From d17e662bca3701f3be6e0d5c461894ad3511eaa9 Mon Sep 17 00:00:00 2001
From: Yuya Tanaka <yuya.presto@gmail.com>
Date: Mon, 13 May 2019 16:45:56 +0900
Subject: [PATCH 001/151] Fix outdated comments for unknown type

---
 src/compiler/checker.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 64834befee1..42e5dc91e63 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -7474,7 +7474,7 @@ namespace ts {
                 else {
                     // Otherwise, get the declared constraint type, and if the constraint type is a type parameter,
                     // get the constraint of that type parameter. If the resulting type is an indexed type 'keyof T',
-                    // the modifiers type is T. Otherwise, the modifiers type is {}.
+                    // the modifiers type is T. Otherwise, the modifiers type is unknown.
                     const declaredType = <MappedType>getTypeFromMappedTypeNode(type.declaration);
                     const constraint = getConstraintTypeFromMappedType(declaredType);
                     const extendedConstraint = constraint && constraint.flags & TypeFlags.TypeParameter ? getConstraintOfTypeParameter(<TypeParameter>constraint) : constraint;
@@ -22570,7 +22570,7 @@ namespace ts {
                 links.type = contextualType;
                 const decl = parameter.valueDeclaration as ParameterDeclaration;
                 if (decl.name.kind !== SyntaxKind.Identifier) {
-                    // if inference didn't come up with anything but {}, fall back to the binding pattern if present.
+                    // if inference didn't come up with anything but unknown, fall back to the binding pattern if present.
                     if (links.type === unknownType) {
                         links.type = getTypeFromBindingPattern(decl.name);
                     }

From f1a0a7f863a0b247471626a0188c42c59ddbe18e Mon Sep 17 00:00:00 2001
From: Orta Therox <Ortam@microsoft.com>
Date: Mon, 17 Jun 2019 13:30:07 -0700
Subject: [PATCH 002/151] Don't let the additional property setting on an
 object show up as a definition for the lanmguage server

---
 src/services/goToDefinition.ts                   | 12 ++++++++----
 .../goToDefinitionPropertyAssignment.ts          | 16 ++++++++++++++++
 2 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100644 tests/cases/fourslash/goToDefinitionPropertyAssignment.ts

diff --git a/src/services/goToDefinition.ts b/src/services/goToDefinition.ts
index 8f495aadfe1..19959871500 100644
--- a/src/services/goToDefinition.ts
+++ b/src/services/goToDefinition.ts
@@ -26,7 +26,7 @@ namespace ts.GoToDefinition {
         if (!symbol) {
             return getDefinitionInfoForIndexSignatures(node, typeChecker);
         }
-
+        
         const calledDeclaration = tryGetSignatureDeclaration(typeChecker, node);
         // Don't go to the component constructor definition for a JSX element, just go to the component definition.
         if (calledDeclaration && !(isJsxOpeningLikeElement(node.parent) && isConstructorLike(calledDeclaration))) {
@@ -233,20 +233,24 @@ namespace ts.GoToDefinition {
     }
 
     function getDefinitionFromSymbol(typeChecker: TypeChecker, symbol: Symbol, node: Node): DefinitionInfo[] | undefined {
-        return getConstructSignatureDefinition() || getCallSignatureDefinition() || map(symbol.declarations, declaration => createDefinitionInfo(declaration, typeChecker, symbol, node));
+        // There are cases when you extend a function by adding properties to it afterwards,
+        // we want to strip those extra properties
+        const filteredDeclarations = symbol.declarations.filter(d =>  !ts.isAssignmentDeclaration(d) || d === symbol.valueDeclaration)
+
+        return getConstructSignatureDefinition() || getCallSignatureDefinition() || map(filteredDeclarations, declaration => createDefinitionInfo(declaration, typeChecker, symbol, node));
 
         function getConstructSignatureDefinition(): DefinitionInfo[] | undefined {
             // Applicable only if we are in a new expression, or we are on a constructor declaration
             // and in either case the symbol has a construct signature definition, i.e. class
             if (symbol.flags & SymbolFlags.Class && (isNewExpressionTarget(node) || node.kind === SyntaxKind.ConstructorKeyword)) {
-                const cls = find(symbol.declarations, isClassLike) || Debug.fail("Expected declaration to have at least one class-like declaration");
+                const cls = find(filteredDeclarations, isClassLike) || Debug.fail("Expected declaration to have at least one class-like declaration");
                 return getSignatureDefinition(cls.members, /*selectConstructors*/ true);
             }
         }
 
         function getCallSignatureDefinition(): DefinitionInfo[] | undefined {
             return isCallOrNewExpressionTarget(node) || isNameOfFunctionDeclaration(node)
-                ? getSignatureDefinition(symbol.declarations, /*selectConstructors*/ false)
+                ? getSignatureDefinition(filteredDeclarations, /*selectConstructors*/ false)
                 : undefined;
         }
 
diff --git a/tests/cases/fourslash/goToDefinitionPropertyAssignment.ts b/tests/cases/fourslash/goToDefinitionPropertyAssignment.ts
new file mode 100644
index 00000000000..5da8604f548
--- /dev/null
+++ b/tests/cases/fourslash/goToDefinitionPropertyAssignment.ts
@@ -0,0 +1,16 @@
+/// <reference path='fourslash.ts' />
+
+//// export const /*FunctionResult*/Component = () => { return "OK"}
+//// Component./*PropertyResult*/displayName = 'Component'
+////
+//// [|/*FunctionClick*/Component|]
+////
+//// Component.[|/*PropertyClick*/displayName|]
+
+verify.goToDefinition("FunctionClick", "FunctionResult")
+
+verify.goToDefinition("PropertyClick", "PropertyResult")
+
+// export const Component = () => { return "OK"}
+// Component.displayName = 'Component'
+

From 6b33dda121e98b9b64e5d04f5f5828c4cddb5168 Mon Sep 17 00:00:00 2001
From: sisisin <azsisisin@gmail.com>
Date: Wed, 19 Jun 2019 19:08:01 +0900
Subject: [PATCH 003/151] chore(tsserver): fix typo

---
 src/services/importTracker.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/services/importTracker.ts b/src/services/importTracker.ts
index 2734d059000..7724292d444 100644
--- a/src/services/importTracker.ts
+++ b/src/services/importTracker.ts
@@ -434,7 +434,7 @@ namespace ts.FindAllReferences {
     /**
      * Given a local reference, we might notice that it's an import/export and recursively search for references of that.
      * If at an import, look locally for the symbol it imports.
-     * If an an export, look for all imports of it.
+     * If at an export, look for all imports of it.
      * This doesn't handle export specifiers; that is done in `getReferencesAtExportSpecifier`.
      * @param comingFromExport If we are doing a search for all exports, don't bother looking backwards for the imported symbol, since that's the reason we're here.
      */

From e0599fd19cc690aca5fb74e18dbee5eed1b446a0 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Fri, 12 Jul 2019 11:11:36 -1000
Subject: [PATCH 004/151] Instantiate contextual type for return type in
 getReturnTypeFromBody

---
 src/compiler/checker.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index b761606fcb3..1f8c62d0858 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -19051,7 +19051,7 @@ namespace ts {
 
         // If the given contextual type contains instantiable types and if a mapper representing
         // return type inferences is available, instantiate those types using that mapper.
-        function instantiateContextualType(contextualType: Type | undefined, node: Expression, contextFlags?: ContextFlags): Type | undefined {
+        function instantiateContextualType(contextualType: Type | undefined, node: Node, contextFlags?: ContextFlags): Type | undefined {
             if (contextualType && maybeTypeOfKind(contextualType, TypeFlags.Instantiable)) {
                 const inferenceContext = getInferenceContext(node);
                 // If no inferences have been made, nothing is gained from instantiating as type parameters
@@ -23363,7 +23363,7 @@ namespace ts {
                     nextType && isUnitType(nextType)) {
                     const contextualType = !contextualSignature ? undefined :
                         contextualSignature === getSignatureFromDeclaration(func) ? isGenerator ? undefined : returnType :
-                        getReturnTypeOfSignature(contextualSignature);
+                        instantiateContextualType(getReturnTypeOfSignature(contextualSignature), func);
                     if (isGenerator) {
                         yieldType = getWidenedLiteralLikeTypeForContextualIterationTypeIfNeeded(yieldType, contextualType, IterationTypeKind.Yield, isAsync);
                         returnType = getWidenedLiteralLikeTypeForContextualIterationTypeIfNeeded(returnType, contextualType, IterationTypeKind.Return, isAsync);

From 044d70fc243e7f68214796611d8b93c0e31dec65 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Fri, 12 Jul 2019 17:57:05 -1000
Subject: [PATCH 005/151] Add regression tests

---
 .../compiler/instantiateContextualTypes.ts    | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/tests/cases/compiler/instantiateContextualTypes.ts b/tests/cases/compiler/instantiateContextualTypes.ts
index b81356fa91e..3165011ecff 100644
--- a/tests/cases/compiler/instantiateContextualTypes.ts
+++ b/tests/cases/compiler/instantiateContextualTypes.ts
@@ -140,3 +140,37 @@ declare function passContentsToFunc<T>(outerBox: T, consumer: BoxConsumerFromOut
 declare const outerBoxOfString: OuterBox<string>;
 
 passContentsToFunc(outerBoxOfString, box => box.value);
+
+// Repro from #32349
+
+type DooDad = 'SOMETHING' | 'ELSE' ;
+
+class Interesting {
+	public compiles = () : Promise<DooDad> => {
+		return Promise.resolve().then(() => {
+			if (1 < 2) {
+				return 'SOMETHING';
+			}
+			return 'ELSE';
+		});
+	};
+	public doesnt = () : Promise<DooDad> => {
+		return Promise.resolve().then(() => {
+			return 'ELSE';
+		});
+	};
+	public slightlyDifferentErrorMessage = () : Promise<DooDad> => {
+		return Promise.resolve().then(() => {
+			if (1 < 2) {
+				return 'SOMETHING';
+			}
+			return 'SOMETHING';
+		});
+	};
+}
+
+// Repro from #32349
+
+declare function invoke<T>(f: () => T): T;
+
+let xx: 0 | 1 | 2 = invoke(() => 1);

From 6f637b0870f27fcae5cfdc5ee97e212017e1ecde Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Fri, 12 Jul 2019 17:57:11 -1000
Subject: [PATCH 006/151] Accept new baselines

---
 .../reference/instantiateContextualTypes.js   | 60 ++++++++++++
 .../instantiateContextualTypes.symbols        | 74 ++++++++++++++
 .../instantiateContextualTypes.types          | 96 +++++++++++++++++++
 3 files changed, 230 insertions(+)

diff --git a/tests/baselines/reference/instantiateContextualTypes.js b/tests/baselines/reference/instantiateContextualTypes.js
index 3a33b54278c..9de6bfb612c 100644
--- a/tests/baselines/reference/instantiateContextualTypes.js
+++ b/tests/baselines/reference/instantiateContextualTypes.js
@@ -138,6 +138,40 @@ declare function passContentsToFunc<T>(outerBox: T, consumer: BoxConsumerFromOut
 declare const outerBoxOfString: OuterBox<string>;
 
 passContentsToFunc(outerBoxOfString, box => box.value);
+
+// Repro from #32349
+
+type DooDad = 'SOMETHING' | 'ELSE' ;
+
+class Interesting {
+	public compiles = () : Promise<DooDad> => {
+		return Promise.resolve().then(() => {
+			if (1 < 2) {
+				return 'SOMETHING';
+			}
+			return 'ELSE';
+		});
+	};
+	public doesnt = () : Promise<DooDad> => {
+		return Promise.resolve().then(() => {
+			return 'ELSE';
+		});
+	};
+	public slightlyDifferentErrorMessage = () : Promise<DooDad> => {
+		return Promise.resolve().then(() => {
+			if (1 < 2) {
+				return 'SOMETHING';
+			}
+			return 'SOMETHING';
+		});
+	};
+}
+
+// Repro from #32349
+
+declare function invoke<T>(f: () => T): T;
+
+let xx: 0 | 1 | 2 = invoke(() => 1);
 
 
 //// [instantiateContextualTypes.js]
@@ -162,3 +196,29 @@ var N1;
     createElement2(InferFunctionTypes, [(foo) => "" + foo]);
 })(N1 || (N1 = {}));
 passContentsToFunc(outerBoxOfString, box => box.value);
+class Interesting {
+    constructor() {
+        this.compiles = () => {
+            return Promise.resolve().then(() => {
+                if (1 < 2) {
+                    return 'SOMETHING';
+                }
+                return 'ELSE';
+            });
+        };
+        this.doesnt = () => {
+            return Promise.resolve().then(() => {
+                return 'ELSE';
+            });
+        };
+        this.slightlyDifferentErrorMessage = () => {
+            return Promise.resolve().then(() => {
+                if (1 < 2) {
+                    return 'SOMETHING';
+                }
+                return 'SOMETHING';
+            });
+        };
+    }
+}
+let xx = invoke(() => 1);
diff --git a/tests/baselines/reference/instantiateContextualTypes.symbols b/tests/baselines/reference/instantiateContextualTypes.symbols
index 098be95bac5..1250edd585b 100644
--- a/tests/baselines/reference/instantiateContextualTypes.symbols
+++ b/tests/baselines/reference/instantiateContextualTypes.symbols
@@ -407,3 +407,77 @@ passContentsToFunc(outerBoxOfString, box => box.value);
 >box : Symbol(box, Decl(instantiateContextualTypes.ts, 138, 36))
 >value : Symbol(value, Decl(instantiateContextualTypes.ts, 121, 20))
 
+// Repro from #32349
+
+type DooDad = 'SOMETHING' | 'ELSE' ;
+>DooDad : Symbol(DooDad, Decl(instantiateContextualTypes.ts, 138, 55))
+
+class Interesting {
+>Interesting : Symbol(Interesting, Decl(instantiateContextualTypes.ts, 142, 36))
+
+	public compiles = () : Promise<DooDad> => {
+>compiles : Symbol(Interesting.compiles, Decl(instantiateContextualTypes.ts, 144, 19))
+>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>DooDad : Symbol(DooDad, Decl(instantiateContextualTypes.ts, 138, 55))
+
+		return Promise.resolve().then(() => {
+>Promise.resolve().then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
+>Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
+
+			if (1 < 2) {
+				return 'SOMETHING';
+			}
+			return 'ELSE';
+		});
+	};
+	public doesnt = () : Promise<DooDad> => {
+>doesnt : Symbol(Interesting.doesnt, Decl(instantiateContextualTypes.ts, 152, 3))
+>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>DooDad : Symbol(DooDad, Decl(instantiateContextualTypes.ts, 138, 55))
+
+		return Promise.resolve().then(() => {
+>Promise.resolve().then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
+>Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
+
+			return 'ELSE';
+		});
+	};
+	public slightlyDifferentErrorMessage = () : Promise<DooDad> => {
+>slightlyDifferentErrorMessage : Symbol(Interesting.slightlyDifferentErrorMessage, Decl(instantiateContextualTypes.ts, 157, 3))
+>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>DooDad : Symbol(DooDad, Decl(instantiateContextualTypes.ts, 138, 55))
+
+		return Promise.resolve().then(() => {
+>Promise.resolve().then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
+>Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>resolve : Symbol(PromiseConstructor.resolve, Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --))
+>then : Symbol(Promise.then, Decl(lib.es5.d.ts, --, --))
+
+			if (1 < 2) {
+				return 'SOMETHING';
+			}
+			return 'SOMETHING';
+		});
+	};
+}
+
+// Repro from #32349
+
+declare function invoke<T>(f: () => T): T;
+>invoke : Symbol(invoke, Decl(instantiateContextualTypes.ts, 166, 1))
+>T : Symbol(T, Decl(instantiateContextualTypes.ts, 170, 24))
+>f : Symbol(f, Decl(instantiateContextualTypes.ts, 170, 27))
+>T : Symbol(T, Decl(instantiateContextualTypes.ts, 170, 24))
+>T : Symbol(T, Decl(instantiateContextualTypes.ts, 170, 24))
+
+let xx: 0 | 1 | 2 = invoke(() => 1);
+>xx : Symbol(xx, Decl(instantiateContextualTypes.ts, 172, 3))
+>invoke : Symbol(invoke, Decl(instantiateContextualTypes.ts, 166, 1))
+
diff --git a/tests/baselines/reference/instantiateContextualTypes.types b/tests/baselines/reference/instantiateContextualTypes.types
index 0e755e82ed3..88e6ca7e4dd 100644
--- a/tests/baselines/reference/instantiateContextualTypes.types
+++ b/tests/baselines/reference/instantiateContextualTypes.types
@@ -326,3 +326,99 @@ passContentsToFunc(outerBoxOfString, box => box.value);
 >box : InnerBox<string>
 >value : string
 
+// Repro from #32349
+
+type DooDad = 'SOMETHING' | 'ELSE' ;
+>DooDad : DooDad
+
+class Interesting {
+>Interesting : Interesting
+
+	public compiles = () : Promise<DooDad> => {
+>compiles : () => Promise<DooDad>
+>() : Promise<DooDad> => {		return Promise.resolve().then(() => {			if (1 < 2) {				return 'SOMETHING';			}			return 'ELSE';		});	} : () => Promise<DooDad>
+
+		return Promise.resolve().then(() => {
+>Promise.resolve().then(() => {			if (1 < 2) {				return 'SOMETHING';			}			return 'ELSE';		}) : Promise<DooDad>
+>Promise.resolve().then : <TResult1 = void, TResult2 = never>(onfulfilled?: ((value: void) => TResult1 | PromiseLike<TResult1>) | null | undefined, onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | null | undefined) => Promise<TResult1 | TResult2>
+>Promise.resolve() : Promise<void>
+>Promise.resolve : { <T>(value: T | PromiseLike<T>): Promise<T>; (): Promise<void>; }
+>Promise : PromiseConstructor
+>resolve : { <T>(value: T | PromiseLike<T>): Promise<T>; (): Promise<void>; }
+>then : <TResult1 = void, TResult2 = never>(onfulfilled?: ((value: void) => TResult1 | PromiseLike<TResult1>) | null | undefined, onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | null | undefined) => Promise<TResult1 | TResult2>
+>() => {			if (1 < 2) {				return 'SOMETHING';			}			return 'ELSE';		} : () => "SOMETHING" | "ELSE"
+
+			if (1 < 2) {
+>1 < 2 : boolean
+>1 : 1
+>2 : 2
+
+				return 'SOMETHING';
+>'SOMETHING' : "SOMETHING"
+			}
+			return 'ELSE';
+>'ELSE' : "ELSE"
+
+		});
+	};
+	public doesnt = () : Promise<DooDad> => {
+>doesnt : () => Promise<DooDad>
+>() : Promise<DooDad> => {		return Promise.resolve().then(() => {			return 'ELSE';		});	} : () => Promise<DooDad>
+
+		return Promise.resolve().then(() => {
+>Promise.resolve().then(() => {			return 'ELSE';		}) : Promise<DooDad>
+>Promise.resolve().then : <TResult1 = void, TResult2 = never>(onfulfilled?: ((value: void) => TResult1 | PromiseLike<TResult1>) | null | undefined, onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | null | undefined) => Promise<TResult1 | TResult2>
+>Promise.resolve() : Promise<void>
+>Promise.resolve : { <T>(value: T | PromiseLike<T>): Promise<T>; (): Promise<void>; }
+>Promise : PromiseConstructor
+>resolve : { <T>(value: T | PromiseLike<T>): Promise<T>; (): Promise<void>; }
+>then : <TResult1 = void, TResult2 = never>(onfulfilled?: ((value: void) => TResult1 | PromiseLike<TResult1>) | null | undefined, onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | null | undefined) => Promise<TResult1 | TResult2>
+>() => {			return 'ELSE';		} : () => "ELSE"
+
+			return 'ELSE';
+>'ELSE' : "ELSE"
+
+		});
+	};
+	public slightlyDifferentErrorMessage = () : Promise<DooDad> => {
+>slightlyDifferentErrorMessage : () => Promise<DooDad>
+>() : Promise<DooDad> => {		return Promise.resolve().then(() => {			if (1 < 2) {				return 'SOMETHING';			}			return 'SOMETHING';		});	} : () => Promise<DooDad>
+
+		return Promise.resolve().then(() => {
+>Promise.resolve().then(() => {			if (1 < 2) {				return 'SOMETHING';			}			return 'SOMETHING';		}) : Promise<DooDad>
+>Promise.resolve().then : <TResult1 = void, TResult2 = never>(onfulfilled?: ((value: void) => TResult1 | PromiseLike<TResult1>) | null | undefined, onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | null | undefined) => Promise<TResult1 | TResult2>
+>Promise.resolve() : Promise<void>
+>Promise.resolve : { <T>(value: T | PromiseLike<T>): Promise<T>; (): Promise<void>; }
+>Promise : PromiseConstructor
+>resolve : { <T>(value: T | PromiseLike<T>): Promise<T>; (): Promise<void>; }
+>then : <TResult1 = void, TResult2 = never>(onfulfilled?: ((value: void) => TResult1 | PromiseLike<TResult1>) | null | undefined, onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | null | undefined) => Promise<TResult1 | TResult2>
+>() => {			if (1 < 2) {				return 'SOMETHING';			}			return 'SOMETHING';		} : () => "SOMETHING"
+
+			if (1 < 2) {
+>1 < 2 : boolean
+>1 : 1
+>2 : 2
+
+				return 'SOMETHING';
+>'SOMETHING' : "SOMETHING"
+			}
+			return 'SOMETHING';
+>'SOMETHING' : "SOMETHING"
+
+		});
+	};
+}
+
+// Repro from #32349
+
+declare function invoke<T>(f: () => T): T;
+>invoke : <T>(f: () => T) => T
+>f : () => T
+
+let xx: 0 | 1 | 2 = invoke(() => 1);
+>xx : 0 | 1 | 2
+>invoke(() => 1) : 1
+>invoke : <T>(f: () => T) => T
+>() => 1 : () => 1
+>1 : 1
+

From d3f3c8e1135b321979f2e93b9cae3c79158cd7e8 Mon Sep 17 00:00:00 2001
From: Orta Therox <orta.therox@gmail.com>
Date: Tue, 16 Jul 2019 12:00:22 -0400
Subject: [PATCH 007/151] Make it easier to read multi-line exceptions

---
 src/harness/fourslash.ts | 36 ++++++++++++++++--------------------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts
index 56cc2b65508..71a07c9e248 100644
--- a/src/harness/fourslash.ts
+++ b/src/harness/fourslash.ts
@@ -948,7 +948,7 @@ namespace FourSlash {
 
             const actual = checker.typeToString(type);
             if (actual !== expected) {
-                this.raiseError(`Expected: '${expected}', actual: '${actual}'`);
+                this.raiseError(displayExpectedAndActualString(expected, actual));
             }
         }
 
@@ -1024,9 +1024,7 @@ namespace FourSlash {
         private assertObjectsEqual<T>(fullActual: T, fullExpected: T, msgPrefix = ""): void {
             const recur = <U>(actual: U, expected: U, path: string) => {
                 const fail = (msg: string) => {
-                    this.raiseError(`${msgPrefix} At ${path}: ${msg}
-Expected: ${stringify(fullExpected)}
-Actual: ${stringify(fullActual)}`);
+                    this.raiseError(`${msgPrefix} At ${path}: ${msg} ${displayExpectedAndActualString(stringify(fullExpected), stringify(fullActual))}`);
                 };
 
                 if ((actual === undefined) !== (expected === undefined)) {
@@ -1058,9 +1056,7 @@ Actual: ${stringify(fullActual)}`);
                 if (fullActual === fullExpected) {
                     return;
                 }
-                this.raiseError(`${msgPrefix}
-Expected: ${stringify(fullExpected)}
-Actual: ${stringify(fullActual)}`);
+                this.raiseError(`${msgPrefix} ${displayExpectedAndActualString(stringify(fullExpected), stringify(fullActual))}`);
             }
             recur(fullActual, fullExpected, "");
 
@@ -2111,9 +2107,7 @@ Actual: ${stringify(fullActual)}`);
         public verifyCurrentLineContent(text: string) {
             const actual = this.getCurrentLineContent();
             if (actual !== text) {
-                throw new Error("verifyCurrentLineContent\n" +
-                    "\tExpected: \"" + text + "\"\n" +
-                    "\t  Actual: \"" + actual + "\"");
+                throw new Error("verifyCurrentLineContent\n" + displayExpectedAndActualString(text, actual, /* quoted */ true));
             }
         }
 
@@ -2139,25 +2133,19 @@ Actual: ${stringify(fullActual)}`);
         public verifyTextAtCaretIs(text: string) {
             const actual = this.getFileContent(this.activeFile.fileName).substring(this.currentCaretPosition, this.currentCaretPosition + text.length);
             if (actual !== text) {
-                throw new Error("verifyTextAtCaretIs\n" +
-                    "\tExpected: \"" + text + "\"\n" +
-                    "\t  Actual: \"" + actual + "\"");
+                throw new Error("verifyTextAtCaretIs\n" + displayExpectedAndActualString(text, actual, /* quoted */ true));
             }
         }
 
         public verifyCurrentNameOrDottedNameSpanText(text: string) {
             const span = this.languageService.getNameOrDottedNameSpan(this.activeFile.fileName, this.currentCaretPosition, this.currentCaretPosition);
             if (!span) {
-                return this.raiseError("verifyCurrentNameOrDottedNameSpanText\n" +
-                    "\tExpected: \"" + text + "\"\n" +
-                    "\t  Actual: undefined");
+                return this.raiseError("verifyCurrentNameOrDottedNameSpanText\n" + displayExpectedAndActualString("\"" + text + "\"", "undefined"));
             }
 
             const actual = this.getFileContent(this.activeFile.fileName).substring(span.start, ts.textSpanEnd(span));
             if (actual !== text) {
-                this.raiseError("verifyCurrentNameOrDottedNameSpanText\n" +
-                    "\tExpected: \"" + text + "\"\n" +
-                    "\t  Actual: \"" + actual + "\"");
+                this.raiseError("verifyCurrentNameOrDottedNameSpanText\n" + displayExpectedAndActualString(text, actual, /* quoted */ true));
             }
         }
 
@@ -3690,7 +3678,7 @@ ${code}
             expected = makeWhitespaceVisible(expected);
             actual = makeWhitespaceVisible(actual);
         }
-        return `Expected:\n${expected}\nActual:\n${actual}`;
+        return displayExpectedAndActualString(expected, actual);
     }
 
     function differOnlyByWhitespace(a: string, b: string) {
@@ -3710,6 +3698,14 @@ ${code}
             }
         }
     }
+
+    function displayExpectedAndActualString(expected: string, actual: string, quoted = false) {
+        const expectMsg = "\x1b[1mExpected\x1b[0m\x1b[31m";
+        const actualMsg = "\x1b[1mActual\x1b[0m\x1b[31m";
+        const expectedString = quoted ? "\"" + expected + "\"" : expected;
+        const actualString = quoted ? "\"" + actual + "\"" : actual;
+        return `\n${expectMsg}:\n${expectedString}\n\n${actualMsg}:\n${actualString}`;
+    }
 }
 
 namespace FourSlashInterface {

From 49ba408e4fed08e328dfff2614611c500ee53bb0 Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Tue, 16 Jul 2019 10:14:06 -0700
Subject: [PATCH 008/151] Handle scoped package names in typing installer Fixes
 #32075

---
 src/jsTyping/jsTyping.ts                      | 75 +++++++++++++------
 .../unittests/tsserver/typingsInstaller.ts    | 64 +++++++++++-----
 src/tsserver/server.ts                        |  2 +-
 src/typingsInstallerCore/typingsInstaller.ts  | 29 +++----
 4 files changed, 114 insertions(+), 56 deletions(-)

diff --git a/src/jsTyping/jsTyping.ts b/src/jsTyping/jsTyping.ts
index c2b2ad3f5b3..172d041cc01 100644
--- a/src/jsTyping/jsTyping.ts
+++ b/src/jsTyping/jsTyping.ts
@@ -289,9 +289,8 @@ namespace ts.JsTyping {
 
     }
 
-    export const enum PackageNameValidationResult {
+    export const enum NameValidationResult {
         Ok,
-        ScopedPackagesNotSupported,
         EmptyName,
         NameTooLong,
         NameStartsWithDot,
@@ -301,49 +300,77 @@ namespace ts.JsTyping {
 
     const maxPackageNameLength = 214;
 
+    export interface ScopedPackageNameValidationResult {
+        name: string;
+        isScopeName: boolean;
+        result: NameValidationResult;
+    }
+    export type PackageNameValidationResult = NameValidationResult | ScopedPackageNameValidationResult;
+
     /**
      * Validates package name using rules defined at https://docs.npmjs.com/files/package.json
      */
     export function validatePackageName(packageName: string): PackageNameValidationResult {
+        return validatePackageNameWorker(packageName, /*supportScopedPackage*/ true);
+    }
+
+    function validatePackageNameWorker(packageName: string, supportScopedPackage: false): NameValidationResult;
+    function validatePackageNameWorker(packageName: string, supportScopedPackage: true): PackageNameValidationResult;
+    function validatePackageNameWorker(packageName: string, supportScopedPackage: boolean): PackageNameValidationResult {
         if (!packageName) {
-            return PackageNameValidationResult.EmptyName;
+            return NameValidationResult.EmptyName;
         }
         if (packageName.length > maxPackageNameLength) {
-            return PackageNameValidationResult.NameTooLong;
+            return NameValidationResult.NameTooLong;
         }
         if (packageName.charCodeAt(0) === CharacterCodes.dot) {
-            return PackageNameValidationResult.NameStartsWithDot;
+            return NameValidationResult.NameStartsWithDot;
         }
         if (packageName.charCodeAt(0) === CharacterCodes._) {
-            return PackageNameValidationResult.NameStartsWithUnderscore;
+            return NameValidationResult.NameStartsWithUnderscore;
         }
         // check if name is scope package like: starts with @ and has one '/' in the middle
         // scoped packages are not currently supported
-        // TODO: when support will be added we'll need to split and check both scope and package name
-        if (/^@[^/]+\/[^/]+$/.test(packageName)) {
-            return PackageNameValidationResult.ScopedPackagesNotSupported;
+        if (supportScopedPackage) {
+            const matches = /^@([^/]+)\/([^/]+)$/.exec(packageName);
+            if (matches) {
+                const scopeResult = validatePackageNameWorker(matches[1], /*supportScopedPackage*/ false);
+                if (scopeResult !== NameValidationResult.Ok) {
+                    return { name: matches[1], isScopeName: true, result: scopeResult };
+                }
+                const packageResult = validatePackageNameWorker(matches[2], /*supportScopedPackage*/ false);
+                if (packageResult !== NameValidationResult.Ok) {
+                    return { name: matches[2], isScopeName: false, result: packageResult };
+                }
+                return NameValidationResult.Ok;
+            }
         }
         if (encodeURIComponent(packageName) !== packageName) {
-            return PackageNameValidationResult.NameContainsNonURISafeCharacters;
+            return NameValidationResult.NameContainsNonURISafeCharacters;
         }
-        return PackageNameValidationResult.Ok;
+        return NameValidationResult.Ok;
     }
 
     export function renderPackageNameValidationFailure(result: PackageNameValidationResult, typing: string): string {
+        return typeof result === "object" ?
+            renderPackageNameValidationFailureWorker(typing, result.result, result.name, result.isScopeName) :
+            renderPackageNameValidationFailureWorker(typing, result, typing, /*isScopeName*/ false);
+    }
+
+    function renderPackageNameValidationFailureWorker(typing: string, result: NameValidationResult, name: string, isScopeName: boolean): string {
+        const kind = isScopeName ? "Scope" : "Package";
         switch (result) {
-            case PackageNameValidationResult.EmptyName:
-                return `Package name '${typing}' cannot be empty`;
-            case PackageNameValidationResult.NameTooLong:
-                return `Package name '${typing}' should be less than ${maxPackageNameLength} characters`;
-            case PackageNameValidationResult.NameStartsWithDot:
-                return `Package name '${typing}' cannot start with '.'`;
-            case PackageNameValidationResult.NameStartsWithUnderscore:
-                return `Package name '${typing}' cannot start with '_'`;
-            case PackageNameValidationResult.ScopedPackagesNotSupported:
-                return `Package '${typing}' is scoped and currently is not supported`;
-            case PackageNameValidationResult.NameContainsNonURISafeCharacters:
-                return `Package name '${typing}' contains non URI safe characters`;
-            case PackageNameValidationResult.Ok:
+            case NameValidationResult.EmptyName:
+                return `'${typing}':: ${kind} name '${name}' cannot be empty`;
+            case NameValidationResult.NameTooLong:
+                return `'${typing}':: ${kind} name '${name}' should be less than ${maxPackageNameLength} characters`;
+            case NameValidationResult.NameStartsWithDot:
+                return `'${typing}':: ${kind} name '${name}' cannot start with '.'`;
+            case NameValidationResult.NameStartsWithUnderscore:
+                return `'${typing}':: ${kind} name '${name}' cannot start with '_'`;
+            case NameValidationResult.NameContainsNonURISafeCharacters:
+                return `'${typing}':: ${kind} name '${name}' contains non URI safe characters`;
+            case NameValidationResult.Ok:
                 return Debug.fail(); // Shouldn't have called this.
             default:
                 throw Debug.assertNever(result);
diff --git a/src/testRunner/unittests/tsserver/typingsInstaller.ts b/src/testRunner/unittests/tsserver/typingsInstaller.ts
index b02adbbd094..79b4f01aa06 100644
--- a/src/testRunner/unittests/tsserver/typingsInstaller.ts
+++ b/src/testRunner/unittests/tsserver/typingsInstaller.ts
@@ -1,6 +1,6 @@
 namespace ts.projectSystem {
     import validatePackageName = JsTyping.validatePackageName;
-    import PackageNameValidationResult = JsTyping.PackageNameValidationResult;
+    import NameValidationResult = JsTyping.NameValidationResult;
 
     interface InstallerParams {
         globalTypingsCacheLocation?: string;
@@ -948,7 +948,8 @@ namespace ts.projectSystem {
                 path: "/a/b/app.js",
                 content: `
                 import * as fs from "fs";
-                import * as commander from "commander";`
+                import * as commander from "commander";
+                import * as component from "@ember/component";`
             };
             const cachePath = "/a/cache";
             const node = {
@@ -959,14 +960,19 @@ namespace ts.projectSystem {
                 path: cachePath + "/node_modules/@types/commander/index.d.ts",
                 content: "export let y: string"
             };
+            const emberComponentDirectory = "ember__component";
+            const emberComponent = {
+                path: `${cachePath}/node_modules/@types/${emberComponentDirectory}/index.d.ts`,
+                content: "export let x: number"
+            };
             const host = createServerHost([file]);
             const installer = new (class extends Installer {
                 constructor() {
                     super(host, { globalTypingsCacheLocation: cachePath, typesRegistry: createTypesRegistry("node", "commander") });
                 }
                 installWorker(_requestId: number, _args: string[], _cwd: string, cb: TI.RequestCompletedAction) {
-                    const installedTypings = ["@types/node", "@types/commander"];
-                    const typingFiles = [node, commander];
+                    const installedTypings = ["@types/node", "@types/commander", `@types/${emberComponentDirectory}`];
+                    const typingFiles = [node, commander, emberComponent];
                     executeCommand(this, host, installedTypings, typingFiles, cb);
                 }
             })();
@@ -980,9 +986,10 @@ namespace ts.projectSystem {
 
             assert.isTrue(host.fileExists(node.path), "typings for 'node' should be created");
             assert.isTrue(host.fileExists(commander.path), "typings for 'commander' should be created");
+            assert.isTrue(host.fileExists(emberComponent.path), "typings for 'commander' should be created");
 
             host.checkTimeoutQueueLengthAndRun(2);
-            checkProjectActualFiles(service.inferredProjects[0], [file.path, node.path, commander.path]);
+            checkProjectActualFiles(service.inferredProjects[0], [file.path, node.path, commander.path, emberComponent.path]);
         });
 
         it("should redo resolution that resolved to '.js' file after typings are installed", () => {
@@ -1263,21 +1270,44 @@ namespace ts.projectSystem {
             for (let i = 0; i < 8; i++) {
                 packageName += packageName;
             }
-            assert.equal(validatePackageName(packageName), PackageNameValidationResult.NameTooLong);
+            assert.equal(validatePackageName(packageName), NameValidationResult.NameTooLong);
         });
-        it("name cannot start with dot", () => {
-            assert.equal(validatePackageName(".foo"), PackageNameValidationResult.NameStartsWithDot);
+        it("package name cannot start with dot", () => {
+            assert.equal(validatePackageName(".foo"), NameValidationResult.NameStartsWithDot);
         });
-        it("name cannot start with underscore", () => {
-            assert.equal(validatePackageName("_foo"), PackageNameValidationResult.NameStartsWithUnderscore);
+        it("package name cannot start with underscore", () => {
+            assert.equal(validatePackageName("_foo"), NameValidationResult.NameStartsWithUnderscore);
         });
-        it("scoped packages not supported", () => {
-            assert.equal(validatePackageName("@scope/bar"), PackageNameValidationResult.ScopedPackagesNotSupported);
+        it("package non URI safe characters are not supported", () => {
+            assert.equal(validatePackageName("  scope  "), NameValidationResult.NameContainsNonURISafeCharacters);
+            assert.equal(validatePackageName("; say ‘Hello from TypeScript!’ #"), NameValidationResult.NameContainsNonURISafeCharacters);
+            assert.equal(validatePackageName("a/b/c"), NameValidationResult.NameContainsNonURISafeCharacters);
         });
-        it("non URI safe characters are not supported", () => {
-            assert.equal(validatePackageName("  scope  "), PackageNameValidationResult.NameContainsNonURISafeCharacters);
-            assert.equal(validatePackageName("; say ‘Hello from TypeScript!’ #"), PackageNameValidationResult.NameContainsNonURISafeCharacters);
-            assert.equal(validatePackageName("a/b/c"), PackageNameValidationResult.NameContainsNonURISafeCharacters);
+        it("scoped package name is supported", () => {
+            assert.equal(validatePackageName("@scope/bar"), NameValidationResult.Ok);
+        });
+        it("scoped name in scoped package name cannot start with dot", () => {
+            assert.deepEqual(validatePackageName("@.scope/bar"), { name: ".scope", isScopeName: true, result: NameValidationResult.NameStartsWithDot });
+            assert.deepEqual(validatePackageName("@.scope/.bar"), { name: ".scope", isScopeName: true, result: NameValidationResult.NameStartsWithDot });
+        });
+        it("scope name in scoped package name cannot start with underscore", () => {
+            assert.deepEqual(validatePackageName("@_scope/bar"), { name: "_scope", isScopeName: true, result: NameValidationResult.NameStartsWithUnderscore });
+            assert.deepEqual(validatePackageName("@_scope/_bar"), { name: "_scope", isScopeName: true, result: NameValidationResult.NameStartsWithUnderscore });
+        });
+        it("scope name in scoped package name with non URI safe characters are not supported", () => {
+            assert.deepEqual(validatePackageName("@  scope  /bar"), { name: "  scope  ", isScopeName: true, result: NameValidationResult.NameContainsNonURISafeCharacters });
+            assert.deepEqual(validatePackageName("@; say ‘Hello from TypeScript!’ #/bar"), { name: "; say ‘Hello from TypeScript!’ #", isScopeName: true, result: NameValidationResult.NameContainsNonURISafeCharacters });
+            assert.deepEqual(validatePackageName("@  scope  /  bar  "), { name: "  scope  ", isScopeName: true, result: NameValidationResult.NameContainsNonURISafeCharacters });
+        });
+        it("package name in scoped package name cannot start with dot", () => {
+            assert.deepEqual(validatePackageName("@scope/.bar"), { name: ".bar", isScopeName: false, result: NameValidationResult.NameStartsWithDot });
+        });
+        it("package name in scoped package name cannot start with underscore", () => {
+            assert.deepEqual(validatePackageName("@scope/_bar"), { name: "_bar", isScopeName: false, result: NameValidationResult.NameStartsWithUnderscore });
+        });
+        it("package name in scoped package name with non URI safe characters are not supported", () => {
+            assert.deepEqual(validatePackageName("@scope/  bar  "), { name: "  bar  ", isScopeName: false, result: NameValidationResult.NameContainsNonURISafeCharacters });
+            assert.deepEqual(validatePackageName("@scope/; say ‘Hello from TypeScript!’ #"), { name: "; say ‘Hello from TypeScript!’ #", isScopeName: false, result: NameValidationResult.NameContainsNonURISafeCharacters });
         });
     });
 
@@ -1309,7 +1339,7 @@ namespace ts.projectSystem {
             projectService.openClientFile(f1.path);
 
             installer.checkPendingCommands(/*expectedCount*/ 0);
-            assert.isTrue(messages.indexOf("Package name '; say ‘Hello from TypeScript!’ #' contains non URI safe characters") > 0, "should find package with invalid name");
+            assert.isTrue(messages.indexOf("'; say ‘Hello from TypeScript!’ #':: Package name '; say ‘Hello from TypeScript!’ #' contains non URI safe characters") > 0, "should find package with invalid name");
         });
     });
 
diff --git a/src/tsserver/server.ts b/src/tsserver/server.ts
index 43dc4638418..a9fbf2f3b6a 100644
--- a/src/tsserver/server.ts
+++ b/src/tsserver/server.ts
@@ -248,7 +248,7 @@ namespace ts.server {
         isKnownTypesPackageName(name: string): boolean {
             // We want to avoid looking this up in the registry as that is expensive. So first check that it's actually an NPM package.
             const validationResult = JsTyping.validatePackageName(name);
-            if (validationResult !== JsTyping.PackageNameValidationResult.Ok) {
+            if (validationResult !== JsTyping.NameValidationResult.Ok) {
                 return false;
             }
 
diff --git a/src/typingsInstallerCore/typingsInstaller.ts b/src/typingsInstallerCore/typingsInstaller.ts
index df83f1a677c..17dae3b4dcb 100644
--- a/src/typingsInstallerCore/typingsInstaller.ts
+++ b/src/typingsInstallerCore/typingsInstaller.ts
@@ -268,27 +268,28 @@ namespace ts.server.typingsInstaller {
         }
 
         private filterTypings(typingsToInstall: ReadonlyArray<string>): ReadonlyArray<string> {
-            return typingsToInstall.filter(typing => {
-                if (this.missingTypingsSet.get(typing)) {
-                    if (this.log.isEnabled()) this.log.writeLine(`'${typing}' is in missingTypingsSet - skipping...`);
-                    return false;
+            return mapDefined(typingsToInstall, typing => {
+                const typingKey = mangleScopedPackageName(typing);
+                if (this.missingTypingsSet.get(typingKey)) {
+                    if (this.log.isEnabled()) this.log.writeLine(`'${typing}':: '${typingKey}' is in missingTypingsSet - skipping...`);
+                    return undefined;
                 }
                 const validationResult = JsTyping.validatePackageName(typing);
-                if (validationResult !== JsTyping.PackageNameValidationResult.Ok) {
+                if (validationResult !== JsTyping.NameValidationResult.Ok) {
                     // add typing name to missing set so we won't process it again
-                    this.missingTypingsSet.set(typing, true);
+                    this.missingTypingsSet.set(typingKey, true);
                     if (this.log.isEnabled()) this.log.writeLine(JsTyping.renderPackageNameValidationFailure(validationResult, typing));
-                    return false;
+                    return undefined;
                 }
-                if (!this.typesRegistry.has(typing)) {
-                    if (this.log.isEnabled()) this.log.writeLine(`Entry for package '${typing}' does not exist in local types registry - skipping...`);
-                    return false;
+                if (!this.typesRegistry.has(typingKey)) {
+                    if (this.log.isEnabled()) this.log.writeLine(`'${typing}':: Entry for package '${typingKey}' does not exist in local types registry - skipping...`);
+                    return undefined;
                 }
-                if (this.packageNameToTypingLocation.get(typing) && JsTyping.isTypingUpToDate(this.packageNameToTypingLocation.get(typing)!, this.typesRegistry.get(typing)!)) {
-                    if (this.log.isEnabled()) this.log.writeLine(`'${typing}' already has an up-to-date typing - skipping...`);
-                    return false;
+                if (this.packageNameToTypingLocation.get(typingKey) && JsTyping.isTypingUpToDate(this.packageNameToTypingLocation.get(typingKey)!, this.typesRegistry.get(typingKey)!)) {
+                    if (this.log.isEnabled()) this.log.writeLine(`'${typing}':: '${typingKey}' already has an up-to-date typing - skipping...`);
+                    return undefined;
                 }
-                return true;
+                return typingKey;
             });
         }
 

From 607c9c5e2681a86e1fa9807dded11248020c37a1 Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Tue, 16 Jul 2019 13:13:02 -0700
Subject: [PATCH 009/151] Fix missing tokenToString for the backtick Fixes
 #32073

---
 src/compiler/scanner.ts                       |  2 +-
 src/testRunner/unittests/publicApi.ts         | 15 ++++++++++++++
 .../jsdocParameterParsingInvalidName.js       | 20 +++++++++++++++++++
 .../jsdocParameterParsingInvalidName.symbols  | 12 +++++++++++
 .../jsdocParameterParsingInvalidName.types    | 12 +++++++++++
 .../jsdocParameterParsingInvalidName.ts       |  7 +++++++
 6 files changed, 67 insertions(+), 1 deletion(-)
 create mode 100644 tests/baselines/reference/jsdocParameterParsingInvalidName.js
 create mode 100644 tests/baselines/reference/jsdocParameterParsingInvalidName.symbols
 create mode 100644 tests/baselines/reference/jsdocParameterParsingInvalidName.types
 create mode 100644 tests/cases/compiler/jsdocParameterParsingInvalidName.ts

diff --git a/src/compiler/scanner.ts b/src/compiler/scanner.ts
index 256e41629a1..f949893171a 100644
--- a/src/compiler/scanner.ts
+++ b/src/compiler/scanner.ts
@@ -197,6 +197,7 @@ namespace ts {
         "|=": SyntaxKind.BarEqualsToken,
         "^=": SyntaxKind.CaretEqualsToken,
         "@": SyntaxKind.AtToken,
+        "`": SyntaxKind.BacktickToken
     });
 
     /*
@@ -298,7 +299,6 @@ namespace ts {
     }
 
     const tokenStrings = makeReverseMap(textToToken);
-
     export function tokenToString(t: SyntaxKind): string | undefined {
         return tokenStrings[t];
     }
diff --git a/src/testRunner/unittests/publicApi.ts b/src/testRunner/unittests/publicApi.ts
index 17b2519c928..a31104de62a 100644
--- a/src/testRunner/unittests/publicApi.ts
+++ b/src/testRunner/unittests/publicApi.ts
@@ -31,3 +31,18 @@ describe("Public APIs", () => {
         verifyApi("tsserverlibrary.d.ts");
     });
 });
+
+describe("Public APIs:: token to string", () => {
+    function assertDefinedTokenToString(initial: ts.SyntaxKind, last: ts.SyntaxKind) {
+        for (let t = initial; t <= last; t++) {
+            assert.isDefined(ts.tokenToString(t), `Expected tokenToString defined for ${ts.Debug.formatSyntaxKind(t)}`);
+        }
+    }
+
+    it("for punctuations", () => {
+        assertDefinedTokenToString(ts.SyntaxKind.FirstPunctuation, ts.SyntaxKind.LastPunctuation);
+    });
+    it("for keywords", () => {
+        assertDefinedTokenToString(ts.SyntaxKind.FirstKeyword, ts.SyntaxKind.LastKeyword);
+    });
+});
diff --git a/tests/baselines/reference/jsdocParameterParsingInvalidName.js b/tests/baselines/reference/jsdocParameterParsingInvalidName.js
new file mode 100644
index 00000000000..4001ece1aec
--- /dev/null
+++ b/tests/baselines/reference/jsdocParameterParsingInvalidName.js
@@ -0,0 +1,20 @@
+//// [jsdocParameterParsingInvalidName.ts]
+class c {
+    /**
+     * @param {string} [`foo]
+     */
+    method(foo) {
+    }
+}
+
+//// [jsdocParameterParsingInvalidName.js]
+var c = /** @class */ (function () {
+    function c() {
+    }
+    /**
+     * @param {string} [`foo]
+     */
+    c.prototype.method = function (foo) {
+    };
+    return c;
+}());
diff --git a/tests/baselines/reference/jsdocParameterParsingInvalidName.symbols b/tests/baselines/reference/jsdocParameterParsingInvalidName.symbols
new file mode 100644
index 00000000000..037731d2477
--- /dev/null
+++ b/tests/baselines/reference/jsdocParameterParsingInvalidName.symbols
@@ -0,0 +1,12 @@
+=== tests/cases/compiler/jsdocParameterParsingInvalidName.ts ===
+class c {
+>c : Symbol(c, Decl(jsdocParameterParsingInvalidName.ts, 0, 0))
+
+    /**
+     * @param {string} [`foo]
+     */
+    method(foo) {
+>method : Symbol(c.method, Decl(jsdocParameterParsingInvalidName.ts, 0, 9))
+>foo : Symbol(foo, Decl(jsdocParameterParsingInvalidName.ts, 4, 11))
+    }
+}
diff --git a/tests/baselines/reference/jsdocParameterParsingInvalidName.types b/tests/baselines/reference/jsdocParameterParsingInvalidName.types
new file mode 100644
index 00000000000..d6ec561cdf2
--- /dev/null
+++ b/tests/baselines/reference/jsdocParameterParsingInvalidName.types
@@ -0,0 +1,12 @@
+=== tests/cases/compiler/jsdocParameterParsingInvalidName.ts ===
+class c {
+>c : c
+
+    /**
+     * @param {string} [`foo]
+     */
+    method(foo) {
+>method : (foo: any) => void
+>foo : any
+    }
+}
diff --git a/tests/cases/compiler/jsdocParameterParsingInvalidName.ts b/tests/cases/compiler/jsdocParameterParsingInvalidName.ts
new file mode 100644
index 00000000000..6c3c93d182e
--- /dev/null
+++ b/tests/cases/compiler/jsdocParameterParsingInvalidName.ts
@@ -0,0 +1,7 @@
+class c {
+    /**
+     * @param {string} [`foo]
+     */
+    method(foo) {
+    }
+}
\ No newline at end of file

From d8b191a671c9cddd095d52b31c06d89222e5dd77 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Tue, 16 Jul 2019 16:29:52 -0700
Subject: [PATCH 010/151] Improve algorithm for inferring to union types

---
 src/compiler/checker.ts | 51 ++++++++++++++++++++++++++++++++++++++---
 1 file changed, 48 insertions(+), 3 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 06395d935b7..75b12ee37bb 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -15458,6 +15458,7 @@ namespace ts {
             let visited: Map<boolean>;
             let bivariant = false;
             let propagationType: Type;
+            let inferenceCount = 0;
             let allowComplexConstraintInference = true;
             inferFromTypes(originalSource, originalTarget);
 
@@ -15561,6 +15562,7 @@ namespace ts {
                                 clearCachedInferences(inferences);
                             }
                         }
+                        inferenceCount++;
                         return;
                     }
                     else {
@@ -15610,13 +15612,16 @@ namespace ts {
                     inferFromTypes(getTrueTypeFromConditionalType(<ConditionalType>source), getTrueTypeFromConditionalType(<ConditionalType>target));
                     inferFromTypes(getFalseTypeFromConditionalType(<ConditionalType>source), getFalseTypeFromConditionalType(<ConditionalType>target));
                 }
+                else if (target.flags & TypeFlags.Union) {
+                    inferToUnionType(source, <UnionType>target);
+                }
+                else if (target.flags & TypeFlags.Intersection) {
+                    inferToMultipleTypes(source, (<UnionOrIntersectionType>target).types, /*isIntersection*/ true);
+                }
                 else if (target.flags & TypeFlags.Conditional && !contravariant) {
                     const targetTypes = [getTrueTypeFromConditionalType(<ConditionalType>target), getFalseTypeFromConditionalType(<ConditionalType>target)];
                     inferToMultipleTypes(source, targetTypes, /*isIntersection*/ false);
                 }
-                else if (target.flags & TypeFlags.UnionOrIntersection) {
-                    inferToMultipleTypes(source, (<UnionOrIntersectionType>target).types, !!(target.flags & TypeFlags.Intersection));
-                }
                 else if (source.flags & TypeFlags.Union) {
                     // Source is a union or intersection type, infer from each constituent type
                     const sourceTypes = (<UnionOrIntersectionType>source).types;
@@ -15742,6 +15747,46 @@ namespace ts {
                 }
             }
 
+            function inferToUnionType(source: Type, target: UnionType) {
+                const sources = source.flags & TypeFlags.Union ? (<UnionType>source).types : [source];
+                const matched = new Array<boolean>(sources.length);
+                let typeVariableCount = 0;
+                // First infer to types that are not naked type variables. For each source type we
+                // track whether inferences were made from that particular type to some target.
+                for (const t of target.types) {
+                    if (getInferenceInfoForType(t)) {
+                        typeVariableCount++;
+                    }
+                    else {
+                        for (let i = 0; i < sources.length; i++) {
+                            const count = inferenceCount;
+                            inferFromTypes(sources[i], t);
+                            if (count !== inferenceCount) matched[i] = true;
+                        }
+                    }
+                }
+                // If there are naked type variables in the target, create a union of the source types
+                // from which no inferences have been made so far and infer from that union to each naked
+                // type variable. If there is more than one naked type variable, give lower priority to
+                // the inferences as they are less specific.
+                if (typeVariableCount > 0) {
+                    const unmatched = flatMap(sources, (s, i) => matched![i] ? undefined : s);
+                    if (unmatched.length) {
+                        const s = getUnionType(unmatched);
+                        const savePriority = priority;
+                        if (typeVariableCount > 1) {
+                            priority |= InferencePriority.NakedTypeVariable;
+                        }
+                        for (const t of target.types) {
+                            if (getInferenceInfoForType(t)) {
+                                inferFromTypes(s, t);
+                            }
+                        }
+                        priority = savePriority;
+                    }
+                }
+            }
+
             function inferToMappedType(source: Type, target: MappedType, constraintType: Type): boolean {
                 if (constraintType.flags & TypeFlags.Union) {
                     let result = false;

From 049618f7daf63332d7f972eb0ae4e6af3bcd55bd Mon Sep 17 00:00:00 2001
From: Ron Buckton <ron.buckton@microsoft.com>
Date: Tue, 16 Jul 2019 17:16:21 -0700
Subject: [PATCH 011/151] Get contextual type of yield from contextual
 signature of containing function (#32433)

* Get contextual type of yield from contextual signature of containing function

* Add missing baseline
---
 src/compiler/checker.ts                       |  6 +++
 .../reference/generatorTypeCheck25.types      |  6 +--
 .../reference/generatorTypeCheck28.types      |  2 +-
 .../reference/generatorTypeCheck45.types      |  2 +-
 .../reference/generatorTypeCheck46.types      |  2 +-
 .../reference/generatorTypeCheck62.types      |  6 +--
 .../reference/generatorTypeCheck63.types      |  4 +-
 .../generatorYieldContextualType.symbols      | 44 +++++++++++++++++++
 .../generatorYieldContextualType.types        | 38 ++++++++++++++++
 .../types.asyncGenerators.es2018.1.types      | 12 ++---
 .../types.asyncGenerators.es2018.2.types      |  6 +--
 tests/baselines/reference/uniqueSymbols.types |  4 +-
 .../reference/uniqueSymbolsDeclarations.types |  4 +-
 .../generatorYieldContextualType.ts           | 14 ++++++
 14 files changed, 126 insertions(+), 24 deletions(-)
 create mode 100644 tests/baselines/reference/generatorYieldContextualType.symbols
 create mode 100644 tests/baselines/reference/generatorYieldContextualType.types
 create mode 100644 tests/cases/conformance/generators/generatorYieldContextualType.ts

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 06395d935b7..20a4246f372 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -24740,6 +24740,12 @@ namespace ts {
                     || anyType;
             }
 
+            const contextualReturnType = getContextualReturnType(func);
+            if (contextualReturnType) {
+                return getIterationTypeOfGeneratorFunctionReturnType(IterationTypeKind.Next, contextualReturnType, isAsync)
+                    || anyType;
+            }
+
             return anyType;
         }
 
diff --git a/tests/baselines/reference/generatorTypeCheck25.types b/tests/baselines/reference/generatorTypeCheck25.types
index d0498c2da16..12dbfeaede9 100644
--- a/tests/baselines/reference/generatorTypeCheck25.types
+++ b/tests/baselines/reference/generatorTypeCheck25.types
@@ -17,15 +17,15 @@ var g3: () => Iterable<Foo> = function* () {
 >function* () {    yield;    yield new Bar;    yield new Baz;    yield *[new Bar];    yield *[new Baz];} : () => Generator<Bar | Baz, void, undefined>
 
     yield;
->yield : any
+>yield : undefined
 
     yield new Bar;
->yield new Bar : any
+>yield new Bar : undefined
 >new Bar : Bar
 >Bar : typeof Bar
 
     yield new Baz;
->yield new Baz : any
+>yield new Baz : undefined
 >new Baz : Baz
 >Baz : typeof Baz
 
diff --git a/tests/baselines/reference/generatorTypeCheck28.types b/tests/baselines/reference/generatorTypeCheck28.types
index 9cd4e5e82ce..6921c946a39 100644
--- a/tests/baselines/reference/generatorTypeCheck28.types
+++ b/tests/baselines/reference/generatorTypeCheck28.types
@@ -14,7 +14,7 @@ function* g(): IterableIterator<(x: string) => number> {
 >iterator : symbol
 
             yield x => x.length;
->yield x => x.length : any
+>yield x => x.length : undefined
 >x => x.length : (x: string) => number
 >x : string
 >x.length : number
diff --git a/tests/baselines/reference/generatorTypeCheck45.types b/tests/baselines/reference/generatorTypeCheck45.types
index cf409241947..18d3e9a5fc2 100644
--- a/tests/baselines/reference/generatorTypeCheck45.types
+++ b/tests/baselines/reference/generatorTypeCheck45.types
@@ -12,7 +12,7 @@ foo("", function* () { yield x => x.length }, p => undefined); // T is fixed, sh
 >foo : <T, U>(x: T, fun: () => Iterator<(x: T) => U, any, undefined>, fun2: (y: U) => T) => T
 >"" : ""
 >function* () { yield x => x.length } : () => Generator<(x: string) => number, void, unknown>
->yield x => x.length : any
+>yield x => x.length : undefined
 >x => x.length : (x: string) => number
 >x : string
 >x.length : number
diff --git a/tests/baselines/reference/generatorTypeCheck46.types b/tests/baselines/reference/generatorTypeCheck46.types
index cd565d55911..283188193b7 100644
--- a/tests/baselines/reference/generatorTypeCheck46.types
+++ b/tests/baselines/reference/generatorTypeCheck46.types
@@ -24,7 +24,7 @@ foo("", function* () {
 >iterator : symbol
 
             yield x => x.length
->yield x => x.length : any
+>yield x => x.length : undefined
 >x => x.length : (x: string) => number
 >x : string
 >x.length : number
diff --git a/tests/baselines/reference/generatorTypeCheck62.types b/tests/baselines/reference/generatorTypeCheck62.types
index be5635a07fc..ed957295c31 100644
--- a/tests/baselines/reference/generatorTypeCheck62.types
+++ b/tests/baselines/reference/generatorTypeCheck62.types
@@ -32,7 +32,7 @@ export function strategy<T extends StrategicState>(stratName: string, gen: (a: T
 >stratName : string
             }
             yield next;
->yield next : any
+>yield next : undefined
 >next : T
         }
     }
@@ -70,7 +70,7 @@ export const Nothing2: Strategy<State> = strategy("Nothing", function*(state: St
 >state : State
 
     yield state;
->yield state : any
+>yield state : undefined
 >state : State
 
 });
@@ -84,7 +84,7 @@ export const Nothing3: Strategy<State> = strategy("Nothing", function* (state: S
 >state : State
 
     yield ;
->yield : any
+>yield : undefined
 
     return state;
 >state : State
diff --git a/tests/baselines/reference/generatorTypeCheck63.types b/tests/baselines/reference/generatorTypeCheck63.types
index 8a1d03dcb16..64d67083e61 100644
--- a/tests/baselines/reference/generatorTypeCheck63.types
+++ b/tests/baselines/reference/generatorTypeCheck63.types
@@ -32,7 +32,7 @@ export function strategy<T extends StrategicState>(stratName: string, gen: (a: T
 >stratName : string
             }
             yield next;
->yield next : any
+>yield next : undefined
 >next : T
         }
     }
@@ -97,7 +97,7 @@ export const Nothing3: Strategy<State> = strategy("Nothing", function* (state: S
 >state : State
 
     yield state;
->yield state : any
+>yield state : undefined
 >state : State
 
     return 1;
diff --git a/tests/baselines/reference/generatorYieldContextualType.symbols b/tests/baselines/reference/generatorYieldContextualType.symbols
new file mode 100644
index 00000000000..80d20b90d75
--- /dev/null
+++ b/tests/baselines/reference/generatorYieldContextualType.symbols
@@ -0,0 +1,44 @@
+=== tests/cases/conformance/generators/generatorYieldContextualType.ts ===
+declare function f1<T, R, S>(gen: () => Generator<R, T, S>): void;
+>f1 : Symbol(f1, Decl(generatorYieldContextualType.ts, 0, 0))
+>T : Symbol(T, Decl(generatorYieldContextualType.ts, 0, 20))
+>R : Symbol(R, Decl(generatorYieldContextualType.ts, 0, 22))
+>S : Symbol(S, Decl(generatorYieldContextualType.ts, 0, 25))
+>gen : Symbol(gen, Decl(generatorYieldContextualType.ts, 0, 29))
+>Generator : Symbol(Generator, Decl(lib.es2015.generator.d.ts, --, --))
+>R : Symbol(R, Decl(generatorYieldContextualType.ts, 0, 22))
+>T : Symbol(T, Decl(generatorYieldContextualType.ts, 0, 20))
+>S : Symbol(S, Decl(generatorYieldContextualType.ts, 0, 25))
+
+f1<0, 0, 1>(function* () {
+>f1 : Symbol(f1, Decl(generatorYieldContextualType.ts, 0, 0))
+
+	const a = yield 0;
+>a : Symbol(a, Decl(generatorYieldContextualType.ts, 2, 6))
+
+	return 0;
+});
+
+declare function f2<T, R, S>(gen: () => Generator<R, T, S> | AsyncGenerator<R, T, S>): void;
+>f2 : Symbol(f2, Decl(generatorYieldContextualType.ts, 4, 3))
+>T : Symbol(T, Decl(generatorYieldContextualType.ts, 6, 20))
+>R : Symbol(R, Decl(generatorYieldContextualType.ts, 6, 22))
+>S : Symbol(S, Decl(generatorYieldContextualType.ts, 6, 25))
+>gen : Symbol(gen, Decl(generatorYieldContextualType.ts, 6, 29))
+>Generator : Symbol(Generator, Decl(lib.es2015.generator.d.ts, --, --))
+>R : Symbol(R, Decl(generatorYieldContextualType.ts, 6, 22))
+>T : Symbol(T, Decl(generatorYieldContextualType.ts, 6, 20))
+>S : Symbol(S, Decl(generatorYieldContextualType.ts, 6, 25))
+>AsyncGenerator : Symbol(AsyncGenerator, Decl(lib.es2018.asyncgenerator.d.ts, --, --))
+>R : Symbol(R, Decl(generatorYieldContextualType.ts, 6, 22))
+>T : Symbol(T, Decl(generatorYieldContextualType.ts, 6, 20))
+>S : Symbol(S, Decl(generatorYieldContextualType.ts, 6, 25))
+
+f2<0, 0, 1>(async function* () {
+>f2 : Symbol(f2, Decl(generatorYieldContextualType.ts, 4, 3))
+
+	const a = yield 0;
+>a : Symbol(a, Decl(generatorYieldContextualType.ts, 8, 6))
+
+	return 0;
+});
diff --git a/tests/baselines/reference/generatorYieldContextualType.types b/tests/baselines/reference/generatorYieldContextualType.types
new file mode 100644
index 00000000000..5caccffa933
--- /dev/null
+++ b/tests/baselines/reference/generatorYieldContextualType.types
@@ -0,0 +1,38 @@
+=== tests/cases/conformance/generators/generatorYieldContextualType.ts ===
+declare function f1<T, R, S>(gen: () => Generator<R, T, S>): void;
+>f1 : <T, R, S>(gen: () => Generator<R, T, S>) => void
+>gen : () => Generator<R, T, S>
+
+f1<0, 0, 1>(function* () {
+>f1<0, 0, 1>(function* () {	const a = yield 0;	return 0;}) : void
+>f1 : <T, R, S>(gen: () => Generator<R, T, S>) => void
+>function* () {	const a = yield 0;	return 0;} : () => Generator<0, 0, unknown>
+
+	const a = yield 0;
+>a : 1
+>yield 0 : 1
+>0 : 0
+
+	return 0;
+>0 : 0
+
+});
+
+declare function f2<T, R, S>(gen: () => Generator<R, T, S> | AsyncGenerator<R, T, S>): void;
+>f2 : <T, R, S>(gen: () => Generator<R, T, S> | AsyncGenerator<R, T, S>) => void
+>gen : () => Generator<R, T, S> | AsyncGenerator<R, T, S>
+
+f2<0, 0, 1>(async function* () {
+>f2<0, 0, 1>(async function* () {	const a = yield 0;	return 0;}) : void
+>f2 : <T, R, S>(gen: () => Generator<R, T, S> | AsyncGenerator<R, T, S>) => void
+>async function* () {	const a = yield 0;	return 0;} : () => AsyncGenerator<0, 0, unknown>
+
+	const a = yield 0;
+>a : 1
+>yield 0 : 1
+>0 : 0
+
+	return 0;
+>0 : 0
+
+});
diff --git a/tests/baselines/reference/types.asyncGenerators.es2018.1.types b/tests/baselines/reference/types.asyncGenerators.es2018.1.types
index ad35f2a796f..24da9312c15 100644
--- a/tests/baselines/reference/types.asyncGenerators.es2018.1.types
+++ b/tests/baselines/reference/types.asyncGenerators.es2018.1.types
@@ -78,7 +78,7 @@ const assignability1: () => AsyncIterableIterator<number> = async function * ()
 >async function * () {    yield 1;} : () => AsyncGenerator<number, void, unknown>
 
     yield 1;
->yield 1 : any
+>yield 1 : undefined
 >1 : 1
 
 };
@@ -87,7 +87,7 @@ const assignability2: () => AsyncIterableIterator<number> = async function * ()
 >async function * () {    yield Promise.resolve(1);} : () => AsyncGenerator<number, void, unknown>
 
     yield Promise.resolve(1);
->yield Promise.resolve(1) : any
+>yield Promise.resolve(1) : undefined
 >Promise.resolve(1) : Promise<number>
 >Promise.resolve : { <T>(value: T | PromiseLike<T>): Promise<T>; (): Promise<void>; }
 >Promise : PromiseConstructor
@@ -138,7 +138,7 @@ const assignability6: () => AsyncIterable<number> = async function * () {
 >async function * () {    yield 1;} : () => AsyncGenerator<number, void, unknown>
 
     yield 1;
->yield 1 : any
+>yield 1 : undefined
 >1 : 1
 
 };
@@ -147,7 +147,7 @@ const assignability7: () => AsyncIterable<number> = async function * () {
 >async function * () {    yield Promise.resolve(1);} : () => AsyncGenerator<number, void, unknown>
 
     yield Promise.resolve(1);
->yield Promise.resolve(1) : any
+>yield Promise.resolve(1) : undefined
 >Promise.resolve(1) : Promise<number>
 >Promise.resolve : { <T>(value: T | PromiseLike<T>): Promise<T>; (): Promise<void>; }
 >Promise : PromiseConstructor
@@ -198,7 +198,7 @@ const assignability11: () => AsyncIterator<number> = async function * () {
 >async function * () {    yield 1;} : () => AsyncGenerator<number, void, unknown>
 
     yield 1;
->yield 1 : any
+>yield 1 : undefined
 >1 : 1
 
 };
@@ -207,7 +207,7 @@ const assignability12: () => AsyncIterator<number> = async function * () {
 >async function * () {    yield Promise.resolve(1);} : () => AsyncGenerator<number, void, unknown>
 
     yield Promise.resolve(1);
->yield Promise.resolve(1) : any
+>yield Promise.resolve(1) : undefined
 >Promise.resolve(1) : Promise<number>
 >Promise.resolve : { <T>(value: T | PromiseLike<T>): Promise<T>; (): Promise<void>; }
 >Promise : PromiseConstructor
diff --git a/tests/baselines/reference/types.asyncGenerators.es2018.2.types b/tests/baselines/reference/types.asyncGenerators.es2018.2.types
index 23bf7225eb9..022ddd297a2 100644
--- a/tests/baselines/reference/types.asyncGenerators.es2018.2.types
+++ b/tests/baselines/reference/types.asyncGenerators.es2018.2.types
@@ -32,7 +32,7 @@ const assignability1: () => AsyncIterableIterator<number> = async function * ()
 >async function * () {    yield "a";} : () => AsyncGenerator<string, void, unknown>
 
     yield "a";
->yield "a" : any
+>yield "a" : undefined
 >"a" : "a"
 
 };
@@ -65,7 +65,7 @@ const assignability4: () => AsyncIterable<number> = async function * () {
 >async function * () {    yield "a";} : () => AsyncGenerator<string, void, unknown>
 
     yield "a";
->yield "a" : any
+>yield "a" : undefined
 >"a" : "a"
 
 };
@@ -98,7 +98,7 @@ const assignability7: () => AsyncIterator<number> = async function * () {
 >async function * () {    yield "a";} : () => AsyncGenerator<string, void, unknown>
 
     yield "a";
->yield "a" : any
+>yield "a" : undefined
 >"a" : "a"
 
 };
diff --git a/tests/baselines/reference/uniqueSymbols.types b/tests/baselines/reference/uniqueSymbols.types
index da2f9895218..02ededf7b1f 100644
--- a/tests/baselines/reference/uniqueSymbols.types
+++ b/tests/baselines/reference/uniqueSymbols.types
@@ -839,7 +839,7 @@ const o3: Context = {
 >method3 : () => AsyncGenerator<unique symbol, void, unknown>
 
         yield s; // yield type should not widen due to contextual type
->yield s : any
+>yield s : undefined
 >s : unique symbol
 
     },
@@ -847,7 +847,7 @@ const o3: Context = {
 >method4 : () => Generator<unique symbol, void, unknown>
 
         yield s; // yield type should not widen due to contextual type
->yield s : any
+>yield s : undefined
 >s : unique symbol
 
     },
diff --git a/tests/baselines/reference/uniqueSymbolsDeclarations.types b/tests/baselines/reference/uniqueSymbolsDeclarations.types
index b8c32385f4b..db198153153 100644
--- a/tests/baselines/reference/uniqueSymbolsDeclarations.types
+++ b/tests/baselines/reference/uniqueSymbolsDeclarations.types
@@ -832,7 +832,7 @@ const o4: Context = {
 >method3 : () => AsyncGenerator<unique symbol, void, unknown>
 
         yield s; // yield type should not widen due to contextual type
->yield s : any
+>yield s : undefined
 >s : unique symbol
 
     },
@@ -840,7 +840,7 @@ const o4: Context = {
 >method4 : () => Generator<unique symbol, void, unknown>
 
         yield s; // yield type should not widen due to contextual type
->yield s : any
+>yield s : undefined
 >s : unique symbol
 
     },
diff --git a/tests/cases/conformance/generators/generatorYieldContextualType.ts b/tests/cases/conformance/generators/generatorYieldContextualType.ts
new file mode 100644
index 00000000000..20cad6a9189
--- /dev/null
+++ b/tests/cases/conformance/generators/generatorYieldContextualType.ts
@@ -0,0 +1,14 @@
+// @target: esnext
+// @strict: true
+// @noEmit: true
+declare function f1<T, R, S>(gen: () => Generator<R, T, S>): void;
+f1<0, 0, 1>(function* () {
+	const a = yield 0;
+	return 0;
+});
+
+declare function f2<T, R, S>(gen: () => Generator<R, T, S> | AsyncGenerator<R, T, S>): void;
+f2<0, 0, 1>(async function* () {
+	const a = yield 0;
+	return 0;
+});
\ No newline at end of file

From e6c723dd2aefc851642ba3b7c534986ae33f3d9b Mon Sep 17 00:00:00 2001
From: csigs <csigs@outlook.com>
Date: Wed, 17 Jul 2019 16:10:08 +0000
Subject: [PATCH 012/151] LEGO: check in for master to temporary branch.

---
 .../diagnosticMessages.generated.json.lcl                   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/loc/lcl/ita/diagnosticMessages/diagnosticMessages.generated.json.lcl b/src/loc/lcl/ita/diagnosticMessages/diagnosticMessages.generated.json.lcl
index 2c25256b224..07839d24475 100644
--- a/src/loc/lcl/ita/diagnosticMessages/diagnosticMessages.generated.json.lcl
+++ b/src/loc/lcl/ita/diagnosticMessages/diagnosticMessages.generated.json.lcl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <LCX SchemaVersion="6.0" Name="f:\ddSetup\sources\typescript\localization\compiler2.resx" PsrId="306" FileType="1" SrcCul="en-US" TgtCul="it-IT" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
   <Props>
     <Str Name="CustomName1" Val="Custom 1" />
@@ -3301,7 +3301,7 @@
         <Str Cat="Text">
           <Val><![CDATA[Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Crea l'origine unitamente alle mappe di origine all'interno di un unico file. Richiede l'impostazione di '--inlineSourceMap' o '--sourceMap'.]]></Val>
+            <Val><![CDATA[Crea l'origine unitamente ai mapping di origine all'interno di un unico file. Richiede l'impostazione di '--inlineSourceMap' o '--sourceMap'.]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />
@@ -4123,7 +4123,7 @@
         <Str Cat="Text">
           <Val><![CDATA[Generates a sourcemap for each corresponding '.d.ts' file.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Genera un sourcemap per ogni file '.d.ts' corrispondente.]]></Val>
+            <Val><![CDATA[Genera un mapping di origine per ogni file '.d.ts' corrispondente.]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />

From 246610957772c8801457ec9c8f32b0686edc0716 Mon Sep 17 00:00:00 2001
From: Andrew Branch <andrewbranch@users.noreply.github.com>
Date: Wed, 17 Jul 2019 13:07:10 -0700
Subject: [PATCH 013/151] Fix build/lint due to differences in master and LKG
 (#32450)

---
 src/compiler/emitter.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index a1207c9b892..8681a452e2a 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -411,7 +411,11 @@ namespace ts {
                     }
                 );
                 if (emitOnlyDtsFiles && declarationTransform.transformed[0].kind === SyntaxKind.SourceFile) {
-                    const sourceFile = declarationTransform.transformed[0] as SourceFile;
+                    // Improved narrowing in master/3.6 makes this cast unnecessary, triggering a lint rule.
+                    // But at the same time, the LKG (3.5) necessitates it because it doesn’t narrow.
+                    // Once the LKG is updated to 3.6, this comment, the cast to `SourceFile`, and the
+                    // tslint directive can be all be removed.
+                    const sourceFile = declarationTransform.transformed[0] as SourceFile; // tslint:disable-line
                     exportedModulesFromDeclarationEmit = sourceFile.exportedModulesFromDeclarationEmit;
                 }
             }

From 8f2ed0ded88a978c283eab9a9184729b6f7e009f Mon Sep 17 00:00:00 2001
From: Milosz Piechocki <miloszpp@gmail.com>
Date: Wed, 17 Jul 2019 22:22:53 +0200
Subject: [PATCH 014/151] addTypeToIntersection performance improvement
 (#32388)

---
 src/compiler/checker.ts | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 20a4246f372..1d6b9e842cc 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -9890,7 +9890,7 @@ namespace ts {
             return links.resolvedType;
         }
 
-        function addTypeToIntersection(typeSet: Type[], includes: TypeFlags, type: Type) {
+        function addTypeToIntersection(typeSet: Map<Type>, includes: TypeFlags, type: Type) {
             const flags = type.flags;
             if (flags & TypeFlags.Intersection) {
                 return addTypesToIntersection(typeSet, includes, (<IntersectionType>type).types);
@@ -9898,20 +9898,20 @@ namespace ts {
             if (isEmptyAnonymousObjectType(type)) {
                 if (!(includes & TypeFlags.IncludesEmptyObject)) {
                     includes |= TypeFlags.IncludesEmptyObject;
-                    typeSet.push(type);
+                    typeSet.set(type.id.toString(), type);
                 }
             }
             else {
                 if (flags & TypeFlags.AnyOrUnknown) {
                     if (type === wildcardType) includes |= TypeFlags.IncludesWildcard;
                 }
-                else if ((strictNullChecks || !(flags & TypeFlags.Nullable)) && !contains(typeSet, type)) {
+                else if ((strictNullChecks || !(flags & TypeFlags.Nullable)) && !typeSet.has(type.id.toString())) {
                     if (type.flags & TypeFlags.Unit && includes & TypeFlags.Unit) {
                         // We have seen two distinct unit types which means we should reduce to an
                         // empty intersection. Adding TypeFlags.NonPrimitive causes that to happen.
                         includes |= TypeFlags.NonPrimitive;
                     }
-                    typeSet.push(type);
+                    typeSet.set(type.id.toString(), type);
                 }
                 includes |= flags & TypeFlags.IncludesMask;
             }
@@ -9920,7 +9920,7 @@ namespace ts {
 
         // Add the given types to the given type set. Order is preserved, freshness is removed from literal
         // types, duplicates are removed, and nested types of the given kind are flattened into the set.
-        function addTypesToIntersection(typeSet: Type[], includes: TypeFlags, types: ReadonlyArray<Type>) {
+        function addTypesToIntersection(typeSet: Map<Type>, includes: TypeFlags, types: ReadonlyArray<Type>) {
             for (const type of types) {
                 includes = addTypeToIntersection(typeSet, includes, getRegularTypeOfLiteralType(type));
             }
@@ -10027,8 +10027,9 @@ namespace ts {
         // Also, unlike union types, the order of the constituent types is preserved in order that overload resolution
         // for intersections of types with signatures can be deterministic.
         function getIntersectionType(types: ReadonlyArray<Type>, aliasSymbol?: Symbol, aliasTypeArguments?: ReadonlyArray<Type>): Type {
-            const typeSet: Type[] = [];
-            const includes = addTypesToIntersection(typeSet, 0, types);
+            const typeMembershipMap: Map<Type> = createMap();
+            const includes = addTypesToIntersection(typeMembershipMap, 0, types);
+            const typeSet: Type[] = arrayFrom(typeMembershipMap.values());
             // An intersection type is considered empty if it contains
             // the type never, or
             // more than one unit type or,

From ddbf7e198d8a01967f2d20366dfeb8ad07a28543 Mon Sep 17 00:00:00 2001
From: 0verk1ll <example@example.com>
Date: Wed, 17 Jul 2019 16:57:25 -0400
Subject: [PATCH 015/151] Add Semicolons to Gulpfile.js

---
 Gulpfile.js | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/Gulpfile.js b/Gulpfile.js
index 42987e4fd8d..d5c40a1625d 100644
--- a/Gulpfile.js
+++ b/Gulpfile.js
@@ -41,7 +41,7 @@ const generateLibs = () => {
             .pipe(concat(relativeTarget, { newLine: "\n\n" }))
             .pipe(dest("built/local"))));
 };
-task("lib", generateLibs)
+task("lib", generateLibs);
 task("lib").description = "Builds the library targets";
 
 const cleanLib = () => del(libs.map(lib => lib.target));
@@ -168,7 +168,7 @@ task("services", series(preBuild, buildServices));
 task("services").description = "Builds the language service";
 task("services").flags = {
     "   --built": "Compile using the built version of the compiler."
-}
+};
 
 const cleanServices = async () => {
     if (fs.existsSync("built/local/typescriptServices.tsconfig.json")) {
@@ -200,14 +200,14 @@ task("watch-services", series(preBuild, parallel(watchLib, watchDiagnostics, wat
 task("watch-services").description = "Watches for changes and rebuild language service only";
 task("watch-services").flags = {
     "   --built": "Compile using the built version of the compiler."
-}
+};
 
 const buildServer = () => buildProject("src/tsserver", cmdLineOptions);
 task("tsserver", series(preBuild, buildServer));
 task("tsserver").description = "Builds the language server";
 task("tsserver").flags = {
     "   --built": "Compile using the built version of the compiler."
-}
+};
 
 const cleanServer = () => cleanProject("src/tsserver");
 cleanTasks.push(cleanServer);
@@ -219,13 +219,13 @@ task("watch-tsserver", series(preBuild, parallel(watchLib, watchDiagnostics, wat
 task("watch-tsserver").description = "Watch for changes and rebuild the language server only";
 task("watch-tsserver").flags = {
     "   --built": "Compile using the built version of the compiler."
-}
+};
 
 task("min", series(preBuild, parallel(buildTsc, buildServer)));
 task("min").description = "Builds only tsc and tsserver";
 task("min").flags = {
     "   --built": "Compile using the built version of the compiler."
-}
+};
 
 task("clean-min", series(cleanTsc, cleanServer));
 task("clean-min").description = "Cleans outputs for tsc and tsserver";
@@ -234,7 +234,7 @@ task("watch-min", series(preBuild, parallel(watchLib, watchDiagnostics, watchTsc
 task("watch-min").description = "Watches for changes to a tsc and tsserver only";
 task("watch-min").flags = {
     "   --built": "Compile using the built version of the compiler."
-}
+};
 
 const buildLssl = (() => {
     // build tsserverlibrary.out.js
@@ -268,7 +268,7 @@ task("lssl", series(preBuild, buildLssl));
 task("lssl").description = "Builds language service server library";
 task("lssl").flags = {
     "   --built": "Compile using the built version of the compiler."
-}
+};
 
 const cleanLssl = async () => {
     if (fs.existsSync("built/local/tsserverlibrary.tsconfig.json")) {
@@ -302,14 +302,14 @@ task("watch-lssl", series(preBuild, parallel(watchLib, watchDiagnostics, watchLs
 task("watch-lssl").description = "Watch for changes and rebuild tsserverlibrary only";
 task("watch-lssl").flags = {
     "   --built": "Compile using the built version of the compiler."
-}
+};
 
 const buildTests = () => buildProject("src/testRunner");
 task("tests", series(preBuild, parallel(buildLssl, buildTests)));
 task("tests").description = "Builds the test infrastructure";
 task("tests").flags = {
     "   --built": "Compile using the built version of the compiler."
-}
+};
 
 const cleanTests = () => cleanProject("src/testRunner");
 cleanTasks.push(cleanTests);
@@ -381,13 +381,13 @@ task("local", series(buildFoldStart, preBuild, parallel(localize, buildTsc, buil
 task("local").description = "Builds the full compiler and services";
 task("local").flags = {
     "   --built": "Compile using the built version of the compiler."
-}
+};
 
 task("watch-local", series(preBuild, parallel(watchLib, watchDiagnostics, watchTsc, watchServices, watchServer, watchLssl)));
 task("watch-local").description = "Watches for changes to projects in src/ (but does not execute tests).";
 task("watch-local").flags = {
     "   --built": "Compile using the built version of the compiler."
-}
+};
 
 const generateCodeCoverage = () => exec("istanbul", ["cover", "node_modules/mocha/bin/_mocha", "--", "-R", "min", "-t", "" + cmdLineOptions.testTimeout, "built/local/run.js"]);
 task("generate-code-coverage", series(preBuild, buildTests, generateCodeCoverage));
@@ -417,7 +417,7 @@ task("runtests").flags = {
     "   --built": "Compile using the built version of the compiler.",
     "   --shards": "Total number of shards running tests (default: 1)",
     "   --shardId": "1-based ID of this shard (default: 1)",
-}
+};
 
 const runTestsParallel = () => runConsoleTests("built/local/run.js", "min", /*runInParallel*/ true, /*watchMode*/ false);
 task("runtests-parallel", series(preBuild, preTest, runTestsParallel, postTest));
@@ -478,7 +478,7 @@ task("tsc-instrumented", series(lkgPreBuild, parallel(localize, buildTsc, buildS
 task("tsc-instrumented").description = "Builds an instrumented tsc.js";
 task("tsc-instrumented").flags = {
     "-t --tests=<testname>": "The test to run."
-}
+};
 
 // TODO(rbuckton): Determine if we still need this task. Depending on a relative
 //                 path here seems like a bad idea.
@@ -533,7 +533,7 @@ task("LKG", series(lkgPreBuild, parallel(localize, buildTsc, buildServer, buildS
 task("LKG").description = "Makes a new LKG out of the built js files";
 task("LKG").flags = {
     "   --built": "Compile using the built version of the compiler.",
-}
+};
 
 const generateSpec = () => exec("cscript", ["//nologo", "scripts/word2md.js", path.resolve("doc/TypeScript Language Specification.docx"), path.resolve("doc/spec.md")]);
 task("generate-spec", series(buildScripts, generateSpec));
@@ -542,15 +542,15 @@ task("generate-spec").description = "Generates a Markdown version of the Languag
 task("clean", series(parallel(cleanTasks), cleanBuilt));
 task("clean").description = "Cleans build outputs";
 
-const configureNightly = () => exec(process.execPath, ["scripts/configurePrerelease.js", "dev", "package.json", "src/compiler/core.ts"])
+const configureNightly = () => exec(process.execPath, ["scripts/configurePrerelease.js", "dev", "package.json", "src/compiler/core.ts"]);
 task("configure-nightly", series(buildScripts, configureNightly));
 task("configure-nightly").description = "Runs scripts/configurePrerelease.ts to prepare a build for nightly publishing";
 
-const configureInsiders = () => exec(process.execPath, ["scripts/configurePrerelease.js", "insiders", "package.json", "src/compiler/core.ts"])
+const configureInsiders = () => exec(process.execPath, ["scripts/configurePrerelease.js", "insiders", "package.json", "src/compiler/core.ts"]);
 task("configure-insiders", series(buildScripts, configureInsiders));
 task("configure-insiders").description = "Runs scripts/configurePrerelease.ts to prepare a build for insiders publishing";
 
-const configureExperimental = () => exec(process.execPath, ["scripts/configurePrerelease.js", "experimental", "package.json", "src/compiler/core.ts"])
+const configureExperimental = () => exec(process.execPath, ["scripts/configurePrerelease.js", "experimental", "package.json", "src/compiler/core.ts"]);
 task("configure-experimental", series(buildScripts, configureExperimental));
 task("configure-experimental").description = "Runs scripts/configurePrerelease.ts to prepare a build for experimental publishing";
 

From 387c917765793773a6f7184bab84e6f5956f44fc Mon Sep 17 00:00:00 2001
From: Andrew Branch <andrewbranch@users.noreply.github.com>
Date: Wed, 17 Jul 2019 14:02:18 -0700
Subject: [PATCH 016/151] =?UTF-8?q?Revert=20"Proposal:=20If=20there?=
 =?UTF-8?q?=E2=80=99s=20a=20package.json,=20only=20auto-import=20things=20?=
 =?UTF-8?q?in=20it,=20more=20or=20less=20(#31893)"=20(#32448)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 60a1b1dc1a93ca792cf12bb0432cf7bc134c3ad1.
---
 src/compiler/utilities.ts                     |   2 +-
 src/harness/fourslash.ts                      |   2 +-
 src/services/codefixes/importFixes.ts         | 124 +-------------
 src/services/completions.ts                   | 152 ++++--------------
 src/services/services.ts                      |   2 +-
 src/services/stringCompletions.ts             |  49 ++++++
 src/services/utilities.ts                     |  49 ------
 ...rt_filteredByPackageJson_@typesImplicit.ts |  44 -----
 ...Import_filteredByPackageJson_@typesOnly.ts |  44 -----
 ...onsImport_filteredByPackageJson_ambient.ts |  30 ----
 ...ionsImport_filteredByPackageJson_direct.ts |  46 ------
 ...ionsImport_filteredByPackageJson_nested.ts |  66 --------
 ...nsImport_filteredByPackageJson_reexport.ts |  58 -------
 ...sImport_filteredByPackageJson_reexport2.ts |  58 -------
 ...sImport_filteredByPackageJson_reexport3.ts |  48 ------
 ...sImport_filteredByPackageJson_reexport4.ts |  57 -------
 .../fourslash/completionsImport_ofAlias.ts    |  17 +-
 .../importNameCodeFixNewImportNodeModules8.ts |   2 +-
 18 files changed, 98 insertions(+), 752 deletions(-)
 delete mode 100644 tests/cases/fourslash/completionsImport_filteredByPackageJson_@typesImplicit.ts
 delete mode 100644 tests/cases/fourslash/completionsImport_filteredByPackageJson_@typesOnly.ts
 delete mode 100644 tests/cases/fourslash/completionsImport_filteredByPackageJson_ambient.ts
 delete mode 100644 tests/cases/fourslash/completionsImport_filteredByPackageJson_direct.ts
 delete mode 100644 tests/cases/fourslash/completionsImport_filteredByPackageJson_nested.ts
 delete mode 100644 tests/cases/fourslash/completionsImport_filteredByPackageJson_reexport.ts
 delete mode 100644 tests/cases/fourslash/completionsImport_filteredByPackageJson_reexport2.ts
 delete mode 100644 tests/cases/fourslash/completionsImport_filteredByPackageJson_reexport3.ts
 delete mode 100644 tests/cases/fourslash/completionsImport_filteredByPackageJson_reexport4.ts

diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index fb5c69c6375..f3282d43723 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -7485,7 +7485,7 @@ namespace ts {
     export function getDirectoryPath(path: Path): Path;
     /**
      * Returns the path except for its basename. Semantics align with NodeJS's `path.dirname`
-     * except that we support URLs as well.
+     * except that we support URL's as well.
      *
      * ```ts
      * getDirectoryPath("/path/to/file.ext") === "/path/to"
diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts
index 919352e1391..aa764e74cdc 100644
--- a/src/harness/fourslash.ts
+++ b/src/harness/fourslash.ts
@@ -798,7 +798,7 @@ namespace FourSlash {
                         const name = typeof include === "string" ? include : include.name;
                         const found = nameToEntries.get(name);
                         if (!found) throw this.raiseError(`No completion ${name} found`);
-                        assert(found.length === 1, `Must use 'exact' for multiple completions with same name: '${name}'`);
+                        assert(found.length === 1); // Must use 'exact' for multiple completions with same name
                         this.verifyCompletionEntry(ts.first(found), include);
                     }
                 }
diff --git a/src/services/codefixes/importFixes.ts b/src/services/codefixes/importFixes.ts
index 2fcc8cf5ccb..8006d1a0cfd 100644
--- a/src/services/codefixes/importFixes.ts
+++ b/src/services/codefixes/importFixes.ts
@@ -283,25 +283,13 @@ namespace ts.codefix {
         preferences: UserPreferences,
     ): ReadonlyArray<FixAddNewImport | FixUseImportType> {
         const isJs = isSourceFileJS(sourceFile);
-        const { allowsImporting } = createLazyPackageJsonDependencyReader(sourceFile, host);
         const choicesForEachExportingModule = flatMap(moduleSymbols, ({ moduleSymbol, importKind, exportedSymbolIsTypeOnly }) =>
             moduleSpecifiers.getModuleSpecifiers(moduleSymbol, program.getCompilerOptions(), sourceFile, host, program.getSourceFiles(), preferences, program.redirectTargetsMap)
             .map((moduleSpecifier): FixAddNewImport | FixUseImportType =>
                 // `position` should only be undefined at a missing jsx namespace, in which case we shouldn't be looking for pure types.
                 exportedSymbolIsTypeOnly && isJs ? { kind: ImportFixKind.ImportType, moduleSpecifier, position: Debug.assertDefined(position) } : { kind: ImportFixKind.AddNew, moduleSpecifier, importKind }));
-
-        // Sort by presence in package.json, then shortest paths first
-        return sort(choicesForEachExportingModule, (a, b) => {
-            const allowsImportingA = allowsImporting(a.moduleSpecifier);
-            const allowsImportingB = allowsImporting(b.moduleSpecifier);
-            if (allowsImportingA && !allowsImportingB) {
-                return -1;
-            }
-            if (allowsImportingB && !allowsImportingA) {
-                return 1;
-            }
-            return a.moduleSpecifier.length - b.moduleSpecifier.length;
-        });
+        // Sort to keep the shortest paths first
+        return sort(choicesForEachExportingModule, (a, b) => a.moduleSpecifier.length - b.moduleSpecifier.length);
     }
 
     function getFixesForAddImport(
@@ -392,8 +380,7 @@ namespace ts.codefix {
         // "default" is a keyword and not a legal identifier for the import, so we don't expect it here
         Debug.assert(symbolName !== InternalSymbolName.Default);
 
-        const exportInfos = getExportInfos(symbolName, getMeaningFromLocation(symbolToken), cancellationToken, sourceFile, checker, program, preferences, host);
-        const fixes = arrayFrom(flatMapIterator(exportInfos.entries(), ([_, exportInfos]) =>
+        const fixes = arrayFrom(flatMapIterator(getExportInfos(symbolName, getMeaningFromLocation(symbolToken), cancellationToken, sourceFile, checker, program).entries(), ([_, exportInfos]) =>
             getFixForImport(exportInfos, symbolName, symbolToken.getStart(sourceFile), program, sourceFile, host, preferences)));
         return { fixes, symbolName };
     }
@@ -406,8 +393,6 @@ namespace ts.codefix {
         sourceFile: SourceFile,
         checker: TypeChecker,
         program: Program,
-        preferences: UserPreferences,
-        host: LanguageServiceHost
     ): ReadonlyMap<ReadonlyArray<SymbolExportInfo>> {
         // For each original symbol, keep all re-exports of that symbol together so we can call `getCodeActionsForImport` on the whole group at once.
         // Maps symbol id to info for modules providing that symbol (original export + re-exports).
@@ -415,7 +400,7 @@ namespace ts.codefix {
         function addSymbol(moduleSymbol: Symbol, exportedSymbol: Symbol, importKind: ImportKind): void {
             originalSymbolToExportInfos.add(getUniqueSymbolId(exportedSymbol, checker).toString(), { moduleSymbol, importKind, exportedSymbolIsTypeOnly: isTypeOnlySymbol(exportedSymbol, checker) });
         }
-        forEachExternalModuleToImportFrom(checker, host, preferences, program.redirectTargetsMap, sourceFile, program.getSourceFiles(), moduleSymbol => {
+        forEachExternalModuleToImportFrom(checker, sourceFile, program.getSourceFiles(), moduleSymbol => {
             cancellationToken.throwIfCancellationRequested();
 
             const defaultInfo = getDefaultLikeExportInfo(moduleSymbol, checker, program.getCompilerOptions());
@@ -576,44 +561,12 @@ namespace ts.codefix {
         return some(declarations, decl => !!(getMeaningFromDeclaration(decl) & meaning));
     }
 
-    export function forEachExternalModuleToImportFrom(checker: TypeChecker, host: LanguageServiceHost, preferences: UserPreferences, redirectTargetsMap: RedirectTargetsMap, from: SourceFile, allSourceFiles: ReadonlyArray<SourceFile>, cb: (module: Symbol) => void) {
-        const { allowsImporting } = createLazyPackageJsonDependencyReader(from, host);
-        const compilerOptions = host.getCompilationSettings();
-        const getCanonicalFileName = hostGetCanonicalFileName(host);
+    export function forEachExternalModuleToImportFrom(checker: TypeChecker, from: SourceFile, allSourceFiles: ReadonlyArray<SourceFile>, cb: (module: Symbol) => void) {
         forEachExternalModule(checker, allSourceFiles, (module, sourceFile) => {
-            if (sourceFile === undefined && allowsImporting(stripQuotes(module.getName()))) {
+            if (sourceFile === undefined || sourceFile !== from && isImportablePath(from.fileName, sourceFile.fileName)) {
                 cb(module);
             }
-            else if (sourceFile && sourceFile !== from && isImportablePath(from.fileName, sourceFile.fileName)) {
-                const moduleSpecifier = getNodeModulesPackageNameFromFileName(sourceFile.fileName);
-                if (!moduleSpecifier || allowsImporting(moduleSpecifier)) {
-                    cb(module);
-                }
-            }
         });
-
-        function getNodeModulesPackageNameFromFileName(importedFileName: string): string | undefined {
-            const specifier = moduleSpecifiers.getModuleSpecifier(
-                compilerOptions,
-                from,
-                toPath(from.fileName, /*basePath*/ undefined, getCanonicalFileName),
-                importedFileName,
-                host,
-                allSourceFiles,
-                preferences,
-                redirectTargetsMap);
-
-            // Paths here are not node_modules, so we don’t care about them;
-            // returning anything will trigger a lookup in package.json.
-            if (!pathIsRelative(specifier) && !isRootedDiskPath(specifier)) {
-                const components = getPathComponents(getPackageNameFromTypesPackageName(specifier)).slice(1);
-                // Scoped packages
-                if (startsWith(components[0], "@")) {
-                    return `${components[0]}/${components[1]}`;
-                }
-                return components[0];
-            }
-        }
     }
 
     function forEachExternalModule(checker: TypeChecker, allSourceFiles: ReadonlyArray<SourceFile>, cb: (module: Symbol, sourceFile: SourceFile | undefined) => void) {
@@ -667,69 +620,4 @@ namespace ts.codefix {
         // Need `|| "_"` to ensure result isn't empty.
         return !isStringANonContextualKeyword(res) ? res || "_" : `_${res}`;
     }
-
-    function createLazyPackageJsonDependencyReader(fromFile: SourceFile, host: LanguageServiceHost) {
-        const packageJsonPaths = findPackageJsons(getDirectoryPath(fromFile.fileName), host);
-        const dependencyIterator = readPackageJsonDependencies(host, packageJsonPaths);
-        let seenDeps: Map<true> | undefined;
-        let usesNodeCoreModules: boolean | undefined;
-        return { allowsImporting };
-
-        function containsDependency(dependency: string) {
-            if ((seenDeps || (seenDeps = createMap())).has(dependency)) {
-                return true;
-            }
-            let packageName: string | void;
-            while (packageName = dependencyIterator.next().value) {
-                seenDeps.set(packageName, true);
-                if (packageName === dependency) {
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        function allowsImporting(moduleSpecifier: string): boolean {
-            if (!packageJsonPaths.length) {
-                return true;
-            }
-
-            // If we’re in JavaScript, it can be difficult to tell whether the user wants to import
-            // from Node core modules or not. We can start by seeing if the user is actually using
-            // any node core modules, as opposed to simply having @types/node accidentally as a
-            // dependency of a dependency.
-            if (isSourceFileJS(fromFile) && JsTyping.nodeCoreModules.has(moduleSpecifier)) {
-                if (usesNodeCoreModules === undefined) {
-                    usesNodeCoreModules = consumesNodeCoreModules(fromFile);
-                }
-                if (usesNodeCoreModules) {
-                    return true;
-                }
-            }
-
-            return containsDependency(moduleSpecifier)
-                || containsDependency(getTypesPackageName(moduleSpecifier));
-        }
-    }
-
-    function *readPackageJsonDependencies(host: LanguageServiceHost, packageJsonPaths: string[]) {
-        type PackageJson = Record<typeof dependencyKeys[number], Record<string, string> | undefined>;
-        const dependencyKeys = ["dependencies", "devDependencies", "optionalDependencies"] as const;
-        for (const fileName of packageJsonPaths) {
-            const content = readJson(fileName, { readFile: host.readFile ? host.readFile.bind(host) : sys.readFile }) as PackageJson;
-            for (const key of dependencyKeys) {
-                const dependencies = content[key];
-                if (!dependencies) {
-                    continue;
-                }
-                for (const packageName in dependencies) {
-                    yield packageName;
-                }
-            }
-        }
-    }
-
-    function consumesNodeCoreModules(sourceFile: SourceFile): boolean {
-        return some(sourceFile.imports, ({ text }) => JsTyping.nodeCoreModules.has(text));
-    }
 }
diff --git a/src/services/completions.ts b/src/services/completions.ts
index d7b40d14587..b5c412a788a 100644
--- a/src/services/completions.ts
+++ b/src/services/completions.ts
@@ -64,7 +64,7 @@ namespace ts.Completions {
             return getLabelCompletionAtPosition(contextToken.parent);
         }
 
-        const completionData = getCompletionData(program, log, sourceFile, isUncheckedFile(sourceFile, compilerOptions), position, preferences, /*detailsEntryId*/ undefined, host);
+        const completionData = getCompletionData(program, log, sourceFile, isUncheckedFile(sourceFile, compilerOptions), position, preferences, /*detailsEntryId*/ undefined);
         if (!completionData) {
             return undefined;
         }
@@ -407,10 +407,10 @@ namespace ts.Completions {
         previousToken: Node | undefined;
         readonly isJsxInitializer: IsJsxInitializer;
     }
-    function getSymbolCompletionFromEntryId(program: Program, log: Log, sourceFile: SourceFile, position: number, entryId: CompletionEntryIdentifier, host: LanguageServiceHost
+    function getSymbolCompletionFromEntryId(program: Program, log: Log, sourceFile: SourceFile, position: number, entryId: CompletionEntryIdentifier,
     ): SymbolCompletion | { type: "request", request: Request } | { type: "literal", literal: string | number | PseudoBigInt } | { type: "none" } {
         const compilerOptions = program.getCompilerOptions();
-        const completionData = getCompletionData(program, log, sourceFile, isUncheckedFile(sourceFile, compilerOptions), position, { includeCompletionsForModuleExports: true, includeCompletionsWithInsertText: true }, entryId, host);
+        const completionData = getCompletionData(program, log, sourceFile, isUncheckedFile(sourceFile, compilerOptions), position, { includeCompletionsForModuleExports: true, includeCompletionsWithInsertText: true }, entryId);
         if (!completionData) {
             return { type: "none" };
         }
@@ -472,7 +472,7 @@ namespace ts.Completions {
         }
 
         // Compute all the completion symbols again.
-        const symbolCompletion = getSymbolCompletionFromEntryId(program, log, sourceFile, position, entryId, host);
+        const symbolCompletion = getSymbolCompletionFromEntryId(program, log, sourceFile, position, entryId);
         switch (symbolCompletion.type) {
             case "request": {
                 const { request } = symbolCompletion;
@@ -557,8 +557,8 @@ namespace ts.Completions {
         return { sourceDisplay: [textPart(moduleSpecifier)], codeActions: [codeAction] };
     }
 
-    export function getCompletionEntrySymbol(program: Program, log: Log, sourceFile: SourceFile, position: number, entryId: CompletionEntryIdentifier, host: LanguageServiceHost): Symbol | undefined {
-        const completion = getSymbolCompletionFromEntryId(program, log, sourceFile, position, entryId, host);
+    export function getCompletionEntrySymbol(program: Program, log: Log, sourceFile: SourceFile, position: number, entryId: CompletionEntryIdentifier): Symbol | undefined {
+        const completion = getSymbolCompletionFromEntryId(program, log, sourceFile, position, entryId);
         return completion.type === "symbol" ? completion.symbol : undefined;
     }
 
@@ -657,7 +657,6 @@ namespace ts.Completions {
         position: number,
         preferences: Pick<UserPreferences, "includeCompletionsForModuleExports" | "includeCompletionsWithInsertText">,
         detailsEntryId: CompletionEntryIdentifier | undefined,
-        host: LanguageServiceHost
     ): CompletionData | Request | undefined {
         const typeChecker = program.getTypeChecker();
 
@@ -1150,7 +1149,7 @@ namespace ts.Completions {
             }
 
             if (shouldOfferImportCompletions()) {
-                getSymbolsFromOtherSourceFileExports(symbols, previousToken && isIdentifier(previousToken) ? previousToken.text : "", program.getCompilerOptions().target!, host);
+                getSymbolsFromOtherSourceFileExports(symbols, previousToken && isIdentifier(previousToken) ? previousToken.text : "", program.getCompilerOptions().target!);
             }
             filterGlobalCompletion(symbols);
         }
@@ -1268,64 +1267,12 @@ namespace ts.Completions {
                 typeChecker.getExportsOfModule(sym).some(e => symbolCanBeReferencedAtTypeLocation(e, seenModules));
         }
 
-        /**
-         * Gathers symbols that can be imported from other files, deduplicating along the way. Symbols can be “duplicates”
-         * if re-exported from another module, e.g. `export { foo } from "./a"`. That syntax creates a fresh symbol, but
-         * it’s just an alias to the first, and both have the same name, so we generally want to filter those aliases out,
-         * if and only if the the first can be imported (it may be excluded due to package.json filtering in
-         * `codefix.forEachExternalModuleToImportFrom`).
-         *
-         * Example. Imagine a chain of node_modules re-exporting one original symbol:
-         *
-         * ```js
-         *  node_modules/x/index.js         node_modules/y/index.js           node_modules/z/index.js
-         * +-----------------------+      +--------------------------+      +--------------------------+
-         * |                       |      |                          |      |                          |
-         * | export const foo = 0; | <--- | export { foo } from 'x'; | <--- | export { foo } from 'y'; |
-         * |                       |      |                          |      |                          |
-         * +-----------------------+      +--------------------------+      +--------------------------+
-         * ```
-         *
-         * Also imagine three buckets, which we’ll reference soon:
-         *
-         * ```md
-         * |                  |      |                      |      |                   |
-         * |   **Bucket A**   |      |    **Bucket B**      |      |    **Bucket C**   |
-         * |    Symbols to    |      | Aliases to symbols   |      | Symbols to return |
-         * |    definitely    |      | in Buckets A or C    |      | if nothing better |
-         * |      return      |      | (don’t return these) |      |    comes along    |
-         * |__________________|      |______________________|      |___________________|
-         * ```
-         *
-         * We _probably_ want to show `foo` from 'x', but not from 'y' or 'z'. However, if 'x' is not in a package.json, it
-         * will not appear in a `forEachExternalModuleToImportFrom` iteration. Furthermore, the order of iterations is not
-         * guaranteed, as it is host-dependent. Therefore, when presented with the symbol `foo` from module 'y' alone, we
-         * may not be sure whether or not it should go in the list. So, we’ll take the following steps:
-         *
-         * 1. Resolve alias `foo` from 'y' to the export declaration in 'x', get the symbol there, and see if that symbol is
-         *    already in Bucket A (symbols we already know will be returned). If it is, put `foo` from 'y' in Bucket B
-         *    (symbols that are aliases to symbols in Bucket A). If it’s not, put it in Bucket C.
-         * 2. Next, imagine we see `foo` from module 'z'. Again, we resolve the alias to the nearest export, which is in 'y'.
-         *    At this point, if that nearest export from 'y' is in _any_ of the three buckets, we know the symbol in 'z'
-         *    should never be returned in the final list, so put it in Bucket B.
-         * 3. Next, imagine we see `foo` from module 'x', the original. Syntactically, it doesn’t look like a re-export, so
-         *    we can just check Bucket C to see if we put any aliases to the original in there. If they exist, throw them out.
-         *    Put this symbol in Bucket A.
-         * 4. After we’ve iterated through every symbol of every module, any symbol left in Bucket C means that step 3 didn’t
-         *    occur for that symbol---that is, the original symbol is not in Bucket A, so we should include the alias. Move
-         *    everything from Bucket C to Bucket A.
-         *
-         * Note: Bucket A is passed in as the parameter `symbols` and mutated.
-         */
-        function getSymbolsFromOtherSourceFileExports(/** Bucket A */ symbols: Symbol[], tokenText: string, target: ScriptTarget, host: LanguageServiceHost): void {
+        function getSymbolsFromOtherSourceFileExports(symbols: Symbol[], tokenText: string, target: ScriptTarget): void {
             const tokenTextLowerCase = tokenText.toLowerCase();
-            const seenResolvedModules = createMap<true>();
-            /** Bucket B */
-            const aliasesToAlreadyIncludedSymbols = createMap<true>();
-            /** Bucket C */
-            const aliasesToReturnIfOriginalsAreMissing = createMap<{ alias: Symbol, moduleSymbol: Symbol }>();
 
-            codefix.forEachExternalModuleToImportFrom(typeChecker, host, preferences, program.redirectTargetsMap, sourceFile, program.getSourceFiles(), moduleSymbol => {
+            const seenResolvedModules = createMap<true>();
+
+            codefix.forEachExternalModuleToImportFrom(typeChecker, sourceFile, program.getSourceFiles(), moduleSymbol => {
                 // Perf -- ignore other modules if this is a request for details
                 if (detailsEntryId && detailsEntryId.source && stripQuotes(moduleSymbol.name) !== detailsEntryId.source) {
                     return;
@@ -1346,59 +1293,33 @@ namespace ts.Completions {
                     symbolToOriginInfoMap[getSymbolId(resolvedModuleSymbol)] = { kind: SymbolOriginInfoKind.Export, moduleSymbol, isDefaultExport: false };
                 }
 
-                for (const symbol of typeChecker.getExportsOfModule(moduleSymbol)) {
-                    // If this is `export { _break as break };` (a keyword) -- skip this and prefer the keyword completion.
-                    if (some(symbol.declarations, d => isExportSpecifier(d) && !!d.propertyName && isIdentifierANonContextualKeyword(d.name))) {
+                for (let symbol of typeChecker.getExportsOfModule(moduleSymbol)) {
+                    // Don't add a completion for a re-export, only for the original.
+                    // The actual import fix might end up coming from a re-export -- we don't compute that until getting completion details.
+                    // This is just to avoid adding duplicate completion entries.
+                    //
+                    // If `symbol.parent !== ...`, this is an `export * from "foo"` re-export. Those don't create new symbols.
+                    if (typeChecker.getMergedSymbol(symbol.parent!) !== resolvedModuleSymbol
+                        || some(symbol.declarations, d =>
+                            // If `!!d.name.originalKeywordKind`, this is `export { _break as break };` -- skip this and prefer the keyword completion.
+                            // If `!!d.parent.parent.moduleSpecifier`, this is `export { foo } from "foo"` re-export, which creates a new symbol (thus isn't caught by the first check).
+                            isExportSpecifier(d) && (d.propertyName ? isIdentifierANonContextualKeyword(d.name) : !!d.parent.parent.moduleSpecifier))) {
                         continue;
                     }
-                    // If `symbol.parent !== moduleSymbol`, this is an `export * from "foo"` re-export. Those don't create new symbols.
-                    const isExportStarFromReExport = typeChecker.getMergedSymbol(symbol.parent!) !== resolvedModuleSymbol;
-                    // If `!!d.parent.parent.moduleSpecifier`, this is `export { foo } from "foo"` re-export, which creates a new symbol (thus isn't caught by the first check).
-                    if (isExportStarFromReExport || some(symbol.declarations, d => isExportSpecifier(d) && !d.propertyName && !!d.parent.parent.moduleSpecifier)) {
-                        // Walk the export chain back one module (step 1 or 2 in diagrammed example).
-                        // Or, in the case of `export * from "foo"`, `symbol` already points to the original export, so just use that.
-                        const nearestExportSymbolId = getSymbolId(isExportStarFromReExport ? symbol : Debug.assertDefined(getNearestExportSymbol(symbol)));
-                        const symbolHasBeenSeen = !!symbolToOriginInfoMap[nearestExportSymbolId] || aliasesToAlreadyIncludedSymbols.has(nearestExportSymbolId.toString());
-                        if (!symbolHasBeenSeen) {
-                            aliasesToReturnIfOriginalsAreMissing.set(nearestExportSymbolId.toString(), { alias: symbol, moduleSymbol });
-                            aliasesToAlreadyIncludedSymbols.set(getSymbolId(symbol).toString(), true);
-                        }
-                        else {
-                            // Perf - we know this symbol is an alias to one that’s already covered in `symbols`, so store it here
-                            // in case another symbol re-exports this one; that way we can short-circuit as soon as we see this symbol id.
-                            addToSeen(aliasesToAlreadyIncludedSymbols, getSymbolId(symbol));
-                        }
+
+                    const isDefaultExport = symbol.escapedName === InternalSymbolName.Default;
+                    if (isDefaultExport) {
+                        symbol = getLocalSymbolForExportDefault(symbol) || symbol;
                     }
-                    else {
-                        // This is not a re-export, so see if we have any aliases pending and remove them (step 3 in diagrammed example)
-                        aliasesToReturnIfOriginalsAreMissing.delete(getSymbolId(symbol).toString());
-                        pushSymbol(symbol, moduleSymbol);
+
+                    const origin: SymbolOriginInfoExport = { kind: SymbolOriginInfoKind.Export, moduleSymbol, isDefaultExport };
+                    if (detailsEntryId || stringContainsCharactersInOrder(getSymbolName(symbol, origin, target).toLowerCase(), tokenTextLowerCase)) {
+                        symbols.push(symbol);
+                        symbolToSortTextMap[getSymbolId(symbol)] = SortText.AutoImportSuggestions;
+                        symbolToOriginInfoMap[getSymbolId(symbol)] = origin;
                     }
                 }
             });
-
-            // By this point, any potential duplicates that were actually duplicates have been
-            // removed, so the rest need to be added. (Step 4 in diagrammed example)
-            aliasesToReturnIfOriginalsAreMissing.forEach(({ alias, moduleSymbol }) => pushSymbol(alias, moduleSymbol));
-
-            function pushSymbol(symbol: Symbol, moduleSymbol: Symbol) {
-                const isDefaultExport = symbol.escapedName === InternalSymbolName.Default;
-                if (isDefaultExport) {
-                    symbol = getLocalSymbolForExportDefault(symbol) || symbol;
-                }
-                const origin: SymbolOriginInfoExport = { kind: SymbolOriginInfoKind.Export, moduleSymbol, isDefaultExport };
-                if (detailsEntryId || stringContainsCharactersInOrder(getSymbolName(symbol, origin, target).toLowerCase(), tokenTextLowerCase)) {
-                    symbols.push(symbol);
-                    symbolToSortTextMap[getSymbolId(symbol)] = SortText.AutoImportSuggestions;
-                    symbolToOriginInfoMap[getSymbolId(symbol)] = origin;
-                }
-            }
-        }
-
-        function getNearestExportSymbol(fromSymbol: Symbol) {
-            return findAlias(typeChecker, fromSymbol, alias => {
-                return some(alias.declarations, d => isExportSpecifier(d) || !!d.localSymbol);
-            });
         }
 
         /**
@@ -2322,13 +2243,4 @@ namespace ts.Completions {
     function binaryExpressionMayBeOpenTag({ left }: BinaryExpression): boolean {
         return nodeIsMissing(left);
     }
-
-    function findAlias(typeChecker: TypeChecker, symbol: Symbol, predicate: (symbol: Symbol) => boolean): Symbol | undefined {
-        let currentAlias: Symbol | undefined = symbol;
-        while (currentAlias.flags & SymbolFlags.Alias && (currentAlias = typeChecker.getImmediateAliasedSymbol(currentAlias))) {
-            if (predicate(currentAlias)) {
-                return currentAlias;
-            }
-        }
-    }
 }
diff --git a/src/services/services.ts b/src/services/services.ts
index 2f000bc0f2e..fab6f88b779 100644
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -1453,7 +1453,7 @@ namespace ts {
 
         function getCompletionEntrySymbol(fileName: string, position: number, name: string, source?: string): Symbol | undefined {
             synchronizeHostData();
-            return Completions.getCompletionEntrySymbol(program, log, getValidSourceFile(fileName), position, { name, source }, host);
+            return Completions.getCompletionEntrySymbol(program, log, getValidSourceFile(fileName), position, { name, source });
         }
 
         function getQuickInfoAtPosition(fileName: string, position: number): QuickInfo | undefined {
diff --git a/src/services/stringCompletions.ts b/src/services/stringCompletions.ts
index 58195b5cb3c..b287ebdb406 100644
--- a/src/services/stringCompletions.ts
+++ b/src/services/stringCompletions.ts
@@ -627,6 +627,30 @@ namespace ts.Completions.StringCompletions {
         }
     }
 
+    function findPackageJsons(directory: string, host: LanguageServiceHost): string[] {
+        const paths: string[] = [];
+        forEachAncestorDirectory(directory, ancestor => {
+            const currentConfigPath = findConfigFile(ancestor, (f) => tryFileExists(host, f), "package.json");
+            if (!currentConfigPath) {
+                return true; // break out
+            }
+            paths.push(currentConfigPath);
+        });
+        return paths;
+    }
+
+    function findPackageJson(directory: string, host: LanguageServiceHost): string | undefined {
+        let packageJson: string | undefined;
+        forEachAncestorDirectory(directory, ancestor => {
+            if (ancestor === "node_modules") return true;
+            packageJson = findConfigFile(ancestor, (f) => tryFileExists(host, f), "package.json");
+            if (packageJson) {
+                return true; // break out
+            }
+        });
+        return packageJson;
+    }
+
     function enumerateNodeModulesVisibleToScript(host: LanguageServiceHost, scriptPath: string): ReadonlyArray<string> {
         if (!host.readFile || !host.fileExists) return emptyArray;
 
@@ -682,6 +706,31 @@ namespace ts.Completions.StringCompletions {
 
     const nodeModulesDependencyKeys: ReadonlyArray<string> = ["dependencies", "devDependencies", "peerDependencies", "optionalDependencies"];
 
+    function tryGetDirectories(host: LanguageServiceHost, directoryName: string): string[] {
+        return tryIOAndConsumeErrors(host, host.getDirectories, directoryName) || [];
+    }
+
+    function tryReadDirectory(host: LanguageServiceHost, path: string, extensions?: ReadonlyArray<string>, exclude?: ReadonlyArray<string>, include?: ReadonlyArray<string>): ReadonlyArray<string> {
+        return tryIOAndConsumeErrors(host, host.readDirectory, path, extensions, exclude, include) || emptyArray;
+    }
+
+    function tryFileExists(host: LanguageServiceHost, path: string): boolean {
+        return tryIOAndConsumeErrors(host, host.fileExists, path);
+    }
+
+    function tryDirectoryExists(host: LanguageServiceHost, path: string): boolean {
+        return tryAndIgnoreErrors(() => directoryProbablyExists(path, host)) || false;
+    }
+
+    function tryIOAndConsumeErrors<T>(host: LanguageServiceHost, toApply: ((...a: any[]) => T) | undefined, ...args: any[]) {
+        return tryAndIgnoreErrors(() => toApply && toApply.apply(host, args));
+    }
+
+    function tryAndIgnoreErrors<T>(cb: () => T): T | undefined {
+        try { return cb(); }
+        catch { return undefined; }
+    }
+
     function containsSlash(fragment: string) {
         return stringContains(fragment, directorySeparator);
     }
diff --git a/src/services/utilities.ts b/src/services/utilities.ts
index 98406c6879c..852d22106a2 100644
--- a/src/services/utilities.ts
+++ b/src/services/utilities.ts
@@ -2022,53 +2022,4 @@ namespace ts {
         // If even 2/5 places have a semicolon, the user probably wants semicolons
         return withSemicolon / withoutSemicolon > 1 / nStatementsToObserve;
     }
-
-    export function tryGetDirectories(host: LanguageServiceHost, directoryName: string): string[] {
-        return tryIOAndConsumeErrors(host, host.getDirectories, directoryName) || [];
-    }
-
-    export function tryReadDirectory(host: LanguageServiceHost, path: string, extensions?: ReadonlyArray<string>, exclude?: ReadonlyArray<string>, include?: ReadonlyArray<string>): ReadonlyArray<string> {
-        return tryIOAndConsumeErrors(host, host.readDirectory, path, extensions, exclude, include) || emptyArray;
-    }
-
-    export function tryFileExists(host: LanguageServiceHost, path: string): boolean {
-        return tryIOAndConsumeErrors(host, host.fileExists, path);
-    }
-
-    export function tryDirectoryExists(host: LanguageServiceHost, path: string): boolean {
-        return tryAndIgnoreErrors(() => directoryProbablyExists(path, host)) || false;
-    }
-
-    export function tryAndIgnoreErrors<T>(cb: () => T): T | undefined {
-        try { return cb(); }
-        catch { return undefined; }
-    }
-
-    export function tryIOAndConsumeErrors<T>(host: LanguageServiceHost, toApply: ((...a: any[]) => T) | undefined, ...args: any[]) {
-        return tryAndIgnoreErrors(() => toApply && toApply.apply(host, args));
-    }
-
-    export function findPackageJsons(directory: string, host: LanguageServiceHost): string[] {
-        const paths: string[] = [];
-        forEachAncestorDirectory(directory, ancestor => {
-            const currentConfigPath = findConfigFile(ancestor, (f) => tryFileExists(host, f), "package.json");
-            if (!currentConfigPath) {
-                return true; // break out
-            }
-            paths.push(currentConfigPath);
-        });
-        return paths;
-    }
-
-    export function findPackageJson(directory: string, host: LanguageServiceHost): string | undefined {
-        let packageJson: string | undefined;
-        forEachAncestorDirectory(directory, ancestor => {
-            if (ancestor === "node_modules") return true;
-            packageJson = findConfigFile(ancestor, (f) => tryFileExists(host, f), "package.json");
-            if (packageJson) {
-                return true; // break out
-            }
-        });
-        return packageJson;
-    }
 }
diff --git a/tests/cases/fourslash/completionsImport_filteredByPackageJson_@typesImplicit.ts b/tests/cases/fourslash/completionsImport_filteredByPackageJson_@typesImplicit.ts
deleted file mode 100644
index 539a9cc8ff6..00000000000
--- a/tests/cases/fourslash/completionsImport_filteredByPackageJson_@typesImplicit.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-/// <reference path="fourslash.ts" />
-
-//@noEmit: true
-
-//@Filename: /package.json
-////{
-////  "dependencies": {
-////    "react": "*"
-////  }
-////}
-
-//@Filename: /node_modules/@types/react/index.d.ts
-////export declare var React: any;
-
-//@Filename: /node_modules/@types/react/package.json
-////{
-////  "name": "@types/react"
-////}
-
-//@Filename: /node_modules/@types/fake-react/index.d.ts
-////export declare var ReactFake: any;
-
-//@Filename: /node_modules/@types/fake-react/package.json
-////{
-////  "name": "@types/fake-react"
-////}
-
-//@Filename: /src/index.ts
-////const x = Re/**/
-
-verify.completions({
-  marker: test.marker(""),
-  isNewIdentifierLocation: true,
-  includes: {
-    name: "React",
-    hasAction: true,
-    source: "/node_modules/@types/react/index",
-    sortText: completion.SortText.AutoImportSuggestions
-  },
-  excludes: "ReactFake",
-  preferences: {
-    includeCompletionsForModuleExports: true
-  }
-});
diff --git a/tests/cases/fourslash/completionsImport_filteredByPackageJson_@typesOnly.ts b/tests/cases/fourslash/completionsImport_filteredByPackageJson_@typesOnly.ts
deleted file mode 100644
index b0d2c01e3db..00000000000
--- a/tests/cases/fourslash/completionsImport_filteredByPackageJson_@typesOnly.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-/// <reference path="fourslash.ts" />
-
-//@noEmit: true
-
-//@Filename: /package.json
-////{
-////  "devDependencies": {
-////    "@types/react": "*"
-////  }
-////}
-
-//@Filename: /node_modules/@types/react/index.d.ts
-////export declare var React: any;
-
-//@Filename: /node_modules/@types/react/package.json
-////{
-////  "name": "@types/react"
-////}
-
-//@Filename: /node_modules/@types/fake-react/index.d.ts
-////export declare var ReactFake: any;
-
-//@Filename: /node_modules/@types/fake-react/package.json
-////{
-////  "name": "@types/fake-react"
-////}
-
-//@Filename: /src/index.ts
-////const x = Re/**/
-
-verify.completions({
-  marker: test.marker(""),
-  isNewIdentifierLocation: true,
-  includes: {
-    name: "React",
-    hasAction: true,
-    source: "/node_modules/@types/react/index",
-    sortText: completion.SortText.AutoImportSuggestions
-  },
-  excludes: "ReactFake",
-  preferences: {
-    includeCompletionsForModuleExports: true
-  }
-});
diff --git a/tests/cases/fourslash/completionsImport_filteredByPackageJson_ambient.ts b/tests/cases/fourslash/completionsImport_filteredByPackageJson_ambient.ts
deleted file mode 100644
index 3dcb9eb6690..00000000000
--- a/tests/cases/fourslash/completionsImport_filteredByPackageJson_ambient.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-/// <reference path="fourslash.ts" />
-
-//@noEmit: true
-
-//@Filename: /package.json
-////{
-////  "dependencies": {
-////  }
-////}
-
-//@Filename: /node_modules/@types/node/timers.d.ts
-////declare module "timers" {
-////  function setTimeout(callback: (...args: any[]) => void, ms: number, ...args: any[]): NodeJS.Timeout;
-////}
-
-//@Filename: /node_modules/@types/node/package.json
-////{
-////  "name": "@types/node",
-////}
-
-//@Filename: /src/index.ts
-////setTimeo/**/
-
-verify.completions({
-  marker: test.marker(""),
-  exact: completion.globals,
-  preferences: {
-    includeCompletionsForModuleExports: true
-  }
-});
diff --git a/tests/cases/fourslash/completionsImport_filteredByPackageJson_direct.ts b/tests/cases/fourslash/completionsImport_filteredByPackageJson_direct.ts
deleted file mode 100644
index aa7845daed3..00000000000
--- a/tests/cases/fourslash/completionsImport_filteredByPackageJson_direct.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-/// <reference path="fourslash.ts" />
-
-//@noEmit: true
-
-//@Filename: /package.json
-////{
-////  "dependencies": {
-////    "react": "*"
-////  }
-////}
-
-//@Filename: /node_modules/react/index.d.ts
-////export declare var React: any;
-
-//@Filename: /node_modules/react/package.json
-////{
-////  "name": "react",
-////  "types": "./index.d.ts"
-////}
-
-//@Filename: /node_modules/fake-react/index.d.ts
-////export declare var ReactFake: any;
-
-//@Filename: /node_modules/fake-react/package.json
-////{
-////  "name": "fake-react",
-////  "types": "./index.d.ts"
-////}
-
-//@Filename: /src/index.ts
-////const x = Re/**/
-
-verify.completions({
-  marker: test.marker(""),
-  isNewIdentifierLocation: true,
-  includes: {
-    name: "React",
-    hasAction: true,
-    source: "/node_modules/react/index",
-    sortText: completion.SortText.AutoImportSuggestions
-  },
-  excludes: "ReactFake",
-  preferences: {
-    includeCompletionsForModuleExports: true
-  }
-});
diff --git a/tests/cases/fourslash/completionsImport_filteredByPackageJson_nested.ts b/tests/cases/fourslash/completionsImport_filteredByPackageJson_nested.ts
deleted file mode 100644
index e940c43e32c..00000000000
--- a/tests/cases/fourslash/completionsImport_filteredByPackageJson_nested.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-/// <reference path="fourslash.ts" />
-
-//@noEmit: true
-
-//@Filename: /package.json
-////{
-////  "dependencies": {
-////    "react": "*"
-////  }
-////}
-
-//@Filename: /node_modules/react/index.d.ts
-////export declare var React: any;
-
-//@Filename: /node_modules/react/package.json
-////{
-////  "name": "react",
-////  "types": "./index.d.ts"
-////}
-
-//@Filename: /dir/package.json
-////{
-////  "dependencies": {
-////    "redux": "*"
-////  }
-////}
-
-//@Filename: /dir/node_modules/redux/package.json
-////{
-////  "name": "redux",
-////  "types": "./index.d.ts"
-////}
-
-//@Filename: /dir/node_modules/redux/index.d.ts
-////export declare var Redux: any;
-
-//@Filename: /dir/index.ts
-////const x = Re/**/
-
-verify.completions({
-  marker: test.marker(""),
-  isNewIdentifierLocation: true,
-  includes: {
-    name: "React",
-    hasAction: true,
-    source: "/node_modules/react/index",
-    sortText: completion.SortText.AutoImportSuggestions
-  },
-  preferences: {
-    includeCompletionsForModuleExports: true
-  }
-});
-
-verify.completions({
-  marker: test.marker(""),
-  isNewIdentifierLocation: true,
-  includes: {
-    name: "Redux",
-    hasAction: true,
-    source: "/dir/node_modules/redux/index",
-    sortText: completion.SortText.AutoImportSuggestions
-  },
-  preferences: {
-    includeCompletionsForModuleExports: true
-  }
-});
diff --git a/tests/cases/fourslash/completionsImport_filteredByPackageJson_reexport.ts b/tests/cases/fourslash/completionsImport_filteredByPackageJson_reexport.ts
deleted file mode 100644
index 8e17a3c3a44..00000000000
--- a/tests/cases/fourslash/completionsImport_filteredByPackageJson_reexport.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-/// <reference path="fourslash.ts" />
-
-//@noEmit: true
-
-//@Filename: /package.json
-////{
-////  "dependencies": {
-////    "@emotion/core": "*"
-////  }
-////}
-
-//@Filename: /node_modules/@emotion/css/index.d.ts
-////export declare const css: any;
-////const css2: any;
-////export { css2 };
-
-//@Filename: /node_modules/@emotion/css/package.json
-////{
-////  "name": "@emotion/css",
-////  "types": "./index.d.ts"
-////}
-
-//@Filename: /node_modules/@emotion/core/index.d.ts
-////import { css2 } from "@emotion/css";
-////export { css } from "@emotion/css";
-////export { css2 };
-
-//@Filename: /node_modules/@emotion/core/package.json
-////{
-////  "name": "@emotion/core",
-////  "types": "./index.d.ts"
-////}
-
-//@Filename: /src/index.ts
-////cs/**/
-
-verify.completions({
-  marker: test.marker(""),
-  includes: [
-    completion.undefinedVarEntry,
-    {
-      name: "css",
-      source: "/node_modules/@emotion/core/index",
-      hasAction: true,
-      sortText: completion.SortText.AutoImportSuggestions
-    },
-    {
-      name: "css2",
-      source: "/node_modules/@emotion/core/index",
-      hasAction: true,
-      sortText: completion.SortText.AutoImportSuggestions
-    },
-    ...completion.statementKeywordsWithTypes
-  ],
-  preferences: {
-    includeCompletionsForModuleExports: true
-  }
-});
diff --git a/tests/cases/fourslash/completionsImport_filteredByPackageJson_reexport2.ts b/tests/cases/fourslash/completionsImport_filteredByPackageJson_reexport2.ts
deleted file mode 100644
index eb946ce17b4..00000000000
--- a/tests/cases/fourslash/completionsImport_filteredByPackageJson_reexport2.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-/// <reference path="fourslash.ts" />
-
-//@noEmit: true
-
-//@Filename: /package.json
-////{
-////  "dependencies": {
-////    "b_": "*",
-////    "_c": "*"
-////  }
-////}
-
-//@Filename: /node_modules/a/index.d.ts
-////export const foo = 0;
-
-//@Filename: /node_modules/a/package.json
-////{
-////  "name": "a",
-////  "types": "./index.d.ts"
-////}
-
-//@Filename: /node_modules/b_/index.d.ts
-////export { foo } from "a";
-
-//@Filename: /node_modules/b_/package.json
-////{
-////  "name": "b_",
-////  "types": "./index.d.ts"
-////}
-
-//@Filename: /node_modules/_c/index.d.ts
-////export { foo } from "b_";
-
-//@Filename: /node_modules/_c/package.json
-////{
-////  "name": "_c",
-////  "types": "./index.d.ts"
-////}
-
-//@Filename: /src/index.ts
-////fo/**/
-
-verify.completions({
-  marker: test.marker(""),
-  includes: [
-    completion.undefinedVarEntry,
-    {
-      name: "foo",
-      source: "/node_modules/b_/index",
-      hasAction: true,
-      sortText: completion.SortText.AutoImportSuggestions
-    },
-    ...completion.statementKeywordsWithTypes
-  ],
-  preferences: {
-    includeCompletionsForModuleExports: true
-  }
-});
diff --git a/tests/cases/fourslash/completionsImport_filteredByPackageJson_reexport3.ts b/tests/cases/fourslash/completionsImport_filteredByPackageJson_reexport3.ts
deleted file mode 100644
index 8533461e0b8..00000000000
--- a/tests/cases/fourslash/completionsImport_filteredByPackageJson_reexport3.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-/// <reference path="fourslash.ts" />
-
-//@noEmit: true
-
-//@Filename: /package.json
-////{
-////  "dependencies": {
-////    "b": "*",
-////  }
-////}
-
-//@Filename: /node_modules/a/index.d.ts
-////export const foo = 0;
-
-//@Filename: /node_modules/a/package.json
-////{
-////  "name": "a",
-////  "types": "./index.d.ts"
-////}
-
-//@Filename: /node_modules/b/index.d.ts
-////export * from "a";
-
-//@Filename: /node_modules/b/package.json
-////{
-////  "name": "b",
-////  "types": "./index.d.ts"
-////}
-
-//@Filename: /src/index.ts
-////fo/**/
-
-verify.completions({
-  marker: test.marker(""),
-  includes: [
-    completion.undefinedVarEntry,
-    {
-      name: "foo",
-      source: "/node_modules/b/index",
-      hasAction: true,
-      sortText: completion.SortText.AutoImportSuggestions
-    },
-    ...completion.statementKeywordsWithTypes
-  ],
-  preferences: {
-    includeCompletionsForModuleExports: true
-  }
-});
diff --git a/tests/cases/fourslash/completionsImport_filteredByPackageJson_reexport4.ts b/tests/cases/fourslash/completionsImport_filteredByPackageJson_reexport4.ts
deleted file mode 100644
index 83ac6526b25..00000000000
--- a/tests/cases/fourslash/completionsImport_filteredByPackageJson_reexport4.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-/// <reference path="fourslash.ts" />
-
-//@noEmit: true
-
-//@Filename: /package.json
-////{
-////  "dependencies": {
-////    "c": "*",
-////  }
-////}
-
-//@Filename: /node_modules/a/index.d.ts
-////export const foo = 0;
-
-//@Filename: /node_modules/a/package.json
-////{
-////  "name": "a",
-////  "types": "./index.d.ts"
-////}
-
-//@Filename: /node_modules/b/index.d.ts
-////export * from "a";
-
-//@Filename: /node_modules/b/package.json
-////{
-////  "name": "b",
-////  "types": "./index.d.ts"
-////}
-
-//@Filename: /node_modules/c/index.d.ts
-////export * from "a";
-
-//@Filename: /node_modules/c/package.json
-////{
-////  "name": "c",
-////  "types": "./index.d.ts"
-////}
-
-//@Filename: /src/index.ts
-////fo/**/
-
-verify.completions({
-  marker: test.marker(""),
-  includes: [
-    completion.undefinedVarEntry,
-    {
-      name: "foo",
-      source: "/node_modules/c/index",
-      hasAction: true,
-      sortText: completion.SortText.AutoImportSuggestions
-    },
-    ...completion.statementKeywordsWithTypes
-  ],
-  preferences: {
-    includeCompletionsForModuleExports: true
-  }
-});
diff --git a/tests/cases/fourslash/completionsImport_ofAlias.ts b/tests/cases/fourslash/completionsImport_ofAlias.ts
index 1319391eb0b..9a9cb4a2b18 100644
--- a/tests/cases/fourslash/completionsImport_ofAlias.ts
+++ b/tests/cases/fourslash/completionsImport_ofAlias.ts
@@ -16,9 +16,6 @@
 // @Filename: /a_reexport_2.ts
 ////export * from "./a";
 
-// @Filename: /a_reexport_3.ts
-////export { foo } from "./a_reexport";
-
 // @Filename: /b.ts
 ////fo/**/
 
@@ -27,13 +24,13 @@ verify.completions({
     includes: [
         completion.undefinedVarEntry,
         {
-            name: "foo",
-            source: "/a",
-            sourceDisplay: "./a",
-            text: "(alias) const foo: 0\nexport foo",
-            kind: "alias",
-            hasAction: true,
-            sortText: completion.SortText.AutoImportSuggestions
+            name: "foo",
+            source: "/a",
+            sourceDisplay: "./a",
+            text: "(alias) const foo: 0\nexport foo",
+            kind: "alias",
+            hasAction: true,
+            sortText: completion.SortText.AutoImportSuggestions
         },
         ...completion.statementKeywordsWithTypes,
     ],
diff --git a/tests/cases/fourslash/importNameCodeFixNewImportNodeModules8.ts b/tests/cases/fourslash/importNameCodeFixNewImportNodeModules8.ts
index acfddd587f7..f048f0d30d2 100644
--- a/tests/cases/fourslash/importNameCodeFixNewImportNodeModules8.ts
+++ b/tests/cases/fourslash/importNameCodeFixNewImportNodeModules8.ts
@@ -3,7 +3,7 @@
 //// [|f1/*0*/('');|]
 
 // @Filename: package.json
-//// { "dependencies": { "@scope/package-name": "latest" } }
+//// { "dependencies": { "package-name": "latest" } }
 
 // @Filename: node_modules/@scope/package-name/bin/lib/index.d.ts
 //// export function f1(text: string): string;

From 5a45d5aed8dc6b6c47d8ab23cdf161049d812afe Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Wed, 17 Jul 2019 14:53:29 -0700
Subject: [PATCH 017/151] Reduce union and intersection targets when source is
 singleton type

---
 src/compiler/checker.ts | 34 +++++++++++++++++++++++++---------
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 75b12ee37bb..1a2fc79534e 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -15500,15 +15500,10 @@ namespace ts {
                     // of all their possible values.
                     let matchingTypes: Type[] | undefined;
                     for (const t of (<UnionOrIntersectionType>source).types) {
-                        if (typeIdenticalToSomeType(t, (<UnionOrIntersectionType>target).types)) {
-                            (matchingTypes || (matchingTypes = [])).push(t);
-                            inferFromTypes(t, t);
-                        }
-                        else if (t.flags & (TypeFlags.NumberLiteral | TypeFlags.StringLiteral)) {
-                            const b = getBaseTypeOfLiteralType(t);
-                            if (typeIdenticalToSomeType(b, (<UnionOrIntersectionType>target).types)) {
-                                (matchingTypes || (matchingTypes = [])).push(t, b);
-                            }
+                        const matched = findMatchedType(t, <UnionOrIntersectionType>target);
+                        if (matched) {
+                            (matchingTypes || (matchingTypes = [])).push(matched);
+                            inferFromTypes(matched, matched);
                         }
                     }
                     // Next, to improve the quality of inferences, reduce the source and target types by
@@ -15519,6 +15514,14 @@ namespace ts {
                         target = removeTypesFromUnionOrIntersection(<UnionOrIntersectionType>target, matchingTypes);
                     }
                 }
+                else if (target.flags & TypeFlags.Union && !(target.flags & TypeFlags.EnumLiteral) || target.flags & TypeFlags.Intersection) {
+                    const matched = findMatchedType(source, <UnionOrIntersectionType>target);
+                    if (matched) {
+                        inferFromTypes(matched, matched);
+                        source = target.flags & TypeFlags.Union ? neverType : unknownType;
+                        target = removeTypesFromUnionOrIntersection(<UnionOrIntersectionType>target, [matched]);
+                    }
+                }
                 else if (target.flags & (TypeFlags.IndexedAccess | TypeFlags.Substitution)) {
                     target = getActualTypeVariable(target);
                 }
@@ -15955,6 +15958,19 @@ namespace ts {
             return false;
         }
 
+        function findMatchedType(type: Type, target: UnionOrIntersectionType) {
+            if (typeIdenticalToSomeType(type, target.types)) {
+                return type;
+            }
+            if (type.flags & (TypeFlags.NumberLiteral | TypeFlags.StringLiteral) && target.flags & TypeFlags.Union) {
+                const base = getBaseTypeOfLiteralType(type);
+                if (typeIdenticalToSomeType(base, target.types)) {
+                    return base;
+                }
+            }
+            return undefined;
+        }
+
         /**
          * Return a new union or intersection type computed by removing a given set of types
          * from a given union or intersection type.

From 652bb1277cd72946fde639479e816933dfd0cbd9 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Wed, 17 Jul 2019 14:54:27 -0700
Subject: [PATCH 018/151] Accept new baselines

---
 .../reference/unionAndIntersectionInference2.types  |  2 +-
 .../reference/unionTypeInference.errors.txt         | 13 +++++++++----
 tests/baselines/reference/unionTypeInference.types  |  6 +++---
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/tests/baselines/reference/unionAndIntersectionInference2.types b/tests/baselines/reference/unionAndIntersectionInference2.types
index a163b25ce28..031354506b7 100644
--- a/tests/baselines/reference/unionAndIntersectionInference2.types
+++ b/tests/baselines/reference/unionAndIntersectionInference2.types
@@ -20,7 +20,7 @@ var e1: number | string | boolean;
 >e1 : string | number | boolean
 
 f1(a1); // string
->f1(a1) : string
+>f1(a1) : never
 >f1 : <T>(x: string | T) => T
 >a1 : string
 
diff --git a/tests/baselines/reference/unionTypeInference.errors.txt b/tests/baselines/reference/unionTypeInference.errors.txt
index dfda0d57c2b..ec5c0e11f8d 100644
--- a/tests/baselines/reference/unionTypeInference.errors.txt
+++ b/tests/baselines/reference/unionTypeInference.errors.txt
@@ -1,7 +1,8 @@
-tests/cases/conformance/types/typeRelationships/typeInference/unionTypeInference.ts(9,15): error TS2345: Argument of type '2' is not assignable to parameter of type 'string | 1'.
+tests/cases/conformance/types/typeRelationships/typeInference/unionTypeInference.ts(13,5): error TS2403: Subsequent variable declarations must have the same type.  Variable 'a3' must be of type 'number', but here has type 'string | number'.
+tests/cases/conformance/types/typeRelationships/typeInference/unionTypeInference.ts(31,5): error TS2403: Subsequent variable declarations must have the same type.  Variable 'c2' must be of type 'string', but here has type 'never'.
 
 
-==== tests/cases/conformance/types/typeRelationships/typeInference/unionTypeInference.ts (1 errors) ====
+==== tests/cases/conformance/types/typeRelationships/typeInference/unionTypeInference.ts (2 errors) ====
     // Verify that inferences made *to* a type parameter in a union type are secondary
     // to inferences made directly to that type parameter
     
@@ -11,12 +12,13 @@ tests/cases/conformance/types/typeRelationships/typeInference/unionTypeInference
     
     var a1: number;
     var a1 = f(1, 2);
-                  ~
-!!! error TS2345: Argument of type '2' is not assignable to parameter of type 'string | 1'.
     var a2: number;
     var a2 = f(1, "hello");
     var a3: number;
     var a3 = f(1, a1 || "hello");
+        ~~
+!!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'a3' must be of type 'number', but here has type 'string | number'.
+!!! related TS6203 tests/cases/conformance/types/typeRelationships/typeInference/unionTypeInference.ts:12:5: 'a3' was also declared here.
     var a4: any;
     var a4 = f(undefined, "abc");
     
@@ -35,4 +37,7 @@ tests/cases/conformance/types/typeRelationships/typeInference/unionTypeInference
     var c1 = h(5);
     var c2: string;
     var c2 = h("abc");
+        ~~
+!!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'c2' must be of type 'string', but here has type 'never'.
+!!! related TS6203 tests/cases/conformance/types/typeRelationships/typeInference/unionTypeInference.ts:30:5: 'c2' was also declared here.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unionTypeInference.types b/tests/baselines/reference/unionTypeInference.types
index e712916c2ff..fc5b777ff5a 100644
--- a/tests/baselines/reference/unionTypeInference.types
+++ b/tests/baselines/reference/unionTypeInference.types
@@ -16,7 +16,7 @@ var a1: number;
 
 var a1 = f(1, 2);
 >a1 : number
->f(1, 2) : any
+>f(1, 2) : 1 | 2
 >f : <T>(x: T, y: string | T) => T
 >1 : 1
 >2 : 2
@@ -36,7 +36,7 @@ var a3: number;
 
 var a3 = f(1, a1 || "hello");
 >a3 : number
->f(1, a1 || "hello") : number
+>f(1, a1 || "hello") : number | "hello"
 >f : <T>(x: T, y: string | T) => T
 >1 : 1
 >a1 || "hello" : number | "hello"
@@ -107,7 +107,7 @@ var c2: string;
 
 var c2 = h("abc");
 >c2 : string
->h("abc") : "abc"
+>h("abc") : never
 >h : <T>(x: string | boolean | T) => T
 >"abc" : "abc"
 

From 7d4259ba9fa4cfa039c36cc54aa5f1351aa36760 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Wed, 17 Jul 2019 14:57:26 -0700
Subject: [PATCH 019/151] Update tests

---
 .../typeInference/unionTypeInference.ts       | 61 +++++++++++--------
 1 file changed, 36 insertions(+), 25 deletions(-)

diff --git a/tests/cases/conformance/types/typeRelationships/typeInference/unionTypeInference.ts b/tests/cases/conformance/types/typeRelationships/typeInference/unionTypeInference.ts
index 39def706622..14ce8e91fc7 100644
--- a/tests/cases/conformance/types/typeRelationships/typeInference/unionTypeInference.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeInference/unionTypeInference.ts
@@ -1,31 +1,42 @@
-// Verify that inferences made *to* a type parameter in a union type are secondary
-// to inferences made directly to that type parameter
+// @strict: true
 
-function f<T>(x: T, y: string|T): T {
-    return x;
-}
+declare const b: boolean;
+declare const s: string;
+declare const sn: string | number;
 
-var a1: number;
-var a1 = f(1, 2);
-var a2: number;
-var a2 = f(1, "hello");
-var a3: number;
-var a3 = f(1, a1 || "hello");
-var a4: any;
-var a4 = f(undefined, "abc");
+declare function f1<T>(x: T, y: string | T): T;
 
-function g<T>(value: [string, T]): T {
-    return value[1];
-}
+const a1 = f1(1, 2);  // 1 | 2
+const a2 = f1(1, "hello");  // 1
+const a3 = f1(1, sn);  // number
+const a4 = f1(undefined, "abc");  // undefined
+const a5 = f1("foo", "bar");  // "foo"
+const a6 = f1(true, false);  // boolean
+const a7 = f1("hello", 1);  // Error
 
-var b1: boolean;
-var b1 = g(["string", true]);
+declare function f2<T>(value: [string, T]): T;
 
-function h<T>(x: string|boolean|T): T {
-    return typeof x === "string" || typeof x === "boolean" ? undefined : x;
-}
+var b1 = f2(["string", true]);  // boolean
 
-var c1: number;
-var c1 = h(5);
-var c2: string;
-var c2 = h("abc");
+declare function f3<T>(x: string | false | T): T;
+
+const c1 = f3(5);  // 5
+const c2 = f3(sn);  // number
+const c3 = f3(true);  // true
+const c4 = f3(b);  // true
+const c5 = f3("abc");  // never
+
+declare function f4<T>(x: string & T): T;
+
+var d1 = f4("abc");
+var d2 = f4(s);
+var d3 = f4(42);  // Error
+
+// Repros from #32434
+
+declare function foo<T>(x: T | Promise<T>): void;
+declare let x: false | Promise<true>;
+foo(x);
+
+declare function bar<T>(x: T, y: string | T): T;
+const y = bar(1, 2);

From ae1add72104b6e3ca7a8e765af77f3bec9003ce6 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Wed, 17 Jul 2019 15:02:20 -0700
Subject: [PATCH 020/151] Update tests

---
 .../typeRelationships/typeInference/unionTypeInference.ts   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/cases/conformance/types/typeRelationships/typeInference/unionTypeInference.ts b/tests/cases/conformance/types/typeRelationships/typeInference/unionTypeInference.ts
index 14ce8e91fc7..ccedb753354 100644
--- a/tests/cases/conformance/types/typeRelationships/typeInference/unionTypeInference.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeInference/unionTypeInference.ts
@@ -28,9 +28,9 @@ const c5 = f3("abc");  // never
 
 declare function f4<T>(x: string & T): T;
 
-var d1 = f4("abc");
-var d2 = f4(s);
-var d3 = f4(42);  // Error
+const d1 = f4("abc");
+const d2 = f4(s);
+const d3 = f4(42);  // Error
 
 // Repros from #32434
 

From c4bad6443884ee7218f1b970784f2c03e23d52bb Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Wed, 17 Jul 2019 15:03:15 -0700
Subject: [PATCH 021/151] Accept new baselines

---
 .../reference/unionTypeInference.errors.txt   |  73 +++---
 .../baselines/reference/unionTypeInference.js | 103 ++++-----
 .../reference/unionTypeInference.symbols      | 194 ++++++++++------
 .../reference/unionTypeInference.types        | 210 +++++++++++-------
 4 files changed, 342 insertions(+), 238 deletions(-)

diff --git a/tests/baselines/reference/unionTypeInference.errors.txt b/tests/baselines/reference/unionTypeInference.errors.txt
index ec5c0e11f8d..6993f4280a7 100644
--- a/tests/baselines/reference/unionTypeInference.errors.txt
+++ b/tests/baselines/reference/unionTypeInference.errors.txt
@@ -1,43 +1,50 @@
-tests/cases/conformance/types/typeRelationships/typeInference/unionTypeInference.ts(13,5): error TS2403: Subsequent variable declarations must have the same type.  Variable 'a3' must be of type 'number', but here has type 'string | number'.
-tests/cases/conformance/types/typeRelationships/typeInference/unionTypeInference.ts(31,5): error TS2403: Subsequent variable declarations must have the same type.  Variable 'c2' must be of type 'string', but here has type 'never'.
+tests/cases/conformance/types/typeRelationships/typeInference/unionTypeInference.ts(13,24): error TS2345: Argument of type '1' is not assignable to parameter of type 'string'.
+tests/cases/conformance/types/typeRelationships/typeInference/unionTypeInference.ts(31,13): error TS2345: Argument of type '42' is not assignable to parameter of type 'never'.
 
 
 ==== tests/cases/conformance/types/typeRelationships/typeInference/unionTypeInference.ts (2 errors) ====
-    // Verify that inferences made *to* a type parameter in a union type are secondary
-    // to inferences made directly to that type parameter
+    declare const b: boolean;
+    declare const s: string;
+    declare const sn: string | number;
     
-    function f<T>(x: T, y: string|T): T {
-        return x;
-    }
+    declare function f1<T>(x: T, y: string | T): T;
     
-    var a1: number;
-    var a1 = f(1, 2);
-    var a2: number;
-    var a2 = f(1, "hello");
-    var a3: number;
-    var a3 = f(1, a1 || "hello");
-        ~~
-!!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'a3' must be of type 'number', but here has type 'string | number'.
-!!! related TS6203 tests/cases/conformance/types/typeRelationships/typeInference/unionTypeInference.ts:12:5: 'a3' was also declared here.
-    var a4: any;
-    var a4 = f(undefined, "abc");
+    const a1 = f1(1, 2);  // 1 | 2
+    const a2 = f1(1, "hello");  // 1
+    const a3 = f1(1, sn);  // number
+    const a4 = f1(undefined, "abc");  // undefined
+    const a5 = f1("foo", "bar");  // "foo"
+    const a6 = f1(true, false);  // boolean
+    const a7 = f1("hello", 1);  // Error
+                           ~
+!!! error TS2345: Argument of type '1' is not assignable to parameter of type 'string'.
     
-    function g<T>(value: [string, T]): T {
-        return value[1];
-    }
+    declare function f2<T>(value: [string, T]): T;
     
-    var b1: boolean;
-    var b1 = g(["string", true]);
+    var b1 = f2(["string", true]);  // boolean
     
-    function h<T>(x: string|boolean|T): T {
-        return typeof x === "string" || typeof x === "boolean" ? undefined : x;
-    }
+    declare function f3<T>(x: string | false | T): T;
     
-    var c1: number;
-    var c1 = h(5);
-    var c2: string;
-    var c2 = h("abc");
-        ~~
-!!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'c2' must be of type 'string', but here has type 'never'.
-!!! related TS6203 tests/cases/conformance/types/typeRelationships/typeInference/unionTypeInference.ts:30:5: 'c2' was also declared here.
+    const c1 = f3(5);  // 5
+    const c2 = f3(sn);  // number
+    const c3 = f3(true);  // true
+    const c4 = f3(b);  // true
+    const c5 = f3("abc");  // never
+    
+    declare function f4<T>(x: string & T): T;
+    
+    var d1 = f4("abc");
+    var d2 = f4(s);
+    var d3 = f4(42);  // Error
+                ~~
+!!! error TS2345: Argument of type '42' is not assignable to parameter of type 'never'.
+    
+    // Repros from #32434
+    
+    declare function foo<T>(x: T | Promise<T>): void;
+    declare let x: false | Promise<true>;
+    foo(x);
+    
+    declare function bar<T>(x: T, y: string | T): T;
+    const y = bar(1, 2);
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unionTypeInference.js b/tests/baselines/reference/unionTypeInference.js
index bdaa340f6ea..fb94e1910f1 100644
--- a/tests/baselines/reference/unionTypeInference.js
+++ b/tests/baselines/reference/unionTypeInference.js
@@ -1,60 +1,63 @@
 //// [unionTypeInference.ts]
-// Verify that inferences made *to* a type parameter in a union type are secondary
-// to inferences made directly to that type parameter
+declare const b: boolean;
+declare const s: string;
+declare const sn: string | number;
 
-function f<T>(x: T, y: string|T): T {
-    return x;
-}
+declare function f1<T>(x: T, y: string | T): T;
 
-var a1: number;
-var a1 = f(1, 2);
-var a2: number;
-var a2 = f(1, "hello");
-var a3: number;
-var a3 = f(1, a1 || "hello");
-var a4: any;
-var a4 = f(undefined, "abc");
+const a1 = f1(1, 2);  // 1 | 2
+const a2 = f1(1, "hello");  // 1
+const a3 = f1(1, sn);  // number
+const a4 = f1(undefined, "abc");  // undefined
+const a5 = f1("foo", "bar");  // "foo"
+const a6 = f1(true, false);  // boolean
+const a7 = f1("hello", 1);  // Error
 
-function g<T>(value: [string, T]): T {
-    return value[1];
-}
+declare function f2<T>(value: [string, T]): T;
 
-var b1: boolean;
-var b1 = g(["string", true]);
+var b1 = f2(["string", true]);  // boolean
 
-function h<T>(x: string|boolean|T): T {
-    return typeof x === "string" || typeof x === "boolean" ? undefined : x;
-}
+declare function f3<T>(x: string | false | T): T;
 
-var c1: number;
-var c1 = h(5);
-var c2: string;
-var c2 = h("abc");
+const c1 = f3(5);  // 5
+const c2 = f3(sn);  // number
+const c3 = f3(true);  // true
+const c4 = f3(b);  // true
+const c5 = f3("abc");  // never
+
+declare function f4<T>(x: string & T): T;
+
+var d1 = f4("abc");
+var d2 = f4(s);
+var d3 = f4(42);  // Error
+
+// Repros from #32434
+
+declare function foo<T>(x: T | Promise<T>): void;
+declare let x: false | Promise<true>;
+foo(x);
+
+declare function bar<T>(x: T, y: string | T): T;
+const y = bar(1, 2);
 
 
 //// [unionTypeInference.js]
-// Verify that inferences made *to* a type parameter in a union type are secondary
-// to inferences made directly to that type parameter
-function f(x, y) {
-    return x;
-}
-var a1;
-var a1 = f(1, 2);
-var a2;
-var a2 = f(1, "hello");
-var a3;
-var a3 = f(1, a1 || "hello");
-var a4;
-var a4 = f(undefined, "abc");
-function g(value) {
-    return value[1];
-}
-var b1;
-var b1 = g(["string", true]);
-function h(x) {
-    return typeof x === "string" || typeof x === "boolean" ? undefined : x;
-}
-var c1;
-var c1 = h(5);
-var c2;
-var c2 = h("abc");
+"use strict";
+var a1 = f1(1, 2); // 1 | 2
+var a2 = f1(1, "hello"); // 1
+var a3 = f1(1, sn); // number
+var a4 = f1(undefined, "abc"); // undefined
+var a5 = f1("foo", "bar"); // "foo"
+var a6 = f1(true, false); // boolean
+var a7 = f1("hello", 1); // Error
+var b1 = f2(["string", true]); // boolean
+var c1 = f3(5); // 5
+var c2 = f3(sn); // number
+var c3 = f3(true); // true
+var c4 = f3(b); // true
+var c5 = f3("abc"); // never
+var d1 = f4("abc");
+var d2 = f4(s);
+var d3 = f4(42); // Error
+foo(x);
+var y = bar(1, 2);
diff --git a/tests/baselines/reference/unionTypeInference.symbols b/tests/baselines/reference/unionTypeInference.symbols
index 3388f279f4b..a34be279837 100644
--- a/tests/baselines/reference/unionTypeInference.symbols
+++ b/tests/baselines/reference/unionTypeInference.symbols
@@ -1,94 +1,140 @@
 === tests/cases/conformance/types/typeRelationships/typeInference/unionTypeInference.ts ===
-// Verify that inferences made *to* a type parameter in a union type are secondary
-// to inferences made directly to that type parameter
+declare const b: boolean;
+>b : Symbol(b, Decl(unionTypeInference.ts, 0, 13))
 
-function f<T>(x: T, y: string|T): T {
->f : Symbol(f, Decl(unionTypeInference.ts, 0, 0))
->T : Symbol(T, Decl(unionTypeInference.ts, 3, 11))
->x : Symbol(x, Decl(unionTypeInference.ts, 3, 14))
->T : Symbol(T, Decl(unionTypeInference.ts, 3, 11))
->y : Symbol(y, Decl(unionTypeInference.ts, 3, 19))
->T : Symbol(T, Decl(unionTypeInference.ts, 3, 11))
->T : Symbol(T, Decl(unionTypeInference.ts, 3, 11))
+declare const s: string;
+>s : Symbol(s, Decl(unionTypeInference.ts, 1, 13))
 
-    return x;
->x : Symbol(x, Decl(unionTypeInference.ts, 3, 14))
-}
+declare const sn: string | number;
+>sn : Symbol(sn, Decl(unionTypeInference.ts, 2, 13))
 
-var a1: number;
->a1 : Symbol(a1, Decl(unionTypeInference.ts, 7, 3), Decl(unionTypeInference.ts, 8, 3))
+declare function f1<T>(x: T, y: string | T): T;
+>f1 : Symbol(f1, Decl(unionTypeInference.ts, 2, 34))
+>T : Symbol(T, Decl(unionTypeInference.ts, 4, 20))
+>x : Symbol(x, Decl(unionTypeInference.ts, 4, 23))
+>T : Symbol(T, Decl(unionTypeInference.ts, 4, 20))
+>y : Symbol(y, Decl(unionTypeInference.ts, 4, 28))
+>T : Symbol(T, Decl(unionTypeInference.ts, 4, 20))
+>T : Symbol(T, Decl(unionTypeInference.ts, 4, 20))
 
-var a1 = f(1, 2);
->a1 : Symbol(a1, Decl(unionTypeInference.ts, 7, 3), Decl(unionTypeInference.ts, 8, 3))
->f : Symbol(f, Decl(unionTypeInference.ts, 0, 0))
+const a1 = f1(1, 2);  // 1 | 2
+>a1 : Symbol(a1, Decl(unionTypeInference.ts, 6, 5))
+>f1 : Symbol(f1, Decl(unionTypeInference.ts, 2, 34))
 
-var a2: number;
->a2 : Symbol(a2, Decl(unionTypeInference.ts, 9, 3), Decl(unionTypeInference.ts, 10, 3))
+const a2 = f1(1, "hello");  // 1
+>a2 : Symbol(a2, Decl(unionTypeInference.ts, 7, 5))
+>f1 : Symbol(f1, Decl(unionTypeInference.ts, 2, 34))
 
-var a2 = f(1, "hello");
->a2 : Symbol(a2, Decl(unionTypeInference.ts, 9, 3), Decl(unionTypeInference.ts, 10, 3))
->f : Symbol(f, Decl(unionTypeInference.ts, 0, 0))
+const a3 = f1(1, sn);  // number
+>a3 : Symbol(a3, Decl(unionTypeInference.ts, 8, 5))
+>f1 : Symbol(f1, Decl(unionTypeInference.ts, 2, 34))
+>sn : Symbol(sn, Decl(unionTypeInference.ts, 2, 13))
 
-var a3: number;
->a3 : Symbol(a3, Decl(unionTypeInference.ts, 11, 3), Decl(unionTypeInference.ts, 12, 3))
-
-var a3 = f(1, a1 || "hello");
->a3 : Symbol(a3, Decl(unionTypeInference.ts, 11, 3), Decl(unionTypeInference.ts, 12, 3))
->f : Symbol(f, Decl(unionTypeInference.ts, 0, 0))
->a1 : Symbol(a1, Decl(unionTypeInference.ts, 7, 3), Decl(unionTypeInference.ts, 8, 3))
-
-var a4: any;
->a4 : Symbol(a4, Decl(unionTypeInference.ts, 13, 3), Decl(unionTypeInference.ts, 14, 3))
-
-var a4 = f(undefined, "abc");
->a4 : Symbol(a4, Decl(unionTypeInference.ts, 13, 3), Decl(unionTypeInference.ts, 14, 3))
->f : Symbol(f, Decl(unionTypeInference.ts, 0, 0))
+const a4 = f1(undefined, "abc");  // undefined
+>a4 : Symbol(a4, Decl(unionTypeInference.ts, 9, 5))
+>f1 : Symbol(f1, Decl(unionTypeInference.ts, 2, 34))
 >undefined : Symbol(undefined)
 
-function g<T>(value: [string, T]): T {
->g : Symbol(g, Decl(unionTypeInference.ts, 14, 29))
->T : Symbol(T, Decl(unionTypeInference.ts, 16, 11))
->value : Symbol(value, Decl(unionTypeInference.ts, 16, 14))
->T : Symbol(T, Decl(unionTypeInference.ts, 16, 11))
->T : Symbol(T, Decl(unionTypeInference.ts, 16, 11))
+const a5 = f1("foo", "bar");  // "foo"
+>a5 : Symbol(a5, Decl(unionTypeInference.ts, 10, 5))
+>f1 : Symbol(f1, Decl(unionTypeInference.ts, 2, 34))
 
-    return value[1];
->value : Symbol(value, Decl(unionTypeInference.ts, 16, 14))
->1 : Symbol(1)
-}
+const a6 = f1(true, false);  // boolean
+>a6 : Symbol(a6, Decl(unionTypeInference.ts, 11, 5))
+>f1 : Symbol(f1, Decl(unionTypeInference.ts, 2, 34))
 
-var b1: boolean;
->b1 : Symbol(b1, Decl(unionTypeInference.ts, 20, 3), Decl(unionTypeInference.ts, 21, 3))
+const a7 = f1("hello", 1);  // Error
+>a7 : Symbol(a7, Decl(unionTypeInference.ts, 12, 5))
+>f1 : Symbol(f1, Decl(unionTypeInference.ts, 2, 34))
 
-var b1 = g(["string", true]);
->b1 : Symbol(b1, Decl(unionTypeInference.ts, 20, 3), Decl(unionTypeInference.ts, 21, 3))
->g : Symbol(g, Decl(unionTypeInference.ts, 14, 29))
+declare function f2<T>(value: [string, T]): T;
+>f2 : Symbol(f2, Decl(unionTypeInference.ts, 12, 26))
+>T : Symbol(T, Decl(unionTypeInference.ts, 14, 20))
+>value : Symbol(value, Decl(unionTypeInference.ts, 14, 23))
+>T : Symbol(T, Decl(unionTypeInference.ts, 14, 20))
+>T : Symbol(T, Decl(unionTypeInference.ts, 14, 20))
 
-function h<T>(x: string|boolean|T): T {
->h : Symbol(h, Decl(unionTypeInference.ts, 21, 29))
->T : Symbol(T, Decl(unionTypeInference.ts, 23, 11))
->x : Symbol(x, Decl(unionTypeInference.ts, 23, 14))
->T : Symbol(T, Decl(unionTypeInference.ts, 23, 11))
->T : Symbol(T, Decl(unionTypeInference.ts, 23, 11))
+var b1 = f2(["string", true]);  // boolean
+>b1 : Symbol(b1, Decl(unionTypeInference.ts, 16, 3))
+>f2 : Symbol(f2, Decl(unionTypeInference.ts, 12, 26))
 
-    return typeof x === "string" || typeof x === "boolean" ? undefined : x;
->x : Symbol(x, Decl(unionTypeInference.ts, 23, 14))
->x : Symbol(x, Decl(unionTypeInference.ts, 23, 14))
->undefined : Symbol(undefined)
->x : Symbol(x, Decl(unionTypeInference.ts, 23, 14))
-}
+declare function f3<T>(x: string | false | T): T;
+>f3 : Symbol(f3, Decl(unionTypeInference.ts, 16, 30))
+>T : Symbol(T, Decl(unionTypeInference.ts, 18, 20))
+>x : Symbol(x, Decl(unionTypeInference.ts, 18, 23))
+>T : Symbol(T, Decl(unionTypeInference.ts, 18, 20))
+>T : Symbol(T, Decl(unionTypeInference.ts, 18, 20))
 
-var c1: number;
->c1 : Symbol(c1, Decl(unionTypeInference.ts, 27, 3), Decl(unionTypeInference.ts, 28, 3))
+const c1 = f3(5);  // 5
+>c1 : Symbol(c1, Decl(unionTypeInference.ts, 20, 5))
+>f3 : Symbol(f3, Decl(unionTypeInference.ts, 16, 30))
 
-var c1 = h(5);
->c1 : Symbol(c1, Decl(unionTypeInference.ts, 27, 3), Decl(unionTypeInference.ts, 28, 3))
->h : Symbol(h, Decl(unionTypeInference.ts, 21, 29))
+const c2 = f3(sn);  // number
+>c2 : Symbol(c2, Decl(unionTypeInference.ts, 21, 5))
+>f3 : Symbol(f3, Decl(unionTypeInference.ts, 16, 30))
+>sn : Symbol(sn, Decl(unionTypeInference.ts, 2, 13))
 
-var c2: string;
->c2 : Symbol(c2, Decl(unionTypeInference.ts, 29, 3), Decl(unionTypeInference.ts, 30, 3))
+const c3 = f3(true);  // true
+>c3 : Symbol(c3, Decl(unionTypeInference.ts, 22, 5))
+>f3 : Symbol(f3, Decl(unionTypeInference.ts, 16, 30))
 
-var c2 = h("abc");
->c2 : Symbol(c2, Decl(unionTypeInference.ts, 29, 3), Decl(unionTypeInference.ts, 30, 3))
->h : Symbol(h, Decl(unionTypeInference.ts, 21, 29))
+const c4 = f3(b);  // true
+>c4 : Symbol(c4, Decl(unionTypeInference.ts, 23, 5))
+>f3 : Symbol(f3, Decl(unionTypeInference.ts, 16, 30))
+>b : Symbol(b, Decl(unionTypeInference.ts, 0, 13))
+
+const c5 = f3("abc");  // never
+>c5 : Symbol(c5, Decl(unionTypeInference.ts, 24, 5))
+>f3 : Symbol(f3, Decl(unionTypeInference.ts, 16, 30))
+
+declare function f4<T>(x: string & T): T;
+>f4 : Symbol(f4, Decl(unionTypeInference.ts, 24, 21))
+>T : Symbol(T, Decl(unionTypeInference.ts, 26, 20))
+>x : Symbol(x, Decl(unionTypeInference.ts, 26, 23))
+>T : Symbol(T, Decl(unionTypeInference.ts, 26, 20))
+>T : Symbol(T, Decl(unionTypeInference.ts, 26, 20))
+
+var d1 = f4("abc");
+>d1 : Symbol(d1, Decl(unionTypeInference.ts, 28, 3))
+>f4 : Symbol(f4, Decl(unionTypeInference.ts, 24, 21))
+
+var d2 = f4(s);
+>d2 : Symbol(d2, Decl(unionTypeInference.ts, 29, 3))
+>f4 : Symbol(f4, Decl(unionTypeInference.ts, 24, 21))
+>s : Symbol(s, Decl(unionTypeInference.ts, 1, 13))
+
+var d3 = f4(42);  // Error
+>d3 : Symbol(d3, Decl(unionTypeInference.ts, 30, 3))
+>f4 : Symbol(f4, Decl(unionTypeInference.ts, 24, 21))
+
+// Repros from #32434
+
+declare function foo<T>(x: T | Promise<T>): void;
+>foo : Symbol(foo, Decl(unionTypeInference.ts, 30, 16))
+>T : Symbol(T, Decl(unionTypeInference.ts, 34, 21))
+>x : Symbol(x, Decl(unionTypeInference.ts, 34, 24))
+>T : Symbol(T, Decl(unionTypeInference.ts, 34, 21))
+>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --))
+>T : Symbol(T, Decl(unionTypeInference.ts, 34, 21))
+
+declare let x: false | Promise<true>;
+>x : Symbol(x, Decl(unionTypeInference.ts, 35, 11))
+>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --))
+
+foo(x);
+>foo : Symbol(foo, Decl(unionTypeInference.ts, 30, 16))
+>x : Symbol(x, Decl(unionTypeInference.ts, 35, 11))
+
+declare function bar<T>(x: T, y: string | T): T;
+>bar : Symbol(bar, Decl(unionTypeInference.ts, 36, 7))
+>T : Symbol(T, Decl(unionTypeInference.ts, 38, 21))
+>x : Symbol(x, Decl(unionTypeInference.ts, 38, 24))
+>T : Symbol(T, Decl(unionTypeInference.ts, 38, 21))
+>y : Symbol(y, Decl(unionTypeInference.ts, 38, 29))
+>T : Symbol(T, Decl(unionTypeInference.ts, 38, 21))
+>T : Symbol(T, Decl(unionTypeInference.ts, 38, 21))
+
+const y = bar(1, 2);
+>y : Symbol(y, Decl(unionTypeInference.ts, 39, 5))
+>bar : Symbol(bar, Decl(unionTypeInference.ts, 36, 7))
 
diff --git a/tests/baselines/reference/unionTypeInference.types b/tests/baselines/reference/unionTypeInference.types
index fc5b777ff5a..836c298bdbc 100644
--- a/tests/baselines/reference/unionTypeInference.types
+++ b/tests/baselines/reference/unionTypeInference.types
@@ -1,113 +1,161 @@
 === tests/cases/conformance/types/typeRelationships/typeInference/unionTypeInference.ts ===
-// Verify that inferences made *to* a type parameter in a union type are secondary
-// to inferences made directly to that type parameter
+declare const b: boolean;
+>b : boolean
 
-function f<T>(x: T, y: string|T): T {
->f : <T>(x: T, y: string | T) => T
+declare const s: string;
+>s : string
+
+declare const sn: string | number;
+>sn : string | number
+
+declare function f1<T>(x: T, y: string | T): T;
+>f1 : <T>(x: T, y: string | T) => T
 >x : T
 >y : string | T
 
-    return x;
->x : T
-}
-
-var a1: number;
->a1 : number
-
-var a1 = f(1, 2);
->a1 : number
->f(1, 2) : 1 | 2
->f : <T>(x: T, y: string | T) => T
+const a1 = f1(1, 2);  // 1 | 2
+>a1 : 1 | 2
+>f1(1, 2) : 1 | 2
+>f1 : <T>(x: T, y: string | T) => T
 >1 : 1
 >2 : 2
 
-var a2: number;
->a2 : number
-
-var a2 = f(1, "hello");
->a2 : number
->f(1, "hello") : 1
->f : <T>(x: T, y: string | T) => T
+const a2 = f1(1, "hello");  // 1
+>a2 : 1
+>f1(1, "hello") : 1
+>f1 : <T>(x: T, y: string | T) => T
 >1 : 1
 >"hello" : "hello"
 
-var a3: number;
+const a3 = f1(1, sn);  // number
 >a3 : number
-
-var a3 = f(1, a1 || "hello");
->a3 : number
->f(1, a1 || "hello") : number | "hello"
->f : <T>(x: T, y: string | T) => T
+>f1(1, sn) : number
+>f1 : <T>(x: T, y: string | T) => T
 >1 : 1
->a1 || "hello" : number | "hello"
->a1 : number
->"hello" : "hello"
+>sn : string | number
 
-var a4: any;
->a4 : any
-
-var a4 = f(undefined, "abc");
->a4 : any
->f(undefined, "abc") : any
->f : <T>(x: T, y: string | T) => T
+const a4 = f1(undefined, "abc");  // undefined
+>a4 : undefined
+>f1(undefined, "abc") : undefined
+>f1 : <T>(x: T, y: string | T) => T
 >undefined : undefined
 >"abc" : "abc"
 
-function g<T>(value: [string, T]): T {
->g : <T>(value: [string, T]) => T
->value : [string, T]
+const a5 = f1("foo", "bar");  // "foo"
+>a5 : "foo"
+>f1("foo", "bar") : "foo"
+>f1 : <T>(x: T, y: string | T) => T
+>"foo" : "foo"
+>"bar" : "bar"
 
-    return value[1];
->value[1] : T
->value : [string, T]
+const a6 = f1(true, false);  // boolean
+>a6 : boolean
+>f1(true, false) : boolean
+>f1 : <T>(x: T, y: string | T) => T
+>true : true
+>false : false
+
+const a7 = f1("hello", 1);  // Error
+>a7 : any
+>f1("hello", 1) : any
+>f1 : <T>(x: T, y: string | T) => T
+>"hello" : "hello"
 >1 : 1
-}
 
-var b1: boolean;
->b1 : boolean
+declare function f2<T>(value: [string, T]): T;
+>f2 : <T>(value: [string, T]) => T
+>value : [string, T]
 
-var b1 = g(["string", true]);
+var b1 = f2(["string", true]);  // boolean
 >b1 : boolean
->g(["string", true]) : boolean
->g : <T>(value: [string, T]) => T
+>f2(["string", true]) : boolean
+>f2 : <T>(value: [string, T]) => T
 >["string", true] : [string, true]
 >"string" : "string"
 >true : true
 
-function h<T>(x: string|boolean|T): T {
->h : <T>(x: string | boolean | T) => T
->x : string | boolean | T
+declare function f3<T>(x: string | false | T): T;
+>f3 : <T>(x: string | false | T) => T
+>x : string | false | T
+>false : false
 
-    return typeof x === "string" || typeof x === "boolean" ? undefined : x;
->typeof x === "string" || typeof x === "boolean" ? undefined : x : T
->typeof x === "string" || typeof x === "boolean" : boolean
->typeof x === "string" : boolean
->typeof x : "string" | "number" | "bigint" | "boolean" | "symbol" | "undefined" | "object" | "function"
->x : string | boolean | T
->"string" : "string"
->typeof x === "boolean" : boolean
->typeof x : "string" | "number" | "bigint" | "boolean" | "symbol" | "undefined" | "object" | "function"
->x : boolean | T
->"boolean" : "boolean"
->undefined : undefined
->x : T
-}
-
-var c1: number;
->c1 : number
-
-var c1 = h(5);
->c1 : number
->h(5) : 5
->h : <T>(x: string | boolean | T) => T
+const c1 = f3(5);  // 5
+>c1 : 5
+>f3(5) : 5
+>f3 : <T>(x: string | false | T) => T
 >5 : 5
 
-var c2: string;
->c2 : string
+const c2 = f3(sn);  // number
+>c2 : number
+>f3(sn) : number
+>f3 : <T>(x: string | false | T) => T
+>sn : string | number
 
-var c2 = h("abc");
->c2 : string
->h("abc") : never
->h : <T>(x: string | boolean | T) => T
+const c3 = f3(true);  // true
+>c3 : true
+>f3(true) : true
+>f3 : <T>(x: string | false | T) => T
+>true : true
+
+const c4 = f3(b);  // true
+>c4 : true
+>f3(b) : true
+>f3 : <T>(x: string | false | T) => T
+>b : boolean
+
+const c5 = f3("abc");  // never
+>c5 : never
+>f3("abc") : never
+>f3 : <T>(x: string | false | T) => T
 >"abc" : "abc"
 
+declare function f4<T>(x: string & T): T;
+>f4 : <T>(x: string & T) => T
+>x : string & T
+
+var d1 = f4("abc");
+>d1 : string
+>f4("abc") : "abc"
+>f4 : <T>(x: string & T) => T
+>"abc" : "abc"
+
+var d2 = f4(s);
+>d2 : unknown
+>f4(s) : unknown
+>f4 : <T>(x: string & T) => T
+>s : string
+
+var d3 = f4(42);  // Error
+>d3 : any
+>f4(42) : any
+>f4 : <T>(x: string & T) => T
+>42 : 42
+
+// Repros from #32434
+
+declare function foo<T>(x: T | Promise<T>): void;
+>foo : <T>(x: T | Promise<T>) => void
+>x : T | Promise<T>
+
+declare let x: false | Promise<true>;
+>x : false | Promise<true>
+>false : false
+>true : true
+
+foo(x);
+>foo(x) : void
+>foo : <T>(x: T | Promise<T>) => void
+>x : false | Promise<true>
+
+declare function bar<T>(x: T, y: string | T): T;
+>bar : <T>(x: T, y: string | T) => T
+>x : T
+>y : string | T
+
+const y = bar(1, 2);
+>y : 1 | 2
+>bar(1, 2) : 1 | 2
+>bar : <T>(x: T, y: string | T) => T
+>1 : 1
+>2 : 2
+

From de837ed51f8f6f329cee97932bf3a8e7ea4cc46e Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Wed, 17 Jul 2019 15:07:36 -0700
Subject: [PATCH 022/151] Accept new baselines

---
 .../reference/unionTypeInference.errors.txt      | 10 +++++-----
 tests/baselines/reference/unionTypeInference.js  |  6 +++---
 .../reference/unionTypeInference.symbols         | 16 ++++++++--------
 .../baselines/reference/unionTypeInference.types |  8 ++++----
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/tests/baselines/reference/unionTypeInference.errors.txt b/tests/baselines/reference/unionTypeInference.errors.txt
index 6993f4280a7..2fe480d0a07 100644
--- a/tests/baselines/reference/unionTypeInference.errors.txt
+++ b/tests/baselines/reference/unionTypeInference.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/conformance/types/typeRelationships/typeInference/unionTypeInference.ts(13,24): error TS2345: Argument of type '1' is not assignable to parameter of type 'string'.
-tests/cases/conformance/types/typeRelationships/typeInference/unionTypeInference.ts(31,13): error TS2345: Argument of type '42' is not assignable to parameter of type 'never'.
+tests/cases/conformance/types/typeRelationships/typeInference/unionTypeInference.ts(31,15): error TS2345: Argument of type '42' is not assignable to parameter of type 'never'.
 
 
 ==== tests/cases/conformance/types/typeRelationships/typeInference/unionTypeInference.ts (2 errors) ====
@@ -33,10 +33,10 @@ tests/cases/conformance/types/typeRelationships/typeInference/unionTypeInference
     
     declare function f4<T>(x: string & T): T;
     
-    var d1 = f4("abc");
-    var d2 = f4(s);
-    var d3 = f4(42);  // Error
-                ~~
+    const d1 = f4("abc");
+    const d2 = f4(s);
+    const d3 = f4(42);  // Error
+                  ~~
 !!! error TS2345: Argument of type '42' is not assignable to parameter of type 'never'.
     
     // Repros from #32434
diff --git a/tests/baselines/reference/unionTypeInference.js b/tests/baselines/reference/unionTypeInference.js
index fb94e1910f1..868140e83a0 100644
--- a/tests/baselines/reference/unionTypeInference.js
+++ b/tests/baselines/reference/unionTypeInference.js
@@ -27,9 +27,9 @@ const c5 = f3("abc");  // never
 
 declare function f4<T>(x: string & T): T;
 
-var d1 = f4("abc");
-var d2 = f4(s);
-var d3 = f4(42);  // Error
+const d1 = f4("abc");
+const d2 = f4(s);
+const d3 = f4(42);  // Error
 
 // Repros from #32434
 
diff --git a/tests/baselines/reference/unionTypeInference.symbols b/tests/baselines/reference/unionTypeInference.symbols
index a34be279837..52b8809dee6 100644
--- a/tests/baselines/reference/unionTypeInference.symbols
+++ b/tests/baselines/reference/unionTypeInference.symbols
@@ -94,23 +94,23 @@ declare function f4<T>(x: string & T): T;
 >T : Symbol(T, Decl(unionTypeInference.ts, 26, 20))
 >T : Symbol(T, Decl(unionTypeInference.ts, 26, 20))
 
-var d1 = f4("abc");
->d1 : Symbol(d1, Decl(unionTypeInference.ts, 28, 3))
+const d1 = f4("abc");
+>d1 : Symbol(d1, Decl(unionTypeInference.ts, 28, 5))
 >f4 : Symbol(f4, Decl(unionTypeInference.ts, 24, 21))
 
-var d2 = f4(s);
->d2 : Symbol(d2, Decl(unionTypeInference.ts, 29, 3))
+const d2 = f4(s);
+>d2 : Symbol(d2, Decl(unionTypeInference.ts, 29, 5))
 >f4 : Symbol(f4, Decl(unionTypeInference.ts, 24, 21))
 >s : Symbol(s, Decl(unionTypeInference.ts, 1, 13))
 
-var d3 = f4(42);  // Error
->d3 : Symbol(d3, Decl(unionTypeInference.ts, 30, 3))
+const d3 = f4(42);  // Error
+>d3 : Symbol(d3, Decl(unionTypeInference.ts, 30, 5))
 >f4 : Symbol(f4, Decl(unionTypeInference.ts, 24, 21))
 
 // Repros from #32434
 
 declare function foo<T>(x: T | Promise<T>): void;
->foo : Symbol(foo, Decl(unionTypeInference.ts, 30, 16))
+>foo : Symbol(foo, Decl(unionTypeInference.ts, 30, 18))
 >T : Symbol(T, Decl(unionTypeInference.ts, 34, 21))
 >x : Symbol(x, Decl(unionTypeInference.ts, 34, 24))
 >T : Symbol(T, Decl(unionTypeInference.ts, 34, 21))
@@ -122,7 +122,7 @@ declare let x: false | Promise<true>;
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --))
 
 foo(x);
->foo : Symbol(foo, Decl(unionTypeInference.ts, 30, 16))
+>foo : Symbol(foo, Decl(unionTypeInference.ts, 30, 18))
 >x : Symbol(x, Decl(unionTypeInference.ts, 35, 11))
 
 declare function bar<T>(x: T, y: string | T): T;
diff --git a/tests/baselines/reference/unionTypeInference.types b/tests/baselines/reference/unionTypeInference.types
index 836c298bdbc..e6d47fa4bda 100644
--- a/tests/baselines/reference/unionTypeInference.types
+++ b/tests/baselines/reference/unionTypeInference.types
@@ -113,19 +113,19 @@ declare function f4<T>(x: string & T): T;
 >f4 : <T>(x: string & T) => T
 >x : string & T
 
-var d1 = f4("abc");
->d1 : string
+const d1 = f4("abc");
+>d1 : "abc"
 >f4("abc") : "abc"
 >f4 : <T>(x: string & T) => T
 >"abc" : "abc"
 
-var d2 = f4(s);
+const d2 = f4(s);
 >d2 : unknown
 >f4(s) : unknown
 >f4 : <T>(x: string & T) => T
 >s : string
 
-var d3 = f4(42);  // Error
+const d3 = f4(42);  // Error
 >d3 : any
 >f4(42) : any
 >f4 : <T>(x: string & T) => T

From 69ec5e03663bc2ad25ae11b20baf0eb767ce3d5d Mon Sep 17 00:00:00 2001
From: csigs <csigs@outlook.com>
Date: Wed, 17 Jul 2019 22:10:20 +0000
Subject: [PATCH 023/151] LEGO: check in for master to temporary branch.

---
 .../diagnosticMessages.generated.json.lcl                   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/loc/lcl/rus/diagnosticMessages/diagnosticMessages.generated.json.lcl b/src/loc/lcl/rus/diagnosticMessages/diagnosticMessages.generated.json.lcl
index 8d7a0a4acbd..5ba07d067e1 100644
--- a/src/loc/lcl/rus/diagnosticMessages/diagnosticMessages.generated.json.lcl
+++ b/src/loc/lcl/rus/diagnosticMessages/diagnosticMessages.generated.json.lcl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <LCX SchemaVersion="6.0" Name="f:\ddSetup\sources\typescript\localization\compiler2.resx" PsrId="306" FileType="1" SrcCul="en-US" TgtCul="ru-RU" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
   <Props>
     <Str Name="CustomName1" Val="Custom 1" />
@@ -3300,7 +3300,7 @@
         <Str Cat="Text">
           <Val><![CDATA[Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Порождать источник вместе с sourcemap в одном файле (нужно задать параметр --inlineSourceMap или --sourceMap).]]></Val>
+            <Val><![CDATA[Порождать источник вместе с сопоставителями с исходным кодом в одном файле (нужно задать параметр --inlineSourceMap или --sourceMap).]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />
@@ -4122,7 +4122,7 @@
         <Str Cat="Text">
           <Val><![CDATA[Generates a sourcemap for each corresponding '.d.ts' file.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Создает sourcemap для каждого соответствующего файла ".d.ts".]]></Val>
+            <Val><![CDATA[Создает сопоставитель с исходным кодом для каждого соответствующего файла ".d.ts".]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />

From c6b77fa5dfe9a396c24035ed77a947c81a1ba42f Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Wed, 17 Jul 2019 15:15:56 -0700
Subject: [PATCH 024/151] Fix lint error

---
 src/compiler/checker.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 1a2fc79534e..81c2a9590ba 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -15773,7 +15773,7 @@ namespace ts {
                 // type variable. If there is more than one naked type variable, give lower priority to
                 // the inferences as they are less specific.
                 if (typeVariableCount > 0) {
-                    const unmatched = flatMap(sources, (s, i) => matched![i] ? undefined : s);
+                    const unmatched = flatMap(sources, (s, i) => matched[i] ? undefined : s);
                     if (unmatched.length) {
                         const s = getUnionType(unmatched);
                         const savePriority = priority;

From 7f071d2a1bda299cf3ac4eacb8abae951a095534 Mon Sep 17 00:00:00 2001
From: Orta Therox <orta.therox@gmail.com>
Date: Wed, 17 Jul 2019 18:21:53 -0400
Subject: [PATCH 025/151] Set the ScriptTarget of ESNext to be 99 so it doesn't
 change between releases

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

diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 439dfb5f98e..6d46d36d167 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -4808,7 +4808,7 @@ namespace ts {
         ES2018 = 5,
         ES2019 = 6,
         ES2020 = 7,
-        ESNext = 8,
+        ESNext = 99,
         JSON = 100,
         Latest = ESNext,
     }

From a24e4b0d2ca34b6ad12aae9218ea4e2f9ddd32f4 Mon Sep 17 00:00:00 2001
From: Orta Therox <orta.therox@gmail.com>
Date: Wed, 17 Jul 2019 18:24:35 -0400
Subject: [PATCH 026/151] Undo accidental push to master

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

diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 6d46d36d167..439dfb5f98e 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -4808,7 +4808,7 @@ namespace ts {
         ES2018 = 5,
         ES2019 = 6,
         ES2020 = 7,
-        ESNext = 99,
+        ESNext = 8,
         JSON = 100,
         Latest = ESNext,
     }

From 5f6cdf17ea0441f42190610254c9d7f0c024459e Mon Sep 17 00:00:00 2001
From: Orta Therox <orta.therox@gmail.com>
Date: Wed, 17 Jul 2019 18:27:29 -0400
Subject: [PATCH 027/151] Set the ScriptTarget of ESNext to be 99 so it doesn't
 change between releases

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

diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 439dfb5f98e..6d46d36d167 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -4808,7 +4808,7 @@ namespace ts {
         ES2018 = 5,
         ES2019 = 6,
         ES2020 = 7,
-        ESNext = 8,
+        ESNext = 99,
         JSON = 100,
         Latest = ESNext,
     }

From 8f020559fbde9d0c8252a3fde5dc4f2890461fb0 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Wed, 17 Jul 2019 18:49:56 -0700
Subject: [PATCH 028/151] Treat Array<T> and ReadonlyArray<T> as synonymous in
 inference

---
 src/compiler/checker.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 81c2a9590ba..f044ee8e375 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -15587,7 +15587,8 @@ namespace ts {
                         }
                     }
                 }
-                if (getObjectFlags(source) & ObjectFlags.Reference && getObjectFlags(target) & ObjectFlags.Reference && (<TypeReference>source).target === (<TypeReference>target).target) {
+                if (getObjectFlags(source) & ObjectFlags.Reference && getObjectFlags(target) & ObjectFlags.Reference && (
+                    (<TypeReference>source).target === (<TypeReference>target).target || isArrayType(source) && isArrayType(target))) {
                     // If source and target are references to the same generic type, infer from type arguments
                     inferFromTypeArguments((<TypeReference>source).typeArguments || emptyArray, (<TypeReference>target).typeArguments || emptyArray, getVariances((<TypeReference>source).target));
                 }

From 282e72419b2421c2d3b86d18a15256602df530a1 Mon Sep 17 00:00:00 2001
From: Orta Therox <orta.therox@gmail.com>
Date: Wed, 17 Jul 2019 22:56:28 -0400
Subject: [PATCH 029/151] Set the ModuleKind value for ESNext to be 99 so it
 doesn't change between releases (and yet another module system?!)

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

diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 6d46d36d167..67c85147aed 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -4760,7 +4760,7 @@ namespace ts {
         UMD = 3,
         System = 4,
         ES2015 = 5,
-        ESNext = 6
+        ESNext = 99
     }
 
     export const enum JsxEmit {

From 0c4422e47203cc3a5b3680aac443ab031c03c1fb Mon Sep 17 00:00:00 2001
From: Orta Therox <orta.therox@gmail.com>
Date: Thu, 18 Jul 2019 11:08:39 -0400
Subject: [PATCH 030/151] Adds baseline updates

---
 tests/baselines/reference/api/tsserverlibrary.d.ts          | 6 +++---
 tests/baselines/reference/api/typescript.d.ts               | 6 +++---
 .../sample1/initial-Build/when-target-option-changes.js     | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts
index 1810cb020e3..c2bad61505b 100644
--- a/tests/baselines/reference/api/tsserverlibrary.d.ts
+++ b/tests/baselines/reference/api/tsserverlibrary.d.ts
@@ -2600,7 +2600,7 @@ declare namespace ts {
         UMD = 3,
         System = 4,
         ES2015 = 5,
-        ESNext = 6
+        ESNext = 99
     }
     enum JsxEmit {
         None = 0,
@@ -2640,9 +2640,9 @@ declare namespace ts {
         ES2018 = 5,
         ES2019 = 6,
         ES2020 = 7,
-        ESNext = 8,
+        ESNext = 99,
         JSON = 100,
-        Latest = 8
+        Latest = 99
     }
     enum LanguageVariant {
         Standard = 0,
diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts
index f74b4b14683..7a2559bbc22 100644
--- a/tests/baselines/reference/api/typescript.d.ts
+++ b/tests/baselines/reference/api/typescript.d.ts
@@ -2600,7 +2600,7 @@ declare namespace ts {
         UMD = 3,
         System = 4,
         ES2015 = 5,
-        ESNext = 6
+        ESNext = 99
     }
     enum JsxEmit {
         None = 0,
@@ -2640,9 +2640,9 @@ declare namespace ts {
         ES2018 = 5,
         ES2019 = 6,
         ES2020 = 7,
-        ESNext = 8,
+        ESNext = 99,
         JSON = 100,
-        Latest = 8
+        Latest = 99
     }
     enum LanguageVariant {
         Standard = 0,
diff --git a/tests/baselines/reference/tsbuild/sample1/initial-Build/when-target-option-changes.js b/tests/baselines/reference/tsbuild/sample1/initial-Build/when-target-option-changes.js
index 895ac5e4bc5..c31d39c0647 100644
--- a/tests/baselines/reference/tsbuild/sample1/initial-Build/when-target-option-changes.js
+++ b/tests/baselines/reference/tsbuild/sample1/initial-Build/when-target-option-changes.js
@@ -70,7 +70,7 @@ export function multiply(a, b) { return a * b; }
       "incremental": true,
       "listFiles": true,
       "listEmittedFiles": true,
-      "target": 8,
+      "target": 99,
       "configFilePath": "./tsconfig.json"
     },
     "referencedMap": {},

From c30ba7884c76a9e94772c0c89604cb6cbfaced99 Mon Sep 17 00:00:00 2001
From: Jake Boone <jakeboone02@gmail.com>
Date: Thu, 18 Jul 2019 12:38:14 -0700
Subject: [PATCH 031/151] Fix capitalization in parseInt description

---
 src/lib/es5.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/es5.d.ts b/src/lib/es5.d.ts
index 0d1481dd7d2..2594344decc 100644
--- a/src/lib/es5.d.ts
+++ b/src/lib/es5.d.ts
@@ -12,7 +12,7 @@ declare var Infinity: number;
 declare function eval(x: string): any;
 
 /**
-  * Converts A string to an integer.
+  * Converts a string to an integer.
   * @param s A string to convert into a number.
   * @param radix A value between 2 and 36 that specifies the base of the number in numString.
   * If this argument is not supplied, strings with a prefix of '0x' are considered hexadecimal.

From 90afd6d620f30bc47e862970a931ca0e207e6b28 Mon Sep 17 00:00:00 2001
From: TypeScript Bot <ts_bot@rcavanaugh.com>
Date: Fri, 19 Jul 2019 09:01:05 -0700
Subject: [PATCH 032/151] Update user baselines (#32483)

---
 .../baselines/reference/docker/azure-sdk.log  | 58 ++++++-------------
 .../reference/docker/office-ui-fabric.log     | 16 ++---
 .../reference/user/adonis-framework.log       |  2 +-
 .../user/chrome-devtools-frontend.log         |  3 +-
 tests/baselines/reference/user/lodash.log     |  2 -
 tests/baselines/reference/user/npmlog.log     |  6 +-
 6 files changed, 33 insertions(+), 54 deletions(-)

diff --git a/tests/baselines/reference/docker/azure-sdk.log b/tests/baselines/reference/docker/azure-sdk.log
index a1e33524e6e..a75af93aee1 100644
--- a/tests/baselines/reference/docker/azure-sdk.log
+++ b/tests/baselines/reference/docker/azure-sdk.log
@@ -5,16 +5,11 @@ Rush Multi-Project Build Tool 5.10.1 - https://rushjs.io
 Starting "rush rebuild"
 Executing a maximum of 1 simultaneous processes...
 [@azure/cosmos] started
-npm ERR! code ELIFECYCLE
-npm ERR! errno 2
-npm ERR! @azure/cosmos@X.X.X compile: `echo Using TypeScript && tsc --version && tsc -p tsconfig.prod.json --pretty`
-npm ERR! Exit status 2
-npm ERR! 
-npm ERR! Failed at the @azure/cosmos@X.X.X compile script.
-npm ERR! This is probably not a problem with npm. There is likely additional logging output above.
-npm ERR! A complete log of this run can be found in:
-npm ERR!     /root/.npm/_logs/2019-07-15T13_35_10_789Z-debug.log
+XX of XX: [@azure/cosmos] completed successfully in ? seconds
+[@azure/event-processor-host] started
+XX of XX: [@azure/event-processor-host] completed successfully in ? seconds
 [@azure/service-bus] started
+Warning: You have changed the public API signature for this project. Updating review/service-bus.api.md
 [@azure/storage-blob] started
 XX of XX: [@azure/storage-blob] completed successfully in ? seconds
 [@azure/storage-file] started
@@ -23,6 +18,8 @@ XX of XX: [@azure/storage-file] completed successfully in ? seconds
 XX of XX: [@azure/storage-queue] completed successfully in ? seconds
 [@azure/template] started
 XX of XX: [@azure/template] completed successfully in ? seconds
+[testhub] started
+XX of XX: [testhub] completed successfully in ? seconds
 [@azure/abort-controller] started
 XX of XX: [@azure/abort-controller] completed successfully in ? seconds
 [@azure/core-asynciterator-polyfill] started
@@ -38,7 +35,7 @@ npm ERR!
 npm ERR! Failed at the @azure/core-http@X.X.X-preview.1 build:tsc script.
 npm ERR! This is probably not a problem with npm. There is likely additional logging output above.
 npm ERR! A complete log of this run can be found in:
-npm ERR!     /root/.npm/_logs/2019-07-15T13_36_24_862Z-debug.log
+npm ERR!     /root/.npm/_logs/2019-07-19T13_40_31_496Z-debug.log
 ERROR: "build:tsc" exited with 2.
 npm ERR! code ELIFECYCLE
 npm ERR! errno 1
@@ -48,20 +45,17 @@ npm ERR!
 npm ERR! Failed at the @azure/core-http@X.X.X-preview.1 build:lib script.
 npm ERR! This is probably not a problem with npm. There is likely additional logging output above.
 npm ERR! A complete log of this run can be found in:
-npm ERR!     /root/.npm/_logs/2019-07-15T13_36_24_938Z-debug.log
+npm ERR!     /root/.npm/_logs/2019-07-19T13_40_31_533Z-debug.log
 ERROR: "build:lib" exited with 1.
 [@azure/core-paging] started
 XX of XX: [@azure/core-paging] completed successfully in ? seconds
-[@azure/event-processor-host] started
-XX of XX: [@azure/event-processor-host] completed successfully in ? seconds
-[testhub] started
-XX of XX: [testhub] completed successfully in ? seconds
-SUCCESS (10)
+SUCCESS (11)
 ================================
 @azure/abort-controller (? seconds)
 @azure/core-asynciterator-polyfill (? seconds)
 @azure/core-auth (? seconds)
 @azure/core-paging (? seconds)
+@azure/cosmos (? seconds)
 @azure/event-processor-host (? seconds)
 @azure/storage-blob (? seconds)
 @azure/storage-file (? seconds)
@@ -69,6 +63,11 @@ SUCCESS (10)
 @azure/template (? seconds)
 testhub (? seconds)
 ================================
+SUCCESS WITH WARNINGS (1)
+================================
+@azure/service-bus (? seconds)
+Warning: You have changed the public API signature for this project. Updating review/service-bus.api.md
+================================
 BLOCKED (7)
 ================================
 @azure/core-amqp
@@ -79,7 +78,7 @@ BLOCKED (7)
 @azure/keyvault-keys
 @azure/keyvault-secrets
 ================================
-FAILURE (3)
+FAILURE (1)
 ================================
 @azure/core-http (? seconds)
 npm ERR! code ELIFECYCLE
@@ -90,7 +89,7 @@ npm ERR!
 npm ERR! Failed at the @azure/core-http@X.X.X-preview.1 build:tsc script.
 npm ERR! This is probably not a problem with npm. There is likely additional logging output above.
 npm ERR! A complete log of this run can be found in:
-npm ERR!     /root/.npm/_logs/2019-07-15T13_36_24_862Z-debug.log
+npm ERR!     /root/.npm/_logs/2019-07-19T13_40_31_496Z-debug.log
 ERROR: "build:tsc" exited with 2.
 npm ERR! code ELIFECYCLE
 npm ERR! errno 1
@@ -100,24 +99,8 @@ npm ERR!
 npm ERR! Failed at the @azure/core-http@X.X.X-preview.1 build:lib script.
 npm ERR! This is probably not a problem with npm. There is likely additional logging output above.
 npm ERR! A complete log of this run can be found in:
-npm ERR!     /root/.npm/_logs/2019-07-15T13_36_24_938Z-debug.log
+npm ERR!     /root/.npm/_logs/2019-07-19T13_40_31_533Z-debug.log
 ERROR: "build:lib" exited with 1.
-@azure/cosmos ( ? seconds)
-npm ERR! code ELIFECYCLE
-npm ERR! errno 2
-npm ERR! @azure/cosmos@X.X.X compile: `echo Using TypeScript && tsc --version && tsc -p tsconfig.prod.json --pretty`
-npm ERR! Exit status 2
-npm ERR!
-npm ERR! Failed at the @azure/cosmos@X.X.X compile script.
-npm ERR! This is probably not a problem with npm. There is likely additional logging output above.
-npm ERR! A complete log of this run can be found in:
-npm ERR!     /root/.npm/_logs/2019-07-15T13_35_10_789Z-debug.log
-@azure/service-bus ( ? seconds)
->>> @azure/service-bus
-tsc -p . && rollup -c 2>&1 && npm run extract-api
-error TS2318: Cannot find global type 'AsyncGenerator'.
-src/receiver.ts(193,32): error TS2739: Type '{}' is missing the following properties from type 'AsyncIterableIterator<ServiceBusMessage>': [Symbol.asyncIterator], next
-src/receiver.ts(742,32): error TS2322: Type '{}' is not assignable to type 'AsyncIterableIterator<ServiceBusMessage>'.
 ================================
 Error: Project(s) failed to build
 rush rebuild - Errors! ( ? seconds)
@@ -126,8 +109,7 @@ rush rebuild - Errors! ( ? seconds)
 
 Standard error:
 Your version of Node.js (X.X.X) has not been tested with this release of Rush. The Rush team will not accept issue reports for it. Please consider upgrading Rush or downgrading Node.js.
-XX of XX: [@azure/cosmos] failed to build!
-XX of XX: [@azure/service-bus] failed to build!
+XX of XX: [@azure/service-bus] completed with warnings in ? seconds
 XX of XX: [@azure/core-http] failed to build!
 XX of XX: [@azure/core-arm] blocked by [@azure/core-http]!
 XX of XX: [@azure/identity] blocked by [@azure/core-http]!
@@ -137,5 +119,3 @@ XX of XX: [@azure/keyvault-certificates] blocked by [@azure/core-http]!
 XX of XX: [@azure/keyvault-keys] blocked by [@azure/core-http]!
 XX of XX: [@azure/keyvault-secrets] blocked by [@azure/core-http]!
 [@azure/core-http] Returned error code: 1
-[@azure/cosmos] Returned error code: 2
-[@azure/service-bus] Returned error code: 2
diff --git a/tests/baselines/reference/docker/office-ui-fabric.log b/tests/baselines/reference/docker/office-ui-fabric.log
index c3a55fc3f6b..888e20cac4b 100644
--- a/tests/baselines/reference/docker/office-ui-fabric.log
+++ b/tests/baselines/reference/docker/office-ui-fabric.log
@@ -12,11 +12,11 @@ XX of XX: [@uifabric/tslint-rules] completed successfully in ? seconds
 ts-jest[versions] (WARN) Version X.X.X-insiders.xxxxxxxx of typescript installed has not been tested with ts-jest. If you're experiencing issues, consider using a supported version (>=2.7.0 <4.0.0). Please do not report issues in ts-jest if you are using unsupported versions.
  PASS  src/__tests__/codepenTransform.test.ts
   codepen transform
-    ✓ handles examples with function components (225ms)
+    ✓ handles examples with function components (256ms)
     ✓ handles examples with class components (38ms)
-    ✓ handles examples importing exampleData (115ms)
-    ✓ handles examples importing TestImages (45ms)
-    ✓ handles examples importing PeopleExampleData (288ms)
+    ✓ handles examples importing exampleData (125ms)
+    ✓ handles examples importing TestImages (33ms)
+    ✓ handles examples importing PeopleExampleData (270ms)
 Test Suites: 1 passed, 1 total
 Tests:       5 passed, 5 total
 Snapshots:   4 passed, 4 total
@@ -246,11 +246,11 @@ SUCCESS WITH WARNINGS (5)
 ts-jest[versions] (WARN) Version X.X.X-insiders.xxxxxxxx of typescript installed has not been tested with ts-jest. If you're experiencing issues, consider using a supported version (>=2.7.0 <4.0.0). Please do not report issues in ts-jest if you are using unsupported versions.
  PASS  src/__tests__/codepenTransform.test.ts
   codepen transform
-    ✓ handles examples with function components (225ms)
+    ✓ handles examples with function components (256ms)
     ✓ handles examples with class components (38ms)
-    ✓ handles examples importing exampleData (115ms)
-    ✓ handles examples importing TestImages (45ms)
-    ✓ handles examples importing PeopleExampleData (288ms)
+    ✓ handles examples importing exampleData (125ms)
+    ✓ handles examples importing TestImages (33ms)
+    ✓ handles examples importing PeopleExampleData (270ms)
 Test Suites: 1 passed, 1 total
 Tests:       5 passed, 5 total
 Snapshots:   4 passed, 4 total
diff --git a/tests/baselines/reference/user/adonis-framework.log b/tests/baselines/reference/user/adonis-framework.log
index e3b19b5de04..6243a7a15db 100644
--- a/tests/baselines/reference/user/adonis-framework.log
+++ b/tests/baselines/reference/user/adonis-framework.log
@@ -30,7 +30,7 @@ node_modules/adonis-framework/src/Encryption/index.js(87,15): error TS2304: Cann
 node_modules/adonis-framework/src/Encryption/index.js(101,21): error TS2769: No overload matches this call.
   Overload 1 of 4, '(data: Binary, input_encoding: undefined, output_encoding: Utf8AsciiBinaryEncoding): string', gave the following error.
     Argument of type '"base64"' is not assignable to parameter of type 'undefined'.
-  Overload 2 of 4, '(data: string, input_encoding: "binary" | "base64" | "hex" | undefined, output_encoding: Utf8AsciiBinaryEncoding): string', gave the following error.
+  Overload 2 of 4, '(data: string, input_encoding: "base64" | "binary" | "hex" | undefined, output_encoding: Utf8AsciiBinaryEncoding): string', gave the following error.
     Argument of type 'string' is not assignable to parameter of type 'Utf8AsciiBinaryEncoding'.
 node_modules/adonis-framework/src/Encryption/index.js(114,15): error TS2304: Cannot find name 'Mixed'.
 node_modules/adonis-framework/src/Encryption/index.js(119,23): error TS2554: Expected 2 arguments, but got 1.
diff --git a/tests/baselines/reference/user/chrome-devtools-frontend.log b/tests/baselines/reference/user/chrome-devtools-frontend.log
index 3f4fa8d5b95..2d4e456d759 100644
--- a/tests/baselines/reference/user/chrome-devtools-frontend.log
+++ b/tests/baselines/reference/user/chrome-devtools-frontend.log
@@ -6501,7 +6501,8 @@ node_modules/chrome-devtools-frontend/front_end/formatter_worker/acorn/acorn_loo
 node_modules/chrome-devtools-frontend/front_end/formatter_worker/acorn/acorn_loose.js(258,55): error TS2339: Property 'end' does not exist on type 'true'.
 node_modules/chrome-devtools-frontend/front_end/formatter_worker/acorn/acorn_loose.js(1365,5): error TS2339: Property 'next' does not exist on type 'LooseParser'.
 node_modules/chrome-devtools-frontend/front_end/formatter_worker/acorn/acorn_loose.js(1366,12): error TS2339: Property 'parseTopLevel' does not exist on type 'LooseParser'.
-node_modules/chrome-devtools-frontend/front_end/har_importer/HARImporter.js(26,11): error TS2403: Subsequent variable declarations must have the same type.  Variable 'page' must be of type 'any', but here has type 'HARPage'.
+node_modules/chrome-devtools-frontend/front_end/har_importer/HARImporter.js(16,32): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
+node_modules/chrome-devtools-frontend/front_end/har_importer/HARImporter.js(16,52): error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
 node_modules/chrome-devtools-frontend/front_end/har_importer/HARImporter.js(46,5): error TS2322: Type 'Date' is not assignable to type 'number'.
 node_modules/chrome-devtools-frontend/front_end/heap_profiler_test_runner/HeapProfilerTestRunner.js(320,70): error TS2339: Property 'heap_profiler' does not exist on type 'any[]'.
 node_modules/chrome-devtools-frontend/front_end/heap_profiler_test_runner/HeapProfilerTestRunner.js(321,35): error TS2339: Property 'heap_profiler' does not exist on type 'any[]'.
diff --git a/tests/baselines/reference/user/lodash.log b/tests/baselines/reference/user/lodash.log
index 954077ce729..1c358238f8d 100644
--- a/tests/baselines/reference/user/lodash.log
+++ b/tests/baselines/reference/user/lodash.log
@@ -382,8 +382,6 @@ node_modules/lodash/nthArg.js(28,26): error TS2345: Argument of type 'number | u
 node_modules/lodash/omit.js(48,32): error TS2345: Argument of type 'number' is not assignable to parameter of type 'boolean'.
 node_modules/lodash/orderBy.js(18,10): error TS1003: Identifier expected.
 node_modules/lodash/orderBy.js(18,10): error TS8024: JSDoc '@param' tag has name '', but there is no parameter with that name.
-node_modules/lodash/org.js(8,22): error TS2307: Cannot find module 'moment'.
-node_modules/lodash/org.js(9,19): error TS2307: Cannot find module 'ncp'.
 node_modules/lodash/parseInt.js(24,10): error TS1003: Identifier expected.
 node_modules/lodash/parseInt.js(24,10): error TS8024: JSDoc '@param' tag has name '', but there is no parameter with that name.
 node_modules/lodash/partial.js(48,9): error TS2339: Property 'placeholder' does not exist on type 'Function'.
diff --git a/tests/baselines/reference/user/npmlog.log b/tests/baselines/reference/user/npmlog.log
index 1e6284674e3..6b6e315d996 100644
--- a/tests/baselines/reference/user/npmlog.log
+++ b/tests/baselines/reference/user/npmlog.log
@@ -8,9 +8,9 @@ node_modules/npmlog/log.js(194,37): error TS2345: Argument of type 'any[]' is no
   Property '0' is missing in type 'any[]' but required in type '[any, ...any[]]'.
 node_modules/npmlog/log.js(218,12): error TS2551: Property '_paused' does not exist on type 'typeof EventEmitter'. Did you mean 'pause'?
 node_modules/npmlog/log.js(271,16): error TS2769: No overload matches this call.
-  Overload 1 of 2, '(buffer: string | Uint8Array | Buffer, cb?: ((err?: Error | null | undefined) => void) | undefined): boolean', gave the following error.
-    Argument of type 'string | undefined' is not assignable to parameter of type 'string | Uint8Array | Buffer'.
-      Type 'undefined' is not assignable to type 'string | Uint8Array | Buffer'.
+  Overload 1 of 2, '(buffer: string | Uint8Array, cb?: ((err?: Error | null | undefined) => void) | undefined): boolean', gave the following error.
+    Argument of type 'string | undefined' is not assignable to parameter of type 'string | Uint8Array'.
+      Type 'undefined' is not assignable to type 'string | Uint8Array'.
   Overload 2 of 2, '(str: string, encoding?: string | undefined, cb?: ((err?: Error | null | undefined) => void) | undefined): boolean', gave the following error.
     Argument of type 'string | undefined' is not assignable to parameter of type 'string'.
       Type 'undefined' is not assignable to type 'string'.

From e543d8bc5a17bdee931ac1a0d2b9ddd32a7164a9 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com>
Date: Fri, 19 Jul 2019 15:22:04 -0700
Subject: [PATCH 033/151] Fix type keyword completions (#32474)

* Fix type keyword completions

1. In functions, type keywords were omitted.
2. In All context, no keywords were omitted.

(1) fixes #28737
(2) removes 17 keywords that should not be suggested, even at the
toplevel of a typescript file:

* private
* protected
* public
* static
* abstract
* as
* constructor
* get
* infer
* is
* namespace
* require
* set
* type
* from
* global
* of

I don't know whether we have a bug tracking this or not.

* Change keyword filter in filterGlobalCompletion

Instead of changing FunctionLikeBodyKeywords

* Add more tests cases

* Make type-only completions after < more common

Because isPossiblyTypeArgumentPosition doesn't give false positives now
that it uses type information.
---
 src/harness/fourslash.ts                      | 43 +------------------
 src/services/completions.ts                   | 38 +++++++++-------
 ...FunctionLikeBody_includesPrimitiveTypes.ts | 27 ++++++++++++
 .../completionListInUnclosedTypeArguments.ts  |  9 ++--
 .../completionListIsGlobalCompletion.ts       |  2 +-
 ...mpletionsIsPossiblyTypeArgumentPosition.ts | 17 +++-----
 tests/cases/fourslash/fourslash.ts            |  1 -
 tests/cases/user/prettier/prettier            |  2 +-
 8 files changed, 64 insertions(+), 75 deletions(-)
 create mode 100644 tests/cases/fourslash/completionInFunctionLikeBody_includesPrimitiveTypes.ts

diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts
index aa764e74cdc..f12506be2fb 100644
--- a/src/harness/fourslash.ts
+++ b/src/harness/fourslash.ts
@@ -797,7 +797,7 @@ namespace FourSlash {
                     for (const include of toArray(options.includes)) {
                         const name = typeof include === "string" ? include : include.name;
                         const found = nameToEntries.get(name);
-                        if (!found) throw this.raiseError(`No completion ${name} found`);
+                        if (!found) throw this.raiseError(`Includes: completion '${name}' not found.`);
                         assert(found.length === 1); // Must use 'exact' for multiple completions with same name
                         this.verifyCompletionEntry(ts.first(found), include);
                     }
@@ -806,7 +806,7 @@ namespace FourSlash {
                     for (const exclude of toArray(options.excludes)) {
                         assert(typeof exclude === "string");
                         if (nameToEntries.has(exclude)) {
-                            this.raiseError(`Did not expect to get a completion named ${exclude}`);
+                            this.raiseError(`Excludes: unexpected completion '${exclude}' found.`);
                         }
                     }
                 }
@@ -4827,40 +4827,23 @@ namespace FourSlashInterface {
             "interface",
             "let",
             "package",
-            "private",
-            "protected",
-            "public",
-            "static",
             "yield",
-            "abstract",
-            "as",
             "any",
             "async",
             "await",
             "boolean",
-            "constructor",
             "declare",
-            "get",
-            "infer",
-            "is",
             "keyof",
             "module",
-            "namespace",
             "never",
             "readonly",
-            "require",
             "number",
             "object",
-            "set",
             "string",
             "symbol",
-            "type",
             "unique",
             "unknown",
-            "from",
-            "global",
             "bigint",
-            "of",
         ].map(keywordEntry);
 
         export const statementKeywords: ReadonlyArray<ExpectedCompletionEntryObject> = statementKeywordsWithTypes.filter(k => {
@@ -5041,40 +5024,23 @@ namespace FourSlashInterface {
             "interface",
             "let",
             "package",
-            "private",
-            "protected",
-            "public",
-            "static",
             "yield",
-            "abstract",
-            "as",
             "any",
             "async",
             "await",
             "boolean",
-            "constructor",
             "declare",
-            "get",
-            "infer",
-            "is",
             "keyof",
             "module",
-            "namespace",
             "never",
             "readonly",
-            "require",
             "number",
             "object",
-            "set",
             "string",
             "symbol",
-            "type",
             "unique",
             "unknown",
-            "from",
-            "global",
             "bigint",
-            "of",
         ].map(keywordEntry);
 
         export const globalInJsKeywords = getInJsKeywords(globalKeywords);
@@ -5127,11 +5093,6 @@ namespace FourSlashInterface {
 
         export const insideMethodInJsKeywords = getInJsKeywords(insideMethodKeywords);
 
-        export const globalKeywordsPlusUndefined: ReadonlyArray<ExpectedCompletionEntryObject> = (() => {
-            const i = ts.findIndex(globalKeywords, x => x.name === "unique");
-            return [...globalKeywords.slice(0, i), keywordEntry("undefined"), ...globalKeywords.slice(i)];
-        })();
-
         export const globals: ReadonlyArray<ExpectedCompletionEntryObject> = [
             globalThisEntry,
             ...globalsVars,
diff --git a/src/services/completions.ts b/src/services/completions.ts
index b5c412a788a..e9a38fb1516 100644
--- a/src/services/completions.ts
+++ b/src/services/completions.ts
@@ -947,11 +947,13 @@ namespace ts.Completions {
             // Right of dot member completion list
             completionKind = CompletionKind.PropertyAccess;
 
-            // Since this is qualified name check its a type node location
+            // Since this is qualified name check it's a type node location
             const isImportType = isLiteralImportTypeNode(node);
-            const isTypeLocation = insideJsDocTagTypeExpression || (isImportType && !(node as ImportTypeNode).isTypeOf) || isPartOfTypeNode(node.parent);
+            const isTypeLocation = insideJsDocTagTypeExpression
+                || (isImportType && !(node as ImportTypeNode).isTypeOf)
+                || isPartOfTypeNode(node.parent)
+                || isPossiblyTypeArgumentPosition(contextToken, sourceFile, typeChecker);
             const isRhsOfImportDeclaration = isInRightSideOfInternalImportEqualsDeclaration(node);
-            const allowTypeOrValue = isRhsOfImportDeclaration || (!isTypeLocation && isPossiblyTypeArgumentPosition(contextToken, sourceFile, typeChecker));
             if (isEntityName(node) || isImportType) {
                 const isNamespaceName = isModuleDeclaration(node.parent);
                 if (isNamespaceName) isNewIdentifierLocation = true;
@@ -968,7 +970,7 @@ namespace ts.Completions {
                             isNamespaceName
                                 // At `namespace N.M/**/`, if this is the only declaration of `M`, don't include `M` as a completion.
                                 ? symbol => !!(symbol.flags & SymbolFlags.Namespace) && !symbol.declarations.every(d => d.parent === node.parent)
-                                : allowTypeOrValue ?
+                                : isRhsOfImportDeclaration ?
                                     // Any kind is allowed when dotting off namespace in internal import equals declaration
                                     symbol => isValidTypeAccess(symbol) || isValidValueAccess(symbol) :
                                     isTypeLocation ? isValidTypeAccess : isValidValueAccess;
@@ -1181,7 +1183,6 @@ namespace ts.Completions {
 
         function filterGlobalCompletion(symbols: Symbol[]): void {
             const isTypeOnly = isTypeOnlyCompletion();
-            const allowTypes = isTypeOnly || !isContextTokenValueLocation(contextToken) && isPossiblyTypeArgumentPosition(contextToken, sourceFile, typeChecker);
             if (isTypeOnly) {
                 keywordFilters = isTypeAssertion()
                     ? KeywordCompletionFilters.TypeAssertionKeywords
@@ -1202,12 +1203,9 @@ namespace ts.Completions {
                         return !!(symbol.flags & SymbolFlags.Namespace);
                     }
 
-                    if (allowTypes) {
-                        // Its a type, but you can reach it by namespace.type as well
-                        const symbolAllowedAsType = symbolCanBeReferencedAtTypeLocation(symbol);
-                        if (symbolAllowedAsType || isTypeOnly) {
-                            return symbolAllowedAsType;
-                        }
+                    if (isTypeOnly) {
+                        // It's a type, but you can reach it by namespace.type as well
+                        return symbolCanBeReferencedAtTypeLocation(symbol);
                     }
                 }
 
@@ -1221,7 +1219,11 @@ namespace ts.Completions {
         }
 
         function isTypeOnlyCompletion(): boolean {
-            return insideJsDocTagTypeExpression || !isContextTokenValueLocation(contextToken) && (isPartOfTypeNode(location) || isContextTokenTypeLocation(contextToken));
+            return insideJsDocTagTypeExpression
+                || !isContextTokenValueLocation(contextToken) &&
+                (isPossiblyTypeArgumentPosition(contextToken, sourceFile, typeChecker)
+                 || isPartOfTypeNode(location)
+                 || isContextTokenTypeLocation(contextToken));
         }
 
         function isContextTokenValueLocation(contextToken: Node) {
@@ -2060,16 +2062,18 @@ namespace ts.Completions {
                 case KeywordCompletionFilters.None:
                     return false;
                 case KeywordCompletionFilters.All:
-                    return kind === SyntaxKind.AsyncKeyword || SyntaxKind.AwaitKeyword || !isContextualKeyword(kind) && !isClassMemberCompletionKeyword(kind) || kind === SyntaxKind.DeclareKeyword || kind === SyntaxKind.ModuleKeyword
+                    return isFunctionLikeBodyKeyword(kind)
+                        || kind === SyntaxKind.DeclareKeyword
+                        || kind === SyntaxKind.ModuleKeyword
                         || isTypeKeyword(kind) && kind !== SyntaxKind.UndefinedKeyword;
+                case KeywordCompletionFilters.FunctionLikeBodyKeywords:
+                    return isFunctionLikeBodyKeyword(kind);
                 case KeywordCompletionFilters.ClassElementKeywords:
                     return isClassMemberCompletionKeyword(kind);
                 case KeywordCompletionFilters.InterfaceElementKeywords:
                     return isInterfaceOrTypeLiteralCompletionKeyword(kind);
                 case KeywordCompletionFilters.ConstructorParameterKeywords:
                     return isParameterPropertyModifier(kind);
-                case KeywordCompletionFilters.FunctionLikeBodyKeywords:
-                    return isFunctionLikeBodyKeyword(kind);
                 case KeywordCompletionFilters.TypeAssertionKeywords:
                     return isTypeKeyword(kind) || kind === SyntaxKind.ConstKeyword;
                 case KeywordCompletionFilters.TypeKeywords:
@@ -2132,7 +2136,9 @@ namespace ts.Completions {
     }
 
     function isFunctionLikeBodyKeyword(kind: SyntaxKind) {
-        return kind === SyntaxKind.AsyncKeyword || kind === SyntaxKind.AwaitKeyword || !isContextualKeyword(kind) && !isClassMemberCompletionKeyword(kind);
+        return kind === SyntaxKind.AsyncKeyword
+            || kind === SyntaxKind.AwaitKeyword
+            || !isContextualKeyword(kind) && !isClassMemberCompletionKeyword(kind);
     }
 
     function keywordForNode(node: Node): SyntaxKind {
diff --git a/tests/cases/fourslash/completionInFunctionLikeBody_includesPrimitiveTypes.ts b/tests/cases/fourslash/completionInFunctionLikeBody_includesPrimitiveTypes.ts
new file mode 100644
index 00000000000..bc94936ab43
--- /dev/null
+++ b/tests/cases/fourslash/completionInFunctionLikeBody_includesPrimitiveTypes.ts
@@ -0,0 +1,27 @@
+/// <reference path='fourslash.ts'/>
+
+//// class Foo<T> { }
+//// class Bar { }
+//// function includesTypes() {
+////     new Foo</*1*/
+//// }
+//// function excludesTypes1() {
+////     new Bar</*2*/
+//// }
+//// function excludesTypes2() {
+////     1</*3*/
+//// }
+
+verify.completions(
+    {
+        marker: ["1"],
+        includes: [
+            { name: "string", sortText: completion.SortText.GlobalsOrKeywords },
+            { name: "String", sortText: completion.SortText.GlobalsOrKeywords },
+        ],
+    },
+    {
+        marker: ["2", "3"],
+        excludes: ["string"]
+    }
+);
diff --git a/tests/cases/fourslash/completionListInUnclosedTypeArguments.ts b/tests/cases/fourslash/completionListInUnclosedTypeArguments.ts
index 31397518ed8..8a100a9616e 100644
--- a/tests/cases/fourslash/completionListInUnclosedTypeArguments.ts
+++ b/tests/cases/fourslash/completionListInUnclosedTypeArguments.ts
@@ -8,14 +8,14 @@
 ////f</*1b*/T/*2b*/y/*3b*/;
 ////f</*1c*/T/*2c*/y/*3c*/>
 ////f</*1d*/T/*2d*/y/*3d*/>
-////f</*1eTypeOnly*/T/*2eTypeOnly*/y/*3eTypeOnly*/>();
+////f</*1e*/T/*2e*/y/*3e*/>();
 ////
 ////f2</*1k*/T/*2k*/y/*3k*/,
 ////f2</*1l*/T/*2l*/y/*3l*/,{| "newId": true |}T{| "newId": true |}y{| "newId": true |}
 ////f2</*1m*/T/*2m*/y/*3m*/,{| "newId": true |}T{| "newId": true |}y{| "newId": true |};
 ////f2</*1n*/T/*2n*/y/*3n*/,{| "newId": true |}T{| "newId": true |}y{| "newId": true |}>
 ////f2</*1o*/T/*2o*/y/*3o*/,{| "newId": true |}T{| "newId": true |}y{| "newId": true |}>
-////f2</*1pTypeOnly*/T/*2pTypeOnly*/y/*3pTypeOnly*/,{| "newId": true, "typeOnly": true |}T{| "newId": true, "typeOnly": true |}y{| "newId": true, "typeOnly": true |}>();
+////f2</*1p*/T/*2p*/y/*3p*/,{| "newId": true, "typeOnly": true |}T{| "newId": true, "typeOnly": true |}y{| "newId": true, "typeOnly": true |}>();
 ////
 ////f2<typeof /*1uValueOnly*/x, {| "newId": true |}T{| "newId": true |}y{| "newId": true |}
 ////
@@ -25,12 +25,11 @@
 
 goTo.eachMarker(marker => {
     const markerName = test.markerName(marker) || "";
-    const typeOnly = markerName.endsWith("TypeOnly") || marker.data && marker.data.typeOnly;
     const valueOnly = markerName.endsWith("ValueOnly");
     verify.completions({
         marker,
-        includes: typeOnly ? "Type" : valueOnly ? "x" : ["Type", "x"],
-        excludes: typeOnly ? "x" : valueOnly ? "Type" : [],
+        includes: valueOnly ? "x" : "Type",
+        excludes: valueOnly ? "Type" : "x",
         isNewIdentifierLocation: marker.data && marker.data.newId || false,
     });
 });
diff --git a/tests/cases/fourslash/completionListIsGlobalCompletion.ts b/tests/cases/fourslash/completionListIsGlobalCompletion.ts
index ea89155a771..91cd1a0f9c7 100644
--- a/tests/cases/fourslash/completionListIsGlobalCompletion.ts
+++ b/tests/cases/fourslash/completionListIsGlobalCompletion.ts
@@ -48,5 +48,5 @@ verify.completions(
     { marker: "13", exact: globals, isGlobalCompletion: false },
     { marker: "15", exact: globals, isGlobalCompletion: true, isNewIdentifierLocation: true },
     { marker: "16", exact: [...x, completion.globalThisEntry, ...completion.globalsVars, completion.undefinedVarEntry], isGlobalCompletion: false },
-    { marker: "17", exact: completion.globalKeywordsPlusUndefined, isGlobalCompletion: false },
+    { marker: "17", exact: completion.globalKeywords, isGlobalCompletion: false },
 );
diff --git a/tests/cases/fourslash/completionsIsPossiblyTypeArgumentPosition.ts b/tests/cases/fourslash/completionsIsPossiblyTypeArgumentPosition.ts
index 1ea8416d70b..704fe0d8347 100644
--- a/tests/cases/fourslash/completionsIsPossiblyTypeArgumentPosition.ts
+++ b/tests/cases/fourslash/completionsIsPossiblyTypeArgumentPosition.ts
@@ -9,25 +9,22 @@
 ////x + {| "valueOnly": true |}
 ////x < {| "valueOnly": true |}
 ////f < {| "valueOnly": true |}
-////g < {| "valueOnly": false |}
-////const something: C<{| "typeOnly": true |};
-////const something2: C<C<{| "typeOnly": true |};
-////new C<{| "valueOnly": false |};
-////new C<C<{| "valueOnly": false |};
+////g < /*g*/
+////const something: C</*something*/;
+////const something2: C<C</*something2*/;
+////new C</*C*/;
+////new C<C</*CC*/;
 ////
 ////declare const callAndConstruct: { new<T>(): callAndConstruct<T>; <T>(): string; };
 ////interface callAndConstruct<T> {}
 ////new callAndConstruct<callAndConstruct</*callAndConstruct*/
 
 for (const marker of test.markers()) {
-    if (marker.data && marker.data.typeOnly) {
-        verify.completions({ marker, includes: "T", excludes: "x" });
-    }
-    else if (marker.data && marker.data.valueOnly) {
+    if (marker.data && marker.data.valueOnly) {
         verify.completions({ marker, includes: "x", excludes: "T" });
     }
     else {
-        verify.completions({ marker, includes: ["x", "T"] });
+        verify.completions({ marker, includes: "T", excludes: "x" });
     }
 }
 
diff --git a/tests/cases/fourslash/fourslash.ts b/tests/cases/fourslash/fourslash.ts
index 73534c6c152..cbb6df28585 100644
--- a/tests/cases/fourslash/fourslash.ts
+++ b/tests/cases/fourslash/fourslash.ts
@@ -685,7 +685,6 @@ declare namespace completion {
     export const globalInJsKeywords: ReadonlyArray<Entry>;
     export const insideMethodKeywords: ReadonlyArray<Entry>;
     export const insideMethodInJsKeywords: ReadonlyArray<Entry>;
-    export const globalKeywordsPlusUndefined: ReadonlyArray<Entry>;
     export const globalsVars: ReadonlyArray<Entry>;
     export function globalsInsideFunction(plus: ReadonlyArray<Entry>): ReadonlyArray<Entry>;
     export function globalsInJsInsideFunction(plus: ReadonlyArray<Entry>): ReadonlyArray<Entry>;
diff --git a/tests/cases/user/prettier/prettier b/tests/cases/user/prettier/prettier
index 1e471a00796..7f938c71ffd 160000
--- a/tests/cases/user/prettier/prettier
+++ b/tests/cases/user/prettier/prettier
@@ -1 +1 @@
-Subproject commit 1e471a007968b7490563b91ed6909ae6046f3fe8
+Subproject commit 7f938c71ffda293eb1b69adf8bd12b7c11f9113b

From aab3069e643952f5ddfe750fe3e5f196c16c3915 Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Fri, 19 Jul 2019 15:55:22 -0700
Subject: [PATCH 034/151] Fix the assert of reporting file infos still attached
 to the project for circular json reference

---
 src/server/editorServices.ts                  | 19 ++++++++++++++++++-
 src/testRunner/unittests/tsserver/projects.ts | 17 +++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
index 81c56bb179b..df9f0e3ee01 100644
--- a/src/server/editorServices.ts
+++ b/src/server/editorServices.ts
@@ -1087,7 +1087,24 @@ namespace ts.server {
 
             project.close();
             if (Debug.shouldAssert(AssertionLevel.Normal)) {
-                this.filenameToScriptInfo.forEach(info => Debug.assert(!info.isAttached(project), "Found script Info still attached to project", () => `${project.projectName}: ScriptInfos still attached: ${JSON.stringify(mapDefined(arrayFrom(this.filenameToScriptInfo.values()), info => info.isAttached(project) ? info : undefined))}`));
+                this.filenameToScriptInfo.forEach(info => Debug.assert(
+                    !info.isAttached(project),
+                    "Found script Info still attached to project",
+                    () => `${project.projectName}: ScriptInfos still attached: ${JSON.stringify(
+                        arrayFrom(
+                            mapDefinedIterator(
+                                this.filenameToScriptInfo.values(),
+                                info => info.isAttached(project) ?
+                                    {
+                                        fileName: info.fileName,
+                                        projects: info.containingProjects.map(p => p.projectName),
+                                        hasMixedContent: info.hasMixedContent
+                                    } : undefined
+                            )
+                        ),
+                        /*replacer*/ undefined,
+                        " "
+                    )}`));
             }
             // Remove the project from pending project updates
             this.pendingProjectUpdates.delete(project.getProjectName());
diff --git a/src/testRunner/unittests/tsserver/projects.ts b/src/testRunner/unittests/tsserver/projects.ts
index 409ce5c525f..abb21669f8a 100644
--- a/src/testRunner/unittests/tsserver/projects.ts
+++ b/src/testRunner/unittests/tsserver/projects.ts
@@ -1467,5 +1467,22 @@ var x = 10;`
                 openFilesForSession([{ file, projectRootPath }], session);
             }
         });
+
+        it("assert when removing project", () => {
+            const host = createServerHost([commonFile1, commonFile2, libFile]);
+            const service = createProjectService(host);
+            service.openClientFile(commonFile1.path);
+            const project = service.inferredProjects[0];
+            checkProjectActualFiles(project, [commonFile1.path, libFile.path]);
+            // Intentionally create scriptinfo and attach it to project
+            const info = service.getOrCreateScriptInfoForNormalizedPath(commonFile2.path as server.NormalizedPath, /*openedByClient*/ false)!;
+            info.attachToProject(project);
+            try {
+                service.applyChangesInOpenFiles(/*openFiles*/ undefined, /*changedFiles*/ undefined, [commonFile1.path]);
+            }
+            catch (e) {
+                assert.isTrue(e.message.indexOf("Debug Failure. False expression: Found script Info still attached to project") === 0);
+            }
+        });
     });
 }

From 2450c1947facf8101cb6cba2e030877ec28a0a88 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Sat, 20 Jul 2019 09:57:10 -0700
Subject: [PATCH 035/151] Make lower priority inferences when inference process
 is blocked

---
 src/compiler/checker.ts | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index f044ee8e375..c2510f84a19 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -15459,6 +15459,7 @@ namespace ts {
             let bivariant = false;
             let propagationType: Type;
             let inferenceCount = 0;
+            let inferenceBlocked = false;
             let allowComplexConstraintInference = true;
             inferFromTypes(originalSource, originalTarget);
 
@@ -15655,6 +15656,7 @@ namespace ts {
                     if (source.flags & (TypeFlags.Object | TypeFlags.Intersection)) {
                         const key = source.id + "," + target.id;
                         if (visited && visited.get(key)) {
+                            inferenceBlocked = true;
                             return;
                         }
                         (visited || (visited = createMap<boolean>())).set(key, true);
@@ -15667,6 +15669,7 @@ namespace ts {
                         const symbol = isNonConstructorObject ? target.symbol : undefined;
                         if (symbol) {
                             if (contains(symbolStack, symbol)) {
+                                inferenceBlocked = true;
                                 return;
                             }
                             (symbolStack || (symbolStack = [])).push(symbol);
@@ -15755,6 +15758,8 @@ namespace ts {
                 const sources = source.flags & TypeFlags.Union ? (<UnionType>source).types : [source];
                 const matched = new Array<boolean>(sources.length);
                 let typeVariableCount = 0;
+                const saveInferenceBlocked = inferenceBlocked;
+                inferenceBlocked = false;
                 // First infer to types that are not naked type variables. For each source type we
                 // track whether inferences were made from that particular type to some target.
                 for (const t of target.types) {
@@ -15771,14 +15776,15 @@ namespace ts {
                 }
                 // If there are naked type variables in the target, create a union of the source types
                 // from which no inferences have been made so far and infer from that union to each naked
-                // type variable. If there is more than one naked type variable, give lower priority to
-                // the inferences as they are less specific.
+                // type variable. If there is more than one naked type variable, or if inference was blocked
+                // (meaning we didn't explore the types fully), give lower priority to the inferences as
+                // they are less specific.
                 if (typeVariableCount > 0) {
                     const unmatched = flatMap(sources, (s, i) => matched[i] ? undefined : s);
                     if (unmatched.length) {
                         const s = getUnionType(unmatched);
                         const savePriority = priority;
-                        if (typeVariableCount > 1) {
+                        if (typeVariableCount > 1 || inferenceBlocked) {
                             priority |= InferencePriority.NakedTypeVariable;
                         }
                         for (const t of target.types) {
@@ -15789,6 +15795,7 @@ namespace ts {
                         priority = savePriority;
                     }
                 }
+                inferenceBlocked = saveInferenceBlocked;
             }
 
             function inferToMappedType(source: Type, target: MappedType, constraintType: Type): boolean {

From d96d16e10b1c307719314886a2a740735593a2e8 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Sat, 20 Jul 2019 10:01:59 -0700
Subject: [PATCH 036/151] Add additional test

---
 .../typeInference/unionTypeInference.ts               | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/tests/cases/conformance/types/typeRelationships/typeInference/unionTypeInference.ts b/tests/cases/conformance/types/typeRelationships/typeInference/unionTypeInference.ts
index ccedb753354..4d9a3eae21e 100644
--- a/tests/cases/conformance/types/typeRelationships/typeInference/unionTypeInference.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeInference/unionTypeInference.ts
@@ -32,6 +32,17 @@ const d1 = f4("abc");
 const d2 = f4(s);
 const d3 = f4(42);  // Error
 
+export interface Foo<T> {
+    then<U>(f: (x: T) => U | Foo<U>, g: U): Foo<U>;
+}
+export interface Bar<T> {
+    then<S>(f: (x: T) => S | Bar<S>, g: S): Bar<S>;
+}
+
+function qux(p1: Foo<void>, p2: Bar<void>) {
+    p1 = p2;
+}
+
 // Repros from #32434
 
 declare function foo<T>(x: T | Promise<T>): void;

From 623a1725c8f7ae779eb754a0d5d9f29a7e633688 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Sat, 20 Jul 2019 10:02:46 -0700
Subject: [PATCH 037/151] Accept new baselines

---
 .../reference/unionTypeInference.errors.txt   | 11 +++
 .../baselines/reference/unionTypeInference.js | 15 ++++
 .../reference/unionTypeInference.symbols      | 83 +++++++++++++++----
 .../reference/unionTypeInference.types        | 26 ++++++
 4 files changed, 118 insertions(+), 17 deletions(-)

diff --git a/tests/baselines/reference/unionTypeInference.errors.txt b/tests/baselines/reference/unionTypeInference.errors.txt
index 2fe480d0a07..f28f32f3373 100644
--- a/tests/baselines/reference/unionTypeInference.errors.txt
+++ b/tests/baselines/reference/unionTypeInference.errors.txt
@@ -39,6 +39,17 @@ tests/cases/conformance/types/typeRelationships/typeInference/unionTypeInference
                   ~~
 !!! error TS2345: Argument of type '42' is not assignable to parameter of type 'never'.
     
+    export interface Foo<T> {
+        then<U>(f: (x: T) => U | Foo<U>, g: U): Foo<U>;
+    }
+    export interface Bar<T> {
+        then<S>(f: (x: T) => S | Bar<S>, g: S): Bar<S>;
+    }
+    
+    function qux(p1: Foo<void>, p2: Bar<void>) {
+        p1 = p2;
+    }
+    
     // Repros from #32434
     
     declare function foo<T>(x: T | Promise<T>): void;
diff --git a/tests/baselines/reference/unionTypeInference.js b/tests/baselines/reference/unionTypeInference.js
index 868140e83a0..e41872eb4d4 100644
--- a/tests/baselines/reference/unionTypeInference.js
+++ b/tests/baselines/reference/unionTypeInference.js
@@ -31,6 +31,17 @@ const d1 = f4("abc");
 const d2 = f4(s);
 const d3 = f4(42);  // Error
 
+export interface Foo<T> {
+    then<U>(f: (x: T) => U | Foo<U>, g: U): Foo<U>;
+}
+export interface Bar<T> {
+    then<S>(f: (x: T) => S | Bar<S>, g: S): Bar<S>;
+}
+
+function qux(p1: Foo<void>, p2: Bar<void>) {
+    p1 = p2;
+}
+
 // Repros from #32434
 
 declare function foo<T>(x: T | Promise<T>): void;
@@ -43,6 +54,7 @@ const y = bar(1, 2);
 
 //// [unionTypeInference.js]
 "use strict";
+exports.__esModule = true;
 var a1 = f1(1, 2); // 1 | 2
 var a2 = f1(1, "hello"); // 1
 var a3 = f1(1, sn); // number
@@ -59,5 +71,8 @@ var c5 = f3("abc"); // never
 var d1 = f4("abc");
 var d2 = f4(s);
 var d3 = f4(42); // Error
+function qux(p1, p2) {
+    p1 = p2;
+}
 foo(x);
 var y = bar(1, 2);
diff --git a/tests/baselines/reference/unionTypeInference.symbols b/tests/baselines/reference/unionTypeInference.symbols
index 52b8809dee6..0d0bf6ae9be 100644
--- a/tests/baselines/reference/unionTypeInference.symbols
+++ b/tests/baselines/reference/unionTypeInference.symbols
@@ -107,34 +107,83 @@ const d3 = f4(42);  // Error
 >d3 : Symbol(d3, Decl(unionTypeInference.ts, 30, 5))
 >f4 : Symbol(f4, Decl(unionTypeInference.ts, 24, 21))
 
+export interface Foo<T> {
+>Foo : Symbol(Foo, Decl(unionTypeInference.ts, 30, 18))
+>T : Symbol(T, Decl(unionTypeInference.ts, 32, 21))
+
+    then<U>(f: (x: T) => U | Foo<U>, g: U): Foo<U>;
+>then : Symbol(Foo.then, Decl(unionTypeInference.ts, 32, 25))
+>U : Symbol(U, Decl(unionTypeInference.ts, 33, 9))
+>f : Symbol(f, Decl(unionTypeInference.ts, 33, 12))
+>x : Symbol(x, Decl(unionTypeInference.ts, 33, 16))
+>T : Symbol(T, Decl(unionTypeInference.ts, 32, 21))
+>U : Symbol(U, Decl(unionTypeInference.ts, 33, 9))
+>Foo : Symbol(Foo, Decl(unionTypeInference.ts, 30, 18))
+>U : Symbol(U, Decl(unionTypeInference.ts, 33, 9))
+>g : Symbol(g, Decl(unionTypeInference.ts, 33, 36))
+>U : Symbol(U, Decl(unionTypeInference.ts, 33, 9))
+>Foo : Symbol(Foo, Decl(unionTypeInference.ts, 30, 18))
+>U : Symbol(U, Decl(unionTypeInference.ts, 33, 9))
+}
+export interface Bar<T> {
+>Bar : Symbol(Bar, Decl(unionTypeInference.ts, 34, 1))
+>T : Symbol(T, Decl(unionTypeInference.ts, 35, 21))
+
+    then<S>(f: (x: T) => S | Bar<S>, g: S): Bar<S>;
+>then : Symbol(Bar.then, Decl(unionTypeInference.ts, 35, 25))
+>S : Symbol(S, Decl(unionTypeInference.ts, 36, 9))
+>f : Symbol(f, Decl(unionTypeInference.ts, 36, 12))
+>x : Symbol(x, Decl(unionTypeInference.ts, 36, 16))
+>T : Symbol(T, Decl(unionTypeInference.ts, 35, 21))
+>S : Symbol(S, Decl(unionTypeInference.ts, 36, 9))
+>Bar : Symbol(Bar, Decl(unionTypeInference.ts, 34, 1))
+>S : Symbol(S, Decl(unionTypeInference.ts, 36, 9))
+>g : Symbol(g, Decl(unionTypeInference.ts, 36, 36))
+>S : Symbol(S, Decl(unionTypeInference.ts, 36, 9))
+>Bar : Symbol(Bar, Decl(unionTypeInference.ts, 34, 1))
+>S : Symbol(S, Decl(unionTypeInference.ts, 36, 9))
+}
+
+function qux(p1: Foo<void>, p2: Bar<void>) {
+>qux : Symbol(qux, Decl(unionTypeInference.ts, 37, 1))
+>p1 : Symbol(p1, Decl(unionTypeInference.ts, 39, 13))
+>Foo : Symbol(Foo, Decl(unionTypeInference.ts, 30, 18))
+>p2 : Symbol(p2, Decl(unionTypeInference.ts, 39, 27))
+>Bar : Symbol(Bar, Decl(unionTypeInference.ts, 34, 1))
+
+    p1 = p2;
+>p1 : Symbol(p1, Decl(unionTypeInference.ts, 39, 13))
+>p2 : Symbol(p2, Decl(unionTypeInference.ts, 39, 27))
+}
+
 // Repros from #32434
 
 declare function foo<T>(x: T | Promise<T>): void;
->foo : Symbol(foo, Decl(unionTypeInference.ts, 30, 18))
->T : Symbol(T, Decl(unionTypeInference.ts, 34, 21))
->x : Symbol(x, Decl(unionTypeInference.ts, 34, 24))
->T : Symbol(T, Decl(unionTypeInference.ts, 34, 21))
+>foo : Symbol(foo, Decl(unionTypeInference.ts, 41, 1))
+>T : Symbol(T, Decl(unionTypeInference.ts, 45, 21))
+>x : Symbol(x, Decl(unionTypeInference.ts, 45, 24))
+>T : Symbol(T, Decl(unionTypeInference.ts, 45, 21))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --))
->T : Symbol(T, Decl(unionTypeInference.ts, 34, 21))
+>T : Symbol(T, Decl(unionTypeInference.ts, 45, 21))
 
 declare let x: false | Promise<true>;
->x : Symbol(x, Decl(unionTypeInference.ts, 35, 11))
+>x : Symbol(x, Decl(unionTypeInference.ts, 46, 11))
 >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --))
 
 foo(x);
->foo : Symbol(foo, Decl(unionTypeInference.ts, 30, 18))
->x : Symbol(x, Decl(unionTypeInference.ts, 35, 11))
+>foo : Symbol(foo, Decl(unionTypeInference.ts, 41, 1))
+>x : Symbol(x, Decl(unionTypeInference.ts, 46, 11))
 
 declare function bar<T>(x: T, y: string | T): T;
->bar : Symbol(bar, Decl(unionTypeInference.ts, 36, 7))
->T : Symbol(T, Decl(unionTypeInference.ts, 38, 21))
->x : Symbol(x, Decl(unionTypeInference.ts, 38, 24))
->T : Symbol(T, Decl(unionTypeInference.ts, 38, 21))
->y : Symbol(y, Decl(unionTypeInference.ts, 38, 29))
->T : Symbol(T, Decl(unionTypeInference.ts, 38, 21))
->T : Symbol(T, Decl(unionTypeInference.ts, 38, 21))
+>bar : Symbol(bar, Decl(unionTypeInference.ts, 47, 7))
+>T : Symbol(T, Decl(unionTypeInference.ts, 49, 21))
+>x : Symbol(x, Decl(unionTypeInference.ts, 49, 24))
+>T : Symbol(T, Decl(unionTypeInference.ts, 49, 21))
+>y : Symbol(y, Decl(unionTypeInference.ts, 49, 29))
+>T : Symbol(T, Decl(unionTypeInference.ts, 49, 21))
+>T : Symbol(T, Decl(unionTypeInference.ts, 49, 21))
 
 const y = bar(1, 2);
->y : Symbol(y, Decl(unionTypeInference.ts, 39, 5))
->bar : Symbol(bar, Decl(unionTypeInference.ts, 36, 7))
+>y : Symbol(y, Decl(unionTypeInference.ts, 50, 5))
+>bar : Symbol(bar, Decl(unionTypeInference.ts, 47, 7))
 
diff --git a/tests/baselines/reference/unionTypeInference.types b/tests/baselines/reference/unionTypeInference.types
index e6d47fa4bda..6675e63f8c4 100644
--- a/tests/baselines/reference/unionTypeInference.types
+++ b/tests/baselines/reference/unionTypeInference.types
@@ -131,6 +131,32 @@ const d3 = f4(42);  // Error
 >f4 : <T>(x: string & T) => T
 >42 : 42
 
+export interface Foo<T> {
+    then<U>(f: (x: T) => U | Foo<U>, g: U): Foo<U>;
+>then : <U>(f: (x: T) => U | Foo<U>, g: U) => Foo<U>
+>f : (x: T) => U | Foo<U>
+>x : T
+>g : U
+}
+export interface Bar<T> {
+    then<S>(f: (x: T) => S | Bar<S>, g: S): Bar<S>;
+>then : <S>(f: (x: T) => S | Bar<S>, g: S) => Bar<S>
+>f : (x: T) => S | Bar<S>
+>x : T
+>g : S
+}
+
+function qux(p1: Foo<void>, p2: Bar<void>) {
+>qux : (p1: Foo<void>, p2: Bar<void>) => void
+>p1 : Foo<void>
+>p2 : Bar<void>
+
+    p1 = p2;
+>p1 = p2 : Bar<void>
+>p1 : Foo<void>
+>p2 : Bar<void>
+}
+
 // Repros from #32434
 
 declare function foo<T>(x: T | Promise<T>): void;

From 2541a5d0fff2037854732253dfc74a096d4c1c04 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Sat, 20 Jul 2019 14:33:35 -0700
Subject: [PATCH 038/151] Always infer between distinct type references to same
 target

---
 src/compiler/checker.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 0b4ae0d9d33..7b39ce98b93 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -15958,9 +15958,14 @@ namespace ts {
             }
         }
 
+        function isTypeReferenceToSameTarget(source: Type, target: Type) {
+            return !!(getObjectFlags(source) & ObjectFlags.Reference && getObjectFlags(target) & ObjectFlags.Reference &&
+                (<TypeReference>source).target === (<TypeReference>target).target);
+        }
+
         function typeIdenticalToSomeType(type: Type, types: Type[]): boolean {
             for (const t of types) {
-                if (isTypeIdenticalTo(t, type)) {
+                if (t === type || !isTypeReferenceToSameTarget(t, type) && isTypeIdenticalTo(t, type)) {
                     return true;
                 }
             }

From 9b2d9cdffcc540d875b0cab533b9915337fa2097 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Sun, 21 Jul 2019 14:07:45 -0700
Subject: [PATCH 039/151] Fix issues uncovered by DT tests

---
 src/compiler/checker.ts | 50 +++++++++++++++++++++++++++--------------
 1 file changed, 33 insertions(+), 17 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 7b39ce98b93..19517b6715c 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -13540,6 +13540,9 @@ namespace ts {
                     if (relation !== identityRelation) {
                         source = getApparentType(source);
                     }
+                    else if (isGenericMappedType(source)) {
+                        return Ternary.False;
+                    }
                     if (getObjectFlags(source) & ObjectFlags.Reference && getObjectFlags(target) & ObjectFlags.Reference && (<TypeReference>source).target === (<TypeReference>target).target &&
                         !(getObjectFlags(source) & ObjectFlags.MarkerType || getObjectFlags(target) & ObjectFlags.MarkerType)) {
                         // We have type references to the same generic type, and the type references are not marker
@@ -15456,7 +15459,7 @@ namespace ts {
 
         function inferTypes(inferences: InferenceInfo[], originalSource: Type, originalTarget: Type, priority: InferencePriority = 0, contravariant = false) {
             let symbolStack: Symbol[];
-            let visited: Map<boolean>;
+            let visited: Map<number>;
             let bivariant = false;
             let propagationType: Type;
             let inferenceCount = 0;
@@ -15656,15 +15659,17 @@ namespace ts {
                     }
                     if (source.flags & (TypeFlags.Object | TypeFlags.Intersection)) {
                         const key = source.id + "," + target.id;
-                        if (visited && visited.get(key)) {
-                            inferenceBlocked = true;
+                        const visitCount = visited && visited.get(key);
+                        if (visitCount !== undefined) {
+                            inferenceCount += visitCount;
                             return;
                         }
-                        (visited || (visited = createMap<boolean>())).set(key, true);
+                        (visited || (visited = createMap<number>())).set(key, 0);
                         // If we are already processing another target type with the same associated symbol (such as
                         // an instantiation of the same generic type), we do not explore this target as it would yield
                         // no further inferences. We exclude the static side of classes from this check since it shares
                         // its symbol with the instance side which would lead to false positives.
+                        const startCount = inferenceCount;
                         const isNonConstructorObject = target.flags & TypeFlags.Object &&
                             !(getObjectFlags(target) & ObjectFlags.Anonymous && target.symbol && target.symbol.flags & SymbolFlags.Class);
                         const symbol = isNonConstructorObject ? target.symbol : undefined;
@@ -15680,14 +15685,21 @@ namespace ts {
                         else {
                             inferFromObjectTypes(source, target);
                         }
+                        visited.set(key, inferenceCount - startCount);
                     }
                 }
 
                 function inferFromTypesOnce(source: Type, target: Type) {
                     const key = source.id + "," + target.id;
-                    if (!visited || !visited.get(key)) {
-                        (visited || (visited = createMap<boolean>())).set(key, true);
+                    const count = visited && visited.get(key);
+                    if (count !== undefined) {
+                        inferenceCount += count;
+                    }
+                    else {
+                        (visited || (visited = createMap<number>())).set(key, 0);
+                        const startCount = inferenceCount;
                         inferFromTypes(source, target);
+                        visited.set(key, inferenceCount - startCount);
                     }
                 }
             }
@@ -15780,23 +15792,28 @@ namespace ts {
                 // type variable. If there is more than one naked type variable, or if inference was blocked
                 // (meaning we didn't explore the types fully), give lower priority to the inferences as
                 // they are less specific.
-                if (typeVariableCount > 0) {
+                if (typeVariableCount === 1 && !inferenceBlocked) {
                     const unmatched = flatMap(sources, (s, i) => matched[i] ? undefined : s);
                     if (unmatched.length) {
                         const s = getUnionType(unmatched);
-                        const savePriority = priority;
-                        if (typeVariableCount > 1 || inferenceBlocked) {
-                            priority |= InferencePriority.NakedTypeVariable;
-                        }
                         for (const t of target.types) {
                             if (getInferenceInfoForType(t)) {
                                 inferFromTypes(s, t);
                             }
                         }
-                        priority = savePriority;
                     }
                 }
-                inferenceBlocked = saveInferenceBlocked;
+                inferenceBlocked = inferenceBlocked || saveInferenceBlocked;
+                if (typeVariableCount > 0) {
+                    const savePriority = priority;
+                    priority |= InferencePriority.NakedTypeVariable;
+                    for (const t of target.types) {
+                        if (getInferenceInfoForType(t)) {
+                            inferFromTypes(source, t);
+                        }
+                    }
+                    priority = savePriority;
+                }
             }
 
             function inferToMappedType(source: Type, target: MappedType, constraintType: Type): boolean {
@@ -15958,14 +15975,13 @@ namespace ts {
             }
         }
 
-        function isTypeReferenceToSameTarget(source: Type, target: Type) {
-            return !!(getObjectFlags(source) & ObjectFlags.Reference && getObjectFlags(target) & ObjectFlags.Reference &&
-                (<TypeReference>source).target === (<TypeReference>target).target);
+        function isMatchableType(type: Type) {
+            return !(type.flags & TypeFlags.Object) || !!(getObjectFlags(type) & ObjectFlags.Anonymous);
         }
 
         function typeIdenticalToSomeType(type: Type, types: Type[]): boolean {
             for (const t of types) {
-                if (t === type || !isTypeReferenceToSameTarget(t, type) && isTypeIdenticalTo(t, type)) {
+                if (t === type || isMatchableType(t) && isMatchableType(type) && isTypeIdenticalTo(t, type)) {
                     return true;
                 }
             }

From 203fd9ff9e1a9923a7dc663cc738c4072b6431ee Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Mon, 22 Jul 2019 08:01:22 -0700
Subject: [PATCH 040/151] Combine multiple separate code paths

---
 src/compiler/checker.ts | 195 ++++++++++++++++++----------------------
 1 file changed, 87 insertions(+), 108 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 19517b6715c..9f64e13911c 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -15577,7 +15577,7 @@ namespace ts {
                         // Infer to the simplified version of an indexed access, if possible, to (hopefully) expose more bare type parameters to the inference engine
                         const simplified = getSimplifiedType(target, /*writing*/ false);
                         if (simplified !== target) {
-                            inferFromTypesOnce(source, simplified);
+                            invokeOnce(source, simplified, inferFromTypes);
                         }
                         else if (target.flags & TypeFlags.IndexedAccess) {
                             const indexType = getSimplifiedType((target as IndexedAccessType).indexType, /*writing*/ false);
@@ -15586,7 +15586,7 @@ namespace ts {
                             if (indexType.flags & TypeFlags.Instantiable) {
                                 const simplified = distributeIndexOverObjectType(getSimplifiedType((target as IndexedAccessType).objectType, /*writing*/ false), indexType, /*writing*/ false);
                                 if (simplified && simplified !== target) {
-                                    inferFromTypesOnce(source, simplified);
+                                    invokeOnce(source, simplified, inferFromTypes);
                                 }
                             }
                         }
@@ -15621,15 +15621,12 @@ namespace ts {
                     inferFromTypes(getTrueTypeFromConditionalType(<ConditionalType>source), getTrueTypeFromConditionalType(<ConditionalType>target));
                     inferFromTypes(getFalseTypeFromConditionalType(<ConditionalType>source), getFalseTypeFromConditionalType(<ConditionalType>target));
                 }
-                else if (target.flags & TypeFlags.Union) {
-                    inferToUnionType(source, <UnionType>target);
-                }
-                else if (target.flags & TypeFlags.Intersection) {
-                    inferToMultipleTypes(source, (<UnionOrIntersectionType>target).types, /*isIntersection*/ true);
-                }
                 else if (target.flags & TypeFlags.Conditional && !contravariant) {
                     const targetTypes = [getTrueTypeFromConditionalType(<ConditionalType>target), getFalseTypeFromConditionalType(<ConditionalType>target)];
-                    inferToMultipleTypes(source, targetTypes, /*isIntersection*/ false);
+                    inferToMultipleTypes(source, targetTypes, target.flags);
+                }
+                else if (target.flags & TypeFlags.UnionOrIntersection) {
+                    inferToMultipleTypes(source, (<UnionOrIntersectionType>target).types, target.flags);
                 }
                 else if (source.flags & TypeFlags.Union) {
                     // Source is a union or intersection type, infer from each constituent type
@@ -15658,50 +15655,22 @@ namespace ts {
                         source = apparentSource;
                     }
                     if (source.flags & (TypeFlags.Object | TypeFlags.Intersection)) {
-                        const key = source.id + "," + target.id;
-                        const visitCount = visited && visited.get(key);
-                        if (visitCount !== undefined) {
-                            inferenceCount += visitCount;
-                            return;
-                        }
-                        (visited || (visited = createMap<number>())).set(key, 0);
-                        // If we are already processing another target type with the same associated symbol (such as
-                        // an instantiation of the same generic type), we do not explore this target as it would yield
-                        // no further inferences. We exclude the static side of classes from this check since it shares
-                        // its symbol with the instance side which would lead to false positives.
-                        const startCount = inferenceCount;
-                        const isNonConstructorObject = target.flags & TypeFlags.Object &&
-                            !(getObjectFlags(target) & ObjectFlags.Anonymous && target.symbol && target.symbol.flags & SymbolFlags.Class);
-                        const symbol = isNonConstructorObject ? target.symbol : undefined;
-                        if (symbol) {
-                            if (contains(symbolStack, symbol)) {
-                                inferenceBlocked = true;
-                                return;
-                            }
-                            (symbolStack || (symbolStack = [])).push(symbol);
-                            inferFromObjectTypes(source, target);
-                            symbolStack.pop();
-                        }
-                        else {
-                            inferFromObjectTypes(source, target);
-                        }
-                        visited.set(key, inferenceCount - startCount);
+                        invokeOnce(source, target, inferFromObjectTypes);
                     }
                 }
+            }
 
-                function inferFromTypesOnce(source: Type, target: Type) {
-                    const key = source.id + "," + target.id;
-                    const count = visited && visited.get(key);
-                    if (count !== undefined) {
-                        inferenceCount += count;
-                    }
-                    else {
-                        (visited || (visited = createMap<number>())).set(key, 0);
-                        const startCount = inferenceCount;
-                        inferFromTypes(source, target);
-                        visited.set(key, inferenceCount - startCount);
-                    }
+            function invokeOnce(source: Type, target: Type, action: (source: Type, target: Type) => void) {
+                const key = source.id + "," + target.id;
+                const count = visited && visited.get(key);
+                if (count !== undefined) {
+                    inferenceCount += count;
+                    return;
                 }
+                (visited || (visited = createMap<number>())).set(key, 0);
+                const startCount = inferenceCount;
+                action(source, target);
+                visited.set(key, inferenceCount - startCount);
             }
 
             function inferFromTypeArguments(sourceTypes: readonly Type[], targetTypes: readonly Type[], variances: readonly VarianceFlags[]) {
@@ -15738,24 +15707,61 @@ namespace ts {
                 return undefined;
             }
 
-            function inferToMultipleTypes(source: Type, targets: Type[], isIntersection: boolean) {
-                // We infer from types that are not naked type variables first so that inferences we
-                // make from nested naked type variables and given slightly higher priority by virtue
-                // of being first in the candidates array.
+            function inferToMultipleTypes(source: Type, targets: Type[], targetFlags: TypeFlags) {
                 let typeVariableCount = 0;
-                for (const t of targets) {
-                    if (getInferenceInfoForType(t)) {
-                        typeVariableCount++;
+                if (targetFlags & TypeFlags.Union) {
+                    const sources = source.flags & TypeFlags.Union ? (<UnionType>source).types : [source];
+                    const matched = new Array<boolean>(sources.length);
+                    const saveInferenceBlocked = inferenceBlocked;
+                    inferenceBlocked = false;
+                    // First infer to types that are not naked type variables. For each source type we
+                    // track whether inferences were made from that particular type to some target.
+                    for (const t of targets) {
+                        if (getInferenceInfoForType(t)) {
+                            typeVariableCount++;
+                        }
+                        else {
+                            for (let i = 0; i < sources.length; i++) {
+                                const count = inferenceCount;
+                                inferFromTypes(sources[i], t);
+                                if (count !== inferenceCount) matched[i] = true;
+                            }
+                        }
                     }
-                    else {
-                        inferFromTypes(source, t);
+                    // If the target has a single naked type variable and inference wasn't blocked (meaning
+                    // we explored the types fully), create a union of the source types from which no inferences
+                    // have been made so far and infer from that union to the naked type variable.
+                    if (typeVariableCount === 1 && !inferenceBlocked) {
+                        const unmatched = flatMap(sources, (s, i) => matched[i] ? undefined : s);
+                        if (unmatched.length) {
+                            const s = getUnionType(unmatched);
+                            for (const t of targets) {
+                                if (getInferenceInfoForType(t)) {
+                                    inferFromTypes(s, t);
+                                }
+                            }
+                        }
+                    }
+                    inferenceBlocked = inferenceBlocked || saveInferenceBlocked;
+                }
+                else {
+                    // We infer from types that are not naked type variables first so that inferences we
+                    // make from nested naked type variables and given slightly higher priority by virtue
+                    // of being first in the candidates array.
+                    for (const t of targets) {
+                        if (getInferenceInfoForType(t)) {
+                            typeVariableCount++;
+                        }
+                        else {
+                            inferFromTypes(source, t);
+                        }
                     }
                 }
                 // Inferences directly to naked type variables are given lower priority as they are
                 // less specific. For example, when inferring from Promise<string> to T | Promise<T>,
                 // we want to infer string for T, not Promise<string> | string. For intersection types
                 // we only infer to single naked type variables.
-                if (isIntersection ? typeVariableCount === 1 : typeVariableCount !== 0) {
+                if (targetFlags & TypeFlags.Intersection ? typeVariableCount === 1 : typeVariableCount > 0) {
                     const savePriority = priority;
                     priority |= InferencePriority.NakedTypeVariable;
                     for (const t of targets) {
@@ -15767,55 +15773,6 @@ namespace ts {
                 }
             }
 
-            function inferToUnionType(source: Type, target: UnionType) {
-                const sources = source.flags & TypeFlags.Union ? (<UnionType>source).types : [source];
-                const matched = new Array<boolean>(sources.length);
-                let typeVariableCount = 0;
-                const saveInferenceBlocked = inferenceBlocked;
-                inferenceBlocked = false;
-                // First infer to types that are not naked type variables. For each source type we
-                // track whether inferences were made from that particular type to some target.
-                for (const t of target.types) {
-                    if (getInferenceInfoForType(t)) {
-                        typeVariableCount++;
-                    }
-                    else {
-                        for (let i = 0; i < sources.length; i++) {
-                            const count = inferenceCount;
-                            inferFromTypes(sources[i], t);
-                            if (count !== inferenceCount) matched[i] = true;
-                        }
-                    }
-                }
-                // If there are naked type variables in the target, create a union of the source types
-                // from which no inferences have been made so far and infer from that union to each naked
-                // type variable. If there is more than one naked type variable, or if inference was blocked
-                // (meaning we didn't explore the types fully), give lower priority to the inferences as
-                // they are less specific.
-                if (typeVariableCount === 1 && !inferenceBlocked) {
-                    const unmatched = flatMap(sources, (s, i) => matched[i] ? undefined : s);
-                    if (unmatched.length) {
-                        const s = getUnionType(unmatched);
-                        for (const t of target.types) {
-                            if (getInferenceInfoForType(t)) {
-                                inferFromTypes(s, t);
-                            }
-                        }
-                    }
-                }
-                inferenceBlocked = inferenceBlocked || saveInferenceBlocked;
-                if (typeVariableCount > 0) {
-                    const savePriority = priority;
-                    priority |= InferencePriority.NakedTypeVariable;
-                    for (const t of target.types) {
-                        if (getInferenceInfoForType(t)) {
-                            inferFromTypes(source, t);
-                        }
-                    }
-                    priority = savePriority;
-                }
-            }
-
             function inferToMappedType(source: Type, target: MappedType, constraintType: Type): boolean {
                 if (constraintType.flags & TypeFlags.Union) {
                     let result = false;
@@ -15873,6 +15830,28 @@ namespace ts {
             }
 
             function inferFromObjectTypes(source: Type, target: Type) {
+                // If we are already processing another target type with the same associated symbol (such as
+                // an instantiation of the same generic type), we do not explore this target as it would yield
+                // no further inferences. We exclude the static side of classes from this check since it shares
+                // its symbol with the instance side which would lead to false positives.
+                const isNonConstructorObject = target.flags & TypeFlags.Object &&
+                    !(getObjectFlags(target) & ObjectFlags.Anonymous && target.symbol && target.symbol.flags & SymbolFlags.Class);
+                const symbol = isNonConstructorObject ? target.symbol : undefined;
+                if (symbol) {
+                    if (contains(symbolStack, symbol)) {
+                        inferenceBlocked = true;
+                        return;
+                    }
+                    (symbolStack || (symbolStack = [])).push(symbol);
+                    inferFromObjectTypesWorker(source, target);
+                    symbolStack.pop();
+                }
+                else {
+                    inferFromObjectTypesWorker(source, target);
+                }
+            }
+
+            function inferFromObjectTypesWorker(source: Type, target: Type) {
                 if (isGenericMappedType(source) && isGenericMappedType(target)) {
                     // The source and target types are generic types { [P in S]: X } and { [P in T]: Y }, so we infer
                     // from S to T and from X to Y.

From b822def6effe8521d14b218bf3287d83c761de21 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Mon, 22 Jul 2019 11:07:33 -0700
Subject: [PATCH 041/151] Minor cleanup plus more comments

---
 src/compiler/checker.ts | 38 ++++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 9f64e13911c..0a64e0552e2 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -15463,7 +15463,7 @@ namespace ts {
             let bivariant = false;
             let propagationType: Type;
             let inferenceCount = 0;
-            let inferenceBlocked = false;
+            let inferenceIncomplete = false;
             let allowComplexConstraintInference = true;
             inferFromTypes(originalSource, originalTarget);
 
@@ -15710,14 +15710,16 @@ namespace ts {
             function inferToMultipleTypes(source: Type, targets: Type[], targetFlags: TypeFlags) {
                 let typeVariableCount = 0;
                 if (targetFlags & TypeFlags.Union) {
+                    let nakedTypeVariable: Type | undefined;
                     const sources = source.flags & TypeFlags.Union ? (<UnionType>source).types : [source];
                     const matched = new Array<boolean>(sources.length);
-                    const saveInferenceBlocked = inferenceBlocked;
-                    inferenceBlocked = false;
+                    const saveInferenceIncomplete = inferenceIncomplete;
+                    inferenceIncomplete = false;
                     // First infer to types that are not naked type variables. For each source type we
                     // track whether inferences were made from that particular type to some target.
                     for (const t of targets) {
                         if (getInferenceInfoForType(t)) {
+                            nakedTypeVariable = t;
                             typeVariableCount++;
                         }
                         else {
@@ -15728,21 +15730,18 @@ namespace ts {
                             }
                         }
                     }
-                    // If the target has a single naked type variable and inference wasn't blocked (meaning
-                    // we explored the types fully), create a union of the source types from which no inferences
+                    const inferenceComplete = !inferenceIncomplete;
+                    inferenceIncomplete = inferenceIncomplete || saveInferenceIncomplete;
+                    // If the target has a single naked type variable and inference completed (meaning we
+                    // explored the types fully), create a union of the source types from which no inferences
                     // have been made so far and infer from that union to the naked type variable.
-                    if (typeVariableCount === 1 && !inferenceBlocked) {
+                    if (typeVariableCount === 1 && inferenceComplete) {
                         const unmatched = flatMap(sources, (s, i) => matched[i] ? undefined : s);
                         if (unmatched.length) {
-                            const s = getUnionType(unmatched);
-                            for (const t of targets) {
-                                if (getInferenceInfoForType(t)) {
-                                    inferFromTypes(s, t);
-                                }
-                            }
+                            inferFromTypes(getUnionType(unmatched), nakedTypeVariable!);
+                            return;
                         }
                     }
-                    inferenceBlocked = inferenceBlocked || saveInferenceBlocked;
                 }
                 else {
                     // We infer from types that are not naked type variables first so that inferences we
@@ -15839,7 +15838,7 @@ namespace ts {
                 const symbol = isNonConstructorObject ? target.symbol : undefined;
                 if (symbol) {
                     if (contains(symbolStack, symbol)) {
-                        inferenceBlocked = true;
+                        inferenceIncomplete = true;
                         return;
                     }
                     (symbolStack || (symbolStack = [])).push(symbol);
@@ -15955,10 +15954,13 @@ namespace ts {
         }
 
         function isMatchableType(type: Type) {
+            // We exclude non-anonymous object types because some frameworks (e.g. Ember) rely on the ability to
+            // infer between types that don't witness their type variables. Such types would otherwise be eliminated
+            // because they appear identical.
             return !(type.flags & TypeFlags.Object) || !!(getObjectFlags(type) & ObjectFlags.Anonymous);
         }
 
-        function typeIdenticalToSomeType(type: Type, types: Type[]): boolean {
+        function typeMatchedBySomeType(type: Type, types: Type[]): boolean {
             for (const t of types) {
                 if (t === type || isMatchableType(t) && isMatchableType(type) && isTypeIdenticalTo(t, type)) {
                     return true;
@@ -15968,12 +15970,12 @@ namespace ts {
         }
 
         function findMatchedType(type: Type, target: UnionOrIntersectionType) {
-            if (typeIdenticalToSomeType(type, target.types)) {
+            if (typeMatchedBySomeType(type, target.types)) {
                 return type;
             }
             if (type.flags & (TypeFlags.NumberLiteral | TypeFlags.StringLiteral) && target.flags & TypeFlags.Union) {
                 const base = getBaseTypeOfLiteralType(type);
-                if (typeIdenticalToSomeType(base, target.types)) {
+                if (typeMatchedBySomeType(base, target.types)) {
                     return base;
                 }
             }
@@ -15987,7 +15989,7 @@ namespace ts {
         function removeTypesFromUnionOrIntersection(type: UnionOrIntersectionType, typesToRemove: Type[]) {
             const reducedTypes: Type[] = [];
             for (const t of type.types) {
-                if (!typeIdenticalToSomeType(t, typesToRemove)) {
+                if (!typeMatchedBySomeType(t, typesToRemove)) {
                     reducedTypes.push(t);
                 }
             }

From 47e3fedb5dda79bcaa33b1e9d424a8591b7f4c40 Mon Sep 17 00:00:00 2001
From: Ron Buckton <ron.buckton@microsoft.com>
Date: Mon, 22 Jul 2019 16:46:09 -0700
Subject: [PATCH 042/151] Fix object spread runtime semantics (#32514)

---
 src/compiler/transformers/es2018.ts           | 31 +++++++-
 src/testRunner/tsconfig.json                  |  1 +
 .../unittests/evaluation/objectRest.ts        | 28 +++++++
 ...iveInternalTypesProduceUniqueTypeParams.js |  2 +-
 .../excessPropertyCheckWithSpread.js          |  2 +-
 .../reference/genericIsNeverEmptyObject.js    |  2 +-
 .../objectLiteralFreshnessWithSpread.js       |  2 +-
 .../reference/objectLiteralNormalization.js   |  2 +-
 tests/baselines/reference/objectRestForOf.js  |  2 +-
 tests/baselines/reference/objectSpread.js     | 76 +++++++++----------
 .../reference/objectSpreadComputedProperty.js |  2 +-
 .../reference/objectSpreadIndexSignature.js   |  4 +-
 .../reference/objectSpreadNegative.js         |  8 +-
 .../reference/objectSpreadNegativeParse.js    |  2 +-
 .../reference/objectSpreadStrictNull.js       | 20 ++---
 ...preadWithinMethodWithinObjectWithSpread.js |  4 +-
 .../spreadContextualTypedBindingPattern.js    |  2 +-
 .../baselines/reference/spreadIntersection.js |  2 +-
 .../baselines/reference/spreadNonPrimitive.js |  2 +-
 tests/baselines/reference/spreadUnion.js      |  4 +-
 tests/baselines/reference/spreadUnion2.js     |  8 +-
 tests/baselines/reference/spreadUnion3.js     |  2 +-
 .../unionExcessPropsWithPartialMember.js      |  2 +-
 tests/baselines/reference/unknownType1.js     |  4 +-
 ...useBeforeDeclaration_propertyAssignment.js |  2 +-
 25 files changed, 135 insertions(+), 81 deletions(-)
 create mode 100644 src/testRunner/unittests/evaluation/objectRest.ts

diff --git a/src/compiler/transformers/es2018.ts b/src/compiler/transformers/es2018.ts
index 89c43dcf599..50fb9f04d1a 100644
--- a/src/compiler/transformers/es2018.ts
+++ b/src/compiler/transformers/es2018.ts
@@ -229,14 +229,39 @@ namespace ts {
             if (node.transformFlags & TransformFlags.ContainsObjectRestOrSpread) {
                 // spread elements emit like so:
                 // non-spread elements are chunked together into object literals, and then all are passed to __assign:
-                //     { a, ...o, b } => __assign({a}, o, {b});
+                //     { a, ...o, b } => __assign(__assign({a}, o), {b});
                 // If the first element is a spread element, then the first argument to __assign is {}:
-                //     { ...o, a, b, ...o2 } => __assign({}, o, {a, b}, o2)
+                //     { ...o, a, b, ...o2 } => __assign(__assign(__assign({}, o), {a, b}), o2)
+                //
+                // We cannot call __assign with more than two elements, since any element could cause side effects. For
+                // example:
+                //      var k = { a: 1, b: 2 };
+                //      var o = { a: 3, ...k, b: k.a++ };
+                //      // expected: { a: 1, b: 1 }
+                // If we translate the above to `__assign({ a: 3 }, k, { b: k.a++ })`, the `k.a++` will evaluate before
+                // `k` is spread and we end up with `{ a: 2, b: 1 }`.
+                //
+                // This also occurs for spread elements, not just property assignments:
+                //      var k = { a: 1, get b() { l = { z: 9 }; return 2; } };
+                //      var l = { c: 3 };
+                //      var o = { ...k, ...l };
+                //      // expected: { a: 1, b: 2, z: 9 }
+                // If we translate the above to `__assign({}, k, l)`, the `l` will evaluate before `k` is spread and we
+                // end up with `{ a: 1, b: 2, c: 3 }`
                 const objects = chunkObjectLiteralElements(node.properties);
                 if (objects.length && objects[0].kind !== SyntaxKind.ObjectLiteralExpression) {
                     objects.unshift(createObjectLiteral());
                 }
-                return createAssignHelper(context, objects);
+                let expression: Expression = objects[0];
+                if (objects.length > 1) {
+                    for (let i = 1; i < objects.length; i++) {
+                        expression = createAssignHelper(context, [expression, objects[i]]);
+                    }
+                    return expression;
+                }
+                else {
+                    return createAssignHelper(context, objects);
+                }
             }
             return visitEachChild(node, visitor, context);
         }
diff --git a/src/testRunner/tsconfig.json b/src/testRunner/tsconfig.json
index b2e7e3e78b9..9ea6c4c85ce 100644
--- a/src/testRunner/tsconfig.json
+++ b/src/testRunner/tsconfig.json
@@ -74,6 +74,7 @@
         "unittests/evaluation/asyncArrow.ts",
         "unittests/evaluation/asyncGenerator.ts",
         "unittests/evaluation/forAwaitOf.ts",
+        "unittests/evaluation/objectRest.ts",
         "unittests/services/cancellableLanguageServiceOperations.ts",
         "unittests/services/colorization.ts",
         "unittests/services/convertToAsyncFunction.ts",
diff --git a/src/testRunner/unittests/evaluation/objectRest.ts b/src/testRunner/unittests/evaluation/objectRest.ts
new file mode 100644
index 00000000000..272ba51ffbe
--- /dev/null
+++ b/src/testRunner/unittests/evaluation/objectRest.ts
@@ -0,0 +1,28 @@
+describe("unittests:: evaluation:: objectRest", () => {
+    // https://github.com/microsoft/TypeScript/issues/31469
+    it("side effects in property assignment", async () => {
+        const result = evaluator.evaluateTypeScript(`
+            const k = { a: 1, b: 2 };
+            const o = { a: 3, ...k, b: k.a++ };
+            export const output = o;
+        `);
+        assert.deepEqual(result.output, { a: 1, b: 1 });
+    });
+    it("side effects in during spread", async () => {
+        const result = evaluator.evaluateTypeScript(`
+            const k = { a: 1, get b() { l = { c: 9 }; return 2; } };
+            let l = { c: 3 };
+            const o = { ...k, ...l };
+            export const output = o;
+        `);
+        assert.deepEqual(result.output, { a: 1, b: 2, c: 9 });
+    });
+    it("trailing literal-valued object-literal", async () => {
+        const result = evaluator.evaluateTypeScript(`
+            const k = { a: 1 }
+            const o = { ...k, ...{ b: 2 } };
+            export const output = o;
+        `);
+        assert.deepEqual(result.output, { a: 1, b: 2 });
+    });
+});
diff --git a/tests/baselines/reference/declarationsWithRecursiveInternalTypesProduceUniqueTypeParams.js b/tests/baselines/reference/declarationsWithRecursiveInternalTypesProduceUniqueTypeParams.js
index 913e82292bf..b043fe275cc 100644
--- a/tests/baselines/reference/declarationsWithRecursiveInternalTypesProduceUniqueTypeParams.js
+++ b/tests/baselines/reference/declarationsWithRecursiveInternalTypesProduceUniqueTypeParams.js
@@ -73,7 +73,7 @@ exports.testRecFun = function (parent) {
     return {
         result: parent,
         deeper: function (child) {
-            return exports.testRecFun(__assign({}, parent, child));
+            return exports.testRecFun(__assign(__assign({}, parent), child));
         }
     };
 };
diff --git a/tests/baselines/reference/excessPropertyCheckWithSpread.js b/tests/baselines/reference/excessPropertyCheckWithSpread.js
index c08e4738965..1b105de7918 100644
--- a/tests/baselines/reference/excessPropertyCheckWithSpread.js
+++ b/tests/baselines/reference/excessPropertyCheckWithSpread.js
@@ -30,4 +30,4 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 f(__assign({ a: 1 }, i));
-f(__assign({ a: 1 }, l, r));
+f(__assign(__assign({ a: 1 }, l), r));
diff --git a/tests/baselines/reference/genericIsNeverEmptyObject.js b/tests/baselines/reference/genericIsNeverEmptyObject.js
index 692f34bfcc4..ec489da75a9 100644
--- a/tests/baselines/reference/genericIsNeverEmptyObject.js
+++ b/tests/baselines/reference/genericIsNeverEmptyObject.js
@@ -37,7 +37,7 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 function test(obj) {
     var a = obj.a, rest = __rest(obj, ["a"]);
-    return __assign({}, rest, { b: a });
+    return __assign(__assign({}, rest), { b: a });
 }
 var o1 = { a: 'hello', x: 42 };
 var o2 = test(o1);
diff --git a/tests/baselines/reference/objectLiteralFreshnessWithSpread.js b/tests/baselines/reference/objectLiteralFreshnessWithSpread.js
index 73962db32ab..ad87fd0557d 100644
--- a/tests/baselines/reference/objectLiteralFreshnessWithSpread.js
+++ b/tests/baselines/reference/objectLiteralFreshnessWithSpread.js
@@ -16,4 +16,4 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 var x = { b: 1, extra: 2 };
-var xx = __assign({ a: 1 }, x, { z: 3 }); // error for 'z', no error for 'extra'
+var xx = __assign(__assign({ a: 1 }, x), { z: 3 }); // error for 'z', no error for 'extra'
diff --git a/tests/baselines/reference/objectLiteralNormalization.js b/tests/baselines/reference/objectLiteralNormalization.js
index 1a8aa8d4b04..aa37bdc2c5e 100644
--- a/tests/baselines/reference/objectLiteralNormalization.js
+++ b/tests/baselines/reference/objectLiteralNormalization.js
@@ -80,7 +80,7 @@ a2 = { a: "def" };
 a2 = {};
 a2 = { a: "def", b: 20 }; // Error
 a2 = { a: 1 }; // Error
-var b2 = __assign({}, b1, { z: 55 });
+var b2 = __assign(__assign({}, b1), { z: 55 });
 var b3 = __assign({}, b2);
 var c1 = !true ? {} : opts;
 var c2 = !true ? opts : {};
diff --git a/tests/baselines/reference/objectRestForOf.js b/tests/baselines/reference/objectRestForOf.js
index f946e42444c..49ebf7c4c17 100644
--- a/tests/baselines/reference/objectRestForOf.js
+++ b/tests/baselines/reference/objectRestForOf.js
@@ -37,7 +37,7 @@ for (let _b of array) {
     ({ x: xx } = _b, rrestOff = __rest(_b, ["x"]));
     [xx, rrestOff];
 }
-for (const norest of array.map(a => (Object.assign({}, a, { x: 'a string' })))) {
+for (const norest of array.map(a => (Object.assign(Object.assign({}, a), { x: 'a string' })))) {
     [norest.x, norest.y];
     // x is now a string. who knows why.
 }
diff --git a/tests/baselines/reference/objectSpread.js b/tests/baselines/reference/objectSpread.js
index b7d3e858c79..1265cc889ff 100644
--- a/tests/baselines/reference/objectSpread.js
+++ b/tests/baselines/reference/objectSpread.js
@@ -171,45 +171,45 @@ var __assign = (this && this.__assign) || function () {
 var o = { a: 1, b: 'no' };
 var o2 = { b: 'yes', c: true };
 var swap = { a: 'yes', b: -1 };
-var addAfter = __assign({}, o, { c: false });
+var addAfter = __assign(__assign({}, o), { c: false });
 var addBefore = __assign({ c: false }, o);
 // Note: ignore still changes the order that properties are printed
 var ignore = __assign({ b: 'ignored' }, o);
-var override = __assign({}, o, { b: 'override' });
-var nested = __assign({}, __assign({ a: 3 }, { b: false, c: 'overriden' }), { c: 'whatever' });
-var combined = __assign({}, o, o2);
-var combinedBefore = __assign({ b: 'ok' }, o, o2);
-var combinedMid = __assign({}, o, { b: 'ok' }, o2);
-var combinedAfter = __assign({}, o, o2, { b: 'ok' });
-var combinedNested = __assign({}, __assign({ a: 4 }, { b: false, c: 'overriden' }), { d: 'actually new' }, { a: 5, d: 'maybe new' });
-var combinedNestedChangeType = __assign({}, __assign({ a: 1 }, { b: false, c: 'overriden' }), { c: -1 });
+var override = __assign(__assign({}, o), { b: 'override' });
+var nested = __assign(__assign({}, __assign({ a: 3 }, { b: false, c: 'overriden' })), { c: 'whatever' });
+var combined = __assign(__assign({}, o), o2);
+var combinedBefore = __assign(__assign({ b: 'ok' }, o), o2);
+var combinedMid = __assign(__assign(__assign({}, o), { b: 'ok' }), o2);
+var combinedAfter = __assign(__assign(__assign({}, o), o2), { b: 'ok' });
+var combinedNested = __assign(__assign(__assign({}, __assign({ a: 4 }, { b: false, c: 'overriden' })), { d: 'actually new' }), { a: 5, d: 'maybe new' });
+var combinedNestedChangeType = __assign(__assign({}, __assign({ a: 1 }, { b: false, c: 'overriden' })), { c: -1 });
 var propertyNested = { a: __assign({}, o) };
 // accessors don't copy the descriptor
 // (which means that readonly getters become read/write properties)
 var op = { get a() { return 6; } };
-var getter = __assign({}, op, { c: 7 });
+var getter = __assign(__assign({}, op), { c: 7 });
 getter.a = 12;
 // functions result in { }
 var spreadFunc = __assign({}, (function () { }));
 function from16326(header, authToken) {
-    return __assign({}, this.header, header, authToken && { authToken: authToken });
+    return __assign(__assign(__assign({}, this.header), header), authToken && { authToken: authToken });
 }
 // boolean && T results in Partial<T>
 function conditionalSpreadBoolean(b) {
     var o = { x: 12, y: 13 };
-    o = __assign({}, o, b && { x: 14 });
+    o = __assign(__assign({}, o), b && { x: 14 });
     var o2 = __assign({}, b && { x: 21 });
     return o;
 }
 function conditionalSpreadNumber(nt) {
     var o = { x: 15, y: 16 };
-    o = __assign({}, o, nt && { x: nt });
+    o = __assign(__assign({}, o), nt && { x: nt });
     var o2 = __assign({}, nt && { x: nt });
     return o;
 }
 function conditionalSpreadString(st) {
     var o = { x: 'hi', y: 17 };
-    o = __assign({}, o, st && { x: st });
+    o = __assign(__assign({}, o), st && { x: st });
     var o2 = __assign({}, st && { x: st });
     return o;
 }
@@ -227,31 +227,31 @@ var C = /** @class */ (function () {
 var c = new C();
 var spreadC = __assign({}, c);
 // own methods are enumerable
-var cplus = __assign({}, c, { plus: function () { return this.p + 1; } });
+var cplus = __assign(__assign({}, c), { plus: function () { return this.p + 1; } });
 cplus.plus();
 // new field's type conflicting with existing field is OK
-var changeTypeAfter = __assign({}, o, { a: 'wrong type?' });
+var changeTypeAfter = __assign(__assign({}, o), { a: 'wrong type?' });
 var changeTypeBefore = __assign({ a: 'wrong type?' }, o);
-var changeTypeBoth = __assign({}, o, swap);
+var changeTypeBoth = __assign(__assign({}, o), swap);
 // optional
 function container(definiteBoolean, definiteString, optionalString, optionalNumber) {
     var _a, _b, _c;
-    var optionalUnionStops = __assign({}, definiteBoolean, definiteString, optionalNumber);
-    var optionalUnionDuplicates = __assign({}, definiteBoolean, definiteString, optionalString, optionalNumber);
-    var allOptional = __assign({}, optionalString, optionalNumber);
+    var optionalUnionStops = __assign(__assign(__assign({}, definiteBoolean), definiteString), optionalNumber);
+    var optionalUnionDuplicates = __assign(__assign(__assign(__assign({}, definiteBoolean), definiteString), optionalString), optionalNumber);
+    var allOptional = __assign(__assign({}, optionalString), optionalNumber);
     // computed property
-    var computedFirst = __assign((_a = {}, _a['before everything'] = 12, _a), o, { b: 'yes' });
-    var computedMiddle = __assign({}, o, (_b = {}, _b['in the middle'] = 13, _b.b = 'maybe?', _b), o2);
-    var computedAfter = __assign({}, o, (_c = { b: 'yeah' }, _c['at the end'] = 14, _c));
+    var computedFirst = __assign(__assign((_a = {}, _a['before everything'] = 12, _a), o), { b: 'yes' });
+    var computedMiddle = __assign(__assign(__assign({}, o), (_b = {}, _b['in the middle'] = 13, _b.b = 'maybe?', _b)), o2);
+    var computedAfter = __assign(__assign({}, o), (_c = { b: 'yeah' }, _c['at the end'] = 14, _c));
 }
 // shortcut syntax
 var a = 12;
-var shortCutted = __assign({}, o, { a: a });
+var shortCutted = __assign(__assign({}, o), { a: a });
 // non primitive
 var spreadNonPrimitive = __assign({}, {});
 // generic spreads
 function f(t, u) {
-    return __assign({}, t, u, { id: 'id' });
+    return __assign(__assign(__assign({}, t), u), { id: 'id' });
 }
 var exclusive = f({ a: 1, b: 'yes' }, { c: 'no', d: false });
 var overlap = f({ a: 1 }, { a: 2, b: 'extra' });
@@ -259,20 +259,20 @@ var overlapConflict = f({ a: 1 }, { a: 'mismatch' });
 var overwriteId = f({ a: 1, id: true }, { c: 1, d: 'no' });
 function genericSpread(t, u, v, w, obj) {
     var x01 = __assign({}, t);
-    var x02 = __assign({}, t, t);
-    var x03 = __assign({}, t, u);
-    var x04 = __assign({}, u, t);
+    var x02 = __assign(__assign({}, t), t);
+    var x03 = __assign(__assign({}, t), u);
+    var x04 = __assign(__assign({}, u), t);
     var x05 = __assign({ a: 5, b: 'hi' }, t);
-    var x06 = __assign({}, t, { a: 5, b: 'hi' });
-    var x07 = __assign({ a: 5, b: 'hi' }, t, { c: true }, obj);
-    var x09 = __assign({ a: 5 }, t, { b: 'hi', c: true }, obj);
-    var x10 = __assign({ a: 5 }, t, { b: 'hi' }, u, obj);
+    var x06 = __assign(__assign({}, t), { a: 5, b: 'hi' });
+    var x07 = __assign(__assign(__assign({ a: 5, b: 'hi' }, t), { c: true }), obj);
+    var x09 = __assign(__assign(__assign({ a: 5 }, t), { b: 'hi', c: true }), obj);
+    var x10 = __assign(__assign(__assign(__assign({ a: 5 }, t), { b: 'hi' }), u), obj);
     var x11 = __assign({}, v);
-    var x12 = __assign({}, v, obj);
+    var x12 = __assign(__assign({}, v), obj);
     var x13 = __assign({}, w);
-    var x14 = __assign({}, w, obj);
-    var x15 = __assign({}, t, v);
-    var x16 = __assign({}, t, w);
-    var x17 = __assign({}, t, w, obj);
-    var x18 = __assign({}, t, v, w);
+    var x14 = __assign(__assign({}, w), obj);
+    var x15 = __assign(__assign({}, t), v);
+    var x16 = __assign(__assign({}, t), w);
+    var x17 = __assign(__assign(__assign({}, t), w), obj);
+    var x18 = __assign(__assign(__assign({}, t), v), w);
 }
diff --git a/tests/baselines/reference/objectSpreadComputedProperty.js b/tests/baselines/reference/objectSpreadComputedProperty.js
index b81b889b2cc..a28ceab111f 100644
--- a/tests/baselines/reference/objectSpreadComputedProperty.js
+++ b/tests/baselines/reference/objectSpreadComputedProperty.js
@@ -30,5 +30,5 @@ function f() {
     var a = null;
     var o1 = __assign({}, (_a = {}, _a[n] = n, _a));
     var o2 = __assign({}, (_b = {}, _b[a] = n, _b));
-    var o3 = __assign((_c = {}, _c[a] = n, _c), {}, (_d = {}, _d[n] = n, _d), {}, (_e = {}, _e[m] = m, _e));
+    var o3 = __assign(__assign(__assign(__assign((_c = {}, _c[a] = n, _c), {}), (_d = {}, _d[n] = n, _d)), {}), (_e = {}, _e[m] = m, _e));
 }
diff --git a/tests/baselines/reference/objectSpreadIndexSignature.js b/tests/baselines/reference/objectSpreadIndexSignature.js
index aef78611f38..8c461e39971 100644
--- a/tests/baselines/reference/objectSpreadIndexSignature.js
+++ b/tests/baselines/reference/objectSpreadIndexSignature.js
@@ -30,10 +30,10 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-var i = __assign({}, indexed1, { b: 11 });
+var i = __assign(__assign({}, indexed1), { b: 11 });
 // only indexed has indexer, so i[101]: any
 i[101];
-var ii = __assign({}, indexed1, indexed2);
+var ii = __assign(__assign({}, indexed1), indexed2);
 // both have indexer, so i[1001]: number | boolean
 ii[1001];
 indexed3 = __assign({}, b ? indexed3 : undefined);
diff --git a/tests/baselines/reference/objectSpreadNegative.js b/tests/baselines/reference/objectSpreadNegative.js
index 23de5699ce6..6151f2d30b7 100644
--- a/tests/baselines/reference/objectSpreadNegative.js
+++ b/tests/baselines/reference/objectSpreadNegative.js
@@ -85,11 +85,11 @@ var PublicX = /** @class */ (function () {
 }());
 var publicX;
 var privateOptionalX;
-var o2 = __assign({}, publicX, privateOptionalX);
+var o2 = __assign(__assign({}, publicX), privateOptionalX);
 var sn = o2.x; // error, x is private
 var optionalString;
 var optionalNumber;
-var allOptional = __assign({}, optionalString, optionalNumber);
+var allOptional = __assign(__assign({}, optionalString), optionalNumber);
 ;
 ;
 var spread = __assign({ b: true }, { s: "foo" });
@@ -97,8 +97,8 @@ spread = { s: "foo" }; // error, missing 'b'
 var b = { b: false };
 spread = b; // error, missing 's'
 // literal repeats are not allowed, but spread repeats are fine
-var duplicated = __assign({ b: 'bad' }, o, { b: 'bad' }, o2, { b: 'bad' });
-var duplicatedSpread = __assign({}, o, o);
+var duplicated = __assign(__assign(__assign(__assign({ b: 'bad' }, o), { b: 'bad' }), o2), { b: 'bad' });
+var duplicatedSpread = __assign(__assign({}, o), o);
 // primitives are not allowed, except for falsy ones
 var spreadNum = __assign({}, 12);
 var spreadSum = __assign({}, 1 + 1);
diff --git a/tests/baselines/reference/objectSpreadNegativeParse.js b/tests/baselines/reference/objectSpreadNegativeParse.js
index 1eb384383fb..11809b96b92 100644
--- a/tests/baselines/reference/objectSpreadNegativeParse.js
+++ b/tests/baselines/reference/objectSpreadNegativeParse.js
@@ -21,4 +21,4 @@ var o7 = __assign({}, o ?  : );
 var o8 = __assign({},  * o);
 var o9 = __assign({}, matchMedia()), _a = void 0;
 ;
-var o10 = __assign({}, get, { x: function () { return 12; } });
+var o10 = __assign(__assign({}, get), { x: function () { return 12; } });
diff --git a/tests/baselines/reference/objectSpreadStrictNull.js b/tests/baselines/reference/objectSpreadStrictNull.js
index 737c1d3e038..f95c2582b26 100644
--- a/tests/baselines/reference/objectSpreadStrictNull.js
+++ b/tests/baselines/reference/objectSpreadStrictNull.js
@@ -58,21 +58,21 @@ var __assign = (this && this.__assign) || function () {
 };
 function f(definiteBoolean, definiteString, optionalString, optionalNumber, undefinedString, undefinedNumber) {
     // optional
-    var optionalUnionStops = __assign({}, definiteBoolean, definiteString, optionalNumber);
-    var optionalUnionDuplicates = __assign({}, definiteBoolean, definiteString, optionalString, optionalNumber);
-    var allOptional = __assign({}, optionalString, optionalNumber);
+    var optionalUnionStops = __assign(__assign(__assign({}, definiteBoolean), definiteString), optionalNumber);
+    var optionalUnionDuplicates = __assign(__assign(__assign(__assign({}, definiteBoolean), definiteString), optionalString), optionalNumber);
+    var allOptional = __assign(__assign({}, optionalString), optionalNumber);
     // undefined
-    var undefinedUnionStops = __assign({}, definiteBoolean, definiteString, undefinedNumber);
-    var undefinedUnionDuplicates = __assign({}, definiteBoolean, definiteString, undefinedString, undefinedNumber);
-    var allUndefined = __assign({}, undefinedString, undefinedNumber);
-    var undefinedWithOptionalContinues = __assign({}, definiteBoolean, undefinedString, optionalNumber);
+    var undefinedUnionStops = __assign(__assign(__assign({}, definiteBoolean), definiteString), undefinedNumber);
+    var undefinedUnionDuplicates = __assign(__assign(__assign(__assign({}, definiteBoolean), definiteString), undefinedString), undefinedNumber);
+    var allUndefined = __assign(__assign({}, undefinedString), undefinedNumber);
+    var undefinedWithOptionalContinues = __assign(__assign(__assign({}, definiteBoolean), undefinedString), optionalNumber);
 }
 var m = { title: "The Matrix", yearReleased: 1999 };
 // should error here because title: undefined is not assignable to string
-var x = __assign({}, m, { title: undefined });
+var x = __assign(__assign({}, m), { title: undefined });
 function g(fields, partialFields, nearlyPartialFields) {
     // ok, undefined is stripped from optional properties when spread
-    fields = __assign({}, fields, partialFields);
+    fields = __assign(__assign({}, fields), partialFields);
     // error: not optional, undefined remains
-    fields = __assign({}, fields, nearlyPartialFields);
+    fields = __assign(__assign({}, fields), nearlyPartialFields);
 }
diff --git a/tests/baselines/reference/objectSpreadWithinMethodWithinObjectWithSpread.js b/tests/baselines/reference/objectSpreadWithinMethodWithinObjectWithSpread.js
index 89744f9f8e5..900dd89a820 100644
--- a/tests/baselines/reference/objectSpreadWithinMethodWithinObjectWithSpread.js
+++ b/tests/baselines/reference/objectSpreadWithinMethodWithinObjectWithSpread.js
@@ -24,6 +24,6 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 var obj = {};
-var a = __assign({}, obj, { prop: function () {
-        return __assign({}, obj, { metadata: 213 });
+var a = __assign(__assign({}, obj), { prop: function () {
+        return __assign(__assign({}, obj), { metadata: 213 });
     } });
diff --git a/tests/baselines/reference/spreadContextualTypedBindingPattern.js b/tests/baselines/reference/spreadContextualTypedBindingPattern.js
index 7b2128e4a53..c95cccedbf3 100644
--- a/tests/baselines/reference/spreadContextualTypedBindingPattern.js
+++ b/tests/baselines/reference/spreadContextualTypedBindingPattern.js
@@ -25,4 +25,4 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 // [ts] Initializer provides no value for this binding element and the binding element has no default value.
-var _a = __assign({}, bob, alice), naam = _a.naam, age = _a.age;
+var _a = __assign(__assign({}, bob), alice), naam = _a.naam, age = _a.age;
diff --git a/tests/baselines/reference/spreadIntersection.js b/tests/baselines/reference/spreadIntersection.js
index 2defebc5ce1..fe746734d6d 100644
--- a/tests/baselines/reference/spreadIntersection.js
+++ b/tests/baselines/reference/spreadIntersection.js
@@ -23,4 +23,4 @@ var intersection;
 var o1;
 var o1 = __assign({}, intersection);
 var o2;
-var o2 = __assign({}, intersection, { c: false });
+var o2 = __assign(__assign({}, intersection), { c: false });
diff --git a/tests/baselines/reference/spreadNonPrimitive.js b/tests/baselines/reference/spreadNonPrimitive.js
index 81b23a584fa..50b2c1cdec8 100644
--- a/tests/baselines/reference/spreadNonPrimitive.js
+++ b/tests/baselines/reference/spreadNonPrimitive.js
@@ -15,4 +15,4 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-var x = __assign({ a: 1 }, o, { b: 2 });
+var x = __assign(__assign({ a: 1 }, o), { b: 2 });
diff --git a/tests/baselines/reference/spreadUnion.js b/tests/baselines/reference/spreadUnion.js
index 42ec336c67d..03220cef0e8 100644
--- a/tests/baselines/reference/spreadUnion.js
+++ b/tests/baselines/reference/spreadUnion.js
@@ -26,6 +26,6 @@ var union;
 var o3;
 var o3 = __assign({}, union);
 var o4;
-var o4 = __assign({}, union, { a: false });
+var o4 = __assign(__assign({}, union), { a: false });
 var o5;
-var o5 = __assign({}, union, union);
+var o5 = __assign(__assign({}, union), union);
diff --git a/tests/baselines/reference/spreadUnion2.js b/tests/baselines/reference/spreadUnion2.js
index 2678ce707cf..b48209cfc01 100644
--- a/tests/baselines/reference/spreadUnion2.js
+++ b/tests/baselines/reference/spreadUnion2.js
@@ -37,9 +37,9 @@ var o1 = __assign({}, undefinedUnion);
 var o2;
 var o2 = __assign({}, nullUnion);
 var o3;
-var o3 = __assign({}, undefinedUnion, nullUnion);
-var o3 = __assign({}, nullUnion, undefinedUnion);
+var o3 = __assign(__assign({}, undefinedUnion), nullUnion);
+var o3 = __assign(__assign({}, nullUnion), undefinedUnion);
 var o4;
-var o4 = __assign({}, undefinedUnion, undefinedUnion);
+var o4 = __assign(__assign({}, undefinedUnion), undefinedUnion);
 var o5;
-var o5 = __assign({}, nullUnion, nullUnion);
+var o5 = __assign(__assign({}, nullUnion), nullUnion);
diff --git a/tests/baselines/reference/spreadUnion3.js b/tests/baselines/reference/spreadUnion3.js
index 2175889db70..dda735a2dc1 100644
--- a/tests/baselines/reference/spreadUnion3.js
+++ b/tests/baselines/reference/spreadUnion3.js
@@ -42,5 +42,5 @@ function g(t) {
 g();
 g(undefined);
 g(null);
-var x = __assign({}, nullAndUndefinedUnion, nullAndUndefinedUnion);
+var x = __assign(__assign({}, nullAndUndefinedUnion), nullAndUndefinedUnion);
 var y = __assign({}, nullAndUndefinedUnion);
diff --git a/tests/baselines/reference/unionExcessPropsWithPartialMember.js b/tests/baselines/reference/unionExcessPropsWithPartialMember.js
index cefd480bba8..f7e88d35a41 100644
--- a/tests/baselines/reference/unionExcessPropsWithPartialMember.js
+++ b/tests/baselines/reference/unionExcessPropsWithPartialMember.js
@@ -28,4 +28,4 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-ab = __assign({}, a, { y: null }); // Should be allowed, since `y` is missing on `A`
+ab = __assign(__assign({}, a), { y: null }); // Should be allowed, since `y` is missing on `A`
diff --git a/tests/baselines/reference/unknownType1.js b/tests/baselines/reference/unknownType1.js
index 688fbf8f93c..8bd340de020 100644
--- a/tests/baselines/reference/unknownType1.js
+++ b/tests/baselines/reference/unknownType1.js
@@ -279,8 +279,8 @@ function f25() {
 // Spread of unknown causes result to be unknown
 function f26(x, y, z) {
     var o1 = __assign({ a: 42 }, x); // { a: number }
-    var o2 = __assign({ a: 42 }, x, y); // unknown
-    var o3 = __assign({ a: 42 }, x, y, z); // any
+    var o2 = __assign(__assign({ a: 42 }, x), y); // unknown
+    var o3 = __assign(__assign(__assign({ a: 42 }, x), y), z); // any
 }
 // Functions with unknown return type don't need return expressions
 function f27() {
diff --git a/tests/baselines/reference/useBeforeDeclaration_propertyAssignment.js b/tests/baselines/reference/useBeforeDeclaration_propertyAssignment.js
index 47968d429ad..4ee81065518 100644
--- a/tests/baselines/reference/useBeforeDeclaration_propertyAssignment.js
+++ b/tests/baselines/reference/useBeforeDeclaration_propertyAssignment.js
@@ -20,7 +20,7 @@ class D {
 //// [useBeforeDeclaration_propertyAssignment.js]
 export class C {
     constructor() {
-        this.a = Object.assign({ b: this.b }, this.c, { [this.b]: `${this.c}` });
+        this.a = Object.assign(Object.assign({ b: this.b }, this.c), { [this.b]: `${this.c}` });
         this.b = 0;
         this.c = { c: this.b };
     }

From d982014d733445f478b5cad8a938d2d2a56f1080 Mon Sep 17 00:00:00 2001
From: Ron Buckton <ron.buckton@microsoft.com>
Date: Mon, 22 Jul 2019 17:23:35 -0700
Subject: [PATCH 043/151] Update __awaiter to be more spec compliant (#32462)

* Update __awaiter to be more spec compliant

* Add awaiter evaluation test
---
 src/compiler/transformers/es2017.ts           |  3 ++-
 src/testRunner/tsconfig.json                  |  1 +
 .../unittests/evaluation/awaiter.ts           | 24 +++++++++++++++++++
 .../reference/asyncArrowFunction11_es5.js     |  3 ++-
 .../asyncAwaitIsolatedModules_es5.js          |  3 ++-
 .../asyncAwaitIsolatedModules_es6.js          |  3 ++-
 tests/baselines/reference/asyncAwait_es5.js   |  3 ++-
 tests/baselines/reference/asyncAwait_es6.js   |  3 ++-
 .../reference/asyncFunctionNoReturnType.js    |  3 ++-
 ...asyncFunctionReturnExpressionErrorSpans.js |  3 ++-
 .../reference/asyncFunctionReturnType.js      |  3 ++-
 .../asyncFunctionTempVariableScoping.js       |  3 ++-
 ...ncFunctionWithForStatementNoInitializer.js |  3 ++-
 .../reference/asyncFunctionsAcrossFiles.js    |  6 +++--
 .../asyncFunctionsAndStrictNullChecks.js      |  3 ++-
 tests/baselines/reference/asyncIIFE.js        |  3 ++-
 .../reference/asyncImportedPromise_es5.js     |  3 ++-
 .../reference/asyncImportedPromise_es6.js     |  3 ++-
 .../asyncMethodWithSuperConflict_es6.js       |  3 ++-
 .../baselines/reference/asyncMultiFile_es5.js |  3 ++-
 .../baselines/reference/asyncMultiFile_es6.js |  3 ++-
 .../baselines/reference/awaitUnionPromise.js  |  3 ++-
 .../reference/await_unaryExpression_es6.js    |  3 ++-
 .../reference/await_unaryExpression_es6_1.js  |  3 ++-
 .../reference/await_unaryExpression_es6_2.js  |  3 ++-
 .../reference/await_unaryExpression_es6_3.js  |  3 ++-
 .../capturedParametersInInitializers1.js      |  3 ++-
 tests/baselines/reference/castOfAwait.js      |  3 ++-
 .../checkJsxSubtleSkipContextSensitiveBug.js  |  3 ++-
 .../circularInferredTypeOfVariable.js         |  3 ++-
 .../controlFlowForCatchAndFinally.js          |  3 ++-
 .../reference/correctOrderOfPromiseMethod.js  |  3 ++-
 .../reference/declarationEmitPrivateAsync.js  |  3 ++-
 .../reference/declarationEmitPromise.js       |  3 ++-
 .../reference/decoratorMetadataPromise.js     |  3 ++-
 .../defaultExportInAwaitExpression01.js       |  3 ++-
 .../defaultExportInAwaitExpression02.js       |  3 ++-
 .../reference/emitter.forAwait.es2015.js      |  9 ++++---
 .../reference/emitter.forAwait.es5.js         |  9 ++++---
 .../baselines/reference/es5-asyncFunction.js  |  3 ++-
 .../es5-importHelpersAsyncFunctions.js        |  3 ++-
 .../reference/exportDefaultAsyncFunction.js   |  3 ++-
 .../reference/exportDefaultAsyncFunction2.js  |  3 ++-
 .../exportDefaultFunctionInNamespace.js       |  3 ++-
 ...essionsForbiddenInParameterInitializers.js |  3 ++-
 .../importCallExpressionAsyncES3AMD.js        |  3 ++-
 .../importCallExpressionAsyncES3CJS.js        |  3 ++-
 .../importCallExpressionAsyncES3System.js     |  3 ++-
 .../importCallExpressionAsyncES3UMD.js        |  3 ++-
 .../importCallExpressionAsyncES5AMD.js        |  3 ++-
 .../importCallExpressionAsyncES5CJS.js        |  3 ++-
 .../importCallExpressionAsyncES5System.js     |  3 ++-
 .../importCallExpressionAsyncES5UMD.js        |  3 ++-
 .../importCallExpressionAsyncES6AMD.js        |  3 ++-
 .../importCallExpressionAsyncES6CJS.js        |  3 ++-
 .../importCallExpressionAsyncES6System.js     |  3 ++-
 .../importCallExpressionAsyncES6UMD.js        |  3 ++-
 .../importCallExpressionNestedAMD.js          |  3 ++-
 .../importCallExpressionNestedAMD2.js         |  3 ++-
 .../importCallExpressionNestedCJS.js          |  3 ++-
 .../importCallExpressionNestedCJS2.js         |  3 ++-
 .../importCallExpressionNestedES2015.js       |  3 ++-
 .../importCallExpressionNestedES20152.js      |  3 ++-
 .../importCallExpressionNestedESNext.js       |  3 ++-
 .../importCallExpressionNestedESNext2.js      |  3 ++-
 .../importCallExpressionNestedSystem.js       |  3 ++-
 .../importCallExpressionNestedSystem2.js      |  3 ++-
 .../importCallExpressionNestedUMD.js          |  3 ++-
 .../importCallExpressionNestedUMD2.js         |  3 ++-
 ...portCallExpressionNoModuleKindSpecified.js |  3 ++-
 tests/baselines/reference/importMetaES5.js    |  3 ++-
 tests/baselines/reference/inferenceLimit.js   |  3 ++-
 .../invalidContinueInDownlevelAsync.js        |  3 ++-
 .../reference/labeledStatementWithLabel.js    |  3 ++-
 .../labeledStatementWithLabel_es2015.js       |  3 ++-
 .../labeledStatementWithLabel_strict.js       |  3 ++-
 ...rizeLibrary_NoErrorDuplicateLibOptions1.js |  3 ++-
 ...rizeLibrary_NoErrorDuplicateLibOptions2.js |  3 ++-
 .../modularizeLibrary_TargetES5UsingES6Lib.js |  3 ++-
 .../reference/noImplicitReturnsInAsync1.js    |  3 ++-
 .../reference/noImplicitReturnsInAsync2.js    |  3 ++-
 tests/baselines/reference/objectRest2.js      |  3 ++-
 .../operationsAvailableOnPromisedType.js      |  3 ++-
 .../parenthesizedAsyncArrowFunction.js        |  3 ++-
 .../reference/promiseDefinitionTest.js        |  3 ++-
 tests/baselines/reference/promiseType.js      |  3 ++-
 .../reference/promiseTypeStrictNull.js        |  3 ++-
 .../reference/reachabilityChecks7.js          |  3 ++-
 ...uxLikeDeferredInferenceAllowsAssignment.js |  3 ++-
 .../reference/thisTypeInFunctionsNegative.js  |  3 ++-
 .../transformNestedGeneratorsWithTry.js       |  3 ++-
 91 files changed, 213 insertions(+), 94 deletions(-)
 create mode 100644 src/testRunner/unittests/evaluation/awaiter.ts

diff --git a/src/compiler/transformers/es2017.ts b/src/compiler/transformers/es2017.ts
index 8d20f94afed..9c2d5700d43 100644
--- a/src/compiler/transformers/es2017.ts
+++ b/src/compiler/transformers/es2017.ts
@@ -775,10 +775,11 @@ namespace ts {
         priority: 5,
         text: `
             var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+                function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
                 return new (P || (P = Promise))(function (resolve, reject) {
                     function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
                     function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-                    function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+                    function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
                     step((generator = generator.apply(thisArg, _arguments || [])).next());
                 });
             };`
diff --git a/src/testRunner/tsconfig.json b/src/testRunner/tsconfig.json
index 9ea6c4c85ce..659dd426b79 100644
--- a/src/testRunner/tsconfig.json
+++ b/src/testRunner/tsconfig.json
@@ -73,6 +73,7 @@
         "unittests/config/tsconfigParsing.ts",
         "unittests/evaluation/asyncArrow.ts",
         "unittests/evaluation/asyncGenerator.ts",
+        "unittests/evaluation/awaiter.ts",
         "unittests/evaluation/forAwaitOf.ts",
         "unittests/evaluation/objectRest.ts",
         "unittests/services/cancellableLanguageServiceOperations.ts",
diff --git a/src/testRunner/unittests/evaluation/awaiter.ts b/src/testRunner/unittests/evaluation/awaiter.ts
new file mode 100644
index 00000000000..65cb4e0ead9
--- /dev/null
+++ b/src/testRunner/unittests/evaluation/awaiter.ts
@@ -0,0 +1,24 @@
+describe("unittests:: evaluation:: awaiter", () => {
+    // NOTE: This could break if the ECMAScript spec ever changes the timing behavior for Promises (again)
+    it("await (es5)", async () => {
+        const result = evaluator.evaluateTypeScript(`
+        async function a(msg: string) {
+            await Promise.resolve();
+            output.push(msg);
+        }
+        function b(msg: string) {
+            return Promise.resolve().then(() => {
+                output.push(msg);
+            });
+        }
+        export const output: string[] = [];
+        export async function main() {
+            const p1 = a('1');
+            const p2 = b('2');
+            await Promise.all([p1, p2]);
+        }
+        `);
+        await result.main();
+        assert.deepEqual(result.output, ["1", "2"]);
+    });
+});
diff --git a/tests/baselines/reference/asyncArrowFunction11_es5.js b/tests/baselines/reference/asyncArrowFunction11_es5.js
index 5f234f2fbf6..a16ce36e840 100644
--- a/tests/baselines/reference/asyncArrowFunction11_es5.js
+++ b/tests/baselines/reference/asyncArrowFunction11_es5.js
@@ -9,10 +9,11 @@ class A {
 
 //// [asyncArrowFunction11_es5.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/asyncAwaitIsolatedModules_es5.js b/tests/baselines/reference/asyncAwaitIsolatedModules_es5.js
index 58b887c61a3..934f6be814a 100644
--- a/tests/baselines/reference/asyncAwaitIsolatedModules_es5.js
+++ b/tests/baselines/reference/asyncAwaitIsolatedModules_es5.js
@@ -42,10 +42,11 @@ module M {
 //// [asyncAwaitIsolatedModules_es5.js]
 "use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/asyncAwaitIsolatedModules_es6.js b/tests/baselines/reference/asyncAwaitIsolatedModules_es6.js
index 046b74e6569..2b956515ba1 100644
--- a/tests/baselines/reference/asyncAwaitIsolatedModules_es6.js
+++ b/tests/baselines/reference/asyncAwaitIsolatedModules_es6.js
@@ -41,10 +41,11 @@ module M {
 
 //// [asyncAwaitIsolatedModules_es6.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/asyncAwait_es5.js b/tests/baselines/reference/asyncAwait_es5.js
index ee8f160b2a4..6a6433e85c6 100644
--- a/tests/baselines/reference/asyncAwait_es5.js
+++ b/tests/baselines/reference/asyncAwait_es5.js
@@ -48,10 +48,11 @@ async function f14() {
 
 //// [asyncAwait_es5.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/asyncAwait_es6.js b/tests/baselines/reference/asyncAwait_es6.js
index 3cfe3b3ceec..caab72bad9a 100644
--- a/tests/baselines/reference/asyncAwait_es6.js
+++ b/tests/baselines/reference/asyncAwait_es6.js
@@ -48,10 +48,11 @@ async function f14() {
 
 //// [asyncAwait_es6.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/asyncFunctionNoReturnType.js b/tests/baselines/reference/asyncFunctionNoReturnType.js
index b376e398d17..430210cbdbc 100644
--- a/tests/baselines/reference/asyncFunctionNoReturnType.js
+++ b/tests/baselines/reference/asyncFunctionNoReturnType.js
@@ -7,10 +7,11 @@ async () => {
 
 //// [asyncFunctionNoReturnType.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/asyncFunctionReturnExpressionErrorSpans.js b/tests/baselines/reference/asyncFunctionReturnExpressionErrorSpans.js
index d60a7df66d0..887484e933a 100644
--- a/tests/baselines/reference/asyncFunctionReturnExpressionErrorSpans.js
+++ b/tests/baselines/reference/asyncFunctionReturnExpressionErrorSpans.js
@@ -23,10 +23,11 @@ async function asyncFoo(): Promise<Foo> {
 
 //// [asyncFunctionReturnExpressionErrorSpans.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/asyncFunctionReturnType.js b/tests/baselines/reference/asyncFunctionReturnType.js
index 6e39e72ae4c..04b3a04a036 100644
--- a/tests/baselines/reference/asyncFunctionReturnType.js
+++ b/tests/baselines/reference/asyncFunctionReturnType.js
@@ -77,10 +77,11 @@ async function fGenericIndexedTypeForExplicitPromiseOfKProp<TObj extends Obj, K
 
 //// [asyncFunctionReturnType.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/asyncFunctionTempVariableScoping.js b/tests/baselines/reference/asyncFunctionTempVariableScoping.js
index 0e258b81284..3a6da56c993 100644
--- a/tests/baselines/reference/asyncFunctionTempVariableScoping.js
+++ b/tests/baselines/reference/asyncFunctionTempVariableScoping.js
@@ -6,10 +6,11 @@ async ({ foo, bar, ...rest }) => bar(await foo);
 //// [asyncFunctionTempVariableScoping.js]
 // https://github.com/Microsoft/TypeScript/issues/19187
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/asyncFunctionWithForStatementNoInitializer.js b/tests/baselines/reference/asyncFunctionWithForStatementNoInitializer.js
index 99394281a15..055a751f523 100644
--- a/tests/baselines/reference/asyncFunctionWithForStatementNoInitializer.js
+++ b/tests/baselines/reference/asyncFunctionWithForStatementNoInitializer.js
@@ -26,10 +26,11 @@ async function test4() {
 
 //// [asyncFunctionWithForStatementNoInitializer.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/asyncFunctionsAcrossFiles.js b/tests/baselines/reference/asyncFunctionsAcrossFiles.js
index b1a766e4e41..cd86f20c69d 100644
--- a/tests/baselines/reference/asyncFunctionsAcrossFiles.js
+++ b/tests/baselines/reference/asyncFunctionsAcrossFiles.js
@@ -17,10 +17,11 @@ export const b = {
 
 //// [b.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
@@ -32,10 +33,11 @@ export const b = {
 };
 //// [a.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/asyncFunctionsAndStrictNullChecks.js b/tests/baselines/reference/asyncFunctionsAndStrictNullChecks.js
index 2afcf5d7dfd..a13f2f8b219 100644
--- a/tests/baselines/reference/asyncFunctionsAndStrictNullChecks.js
+++ b/tests/baselines/reference/asyncFunctionsAndStrictNullChecks.js
@@ -27,10 +27,11 @@ async function sample2(x?: number) {
 
 //// [asyncFunctionsAndStrictNullChecks.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/asyncIIFE.js b/tests/baselines/reference/asyncIIFE.js
index 8ca87781113..e2096b4c6de 100644
--- a/tests/baselines/reference/asyncIIFE.js
+++ b/tests/baselines/reference/asyncIIFE.js
@@ -11,10 +11,11 @@ function f1() {
 
 //// [asyncIIFE.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/asyncImportedPromise_es5.js b/tests/baselines/reference/asyncImportedPromise_es5.js
index f17459321c8..11699f6ab1e 100644
--- a/tests/baselines/reference/asyncImportedPromise_es5.js
+++ b/tests/baselines/reference/asyncImportedPromise_es5.js
@@ -36,10 +36,11 @@ exports.Task = Task;
 //// [test.js]
 "use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/asyncImportedPromise_es6.js b/tests/baselines/reference/asyncImportedPromise_es6.js
index 6b84f5615b3..41bf0f26087 100644
--- a/tests/baselines/reference/asyncImportedPromise_es6.js
+++ b/tests/baselines/reference/asyncImportedPromise_es6.js
@@ -18,10 +18,11 @@ exports.Task = Task;
 //// [test.js]
 "use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/asyncMethodWithSuperConflict_es6.js b/tests/baselines/reference/asyncMethodWithSuperConflict_es6.js
index 2a910226703..5e2a152b9e0 100644
--- a/tests/baselines/reference/asyncMethodWithSuperConflict_es6.js
+++ b/tests/baselines/reference/asyncMethodWithSuperConflict_es6.js
@@ -61,10 +61,11 @@ class B extends A {
 
 //// [asyncMethodWithSuperConflict_es6.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/asyncMultiFile_es5.js b/tests/baselines/reference/asyncMultiFile_es5.js
index a6dbb44ef9e..392a4456cc2 100644
--- a/tests/baselines/reference/asyncMultiFile_es5.js
+++ b/tests/baselines/reference/asyncMultiFile_es5.js
@@ -7,10 +7,11 @@ function g() { }
 
 //// [a.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/asyncMultiFile_es6.js b/tests/baselines/reference/asyncMultiFile_es6.js
index e7dd854b95b..7fbb00063c7 100644
--- a/tests/baselines/reference/asyncMultiFile_es6.js
+++ b/tests/baselines/reference/asyncMultiFile_es6.js
@@ -7,10 +7,11 @@ function g() { }
 
 //// [a.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/awaitUnionPromise.js b/tests/baselines/reference/awaitUnionPromise.js
index 90b894ee0f5..723339b9f71 100644
--- a/tests/baselines/reference/awaitUnionPromise.js
+++ b/tests/baselines/reference/awaitUnionPromise.js
@@ -23,10 +23,11 @@ async function main() {
 /// @target: es2015
 // https://github.com/Microsoft/TypeScript/issues/18186
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/await_unaryExpression_es6.js b/tests/baselines/reference/await_unaryExpression_es6.js
index 1361f80bc8e..69eef173613 100644
--- a/tests/baselines/reference/await_unaryExpression_es6.js
+++ b/tests/baselines/reference/await_unaryExpression_es6.js
@@ -17,10 +17,11 @@ async function bar4() {
 
 //// [await_unaryExpression_es6.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/await_unaryExpression_es6_1.js b/tests/baselines/reference/await_unaryExpression_es6_1.js
index 297299e4462..3a205f05ea9 100644
--- a/tests/baselines/reference/await_unaryExpression_es6_1.js
+++ b/tests/baselines/reference/await_unaryExpression_es6_1.js
@@ -21,10 +21,11 @@ async function bar4() {
 
 //// [await_unaryExpression_es6_1.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/await_unaryExpression_es6_2.js b/tests/baselines/reference/await_unaryExpression_es6_2.js
index fdf83e3def1..ee59f5825ae 100644
--- a/tests/baselines/reference/await_unaryExpression_es6_2.js
+++ b/tests/baselines/reference/await_unaryExpression_es6_2.js
@@ -13,10 +13,11 @@ async function bar3() {
 
 //// [await_unaryExpression_es6_2.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/await_unaryExpression_es6_3.js b/tests/baselines/reference/await_unaryExpression_es6_3.js
index 23985832ce1..42643caa262 100644
--- a/tests/baselines/reference/await_unaryExpression_es6_3.js
+++ b/tests/baselines/reference/await_unaryExpression_es6_3.js
@@ -19,10 +19,11 @@ async function bar4() {
 
 //// [await_unaryExpression_es6_3.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/capturedParametersInInitializers1.js b/tests/baselines/reference/capturedParametersInInitializers1.js
index 7ec393e2e39..ec5ff77d84b 100644
--- a/tests/baselines/reference/capturedParametersInInitializers1.js
+++ b/tests/baselines/reference/capturedParametersInInitializers1.js
@@ -42,10 +42,11 @@ function foo9(y = {[z]() { return z; }}, z = 1) {
 
 //// [capturedParametersInInitializers1.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/castOfAwait.js b/tests/baselines/reference/castOfAwait.js
index 9f67f74b11b..c00c1b028f4 100644
--- a/tests/baselines/reference/castOfAwait.js
+++ b/tests/baselines/reference/castOfAwait.js
@@ -10,10 +10,11 @@ async function f() {
 
 //// [castOfAwait.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/checkJsxSubtleSkipContextSensitiveBug.js b/tests/baselines/reference/checkJsxSubtleSkipContextSensitiveBug.js
index 704781dbe58..d1d6dd7eeec 100644
--- a/tests/baselines/reference/checkJsxSubtleSkipContextSensitiveBug.js
+++ b/tests/baselines/reference/checkJsxSubtleSkipContextSensitiveBug.js
@@ -40,10 +40,11 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/circularInferredTypeOfVariable.js b/tests/baselines/reference/circularInferredTypeOfVariable.js
index e7ba96ebaf8..d3e4dd0dc58 100644
--- a/tests/baselines/reference/circularInferredTypeOfVariable.js
+++ b/tests/baselines/reference/circularInferredTypeOfVariable.js
@@ -21,10 +21,11 @@
 //// [circularInferredTypeOfVariable.js]
 // Repro from #14428
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/controlFlowForCatchAndFinally.js b/tests/baselines/reference/controlFlowForCatchAndFinally.js
index b3dfc4e7bb8..48075ffb6b4 100644
--- a/tests/baselines/reference/controlFlowForCatchAndFinally.js
+++ b/tests/baselines/reference/controlFlowForCatchAndFinally.js
@@ -43,10 +43,11 @@ class Foo {
 //// [controlFlowForCatchAndFinally.js]
 "use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/correctOrderOfPromiseMethod.js b/tests/baselines/reference/correctOrderOfPromiseMethod.js
index 4c273d3c0f2..58c98189a43 100644
--- a/tests/baselines/reference/correctOrderOfPromiseMethod.js
+++ b/tests/baselines/reference/correctOrderOfPromiseMethod.js
@@ -27,10 +27,11 @@ async function countEverything(): Promise<number> {
 
 //// [correctOrderOfPromiseMethod.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/declarationEmitPrivateAsync.js b/tests/baselines/reference/declarationEmitPrivateAsync.js
index deeb9fd15d9..89f33267b8a 100644
--- a/tests/baselines/reference/declarationEmitPrivateAsync.js
+++ b/tests/baselines/reference/declarationEmitPrivateAsync.js
@@ -8,10 +8,11 @@ export class Foo {
 //// [declarationEmitPrivateAsync.js]
 "use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/declarationEmitPromise.js b/tests/baselines/reference/declarationEmitPromise.js
index 6822dc56c3d..313ffa04183 100644
--- a/tests/baselines/reference/declarationEmitPromise.js
+++ b/tests/baselines/reference/declarationEmitPromise.js
@@ -24,10 +24,11 @@ export async function runSampleBreaks<A, B, C, D, E>(
 //// [declarationEmitPromise.js]
 "use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/decoratorMetadataPromise.js b/tests/baselines/reference/decoratorMetadataPromise.js
index a370df936d5..41bb42e2732 100644
--- a/tests/baselines/reference/decoratorMetadataPromise.js
+++ b/tests/baselines/reference/decoratorMetadataPromise.js
@@ -22,10 +22,11 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/defaultExportInAwaitExpression01.js b/tests/baselines/reference/defaultExportInAwaitExpression01.js
index 6a31461fe3c..950c1141136 100644
--- a/tests/baselines/reference/defaultExportInAwaitExpression01.js
+++ b/tests/baselines/reference/defaultExportInAwaitExpression01.js
@@ -29,10 +29,11 @@ import x from './a';
 });
 //// [b.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/defaultExportInAwaitExpression02.js b/tests/baselines/reference/defaultExportInAwaitExpression02.js
index 565cfb41617..8aa41a6b52a 100644
--- a/tests/baselines/reference/defaultExportInAwaitExpression02.js
+++ b/tests/baselines/reference/defaultExportInAwaitExpression02.js
@@ -20,10 +20,11 @@ exports.default = x;
 //// [b.js]
 "use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/emitter.forAwait.es2015.js b/tests/baselines/reference/emitter.forAwait.es2015.js
index e5764747765..2b2cc3ce08d 100644
--- a/tests/baselines/reference/emitter.forAwait.es2015.js
+++ b/tests/baselines/reference/emitter.forAwait.es2015.js
@@ -43,10 +43,11 @@ async function* f6() {
 
 //// [file1.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
@@ -77,10 +78,11 @@ function f1() {
 }
 //// [file2.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
@@ -187,10 +189,11 @@ function f4() {
 }
 //// [file5.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/emitter.forAwait.es5.js b/tests/baselines/reference/emitter.forAwait.es5.js
index 0d67c591e30..f33af25dcc1 100644
--- a/tests/baselines/reference/emitter.forAwait.es5.js
+++ b/tests/baselines/reference/emitter.forAwait.es5.js
@@ -43,10 +43,11 @@ async function* f6() {
 
 //// [file1.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
@@ -124,10 +125,11 @@ function f1() {
 }
 //// [file2.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
@@ -375,10 +377,11 @@ function f4() {
 }
 //// [file5.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/es5-asyncFunction.js b/tests/baselines/reference/es5-asyncFunction.js
index 9b5744be31e..805e4d4a4c7 100644
--- a/tests/baselines/reference/es5-asyncFunction.js
+++ b/tests/baselines/reference/es5-asyncFunction.js
@@ -10,10 +10,11 @@ async function singleAwait() {
 
 //// [es5-asyncFunction.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/es5-importHelpersAsyncFunctions.js b/tests/baselines/reference/es5-importHelpersAsyncFunctions.js
index 932fd8185eb..75ac303d3c0 100644
--- a/tests/baselines/reference/es5-importHelpersAsyncFunctions.js
+++ b/tests/baselines/reference/es5-importHelpersAsyncFunctions.js
@@ -31,10 +31,11 @@ function foo() {
 exports.foo = foo;
 //// [script.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/exportDefaultAsyncFunction.js b/tests/baselines/reference/exportDefaultAsyncFunction.js
index 9931d1f1eea..31460daae84 100644
--- a/tests/baselines/reference/exportDefaultAsyncFunction.js
+++ b/tests/baselines/reference/exportDefaultAsyncFunction.js
@@ -5,10 +5,11 @@ foo();
 
 //// [exportDefaultAsyncFunction.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/exportDefaultAsyncFunction2.js b/tests/baselines/reference/exportDefaultAsyncFunction2.js
index 8f889381140..ad9b9086a74 100644
--- a/tests/baselines/reference/exportDefaultAsyncFunction2.js
+++ b/tests/baselines/reference/exportDefaultAsyncFunction2.js
@@ -35,10 +35,11 @@ import { async, await } from 'asyncawait';
 export default async(() => await(Promise.resolve(1)));
 //// [b.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/exportDefaultFunctionInNamespace.js b/tests/baselines/reference/exportDefaultFunctionInNamespace.js
index 3a0c260ff01..482611413b7 100644
--- a/tests/baselines/reference/exportDefaultFunctionInNamespace.js
+++ b/tests/baselines/reference/exportDefaultFunctionInNamespace.js
@@ -10,10 +10,11 @@ namespace ns_async_function {
 
 //// [exportDefaultFunctionInNamespace.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/expressionsForbiddenInParameterInitializers.js b/tests/baselines/reference/expressionsForbiddenInParameterInitializers.js
index e12f4b6a232..a23a820e8e5 100644
--- a/tests/baselines/reference/expressionsForbiddenInParameterInitializers.js
+++ b/tests/baselines/reference/expressionsForbiddenInParameterInitializers.js
@@ -9,10 +9,11 @@ export function* foo2({ foo = yield "a" }) {
 //// [bar.js]
 "use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/importCallExpressionAsyncES3AMD.js b/tests/baselines/reference/importCallExpressionAsyncES3AMD.js
index 7a8776ebe10..9b4f7f76cc7 100644
--- a/tests/baselines/reference/importCallExpressionAsyncES3AMD.js
+++ b/tests/baselines/reference/importCallExpressionAsyncES3AMD.js
@@ -30,10 +30,11 @@ export const l = async () => {
 
 //// [test.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/importCallExpressionAsyncES3CJS.js b/tests/baselines/reference/importCallExpressionAsyncES3CJS.js
index ba16d3bbd27..43b4c868529 100644
--- a/tests/baselines/reference/importCallExpressionAsyncES3CJS.js
+++ b/tests/baselines/reference/importCallExpressionAsyncES3CJS.js
@@ -31,10 +31,11 @@ export const l = async () => {
 //// [test.js]
 "use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/importCallExpressionAsyncES3System.js b/tests/baselines/reference/importCallExpressionAsyncES3System.js
index f8b7e54e5cd..6369c73b68b 100644
--- a/tests/baselines/reference/importCallExpressionAsyncES3System.js
+++ b/tests/baselines/reference/importCallExpressionAsyncES3System.js
@@ -32,10 +32,11 @@ export const l = async () => {
 System.register([], function (exports_1, context_1) {
     "use strict";
     var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+        function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
         return new (P || (P = Promise))(function (resolve, reject) {
             function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
             function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-            function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+            function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
             step((generator = generator.apply(thisArg, _arguments || [])).next());
         });
     };
diff --git a/tests/baselines/reference/importCallExpressionAsyncES3UMD.js b/tests/baselines/reference/importCallExpressionAsyncES3UMD.js
index 0f13a0252a6..794678e871d 100644
--- a/tests/baselines/reference/importCallExpressionAsyncES3UMD.js
+++ b/tests/baselines/reference/importCallExpressionAsyncES3UMD.js
@@ -30,10 +30,11 @@ export const l = async () => {
 
 //// [test.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/importCallExpressionAsyncES5AMD.js b/tests/baselines/reference/importCallExpressionAsyncES5AMD.js
index 17ba4f7e8bf..2451190c793 100644
--- a/tests/baselines/reference/importCallExpressionAsyncES5AMD.js
+++ b/tests/baselines/reference/importCallExpressionAsyncES5AMD.js
@@ -30,10 +30,11 @@ export const l = async () => {
 
 //// [test.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/importCallExpressionAsyncES5CJS.js b/tests/baselines/reference/importCallExpressionAsyncES5CJS.js
index 8e00d5b9739..cd60c69c4cf 100644
--- a/tests/baselines/reference/importCallExpressionAsyncES5CJS.js
+++ b/tests/baselines/reference/importCallExpressionAsyncES5CJS.js
@@ -31,10 +31,11 @@ export const l = async () => {
 //// [test.js]
 "use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/importCallExpressionAsyncES5System.js b/tests/baselines/reference/importCallExpressionAsyncES5System.js
index f63d41bf9a5..da510e8d098 100644
--- a/tests/baselines/reference/importCallExpressionAsyncES5System.js
+++ b/tests/baselines/reference/importCallExpressionAsyncES5System.js
@@ -32,10 +32,11 @@ export const l = async () => {
 System.register([], function (exports_1, context_1) {
     "use strict";
     var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+        function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
         return new (P || (P = Promise))(function (resolve, reject) {
             function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
             function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-            function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+            function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
             step((generator = generator.apply(thisArg, _arguments || [])).next());
         });
     };
diff --git a/tests/baselines/reference/importCallExpressionAsyncES5UMD.js b/tests/baselines/reference/importCallExpressionAsyncES5UMD.js
index 1c8ecdc5118..111b747ff32 100644
--- a/tests/baselines/reference/importCallExpressionAsyncES5UMD.js
+++ b/tests/baselines/reference/importCallExpressionAsyncES5UMD.js
@@ -30,10 +30,11 @@ export const l = async () => {
 
 //// [test.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/importCallExpressionAsyncES6AMD.js b/tests/baselines/reference/importCallExpressionAsyncES6AMD.js
index 7f86625bbfc..80cf843ade9 100644
--- a/tests/baselines/reference/importCallExpressionAsyncES6AMD.js
+++ b/tests/baselines/reference/importCallExpressionAsyncES6AMD.js
@@ -30,10 +30,11 @@ export const l = async () => {
 
 //// [test.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/importCallExpressionAsyncES6CJS.js b/tests/baselines/reference/importCallExpressionAsyncES6CJS.js
index 20961f96330..7ce2b69b44c 100644
--- a/tests/baselines/reference/importCallExpressionAsyncES6CJS.js
+++ b/tests/baselines/reference/importCallExpressionAsyncES6CJS.js
@@ -31,10 +31,11 @@ export const l = async () => {
 //// [test.js]
 "use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/importCallExpressionAsyncES6System.js b/tests/baselines/reference/importCallExpressionAsyncES6System.js
index 1f605dcc3f8..8dd7e2f32e8 100644
--- a/tests/baselines/reference/importCallExpressionAsyncES6System.js
+++ b/tests/baselines/reference/importCallExpressionAsyncES6System.js
@@ -32,10 +32,11 @@ export const l = async () => {
 System.register([], function (exports_1, context_1) {
     "use strict";
     var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+        function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
         return new (P || (P = Promise))(function (resolve, reject) {
             function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
             function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-            function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+            function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
             step((generator = generator.apply(thisArg, _arguments || [])).next());
         });
     };
diff --git a/tests/baselines/reference/importCallExpressionAsyncES6UMD.js b/tests/baselines/reference/importCallExpressionAsyncES6UMD.js
index 1d4aff02670..f7dfe0d9934 100644
--- a/tests/baselines/reference/importCallExpressionAsyncES6UMD.js
+++ b/tests/baselines/reference/importCallExpressionAsyncES6UMD.js
@@ -30,10 +30,11 @@ export const l = async () => {
 
 //// [test.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/importCallExpressionNestedAMD.js b/tests/baselines/reference/importCallExpressionNestedAMD.js
index dc211d44003..678c02a8e73 100644
--- a/tests/baselines/reference/importCallExpressionNestedAMD.js
+++ b/tests/baselines/reference/importCallExpressionNestedAMD.js
@@ -16,10 +16,11 @@ define(["require", "exports"], function (require, exports) {
 });
 //// [index.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/importCallExpressionNestedAMD2.js b/tests/baselines/reference/importCallExpressionNestedAMD2.js
index f6ebbe32c7b..ffc42963975 100644
--- a/tests/baselines/reference/importCallExpressionNestedAMD2.js
+++ b/tests/baselines/reference/importCallExpressionNestedAMD2.js
@@ -16,10 +16,11 @@ define(["require", "exports"], function (require, exports) {
 });
 //// [index.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/importCallExpressionNestedCJS.js b/tests/baselines/reference/importCallExpressionNestedCJS.js
index 07c0f234bf7..5b6abef5e0e 100644
--- a/tests/baselines/reference/importCallExpressionNestedCJS.js
+++ b/tests/baselines/reference/importCallExpressionNestedCJS.js
@@ -14,10 +14,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = "./foo";
 //// [index.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/importCallExpressionNestedCJS2.js b/tests/baselines/reference/importCallExpressionNestedCJS2.js
index 97728dfb41f..104a01b5bd9 100644
--- a/tests/baselines/reference/importCallExpressionNestedCJS2.js
+++ b/tests/baselines/reference/importCallExpressionNestedCJS2.js
@@ -14,10 +14,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = "./foo";
 //// [index.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/importCallExpressionNestedES2015.js b/tests/baselines/reference/importCallExpressionNestedES2015.js
index 5c8a6a9edb5..8bbb7c7b1f3 100644
--- a/tests/baselines/reference/importCallExpressionNestedES2015.js
+++ b/tests/baselines/reference/importCallExpressionNestedES2015.js
@@ -12,10 +12,11 @@ async function foo() {
 export default "./foo";
 //// [index.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/importCallExpressionNestedES20152.js b/tests/baselines/reference/importCallExpressionNestedES20152.js
index 0baee242a60..c0b888df2fb 100644
--- a/tests/baselines/reference/importCallExpressionNestedES20152.js
+++ b/tests/baselines/reference/importCallExpressionNestedES20152.js
@@ -12,10 +12,11 @@ async function foo() {
 export default "./foo";
 //// [index.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/importCallExpressionNestedESNext.js b/tests/baselines/reference/importCallExpressionNestedESNext.js
index 8ec9b988201..77ade8e8928 100644
--- a/tests/baselines/reference/importCallExpressionNestedESNext.js
+++ b/tests/baselines/reference/importCallExpressionNestedESNext.js
@@ -12,10 +12,11 @@ async function foo() {
 export default "./foo";
 //// [index.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/importCallExpressionNestedESNext2.js b/tests/baselines/reference/importCallExpressionNestedESNext2.js
index 07bfaf89d40..cfe3fca6aeb 100644
--- a/tests/baselines/reference/importCallExpressionNestedESNext2.js
+++ b/tests/baselines/reference/importCallExpressionNestedESNext2.js
@@ -12,10 +12,11 @@ async function foo() {
 export default "./foo";
 //// [index.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/importCallExpressionNestedSystem.js b/tests/baselines/reference/importCallExpressionNestedSystem.js
index 839a3601e38..15a825c8a76 100644
--- a/tests/baselines/reference/importCallExpressionNestedSystem.js
+++ b/tests/baselines/reference/importCallExpressionNestedSystem.js
@@ -22,10 +22,11 @@ System.register([], function (exports_1, context_1) {
 //// [index.js]
 System.register([], function (exports_1, context_1) {
     var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+        function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
         return new (P || (P = Promise))(function (resolve, reject) {
             function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
             function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-            function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+            function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
             step((generator = generator.apply(thisArg, _arguments || [])).next());
         });
     };
diff --git a/tests/baselines/reference/importCallExpressionNestedSystem2.js b/tests/baselines/reference/importCallExpressionNestedSystem2.js
index 1685ca93943..60861b7aca7 100644
--- a/tests/baselines/reference/importCallExpressionNestedSystem2.js
+++ b/tests/baselines/reference/importCallExpressionNestedSystem2.js
@@ -22,10 +22,11 @@ System.register([], function (exports_1, context_1) {
 //// [index.js]
 System.register([], function (exports_1, context_1) {
     var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+        function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
         return new (P || (P = Promise))(function (resolve, reject) {
             function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
             function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-            function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+            function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
             step((generator = generator.apply(thisArg, _arguments || [])).next());
         });
     };
diff --git a/tests/baselines/reference/importCallExpressionNestedUMD.js b/tests/baselines/reference/importCallExpressionNestedUMD.js
index c61e35c3399..29f0e0974ed 100644
--- a/tests/baselines/reference/importCallExpressionNestedUMD.js
+++ b/tests/baselines/reference/importCallExpressionNestedUMD.js
@@ -24,10 +24,11 @@ async function foo() {
 });
 //// [index.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/importCallExpressionNestedUMD2.js b/tests/baselines/reference/importCallExpressionNestedUMD2.js
index 5d1646d090a..33d3d608e14 100644
--- a/tests/baselines/reference/importCallExpressionNestedUMD2.js
+++ b/tests/baselines/reference/importCallExpressionNestedUMD2.js
@@ -24,10 +24,11 @@ async function foo() {
 });
 //// [index.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/importCallExpressionNoModuleKindSpecified.js b/tests/baselines/reference/importCallExpressionNoModuleKindSpecified.js
index 4f662c4be4f..9c54007d33f 100644
--- a/tests/baselines/reference/importCallExpressionNoModuleKindSpecified.js
+++ b/tests/baselines/reference/importCallExpressionNoModuleKindSpecified.js
@@ -45,10 +45,11 @@ function backup() { return "backup"; }
 exports.backup = backup;
 //// [2.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/importMetaES5.js b/tests/baselines/reference/importMetaES5.js
index e618f695869..6b69557e419 100644
--- a/tests/baselines/reference/importMetaES5.js
+++ b/tests/baselines/reference/importMetaES5.js
@@ -41,10 +41,11 @@ const { a, b, c } = import.meta.wellKnownProperty;
 //// [example.js]
 "use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/inferenceLimit.js b/tests/baselines/reference/inferenceLimit.js
index 997cbcd5b79..e27d155d616 100644
--- a/tests/baselines/reference/inferenceLimit.js
+++ b/tests/baselines/reference/inferenceLimit.js
@@ -46,10 +46,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 //// [file1.js]
 "use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/invalidContinueInDownlevelAsync.js b/tests/baselines/reference/invalidContinueInDownlevelAsync.js
index 793a9451f87..9a2fc08f4a8 100644
--- a/tests/baselines/reference/invalidContinueInDownlevelAsync.js
+++ b/tests/baselines/reference/invalidContinueInDownlevelAsync.js
@@ -10,10 +10,11 @@ async function func() {
 
 //// [invalidContinueInDownlevelAsync.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/labeledStatementWithLabel.js b/tests/baselines/reference/labeledStatementWithLabel.js
index ada819c9908..92c0472c222 100644
--- a/tests/baselines/reference/labeledStatementWithLabel.js
+++ b/tests/baselines/reference/labeledStatementWithLabel.js
@@ -16,10 +16,11 @@ label: type T = {}
 
 //// [labeledStatementWithLabel.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/labeledStatementWithLabel_es2015.js b/tests/baselines/reference/labeledStatementWithLabel_es2015.js
index 34ceb7bc17a..93d76684c6d 100644
--- a/tests/baselines/reference/labeledStatementWithLabel_es2015.js
+++ b/tests/baselines/reference/labeledStatementWithLabel_es2015.js
@@ -16,10 +16,11 @@ label: type T = {}
 
 //// [labeledStatementWithLabel_es2015.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/labeledStatementWithLabel_strict.js b/tests/baselines/reference/labeledStatementWithLabel_strict.js
index bcf211fdbfd..124c6c0bde2 100644
--- a/tests/baselines/reference/labeledStatementWithLabel_strict.js
+++ b/tests/baselines/reference/labeledStatementWithLabel_strict.js
@@ -18,10 +18,11 @@ label: type T = {}
 //// [labeledStatementWithLabel_strict.js]
 "use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions1.js b/tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions1.js
index 8fdb55a0f26..5c16fa2a389 100644
--- a/tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions1.js
+++ b/tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions1.js
@@ -82,10 +82,11 @@ const o1 = {
 
 //// [modularizeLibrary_NoErrorDuplicateLibOptions1.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions2.js b/tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions2.js
index 21a8fa48b1f..9d340096491 100644
--- a/tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions2.js
+++ b/tests/baselines/reference/modularizeLibrary_NoErrorDuplicateLibOptions2.js
@@ -82,10 +82,11 @@ const o1 = {
 
 //// [modularizeLibrary_NoErrorDuplicateLibOptions2.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/modularizeLibrary_TargetES5UsingES6Lib.js b/tests/baselines/reference/modularizeLibrary_TargetES5UsingES6Lib.js
index 093f3bde868..57fca626c06 100644
--- a/tests/baselines/reference/modularizeLibrary_TargetES5UsingES6Lib.js
+++ b/tests/baselines/reference/modularizeLibrary_TargetES5UsingES6Lib.js
@@ -82,10 +82,11 @@ const o1 = {
 
 //// [modularizeLibrary_TargetES5UsingES6Lib.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/noImplicitReturnsInAsync1.js b/tests/baselines/reference/noImplicitReturnsInAsync1.js
index e165cafe3b1..d803694056f 100644
--- a/tests/baselines/reference/noImplicitReturnsInAsync1.js
+++ b/tests/baselines/reference/noImplicitReturnsInAsync1.js
@@ -8,10 +8,11 @@ async function test(isError: boolean = false) {
 
 //// [noImplicitReturnsInAsync1.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/noImplicitReturnsInAsync2.js b/tests/baselines/reference/noImplicitReturnsInAsync2.js
index e84b42e8a55..64f267459c3 100644
--- a/tests/baselines/reference/noImplicitReturnsInAsync2.js
+++ b/tests/baselines/reference/noImplicitReturnsInAsync2.js
@@ -37,10 +37,11 @@ async function test7(isError: boolean = true) {
 
 //// [noImplicitReturnsInAsync2.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/objectRest2.js b/tests/baselines/reference/objectRest2.js
index e46d22db80a..e97e1a0498e 100644
--- a/tests/baselines/reference/objectRest2.js
+++ b/tests/baselines/reference/objectRest2.js
@@ -16,10 +16,11 @@ rootConnection('test');
 
 //// [objectRest2.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/operationsAvailableOnPromisedType.js b/tests/baselines/reference/operationsAvailableOnPromisedType.js
index c9f8851fcc8..5772f603037 100644
--- a/tests/baselines/reference/operationsAvailableOnPromisedType.js
+++ b/tests/baselines/reference/operationsAvailableOnPromisedType.js
@@ -31,10 +31,11 @@ async function fn(
 
 //// [operationsAvailableOnPromisedType.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/parenthesizedAsyncArrowFunction.js b/tests/baselines/reference/parenthesizedAsyncArrowFunction.js
index 2009a240f0e..916a0e4a045 100644
--- a/tests/baselines/reference/parenthesizedAsyncArrowFunction.js
+++ b/tests/baselines/reference/parenthesizedAsyncArrowFunction.js
@@ -7,10 +7,11 @@ let foo = (async bar => bar);
 //// [parenthesizedAsyncArrowFunction.js]
 // Repro from #20096
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/promiseDefinitionTest.js b/tests/baselines/reference/promiseDefinitionTest.js
index a0f503e2f03..c502085e362 100644
--- a/tests/baselines/reference/promiseDefinitionTest.js
+++ b/tests/baselines/reference/promiseDefinitionTest.js
@@ -6,10 +6,11 @@ const x = foo();
 
 //// [promiseDefinitionTest.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/promiseType.js b/tests/baselines/reference/promiseType.js
index d6b82ebb4d5..84d9d713b48 100644
--- a/tests/baselines/reference/promiseType.js
+++ b/tests/baselines/reference/promiseType.js
@@ -221,10 +221,11 @@ const pc9 = p.then(() => Promise.reject("1"), () => Promise.reject(1));
 
 //// [promiseType.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/promiseTypeStrictNull.js b/tests/baselines/reference/promiseTypeStrictNull.js
index 60e0b9b61df..cdee87b5666 100644
--- a/tests/baselines/reference/promiseTypeStrictNull.js
+++ b/tests/baselines/reference/promiseTypeStrictNull.js
@@ -221,10 +221,11 @@ const pc9 = p.then(() => Promise.reject("1"), () => Promise.reject(1));
 
 //// [promiseTypeStrictNull.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/reachabilityChecks7.js b/tests/baselines/reference/reachabilityChecks7.js
index 30addff4aec..8421e1ff594 100644
--- a/tests/baselines/reference/reachabilityChecks7.js
+++ b/tests/baselines/reference/reachabilityChecks7.js
@@ -31,10 +31,11 @@ let x1 = () => { use("Test"); }
 
 //// [reachabilityChecks7.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/reactReduxLikeDeferredInferenceAllowsAssignment.js b/tests/baselines/reference/reactReduxLikeDeferredInferenceAllowsAssignment.js
index 69e1108ad30..88ae943f92a 100644
--- a/tests/baselines/reference/reactReduxLikeDeferredInferenceAllowsAssignment.js
+++ b/tests/baselines/reference/reactReduxLikeDeferredInferenceAllowsAssignment.js
@@ -163,10 +163,11 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/thisTypeInFunctionsNegative.js b/tests/baselines/reference/thisTypeInFunctionsNegative.js
index ed454ee8b70..a3fe0b8ee59 100644
--- a/tests/baselines/reference/thisTypeInFunctionsNegative.js
+++ b/tests/baselines/reference/thisTypeInFunctionsNegative.js
@@ -181,10 +181,11 @@ const f4 = async <T>(this: {n: number}, m: number) => m + this.n;
 
 //// [thisTypeInFunctionsNegative.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
diff --git a/tests/baselines/reference/transformNestedGeneratorsWithTry.js b/tests/baselines/reference/transformNestedGeneratorsWithTry.js
index 28f01e07988..84b933cc6a7 100644
--- a/tests/baselines/reference/transformNestedGeneratorsWithTry.js
+++ b/tests/baselines/reference/transformNestedGeneratorsWithTry.js
@@ -25,10 +25,11 @@ declare module "bluebird" {
 //// [main.js]
 "use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };

From 3206f5fb94d7962c6f0588289a5c670bfc0b4b54 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Tue, 23 Jul 2019 06:38:49 -0700
Subject: [PATCH 044/151] When inferring from XXX to T | XXX make no inferece
 for T (instead of never)

---
 src/compiler/checker.ts | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 0a64e0552e2..72d91c184d7 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -15515,16 +15515,18 @@ namespace ts {
                     // removing the identically matched constituents. For example, when inferring from
                     // 'string | string[]' to 'string | T' we reduce the types to 'string[]' and 'T'.
                     if (matchingTypes) {
-                        source = removeTypesFromUnionOrIntersection(<UnionOrIntersectionType>source, matchingTypes);
-                        target = removeTypesFromUnionOrIntersection(<UnionOrIntersectionType>target, matchingTypes);
+                        const s = removeTypesFromUnionOrIntersection(<UnionOrIntersectionType>source, matchingTypes);
+                        const t = removeTypesFromUnionOrIntersection(<UnionOrIntersectionType>target, matchingTypes);
+                        if (!(s && t)) return;
+                        source = s;
+                        target = t;
                     }
                 }
                 else if (target.flags & TypeFlags.Union && !(target.flags & TypeFlags.EnumLiteral) || target.flags & TypeFlags.Intersection) {
                     const matched = findMatchedType(source, <UnionOrIntersectionType>target);
                     if (matched) {
                         inferFromTypes(matched, matched);
-                        source = target.flags & TypeFlags.Union ? neverType : unknownType;
-                        target = removeTypesFromUnionOrIntersection(<UnionOrIntersectionType>target, [matched]);
+                        return;
                     }
                 }
                 else if (target.flags & (TypeFlags.IndexedAccess | TypeFlags.Substitution)) {
@@ -15993,7 +15995,7 @@ namespace ts {
                     reducedTypes.push(t);
                 }
             }
-            return type.flags & TypeFlags.Union ? getUnionType(reducedTypes) : getIntersectionType(reducedTypes);
+            return reducedTypes.length ? type.flags & TypeFlags.Union ? getUnionType(reducedTypes) : getIntersectionType(reducedTypes) : undefined;
         }
 
         function hasPrimitiveConstraint(type: TypeParameter): boolean {

From 564685692f8103e6b8f90dd47283aa2363ef768f Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Tue, 23 Jul 2019 06:38:58 -0700
Subject: [PATCH 045/151] Accept new baselines

---
 .../baselines/reference/unionAndIntersectionInference2.types  | 2 +-
 tests/baselines/reference/unionTypeInference.types            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/baselines/reference/unionAndIntersectionInference2.types b/tests/baselines/reference/unionAndIntersectionInference2.types
index 031354506b7..24f24220bd9 100644
--- a/tests/baselines/reference/unionAndIntersectionInference2.types
+++ b/tests/baselines/reference/unionAndIntersectionInference2.types
@@ -20,7 +20,7 @@ var e1: number | string | boolean;
 >e1 : string | number | boolean
 
 f1(a1); // string
->f1(a1) : never
+>f1(a1) : unknown
 >f1 : <T>(x: string | T) => T
 >a1 : string
 
diff --git a/tests/baselines/reference/unionTypeInference.types b/tests/baselines/reference/unionTypeInference.types
index 6675e63f8c4..304bbcd33ec 100644
--- a/tests/baselines/reference/unionTypeInference.types
+++ b/tests/baselines/reference/unionTypeInference.types
@@ -104,8 +104,8 @@ const c4 = f3(b);  // true
 >b : boolean
 
 const c5 = f3("abc");  // never
->c5 : never
->f3("abc") : never
+>c5 : unknown
+>f3("abc") : unknown
 >f3 : <T>(x: string | false | T) => T
 >"abc" : "abc"
 

From b8e779d89ad939d1740542e8f01347670b116cb0 Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Tue, 23 Jul 2019 16:28:22 -0700
Subject: [PATCH 046/151] When the exported symbol is merged symbol from
 declaration use that name to verify quality Fixes #27880

---
 src/services/codefixes/importFixes.ts         |  7 ++-
 .../completionsImport_default_symbolName.ts   | 44 +++++++++++++++++++
 2 files changed, 49 insertions(+), 2 deletions(-)
 create mode 100644 tests/cases/fourslash/completionsImport_default_symbolName.ts

diff --git a/src/services/codefixes/importFixes.ts b/src/services/codefixes/importFixes.ts
index 8006d1a0cfd..5f1754c3036 100644
--- a/src/services/codefixes/importFixes.ts
+++ b/src/services/codefixes/importFixes.ts
@@ -445,9 +445,12 @@ namespace ts.codefix {
             const aliased = checker.getImmediateAliasedSymbol(defaultExport);
             return aliased && getDefaultExportInfoWorker(aliased, Debug.assertDefined(aliased.parent), checker, compilerOptions);
         }
-        else {
-            return { symbolForMeaning: defaultExport, name: moduleSymbolToValidIdentifier(moduleSymbol, compilerOptions.target!) };
+
+        if (defaultExport.escapedName !== InternalSymbolName.Default &&
+            defaultExport.escapedName !== InternalSymbolName.ExportEquals) {
+            return { symbolForMeaning: defaultExport, name: defaultExport.getName() };
         }
+        return { symbolForMeaning: defaultExport, name: moduleSymbolToValidIdentifier(moduleSymbol, compilerOptions.target!) };
     }
 
     function getNameForExportDefault(symbol: Symbol): string | undefined {
diff --git a/tests/cases/fourslash/completionsImport_default_symbolName.ts b/tests/cases/fourslash/completionsImport_default_symbolName.ts
new file mode 100644
index 00000000000..0ede7a1673a
--- /dev/null
+++ b/tests/cases/fourslash/completionsImport_default_symbolName.ts
@@ -0,0 +1,44 @@
+/// <reference path="fourslash.ts" />
+
+// @module: commonjs
+
+// @Filename: /node_modules/@types/range-parser/index.d.ts
+////declare function RangeParser(): string;
+////declare namespace RangeParser {
+////    interface Options {
+////        combine?: boolean;
+////    }
+////}
+////export = RangeParser;
+
+// @Filename: /b.ts
+////R/*0*/
+
+verify.completions(
+    {
+        marker: "0",
+        includes: {
+            name: "RangeParser",
+            kind: "function",
+            kindModifiers: "declare",
+            source: "/node_modules/@types/range-parser/index",
+            sourceDisplay: "range-parser",
+            hasAction: true,
+            sortText: completion.SortText.AutoImportSuggestions,
+            text: `namespace RangeParser
+function RangeParser(): string`
+        },
+        preferences: {
+            includeCompletionsForModuleExports: true
+        }
+    },
+);
+
+verify.applyCodeActionFromCompletion("0", {
+    name: "RangeParser",
+    source: "/node_modules/@types/range-parser/index",
+    description: `Import 'RangeParser' from module "range-parser"`,
+    newFileContent: `import RangeParser = require("range-parser");
+
+R`,
+});

From 40fd4efdf6b61dcf1a2265c23d784a4974a5cfc7 Mon Sep 17 00:00:00 2001
From: Wesley Wigham <wewigham@microsoft.com>
Date: Tue, 23 Jul 2019 17:14:50 -0700
Subject: [PATCH 047/151] Strip more kinds of timestamps and versions from
 dockerfile output (#32519)

* Strip more kinds of timestamps and versions from dockerfile output, rewrite office-ui-fabric dockerfile to use new lerna build system

* Add another filter for just output

* Update user baselines (#23)

* Update user baselines (#24)

* Strip only maybe-present timestamps

* More lenient timestamp filter

* Update user baselines (#25)

* Simplify and enhance vscode dockerfile to use nightly ts in ts extension, too

* Update user baselines (#26)

* Update user baselines (#27)
---
 src/testRunner/externalCompileRunner.ts       |   8 +-
 .../baselines/reference/docker/azure-sdk.log  |  65 +-
 .../reference/docker/office-ui-fabric.log     | 795 ++++++++++--------
 tests/baselines/reference/docker/vscode.log   |  31 +-
 .../cases/docker/office-ui-fabric/Dockerfile  |  29 +-
 tests/cases/docker/vscode/Dockerfile          |  10 +-
 tests/cases/user/prettier/prettier            |   2 +-
 7 files changed, 495 insertions(+), 445 deletions(-)

diff --git a/src/testRunner/externalCompileRunner.ts b/src/testRunner/externalCompileRunner.ts
index dbe7bc5854f..a47c0b59e24 100644
--- a/src/testRunner/externalCompileRunner.ts
+++ b/src/testRunner/externalCompileRunner.ts
@@ -185,7 +185,8 @@ function stripRushStageNumbers(result: string): string {
  * so we purge as much of the gulp output as we can
  */
 function sanitizeUnimportantGulpOutput(result: string): string {
-    return result.replace(/^.*(\] (Starting)|(Finished)).*$/gm, "") // task start/end messages (nondeterministic order)
+    return result.replace(/^.*(\] (Starting)|(Finished)).*$/gm, "") // "gulp" task start/end messages (nondeterministic order)
+        .replace(/^.*(\] . (finished)|(started)).*$/gm, "") // "just" task start/end messages (nondeterministic order)
         .replace(/^.*\] Respawned to PID: \d+.*$/gm, "") // PID of child is OS and system-load dependent (likely stableish in a container but still dangerous)
         .replace(/\n+/g, "\n");
 }
@@ -193,14 +194,17 @@ function sanitizeUnimportantGulpOutput(result: string): string {
 function sanitizeTimestamps(result: string): string {
     return result.replace(/\[\d?\d:\d\d:\d\d (A|P)M\]/g, "[XX:XX:XX XM]")
         .replace(/\[\d?\d:\d\d:\d\d\]/g, "[XX:XX:XX]")
+        .replace(/\/\d+-\d+-[\d_TZ]+-debug.log/g, "\/XXXX-XX-XXXXXXXXX-debug.log")
         .replace(/\d+(\.\d+)? sec(onds?)?/g, "? seconds")
         .replace(/\d+(\.\d+)? min(utes?)?/g, "")
-        .replace(/\d+(\.\d+)?( m)?s/g, "?s");
+        .replace(/\d+(\.\d+)? ?m?s/g, "?s")
+        .replace(/ \(\?s\)/g, "");
 }
 
 function sanitizeVersionSpecifiers(result: string): string {
     return result
         .replace(/\d+.\d+.\d+-insiders.\d\d\d\d\d\d\d\d/g, "X.X.X-insiders.xxxxxxxx")
+        .replace(/Rush Multi-Project Build Tool (\d+)\.\d+\.\d+/g, "Rush Multi-Project Build Tool $1.X.X")
         .replace(/([@v\()])\d+\.\d+\.\d+/g, "$1X.X.X");
 }
 
diff --git a/tests/baselines/reference/docker/azure-sdk.log b/tests/baselines/reference/docker/azure-sdk.log
index a75af93aee1..8728a9a8110 100644
--- a/tests/baselines/reference/docker/azure-sdk.log
+++ b/tests/baselines/reference/docker/azure-sdk.log
@@ -1,54 +1,41 @@
 Exit Code: 1
 Standard output:
 
-Rush Multi-Project Build Tool 5.10.1 - https://rushjs.io
+Rush Multi-Project Build Tool 5.X.X - https://rushjs.io
 Starting "rush rebuild"
-Executing a maximum of 1 simultaneous processes...
-[@azure/cosmos] started
-XX of XX: [@azure/cosmos] completed successfully in ? seconds
-[@azure/event-processor-host] started
-XX of XX: [@azure/event-processor-host] completed successfully in ? seconds
-[@azure/service-bus] started
-Warning: You have changed the public API signature for this project. Updating review/service-bus.api.md
-[@azure/storage-blob] started
-XX of XX: [@azure/storage-blob] completed successfully in ? seconds
-[@azure/storage-file] started
-XX of XX: [@azure/storage-file] completed successfully in ? seconds
-[@azure/storage-queue] started
-XX of XX: [@azure/storage-queue] completed successfully in ? seconds
-[@azure/template] started
-XX of XX: [@azure/template] completed successfully in ? seconds
-[testhub] started
-XX of XX: [testhub] completed successfully in ? seconds
-[@azure/abort-controller] started
+Executing a maximum of ?simultaneous processes...
 XX of XX: [@azure/abort-controller] completed successfully in ? seconds
-[@azure/core-asynciterator-polyfill] started
 XX of XX: [@azure/core-asynciterator-polyfill] completed successfully in ? seconds
-[@azure/core-auth] started
+XX of XX: [@azure/core-paging] completed successfully in ? seconds
+XX of XX: [@azure/cosmos] completed successfully in ? seconds
+XX of XX: [@azure/event-processor-host] completed successfully in ? seconds
+Warning: You have changed the public API signature for this project. Updating review/service-bus.api.md
+XX of XX: [@azure/storage-blob] completed successfully in ? seconds
+XX of XX: [@azure/storage-file] completed successfully in ? seconds
+XX of XX: [@azure/storage-queue] completed successfully in ? seconds
+XX of XX: [@azure/template] completed successfully in ? seconds
+XX of XX: [testhub] completed successfully in ? seconds
 XX of XX: [@azure/core-auth] completed successfully in ? seconds
-[@azure/core-http] started
 npm ERR! code ELIFECYCLE
 npm ERR! errno 2
-npm ERR! @azure/core-http@X.X.X-preview.1 build:tsc: `tsc -p tsconfig.es.json`
+npm ERR! @azure/core-http@X.X.X-preview.2 build:tsc: `tsc -p tsconfig.es.json`
 npm ERR! Exit status 2
 npm ERR! 
-npm ERR! Failed at the @azure/core-http@X.X.X-preview.1 build:tsc script.
+npm ERR! Failed at the @azure/core-http@X.X.X-preview.2 build:tsc script.
 npm ERR! This is probably not a problem with npm. There is likely additional logging output above.
 npm ERR! A complete log of this run can be found in:
-npm ERR!     /root/.npm/_logs/2019-07-19T13_40_31_496Z-debug.log
+npm ERR!     /root/.npm/_logs/XXXX-XX-XXXXXXXXX-debug.log
 ERROR: "build:tsc" exited with 2.
 npm ERR! code ELIFECYCLE
 npm ERR! errno 1
-npm ERR! @azure/core-http@X.X.X-preview.1 build:lib: `run-s build:tsc build:rollup build:minify-browser`
+npm ERR! @azure/core-http@X.X.X-preview.2 build:lib: `run-s build:tsc build:rollup build:minify-browser`
 npm ERR! Exit status 1
 npm ERR! 
-npm ERR! Failed at the @azure/core-http@X.X.X-preview.1 build:lib script.
+npm ERR! Failed at the @azure/core-http@X.X.X-preview.2 build:lib script.
 npm ERR! This is probably not a problem with npm. There is likely additional logging output above.
 npm ERR! A complete log of this run can be found in:
-npm ERR!     /root/.npm/_logs/2019-07-19T13_40_31_533Z-debug.log
+npm ERR!     /root/.npm/_logs/XXXX-XX-XXXXXXXXX-debug.log
 ERROR: "build:lib" exited with 1.
-[@azure/core-paging] started
-XX of XX: [@azure/core-paging] completed successfully in ? seconds
 SUCCESS (11)
 ================================
 @azure/abort-controller (? seconds)
@@ -83,23 +70,23 @@ FAILURE (1)
 @azure/core-http (? seconds)
 npm ERR! code ELIFECYCLE
 npm ERR! errno 2
-npm ERR! @azure/core-http@X.X.X-preview.1 build:tsc: `tsc -p tsconfig.es.json`
+npm ERR! @azure/core-http@X.X.X-preview.2 build:tsc: `tsc -p tsconfig.es.json`
 npm ERR! Exit status 2
 npm ERR!
-npm ERR! Failed at the @azure/core-http@X.X.X-preview.1 build:tsc script.
+npm ERR! Failed at the @azure/core-http@X.X.X-preview.2 build:tsc script.
 npm ERR! This is probably not a problem with npm. There is likely additional logging output above.
 npm ERR! A complete log of this run can be found in:
-npm ERR!     /root/.npm/_logs/2019-07-19T13_40_31_496Z-debug.log
+npm ERR!     /root/.npm/_logs/XXXX-XX-XXXXXXXXX-debug.log
 ERROR: "build:tsc" exited with 2.
 npm ERR! code ELIFECYCLE
 npm ERR! errno 1
-npm ERR! @azure/core-http@X.X.X-preview.1 build:lib: `run-s build:tsc build:rollup build:minify-browser`
+npm ERR! @azure/core-http@X.X.X-preview.2 build:lib: `run-s build:tsc build:rollup build:minify-browser`
 npm ERR! Exit status 1
 npm ERR!
-npm ERR! Failed at the @azure/core-http@X.X.X-preview.1 build:lib script.
+npm ERR! Failed at the @azure/core-http@X.X.X-preview.2 build:lib script.
 npm ERR! This is probably not a problem with npm. There is likely additional logging output above.
 npm ERR! A complete log of this run can be found in:
-npm ERR!     /root/.npm/_logs/2019-07-19T13_40_31_533Z-debug.log
+npm ERR!     /root/.npm/_logs/XXXX-XX-XXXXXXXXX-debug.log
 ERROR: "build:lib" exited with 1.
 ================================
 Error: Project(s) failed to build
@@ -112,10 +99,10 @@ Your version of Node.js (X.X.X) has not been tested with this release of Rush. T
 XX of XX: [@azure/service-bus] completed with warnings in ? seconds
 XX of XX: [@azure/core-http] failed to build!
 XX of XX: [@azure/core-arm] blocked by [@azure/core-http]!
-XX of XX: [@azure/identity] blocked by [@azure/core-http]!
-XX of XX: [@azure/core-amqp] blocked by [@azure/core-http]!
-XX of XX: [@azure/event-hubs] blocked by [@azure/core-http]!
 XX of XX: [@azure/keyvault-certificates] blocked by [@azure/core-http]!
 XX of XX: [@azure/keyvault-keys] blocked by [@azure/core-http]!
 XX of XX: [@azure/keyvault-secrets] blocked by [@azure/core-http]!
+XX of XX: [@azure/identity] blocked by [@azure/core-http]!
+XX of XX: [@azure/core-amqp] blocked by [@azure/core-http]!
+XX of XX: [@azure/event-hubs] blocked by [@azure/core-http]!
 [@azure/core-http] Returned error code: 1
diff --git a/tests/baselines/reference/docker/office-ui-fabric.log b/tests/baselines/reference/docker/office-ui-fabric.log
index 888e20cac4b..745bdff4193 100644
--- a/tests/baselines/reference/docker/office-ui-fabric.log
+++ b/tests/baselines/reference/docker/office-ui-fabric.log
@@ -1,371 +1,436 @@
 Exit Code: 1
 Standard output:
-
-Rush Multi-Project Build Tool 5.6.0 - https://rushjs.io
-Starting "rush rebuild"
-Executing a maximum of 1 simultaneous processes...
-[@uifabric/prettier-rules] started
-XX of XX: [@uifabric/prettier-rules] completed successfully in ? seconds
-[@uifabric/tslint-rules] started
-XX of XX: [@uifabric/tslint-rules] completed successfully in ? seconds
-[@uifabric/codepen-loader] started
-ts-jest[versions] (WARN) Version X.X.X-insiders.xxxxxxxx of typescript installed has not been tested with ts-jest. If you're experiencing issues, consider using a supported version (>=2.7.0 <4.0.0). Please do not report issues in ts-jest if you are using unsupported versions.
- PASS  src/__tests__/codepenTransform.test.ts
-  codepen transform
-    ✓ handles examples with function components (256ms)
-    ✓ handles examples with class components (38ms)
-    ✓ handles examples importing exampleData (125ms)
-    ✓ handles examples importing TestImages (33ms)
-    ✓ handles examples importing PeopleExampleData (270ms)
-Test Suites: 1 passed, 1 total
-Tests:       5 passed, 5 total
-Snapshots:   4 passed, 4 total
-Time:        ?s
-Ran all test suites.
-[@uifabric/build] started
-XX of XX: [@uifabric/build] completed successfully in ? seconds
-[@uifabric/migration] started
-XX of XX: [@uifabric/migration] completed successfully in ? seconds
-[@uifabric/set-version] started
-XX of XX: [@uifabric/set-version] completed successfully in ? seconds
-[@uifabric/merge-styles] started
-ts-jest[versions] (WARN) Version X.X.X-insiders.xxxxxxxx of typescript installed has not been tested with ts-jest. If you're experiencing issues, consider using a supported version (>=2.7.0 <4.0.0). Please do not report issues in ts-jest if you are using unsupported versions.
-[@uifabric/jest-serializer-merge-styles] started
-ts-jest[versions] (WARN) Version X.X.X-insiders.xxxxxxxx of typescript installed has not been tested with ts-jest. If you're experiencing issues, consider using a supported version (>=2.7.0 <4.0.0). Please do not report issues in ts-jest if you are using unsupported versions.
-[@uifabric/test-utilities] started
-XX of XX: [@uifabric/test-utilities] completed successfully in ? seconds
-[@uifabric/utilities] started
-ts-jest[versions] (WARN) Version X.X.X-insiders.xxxxxxxx of typescript installed has not been tested with ts-jest. If you're experiencing issues, consider using a supported version (>=2.7.0 <4.0.0). Please do not report issues in ts-jest if you are using unsupported versions.
-[@uifabric/styling] started
-ts-jest[versions] (WARN) Version X.X.X-insiders.xxxxxxxx of typescript installed has not been tested with ts-jest. If you're experiencing issues, consider using a supported version (>=2.7.0 <4.0.0). Please do not report issues in ts-jest if you are using unsupported versions.
-[@uifabric/file-type-icons] started
-XX of XX: [@uifabric/file-type-icons] completed successfully in ? seconds
-[@uifabric/foundation] started
-ts-jest[versions] (WARN) Version X.X.X-insiders.xxxxxxxx of typescript installed has not been tested with ts-jest. If you're experiencing issues, consider using a supported version (>=2.7.0 <4.0.0). Please do not report issues in ts-jest if you are using unsupported versions.
-  ● createFactory › passes componentProps without userProps
-    RangeError: Invalid array length
-      189 |   for (const props of allProps) {
-      190 |     classNames.push(props && props.className);
-    > 191 |     assign(finalProps, ...(props as any));
-          |           ^
-      192 |   }
-      193 | 
-      194 |   finalProps.className = mergeStyles(defaultStyles, classNames);
-      at Object.__spreadArrays (../../common/temp/node_modules/.registry.npmjs.org/tslib/1.10.0/node_modules/tslib/tslib.js:182:22)
-      at _constructFinalProps (src/slots.tsx:191:11)
-      at result (src/slots.tsx:88:24)
-      at Object.<anonymous> (src/slots.test.tsx:205:73)
-  ● createFactory › passes userProp string as child
-    RangeError: Invalid array length
-      189 |   for (const props of allProps) {
-      190 |     classNames.push(props && props.className);
-    > 191 |     assign(finalProps, ...(props as any));
-          |           ^
-      192 |   }
-      193 | 
-      194 |   finalProps.className = mergeStyles(defaultStyles, classNames);
-      at Object.__spreadArrays (../../common/temp/node_modules/.registry.npmjs.org/tslib/1.10.0/node_modules/tslib/tslib.js:182:22)
-      at _constructFinalProps (src/slots.tsx:191:11)
-      at result (src/slots.tsx:88:24)
-      at Object.<anonymous> (src/slots.test.tsx:210:76)
-  ● createFactory › passes userProp integer as child
-    RangeError: Invalid array length
-      189 |   for (const props of allProps) {
-      190 |     classNames.push(props && props.className);
-    > 191 |     assign(finalProps, ...(props as any));
-          |           ^
-      192 |   }
-      193 | 
-      194 |   finalProps.className = mergeStyles(defaultStyles, classNames);
-      at Object.__spreadArrays (../../common/temp/node_modules/.registry.npmjs.org/tslib/1.10.0/node_modules/tslib/tslib.js:182:22)
-      at _constructFinalProps (src/slots.tsx:191:11)
-      at result (src/slots.tsx:88:24)
-      at Object.<anonymous> (src/slots.test.tsx:220:76)
-  ● createFactory › passes userProp string as defaultProp
-    RangeError: Invalid array length
-      189 |   for (const props of allProps) {
-      190 |     classNames.push(props && props.className);
-    > 191 |     assign(finalProps, ...(props as any));
-          |           ^
-      192 |   }
-      193 | 
-      194 |   finalProps.className = mergeStyles(defaultStyles, classNames);
-      at Object.__spreadArrays (../../common/temp/node_modules/.registry.npmjs.org/tslib/1.10.0/node_modules/tslib/tslib.js:182:22)
-      at _constructFinalProps (src/slots.tsx:191:11)
-      at result (src/slots.tsx:88:24)
-      at Object.<anonymous> (src/slots.test.tsx:225:92)
-  ● createFactory › passes userProp integer as defaultProp
-    RangeError: Invalid array length
-      189 |   for (const props of allProps) {
-      190 |     classNames.push(props && props.className);
-    > 191 |     assign(finalProps, ...(props as any));
-          |           ^
-      192 |   }
-      193 | 
-      194 |   finalProps.className = mergeStyles(defaultStyles, classNames);
-      at Object.__spreadArrays (../../common/temp/node_modules/.registry.npmjs.org/tslib/1.10.0/node_modules/tslib/tslib.js:182:22)
-      at _constructFinalProps (src/slots.tsx:191:11)
-      at result (src/slots.tsx:88:24)
-      at Object.<anonymous> (src/slots.test.tsx:235:92)
-  ● createFactory › merges userProps over componentProps
-    RangeError: Invalid array length
-      189 |   for (const props of allProps) {
-      190 |     classNames.push(props && props.className);
-    > 191 |     assign(finalProps, ...(props as any));
-          |           ^
-      192 |   }
-      193 | 
-      194 |   finalProps.className = mergeStyles(defaultStyles, classNames);
-      at Object.__spreadArrays (../../common/temp/node_modules/.registry.npmjs.org/tslib/1.10.0/node_modules/tslib/tslib.js:182:22)
-      at _constructFinalProps (src/slots.tsx:191:11)
-      at result (src/slots.tsx:88:24)
-      at Object.<anonymous> (src/slots.test.tsx:245:84)
-  ● createFactory › renders div and userProp integer as children
-    RangeError: Invalid array length
-      189 |   for (const props of allProps) {
-      190 |     classNames.push(props && props.className);
-    > 191 |     assign(finalProps, ...(props as any));
-          |           ^
-      192 |   }
-      193 | 
-      194 |   finalProps.className = mergeStyles(defaultStyles, classNames);
-      at Object.__spreadArrays (../../common/temp/node_modules/.registry.npmjs.org/tslib/1.10.0/node_modules/tslib/tslib.js:182:22)
-      at _constructFinalProps (src/slots.tsx:191:11)
-      at result (src/slots.tsx:88:24)
-      at Object.<anonymous> (src/slots.test.tsx:255:86)
-  ● createFactory › renders div and userProp string as children
-    RangeError: Invalid array length
-      189 |   for (const props of allProps) {
-      190 |     classNames.push(props && props.className);
-    > 191 |     assign(finalProps, ...(props as any));
-          |           ^
-      192 |   }
-      193 | 
-      194 |   finalProps.className = mergeStyles(defaultStyles, classNames);
-      at Object.__spreadArrays (../../common/temp/node_modules/.registry.npmjs.org/tslib/1.10.0/node_modules/tslib/tslib.js:182:22)
-      at _constructFinalProps (src/slots.tsx:191:11)
-      at result (src/slots.tsx:88:24)
-      at Object.<anonymous> (src/slots.test.tsx:266:86)
-  ● createFactory › renders userProp span function without component props
-    RangeError: Invalid array length
-      189 |   for (const props of allProps) {
-      190 |     classNames.push(props && props.className);
-    > 191 |     assign(finalProps, ...(props as any));
-          |           ^
-      192 |   }
-      193 | 
-      194 |   finalProps.className = mergeStyles(defaultStyles, classNames);
-      at Object.__spreadArrays (../../common/temp/node_modules/.registry.npmjs.org/tslib/1.10.0/node_modules/tslib/tslib.js:182:22)
-      at _constructFinalProps (src/slots.tsx:191:11)
-      at result (src/slots.tsx:88:24)
-      at Object.<anonymous> (src/slots.test.tsx:288:61)
-  ● createFactory › renders userProp span function with component props
-    RangeError: Invalid array length
-      189 |   for (const props of allProps) {
-      190 |     classNames.push(props && props.className);
-    > 191 |     assign(finalProps, ...(props as any));
-          |           ^
-      192 |   }
-      193 | 
-      194 |   finalProps.className = mergeStyles(defaultStyles, classNames);
-      at Object.__spreadArrays (../../common/temp/node_modules/.registry.npmjs.org/tslib/1.10.0/node_modules/tslib/tslib.js:182:22)
-      at _constructFinalProps (src/slots.tsx:191:11)
-      at result (src/slots.tsx:88:24)
-      at Object.<anonymous> (src/slots.test.tsx:301:61)
-  ● createFactory › renders userProp span component with component props
-    RangeError: Invalid array length
-      189 |   for (const props of allProps) {
-      190 |     classNames.push(props && props.className);
-    > 191 |     assign(finalProps, ...(props as any));
-          |           ^
-      192 |   }
-      193 | 
-      194 |   finalProps.className = mergeStyles(defaultStyles, classNames);
-      at Object.__spreadArrays (../../common/temp/node_modules/.registry.npmjs.org/tslib/1.10.0/node_modules/tslib/tslib.js:182:22)
-      at _constructFinalProps (src/slots.tsx:191:11)
-      at result (src/slots.tsx:88:24)
-      at Object.<anonymous> (src/slots.test.tsx:314:61)
-  ● createFactory › passes props and type arguments to userProp function
-    RangeError: Invalid array length
-      189 |   for (const props of allProps) {
-      190 |     classNames.push(props && props.className);
-    > 191 |     assign(finalProps, ...(props as any));
-          |           ^
-      192 |   }
-      193 | 
-      194 |   finalProps.className = mergeStyles(defaultStyles, classNames);
-      at Object.__spreadArrays (../../common/temp/node_modules/.registry.npmjs.org/tslib/1.10.0/node_modules/tslib/tslib.js:182:22)
-      at _constructFinalProps (src/slots.tsx:191:11)
-      at result (src/slots.tsx:88:24)
-      at Object.<anonymous> (src/slots.test.tsx:334:43)
-  ● getSlots › creates slots and passes merged props to them
-    RangeError: Invalid array length
-      189 |   for (const props of allProps) {
-      190 |     classNames.push(props && props.className);
-    > 191 |     assign(finalProps, ...(props as any));
-          |           ^
-      192 |   }
-      193 | 
-      194 |   finalProps.className = mergeStyles(defaultStyles, classNames);
-      at Object.__spreadArrays (../../common/temp/node_modules/.registry.npmjs.org/tslib/1.10.0/node_modules/tslib/tslib.js:182:22)
-      at _constructFinalProps (src/slots.tsx:191:11)
-      at result (src/slots.tsx:88:24)
-      at _renderSlot (src/slots.tsx:221:100)
-      at Object.slot [as testSlot1] (src/slots.tsx:142:16)
-      at Object.<anonymous> (src/slots.test.tsx:399:24)
-[XX:XX:XX XM] x Error detected while running 'jest'
-[XX:XX:XX XM] x ------------------------------------
-[XX:XX:XX XM] x Error: Command failed: /usr/local/bin/node /office-ui-fabric-react/common/temp/node_modules/jest/bin/jest.js --config /office-ui-fabric-react/packages/foundation/jest.config.js --passWithNoTests --colors
-    at ChildProcess.<anonymous> (/office-ui-fabric-react/common/temp/node_modules/.registry.npmjs.org/just-scripts-utils/0.8.2/node_modules/just-scripts-utils/lib/exec.js:70:31)
-    at ChildProcess.emit (events.js:203:13)
-    at ChildProcess.EventEmitter.emit (domain.js:494:23)
-    at Process.ChildProcess._handle.onexit (internal/child_process.js:272:12)
-[XX:XX:XX XM] x ------------------------------------
-[XX:XX:XX XM] x finished 'validate' in ?s with errors
-[XX:XX:XX XM] x finished 'build' in ?s with errors
-[XX:XX:XX XM] x Error previously detected. See above for error messages.
-[@uifabric/icons] started
-XX of XX: [@uifabric/icons] completed successfully in ? seconds
-[@uifabric/webpack-utils] started
-XX of XX: [@uifabric/webpack-utils] completed successfully in ? seconds
-SUCCESS (9)
-================================
-@uifabric/build (? seconds)
-@uifabric/file-type-icons (? seconds)
-@uifabric/icons (? seconds)
-@uifabric/migration (? seconds)
-@uifabric/prettier-rules (? seconds)
-@uifabric/set-version (? seconds)
-@uifabric/test-utilities (? seconds)
-@uifabric/tslint-rules (? seconds)
-@uifabric/webpack-utils (? seconds)
-================================
-SUCCESS WITH WARNINGS (5)
-================================
-@uifabric/codepen-loader (? seconds)
-ts-jest[versions] (WARN) Version X.X.X-insiders.xxxxxxxx of typescript installed has not been tested with ts-jest. If you're experiencing issues, consider using a supported version (>=2.7.0 <4.0.0). Please do not report issues in ts-jest if you are using unsupported versions.
- PASS  src/__tests__/codepenTransform.test.ts
-  codepen transform
-    ✓ handles examples with function components (256ms)
-    ✓ handles examples with class components (38ms)
-    ✓ handles examples importing exampleData (125ms)
-    ✓ handles examples importing TestImages (33ms)
-    ✓ handles examples importing PeopleExampleData (270ms)
-Test Suites: 1 passed, 1 total
-Tests:       5 passed, 5 total
-Snapshots:   4 passed, 4 total
-Time:        ?s
-Ran all test suites.
-@uifabric/jest-serializer-merge-styles (? seconds)
-ts-jest[versions] (WARN) Version X.X.X-insiders.xxxxxxxx of typescript installed has not been tested with ts-jest. If you're experiencing issues, consider using a supported version (>=2.7.0 <4.0.0). Please do not report issues in ts-jest if you are using unsupported versions.
-@uifabric/merge-styles (? seconds)
-ts-jest[versions] (WARN) Version X.X.X-insiders.xxxxxxxx of typescript installed has not been tested with ts-jest. If you're experiencing issues, consider using a supported version (>=2.7.0 <4.0.0). Please do not report issues in ts-jest if you are using unsupported versions.
-@uifabric/styling (? seconds)
-ts-jest[versions] (WARN) Version X.X.X-insiders.xxxxxxxx of typescript installed has not been tested with ts-jest. If you're experiencing issues, consider using a supported version (>=2.7.0 <4.0.0). Please do not report issues in ts-jest if you are using unsupported versions.
-@uifabric/utilities (? seconds)
-ts-jest[versions] (WARN) Version X.X.X-insiders.xxxxxxxx of typescript installed has not been tested with ts-jest. If you're experiencing issues, consider using a supported version (>=2.7.0 <4.0.0). Please do not report issues in ts-jest if you are using unsupported versions.
-================================
-BLOCKED (27)
-================================
-@uifabric/api-docs
-@uifabric/azure-themes
-@uifabric/charting
-@uifabric/date-time
-@uifabric/example-app-base
-@uifabric/experiments
-@uifabric/fabric-website
-@uifabric/fabric-website-resources
-@uifabric/fluent-theme
-@uifabric/foundation-scenarios
-@uifabric/lists
-@uifabric/mdl2-theme
-@uifabric/pr-deploy-site
-@uifabric/react-cards
-@uifabric/theme-samples
-@uifabric/tsx-editor
-@uifabric/variants
-a11y-tests
-dom-tests
-office-ui-fabric-react
-perf-test
-server-rendered-app
-ssr-tests
-test-bundles
-theming-designer
-todo-app
-vr-tests
-================================
-FAILURE (1)
-================================
-@uifabric/foundation (? seconds)
-ts-jest[versions] (WARN) Version X.X.X-insiders.xxxxxxxx of typescript installed has not been tested with ts-jest. If you're experiencing issues, consider using a supported version (>=2.7.0 <4.0.0). Please do not report issues in ts-jest if you are using unsupported versions.
-  ● createFactory › passes componentProps without userProps
-    RangeError: Invalid array length
-      189 |   for (const props of allProps) {
-      190 |     classNames.push(props && props.className);
-    > 191 |     assign(finalProps, ...(props as any));
-          |           ^
-      192 |   }
-      193 | 
-[...179 lines omitted...]
-      193 | 
-      194 |   finalProps.className = mergeStyles(defaultStyles, classNames);
-      at Object.__spreadArrays (../../common/temp/node_modules/.registry.npmjs.org/tslib/1.10.0/node_modules/tslib/tslib.js:182:22)
-      at _constructFinalProps (src/slots.tsx:191:11)
-      at result (src/slots.tsx:88:24)
-      at _renderSlot (src/slots.tsx:221:100)
-      at Object.slot [as testSlot1] (src/slots.tsx:142:16)
-      at Object.<anonymous> (src/slots.test.tsx:399:24)
-[XX:XX:XX XM] x Error detected while running 'jest'
-[XX:XX:XX XM] x ------------------------------------
-[XX:XX:XX XM] x Error: Command failed: /usr/local/bin/node /office-ui-fabric-react/common/temp/node_modules/jest/bin/jest.js --config /office-ui-fabric-react/packages/foundation/jest.config.js --passWithNoTests --colors
-    at ChildProcess.<anonymous> (/office-ui-fabric-react/common/temp/node_modules/.registry.npmjs.org/just-scripts-utils/0.8.2/node_modules/just-scripts-utils/lib/exec.js:70:31)
-    at ChildProcess.emit (events.js:203:13)
-    at ChildProcess.EventEmitter.emit (domain.js:494:23)
-    at Process.ChildProcess._handle.onexit (internal/child_process.js:272:12)
-[XX:XX:XX XM] x ------------------------------------
-[XX:XX:XX XM] x finished 'validate' in ?s with errors
-[XX:XX:XX XM] x finished 'build' in ?s with errors
-[XX:XX:XX XM] x Error previously detected. See above for error messages.
-================================
-Error: Project(s) failed to build
-rush rebuild - Errors! ( ? seconds)
+@uifabric/codepen-loader: yarn run vX.X.X
+@uifabric/codepen-loader: $ just-scripts build --production --lint
+@uifabric/codepen-loader: [XX:XX:XX XM] ■ Removing [lib, temp, dist, coverage, lib-commonjs]
+@uifabric/codepen-loader: [XX:XX:XX XM] ■ Copying [../office-ui-fabric-react/src/utilities/exampleData.ts, ../office-ui-fabric-react/src/components/ExtendedPicker/examples/PeopleExampleData.ts, ../office-ui-fabric-react/src/common/TestImages.ts] to 'lib'
+@uifabric/codepen-loader: [XX:XX:XX XM] ■ Running /office-ui-fabric-react/node_modules/typescript/lib/tsc.js with /office-ui-fabric-react/packages/codepen-loader/tsconfig.json
+@uifabric/codepen-loader: [XX:XX:XX XM] ■ Executing: /usr/local/bin/node "/office-ui-fabric-react/node_modules/typescript/lib/tsc.js" --module commonjs --outDir "./lib" --project "/office-ui-fabric-react/packages/codepen-loader/tsconfig.json"
+@uifabric/codepen-loader: [XX:XX:XX XM] ■ Running Jest
+@uifabric/codepen-loader: [XX:XX:XX XM] ■ /usr/local/bin/node "/office-ui-fabric-react/node_modules/jest/bin/jest.js" --config "/office-ui-fabric-react/packages/codepen-loader/jest.config.js" --passWithNoTests --colors
+@uifabric/codepen-loader:  PASS  src/__tests__/codepenTransform.test.ts
+@uifabric/codepen-loader: Done in ?s.
+@uifabric/build: yarn run vX.X.X
+@uifabric/build: $ node ./just-scripts.js no-op --production --lint
+@uifabric/build: Done in ?s.
+@uifabric/migration: yarn run vX.X.X
+@uifabric/migration: $ just-scripts build --production --lint
+@uifabric/migration: [XX:XX:XX XM] ■ Removing [lib, temp, dist, lib-amd, lib-commonjs, lib-es2015, coverage, src/**/*.scss.ts]
+@uifabric/migration: [XX:XX:XX XM] ■ Running /office-ui-fabric-react/node_modules/typescript/lib/tsc.js with /office-ui-fabric-react/packages/migration/tsconfig.json
+@uifabric/migration: [XX:XX:XX XM] ■ Executing: /usr/local/bin/node "/office-ui-fabric-react/node_modules/typescript/lib/tsc.js" --pretty --target es5 --inlineSources --sourceRoot "../src" --outDir lib --module commonjs --project "/office-ui-fabric-react/packages/migration/tsconfig.json"
+@uifabric/migration: Done in ?s.
+@uifabric/set-version: yarn run vX.X.X
+@uifabric/set-version: $ just-scripts build --production --lint
+@uifabric/set-version: [XX:XX:XX XM] ■ Removing [lib, temp, dist, lib-amd, lib-commonjs, lib-es2015, coverage, src/**/*.scss.ts]
+@uifabric/set-version: [XX:XX:XX XM] ■ Running tslint
+@uifabric/set-version: [XX:XX:XX XM] ■ /usr/local/bin/node "/office-ui-fabric-react/node_modules/tslint/lib/tslintCli.js" --project "/office-ui-fabric-react/packages/set-version/tsconfig.json" -t stylish -r /office-ui-fabric-react/node_modules/tslint-microsoft-contrib
+@uifabric/set-version: [XX:XX:XX XM] ■ Running /office-ui-fabric-react/node_modules/typescript/lib/tsc.js with /office-ui-fabric-react/packages/set-version/tsconfig.json
+@uifabric/set-version: [XX:XX:XX XM] ■ Executing: /usr/local/bin/node "/office-ui-fabric-react/node_modules/typescript/lib/tsc.js" --pretty --target es5 --inlineSources --sourceRoot "../src" --outDir lib-commonjs --module commonjs --project "/office-ui-fabric-react/packages/set-version/tsconfig.json"
+@uifabric/set-version: [XX:XX:XX XM] ■ Running /office-ui-fabric-react/node_modules/typescript/lib/tsc.js with /office-ui-fabric-react/packages/set-version/tsconfig.json
+@uifabric/set-version: [XX:XX:XX XM] ■ Executing: /usr/local/bin/node "/office-ui-fabric-react/node_modules/typescript/lib/tsc.js" --pretty --target es5 --inlineSources --sourceRoot "../src" --outDir lib --module es2015 --project "/office-ui-fabric-react/packages/set-version/tsconfig.json"
+@uifabric/set-version: [XX:XX:XX XM] ■ Running /office-ui-fabric-react/node_modules/typescript/lib/tsc.js with /office-ui-fabric-react/packages/set-version/tsconfig.json
+@uifabric/set-version: [XX:XX:XX XM] ■ Executing: /usr/local/bin/node "/office-ui-fabric-react/node_modules/typescript/lib/tsc.js" --pretty --target es5 --inlineSources --sourceRoot "../src" --outDir lib-amd --module amd --project "/office-ui-fabric-react/packages/set-version/tsconfig.json"
+@uifabric/set-version: [XX:XX:XX XM] ■ Running Webpack
+@uifabric/set-version: [XX:XX:XX XM] ■ Webpack Config Path: null
+@uifabric/set-version: [XX:XX:XX XM] ■ webpack.config.js not found, skipping webpack
+@uifabric/set-version: Done in ?s.
+@uifabric/webpack-utils: yarn run vX.X.X
+@uifabric/webpack-utils: $ just-scripts build --production --lint
+@uifabric/webpack-utils: [XX:XX:XX XM] ■ Removing [lib, temp, dist, lib-amd, lib-commonjs, lib-es2015, coverage, src/**/*.scss.ts]
+@uifabric/webpack-utils: [XX:XX:XX XM] ■ Running tslint
+@uifabric/webpack-utils: [XX:XX:XX XM] ■ /usr/local/bin/node "/office-ui-fabric-react/node_modules/tslint/lib/tslintCli.js" --project "/office-ui-fabric-react/packages/webpack-utils/tsconfig.json" -t stylish -r /office-ui-fabric-react/node_modules/tslint-microsoft-contrib
+@uifabric/webpack-utils: [XX:XX:XX XM] ■ Running /office-ui-fabric-react/node_modules/typescript/lib/tsc.js with /office-ui-fabric-react/packages/webpack-utils/tsconfig.json
+@uifabric/webpack-utils: [XX:XX:XX XM] ■ Executing: /usr/local/bin/node "/office-ui-fabric-react/node_modules/typescript/lib/tsc.js" --pretty --target es5 --inlineSources --sourceRoot "../src" --outDir lib --module commonjs --project "/office-ui-fabric-react/packages/webpack-utils/tsconfig.json"
+@uifabric/webpack-utils: Done in ?s.
+@uifabric/merge-styles: yarn run vX.X.X
+@uifabric/merge-styles: $ just-scripts build --production --lint
+@uifabric/merge-styles: [XX:XX:XX XM] ■ Removing [lib, temp, dist, lib-amd, lib-commonjs, lib-es2015, coverage, src/**/*.scss.ts]
+@uifabric/merge-styles: [XX:XX:XX XM] ■ Running tslint
+@uifabric/merge-styles: [XX:XX:XX XM] ■ /usr/local/bin/node "/office-ui-fabric-react/node_modules/tslint/lib/tslintCli.js" --project "/office-ui-fabric-react/packages/merge-styles/tsconfig.json" -t stylish -r /office-ui-fabric-react/node_modules/tslint-microsoft-contrib
+@uifabric/merge-styles: [XX:XX:XX XM] ■ Running /office-ui-fabric-react/node_modules/typescript/lib/tsc.js with /office-ui-fabric-react/packages/merge-styles/tsconfig.json
+@uifabric/merge-styles: [XX:XX:XX XM] ■ Executing: /usr/local/bin/node "/office-ui-fabric-react/node_modules/typescript/lib/tsc.js" --pretty --target es5 --inlineSources --sourceRoot "../src" --outDir lib-commonjs --module commonjs --project "/office-ui-fabric-react/packages/merge-styles/tsconfig.json"
+@uifabric/merge-styles: [XX:XX:XX XM] ■ Running /office-ui-fabric-react/node_modules/typescript/lib/tsc.js with /office-ui-fabric-react/packages/merge-styles/tsconfig.json
+@uifabric/merge-styles: [XX:XX:XX XM] ■ Executing: /usr/local/bin/node "/office-ui-fabric-react/node_modules/typescript/lib/tsc.js" --pretty --target es5 --inlineSources --sourceRoot "../src" --outDir lib --module es2015 --project "/office-ui-fabric-react/packages/merge-styles/tsconfig.json"
+@uifabric/merge-styles: [XX:XX:XX XM] ■ Running /office-ui-fabric-react/node_modules/typescript/lib/tsc.js with /office-ui-fabric-react/packages/merge-styles/tsconfig.json
+@uifabric/merge-styles: [XX:XX:XX XM] ■ Executing: /usr/local/bin/node "/office-ui-fabric-react/node_modules/typescript/lib/tsc.js" --pretty --target es5 --inlineSources --sourceRoot "../src" --outDir lib-amd --module amd --project "/office-ui-fabric-react/packages/merge-styles/tsconfig.json"
+@uifabric/merge-styles: [XX:XX:XX XM] ■ Running Jest
+@uifabric/merge-styles: [XX:XX:XX XM] ■ /usr/local/bin/node "/office-ui-fabric-react/node_modules/jest/bin/jest.js" --config "/office-ui-fabric-react/packages/merge-styles/jest.config.js" --passWithNoTests --colors
+@uifabric/merge-styles: [XX:XX:XX XM] ■ Running Webpack
+@uifabric/merge-styles: [XX:XX:XX XM] ■ Webpack Config Path: /office-ui-fabric-react/packages/merge-styles/webpack.config.js
+@uifabric/merge-styles: Webpack version: 4.29.5
+@uifabric/merge-styles:  PASS  src/styleToClassName.test.ts
+@uifabric/merge-styles:  PASS  src/mergeStyleSets.test.ts
+@uifabric/merge-styles:  PASS  src/concatStyleSets.test.ts
+@uifabric/merge-styles:  PASS  src/mergeStyles.test.ts
+@uifabric/merge-styles:  PASS  src/transforms/rtlifyRules.test.ts
+@uifabric/merge-styles:  PASS  src/transforms/prefixRules.test.ts
+@uifabric/merge-styles:  PASS  src/transforms/provideUnits.test.ts
+@uifabric/merge-styles:  PASS  src/keyframes.test.ts
+@uifabric/merge-styles:  PASS  src/Stylesheet.test.ts
+@uifabric/merge-styles:  PASS  src/extractStyleParts.test.ts
+@uifabric/merge-styles:  PASS  src/server.test.ts
+@uifabric/merge-styles:  PASS  src/fontFace.test.ts
+@uifabric/merge-styles:  PASS  src/transforms/kebabRules.test.ts
+@uifabric/merge-styles: [XX:XX:XX XM] ■ Extracting Public API surface from '/office-ui-fabric-react/packages/merge-styles/lib/index.d.ts'
+@uifabric/merge-styles: Done in ?s.
+@uifabric/jest-serializer-merge-styles: yarn run vX.X.X
+@uifabric/jest-serializer-merge-styles: $ just-scripts build --production --lint
+@uifabric/jest-serializer-merge-styles: [XX:XX:XX XM] ■ Running /office-ui-fabric-react/node_modules/typescript/lib/tsc.js with /office-ui-fabric-react/packages/jest-serializer-merge-styles/tsconfig.json
+@uifabric/jest-serializer-merge-styles: [XX:XX:XX XM] ■ Executing: /usr/local/bin/node "/office-ui-fabric-react/node_modules/typescript/lib/tsc.js" --pretty --target es5 --inlineSources --sourceRoot "../src" --outDir lib-commonjs --module commonjs --project "/office-ui-fabric-react/packages/jest-serializer-merge-styles/tsconfig.json"
+@uifabric/jest-serializer-merge-styles: [XX:XX:XX XM] ■ Running /office-ui-fabric-react/node_modules/typescript/lib/tsc.js with /office-ui-fabric-react/packages/jest-serializer-merge-styles/tsconfig.json
+@uifabric/jest-serializer-merge-styles: [XX:XX:XX XM] ■ Executing: /usr/local/bin/node "/office-ui-fabric-react/node_modules/typescript/lib/tsc.js" --pretty --target es5 --inlineSources --sourceRoot "../src" --outDir lib --module es2015 --project "/office-ui-fabric-react/packages/jest-serializer-merge-styles/tsconfig.json"
+@uifabric/jest-serializer-merge-styles: [XX:XX:XX XM] ■ Running /office-ui-fabric-react/node_modules/typescript/lib/tsc.js with /office-ui-fabric-react/packages/jest-serializer-merge-styles/tsconfig.json
+@uifabric/jest-serializer-merge-styles: [XX:XX:XX XM] ■ Executing: /usr/local/bin/node "/office-ui-fabric-react/node_modules/typescript/lib/tsc.js" --pretty --target es5 --inlineSources --sourceRoot "../src" --outDir lib-amd --module amd --project "/office-ui-fabric-react/packages/jest-serializer-merge-styles/tsconfig.json"
+@uifabric/jest-serializer-merge-styles: [XX:XX:XX XM] ■ Running Jest
+@uifabric/jest-serializer-merge-styles: [XX:XX:XX XM] ■ /usr/local/bin/node "/office-ui-fabric-react/node_modules/jest/bin/jest.js" --config "/office-ui-fabric-react/packages/jest-serializer-merge-styles/jest.config.js" --passWithNoTests --colors
+@uifabric/jest-serializer-merge-styles:  PASS  src/index.test.tsx
+@uifabric/jest-serializer-merge-styles: Done in ?s.
+@uifabric/test-utilities: yarn run vX.X.X
+@uifabric/test-utilities: $ just-scripts build --production --lint
+@uifabric/test-utilities: [XX:XX:XX XM] ■ Removing [lib, temp, dist, lib-amd, lib-commonjs, lib-es2015, coverage, src/**/*.scss.ts]
+@uifabric/test-utilities: [XX:XX:XX XM] ■ Running /office-ui-fabric-react/node_modules/typescript/lib/tsc.js with /office-ui-fabric-react/packages/test-utilities/tsconfig.json
+@uifabric/test-utilities: [XX:XX:XX XM] ■ Executing: /usr/local/bin/node "/office-ui-fabric-react/node_modules/typescript/lib/tsc.js" --pretty --target es5 --inlineSources --sourceRoot "../src" --outDir lib-commonjs --module commonjs --project "/office-ui-fabric-react/packages/test-utilities/tsconfig.json"
+@uifabric/test-utilities: [XX:XX:XX XM] ■ Running /office-ui-fabric-react/node_modules/typescript/lib/tsc.js with /office-ui-fabric-react/packages/test-utilities/tsconfig.json
+@uifabric/test-utilities: [XX:XX:XX XM] ■ Executing: /usr/local/bin/node "/office-ui-fabric-react/node_modules/typescript/lib/tsc.js" --pretty --target es5 --inlineSources --sourceRoot "../src" --outDir lib --module es2015 --project "/office-ui-fabric-react/packages/test-utilities/tsconfig.json"
+@uifabric/test-utilities: [XX:XX:XX XM] ■ Running /office-ui-fabric-react/node_modules/typescript/lib/tsc.js with /office-ui-fabric-react/packages/test-utilities/tsconfig.json
+@uifabric/test-utilities: [XX:XX:XX XM] ■ Executing: /usr/local/bin/node "/office-ui-fabric-react/node_modules/typescript/lib/tsc.js" --pretty --target es5 --inlineSources --sourceRoot "../src" --outDir lib-amd --module amd --project "/office-ui-fabric-react/packages/test-utilities/tsconfig.json"
+@uifabric/test-utilities: Done in ?s.
+@uifabric/utilities: yarn run vX.X.X
+@uifabric/utilities: $ just-scripts build --production --lint
+@uifabric/utilities: [XX:XX:XX XM] ■ Removing [lib, temp, dist, lib-amd, lib-commonjs, lib-es2015, coverage, src/**/*.scss.ts]
+@uifabric/utilities: [XX:XX:XX XM] ■ Running tslint
+@uifabric/utilities: [XX:XX:XX XM] ■ /usr/local/bin/node "/office-ui-fabric-react/node_modules/tslint/lib/tslintCli.js" --project "/office-ui-fabric-react/packages/utilities/tsconfig.json" -t stylish -r /office-ui-fabric-react/node_modules/tslint-microsoft-contrib
+@uifabric/utilities: [XX:XX:XX XM] ■ Running /office-ui-fabric-react/node_modules/typescript/lib/tsc.js with /office-ui-fabric-react/packages/utilities/tsconfig.json
+@uifabric/utilities: [XX:XX:XX XM] ■ Executing: /usr/local/bin/node "/office-ui-fabric-react/node_modules/typescript/lib/tsc.js" --pretty --target es5 --inlineSources --sourceRoot "../src" --outDir lib-commonjs --module commonjs --project "/office-ui-fabric-react/packages/utilities/tsconfig.json"
+@uifabric/utilities: [XX:XX:XX XM] ■ Running /office-ui-fabric-react/node_modules/typescript/lib/tsc.js with /office-ui-fabric-react/packages/utilities/tsconfig.json
+@uifabric/utilities: [XX:XX:XX XM] ■ Executing: /usr/local/bin/node "/office-ui-fabric-react/node_modules/typescript/lib/tsc.js" --pretty --target es5 --inlineSources --sourceRoot "../src" --outDir lib --module es2015 --project "/office-ui-fabric-react/packages/utilities/tsconfig.json"
+@uifabric/utilities: [XX:XX:XX XM] ■ Running /office-ui-fabric-react/node_modules/typescript/lib/tsc.js with /office-ui-fabric-react/packages/utilities/tsconfig.json
+@uifabric/utilities: [XX:XX:XX XM] ■ Executing: /usr/local/bin/node "/office-ui-fabric-react/node_modules/typescript/lib/tsc.js" --pretty --target es5 --inlineSources --sourceRoot "../src" --outDir lib-amd --module amd --project "/office-ui-fabric-react/packages/utilities/tsconfig.json"
+@uifabric/utilities: [XX:XX:XX XM] ■ Running Jest
+@uifabric/utilities: [XX:XX:XX XM] ■ /usr/local/bin/node "/office-ui-fabric-react/node_modules/jest/bin/jest.js" --config "/office-ui-fabric-react/packages/utilities/jest.config.js" --passWithNoTests --colors
+@uifabric/utilities: [XX:XX:XX XM] ■ Running Webpack
+@uifabric/utilities: [XX:XX:XX XM] ■ Webpack Config Path: null
+@uifabric/utilities: [XX:XX:XX XM] ■ webpack.config.js not found, skipping webpack
+@uifabric/utilities:  PASS  src/warn/warnControlledUsage.test.ts
+@uifabric/utilities:  PASS  src/focus.test.tsx
+@uifabric/utilities:  PASS  src/styled.test.tsx
+@uifabric/utilities:  PASS  src/EventGroup.test.ts
+@uifabric/utilities:  PASS  src/array.test.ts
+@uifabric/utilities:  PASS  src/customizations/Customizer.test.tsx
+@uifabric/utilities:  PASS  src/math.test.ts
+@uifabric/utilities:  PASS  src/warn/warn.test.ts
+@uifabric/utilities:  PASS  src/dom/dom.test.ts
+@uifabric/utilities:  PASS  src/customizations/customizable.test.tsx
+@uifabric/utilities:  PASS  src/initials.test.ts
+@uifabric/utilities:  PASS  src/selection/Selection.test.ts
+@uifabric/utilities:  PASS  src/initializeFocusRects.test.ts
+@uifabric/utilities:  PASS  src/memoize.test.ts
+@uifabric/utilities:  PASS  src/osDetector.test.ts
+@uifabric/utilities:  PASS  src/mobileDetector.test.ts
+@uifabric/utilities:  PASS  src/aria.test.ts
+@uifabric/utilities:  PASS  src/rtl.test.ts
+@uifabric/utilities:  PASS  src/setFocusVisibility.test.ts
+@uifabric/utilities:  PASS  src/properties.test.ts
+@uifabric/utilities:  PASS  src/asAsync.test.tsx
+@uifabric/utilities:  PASS  src/object.test.ts
+@uifabric/utilities:  PASS  src/classNamesFunction.test.ts
+@uifabric/utilities:  PASS  src/merge.test.ts
+@uifabric/utilities:  PASS  src/customizations/Customizations.test.ts
+@uifabric/utilities:  PASS  src/safeSetTimeout.test.tsx
+@uifabric/utilities:  PASS  src/safeRequestAnimationFrame.test.tsx
+@uifabric/utilities:  PASS  src/overflow.test.ts
+@uifabric/utilities:  PASS  src/appendFunction.test.ts
+@uifabric/utilities:  PASS  src/controlled.test.ts
+@uifabric/utilities:  PASS  src/extendComponent.test.tsx
+@uifabric/utilities:  PASS  src/initializeComponentRef.test.tsx
+@uifabric/utilities:  PASS  src/BaseComponent.test.tsx
+@uifabric/utilities:  PASS  src/keyboard.test.ts
+@uifabric/utilities:  PASS  src/css.test.ts
+@uifabric/utilities: [XX:XX:XX XM] ■ Extracting Public API surface from '/office-ui-fabric-react/packages/utilities/lib/index.d.ts'
+@uifabric/utilities: Done in ?s.
+@uifabric/styling: yarn run vX.X.X
+@uifabric/styling: $ just-scripts build --production --lint
+@uifabric/styling: [XX:XX:XX XM] ■ Removing [lib, temp, dist, lib-amd, lib-commonjs, lib-es2015, coverage, src/**/*.scss.ts]
+@uifabric/styling: [XX:XX:XX XM] ■ Running tslint
+@uifabric/styling: [XX:XX:XX XM] ■ /usr/local/bin/node "/office-ui-fabric-react/node_modules/tslint/lib/tslintCli.js" --project "/office-ui-fabric-react/packages/styling/tsconfig.json" -t stylish -r /office-ui-fabric-react/node_modules/tslint-microsoft-contrib
+@uifabric/styling: [XX:XX:XX XM] ■ Running /office-ui-fabric-react/node_modules/typescript/lib/tsc.js with /office-ui-fabric-react/packages/styling/tsconfig.json
+@uifabric/styling: [XX:XX:XX XM] ■ Executing: /usr/local/bin/node "/office-ui-fabric-react/node_modules/typescript/lib/tsc.js" --pretty --target es5 --inlineSources --sourceRoot "../src" --outDir lib-commonjs --module commonjs --project "/office-ui-fabric-react/packages/styling/tsconfig.json"
+@uifabric/styling: [XX:XX:XX XM] ■ Running /office-ui-fabric-react/node_modules/typescript/lib/tsc.js with /office-ui-fabric-react/packages/styling/tsconfig.json
+@uifabric/styling: [XX:XX:XX XM] ■ Executing: /usr/local/bin/node "/office-ui-fabric-react/node_modules/typescript/lib/tsc.js" --pretty --target es5 --inlineSources --sourceRoot "../src" --outDir lib --module es2015 --project "/office-ui-fabric-react/packages/styling/tsconfig.json"
+@uifabric/styling: [XX:XX:XX XM] ■ Running /office-ui-fabric-react/node_modules/typescript/lib/tsc.js with /office-ui-fabric-react/packages/styling/tsconfig.json
+@uifabric/styling: [XX:XX:XX XM] ■ Executing: /usr/local/bin/node "/office-ui-fabric-react/node_modules/typescript/lib/tsc.js" --pretty --target es5 --inlineSources --sourceRoot "../src" --outDir lib-amd --module amd --project "/office-ui-fabric-react/packages/styling/tsconfig.json"
+@uifabric/styling: [XX:XX:XX XM] ■ Running Jest
+@uifabric/styling: [XX:XX:XX XM] ■ /usr/local/bin/node "/office-ui-fabric-react/node_modules/jest/bin/jest.js" --config "/office-ui-fabric-react/packages/styling/jest.config.js" --passWithNoTests --colors
+@uifabric/styling: [XX:XX:XX XM] ■ Running Webpack
+@uifabric/styling: [XX:XX:XX XM] ■ Webpack Config Path: null
+@uifabric/styling: [XX:XX:XX XM] ■ webpack.config.js not found, skipping webpack
+@uifabric/styling:  PASS  src/styles/theme.test.ts
+@uifabric/styling:  PASS  src/styles/scheme.test.ts
+@uifabric/styling:  PASS  src/styles/getGlobalClassNames.test.ts
+@uifabric/styling:  PASS  src/utilities/icons.test.ts
+@uifabric/styling:  PASS  src/styles/fonts.test.ts
+@uifabric/styling: [XX:XX:XX XM] ■ Extracting Public API surface from '/office-ui-fabric-react/packages/styling/lib/index.d.ts'
+@uifabric/styling: Done in ?s.
+@uifabric/file-type-icons: yarn run vX.X.X
+@uifabric/file-type-icons: $ just-scripts build --production --lint
+@uifabric/file-type-icons: [XX:XX:XX XM] ■ Removing [lib, temp, dist, lib-amd, lib-commonjs, lib-es2015, coverage, src/**/*.scss.ts]
+@uifabric/file-type-icons: [XX:XX:XX XM] ■ Running tslint
+@uifabric/file-type-icons: [XX:XX:XX XM] ■ /usr/local/bin/node "/office-ui-fabric-react/node_modules/tslint/lib/tslintCli.js" --project "/office-ui-fabric-react/packages/file-type-icons/tsconfig.json" -t stylish -r /office-ui-fabric-react/node_modules/tslint-microsoft-contrib
+@uifabric/file-type-icons: [XX:XX:XX XM] ■ Running /office-ui-fabric-react/node_modules/typescript/lib/tsc.js with /office-ui-fabric-react/packages/file-type-icons/tsconfig.json
+@uifabric/file-type-icons: [XX:XX:XX XM] ■ Executing: /usr/local/bin/node "/office-ui-fabric-react/node_modules/typescript/lib/tsc.js" --pretty --target es5 --inlineSources --sourceRoot "../src" --outDir lib-commonjs --module commonjs --project "/office-ui-fabric-react/packages/file-type-icons/tsconfig.json"
+@uifabric/file-type-icons: [XX:XX:XX XM] ■ Running /office-ui-fabric-react/node_modules/typescript/lib/tsc.js with /office-ui-fabric-react/packages/file-type-icons/tsconfig.json
+@uifabric/file-type-icons: [XX:XX:XX XM] ■ Executing: /usr/local/bin/node "/office-ui-fabric-react/node_modules/typescript/lib/tsc.js" --pretty --target es5 --inlineSources --sourceRoot "../src" --outDir lib --module es2015 --project "/office-ui-fabric-react/packages/file-type-icons/tsconfig.json"
+@uifabric/file-type-icons: [XX:XX:XX XM] ■ Running /office-ui-fabric-react/node_modules/typescript/lib/tsc.js with /office-ui-fabric-react/packages/file-type-icons/tsconfig.json
+@uifabric/file-type-icons: [XX:XX:XX XM] ■ Executing: /usr/local/bin/node "/office-ui-fabric-react/node_modules/typescript/lib/tsc.js" --pretty --target es5 --inlineSources --sourceRoot "../src" --outDir lib-amd --module amd --project "/office-ui-fabric-react/packages/file-type-icons/tsconfig.json"
+@uifabric/file-type-icons: [XX:XX:XX XM] ■ Running Webpack
+@uifabric/file-type-icons: [XX:XX:XX XM] ■ Webpack Config Path: null
+@uifabric/file-type-icons: [XX:XX:XX XM] ■ webpack.config.js not found, skipping webpack
+@uifabric/file-type-icons: Done in ?s.
+@uifabric/foundation: yarn run vX.X.X
+@uifabric/foundation: $ just-scripts build --production --lint
+@uifabric/foundation: [XX:XX:XX XM] ■ Removing [lib, temp, dist, lib-amd, lib-commonjs, lib-es2015, coverage, src/**/*.scss.ts]
+@uifabric/foundation: [XX:XX:XX XM] ■ Running tslint
+@uifabric/foundation: [XX:XX:XX XM] ■ /usr/local/bin/node "/office-ui-fabric-react/node_modules/tslint/lib/tslintCli.js" --project "/office-ui-fabric-react/packages/foundation/tsconfig.json" -t stylish -r /office-ui-fabric-react/node_modules/tslint-microsoft-contrib
+@uifabric/foundation: [XX:XX:XX XM] ■ Running /office-ui-fabric-react/node_modules/typescript/lib/tsc.js with /office-ui-fabric-react/packages/foundation/tsconfig.json
+@uifabric/foundation: [XX:XX:XX XM] ■ Executing: /usr/local/bin/node "/office-ui-fabric-react/node_modules/typescript/lib/tsc.js" --pretty --target es5 --inlineSources --sourceRoot "../src" --outDir lib-commonjs --module commonjs --project "/office-ui-fabric-react/packages/foundation/tsconfig.json"
+@uifabric/foundation: [XX:XX:XX XM] ■ Running /office-ui-fabric-react/node_modules/typescript/lib/tsc.js with /office-ui-fabric-react/packages/foundation/tsconfig.json
+@uifabric/foundation: [XX:XX:XX XM] ■ Executing: /usr/local/bin/node "/office-ui-fabric-react/node_modules/typescript/lib/tsc.js" --pretty --target es5 --inlineSources --sourceRoot "../src" --outDir lib --module es2015 --project "/office-ui-fabric-react/packages/foundation/tsconfig.json"
+@uifabric/foundation: [XX:XX:XX XM] ■ Running /office-ui-fabric-react/node_modules/typescript/lib/tsc.js with /office-ui-fabric-react/packages/foundation/tsconfig.json
+@uifabric/foundation: [XX:XX:XX XM] ■ Executing: /usr/local/bin/node "/office-ui-fabric-react/node_modules/typescript/lib/tsc.js" --pretty --target es5 --inlineSources --sourceRoot "../src" --outDir lib-amd --module amd --project "/office-ui-fabric-react/packages/foundation/tsconfig.json"
+@uifabric/foundation: [XX:XX:XX XM] ■ Running Jest
+@uifabric/foundation: [XX:XX:XX XM] ■ /usr/local/bin/node "/office-ui-fabric-react/node_modules/jest/bin/jest.js" --config "/office-ui-fabric-react/packages/foundation/jest.config.js" --passWithNoTests --colors
+@uifabric/foundation: [XX:XX:XX XM] ■ Running Webpack
+@uifabric/foundation: [XX:XX:XX XM] ■ Webpack Config Path: /office-ui-fabric-react/packages/foundation/webpack.config.js
+@uifabric/foundation: Webpack version: 4.29.5
+@uifabric/foundation:  FAIL  src/slots.test.tsx
+@uifabric/foundation:  PASS  src/hooks/controlled.test.tsx
+@uifabric/foundation: info Visit https://yarnpkg.com/en/docs/cli/run for documentation about this command.
 
 
 
 Standard error:
-Your version of Node.js (X.X.X) has not been tested with this release of Rush. The Rush team will not accept issue reports for it. Please consider upgrading Rush or downgrading Node.js.
-XX of XX: [@uifabric/codepen-loader] completed with warnings in ? seconds
-XX of XX: [@uifabric/merge-styles] completed with warnings in ? seconds
-XX of XX: [@uifabric/jest-serializer-merge-styles] completed with warnings in ? seconds
-XX of XX: [@uifabric/utilities] completed with warnings in ? seconds
-XX of XX: [@uifabric/styling] completed with warnings in ? seconds
-XX of XX: [@uifabric/foundation] failed to build!
-XX of XX: [@uifabric/experiments] blocked by [@uifabric/foundation]!
-XX of XX: [@uifabric/fabric-website] blocked by [@uifabric/foundation]!
-XX of XX: [@uifabric/pr-deploy-site] blocked by [@uifabric/foundation]!
-XX of XX: [@uifabric/react-cards] blocked by [@uifabric/foundation]!
-XX of XX: [theming-designer] blocked by [@uifabric/foundation]!
-XX of XX: [vr-tests] blocked by [@uifabric/foundation]!
-XX of XX: [dom-tests] blocked by [@uifabric/foundation]!
-XX of XX: [perf-test] blocked by [@uifabric/foundation]!
-XX of XX: [test-bundles] blocked by [@uifabric/foundation]!
-XX of XX: [office-ui-fabric-react] blocked by [@uifabric/foundation]!
-XX of XX: [@uifabric/api-docs] blocked by [@uifabric/foundation]!
-XX of XX: [@uifabric/fabric-website-resources] blocked by [@uifabric/foundation]!
-XX of XX: [a11y-tests] blocked by [@uifabric/foundation]!
-XX of XX: [ssr-tests] blocked by [@uifabric/foundation]!
-XX of XX: [@uifabric/azure-themes] blocked by [@uifabric/foundation]!
-XX of XX: [@uifabric/charting] blocked by [@uifabric/foundation]!
-XX of XX: [@uifabric/date-time] blocked by [@uifabric/foundation]!
-XX of XX: [@uifabric/example-app-base] blocked by [@uifabric/foundation]!
-XX of XX: [@uifabric/foundation-scenarios] blocked by [@uifabric/foundation]!
-XX of XX: [@uifabric/lists] blocked by [@uifabric/foundation]!
-XX of XX: [@uifabric/fluent-theme] blocked by [@uifabric/foundation]!
-XX of XX: [@uifabric/tsx-editor] blocked by [@uifabric/foundation]!
-XX of XX: [@uifabric/mdl2-theme] blocked by [@uifabric/foundation]!
-XX of XX: [@uifabric/theme-samples] blocked by [@uifabric/foundation]!
-XX of XX: [@uifabric/variants] blocked by [@uifabric/foundation]!
-XX of XX: [server-rendered-app] blocked by [@uifabric/foundation]!
-XX of XX: [todo-app] blocked by [@uifabric/foundation]!
-[@uifabric/foundation] Returned error code: 1
+info cli using local version of lerna
+lerna notice cli vX.X.X
+lerna info Executing command in 40 packages: "yarn run build --production --lint"
+@uifabric/codepen-loader: ts-jest[versions] (WARN) Version X.X.X-insiders.xxxxxxxx of typescript installed has not been tested with ts-jest. If you're experiencing issues, consider using a supported version (>=2.7.0 <4.0.0). Please do not report issues in ts-jest if you are using unsupported versions.
+@uifabric/set-version: [XX:XX:XX XM] ▲ One of these [node-sass, postcss, autoprefixer] is not installed, so this task has no effect
+@uifabric/merge-styles: [XX:XX:XX XM] ▲ One of these [node-sass, postcss, autoprefixer] is not installed, so this task has no effect
+@uifabric/merge-styles: ts-jest[versions] (WARN) Version X.X.X-insiders.xxxxxxxx of typescript installed has not been tested with ts-jest. If you're experiencing issues, consider using a supported version (>=2.7.0 <4.0.0). Please do not report issues in ts-jest if you are using unsupported versions.
+@uifabric/jest-serializer-merge-styles: ts-jest[versions] (WARN) Version X.X.X-insiders.xxxxxxxx of typescript installed has not been tested with ts-jest. If you're experiencing issues, consider using a supported version (>=2.7.0 <4.0.0). Please do not report issues in ts-jest if you are using unsupported versions.
+@uifabric/utilities: [XX:XX:XX XM] ▲ One of these [node-sass, postcss, autoprefixer] is not installed, so this task has no effect
+@uifabric/utilities: ts-jest[versions] (WARN) Version X.X.X-insiders.xxxxxxxx of typescript installed has not been tested with ts-jest. If you're experiencing issues, consider using a supported version (>=2.7.0 <4.0.0). Please do not report issues in ts-jest if you are using unsupported versions.
+@uifabric/styling: [XX:XX:XX XM] ▲ One of these [node-sass, postcss, autoprefixer] is not installed, so this task has no effect
+@uifabric/styling: ts-jest[versions] (WARN) Version X.X.X-insiders.xxxxxxxx of typescript installed has not been tested with ts-jest. If you're experiencing issues, consider using a supported version (>=2.7.0 <4.0.0). Please do not report issues in ts-jest if you are using unsupported versions.
+@uifabric/file-type-icons: [XX:XX:XX XM] ▲ One of these [node-sass, postcss, autoprefixer] is not installed, so this task has no effect
+@uifabric/foundation: [XX:XX:XX XM] ▲ One of these [node-sass, postcss, autoprefixer] is not installed, so this task has no effect
+@uifabric/foundation: ts-jest[versions] (WARN) Version X.X.X-insiders.xxxxxxxx of typescript installed has not been tested with ts-jest. If you're experiencing issues, consider using a supported version (>=2.7.0 <4.0.0). Please do not report issues in ts-jest if you are using unsupported versions.
+@uifabric/foundation:   ● createFactory › passes componentProps without userProps
+@uifabric/foundation:     RangeError: Invalid array length
+@uifabric/foundation: 
+@uifabric/foundation:       189 |   for (const props of allProps) {
+@uifabric/foundation:       190 |     classNames.push(props && props.className);
+@uifabric/foundation:     > 191 |     assign(finalProps, ...(props as any));
+@uifabric/foundation:           |           ^
+@uifabric/foundation:       192 |   }
+@uifabric/foundation:       193 | 
+@uifabric/foundation:       194 |   finalProps.className = mergeStyles(defaultStyles, classNames);
+@uifabric/foundation: 
+@uifabric/foundation:       at Object.__spreadArrays (../../node_modules/tslib/tslib.js:182:22)
+@uifabric/foundation:       at _constructFinalProps (src/slots.tsx:191:11)
+@uifabric/foundation:       at result (src/slots.tsx:88:24)
+@uifabric/foundation:       at Object.<anonymous> (src/slots.test.tsx:205:73)
+@uifabric/foundation:   ● createFactory › passes userProp string as child
+@uifabric/foundation:     RangeError: Invalid array length
+@uifabric/foundation: 
+@uifabric/foundation:       189 |   for (const props of allProps) {
+@uifabric/foundation:       190 |     classNames.push(props && props.className);
+@uifabric/foundation:     > 191 |     assign(finalProps, ...(props as any));
+@uifabric/foundation:           |           ^
+@uifabric/foundation:       192 |   }
+@uifabric/foundation:       193 | 
+@uifabric/foundation:       194 |   finalProps.className = mergeStyles(defaultStyles, classNames);
+@uifabric/foundation: 
+@uifabric/foundation:       at Object.__spreadArrays (../../node_modules/tslib/tslib.js:182:22)
+@uifabric/foundation:       at _constructFinalProps (src/slots.tsx:191:11)
+@uifabric/foundation:       at result (src/slots.tsx:88:24)
+@uifabric/foundation:       at Object.<anonymous> (src/slots.test.tsx:210:76)
+@uifabric/foundation:   ● createFactory › passes userProp integer as child
+@uifabric/foundation:     RangeError: Invalid array length
+@uifabric/foundation: 
+@uifabric/foundation:       189 |   for (const props of allProps) {
+@uifabric/foundation:       190 |     classNames.push(props && props.className);
+@uifabric/foundation:     > 191 |     assign(finalProps, ...(props as any));
+@uifabric/foundation:           |           ^
+@uifabric/foundation:       192 |   }
+@uifabric/foundation:       193 | 
+@uifabric/foundation:       194 |   finalProps.className = mergeStyles(defaultStyles, classNames);
+@uifabric/foundation: 
+@uifabric/foundation:       at Object.__spreadArrays (../../node_modules/tslib/tslib.js:182:22)
+@uifabric/foundation:       at _constructFinalProps (src/slots.tsx:191:11)
+@uifabric/foundation:       at result (src/slots.tsx:88:24)
+@uifabric/foundation:       at Object.<anonymous> (src/slots.test.tsx:220:76)
+@uifabric/foundation:   ● createFactory › passes userProp string as defaultProp
+@uifabric/foundation:     RangeError: Invalid array length
+@uifabric/foundation: 
+@uifabric/foundation:       189 |   for (const props of allProps) {
+@uifabric/foundation:       190 |     classNames.push(props && props.className);
+@uifabric/foundation:     > 191 |     assign(finalProps, ...(props as any));
+@uifabric/foundation:           |           ^
+@uifabric/foundation:       192 |   }
+@uifabric/foundation:       193 | 
+@uifabric/foundation:       194 |   finalProps.className = mergeStyles(defaultStyles, classNames);
+@uifabric/foundation: 
+@uifabric/foundation:       at Object.__spreadArrays (../../node_modules/tslib/tslib.js:182:22)
+@uifabric/foundation:       at _constructFinalProps (src/slots.tsx:191:11)
+@uifabric/foundation:       at result (src/slots.tsx:88:24)
+@uifabric/foundation:       at Object.<anonymous> (src/slots.test.tsx:225:92)
+@uifabric/foundation:   ● createFactory › passes userProp integer as defaultProp
+@uifabric/foundation:     RangeError: Invalid array length
+@uifabric/foundation: 
+@uifabric/foundation:       189 |   for (const props of allProps) {
+@uifabric/foundation:       190 |     classNames.push(props && props.className);
+@uifabric/foundation:     > 191 |     assign(finalProps, ...(props as any));
+@uifabric/foundation:           |           ^
+@uifabric/foundation:       192 |   }
+@uifabric/foundation:       193 | 
+@uifabric/foundation:       194 |   finalProps.className = mergeStyles(defaultStyles, classNames);
+@uifabric/foundation: 
+@uifabric/foundation:       at Object.__spreadArrays (../../node_modules/tslib/tslib.js:182:22)
+@uifabric/foundation:       at _constructFinalProps (src/slots.tsx:191:11)
+@uifabric/foundation:       at result (src/slots.tsx:88:24)
+@uifabric/foundation:       at Object.<anonymous> (src/slots.test.tsx:235:92)
+@uifabric/foundation:   ● createFactory › merges userProps over componentProps
+@uifabric/foundation:     RangeError: Invalid array length
+@uifabric/foundation: 
+@uifabric/foundation:       189 |   for (const props of allProps) {
+@uifabric/foundation:       190 |     classNames.push(props && props.className);
+@uifabric/foundation:     > 191 |     assign(finalProps, ...(props as any));
+@uifabric/foundation:           |           ^
+@uifabric/foundation:       192 |   }
+@uifabric/foundation:       193 | 
+@uifabric/foundation:       194 |   finalProps.className = mergeStyles(defaultStyles, classNames);
+@uifabric/foundation: 
+@uifabric/foundation:       at Object.__spreadArrays (../../node_modules/tslib/tslib.js:182:22)
+@uifabric/foundation:       at _constructFinalProps (src/slots.tsx:191:11)
+@uifabric/foundation:       at result (src/slots.tsx:88:24)
+@uifabric/foundation:       at Object.<anonymous> (src/slots.test.tsx:245:84)
+@uifabric/foundation:   ● createFactory › renders div and userProp integer as children
+@uifabric/foundation:     RangeError: Invalid array length
+@uifabric/foundation: 
+@uifabric/foundation:       189 |   for (const props of allProps) {
+@uifabric/foundation:       190 |     classNames.push(props && props.className);
+@uifabric/foundation:     > 191 |     assign(finalProps, ...(props as any));
+@uifabric/foundation:           |           ^
+@uifabric/foundation:       192 |   }
+@uifabric/foundation:       193 | 
+@uifabric/foundation:       194 |   finalProps.className = mergeStyles(defaultStyles, classNames);
+@uifabric/foundation: 
+@uifabric/foundation:       at Object.__spreadArrays (../../node_modules/tslib/tslib.js:182:22)
+@uifabric/foundation:       at _constructFinalProps (src/slots.tsx:191:11)
+@uifabric/foundation:       at result (src/slots.tsx:88:24)
+@uifabric/foundation:       at Object.<anonymous> (src/slots.test.tsx:255:86)
+@uifabric/foundation:   ● createFactory › renders div and userProp string as children
+@uifabric/foundation:     RangeError: Invalid array length
+@uifabric/foundation: 
+@uifabric/foundation:       189 |   for (const props of allProps) {
+@uifabric/foundation:       190 |     classNames.push(props && props.className);
+@uifabric/foundation:     > 191 |     assign(finalProps, ...(props as any));
+@uifabric/foundation:           |           ^
+@uifabric/foundation:       192 |   }
+@uifabric/foundation:       193 | 
+@uifabric/foundation:       194 |   finalProps.className = mergeStyles(defaultStyles, classNames);
+@uifabric/foundation: 
+@uifabric/foundation:       at Object.__spreadArrays (../../node_modules/tslib/tslib.js:182:22)
+@uifabric/foundation:       at _constructFinalProps (src/slots.tsx:191:11)
+@uifabric/foundation:       at result (src/slots.tsx:88:24)
+@uifabric/foundation:       at Object.<anonymous> (src/slots.test.tsx:266:86)
+@uifabric/foundation:   ● createFactory › renders userProp span function without component props
+@uifabric/foundation:     RangeError: Invalid array length
+@uifabric/foundation: 
+@uifabric/foundation:       189 |   for (const props of allProps) {
+@uifabric/foundation:       190 |     classNames.push(props && props.className);
+@uifabric/foundation:     > 191 |     assign(finalProps, ...(props as any));
+@uifabric/foundation:           |           ^
+@uifabric/foundation:       192 |   }
+@uifabric/foundation:       193 | 
+@uifabric/foundation:       194 |   finalProps.className = mergeStyles(defaultStyles, classNames);
+@uifabric/foundation: 
+@uifabric/foundation:       at Object.__spreadArrays (../../node_modules/tslib/tslib.js:182:22)
+@uifabric/foundation:       at _constructFinalProps (src/slots.tsx:191:11)
+@uifabric/foundation:       at result (src/slots.tsx:88:24)
+@uifabric/foundation:       at Object.<anonymous> (src/slots.test.tsx:288:61)
+@uifabric/foundation:   ● createFactory › renders userProp span function with component props
+@uifabric/foundation:     RangeError: Invalid array length
+@uifabric/foundation: 
+@uifabric/foundation:       189 |   for (const props of allProps) {
+@uifabric/foundation:       190 |     classNames.push(props && props.className);
+@uifabric/foundation:     > 191 |     assign(finalProps, ...(props as any));
+@uifabric/foundation:           |           ^
+@uifabric/foundation:       192 |   }
+@uifabric/foundation:       193 | 
+@uifabric/foundation:       194 |   finalProps.className = mergeStyles(defaultStyles, classNames);
+@uifabric/foundation: 
+@uifabric/foundation:       at Object.__spreadArrays (../../node_modules/tslib/tslib.js:182:22)
+@uifabric/foundation:       at _constructFinalProps (src/slots.tsx:191:11)
+@uifabric/foundation:       at result (src/slots.tsx:88:24)
+@uifabric/foundation:       at Object.<anonymous> (src/slots.test.tsx:301:61)
+@uifabric/foundation:   ● createFactory › renders userProp span component with component props
+@uifabric/foundation:     RangeError: Invalid array length
+@uifabric/foundation: 
+@uifabric/foundation:       189 |   for (const props of allProps) {
+@uifabric/foundation:       190 |     classNames.push(props && props.className);
+@uifabric/foundation:     > 191 |     assign(finalProps, ...(props as any));
+@uifabric/foundation:           |           ^
+@uifabric/foundation:       192 |   }
+@uifabric/foundation:       193 | 
+@uifabric/foundation:       194 |   finalProps.className = mergeStyles(defaultStyles, classNames);
+@uifabric/foundation: 
+@uifabric/foundation:       at Object.__spreadArrays (../../node_modules/tslib/tslib.js:182:22)
+@uifabric/foundation:       at _constructFinalProps (src/slots.tsx:191:11)
+@uifabric/foundation:       at result (src/slots.tsx:88:24)
+@uifabric/foundation:       at Object.<anonymous> (src/slots.test.tsx:314:61)
+@uifabric/foundation:   ● createFactory › passes props and type arguments to userProp function
+@uifabric/foundation:     RangeError: Invalid array length
+@uifabric/foundation: 
+@uifabric/foundation:       189 |   for (const props of allProps) {
+@uifabric/foundation:       190 |     classNames.push(props && props.className);
+@uifabric/foundation:     > 191 |     assign(finalProps, ...(props as any));
+@uifabric/foundation:           |           ^
+@uifabric/foundation:       192 |   }
+@uifabric/foundation:       193 | 
+@uifabric/foundation:       194 |   finalProps.className = mergeStyles(defaultStyles, classNames);
+@uifabric/foundation: 
+@uifabric/foundation:       at Object.__spreadArrays (../../node_modules/tslib/tslib.js:182:22)
+@uifabric/foundation:       at _constructFinalProps (src/slots.tsx:191:11)
+@uifabric/foundation:       at result (src/slots.tsx:88:24)
+@uifabric/foundation:       at Object.<anonymous> (src/slots.test.tsx:334:43)
+@uifabric/foundation:   ● getSlots › creates slots and passes merged props to them
+@uifabric/foundation:     RangeError: Invalid array length
+@uifabric/foundation: 
+@uifabric/foundation:       189 |   for (const props of allProps) {
+@uifabric/foundation:       190 |     classNames.push(props && props.className);
+@uifabric/foundation:     > 191 |     assign(finalProps, ...(props as any));
+@uifabric/foundation:           |           ^
+@uifabric/foundation:       192 |   }
+@uifabric/foundation:       193 | 
+@uifabric/foundation:       194 |   finalProps.className = mergeStyles(defaultStyles, classNames);
+@uifabric/foundation: 
+@uifabric/foundation:       at Object.__spreadArrays (../../node_modules/tslib/tslib.js:182:22)
+@uifabric/foundation:       at _constructFinalProps (src/slots.tsx:191:11)
+@uifabric/foundation:       at result (src/slots.tsx:88:24)
+@uifabric/foundation:       at _renderSlot (src/slots.tsx:221:100)
+@uifabric/foundation:       at Object.slot [as testSlot1] (src/slots.tsx:142:16)
+@uifabric/foundation:       at Object.<anonymous> (src/slots.test.tsx:399:24)
+@uifabric/foundation: [XX:XX:XX XM] x Error detected while running 'jest'
+@uifabric/foundation: [XX:XX:XX XM] x ------------------------------------
+@uifabric/foundation: [XX:XX:XX XM] x Error: Command failed: /usr/local/bin/node /office-ui-fabric-react/node_modules/jest/bin/jest.js --config /office-ui-fabric-react/packages/foundation/jest.config.js --passWithNoTests --colors
+@uifabric/foundation:     at ChildProcess.<anonymous> (/office-ui-fabric-react/node_modules/just-scripts-utils/lib/exec.js:70:31)
+@uifabric/foundation:     at ChildProcess.emit (events.js:203:13)
+@uifabric/foundation:     at ChildProcess.EventEmitter.emit (domain.js:494:23)
+@uifabric/foundation:     at Process.ChildProcess._handle.onexit (internal/child_process.js:272:12)
+@uifabric/foundation: [XX:XX:XX XM] x ------------------------------------
+@uifabric/foundation: [XX:XX:XX XM] x Error previously detected. See above for error messages.
+@uifabric/foundation: [XX:XX:XX XM] x Other tasks that did not complete: [webpack]
+@uifabric/foundation: error Command failed with exit code 1.
+lerna ERR! yarn run build --production --lint exited 1 in '@uifabric/foundation'
+lerna WARN complete Waiting for 1 child process to exit. CTRL-C to exit immediately.
diff --git a/tests/baselines/reference/docker/vscode.log b/tests/baselines/reference/docker/vscode.log
index 8f23cb6719d..4775203f50e 100644
--- a/tests/baselines/reference/docker/vscode.log
+++ b/tests/baselines/reference/docker/vscode.log
@@ -4,31 +4,24 @@ yarn run vX.X.X
 $ gulp compile --max_old_space_size=4095
 [XX:XX:XX] Node flags detected: --max_old_space_size=4095
 [XX:XX:XX] Using gulpfile /vscode/gulpfile.js
-[XX:XX:XX] Error: /vscode/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts(560,5): Type 'null' is not assignable to type 'string'.
-[XX:XX:XX] Error: /vscode/src/vs/base/browser/ui/menu/menubar.ts(742,7): Type '"underline" | null' is not assignable to type 'string'.
-  Type 'null' is not assignable to type 'string'.
-[XX:XX:XX] Error: /vscode/src/vs/editor/browser/controller/textAreaInput.ts(208,33): Property 'locale' does not exist on type 'CompositionEvent'.
-[XX:XX:XX] Error: /vscode/src/vs/editor/browser/controller/textAreaInput.ts(225,33): Property 'locale' does not exist on type 'CompositionEvent'.
-[XX:XX:XX] Error: /vscode/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts(560,5): Type 'null' is not assignable to type 'string'.
-[XX:XX:XX] Error: /vscode/src/vs/base/browser/ui/menu/menubar.ts(742,7): Type '"underline" | null' is not assignable to type 'string'.
-  Type 'null' is not assignable to type 'string'.
-[XX:XX:XX] Error: /vscode/src/vs/editor/browser/controller/textAreaInput.ts(208,33): Property 'locale' does not exist on type 'CompositionEvent'.
-[XX:XX:XX] Error: /vscode/src/vs/editor/browser/controller/textAreaInput.ts(225,33): Property 'locale' does not exist on type 'CompositionEvent'.
+[XX:XX:XX] Error: /vscode/node_modules/@types/node/index.d.ts(179,11): Duplicate identifier 'IteratorResult'.
 info Visit https://yarnpkg.com/en/docs/cli/run for documentation about this command.
 
 
 
 Standard error:
-[XX:XX:XX] 'compile' errored after 
-[XX:XX:XX] Error: Found 4 errors
+{"type":"warning","data":"package.json: No license field"}
+{"type":"warning","data":"../package.json: No license field"}
+{"type":"warning","data":"vscode-web@X.X.X: No license field"}
+[XX:XX:XX] 'compile' errored after ?s
+[XX:XX:XX] Error: Found 1 errors
     at Stream.<anonymous> (/vscode/build/lib/reporter.js:74:29)
     at _end (/vscode/node_modules/through/index.js:65:9)
     at Stream.stream.end (/vscode/node_modules/through/index.js:74:5)
-    at Stream.onend (internal/streams/legacy.js:42:10)
-    at Stream.emit (events.js:203:15)
-    at Stream.EventEmitter.emit (domain.js:466:23)
-    at drain (/vscode/node_modules/through/index.js:34:23)
-    at Stream.stream.queue.stream.push (/vscode/node_modules/through/index.js:45:5)
-    at Stream.end (/vscode/node_modules/through/index.js:15:35)
-    at _end (/vscode/node_modules/through/index.js:65:9)
+    at StreamFilter.onend (/vscode/node_modules/readable-stream/lib/_stream_readable.js:570:10)
+    at Object.onceWrapper (events.js:286:20)
+    at StreamFilter.emit (events.js:203:15)
+    at StreamFilter.EventEmitter.emit (domain.js:466:23)
+    at endReadableNT (/vscode/node_modules/readable-stream/lib/_stream_readable.js:992:12)
+    at process._tickCallback (internal/process/next_tick.js:63:19)
 error Command failed with exit code 1.
diff --git a/tests/cases/docker/office-ui-fabric/Dockerfile b/tests/cases/docker/office-ui-fabric/Dockerfile
index 718289fabe3..e31dc713ec2 100644
--- a/tests/cases/docker/office-ui-fabric/Dockerfile
+++ b/tests/cases/docker/office-ui-fabric/Dockerfile
@@ -1,20 +1,21 @@
 FROM node:current
-RUN npm install -g @microsoft/rush
+RUN npm install -g yarn lerna
 RUN git clone https://github.com/OfficeDev/office-ui-fabric-react.git /office-ui-fabric-react
 WORKDIR /office-ui-fabric-react
 RUN git pull
-RUN rush update
+COPY --from=typescript/typescript /typescript/typescript-*.tgz typescript.tgz
+# Sync up all TS versions used internally to the new one
 WORKDIR /office-ui-fabric-react/scripts
-# Sync up all TS versions used internally so they're all linked from a known location
-RUN rush add -p "typescript@3.5.1" --exact --dev -m
-# Relink installed TSes to built TS
-WORKDIR /office-ui-fabric-react/common/temp/node_modules/.registry.npmjs.org/typescript/3.5.1/node_modules
-RUN rm -rf typescript
-COPY --from=typescript/typescript /typescript/typescript-*.tgz /typescript.tgz
-RUN mkdir /typescript
-RUN tar -xzvf /typescript.tgz -C /typescript
-RUN ln -s /typescript/package ./typescript
-RUN npm i -g /typescript.tgz
+RUN yarn add typescript@../typescript.tgz --exact --dev --ignore-scripts
+WORKDIR /office-ui-fabric-react/packages/tsx-editor
+RUN yarn add typescript@../../typescript.tgz --exact --ignore-scripts
+WORKDIR /office-ui-fabric-react/packages/migration
+RUN yarn add typescript@../../typescript.tgz --exact --ignore-scripts
+WORKDIR /office-ui-fabric-react/apps/vr-tests
+RUN yarn add typescript@../../typescript.tgz --exact --ignore-scripts
+WORKDIR /office-ui-fabric-react/apps/todo-app
+RUN yarn add typescript@../../typescript.tgz --exact --ignore-scripts
 WORKDIR /office-ui-fabric-react
-ENTRYPOINT [ "rush" ]
-CMD [ "rebuild", "--parallelism", "1" ]
\ No newline at end of file
+RUN yarn
+ENTRYPOINT [ "lerna" ]
+CMD [ "run", "build", "--stream", "--concurrency", "1", "--", "--production", "--lint" ]
\ No newline at end of file
diff --git a/tests/cases/docker/vscode/Dockerfile b/tests/cases/docker/vscode/Dockerfile
index d20e2e8d622..b0ece263d54 100644
--- a/tests/cases/docker/vscode/Dockerfile
+++ b/tests/cases/docker/vscode/Dockerfile
@@ -1,4 +1,4 @@
-# vscode only supports node 8 :(
+# vscode only supports older node
 FROM node:10
 RUN apt-get update
 RUN apt-get install libsecret-1-dev libx11-dev libxkbfile-dev -y
@@ -7,12 +7,12 @@ RUN git clone https://github.com/microsoft/vscode.git /vscode
 WORKDIR /vscode
 RUN git pull
 COPY --from=typescript/typescript /typescript/typescript-*.tgz /typescript.tgz
-RUN mkdir /typescript
-RUN tar -xzvf /typescript.tgz -C /typescript
 WORKDIR /vscode/build
-RUN yarn add typescript@/typescript/package
+RUN yarn add typescript@/typescript.tgz
+WORKDIR /vscode/extensions
+RUN yarn add typescript@/typescript.tgz
 WORKDIR /vscode
-RUN yarn add typescript@/typescript/package
+RUN yarn add typescript@/typescript.tgz
 RUN yarn
 ENTRYPOINT [ "yarn" ]
 # Build
diff --git a/tests/cases/user/prettier/prettier b/tests/cases/user/prettier/prettier
index 7f938c71ffd..1e471a00796 160000
--- a/tests/cases/user/prettier/prettier
+++ b/tests/cases/user/prettier/prettier
@@ -1 +1 @@
-Subproject commit 7f938c71ffda293eb1b69adf8bd12b7c11f9113b
+Subproject commit 1e471a007968b7490563b91ed6909ae6046f3fe8

From 395d1515eeefe5f52aab8a1365824bd0eba49215 Mon Sep 17 00:00:00 2001
From: "Salisbury, Tom" <t.salisbury@fugro.com>
Date: Thu, 18 Jul 2019 12:32:43 +0100
Subject: [PATCH 048/151] #32458 stop ES5 __values with no Symbol.iterator
 getting stuck in loop

---
 src/compiler/factory.ts                       |   7 +-
 src/testRunner/tsconfig.json                  |   1 +
 src/testRunner/unittests/evaluation/forOf.ts  | 119 ++++++++++++++++++
 tests/baselines/reference/ES5For-of33.js      |   7 +-
 tests/baselines/reference/ES5For-of33.js.map  |   2 +-
 .../reference/ES5For-of33.sourcemap.txt       |  63 +++++-----
 tests/baselines/reference/ES5For-of34.js      |   7 +-
 tests/baselines/reference/ES5For-of34.js.map  |   2 +-
 .../reference/ES5For-of34.sourcemap.txt       |  95 +++++++-------
 tests/baselines/reference/ES5For-of35.js      |   7 +-
 tests/baselines/reference/ES5For-of35.js.map  |   2 +-
 .../reference/ES5For-of35.sourcemap.txt       |  69 +++++-----
 tests/baselines/reference/ES5For-of36.js      |   7 +-
 tests/baselines/reference/ES5For-of36.js.map  |   2 +-
 .../reference/ES5For-of36.sourcemap.txt       |  69 +++++-----
 tests/baselines/reference/ES5For-of37.js      |   7 +-
 ...blockScopedBindingsInDownlevelGenerator.js |   7 +-
 ...mitter.asyncGenerators.classMethods.es5.js |  14 ++-
 ...syncGenerators.functionDeclarations.es5.js |  14 ++-
 ...asyncGenerators.functionExpressions.es5.js |  14 ++-
 ...syncGenerators.objectLiteralMethods.es5.js |  14 ++-
 ...eclarationBindingPatterns01_ES5iterable.js |   7 +-
 22 files changed, 338 insertions(+), 198 deletions(-)
 create mode 100644 src/testRunner/unittests/evaluation/forOf.ts

diff --git a/src/compiler/factory.ts b/src/compiler/factory.ts
index 1f0294423a5..82b4a3fb59f 100644
--- a/src/compiler/factory.ts
+++ b/src/compiler/factory.ts
@@ -3636,15 +3636,16 @@ namespace ts {
         name: "typescript:values",
         scoped: false,
         text: `
-            var __values = (this && this.__values) || function (o) {
-                var m = typeof Symbol === "function" && o[Symbol.iterator], i = 0;
+            var __values = (this && this.__values) || function(o) {
+                var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
                 if (m) return m.call(o);
-                return {
+                if (o && typeof o.length === "number") return {
                     next: function () {
                         if (o && i >= o.length) o = void 0;
                         return { value: o && o[i++], done: !o };
                     }
                 };
+                throw new TypeError(s ? "Object not iterable." : "Symbol.iterator is not defined.");
             };`
     };
 
diff --git a/src/testRunner/tsconfig.json b/src/testRunner/tsconfig.json
index 659dd426b79..d69feffb787 100644
--- a/src/testRunner/tsconfig.json
+++ b/src/testRunner/tsconfig.json
@@ -75,6 +75,7 @@
         "unittests/evaluation/asyncGenerator.ts",
         "unittests/evaluation/awaiter.ts",
         "unittests/evaluation/forAwaitOf.ts",
+        "unittests/evaluation/forOf.ts",
         "unittests/evaluation/objectRest.ts",
         "unittests/services/cancellableLanguageServiceOperations.ts",
         "unittests/services/colorization.ts",
diff --git a/src/testRunner/unittests/evaluation/forOf.ts b/src/testRunner/unittests/evaluation/forOf.ts
new file mode 100644
index 00000000000..3d9352cf926
--- /dev/null
+++ b/src/testRunner/unittests/evaluation/forOf.ts
@@ -0,0 +1,119 @@
+describe("unittests:: evaluation:: forOfEvaluation", () => {
+    it("es5 over a array with no Symbol", () => {
+        const result = evaluator.evaluateTypeScript(`
+            Symbol = undefined;
+            export var output = [];
+            export function main() {
+                let x = [1,2,3];
+
+                for (let value of x) {
+                    output.push(value);
+                }
+            }
+        `, { downlevelIteration: true, target: ts.ScriptTarget.ES5 });
+
+        result.main();
+
+        assert.strictEqual(result.output[0], 1);
+        assert.strictEqual(result.output[1], 2);
+        assert.strictEqual(result.output[2], 3);
+
+    });
+
+    it("es5 over a string with no Symbol", () => {
+        const result = evaluator.evaluateTypeScript(`
+            Symbol = undefined;
+            export var output = [];
+            export function main() {
+                let x = "hello";
+
+                for (let value of x) {
+                    output.push(value);
+                }
+            }
+        `, { downlevelIteration: true, target: ts.ScriptTarget.ES5 });
+
+        result.main();
+
+        assert.strictEqual(result.output[0], "h");
+        assert.strictEqual(result.output[1], "e");
+        assert.strictEqual(result.output[2], "l");
+        assert.strictEqual(result.output[3], "l");
+        assert.strictEqual(result.output[4], "o");
+    });
+
+    it("es5 over undefined with no Symbol", () => {
+        const result = evaluator.evaluateTypeScript(`
+        Symbol = undefined;
+        export function main() {
+            let x = undefined;
+
+            for (let value of x) {
+            }
+        }
+        `, { downlevelIteration: true, target: ts.ScriptTarget.ES5 });
+
+        assert.throws(() => result.main(), "Symbol.iterator is not defined");
+    });
+
+    it("es5 over undefined with Symbol", () => {
+        const result = evaluator.evaluateTypeScript(`
+        export function main() {
+            let x = undefined;
+
+            for (let value of x) {
+            }
+        }
+        `, { downlevelIteration: true, target: ts.ScriptTarget.ES5 });
+
+        assert.throws(() => result.main(), "undefined is not iterable (cannot read property Symbol(Symbol.iterator))");
+    });
+
+    it("es5 over object with no Symbol.iterator with no Symbol", () => {
+        const result = evaluator.evaluateTypeScript(`
+        Symbol = undefined;
+        export function main() {
+            let x = {} as any;
+
+            for (let value of x) {
+            }
+        }
+        `, { downlevelIteration: true, target: ts.ScriptTarget.ES5 });
+
+        assert.throws(() => result.main(), "Symbol.iterator is not defined");
+    });
+
+    it("es5 over object with no Symbol.iterator with Symbol", () => {
+        const result = evaluator.evaluateTypeScript(`
+        export function main() {
+            let x = {} as any;
+
+            for (let value of x) {
+            }
+        }
+        `, { downlevelIteration: true, target: ts.ScriptTarget.ES5 });
+
+        assert.throws(() => result.main(), "Object not iterable");
+    });
+
+    it("es5 over object with Symbol.iterator", () => {
+        const result = evaluator.evaluateTypeScript(`
+            export var output = [];
+            export function main() {
+                let thing : any = {};
+                thing[Symbol.iterator] = () => {
+                    let i = 0;
+                    return { next() { i++; return this; }, value: i, done: i < 10 };
+                };
+
+                for (let value of thing)
+                {
+                    output.push(value)
+                }
+                
+            }`, { downlevelIteration: true, target: ts.ScriptTarget.ES5 });
+
+        result.main();
+    });
+
+});
\ No newline at end of file
diff --git a/tests/baselines/reference/ES5For-of33.js b/tests/baselines/reference/ES5For-of33.js
index 8a7bacbf52d..900f32b6407 100644
--- a/tests/baselines/reference/ES5For-of33.js
+++ b/tests/baselines/reference/ES5For-of33.js
@@ -4,15 +4,16 @@ for (var v of ['a', 'b', 'c']) {
 }
 
 //// [ES5For-of33.js]
-var __values = (this && this.__values) || function (o) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator], i = 0;
+var __values = (this && this.__values) || function(o) {
+    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
     if (m) return m.call(o);
-    return {
+    if (o && typeof o.length === "number") return {
         next: function () {
             if (o && i >= o.length) o = void 0;
             return { value: o && o[i++], done: !o };
         }
     };
+    throw new TypeError(s ? "Object not iterable." : "Symbol.iterator is not defined.");
 };
 var e_1, _a;
 try {
diff --git a/tests/baselines/reference/ES5For-of33.js.map b/tests/baselines/reference/ES5For-of33.js.map
index c2a28ecec79..368ef47a3f5 100644
--- a/tests/baselines/reference/ES5For-of33.js.map
+++ b/tests/baselines/reference/ES5For-of33.js.map
@@ -1,2 +1,2 @@
 //// [ES5For-of33.js.map]
-{"version":3,"file":"ES5For-of33.js","sourceRoot":"","sources":["ES5For-of33.ts"],"names":[],"mappings":";;;;;;;;;;;;IAAA,KAAc,IAAA,KAAA,SAAA,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA,gBAAA,4BAAE;QAA1B,IAAI,CAAC,WAAA;QACN,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;KAClB"}
\ No newline at end of file
+{"version":3,"file":"ES5For-of33.js","sourceRoot":"","sources":["ES5For-of33.ts"],"names":[],"mappings":";;;;;;;;;;;;;IAAA,KAAc,IAAA,KAAA,SAAA,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA,gBAAA,4BAAE;QAA1B,IAAI,CAAC,WAAA;QACN,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;KAClB"}
\ No newline at end of file
diff --git a/tests/baselines/reference/ES5For-of33.sourcemap.txt b/tests/baselines/reference/ES5For-of33.sourcemap.txt
index 8438d558c74..f6be2e8fb11 100644
--- a/tests/baselines/reference/ES5For-of33.sourcemap.txt
+++ b/tests/baselines/reference/ES5For-of33.sourcemap.txt
@@ -8,15 +8,16 @@ sources: ES5For-of33.ts
 emittedFile:tests/cases/conformance/statements/for-ofStatements/ES5For-of33.js
 sourceFile:ES5For-of33.ts
 -------------------------------------------------------------------
->>>var __values = (this && this.__values) || function (o) {
->>>    var m = typeof Symbol === "function" && o[Symbol.iterator], i = 0;
+>>>var __values = (this && this.__values) || function(o) {
+>>>    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
 >>>    if (m) return m.call(o);
->>>    return {
+>>>    if (o && typeof o.length === "number") return {
 >>>        next: function () {
 >>>            if (o && i >= o.length) o = void 0;
 >>>            return { value: o && o[i++], done: !o };
 >>>        }
 >>>    };
+>>>    throw new TypeError(s ? "Object not iterable." : "Symbol.iterator is not defined.");
 >>>};
 >>>var e_1, _a;
 >>>try {
@@ -51,21 +52,21 @@ sourceFile:ES5For-of33.ts
 13>                                          
 14>                                           
 15>                                                           ) 
-1 >Emitted(13, 5) Source(1, 1) + SourceIndex(0)
-2 >Emitted(13, 10) Source(1, 15) + SourceIndex(0)
-3 >Emitted(13, 14) Source(1, 15) + SourceIndex(0)
-4 >Emitted(13, 19) Source(1, 15) + SourceIndex(0)
-5 >Emitted(13, 28) Source(1, 15) + SourceIndex(0)
-6 >Emitted(13, 29) Source(1, 16) + SourceIndex(0)
-7 >Emitted(13, 32) Source(1, 19) + SourceIndex(0)
-8 >Emitted(13, 34) Source(1, 21) + SourceIndex(0)
-9 >Emitted(13, 37) Source(1, 24) + SourceIndex(0)
-10>Emitted(13, 39) Source(1, 26) + SourceIndex(0)
-11>Emitted(13, 42) Source(1, 29) + SourceIndex(0)
-12>Emitted(13, 43) Source(1, 30) + SourceIndex(0)
-13>Emitted(13, 44) Source(1, 30) + SourceIndex(0)
-14>Emitted(13, 60) Source(1, 30) + SourceIndex(0)
-15>Emitted(13, 88) Source(1, 32) + SourceIndex(0)
+1 >Emitted(14, 5) Source(1, 1) + SourceIndex(0)
+2 >Emitted(14, 10) Source(1, 15) + SourceIndex(0)
+3 >Emitted(14, 14) Source(1, 15) + SourceIndex(0)
+4 >Emitted(14, 19) Source(1, 15) + SourceIndex(0)
+5 >Emitted(14, 28) Source(1, 15) + SourceIndex(0)
+6 >Emitted(14, 29) Source(1, 16) + SourceIndex(0)
+7 >Emitted(14, 32) Source(1, 19) + SourceIndex(0)
+8 >Emitted(14, 34) Source(1, 21) + SourceIndex(0)
+9 >Emitted(14, 37) Source(1, 24) + SourceIndex(0)
+10>Emitted(14, 39) Source(1, 26) + SourceIndex(0)
+11>Emitted(14, 42) Source(1, 29) + SourceIndex(0)
+12>Emitted(14, 43) Source(1, 30) + SourceIndex(0)
+13>Emitted(14, 44) Source(1, 30) + SourceIndex(0)
+14>Emitted(14, 60) Source(1, 30) + SourceIndex(0)
+15>Emitted(14, 88) Source(1, 32) + SourceIndex(0)
 ---
 >>>        var v = _c.value;
 1 >^^^^^^^^
@@ -76,10 +77,10 @@ sourceFile:ES5For-of33.ts
 2 >        var 
 3 >            v
 4 >             
-1 >Emitted(14, 9) Source(1, 6) + SourceIndex(0)
-2 >Emitted(14, 13) Source(1, 10) + SourceIndex(0)
-3 >Emitted(14, 14) Source(1, 11) + SourceIndex(0)
-4 >Emitted(14, 25) Source(1, 11) + SourceIndex(0)
+1 >Emitted(15, 9) Source(1, 6) + SourceIndex(0)
+2 >Emitted(15, 13) Source(1, 10) + SourceIndex(0)
+3 >Emitted(15, 14) Source(1, 11) + SourceIndex(0)
+4 >Emitted(15, 25) Source(1, 11) + SourceIndex(0)
 ---
 >>>        console.log(v);
 1 >^^^^^^^^
@@ -99,20 +100,20 @@ sourceFile:ES5For-of33.ts
 6 >                    v
 7 >                     )
 8 >                      ;
-1 >Emitted(15, 9) Source(2, 5) + SourceIndex(0)
-2 >Emitted(15, 16) Source(2, 12) + SourceIndex(0)
-3 >Emitted(15, 17) Source(2, 13) + SourceIndex(0)
-4 >Emitted(15, 20) Source(2, 16) + SourceIndex(0)
-5 >Emitted(15, 21) Source(2, 17) + SourceIndex(0)
-6 >Emitted(15, 22) Source(2, 18) + SourceIndex(0)
-7 >Emitted(15, 23) Source(2, 19) + SourceIndex(0)
-8 >Emitted(15, 24) Source(2, 20) + SourceIndex(0)
+1 >Emitted(16, 9) Source(2, 5) + SourceIndex(0)
+2 >Emitted(16, 16) Source(2, 12) + SourceIndex(0)
+3 >Emitted(16, 17) Source(2, 13) + SourceIndex(0)
+4 >Emitted(16, 20) Source(2, 16) + SourceIndex(0)
+5 >Emitted(16, 21) Source(2, 17) + SourceIndex(0)
+6 >Emitted(16, 22) Source(2, 18) + SourceIndex(0)
+7 >Emitted(16, 23) Source(2, 19) + SourceIndex(0)
+8 >Emitted(16, 24) Source(2, 20) + SourceIndex(0)
 ---
 >>>    }
 1 >^^^^^
 1 >
   >}
-1 >Emitted(16, 6) Source(3, 2) + SourceIndex(0)
+1 >Emitted(17, 6) Source(3, 2) + SourceIndex(0)
 ---
 >>>}
 >>>catch (e_1_1) { e_1 = { error: e_1_1 }; }
diff --git a/tests/baselines/reference/ES5For-of34.js b/tests/baselines/reference/ES5For-of34.js
index 821cec60ee1..d4ab664d009 100644
--- a/tests/baselines/reference/ES5For-of34.js
+++ b/tests/baselines/reference/ES5For-of34.js
@@ -7,15 +7,16 @@ for (foo().x of ['a', 'b', 'c']) {
 }
 
 //// [ES5For-of34.js]
-var __values = (this && this.__values) || function (o) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator], i = 0;
+var __values = (this && this.__values) || function(o) {
+    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
     if (m) return m.call(o);
-    return {
+    if (o && typeof o.length === "number") return {
         next: function () {
             if (o && i >= o.length) o = void 0;
             return { value: o && o[i++], done: !o };
         }
     };
+    throw new TypeError(s ? "Object not iterable." : "Symbol.iterator is not defined.");
 };
 var e_1, _a;
 function foo() {
diff --git a/tests/baselines/reference/ES5For-of34.js.map b/tests/baselines/reference/ES5For-of34.js.map
index 6bf7fd0baed..9535e73615c 100644
--- a/tests/baselines/reference/ES5For-of34.js.map
+++ b/tests/baselines/reference/ES5For-of34.js.map
@@ -1,2 +1,2 @@
 //// [ES5For-of34.js.map]
-{"version":3,"file":"ES5For-of34.js","sourceRoot":"","sources":["ES5For-of34.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,SAAS,GAAG;IACR,OAAO,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC;AACpB,CAAC;;IACD,KAAgB,IAAA,KAAA,SAAA,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA,gBAAA,4BAAE;QAA5B,GAAG,EAAE,CAAC,CAAC,WAAA;QACR,IAAI,CAAC,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC;KACnB"}
\ No newline at end of file
+{"version":3,"file":"ES5For-of34.js","sourceRoot":"","sources":["ES5For-of34.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,SAAS,GAAG;IACR,OAAO,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC;AACpB,CAAC;;IACD,KAAgB,IAAA,KAAA,SAAA,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA,gBAAA,4BAAE;QAA5B,GAAG,EAAE,CAAC,CAAC,WAAA;QACR,IAAI,CAAC,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC;KACnB"}
\ No newline at end of file
diff --git a/tests/baselines/reference/ES5For-of34.sourcemap.txt b/tests/baselines/reference/ES5For-of34.sourcemap.txt
index 06e93f578e2..e64aa5cdb8c 100644
--- a/tests/baselines/reference/ES5For-of34.sourcemap.txt
+++ b/tests/baselines/reference/ES5For-of34.sourcemap.txt
@@ -8,15 +8,16 @@ sources: ES5For-of34.ts
 emittedFile:tests/cases/conformance/statements/for-ofStatements/ES5For-of34.js
 sourceFile:ES5For-of34.ts
 -------------------------------------------------------------------
->>>var __values = (this && this.__values) || function (o) {
->>>    var m = typeof Symbol === "function" && o[Symbol.iterator], i = 0;
+>>>var __values = (this && this.__values) || function(o) {
+>>>    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
 >>>    if (m) return m.call(o);
->>>    return {
+>>>    if (o && typeof o.length === "number") return {
 >>>        next: function () {
 >>>            if (o && i >= o.length) o = void 0;
 >>>            return { value: o && o[i++], done: !o };
 >>>        }
 >>>    };
+>>>    throw new TypeError(s ? "Object not iterable." : "Symbol.iterator is not defined.");
 >>>};
 >>>var e_1, _a;
 >>>function foo() {
@@ -27,9 +28,9 @@ sourceFile:ES5For-of34.ts
 1 >
 2 >function 
 3 >         foo
-1 >Emitted(12, 1) Source(1, 1) + SourceIndex(0)
-2 >Emitted(12, 10) Source(1, 10) + SourceIndex(0)
-3 >Emitted(12, 13) Source(1, 13) + SourceIndex(0)
+1 >Emitted(13, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(13, 10) Source(1, 10) + SourceIndex(0)
+3 >Emitted(13, 13) Source(1, 13) + SourceIndex(0)
 ---
 >>>    return { x: 0 };
 1->^^^^
@@ -49,14 +50,14 @@ sourceFile:ES5For-of34.ts
 6 >                0
 7 >                  }
 8 >                   ;
-1->Emitted(13, 5) Source(2, 5) + SourceIndex(0)
-2 >Emitted(13, 12) Source(2, 12) + SourceIndex(0)
-3 >Emitted(13, 14) Source(2, 14) + SourceIndex(0)
-4 >Emitted(13, 15) Source(2, 15) + SourceIndex(0)
-5 >Emitted(13, 17) Source(2, 17) + SourceIndex(0)
-6 >Emitted(13, 18) Source(2, 18) + SourceIndex(0)
-7 >Emitted(13, 20) Source(2, 20) + SourceIndex(0)
-8 >Emitted(13, 21) Source(2, 21) + SourceIndex(0)
+1->Emitted(14, 5) Source(2, 5) + SourceIndex(0)
+2 >Emitted(14, 12) Source(2, 12) + SourceIndex(0)
+3 >Emitted(14, 14) Source(2, 14) + SourceIndex(0)
+4 >Emitted(14, 15) Source(2, 15) + SourceIndex(0)
+5 >Emitted(14, 17) Source(2, 17) + SourceIndex(0)
+6 >Emitted(14, 18) Source(2, 18) + SourceIndex(0)
+7 >Emitted(14, 20) Source(2, 20) + SourceIndex(0)
+8 >Emitted(14, 21) Source(2, 21) + SourceIndex(0)
 ---
 >>>}
 1 >
@@ -65,8 +66,8 @@ sourceFile:ES5For-of34.ts
 1 >
   >
 2 >}
-1 >Emitted(14, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(14, 2) Source(3, 2) + SourceIndex(0)
+1 >Emitted(15, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(15, 2) Source(3, 2) + SourceIndex(0)
 ---
 >>>try {
 >>>    for (var _b = __values(['a', 'b', 'c']), _c = _b.next(); !_c.done; _c = _b.next()) {
@@ -101,21 +102,21 @@ sourceFile:ES5For-of34.ts
 13>                                          
 14>                                           
 15>                                                           ) 
-1->Emitted(16, 5) Source(4, 1) + SourceIndex(0)
-2 >Emitted(16, 10) Source(4, 17) + SourceIndex(0)
-3 >Emitted(16, 14) Source(4, 17) + SourceIndex(0)
-4 >Emitted(16, 19) Source(4, 17) + SourceIndex(0)
-5 >Emitted(16, 28) Source(4, 17) + SourceIndex(0)
-6 >Emitted(16, 29) Source(4, 18) + SourceIndex(0)
-7 >Emitted(16, 32) Source(4, 21) + SourceIndex(0)
-8 >Emitted(16, 34) Source(4, 23) + SourceIndex(0)
-9 >Emitted(16, 37) Source(4, 26) + SourceIndex(0)
-10>Emitted(16, 39) Source(4, 28) + SourceIndex(0)
-11>Emitted(16, 42) Source(4, 31) + SourceIndex(0)
-12>Emitted(16, 43) Source(4, 32) + SourceIndex(0)
-13>Emitted(16, 44) Source(4, 32) + SourceIndex(0)
-14>Emitted(16, 60) Source(4, 32) + SourceIndex(0)
-15>Emitted(16, 88) Source(4, 34) + SourceIndex(0)
+1->Emitted(17, 5) Source(4, 1) + SourceIndex(0)
+2 >Emitted(17, 10) Source(4, 17) + SourceIndex(0)
+3 >Emitted(17, 14) Source(4, 17) + SourceIndex(0)
+4 >Emitted(17, 19) Source(4, 17) + SourceIndex(0)
+5 >Emitted(17, 28) Source(4, 17) + SourceIndex(0)
+6 >Emitted(17, 29) Source(4, 18) + SourceIndex(0)
+7 >Emitted(17, 32) Source(4, 21) + SourceIndex(0)
+8 >Emitted(17, 34) Source(4, 23) + SourceIndex(0)
+9 >Emitted(17, 37) Source(4, 26) + SourceIndex(0)
+10>Emitted(17, 39) Source(4, 28) + SourceIndex(0)
+11>Emitted(17, 42) Source(4, 31) + SourceIndex(0)
+12>Emitted(17, 43) Source(4, 32) + SourceIndex(0)
+13>Emitted(17, 44) Source(4, 32) + SourceIndex(0)
+14>Emitted(17, 60) Source(4, 32) + SourceIndex(0)
+15>Emitted(17, 88) Source(4, 34) + SourceIndex(0)
 ---
 >>>        foo().x = _c.value;
 1 >^^^^^^^^
@@ -130,12 +131,12 @@ sourceFile:ES5For-of34.ts
 4 >             .
 5 >              x
 6 >               
-1 >Emitted(17, 9) Source(4, 6) + SourceIndex(0)
-2 >Emitted(17, 12) Source(4, 9) + SourceIndex(0)
-3 >Emitted(17, 14) Source(4, 11) + SourceIndex(0)
-4 >Emitted(17, 15) Source(4, 12) + SourceIndex(0)
-5 >Emitted(17, 16) Source(4, 13) + SourceIndex(0)
-6 >Emitted(17, 27) Source(4, 13) + SourceIndex(0)
+1 >Emitted(18, 9) Source(4, 6) + SourceIndex(0)
+2 >Emitted(18, 12) Source(4, 9) + SourceIndex(0)
+3 >Emitted(18, 14) Source(4, 11) + SourceIndex(0)
+4 >Emitted(18, 15) Source(4, 12) + SourceIndex(0)
+5 >Emitted(18, 16) Source(4, 13) + SourceIndex(0)
+6 >Emitted(18, 27) Source(4, 13) + SourceIndex(0)
 ---
 >>>        var p = foo().x;
 1 >^^^^^^^^
@@ -157,21 +158,21 @@ sourceFile:ES5For-of34.ts
 7 >                     .
 8 >                      x
 9 >                       ;
-1 >Emitted(18, 9) Source(5, 5) + SourceIndex(0)
-2 >Emitted(18, 13) Source(5, 9) + SourceIndex(0)
-3 >Emitted(18, 14) Source(5, 10) + SourceIndex(0)
-4 >Emitted(18, 17) Source(5, 13) + SourceIndex(0)
-5 >Emitted(18, 20) Source(5, 16) + SourceIndex(0)
-6 >Emitted(18, 22) Source(5, 18) + SourceIndex(0)
-7 >Emitted(18, 23) Source(5, 19) + SourceIndex(0)
-8 >Emitted(18, 24) Source(5, 20) + SourceIndex(0)
-9 >Emitted(18, 25) Source(5, 21) + SourceIndex(0)
+1 >Emitted(19, 9) Source(5, 5) + SourceIndex(0)
+2 >Emitted(19, 13) Source(5, 9) + SourceIndex(0)
+3 >Emitted(19, 14) Source(5, 10) + SourceIndex(0)
+4 >Emitted(19, 17) Source(5, 13) + SourceIndex(0)
+5 >Emitted(19, 20) Source(5, 16) + SourceIndex(0)
+6 >Emitted(19, 22) Source(5, 18) + SourceIndex(0)
+7 >Emitted(19, 23) Source(5, 19) + SourceIndex(0)
+8 >Emitted(19, 24) Source(5, 20) + SourceIndex(0)
+9 >Emitted(19, 25) Source(5, 21) + SourceIndex(0)
 ---
 >>>    }
 1 >^^^^^
 1 >
   >}
-1 >Emitted(19, 6) Source(6, 2) + SourceIndex(0)
+1 >Emitted(20, 6) Source(6, 2) + SourceIndex(0)
 ---
 >>>}
 >>>catch (e_1_1) { e_1 = { error: e_1_1 }; }
diff --git a/tests/baselines/reference/ES5For-of35.js b/tests/baselines/reference/ES5For-of35.js
index 608ce967479..1158ae5ede1 100644
--- a/tests/baselines/reference/ES5For-of35.js
+++ b/tests/baselines/reference/ES5For-of35.js
@@ -5,15 +5,16 @@ for (const {x: a = 0, y: b = 1} of [2, 3]) {
 }
 
 //// [ES5For-of35.js]
-var __values = (this && this.__values) || function (o) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator], i = 0;
+var __values = (this && this.__values) || function(o) {
+    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
     if (m) return m.call(o);
-    return {
+    if (o && typeof o.length === "number") return {
         next: function () {
             if (o && i >= o.length) o = void 0;
             return { value: o && o[i++], done: !o };
         }
     };
+    throw new TypeError(s ? "Object not iterable." : "Symbol.iterator is not defined.");
 };
 var e_1, _a;
 try {
diff --git a/tests/baselines/reference/ES5For-of35.js.map b/tests/baselines/reference/ES5For-of35.js.map
index ca243e5bde5..ff69685616b 100644
--- a/tests/baselines/reference/ES5For-of35.js.map
+++ b/tests/baselines/reference/ES5For-of35.js.map
@@ -1,2 +1,2 @@
 //// [ES5For-of35.js.map]
-{"version":3,"file":"ES5For-of35.js","sourceRoot":"","sources":["ES5For-of35.ts"],"names":[],"mappings":";;;;;;;;;;;;IAAA,KAAmC,IAAA,KAAA,SAAA,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA,gBAAA,4BAAE;QAAhC,IAAA,aAAoB,EAAnB,SAAQ,EAAR,0BAAQ,EAAE,SAAQ,EAAR,0BAAQ;QAC1B,CAAC,CAAC;QACF,CAAC,CAAC;KACL"}
\ No newline at end of file
+{"version":3,"file":"ES5For-of35.js","sourceRoot":"","sources":["ES5For-of35.ts"],"names":[],"mappings":";;;;;;;;;;;;;IAAA,KAAmC,IAAA,KAAA,SAAA,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA,gBAAA,4BAAE;QAAhC,IAAA,aAAoB,EAAnB,SAAQ,EAAR,0BAAQ,EAAE,SAAQ,EAAR,0BAAQ;QAC1B,CAAC,CAAC;QACF,CAAC,CAAC;KACL"}
\ No newline at end of file
diff --git a/tests/baselines/reference/ES5For-of35.sourcemap.txt b/tests/baselines/reference/ES5For-of35.sourcemap.txt
index 907fc3ce690..1cabb7af3b6 100644
--- a/tests/baselines/reference/ES5For-of35.sourcemap.txt
+++ b/tests/baselines/reference/ES5For-of35.sourcemap.txt
@@ -8,15 +8,16 @@ sources: ES5For-of35.ts
 emittedFile:tests/cases/conformance/statements/for-ofStatements/ES5For-of35.js
 sourceFile:ES5For-of35.ts
 -------------------------------------------------------------------
->>>var __values = (this && this.__values) || function (o) {
->>>    var m = typeof Symbol === "function" && o[Symbol.iterator], i = 0;
+>>>var __values = (this && this.__values) || function(o) {
+>>>    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
 >>>    if (m) return m.call(o);
->>>    return {
+>>>    if (o && typeof o.length === "number") return {
 >>>        next: function () {
 >>>            if (o && i >= o.length) o = void 0;
 >>>            return { value: o && o[i++], done: !o };
 >>>        }
 >>>    };
+>>>    throw new TypeError(s ? "Object not iterable." : "Symbol.iterator is not defined.");
 >>>};
 >>>var e_1, _a;
 >>>try {
@@ -48,19 +49,19 @@ sourceFile:ES5For-of35.ts
 11>                                 
 12>                                  
 13>                                                  ) 
-1 >Emitted(13, 5) Source(1, 1) + SourceIndex(0)
-2 >Emitted(13, 10) Source(1, 36) + SourceIndex(0)
-3 >Emitted(13, 14) Source(1, 36) + SourceIndex(0)
-4 >Emitted(13, 19) Source(1, 36) + SourceIndex(0)
-5 >Emitted(13, 28) Source(1, 36) + SourceIndex(0)
-6 >Emitted(13, 29) Source(1, 37) + SourceIndex(0)
-7 >Emitted(13, 30) Source(1, 38) + SourceIndex(0)
-8 >Emitted(13, 32) Source(1, 40) + SourceIndex(0)
-9 >Emitted(13, 33) Source(1, 41) + SourceIndex(0)
-10>Emitted(13, 34) Source(1, 42) + SourceIndex(0)
-11>Emitted(13, 35) Source(1, 42) + SourceIndex(0)
-12>Emitted(13, 51) Source(1, 42) + SourceIndex(0)
-13>Emitted(13, 79) Source(1, 44) + SourceIndex(0)
+1 >Emitted(14, 5) Source(1, 1) + SourceIndex(0)
+2 >Emitted(14, 10) Source(1, 36) + SourceIndex(0)
+3 >Emitted(14, 14) Source(1, 36) + SourceIndex(0)
+4 >Emitted(14, 19) Source(1, 36) + SourceIndex(0)
+5 >Emitted(14, 28) Source(1, 36) + SourceIndex(0)
+6 >Emitted(14, 29) Source(1, 37) + SourceIndex(0)
+7 >Emitted(14, 30) Source(1, 38) + SourceIndex(0)
+8 >Emitted(14, 32) Source(1, 40) + SourceIndex(0)
+9 >Emitted(14, 33) Source(1, 41) + SourceIndex(0)
+10>Emitted(14, 34) Source(1, 42) + SourceIndex(0)
+11>Emitted(14, 35) Source(1, 42) + SourceIndex(0)
+12>Emitted(14, 51) Source(1, 42) + SourceIndex(0)
+13>Emitted(14, 79) Source(1, 44) + SourceIndex(0)
 ---
 >>>        var _d = _c.value, _e = _d.x, a = _e === void 0 ? 0 : _e, _f = _d.y, b = _f === void 0 ? 1 : _f;
 1->^^^^^^^^
@@ -85,17 +86,17 @@ sourceFile:ES5For-of35.ts
 9 >                                                                  y: b = 1
 10>                                                                           
 11>                                                                             y: b = 1
-1->Emitted(14, 9) Source(1, 12) + SourceIndex(0)
-2 >Emitted(14, 13) Source(1, 12) + SourceIndex(0)
-3 >Emitted(14, 26) Source(1, 32) + SourceIndex(0)
-4 >Emitted(14, 28) Source(1, 13) + SourceIndex(0)
-5 >Emitted(14, 37) Source(1, 21) + SourceIndex(0)
-6 >Emitted(14, 39) Source(1, 13) + SourceIndex(0)
-7 >Emitted(14, 65) Source(1, 21) + SourceIndex(0)
-8 >Emitted(14, 67) Source(1, 23) + SourceIndex(0)
-9 >Emitted(14, 76) Source(1, 31) + SourceIndex(0)
-10>Emitted(14, 78) Source(1, 23) + SourceIndex(0)
-11>Emitted(14, 104) Source(1, 31) + SourceIndex(0)
+1->Emitted(15, 9) Source(1, 12) + SourceIndex(0)
+2 >Emitted(15, 13) Source(1, 12) + SourceIndex(0)
+3 >Emitted(15, 26) Source(1, 32) + SourceIndex(0)
+4 >Emitted(15, 28) Source(1, 13) + SourceIndex(0)
+5 >Emitted(15, 37) Source(1, 21) + SourceIndex(0)
+6 >Emitted(15, 39) Source(1, 13) + SourceIndex(0)
+7 >Emitted(15, 65) Source(1, 21) + SourceIndex(0)
+8 >Emitted(15, 67) Source(1, 23) + SourceIndex(0)
+9 >Emitted(15, 76) Source(1, 31) + SourceIndex(0)
+10>Emitted(15, 78) Source(1, 23) + SourceIndex(0)
+11>Emitted(15, 104) Source(1, 31) + SourceIndex(0)
 ---
 >>>        a;
 1 >^^^^^^^^
@@ -106,9 +107,9 @@ sourceFile:ES5For-of35.ts
   >    
 2 >        a
 3 >         ;
-1 >Emitted(15, 9) Source(2, 5) + SourceIndex(0)
-2 >Emitted(15, 10) Source(2, 6) + SourceIndex(0)
-3 >Emitted(15, 11) Source(2, 7) + SourceIndex(0)
+1 >Emitted(16, 9) Source(2, 5) + SourceIndex(0)
+2 >Emitted(16, 10) Source(2, 6) + SourceIndex(0)
+3 >Emitted(16, 11) Source(2, 7) + SourceIndex(0)
 ---
 >>>        b;
 1->^^^^^^^^
@@ -118,15 +119,15 @@ sourceFile:ES5For-of35.ts
   >    
 2 >        b
 3 >         ;
-1->Emitted(16, 9) Source(3, 5) + SourceIndex(0)
-2 >Emitted(16, 10) Source(3, 6) + SourceIndex(0)
-3 >Emitted(16, 11) Source(3, 7) + SourceIndex(0)
+1->Emitted(17, 9) Source(3, 5) + SourceIndex(0)
+2 >Emitted(17, 10) Source(3, 6) + SourceIndex(0)
+3 >Emitted(17, 11) Source(3, 7) + SourceIndex(0)
 ---
 >>>    }
 1 >^^^^^
 1 >
   >}
-1 >Emitted(17, 6) Source(4, 2) + SourceIndex(0)
+1 >Emitted(18, 6) Source(4, 2) + SourceIndex(0)
 ---
 >>>}
 >>>catch (e_1_1) { e_1 = { error: e_1_1 }; }
diff --git a/tests/baselines/reference/ES5For-of36.js b/tests/baselines/reference/ES5For-of36.js
index 5d53b241466..f08a178256d 100644
--- a/tests/baselines/reference/ES5For-of36.js
+++ b/tests/baselines/reference/ES5For-of36.js
@@ -5,15 +5,16 @@ for (let [a = 0, b = 1] of [2, 3]) {
 }
 
 //// [ES5For-of36.js]
-var __values = (this && this.__values) || function (o) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator], i = 0;
+var __values = (this && this.__values) || function(o) {
+    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
     if (m) return m.call(o);
-    return {
+    if (o && typeof o.length === "number") return {
         next: function () {
             if (o && i >= o.length) o = void 0;
             return { value: o && o[i++], done: !o };
         }
     };
+    throw new TypeError(s ? "Object not iterable." : "Symbol.iterator is not defined.");
 };
 var __read = (this && this.__read) || function (o, n) {
     var m = typeof Symbol === "function" && o[Symbol.iterator];
diff --git a/tests/baselines/reference/ES5For-of36.js.map b/tests/baselines/reference/ES5For-of36.js.map
index 09fdb4fd820..9ea2aa31df2 100644
--- a/tests/baselines/reference/ES5For-of36.js.map
+++ b/tests/baselines/reference/ES5For-of36.js.map
@@ -1,2 +1,2 @@
 //// [ES5For-of36.js.map]
-{"version":3,"file":"ES5For-of36.js","sourceRoot":"","sources":["ES5For-of36.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;IAAA,KAA2B,IAAA,KAAA,SAAA,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA,gBAAA,4BAAE;QAA1B,IAAA,wBAAc,EAAb,UAAK,EAAL,0BAAK,EAAE,UAAK,EAAL,0BAAK;QAClB,CAAC,CAAC;QACF,CAAC,CAAC;KACL"}
\ No newline at end of file
+{"version":3,"file":"ES5For-of36.js","sourceRoot":"","sources":["ES5For-of36.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAAA,KAA2B,IAAA,KAAA,SAAA,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA,gBAAA,4BAAE;QAA1B,IAAA,wBAAc,EAAb,UAAK,EAAL,0BAAK,EAAE,UAAK,EAAL,0BAAK;QAClB,CAAC,CAAC;QACF,CAAC,CAAC;KACL"}
\ No newline at end of file
diff --git a/tests/baselines/reference/ES5For-of36.sourcemap.txt b/tests/baselines/reference/ES5For-of36.sourcemap.txt
index c3ac87f51ca..b1977e55d81 100644
--- a/tests/baselines/reference/ES5For-of36.sourcemap.txt
+++ b/tests/baselines/reference/ES5For-of36.sourcemap.txt
@@ -8,15 +8,16 @@ sources: ES5For-of36.ts
 emittedFile:tests/cases/conformance/statements/for-ofStatements/ES5For-of36.js
 sourceFile:ES5For-of36.ts
 -------------------------------------------------------------------
->>>var __values = (this && this.__values) || function (o) {
->>>    var m = typeof Symbol === "function" && o[Symbol.iterator], i = 0;
+>>>var __values = (this && this.__values) || function(o) {
+>>>    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
 >>>    if (m) return m.call(o);
->>>    return {
+>>>    if (o && typeof o.length === "number") return {
 >>>        next: function () {
 >>>            if (o && i >= o.length) o = void 0;
 >>>            return { value: o && o[i++], done: !o };
 >>>        }
 >>>    };
+>>>    throw new TypeError(s ? "Object not iterable." : "Symbol.iterator is not defined.");
 >>>};
 >>>var __read = (this && this.__read) || function (o, n) {
 >>>    var m = typeof Symbol === "function" && o[Symbol.iterator];
@@ -64,19 +65,19 @@ sourceFile:ES5For-of36.ts
 11>                                 
 12>                                  
 13>                                                  ) 
-1 >Emitted(29, 5) Source(1, 1) + SourceIndex(0)
-2 >Emitted(29, 10) Source(1, 28) + SourceIndex(0)
-3 >Emitted(29, 14) Source(1, 28) + SourceIndex(0)
-4 >Emitted(29, 19) Source(1, 28) + SourceIndex(0)
-5 >Emitted(29, 28) Source(1, 28) + SourceIndex(0)
-6 >Emitted(29, 29) Source(1, 29) + SourceIndex(0)
-7 >Emitted(29, 30) Source(1, 30) + SourceIndex(0)
-8 >Emitted(29, 32) Source(1, 32) + SourceIndex(0)
-9 >Emitted(29, 33) Source(1, 33) + SourceIndex(0)
-10>Emitted(29, 34) Source(1, 34) + SourceIndex(0)
-11>Emitted(29, 35) Source(1, 34) + SourceIndex(0)
-12>Emitted(29, 51) Source(1, 34) + SourceIndex(0)
-13>Emitted(29, 79) Source(1, 36) + SourceIndex(0)
+1 >Emitted(30, 5) Source(1, 1) + SourceIndex(0)
+2 >Emitted(30, 10) Source(1, 28) + SourceIndex(0)
+3 >Emitted(30, 14) Source(1, 28) + SourceIndex(0)
+4 >Emitted(30, 19) Source(1, 28) + SourceIndex(0)
+5 >Emitted(30, 28) Source(1, 28) + SourceIndex(0)
+6 >Emitted(30, 29) Source(1, 29) + SourceIndex(0)
+7 >Emitted(30, 30) Source(1, 30) + SourceIndex(0)
+8 >Emitted(30, 32) Source(1, 32) + SourceIndex(0)
+9 >Emitted(30, 33) Source(1, 33) + SourceIndex(0)
+10>Emitted(30, 34) Source(1, 34) + SourceIndex(0)
+11>Emitted(30, 35) Source(1, 34) + SourceIndex(0)
+12>Emitted(30, 51) Source(1, 34) + SourceIndex(0)
+13>Emitted(30, 79) Source(1, 36) + SourceIndex(0)
 ---
 >>>        var _d = __read(_c.value, 2), _e = _d[0], a = _e === void 0 ? 0 : _e, _f = _d[1], b = _f === void 0 ? 1 : _f;
 1->^^^^^^^^
@@ -101,17 +102,17 @@ sourceFile:ES5For-of36.ts
 9 >                                                                              b = 1
 10>                                                                                        
 11>                                                                                          b = 1
-1->Emitted(30, 9) Source(1, 10) + SourceIndex(0)
-2 >Emitted(30, 13) Source(1, 10) + SourceIndex(0)
-3 >Emitted(30, 37) Source(1, 24) + SourceIndex(0)
-4 >Emitted(30, 39) Source(1, 11) + SourceIndex(0)
-5 >Emitted(30, 49) Source(1, 16) + SourceIndex(0)
-6 >Emitted(30, 51) Source(1, 11) + SourceIndex(0)
-7 >Emitted(30, 77) Source(1, 16) + SourceIndex(0)
-8 >Emitted(30, 79) Source(1, 18) + SourceIndex(0)
-9 >Emitted(30, 89) Source(1, 23) + SourceIndex(0)
-10>Emitted(30, 91) Source(1, 18) + SourceIndex(0)
-11>Emitted(30, 117) Source(1, 23) + SourceIndex(0)
+1->Emitted(31, 9) Source(1, 10) + SourceIndex(0)
+2 >Emitted(31, 13) Source(1, 10) + SourceIndex(0)
+3 >Emitted(31, 37) Source(1, 24) + SourceIndex(0)
+4 >Emitted(31, 39) Source(1, 11) + SourceIndex(0)
+5 >Emitted(31, 49) Source(1, 16) + SourceIndex(0)
+6 >Emitted(31, 51) Source(1, 11) + SourceIndex(0)
+7 >Emitted(31, 77) Source(1, 16) + SourceIndex(0)
+8 >Emitted(31, 79) Source(1, 18) + SourceIndex(0)
+9 >Emitted(31, 89) Source(1, 23) + SourceIndex(0)
+10>Emitted(31, 91) Source(1, 18) + SourceIndex(0)
+11>Emitted(31, 117) Source(1, 23) + SourceIndex(0)
 ---
 >>>        a;
 1 >^^^^^^^^
@@ -122,9 +123,9 @@ sourceFile:ES5For-of36.ts
   >    
 2 >        a
 3 >         ;
-1 >Emitted(31, 9) Source(2, 5) + SourceIndex(0)
-2 >Emitted(31, 10) Source(2, 6) + SourceIndex(0)
-3 >Emitted(31, 11) Source(2, 7) + SourceIndex(0)
+1 >Emitted(32, 9) Source(2, 5) + SourceIndex(0)
+2 >Emitted(32, 10) Source(2, 6) + SourceIndex(0)
+3 >Emitted(32, 11) Source(2, 7) + SourceIndex(0)
 ---
 >>>        b;
 1->^^^^^^^^
@@ -134,15 +135,15 @@ sourceFile:ES5For-of36.ts
   >    
 2 >        b
 3 >         ;
-1->Emitted(32, 9) Source(3, 5) + SourceIndex(0)
-2 >Emitted(32, 10) Source(3, 6) + SourceIndex(0)
-3 >Emitted(32, 11) Source(3, 7) + SourceIndex(0)
+1->Emitted(33, 9) Source(3, 5) + SourceIndex(0)
+2 >Emitted(33, 10) Source(3, 6) + SourceIndex(0)
+3 >Emitted(33, 11) Source(3, 7) + SourceIndex(0)
 ---
 >>>    }
 1 >^^^^^
 1 >
   >}
-1 >Emitted(33, 6) Source(4, 2) + SourceIndex(0)
+1 >Emitted(34, 6) Source(4, 2) + SourceIndex(0)
 ---
 >>>}
 >>>catch (e_1_1) { e_1 = { error: e_1_1 }; }
diff --git a/tests/baselines/reference/ES5For-of37.js b/tests/baselines/reference/ES5For-of37.js
index c9ea0236187..ada2710249f 100644
--- a/tests/baselines/reference/ES5For-of37.js
+++ b/tests/baselines/reference/ES5For-of37.js
@@ -17,15 +17,16 @@ for (const i of [0, 1, 2, 3, 4]) {
 
 //// [ES5For-of37.js]
 // https://github.com/microsoft/TypeScript/issues/30083
-var __values = (this && this.__values) || function (o) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator], i = 0;
+var __values = (this && this.__values) || function(o) {
+    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
     if (m) return m.call(o);
-    return {
+    if (o && typeof o.length === "number") return {
         next: function () {
             if (o && i >= o.length) o = void 0;
             return { value: o && o[i++], done: !o };
         }
     };
+    throw new TypeError(s ? "Object not iterable." : "Symbol.iterator is not defined.");
 };
 var e_1, _a, e_2, _b;
 try {
diff --git a/tests/baselines/reference/blockScopedBindingsInDownlevelGenerator.js b/tests/baselines/reference/blockScopedBindingsInDownlevelGenerator.js
index 9bb07d80b00..a0bc036f2a7 100644
--- a/tests/baselines/reference/blockScopedBindingsInDownlevelGenerator.js
+++ b/tests/baselines/reference/blockScopedBindingsInDownlevelGenerator.js
@@ -34,15 +34,16 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-var __values = (this && this.__values) || function (o) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator], i = 0;
+var __values = (this && this.__values) || function(o) {
+    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
     if (m) return m.call(o);
-    return {
+    if (o && typeof o.length === "number") return {
         next: function () {
             if (o && i >= o.length) o = void 0;
             return { value: o && o[i++], done: !o };
         }
     };
+    throw new TypeError(s ? "Object not iterable." : "Symbol.iterator is not defined.");
 };
 function a() {
     var _loop_1, _a, _b, i, e_1_1;
diff --git a/tests/baselines/reference/emitter.asyncGenerators.classMethods.es5.js b/tests/baselines/reference/emitter.asyncGenerators.classMethods.es5.js
index 25b01aa5956..629cd3b0d9b 100644
--- a/tests/baselines/reference/emitter.asyncGenerators.classMethods.es5.js
+++ b/tests/baselines/reference/emitter.asyncGenerators.classMethods.es5.js
@@ -282,15 +282,16 @@ var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _ar
     function reject(value) { resume("throw", value); }
     function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
 };
-var __values = (this && this.__values) || function (o) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator], i = 0;
+var __values = (this && this.__values) || function(o) {
+    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
     if (m) return m.call(o);
-    return {
+    if (o && typeof o.length === "number") return {
         next: function () {
             if (o && i >= o.length) o = void 0;
             return { value: o && o[i++], done: !o };
         }
     };
+    throw new TypeError(s ? "Object not iterable." : "Symbol.iterator is not defined.");
 };
 var C4 = /** @class */ (function () {
     function C4() {
@@ -363,15 +364,16 @@ var __asyncDelegator = (this && this.__asyncDelegator) || function (o) {
     return i = {}, verb("next"), verb("throw", function (e) { throw e; }), verb("return"), i[Symbol.iterator] = function () { return this; }, i;
     function verb(n, f) { i[n] = o[n] ? function (v) { return (p = !p) ? { value: __await(o[n](v)), done: n === "return" } : f ? f(v) : v; } : f; }
 };
-var __values = (this && this.__values) || function (o) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator], i = 0;
+var __values = (this && this.__values) || function(o) {
+    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
     if (m) return m.call(o);
-    return {
+    if (o && typeof o.length === "number") return {
         next: function () {
             if (o && i >= o.length) o = void 0;
             return { value: o && o[i++], done: !o };
         }
     };
+    throw new TypeError(s ? "Object not iterable." : "Symbol.iterator is not defined.");
 };
 var C5 = /** @class */ (function () {
     function C5() {
diff --git a/tests/baselines/reference/emitter.asyncGenerators.functionDeclarations.es5.js b/tests/baselines/reference/emitter.asyncGenerators.functionDeclarations.es5.js
index d4f6cd74132..622195d09df 100644
--- a/tests/baselines/reference/emitter.asyncGenerators.functionDeclarations.es5.js
+++ b/tests/baselines/reference/emitter.asyncGenerators.functionDeclarations.es5.js
@@ -236,15 +236,16 @@ var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _ar
     function reject(value) { resume("throw", value); }
     function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
 };
-var __values = (this && this.__values) || function (o) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator], i = 0;
+var __values = (this && this.__values) || function(o) {
+    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
     if (m) return m.call(o);
-    return {
+    if (o && typeof o.length === "number") return {
         next: function () {
             if (o && i >= o.length) o = void 0;
             return { value: o && o[i++], done: !o };
         }
     };
+    throw new TypeError(s ? "Object not iterable." : "Symbol.iterator is not defined.");
 };
 function f4() {
     return __asyncGenerator(this, arguments, function f4_1() {
@@ -312,15 +313,16 @@ var __asyncDelegator = (this && this.__asyncDelegator) || function (o) {
     return i = {}, verb("next"), verb("throw", function (e) { throw e; }), verb("return"), i[Symbol.iterator] = function () { return this; }, i;
     function verb(n, f) { i[n] = o[n] ? function (v) { return (p = !p) ? { value: __await(o[n](v)), done: n === "return" } : f ? f(v) : v; } : f; }
 };
-var __values = (this && this.__values) || function (o) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator], i = 0;
+var __values = (this && this.__values) || function(o) {
+    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
     if (m) return m.call(o);
-    return {
+    if (o && typeof o.length === "number") return {
         next: function () {
             if (o && i >= o.length) o = void 0;
             return { value: o && o[i++], done: !o };
         }
     };
+    throw new TypeError(s ? "Object not iterable." : "Symbol.iterator is not defined.");
 };
 function f5() {
     return __asyncGenerator(this, arguments, function f5_1() {
diff --git a/tests/baselines/reference/emitter.asyncGenerators.functionExpressions.es5.js b/tests/baselines/reference/emitter.asyncGenerators.functionExpressions.es5.js
index 55efe59aeba..7d8b9ad649b 100644
--- a/tests/baselines/reference/emitter.asyncGenerators.functionExpressions.es5.js
+++ b/tests/baselines/reference/emitter.asyncGenerators.functionExpressions.es5.js
@@ -236,15 +236,16 @@ var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _ar
     function reject(value) { resume("throw", value); }
     function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
 };
-var __values = (this && this.__values) || function (o) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator], i = 0;
+var __values = (this && this.__values) || function(o) {
+    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
     if (m) return m.call(o);
-    return {
+    if (o && typeof o.length === "number") return {
         next: function () {
             if (o && i >= o.length) o = void 0;
             return { value: o && o[i++], done: !o };
         }
     };
+    throw new TypeError(s ? "Object not iterable." : "Symbol.iterator is not defined.");
 };
 var f4 = function () {
     return __asyncGenerator(this, arguments, function () {
@@ -312,15 +313,16 @@ var __asyncDelegator = (this && this.__asyncDelegator) || function (o) {
     return i = {}, verb("next"), verb("throw", function (e) { throw e; }), verb("return"), i[Symbol.iterator] = function () { return this; }, i;
     function verb(n, f) { i[n] = o[n] ? function (v) { return (p = !p) ? { value: __await(o[n](v)), done: n === "return" } : f ? f(v) : v; } : f; }
 };
-var __values = (this && this.__values) || function (o) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator], i = 0;
+var __values = (this && this.__values) || function(o) {
+    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
     if (m) return m.call(o);
-    return {
+    if (o && typeof o.length === "number") return {
         next: function () {
             if (o && i >= o.length) o = void 0;
             return { value: o && o[i++], done: !o };
         }
     };
+    throw new TypeError(s ? "Object not iterable." : "Symbol.iterator is not defined.");
 };
 var f5 = function () {
     return __asyncGenerator(this, arguments, function () {
diff --git a/tests/baselines/reference/emitter.asyncGenerators.objectLiteralMethods.es5.js b/tests/baselines/reference/emitter.asyncGenerators.objectLiteralMethods.es5.js
index 845d84e2c29..8677898f05d 100644
--- a/tests/baselines/reference/emitter.asyncGenerators.objectLiteralMethods.es5.js
+++ b/tests/baselines/reference/emitter.asyncGenerators.objectLiteralMethods.es5.js
@@ -256,15 +256,16 @@ var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _ar
     function reject(value) { resume("throw", value); }
     function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
 };
-var __values = (this && this.__values) || function (o) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator], i = 0;
+var __values = (this && this.__values) || function(o) {
+    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
     if (m) return m.call(o);
-    return {
+    if (o && typeof o.length === "number") return {
         next: function () {
             if (o && i >= o.length) o = void 0;
             return { value: o && o[i++], done: !o };
         }
     };
+    throw new TypeError(s ? "Object not iterable." : "Symbol.iterator is not defined.");
 };
 var o4 = {
     f: function () {
@@ -334,15 +335,16 @@ var __asyncDelegator = (this && this.__asyncDelegator) || function (o) {
     return i = {}, verb("next"), verb("throw", function (e) { throw e; }), verb("return"), i[Symbol.iterator] = function () { return this; }, i;
     function verb(n, f) { i[n] = o[n] ? function (v) { return (p = !p) ? { value: __await(o[n](v)), done: n === "return" } : f ? f(v) : v; } : f; }
 };
-var __values = (this && this.__values) || function (o) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator], i = 0;
+var __values = (this && this.__values) || function(o) {
+    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
     if (m) return m.call(o);
-    return {
+    if (o && typeof o.length === "number") return {
         next: function () {
             if (o && i >= o.length) o = void 0;
             return { value: o && o[i++], done: !o };
         }
     };
+    throw new TypeError(s ? "Object not iterable." : "Symbol.iterator is not defined.");
 };
 var o5 = {
     f: function () {
diff --git a/tests/baselines/reference/emptyVariableDeclarationBindingPatterns01_ES5iterable.js b/tests/baselines/reference/emptyVariableDeclarationBindingPatterns01_ES5iterable.js
index 80b2b04b8f0..e1a2a828b5c 100644
--- a/tests/baselines/reference/emptyVariableDeclarationBindingPatterns01_ES5iterable.js
+++ b/tests/baselines/reference/emptyVariableDeclarationBindingPatterns01_ES5iterable.js
@@ -65,15 +65,16 @@ var __read = (this && this.__read) || function (o, n) {
     }
     return ar;
 };
-var __values = (this && this.__values) || function (o) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator], i = 0;
+var __values = (this && this.__values) || function(o) {
+    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
     if (m) return m.call(o);
-    return {
+    if (o && typeof o.length === "number") return {
         next: function () {
             if (o && i >= o.length) o = void 0;
             return { value: o && o[i++], done: !o };
         }
     };
+    throw new TypeError(s ? "Object not iterable." : "Symbol.iterator is not defined.");
 };
 (function () {
     var a;

From aa12ec440c9fcd1e74576c615cd3bf889fcc74db Mon Sep 17 00:00:00 2001
From: Andrew Branch <andrewbranch@users.noreply.github.com>
Date: Thu, 25 Jul 2019 09:47:57 -0700
Subject: [PATCH 049/151] Fix smart select on last blank line of file (#32544)

* Fix SmartSelection on last blank line of file

* Add baseline
---
 src/services/smartSelection.ts                             | 7 +++++++
 .../reference/smartSelection_lastBlankLine.baseline        | 5 +++++
 tests/cases/fourslash/smartSelection_lastBlankLine.ts      | 5 +++++
 3 files changed, 17 insertions(+)
 create mode 100644 tests/baselines/reference/smartSelection_lastBlankLine.baseline
 create mode 100644 tests/cases/fourslash/smartSelection_lastBlankLine.ts

diff --git a/src/services/smartSelection.ts b/src/services/smartSelection.ts
index d0423ce031e..3765c39ed7a 100644
--- a/src/services/smartSelection.ts
+++ b/src/services/smartSelection.ts
@@ -64,6 +64,13 @@ namespace ts.SmartSelectionRange {
                     parentNode = node;
                     break;
                 }
+
+                // If we made it to the end of the for loop, we’re done.
+                // In practice, I’ve only seen this happen at the very end
+                // of a SourceFile.
+                if (i === children.length - 1) {
+                    break outer;
+                }
             }
         }
 
diff --git a/tests/baselines/reference/smartSelection_lastBlankLine.baseline b/tests/baselines/reference/smartSelection_lastBlankLine.baseline
new file mode 100644
index 00000000000..3cbad44aac4
--- /dev/null
+++ b/tests/baselines/reference/smartSelection_lastBlankLine.baseline
@@ -0,0 +1,5 @@
+class C {}
+/**/
+
+
+class C {}↲
diff --git a/tests/cases/fourslash/smartSelection_lastBlankLine.ts b/tests/cases/fourslash/smartSelection_lastBlankLine.ts
new file mode 100644
index 00000000000..2f5cc3f07fc
--- /dev/null
+++ b/tests/cases/fourslash/smartSelection_lastBlankLine.ts
@@ -0,0 +1,5 @@
+/// <reference path="fourslash.ts" />
+////class C {}
+/////**/
+
+verify.baselineSmartSelection();

From dc415c5c5e81d6578f58cb1847d0c27926e8a005 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Thu, 25 Jul 2019 09:56:36 -0700
Subject: [PATCH 050/151] Infer between closely matching types in unions and
 intersections

---
 src/compiler/checker.ts | 116 +++++++++++++++++++---------------------
 1 file changed, 56 insertions(+), 60 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index f56f56223cf..54c8d05e502 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -15497,37 +15497,27 @@ namespace ts {
                         }
                         return;
                     }
-                    // Find each source constituent type that has an identically matching target constituent
-                    // type, and for each such type infer from the type to itself. When inferring from a
-                    // type to itself we effectively find all type parameter occurrences within that type
-                    // and infer themselves as their type arguments. We have special handling for numeric
-                    // and string literals because the number and string types are not represented as unions
-                    // of all their possible values.
-                    let matchingTypes: Type[] | undefined;
-                    for (const t of (<UnionOrIntersectionType>source).types) {
-                        const matched = findMatchedType(t, <UnionOrIntersectionType>target);
-                        if (matched) {
-                            (matchingTypes || (matchingTypes = [])).push(matched);
-                            inferFromTypes(matched, matched);
-                        }
-                    }
-                    // Next, to improve the quality of inferences, reduce the source and target types by
-                    // removing the identically matched constituents. For example, when inferring from
-                    // 'string | string[]' to 'string | T' we reduce the types to 'string[]' and 'T'.
-                    if (matchingTypes) {
-                        const s = removeTypesFromUnionOrIntersection(<UnionOrIntersectionType>source, matchingTypes);
-                        const t = removeTypesFromUnionOrIntersection(<UnionOrIntersectionType>target, matchingTypes);
-                        if (!(s && t)) return;
-                        source = s;
-                        target = t;
-                    }
-                }
-                else if (target.flags & TypeFlags.Union && !(target.flags & TypeFlags.EnumLiteral) || target.flags & TypeFlags.Intersection) {
-                    const matched = findMatchedType(source, <UnionOrIntersectionType>target);
-                    if (matched) {
-                        inferFromTypes(matched, matched);
+                    // First, infer between exactly matching source and target constituents and remove
+                    // the matching types. Types exactly match when they are identical or, in union
+                    // types, when the source is a literal and the target is the corresponding primitive.
+                    const matching = target.flags & TypeFlags.Union ? isTypeOrBaseExactlyMatchedBy : isTypeExactlyMatchedBy;
+                    const [tempSources, tempTargets] = inferFromMatchingTypes((<UnionOrIntersectionType>source).types, (<UnionOrIntersectionType>target).types, matching);
+                    // Next, infer between closely matching source and target constituents and remove
+                    // the matching types. Types closely match when they are instantiations of the same
+                    // object type or instantiations of the same type alias.
+                    const [sources, targets] = inferFromMatchingTypes(tempSources, tempTargets, isTypeCloselyMatchedBy);
+                    if (sources.length === 0 || targets.length === 0) {
                         return;
                     }
+                    source = source.flags & TypeFlags.Union ? getUnionType(sources) : getIntersectionType(sources);
+                    target = target.flags & TypeFlags.Union ? getUnionType(targets) : getIntersectionType(targets);
+                }
+                else if (target.flags & TypeFlags.Union && !(target.flags & TypeFlags.EnumLiteral) || target.flags & TypeFlags.Intersection) {
+                    // This block of code is an optimized version of the block above for the simpler case
+                    // of a singleton source type.
+                    const matching = target.flags & TypeFlags.Union ? isTypeOrBaseExactlyMatchedBy : isTypeExactlyMatchedBy;
+                    if (inferFromMatchingType(source, (<UnionOrIntersectionType>target).types, matching)) return;
+                    if (inferFromMatchingType(source, (<UnionOrIntersectionType>target).types, isTypeCloselyMatchedBy)) return;
                 }
                 else if (target.flags & (TypeFlags.IndexedAccess | TypeFlags.Substitution)) {
                     target = getActualTypeVariable(target);
@@ -15675,6 +15665,35 @@ namespace ts {
                 visited.set(key, inferenceCount - startCount);
             }
 
+            function inferFromMatchingType(source: Type, targets: Type[], matches: (s: Type, t: Type) => boolean) {
+                let matched = false;
+                for (const t of targets) {
+                    if (matches(source, t)) {
+                        inferFromTypes(source, t);
+                        matched = true;
+                    }
+                }
+                return matched;
+            }
+
+            function inferFromMatchingTypes(sources: Type[], targets: Type[], matches: (s: Type, t: Type) => boolean): [Type[], Type[]] {
+                let matchedSources: Type[] | undefined;
+                let matchedTargets: Type[] | undefined;
+                for (const t of targets) {
+                    for (const s of sources) {
+                        if (matches(s, t)) {
+                            inferFromTypes(s, t);
+                            matchedSources = appendIfUnique(matchedSources, s);
+                            matchedTargets = appendIfUnique(matchedTargets, t);
+                        }
+                    }
+                }
+                return [
+                    matchedSources ? filter(sources, t => !contains(matchedSources, t)) : sources,
+                    matchedTargets ? filter(targets, t => !contains(matchedTargets, t)) : targets,
+                ];
+            }
+
             function inferFromTypeArguments(sourceTypes: readonly Type[], targetTypes: readonly Type[], variances: readonly VarianceFlags[]) {
                 const count = sourceTypes.length < targetTypes.length ? sourceTypes.length : targetTypes.length;
                 for (let i = 0; i < count; i++) {
@@ -15955,47 +15974,24 @@ namespace ts {
             }
         }
 
-        function isMatchableType(type: Type) {
+        function isNonObjectOrAnonymousType(type: Type) {
             // We exclude non-anonymous object types because some frameworks (e.g. Ember) rely on the ability to
             // infer between types that don't witness their type variables. Such types would otherwise be eliminated
             // because they appear identical.
             return !(type.flags & TypeFlags.Object) || !!(getObjectFlags(type) & ObjectFlags.Anonymous);
         }
 
-        function typeMatchedBySomeType(type: Type, types: Type[]): boolean {
-            for (const t of types) {
-                if (t === type || isMatchableType(t) && isMatchableType(type) && isTypeIdenticalTo(t, type)) {
-                    return true;
-                }
-            }
-            return false;
+        function isTypeExactlyMatchedBy(s: Type, t: Type) {
+            return s === t || isNonObjectOrAnonymousType(s) && isNonObjectOrAnonymousType(t) && isTypeIdenticalTo(s, t);
         }
 
-        function findMatchedType(type: Type, target: UnionOrIntersectionType) {
-            if (typeMatchedBySomeType(type, target.types)) {
-                return type;
-            }
-            if (type.flags & (TypeFlags.NumberLiteral | TypeFlags.StringLiteral) && target.flags & TypeFlags.Union) {
-                const base = getBaseTypeOfLiteralType(type);
-                if (typeMatchedBySomeType(base, target.types)) {
-                    return base;
-                }
-            }
-            return undefined;
+        function isTypeOrBaseExactlyMatchedBy(s: Type, t: Type) {
+            return isTypeExactlyMatchedBy(s, t) || !!(s.flags & (TypeFlags.StringLiteral | TypeFlags.NumberLiteral)) && isTypeIdenticalTo(getBaseTypeOfLiteralType(s), t);
         }
 
-        /**
-         * Return a new union or intersection type computed by removing a given set of types
-         * from a given union or intersection type.
-         */
-        function removeTypesFromUnionOrIntersection(type: UnionOrIntersectionType, typesToRemove: Type[]) {
-            const reducedTypes: Type[] = [];
-            for (const t of type.types) {
-                if (!typeMatchedBySomeType(t, typesToRemove)) {
-                    reducedTypes.push(t);
-                }
-            }
-            return reducedTypes.length ? type.flags & TypeFlags.Union ? getUnionType(reducedTypes) : getIntersectionType(reducedTypes) : undefined;
+        function isTypeCloselyMatchedBy(s: Type, t: Type) {
+            return !!(s.flags & TypeFlags.Object && t.flags & TypeFlags.Object && s.symbol && s.symbol === t.symbol ||
+                s.aliasSymbol && s.aliasTypeArguments && s.aliasSymbol === t.aliasSymbol);
         }
 
         function hasPrimitiveConstraint(type: TypeParameter): boolean {

From 772bee5e84f80a7e76c623b1c39d1eb80d8e9b4a Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com>
Date: Thu, 25 Jul 2019 10:23:03 -0700
Subject: [PATCH 051/151] Property assignment uses parent type annotation
 (#32553)

* Property assignment uses parent type annotation

First draft, will write full explanation later.

Also makes sure that jsdoc is ignored in TS. It was not before.

* Update baselines
---
 src/compiler/checker.ts                       | 25 +++++++----
 .../expandoFunctionContextualTypes.types      |  2 +-
 .../expandoFunctionContextualTypesJs.types    |  2 +-
 .../propertyAssignmentUseParentType1.js       | 26 +++++++++++
 .../propertyAssignmentUseParentType1.symbols  | 35 +++++++++++++++
 .../propertyAssignmentUseParentType1.types    | 44 +++++++++++++++++++
 ...ropertyAssignmentUseParentType2.errors.txt | 24 ++++++++++
 .../propertyAssignmentUseParentType2.symbols  | 30 +++++++++++++
 .../propertyAssignmentUseParentType2.types    | 42 ++++++++++++++++++
 .../salsa/propertyAssignmentUseParentType1.ts | 13 ++++++
 .../salsa/propertyAssignmentUseParentType2.ts | 18 ++++++++
 11 files changed, 250 insertions(+), 11 deletions(-)
 create mode 100644 tests/baselines/reference/propertyAssignmentUseParentType1.js
 create mode 100644 tests/baselines/reference/propertyAssignmentUseParentType1.symbols
 create mode 100644 tests/baselines/reference/propertyAssignmentUseParentType1.types
 create mode 100644 tests/baselines/reference/propertyAssignmentUseParentType2.errors.txt
 create mode 100644 tests/baselines/reference/propertyAssignmentUseParentType2.symbols
 create mode 100644 tests/baselines/reference/propertyAssignmentUseParentType2.types
 create mode 100644 tests/cases/conformance/salsa/propertyAssignmentUseParentType1.ts
 create mode 100644 tests/cases/conformance/salsa/propertyAssignmentUseParentType2.ts

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index f56f56223cf..2f466267f9d 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -5396,7 +5396,7 @@ namespace ts {
             return undefined;
         }
 
-        function getWidenedTypeFromAssignmentDeclaration(symbol: Symbol, resolvedSymbol?: Symbol) {
+        function getWidenedTypeForAssignmentDeclaration(symbol: Symbol, resolvedSymbol?: Symbol) {
             // function/class/{} initializers are themselves containers, so they won't merge in the same way as other initializers
             const container = getAssignedExpandoInitializer(symbol.valueDeclaration);
             if (container) {
@@ -5429,7 +5429,7 @@ namespace ts {
                     }
                 }
                 if (!isCallExpression(expression)) {
-                    jsdocType = getJSDocTypeFromAssignmentDeclaration(jsdocType, expression, symbol, declaration);
+                    jsdocType = getAnnotatedTypeForAssignmentDeclaration(jsdocType, expression, symbol, declaration);
                 }
                 if (!jsdocType) {
                     (types || (types = [])).push((isBinaryExpression(expression) || isCallExpression(expression)) ? getInitializerTypeFromAssignmentDeclaration(symbol, resolvedSymbol, expression, kind) : neverType);
@@ -5478,8 +5478,8 @@ namespace ts {
             return type;
         }
 
-        function getJSDocTypeFromAssignmentDeclaration(declaredType: Type | undefined, expression: Expression, _symbol: Symbol, declaration: Declaration) {
-            const typeNode = getJSDocType(expression.parent);
+        function getAnnotatedTypeForAssignmentDeclaration(declaredType: Type | undefined, expression: Expression, symbol: Symbol, declaration: Declaration) {
+            const typeNode = getEffectiveTypeAnnotationNode(expression.parent);
             if (typeNode) {
                 const type = getWidenedType(getTypeFromTypeNode(typeNode));
                 if (!declaredType) {
@@ -5489,6 +5489,13 @@ namespace ts {
                     errorNextVariableOrPropertyDeclarationMustHaveSameType(/*firstDeclaration*/ undefined, declaredType, declaration, type);
                 }
             }
+            if (symbol.parent) {
+                const typeNode = getEffectiveTypeAnnotationNode(symbol.parent.valueDeclaration);
+                if (typeNode) {
+                    return getTypeOfPropertyOfType(getTypeFromTypeNode(typeNode), symbol.escapedName);
+                }
+            }
+
             return declaredType;
         }
 
@@ -5783,7 +5790,7 @@ namespace ts {
             }
             else if (isInJSFile(declaration) &&
                 (isCallExpression(declaration) || isBinaryExpression(declaration) || isPropertyAccessExpression(declaration) && isBinaryExpression(declaration.parent))) {
-                type = getWidenedTypeFromAssignmentDeclaration(symbol);
+                type = getWidenedTypeForAssignmentDeclaration(symbol);
             }
             else if (isJSDocPropertyLikeTag(declaration)
                 || isPropertyAccessExpression(declaration)
@@ -5798,7 +5805,7 @@ namespace ts {
                     return getTypeOfFuncClassEnumModule(symbol);
                 }
                 type = isBinaryExpression(declaration.parent) ?
-                    getWidenedTypeFromAssignmentDeclaration(symbol) :
+                    getWidenedTypeForAssignmentDeclaration(symbol) :
                     tryGetTypeFromEffectiveTypeNode(declaration) || anyType;
             }
             else if (isPropertyAssignment(declaration)) {
@@ -5969,7 +5976,7 @@ namespace ts {
             }
             else if (declaration.kind === SyntaxKind.BinaryExpression ||
                      declaration.kind === SyntaxKind.PropertyAccessExpression && declaration.parent.kind === SyntaxKind.BinaryExpression) {
-                return getWidenedTypeFromAssignmentDeclaration(symbol);
+                return getWidenedTypeForAssignmentDeclaration(symbol);
             }
             else if (symbol.flags & SymbolFlags.ValueModule && declaration && isSourceFile(declaration) && declaration.commonJsModuleIndicator) {
                 const resolvedModule = resolveExternalModuleSymbol(symbol);
@@ -5978,7 +5985,7 @@ namespace ts {
                         return errorType;
                     }
                     const exportEquals = getMergedSymbol(symbol.exports!.get(InternalSymbolName.ExportEquals)!);
-                    const type = getWidenedTypeFromAssignmentDeclaration(exportEquals, exportEquals === resolvedModule ? undefined : resolvedModule);
+                    const type = getWidenedTypeForAssignmentDeclaration(exportEquals, exportEquals === resolvedModule ? undefined : resolvedModule);
                     if (!popTypeResolution()) {
                         return reportCircularityError(symbol);
                     }
@@ -19157,7 +19164,7 @@ namespace ts {
         }
 
         /**
-         * Woah! Do you really want to use this function?
+         * Whoa! Do you really want to use this function?
          *
          * Unless you're trying to get the *non-apparent* type for a
          * value-literal type or you're authoring relevant portions of this algorithm,
diff --git a/tests/baselines/reference/expandoFunctionContextualTypes.types b/tests/baselines/reference/expandoFunctionContextualTypes.types
index e1eca92659c..915b168776f 100644
--- a/tests/baselines/reference/expandoFunctionContextualTypes.types
+++ b/tests/baselines/reference/expandoFunctionContextualTypes.types
@@ -12,7 +12,7 @@ interface StatelessComponent<P> {
 
 const MyComponent: StatelessComponent<MyComponentProps> = () => null as any;
 >MyComponent : StatelessComponent<MyComponentProps>
->() => null as any : { (): any; defaultProps: { color: "red"; }; }
+>() => null as any : { (): any; defaultProps: Partial<MyComponentProps>; }
 >null as any : any
 >null : null
 
diff --git a/tests/baselines/reference/expandoFunctionContextualTypesJs.types b/tests/baselines/reference/expandoFunctionContextualTypesJs.types
index 081c57c0dac..82442a9db4a 100644
--- a/tests/baselines/reference/expandoFunctionContextualTypesJs.types
+++ b/tests/baselines/reference/expandoFunctionContextualTypesJs.types
@@ -10,7 +10,7 @@
   */
 const MyComponent = () => /* @type {any} */(null);
 >MyComponent : { (): any; defaultProps?: Partial<{ color: "red" | "blue"; }>; }
->() => /* @type {any} */(null) : { (): any; defaultProps: { color: "red"; }; }
+>() => /* @type {any} */(null) : { (): any; defaultProps: Partial<{ color: "red" | "blue"; }>; }
 >(null) : null
 >null : null
 
diff --git a/tests/baselines/reference/propertyAssignmentUseParentType1.js b/tests/baselines/reference/propertyAssignmentUseParentType1.js
new file mode 100644
index 00000000000..5e839a31da4
--- /dev/null
+++ b/tests/baselines/reference/propertyAssignmentUseParentType1.js
@@ -0,0 +1,26 @@
+//// [propertyAssignmentUseParentType1.ts]
+interface N {
+    (): boolean
+    num: 123;
+}
+export const interfaced: N = () => true;
+interfaced.num = 123;
+
+export const inlined: { (): boolean; nun: 456 } = () => true;
+inlined.nun = 456;
+
+export const ignoreJsdoc = () => true;
+/** @type {string} make sure to ignore jsdoc! */
+ignoreJsdoc.extra = 111
+
+
+//// [propertyAssignmentUseParentType1.js]
+"use strict";
+exports.__esModule = true;
+exports.interfaced = function () { return true; };
+exports.interfaced.num = 123;
+exports.inlined = function () { return true; };
+exports.inlined.nun = 456;
+exports.ignoreJsdoc = function () { return true; };
+/** @type {string} make sure to ignore jsdoc! */
+exports.ignoreJsdoc.extra = 111;
diff --git a/tests/baselines/reference/propertyAssignmentUseParentType1.symbols b/tests/baselines/reference/propertyAssignmentUseParentType1.symbols
new file mode 100644
index 00000000000..081e2f12604
--- /dev/null
+++ b/tests/baselines/reference/propertyAssignmentUseParentType1.symbols
@@ -0,0 +1,35 @@
+=== tests/cases/conformance/salsa/propertyAssignmentUseParentType1.ts ===
+interface N {
+>N : Symbol(N, Decl(propertyAssignmentUseParentType1.ts, 0, 0))
+
+    (): boolean
+    num: 123;
+>num : Symbol(N.num, Decl(propertyAssignmentUseParentType1.ts, 1, 15))
+}
+export const interfaced: N = () => true;
+>interfaced : Symbol(interfaced, Decl(propertyAssignmentUseParentType1.ts, 4, 12), Decl(propertyAssignmentUseParentType1.ts, 4, 40))
+>N : Symbol(N, Decl(propertyAssignmentUseParentType1.ts, 0, 0))
+
+interfaced.num = 123;
+>interfaced.num : Symbol(N.num, Decl(propertyAssignmentUseParentType1.ts, 1, 15))
+>interfaced : Symbol(interfaced, Decl(propertyAssignmentUseParentType1.ts, 4, 12), Decl(propertyAssignmentUseParentType1.ts, 4, 40))
+>num : Symbol(N.num, Decl(propertyAssignmentUseParentType1.ts, 1, 15))
+
+export const inlined: { (): boolean; nun: 456 } = () => true;
+>inlined : Symbol(inlined, Decl(propertyAssignmentUseParentType1.ts, 7, 12), Decl(propertyAssignmentUseParentType1.ts, 7, 61))
+>nun : Symbol(nun, Decl(propertyAssignmentUseParentType1.ts, 7, 36))
+
+inlined.nun = 456;
+>inlined.nun : Symbol(nun, Decl(propertyAssignmentUseParentType1.ts, 7, 36))
+>inlined : Symbol(inlined, Decl(propertyAssignmentUseParentType1.ts, 7, 12), Decl(propertyAssignmentUseParentType1.ts, 7, 61))
+>nun : Symbol(nun, Decl(propertyAssignmentUseParentType1.ts, 7, 36))
+
+export const ignoreJsdoc = () => true;
+>ignoreJsdoc : Symbol(ignoreJsdoc, Decl(propertyAssignmentUseParentType1.ts, 10, 12), Decl(propertyAssignmentUseParentType1.ts, 10, 38))
+
+/** @type {string} make sure to ignore jsdoc! */
+ignoreJsdoc.extra = 111
+>ignoreJsdoc.extra : Symbol(ignoreJsdoc.extra, Decl(propertyAssignmentUseParentType1.ts, 10, 38))
+>ignoreJsdoc : Symbol(ignoreJsdoc, Decl(propertyAssignmentUseParentType1.ts, 10, 12), Decl(propertyAssignmentUseParentType1.ts, 10, 38))
+>extra : Symbol(ignoreJsdoc.extra, Decl(propertyAssignmentUseParentType1.ts, 10, 38))
+
diff --git a/tests/baselines/reference/propertyAssignmentUseParentType1.types b/tests/baselines/reference/propertyAssignmentUseParentType1.types
new file mode 100644
index 00000000000..f3bd5010b20
--- /dev/null
+++ b/tests/baselines/reference/propertyAssignmentUseParentType1.types
@@ -0,0 +1,44 @@
+=== tests/cases/conformance/salsa/propertyAssignmentUseParentType1.ts ===
+interface N {
+    (): boolean
+    num: 123;
+>num : 123
+}
+export const interfaced: N = () => true;
+>interfaced : N
+>() => true : { (): true; num: 123; }
+>true : true
+
+interfaced.num = 123;
+>interfaced.num = 123 : 123
+>interfaced.num : 123
+>interfaced : N
+>num : 123
+>123 : 123
+
+export const inlined: { (): boolean; nun: 456 } = () => true;
+>inlined : { (): boolean; nun: 456; }
+>nun : 456
+>() => true : { (): true; nun: 456; }
+>true : true
+
+inlined.nun = 456;
+>inlined.nun = 456 : 456
+>inlined.nun : 456
+>inlined : { (): boolean; nun: 456; }
+>nun : 456
+>456 : 456
+
+export const ignoreJsdoc = () => true;
+>ignoreJsdoc : { (): boolean; extra: number; }
+>() => true : { (): boolean; extra: number; }
+>true : true
+
+/** @type {string} make sure to ignore jsdoc! */
+ignoreJsdoc.extra = 111
+>ignoreJsdoc.extra = 111 : 111
+>ignoreJsdoc.extra : number
+>ignoreJsdoc : { (): boolean; extra: number; }
+>extra : number
+>111 : 111
+
diff --git a/tests/baselines/reference/propertyAssignmentUseParentType2.errors.txt b/tests/baselines/reference/propertyAssignmentUseParentType2.errors.txt
new file mode 100644
index 00000000000..b88e276b405
--- /dev/null
+++ b/tests/baselines/reference/propertyAssignmentUseParentType2.errors.txt
@@ -0,0 +1,24 @@
+tests/cases/conformance/salsa/propertyAssignmentUseParentType2.js(11,14): error TS2322: Type '{ (): boolean; nuo: 1000; }' is not assignable to type '{ (): boolean; nuo: 789; }'.
+  Types of property 'nuo' are incompatible.
+    Type '1000' is not assignable to type '789'.
+
+
+==== tests/cases/conformance/salsa/propertyAssignmentUseParentType2.js (1 errors) ====
+    /** @type {{ (): boolean; nuo: 789 }} */
+    export const inlined = () => true
+    inlined.nuo = 789
+    
+    /** @type {{ (): boolean; nuo: 789 }} */
+    export const duplicated = () => true
+    /** @type {789} */
+    duplicated.nuo = 789
+    
+    /** @type {{ (): boolean; nuo: 789 }} */
+    export const conflictingDuplicated = () => true
+                 ~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2322: Type '{ (): boolean; nuo: 1000; }' is not assignable to type '{ (): boolean; nuo: 789; }'.
+!!! error TS2322:   Types of property 'nuo' are incompatible.
+!!! error TS2322:     Type '1000' is not assignable to type '789'.
+    /** @type {1000} */
+    conflictingDuplicated.nuo = 789
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/propertyAssignmentUseParentType2.symbols b/tests/baselines/reference/propertyAssignmentUseParentType2.symbols
new file mode 100644
index 00000000000..93b8b9290da
--- /dev/null
+++ b/tests/baselines/reference/propertyAssignmentUseParentType2.symbols
@@ -0,0 +1,30 @@
+=== tests/cases/conformance/salsa/propertyAssignmentUseParentType2.js ===
+/** @type {{ (): boolean; nuo: 789 }} */
+export const inlined = () => true
+>inlined : Symbol(inlined, Decl(propertyAssignmentUseParentType2.js, 1, 12), Decl(propertyAssignmentUseParentType2.js, 1, 33))
+
+inlined.nuo = 789
+>inlined.nuo : Symbol(nuo, Decl(propertyAssignmentUseParentType2.js, 0, 25))
+>inlined : Symbol(inlined, Decl(propertyAssignmentUseParentType2.js, 1, 12), Decl(propertyAssignmentUseParentType2.js, 1, 33))
+>nuo : Symbol(nuo, Decl(propertyAssignmentUseParentType2.js, 0, 25))
+
+/** @type {{ (): boolean; nuo: 789 }} */
+export const duplicated = () => true
+>duplicated : Symbol(duplicated, Decl(propertyAssignmentUseParentType2.js, 5, 12), Decl(propertyAssignmentUseParentType2.js, 5, 36))
+
+/** @type {789} */
+duplicated.nuo = 789
+>duplicated.nuo : Symbol(nuo, Decl(propertyAssignmentUseParentType2.js, 4, 25))
+>duplicated : Symbol(duplicated, Decl(propertyAssignmentUseParentType2.js, 5, 12), Decl(propertyAssignmentUseParentType2.js, 5, 36))
+>nuo : Symbol(nuo, Decl(propertyAssignmentUseParentType2.js, 4, 25))
+
+/** @type {{ (): boolean; nuo: 789 }} */
+export const conflictingDuplicated = () => true
+>conflictingDuplicated : Symbol(conflictingDuplicated, Decl(propertyAssignmentUseParentType2.js, 10, 12), Decl(propertyAssignmentUseParentType2.js, 10, 47))
+
+/** @type {1000} */
+conflictingDuplicated.nuo = 789
+>conflictingDuplicated.nuo : Symbol(nuo, Decl(propertyAssignmentUseParentType2.js, 9, 25))
+>conflictingDuplicated : Symbol(conflictingDuplicated, Decl(propertyAssignmentUseParentType2.js, 10, 12), Decl(propertyAssignmentUseParentType2.js, 10, 47))
+>nuo : Symbol(nuo, Decl(propertyAssignmentUseParentType2.js, 9, 25))
+
diff --git a/tests/baselines/reference/propertyAssignmentUseParentType2.types b/tests/baselines/reference/propertyAssignmentUseParentType2.types
new file mode 100644
index 00000000000..24118a9ee73
--- /dev/null
+++ b/tests/baselines/reference/propertyAssignmentUseParentType2.types
@@ -0,0 +1,42 @@
+=== tests/cases/conformance/salsa/propertyAssignmentUseParentType2.js ===
+/** @type {{ (): boolean; nuo: 789 }} */
+export const inlined = () => true
+>inlined : { (): boolean; nuo: 789; }
+>() => true : { (): boolean; nuo: 789; }
+>true : true
+
+inlined.nuo = 789
+>inlined.nuo = 789 : 789
+>inlined.nuo : 789
+>inlined : { (): boolean; nuo: 789; }
+>nuo : 789
+>789 : 789
+
+/** @type {{ (): boolean; nuo: 789 }} */
+export const duplicated = () => true
+>duplicated : { (): boolean; nuo: 789; }
+>() => true : { (): boolean; nuo: 789; }
+>true : true
+
+/** @type {789} */
+duplicated.nuo = 789
+>duplicated.nuo = 789 : 789
+>duplicated.nuo : 789
+>duplicated : { (): boolean; nuo: 789; }
+>nuo : 789
+>789 : 789
+
+/** @type {{ (): boolean; nuo: 789 }} */
+export const conflictingDuplicated = () => true
+>conflictingDuplicated : { (): boolean; nuo: 789; }
+>() => true : { (): boolean; nuo: 1000; }
+>true : true
+
+/** @type {1000} */
+conflictingDuplicated.nuo = 789
+>conflictingDuplicated.nuo = 789 : 789
+>conflictingDuplicated.nuo : 789
+>conflictingDuplicated : { (): boolean; nuo: 789; }
+>nuo : 789
+>789 : 789
+
diff --git a/tests/cases/conformance/salsa/propertyAssignmentUseParentType1.ts b/tests/cases/conformance/salsa/propertyAssignmentUseParentType1.ts
new file mode 100644
index 00000000000..500ae6f2fe3
--- /dev/null
+++ b/tests/cases/conformance/salsa/propertyAssignmentUseParentType1.ts
@@ -0,0 +1,13 @@
+interface N {
+    (): boolean
+    num: 123;
+}
+export const interfaced: N = () => true;
+interfaced.num = 123;
+
+export const inlined: { (): boolean; nun: 456 } = () => true;
+inlined.nun = 456;
+
+export const ignoreJsdoc = () => true;
+/** @type {string} make sure to ignore jsdoc! */
+ignoreJsdoc.extra = 111
diff --git a/tests/cases/conformance/salsa/propertyAssignmentUseParentType2.ts b/tests/cases/conformance/salsa/propertyAssignmentUseParentType2.ts
new file mode 100644
index 00000000000..53696abbf81
--- /dev/null
+++ b/tests/cases/conformance/salsa/propertyAssignmentUseParentType2.ts
@@ -0,0 +1,18 @@
+// @allowJs: true
+// @checkJs: true
+// @noEmit: true
+// @Filename: propertyAssignmentUseParentType2.js
+
+/** @type {{ (): boolean; nuo: 789 }} */
+export const inlined = () => true
+inlined.nuo = 789
+
+/** @type {{ (): boolean; nuo: 789 }} */
+export const duplicated = () => true
+/** @type {789} */
+duplicated.nuo = 789
+
+/** @type {{ (): boolean; nuo: 789 }} */
+export const conflictingDuplicated = () => true
+/** @type {1000} */
+conflictingDuplicated.nuo = 789

From 35de142943ea867f302fc8318afa9e9f9bb7c0ad Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Thu, 25 Jul 2019 11:50:50 -0700
Subject: [PATCH 052/151] Accept new baselines

---
 ...nalNoInfiniteInstantiationDepth.errors.txt | 26 +++++++------------
 ...ferredInferenceAllowsAssignment.errors.txt | 26 +++++++------------
 2 files changed, 20 insertions(+), 32 deletions(-)

diff --git a/tests/baselines/reference/circularlyConstrainedMappedTypeContainingConditionalNoInfiniteInstantiationDepth.errors.txt b/tests/baselines/reference/circularlyConstrainedMappedTypeContainingConditionalNoInfiniteInstantiationDepth.errors.txt
index c7a323f1283..4fad6997145 100644
--- a/tests/baselines/reference/circularlyConstrainedMappedTypeContainingConditionalNoInfiniteInstantiationDepth.errors.txt
+++ b/tests/baselines/reference/circularlyConstrainedMappedTypeContainingConditionalNoInfiniteInstantiationDepth.errors.txt
@@ -45,14 +45,11 @@ tests/cases/compiler/circularlyConstrainedMappedTypeContainingConditionalNoInfin
                                                                                         Type 'TInjectedProps[string]' is not assignable to type 'TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : never'.
                                                                                           Type 'TInjectedProps[keyof TInjectedProps & keyof GetProps<C> & string] extends GetProps<C>[keyof TInjectedProps & keyof GetProps<C> & string] ? GetProps<C>[keyof TInjectedProps & keyof GetProps<C> & string] : TInjectedProps[keyof TInjectedProps & keyof GetProps<C> & string]' is not assignable to type 'TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : never'.
                                                                                             Type 'string extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & string] extends GetProps<C>[keyof TInjectedProps & string] ? GetProps<C>[keyof TInjectedProps & string] : TInjectedProps[keyof TInjectedProps & string] : GetProps<C>[string]' is not assignable to type '(TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : never) | undefined'.
-                                                                                              Type 'GetProps<C>[string] | (TInjectedProps[keyof TInjectedProps & string] extends GetProps<C>[keyof TInjectedProps & string] ? GetProps<C>[keyof TInjectedProps & string] : TInjectedProps[keyof TInjectedProps & string])' is not assignable to type '(TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : never) | undefined'.
-                                                                                                Type 'GetProps<C>[string]' is not assignable to type '(TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : never) | undefined'.
-                                                                                                  Type 'GetProps<C>[string]' is not assignable to type 'TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : never'.
-                                                                                                    Type 'string extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & string] extends GetProps<C>[keyof TInjectedProps & string] ? GetProps<C>[keyof TInjectedProps & string] : TInjectedProps[keyof TInjectedProps & string] : GetProps<C>[string]' is not assignable to type 'TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : never'.
-                                                                                                      Type 'keyof GetProps<C> & string extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & keyof GetProps<C> & string] extends GetProps<C>[keyof TInjectedProps & keyof GetProps<C> & string] ? GetProps<C>[keyof TInjectedProps & keyof GetProps<C> & string] : TInjectedProps[keyof TInjectedProps & keyof GetProps<C> & string] : GetProps<C>[keyof GetProps<C> & string]' is not assignable to type 'TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : never'.
-                                                                                                        Type 'Extract<string, keyof GetProps<C>> extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & Extract<string, keyof GetProps<C>>] extends GetProps<C>[keyof TInjectedProps & Extract<string, keyof GetProps<C>>] ? GetProps<C>[keyof TInjectedProps & Extract<string, keyof GetProps<C>>] : TInjectedProps[keyof TInjectedProps & Extract<string, keyof GetProps<C>>] : GetProps<C>[Extract<string, keyof GetProps<C>>]' is not assignable to type 'TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : never'.
-                                                                                                          Type 'Extract<keyof TInjectedProps, keyof GetProps<C>> extends keyof TInjectedProps ? TInjectedProps[Extract<keyof TInjectedProps, keyof GetProps<C>>] extends GetProps<C>[Extract<keyof TInjectedProps, keyof GetProps<C>>] ? GetProps<C>[Extract<keyof TInjectedProps, keyof GetProps<C>>] : TInjectedProps[Extract<keyof TInjectedProps, keyof GetProps<C>>] : GetProps<C>[Extract<keyof TInjectedProps, keyof GetProps<C>>]' is not assignable to type 'TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : never'.
-                                                                                                            Type 'P extends keyof TInjectedProps ? TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : TInjectedProps[P] : GetProps<C>[P]' is not assignable to type 'TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : never'.
+                                                                                              Type 'string extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & string] extends GetProps<C>[keyof TInjectedProps & string] ? GetProps<C>[keyof TInjectedProps & string] : TInjectedProps[keyof TInjectedProps & string] : GetProps<C>[string]' is not assignable to type 'TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : never'.
+                                                                                                Type 'keyof GetProps<C> & string extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & keyof GetProps<C> & string] extends GetProps<C>[keyof TInjectedProps & keyof GetProps<C> & string] ? GetProps<C>[keyof TInjectedProps & keyof GetProps<C> & string] : TInjectedProps[keyof TInjectedProps & keyof GetProps<C> & string] : GetProps<C>[keyof GetProps<C> & string]' is not assignable to type 'TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : never'.
+                                                                                                  Type 'Extract<string, keyof GetProps<C>> extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & Extract<string, keyof GetProps<C>>] extends GetProps<C>[keyof TInjectedProps & Extract<string, keyof GetProps<C>>] ? GetProps<C>[keyof TInjectedProps & Extract<string, keyof GetProps<C>>] : TInjectedProps[keyof TInjectedProps & Extract<string, keyof GetProps<C>>] : GetProps<C>[Extract<string, keyof GetProps<C>>]' is not assignable to type 'TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : never'.
+                                                                                                    Type 'Extract<keyof TInjectedProps, keyof GetProps<C>> extends keyof TInjectedProps ? TInjectedProps[Extract<keyof TInjectedProps, keyof GetProps<C>>] extends GetProps<C>[Extract<keyof TInjectedProps, keyof GetProps<C>>] ? GetProps<C>[Extract<keyof TInjectedProps, keyof GetProps<C>>] : TInjectedProps[Extract<keyof TInjectedProps, keyof GetProps<C>>] : GetProps<C>[Extract<keyof TInjectedProps, keyof GetProps<C>>]' is not assignable to type 'TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : never'.
+                                                                                                      Type 'P extends keyof TInjectedProps ? TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : TInjectedProps[P] : GetProps<C>[P]' is not assignable to type 'TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : never'.
 
 
 ==== tests/cases/compiler/circularlyConstrainedMappedTypeContainingConditionalNoInfiniteInstantiationDepth.ts (1 errors) ====
@@ -167,12 +164,9 @@ tests/cases/compiler/circularlyConstrainedMappedTypeContainingConditionalNoInfin
 !!! error TS2344:                                                                                         Type 'TInjectedProps[string]' is not assignable to type 'TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : never'.
 !!! error TS2344:                                                                                           Type 'TInjectedProps[keyof TInjectedProps & keyof GetProps<C> & string] extends GetProps<C>[keyof TInjectedProps & keyof GetProps<C> & string] ? GetProps<C>[keyof TInjectedProps & keyof GetProps<C> & string] : TInjectedProps[keyof TInjectedProps & keyof GetProps<C> & string]' is not assignable to type 'TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : never'.
 !!! error TS2344:                                                                                             Type 'string extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & string] extends GetProps<C>[keyof TInjectedProps & string] ? GetProps<C>[keyof TInjectedProps & string] : TInjectedProps[keyof TInjectedProps & string] : GetProps<C>[string]' is not assignable to type '(TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : never) | undefined'.
-!!! error TS2344:                                                                                               Type 'GetProps<C>[string] | (TInjectedProps[keyof TInjectedProps & string] extends GetProps<C>[keyof TInjectedProps & string] ? GetProps<C>[keyof TInjectedProps & string] : TInjectedProps[keyof TInjectedProps & string])' is not assignable to type '(TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : never) | undefined'.
-!!! error TS2344:                                                                                                 Type 'GetProps<C>[string]' is not assignable to type '(TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : never) | undefined'.
-!!! error TS2344:                                                                                                   Type 'GetProps<C>[string]' is not assignable to type 'TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : never'.
-!!! error TS2344:                                                                                                     Type 'string extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & string] extends GetProps<C>[keyof TInjectedProps & string] ? GetProps<C>[keyof TInjectedProps & string] : TInjectedProps[keyof TInjectedProps & string] : GetProps<C>[string]' is not assignable to type 'TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : never'.
-!!! error TS2344:                                                                                                       Type 'keyof GetProps<C> & string extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & keyof GetProps<C> & string] extends GetProps<C>[keyof TInjectedProps & keyof GetProps<C> & string] ? GetProps<C>[keyof TInjectedProps & keyof GetProps<C> & string] : TInjectedProps[keyof TInjectedProps & keyof GetProps<C> & string] : GetProps<C>[keyof GetProps<C> & string]' is not assignable to type 'TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : never'.
-!!! error TS2344:                                                                                                         Type 'Extract<string, keyof GetProps<C>> extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & Extract<string, keyof GetProps<C>>] extends GetProps<C>[keyof TInjectedProps & Extract<string, keyof GetProps<C>>] ? GetProps<C>[keyof TInjectedProps & Extract<string, keyof GetProps<C>>] : TInjectedProps[keyof TInjectedProps & Extract<string, keyof GetProps<C>>] : GetProps<C>[Extract<string, keyof GetProps<C>>]' is not assignable to type 'TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : never'.
-!!! error TS2344:                                                                                                           Type 'Extract<keyof TInjectedProps, keyof GetProps<C>> extends keyof TInjectedProps ? TInjectedProps[Extract<keyof TInjectedProps, keyof GetProps<C>>] extends GetProps<C>[Extract<keyof TInjectedProps, keyof GetProps<C>>] ? GetProps<C>[Extract<keyof TInjectedProps, keyof GetProps<C>>] : TInjectedProps[Extract<keyof TInjectedProps, keyof GetProps<C>>] : GetProps<C>[Extract<keyof TInjectedProps, keyof GetProps<C>>]' is not assignable to type 'TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : never'.
-!!! error TS2344:                                                                                                             Type 'P extends keyof TInjectedProps ? TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : TInjectedProps[P] : GetProps<C>[P]' is not assignable to type 'TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : never'.
+!!! error TS2344:                                                                                               Type 'string extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & string] extends GetProps<C>[keyof TInjectedProps & string] ? GetProps<C>[keyof TInjectedProps & string] : TInjectedProps[keyof TInjectedProps & string] : GetProps<C>[string]' is not assignable to type 'TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : never'.
+!!! error TS2344:                                                                                                 Type 'keyof GetProps<C> & string extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & keyof GetProps<C> & string] extends GetProps<C>[keyof TInjectedProps & keyof GetProps<C> & string] ? GetProps<C>[keyof TInjectedProps & keyof GetProps<C> & string] : TInjectedProps[keyof TInjectedProps & keyof GetProps<C> & string] : GetProps<C>[keyof GetProps<C> & string]' is not assignable to type 'TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : never'.
+!!! error TS2344:                                                                                                   Type 'Extract<string, keyof GetProps<C>> extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & Extract<string, keyof GetProps<C>>] extends GetProps<C>[keyof TInjectedProps & Extract<string, keyof GetProps<C>>] ? GetProps<C>[keyof TInjectedProps & Extract<string, keyof GetProps<C>>] : TInjectedProps[keyof TInjectedProps & Extract<string, keyof GetProps<C>>] : GetProps<C>[Extract<string, keyof GetProps<C>>]' is not assignable to type 'TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : never'.
+!!! error TS2344:                                                                                                     Type 'Extract<keyof TInjectedProps, keyof GetProps<C>> extends keyof TInjectedProps ? TInjectedProps[Extract<keyof TInjectedProps, keyof GetProps<C>>] extends GetProps<C>[Extract<keyof TInjectedProps, keyof GetProps<C>>] ? GetProps<C>[Extract<keyof TInjectedProps, keyof GetProps<C>>] : TInjectedProps[Extract<keyof TInjectedProps, keyof GetProps<C>>] : GetProps<C>[Extract<keyof TInjectedProps, keyof GetProps<C>>]' is not assignable to type 'TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : never'.
+!!! error TS2344:                                                                                                       Type 'P extends keyof TInjectedProps ? TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : TInjectedProps[P] : GetProps<C>[P]' is not assignable to type 'TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : never'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/reactReduxLikeDeferredInferenceAllowsAssignment.errors.txt b/tests/baselines/reference/reactReduxLikeDeferredInferenceAllowsAssignment.errors.txt
index 0556ae25c91..0acfd4a8365 100644
--- a/tests/baselines/reference/reactReduxLikeDeferredInferenceAllowsAssignment.errors.txt
+++ b/tests/baselines/reference/reactReduxLikeDeferredInferenceAllowsAssignment.errors.txt
@@ -45,14 +45,11 @@ tests/cases/compiler/reactReduxLikeDeferredInferenceAllowsAssignment.ts(76,50):
                                                                                         Type 'TInjectedProps[string]' is not assignable to type 'TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : never'.
                                                                                           Type 'TInjectedProps[keyof TInjectedProps & keyof GetProps<C> & string] extends GetProps<C>[keyof TInjectedProps & keyof GetProps<C> & string] ? GetProps<C>[keyof TInjectedProps & keyof GetProps<C> & string] : TInjectedProps[keyof TInjectedProps & keyof GetProps<C> & string]' is not assignable to type 'TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : never'.
                                                                                             Type 'string extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & string] extends GetProps<C>[keyof TInjectedProps & string] ? GetProps<C>[keyof TInjectedProps & string] : TInjectedProps[keyof TInjectedProps & string] : GetProps<C>[string]' is not assignable to type '(TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : never) | undefined'.
-                                                                                              Type 'GetProps<C>[string] | (TInjectedProps[keyof TInjectedProps & string] extends GetProps<C>[keyof TInjectedProps & string] ? GetProps<C>[keyof TInjectedProps & string] : TInjectedProps[keyof TInjectedProps & string])' is not assignable to type '(TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : never) | undefined'.
-                                                                                                Type 'GetProps<C>[string]' is not assignable to type '(TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : never) | undefined'.
-                                                                                                  Type 'GetProps<C>[string]' is not assignable to type 'TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : never'.
-                                                                                                    Type 'string extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & string] extends GetProps<C>[keyof TInjectedProps & string] ? GetProps<C>[keyof TInjectedProps & string] : TInjectedProps[keyof TInjectedProps & string] : GetProps<C>[string]' is not assignable to type 'TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : never'.
-                                                                                                      Type 'keyof GetProps<C> & string extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & keyof GetProps<C> & string] extends GetProps<C>[keyof TInjectedProps & keyof GetProps<C> & string] ? GetProps<C>[keyof TInjectedProps & keyof GetProps<C> & string] : TInjectedProps[keyof TInjectedProps & keyof GetProps<C> & string] : GetProps<C>[keyof GetProps<C> & string]' is not assignable to type 'TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : never'.
-                                                                                                        Type 'Extract<string, keyof GetProps<C>> extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & Extract<string, keyof GetProps<C>>] extends GetProps<C>[keyof TInjectedProps & Extract<string, keyof GetProps<C>>] ? GetProps<C>[keyof TInjectedProps & Extract<string, keyof GetProps<C>>] : TInjectedProps[keyof TInjectedProps & Extract<string, keyof GetProps<C>>] : GetProps<C>[Extract<string, keyof GetProps<C>>]' is not assignable to type 'TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : never'.
-                                                                                                          Type 'Extract<keyof TInjectedProps, keyof GetProps<C>> extends keyof TInjectedProps ? TInjectedProps[Extract<keyof TInjectedProps, keyof GetProps<C>>] extends GetProps<C>[Extract<keyof TInjectedProps, keyof GetProps<C>>] ? GetProps<C>[Extract<keyof TInjectedProps, keyof GetProps<C>>] : TInjectedProps[Extract<keyof TInjectedProps, keyof GetProps<C>>] : GetProps<C>[Extract<keyof TInjectedProps, keyof GetProps<C>>]' is not assignable to type 'TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : never'.
-                                                                                                            Type 'P extends keyof TInjectedProps ? TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : TInjectedProps[P] : GetProps<C>[P]' is not assignable to type 'TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : never'.
+                                                                                              Type 'string extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & string] extends GetProps<C>[keyof TInjectedProps & string] ? GetProps<C>[keyof TInjectedProps & string] : TInjectedProps[keyof TInjectedProps & string] : GetProps<C>[string]' is not assignable to type 'TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : never'.
+                                                                                                Type 'keyof GetProps<C> & string extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & keyof GetProps<C> & string] extends GetProps<C>[keyof TInjectedProps & keyof GetProps<C> & string] ? GetProps<C>[keyof TInjectedProps & keyof GetProps<C> & string] : TInjectedProps[keyof TInjectedProps & keyof GetProps<C> & string] : GetProps<C>[keyof GetProps<C> & string]' is not assignable to type 'TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : never'.
+                                                                                                  Type 'Extract<string, keyof GetProps<C>> extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & Extract<string, keyof GetProps<C>>] extends GetProps<C>[keyof TInjectedProps & Extract<string, keyof GetProps<C>>] ? GetProps<C>[keyof TInjectedProps & Extract<string, keyof GetProps<C>>] : TInjectedProps[keyof TInjectedProps & Extract<string, keyof GetProps<C>>] : GetProps<C>[Extract<string, keyof GetProps<C>>]' is not assignable to type 'TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : never'.
+                                                                                                    Type 'Extract<keyof TInjectedProps, keyof GetProps<C>> extends keyof TInjectedProps ? TInjectedProps[Extract<keyof TInjectedProps, keyof GetProps<C>>] extends GetProps<C>[Extract<keyof TInjectedProps, keyof GetProps<C>>] ? GetProps<C>[Extract<keyof TInjectedProps, keyof GetProps<C>>] : TInjectedProps[Extract<keyof TInjectedProps, keyof GetProps<C>>] : GetProps<C>[Extract<keyof TInjectedProps, keyof GetProps<C>>]' is not assignable to type 'TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : never'.
+                                                                                                      Type 'P extends keyof TInjectedProps ? TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : TInjectedProps[P] : GetProps<C>[P]' is not assignable to type 'TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : never'.
 
 
 ==== tests/cases/compiler/reactReduxLikeDeferredInferenceAllowsAssignment.ts (1 errors) ====
@@ -180,14 +177,11 @@ tests/cases/compiler/reactReduxLikeDeferredInferenceAllowsAssignment.ts(76,50):
 !!! error TS2344:                                                                                         Type 'TInjectedProps[string]' is not assignable to type 'TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : never'.
 !!! error TS2344:                                                                                           Type 'TInjectedProps[keyof TInjectedProps & keyof GetProps<C> & string] extends GetProps<C>[keyof TInjectedProps & keyof GetProps<C> & string] ? GetProps<C>[keyof TInjectedProps & keyof GetProps<C> & string] : TInjectedProps[keyof TInjectedProps & keyof GetProps<C> & string]' is not assignable to type 'TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : never'.
 !!! error TS2344:                                                                                             Type 'string extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & string] extends GetProps<C>[keyof TInjectedProps & string] ? GetProps<C>[keyof TInjectedProps & string] : TInjectedProps[keyof TInjectedProps & string] : GetProps<C>[string]' is not assignable to type '(TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : never) | undefined'.
-!!! error TS2344:                                                                                               Type 'GetProps<C>[string] | (TInjectedProps[keyof TInjectedProps & string] extends GetProps<C>[keyof TInjectedProps & string] ? GetProps<C>[keyof TInjectedProps & string] : TInjectedProps[keyof TInjectedProps & string])' is not assignable to type '(TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : never) | undefined'.
-!!! error TS2344:                                                                                                 Type 'GetProps<C>[string]' is not assignable to type '(TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : never) | undefined'.
-!!! error TS2344:                                                                                                   Type 'GetProps<C>[string]' is not assignable to type 'TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : never'.
-!!! error TS2344:                                                                                                     Type 'string extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & string] extends GetProps<C>[keyof TInjectedProps & string] ? GetProps<C>[keyof TInjectedProps & string] : TInjectedProps[keyof TInjectedProps & string] : GetProps<C>[string]' is not assignable to type 'TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : never'.
-!!! error TS2344:                                                                                                       Type 'keyof GetProps<C> & string extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & keyof GetProps<C> & string] extends GetProps<C>[keyof TInjectedProps & keyof GetProps<C> & string] ? GetProps<C>[keyof TInjectedProps & keyof GetProps<C> & string] : TInjectedProps[keyof TInjectedProps & keyof GetProps<C> & string] : GetProps<C>[keyof GetProps<C> & string]' is not assignable to type 'TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : never'.
-!!! error TS2344:                                                                                                         Type 'Extract<string, keyof GetProps<C>> extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & Extract<string, keyof GetProps<C>>] extends GetProps<C>[keyof TInjectedProps & Extract<string, keyof GetProps<C>>] ? GetProps<C>[keyof TInjectedProps & Extract<string, keyof GetProps<C>>] : TInjectedProps[keyof TInjectedProps & Extract<string, keyof GetProps<C>>] : GetProps<C>[Extract<string, keyof GetProps<C>>]' is not assignable to type 'TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : never'.
-!!! error TS2344:                                                                                                           Type 'Extract<keyof TInjectedProps, keyof GetProps<C>> extends keyof TInjectedProps ? TInjectedProps[Extract<keyof TInjectedProps, keyof GetProps<C>>] extends GetProps<C>[Extract<keyof TInjectedProps, keyof GetProps<C>>] ? GetProps<C>[Extract<keyof TInjectedProps, keyof GetProps<C>>] : TInjectedProps[Extract<keyof TInjectedProps, keyof GetProps<C>>] : GetProps<C>[Extract<keyof TInjectedProps, keyof GetProps<C>>]' is not assignable to type 'TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : never'.
-!!! error TS2344:                                                                                                             Type 'P extends keyof TInjectedProps ? TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : TInjectedProps[P] : GetProps<C>[P]' is not assignable to type 'TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : never'.
+!!! error TS2344:                                                                                               Type 'string extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & string] extends GetProps<C>[keyof TInjectedProps & string] ? GetProps<C>[keyof TInjectedProps & string] : TInjectedProps[keyof TInjectedProps & string] : GetProps<C>[string]' is not assignable to type 'TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : never'.
+!!! error TS2344:                                                                                                 Type 'keyof GetProps<C> & string extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & keyof GetProps<C> & string] extends GetProps<C>[keyof TInjectedProps & keyof GetProps<C> & string] ? GetProps<C>[keyof TInjectedProps & keyof GetProps<C> & string] : TInjectedProps[keyof TInjectedProps & keyof GetProps<C> & string] : GetProps<C>[keyof GetProps<C> & string]' is not assignable to type 'TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : never'.
+!!! error TS2344:                                                                                                   Type 'Extract<string, keyof GetProps<C>> extends keyof TInjectedProps ? TInjectedProps[keyof TInjectedProps & Extract<string, keyof GetProps<C>>] extends GetProps<C>[keyof TInjectedProps & Extract<string, keyof GetProps<C>>] ? GetProps<C>[keyof TInjectedProps & Extract<string, keyof GetProps<C>>] : TInjectedProps[keyof TInjectedProps & Extract<string, keyof GetProps<C>>] : GetProps<C>[Extract<string, keyof GetProps<C>>]' is not assignable to type 'TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : never'.
+!!! error TS2344:                                                                                                     Type 'Extract<keyof TInjectedProps, keyof GetProps<C>> extends keyof TInjectedProps ? TInjectedProps[Extract<keyof TInjectedProps, keyof GetProps<C>>] extends GetProps<C>[Extract<keyof TInjectedProps, keyof GetProps<C>>] ? GetProps<C>[Extract<keyof TInjectedProps, keyof GetProps<C>>] : TInjectedProps[Extract<keyof TInjectedProps, keyof GetProps<C>>] : GetProps<C>[Extract<keyof TInjectedProps, keyof GetProps<C>>]' is not assignable to type 'TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : never'.
+!!! error TS2344:                                                                                                       Type 'P extends keyof TInjectedProps ? TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : TInjectedProps[P] : GetProps<C>[P]' is not assignable to type 'TInjectedProps[P] extends GetProps<C>[P] ? GetProps<C>[P] : never'.
     >;
     
     declare const connect: {

From b9d27c0f2ce5df82b8899aca94ed752b626978b0 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Thu, 25 Jul 2019 11:52:08 -0700
Subject: [PATCH 053/151] Add regression tests

---
 .../unionAndIntersectionInference3.ts         | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/tests/cases/conformance/types/typeRelationships/typeInference/unionAndIntersectionInference3.ts b/tests/cases/conformance/types/typeRelationships/typeInference/unionAndIntersectionInference3.ts
index aad083a626b..17057de2b84 100644
--- a/tests/cases/conformance/types/typeRelationships/typeInference/unionAndIntersectionInference3.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeInference/unionAndIntersectionInference3.ts
@@ -1,7 +1,42 @@
 // @strict: true
+// @target: esnext
 
 // Repro from #30720
 
 type Maybe<T> = T | undefined;
 declare function concatMaybe<T>(...args: (Maybe<T> | Maybe<T>[])[]): T[];
 concatMaybe([1, 2, 3], 4);
+
+// Repros from #32247
+
+const g: <U, R, S>(com: () => Iterator<S, U, R> | AsyncIterator<S, U, R>) => Promise<U> = async <U, R, S>(com: () => Iterator<S, U, R> | AsyncIterator<S, U, R>): Promise<U> => {
+  throw com;
+};
+
+interface Foo1<T> {
+    test(value: T): void;
+}
+
+interface Bar1<T> {
+    test(value: T | PromiseLike<T>): void;
+}
+
+declare let f1: <T>(x: Foo1<T> | Bar1<T>) => Promise<T>;
+declare let f2: <U>(x: Foo1<U> | Bar1<U>) => Promise<U>;
+
+f1 = f2;
+f2 = f1;
+
+type Foo2<T> = {
+    test(value: T): void;
+}
+
+type Bar2<T> = {
+    test(value: T | PromiseLike<T>): void;
+}
+
+declare let g1: <T>(x: Foo2<T> | Bar2<T>) => Promise<T>;
+declare let g2: <U>(x: Foo2<U> | Bar2<U>) => Promise<U>;
+
+g1 = g2;
+g2 = g1;

From 540134840da0acea39f103b12719392c41b9a67d Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Thu, 25 Jul 2019 11:52:15 -0700
Subject: [PATCH 054/151] Accept new baselines

---
 .../unionAndIntersectionInference3.js         |  42 ++++++
 .../unionAndIntersectionInference3.symbols    | 142 ++++++++++++++++++
 .../unionAndIntersectionInference3.types      |  77 ++++++++++
 3 files changed, 261 insertions(+)

diff --git a/tests/baselines/reference/unionAndIntersectionInference3.js b/tests/baselines/reference/unionAndIntersectionInference3.js
index 4cc0c2f667e..c9f5cffa1f7 100644
--- a/tests/baselines/reference/unionAndIntersectionInference3.js
+++ b/tests/baselines/reference/unionAndIntersectionInference3.js
@@ -4,9 +4,51 @@
 type Maybe<T> = T | undefined;
 declare function concatMaybe<T>(...args: (Maybe<T> | Maybe<T>[])[]): T[];
 concatMaybe([1, 2, 3], 4);
+
+// Repros from #32247
+
+const g: <U, R, S>(com: () => Iterator<S, U, R> | AsyncIterator<S, U, R>) => Promise<U> = async <U, R, S>(com: () => Iterator<S, U, R> | AsyncIterator<S, U, R>): Promise<U> => {
+  throw com;
+};
+
+interface Foo1<T> {
+    test(value: T): void;
+}
+
+interface Bar1<T> {
+    test(value: T | PromiseLike<T>): void;
+}
+
+declare let f1: <T>(x: Foo1<T> | Bar1<T>) => Promise<T>;
+declare let f2: <U>(x: Foo1<U> | Bar1<U>) => Promise<U>;
+
+f1 = f2;
+f2 = f1;
+
+type Foo2<T> = {
+    test(value: T): void;
+}
+
+type Bar2<T> = {
+    test(value: T | PromiseLike<T>): void;
+}
+
+declare let g1: <T>(x: Foo2<T> | Bar2<T>) => Promise<T>;
+declare let g2: <U>(x: Foo2<U> | Bar2<U>) => Promise<U>;
+
+g1 = g2;
+g2 = g1;
 
 
 //// [unionAndIntersectionInference3.js]
 "use strict";
 // Repro from #30720
 concatMaybe([1, 2, 3], 4);
+// Repros from #32247
+const g = async (com) => {
+    throw com;
+};
+f1 = f2;
+f2 = f1;
+g1 = g2;
+g2 = g1;
diff --git a/tests/baselines/reference/unionAndIntersectionInference3.symbols b/tests/baselines/reference/unionAndIntersectionInference3.symbols
index be24bc0cc77..b854ee1ce42 100644
--- a/tests/baselines/reference/unionAndIntersectionInference3.symbols
+++ b/tests/baselines/reference/unionAndIntersectionInference3.symbols
@@ -19,3 +19,145 @@ declare function concatMaybe<T>(...args: (Maybe<T> | Maybe<T>[])[]): T[];
 concatMaybe([1, 2, 3], 4);
 >concatMaybe : Symbol(concatMaybe, Decl(unionAndIntersectionInference3.ts, 2, 30))
 
+// Repros from #32247
+
+const g: <U, R, S>(com: () => Iterator<S, U, R> | AsyncIterator<S, U, R>) => Promise<U> = async <U, R, S>(com: () => Iterator<S, U, R> | AsyncIterator<S, U, R>): Promise<U> => {
+>g : Symbol(g, Decl(unionAndIntersectionInference3.ts, 8, 5))
+>U : Symbol(U, Decl(unionAndIntersectionInference3.ts, 8, 10))
+>R : Symbol(R, Decl(unionAndIntersectionInference3.ts, 8, 12))
+>S : Symbol(S, Decl(unionAndIntersectionInference3.ts, 8, 15))
+>com : Symbol(com, Decl(unionAndIntersectionInference3.ts, 8, 19))
+>Iterator : Symbol(Iterator, Decl(lib.es2015.iterable.d.ts, --, --))
+>S : Symbol(S, Decl(unionAndIntersectionInference3.ts, 8, 15))
+>U : Symbol(U, Decl(unionAndIntersectionInference3.ts, 8, 10))
+>R : Symbol(R, Decl(unionAndIntersectionInference3.ts, 8, 12))
+>AsyncIterator : Symbol(AsyncIterator, Decl(lib.es2018.asynciterable.d.ts, --, --))
+>S : Symbol(S, Decl(unionAndIntersectionInference3.ts, 8, 15))
+>U : Symbol(U, Decl(unionAndIntersectionInference3.ts, 8, 10))
+>R : Symbol(R, Decl(unionAndIntersectionInference3.ts, 8, 12))
+>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2018.promise.d.ts, --, --))
+>U : Symbol(U, Decl(unionAndIntersectionInference3.ts, 8, 10))
+>U : Symbol(U, Decl(unionAndIntersectionInference3.ts, 8, 97))
+>R : Symbol(R, Decl(unionAndIntersectionInference3.ts, 8, 99))
+>S : Symbol(S, Decl(unionAndIntersectionInference3.ts, 8, 102))
+>com : Symbol(com, Decl(unionAndIntersectionInference3.ts, 8, 106))
+>Iterator : Symbol(Iterator, Decl(lib.es2015.iterable.d.ts, --, --))
+>S : Symbol(S, Decl(unionAndIntersectionInference3.ts, 8, 102))
+>U : Symbol(U, Decl(unionAndIntersectionInference3.ts, 8, 97))
+>R : Symbol(R, Decl(unionAndIntersectionInference3.ts, 8, 99))
+>AsyncIterator : Symbol(AsyncIterator, Decl(lib.es2018.asynciterable.d.ts, --, --))
+>S : Symbol(S, Decl(unionAndIntersectionInference3.ts, 8, 102))
+>U : Symbol(U, Decl(unionAndIntersectionInference3.ts, 8, 97))
+>R : Symbol(R, Decl(unionAndIntersectionInference3.ts, 8, 99))
+>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2018.promise.d.ts, --, --))
+>U : Symbol(U, Decl(unionAndIntersectionInference3.ts, 8, 97))
+
+  throw com;
+>com : Symbol(com, Decl(unionAndIntersectionInference3.ts, 8, 106))
+
+};
+
+interface Foo1<T> {
+>Foo1 : Symbol(Foo1, Decl(unionAndIntersectionInference3.ts, 10, 2))
+>T : Symbol(T, Decl(unionAndIntersectionInference3.ts, 12, 15))
+
+    test(value: T): void;
+>test : Symbol(Foo1.test, Decl(unionAndIntersectionInference3.ts, 12, 19))
+>value : Symbol(value, Decl(unionAndIntersectionInference3.ts, 13, 9))
+>T : Symbol(T, Decl(unionAndIntersectionInference3.ts, 12, 15))
+}
+
+interface Bar1<T> {
+>Bar1 : Symbol(Bar1, Decl(unionAndIntersectionInference3.ts, 14, 1))
+>T : Symbol(T, Decl(unionAndIntersectionInference3.ts, 16, 15))
+
+    test(value: T | PromiseLike<T>): void;
+>test : Symbol(Bar1.test, Decl(unionAndIntersectionInference3.ts, 16, 19))
+>value : Symbol(value, Decl(unionAndIntersectionInference3.ts, 17, 9))
+>T : Symbol(T, Decl(unionAndIntersectionInference3.ts, 16, 15))
+>PromiseLike : Symbol(PromiseLike, Decl(lib.es5.d.ts, --, --))
+>T : Symbol(T, Decl(unionAndIntersectionInference3.ts, 16, 15))
+}
+
+declare let f1: <T>(x: Foo1<T> | Bar1<T>) => Promise<T>;
+>f1 : Symbol(f1, Decl(unionAndIntersectionInference3.ts, 20, 11))
+>T : Symbol(T, Decl(unionAndIntersectionInference3.ts, 20, 17))
+>x : Symbol(x, Decl(unionAndIntersectionInference3.ts, 20, 20))
+>Foo1 : Symbol(Foo1, Decl(unionAndIntersectionInference3.ts, 10, 2))
+>T : Symbol(T, Decl(unionAndIntersectionInference3.ts, 20, 17))
+>Bar1 : Symbol(Bar1, Decl(unionAndIntersectionInference3.ts, 14, 1))
+>T : Symbol(T, Decl(unionAndIntersectionInference3.ts, 20, 17))
+>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2018.promise.d.ts, --, --))
+>T : Symbol(T, Decl(unionAndIntersectionInference3.ts, 20, 17))
+
+declare let f2: <U>(x: Foo1<U> | Bar1<U>) => Promise<U>;
+>f2 : Symbol(f2, Decl(unionAndIntersectionInference3.ts, 21, 11))
+>U : Symbol(U, Decl(unionAndIntersectionInference3.ts, 21, 17))
+>x : Symbol(x, Decl(unionAndIntersectionInference3.ts, 21, 20))
+>Foo1 : Symbol(Foo1, Decl(unionAndIntersectionInference3.ts, 10, 2))
+>U : Symbol(U, Decl(unionAndIntersectionInference3.ts, 21, 17))
+>Bar1 : Symbol(Bar1, Decl(unionAndIntersectionInference3.ts, 14, 1))
+>U : Symbol(U, Decl(unionAndIntersectionInference3.ts, 21, 17))
+>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2018.promise.d.ts, --, --))
+>U : Symbol(U, Decl(unionAndIntersectionInference3.ts, 21, 17))
+
+f1 = f2;
+>f1 : Symbol(f1, Decl(unionAndIntersectionInference3.ts, 20, 11))
+>f2 : Symbol(f2, Decl(unionAndIntersectionInference3.ts, 21, 11))
+
+f2 = f1;
+>f2 : Symbol(f2, Decl(unionAndIntersectionInference3.ts, 21, 11))
+>f1 : Symbol(f1, Decl(unionAndIntersectionInference3.ts, 20, 11))
+
+type Foo2<T> = {
+>Foo2 : Symbol(Foo2, Decl(unionAndIntersectionInference3.ts, 24, 8))
+>T : Symbol(T, Decl(unionAndIntersectionInference3.ts, 26, 10))
+
+    test(value: T): void;
+>test : Symbol(test, Decl(unionAndIntersectionInference3.ts, 26, 16))
+>value : Symbol(value, Decl(unionAndIntersectionInference3.ts, 27, 9))
+>T : Symbol(T, Decl(unionAndIntersectionInference3.ts, 26, 10))
+}
+
+type Bar2<T> = {
+>Bar2 : Symbol(Bar2, Decl(unionAndIntersectionInference3.ts, 28, 1))
+>T : Symbol(T, Decl(unionAndIntersectionInference3.ts, 30, 10))
+
+    test(value: T | PromiseLike<T>): void;
+>test : Symbol(test, Decl(unionAndIntersectionInference3.ts, 30, 16))
+>value : Symbol(value, Decl(unionAndIntersectionInference3.ts, 31, 9))
+>T : Symbol(T, Decl(unionAndIntersectionInference3.ts, 30, 10))
+>PromiseLike : Symbol(PromiseLike, Decl(lib.es5.d.ts, --, --))
+>T : Symbol(T, Decl(unionAndIntersectionInference3.ts, 30, 10))
+}
+
+declare let g1: <T>(x: Foo2<T> | Bar2<T>) => Promise<T>;
+>g1 : Symbol(g1, Decl(unionAndIntersectionInference3.ts, 34, 11))
+>T : Symbol(T, Decl(unionAndIntersectionInference3.ts, 34, 17))
+>x : Symbol(x, Decl(unionAndIntersectionInference3.ts, 34, 20))
+>Foo2 : Symbol(Foo2, Decl(unionAndIntersectionInference3.ts, 24, 8))
+>T : Symbol(T, Decl(unionAndIntersectionInference3.ts, 34, 17))
+>Bar2 : Symbol(Bar2, Decl(unionAndIntersectionInference3.ts, 28, 1))
+>T : Symbol(T, Decl(unionAndIntersectionInference3.ts, 34, 17))
+>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2018.promise.d.ts, --, --))
+>T : Symbol(T, Decl(unionAndIntersectionInference3.ts, 34, 17))
+
+declare let g2: <U>(x: Foo2<U> | Bar2<U>) => Promise<U>;
+>g2 : Symbol(g2, Decl(unionAndIntersectionInference3.ts, 35, 11))
+>U : Symbol(U, Decl(unionAndIntersectionInference3.ts, 35, 17))
+>x : Symbol(x, Decl(unionAndIntersectionInference3.ts, 35, 20))
+>Foo2 : Symbol(Foo2, Decl(unionAndIntersectionInference3.ts, 24, 8))
+>U : Symbol(U, Decl(unionAndIntersectionInference3.ts, 35, 17))
+>Bar2 : Symbol(Bar2, Decl(unionAndIntersectionInference3.ts, 28, 1))
+>U : Symbol(U, Decl(unionAndIntersectionInference3.ts, 35, 17))
+>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2018.promise.d.ts, --, --))
+>U : Symbol(U, Decl(unionAndIntersectionInference3.ts, 35, 17))
+
+g1 = g2;
+>g1 : Symbol(g1, Decl(unionAndIntersectionInference3.ts, 34, 11))
+>g2 : Symbol(g2, Decl(unionAndIntersectionInference3.ts, 35, 11))
+
+g2 = g1;
+>g2 : Symbol(g2, Decl(unionAndIntersectionInference3.ts, 35, 11))
+>g1 : Symbol(g1, Decl(unionAndIntersectionInference3.ts, 34, 11))
+
diff --git a/tests/baselines/reference/unionAndIntersectionInference3.types b/tests/baselines/reference/unionAndIntersectionInference3.types
index 8497cb1e516..acbca0a1eae 100644
--- a/tests/baselines/reference/unionAndIntersectionInference3.types
+++ b/tests/baselines/reference/unionAndIntersectionInference3.types
@@ -17,3 +17,80 @@ concatMaybe([1, 2, 3], 4);
 >3 : 3
 >4 : 4
 
+// Repros from #32247
+
+const g: <U, R, S>(com: () => Iterator<S, U, R> | AsyncIterator<S, U, R>) => Promise<U> = async <U, R, S>(com: () => Iterator<S, U, R> | AsyncIterator<S, U, R>): Promise<U> => {
+>g : <U, R, S>(com: () => Iterator<S, U, R> | AsyncIterator<S, U, R>) => Promise<U>
+>com : () => Iterator<S, U, R> | AsyncIterator<S, U, R>
+>async <U, R, S>(com: () => Iterator<S, U, R> | AsyncIterator<S, U, R>): Promise<U> => {  throw com;} : <U, R, S>(com: () => Iterator<S, U, R> | AsyncIterator<S, U, R>) => Promise<U>
+>com : () => Iterator<S, U, R> | AsyncIterator<S, U, R>
+
+  throw com;
+>com : () => Iterator<S, U, R> | AsyncIterator<S, U, R>
+
+};
+
+interface Foo1<T> {
+    test(value: T): void;
+>test : (value: T) => void
+>value : T
+}
+
+interface Bar1<T> {
+    test(value: T | PromiseLike<T>): void;
+>test : (value: T | PromiseLike<T>) => void
+>value : T | PromiseLike<T>
+}
+
+declare let f1: <T>(x: Foo1<T> | Bar1<T>) => Promise<T>;
+>f1 : <T>(x: Foo1<T> | Bar1<T>) => Promise<T>
+>x : Foo1<T> | Bar1<T>
+
+declare let f2: <U>(x: Foo1<U> | Bar1<U>) => Promise<U>;
+>f2 : <U>(x: Foo1<U> | Bar1<U>) => Promise<U>
+>x : Foo1<U> | Bar1<U>
+
+f1 = f2;
+>f1 = f2 : <U>(x: Foo1<U> | Bar1<U>) => Promise<U>
+>f1 : <T>(x: Foo1<T> | Bar1<T>) => Promise<T>
+>f2 : <U>(x: Foo1<U> | Bar1<U>) => Promise<U>
+
+f2 = f1;
+>f2 = f1 : <T>(x: Foo1<T> | Bar1<T>) => Promise<T>
+>f2 : <U>(x: Foo1<U> | Bar1<U>) => Promise<U>
+>f1 : <T>(x: Foo1<T> | Bar1<T>) => Promise<T>
+
+type Foo2<T> = {
+>Foo2 : Foo2<T>
+
+    test(value: T): void;
+>test : (value: T) => void
+>value : T
+}
+
+type Bar2<T> = {
+>Bar2 : Bar2<T>
+
+    test(value: T | PromiseLike<T>): void;
+>test : (value: T | PromiseLike<T>) => void
+>value : T | PromiseLike<T>
+}
+
+declare let g1: <T>(x: Foo2<T> | Bar2<T>) => Promise<T>;
+>g1 : <T>(x: Foo2<T> | Bar2<T>) => Promise<T>
+>x : Foo2<T> | Bar2<T>
+
+declare let g2: <U>(x: Foo2<U> | Bar2<U>) => Promise<U>;
+>g2 : <U>(x: Foo2<U> | Bar2<U>) => Promise<U>
+>x : Foo2<U> | Bar2<U>
+
+g1 = g2;
+>g1 = g2 : <U>(x: Foo2<U> | Bar2<U>) => Promise<U>
+>g1 : <T>(x: Foo2<T> | Bar2<T>) => Promise<T>
+>g2 : <U>(x: Foo2<U> | Bar2<U>) => Promise<U>
+
+g2 = g1;
+>g2 = g1 : <T>(x: Foo2<T> | Bar2<T>) => Promise<T>
+>g2 : <U>(x: Foo2<U> | Bar2<U>) => Promise<U>
+>g1 : <T>(x: Foo2<T> | Bar2<T>) => Promise<T>
+

From ee623c1ae69b46774c2779c28c3fb438f3514072 Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Thu, 25 Jul 2019 11:57:23 -0700
Subject: [PATCH 055/151] Add test case before change where config project is
 created just to remove it

---
 .../unittests/tsserver/inferredProjects.ts    | 63 +++++++++++++++++++
 1 file changed, 63 insertions(+)

diff --git a/src/testRunner/unittests/tsserver/inferredProjects.ts b/src/testRunner/unittests/tsserver/inferredProjects.ts
index 0bc14809aaa..6882f2ed5c5 100644
--- a/src/testRunner/unittests/tsserver/inferredProjects.ts
+++ b/src/testRunner/unittests/tsserver/inferredProjects.ts
@@ -345,5 +345,68 @@ namespace ts.projectSystem {
         it("inferred projects per project root with case insensitive system", () => {
             verifyProjectRootWithCaseSensitivity(/*useCaseSensitiveFileNames*/ false);
         });
+
+        it("should still retain configured project created while opening the file", () => {
+            const projectRoot = "/user/username/projects/project";
+            const appFile: File = {
+                path: `${projectRoot}/app.ts`,
+                content: `const app = 20;`
+            };
+            const config: File = {
+                path: `${projectRoot}/tsconfig.json`,
+                content: "{}"
+            };
+            const jsFile1: File = {
+                path: `${projectRoot}/jsFile1.js`,
+                content: `const jsFile1 = 10;`
+            };
+            const jsFile2: File = {
+                path: `${projectRoot}/jsFile2.js`,
+                content: `const jsFile2 = 10;`
+            };
+            const host = createServerHost([appFile, libFile, config, jsFile1, jsFile2]);
+            const projectService = createProjectService(host);
+            const originalSet = projectService.configuredProjects.set;
+            const originalDelete = projectService.configuredProjects.delete;
+            const configuredCreated = createMap<true>();
+            const configuredRemoved = createMap<true>();
+            projectService.configuredProjects.set = (key, value) => {
+                assert.isFalse(configuredCreated.has(key));
+                configuredCreated.set(key, true);
+                return originalSet.call(projectService.configuredProjects, key, value);
+            };
+            projectService.configuredProjects.delete = key => {
+                assert.isFalse(configuredRemoved.has(key));
+                configuredRemoved.set(key, true);
+                return originalDelete.call(projectService.configuredProjects, key);
+            };
+
+            projectService.openClientFile(jsFile1.path);
+            checkNumberOfProjects(projectService, { inferredProjects: 1 });
+            checkProjectActualFiles(projectService.inferredProjects[0], [jsFile1.path, libFile.path]);
+            checkConfiguredProjectCreatedAndDeleted();
+
+            projectService.closeClientFile(jsFile1.path);
+            checkNumberOfProjects(projectService, { inferredProjects: 1 });
+            projectService.openClientFile(jsFile2.path);
+            checkNumberOfProjects(projectService, { inferredProjects: 1 });
+            checkProjectActualFiles(projectService.inferredProjects[0], [jsFile2.path, libFile.path]);
+            checkConfiguredProjectCreatedAndDeleted();
+
+            projectService.openClientFile(jsFile1.path);
+            checkNumberOfProjects(projectService, { inferredProjects: 2 });
+            checkProjectActualFiles(projectService.inferredProjects[0], [jsFile2.path, libFile.path]);
+            checkProjectActualFiles(projectService.inferredProjects[1], [jsFile1.path, libFile.path]);
+            checkConfiguredProjectCreatedAndDeleted();
+
+            function checkConfiguredProjectCreatedAndDeleted() {
+                assert.equal(configuredCreated.size, 1);
+                assert.isTrue(configuredCreated.has(config.path));
+                assert.equal(configuredRemoved.size, 1);
+                assert.isTrue(configuredRemoved.has(config.path));
+                configuredCreated.clear();
+                configuredRemoved.clear();
+            }
+        });
     });
 }

From 10ee85c98c9027321bc88fc8e42f4d759c7c0c63 Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Thu, 25 Jul 2019 12:28:09 -0700
Subject: [PATCH 056/151] Retain the  configured project opened during opening
 client file even if opened file isnt included in that project This helps not
 create and remove project on every open if tsconfig file isnt referenced by
 any open file

---
 src/server/editorServices.ts                  | 41 ++++++++++++++-----
 .../unittests/tsserver/configuredProjects.ts  | 14 +++----
 .../unittests/tsserver/inferredProjects.ts    | 40 ++++++++++++++----
 src/testRunner/unittests/tsserver/projects.ts | 18 ++++++--
 4 files changed, 83 insertions(+), 30 deletions(-)

diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
index df9f0e3ee01..a25256a3aec 100644
--- a/src/server/editorServices.ts
+++ b/src/server/editorServices.ts
@@ -284,6 +284,10 @@ namespace ts.server {
         configFileErrors?: ReadonlyArray<Diagnostic>;
     }
 
+    interface AssignProjectResult extends OpenConfiguredProjectResult {
+        defaultConfigProject: ConfiguredProject | undefined;
+    }
+
     interface FilePropertyReader<T> {
         getFileName(f: T): string;
         getScriptKind(f: T, extraFileExtensions?: FileExtensionInfo[]): ScriptKind;
@@ -2635,10 +2639,11 @@ namespace ts.server {
             return info;
         }
 
-        private assignProjectToOpenedScriptInfo(info: ScriptInfo): OpenConfiguredProjectResult {
+        private assignProjectToOpenedScriptInfo(info: ScriptInfo): AssignProjectResult {
             let configFileName: NormalizedPath | undefined;
             let configFileErrors: ReadonlyArray<Diagnostic> | undefined;
             let project: ConfiguredProject | ExternalProject | undefined = this.findExternalProjectContainingOpenScriptInfo(info);
+            let defaultConfigProject: ConfiguredProject | undefined;
             if (!project && !this.syntaxOnly) { // Checking syntaxOnly is an optimization
                 configFileName = this.getConfigFileNameForFile(info);
                 if (configFileName) {
@@ -2659,6 +2664,7 @@ namespace ts.server {
                         // Ensure project is ready to check if it contains opened script info
                         updateProjectIfDirty(project);
                     }
+                    defaultConfigProject = project;
                 }
             }
 
@@ -2678,13 +2684,13 @@ namespace ts.server {
                 this.assignOrphanScriptInfoToInferredProject(info, this.openFiles.get(info.path));
             }
             Debug.assert(!info.isOrphan());
-            return { configFileName, configFileErrors };
+            return { configFileName, configFileErrors, defaultConfigProject };
         }
 
-        private cleanupAfterOpeningFile() {
+        private cleanupAfterOpeningFile(toRetainConfigProjects: ConfiguredProject[] | ConfiguredProject | undefined) {
             // This was postponed from closeOpenFile to after opening next file,
             // so that we can reuse the project if we need to right away
-            this.removeOrphanConfiguredProjects();
+            this.removeOrphanConfiguredProjects(toRetainConfigProjects);
 
             // Remove orphan inferred projects now that we have reused projects
             // We need to create a duplicate because we cant guarantee order after removal
@@ -2705,14 +2711,22 @@ namespace ts.server {
 
         openClientFileWithNormalizedPath(fileName: NormalizedPath, fileContent?: string, scriptKind?: ScriptKind, hasMixedContent?: boolean, projectRootPath?: NormalizedPath): OpenConfiguredProjectResult {
             const info = this.getOrCreateOpenScriptInfo(fileName, fileContent, scriptKind, hasMixedContent, projectRootPath);
-            const result = this.assignProjectToOpenedScriptInfo(info);
-            this.cleanupAfterOpeningFile();
+            const { defaultConfigProject, ...result } = this.assignProjectToOpenedScriptInfo(info);
+            this.cleanupAfterOpeningFile(defaultConfigProject);
             this.telemetryOnOpenFile(info);
             return result;
         }
 
-        private removeOrphanConfiguredProjects() {
+        private removeOrphanConfiguredProjects(toRetainConfiguredProjects: ConfiguredProject[] | ConfiguredProject | undefined) {
             const toRemoveConfiguredProjects = cloneMap(this.configuredProjects);
+            if (toRetainConfiguredProjects) {
+                if (isArray(toRetainConfiguredProjects)) {
+                    toRetainConfiguredProjects.forEach(retainConfiguredProject);
+                }
+                else {
+                    retainConfiguredProject(toRetainConfiguredProjects);
+                }
+            }
 
             // Do not remove configured projects that are used as original projects of other
             this.inferredProjects.forEach(markOriginalProjectsAsUsed);
@@ -2720,7 +2734,7 @@ namespace ts.server {
             this.configuredProjects.forEach(project => {
                 // If project has open ref (there are more than zero references from external project/open file), keep it alive as well as any project it references
                 if (project.hasOpenRef()) {
-                    toRemoveConfiguredProjects.delete(project.canonicalConfigFilePath);
+                    retainConfiguredProject(project);
                     markOriginalProjectsAsUsed(project);
                 }
                 else {
@@ -2729,7 +2743,7 @@ namespace ts.server {
                         if (ref) {
                             const refProject = this.configuredProjects.get(ref.sourceFile.path);
                             if (refProject && refProject.hasOpenRef()) {
-                                toRemoveConfiguredProjects.delete(project.canonicalConfigFilePath);
+                                retainConfiguredProject(project);
                             }
                         }
                     });
@@ -2744,6 +2758,10 @@ namespace ts.server {
                     project.originalConfiguredProjects.forEach((_value, configuredProjectPath) => toRemoveConfiguredProjects.delete(configuredProjectPath));
                 }
             }
+
+            function retainConfiguredProject(project: ConfiguredProject) {
+                toRemoveConfiguredProjects.delete(project.canonicalConfigFilePath);
+            }
         }
 
         private removeOrphanScriptInfos() {
@@ -2886,8 +2904,9 @@ namespace ts.server {
             }
 
             // All the script infos now exist, so ok to go update projects for open files
+            let defaultConfigProjects: ConfiguredProject[] | undefined;
             if (openScriptInfos) {
-                openScriptInfos.forEach(info => this.assignProjectToOpenedScriptInfo(info));
+                defaultConfigProjects = mapDefined(openScriptInfos, info => this.assignProjectToOpenedScriptInfo(info).defaultConfigProject);
             }
 
             // While closing files there could be open files that needed assigning new inferred projects, do it now
@@ -2896,7 +2915,7 @@ namespace ts.server {
             }
 
             // Cleanup projects
-            this.cleanupAfterOpeningFile();
+            this.cleanupAfterOpeningFile(defaultConfigProjects);
 
             // Telemetry
             forEach(openScriptInfos, info => this.telemetryOnOpenFile(info));
diff --git a/src/testRunner/unittests/tsserver/configuredProjects.ts b/src/testRunner/unittests/tsserver/configuredProjects.ts
index a72c9924303..7d066cd9473 100644
--- a/src/testRunner/unittests/tsserver/configuredProjects.ts
+++ b/src/testRunner/unittests/tsserver/configuredProjects.ts
@@ -866,12 +866,12 @@ namespace ts.projectSystem {
             const projectService = createProjectService(host);
             projectService.openClientFile(file1.path);
             host.runQueuedTimeoutCallbacks();
-            // Since there is no file open from configFile it would be closed
-            checkNumberOfConfiguredProjects(projectService, 0);
-            checkNumberOfInferredProjects(projectService, 1);
 
+            // Since file1 refers to config file as the default project, it needs to be kept alive
+            checkNumberOfProjects(projectService, { inferredProjects: 1, configuredProjects: 1 });
             const inferredProject = projectService.inferredProjects[0];
             assert.isTrue(inferredProject.containsFile(<server.NormalizedPath>file1.path));
+            assert.isFalse(projectService.configuredProjects.get(configFile.path)!.containsFile(<server.NormalizedPath>file1.path));
         });
 
         it("should be able to handle @types if input file list is empty", () => {
@@ -898,8 +898,8 @@ namespace ts.projectSystem {
             const projectService = createProjectService(host);
 
             projectService.openClientFile(f.path);
-            // Since no file from the configured project is open, it would be closed immediately
-            projectService.checkNumberOfProjects({ configuredProjects: 0, inferredProjects: 1 });
+            // Since f refers to config file as the default project, it needs to be kept alive
+            projectService.checkNumberOfProjects({ configuredProjects: 1, inferredProjects: 1 });
         });
 
         it("should tolerate invalid include files that start in subDirectory", () => {
@@ -924,8 +924,8 @@ namespace ts.projectSystem {
             const projectService = createProjectService(host);
 
             projectService.openClientFile(f.path);
-            // Since no file from the configured project is open, it would be closed immediately
-            projectService.checkNumberOfProjects({ configuredProjects: 0, inferredProjects: 1 });
+            // Since f refers to config file as the default project, it needs to be kept alive
+            projectService.checkNumberOfProjects({ configuredProjects: 1, inferredProjects: 1 });
         });
 
         it("Changed module resolution reflected when specifying files list", () => {
diff --git a/src/testRunner/unittests/tsserver/inferredProjects.ts b/src/testRunner/unittests/tsserver/inferredProjects.ts
index 6882f2ed5c5..44ff8292acd 100644
--- a/src/testRunner/unittests/tsserver/inferredProjects.ts
+++ b/src/testRunner/unittests/tsserver/inferredProjects.ts
@@ -381,30 +381,54 @@ namespace ts.projectSystem {
                 return originalDelete.call(projectService.configuredProjects, key);
             };
 
+            // Do not remove config project when opening jsFile that is not present as part of config project
             projectService.openClientFile(jsFile1.path);
-            checkNumberOfProjects(projectService, { inferredProjects: 1 });
+            checkNumberOfProjects(projectService, { inferredProjects: 1, configuredProjects: 1 });
             checkProjectActualFiles(projectService.inferredProjects[0], [jsFile1.path, libFile.path]);
-            checkConfiguredProjectCreatedAndDeleted();
+            const project = projectService.configuredProjects.get(config.path)!;
+            checkProjectActualFiles(project, [appFile.path, config.path, libFile.path]);
+            checkConfiguredProjectCreatedAndNotDeleted();
 
+            // Do not remove config project when opening jsFile that is not present as part of config project
             projectService.closeClientFile(jsFile1.path);
-            checkNumberOfProjects(projectService, { inferredProjects: 1 });
+            checkNumberOfProjects(projectService, { inferredProjects: 1, configuredProjects: 1 });
             projectService.openClientFile(jsFile2.path);
-            checkNumberOfProjects(projectService, { inferredProjects: 1 });
+            checkNumberOfProjects(projectService, { inferredProjects: 1, configuredProjects: 1 });
             checkProjectActualFiles(projectService.inferredProjects[0], [jsFile2.path, libFile.path]);
-            checkConfiguredProjectCreatedAndDeleted();
+            checkProjectActualFiles(project, [appFile.path, config.path, libFile.path]);
+            checkConfiguredProjectNotCreatedAndNotDeleted();
 
+            // Do not remove config project when opening jsFile that is not present as part of config project
             projectService.openClientFile(jsFile1.path);
+            checkNumberOfProjects(projectService, { inferredProjects: 2, configuredProjects: 1 });
+            checkProjectActualFiles(projectService.inferredProjects[0], [jsFile2.path, libFile.path]);
+            checkProjectActualFiles(projectService.inferredProjects[1], [jsFile1.path, libFile.path]);
+            checkProjectActualFiles(project, [appFile.path, config.path, libFile.path]);
+            checkConfiguredProjectNotCreatedAndNotDeleted();
+
+            // When opening file that doesnt fall back to the config file, we remove the config project
+            projectService.openClientFile(libFile.path);
             checkNumberOfProjects(projectService, { inferredProjects: 2 });
             checkProjectActualFiles(projectService.inferredProjects[0], [jsFile2.path, libFile.path]);
             checkProjectActualFiles(projectService.inferredProjects[1], [jsFile1.path, libFile.path]);
-            checkConfiguredProjectCreatedAndDeleted();
+            checkConfiguredProjectNotCreatedButDeleted();
 
-            function checkConfiguredProjectCreatedAndDeleted() {
+            function checkConfiguredProjectCreatedAndNotDeleted() {
                 assert.equal(configuredCreated.size, 1);
                 assert.isTrue(configuredCreated.has(config.path));
+                assert.equal(configuredRemoved.size, 0);
+                configuredCreated.clear();
+            }
+
+            function checkConfiguredProjectNotCreatedAndNotDeleted() {
+                assert.equal(configuredCreated.size, 0);
+                assert.equal(configuredRemoved.size, 0);
+            }
+
+            function checkConfiguredProjectNotCreatedButDeleted() {
+                assert.equal(configuredCreated.size, 0);
                 assert.equal(configuredRemoved.size, 1);
                 assert.isTrue(configuredRemoved.has(config.path));
-                configuredCreated.clear();
                 configuredRemoved.clear();
             }
         });
diff --git a/src/testRunner/unittests/tsserver/projects.ts b/src/testRunner/unittests/tsserver/projects.ts
index abb21669f8a..78d22615256 100644
--- a/src/testRunner/unittests/tsserver/projects.ts
+++ b/src/testRunner/unittests/tsserver/projects.ts
@@ -634,13 +634,17 @@ namespace ts.projectSystem {
                 path: "/a/main.js",
                 content: "var y = 1"
             };
+            const f3 = {
+                path: "/main.js",
+                content: "var y = 1"
+            };
             const config = {
                 path: "/a/tsconfig.json",
                 content: JSON.stringify({
                     compilerOptions: { allowJs: true }
                 })
             };
-            const host = createServerHost([f1, f2, config]);
+            const host = createServerHost([f1, f2, f3, config]);
             const projectService = createProjectService(host);
             projectService.setHostConfiguration({
                 extraFileExtensions: [
@@ -652,13 +656,19 @@ namespace ts.projectSystem {
             projectService.checkNumberOfProjects({ configuredProjects: 1 });
             checkProjectActualFiles(configuredProjectAt(projectService, 0), [f1.path, config.path]);
 
-            // Should close configured project with next file open
+            // Since f2 refers to config file as the default project, it needs to be kept alive
             projectService.closeClientFile(f1.path);
-
             projectService.openClientFile(f2.path);
+            projectService.checkNumberOfProjects({ inferredProjects: 1, configuredProjects: 1 });
+            assert.isDefined(projectService.configuredProjects.get(config.path));
+            checkProjectActualFiles(projectService.inferredProjects[0], [f2.path]);
+
+            // Should close configured project with next file open
+            projectService.closeClientFile(f2.path);
+            projectService.openClientFile(f3.path);
             projectService.checkNumberOfProjects({ inferredProjects: 1 });
             assert.isUndefined(projectService.configuredProjects.get(config.path));
-            checkProjectActualFiles(projectService.inferredProjects[0], [f2.path]);
+            checkProjectActualFiles(projectService.inferredProjects[0], [f3.path]);
         });
 
         it("tsconfig script block support", () => {

From 4c76bae8880d97d01847064cd98befba8f42028a Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Thu, 25 Jul 2019 14:03:17 -0700
Subject: [PATCH 057/151] Don't exclude non-anonymous object types in identity
 checks

---
 src/compiler/checker.ts | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 54c8d05e502..0f8326c1fac 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -15500,7 +15500,7 @@ namespace ts {
                     // First, infer between exactly matching source and target constituents and remove
                     // the matching types. Types exactly match when they are identical or, in union
                     // types, when the source is a literal and the target is the corresponding primitive.
-                    const matching = target.flags & TypeFlags.Union ? isTypeOrBaseExactlyMatchedBy : isTypeExactlyMatchedBy;
+                    const matching = target.flags & TypeFlags.Union ? isTypeOrBaseIdenticalTo : isTypeIdenticalTo;
                     const [tempSources, tempTargets] = inferFromMatchingTypes((<UnionOrIntersectionType>source).types, (<UnionOrIntersectionType>target).types, matching);
                     // Next, infer between closely matching source and target constituents and remove
                     // the matching types. Types closely match when they are instantiations of the same
@@ -15515,7 +15515,7 @@ namespace ts {
                 else if (target.flags & TypeFlags.Union && !(target.flags & TypeFlags.EnumLiteral) || target.flags & TypeFlags.Intersection) {
                     // This block of code is an optimized version of the block above for the simpler case
                     // of a singleton source type.
-                    const matching = target.flags & TypeFlags.Union ? isTypeOrBaseExactlyMatchedBy : isTypeExactlyMatchedBy;
+                    const matching = target.flags & TypeFlags.Union ? isTypeOrBaseIdenticalTo : isTypeIdenticalTo;
                     if (inferFromMatchingType(source, (<UnionOrIntersectionType>target).types, matching)) return;
                     if (inferFromMatchingType(source, (<UnionOrIntersectionType>target).types, isTypeCloselyMatchedBy)) return;
                 }
@@ -15974,19 +15974,8 @@ namespace ts {
             }
         }
 
-        function isNonObjectOrAnonymousType(type: Type) {
-            // We exclude non-anonymous object types because some frameworks (e.g. Ember) rely on the ability to
-            // infer between types that don't witness their type variables. Such types would otherwise be eliminated
-            // because they appear identical.
-            return !(type.flags & TypeFlags.Object) || !!(getObjectFlags(type) & ObjectFlags.Anonymous);
-        }
-
-        function isTypeExactlyMatchedBy(s: Type, t: Type) {
-            return s === t || isNonObjectOrAnonymousType(s) && isNonObjectOrAnonymousType(t) && isTypeIdenticalTo(s, t);
-        }
-
-        function isTypeOrBaseExactlyMatchedBy(s: Type, t: Type) {
-            return isTypeExactlyMatchedBy(s, t) || !!(s.flags & (TypeFlags.StringLiteral | TypeFlags.NumberLiteral)) && isTypeIdenticalTo(getBaseTypeOfLiteralType(s), t);
+        function isTypeOrBaseIdenticalTo(s: Type, t: Type) {
+            return isTypeIdenticalTo(s, t) || !!(s.flags & (TypeFlags.StringLiteral | TypeFlags.NumberLiteral)) && isTypeIdenticalTo(getBaseTypeOfLiteralType(s), t);
         }
 
         function isTypeCloselyMatchedBy(s: Type, t: Type) {

From 9647506d8c6dea0c2531f5f4867971e419799e1f Mon Sep 17 00:00:00 2001
From: Andrew Casey <andrew.casey@microsoft.com>
Date: Wed, 24 Jul 2019 15:57:46 -0700
Subject: [PATCH 058/151] Support classification of triple-slash references

Note: not restricted to the element and attribute names that actually
bind
---
 src/services/classifier.ts                    | 83 +++++++++++++++++++
 .../syntacticClassificationsTripleSlash1.ts   | 15 ++++
 .../syntacticClassificationsTripleSlash10.ts  | 13 +++
 .../syntacticClassificationsTripleSlash11.ts  | 15 ++++
 .../syntacticClassificationsTripleSlash12.ts  | 19 +++++
 .../syntacticClassificationsTripleSlash13.ts  | 16 ++++
 .../syntacticClassificationsTripleSlash14.ts  |  7 ++
 .../syntacticClassificationsTripleSlash15.ts  | 25 ++++++
 .../syntacticClassificationsTripleSlash16.ts  | 17 ++++
 .../syntacticClassificationsTripleSlash2.ts   | 16 ++++
 .../syntacticClassificationsTripleSlash3.ts   | 19 +++++
 .../syntacticClassificationsTripleSlash4.ts   |  8 ++
 .../syntacticClassificationsTripleSlash5.ts   |  9 ++
 .../syntacticClassificationsTripleSlash6.ts   | 10 +++
 .../syntacticClassificationsTripleSlash7.ts   | 10 +++
 .../syntacticClassificationsTripleSlash8.ts   | 10 +++
 .../syntacticClassificationsTripleSlash9.ts   | 10 +++
 17 files changed, 302 insertions(+)
 create mode 100644 tests/cases/fourslash/syntacticClassificationsTripleSlash1.ts
 create mode 100644 tests/cases/fourslash/syntacticClassificationsTripleSlash10.ts
 create mode 100644 tests/cases/fourslash/syntacticClassificationsTripleSlash11.ts
 create mode 100644 tests/cases/fourslash/syntacticClassificationsTripleSlash12.ts
 create mode 100644 tests/cases/fourslash/syntacticClassificationsTripleSlash13.ts
 create mode 100644 tests/cases/fourslash/syntacticClassificationsTripleSlash14.ts
 create mode 100644 tests/cases/fourslash/syntacticClassificationsTripleSlash15.ts
 create mode 100644 tests/cases/fourslash/syntacticClassificationsTripleSlash16.ts
 create mode 100644 tests/cases/fourslash/syntacticClassificationsTripleSlash2.ts
 create mode 100644 tests/cases/fourslash/syntacticClassificationsTripleSlash3.ts
 create mode 100644 tests/cases/fourslash/syntacticClassificationsTripleSlash4.ts
 create mode 100644 tests/cases/fourslash/syntacticClassificationsTripleSlash5.ts
 create mode 100644 tests/cases/fourslash/syntacticClassificationsTripleSlash6.ts
 create mode 100644 tests/cases/fourslash/syntacticClassificationsTripleSlash7.ts
 create mode 100644 tests/cases/fourslash/syntacticClassificationsTripleSlash8.ts
 create mode 100644 tests/cases/fourslash/syntacticClassificationsTripleSlash9.ts

diff --git a/src/services/classifier.ts b/src/services/classifier.ts
index f85a69681de..f1db477481f 100644
--- a/src/services/classifier.ts
+++ b/src/services/classifier.ts
@@ -683,6 +683,11 @@ namespace ts {
                     return;
                 }
             }
+            else if (kind === SyntaxKind.SingleLineCommentTrivia) {
+                if (tryClassifyTripleSlashComment(start, width)) {
+                    return;
+                }
+            }
 
             // Simple comment.  Just add as is.
             pushCommentRange(start, width);
@@ -755,6 +760,84 @@ namespace ts {
             }
         }
 
+        function tryClassifyTripleSlashComment(start: number, width: number): boolean {
+            const tripleSlashXMLCommentRegEx = /^(\/\/\/\s*)(<)(?:(\S+)((?:[^/]|\/[^>])*)(\/>)?)?/im;
+            const attributeRegex = /(\S+)(\s*)(=)(\s*)('[^']+'|"[^"]+")/img;
+
+            const text = sourceFile.text.substr(start, width);
+            const match = tripleSlashXMLCommentRegEx.exec(text);
+            if (!match) {
+                return false;
+            }
+
+            let pos = start;
+
+            pushCommentRange(pos, match[1].length); // ///
+            pos += match[1].length;
+
+            pushClassification(pos, match[2].length, ClassificationType.punctuation); // <
+            pos += match[2].length;
+
+            if (!match[3]) {
+                return true;
+            }
+
+            pushClassification(pos, match[3].length, ClassificationType.jsxSelfClosingTagName); // element name
+            pos += match[3].length;
+
+            const attrText = match[4];
+            let attrPos = pos;
+            while (true) {
+                const attrMatch = attributeRegex.exec(attrText);
+                if (!attrMatch) {
+                    break;
+                }
+
+                const newAttrPos = pos + attrMatch.index;
+                if (newAttrPos > attrPos) {
+                    pushCommentRange(attrPos, newAttrPos - attrPos);
+                    attrPos = newAttrPos;
+                }
+
+                pushClassification(attrPos, attrMatch[1].length, ClassificationType.jsxAttribute); // attribute name
+                attrPos += attrMatch[1].length;
+
+                if (attrMatch[2].length) {
+                    pushCommentRange(attrPos, attrMatch[2].length); // whitespace
+                    attrPos += attrMatch[2].length;
+                }
+
+                pushClassification(attrPos, attrMatch[3].length, ClassificationType.operator); // =
+                attrPos += attrMatch[3].length;
+
+                if (attrMatch[4].length) {
+                    pushCommentRange(attrPos, attrMatch[4].length); // whitespace
+                    attrPos += attrMatch[4].length;
+                }
+
+                pushClassification(attrPos, attrMatch[5].length, ClassificationType.jsxAttributeStringLiteralValue); // attribute value
+                attrPos += attrMatch[5].length;
+            }
+
+            pos += match[4].length;
+
+            if (pos > attrPos) {
+                pushCommentRange(attrPos, pos - attrPos);
+            }
+
+            if (match[5]) {
+                pushClassification(pos, match[5].length, ClassificationType.punctuation); // />
+                pos += match[5].length;
+            }
+
+            const end = start + width;
+            if (pos < end) {
+                pushCommentRange(pos, end - pos);
+            }
+
+            return true;
+        }
+
         function processJSDocTemplateTag(tag: JSDocTemplateTag) {
             for (const child of tag.getChildren()) {
                 processElement(child);
diff --git a/tests/cases/fourslash/syntacticClassificationsTripleSlash1.ts b/tests/cases/fourslash/syntacticClassificationsTripleSlash1.ts
new file mode 100644
index 00000000000..13c27669ad5
--- /dev/null
+++ b/tests/cases/fourslash/syntacticClassificationsTripleSlash1.ts
@@ -0,0 +1,15 @@
+/// <reference path="fourslash.ts"/>
+
+//// /// <reference path="./module.ts" />
+
+var c = classification;
+verify.syntacticClassificationsAre(
+    c.comment("/// "),
+    c.punctuation("<"),
+    c.jsxSelfClosingTagName("reference"),
+    c.comment(" "),
+    c.jsxAttribute("path"),
+    c.operator("="),
+    c.jsxAttributeStringLiteralValue("\"./module.ts\""),
+    c.comment(" "),
+    c.punctuation("/>"));
\ No newline at end of file
diff --git a/tests/cases/fourslash/syntacticClassificationsTripleSlash10.ts b/tests/cases/fourslash/syntacticClassificationsTripleSlash10.ts
new file mode 100644
index 00000000000..d1bb681b92e
--- /dev/null
+++ b/tests/cases/fourslash/syntacticClassificationsTripleSlash10.ts
@@ -0,0 +1,13 @@
+/// <reference path="fourslash.ts"/>
+
+//// /// <reference path="./module.ts"
+
+var c = classification;
+verify.syntacticClassificationsAre(
+    c.comment("/// "),
+    c.punctuation("<"),
+    c.jsxSelfClosingTagName("reference"),
+    c.comment(" "),
+    c.jsxAttribute("path"),
+    c.operator("="),
+    c.jsxAttributeStringLiteralValue("\"./module.ts\""));
\ No newline at end of file
diff --git a/tests/cases/fourslash/syntacticClassificationsTripleSlash11.ts b/tests/cases/fourslash/syntacticClassificationsTripleSlash11.ts
new file mode 100644
index 00000000000..00dcfe4a08e
--- /dev/null
+++ b/tests/cases/fourslash/syntacticClassificationsTripleSlash11.ts
@@ -0,0 +1,15 @@
+/// <reference path="fourslash.ts"/>
+
+//// /// <reference path="./module.ts" /
+
+var c = classification;
+verify.syntacticClassificationsAre(
+    c.comment("/// "),
+    c.punctuation("<"),
+    c.jsxSelfClosingTagName("reference"),
+    c.comment(" "),
+    c.jsxAttribute("path"),
+    c.operator("="),
+    c.jsxAttributeStringLiteralValue("\"./module.ts\""),
+    c.comment(" "),
+    c.comment("/"));
\ No newline at end of file
diff --git a/tests/cases/fourslash/syntacticClassificationsTripleSlash12.ts b/tests/cases/fourslash/syntacticClassificationsTripleSlash12.ts
new file mode 100644
index 00000000000..b4a58c6a4e7
--- /dev/null
+++ b/tests/cases/fourslash/syntacticClassificationsTripleSlash12.ts
@@ -0,0 +1,19 @@
+/// <reference path="fourslash.ts"/>
+
+//// /// <reference path="./module.ts" bad types="node" />
+
+var c = classification;
+verify.syntacticClassificationsAre(
+    c.comment("/// "),
+    c.punctuation("<"),
+    c.jsxSelfClosingTagName("reference"),
+    c.comment(" "),
+    c.jsxAttribute("path"),
+    c.operator("="),
+    c.jsxAttributeStringLiteralValue("\"./module.ts\""),
+    c.comment(" bad "),
+    c.jsxAttribute("types"),
+    c.operator("="),
+    c.jsxAttributeStringLiteralValue("\"node\""),
+    c.comment(" "),
+    c.punctuation("/>"));
\ No newline at end of file
diff --git a/tests/cases/fourslash/syntacticClassificationsTripleSlash13.ts b/tests/cases/fourslash/syntacticClassificationsTripleSlash13.ts
new file mode 100644
index 00000000000..182b01f7560
--- /dev/null
+++ b/tests/cases/fourslash/syntacticClassificationsTripleSlash13.ts
@@ -0,0 +1,16 @@
+/// <reference path="fourslash.ts"/>
+
+//// /// <reference path="./module.ts" /> trailing
+
+var c = classification;
+verify.syntacticClassificationsAre(
+    c.comment("/// "),
+    c.punctuation("<"),
+    c.jsxSelfClosingTagName("reference"),
+    c.comment(" "),
+    c.jsxAttribute("path"),
+    c.operator("="),
+    c.jsxAttributeStringLiteralValue("\"./module.ts\""),
+    c.comment(" "),
+    c.punctuation("/>"),
+    c.comment(" trailing"));
\ No newline at end of file
diff --git a/tests/cases/fourslash/syntacticClassificationsTripleSlash14.ts b/tests/cases/fourslash/syntacticClassificationsTripleSlash14.ts
new file mode 100644
index 00000000000..a7d16fea02c
--- /dev/null
+++ b/tests/cases/fourslash/syntacticClassificationsTripleSlash14.ts
@@ -0,0 +1,7 @@
+/// <reference path="fourslash.ts"/>
+
+//// /// nonElement
+
+var c = classification;
+verify.syntacticClassificationsAre(
+    c.comment("/// nonElement"));
\ No newline at end of file
diff --git a/tests/cases/fourslash/syntacticClassificationsTripleSlash15.ts b/tests/cases/fourslash/syntacticClassificationsTripleSlash15.ts
new file mode 100644
index 00000000000..8ec5ebbea5d
--- /dev/null
+++ b/tests/cases/fourslash/syntacticClassificationsTripleSlash15.ts
@@ -0,0 +1,25 @@
+/// <reference path="fourslash.ts"/>
+
+//// /// <reference path="./module1.ts" />
+//// /// <reference path="./module2.ts" />
+
+var c = classification;
+verify.syntacticClassificationsAre(
+    c.comment("/// "),
+    c.punctuation("<"),
+    c.jsxSelfClosingTagName("reference"),
+    c.comment(" "),
+    c.jsxAttribute("path"),
+    c.operator("="),
+    c.jsxAttributeStringLiteralValue("\"./module1.ts\""),
+    c.comment(" "),
+    c.punctuation("/>"),
+    c.comment("/// "),
+    c.punctuation("<"),
+    c.jsxSelfClosingTagName("reference"),
+    c.comment(" "),
+    c.jsxAttribute("path"),
+    c.operator("="),
+    c.jsxAttributeStringLiteralValue("\"./module2.ts\""),
+    c.comment(" "),
+    c.punctuation("/>"));
\ No newline at end of file
diff --git a/tests/cases/fourslash/syntacticClassificationsTripleSlash16.ts b/tests/cases/fourslash/syntacticClassificationsTripleSlash16.ts
new file mode 100644
index 00000000000..1dbee22cb59
--- /dev/null
+++ b/tests/cases/fourslash/syntacticClassificationsTripleSlash16.ts
@@ -0,0 +1,17 @@
+/// <reference path="fourslash.ts"/>
+
+//// /// <reference path="./module.ts" />
+//// 1
+
+var c = classification;
+verify.syntacticClassificationsAre(
+    c.comment("/// "),
+    c.punctuation("<"),
+    c.jsxSelfClosingTagName("reference"),
+    c.comment(" "),
+    c.jsxAttribute("path"),
+    c.operator("="),
+    c.jsxAttributeStringLiteralValue("\"./module.ts\""),
+    c.comment(" "),
+    c.punctuation("/>"),
+    c.numericLiteral("1"));
\ No newline at end of file
diff --git a/tests/cases/fourslash/syntacticClassificationsTripleSlash2.ts b/tests/cases/fourslash/syntacticClassificationsTripleSlash2.ts
new file mode 100644
index 00000000000..278d66dcb4a
--- /dev/null
+++ b/tests/cases/fourslash/syntacticClassificationsTripleSlash2.ts
@@ -0,0 +1,16 @@
+/// <reference path="fourslash.ts"/>
+
+//// ///<reference path = "./module.ts"/>
+
+var c = classification;
+verify.syntacticClassificationsAre(
+    c.comment("///"),
+    c.punctuation("<"),
+    c.jsxSelfClosingTagName("reference"),
+    c.comment(" "),
+    c.jsxAttribute("path"),
+    c.comment(" "),
+    c.operator("="),
+    c.comment(" "),
+    c.jsxAttributeStringLiteralValue("\"./module.ts\""),
+    c.punctuation("/>"));
\ No newline at end of file
diff --git a/tests/cases/fourslash/syntacticClassificationsTripleSlash3.ts b/tests/cases/fourslash/syntacticClassificationsTripleSlash3.ts
new file mode 100644
index 00000000000..11d3b2462be
--- /dev/null
+++ b/tests/cases/fourslash/syntacticClassificationsTripleSlash3.ts
@@ -0,0 +1,19 @@
+/// <reference path="fourslash.ts"/>
+
+//// /// <reference path="./module.ts" types="node" />
+
+var c = classification;
+verify.syntacticClassificationsAre(
+    c.comment("/// "),
+    c.punctuation("<"),
+    c.jsxSelfClosingTagName("reference"),
+    c.comment(" "),
+    c.jsxAttribute("path"),
+    c.operator("="),
+    c.jsxAttributeStringLiteralValue("\"./module.ts\""),
+    c.comment(" "),
+    c.jsxAttribute("types"),
+    c.operator("="),
+    c.jsxAttributeStringLiteralValue("\"node\""),
+    c.comment(" "),
+    c.punctuation("/>"));
\ No newline at end of file
diff --git a/tests/cases/fourslash/syntacticClassificationsTripleSlash4.ts b/tests/cases/fourslash/syntacticClassificationsTripleSlash4.ts
new file mode 100644
index 00000000000..e656c811377
--- /dev/null
+++ b/tests/cases/fourslash/syntacticClassificationsTripleSlash4.ts
@@ -0,0 +1,8 @@
+/// <reference path="fourslash.ts"/>
+
+//// /// <
+
+var c = classification;
+verify.syntacticClassificationsAre(
+    c.comment("/// "),
+    c.punctuation("<"));
\ No newline at end of file
diff --git a/tests/cases/fourslash/syntacticClassificationsTripleSlash5.ts b/tests/cases/fourslash/syntacticClassificationsTripleSlash5.ts
new file mode 100644
index 00000000000..c6f1de38f28
--- /dev/null
+++ b/tests/cases/fourslash/syntacticClassificationsTripleSlash5.ts
@@ -0,0 +1,9 @@
+/// <reference path="fourslash.ts"/>
+
+//// /// <reference
+
+var c = classification;
+verify.syntacticClassificationsAre(
+    c.comment("/// "),
+    c.punctuation("<"),
+    c.jsxSelfClosingTagName("reference"));
\ No newline at end of file
diff --git a/tests/cases/fourslash/syntacticClassificationsTripleSlash6.ts b/tests/cases/fourslash/syntacticClassificationsTripleSlash6.ts
new file mode 100644
index 00000000000..39c205dbc3a
--- /dev/null
+++ b/tests/cases/fourslash/syntacticClassificationsTripleSlash6.ts
@@ -0,0 +1,10 @@
+/// <reference path="fourslash.ts"/>
+
+//// /// <reference path
+
+var c = classification;
+verify.syntacticClassificationsAre(
+    c.comment("/// "),
+    c.punctuation("<"),
+    c.jsxSelfClosingTagName("reference"),
+    c.comment(" path"));
\ No newline at end of file
diff --git a/tests/cases/fourslash/syntacticClassificationsTripleSlash7.ts b/tests/cases/fourslash/syntacticClassificationsTripleSlash7.ts
new file mode 100644
index 00000000000..f4f376b33a4
--- /dev/null
+++ b/tests/cases/fourslash/syntacticClassificationsTripleSlash7.ts
@@ -0,0 +1,10 @@
+/// <reference path="fourslash.ts"/>
+
+//// /// <reference path=
+
+var c = classification;
+verify.syntacticClassificationsAre(
+    c.comment("/// "),
+    c.punctuation("<"),
+    c.jsxSelfClosingTagName("reference"),
+    c.comment(" path="));
\ No newline at end of file
diff --git a/tests/cases/fourslash/syntacticClassificationsTripleSlash8.ts b/tests/cases/fourslash/syntacticClassificationsTripleSlash8.ts
new file mode 100644
index 00000000000..80433d257a1
--- /dev/null
+++ b/tests/cases/fourslash/syntacticClassificationsTripleSlash8.ts
@@ -0,0 +1,10 @@
+/// <reference path="fourslash.ts"/>
+
+//// /// <reference path="
+
+var c = classification;
+verify.syntacticClassificationsAre(
+    c.comment("/// "),
+    c.punctuation("<"),
+    c.jsxSelfClosingTagName("reference"),
+    c.comment(" path=\""));
\ No newline at end of file
diff --git a/tests/cases/fourslash/syntacticClassificationsTripleSlash9.ts b/tests/cases/fourslash/syntacticClassificationsTripleSlash9.ts
new file mode 100644
index 00000000000..8b89c3334f3
--- /dev/null
+++ b/tests/cases/fourslash/syntacticClassificationsTripleSlash9.ts
@@ -0,0 +1,10 @@
+/// <reference path="fourslash.ts"/>
+
+//// /// <reference path="./module.ts
+
+var c = classification;
+verify.syntacticClassificationsAre(
+    c.comment("/// "),
+    c.punctuation("<"),
+    c.jsxSelfClosingTagName("reference"),
+    c.comment(" path=\"./module.ts"));
\ No newline at end of file

From b902a71e5f11af732a52a9adee9778b668c7b211 Mon Sep 17 00:00:00 2001
From: Orta Therox <orta.therox@gmail.com>
Date: Thu, 25 Jul 2019 17:10:31 -0400
Subject: [PATCH 059/151] Handle namepaths inside JSDoc type expressions a bit
 better - fixes #31298

---
 src/compiler/parser.ts                        |  8 +++
 src/compiler/types.ts                         |  7 +++
 .../reference/api/tsserverlibrary.d.ts        | 57 ++++++++++---------
 tests/baselines/reference/api/typescript.d.ts | 57 ++++++++++---------
 .../noAssertForUnparseableTypedefs.errors.txt |  9 +--
 .../fourslash/jsDocDontBreakWithNamespaces.ts | 17 ++++++
 6 files changed, 97 insertions(+), 58 deletions(-)
 create mode 100644 tests/cases/fourslash/jsDocDontBreakWithNamespaces.ts

diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
index 254be93000b..9762302b7a2 100644
--- a/src/compiler/parser.ts
+++ b/src/compiler/parser.ts
@@ -2429,8 +2429,16 @@ namespace ts {
         function parseJSDocType(): TypeNode {
             scanner.setInJSDocType(true);
             const dotdotdot = parseOptionalToken(SyntaxKind.DotDotDotToken);
+            const moduleSpecifier = parseOptionalToken(SyntaxKind.ModuleKeyword);
             let type = parseTypeOrTypePredicate();
             scanner.setInJSDocType(false);
+            if (moduleSpecifier) {
+                const moduleTag = createNode(SyntaxKind.JSDocNamepathType, moduleSpecifier.pos) as JSDocNamepathType;
+                while (token() !== SyntaxKind.CloseBraceToken && token() !== SyntaxKind.EndOfFileToken) {
+                    nextTokenJSDoc();
+                }
+                type = finishNode(moduleTag);
+            }
             if (dotdotdot) {
                 const variadic = createNode(SyntaxKind.JSDocVariadicType, dotdotdot.pos) as JSDocVariadicType;
                 variadic.type = type;
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 67c85147aed..e1461071e20 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -455,6 +455,8 @@ namespace ts {
         JSDocOptionalType,
         JSDocFunctionType,
         JSDocVariadicType,
+        // https://jsdoc.app/about-namepaths.html
+        JSDocNamepathType,
         JSDocComment,
         JSDocTypeLiteral,
         JSDocSignature,
@@ -2430,6 +2432,11 @@ namespace ts {
         type: TypeNode;
     }
 
+    export interface JSDocNamepathType extends JSDocType {
+        kind: SyntaxKind.JSDocNamepathType;
+        type: TypeNode;
+    }
+
     export type JSDocTypeReferencingNode = JSDocVariadicType | JSDocOptionalType | JSDocNullableType | JSDocNonNullableType;
 
     export interface JSDoc extends Node {
diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts
index c2bad61505b..549cb6368f9 100644
--- a/tests/baselines/reference/api/tsserverlibrary.d.ts
+++ b/tests/baselines/reference/api/tsserverlibrary.d.ts
@@ -374,29 +374,30 @@ declare namespace ts {
         JSDocOptionalType = 294,
         JSDocFunctionType = 295,
         JSDocVariadicType = 296,
-        JSDocComment = 297,
-        JSDocTypeLiteral = 298,
-        JSDocSignature = 299,
-        JSDocTag = 300,
-        JSDocAugmentsTag = 301,
-        JSDocAuthorTag = 302,
-        JSDocClassTag = 303,
-        JSDocCallbackTag = 304,
-        JSDocEnumTag = 305,
-        JSDocParameterTag = 306,
-        JSDocReturnTag = 307,
-        JSDocThisTag = 308,
-        JSDocTypeTag = 309,
-        JSDocTemplateTag = 310,
-        JSDocTypedefTag = 311,
-        JSDocPropertyTag = 312,
-        SyntaxList = 313,
-        NotEmittedStatement = 314,
-        PartiallyEmittedExpression = 315,
-        CommaListExpression = 316,
-        MergeDeclarationMarker = 317,
-        EndOfDeclarationMarker = 318,
-        Count = 319,
+        JSDocNamepathType = 297,
+        JSDocComment = 298,
+        JSDocTypeLiteral = 299,
+        JSDocSignature = 300,
+        JSDocTag = 301,
+        JSDocAugmentsTag = 302,
+        JSDocAuthorTag = 303,
+        JSDocClassTag = 304,
+        JSDocCallbackTag = 305,
+        JSDocEnumTag = 306,
+        JSDocParameterTag = 307,
+        JSDocReturnTag = 308,
+        JSDocThisTag = 309,
+        JSDocTypeTag = 310,
+        JSDocTemplateTag = 311,
+        JSDocTypedefTag = 312,
+        JSDocPropertyTag = 313,
+        SyntaxList = 314,
+        NotEmittedStatement = 315,
+        PartiallyEmittedExpression = 316,
+        CommaListExpression = 317,
+        MergeDeclarationMarker = 318,
+        EndOfDeclarationMarker = 319,
+        Count = 320,
         FirstAssignment = 60,
         LastAssignment = 72,
         FirstCompoundAssignment = 61,
@@ -423,9 +424,9 @@ declare namespace ts {
         LastBinaryOperator = 72,
         FirstNode = 149,
         FirstJSDocNode = 289,
-        LastJSDocNode = 312,
-        FirstJSDocTagNode = 300,
-        LastJSDocTagNode = 312,
+        LastJSDocNode = 313,
+        FirstJSDocTagNode = 301,
+        LastJSDocTagNode = 313,
     }
     enum NodeFlags {
         None = 0,
@@ -1558,6 +1559,10 @@ declare namespace ts {
         kind: SyntaxKind.JSDocVariadicType;
         type: TypeNode;
     }
+    interface JSDocNamepathType extends JSDocType {
+        kind: SyntaxKind.JSDocNamepathType;
+        type: TypeNode;
+    }
     type JSDocTypeReferencingNode = JSDocVariadicType | JSDocOptionalType | JSDocNullableType | JSDocNonNullableType;
     interface JSDoc extends Node {
         kind: SyntaxKind.JSDocComment;
diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts
index 7a2559bbc22..935aff356f8 100644
--- a/tests/baselines/reference/api/typescript.d.ts
+++ b/tests/baselines/reference/api/typescript.d.ts
@@ -374,29 +374,30 @@ declare namespace ts {
         JSDocOptionalType = 294,
         JSDocFunctionType = 295,
         JSDocVariadicType = 296,
-        JSDocComment = 297,
-        JSDocTypeLiteral = 298,
-        JSDocSignature = 299,
-        JSDocTag = 300,
-        JSDocAugmentsTag = 301,
-        JSDocAuthorTag = 302,
-        JSDocClassTag = 303,
-        JSDocCallbackTag = 304,
-        JSDocEnumTag = 305,
-        JSDocParameterTag = 306,
-        JSDocReturnTag = 307,
-        JSDocThisTag = 308,
-        JSDocTypeTag = 309,
-        JSDocTemplateTag = 310,
-        JSDocTypedefTag = 311,
-        JSDocPropertyTag = 312,
-        SyntaxList = 313,
-        NotEmittedStatement = 314,
-        PartiallyEmittedExpression = 315,
-        CommaListExpression = 316,
-        MergeDeclarationMarker = 317,
-        EndOfDeclarationMarker = 318,
-        Count = 319,
+        JSDocNamepathType = 297,
+        JSDocComment = 298,
+        JSDocTypeLiteral = 299,
+        JSDocSignature = 300,
+        JSDocTag = 301,
+        JSDocAugmentsTag = 302,
+        JSDocAuthorTag = 303,
+        JSDocClassTag = 304,
+        JSDocCallbackTag = 305,
+        JSDocEnumTag = 306,
+        JSDocParameterTag = 307,
+        JSDocReturnTag = 308,
+        JSDocThisTag = 309,
+        JSDocTypeTag = 310,
+        JSDocTemplateTag = 311,
+        JSDocTypedefTag = 312,
+        JSDocPropertyTag = 313,
+        SyntaxList = 314,
+        NotEmittedStatement = 315,
+        PartiallyEmittedExpression = 316,
+        CommaListExpression = 317,
+        MergeDeclarationMarker = 318,
+        EndOfDeclarationMarker = 319,
+        Count = 320,
         FirstAssignment = 60,
         LastAssignment = 72,
         FirstCompoundAssignment = 61,
@@ -423,9 +424,9 @@ declare namespace ts {
         LastBinaryOperator = 72,
         FirstNode = 149,
         FirstJSDocNode = 289,
-        LastJSDocNode = 312,
-        FirstJSDocTagNode = 300,
-        LastJSDocTagNode = 312,
+        LastJSDocNode = 313,
+        FirstJSDocTagNode = 301,
+        LastJSDocTagNode = 313,
     }
     enum NodeFlags {
         None = 0,
@@ -1558,6 +1559,10 @@ declare namespace ts {
         kind: SyntaxKind.JSDocVariadicType;
         type: TypeNode;
     }
+    interface JSDocNamepathType extends JSDocType {
+        kind: SyntaxKind.JSDocNamepathType;
+        type: TypeNode;
+    }
     type JSDocTypeReferencingNode = JSDocVariadicType | JSDocOptionalType | JSDocNullableType | JSDocNonNullableType;
     interface JSDoc extends Node {
         kind: SyntaxKind.JSDocComment;
diff --git a/tests/baselines/reference/noAssertForUnparseableTypedefs.errors.txt b/tests/baselines/reference/noAssertForUnparseableTypedefs.errors.txt
index b131c8adac0..a0b1f6210ba 100644
--- a/tests/baselines/reference/noAssertForUnparseableTypedefs.errors.txt
+++ b/tests/baselines/reference/noAssertForUnparseableTypedefs.errors.txt
@@ -1,14 +1,11 @@
-tests/cases/conformance/jsdoc/bug26693.js(1,15): error TS2580: Cannot find name 'module'. Do you need to install type definitions for node? Try `npm i @types/node`.
-tests/cases/conformance/jsdoc/bug26693.js(1,21): error TS1005: '}' expected.
+tests/cases/conformance/jsdoc/bug26693.js(1,21): error TS1110: Type expected.
 tests/cases/conformance/jsdoc/bug26693.js(2,22): error TS2307: Cannot find module 'nope'.
 
 
-==== tests/cases/conformance/jsdoc/bug26693.js (3 errors) ====
+==== tests/cases/conformance/jsdoc/bug26693.js (2 errors) ====
     /** @typedef {module:locale} hi */
-                  ~~~~~~
-!!! error TS2580: Cannot find name 'module'. Do you need to install type definitions for node? Try `npm i @types/node`.
                         ~
-!!! error TS1005: '}' expected.
+!!! error TS1110: Type expected.
     import { nope } from 'nope';
                          ~~~~~~
 !!! error TS2307: Cannot find module 'nope'.
diff --git a/tests/cases/fourslash/jsDocDontBreakWithNamespaces.ts b/tests/cases/fourslash/jsDocDontBreakWithNamespaces.ts
new file mode 100644
index 00000000000..7807d5d30d1
--- /dev/null
+++ b/tests/cases/fourslash/jsDocDontBreakWithNamespaces.ts
@@ -0,0 +1,17 @@
+///<reference path="fourslash.ts" />
+// @allowJs: true
+// @Filename: 31298.js
+/////**
+//// * @returns {module:@nodefuel/web~Webserver~wsServer#hello} Websocket server object
+//// */
+////function foo() { }
+////foo(''/**/);
+
+verify.signatureHelp({
+  marker: "",
+  text: "foo(): any",
+  docComment: "",
+  tags: [
+      { name: "returns", text: "Websocket server object" },
+  ],
+});

From 599e36a0685fbeebddc00e8cb36b76fb52b9f0c8 Mon Sep 17 00:00:00 2001
From: Jesse Trinity <42591254+jessetrinity@users.noreply.github.com>
Date: Thu, 25 Jul 2019 21:29:12 -0700
Subject: [PATCH 060/151] Decrement line ends if they end with a carriage
 return. (#31220)

* Decrement line ends if they end with a carriage return.

* Changed handling of newlines and inlined regex operation.

* fixed misname of hintSpan

* added tests

* revert inline of regex match and use getLineEndOfPosition

* fixed lint error and changed a silly thing in tests
---
 src/services/outliningElementsCollector.ts    |  5 ++---
 .../unittests/services/hostNewLineSupport.ts  | 22 +++++++++++++++++++
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/services/outliningElementsCollector.ts b/src/services/outliningElementsCollector.ts
index a23eddf0628..6e5e2b963e8 100644
--- a/src/services/outliningElementsCollector.ts
+++ b/src/services/outliningElementsCollector.ts
@@ -71,9 +71,8 @@ namespace ts.OutliningElementsCollector {
     function addRegionOutliningSpans(sourceFile: SourceFile, out: Push<OutliningSpan>): void {
         const regions: OutliningSpan[] = [];
         const lineStarts = sourceFile.getLineStarts();
-        for (let i = 0; i < lineStarts.length; i++) {
-            const currentLineStart = lineStarts[i];
-            const lineEnd = i + 1 === lineStarts.length ? sourceFile.getEnd() : lineStarts[i + 1] - 1;
+        for (const currentLineStart of lineStarts) {
+            const lineEnd = sourceFile.getLineEndOfPosition(currentLineStart);
             const lineText = sourceFile.text.substring(currentLineStart, lineEnd);
             const result = isRegionDelimiter(lineText);
             if (!result || isInComment(sourceFile, currentLineStart)) {
diff --git a/src/testRunner/unittests/services/hostNewLineSupport.ts b/src/testRunner/unittests/services/hostNewLineSupport.ts
index cafe4813431..48bc124f3bc 100644
--- a/src/testRunner/unittests/services/hostNewLineSupport.ts
+++ b/src/testRunner/unittests/services/hostNewLineSupport.ts
@@ -38,6 +38,18 @@ namespace ts {
             verifyNewLines(content, { newLine: NewLineKind.LineFeed });
         }
 
+        function verifyOutliningSpanNewLines(content: string, options: CompilerOptions) {
+            const ls = testLSWithFiles(options, [{
+                content,
+                fileOptions: {},
+                unitName: "input.ts"
+            }]);
+            const span = ls.getOutliningSpans("input.ts")[0];
+            const textAfterSpanCollapse = content.substring(span.textSpan.start + span.textSpan.length);
+            assert(textAfterSpanCollapse.match(options.newLine === NewLineKind.CarriageReturnLineFeed ? /\r\n/ : /[^\r]\n/), "expected to find appropriate newlines");
+            assert(!textAfterSpanCollapse.match(options.newLine === NewLineKind.CarriageReturnLineFeed ? /[^\r]\n/ : /\r\n/), "expected not to find inappropriate newlines");
+        }
+
         it("should exist and respect provided compiler options", () => {
             verifyBothNewLines(`
                 function foo() {
@@ -45,5 +57,15 @@ namespace ts {
                 }
             `);
         });
+
+        it("should respect CRLF line endings around outlining spans", () => {
+            verifyOutliningSpanNewLines("// comment not included\r\n// #region name\r\nlet x: string = \"x\";\r\n// #endregion name\r\n",
+            { newLine: NewLineKind.CarriageReturnLineFeed });
+        });
+
+        it("should respect LF line endings around outlining spans", () => {
+            verifyOutliningSpanNewLines("// comment not included\n// #region name\nlet x: string = \"x\";\n// #endregion name\n\n",
+            { newLine: NewLineKind.LineFeed });
+        });
     });
 }

From 00f41e5693e55ede6a243b8fe0f4d982081ef2dd Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Fri, 26 Jul 2019 11:03:31 -0700
Subject: [PATCH 061/151] Less aggressive reduction of intersection types

---
 src/compiler/checker.ts | 70 +++++++++++++++++++++++------------------
 1 file changed, 40 insertions(+), 30 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 0f8326c1fac..8ef7b3453a2 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -15310,7 +15310,7 @@ namespace ts {
                 objectFlags & ObjectFlags.Reference && forEach((<TypeReference>type).typeArguments, couldContainTypeVariables) ||
                 objectFlags & ObjectFlags.Anonymous && type.symbol && type.symbol.flags & (SymbolFlags.Function | SymbolFlags.Method | SymbolFlags.Class | SymbolFlags.TypeLiteral | SymbolFlags.ObjectLiteral) && type.symbol.declarations ||
                 objectFlags & ObjectFlags.Mapped ||
-                type.flags & TypeFlags.UnionOrIntersection && couldUnionOrIntersectionContainTypeVariables(<UnionOrIntersectionType>type));
+                type.flags & TypeFlags.UnionOrIntersection && !(type.flags & TypeFlags.EnumLiteral) && couldUnionOrIntersectionContainTypeVariables(<UnionOrIntersectionType>type));
         }
 
         function couldUnionOrIntersectionContainTypeVariables(type: UnionOrIntersectionType): boolean {
@@ -15487,37 +15487,47 @@ namespace ts {
                     inferFromTypeArguments(source.aliasTypeArguments, target.aliasTypeArguments!, getAliasVariances(source.aliasSymbol));
                     return;
                 }
-                if (source.flags & TypeFlags.Union && target.flags & TypeFlags.Union && !(source.flags & TypeFlags.EnumLiteral && target.flags & TypeFlags.EnumLiteral) ||
-                    source.flags & TypeFlags.Intersection && target.flags & TypeFlags.Intersection) {
-                    // Source and target are both unions or both intersections. If source and target
-                    // are the same type, just relate each constituent type to itself.
-                    if (source === target) {
-                        for (const t of (<UnionOrIntersectionType>source).types) {
-                            inferFromTypes(t, t);
-                        }
-                        return;
+                if (source === target && source.flags & TypeFlags.UnionOrIntersection) {
+                    // When source and target are the same union or intersection type, just relate each constituent
+                    // type to itself.
+                    for (const t of (<UnionOrIntersectionType>source).types) {
+                        inferFromTypes(t, t);
                     }
-                    // First, infer between exactly matching source and target constituents and remove
-                    // the matching types. Types exactly match when they are identical or, in union
-                    // types, when the source is a literal and the target is the corresponding primitive.
-                    const matching = target.flags & TypeFlags.Union ? isTypeOrBaseIdenticalTo : isTypeIdenticalTo;
-                    const [tempSources, tempTargets] = inferFromMatchingTypes((<UnionOrIntersectionType>source).types, (<UnionOrIntersectionType>target).types, matching);
-                    // Next, infer between closely matching source and target constituents and remove
-                    // the matching types. Types closely match when they are instantiations of the same
-                    // object type or instantiations of the same type alias.
-                    const [sources, targets] = inferFromMatchingTypes(tempSources, tempTargets, isTypeCloselyMatchedBy);
-                    if (sources.length === 0 || targets.length === 0) {
-                        return;
-                    }
-                    source = source.flags & TypeFlags.Union ? getUnionType(sources) : getIntersectionType(sources);
-                    target = target.flags & TypeFlags.Union ? getUnionType(targets) : getIntersectionType(targets);
+                    return;
                 }
-                else if (target.flags & TypeFlags.Union && !(target.flags & TypeFlags.EnumLiteral) || target.flags & TypeFlags.Intersection) {
-                    // This block of code is an optimized version of the block above for the simpler case
-                    // of a singleton source type.
-                    const matching = target.flags & TypeFlags.Union ? isTypeOrBaseIdenticalTo : isTypeIdenticalTo;
-                    if (inferFromMatchingType(source, (<UnionOrIntersectionType>target).types, matching)) return;
-                    if (inferFromMatchingType(source, (<UnionOrIntersectionType>target).types, isTypeCloselyMatchedBy)) return;
+                if (target.flags & TypeFlags.Union) {
+                    if (source.flags & TypeFlags.Union) {
+                        // First, infer between identically matching source and target constituents and remove the
+                        // matching types.
+                        const [tempSources, tempTargets] = inferFromMatchingTypes((<UnionType>source).types, (<UnionType>target).types, isTypeOrBaseIdenticalTo);
+                        // Next, infer between closely matching source and target constituents and remove
+                        // the matching types. Types closely match when they are instantiations of the same
+                        // object type or instantiations of the same type alias.
+                        const [sources, targets] = inferFromMatchingTypes(tempSources, tempTargets, isTypeCloselyMatchedBy);
+                        if (sources.length === 0 || targets.length === 0) {
+                            return;
+                        }
+                        source = getUnionType(sources);
+                        target = getUnionType(targets);
+                    }
+                    else {
+                        if (inferFromMatchingType(source, (<UnionType>target).types, isTypeOrBaseIdenticalTo)) return;
+                        if (inferFromMatchingType(source, (<UnionType>target).types, isTypeCloselyMatchedBy)) return;
+                    }
+                }
+                else if (target.flags & TypeFlags.Intersection && some((<IntersectionType>target).types, t => !!getInferenceInfoForType(t))) {
+                    if (source.flags & TypeFlags.Intersection) {
+                        // Infer between identically matching source and target constituents and remove the matching types.
+                        const [sources, targets] = inferFromMatchingTypes((<IntersectionType>source).types, (<IntersectionType>target).types, isTypeIdenticalTo);
+                        if (sources.length === 0 || targets.length === 0) {
+                            return;
+                        }
+                        source = getIntersectionType(sources);
+                        target = getIntersectionType(targets);
+                    }
+                    else if (!(source.flags & TypeFlags.Union)) {
+                        if (inferFromMatchingType(source, (<IntersectionType>target).types, isTypeIdenticalTo)) return;
+                    }
                 }
                 else if (target.flags & (TypeFlags.IndexedAccess | TypeFlags.Substitution)) {
                     target = getActualTypeVariable(target);

From bb87332e73a1024dd3aa1b0fef18575cb504057d Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Fri, 26 Jul 2019 13:12:44 -0700
Subject: [PATCH 062/151] Add more comments

---
 src/compiler/checker.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 8ef7b3453a2..a69751673f6 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -15516,6 +15516,10 @@ namespace ts {
                     }
                 }
                 else if (target.flags & TypeFlags.Intersection && some((<IntersectionType>target).types, t => !!getInferenceInfoForType(t))) {
+                    // We reduce intersection types only when they contain naked type parameters. For example, when
+                    // inferring from 'string[] & { extra: any }' to 'string[] & T' we want to remove string[] and
+                    // infer { extra: any } for T. But when inferring to 'string[] & Iterable<T>' we want to keep the
+                    // string[] on the source side and infer string for T.
                     if (source.flags & TypeFlags.Intersection) {
                         // Infer between identically matching source and target constituents and remove the matching types.
                         const [sources, targets] = inferFromMatchingTypes((<IntersectionType>source).types, (<IntersectionType>target).types, isTypeIdenticalTo);

From ec38799e2a1a9df776882e20d89604c85ec3015f Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Fri, 26 Jul 2019 13:17:00 -0700
Subject: [PATCH 063/151] Add more tests

---
 .../unionAndIntersectionInference3.ts              | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/tests/cases/conformance/types/typeRelationships/typeInference/unionAndIntersectionInference3.ts b/tests/cases/conformance/types/typeRelationships/typeInference/unionAndIntersectionInference3.ts
index 17057de2b84..d64b1973695 100644
--- a/tests/cases/conformance/types/typeRelationships/typeInference/unionAndIntersectionInference3.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeInference/unionAndIntersectionInference3.ts
@@ -40,3 +40,17 @@ declare let g2: <U>(x: Foo2<U> | Bar2<U>) => Promise<U>;
 
 g1 = g2;
 g2 = g1;
+
+// Repro from #32572
+
+declare function foo1<T>(obj: string[] & Iterable<T>): T;
+declare function foo2<T>(obj: string[] & T): T;
+
+declare let sa: string[];
+declare let sx: string[] & { extra: number };
+
+let x1 = foo1(sa);  // string
+let y1 = foo1(sx);  // string
+
+let x2 = foo2(sa);  // unknown
+let y2 = foo2(sx);  // { extra: number }

From 1ea4008120a20c4cca416af2096c5f3a46da7063 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Fri, 26 Jul 2019 13:17:06 -0700
Subject: [PATCH 064/151] Accept new baselines

---
 .../unionAndIntersectionInference3.js         | 18 ++++++++
 .../unionAndIntersectionInference3.symbols    | 44 +++++++++++++++++++
 .../unionAndIntersectionInference3.types      | 41 +++++++++++++++++
 3 files changed, 103 insertions(+)

diff --git a/tests/baselines/reference/unionAndIntersectionInference3.js b/tests/baselines/reference/unionAndIntersectionInference3.js
index c9f5cffa1f7..415d98220a5 100644
--- a/tests/baselines/reference/unionAndIntersectionInference3.js
+++ b/tests/baselines/reference/unionAndIntersectionInference3.js
@@ -38,6 +38,20 @@ declare let g2: <U>(x: Foo2<U> | Bar2<U>) => Promise<U>;
 
 g1 = g2;
 g2 = g1;
+
+// Repro from #32572
+
+declare function foo1<T>(obj: string[] & Iterable<T>): T;
+declare function foo2<T>(obj: string[] & T): T;
+
+declare let sa: string[];
+declare let sx: string[] & { extra: number };
+
+let x1 = foo1(sa);  // string
+let y1 = foo1(sx);  // string
+
+let x2 = foo2(sa);  // unknown
+let y2 = foo2(sx);  // { extra: number }
 
 
 //// [unionAndIntersectionInference3.js]
@@ -52,3 +66,7 @@ f1 = f2;
 f2 = f1;
 g1 = g2;
 g2 = g1;
+let x1 = foo1(sa); // string
+let y1 = foo1(sx); // string
+let x2 = foo2(sa); // unknown
+let y2 = foo2(sx); // { extra: number }
diff --git a/tests/baselines/reference/unionAndIntersectionInference3.symbols b/tests/baselines/reference/unionAndIntersectionInference3.symbols
index b854ee1ce42..1d237951b4f 100644
--- a/tests/baselines/reference/unionAndIntersectionInference3.symbols
+++ b/tests/baselines/reference/unionAndIntersectionInference3.symbols
@@ -161,3 +161,47 @@ g2 = g1;
 >g2 : Symbol(g2, Decl(unionAndIntersectionInference3.ts, 35, 11))
 >g1 : Symbol(g1, Decl(unionAndIntersectionInference3.ts, 34, 11))
 
+// Repro from #32572
+
+declare function foo1<T>(obj: string[] & Iterable<T>): T;
+>foo1 : Symbol(foo1, Decl(unionAndIntersectionInference3.ts, 38, 8))
+>T : Symbol(T, Decl(unionAndIntersectionInference3.ts, 42, 22))
+>obj : Symbol(obj, Decl(unionAndIntersectionInference3.ts, 42, 25))
+>Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --))
+>T : Symbol(T, Decl(unionAndIntersectionInference3.ts, 42, 22))
+>T : Symbol(T, Decl(unionAndIntersectionInference3.ts, 42, 22))
+
+declare function foo2<T>(obj: string[] & T): T;
+>foo2 : Symbol(foo2, Decl(unionAndIntersectionInference3.ts, 42, 57))
+>T : Symbol(T, Decl(unionAndIntersectionInference3.ts, 43, 22))
+>obj : Symbol(obj, Decl(unionAndIntersectionInference3.ts, 43, 25))
+>T : Symbol(T, Decl(unionAndIntersectionInference3.ts, 43, 22))
+>T : Symbol(T, Decl(unionAndIntersectionInference3.ts, 43, 22))
+
+declare let sa: string[];
+>sa : Symbol(sa, Decl(unionAndIntersectionInference3.ts, 45, 11))
+
+declare let sx: string[] & { extra: number };
+>sx : Symbol(sx, Decl(unionAndIntersectionInference3.ts, 46, 11))
+>extra : Symbol(extra, Decl(unionAndIntersectionInference3.ts, 46, 28))
+
+let x1 = foo1(sa);  // string
+>x1 : Symbol(x1, Decl(unionAndIntersectionInference3.ts, 48, 3))
+>foo1 : Symbol(foo1, Decl(unionAndIntersectionInference3.ts, 38, 8))
+>sa : Symbol(sa, Decl(unionAndIntersectionInference3.ts, 45, 11))
+
+let y1 = foo1(sx);  // string
+>y1 : Symbol(y1, Decl(unionAndIntersectionInference3.ts, 49, 3))
+>foo1 : Symbol(foo1, Decl(unionAndIntersectionInference3.ts, 38, 8))
+>sx : Symbol(sx, Decl(unionAndIntersectionInference3.ts, 46, 11))
+
+let x2 = foo2(sa);  // unknown
+>x2 : Symbol(x2, Decl(unionAndIntersectionInference3.ts, 51, 3))
+>foo2 : Symbol(foo2, Decl(unionAndIntersectionInference3.ts, 42, 57))
+>sa : Symbol(sa, Decl(unionAndIntersectionInference3.ts, 45, 11))
+
+let y2 = foo2(sx);  // { extra: number }
+>y2 : Symbol(y2, Decl(unionAndIntersectionInference3.ts, 52, 3))
+>foo2 : Symbol(foo2, Decl(unionAndIntersectionInference3.ts, 42, 57))
+>sx : Symbol(sx, Decl(unionAndIntersectionInference3.ts, 46, 11))
+
diff --git a/tests/baselines/reference/unionAndIntersectionInference3.types b/tests/baselines/reference/unionAndIntersectionInference3.types
index acbca0a1eae..fb507474321 100644
--- a/tests/baselines/reference/unionAndIntersectionInference3.types
+++ b/tests/baselines/reference/unionAndIntersectionInference3.types
@@ -94,3 +94,44 @@ g2 = g1;
 >g2 : <U>(x: Foo2<U> | Bar2<U>) => Promise<U>
 >g1 : <T>(x: Foo2<T> | Bar2<T>) => Promise<T>
 
+// Repro from #32572
+
+declare function foo1<T>(obj: string[] & Iterable<T>): T;
+>foo1 : <T>(obj: string[] & Iterable<T>) => T
+>obj : string[] & Iterable<T>
+
+declare function foo2<T>(obj: string[] & T): T;
+>foo2 : <T>(obj: string[] & T) => T
+>obj : string[] & T
+
+declare let sa: string[];
+>sa : string[]
+
+declare let sx: string[] & { extra: number };
+>sx : string[] & { extra: number; }
+>extra : number
+
+let x1 = foo1(sa);  // string
+>x1 : string
+>foo1(sa) : string
+>foo1 : <T>(obj: string[] & Iterable<T>) => T
+>sa : string[]
+
+let y1 = foo1(sx);  // string
+>y1 : string
+>foo1(sx) : string
+>foo1 : <T>(obj: string[] & Iterable<T>) => T
+>sx : string[] & { extra: number; }
+
+let x2 = foo2(sa);  // unknown
+>x2 : unknown
+>foo2(sa) : unknown
+>foo2 : <T>(obj: string[] & T) => T
+>sa : string[]
+
+let y2 = foo2(sx);  // { extra: number }
+>y2 : { extra: number; }
+>foo2(sx) : { extra: number; }
+>foo2 : <T>(obj: string[] & T) => T
+>sx : string[] & { extra: number; }
+

From 2a4930f4ec75e8accd78744bd02b608d0cef9e4d Mon Sep 17 00:00:00 2001
From: Wesley Wigham <wewigham@microsoft.com>
Date: Fri, 26 Jul 2019 13:57:22 -0700
Subject: [PATCH 065/151] Bind a jsdoc enum as SymbolFlags.TypeAlias and not
 SymbolFlags.Enum (#32520)

* Bind a jsdoc enum as SymbolFlags.TypeAlias and not SymbolFlags.Enum

* Actually include an @enum tag as a declaration

* Add enum tag refs into a couple more syntax kind lists

* accept symbol baseline update
---
 src/compiler/binder.ts                        | 21 +++++++------
 src/compiler/checker.ts                       | 30 +++++++------------
 src/compiler/types.ts                         |  3 +-
 src/compiler/utilities.ts                     | 10 ++++---
 src/harness/typeWriter.ts                     |  2 +-
 .../reference/api/tsserverlibrary.d.ts        |  3 +-
 tests/baselines/reference/api/typescript.d.ts |  3 +-
 tests/baselines/reference/enumTag.symbols     | 16 +++++-----
 .../enumTagCircularReference.errors.txt       |  6 ++--
 .../enumTagCircularReference.symbols          |  2 +-
 .../reference/enumTagImported.symbols         |  2 +-
 .../enumTagUseBeforeDefCrash.symbols          |  2 +-
 .../reference/enumTagUseBeforeDefCrash.types  |  2 +-
 tests/cases/fourslash/findAllRefs_jsEnum.ts   |  2 +-
 tests/cases/fourslash/quickInfoJsdocEnum.ts   |  5 ++--
 15 files changed, 52 insertions(+), 57 deletions(-)

diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts
index 38d5ed24eae..d18ab45a347 100644
--- a/src/compiler/binder.ts
+++ b/src/compiler/binder.ts
@@ -120,7 +120,7 @@ namespace ts {
         let thisParentContainer: Node; // Container one level up
         let blockScopeContainer: Node;
         let lastContainer: Node;
-        let delayedTypeAliases: (JSDocTypedefTag | JSDocCallbackTag)[];
+        let delayedTypeAliases: (JSDocTypedefTag | JSDocCallbackTag | JSDocEnumTag)[];
         let seenThisKeyword: boolean;
 
         // state used by control flow analysis
@@ -732,7 +732,8 @@ namespace ts {
                     break;
                 case SyntaxKind.JSDocTypedefTag:
                 case SyntaxKind.JSDocCallbackTag:
-                    bindJSDocTypeAlias(node as JSDocTypedefTag | JSDocCallbackTag);
+                case SyntaxKind.JSDocEnumTag:
+                    bindJSDocTypeAlias(node as JSDocTypedefTag | JSDocCallbackTag | JSDocEnumTag);
                     break;
                 // In source files and blocks, bind functions first to match hoisting that occurs at runtime
                 case SyntaxKind.SourceFile: {
@@ -1436,9 +1437,9 @@ namespace ts {
             }
         }
 
-        function bindJSDocTypeAlias(node: JSDocTypedefTag | JSDocCallbackTag) {
+        function bindJSDocTypeAlias(node: JSDocTypedefTag | JSDocCallbackTag | JSDocEnumTag) {
             node.tagName.parent = node;
-            if (node.fullName) {
+            if (node.kind !== SyntaxKind.JSDocEnumTag && node.fullName) {
                 setParentPointers(node, node.fullName);
             }
         }
@@ -1805,7 +1806,7 @@ namespace ts {
                 currentFlow = { flags: FlowFlags.Start };
                 parent = typeAlias;
                 bind(typeAlias.typeExpression);
-                if (!typeAlias.fullName || typeAlias.fullName.kind === SyntaxKind.Identifier) {
+                if (isJSDocEnumTag(typeAlias) || !typeAlias.fullName || typeAlias.fullName.kind === SyntaxKind.Identifier) {
                     parent = typeAlias.parent;
                     bindBlockScopedDeclaration(typeAlias, SymbolFlags.TypeAlias, SymbolFlags.TypeAliasExcludes);
                 }
@@ -2319,7 +2320,8 @@ namespace ts {
                     return declareSymbolAndAddToSymbolTable(propTag, flags, SymbolFlags.PropertyExcludes);
                 case SyntaxKind.JSDocTypedefTag:
                 case SyntaxKind.JSDocCallbackTag:
-                    return (delayedTypeAliases || (delayedTypeAliases = [])).push(node as JSDocTypedefTag | JSDocCallbackTag);
+                case SyntaxKind.JSDocEnumTag:
+                    return (delayedTypeAliases || (delayedTypeAliases = [])).push(node as JSDocTypedefTag | JSDocCallbackTag | JSDocEnumTag);
             }
         }
 
@@ -2766,11 +2768,8 @@ namespace ts {
             }
 
             if (!isBindingPattern(node.name)) {
-                const isEnum = isInJSFile(node) && !!getJSDocEnumTag(node);
-                const enumFlags = (isEnum ? SymbolFlags.RegularEnum : SymbolFlags.None);
-                const enumExcludes = (isEnum ? SymbolFlags.RegularEnumExcludes : SymbolFlags.None);
                 if (isBlockOrCatchScoped(node)) {
-                    bindBlockScopedDeclaration(node, SymbolFlags.BlockScopedVariable | enumFlags, SymbolFlags.BlockScopedVariableExcludes | enumExcludes);
+                    bindBlockScopedDeclaration(node, SymbolFlags.BlockScopedVariable, SymbolFlags.BlockScopedVariableExcludes);
                 }
                 else if (isParameterDeclaration(node)) {
                     // It is safe to walk up parent chain to find whether the node is a destructuring parameter declaration
@@ -2785,7 +2784,7 @@ namespace ts {
                     declareSymbolAndAddToSymbolTable(node, SymbolFlags.FunctionScopedVariable, SymbolFlags.ParameterExcludes);
                 }
                 else {
-                    declareSymbolAndAddToSymbolTable(node, SymbolFlags.FunctionScopedVariable | enumFlags, SymbolFlags.FunctionScopedVariableExcludes | enumExcludes);
+                    declareSymbolAndAddToSymbolTable(node, SymbolFlags.FunctionScopedVariable, SymbolFlags.FunctionScopedVariableExcludes);
                 }
             }
         }
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 2f466267f9d..834fb3eccfa 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -1680,6 +1680,7 @@ namespace ts {
                         break;
                     case SyntaxKind.JSDocTypedefTag:
                     case SyntaxKind.JSDocCallbackTag:
+                    case SyntaxKind.JSDocEnumTag:
                         // js type aliases do not resolve names from their host, so skip past it
                         location = getJSDocHost(location);
                         break;
@@ -2025,7 +2026,7 @@ namespace ts {
             // Block-scoped variables cannot be used before their definition
             const declaration = find(
                 result.declarations,
-                d => isBlockOrCatchScoped(d) || isClassLike(d) || (d.kind === SyntaxKind.EnumDeclaration) || isInJSFile(d) && !!getJSDocEnumTag(d));
+                d => isBlockOrCatchScoped(d) || isClassLike(d) || (d.kind === SyntaxKind.EnumDeclaration));
 
             if (declaration === undefined) return Debug.fail("Declaration to checkResolvedBlockScopedVariable is undefined");
 
@@ -4851,6 +4852,7 @@ namespace ts {
                 switch (node.kind) {
                     case SyntaxKind.JSDocCallbackTag:
                     case SyntaxKind.JSDocTypedefTag:
+                    case SyntaxKind.JSDocEnumTag:
                         // Top-level jsdoc type aliases are considered exported
                         // First parent is comment node, second is hosting declaration or token; we only care about those tokens or declarations whose parent is a source file
                         return !!(node.parent && node.parent.parent && node.parent.parent.parent && isSourceFile(node.parent.parent.parent));
@@ -6156,6 +6158,7 @@ namespace ts {
                     case SyntaxKind.TypeAliasDeclaration:
                     case SyntaxKind.JSDocTemplateTag:
                     case SyntaxKind.JSDocTypedefTag:
+                    case SyntaxKind.JSDocEnumTag:
                     case SyntaxKind.JSDocCallbackTag:
                     case SyntaxKind.MappedType:
                     case SyntaxKind.ConditionalType:
@@ -6489,8 +6492,10 @@ namespace ts {
                     return errorType;
                 }
 
-                const declaration = <JSDocTypedefTag | JSDocCallbackTag | TypeAliasDeclaration>find(symbol.declarations, d =>
-                    isJSDocTypeAlias(d) || d.kind === SyntaxKind.TypeAliasDeclaration);
+                const declaration = find(symbol.declarations, isTypeAlias);
+                if (!declaration) {
+                    return Debug.fail("Type alias symbol with no valid declaration found");
+                }
                 const typeNode = isJSDocTypeAlias(declaration) ? declaration.typeExpression : declaration.type;
                 // If typeNode is missing, we will error in checkJSDocTypedefTag.
                 let type = typeNode ? getTypeFromTypeNode(typeNode) : errorType;
@@ -6507,7 +6512,7 @@ namespace ts {
                 }
                 else {
                     type = errorType;
-                    error(declaration.name, Diagnostics.Type_alias_0_circularly_references_itself, symbolToString(symbol));
+                    error(isJSDocEnumTag(declaration) ? declaration : declaration.name || declaration, Diagnostics.Type_alias_0_circularly_references_itself, symbolToString(symbol));
                 }
                 links.declaredType = type;
             }
@@ -9159,21 +9164,6 @@ namespace ts {
                 return type;
             }
 
-            // JS enums are 'string' or 'number', not an enum type.
-            const enumTag = isInJSFile(node) && symbol.valueDeclaration && getJSDocEnumTag(symbol.valueDeclaration);
-            if (enumTag) {
-                const links = getNodeLinks(enumTag);
-                if (!pushTypeResolution(enumTag, TypeSystemPropertyName.EnumTagType)) {
-                    return errorType;
-                }
-                let type = enumTag.typeExpression ? getTypeFromTypeNode(enumTag.typeExpression) : errorType;
-                if (!popTypeResolution()) {
-                    type = errorType;
-                    error(node, Diagnostics.Enum_type_0_circularly_references_itself, symbolToString(symbol));
-                }
-                return (links.resolvedEnumType = type);
-            }
-
             // Get type from reference to named type that cannot be generic (enum or type parameter)
             const res = tryGetDeclaredTypeOfSymbol(symbol);
             if (res) {
@@ -26409,6 +26399,7 @@ namespace ts {
                     // A jsdoc typedef and callback are, by definition, type aliases
                     case SyntaxKind.JSDocTypedefTag:
                     case SyntaxKind.JSDocCallbackTag:
+                    case SyntaxKind.JSDocEnumTag:
                         return DeclarationSpaces.ExportType;
                     case SyntaxKind.ModuleDeclaration:
                         return isAmbientModule(d as ModuleDeclaration) || getModuleInstanceState(d as ModuleDeclaration) !== ModuleInstanceState.NonInstantiated
@@ -30325,6 +30316,7 @@ namespace ts {
                     return checkJSDocAugmentsTag(node as JSDocAugmentsTag);
                 case SyntaxKind.JSDocTypedefTag:
                 case SyntaxKind.JSDocCallbackTag:
+                case SyntaxKind.JSDocEnumTag:
                     return checkJSDocTypeAliasTag(node as JSDocTypedefTag);
                 case SyntaxKind.JSDocTemplateTag:
                     return checkJSDocTemplateTag(node as JSDocTemplateTag);
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 67c85147aed..099f7705f84 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -2466,7 +2466,8 @@ namespace ts {
         kind: SyntaxKind.JSDocClassTag;
     }
 
-    export interface JSDocEnumTag extends JSDocTag {
+    export interface JSDocEnumTag extends JSDocTag, Declaration {
+        parent: JSDoc;
         kind: SyntaxKind.JSDocEnumTag;
         typeExpression?: JSDocTypeExpression;
     }
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index f3282d43723..d13e12a6f19 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -2147,11 +2147,11 @@ namespace ts {
         return !!name && name.escapedText === "new";
     }
 
-    export function isJSDocTypeAlias(node: Node): node is JSDocTypedefTag | JSDocCallbackTag {
-        return node.kind === SyntaxKind.JSDocTypedefTag || node.kind === SyntaxKind.JSDocCallbackTag;
+    export function isJSDocTypeAlias(node: Node): node is JSDocTypedefTag | JSDocCallbackTag | JSDocEnumTag {
+        return node.kind === SyntaxKind.JSDocTypedefTag || node.kind === SyntaxKind.JSDocCallbackTag || node.kind === SyntaxKind.JSDocEnumTag;
     }
 
-    export function isTypeAlias(node: Node): node is JSDocTypedefTag | JSDocCallbackTag | TypeAliasDeclaration {
+    export function isTypeAlias(node: Node): node is JSDocTypedefTag | JSDocCallbackTag | JSDocEnumTag | TypeAliasDeclaration {
         return isJSDocTypeAlias(node) || isTypeAliasDeclaration(node);
     }
 
@@ -5091,7 +5091,7 @@ namespace ts {
      * attempt to draw the name from the node the declaration is on (as that declaration is what its' symbol
      * will be merged with)
      */
-    function nameForNamelessJSDocTypedef(declaration: JSDocTypedefTag): Identifier | undefined {
+    function nameForNamelessJSDocTypedef(declaration: JSDocTypedefTag | JSDocEnumTag): Identifier | undefined {
         const hostNode = declaration.parent.parent;
         if (!hostNode) {
             return undefined;
@@ -5177,6 +5177,8 @@ namespace ts {
             }
             case SyntaxKind.JSDocTypedefTag:
                 return getNameOfJSDocTypedef(declaration as JSDocTypedefTag);
+            case SyntaxKind.JSDocEnumTag:
+                return nameForNamelessJSDocTypedef(declaration as JSDocEnumTag);
             case SyntaxKind.ExportAssignment: {
                 const { expression } = declaration as ExportAssignment;
                 return isIdentifier(expression) ? expression : undefined;
diff --git a/src/harness/typeWriter.ts b/src/harness/typeWriter.ts
index b0b20c92e64..e8b4401b846 100644
--- a/src/harness/typeWriter.ts
+++ b/src/harness/typeWriter.ts
@@ -97,7 +97,7 @@ class TypeWriterWalker {
         if (!isSymbolWalk) {
             // Don't try to get the type of something that's already a type.
             // Exception for `T` in `type T = something` because that may evaluate to some interesting type.
-            if (ts.isPartOfTypeNode(node) || ts.isIdentifier(node) && !(ts.getMeaningFromDeclaration(node.parent) & ts.SemanticMeaning.Value) && !(ts.isTypeAlias(node.parent) && node.parent.name === node)) {
+            if (ts.isPartOfTypeNode(node) || ts.isIdentifier(node) && !(ts.getMeaningFromDeclaration(node.parent) & ts.SemanticMeaning.Value) && !(ts.isTypeAliasDeclaration(node.parent) && node.parent.name === node)) {
                 return undefined;
             }
 
diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts
index c2bad61505b..6d81a6f08ab 100644
--- a/tests/baselines/reference/api/tsserverlibrary.d.ts
+++ b/tests/baselines/reference/api/tsserverlibrary.d.ts
@@ -1589,7 +1589,8 @@ declare namespace ts {
     interface JSDocClassTag extends JSDocTag {
         kind: SyntaxKind.JSDocClassTag;
     }
-    interface JSDocEnumTag extends JSDocTag {
+    interface JSDocEnumTag extends JSDocTag, Declaration {
+        parent: JSDoc;
         kind: SyntaxKind.JSDocEnumTag;
         typeExpression?: JSDocTypeExpression;
     }
diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts
index 7a2559bbc22..ebd2d1471f7 100644
--- a/tests/baselines/reference/api/typescript.d.ts
+++ b/tests/baselines/reference/api/typescript.d.ts
@@ -1589,7 +1589,8 @@ declare namespace ts {
     interface JSDocClassTag extends JSDocTag {
         kind: SyntaxKind.JSDocClassTag;
     }
-    interface JSDocEnumTag extends JSDocTag {
+    interface JSDocEnumTag extends JSDocTag, Declaration {
+        parent: JSDoc;
         kind: SyntaxKind.JSDocEnumTag;
         typeExpression?: JSDocTypeExpression;
     }
diff --git a/tests/baselines/reference/enumTag.symbols b/tests/baselines/reference/enumTag.symbols
index a54b9f4a3d8..87bcd6961a5 100644
--- a/tests/baselines/reference/enumTag.symbols
+++ b/tests/baselines/reference/enumTag.symbols
@@ -1,7 +1,7 @@
 === tests/cases/conformance/jsdoc/a.js ===
 /** @enum {string} */
 const Target = {
->Target : Symbol(Target, Decl(a.js, 1, 5))
+>Target : Symbol(Target, Decl(a.js, 1, 5), Decl(a.js, 0, 4))
 
     START: "start",
 >START : Symbol(START, Decl(a.js, 1, 16))
@@ -21,7 +21,7 @@ const Target = {
 }
 /** @enum number */
 const Second = {
->Second : Symbol(Second, Decl(a.js, 10, 5))
+>Second : Symbol(Second, Decl(a.js, 10, 5), Decl(a.js, 9, 4))
 
     MISTAKE: "end",
 >MISTAKE : Symbol(MISTAKE, Decl(a.js, 10, 16))
@@ -35,7 +35,7 @@ const Second = {
 }
 /** @enum {function(number): number} */
 const Fs = {
->Fs : Symbol(Fs, Decl(a.js, 17, 5))
+>Fs : Symbol(Fs, Decl(a.js, 17, 5), Decl(a.js, 16, 4))
 
     ADD1: n => n + 1,
 >ADD1 : Symbol(ADD1, Decl(a.js, 17, 12))
@@ -82,17 +82,17 @@ function consume(t,s,f) {
     var v = Target.START
 >v : Symbol(v, Decl(a.js, 35, 7))
 >Target.START : Symbol(START, Decl(a.js, 1, 16))
->Target : Symbol(Target, Decl(a.js, 1, 5))
+>Target : Symbol(Target, Decl(a.js, 1, 5), Decl(a.js, 0, 4))
 >START : Symbol(START, Decl(a.js, 1, 16))
 
     v = Target.UNKNOWN // error, can't find 'UNKNOWN'
 >v : Symbol(v, Decl(a.js, 35, 7))
->Target : Symbol(Target, Decl(a.js, 1, 5))
+>Target : Symbol(Target, Decl(a.js, 1, 5), Decl(a.js, 0, 4))
 
     v = Second.MISTAKE // meh..ok, I guess?
 >v : Symbol(v, Decl(a.js, 35, 7))
 >Second.MISTAKE : Symbol(MISTAKE, Decl(a.js, 10, 16))
->Second : Symbol(Second, Decl(a.js, 10, 5))
+>Second : Symbol(Second, Decl(a.js, 10, 5), Decl(a.js, 9, 4))
 >MISTAKE : Symbol(MISTAKE, Decl(a.js, 10, 16))
 
     v = 'something else' // allowed, like Typescript's classic enums and unlike its string enums
@@ -105,14 +105,14 @@ function ff(s) {
 
     // element access with arbitrary string is an error only with noImplicitAny
     if (!Target[s]) {
->Target : Symbol(Target, Decl(a.js, 1, 5))
+>Target : Symbol(Target, Decl(a.js, 1, 5), Decl(a.js, 0, 4))
 >s : Symbol(s, Decl(a.js, 41, 12))
 
         return null
     }
     else {
         return Target[s]
->Target : Symbol(Target, Decl(a.js, 1, 5))
+>Target : Symbol(Target, Decl(a.js, 1, 5), Decl(a.js, 0, 4))
 >s : Symbol(s, Decl(a.js, 41, 12))
     }
 }
diff --git a/tests/baselines/reference/enumTagCircularReference.errors.txt b/tests/baselines/reference/enumTagCircularReference.errors.txt
index f876b5a33da..f42be3719f9 100644
--- a/tests/baselines/reference/enumTagCircularReference.errors.txt
+++ b/tests/baselines/reference/enumTagCircularReference.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/jsdoc/bug27142.js(1,12): error TS2586: Enum type 'E' circularly references itself.
+tests/cases/conformance/jsdoc/bug27142.js(1,5): error TS2456: Type alias 'E' circularly references itself.
 
 
 ==== tests/cases/conformance/jsdoc/bug27142.js (1 errors) ====
     /** @enum {E} */
-               ~
-!!! error TS2586: Enum type 'E' circularly references itself.
+        ~~~~~~~~~
+!!! error TS2456: Type alias 'E' circularly references itself.
     const E = { x: 0 };
     
\ No newline at end of file
diff --git a/tests/baselines/reference/enumTagCircularReference.symbols b/tests/baselines/reference/enumTagCircularReference.symbols
index e3c594ac9d1..1236c02e392 100644
--- a/tests/baselines/reference/enumTagCircularReference.symbols
+++ b/tests/baselines/reference/enumTagCircularReference.symbols
@@ -1,6 +1,6 @@
 === tests/cases/conformance/jsdoc/bug27142.js ===
 /** @enum {E} */
 const E = { x: 0 };
->E : Symbol(E, Decl(bug27142.js, 1, 5))
+>E : Symbol(E, Decl(bug27142.js, 1, 5), Decl(bug27142.js, 0, 4))
 >x : Symbol(x, Decl(bug27142.js, 1, 11))
 
diff --git a/tests/baselines/reference/enumTagImported.symbols b/tests/baselines/reference/enumTagImported.symbols
index ab9ab5eceb1..a79198aaae1 100644
--- a/tests/baselines/reference/enumTagImported.symbols
+++ b/tests/baselines/reference/enumTagImported.symbols
@@ -23,7 +23,7 @@ const tist = TestEnum.ADD
 === tests/cases/conformance/jsdoc/mod1.js ===
 /** @enum {string} */
 export const TestEnum = {
->TestEnum : Symbol(TestEnum, Decl(mod1.js, 1, 12))
+>TestEnum : Symbol(TestEnum, Decl(mod1.js, 1, 12), Decl(mod1.js, 0, 4))
 
     ADD: 'add',
 >ADD : Symbol(ADD, Decl(mod1.js, 1, 25))
diff --git a/tests/baselines/reference/enumTagUseBeforeDefCrash.symbols b/tests/baselines/reference/enumTagUseBeforeDefCrash.symbols
index 1cef96a9823..8ec8a90e64b 100644
--- a/tests/baselines/reference/enumTagUseBeforeDefCrash.symbols
+++ b/tests/baselines/reference/enumTagUseBeforeDefCrash.symbols
@@ -3,7 +3,7 @@
  * @enum {number}
  */
 var foo = { };
->foo : Symbol(foo, Decl(bug27134.js, 3, 3))
+>foo : Symbol(foo, Decl(bug27134.js, 3, 3), Decl(bug27134.js, 1, 3))
 
 /**
  * @type {foo}
diff --git a/tests/baselines/reference/enumTagUseBeforeDefCrash.types b/tests/baselines/reference/enumTagUseBeforeDefCrash.types
index 159781fee05..d9f800d0d03 100644
--- a/tests/baselines/reference/enumTagUseBeforeDefCrash.types
+++ b/tests/baselines/reference/enumTagUseBeforeDefCrash.types
@@ -3,7 +3,7 @@
  * @enum {number}
  */
 var foo = { };
->foo : typeof foo
+>foo : {}
 >{ } : {}
 
 /**
diff --git a/tests/cases/fourslash/findAllRefs_jsEnum.ts b/tests/cases/fourslash/findAllRefs_jsEnum.ts
index f9033d6c588..d492cd84de4 100644
--- a/tests/cases/fourslash/findAllRefs_jsEnum.ts
+++ b/tests/cases/fourslash/findAllRefs_jsEnum.ts
@@ -10,7 +10,7 @@
 ////const e = [|E|].A;
 
 verify.singleReferenceGroup(
-`enum E
+`type E = string
 const E: {
     A: string;
 }`, "E");
diff --git a/tests/cases/fourslash/quickInfoJsdocEnum.ts b/tests/cases/fourslash/quickInfoJsdocEnum.ts
index 9ef3b1edc78..b8264b52110 100644
--- a/tests/cases/fourslash/quickInfoJsdocEnum.ts
+++ b/tests/cases/fourslash/quickInfoJsdocEnum.ts
@@ -18,11 +18,10 @@
 verify.noErrors();
 
 verify.quickInfoAt("type",
-`enum E`,
+`type E = number`,
 "Doc");
 verify.quickInfoAt("value",
-`enum E
-const E: {
+`const E: {
     A: number;
 }`,
 "Doc");

From 3d09010dc8916446f3e7a00df7845bc982ae721f Mon Sep 17 00:00:00 2001
From: Andrew Branch <andrewbranch@users.noreply.github.com>
Date: Fri, 26 Jul 2019 14:56:03 -0700
Subject: [PATCH 066/151] Intersect 'this' types in union signatures (#32538)

* Intersect this types in union signatures

* Actually update baselines
---
 src/compiler/checker.ts                       |  13 +-
 .../unionThisTypeInFunctions.errors.txt       |  34 ++++
 .../reference/unionThisTypeInFunctions.js     |   4 +-
 .../unionThisTypeInFunctions.symbols          |   2 +-
 .../reference/unionThisTypeInFunctions.types  |   4 +-
 .../unionTypeCallSignatures5.errors.txt       |  19 ++
 .../reference/unionTypeCallSignatures5.types  |   2 +-
 .../unionTypeCallSignatures6.errors.txt       |  98 +++++++++
 .../reference/unionTypeCallSignatures6.js     |  69 +++++++
 .../unionTypeCallSignatures6.symbols          | 187 ++++++++++++++++++
 .../reference/unionTypeCallSignatures6.types  | 150 ++++++++++++++
 .../thisType/unionThisTypeInFunctions.ts      |   2 +-
 .../types/union/unionTypeCallSignatures6.ts   |  55 ++++++
 13 files changed, 626 insertions(+), 13 deletions(-)
 create mode 100644 tests/baselines/reference/unionThisTypeInFunctions.errors.txt
 create mode 100644 tests/baselines/reference/unionTypeCallSignatures5.errors.txt
 create mode 100644 tests/baselines/reference/unionTypeCallSignatures6.errors.txt
 create mode 100644 tests/baselines/reference/unionTypeCallSignatures6.js
 create mode 100644 tests/baselines/reference/unionTypeCallSignatures6.symbols
 create mode 100644 tests/baselines/reference/unionTypeCallSignatures6.types
 create mode 100644 tests/cases/conformance/types/union/unionTypeCallSignatures6.ts

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 834fb3eccfa..f8242ed6df7 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -7181,8 +7181,9 @@ namespace ts {
             }
             let result: Signature[] | undefined;
             for (let i = 0; i < signatureLists.length; i++) {
-                // Allow matching non-generic signatures to have excess parameters and different return types
-                const match = i === listIndex ? signature : findMatchingSignature(signatureLists[i], signature, /*partialMatch*/ true, /*ignoreThisTypes*/ true, /*ignoreReturnTypes*/ true);
+                // Allow matching non-generic signatures to have excess parameters and different return types.
+                // Prefer matching this types if possible.
+                const match = i === listIndex ? signature : findMatchingSignature(signatureLists[i], signature, /*partialMatch*/ true, /*ignoreThisTypes*/ false, /*ignoreReturnTypes*/ true);
                 if (!match) {
                     return undefined;
                 }
@@ -7205,7 +7206,7 @@ namespace ts {
                 }
                 for (const signature of signatureLists[i]) {
                     // Only process signatures with parameter lists that aren't already in the result list
-                    if (!result || !findMatchingSignature(result, signature, /*partialMatch*/ false, /*ignoreThisTypes*/ true, /*ignoreReturnTypes*/ true)) {
+                    if (!result || !findMatchingSignature(result, signature, /*partialMatch*/ false, /*ignoreThisTypes*/ false, /*ignoreReturnTypes*/ true)) {
                         const unionSignatures = findMatchingSignatures(signatureLists, signature, i);
                         if (unionSignatures) {
                             let s = signature;
@@ -7214,7 +7215,7 @@ namespace ts {
                                 let thisParameter = signature.thisParameter;
                                 const firstThisParameterOfUnionSignatures = forEach(unionSignatures, sig => sig.thisParameter);
                                 if (firstThisParameterOfUnionSignatures) {
-                                    const thisType = getUnionType(map(unionSignatures, sig => sig.thisParameter ? getTypeOfSymbol(sig.thisParameter) : anyType), UnionReduction.Subtype);
+                                    const thisType = getIntersectionType(mapDefined(unionSignatures, sig => sig.thisParameter && getTypeOfSymbol(sig.thisParameter)));
                                     thisParameter = createSymbolWithType(firstThisParameterOfUnionSignatures, thisType);
                                 }
                                 s = createUnionSignature(signature, unionSignatures);
@@ -7253,8 +7254,8 @@ namespace ts {
             }
             // A signature `this` type might be a read or a write position... It's very possible that it should be invariant
             // and we should refuse to merge signatures if there are `this` types and they do not match. However, so as to be
-            // permissive when calling, for now, we'll union the `this` types just like the overlapping-union-signature check does
-            const thisType = getUnionType([getTypeOfSymbol(left), getTypeOfSymbol(right)], UnionReduction.Subtype);
+            // permissive when calling, for now, we'll intersect the `this` types just like we do for param types in union signatures.
+            const thisType = getIntersectionType([getTypeOfSymbol(left), getTypeOfSymbol(right)]);
             return createSymbolWithType(left, thisType);
         }
 
diff --git a/tests/baselines/reference/unionThisTypeInFunctions.errors.txt b/tests/baselines/reference/unionThisTypeInFunctions.errors.txt
new file mode 100644
index 00000000000..db03a5426fb
--- /dev/null
+++ b/tests/baselines/reference/unionThisTypeInFunctions.errors.txt
@@ -0,0 +1,34 @@
+tests/cases/conformance/types/thisType/unionThisTypeInFunctions.ts(10,5): error TS2684: The 'this' context of type 'Real | Fake' is not assignable to method's 'this' of type 'Real & Fake'.
+  Type 'Real' is not assignable to type 'Real & Fake'.
+    Type 'Real' is not assignable to type 'Fake'.
+      Types of property 'method' are incompatible.
+        Type '(this: Real, n: number) => void' is not assignable to type '(this: Fake, n: number) => void'.
+          The 'this' types of each signature are incompatible.
+            Type 'Fake' is not assignable to type 'Real'.
+              Types of property 'data' are incompatible.
+                Type 'number' is not assignable to type 'string'.
+
+
+==== tests/cases/conformance/types/thisType/unionThisTypeInFunctions.ts (1 errors) ====
+    interface Real {
+        method(this: this, n: number): void;
+        data: string;
+    }
+    interface Fake {
+        method(this: this, n: number): void;
+        data: number;
+    }
+    function test(r: Real | Fake) {
+        r.method(12); // error
+        ~
+!!! error TS2684: The 'this' context of type 'Real | Fake' is not assignable to method's 'this' of type 'Real & Fake'.
+!!! error TS2684:   Type 'Real' is not assignable to type 'Real & Fake'.
+!!! error TS2684:     Type 'Real' is not assignable to type 'Fake'.
+!!! error TS2684:       Types of property 'method' are incompatible.
+!!! error TS2684:         Type '(this: Real, n: number) => void' is not assignable to type '(this: Fake, n: number) => void'.
+!!! error TS2684:           The 'this' types of each signature are incompatible.
+!!! error TS2684:             Type 'Fake' is not assignable to type 'Real'.
+!!! error TS2684:               Types of property 'data' are incompatible.
+!!! error TS2684:                 Type 'number' is not assignable to type 'string'.
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unionThisTypeInFunctions.js b/tests/baselines/reference/unionThisTypeInFunctions.js
index 0d4b535ff8b..dca64b6d893 100644
--- a/tests/baselines/reference/unionThisTypeInFunctions.js
+++ b/tests/baselines/reference/unionThisTypeInFunctions.js
@@ -8,11 +8,11 @@ interface Fake {
     data: number;
 }
 function test(r: Real | Fake) {
-    r.method(12);
+    r.method(12); // error
 }
 
 
 //// [unionThisTypeInFunctions.js]
 function test(r) {
-    r.method(12);
+    r.method(12); // error
 }
diff --git a/tests/baselines/reference/unionThisTypeInFunctions.symbols b/tests/baselines/reference/unionThisTypeInFunctions.symbols
index eada1231750..b907519626a 100644
--- a/tests/baselines/reference/unionThisTypeInFunctions.symbols
+++ b/tests/baselines/reference/unionThisTypeInFunctions.symbols
@@ -27,7 +27,7 @@ function test(r: Real | Fake) {
 >Real : Symbol(Real, Decl(unionThisTypeInFunctions.ts, 0, 0))
 >Fake : Symbol(Fake, Decl(unionThisTypeInFunctions.ts, 3, 1))
 
-    r.method(12);
+    r.method(12); // error
 >r.method : Symbol(method, Decl(unionThisTypeInFunctions.ts, 0, 16), Decl(unionThisTypeInFunctions.ts, 4, 16))
 >r : Symbol(r, Decl(unionThisTypeInFunctions.ts, 8, 14))
 >method : Symbol(method, Decl(unionThisTypeInFunctions.ts, 0, 16), Decl(unionThisTypeInFunctions.ts, 4, 16))
diff --git a/tests/baselines/reference/unionThisTypeInFunctions.types b/tests/baselines/reference/unionThisTypeInFunctions.types
index 44c03d73a61..af987759a55 100644
--- a/tests/baselines/reference/unionThisTypeInFunctions.types
+++ b/tests/baselines/reference/unionThisTypeInFunctions.types
@@ -21,8 +21,8 @@ function test(r: Real | Fake) {
 >test : (r: Real | Fake) => void
 >r : Real | Fake
 
-    r.method(12);
->r.method(12) : void
+    r.method(12); // error
+>r.method(12) : any
 >r.method : ((this: Real, n: number) => void) | ((this: Fake, n: number) => void)
 >r : Real | Fake
 >method : ((this: Real, n: number) => void) | ((this: Fake, n: number) => void)
diff --git a/tests/baselines/reference/unionTypeCallSignatures5.errors.txt b/tests/baselines/reference/unionTypeCallSignatures5.errors.txt
new file mode 100644
index 00000000000..2dc6ebb002b
--- /dev/null
+++ b/tests/baselines/reference/unionTypeCallSignatures5.errors.txt
@@ -0,0 +1,19 @@
+tests/cases/conformance/types/union/unionTypeCallSignatures5.ts(12,1): error TS2684: The 'this' context of type 'void' is not assignable to method's 'this' of type 'never'.
+
+
+==== tests/cases/conformance/types/union/unionTypeCallSignatures5.ts (1 errors) ====
+    // #31485
+    interface A {
+      (this: void, b?: number): void;
+    }
+    interface B {
+      (this: number, b?: number): void;
+    }
+    interface C {
+      (i: number): void;
+    }
+    declare const fn: A | B | C;
+    fn(0);
+    ~~~~~
+!!! error TS2684: The 'this' context of type 'void' is not assignable to method's 'this' of type 'never'.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unionTypeCallSignatures5.types b/tests/baselines/reference/unionTypeCallSignatures5.types
index 53ce4ea6550..b9b5a6fbc0d 100644
--- a/tests/baselines/reference/unionTypeCallSignatures5.types
+++ b/tests/baselines/reference/unionTypeCallSignatures5.types
@@ -18,7 +18,7 @@ declare const fn: A | B | C;
 >fn : A | B | C
 
 fn(0);
->fn(0) : void
+>fn(0) : any
 >fn : A | B | C
 >0 : 0
 
diff --git a/tests/baselines/reference/unionTypeCallSignatures6.errors.txt b/tests/baselines/reference/unionTypeCallSignatures6.errors.txt
new file mode 100644
index 00000000000..51b18b204a7
--- /dev/null
+++ b/tests/baselines/reference/unionTypeCallSignatures6.errors.txt
@@ -0,0 +1,98 @@
+tests/cases/conformance/types/union/unionTypeCallSignatures6.ts(11,1): error TS2684: The 'this' context of type 'void' is not assignable to method's 'this' of type 'A & B'.
+  Type 'void' is not assignable to type 'A'.
+tests/cases/conformance/types/union/unionTypeCallSignatures6.ts(13,1): error TS2684: The 'this' context of type 'void' is not assignable to method's 'this' of type 'A'.
+tests/cases/conformance/types/union/unionTypeCallSignatures6.ts(38,4): error TS2349: This expression is not callable.
+  Each member of the union type 'F3 | F4' has signatures, but none of those signatures are compatible with each other.
+tests/cases/conformance/types/union/unionTypeCallSignatures6.ts(39,1): error TS2684: The 'this' context of type 'A & C & { f0: F0 | F3; f1: F1 | F3; f2: F1 | F4; f3: F3 | F4; f4: F3 | F5; }' is not assignable to method's 'this' of type 'B'.
+  Property 'b' is missing in type 'A & C & { f0: F0 | F3; f1: F1 | F3; f2: F1 | F4; f3: F3 | F4; f4: F3 | F5; }' but required in type 'B'.
+tests/cases/conformance/types/union/unionTypeCallSignatures6.ts(48,1): error TS2684: The 'this' context of type 'void' is not assignable to method's 'this' of type 'A & B'.
+  Type 'void' is not assignable to type 'A'.
+tests/cases/conformance/types/union/unionTypeCallSignatures6.ts(55,1): error TS2769: No overload matches this call.
+  Overload 1 of 2, '(this: A & B & C): void', gave the following error.
+    The 'this' context of type 'void' is not assignable to method's 'this' of type 'A & B & C'.
+      Type 'void' is not assignable to type 'A'.
+  Overload 2 of 2, '(this: A & B): void', gave the following error.
+    The 'this' context of type 'void' is not assignable to method's 'this' of type 'A & B'.
+      Type 'void' is not assignable to type 'A'.
+
+
+==== tests/cases/conformance/types/union/unionTypeCallSignatures6.ts (6 errors) ====
+    type A = { a: string };
+    type B = { b: number };
+    type C = { c: string };
+    type D = { d: number };
+    type F0 = () => void;
+    
+    // #31547
+    type F1 = (this: A) => void;
+    type F2 = (this: B) => void;
+    declare var f1: F1 | F2;
+    f1(); // error
+    ~~~~
+!!! error TS2684: The 'this' context of type 'void' is not assignable to method's 'this' of type 'A & B'.
+!!! error TS2684:   Type 'void' is not assignable to type 'A'.
+    declare var f2: F0 | F1;
+    f2(); // error
+    ~~~~
+!!! error TS2684: The 'this' context of type 'void' is not assignable to method's 'this' of type 'A'.
+    
+    interface F3 {
+      (this: A): void;
+      (this: B): void;
+    }
+    interface F4 {
+      (this: C): void;
+      (this: D): void;
+    }
+    interface F5 {
+      (this: C): void;
+      (this: B): void;
+    }
+    
+    declare var x1: A & C & {
+      f0: F0 | F3;
+      f1: F1 | F3;
+      f2: F1 | F4;
+      f3: F3 | F4;
+      f4: F3 | F5;
+    }
+    x1.f0();
+    x1.f1();
+    x1.f2();
+    x1.f3(); // error
+       ~~
+!!! error TS2349: This expression is not callable.
+!!! error TS2349:   Each member of the union type 'F3 | F4' has signatures, but none of those signatures are compatible with each other.
+    x1.f4(); // error
+    ~~
+!!! error TS2684: The 'this' context of type 'A & C & { f0: F0 | F3; f1: F1 | F3; f2: F1 | F4; f3: F3 | F4; f4: F3 | F5; }' is not assignable to method's 'this' of type 'B'.
+!!! error TS2684:   Property 'b' is missing in type 'A & C & { f0: F0 | F3; f1: F1 | F3; f2: F1 | F4; f3: F3 | F4; f4: F3 | F5; }' but required in type 'B'.
+!!! related TS2728 tests/cases/conformance/types/union/unionTypeCallSignatures6.ts:2:12: 'b' is declared here.
+    
+    declare var x2: A & B & {
+      f4: F3 | F5;
+    }
+    x2.f4();
+    
+    type F6 = (this: A & B) => void;
+    declare var f3: F1 | F6;
+    f3(); // error
+    ~~~~
+!!! error TS2684: The 'this' context of type 'void' is not assignable to method's 'this' of type 'A & B'.
+!!! error TS2684:   Type 'void' is not assignable to type 'A'.
+    
+    interface F7 {
+      (this: A & B & C): void;
+      (this: A & B): void;
+    }
+    declare var f4: F6 | F7;
+    f4(); // error
+    ~~~~
+!!! error TS2769: No overload matches this call.
+!!! error TS2769:   Overload 1 of 2, '(this: A & B & C): void', gave the following error.
+!!! error TS2769:     The 'this' context of type 'void' is not assignable to method's 'this' of type 'A & B & C'.
+!!! error TS2769:       Type 'void' is not assignable to type 'A'.
+!!! error TS2769:   Overload 2 of 2, '(this: A & B): void', gave the following error.
+!!! error TS2769:     The 'this' context of type 'void' is not assignable to method's 'this' of type 'A & B'.
+!!! error TS2769:       Type 'void' is not assignable to type 'A'.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unionTypeCallSignatures6.js b/tests/baselines/reference/unionTypeCallSignatures6.js
new file mode 100644
index 00000000000..32e0518cbb8
--- /dev/null
+++ b/tests/baselines/reference/unionTypeCallSignatures6.js
@@ -0,0 +1,69 @@
+//// [unionTypeCallSignatures6.ts]
+type A = { a: string };
+type B = { b: number };
+type C = { c: string };
+type D = { d: number };
+type F0 = () => void;
+
+// #31547
+type F1 = (this: A) => void;
+type F2 = (this: B) => void;
+declare var f1: F1 | F2;
+f1(); // error
+declare var f2: F0 | F1;
+f2(); // error
+
+interface F3 {
+  (this: A): void;
+  (this: B): void;
+}
+interface F4 {
+  (this: C): void;
+  (this: D): void;
+}
+interface F5 {
+  (this: C): void;
+  (this: B): void;
+}
+
+declare var x1: A & C & {
+  f0: F0 | F3;
+  f1: F1 | F3;
+  f2: F1 | F4;
+  f3: F3 | F4;
+  f4: F3 | F5;
+}
+x1.f0();
+x1.f1();
+x1.f2();
+x1.f3(); // error
+x1.f4(); // error
+
+declare var x2: A & B & {
+  f4: F3 | F5;
+}
+x2.f4();
+
+type F6 = (this: A & B) => void;
+declare var f3: F1 | F6;
+f3(); // error
+
+interface F7 {
+  (this: A & B & C): void;
+  (this: A & B): void;
+}
+declare var f4: F6 | F7;
+f4(); // error
+
+
+//// [unionTypeCallSignatures6.js]
+f1(); // error
+f2(); // error
+x1.f0();
+x1.f1();
+x1.f2();
+x1.f3(); // error
+x1.f4(); // error
+x2.f4();
+f3(); // error
+f4(); // error
diff --git a/tests/baselines/reference/unionTypeCallSignatures6.symbols b/tests/baselines/reference/unionTypeCallSignatures6.symbols
new file mode 100644
index 00000000000..87d1928f069
--- /dev/null
+++ b/tests/baselines/reference/unionTypeCallSignatures6.symbols
@@ -0,0 +1,187 @@
+=== tests/cases/conformance/types/union/unionTypeCallSignatures6.ts ===
+type A = { a: string };
+>A : Symbol(A, Decl(unionTypeCallSignatures6.ts, 0, 0))
+>a : Symbol(a, Decl(unionTypeCallSignatures6.ts, 0, 10))
+
+type B = { b: number };
+>B : Symbol(B, Decl(unionTypeCallSignatures6.ts, 0, 23))
+>b : Symbol(b, Decl(unionTypeCallSignatures6.ts, 1, 10))
+
+type C = { c: string };
+>C : Symbol(C, Decl(unionTypeCallSignatures6.ts, 1, 23))
+>c : Symbol(c, Decl(unionTypeCallSignatures6.ts, 2, 10))
+
+type D = { d: number };
+>D : Symbol(D, Decl(unionTypeCallSignatures6.ts, 2, 23))
+>d : Symbol(d, Decl(unionTypeCallSignatures6.ts, 3, 10))
+
+type F0 = () => void;
+>F0 : Symbol(F0, Decl(unionTypeCallSignatures6.ts, 3, 23))
+
+// #31547
+type F1 = (this: A) => void;
+>F1 : Symbol(F1, Decl(unionTypeCallSignatures6.ts, 4, 21))
+>this : Symbol(this, Decl(unionTypeCallSignatures6.ts, 7, 11))
+>A : Symbol(A, Decl(unionTypeCallSignatures6.ts, 0, 0))
+
+type F2 = (this: B) => void;
+>F2 : Symbol(F2, Decl(unionTypeCallSignatures6.ts, 7, 28))
+>this : Symbol(this, Decl(unionTypeCallSignatures6.ts, 8, 11))
+>B : Symbol(B, Decl(unionTypeCallSignatures6.ts, 0, 23))
+
+declare var f1: F1 | F2;
+>f1 : Symbol(f1, Decl(unionTypeCallSignatures6.ts, 9, 11))
+>F1 : Symbol(F1, Decl(unionTypeCallSignatures6.ts, 4, 21))
+>F2 : Symbol(F2, Decl(unionTypeCallSignatures6.ts, 7, 28))
+
+f1(); // error
+>f1 : Symbol(f1, Decl(unionTypeCallSignatures6.ts, 9, 11))
+
+declare var f2: F0 | F1;
+>f2 : Symbol(f2, Decl(unionTypeCallSignatures6.ts, 11, 11))
+>F0 : Symbol(F0, Decl(unionTypeCallSignatures6.ts, 3, 23))
+>F1 : Symbol(F1, Decl(unionTypeCallSignatures6.ts, 4, 21))
+
+f2(); // error
+>f2 : Symbol(f2, Decl(unionTypeCallSignatures6.ts, 11, 11))
+
+interface F3 {
+>F3 : Symbol(F3, Decl(unionTypeCallSignatures6.ts, 12, 5))
+
+  (this: A): void;
+>this : Symbol(this, Decl(unionTypeCallSignatures6.ts, 15, 3))
+>A : Symbol(A, Decl(unionTypeCallSignatures6.ts, 0, 0))
+
+  (this: B): void;
+>this : Symbol(this, Decl(unionTypeCallSignatures6.ts, 16, 3))
+>B : Symbol(B, Decl(unionTypeCallSignatures6.ts, 0, 23))
+}
+interface F4 {
+>F4 : Symbol(F4, Decl(unionTypeCallSignatures6.ts, 17, 1))
+
+  (this: C): void;
+>this : Symbol(this, Decl(unionTypeCallSignatures6.ts, 19, 3))
+>C : Symbol(C, Decl(unionTypeCallSignatures6.ts, 1, 23))
+
+  (this: D): void;
+>this : Symbol(this, Decl(unionTypeCallSignatures6.ts, 20, 3))
+>D : Symbol(D, Decl(unionTypeCallSignatures6.ts, 2, 23))
+}
+interface F5 {
+>F5 : Symbol(F5, Decl(unionTypeCallSignatures6.ts, 21, 1))
+
+  (this: C): void;
+>this : Symbol(this, Decl(unionTypeCallSignatures6.ts, 23, 3))
+>C : Symbol(C, Decl(unionTypeCallSignatures6.ts, 1, 23))
+
+  (this: B): void;
+>this : Symbol(this, Decl(unionTypeCallSignatures6.ts, 24, 3))
+>B : Symbol(B, Decl(unionTypeCallSignatures6.ts, 0, 23))
+}
+
+declare var x1: A & C & {
+>x1 : Symbol(x1, Decl(unionTypeCallSignatures6.ts, 27, 11))
+>A : Symbol(A, Decl(unionTypeCallSignatures6.ts, 0, 0))
+>C : Symbol(C, Decl(unionTypeCallSignatures6.ts, 1, 23))
+
+  f0: F0 | F3;
+>f0 : Symbol(f0, Decl(unionTypeCallSignatures6.ts, 27, 25))
+>F0 : Symbol(F0, Decl(unionTypeCallSignatures6.ts, 3, 23))
+>F3 : Symbol(F3, Decl(unionTypeCallSignatures6.ts, 12, 5))
+
+  f1: F1 | F3;
+>f1 : Symbol(f1, Decl(unionTypeCallSignatures6.ts, 28, 14))
+>F1 : Symbol(F1, Decl(unionTypeCallSignatures6.ts, 4, 21))
+>F3 : Symbol(F3, Decl(unionTypeCallSignatures6.ts, 12, 5))
+
+  f2: F1 | F4;
+>f2 : Symbol(f2, Decl(unionTypeCallSignatures6.ts, 29, 14))
+>F1 : Symbol(F1, Decl(unionTypeCallSignatures6.ts, 4, 21))
+>F4 : Symbol(F4, Decl(unionTypeCallSignatures6.ts, 17, 1))
+
+  f3: F3 | F4;
+>f3 : Symbol(f3, Decl(unionTypeCallSignatures6.ts, 30, 14))
+>F3 : Symbol(F3, Decl(unionTypeCallSignatures6.ts, 12, 5))
+>F4 : Symbol(F4, Decl(unionTypeCallSignatures6.ts, 17, 1))
+
+  f4: F3 | F5;
+>f4 : Symbol(f4, Decl(unionTypeCallSignatures6.ts, 31, 14))
+>F3 : Symbol(F3, Decl(unionTypeCallSignatures6.ts, 12, 5))
+>F5 : Symbol(F5, Decl(unionTypeCallSignatures6.ts, 21, 1))
+}
+x1.f0();
+>x1.f0 : Symbol(f0, Decl(unionTypeCallSignatures6.ts, 27, 25))
+>x1 : Symbol(x1, Decl(unionTypeCallSignatures6.ts, 27, 11))
+>f0 : Symbol(f0, Decl(unionTypeCallSignatures6.ts, 27, 25))
+
+x1.f1();
+>x1.f1 : Symbol(f1, Decl(unionTypeCallSignatures6.ts, 28, 14))
+>x1 : Symbol(x1, Decl(unionTypeCallSignatures6.ts, 27, 11))
+>f1 : Symbol(f1, Decl(unionTypeCallSignatures6.ts, 28, 14))
+
+x1.f2();
+>x1.f2 : Symbol(f2, Decl(unionTypeCallSignatures6.ts, 29, 14))
+>x1 : Symbol(x1, Decl(unionTypeCallSignatures6.ts, 27, 11))
+>f2 : Symbol(f2, Decl(unionTypeCallSignatures6.ts, 29, 14))
+
+x1.f3(); // error
+>x1.f3 : Symbol(f3, Decl(unionTypeCallSignatures6.ts, 30, 14))
+>x1 : Symbol(x1, Decl(unionTypeCallSignatures6.ts, 27, 11))
+>f3 : Symbol(f3, Decl(unionTypeCallSignatures6.ts, 30, 14))
+
+x1.f4(); // error
+>x1.f4 : Symbol(f4, Decl(unionTypeCallSignatures6.ts, 31, 14))
+>x1 : Symbol(x1, Decl(unionTypeCallSignatures6.ts, 27, 11))
+>f4 : Symbol(f4, Decl(unionTypeCallSignatures6.ts, 31, 14))
+
+declare var x2: A & B & {
+>x2 : Symbol(x2, Decl(unionTypeCallSignatures6.ts, 40, 11))
+>A : Symbol(A, Decl(unionTypeCallSignatures6.ts, 0, 0))
+>B : Symbol(B, Decl(unionTypeCallSignatures6.ts, 0, 23))
+
+  f4: F3 | F5;
+>f4 : Symbol(f4, Decl(unionTypeCallSignatures6.ts, 40, 25))
+>F3 : Symbol(F3, Decl(unionTypeCallSignatures6.ts, 12, 5))
+>F5 : Symbol(F5, Decl(unionTypeCallSignatures6.ts, 21, 1))
+}
+x2.f4();
+>x2.f4 : Symbol(f4, Decl(unionTypeCallSignatures6.ts, 40, 25))
+>x2 : Symbol(x2, Decl(unionTypeCallSignatures6.ts, 40, 11))
+>f4 : Symbol(f4, Decl(unionTypeCallSignatures6.ts, 40, 25))
+
+type F6 = (this: A & B) => void;
+>F6 : Symbol(F6, Decl(unionTypeCallSignatures6.ts, 43, 8))
+>this : Symbol(this, Decl(unionTypeCallSignatures6.ts, 45, 11))
+>A : Symbol(A, Decl(unionTypeCallSignatures6.ts, 0, 0))
+>B : Symbol(B, Decl(unionTypeCallSignatures6.ts, 0, 23))
+
+declare var f3: F1 | F6;
+>f3 : Symbol(f3, Decl(unionTypeCallSignatures6.ts, 46, 11))
+>F1 : Symbol(F1, Decl(unionTypeCallSignatures6.ts, 4, 21))
+>F6 : Symbol(F6, Decl(unionTypeCallSignatures6.ts, 43, 8))
+
+f3(); // error
+>f3 : Symbol(f3, Decl(unionTypeCallSignatures6.ts, 46, 11))
+
+interface F7 {
+>F7 : Symbol(F7, Decl(unionTypeCallSignatures6.ts, 47, 5))
+
+  (this: A & B & C): void;
+>this : Symbol(this, Decl(unionTypeCallSignatures6.ts, 50, 3))
+>A : Symbol(A, Decl(unionTypeCallSignatures6.ts, 0, 0))
+>B : Symbol(B, Decl(unionTypeCallSignatures6.ts, 0, 23))
+>C : Symbol(C, Decl(unionTypeCallSignatures6.ts, 1, 23))
+
+  (this: A & B): void;
+>this : Symbol(this, Decl(unionTypeCallSignatures6.ts, 51, 3))
+>A : Symbol(A, Decl(unionTypeCallSignatures6.ts, 0, 0))
+>B : Symbol(B, Decl(unionTypeCallSignatures6.ts, 0, 23))
+}
+declare var f4: F6 | F7;
+>f4 : Symbol(f4, Decl(unionTypeCallSignatures6.ts, 53, 11))
+>F6 : Symbol(F6, Decl(unionTypeCallSignatures6.ts, 43, 8))
+>F7 : Symbol(F7, Decl(unionTypeCallSignatures6.ts, 47, 5))
+
+f4(); // error
+>f4 : Symbol(f4, Decl(unionTypeCallSignatures6.ts, 53, 11))
+
diff --git a/tests/baselines/reference/unionTypeCallSignatures6.types b/tests/baselines/reference/unionTypeCallSignatures6.types
new file mode 100644
index 00000000000..930c91b1109
--- /dev/null
+++ b/tests/baselines/reference/unionTypeCallSignatures6.types
@@ -0,0 +1,150 @@
+=== tests/cases/conformance/types/union/unionTypeCallSignatures6.ts ===
+type A = { a: string };
+>A : A
+>a : string
+
+type B = { b: number };
+>B : B
+>b : number
+
+type C = { c: string };
+>C : C
+>c : string
+
+type D = { d: number };
+>D : D
+>d : number
+
+type F0 = () => void;
+>F0 : F0
+
+// #31547
+type F1 = (this: A) => void;
+>F1 : F1
+>this : A
+
+type F2 = (this: B) => void;
+>F2 : F2
+>this : B
+
+declare var f1: F1 | F2;
+>f1 : F1 | F2
+
+f1(); // error
+>f1() : any
+>f1 : F1 | F2
+
+declare var f2: F0 | F1;
+>f2 : F1 | F0
+
+f2(); // error
+>f2() : any
+>f2 : F1 | F0
+
+interface F3 {
+  (this: A): void;
+>this : A
+
+  (this: B): void;
+>this : B
+}
+interface F4 {
+  (this: C): void;
+>this : C
+
+  (this: D): void;
+>this : D
+}
+interface F5 {
+  (this: C): void;
+>this : C
+
+  (this: B): void;
+>this : B
+}
+
+declare var x1: A & C & {
+>x1 : A & C & { f0: F0 | F3; f1: F1 | F3; f2: F1 | F4; f3: F3 | F4; f4: F3 | F5; }
+
+  f0: F0 | F3;
+>f0 : F0 | F3
+
+  f1: F1 | F3;
+>f1 : F1 | F3
+
+  f2: F1 | F4;
+>f2 : F1 | F4
+
+  f3: F3 | F4;
+>f3 : F3 | F4
+
+  f4: F3 | F5;
+>f4 : F3 | F5
+}
+x1.f0();
+>x1.f0() : void
+>x1.f0 : F0 | F3
+>x1 : A & C & { f0: F0 | F3; f1: F1 | F3; f2: F1 | F4; f3: F3 | F4; f4: F3 | F5; }
+>f0 : F0 | F3
+
+x1.f1();
+>x1.f1() : void
+>x1.f1 : F1 | F3
+>x1 : A & C & { f0: F0 | F3; f1: F1 | F3; f2: F1 | F4; f3: F3 | F4; f4: F3 | F5; }
+>f1 : F1 | F3
+
+x1.f2();
+>x1.f2() : void
+>x1.f2 : F1 | F4
+>x1 : A & C & { f0: F0 | F3; f1: F1 | F3; f2: F1 | F4; f3: F3 | F4; f4: F3 | F5; }
+>f2 : F1 | F4
+
+x1.f3(); // error
+>x1.f3() : any
+>x1.f3 : F3 | F4
+>x1 : A & C & { f0: F0 | F3; f1: F1 | F3; f2: F1 | F4; f3: F3 | F4; f4: F3 | F5; }
+>f3 : F3 | F4
+
+x1.f4(); // error
+>x1.f4() : any
+>x1.f4 : F3 | F5
+>x1 : A & C & { f0: F0 | F3; f1: F1 | F3; f2: F1 | F4; f3: F3 | F4; f4: F3 | F5; }
+>f4 : F3 | F5
+
+declare var x2: A & B & {
+>x2 : A & B & { f4: F3 | F5; }
+
+  f4: F3 | F5;
+>f4 : F3 | F5
+}
+x2.f4();
+>x2.f4() : void
+>x2.f4 : F3 | F5
+>x2 : A & B & { f4: F3 | F5; }
+>f4 : F3 | F5
+
+type F6 = (this: A & B) => void;
+>F6 : F6
+>this : A & B
+
+declare var f3: F1 | F6;
+>f3 : F1 | F6
+
+f3(); // error
+>f3() : any
+>f3 : F1 | F6
+
+interface F7 {
+  (this: A & B & C): void;
+>this : A & B & C
+
+  (this: A & B): void;
+>this : A & B
+}
+declare var f4: F6 | F7;
+>f4 : F6 | F7
+
+f4(); // error
+>f4() : any
+>f4 : F6 | F7
+
diff --git a/tests/cases/conformance/types/thisType/unionThisTypeInFunctions.ts b/tests/cases/conformance/types/thisType/unionThisTypeInFunctions.ts
index 4f74058cc48..a35019d372e 100644
--- a/tests/cases/conformance/types/thisType/unionThisTypeInFunctions.ts
+++ b/tests/cases/conformance/types/thisType/unionThisTypeInFunctions.ts
@@ -7,5 +7,5 @@ interface Fake {
     data: number;
 }
 function test(r: Real | Fake) {
-    r.method(12);
+    r.method(12); // error
 }
diff --git a/tests/cases/conformance/types/union/unionTypeCallSignatures6.ts b/tests/cases/conformance/types/union/unionTypeCallSignatures6.ts
new file mode 100644
index 00000000000..0fe98847205
--- /dev/null
+++ b/tests/cases/conformance/types/union/unionTypeCallSignatures6.ts
@@ -0,0 +1,55 @@
+type A = { a: string };
+type B = { b: number };
+type C = { c: string };
+type D = { d: number };
+type F0 = () => void;
+
+// #31547
+type F1 = (this: A) => void;
+type F2 = (this: B) => void;
+declare var f1: F1 | F2;
+f1(); // error
+declare var f2: F0 | F1;
+f2(); // error
+
+interface F3 {
+  (this: A): void;
+  (this: B): void;
+}
+interface F4 {
+  (this: C): void;
+  (this: D): void;
+}
+interface F5 {
+  (this: C): void;
+  (this: B): void;
+}
+
+declare var x1: A & C & {
+  f0: F0 | F3;
+  f1: F1 | F3;
+  f2: F1 | F4;
+  f3: F3 | F4;
+  f4: F3 | F5;
+}
+x1.f0();
+x1.f1();
+x1.f2();
+x1.f3(); // error
+x1.f4(); // error
+
+declare var x2: A & B & {
+  f4: F3 | F5;
+}
+x2.f4();
+
+type F6 = (this: A & B) => void;
+declare var f3: F1 | F6;
+f3(); // error
+
+interface F7 {
+  (this: A & B & C): void;
+  (this: A & B): void;
+}
+declare var f4: F6 | F7;
+f4(); // error

From a9e0a7766e30eff61f76ca85b380e65f45c8eb12 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Sat, 27 Jul 2019 08:50:26 -0700
Subject: [PATCH 067/151] Record full inference status in visitation cache

---
 src/compiler/checker.ts | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index a69751673f6..27c8a027cbc 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -15462,7 +15462,7 @@ namespace ts {
             let visited: Map<number>;
             let bivariant = false;
             let propagationType: Type;
-            let inferenceCount = 0;
+            let inferenceMatch = false;
             let inferenceIncomplete = false;
             let allowComplexConstraintInference = true;
             inferFromTypes(originalSource, originalTarget);
@@ -15576,7 +15576,7 @@ namespace ts {
                                 clearCachedInferences(inferences);
                             }
                         }
-                        inferenceCount++;
+                        inferenceMatch = true;
                         return;
                     }
                     else {
@@ -15668,15 +15668,21 @@ namespace ts {
 
             function invokeOnce(source: Type, target: Type, action: (source: Type, target: Type) => void) {
                 const key = source.id + "," + target.id;
-                const count = visited && visited.get(key);
-                if (count !== undefined) {
-                    inferenceCount += count;
+                const status = visited && visited.get(key);
+                if (status !== undefined) {
+                    if (status & 1) inferenceMatch = true;
+                    if (status & 2) inferenceIncomplete = true;
                     return;
                 }
                 (visited || (visited = createMap<number>())).set(key, 0);
-                const startCount = inferenceCount;
+                const saveInferenceMatch = inferenceMatch;
+                const saveInferenceIncomplete = inferenceIncomplete;
+                inferenceMatch = false;
+                inferenceIncomplete = false;
                 action(source, target);
-                visited.set(key, inferenceCount - startCount);
+                visited.set(key, (inferenceMatch ? 1 : 0) | (inferenceIncomplete ? 2 : 0));
+                inferenceMatch = inferenceMatch || saveInferenceMatch;
+                inferenceIncomplete = inferenceIncomplete || saveInferenceIncomplete;
             }
 
             function inferFromMatchingType(source: Type, targets: Type[], matches: (s: Type, t: Type) => boolean) {
@@ -15759,9 +15765,11 @@ namespace ts {
                         }
                         else {
                             for (let i = 0; i < sources.length; i++) {
-                                const count = inferenceCount;
+                                const saveInferenceMatch = inferenceMatch;
+                                inferenceMatch = false;
                                 inferFromTypes(sources[i], t);
-                                if (count !== inferenceCount) matched[i] = true;
+                                if (inferenceMatch) matched[i] = true;
+                                inferenceMatch = inferenceMatch || saveInferenceMatch;
                             }
                         }
                     }

From 58ff76abf663190a91ada6e3f23e9b3fed417af0 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Sun, 28 Jul 2019 09:01:11 -0700
Subject: [PATCH 068/151] Properly instantiate contextual type for object
 literal methods

---
 src/compiler/checker.ts | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index f8242ed6df7..1ad92eebc21 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -19099,10 +19099,13 @@ namespace ts {
 
         // Return the contextual type for a given expression node. During overload resolution, a contextual type may temporarily
         // be "pushed" onto a node using the contextualType property.
-        function getApparentTypeOfContextualType(node: Expression, contextFlags?: ContextFlags): Type | undefined {
-            const contextualType = instantiateContextualType(getContextualType(node, contextFlags), node, contextFlags);
-            if (contextualType) {
-                const apparentType = mapType(contextualType, getApparentType, /*noReductions*/ true);
+        function getApparentTypeOfContextualType(node: Expression | MethodDeclaration, contextFlags?: ContextFlags): Type | undefined {
+            const contextualType = isObjectLiteralMethod(node) ?
+                getContextualTypeForObjectLiteralMethod(node, contextFlags) :
+                getContextualType(node, contextFlags);
+            const instantiatedType = instantiateContextualType(contextualType, node, contextFlags);
+            if (instantiatedType) {
+                const apparentType = mapType(instantiatedType, getApparentType, /*noReductions*/ true);
                 if (apparentType.flags & TypeFlags.Union) {
                     if (isObjectLiteralExpression(node)) {
                         return discriminateContextualTypeByObjectMembers(node, apparentType as UnionType);
@@ -19426,9 +19429,7 @@ namespace ts {
             if (typeTagSignature) {
                 return typeTagSignature;
             }
-            const type = isObjectLiteralMethod(node) ?
-                getContextualTypeForObjectLiteralMethod(node, ContextFlags.Signature) :
-                getApparentTypeOfContextualType(node, ContextFlags.Signature);
+            const type = getApparentTypeOfContextualType(node, ContextFlags.Signature);
             if (!type) {
                 return undefined;
             }

From a717d3ab44b2cacc9e0fb36861bbe7c428bba6fc Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Sun, 28 Jul 2019 09:05:57 -0700
Subject: [PATCH 069/151] Add regression test

---
 tests/cases/compiler/instantiateContextualTypes.ts | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tests/cases/compiler/instantiateContextualTypes.ts b/tests/cases/compiler/instantiateContextualTypes.ts
index 3165011ecff..4059bd5202e 100644
--- a/tests/cases/compiler/instantiateContextualTypes.ts
+++ b/tests/cases/compiler/instantiateContextualTypes.ts
@@ -174,3 +174,13 @@ class Interesting {
 declare function invoke<T>(f: () => T): T;
 
 let xx: 0 | 1 | 2 = invoke(() => 1);
+
+// Repro from #32416
+
+declare function assignPartial<T>(target: T, partial: Partial<T>): T;
+
+let obj = {
+  foo(bar: string) {}
+}
+
+assignPartial(obj, { foo(...args) {} });  // args has type [string]

From 4a17581f67a0c0cd413adcd7ce0e0ffe30698122 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Sun, 28 Jul 2019 09:06:04 -0700
Subject: [PATCH 070/151] Accept new baselines

---
 .../reference/instantiateContextualTypes.js   | 14 ++++++++++
 .../instantiateContextualTypes.symbols        | 26 +++++++++++++++++++
 .../instantiateContextualTypes.types          | 24 +++++++++++++++++
 3 files changed, 64 insertions(+)

diff --git a/tests/baselines/reference/instantiateContextualTypes.js b/tests/baselines/reference/instantiateContextualTypes.js
index 9de6bfb612c..46d87cb1153 100644
--- a/tests/baselines/reference/instantiateContextualTypes.js
+++ b/tests/baselines/reference/instantiateContextualTypes.js
@@ -172,6 +172,16 @@ class Interesting {
 declare function invoke<T>(f: () => T): T;
 
 let xx: 0 | 1 | 2 = invoke(() => 1);
+
+// Repro from #32416
+
+declare function assignPartial<T>(target: T, partial: Partial<T>): T;
+
+let obj = {
+  foo(bar: string) {}
+}
+
+assignPartial(obj, { foo(...args) {} });  // args has type [string]
 
 
 //// [instantiateContextualTypes.js]
@@ -222,3 +232,7 @@ class Interesting {
     }
 }
 let xx = invoke(() => 1);
+let obj = {
+    foo(bar) { }
+};
+assignPartial(obj, { foo(...args) { } }); // args has type [string]
diff --git a/tests/baselines/reference/instantiateContextualTypes.symbols b/tests/baselines/reference/instantiateContextualTypes.symbols
index 1250edd585b..d3e8a7a317c 100644
--- a/tests/baselines/reference/instantiateContextualTypes.symbols
+++ b/tests/baselines/reference/instantiateContextualTypes.symbols
@@ -481,3 +481,29 @@ let xx: 0 | 1 | 2 = invoke(() => 1);
 >xx : Symbol(xx, Decl(instantiateContextualTypes.ts, 172, 3))
 >invoke : Symbol(invoke, Decl(instantiateContextualTypes.ts, 166, 1))
 
+// Repro from #32416
+
+declare function assignPartial<T>(target: T, partial: Partial<T>): T;
+>assignPartial : Symbol(assignPartial, Decl(instantiateContextualTypes.ts, 172, 36))
+>T : Symbol(T, Decl(instantiateContextualTypes.ts, 176, 31))
+>target : Symbol(target, Decl(instantiateContextualTypes.ts, 176, 34))
+>T : Symbol(T, Decl(instantiateContextualTypes.ts, 176, 31))
+>partial : Symbol(partial, Decl(instantiateContextualTypes.ts, 176, 44))
+>Partial : Symbol(Partial, Decl(lib.es5.d.ts, --, --))
+>T : Symbol(T, Decl(instantiateContextualTypes.ts, 176, 31))
+>T : Symbol(T, Decl(instantiateContextualTypes.ts, 176, 31))
+
+let obj = {
+>obj : Symbol(obj, Decl(instantiateContextualTypes.ts, 178, 3))
+
+  foo(bar: string) {}
+>foo : Symbol(foo, Decl(instantiateContextualTypes.ts, 178, 11))
+>bar : Symbol(bar, Decl(instantiateContextualTypes.ts, 179, 6))
+}
+
+assignPartial(obj, { foo(...args) {} });  // args has type [string]
+>assignPartial : Symbol(assignPartial, Decl(instantiateContextualTypes.ts, 172, 36))
+>obj : Symbol(obj, Decl(instantiateContextualTypes.ts, 178, 3))
+>foo : Symbol(foo, Decl(instantiateContextualTypes.ts, 182, 20))
+>args : Symbol(args, Decl(instantiateContextualTypes.ts, 182, 25))
+
diff --git a/tests/baselines/reference/instantiateContextualTypes.types b/tests/baselines/reference/instantiateContextualTypes.types
index 88e6ca7e4dd..b5317b6f756 100644
--- a/tests/baselines/reference/instantiateContextualTypes.types
+++ b/tests/baselines/reference/instantiateContextualTypes.types
@@ -422,3 +422,27 @@ let xx: 0 | 1 | 2 = invoke(() => 1);
 >() => 1 : () => 1
 >1 : 1
 
+// Repro from #32416
+
+declare function assignPartial<T>(target: T, partial: Partial<T>): T;
+>assignPartial : <T>(target: T, partial: Partial<T>) => T
+>target : T
+>partial : Partial<T>
+
+let obj = {
+>obj : { foo(bar: string): void; }
+>{  foo(bar: string) {}} : { foo(bar: string): void; }
+
+  foo(bar: string) {}
+>foo : (bar: string) => void
+>bar : string
+}
+
+assignPartial(obj, { foo(...args) {} });  // args has type [string]
+>assignPartial(obj, { foo(...args) {} }) : { foo(bar: string): void; }
+>assignPartial : <T>(target: T, partial: Partial<T>) => T
+>obj : { foo(bar: string): void; }
+>{ foo(...args) {} } : { foo(bar: string): void; }
+>foo : (bar: string) => void
+>args : [string]
+

From 30aad9db8dc6fe09fe4e21fe973e984c35c201dc Mon Sep 17 00:00:00 2001
From: Orta Therox <orta.therox@gmail.com>
Date: Mon, 29 Jul 2019 09:46:42 -0400
Subject: [PATCH 071/151] Support more terminators for parsing jsdoc filepaths

---
 src/compiler/parser.ts                        | 12 ++++++-----
 src/compiler/scanner.ts                       |  2 +-
 src/harness/fourslash.ts                      |  4 ++++
 src/services/classifier.ts                    |  1 +
 .../fourslash/jsDocDontBreakWithNamespaces.ts | 20 ++++++++++++++++---
 5 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
index 9762302b7a2..b585adb04ac 100644
--- a/src/compiler/parser.ts
+++ b/src/compiler/parser.ts
@@ -2428,17 +2428,19 @@ namespace ts {
 
         function parseJSDocType(): TypeNode {
             scanner.setInJSDocType(true);
-            const dotdotdot = parseOptionalToken(SyntaxKind.DotDotDotToken);
             const moduleSpecifier = parseOptionalToken(SyntaxKind.ModuleKeyword);
-            let type = parseTypeOrTypePredicate();
-            scanner.setInJSDocType(false);
             if (moduleSpecifier) {
                 const moduleTag = createNode(SyntaxKind.JSDocNamepathType, moduleSpecifier.pos) as JSDocNamepathType;
-                while (token() !== SyntaxKind.CloseBraceToken && token() !== SyntaxKind.EndOfFileToken) {
+                const terminators = [SyntaxKind.CloseBraceToken, SyntaxKind.EndOfFileToken, SyntaxKind.CommaToken, SyntaxKind.CloseParenToken];
+                while (terminators.indexOf(token()) < 0) {
                     nextTokenJSDoc();
                 }
-                type = finishNode(moduleTag);
+                return finishNode(moduleTag);
             }
+
+            const dotdotdot = parseOptionalToken(SyntaxKind.DotDotDotToken);
+            let type = parseTypeOrTypePredicate();
+            scanner.setInJSDocType(false);
             if (dotdotdot) {
                 const variadic = createNode(SyntaxKind.JSDocVariadicType, dotdotdot.pos) as JSDocVariadicType;
                 variadic.type = type;
diff --git a/src/compiler/scanner.ts b/src/compiler/scanner.ts
index f949893171a..3109da91788 100644
--- a/src/compiler/scanner.ts
+++ b/src/compiler/scanner.ts
@@ -1983,7 +1983,7 @@ namespace ts {
             // First non-whitespace character on this line.
             let firstNonWhitespace = 0;
             // These initial values are special because the first line is:
-            // firstNonWhitespace = 0 to indicate that we want leading whitspace,
+            // firstNonWhitespace = 0 to indicate that we want leading whitespace,
 
             while (pos < end) {
                 char = text.charCodeAt(pos);
diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts
index f12506be2fb..b59f4e15dc4 100644
--- a/src/harness/fourslash.ts
+++ b/src/harness/fourslash.ts
@@ -1268,6 +1268,10 @@ namespace FourSlash {
 
         private verifySignatureHelpWorker(options: FourSlashInterface.VerifySignatureHelpOptions) {
             const help = this.getSignatureHelp({ triggerReason: options.triggerReason })!;
+            if (!help) {
+                this.raiseError("Could not get a help signature");
+            }
+
             const selectedItem = help.items[help.selectedItemIndex];
             // Argument index may exceed number of parameters
             const currentParameter = selectedItem.parameters[help.argumentIndex] as ts.SignatureHelpParameter | undefined;
diff --git a/src/services/classifier.ts b/src/services/classifier.ts
index f85a69681de..5da0354dc13 100644
--- a/src/services/classifier.ts
+++ b/src/services/classifier.ts
@@ -1,4 +1,5 @@
 namespace ts {
+    /** The classifier is used for syntactic highlighting in editors via the TSServer */
     export function createClassifier(): Classifier {
         const scanner = createScanner(ScriptTarget.Latest, /*skipTrivia*/ false);
 
diff --git a/tests/cases/fourslash/jsDocDontBreakWithNamespaces.ts b/tests/cases/fourslash/jsDocDontBreakWithNamespaces.ts
index 7807d5d30d1..5be2f3e7b62 100644
--- a/tests/cases/fourslash/jsDocDontBreakWithNamespaces.ts
+++ b/tests/cases/fourslash/jsDocDontBreakWithNamespaces.ts
@@ -5,13 +5,27 @@
 //// * @returns {module:@nodefuel/web~Webserver~wsServer#hello} Websocket server object
 //// */
 ////function foo() { }
-////foo(''/**/);
+////foo(''/*foo*/);
+////
+/////**
+//// * @type {module:xxxxx} */
+//// */
+////function bar() { }
+////bar(''/*bar*/);
+
 
 verify.signatureHelp({
-  marker: "",
+  marker: "foo",
   text: "foo(): any",
   docComment: "",
   tags: [
-      { name: "returns", text: "Websocket server object" },
+    { name: "returns", text: "Websocket server object" },
   ],
 });
+
+verify.signatureHelp({
+  marker: "bar",
+  text: "bar(): void",
+  docComment: "",
+  tags: [],
+});

From b963e1a2a7e3b1056ee2552927fa08fcc51e4c7d Mon Sep 17 00:00:00 2001
From: Wesley Wigham <wewigham@microsoft.com>
Date: Mon, 29 Jul 2019 10:33:43 -0700
Subject: [PATCH 072/151] Update LKG (#32578)

* Update LKG

* Add @types/node version bump

* Small paatches/casts to be compatible with latest node

* Accept API baseline update

* Make internal NodeBuffer compatable with latest Buffer

* Why do we even have an internal buffer type

* Sync up internal buffer type better

* Fix lint

* Readd mroe missing Buffer methods
---
 lib/enu/diagnosticMessages.generated.json.lcg |   424 +-
 lib/it/diagnosticMessages.generated.json      |     4 +-
 lib/ja/diagnosticMessages.generated.json      |     4 +-
 lib/ko/diagnosticMessages.generated.json      |   140 +-
 lib/lib.dom.d.ts                              |  4022 ++-
 lib/lib.dom.iterable.d.ts                     |   111 +-
 lib/lib.es2015.collection.d.ts                |     2 +-
 lib/lib.es2015.core.d.ts                      |    18 +-
 lib/lib.es2015.generator.d.ts                 |    10 +-
 lib/lib.es2015.iterable.d.ts                  |    26 +-
 lib/lib.es2015.promise.d.ts                   |    70 +-
 lib/lib.es2018.asyncgenerator.d.ts            |    79 +
 lib/lib.es2018.asynciterable.d.ts             |     9 +-
 lib/lib.es2018.d.ts                           |     1 +
 lib/lib.es2019.d.ts                           |     1 +
 lib/lib.es2019.object.d.ts                    |    35 +
 lib/lib.es2019.string.d.ts                    |     4 +-
 lib/lib.es2020.d.ts                           |    23 +
 lib/lib.es2020.full.d.ts                      |    25 +
 lib/lib.es2020.string.d.ts                    |    30 +
 lib/lib.es2020.symbol.wellknown.d.ts          |    39 +
 lib/lib.es5.d.ts                              |    81 +-
 lib/lib.esnext.bigint.d.ts                    |     8 +-
 lib/lib.webworker.d.ts                        |  2245 +-
 lib/pl/diagnosticMessages.generated.json      |     4 +-
 lib/protocol.d.ts                             |    57 +-
 lib/ru/diagnosticMessages.generated.json      |     4 +-
 lib/tsc.js                                    | 20474 ++++++-----
 lib/tsserver.js                               | 30143 +++++++++-------
 lib/tsserverlibrary.d.ts                      |   861 +-
 lib/tsserverlibrary.js                        | 30124 ++++++++-------
 lib/typescript.d.ts                           |   793 +-
 lib/typescript.js                             | 29662 ++++++++-------
 lib/typescriptServices.d.ts                   |   793 +-
 lib/typescriptServices.js                     | 29662 ++++++++-------
 lib/typingsInstaller.js                       | 23362 ++++++------
 lib/zh-cn/diagnosticMessages.generated.json   |     2 +-
 package.json                                  |     2 +-
 src/compiler/sys.ts                           |   114 +-
 src/harness/harness.ts                        |     2 +-
 src/testRunner/externalCompileRunner.ts       |     2 +-
 .../reference/api/tsserverlibrary.d.ts        |  1124 +-
 tests/baselines/reference/api/typescript.d.ts |  1055 +-
 43 files changed, 100855 insertions(+), 74796 deletions(-)
 create mode 100644 lib/lib.es2018.asyncgenerator.d.ts
 create mode 100644 lib/lib.es2019.object.d.ts
 create mode 100644 lib/lib.es2020.d.ts
 create mode 100644 lib/lib.es2020.full.d.ts
 create mode 100644 lib/lib.es2020.string.d.ts
 create mode 100644 lib/lib.es2020.symbol.wellknown.d.ts

diff --git a/lib/enu/diagnosticMessages.generated.json.lcg b/lib/enu/diagnosticMessages.generated.json.lcg
index 0b66fd7760c..77e5d6f2236 100644
--- a/lib/enu/diagnosticMessages.generated.json.lcg
+++ b/lib/enu/diagnosticMessages.generated.json.lcg
@@ -141,9 +141,9 @@
               </Str>
               <Disp Icon="Str" />
             </Item>
-            <Item ItemId=";A_const_assertion_can_only_be_applied_to_a_string_number_boolean_array_or_object_literal_1355" ItemType="0" PsrId="306" Leaf="true">
+            <Item ItemId=";A_const_assertions_can_only_be_applied_to_references_to_enum_members_or_string_number_boolean_array__1355" ItemType="0" PsrId="306" Leaf="true">
               <Str Cat="Text">
-                <Val><![CDATA[A 'const' assertion can only be applied to a string, number, boolean, array, or object literal.]]></Val>
+                <Val><![CDATA[A 'const' assertions can only be applied to references to enum members, or string, number, boolean, array, or object literals.]]></Val>
               </Str>
               <Disp Icon="Str" />
             </Item>
@@ -189,12 +189,6 @@
               </Str>
               <Disp Icon="Str" />
             </Item>
-            <Item ItemId=";A_declare_modifier_is_required_for_a_top_level_declaration_in_a_d_ts_file_1046" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A 'declare' modifier is required for a top level declaration in a .d.ts file.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
             <Item ItemId=";A_decorator_can_only_decorate_a_method_implementation_not_an_overload_1249" ItemType="0" PsrId="306" Leaf="true">
               <Str Cat="Text">
                 <Val><![CDATA[A decorator can only decorate a method implementation, not an overload.]]></Val>
@@ -675,12 +669,36 @@
               </Str>
               <Disp Icon="Str" />
             </Item>
+            <Item ItemId=";Add_await_95083" ItemType="0" PsrId="306" Leaf="true">
+              <Str Cat="Text">
+                <Val><![CDATA[Add 'await']]></Val>
+              </Str>
+              <Disp Icon="Str" />
+            </Item>
+            <Item ItemId=";Add_await_to_initializer_for_0_95084" ItemType="0" PsrId="306" Leaf="true">
+              <Str Cat="Text">
+                <Val><![CDATA[Add 'await' to initializer for '{0}']]></Val>
+              </Str>
+              <Disp Icon="Str" />
+            </Item>
             <Item ItemId=";Add_braces_to_arrow_function_95059" ItemType="0" PsrId="306" Leaf="true">
               <Str Cat="Text">
                 <Val><![CDATA[Add braces to arrow function]]></Val>
               </Str>
               <Disp Icon="Str" />
             </Item>
+            <Item ItemId=";Add_const_to_all_unresolved_variables_95082" ItemType="0" PsrId="306" Leaf="true">
+              <Str Cat="Text">
+                <Val><![CDATA[Add 'const' to all unresolved variables]]></Val>
+              </Str>
+              <Disp Icon="Str" />
+            </Item>
+            <Item ItemId=";Add_const_to_unresolved_variable_95081" ItemType="0" PsrId="306" Leaf="true">
+              <Str Cat="Text">
+                <Val><![CDATA[Add 'const' to unresolved variable]]></Val>
+              </Str>
+              <Disp Icon="Str" />
+            </Item>
             <Item ItemId=";Add_default_import_0_to_existing_import_declaration_from_1_90033" ItemType="0" PsrId="306" Leaf="true">
               <Str Cat="Text">
                 <Val><![CDATA[Add default import '{0}' to existing import declaration from "{1}"]]></Val>
@@ -849,6 +867,12 @@
               </Str>
               <Disp Icon="Str" />
             </Item>
+            <Item ItemId=";All_files_must_be_modules_when_the_isolatedModules_flag_is_provided_1208" ItemType="0" PsrId="306" Leaf="true">
+              <Str Cat="Text">
+                <Val><![CDATA[All files must be modules when the '--isolatedModules' flag is provided.]]></Val>
+              </Str>
+              <Disp Icon="Str" />
+            </Item>
             <Item ItemId=";All_imports_in_import_declaration_are_unused_6192" ItemType="0" PsrId="306" Leaf="true">
               <Str Cat="Text">
                 <Val><![CDATA[All imports in import declaration are unused.]]></Val>
@@ -867,6 +891,12 @@
               </Str>
               <Disp Icon="Str" />
             </Item>
+            <Item ItemId=";Allow_accessing_UMD_globals_from_modules_95076" ItemType="0" PsrId="306" Leaf="true">
+              <Str Cat="Text">
+                <Val><![CDATA[Allow accessing UMD globals from modules.]]></Val>
+              </Str>
+              <Disp Icon="Str" />
+            </Item>
             <Item ItemId=";Allow_default_imports_from_modules_with_no_default_export_This_does_not_affect_code_emit_just_typech_6011" ItemType="0" PsrId="306" Leaf="true">
               <Str Cat="Text">
                 <Val><![CDATA[Allow default imports from modules with no default export. This does not affect code emit, just typechecking.]]></Val>
@@ -1209,6 +1239,12 @@
               </Str>
               <Disp Icon="Str" />
             </Item>
+            <Item ItemId=";Another_export_default_is_here_2753" ItemType="0" PsrId="306" Leaf="true">
+              <Str Cat="Text">
+                <Val><![CDATA[Another export default is here.]]></Val>
+              </Str>
+              <Disp Icon="Str" />
+            </Item>
             <Item ItemId=";Argument_expression_expected_1135" ItemType="0" PsrId="306" Leaf="true">
               <Str Cat="Text">
                 <Val><![CDATA[Argument expression expected.]]></Val>
@@ -1413,18 +1449,18 @@
               </Str>
               <Disp Icon="Str" />
             </Item>
-            <Item ItemId=";Cannot_compile_namespaces_when_the_isolatedModules_flag_is_provided_1208" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Cannot compile namespaces when the '--isolatedModules' flag is provided.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
             <Item ItemId=";Cannot_create_an_instance_of_an_abstract_class_2511" ItemType="0" PsrId="306" Leaf="true">
               <Str Cat="Text">
                 <Val><![CDATA[Cannot create an instance of an abstract class.]]></Val>
               </Str>
               <Disp Icon="Str" />
             </Item>
+            <Item ItemId=";Cannot_delegate_iteration_to_value_because_the_next_method_of_its_iterator_expects_type_1_but_the_co_2766" ItemType="0" PsrId="306" Leaf="true">
+              <Str Cat="Text">
+                <Val><![CDATA[Cannot delegate iteration to value because the 'next' method of its iterator expects type '{1}', but the containing generator will always send '{0}'.]]></Val>
+              </Str>
+              <Disp Icon="Str" />
+            </Item>
             <Item ItemId=";Cannot_export_0_Only_local_declarations_can_be_exported_from_a_module_2661" ItemType="0" PsrId="306" Leaf="true">
               <Str Cat="Text">
                 <Val><![CDATA[Cannot export '{0}'. Only local declarations can be exported from a module.]]></Val>
@@ -1593,12 +1629,6 @@
               </Str>
               <Disp Icon="Str" />
             </Item>
-            <Item ItemId=";Cannot_invoke_an_expression_whose_type_lacks_a_call_signature_Type_0_has_no_compatible_call_signatur_2349" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Cannot invoke an expression whose type lacks a call signature. Type '{0}' has no compatible call signatures.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
             <Item ItemId=";Cannot_invoke_an_object_which_is_possibly_null_2721" ItemType="0" PsrId="306" Leaf="true">
               <Str Cat="Text">
                 <Val><![CDATA[Cannot invoke an object which is possibly 'null'.]]></Val>
@@ -1617,6 +1647,24 @@
               </Str>
               <Disp Icon="Str" />
             </Item>
+            <Item ItemId=";Cannot_iterate_value_because_the_next_method_of_its_iterator_expects_type_1_but_array_destructuring__2765" ItemType="0" PsrId="306" Leaf="true">
+              <Str Cat="Text">
+                <Val><![CDATA[Cannot iterate value because the 'next' method of its iterator expects type '{1}', but array destructuring will always send '{0}'.]]></Val>
+              </Str>
+              <Disp Icon="Str" />
+            </Item>
+            <Item ItemId=";Cannot_iterate_value_because_the_next_method_of_its_iterator_expects_type_1_but_array_spread_will_al_2764" ItemType="0" PsrId="306" Leaf="true">
+              <Str Cat="Text">
+                <Val><![CDATA[Cannot iterate value because the 'next' method of its iterator expects type '{1}', but array spread will always send '{0}'.]]></Val>
+              </Str>
+              <Disp Icon="Str" />
+            </Item>
+            <Item ItemId=";Cannot_iterate_value_because_the_next_method_of_its_iterator_expects_type_1_but_for_of_will_always_s_2763" ItemType="0" PsrId="306" Leaf="true">
+              <Str Cat="Text">
+                <Val><![CDATA[Cannot iterate value because the 'next' method of its iterator expects type '{1}', but for-of will always send '{0}'.]]></Val>
+              </Str>
+              <Disp Icon="Str" />
+            </Item>
             <Item ItemId=";Cannot_prepend_project_0_because_it_does_not_have_outFile_set_6308" ItemType="0" PsrId="306" Leaf="true">
               <Str Cat="Text">
                 <Val><![CDATA[Cannot prepend project '{0}' because it does not have 'outFile' set]]></Val>
@@ -1683,12 +1731,6 @@
               </Str>
               <Disp Icon="Str" />
             </Item>
-            <Item ItemId=";Cannot_use_new_with_an_expression_whose_type_lacks_a_call_or_construct_signature_2351" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Cannot use 'new' with an expression whose type lacks a call or construct signature.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
             <Item ItemId=";Cannot_write_file_0_because_it_will_overwrite_tsbuildinfo_file_generated_by_referenced_project_1_6377" ItemType="0" PsrId="306" Leaf="true">
               <Str Cat="Text">
                 <Val><![CDATA[Cannot write file '{0}' because it will overwrite '.tsbuildinfo' file generated by referenced project '{1}']]></Val>
@@ -1863,6 +1905,12 @@
               </Str>
               <Disp Icon="Str" />
             </Item>
+            <Item ItemId=";Classes_may_not_have_a_field_named_constructor_18006" ItemType="0" PsrId="306" Leaf="true">
+              <Str Cat="Text">
+                <Val><![CDATA[Classes may not have a field named 'constructor'.]]></Val>
+              </Str>
+              <Disp Icon="Str" />
+            </Item>
             <Item ItemId=";Command_line_Options_6171" ItemType="0" PsrId="306" Leaf="true">
               <Str Cat="Text">
                 <Val><![CDATA[Command-line Options]]></Val>
@@ -2037,6 +2085,12 @@
               </Str>
               <Disp Icon="Str" />
             </Item>
+            <Item ItemId=";Convert_parameters_to_destructured_object_95075" ItemType="0" PsrId="306" Leaf="true">
+              <Str Cat="Text">
+                <Val><![CDATA[Convert parameters to destructured object]]></Val>
+              </Str>
+              <Disp Icon="Str" />
+            </Item>
             <Item ItemId=";Convert_require_to_import_95047" ItemType="0" PsrId="306" Leaf="true">
               <Str Cat="Text">
                 <Val><![CDATA[Convert 'require' to 'import']]></Val>
@@ -2061,12 +2115,6 @@
               </Str>
               <Disp Icon="Str" />
             </Item>
-            <Item ItemId=";Convert_to_named_parameters_95075" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Convert to named parameters]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
             <Item ItemId=";Corrupted_locale_file_0_6051" ItemType="0" PsrId="306" Leaf="true">
               <Str Cat="Text">
                 <Val><![CDATA[Corrupted locale file {0}.]]></Val>
@@ -2151,6 +2199,12 @@
               </Str>
               <Disp Icon="Str" />
             </Item>
+            <Item ItemId=";Definite_assignment_assertions_can_only_be_used_along_with_a_type_annotation_1258" ItemType="0" PsrId="306" Leaf="true">
+              <Str Cat="Text">
+                <Val><![CDATA[Definite assignment assertions can only be used along with a type annotation.]]></Val>
+              </Str>
+              <Disp Icon="Str" />
+            </Item>
             <Item ItemId=";Definitions_of_the_following_identifiers_conflict_with_those_in_another_file_Colon_0_6200" ItemType="0" PsrId="306" Leaf="true">
               <Str Cat="Text">
                 <Val><![CDATA[Definitions of the following identifiers conflict with those in another file: {0}]]></Val>
@@ -2187,6 +2241,12 @@
               </Str>
               <Disp Icon="Str" />
             </Item>
+            <Item ItemId=";Did_you_forget_to_use_await_2773" ItemType="0" PsrId="306" Leaf="true">
+              <Str Cat="Text">
+                <Val><![CDATA[Did you forget to use 'await'?]]></Val>
+              </Str>
+              <Disp Icon="Str" />
+            </Item>
             <Item ItemId=";Did_you_mean_for_0_to_be_constrained_to_type_new_args_Colon_any_1_2735" ItemType="0" PsrId="306" Leaf="true">
               <Str Cat="Text">
                 <Val><![CDATA[Did you mean for '{0}' to be constrained to type 'new (...args: any[]5D;) => {1}'?]]></Val>
@@ -2199,6 +2259,12 @@
               </Str>
               <Disp Icon="Str" />
             </Item>
+            <Item ItemId=";Did_you_mean_to_mark_this_function_as_async_1356" ItemType="0" PsrId="306" Leaf="true">
+              <Str Cat="Text">
+                <Val><![CDATA[Did you mean to mark this function as 'async'?]]></Val>
+              </Str>
+              <Disp Icon="Str" />
+            </Item>
             <Item ItemId=";Did_you_mean_to_use_new_with_this_expression_6213" ItemType="0" PsrId="306" Leaf="true">
               <Str Cat="Text">
                 <Val><![CDATA[Did you mean to use 'new' with this expression?]]></Val>
@@ -2421,6 +2487,24 @@
               </Str>
               <Disp Icon="Str" />
             </Item>
+            <Item ItemId=";Each_member_of_the_union_type_0_has_construct_signatures_but_none_of_those_signatures_are_compatible_2762" ItemType="0" PsrId="306" Leaf="true">
+              <Str Cat="Text">
+                <Val><![CDATA[Each member of the union type '{0}' has construct signatures, but none of those signatures are compatible with each other.]]></Val>
+              </Str>
+              <Disp Icon="Str" />
+            </Item>
+            <Item ItemId=";Each_member_of_the_union_type_0_has_signatures_but_none_of_those_signatures_are_compatible_with_each_2758" ItemType="0" PsrId="306" Leaf="true">
+              <Str Cat="Text">
+                <Val><![CDATA[Each member of the union type '{0}' has signatures, but none of those signatures are compatible with each other.]]></Val>
+              </Str>
+              <Disp Icon="Str" />
+            </Item>
+            <Item ItemId=";Element_implicitly_has_an_any_type_because_expression_of_type_0_can_t_be_used_to_index_type_1_7053" ItemType="0" PsrId="306" Leaf="true">
+              <Str Cat="Text">
+                <Val><![CDATA[Element implicitly has an 'any' type because expression of type '{0}' can't be used to index type '{1}'.]]></Val>
+              </Str>
+              <Disp Icon="Str" />
+            </Item>
             <Item ItemId=";Element_implicitly_has_an_any_type_because_index_expression_is_not_of_type_number_7015" ItemType="0" PsrId="306" Leaf="true">
               <Str Cat="Text">
                 <Val><![CDATA[Element implicitly has an 'any' type because index expression is not of type 'number'.]]></Val>
@@ -2433,6 +2517,12 @@
               </Str>
               <Disp Icon="Str" />
             </Item>
+            <Item ItemId=";Element_implicitly_has_an_any_type_because_type_0_has_no_index_signature_Did_you_mean_to_call_1_7052" ItemType="0" PsrId="306" Leaf="true">
+              <Str Cat="Text">
+                <Val><![CDATA[Element implicitly has an 'any' type because type '{0}' has no index signature. Did you mean to call '{1}' ?]]></Val>
+              </Str>
+              <Disp Icon="Str" />
+            </Item>
             <Item ItemId=";Emit_a_UTF_8_Byte_Order_Mark_BOM_in_the_beginning_of_output_files_6164" ItemType="0" PsrId="306" Leaf="true">
               <Str Cat="Text">
                 <Val><![CDATA[Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files.]]></Val>
@@ -2663,7 +2753,7 @@
             </Item>
             <Item ItemId=";Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_t_1219" ItemType="0" PsrId="306" Leaf="true">
               <Str Cat="Text">
-                <Val><![CDATA[Experimental support for decorators is a feature that is subject to change in a future release. Set the 'experimentalDecorators' option to remove this warning.]]></Val>
+                <Val><![CDATA[Experimental support for decorators is a feature that is subject to change in a future release. Set the 'experimentalDecorators' option in your 'tsconfig' or 'jsconfig' to remove this warning.]]></Val>
               </Str>
               <Disp Icon="Str" />
             </Item>
@@ -2811,6 +2901,24 @@
               </Str>
               <Disp Icon="Str" />
             </Item>
+            <Item ItemId=";Extract_to_type_alias_95078" ItemType="0" PsrId="306" Leaf="true">
+              <Str Cat="Text">
+                <Val><![CDATA[Extract to type alias]]></Val>
+              </Str>
+              <Disp Icon="Str" />
+            </Item>
+            <Item ItemId=";Extract_to_typedef_95079" ItemType="0" PsrId="306" Leaf="true">
+              <Str Cat="Text">
+                <Val><![CDATA[Extract to typedef]]></Val>
+              </Str>
+              <Disp Icon="Str" />
+            </Item>
+            <Item ItemId=";Extract_type_95077" ItemType="0" PsrId="306" Leaf="true">
+              <Str Cat="Text">
+                <Val><![CDATA[Extract type]]></Val>
+              </Str>
+              <Disp Icon="Str" />
+            </Item>
             <Item ItemId=";FILE_6035" ItemType="0" PsrId="306" Leaf="true">
               <Str Cat="Text">
                 <Val><![CDATA[FILE]]></Val>
@@ -2865,9 +2973,9 @@
               </Str>
               <Disp Icon="Str" />
             </Item>
-            <Item ItemId=";File_0_is_not_in_project_file_list_Projects_must_list_all_files_or_use_an_include_pattern_6307" ItemType="0" PsrId="306" Leaf="true">
+            <Item ItemId=";File_0_is_not_listed_within_the_file_list_of_project_1_Projects_must_list_all_files_or_use_an_includ_6307" ItemType="0" PsrId="306" Leaf="true">
               <Str Cat="Text">
-                <Val><![CDATA[File '{0}' is not in project file list. Projects must list all files or use an 'include' pattern.]]></Val>
+                <Val><![CDATA[File '{0}' is not listed within the file list of project '{1}'. Projects must list all files or use an 'include' pattern.]]></Val>
               </Str>
               <Disp Icon="Str" />
             </Item>
@@ -2925,6 +3033,12 @@
               </Str>
               <Disp Icon="Str" />
             </Item>
+            <Item ItemId=";Fix_all_expressions_possibly_missing_await_95085" ItemType="0" PsrId="306" Leaf="true">
+              <Str Cat="Text">
+                <Val><![CDATA[Fix all expressions possibly missing 'await']]></Val>
+              </Str>
+              <Disp Icon="Str" />
+            </Item>
             <Item ItemId=";Found_0_errors_6217" ItemType="0" PsrId="306" Leaf="true">
               <Str Cat="Text">
                 <Val><![CDATA[Found {0} errors.]]></Val>
@@ -2955,12 +3069,6 @@
               </Str>
               <Disp Icon="Str" />
             </Item>
-            <Item ItemId=";Found_package_json_at_0_Package_ID_is_1_6190" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Found 'package.json' at '{0}'. Package ID is '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
             <Item ItemId=";Function_declarations_are_not_allowed_inside_blocks_in_strict_mode_when_targeting_ES3_or_ES5_1250" ItemType="0" PsrId="306" Leaf="true">
               <Str Cat="Text">
                 <Val><![CDATA[Function declarations are not allowed inside blocks in strict mode when targeting 'ES3' or 'ES5'.]]></Val>
@@ -3033,18 +3141,6 @@
               </Str>
               <Disp Icon="Str" />
             </Item>
-            <Item ItemId=";Generate_types_for_0_95067" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Generate types for '{0}']]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Generate_types_for_all_packages_without_types_95068" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Generate types for all packages without types]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
             <Item ItemId=";Generates_a_sourcemap_for_each_corresponding_d_ts_file_6000" ItemType="0" PsrId="306" Leaf="true">
               <Str Cat="Text">
                 <Val><![CDATA[Generates a sourcemap for each corresponding '.d.ts' file.]]></Val>
@@ -3063,9 +3159,9 @@
               </Str>
               <Disp Icon="Str" />
             </Item>
-            <Item ItemId=";Generator_implicitly_has_type_0_because_it_does_not_yield_any_values_Consider_supplying_a_return_typ_7025" ItemType="0" PsrId="306" Leaf="true">
+            <Item ItemId=";Generator_implicitly_has_yield_type_0_because_it_does_not_yield_any_values_Consider_supplying_a_retu_7025" ItemType="0" PsrId="306" Leaf="true">
               <Str Cat="Text">
-                <Val><![CDATA[Generator implicitly has type '{0}' because it does not yield any values. Consider supplying a return type.]]></Val>
+                <Val><![CDATA[Generator implicitly has yield type '{0}' because it does not yield any values. Consider supplying a return type annotation.]]></Val>
               </Str>
               <Disp Icon="Str" />
             </Item>
@@ -3333,6 +3429,12 @@
               </Str>
               <Disp Icon="Str" />
             </Item>
+            <Item ItemId=";Infer_this_type_of_0_from_usage_95080" ItemType="0" PsrId="306" Leaf="true">
+              <Str Cat="Text">
+                <Val><![CDATA[Infer 'this' type of '{0}' from usage]]></Val>
+              </Str>
+              <Disp Icon="Str" />
+            </Item>
             <Item ItemId=";Infer_type_of_0_from_usage_95011" ItemType="0" PsrId="306" Leaf="true">
               <Str Cat="Text">
                 <Val><![CDATA[Infer type of '{0}' from usage]]></Val>
@@ -3597,6 +3699,12 @@
               </Str>
               <Disp Icon="Str" />
             </Item>
+            <Item ItemId=";JSX_expressions_may_not_use_the_comma_operator_Did_you_mean_to_write_an_array_18007" ItemType="0" PsrId="306" Leaf="true">
+              <Str Cat="Text">
+                <Val><![CDATA[JSX expressions may not use the comma operator. Did you mean to write an array?]]></Val>
+              </Str>
+              <Disp Icon="Str" />
+            </Item>
             <Item ItemId=";JSX_expressions_must_have_one_parent_element_2657" ItemType="0" PsrId="306" Leaf="true">
               <Str Cat="Text">
                 <Val><![CDATA[JSX expressions must have one parent element.]]></Val>
@@ -3795,6 +3903,12 @@
               </Str>
               <Disp Icon="Str" />
             </Item>
+            <Item ItemId=";Module_0_can_only_be_default_imported_using_the_1_flag_1259" ItemType="0" PsrId="306" Leaf="true">
+              <Str Cat="Text">
+                <Val><![CDATA[Module '{0}' can only be default-imported using the '{1}' flag]]></Val>
+              </Str>
+              <Disp Icon="Str" />
+            </Item>
             <Item ItemId=";Module_0_does_not_refer_to_a_type_but_is_used_as_a_type_here_Did_you_mean_typeof_import_0_1340" ItemType="0" PsrId="306" Leaf="true">
               <Str Cat="Text">
                 <Val><![CDATA[Module '{0}' does not refer to a type, but is used as a type here. Did you mean 'typeof import('{0}')'?]]></Val>
@@ -3891,6 +4005,12 @@
               </Str>
               <Disp Icon="Str" />
             </Item>
+            <Item ItemId=";Module_name_0_was_successfully_resolved_to_1_with_Package_ID_2_6218" ItemType="0" PsrId="306" Leaf="true">
+              <Str Cat="Text">
+                <Val><![CDATA[======== Module name '{0}' was successfully resolved to '{1}' with Package ID '{2}'. ========]]></Val>
+              </Str>
+              <Disp Icon="Str" />
+            </Item>
             <Item ItemId=";Module_resolution_kind_is_not_specified_using_0_6088" ItemType="0" PsrId="306" Leaf="true">
               <Str Cat="Text">
                 <Val><![CDATA[Module resolution kind is not specified, using '{0}'.]]></Val>
@@ -3945,6 +4065,24 @@
               </Str>
               <Disp Icon="Str" />
             </Item>
+            <Item ItemId=";No_constituent_of_type_0_is_callable_2755" ItemType="0" PsrId="306" Leaf="true">
+              <Str Cat="Text">
+                <Val><![CDATA[No constituent of type '{0}' is callable.]]></Val>
+              </Str>
+              <Disp Icon="Str" />
+            </Item>
+            <Item ItemId=";No_constituent_of_type_0_is_constructable_2759" ItemType="0" PsrId="306" Leaf="true">
+              <Str Cat="Text">
+                <Val><![CDATA[No constituent of type '{0}' is constructable.]]></Val>
+              </Str>
+              <Disp Icon="Str" />
+            </Item>
+            <Item ItemId=";No_index_signature_with_a_parameter_of_type_0_was_found_on_type_1_7054" ItemType="0" PsrId="306" Leaf="true">
+              <Str Cat="Text">
+                <Val><![CDATA[No index signature with a parameter of type '{0}' was found on type '{1}'.]]></Val>
+              </Str>
+              <Disp Icon="Str" />
+            </Item>
             <Item ItemId=";No_inputs_were_found_in_config_file_0_Specified_include_paths_were_1_and_exclude_paths_were_2_18003" ItemType="0" PsrId="306" Leaf="true">
               <Str Cat="Text">
                 <Val><![CDATA[No inputs were found in config file '{0}'. Specified 'include' paths were '{1}' and 'exclude' paths were '{2}'.]]></Val>
@@ -3963,6 +4101,18 @@
               </Str>
               <Disp Icon="Str" />
             </Item>
+            <Item ItemId=";No_overload_matches_this_call_2769" ItemType="0" PsrId="306" Leaf="true">
+              <Str Cat="Text">
+                <Val><![CDATA[No overload matches this call.]]></Val>
+              </Str>
+              <Disp Icon="Str" />
+            </Item>
+            <Item ItemId=";No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer_18004" ItemType="0" PsrId="306" Leaf="true">
+              <Str Cat="Text">
+                <Val><![CDATA[No value exists in scope for the shorthand property '{0}'. Either declare one or provide an initializer.]]></Val>
+              </Str>
+              <Disp Icon="Str" />
+            </Item>
             <Item ItemId=";Non_abstract_class_0_does_not_implement_inherited_abstract_member_1_from_class_2_2515" ItemType="0" PsrId="306" Leaf="true">
               <Str Cat="Text">
                 <Val><![CDATA[Non-abstract class '{0}' does not implement inherited abstract member '{1}' from class '{2}'.]]></Val>
@@ -3987,6 +4137,18 @@
               </Str>
               <Disp Icon="Str" />
             </Item>
+            <Item ItemId=";Not_all_constituents_of_type_0_are_callable_2756" ItemType="0" PsrId="306" Leaf="true">
+              <Str Cat="Text">
+                <Val><![CDATA[Not all constituents of type '{0}' are callable.]]></Val>
+              </Str>
+              <Disp Icon="Str" />
+            </Item>
+            <Item ItemId=";Not_all_constituents_of_type_0_are_constructable_2760" ItemType="0" PsrId="306" Leaf="true">
+              <Str Cat="Text">
+                <Val><![CDATA[Not all constituents of type '{0}' are constructable.]]></Val>
+              </Str>
+              <Disp Icon="Str" />
+            </Item>
             <Item ItemId=";Numeric_index_type_0_is_not_assignable_to_string_index_type_1_2413" ItemType="0" PsrId="306" Leaf="true">
               <Str Cat="Text">
                 <Val><![CDATA[Numeric index type '{0}' is not assignable to string index type '{1}'.]]></Val>
@@ -4173,6 +4335,12 @@
               </Str>
               <Disp Icon="Str" />
             </Item>
+            <Item ItemId=";Option_incremental_can_only_be_specified_using_tsconfig_emitting_to_single_file_or_when_option_tsBui_5074" ItemType="0" PsrId="306" Leaf="true">
+              <Str Cat="Text">
+                <Val><![CDATA[Option '--incremental' can only be specified using tsconfig, emitting to single file or when option `--tsBuildInfoFile` is specified.]]></Val>
+              </Str>
+              <Disp Icon="Str" />
+            </Item>
             <Item ItemId=";Option_isolatedModules_can_only_be_used_when_either_option_module_is_provided_or_option_target_is_ES_5047" ItemType="0" PsrId="306" Leaf="true">
               <Str Cat="Text">
                 <Val><![CDATA[Option 'isolatedModules' can only be used when either option '--module' is provided or option 'target' is 'ES2015' or higher.]]></Val>
@@ -4233,6 +4401,12 @@
               </Str>
               <Disp Icon="Str" />
             </Item>
+            <Item ItemId=";Overload_0_of_1_2_gave_the_following_error_2772" ItemType="0" PsrId="306" Leaf="true">
+              <Str Cat="Text">
+                <Val><![CDATA[Overload {0} of {1}, '{2}', gave the following error.]]></Val>
+              </Str>
+              <Disp Icon="Str" />
+            </Item>
             <Item ItemId=";Overload_signatures_must_all_be_abstract_or_non_abstract_2512" ItemType="0" PsrId="306" Leaf="true">
               <Str Cat="Text">
                 <Val><![CDATA[Overload signatures must all be abstract or non-abstract.]]></Val>
@@ -4503,6 +4677,12 @@
               </Str>
               <Disp Icon="Str" />
             </Item>
+            <Item ItemId=";Private_or_protected_member_0_cannot_be_accessed_on_a_type_parameter_4105" ItemType="0" PsrId="306" Leaf="true">
+              <Str Cat="Text">
+                <Val><![CDATA[Private or protected member '{0}' cannot be accessed on a type parameter.]]></Val>
+              </Str>
+              <Disp Icon="Str" />
+            </Item>
             <Item ItemId=";Project_0_can_t_be_built_because_its_dependency_1_has_errors_6363" ItemType="0" PsrId="306" Leaf="true">
               <Str Cat="Text">
                 <Val><![CDATA[Project '{0}' can't be built because its dependency '{1}' has errors]]></Val>
@@ -4587,12 +4767,6 @@
               </Str>
               <Disp Icon="Str" />
             </Item>
-            <Item ItemId=";Property_0_does_not_exist_on_type_1_Did_you_forget_to_use_await_2570" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Property '{0}' does not exist on type '{1}'. Did you forget to use 'await'?]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
             <Item ItemId=";Property_0_does_not_exist_on_type_1_Did_you_mean_2_2551" ItemType="0" PsrId="306" Leaf="true">
               <Str Cat="Text">
                 <Val><![CDATA[Property '{0}' does not exist on type '{1}'. Did you mean '{2}'?]]></Val>
@@ -4911,6 +5085,12 @@
               </Str>
               <Disp Icon="Str" />
             </Item>
+            <Item ItemId=";Remove_all_unnecessary_uses_of_await_95087" ItemType="0" PsrId="306" Leaf="true">
+              <Str Cat="Text">
+                <Val><![CDATA[Remove all unnecessary uses of 'await']]></Val>
+              </Str>
+              <Disp Icon="Str" />
+            </Item>
             <Item ItemId=";Remove_all_unreachable_code_95051" ItemType="0" PsrId="306" Leaf="true">
               <Str Cat="Text">
                 <Val><![CDATA[Remove all unreachable code]]></Val>
@@ -4959,6 +5139,12 @@
               </Str>
               <Disp Icon="Str" />
             </Item>
+            <Item ItemId=";Remove_unnecessary_await_95086" ItemType="0" PsrId="306" Leaf="true">
+              <Str Cat="Text">
+                <Val><![CDATA[Remove unnecessary 'await']]></Val>
+              </Str>
+              <Disp Icon="Str" />
+            </Item>
             <Item ItemId=";Remove_unreachable_code_95050" ItemType="0" PsrId="306" Leaf="true">
               <Str Cat="Text">
                 <Val><![CDATA[Remove unreachable code]]></Val>
@@ -5601,6 +5787,18 @@
               </Str>
               <Disp Icon="Str" />
             </Item>
+            <Item ItemId=";The_0_property_of_an_async_iterator_must_be_a_method_2768" ItemType="0" PsrId="306" Leaf="true">
+              <Str Cat="Text">
+                <Val><![CDATA[The '{0}' property of an async iterator must be a method.]]></Val>
+              </Str>
+              <Disp Icon="Str" />
+            </Item>
+            <Item ItemId=";The_0_property_of_an_iterator_must_be_a_method_2767" ItemType="0" PsrId="306" Leaf="true">
+              <Str Cat="Text">
+                <Val><![CDATA[The '{0}' property of an iterator must be a method.]]></Val>
+              </Str>
+              <Disp Icon="Str" />
+            </Item>
             <Item ItemId=";The_Object_type_is_assignable_to_very_few_other_types_Did_you_mean_to_use_the_any_type_instead_2696" ItemType="0" PsrId="306" Leaf="true">
               <Str Cat="Text">
                 <Val><![CDATA[The 'Object' type is assignable to very few other types. Did you mean to use the 'any' type instead?]]></Val>
@@ -5679,6 +5877,12 @@
               </Str>
               <Disp Icon="Str" />
             </Item>
+            <Item ItemId=";The_first_export_default_is_here_2752" ItemType="0" PsrId="306" Leaf="true">
+              <Str Cat="Text">
+                <Val><![CDATA[The first export default is here.]]></Val>
+              </Str>
+              <Disp Icon="Str" />
+            </Item>
             <Item ItemId=";The_first_parameter_of_the_then_method_of_a_promise_must_be_a_callback_1060" ItemType="0" PsrId="306" Leaf="true">
               <Str Cat="Text">
                 <Val><![CDATA[The first parameter of the 'then' method of a promise must be a callback.]]></Val>
@@ -5715,6 +5919,18 @@
               </Str>
               <Disp Icon="Str" />
             </Item>
+            <Item ItemId=";The_last_overload_gave_the_following_error_2770" ItemType="0" PsrId="306" Leaf="true">
+              <Str Cat="Text">
+                <Val><![CDATA[The last overload gave the following error.]]></Val>
+              </Str>
+              <Disp Icon="Str" />
+            </Item>
+            <Item ItemId=";The_last_overload_is_declared_here_2771" ItemType="0" PsrId="306" Leaf="true">
+              <Str Cat="Text">
+                <Val><![CDATA[The last overload is declared here.]]></Val>
+              </Str>
+              <Disp Icon="Str" />
+            </Item>
             <Item ItemId=";The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern_2491" ItemType="0" PsrId="306" Leaf="true">
               <Str Cat="Text">
                 <Val><![CDATA[The left-hand side of a 'for...in' statement cannot be a destructuring pattern.]]></Val>
@@ -5889,6 +6105,12 @@
               </Str>
               <Disp Icon="Str" />
             </Item>
+            <Item ItemId=";The_type_0_is_readonly_and_cannot_be_assigned_to_the_mutable_type_1_4104" ItemType="0" PsrId="306" Leaf="true">
+              <Str Cat="Text">
+                <Val><![CDATA[The type '{0}' is 'readonly' and cannot be assigned to the mutable type '{1}'.]]></Val>
+              </Str>
+              <Disp Icon="Str" />
+            </Item>
             <Item ItemId=";The_type_argument_for_type_parameter_0_cannot_be_inferred_from_the_usage_Consider_specifying_the_typ_2453" ItemType="0" PsrId="306" Leaf="true">
               <Str Cat="Text">
                 <Val><![CDATA[The type argument for type parameter '{0}' cannot be inferred from the usage. Consider specifying the type arguments explicitly.]]></Val>
@@ -5901,15 +6123,15 @@
               </Str>
               <Disp Icon="Str" />
             </Item>
-            <Item ItemId=";The_type_returned_by_the_next_method_of_an_async_iterator_must_be_a_promise_for_a_type_with_a_value__2547" ItemType="0" PsrId="306" Leaf="true">
+            <Item ItemId=";The_type_returned_by_the_0_method_of_an_async_iterator_must_be_a_promise_for_a_type_with_a_value_pro_2547" ItemType="0" PsrId="306" Leaf="true">
               <Str Cat="Text">
-                <Val><![CDATA[The type returned by the 'next()' method of an async iterator must be a promise for a type with a 'value' property.]]></Val>
+                <Val><![CDATA[The type returned by the '{0}()' method of an async iterator must be a promise for a type with a 'value' property.]]></Val>
               </Str>
               <Disp Icon="Str" />
             </Item>
-            <Item ItemId=";The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property_2490" ItemType="0" PsrId="306" Leaf="true">
+            <Item ItemId=";The_type_returned_by_the_0_method_of_an_iterator_must_have_a_value_property_2490" ItemType="0" PsrId="306" Leaf="true">
               <Str Cat="Text">
-                <Val><![CDATA[The type returned by the 'next()' method of an iterator must have a 'value' property.]]></Val>
+                <Val><![CDATA[The type returned by the '{0}()' method of an iterator must have a 'value' property.]]></Val>
               </Str>
               <Disp Icon="Str" />
             </Item>
@@ -5955,6 +6177,18 @@
               </Str>
               <Disp Icon="Str" />
             </Item>
+            <Item ItemId=";This_expression_is_not_callable_2349" ItemType="0" PsrId="306" Leaf="true">
+              <Str Cat="Text">
+                <Val><![CDATA[This expression is not callable.]]></Val>
+              </Str>
+              <Disp Icon="Str" />
+            </Item>
+            <Item ItemId=";This_expression_is_not_constructable_2351" ItemType="0" PsrId="306" Leaf="true">
+              <Str Cat="Text">
+                <Val><![CDATA[This expression is not constructable.]]></Val>
+              </Str>
+              <Disp Icon="Str" />
+            </Item>
             <Item ItemId=";This_may_be_converted_to_an_async_function_80006" ItemType="0" PsrId="306" Leaf="true">
               <Str Cat="Text">
                 <Val><![CDATA[This may be converted to an async function.]]></Val>
@@ -5967,6 +6201,12 @@
               </Str>
               <Disp Icon="Str" />
             </Item>
+            <Item ItemId=";This_module_is_declared_with_using_export_and_can_only_be_used_with_a_default_import_when_using_the__2594" ItemType="0" PsrId="306" Leaf="true">
+              <Str Cat="Text">
+                <Val><![CDATA[This module is declared with using 'export =', and can only be used with a default import when using the '{0}' flag.]]></Val>
+              </Str>
+              <Disp Icon="Str" />
+            </Item>
             <Item ItemId=";This_overload_signature_is_not_compatible_with_its_implementation_signature_2394" ItemType="0" PsrId="306" Leaf="true">
               <Str Cat="Text">
                 <Val><![CDATA[This overload signature is not compatible with its implementation signature.]]></Val>
@@ -5991,6 +6231,12 @@
               </Str>
               <Disp Icon="Str" />
             </Item>
+            <Item ItemId=";Top_level_declarations_in_d_ts_files_must_start_with_either_a_declare_or_export_modifier_1046" ItemType="0" PsrId="306" Leaf="true">
+              <Str Cat="Text">
+                <Val><![CDATA[Top-level declarations in .d.ts files must start with either a 'declare' or 'export' modifier.]]></Val>
+              </Str>
+              <Disp Icon="Str" />
+            </Item>
             <Item ItemId=";Trailing_comma_not_allowed_1009" ItemType="0" PsrId="306" Leaf="true">
               <Str Cat="Text">
                 <Val><![CDATA[Trailing comma not allowed.]]></Val>
@@ -6045,6 +6291,18 @@
               </Str>
               <Disp Icon="Str" />
             </Item>
+            <Item ItemId=";Type_0_has_no_call_signatures_2757" ItemType="0" PsrId="306" Leaf="true">
+              <Str Cat="Text">
+                <Val><![CDATA[Type '{0}' has no call signatures.]]></Val>
+              </Str>
+              <Disp Icon="Str" />
+            </Item>
+            <Item ItemId=";Type_0_has_no_construct_signatures_2761" ItemType="0" PsrId="306" Leaf="true">
+              <Str Cat="Text">
+                <Val><![CDATA[Type '{0}' has no construct signatures.]]></Val>
+              </Str>
+              <Disp Icon="Str" />
+            </Item>
             <Item ItemId=";Type_0_has_no_matching_index_signature_for_type_1_2537" ItemType="0" PsrId="306" Leaf="true">
               <Str Cat="Text">
                 <Val><![CDATA[Type '{0}' has no matching index signature for type '{1}'.]]></Val>
@@ -6375,6 +6633,12 @@
               </Str>
               <Disp Icon="Str" />
             </Item>
+            <Item ItemId=";Type_reference_directive_0_was_successfully_resolved_to_1_with_Package_ID_2_primary_Colon_3_6219" ItemType="0" PsrId="306" Leaf="true">
+              <Str Cat="Text">
+                <Val><![CDATA[======== Type reference directive '{0}' was successfully resolved to '{1}' with Package ID '{2}', primary: {3}. ========]]></Val>
+              </Str>
+              <Disp Icon="Str" />
+            </Item>
             <Item ItemId=";Types_have_separate_declarations_of_a_private_property_0_2442" ItemType="0" PsrId="306" Leaf="true">
               <Str Cat="Text">
                 <Val><![CDATA[Types have separate declarations of a private property '{0}'.]]></Val>
@@ -6717,6 +6981,12 @@
               </Str>
               <Disp Icon="Str" />
             </Item>
+            <Item ItemId=";_0_is_assignable_to_the_constraint_of_type_1_but_1_could_be_instantiated_with_a_different_subtype_of_5075" ItemType="0" PsrId="306" Leaf="true">
+              <Str Cat="Text">
+                <Val><![CDATA['{0}' is assignable to the constraint of type '{1}', but '{1}' could be instantiated with a different subtype of constraint '{2}'.]]></Val>
+              </Str>
+              <Disp Icon="Str" />
+            </Item>
             <Item ItemId=";_0_is_declared_but_its_value_is_never_read_6133" ItemType="0" PsrId="306" Leaf="true">
               <Str Cat="Text">
                 <Val><![CDATA['{0}' is declared but its value is never read.]]></Val>
@@ -6891,6 +7161,12 @@
               </Str>
               <Disp Icon="Str" />
             </Item>
+            <Item ItemId=";_0_which_lacks_return_type_annotation_implicitly_has_an_1_yield_type_7055" ItemType="0" PsrId="306" Leaf="true">
+              <Str Cat="Text">
+                <Val><![CDATA['{0}', which lacks return-type annotation, implicitly has an '{1}' yield type.]]></Val>
+              </Str>
+              <Disp Icon="Str" />
+            </Item>
             <Item ItemId=";abstract_modifier_can_only_appear_on_a_class_method_or_property_declaration_1242" ItemType="0" PsrId="306" Leaf="true">
               <Str Cat="Text">
                 <Val><![CDATA['abstract' modifier can only appear on a class, method, or property declaration.]]></Val>
@@ -6915,6 +7191,12 @@
               </Str>
               <Disp Icon="Str" />
             </Item>
+            <Item ItemId=";await_has_no_effect_on_the_type_of_this_expression_80007" ItemType="0" PsrId="306" Leaf="true">
+              <Str Cat="Text">
+                <Val><![CDATA['await' has no effect on the type of this expression.]]></Val>
+              </Str>
+              <Disp Icon="Str" />
+            </Item>
             <Item ItemId=";baseUrl_option_is_set_to_0_using_this_value_to_resolve_non_relative_module_name_1_6106" ItemType="0" PsrId="306" Leaf="true">
               <Str Cat="Text">
                 <Val><![CDATA['baseUrl' option is set to '{0}', using this value to resolve non-relative module name '{1}'.]]></Val>
@@ -7137,6 +7419,12 @@
               </Str>
               <Disp Icon="Str" />
             </Item>
+            <Item ItemId=";package_json_had_a_falsy_0_field_6220" ItemType="0" PsrId="306" Leaf="true">
+              <Str Cat="Text">
+                <Val><![CDATA['package.json' had a falsy '{0}' field.]]></Val>
+              </Str>
+              <Disp Icon="Str" />
+            </Item>
             <Item ItemId=";package_json_has_0_field_1_that_references_2_6101" ItemType="0" PsrId="306" Leaf="true">
               <Str Cat="Text">
                 <Val><![CDATA['package.json' has '{0}' field '{1}' that references '{2}'.]]></Val>
@@ -7227,6 +7515,12 @@
               </Str>
               <Disp Icon="Str" />
             </Item>
+            <Item ItemId=";super_may_not_use_type_arguments_2754" ItemType="0" PsrId="306" Leaf="true">
+              <Str Cat="Text">
+                <Val><![CDATA['super' may not use type arguments.]]></Val>
+              </Str>
+              <Disp Icon="Str" />
+            </Item>
             <Item ItemId=";super_must_be_called_before_accessing_a_property_of_super_in_the_constructor_of_a_derived_class_17011" ItemType="0" PsrId="306" Leaf="true">
               <Str Cat="Text">
                 <Val><![CDATA['super' must be called before accessing a property of 'super' in the constructor of a derived class.]]></Val>
diff --git a/lib/it/diagnosticMessages.generated.json b/lib/it/diagnosticMessages.generated.json
index 9f8ef7d48f4..51981810ba2 100644
--- a/lib/it/diagnosticMessages.generated.json
+++ b/lib/it/diagnosticMessages.generated.json
@@ -355,7 +355,7 @@
   "Element_implicitly_has_an_any_type_because_type_0_has_no_index_signature_7017": "L'elemento contiene implicitamente un tipo 'any' perché al tipo '{0}' non è assegnata alcuna firma dell'indice.",
   "Emit_a_UTF_8_Byte_Order_Mark_BOM_in_the_beginning_of_output_files_6164": "Crea un BOM (Byte Order Mark) UTF-8 all'inizio dei file di output.",
   "Emit_a_single_file_with_source_maps_instead_of_having_a_separate_file_6151": "Crea un unico file con i mapping di origine invece di file separati.",
-  "Emit_the_source_alongside_the_sourcemaps_within_a_single_file_requires_inlineSourceMap_or_sourceMap__6152": "Crea l'origine unitamente alle mappe di origine all'interno di un unico file. Richiede l'impostazione di '--inlineSourceMap' o '--sourceMap'.",
+  "Emit_the_source_alongside_the_sourcemaps_within_a_single_file_requires_inlineSourceMap_or_sourceMap__6152": "Crea l'origine unitamente ai mapping di origine all'interno di un unico file. Richiede l'impostazione di '--inlineSourceMap' o '--sourceMap'.",
   "Enable_all_strict_type_checking_options_6180": "Abilita tutte le opzioni per i controlli del tipo strict.",
   "Enable_project_compilation_6302": "Abilitare la compilazione dei progetti",
   "Enable_strict_checking_of_function_types_6186": "Abilita il controllo tassativo dei tipi funzione.",
@@ -445,7 +445,7 @@
   "Function_overload_must_be_static_2387": "L'overload della funzione deve essere statico.",
   "Function_overload_must_not_be_static_2388": "L'overload della funzione non deve essere statico.",
   "Generate_get_and_set_accessors_95046": "Generare le funzioni di accesso 'get' e 'set'",
-  "Generates_a_sourcemap_for_each_corresponding_d_ts_file_6000": "Genera un sourcemap per ogni file '.d.ts' corrispondente.",
+  "Generates_a_sourcemap_for_each_corresponding_d_ts_file_6000": "Genera un mapping di origine per ogni file '.d.ts' corrispondente.",
   "Generates_corresponding_d_ts_file_6002": "Genera il file '.d.ts' corrispondente.",
   "Generates_corresponding_map_file_6043": "Genera il file '.map' corrispondente.",
   "Generator_implicitly_has_type_0_because_it_does_not_yield_any_values_Consider_supplying_a_return_typ_7025": "Il tipo del generatore è implicitamente '{0}' perché non contiene alcun valore. Provare a specificare un tipo restituito.",
diff --git a/lib/ja/diagnosticMessages.generated.json b/lib/ja/diagnosticMessages.generated.json
index 6877a89c753..d3029982ca6 100644
--- a/lib/ja/diagnosticMessages.generated.json
+++ b/lib/ja/diagnosticMessages.generated.json
@@ -355,7 +355,7 @@
   "Element_implicitly_has_an_any_type_because_type_0_has_no_index_signature_7017": "型 '{0}' にはインデックス シグネチャがないため、要素は暗黙的に 'any' 型になります。",
   "Emit_a_UTF_8_Byte_Order_Mark_BOM_in_the_beginning_of_output_files_6164": "出力ファイルの最初に UTF-8 バイト順マーク(BOM) を生成します。",
   "Emit_a_single_file_with_source_maps_instead_of_having_a_separate_file_6151": "個々のファイルを持つ代わりに、複数のソース マップを含む単一ファイルを生成します。",
-  "Emit_the_source_alongside_the_sourcemaps_within_a_single_file_requires_inlineSourceMap_or_sourceMap__6152": "単一ファイル内で sourcemap と共にソースを生成します。'--inlineSourceMap' または '--sourceMap' を設定する必要があります。",
+  "Emit_the_source_alongside_the_sourcemaps_within_a_single_file_requires_inlineSourceMap_or_sourceMap__6152": "単一ファイル内でソースマップと共にソースを生成します。'--inlineSourceMap' または '--sourceMap' を設定する必要があります。",
   "Enable_all_strict_type_checking_options_6180": "厳密な型チェックのオプションをすべて有効にします。",
   "Enable_project_compilation_6302": "プロジェクトのコンパイルを有効にします",
   "Enable_strict_checking_of_function_types_6186": "関数の型の厳密なチェックを有効にします。",
@@ -445,7 +445,7 @@
   "Function_overload_must_be_static_2387": "関数のオーバーロードは静的でなければなりません。",
   "Function_overload_must_not_be_static_2388": "関数のオーバーロードは静的にはできせん。",
   "Generate_get_and_set_accessors_95046": "'get' および 'set' アクセサーの生成",
-  "Generates_a_sourcemap_for_each_corresponding_d_ts_file_6000": "対応する各 '.d.ts' ファイルに sourcemap を生成します。",
+  "Generates_a_sourcemap_for_each_corresponding_d_ts_file_6000": "対応する各 '.d.ts' ファイルにソースマップを生成します。",
   "Generates_corresponding_d_ts_file_6002": "対応する '.d.ts' ファイルを生成します。",
   "Generates_corresponding_map_file_6043": "対応する '.map' ファイルを生成します。",
   "Generator_implicitly_has_type_0_because_it_does_not_yield_any_values_Consider_supplying_a_return_typ_7025": "ジェネレーターは値を生成しないため、暗黙的に型 '{0}' になります。戻り値の型を指定することを検討してください。",
diff --git a/lib/ko/diagnosticMessages.generated.json b/lib/ko/diagnosticMessages.generated.json
index a1b1320115a..abda4ace91f 100644
--- a/lib/ko/diagnosticMessages.generated.json
+++ b/lib/ko/diagnosticMessages.generated.json
@@ -309,7 +309,7 @@
   "Declare_static_property_0_90027": "'{0}' 정적 속성 선언",
   "Decorators_are_not_valid_here_1206": "데코레이터는 여기에 사용할 수 없습니다.",
   "Decorators_cannot_be_applied_to_multiple_get_Slashset_accessors_of_the_same_name_1207": "동일한 이름의 여러 get/set 접근자에 데코레이터를 적용할 수 없습니다.",
-  "Default_export_of_the_module_has_or_is_using_private_name_0_4082": "모듈의 기본 내보내기에서 전용 이름 '{0}'을(를) 가지고 있거나 사용 중입니다.",
+  "Default_export_of_the_module_has_or_is_using_private_name_0_4082": "모듈의 기본 내보내기에서 프라이빗 이름 '{0}'을(를) 가지고 있거나 사용 중입니다.",
   "Delete_all_unused_declarations_95024": "사용하지 않는 선언 모두 삭제",
   "Delete_the_outputs_of_all_projects_6365": "모든 프로젝트의 출력 삭제",
   "Deprecated_Use_jsxFactory_instead_Specify_the_object_invoked_for_createElement_when_targeting_react__6084": "[사용되지 않음] 대신 '--jsxFactory'를 사용합니다. 'react' JSX 내보내기를 대상으로 할 경우 createElement에 대해 호출되는 개체를 지정합니다.",
@@ -395,10 +395,10 @@
   "Export_declarations_are_not_permitted_in_a_namespace_1194": "네임스페이스에서는 내보내기 선언이 허용되지 않습니다.",
   "Exported_external_package_typings_file_0_is_not_a_module_Please_contact_the_package_author_to_update_2656": "내보낸 외부 패키지 입력 항목 파일 '{0}'은(는) 모듈이 아닙니다. 패키지 작성자에게 문의하여 패키지 정의를 업데이트하세요.",
   "Exported_external_package_typings_file_cannot_contain_tripleslash_references_Please_contact_the_pack_2654": "내보낸 외부 패키지 입력 항목 파일에는 삼중 슬래시 참조가 포함될 수 없습니다. 패키지 작성자에게 문의하여 패키지 정의를 업데이트하세요.",
-  "Exported_type_alias_0_has_or_is_using_private_name_1_4081": "내보낸 형식 별칭 '{0}'은(는) '{1}' 전용 이름을 포함하거나 사용 중입니다.",
+  "Exported_type_alias_0_has_or_is_using_private_name_1_4081": "내보낸 형식 별칭 '{0}'은(는) '{1}' 프라이빗 이름을 포함하거나 사용 중입니다.",
   "Exported_variable_0_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named_4023": "내보낸 변수 '{0}'이(가) 외부 모듈 {2}의 '{1}' 이름을 가지고 있거나 사용 중이지만 명명할 수 없습니다.",
-  "Exported_variable_0_has_or_is_using_name_1_from_private_module_2_4024": "내보낸 변수 '{0}'이(가) 전용 모듈 '{2}'의 '{1}' 이름을 가지고 있거나 사용 중입니다.",
-  "Exported_variable_0_has_or_is_using_private_name_1_4025": "내보낸 변수 '{0}'이(가) 전용 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
+  "Exported_variable_0_has_or_is_using_name_1_from_private_module_2_4024": "내보낸 변수 '{0}'이(가) 프라이빗 모듈 '{2}'의 '{1}' 이름을 가지고 있거나 사용 중입니다.",
+  "Exported_variable_0_has_or_is_using_private_name_1_4025": "내보낸 변수 '{0}'이(가) 프라이빗 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
   "Exports_and_export_assignments_are_not_permitted_in_module_augmentations_2666": "내보내기 및 내보내기 할당는 모듈 확대에서 허용되지 않습니다.",
   "Expression_expected_1109": "식이 필요합니다.",
   "Expression_or_comma_expected_1137": "식 또는 쉼표가 필요합니다.",
@@ -471,10 +471,10 @@
   "Implement_all_unimplemented_interfaces_95032": "구현되지 않은 인터페이스 모두 구현",
   "Implement_inherited_abstract_class_90007": "상속된 추상 클래스 구현",
   "Implement_interface_0_90006": "'{0}' 인터페이스 구현",
-  "Implements_clause_of_exported_class_0_has_or_is_using_private_name_1_4019": "내보낸 클래스 '{0}'의 Implements 절이 전용 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
+  "Implements_clause_of_exported_class_0_has_or_is_using_private_name_1_4019": "내보낸 클래스 '{0}'의 Implements 절이 프라이빗 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
   "Import_0_from_module_1_90013": "\"{1}\" 모듈에서 '{0}' 가져오기",
   "Import_assignment_cannot_be_used_when_targeting_ECMAScript_modules_Consider_using_import_Asterisk_as_1202": "ECMAScript 모듈을 대상으로 하는 경우 할당 가져오기를 사용할 수 없습니다. 대신 'import * as ns from \"mod\"', 'import {a} from \"mod\"', 'import d from \"mod\"' 또는 다른 모듈 형식 사용을 고려하세요.",
-  "Import_declaration_0_is_using_private_name_1_4000": "가져오기 선언 '{0}'이(가) 전용 이름 '{1}'을(를) 사용하고 있습니다.",
+  "Import_declaration_0_is_using_private_name_1_4000": "가져오기 선언 '{0}'이(가) 프라이빗 이름 '{1}'을(를) 사용하고 있습니다.",
   "Import_declaration_conflicts_with_local_declaration_of_0_2440": "가져오기 선언이 '{0}'의 로컬 선언과 충돌합니다.",
   "Import_declarations_in_a_namespace_cannot_reference_a_module_1147": "네임스페이스의 가져오기 선언은 모듈을 참조할 수 없습니다.",
   "Import_emit_helpers_from_tslib_6139": "'tslib'에서 내보내기 도우미를 가져오세요.",
@@ -563,8 +563,8 @@
   "Merged_declaration_0_cannot_include_a_default_export_declaration_Consider_adding_a_separate_export_d_2652": "병합된 선언 '{0}'에는 기본 내보내기 선언을 포함할 수 없습니다. 대신 별도의 'export default {0}' 선언을 추가하세요.",
   "Meta_property_0_is_only_allowed_in_the_body_of_a_function_declaration_function_expression_or_constru_17013": "메타 속성 '{0}'은(는) 함수 선언, 함수 식 또는 생성기의 본문에서만 사용할 수 있습니다.",
   "Method_0_cannot_have_an_implementation_because_it_is_marked_abstract_1245": "'{0}' 메서드는 abstract로 표시되어 있으므로 구현이 있을 수 없습니다.",
-  "Method_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2_4101": "내보낸 인터페이스의 '{0}' 메서드가 전용 모듈 '{2}'의 '{1}' 이름을 가지고 있거나 사용 중입니다.",
-  "Method_0_of_exported_interface_has_or_is_using_private_name_1_4102": "내보낸 인터페이스의 '{0}' 메서드가 전용 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
+  "Method_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2_4101": "내보낸 인터페이스의 '{0}' 메서드가 프라이빗 모듈 '{2}'의 '{1}' 이름을 가지고 있거나 사용 중입니다.",
+  "Method_0_of_exported_interface_has_or_is_using_private_name_1_4102": "내보낸 인터페이스의 '{0}' 메서드가 프라이빗 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
   "Modifiers_cannot_appear_here_1184": "한정자를 여기에 표시할 수 없습니다.",
   "Module_0_does_not_refer_to_a_type_but_is_used_as_a_type_here_1340": "모듈 '{0}'은(는) 형식을 참조하지 않지만, 여기에서 형식으로 사용됩니다.",
   "Module_0_does_not_refer_to_a_value_but_is_used_as_a_value_here_1339": "모듈 '{0}'은(는) 값을 참조하지 않지만, 여기에서 값으로 사용됩니다.",
@@ -639,36 +639,36 @@
   "Overload_signatures_must_all_be_ambient_or_non_ambient_2384": "오버로드 시그니처는 모두 앰비언트이거나 앰비언트가 아니어야 합니다.",
   "Overload_signatures_must_all_be_exported_or_non_exported_2383": "오버로드 시그니처는 모두 내보내거나 모두 내보내지 않아야 합니다.",
   "Overload_signatures_must_all_be_optional_or_required_2386": "오버로드 시그니처는 모두 선택 사항이거나 필수 사항이어야 합니다.",
-  "Overload_signatures_must_all_be_public_private_or_protected_2385": "오버로드 시그니처는 모두 공용, 전용 또는 보호된 상태여야 합니다.",
+  "Overload_signatures_must_all_be_public_private_or_protected_2385": "오버로드 시그니처는 모두 퍼블릭, 프라이빗 또는 보호된 상태여야 합니다.",
   "Parameter_0_cannot_be_referenced_in_its_initializer_2372": "매개 변수 '{0}'은(는) 해당 이니셜라이저에서 참조할 수 없습니다.",
   "Parameter_0_implicitly_has_an_1_type_7006": "'{0}' 매개 변수에는 암시적으로 '{1}' 형식이 포함됩니다.",
   "Parameter_0_is_not_in_the_same_position_as_parameter_1_1227": "'{0}' 매개 변수는 '{1}' 매개 변수와 같은 위치에 있지 않습니다.",
-  "Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2_4066": "내보낸 인터페이스에 있는 호출 시그니처의 '{0}' 매개 변수가 전용 모듈 '{2}'의 '{1}' 이름을 가지고 있거나 사용 중입니다.",
-  "Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1_4067": "내보낸 인터페이스에 있는 호출 시그니처의 '{0}' 매개 변수가 전용 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
+  "Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2_4066": "내보낸 인터페이스에 있는 호출 시그니처의 '{0}' 매개 변수가 프라이빗 모듈 '{2}'의 '{1}' 이름을 가지고 있거나 사용 중입니다.",
+  "Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1_4067": "내보낸 인터페이스에 있는 호출 시그니처의 '{0}' 매개 변수가 프라이빗 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
   "Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_can_4061": "내보낸 클래스에 있는 생성자의 '{0}' 매개 변수가 외부 모듈 {2}의 '{1}' 이름을 가지고 있거나 사용 중이지만 명명할 수 없습니다.",
-  "Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_private_module_2_4062": "내보낸 클래스에 있는 생성자의 '{0}' 매개 변수가 전용 모듈 '{2}'의 '{1}' 이름을 가지고 있거나 사용 중입니다.",
-  "Parameter_0_of_constructor_from_exported_class_has_or_is_using_private_name_1_4063": "내보낸 클래스에 있는 생성자의 '{0}' 매개 변수가 전용 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
-  "Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_name_1_from_private_mod_4064": "내보낸 인터페이스에 있는 생성자 시그니처의 '{0}' 매개 변수가 전용 모듈 '{2}'의 '{1}' 이름을 가지고 있거나 사용 중입니다.",
-  "Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1_4065": "내보낸 인터페이스에 있는 생성자 시그니처의 '{0}' 매개 변수가 전용 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
+  "Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_private_module_2_4062": "내보낸 클래스에 있는 생성자의 '{0}' 매개 변수가 프라이빗 모듈 '{2}'의 '{1}' 이름을 가지고 있거나 사용 중입니다.",
+  "Parameter_0_of_constructor_from_exported_class_has_or_is_using_private_name_1_4063": "내보낸 클래스에 있는 생성자의 '{0}' 매개 변수가 프라이빗 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
+  "Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_name_1_from_private_mod_4064": "내보낸 인터페이스에 있는 생성자 시그니처의 '{0}' 매개 변수가 프라이빗 모듈 '{2}'의 '{1}' 이름을 가지고 있거나 사용 중입니다.",
+  "Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1_4065": "내보낸 인터페이스에 있는 생성자 시그니처의 '{0}' 매개 변수가 프라이빗 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
   "Parameter_0_of_exported_function_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named_4076": "내보낸 함수의 '{0}' 매개 변수가 외부 모듈 {2}의 '{1}' 이름을 가지고 있거나 사용 중이지만 명명할 수 없습니다.",
-  "Parameter_0_of_exported_function_has_or_is_using_name_1_from_private_module_2_4077": "내보낸 함수의 '{0}' 매개 변수가 전용 모듈 '{2}'의 '{1}' 이름을 가지고 있거나 사용 중입니다.",
-  "Parameter_0_of_exported_function_has_or_is_using_private_name_1_4078": "내보낸 함수의 '{0}' 매개 변수가 전용 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
-  "Parameter_0_of_index_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2_4091": "내보낸 인터페이스에 있는 인덱스 시그니처의 '{0}' 매개 변수가 전용 모듈 '{2}'의 '{1}' 이름을 가지고 있거나 사용 중입니다.",
-  "Parameter_0_of_index_signature_from_exported_interface_has_or_is_using_private_name_1_4092": "내보낸 인터페이스에 있는 인덱스 시그니처의 '{0}' 매개 변수가 전용 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
-  "Parameter_0_of_method_from_exported_interface_has_or_is_using_name_1_from_private_module_2_4074": "내보낸 인터페이스에 있는 메서드의 '{0}' 매개 변수가 전용 모듈 '{2}'의 '{1}' 이름을 가지고 있거나 사용 중입니다.",
-  "Parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1_4075": "내보낸 인터페이스에 있는 메서드의 '{0}' 매개 변수가 전용 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
+  "Parameter_0_of_exported_function_has_or_is_using_name_1_from_private_module_2_4077": "내보낸 함수의 '{0}' 매개 변수가 프라이빗 모듈 '{2}'의 '{1}' 이름을 가지고 있거나 사용 중입니다.",
+  "Parameter_0_of_exported_function_has_or_is_using_private_name_1_4078": "내보낸 함수의 '{0}' 매개 변수가 프라이빗 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
+  "Parameter_0_of_index_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2_4091": "내보낸 인터페이스에 있는 인덱스 시그니처의 '{0}' 매개 변수가 프라이빗 모듈 '{2}'의 '{1}' 이름을 가지고 있거나 사용 중입니다.",
+  "Parameter_0_of_index_signature_from_exported_interface_has_or_is_using_private_name_1_4092": "내보낸 인터페이스에 있는 인덱스 시그니처의 '{0}' 매개 변수가 프라이빗 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
+  "Parameter_0_of_method_from_exported_interface_has_or_is_using_name_1_from_private_module_2_4074": "내보낸 인터페이스에 있는 메서드의 '{0}' 매개 변수가 프라이빗 모듈 '{2}'의 '{1}' 이름을 가지고 있거나 사용 중입니다.",
+  "Parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1_4075": "내보낸 인터페이스에 있는 메서드의 '{0}' 매개 변수가 프라이빗 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
   "Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_c_4071": "내보낸 클래스에 있는 공용 메서드의 '{0}' 매개 변수가 외부 모듈 {2}의 '{1}' 이름을 가지고 있거나 사용 중이지만 명명할 수 없습니다.",
-  "Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_private_module_2_4072": "내보낸 클래스에 있는 공용 메서드의 '{0}' 매개 변수가 전용 모듈 '{2}'의 '{1}' 이름을 가지고 있거나 사용 중입니다.",
-  "Parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1_4073": "내보낸 클래스에 있는 공용 메서드의 '{0}' 매개 변수가 전용 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
+  "Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_private_module_2_4072": "내보낸 클래스에 있는 공용 메서드의 '{0}' 매개 변수가 프라이빗 모듈 '{2}'의 '{1}' 이름을 가지고 있거나 사용 중입니다.",
+  "Parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1_4073": "내보낸 클래스에 있는 공용 메서드의 '{0}' 매개 변수가 프라이빗 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
   "Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_external_module__4068": "내보낸 클래스에 있는 공용 정적 메서드의 '{0}' 매개 변수가 외부 모듈 {2}의 '{1}' 이름을 가지고 있거나 사용 중이지만 명명할 수 없습니다.",
-  "Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_private_module_2_4069": "내보낸 클래스에 있는 공용 정적 메서드의 '{0}' 매개 변수가 전용 모듈 '{2}'의 '{1}' 이름을 가지고 있거나 사용 중입니다.",
-  "Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1_4070": "내보낸 클래스에 있는 공용 정적 메서드의 '{0}' 매개 변수가 전용 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
+  "Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_private_module_2_4069": "내보낸 클래스에 있는 공용 정적 메서드의 '{0}' 매개 변수가 프라이빗 모듈 '{2}'의 '{1}' 이름을 가지고 있거나 사용 중입니다.",
+  "Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1_4070": "내보낸 클래스에 있는 공용 정적 메서드의 '{0}' 매개 변수가 프라이빗 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
   "Parameter_cannot_have_question_mark_and_initializer_1015": "매개 변수에 물음표와 이니셜라이저를 사용할 수 없습니다.",
   "Parameter_declaration_expected_1138": "매개 변수 선언이 필요합니다.",
-  "Parameter_type_of_public_setter_0_from_exported_class_has_or_is_using_name_1_from_private_module_2_4036": "내보낸 클래스에 있는 공용 setter '{0}'의 매개 변수 형식이 전용 모듈 '{2}'의 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
-  "Parameter_type_of_public_setter_0_from_exported_class_has_or_is_using_private_name_1_4037": "내보낸 클래스에 있는 공용 setter '{0}'의 매개 변수 형식이 전용 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
-  "Parameter_type_of_public_static_setter_0_from_exported_class_has_or_is_using_name_1_from_private_mod_4034": "내보낸 클래스에 있는 공용 정적 setter '{0}'의 매개 변수 형식이 전용 모듈 '{2}'의 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
-  "Parameter_type_of_public_static_setter_0_from_exported_class_has_or_is_using_private_name_1_4035": "내보낸 클래스에 있는 공용 정적 setter '{0}'의 매개 변수 형식이 전용 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
+  "Parameter_type_of_public_setter_0_from_exported_class_has_or_is_using_name_1_from_private_module_2_4036": "내보낸 클래스에 있는 공용 setter '{0}'의 매개 변수 형식이 프라이빗 모듈 '{2}'의 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
+  "Parameter_type_of_public_setter_0_from_exported_class_has_or_is_using_private_name_1_4037": "내보낸 클래스에 있는 공용 setter '{0}'의 매개 변수 형식이 프라이빗 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
+  "Parameter_type_of_public_static_setter_0_from_exported_class_has_or_is_using_name_1_from_private_mod_4034": "내보낸 클래스에 있는 공용 정적 setter '{0}'의 매개 변수 형식이 프라이빗 모듈 '{2}'의 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
+  "Parameter_type_of_public_static_setter_0_from_exported_class_has_or_is_using_private_name_1_4035": "내보낸 클래스에 있는 공용 정적 setter '{0}'의 매개 변수 형식이 프라이빗 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
   "Parse_in_strict_mode_and_emit_use_strict_for_each_source_file_6141": "strict 모드에서 구문 분석하고 각 소스 파일에 대해 \"use strict\"를 내보냅니다.",
   "Pattern_0_can_have_at_most_one_Asterisk_character_5061": "'{0}' 패턴에는 '*' 문자를 최대 하나만 사용할 수 있습니다.",
   "Prefix_0_with_an_underscore_90025": "'{0}' 앞에 밑줄 추가",
@@ -709,9 +709,9 @@
   "Property_0_is_protected_in_type_1_but_public_in_type_2_2444": "'{0}' 속성은 '{1}' 형식에서는 보호된 속성이지만 '{2}' 형식에서는 공용입니다.",
   "Property_0_is_used_before_being_assigned_2565": "'{0}' 속성이 할당되기 전에 사용되었습니다.",
   "Property_0_of_JSX_spread_attribute_is_not_assignable_to_target_property_2606": "JSX 분배 특성의 '{0}' 속성을 대상 속성에 할당할 수 없습니다.",
-  "Property_0_of_exported_class_expression_may_not_be_private_or_protected_4094": "내보낸 클래스 식의 속성 '{0}'이(가) 비공개가 아니거나 보호되지 않을 수 있습니다.",
-  "Property_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2_4032": "내보낸 인터페이스의 '{0}' 속성이 전용 모듈 '{2}'의 '{1}' 이름을 가지고 있거나 사용 중입니다.",
-  "Property_0_of_exported_interface_has_or_is_using_private_name_1_4033": "내보낸 인터페이스의 '{0}' 속성이 전용 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
+  "Property_0_of_exported_class_expression_may_not_be_private_or_protected_4094": "내보낸 클래스 식의 속성 '{0}'이(가) 프라이빗이 아니거나 보호되지 않을 수 있습니다.",
+  "Property_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2_4032": "내보낸 인터페이스의 '{0}' 속성이 프라이빗 모듈 '{2}'의 '{1}' 이름을 가지고 있거나 사용 중입니다.",
+  "Property_0_of_exported_interface_has_or_is_using_private_name_1_4033": "내보낸 인터페이스의 '{0}' 속성이 프라이빗 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
   "Property_0_of_type_1_is_not_assignable_to_numeric_index_type_2_2412": "'{1}' 형식의 '{0}' 속성을 숫자 인덱스 형식 '{2}'에 할당할 수 없습니다.",
   "Property_0_of_type_1_is_not_assignable_to_string_index_type_2_2411": "'{1}' 형식의 '{0}' 속성을 문자열 인덱스 형식 '{2}'에 할당할 수 없습니다.",
   "Property_assignment_expected_1136": "속성 할당이 필요합니다.",
@@ -720,17 +720,17 @@
   "Property_value_can_only_be_string_literal_numeric_literal_true_false_null_object_literal_or_array_li_1328": "속성 값은 문자열 리터럴, 숫자 리터럴, 'true', 'false', 'null', 개체 리터럴 또는 배열 리터럴이어야 합니다.",
   "Provide_full_support_for_iterables_in_for_of_spread_and_destructuring_when_targeting_ES5_or_ES3_6179": "'ES5' 또는 'ES3'을 대상으로 할 경우 'for-of', spread 및 소멸의 반복 가능한 개체를 완벽히 지원합니다.",
   "Public_method_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named_4098": "내보낸 클래스의 공용 메서드 '{0}'이(가) 외부 모듈 {2}의 '{1}' 이름을 가지고 있거나 사용 중이지만 명명할 수 없습니다.",
-  "Public_method_0_of_exported_class_has_or_is_using_name_1_from_private_module_2_4099": "내보낸 클래스의 공용 메서드 '{0}'이(가) 전용 모듈 '{2}'의 '{1}' 이름을 가지고 있거나 사용 중입니다.",
-  "Public_method_0_of_exported_class_has_or_is_using_private_name_1_4100": "내보낸 클래스의 공용 메서드의 '{0}'이(가) 전용 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
+  "Public_method_0_of_exported_class_has_or_is_using_name_1_from_private_module_2_4099": "내보낸 클래스의 공용 메서드 '{0}'이(가) 프라이빗 모듈 '{2}'의 '{1}' 이름을 가지고 있거나 사용 중입니다.",
+  "Public_method_0_of_exported_class_has_or_is_using_private_name_1_4100": "내보낸 클래스의 공용 메서드의 '{0}'이(가) 프라이빗 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
   "Public_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_name_4029": "내보낸 클래스의 공용 속성 '{0}'이(가) 외부 모듈 {2}의 '{1}' 이름을 가지고 있거나 사용 중이지만 명명할 수 없습니다.",
-  "Public_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2_4030": "내보낸 클래스의 공용 속성 '{0}'이(가) 전용 모듈 '{2}'의 '{1}' 이름을 가지고 있거나 사용 중입니다.",
-  "Public_property_0_of_exported_class_has_or_is_using_private_name_1_4031": "내보낸 클래스의 공용 속성 '{0}'이(가) 전용 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
+  "Public_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2_4030": "내보낸 클래스의 공용 속성 '{0}'이(가) 프라이빗 모듈 '{2}'의 '{1}' 이름을 가지고 있거나 사용 중입니다.",
+  "Public_property_0_of_exported_class_has_or_is_using_private_name_1_4031": "내보낸 클래스의 공용 속성 '{0}'이(가) 프라이빗 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
   "Public_static_method_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_4095": "내보낸 클래스의 공용 정적 메서드 '{0}'이(가) 외부 모듈 {2}의 '{1}' 이름을 가지고 있거나 사용 중이지만 명명할 수 없습니다.",
-  "Public_static_method_0_of_exported_class_has_or_is_using_name_1_from_private_module_2_4096": "내보낸 클래스에 있는 공용 정적 메서드 '{0}'이(가) 전용 모듈 '{2}'의 '{1}' 이름을 가지고 있거나 사용 중입니다.",
-  "Public_static_method_0_of_exported_class_has_or_is_using_private_name_1_4097": "내보낸 클래스의 공용 정적 메서드 '{0}'이(가) 전용 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
+  "Public_static_method_0_of_exported_class_has_or_is_using_name_1_from_private_module_2_4096": "내보낸 클래스에 있는 공용 정적 메서드 '{0}'이(가) 프라이빗 모듈 '{2}'의 '{1}' 이름을 가지고 있거나 사용 중입니다.",
+  "Public_static_method_0_of_exported_class_has_or_is_using_private_name_1_4097": "내보낸 클래스의 공용 정적 메서드 '{0}'이(가) 프라이빗 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
   "Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot__4026": "내보낸 클래스에 있는 공용 정적 속성 '{0}'이(가) 외부 모듈 {2}의 '{1}' 이름을 가지고 있거나 사용 중이지만 명명할 수 없습니다.",
-  "Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2_4027": "내보낸 클래스의 공용 정적 속성 '{0}'이(가) 전용 모듈 '{2}'의 '{1}' 이름을 가지고 있거나 사용 중입니다.",
-  "Public_static_property_0_of_exported_class_has_or_is_using_private_name_1_4028": "내보낸 클래스의 공용 정적 속성 '{0}'이(가) 전용 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
+  "Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2_4027": "내보낸 클래스의 공용 정적 속성 '{0}'이(가) 프라이빗 모듈 '{2}'의 '{1}' 이름을 가지고 있거나 사용 중입니다.",
+  "Public_static_property_0_of_exported_class_has_or_is_using_private_name_1_4028": "내보낸 클래스의 공용 정적 속성 '{0}'이(가) 프라이빗 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
   "Raise_error_on_expressions_and_declarations_with_an_implied_any_type_6052": "암시된 'any' 형식이 있는 식 및 선언에서 오류를 발생합니다.",
   "Raise_error_on_this_expressions_with_an_implied_any_type_6115": "암시된 'any' 형식이 있는 'this' 식에서 오류를 발생합니다.",
   "Redirect_output_structure_to_the_directory_6006": "출력 구조를 디렉터리로 리디렉션합니다.",
@@ -765,30 +765,30 @@
   "Resolving_with_primary_search_path_0_6121": "기본 검색 경로 '{0}'을(를) 사용하여 확인하는 중입니다.",
   "Rest_parameter_0_implicitly_has_an_any_type_7019": "Rest 매개 변수 '{0}'에는 암시적으로 'any[]' 형식이 포함됩니다.",
   "Rest_types_may_only_be_created_from_object_types_2700": "rest 유형은 개체 형식에서만 만들 수 있습니다.",
-  "Return_type_of_call_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1_4046": "내보낸 인터페이스에 있는 호출 시그니처의 반환 형식이 전용 모듈 '{1}'의 '{0}' 이름을 가지고 있거나 사용 중입니다.",
-  "Return_type_of_call_signature_from_exported_interface_has_or_is_using_private_name_0_4047": "내보낸 인터페이스에 있는 호출 시그니처의 반환 형식이 전용 이름 '{0}'을(를) 가지고 있거나 사용 중입니다.",
-  "Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_name_0_from_private_mod_4044": "내보낸 인터페이스에 있는 생성자 시그니처의 반환 형식이 전용 모듈 '{1}'의 '{0}' 이름을 가지고 있거나 사용 중입니다.",
-  "Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_0_4045": "내보낸 인터페이스에 있는 생성자 시그니처의 반환 형식이 전용 이름 '{0}'을(를) 가지고 있거나 사용 중입니다.",
+  "Return_type_of_call_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1_4046": "내보낸 인터페이스에 있는 호출 시그니처의 반환 형식이 프라이빗 모듈 '{1}'의 '{0}' 이름을 가지고 있거나 사용 중입니다.",
+  "Return_type_of_call_signature_from_exported_interface_has_or_is_using_private_name_0_4047": "내보낸 인터페이스에 있는 호출 시그니처의 반환 형식이 프라이빗 이름 '{0}'을(를) 가지고 있거나 사용 중입니다.",
+  "Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_name_0_from_private_mod_4044": "내보낸 인터페이스에 있는 생성자 시그니처의 반환 형식이 프라이빗 모듈 '{1}'의 '{0}' 이름을 가지고 있거나 사용 중입니다.",
+  "Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_0_4045": "내보낸 인터페이스에 있는 생성자 시그니처의 반환 형식이 프라이빗 이름 '{0}'을(를) 가지고 있거나 사용 중입니다.",
   "Return_type_of_constructor_signature_must_be_assignable_to_the_instance_type_of_the_class_2409": "생성자 시그니처의 반환 형식을 클래스의 인스턴스 형식에 할당할 수 있어야 합니다.",
   "Return_type_of_exported_function_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named_4058": "내보낸 함수의 반환 형식이 외부 모듈 {1}의 '{0}' 이름을 가지고 있거나 사용 중이지만 명명할 수 없습니다.",
-  "Return_type_of_exported_function_has_or_is_using_name_0_from_private_module_1_4059": "내보낸 함수의 반환 형식이 전용 모듈 '{1}'의 '{0}' 이름을 가지고 있거나 사용 중입니다.",
-  "Return_type_of_exported_function_has_or_is_using_private_name_0_4060": "내보낸 함수의 반환 형식이 전용 이름 '{0}'을(를) 가지고 있거나 사용 중입니다.",
-  "Return_type_of_index_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1_4048": "내보낸 인터페이스에 있는 인덱스 시그니처의 반환 형식이 전용 모듈 '{1}'의 '{0}' 이름을 가지고 있거나 사용 중입니다.",
-  "Return_type_of_index_signature_from_exported_interface_has_or_is_using_private_name_0_4049": "내보낸 인터페이스에 있는 인덱스 시그니처의 반환 형식이 전용 이름 '{0}'을(를) 가지고 있거나 사용 중입니다.",
-  "Return_type_of_method_from_exported_interface_has_or_is_using_name_0_from_private_module_1_4056": "내보낸 인터페이스에 있는 메서드의 반환 형식이 전용 모듈 '{1}'의 '{0}' 이름을 가지고 있거나 사용 중입니다.",
-  "Return_type_of_method_from_exported_interface_has_or_is_using_private_name_0_4057": "내보낸 인터페이스에 있는 메서드의 반환 형식이 전용 이름 '{0}'을(를) 가지고 있거나 사용 중입니다.",
+  "Return_type_of_exported_function_has_or_is_using_name_0_from_private_module_1_4059": "내보낸 함수의 반환 형식이 프라이빗 모듈 '{1}'의 '{0}' 이름을 가지고 있거나 사용 중입니다.",
+  "Return_type_of_exported_function_has_or_is_using_private_name_0_4060": "내보낸 함수의 반환 형식이 프라이빗 이름 '{0}'을(를) 가지고 있거나 사용 중입니다.",
+  "Return_type_of_index_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1_4048": "내보낸 인터페이스에 있는 인덱스 시그니처의 반환 형식이 프라이빗 모듈 '{1}'의 '{0}' 이름을 가지고 있거나 사용 중입니다.",
+  "Return_type_of_index_signature_from_exported_interface_has_or_is_using_private_name_0_4049": "내보낸 인터페이스에 있는 인덱스 시그니처의 반환 형식이 프라이빗 이름 '{0}'을(를) 가지고 있거나 사용 중입니다.",
+  "Return_type_of_method_from_exported_interface_has_or_is_using_name_0_from_private_module_1_4056": "내보낸 인터페이스에 있는 메서드의 반환 형식이 프라이빗 모듈 '{1}'의 '{0}' 이름을 가지고 있거나 사용 중입니다.",
+  "Return_type_of_method_from_exported_interface_has_or_is_using_private_name_0_4057": "내보낸 인터페이스에 있는 메서드의 반환 형식이 프라이빗 이름 '{0}'을(를) 가지고 있거나 사용 중입니다.",
   "Return_type_of_public_getter_0_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_4041": "내보낸 클래스에 있는 공용 getter '{0}'의 반환 형식이 외부 모듈 {2}의 이름 '{1}'을(를) 가지고 있거나 사용 중이지만 명명할 수 없습니다.",
-  "Return_type_of_public_getter_0_from_exported_class_has_or_is_using_name_1_from_private_module_2_4042": "내보낸 클래스에 있는 공용 getter '{0}'의 반환 형식이 전용 모듈 '{2}'의 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
-  "Return_type_of_public_getter_0_from_exported_class_has_or_is_using_private_name_1_4043": "내보낸 클래스에 있는 공용 getter '{0}'의 반환 형식이 전용 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
+  "Return_type_of_public_getter_0_from_exported_class_has_or_is_using_name_1_from_private_module_2_4042": "내보낸 클래스에 있는 공용 getter '{0}'의 반환 형식이 프라이빗 모듈 '{2}'의 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
+  "Return_type_of_public_getter_0_from_exported_class_has_or_is_using_private_name_1_4043": "내보낸 클래스에 있는 공용 getter '{0}'의 반환 형식이 프라이빗 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
   "Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_c_4053": "내보낸 클래스에 있는 공용 메서드의 반환 형식이 외부 모듈 {1}의 '{0}' 이름을 가지고 있거나 사용 중이지만 명명할 수 없습니다.",
-  "Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_private_module_1_4054": "내보낸 클래스에 있는 공용 메서드의 반환 형식이 전용 모듈 '{1}'의 '{0}' 이름을 가지고 있거나 사용 중입니다.",
-  "Return_type_of_public_method_from_exported_class_has_or_is_using_private_name_0_4055": "내보낸 클래스에 있는 공용 메서드의 반환 형식이 전용 이름 '{0}'을(를) 가지고 있거나 사용 중입니다.",
+  "Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_private_module_1_4054": "내보낸 클래스에 있는 공용 메서드의 반환 형식이 프라이빗 모듈 '{1}'의 '{0}' 이름을 가지고 있거나 사용 중입니다.",
+  "Return_type_of_public_method_from_exported_class_has_or_is_using_private_name_0_4055": "내보낸 클래스에 있는 공용 메서드의 반환 형식이 프라이빗 이름 '{0}'을(를) 가지고 있거나 사용 중입니다.",
   "Return_type_of_public_static_getter_0_from_exported_class_has_or_is_using_name_1_from_external_modul_4038": "내보낸 클래스에 있는 공용 정적 getter '{0}'의 반환 형식이 외부 모듈 {2}의 이름 '{1}'을(를) 가지고 있거나 사용 중이지만 명명할 수 없습니다.",
-  "Return_type_of_public_static_getter_0_from_exported_class_has_or_is_using_name_1_from_private_module_4039": "내보낸 클래스에 있는 공용 정적 getter '{0}'의 반환 형식이 전용 모듈 '{2}'의 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
-  "Return_type_of_public_static_getter_0_from_exported_class_has_or_is_using_private_name_1_4040": "내보낸 클래스에 있는 공용 정적 getter '{0}'의 반환 형식이 전용 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
+  "Return_type_of_public_static_getter_0_from_exported_class_has_or_is_using_name_1_from_private_module_4039": "내보낸 클래스에 있는 공용 정적 getter '{0}'의 반환 형식이 프라이빗 모듈 '{2}'의 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
+  "Return_type_of_public_static_getter_0_from_exported_class_has_or_is_using_private_name_1_4040": "내보낸 클래스에 있는 공용 정적 getter '{0}'의 반환 형식이 프라이빗 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
   "Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_external_module__4050": "내보낸 클래스에 있는 공용 정적 메서드의 반환 형식이 외부 모듈 {1}의 '{0}' 이름을 가지고 있거나 사용 중이지만 명명할 수 없습니다.",
-  "Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_private_module_1_4051": "내보낸 클래스에 있는 공용 정적 메서드의 반환 형식이 전용 모듈 '{1}'의 '{0}' 이름을 가지고 있거나 사용 중입니다.",
-  "Return_type_of_public_static_method_from_exported_class_has_or_is_using_private_name_0_4052": "내보낸 클래스에 있는 공용 정적 메서드의 반환 형식이 전용 이름 '{0}'을(를) 가지고 있거나 사용 중입니다.",
+  "Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_private_module_1_4051": "내보낸 클래스에 있는 공용 정적 메서드의 반환 형식이 프라이빗 모듈 '{1}'의 '{0}' 이름을 가지고 있거나 사용 중입니다.",
+  "Return_type_of_public_static_method_from_exported_class_has_or_is_using_private_name_0_4052": "내보낸 클래스에 있는 공용 정적 메서드의 반환 형식이 프라이빗 이름 '{0}'을(를) 가지고 있거나 사용 중입니다.",
   "Reusing_module_resolutions_originating_in_0_since_resolutions_are_unchanged_from_old_program_6184": "이전 프로그램에서 변경되지 않았으므로 '{0}'에서 발생하는 모듈 확인을 다시 사용합니다.",
   "Reusing_resolution_of_module_0_to_file_1_from_old_program_6183": "'{0}' 모듈 확인을 이전 프로그램의 '{1}' 파일에 다시 사용합니다.",
   "Rewrite_all_as_indexed_access_types_95034": "인덱싱된 액세스 형식으로 모두 다시 작성",
@@ -939,15 +939,15 @@
   "Type_of_yield_operand_in_an_async_generator_must_either_be_a_valid_promise_or_must_not_contain_a_cal_1321": "비동기 생성기에 있는 'yield' 형식의 피연산자는 유효한 프라미스여야 하거나 호출 가능 'then' 멤버를 포함하지 않아야 합니다.",
   "Type_parameter_0_has_a_circular_constraint_2313": "형식 매개 변수 '{0}'에 순환 제약 조건이 있습니다.",
   "Type_parameter_0_has_a_circular_default_2716": "형식 매개 변수 '{0}'에 순환 기본값이 있습니다.",
-  "Type_parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1_4008": "내보낸 인터페이스에 있는 호출 시그니처의 형식 매개 변수 '{0}'이(가) 전용 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
-  "Type_parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1_4006": "내보낸 인터페이스에 있는 생성자 시그니처의 형식 매개 변수 '{0}'이(가) 전용 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
-  "Type_parameter_0_of_exported_class_has_or_is_using_private_name_1_4002": "내보낸 클래스의 형식 매개 변수 '{0}'이(가) 전용 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
-  "Type_parameter_0_of_exported_function_has_or_is_using_private_name_1_4016": "내보낸 함수의 형식 매개 변수 '{0}'이(가) 전용 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
-  "Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1_4004": "내보낸 인터페이스의 형식 매개 변수 '{0}'이(가) 전용 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
-  "Type_parameter_0_of_exported_type_alias_has_or_is_using_private_name_1_4083": "내보낸 형식 별칭의 형식 매개 변수 '{0}'이(가) 전용 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
-  "Type_parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1_4014": "내보낸 인터페이스에 있는 메서드의 형식 매개 변수 '{0}'이(가) 전용 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
-  "Type_parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1_4012": "내보낸 클래스에 있는 공용 메서드의 형식 매개 변수 '{0}'이(가) 전용 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
-  "Type_parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1_4010": "내보낸 클래스에 있는 공용 정적 메서드의 형식 매개 변수 '{0}'이(가) 전용 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
+  "Type_parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1_4008": "내보낸 인터페이스에 있는 호출 시그니처의 형식 매개 변수 '{0}'이(가) 프라이빗 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
+  "Type_parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1_4006": "내보낸 인터페이스에 있는 생성자 시그니처의 형식 매개 변수 '{0}'이(가) 프라이빗 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
+  "Type_parameter_0_of_exported_class_has_or_is_using_private_name_1_4002": "내보낸 클래스의 형식 매개 변수 '{0}'이(가) 프라이빗 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
+  "Type_parameter_0_of_exported_function_has_or_is_using_private_name_1_4016": "내보낸 함수의 형식 매개 변수 '{0}'이(가) 프라이빗 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
+  "Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1_4004": "내보낸 인터페이스의 형식 매개 변수 '{0}'이(가) 프라이빗 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
+  "Type_parameter_0_of_exported_type_alias_has_or_is_using_private_name_1_4083": "내보낸 형식 별칭의 형식 매개 변수 '{0}'이(가) 프라이빗 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
+  "Type_parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1_4014": "내보낸 인터페이스에 있는 메서드의 형식 매개 변수 '{0}'이(가) 프라이빗 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
+  "Type_parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1_4012": "내보낸 클래스에 있는 공용 메서드의 형식 매개 변수 '{0}'이(가) 프라이빗 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
+  "Type_parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1_4010": "내보낸 클래스에 있는 공용 정적 메서드의 형식 매개 변수 '{0}'이(가) 프라이빗 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
   "Type_parameter_declaration_expected_1139": "형식 매개 변수 선언이 필요합니다.",
   "Type_parameter_list_cannot_be_empty_1098": "형식 매개 변수 목록은 비워 둘 수 없습니다.",
   "Type_parameter_name_cannot_be_0_2368": "형식 매개 변수 이름은 '{0}'일 수 없습니다.",
@@ -955,7 +955,7 @@
   "Type_predicate_0_is_not_assignable_to_1_1226": "형식 조건자 '{0}'을(를) '{1}'에 할당할 수 없습니다.",
   "Type_reference_directive_0_was_not_resolved_6120": "======== 형식 참조 지시문 '{0}'이(가) 확인되지 않았습니다. ========",
   "Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2_6119": "======== 형식 참조 지시문 '{0}'이(가) '{1}'(으)로 확인되었습니다. 주: {2}. ========",
-  "Types_have_separate_declarations_of_a_private_property_0_2442": "형식에 별도의 전용 속성 '{0}' 선언이 있습니다.",
+  "Types_have_separate_declarations_of_a_private_property_0_2442": "형식에 별도의 프라이빗 속성 '{0}' 선언이 있습니다.",
   "Types_of_parameters_0_and_1_are_incompatible_2328": "'{0}' 및 '{1}' 매개 변수의 형식이 호환되지 않습니다.",
   "Types_of_property_0_are_incompatible_2326": "'{0}' 속성의 형식이 호환되지 않습니다.",
   "Unable_to_open_file_0_6050": "'{0}' 파일을 열 수 없습니다.",
@@ -1047,8 +1047,8 @@
   "export_modifier_cannot_be_applied_to_ambient_modules_and_module_augmentations_since_they_are_always__2668": "앰비언트 모듈 및 모듈 확대는 항상 표시되므로 'export' 한정자를 적용할 수 없습니다.",
   "extends_clause_already_seen_1172": "'extends' 절이 이미 있습니다.",
   "extends_clause_must_precede_implements_clause_1173": "'extends' 절은 'implements' 절 앞에 와야 합니다.",
-  "extends_clause_of_exported_class_0_has_or_is_using_private_name_1_4020": "내보낸 클래스 '{0}'의 Extends 절이 전용 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
-  "extends_clause_of_exported_interface_0_has_or_is_using_private_name_1_4022": "내보낸 인터페이스 '{0}'의 Extends 절이 전용 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
+  "extends_clause_of_exported_class_0_has_or_is_using_private_name_1_4020": "내보낸 클래스 '{0}'의 Extends 절이 프라이빗 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
+  "extends_clause_of_exported_interface_0_has_or_is_using_private_name_1_4022": "내보낸 인터페이스 '{0}'의 Extends 절이 프라이빗 이름 '{1}'을(를) 가지고 있거나 사용 중입니다.",
   "file_6025": "파일",
   "get_and_set_accessor_must_have_the_same_this_type_2682": "'get' 및 'set' 접근자는 동일한 'this' 형식이어야 합니다.",
   "get_and_set_accessor_must_have_the_same_type_2380": "'get' 및 'set' 접근자의 형식이 같아야 합니다.",
diff --git a/lib/lib.dom.d.ts b/lib/lib.dom.d.ts
index 7817a0e4267..92500ffc046 100644
--- a/lib/lib.dom.d.ts
+++ b/lib/lib.dom.d.ts
@@ -153,6 +153,34 @@ interface AudioWorkletNodeOptions extends AudioNodeOptions {
     processorOptions?: any;
 }
 
+interface AuthenticationExtensionsClientInputs {
+    appid?: string;
+    authnSel?: AuthenticatorSelectionList;
+    exts?: boolean;
+    loc?: boolean;
+    txAuthGeneric?: txAuthGenericArg;
+    txAuthSimple?: string;
+    uvi?: boolean;
+    uvm?: boolean;
+}
+
+interface AuthenticationExtensionsClientOutputs {
+    appid?: boolean;
+    authnSel?: boolean;
+    exts?: AuthenticationExtensionsSupported;
+    loc?: Coordinates;
+    txAuthGeneric?: ArrayBuffer;
+    txAuthSimple?: string;
+    uvi?: ArrayBuffer;
+    uvm?: UvmEntries;
+}
+
+interface AuthenticatorSelectionCriteria {
+    authenticatorAttachment?: AuthenticatorAttachment;
+    requireResidentKey?: boolean;
+    userVerification?: UserVerificationRequirement;
+}
+
 interface BiquadFilterOptions extends AudioNodeOptions {
     Q?: number;
     detune?: number;
@@ -171,7 +199,6 @@ interface ByteLengthChunk {
 }
 
 interface CacheQueryOptions {
-    cacheName?: string;
     ignoreMethod?: boolean;
     ignoreSearch?: boolean;
     ignoreVary?: boolean;
@@ -179,6 +206,7 @@ interface CacheQueryOptions {
 
 interface CanvasRenderingContext2DSettings {
     alpha?: boolean;
+    desynchronized?: boolean;
 }
 
 interface ChannelMergerOptions extends AudioNodeOptions {
@@ -256,7 +284,7 @@ interface ConstrainDoubleRange extends DoubleRange {
     ideal?: number;
 }
 
-interface ConstrainLongRange extends LongRange {
+interface ConstrainULongRange extends ULongRange {
     exact?: number;
     ideal?: number;
 }
@@ -271,6 +299,17 @@ interface ConvolverOptions extends AudioNodeOptions {
     disableNormalization?: boolean;
 }
 
+interface CredentialCreationOptions {
+    publicKey?: PublicKeyCredentialCreationOptions;
+    signal?: AbortSignal;
+}
+
+interface CredentialRequestOptions {
+    mediation?: CredentialMediationRequirement;
+    publicKey?: PublicKeyCredentialRequestOptions;
+    signal?: AbortSignal;
+}
+
 interface CustomEventInit<T = any> extends EventInit {
     detail?: T;
 }
@@ -330,21 +369,27 @@ interface DelayOptions extends AudioNodeOptions {
     maxDelayTime?: number;
 }
 
-interface DeviceAccelerationDict {
+interface DeviceLightEventInit extends EventInit {
+    value?: number;
+}
+
+interface DeviceMotionEventAccelerationInit {
     x?: number | null;
     y?: number | null;
     z?: number | null;
 }
 
-interface DeviceLightEventInit extends EventInit {
-    value?: number;
+interface DeviceMotionEventInit extends EventInit {
+    acceleration?: DeviceMotionEventAccelerationInit;
+    accelerationIncludingGravity?: DeviceMotionEventAccelerationInit;
+    interval?: number;
+    rotationRate?: DeviceMotionEventRotationRateInit;
 }
 
-interface DeviceMotionEventInit extends EventInit {
-    acceleration?: DeviceAccelerationDict | null;
-    accelerationIncludingGravity?: DeviceAccelerationDict | null;
-    interval?: number | null;
-    rotationRate?: DeviceRotationRateDict | null;
+interface DeviceMotionEventRotationRateInit {
+    alpha?: number | null;
+    beta?: number | null;
+    gamma?: number | null;
 }
 
 interface DeviceOrientationEventInit extends EventInit {
@@ -354,10 +399,9 @@ interface DeviceOrientationEventInit extends EventInit {
     gamma?: number | null;
 }
 
-interface DeviceRotationRateDict {
-    alpha?: number | null;
-    beta?: number | null;
-    gamma?: number | null;
+interface DevicePermissionDescriptor extends PermissionDescriptor {
+    deviceId?: string;
+    name: "camera" | "microphone" | "speaker";
 }
 
 interface DocumentTimelineOptions {
@@ -412,6 +456,10 @@ interface EffectTiming {
     iterations?: number;
 }
 
+interface ElementCreationOptions {
+    is?: string;
+}
+
 interface ElementDefinitionOptions {
     extends?: string;
 }
@@ -444,7 +492,6 @@ interface EventModifierInit extends UIEventInit {
     modifierFnLock?: boolean;
     modifierHyper?: boolean;
     modifierNumLock?: boolean;
-    modifierOS?: boolean;
     modifierScrollLock?: boolean;
     modifierSuper?: boolean;
     modifierSymbol?: boolean;
@@ -553,11 +600,27 @@ interface IIRFilterOptions extends AudioNodeOptions {
     feedforward: number[];
 }
 
+interface ImageBitmapRenderingContextSettings {
+    alpha?: boolean;
+}
+
+interface ImageEncodeOptions {
+    quality?: number;
+    type?: string;
+}
+
+interface InputEventInit extends UIEventInit {
+    data?: string | null;
+    inputType?: string;
+    isComposing?: boolean;
+}
+
 interface IntersectionObserverEntryInit {
     boundingClientRect: DOMRectInit;
+    intersectionRatio: number;
     intersectionRect: DOMRectInit;
     isIntersecting: boolean;
-    rootBounds: DOMRectInit;
+    rootBounds: DOMRectInit | null;
     target: Element;
     time: number;
 }
@@ -595,6 +658,7 @@ interface KeyAlgorithm {
 
 interface KeyboardEventInit extends EventModifierInit {
     code?: string;
+    isComposing?: boolean;
     key?: string;
     location?: number;
     repeat?: boolean;
@@ -616,11 +680,6 @@ interface KeyframeEffectOptions extends EffectTiming {
     iterationComposite?: IterationCompositeOperation;
 }
 
-interface LongRange {
-    max?: number;
-    min?: number;
-}
-
 interface MediaElementAudioSourceOptions {
     mediaElement: HTMLMediaElement;
 }
@@ -678,39 +737,43 @@ interface MediaStreamTrackAudioSourceOptions {
 }
 
 interface MediaStreamTrackEventInit extends EventInit {
-    track?: MediaStreamTrack | null;
+    track: MediaStreamTrack;
 }
 
 interface MediaTrackCapabilities {
-    aspectRatio?: number | DoubleRange;
+    aspectRatio?: DoubleRange;
+    autoGainControl?: boolean[];
+    channelCount?: ULongRange;
     deviceId?: string;
     echoCancellation?: boolean[];
-    facingMode?: string;
-    frameRate?: number | DoubleRange;
+    facingMode?: string[];
+    frameRate?: DoubleRange;
     groupId?: string;
-    height?: number | LongRange;
-    sampleRate?: number | LongRange;
-    sampleSize?: number | LongRange;
-    volume?: number | DoubleRange;
-    width?: number | LongRange;
+    height?: ULongRange;
+    latency?: DoubleRange;
+    noiseSuppression?: boolean[];
+    resizeMode?: string[];
+    sampleRate?: ULongRange;
+    sampleSize?: ULongRange;
+    width?: ULongRange;
 }
 
 interface MediaTrackConstraintSet {
-    aspectRatio?: number | ConstrainDoubleRange;
-    channelCount?: number | ConstrainLongRange;
-    deviceId?: string | string[] | ConstrainDOMStringParameters;
-    displaySurface?: string | string[] | ConstrainDOMStringParameters;
-    echoCancellation?: boolean | ConstrainBooleanParameters;
-    facingMode?: string | string[] | ConstrainDOMStringParameters;
-    frameRate?: number | ConstrainDoubleRange;
-    groupId?: string | string[] | ConstrainDOMStringParameters;
-    height?: number | ConstrainLongRange;
-    latency?: number | ConstrainDoubleRange;
-    logicalSurface?: boolean | ConstrainBooleanParameters;
-    sampleRate?: number | ConstrainLongRange;
-    sampleSize?: number | ConstrainLongRange;
-    volume?: number | ConstrainDoubleRange;
-    width?: number | ConstrainLongRange;
+    aspectRatio?: ConstrainDouble;
+    autoGainControl?: ConstrainBoolean;
+    channelCount?: ConstrainULong;
+    deviceId?: ConstrainDOMString;
+    echoCancellation?: ConstrainBoolean;
+    facingMode?: ConstrainDOMString;
+    frameRate?: ConstrainDouble;
+    groupId?: ConstrainDOMString;
+    height?: ConstrainULong;
+    latency?: ConstrainDouble;
+    noiseSuppression?: ConstrainBoolean;
+    resizeMode?: ConstrainDOMString;
+    sampleRate?: ConstrainULong;
+    sampleSize?: ConstrainULong;
+    width?: ConstrainULong;
 }
 
 interface MediaTrackConstraints extends MediaTrackConstraintSet {
@@ -719,29 +782,37 @@ interface MediaTrackConstraints extends MediaTrackConstraintSet {
 
 interface MediaTrackSettings {
     aspectRatio?: number;
+    autoGainControl?: boolean;
+    channelCount?: number;
     deviceId?: string;
     echoCancellation?: boolean;
     facingMode?: string;
     frameRate?: number;
     groupId?: string;
     height?: number;
+    latency?: number;
+    noiseSuppression?: boolean;
+    resizeMode?: string;
     sampleRate?: number;
     sampleSize?: number;
-    volume?: number;
     width?: number;
 }
 
 interface MediaTrackSupportedConstraints {
     aspectRatio?: boolean;
+    autoGainControl?: boolean;
+    channelCount?: boolean;
     deviceId?: boolean;
     echoCancellation?: boolean;
     facingMode?: boolean;
     frameRate?: boolean;
     groupId?: boolean;
     height?: boolean;
+    latency?: boolean;
+    noiseSuppression?: boolean;
+    resizeMode?: boolean;
     sampleRate?: boolean;
     sampleSize?: boolean;
-    volume?: boolean;
     width?: boolean;
 }
 
@@ -753,6 +824,11 @@ interface MessageEventInit extends EventInit {
     source?: MessageEventSource | null;
 }
 
+interface MidiPermissionDescriptor extends PermissionDescriptor {
+    name: "midi";
+    sysex?: boolean;
+}
+
 interface MouseEventInit extends EventModifierInit {
     button?: number;
     buttons?: number;
@@ -765,13 +841,38 @@ interface MouseEventInit extends EventModifierInit {
     screenY?: number;
 }
 
+interface MultiCacheQueryOptions extends CacheQueryOptions {
+    cacheName?: string;
+}
+
 interface MutationObserverInit {
+    /**
+     * Set to a list of attribute local names (without namespace) if not all attribute mutations need to be observed and attributes is true or omitted.
+     */
     attributeFilter?: string[];
+    /**
+     * Set to true if attributes is true or omitted and target's attribute value before the mutation needs to be recorded.
+     */
     attributeOldValue?: boolean;
+    /**
+     * Set to true if mutations to target's attributes are to be observed. Can be omitted if attributeOldValue or attributeFilter is specified.
+     */
     attributes?: boolean;
+    /**
+     * Set to true if mutations to target's data are to be observed. Can be omitted if characterDataOldValue is specified.
+     */
     characterData?: boolean;
+    /**
+     * Set to true if characterData is set to true or omitted and target's data before the mutation needs to be recorded.
+     */
     characterDataOldValue?: boolean;
+    /**
+     * Set to true if mutations to target's children are to be observed.
+     */
     childList?: boolean;
+    /**
+     * Set to true if mutations to not just target, but also target's descendants are to be observed.
+     */
     subtree?: boolean;
 }
 
@@ -914,7 +1015,8 @@ interface Pbkdf2Params extends Algorithm {
 
 interface PerformanceObserverInit {
     buffered?: boolean;
-    entryTypes: string[];
+    entryTypes?: string[];
+    type?: string;
 }
 
 interface PeriodicWaveConstraints {
@@ -926,10 +1028,15 @@ interface PeriodicWaveOptions extends PeriodicWaveConstraints {
     real?: number[] | Float32Array;
 }
 
+interface PermissionDescriptor {
+    name: PermissionName;
+}
+
 interface PipeOptions {
     preventAbort?: boolean;
     preventCancel?: boolean;
     preventClose?: boolean;
+    signal?: AbortSignal;
 }
 
 interface PointerEventInit extends MouseEventInit {
@@ -955,6 +1062,10 @@ interface PositionOptions {
     timeout?: number;
 }
 
+interface PostMessageOptions {
+    transfer?: any[];
+}
+
 interface ProgressEventInit extends EventInit {
     lengthComputable?: boolean;
     loaded?: number;
@@ -973,6 +1084,57 @@ interface PropertyIndexedKeyframes {
     [property: string]: string | string[] | number | null | (number | null)[] | undefined;
 }
 
+interface PublicKeyCredentialCreationOptions {
+    attestation?: AttestationConveyancePreference;
+    authenticatorSelection?: AuthenticatorSelectionCriteria;
+    challenge: BufferSource;
+    excludeCredentials?: PublicKeyCredentialDescriptor[];
+    extensions?: AuthenticationExtensionsClientInputs;
+    pubKeyCredParams: PublicKeyCredentialParameters[];
+    rp: PublicKeyCredentialRpEntity;
+    timeout?: number;
+    user: PublicKeyCredentialUserEntity;
+}
+
+interface PublicKeyCredentialDescriptor {
+    id: BufferSource;
+    transports?: AuthenticatorTransport[];
+    type: PublicKeyCredentialType;
+}
+
+interface PublicKeyCredentialEntity {
+    icon?: string;
+    name: string;
+}
+
+interface PublicKeyCredentialParameters {
+    alg: COSEAlgorithmIdentifier;
+    type: PublicKeyCredentialType;
+}
+
+interface PublicKeyCredentialRequestOptions {
+    allowCredentials?: PublicKeyCredentialDescriptor[];
+    challenge: BufferSource;
+    extensions?: AuthenticationExtensionsClientInputs;
+    rpId?: string;
+    timeout?: number;
+    userVerification?: UserVerificationRequirement;
+}
+
+interface PublicKeyCredentialRpEntity extends PublicKeyCredentialEntity {
+    id?: string;
+}
+
+interface PublicKeyCredentialUserEntity extends PublicKeyCredentialEntity {
+    displayName: string;
+    id: BufferSource;
+}
+
+interface PushPermissionDescriptor extends PermissionDescriptor {
+    name: "push";
+    userVisibleOnly?: boolean;
+}
+
 interface PushSubscriptionJSON {
     endpoint?: string;
     expirationTime?: number | null;
@@ -1361,18 +1523,57 @@ interface RegistrationOptions {
 }
 
 interface RequestInit {
+    /**
+     * A BodyInit object or null to set request's body.
+     */
     body?: BodyInit | null;
+    /**
+     * A string indicating how the request will interact with the browser's cache to set request's cache.
+     */
     cache?: RequestCache;
+    /**
+     * A string indicating whether credentials will be sent with the request always, never, or only when sent to a same-origin URL. Sets request's credentials.
+     */
     credentials?: RequestCredentials;
+    /**
+     * A Headers object, an object literal, or an array of two-item arrays to set request's headers.
+     */
     headers?: HeadersInit;
+    /**
+     * A cryptographic hash of the resource to be fetched by request. Sets request's integrity.
+     */
     integrity?: string;
+    /**
+     * A boolean to set request's keepalive.
+     */
     keepalive?: boolean;
+    /**
+     * A string to set request's method.
+     */
     method?: string;
+    /**
+     * A string to indicate whether the request will use CORS, or will be restricted to same-origin URLs. Sets request's mode.
+     */
     mode?: RequestMode;
+    /**
+     * A string indicating whether request follows redirects, results in an error upon encountering a redirect, or returns the redirect (in an opaque fashion). Sets request's redirect.
+     */
     redirect?: RequestRedirect;
+    /**
+     * A string whose value is a same-origin URL, "about:client", or the empty string, to set request's referrer.
+     */
     referrer?: string;
+    /**
+     * A referrer policy to set request's referrerPolicy.
+     */
     referrerPolicy?: ReferrerPolicy;
+    /**
+     * An AbortSignal to set request's signal.
+     */
     signal?: AbortSignal | null;
+    /**
+     * Can only be null. Used to disassociate request from any Window.
+     */
     window?: any;
 }
 
@@ -1519,6 +1720,11 @@ interface TextDecoderOptions {
     ignoreBOM?: boolean;
 }
 
+interface TextEncoderEncodeIntoResult {
+    read?: number;
+    written?: number;
+}
+
 interface TouchEventInit extends EventModifierInit {
     changedTouches?: Touch[];
     targetTouches?: Touch[];
@@ -1566,6 +1772,11 @@ interface UIEventInit extends EventInit {
     view?: Window | null;
 }
 
+interface ULongRange {
+    max?: number;
+    min?: number;
+}
+
 interface UnderlyingByteSource {
     autoAllocateChunkSize?: number;
     cancel?: ReadableStreamErrorCallback;
@@ -1615,14 +1826,15 @@ interface WebAuthnExtensions {
 }
 
 interface WebGLContextAttributes {
-    alpha?: GLboolean;
-    antialias?: GLboolean;
-    depth?: GLboolean;
+    alpha?: boolean;
+    antialias?: boolean;
+    depth?: boolean;
+    desynchronized?: boolean;
     failIfMajorPerformanceCaveat?: boolean;
     powerPreference?: WebGLPowerPreference;
-    premultipliedAlpha?: GLboolean;
-    preserveDrawingBuffer?: GLboolean;
-    stencil?: GLboolean;
+    premultipliedAlpha?: boolean;
+    preserveDrawingBuffer?: boolean;
+    stencil?: boolean;
 }
 
 interface WebGLContextEventInit extends EventInit {
@@ -1646,10 +1858,17 @@ interface WorkletOptions {
     credentials?: RequestCredentials;
 }
 
+interface txAuthGenericArg {
+    content: ArrayBuffer;
+    contentType: string;
+}
+
 interface EventListener {
     (evt: Event): void;
 }
 
+type XPathNSResolver = ((prefix: string | null) => string | null) | { lookupNamespaceURI(prefix: string | null): string | null; };
+
 /** The ANGLE_instanced_arrays extension is part of the WebGL API and allows to draw the same object, or groups of similar objects multiple times, if they share the same vertex data, primitive count and type. */
 interface ANGLE_instanced_arrays {
     drawArraysInstancedANGLE(mode: GLenum, first: GLint, count: GLsizei, primcount: GLsizei): void;
@@ -1658,15 +1877,14 @@ interface ANGLE_instanced_arrays {
     readonly VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE: GLenum;
 }
 
-/** The AbortController interface represents a controller object that allows you to abort one or more DOM requests as and when desired. */
+/** A controller object that allows you to abort one or more DOM requests as and when desired. */
 interface AbortController {
     /**
      * Returns the AbortSignal object associated with this object.
      */
     readonly signal: AbortSignal;
     /**
-     * Invoking this method will set this object's AbortSignal's aborted flag and
-     * signal to any observers that the associated activity is to be aborted.
+     * Invoking this method will set this object's AbortSignal's aborted flag and signal to any observers that the associated activity is to be aborted.
      */
     abort(): void;
 }
@@ -1680,11 +1898,10 @@ interface AbortSignalEventMap {
     "abort": Event;
 }
 
-/** The AbortSignal interface represents a signal object that allows you to communicate with a DOM request (such as a Fetch) and abort it if required via an AbortController object. */
+/** A signal object that allows you to communicate with a DOM request (such as a Fetch) and abort it if required via an AbortController object. */
 interface AbortSignal extends EventTarget {
     /**
-     * Returns true if this AbortSignal's AbortController has signaled to abort, and false
-     * otherwise.
+     * Returns true if this AbortSignal's AbortController has signaled to abort, and false otherwise.
      */
     readonly aborted: boolean;
     onabort: ((this: AbortSignal, ev: Event) => any) | null;
@@ -1700,10 +1917,25 @@ declare var AbortSignal: {
 };
 
 interface AbstractRange {
+    /**
+     * Returns true if range is collapsed, and false otherwise.
+     */
     readonly collapsed: boolean;
+    /**
+     * Returns range's end node.
+     */
     readonly endContainer: Node;
+    /**
+     * Returns range's end offset.
+     */
     readonly endOffset: number;
+    /**
+     * Returns range's start node.
+     */
     readonly startContainer: Node;
+    /**
+     * Returns range's start offset.
+     */
     readonly startOffset: number;
 }
 
@@ -1732,7 +1964,7 @@ interface AesCmacParams extends Algorithm {
     length: number;
 }
 
-/** The AnalyserNode interface represents a node able to provide real-time frequency and time-domain analysis information. It is an AudioNode that passes the audio stream unchanged from the input to the output, but allows you to take the generated data, process it, and create audio visualizations. */
+/** A node able to provide real-time frequency and time-domain analysis information. It is an AudioNode that passes the audio stream unchanged from the input to the output, but allows you to take the generated data, process it, and create audio visualizations. */
 interface AnalyserNode extends AudioNode {
     fftSize: number;
     readonly frequencyBinCount: number;
@@ -1801,7 +2033,7 @@ declare var AnimationEffect: {
     new(): AnimationEffect;
 };
 
-/** The AnimationEvent interface represents events providing information related to animations. */
+/** Events providing information related to animations. */
 interface AnimationEvent extends Event {
     readonly animationName: string;
     readonly elapsedTime: number;
@@ -1813,6 +2045,11 @@ declare var AnimationEvent: {
     new(type: string, animationEventInitDict?: AnimationEventInit): AnimationEvent;
 };
 
+interface AnimationFrameProvider {
+    cancelAnimationFrame(handle: number): void;
+    requestAnimationFrame(callback: FrameRequestCallback): number;
+}
+
 interface AnimationPlaybackEvent extends Event {
     readonly currentTime: number | null;
     readonly timelineTime: number | null;
@@ -1839,7 +2076,7 @@ interface ApplicationCacheEventMap {
     "error": Event;
     "noupdate": Event;
     "obsolete": Event;
-    "progress": ProgressEvent;
+    "progress": ProgressEvent<ApplicationCache>;
     "updateready": Event;
 }
 
@@ -1857,7 +2094,7 @@ interface ApplicationCache extends EventTarget {
     /** @deprecated */
     onobsolete: ((this: ApplicationCache, ev: Event) => any) | null;
     /** @deprecated */
-    onprogress: ((this: ApplicationCache, ev: ProgressEvent) => any) | null;
+    onprogress: ((this: ApplicationCache, ev: ProgressEvent<ApplicationCache>) => any) | null;
     /** @deprecated */
     onupdateready: ((this: ApplicationCache, ev: Event) => any) | null;
     /** @deprecated */
@@ -1891,7 +2128,7 @@ declare var ApplicationCache: {
     readonly UPDATEREADY: number;
 };
 
-/** This type represents a DOM element's attribute as an object. In most DOM methods, you will probably directly retrieve the attribute as a string (e.g., Element.getAttribute(), but certain functions (e.g., Element.getAttributeNode()) or means of iterating give Attr types. */
+/** A DOM element's attribute as an object. In most DOM methods, you will probably directly retrieve the attribute as a string (e.g., Element.getAttribute(), but certain functions (e.g., Element.getAttributeNode()) or means of iterating give Attr types. */
 interface Attr extends Node {
     readonly localName: string;
     readonly name: string;
@@ -1907,7 +2144,7 @@ declare var Attr: {
     new(): Attr;
 };
 
-/** Objects of these types are designed to hold small audio snippets, typically less than 45 s. For longer sounds, objects implementing the MediaElementAudioSourceNode are more suitable. The buffer contains data in the following format:  non-interleaved IEEE754 32-bit linear PCM with a nominal range between -1 and +1, that is, 32bits floating point buffer, with each samples between -1.0 and 1.0. If the AudioBuffer has multiple channels, they are stored in separate buffer. */
+/** A short audio asset residing in memory, created from an audio file using the AudioContext.decodeAudioData() method, or from raw data using AudioContext.createBuffer(). Once put into an AudioBuffer, the audio can then be played by being passed into an AudioBufferSourceNode. */
 interface AudioBuffer {
     readonly duration: number;
     readonly length: number;
@@ -1923,7 +2160,7 @@ declare var AudioBuffer: {
     new(options: AudioBufferOptions): AudioBuffer;
 };
 
-/** The AudioBufferSourceNode interface is an AudioScheduledSourceNode which represents an audio source consisting of in-memory audio data, stored in an AudioBuffer. It's especially useful for playing back audio which has particularly stringent timing accuracy requirements, such as for sounds that must match a specific rhythm and can be kept in memory rather than being played from disk or the network. */
+/** An AudioScheduledSourceNode which represents an audio source consisting of in-memory audio data, stored in an AudioBuffer. It's especially useful for playing back audio which has particularly stringent timing accuracy requirements, such as for sounds that must match a specific rhythm and can be kept in memory rather than being played from disk or the network. */
 interface AudioBufferSourceNode extends AudioScheduledSourceNode {
     buffer: AudioBuffer | null;
     readonly detune: AudioParam;
@@ -1943,7 +2180,7 @@ declare var AudioBufferSourceNode: {
     new(context: BaseAudioContext, options?: AudioBufferSourceOptions): AudioBufferSourceNode;
 };
 
-/** The AudioContext interface represents an audio-processing graph built from audio modules linked together, each represented by an AudioNode. */
+/** An audio-processing graph built from audio modules linked together, each represented by an AudioNode. */
 interface AudioContext extends BaseAudioContext {
     readonly baseLatency: number;
     readonly outputLatency: number;
@@ -1953,6 +2190,7 @@ interface AudioContext extends BaseAudioContext {
     createMediaStreamSource(mediaStream: MediaStream): MediaStreamAudioSourceNode;
     createMediaStreamTrackSource(mediaStreamTrack: MediaStreamTrack): MediaStreamTrackAudioSourceNode;
     getOutputTimestamp(): AudioTimestamp;
+    resume(): Promise<void>;
     suspend(): Promise<void>;
     addEventListener<K extends keyof BaseAudioContextEventMap>(type: K, listener: (this: AudioContext, ev: BaseAudioContextEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
@@ -1975,7 +2213,7 @@ declare var AudioDestinationNode: {
     new(): AudioDestinationNode;
 };
 
-/** The AudioListener interface represents the position and orientation of the unique person listening to the audio scene, and is used in audio spatialization. All PannerNodes spatialize in relation to the AudioListener stored in the BaseAudioContext.listener attribute. */
+/** The position and orientation of the unique person listening to the audio scene, and is used in audio spatialization. All PannerNodes spatialize in relation to the AudioListener stored in the BaseAudioContext.listener attribute. */
 interface AudioListener {
     readonly forwardX: AudioParam;
     readonly forwardY: AudioParam;
@@ -1997,7 +2235,7 @@ declare var AudioListener: {
     new(): AudioListener;
 };
 
-/** The AudioNode interface is a generic interface for representing an audio processing module. Examples include: */
+/** A generic interface for representing an audio processing module. Examples include: */
 interface AudioNode extends EventTarget {
     channelCount: number;
     channelCountMode: ChannelCountMode;
@@ -2051,7 +2289,7 @@ declare var AudioParamMap: {
     new(): AudioParamMap;
 };
 
-/** The Web Audio API AudioProcessingEvent represents events that occur when a ScriptProcessorNode input buffer is ready to be processed. */
+/** The Web Audio API events that occur when a ScriptProcessorNode input buffer is ready to be processed. */
 interface AudioProcessingEvent extends Event {
     readonly inputBuffer: AudioBuffer;
     readonly outputBuffer: AudioBuffer;
@@ -2082,7 +2320,7 @@ declare var AudioScheduledSourceNode: {
     new(): AudioScheduledSourceNode;
 };
 
-/** The AudioTrack interface represents a single audio track from one of the HTML media elements, <audio> or <video>.  */
+/** A single audio track from one of the HTML media elements, <audio> or <video>.  */
 interface AudioTrack {
     enabled: boolean;
     readonly id: string;
@@ -2103,7 +2341,7 @@ interface AudioTrackListEventMap {
     "removetrack": TrackEvent;
 }
 
-/** The AudioTrackList interface is used to represent a list of the audio tracks contained within a given HTML media element, with each track represented by a separate AudioTrack object in the list. */
+/** Used to represent a list of the audio tracks contained within a given HTML media element, with each track represented by a separate AudioTrack object in the list. */
 interface AudioTrackList extends EventTarget {
     readonly length: number;
     onaddtrack: ((this: AudioTrackList, ev: TrackEvent) => any) | null;
@@ -2150,6 +2388,35 @@ declare var AudioWorkletNode: {
     new(context: BaseAudioContext, name: string, options?: AudioWorkletNodeOptions): AudioWorkletNode;
 };
 
+interface AuthenticatorAssertionResponse extends AuthenticatorResponse {
+    readonly authenticatorData: ArrayBuffer;
+    readonly signature: ArrayBuffer;
+    readonly userHandle: ArrayBuffer | null;
+}
+
+declare var AuthenticatorAssertionResponse: {
+    prototype: AuthenticatorAssertionResponse;
+    new(): AuthenticatorAssertionResponse;
+};
+
+interface AuthenticatorAttestationResponse extends AuthenticatorResponse {
+    readonly attestationObject: ArrayBuffer;
+}
+
+declare var AuthenticatorAttestationResponse: {
+    prototype: AuthenticatorAttestationResponse;
+    new(): AuthenticatorAttestationResponse;
+};
+
+interface AuthenticatorResponse {
+    readonly clientDataJSON: ArrayBuffer;
+}
+
+declare var AuthenticatorResponse: {
+    prototype: AuthenticatorResponse;
+    new(): AuthenticatorResponse;
+};
+
 interface BarProp {
     readonly visible: boolean;
 }
@@ -2190,7 +2457,6 @@ interface BaseAudioContext extends EventTarget {
     createStereoPanner(): StereoPannerNode;
     createWaveShaper(): WaveShaperNode;
     decodeAudioData(audioData: ArrayBuffer, successCallback?: DecodeSuccessCallback | null, errorCallback?: DecodeErrorCallback | null): Promise<AudioBuffer>;
-    resume(): Promise<void>;
     addEventListener<K extends keyof BaseAudioContextEventMap>(type: K, listener: (this: BaseAudioContext, ev: BaseAudioContextEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof BaseAudioContextEventMap>(type: K, listener: (this: BaseAudioContext, ev: BaseAudioContextEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -2234,7 +2500,7 @@ declare var BhxBrowser: {
     new(): BhxBrowser;
 };
 
-/** The BiquadFilterNode interface represents a simple low-order filter, and is created using the AudioContext.createBiquadFilter() method. It is an AudioNode that can represent different kinds of filters, tone control devices, and graphic equalizers. */
+/** A simple low-order filter, and is created using the AudioContext.createBiquadFilter() method. It is an AudioNode that can represent different kinds of filters, tone control devices, and graphic equalizers. */
 interface BiquadFilterNode extends AudioNode {
     readonly Q: AudioParam;
     readonly detune: AudioParam;
@@ -2249,7 +2515,7 @@ declare var BiquadFilterNode: {
     new(context: BaseAudioContext, options?: BiquadFilterOptions): BiquadFilterNode;
 };
 
-/** A Blob object represents a file-like object of immutable, raw data. Blobs represent data that isn't necessarily in a JavaScript-native format. The File interface is based on Blob, inheriting blob functionality and expanding it to support files on the user's system. */
+/** A file-like object of immutable, raw data. Blobs represent data that isn't necessarily in a JavaScript-native format. The File interface is based on Blob, inheriting blob functionality and expanding it to support files on the user's system. */
 interface Blob {
     readonly size: number;
     readonly type: string;
@@ -2302,12 +2568,7 @@ declare var BroadcastChannel: {
     new(name: string): BroadcastChannel;
 };
 
-interface BroadcastChannelEventMap {
-    message: MessageEvent;
-    messageerror: MessageEvent;
-}
-
-/** The ByteLengthQueuingStrategy interface of the the Streams API provides a built-in byte length queuing strategy that can be used when constructing streams. */
+/** This Streams API interface provides a built-in byte length queuing strategy that can be used when constructing streams. */
 interface ByteLengthQueuingStrategy extends QueuingStrategy<ArrayBufferView> {
     highWaterMark: number;
     size(chunk: ArrayBufferView): number;
@@ -2318,7 +2579,7 @@ declare var ByteLengthQueuingStrategy: {
     new(options: { highWaterMark: number }): ByteLengthQueuingStrategy;
 };
 
-/** The CDATASection interface represents a CDATA section that can be used within XML to include extended portions of unescaped text. The symbols < and & don’t need escaping as they normally do when inside a CDATA section. */
+/** A CDATA section that can be used within XML to include extended portions of unescaped text. The symbols < and & don’t need escaping as they normally do when inside a CDATA section. */
 interface CDATASection extends Text {
 }
 
@@ -2327,14 +2588,14 @@ declare var CDATASection: {
     new(): CDATASection;
 };
 
-/** The CSS interface holds useful CSS-related methods. No object with this interface are implemented: it contains only static methods and therefore is a utilitarian interface. */
+/** Holds useful CSS-related methods. No object with this interface are implemented: it contains only static methods and therefore is a utilitarian interface. */
 interface CSS {
     escape(value: string): string;
     supports(property: string, value?: string): boolean;
 }
 declare var CSS: CSS;
 
-/** An object implementing the CSSConditionRule interface represents a single condition CSS at-rule, which consists of a condition and a statement block. It is a child of CSSGroupingRule. */
+/** A single condition CSS at-rule, which consists of a condition and a statement block. It is a child of CSSGroupingRule. */
 interface CSSConditionRule extends CSSGroupingRule {
     conditionText: string;
 }
@@ -2353,7 +2614,7 @@ declare var CSSFontFaceRule: {
     new(): CSSFontFaceRule;
 };
 
-/** An object implementing the CSSGroupingRule interface represents any CSS at-rule that contains other rules nested within it. */
+/** Any CSS at-rule that contains other rules nested within it. */
 interface CSSGroupingRule extends CSSRule {
     readonly cssRules: CSSRuleList;
     deleteRule(index: number): void;
@@ -2376,7 +2637,7 @@ declare var CSSImportRule: {
     new(): CSSImportRule;
 };
 
-/** The CSSKeyframeRule interface describes an object representing a set of style for a given keyframe. It corresponds to the contains of a single keyframe of a @keyframes at-rule. It implements the CSSRule interface with a type value of 8 (CSSRule.KEYFRAME_RULE). */
+/** An object representing a set of style for a given keyframe. It corresponds to the contains of a single keyframe of a @keyframes at-rule. It implements the CSSRule interface with a type value of 8 (CSSRule.KEYFRAME_RULE). */
 interface CSSKeyframeRule extends CSSRule {
     keyText: string;
     readonly style: CSSStyleDeclaration;
@@ -2387,7 +2648,7 @@ declare var CSSKeyframeRule: {
     new(): CSSKeyframeRule;
 };
 
-/** The CSSKeyframesRule interface describes an object representing a complete set of keyframes for a CSS animation. It corresponds to the contains of a whole @keyframes at-rule. It implements the CSSRule interface with a type value of 7 (CSSRule.KEYFRAMES_RULE). */
+/** An object representing a complete set of keyframes for a CSS animation. It corresponds to the contains of a whole @keyframes at-rule. It implements the CSSRule interface with a type value of 7 (CSSRule.KEYFRAMES_RULE). */
 interface CSSKeyframesRule extends CSSRule {
     readonly cssRules: CSSRuleList;
     name: string;
@@ -2401,7 +2662,7 @@ declare var CSSKeyframesRule: {
     new(): CSSKeyframesRule;
 };
 
-/** The CSSMediaRule is an interface representing a single CSS @media rule. It implements the CSSConditionRule interface, and therefore the CSSGroupingRule and the CSSRule interface with a type value of 4 (CSSRule.MEDIA_RULE). */
+/** A single CSS @media rule. It implements the CSSConditionRule interface, and therefore the CSSGroupingRule and the CSSRule interface with a type value of 4 (CSSRule.MEDIA_RULE). */
 interface CSSMediaRule extends CSSConditionRule {
     readonly media: MediaList;
 }
@@ -2411,7 +2672,7 @@ declare var CSSMediaRule: {
     new(): CSSMediaRule;
 };
 
-/** The CSSNamespaceRule interface describes an object representing a single CSS @namespace at-rule. It implements the CSSRule interface, with a type value of 10 (CSSRule.NAMESPACE_RULE). */
+/** An object representing a single CSS @namespace at-rule. It implements the CSSRule interface, with a type value of 10 (CSSRule.NAMESPACE_RULE). */
 interface CSSNamespaceRule extends CSSRule {
     readonly namespaceURI: string;
     readonly prefix: string;
@@ -2435,7 +2696,7 @@ declare var CSSPageRule: {
     new(): CSSPageRule;
 };
 
-/** The CSSRule interface represents a single CSS rule. There are several types of rules, listed in the Type constants section below. */
+/** A single CSS rule. There are several types of rules, listed in the Type constants section below. */
 interface CSSRule {
     cssText: string;
     readonly parentRule: CSSRule | null;
@@ -2484,11 +2745,11 @@ declare var CSSRuleList: {
     new(): CSSRuleList;
 };
 
-/** The CSSStyleDeclaration API represents an object that is a CSS declaration block, that exposes style information and various style-related methods and properties. */
+/** An object that is a CSS declaration block, and exposes style information and various style-related methods and properties. */
 interface CSSStyleDeclaration {
-    alignContent: string | null;
-    alignItems: string | null;
-    alignSelf: string | null;
+    alignContent: string;
+    alignItems: string;
+    alignSelf: string;
     alignmentBaseline: string | null;
     animation: string;
     animationDelay: string;
@@ -2547,34 +2808,35 @@ interface CSSStyleDeclaration {
     borderWidth: string | null;
     bottom: string | null;
     boxShadow: string | null;
-    boxSizing: string | null;
+    boxSizing: string;
     breakAfter: string | null;
     breakBefore: string | null;
     breakInside: string | null;
     captionSide: string | null;
+    caretColor: string;
     clear: string | null;
-    clip: string | null;
-    clipPath: string | null;
-    clipRule: string | null;
+    clip: string;
+    clipPath: string;
+    clipRule: string;
     color: string | null;
-    colorInterpolationFilters: string | null;
-    columnCount: any;
-    columnFill: string | null;
-    columnGap: any;
-    columnRule: string | null;
-    columnRuleColor: any;
-    columnRuleStyle: string | null;
-    columnRuleWidth: any;
-    columnSpan: string | null;
-    columnWidth: any;
-    columns: string | null;
+    colorInterpolationFilters: string;
+    columnCount: string;
+    columnFill: string;
+    columnGap: string;
+    columnRule: string;
+    columnRuleColor: string;
+    columnRuleStyle: string;
+    columnRuleWidth: string;
+    columnSpan: string;
+    columnWidth: string;
+    columns: string;
     content: string | null;
     counterIncrement: string | null;
     counterReset: string | null;
     cssFloat: string | null;
     cssText: string;
-    cursor: string | null;
-    direction: string | null;
+    cursor: string;
+    direction: string;
     display: string | null;
     dominantBaseline: string | null;
     emptyCells: string | null;
@@ -2582,7 +2844,7 @@ interface CSSStyleDeclaration {
     fill: string | null;
     fillOpacity: string | null;
     fillRule: string | null;
-    filter: string | null;
+    filter: string;
     flex: string | null;
     flexBasis: string | null;
     flexDirection: string | null;
@@ -2590,20 +2852,27 @@ interface CSSStyleDeclaration {
     flexGrow: string | null;
     flexShrink: string | null;
     flexWrap: string | null;
-    floodColor: string | null;
-    floodOpacity: string | null;
-    font: string | null;
-    fontFamily: string | null;
-    fontFeatureSettings: string | null;
-    fontSize: string | null;
-    fontSizeAdjust: string | null;
-    fontStretch: string | null;
-    fontStyle: string | null;
-    fontVariant: string | null;
-    fontWeight: string | null;
-    gap: string | null;
+    floodColor: string;
+    floodOpacity: string;
+    font: string;
+    fontFamily: string;
+    fontFeatureSettings: string;
+    fontKerning: string;
+    fontSize: string;
+    fontSizeAdjust: string;
+    fontStretch: string;
+    fontStyle: string;
+    fontSynthesis: string;
+    fontVariant: string;
+    fontVariantCaps: string;
+    fontVariantEastAsian: string;
+    fontVariantLigatures: string;
+    fontVariantNumeric: string;
+    fontVariantPosition: string;
+    fontWeight: string;
+    gap: string;
     glyphOrientationHorizontal: string | null;
-    glyphOrientationVertical: string | null;
+    glyphOrientationVertical: string;
     grid: string | null;
     gridArea: string | null;
     gridAutoColumns: string | null;
@@ -2611,22 +2880,25 @@ interface CSSStyleDeclaration {
     gridAutoRows: string | null;
     gridColumn: string | null;
     gridColumnEnd: string | null;
-    gridColumnGap: string | null;
+    gridColumnGap: string;
     gridColumnStart: string | null;
-    gridGap: string | null;
+    gridGap: string;
     gridRow: string | null;
     gridRowEnd: string | null;
-    gridRowGap: string | null;
+    gridRowGap: string;
     gridRowStart: string | null;
     gridTemplate: string | null;
     gridTemplateAreas: string | null;
     gridTemplateColumns: string | null;
     gridTemplateRows: string | null;
     height: string | null;
+    hyphens: string;
+    imageOrientation: string;
+    imageRendering: string;
     imeMode: string | null;
-    justifyContent: string | null;
-    justifyItems: string | null;
-    justifySelf: string | null;
+    justifyContent: string;
+    justifyItems: string;
+    justifySelf: string;
     kerning: string | null;
     layoutGrid: string | null;
     layoutGridChar: string | null;
@@ -2635,9 +2907,9 @@ interface CSSStyleDeclaration {
     layoutGridType: string | null;
     left: string | null;
     readonly length: number;
-    letterSpacing: string | null;
-    lightingColor: string | null;
-    lineBreak: string | null;
+    letterSpacing: string;
+    lightingColor: string;
+    lineBreak: string;
     lineHeight: string | null;
     listStyle: string | null;
     listStyleImage: string | null;
@@ -2652,8 +2924,13 @@ interface CSSStyleDeclaration {
     markerEnd: string | null;
     markerMid: string | null;
     markerStart: string | null;
-    mask: string | null;
-    maskImage: string | null;
+    mask: string;
+    maskComposite: string;
+    maskImage: string;
+    maskPosition: string;
+    maskRepeat: string;
+    maskSize: string;
+    maskType: string;
     maxHeight: string | null;
     maxWidth: string | null;
     minHeight: string | null;
@@ -2705,19 +2982,21 @@ interface CSSStyleDeclaration {
     msWrapFlow: string;
     msWrapMargin: any;
     msWrapThrough: string;
-    objectFit: string | null;
-    objectPosition: string | null;
+    objectFit: string;
+    objectPosition: string;
     opacity: string | null;
     order: string | null;
     orphans: string | null;
-    outline: string | null;
-    outlineColor: string | null;
-    outlineOffset: string | null;
-    outlineStyle: string | null;
-    outlineWidth: string | null;
-    overflow: string | null;
-    overflowX: string | null;
-    overflowY: string | null;
+    outline: string;
+    outlineColor: string;
+    outlineOffset: string;
+    outlineStyle: string;
+    outlineWidth: string;
+    overflow: string;
+    overflowAnchor: string;
+    overflowWrap: string;
+    overflowX: string;
+    overflowY: string;
     padding: string | null;
     paddingBottom: string | null;
     paddingLeft: string | null;
@@ -2730,13 +3009,16 @@ interface CSSStyleDeclaration {
     penAction: string | null;
     perspective: string | null;
     perspectiveOrigin: string | null;
+    placeContent: string;
+    placeItems: string;
+    placeSelf: string;
     pointerEvents: string | null;
     position: string | null;
     quotes: string | null;
-    resize: string | null;
+    resize: string;
     right: string | null;
     rotate: string | null;
-    rowGap: string | null;
+    rowGap: string;
     rubyAlign: string | null;
     rubyOverhang: string | null;
     rubyPosition: string | null;
@@ -2752,24 +3034,34 @@ interface CSSStyleDeclaration {
     strokeMiterlimit: string | null;
     strokeOpacity: string | null;
     strokeWidth: string | null;
+    tabSize: string;
     tableLayout: string | null;
-    textAlign: string | null;
-    textAlignLast: string | null;
+    textAlign: string;
+    textAlignLast: string;
     textAnchor: string | null;
-    textCombineUpright: string | null;
-    textDecoration: string | null;
-    textIndent: string | null;
-    textJustify: string | null;
+    textCombineUpright: string;
+    textDecoration: string;
+    textDecorationColor: string;
+    textDecorationLine: string;
+    textDecorationStyle: string;
+    textEmphasis: string;
+    textEmphasisColor: string;
+    textEmphasisPosition: string;
+    textEmphasisStyle: string;
+    textIndent: string;
+    textJustify: string;
     textKashida: string | null;
     textKashidaSpace: string | null;
-    textOverflow: string | null;
-    textShadow: string | null;
-    textTransform: string | null;
-    textUnderlinePosition: string | null;
+    textOrientation: string;
+    textOverflow: string;
+    textShadow: string;
+    textTransform: string;
+    textUnderlinePosition: string;
     top: string | null;
     touchAction: string;
-    transform: string | null;
-    transformOrigin: string | null;
+    transform: string;
+    transformBox: string;
+    transformOrigin: string;
     transformStyle: string | null;
     transition: string;
     transitionDelay: string;
@@ -2777,8 +3069,8 @@ interface CSSStyleDeclaration {
     transitionProperty: string;
     transitionTimingFunction: string;
     translate: string | null;
-    unicodeBidi: string | null;
-    userSelect: string | null;
+    unicodeBidi: string;
+    userSelect: string;
     verticalAlign: string | null;
     visibility: string | null;
     /** @deprecated */
@@ -2870,6 +3162,7 @@ interface CSSStyleDeclaration {
     webkitFlexWrap: string;
     /** @deprecated */
     webkitJustifyContent: string;
+    webkitLineClamp: string;
     /** @deprecated */
     webkitMask: string;
     /** @deprecated */
@@ -2934,13 +3227,14 @@ interface CSSStyleDeclaration {
     webkitUserModify: string | null;
     webkitUserSelect: string | null;
     webkitWritingMode: string | null;
-    whiteSpace: string | null;
+    whiteSpace: string;
     widows: string | null;
     width: string | null;
-    wordBreak: string | null;
-    wordSpacing: string | null;
-    wordWrap: string | null;
-    writingMode: string | null;
+    willChange: string;
+    wordBreak: string;
+    wordSpacing: string;
+    wordWrap: string;
+    writingMode: string;
     zIndex: string | null;
     zoom: string | null;
     getPropertyPriority(propertyName: string): string;
@@ -2967,7 +3261,7 @@ declare var CSSStyleRule: {
     new(): CSSStyleRule;
 };
 
-/** The CSSStyleSheet interface represents a single CSS style sheet. It inherits properties and methods from its parent, StyleSheet. */
+/** A single CSS style sheet. It inherits properties and methods from its parent, StyleSheet. */
 interface CSSStyleSheet extends StyleSheet {
     readonly cssRules: CSSRuleList;
     /** @deprecated */
@@ -3005,7 +3299,7 @@ declare var CSSStyleSheet: {
     new(): CSSStyleSheet;
 };
 
-/** The CSSSupportsRule interface describes an object representing a single CSS @supports at-rule. It implements the CSSConditionRule interface, and therefore the CSSRule and CSSGroupingRule interfaces with a type value of 12 (CSSRule.SUPPORTS_RULE). */
+/** An object representing a single CSS @supports at-rule. It implements the CSSConditionRule interface, and therefore the CSSRule and CSSGroupingRule interfaces with a type value of 12 (CSSRule.SUPPORTS_RULE). */
 interface CSSSupportsRule extends CSSConditionRule {
 }
 
@@ -3014,7 +3308,7 @@ declare var CSSSupportsRule: {
     new(): CSSSupportsRule;
 };
 
-/** The Cache interface provides a storage mechanism for Request / Response object pairs that are cached, for example as part of the ServiceWorker life cycle. Note that the Cache interface is exposed to windowed scopes as well as workers. You don't have to use it in conjunction with service workers, even though it is defined in the service worker spec. */
+/** Provides a storage mechanism for Request / Response object pairs that are cached, for example as part of the ServiceWorker life cycle. Note that the Cache interface is exposed to windowed scopes as well as workers. You don't have to use it in conjunction with service workers, even though it is defined in the service worker spec. */
 interface Cache {
     add(request: RequestInfo): Promise<void>;
     addAll(requests: RequestInfo[]): Promise<void>;
@@ -3030,7 +3324,7 @@ declare var Cache: {
     new(): Cache;
 };
 
-/** The CacheStorage interface represents the storage for Cache objects. */
+/** The storage for Cache objects. */
 interface CacheStorage {
     delete(cacheName: string): Promise<boolean>;
     has(cacheName: string): Promise<boolean>;
@@ -3081,14 +3375,12 @@ interface CanvasFilters {
     filter: string;
 }
 
-/** The CanvasGradient interface represents an opaque object describing a gradient. It is returned by the methods CanvasRenderingContext2D.createLinearGradient() or CanvasRenderingContext2D.createRadialGradient(). */
+/** An opaque object describing a gradient. It is returned by the methods CanvasRenderingContext2D.createLinearGradient() or CanvasRenderingContext2D.createRadialGradient(). */
 interface CanvasGradient {
     /**
-     * Adds a color stop with the given color to the gradient at the given offset. 0.0 is the offset
-     * at one end of the gradient, 1.0 is the offset at the other end.
-     * Throws an "IndexSizeError" DOMException if the offset
-     * is out of range. Throws a "SyntaxError" DOMException if
-     * the color cannot be parsed.
+     * Adds a color stop with the given color to the gradient at the given offset. 0.0 is the offset at one end of the gradient, 1.0 is the offset at the other end.
+     * 
+     * Throws an "IndexSizeError" DOMException if the offset is out of range. Throws a "SyntaxError" DOMException if the color cannot be parsed.
      */
     addColorStop(offset: number, color: string): void;
 }
@@ -3133,11 +3425,10 @@ interface CanvasPathDrawingStyles {
     setLineDash(segments: number[]): void;
 }
 
-/** The CanvasPattern interface represents an opaque object describing a pattern, based on an image, a canvas, or a video, created by the CanvasRenderingContext2D.createPattern() method. */
+/** An opaque object describing a pattern, based on an image, a canvas, or a video, created by the CanvasRenderingContext2D.createPattern() method. */
 interface CanvasPattern {
     /**
-     * Sets the transformation matrix that will be used when rendering the pattern during a fill or
-     * stroke painting operation.
+     * Sets the transformation matrix that will be used when rendering the pattern during a fill or stroke painting operation.
      */
     setTransform(transform?: DOMMatrix2DInit): void;
 }
@@ -3254,14 +3545,14 @@ declare var CharacterData: {
 interface ChildNode extends Node {
     /**
      * Inserts nodes just after node, while replacing strings in nodes with equivalent Text nodes.
-     * Throws a "HierarchyRequestError" DOMException if the constraints of
-     * the node tree are violated.
+     * 
+     * Throws a "HierarchyRequestError" DOMException if the constraints of the node tree are violated.
      */
     after(...nodes: (Node | string)[]): void;
     /**
      * Inserts nodes just before node, while replacing strings in nodes with equivalent Text nodes.
-     * Throws a "HierarchyRequestError" DOMException if the constraints of
-     * the node tree are violated.
+     * 
+     * Throws a "HierarchyRequestError" DOMException if the constraints of the node tree are violated.
      */
     before(...nodes: (Node | string)[]): void;
     /**
@@ -3270,8 +3561,8 @@ interface ChildNode extends Node {
     remove(): void;
     /**
      * Replaces node with nodes, while replacing strings in nodes with equivalent Text nodes.
-     * Throws a "HierarchyRequestError" DOMException if the constraints of
-     * the node tree are violated.
+     * 
+     * Throws a "HierarchyRequestError" DOMException if the constraints of the node tree are violated.
      */
     replaceWith(...nodes: (Node | string)[]): void;
 }
@@ -3311,7 +3602,7 @@ declare var Clipboard: {
     new(): Clipboard;
 };
 
-/** The ClipboardEvent interface represents events providing information related to modification of the clipboard, that is cut, copy, and paste events. */
+/** Events providing information related to modification of the clipboard, that is cut, copy, and paste events. */
 interface ClipboardEvent extends Event {
     readonly clipboardData: DataTransfer | null;
 }
@@ -3335,7 +3626,7 @@ declare var CloseEvent: {
     new(type: string, eventInitDict?: CloseEventInit): CloseEvent;
 };
 
-/** The Comment interface represents textual notations within markup; although it is generally not visually shown, such comments are available to be read in the source view. Comments are represented in HTML and XML as content between '<!--' and '-->'. In XML, the character sequence '--' cannot be used within a comment. */
+/** Textual notations within markup; although it is generally not visually shown, such comments are available to be read in the source view. */
 interface Comment extends CharacterData {
 }
 
@@ -3347,13 +3638,11 @@ declare var Comment: {
 /** The DOM CompositionEvent represents events that occur due to the user indirectly entering text. */
 interface CompositionEvent extends UIEvent {
     readonly data: string;
-    readonly locale: string;
-    initCompositionEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, dataArg: string, locale: string): void;
 }
 
 declare var CompositionEvent: {
     prototype: CompositionEvent;
-    new(typeArg: string, eventInitDict?: CompositionEventInit): CompositionEvent;
+    new(type: string, eventInitDict?: CompositionEventInit): CompositionEvent;
 };
 
 interface ConcatParams extends Algorithm {
@@ -3365,7 +3654,7 @@ interface ConcatParams extends Algorithm {
     publicInfo?: Uint8Array;
 }
 
-/** The Console object provides access to the browser's debugging console (e.g. the Web Console in Firefox). The specifics of how it works varies from browser to browser, but there is a de facto set of features that are typically provided. */
+/** Provides access to the browser's debugging console (e.g. the Web Console in Firefox). The specifics of how it works varies from browser to browser, but there is a de facto set of features that are typically provided. */
 interface Console {
     memory: any;
     assert(condition?: boolean, message?: string, ...data: any[]): void;
@@ -3412,7 +3701,7 @@ declare var ConstantSourceNode: {
     new(context: BaseAudioContext, options?: ConstantSourceOptions): ConstantSourceNode;
 };
 
-/** The ConvolverNode interface is an AudioNode that performs a Linear Convolution on a given AudioBuffer, often used to achieve a reverb effect. A ConvolverNode always has exactly one input and one output. */
+/** An AudioNode that performs a Linear Convolution on a given AudioBuffer, often used to achieve a reverb effect. A ConvolverNode always has exactly one input and one output. */
 interface ConvolverNode extends AudioNode {
     buffer: AudioBuffer | null;
     normalize: boolean;
@@ -3423,7 +3712,7 @@ declare var ConvolverNode: {
     new(context: BaseAudioContext, options?: ConvolverOptions): ConvolverNode;
 };
 
-/** The Coordinates interface represents the position and altitude of the device on Earth, as well as the accuracy with which these properties are calculated. */
+/** The position and altitude of the device on Earth, as well as the accuracy with which these properties are calculated. */
 interface Coordinates {
     readonly accuracy: number;
     readonly altitude: number | null;
@@ -3434,7 +3723,7 @@ interface Coordinates {
     readonly speed: number | null;
 }
 
-/** The CountQueuingStrategy interface of the the Streams API provides a built-in byte length queuing strategy that can be used when constructing streams. */
+/** This Streams API interface provides a built-in byte length queuing strategy that can be used when constructing streams. */
 interface CountQueuingStrategy extends QueuingStrategy {
     highWaterMark: number;
     size(chunk: any): 1;
@@ -3445,7 +3734,29 @@ declare var CountQueuingStrategy: {
     new(options: { highWaterMark: number }): CountQueuingStrategy;
 };
 
-/** The Crypto interface represents basic cryptography features available in the current context. It allows access to a cryptographically strong random number generator and to cryptographic primitives. */
+interface Credential {
+    readonly id: string;
+    readonly type: string;
+}
+
+declare var Credential: {
+    prototype: Credential;
+    new(): Credential;
+};
+
+interface CredentialsContainer {
+    create(options?: CredentialCreationOptions): Promise<Credential | null>;
+    get(options?: CredentialRequestOptions): Promise<Credential | null>;
+    preventSilentAccess(): Promise<void>;
+    store(credential: Credential): Promise<Credential>;
+}
+
+declare var CredentialsContainer: {
+    prototype: CredentialsContainer;
+    new(): CredentialsContainer;
+};
+
+/** Basic cryptography features available in the current context. It allows access to a cryptographically strong random number generator and to cryptographic primitives. */
 interface Crypto {
     readonly subtle: SubtleCrypto;
     getRandomValues<T extends Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | null>(array: T): T;
@@ -3456,7 +3767,7 @@ declare var Crypto: {
     new(): Crypto;
 };
 
-/** The CryptoKey interface represents a cryptographic key derived from a specific key algorithm. */
+/** The CryptoKey dictionary of the Web Crypto API represents a cryptographic key. */
 interface CryptoKey {
     readonly algorithm: KeyAlgorithm;
     readonly extractable: boolean;
@@ -3469,6 +3780,7 @@ declare var CryptoKey: {
     new(): CryptoKey;
 };
 
+/** The CryptoKeyPair dictionary of the Web Crypto API represents a key pair for an asymmetric cryptography algorithm, also known as a public-key algorithm. */
 interface CryptoKeyPair {
     privateKey: CryptoKey;
     publicKey: CryptoKey;
@@ -3493,8 +3805,7 @@ declare var CustomElementRegistry: {
 
 interface CustomEvent<T = any> extends Event {
     /**
-     * Returns any custom data event was created with.
-     * Typically used for synthetic events.
+     * Returns any custom data event was created with. Typically used for synthetic events.
      */
     readonly detail: T;
     initCustomEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, detailArg: T): void;
@@ -3505,7 +3816,7 @@ declare var CustomEvent: {
     new<T>(typeArg: string, eventInitDict?: CustomEventInit<T>): CustomEvent<T>;
 };
 
-/** The DOMError interface describes an error object that contains an error name. */
+/** An error object that contains an error name. */
 interface DOMError {
     readonly name: string;
     toString(): string;
@@ -3516,7 +3827,7 @@ declare var DOMError: {
     new(): DOMError;
 };
 
-/** The DOMException interface represents an abnormal event (called an exception) which occurs as a result of calling a method or accessing a property of a web API. */
+/** An abnormal event (called an exception) which occurs as a result of calling a method or accessing a property of a web API. */
 interface DOMException {
     readonly code: number;
     readonly message: string;
@@ -3578,7 +3889,7 @@ declare var DOMException: {
     readonly WRONG_DOCUMENT_ERR: number;
 };
 
-/** The DOMImplementation interface represent an object providing methods which are not dependent on any particular document. Such an object is returned by the Document.implementation property. */
+/** An object providing methods which are not dependent on any particular document. Such an object is returned by the Document.implementation property. */
 interface DOMImplementation {
     createDocument(namespaceURI: string | null, qualifiedName: string | null, doctype: DocumentType | null): Document;
     createDocumentType(qualifiedName: string, publicId: string, systemId: string): DocumentType;
@@ -3700,7 +4011,7 @@ declare var DOMMatrixReadOnly: {
     fromMatrix(other?: DOMMatrixInit): DOMMatrixReadOnly;
 };
 
-/** The DOMParser interface provides the ability to parse XML or HTML source code from a string into a DOM Document. */
+/** Provides the ability to parse XML or HTML source code from a string into a DOM Document. */
 interface DOMParser {
     parseFromString(str: string, type: SupportedType): Document;
 }
@@ -3818,8 +4129,7 @@ interface DOMStringList {
      */
     readonly length: number;
     /**
-     * Returns true if strings contains string, and false
-     * otherwise.
+     * Returns true if strings contains string, and false otherwise.
      */
     contains(string: string): boolean;
     /**
@@ -3844,7 +4154,7 @@ declare var DOMStringMap: {
     new(): DOMStringMap;
 };
 
-/** The DOMTokenList interface represents a set of space-separated tokens. Such a set is returned by Element.classList, HTMLLinkElement.relList, HTMLAnchorElement.relList, HTMLAreaElement.relList, HTMLIframeElement.sandbox, or HTMLOutputElement.htmlFor. It is indexed beginning with 0 as with JavaScript Array objects. DOMTokenList is always case-sensitive. */
+/** A set of space-separated tokens. Such a set is returned by Element.classList, HTMLLinkElement.relList, HTMLAnchorElement.relList, HTMLAreaElement.relList, HTMLIframeElement.sandbox, or HTMLOutputElement.htmlFor. It is indexed beginning with 0 as with JavaScript Array objects. DOMTokenList is always case-sensitive. */
 interface DOMTokenList {
     /**
      * Returns the number of tokens.
@@ -3852,15 +4162,16 @@ interface DOMTokenList {
     readonly length: number;
     /**
      * Returns the associated set as string.
+     * 
      * Can be set, to change the associated attribute.
      */
     value: string;
     /**
      * Adds all arguments passed, except those already present.
-     * Throws a "SyntaxError" DOMException if one of the arguments is the empty
-     * string.
-     * Throws an "InvalidCharacterError" DOMException if one of the arguments
-     * contains any ASCII whitespace.
+     * 
+     * Throws a "SyntaxError" DOMException if one of the arguments is the empty string.
+     * 
+     * Throws an "InvalidCharacterError" DOMException if one of the arguments contains any ASCII whitespace.
      */
     add(...tokens: string[]): void;
     /**
@@ -3868,32 +4179,42 @@ interface DOMTokenList {
      */
     contains(token: string): boolean;
     /**
-     * tokenlist[index]
+     * Returns the token with index index.
      */
     item(index: number): string | null;
     /**
      * Removes arguments passed, if they are present.
-     * Throws a "SyntaxError" DOMException if one of the arguments is the empty
-     * string.
-     * Throws an "InvalidCharacterError" DOMException if one of the arguments
-     * contains any ASCII whitespace.
+     * 
+     * Throws a "SyntaxError" DOMException if one of the arguments is the empty string.
+     * 
+     * Throws an "InvalidCharacterError" DOMException if one of the arguments contains any ASCII whitespace.
      */
     remove(...tokens: string[]): void;
     /**
      * Replaces token with newToken.
+     * 
      * Returns true if token was replaced with newToken, and false otherwise.
-     * Throws a "SyntaxError" DOMException if one of the arguments is the empty
-     * string.
-     * Throws an "InvalidCharacterError" DOMException if one of the arguments
-     * contains any ASCII whitespace.
+     * 
+     * Throws a "SyntaxError" DOMException if one of the arguments is the empty string.
+     * 
+     * Throws an "InvalidCharacterError" DOMException if one of the arguments contains any ASCII whitespace.
      */
     replace(oldToken: string, newToken: string): void;
     /**
-     * Returns true if token is in the associated attribute's supported tokens. Returns
-     * false otherwise.
+     * Returns true if token is in the associated attribute's supported tokens. Returns false otherwise.
+     * 
      * Throws a TypeError if the associated attribute has no supported tokens defined.
      */
     supports(token: string): boolean;
+    /**
+     * If force is not given, "toggles" token, removing it if it's present and adding it if it's not present. If force is true, adds token (same as add()). If force is false, removes token (same as remove()).
+     * 
+     * Returns true if token is now present, and false otherwise.
+     * 
+     * Throws a "SyntaxError" DOMException if token is empty.
+     * 
+     * Throws an "InvalidCharacterError" DOMException if token contains any spaces.
+     */
     toggle(token: string, force?: boolean): boolean;
     forEach(callbackfn: (value: string, key: number, parent: DOMTokenList) => void, thisArg?: any): void;
     [index: number]: string;
@@ -3917,9 +4238,23 @@ declare var DataCue: {
     new(): DataCue;
 };
 
-/** The DataTransfer object is used to hold the data that is being dragged during a drag and drop operation. It may hold one or more data items, each of one or more data types. For more information about drag and drop, see HTML Drag and Drop API. */
+/** Used to hold the data that is being dragged during a drag and drop operation. It may hold one or more data items, each of one or more data types. For more information about drag and drop, see HTML Drag and Drop API. */
 interface DataTransfer {
+    /**
+     * Returns the kind of operation that is currently selected. If the kind of operation isn't one of those that is allowed by the effectAllowed attribute, then the operation will fail.
+     * 
+     * Can be set, to change the selected operation.
+     * 
+     * The possible values are "none", "copy", "link", and "move".
+     */
     dropEffect: string;
+    /**
+     * Returns the kinds of operations that are to be allowed.
+     * 
+     * Can be set (during the dragstart event), to change the allowed operations.
+     * 
+     * The possible values are "none", "copy", "copyLink", "copyMove", "link", "linkMove", "move", "all", and "uninitialized",
+     */
     effectAllowed: string;
     /**
      * Returns a FileList of the files being dragged, if any.
@@ -3930,8 +4265,7 @@ interface DataTransfer {
      */
     readonly items: DataTransferItemList;
     /**
-     * Returns a frozen array listing the formats that were set in the dragstart event. In addition, if any files are being
-     * dragged, then one of the types will be the string "Files".
+     * Returns a frozen array listing the formats that were set in the dragstart event. In addition, if any files are being dragged, then one of the types will be the string "Files".
      */
     readonly types: ReadonlyArray<string>;
     /**
@@ -3947,8 +4281,7 @@ interface DataTransfer {
      */
     setData(format: string, data: string): void;
     /**
-     * Uses the given element to update the drag feedback, replacing any previously specified
-     * feedback.
+     * Uses the given element to update the drag feedback, replacing any previously specified feedback.
      */
     setDragImage(image: Element, x: number, y: number): void;
 }
@@ -3958,11 +4291,10 @@ declare var DataTransfer: {
     new(): DataTransfer;
 };
 
-/** The DataTransferItem object represents one drag data item. During a drag operation, each drag event has a dataTransfer property which contains a list of drag data items. Each item in the list is a DataTransferItem object. */
+/** One drag data item. During a drag operation, each drag event has a dataTransfer property which contains a list of drag data items. Each item in the list is a DataTransferItem object. */
 interface DataTransferItem {
     /**
-     * Returns the drag data item kind, one of: "string",
-     * "file".
+     * Returns the drag data item kind, one of: "string", "file".
      */
     readonly kind: string;
     /**
@@ -3974,8 +4306,7 @@ interface DataTransferItem {
      */
     getAsFile(): File | null;
     /**
-     * Invokes the callback with the string data as the argument, if the drag data item
-     * kind is Plain Unicode string.
+     * Invokes the callback with the string data as the argument, if the drag data item kind is Plain Unicode string.
      */
     getAsString(callback: FunctionStringCallback | null): void;
     webkitGetAsEntry(): any;
@@ -3986,16 +4317,14 @@ declare var DataTransferItem: {
     new(): DataTransferItem;
 };
 
-/** The DataTransferItemList object is a list of DataTransferItem objects representing items being dragged. During a drag operation, each DragEvent has a dataTransfer property and that property is a DataTransferItemList. */
+/** A list of DataTransferItem objects representing items being dragged. During a drag operation, each DragEvent has a dataTransfer property and that property is a DataTransferItemList. */
 interface DataTransferItemList {
     /**
      * Returns the number of items in the drag data store.
      */
     readonly length: number;
     /**
-     * Adds a new entry for the given data to the drag data store. If the data is plain
-     * text  then a type string has to be provided
-     * also.
+     * Adds a new entry for the given data to the drag data store. If the data is plain text then a type string has to be provided also.
      */
     add(data: string, type: string): DataTransferItem | null;
     add(data: File): DataTransferItem | null;
@@ -4029,7 +4358,7 @@ declare var DeferredPermissionRequest: {
     new(): DeferredPermissionRequest;
 };
 
-/** The DelayNode interface represents a delay-line; an AudioNode audio-processing module that causes a delay between the arrival of an input data and its propagation to the output. */
+/** A delay-line; an AudioNode audio-processing module that causes a delay between the arrival of an input data and its propagation to the output. */
 interface DelayNode extends AudioNode {
     readonly delayTime: AudioParam;
 }
@@ -4039,7 +4368,7 @@ declare var DelayNode: {
     new(context: BaseAudioContext, options?: DelayOptions): DelayNode;
 };
 
-/** A DeviceAcceleration object provides information about the amount of acceleration the device is experiencing along all three axes. */
+/** Provides information about the amount of acceleration the device is experiencing along all three axes. */
 interface DeviceAcceleration {
     readonly x: number | null;
     readonly y: number | null;
@@ -4063,33 +4392,43 @@ declare var DeviceLightEvent: {
 
 /** The DeviceMotionEvent provides web developers with information about the speed of changes for the device's position and orientation. */
 interface DeviceMotionEvent extends Event {
-    readonly acceleration: DeviceAcceleration | null;
-    readonly accelerationIncludingGravity: DeviceAcceleration | null;
-    readonly interval: number | null;
-    readonly rotationRate: DeviceRotationRate | null;
-    initDeviceMotionEvent(type: string, bubbles: boolean, cancelable: boolean, acceleration: DeviceAccelerationDict | null, accelerationIncludingGravity: DeviceAccelerationDict | null, rotationRate: DeviceRotationRateDict | null, interval: number | null): void;
+    readonly acceleration: DeviceMotionEventAcceleration | null;
+    readonly accelerationIncludingGravity: DeviceMotionEventAcceleration | null;
+    readonly interval: number;
+    readonly rotationRate: DeviceMotionEventRotationRate | null;
 }
 
 declare var DeviceMotionEvent: {
     prototype: DeviceMotionEvent;
-    new(typeArg: string, eventInitDict?: DeviceMotionEventInit): DeviceMotionEvent;
+    new(type: string, eventInitDict?: DeviceMotionEventInit): DeviceMotionEvent;
 };
 
+interface DeviceMotionEventAcceleration {
+    readonly x: number | null;
+    readonly y: number | null;
+    readonly z: number | null;
+}
+
+interface DeviceMotionEventRotationRate {
+    readonly alpha: number | null;
+    readonly beta: number | null;
+    readonly gamma: number | null;
+}
+
 /** The DeviceOrientationEvent provides web developers with information from the physical orientation of the device running the web page. */
 interface DeviceOrientationEvent extends Event {
     readonly absolute: boolean;
     readonly alpha: number | null;
     readonly beta: number | null;
     readonly gamma: number | null;
-    initDeviceOrientationEvent(type: string, bubbles: boolean, cancelable: boolean, alpha: number | null, beta: number | null, gamma: number | null, absolute: boolean): void;
 }
 
 declare var DeviceOrientationEvent: {
     prototype: DeviceOrientationEvent;
-    new(typeArg: string, eventInitDict?: DeviceOrientationEventInit): DeviceOrientationEvent;
+    new(type: string, eventInitDict?: DeviceOrientationEventInit): DeviceOrientationEvent;
 };
 
-/** A DeviceRotationRate object provides information about the rate at which the device is rotating around all three axes. */
+/** Provides information about the rate at which the device is rotating around all three axes. */
 interface DeviceRotationRate {
     readonly alpha: number | null;
     readonly beta: number | null;
@@ -4125,12 +4464,12 @@ interface DocumentEventMap extends GlobalEventHandlersEventMap, DocumentAndEleme
     "fullscreenerror": Event;
     "pointerlockchange": Event;
     "pointerlockerror": Event;
-    "readystatechange": ProgressEvent;
+    "readystatechange": ProgressEvent<Document>;
     "visibilitychange": Event;
 }
 
-/** The Document interface represents any web page loaded in the browser and serves as an entry point into the web page's content, which is the DOM tree. */
-interface Document extends Node, NonElementParentNode, DocumentOrShadowRoot, ParentNode, GlobalEventHandlers, DocumentAndElementEventHandlers {
+/** Any web page loaded in the browser and serves as an entry point into the web page's content, which is the DOM tree. */
+interface Document extends Node, NonElementParentNode, DocumentOrShadowRoot, ParentNode, XPathEvaluatorBase, GlobalEventHandlers, DocumentAndElementEventHandlers {
     /**
      * Sets or gets the URL for the current document.
      */
@@ -4185,24 +4524,17 @@ interface Document extends Node, NonElementParentNode, DocumentOrShadowRoot, Par
      */
     readonly contentType: string;
     /**
-     * Returns the HTTP cookies that apply to the Document. If there are no cookies or
-     * cookies can't be applied to this resource, the empty string will be returned.
+     * Returns the HTTP cookies that apply to the Document. If there are no cookies or cookies can't be applied to this resource, the empty string will be returned.
+     * 
      * Can be set, to add a new cookie to the element's set of HTTP cookies.
-     * If the contents are sandboxed into a
-     * unique origin (e.g. in an iframe with the sandbox attribute), a
-     * "SecurityError" DOMException will be thrown on getting
-     * and setting.
+     * 
+     * If the contents are sandboxed into a unique origin (e.g. in an iframe with the sandbox attribute), a "SecurityError" DOMException will be thrown on getting and setting.
      */
     cookie: string;
     /**
-     * Returns the script element, or the SVG script element,
-     * that is currently executing, as long as the element represents a classic script.
-     * In the case of reentrant script execution, returns the one that most recently started executing
-     * amongst those that have not yet finished executing.
-     * Returns null if the Document is not currently executing a script
-     * or SVG script element (e.g., because the running script is an event
-     * handler, or a timeout), or if the currently executing script or SVG
-     * script element represents a module script.
+     * Returns the script element, or the SVG script element, that is currently executing, as long as the element represents a classic script. In the case of reentrant script execution, returns the one that most recently started executing amongst those that have not yet finished executing.
+     * 
+     * Returns null if the Document is not currently executing a script or SVG script element (e.g., because the running script is an event handler, or a timeout), or if the currently executing script or SVG script element represents a module script.
      */
     readonly currentScript: HTMLOrSVGScriptElement | null;
     readonly defaultView: WindowProxy | null;
@@ -4246,8 +4578,7 @@ interface Document extends Node, NonElementParentNode, DocumentOrShadowRoot, Par
     /** @deprecated */
     readonly fullscreen: boolean;
     /**
-     * Returns true if document has the ability to display elements fullscreen
-     * and fullscreen is supported, or false otherwise.
+     * Returns true if document has the ability to display elements fullscreen and fullscreen is supported, or false otherwise.
      */
     readonly fullscreenEnabled: boolean;
     /**
@@ -4292,7 +4623,7 @@ interface Document extends Node, NonElementParentNode, DocumentOrShadowRoot, Par
      * Fires when the state of the object has changed.
      * @param ev The event
      */
-    onreadystatechange: ((this: Document, ev: ProgressEvent) => any) | null;
+    onreadystatechange: ((this: Document, ev: ProgressEvent<Document>) => any) | null;
     onvisibilitychange: ((this: Document, ev: Event) => any) | null;
     /**
      * Returns document's origin.
@@ -4328,8 +4659,8 @@ interface Document extends Node, NonElementParentNode, DocumentOrShadowRoot, Par
     vlinkColor: string;
     /**
      * Moves node from another document and returns it.
-     * If node is a document, throws a "NotSupportedError" DOMException or, if node is a shadow root, throws a
-     * "HierarchyRequestError" DOMException.
+     * 
+     * If node is a document, throws a "NotSupportedError" DOMException or, if node is a shadow root, throws a "HierarchyRequestError" DOMException.
      */
     adoptNode<T extends Node>(source: T): T;
     /** @deprecated */
@@ -4371,25 +4702,22 @@ interface Document extends Node, NonElementParentNode, DocumentOrShadowRoot, Par
     createElement<K extends keyof HTMLElementDeprecatedTagNameMap>(tagName: K, options?: ElementCreationOptions): HTMLElementDeprecatedTagNameMap[K];
     createElement(tagName: string, options?: ElementCreationOptions): HTMLElement;
     /**
-     * Returns an element with namespace namespace. Its namespace prefix will be everything before ":" (U+003E) in qualifiedName or null. Its local name will be everything after
-     * ":" (U+003E) in qualifiedName or qualifiedName.
-     * If localName does not match the Name production an
-     * "InvalidCharacterError" DOMException will be thrown.
+     * Returns an element with namespace namespace. Its namespace prefix will be everything before ":" (U+003E) in qualifiedName or null. Its local name will be everything after ":" (U+003E) in qualifiedName or qualifiedName.
+     * 
+     * If localName does not match the Name production an "InvalidCharacterError" DOMException will be thrown.
+     * 
      * If one of the following conditions is true a "NamespaceError" DOMException will be thrown:
+     * 
      * localName does not match the QName production.
      * Namespace prefix is not null and namespace is the empty string.
      * Namespace prefix is "xml" and namespace is not the XML namespace.
      * qualifiedName or namespace prefix is "xmlns" and namespace is not the XMLNS namespace.
-     * namespace is the XMLNS namespace and
-     * neither qualifiedName nor namespace prefix is "xmlns".
+     * namespace is the XMLNS namespace and neither qualifiedName nor namespace prefix is "xmlns".
+     * 
      * When supplied, options's is can be used to create a customized built-in element.
      */
     createElementNS(namespaceURI: "http://www.w3.org/1999/xhtml", qualifiedName: string): HTMLElement;
     createElementNS<K extends keyof SVGElementTagNameMap>(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: K): SVGElementTagNameMap[K];
-    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "a"): SVGAElement;
-    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "script"): SVGScriptElement;
-    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "style"): SVGStyleElement;
-    createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "title"): SVGTitleElement;
     createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: string): SVGElement;
     createElementNS(namespaceURI: string | null, qualifiedName: string, options?: ElementCreationOptions): Element;
     createElementNS(namespace: string | null, qualifiedName: string, options?: string | ElementCreationOptions): Element;
@@ -4413,6 +4741,7 @@ interface Document extends Node, NonElementParentNode, DocumentOrShadowRoot, Par
     createEvent(eventInterface: "GamepadEvent"): GamepadEvent;
     createEvent(eventInterface: "HashChangeEvent"): HashChangeEvent;
     createEvent(eventInterface: "IDBVersionChangeEvent"): IDBVersionChangeEvent;
+    createEvent(eventInterface: "InputEvent"): InputEvent;
     createEvent(eventInterface: "KeyboardEvent"): KeyboardEvent;
     createEvent(eventInterface: "ListeningStateChangedEvent"): ListeningStateChangedEvent;
     createEvent(eventInterface: "MSGestureEvent"): MSGestureEvent;
@@ -4480,11 +4809,7 @@ interface Document extends Node, NonElementParentNode, DocumentOrShadowRoot, Par
      */
     createNodeIterator(root: Node, whatToShow?: number, filter?: NodeFilter | null): NodeIterator;
     /**
-     * Returns a ProcessingInstruction node whose target is target and data is data.
-     * If target does not match the Name production an
-     * "InvalidCharacterError" DOMException will be thrown.
-     * If data contains "?>" an
-     * "InvalidCharacterError" DOMException will be thrown.
+     * Returns a ProcessingInstruction node whose target is target and data is data. If target does not match the Name production an "InvalidCharacterError" DOMException will be thrown. If data contains "?>" an "InvalidCharacterError" DOMException will be thrown.
      */
     createProcessingInstruction(target: string, data: string): ProcessingInstruction;
     /**
@@ -4496,8 +4821,6 @@ interface Document extends Node, NonElementParentNode, DocumentOrShadowRoot, Par
      * @param data String that specifies the nodeValue property of the text node.
      */
     createTextNode(data: string): Text;
-    createTouch(view: WindowProxy, target: EventTarget, identifier: number, pageX: number, pageY: number, screenX: number, screenY: number): Touch;
-    createTouchList(...touches: Touch[]): TouchList;
     /**
      * Creates a TreeWalker object that you can use to traverse filtered lists of nodes or elements in a document.
      * @param root The root element or node to start traversing on.
@@ -4515,7 +4838,6 @@ interface Document extends Node, NonElementParentNode, DocumentOrShadowRoot, Par
      */
     elementFromPoint(x: number, y: number): Element | null;
     elementsFromPoint(x: number, y: number): Element[];
-    evaluate(expression: string, contextNode: Node, resolver: XPathNSResolver | ((prefix: string) => string | null) | null, type: number, result: XPathResult | null): XPathResult;
     /**
      * Executes a command on the current document, current selection, or the given range.
      * @param commandId String that specifies the command to execute. This command can be any of the command identifiers that can be executed in script.
@@ -4524,8 +4846,7 @@ interface Document extends Node, NonElementParentNode, DocumentOrShadowRoot, Par
      */
     execCommand(commandId: string, showUI?: boolean, value?: string): boolean;
     /**
-     * Stops document's fullscreen element from being displayed fullscreen and
-     * resolves promise when done.
+     * Stops document's fullscreen element from being displayed fullscreen and resolves promise when done.
      */
     exitFullscreen(): Promise<void>;
     exitPointerLock(): void;
@@ -4536,7 +4857,7 @@ interface Document extends Node, NonElementParentNode, DocumentOrShadowRoot, Par
      */
     getElementById(elementId: string): HTMLElement | null;
     /**
-     * collection = element . getElementsByClassName(classNames)
+     * Returns a HTMLCollection of the elements in the object on which the method was invoked (a document or an element) that have all the classes given by classNames. The classNames argument is interpreted as a space-separated list of classes.
      */
     getElementsByClassName(classNames: string): HTMLCollectionOf<Element>;
     /**
@@ -4552,10 +4873,12 @@ interface Document extends Node, NonElementParentNode, DocumentOrShadowRoot, Par
     getElementsByTagName<K extends keyof SVGElementTagNameMap>(qualifiedName: K): HTMLCollectionOf<SVGElementTagNameMap[K]>;
     getElementsByTagName(qualifiedName: string): HTMLCollectionOf<Element>;
     /**
-     * If namespace and localName are
-     * "*" returns a HTMLCollection of all descendant elements.
+     * If namespace and localName are "*" returns a HTMLCollection of all descendant elements.
+     * 
      * If only namespace is "*" returns a HTMLCollection of all descendant elements whose local name is localName.
+     * 
      * If only localName is "*" returns a HTMLCollection of all descendant elements whose namespace is namespace.
+     * 
      * Otherwise, returns a HTMLCollection of all descendant elements whose namespace is namespace and local name is localName.
      */
     getElementsByTagNameNS(namespaceURI: "http://www.w3.org/1999/xhtml", localName: string): HTMLCollectionOf<HTMLElement>;
@@ -4571,8 +4894,8 @@ interface Document extends Node, NonElementParentNode, DocumentOrShadowRoot, Par
     hasFocus(): boolean;
     /**
      * Returns a copy of node. If deep is true, the copy also includes the node's descendants.
-     * If node is a document or a shadow root, throws a
-     * "NotSupportedError" DOMException.
+     * 
+     * If node is a document or a shadow root, throws a "NotSupportedError" DOMException.
      */
     importNode<T extends Node>(importedNode: T, deep: boolean): T;
     /**
@@ -4668,6 +4991,7 @@ interface DocumentEvent {
     createEvent(eventInterface: "GamepadEvent"): GamepadEvent;
     createEvent(eventInterface: "HashChangeEvent"): HashChangeEvent;
     createEvent(eventInterface: "IDBVersionChangeEvent"): IDBVersionChangeEvent;
+    createEvent(eventInterface: "InputEvent"): InputEvent;
     createEvent(eventInterface: "KeyboardEvent"): KeyboardEvent;
     createEvent(eventInterface: "ListeningStateChangedEvent"): ListeningStateChangedEvent;
     createEvent(eventInterface: "MSGestureEvent"): MSGestureEvent;
@@ -4728,7 +5052,7 @@ interface DocumentEvent {
     createEvent(eventInterface: string): Event;
 }
 
-/** The DocumentFragment interface represents a minimal document object that has no parent. It is used as a lightweight version of Document that stores a segment of a document structure comprised of nodes just like a standard document. The key difference is that because the document fragment isn't part of the active document tree structure, changes made to the fragment don't affect the document, cause reflow, or incur any performance impact that can occur when changes are made. */
+/** A minimal document object that has no parent. It is used as a lightweight version of Document that stores a segment of a document structure comprised of nodes just like a standard document. The key difference is that because the document fragment isn't part of the active document tree structure, changes made to the fragment don't affect the document, cause reflow, or incur any performance impact that can occur when changes are made. */
 interface DocumentFragment extends Node, NonElementParentNode, ParentNode {
     getElementById(elementId: string): HTMLElement | null;
 }
@@ -4740,6 +5064,9 @@ declare var DocumentFragment: {
 
 interface DocumentOrShadowRoot {
     readonly activeElement: Element | null;
+    /**
+     * Returns document's fullscreen element.
+     */
     readonly fullscreenElement: Element | null;
     readonly pointerLockElement: Element | null;
     /**
@@ -4762,7 +5089,7 @@ declare var DocumentTimeline: {
     new(options?: DocumentTimelineOptions): DocumentTimeline;
 };
 
-/** The DocumentType interface represents a Node containing a doctype. */
+/** A Node containing a doctype. */
 interface DocumentType extends Node, ChildNode {
     readonly name: string;
     readonly publicId: string;
@@ -4774,7 +5101,7 @@ declare var DocumentType: {
     new(): DocumentType;
 };
 
-/** The DragEvent interface is a DOM event that represents a drag and drop interaction. The user initiates a drag by placing a pointer device (such as a mouse) on the touch surface and then dragging the pointer to a new location (such as another DOM element). Applications are free to interpret a drag and drop interaction in an application-specific way. */
+/** A DOM event that represents a drag and drop interaction. The user initiates a drag by placing a pointer device (such as a mouse) on the touch surface and then dragging the pointer to a new location (such as another DOM element). Applications are free to interpret a drag and drop interaction in an application-specific way. */
 interface DragEvent extends MouseEvent {
     /**
      * Returns the DataTransfer object for the event.
@@ -4833,17 +5160,15 @@ interface ElementEventMap {
 }
 
 /** Element is the most general base class from which all objects in a Document inherit. It only has methods and properties common to all kinds of elements. More specific classes inherit from Element. */
-interface Element extends Node, ParentNode, NonDocumentTypeChildNode, ChildNode, Slotable, Animatable {
+interface Element extends Node, ParentNode, NonDocumentTypeChildNode, ChildNode, Slotable, InnerHTML, Animatable {
     readonly assignedSlot: HTMLSlotElement | null;
     readonly attributes: NamedNodeMap;
     /**
-     * Allows for manipulation of element's class content attribute as a
-     * set of whitespace-separated tokens through a DOMTokenList object.
+     * Allows for manipulation of element's class content attribute as a set of whitespace-separated tokens through a DOMTokenList object.
      */
     readonly classList: DOMTokenList;
     /**
-     * Returns the value of element's class content attribute. Can be set
-     * to change it.
+     * Returns the value of element's class content attribute. Can be set to change it.
      */
     className: string;
     readonly clientHeight: number;
@@ -4851,11 +5176,9 @@ interface Element extends Node, ParentNode, NonDocumentTypeChildNode, ChildNode,
     readonly clientTop: number;
     readonly clientWidth: number;
     /**
-     * Returns the value of element's id content attribute. Can be set to
-     * change it.
+     * Returns the value of element's id content attribute. Can be set to change it.
      */
     id: string;
-    innerHTML: string;
     /**
      * Returns the local name.
      */
@@ -4880,8 +5203,7 @@ interface Element extends Node, ParentNode, NonDocumentTypeChildNode, ChildNode,
      */
     readonly shadowRoot: ShadowRoot | null;
     /**
-     * Returns the value of element's slot content attribute. Can be set to
-     * change it.
+     * Returns the value of element's slot content attribute. Can be set to change it.
      */
     slot: string;
     /**
@@ -4897,25 +5219,26 @@ interface Element extends Node, ParentNode, NonDocumentTypeChildNode, ChildNode,
      */
     closest<K extends keyof HTMLElementTagNameMap>(selector: K): HTMLElementTagNameMap[K] | null;
     closest<K extends keyof SVGElementTagNameMap>(selector: K): SVGElementTagNameMap[K] | null;
-    closest(selector: string): Element | null;
+    closest<E extends Element = Element>(selector: string): E | null;
     /**
      * Returns element's first attribute whose qualified name is qualifiedName, and null if there is no such attribute otherwise.
      */
     getAttribute(qualifiedName: string): string | null;
     /**
-     * Returns element's attribute whose namespace is namespace and local name is localName, and null if there is
-     * no such attribute otherwise.
+     * Returns element's attribute whose namespace is namespace and local name is localName, and null if there is no such attribute otherwise.
      */
     getAttributeNS(namespace: string | null, localName: string): string | null;
     /**
-     * Returns the qualified names of all element's attributes.
-     * Can contain duplicates.
+     * Returns the qualified names of all element's attributes. Can contain duplicates.
      */
     getAttributeNames(): string[];
     getAttributeNode(name: string): Attr | null;
     getAttributeNodeNS(namespaceURI: string, localName: string): Attr | null;
     getBoundingClientRect(): ClientRect | DOMRect;
     getClientRects(): ClientRectList | DOMRectList;
+    /**
+     * Returns a HTMLCollection of the elements in the object on which the method was invoked (a document or an element) that have all the classes given by classNames. The classNames argument is interpreted as a space-separated list of classes.
+     */
     getElementsByClassName(classNames: string): HTMLCollectionOf<Element>;
     getElementsByTagName<K extends keyof HTMLElementTagNameMap>(qualifiedName: K): HTMLCollectionOf<HTMLElementTagNameMap[K]>;
     getElementsByTagName<K extends keyof SVGElementTagNameMap>(qualifiedName: K): HTMLCollectionOf<SVGElementTagNameMap[K]>;
@@ -4956,11 +5279,8 @@ interface Element extends Node, ParentNode, NonDocumentTypeChildNode, ChildNode,
     removeAttributeNode(attr: Attr): Attr;
     /**
      * Displays element fullscreen and resolves promise when done.
-     * When supplied, options's navigationUI member indicates whether showing
-     * navigation UI while in fullscreen is preferred or not. If set to "show", navigation
-     * simplicity is preferred over screen space, and if set to "hide", more screen space
-     * is preferred. User agents are always free to honor user preference over the application's. The
-     * default value "auto" indicates no application preference.
+     * 
+     * When supplied, options's navigationUI member indicates whether showing navigation UI while in fullscreen is preferred or not. If set to "show", navigation simplicity is preferred over screen space, and if set to "hide", more screen space is preferred. User agents are always free to honor user preference over the application's. The default value "auto" indicates no application preference.
      */
     requestFullscreen(options?: FullscreenOptions): Promise<void>;
     requestPointerLock(): void;
@@ -4983,8 +5303,8 @@ interface Element extends Node, ParentNode, NonDocumentTypeChildNode, ChildNode,
     setAttributeNodeNS(attr: Attr): Attr | null;
     setPointerCapture(pointerId: number): void;
     /**
-     * If force is not given, "toggles" qualifiedName, removing it if it is
-     * present and adding it if it is not present. If force is true, adds qualifiedName. If force is false, removes qualifiedName.
+     * If force is not given, "toggles" qualifiedName, removing it if it is present and adding it if it is not present. If force is true, adds qualifiedName. If force is false, removes qualifiedName.
+     * 
      * Returns true if qualifiedName is now present, and false otherwise.
      */
     toggleAttribute(qualifiedName: string, force?: boolean): boolean;
@@ -5010,11 +5330,7 @@ interface ElementContentEditable {
     readonly isContentEditable: boolean;
 }
 
-interface ElementCreationOptions {
-    is?: string;
-}
-
-/** The ErrorEvent interface represents events providing information related to errors in scripts or in files. */
+/** Events providing information related to errors in scripts or in files. */
 interface ErrorEvent extends Event {
     readonly colno: number;
     readonly error: any;
@@ -5028,28 +5344,35 @@ declare var ErrorEvent: {
     new(type: string, eventInitDict?: ErrorEventInit): ErrorEvent;
 };
 
-/** The Event interface represents any event which takes place in the DOM; some are user-generated (such as mouse or keyboard events), while others are generated by APIs (such as events that indicate an animation has finished running, a video has been paused, and so forth). While events are usually triggered by such "external" sources, they can also be triggered programmatically, such as by calling the HTMLElement.click() method of an element, or by defining the event, then sending it to a specified target using EventTarget.dispatchEvent(). There are many types of events, some of which use other interfaces based on the main Event interface. Event itself contains the properties and methods which are common to all events. */
+/** An event which takes place in the DOM. */
 interface Event {
     /**
      * Returns true or false depending on how event was initialized. True if event goes through its target's ancestors in reverse tree order, and false otherwise.
      */
     readonly bubbles: boolean;
     cancelBubble: boolean;
+    /**
+     * Returns true or false depending on how event was initialized. Its return value does not always carry meaning, but true can indicate that part of the operation during which event was dispatched, can be canceled by invoking the preventDefault() method.
+     */
     readonly cancelable: boolean;
     /**
      * Returns true or false depending on how event was initialized. True if event invokes listeners past a ShadowRoot node that is the root of its target, and false otherwise.
      */
     readonly composed: boolean;
     /**
-     * Returns the object whose event listener's callback is currently being
-     * invoked.
+     * Returns the object whose event listener's callback is currently being invoked.
      */
     readonly currentTarget: EventTarget | null;
+    /**
+     * Returns true if preventDefault() was invoked successfully to indicate cancelation, and false otherwise.
+     */
     readonly defaultPrevented: boolean;
+    /**
+     * Returns the event's phase, which is one of NONE, CAPTURING_PHASE, AT_TARGET, and BUBBLING_PHASE.
+     */
     readonly eventPhase: number;
     /**
-     * Returns true if event was dispatched by the user agent, and
-     * false otherwise.
+     * Returns true if event was dispatched by the user agent, and false otherwise.
      */
     readonly isTrusted: boolean;
     returnValue: boolean;
@@ -5060,23 +5383,24 @@ interface Event {
      */
     readonly target: EventTarget | null;
     /**
-     * Returns the event's timestamp as the number of milliseconds measured relative to
-     * the time origin.
+     * Returns the event's timestamp as the number of milliseconds measured relative to the time origin.
      */
     readonly timeStamp: number;
     /**
-     * Returns the type of event, e.g.
-     * "click", "hashchange", or
-     * "submit".
+     * Returns the type of event, e.g. "click", "hashchange", or "submit".
      */
     readonly type: string;
+    /**
+     * Returns the invocation target objects of event's path (objects on which listeners will be invoked), except for any nodes in shadow trees of which the shadow root's mode is "closed" that are not reachable from event's currentTarget.
+     */
     composedPath(): EventTarget[];
     initEvent(type: string, bubbles?: boolean, cancelable?: boolean): void;
+    /**
+     * If invoked when the cancelable attribute value is true, and while executing a listener for the event with passive set to false, signals to the operation that caused event to be dispatched that it needs to be canceled.
+     */
     preventDefault(): void;
     /**
-     * Invoking this method prevents event from reaching
-     * any registered event listeners after the current one finishes running and, when dispatched in a tree, also prevents event from reaching any
-     * other objects.
+     * Invoking this method prevents event from reaching any registered event listeners after the current one finishes running and, when dispatched in a tree, also prevents event from reaching any other objects.
      */
     stopImmediatePropagation(): void;
     /**
@@ -5113,8 +5437,7 @@ interface EventSource extends EventTarget {
     onmessage: ((this: EventSource, ev: MessageEvent) => any) | null;
     onopen: ((this: EventSource, ev: Event) => any) | null;
     /**
-     * Returns the state of this EventSource object's connection. It can have the
-     * values described below.
+     * Returns the state of this EventSource object's connection. It can have the values described below.
      */
     readonly readyState: number;
     /**
@@ -5122,11 +5445,12 @@ interface EventSource extends EventTarget {
      */
     readonly url: string;
     /**
-     * Returns true if the credentials mode
-     * for connection requests to the URL providing the
-     * event stream is set to "include", and false otherwise.
+     * Returns true if the credentials mode for connection requests to the URL providing the event stream is set to "include", and false otherwise.
      */
     readonly withCredentials: boolean;
+    /**
+     * Aborts any instances of the fetch algorithm started for this EventSource object, and sets the readyState attribute to CLOSED.
+     */
     close(): void;
     readonly CLOSED: number;
     readonly CONNECTING: number;
@@ -5145,22 +5469,24 @@ declare var EventSource: {
     readonly OPEN: number;
 };
 
-/** EventTarget is an interface implemented by objects that can receive events and may have listeners for them. */
+/** EventTarget is a DOM interface implemented by objects that can receive events and may have listeners for them. */
 interface EventTarget {
     /**
      * Appends an event listener for events whose type attribute value is type. The callback argument sets the callback that will be invoked when the event is dispatched.
-     * The options argument sets listener-specific options. For compatibility this can be a
-     * boolean, in which case the method behaves exactly as if the value was specified as options's capture.
+     * 
+     * The options argument sets listener-specific options. For compatibility this can be a boolean, in which case the method behaves exactly as if the value was specified as options's capture.
+     * 
      * When set to true, options's capture prevents callback from being invoked when the event's eventPhase attribute value is BUBBLING_PHASE. When false (or not present), callback will not be invoked when event's eventPhase attribute value is CAPTURING_PHASE. Either way, callback will be invoked if event's eventPhase attribute value is AT_TARGET.
+     * 
      * When set to true, options's passive indicates that the callback will not cancel the event by invoking preventDefault(). This is used to enable performance optimizations described in §2.8 Observing event listeners.
-     * When set to true, options's once indicates that the callback will only be invoked once after which the event listener will
-     * be removed.
+     * 
+     * When set to true, options's once indicates that the callback will only be invoked once after which the event listener will be removed.
+     * 
      * The event listener is appended to target's event listener list and is not appended if it has the same type, callback, and capture.
      */
     addEventListener(type: string, listener: EventListenerOrEventListenerObject | null, options?: boolean | AddEventListenerOptions): void;
     /**
-     * Dispatches a synthetic event event to target and returns true
-     * if either event's cancelable attribute value is false or its preventDefault() method was not invoked, and false otherwise.
+     * Dispatches a synthetic event event to target and returns true if either event's cancelable attribute value is false or its preventDefault() method was not invoked, and false otherwise.
      */
     dispatchEvent(event: Event): boolean;
     /**
@@ -5198,7 +5524,12 @@ interface External {
     IsSearchProviderInstalled(): void;
 }
 
-/** The File interface provides information about files and allows JavaScript in a web page to access their content. */
+declare var External: {
+    prototype: External;
+    new(): External;
+};
+
+/** Provides information about files and allows JavaScript in a web page to access their content. */
 interface File extends Blob {
     readonly lastModified: number;
     readonly name: string;
@@ -5222,23 +5553,23 @@ declare var FileList: {
 };
 
 interface FileReaderEventMap {
-    "abort": ProgressEvent;
-    "error": ProgressEvent;
-    "load": ProgressEvent;
-    "loadend": ProgressEvent;
-    "loadstart": ProgressEvent;
-    "progress": ProgressEvent;
+    "abort": ProgressEvent<FileReader>;
+    "error": ProgressEvent<FileReader>;
+    "load": ProgressEvent<FileReader>;
+    "loadend": ProgressEvent<FileReader>;
+    "loadstart": ProgressEvent<FileReader>;
+    "progress": ProgressEvent<FileReader>;
 }
 
-/** The FileReader object lets web applications asynchronously read the contents of files (or raw data buffers) stored on the user's computer, using File or Blob objects to specify the file or data to read. */
+/** Lets web applications asynchronously read the contents of files (or raw data buffers) stored on the user's computer, using File or Blob objects to specify the file or data to read. */
 interface FileReader extends EventTarget {
     readonly error: DOMException | null;
-    onabort: ((this: FileReader, ev: ProgressEvent) => any) | null;
-    onerror: ((this: FileReader, ev: ProgressEvent) => any) | null;
-    onload: ((this: FileReader, ev: ProgressEvent) => any) | null;
-    onloadend: ((this: FileReader, ev: ProgressEvent) => any) | null;
-    onloadstart: ((this: FileReader, ev: ProgressEvent) => any) | null;
-    onprogress: ((this: FileReader, ev: ProgressEvent) => any) | null;
+    onabort: ((this: FileReader, ev: ProgressEvent<FileReader>) => any) | null;
+    onerror: ((this: FileReader, ev: ProgressEvent<FileReader>) => any) | null;
+    onload: ((this: FileReader, ev: ProgressEvent<FileReader>) => any) | null;
+    onloadend: ((this: FileReader, ev: ProgressEvent<FileReader>) => any) | null;
+    onloadstart: ((this: FileReader, ev: ProgressEvent<FileReader>) => any) | null;
+    onprogress: ((this: FileReader, ev: ProgressEvent<FileReader>) => any) | null;
     readonly readyState: number;
     readonly result: string | ArrayBuffer | null;
     abort(): void;
@@ -5263,15 +5594,14 @@ declare var FileReader: {
     readonly LOADING: number;
 };
 
-/** The FocusEvent interface represents focus-related events like focus, blur, focusin, or focusout. */
+/** Focus-related events like focus, blur, focusin, or focusout. */
 interface FocusEvent extends UIEvent {
-    readonly relatedTarget: EventTarget;
-    initFocusEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number, relatedTargetArg: EventTarget): void;
+    readonly relatedTarget: EventTarget | null;
 }
 
 declare var FocusEvent: {
     prototype: FocusEvent;
-    new(typeArg: string, eventInitDict?: FocusEventInit): FocusEvent;
+    new(type: string, eventInitDict?: FocusEventInit): FocusEvent;
 };
 
 interface FocusNavigationEvent extends Event {
@@ -5288,7 +5618,7 @@ declare var FocusNavigationEvent: {
     new(type: string, eventInitDict?: FocusNavigationEventInit): FocusNavigationEvent;
 };
 
-/** The FormData interface provides a way to easily construct a set of key/value pairs representing form fields and their values, which can then be easily sent using the XMLHttpRequest.send() method. It uses the same format a form would use if the encoding type were set to "multipart/form-data". */
+/** Provides a way to easily construct a set of key/value pairs representing form fields and their values, which can then be easily sent using the XMLHttpRequest.send() method. It uses the same format a form would use if the encoding type were set to "multipart/form-data". */
 interface FormData {
     append(name: string, value: string | Blob, fileName?: string): void;
     delete(name: string): void;
@@ -5304,7 +5634,7 @@ declare var FormData: {
     new(form?: HTMLFormElement): FormData;
 };
 
-/** The GainNode interface represents a change in volume. It is an AudioNode audio-processing module that causes a given gain to be applied to the input data before its propagation to the output. A GainNode always has exactly one input and one output, both with the same number of channels. */
+/** A change in volume. It is an AudioNode audio-processing module that causes a given gain to be applied to the input data before its propagation to the output. A GainNode always has exactly one input and one output, both with the same number of channels. */
 interface GainNode extends AudioNode {
     readonly gain: AudioParam;
 }
@@ -5314,7 +5644,7 @@ declare var GainNode: {
     new(context: BaseAudioContext, options?: GainOptions): GainNode;
 };
 
-/** The Gamepad interface of the Gamepad API defines an individual gamepad or other controller, allowing access to information such as button presses, axis positions, and id. */
+/** This Gamepad API interface defines an individual gamepad or other controller, allowing access to information such as button presses, axis positions, and id. */
 interface Gamepad {
     readonly axes: ReadonlyArray<number>;
     readonly buttons: ReadonlyArray<GamepadButton>;
@@ -5333,7 +5663,7 @@ declare var Gamepad: {
     new(): Gamepad;
 };
 
-/** The GamepadButton interface defines an individual button of a gamepad or other controller, allowing access to the current state of different types of buttons available on the control device. */
+/** An individual button of a gamepad or other controller, allowing access to the current state of different types of buttons available on the control device. */
 interface GamepadButton {
     readonly pressed: boolean;
     readonly touched: boolean;
@@ -5345,7 +5675,7 @@ declare var GamepadButton: {
     new(): GamepadButton;
 };
 
-/** The GamepadEvent interface of the Gamepad API contains references to gamepads connected to the system, which is what the gamepad events Window.gamepadconnected and Window.gamepaddisconnected are fired in response to. */
+/** This Gamepad API interface contains references to gamepads connected to the system, which is what the gamepad events Window.gamepadconnected and Window.gamepaddisconnected are fired in response to. */
 interface GamepadEvent extends Event {
     readonly gamepad: Gamepad;
 }
@@ -5355,7 +5685,7 @@ declare var GamepadEvent: {
     new(type: string, eventInitDict: GamepadEventInit): GamepadEvent;
 };
 
-/** The GamepadHapticActuator interface of the Gamepad API represents hardware in the controller designed to provide haptic feedback to the user (if available), most commonly vibration hardware. */
+/** This Gamepad API interface represents hardware in the controller designed to provide haptic feedback to the user (if available), most commonly vibration hardware. */
 interface GamepadHapticActuator {
     readonly type: GamepadHapticActuatorType;
     pulse(value: number, duration: number): Promise<boolean>;
@@ -5366,7 +5696,7 @@ declare var GamepadHapticActuator: {
     new(): GamepadHapticActuator;
 };
 
-/** The GamepadPose interface of the Gamepad API represents the pose of a WebVR controller at a given timestamp (which includes orientation, position, velocity, and acceleration information.) */
+/** This Gamepad API interface represents the pose of a WebVR controller at a given timestamp (which includes orientation, position, velocity, and acceleration information.) */
 interface GamepadPose {
     readonly angularAcceleration: Float32Array | null;
     readonly angularVelocity: Float32Array | null;
@@ -5383,7 +5713,29 @@ declare var GamepadPose: {
     new(): GamepadPose;
 };
 
-/** The Geolocation interface represents an object able to programmatically obtain the position of the device. It gives Web content access to the location of the device. This allows a Web site or app to offer customized results based on the user's location. */
+interface GenericTransformStream {
+    /**
+     * Returns a readable stream whose chunks are strings resulting from running encoding's decoder on the chunks written to writable.
+     */
+    readonly readable: ReadableStream;
+    /**
+     * Returns a writable stream which accepts BufferSource chunks and runs them through encoding's decoder before making them available to readable.
+     * 
+     * Typically this will be used via the pipeThrough() method on a ReadableStream source.
+     * 
+     * ```
+     * var decoder = new TextDecoderStream(encoding);
+     * byteReadable
+     *   .pipeThrough(decoder)
+     *   .pipeTo(textWritable);
+     * ```
+     * 
+     * If the error mode is "fatal" and encoding's decoder returns error, both readable and writable will be errored with a TypeError.
+     */
+    readonly writable: WritableStream;
+}
+
+/** An object able to programmatically obtain the position of the device. It gives Web content access to the location of the device. This allows a Web site or app to offer customized results based on the user's location. */
 interface Geolocation {
     clearWatch(watchId: number): void;
     getCurrentPosition(successCallback: PositionCallback, errorCallback?: PositionErrorCallback, options?: PositionOptions): void;
@@ -5396,7 +5748,7 @@ interface GlobalEventHandlersEventMap {
     "animationend": AnimationEvent;
     "animationiteration": AnimationEvent;
     "animationstart": AnimationEvent;
-    "auxclick": Event;
+    "auxclick": MouseEvent;
     "blur": FocusEvent;
     "cancel": Event;
     "canplay": Event;
@@ -5420,6 +5772,8 @@ interface GlobalEventHandlersEventMap {
     "ended": Event;
     "error": ErrorEvent;
     "focus": FocusEvent;
+    "focusin": FocusEvent;
+    "focusout": FocusEvent;
     "gotpointercapture": PointerEvent;
     "input": Event;
     "invalid": Event;
@@ -5489,7 +5843,7 @@ interface GlobalEventHandlers {
     onanimationend: ((this: GlobalEventHandlers, ev: AnimationEvent) => any) | null;
     onanimationiteration: ((this: GlobalEventHandlers, ev: AnimationEvent) => any) | null;
     onanimationstart: ((this: GlobalEventHandlers, ev: AnimationEvent) => any) | null;
-    onauxclick: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+    onauxclick: ((this: GlobalEventHandlers, ev: MouseEvent) => any) | null;
     /**
      * Fires when the object loses the input focus.
      * @param ev The focus event.
@@ -5752,21 +6106,21 @@ interface GlobalEventHandlers {
     removeEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | EventListenerOptions): void;
 }
 
-interface GlobalFetch {
-    fetch(input: RequestInfo, init?: RequestInit): Promise<Response>;
-}
-
 interface HTMLAllCollection {
     /**
      * Returns the number of elements in the collection.
      */
     readonly length: number;
     /**
-     * element = collection(index)
+     * Returns the item with index index from the collection (determined by tree order).
      */
     item(nameOrIndex?: string): HTMLCollection | Element | null;
     /**
-     * element = collection(name)
+     * Returns the item with ID or name name from the collection.
+     * 
+     * If there are multiple matching items, then an HTMLCollection object containing all those elements is returned.
+     * 
+     * Only button, form, iframe, input, map, meta, object, select, and textarea elements can have a name for the purpose of this method; their name is given by the value of their name attribute.
      */
     namedItem(name: string): HTMLCollection | Element | null;
     [index: number]: Element;
@@ -5777,7 +6131,7 @@ declare var HTMLAllCollection: {
     new(): HTMLAllCollection;
 };
 
-/** The HTMLAnchorElement interface represents hyperlink elements and provides special properties and methods (beyond those of the regular HTMLElement object interface that they inherit from) for manipulating the layout and presentation of such elements. */
+/** Hyperlink elements and provides special properties and methods (beyond those of the regular HTMLElement object interface that they inherit from) for manipulating the layout and presentation of such elements. */
 interface HTMLAnchorElement extends HTMLElement, HTMLHyperlinkElementUtils {
     /**
      * Sets or retrieves the character set used to encode the object.
@@ -5886,7 +6240,7 @@ declare var HTMLAppletElement: {
     new(): HTMLAppletElement;
 };
 
-/** The HTMLAreaElement interface provides special properties and methods (beyond those of the regular object HTMLElement interface it also has available to it by inheritance) for manipulating the layout and presentation of area elements. */
+/** Provides special properties and methods (beyond those of the regular object HTMLElement interface it also has available to it by inheritance) for manipulating the layout and presentation of <area> elements. */
 interface HTMLAreaElement extends HTMLElement, HTMLHyperlinkElementUtils {
     /**
      * Sets or retrieves a text alternative to the graphic.
@@ -5925,7 +6279,7 @@ declare var HTMLAreaElement: {
     new(): HTMLAreaElement;
 };
 
-/** The HTMLAudioElement interface provides access to the properties of <audio> elements, as well as methods to manipulate them. It derives from the HTMLMediaElement interface. */
+/** Provides access to the properties of <audio> elements, as well as methods to manipulate them. It derives from the HTMLMediaElement interface. */
 interface HTMLAudioElement extends HTMLMediaElement {
     addEventListener<K extends keyof HTMLMediaElementEventMap>(type: K, listener: (this: HTMLAudioElement, ev: HTMLMediaElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
@@ -5938,7 +6292,7 @@ declare var HTMLAudioElement: {
     new(): HTMLAudioElement;
 };
 
-/** The HTMLBRElement interface represents a HTML line break element (<br>). It inherits from HTMLElement. */
+/** A HTML line break element (<br>). It inherits from HTMLElement. */
 interface HTMLBRElement extends HTMLElement {
     /**
      * Sets or retrieves the side on which floating objects are not to be positioned when any IHTMLBlockElement is inserted into the document.
@@ -5956,7 +6310,7 @@ declare var HTMLBRElement: {
     new(): HTMLBRElement;
 };
 
-/** The HTMLBaseElement interface contains the base URI for a document. This object inherits all of the properties and methods as described in the HTMLElement interface. */
+/** Contains the base URI for a document. This object inherits all of the properties and methods as described in the HTMLElement interface. */
 interface HTMLBaseElement extends HTMLElement {
     /**
      * Gets or sets the baseline URL on which relative links are based.
@@ -5977,7 +6331,7 @@ declare var HTMLBaseElement: {
     new(): HTMLBaseElement;
 };
 
-/** The HTMLBaseFontElement interface provides special properties (beyond the regular HTMLElement interface it also has available to it by inheritance) for manipulating <basefont> elements. */
+/** Provides special properties (beyond the regular HTMLElement interface it also has available to it by inheritance) for manipulating <basefont> elements. */
 interface HTMLBaseFontElement extends HTMLElement, DOML2DeprecatedColorProperty {
     /**
      * Sets or retrieves the current typeface family.
@@ -6004,7 +6358,7 @@ interface HTMLBodyElementEventMap extends HTMLElementEventMap, WindowEventHandle
     "orientationchange": Event;
 }
 
-/** The HTMLBodyElement interface provides special properties (beyond those of the regular HTMLElement interface they also inherit) for manipulating body elements. */
+/** Provides special properties (beyond those inherited from the regular HTMLElement interface) for manipulating <body> elements. */
 interface HTMLBodyElement extends HTMLElement, WindowEventHandlers {
     /** @deprecated */
     aLink: string;
@@ -6034,7 +6388,7 @@ declare var HTMLBodyElement: {
     new(): HTMLBodyElement;
 };
 
-/** The HTMLButtonElement interface provides properties and methods (beyond the <button> object interface it also has available to them by inheritance) for manipulating the layout and presentation of button elements. */
+/** Provides properties and methods (beyond the regular HTMLElement interface it also has available to it by inheritance) for manipulating <button> elements. */
 interface HTMLButtonElement extends HTMLElement {
     /**
      * Provides a way to direct a user to a specific field when a document loads. This can provide both direction and convenience for a user, reducing the need to click or tab to a field when a page opens. This attribute is true when present on an element, and false when missing.
@@ -6111,7 +6465,7 @@ declare var HTMLButtonElement: {
     new(): HTMLButtonElement;
 };
 
-/** The HTMLCanvasElement interface provides properties and methods for manipulating the layout and presentation of <canvas> elements. The HTMLCanvasElement interface also inherits the properties and methods of the HTMLElement interface. */
+/** Provides properties and methods for manipulating the layout and presentation of <canvas> elements. The HTMLCanvasElement interface also inherits the properties and methods of the HTMLElement interface. */
 interface HTMLCanvasElement extends HTMLElement {
     /**
      * Gets or sets the height of a canvas element on a document.
@@ -6125,15 +6479,18 @@ interface HTMLCanvasElement extends HTMLElement {
      * Returns an object that provides methods and properties for drawing and manipulating images and graphics on a canvas element in a document. A context object includes information about colors, line widths, fonts, and other graphic parameters that can be drawn on a canvas.
      * @param contextId The identifier (ID) of the type of canvas to create. Internet Explorer 9 and Internet Explorer 10 support only a 2-D context using canvas.getContext("2d"); IE11 Preview also supports 3-D or WebGL context using canvas.getContext("experimental-webgl");
      */
-    getContext(contextId: "2d", contextAttributes?: CanvasRenderingContext2DSettings): CanvasRenderingContext2D | null;
-    getContext(contextId: "webgl" | "experimental-webgl", contextAttributes?: WebGLContextAttributes): WebGLRenderingContext | null;
-    getContext(contextId: string, contextAttributes?: {}): CanvasRenderingContext2D | WebGLRenderingContext | null;
+    getContext(contextId: "2d", options?: CanvasRenderingContext2DSettings): CanvasRenderingContext2D | null;
+    getContext(contextId: "bitmaprenderer", options?: ImageBitmapRenderingContextSettings): ImageBitmapRenderingContext | null;
+    getContext(contextId: "webgl", options?: WebGLContextAttributes): WebGLRenderingContext | null;
+    getContext(contextId: "webgl2", options?: WebGLContextAttributes): WebGL2RenderingContext | null;
+    getContext(contextId: string, options?: any): RenderingContext | null;
     toBlob(callback: BlobCallback, type?: string, quality?: any): void;
     /**
      * Returns the content of the current canvas as an image that you can use as a source for another canvas or an HTML element.
      * @param type The standard MIME type for the image format to return. If you do not specify this parameter, the default value is a PNG format image.
      */
     toDataURL(type?: string, quality?: any): string;
+    transferControlToOffscreen(): OffscreenCanvas;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLCanvasElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLCanvasElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -6145,7 +6502,7 @@ declare var HTMLCanvasElement: {
     new(): HTMLCanvasElement;
 };
 
-/** The HTMLCollection interface represents a generic collection (array-like object similar to arguments) of elements (in document order) and offers methods and properties for selecting from the list. */
+/** A generic collection (array-like object similar to arguments) of elements (in document order) and offers methods and properties for selecting from the list. */
 interface HTMLCollectionBase {
     /**
      * Sets or retrieves the number of objects in a collection.
@@ -6176,7 +6533,7 @@ interface HTMLCollectionOf<T extends Element> extends HTMLCollectionBase {
     [index: number]: T;
 }
 
-/** The HTMLDListElement interface provides special properties (beyond those of the regular HTMLElement interface it also has available to it by inheritance) for manipulating definition list elements. */
+/** Provides special properties (beyond those of the regular HTMLElement interface it also has available to it by inheritance) for manipulating definition list (<dl>) elements. */
 interface HTMLDListElement extends HTMLElement {
     /** @deprecated */
     compact: boolean;
@@ -6191,7 +6548,7 @@ declare var HTMLDListElement: {
     new(): HTMLDListElement;
 };
 
-/** The HTMLDataElement interface provides special properties (beyond the regular HTMLElement interface it also has available to it by inheritance) for manipulating <data> elements. */
+/** Provides special properties (beyond the regular HTMLElement interface it also has available to it by inheritance) for manipulating <data> elements. */
 interface HTMLDataElement extends HTMLElement {
     value: string;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLDataElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
@@ -6205,7 +6562,7 @@ declare var HTMLDataElement: {
     new(): HTMLDataElement;
 };
 
-/** The HTMLDataListElement interface provides special properties (beyond the HTMLElement object interface it also has available to it by inheritance) to manipulate <datalist> elements and their content. */
+/** Provides special properties (beyond the HTMLElement object interface it also has available to it by inheritance) to manipulate <datalist> elements and their content. */
 interface HTMLDataListElement extends HTMLElement {
     readonly options: HTMLCollectionOf<HTMLOptionElement>;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLDataListElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
@@ -6263,7 +6620,7 @@ declare var HTMLDirectoryElement: {
     new(): HTMLDirectoryElement;
 };
 
-/** The HTMLDivElement interface provides special properties (beyond the regular HTMLElement interface it also has available to it by inheritance) for manipulating <div> elements. */
+/** Provides special properties (beyond the regular HTMLElement interface it also has available to it by inheritance) for manipulating <div> elements. */
 interface HTMLDivElement extends HTMLElement {
     /**
      * Sets or retrieves how the object is aligned with adjacent text.
@@ -6297,7 +6654,7 @@ declare var HTMLDocument: {
 interface HTMLElementEventMap extends ElementEventMap, GlobalEventHandlersEventMap, DocumentAndElementEventHandlersEventMap {
 }
 
-/** The HTMLElement interface represents any HTML element. Some elements directly implement this interface, others implement it via an interface that inherits it. */
+/** Any HTML element. Some elements directly implement this interface, while others implement it via an interface that inherits it. */
 interface HTMLElement extends Element, GlobalEventHandlers, DocumentAndElementEventHandlers, ElementContentEditable, HTMLOrSVGElement, ElementCSSInlineStyle {
     accessKey: string;
     readonly accessKeyLabel: string;
@@ -6327,7 +6684,7 @@ declare var HTMLElement: {
     new(): HTMLElement;
 };
 
-/** The HTMLEmbedElement interface, which provides special properties (beyond the regular HTMLElement interface it also has available to it by inheritance) for manipulating <embed> elements. */
+/** Provides special properties (beyond the regular HTMLElement interface it also has available to it by inheritance) for manipulating <embed> elements. */
 interface HTMLEmbedElement extends HTMLElement {
     /** @deprecated */
     align: string;
@@ -6361,7 +6718,7 @@ declare var HTMLEmbedElement: {
     new(): HTMLEmbedElement;
 };
 
-/** The HTMLFieldSetElement interface has special properties and methods (beyond the regular HTMLElement interface it also has available to it by inheritance) for manipulating the layout and presentation of field-set elements. */
+/** Provides special properties and methods (beyond the regular HTMLElement interface it also has available to it by inheritance) for manipulating the layout and presentation of <fieldset> elements. */
 interface HTMLFieldSetElement extends HTMLElement {
     disabled: boolean;
     readonly elements: HTMLCollection;
@@ -6426,10 +6783,12 @@ declare var HTMLFontElement: {
     new(): HTMLFontElement;
 };
 
-/** The HTMLFormControlsCollection interface represents a collection of HTML form control elements.  */
+/** A collection of HTML form control elements.  */
 interface HTMLFormControlsCollection extends HTMLCollectionBase {
     /**
-     * element = collection[name]
+     * Returns the item with ID or name name from the collection.
+     * 
+     * If there are multiple matching items, then a RadioNodeList object containing all those elements is returned.
      */
     namedItem(name: string): RadioNodeList | Element | null;
 }
@@ -6439,7 +6798,7 @@ declare var HTMLFormControlsCollection: {
     new(): HTMLFormControlsCollection;
 };
 
-/** The HTMLFormElement interface represents a <form> element in the DOM; it allows access to and in some cases modification of aspects of the form, as well as access to its component elements. */
+/** A <form> element in the DOM; it allows access to and in some cases modification of aspects of the form, as well as access to its component elements. */
 interface HTMLFormElement extends HTMLElement {
     /**
      * Sets or retrieves a list of character encodings for input data that must be accepted by the server processing the form.
@@ -6576,7 +6935,7 @@ declare var HTMLFrameElement: {
 interface HTMLFrameSetElementEventMap extends HTMLElementEventMap, WindowEventHandlersEventMap {
 }
 
-/** The HTMLFrameSetElement interface provides special properties (beyond those of the regular HTMLElement interface they also inherit) for manipulating <frameset> elements. */
+/** Provides special properties (beyond those of the regular HTMLElement interface they also inherit) for manipulating <frameset> elements. */
 interface HTMLFrameSetElement extends HTMLElement, WindowEventHandlers {
     /**
      * Sets or retrieves the frame widths of the object.
@@ -6599,7 +6958,7 @@ declare var HTMLFrameSetElement: {
     new(): HTMLFrameSetElement;
 };
 
-/** The HTMLHRElement interface provides special properties (beyond those of the HTMLElement interface it also has available to it by inheritance) for manipulating <hr> elements. */
+/** Provides special properties (beyond those of the HTMLElement interface it also has available to it by inheritance) for manipulating <hr> elements. */
 interface HTMLHRElement extends HTMLElement {
     /**
      * Sets or retrieves how the object is aligned with adjacent text.
@@ -6631,7 +6990,7 @@ declare var HTMLHRElement: {
     new(): HTMLHRElement;
 };
 
-/** The HTMLHeadElement interface contains the descriptive information, or metadata, for a document. This object inherits all of the properties and methods described in the HTMLElement interface. */
+/** Contains the descriptive information, or metadata, for a document. This object inherits all of the properties and methods described in the HTMLElement interface. */
 interface HTMLHeadElement extends HTMLElement {
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLHeadElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
@@ -6644,7 +7003,7 @@ declare var HTMLHeadElement: {
     new(): HTMLHeadElement;
 };
 
-/** The HTMLHeadingElement interface represents the different heading elements. It inherits methods and properties from the HTMLElement interface. */
+/** The different heading elements. It inherits methods and properties from the HTMLElement interface. */
 interface HTMLHeadingElement extends HTMLElement {
     /**
      * Sets or retrieves a value that indicates the table alignment.
@@ -6662,7 +7021,7 @@ declare var HTMLHeadingElement: {
     new(): HTMLHeadingElement;
 };
 
-/** The HTMLHtmlElement interface serves as the root node for a given HTML document. This object inherits the properties and methods described in the HTMLElement interface. */
+/** Serves as the root node for a given HTML document. This object inherits the properties and methods described in the HTMLElement interface. */
 interface HTMLHtmlElement extends HTMLElement {
     /**
      * Sets or retrieves the DTD version that governs the current document.
@@ -6694,7 +7053,7 @@ interface HTMLHyperlinkElementUtils {
     username: string;
 }
 
-/** The HTMLIFrameElement interface provides special properties and methods (beyond those of the HTMLElement interface it also has available to it by inheritance) for manipulating the layout and presentation of inline frame elements. */
+/** Provides special properties and methods (beyond those of the HTMLElement interface it also has available to it by inheritance) for manipulating the layout and presentation of inline frame elements. */
 interface HTMLIFrameElement extends HTMLElement {
     /**
      * Sets or retrieves how the object is aligned with adjacent text.
@@ -6771,7 +7130,7 @@ declare var HTMLIFrameElement: {
     new(): HTMLIFrameElement;
 };
 
-/** The HTMLImageElement interface provides special properties and methods  for manipulating the layout and presentation of <img> elements. */
+/** Provides special properties and methods for manipulating <img> elements. */
 interface HTMLImageElement extends HTMLElement {
     /**
      * Sets or retrieves how the object is aligned with adjacent text.
@@ -6861,7 +7220,7 @@ declare var HTMLImageElement: {
     new(): HTMLImageElement;
 };
 
-/** The HTMLInputElement interface provides special properties and methods for manipulating the options, layout, and presentation of <input> elements. */
+/** Provides special properties and methods for manipulating the options, layout, and presentation of <input> elements. */
 interface HTMLInputElement extends HTMLElement {
     /**
      * Sets or retrieves a comma-separated list of content types.
@@ -7009,7 +7368,10 @@ interface HTMLInputElement extends HTMLElement {
      * Returns the value of the data at the cursor's current position.
      */
     value: string;
-    valueAsDate: any;
+    /**
+     * Returns a Date object representing the form control's value, if applicable; otherwise, returns null. Can be set, to change the value. Throws an "InvalidStateError" DOMException if the control isn't date- or time-based.
+     */
+    valueAsDate: Date | null;
     /**
      * Returns the input field value as a number.
      */
@@ -7066,7 +7428,7 @@ declare var HTMLInputElement: {
     new(): HTMLInputElement;
 };
 
-/** The HTMLLIElement interface exposes specific properties and methods (beyond those defined by regular HTMLElement interface it also has available to it by inheritance) for manipulating list elements. */
+/** Exposes specific properties and methods (beyond those defined by regular HTMLElement interface it also has available to it by inheritance) for manipulating list elements. */
 interface HTMLLIElement extends HTMLElement {
     /** @deprecated */
     type: string;
@@ -7085,7 +7447,7 @@ declare var HTMLLIElement: {
     new(): HTMLLIElement;
 };
 
-/** The HTMLLabelElement interface gives access to properties specific to <label> elements. It inherits methods and properties from the base HTMLElement interface. */
+/** Gives access to properties specific to <label> elements. It inherits methods and properties from the base HTMLElement interface. */
 interface HTMLLabelElement extends HTMLElement {
     readonly control: HTMLElement | null;
     /**
@@ -7126,7 +7488,7 @@ declare var HTMLLegendElement: {
     new(): HTMLLegendElement;
 };
 
-/** The HTMLLinkElement interface represents reference information for external resources and the relationship of those resources to a document and vice-versa. This object inherits all of the properties and methods of the HTMLElement interface. */
+/** Reference information for external resources and the relationship of those resources to a document and vice-versa. This object inherits all of the properties and methods of the HTMLElement interface. */
 interface HTMLLinkElement extends HTMLElement, LinkStyle {
     as: string;
     /**
@@ -7144,6 +7506,8 @@ interface HTMLLinkElement extends HTMLElement, LinkStyle {
      * Sets or retrieves the language code of the object.
      */
     hreflang: string;
+    imageSizes: string;
+    imageSrcset: string;
     integrity: string;
     /**
      * Sets or retrieves the media type.
@@ -7181,19 +7545,7 @@ declare var HTMLLinkElement: {
     new(): HTMLLinkElement;
 };
 
-interface HTMLMainElement extends HTMLElement {
-    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLMainElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
-    removeEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLMainElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
-    removeEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | EventListenerOptions): void;
-}
-
-declare var HTMLMainElement: {
-    prototype: HTMLMainElement;
-    new(): HTMLMainElement;
-};
-
-/** The HTMLMapElement interface provides special properties and methods (beyond those of the regular object HTMLElement interface it also has available to it by inheritance) for manipulating the layout and presentation of map elements. */
+/** Provides special properties and methods (beyond those of the regular object HTMLElement interface it also has available to it by inheritance) for manipulating the layout and presentation of map elements. */
 interface HTMLMapElement extends HTMLElement {
     /**
      * Retrieves a collection of the area objects defined for the given map object.
@@ -7220,7 +7572,7 @@ interface HTMLMarqueeElementEventMap extends HTMLElementEventMap {
     "start": Event;
 }
 
-/** The HTMLMarqueeElement interface provides methods to manipulate <marquee> elements. */
+/** Provides methods to manipulate <marquee> elements. */
 interface HTMLMarqueeElement extends HTMLElement {
     /** @deprecated */
     behavior: string;
@@ -7271,7 +7623,7 @@ interface HTMLMediaElementEventMap extends HTMLElementEventMap {
     "waitingforkey": Event;
 }
 
-/** The HTMLMediaElement interface adds to HTMLElement the properties and methods needed to support basic media-related capabilities that are common to audio and video. */
+/** Adds to HTMLElement the properties and methods needed to support basic media-related capabilities that are common to audio and video. */
 interface HTMLMediaElement extends HTMLElement {
     /**
      * Returns an AudioTrackList object with the audio tracks for a given video element.
@@ -7478,7 +7830,7 @@ declare var HTMLMenuElement: {
     new(): HTMLMenuElement;
 };
 
-/** The HTMLMetaElement interface contains descriptive metadata about a document. It inherits all of the properties and methods described in the HTMLElement interface. */
+/** Contains descriptive metadata about a document. It inherits all of the properties and methods described in the HTMLElement interface. */
 interface HTMLMetaElement extends HTMLElement {
     /**
      * Gets or sets meta-information to associate with httpEquiv or name.
@@ -7528,7 +7880,7 @@ declare var HTMLMeterElement: {
     new(): HTMLMeterElement;
 };
 
-/** The HTMLModElement interface provides special properties (beyond the regular methods and properties available through the HTMLElement interface they also have available to them by inheritance) for manipulating modification elements, that is <del> and <ins>. */
+/** Provides special properties (beyond the regular methods and properties available through the HTMLElement interface they also have available to them by inheritance) for manipulating modification elements, that is <del> and <ins>. */
 interface HTMLModElement extends HTMLElement {
     /**
      * Sets or retrieves reference information about the object.
@@ -7549,7 +7901,7 @@ declare var HTMLModElement: {
     new(): HTMLModElement;
 };
 
-/** The HTMLOListElement interface provides special properties (beyond those defined on the regular HTMLElement interface it also has available to it by inheritance) for manipulating ordered list elements. */
+/** Provides special properties (beyond those defined on the regular HTMLElement interface it also has available to it by inheritance) for manipulating ordered list elements. */
 interface HTMLOListElement extends HTMLElement {
     /** @deprecated */
     compact: boolean;
@@ -7570,7 +7922,7 @@ declare var HTMLOListElement: {
     new(): HTMLOListElement;
 };
 
-/** The HTMLObjectElement interface provides special properties and methods (beyond those on the HTMLElement interface it also has available to it by inheritance) for manipulating the layout and presentation of <object> element, representing external resources. */
+/** Provides special properties and methods (beyond those on the HTMLElement interface it also has available to it by inheritance) for manipulating the layout and presentation of <object> element, representing external resources. */
 interface HTMLObjectElement extends HTMLElement {
     /** @deprecated */
     align: string;
@@ -7630,7 +7982,6 @@ interface HTMLObjectElement extends HTMLElement {
      * Sets or retrieves the MIME type of the object.
      */
     type: string;
-    typeMustMatch: boolean;
     /**
      * Sets or retrieves the URL, often with a bookmark extension (#name), to use as a client-side image map.
      */
@@ -7675,7 +8026,7 @@ declare var HTMLObjectElement: {
     new(): HTMLObjectElement;
 };
 
-/** The HTMLOptGroupElement interface provides special properties and methods (beyond the regular HTMLElement object interface they also have available to them by inheritance) for manipulating the layout and presentation of <optgroup> elements. */
+/** Provides special properties and methods (beyond the regular HTMLElement object interface they also have available to them by inheritance) for manipulating the layout and presentation of <optgroup> elements. */
 interface HTMLOptGroupElement extends HTMLElement {
     disabled: boolean;
     /**
@@ -7697,7 +8048,7 @@ declare var HTMLOptGroupElement: {
     new(): HTMLOptGroupElement;
 };
 
-/** The HTMLOptionElement interface represents <option> elements and inherits all classes and methods of the HTMLElement interface. */
+/** <option> elements and inherits all classes and methods of the HTMLElement interface. */
 interface HTMLOptionElement extends HTMLElement {
     /**
      * Sets or retrieves the status of an option.
@@ -7743,23 +8094,26 @@ declare var HTMLOptionElement: {
 interface HTMLOptionsCollection extends HTMLCollectionOf<HTMLOptionElement> {
     /**
      * Returns the number of elements in the collection.
+     * 
      * When set to a smaller number, truncates the number of option elements in the corresponding container.
+     * 
      * When set to a greater number, adds new blank option elements to that container.
      */
     length: number;
     /**
-     * Returns the index of the first selected item, if any, or −1 if there is no selected
-     * item.
+     * Returns the index of the first selected item, if any, or −1 if there is no selected item.
+     * 
      * Can be set, to change the selection.
      */
     selectedIndex: number;
     /**
      * Inserts element before the node given by before.
-     * The before argument can be a number, in which case element is inserted before the item with that number, or an element from the
-     * collection, in which case element is inserted before that element.
+     * 
+     * The before argument can be a number, in which case element is inserted before the item with that number, or an element from the collection, in which case element is inserted before that element.
+     * 
      * If before is omitted, null, or a number out of range, then element will be added at the end of the list.
-     * This method will throw a "HierarchyRequestError" DOMException if
-     * element is an ancestor of the element into which it is to be inserted.
+     * 
+     * This method will throw a "HierarchyRequestError" DOMException if element is an ancestor of the element into which it is to be inserted.
      */
     add(element: HTMLOptionElement | HTMLOptGroupElement, before?: HTMLElement | number | null): void;
     /**
@@ -7781,7 +8135,7 @@ interface HTMLOrSVGElement {
     focus(options?: FocusOptions): void;
 }
 
-/** The HTMLOutputElement interface provides properties and methods (beyond those inherited from HTMLElement) for manipulating the layout and presentation of <output> elements. */
+/** Provides properties and methods (beyond those inherited from HTMLElement) for manipulating the layout and presentation of <output> elements. */
 interface HTMLOutputElement extends HTMLElement {
     defaultValue: string;
     readonly form: HTMLFormElement | null;
@@ -7807,7 +8161,7 @@ declare var HTMLOutputElement: {
     new(): HTMLOutputElement;
 };
 
-/** The HTMLParagraphElement interface provides special properties (beyond those of the regular HTMLElement object interface it inherits) for manipulating <p> elements. */
+/** Provides special properties (beyond those of the regular HTMLElement object interface it inherits) for manipulating <p> elements. */
 interface HTMLParagraphElement extends HTMLElement {
     /**
      * Sets or retrieves how the object is aligned with adjacent text.
@@ -7825,7 +8179,7 @@ declare var HTMLParagraphElement: {
     new(): HTMLParagraphElement;
 };
 
-/** The HTMLParamElement interface provides special properties (beyond those of the regular HTMLElement object interface it inherits) for manipulating <param> elements, representing a pair of a key and a value that acts as a parameter for an <object> element. */
+/** Provides special properties (beyond those of the regular HTMLElement object interface it inherits) for manipulating <param> elements, representing a pair of a key and a value that acts as a parameter for an <object> element. */
 interface HTMLParamElement extends HTMLElement {
     /**
      * Sets or retrieves the name of an input parameter for an element.
@@ -7856,7 +8210,7 @@ declare var HTMLParamElement: {
     new(): HTMLParamElement;
 };
 
-/** The HTMLPictureElement interface represents a <picture> HTML element. It doesn't implement specific properties or methods. */
+/** A <picture> HTML element. It doesn't implement specific properties or methods. */
 interface HTMLPictureElement extends HTMLElement {
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLPictureElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
@@ -7869,7 +8223,7 @@ declare var HTMLPictureElement: {
     new(): HTMLPictureElement;
 };
 
-/** The HTMLPreElement interface expose specific properties and methods (beyond those defined by regular HTMLElement interface it also has available to it by inheritance) for manipulating block of preformatted text. */
+/** Exposes specific properties and methods (beyond those of the HTMLElement interface it also has available to it by inheritance) for manipulating a block of preformatted text (<pre>). */
 interface HTMLPreElement extends HTMLElement {
     /**
      * Sets or gets a value that you can use to implement your own width functionality for the object.
@@ -7887,7 +8241,7 @@ declare var HTMLPreElement: {
     new(): HTMLPreElement;
 };
 
-/** The HTMLProgressElement interface provides special properties and methods (beyond the regular HTMLElement interface it also has available to it by inheritance) for manipulating the layout and presentation of <progress> elements. */
+/** Provides special properties and methods (beyond the regular HTMLElement interface it also has available to it by inheritance) for manipulating the layout and presentation of <progress> elements. */
 interface HTMLProgressElement extends HTMLElement {
     readonly labels: NodeListOf<HTMLLabelElement>;
     /**
@@ -7913,7 +8267,7 @@ declare var HTMLProgressElement: {
     new(): HTMLProgressElement;
 };
 
-/** The HTMLQuoteElement interface provides special properties and methods (beyond the regular HTMLElement interface it also has available to it by inheritance) for manipulating quoting elements, like <blockquote> and <q>, but not the <cite> element. */
+/** Provides special properties and methods (beyond the regular HTMLElement interface it also has available to it by inheritance) for manipulating quoting elements, like <blockquote> and <q>, but not the <cite> element. */
 interface HTMLQuoteElement extends HTMLElement {
     /**
      * Sets or retrieves reference information about the object.
@@ -7979,7 +8333,7 @@ declare var HTMLScriptElement: {
     new(): HTMLScriptElement;
 };
 
-/** The HTMLSelectElement interface represents a <select> HTML Element. These elements also share all of the properties and methods of other HTML elements via the HTMLElement interface. */
+/** A <select> HTML Element. These elements also share all of the properties and methods of other HTML elements via the HTMLElement interface. */
 interface HTMLSelectElement extends HTMLElement {
     autocomplete: string;
     /**
@@ -8098,7 +8452,7 @@ declare var HTMLSlotElement: {
     new(): HTMLSlotElement;
 };
 
-/** The HTMLSourceElement interface provides special properties (beyond the regular HTMLElement object interface it also has available to it by inheritance) for manipulating <source> elements. */
+/** Provides special properties (beyond the regular HTMLElement object interface it also has available to it by inheritance) for manipulating <source> elements. */
 interface HTMLSourceElement extends HTMLElement {
     /**
      * Gets or sets the intended media type of the media source.
@@ -8125,7 +8479,7 @@ declare var HTMLSourceElement: {
     new(): HTMLSourceElement;
 };
 
-/** The HTMLSpanElement interface represents a <span> element and derives from the HTMLElement interface, but without implementing any additional properties or methods. */
+/** A <span> element and derives from the HTMLElement interface, but without implementing any additional properties or methods. */
 interface HTMLSpanElement extends HTMLElement {
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLSpanElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
@@ -8138,7 +8492,7 @@ declare var HTMLSpanElement: {
     new(): HTMLSpanElement;
 };
 
-/** The HTMLStyleElement interface represents a <style> element. It inherits properties and methods from its parent, HTMLElement, and from LinkStyle. */
+/** A <style> element. It inherits properties and methods from its parent, HTMLElement, and from LinkStyle. */
 interface HTMLStyleElement extends HTMLElement, LinkStyle {
     /**
      * Sets or retrieves the media type.
@@ -8160,7 +8514,7 @@ declare var HTMLStyleElement: {
     new(): HTMLStyleElement;
 };
 
-/** The HTMLTableCaptionElement interface special properties (beyond the regular HTMLElement interface it also has available to it by inheritance) for manipulating table caption elements. */
+/** Special properties (beyond the regular HTMLElement interface it also has available to it by inheritance) for manipulating table caption elements. */
 interface HTMLTableCaptionElement extends HTMLElement {
     /**
      * Sets or retrieves the alignment of the caption or legend.
@@ -8178,7 +8532,7 @@ declare var HTMLTableCaptionElement: {
     new(): HTMLTableCaptionElement;
 };
 
-/** The HTMLTableCellElement interface provides special properties and methods (beyond the regular HTMLElement interface it also has available to it by inheritance) for manipulating the layout and presentation of table cells, either header or data cells, in an HTML document. */
+/** Provides special properties and methods (beyond the regular HTMLElement interface it also has available to it by inheritance) for manipulating the layout and presentation of table cells, either header or data cells, in an HTML document. */
 interface HTMLTableCellElement extends HTMLElement {
     /**
      * Sets or retrieves abbreviated text for the object.
@@ -8248,7 +8602,7 @@ declare var HTMLTableCellElement: {
     new(): HTMLTableCellElement;
 };
 
-/** The HTMLTableColElement interface provides special properties (beyond the HTMLElement interface it also has available to it inheritance) for manipulating single or grouped table column elements. */
+/** Provides special properties (beyond the HTMLElement interface it also has available to it inheritance) for manipulating single or grouped table column elements. */
 interface HTMLTableColElement extends HTMLElement {
     /**
      * Sets or retrieves the alignment of the object relative to the display or table.
@@ -8293,7 +8647,7 @@ declare var HTMLTableDataCellElement: {
     new(): HTMLTableDataCellElement;
 };
 
-/** The HTMLTableElement interface provides special properties and methods (beyond the regular HTMLElement object interface it also has available to it by inheritance) for manipulating the layout and presentation of tables in an HTML document. */
+/** Provides special properties and methods (beyond the regular HTMLElement object interface it also has available to it by inheritance) for manipulating the layout and presentation of tables in an HTML document. */
 interface HTMLTableElement extends HTMLElement {
     /**
      * Sets or retrieves a value that indicates the table alignment.
@@ -8419,7 +8773,7 @@ declare var HTMLTableHeaderCellElement: {
     new(): HTMLTableHeaderCellElement;
 };
 
-/** The HTMLTableRowElement interface provides special properties and methods (beyond the HTMLElement interface it also has available to it by inheritance) for manipulating the layout and presentation of rows in an HTML table. */
+/** Provides special properties and methods (beyond the HTMLElement interface it also has available to it by inheritance) for manipulating the layout and presentation of rows in an HTML table. */
 interface HTMLTableRowElement extends HTMLElement {
     /**
      * Sets or retrieves how the object is aligned with adjacent text.
@@ -8467,7 +8821,7 @@ declare var HTMLTableRowElement: {
     new(): HTMLTableRowElement;
 };
 
-/** The HTMLTableSectionElement interface provides special properties and methods (beyond the HTMLElement interface it also has available to it by inheritance) for manipulating the layout and presentation of sections, that is headers, footers and bodies, in an HTML table. */
+/** Provides special properties and methods (beyond the HTMLElement interface it also has available to it by inheritance) for manipulating the layout and presentation of sections, that is headers, footers and bodies, in an HTML table. */
 interface HTMLTableSectionElement extends HTMLElement {
     /**
      * Sets or retrieves a value that indicates the table alignment.
@@ -8505,7 +8859,7 @@ declare var HTMLTableSectionElement: {
     new(): HTMLTableSectionElement;
 };
 
-/** The HTMLTemplateElement interface enables access to the contents of an HTML <template> element. */
+/** Enables access to the contents of an HTML <template> element. */
 interface HTMLTemplateElement extends HTMLElement {
     readonly content: DocumentFragment;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLTemplateElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
@@ -8519,7 +8873,7 @@ declare var HTMLTemplateElement: {
     new(): HTMLTemplateElement;
 };
 
-/** The HTMLTextAreaElement interface provides special properties and methods for manipulating the layout and presentation of <textarea> elements. */
+/** Provides special properties and methods for manipulating the layout and presentation of <textarea> elements. */
 interface HTMLTextAreaElement extends HTMLElement {
     autocomplete: string;
     /**
@@ -8634,7 +8988,7 @@ declare var HTMLTextAreaElement: {
     new(): HTMLTextAreaElement;
 };
 
-/** The HTMLTimeElement interface provides special properties (beyond the regular HTMLElement interface it also has available to it by inheritance) for manipulating <time> elements. */
+/** Provides special properties (beyond the regular HTMLElement interface it also has available to it by inheritance) for manipulating <time> elements. */
 interface HTMLTimeElement extends HTMLElement {
     dateTime: string;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLTimeElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
@@ -8648,7 +9002,7 @@ declare var HTMLTimeElement: {
     new(): HTMLTimeElement;
 };
 
-/** The HTMLTitleElement interface contains the title for a document. This element inherits all of the properties and methods of the HTMLElement interface. */
+/** Contains the title for a document. This element inherits all of the properties and methods of the HTMLElement interface. */
 interface HTMLTitleElement extends HTMLElement {
     /**
      * Retrieves or sets the text of the object as a string.
@@ -8693,7 +9047,7 @@ declare var HTMLTrackElement: {
     readonly NONE: number;
 };
 
-/** The HTMLUListElement interface provides special properties (beyond those defined on the regular HTMLElement interface it also has available to it by inheritance) for manipulating unordered list elements. */
+/** Provides special properties (beyond those defined on the regular HTMLElement interface it also has available to it by inheritance) for manipulating unordered list elements. */
 interface HTMLUListElement extends HTMLElement {
     /** @deprecated */
     compact: boolean;
@@ -8710,7 +9064,7 @@ declare var HTMLUListElement: {
     new(): HTMLUListElement;
 };
 
-/** The HTMLUnknownElement interface represents an invalid HTML element and derives from the HTMLElement interface, but without implementing any additional properties or methods. */
+/** An invalid HTML element and derives from the HTMLElement interface, but without implementing any additional properties or methods. */
 interface HTMLUnknownElement extends HTMLElement {
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLUnknownElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
@@ -8729,7 +9083,7 @@ interface HTMLVideoElementEventMap extends HTMLMediaElementEventMap {
     "MSVideoOptimalLayoutChanged": Event;
 }
 
-/** The HTMLVideoElement interface provides special properties and methods for manipulating video objects. It also inherits properties and methods of HTMLMediaElement and HTMLElement. */
+/** Provides special properties and methods for manipulating video objects. It also inherits properties and methods of HTMLMediaElement and HTMLElement. */
 interface HTMLVideoElement extends HTMLMediaElement {
     /**
      * Gets or sets the height of the video element.
@@ -8781,7 +9135,7 @@ declare var HTMLVideoElement: {
     new(): HTMLVideoElement;
 };
 
-/** The HashChangeEvent event is fired when the fragment identifier of the URL has changed (the part of the URL that follows the # symbol, including the # symbol). */
+/** Events that fire when the fragment identifier of the URL has changed. */
 interface HashChangeEvent extends Event {
     readonly newURL: string;
     readonly oldURL: string;
@@ -8792,7 +9146,7 @@ declare var HashChangeEvent: {
     new(type: string, eventInitDict?: HashChangeEventInit): HashChangeEvent;
 };
 
-/** The Headers interface of the Fetch API allows you to perform various actions on HTTP request and response headers. These actions include retrieving, setting, adding to, and removing. A Headers object has an associated header list, which is initially empty and consists of zero or more name and value pairs.  You can add to this using methods like append() (see Examples.) In all methods of this interface, header names are matched by case-insensitive byte sequence. */
+/** This Fetch API interface allows you to perform various actions on HTTP request and response headers. These actions include retrieving, setting, adding to, and removing. A Headers object has an associated header list, which is initially empty and consists of zero or more name and value pairs.  You can add to this using methods like append() (see Examples.) In all methods of this interface, header names are matched by case-insensitive byte sequence. */
 interface Headers {
     append(name: string, value: string): void;
     delete(name: string): void;
@@ -8807,7 +9161,7 @@ declare var Headers: {
     new(init?: HeadersInit): Headers;
 };
 
-/** The History interface allows manipulation of the browser session history, that is the pages visited in the tab or frame that the current page is loaded in. */
+/** Allows manipulation of the browser session history, that is the pages visited in the tab or frame that the current page is loaded in. */
 interface History {
     readonly length: number;
     scrollRestoration: ScrollRestoration;
@@ -8833,21 +9187,18 @@ interface HkdfCtrParams extends Algorithm {
 interface IDBArrayKey extends Array<IDBValidKey> {
 }
 
-/** The IDBCursor interface of the IndexedDB API represents a cursor for traversing or iterating over multiple records in a database. */
+/** This IndexedDB API interface represents a cursor for traversing or iterating over multiple records in a database. */
 interface IDBCursor {
     /**
-     * Returns the direction ("next", "nextunique", "prev" or "prevunique")
-     * of the cursor.
+     * Returns the direction ("next", "nextunique", "prev" or "prevunique") of the cursor.
      */
     readonly direction: IDBCursorDirection;
     /**
-     * Returns the key of the cursor.
-     * Throws a "InvalidStateError" DOMException if the cursor is advancing or is finished.
+     * Returns the key of the cursor. Throws a "InvalidStateError" DOMException if the cursor is advancing or is finished.
      */
     readonly key: IDBValidKey;
     /**
-     * Returns the effective key of the cursor.
-     * Throws a "InvalidStateError" DOMException if the cursor is advancing or is finished.
+     * Returns the effective key of the cursor. Throws a "InvalidStateError" DOMException if the cursor is advancing or is finished.
      */
     readonly primaryKey: IDBValidKey;
     /**
@@ -8855,28 +9206,28 @@ interface IDBCursor {
      */
     readonly source: IDBObjectStore | IDBIndex;
     /**
-     * Advances the cursor through the next count records in
-     * range.
+     * Advances the cursor through the next count records in range.
      */
     advance(count: number): void;
     /**
-     * Advances the cursor to the next record in range matching or
-     * after key.
+     * Advances the cursor to the next record in range.
      */
     continue(key?: IDBValidKey): void;
     /**
-     * Advances the cursor to the next record in range matching
-     * or after key and primaryKey. Throws an "InvalidAccessError" DOMException if the source is not an index.
+     * Advances the cursor to the next record in range matching or after key and primaryKey. Throws an "InvalidAccessError" DOMException if the source is not an index.
      */
     continuePrimaryKey(key: IDBValidKey, primaryKey: IDBValidKey): void;
     /**
      * Delete the record pointed at by the cursor with a new value.
+     * 
      * If successful, request's result will be undefined.
      */
     delete(): IDBRequest<undefined>;
     /**
      * Updated the record pointed at by the cursor with a new value.
+     * 
      * Throws a "DataError" DOMException if the effective object store uses in-line keys and the key would have changed.
+     * 
      * If successful, request's result will be the record's key.
      */
     update(value: any): IDBRequest<IDBValidKey>;
@@ -8887,7 +9238,7 @@ declare var IDBCursor: {
     new(): IDBCursor;
 };
 
-/** The IDBCursorWithValue interface of the IndexedDB API represents a cursor for traversing or iterating over multiple records in a database. It is the same as the IDBCursor, except that it includes the value property. */
+/** This IndexedDB API interface represents a cursor for traversing or iterating over multiple records in a database. It is the same as the IDBCursor, except that it includes the value property. */
 interface IDBCursorWithValue extends IDBCursor {
     /**
      * Returns the cursor's current value.
@@ -8907,7 +9258,7 @@ interface IDBDatabaseEventMap {
     "versionchange": IDBVersionChangeEvent;
 }
 
-/** The IDBDatabase interface of the IndexedDB API provides a connection to a database; you can use an IDBDatabase object to open a transaction on your database then create, manipulate, and delete objects (data) in that database. The interface provides the only way to get and manage versions of the database. */
+/** This IndexedDB API interface provides a connection to a database; you can use an IDBDatabase object to open a transaction on your database then create, manipulate, and delete objects (data) in that database. The interface provides the only way to get and manage versions of the database. */
 interface IDBDatabase extends EventTarget {
     /**
      * Returns the name of the database.
@@ -8931,17 +9282,18 @@ interface IDBDatabase extends EventTarget {
     close(): void;
     /**
      * Creates a new object store with the given name and options and returns a new IDBObjectStore.
+     * 
      * Throws a "InvalidStateError" DOMException if not called within an upgrade transaction.
      */
     createObjectStore(name: string, optionalParameters?: IDBObjectStoreParameters): IDBObjectStore;
     /**
      * Deletes the object store with the given name.
+     * 
      * Throws a "InvalidStateError" DOMException if not called within an upgrade transaction.
      */
     deleteObjectStore(name: string): void;
     /**
-     * Returns a new transaction with the given mode ("readonly" or "readwrite")
-     * and scope which can be a single object store name or an array of names.
+     * Returns a new transaction with the given mode ("readonly" or "readwrite") and scope which can be a single object store name or an array of names.
      */
     transaction(storeNames: string | string[], mode?: IDBTransactionMode): IDBTransaction;
     addEventListener<K extends keyof IDBDatabaseEventMap>(type: K, listener: (this: IDBDatabase, ev: IDBDatabaseEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
@@ -8962,24 +9314,17 @@ interface IDBEnvironment {
 /** In the following code snippet, we make a request to open a database, and include handlers for the success and error cases. For a full working example, see our To-do Notifications app (view example live.) */
 interface IDBFactory {
     /**
-     * Compares two values as keys. Returns -1 if key1 precedes key2, 1 if key2 precedes key1, and 0 if
-     * the keys are equal.
+     * Compares two values as keys. Returns -1 if key1 precedes key2, 1 if key2 precedes key1, and 0 if the keys are equal.
+     * 
      * Throws a "DataError" DOMException if either input is not a valid key.
      */
     cmp(first: any, second: any): number;
     /**
-     * Attempts to delete the named database. If the
-     * database already exists and there are open connections that don't close in response to a versionchange event, the request will be blocked until all they close. If the request
-     * is successful request's result will be null.
+     * Attempts to delete the named database. If the database already exists and there are open connections that don't close in response to a versionchange event, the request will be blocked until all they close. If the request is successful request's result will be null.
      */
     deleteDatabase(name: string): IDBOpenDBRequest;
     /**
-     * Attempts to open a connection to the named database with the specified version. If the database already exists
-     * with a lower version and there are open connections that don't close in response to a versionchange event, the request will be blocked until all they close, then an upgrade
-     * will occur. If the database already exists with a higher
-     * version the request will fail. If the request is
-     * successful request's result will
-     * be the connection.
+     * Attempts to open a connection to the named database with the current version, or 1 if it does not already exist. If the request is successful request's result will be the connection.
      */
     open(name: string, version?: number): IDBOpenDBRequest;
 }
@@ -8994,9 +9339,7 @@ interface IDBIndex {
     readonly keyPath: string | string[];
     readonly multiEntry: boolean;
     /**
-     * Updates the name of the store to newName.
-     * Throws an "InvalidStateError" DOMException if not called within an upgrade
-     * transaction.
+     * Returns the name of the index.
      */
     name: string;
     /**
@@ -9006,43 +9349,46 @@ interface IDBIndex {
     readonly unique: boolean;
     /**
      * Retrieves the number of records matching the given key or key range in query.
-     * If successful, request's result will be the
-     * count.
+     * 
+     * If successful, request's result will be the count.
      */
     count(key?: IDBValidKey | IDBKeyRange): IDBRequest<number>;
     /**
-     * Retrieves the value of the first record matching the
-     * given key or key range in query.
+     * Retrieves the value of the first record matching the given key or key range in query.
+     * 
      * If successful, request's result will be the value, or undefined if there was no matching record.
      */
     get(key: IDBValidKey | IDBKeyRange): IDBRequest<any | undefined>;
     /**
      * Retrieves the values of the records matching the given key or key range in query (up to count if given).
+     * 
      * If successful, request's result will be an Array of the values.
      */
-    getAll(query?: IDBValidKey | IDBKeyRange, count?: number): IDBRequest<any[]>;
+    getAll(query?: IDBValidKey | IDBKeyRange | null, count?: number): IDBRequest<any[]>;
     /**
      * Retrieves the keys of records matching the given key or key range in query (up to count if given).
+     * 
      * If successful, request's result will be an Array of the keys.
      */
-    getAllKeys(query?: IDBValidKey | IDBKeyRange, count?: number): IDBRequest<IDBValidKey[]>;
+    getAllKeys(query?: IDBValidKey | IDBKeyRange | null, count?: number): IDBRequest<IDBValidKey[]>;
     /**
-     * Retrieves the key of the first record matching the
-     * given key or key range in query.
+     * Retrieves the key of the first record matching the given key or key range in query.
+     * 
      * If successful, request's result will be the key, or undefined if there was no matching record.
      */
     getKey(key: IDBValidKey | IDBKeyRange): IDBRequest<IDBValidKey | undefined>;
     /**
-     * Opens a cursor over the records matching query,
-     * ordered by direction. If query is null, all records in index are matched.
+     * Opens a cursor over the records matching query, ordered by direction. If query is null, all records in index are matched.
+     * 
      * If successful, request's result will be an IDBCursorWithValue, or null if there were no matching records.
      */
-    openCursor(range?: IDBValidKey | IDBKeyRange, direction?: IDBCursorDirection): IDBRequest<IDBCursorWithValue | null>;
+    openCursor(query?: IDBValidKey | IDBKeyRange | null, direction?: IDBCursorDirection): IDBRequest<IDBCursorWithValue | null>;
     /**
      * Opens a cursor with key only flag set over the records matching query, ordered by direction. If query is null, all records in index are matched.
+     * 
      * If successful, request's result will be an IDBCursor, or null if there were no matching records.
      */
-    openKeyCursor(range?: IDBValidKey | IDBKeyRange, direction?: IDBCursorDirection): IDBRequest<IDBCursor | null>;
+    openKeyCursor(query?: IDBValidKey | IDBKeyRange | null, direction?: IDBCursorDirection): IDBRequest<IDBCursor | null>;
 }
 
 declare var IDBIndex: {
@@ -9078,15 +9424,11 @@ declare var IDBKeyRange: {
     prototype: IDBKeyRange;
     new(): IDBKeyRange;
     /**
-     * Returns a new IDBKeyRange spanning from lower to upper.
-     * If lowerOpen is true, lower is not included in the range.
-     * If upperOpen is true, upper is not included in the range.
+     * Returns a new IDBKeyRange spanning from lower to upper. If lowerOpen is true, lower is not included in the range. If upperOpen is true, upper is not included in the range.
      */
     bound(lower: any, upper: any, lowerOpen?: boolean, upperOpen?: boolean): IDBKeyRange;
     /**
-     * Returns a new IDBKeyRange starting at key with no
-     * upper bound. If open is true, key is not included in the
-     * range.
+     * Returns a new IDBKeyRange starting at key with no upper bound. If open is true, key is not included in the range.
      */
     lowerBound(lower: any, open?: boolean): IDBKeyRange;
     /**
@@ -9114,88 +9456,99 @@ interface IDBObjectStore {
      */
     readonly keyPath: string | string[];
     /**
-     * Updates the name of the store to newName.
-     * Throws "InvalidStateError" DOMException if not called within an upgrade
-     * transaction.
+     * Returns the name of the store.
      */
     name: string;
     /**
      * Returns the associated transaction.
      */
     readonly transaction: IDBTransaction;
+    /**
+     * Adds or updates a record in store with the given value and key.
+     * 
+     * If the store uses in-line keys and key is specified a "DataError" DOMException will be thrown.
+     * 
+     * If put() is used, any existing record with the key will be replaced. If add() is used, and if a record with the key already exists the request will fail, with request's error set to a "ConstraintError" DOMException.
+     * 
+     * If successful, request's result will be the record's key.
+     */
     add(value: any, key?: IDBValidKey): IDBRequest<IDBValidKey>;
     /**
      * Deletes all records in store.
-     * If successful, request's result will
-     * be undefined.
+     * 
+     * If successful, request's result will be undefined.
      */
     clear(): IDBRequest<undefined>;
     /**
-     * Retrieves the number of records matching the
-     * given key or key range in query.
+     * Retrieves the number of records matching the given key or key range in query.
+     * 
      * If successful, request's result will be the count.
      */
     count(key?: IDBValidKey | IDBKeyRange): IDBRequest<number>;
     /**
-     * Creates a new index in store with the given name, keyPath and options and returns a new IDBIndex. If the keyPath and options define constraints that cannot be
-     * satisfied with the data already in store the upgrade
-     * transaction will abort with
-     * a "ConstraintError" DOMException.
-     * Throws an "InvalidStateError" DOMException if not called within an upgrade
-     * transaction.
+     * Creates a new index in store with the given name, keyPath and options and returns a new IDBIndex. If the keyPath and options define constraints that cannot be satisfied with the data already in store the upgrade transaction will abort with a "ConstraintError" DOMException.
+     * 
+     * Throws an "InvalidStateError" DOMException if not called within an upgrade transaction.
      */
     createIndex(name: string, keyPath: string | string[], options?: IDBIndexParameters): IDBIndex;
     /**
      * Deletes records in store with the given key or in the given key range in query.
-     * If successful, request's result will
-     * be undefined.
+     * 
+     * If successful, request's result will be undefined.
      */
     delete(key: IDBValidKey | IDBKeyRange): IDBRequest<undefined>;
     /**
      * Deletes the index in store with the given name.
-     * Throws an "InvalidStateError" DOMException if not called within an upgrade
-     * transaction.
+     * 
+     * Throws an "InvalidStateError" DOMException if not called within an upgrade transaction.
      */
     deleteIndex(name: string): void;
     /**
-     * Retrieves the value of the first record matching the
-     * given key or key range in query.
+     * Retrieves the value of the first record matching the given key or key range in query.
+     * 
      * If successful, request's result will be the value, or undefined if there was no matching record.
      */
     get(query: IDBValidKey | IDBKeyRange): IDBRequest<any | undefined>;
     /**
-     * Retrieves the values of the records matching the
-     * given key or key range in query (up to count if given).
-     * If successful, request's result will
-     * be an Array of the values.
+     * Retrieves the values of the records matching the given key or key range in query (up to count if given).
+     * 
+     * If successful, request's result will be an Array of the values.
      */
-    getAll(query?: IDBValidKey | IDBKeyRange, count?: number): IDBRequest<any[]>;
+    getAll(query?: IDBValidKey | IDBKeyRange | null, count?: number): IDBRequest<any[]>;
     /**
-     * Retrieves the keys of records matching the
-     * given key or key range in query (up to count if given).
-     * If successful, request's result will
-     * be an Array of the keys.
+     * Retrieves the keys of records matching the given key or key range in query (up to count if given).
+     * 
+     * If successful, request's result will be an Array of the keys.
      */
-    getAllKeys(query?: IDBValidKey | IDBKeyRange, count?: number): IDBRequest<IDBValidKey[]>;
+    getAllKeys(query?: IDBValidKey | IDBKeyRange | null, count?: number): IDBRequest<IDBValidKey[]>;
     /**
-     * Retrieves the key of the first record matching the
-     * given key or key range in query.
+     * Retrieves the key of the first record matching the given key or key range in query.
+     * 
      * If successful, request's result will be the key, or undefined if there was no matching record.
      */
     getKey(query: IDBValidKey | IDBKeyRange): IDBRequest<IDBValidKey | undefined>;
     index(name: string): IDBIndex;
     /**
-     * Opens a cursor over the records matching query,
-     * ordered by direction. If query is null, all records in store are matched.
+     * Opens a cursor over the records matching query, ordered by direction. If query is null, all records in store are matched.
+     * 
      * If successful, request's result will be an IDBCursorWithValue pointing at the first matching record, or null if there were no matching records.
      */
-    openCursor(range?: IDBValidKey | IDBKeyRange, direction?: IDBCursorDirection): IDBRequest<IDBCursorWithValue | null>;
+    openCursor(query?: IDBValidKey | IDBKeyRange | null, direction?: IDBCursorDirection): IDBRequest<IDBCursorWithValue | null>;
     /**
      * Opens a cursor with key only flag set over the records matching query, ordered by direction. If query is null, all records in store are matched.
-     * If successful, request's result will be an IDBCursor pointing at the first matching record, or
-     * null if there were no matching records.
+     * 
+     * If successful, request's result will be an IDBCursor pointing at the first matching record, or null if there were no matching records.
+     */
+    openKeyCursor(query?: IDBValidKey | IDBKeyRange | null, direction?: IDBCursorDirection): IDBRequest<IDBCursor | null>;
+    /**
+     * Adds or updates a record in store with the given value and key.
+     * 
+     * If the store uses in-line keys and key is specified a "DataError" DOMException will be thrown.
+     * 
+     * If put() is used, any existing record with the key will be replaced. If add() is used, and if a record with the key already exists the request will fail, with request's error set to a "ConstraintError" DOMException.
+     * 
+     * If successful, request's result will be the record's key.
      */
-    openKeyCursor(query?: IDBValidKey | IDBKeyRange, direction?: IDBCursorDirection): IDBRequest<IDBCursor | null>;
     put(value: any, key?: IDBValidKey): IDBRequest<IDBValidKey>;
 }
 
@@ -9232,31 +9585,25 @@ interface IDBRequestEventMap {
 /** The request object does not initially contain any information about the result of the operation, but once information becomes available, an event is fired on the request, and the information becomes available through the properties of the IDBRequest instance. */
 interface IDBRequest<T = any> extends EventTarget {
     /**
-     * When a request is completed, returns the error (a DOMException), or null if the request succeeded. Throws
-     * a "InvalidStateError" DOMException if the request is still pending.
+     * When a request is completed, returns the error (a DOMException), or null if the request succeeded. Throws a "InvalidStateError" DOMException if the request is still pending.
      */
     readonly error: DOMException | null;
     onerror: ((this: IDBRequest<T>, ev: Event) => any) | null;
     onsuccess: ((this: IDBRequest<T>, ev: Event) => any) | null;
     /**
-     * Returns "pending" until a request is complete,
-     * then returns "done".
+     * Returns "pending" until a request is complete, then returns "done".
      */
     readonly readyState: IDBRequestReadyState;
     /**
-     * When a request is completed, returns the result,
-     * or undefined if the request failed. Throws a
-     * "InvalidStateError" DOMException if the request is still pending.
+     * When a request is completed, returns the result, or undefined if the request failed. Throws a "InvalidStateError" DOMException if the request is still pending.
      */
     readonly result: T;
     /**
-     * Returns the IDBObjectStore, IDBIndex, or IDBCursor the request was made against, or null if is was an open
-     * request.
+     * Returns the IDBObjectStore, IDBIndex, or IDBCursor the request was made against, or null if is was an open request.
      */
     readonly source: IDBObjectStore | IDBIndex | IDBCursor;
     /**
-     * Returns the IDBTransaction the request was made within.
-     * If this as an open request, then it returns an upgrade transaction while it is running, or null otherwise.
+     * Returns the IDBTransaction the request was made within. If this as an open request, then it returns an upgrade transaction while it is running, or null otherwise.
      */
     readonly transaction: IDBTransaction | null;
     addEventListener<K extends keyof IDBRequestEventMap>(type: K, listener: (this: IDBRequest<T>, ev: IDBRequestEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
@@ -9282,28 +9629,22 @@ interface IDBTransaction extends EventTarget {
      */
     readonly db: IDBDatabase;
     /**
-     * If the transaction was aborted, returns the
-     * error (a DOMException) providing the reason.
+     * If the transaction was aborted, returns the error (a DOMException) providing the reason.
      */
     readonly error: DOMException;
     /**
-     * Returns the mode the transaction was created with
-     * ("readonly" or "readwrite"), or "versionchange" for
-     * an upgrade transaction.
+     * Returns the mode the transaction was created with ("readonly" or "readwrite"), or "versionchange" for an upgrade transaction.
      */
     readonly mode: IDBTransactionMode;
     /**
-     * Returns a list of the names of object stores in the
-     * transaction's scope. For an upgrade transaction this is all object stores in the database.
+     * Returns a list of the names of object stores in the transaction's scope. For an upgrade transaction this is all object stores in the database.
      */
     readonly objectStoreNames: DOMStringList;
     onabort: ((this: IDBTransaction, ev: Event) => any) | null;
     oncomplete: ((this: IDBTransaction, ev: Event) => any) | null;
     onerror: ((this: IDBTransaction, ev: Event) => any) | null;
     /**
-     * Aborts the transaction. All pending requests will fail with
-     * a "AbortError" DOMException and all changes made to the database will be
-     * reverted.
+     * Aborts the transaction. All pending requests will fail with a "AbortError" DOMException and all changes made to the database will be reverted.
      */
     abort(): void;
     /**
@@ -9321,7 +9662,7 @@ declare var IDBTransaction: {
     new(): IDBTransaction;
 };
 
-/** The IDBVersionChangeEvent interface of the IndexedDB API indicates that the version of the database has changed, as the result of an IDBOpenDBRequest.onupgradeneeded event handler function. */
+/** This IndexedDB API interface indicates that the version of the database has changed, as the result of an IDBOpenDBRequest.onupgradeneeded event handler function. */
 interface IDBVersionChangeEvent extends Event {
     readonly newVersion: number | null;
     readonly oldVersion: number;
@@ -9344,13 +9685,11 @@ declare var IIRFilterNode: {
 
 interface ImageBitmap {
     /**
-     * Returns the intrinsic height of the image, in CSS
-     * pixels.
+     * Returns the intrinsic height of the image, in CSS pixels.
      */
     readonly height: number;
     /**
-     * Returns the intrinsic width of the image, in CSS
-     * pixels.
+     * Returns the intrinsic width of the image, in CSS pixels.
      */
     readonly width: number;
     /**
@@ -9377,11 +9716,9 @@ interface ImageBitmapRenderingContext {
     /**
      * Returns the canvas element that the context is bound to.
      */
-    readonly canvas: HTMLCanvasElement;
+    readonly canvas: HTMLCanvasElement | OffscreenCanvas;
     /**
-     * Replaces contents of the canvas element to which context
-     * is bound with a transparent black bitmap whose size corresponds to the width and height
-     * content attributes of the canvas element.
+     * Transfers the underlying bitmap data from imageBitmap to context, and the bitmap becomes the contents of the canvas element to which context is bound.
      */
     transferFromImageBitmap(bitmap: ImageBitmap | null): void;
 }
@@ -9391,18 +9728,19 @@ declare var ImageBitmapRenderingContext: {
     new(): ImageBitmapRenderingContext;
 };
 
-/** The ImageData interface represents the underlying pixel data of an area of a <canvas> element. It is created using the ImageData() constructor or creator methods on the CanvasRenderingContext2D object associated with a canvas: createImageData() and getImageData(). It can also be used to set a part of the canvas by using putImageData(). */
+/** The underlying pixel data of an area of a <canvas> element. It is created using the ImageData() constructor or creator methods on the CanvasRenderingContext2D object associated with a canvas: createImageData() and getImageData(). It can also be used to set a part of the canvas by using putImageData(). */
 interface ImageData {
     /**
-     * Returns the one-dimensional array containing the data in RGBA order, as integers in the
-     * range 0 to 255.
+     * Returns the one-dimensional array containing the data in RGBA order, as integers in the range 0 to 255.
      */
     readonly data: Uint8ClampedArray;
     /**
-     * Returns the actual dimensions of the data in the ImageData object, in
-     * pixels.
+     * Returns the actual dimensions of the data in the ImageData object, in pixels.
      */
     readonly height: number;
+    /**
+     * Returns the actual dimensions of the data in the ImageData object, in pixels.
+     */
     readonly width: number;
 }
 
@@ -9412,11 +9750,35 @@ declare var ImageData: {
     new(array: Uint8ClampedArray, width: number, height: number): ImageData;
 };
 
-/** The IntersectionObserver interface of the Intersection Observer API provides a way to asynchronously observe changes in the intersection of a target element with an ancestor element or with a top-level document's viewport. */
+interface InnerHTML {
+    innerHTML: string;
+}
+
+interface InputDeviceInfo extends MediaDeviceInfo {
+    getCapabilities(): MediaTrackCapabilities;
+}
+
+declare var InputDeviceInfo: {
+    prototype: InputDeviceInfo;
+    new(): InputDeviceInfo;
+};
+
+interface InputEvent extends UIEvent {
+    readonly data: string | null;
+    readonly inputType: string;
+    readonly isComposing: boolean;
+}
+
+declare var InputEvent: {
+    prototype: InputEvent;
+    new(type: string, eventInitDict?: InputEventInit): InputEvent;
+};
+
+/** provides a way to asynchronously observe changes in the intersection of a target element with an ancestor element or with a top-level document's viewport. */
 interface IntersectionObserver {
     readonly root: Element | null;
     readonly rootMargin: string;
-    readonly thresholds: number[];
+    readonly thresholds: ReadonlyArray<number>;
     disconnect(): void;
     observe(target: Element): void;
     takeRecords(): IntersectionObserverEntry[];
@@ -9428,13 +9790,13 @@ declare var IntersectionObserver: {
     new(callback: IntersectionObserverCallback, options?: IntersectionObserverInit): IntersectionObserver;
 };
 
-/** The IntersectionObserverEntry interface of the Intersection Observer API describes the intersection between the target element and its root container at a specific moment of transition. */
+/** This Intersection Observer API interface describes the intersection between the target element and its root container at a specific moment of transition. */
 interface IntersectionObserverEntry {
     readonly boundingClientRect: ClientRect | DOMRect;
     readonly intersectionRatio: number;
     readonly intersectionRect: ClientRect | DOMRect;
     readonly isIntersecting: boolean;
-    readonly rootBounds: ClientRect | DOMRect;
+    readonly rootBounds: ClientRect | DOMRect | null;
     readonly target: Element;
     readonly time: number;
 }
@@ -9453,6 +9815,7 @@ interface KeyboardEvent extends UIEvent {
     readonly charCode: number;
     readonly code: string;
     readonly ctrlKey: boolean;
+    readonly isComposing: boolean;
     readonly key: string;
     /** @deprecated */
     readonly keyCode: number;
@@ -9460,14 +9823,8 @@ interface KeyboardEvent extends UIEvent {
     readonly metaKey: boolean;
     readonly repeat: boolean;
     readonly shiftKey: boolean;
-    /** @deprecated */
-    readonly which: number;
     getModifierState(keyArg: string): boolean;
-    /** @deprecated */
-    initKeyboardEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, keyArg: string, locationArg: number, modifiersListArg: string, repeat: boolean, locale: string): void;
-    readonly DOM_KEY_LOCATION_JOYSTICK: number;
     readonly DOM_KEY_LOCATION_LEFT: number;
-    readonly DOM_KEY_LOCATION_MOBILE: number;
     readonly DOM_KEY_LOCATION_NUMPAD: number;
     readonly DOM_KEY_LOCATION_RIGHT: number;
     readonly DOM_KEY_LOCATION_STANDARD: number;
@@ -9475,10 +9832,8 @@ interface KeyboardEvent extends UIEvent {
 
 declare var KeyboardEvent: {
     prototype: KeyboardEvent;
-    new(typeArg: string, eventInitDict?: KeyboardEventInit): KeyboardEvent;
-    readonly DOM_KEY_LOCATION_JOYSTICK: number;
+    new(type: string, eventInitDict?: KeyboardEventInit): KeyboardEvent;
     readonly DOM_KEY_LOCATION_LEFT: number;
-    readonly DOM_KEY_LOCATION_MOBILE: number;
     readonly DOM_KEY_LOCATION_NUMPAD: number;
     readonly DOM_KEY_LOCATION_RIGHT: number;
     readonly DOM_KEY_LOCATION_STANDARD: number;
@@ -9512,31 +9867,33 @@ declare var ListeningStateChangedEvent: {
     new(): ListeningStateChangedEvent;
 };
 
-/** The Location interface represents the location (URL) of the object it is linked to. Changes done on it are reflected on the object it relates to. Both the Document and Window interface have such a linked Location, accessible via Document.location and Window.location respectively. */
+/** The location (URL) of the object it is linked to. Changes done on it are reflected on the object it relates to. Both the Document and Window interface have such a linked Location, accessible via Document.location and Window.location respectively. */
 interface Location {
     /**
-     * Returns a DOMStringList object listing the origins of the ancestor browsing contexts, from the parent browsing
-     * context to the top-level browsing context.
+     * Returns a DOMStringList object listing the origins of the ancestor browsing contexts, from the parent browsing context to the top-level browsing context.
      */
     readonly ancestorOrigins: DOMStringList;
     /**
      * Returns the Location object's URL's fragment (includes leading "#" if non-empty).
+     * 
      * Can be set, to navigate to the same URL with a changed fragment (ignores leading "#").
      */
     hash: string;
     /**
-     * Returns the Location object's URL's host and port (if different from the default
-     * port for the scheme).
+     * Returns the Location object's URL's host and port (if different from the default port for the scheme).
+     * 
      * Can be set, to navigate to the same URL with a changed host and port.
      */
     host: string;
     /**
      * Returns the Location object's URL's host.
+     * 
      * Can be set, to navigate to the same URL with a changed host.
      */
     hostname: string;
     /**
      * Returns the Location object's URL.
+     * 
      * Can be set, to navigate to the given URL.
      */
     href: string;
@@ -9546,21 +9903,25 @@ interface Location {
     readonly origin: string;
     /**
      * Returns the Location object's URL's path.
+     * 
      * Can be set, to navigate to the same URL with a changed path.
      */
     pathname: string;
     /**
      * Returns the Location object's URL's port.
+     * 
      * Can be set, to navigate to the same URL with a changed port.
      */
     port: string;
     /**
      * Returns the Location object's URL's scheme.
+     * 
      * Can be set, to navigate to the same URL with a changed scheme.
      */
     protocol: string;
     /**
      * Returns the Location object's URL's query (includes leading "?" if non-empty).
+     * 
      * Can be set, to navigate to the same URL with a changed query (ignores leading "?").
      */
     search: string;
@@ -9844,6 +10205,7 @@ interface MediaDeviceInfo {
     readonly groupId: string;
     readonly kind: MediaDeviceKind;
     readonly label: string;
+    toJSON(): any;
 }
 
 declare var MediaDeviceInfo: {
@@ -9855,12 +10217,12 @@ interface MediaDevicesEventMap {
     "devicechange": Event;
 }
 
-/** The MediaDevices interface provides access to connected media input devices like cameras and microphones, as well as screen sharing. In essence, it lets you obtain access to any hardware source of media data. */
+/** Provides access to connected media input devices like cameras and microphones, as well as screen sharing. In essence, it lets you obtain access to any hardware source of media data. */
 interface MediaDevices extends EventTarget {
     ondevicechange: ((this: MediaDevices, ev: Event) => any) | null;
     enumerateDevices(): Promise<MediaDeviceInfo[]>;
     getSupportedConstraints(): MediaTrackSupportedConstraints;
-    getUserMedia(constraints: MediaStreamConstraints): Promise<MediaStream>;
+    getUserMedia(constraints?: MediaStreamConstraints): Promise<MediaStream>;
     addEventListener<K extends keyof MediaDevicesEventMap>(type: K, listener: (this: MediaDevices, ev: MediaDevicesEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof MediaDevicesEventMap>(type: K, listener: (this: MediaDevices, ev: MediaDevicesEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -9892,7 +10254,7 @@ declare var MediaEncryptedEvent: {
     new(type: string, eventInitDict?: MediaEncryptedEventInit): MediaEncryptedEvent;
 };
 
-/** The MediaError interface represents an error which occurred while handling media in an HTML media element based on HTMLMediaElement, such as <audio> or <video>. */
+/** An error which occurred while handling media in an HTML media element based on HTMLMediaElement, such as <audio> or <video>. */
 interface MediaError {
     readonly code: number;
     readonly message: string;
@@ -9914,7 +10276,7 @@ declare var MediaError: {
     readonly MS_MEDIA_ERR_ENCRYPTED: number;
 };
 
-/** The MediaKeyMessageEvent interface of the EncryptedMediaExtensions API contains the content and related data when the content decryption module generates a message for the session. */
+/** This EncryptedMediaExtensions API interface contains the content and related data when the content decryption module generates a message for the session. */
 interface MediaKeyMessageEvent extends Event {
     readonly message: ArrayBuffer;
     readonly messageType: MediaKeyMessageType;
@@ -9930,7 +10292,7 @@ interface MediaKeySessionEventMap {
     "message": MessageEvent;
 }
 
-/** The MediaKeySession interface of the EncryptedMediaExtensions API represents a context for message exchange with a content decryption module (CDM). */
+/** This EncryptedMediaExtensions API interface represents a context for message exchange with a content decryption module (CDM). */
 interface MediaKeySession extends EventTarget {
     readonly closed: Promise<void>;
     readonly expiration: number;
@@ -9954,7 +10316,7 @@ declare var MediaKeySession: {
     new(): MediaKeySession;
 };
 
-/** The MediaKeyStatusMap interface of the EncryptedMediaExtensions API is a read-only map of media key statuses by key IDs. */
+/** This EncryptedMediaExtensions API interface is a read-only map of media key statuses by key IDs. */
 interface MediaKeyStatusMap {
     readonly size: number;
     get(keyId: BufferSource): any;
@@ -9967,7 +10329,7 @@ declare var MediaKeyStatusMap: {
     new(): MediaKeyStatusMap;
 };
 
-/** The MediaKeySystemAccess interface of the EncryptedMediaExtensions API provides access to a Key System for decryption and/or a content protection provider. You can request an instance of this object using the Navigator.requestMediaKeySystemAccess method. */
+/** This EncryptedMediaExtensions API interface provides access to a Key System for decryption and/or a content protection provider. You can request an instance of this object using the Navigator.requestMediaKeySystemAccess method. */
 interface MediaKeySystemAccess {
     readonly keySystem: string;
     createMediaKeys(): Promise<MediaKeys>;
@@ -9979,7 +10341,7 @@ declare var MediaKeySystemAccess: {
     new(): MediaKeySystemAccess;
 };
 
-/** The MediaKeys interface of EncryptedMediaExtensions API the represents a set of keys that an associated HTMLMediaElement can use for decryption of media data during playback. */
+/** This EncryptedMediaExtensions API interface the represents a set of keys that an associated HTMLMediaElement can use for decryption of media data during playback. */
 interface MediaKeys {
     createSession(sessionType?: MediaKeySessionType): MediaKeySession;
     setServerCertificate(serverCertificate: BufferSource): Promise<boolean>;
@@ -10009,7 +10371,7 @@ interface MediaQueryListEventMap {
     "change": MediaQueryListEvent;
 }
 
-/** A MediaQueryList object stores information on a media query applied to a document, and handles sending notifications to listeners when the media query state change (i.e. when the media query test starts or stops evaluating to true). */
+/** Stores information on a media query applied to a document, and handles sending notifications to listeners when the media query state change (i.e. when the media query test starts or stops evaluating to true). */
 interface MediaQueryList extends EventTarget {
     readonly matches: boolean;
     readonly media: string;
@@ -10045,7 +10407,7 @@ interface MediaSourceEventMap {
     "sourceopen": Event;
 }
 
-/** The MediaSource interface of the Media Source Extensions API represents a source of media data for an HTMLMediaElement object. A MediaSource object can be attached to a HTMLMediaElement to be played in the user agent. */
+/** This Media Source Extensions API interface represents a source of media data for an HTMLMediaElement object. A MediaSource object can be attached to a HTMLMediaElement to be played in the user agent. */
 interface MediaSource extends EventTarget {
     readonly activeSourceBuffers: SourceBufferList;
     duration: number;
@@ -10072,19 +10434,15 @@ declare var MediaSource: {
 };
 
 interface MediaStreamEventMap {
-    "active": Event;
     "addtrack": MediaStreamTrackEvent;
-    "inactive": Event;
     "removetrack": MediaStreamTrackEvent;
 }
 
-/** The MediaStream interface represents a stream of media content. A stream consists of several tracks such as video or audio tracks. Each track is specified as an instance of MediaStreamTrack. */
+/** A stream of media content. A stream consists of several tracks such as video or audio tracks. Each track is specified as an instance of MediaStreamTrack. */
 interface MediaStream extends EventTarget {
     readonly active: boolean;
     readonly id: string;
-    onactive: ((this: MediaStream, ev: Event) => any) | null;
     onaddtrack: ((this: MediaStream, ev: MediaStreamTrackEvent) => any) | null;
-    oninactive: ((this: MediaStream, ev: Event) => any) | null;
     onremovetrack: ((this: MediaStream, ev: MediaStreamTrackEvent) => any) | null;
     addTrack(track: MediaStreamTrack): void;
     clone(): MediaStream;
@@ -10093,7 +10451,6 @@ interface MediaStream extends EventTarget {
     getTracks(): MediaStreamTrack[];
     getVideoTracks(): MediaStreamTrack[];
     removeTrack(track: MediaStreamTrack): void;
-    stop(): void;
     addEventListener<K extends keyof MediaStreamEventMap>(type: K, listener: (this: MediaStream, ev: MediaStreamEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof MediaStreamEventMap>(type: K, listener: (this: MediaStream, ev: MediaStreamEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -10116,7 +10473,7 @@ declare var MediaStreamAudioDestinationNode: {
     new(context: AudioContext, options?: AudioNodeOptions): MediaStreamAudioDestinationNode;
 };
 
-/** A MediaStreamAudioSourceNode has no inputs and exactly one output, and is created using the AudioContext.createMediaStreamSource method. The number of channels in the output equals the number of channels in AudioMediaStreamTrack. If there is no valid media stream, then the number of output channels will be one silent channel. */
+/** A type of AudioNode which operates as an audio source whose media is received from a MediaStream obtained using the WebRTC or Media Capture and Streams APIs. */
 interface MediaStreamAudioSourceNode extends AudioNode {
     readonly mediaStream: MediaStream;
 }
@@ -10146,7 +10503,7 @@ declare var MediaStreamErrorEvent: {
     new(typeArg: string, eventInitDict?: MediaStreamErrorEventInit): MediaStreamErrorEvent;
 };
 
-/** The MediaStreamEvent interface represents events that occurs in relation to a MediaStream. Two events of this type can be thrown: addstream and removestream. */
+/** Events that occurs in relation to a MediaStream. Two events of this type can be thrown: addstream and removestream. */
 interface MediaStreamEvent extends Event {
     readonly stream: MediaStream | null;
 }
@@ -10157,14 +10514,13 @@ declare var MediaStreamEvent: {
 };
 
 interface MediaStreamTrackEventMap {
-    "ended": MediaStreamErrorEvent;
+    "ended": Event;
     "isolationchange": Event;
     "mute": Event;
-    "overconstrained": MediaStreamErrorEvent;
     "unmute": Event;
 }
 
-/** The MediaStreamTrack interface represents a single media track within a stream; typically, these are audio or video tracks, but other track types may exist as well. */
+/** A single media track within a stream; typically, these are audio or video tracks, but other track types may exist as well. */
 interface MediaStreamTrack extends EventTarget {
     enabled: boolean;
     readonly id: string;
@@ -10172,15 +10528,12 @@ interface MediaStreamTrack extends EventTarget {
     readonly kind: string;
     readonly label: string;
     readonly muted: boolean;
-    onended: ((this: MediaStreamTrack, ev: MediaStreamErrorEvent) => any) | null;
+    onended: ((this: MediaStreamTrack, ev: Event) => any) | null;
     onisolationchange: ((this: MediaStreamTrack, ev: Event) => any) | null;
     onmute: ((this: MediaStreamTrack, ev: Event) => any) | null;
-    onoverconstrained: ((this: MediaStreamTrack, ev: MediaStreamErrorEvent) => any) | null;
     onunmute: ((this: MediaStreamTrack, ev: Event) => any) | null;
-    readonly readonly: boolean;
     readonly readyState: MediaStreamTrackState;
-    readonly remote: boolean;
-    applyConstraints(constraints: MediaTrackConstraints): Promise<void>;
+    applyConstraints(constraints?: MediaTrackConstraints): Promise<void>;
     clone(): MediaStreamTrack;
     getCapabilities(): MediaTrackCapabilities;
     getConstraints(): MediaTrackConstraints;
@@ -10205,19 +10558,25 @@ declare var MediaStreamTrackAudioSourceNode: {
     new(context: AudioContext, options: MediaStreamTrackAudioSourceOptions): MediaStreamTrackAudioSourceNode;
 };
 
-/** The MediaStreamTrackEvent interface represents events which indicate that a MediaStream has had tracks added to or removed from the stream through calls to Media Stream API methods. These events are sent to the stream when these changes occur. */
+/** Events which indicate that a MediaStream has had tracks added to or removed from the stream through calls to Media Stream API methods. These events are sent to the stream when these changes occur. */
 interface MediaStreamTrackEvent extends Event {
     readonly track: MediaStreamTrack;
 }
 
 declare var MediaStreamTrackEvent: {
     prototype: MediaStreamTrackEvent;
-    new(typeArg: string, eventInitDict?: MediaStreamTrackEventInit): MediaStreamTrackEvent;
+    new(type: string, eventInitDict: MediaStreamTrackEventInit): MediaStreamTrackEvent;
 };
 
-/** The MessageChannel interface of the Channel Messaging API allows us to create a new message channel and send data through it via its two MessagePort properties. */
+/** This Channel Messaging API interface allows us to create a new message channel and send data through it via its two MessagePort properties. */
 interface MessageChannel {
+    /**
+     * Returns the first MessagePort object.
+     */
     readonly port1: MessagePort;
+    /**
+     * Returns the second MessagePort object.
+     */
     readonly port2: MessagePort;
 }
 
@@ -10226,31 +10585,26 @@ declare var MessageChannel: {
     new(): MessageChannel;
 };
 
-/** The MessageEvent interface represents a message received by a target object. */
+/** A message received by a target object. */
 interface MessageEvent extends Event {
     /**
      * Returns the data of the message.
      */
     readonly data: any;
     /**
-     * Returns the last event ID string, for
-     * server-sent events.
+     * Returns the last event ID string, for server-sent events.
      */
     readonly lastEventId: string;
     /**
-     * Returns the origin of the message, for server-sent events and
-     * cross-document messaging.
+     * Returns the origin of the message, for server-sent events and cross-document messaging.
      */
     readonly origin: string;
     /**
-     * Returns the MessagePort array sent with the message, for cross-document
-     * messaging and channel messaging.
+     * Returns the MessagePort array sent with the message, for cross-document messaging and channel messaging.
      */
     readonly ports: ReadonlyArray<MessagePort>;
     /**
-     * Returns the WindowProxy of the source window, for cross-document
-     * messaging, and the MessagePort being attached, in the connect event fired at
-     * SharedWorkerGlobalScope objects.
+     * Returns the WindowProxy of the source window, for cross-document messaging, and the MessagePort being attached, in the connect event fired at SharedWorkerGlobalScope objects.
      */
     readonly source: MessageEventSource | null;
 }
@@ -10265,7 +10619,7 @@ interface MessagePortEventMap {
     "messageerror": MessageEvent;
 }
 
-/** The MessagePort interface of the Channel Messaging API represents one of the two ports of a MessageChannel, allowing messages to be sent from one port and listening out for them arriving at the other. */
+/** This Channel Messaging API interface represents one of the two ports of a MessageChannel, allowing messages to be sent from one port and listening out for them arriving at the other. */
 interface MessagePort extends EventTarget {
     onmessage: ((this: MessagePort, ev: MessageEvent) => any) | null;
     onmessageerror: ((this: MessagePort, ev: MessageEvent) => any) | null;
@@ -10274,13 +10628,12 @@ interface MessagePort extends EventTarget {
      */
     close(): void;
     /**
-     * Posts a message through the channel. Objects listed in transfer are
-     * transferred, not just cloned, meaning that they are no longer usable on the sending side.
-     * Throws a "DataCloneError" DOMException if
-     * transfer contains duplicate objects or port, or if message
-     * could not be cloned.
+     * Posts a message through the channel. Objects listed in transfer are transferred, not just cloned, meaning that they are no longer usable on the sending side.
+     * 
+     * Throws a "DataCloneError" DOMException if transfer contains duplicate objects or port, or if message could not be cloned.
      */
-    postMessage(message: any, transfer?: Transferable[]): void;
+    postMessage(message: any, transfer: Transferable[]): void;
+    postMessage(message: any, options?: PostMessageOptions): void;
     /**
      * Begins dispatching messages received on the port.
      */
@@ -10296,11 +10649,23 @@ declare var MessagePort: {
     new(): MessagePort;
 };
 
-/** The MimeType interface provides contains information about a MIME type associated with a particular plugin. NavigatorPlugins.mimeTypes returns an array of this object. */
+/** Provides contains information about a MIME type associated with a particular plugin. NavigatorPlugins.mimeTypes returns an array of this object. */
 interface MimeType {
+    /**
+     * Returns the MIME type's description.
+     */
     readonly description: string;
+    /**
+     * Returns the Plugin object that implements this MIME type.
+     */
     readonly enabledPlugin: Plugin;
+    /**
+     * Returns the MIME type's typical file extensions, in a comma-separated list.
+     */
     readonly suffixes: string;
+    /**
+     * Returns the MIME type.
+     */
     readonly type: string;
 }
 
@@ -10309,12 +10674,12 @@ declare var MimeType: {
     new(): MimeType;
 };
 
-/** The MimeTypeArray interface returns an array of MimeType instances, each of which contains information about a supported browser plugins. This object is returned by NavigatorPlugins.mimeTypes. */
+/** Returns an array of MimeType instances, each of which contains information about a supported browser plugins. This object is returned by NavigatorPlugins.mimeTypes. */
 interface MimeTypeArray {
     readonly length: number;
-    item(index: number): Plugin;
-    namedItem(type: string): Plugin;
-    [index: number]: Plugin;
+    item(index: number): MimeType | null;
+    namedItem(name: string): MimeType | null;
+    [index: number]: MimeType;
 }
 
 declare var MimeTypeArray: {
@@ -10322,7 +10687,7 @@ declare var MimeTypeArray: {
     new(): MimeTypeArray;
 };
 
-/** The MouseEvent interface represents events that occur due to the user interacting with a pointing device (such as a mouse). Common events using this interface include click, dblclick, mouseup, mousedown. */
+/** Events that occur due to the user interacting with a pointing device (such as a mouse). Common events using this interface include click, dblclick, mouseup, mousedown. */
 interface MouseEvent extends UIEvent {
     readonly altKey: boolean;
     readonly button: number;
@@ -10330,10 +10695,6 @@ interface MouseEvent extends UIEvent {
     readonly clientX: number;
     readonly clientY: number;
     readonly ctrlKey: boolean;
-    /** @deprecated */
-    readonly fromElement: Element;
-    readonly layerX: number;
-    readonly layerY: number;
     readonly metaKey: boolean;
     readonly movementX: number;
     readonly movementY: number;
@@ -10341,14 +10702,10 @@ interface MouseEvent extends UIEvent {
     readonly offsetY: number;
     readonly pageX: number;
     readonly pageY: number;
-    readonly relatedTarget: EventTarget;
+    readonly relatedTarget: EventTarget | null;
     readonly screenX: number;
     readonly screenY: number;
     readonly shiftKey: boolean;
-    /** @deprecated */
-    readonly toElement: Element;
-    /** @deprecated */
-    readonly which: number;
     readonly x: number;
     readonly y: number;
     getModifierState(keyArg: string): boolean;
@@ -10357,7 +10714,7 @@ interface MouseEvent extends UIEvent {
 
 declare var MouseEvent: {
     prototype: MouseEvent;
-    new(typeArg: string, eventInitDict?: MouseEventInit): MouseEvent;
+    new(type: string, eventInitDict?: MouseEventInit): MouseEvent;
 };
 
 /** Provides event properties that are specific to modifications to the Document Object Model (DOM) hierarchy and nodes. */
@@ -10381,42 +10738,20 @@ declare var MutationEvent: {
     readonly REMOVAL: number;
 };
 
-/** The MutationObserver interface provides the ability to watch for changes being made to the DOM tree. It is designed as a replacement for the older Mutation Events feature which was part of the DOM3 Events specification. */
+/** Provides the ability to watch for changes being made to the DOM tree. It is designed as a replacement for the older Mutation Events feature which was part of the DOM3 Events specification. */
 interface MutationObserver {
+    /**
+     * Stops observer from observing any mutations. Until the observe() method is used again, observer's callback will not be invoked.
+     */
     disconnect(): void;
     /**
-     * Instructs the user agent to observe a given target (a node) and report any mutations based on
-     * the criteria given by options (an object).
-     * The options argument allows for setting mutation
-     * observation options via object members. These are the object members that
-     * can be used:
-     * childList
-     * Set to true if mutations to target's children are to be observed.
-     * attributes
-     * Set to true if mutations to target's attributes are to be observed. Can be omitted if attributeOldValue or attributeFilter is
-     * specified.
-     * characterData
-     * Set to true if mutations to target's data are to be observed. Can be omitted if characterDataOldValue is specified.
-     * subtree
-     * Set to true if mutations to not just target, but
-     * also target's descendants are to be
-     * observed.
-     * attributeOldValue
-     * Set to true if attributes is true or omitted
-     * and target's attribute value before the mutation
-     * needs to be recorded.
-     * characterDataOldValue
-     * Set to true if characterData is set to true or omitted and target's data before the mutation
-     * needs to be recorded.
-     * attributeFilter
-     * Set to a list of attribute local names (without namespace) if not all attribute mutations need to be
-     * observed and attributes is true
-     * or omitted.
+     * Instructs the user agent to observe a given target (a node) and report any mutations based on the criteria given by options (an object).
+     * 
+     * The options argument allows for setting mutation observation options via object members.
      */
     observe(target: Node, options?: MutationObserverInit): void;
     /**
-     * Empties the record queue and
-     * returns what was in there.
+     * Empties the record queue and returns what was in there.
      */
     takeRecords(): MutationRecord[];
 }
@@ -10428,41 +10763,40 @@ declare var MutationObserver: {
 
 /** A MutationRecord represents an individual DOM mutation. It is the object that is passed to MutationObserver's callback. */
 interface MutationRecord {
+    /**
+     * Return the nodes added and removed respectively.
+     */
     readonly addedNodes: NodeList;
     /**
-     * Returns the local name of the
-     * changed attribute, and null otherwise.
+     * Returns the local name of the changed attribute, and null otherwise.
      */
     readonly attributeName: string | null;
     /**
-     * Returns the namespace of the
-     * changed attribute, and null otherwise.
+     * Returns the namespace of the changed attribute, and null otherwise.
      */
     readonly attributeNamespace: string | null;
     /**
-     * Return the previous and next sibling respectively
-     * of the added or removed nodes, and null otherwise.
+     * Return the previous and next sibling respectively of the added or removed nodes, and null otherwise.
      */
     readonly nextSibling: Node | null;
     /**
-     * The return value depends on type. For
-     * "attributes", it is the value of the
-     * changed attribute before the change.
-     * For "characterData", it is the data of the changed node before the change. For
-     * "childList", it is null.
+     * The return value depends on type. For "attributes", it is the value of the changed attribute before the change. For "characterData", it is the data of the changed node before the change. For "childList", it is null.
      */
     readonly oldValue: string | null;
+    /**
+     * Return the previous and next sibling respectively of the added or removed nodes, and null otherwise.
+     */
     readonly previousSibling: Node | null;
     /**
-     * Return the nodes added and removed
-     * respectively.
+     * Return the nodes added and removed respectively.
      */
     readonly removedNodes: NodeList;
+    /**
+     * Returns the node the mutation affected, depending on the type. For "attributes", it is the element whose attribute changed. For "characterData", it is the CharacterData node. For "childList", it is the node whose children changed.
+     */
     readonly target: Node;
     /**
-     * Returns "attributes" if it was an attribute mutation.
-     * "characterData" if it was a mutation to a CharacterData node. And
-     * "childList" if it was a mutation to the tree of nodes.
+     * Returns "attributes" if it was an attribute mutation. "characterData" if it was a mutation to a CharacterData node. And "childList" if it was a mutation to the tree of nodes.
      */
     readonly type: MutationRecordType;
 }
@@ -10472,7 +10806,7 @@ declare var MutationRecord: {
     new(): MutationRecord;
 };
 
-/** The NamedNodeMap interface represents a collection of Attr objects. Objects inside a NamedNodeMap are not in any particular order, unlike NodeList, although they may be accessed by an index as in an array. */
+/** A collection of Attr objects. Objects inside a NamedNodeMap are not in any particular order, unlike NodeList, although they may be accessed by an index as in an array. */
 interface NamedNodeMap {
     readonly length: number;
     getNamedItem(qualifiedName: string): Attr | null;
@@ -10502,27 +10836,24 @@ declare var NavigationPreloadManager: {
     new(): NavigationPreloadManager;
 };
 
-/** The Navigator interface represents the state and the identity of the user agent. It allows scripts to query it and to register themselves to carry on some activities. */
-interface Navigator extends NavigatorID, NavigatorOnLine, NavigatorContentUtils, NavigatorStorageUtils, MSNavigatorDoNotTrack, MSFileSaver, NavigatorBeacon, NavigatorConcurrentHardware, NavigatorUserMedia, NavigatorLanguage, NavigatorStorage, NavigatorAutomationInformation {
+/** The state and the identity of the user agent. It allows scripts to query it and to register themselves to carry on some activities. */
+interface Navigator extends NavigatorID, NavigatorLanguage, NavigatorOnLine, NavigatorContentUtils, NavigatorCookies, NavigatorPlugins, NavigatorConcurrentHardware, NavigatorStorage, NavigatorAutomationInformation, MSFileSaver, MSNavigatorDoNotTrack, NavigatorBeacon {
     readonly activeVRDisplays: ReadonlyArray<VRDisplay>;
-    readonly authentication: WebAuthentication;
     readonly clipboard: Clipboard;
-    readonly cookieEnabled: boolean;
+    readonly credentials: CredentialsContainer;
     readonly doNotTrack: string | null;
-    gamepadInputEmulation: GamepadInputEmulationType;
     readonly geolocation: Geolocation;
     readonly maxTouchPoints: number;
-    readonly mimeTypes: MimeTypeArray;
+    readonly mediaDevices: MediaDevices;
     readonly msManipulationViewsEnabled: boolean;
     readonly msMaxTouchPoints: number;
     readonly msPointerEnabled: boolean;
-    readonly plugins: PluginArray;
+    readonly permissions: Permissions;
     readonly pointerEnabled: boolean;
     readonly serviceWorker: ServiceWorkerContainer;
-    readonly webdriver: boolean;
     getGamepads(): (Gamepad | null)[];
+    getUserMedia(constraints: MediaStreamConstraints, successCallback: NavigatorUserMediaSuccessCallback, errorCallback: NavigatorUserMediaErrorCallback): void;
     getVRDisplays(): Promise<VRDisplay[]>;
-    javaEnabled(): boolean;
     msLaunchUri(uri: string, successCallback?: MSLaunchUriCallback, noHandlerCallback?: MSLaunchUriCallback): void;
     requestMediaKeySystemAccess(keySystem: string, supportedConfigurations: MediaKeySystemConfiguration[]): Promise<MediaKeySystemAccess>;
     vibrate(pattern: number | number[]): boolean;
@@ -10546,18 +10877,26 @@ interface NavigatorConcurrentHardware {
 }
 
 interface NavigatorContentUtils {
+    registerProtocolHandler(scheme: string, url: string, title: string): void;
+    unregisterProtocolHandler(scheme: string, url: string): void;
+}
+
+interface NavigatorCookies {
+    readonly cookieEnabled: boolean;
 }
 
 interface NavigatorID {
     readonly appCodeName: string;
     readonly appName: string;
     readonly appVersion: string;
+    readonly oscpu: string;
     readonly platform: string;
     readonly product: string;
     readonly productSub: string;
     readonly userAgent: string;
     readonly vendor: string;
     readonly vendorSub: string;
+    taintEnabled(): boolean;
 }
 
 interface NavigatorLanguage {
@@ -10569,19 +10908,16 @@ interface NavigatorOnLine {
     readonly onLine: boolean;
 }
 
+interface NavigatorPlugins {
+    readonly mimeTypes: MimeTypeArray;
+    readonly plugins: PluginArray;
+    javaEnabled(): boolean;
+}
+
 interface NavigatorStorage {
     readonly storage: StorageManager;
 }
 
-interface NavigatorStorageUtils {
-}
-
-interface NavigatorUserMedia {
-    readonly mediaDevices: MediaDevices;
-    getDisplayMedia(constraints: MediaStreamConstraints): Promise<MediaStream>;
-    getUserMedia(constraints: MediaStreamConstraints, successCallback: NavigatorUserMediaSuccessCallback, errorCallback: NavigatorUserMediaErrorCallback): void;
-}
-
 /** Node is an interface from which a number of DOM API object types inherit. It allows those types to be treated similarly; for example, inheriting the same set of methods, or being tested in the same way. */
 interface Node extends EventTarget {
     /**
@@ -10611,33 +10947,16 @@ interface Node extends EventTarget {
      */
     readonly nextSibling: ChildNode | null;
     /**
-     * Returns a string appropriate for the type of node, as
-     * follows:
-     * Element
-     * Its HTML-uppercased qualified name.
-     * Attr
-     * Its qualified name.
-     * Text
-     * "#text".
-     * CDATASection
-     * "#cdata-section".
-     * ProcessingInstruction
-     * Its target.
-     * Comment
-     * "#comment".
-     * Document
-     * "#document".
-     * DocumentType
-     * Its name.
-     * DocumentFragment
-     * "#document-fragment".
+     * Returns a string appropriate for the type of node.
      */
     readonly nodeName: string;
+    /**
+     * Returns the type of node.
+     */
     readonly nodeType: number;
     nodeValue: string | null;
     /**
-     * Returns the node document.
-     * Returns null for documents.
+     * Returns the node document. Returns null for documents.
      */
     readonly ownerDocument: Document | null;
     /**
@@ -10658,13 +10977,16 @@ interface Node extends EventTarget {
      * Returns a copy of node. If deep is true, the copy also includes the node's descendants.
      */
     cloneNode(deep?: boolean): Node;
+    /**
+     * Returns a bitmask indicating the position of other relative to node.
+     */
     compareDocumentPosition(other: Node): number;
     /**
      * Returns true if other is an inclusive descendant of node, and false otherwise.
      */
     contains(other: Node | null): boolean;
     /**
-     * Returns node's shadow-including root.
+     * Returns node's root.
      */
     getRootNode(options?: GetRootNodeOptions): Node;
     /**
@@ -10687,22 +11009,61 @@ interface Node extends EventTarget {
     removeChild<T extends Node>(oldChild: T): T;
     replaceChild<T extends Node>(newChild: Node, oldChild: T): T;
     readonly ATTRIBUTE_NODE: number;
+    /**
+     * node is a CDATASection node.
+     */
     readonly CDATA_SECTION_NODE: number;
+    /**
+     * node is a Comment node.
+     */
     readonly COMMENT_NODE: number;
+    /**
+     * node is a DocumentFragment node.
+     */
     readonly DOCUMENT_FRAGMENT_NODE: number;
+    /**
+     * node is a document.
+     */
     readonly DOCUMENT_NODE: number;
+    /**
+     * Set when other is a descendant of node.
+     */
     readonly DOCUMENT_POSITION_CONTAINED_BY: number;
+    /**
+     * Set when other is an ancestor of node.
+     */
     readonly DOCUMENT_POSITION_CONTAINS: number;
+    /**
+     * Set when node and other are not in the same tree.
+     */
     readonly DOCUMENT_POSITION_DISCONNECTED: number;
+    /**
+     * Set when other is following node.
+     */
     readonly DOCUMENT_POSITION_FOLLOWING: number;
     readonly DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC: number;
+    /**
+     * Set when other is preceding node.
+     */
     readonly DOCUMENT_POSITION_PRECEDING: number;
+    /**
+     * node is a doctype.
+     */
     readonly DOCUMENT_TYPE_NODE: number;
+    /**
+     * node is an element.
+     */
     readonly ELEMENT_NODE: number;
     readonly ENTITY_NODE: number;
     readonly ENTITY_REFERENCE_NODE: number;
     readonly NOTATION_NODE: number;
+    /**
+     * node is a ProcessingInstruction node.
+     */
     readonly PROCESSING_INSTRUCTION_NODE: number;
+    /**
+     * node is a Text node.
+     */
     readonly TEXT_NODE: number;
 }
 
@@ -10710,26 +11071,65 @@ declare var Node: {
     prototype: Node;
     new(): Node;
     readonly ATTRIBUTE_NODE: number;
+    /**
+     * node is a CDATASection node.
+     */
     readonly CDATA_SECTION_NODE: number;
+    /**
+     * node is a Comment node.
+     */
     readonly COMMENT_NODE: number;
+    /**
+     * node is a DocumentFragment node.
+     */
     readonly DOCUMENT_FRAGMENT_NODE: number;
+    /**
+     * node is a document.
+     */
     readonly DOCUMENT_NODE: number;
+    /**
+     * Set when other is a descendant of node.
+     */
     readonly DOCUMENT_POSITION_CONTAINED_BY: number;
+    /**
+     * Set when other is an ancestor of node.
+     */
     readonly DOCUMENT_POSITION_CONTAINS: number;
+    /**
+     * Set when node and other are not in the same tree.
+     */
     readonly DOCUMENT_POSITION_DISCONNECTED: number;
+    /**
+     * Set when other is following node.
+     */
     readonly DOCUMENT_POSITION_FOLLOWING: number;
     readonly DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC: number;
+    /**
+     * Set when other is preceding node.
+     */
     readonly DOCUMENT_POSITION_PRECEDING: number;
+    /**
+     * node is a doctype.
+     */
     readonly DOCUMENT_TYPE_NODE: number;
+    /**
+     * node is an element.
+     */
     readonly ELEMENT_NODE: number;
     readonly ENTITY_NODE: number;
     readonly ENTITY_REFERENCE_NODE: number;
     readonly NOTATION_NODE: number;
+    /**
+     * node is a ProcessingInstruction node.
+     */
     readonly PROCESSING_INSTRUCTION_NODE: number;
+    /**
+     * node is a Text node.
+     */
     readonly TEXT_NODE: number;
 };
 
-/** A NodeFilter interface represents an object used to filter the nodes in a NodeIterator or TreeWalker. They don't know anything about the DOM or how to traverse nodes; they just know how to evaluate a single node against the provided filter. */
+/** An object used to filter the nodes in a NodeIterator or TreeWalker. They don't know anything about the DOM or how to traverse nodes; they just know how to evaluate a single node against the provided filter. */
 interface NodeFilter {
     acceptNode(node: Node): number;
 }
@@ -10753,7 +11153,7 @@ declare var NodeFilter: {
     readonly SHOW_TEXT: number;
 };
 
-/** The NodeIterator interface represents an iterator over the members of a list of the nodes in a subtree of the DOM. The nodes will be returned in document order. */
+/** An iterator over the members of a list of the nodes in a subtree of the DOM. The nodes will be returned in document order. */
 interface NodeIterator {
     readonly filter: NodeFilter | null;
     readonly pointerBeforeReferenceNode: boolean;
@@ -10777,7 +11177,7 @@ interface NodeList {
      */
     readonly length: number;
     /**
-     * element = collection[index]
+     * Returns the node with index index from the collection. The nodes are sorted in tree order.
      */
     item(index: number): Node | null;
     /**
@@ -10806,24 +11206,13 @@ interface NodeListOf<TNode extends Node> extends NodeList {
     [index: number]: TNode;
 }
 
-interface NodeSelector {
-    querySelector<K extends keyof HTMLElementTagNameMap>(selectors: K): HTMLElementTagNameMap[K] | null;
-    querySelector<K extends keyof SVGElementTagNameMap>(selectors: K): SVGElementTagNameMap[K] | null;
-    querySelector<E extends Element = Element>(selectors: string): E | null;
-    querySelectorAll<K extends keyof HTMLElementTagNameMap>(selectors: K): NodeListOf<HTMLElementTagNameMap[K]>;
-    querySelectorAll<K extends keyof SVGElementTagNameMap>(selectors: K): NodeListOf<SVGElementTagNameMap[K]>;
-    querySelectorAll<E extends Element = Element>(selectors: string): NodeListOf<E>;
-}
-
 interface NonDocumentTypeChildNode {
     /**
-     * Returns the first following sibling that
-     * is an element, and null otherwise.
+     * Returns the first following sibling that is an element, and null otherwise.
      */
     readonly nextElementSibling: Element | null;
     /**
-     * Returns the first preceding sibling that
-     * is an element, and null otherwise.
+     * Returns the first preceding sibling that is an element, and null otherwise.
      */
     readonly previousElementSibling: Element | null;
 }
@@ -10842,7 +11231,7 @@ interface NotificationEventMap {
     "show": Event;
 }
 
-/** The Notification interface of the Notifications API is used to configure and display desktop notifications to the user. */
+/** This Notifications API interface is used to configure and display desktop notifications to the user. */
 interface Notification extends EventTarget {
     readonly actions: ReadonlyArray<NotificationAction>;
     readonly badge: string;
@@ -10926,10 +11315,11 @@ interface OfflineAudioContextEventMap extends BaseAudioContextEventMap {
     "complete": OfflineAudioCompletionEvent;
 }
 
-/** The OfflineAudioContext interface is an AudioContext interface representing an audio-processing graph built from linked together AudioNodes. In contrast with a standard AudioContext, an OfflineAudioContext doesn't render the audio to the device hardware; instead, it generates it, as fast as it can, and outputs the result to an AudioBuffer. */
+/** An AudioContext interface representing an audio-processing graph built from linked together AudioNodes. In contrast with a standard AudioContext, an OfflineAudioContext doesn't render the audio to the device hardware; instead, it generates it, as fast as it can, and outputs the result to an AudioBuffer. */
 interface OfflineAudioContext extends BaseAudioContext {
     readonly length: number;
     oncomplete: ((this: OfflineAudioContext, ev: OfflineAudioCompletionEvent) => any) | null;
+    resume(): Promise<void>;
     startRendering(): Promise<AudioBuffer>;
     suspend(suspendTime: number): Promise<void>;
     addEventListener<K extends keyof OfflineAudioContextEventMap>(type: K, listener: (this: OfflineAudioContext, ev: OfflineAudioContextEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
@@ -10944,6 +11334,58 @@ declare var OfflineAudioContext: {
     new(numberOfChannels: number, length: number, sampleRate: number): OfflineAudioContext;
 };
 
+interface OffscreenCanvas extends EventTarget {
+    /**
+     * These attributes return the dimensions of the OffscreenCanvas object's bitmap.
+     * 
+     * They can be set, to replace the bitmap with a new, transparent black bitmap of the specified dimensions (effectively resizing it).
+     */
+    height: number;
+    /**
+     * These attributes return the dimensions of the OffscreenCanvas object's bitmap.
+     * 
+     * They can be set, to replace the bitmap with a new, transparent black bitmap of the specified dimensions (effectively resizing it).
+     */
+    width: number;
+    /**
+     * Returns a promise that will fulfill with a new Blob object representing a file containing the image in the OffscreenCanvas object.
+     * 
+     * The argument, if provided, is a dictionary that controls the encoding options of the image file to be created. The type field specifies the file format and has a default value of "image/png"; that type is also used if the requested type isn't supported. If the image format supports variable quality (such as "image/jpeg"), then the quality field is a number in the range 0.0 to 1.0 inclusive indicating the desired quality level for the resulting image.
+     */
+    convertToBlob(options?: ImageEncodeOptions): Promise<Blob>;
+    /**
+     * Returns an object that exposes an API for drawing on the OffscreenCanvas object. contextId specifies the desired API: "2d", "bitmaprenderer", "webgl", or "webgl2". options is handled by that API.
+     * 
+     * This specification defines the "2d" context below, which is similar but distinct from the "2d" context that is created from a canvas element. The WebGL specifications define the "webgl" and "webgl2" contexts. [WEBGL]
+     * 
+     * Returns null if the canvas has already been initialized with another context type (e.g., trying to get a "2d" context after getting a "webgl" context).
+     */
+    getContext(contextId: "2d", options?: CanvasRenderingContext2DSettings): OffscreenCanvasRenderingContext2D | null;
+    getContext(contextId: "bitmaprenderer", options?: ImageBitmapRenderingContextSettings): ImageBitmapRenderingContext | null;
+    getContext(contextId: "webgl", options?: WebGLContextAttributes): WebGLRenderingContext | null;
+    getContext(contextId: "webgl2", options?: WebGLContextAttributes): WebGL2RenderingContext | null;
+    getContext(contextId: OffscreenRenderingContextId, options?: any): OffscreenRenderingContext | null;
+    /**
+     * Returns a newly created ImageBitmap object with the image in the OffscreenCanvas object. The image in the OffscreenCanvas object is replaced with a new blank image.
+     */
+    transferToImageBitmap(): ImageBitmap;
+}
+
+declare var OffscreenCanvas: {
+    prototype: OffscreenCanvas;
+    new(width: number, height: number): OffscreenCanvas;
+};
+
+interface OffscreenCanvasRenderingContext2D extends CanvasState, CanvasTransform, CanvasCompositing, CanvasImageSmoothing, CanvasFillStrokeStyles, CanvasShadowStyles, CanvasFilters, CanvasRect, CanvasDrawPath, CanvasText, CanvasDrawImage, CanvasImageData, CanvasPathDrawingStyles, CanvasTextDrawingStyles, CanvasPath {
+    readonly canvas: OffscreenCanvas;
+    commit(): void;
+}
+
+declare var OffscreenCanvasRenderingContext2D: {
+    prototype: OffscreenCanvasRenderingContext2D;
+    new(): OffscreenCanvasRenderingContext2D;
+};
+
 /** The OscillatorNode interface represents a periodic waveform, such as a sine wave. It is an AudioScheduledSourceNode audio-processing module that causes a specified frequency of a given wave to be created—in effect, a constant tone. */
 interface OscillatorNode extends AudioScheduledSourceNode {
     readonly detune: AudioParam;
@@ -10961,6 +11403,15 @@ declare var OscillatorNode: {
     new(context: BaseAudioContext, options?: OscillatorOptions): OscillatorNode;
 };
 
+interface OverconstrainedError extends Error {
+    constraint: string;
+}
+
+declare var OverconstrainedError: {
+    prototype: OverconstrainedError;
+    new(): OverconstrainedError;
+};
+
 interface OverflowEvent extends UIEvent {
     readonly horizontalOverflow: boolean;
     readonly orient: number;
@@ -11030,37 +11481,36 @@ interface ParentNode {
      */
     readonly lastElementChild: Element | null;
     /**
-     * Inserts nodes after the last child of node, while replacing
-     * strings in nodes with equivalent Text nodes.
-     * Throws a "HierarchyRequestError" DOMException if the constraints of
-     * the node tree are violated.
+     * Inserts nodes after the last child of node, while replacing strings in nodes with equivalent Text nodes.
+     * 
+     * Throws a "HierarchyRequestError" DOMException if the constraints of the node tree are violated.
      */
     append(...nodes: (Node | string)[]): void;
     /**
-     * Inserts nodes before the first child of node, while
-     * replacing strings in nodes with equivalent Text nodes.
-     * Throws a "HierarchyRequestError" DOMException if the constraints of
-     * the node tree are violated.
+     * Inserts nodes before the first child of node, while replacing strings in nodes with equivalent Text nodes.
+     * 
+     * Throws a "HierarchyRequestError" DOMException if the constraints of the node tree are violated.
      */
     prepend(...nodes: (Node | string)[]): void;
     /**
-     * Returns the first element that is a descendant of node that
-     * matches selectors.
+     * Returns the first element that is a descendant of node that matches selectors.
      */
     querySelector<K extends keyof HTMLElementTagNameMap>(selectors: K): HTMLElementTagNameMap[K] | null;
     querySelector<K extends keyof SVGElementTagNameMap>(selectors: K): SVGElementTagNameMap[K] | null;
     querySelector<E extends Element = Element>(selectors: string): E | null;
     /**
-     * Returns all element descendants of node that
-     * match selectors.
+     * Returns all element descendants of node that match selectors.
      */
     querySelectorAll<K extends keyof HTMLElementTagNameMap>(selectors: K): NodeListOf<HTMLElementTagNameMap[K]>;
     querySelectorAll<K extends keyof SVGElementTagNameMap>(selectors: K): NodeListOf<SVGElementTagNameMap[K]>;
     querySelectorAll<E extends Element = Element>(selectors: string): NodeListOf<E>;
 }
 
-/** The Path2D interface of the Canvas 2D API is used to declare a path that can then be used on a CanvasRenderingContext2D object. The path methods of the CanvasRenderingContext2D interface are also present on this interface, which gives you the convenience of being able to retain and replay your path whenever desired. */
+/** This Canvas 2D API interface is used to declare a path that can then be used on a CanvasRenderingContext2D object. The path methods of the CanvasRenderingContext2D interface are also present on this interface, which gives you the convenience of being able to retain and replay your path whenever desired. */
 interface Path2D extends CanvasPath {
+    /**
+     * Adds to the path the path given by the argument.
+     */
     addPath(path: Path2D, transform?: DOMMatrix2DInit): void;
 }
 
@@ -11069,7 +11519,7 @@ declare var Path2D: {
     new(path?: Path2D | string): Path2D;
 };
 
-/** The PaymentAddress interface of the Payment Request API is used to store shipping or payment address information. */
+/** This Payment Request API interface is used to store shipping or payment address information. */
 interface PaymentAddress {
     readonly addressLine: string[];
     readonly city: string;
@@ -11095,7 +11545,7 @@ interface PaymentRequestEventMap {
     "shippingoptionchange": Event;
 }
 
-/** The PaymentRequest interface of the Payment Request API is the primary access point into the API, and lets web content and apps accept payments from the end user. */
+/** This Payment Request API interface is the primary access point into the API, and lets web content and apps accept payments from the end user. */
 interface PaymentRequest extends EventTarget {
     readonly id: string;
     onshippingaddresschange: ((this: PaymentRequest, ev: Event) => any) | null;
@@ -11117,7 +11567,7 @@ declare var PaymentRequest: {
     new(methodData: PaymentMethodData[], details: PaymentDetailsInit, options?: PaymentOptions): PaymentRequest;
 };
 
-/** The PaymentRequestUpdateEvent interface of the the Payment Request API enables a web page to update the details of a PaymentRequest in response to a user action. */
+/** This Payment Request API interface enables a web page to update the details of a PaymentRequest in response to a user action. */
 interface PaymentRequestUpdateEvent extends Event {
     updateWith(detailsPromise: PaymentDetailsUpdate | Promise<PaymentDetailsUpdate>): void;
 }
@@ -11127,7 +11577,7 @@ declare var PaymentRequestUpdateEvent: {
     new(type: string, eventInitDict?: PaymentRequestUpdateEventInit): PaymentRequestUpdateEvent;
 };
 
-/** The PaymentResponse interface of the Payment Request API is returned after a user selects a payment method and approves a payment request. */
+/** This Payment Request API interface is returned after a user selects a payment method and approves a payment request. */
 interface PaymentResponse {
     readonly details: any;
     readonly methodName: string;
@@ -11179,7 +11629,7 @@ interface PerformanceEventMap {
     "resourcetimingbufferfull": Event;
 }
 
-/** The Performance interface provides access to performance-related information for the current page. It's part of the High Resolution Time API, but is enhanced by the Performance Timeline API, the Navigation Timing API, the User Timing API, and the Resource Timing API. */
+/** Provides access to performance-related information for the current page. It's part of the High Resolution Time API, but is enhanced by the Performance Timeline API, the Navigation Timing API, the User Timing API, and the Resource Timing API. */
 interface Performance extends EventTarget {
     /** @deprecated */
     readonly navigation: PerformanceNavigation;
@@ -11209,7 +11659,7 @@ declare var Performance: {
     new(): Performance;
 };
 
-/** The PerformanceEntry object encapsulates a single performance metric that is part of the performance timeline. A performance entry can be directly created by making a performance mark or measure (for example by calling the mark() method) at an explicit point in an application. Performance entries are also created in indirect ways such as loading a resource (such as an image). */
+/** Encapsulates a single performance metric that is part of the performance timeline. A performance entry can be directly created by making a performance mark or measure (for example by calling the mark() method) at an explicit point in an application. Performance entries are also created in indirect ways such as loading a resource (such as an image). */
 interface PerformanceEntry {
     readonly duration: number;
     readonly entryType: string;
@@ -11261,7 +11711,7 @@ declare var PerformanceNavigation: {
     readonly TYPE_RESERVED: number;
 };
 
-/** The PerformanceNavigationTiming interface provides methods and properties to store and retrieve metrics regarding the browser's document navigation events. For example, this interface can be used to determine how much time it takes to load or unload a document. */
+/** Provides methods and properties to store and retrieve metrics regarding the browser's document navigation events. For example, this interface can be used to determine how much time it takes to load or unload a document. */
 interface PerformanceNavigationTiming extends PerformanceResourceTiming {
     readonly domComplete: number;
     readonly domContentLoadedEventEnd: number;
@@ -11283,13 +11733,14 @@ declare var PerformanceNavigationTiming: {
 
 interface PerformanceObserver {
     disconnect(): void;
-    observe(options: PerformanceObserverInit): void;
+    observe(options?: PerformanceObserverInit): void;
     takeRecords(): PerformanceEntryList;
 }
 
 declare var PerformanceObserver: {
     prototype: PerformanceObserver;
     new(callback: PerformanceObserverCallback): PerformanceObserver;
+    readonly supportedEntryTypes: ReadonlyArray<string>;
 };
 
 interface PerformanceObserverEntryList {
@@ -11303,7 +11754,7 @@ declare var PerformanceObserverEntryList: {
     new(): PerformanceObserverEntryList;
 };
 
-/** The PerformanceResourceTiming interface enables retrieval and analysis of detailed network timing data regarding the loading of an application's resources. An application can use the timing metrics to determine, for example, the length of time it takes to fetch a specific resource, such as an XMLHttpRequest, <SVG>, image, or script. */
+/** Enables retrieval and analysis of detailed network timing data regarding the loading of an application's resources. An application can use the timing metrics to determine, for example, the length of time it takes to fetch a specific resource, such as an XMLHttpRequest, <SVG>, image, or script. */
 interface PerformanceResourceTiming extends PerformanceEntry {
     readonly connectEnd: number;
     readonly connectStart: number;
@@ -11330,7 +11781,7 @@ declare var PerformanceResourceTiming: {
     new(): PerformanceResourceTiming;
 };
 
-/** The PerformanceTiming interface is a legacy interface kept for backwards compatibility and contains properties that offer performance timing information for various events which occur during the loading and use of the current page. You get a PerformanceTiming object describing your page using the window.performance.timing property. */
+/** A legacy interface kept for backwards compatibility and contains properties that offer performance timing information for various events which occur during the loading and use of the current page. You get a PerformanceTiming object describing your page using the window.performance.timing property. */
 interface PerformanceTiming {
     readonly connectEnd: number;
     readonly connectStart: number;
@@ -11389,15 +11840,56 @@ declare var PermissionRequestedEvent: {
     new(): PermissionRequestedEvent;
 };
 
-/** The Plugin interface provides information about a browser plugin. */
+interface PermissionStatusEventMap {
+    "change": Event;
+}
+
+interface PermissionStatus extends EventTarget {
+    onchange: ((this: PermissionStatus, ev: Event) => any) | null;
+    readonly state: PermissionState;
+    addEventListener<K extends keyof PermissionStatusEventMap>(type: K, listener: (this: PermissionStatus, ev: PermissionStatusEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
+    removeEventListener<K extends keyof PermissionStatusEventMap>(type: K, listener: (this: PermissionStatus, ev: PermissionStatusEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
+    removeEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | EventListenerOptions): void;
+}
+
+declare var PermissionStatus: {
+    prototype: PermissionStatus;
+    new(): PermissionStatus;
+};
+
+interface Permissions {
+    query(permissionDesc: PermissionDescriptor | DevicePermissionDescriptor | MidiPermissionDescriptor | PushPermissionDescriptor): Promise<PermissionStatus>;
+}
+
+declare var Permissions: {
+    prototype: Permissions;
+    new(): Permissions;
+};
+
+/** Provides information about a browser plugin. */
 interface Plugin {
+    /**
+     * Returns the plugin's description.
+     */
     readonly description: string;
+    /**
+     * Returns the plugin library's filename, if applicable on the current platform.
+     */
     readonly filename: string;
+    /**
+     * Returns the number of MIME types, represented by MimeType objects, supported by the plugin.
+     */
     readonly length: number;
+    /**
+     * Returns the plugin's name.
+     */
     readonly name: string;
-    readonly version: string;
-    item(index: number): MimeType;
-    namedItem(type: string): MimeType;
+    /**
+     * Returns the specified MimeType object.
+     */
+    item(index: number): MimeType | null;
+    namedItem(name: string): MimeType | null;
     [index: number]: MimeType;
 }
 
@@ -11406,11 +11898,11 @@ declare var Plugin: {
     new(): Plugin;
 };
 
-/** The PluginArray interface is used to store a list of Plugin objects describing the available plugins; it's returned by the window.navigator.plugins property. The PluginArray is not a JavaScript array, but has the length property and supports accessing individual items using bracket notation (plugins[2]), as well as via item(index) and namedItem("name") methods. */
+/** Used to store a list of Plugin objects describing the available plugins; it's returned by the window.navigator.plugins property. The PluginArray is not a JavaScript array, but has the length property and supports accessing individual items using bracket notation (plugins[2]), as well as via item(index) and namedItem("name") methods. */
 interface PluginArray {
     readonly length: number;
-    item(index: number): Plugin;
-    namedItem(name: string): Plugin;
+    item(index: number): Plugin | null;
+    namedItem(name: string): Plugin | null;
     refresh(reload?: boolean): void;
     [index: number]: Plugin;
 }
@@ -11420,7 +11912,7 @@ declare var PluginArray: {
     new(): PluginArray;
 };
 
-/** The PointerEvent interface represents the state of a DOM event produced by a pointer such as the geometry of the contact point, the device type that generated the event, the amount of pressure that was applied on the contact surface, etc. */
+/** The state of a DOM event produced by a pointer such as the geometry of the contact point, the device type that generated the event, the amount of pressure that was applied on the contact surface, etc. */
 interface PointerEvent extends MouseEvent {
     readonly height: number;
     readonly isPrimary: boolean;
@@ -11439,7 +11931,7 @@ declare var PointerEvent: {
     new(type: string, eventInitDict?: PointerEventInit): PointerEvent;
 };
 
-/** An event handler for the popstate event on the window. */
+/** PopStateEvent is an event handler for the popstate event on the window. */
 interface PopStateEvent extends Event {
     readonly state: any;
 }
@@ -11449,13 +11941,13 @@ declare var PopStateEvent: {
     new(type: string, eventInitDict?: PopStateEventInit): PopStateEvent;
 };
 
-/** The Position interface represents the position of the concerned device at a given time. The position, represented by a Coordinates object, comprehends the 2D position of the device, on a spheroid representing the Earth, but also its altitude and its speed. */
+/** The position of the concerned device at a given time. The position, represented by a Coordinates object, comprehends the 2D position of the device, on a spheroid representing the Earth, but also its altitude and its speed. */
 interface Position {
     readonly coords: Coordinates;
     readonly timestamp: number;
 }
 
-/** The PositionError interface represents the reason of an error occurring when using the geolocating device. */
+/** The reason of an error occurring when using the geolocating device. */
 interface PositionError {
     readonly code: number;
     readonly message: string;
@@ -11474,10 +11966,11 @@ declare var ProcessingInstruction: {
     new(): ProcessingInstruction;
 };
 
-/** The ProgressEvent interface represents events measuring progress of an underlying process, like an HTTP request (for an XMLHttpRequest, or the loading of the underlying resource of an <img>, <audio>, <video>, <style> or <link>). */
-interface ProgressEvent extends Event {
+/** Events measuring progress of an underlying process, like an HTTP request (for an XMLHttpRequest, or the loading of the underlying resource of an <img>, <audio>, <video>, <style> or <link>). */
+interface ProgressEvent<T extends EventTarget = EventTarget> extends Event {
     readonly lengthComputable: boolean;
     readonly loaded: number;
+    readonly target: T | null;
     readonly total: number;
 }
 
@@ -11496,7 +11989,19 @@ declare var PromiseRejectionEvent: {
     new(type: string, eventInitDict: PromiseRejectionEventInit): PromiseRejectionEvent;
 };
 
-/** The PushManager interface of the Push API provides a way to receive notifications from third-party servers as well as request URLs for push notifications. */
+interface PublicKeyCredential extends Credential {
+    readonly rawId: ArrayBuffer;
+    readonly response: AuthenticatorResponse;
+    getClientExtensionResults(): AuthenticationExtensionsClientOutputs;
+}
+
+declare var PublicKeyCredential: {
+    prototype: PublicKeyCredential;
+    new(): PublicKeyCredential;
+    isUserVerifyingPlatformAuthenticatorAvailable(): Promise<boolean>;
+};
+
+/** This Push API interface provides a way to receive notifications from third-party servers as well as request URLs for push notifications. */
 interface PushManager {
     getSubscription(): Promise<PushSubscription | null>;
     permissionState(options?: PushSubscriptionOptionsInit): Promise<PushPermissionState>;
@@ -11509,7 +12014,7 @@ declare var PushManager: {
     readonly supportedContentEncodings: ReadonlyArray<string>;
 };
 
-/** The PushSubscription interface of the Push API provides a subcription's URL endpoint and allows unsubscription from a push service. */
+/** This Push API interface provides a subcription's URL endpoint and allows unsubscription from a push service. */
 interface PushSubscription {
     readonly endpoint: string;
     readonly expirationTime: number | null;
@@ -11565,7 +12070,7 @@ declare var RTCDTMFSender: {
     new(): RTCDTMFSender;
 };
 
-/** The RTCDTMFToneChangeEvent interface represents events sent to indicate that DTMF tones have started or finished playing. This interface is used by the tonechange event. */
+/** Events sent to indicate that DTMF tones have started or finished playing. This interface is used by the tonechange event. */
 interface RTCDTMFToneChangeEvent extends Event {
     readonly tone: string;
 }
@@ -11776,7 +12281,7 @@ interface RTCIceTransportEventMap {
     "statechange": Event;
 }
 
-/** The RTCIceTransport interface provides access to information about the ICE transport layer over which the data is being sent and received. */
+/** Provides access to information about the ICE transport layer over which the data is being sent and received. */
 interface RTCIceTransport extends EventTarget {
     readonly component: RTCIceComponent;
     readonly gatheringState: RTCIceGathererState;
@@ -11833,7 +12338,7 @@ interface RTCPeerConnectionEventMap {
     "track": RTCTrackEvent;
 }
 
-/** The RTCPeerConnection interface represents a WebRTC connection between the local computer and a remote peer. It provides methods to connect to a remote peer, maintain and monitor the connection, and close the connection once it's no longer needed. */
+/** A WebRTC connection between the local computer and a remote peer. It provides methods to connect to a remote peer, maintain and monitor the connection, and close the connection once it's no longer needed. */
 interface RTCPeerConnection extends EventTarget {
     readonly canTrickleIceCandidates: boolean | null;
     readonly connectionState: RTCPeerConnectionState;
@@ -11903,7 +12408,7 @@ declare var RTCPeerConnectionIceErrorEvent: {
     new(type: string, eventInitDict: RTCPeerConnectionIceErrorEventInit): RTCPeerConnectionIceErrorEvent;
 };
 
-/** The RTCPeerConnectionIceEvent interface represents events that occurs in relation to ICE candidates with the target, usually an RTCPeerConnection. Only one event is of this type: icecandidate. */
+/** Events that occurs in relation to ICE candidates with the target, usually an RTCPeerConnection. Only one event is of this type: icecandidate. */
 interface RTCPeerConnectionIceEvent extends Event {
     readonly candidate: RTCIceCandidate | null;
     readonly url: string | null;
@@ -11914,7 +12419,7 @@ declare var RTCPeerConnectionIceEvent: {
     new(type: string, eventInitDict?: RTCPeerConnectionIceEventInit): RTCPeerConnectionIceEvent;
 };
 
-/** The RTCRtpReceiver interface of the the WebRTC API manages the reception and decoding of data for a MediaStreamTrack on an RTCPeerConnection. */
+/** This WebRTC API interface manages the reception and decoding of data for a MediaStreamTrack on an RTCPeerConnection. */
 interface RTCRtpReceiver {
     readonly rtcpTransport: RTCDtlsTransport | null;
     readonly track: MediaStreamTrack;
@@ -11931,7 +12436,7 @@ declare var RTCRtpReceiver: {
     getCapabilities(kind: string): RTCRtpCapabilities | null;
 };
 
-/** The RTCRtpSender interface provides the ability to control and obtain details about how a particular MediaStreamTrack is encoded and sent to a remote peer. */
+/** Provides the ability to control and obtain details about how a particular MediaStreamTrack is encoded and sent to a remote peer. */
 interface RTCRtpSender {
     readonly dtmf: RTCDTMFSender | null;
     readonly rtcpTransport: RTCDtlsTransport | null;
@@ -11987,7 +12492,7 @@ declare var RTCSctpTransport: {
     new(): RTCSctpTransport;
 };
 
-/** The RTCSessionDescription interface describes one end of a connection—or potential connection—and how it's configured. Each RTCSessionDescription consists of a description type indicating which part of the offer/answer negotiation process it describes and of the SDP descriptor of the session. */
+/** One end of a connection—or potential connection—and how it's configured. Each RTCSessionDescription consists of a description type indicating which part of the offer/answer negotiation process it describes and of the SDP descriptor of the session. */
 interface RTCSessionDescription {
     readonly sdp: string;
     readonly type: RTCSdpType;
@@ -12085,11 +12590,10 @@ declare var RandomSource: {
     new(): RandomSource;
 };
 
-/** The Range interface represents a fragment of a document that can contain nodes and parts of text nodes. */
+/** A fragment of a document that can contain nodes and parts of text nodes. */
 interface Range extends AbstractRange {
     /**
-     * Returns the node, furthest away from
-     * the document, that is an ancestor of both range's start node and end node.
+     * Returns the node, furthest away from the document, that is an ancestor of both range's start node and end node.
      */
     readonly commonAncestorContainer: Node;
     cloneContents(): DocumentFragment;
@@ -12097,8 +12601,7 @@ interface Range extends AbstractRange {
     collapse(toStart?: boolean): void;
     compareBoundaryPoints(how: number, sourceRange: Range): number;
     /**
-     * Returns −1 if the point is before the range, 0 if the point is
-     * in the range, and 1 if the point is after the range.
+     * Returns −1 if the point is before the range, 0 if the point is in the range, and 1 if the point is after the range.
      */
     comparePoint(node: Node, offset: number): number;
     createContextualFragment(fragment: string): DocumentFragment;
@@ -12145,7 +12648,7 @@ interface ReadableByteStreamController {
     error(error?: any): void;
 }
 
-/** The ReadableStream interface of the Streams API represents a readable stream of byte data. The Fetch API offers a concrete instance of a ReadableStream through the body property of a Response object. */
+/** This Streams API interface represents a readable stream of byte data. The Fetch API offers a concrete instance of a ReadableStream through the body property of a Response object. */
 interface ReadableStream<R = any> {
     readonly locked: boolean;
     cancel(reason?: any): Promise<void>;
@@ -12169,11 +12672,6 @@ interface ReadableStreamBYOBReader {
     releaseLock(): void;
 }
 
-declare var ReadableStreamBYOBReader: {
-    prototype: ReadableStreamBYOBReader;
-    new(stream: ReadableStream<Uint8Array>): ReadableStreamBYOBReader;
-};
-
 interface ReadableStreamBYOBRequest {
     readonly view: ArrayBufferView;
     respond(bytesWritten: number): void;
@@ -12210,38 +12708,30 @@ declare var ReadableStreamReader: {
     new(): ReadableStreamReader;
 };
 
-/** The Request interface of the Fetch API represents a resource request. */
+/** This Fetch API interface represents a resource request. */
 interface Request extends Body {
     /**
-     * Returns the cache mode associated with request, which is a string indicating
-     * how the request will interact with the browser's cache when fetching.
+     * Returns the cache mode associated with request, which is a string indicating how the request will interact with the browser's cache when fetching.
      */
     readonly cache: RequestCache;
     /**
-     * Returns the credentials mode associated with request, which is a string
-     * indicating whether credentials will be sent with the request always, never, or only when sent to a
-     * same-origin URL.
+     * Returns the credentials mode associated with request, which is a string indicating whether credentials will be sent with the request always, never, or only when sent to a same-origin URL.
      */
     readonly credentials: RequestCredentials;
     /**
-     * Returns the kind of resource requested by request, e.g., "document" or
-     * "script".
+     * Returns the kind of resource requested by request, e.g., "document" or "script".
      */
     readonly destination: RequestDestination;
     /**
-     * Returns a Headers object consisting of the headers associated with request.
-     * Note that headers added in the network layer by the user agent will not be accounted for in this
-     * object, e.g., the "Host" header.
+     * Returns a Headers object consisting of the headers associated with request. Note that headers added in the network layer by the user agent will not be accounted for in this object, e.g., the "Host" header.
      */
     readonly headers: Headers;
     /**
-     * Returns request's subresource integrity metadata, which is a cryptographic hash of
-     * the resource being fetched. Its value consists of multiple hashes separated by whitespace. [SRI]
+     * Returns request's subresource integrity metadata, which is a cryptographic hash of the resource being fetched. Its value consists of multiple hashes separated by whitespace. [SRI]
      */
     readonly integrity: string;
     /**
-     * Returns a boolean indicating whether or not request is for a history
-     * navigation (a.k.a. back-foward navigation).
+     * Returns a boolean indicating whether or not request is for a history navigation (a.k.a. back-foward navigation).
      */
     readonly isHistoryNavigation: boolean;
     /**
@@ -12249,8 +12739,7 @@ interface Request extends Body {
      */
     readonly isReloadNavigation: boolean;
     /**
-     * Returns a boolean indicating whether or not request can outlive the global in which
-     * it was created.
+     * Returns a boolean indicating whether or not request can outlive the global in which it was created.
      */
     readonly keepalive: boolean;
     /**
@@ -12258,30 +12747,23 @@ interface Request extends Body {
      */
     readonly method: string;
     /**
-     * Returns the mode associated with request, which is a string indicating
-     * whether the request will use CORS, or will be restricted to same-origin URLs.
+     * Returns the mode associated with request, which is a string indicating whether the request will use CORS, or will be restricted to same-origin URLs.
      */
     readonly mode: RequestMode;
     /**
-     * Returns the redirect mode associated with request, which is a string
-     * indicating how redirects for the request will be handled during fetching. A request will follow redirects by default.
+     * Returns the redirect mode associated with request, which is a string indicating how redirects for the request will be handled during fetching. A request will follow redirects by default.
      */
     readonly redirect: RequestRedirect;
     /**
-     * Returns the referrer of request. Its value can be a same-origin URL if
-     * explicitly set in init, the empty string to indicate no referrer, and
-     * "about:client" when defaulting to the global's default. This is used during
-     * fetching to determine the value of the `Referer` header of the request being made.
+     * Returns the referrer of request. Its value can be a same-origin URL if explicitly set in init, the empty string to indicate no referrer, and "about:client" when defaulting to the global's default. This is used during fetching to determine the value of the `Referer` header of the request being made.
      */
     readonly referrer: string;
     /**
-     * Returns the referrer policy associated with request. This is used during
-     * fetching to compute the value of the request's referrer.
+     * Returns the referrer policy associated with request. This is used during fetching to compute the value of the request's referrer.
      */
     readonly referrerPolicy: ReferrerPolicy;
     /**
-     * Returns the signal associated with request, which is an AbortSignal object indicating whether or not request has been aborted, and its abort
-     * event handler.
+     * Returns the signal associated with request, which is an AbortSignal object indicating whether or not request has been aborted, and its abort event handler.
      */
     readonly signal: AbortSignal;
     /**
@@ -12296,7 +12778,7 @@ declare var Request: {
     new(input: RequestInfo, init?: RequestInit): Request;
 };
 
-/** The Response interface of the Fetch API represents the response to a request. */
+/** This Fetch API interface represents the response to a request. */
 interface Response extends Body {
     readonly headers: Headers;
     readonly ok: boolean;
@@ -12316,7 +12798,7 @@ declare var Response: {
     redirect(url: string, status?: number): Response;
 };
 
-/** The SVGAElement interface provides access to the properties of <a> element, as well as methods to manipulate them. */
+/** Provides access to the properties of <a> element, as well as methods to manipulate them. */
 interface SVGAElement extends SVGGraphicsElement, SVGURIReference {
     readonly target: SVGAnimatedString;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGAElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
@@ -12330,7 +12812,7 @@ declare var SVGAElement: {
     new(): SVGAElement;
 };
 
-/** The SVGAngle interface is used to represent a value that can be an <angle> or <number> value. An SVGAngle reflected through the animVal attribute is always read only. */
+/** Used to represent a value that can be an <angle> or <number> value. An SVGAngle reflected through the animVal attribute is always read only. */
 interface SVGAngle {
     readonly unitType: number;
     value: number;
@@ -12391,7 +12873,7 @@ declare var SVGAnimateTransformElement: {
     new(): SVGAnimateTransformElement;
 };
 
-/** The SVGAnimatedAngle interface is used for attributes of basic type <angle> which can be animated. */
+/** Used for attributes of basic type <angle> which can be animated. */
 interface SVGAnimatedAngle {
     readonly animVal: SVGAngle;
     readonly baseVal: SVGAngle;
@@ -12402,7 +12884,7 @@ declare var SVGAnimatedAngle: {
     new(): SVGAnimatedAngle;
 };
 
-/** The SVGAnimatedBoolean interface is used for attributes of type boolean which can be animated. */
+/** Used for attributes of type boolean which can be animated. */
 interface SVGAnimatedBoolean {
     readonly animVal: boolean;
     baseVal: boolean;
@@ -12413,7 +12895,7 @@ declare var SVGAnimatedBoolean: {
     new(): SVGAnimatedBoolean;
 };
 
-/** The SVGAnimatedEnumeration interface is used for attributes whose value must be a constant from a particular enumeration and which can be animated. */
+/** Used for attributes whose value must be a constant from a particular enumeration and which can be animated. */
 interface SVGAnimatedEnumeration {
     readonly animVal: number;
     baseVal: number;
@@ -12424,7 +12906,7 @@ declare var SVGAnimatedEnumeration: {
     new(): SVGAnimatedEnumeration;
 };
 
-/** The SVGAnimatedInteger interface is used for attributes of basic type <integer> which can be animated. */
+/** Used for attributes of basic type <integer> which can be animated. */
 interface SVGAnimatedInteger {
     readonly animVal: number;
     baseVal: number;
@@ -12435,7 +12917,7 @@ declare var SVGAnimatedInteger: {
     new(): SVGAnimatedInteger;
 };
 
-/** The SVGAnimatedLength interface is used for attributes of basic type <length> which can be animated. */
+/** Used for attributes of basic type <length> which can be animated. */
 interface SVGAnimatedLength {
     readonly animVal: SVGLength;
     readonly baseVal: SVGLength;
@@ -12446,7 +12928,7 @@ declare var SVGAnimatedLength: {
     new(): SVGAnimatedLength;
 };
 
-/** The SVGAnimatedLengthList interface is used for attributes of type SVGLengthList which can be animated. */
+/** Used for attributes of type SVGLengthList which can be animated. */
 interface SVGAnimatedLengthList {
     readonly animVal: SVGLengthList;
     readonly baseVal: SVGLengthList;
@@ -12457,7 +12939,7 @@ declare var SVGAnimatedLengthList: {
     new(): SVGAnimatedLengthList;
 };
 
-/** The SVGAnimatedNumber interface is used for attributes of basic type <Number> which can be animated. */
+/** Used for attributes of basic type <Number> which can be animated. */
 interface SVGAnimatedNumber {
     readonly animVal: number;
     baseVal: number;
@@ -12484,7 +12966,7 @@ interface SVGAnimatedPoints {
     readonly points: SVGPointList;
 }
 
-/** The SVGAnimatedPreserveAspectRatio interface is used for attributes of type SVGPreserveAspectRatio which can be animated. */
+/** Used for attributes of type SVGPreserveAspectRatio which can be animated. */
 interface SVGAnimatedPreserveAspectRatio {
     readonly animVal: SVGPreserveAspectRatio;
     readonly baseVal: SVGPreserveAspectRatio;
@@ -12495,7 +12977,7 @@ declare var SVGAnimatedPreserveAspectRatio: {
     new(): SVGAnimatedPreserveAspectRatio;
 };
 
-/** The SVGAnimatedRect interface is used for attributes of basic SVGRect which can be animated. */
+/** Used for attributes of basic SVGRect which can be animated. */
 interface SVGAnimatedRect {
     readonly animVal: DOMRectReadOnly;
     readonly baseVal: DOMRect;
@@ -12517,7 +12999,7 @@ declare var SVGAnimatedString: {
     new(): SVGAnimatedString;
 };
 
-/** The SVGAnimatedTransformList interface is used for attributes which take a list of numbers and which can be animated. */
+/** Used for attributes which take a list of numbers and which can be animated. */
 interface SVGAnimatedTransformList {
     readonly animVal: SVGTransformList;
     readonly baseVal: SVGTransformList;
@@ -12544,8 +13026,8 @@ declare var SVGAnimationElement: {
     new(): SVGAnimationElement;
 };
 
-/** The SVGCircleElement interface is an interface for the <circle> element. The circle element is defined by the cx and cy attributes that denote the coordinates of the centre of the circle. */
-interface SVGCircleElement extends SVGGraphicsElement {
+/** An interface for the <circle> element. The circle element is defined by the cx and cy attributes that denote the coordinates of the centre of the circle. */
+interface SVGCircleElement extends SVGGeometryElement {
     readonly cx: SVGAnimatedLength;
     readonly cy: SVGAnimatedLength;
     readonly r: SVGAnimatedLength;
@@ -12560,9 +13042,10 @@ declare var SVGCircleElement: {
     new(): SVGCircleElement;
 };
 
-/** The SVGClipPathElement interface provides access to the properties of <clipPath> elements, as well as methods to manipulate them. */
-interface SVGClipPathElement extends SVGGraphicsElement {
+/** Provides access to the properties of <clipPath> elements, as well as methods to manipulate them. */
+interface SVGClipPathElement extends SVGElement {
     readonly clipPathUnits: SVGAnimatedEnumeration;
+    readonly transform: SVGAnimatedTransformList;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGClipPathElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGClipPathElement, ev: SVGElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -12574,7 +13057,7 @@ declare var SVGClipPathElement: {
     new(): SVGClipPathElement;
 };
 
-/** The SVGComponentTransferFunctionElement interface defines a base interface used by the component transfer function interfaces. */
+/** A base interface used by the component transfer function interfaces. */
 interface SVGComponentTransferFunctionElement extends SVGElement {
     readonly amplitude: SVGAnimatedNumber;
     readonly exponent: SVGAnimatedNumber;
@@ -12620,7 +13103,7 @@ declare var SVGCursorElement: {
     new(): SVGCursorElement;
 };
 
-/** The SVGDefsElement interface corresponds to the <defs> element. */
+/** Corresponds to the <defs> element. */
 interface SVGDefsElement extends SVGGraphicsElement {
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGDefsElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
@@ -12633,7 +13116,7 @@ declare var SVGDefsElement: {
     new(): SVGDefsElement;
 };
 
-/** The SVGDescElement interface corresponds to the <desc> element. */
+/** Corresponds to the <desc> element. */
 interface SVGDescElement extends SVGElement {
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGDescElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
@@ -12688,8 +13171,8 @@ declare var SVGElementInstanceList: {
     new(): SVGElementInstanceList;
 };
 
-/** The SVGEllipseElement interface provides access to the properties of <ellipse> elements. */
-interface SVGEllipseElement extends SVGGraphicsElement {
+/** Provides access to the properties of <ellipse> elements. */
+interface SVGEllipseElement extends SVGGeometryElement {
     readonly cx: SVGAnimatedLength;
     readonly cy: SVGAnimatedLength;
     readonly rx: SVGAnimatedLength;
@@ -12705,7 +13188,7 @@ declare var SVGEllipseElement: {
     new(): SVGEllipseElement;
 };
 
-/** The SVGFEBlendElement interface corresponds to the <feBlend> element. */
+/** Corresponds to the <feBlend> element. */
 interface SVGFEBlendElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
     readonly in1: SVGAnimatedString;
     readonly in2: SVGAnimatedString;
@@ -12755,7 +13238,7 @@ declare var SVGFEBlendElement: {
     readonly SVG_FEBLEND_MODE_UNKNOWN: number;
 };
 
-/** The SVGFEColorMatrixElement interface corresponds to the <feColorMatrix> element. */
+/** Corresponds to the <feColorMatrix> element. */
 interface SVGFEColorMatrixElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
     readonly in1: SVGAnimatedString;
     readonly type: SVGAnimatedEnumeration;
@@ -12781,7 +13264,7 @@ declare var SVGFEColorMatrixElement: {
     readonly SVG_FECOLORMATRIX_TYPE_UNKNOWN: number;
 };
 
-/** The SVGFEComponentTransferElement interface corresponds to the <feComponentTransfer> element. */
+/** Corresponds to the <feComponentTransfer> element. */
 interface SVGFEComponentTransferElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
     readonly in1: SVGAnimatedString;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEComponentTransferElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
@@ -12795,7 +13278,7 @@ declare var SVGFEComponentTransferElement: {
     new(): SVGFEComponentTransferElement;
 };
 
-/** The SVGFECompositeElement interface corresponds to the <feComposite> element. */
+/** Corresponds to the <feComposite> element. */
 interface SVGFECompositeElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
     readonly in1: SVGAnimatedString;
     readonly in2: SVGAnimatedString;
@@ -12829,7 +13312,7 @@ declare var SVGFECompositeElement: {
     readonly SVG_FECOMPOSITE_OPERATOR_XOR: number;
 };
 
-/** The SVGFEConvolveMatrixElement interface corresponds to the <feConvolveMatrix> element. */
+/** Corresponds to the <feConvolveMatrix> element. */
 interface SVGFEConvolveMatrixElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
     readonly bias: SVGAnimatedNumber;
     readonly divisor: SVGAnimatedNumber;
@@ -12862,7 +13345,7 @@ declare var SVGFEConvolveMatrixElement: {
     readonly SVG_EDGEMODE_WRAP: number;
 };
 
-/** The SVGFEDiffuseLightingElement interface corresponds to the <feDiffuseLighting> element. */
+/** Corresponds to the <feDiffuseLighting> element. */
 interface SVGFEDiffuseLightingElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
     readonly diffuseConstant: SVGAnimatedNumber;
     readonly in1: SVGAnimatedString;
@@ -12880,7 +13363,7 @@ declare var SVGFEDiffuseLightingElement: {
     new(): SVGFEDiffuseLightingElement;
 };
 
-/** The SVGFEDisplacementMapElement interface corresponds to the <feDisplacementMap> element. */
+/** Corresponds to the <feDisplacementMap> element. */
 interface SVGFEDisplacementMapElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
     readonly in1: SVGAnimatedString;
     readonly in2: SVGAnimatedString;
@@ -12908,7 +13391,7 @@ declare var SVGFEDisplacementMapElement: {
     readonly SVG_CHANNEL_UNKNOWN: number;
 };
 
-/** The SVGFEDistantLightElement interface corresponds to the <feDistantLight> element. */
+/** Corresponds to the <feDistantLight> element. */
 interface SVGFEDistantLightElement extends SVGElement {
     readonly azimuth: SVGAnimatedNumber;
     readonly elevation: SVGAnimatedNumber;
@@ -12923,7 +13406,25 @@ declare var SVGFEDistantLightElement: {
     new(): SVGFEDistantLightElement;
 };
 
-/** The SVGFEFloodElement interface corresponds to the <feFlood> element. */
+interface SVGFEDropShadowElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
+    readonly dx: SVGAnimatedNumber;
+    readonly dy: SVGAnimatedNumber;
+    readonly in1: SVGAnimatedString;
+    readonly stdDeviationX: SVGAnimatedNumber;
+    readonly stdDeviationY: SVGAnimatedNumber;
+    setStdDeviation(stdDeviationX: number, stdDeviationY: number): void;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEDropShadowElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
+    removeEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEDropShadowElement, ev: SVGElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
+    removeEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | EventListenerOptions): void;
+}
+
+declare var SVGFEDropShadowElement: {
+    prototype: SVGFEDropShadowElement;
+    new(): SVGFEDropShadowElement;
+};
+
+/** Corresponds to the <feFlood> element. */
 interface SVGFEFloodElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEFloodElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
@@ -12936,7 +13437,7 @@ declare var SVGFEFloodElement: {
     new(): SVGFEFloodElement;
 };
 
-/** The SVGFEFuncAElement interface corresponds to the <feFuncA> element. */
+/** Corresponds to the <feFuncA> element. */
 interface SVGFEFuncAElement extends SVGComponentTransferFunctionElement {
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEFuncAElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
@@ -12949,7 +13450,7 @@ declare var SVGFEFuncAElement: {
     new(): SVGFEFuncAElement;
 };
 
-/** The SVGFEFuncBElement interface corresponds to the <feFuncB> element. */
+/** Corresponds to the <feFuncB> element. */
 interface SVGFEFuncBElement extends SVGComponentTransferFunctionElement {
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEFuncBElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
@@ -12962,7 +13463,7 @@ declare var SVGFEFuncBElement: {
     new(): SVGFEFuncBElement;
 };
 
-/** The SVGFEFuncGElement interface corresponds to the <feFuncG> element. */
+/** Corresponds to the <feFuncG> element. */
 interface SVGFEFuncGElement extends SVGComponentTransferFunctionElement {
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEFuncGElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
@@ -12975,7 +13476,7 @@ declare var SVGFEFuncGElement: {
     new(): SVGFEFuncGElement;
 };
 
-/** The SVGFEFuncRElement interface corresponds to the <feFuncR> element. */
+/** Corresponds to the <feFuncR> element. */
 interface SVGFEFuncRElement extends SVGComponentTransferFunctionElement {
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEFuncRElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
@@ -12988,7 +13489,7 @@ declare var SVGFEFuncRElement: {
     new(): SVGFEFuncRElement;
 };
 
-/** The SVGFEGaussianBlurElement interface corresponds to the <feGaussianBlur> element. */
+/** Corresponds to the <feGaussianBlur> element. */
 interface SVGFEGaussianBlurElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
     readonly in1: SVGAnimatedString;
     readonly stdDeviationX: SVGAnimatedNumber;
@@ -13005,7 +13506,7 @@ declare var SVGFEGaussianBlurElement: {
     new(): SVGFEGaussianBlurElement;
 };
 
-/** The SVGFEImageElement interface corresponds to the <feImage> element. */
+/** Corresponds to the <feImage> element. */
 interface SVGFEImageElement extends SVGElement, SVGFilterPrimitiveStandardAttributes, SVGURIReference {
     readonly preserveAspectRatio: SVGAnimatedPreserveAspectRatio;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEImageElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
@@ -13019,7 +13520,7 @@ declare var SVGFEImageElement: {
     new(): SVGFEImageElement;
 };
 
-/** The SVGFEMergeElement interface corresponds to the <feMerge> element. */
+/** Corresponds to the <feMerge> element. */
 interface SVGFEMergeElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEMergeElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
@@ -13032,7 +13533,7 @@ declare var SVGFEMergeElement: {
     new(): SVGFEMergeElement;
 };
 
-/** The SVGFEMergeNodeElement interface corresponds to the <feMergeNode> element. */
+/** Corresponds to the <feMergeNode> element. */
 interface SVGFEMergeNodeElement extends SVGElement {
     readonly in1: SVGAnimatedString;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEMergeNodeElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
@@ -13046,7 +13547,7 @@ declare var SVGFEMergeNodeElement: {
     new(): SVGFEMergeNodeElement;
 };
 
-/** The SVGFEMorphologyElement interface corresponds to the <feMorphology> element. */
+/** Corresponds to the <feMorphology> element. */
 interface SVGFEMorphologyElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
     readonly in1: SVGAnimatedString;
     readonly operator: SVGAnimatedEnumeration;
@@ -13069,7 +13570,7 @@ declare var SVGFEMorphologyElement: {
     readonly SVG_MORPHOLOGY_OPERATOR_UNKNOWN: number;
 };
 
-/** The SVGFEOffsetElement interface corresponds to the <feOffset> element. */
+/** Corresponds to the <feOffset> element. */
 interface SVGFEOffsetElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
     readonly dx: SVGAnimatedNumber;
     readonly dy: SVGAnimatedNumber;
@@ -13085,7 +13586,7 @@ declare var SVGFEOffsetElement: {
     new(): SVGFEOffsetElement;
 };
 
-/** The SVGFEPointLightElement interface corresponds to the <fePointLight> element. */
+/** Corresponds to the <fePointLight> element. */
 interface SVGFEPointLightElement extends SVGElement {
     readonly x: SVGAnimatedNumber;
     readonly y: SVGAnimatedNumber;
@@ -13101,7 +13602,7 @@ declare var SVGFEPointLightElement: {
     new(): SVGFEPointLightElement;
 };
 
-/** The SVGFESpecularLightingElement interface corresponds to the <feSpecularLighting> element. */
+/** Corresponds to the <feSpecularLighting> element. */
 interface SVGFESpecularLightingElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
     readonly in1: SVGAnimatedString;
     readonly kernelUnitLengthX: SVGAnimatedNumber;
@@ -13120,7 +13621,7 @@ declare var SVGFESpecularLightingElement: {
     new(): SVGFESpecularLightingElement;
 };
 
-/** The SVGFESpotLightElement interface corresponds to the <feSpotLight> element. */
+/** Corresponds to the <feSpotLight> element. */
 interface SVGFESpotLightElement extends SVGElement {
     readonly limitingConeAngle: SVGAnimatedNumber;
     readonly pointsAtX: SVGAnimatedNumber;
@@ -13141,7 +13642,7 @@ declare var SVGFESpotLightElement: {
     new(): SVGFESpotLightElement;
 };
 
-/** The SVGFETileElement interface corresponds to the <feTile> element. */
+/** Corresponds to the <feTile> element. */
 interface SVGFETileElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
     readonly in1: SVGAnimatedString;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFETileElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
@@ -13155,7 +13656,7 @@ declare var SVGFETileElement: {
     new(): SVGFETileElement;
 };
 
-/** The SVGFETurbulenceElement interface corresponds to the <feTurbulence> element. */
+/** Corresponds to the <feTurbulence> element. */
 interface SVGFETurbulenceElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
     readonly baseFrequencyX: SVGAnimatedNumber;
     readonly baseFrequencyY: SVGAnimatedNumber;
@@ -13186,20 +13687,14 @@ declare var SVGFETurbulenceElement: {
     readonly SVG_TURBULENCE_TYPE_UNKNOWN: number;
 };
 
-/** The SVGFilterElement interface provides access to the properties of <filter> elements, as well as methods to manipulate them. */
+/** Provides access to the properties of <filter> elements, as well as methods to manipulate them. */
 interface SVGFilterElement extends SVGElement, SVGURIReference {
-    /** @deprecated */
-    readonly filterResX: SVGAnimatedInteger;
-    /** @deprecated */
-    readonly filterResY: SVGAnimatedInteger;
     readonly filterUnits: SVGAnimatedEnumeration;
     readonly height: SVGAnimatedLength;
     readonly primitiveUnits: SVGAnimatedEnumeration;
     readonly width: SVGAnimatedLength;
     readonly x: SVGAnimatedLength;
     readonly y: SVGAnimatedLength;
-    /** @deprecated */
-    setFilterRes(filterResX: number, filterResY: number): void;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFilterElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFilterElement, ev: SVGElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -13224,7 +13719,7 @@ interface SVGFitToViewBox {
     readonly viewBox: SVGAnimatedRect;
 }
 
-/** The SVGForeignObjectElement interface provides access to the properties of <foreignObject> elements, as well as methods to manipulate them. */
+/** Provides access to the properties of <foreignObject> elements, as well as methods to manipulate them. */
 interface SVGForeignObjectElement extends SVGGraphicsElement {
     readonly height: SVGAnimatedLength;
     readonly width: SVGAnimatedLength;
@@ -13241,7 +13736,7 @@ declare var SVGForeignObjectElement: {
     new(): SVGForeignObjectElement;
 };
 
-/** The SVGGElement interface corresponds to the <g> element. */
+/** Corresponds to the <g> element. */
 interface SVGGElement extends SVGGraphicsElement {
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGGElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
@@ -13295,7 +13790,7 @@ declare var SVGGradientElement: {
     readonly SVG_SPREADMETHOD_UNKNOWN: number;
 };
 
-/** The SVGGraphicsElement interface represents SVG elements whose primary purpose is to directly render graphics into a group. */
+/** SVG elements whose primary purpose is to directly render graphics into a group. */
 interface SVGGraphicsElement extends SVGElement, SVGTests {
     readonly transform: SVGAnimatedTransformList;
     getBBox(options?: SVGBoundingBoxOptions): DOMRect;
@@ -13312,7 +13807,7 @@ declare var SVGGraphicsElement: {
     new(): SVGGraphicsElement;
 };
 
-/** The SVGImageElement interface corresponds to the <image> element. */
+/** Corresponds to the <image> element. */
 interface SVGImageElement extends SVGGraphicsElement, SVGURIReference {
     readonly height: SVGAnimatedLength;
     readonly preserveAspectRatio: SVGAnimatedPreserveAspectRatio;
@@ -13330,7 +13825,7 @@ declare var SVGImageElement: {
     new(): SVGImageElement;
 };
 
-/** The SVGLength interface correspond to the <length> basic data type. */
+/** Correspond to the <length> basic data type. */
 interface SVGLength {
     readonly unitType: number;
     value: number;
@@ -13386,8 +13881,8 @@ declare var SVGLengthList: {
     new(): SVGLengthList;
 };
 
-/** The SVGLineElement interface provides access to the properties of <line> elements, as well as methods to manipulate them. */
-interface SVGLineElement extends SVGGraphicsElement {
+/** Provides access to the properties of <line> elements, as well as methods to manipulate them. */
+interface SVGLineElement extends SVGGeometryElement {
     readonly x1: SVGAnimatedLength;
     readonly x2: SVGAnimatedLength;
     readonly y1: SVGAnimatedLength;
@@ -13403,7 +13898,7 @@ declare var SVGLineElement: {
     new(): SVGLineElement;
 };
 
-/** The SVGLinearGradientElement interface corresponds to the <linearGradient> element. */
+/** Corresponds to the <linearGradient> element. */
 interface SVGLinearGradientElement extends SVGGradientElement {
     readonly x1: SVGAnimatedLength;
     readonly x2: SVGAnimatedLength;
@@ -13453,8 +13948,8 @@ declare var SVGMarkerElement: {
     readonly SVG_MARKER_ORIENT_UNKNOWN: number;
 };
 
-/** The SVGMaskElement interface provides access to the properties of <mask> elements, as well as methods to manipulate them. */
-interface SVGMaskElement extends SVGElement, SVGTests {
+/** Provides access to the properties of <mask> elements, as well as methods to manipulate them. */
+interface SVGMaskElement extends SVGElement {
     readonly height: SVGAnimatedLength;
     readonly maskContentUnits: SVGAnimatedEnumeration;
     readonly maskUnits: SVGAnimatedEnumeration;
@@ -13472,7 +13967,7 @@ declare var SVGMaskElement: {
     new(): SVGMaskElement;
 };
 
-/** The SVGMetadataElement interface corresponds to the <metadata> element. */
+/** Corresponds to the <metadata> element. */
 interface SVGMetadataElement extends SVGElement {
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGMetadataElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
@@ -13485,7 +13980,7 @@ declare var SVGMetadataElement: {
     new(): SVGMetadataElement;
 };
 
-/** The SVGNumber interface corresponds to the <number> basic data type. */
+/** Corresponds to the <number> basic data type. */
 interface SVGNumber {
     value: number;
 }
@@ -13514,7 +14009,7 @@ declare var SVGNumberList: {
     new(): SVGNumberList;
 };
 
-/** The SVGPathElement interface corresponds to the <path> element. */
+/** Corresponds to the <path> element. */
 interface SVGPathElement extends SVGGraphicsElement {
     /** @deprecated */
     readonly pathSegList: SVGPathSegList;
@@ -13847,7 +14342,7 @@ declare var SVGPathSegMovetoRel: {
     new(): SVGPathSegMovetoRel;
 };
 
-/** The SVGPatternElement interface corresponds to the <pattern> element. */
+/** Corresponds to the <pattern> element. */
 interface SVGPatternElement extends SVGElement, SVGTests, SVGFitToViewBox, SVGURIReference {
     readonly height: SVGAnimatedLength;
     readonly patternContentUnits: SVGAnimatedEnumeration;
@@ -13868,14 +14363,16 @@ declare var SVGPatternElement: {
 };
 
 interface SVGPointList {
+    readonly length: number;
     readonly numberOfItems: number;
-    appendItem(newItem: SVGPoint): SVGPoint;
+    appendItem(newItem: DOMPoint): DOMPoint;
     clear(): void;
-    getItem(index: number): SVGPoint;
-    initialize(newItem: SVGPoint): SVGPoint;
-    insertItemBefore(newItem: SVGPoint, index: number): SVGPoint;
-    removeItem(index: number): SVGPoint;
-    replaceItem(newItem: SVGPoint, index: number): SVGPoint;
+    getItem(index: number): DOMPoint;
+    initialize(newItem: DOMPoint): DOMPoint;
+    insertItemBefore(newItem: DOMPoint, index: number): DOMPoint;
+    removeItem(index: number): DOMPoint;
+    replaceItem(newItem: DOMPoint, index: number): DOMPoint;
+    [index: number]: DOMPoint;
 }
 
 declare var SVGPointList: {
@@ -13883,8 +14380,8 @@ declare var SVGPointList: {
     new(): SVGPointList;
 };
 
-/** The SVGPolygonElement interface provides access to the properties of <polygon> elements, as well as methods to manipulate them. */
-interface SVGPolygonElement extends SVGGraphicsElement, SVGAnimatedPoints {
+/** Provides access to the properties of <polygon> elements, as well as methods to manipulate them. */
+interface SVGPolygonElement extends SVGGeometryElement, SVGAnimatedPoints {
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGPolygonElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGPolygonElement, ev: SVGElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -13896,8 +14393,8 @@ declare var SVGPolygonElement: {
     new(): SVGPolygonElement;
 };
 
-/** The SVGPolylineElement interface provides access to the properties of <polyline> elements, as well as methods to manipulate them. */
-interface SVGPolylineElement extends SVGGraphicsElement, SVGAnimatedPoints {
+/** Provides access to the properties of <polyline> elements, as well as methods to manipulate them. */
+interface SVGPolylineElement extends SVGGeometryElement, SVGAnimatedPoints {
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGPolylineElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGPolylineElement, ev: SVGElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -13909,7 +14406,7 @@ declare var SVGPolylineElement: {
     new(): SVGPolylineElement;
 };
 
-/** The SVGPreserveAspectRatio interface corresponds to the preserveAspectRatio attribute, which is available for some of SVG's elements. */
+/** Corresponds to the preserveAspectRatio attribute, which is available for some of SVG's elements. */
 interface SVGPreserveAspectRatio {
     align: number;
     meetOrSlice: number;
@@ -13948,7 +14445,7 @@ declare var SVGPreserveAspectRatio: {
     readonly SVG_PRESERVEASPECTRATIO_XMINYMIN: number;
 };
 
-/** The SVGRadialGradientElement interface corresponds to the <RadialGradient> element. */
+/** Corresponds to the <RadialGradient> element. */
 interface SVGRadialGradientElement extends SVGGradientElement {
     readonly cx: SVGAnimatedLength;
     readonly cy: SVGAnimatedLength;
@@ -13966,8 +14463,8 @@ declare var SVGRadialGradientElement: {
     new(): SVGRadialGradientElement;
 };
 
-/** The SVGRectElement interface provides access to the properties of <rect> elements, as well as methods to manipulate them. */
-interface SVGRectElement extends SVGGraphicsElement {
+/** Provides access to the properties of <rect> elements, as well as methods to manipulate them. */
+interface SVGRectElement extends SVGGeometryElement {
     readonly height: SVGAnimatedLength;
     readonly rx: SVGAnimatedLength;
     readonly ry: SVGAnimatedLength;
@@ -13990,7 +14487,7 @@ interface SVGSVGElementEventMap extends SVGElementEventMap {
     "SVGZoom": SVGZoomEvent;
 }
 
-/** The SVGSVGElement interface provides access to the properties of <svg> elements, as well as methods to manipulate them. This interface contains also various miscellaneous commonly-used utility methods, such as matrix operations and the ability to control the time of redraw on visual rendering devices. */
+/** Provides access to the properties of <svg> elements, as well as methods to manipulate them. This interface contains also various miscellaneous commonly-used utility methods, such as matrix operations and the ability to control the time of redraw on visual rendering devices. */
 interface SVGSVGElement extends SVGGraphicsElement, DocumentEvent, SVGFitToViewBox, SVGZoomAndPan {
     /** @deprecated */
     contentScriptType: string;
@@ -14014,6 +14511,7 @@ interface SVGSVGElement extends SVGGraphicsElement, DocumentEvent, SVGFitToViewB
     readonly width: SVGAnimatedLength;
     readonly x: SVGAnimatedLength;
     readonly y: SVGAnimatedLength;
+    animationsPaused(): boolean;
     checkEnclosure(element: SVGElement, rect: SVGRect): boolean;
     checkIntersection(element: SVGElement, rect: SVGRect): boolean;
     createSVGAngle(): SVGAngle;
@@ -14028,18 +14526,14 @@ interface SVGSVGElement extends SVGGraphicsElement, DocumentEvent, SVGFitToViewB
     /** @deprecated */
     forceRedraw(): void;
     getComputedStyle(elt: Element, pseudoElt?: string | null): CSSStyleDeclaration;
-    /** @deprecated */
     getCurrentTime(): number;
     getElementById(elementId: string): Element;
     getEnclosureList(rect: SVGRect, referenceElement: SVGElement): NodeListOf<SVGCircleElement | SVGEllipseElement | SVGImageElement | SVGLineElement | SVGPathElement | SVGPolygonElement | SVGPolylineElement | SVGRectElement | SVGTextElement | SVGUseElement>;
     getIntersectionList(rect: SVGRect, referenceElement: SVGElement): NodeListOf<SVGCircleElement | SVGEllipseElement | SVGImageElement | SVGLineElement | SVGPathElement | SVGPolygonElement | SVGPolylineElement | SVGRectElement | SVGTextElement | SVGUseElement>;
-    /** @deprecated */
     pauseAnimations(): void;
-    /** @deprecated */
     setCurrentTime(seconds: number): void;
     /** @deprecated */
     suspendRedraw(maxWaitMilliseconds: number): number;
-    /** @deprecated */
     unpauseAnimations(): void;
     /** @deprecated */
     unsuspendRedraw(suspendHandleID: number): void;
@@ -14059,7 +14553,7 @@ declare var SVGSVGElement: {
     readonly SVG_ZOOMANDPAN_UNKNOWN: number;
 };
 
-/** The SVGScriptElement interface corresponds to the SVG <script> element. */
+/** Corresponds to the SVG <script> element. */
 interface SVGScriptElement extends SVGElement, SVGURIReference {
     type: string;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGScriptElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
@@ -14073,7 +14567,7 @@ declare var SVGScriptElement: {
     new(): SVGScriptElement;
 };
 
-/** The SVGStopElement interface corresponds to the <stop> element. */
+/** Corresponds to the <stop> element. */
 interface SVGStopElement extends SVGElement {
     readonly offset: SVGAnimatedNumber;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGStopElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
@@ -14106,7 +14600,7 @@ declare var SVGStringList: {
     new(): SVGStringList;
 };
 
-/** The SVGStyleElement interface corresponds to the SVG <style> element. */
+/** Corresponds to the SVG <style> element. */
 interface SVGStyleElement extends SVGElement {
     disabled: boolean;
     media: string;
@@ -14123,7 +14617,7 @@ declare var SVGStyleElement: {
     new(): SVGStyleElement;
 };
 
-/** The SVGSwitchElement interface corresponds to the <switch> element. */
+/** Corresponds to the <switch> element. */
 interface SVGSwitchElement extends SVGGraphicsElement {
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGSwitchElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
@@ -14136,7 +14630,7 @@ declare var SVGSwitchElement: {
     new(): SVGSwitchElement;
 };
 
-/** The SVGSymbolElement interface corresponds to the <symbol> element. */
+/** Corresponds to the <symbol> element. */
 interface SVGSymbolElement extends SVGElement, SVGFitToViewBox {
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGSymbolElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
@@ -14149,7 +14643,7 @@ declare var SVGSymbolElement: {
     new(): SVGSymbolElement;
 };
 
-/** The SVGTSpanElement interface represents a <tspan> element. */
+/** A <tspan> element. */
 interface SVGTSpanElement extends SVGTextPositioningElement {
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGTSpanElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
@@ -14167,7 +14661,7 @@ interface SVGTests {
     readonly systemLanguage: SVGStringList;
 }
 
-/** The SVGTextContentElement interface is implemented by elements that support rendering child text content. It is inherited by various text-related interfaces, such as SVGTextElement, SVGTSpanElement, SVGTRefElement, SVGAltGlyphElement and SVGTextPathElement. */
+/** Implemented by elements that support rendering child text content. It is inherited by various text-related interfaces, such as SVGTextElement, SVGTSpanElement, SVGTRefElement, SVGAltGlyphElement and SVGTextPathElement. */
 interface SVGTextContentElement extends SVGGraphicsElement {
     readonly lengthAdjust: SVGAnimatedEnumeration;
     readonly textLength: SVGAnimatedLength;
@@ -14197,7 +14691,7 @@ declare var SVGTextContentElement: {
     readonly LENGTHADJUST_UNKNOWN: number;
 };
 
-/** The SVGTextElement interface corresponds to the <text> elements. */
+/** Corresponds to the <text> elements. */
 interface SVGTextElement extends SVGTextPositioningElement {
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGTextElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
@@ -14210,7 +14704,7 @@ declare var SVGTextElement: {
     new(): SVGTextElement;
 };
 
-/** The SVGTextPathElement interface corresponds to the <textPath> element. */
+/** Corresponds to the <textPath> element. */
 interface SVGTextPathElement extends SVGTextContentElement, SVGURIReference {
     readonly method: SVGAnimatedEnumeration;
     readonly spacing: SVGAnimatedEnumeration;
@@ -14238,7 +14732,7 @@ declare var SVGTextPathElement: {
     readonly TEXTPATH_SPACINGTYPE_UNKNOWN: number;
 };
 
-/** The SVGTextPositioningElement interface is implemented by elements that support attributes that position individual text glyphs. It is inherited by SVGTextElement, SVGTSpanElement, SVGTRefElement and SVGAltGlyphElement. */
+/** Implemented by elements that support attributes that position individual text glyphs. It is inherited by SVGTextElement, SVGTSpanElement, SVGTRefElement and SVGAltGlyphElement. */
 interface SVGTextPositioningElement extends SVGTextContentElement {
     readonly dx: SVGAnimatedLengthList;
     readonly dy: SVGAnimatedLengthList;
@@ -14256,7 +14750,7 @@ declare var SVGTextPositioningElement: {
     new(): SVGTextPositioningElement;
 };
 
-/** The SVGTitleElement interface corresponds to the <title> element. */
+/** Corresponds to the <title> element. */
 interface SVGTitleElement extends SVGElement {
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGTitleElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
@@ -14324,7 +14818,7 @@ interface SVGURIReference {
     readonly href: SVGAnimatedString;
 }
 
-/** The SVGUnitTypes interface defines a commonly used set of constants used for reflecting gradientUnits, patternContentUnits and other similar attributes. */
+/** A commonly used set of constants used for reflecting gradientUnits, patternContentUnits and other similar attributes. */
 interface SVGUnitTypes {
     readonly SVG_UNIT_TYPE_OBJECTBOUNDINGBOX: number;
     readonly SVG_UNIT_TYPE_UNKNOWN: number;
@@ -14339,7 +14833,7 @@ declare var SVGUnitTypes: {
     readonly SVG_UNIT_TYPE_USERSPACEONUSE: number;
 };
 
-/** The SVGUseElement interface corresponds to the <use> element. */
+/** Corresponds to the <use> element. */
 interface SVGUseElement extends SVGGraphicsElement, SVGURIReference {
     readonly animatedInstanceRoot: SVGElementInstance | null;
     readonly height: SVGAnimatedLength;
@@ -14358,7 +14852,7 @@ declare var SVGUseElement: {
     new(): SVGUseElement;
 };
 
-/** The SVGViewElement interface provides access to the properties of <view> elements, as well as methods to manipulate them. */
+/** Provides access to the properties of <view> elements, as well as methods to manipulate them. */
 interface SVGViewElement extends SVGElement, SVGFitToViewBox, SVGZoomAndPan {
     /** @deprecated */
     readonly viewTarget: SVGStringList;
@@ -14376,7 +14870,7 @@ declare var SVGViewElement: {
     readonly SVG_ZOOMANDPAN_UNKNOWN: number;
 };
 
-/** The SVGZoomAndPan interface is used to reflect the zoomAndPan attribute, and is mixed in to other interfaces for elements that support this attribute. */
+/** Used to reflect the zoomAndPan attribute, and is mixed in to other interfaces for elements that support this attribute. */
 interface SVGZoomAndPan {
     readonly zoomAndPan: number;
 }
@@ -14420,7 +14914,7 @@ declare var ScopedCredentialInfo: {
     new(): ScopedCredentialInfo;
 };
 
-/** The Screen interface represents a screen, usually the one on which the current window is being rendered, and is obtained using window.screen. */
+/** A screen, usually the one on which the current window is being rendered, and is obtained using window.screen. */
 interface Screen {
     readonly availHeight: number;
     readonly availWidth: number;
@@ -14461,7 +14955,7 @@ interface ScriptProcessorNodeEventMap {
     "audioprocess": AudioProcessingEvent;
 }
 
-/** The ScriptProcessorNode interface allows the generation, processing, or analyzing of audio using JavaScript. */
+/** Allows the generation, processing, or analyzing of audio using JavaScript. */
 interface ScriptProcessorNode extends AudioNode {
     /** @deprecated */
     readonly bufferSize: number;
@@ -14478,7 +14972,7 @@ declare var ScriptProcessorNode: {
     new(): ScriptProcessorNode;
 };
 
-/** The SecurityPolicyViolationEvent interface inherits from Event, and represents the event object of an event sent on a document or worker when its content security policy is violated. */
+/** Inherits from Event, and represents the event object of an event sent on a document or worker when its content security policy is violated. */
 interface SecurityPolicyViolationEvent extends Event {
     readonly blockedURI: string;
     readonly columnNumber: number;
@@ -14537,12 +15031,13 @@ interface ServiceWorkerEventMap extends AbstractWorkerEventMap {
     "statechange": Event;
 }
 
-/** The ServiceWorker interface of the ServiceWorker API provides a reference to a service worker. Multiple browsing contexts (e.g. pages, workers, etc.) can be associated with the same service worker, each through a unique ServiceWorker object. */
+/** This ServiceWorker API interface provides a reference to a service worker. Multiple browsing contexts (e.g. pages, workers, etc.) can be associated with the same service worker, each through a unique ServiceWorker object. */
 interface ServiceWorker extends EventTarget, AbstractWorker {
     onstatechange: ((this: ServiceWorker, ev: Event) => any) | null;
     readonly scriptURL: string;
     readonly state: ServiceWorkerState;
-    postMessage(message: any, transfer?: Transferable[]): void;
+    postMessage(message: any, transfer: Transferable[]): void;
+    postMessage(message: any, options?: PostMessageOptions): void;
     addEventListener<K extends keyof ServiceWorkerEventMap>(type: K, listener: (this: ServiceWorker, ev: ServiceWorkerEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof ServiceWorkerEventMap>(type: K, listener: (this: ServiceWorker, ev: ServiceWorkerEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -14582,7 +15077,7 @@ declare var ServiceWorkerContainer: {
     new(): ServiceWorkerContainer;
 };
 
-/** The ServiceWorkerMessageEvent interface of the ServiceWorker API contains information about an event sent to a ServiceWorkerContainer target. This extends the default message event to allow setting a ServiceWorker object as the source of a message. The event object is accessed via the handler function of a message event, when fired by a message received from a service worker. */
+/** This ServiceWorker API interface contains information about an event sent to a ServiceWorkerContainer target. This extends the default message event to allow setting a ServiceWorker object as the source of a message. The event object is accessed via the handler function of a message event, when fired by a message received from a service worker. */
 interface ServiceWorkerMessageEvent extends Event {
     readonly data: any;
     readonly lastEventId: string;
@@ -14600,7 +15095,7 @@ interface ServiceWorkerRegistrationEventMap {
     "updatefound": Event;
 }
 
-/** The ServiceWorkerRegistration interface of the ServiceWorker API represents the service worker registration. You register a service worker to control one or more pages that share the same origin. */
+/** This ServiceWorker API interface represents the service worker registration. You register a service worker to control one or more pages that share the same origin. */
 interface ServiceWorkerRegistration extends EventTarget {
     readonly active: ServiceWorker | null;
     readonly installing: ServiceWorker | null;
@@ -14626,9 +15121,8 @@ declare var ServiceWorkerRegistration: {
     new(): ServiceWorkerRegistration;
 };
 
-interface ShadowRoot extends DocumentFragment, DocumentOrShadowRoot {
+interface ShadowRoot extends DocumentFragment, DocumentOrShadowRoot, InnerHTML {
     readonly host: Element;
-    innerHTML: string;
     readonly mode: ShadowRootMode;
 }
 
@@ -14649,7 +15143,7 @@ interface SourceBufferEventMap {
     "updatestart": Event;
 }
 
-/** The SourceBuffer interface represents a chunk of media to be passed into an HTMLMediaElement and played, via a MediaSource object. This can be made up of one or several media segments. */
+/** A chunk of media to be passed into an HTMLMediaElement and played, via a MediaSource object. This can be made up of one or several media segments. */
 interface SourceBuffer extends EventTarget {
     appendWindowEnd: number;
     appendWindowStart: number;
@@ -14684,7 +15178,7 @@ interface SourceBufferListEventMap {
     "removesourcebuffer": Event;
 }
 
-/** The SourceBufferList interface represents a simple container list for multiple SourceBuffer objects. */
+/** A simple container list for multiple SourceBuffer objects. */
 interface SourceBufferList extends EventTarget {
     readonly length: number;
     onaddsourcebuffer: ((this: SourceBufferList, ev: Event) => any) | null;
@@ -14829,7 +15323,7 @@ interface SpeechSynthesisEventMap {
     "voiceschanged": Event;
 }
 
-/** The SpeechSynthesis interface of the Web Speech API is the controller interface for the speech service; this can be used to retrieve information about the synthesis voices available on the device, start and pause speech, and other commands besides. */
+/** This Web Speech API interface is the controller interface for the speech service; this can be used to retrieve information about the synthesis voices available on the device, start and pause speech, and other commands besides. */
 interface SpeechSynthesis extends EventTarget {
     onvoiceschanged: ((this: SpeechSynthesis, ev: Event) => any) | null;
     readonly paused: boolean;
@@ -14860,7 +15354,7 @@ declare var SpeechSynthesisErrorEvent: {
     new(): SpeechSynthesisErrorEvent;
 };
 
-/** The SpeechSynthesisEvent interface of the Web Speech API contains information about the current state of SpeechSynthesisUtterance objects that have been processed in the speech service. */
+/** This Web Speech API interface contains information about the current state of SpeechSynthesisUtterance objects that have been processed in the speech service. */
 interface SpeechSynthesisEvent extends Event {
     readonly charIndex: number;
     readonly elapsedTime: number;
@@ -14883,7 +15377,7 @@ interface SpeechSynthesisUtteranceEventMap {
     "start": SpeechSynthesisEvent;
 }
 
-/** The SpeechSynthesisUtterance interface of the Web Speech API represents a speech request. It contains the content the speech service should read and information about how to read it (e.g. language, pitch and volume.) */
+/** This Web Speech API interface represents a speech request. It contains the content the speech service should read and information about how to read it (e.g. language, pitch and volume.) */
 interface SpeechSynthesisUtterance extends EventTarget {
     lang: string;
     onboundary: ((this: SpeechSynthesisUtterance, ev: SpeechSynthesisEvent) => any) | null;
@@ -14910,7 +15404,7 @@ declare var SpeechSynthesisUtterance: {
     new(text: string): SpeechSynthesisUtterance;
 };
 
-/** The SpeechSynthesisVoice interface of the Web Speech API represents a voice that the system supports. Every SpeechSynthesisVoice has its own relative speech service including information about language, name and URI. */
+/** This Web Speech API interface represents a voice that the system supports. Every SpeechSynthesisVoice has its own relative speech service including information about language, name and URI. */
 interface SpeechSynthesisVoice {
     readonly default: boolean;
     readonly lang: string;
@@ -14942,11 +15436,10 @@ declare var StereoPannerNode: {
     new(context: BaseAudioContext, options?: StereoPannerOptions): StereoPannerNode;
 };
 
-/** The Storage interface of the Web Storage API provides access to a particular domain's session or local storage. It allows, for example, the addition, modification, or deletion of stored data items. */
+/** This Web Storage API interface provides access to a particular domain's session or local storage. It allows, for example, the addition, modification, or deletion of stored data items. */
 interface Storage {
     /**
-     * Returns the number of key/value pairs currently present in the list associated with the
-     * object.
+     * Returns the number of key/value pairs currently present in the list associated with the object.
      */
     readonly length: number;
     /**
@@ -14954,20 +15447,21 @@ interface Storage {
      */
     clear(): void;
     /**
-     * value = storage[key]
+     * Returns the current value associated with the given key, or null if the given key does not exist in the list associated with the object.
      */
     getItem(key: string): string | null;
     /**
-     * Returns the name of the nth key in the list, or null if n is greater
-     * than or equal to the number of key/value pairs in the object.
+     * Returns the name of the nth key in the list, or null if n is greater than or equal to the number of key/value pairs in the object.
      */
     key(index: number): string | null;
     /**
-     * delete storage[key]
+     * Removes the key/value pair with the given key from the list associated with the object, if a key/value pair with the given key exists.
      */
     removeItem(key: string): void;
     /**
-     * storage[key] = value
+     * Sets the value of the pair identified by key to value, creating a new key/value pair if none existed for key previously.
+     * 
+     * Throws a "QuotaExceededError" DOMException exception if the new value couldn't be set. (Setting could fail if, e.g., the user has disabled storage for the site, or if the quota has been exceeded.)
      */
     setItem(key: string, value: string): void;
     [name: string]: any;
@@ -15028,7 +15522,7 @@ declare var StyleMedia: {
     new(): StyleMedia;
 };
 
-/** An object implementing the StyleSheet interface represents a single style sheet. CSS style sheets will further implement the more specialized CSSStyleSheet interface. */
+/** A single style sheet. CSS style sheets will further implement the more specialized CSSStyleSheet interface. */
 interface StyleSheet {
     disabled: boolean;
     readonly href: string | null;
@@ -15044,7 +15538,7 @@ declare var StyleSheet: {
     new(): StyleSheet;
 };
 
-/** The StyleSheetList interface represents a list of StyleSheet. */
+/** A list of StyleSheet. */
 interface StyleSheetList {
     readonly length: number;
     item(index: number): StyleSheet | null;
@@ -15056,7 +15550,7 @@ declare var StyleSheetList: {
     new(): StyleSheetList;
 };
 
-/** The SubtleCrypto interface represents a set of cryptographic primitives. It is available via the Crypto.subtle properties available in a window context (via Window.crypto). */
+/** This Web Crypto API interface provides a number of low-level cryptographic functions. It is accessed via the Crypto.subtle properties available in a window context (via Window.crypto). */
 interface SubtleCrypto {
     decrypt(algorithm: string | RsaOaepParams | AesCtrParams | AesCbcParams | AesCmacParams | AesGcmParams | AesCfbParams, key: CryptoKey, data: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer): PromiseLike<ArrayBuffer>;
     deriveBits(algorithm: string | EcdhKeyDeriveParams | DhKeyDeriveParams | ConcatParams | HkdfCtrParams | Pbkdf2Params, baseKey: CryptoKey, length: number): PromiseLike<ArrayBuffer>;
@@ -15083,7 +15577,7 @@ declare var SubtleCrypto: {
     new(): SubtleCrypto;
 };
 
-/** The SyncManager interface of the the ServiceWorker API provides an interface for registering and listing sync registrations. */
+/** This ServiceWorker API interface provides an interface for registering and listing sync registrations. */
 interface SyncManager {
     getTags(): Promise<string[]>;
     register(tag: string): Promise<void>;
@@ -15094,7 +15588,7 @@ declare var SyncManager: {
     new(): SyncManager;
 };
 
-/** The Text interface represents the textual content of Element or Attr.  If an element has no markup within its content, it has a single child implementing Text that contains the element's text.  However, if the element contains markup, it is parsed into information items and Text nodes that form its children. */
+/** The textual content of Element or Attr. If an element has no markup within its content, it has a single child implementing Text that contains the element's text. However, if the element contains markup, it is parsed into information items and Text nodes that form its children. */
 interface Text extends CharacterData, Slotable {
     readonly assignedSlot: HTMLSlotElement | null;
     /**
@@ -15112,32 +15606,19 @@ declare var Text: {
     new(data?: string): Text;
 };
 
-/** The TextDecoder interface represents a decoder for a specific method, that is a specific character encoding, like utf-8, iso-8859-2, koi8, cp1261, gbk, etc. A decoder takes a stream of bytes as input and emits a stream of code points. For a more scalable, non-native library, see StringView – a C-like representation of strings based on typed arrays. */
-interface TextDecoder {
+/** A decoder for a specific method, that is a specific character encoding, like utf-8, iso-8859-2, koi8, cp1261, gbk, etc. A decoder takes a stream of bytes as input and emits a stream of code points. For a more scalable, non-native library, see StringView – a C-like representation of strings based on typed arrays. */
+interface TextDecoder extends TextDecoderCommon {
     /**
-     * Returns encoding's name, lowercased.
-     */
-    readonly encoding: string;
-    /**
-     * Returns true if error mode is "fatal", and false
-     * otherwise.
-     */
-    readonly fatal: boolean;
-    /**
-     * Returns true if ignore BOM flag is set, and false otherwise.
-     */
-    readonly ignoreBOM: boolean;
-    /**
-     * Returns the result of running encoding's decoder. The
-     * method can be invoked zero or more times with options's stream set to
-     * true, and then once without options's stream (or set to false), to process
-     * a fragmented stream. If the invocation without options's stream (or set to
-     * false) has no input, it's clearest to omit both arguments.
+     * Returns the result of running encoding's decoder. The method can be invoked zero or more times with options's stream set to true, and then once without options's stream (or set to false), to process a fragmented stream. If the invocation without options's stream (or set to false) has no input, it's clearest to omit both arguments.
+     * 
+     * ```
      * var string = "", decoder = new TextDecoder(encoding), buffer;
      * while(buffer = next_chunk()) {
-     * string += decoder.decode(buffer, {stream:true});
+     *   string += decoder.decode(buffer, {stream:true});
      * }
      * string += decoder.decode(); // end-of-stream
+     * ```
+     * 
      * If the error mode is "fatal" and encoding's decoder returns error, throws a TypeError.
      */
     decode(input?: BufferSource, options?: TextDecodeOptions): string;
@@ -15148,16 +15629,39 @@ declare var TextDecoder: {
     new(label?: string, options?: TextDecoderOptions): TextDecoder;
 };
 
-/** TextEncoder takes a stream of code points as input and emits a stream of bytes. For a more scalable, non-native library, see StringView – a C-like representation of strings based on typed arrays. */
-interface TextEncoder {
+interface TextDecoderCommon {
     /**
-     * Returns "utf-8".
+     * Returns encoding's name, lowercased.
      */
     readonly encoding: string;
+    /**
+     * Returns true if error mode is "fatal", and false otherwise.
+     */
+    readonly fatal: boolean;
+    /**
+     * Returns true if ignore BOM flag is set, and false otherwise.
+     */
+    readonly ignoreBOM: boolean;
+}
+
+interface TextDecoderStream extends TextDecoderCommon, GenericTransformStream {
+}
+
+declare var TextDecoderStream: {
+    prototype: TextDecoderStream;
+    new(label?: string, options?: TextDecoderOptions): TextDecoderStream;
+};
+
+/** TextEncoder takes a stream of code points as input and emits a stream of bytes. For a more scalable, non-native library, see StringView – a C-like representation of strings based on typed arrays. */
+interface TextEncoder extends TextEncoderCommon {
     /**
      * Returns the result of running UTF-8's encoder.
      */
     encode(input?: string): Uint8Array;
+    /**
+     * Runs the UTF-8 encoder on source, stores the result of that operation into destination, and returns the progress made as a dictionary whereby read is the number of converted code units of source and written is the number of bytes modified in destination.
+     */
+    encodeInto(source: string, destination: Uint8Array): TextEncoderEncodeIntoResult;
 }
 
 declare var TextEncoder: {
@@ -15165,6 +15669,21 @@ declare var TextEncoder: {
     new(): TextEncoder;
 };
 
+interface TextEncoderCommon {
+    /**
+     * Returns "utf-8".
+     */
+    readonly encoding: string;
+}
+
+interface TextEncoderStream extends TextEncoderCommon, GenericTransformStream {
+}
+
+declare var TextEncoderStream: {
+    prototype: TextEncoderStream;
+    new(): TextEncoderStream;
+};
+
 interface TextEvent extends UIEvent {
     readonly data: string;
     initTextEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, dataArg: string, inputMethod: number, locale: string): void;
@@ -15195,22 +15714,55 @@ declare var TextEvent: {
     readonly DOM_INPUT_METHOD_VOICE: number;
 };
 
-/** The TextMetrics interface represents the dimension of a text in the canvas, as created by the CanvasRenderingContext2D.measureText() method. */
+/** The dimensions of a piece of text in the canvas, as created by the CanvasRenderingContext2D.measureText() method. */
 interface TextMetrics {
+    /**
+     * Returns the measurement described below.
+     */
     readonly actualBoundingBoxAscent: number;
+    /**
+     * Returns the measurement described below.
+     */
     readonly actualBoundingBoxDescent: number;
+    /**
+     * Returns the measurement described below.
+     */
     readonly actualBoundingBoxLeft: number;
+    /**
+     * Returns the measurement described below.
+     */
     readonly actualBoundingBoxRight: number;
+    /**
+     * Returns the measurement described below.
+     */
     readonly alphabeticBaseline: number;
+    /**
+     * Returns the measurement described below.
+     */
     readonly emHeightAscent: number;
+    /**
+     * Returns the measurement described below.
+     */
     readonly emHeightDescent: number;
+    /**
+     * Returns the measurement described below.
+     */
     readonly fontBoundingBoxAscent: number;
+    /**
+     * Returns the measurement described below.
+     */
     readonly fontBoundingBoxDescent: number;
+    /**
+     * Returns the measurement described below.
+     */
     readonly hangingBaseline: number;
     /**
      * Returns the measurement described below.
      */
     readonly ideographicBaseline: number;
+    /**
+     * Returns the measurement described below.
+     */
     readonly width: number;
 }
 
@@ -15325,7 +15877,7 @@ declare var TextTrackList: {
     new(): TextTrackList;
 };
 
-/** The TimeRanges interface is used to represent a set of time ranges, primarily for the purpose of tracking which portions of media have been buffered when loading it for use by the <audio> and <video> elements. */
+/** Used to represent a set of time ranges, primarily for the purpose of tracking which portions of media have been buffered when loading it for use by the <audio> and <video> elements. */
 interface TimeRanges {
     readonly length: number;
     end(index: number): number;
@@ -15337,7 +15889,7 @@ declare var TimeRanges: {
     new(): TimeRanges;
 };
 
-/** The Touch interface represents a single contact point on a touch-sensitive device. The contact point is commonly a finger or stylus and the device may be a touchscreen or trackpad. */
+/** A single contact point on a touch-sensitive device. The contact point is commonly a finger or stylus and the device may be a touchscreen or trackpad. */
 interface Touch {
     readonly altitudeAngle: number;
     readonly azimuthAngle: number;
@@ -15361,7 +15913,7 @@ declare var Touch: {
     new(touchInitDict: TouchInit): Touch;
 };
 
-/** The TouchEvent interface represents an event sent when the state of contacts with a touch-sensitive surface changes. This surface can be a touch screen or trackpad, for example. The event can describe one or more points of contact with the screen and includes support for detecting movement, addition and removal of contact points, and so forth. */
+/** An event sent when the state of contacts with a touch-sensitive surface changes. This surface can be a touch screen or trackpad, for example. The event can describe one or more points of contact with the screen and includes support for detecting movement, addition and removal of contact points, and so forth. */
 interface TouchEvent extends UIEvent {
     readonly altKey: boolean;
     readonly changedTouches: TouchList;
@@ -15377,7 +15929,7 @@ declare var TouchEvent: {
     new(type: string, eventInitDict?: TouchEventInit): TouchEvent;
 };
 
-/** The TouchList interface represents a list of contact points with a touch surface; for example, if the user has three fingers on the touch surface (such as a screen or trackpad), the corresponding TouchList object would have one Touch object for each finger, for a total of three entries. */
+/** A list of contact points on a touch surface. For example, if the user has three fingers on the touch surface (such as a screen or trackpad), the corresponding TouchList object would have one Touch object for each finger, for a total of three entries. */
 interface TouchList {
     readonly length: number;
     item(index: number): Touch | null;
@@ -15416,7 +15968,7 @@ interface TransformStreamDefaultController<O = any> {
     terminate(): void;
 }
 
-/** The TransitionEvent interface represents events providing information related to transitions. */
+/** Events providing information related to transitions. */
 interface TransitionEvent extends Event {
     readonly elapsedTime: number;
     readonly propertyName: string;
@@ -15428,7 +15980,7 @@ declare var TransitionEvent: {
     new(type: string, transitionEventInitDict?: TransitionEventInit): TransitionEvent;
 };
 
-/** The TreeWalker object represents the nodes of a document subtree and a position within them. */
+/** The nodes of a document subtree and a position within them. */
 interface TreeWalker {
     currentNode: Node;
     readonly filter: NodeFilter | null;
@@ -15448,16 +16000,17 @@ declare var TreeWalker: {
     new(): TreeWalker;
 };
 
-/** The UIEvent interface represents simple user interface events. */
+/** Simple user interface events. */
 interface UIEvent extends Event {
     readonly detail: number;
-    readonly view: Window;
-    initUIEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number): void;
+    readonly view: Window | null;
+    /** @deprecated */
+    readonly which: number;
 }
 
 declare var UIEvent: {
     prototype: UIEvent;
-    new(typeArg: string, eventInitDict?: UIEventInit): UIEvent;
+    new(type: string, eventInitDict?: UIEventInit): UIEvent;
 };
 
 /** The URL interface represents an object providing static methods used for creating object URLs. */
@@ -15521,7 +16074,7 @@ declare var URLSearchParams: {
     new(init?: string[][] | Record<string, string> | string | URLSearchParams): URLSearchParams;
 };
 
-/** The VRDisplay interface of the WebVR API represents any VR device supported by this API. It includes generic information such as device IDs and descriptions, as well as methods for starting to present a VR scene, retrieving eye parameters and display capabilities, and other important functionality. */
+/** This WebVR API interface represents any VR device supported by this API. It includes generic information such as device IDs and descriptions, as well as methods for starting to present a VR scene, retrieving eye parameters and display capabilities, and other important functionality. */
 interface VRDisplay extends EventTarget {
     readonly capabilities: VRDisplayCapabilities;
     depthFar: number;
@@ -15549,7 +16102,7 @@ declare var VRDisplay: {
     new(): VRDisplay;
 };
 
-/** The VRDisplayCapabilities interface of the WebVR API describes the capabilities of a VRDisplay — its features can be used to perform VR device capability tests, for example can it return position information. */
+/** This WebVR API interface describes the capabilities of a VRDisplay — its features can be used to perform VR device capability tests, for example can it return position information. */
 interface VRDisplayCapabilities {
     readonly canPresent: boolean;
     readonly hasExternalDisplay: boolean;
@@ -15563,7 +16116,7 @@ declare var VRDisplayCapabilities: {
     new(): VRDisplayCapabilities;
 };
 
-/** The VRDisplayEvent interface of the WebVR API represents represents the event object of WebVR-related events (see the list of WebVR window extensions). */
+/** This WebVR API interface represents represents the event object of WebVR-related events (see the list of WebVR window extensions). */
 interface VRDisplayEvent extends Event {
     readonly display: VRDisplay;
     readonly reason: VRDisplayEventReason | null;
@@ -15574,7 +16127,7 @@ declare var VRDisplayEvent: {
     new(type: string, eventInitDict: VRDisplayEventInit): VRDisplayEvent;
 };
 
-/** The VREyeParameters interface of the WebVR API represents all the information required to correctly render a scene for a given eye, including field of view information. */
+/** This WebVR API interface represents all the information required to correctly render a scene for a given eye, including field of view information. */
 interface VREyeParameters {
     /** @deprecated */
     readonly fieldOfView: VRFieldOfView;
@@ -15588,7 +16141,7 @@ declare var VREyeParameters: {
     new(): VREyeParameters;
 };
 
-/** The VRFieldOfView interface of the WebVR API represents a field of view defined by 4 different degree values describing the view from a center point. */
+/** This WebVR API interface represents a field of view defined by 4 different degree values describing the view from a center point. */
 interface VRFieldOfView {
     readonly downDegrees: number;
     readonly leftDegrees: number;
@@ -15601,7 +16154,7 @@ declare var VRFieldOfView: {
     new(): VRFieldOfView;
 };
 
-/** The VRFrameData interface of the WebVR API represents all the information needed to render a single frame of a VR scene; constructed by VRDisplay.getFrameData(). */
+/** This WebVR API interface represents all the information needed to render a single frame of a VR scene; constructed by VRDisplay.getFrameData(). */
 interface VRFrameData {
     readonly leftProjectionMatrix: Float32Array;
     readonly leftViewMatrix: Float32Array;
@@ -15616,7 +16169,7 @@ declare var VRFrameData: {
     new(): VRFrameData;
 };
 
-/** The VRPose interface of the WebVR API represents the state of a VR sensor at a given timestamp (which includes orientation, position, velocity, and acceleration information.) */
+/** This WebVR API interface represents the state of a VR sensor at a given timestamp (which includes orientation, position, velocity, and acceleration information.) */
 interface VRPose {
     readonly angularAcceleration: Float32Array | null;
     readonly angularVelocity: Float32Array | null;
@@ -15671,7 +16224,7 @@ declare var VTTRegion: {
     new(): VTTRegion;
 };
 
-/** The ValidityState interface represents the validity states that an element can be in, with respect to constraint validation. Together, they help explain why an element's value fails to validate, if it's not valid. */
+/** The validity states that an element can be in, with respect to constraint validation. Together, they help explain why an element's value fails to validate, if it's not valid. */
 interface ValidityState {
     readonly badInput: boolean;
     readonly customError: boolean;
@@ -15691,7 +16244,7 @@ declare var ValidityState: {
     new(): ValidityState;
 };
 
-/** A VideoPlaybackQuality object is returned by the HTMLVideoElement.getVideoPlaybackQuality() method and contains metrics that can be used to determine the playback quality of a video. */
+/** Returned by the HTMLVideoElement.getVideoPlaybackQuality() method and contains metrics that can be used to determine the playback quality of a video. */
 interface VideoPlaybackQuality {
     readonly corruptedVideoFrames: number;
     readonly creationTime: number;
@@ -15705,7 +16258,7 @@ declare var VideoPlaybackQuality: {
     new(): VideoPlaybackQuality;
 };
 
-/** The VideoTrack interface represents a single video track from a <video> element. */
+/** A single video track from a <video> element. */
 interface VideoTrack {
     readonly id: string;
     kind: string;
@@ -15726,7 +16279,7 @@ interface VideoTrackListEventMap {
     "removetrack": TrackEvent;
 }
 
-/** The VideoTrackList interface is used to represent a list of the video tracks contained within a <video> element, with each track represented by a separate VideoTrack object in the list. */
+/** Used to represent a list of the video tracks contained within a <video> element, with each track represented by a separate VideoTrack object in the list. */
 interface VideoTrackList extends EventTarget {
     readonly length: number;
     onaddtrack: ((this: VideoTrackList, ev: TrackEvent) => any) | null;
@@ -15891,7 +16444,971 @@ declare var WebAuthnAssertion: {
     new(): WebAuthnAssertion;
 };
 
-/** The WebGLActiveInfo interface is part of the WebGL API and represents the information returned by calling the WebGLRenderingContext.getActiveAttrib() and WebGLRenderingContext.getActiveUniform() methods. */
+interface WebGL2RenderingContext extends WebGLRenderingContextBase, WebGL2RenderingContextBase, WebGL2RenderingContextOverloads {
+}
+
+declare var WebGL2RenderingContext: {
+    prototype: WebGL2RenderingContext;
+    new(): WebGL2RenderingContext;
+    readonly ACTIVE_ATTRIBUTES: GLenum;
+    readonly ACTIVE_TEXTURE: GLenum;
+    readonly ACTIVE_UNIFORMS: GLenum;
+    readonly ALIASED_LINE_WIDTH_RANGE: GLenum;
+    readonly ALIASED_POINT_SIZE_RANGE: GLenum;
+    readonly ALPHA: GLenum;
+    readonly ALPHA_BITS: GLenum;
+    readonly ALWAYS: GLenum;
+    readonly ARRAY_BUFFER: GLenum;
+    readonly ARRAY_BUFFER_BINDING: GLenum;
+    readonly ATTACHED_SHADERS: GLenum;
+    readonly BACK: GLenum;
+    readonly BLEND: GLenum;
+    readonly BLEND_COLOR: GLenum;
+    readonly BLEND_DST_ALPHA: GLenum;
+    readonly BLEND_DST_RGB: GLenum;
+    readonly BLEND_EQUATION: GLenum;
+    readonly BLEND_EQUATION_ALPHA: GLenum;
+    readonly BLEND_EQUATION_RGB: GLenum;
+    readonly BLEND_SRC_ALPHA: GLenum;
+    readonly BLEND_SRC_RGB: GLenum;
+    readonly BLUE_BITS: GLenum;
+    readonly BOOL: GLenum;
+    readonly BOOL_VEC2: GLenum;
+    readonly BOOL_VEC3: GLenum;
+    readonly BOOL_VEC4: GLenum;
+    readonly BROWSER_DEFAULT_WEBGL: GLenum;
+    readonly BUFFER_SIZE: GLenum;
+    readonly BUFFER_USAGE: GLenum;
+    readonly BYTE: GLenum;
+    readonly CCW: GLenum;
+    readonly CLAMP_TO_EDGE: GLenum;
+    readonly COLOR_ATTACHMENT0: GLenum;
+    readonly COLOR_BUFFER_BIT: GLenum;
+    readonly COLOR_CLEAR_VALUE: GLenum;
+    readonly COLOR_WRITEMASK: GLenum;
+    readonly COMPILE_STATUS: GLenum;
+    readonly COMPRESSED_TEXTURE_FORMATS: GLenum;
+    readonly CONSTANT_ALPHA: GLenum;
+    readonly CONSTANT_COLOR: GLenum;
+    readonly CONTEXT_LOST_WEBGL: GLenum;
+    readonly CULL_FACE: GLenum;
+    readonly CULL_FACE_MODE: GLenum;
+    readonly CURRENT_PROGRAM: GLenum;
+    readonly CURRENT_VERTEX_ATTRIB: GLenum;
+    readonly CW: GLenum;
+    readonly DECR: GLenum;
+    readonly DECR_WRAP: GLenum;
+    readonly DELETE_STATUS: GLenum;
+    readonly DEPTH_ATTACHMENT: GLenum;
+    readonly DEPTH_BITS: GLenum;
+    readonly DEPTH_BUFFER_BIT: GLenum;
+    readonly DEPTH_CLEAR_VALUE: GLenum;
+    readonly DEPTH_COMPONENT: GLenum;
+    readonly DEPTH_COMPONENT16: GLenum;
+    readonly DEPTH_FUNC: GLenum;
+    readonly DEPTH_RANGE: GLenum;
+    readonly DEPTH_STENCIL: GLenum;
+    readonly DEPTH_STENCIL_ATTACHMENT: GLenum;
+    readonly DEPTH_TEST: GLenum;
+    readonly DEPTH_WRITEMASK: GLenum;
+    readonly DITHER: GLenum;
+    readonly DONT_CARE: GLenum;
+    readonly DST_ALPHA: GLenum;
+    readonly DST_COLOR: GLenum;
+    readonly DYNAMIC_DRAW: GLenum;
+    readonly ELEMENT_ARRAY_BUFFER: GLenum;
+    readonly ELEMENT_ARRAY_BUFFER_BINDING: GLenum;
+    readonly EQUAL: GLenum;
+    readonly FASTEST: GLenum;
+    readonly FLOAT: GLenum;
+    readonly FLOAT_MAT2: GLenum;
+    readonly FLOAT_MAT3: GLenum;
+    readonly FLOAT_MAT4: GLenum;
+    readonly FLOAT_VEC2: GLenum;
+    readonly FLOAT_VEC3: GLenum;
+    readonly FLOAT_VEC4: GLenum;
+    readonly FRAGMENT_SHADER: GLenum;
+    readonly FRAMEBUFFER: GLenum;
+    readonly FRAMEBUFFER_ATTACHMENT_OBJECT_NAME: GLenum;
+    readonly FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE: GLenum;
+    readonly FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE: GLenum;
+    readonly FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL: GLenum;
+    readonly FRAMEBUFFER_BINDING: GLenum;
+    readonly FRAMEBUFFER_COMPLETE: GLenum;
+    readonly FRAMEBUFFER_INCOMPLETE_ATTACHMENT: GLenum;
+    readonly FRAMEBUFFER_INCOMPLETE_DIMENSIONS: GLenum;
+    readonly FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT: GLenum;
+    readonly FRAMEBUFFER_UNSUPPORTED: GLenum;
+    readonly FRONT: GLenum;
+    readonly FRONT_AND_BACK: GLenum;
+    readonly FRONT_FACE: GLenum;
+    readonly FUNC_ADD: GLenum;
+    readonly FUNC_REVERSE_SUBTRACT: GLenum;
+    readonly FUNC_SUBTRACT: GLenum;
+    readonly GENERATE_MIPMAP_HINT: GLenum;
+    readonly GEQUAL: GLenum;
+    readonly GREATER: GLenum;
+    readonly GREEN_BITS: GLenum;
+    readonly HIGH_FLOAT: GLenum;
+    readonly HIGH_INT: GLenum;
+    readonly IMPLEMENTATION_COLOR_READ_FORMAT: GLenum;
+    readonly IMPLEMENTATION_COLOR_READ_TYPE: GLenum;
+    readonly INCR: GLenum;
+    readonly INCR_WRAP: GLenum;
+    readonly INT: GLenum;
+    readonly INT_VEC2: GLenum;
+    readonly INT_VEC3: GLenum;
+    readonly INT_VEC4: GLenum;
+    readonly INVALID_ENUM: GLenum;
+    readonly INVALID_FRAMEBUFFER_OPERATION: GLenum;
+    readonly INVALID_OPERATION: GLenum;
+    readonly INVALID_VALUE: GLenum;
+    readonly INVERT: GLenum;
+    readonly KEEP: GLenum;
+    readonly LEQUAL: GLenum;
+    readonly LESS: GLenum;
+    readonly LINEAR: GLenum;
+    readonly LINEAR_MIPMAP_LINEAR: GLenum;
+    readonly LINEAR_MIPMAP_NEAREST: GLenum;
+    readonly LINES: GLenum;
+    readonly LINE_LOOP: GLenum;
+    readonly LINE_STRIP: GLenum;
+    readonly LINE_WIDTH: GLenum;
+    readonly LINK_STATUS: GLenum;
+    readonly LOW_FLOAT: GLenum;
+    readonly LOW_INT: GLenum;
+    readonly LUMINANCE: GLenum;
+    readonly LUMINANCE_ALPHA: GLenum;
+    readonly MAX_COMBINED_TEXTURE_IMAGE_UNITS: GLenum;
+    readonly MAX_CUBE_MAP_TEXTURE_SIZE: GLenum;
+    readonly MAX_FRAGMENT_UNIFORM_VECTORS: GLenum;
+    readonly MAX_RENDERBUFFER_SIZE: GLenum;
+    readonly MAX_TEXTURE_IMAGE_UNITS: GLenum;
+    readonly MAX_TEXTURE_SIZE: GLenum;
+    readonly MAX_VARYING_VECTORS: GLenum;
+    readonly MAX_VERTEX_ATTRIBS: GLenum;
+    readonly MAX_VERTEX_TEXTURE_IMAGE_UNITS: GLenum;
+    readonly MAX_VERTEX_UNIFORM_VECTORS: GLenum;
+    readonly MAX_VIEWPORT_DIMS: GLenum;
+    readonly MEDIUM_FLOAT: GLenum;
+    readonly MEDIUM_INT: GLenum;
+    readonly MIRRORED_REPEAT: GLenum;
+    readonly NEAREST: GLenum;
+    readonly NEAREST_MIPMAP_LINEAR: GLenum;
+    readonly NEAREST_MIPMAP_NEAREST: GLenum;
+    readonly NEVER: GLenum;
+    readonly NICEST: GLenum;
+    readonly NONE: GLenum;
+    readonly NOTEQUAL: GLenum;
+    readonly NO_ERROR: GLenum;
+    readonly ONE: GLenum;
+    readonly ONE_MINUS_CONSTANT_ALPHA: GLenum;
+    readonly ONE_MINUS_CONSTANT_COLOR: GLenum;
+    readonly ONE_MINUS_DST_ALPHA: GLenum;
+    readonly ONE_MINUS_DST_COLOR: GLenum;
+    readonly ONE_MINUS_SRC_ALPHA: GLenum;
+    readonly ONE_MINUS_SRC_COLOR: GLenum;
+    readonly OUT_OF_MEMORY: GLenum;
+    readonly PACK_ALIGNMENT: GLenum;
+    readonly POINTS: GLenum;
+    readonly POLYGON_OFFSET_FACTOR: GLenum;
+    readonly POLYGON_OFFSET_FILL: GLenum;
+    readonly POLYGON_OFFSET_UNITS: GLenum;
+    readonly RED_BITS: GLenum;
+    readonly RENDERBUFFER: GLenum;
+    readonly RENDERBUFFER_ALPHA_SIZE: GLenum;
+    readonly RENDERBUFFER_BINDING: GLenum;
+    readonly RENDERBUFFER_BLUE_SIZE: GLenum;
+    readonly RENDERBUFFER_DEPTH_SIZE: GLenum;
+    readonly RENDERBUFFER_GREEN_SIZE: GLenum;
+    readonly RENDERBUFFER_HEIGHT: GLenum;
+    readonly RENDERBUFFER_INTERNAL_FORMAT: GLenum;
+    readonly RENDERBUFFER_RED_SIZE: GLenum;
+    readonly RENDERBUFFER_STENCIL_SIZE: GLenum;
+    readonly RENDERBUFFER_WIDTH: GLenum;
+    readonly RENDERER: GLenum;
+    readonly REPEAT: GLenum;
+    readonly REPLACE: GLenum;
+    readonly RGB: GLenum;
+    readonly RGB565: GLenum;
+    readonly RGB5_A1: GLenum;
+    readonly RGBA: GLenum;
+    readonly RGBA4: GLenum;
+    readonly SAMPLER_2D: GLenum;
+    readonly SAMPLER_CUBE: GLenum;
+    readonly SAMPLES: GLenum;
+    readonly SAMPLE_ALPHA_TO_COVERAGE: GLenum;
+    readonly SAMPLE_BUFFERS: GLenum;
+    readonly SAMPLE_COVERAGE: GLenum;
+    readonly SAMPLE_COVERAGE_INVERT: GLenum;
+    readonly SAMPLE_COVERAGE_VALUE: GLenum;
+    readonly SCISSOR_BOX: GLenum;
+    readonly SCISSOR_TEST: GLenum;
+    readonly SHADER_TYPE: GLenum;
+    readonly SHADING_LANGUAGE_VERSION: GLenum;
+    readonly SHORT: GLenum;
+    readonly SRC_ALPHA: GLenum;
+    readonly SRC_ALPHA_SATURATE: GLenum;
+    readonly SRC_COLOR: GLenum;
+    readonly STATIC_DRAW: GLenum;
+    readonly STENCIL_ATTACHMENT: GLenum;
+    readonly STENCIL_BACK_FAIL: GLenum;
+    readonly STENCIL_BACK_FUNC: GLenum;
+    readonly STENCIL_BACK_PASS_DEPTH_FAIL: GLenum;
+    readonly STENCIL_BACK_PASS_DEPTH_PASS: GLenum;
+    readonly STENCIL_BACK_REF: GLenum;
+    readonly STENCIL_BACK_VALUE_MASK: GLenum;
+    readonly STENCIL_BACK_WRITEMASK: GLenum;
+    readonly STENCIL_BITS: GLenum;
+    readonly STENCIL_BUFFER_BIT: GLenum;
+    readonly STENCIL_CLEAR_VALUE: GLenum;
+    readonly STENCIL_FAIL: GLenum;
+    readonly STENCIL_FUNC: GLenum;
+    readonly STENCIL_INDEX8: GLenum;
+    readonly STENCIL_PASS_DEPTH_FAIL: GLenum;
+    readonly STENCIL_PASS_DEPTH_PASS: GLenum;
+    readonly STENCIL_REF: GLenum;
+    readonly STENCIL_TEST: GLenum;
+    readonly STENCIL_VALUE_MASK: GLenum;
+    readonly STENCIL_WRITEMASK: GLenum;
+    readonly STREAM_DRAW: GLenum;
+    readonly SUBPIXEL_BITS: GLenum;
+    readonly TEXTURE: GLenum;
+    readonly TEXTURE0: GLenum;
+    readonly TEXTURE1: GLenum;
+    readonly TEXTURE10: GLenum;
+    readonly TEXTURE11: GLenum;
+    readonly TEXTURE12: GLenum;
+    readonly TEXTURE13: GLenum;
+    readonly TEXTURE14: GLenum;
+    readonly TEXTURE15: GLenum;
+    readonly TEXTURE16: GLenum;
+    readonly TEXTURE17: GLenum;
+    readonly TEXTURE18: GLenum;
+    readonly TEXTURE19: GLenum;
+    readonly TEXTURE2: GLenum;
+    readonly TEXTURE20: GLenum;
+    readonly TEXTURE21: GLenum;
+    readonly TEXTURE22: GLenum;
+    readonly TEXTURE23: GLenum;
+    readonly TEXTURE24: GLenum;
+    readonly TEXTURE25: GLenum;
+    readonly TEXTURE26: GLenum;
+    readonly TEXTURE27: GLenum;
+    readonly TEXTURE28: GLenum;
+    readonly TEXTURE29: GLenum;
+    readonly TEXTURE3: GLenum;
+    readonly TEXTURE30: GLenum;
+    readonly TEXTURE31: GLenum;
+    readonly TEXTURE4: GLenum;
+    readonly TEXTURE5: GLenum;
+    readonly TEXTURE6: GLenum;
+    readonly TEXTURE7: GLenum;
+    readonly TEXTURE8: GLenum;
+    readonly TEXTURE9: GLenum;
+    readonly TEXTURE_2D: GLenum;
+    readonly TEXTURE_BINDING_2D: GLenum;
+    readonly TEXTURE_BINDING_CUBE_MAP: GLenum;
+    readonly TEXTURE_CUBE_MAP: GLenum;
+    readonly TEXTURE_CUBE_MAP_NEGATIVE_X: GLenum;
+    readonly TEXTURE_CUBE_MAP_NEGATIVE_Y: GLenum;
+    readonly TEXTURE_CUBE_MAP_NEGATIVE_Z: GLenum;
+    readonly TEXTURE_CUBE_MAP_POSITIVE_X: GLenum;
+    readonly TEXTURE_CUBE_MAP_POSITIVE_Y: GLenum;
+    readonly TEXTURE_CUBE_MAP_POSITIVE_Z: GLenum;
+    readonly TEXTURE_MAG_FILTER: GLenum;
+    readonly TEXTURE_MIN_FILTER: GLenum;
+    readonly TEXTURE_WRAP_S: GLenum;
+    readonly TEXTURE_WRAP_T: GLenum;
+    readonly TRIANGLES: GLenum;
+    readonly TRIANGLE_FAN: GLenum;
+    readonly TRIANGLE_STRIP: GLenum;
+    readonly UNPACK_ALIGNMENT: GLenum;
+    readonly UNPACK_COLORSPACE_CONVERSION_WEBGL: GLenum;
+    readonly UNPACK_FLIP_Y_WEBGL: GLenum;
+    readonly UNPACK_PREMULTIPLY_ALPHA_WEBGL: GLenum;
+    readonly UNSIGNED_BYTE: GLenum;
+    readonly UNSIGNED_INT: GLenum;
+    readonly UNSIGNED_SHORT: GLenum;
+    readonly UNSIGNED_SHORT_4_4_4_4: GLenum;
+    readonly UNSIGNED_SHORT_5_5_5_1: GLenum;
+    readonly UNSIGNED_SHORT_5_6_5: GLenum;
+    readonly VALIDATE_STATUS: GLenum;
+    readonly VENDOR: GLenum;
+    readonly VERSION: GLenum;
+    readonly VERTEX_ATTRIB_ARRAY_BUFFER_BINDING: GLenum;
+    readonly VERTEX_ATTRIB_ARRAY_ENABLED: GLenum;
+    readonly VERTEX_ATTRIB_ARRAY_NORMALIZED: GLenum;
+    readonly VERTEX_ATTRIB_ARRAY_POINTER: GLenum;
+    readonly VERTEX_ATTRIB_ARRAY_SIZE: GLenum;
+    readonly VERTEX_ATTRIB_ARRAY_STRIDE: GLenum;
+    readonly VERTEX_ATTRIB_ARRAY_TYPE: GLenum;
+    readonly VERTEX_SHADER: GLenum;
+    readonly VIEWPORT: GLenum;
+    readonly ZERO: GLenum;
+    readonly ACTIVE_UNIFORM_BLOCKS: GLenum;
+    readonly ALREADY_SIGNALED: GLenum;
+    readonly ANY_SAMPLES_PASSED: GLenum;
+    readonly ANY_SAMPLES_PASSED_CONSERVATIVE: GLenum;
+    readonly COLOR: GLenum;
+    readonly COLOR_ATTACHMENT1: GLenum;
+    readonly COLOR_ATTACHMENT10: GLenum;
+    readonly COLOR_ATTACHMENT11: GLenum;
+    readonly COLOR_ATTACHMENT12: GLenum;
+    readonly COLOR_ATTACHMENT13: GLenum;
+    readonly COLOR_ATTACHMENT14: GLenum;
+    readonly COLOR_ATTACHMENT15: GLenum;
+    readonly COLOR_ATTACHMENT2: GLenum;
+    readonly COLOR_ATTACHMENT3: GLenum;
+    readonly COLOR_ATTACHMENT4: GLenum;
+    readonly COLOR_ATTACHMENT5: GLenum;
+    readonly COLOR_ATTACHMENT6: GLenum;
+    readonly COLOR_ATTACHMENT7: GLenum;
+    readonly COLOR_ATTACHMENT8: GLenum;
+    readonly COLOR_ATTACHMENT9: GLenum;
+    readonly COMPARE_REF_TO_TEXTURE: GLenum;
+    readonly CONDITION_SATISFIED: GLenum;
+    readonly COPY_READ_BUFFER: GLenum;
+    readonly COPY_READ_BUFFER_BINDING: GLenum;
+    readonly COPY_WRITE_BUFFER: GLenum;
+    readonly COPY_WRITE_BUFFER_BINDING: GLenum;
+    readonly CURRENT_QUERY: GLenum;
+    readonly DEPTH: GLenum;
+    readonly DEPTH24_STENCIL8: GLenum;
+    readonly DEPTH32F_STENCIL8: GLenum;
+    readonly DEPTH_COMPONENT24: GLenum;
+    readonly DEPTH_COMPONENT32F: GLenum;
+    readonly DRAW_BUFFER0: GLenum;
+    readonly DRAW_BUFFER1: GLenum;
+    readonly DRAW_BUFFER10: GLenum;
+    readonly DRAW_BUFFER11: GLenum;
+    readonly DRAW_BUFFER12: GLenum;
+    readonly DRAW_BUFFER13: GLenum;
+    readonly DRAW_BUFFER14: GLenum;
+    readonly DRAW_BUFFER15: GLenum;
+    readonly DRAW_BUFFER2: GLenum;
+    readonly DRAW_BUFFER3: GLenum;
+    readonly DRAW_BUFFER4: GLenum;
+    readonly DRAW_BUFFER5: GLenum;
+    readonly DRAW_BUFFER6: GLenum;
+    readonly DRAW_BUFFER7: GLenum;
+    readonly DRAW_BUFFER8: GLenum;
+    readonly DRAW_BUFFER9: GLenum;
+    readonly DRAW_FRAMEBUFFER: GLenum;
+    readonly DRAW_FRAMEBUFFER_BINDING: GLenum;
+    readonly DYNAMIC_COPY: GLenum;
+    readonly DYNAMIC_READ: GLenum;
+    readonly FLOAT_32_UNSIGNED_INT_24_8_REV: GLenum;
+    readonly FLOAT_MAT2x3: GLenum;
+    readonly FLOAT_MAT2x4: GLenum;
+    readonly FLOAT_MAT3x2: GLenum;
+    readonly FLOAT_MAT3x4: GLenum;
+    readonly FLOAT_MAT4x2: GLenum;
+    readonly FLOAT_MAT4x3: GLenum;
+    readonly FRAGMENT_SHADER_DERIVATIVE_HINT: GLenum;
+    readonly FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE: GLenum;
+    readonly FRAMEBUFFER_ATTACHMENT_BLUE_SIZE: GLenum;
+    readonly FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING: GLenum;
+    readonly FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE: GLenum;
+    readonly FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE: GLenum;
+    readonly FRAMEBUFFER_ATTACHMENT_GREEN_SIZE: GLenum;
+    readonly FRAMEBUFFER_ATTACHMENT_RED_SIZE: GLenum;
+    readonly FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE: GLenum;
+    readonly FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER: GLenum;
+    readonly FRAMEBUFFER_DEFAULT: GLenum;
+    readonly FRAMEBUFFER_INCOMPLETE_MULTISAMPLE: GLenum;
+    readonly HALF_FLOAT: GLenum;
+    readonly INTERLEAVED_ATTRIBS: GLenum;
+    readonly INT_2_10_10_10_REV: GLenum;
+    readonly INT_SAMPLER_2D: GLenum;
+    readonly INT_SAMPLER_2D_ARRAY: GLenum;
+    readonly INT_SAMPLER_3D: GLenum;
+    readonly INT_SAMPLER_CUBE: GLenum;
+    readonly INVALID_INDEX: GLenum;
+    readonly MAX: GLenum;
+    readonly MAX_3D_TEXTURE_SIZE: GLenum;
+    readonly MAX_ARRAY_TEXTURE_LAYERS: GLenum;
+    readonly MAX_CLIENT_WAIT_TIMEOUT_WEBGL: GLenum;
+    readonly MAX_COLOR_ATTACHMENTS: GLenum;
+    readonly MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS: GLenum;
+    readonly MAX_COMBINED_UNIFORM_BLOCKS: GLenum;
+    readonly MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS: GLenum;
+    readonly MAX_DRAW_BUFFERS: GLenum;
+    readonly MAX_ELEMENTS_INDICES: GLenum;
+    readonly MAX_ELEMENTS_VERTICES: GLenum;
+    readonly MAX_ELEMENT_INDEX: GLenum;
+    readonly MAX_FRAGMENT_INPUT_COMPONENTS: GLenum;
+    readonly MAX_FRAGMENT_UNIFORM_BLOCKS: GLenum;
+    readonly MAX_FRAGMENT_UNIFORM_COMPONENTS: GLenum;
+    readonly MAX_PROGRAM_TEXEL_OFFSET: GLenum;
+    readonly MAX_SAMPLES: GLenum;
+    readonly MAX_SERVER_WAIT_TIMEOUT: GLenum;
+    readonly MAX_TEXTURE_LOD_BIAS: GLenum;
+    readonly MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS: GLenum;
+    readonly MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS: GLenum;
+    readonly MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS: GLenum;
+    readonly MAX_UNIFORM_BLOCK_SIZE: GLenum;
+    readonly MAX_UNIFORM_BUFFER_BINDINGS: GLenum;
+    readonly MAX_VARYING_COMPONENTS: GLenum;
+    readonly MAX_VERTEX_OUTPUT_COMPONENTS: GLenum;
+    readonly MAX_VERTEX_UNIFORM_BLOCKS: GLenum;
+    readonly MAX_VERTEX_UNIFORM_COMPONENTS: GLenum;
+    readonly MIN: GLenum;
+    readonly MIN_PROGRAM_TEXEL_OFFSET: GLenum;
+    readonly OBJECT_TYPE: GLenum;
+    readonly PACK_ROW_LENGTH: GLenum;
+    readonly PACK_SKIP_PIXELS: GLenum;
+    readonly PACK_SKIP_ROWS: GLenum;
+    readonly PIXEL_PACK_BUFFER: GLenum;
+    readonly PIXEL_PACK_BUFFER_BINDING: GLenum;
+    readonly PIXEL_UNPACK_BUFFER: GLenum;
+    readonly PIXEL_UNPACK_BUFFER_BINDING: GLenum;
+    readonly QUERY_RESULT: GLenum;
+    readonly QUERY_RESULT_AVAILABLE: GLenum;
+    readonly R11F_G11F_B10F: GLenum;
+    readonly R16F: GLenum;
+    readonly R16I: GLenum;
+    readonly R16UI: GLenum;
+    readonly R32F: GLenum;
+    readonly R32I: GLenum;
+    readonly R32UI: GLenum;
+    readonly R8: GLenum;
+    readonly R8I: GLenum;
+    readonly R8UI: GLenum;
+    readonly R8_SNORM: GLenum;
+    readonly RASTERIZER_DISCARD: GLenum;
+    readonly READ_BUFFER: GLenum;
+    readonly READ_FRAMEBUFFER: GLenum;
+    readonly READ_FRAMEBUFFER_BINDING: GLenum;
+    readonly RED: GLenum;
+    readonly RED_INTEGER: GLenum;
+    readonly RENDERBUFFER_SAMPLES: GLenum;
+    readonly RG: GLenum;
+    readonly RG16F: GLenum;
+    readonly RG16I: GLenum;
+    readonly RG16UI: GLenum;
+    readonly RG32F: GLenum;
+    readonly RG32I: GLenum;
+    readonly RG32UI: GLenum;
+    readonly RG8: GLenum;
+    readonly RG8I: GLenum;
+    readonly RG8UI: GLenum;
+    readonly RG8_SNORM: GLenum;
+    readonly RGB10_A2: GLenum;
+    readonly RGB10_A2UI: GLenum;
+    readonly RGB16F: GLenum;
+    readonly RGB16I: GLenum;
+    readonly RGB16UI: GLenum;
+    readonly RGB32F: GLenum;
+    readonly RGB32I: GLenum;
+    readonly RGB32UI: GLenum;
+    readonly RGB8: GLenum;
+    readonly RGB8I: GLenum;
+    readonly RGB8UI: GLenum;
+    readonly RGB8_SNORM: GLenum;
+    readonly RGB9_E5: GLenum;
+    readonly RGBA16F: GLenum;
+    readonly RGBA16I: GLenum;
+    readonly RGBA16UI: GLenum;
+    readonly RGBA32F: GLenum;
+    readonly RGBA32I: GLenum;
+    readonly RGBA32UI: GLenum;
+    readonly RGBA8: GLenum;
+    readonly RGBA8I: GLenum;
+    readonly RGBA8UI: GLenum;
+    readonly RGBA8_SNORM: GLenum;
+    readonly RGBA_INTEGER: GLenum;
+    readonly RGB_INTEGER: GLenum;
+    readonly RG_INTEGER: GLenum;
+    readonly SAMPLER_2D_ARRAY: GLenum;
+    readonly SAMPLER_2D_ARRAY_SHADOW: GLenum;
+    readonly SAMPLER_2D_SHADOW: GLenum;
+    readonly SAMPLER_3D: GLenum;
+    readonly SAMPLER_BINDING: GLenum;
+    readonly SAMPLER_CUBE_SHADOW: GLenum;
+    readonly SEPARATE_ATTRIBS: GLenum;
+    readonly SIGNALED: GLenum;
+    readonly SIGNED_NORMALIZED: GLenum;
+    readonly SRGB: GLenum;
+    readonly SRGB8: GLenum;
+    readonly SRGB8_ALPHA8: GLenum;
+    readonly STATIC_COPY: GLenum;
+    readonly STATIC_READ: GLenum;
+    readonly STENCIL: GLenum;
+    readonly STREAM_COPY: GLenum;
+    readonly STREAM_READ: GLenum;
+    readonly SYNC_CONDITION: GLenum;
+    readonly SYNC_FENCE: GLenum;
+    readonly SYNC_FLAGS: GLenum;
+    readonly SYNC_FLUSH_COMMANDS_BIT: GLenum;
+    readonly SYNC_GPU_COMMANDS_COMPLETE: GLenum;
+    readonly SYNC_STATUS: GLenum;
+    readonly TEXTURE_2D_ARRAY: GLenum;
+    readonly TEXTURE_3D: GLenum;
+    readonly TEXTURE_BASE_LEVEL: GLenum;
+    readonly TEXTURE_BINDING_2D_ARRAY: GLenum;
+    readonly TEXTURE_BINDING_3D: GLenum;
+    readonly TEXTURE_COMPARE_FUNC: GLenum;
+    readonly TEXTURE_COMPARE_MODE: GLenum;
+    readonly TEXTURE_IMMUTABLE_FORMAT: GLenum;
+    readonly TEXTURE_IMMUTABLE_LEVELS: GLenum;
+    readonly TEXTURE_MAX_LEVEL: GLenum;
+    readonly TEXTURE_MAX_LOD: GLenum;
+    readonly TEXTURE_MIN_LOD: GLenum;
+    readonly TEXTURE_WRAP_R: GLenum;
+    readonly TIMEOUT_EXPIRED: GLenum;
+    readonly TIMEOUT_IGNORED: GLint64;
+    readonly TRANSFORM_FEEDBACK: GLenum;
+    readonly TRANSFORM_FEEDBACK_ACTIVE: GLenum;
+    readonly TRANSFORM_FEEDBACK_BINDING: GLenum;
+    readonly TRANSFORM_FEEDBACK_BUFFER: GLenum;
+    readonly TRANSFORM_FEEDBACK_BUFFER_BINDING: GLenum;
+    readonly TRANSFORM_FEEDBACK_BUFFER_MODE: GLenum;
+    readonly TRANSFORM_FEEDBACK_BUFFER_SIZE: GLenum;
+    readonly TRANSFORM_FEEDBACK_BUFFER_START: GLenum;
+    readonly TRANSFORM_FEEDBACK_PAUSED: GLenum;
+    readonly TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN: GLenum;
+    readonly TRANSFORM_FEEDBACK_VARYINGS: GLenum;
+    readonly UNIFORM_ARRAY_STRIDE: GLenum;
+    readonly UNIFORM_BLOCK_ACTIVE_UNIFORMS: GLenum;
+    readonly UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES: GLenum;
+    readonly UNIFORM_BLOCK_BINDING: GLenum;
+    readonly UNIFORM_BLOCK_DATA_SIZE: GLenum;
+    readonly UNIFORM_BLOCK_INDEX: GLenum;
+    readonly UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER: GLenum;
+    readonly UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER: GLenum;
+    readonly UNIFORM_BUFFER: GLenum;
+    readonly UNIFORM_BUFFER_BINDING: GLenum;
+    readonly UNIFORM_BUFFER_OFFSET_ALIGNMENT: GLenum;
+    readonly UNIFORM_BUFFER_SIZE: GLenum;
+    readonly UNIFORM_BUFFER_START: GLenum;
+    readonly UNIFORM_IS_ROW_MAJOR: GLenum;
+    readonly UNIFORM_MATRIX_STRIDE: GLenum;
+    readonly UNIFORM_OFFSET: GLenum;
+    readonly UNIFORM_SIZE: GLenum;
+    readonly UNIFORM_TYPE: GLenum;
+    readonly UNPACK_IMAGE_HEIGHT: GLenum;
+    readonly UNPACK_ROW_LENGTH: GLenum;
+    readonly UNPACK_SKIP_IMAGES: GLenum;
+    readonly UNPACK_SKIP_PIXELS: GLenum;
+    readonly UNPACK_SKIP_ROWS: GLenum;
+    readonly UNSIGNALED: GLenum;
+    readonly UNSIGNED_INT_10F_11F_11F_REV: GLenum;
+    readonly UNSIGNED_INT_24_8: GLenum;
+    readonly UNSIGNED_INT_2_10_10_10_REV: GLenum;
+    readonly UNSIGNED_INT_5_9_9_9_REV: GLenum;
+    readonly UNSIGNED_INT_SAMPLER_2D: GLenum;
+    readonly UNSIGNED_INT_SAMPLER_2D_ARRAY: GLenum;
+    readonly UNSIGNED_INT_SAMPLER_3D: GLenum;
+    readonly UNSIGNED_INT_SAMPLER_CUBE: GLenum;
+    readonly UNSIGNED_INT_VEC2: GLenum;
+    readonly UNSIGNED_INT_VEC3: GLenum;
+    readonly UNSIGNED_INT_VEC4: GLenum;
+    readonly UNSIGNED_NORMALIZED: GLenum;
+    readonly VERTEX_ARRAY_BINDING: GLenum;
+    readonly VERTEX_ATTRIB_ARRAY_DIVISOR: GLenum;
+    readonly VERTEX_ATTRIB_ARRAY_INTEGER: GLenum;
+    readonly WAIT_FAILED: GLenum;
+};
+
+interface WebGL2RenderingContextBase {
+    beginQuery(target: GLenum, query: WebGLQuery): void;
+    beginTransformFeedback(primitiveMode: GLenum): void;
+    bindBufferBase(target: GLenum, index: GLuint, buffer: WebGLBuffer | null): void;
+    bindBufferRange(target: GLenum, index: GLuint, buffer: WebGLBuffer | null, offset: GLintptr, size: GLsizeiptr): void;
+    bindSampler(unit: GLuint, sampler: WebGLSampler | null): void;
+    bindTransformFeedback(target: GLenum, tf: WebGLTransformFeedback | null): void;
+    bindVertexArray(array: WebGLVertexArrayObject | null): void;
+    blitFramebuffer(srcX0: GLint, srcY0: GLint, srcX1: GLint, srcY1: GLint, dstX0: GLint, dstY0: GLint, dstX1: GLint, dstY1: GLint, mask: GLbitfield, filter: GLenum): void;
+    clearBufferfi(buffer: GLenum, drawbuffer: GLint, depth: GLfloat, stencil: GLint): void;
+    clearBufferfv(buffer: GLenum, drawbuffer: GLint, values: Float32List, srcOffset?: GLuint): void;
+    clearBufferiv(buffer: GLenum, drawbuffer: GLint, values: Int32List, srcOffset?: GLuint): void;
+    clearBufferuiv(buffer: GLenum, drawbuffer: GLint, values: Uint32List, srcOffset?: GLuint): void;
+    clientWaitSync(sync: WebGLSync, flags: GLbitfield, timeout: GLuint64): GLenum;
+    compressedTexImage3D(target: GLenum, level: GLint, internalformat: GLenum, width: GLsizei, height: GLsizei, depth: GLsizei, border: GLint, imageSize: GLsizei, offset: GLintptr): void;
+    compressedTexImage3D(target: GLenum, level: GLint, internalformat: GLenum, width: GLsizei, height: GLsizei, depth: GLsizei, border: GLint, srcData: ArrayBufferView, srcOffset?: GLuint, srcLengthOverride?: GLuint): void;
+    compressedTexSubImage3D(target: GLenum, level: GLint, xoffset: GLint, yoffset: GLint, zoffset: GLint, width: GLsizei, height: GLsizei, depth: GLsizei, format: GLenum, imageSize: GLsizei, offset: GLintptr): void;
+    compressedTexSubImage3D(target: GLenum, level: GLint, xoffset: GLint, yoffset: GLint, zoffset: GLint, width: GLsizei, height: GLsizei, depth: GLsizei, format: GLenum, srcData: ArrayBufferView, srcOffset?: GLuint, srcLengthOverride?: GLuint): void;
+    copyBufferSubData(readTarget: GLenum, writeTarget: GLenum, readOffset: GLintptr, writeOffset: GLintptr, size: GLsizeiptr): void;
+    copyTexSubImage3D(target: GLenum, level: GLint, xoffset: GLint, yoffset: GLint, zoffset: GLint, x: GLint, y: GLint, width: GLsizei, height: GLsizei): void;
+    createQuery(): WebGLQuery | null;
+    createSampler(): WebGLSampler | null;
+    createTransformFeedback(): WebGLTransformFeedback | null;
+    createVertexArray(): WebGLVertexArrayObject | null;
+    deleteQuery(query: WebGLQuery | null): void;
+    deleteSampler(sampler: WebGLSampler | null): void;
+    deleteSync(sync: WebGLSync | null): void;
+    deleteTransformFeedback(tf: WebGLTransformFeedback | null): void;
+    deleteVertexArray(vertexArray: WebGLVertexArrayObject | null): void;
+    drawArraysInstanced(mode: GLenum, first: GLint, count: GLsizei, instanceCount: GLsizei): void;
+    drawBuffers(buffers: GLenum[]): void;
+    drawElementsInstanced(mode: GLenum, count: GLsizei, type: GLenum, offset: GLintptr, instanceCount: GLsizei): void;
+    drawRangeElements(mode: GLenum, start: GLuint, end: GLuint, count: GLsizei, type: GLenum, offset: GLintptr): void;
+    endQuery(target: GLenum): void;
+    endTransformFeedback(): void;
+    fenceSync(condition: GLenum, flags: GLbitfield): WebGLSync | null;
+    framebufferTextureLayer(target: GLenum, attachment: GLenum, texture: WebGLTexture | null, level: GLint, layer: GLint): void;
+    getActiveUniformBlockName(program: WebGLProgram, uniformBlockIndex: GLuint): string | null;
+    getActiveUniformBlockParameter(program: WebGLProgram, uniformBlockIndex: GLuint, pname: GLenum): any;
+    getActiveUniforms(program: WebGLProgram, uniformIndices: GLuint[], pname: GLenum): any;
+    getBufferSubData(target: GLenum, srcByteOffset: GLintptr, dstBuffer: ArrayBufferView, dstOffset?: GLuint, length?: GLuint): void;
+    getFragDataLocation(program: WebGLProgram, name: string): GLint;
+    getIndexedParameter(target: GLenum, index: GLuint): any;
+    getInternalformatParameter(target: GLenum, internalformat: GLenum, pname: GLenum): any;
+    getQuery(target: GLenum, pname: GLenum): WebGLQuery | null;
+    getQueryParameter(query: WebGLQuery, pname: GLenum): any;
+    getSamplerParameter(sampler: WebGLSampler, pname: GLenum): any;
+    getSyncParameter(sync: WebGLSync, pname: GLenum): any;
+    getTransformFeedbackVarying(program: WebGLProgram, index: GLuint): WebGLActiveInfo | null;
+    getUniformBlockIndex(program: WebGLProgram, uniformBlockName: string): GLuint;
+    getUniformIndices(program: WebGLProgram, uniformNames: string[]): GLuint[] | null;
+    invalidateFramebuffer(target: GLenum, attachments: GLenum[]): void;
+    invalidateSubFramebuffer(target: GLenum, attachments: GLenum[], x: GLint, y: GLint, width: GLsizei, height: GLsizei): void;
+    isQuery(query: WebGLQuery | null): GLboolean;
+    isSampler(sampler: WebGLSampler | null): GLboolean;
+    isSync(sync: WebGLSync | null): GLboolean;
+    isTransformFeedback(tf: WebGLTransformFeedback | null): GLboolean;
+    isVertexArray(vertexArray: WebGLVertexArrayObject | null): GLboolean;
+    pauseTransformFeedback(): void;
+    readBuffer(src: GLenum): void;
+    renderbufferStorageMultisample(target: GLenum, samples: GLsizei, internalformat: GLenum, width: GLsizei, height: GLsizei): void;
+    resumeTransformFeedback(): void;
+    samplerParameterf(sampler: WebGLSampler, pname: GLenum, param: GLfloat): void;
+    samplerParameteri(sampler: WebGLSampler, pname: GLenum, param: GLint): void;
+    texImage3D(target: GLenum, level: GLint, internalformat: GLint, width: GLsizei, height: GLsizei, depth: GLsizei, border: GLint, format: GLenum, type: GLenum, pboOffset: GLintptr): void;
+    texImage3D(target: GLenum, level: GLint, internalformat: GLint, width: GLsizei, height: GLsizei, depth: GLsizei, border: GLint, format: GLenum, type: GLenum, source: TexImageSource): void;
+    texImage3D(target: GLenum, level: GLint, internalformat: GLint, width: GLsizei, height: GLsizei, depth: GLsizei, border: GLint, format: GLenum, type: GLenum, srcData: ArrayBufferView | null): void;
+    texImage3D(target: GLenum, level: GLint, internalformat: GLint, width: GLsizei, height: GLsizei, depth: GLsizei, border: GLint, format: GLenum, type: GLenum, srcData: ArrayBufferView, srcOffset: GLuint): void;
+    texStorage2D(target: GLenum, levels: GLsizei, internalformat: GLenum, width: GLsizei, height: GLsizei): void;
+    texStorage3D(target: GLenum, levels: GLsizei, internalformat: GLenum, width: GLsizei, height: GLsizei, depth: GLsizei): void;
+    texSubImage3D(target: GLenum, level: GLint, xoffset: GLint, yoffset: GLint, zoffset: GLint, width: GLsizei, height: GLsizei, depth: GLsizei, format: GLenum, type: GLenum, pboOffset: GLintptr): void;
+    texSubImage3D(target: GLenum, level: GLint, xoffset: GLint, yoffset: GLint, zoffset: GLint, width: GLsizei, height: GLsizei, depth: GLsizei, format: GLenum, type: GLenum, source: TexImageSource): void;
+    texSubImage3D(target: GLenum, level: GLint, xoffset: GLint, yoffset: GLint, zoffset: GLint, width: GLsizei, height: GLsizei, depth: GLsizei, format: GLenum, type: GLenum, srcData: ArrayBufferView | null, srcOffset?: GLuint): void;
+    transformFeedbackVaryings(program: WebGLProgram, varyings: string[], bufferMode: GLenum): void;
+    uniform1ui(location: WebGLUniformLocation | null, v0: GLuint): void;
+    uniform1uiv(location: WebGLUniformLocation | null, data: Uint32List, srcOffset?: GLuint, srcLength?: GLuint): void;
+    uniform2ui(location: WebGLUniformLocation | null, v0: GLuint, v1: GLuint): void;
+    uniform2uiv(location: WebGLUniformLocation | null, data: Uint32List, srcOffset?: GLuint, srcLength?: GLuint): void;
+    uniform3ui(location: WebGLUniformLocation | null, v0: GLuint, v1: GLuint, v2: GLuint): void;
+    uniform3uiv(location: WebGLUniformLocation | null, data: Uint32List, srcOffset?: GLuint, srcLength?: GLuint): void;
+    uniform4ui(location: WebGLUniformLocation | null, v0: GLuint, v1: GLuint, v2: GLuint, v3: GLuint): void;
+    uniform4uiv(location: WebGLUniformLocation | null, data: Uint32List, srcOffset?: GLuint, srcLength?: GLuint): void;
+    uniformBlockBinding(program: WebGLProgram, uniformBlockIndex: GLuint, uniformBlockBinding: GLuint): void;
+    uniformMatrix2x3fv(location: WebGLUniformLocation | null, transpose: GLboolean, data: Float32List, srcOffset?: GLuint, srcLength?: GLuint): void;
+    uniformMatrix2x4fv(location: WebGLUniformLocation | null, transpose: GLboolean, data: Float32List, srcOffset?: GLuint, srcLength?: GLuint): void;
+    uniformMatrix3x2fv(location: WebGLUniformLocation | null, transpose: GLboolean, data: Float32List, srcOffset?: GLuint, srcLength?: GLuint): void;
+    uniformMatrix3x4fv(location: WebGLUniformLocation | null, transpose: GLboolean, data: Float32List, srcOffset?: GLuint, srcLength?: GLuint): void;
+    uniformMatrix4x2fv(location: WebGLUniformLocation | null, transpose: GLboolean, data: Float32List, srcOffset?: GLuint, srcLength?: GLuint): void;
+    uniformMatrix4x3fv(location: WebGLUniformLocation | null, transpose: GLboolean, data: Float32List, srcOffset?: GLuint, srcLength?: GLuint): void;
+    vertexAttribDivisor(index: GLuint, divisor: GLuint): void;
+    vertexAttribI4i(index: GLuint, x: GLint, y: GLint, z: GLint, w: GLint): void;
+    vertexAttribI4iv(index: GLuint, values: Int32List): void;
+    vertexAttribI4ui(index: GLuint, x: GLuint, y: GLuint, z: GLuint, w: GLuint): void;
+    vertexAttribI4uiv(index: GLuint, values: Uint32List): void;
+    vertexAttribIPointer(index: GLuint, size: GLint, type: GLenum, stride: GLsizei, offset: GLintptr): void;
+    waitSync(sync: WebGLSync, flags: GLbitfield, timeout: GLint64): void;
+    readonly ACTIVE_UNIFORM_BLOCKS: GLenum;
+    readonly ALREADY_SIGNALED: GLenum;
+    readonly ANY_SAMPLES_PASSED: GLenum;
+    readonly ANY_SAMPLES_PASSED_CONSERVATIVE: GLenum;
+    readonly COLOR: GLenum;
+    readonly COLOR_ATTACHMENT1: GLenum;
+    readonly COLOR_ATTACHMENT10: GLenum;
+    readonly COLOR_ATTACHMENT11: GLenum;
+    readonly COLOR_ATTACHMENT12: GLenum;
+    readonly COLOR_ATTACHMENT13: GLenum;
+    readonly COLOR_ATTACHMENT14: GLenum;
+    readonly COLOR_ATTACHMENT15: GLenum;
+    readonly COLOR_ATTACHMENT2: GLenum;
+    readonly COLOR_ATTACHMENT3: GLenum;
+    readonly COLOR_ATTACHMENT4: GLenum;
+    readonly COLOR_ATTACHMENT5: GLenum;
+    readonly COLOR_ATTACHMENT6: GLenum;
+    readonly COLOR_ATTACHMENT7: GLenum;
+    readonly COLOR_ATTACHMENT8: GLenum;
+    readonly COLOR_ATTACHMENT9: GLenum;
+    readonly COMPARE_REF_TO_TEXTURE: GLenum;
+    readonly CONDITION_SATISFIED: GLenum;
+    readonly COPY_READ_BUFFER: GLenum;
+    readonly COPY_READ_BUFFER_BINDING: GLenum;
+    readonly COPY_WRITE_BUFFER: GLenum;
+    readonly COPY_WRITE_BUFFER_BINDING: GLenum;
+    readonly CURRENT_QUERY: GLenum;
+    readonly DEPTH: GLenum;
+    readonly DEPTH24_STENCIL8: GLenum;
+    readonly DEPTH32F_STENCIL8: GLenum;
+    readonly DEPTH_COMPONENT24: GLenum;
+    readonly DEPTH_COMPONENT32F: GLenum;
+    readonly DRAW_BUFFER0: GLenum;
+    readonly DRAW_BUFFER1: GLenum;
+    readonly DRAW_BUFFER10: GLenum;
+    readonly DRAW_BUFFER11: GLenum;
+    readonly DRAW_BUFFER12: GLenum;
+    readonly DRAW_BUFFER13: GLenum;
+    readonly DRAW_BUFFER14: GLenum;
+    readonly DRAW_BUFFER15: GLenum;
+    readonly DRAW_BUFFER2: GLenum;
+    readonly DRAW_BUFFER3: GLenum;
+    readonly DRAW_BUFFER4: GLenum;
+    readonly DRAW_BUFFER5: GLenum;
+    readonly DRAW_BUFFER6: GLenum;
+    readonly DRAW_BUFFER7: GLenum;
+    readonly DRAW_BUFFER8: GLenum;
+    readonly DRAW_BUFFER9: GLenum;
+    readonly DRAW_FRAMEBUFFER: GLenum;
+    readonly DRAW_FRAMEBUFFER_BINDING: GLenum;
+    readonly DYNAMIC_COPY: GLenum;
+    readonly DYNAMIC_READ: GLenum;
+    readonly FLOAT_32_UNSIGNED_INT_24_8_REV: GLenum;
+    readonly FLOAT_MAT2x3: GLenum;
+    readonly FLOAT_MAT2x4: GLenum;
+    readonly FLOAT_MAT3x2: GLenum;
+    readonly FLOAT_MAT3x4: GLenum;
+    readonly FLOAT_MAT4x2: GLenum;
+    readonly FLOAT_MAT4x3: GLenum;
+    readonly FRAGMENT_SHADER_DERIVATIVE_HINT: GLenum;
+    readonly FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE: GLenum;
+    readonly FRAMEBUFFER_ATTACHMENT_BLUE_SIZE: GLenum;
+    readonly FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING: GLenum;
+    readonly FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE: GLenum;
+    readonly FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE: GLenum;
+    readonly FRAMEBUFFER_ATTACHMENT_GREEN_SIZE: GLenum;
+    readonly FRAMEBUFFER_ATTACHMENT_RED_SIZE: GLenum;
+    readonly FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE: GLenum;
+    readonly FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER: GLenum;
+    readonly FRAMEBUFFER_DEFAULT: GLenum;
+    readonly FRAMEBUFFER_INCOMPLETE_MULTISAMPLE: GLenum;
+    readonly HALF_FLOAT: GLenum;
+    readonly INTERLEAVED_ATTRIBS: GLenum;
+    readonly INT_2_10_10_10_REV: GLenum;
+    readonly INT_SAMPLER_2D: GLenum;
+    readonly INT_SAMPLER_2D_ARRAY: GLenum;
+    readonly INT_SAMPLER_3D: GLenum;
+    readonly INT_SAMPLER_CUBE: GLenum;
+    readonly INVALID_INDEX: GLenum;
+    readonly MAX: GLenum;
+    readonly MAX_3D_TEXTURE_SIZE: GLenum;
+    readonly MAX_ARRAY_TEXTURE_LAYERS: GLenum;
+    readonly MAX_CLIENT_WAIT_TIMEOUT_WEBGL: GLenum;
+    readonly MAX_COLOR_ATTACHMENTS: GLenum;
+    readonly MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS: GLenum;
+    readonly MAX_COMBINED_UNIFORM_BLOCKS: GLenum;
+    readonly MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS: GLenum;
+    readonly MAX_DRAW_BUFFERS: GLenum;
+    readonly MAX_ELEMENTS_INDICES: GLenum;
+    readonly MAX_ELEMENTS_VERTICES: GLenum;
+    readonly MAX_ELEMENT_INDEX: GLenum;
+    readonly MAX_FRAGMENT_INPUT_COMPONENTS: GLenum;
+    readonly MAX_FRAGMENT_UNIFORM_BLOCKS: GLenum;
+    readonly MAX_FRAGMENT_UNIFORM_COMPONENTS: GLenum;
+    readonly MAX_PROGRAM_TEXEL_OFFSET: GLenum;
+    readonly MAX_SAMPLES: GLenum;
+    readonly MAX_SERVER_WAIT_TIMEOUT: GLenum;
+    readonly MAX_TEXTURE_LOD_BIAS: GLenum;
+    readonly MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS: GLenum;
+    readonly MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS: GLenum;
+    readonly MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS: GLenum;
+    readonly MAX_UNIFORM_BLOCK_SIZE: GLenum;
+    readonly MAX_UNIFORM_BUFFER_BINDINGS: GLenum;
+    readonly MAX_VARYING_COMPONENTS: GLenum;
+    readonly MAX_VERTEX_OUTPUT_COMPONENTS: GLenum;
+    readonly MAX_VERTEX_UNIFORM_BLOCKS: GLenum;
+    readonly MAX_VERTEX_UNIFORM_COMPONENTS: GLenum;
+    readonly MIN: GLenum;
+    readonly MIN_PROGRAM_TEXEL_OFFSET: GLenum;
+    readonly OBJECT_TYPE: GLenum;
+    readonly PACK_ROW_LENGTH: GLenum;
+    readonly PACK_SKIP_PIXELS: GLenum;
+    readonly PACK_SKIP_ROWS: GLenum;
+    readonly PIXEL_PACK_BUFFER: GLenum;
+    readonly PIXEL_PACK_BUFFER_BINDING: GLenum;
+    readonly PIXEL_UNPACK_BUFFER: GLenum;
+    readonly PIXEL_UNPACK_BUFFER_BINDING: GLenum;
+    readonly QUERY_RESULT: GLenum;
+    readonly QUERY_RESULT_AVAILABLE: GLenum;
+    readonly R11F_G11F_B10F: GLenum;
+    readonly R16F: GLenum;
+    readonly R16I: GLenum;
+    readonly R16UI: GLenum;
+    readonly R32F: GLenum;
+    readonly R32I: GLenum;
+    readonly R32UI: GLenum;
+    readonly R8: GLenum;
+    readonly R8I: GLenum;
+    readonly R8UI: GLenum;
+    readonly R8_SNORM: GLenum;
+    readonly RASTERIZER_DISCARD: GLenum;
+    readonly READ_BUFFER: GLenum;
+    readonly READ_FRAMEBUFFER: GLenum;
+    readonly READ_FRAMEBUFFER_BINDING: GLenum;
+    readonly RED: GLenum;
+    readonly RED_INTEGER: GLenum;
+    readonly RENDERBUFFER_SAMPLES: GLenum;
+    readonly RG: GLenum;
+    readonly RG16F: GLenum;
+    readonly RG16I: GLenum;
+    readonly RG16UI: GLenum;
+    readonly RG32F: GLenum;
+    readonly RG32I: GLenum;
+    readonly RG32UI: GLenum;
+    readonly RG8: GLenum;
+    readonly RG8I: GLenum;
+    readonly RG8UI: GLenum;
+    readonly RG8_SNORM: GLenum;
+    readonly RGB10_A2: GLenum;
+    readonly RGB10_A2UI: GLenum;
+    readonly RGB16F: GLenum;
+    readonly RGB16I: GLenum;
+    readonly RGB16UI: GLenum;
+    readonly RGB32F: GLenum;
+    readonly RGB32I: GLenum;
+    readonly RGB32UI: GLenum;
+    readonly RGB8: GLenum;
+    readonly RGB8I: GLenum;
+    readonly RGB8UI: GLenum;
+    readonly RGB8_SNORM: GLenum;
+    readonly RGB9_E5: GLenum;
+    readonly RGBA16F: GLenum;
+    readonly RGBA16I: GLenum;
+    readonly RGBA16UI: GLenum;
+    readonly RGBA32F: GLenum;
+    readonly RGBA32I: GLenum;
+    readonly RGBA32UI: GLenum;
+    readonly RGBA8: GLenum;
+    readonly RGBA8I: GLenum;
+    readonly RGBA8UI: GLenum;
+    readonly RGBA8_SNORM: GLenum;
+    readonly RGBA_INTEGER: GLenum;
+    readonly RGB_INTEGER: GLenum;
+    readonly RG_INTEGER: GLenum;
+    readonly SAMPLER_2D_ARRAY: GLenum;
+    readonly SAMPLER_2D_ARRAY_SHADOW: GLenum;
+    readonly SAMPLER_2D_SHADOW: GLenum;
+    readonly SAMPLER_3D: GLenum;
+    readonly SAMPLER_BINDING: GLenum;
+    readonly SAMPLER_CUBE_SHADOW: GLenum;
+    readonly SEPARATE_ATTRIBS: GLenum;
+    readonly SIGNALED: GLenum;
+    readonly SIGNED_NORMALIZED: GLenum;
+    readonly SRGB: GLenum;
+    readonly SRGB8: GLenum;
+    readonly SRGB8_ALPHA8: GLenum;
+    readonly STATIC_COPY: GLenum;
+    readonly STATIC_READ: GLenum;
+    readonly STENCIL: GLenum;
+    readonly STREAM_COPY: GLenum;
+    readonly STREAM_READ: GLenum;
+    readonly SYNC_CONDITION: GLenum;
+    readonly SYNC_FENCE: GLenum;
+    readonly SYNC_FLAGS: GLenum;
+    readonly SYNC_FLUSH_COMMANDS_BIT: GLenum;
+    readonly SYNC_GPU_COMMANDS_COMPLETE: GLenum;
+    readonly SYNC_STATUS: GLenum;
+    readonly TEXTURE_2D_ARRAY: GLenum;
+    readonly TEXTURE_3D: GLenum;
+    readonly TEXTURE_BASE_LEVEL: GLenum;
+    readonly TEXTURE_BINDING_2D_ARRAY: GLenum;
+    readonly TEXTURE_BINDING_3D: GLenum;
+    readonly TEXTURE_COMPARE_FUNC: GLenum;
+    readonly TEXTURE_COMPARE_MODE: GLenum;
+    readonly TEXTURE_IMMUTABLE_FORMAT: GLenum;
+    readonly TEXTURE_IMMUTABLE_LEVELS: GLenum;
+    readonly TEXTURE_MAX_LEVEL: GLenum;
+    readonly TEXTURE_MAX_LOD: GLenum;
+    readonly TEXTURE_MIN_LOD: GLenum;
+    readonly TEXTURE_WRAP_R: GLenum;
+    readonly TIMEOUT_EXPIRED: GLenum;
+    readonly TIMEOUT_IGNORED: GLint64;
+    readonly TRANSFORM_FEEDBACK: GLenum;
+    readonly TRANSFORM_FEEDBACK_ACTIVE: GLenum;
+    readonly TRANSFORM_FEEDBACK_BINDING: GLenum;
+    readonly TRANSFORM_FEEDBACK_BUFFER: GLenum;
+    readonly TRANSFORM_FEEDBACK_BUFFER_BINDING: GLenum;
+    readonly TRANSFORM_FEEDBACK_BUFFER_MODE: GLenum;
+    readonly TRANSFORM_FEEDBACK_BUFFER_SIZE: GLenum;
+    readonly TRANSFORM_FEEDBACK_BUFFER_START: GLenum;
+    readonly TRANSFORM_FEEDBACK_PAUSED: GLenum;
+    readonly TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN: GLenum;
+    readonly TRANSFORM_FEEDBACK_VARYINGS: GLenum;
+    readonly UNIFORM_ARRAY_STRIDE: GLenum;
+    readonly UNIFORM_BLOCK_ACTIVE_UNIFORMS: GLenum;
+    readonly UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES: GLenum;
+    readonly UNIFORM_BLOCK_BINDING: GLenum;
+    readonly UNIFORM_BLOCK_DATA_SIZE: GLenum;
+    readonly UNIFORM_BLOCK_INDEX: GLenum;
+    readonly UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER: GLenum;
+    readonly UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER: GLenum;
+    readonly UNIFORM_BUFFER: GLenum;
+    readonly UNIFORM_BUFFER_BINDING: GLenum;
+    readonly UNIFORM_BUFFER_OFFSET_ALIGNMENT: GLenum;
+    readonly UNIFORM_BUFFER_SIZE: GLenum;
+    readonly UNIFORM_BUFFER_START: GLenum;
+    readonly UNIFORM_IS_ROW_MAJOR: GLenum;
+    readonly UNIFORM_MATRIX_STRIDE: GLenum;
+    readonly UNIFORM_OFFSET: GLenum;
+    readonly UNIFORM_SIZE: GLenum;
+    readonly UNIFORM_TYPE: GLenum;
+    readonly UNPACK_IMAGE_HEIGHT: GLenum;
+    readonly UNPACK_ROW_LENGTH: GLenum;
+    readonly UNPACK_SKIP_IMAGES: GLenum;
+    readonly UNPACK_SKIP_PIXELS: GLenum;
+    readonly UNPACK_SKIP_ROWS: GLenum;
+    readonly UNSIGNALED: GLenum;
+    readonly UNSIGNED_INT_10F_11F_11F_REV: GLenum;
+    readonly UNSIGNED_INT_24_8: GLenum;
+    readonly UNSIGNED_INT_2_10_10_10_REV: GLenum;
+    readonly UNSIGNED_INT_5_9_9_9_REV: GLenum;
+    readonly UNSIGNED_INT_SAMPLER_2D: GLenum;
+    readonly UNSIGNED_INT_SAMPLER_2D_ARRAY: GLenum;
+    readonly UNSIGNED_INT_SAMPLER_3D: GLenum;
+    readonly UNSIGNED_INT_SAMPLER_CUBE: GLenum;
+    readonly UNSIGNED_INT_VEC2: GLenum;
+    readonly UNSIGNED_INT_VEC3: GLenum;
+    readonly UNSIGNED_INT_VEC4: GLenum;
+    readonly UNSIGNED_NORMALIZED: GLenum;
+    readonly VERTEX_ARRAY_BINDING: GLenum;
+    readonly VERTEX_ATTRIB_ARRAY_DIVISOR: GLenum;
+    readonly VERTEX_ATTRIB_ARRAY_INTEGER: GLenum;
+    readonly WAIT_FAILED: GLenum;
+}
+
+interface WebGL2RenderingContextOverloads {
+    bufferData(target: GLenum, size: GLsizeiptr, usage: GLenum): void;
+    bufferData(target: GLenum, srcData: BufferSource | null, usage: GLenum): void;
+    bufferData(target: GLenum, srcData: ArrayBufferView, usage: GLenum, srcOffset: GLuint, length?: GLuint): void;
+    bufferSubData(target: GLenum, dstByteOffset: GLintptr, srcData: BufferSource): void;
+    bufferSubData(target: GLenum, dstByteOffset: GLintptr, srcData: ArrayBufferView, srcOffset: GLuint, length?: GLuint): void;
+    compressedTexImage2D(target: GLenum, level: GLint, internalformat: GLenum, width: GLsizei, height: GLsizei, border: GLint, imageSize: GLsizei, offset: GLintptr): void;
+    compressedTexImage2D(target: GLenum, level: GLint, internalformat: GLenum, width: GLsizei, height: GLsizei, border: GLint, srcData: ArrayBufferView, srcOffset?: GLuint, srcLengthOverride?: GLuint): void;
+    compressedTexSubImage2D(target: GLenum, level: GLint, xoffset: GLint, yoffset: GLint, width: GLsizei, height: GLsizei, format: GLenum, imageSize: GLsizei, offset: GLintptr): void;
+    compressedTexSubImage2D(target: GLenum, level: GLint, xoffset: GLint, yoffset: GLint, width: GLsizei, height: GLsizei, format: GLenum, srcData: ArrayBufferView, srcOffset?: GLuint, srcLengthOverride?: GLuint): void;
+    readPixels(x: GLint, y: GLint, width: GLsizei, height: GLsizei, format: GLenum, type: GLenum, dstData: ArrayBufferView | null): void;
+    readPixels(x: GLint, y: GLint, width: GLsizei, height: GLsizei, format: GLenum, type: GLenum, offset: GLintptr): void;
+    readPixels(x: GLint, y: GLint, width: GLsizei, height: GLsizei, format: GLenum, type: GLenum, dstData: ArrayBufferView, dstOffset: GLuint): void;
+    texImage2D(target: GLenum, level: GLint, internalformat: GLint, width: GLsizei, height: GLsizei, border: GLint, format: GLenum, type: GLenum, pixels: ArrayBufferView | null): void;
+    texImage2D(target: GLenum, level: GLint, internalformat: GLint, format: GLenum, type: GLenum, source: TexImageSource): void;
+    texImage2D(target: GLenum, level: GLint, internalformat: GLint, width: GLsizei, height: GLsizei, border: GLint, format: GLenum, type: GLenum, pboOffset: GLintptr): void;
+    texImage2D(target: GLenum, level: GLint, internalformat: GLint, width: GLsizei, height: GLsizei, border: GLint, format: GLenum, type: GLenum, source: TexImageSource): void;
+    texImage2D(target: GLenum, level: GLint, internalformat: GLint, width: GLsizei, height: GLsizei, border: GLint, format: GLenum, type: GLenum, srcData: ArrayBufferView, srcOffset: GLuint): void;
+    texSubImage2D(target: GLenum, level: GLint, xoffset: GLint, yoffset: GLint, width: GLsizei, height: GLsizei, format: GLenum, type: GLenum, pixels: ArrayBufferView | null): void;
+    texSubImage2D(target: GLenum, level: GLint, xoffset: GLint, yoffset: GLint, format: GLenum, type: GLenum, source: TexImageSource): void;
+    texSubImage2D(target: GLenum, level: GLint, xoffset: GLint, yoffset: GLint, width: GLsizei, height: GLsizei, format: GLenum, type: GLenum, pboOffset: GLintptr): void;
+    texSubImage2D(target: GLenum, level: GLint, xoffset: GLint, yoffset: GLint, width: GLsizei, height: GLsizei, format: GLenum, type: GLenum, source: TexImageSource): void;
+    texSubImage2D(target: GLenum, level: GLint, xoffset: GLint, yoffset: GLint, width: GLsizei, height: GLsizei, format: GLenum, type: GLenum, srcData: ArrayBufferView, srcOffset: GLuint): void;
+    uniform1fv(location: WebGLUniformLocation | null, data: Float32List, srcOffset?: GLuint, srcLength?: GLuint): void;
+    uniform1iv(location: WebGLUniformLocation | null, data: Int32List, srcOffset?: GLuint, srcLength?: GLuint): void;
+    uniform2fv(location: WebGLUniformLocation | null, data: Float32List, srcOffset?: GLuint, srcLength?: GLuint): void;
+    uniform2iv(location: WebGLUniformLocation | null, data: Int32List, srcOffset?: GLuint, srcLength?: GLuint): void;
+    uniform3fv(location: WebGLUniformLocation | null, data: Float32List, srcOffset?: GLuint, srcLength?: GLuint): void;
+    uniform3iv(location: WebGLUniformLocation | null, data: Int32List, srcOffset?: GLuint, srcLength?: GLuint): void;
+    uniform4fv(location: WebGLUniformLocation | null, data: Float32List, srcOffset?: GLuint, srcLength?: GLuint): void;
+    uniform4iv(location: WebGLUniformLocation | null, data: Int32List, srcOffset?: GLuint, srcLength?: GLuint): void;
+    uniformMatrix2fv(location: WebGLUniformLocation | null, transpose: GLboolean, data: Float32List, srcOffset?: GLuint, srcLength?: GLuint): void;
+    uniformMatrix3fv(location: WebGLUniformLocation | null, transpose: GLboolean, data: Float32List, srcOffset?: GLuint, srcLength?: GLuint): void;
+    uniformMatrix4fv(location: WebGLUniformLocation | null, transpose: GLboolean, data: Float32List, srcOffset?: GLuint, srcLength?: GLuint): void;
+}
+
+/** Part of the WebGL API and represents the information returned by calling the WebGLRenderingContext.getActiveAttrib() and WebGLRenderingContext.getActiveUniform() methods. */
 interface WebGLActiveInfo {
     readonly name: string;
     readonly size: GLint;
@@ -15903,7 +17420,7 @@ declare var WebGLActiveInfo: {
     new(): WebGLActiveInfo;
 };
 
-/** The WebGLBuffer interface is part of the WebGL API and represents an opaque buffer object storing data such as vertices or colors. */
+/** Part of the WebGL API and represents an opaque buffer object storing data such as vertices or colors. */
 interface WebGLBuffer extends WebGLObject {
 }
 
@@ -15922,7 +17439,7 @@ declare var WebGLContextEvent: {
     new(type: string, eventInit?: WebGLContextEventInit): WebGLContextEvent;
 };
 
-/** The WebGLFramebuffer interface is part of the WebGL API and represents a collection of buffers that serve as a rendering destination. */
+/** Part of the WebGL API and represents a collection of buffers that serve as a rendering destination. */
 interface WebGLFramebuffer extends WebGLObject {
 }
 
@@ -15948,7 +17465,15 @@ declare var WebGLProgram: {
     new(): WebGLProgram;
 };
 
-/** The WebGLRenderbuffer interface is part of the WebGL API and represents a buffer that can contain an image, or can be source or target of an rendering operation. */
+interface WebGLQuery extends WebGLObject {
+}
+
+declare var WebGLQuery: {
+    prototype: WebGLQuery;
+    new(): WebGLQuery;
+};
+
+/** Part of the WebGL API and represents a buffer that can contain an image, or can be source or target of an rendering operation. */
 interface WebGLRenderbuffer extends WebGLObject {
 }
 
@@ -15957,8 +17482,8 @@ declare var WebGLRenderbuffer: {
     new(): WebGLRenderbuffer;
 };
 
-/** The WebGLRenderingContext interface provides an interface to the OpenGL ES 2.0 graphics rendering context for the drawing surface of an HTML <canvas> element. */
-interface WebGLRenderingContext extends WebGLRenderingContextBase {
+/** Provides an interface to the OpenGL ES 2.0 graphics rendering context for the drawing surface of an HTML <canvas> element. */
+interface WebGLRenderingContext extends WebGLRenderingContextBase, WebGLRenderingContextOverloads {
 }
 
 declare var WebGLRenderingContext: {
@@ -16263,7 +17788,7 @@ declare var WebGLRenderingContext: {
 };
 
 interface WebGLRenderingContextBase {
-    readonly canvas: HTMLCanvasElement;
+    readonly canvas: HTMLCanvasElement | OffscreenCanvas;
     readonly drawingBufferHeight: GLsizei;
     readonly drawingBufferWidth: GLsizei;
     activeTexture(texture: GLenum): void;
@@ -16278,9 +17803,6 @@ interface WebGLRenderingContextBase {
     blendEquationSeparate(modeRGB: GLenum, modeAlpha: GLenum): void;
     blendFunc(sfactor: GLenum, dfactor: GLenum): void;
     blendFuncSeparate(srcRGB: GLenum, dstRGB: GLenum, srcAlpha: GLenum, dstAlpha: GLenum): void;
-    bufferData(target: GLenum, size: GLsizeiptr, usage: GLenum): void;
-    bufferData(target: GLenum, data: BufferSource | null, usage: GLenum): void;
-    bufferSubData(target: GLenum, offset: GLintptr, data: BufferSource): void;
     checkFramebufferStatus(target: GLenum): GLenum;
     clear(mask: GLbitfield): void;
     clearColor(red: GLclampf, green: GLclampf, blue: GLclampf, alpha: GLclampf): void;
@@ -16288,8 +17810,6 @@ interface WebGLRenderingContextBase {
     clearStencil(s: GLint): void;
     colorMask(red: GLboolean, green: GLboolean, blue: GLboolean, alpha: GLboolean): void;
     compileShader(shader: WebGLShader): void;
-    compressedTexImage2D(target: GLenum, level: GLint, internalformat: GLenum, width: GLsizei, height: GLsizei, border: GLint, data: ArrayBufferView): void;
-    compressedTexSubImage2D(target: GLenum, level: GLint, xoffset: GLint, yoffset: GLint, width: GLsizei, height: GLsizei, format: GLenum, data: ArrayBufferView): void;
     copyTexImage2D(target: GLenum, level: GLint, internalformat: GLenum, x: GLint, y: GLint, width: GLsizei, height: GLsizei, border: GLint): void;
     copyTexSubImage2D(target: GLenum, level: GLint, xoffset: GLint, yoffset: GLint, x: GLint, y: GLint, width: GLsizei, height: GLsizei): void;
     createBuffer(): WebGLBuffer | null;
@@ -16379,7 +17899,6 @@ interface WebGLRenderingContextBase {
     linkProgram(program: WebGLProgram): void;
     pixelStorei(pname: GLenum, param: GLint | GLboolean): void;
     polygonOffset(factor: GLfloat, units: GLfloat): void;
-    readPixels(x: GLint, y: GLint, width: GLsizei, height: GLsizei, format: GLenum, type: GLenum, pixels: ArrayBufferView | null): void;
     renderbufferStorage(target: GLenum, internalformat: GLenum, width: GLsizei, height: GLsizei): void;
     sampleCoverage(value: GLclampf, invert: GLboolean): void;
     scissor(x: GLint, y: GLint, width: GLsizei, height: GLsizei): void;
@@ -16390,31 +17909,16 @@ interface WebGLRenderingContextBase {
     stencilMaskSeparate(face: GLenum, mask: GLuint): void;
     stencilOp(fail: GLenum, zfail: GLenum, zpass: GLenum): void;
     stencilOpSeparate(face: GLenum, fail: GLenum, zfail: GLenum, zpass: GLenum): void;
-    texImage2D(target: GLenum, level: GLint, internalformat: GLint, width: GLsizei, height: GLsizei, border: GLint, format: GLenum, type: GLenum, pixels: ArrayBufferView | null): void;
-    texImage2D(target: GLenum, level: GLint, internalformat: GLint, format: GLenum, type: GLenum, source: TexImageSource): void;
     texParameterf(target: GLenum, pname: GLenum, param: GLfloat): void;
     texParameteri(target: GLenum, pname: GLenum, param: GLint): void;
-    texSubImage2D(target: GLenum, level: GLint, xoffset: GLint, yoffset: GLint, width: GLsizei, height: GLsizei, format: GLenum, type: GLenum, pixels: ArrayBufferView | null): void;
-    texSubImage2D(target: GLenum, level: GLint, xoffset: GLint, yoffset: GLint, format: GLenum, type: GLenum, source: TexImageSource): void;
     uniform1f(location: WebGLUniformLocation | null, x: GLfloat): void;
-    uniform1fv(location: WebGLUniformLocation | null, v: Float32List): void;
     uniform1i(location: WebGLUniformLocation | null, x: GLint): void;
-    uniform1iv(location: WebGLUniformLocation | null, v: Int32List): void;
     uniform2f(location: WebGLUniformLocation | null, x: GLfloat, y: GLfloat): void;
-    uniform2fv(location: WebGLUniformLocation | null, v: Float32List): void;
     uniform2i(location: WebGLUniformLocation | null, x: GLint, y: GLint): void;
-    uniform2iv(location: WebGLUniformLocation | null, v: Int32List): void;
     uniform3f(location: WebGLUniformLocation | null, x: GLfloat, y: GLfloat, z: GLfloat): void;
-    uniform3fv(location: WebGLUniformLocation | null, v: Float32List): void;
     uniform3i(location: WebGLUniformLocation | null, x: GLint, y: GLint, z: GLint): void;
-    uniform3iv(location: WebGLUniformLocation | null, v: Int32List): void;
     uniform4f(location: WebGLUniformLocation | null, x: GLfloat, y: GLfloat, z: GLfloat, w: GLfloat): void;
-    uniform4fv(location: WebGLUniformLocation | null, v: Float32List): void;
     uniform4i(location: WebGLUniformLocation | null, x: GLint, y: GLint, z: GLint, w: GLint): void;
-    uniform4iv(location: WebGLUniformLocation | null, v: Int32List): void;
-    uniformMatrix2fv(location: WebGLUniformLocation | null, transpose: GLboolean, value: Float32List): void;
-    uniformMatrix3fv(location: WebGLUniformLocation | null, transpose: GLboolean, value: Float32List): void;
-    uniformMatrix4fv(location: WebGLUniformLocation | null, transpose: GLboolean, value: Float32List): void;
     useProgram(program: WebGLProgram | null): void;
     validateProgram(program: WebGLProgram): void;
     vertexAttrib1f(index: GLuint, x: GLfloat): void;
@@ -16725,6 +18229,38 @@ interface WebGLRenderingContextBase {
     readonly ZERO: GLenum;
 }
 
+interface WebGLRenderingContextOverloads {
+    bufferData(target: GLenum, size: GLsizeiptr, usage: GLenum): void;
+    bufferData(target: GLenum, data: BufferSource | null, usage: GLenum): void;
+    bufferSubData(target: GLenum, offset: GLintptr, data: BufferSource): void;
+    compressedTexImage2D(target: GLenum, level: GLint, internalformat: GLenum, width: GLsizei, height: GLsizei, border: GLint, data: ArrayBufferView): void;
+    compressedTexSubImage2D(target: GLenum, level: GLint, xoffset: GLint, yoffset: GLint, width: GLsizei, height: GLsizei, format: GLenum, data: ArrayBufferView): void;
+    readPixels(x: GLint, y: GLint, width: GLsizei, height: GLsizei, format: GLenum, type: GLenum, pixels: ArrayBufferView | null): void;
+    texImage2D(target: GLenum, level: GLint, internalformat: GLint, width: GLsizei, height: GLsizei, border: GLint, format: GLenum, type: GLenum, pixels: ArrayBufferView | null): void;
+    texImage2D(target: GLenum, level: GLint, internalformat: GLint, format: GLenum, type: GLenum, source: TexImageSource): void;
+    texSubImage2D(target: GLenum, level: GLint, xoffset: GLint, yoffset: GLint, width: GLsizei, height: GLsizei, format: GLenum, type: GLenum, pixels: ArrayBufferView | null): void;
+    texSubImage2D(target: GLenum, level: GLint, xoffset: GLint, yoffset: GLint, format: GLenum, type: GLenum, source: TexImageSource): void;
+    uniform1fv(location: WebGLUniformLocation | null, v: Float32List): void;
+    uniform1iv(location: WebGLUniformLocation | null, v: Int32List): void;
+    uniform2fv(location: WebGLUniformLocation | null, v: Float32List): void;
+    uniform2iv(location: WebGLUniformLocation | null, v: Int32List): void;
+    uniform3fv(location: WebGLUniformLocation | null, v: Float32List): void;
+    uniform3iv(location: WebGLUniformLocation | null, v: Int32List): void;
+    uniform4fv(location: WebGLUniformLocation | null, v: Float32List): void;
+    uniform4iv(location: WebGLUniformLocation | null, v: Int32List): void;
+    uniformMatrix2fv(location: WebGLUniformLocation | null, transpose: GLboolean, value: Float32List): void;
+    uniformMatrix3fv(location: WebGLUniformLocation | null, transpose: GLboolean, value: Float32List): void;
+    uniformMatrix4fv(location: WebGLUniformLocation | null, transpose: GLboolean, value: Float32List): void;
+}
+
+interface WebGLSampler extends WebGLObject {
+}
+
+declare var WebGLSampler: {
+    prototype: WebGLSampler;
+    new(): WebGLSampler;
+};
+
 /** The WebGLShader is part of the WebGL API and can either be a vertex or a fragment shader. A WebGLProgram requires both types of shaders. */
 interface WebGLShader extends WebGLObject {
 }
@@ -16734,7 +18270,7 @@ declare var WebGLShader: {
     new(): WebGLShader;
 };
 
-/** The WebGLShaderPrecisionFormat interface is part of the WebGL API and represents the information returned by calling the WebGLRenderingContext.getShaderPrecisionFormat() method. */
+/** Part of the WebGL API and represents the information returned by calling the WebGLRenderingContext.getShaderPrecisionFormat() method. */
 interface WebGLShaderPrecisionFormat {
     readonly precision: GLint;
     readonly rangeMax: GLint;
@@ -16746,7 +18282,15 @@ declare var WebGLShaderPrecisionFormat: {
     new(): WebGLShaderPrecisionFormat;
 };
 
-/** The WebGLTexture interface is part of the WebGL API and represents an opaque texture object providing storage and state for texturing operations. */
+interface WebGLSync extends WebGLObject {
+}
+
+declare var WebGLSync: {
+    prototype: WebGLSync;
+    new(): WebGLSync;
+};
+
+/** Part of the WebGL API and represents an opaque texture object providing storage and state for texturing operations. */
 interface WebGLTexture extends WebGLObject {
 }
 
@@ -16755,7 +18299,15 @@ declare var WebGLTexture: {
     new(): WebGLTexture;
 };
 
-/** The WebGLUniformLocation interface is part of the WebGL API and represents the location of a uniform variable in a shader program. */
+interface WebGLTransformFeedback extends WebGLObject {
+}
+
+declare var WebGLTransformFeedback: {
+    prototype: WebGLTransformFeedback;
+    new(): WebGLTransformFeedback;
+};
+
+/** Part of the WebGL API and represents the location of a uniform variable in a shader program. */
 interface WebGLUniformLocation {
 }
 
@@ -16764,6 +18316,14 @@ declare var WebGLUniformLocation: {
     new(): WebGLUniformLocation;
 };
 
+interface WebGLVertexArrayObject extends WebGLObject {
+}
+
+declare var WebGLVertexArrayObject: {
+    prototype: WebGLVertexArrayObject;
+    new(): WebGLVertexArrayObject;
+};
+
 interface WebGLVertexArrayObjectOES extends WebGLObject {
 }
 
@@ -16784,7 +18344,7 @@ interface WebSocketEventMap {
     "open": Event;
 }
 
-/** The WebSocket object provides the API for creating and managing a WebSocket connection to a server, as well as for sending and receiving data on the connection. */
+/** Provides the API for creating and managing a WebSocket connection to a server, as well as for sending and receiving data on the connection. */
 interface WebSocket extends EventTarget {
     binaryType: BinaryType;
     readonly bufferedAmount: number;
@@ -16817,14 +18377,12 @@ declare var WebSocket: {
     readonly OPEN: number;
 };
 
-/** The WheelEvent interface represents events that occur due to the user moving a mouse wheel or similar input device. */
+/** Events that occur due to the user moving a mouse wheel or similar input device. */
 interface WheelEvent extends MouseEvent {
     readonly deltaMode: number;
     readonly deltaX: number;
     readonly deltaY: number;
     readonly deltaZ: number;
-    getCurrentPoint(element: Element): void;
-    initWheelEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number, screenXArg: number, screenYArg: number, clientXArg: number, clientYArg: number, buttonArg: number, relatedTargetArg: EventTarget, modifiersListArg: string, deltaXArg: number, deltaYArg: number, deltaZArg: number, deltaMode: number): void;
     readonly DOM_DELTA_LINE: number;
     readonly DOM_DELTA_PAGE: number;
     readonly DOM_DELTA_PIXEL: number;
@@ -16832,7 +18390,7 @@ interface WheelEvent extends MouseEvent {
 
 declare var WheelEvent: {
     prototype: WheelEvent;
-    new(typeArg: string, eventInitDict?: WheelEventInit): WheelEvent;
+    new(type: string, eventInitDict?: WheelEventInit): WheelEvent;
     readonly DOM_DELTA_LINE: number;
     readonly DOM_DELTA_PAGE: number;
     readonly DOM_DELTA_PIXEL: number;
@@ -16854,6 +18412,7 @@ interface WindowEventMap extends GlobalEventHandlersEventMap, WindowEventHandler
     "devicelight": DeviceLightEvent;
     "devicemotion": DeviceMotionEvent;
     "deviceorientation": DeviceOrientationEvent;
+    "deviceorientationabsolute": DeviceOrientationEvent;
     "drag": DragEvent;
     "dragend": DragEvent;
     "dragenter": DragEvent;
@@ -16909,9 +18468,9 @@ interface WindowEventMap extends GlobalEventHandlersEventMap, WindowEventHandler
     "play": Event;
     "playing": Event;
     "popstate": PopStateEvent;
-    "progress": ProgressEvent;
+    "progress": ProgressEvent<Window>;
     "ratechange": Event;
-    "readystatechange": ProgressEvent;
+    "readystatechange": ProgressEvent<Window>;
     "reset": Event;
     "resize": UIEvent;
     "scroll": Event;
@@ -16937,11 +18496,8 @@ interface WindowEventMap extends GlobalEventHandlersEventMap, WindowEventHandler
     "waiting": Event;
 }
 
-/** The Window interface represents a window containing a DOM document; the document property points to the DOM document loaded in that window. */
-interface Window extends EventTarget, WindowTimers, WindowSessionStorage, WindowLocalStorage, WindowConsole, GlobalEventHandlers, IDBEnvironment, WindowBase64, GlobalFetch, WindowOrWorkerGlobalScope, WindowEventHandlers {
-    Blob: typeof Blob;
-    URL: typeof URL;
-    URLSearchParams: typeof URLSearchParams;
+/** A window containing a DOM document; the document property points to the DOM document loaded in that window. */
+interface Window extends EventTarget, WindowTimers, WindowSessionStorage, WindowLocalStorage, WindowConsole, GlobalEventHandlers, IDBEnvironment, WindowBase64, AnimationFrameProvider, WindowOrWorkerGlobalScope, WindowEventHandlers {
     readonly applicationCache: ApplicationCache;
     readonly caches: CacheStorage;
     readonly clientInformation: Navigator;
@@ -16974,6 +18530,7 @@ interface Window extends EventTarget, WindowTimers, WindowSessionStorage, Window
     ondevicelight: ((this: Window, ev: DeviceLightEvent) => any) | null;
     ondevicemotion: ((this: Window, ev: DeviceMotionEvent) => any) | null;
     ondeviceorientation: ((this: Window, ev: DeviceOrientationEvent) => any) | null;
+    ondeviceorientationabsolute: ((this: Window, ev: DeviceOrientationEvent) => any) | null;
     onmousewheel: ((this: Window, ev: Event) => any) | null;
     onmsgesturechange: ((this: Window, ev: Event) => any) | null;
     onmsgesturedoubletap: ((this: Window, ev: Event) => any) | null;
@@ -16992,7 +18549,7 @@ interface Window extends EventTarget, WindowTimers, WindowSessionStorage, Window
     onmspointerup: ((this: Window, ev: Event) => any) | null;
     /** @deprecated */
     onorientationchange: ((this: Window, ev: Event) => any) | null;
-    onreadystatechange: ((this: Window, ev: ProgressEvent) => any) | null;
+    onreadystatechange: ((this: Window, ev: ProgressEvent<Window>) => any) | null;
     onvrdisplayactivate: ((this: Window, ev: Event) => any) | null;
     onvrdisplayblur: ((this: Window, ev: Event) => any) | null;
     onvrdisplayconnect: ((this: Window, ev: Event) => any) | null;
@@ -17020,17 +18577,16 @@ interface Window extends EventTarget, WindowTimers, WindowSessionStorage, Window
     readonly scrollX: number;
     readonly scrollY: number;
     readonly scrollbars: BarProp;
-    readonly self: Window;
+    readonly self: Window & typeof globalThis;
     readonly speechSynthesis: SpeechSynthesis;
     status: string;
     readonly statusbar: BarProp;
     readonly styleMedia: StyleMedia;
     readonly toolbar: BarProp;
     readonly top: Window;
-    readonly window: Window;
+    readonly window: Window & typeof globalThis;
     alert(message?: any): void;
     blur(): void;
-    cancelAnimationFrame(handle: number): void;
     /** @deprecated */
     captureEvents(): void;
     close(): void;
@@ -17050,7 +18606,6 @@ interface Window extends EventTarget, WindowTimers, WindowSessionStorage, Window
     prompt(message?: string, _default?: string): string | null;
     /** @deprecated */
     releaseEvents(): void;
-    requestAnimationFrame(callback: FrameRequestCallback): number;
     resizeBy(x: number, y: number): void;
     resizeTo(x: number, y: number): void;
     scroll(options?: ScrollToOptions): void;
@@ -17068,6 +18623,7 @@ interface Window extends EventTarget, WindowTimers, WindowSessionStorage, Window
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof WindowEventMap>(type: K, listener: (this: Window, ev: WindowEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
     removeEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | EventListenerOptions): void;
+    [index: number]: Window;
 }
 
 declare var Window: {
@@ -17159,10 +18715,11 @@ interface WorkerEventMap extends AbstractWorkerEventMap {
     "message": MessageEvent;
 }
 
-/** The Worker interface of the Web Workers API represents a background task that can be easily created and can send messages back to its creator. Creating a worker is as simple as calling the Worker() constructor and specifying a script to be run in the worker thread. */
+/** This Web Workers API interface represents a background task that can be easily created and can send messages back to its creator. Creating a worker is as simple as calling the Worker() constructor and specifying a script to be run in the worker thread. */
 interface Worker extends EventTarget, AbstractWorker {
     onmessage: ((this: Worker, ev: MessageEvent) => any) | null;
-    postMessage(message: any, transfer?: Transferable[]): void;
+    postMessage(message: any, transfer: Transferable[]): void;
+    postMessage(message: any, options?: PostMessageOptions): void;
     terminate(): void;
     addEventListener<K extends keyof WorkerEventMap>(type: K, listener: (this: Worker, ev: WorkerEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
@@ -17184,7 +18741,7 @@ declare var Worklet: {
     new(): Worklet;
 };
 
-/** The WritableStream interface of the the Streams API provides a standard abstraction for writing streaming data to a destination, known as a sink. This object comes with built-in backpressure and queuing. */
+/** This Streams API interface provides a standard abstraction for writing streaming data to a destination, known as a sink. This object comes with built-in backpressure and queuing. */
 interface WritableStream<W = any> {
     readonly locked: boolean;
     abort(reason?: any): Promise<void>;
@@ -17196,12 +18753,12 @@ declare var WritableStream: {
     new<W = any>(underlyingSink?: UnderlyingSink<W>, strategy?: QueuingStrategy<W>): WritableStream<W>;
 };
 
-/** The WritableStreamDefaultController interface of the the Streams API represents a controller allowing control of a WritableStream's state. When constructing a WritableStream, the underlying sink is given a corresponding WritableStreamDefaultController instance to manipulate. */
+/** This Streams API interface represents a controller allowing control of a WritableStream's state. When constructing a WritableStream, the underlying sink is given a corresponding WritableStreamDefaultController instance to manipulate. */
 interface WritableStreamDefaultController {
     error(error?: any): void;
 }
 
-/** The WritableStreamDefaultWriter interface of the the Streams API is the object returned by WritableStream.getWriter() and once created locks the < writer to the WritableStream ensuring that no other streams can write to the underlying sink. */
+/** This Streams API interface is the object returned by WritableStream.getWriter() and once created locks the < writer to the WritableStream ensuring that no other streams can write to the underlying sink. */
 interface WritableStreamDefaultWriter<W = any> {
     readonly closed: Promise<void>;
     readonly desiredSize: number | null;
@@ -17212,7 +18769,7 @@ interface WritableStreamDefaultWriter<W = any> {
     write(chunk: W): Promise<void>;
 }
 
-/** The XMLDocument interface represent an XML document. It inherits from the generic Document and does not add any specific methods or properties to it: nevertheless, several algorithms behave differently with the two types of documents. */
+/** An XML document. It inherits from the generic Document and does not add any specific methods or properties to it: nevertheless, several algorithms behave differently with the two types of documents. */
 interface XMLDocument extends Document {
     addEventListener<K extends keyof DocumentEventMap>(type: K, listener: (this: XMLDocument, ev: DocumentEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
@@ -17242,47 +18799,44 @@ interface XMLHttpRequest extends XMLHttpRequestEventTarget {
     readonly response: any;
     /**
      * Returns the text response.
+     * 
      * Throws an "InvalidStateError" DOMException if responseType is not the empty string or "text".
      */
     readonly responseText: string;
     /**
      * Returns the response type.
-     * Can be set to change the response type. Values are:
-     * the empty string (default),
-     * "arraybuffer",
-     * "blob",
-     * "document",
-     * "json", and
-     * "text".
+     * 
+     * Can be set to change the response type. Values are: the empty string (default), "arraybuffer", "blob", "document", "json", and "text".
+     * 
      * When set: setting to "document" is ignored if current global object is not a Window object.
+     * 
      * When set: throws an "InvalidStateError" DOMException if state is loading or done.
+     * 
      * When set: throws an "InvalidAccessError" DOMException if the synchronous flag is set and current global object is a Window object.
      */
     responseType: XMLHttpRequestResponseType;
     readonly responseURL: string;
     /**
      * Returns the document response.
+     * 
      * Throws an "InvalidStateError" DOMException if responseType is not the empty string or "document".
      */
     readonly responseXML: Document | null;
     readonly status: number;
     readonly statusText: string;
     /**
-     * Can be set to a time in milliseconds. When set to a non-zero value will cause fetching to terminate after the given time has passed. When the time has passed, the
-     * request has not yet completed, and the synchronous flag is unset, a timeout event will then be dispatched, or a
-     * "TimeoutError" DOMException will be thrown otherwise (for the send() method).
+     * Can be set to a time in milliseconds. When set to a non-zero value will cause fetching to terminate after the given time has passed. When the time has passed, the request has not yet completed, and the synchronous flag is unset, a timeout event will then be dispatched, or a "TimeoutError" DOMException will be thrown otherwise (for the send() method).
+     * 
      * When set: throws an "InvalidAccessError" DOMException if the synchronous flag is set and current global object is a Window object.
      */
     timeout: number;
     /**
-     * Returns the associated XMLHttpRequestUpload object. It can be used to gather transmission information when data is
-     * transferred to a server.
+     * Returns the associated XMLHttpRequestUpload object. It can be used to gather transmission information when data is transferred to a server.
      */
     readonly upload: XMLHttpRequestUpload;
     /**
-     * True when credentials are to be included in a cross-origin request. False when they are
-     * to be excluded in a cross-origin request and when cookies are to be ignored in its response.
-     * Initially false.
+     * True when credentials are to be included in a cross-origin request. False when they are to be excluded in a cross-origin request and when cookies are to be ignored in its response. Initially false.
+     * 
      * When set: throws an "InvalidStateError" DOMException if state is not unsent or opened, or if the send() flag is set.
      */
     withCredentials: boolean;
@@ -17294,31 +18848,33 @@ interface XMLHttpRequest extends XMLHttpRequestEventTarget {
     getResponseHeader(name: string): string | null;
     /**
      * Sets the request method, request URL, and synchronous flag.
-     * Throws a "SyntaxError" DOMException if either method is not a
-     * valid HTTP method or url cannot be parsed.
-     * Throws a "SecurityError" DOMException if method is a
-     * case-insensitive match for `CONNECT`, `TRACE`, or `TRACK`.
+     * 
+     * Throws a "SyntaxError" DOMException if either method is not a valid HTTP method or url cannot be parsed.
+     * 
+     * Throws a "SecurityError" DOMException if method is a case-insensitive match for `CONNECT`, `TRACE`, or `TRACK`.
+     * 
      * Throws an "InvalidAccessError" DOMException if async is false, current global object is a Window object, and the timeout attribute is not zero or the responseType attribute is not the empty string.
      */
     open(method: string, url: string): void;
     open(method: string, url: string, async: boolean, username?: string | null, password?: string | null): void;
     /**
-     * Acts as if the `Content-Type` header value for response is mime.
-     * (It does not actually change the header though.)
+     * Acts as if the `Content-Type` header value for response is mime. (It does not actually change the header though.)
+     * 
      * Throws an "InvalidStateError" DOMException if state is loading or done.
      */
     overrideMimeType(mime: string): void;
     /**
-     * Initiates the request. The body argument provides the request body, if any,
-     * and is ignored if the request method is GET or HEAD.
+     * Initiates the request. The body argument provides the request body, if any, and is ignored if the request method is GET or HEAD.
+     * 
      * Throws an "InvalidStateError" DOMException if either state is not opened or the send() flag is set.
      */
     send(body?: Document | BodyInit | null): void;
     /**
      * Combines a header in author request headers.
+     * 
      * Throws an "InvalidStateError" DOMException if either state is not opened or the send() flag is set.
-     * Throws a "SyntaxError" DOMException if name is not a header name
-     * or if value is not a header value.
+     * 
+     * Throws a "SyntaxError" DOMException if name is not a header name or if value is not a header value.
      */
     setRequestHeader(name: string, value: string): void;
     readonly DONE: number;
@@ -17343,13 +18899,13 @@ declare var XMLHttpRequest: {
 };
 
 interface XMLHttpRequestEventTargetEventMap {
-    "abort": ProgressEvent;
-    "error": ProgressEvent;
-    "load": ProgressEvent;
-    "loadend": ProgressEvent;
-    "loadstart": ProgressEvent;
-    "progress": ProgressEvent;
-    "timeout": ProgressEvent;
+    "abort": ProgressEvent<XMLHttpRequestEventTarget>;
+    "error": ProgressEvent<XMLHttpRequestEventTarget>;
+    "load": ProgressEvent<XMLHttpRequestEventTarget>;
+    "loadend": ProgressEvent<XMLHttpRequestEventTarget>;
+    "loadstart": ProgressEvent<XMLHttpRequestEventTarget>;
+    "progress": ProgressEvent<XMLHttpRequestEventTarget>;
+    "timeout": ProgressEvent<XMLHttpRequestEventTarget>;
 }
 
 interface XMLHttpRequestEventTarget extends EventTarget {
@@ -17383,7 +18939,7 @@ declare var XMLHttpRequestUpload: {
     new(): XMLHttpRequestUpload;
 };
 
-/** The XMLSerializer interface provides the serializeToString() method to construct an XML string representing a DOM tree. */
+/** Provides the serializeToString() method to construct an XML string representing a DOM tree. */
 interface XMLSerializer {
     serializeToString(root: Node): string;
 }
@@ -17393,10 +18949,8 @@ declare var XMLSerializer: {
     new(): XMLSerializer;
 };
 
-interface XPathEvaluator {
-    createExpression(expression: string, resolver: XPathNSResolver): XPathExpression;
-    createNSResolver(nodeResolver?: Node): XPathNSResolver;
-    evaluate(expression: string, contextNode: Node, resolver: XPathNSResolver | ((prefix: string) => string | null) | null, type: number, result: XPathResult | null): XPathResult;
+/** The XPathEvaluator interface allows to compile and evaluate XPath expressions. */
+interface XPathEvaluator extends XPathEvaluatorBase {
 }
 
 declare var XPathEvaluator: {
@@ -17404,9 +18958,15 @@ declare var XPathEvaluator: {
     new(): XPathEvaluator;
 };
 
-/** An XPathExpression is a compiled XPath query returned from document.createExpression(). It has a method evaluate() which can be used to execute the compiled XPath. */
+interface XPathEvaluatorBase {
+    createExpression(expression: string, resolver?: XPathNSResolver | null): XPathExpression;
+    createNSResolver(nodeResolver: Node): XPathNSResolver;
+    evaluate(expression: string, contextNode: Node, resolver?: XPathNSResolver | null, type?: number, result?: XPathResult | null): XPathResult;
+}
+
+/** This interface is a compiled XPath expression that can be evaluated on a document or specific node to return information its DOM tree. */
 interface XPathExpression {
-    evaluate(contextNode: Node, type: number, result: XPathResult | null): XPathResult;
+    evaluate(contextNode: Node, type?: number, result?: XPathResult | null): XPathResult;
 }
 
 declare var XPathExpression: {
@@ -17414,26 +18974,17 @@ declare var XPathExpression: {
     new(): XPathExpression;
 };
 
-interface XPathNSResolver {
-    lookupNamespaceURI(prefix: string): string | null;
-}
-
-declare var XPathNSResolver: {
-    prototype: XPathNSResolver;
-    new(): XPathNSResolver;
-};
-
-/** The XPathResult interface represents the results generated by evaluating an XPath 1.0 expression within the context of a given node. */
+/** The results generated by evaluating an XPath expression within the context of a given node. */
 interface XPathResult {
     readonly booleanValue: boolean;
     readonly invalidIteratorState: boolean;
     readonly numberValue: number;
     readonly resultType: number;
-    readonly singleNodeValue: Node;
+    readonly singleNodeValue: Node | null;
     readonly snapshotLength: number;
     readonly stringValue: string;
-    iterateNext(): Node;
-    snapshotItem(index: number): Node;
+    iterateNext(): Node | null;
+    snapshotItem(index: number): Node | null;
     readonly ANY_TYPE: number;
     readonly ANY_UNORDERED_NODE_TYPE: number;
     readonly BOOLEAN_TYPE: number;
@@ -17492,6 +19043,123 @@ declare var webkitRTCPeerConnection: {
 
 declare type EventListenerOrEventListenerObject = EventListener | EventListenerObject;
 
+declare namespace WebAssembly {
+    interface CompileError {
+    }
+    
+    var CompileError: {
+        prototype: CompileError;
+        new(): CompileError;
+    };
+    
+    interface Global {
+        value: any;
+        valueOf(): any;
+    }
+    
+    var Global: {
+        prototype: Global;
+        new(descriptor: GlobalDescriptor, value?: any): Global;
+    };
+    
+    interface Instance {
+        readonly exports: any;
+    }
+    
+    var Instance: {
+        prototype: Instance;
+        new(module: Module, importObject?: any): Instance;
+    };
+    
+    interface LinkError {
+    }
+    
+    var LinkError: {
+        prototype: LinkError;
+        new(): LinkError;
+    };
+    
+    interface Memory {
+        readonly buffer: ArrayBuffer;
+        grow(delta: number): number;
+    }
+    
+    var Memory: {
+        prototype: Memory;
+        new(descriptor: MemoryDescriptor): Memory;
+    };
+    
+    interface Module {
+    }
+    
+    var Module: {
+        prototype: Module;
+        new(bytes: BufferSource): Module;
+        customSections(module: Module, sectionName: string): ArrayBuffer[];
+        exports(module: Module): ModuleExportDescriptor[];
+        imports(module: Module): ModuleImportDescriptor[];
+    };
+    
+    interface RuntimeError {
+    }
+    
+    var RuntimeError: {
+        prototype: RuntimeError;
+        new(): RuntimeError;
+    };
+    
+    interface Table {
+        readonly length: number;
+        get(index: number): Function | null;
+        grow(delta: number): number;
+        set(index: number, value: Function | null): void;
+    }
+    
+    var Table: {
+        prototype: Table;
+        new(descriptor: TableDescriptor): Table;
+    };
+    
+    interface GlobalDescriptor {
+        mutable?: boolean;
+        value: string;
+    }
+    
+    interface MemoryDescriptor {
+        initial: number;
+        maximum?: number;
+    }
+    
+    interface ModuleExportDescriptor {
+        kind: ImportExportKind;
+        name: string;
+    }
+    
+    interface ModuleImportDescriptor {
+        kind: ImportExportKind;
+        module: string;
+        name: string;
+    }
+    
+    interface TableDescriptor {
+        element: TableKind;
+        initial: number;
+        maximum?: number;
+    }
+    
+    interface WebAssemblyInstantiatedSource {
+        instance: Instance;
+        module: Module;
+    }
+    
+    type ImportExportKind = "function" | "table" | "memory" | "global";
+    type TableKind = "anyfunc";
+    function compile(bytes: BufferSource): Promise<Module>;
+    function instantiate(bytes: BufferSource, importObject?: any): Promise<WebAssemblyInstantiatedSource>;
+    function instantiate(moduleObject: Module, importObject?: any): Promise<Instance>;
+    function validate(bytes: BufferSource): boolean;
+}
+
 interface BlobCallback {
     (blob: Blob | null): void;
 }
@@ -17748,6 +19416,7 @@ interface HTMLElementDeprecatedTagNameMap {
 }
 
 interface SVGElementTagNameMap {
+    "a": SVGAElement;
     "circle": SVGCircleElement;
     "clipPath": SVGClipPathElement;
     "defs": SVGDefsElement;
@@ -17792,19 +19461,22 @@ interface SVGElementTagNameMap {
     "polyline": SVGPolylineElement;
     "radialGradient": SVGRadialGradientElement;
     "rect": SVGRectElement;
+    "script": SVGScriptElement;
     "stop": SVGStopElement;
+    "style": SVGStyleElement;
     "svg": SVGSVGElement;
     "switch": SVGSwitchElement;
     "symbol": SVGSymbolElement;
     "text": SVGTextElement;
     "textPath": SVGTextPathElement;
+    "title": SVGTitleElement;
     "tspan": SVGTSpanElement;
     "use": SVGUseElement;
     "view": SVGViewElement;
 }
 
 /** @deprecated Directly use HTMLElementTagNameMap or SVGElementTagNameMap as appropriate, instead. */
-interface ElementTagNameMap extends HTMLElementTagNameMap, SVGElementTagNameMap { }
+type ElementTagNameMap = HTMLElementTagNameMap & Pick<SVGElementTagNameMap, Exclude<keyof SVGElementTagNameMap, keyof HTMLElementTagNameMap>>;
 
 declare var Audio: {
     new(src?: string): HTMLAudioElement;
@@ -17815,9 +19487,6 @@ declare var Image: {
 declare var Option: {
     new(text?: string, value?: string, defaultSelected?: boolean, selected?: boolean): HTMLOptionElement;
 };
-declare var Blob: typeof Blob;
-declare var URL: typeof URL;
-declare var URLSearchParams: typeof URLSearchParams;
 declare var applicationCache: ApplicationCache;
 declare var caches: CacheStorage;
 declare var clientInformation: Navigator;
@@ -17850,6 +19519,7 @@ declare var oncompassneedscalibration: ((this: Window, ev: Event) => any) | null
 declare var ondevicelight: ((this: Window, ev: DeviceLightEvent) => any) | null;
 declare var ondevicemotion: ((this: Window, ev: DeviceMotionEvent) => any) | null;
 declare var ondeviceorientation: ((this: Window, ev: DeviceOrientationEvent) => any) | null;
+declare var ondeviceorientationabsolute: ((this: Window, ev: DeviceOrientationEvent) => any) | null;
 declare var onmousewheel: ((this: Window, ev: Event) => any) | null;
 declare var onmsgesturechange: ((this: Window, ev: Event) => any) | null;
 declare var onmsgesturedoubletap: ((this: Window, ev: Event) => any) | null;
@@ -17868,7 +19538,7 @@ declare var onmspointerover: ((this: Window, ev: Event) => any) | null;
 declare var onmspointerup: ((this: Window, ev: Event) => any) | null;
 /** @deprecated */
 declare var onorientationchange: ((this: Window, ev: Event) => any) | null;
-declare var onreadystatechange: ((this: Window, ev: ProgressEvent) => any) | null;
+declare var onreadystatechange: ((this: Window, ev: ProgressEvent<Window>) => any) | null;
 declare var onvrdisplayactivate: ((this: Window, ev: Event) => any) | null;
 declare var onvrdisplayblur: ((this: Window, ev: Event) => any) | null;
 declare var onvrdisplayconnect: ((this: Window, ev: Event) => any) | null;
@@ -17896,17 +19566,16 @@ declare var screenY: number;
 declare var scrollX: number;
 declare var scrollY: number;
 declare var scrollbars: BarProp;
-declare var self: Window;
+declare var self: Window & typeof globalThis;
 declare var speechSynthesis: SpeechSynthesis;
 declare var status: string;
 declare var statusbar: BarProp;
 declare var styleMedia: StyleMedia;
 declare var toolbar: BarProp;
 declare var top: Window;
-declare var window: Window;
+declare var window: Window & typeof globalThis;
 declare function alert(message?: any): void;
 declare function blur(): void;
-declare function cancelAnimationFrame(handle: number): void;
 /** @deprecated */
 declare function captureEvents(): void;
 declare function close(): void;
@@ -17926,7 +19595,6 @@ declare function print(): void;
 declare function prompt(message?: string, _default?: string): string | null;
 /** @deprecated */
 declare function releaseEvents(): void;
-declare function requestAnimationFrame(callback: FrameRequestCallback): number;
 declare function resizeBy(x: number, y: number): void;
 declare function resizeTo(x: number, y: number): void;
 declare function scroll(options?: ScrollToOptions): void;
@@ -17942,8 +19610,7 @@ declare function webkitConvertPointFromPageToNode(node: Node, pt: WebKitPoint):
 declare function webkitRequestAnimationFrame(callback: FrameRequestCallback): number;
 declare function toString(): string;
 /**
- * Dispatches a synthetic event event to target and returns true
- * if either event's cancelable attribute value is false or its preventDefault() method was not invoked, and false otherwise.
+ * Dispatches a synthetic event event to target and returns true if either event's cancelable attribute value is false or its preventDefault() method was not invoked, and false otherwise.
  */
 declare function dispatchEvent(event: Event): boolean;
 declare var sessionStorage: Storage;
@@ -17958,7 +19625,7 @@ declare var onanimationcancel: ((this: Window, ev: AnimationEvent) => any) | nul
 declare var onanimationend: ((this: Window, ev: AnimationEvent) => any) | null;
 declare var onanimationiteration: ((this: Window, ev: AnimationEvent) => any) | null;
 declare var onanimationstart: ((this: Window, ev: AnimationEvent) => any) | null;
-declare var onauxclick: ((this: Window, ev: Event) => any) | null;
+declare var onauxclick: ((this: Window, ev: MouseEvent) => any) | null;
 /**
  * Fires when the object loses the input focus.
  * @param ev The focus event.
@@ -18218,7 +19885,8 @@ declare var onwheel: ((this: Window, ev: WheelEvent) => any) | null;
 declare var indexedDB: IDBFactory;
 declare function atob(encodedString: string): string;
 declare function btoa(rawString: string): string;
-declare function fetch(input: RequestInfo, init?: RequestInit): Promise<Response>;
+declare function cancelAnimationFrame(handle: number): void;
+declare function requestAnimationFrame(callback: FrameRequestCallback): number;
 declare var caches: CacheStorage;
 declare var crypto: Crypto;
 declare var indexedDB: IDBFactory;
@@ -18256,22 +19924,33 @@ declare function addEventListener<K extends keyof WindowEventMap>(type: K, liste
 declare function addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
 declare function removeEventListener<K extends keyof WindowEventMap>(type: K, listener: (this: Window, ev: WindowEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
 declare function removeEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | EventListenerOptions): void;
-type BlobPart = BufferSource | Blob | string;
 type HeadersInit = Headers | string[][] | Record<string, string>;
 type BodyInit = Blob | BufferSource | FormData | URLSearchParams | ReadableStream<Uint8Array> | string;
 type RequestInfo = Request | string;
+type BlobPart = BufferSource | Blob | string;
 type DOMHighResTimeStamp = number;
-type RenderingContext = CanvasRenderingContext2D | ImageBitmapRenderingContext | WebGLRenderingContext;
+type RenderingContext = CanvasRenderingContext2D | ImageBitmapRenderingContext | WebGLRenderingContext | WebGL2RenderingContext;
 type HTMLOrSVGImageElement = HTMLImageElement | SVGImageElement;
-type CanvasImageSource = HTMLOrSVGImageElement | HTMLVideoElement | HTMLCanvasElement | ImageBitmap;
+type CanvasImageSource = HTMLOrSVGImageElement | HTMLVideoElement | HTMLCanvasElement | ImageBitmap | OffscreenCanvas;
+type OffscreenRenderingContext = OffscreenCanvasRenderingContext2D | ImageBitmapRenderingContext | WebGLRenderingContext | WebGL2RenderingContext;
 type MessageEventSource = WindowProxy | MessagePort | ServiceWorker;
 type HTMLOrSVGScriptElement = HTMLScriptElement | SVGScriptElement;
 type ImageBitmapSource = CanvasImageSource | Blob | ImageData;
 type OnErrorEventHandler = OnErrorEventHandlerNonNull | null;
 type OnBeforeUnloadEventHandler = OnBeforeUnloadEventHandlerNonNull | null;
 type TimerHandler = string | Function;
+type ConstrainULong = number | ConstrainULongRange;
+type ConstrainDouble = number | ConstrainDoubleRange;
+type ConstrainBoolean = boolean | ConstrainBooleanParameters;
+type ConstrainDOMString = string | string[] | ConstrainDOMStringParameters;
 type PerformanceEntryList = PerformanceEntry[];
 type VibratePattern = number | number[];
+type COSEAlgorithmIdentifier = number;
+type AuthenticatorSelectionList = AAGUID[];
+type AAGUID = BufferSource;
+type AuthenticationExtensionsSupported = string[];
+type UvmEntry = number[];
+type UvmEntries = UvmEntry[];
 type AlgorithmIdentifier = string | Algorithm;
 type HashAlgorithmIdentifier = AlgorithmIdentifier;
 type BigInteger = Uint8Array;
@@ -18286,9 +19965,12 @@ type GLsizeiptr = number;
 type GLuint = number;
 type GLfloat = number;
 type GLclampf = number;
-type TexImageSource = ImageBitmap | ImageData | HTMLImageElement | HTMLCanvasElement | HTMLVideoElement;
+type TexImageSource = ImageBitmap | ImageData | HTMLImageElement | HTMLCanvasElement | HTMLVideoElement | OffscreenCanvas;
 type Float32List = Float32Array | GLfloat[];
 type Int32List = Int32Array | GLint[];
+type GLint64 = number;
+type GLuint64 = number;
+type Uint32List = Uint32Array | GLuint[];
 type BufferSource = ArrayBufferView | ArrayBuffer;
 type DOMTimeStamp = number;
 type LineAndPositionSetting = number | AutoKeyword;
@@ -18296,10 +19978,6 @@ type FormDataEntryValue = File | string;
 type InsertPosition = "beforebegin" | "afterbegin" | "beforeend" | "afterend";
 type IDBValidKey = number | string | Date | BufferSource | IDBArrayKey;
 type MutationRecordType = "attributes" | "characterData" | "childList";
-type ConstrainBoolean = boolean | ConstrainBooleanParameters;
-type ConstrainDOMString = string | string[] | ConstrainDOMStringParameters;
-type ConstrainDouble = number | ConstrainDoubleRange;
-type ConstrainLong = number | ConstrainLongRange;
 type IDBKeyPath = string;
 type Transferable = ArrayBuffer | MessagePort | ImageBitmap;
 type RTCIceGatherCandidate = RTCIceCandidateDictionary | RTCIceCandidateComplete;
@@ -18310,8 +19988,11 @@ type WindowProxy = Window;
 type AlignSetting = "start" | "center" | "end" | "left" | "right";
 type AnimationPlayState = "idle" | "running" | "paused" | "finished";
 type AppendMode = "segments" | "sequence";
+type AttestationConveyancePreference = "none" | "indirect" | "direct";
 type AudioContextLatencyCategory = "balanced" | "interactive" | "playback";
 type AudioContextState = "suspended" | "running" | "closed";
+type AuthenticatorAttachment = "platform" | "cross-platform";
+type AuthenticatorTransport = "usb" | "nfc" | "ble" | "internal";
 type AutoKeyword = "auto";
 type AutomationRate = "a-rate" | "k-rate";
 type BinaryType = "blob" | "arraybuffer";
@@ -18328,6 +20009,7 @@ type ChannelInterpretation = "speakers" | "discrete";
 type ClientTypes = "window" | "worker" | "sharedworker" | "all";
 type CompositeOperation = "replace" | "add" | "accumulate";
 type CompositeOperationOrAuto = "replace" | "add" | "accumulate" | "auto";
+type CredentialMediationRequirement = "silent" | "optional" | "required";
 type DirectionSetting = "" | "rl" | "lr";
 type DisplayCaptureSurfaceType = "monitor" | "window" | "application" | "browser";
 type DistanceModelType = "linear" | "inverse" | "exponential";
@@ -18338,7 +20020,6 @@ type FillMode = "none" | "forwards" | "backwards" | "both" | "auto";
 type FullscreenNavigationUI = "auto" | "show" | "hide";
 type GamepadHand = "" | "left" | "right";
 type GamepadHapticActuatorType = "vibration";
-type GamepadInputEmulationType = "mouse" | "keyboard" | "gamepad";
 type GamepadMappingType = "" | "standard";
 type IDBCursorDirection = "next" | "nextunique" | "prev" | "prevunique";
 type IDBRequestReadyState = "pending" | "done";
@@ -18364,6 +20045,7 @@ type NavigationReason = "up" | "down" | "left" | "right";
 type NavigationType = "navigate" | "reload" | "back_forward" | "prerender";
 type NotificationDirection = "auto" | "ltr" | "rtl";
 type NotificationPermission = "default" | "denied" | "granted";
+type OffscreenRenderingContextId = "2d" | "bitmaprenderer" | "webgl" | "webgl2";
 type OrientationLockType = "any" | "natural" | "landscape" | "portrait" | "portrait-primary" | "portrait-secondary" | "landscape-primary" | "landscape-secondary";
 type OrientationType = "portrait-primary" | "portrait-secondary" | "landscape-primary" | "landscape-secondary";
 type OscillatorType = "sine" | "square" | "sawtooth" | "triangle" | "custom";
@@ -18371,8 +20053,11 @@ type OverSampleType = "none" | "2x" | "4x";
 type PanningModelType = "equalpower" | "HRTF";
 type PaymentComplete = "success" | "fail" | "unknown";
 type PaymentShippingType = "shipping" | "delivery" | "pickup";
+type PermissionName = "geolocation" | "notifications" | "push" | "midi" | "camera" | "microphone" | "speaker" | "device-info" | "background-sync" | "bluetooth" | "persistent-storage" | "ambient-light-sensor" | "accelerometer" | "gyroscope" | "magnetometer" | "clipboard";
+type PermissionState = "granted" | "denied" | "prompt";
 type PlaybackDirection = "normal" | "reverse" | "alternate" | "alternate-reverse";
 type PositionAlignSetting = "line-left" | "center" | "line-right" | "auto";
+type PublicKeyCredentialType = "public-key";
 type PushEncryptionKeyName = "p256dh" | "auth";
 type PushPermissionState = "denied" | "granted" | "prompt";
 type RTCBundlePolicy = "balanced" | "max-compat" | "max-bundle";
@@ -18428,6 +20113,7 @@ type TextTrackKind = "subtitles" | "captions" | "descriptions" | "chapters" | "m
 type TextTrackMode = "disabled" | "hidden" | "showing";
 type TouchType = "direct" | "stylus";
 type Transport = "usb" | "nfc" | "ble";
+type UserVerificationRequirement = "required" | "preferred" | "discouraged";
 type VRDisplayEventReason = "mounted" | "navigation" | "requested" | "unmounted";
 type VideoFacingModeEnum = "user" | "environment" | "left" | "right";
 type VisibilityState = "hidden" | "visible" | "prerender";
diff --git a/lib/lib.dom.iterable.d.ts b/lib/lib.dom.iterable.d.ts
index 4366c7174b6..00b00fa5248 100644
--- a/lib/lib.dom.iterable.d.ts
+++ b/lib/lib.dom.iterable.d.ts
@@ -22,6 +22,10 @@ and limitations under the License.
 /// DOM Iterable APIs
 /////////////////////////////
 
+interface AudioParam {
+    setValueCurveAtTime(values: Iterable<number>, startTime: number, duration: number): AudioParam;
+}
+
 interface AudioParamMap extends ReadonlyMap<string, AudioParam> {
 }
 
@@ -29,6 +33,11 @@ interface AudioTrackList {
     [Symbol.iterator](): IterableIterator<AudioTrack>;
 }
 
+interface BaseAudioContext {
+    createIIRFilter(feedforward: Iterable<number>, feedback: Iterable<number>): IIRFilterNode;
+    createPeriodicWave(real: Iterable<number>, imag: Iterable<number>, constraints?: PeriodicWaveConstraints): PeriodicWave;
+}
+
 interface CSSRuleList {
     [Symbol.iterator](): IterableIterator<CSSRule>;
 }
@@ -37,6 +46,14 @@ interface CSSStyleDeclaration {
     [Symbol.iterator](): IterableIterator<string>;
 }
 
+interface Cache {
+    addAll(requests: Iterable<RequestInfo>): Promise<void>;
+}
+
+interface CanvasPathDrawingStyles {
+    setLineDash(segments: Iterable<number>): void;
+}
+
 interface ClientRectList {
     [Symbol.iterator](): IterableIterator<ClientRect>;
 }
@@ -116,6 +133,15 @@ interface Headers {
     values(): IterableIterator<string>;
 }
 
+interface IDBObjectStore {
+    /**
+     * Creates a new index in store with the given name, keyPath and options and returns a new IDBIndex. If the keyPath and options define constraints that cannot be satisfied with the data already in store the upgrade transaction will abort with a "ConstraintError" DOMException.
+     * 
+     * Throws an "InvalidStateError" DOMException if not called within an upgrade transaction.
+     */
+    createIndex(name: string, keyPath: string | Iterable<string>, options?: IDBIndexParameters): IDBIndex;
+}
+
 interface MediaKeyStatusMap {
     [Symbol.iterator](): IterableIterator<[BufferSource, MediaKeyStatus]>;
     entries(): IterableIterator<[BufferSource, MediaKeyStatus]>;
@@ -128,13 +154,17 @@ interface MediaList {
 }
 
 interface MimeTypeArray {
-    [Symbol.iterator](): IterableIterator<Plugin>;
+    [Symbol.iterator](): IterableIterator<MimeType>;
 }
 
 interface NamedNodeMap {
     [Symbol.iterator](): IterableIterator<Attr>;
 }
 
+interface Navigator {
+    requestMediaKeySystemAccess(keySystem: string, supportedConfigurations: Iterable<MediaKeySystemConfiguration>): Promise<MediaKeySystemAccess>;
+}
+
 interface NodeList {
     [Symbol.iterator](): IterableIterator<Node>;
     /**
@@ -175,6 +205,10 @@ interface PluginArray {
     [Symbol.iterator](): IterableIterator<Plugin>;
 }
 
+interface RTCRtpTransceiver {
+    setCodecPreferences(codecs: Iterable<RTCRtpCodecCapability>): void;
+}
+
 interface RTCStatsReport extends ReadonlyMap<string, any> {
 }
 
@@ -186,6 +220,10 @@ interface SVGNumberList {
     [Symbol.iterator](): IterableIterator<SVGNumber>;
 }
 
+interface SVGPointList {
+    [Symbol.iterator](): IterableIterator<DOMPoint>;
+}
+
 interface SVGStringList {
     [Symbol.iterator](): IterableIterator<string>;
 }
@@ -238,6 +276,77 @@ interface URLSearchParams {
     values(): IterableIterator<string>;
 }
 
+interface VRDisplay {
+    requestPresent(layers: Iterable<VRLayer>): Promise<void>;
+}
+
 interface VideoTrackList {
     [Symbol.iterator](): IterableIterator<VideoTrack>;
 }
+
+interface WEBGL_draw_buffers {
+    drawBuffersWEBGL(buffers: Iterable<GLenum>): void;
+}
+
+interface WebAuthentication {
+    makeCredential(accountInformation: Account, cryptoParameters: Iterable<ScopedCredentialParameters>, attestationChallenge: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer | null, options?: ScopedCredentialOptions): Promise<ScopedCredentialInfo>;
+}
+
+interface WebGL2RenderingContextBase {
+    invalidateFramebuffer(target: GLenum, attachments: Iterable<GLenum>): void;
+    invalidateSubFramebuffer(target: GLenum, attachments: Iterable<GLenum>, x: GLint, y: GLint, width: GLsizei, height: GLsizei): void;
+    uniform1uiv(location: WebGLUniformLocation | null, data: Iterable<GLuint>, srcOffset?: GLuint, srcLength?: GLuint): void;
+    uniform2uiv(location: WebGLUniformLocation | null, data: Iterable<GLuint>, srcOffset?: GLuint, srcLength?: GLuint): void;
+    uniform3uiv(location: WebGLUniformLocation | null, data: Iterable<GLuint>, srcOffset?: GLuint, srcLength?: GLuint): void;
+    uniform4uiv(location: WebGLUniformLocation | null, data: Iterable<GLuint>, srcOffset?: GLuint, srcLength?: GLuint): void;
+    uniformMatrix3x2fv(location: WebGLUniformLocation | null, transpose: GLboolean, data: Iterable<GLfloat>, srcOffset?: GLuint, srcLength?: GLuint): void;
+    uniformMatrix4x2fv(location: WebGLUniformLocation | null, transpose: GLboolean, data: Iterable<GLfloat>, srcOffset?: GLuint, srcLength?: GLuint): void;
+    uniformMatrix2x3fv(location: WebGLUniformLocation | null, transpose: GLboolean, data: Iterable<GLfloat>, srcOffset?: GLuint, srcLength?: GLuint): void;
+    uniformMatrix4x3fv(location: WebGLUniformLocation | null, transpose: GLboolean, data: Iterable<GLfloat>, srcOffset?: GLuint, srcLength?: GLuint): void;
+    uniformMatrix2x4fv(location: WebGLUniformLocation | null, transpose: GLboolean, data: Iterable<GLfloat>, srcOffset?: GLuint, srcLength?: GLuint): void;
+    uniformMatrix3x4fv(location: WebGLUniformLocation | null, transpose: GLboolean, data: Iterable<GLfloat>, srcOffset?: GLuint, srcLength?: GLuint): void;
+    vertexAttribI4iv(index: GLuint, values: Iterable<GLint>): void;
+    vertexAttribI4uiv(index: GLuint, values: Iterable<GLuint>): void;
+    drawBuffers(buffers: Iterable<GLenum>): void;
+    clearBufferfv(buffer: GLenum, drawbuffer: GLint, values: Iterable<GLfloat>, srcOffset?: GLuint): void;
+    clearBufferiv(buffer: GLenum, drawbuffer: GLint, values: Iterable<GLint>, srcOffset?: GLuint): void;
+    clearBufferuiv(buffer: GLenum, drawbuffer: GLint, values: Iterable<GLuint>, srcOffset?: GLuint): void;
+    transformFeedbackVaryings(program: WebGLProgram, varyings: Iterable<string>, bufferMode: GLenum): void;
+    getUniformIndices(program: WebGLProgram, uniformNames: Iterable<string>): Iterable<GLuint> | null;
+    getActiveUniforms(program: WebGLProgram, uniformIndices: Iterable<GLuint>, pname: GLenum): any;
+}
+
+interface WebGL2RenderingContextOverloads {
+    uniform1fv(location: WebGLUniformLocation | null, data: Iterable<GLfloat>, srcOffset?: GLuint, srcLength?: GLuint): void;
+    uniform2fv(location: WebGLUniformLocation | null, data: Iterable<GLfloat>, srcOffset?: GLuint, srcLength?: GLuint): void;
+    uniform3fv(location: WebGLUniformLocation | null, data: Iterable<GLfloat>, srcOffset?: GLuint, srcLength?: GLuint): void;
+    uniform4fv(location: WebGLUniformLocation | null, data: Iterable<GLfloat>, srcOffset?: GLuint, srcLength?: GLuint): void;
+    uniform1iv(location: WebGLUniformLocation | null, data: Iterable<GLint>, srcOffset?: GLuint, srcLength?: GLuint): void;
+    uniform2iv(location: WebGLUniformLocation | null, data: Iterable<GLint>, srcOffset?: GLuint, srcLength?: GLuint): void;
+    uniform3iv(location: WebGLUniformLocation | null, data: Iterable<GLint>, srcOffset?: GLuint, srcLength?: GLuint): void;
+    uniform4iv(location: WebGLUniformLocation | null, data: Iterable<GLint>, srcOffset?: GLuint, srcLength?: GLuint): void;
+    uniformMatrix2fv(location: WebGLUniformLocation | null, transpose: GLboolean, data: Iterable<GLfloat>, srcOffset?: GLuint, srcLength?: GLuint): void;
+    uniformMatrix3fv(location: WebGLUniformLocation | null, transpose: GLboolean, data: Iterable<GLfloat>, srcOffset?: GLuint, srcLength?: GLuint): void;
+    uniformMatrix4fv(location: WebGLUniformLocation | null, transpose: GLboolean, data: Iterable<GLfloat>, srcOffset?: GLuint, srcLength?: GLuint): void;
+}
+
+interface WebGLRenderingContextBase {
+    vertexAttrib1fv(index: GLuint, values: Iterable<GLfloat>): void;
+    vertexAttrib2fv(index: GLuint, values: Iterable<GLfloat>): void;
+    vertexAttrib3fv(index: GLuint, values: Iterable<GLfloat>): void;
+    vertexAttrib4fv(index: GLuint, values: Iterable<GLfloat>): void;
+}
+
+interface WebGLRenderingContextOverloads {
+    uniform1fv(location: WebGLUniformLocation | null, v: Iterable<GLfloat>): void;
+    uniform2fv(location: WebGLUniformLocation | null, v: Iterable<GLfloat>): void;
+    uniform3fv(location: WebGLUniformLocation | null, v: Iterable<GLfloat>): void;
+    uniform4fv(location: WebGLUniformLocation | null, v: Iterable<GLfloat>): void;
+    uniform1iv(location: WebGLUniformLocation | null, v: Iterable<GLint>): void;
+    uniform2iv(location: WebGLUniformLocation | null, v: Iterable<GLint>): void;
+    uniform3iv(location: WebGLUniformLocation | null, v: Iterable<GLint>): void;
+    uniform4iv(location: WebGLUniformLocation | null, v: Iterable<GLint>): void;
+    uniformMatrix2fv(location: WebGLUniformLocation | null, transpose: GLboolean, value: Iterable<GLfloat>): void;
+    uniformMatrix3fv(location: WebGLUniformLocation | null, transpose: GLboolean, value: Iterable<GLfloat>): void;
+    uniformMatrix4fv(location: WebGLUniformLocation | null, transpose: GLboolean, value: Iterable<GLfloat>): void;
+}
diff --git a/lib/lib.es2015.collection.d.ts b/lib/lib.es2015.collection.d.ts
index 2c19919dd20..557bfd9bcf3 100644
--- a/lib/lib.es2015.collection.d.ts
+++ b/lib/lib.es2015.collection.d.ts
@@ -30,7 +30,7 @@ interface Map<K, V> {
 
 interface MapConstructor {
     new(): Map<any, any>;
-    new<K, V>(entries?: ReadonlyArray<[K, V]> | null): Map<K, V>;
+    new<K, V>(entries?: ReadonlyArray<readonly [K, V]> | null): Map<K, V>;
     readonly prototype: Map<any, any>;
 }
 declare var Map: MapConstructor;
diff --git a/lib/lib.es2015.core.d.ts b/lib/lib.es2015.core.d.ts
index 7c43b36c424..8cecc6e01d8 100644
--- a/lib/lib.es2015.core.d.ts
+++ b/lib/lib.es2015.core.d.ts
@@ -29,7 +29,7 @@ interface Array<T> {
      * predicate. If it is not provided, undefined is used instead.
      */
     find<S extends T>(predicate: (this: void, value: T, index: number, obj: T[]) => value is S, thisArg?: any): S | undefined;
-    find(predicate: (value: T, index: number, obj: T[]) => boolean, thisArg?: any): T | undefined;
+    find(predicate: (value: T, index: number, obj: T[]) => unknown, thisArg?: any): T | undefined;
 
     /**
      * Returns the index of the first element in the array where predicate is true, and -1
@@ -40,7 +40,7 @@ interface Array<T> {
      * @param thisArg If provided, it will be used as the this value for each invocation of
      * predicate. If it is not provided, undefined is used instead.
      */
-    findIndex(predicate: (value: T, index: number, obj: T[]) => boolean, thisArg?: any): number;
+    findIndex(predicate: (value: T, index: number, obj: T[]) => unknown, thisArg?: any): number;
 
     /**
      * Returns the this object after filling the section identified by start and end with value
@@ -318,6 +318,12 @@ interface ObjectConstructor {
      */
     getOwnPropertySymbols(o: any): symbol[];
 
+    /**
+      * Returns the names of the enumerable string properties and methods of an object.
+      * @param o Object that contains the properties and methods. This can be an object that you created or an existing Document Object Model (DOM) object.
+      */
+    keys(o: {}): string[];
+
     /**
      * Returns true if the values are the same value, false otherwise.
      * @param value1 The first value.
@@ -344,7 +350,7 @@ interface ReadonlyArray<T> {
      * predicate. If it is not provided, undefined is used instead.
      */
     find<S extends T>(predicate: (this: void, value: T, index: number, obj: ReadonlyArray<T>) => value is S, thisArg?: any): S | undefined;
-    find(predicate: (value: T, index: number, obj: ReadonlyArray<T>) => boolean, thisArg?: any): T | undefined;
+    find(predicate: (value: T, index: number, obj: ReadonlyArray<T>) => unknown, thisArg?: any): T | undefined;
 
     /**
      * Returns the index of the first element in the array where predicate is true, and -1
@@ -355,7 +361,7 @@ interface ReadonlyArray<T> {
      * @param thisArg If provided, it will be used as the this value for each invocation of
      * predicate. If it is not provided, undefined is used instead.
      */
-    findIndex(predicate: (value: T, index: number, obj: ReadonlyArray<T>) => boolean, thisArg?: any): number;
+    findIndex(predicate: (value: T, index: number, obj: ReadonlyArray<T>) => unknown, thisArg?: any): number;
 }
 
 interface RegExp {
@@ -387,8 +393,8 @@ interface RegExp {
 }
 
 interface RegExpConstructor {
-    new (pattern: RegExp, flags?: string): RegExp;
-    (pattern: RegExp, flags?: string): RegExp;
+    new (pattern: RegExp | string, flags?: string): RegExp;
+    (pattern: RegExp | string, flags?: string): RegExp;
 }
 
 interface String {
diff --git a/lib/lib.es2015.generator.d.ts b/lib/lib.es2015.generator.d.ts
index df6a987eb77..25b733b07f9 100644
--- a/lib/lib.es2015.generator.d.ts
+++ b/lib/lib.es2015.generator.d.ts
@@ -18,7 +18,15 @@ and limitations under the License.
 /// <reference no-default-lib="true"/>
 
 
-interface Generator extends Iterator<any> { }
+/// <reference lib="es2015.iterable" />
+
+interface Generator<T = unknown, TReturn = any, TNext = unknown> extends Iterator<T, TReturn, TNext> {
+    // NOTE: 'next' is defined using a tuple to ensure we report the correct assignability errors in all places.
+    next(...args: [] | [TNext]): IteratorResult<T, TReturn>;
+    return(value: TReturn): IteratorResult<T, TReturn>;
+    throw(e: any): IteratorResult<T, TReturn>;
+    [Symbol.iterator](): Generator<T, TReturn, TNext>;
+}
 
 interface GeneratorFunction {
     /**
diff --git a/lib/lib.es2015.iterable.d.ts b/lib/lib.es2015.iterable.d.ts
index 43b021a197d..051d3f26eb8 100644
--- a/lib/lib.es2015.iterable.d.ts
+++ b/lib/lib.es2015.iterable.d.ts
@@ -28,15 +28,23 @@ interface SymbolConstructor {
     readonly iterator: symbol;
 }
 
-interface IteratorResult<T> {
-    done: boolean;
-    value: T;
+interface IteratorYieldResult<TYield> {
+    done?: false;
+    value: TYield;
 }
 
-interface Iterator<T> {
-    next(value?: any): IteratorResult<T>;
-    return?(value?: any): IteratorResult<T>;
-    throw?(e?: any): IteratorResult<T>;
+interface IteratorReturnResult<TReturn> {
+    done: true;
+    value: TReturn;
+}
+
+type IteratorResult<T, TReturn = any> = IteratorYieldResult<T> | IteratorReturnResult<TReturn>;
+
+interface Iterator<T, TReturn = any, TNext = undefined> {
+    // NOTE: 'next' is defined using a tuple to ensure we report the correct assignability errors in all places.
+    next(...args: [] | [TNext]): IteratorResult<T, TReturn>;
+    return?(value?: TReturn): IteratorResult<T, TReturn>;
+    throw?(e?: any): IteratorResult<T, TReturn>;
 }
 
 interface Iterable<T> {
@@ -149,7 +157,7 @@ interface ReadonlyMap<K, V> {
 }
 
 interface MapConstructor {
-    new <K, V>(iterable: Iterable<[K, V]>): Map<K, V>;
+    new <K, V>(iterable: Iterable<readonly [K, V]>): Map<K, V>;
 }
 
 interface WeakMap<K extends object, V> { }
@@ -197,7 +205,7 @@ interface ReadonlySet<T> {
 }
 
 interface SetConstructor {
-    new <T>(iterable: Iterable<T>): Set<T>;
+    new <T>(iterable?: Iterable<T> | null): Set<T>;
 }
 
 interface WeakSet<T extends object> { }
diff --git a/lib/lib.es2015.promise.d.ts b/lib/lib.es2015.promise.d.ts
index 002d69165fd..4db67542cad 100644
--- a/lib/lib.es2015.promise.d.ts
+++ b/lib/lib.es2015.promise.d.ts
@@ -118,79 +118,15 @@ interface PromiseConstructor {
      * @param values An array of Promises.
      * @returns A new Promise.
      */
-    race<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike<T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>, T8 | PromiseLike<T8>, T9 | PromiseLike<T9>, T10 | PromiseLike<T10>]): Promise<T1 | T2 | T3 | T4 | T5 | T6 | T7 | T8 | T9 | T10>;
+    race<T>(values: T[]): Promise<T extends PromiseLike<infer U> ? U : T>;
 
     /**
      * Creates a Promise that is resolved or rejected when any of the provided Promises are resolved
      * or rejected.
-     * @param values An array of Promises.
+     * @param values An iterable of Promises.
      * @returns A new Promise.
      */
-    race<T1, T2, T3, T4, T5, T6, T7, T8, T9>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike<T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>, T8 | PromiseLike<T8>, T9 | PromiseLike<T9>]): Promise<T1 | T2 | T3 | T4 | T5 | T6 | T7 | T8 | T9>;
-
-    /**
-     * Creates a Promise that is resolved or rejected when any of the provided Promises are resolved
-     * or rejected.
-     * @param values An array of Promises.
-     * @returns A new Promise.
-     */
-    race<T1, T2, T3, T4, T5, T6, T7, T8>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike<T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>, T8 | PromiseLike<T8>]): Promise<T1 | T2 | T3 | T4 | T5 | T6 | T7 | T8>;
-
-    /**
-     * Creates a Promise that is resolved or rejected when any of the provided Promises are resolved
-     * or rejected.
-     * @param values An array of Promises.
-     * @returns A new Promise.
-     */
-    race<T1, T2, T3, T4, T5, T6, T7>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike<T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>]): Promise<T1 | T2 | T3 | T4 | T5 | T6 | T7>;
-
-    /**
-     * Creates a Promise that is resolved or rejected when any of the provided Promises are resolved
-     * or rejected.
-     * @param values An array of Promises.
-     * @returns A new Promise.
-     */
-    race<T1, T2, T3, T4, T5, T6>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike<T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>]): Promise<T1 | T2 | T3 | T4 | T5 | T6>;
-
-    /**
-     * Creates a Promise that is resolved or rejected when any of the provided Promises are resolved
-     * or rejected.
-     * @param values An array of Promises.
-     * @returns A new Promise.
-     */
-    race<T1, T2, T3, T4, T5>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike<T4>, T5 | PromiseLike<T5>]): Promise<T1 | T2 | T3 | T4 | T5>;
-
-    /**
-     * Creates a Promise that is resolved or rejected when any of the provided Promises are resolved
-     * or rejected.
-     * @param values An array of Promises.
-     * @returns A new Promise.
-     */
-    race<T1, T2, T3, T4>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike<T4>]): Promise<T1 | T2 | T3 | T4>;
-
-    /**
-     * Creates a Promise that is resolved or rejected when any of the provided Promises are resolved
-     * or rejected.
-     * @param values An array of Promises.
-     * @returns A new Promise.
-     */
-    race<T1, T2, T3>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>]): Promise<T1 | T2 | T3>;
-
-    /**
-     * Creates a Promise that is resolved or rejected when any of the provided Promises are resolved
-     * or rejected.
-     * @param values An array of Promises.
-     * @returns A new Promise.
-     */
-    race<T1, T2>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>]): Promise<T1 | T2>;
-
-    /**
-     * Creates a Promise that is resolved or rejected when any of the provided Promises are resolved
-     * or rejected.
-     * @param values An array of Promises.
-     * @returns A new Promise.
-     */
-    race<T>(values: (T | PromiseLike<T>)[]): Promise<T>;
+    race<T>(values: Iterable<T>): Promise<T extends PromiseLike<infer U> ? U : T>;
 
     /**
      * Creates a new rejected promise for the provided reason.
diff --git a/lib/lib.es2018.asyncgenerator.d.ts b/lib/lib.es2018.asyncgenerator.d.ts
new file mode 100644
index 00000000000..a569853be9f
--- /dev/null
+++ b/lib/lib.es2018.asyncgenerator.d.ts
@@ -0,0 +1,79 @@
+/*! *****************************************************************************
+Copyright (c) Microsoft Corporation. All rights reserved. 
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License. You may obtain a copy of the
+License at http://www.apache.org/licenses/LICENSE-2.0  
+ 
+THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE, 
+MERCHANTABLITY OR NON-INFRINGEMENT. 
+ 
+See the Apache Version 2.0 License for specific language governing permissions
+and limitations under the License.
+***************************************************************************** */
+
+
+
+/// <reference no-default-lib="true"/>
+
+
+/// <reference lib="es2018.asynciterable" />
+
+interface AsyncGenerator<T = unknown, TReturn = any, TNext = unknown> extends AsyncIterator<T, TReturn, TNext> {
+    // NOTE: 'next' is defined using a tuple to ensure we report the correct assignability errors in all places.
+    next(...args: [] | [TNext | PromiseLike<TNext>]): Promise<IteratorResult<T, TReturn>>;
+    return(value: TReturn | PromiseLike<TReturn>): Promise<IteratorResult<T, TReturn>>;
+    throw(e: any): Promise<IteratorResult<T, TReturn>>;
+    [Symbol.asyncIterator](): AsyncGenerator<T, TReturn, TNext>;
+}
+
+interface AsyncGeneratorFunction {
+    /**
+     * Creates a new AsyncGenerator object.
+     * @param args A list of arguments the function accepts.
+     */
+    new (...args: any[]): AsyncGenerator;
+    /**
+     * Creates a new AsyncGenerator object.
+     * @param args A list of arguments the function accepts.
+     */
+    (...args: any[]): AsyncGenerator;
+    /**
+     * The length of the arguments.
+     */
+    readonly length: number;
+    /**
+     * Returns the name of the function.
+     */
+    readonly name: string;
+    /**
+     * A reference to the prototype.
+     */
+    readonly prototype: AsyncGenerator;
+}
+
+interface AsyncGeneratorFunctionConstructor {
+    /**
+     * Creates a new AsyncGenerator function.
+     * @param args A list of arguments the function accepts.
+     */
+    new (...args: string[]): AsyncGeneratorFunction;
+    /**
+     * Creates a new AsyncGenerator function.
+     * @param args A list of arguments the function accepts.
+     */
+    (...args: string[]): AsyncGeneratorFunction;
+    /**
+     * The length of the arguments.
+     */
+    readonly length: number;
+    /**
+     * Returns the name of the function.
+     */
+    readonly name: string;
+    /**
+     * A reference to the prototype.
+     */
+    readonly prototype: AsyncGeneratorFunction;
+}
diff --git a/lib/lib.es2018.asynciterable.d.ts b/lib/lib.es2018.asynciterable.d.ts
index 38e12a7caf6..c5bc92da280 100644
--- a/lib/lib.es2018.asynciterable.d.ts
+++ b/lib/lib.es2018.asynciterable.d.ts
@@ -29,10 +29,11 @@ interface SymbolConstructor {
     readonly asyncIterator: symbol;
 }
 
-interface AsyncIterator<T> {
-    next(value?: any): Promise<IteratorResult<T>>;
-    return?(value?: any): Promise<IteratorResult<T>>;
-    throw?(e?: any): Promise<IteratorResult<T>>;
+interface AsyncIterator<T, TReturn = any, TNext = undefined> {
+    // NOTE: 'next' is defined using a tuple to ensure we report the correct assignability errors in all places.
+    next(...args: [] | [TNext | PromiseLike<TNext>]): Promise<IteratorResult<T, TReturn>>;
+    return?(value?: TReturn | PromiseLike<TReturn>): Promise<IteratorResult<T, TReturn>>;
+    throw?(e?: any): Promise<IteratorResult<T, TReturn>>;
 }
 
 interface AsyncIterable<T> {
diff --git a/lib/lib.es2018.d.ts b/lib/lib.es2018.d.ts
index c228790d742..24ce0dc0501 100644
--- a/lib/lib.es2018.d.ts
+++ b/lib/lib.es2018.d.ts
@@ -19,6 +19,7 @@ and limitations under the License.
 
 
 /// <reference lib="es2017" />
+/// <reference lib="es2018.asyncgenerator" />
 /// <reference lib="es2018.asynciterable" />
 /// <reference lib="es2018.promise" />
 /// <reference lib="es2018.regexp" />
diff --git a/lib/lib.es2019.d.ts b/lib/lib.es2019.d.ts
index 36ec2eaf76c..14a547afbb4 100644
--- a/lib/lib.es2019.d.ts
+++ b/lib/lib.es2019.d.ts
@@ -20,5 +20,6 @@ and limitations under the License.
 
 /// <reference lib="es2018" />
 /// <reference lib="es2019.array" />
+/// <reference lib="es2019.object" />
 /// <reference lib="es2019.string" />
 /// <reference lib="es2019.symbol" />
diff --git a/lib/lib.es2019.object.d.ts b/lib/lib.es2019.object.d.ts
new file mode 100644
index 00000000000..9b26b670941
--- /dev/null
+++ b/lib/lib.es2019.object.d.ts
@@ -0,0 +1,35 @@
+/*! *****************************************************************************
+Copyright (c) Microsoft Corporation. All rights reserved. 
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License. You may obtain a copy of the
+License at http://www.apache.org/licenses/LICENSE-2.0  
+ 
+THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE, 
+MERCHANTABLITY OR NON-INFRINGEMENT. 
+ 
+See the Apache Version 2.0 License for specific language governing permissions
+and limitations under the License.
+***************************************************************************** */
+
+
+
+/// <reference no-default-lib="true"/>
+
+
+/// <reference lib="es2015.iterable" />
+
+interface ObjectConstructor {
+    /**
+     * Returns an object created by key-value entries for properties and methods
+     * @param entries An iterable object that contains key-value entries for properties and methods.
+     */
+    fromEntries<T = any>(entries: Iterable<readonly [PropertyKey, T]>): { [k in PropertyKey]: T };
+
+    /**
+     * Returns an object created by key-value entries for properties and methods
+     * @param entries An iterable object that contains key-value entries for properties and methods.
+     */
+    fromEntries(entries: Iterable<readonly any[]>): any;
+}
diff --git a/lib/lib.es2019.string.d.ts b/lib/lib.es2019.string.d.ts
index 225f514a264..60985db0480 100644
--- a/lib/lib.es2019.string.d.ts
+++ b/lib/lib.es2019.string.d.ts
@@ -25,9 +25,9 @@ interface String {
   /** Removes the leading white space and line terminator characters from a string. */
   trimStart(): string;
 
-  /** Removes the trailing white space and line terminator characters from a string. */
+  /** Removes the leading white space and line terminator characters from a string. */
   trimLeft(): string;
 
-  /** Removes the leading white space and line terminator characters from a string. */
+  /** Removes the trailing white space and line terminator characters from a string. */
   trimRight(): string;
 }
diff --git a/lib/lib.es2020.d.ts b/lib/lib.es2020.d.ts
new file mode 100644
index 00000000000..f0b49c8a791
--- /dev/null
+++ b/lib/lib.es2020.d.ts
@@ -0,0 +1,23 @@
+/*! *****************************************************************************
+Copyright (c) Microsoft Corporation. All rights reserved. 
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License. You may obtain a copy of the
+License at http://www.apache.org/licenses/LICENSE-2.0  
+ 
+THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE, 
+MERCHANTABLITY OR NON-INFRINGEMENT. 
+ 
+See the Apache Version 2.0 License for specific language governing permissions
+and limitations under the License.
+***************************************************************************** */
+
+
+
+/// <reference no-default-lib="true"/>
+
+
+/// <reference lib="es2019" />
+/// <reference lib="es2020.string" />
+/// <reference lib="es2020.symbol.wellknown" />
diff --git a/lib/lib.es2020.full.d.ts b/lib/lib.es2020.full.d.ts
new file mode 100644
index 00000000000..7ffe939cd91
--- /dev/null
+++ b/lib/lib.es2020.full.d.ts
@@ -0,0 +1,25 @@
+/*! *****************************************************************************
+Copyright (c) Microsoft Corporation. All rights reserved. 
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License. You may obtain a copy of the
+License at http://www.apache.org/licenses/LICENSE-2.0  
+ 
+THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE, 
+MERCHANTABLITY OR NON-INFRINGEMENT. 
+ 
+See the Apache Version 2.0 License for specific language governing permissions
+and limitations under the License.
+***************************************************************************** */
+
+
+
+/// <reference no-default-lib="true"/>
+
+
+/// <reference lib="es2020" />
+/// <reference lib="dom" />
+/// <reference lib="webworker.importscripts" />
+/// <reference lib="scripthost" />
+/// <reference lib="dom.iterable" />
diff --git a/lib/lib.es2020.string.d.ts b/lib/lib.es2020.string.d.ts
new file mode 100644
index 00000000000..c9a99d32281
--- /dev/null
+++ b/lib/lib.es2020.string.d.ts
@@ -0,0 +1,30 @@
+/*! *****************************************************************************
+Copyright (c) Microsoft Corporation. All rights reserved. 
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License. You may obtain a copy of the
+License at http://www.apache.org/licenses/LICENSE-2.0  
+ 
+THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE, 
+MERCHANTABLITY OR NON-INFRINGEMENT. 
+ 
+See the Apache Version 2.0 License for specific language governing permissions
+and limitations under the License.
+***************************************************************************** */
+
+
+
+/// <reference no-default-lib="true"/>
+
+
+/// <reference lib="es2015.iterable" />
+
+interface String {
+  /**
+    * Matches a string with a regular expression, and returns an iterable of matches
+    * containing the results of that search.
+    * @param regexp A variable name or string literal containing the regular expression pattern and flags.
+    */
+  matchAll(regexp: RegExp): IterableIterator<RegExpMatchArray>;
+}
diff --git a/lib/lib.es2020.symbol.wellknown.d.ts b/lib/lib.es2020.symbol.wellknown.d.ts
new file mode 100644
index 00000000000..f513f5e960b
--- /dev/null
+++ b/lib/lib.es2020.symbol.wellknown.d.ts
@@ -0,0 +1,39 @@
+/*! *****************************************************************************
+Copyright (c) Microsoft Corporation. All rights reserved. 
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License. You may obtain a copy of the
+License at http://www.apache.org/licenses/LICENSE-2.0  
+ 
+THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE, 
+MERCHANTABLITY OR NON-INFRINGEMENT. 
+ 
+See the Apache Version 2.0 License for specific language governing permissions
+and limitations under the License.
+***************************************************************************** */
+
+
+
+/// <reference no-default-lib="true"/>
+
+
+/// <reference lib="es2015.iterable" />
+/// <reference lib="es2015.symbol" />
+
+interface SymbolConstructor {
+  /**
+   * A regular expression method that matches the regular expression against a string. Called
+   * by the String.prototype.matchAll method.
+   */
+  readonly matchAll: symbol;
+}
+
+interface RegExp {
+  /**
+   * Matches a string with this regular expression, and returns an iterable of matches
+   * containing the results of that search.
+   * @param string A string to search within.
+   */
+  [Symbol.matchAll](str: string): IterableIterator<RegExpMatchArray>;
+}
diff --git a/lib/lib.es5.d.ts b/lib/lib.es5.d.ts
index dda476e4e39..48637e9de17 100644
--- a/lib/lib.es5.d.ts
+++ b/lib/lib.es5.d.ts
@@ -22,8 +22,8 @@ and limitations under the License.
 /// ECMAScript APIs
 /////////////////////////////
 
-declare const NaN: number;
-declare const Infinity: number;
+declare var NaN: number;
+declare var Infinity: number;
 
 /**
   * Evaluates JavaScript code and executes it.
@@ -32,7 +32,7 @@ declare const Infinity: number;
 declare function eval(x: string): any;
 
 /**
-  * Converts A string to an integer.
+  * Converts a string to an integer.
   * @param s A string to convert into a number.
   * @param radix A value between 2 and 36 that specifies the base of the number in numString.
   * If this argument is not supplied, strings with a prefix of '0x' are considered hexadecimal.
@@ -80,7 +80,7 @@ declare function encodeURI(uri: string): string;
   * Encodes a text string as a valid component of a Uniform Resource Identifier (URI).
   * @param uriComponent A value representing an encoded URI component.
   */
-declare function encodeURIComponent(uriComponent: string): string;
+declare function encodeURIComponent(uriComponent: string | number | boolean): string;
 
 /**
   * Computes a new string in which certain characters have been replaced by a hexadecimal escape sequence.
@@ -255,16 +255,16 @@ interface ObjectConstructor {
     isExtensible(o: any): boolean;
 
     /**
-      * Returns the names of the enumerable properties and methods of an object.
+      * Returns the names of the enumerable string properties and methods of an object.
       * @param o Object that contains the properties and methods. This can be an object that you created or an existing Document Object Model (DOM) object.
       */
-    keys(o: {}): string[];
+     keys(o: object): string[];
 }
 
 /**
   * Provides functionality common to all JavaScript objects.
   */
-declare const Object: ObjectConstructor;
+declare var Object: ObjectConstructor;
 
 /**
   * Creates a new function.
@@ -313,7 +313,7 @@ interface FunctionConstructor {
     readonly prototype: Function;
 }
 
-declare const Function: FunctionConstructor;
+declare var Function: FunctionConstructor;
 
 /**
  * Extracts the type of the 'this' parameter of a function type, or 'unknown' if the function type has no 'this' parameter.
@@ -524,7 +524,7 @@ interface StringConstructor {
 /**
   * Allows manipulation and formatting of text strings and determination and location of substrings within strings.
   */
-declare const String: StringConstructor;
+declare var String: StringConstructor;
 
 interface Boolean {
     /** Returns the primitive value of the specified object. */
@@ -533,11 +533,11 @@ interface Boolean {
 
 interface BooleanConstructor {
     new(value?: any): Boolean;
-    (value?: any): boolean;
+    <T>(value?: T): boolean;
     readonly prototype: Boolean;
 }
 
-declare const Boolean: BooleanConstructor;
+declare var Boolean: BooleanConstructor;
 
 interface Number {
     /**
@@ -599,7 +599,7 @@ interface NumberConstructor {
 }
 
 /** An object that represents a number of any kind. All JavaScript numbers are 64-bit floating-point numbers. */
-declare const Number: NumberConstructor;
+declare var Number: NumberConstructor;
 
 interface TemplateStringsArray extends ReadonlyArray<string> {
     readonly raw: ReadonlyArray<string>;
@@ -723,7 +723,7 @@ interface Math {
     tan(x: number): number;
 }
 /** An intrinsic object that provides basic mathematics functionality and constants. */
-declare const Math: Math;
+declare var Math: Math;
 
 /** Enables basic storage and retrieval of dates and times. */
 interface Date {
@@ -904,7 +904,7 @@ interface DateConstructor {
     now(): number;
 }
 
-declare const Date: DateConstructor;
+declare var Date: DateConstructor;
 
 interface RegExpMatchArray extends Array<string> {
     index?: number;
@@ -967,7 +967,7 @@ interface RegExpConstructor {
     lastMatch: string;
 }
 
-declare const RegExp: RegExpConstructor;
+declare var RegExp: RegExpConstructor;
 
 interface Error {
     name: string;
@@ -981,7 +981,7 @@ interface ErrorConstructor {
     readonly prototype: Error;
 }
 
-declare const Error: ErrorConstructor;
+declare var Error: ErrorConstructor;
 
 interface EvalError extends Error {
 }
@@ -992,7 +992,7 @@ interface EvalErrorConstructor {
     readonly prototype: EvalError;
 }
 
-declare const EvalError: EvalErrorConstructor;
+declare var EvalError: EvalErrorConstructor;
 
 interface RangeError extends Error {
 }
@@ -1003,7 +1003,7 @@ interface RangeErrorConstructor {
     readonly prototype: RangeError;
 }
 
-declare const RangeError: RangeErrorConstructor;
+declare var RangeError: RangeErrorConstructor;
 
 interface ReferenceError extends Error {
 }
@@ -1014,7 +1014,7 @@ interface ReferenceErrorConstructor {
     readonly prototype: ReferenceError;
 }
 
-declare const ReferenceError: ReferenceErrorConstructor;
+declare var ReferenceError: ReferenceErrorConstructor;
 
 interface SyntaxError extends Error {
 }
@@ -1025,7 +1025,7 @@ interface SyntaxErrorConstructor {
     readonly prototype: SyntaxError;
 }
 
-declare const SyntaxError: SyntaxErrorConstructor;
+declare var SyntaxError: SyntaxErrorConstructor;
 
 interface TypeError extends Error {
 }
@@ -1036,7 +1036,7 @@ interface TypeErrorConstructor {
     readonly prototype: TypeError;
 }
 
-declare const TypeError: TypeErrorConstructor;
+declare var TypeError: TypeErrorConstructor;
 
 interface URIError extends Error {
 }
@@ -1047,7 +1047,7 @@ interface URIErrorConstructor {
     readonly prototype: URIError;
 }
 
-declare const URIError: URIErrorConstructor;
+declare var URIError: URIErrorConstructor;
 
 interface JSON {
     /**
@@ -1076,7 +1076,7 @@ interface JSON {
 /**
   * An intrinsic object that provides functions to convert JavaScript values to and from the JavaScript Object Notation (JSON) format.
   */
-declare const JSON: JSON;
+declare var JSON: JSON;
 
 
 /////////////////////////////
@@ -1293,13 +1293,13 @@ interface Array<T> {
       * @param callbackfn A function that accepts up to three arguments. The every method calls the callbackfn function for each element in array1 until the callbackfn returns false, or until the end of the array.
       * @param thisArg An object to which the this keyword can refer in the callbackfn function. If thisArg is omitted, undefined is used as the this value.
       */
-    every(callbackfn: (value: T, index: number, array: T[]) => boolean, thisArg?: any): boolean;
+    every(callbackfn: (value: T, index: number, array: T[]) => unknown, thisArg?: any): boolean;
     /**
       * Determines whether the specified callback function returns true for any element of an array.
       * @param callbackfn A function that accepts up to three arguments. The some method calls the callbackfn function for each element in array1 until the callbackfn returns true, or until the end of the array.
       * @param thisArg An object to which the this keyword can refer in the callbackfn function. If thisArg is omitted, undefined is used as the this value.
       */
-    some(callbackfn: (value: T, index: number, array: T[]) => boolean, thisArg?: any): boolean;
+    some(callbackfn: (value: T, index: number, array: T[]) => unknown, thisArg?: any): boolean;
     /**
       * Performs the specified action for each element in an array.
       * @param callbackfn  A function that accepts up to three arguments. forEach calls the callbackfn function one time for each element in the array.
@@ -1323,7 +1323,7 @@ interface Array<T> {
       * @param callbackfn A function that accepts up to three arguments. The filter method calls the callbackfn function one time for each element in the array.
       * @param thisArg An object to which the this keyword can refer in the callbackfn function. If thisArg is omitted, undefined is used as the this value.
       */
-    filter(callbackfn: (value: T, index: number, array: T[]) => any, thisArg?: any): T[];
+    filter(callbackfn: (value: T, index: number, array: T[]) => unknown, thisArg?: any): T[];
     /**
       * Calls the specified callback function for all the elements in an array. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function.
       * @param callbackfn A function that accepts up to four arguments. The reduce method calls the callbackfn function one time for each element in the array.
@@ -1365,7 +1365,7 @@ interface ArrayConstructor {
     readonly prototype: Array<any>;
 }
 
-declare const Array: ArrayConstructor;
+declare var Array: ArrayConstructor;
 
 interface TypedPropertyDescriptor<T> {
     enumerable?: boolean;
@@ -1463,6 +1463,11 @@ type Exclude<T, U> = T extends U ? never : T;
  */
 type Extract<T, U> = T extends U ? T : never;
 
+/**
+ * Construct a type with the properties of T except for those in type K.
+ */
+type Omit<T, K extends keyof any> = Pick<T, Exclude<keyof T, K>>;
+
 /**
  * Exclude null and undefined from T
  */
@@ -1524,7 +1529,7 @@ interface ArrayBufferConstructor {
     new(byteLength: number): ArrayBuffer;
     isView(arg: any): arg is ArrayBufferView;
 }
-declare const ArrayBuffer: ArrayBufferConstructor;
+declare var ArrayBuffer: ArrayBufferConstructor;
 
 interface ArrayBufferView {
     /**
@@ -1674,7 +1679,7 @@ interface DataView {
 interface DataViewConstructor {
     new(buffer: ArrayBufferLike, byteOffset?: number, byteLength?: number): DataView;
 }
-declare const DataView: DataViewConstructor;
+declare var DataView: DataViewConstructor;
 
 /**
   * A typed array of 8-bit integer values. The contents are initialized to 0. If the requested
@@ -1949,7 +1954,7 @@ interface Int8ArrayConstructor {
 
 
 }
-declare const Int8Array: Int8ArrayConstructor;
+declare var Int8Array: Int8ArrayConstructor;
 
 /**
   * A typed array of 8-bit unsigned integer values. The contents are initialized to 0. If the
@@ -2224,7 +2229,7 @@ interface Uint8ArrayConstructor {
     from<T>(arrayLike: ArrayLike<T>, mapfn: (v: T, k: number) => number, thisArg?: any): Uint8Array;
 
 }
-declare const Uint8Array: Uint8ArrayConstructor;
+declare var Uint8Array: Uint8ArrayConstructor;
 
 /**
   * A typed array of 8-bit unsigned integer (clamped) values. The contents are initialized to 0.
@@ -2498,7 +2503,7 @@ interface Uint8ClampedArrayConstructor {
       */
     from<T>(arrayLike: ArrayLike<T>, mapfn: (v: T, k: number) => number, thisArg?: any): Uint8ClampedArray;
 }
-declare const Uint8ClampedArray: Uint8ClampedArrayConstructor;
+declare var Uint8ClampedArray: Uint8ClampedArrayConstructor;
 
 /**
   * A typed array of 16-bit signed integer values. The contents are initialized to 0. If the
@@ -2773,7 +2778,7 @@ interface Int16ArrayConstructor {
 
 
 }
-declare const Int16Array: Int16ArrayConstructor;
+declare var Int16Array: Int16ArrayConstructor;
 
 /**
   * A typed array of 16-bit unsigned integer values. The contents are initialized to 0. If the
@@ -3049,7 +3054,7 @@ interface Uint16ArrayConstructor {
 
 
 }
-declare const Uint16Array: Uint16ArrayConstructor;
+declare var Uint16Array: Uint16ArrayConstructor;
 /**
   * A typed array of 32-bit signed integer values. The contents are initialized to 0. If the
   * requested number of bytes could not be allocated an exception is raised.
@@ -3323,7 +3328,7 @@ interface Int32ArrayConstructor {
     from<T>(arrayLike: ArrayLike<T>, mapfn: (v: T, k: number) => number, thisArg?: any): Int32Array;
 
 }
-declare const Int32Array: Int32ArrayConstructor;
+declare var Int32Array: Int32ArrayConstructor;
 
 /**
   * A typed array of 32-bit unsigned integer values. The contents are initialized to 0. If the
@@ -3597,7 +3602,7 @@ interface Uint32ArrayConstructor {
     from<T>(arrayLike: ArrayLike<T>, mapfn: (v: T, k: number) => number, thisArg?: any): Uint32Array;
 
 }
-declare const Uint32Array: Uint32ArrayConstructor;
+declare var Uint32Array: Uint32ArrayConstructor;
 
 /**
   * A typed array of 32-bit float values. The contents are initialized to 0. If the requested number
@@ -3873,7 +3878,7 @@ interface Float32ArrayConstructor {
 
 
 }
-declare const Float32Array: Float32ArrayConstructor;
+declare var Float32Array: Float32ArrayConstructor;
 
 /**
   * A typed array of 64-bit float values. The contents are initialized to 0. If the requested
@@ -4148,7 +4153,7 @@ interface Float64ArrayConstructor {
     from<T>(arrayLike: ArrayLike<T>, mapfn: (v: T, k: number) => number, thisArg?: any): Float64Array;
 
 }
-declare const Float64Array: Float64ArrayConstructor;
+declare var Float64Array: Float64ArrayConstructor;
 
 /////////////////////////////
 /// ECMAScript Internationalization API
diff --git a/lib/lib.esnext.bigint.d.ts b/lib/lib.esnext.bigint.d.ts
index ccb73bee761..50967de98fe 100644
--- a/lib/lib.esnext.bigint.d.ts
+++ b/lib/lib.esnext.bigint.d.ts
@@ -54,7 +54,7 @@ interface BigIntConstructor {
     asUintN(bits: number, int: bigint): bigint;
 }
 
-declare const BigInt: BigIntConstructor;
+declare var BigInt: BigIntConstructor;
 
 /**
   * A typed array of 64-bit signed integer values. The contents are initialized to 0. If the
@@ -323,7 +323,7 @@ interface BigInt64ArrayConstructor {
     from<U>(arrayLike: ArrayLike<U>, mapfn: (v: U, k: number) => bigint, thisArg?: any): BigInt64Array;
 }
 
-declare const BigInt64Array: BigInt64ArrayConstructor;
+declare var BigInt64Array: BigInt64ArrayConstructor;
 
 /**
   * A typed array of 64-bit unsigned integer values. The contents are initialized to 0. If the
@@ -592,7 +592,7 @@ interface BigUint64ArrayConstructor {
     from<U>(arrayLike: ArrayLike<U>, mapfn: (v: U, k: number) => bigint, thisArg?: any): BigUint64Array;
 }
 
-declare const BigUint64Array: BigUint64ArrayConstructor;
+declare var BigUint64Array: BigUint64ArrayConstructor;
 
 interface DataView {
     /**
@@ -626,4 +626,4 @@ interface DataView {
       * otherwise a little-endian value should be written.
       */
     setBigUint64(byteOffset: number, value: bigint, littleEndian?: boolean): void;
-}
\ No newline at end of file
+}
diff --git a/lib/lib.webworker.d.ts b/lib/lib.webworker.d.ts
index 56745f6d14e..9b73c55a936 100644
--- a/lib/lib.webworker.d.ts
+++ b/lib/lib.webworker.d.ts
@@ -64,12 +64,16 @@ interface BlobPropertyBag {
 }
 
 interface CacheQueryOptions {
-    cacheName?: string;
     ignoreMethod?: boolean;
     ignoreSearch?: boolean;
     ignoreVary?: boolean;
 }
 
+interface CanvasRenderingContext2DSettings {
+    alpha?: boolean;
+    desynchronized?: boolean;
+}
+
 interface ClientQueryOptions {
     includeUncontrolled?: boolean;
     type?: ClientTypes;
@@ -140,6 +144,11 @@ interface DOMRectInit {
     y?: number;
 }
 
+interface DevicePermissionDescriptor extends PermissionDescriptor {
+    deviceId?: string;
+    name: "camera" | "microphone" | "speaker";
+}
+
 interface EcKeyGenParams extends Algorithm {
     namedCurve: NamedCurve;
 }
@@ -192,9 +201,9 @@ interface ExtendableMessageEventInit extends ExtendableEventInit {
 interface FetchEventInit extends ExtendableEventInit {
     clientId?: string;
     preloadResponse?: Promise<any>;
+    replacesClientId?: string;
     request: Request;
     resultingClientId?: string;
-    targetClientId?: string;
 }
 
 interface FilePropertyBag extends BlobPropertyBag {
@@ -230,6 +239,15 @@ interface IDBVersionChangeEventInit extends EventInit {
     oldVersion?: number;
 }
 
+interface ImageBitmapRenderingContextSettings {
+    alpha?: boolean;
+}
+
+interface ImageEncodeOptions {
+    quality?: number;
+    type?: string;
+}
+
 interface JsonWebKey {
     alg?: string;
     crv?: string;
@@ -263,6 +281,15 @@ interface MessageEventInit extends EventInit {
     source?: MessageEventSource | null;
 }
 
+interface MidiPermissionDescriptor extends PermissionDescriptor {
+    name: "midi";
+    sysex?: boolean;
+}
+
+interface MultiCacheQueryOptions extends CacheQueryOptions {
+    cacheName?: string;
+}
+
 interface NavigationPreloadState {
     enabled?: boolean;
     headerValue?: string;
@@ -304,13 +331,23 @@ interface Pbkdf2Params extends Algorithm {
 
 interface PerformanceObserverInit {
     buffered?: boolean;
-    entryTypes: string[];
+    entryTypes?: string[];
+    type?: string;
+}
+
+interface PermissionDescriptor {
+    name: PermissionName;
 }
 
 interface PipeOptions {
     preventAbort?: boolean;
     preventCancel?: boolean;
     preventClose?: boolean;
+    signal?: AbortSignal;
+}
+
+interface PostMessageOptions {
+    transfer?: any[];
 }
 
 interface ProgressEventInit extends EventInit {
@@ -328,6 +365,11 @@ interface PushEventInit extends ExtendableEventInit {
     data?: PushMessageDataInit;
 }
 
+interface PushPermissionDescriptor extends PermissionDescriptor {
+    name: "push";
+    userVisibleOnly?: boolean;
+}
+
 interface PushSubscriptionChangeInit extends ExtendableEventInit {
     newSubscription?: PushSubscription;
     oldSubscription?: PushSubscription;
@@ -356,18 +398,57 @@ interface RegistrationOptions {
 }
 
 interface RequestInit {
+    /**
+     * A BodyInit object or null to set request's body.
+     */
     body?: BodyInit | null;
+    /**
+     * A string indicating how the request will interact with the browser's cache to set request's cache.
+     */
     cache?: RequestCache;
+    /**
+     * A string indicating whether credentials will be sent with the request always, never, or only when sent to a same-origin URL. Sets request's credentials.
+     */
     credentials?: RequestCredentials;
+    /**
+     * A Headers object, an object literal, or an array of two-item arrays to set request's headers.
+     */
     headers?: HeadersInit;
+    /**
+     * A cryptographic hash of the resource to be fetched by request. Sets request's integrity.
+     */
     integrity?: string;
+    /**
+     * A boolean to set request's keepalive.
+     */
     keepalive?: boolean;
+    /**
+     * A string to set request's method.
+     */
     method?: string;
+    /**
+     * A string to indicate whether the request will use CORS, or will be restricted to same-origin URLs. Sets request's mode.
+     */
     mode?: RequestMode;
+    /**
+     * A string indicating whether request follows redirects, results in an error upon encountering a redirect, or returns the redirect (in an opaque fashion). Sets request's redirect.
+     */
     redirect?: RequestRedirect;
+    /**
+     * A string whose value is a same-origin URL, "about:client", or the empty string, to set request's referrer.
+     */
     referrer?: string;
+    /**
+     * A referrer policy to set request's referrerPolicy.
+     */
     referrerPolicy?: ReferrerPolicy;
+    /**
+     * An AbortSignal to set request's signal.
+     */
     signal?: AbortSignal | null;
+    /**
+     * Can only be null. Used to disassociate request from any Window.
+     */
     window?: any;
 }
 
@@ -423,6 +504,11 @@ interface TextDecoderOptions {
     ignoreBOM?: boolean;
 }
 
+interface TextEncoderEncodeIntoResult {
+    read?: number;
+    written?: number;
+}
+
 interface Transformer<I = any, O = any> {
     flush?: TransformStreamDefaultControllerCallback<O>;
     readableType?: undefined;
@@ -455,14 +541,15 @@ interface UnderlyingSource<R = any> {
 }
 
 interface WebGLContextAttributes {
-    alpha?: GLboolean;
-    antialias?: GLboolean;
-    depth?: GLboolean;
+    alpha?: boolean;
+    antialias?: boolean;
+    depth?: boolean;
+    desynchronized?: boolean;
     failIfMajorPerformanceCaveat?: boolean;
     powerPreference?: WebGLPowerPreference;
-    premultipliedAlpha?: GLboolean;
-    preserveDrawingBuffer?: GLboolean;
-    stencil?: GLboolean;
+    premultipliedAlpha?: boolean;
+    preserveDrawingBuffer?: boolean;
+    stencil?: boolean;
 }
 
 interface WebGLContextEventInit extends EventInit {
@@ -487,15 +574,14 @@ interface ANGLE_instanced_arrays {
     readonly VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE: GLenum;
 }
 
-/** The AbortController interface represents a controller object that allows you to abort one or more DOM requests as and when desired. */
+/** A controller object that allows you to abort one or more DOM requests as and when desired. */
 interface AbortController {
     /**
      * Returns the AbortSignal object associated with this object.
      */
     readonly signal: AbortSignal;
     /**
-     * Invoking this method will set this object's AbortSignal's aborted flag and
-     * signal to any observers that the associated activity is to be aborted.
+     * Invoking this method will set this object's AbortSignal's aborted flag and signal to any observers that the associated activity is to be aborted.
      */
     abort(): void;
 }
@@ -509,11 +595,10 @@ interface AbortSignalEventMap {
     "abort": Event;
 }
 
-/** The AbortSignal interface represents a signal object that allows you to communicate with a DOM request (such as a Fetch) and abort it if required via an AbortController object. */
+/** A signal object that allows you to communicate with a DOM request (such as a Fetch) and abort it if required via an AbortController object. */
 interface AbortSignal extends EventTarget {
     /**
-     * Returns true if this AbortSignal's AbortController has signaled to abort, and false
-     * otherwise.
+     * Returns true if this AbortSignal's AbortController has signaled to abort, and false otherwise.
      */
     readonly aborted: boolean;
     onabort: ((this: AbortSignal, ev: Event) => any) | null;
@@ -548,7 +633,12 @@ interface AesCmacParams extends Algorithm {
     length: number;
 }
 
-/** A Blob object represents a file-like object of immutable, raw data. Blobs represent data that isn't necessarily in a JavaScript-native format. The File interface is based on Blob, inheriting blob functionality and expanding it to support files on the user's system. */
+interface AnimationFrameProvider {
+    cancelAnimationFrame(handle: number): void;
+    requestAnimationFrame(callback: FrameRequestCallback): number;
+}
+
+/** A file-like object of immutable, raw data. Blobs represent data that isn't necessarily in a JavaScript-native format. The File interface is based on Blob, inheriting blob functionality and expanding it to support files on the user's system. */
 interface Blob {
     readonly size: number;
     readonly type: string;
@@ -601,12 +691,7 @@ declare var BroadcastChannel: {
     new(name: string): BroadcastChannel;
 };
 
-interface BroadcastChannelEventMap {
-    message: MessageEvent;
-    messageerror: MessageEvent;
-}
-
-/** The ByteLengthQueuingStrategy interface of the the Streams API provides a built-in byte length queuing strategy that can be used when constructing streams. */
+/** This Streams API interface provides a built-in byte length queuing strategy that can be used when constructing streams. */
 interface ByteLengthQueuingStrategy extends QueuingStrategy<ArrayBufferView> {
     highWaterMark: number;
     size(chunk: ArrayBufferView): number;
@@ -617,7 +702,7 @@ declare var ByteLengthQueuingStrategy: {
     new(options: { highWaterMark: number }): ByteLengthQueuingStrategy;
 };
 
-/** The Cache interface provides a storage mechanism for Request / Response object pairs that are cached, for example as part of the ServiceWorker life cycle. Note that the Cache interface is exposed to windowed scopes as well as workers. You don't have to use it in conjunction with service workers, even though it is defined in the service worker spec. */
+/** Provides a storage mechanism for Request / Response object pairs that are cached, for example as part of the ServiceWorker life cycle. Note that the Cache interface is exposed to windowed scopes as well as workers. You don't have to use it in conjunction with service workers, even though it is defined in the service worker spec. */
 interface Cache {
     add(request: RequestInfo): Promise<void>;
     addAll(requests: RequestInfo[]): Promise<void>;
@@ -633,7 +718,7 @@ declare var Cache: {
     new(): Cache;
 };
 
-/** The CacheStorage interface represents the storage for Cache objects. */
+/** The storage for Cache objects. */
 interface CacheStorage {
     delete(cacheName: string): Promise<boolean>;
     has(cacheName: string): Promise<boolean>;
@@ -647,14 +732,49 @@ declare var CacheStorage: {
     new(): CacheStorage;
 };
 
-/** The CanvasGradient interface represents an opaque object describing a gradient. It is returned by the methods CanvasRenderingContext2D.createLinearGradient() or CanvasRenderingContext2D.createRadialGradient(). */
+interface CanvasCompositing {
+    globalAlpha: number;
+    globalCompositeOperation: string;
+}
+
+interface CanvasDrawImage {
+    drawImage(image: CanvasImageSource, dx: number, dy: number): void;
+    drawImage(image: CanvasImageSource, dx: number, dy: number, dw: number, dh: number): void;
+    drawImage(image: CanvasImageSource, sx: number, sy: number, sw: number, sh: number, dx: number, dy: number, dw: number, dh: number): void;
+}
+
+interface CanvasDrawPath {
+    beginPath(): void;
+    clip(fillRule?: CanvasFillRule): void;
+    clip(path: Path2D, fillRule?: CanvasFillRule): void;
+    fill(fillRule?: CanvasFillRule): void;
+    fill(path: Path2D, fillRule?: CanvasFillRule): void;
+    isPointInPath(x: number, y: number, fillRule?: CanvasFillRule): boolean;
+    isPointInPath(path: Path2D, x: number, y: number, fillRule?: CanvasFillRule): boolean;
+    isPointInStroke(x: number, y: number): boolean;
+    isPointInStroke(path: Path2D, x: number, y: number): boolean;
+    stroke(): void;
+    stroke(path: Path2D): void;
+}
+
+interface CanvasFillStrokeStyles {
+    fillStyle: string | CanvasGradient | CanvasPattern;
+    strokeStyle: string | CanvasGradient | CanvasPattern;
+    createLinearGradient(x0: number, y0: number, x1: number, y1: number): CanvasGradient;
+    createPattern(image: CanvasImageSource, repetition: string): CanvasPattern | null;
+    createRadialGradient(x0: number, y0: number, r0: number, x1: number, y1: number, r1: number): CanvasGradient;
+}
+
+interface CanvasFilters {
+    filter: string;
+}
+
+/** An opaque object describing a gradient. It is returned by the methods CanvasRenderingContext2D.createLinearGradient() or CanvasRenderingContext2D.createRadialGradient(). */
 interface CanvasGradient {
     /**
-     * Adds a color stop with the given color to the gradient at the given offset. 0.0 is the offset
-     * at one end of the gradient, 1.0 is the offset at the other end.
-     * Throws an "IndexSizeError" DOMException if the offset
-     * is out of range. Throws a "SyntaxError" DOMException if
-     * the color cannot be parsed.
+     * Adds a color stop with the given color to the gradient at the given offset. 0.0 is the offset at one end of the gradient, 1.0 is the offset at the other end.
+     * 
+     * Throws an "IndexSizeError" DOMException if the offset is out of range. Throws a "SyntaxError" DOMException if the color cannot be parsed.
      */
     addColorStop(offset: number, color: string): void;
 }
@@ -664,6 +784,19 @@ declare var CanvasGradient: {
     new(): CanvasGradient;
 };
 
+interface CanvasImageData {
+    createImageData(sw: number, sh: number): ImageData;
+    createImageData(imagedata: ImageData): ImageData;
+    getImageData(sx: number, sy: number, sw: number, sh: number): ImageData;
+    putImageData(imagedata: ImageData, dx: number, dy: number): void;
+    putImageData(imagedata: ImageData, dx: number, dy: number, dirtyX: number, dirtyY: number, dirtyWidth: number, dirtyHeight: number): void;
+}
+
+interface CanvasImageSmoothing {
+    imageSmoothingEnabled: boolean;
+    imageSmoothingQuality: ImageSmoothingQuality;
+}
+
 interface CanvasPath {
     arc(x: number, y: number, radius: number, startAngle: number, endAngle: number, anticlockwise?: boolean): void;
     arcTo(x1: number, y1: number, x2: number, y2: number, radius: number): void;
@@ -676,11 +809,20 @@ interface CanvasPath {
     rect(x: number, y: number, w: number, h: number): void;
 }
 
-/** The CanvasPattern interface represents an opaque object describing a pattern, based on an image, a canvas, or a video, created by the CanvasRenderingContext2D.createPattern() method. */
+interface CanvasPathDrawingStyles {
+    lineCap: CanvasLineCap;
+    lineDashOffset: number;
+    lineJoin: CanvasLineJoin;
+    lineWidth: number;
+    miterLimit: number;
+    getLineDash(): number[];
+    setLineDash(segments: number[]): void;
+}
+
+/** An opaque object describing a pattern, based on an image, a canvas, or a video, created by the CanvasRenderingContext2D.createPattern() method. */
 interface CanvasPattern {
     /**
-     * Sets the transformation matrix that will be used when rendering the pattern during a fill or
-     * stroke painting operation.
+     * Sets the transformation matrix that will be used when rendering the pattern during a fill or stroke painting operation.
      */
     setTransform(transform?: DOMMatrix2DInit): void;
 }
@@ -690,8 +832,51 @@ declare var CanvasPattern: {
     new(): CanvasPattern;
 };
 
+interface CanvasRect {
+    clearRect(x: number, y: number, w: number, h: number): void;
+    fillRect(x: number, y: number, w: number, h: number): void;
+    strokeRect(x: number, y: number, w: number, h: number): void;
+}
+
+interface CanvasShadowStyles {
+    shadowBlur: number;
+    shadowColor: string;
+    shadowOffsetX: number;
+    shadowOffsetY: number;
+}
+
+interface CanvasState {
+    restore(): void;
+    save(): void;
+}
+
+interface CanvasText {
+    fillText(text: string, x: number, y: number, maxWidth?: number): void;
+    measureText(text: string): TextMetrics;
+    strokeText(text: string, x: number, y: number, maxWidth?: number): void;
+}
+
+interface CanvasTextDrawingStyles {
+    direction: CanvasDirection;
+    font: string;
+    textAlign: CanvasTextAlign;
+    textBaseline: CanvasTextBaseline;
+}
+
+interface CanvasTransform {
+    getTransform(): DOMMatrix;
+    resetTransform(): void;
+    rotate(angle: number): void;
+    scale(x: number, y: number): void;
+    setTransform(a: number, b: number, c: number, d: number, e: number, f: number): void;
+    setTransform(transform?: DOMMatrix2DInit): void;
+    transform(a: number, b: number, c: number, d: number, e: number, f: number): void;
+    translate(x: number, y: number): void;
+}
+
 /** The Client interface represents an executable context such as a Worker, or a SharedWorker. Window clients are represented by the more-specific WindowClient. You can get Client/WindowClient objects from methods such as Clients.matchAll() and Clients.get(). */
 interface Client {
+    readonly frameType: FrameType;
     readonly id: string;
     readonly type: ClientTypes;
     readonly url: string;
@@ -703,7 +888,7 @@ declare var Client: {
     new(): Client;
 };
 
-/** The Clients interface provides access to Client objects. Access it via self.clients within a service worker. */
+/** Provides access to Client objects. Access it via self.clients within a service worker. */
 interface Clients {
     claim(): Promise<void>;
     get(id: string): Promise<any>;
@@ -739,7 +924,7 @@ interface ConcatParams extends Algorithm {
     publicInfo?: Uint8Array;
 }
 
-/** The Console object provides access to the browser's debugging console (e.g. the Web Console in Firefox). The specifics of how it works varies from browser to browser, but there is a de facto set of features that are typically provided. */
+/** Provides access to the browser's debugging console (e.g. the Web Console in Firefox). The specifics of how it works varies from browser to browser, but there is a de facto set of features that are typically provided. */
 interface Console {
     memory: any;
     assert(condition?: boolean, message?: string, ...data: any[]): void;
@@ -773,7 +958,7 @@ declare var Console: {
     new(): Console;
 };
 
-/** The CountQueuingStrategy interface of the the Streams API provides a built-in byte length queuing strategy that can be used when constructing streams. */
+/** This Streams API interface provides a built-in byte length queuing strategy that can be used when constructing streams. */
 interface CountQueuingStrategy extends QueuingStrategy {
     highWaterMark: number;
     size(chunk: any): 1;
@@ -784,7 +969,7 @@ declare var CountQueuingStrategy: {
     new(options: { highWaterMark: number }): CountQueuingStrategy;
 };
 
-/** The Crypto interface represents basic cryptography features available in the current context. It allows access to a cryptographically strong random number generator and to cryptographic primitives. */
+/** Basic cryptography features available in the current context. It allows access to a cryptographically strong random number generator and to cryptographic primitives. */
 interface Crypto {
     readonly subtle: SubtleCrypto;
     getRandomValues<T extends Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | null>(array: T): T;
@@ -795,7 +980,7 @@ declare var Crypto: {
     new(): Crypto;
 };
 
-/** The CryptoKey interface represents a cryptographic key derived from a specific key algorithm. */
+/** The CryptoKey dictionary of the Web Crypto API represents a cryptographic key. */
 interface CryptoKey {
     readonly algorithm: KeyAlgorithm;
     readonly extractable: boolean;
@@ -810,8 +995,7 @@ declare var CryptoKey: {
 
 interface CustomEvent<T = any> extends Event {
     /**
-     * Returns any custom data event was created with.
-     * Typically used for synthetic events.
+     * Returns any custom data event was created with. Typically used for synthetic events.
      */
     readonly detail: T;
     initCustomEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, detailArg: T): void;
@@ -822,7 +1006,7 @@ declare var CustomEvent: {
     new<T>(typeArg: string, eventInitDict?: CustomEventInit<T>): CustomEvent<T>;
 };
 
-/** The DOMException interface represents an abnormal event (called an exception) which occurs as a result of calling a method or accessing a property of a web API. */
+/** An abnormal event (called an exception) which occurs as a result of calling a method or accessing a property of a web API. */
 interface DOMException {
     readonly code: number;
     readonly message: string;
@@ -1063,8 +1247,7 @@ interface DOMStringList {
      */
     readonly length: number;
     /**
-     * Returns true if strings contains string, and false
-     * otherwise.
+     * Returns true if strings contains string, and false otherwise.
      */
     contains(string: string): boolean;
     /**
@@ -1083,11 +1266,12 @@ interface DedicatedWorkerGlobalScopeEventMap extends WorkerGlobalScopeEventMap {
     "message": MessageEvent;
 }
 
-/** The DedicatedWorkerGlobalScope object (the Worker global scope) is accessible through the self keyword. Some additional global functions, namespaces objects, and constructors, not typically associated with the worker global scope, but available on it, are listed in the JavaScript Reference. See also: Functions available to workers. */
-interface DedicatedWorkerGlobalScope extends WorkerGlobalScope {
+/** (the Worker global scope) is accessible through the self keyword. Some additional global functions, namespaces objects, and constructors, not typically associated with the worker global scope, but available on it, are listed in the JavaScript Reference. See also: Functions available to workers. */
+interface DedicatedWorkerGlobalScope extends WorkerGlobalScope, AnimationFrameProvider {
     onmessage: ((this: DedicatedWorkerGlobalScope, ev: MessageEvent) => any) | null;
     close(): void;
-    postMessage(message: any, transfer?: Transferable[]): void;
+    postMessage(message: any, transfer: Transferable[]): void;
+    postMessage(message: any, options?: PostMessageOptions): void;
     addEventListener<K extends keyof DedicatedWorkerGlobalScopeEventMap>(type: K, listener: (this: DedicatedWorkerGlobalScope, ev: DedicatedWorkerGlobalScopeEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof DedicatedWorkerGlobalScopeEventMap>(type: K, listener: (this: DedicatedWorkerGlobalScope, ev: DedicatedWorkerGlobalScopeEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -1143,7 +1327,7 @@ interface EXT_texture_filter_anisotropic {
     readonly TEXTURE_MAX_ANISOTROPY_EXT: GLenum;
 }
 
-/** The ErrorEvent interface represents events providing information related to errors in scripts or in files. */
+/** Events providing information related to errors in scripts or in files. */
 interface ErrorEvent extends Event {
     readonly colno: number;
     readonly error: any;
@@ -1157,28 +1341,35 @@ declare var ErrorEvent: {
     new(type: string, eventInitDict?: ErrorEventInit): ErrorEvent;
 };
 
-/** The Event interface represents any event which takes place in the DOM; some are user-generated (such as mouse or keyboard events), while others are generated by APIs (such as events that indicate an animation has finished running, a video has been paused, and so forth). While events are usually triggered by such "external" sources, they can also be triggered programmatically, such as by calling the HTMLElement.click() method of an element, or by defining the event, then sending it to a specified target using EventTarget.dispatchEvent(). There are many types of events, some of which use other interfaces based on the main Event interface. Event itself contains the properties and methods which are common to all events. */
+/** An event which takes place in the DOM. */
 interface Event {
     /**
      * Returns true or false depending on how event was initialized. True if event goes through its target's ancestors in reverse tree order, and false otherwise.
      */
     readonly bubbles: boolean;
     cancelBubble: boolean;
+    /**
+     * Returns true or false depending on how event was initialized. Its return value does not always carry meaning, but true can indicate that part of the operation during which event was dispatched, can be canceled by invoking the preventDefault() method.
+     */
     readonly cancelable: boolean;
     /**
      * Returns true or false depending on how event was initialized. True if event invokes listeners past a ShadowRoot node that is the root of its target, and false otherwise.
      */
     readonly composed: boolean;
     /**
-     * Returns the object whose event listener's callback is currently being
-     * invoked.
+     * Returns the object whose event listener's callback is currently being invoked.
      */
     readonly currentTarget: EventTarget | null;
+    /**
+     * Returns true if preventDefault() was invoked successfully to indicate cancelation, and false otherwise.
+     */
     readonly defaultPrevented: boolean;
+    /**
+     * Returns the event's phase, which is one of NONE, CAPTURING_PHASE, AT_TARGET, and BUBBLING_PHASE.
+     */
     readonly eventPhase: number;
     /**
-     * Returns true if event was dispatched by the user agent, and
-     * false otherwise.
+     * Returns true if event was dispatched by the user agent, and false otherwise.
      */
     readonly isTrusted: boolean;
     returnValue: boolean;
@@ -1189,23 +1380,24 @@ interface Event {
      */
     readonly target: EventTarget | null;
     /**
-     * Returns the event's timestamp as the number of milliseconds measured relative to
-     * the time origin.
+     * Returns the event's timestamp as the number of milliseconds measured relative to the time origin.
      */
     readonly timeStamp: number;
     /**
-     * Returns the type of event, e.g.
-     * "click", "hashchange", or
-     * "submit".
+     * Returns the type of event, e.g. "click", "hashchange", or "submit".
      */
     readonly type: string;
+    /**
+     * Returns the invocation target objects of event's path (objects on which listeners will be invoked), except for any nodes in shadow trees of which the shadow root's mode is "closed" that are not reachable from event's currentTarget.
+     */
     composedPath(): EventTarget[];
     initEvent(type: string, bubbles?: boolean, cancelable?: boolean): void;
+    /**
+     * If invoked when the cancelable attribute value is true, and while executing a listener for the event with passive set to false, signals to the operation that caused event to be dispatched that it needs to be canceled.
+     */
     preventDefault(): void;
     /**
-     * Invoking this method prevents event from reaching
-     * any registered event listeners after the current one finishes running and, when dispatched in a tree, also prevents event from reaching any
-     * other objects.
+     * Invoking this method prevents event from reaching any registered event listeners after the current one finishes running and, when dispatched in a tree, also prevents event from reaching any other objects.
      */
     stopImmediatePropagation(): void;
     /**
@@ -1242,8 +1434,7 @@ interface EventSource extends EventTarget {
     onmessage: ((this: EventSource, ev: MessageEvent) => any) | null;
     onopen: ((this: EventSource, ev: Event) => any) | null;
     /**
-     * Returns the state of this EventSource object's connection. It can have the
-     * values described below.
+     * Returns the state of this EventSource object's connection. It can have the values described below.
      */
     readonly readyState: number;
     /**
@@ -1251,11 +1442,12 @@ interface EventSource extends EventTarget {
      */
     readonly url: string;
     /**
-     * Returns true if the credentials mode
-     * for connection requests to the URL providing the
-     * event stream is set to "include", and false otherwise.
+     * Returns true if the credentials mode for connection requests to the URL providing the event stream is set to "include", and false otherwise.
      */
     readonly withCredentials: boolean;
+    /**
+     * Aborts any instances of the fetch algorithm started for this EventSource object, and sets the readyState attribute to CLOSED.
+     */
     close(): void;
     readonly CLOSED: number;
     readonly CONNECTING: number;
@@ -1274,22 +1466,24 @@ declare var EventSource: {
     readonly OPEN: number;
 };
 
-/** EventTarget is an interface implemented by objects that can receive events and may have listeners for them. */
+/** EventTarget is a DOM interface implemented by objects that can receive events and may have listeners for them. */
 interface EventTarget {
     /**
      * Appends an event listener for events whose type attribute value is type. The callback argument sets the callback that will be invoked when the event is dispatched.
-     * The options argument sets listener-specific options. For compatibility this can be a
-     * boolean, in which case the method behaves exactly as if the value was specified as options's capture.
+     * 
+     * The options argument sets listener-specific options. For compatibility this can be a boolean, in which case the method behaves exactly as if the value was specified as options's capture.
+     * 
      * When set to true, options's capture prevents callback from being invoked when the event's eventPhase attribute value is BUBBLING_PHASE. When false (or not present), callback will not be invoked when event's eventPhase attribute value is CAPTURING_PHASE. Either way, callback will be invoked if event's eventPhase attribute value is AT_TARGET.
+     * 
      * When set to true, options's passive indicates that the callback will not cancel the event by invoking preventDefault(). This is used to enable performance optimizations described in §2.8 Observing event listeners.
-     * When set to true, options's once indicates that the callback will only be invoked once after which the event listener will
-     * be removed.
+     * 
+     * When set to true, options's once indicates that the callback will only be invoked once after which the event listener will be removed.
+     * 
      * The event listener is appended to target's event listener list and is not appended if it has the same type, callback, and capture.
      */
     addEventListener(type: string, listener: EventListenerOrEventListenerObject | null, options?: boolean | AddEventListenerOptions): void;
     /**
-     * Dispatches a synthetic event event to target and returns true
-     * if either event's cancelable attribute value is false or its preventDefault() method was not invoked, and false otherwise.
+     * Dispatches a synthetic event event to target and returns true if either event's cancelable attribute value is false or its preventDefault() method was not invoked, and false otherwise.
      */
     dispatchEvent(event: Event): boolean;
     /**
@@ -1303,7 +1497,7 @@ declare var EventTarget: {
     new(): EventTarget;
 };
 
-/** The ExtendableEvent interface extends the lifetime of the install and activate events dispatched on the global scope as part of the service worker lifecycle. This ensures that any functional events (like FetchEvent) are not dispatched until it upgrades database schemas and deletes the outdated cache entries. */
+/** Extends the lifetime of the install and activate events dispatched on the global scope as part of the service worker lifecycle. This ensures that any functional events (like FetchEvent) are not dispatched until it upgrades database schemas and deletes the outdated cache entries. */
 interface ExtendableEvent extends Event {
     waitUntil(f: any): void;
 }
@@ -1313,7 +1507,7 @@ declare var ExtendableEvent: {
     new(type: string, eventInitDict?: ExtendableEventInit): ExtendableEvent;
 };
 
-/** The ExtendableMessageEvent interface of the ServiceWorker API represents the event object of a message event fired on a service worker (when a channel message is received on the ServiceWorkerGlobalScope from another context) — extends the lifetime of such events. */
+/** This ServiceWorker API interface represents the event object of a message event fired on a service worker (when a channel message is received on the ServiceWorkerGlobalScope from another context) — extends the lifetime of such events. */
 interface ExtendableMessageEvent extends ExtendableEvent {
     readonly data: any;
     readonly lastEventId: string;
@@ -1331,9 +1525,9 @@ declare var ExtendableMessageEvent: {
 interface FetchEvent extends ExtendableEvent {
     readonly clientId: string;
     readonly preloadResponse: Promise<any>;
+    readonly replacesClientId: string;
     readonly request: Request;
     readonly resultingClientId: string;
-    readonly targetClientId: string;
     respondWith(r: Response | Promise<Response>): void;
 }
 
@@ -1342,7 +1536,7 @@ declare var FetchEvent: {
     new(type: string, eventInitDict: FetchEventInit): FetchEvent;
 };
 
-/** The File interface provides information about files and allows JavaScript in a web page to access their content. */
+/** Provides information about files and allows JavaScript in a web page to access their content. */
 interface File extends Blob {
     readonly lastModified: number;
     readonly name: string;
@@ -1366,23 +1560,23 @@ declare var FileList: {
 };
 
 interface FileReaderEventMap {
-    "abort": ProgressEvent;
-    "error": ProgressEvent;
-    "load": ProgressEvent;
-    "loadend": ProgressEvent;
-    "loadstart": ProgressEvent;
-    "progress": ProgressEvent;
+    "abort": ProgressEvent<FileReader>;
+    "error": ProgressEvent<FileReader>;
+    "load": ProgressEvent<FileReader>;
+    "loadend": ProgressEvent<FileReader>;
+    "loadstart": ProgressEvent<FileReader>;
+    "progress": ProgressEvent<FileReader>;
 }
 
-/** The FileReader object lets web applications asynchronously read the contents of files (or raw data buffers) stored on the user's computer, using File or Blob objects to specify the file or data to read. */
+/** Lets web applications asynchronously read the contents of files (or raw data buffers) stored on the user's computer, using File or Blob objects to specify the file or data to read. */
 interface FileReader extends EventTarget {
     readonly error: DOMException | null;
-    onabort: ((this: FileReader, ev: ProgressEvent) => any) | null;
-    onerror: ((this: FileReader, ev: ProgressEvent) => any) | null;
-    onload: ((this: FileReader, ev: ProgressEvent) => any) | null;
-    onloadend: ((this: FileReader, ev: ProgressEvent) => any) | null;
-    onloadstart: ((this: FileReader, ev: ProgressEvent) => any) | null;
-    onprogress: ((this: FileReader, ev: ProgressEvent) => any) | null;
+    onabort: ((this: FileReader, ev: ProgressEvent<FileReader>) => any) | null;
+    onerror: ((this: FileReader, ev: ProgressEvent<FileReader>) => any) | null;
+    onload: ((this: FileReader, ev: ProgressEvent<FileReader>) => any) | null;
+    onloadend: ((this: FileReader, ev: ProgressEvent<FileReader>) => any) | null;
+    onloadstart: ((this: FileReader, ev: ProgressEvent<FileReader>) => any) | null;
+    onprogress: ((this: FileReader, ev: ProgressEvent<FileReader>) => any) | null;
     readonly readyState: number;
     readonly result: string | ArrayBuffer | null;
     abort(): void;
@@ -1407,7 +1601,7 @@ declare var FileReader: {
     readonly LOADING: number;
 };
 
-/** The FileReaderSync interface allows to read File or Blob objects in a synchronous way. */
+/** Allows to read File or Blob objects in a synchronous way. */
 interface FileReaderSync {
     readAsArrayBuffer(blob: Blob): ArrayBuffer;
     readAsBinaryString(blob: Blob): string;
@@ -1420,7 +1614,7 @@ declare var FileReaderSync: {
     new(): FileReaderSync;
 };
 
-/** The FormData interface provides a way to easily construct a set of key/value pairs representing form fields and their values, which can then be easily sent using the XMLHttpRequest.send() method. It uses the same format a form would use if the encoding type were set to "multipart/form-data". */
+/** Provides a way to easily construct a set of key/value pairs representing form fields and their values, which can then be easily sent using the XMLHttpRequest.send() method. It uses the same format a form would use if the encoding type were set to "multipart/form-data". */
 interface FormData {
     append(name: string, value: string | Blob, fileName?: string): void;
     delete(name: string): void;
@@ -1436,11 +1630,29 @@ declare var FormData: {
     new(): FormData;
 };
 
-interface GlobalFetch {
-    fetch(input: RequestInfo, init?: RequestInit): Promise<Response>;
+interface GenericTransformStream {
+    /**
+     * Returns a readable stream whose chunks are strings resulting from running encoding's decoder on the chunks written to writable.
+     */
+    readonly readable: ReadableStream;
+    /**
+     * Returns a writable stream which accepts BufferSource chunks and runs them through encoding's decoder before making them available to readable.
+     * 
+     * Typically this will be used via the pipeThrough() method on a ReadableStream source.
+     * 
+     * ```
+     * var decoder = new TextDecoderStream(encoding);
+     * byteReadable
+     *   .pipeThrough(decoder)
+     *   .pipeTo(textWritable);
+     * ```
+     * 
+     * If the error mode is "fatal" and encoding's decoder returns error, both readable and writable will be errored with a TypeError.
+     */
+    readonly writable: WritableStream;
 }
 
-/** The Headers interface of the Fetch API allows you to perform various actions on HTTP request and response headers. These actions include retrieving, setting, adding to, and removing. A Headers object has an associated header list, which is initially empty and consists of zero or more name and value pairs.  You can add to this using methods like append() (see Examples.) In all methods of this interface, header names are matched by case-insensitive byte sequence. */
+/** This Fetch API interface allows you to perform various actions on HTTP request and response headers. These actions include retrieving, setting, adding to, and removing. A Headers object has an associated header list, which is initially empty and consists of zero or more name and value pairs.  You can add to this using methods like append() (see Examples.) In all methods of this interface, header names are matched by case-insensitive byte sequence. */
 interface Headers {
     append(name: string, value: string): void;
     delete(name: string): void;
@@ -1464,21 +1676,18 @@ interface HkdfCtrParams extends Algorithm {
 interface IDBArrayKey extends Array<IDBValidKey> {
 }
 
-/** The IDBCursor interface of the IndexedDB API represents a cursor for traversing or iterating over multiple records in a database. */
+/** This IndexedDB API interface represents a cursor for traversing or iterating over multiple records in a database. */
 interface IDBCursor {
     /**
-     * Returns the direction ("next", "nextunique", "prev" or "prevunique")
-     * of the cursor.
+     * Returns the direction ("next", "nextunique", "prev" or "prevunique") of the cursor.
      */
     readonly direction: IDBCursorDirection;
     /**
-     * Returns the key of the cursor.
-     * Throws a "InvalidStateError" DOMException if the cursor is advancing or is finished.
+     * Returns the key of the cursor. Throws a "InvalidStateError" DOMException if the cursor is advancing or is finished.
      */
     readonly key: IDBValidKey;
     /**
-     * Returns the effective key of the cursor.
-     * Throws a "InvalidStateError" DOMException if the cursor is advancing or is finished.
+     * Returns the effective key of the cursor. Throws a "InvalidStateError" DOMException if the cursor is advancing or is finished.
      */
     readonly primaryKey: IDBValidKey;
     /**
@@ -1486,28 +1695,28 @@ interface IDBCursor {
      */
     readonly source: IDBObjectStore | IDBIndex;
     /**
-     * Advances the cursor through the next count records in
-     * range.
+     * Advances the cursor through the next count records in range.
      */
     advance(count: number): void;
     /**
-     * Advances the cursor to the next record in range matching or
-     * after key.
+     * Advances the cursor to the next record in range.
      */
     continue(key?: IDBValidKey): void;
     /**
-     * Advances the cursor to the next record in range matching
-     * or after key and primaryKey. Throws an "InvalidAccessError" DOMException if the source is not an index.
+     * Advances the cursor to the next record in range matching or after key and primaryKey. Throws an "InvalidAccessError" DOMException if the source is not an index.
      */
     continuePrimaryKey(key: IDBValidKey, primaryKey: IDBValidKey): void;
     /**
      * Delete the record pointed at by the cursor with a new value.
+     * 
      * If successful, request's result will be undefined.
      */
     delete(): IDBRequest<undefined>;
     /**
      * Updated the record pointed at by the cursor with a new value.
+     * 
      * Throws a "DataError" DOMException if the effective object store uses in-line keys and the key would have changed.
+     * 
      * If successful, request's result will be the record's key.
      */
     update(value: any): IDBRequest<IDBValidKey>;
@@ -1518,7 +1727,7 @@ declare var IDBCursor: {
     new(): IDBCursor;
 };
 
-/** The IDBCursorWithValue interface of the IndexedDB API represents a cursor for traversing or iterating over multiple records in a database. It is the same as the IDBCursor, except that it includes the value property. */
+/** This IndexedDB API interface represents a cursor for traversing or iterating over multiple records in a database. It is the same as the IDBCursor, except that it includes the value property. */
 interface IDBCursorWithValue extends IDBCursor {
     /**
      * Returns the cursor's current value.
@@ -1538,7 +1747,7 @@ interface IDBDatabaseEventMap {
     "versionchange": IDBVersionChangeEvent;
 }
 
-/** The IDBDatabase interface of the IndexedDB API provides a connection to a database; you can use an IDBDatabase object to open a transaction on your database then create, manipulate, and delete objects (data) in that database. The interface provides the only way to get and manage versions of the database. */
+/** This IndexedDB API interface provides a connection to a database; you can use an IDBDatabase object to open a transaction on your database then create, manipulate, and delete objects (data) in that database. The interface provides the only way to get and manage versions of the database. */
 interface IDBDatabase extends EventTarget {
     /**
      * Returns the name of the database.
@@ -1562,17 +1771,18 @@ interface IDBDatabase extends EventTarget {
     close(): void;
     /**
      * Creates a new object store with the given name and options and returns a new IDBObjectStore.
+     * 
      * Throws a "InvalidStateError" DOMException if not called within an upgrade transaction.
      */
     createObjectStore(name: string, optionalParameters?: IDBObjectStoreParameters): IDBObjectStore;
     /**
      * Deletes the object store with the given name.
+     * 
      * Throws a "InvalidStateError" DOMException if not called within an upgrade transaction.
      */
     deleteObjectStore(name: string): void;
     /**
-     * Returns a new transaction with the given mode ("readonly" or "readwrite")
-     * and scope which can be a single object store name or an array of names.
+     * Returns a new transaction with the given mode ("readonly" or "readwrite") and scope which can be a single object store name or an array of names.
      */
     transaction(storeNames: string | string[], mode?: IDBTransactionMode): IDBTransaction;
     addEventListener<K extends keyof IDBDatabaseEventMap>(type: K, listener: (this: IDBDatabase, ev: IDBDatabaseEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
@@ -1589,24 +1799,17 @@ declare var IDBDatabase: {
 /** In the following code snippet, we make a request to open a database, and include handlers for the success and error cases. For a full working example, see our To-do Notifications app (view example live.) */
 interface IDBFactory {
     /**
-     * Compares two values as keys. Returns -1 if key1 precedes key2, 1 if key2 precedes key1, and 0 if
-     * the keys are equal.
+     * Compares two values as keys. Returns -1 if key1 precedes key2, 1 if key2 precedes key1, and 0 if the keys are equal.
+     * 
      * Throws a "DataError" DOMException if either input is not a valid key.
      */
     cmp(first: any, second: any): number;
     /**
-     * Attempts to delete the named database. If the
-     * database already exists and there are open connections that don't close in response to a versionchange event, the request will be blocked until all they close. If the request
-     * is successful request's result will be null.
+     * Attempts to delete the named database. If the database already exists and there are open connections that don't close in response to a versionchange event, the request will be blocked until all they close. If the request is successful request's result will be null.
      */
     deleteDatabase(name: string): IDBOpenDBRequest;
     /**
-     * Attempts to open a connection to the named database with the specified version. If the database already exists
-     * with a lower version and there are open connections that don't close in response to a versionchange event, the request will be blocked until all they close, then an upgrade
-     * will occur. If the database already exists with a higher
-     * version the request will fail. If the request is
-     * successful request's result will
-     * be the connection.
+     * Attempts to open a connection to the named database with the current version, or 1 if it does not already exist. If the request is successful request's result will be the connection.
      */
     open(name: string, version?: number): IDBOpenDBRequest;
 }
@@ -1621,9 +1824,7 @@ interface IDBIndex {
     readonly keyPath: string | string[];
     readonly multiEntry: boolean;
     /**
-     * Updates the name of the store to newName.
-     * Throws an "InvalidStateError" DOMException if not called within an upgrade
-     * transaction.
+     * Returns the name of the index.
      */
     name: string;
     /**
@@ -1633,43 +1834,46 @@ interface IDBIndex {
     readonly unique: boolean;
     /**
      * Retrieves the number of records matching the given key or key range in query.
-     * If successful, request's result will be the
-     * count.
+     * 
+     * If successful, request's result will be the count.
      */
     count(key?: IDBValidKey | IDBKeyRange): IDBRequest<number>;
     /**
-     * Retrieves the value of the first record matching the
-     * given key or key range in query.
+     * Retrieves the value of the first record matching the given key or key range in query.
+     * 
      * If successful, request's result will be the value, or undefined if there was no matching record.
      */
     get(key: IDBValidKey | IDBKeyRange): IDBRequest<any | undefined>;
     /**
      * Retrieves the values of the records matching the given key or key range in query (up to count if given).
+     * 
      * If successful, request's result will be an Array of the values.
      */
-    getAll(query?: IDBValidKey | IDBKeyRange, count?: number): IDBRequest<any[]>;
+    getAll(query?: IDBValidKey | IDBKeyRange | null, count?: number): IDBRequest<any[]>;
     /**
      * Retrieves the keys of records matching the given key or key range in query (up to count if given).
+     * 
      * If successful, request's result will be an Array of the keys.
      */
-    getAllKeys(query?: IDBValidKey | IDBKeyRange, count?: number): IDBRequest<IDBValidKey[]>;
+    getAllKeys(query?: IDBValidKey | IDBKeyRange | null, count?: number): IDBRequest<IDBValidKey[]>;
     /**
-     * Retrieves the key of the first record matching the
-     * given key or key range in query.
+     * Retrieves the key of the first record matching the given key or key range in query.
+     * 
      * If successful, request's result will be the key, or undefined if there was no matching record.
      */
     getKey(key: IDBValidKey | IDBKeyRange): IDBRequest<IDBValidKey | undefined>;
     /**
-     * Opens a cursor over the records matching query,
-     * ordered by direction. If query is null, all records in index are matched.
+     * Opens a cursor over the records matching query, ordered by direction. If query is null, all records in index are matched.
+     * 
      * If successful, request's result will be an IDBCursorWithValue, or null if there were no matching records.
      */
-    openCursor(range?: IDBValidKey | IDBKeyRange, direction?: IDBCursorDirection): IDBRequest<IDBCursorWithValue | null>;
+    openCursor(query?: IDBValidKey | IDBKeyRange | null, direction?: IDBCursorDirection): IDBRequest<IDBCursorWithValue | null>;
     /**
      * Opens a cursor with key only flag set over the records matching query, ordered by direction. If query is null, all records in index are matched.
+     * 
      * If successful, request's result will be an IDBCursor, or null if there were no matching records.
      */
-    openKeyCursor(range?: IDBValidKey | IDBKeyRange, direction?: IDBCursorDirection): IDBRequest<IDBCursor | null>;
+    openKeyCursor(query?: IDBValidKey | IDBKeyRange | null, direction?: IDBCursorDirection): IDBRequest<IDBCursor | null>;
 }
 
 declare var IDBIndex: {
@@ -1705,15 +1909,11 @@ declare var IDBKeyRange: {
     prototype: IDBKeyRange;
     new(): IDBKeyRange;
     /**
-     * Returns a new IDBKeyRange spanning from lower to upper.
-     * If lowerOpen is true, lower is not included in the range.
-     * If upperOpen is true, upper is not included in the range.
+     * Returns a new IDBKeyRange spanning from lower to upper. If lowerOpen is true, lower is not included in the range. If upperOpen is true, upper is not included in the range.
      */
     bound(lower: any, upper: any, lowerOpen?: boolean, upperOpen?: boolean): IDBKeyRange;
     /**
-     * Returns a new IDBKeyRange starting at key with no
-     * upper bound. If open is true, key is not included in the
-     * range.
+     * Returns a new IDBKeyRange starting at key with no upper bound. If open is true, key is not included in the range.
      */
     lowerBound(lower: any, open?: boolean): IDBKeyRange;
     /**
@@ -1741,88 +1941,99 @@ interface IDBObjectStore {
      */
     readonly keyPath: string | string[];
     /**
-     * Updates the name of the store to newName.
-     * Throws "InvalidStateError" DOMException if not called within an upgrade
-     * transaction.
+     * Returns the name of the store.
      */
     name: string;
     /**
      * Returns the associated transaction.
      */
     readonly transaction: IDBTransaction;
+    /**
+     * Adds or updates a record in store with the given value and key.
+     * 
+     * If the store uses in-line keys and key is specified a "DataError" DOMException will be thrown.
+     * 
+     * If put() is used, any existing record with the key will be replaced. If add() is used, and if a record with the key already exists the request will fail, with request's error set to a "ConstraintError" DOMException.
+     * 
+     * If successful, request's result will be the record's key.
+     */
     add(value: any, key?: IDBValidKey): IDBRequest<IDBValidKey>;
     /**
      * Deletes all records in store.
-     * If successful, request's result will
-     * be undefined.
+     * 
+     * If successful, request's result will be undefined.
      */
     clear(): IDBRequest<undefined>;
     /**
-     * Retrieves the number of records matching the
-     * given key or key range in query.
+     * Retrieves the number of records matching the given key or key range in query.
+     * 
      * If successful, request's result will be the count.
      */
     count(key?: IDBValidKey | IDBKeyRange): IDBRequest<number>;
     /**
-     * Creates a new index in store with the given name, keyPath and options and returns a new IDBIndex. If the keyPath and options define constraints that cannot be
-     * satisfied with the data already in store the upgrade
-     * transaction will abort with
-     * a "ConstraintError" DOMException.
-     * Throws an "InvalidStateError" DOMException if not called within an upgrade
-     * transaction.
+     * Creates a new index in store with the given name, keyPath and options and returns a new IDBIndex. If the keyPath and options define constraints that cannot be satisfied with the data already in store the upgrade transaction will abort with a "ConstraintError" DOMException.
+     * 
+     * Throws an "InvalidStateError" DOMException if not called within an upgrade transaction.
      */
     createIndex(name: string, keyPath: string | string[], options?: IDBIndexParameters): IDBIndex;
     /**
      * Deletes records in store with the given key or in the given key range in query.
-     * If successful, request's result will
-     * be undefined.
+     * 
+     * If successful, request's result will be undefined.
      */
     delete(key: IDBValidKey | IDBKeyRange): IDBRequest<undefined>;
     /**
      * Deletes the index in store with the given name.
-     * Throws an "InvalidStateError" DOMException if not called within an upgrade
-     * transaction.
+     * 
+     * Throws an "InvalidStateError" DOMException if not called within an upgrade transaction.
      */
     deleteIndex(name: string): void;
     /**
-     * Retrieves the value of the first record matching the
-     * given key or key range in query.
+     * Retrieves the value of the first record matching the given key or key range in query.
+     * 
      * If successful, request's result will be the value, or undefined if there was no matching record.
      */
     get(query: IDBValidKey | IDBKeyRange): IDBRequest<any | undefined>;
     /**
-     * Retrieves the values of the records matching the
-     * given key or key range in query (up to count if given).
-     * If successful, request's result will
-     * be an Array of the values.
+     * Retrieves the values of the records matching the given key or key range in query (up to count if given).
+     * 
+     * If successful, request's result will be an Array of the values.
      */
-    getAll(query?: IDBValidKey | IDBKeyRange, count?: number): IDBRequest<any[]>;
+    getAll(query?: IDBValidKey | IDBKeyRange | null, count?: number): IDBRequest<any[]>;
     /**
-     * Retrieves the keys of records matching the
-     * given key or key range in query (up to count if given).
-     * If successful, request's result will
-     * be an Array of the keys.
+     * Retrieves the keys of records matching the given key or key range in query (up to count if given).
+     * 
+     * If successful, request's result will be an Array of the keys.
      */
-    getAllKeys(query?: IDBValidKey | IDBKeyRange, count?: number): IDBRequest<IDBValidKey[]>;
+    getAllKeys(query?: IDBValidKey | IDBKeyRange | null, count?: number): IDBRequest<IDBValidKey[]>;
     /**
-     * Retrieves the key of the first record matching the
-     * given key or key range in query.
+     * Retrieves the key of the first record matching the given key or key range in query.
+     * 
      * If successful, request's result will be the key, or undefined if there was no matching record.
      */
     getKey(query: IDBValidKey | IDBKeyRange): IDBRequest<IDBValidKey | undefined>;
     index(name: string): IDBIndex;
     /**
-     * Opens a cursor over the records matching query,
-     * ordered by direction. If query is null, all records in store are matched.
+     * Opens a cursor over the records matching query, ordered by direction. If query is null, all records in store are matched.
+     * 
      * If successful, request's result will be an IDBCursorWithValue pointing at the first matching record, or null if there were no matching records.
      */
-    openCursor(range?: IDBValidKey | IDBKeyRange, direction?: IDBCursorDirection): IDBRequest<IDBCursorWithValue | null>;
+    openCursor(query?: IDBValidKey | IDBKeyRange | null, direction?: IDBCursorDirection): IDBRequest<IDBCursorWithValue | null>;
     /**
      * Opens a cursor with key only flag set over the records matching query, ordered by direction. If query is null, all records in store are matched.
-     * If successful, request's result will be an IDBCursor pointing at the first matching record, or
-     * null if there were no matching records.
+     * 
+     * If successful, request's result will be an IDBCursor pointing at the first matching record, or null if there were no matching records.
+     */
+    openKeyCursor(query?: IDBValidKey | IDBKeyRange | null, direction?: IDBCursorDirection): IDBRequest<IDBCursor | null>;
+    /**
+     * Adds or updates a record in store with the given value and key.
+     * 
+     * If the store uses in-line keys and key is specified a "DataError" DOMException will be thrown.
+     * 
+     * If put() is used, any existing record with the key will be replaced. If add() is used, and if a record with the key already exists the request will fail, with request's error set to a "ConstraintError" DOMException.
+     * 
+     * If successful, request's result will be the record's key.
      */
-    openKeyCursor(query?: IDBValidKey | IDBKeyRange, direction?: IDBCursorDirection): IDBRequest<IDBCursor | null>;
     put(value: any, key?: IDBValidKey): IDBRequest<IDBValidKey>;
 }
 
@@ -1859,31 +2070,25 @@ interface IDBRequestEventMap {
 /** The request object does not initially contain any information about the result of the operation, but once information becomes available, an event is fired on the request, and the information becomes available through the properties of the IDBRequest instance. */
 interface IDBRequest<T = any> extends EventTarget {
     /**
-     * When a request is completed, returns the error (a DOMException), or null if the request succeeded. Throws
-     * a "InvalidStateError" DOMException if the request is still pending.
+     * When a request is completed, returns the error (a DOMException), or null if the request succeeded. Throws a "InvalidStateError" DOMException if the request is still pending.
      */
     readonly error: DOMException | null;
     onerror: ((this: IDBRequest<T>, ev: Event) => any) | null;
     onsuccess: ((this: IDBRequest<T>, ev: Event) => any) | null;
     /**
-     * Returns "pending" until a request is complete,
-     * then returns "done".
+     * Returns "pending" until a request is complete, then returns "done".
      */
     readonly readyState: IDBRequestReadyState;
     /**
-     * When a request is completed, returns the result,
-     * or undefined if the request failed. Throws a
-     * "InvalidStateError" DOMException if the request is still pending.
+     * When a request is completed, returns the result, or undefined if the request failed. Throws a "InvalidStateError" DOMException if the request is still pending.
      */
     readonly result: T;
     /**
-     * Returns the IDBObjectStore, IDBIndex, or IDBCursor the request was made against, or null if is was an open
-     * request.
+     * Returns the IDBObjectStore, IDBIndex, or IDBCursor the request was made against, or null if is was an open request.
      */
     readonly source: IDBObjectStore | IDBIndex | IDBCursor;
     /**
-     * Returns the IDBTransaction the request was made within.
-     * If this as an open request, then it returns an upgrade transaction while it is running, or null otherwise.
+     * Returns the IDBTransaction the request was made within. If this as an open request, then it returns an upgrade transaction while it is running, or null otherwise.
      */
     readonly transaction: IDBTransaction | null;
     addEventListener<K extends keyof IDBRequestEventMap>(type: K, listener: (this: IDBRequest<T>, ev: IDBRequestEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
@@ -1909,28 +2114,22 @@ interface IDBTransaction extends EventTarget {
      */
     readonly db: IDBDatabase;
     /**
-     * If the transaction was aborted, returns the
-     * error (a DOMException) providing the reason.
+     * If the transaction was aborted, returns the error (a DOMException) providing the reason.
      */
     readonly error: DOMException;
     /**
-     * Returns the mode the transaction was created with
-     * ("readonly" or "readwrite"), or "versionchange" for
-     * an upgrade transaction.
+     * Returns the mode the transaction was created with ("readonly" or "readwrite"), or "versionchange" for an upgrade transaction.
      */
     readonly mode: IDBTransactionMode;
     /**
-     * Returns a list of the names of object stores in the
-     * transaction's scope. For an upgrade transaction this is all object stores in the database.
+     * Returns a list of the names of object stores in the transaction's scope. For an upgrade transaction this is all object stores in the database.
      */
     readonly objectStoreNames: DOMStringList;
     onabort: ((this: IDBTransaction, ev: Event) => any) | null;
     oncomplete: ((this: IDBTransaction, ev: Event) => any) | null;
     onerror: ((this: IDBTransaction, ev: Event) => any) | null;
     /**
-     * Aborts the transaction. All pending requests will fail with
-     * a "AbortError" DOMException and all changes made to the database will be
-     * reverted.
+     * Aborts the transaction. All pending requests will fail with a "AbortError" DOMException and all changes made to the database will be reverted.
      */
     abort(): void;
     /**
@@ -1948,7 +2147,7 @@ declare var IDBTransaction: {
     new(): IDBTransaction;
 };
 
-/** The IDBVersionChangeEvent interface of the IndexedDB API indicates that the version of the database has changed, as the result of an IDBOpenDBRequest.onupgradeneeded event handler function. */
+/** This IndexedDB API interface indicates that the version of the database has changed, as the result of an IDBOpenDBRequest.onupgradeneeded event handler function. */
 interface IDBVersionChangeEvent extends Event {
     readonly newVersion: number | null;
     readonly oldVersion: number;
@@ -1961,13 +2160,11 @@ declare var IDBVersionChangeEvent: {
 
 interface ImageBitmap {
     /**
-     * Returns the intrinsic height of the image, in CSS
-     * pixels.
+     * Returns the intrinsic height of the image, in CSS pixels.
      */
     readonly height: number;
     /**
-     * Returns the intrinsic width of the image, in CSS
-     * pixels.
+     * Returns the intrinsic width of the image, in CSS pixels.
      */
     readonly width: number;
     /**
@@ -1990,18 +2187,35 @@ interface ImageBitmapOptions {
     resizeWidth?: number;
 }
 
-/** The ImageData interface represents the underlying pixel data of an area of a <canvas> element. It is created using the ImageData() constructor or creator methods on the CanvasRenderingContext2D object associated with a canvas: createImageData() and getImageData(). It can also be used to set a part of the canvas by using putImageData(). */
+interface ImageBitmapRenderingContext {
+    /**
+     * Returns the canvas element that the context is bound to.
+     */
+    readonly canvas: OffscreenCanvas;
+    /**
+     * Transfers the underlying bitmap data from imageBitmap to context, and the bitmap becomes the contents of the canvas element to which context is bound.
+     */
+    transferFromImageBitmap(bitmap: ImageBitmap | null): void;
+}
+
+declare var ImageBitmapRenderingContext: {
+    prototype: ImageBitmapRenderingContext;
+    new(): ImageBitmapRenderingContext;
+};
+
+/** The underlying pixel data of an area of a <canvas> element. It is created using the ImageData() constructor or creator methods on the CanvasRenderingContext2D object associated with a canvas: createImageData() and getImageData(). It can also be used to set a part of the canvas by using putImageData(). */
 interface ImageData {
     /**
-     * Returns the one-dimensional array containing the data in RGBA order, as integers in the
-     * range 0 to 255.
+     * Returns the one-dimensional array containing the data in RGBA order, as integers in the range 0 to 255.
      */
     readonly data: Uint8ClampedArray;
     /**
-     * Returns the actual dimensions of the data in the ImageData object, in
-     * pixels.
+     * Returns the actual dimensions of the data in the ImageData object, in pixels.
      */
     readonly height: number;
+    /**
+     * Returns the actual dimensions of the data in the ImageData object, in pixels.
+     */
     readonly width: number;
 }
 
@@ -2011,9 +2225,15 @@ declare var ImageData: {
     new(array: Uint8ClampedArray, width: number, height: number): ImageData;
 };
 
-/** The MessageChannel interface of the Channel Messaging API allows us to create a new message channel and send data through it via its two MessagePort properties. */
+/** This Channel Messaging API interface allows us to create a new message channel and send data through it via its two MessagePort properties. */
 interface MessageChannel {
+    /**
+     * Returns the first MessagePort object.
+     */
     readonly port1: MessagePort;
+    /**
+     * Returns the second MessagePort object.
+     */
     readonly port2: MessagePort;
 }
 
@@ -2022,31 +2242,26 @@ declare var MessageChannel: {
     new(): MessageChannel;
 };
 
-/** The MessageEvent interface represents a message received by a target object. */
+/** A message received by a target object. */
 interface MessageEvent extends Event {
     /**
      * Returns the data of the message.
      */
     readonly data: any;
     /**
-     * Returns the last event ID string, for
-     * server-sent events.
+     * Returns the last event ID string, for server-sent events.
      */
     readonly lastEventId: string;
     /**
-     * Returns the origin of the message, for server-sent events and
-     * cross-document messaging.
+     * Returns the origin of the message, for server-sent events and cross-document messaging.
      */
     readonly origin: string;
     /**
-     * Returns the MessagePort array sent with the message, for cross-document
-     * messaging and channel messaging.
+     * Returns the MessagePort array sent with the message, for cross-document messaging and channel messaging.
      */
     readonly ports: ReadonlyArray<MessagePort>;
     /**
-     * Returns the WindowProxy of the source window, for cross-document
-     * messaging, and the MessagePort being attached, in the connect event fired at
-     * SharedWorkerGlobalScope objects.
+     * Returns the WindowProxy of the source window, for cross-document messaging, and the MessagePort being attached, in the connect event fired at SharedWorkerGlobalScope objects.
      */
     readonly source: MessageEventSource | null;
 }
@@ -2061,7 +2276,7 @@ interface MessagePortEventMap {
     "messageerror": MessageEvent;
 }
 
-/** The MessagePort interface of the Channel Messaging API represents one of the two ports of a MessageChannel, allowing messages to be sent from one port and listening out for them arriving at the other. */
+/** This Channel Messaging API interface represents one of the two ports of a MessageChannel, allowing messages to be sent from one port and listening out for them arriving at the other. */
 interface MessagePort extends EventTarget {
     onmessage: ((this: MessagePort, ev: MessageEvent) => any) | null;
     onmessageerror: ((this: MessagePort, ev: MessageEvent) => any) | null;
@@ -2070,13 +2285,12 @@ interface MessagePort extends EventTarget {
      */
     close(): void;
     /**
-     * Posts a message through the channel. Objects listed in transfer are
-     * transferred, not just cloned, meaning that they are no longer usable on the sending side.
-     * Throws a "DataCloneError" DOMException if
-     * transfer contains duplicate objects or port, or if message
-     * could not be cloned.
+     * Posts a message through the channel. Objects listed in transfer are transferred, not just cloned, meaning that they are no longer usable on the sending side.
+     * 
+     * Throws a "DataCloneError" DOMException if transfer contains duplicate objects or port, or if message could not be cloned.
      */
-    postMessage(message: any, transfer?: Transferable[]): void;
+    postMessage(message: any, transfer: Transferable[]): void;
+    postMessage(message: any, options?: PostMessageOptions): void;
     /**
      * Begins dispatching messages received on the port.
      */
@@ -2118,10 +2332,7 @@ interface NavigatorID {
     readonly appVersion: string;
     readonly platform: string;
     readonly product: string;
-    readonly productSub: string;
     readonly userAgent: string;
-    readonly vendor: string;
-    readonly vendorSub: string;
 }
 
 interface NavigatorOnLine {
@@ -2139,7 +2350,7 @@ interface NotificationEventMap {
     "show": Event;
 }
 
-/** The Notification interface of the Notifications API is used to configure and display desktop notifications to the user. */
+/** This Notifications API interface is used to configure and display desktop notifications to the user. */
 interface Notification extends EventTarget {
     readonly actions: ReadonlyArray<NotificationAction>;
     readonly badge: string;
@@ -2219,8 +2430,63 @@ interface OES_vertex_array_object {
     readonly VERTEX_ARRAY_BINDING_OES: GLenum;
 }
 
-/** The Path2D interface of the Canvas 2D API is used to declare a path that can then be used on a CanvasRenderingContext2D object. The path methods of the CanvasRenderingContext2D interface are also present on this interface, which gives you the convenience of being able to retain and replay your path whenever desired. */
+interface OffscreenCanvas extends EventTarget {
+    /**
+     * These attributes return the dimensions of the OffscreenCanvas object's bitmap.
+     * 
+     * They can be set, to replace the bitmap with a new, transparent black bitmap of the specified dimensions (effectively resizing it).
+     */
+    height: number;
+    /**
+     * These attributes return the dimensions of the OffscreenCanvas object's bitmap.
+     * 
+     * They can be set, to replace the bitmap with a new, transparent black bitmap of the specified dimensions (effectively resizing it).
+     */
+    width: number;
+    /**
+     * Returns a promise that will fulfill with a new Blob object representing a file containing the image in the OffscreenCanvas object.
+     * 
+     * The argument, if provided, is a dictionary that controls the encoding options of the image file to be created. The type field specifies the file format and has a default value of "image/png"; that type is also used if the requested type isn't supported. If the image format supports variable quality (such as "image/jpeg"), then the quality field is a number in the range 0.0 to 1.0 inclusive indicating the desired quality level for the resulting image.
+     */
+    convertToBlob(options?: ImageEncodeOptions): Promise<Blob>;
+    /**
+     * Returns an object that exposes an API for drawing on the OffscreenCanvas object. contextId specifies the desired API: "2d", "bitmaprenderer", "webgl", or "webgl2". options is handled by that API.
+     * 
+     * This specification defines the "2d" context below, which is similar but distinct from the "2d" context that is created from a canvas element. The WebGL specifications define the "webgl" and "webgl2" contexts. [WEBGL]
+     * 
+     * Returns null if the canvas has already been initialized with another context type (e.g., trying to get a "2d" context after getting a "webgl" context).
+     */
+    getContext(contextId: "2d", options?: CanvasRenderingContext2DSettings): OffscreenCanvasRenderingContext2D | null;
+    getContext(contextId: "bitmaprenderer", options?: ImageBitmapRenderingContextSettings): ImageBitmapRenderingContext | null;
+    getContext(contextId: "webgl", options?: WebGLContextAttributes): WebGLRenderingContext | null;
+    getContext(contextId: "webgl2", options?: WebGLContextAttributes): WebGL2RenderingContext | null;
+    getContext(contextId: OffscreenRenderingContextId, options?: any): OffscreenRenderingContext | null;
+    /**
+     * Returns a newly created ImageBitmap object with the image in the OffscreenCanvas object. The image in the OffscreenCanvas object is replaced with a new blank image.
+     */
+    transferToImageBitmap(): ImageBitmap;
+}
+
+declare var OffscreenCanvas: {
+    prototype: OffscreenCanvas;
+    new(width: number, height: number): OffscreenCanvas;
+};
+
+interface OffscreenCanvasRenderingContext2D extends CanvasState, CanvasTransform, CanvasCompositing, CanvasImageSmoothing, CanvasFillStrokeStyles, CanvasShadowStyles, CanvasFilters, CanvasRect, CanvasDrawPath, CanvasText, CanvasDrawImage, CanvasImageData, CanvasPathDrawingStyles, CanvasTextDrawingStyles, CanvasPath {
+    readonly canvas: OffscreenCanvas;
+    commit(): void;
+}
+
+declare var OffscreenCanvasRenderingContext2D: {
+    prototype: OffscreenCanvasRenderingContext2D;
+    new(): OffscreenCanvasRenderingContext2D;
+};
+
+/** This Canvas 2D API interface is used to declare a path that can then be used on a CanvasRenderingContext2D object. The path methods of the CanvasRenderingContext2D interface are also present on this interface, which gives you the convenience of being able to retain and replay your path whenever desired. */
 interface Path2D extends CanvasPath {
+    /**
+     * Adds to the path the path given by the argument.
+     */
     addPath(path: Path2D, transform?: DOMMatrix2DInit): void;
 }
 
@@ -2233,7 +2499,7 @@ interface PerformanceEventMap {
     "resourcetimingbufferfull": Event;
 }
 
-/** The Performance interface provides access to performance-related information for the current page. It's part of the High Resolution Time API, but is enhanced by the Performance Timeline API, the Navigation Timing API, the User Timing API, and the Resource Timing API. */
+/** Provides access to performance-related information for the current page. It's part of the High Resolution Time API, but is enhanced by the Performance Timeline API, the Navigation Timing API, the User Timing API, and the Resource Timing API. */
 interface Performance extends EventTarget {
     onresourcetimingbufferfull: ((this: Performance, ev: Event) => any) | null;
     readonly timeOrigin: number;
@@ -2259,7 +2525,7 @@ declare var Performance: {
     new(): Performance;
 };
 
-/** The PerformanceEntry object encapsulates a single performance metric that is part of the performance timeline. A performance entry can be directly created by making a performance mark or measure (for example by calling the mark() method) at an explicit point in an application. Performance entries are also created in indirect ways such as loading a resource (such as an image). */
+/** Encapsulates a single performance metric that is part of the performance timeline. A performance entry can be directly created by making a performance mark or measure (for example by calling the mark() method) at an explicit point in an application. Performance entries are also created in indirect ways such as loading a resource (such as an image). */
 interface PerformanceEntry {
     readonly duration: number;
     readonly entryType: string;
@@ -2293,13 +2559,14 @@ declare var PerformanceMeasure: {
 
 interface PerformanceObserver {
     disconnect(): void;
-    observe(options: PerformanceObserverInit): void;
+    observe(options?: PerformanceObserverInit): void;
     takeRecords(): PerformanceEntryList;
 }
 
 declare var PerformanceObserver: {
     prototype: PerformanceObserver;
     new(callback: PerformanceObserverCallback): PerformanceObserver;
+    readonly supportedEntryTypes: ReadonlyArray<string>;
 };
 
 interface PerformanceObserverEntryList {
@@ -2313,7 +2580,7 @@ declare var PerformanceObserverEntryList: {
     new(): PerformanceObserverEntryList;
 };
 
-/** The PerformanceResourceTiming interface enables retrieval and analysis of detailed network timing data regarding the loading of an application's resources. An application can use the timing metrics to determine, for example, the length of time it takes to fetch a specific resource, such as an XMLHttpRequest, <SVG>, image, or script. */
+/** Enables retrieval and analysis of detailed network timing data regarding the loading of an application's resources. An application can use the timing metrics to determine, for example, the length of time it takes to fetch a specific resource, such as an XMLHttpRequest, <SVG>, image, or script. */
 interface PerformanceResourceTiming extends PerformanceEntry {
     readonly connectEnd: number;
     readonly connectStart: number;
@@ -2340,10 +2607,38 @@ declare var PerformanceResourceTiming: {
     new(): PerformanceResourceTiming;
 };
 
-/** The ProgressEvent interface represents events measuring progress of an underlying process, like an HTTP request (for an XMLHttpRequest, or the loading of the underlying resource of an <img>, <audio>, <video>, <style> or <link>). */
-interface ProgressEvent extends Event {
+interface PermissionStatusEventMap {
+    "change": Event;
+}
+
+interface PermissionStatus extends EventTarget {
+    onchange: ((this: PermissionStatus, ev: Event) => any) | null;
+    readonly state: PermissionState;
+    addEventListener<K extends keyof PermissionStatusEventMap>(type: K, listener: (this: PermissionStatus, ev: PermissionStatusEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
+    removeEventListener<K extends keyof PermissionStatusEventMap>(type: K, listener: (this: PermissionStatus, ev: PermissionStatusEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
+    removeEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | EventListenerOptions): void;
+}
+
+declare var PermissionStatus: {
+    prototype: PermissionStatus;
+    new(): PermissionStatus;
+};
+
+interface Permissions {
+    query(permissionDesc: PermissionDescriptor | DevicePermissionDescriptor | MidiPermissionDescriptor | PushPermissionDescriptor): Promise<PermissionStatus>;
+}
+
+declare var Permissions: {
+    prototype: Permissions;
+    new(): Permissions;
+};
+
+/** Events measuring progress of an underlying process, like an HTTP request (for an XMLHttpRequest, or the loading of the underlying resource of an <img>, <audio>, <video>, <style> or <link>). */
+interface ProgressEvent<T extends EventTarget = EventTarget> extends Event {
     readonly lengthComputable: boolean;
     readonly loaded: number;
+    readonly target: T | null;
     readonly total: number;
 }
 
@@ -2362,7 +2657,7 @@ declare var PromiseRejectionEvent: {
     new(type: string, eventInitDict: PromiseRejectionEventInit): PromiseRejectionEvent;
 };
 
-/** The PushEvent interface of the Push API represents a push message that has been received. This event is sent to the global scope of a ServiceWorker. It contains the information sent from an application server to a PushSubscription. */
+/** This Push API interface represents a push message that has been received. This event is sent to the global scope of a ServiceWorker. It contains the information sent from an application server to a PushSubscription. */
 interface PushEvent extends ExtendableEvent {
     readonly data: PushMessageData | null;
 }
@@ -2372,7 +2667,7 @@ declare var PushEvent: {
     new(type: string, eventInitDict?: PushEventInit): PushEvent;
 };
 
-/** The PushManager interface of the Push API provides a way to receive notifications from third-party servers as well as request URLs for push notifications. */
+/** This Push API interface provides a way to receive notifications from third-party servers as well as request URLs for push notifications. */
 interface PushManager {
     getSubscription(): Promise<PushSubscription | null>;
     permissionState(options?: PushSubscriptionOptionsInit): Promise<PushPermissionState>;
@@ -2385,7 +2680,7 @@ declare var PushManager: {
     readonly supportedContentEncodings: ReadonlyArray<string>;
 };
 
-/** The PushMessageData interface of the Push API provides methods which let you retrieve the push data sent by a server in various formats. */
+/** This Push API interface provides methods which let you retrieve the push data sent by a server in various formats. */
 interface PushMessageData {
     arrayBuffer(): ArrayBuffer;
     blob(): Blob;
@@ -2398,7 +2693,7 @@ declare var PushMessageData: {
     new(): PushMessageData;
 };
 
-/** The PushSubscription interface of the Push API provides a subcription's URL endpoint and allows unsubscription from a push service. */
+/** This Push API interface provides a subcription's URL endpoint and allows unsubscription from a push service. */
 interface PushSubscription {
     readonly endpoint: string;
     readonly expirationTime: number | null;
@@ -2441,7 +2736,7 @@ interface ReadableByteStreamController {
     error(error?: any): void;
 }
 
-/** The ReadableStream interface of the Streams API represents a readable stream of byte data. The Fetch API offers a concrete instance of a ReadableStream through the body property of a Response object. */
+/** This Streams API interface represents a readable stream of byte data. The Fetch API offers a concrete instance of a ReadableStream through the body property of a Response object. */
 interface ReadableStream<R = any> {
     readonly locked: boolean;
     cancel(reason?: any): Promise<void>;
@@ -2465,11 +2760,6 @@ interface ReadableStreamBYOBReader {
     releaseLock(): void;
 }
 
-declare var ReadableStreamBYOBReader: {
-    prototype: ReadableStreamBYOBReader;
-    new(stream: ReadableStream<Uint8Array>): ReadableStreamBYOBReader;
-};
-
 interface ReadableStreamBYOBRequest {
     readonly view: ArrayBufferView;
     respond(bytesWritten: number): void;
@@ -2506,38 +2796,30 @@ declare var ReadableStreamReader: {
     new(): ReadableStreamReader;
 };
 
-/** The Request interface of the Fetch API represents a resource request. */
+/** This Fetch API interface represents a resource request. */
 interface Request extends Body {
     /**
-     * Returns the cache mode associated with request, which is a string indicating
-     * how the request will interact with the browser's cache when fetching.
+     * Returns the cache mode associated with request, which is a string indicating how the request will interact with the browser's cache when fetching.
      */
     readonly cache: RequestCache;
     /**
-     * Returns the credentials mode associated with request, which is a string
-     * indicating whether credentials will be sent with the request always, never, or only when sent to a
-     * same-origin URL.
+     * Returns the credentials mode associated with request, which is a string indicating whether credentials will be sent with the request always, never, or only when sent to a same-origin URL.
      */
     readonly credentials: RequestCredentials;
     /**
-     * Returns the kind of resource requested by request, e.g., "document" or
-     * "script".
+     * Returns the kind of resource requested by request, e.g., "document" or "script".
      */
     readonly destination: RequestDestination;
     /**
-     * Returns a Headers object consisting of the headers associated with request.
-     * Note that headers added in the network layer by the user agent will not be accounted for in this
-     * object, e.g., the "Host" header.
+     * Returns a Headers object consisting of the headers associated with request. Note that headers added in the network layer by the user agent will not be accounted for in this object, e.g., the "Host" header.
      */
     readonly headers: Headers;
     /**
-     * Returns request's subresource integrity metadata, which is a cryptographic hash of
-     * the resource being fetched. Its value consists of multiple hashes separated by whitespace. [SRI]
+     * Returns request's subresource integrity metadata, which is a cryptographic hash of the resource being fetched. Its value consists of multiple hashes separated by whitespace. [SRI]
      */
     readonly integrity: string;
     /**
-     * Returns a boolean indicating whether or not request is for a history
-     * navigation (a.k.a. back-foward navigation).
+     * Returns a boolean indicating whether or not request is for a history navigation (a.k.a. back-foward navigation).
      */
     readonly isHistoryNavigation: boolean;
     /**
@@ -2545,8 +2827,7 @@ interface Request extends Body {
      */
     readonly isReloadNavigation: boolean;
     /**
-     * Returns a boolean indicating whether or not request can outlive the global in which
-     * it was created.
+     * Returns a boolean indicating whether or not request can outlive the global in which it was created.
      */
     readonly keepalive: boolean;
     /**
@@ -2554,30 +2835,23 @@ interface Request extends Body {
      */
     readonly method: string;
     /**
-     * Returns the mode associated with request, which is a string indicating
-     * whether the request will use CORS, or will be restricted to same-origin URLs.
+     * Returns the mode associated with request, which is a string indicating whether the request will use CORS, or will be restricted to same-origin URLs.
      */
     readonly mode: RequestMode;
     /**
-     * Returns the redirect mode associated with request, which is a string
-     * indicating how redirects for the request will be handled during fetching. A request will follow redirects by default.
+     * Returns the redirect mode associated with request, which is a string indicating how redirects for the request will be handled during fetching. A request will follow redirects by default.
      */
     readonly redirect: RequestRedirect;
     /**
-     * Returns the referrer of request. Its value can be a same-origin URL if
-     * explicitly set in init, the empty string to indicate no referrer, and
-     * "about:client" when defaulting to the global's default. This is used during
-     * fetching to determine the value of the `Referer` header of the request being made.
+     * Returns the referrer of request. Its value can be a same-origin URL if explicitly set in init, the empty string to indicate no referrer, and "about:client" when defaulting to the global's default. This is used during fetching to determine the value of the `Referer` header of the request being made.
      */
     readonly referrer: string;
     /**
-     * Returns the referrer policy associated with request. This is used during
-     * fetching to compute the value of the request's referrer.
+     * Returns the referrer policy associated with request. This is used during fetching to compute the value of the request's referrer.
      */
     readonly referrerPolicy: ReferrerPolicy;
     /**
-     * Returns the signal associated with request, which is an AbortSignal object indicating whether or not request has been aborted, and its abort
-     * event handler.
+     * Returns the signal associated with request, which is an AbortSignal object indicating whether or not request has been aborted, and its abort event handler.
      */
     readonly signal: AbortSignal;
     /**
@@ -2592,7 +2866,7 @@ declare var Request: {
     new(input: RequestInfo, init?: RequestInit): Request;
 };
 
-/** The Response interface of the Fetch API represents the response to a request. */
+/** This Fetch API interface represents the response to a request. */
 interface Response extends Body {
     readonly headers: Headers;
     readonly ok: boolean;
@@ -2616,12 +2890,13 @@ interface ServiceWorkerEventMap extends AbstractWorkerEventMap {
     "statechange": Event;
 }
 
-/** The ServiceWorker interface of the ServiceWorker API provides a reference to a service worker. Multiple browsing contexts (e.g. pages, workers, etc.) can be associated with the same service worker, each through a unique ServiceWorker object. */
+/** This ServiceWorker API interface provides a reference to a service worker. Multiple browsing contexts (e.g. pages, workers, etc.) can be associated with the same service worker, each through a unique ServiceWorker object. */
 interface ServiceWorker extends EventTarget, AbstractWorker {
     onstatechange: ((this: ServiceWorker, ev: Event) => any) | null;
     readonly scriptURL: string;
     readonly state: ServiceWorkerState;
-    postMessage(message: any, transfer?: Transferable[]): void;
+    postMessage(message: any, transfer: Transferable[]): void;
+    postMessage(message: any, options?: PostMessageOptions): void;
     addEventListener<K extends keyof ServiceWorkerEventMap>(type: K, listener: (this: ServiceWorker, ev: ServiceWorkerEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof ServiceWorkerEventMap>(type: K, listener: (this: ServiceWorker, ev: ServiceWorkerEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -2674,7 +2949,7 @@ interface ServiceWorkerGlobalScopeEventMap extends WorkerGlobalScopeEventMap {
     "sync": SyncEvent;
 }
 
-/** The ServiceWorkerGlobalScope interface of the ServiceWorker API represents the global execution context of a service worker. */
+/** This ServiceWorker API interface represents the global execution context of a service worker. */
 interface ServiceWorkerGlobalScope extends WorkerGlobalScope {
     readonly clients: Clients;
     onactivate: ((this: ServiceWorkerGlobalScope, ev: ExtendableEvent) => any) | null;
@@ -2704,7 +2979,7 @@ interface ServiceWorkerRegistrationEventMap {
     "updatefound": Event;
 }
 
-/** The ServiceWorkerRegistration interface of the ServiceWorker API represents the service worker registration. You register a service worker to control one or more pages that share the same origin. */
+/** This ServiceWorker API interface represents the service worker registration. You register a service worker to control one or more pages that share the same origin. */
 interface ServiceWorkerRegistration extends EventTarget {
     readonly active: ServiceWorker | null;
     readonly installing: ServiceWorker | null;
@@ -2740,7 +3015,7 @@ declare var StorageManager: {
     new(): StorageManager;
 };
 
-/** The SubtleCrypto interface represents a set of cryptographic primitives. It is available via the Crypto.subtle properties available in a window context (via Window.crypto). */
+/** This Web Crypto API interface provides a number of low-level cryptographic functions. It is accessed via the Crypto.subtle properties available in a window context (via Window.crypto). */
 interface SubtleCrypto {
     decrypt(algorithm: string | RsaOaepParams | AesCtrParams | AesCbcParams | AesCmacParams | AesGcmParams | AesCfbParams, key: CryptoKey, data: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer): PromiseLike<ArrayBuffer>;
     deriveBits(algorithm: string | EcdhKeyDeriveParams | DhKeyDeriveParams | ConcatParams | HkdfCtrParams | Pbkdf2Params, baseKey: CryptoKey, length: number): PromiseLike<ArrayBuffer>;
@@ -2767,7 +3042,7 @@ declare var SubtleCrypto: {
     new(): SubtleCrypto;
 };
 
-/** The SyncEvent interface represents a sync action that is dispatched on the ServiceWorkerGlobalScope of a ServiceWorker.  */
+/** A sync action that is dispatched on the ServiceWorkerGlobalScope of a ServiceWorker.  */
 interface SyncEvent extends ExtendableEvent {
     readonly lastChance: boolean;
     readonly tag: string;
@@ -2778,7 +3053,7 @@ declare var SyncEvent: {
     new(type: string, init: SyncEventInit): SyncEvent;
 };
 
-/** The SyncManager interface of the the ServiceWorker API provides an interface for registering and listing sync registrations. */
+/** This ServiceWorker API interface provides an interface for registering and listing sync registrations. */
 interface SyncManager {
     getTags(): Promise<string[]>;
     register(tag: string): Promise<void>;
@@ -2789,32 +3064,19 @@ declare var SyncManager: {
     new(): SyncManager;
 };
 
-/** The TextDecoder interface represents a decoder for a specific method, that is a specific character encoding, like utf-8, iso-8859-2, koi8, cp1261, gbk, etc. A decoder takes a stream of bytes as input and emits a stream of code points. For a more scalable, non-native library, see StringView – a C-like representation of strings based on typed arrays. */
-interface TextDecoder {
+/** A decoder for a specific method, that is a specific character encoding, like utf-8, iso-8859-2, koi8, cp1261, gbk, etc. A decoder takes a stream of bytes as input and emits a stream of code points. For a more scalable, non-native library, see StringView – a C-like representation of strings based on typed arrays. */
+interface TextDecoder extends TextDecoderCommon {
     /**
-     * Returns encoding's name, lowercased.
-     */
-    readonly encoding: string;
-    /**
-     * Returns true if error mode is "fatal", and false
-     * otherwise.
-     */
-    readonly fatal: boolean;
-    /**
-     * Returns true if ignore BOM flag is set, and false otherwise.
-     */
-    readonly ignoreBOM: boolean;
-    /**
-     * Returns the result of running encoding's decoder. The
-     * method can be invoked zero or more times with options's stream set to
-     * true, and then once without options's stream (or set to false), to process
-     * a fragmented stream. If the invocation without options's stream (or set to
-     * false) has no input, it's clearest to omit both arguments.
+     * Returns the result of running encoding's decoder. The method can be invoked zero or more times with options's stream set to true, and then once without options's stream (or set to false), to process a fragmented stream. If the invocation without options's stream (or set to false) has no input, it's clearest to omit both arguments.
+     * 
+     * ```
      * var string = "", decoder = new TextDecoder(encoding), buffer;
      * while(buffer = next_chunk()) {
-     * string += decoder.decode(buffer, {stream:true});
+     *   string += decoder.decode(buffer, {stream:true});
      * }
      * string += decoder.decode(); // end-of-stream
+     * ```
+     * 
      * If the error mode is "fatal" and encoding's decoder returns error, throws a TypeError.
      */
     decode(input?: BufferSource, options?: TextDecodeOptions): string;
@@ -2825,16 +3087,39 @@ declare var TextDecoder: {
     new(label?: string, options?: TextDecoderOptions): TextDecoder;
 };
 
-/** TextEncoder takes a stream of code points as input and emits a stream of bytes. For a more scalable, non-native library, see StringView – a C-like representation of strings based on typed arrays. */
-interface TextEncoder {
+interface TextDecoderCommon {
     /**
-     * Returns "utf-8".
+     * Returns encoding's name, lowercased.
      */
     readonly encoding: string;
+    /**
+     * Returns true if error mode is "fatal", and false otherwise.
+     */
+    readonly fatal: boolean;
+    /**
+     * Returns true if ignore BOM flag is set, and false otherwise.
+     */
+    readonly ignoreBOM: boolean;
+}
+
+interface TextDecoderStream extends TextDecoderCommon, GenericTransformStream {
+}
+
+declare var TextDecoderStream: {
+    prototype: TextDecoderStream;
+    new(label?: string, options?: TextDecoderOptions): TextDecoderStream;
+};
+
+/** TextEncoder takes a stream of code points as input and emits a stream of bytes. For a more scalable, non-native library, see StringView – a C-like representation of strings based on typed arrays. */
+interface TextEncoder extends TextEncoderCommon {
     /**
      * Returns the result of running UTF-8's encoder.
      */
     encode(input?: string): Uint8Array;
+    /**
+     * Runs the UTF-8 encoder on source, stores the result of that operation into destination, and returns the progress made as a dictionary whereby read is the number of converted code units of source and written is the number of bytes modified in destination.
+     */
+    encodeInto(source: string, destination: Uint8Array): TextEncoderEncodeIntoResult;
 }
 
 declare var TextEncoder: {
@@ -2842,22 +3127,70 @@ declare var TextEncoder: {
     new(): TextEncoder;
 };
 
-/** The TextMetrics interface represents the dimension of a text in the canvas, as created by the CanvasRenderingContext2D.measureText() method. */
+interface TextEncoderCommon {
+    /**
+     * Returns "utf-8".
+     */
+    readonly encoding: string;
+}
+
+interface TextEncoderStream extends TextEncoderCommon, GenericTransformStream {
+}
+
+declare var TextEncoderStream: {
+    prototype: TextEncoderStream;
+    new(): TextEncoderStream;
+};
+
+/** The dimensions of a piece of text in the canvas, as created by the CanvasRenderingContext2D.measureText() method. */
 interface TextMetrics {
+    /**
+     * Returns the measurement described below.
+     */
     readonly actualBoundingBoxAscent: number;
+    /**
+     * Returns the measurement described below.
+     */
     readonly actualBoundingBoxDescent: number;
+    /**
+     * Returns the measurement described below.
+     */
     readonly actualBoundingBoxLeft: number;
+    /**
+     * Returns the measurement described below.
+     */
     readonly actualBoundingBoxRight: number;
+    /**
+     * Returns the measurement described below.
+     */
     readonly alphabeticBaseline: number;
+    /**
+     * Returns the measurement described below.
+     */
     readonly emHeightAscent: number;
+    /**
+     * Returns the measurement described below.
+     */
     readonly emHeightDescent: number;
+    /**
+     * Returns the measurement described below.
+     */
     readonly fontBoundingBoxAscent: number;
+    /**
+     * Returns the measurement described below.
+     */
     readonly fontBoundingBoxDescent: number;
+    /**
+     * Returns the measurement described below.
+     */
     readonly hangingBaseline: number;
     /**
      * Returns the measurement described below.
      */
     readonly ideographicBaseline: number;
+    /**
+     * Returns the measurement described below.
+     */
     readonly width: number;
 }
 
@@ -3052,7 +3385,971 @@ interface WEBGL_lose_context {
     restoreContext(): void;
 }
 
-/** The WebGLActiveInfo interface is part of the WebGL API and represents the information returned by calling the WebGLRenderingContext.getActiveAttrib() and WebGLRenderingContext.getActiveUniform() methods. */
+interface WebGL2RenderingContext extends WebGLRenderingContextBase, WebGL2RenderingContextBase, WebGL2RenderingContextOverloads {
+}
+
+declare var WebGL2RenderingContext: {
+    prototype: WebGL2RenderingContext;
+    new(): WebGL2RenderingContext;
+    readonly ACTIVE_ATTRIBUTES: GLenum;
+    readonly ACTIVE_TEXTURE: GLenum;
+    readonly ACTIVE_UNIFORMS: GLenum;
+    readonly ALIASED_LINE_WIDTH_RANGE: GLenum;
+    readonly ALIASED_POINT_SIZE_RANGE: GLenum;
+    readonly ALPHA: GLenum;
+    readonly ALPHA_BITS: GLenum;
+    readonly ALWAYS: GLenum;
+    readonly ARRAY_BUFFER: GLenum;
+    readonly ARRAY_BUFFER_BINDING: GLenum;
+    readonly ATTACHED_SHADERS: GLenum;
+    readonly BACK: GLenum;
+    readonly BLEND: GLenum;
+    readonly BLEND_COLOR: GLenum;
+    readonly BLEND_DST_ALPHA: GLenum;
+    readonly BLEND_DST_RGB: GLenum;
+    readonly BLEND_EQUATION: GLenum;
+    readonly BLEND_EQUATION_ALPHA: GLenum;
+    readonly BLEND_EQUATION_RGB: GLenum;
+    readonly BLEND_SRC_ALPHA: GLenum;
+    readonly BLEND_SRC_RGB: GLenum;
+    readonly BLUE_BITS: GLenum;
+    readonly BOOL: GLenum;
+    readonly BOOL_VEC2: GLenum;
+    readonly BOOL_VEC3: GLenum;
+    readonly BOOL_VEC4: GLenum;
+    readonly BROWSER_DEFAULT_WEBGL: GLenum;
+    readonly BUFFER_SIZE: GLenum;
+    readonly BUFFER_USAGE: GLenum;
+    readonly BYTE: GLenum;
+    readonly CCW: GLenum;
+    readonly CLAMP_TO_EDGE: GLenum;
+    readonly COLOR_ATTACHMENT0: GLenum;
+    readonly COLOR_BUFFER_BIT: GLenum;
+    readonly COLOR_CLEAR_VALUE: GLenum;
+    readonly COLOR_WRITEMASK: GLenum;
+    readonly COMPILE_STATUS: GLenum;
+    readonly COMPRESSED_TEXTURE_FORMATS: GLenum;
+    readonly CONSTANT_ALPHA: GLenum;
+    readonly CONSTANT_COLOR: GLenum;
+    readonly CONTEXT_LOST_WEBGL: GLenum;
+    readonly CULL_FACE: GLenum;
+    readonly CULL_FACE_MODE: GLenum;
+    readonly CURRENT_PROGRAM: GLenum;
+    readonly CURRENT_VERTEX_ATTRIB: GLenum;
+    readonly CW: GLenum;
+    readonly DECR: GLenum;
+    readonly DECR_WRAP: GLenum;
+    readonly DELETE_STATUS: GLenum;
+    readonly DEPTH_ATTACHMENT: GLenum;
+    readonly DEPTH_BITS: GLenum;
+    readonly DEPTH_BUFFER_BIT: GLenum;
+    readonly DEPTH_CLEAR_VALUE: GLenum;
+    readonly DEPTH_COMPONENT: GLenum;
+    readonly DEPTH_COMPONENT16: GLenum;
+    readonly DEPTH_FUNC: GLenum;
+    readonly DEPTH_RANGE: GLenum;
+    readonly DEPTH_STENCIL: GLenum;
+    readonly DEPTH_STENCIL_ATTACHMENT: GLenum;
+    readonly DEPTH_TEST: GLenum;
+    readonly DEPTH_WRITEMASK: GLenum;
+    readonly DITHER: GLenum;
+    readonly DONT_CARE: GLenum;
+    readonly DST_ALPHA: GLenum;
+    readonly DST_COLOR: GLenum;
+    readonly DYNAMIC_DRAW: GLenum;
+    readonly ELEMENT_ARRAY_BUFFER: GLenum;
+    readonly ELEMENT_ARRAY_BUFFER_BINDING: GLenum;
+    readonly EQUAL: GLenum;
+    readonly FASTEST: GLenum;
+    readonly FLOAT: GLenum;
+    readonly FLOAT_MAT2: GLenum;
+    readonly FLOAT_MAT3: GLenum;
+    readonly FLOAT_MAT4: GLenum;
+    readonly FLOAT_VEC2: GLenum;
+    readonly FLOAT_VEC3: GLenum;
+    readonly FLOAT_VEC4: GLenum;
+    readonly FRAGMENT_SHADER: GLenum;
+    readonly FRAMEBUFFER: GLenum;
+    readonly FRAMEBUFFER_ATTACHMENT_OBJECT_NAME: GLenum;
+    readonly FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE: GLenum;
+    readonly FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE: GLenum;
+    readonly FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL: GLenum;
+    readonly FRAMEBUFFER_BINDING: GLenum;
+    readonly FRAMEBUFFER_COMPLETE: GLenum;
+    readonly FRAMEBUFFER_INCOMPLETE_ATTACHMENT: GLenum;
+    readonly FRAMEBUFFER_INCOMPLETE_DIMENSIONS: GLenum;
+    readonly FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT: GLenum;
+    readonly FRAMEBUFFER_UNSUPPORTED: GLenum;
+    readonly FRONT: GLenum;
+    readonly FRONT_AND_BACK: GLenum;
+    readonly FRONT_FACE: GLenum;
+    readonly FUNC_ADD: GLenum;
+    readonly FUNC_REVERSE_SUBTRACT: GLenum;
+    readonly FUNC_SUBTRACT: GLenum;
+    readonly GENERATE_MIPMAP_HINT: GLenum;
+    readonly GEQUAL: GLenum;
+    readonly GREATER: GLenum;
+    readonly GREEN_BITS: GLenum;
+    readonly HIGH_FLOAT: GLenum;
+    readonly HIGH_INT: GLenum;
+    readonly IMPLEMENTATION_COLOR_READ_FORMAT: GLenum;
+    readonly IMPLEMENTATION_COLOR_READ_TYPE: GLenum;
+    readonly INCR: GLenum;
+    readonly INCR_WRAP: GLenum;
+    readonly INT: GLenum;
+    readonly INT_VEC2: GLenum;
+    readonly INT_VEC3: GLenum;
+    readonly INT_VEC4: GLenum;
+    readonly INVALID_ENUM: GLenum;
+    readonly INVALID_FRAMEBUFFER_OPERATION: GLenum;
+    readonly INVALID_OPERATION: GLenum;
+    readonly INVALID_VALUE: GLenum;
+    readonly INVERT: GLenum;
+    readonly KEEP: GLenum;
+    readonly LEQUAL: GLenum;
+    readonly LESS: GLenum;
+    readonly LINEAR: GLenum;
+    readonly LINEAR_MIPMAP_LINEAR: GLenum;
+    readonly LINEAR_MIPMAP_NEAREST: GLenum;
+    readonly LINES: GLenum;
+    readonly LINE_LOOP: GLenum;
+    readonly LINE_STRIP: GLenum;
+    readonly LINE_WIDTH: GLenum;
+    readonly LINK_STATUS: GLenum;
+    readonly LOW_FLOAT: GLenum;
+    readonly LOW_INT: GLenum;
+    readonly LUMINANCE: GLenum;
+    readonly LUMINANCE_ALPHA: GLenum;
+    readonly MAX_COMBINED_TEXTURE_IMAGE_UNITS: GLenum;
+    readonly MAX_CUBE_MAP_TEXTURE_SIZE: GLenum;
+    readonly MAX_FRAGMENT_UNIFORM_VECTORS: GLenum;
+    readonly MAX_RENDERBUFFER_SIZE: GLenum;
+    readonly MAX_TEXTURE_IMAGE_UNITS: GLenum;
+    readonly MAX_TEXTURE_SIZE: GLenum;
+    readonly MAX_VARYING_VECTORS: GLenum;
+    readonly MAX_VERTEX_ATTRIBS: GLenum;
+    readonly MAX_VERTEX_TEXTURE_IMAGE_UNITS: GLenum;
+    readonly MAX_VERTEX_UNIFORM_VECTORS: GLenum;
+    readonly MAX_VIEWPORT_DIMS: GLenum;
+    readonly MEDIUM_FLOAT: GLenum;
+    readonly MEDIUM_INT: GLenum;
+    readonly MIRRORED_REPEAT: GLenum;
+    readonly NEAREST: GLenum;
+    readonly NEAREST_MIPMAP_LINEAR: GLenum;
+    readonly NEAREST_MIPMAP_NEAREST: GLenum;
+    readonly NEVER: GLenum;
+    readonly NICEST: GLenum;
+    readonly NONE: GLenum;
+    readonly NOTEQUAL: GLenum;
+    readonly NO_ERROR: GLenum;
+    readonly ONE: GLenum;
+    readonly ONE_MINUS_CONSTANT_ALPHA: GLenum;
+    readonly ONE_MINUS_CONSTANT_COLOR: GLenum;
+    readonly ONE_MINUS_DST_ALPHA: GLenum;
+    readonly ONE_MINUS_DST_COLOR: GLenum;
+    readonly ONE_MINUS_SRC_ALPHA: GLenum;
+    readonly ONE_MINUS_SRC_COLOR: GLenum;
+    readonly OUT_OF_MEMORY: GLenum;
+    readonly PACK_ALIGNMENT: GLenum;
+    readonly POINTS: GLenum;
+    readonly POLYGON_OFFSET_FACTOR: GLenum;
+    readonly POLYGON_OFFSET_FILL: GLenum;
+    readonly POLYGON_OFFSET_UNITS: GLenum;
+    readonly RED_BITS: GLenum;
+    readonly RENDERBUFFER: GLenum;
+    readonly RENDERBUFFER_ALPHA_SIZE: GLenum;
+    readonly RENDERBUFFER_BINDING: GLenum;
+    readonly RENDERBUFFER_BLUE_SIZE: GLenum;
+    readonly RENDERBUFFER_DEPTH_SIZE: GLenum;
+    readonly RENDERBUFFER_GREEN_SIZE: GLenum;
+    readonly RENDERBUFFER_HEIGHT: GLenum;
+    readonly RENDERBUFFER_INTERNAL_FORMAT: GLenum;
+    readonly RENDERBUFFER_RED_SIZE: GLenum;
+    readonly RENDERBUFFER_STENCIL_SIZE: GLenum;
+    readonly RENDERBUFFER_WIDTH: GLenum;
+    readonly RENDERER: GLenum;
+    readonly REPEAT: GLenum;
+    readonly REPLACE: GLenum;
+    readonly RGB: GLenum;
+    readonly RGB565: GLenum;
+    readonly RGB5_A1: GLenum;
+    readonly RGBA: GLenum;
+    readonly RGBA4: GLenum;
+    readonly SAMPLER_2D: GLenum;
+    readonly SAMPLER_CUBE: GLenum;
+    readonly SAMPLES: GLenum;
+    readonly SAMPLE_ALPHA_TO_COVERAGE: GLenum;
+    readonly SAMPLE_BUFFERS: GLenum;
+    readonly SAMPLE_COVERAGE: GLenum;
+    readonly SAMPLE_COVERAGE_INVERT: GLenum;
+    readonly SAMPLE_COVERAGE_VALUE: GLenum;
+    readonly SCISSOR_BOX: GLenum;
+    readonly SCISSOR_TEST: GLenum;
+    readonly SHADER_TYPE: GLenum;
+    readonly SHADING_LANGUAGE_VERSION: GLenum;
+    readonly SHORT: GLenum;
+    readonly SRC_ALPHA: GLenum;
+    readonly SRC_ALPHA_SATURATE: GLenum;
+    readonly SRC_COLOR: GLenum;
+    readonly STATIC_DRAW: GLenum;
+    readonly STENCIL_ATTACHMENT: GLenum;
+    readonly STENCIL_BACK_FAIL: GLenum;
+    readonly STENCIL_BACK_FUNC: GLenum;
+    readonly STENCIL_BACK_PASS_DEPTH_FAIL: GLenum;
+    readonly STENCIL_BACK_PASS_DEPTH_PASS: GLenum;
+    readonly STENCIL_BACK_REF: GLenum;
+    readonly STENCIL_BACK_VALUE_MASK: GLenum;
+    readonly STENCIL_BACK_WRITEMASK: GLenum;
+    readonly STENCIL_BITS: GLenum;
+    readonly STENCIL_BUFFER_BIT: GLenum;
+    readonly STENCIL_CLEAR_VALUE: GLenum;
+    readonly STENCIL_FAIL: GLenum;
+    readonly STENCIL_FUNC: GLenum;
+    readonly STENCIL_INDEX8: GLenum;
+    readonly STENCIL_PASS_DEPTH_FAIL: GLenum;
+    readonly STENCIL_PASS_DEPTH_PASS: GLenum;
+    readonly STENCIL_REF: GLenum;
+    readonly STENCIL_TEST: GLenum;
+    readonly STENCIL_VALUE_MASK: GLenum;
+    readonly STENCIL_WRITEMASK: GLenum;
+    readonly STREAM_DRAW: GLenum;
+    readonly SUBPIXEL_BITS: GLenum;
+    readonly TEXTURE: GLenum;
+    readonly TEXTURE0: GLenum;
+    readonly TEXTURE1: GLenum;
+    readonly TEXTURE10: GLenum;
+    readonly TEXTURE11: GLenum;
+    readonly TEXTURE12: GLenum;
+    readonly TEXTURE13: GLenum;
+    readonly TEXTURE14: GLenum;
+    readonly TEXTURE15: GLenum;
+    readonly TEXTURE16: GLenum;
+    readonly TEXTURE17: GLenum;
+    readonly TEXTURE18: GLenum;
+    readonly TEXTURE19: GLenum;
+    readonly TEXTURE2: GLenum;
+    readonly TEXTURE20: GLenum;
+    readonly TEXTURE21: GLenum;
+    readonly TEXTURE22: GLenum;
+    readonly TEXTURE23: GLenum;
+    readonly TEXTURE24: GLenum;
+    readonly TEXTURE25: GLenum;
+    readonly TEXTURE26: GLenum;
+    readonly TEXTURE27: GLenum;
+    readonly TEXTURE28: GLenum;
+    readonly TEXTURE29: GLenum;
+    readonly TEXTURE3: GLenum;
+    readonly TEXTURE30: GLenum;
+    readonly TEXTURE31: GLenum;
+    readonly TEXTURE4: GLenum;
+    readonly TEXTURE5: GLenum;
+    readonly TEXTURE6: GLenum;
+    readonly TEXTURE7: GLenum;
+    readonly TEXTURE8: GLenum;
+    readonly TEXTURE9: GLenum;
+    readonly TEXTURE_2D: GLenum;
+    readonly TEXTURE_BINDING_2D: GLenum;
+    readonly TEXTURE_BINDING_CUBE_MAP: GLenum;
+    readonly TEXTURE_CUBE_MAP: GLenum;
+    readonly TEXTURE_CUBE_MAP_NEGATIVE_X: GLenum;
+    readonly TEXTURE_CUBE_MAP_NEGATIVE_Y: GLenum;
+    readonly TEXTURE_CUBE_MAP_NEGATIVE_Z: GLenum;
+    readonly TEXTURE_CUBE_MAP_POSITIVE_X: GLenum;
+    readonly TEXTURE_CUBE_MAP_POSITIVE_Y: GLenum;
+    readonly TEXTURE_CUBE_MAP_POSITIVE_Z: GLenum;
+    readonly TEXTURE_MAG_FILTER: GLenum;
+    readonly TEXTURE_MIN_FILTER: GLenum;
+    readonly TEXTURE_WRAP_S: GLenum;
+    readonly TEXTURE_WRAP_T: GLenum;
+    readonly TRIANGLES: GLenum;
+    readonly TRIANGLE_FAN: GLenum;
+    readonly TRIANGLE_STRIP: GLenum;
+    readonly UNPACK_ALIGNMENT: GLenum;
+    readonly UNPACK_COLORSPACE_CONVERSION_WEBGL: GLenum;
+    readonly UNPACK_FLIP_Y_WEBGL: GLenum;
+    readonly UNPACK_PREMULTIPLY_ALPHA_WEBGL: GLenum;
+    readonly UNSIGNED_BYTE: GLenum;
+    readonly UNSIGNED_INT: GLenum;
+    readonly UNSIGNED_SHORT: GLenum;
+    readonly UNSIGNED_SHORT_4_4_4_4: GLenum;
+    readonly UNSIGNED_SHORT_5_5_5_1: GLenum;
+    readonly UNSIGNED_SHORT_5_6_5: GLenum;
+    readonly VALIDATE_STATUS: GLenum;
+    readonly VENDOR: GLenum;
+    readonly VERSION: GLenum;
+    readonly VERTEX_ATTRIB_ARRAY_BUFFER_BINDING: GLenum;
+    readonly VERTEX_ATTRIB_ARRAY_ENABLED: GLenum;
+    readonly VERTEX_ATTRIB_ARRAY_NORMALIZED: GLenum;
+    readonly VERTEX_ATTRIB_ARRAY_POINTER: GLenum;
+    readonly VERTEX_ATTRIB_ARRAY_SIZE: GLenum;
+    readonly VERTEX_ATTRIB_ARRAY_STRIDE: GLenum;
+    readonly VERTEX_ATTRIB_ARRAY_TYPE: GLenum;
+    readonly VERTEX_SHADER: GLenum;
+    readonly VIEWPORT: GLenum;
+    readonly ZERO: GLenum;
+    readonly ACTIVE_UNIFORM_BLOCKS: GLenum;
+    readonly ALREADY_SIGNALED: GLenum;
+    readonly ANY_SAMPLES_PASSED: GLenum;
+    readonly ANY_SAMPLES_PASSED_CONSERVATIVE: GLenum;
+    readonly COLOR: GLenum;
+    readonly COLOR_ATTACHMENT1: GLenum;
+    readonly COLOR_ATTACHMENT10: GLenum;
+    readonly COLOR_ATTACHMENT11: GLenum;
+    readonly COLOR_ATTACHMENT12: GLenum;
+    readonly COLOR_ATTACHMENT13: GLenum;
+    readonly COLOR_ATTACHMENT14: GLenum;
+    readonly COLOR_ATTACHMENT15: GLenum;
+    readonly COLOR_ATTACHMENT2: GLenum;
+    readonly COLOR_ATTACHMENT3: GLenum;
+    readonly COLOR_ATTACHMENT4: GLenum;
+    readonly COLOR_ATTACHMENT5: GLenum;
+    readonly COLOR_ATTACHMENT6: GLenum;
+    readonly COLOR_ATTACHMENT7: GLenum;
+    readonly COLOR_ATTACHMENT8: GLenum;
+    readonly COLOR_ATTACHMENT9: GLenum;
+    readonly COMPARE_REF_TO_TEXTURE: GLenum;
+    readonly CONDITION_SATISFIED: GLenum;
+    readonly COPY_READ_BUFFER: GLenum;
+    readonly COPY_READ_BUFFER_BINDING: GLenum;
+    readonly COPY_WRITE_BUFFER: GLenum;
+    readonly COPY_WRITE_BUFFER_BINDING: GLenum;
+    readonly CURRENT_QUERY: GLenum;
+    readonly DEPTH: GLenum;
+    readonly DEPTH24_STENCIL8: GLenum;
+    readonly DEPTH32F_STENCIL8: GLenum;
+    readonly DEPTH_COMPONENT24: GLenum;
+    readonly DEPTH_COMPONENT32F: GLenum;
+    readonly DRAW_BUFFER0: GLenum;
+    readonly DRAW_BUFFER1: GLenum;
+    readonly DRAW_BUFFER10: GLenum;
+    readonly DRAW_BUFFER11: GLenum;
+    readonly DRAW_BUFFER12: GLenum;
+    readonly DRAW_BUFFER13: GLenum;
+    readonly DRAW_BUFFER14: GLenum;
+    readonly DRAW_BUFFER15: GLenum;
+    readonly DRAW_BUFFER2: GLenum;
+    readonly DRAW_BUFFER3: GLenum;
+    readonly DRAW_BUFFER4: GLenum;
+    readonly DRAW_BUFFER5: GLenum;
+    readonly DRAW_BUFFER6: GLenum;
+    readonly DRAW_BUFFER7: GLenum;
+    readonly DRAW_BUFFER8: GLenum;
+    readonly DRAW_BUFFER9: GLenum;
+    readonly DRAW_FRAMEBUFFER: GLenum;
+    readonly DRAW_FRAMEBUFFER_BINDING: GLenum;
+    readonly DYNAMIC_COPY: GLenum;
+    readonly DYNAMIC_READ: GLenum;
+    readonly FLOAT_32_UNSIGNED_INT_24_8_REV: GLenum;
+    readonly FLOAT_MAT2x3: GLenum;
+    readonly FLOAT_MAT2x4: GLenum;
+    readonly FLOAT_MAT3x2: GLenum;
+    readonly FLOAT_MAT3x4: GLenum;
+    readonly FLOAT_MAT4x2: GLenum;
+    readonly FLOAT_MAT4x3: GLenum;
+    readonly FRAGMENT_SHADER_DERIVATIVE_HINT: GLenum;
+    readonly FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE: GLenum;
+    readonly FRAMEBUFFER_ATTACHMENT_BLUE_SIZE: GLenum;
+    readonly FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING: GLenum;
+    readonly FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE: GLenum;
+    readonly FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE: GLenum;
+    readonly FRAMEBUFFER_ATTACHMENT_GREEN_SIZE: GLenum;
+    readonly FRAMEBUFFER_ATTACHMENT_RED_SIZE: GLenum;
+    readonly FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE: GLenum;
+    readonly FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER: GLenum;
+    readonly FRAMEBUFFER_DEFAULT: GLenum;
+    readonly FRAMEBUFFER_INCOMPLETE_MULTISAMPLE: GLenum;
+    readonly HALF_FLOAT: GLenum;
+    readonly INTERLEAVED_ATTRIBS: GLenum;
+    readonly INT_2_10_10_10_REV: GLenum;
+    readonly INT_SAMPLER_2D: GLenum;
+    readonly INT_SAMPLER_2D_ARRAY: GLenum;
+    readonly INT_SAMPLER_3D: GLenum;
+    readonly INT_SAMPLER_CUBE: GLenum;
+    readonly INVALID_INDEX: GLenum;
+    readonly MAX: GLenum;
+    readonly MAX_3D_TEXTURE_SIZE: GLenum;
+    readonly MAX_ARRAY_TEXTURE_LAYERS: GLenum;
+    readonly MAX_CLIENT_WAIT_TIMEOUT_WEBGL: GLenum;
+    readonly MAX_COLOR_ATTACHMENTS: GLenum;
+    readonly MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS: GLenum;
+    readonly MAX_COMBINED_UNIFORM_BLOCKS: GLenum;
+    readonly MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS: GLenum;
+    readonly MAX_DRAW_BUFFERS: GLenum;
+    readonly MAX_ELEMENTS_INDICES: GLenum;
+    readonly MAX_ELEMENTS_VERTICES: GLenum;
+    readonly MAX_ELEMENT_INDEX: GLenum;
+    readonly MAX_FRAGMENT_INPUT_COMPONENTS: GLenum;
+    readonly MAX_FRAGMENT_UNIFORM_BLOCKS: GLenum;
+    readonly MAX_FRAGMENT_UNIFORM_COMPONENTS: GLenum;
+    readonly MAX_PROGRAM_TEXEL_OFFSET: GLenum;
+    readonly MAX_SAMPLES: GLenum;
+    readonly MAX_SERVER_WAIT_TIMEOUT: GLenum;
+    readonly MAX_TEXTURE_LOD_BIAS: GLenum;
+    readonly MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS: GLenum;
+    readonly MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS: GLenum;
+    readonly MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS: GLenum;
+    readonly MAX_UNIFORM_BLOCK_SIZE: GLenum;
+    readonly MAX_UNIFORM_BUFFER_BINDINGS: GLenum;
+    readonly MAX_VARYING_COMPONENTS: GLenum;
+    readonly MAX_VERTEX_OUTPUT_COMPONENTS: GLenum;
+    readonly MAX_VERTEX_UNIFORM_BLOCKS: GLenum;
+    readonly MAX_VERTEX_UNIFORM_COMPONENTS: GLenum;
+    readonly MIN: GLenum;
+    readonly MIN_PROGRAM_TEXEL_OFFSET: GLenum;
+    readonly OBJECT_TYPE: GLenum;
+    readonly PACK_ROW_LENGTH: GLenum;
+    readonly PACK_SKIP_PIXELS: GLenum;
+    readonly PACK_SKIP_ROWS: GLenum;
+    readonly PIXEL_PACK_BUFFER: GLenum;
+    readonly PIXEL_PACK_BUFFER_BINDING: GLenum;
+    readonly PIXEL_UNPACK_BUFFER: GLenum;
+    readonly PIXEL_UNPACK_BUFFER_BINDING: GLenum;
+    readonly QUERY_RESULT: GLenum;
+    readonly QUERY_RESULT_AVAILABLE: GLenum;
+    readonly R11F_G11F_B10F: GLenum;
+    readonly R16F: GLenum;
+    readonly R16I: GLenum;
+    readonly R16UI: GLenum;
+    readonly R32F: GLenum;
+    readonly R32I: GLenum;
+    readonly R32UI: GLenum;
+    readonly R8: GLenum;
+    readonly R8I: GLenum;
+    readonly R8UI: GLenum;
+    readonly R8_SNORM: GLenum;
+    readonly RASTERIZER_DISCARD: GLenum;
+    readonly READ_BUFFER: GLenum;
+    readonly READ_FRAMEBUFFER: GLenum;
+    readonly READ_FRAMEBUFFER_BINDING: GLenum;
+    readonly RED: GLenum;
+    readonly RED_INTEGER: GLenum;
+    readonly RENDERBUFFER_SAMPLES: GLenum;
+    readonly RG: GLenum;
+    readonly RG16F: GLenum;
+    readonly RG16I: GLenum;
+    readonly RG16UI: GLenum;
+    readonly RG32F: GLenum;
+    readonly RG32I: GLenum;
+    readonly RG32UI: GLenum;
+    readonly RG8: GLenum;
+    readonly RG8I: GLenum;
+    readonly RG8UI: GLenum;
+    readonly RG8_SNORM: GLenum;
+    readonly RGB10_A2: GLenum;
+    readonly RGB10_A2UI: GLenum;
+    readonly RGB16F: GLenum;
+    readonly RGB16I: GLenum;
+    readonly RGB16UI: GLenum;
+    readonly RGB32F: GLenum;
+    readonly RGB32I: GLenum;
+    readonly RGB32UI: GLenum;
+    readonly RGB8: GLenum;
+    readonly RGB8I: GLenum;
+    readonly RGB8UI: GLenum;
+    readonly RGB8_SNORM: GLenum;
+    readonly RGB9_E5: GLenum;
+    readonly RGBA16F: GLenum;
+    readonly RGBA16I: GLenum;
+    readonly RGBA16UI: GLenum;
+    readonly RGBA32F: GLenum;
+    readonly RGBA32I: GLenum;
+    readonly RGBA32UI: GLenum;
+    readonly RGBA8: GLenum;
+    readonly RGBA8I: GLenum;
+    readonly RGBA8UI: GLenum;
+    readonly RGBA8_SNORM: GLenum;
+    readonly RGBA_INTEGER: GLenum;
+    readonly RGB_INTEGER: GLenum;
+    readonly RG_INTEGER: GLenum;
+    readonly SAMPLER_2D_ARRAY: GLenum;
+    readonly SAMPLER_2D_ARRAY_SHADOW: GLenum;
+    readonly SAMPLER_2D_SHADOW: GLenum;
+    readonly SAMPLER_3D: GLenum;
+    readonly SAMPLER_BINDING: GLenum;
+    readonly SAMPLER_CUBE_SHADOW: GLenum;
+    readonly SEPARATE_ATTRIBS: GLenum;
+    readonly SIGNALED: GLenum;
+    readonly SIGNED_NORMALIZED: GLenum;
+    readonly SRGB: GLenum;
+    readonly SRGB8: GLenum;
+    readonly SRGB8_ALPHA8: GLenum;
+    readonly STATIC_COPY: GLenum;
+    readonly STATIC_READ: GLenum;
+    readonly STENCIL: GLenum;
+    readonly STREAM_COPY: GLenum;
+    readonly STREAM_READ: GLenum;
+    readonly SYNC_CONDITION: GLenum;
+    readonly SYNC_FENCE: GLenum;
+    readonly SYNC_FLAGS: GLenum;
+    readonly SYNC_FLUSH_COMMANDS_BIT: GLenum;
+    readonly SYNC_GPU_COMMANDS_COMPLETE: GLenum;
+    readonly SYNC_STATUS: GLenum;
+    readonly TEXTURE_2D_ARRAY: GLenum;
+    readonly TEXTURE_3D: GLenum;
+    readonly TEXTURE_BASE_LEVEL: GLenum;
+    readonly TEXTURE_BINDING_2D_ARRAY: GLenum;
+    readonly TEXTURE_BINDING_3D: GLenum;
+    readonly TEXTURE_COMPARE_FUNC: GLenum;
+    readonly TEXTURE_COMPARE_MODE: GLenum;
+    readonly TEXTURE_IMMUTABLE_FORMAT: GLenum;
+    readonly TEXTURE_IMMUTABLE_LEVELS: GLenum;
+    readonly TEXTURE_MAX_LEVEL: GLenum;
+    readonly TEXTURE_MAX_LOD: GLenum;
+    readonly TEXTURE_MIN_LOD: GLenum;
+    readonly TEXTURE_WRAP_R: GLenum;
+    readonly TIMEOUT_EXPIRED: GLenum;
+    readonly TIMEOUT_IGNORED: GLint64;
+    readonly TRANSFORM_FEEDBACK: GLenum;
+    readonly TRANSFORM_FEEDBACK_ACTIVE: GLenum;
+    readonly TRANSFORM_FEEDBACK_BINDING: GLenum;
+    readonly TRANSFORM_FEEDBACK_BUFFER: GLenum;
+    readonly TRANSFORM_FEEDBACK_BUFFER_BINDING: GLenum;
+    readonly TRANSFORM_FEEDBACK_BUFFER_MODE: GLenum;
+    readonly TRANSFORM_FEEDBACK_BUFFER_SIZE: GLenum;
+    readonly TRANSFORM_FEEDBACK_BUFFER_START: GLenum;
+    readonly TRANSFORM_FEEDBACK_PAUSED: GLenum;
+    readonly TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN: GLenum;
+    readonly TRANSFORM_FEEDBACK_VARYINGS: GLenum;
+    readonly UNIFORM_ARRAY_STRIDE: GLenum;
+    readonly UNIFORM_BLOCK_ACTIVE_UNIFORMS: GLenum;
+    readonly UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES: GLenum;
+    readonly UNIFORM_BLOCK_BINDING: GLenum;
+    readonly UNIFORM_BLOCK_DATA_SIZE: GLenum;
+    readonly UNIFORM_BLOCK_INDEX: GLenum;
+    readonly UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER: GLenum;
+    readonly UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER: GLenum;
+    readonly UNIFORM_BUFFER: GLenum;
+    readonly UNIFORM_BUFFER_BINDING: GLenum;
+    readonly UNIFORM_BUFFER_OFFSET_ALIGNMENT: GLenum;
+    readonly UNIFORM_BUFFER_SIZE: GLenum;
+    readonly UNIFORM_BUFFER_START: GLenum;
+    readonly UNIFORM_IS_ROW_MAJOR: GLenum;
+    readonly UNIFORM_MATRIX_STRIDE: GLenum;
+    readonly UNIFORM_OFFSET: GLenum;
+    readonly UNIFORM_SIZE: GLenum;
+    readonly UNIFORM_TYPE: GLenum;
+    readonly UNPACK_IMAGE_HEIGHT: GLenum;
+    readonly UNPACK_ROW_LENGTH: GLenum;
+    readonly UNPACK_SKIP_IMAGES: GLenum;
+    readonly UNPACK_SKIP_PIXELS: GLenum;
+    readonly UNPACK_SKIP_ROWS: GLenum;
+    readonly UNSIGNALED: GLenum;
+    readonly UNSIGNED_INT_10F_11F_11F_REV: GLenum;
+    readonly UNSIGNED_INT_24_8: GLenum;
+    readonly UNSIGNED_INT_2_10_10_10_REV: GLenum;
+    readonly UNSIGNED_INT_5_9_9_9_REV: GLenum;
+    readonly UNSIGNED_INT_SAMPLER_2D: GLenum;
+    readonly UNSIGNED_INT_SAMPLER_2D_ARRAY: GLenum;
+    readonly UNSIGNED_INT_SAMPLER_3D: GLenum;
+    readonly UNSIGNED_INT_SAMPLER_CUBE: GLenum;
+    readonly UNSIGNED_INT_VEC2: GLenum;
+    readonly UNSIGNED_INT_VEC3: GLenum;
+    readonly UNSIGNED_INT_VEC4: GLenum;
+    readonly UNSIGNED_NORMALIZED: GLenum;
+    readonly VERTEX_ARRAY_BINDING: GLenum;
+    readonly VERTEX_ATTRIB_ARRAY_DIVISOR: GLenum;
+    readonly VERTEX_ATTRIB_ARRAY_INTEGER: GLenum;
+    readonly WAIT_FAILED: GLenum;
+};
+
+interface WebGL2RenderingContextBase {
+    beginQuery(target: GLenum, query: WebGLQuery): void;
+    beginTransformFeedback(primitiveMode: GLenum): void;
+    bindBufferBase(target: GLenum, index: GLuint, buffer: WebGLBuffer | null): void;
+    bindBufferRange(target: GLenum, index: GLuint, buffer: WebGLBuffer | null, offset: GLintptr, size: GLsizeiptr): void;
+    bindSampler(unit: GLuint, sampler: WebGLSampler | null): void;
+    bindTransformFeedback(target: GLenum, tf: WebGLTransformFeedback | null): void;
+    bindVertexArray(array: WebGLVertexArrayObject | null): void;
+    blitFramebuffer(srcX0: GLint, srcY0: GLint, srcX1: GLint, srcY1: GLint, dstX0: GLint, dstY0: GLint, dstX1: GLint, dstY1: GLint, mask: GLbitfield, filter: GLenum): void;
+    clearBufferfi(buffer: GLenum, drawbuffer: GLint, depth: GLfloat, stencil: GLint): void;
+    clearBufferfv(buffer: GLenum, drawbuffer: GLint, values: Float32List, srcOffset?: GLuint): void;
+    clearBufferiv(buffer: GLenum, drawbuffer: GLint, values: Int32List, srcOffset?: GLuint): void;
+    clearBufferuiv(buffer: GLenum, drawbuffer: GLint, values: Uint32List, srcOffset?: GLuint): void;
+    clientWaitSync(sync: WebGLSync, flags: GLbitfield, timeout: GLuint64): GLenum;
+    compressedTexImage3D(target: GLenum, level: GLint, internalformat: GLenum, width: GLsizei, height: GLsizei, depth: GLsizei, border: GLint, imageSize: GLsizei, offset: GLintptr): void;
+    compressedTexImage3D(target: GLenum, level: GLint, internalformat: GLenum, width: GLsizei, height: GLsizei, depth: GLsizei, border: GLint, srcData: ArrayBufferView, srcOffset?: GLuint, srcLengthOverride?: GLuint): void;
+    compressedTexSubImage3D(target: GLenum, level: GLint, xoffset: GLint, yoffset: GLint, zoffset: GLint, width: GLsizei, height: GLsizei, depth: GLsizei, format: GLenum, imageSize: GLsizei, offset: GLintptr): void;
+    compressedTexSubImage3D(target: GLenum, level: GLint, xoffset: GLint, yoffset: GLint, zoffset: GLint, width: GLsizei, height: GLsizei, depth: GLsizei, format: GLenum, srcData: ArrayBufferView, srcOffset?: GLuint, srcLengthOverride?: GLuint): void;
+    copyBufferSubData(readTarget: GLenum, writeTarget: GLenum, readOffset: GLintptr, writeOffset: GLintptr, size: GLsizeiptr): void;
+    copyTexSubImage3D(target: GLenum, level: GLint, xoffset: GLint, yoffset: GLint, zoffset: GLint, x: GLint, y: GLint, width: GLsizei, height: GLsizei): void;
+    createQuery(): WebGLQuery | null;
+    createSampler(): WebGLSampler | null;
+    createTransformFeedback(): WebGLTransformFeedback | null;
+    createVertexArray(): WebGLVertexArrayObject | null;
+    deleteQuery(query: WebGLQuery | null): void;
+    deleteSampler(sampler: WebGLSampler | null): void;
+    deleteSync(sync: WebGLSync | null): void;
+    deleteTransformFeedback(tf: WebGLTransformFeedback | null): void;
+    deleteVertexArray(vertexArray: WebGLVertexArrayObject | null): void;
+    drawArraysInstanced(mode: GLenum, first: GLint, count: GLsizei, instanceCount: GLsizei): void;
+    drawBuffers(buffers: GLenum[]): void;
+    drawElementsInstanced(mode: GLenum, count: GLsizei, type: GLenum, offset: GLintptr, instanceCount: GLsizei): void;
+    drawRangeElements(mode: GLenum, start: GLuint, end: GLuint, count: GLsizei, type: GLenum, offset: GLintptr): void;
+    endQuery(target: GLenum): void;
+    endTransformFeedback(): void;
+    fenceSync(condition: GLenum, flags: GLbitfield): WebGLSync | null;
+    framebufferTextureLayer(target: GLenum, attachment: GLenum, texture: WebGLTexture | null, level: GLint, layer: GLint): void;
+    getActiveUniformBlockName(program: WebGLProgram, uniformBlockIndex: GLuint): string | null;
+    getActiveUniformBlockParameter(program: WebGLProgram, uniformBlockIndex: GLuint, pname: GLenum): any;
+    getActiveUniforms(program: WebGLProgram, uniformIndices: GLuint[], pname: GLenum): any;
+    getBufferSubData(target: GLenum, srcByteOffset: GLintptr, dstBuffer: ArrayBufferView, dstOffset?: GLuint, length?: GLuint): void;
+    getFragDataLocation(program: WebGLProgram, name: string): GLint;
+    getIndexedParameter(target: GLenum, index: GLuint): any;
+    getInternalformatParameter(target: GLenum, internalformat: GLenum, pname: GLenum): any;
+    getQuery(target: GLenum, pname: GLenum): WebGLQuery | null;
+    getQueryParameter(query: WebGLQuery, pname: GLenum): any;
+    getSamplerParameter(sampler: WebGLSampler, pname: GLenum): any;
+    getSyncParameter(sync: WebGLSync, pname: GLenum): any;
+    getTransformFeedbackVarying(program: WebGLProgram, index: GLuint): WebGLActiveInfo | null;
+    getUniformBlockIndex(program: WebGLProgram, uniformBlockName: string): GLuint;
+    getUniformIndices(program: WebGLProgram, uniformNames: string[]): GLuint[] | null;
+    invalidateFramebuffer(target: GLenum, attachments: GLenum[]): void;
+    invalidateSubFramebuffer(target: GLenum, attachments: GLenum[], x: GLint, y: GLint, width: GLsizei, height: GLsizei): void;
+    isQuery(query: WebGLQuery | null): GLboolean;
+    isSampler(sampler: WebGLSampler | null): GLboolean;
+    isSync(sync: WebGLSync | null): GLboolean;
+    isTransformFeedback(tf: WebGLTransformFeedback | null): GLboolean;
+    isVertexArray(vertexArray: WebGLVertexArrayObject | null): GLboolean;
+    pauseTransformFeedback(): void;
+    readBuffer(src: GLenum): void;
+    renderbufferStorageMultisample(target: GLenum, samples: GLsizei, internalformat: GLenum, width: GLsizei, height: GLsizei): void;
+    resumeTransformFeedback(): void;
+    samplerParameterf(sampler: WebGLSampler, pname: GLenum, param: GLfloat): void;
+    samplerParameteri(sampler: WebGLSampler, pname: GLenum, param: GLint): void;
+    texImage3D(target: GLenum, level: GLint, internalformat: GLint, width: GLsizei, height: GLsizei, depth: GLsizei, border: GLint, format: GLenum, type: GLenum, pboOffset: GLintptr): void;
+    texImage3D(target: GLenum, level: GLint, internalformat: GLint, width: GLsizei, height: GLsizei, depth: GLsizei, border: GLint, format: GLenum, type: GLenum, source: TexImageSource): void;
+    texImage3D(target: GLenum, level: GLint, internalformat: GLint, width: GLsizei, height: GLsizei, depth: GLsizei, border: GLint, format: GLenum, type: GLenum, srcData: ArrayBufferView | null): void;
+    texImage3D(target: GLenum, level: GLint, internalformat: GLint, width: GLsizei, height: GLsizei, depth: GLsizei, border: GLint, format: GLenum, type: GLenum, srcData: ArrayBufferView, srcOffset: GLuint): void;
+    texStorage2D(target: GLenum, levels: GLsizei, internalformat: GLenum, width: GLsizei, height: GLsizei): void;
+    texStorage3D(target: GLenum, levels: GLsizei, internalformat: GLenum, width: GLsizei, height: GLsizei, depth: GLsizei): void;
+    texSubImage3D(target: GLenum, level: GLint, xoffset: GLint, yoffset: GLint, zoffset: GLint, width: GLsizei, height: GLsizei, depth: GLsizei, format: GLenum, type: GLenum, pboOffset: GLintptr): void;
+    texSubImage3D(target: GLenum, level: GLint, xoffset: GLint, yoffset: GLint, zoffset: GLint, width: GLsizei, height: GLsizei, depth: GLsizei, format: GLenum, type: GLenum, source: TexImageSource): void;
+    texSubImage3D(target: GLenum, level: GLint, xoffset: GLint, yoffset: GLint, zoffset: GLint, width: GLsizei, height: GLsizei, depth: GLsizei, format: GLenum, type: GLenum, srcData: ArrayBufferView | null, srcOffset?: GLuint): void;
+    transformFeedbackVaryings(program: WebGLProgram, varyings: string[], bufferMode: GLenum): void;
+    uniform1ui(location: WebGLUniformLocation | null, v0: GLuint): void;
+    uniform1uiv(location: WebGLUniformLocation | null, data: Uint32List, srcOffset?: GLuint, srcLength?: GLuint): void;
+    uniform2ui(location: WebGLUniformLocation | null, v0: GLuint, v1: GLuint): void;
+    uniform2uiv(location: WebGLUniformLocation | null, data: Uint32List, srcOffset?: GLuint, srcLength?: GLuint): void;
+    uniform3ui(location: WebGLUniformLocation | null, v0: GLuint, v1: GLuint, v2: GLuint): void;
+    uniform3uiv(location: WebGLUniformLocation | null, data: Uint32List, srcOffset?: GLuint, srcLength?: GLuint): void;
+    uniform4ui(location: WebGLUniformLocation | null, v0: GLuint, v1: GLuint, v2: GLuint, v3: GLuint): void;
+    uniform4uiv(location: WebGLUniformLocation | null, data: Uint32List, srcOffset?: GLuint, srcLength?: GLuint): void;
+    uniformBlockBinding(program: WebGLProgram, uniformBlockIndex: GLuint, uniformBlockBinding: GLuint): void;
+    uniformMatrix2x3fv(location: WebGLUniformLocation | null, transpose: GLboolean, data: Float32List, srcOffset?: GLuint, srcLength?: GLuint): void;
+    uniformMatrix2x4fv(location: WebGLUniformLocation | null, transpose: GLboolean, data: Float32List, srcOffset?: GLuint, srcLength?: GLuint): void;
+    uniformMatrix3x2fv(location: WebGLUniformLocation | null, transpose: GLboolean, data: Float32List, srcOffset?: GLuint, srcLength?: GLuint): void;
+    uniformMatrix3x4fv(location: WebGLUniformLocation | null, transpose: GLboolean, data: Float32List, srcOffset?: GLuint, srcLength?: GLuint): void;
+    uniformMatrix4x2fv(location: WebGLUniformLocation | null, transpose: GLboolean, data: Float32List, srcOffset?: GLuint, srcLength?: GLuint): void;
+    uniformMatrix4x3fv(location: WebGLUniformLocation | null, transpose: GLboolean, data: Float32List, srcOffset?: GLuint, srcLength?: GLuint): void;
+    vertexAttribDivisor(index: GLuint, divisor: GLuint): void;
+    vertexAttribI4i(index: GLuint, x: GLint, y: GLint, z: GLint, w: GLint): void;
+    vertexAttribI4iv(index: GLuint, values: Int32List): void;
+    vertexAttribI4ui(index: GLuint, x: GLuint, y: GLuint, z: GLuint, w: GLuint): void;
+    vertexAttribI4uiv(index: GLuint, values: Uint32List): void;
+    vertexAttribIPointer(index: GLuint, size: GLint, type: GLenum, stride: GLsizei, offset: GLintptr): void;
+    waitSync(sync: WebGLSync, flags: GLbitfield, timeout: GLint64): void;
+    readonly ACTIVE_UNIFORM_BLOCKS: GLenum;
+    readonly ALREADY_SIGNALED: GLenum;
+    readonly ANY_SAMPLES_PASSED: GLenum;
+    readonly ANY_SAMPLES_PASSED_CONSERVATIVE: GLenum;
+    readonly COLOR: GLenum;
+    readonly COLOR_ATTACHMENT1: GLenum;
+    readonly COLOR_ATTACHMENT10: GLenum;
+    readonly COLOR_ATTACHMENT11: GLenum;
+    readonly COLOR_ATTACHMENT12: GLenum;
+    readonly COLOR_ATTACHMENT13: GLenum;
+    readonly COLOR_ATTACHMENT14: GLenum;
+    readonly COLOR_ATTACHMENT15: GLenum;
+    readonly COLOR_ATTACHMENT2: GLenum;
+    readonly COLOR_ATTACHMENT3: GLenum;
+    readonly COLOR_ATTACHMENT4: GLenum;
+    readonly COLOR_ATTACHMENT5: GLenum;
+    readonly COLOR_ATTACHMENT6: GLenum;
+    readonly COLOR_ATTACHMENT7: GLenum;
+    readonly COLOR_ATTACHMENT8: GLenum;
+    readonly COLOR_ATTACHMENT9: GLenum;
+    readonly COMPARE_REF_TO_TEXTURE: GLenum;
+    readonly CONDITION_SATISFIED: GLenum;
+    readonly COPY_READ_BUFFER: GLenum;
+    readonly COPY_READ_BUFFER_BINDING: GLenum;
+    readonly COPY_WRITE_BUFFER: GLenum;
+    readonly COPY_WRITE_BUFFER_BINDING: GLenum;
+    readonly CURRENT_QUERY: GLenum;
+    readonly DEPTH: GLenum;
+    readonly DEPTH24_STENCIL8: GLenum;
+    readonly DEPTH32F_STENCIL8: GLenum;
+    readonly DEPTH_COMPONENT24: GLenum;
+    readonly DEPTH_COMPONENT32F: GLenum;
+    readonly DRAW_BUFFER0: GLenum;
+    readonly DRAW_BUFFER1: GLenum;
+    readonly DRAW_BUFFER10: GLenum;
+    readonly DRAW_BUFFER11: GLenum;
+    readonly DRAW_BUFFER12: GLenum;
+    readonly DRAW_BUFFER13: GLenum;
+    readonly DRAW_BUFFER14: GLenum;
+    readonly DRAW_BUFFER15: GLenum;
+    readonly DRAW_BUFFER2: GLenum;
+    readonly DRAW_BUFFER3: GLenum;
+    readonly DRAW_BUFFER4: GLenum;
+    readonly DRAW_BUFFER5: GLenum;
+    readonly DRAW_BUFFER6: GLenum;
+    readonly DRAW_BUFFER7: GLenum;
+    readonly DRAW_BUFFER8: GLenum;
+    readonly DRAW_BUFFER9: GLenum;
+    readonly DRAW_FRAMEBUFFER: GLenum;
+    readonly DRAW_FRAMEBUFFER_BINDING: GLenum;
+    readonly DYNAMIC_COPY: GLenum;
+    readonly DYNAMIC_READ: GLenum;
+    readonly FLOAT_32_UNSIGNED_INT_24_8_REV: GLenum;
+    readonly FLOAT_MAT2x3: GLenum;
+    readonly FLOAT_MAT2x4: GLenum;
+    readonly FLOAT_MAT3x2: GLenum;
+    readonly FLOAT_MAT3x4: GLenum;
+    readonly FLOAT_MAT4x2: GLenum;
+    readonly FLOAT_MAT4x3: GLenum;
+    readonly FRAGMENT_SHADER_DERIVATIVE_HINT: GLenum;
+    readonly FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE: GLenum;
+    readonly FRAMEBUFFER_ATTACHMENT_BLUE_SIZE: GLenum;
+    readonly FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING: GLenum;
+    readonly FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE: GLenum;
+    readonly FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE: GLenum;
+    readonly FRAMEBUFFER_ATTACHMENT_GREEN_SIZE: GLenum;
+    readonly FRAMEBUFFER_ATTACHMENT_RED_SIZE: GLenum;
+    readonly FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE: GLenum;
+    readonly FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER: GLenum;
+    readonly FRAMEBUFFER_DEFAULT: GLenum;
+    readonly FRAMEBUFFER_INCOMPLETE_MULTISAMPLE: GLenum;
+    readonly HALF_FLOAT: GLenum;
+    readonly INTERLEAVED_ATTRIBS: GLenum;
+    readonly INT_2_10_10_10_REV: GLenum;
+    readonly INT_SAMPLER_2D: GLenum;
+    readonly INT_SAMPLER_2D_ARRAY: GLenum;
+    readonly INT_SAMPLER_3D: GLenum;
+    readonly INT_SAMPLER_CUBE: GLenum;
+    readonly INVALID_INDEX: GLenum;
+    readonly MAX: GLenum;
+    readonly MAX_3D_TEXTURE_SIZE: GLenum;
+    readonly MAX_ARRAY_TEXTURE_LAYERS: GLenum;
+    readonly MAX_CLIENT_WAIT_TIMEOUT_WEBGL: GLenum;
+    readonly MAX_COLOR_ATTACHMENTS: GLenum;
+    readonly MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS: GLenum;
+    readonly MAX_COMBINED_UNIFORM_BLOCKS: GLenum;
+    readonly MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS: GLenum;
+    readonly MAX_DRAW_BUFFERS: GLenum;
+    readonly MAX_ELEMENTS_INDICES: GLenum;
+    readonly MAX_ELEMENTS_VERTICES: GLenum;
+    readonly MAX_ELEMENT_INDEX: GLenum;
+    readonly MAX_FRAGMENT_INPUT_COMPONENTS: GLenum;
+    readonly MAX_FRAGMENT_UNIFORM_BLOCKS: GLenum;
+    readonly MAX_FRAGMENT_UNIFORM_COMPONENTS: GLenum;
+    readonly MAX_PROGRAM_TEXEL_OFFSET: GLenum;
+    readonly MAX_SAMPLES: GLenum;
+    readonly MAX_SERVER_WAIT_TIMEOUT: GLenum;
+    readonly MAX_TEXTURE_LOD_BIAS: GLenum;
+    readonly MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS: GLenum;
+    readonly MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS: GLenum;
+    readonly MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS: GLenum;
+    readonly MAX_UNIFORM_BLOCK_SIZE: GLenum;
+    readonly MAX_UNIFORM_BUFFER_BINDINGS: GLenum;
+    readonly MAX_VARYING_COMPONENTS: GLenum;
+    readonly MAX_VERTEX_OUTPUT_COMPONENTS: GLenum;
+    readonly MAX_VERTEX_UNIFORM_BLOCKS: GLenum;
+    readonly MAX_VERTEX_UNIFORM_COMPONENTS: GLenum;
+    readonly MIN: GLenum;
+    readonly MIN_PROGRAM_TEXEL_OFFSET: GLenum;
+    readonly OBJECT_TYPE: GLenum;
+    readonly PACK_ROW_LENGTH: GLenum;
+    readonly PACK_SKIP_PIXELS: GLenum;
+    readonly PACK_SKIP_ROWS: GLenum;
+    readonly PIXEL_PACK_BUFFER: GLenum;
+    readonly PIXEL_PACK_BUFFER_BINDING: GLenum;
+    readonly PIXEL_UNPACK_BUFFER: GLenum;
+    readonly PIXEL_UNPACK_BUFFER_BINDING: GLenum;
+    readonly QUERY_RESULT: GLenum;
+    readonly QUERY_RESULT_AVAILABLE: GLenum;
+    readonly R11F_G11F_B10F: GLenum;
+    readonly R16F: GLenum;
+    readonly R16I: GLenum;
+    readonly R16UI: GLenum;
+    readonly R32F: GLenum;
+    readonly R32I: GLenum;
+    readonly R32UI: GLenum;
+    readonly R8: GLenum;
+    readonly R8I: GLenum;
+    readonly R8UI: GLenum;
+    readonly R8_SNORM: GLenum;
+    readonly RASTERIZER_DISCARD: GLenum;
+    readonly READ_BUFFER: GLenum;
+    readonly READ_FRAMEBUFFER: GLenum;
+    readonly READ_FRAMEBUFFER_BINDING: GLenum;
+    readonly RED: GLenum;
+    readonly RED_INTEGER: GLenum;
+    readonly RENDERBUFFER_SAMPLES: GLenum;
+    readonly RG: GLenum;
+    readonly RG16F: GLenum;
+    readonly RG16I: GLenum;
+    readonly RG16UI: GLenum;
+    readonly RG32F: GLenum;
+    readonly RG32I: GLenum;
+    readonly RG32UI: GLenum;
+    readonly RG8: GLenum;
+    readonly RG8I: GLenum;
+    readonly RG8UI: GLenum;
+    readonly RG8_SNORM: GLenum;
+    readonly RGB10_A2: GLenum;
+    readonly RGB10_A2UI: GLenum;
+    readonly RGB16F: GLenum;
+    readonly RGB16I: GLenum;
+    readonly RGB16UI: GLenum;
+    readonly RGB32F: GLenum;
+    readonly RGB32I: GLenum;
+    readonly RGB32UI: GLenum;
+    readonly RGB8: GLenum;
+    readonly RGB8I: GLenum;
+    readonly RGB8UI: GLenum;
+    readonly RGB8_SNORM: GLenum;
+    readonly RGB9_E5: GLenum;
+    readonly RGBA16F: GLenum;
+    readonly RGBA16I: GLenum;
+    readonly RGBA16UI: GLenum;
+    readonly RGBA32F: GLenum;
+    readonly RGBA32I: GLenum;
+    readonly RGBA32UI: GLenum;
+    readonly RGBA8: GLenum;
+    readonly RGBA8I: GLenum;
+    readonly RGBA8UI: GLenum;
+    readonly RGBA8_SNORM: GLenum;
+    readonly RGBA_INTEGER: GLenum;
+    readonly RGB_INTEGER: GLenum;
+    readonly RG_INTEGER: GLenum;
+    readonly SAMPLER_2D_ARRAY: GLenum;
+    readonly SAMPLER_2D_ARRAY_SHADOW: GLenum;
+    readonly SAMPLER_2D_SHADOW: GLenum;
+    readonly SAMPLER_3D: GLenum;
+    readonly SAMPLER_BINDING: GLenum;
+    readonly SAMPLER_CUBE_SHADOW: GLenum;
+    readonly SEPARATE_ATTRIBS: GLenum;
+    readonly SIGNALED: GLenum;
+    readonly SIGNED_NORMALIZED: GLenum;
+    readonly SRGB: GLenum;
+    readonly SRGB8: GLenum;
+    readonly SRGB8_ALPHA8: GLenum;
+    readonly STATIC_COPY: GLenum;
+    readonly STATIC_READ: GLenum;
+    readonly STENCIL: GLenum;
+    readonly STREAM_COPY: GLenum;
+    readonly STREAM_READ: GLenum;
+    readonly SYNC_CONDITION: GLenum;
+    readonly SYNC_FENCE: GLenum;
+    readonly SYNC_FLAGS: GLenum;
+    readonly SYNC_FLUSH_COMMANDS_BIT: GLenum;
+    readonly SYNC_GPU_COMMANDS_COMPLETE: GLenum;
+    readonly SYNC_STATUS: GLenum;
+    readonly TEXTURE_2D_ARRAY: GLenum;
+    readonly TEXTURE_3D: GLenum;
+    readonly TEXTURE_BASE_LEVEL: GLenum;
+    readonly TEXTURE_BINDING_2D_ARRAY: GLenum;
+    readonly TEXTURE_BINDING_3D: GLenum;
+    readonly TEXTURE_COMPARE_FUNC: GLenum;
+    readonly TEXTURE_COMPARE_MODE: GLenum;
+    readonly TEXTURE_IMMUTABLE_FORMAT: GLenum;
+    readonly TEXTURE_IMMUTABLE_LEVELS: GLenum;
+    readonly TEXTURE_MAX_LEVEL: GLenum;
+    readonly TEXTURE_MAX_LOD: GLenum;
+    readonly TEXTURE_MIN_LOD: GLenum;
+    readonly TEXTURE_WRAP_R: GLenum;
+    readonly TIMEOUT_EXPIRED: GLenum;
+    readonly TIMEOUT_IGNORED: GLint64;
+    readonly TRANSFORM_FEEDBACK: GLenum;
+    readonly TRANSFORM_FEEDBACK_ACTIVE: GLenum;
+    readonly TRANSFORM_FEEDBACK_BINDING: GLenum;
+    readonly TRANSFORM_FEEDBACK_BUFFER: GLenum;
+    readonly TRANSFORM_FEEDBACK_BUFFER_BINDING: GLenum;
+    readonly TRANSFORM_FEEDBACK_BUFFER_MODE: GLenum;
+    readonly TRANSFORM_FEEDBACK_BUFFER_SIZE: GLenum;
+    readonly TRANSFORM_FEEDBACK_BUFFER_START: GLenum;
+    readonly TRANSFORM_FEEDBACK_PAUSED: GLenum;
+    readonly TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN: GLenum;
+    readonly TRANSFORM_FEEDBACK_VARYINGS: GLenum;
+    readonly UNIFORM_ARRAY_STRIDE: GLenum;
+    readonly UNIFORM_BLOCK_ACTIVE_UNIFORMS: GLenum;
+    readonly UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES: GLenum;
+    readonly UNIFORM_BLOCK_BINDING: GLenum;
+    readonly UNIFORM_BLOCK_DATA_SIZE: GLenum;
+    readonly UNIFORM_BLOCK_INDEX: GLenum;
+    readonly UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER: GLenum;
+    readonly UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER: GLenum;
+    readonly UNIFORM_BUFFER: GLenum;
+    readonly UNIFORM_BUFFER_BINDING: GLenum;
+    readonly UNIFORM_BUFFER_OFFSET_ALIGNMENT: GLenum;
+    readonly UNIFORM_BUFFER_SIZE: GLenum;
+    readonly UNIFORM_BUFFER_START: GLenum;
+    readonly UNIFORM_IS_ROW_MAJOR: GLenum;
+    readonly UNIFORM_MATRIX_STRIDE: GLenum;
+    readonly UNIFORM_OFFSET: GLenum;
+    readonly UNIFORM_SIZE: GLenum;
+    readonly UNIFORM_TYPE: GLenum;
+    readonly UNPACK_IMAGE_HEIGHT: GLenum;
+    readonly UNPACK_ROW_LENGTH: GLenum;
+    readonly UNPACK_SKIP_IMAGES: GLenum;
+    readonly UNPACK_SKIP_PIXELS: GLenum;
+    readonly UNPACK_SKIP_ROWS: GLenum;
+    readonly UNSIGNALED: GLenum;
+    readonly UNSIGNED_INT_10F_11F_11F_REV: GLenum;
+    readonly UNSIGNED_INT_24_8: GLenum;
+    readonly UNSIGNED_INT_2_10_10_10_REV: GLenum;
+    readonly UNSIGNED_INT_5_9_9_9_REV: GLenum;
+    readonly UNSIGNED_INT_SAMPLER_2D: GLenum;
+    readonly UNSIGNED_INT_SAMPLER_2D_ARRAY: GLenum;
+    readonly UNSIGNED_INT_SAMPLER_3D: GLenum;
+    readonly UNSIGNED_INT_SAMPLER_CUBE: GLenum;
+    readonly UNSIGNED_INT_VEC2: GLenum;
+    readonly UNSIGNED_INT_VEC3: GLenum;
+    readonly UNSIGNED_INT_VEC4: GLenum;
+    readonly UNSIGNED_NORMALIZED: GLenum;
+    readonly VERTEX_ARRAY_BINDING: GLenum;
+    readonly VERTEX_ATTRIB_ARRAY_DIVISOR: GLenum;
+    readonly VERTEX_ATTRIB_ARRAY_INTEGER: GLenum;
+    readonly WAIT_FAILED: GLenum;
+}
+
+interface WebGL2RenderingContextOverloads {
+    bufferData(target: GLenum, size: GLsizeiptr, usage: GLenum): void;
+    bufferData(target: GLenum, srcData: BufferSource | null, usage: GLenum): void;
+    bufferData(target: GLenum, srcData: ArrayBufferView, usage: GLenum, srcOffset: GLuint, length?: GLuint): void;
+    bufferSubData(target: GLenum, dstByteOffset: GLintptr, srcData: BufferSource): void;
+    bufferSubData(target: GLenum, dstByteOffset: GLintptr, srcData: ArrayBufferView, srcOffset: GLuint, length?: GLuint): void;
+    compressedTexImage2D(target: GLenum, level: GLint, internalformat: GLenum, width: GLsizei, height: GLsizei, border: GLint, imageSize: GLsizei, offset: GLintptr): void;
+    compressedTexImage2D(target: GLenum, level: GLint, internalformat: GLenum, width: GLsizei, height: GLsizei, border: GLint, srcData: ArrayBufferView, srcOffset?: GLuint, srcLengthOverride?: GLuint): void;
+    compressedTexSubImage2D(target: GLenum, level: GLint, xoffset: GLint, yoffset: GLint, width: GLsizei, height: GLsizei, format: GLenum, imageSize: GLsizei, offset: GLintptr): void;
+    compressedTexSubImage2D(target: GLenum, level: GLint, xoffset: GLint, yoffset: GLint, width: GLsizei, height: GLsizei, format: GLenum, srcData: ArrayBufferView, srcOffset?: GLuint, srcLengthOverride?: GLuint): void;
+    readPixels(x: GLint, y: GLint, width: GLsizei, height: GLsizei, format: GLenum, type: GLenum, dstData: ArrayBufferView | null): void;
+    readPixels(x: GLint, y: GLint, width: GLsizei, height: GLsizei, format: GLenum, type: GLenum, offset: GLintptr): void;
+    readPixels(x: GLint, y: GLint, width: GLsizei, height: GLsizei, format: GLenum, type: GLenum, dstData: ArrayBufferView, dstOffset: GLuint): void;
+    texImage2D(target: GLenum, level: GLint, internalformat: GLint, width: GLsizei, height: GLsizei, border: GLint, format: GLenum, type: GLenum, pixels: ArrayBufferView | null): void;
+    texImage2D(target: GLenum, level: GLint, internalformat: GLint, format: GLenum, type: GLenum, source: TexImageSource): void;
+    texImage2D(target: GLenum, level: GLint, internalformat: GLint, width: GLsizei, height: GLsizei, border: GLint, format: GLenum, type: GLenum, pboOffset: GLintptr): void;
+    texImage2D(target: GLenum, level: GLint, internalformat: GLint, width: GLsizei, height: GLsizei, border: GLint, format: GLenum, type: GLenum, source: TexImageSource): void;
+    texImage2D(target: GLenum, level: GLint, internalformat: GLint, width: GLsizei, height: GLsizei, border: GLint, format: GLenum, type: GLenum, srcData: ArrayBufferView, srcOffset: GLuint): void;
+    texSubImage2D(target: GLenum, level: GLint, xoffset: GLint, yoffset: GLint, width: GLsizei, height: GLsizei, format: GLenum, type: GLenum, pixels: ArrayBufferView | null): void;
+    texSubImage2D(target: GLenum, level: GLint, xoffset: GLint, yoffset: GLint, format: GLenum, type: GLenum, source: TexImageSource): void;
+    texSubImage2D(target: GLenum, level: GLint, xoffset: GLint, yoffset: GLint, width: GLsizei, height: GLsizei, format: GLenum, type: GLenum, pboOffset: GLintptr): void;
+    texSubImage2D(target: GLenum, level: GLint, xoffset: GLint, yoffset: GLint, width: GLsizei, height: GLsizei, format: GLenum, type: GLenum, source: TexImageSource): void;
+    texSubImage2D(target: GLenum, level: GLint, xoffset: GLint, yoffset: GLint, width: GLsizei, height: GLsizei, format: GLenum, type: GLenum, srcData: ArrayBufferView, srcOffset: GLuint): void;
+    uniform1fv(location: WebGLUniformLocation | null, data: Float32List, srcOffset?: GLuint, srcLength?: GLuint): void;
+    uniform1iv(location: WebGLUniformLocation | null, data: Int32List, srcOffset?: GLuint, srcLength?: GLuint): void;
+    uniform2fv(location: WebGLUniformLocation | null, data: Float32List, srcOffset?: GLuint, srcLength?: GLuint): void;
+    uniform2iv(location: WebGLUniformLocation | null, data: Int32List, srcOffset?: GLuint, srcLength?: GLuint): void;
+    uniform3fv(location: WebGLUniformLocation | null, data: Float32List, srcOffset?: GLuint, srcLength?: GLuint): void;
+    uniform3iv(location: WebGLUniformLocation | null, data: Int32List, srcOffset?: GLuint, srcLength?: GLuint): void;
+    uniform4fv(location: WebGLUniformLocation | null, data: Float32List, srcOffset?: GLuint, srcLength?: GLuint): void;
+    uniform4iv(location: WebGLUniformLocation | null, data: Int32List, srcOffset?: GLuint, srcLength?: GLuint): void;
+    uniformMatrix2fv(location: WebGLUniformLocation | null, transpose: GLboolean, data: Float32List, srcOffset?: GLuint, srcLength?: GLuint): void;
+    uniformMatrix3fv(location: WebGLUniformLocation | null, transpose: GLboolean, data: Float32List, srcOffset?: GLuint, srcLength?: GLuint): void;
+    uniformMatrix4fv(location: WebGLUniformLocation | null, transpose: GLboolean, data: Float32List, srcOffset?: GLuint, srcLength?: GLuint): void;
+}
+
+/** Part of the WebGL API and represents the information returned by calling the WebGLRenderingContext.getActiveAttrib() and WebGLRenderingContext.getActiveUniform() methods. */
 interface WebGLActiveInfo {
     readonly name: string;
     readonly size: GLint;
@@ -3064,7 +4361,7 @@ declare var WebGLActiveInfo: {
     new(): WebGLActiveInfo;
 };
 
-/** The WebGLBuffer interface is part of the WebGL API and represents an opaque buffer object storing data such as vertices or colors. */
+/** Part of the WebGL API and represents an opaque buffer object storing data such as vertices or colors. */
 interface WebGLBuffer extends WebGLObject {
 }
 
@@ -3083,7 +4380,7 @@ declare var WebGLContextEvent: {
     new(type: string, eventInit?: WebGLContextEventInit): WebGLContextEvent;
 };
 
-/** The WebGLFramebuffer interface is part of the WebGL API and represents a collection of buffers that serve as a rendering destination. */
+/** Part of the WebGL API and represents a collection of buffers that serve as a rendering destination. */
 interface WebGLFramebuffer extends WebGLObject {
 }
 
@@ -3109,7 +4406,15 @@ declare var WebGLProgram: {
     new(): WebGLProgram;
 };
 
-/** The WebGLRenderbuffer interface is part of the WebGL API and represents a buffer that can contain an image, or can be source or target of an rendering operation. */
+interface WebGLQuery extends WebGLObject {
+}
+
+declare var WebGLQuery: {
+    prototype: WebGLQuery;
+    new(): WebGLQuery;
+};
+
+/** Part of the WebGL API and represents a buffer that can contain an image, or can be source or target of an rendering operation. */
 interface WebGLRenderbuffer extends WebGLObject {
 }
 
@@ -3118,8 +4423,8 @@ declare var WebGLRenderbuffer: {
     new(): WebGLRenderbuffer;
 };
 
-/** The WebGLRenderingContext interface provides an interface to the OpenGL ES 2.0 graphics rendering context for the drawing surface of an HTML <canvas> element. */
-interface WebGLRenderingContext extends WebGLRenderingContextBase {
+/** Provides an interface to the OpenGL ES 2.0 graphics rendering context for the drawing surface of an HTML <canvas> element. */
+interface WebGLRenderingContext extends WebGLRenderingContextBase, WebGLRenderingContextOverloads {
 }
 
 declare var WebGLRenderingContext: {
@@ -3424,6 +4729,7 @@ declare var WebGLRenderingContext: {
 };
 
 interface WebGLRenderingContextBase {
+    readonly canvas: OffscreenCanvas;
     readonly drawingBufferHeight: GLsizei;
     readonly drawingBufferWidth: GLsizei;
     activeTexture(texture: GLenum): void;
@@ -3438,9 +4744,6 @@ interface WebGLRenderingContextBase {
     blendEquationSeparate(modeRGB: GLenum, modeAlpha: GLenum): void;
     blendFunc(sfactor: GLenum, dfactor: GLenum): void;
     blendFuncSeparate(srcRGB: GLenum, dstRGB: GLenum, srcAlpha: GLenum, dstAlpha: GLenum): void;
-    bufferData(target: GLenum, size: GLsizeiptr, usage: GLenum): void;
-    bufferData(target: GLenum, data: BufferSource | null, usage: GLenum): void;
-    bufferSubData(target: GLenum, offset: GLintptr, data: BufferSource): void;
     checkFramebufferStatus(target: GLenum): GLenum;
     clear(mask: GLbitfield): void;
     clearColor(red: GLclampf, green: GLclampf, blue: GLclampf, alpha: GLclampf): void;
@@ -3448,8 +4751,6 @@ interface WebGLRenderingContextBase {
     clearStencil(s: GLint): void;
     colorMask(red: GLboolean, green: GLboolean, blue: GLboolean, alpha: GLboolean): void;
     compileShader(shader: WebGLShader): void;
-    compressedTexImage2D(target: GLenum, level: GLint, internalformat: GLenum, width: GLsizei, height: GLsizei, border: GLint, data: ArrayBufferView): void;
-    compressedTexSubImage2D(target: GLenum, level: GLint, xoffset: GLint, yoffset: GLint, width: GLsizei, height: GLsizei, format: GLenum, data: ArrayBufferView): void;
     copyTexImage2D(target: GLenum, level: GLint, internalformat: GLenum, x: GLint, y: GLint, width: GLsizei, height: GLsizei, border: GLint): void;
     copyTexSubImage2D(target: GLenum, level: GLint, xoffset: GLint, yoffset: GLint, x: GLint, y: GLint, width: GLsizei, height: GLsizei): void;
     createBuffer(): WebGLBuffer | null;
@@ -3539,7 +4840,6 @@ interface WebGLRenderingContextBase {
     linkProgram(program: WebGLProgram): void;
     pixelStorei(pname: GLenum, param: GLint | GLboolean): void;
     polygonOffset(factor: GLfloat, units: GLfloat): void;
-    readPixels(x: GLint, y: GLint, width: GLsizei, height: GLsizei, format: GLenum, type: GLenum, pixels: ArrayBufferView | null): void;
     renderbufferStorage(target: GLenum, internalformat: GLenum, width: GLsizei, height: GLsizei): void;
     sampleCoverage(value: GLclampf, invert: GLboolean): void;
     scissor(x: GLint, y: GLint, width: GLsizei, height: GLsizei): void;
@@ -3550,31 +4850,16 @@ interface WebGLRenderingContextBase {
     stencilMaskSeparate(face: GLenum, mask: GLuint): void;
     stencilOp(fail: GLenum, zfail: GLenum, zpass: GLenum): void;
     stencilOpSeparate(face: GLenum, fail: GLenum, zfail: GLenum, zpass: GLenum): void;
-    texImage2D(target: GLenum, level: GLint, internalformat: GLint, width: GLsizei, height: GLsizei, border: GLint, format: GLenum, type: GLenum, pixels: ArrayBufferView | null): void;
-    texImage2D(target: GLenum, level: GLint, internalformat: GLint, format: GLenum, type: GLenum, source: TexImageSource): void;
     texParameterf(target: GLenum, pname: GLenum, param: GLfloat): void;
     texParameteri(target: GLenum, pname: GLenum, param: GLint): void;
-    texSubImage2D(target: GLenum, level: GLint, xoffset: GLint, yoffset: GLint, width: GLsizei, height: GLsizei, format: GLenum, type: GLenum, pixels: ArrayBufferView | null): void;
-    texSubImage2D(target: GLenum, level: GLint, xoffset: GLint, yoffset: GLint, format: GLenum, type: GLenum, source: TexImageSource): void;
     uniform1f(location: WebGLUniformLocation | null, x: GLfloat): void;
-    uniform1fv(location: WebGLUniformLocation | null, v: Float32List): void;
     uniform1i(location: WebGLUniformLocation | null, x: GLint): void;
-    uniform1iv(location: WebGLUniformLocation | null, v: Int32List): void;
     uniform2f(location: WebGLUniformLocation | null, x: GLfloat, y: GLfloat): void;
-    uniform2fv(location: WebGLUniformLocation | null, v: Float32List): void;
     uniform2i(location: WebGLUniformLocation | null, x: GLint, y: GLint): void;
-    uniform2iv(location: WebGLUniformLocation | null, v: Int32List): void;
     uniform3f(location: WebGLUniformLocation | null, x: GLfloat, y: GLfloat, z: GLfloat): void;
-    uniform3fv(location: WebGLUniformLocation | null, v: Float32List): void;
     uniform3i(location: WebGLUniformLocation | null, x: GLint, y: GLint, z: GLint): void;
-    uniform3iv(location: WebGLUniformLocation | null, v: Int32List): void;
     uniform4f(location: WebGLUniformLocation | null, x: GLfloat, y: GLfloat, z: GLfloat, w: GLfloat): void;
-    uniform4fv(location: WebGLUniformLocation | null, v: Float32List): void;
     uniform4i(location: WebGLUniformLocation | null, x: GLint, y: GLint, z: GLint, w: GLint): void;
-    uniform4iv(location: WebGLUniformLocation | null, v: Int32List): void;
-    uniformMatrix2fv(location: WebGLUniformLocation | null, transpose: GLboolean, value: Float32List): void;
-    uniformMatrix3fv(location: WebGLUniformLocation | null, transpose: GLboolean, value: Float32List): void;
-    uniformMatrix4fv(location: WebGLUniformLocation | null, transpose: GLboolean, value: Float32List): void;
     useProgram(program: WebGLProgram | null): void;
     validateProgram(program: WebGLProgram): void;
     vertexAttrib1f(index: GLuint, x: GLfloat): void;
@@ -3885,6 +5170,38 @@ interface WebGLRenderingContextBase {
     readonly ZERO: GLenum;
 }
 
+interface WebGLRenderingContextOverloads {
+    bufferData(target: GLenum, size: GLsizeiptr, usage: GLenum): void;
+    bufferData(target: GLenum, data: BufferSource | null, usage: GLenum): void;
+    bufferSubData(target: GLenum, offset: GLintptr, data: BufferSource): void;
+    compressedTexImage2D(target: GLenum, level: GLint, internalformat: GLenum, width: GLsizei, height: GLsizei, border: GLint, data: ArrayBufferView): void;
+    compressedTexSubImage2D(target: GLenum, level: GLint, xoffset: GLint, yoffset: GLint, width: GLsizei, height: GLsizei, format: GLenum, data: ArrayBufferView): void;
+    readPixels(x: GLint, y: GLint, width: GLsizei, height: GLsizei, format: GLenum, type: GLenum, pixels: ArrayBufferView | null): void;
+    texImage2D(target: GLenum, level: GLint, internalformat: GLint, width: GLsizei, height: GLsizei, border: GLint, format: GLenum, type: GLenum, pixels: ArrayBufferView | null): void;
+    texImage2D(target: GLenum, level: GLint, internalformat: GLint, format: GLenum, type: GLenum, source: TexImageSource): void;
+    texSubImage2D(target: GLenum, level: GLint, xoffset: GLint, yoffset: GLint, width: GLsizei, height: GLsizei, format: GLenum, type: GLenum, pixels: ArrayBufferView | null): void;
+    texSubImage2D(target: GLenum, level: GLint, xoffset: GLint, yoffset: GLint, format: GLenum, type: GLenum, source: TexImageSource): void;
+    uniform1fv(location: WebGLUniformLocation | null, v: Float32List): void;
+    uniform1iv(location: WebGLUniformLocation | null, v: Int32List): void;
+    uniform2fv(location: WebGLUniformLocation | null, v: Float32List): void;
+    uniform2iv(location: WebGLUniformLocation | null, v: Int32List): void;
+    uniform3fv(location: WebGLUniformLocation | null, v: Float32List): void;
+    uniform3iv(location: WebGLUniformLocation | null, v: Int32List): void;
+    uniform4fv(location: WebGLUniformLocation | null, v: Float32List): void;
+    uniform4iv(location: WebGLUniformLocation | null, v: Int32List): void;
+    uniformMatrix2fv(location: WebGLUniformLocation | null, transpose: GLboolean, value: Float32List): void;
+    uniformMatrix3fv(location: WebGLUniformLocation | null, transpose: GLboolean, value: Float32List): void;
+    uniformMatrix4fv(location: WebGLUniformLocation | null, transpose: GLboolean, value: Float32List): void;
+}
+
+interface WebGLSampler extends WebGLObject {
+}
+
+declare var WebGLSampler: {
+    prototype: WebGLSampler;
+    new(): WebGLSampler;
+};
+
 /** The WebGLShader is part of the WebGL API and can either be a vertex or a fragment shader. A WebGLProgram requires both types of shaders. */
 interface WebGLShader extends WebGLObject {
 }
@@ -3894,7 +5211,7 @@ declare var WebGLShader: {
     new(): WebGLShader;
 };
 
-/** The WebGLShaderPrecisionFormat interface is part of the WebGL API and represents the information returned by calling the WebGLRenderingContext.getShaderPrecisionFormat() method. */
+/** Part of the WebGL API and represents the information returned by calling the WebGLRenderingContext.getShaderPrecisionFormat() method. */
 interface WebGLShaderPrecisionFormat {
     readonly precision: GLint;
     readonly rangeMax: GLint;
@@ -3906,7 +5223,15 @@ declare var WebGLShaderPrecisionFormat: {
     new(): WebGLShaderPrecisionFormat;
 };
 
-/** The WebGLTexture interface is part of the WebGL API and represents an opaque texture object providing storage and state for texturing operations. */
+interface WebGLSync extends WebGLObject {
+}
+
+declare var WebGLSync: {
+    prototype: WebGLSync;
+    new(): WebGLSync;
+};
+
+/** Part of the WebGL API and represents an opaque texture object providing storage and state for texturing operations. */
 interface WebGLTexture extends WebGLObject {
 }
 
@@ -3915,7 +5240,15 @@ declare var WebGLTexture: {
     new(): WebGLTexture;
 };
 
-/** The WebGLUniformLocation interface is part of the WebGL API and represents the location of a uniform variable in a shader program. */
+interface WebGLTransformFeedback extends WebGLObject {
+}
+
+declare var WebGLTransformFeedback: {
+    prototype: WebGLTransformFeedback;
+    new(): WebGLTransformFeedback;
+};
+
+/** Part of the WebGL API and represents the location of a uniform variable in a shader program. */
 interface WebGLUniformLocation {
 }
 
@@ -3924,6 +5257,14 @@ declare var WebGLUniformLocation: {
     new(): WebGLUniformLocation;
 };
 
+interface WebGLVertexArrayObject extends WebGLObject {
+}
+
+declare var WebGLVertexArrayObject: {
+    prototype: WebGLVertexArrayObject;
+    new(): WebGLVertexArrayObject;
+};
+
 interface WebGLVertexArrayObjectOES extends WebGLObject {
 }
 
@@ -3934,7 +5275,7 @@ interface WebSocketEventMap {
     "open": Event;
 }
 
-/** The WebSocket object provides the API for creating and managing a WebSocket connection to a server, as well as for sending and receiving data on the connection. */
+/** Provides the API for creating and managing a WebSocket connection to a server, as well as for sending and receiving data on the connection. */
 interface WebSocket extends EventTarget {
     binaryType: BinaryType;
     readonly bufferedAmount: number;
@@ -3972,7 +5313,7 @@ interface WindowBase64 {
     btoa(rawString: string): string;
 }
 
-/** The WindowClient interface of the ServiceWorker API represents the scope of a service worker client that is a document in a browser context, controlled by an active worker. The service worker client independently selects and uses a service worker for its own loading and sub-resources. */
+/** This ServiceWorker API interface represents the scope of a service worker client that is a document in a browser context, controlled by an active worker. The service worker client independently selects and uses a service worker for its own loading and sub-resources. */
 interface WindowClient extends Client {
     readonly ancestorOrigins: ReadonlyArray<string>;
     readonly focused: boolean;
@@ -4012,10 +5353,11 @@ interface WorkerEventMap extends AbstractWorkerEventMap {
     "message": MessageEvent;
 }
 
-/** The Worker interface of the Web Workers API represents a background task that can be easily created and can send messages back to its creator. Creating a worker is as simple as calling the Worker() constructor and specifying a script to be run in the worker thread. */
+/** This Web Workers API interface represents a background task that can be easily created and can send messages back to its creator. Creating a worker is as simple as calling the Worker() constructor and specifying a script to be run in the worker thread. */
 interface Worker extends EventTarget, AbstractWorker {
     onmessage: ((this: Worker, ev: MessageEvent) => any) | null;
-    postMessage(message: any, transfer?: Transferable[]): void;
+    postMessage(message: any, transfer: Transferable[]): void;
+    postMessage(message: any, options?: PostMessageOptions): void;
     terminate(): void;
     addEventListener<K extends keyof WorkerEventMap>(type: K, listener: (this: Worker, ev: WorkerEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
@@ -4032,14 +5374,14 @@ interface WorkerGlobalScopeEventMap {
     "error": ErrorEvent;
 }
 
-/** The WorkerGlobalScope interface of the Web Workers API is an interface representing the scope of any worker. Workers have no browsing context; this scope contains the information usually conveyed by Window objects — in this case event handlers, the console or the associated WorkerNavigator object. Each WorkerGlobalScope has its own event loop. */
-interface WorkerGlobalScope extends EventTarget, WorkerUtils, WindowConsole, GlobalFetch, WindowOrWorkerGlobalScope {
+/** This Web Workers API interface is an interface representing the scope of any worker. Workers have no browsing context; this scope contains the information usually conveyed by Window objects — in this case event handlers, the console or the associated WorkerNavigator object. Each WorkerGlobalScope has its own event loop. */
+interface WorkerGlobalScope extends EventTarget, WorkerUtils, WindowConsole, WindowOrWorkerGlobalScope {
     readonly caches: CacheStorage;
     readonly isSecureContext: boolean;
     readonly location: WorkerLocation;
     onerror: ((this: WorkerGlobalScope, ev: ErrorEvent) => any) | null;
     readonly performance: Performance;
-    readonly self: WorkerGlobalScope;
+    readonly self: WorkerGlobalScope & typeof globalThis;
     msWriteProfilerMark(profilerMarkName: string): void;
     addEventListener<K extends keyof WorkerGlobalScopeEventMap>(type: K, listener: (this: WorkerGlobalScope, ev: WorkerGlobalScopeEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
@@ -4052,7 +5394,7 @@ declare var WorkerGlobalScope: {
     new(): WorkerGlobalScope;
 };
 
-/** The WorkerLocation interface defines the absolute location of the script executed by the Worker. Such an object is initialized for each worker and is available via the WorkerGlobalScope.location property obtained by calling self.location. */
+/** The absolute location of the script executed by the Worker. Such an object is initialized for each worker and is available via the WorkerGlobalScope.location property obtained by calling self.location. */
 interface WorkerLocation {
     readonly hash: string;
     readonly host: string;
@@ -4071,8 +5413,9 @@ declare var WorkerLocation: {
     new(): WorkerLocation;
 };
 
-/** The WorkerNavigator interface represents a subset of the Navigator interface allowed to be accessed from a Worker. Such an object is initialized for each worker and is available via the WorkerGlobalScope.navigator property obtained by calling window.self.navigator. */
+/** A subset of the Navigator interface allowed to be accessed from a Worker. Such an object is initialized for each worker and is available via the WorkerGlobalScope.navigator property obtained by calling window.self.navigator. */
 interface WorkerNavigator extends NavigatorID, NavigatorOnLine, NavigatorBeacon, NavigatorConcurrentHardware, NavigatorStorage {
+    readonly permissions: Permissions;
     readonly serviceWorker: ServiceWorkerContainer;
 }
 
@@ -4088,7 +5431,7 @@ interface WorkerUtils extends WindowBase64 {
     importScripts(...urls: string[]): void;
 }
 
-/** The WritableStream interface of the the Streams API provides a standard abstraction for writing streaming data to a destination, known as a sink. This object comes with built-in backpressure and queuing. */
+/** This Streams API interface provides a standard abstraction for writing streaming data to a destination, known as a sink. This object comes with built-in backpressure and queuing. */
 interface WritableStream<W = any> {
     readonly locked: boolean;
     abort(reason?: any): Promise<void>;
@@ -4100,12 +5443,12 @@ declare var WritableStream: {
     new<W = any>(underlyingSink?: UnderlyingSink<W>, strategy?: QueuingStrategy<W>): WritableStream<W>;
 };
 
-/** The WritableStreamDefaultController interface of the the Streams API represents a controller allowing control of a WritableStream's state. When constructing a WritableStream, the underlying sink is given a corresponding WritableStreamDefaultController instance to manipulate. */
+/** This Streams API interface represents a controller allowing control of a WritableStream's state. When constructing a WritableStream, the underlying sink is given a corresponding WritableStreamDefaultController instance to manipulate. */
 interface WritableStreamDefaultController {
     error(error?: any): void;
 }
 
-/** The WritableStreamDefaultWriter interface of the the Streams API is the object returned by WritableStream.getWriter() and once created locks the < writer to the WritableStream ensuring that no other streams can write to the underlying sink. */
+/** This Streams API interface is the object returned by WritableStream.getWriter() and once created locks the < writer to the WritableStream ensuring that no other streams can write to the underlying sink. */
 interface WritableStreamDefaultWriter<W = any> {
     readonly closed: Promise<void>;
     readonly desiredSize: number | null;
@@ -4133,20 +5476,19 @@ interface XMLHttpRequest extends XMLHttpRequestEventTarget {
     readonly response: any;
     /**
      * Returns the text response.
+     * 
      * Throws an "InvalidStateError" DOMException if responseType is not the empty string or "text".
      */
     readonly responseText: string;
     /**
      * Returns the response type.
-     * Can be set to change the response type. Values are:
-     * the empty string (default),
-     * "arraybuffer",
-     * "blob",
-     * "document",
-     * "json", and
-     * "text".
+     * 
+     * Can be set to change the response type. Values are: the empty string (default), "arraybuffer", "blob", "document", "json", and "text".
+     * 
      * When set: setting to "document" is ignored if current global object is not a Window object.
+     * 
      * When set: throws an "InvalidStateError" DOMException if state is loading or done.
+     * 
      * When set: throws an "InvalidAccessError" DOMException if the synchronous flag is set and current global object is a Window object.
      */
     responseType: XMLHttpRequestResponseType;
@@ -4154,21 +5496,18 @@ interface XMLHttpRequest extends XMLHttpRequestEventTarget {
     readonly status: number;
     readonly statusText: string;
     /**
-     * Can be set to a time in milliseconds. When set to a non-zero value will cause fetching to terminate after the given time has passed. When the time has passed, the
-     * request has not yet completed, and the synchronous flag is unset, a timeout event will then be dispatched, or a
-     * "TimeoutError" DOMException will be thrown otherwise (for the send() method).
+     * Can be set to a time in milliseconds. When set to a non-zero value will cause fetching to terminate after the given time has passed. When the time has passed, the request has not yet completed, and the synchronous flag is unset, a timeout event will then be dispatched, or a "TimeoutError" DOMException will be thrown otherwise (for the send() method).
+     * 
      * When set: throws an "InvalidAccessError" DOMException if the synchronous flag is set and current global object is a Window object.
      */
     timeout: number;
     /**
-     * Returns the associated XMLHttpRequestUpload object. It can be used to gather transmission information when data is
-     * transferred to a server.
+     * Returns the associated XMLHttpRequestUpload object. It can be used to gather transmission information when data is transferred to a server.
      */
     readonly upload: XMLHttpRequestUpload;
     /**
-     * True when credentials are to be included in a cross-origin request. False when they are
-     * to be excluded in a cross-origin request and when cookies are to be ignored in its response.
-     * Initially false.
+     * True when credentials are to be included in a cross-origin request. False when they are to be excluded in a cross-origin request and when cookies are to be ignored in its response. Initially false.
+     * 
      * When set: throws an "InvalidStateError" DOMException if state is not unsent or opened, or if the send() flag is set.
      */
     withCredentials: boolean;
@@ -4180,31 +5519,33 @@ interface XMLHttpRequest extends XMLHttpRequestEventTarget {
     getResponseHeader(name: string): string | null;
     /**
      * Sets the request method, request URL, and synchronous flag.
-     * Throws a "SyntaxError" DOMException if either method is not a
-     * valid HTTP method or url cannot be parsed.
-     * Throws a "SecurityError" DOMException if method is a
-     * case-insensitive match for `CONNECT`, `TRACE`, or `TRACK`.
+     * 
+     * Throws a "SyntaxError" DOMException if either method is not a valid HTTP method or url cannot be parsed.
+     * 
+     * Throws a "SecurityError" DOMException if method is a case-insensitive match for `CONNECT`, `TRACE`, or `TRACK`.
+     * 
      * Throws an "InvalidAccessError" DOMException if async is false, current global object is a Window object, and the timeout attribute is not zero or the responseType attribute is not the empty string.
      */
     open(method: string, url: string): void;
     open(method: string, url: string, async: boolean, username?: string | null, password?: string | null): void;
     /**
-     * Acts as if the `Content-Type` header value for response is mime.
-     * (It does not actually change the header though.)
+     * Acts as if the `Content-Type` header value for response is mime. (It does not actually change the header though.)
+     * 
      * Throws an "InvalidStateError" DOMException if state is loading or done.
      */
     overrideMimeType(mime: string): void;
     /**
-     * Initiates the request. The body argument provides the request body, if any,
-     * and is ignored if the request method is GET or HEAD.
+     * Initiates the request. The body argument provides the request body, if any, and is ignored if the request method is GET or HEAD.
+     * 
      * Throws an "InvalidStateError" DOMException if either state is not opened or the send() flag is set.
      */
     send(body?: BodyInit | null): void;
     /**
      * Combines a header in author request headers.
+     * 
      * Throws an "InvalidStateError" DOMException if either state is not opened or the send() flag is set.
-     * Throws a "SyntaxError" DOMException if name is not a header name
-     * or if value is not a header value.
+     * 
+     * Throws a "SyntaxError" DOMException if name is not a header name or if value is not a header value.
      */
     setRequestHeader(name: string, value: string): void;
     readonly DONE: number;
@@ -4229,13 +5570,13 @@ declare var XMLHttpRequest: {
 };
 
 interface XMLHttpRequestEventTargetEventMap {
-    "abort": ProgressEvent;
-    "error": ProgressEvent;
-    "load": ProgressEvent;
-    "loadend": ProgressEvent;
-    "loadstart": ProgressEvent;
-    "progress": ProgressEvent;
-    "timeout": ProgressEvent;
+    "abort": ProgressEvent<XMLHttpRequestEventTarget>;
+    "error": ProgressEvent<XMLHttpRequestEventTarget>;
+    "load": ProgressEvent<XMLHttpRequestEventTarget>;
+    "loadend": ProgressEvent<XMLHttpRequestEventTarget>;
+    "loadstart": ProgressEvent<XMLHttpRequestEventTarget>;
+    "progress": ProgressEvent<XMLHttpRequestEventTarget>;
+    "timeout": ProgressEvent<XMLHttpRequestEventTarget>;
 }
 
 interface XMLHttpRequestEventTarget extends EventTarget {
@@ -4271,10 +5612,107 @@ declare var XMLHttpRequestUpload: {
 
 declare type EventListenerOrEventListenerObject = EventListener | EventListenerObject;
 
+declare namespace WebAssembly {
+    interface Global {
+        value: any;
+        valueOf(): any;
+    }
+    
+    var Global: {
+        prototype: Global;
+        new(descriptor: GlobalDescriptor, value?: any): Global;
+    };
+    
+    interface Instance {
+        readonly exports: any;
+    }
+    
+    var Instance: {
+        prototype: Instance;
+        new(module: Module, importObject?: any): Instance;
+    };
+    
+    interface Memory {
+        readonly buffer: ArrayBuffer;
+        grow(delta: number): number;
+    }
+    
+    var Memory: {
+        prototype: Memory;
+        new(descriptor: MemoryDescriptor): Memory;
+    };
+    
+    interface Module {
+    }
+    
+    var Module: {
+        prototype: Module;
+        new(bytes: BufferSource): Module;
+        customSections(module: Module, sectionName: string): ArrayBuffer[];
+        exports(module: Module): ModuleExportDescriptor[];
+        imports(module: Module): ModuleImportDescriptor[];
+    };
+    
+    interface Table {
+        readonly length: number;
+        get(index: number): Function | null;
+        grow(delta: number): number;
+        set(index: number, value: Function | null): void;
+    }
+    
+    var Table: {
+        prototype: Table;
+        new(descriptor: TableDescriptor): Table;
+    };
+    
+    interface GlobalDescriptor {
+        mutable?: boolean;
+        value: string;
+    }
+    
+    interface MemoryDescriptor {
+        initial: number;
+        maximum?: number;
+    }
+    
+    interface ModuleExportDescriptor {
+        kind: ImportExportKind;
+        name: string;
+    }
+    
+    interface ModuleImportDescriptor {
+        kind: ImportExportKind;
+        module: string;
+        name: string;
+    }
+    
+    interface TableDescriptor {
+        element: TableKind;
+        initial: number;
+        maximum?: number;
+    }
+    
+    interface WebAssemblyInstantiatedSource {
+        instance: Instance;
+        module: Module;
+    }
+    
+    type ImportExportKind = "function" | "table" | "memory" | "global";
+    type TableKind = "anyfunc";
+    function compile(bytes: BufferSource): Promise<Module>;
+    function instantiate(bytes: BufferSource, importObject?: any): Promise<WebAssemblyInstantiatedSource>;
+    function instantiate(moduleObject: Module, importObject?: any): Promise<Instance>;
+    function validate(bytes: BufferSource): boolean;
+}
+
 interface EventHandlerNonNull {
     (event: Event): any;
 }
 
+interface FrameRequestCallback {
+    (time: number): void;
+}
+
 interface PerformanceObserverCallback {
     (entries: PerformanceObserverEntryList, observer: PerformanceObserver): void;
 }
@@ -4321,10 +5759,10 @@ interface WritableStreamErrorCallback {
 
 declare var onmessage: ((this: DedicatedWorkerGlobalScope, ev: MessageEvent) => any) | null;
 declare function close(): void;
-declare function postMessage(message: any, transfer?: Transferable[]): void;
+declare function postMessage(message: any, transfer: Transferable[]): void;
+declare function postMessage(message: any, options?: PostMessageOptions): void;
 /**
- * Dispatches a synthetic event event to target and returns true
- * if either event's cancelable attribute value is false or its preventDefault() method was not invoked, and false otherwise.
+ * Dispatches a synthetic event event to target and returns true if either event's cancelable attribute value is false or its preventDefault() method was not invoked, and false otherwise.
  */
 declare function dispatchEvent(event: Event): boolean;
 declare var caches: CacheStorage;
@@ -4332,11 +5770,10 @@ declare var isSecureContext: boolean;
 declare var location: WorkerLocation;
 declare var onerror: ((this: DedicatedWorkerGlobalScope, ev: ErrorEvent) => any) | null;
 declare var performance: Performance;
-declare var self: WorkerGlobalScope;
+declare var self: WorkerGlobalScope & typeof globalThis;
 declare function msWriteProfilerMark(profilerMarkName: string): void;
 /**
- * Dispatches a synthetic event event to target and returns true
- * if either event's cancelable attribute value is false or its preventDefault() method was not invoked, and false otherwise.
+ * Dispatches a synthetic event event to target and returns true if either event's cancelable attribute value is false or its preventDefault() method was not invoked, and false otherwise.
  */
 declare function dispatchEvent(event: Event): boolean;
 declare var indexedDB: IDBFactory;
@@ -4346,7 +5783,6 @@ declare function importScripts(...urls: string[]): void;
 declare function atob(encodedString: string): string;
 declare function btoa(rawString: string): string;
 declare var console: Console;
-declare function fetch(input: RequestInfo, init?: RequestInit): Promise<Response>;
 declare var caches: CacheStorage;
 declare var crypto: Crypto;
 declare var indexedDB: IDBFactory;
@@ -4362,16 +5798,19 @@ declare function fetch(input: RequestInfo, init?: RequestInit): Promise<Response
 declare function queueMicrotask(callback: Function): void;
 declare function setInterval(handler: TimerHandler, timeout?: number, ...arguments: any[]): number;
 declare function setTimeout(handler: TimerHandler, timeout?: number, ...arguments: any[]): number;
+declare function cancelAnimationFrame(handle: number): void;
+declare function requestAnimationFrame(callback: FrameRequestCallback): number;
 declare function addEventListener<K extends keyof DedicatedWorkerGlobalScopeEventMap>(type: K, listener: (this: DedicatedWorkerGlobalScope, ev: DedicatedWorkerGlobalScopeEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
 declare function addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
 declare function removeEventListener<K extends keyof DedicatedWorkerGlobalScopeEventMap>(type: K, listener: (this: DedicatedWorkerGlobalScope, ev: DedicatedWorkerGlobalScopeEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
 declare function removeEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | EventListenerOptions): void;
-type BlobPart = BufferSource | Blob | string;
 type HeadersInit = Headers | string[][] | Record<string, string>;
 type BodyInit = Blob | BufferSource | FormData | URLSearchParams | ReadableStream<Uint8Array> | string;
 type RequestInfo = Request | string;
+type BlobPart = BufferSource | Blob | string;
 type DOMHighResTimeStamp = number;
-type CanvasImageSource = ImageBitmap;
+type CanvasImageSource = ImageBitmap | OffscreenCanvas;
+type OffscreenRenderingContext = OffscreenCanvasRenderingContext2D | ImageBitmapRenderingContext | WebGLRenderingContext | WebGL2RenderingContext;
 type MessageEventSource = MessagePort | ServiceWorker;
 type ImageBitmapSource = CanvasImageSource | Blob | ImageData;
 type TimerHandler = string | Function;
@@ -4392,25 +5831,39 @@ type GLsizeiptr = number;
 type GLuint = number;
 type GLfloat = number;
 type GLclampf = number;
-type TexImageSource = ImageBitmap | ImageData;
+type TexImageSource = ImageBitmap | ImageData | OffscreenCanvas;
 type Float32List = Float32Array | GLfloat[];
 type Int32List = Int32Array | GLint[];
+type GLint64 = number;
+type GLuint64 = number;
+type Uint32List = Uint32Array | GLuint[];
 type BufferSource = ArrayBufferView | ArrayBuffer;
 type DOMTimeStamp = number;
 type FormDataEntryValue = File | string;
 type IDBValidKey = number | string | Date | BufferSource | IDBArrayKey;
 type Transferable = ArrayBuffer | MessagePort | ImageBitmap;
 type BinaryType = "blob" | "arraybuffer";
+type CanvasDirection = "ltr" | "rtl" | "inherit";
+type CanvasFillRule = "nonzero" | "evenodd";
+type CanvasLineCap = "butt" | "round" | "square";
+type CanvasLineJoin = "round" | "bevel" | "miter";
+type CanvasTextAlign = "start" | "end" | "left" | "right" | "center";
+type CanvasTextBaseline = "top" | "hanging" | "middle" | "alphabetic" | "ideographic" | "bottom";
 type ClientTypes = "window" | "worker" | "sharedworker" | "all";
 type EndingType = "transparent" | "native";
+type FrameType = "auxiliary" | "top-level" | "nested" | "none";
 type IDBCursorDirection = "next" | "nextunique" | "prev" | "prevunique";
 type IDBRequestReadyState = "pending" | "done";
 type IDBTransactionMode = "readonly" | "readwrite" | "versionchange";
+type ImageSmoothingQuality = "low" | "medium" | "high";
 type KeyFormat = "raw" | "spki" | "pkcs8" | "jwk";
 type KeyType = "public" | "private" | "secret";
 type KeyUsage = "encrypt" | "decrypt" | "sign" | "verify" | "deriveKey" | "deriveBits" | "wrapKey" | "unwrapKey";
 type NotificationDirection = "auto" | "ltr" | "rtl";
 type NotificationPermission = "default" | "denied" | "granted";
+type OffscreenRenderingContextId = "2d" | "bitmaprenderer" | "webgl" | "webgl2";
+type PermissionName = "geolocation" | "notifications" | "push" | "midi" | "camera" | "microphone" | "speaker" | "device-info" | "background-sync" | "bluetooth" | "persistent-storage" | "ambient-light-sensor" | "accelerometer" | "gyroscope" | "magnetometer" | "clipboard";
+type PermissionState = "granted" | "denied" | "prompt";
 type PushEncryptionKeyName = "p256dh" | "auth";
 type PushPermissionState = "denied" | "granted" | "prompt";
 type ReferrerPolicy = "" | "no-referrer" | "no-referrer-when-downgrade" | "same-origin" | "origin" | "strict-origin" | "origin-when-cross-origin" | "strict-origin-when-cross-origin" | "unsafe-url";
diff --git a/lib/pl/diagnosticMessages.generated.json b/lib/pl/diagnosticMessages.generated.json
index bfab76b80ab..8573d802c74 100644
--- a/lib/pl/diagnosticMessages.generated.json
+++ b/lib/pl/diagnosticMessages.generated.json
@@ -355,7 +355,7 @@
   "Element_implicitly_has_an_any_type_because_type_0_has_no_index_signature_7017": "Element ma niejawnie typ „any”, ponieważ typ „{0}” nie ma sygnatury indeksu.",
   "Emit_a_UTF_8_Byte_Order_Mark_BOM_in_the_beginning_of_output_files_6164": "Emituj znacznik kolejności bajtów UTF-8 na początku plików wyjściowych.",
   "Emit_a_single_file_with_source_maps_instead_of_having_a_separate_file_6151": "Emituj pojedynczy plik z mapami źródeł zamiast oddzielnego pliku.",
-  "Emit_the_source_alongside_the_sourcemaps_within_a_single_file_requires_inlineSourceMap_or_sourceMap__6152": "Emituj źródło razem z mapami źródłowymi w pojedynczym pliku; wymaga ustawienia opcji „--inlineSourceMap” lub „--sourceMap”.",
+  "Emit_the_source_alongside_the_sourcemaps_within_a_single_file_requires_inlineSourceMap_or_sourceMap__6152": "Emituj źródło razem z mapami źródeł w pojedynczym pliku; wymaga ustawienia opcji „--inlineSourceMap” lub „--sourceMap”.",
   "Enable_all_strict_type_checking_options_6180": "Włącz wszystkie opcje ścisłego sprawdzania typów.",
   "Enable_project_compilation_6302": "Włącz kompilację projektu",
   "Enable_strict_checking_of_function_types_6186": "Włącz dokładne sprawdzanie typów funkcji.",
@@ -445,7 +445,7 @@
   "Function_overload_must_be_static_2387": "Przeciążenie funkcji musi być statyczne.",
   "Function_overload_must_not_be_static_2388": "Przeciążenie funkcji nie może być statyczne.",
   "Generate_get_and_set_accessors_95046": "Generuj metody dostępu „get” i „set”.",
-  "Generates_a_sourcemap_for_each_corresponding_d_ts_file_6000": "Generuje mapę źródła dla każdego odpowiadającego pliku „.d.ts”.",
+  "Generates_a_sourcemap_for_each_corresponding_d_ts_file_6000": "Generuje mapę źródła dla poszczególnych plików „.d.ts”.",
   "Generates_corresponding_d_ts_file_6002": "Generuje odpowiadający plik „d.ts”.",
   "Generates_corresponding_map_file_6043": "Generuje odpowiadający plik „map”.",
   "Generator_implicitly_has_type_0_because_it_does_not_yield_any_values_Consider_supplying_a_return_typ_7025": "Dla generatora niejawnie określono typ „{0}”, ponieważ nie przekazuje on żadnych wartości. Rozważ podanie zwracanego typu.",
diff --git a/lib/protocol.d.ts b/lib/protocol.d.ts
index 38c0989c362..ca84f3dab79 100644
--- a/lib/protocol.d.ts
+++ b/lib/protocol.d.ts
@@ -63,7 +63,8 @@ declare namespace ts.server.protocol {
         GetEditsForRefactor = "getEditsForRefactor",
         OrganizeImports = "organizeImports",
         GetEditsForFileRename = "getEditsForFileRename",
-        ConfigurePlugin = "configurePlugin"
+        ConfigurePlugin = "configurePlugin",
+        SelectionRange = "selectionRange"
     }
     /**
      * A TypeScript Server message
@@ -566,19 +567,6 @@ declare namespace ts.server.protocol {
          */
         body?: string[];
     }
-    /**
-     * Arguments for EncodedSemanticClassificationsRequest request.
-     */
-    interface EncodedSemanticClassificationsRequestArgs extends FileRequestArgs {
-        /**
-         * Start position of the span.
-         */
-        start: number;
-        /**
-         * Length of the span.
-         */
-        length: number;
-    }
     /**
      * Arguments in document highlight request; include: filesToSearch, file,
      * line, offset.
@@ -648,15 +636,21 @@ declare namespace ts.server.protocol {
          */
         file: string;
     }
+    interface TextSpanWithContext extends TextSpan {
+        contextStart?: Location;
+        contextEnd?: Location;
+    }
+    interface FileSpanWithContext extends FileSpan, TextSpanWithContext {
+    }
     interface DefinitionInfoAndBoundSpan {
-        definitions: ReadonlyArray<FileSpan>;
+        definitions: ReadonlyArray<FileSpanWithContext>;
         textSpan: TextSpan;
     }
     /**
      * Definition response message.  Gives text range for definition.
      */
     interface DefinitionResponse extends Response {
-        body?: FileSpan[];
+        body?: FileSpanWithContext[];
     }
     interface DefinitionInfoAndBoundSpanReponse extends Response {
         body?: DefinitionInfoAndBoundSpan;
@@ -665,13 +659,13 @@ declare namespace ts.server.protocol {
      * Definition response message.  Gives text range for definition.
      */
     interface TypeDefinitionResponse extends Response {
-        body?: FileSpan[];
+        body?: FileSpanWithContext[];
     }
     /**
      * Implementation response message.  Gives text range for implementations.
      */
     interface ImplementationResponse extends Response {
-        body?: FileSpan[];
+        body?: FileSpanWithContext[];
     }
     /**
      * Request to get brace completion for a location in the file.
@@ -708,7 +702,7 @@ declare namespace ts.server.protocol {
         command: CommandTypes.Occurrences;
     }
     /** @deprecated */
-    interface OccurrencesResponseItem extends FileSpan {
+    interface OccurrencesResponseItem extends FileSpanWithContext {
         /**
          * True if the occurrence is a write location, false otherwise.
          */
@@ -734,7 +728,7 @@ declare namespace ts.server.protocol {
     /**
      * Span augmented with extra information that denotes the kind of the highlighting to be used for span.
      */
-    interface HighlightSpan extends TextSpan {
+    interface HighlightSpan extends TextSpanWithContext {
         kind: HighlightSpanKind;
     }
     /**
@@ -764,7 +758,7 @@ declare namespace ts.server.protocol {
     interface ReferencesRequest extends FileLocationRequest {
         command: CommandTypes.References;
     }
-    interface ReferencesResponseItem extends FileSpan {
+    interface ReferencesResponseItem extends FileSpanWithContext {
         /** Text of line containing the reference.  Including this
          *  with the response avoids latency of editor loading files
          * to show text of reference line (the server already has
@@ -879,7 +873,7 @@ declare namespace ts.server.protocol {
         /** The text spans in this group */
         locs: RenameTextSpan[];
     }
-    interface RenameTextSpan extends TextSpan {
+    interface RenameTextSpan extends TextSpanWithContext {
         readonly prefixText?: string;
         readonly suffixText?: string;
     }
@@ -1024,6 +1018,22 @@ declare namespace ts.server.protocol {
         command: CommandTypes.ConfigurePlugin;
         arguments: ConfigurePluginRequestArguments;
     }
+    interface ConfigurePluginResponse extends Response {
+    }
+    interface SelectionRangeRequest extends FileRequest {
+        command: CommandTypes.SelectionRange;
+        arguments: SelectionRangeRequestArgs;
+    }
+    interface SelectionRangeRequestArgs extends FileRequestArgs {
+        locations: Location[];
+    }
+    interface SelectionRangeResponse extends Response {
+        body?: SelectionRange[];
+    }
+    interface SelectionRange {
+        textSpan: TextSpan;
+        parent?: SelectionRange;
+    }
     /**
      *  Information found in an "open" request.
      */
@@ -2409,6 +2419,9 @@ declare namespace ts.server.protocol {
         ES2015 = "ES2015",
         ES2016 = "ES2016",
         ES2017 = "ES2017",
+        ES2018 = "ES2018",
+        ES2019 = "ES2019",
+        ES2020 = "ES2020",
         ESNext = "ESNext"
     }
 }
diff --git a/lib/ru/diagnosticMessages.generated.json b/lib/ru/diagnosticMessages.generated.json
index 90d11ced277..468fd47b888 100644
--- a/lib/ru/diagnosticMessages.generated.json
+++ b/lib/ru/diagnosticMessages.generated.json
@@ -355,7 +355,7 @@
   "Element_implicitly_has_an_any_type_because_type_0_has_no_index_signature_7017": "Элемент неявно имеет тип any, так как тип \"{0}\" не содержит сигнатуру индекса.",
   "Emit_a_UTF_8_Byte_Order_Mark_BOM_in_the_beginning_of_output_files_6164": "Порождать метку порядка байтов UTF-8 в начале выходных файлов.",
   "Emit_a_single_file_with_source_maps_instead_of_having_a_separate_file_6151": "Порождать один файл с сопоставлениями источников, а не создавать отдельный файл.",
-  "Emit_the_source_alongside_the_sourcemaps_within_a_single_file_requires_inlineSourceMap_or_sourceMap__6152": "Порождать источник вместе с sourcemap в одном файле (нужно задать параметр --inlineSourceMap или --sourceMap).",
+  "Emit_the_source_alongside_the_sourcemaps_within_a_single_file_requires_inlineSourceMap_or_sourceMap__6152": "Порождать источник вместе с сопоставителями с исходным кодом в одном файле (нужно задать параметр --inlineSourceMap или --sourceMap).",
   "Enable_all_strict_type_checking_options_6180": "Включить все параметры строгой проверки типов.",
   "Enable_project_compilation_6302": "Включить компиляцию проекта",
   "Enable_strict_checking_of_function_types_6186": "Включение строгой проверки типов функций.",
@@ -445,7 +445,7 @@
   "Function_overload_must_be_static_2387": "Перегрузка функции должна быть статической.",
   "Function_overload_must_not_be_static_2388": "Перегрузка функции не должна быть статической.",
   "Generate_get_and_set_accessors_95046": "Создать методы доступа get и set",
-  "Generates_a_sourcemap_for_each_corresponding_d_ts_file_6000": "Создает sourcemap для каждого соответствующего файла \".d.ts\".",
+  "Generates_a_sourcemap_for_each_corresponding_d_ts_file_6000": "Создает сопоставитель с исходным кодом для каждого соответствующего файла \".d.ts\".",
   "Generates_corresponding_d_ts_file_6002": "Создает соответствующий D.TS-файл.",
   "Generates_corresponding_map_file_6043": "Создает соответствующий файл с расширением \".map\".",
   "Generator_implicitly_has_type_0_because_it_does_not_yield_any_values_Consider_supplying_a_return_typ_7025": "Генератор неявно имеет тип \"{0}\", поскольку он не предоставляет никаких значений. Рекомендуется указать тип возвращаемого значения.",
diff --git a/lib/tsc.js b/lib/tsc.js
index 63a7accb5a3..ba422ff94a2 100644
--- a/lib/tsc.js
+++ b/lib/tsc.js
@@ -59,7 +59,7 @@ var __makeTemplateObject = (this && this.__makeTemplateObject) || function (cook
 };
 var ts;
 (function (ts) {
-    ts.versionMajorMinor = "3.4";
+    ts.versionMajorMinor = "3.6";
     ts.version = ts.versionMajorMinor + ".0-dev";
 })(ts || (ts = {}));
 (function (ts) {
@@ -196,11 +196,12 @@ var ts;
             class_1.prototype.forEach = function (action) {
                 var iterator = this.entries();
                 while (true) {
-                    var _a = iterator.next(), entry = _a.value, done = _a.done;
-                    if (done) {
+                    var iterResult = iterator.next();
+                    if (iterResult.done) {
                         break;
                     }
-                    action(entry[1], entry[0]);
+                    var _a = iterResult.value, key = _a[0], value = _a[1];
+                    action(value, key);
                 }
             };
             return class_1;
@@ -238,11 +239,11 @@ var ts;
     ts.firstDefined = firstDefined;
     function firstDefinedIterator(iter, callback) {
         while (true) {
-            var _a = iter.next(), value = _a.value, done = _a.done;
-            if (done) {
+            var iterResult = iter.next();
+            if (iterResult.done) {
                 return undefined;
             }
-            var result = callback(value);
+            var result = callback(iterResult.value);
             if (result !== undefined) {
                 return result;
             }
@@ -251,7 +252,7 @@ var ts;
     ts.firstDefinedIterator = firstDefinedIterator;
     function zipWith(arrayA, arrayB, callback) {
         var result = [];
-        Debug.assertEqual(arrayA.length, arrayB.length);
+        ts.Debug.assertEqual(arrayA.length, arrayB.length);
         for (var i = 0; i < arrayA.length; i++) {
             result.push(callback(arrayA[i], arrayB[i], i));
         }
@@ -259,7 +260,7 @@ var ts;
     }
     ts.zipWith = zipWith;
     function zipToIterator(arrayA, arrayB) {
-        Debug.assertEqual(arrayA.length, arrayB.length);
+        ts.Debug.assertEqual(arrayA.length, arrayB.length);
         var i = 0;
         return {
             next: function () {
@@ -273,7 +274,7 @@ var ts;
     }
     ts.zipToIterator = zipToIterator;
     function zipToMap(keys, values) {
-        Debug.assert(keys.length === values.length);
+        ts.Debug.assert(keys.length === values.length);
         var map = createMap();
         for (var i = 0; i < keys.length; ++i) {
             map.set(keys[i], values[i]);
@@ -337,7 +338,7 @@ var ts;
                 return result;
             }
         }
-        return Debug.fail();
+        return ts.Debug.fail();
     }
     ts.findMap = findMap;
     function contains(array, value, equalityComparer) {
@@ -456,18 +457,15 @@ var ts;
     }
     ts.sameMap = sameMap;
     function flatten(array) {
-        var result;
-        if (array) {
-            result = [];
-            for (var _i = 0, array_2 = array; _i < array_2.length; _i++) {
-                var v = array_2[_i];
-                if (v) {
-                    if (isArray(v)) {
-                        addRange(result, v);
-                    }
-                    else {
-                        result.push(v);
-                    }
+        var result = [];
+        for (var _i = 0, array_2 = array; _i < array_2.length; _i++) {
+            var v = array_2[_i];
+            if (v) {
+                if (isArray(v)) {
+                    addRange(result, v);
+                }
+                else {
+                    result.push(v);
                 }
             }
         }
@@ -745,7 +743,7 @@ var ts;
                 case 0:
                     continue;
                 case -1:
-                    return Debug.fail("Array is unsorted.");
+                    return ts.Debug.fail("Array is unsorted.");
             }
             deduplicated.push(last = next);
         }
@@ -806,11 +804,11 @@ var ts;
         var result = [];
         loopB: for (var offsetA = 0, offsetB = 0; offsetB < arrayB.length; offsetB++) {
             if (offsetB > 0) {
-                Debug.assertGreaterThanOrEqual(comparer(arrayB[offsetB], arrayB[offsetB - 1]), 0);
+                ts.Debug.assertGreaterThanOrEqual(comparer(arrayB[offsetB], arrayB[offsetB - 1]), 0);
             }
             loopA: for (var startA = offsetA; offsetA < arrayA.length; offsetA++) {
                 if (offsetA > startA) {
-                    Debug.assertGreaterThanOrEqual(comparer(arrayA[offsetA], arrayA[offsetA - 1]), 0);
+                    ts.Debug.assertGreaterThanOrEqual(comparer(arrayA[offsetA], arrayA[offsetA - 1]), 0);
                 }
                 switch (comparer(arrayB[offsetB], arrayA[offsetA])) {
                     case -1:
@@ -948,7 +946,7 @@ var ts;
     }
     ts.firstOrUndefined = firstOrUndefined;
     function first(array) {
-        Debug.assert(array.length !== 0);
+        ts.Debug.assert(array.length !== 0);
         return array[0];
     }
     ts.first = first;
@@ -957,7 +955,7 @@ var ts;
     }
     ts.lastOrUndefined = lastOrUndefined;
     function last(array) {
-        Debug.assert(array.length !== 0);
+        ts.Debug.assert(array.length !== 0);
         return array[array.length - 1];
     }
     ts.last = last;
@@ -1060,10 +1058,9 @@ var ts;
     }
     ts.getOwnValues = getOwnValues;
     function arrayFrom(iterator, map) {
-        var _a;
         var result = [];
-        for (var _b = iterator.next(), value = _b.value, done = _b.done; !done; _a = iterator.next(), value = _a.value, done = _a.done, _a) {
-            result.push(map ? map(value) : value);
+        for (var iterResult = iterator.next(); !iterResult.done; iterResult = iterator.next()) {
+            result.push(map ? map(iterResult.value) : iterResult.value);
         }
         return result;
     }
@@ -1231,7 +1228,7 @@ var ts;
     function cast(value, test) {
         if (value !== undefined && test(value))
             return value;
-        return Debug.fail("Invalid cast. The supplied value " + value + " did not pass the test '" + Debug.getFunctionName(test) + "'.");
+        return ts.Debug.fail("Invalid cast. The supplied value " + value + " did not pass the test '" + ts.Debug.getFunctionName(test) + "'.");
     }
     ts.cast = cast;
     function noop(_) { }
@@ -1240,6 +1237,8 @@ var ts;
     ts.returnFalse = returnFalse;
     function returnTrue() { return true; }
     ts.returnTrue = returnTrue;
+    function returnUndefined() { return undefined; }
+    ts.returnUndefined = returnUndefined;
     function identity(x) { return x; }
     ts.identity = identity;
     function toLowerCase(x) { return x.toLowerCase(); }
@@ -1259,38 +1258,13 @@ var ts;
         };
     }
     ts.memoize = memoize;
-    function chain(a, b, c, d, e) {
+    function compose(a, b, c, d, e) {
         if (e) {
             var args_2 = [];
             for (var i = 0; i < arguments.length; i++) {
                 args_2[i] = arguments[i];
             }
-            return function (t) { return compose.apply(void 0, map(args_2, function (f) { return f(t); })); };
-        }
-        else if (d) {
-            return function (t) { return compose(a(t), b(t), c(t), d(t)); };
-        }
-        else if (c) {
-            return function (t) { return compose(a(t), b(t), c(t)); };
-        }
-        else if (b) {
-            return function (t) { return compose(a(t), b(t)); };
-        }
-        else if (a) {
-            return function (t) { return compose(a(t)); };
-        }
-        else {
-            return function (_) { return function (u) { return u; }; };
-        }
-    }
-    ts.chain = chain;
-    function compose(a, b, c, d, e) {
-        if (e) {
-            var args_3 = [];
-            for (var i = 0; i < arguments.length; i++) {
-                args_3[i] = arguments[i];
-            }
-            return function (t) { return reduceLeft(args_3, function (u, f) { return f(u); }, t); };
+            return function (t) { return reduceLeft(args_2, function (u, f) { return f(u); }, t); };
         }
         else if (d) {
             return function (t) { return d(c(b(a(t)))); };
@@ -1309,92 +1283,6 @@ var ts;
         }
     }
     ts.compose = compose;
-    var Debug;
-    (function (Debug) {
-        Debug.currentAssertionLevel = 0;
-        Debug.isDebugging = false;
-        function shouldAssert(level) {
-            return Debug.currentAssertionLevel >= level;
-        }
-        Debug.shouldAssert = shouldAssert;
-        function assert(expression, message, verboseDebugInfo, stackCrawlMark) {
-            if (!expression) {
-                if (verboseDebugInfo) {
-                    message += "\r\nVerbose Debug Information: " + (typeof verboseDebugInfo === "string" ? verboseDebugInfo : verboseDebugInfo());
-                }
-                fail(message ? "False expression: " + message : "False expression.", stackCrawlMark || assert);
-            }
-        }
-        Debug.assert = assert;
-        function assertEqual(a, b, msg, msg2) {
-            if (a !== b) {
-                var message = msg ? msg2 ? msg + " " + msg2 : msg : "";
-                fail("Expected " + a + " === " + b + ". " + message);
-            }
-        }
-        Debug.assertEqual = assertEqual;
-        function assertLessThan(a, b, msg) {
-            if (a >= b) {
-                fail("Expected " + a + " < " + b + ". " + (msg || ""));
-            }
-        }
-        Debug.assertLessThan = assertLessThan;
-        function assertLessThanOrEqual(a, b) {
-            if (a > b) {
-                fail("Expected " + a + " <= " + b);
-            }
-        }
-        Debug.assertLessThanOrEqual = assertLessThanOrEqual;
-        function assertGreaterThanOrEqual(a, b) {
-            if (a < b) {
-                fail("Expected " + a + " >= " + b);
-            }
-        }
-        Debug.assertGreaterThanOrEqual = assertGreaterThanOrEqual;
-        function fail(message, stackCrawlMark) {
-            debugger;
-            var e = new Error(message ? "Debug Failure. " + message : "Debug Failure.");
-            if (Error.captureStackTrace) {
-                Error.captureStackTrace(e, stackCrawlMark || fail);
-            }
-            throw e;
-        }
-        Debug.fail = fail;
-        function assertDefined(value, message) {
-            if (value === undefined || value === null)
-                return fail(message);
-            return value;
-        }
-        Debug.assertDefined = assertDefined;
-        function assertEachDefined(value, message) {
-            for (var _i = 0, value_1 = value; _i < value_1.length; _i++) {
-                var v = value_1[_i];
-                assertDefined(v, message);
-            }
-            return value;
-        }
-        Debug.assertEachDefined = assertEachDefined;
-        function assertNever(member, message, stackCrawlMark) {
-            if (message === void 0) { message = "Illegal value:"; }
-            var detail = typeof member === "object" && "kind" in member && "pos" in member ? "SyntaxKind: " + Debug.showSyntaxKind(member) : JSON.stringify(member);
-            return fail(message + " " + detail, stackCrawlMark || assertNever);
-        }
-        Debug.assertNever = assertNever;
-        function getFunctionName(func) {
-            if (typeof func !== "function") {
-                return "";
-            }
-            else if (func.hasOwnProperty("name")) {
-                return func.name;
-            }
-            else {
-                var text = Function.prototype.toString.call(func);
-                var match = /^function\s+([\w\$]+)\s*\(/.exec(text);
-                return match ? match[1] : "";
-            }
-        }
-        Debug.getFunctionName = getFunctionName;
-    })(Debug = ts.Debug || (ts.Debug = {}));
     function equateValues(a, b) {
         return a === b;
     }
@@ -1565,7 +1453,7 @@ var ts;
                     bestCandidate = candidate;
                 }
                 else {
-                    Debug.assert(distance < bestDistance);
+                    ts.Debug.assert(distance < bestDistance);
                     bestDistance = distance;
                     bestCandidate = candidate;
                 }
@@ -1691,7 +1579,7 @@ var ts;
     }
     ts.patternText = patternText;
     function matchedText(pattern, candidate) {
-        Debug.assert(isPatternMatch(pattern, candidate));
+        ts.Debug.assert(isPatternMatch(pattern, candidate));
         return candidate.substring(pattern.prefix.length, candidate.length - pattern.suffix.length);
     }
     ts.matchedText = matchedText;
@@ -1782,6 +1670,259 @@ var ts;
         return result;
     }
     ts.fill = fill;
+    function cartesianProduct(arrays) {
+        var result = [];
+        cartesianProductWorker(arrays, result, undefined, 0);
+        return result;
+    }
+    ts.cartesianProduct = cartesianProduct;
+    function cartesianProductWorker(arrays, result, outer, index) {
+        for (var _i = 0, _a = arrays[index]; _i < _a.length; _i++) {
+            var element = _a[_i];
+            var inner = void 0;
+            if (outer) {
+                inner = outer.slice();
+                inner.push(element);
+            }
+            else {
+                inner = [element];
+            }
+            if (index === arrays.length - 1) {
+                result.push(inner);
+            }
+            else {
+                cartesianProductWorker(arrays, result, inner, index + 1);
+            }
+        }
+    }
+})(ts || (ts = {}));
+var ts;
+(function (ts) {
+    var Debug;
+    (function (Debug) {
+        Debug.currentAssertionLevel = 0;
+        Debug.isDebugging = false;
+        function shouldAssert(level) {
+            return Debug.currentAssertionLevel >= level;
+        }
+        Debug.shouldAssert = shouldAssert;
+        function assert(expression, message, verboseDebugInfo, stackCrawlMark) {
+            if (!expression) {
+                if (verboseDebugInfo) {
+                    message += "\r\nVerbose Debug Information: " + (typeof verboseDebugInfo === "string" ? verboseDebugInfo : verboseDebugInfo());
+                }
+                fail(message ? "False expression: " + message : "False expression.", stackCrawlMark || assert);
+            }
+        }
+        Debug.assert = assert;
+        function assertEqual(a, b, msg, msg2) {
+            if (a !== b) {
+                var message = msg ? msg2 ? msg + " " + msg2 : msg : "";
+                fail("Expected " + a + " === " + b + ". " + message);
+            }
+        }
+        Debug.assertEqual = assertEqual;
+        function assertLessThan(a, b, msg) {
+            if (a >= b) {
+                fail("Expected " + a + " < " + b + ". " + (msg || ""));
+            }
+        }
+        Debug.assertLessThan = assertLessThan;
+        function assertLessThanOrEqual(a, b) {
+            if (a > b) {
+                fail("Expected " + a + " <= " + b);
+            }
+        }
+        Debug.assertLessThanOrEqual = assertLessThanOrEqual;
+        function assertGreaterThanOrEqual(a, b) {
+            if (a < b) {
+                fail("Expected " + a + " >= " + b);
+            }
+        }
+        Debug.assertGreaterThanOrEqual = assertGreaterThanOrEqual;
+        function fail(message, stackCrawlMark) {
+            debugger;
+            var e = new Error(message ? "Debug Failure. " + message : "Debug Failure.");
+            if (Error.captureStackTrace) {
+                Error.captureStackTrace(e, stackCrawlMark || fail);
+            }
+            throw e;
+        }
+        Debug.fail = fail;
+        function assertDefined(value, message) {
+            if (value === undefined || value === null)
+                return fail(message);
+            return value;
+        }
+        Debug.assertDefined = assertDefined;
+        function assertEachDefined(value, message) {
+            for (var _i = 0, value_1 = value; _i < value_1.length; _i++) {
+                var v = value_1[_i];
+                assertDefined(v, message);
+            }
+            return value;
+        }
+        Debug.assertEachDefined = assertEachDefined;
+        function assertNever(member, message, stackCrawlMark) {
+            if (message === void 0) { message = "Illegal value:"; }
+            var detail = typeof member === "object" && "kind" in member && "pos" in member && formatSyntaxKind ? "SyntaxKind: " + formatSyntaxKind(member.kind) : JSON.stringify(member);
+            return fail(message + " " + detail, stackCrawlMark || assertNever);
+        }
+        Debug.assertNever = assertNever;
+        function getFunctionName(func) {
+            if (typeof func !== "function") {
+                return "";
+            }
+            else if (func.hasOwnProperty("name")) {
+                return func.name;
+            }
+            else {
+                var text = Function.prototype.toString.call(func);
+                var match = /^function\s+([\w\$]+)\s*\(/.exec(text);
+                return match ? match[1] : "";
+            }
+        }
+        Debug.getFunctionName = getFunctionName;
+        function formatSymbol(symbol) {
+            return "{ name: " + ts.unescapeLeadingUnderscores(symbol.escapedName) + "; flags: " + formatSymbolFlags(symbol.flags) + "; declarations: " + ts.map(symbol.declarations, function (node) { return formatSyntaxKind(node.kind); }) + " }";
+        }
+        Debug.formatSymbol = formatSymbol;
+        function formatEnum(value, enumObject, isFlags) {
+            if (value === void 0) { value = 0; }
+            var members = getEnumMembers(enumObject);
+            if (value === 0) {
+                return members.length > 0 && members[0][0] === 0 ? members[0][1] : "0";
+            }
+            if (isFlags) {
+                var result = "";
+                var remainingFlags = value;
+                for (var i = members.length - 1; i >= 0 && remainingFlags !== 0; i--) {
+                    var _a = members[i], enumValue = _a[0], enumName = _a[1];
+                    if (enumValue !== 0 && (remainingFlags & enumValue) === enumValue) {
+                        remainingFlags &= ~enumValue;
+                        result = "" + enumName + (result ? "|" : "") + result;
+                    }
+                }
+                if (remainingFlags === 0) {
+                    return result;
+                }
+            }
+            else {
+                for (var _i = 0, members_1 = members; _i < members_1.length; _i++) {
+                    var _b = members_1[_i], enumValue = _b[0], enumName = _b[1];
+                    if (enumValue === value) {
+                        return enumName;
+                    }
+                }
+            }
+            return value.toString();
+        }
+        Debug.formatEnum = formatEnum;
+        function getEnumMembers(enumObject) {
+            var result = [];
+            for (var name in enumObject) {
+                var value = enumObject[name];
+                if (typeof value === "number") {
+                    result.push([value, name]);
+                }
+            }
+            return ts.stableSort(result, function (x, y) { return ts.compareValues(x[0], y[0]); });
+        }
+        function formatSyntaxKind(kind) {
+            return formatEnum(kind, ts.SyntaxKind, false);
+        }
+        Debug.formatSyntaxKind = formatSyntaxKind;
+        function formatNodeFlags(flags) {
+            return formatEnum(flags, ts.NodeFlags, true);
+        }
+        Debug.formatNodeFlags = formatNodeFlags;
+        function formatModifierFlags(flags) {
+            return formatEnum(flags, ts.ModifierFlags, true);
+        }
+        Debug.formatModifierFlags = formatModifierFlags;
+        function formatTransformFlags(flags) {
+            return formatEnum(flags, ts.TransformFlags, true);
+        }
+        Debug.formatTransformFlags = formatTransformFlags;
+        function formatEmitFlags(flags) {
+            return formatEnum(flags, ts.EmitFlags, true);
+        }
+        Debug.formatEmitFlags = formatEmitFlags;
+        function formatSymbolFlags(flags) {
+            return formatEnum(flags, ts.SymbolFlags, true);
+        }
+        Debug.formatSymbolFlags = formatSymbolFlags;
+        function formatTypeFlags(flags) {
+            return formatEnum(flags, ts.TypeFlags, true);
+        }
+        Debug.formatTypeFlags = formatTypeFlags;
+        function formatObjectFlags(flags) {
+            return formatEnum(flags, ts.ObjectFlags, true);
+        }
+        Debug.formatObjectFlags = formatObjectFlags;
+        function failBadSyntaxKind(node, message) {
+            return fail((message || "Unexpected node.") + "\r\nNode " + formatSyntaxKind(node.kind) + " was unexpected.", failBadSyntaxKind);
+        }
+        Debug.failBadSyntaxKind = failBadSyntaxKind;
+        Debug.assertEachNode = shouldAssert(1)
+            ? function (nodes, test, message) { return assert(test === undefined || ts.every(nodes, test), message || "Unexpected node.", function () { return "Node array did not pass test '" + getFunctionName(test) + "'."; }, Debug.assertEachNode); }
+            : ts.noop;
+        Debug.assertNode = shouldAssert(1)
+            ? function (node, test, message) { return assert(test === undefined || test(node), message || "Unexpected node.", function () { return "Node " + formatSyntaxKind(node.kind) + " did not pass test '" + getFunctionName(test) + "'."; }, Debug.assertNode); }
+            : ts.noop;
+        Debug.assertOptionalNode = shouldAssert(1)
+            ? function (node, test, message) { return assert(test === undefined || node === undefined || test(node), message || "Unexpected node.", function () { return "Node " + formatSyntaxKind(node.kind) + " did not pass test '" + getFunctionName(test) + "'."; }, Debug.assertOptionalNode); }
+            : ts.noop;
+        Debug.assertOptionalToken = shouldAssert(1)
+            ? function (node, kind, message) { return assert(kind === undefined || node === undefined || node.kind === kind, message || "Unexpected node.", function () { return "Node " + formatSyntaxKind(node.kind) + " was not a '" + formatSyntaxKind(kind) + "' token."; }, Debug.assertOptionalToken); }
+            : ts.noop;
+        Debug.assertMissingNode = shouldAssert(1)
+            ? function (node, message) { return assert(node === undefined, message || "Unexpected node.", function () { return "Node " + formatSyntaxKind(node.kind) + " was unexpected'."; }, Debug.assertMissingNode); }
+            : ts.noop;
+        var isDebugInfoEnabled = false;
+        function enableDebugInfo() {
+            if (isDebugInfoEnabled)
+                return;
+            Object.defineProperties(ts.objectAllocator.getSymbolConstructor().prototype, {
+                __debugFlags: { get: function () { return formatSymbolFlags(this.flags); } }
+            });
+            Object.defineProperties(ts.objectAllocator.getTypeConstructor().prototype, {
+                __debugFlags: { get: function () { return formatTypeFlags(this.flags); } },
+                __debugObjectFlags: { get: function () { return this.flags & 524288 ? formatObjectFlags(this.objectFlags) : ""; } },
+                __debugTypeToString: { value: function () { return this.checker.typeToString(this); } },
+            });
+            var nodeConstructors = [
+                ts.objectAllocator.getNodeConstructor(),
+                ts.objectAllocator.getIdentifierConstructor(),
+                ts.objectAllocator.getTokenConstructor(),
+                ts.objectAllocator.getSourceFileConstructor()
+            ];
+            for (var _i = 0, nodeConstructors_1 = nodeConstructors; _i < nodeConstructors_1.length; _i++) {
+                var ctor = nodeConstructors_1[_i];
+                if (!ctor.prototype.hasOwnProperty("__debugKind")) {
+                    Object.defineProperties(ctor.prototype, {
+                        __debugKind: { get: function () { return formatSyntaxKind(this.kind); } },
+                        __debugNodeFlags: { get: function () { return formatNodeFlags(this.flags); } },
+                        __debugModifierFlags: { get: function () { return formatModifierFlags(ts.getModifierFlagsNoCache(this)); } },
+                        __debugTransformFlags: { get: function () { return formatTransformFlags(this.transformFlags); } },
+                        __debugIsParseTreeNode: { get: function () { return ts.isParseTreeNode(this); } },
+                        __debugEmitFlags: { get: function () { return formatEmitFlags(ts.getEmitFlags(this)); } },
+                        __debugGetText: {
+                            value: function (includeTrivia) {
+                                if (ts.nodeIsSynthesized(this))
+                                    return "";
+                                var parseNode = ts.getParseTreeNode(this);
+                                var sourceFile = parseNode && ts.getSourceFileOfNode(parseNode);
+                                return sourceFile ? ts.getSourceTextOfNodeFromSourceFile(sourceFile, parseNode, includeTrivia) : "";
+                            }
+                        }
+                    });
+                }
+            }
+            isDebugInfoEnabled = true;
+        }
+        Debug.enableDebugInfo = enableDebugInfo;
+    })(Debug = ts.Debug || (ts.Debug = {}));
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
@@ -2161,6 +2302,7 @@ var ts;
         ExitStatus[ExitStatus["Success"] = 0] = "Success";
         ExitStatus[ExitStatus["DiagnosticsPresent_OutputsSkipped"] = 1] = "DiagnosticsPresent_OutputsSkipped";
         ExitStatus[ExitStatus["DiagnosticsPresent_OutputsGenerated"] = 2] = "DiagnosticsPresent_OutputsGenerated";
+        ExitStatus[ExitStatus["InvalidProject_OutputsSkipped"] = 3] = "InvalidProject_OutputsSkipped";
     })(ExitStatus = ts.ExitStatus || (ts.ExitStatus = {}));
     var TypeReferenceSerializationKind;
     (function (TypeReferenceSerializationKind) {
@@ -2203,12 +2345,9 @@ var ts;
         ModuleKind[ModuleKind["UMD"] = 3] = "UMD";
         ModuleKind[ModuleKind["System"] = 4] = "System";
         ModuleKind[ModuleKind["ES2015"] = 5] = "ES2015";
-        ModuleKind[ModuleKind["ESNext"] = 6] = "ESNext";
+        ModuleKind[ModuleKind["ESNext"] = 99] = "ESNext";
     })(ModuleKind = ts.ModuleKind || (ts.ModuleKind = {}));
-    function _contextuallyTypePragmas(args) {
-        return args;
-    }
-    ts.commentPragmas = _contextuallyTypePragmas({
+    ts.commentPragmas = {
         "reference": {
             args: [
                 { name: "types", optional: true, captureSpan: true },
@@ -2236,13 +2375,16 @@ var ts;
             args: [{ name: "factory" }],
             kind: 4
         },
-    });
+    };
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
     function generateDjb2Hash(data) {
-        var chars = data.split("").map(function (str) { return str.charCodeAt(0); });
-        return "" + chars.reduce(function (prev, curr) { return ((prev << 5) + prev) + curr; }, 5381);
+        var acc = 5381;
+        for (var i = 0; i < data.length; i++) {
+            acc = ((acc << 5) + acc) + data.charCodeAt(i);
+        }
+        return acc.toString();
     }
     ts.generateDjb2Hash = generateDjb2Hash;
     function setStackTraceLimit() {
@@ -2472,7 +2614,7 @@ var ts;
                 : FileWatcherEventKind.Changed;
     }
     ts.getFileWatcherEventKind = getFileWatcherEventKind;
-    ts.ignoredPaths = ["/node_modules/.", "/.git"];
+    ts.ignoredPaths = ["/node_modules/.", "/.git", "/.#"];
     function createRecursiveDirectoryWatcher(host) {
         var cache = ts.createMap();
         var callbackCache = ts.createMultiMap();
@@ -2959,7 +3101,7 @@ var ts;
                 }
             }
             function readDirectory(path, extensions, excludes, includes, depth) {
-                return ts.matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, process.cwd(), depth, getAccessibleFileSystemEntries);
+                return ts.matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, process.cwd(), depth, getAccessibleFileSystemEntries, realpath);
             }
             function fileSystemEntryExists(path, entryKind) {
                 try {
@@ -3136,7 +3278,7 @@ var ts;
         _0_modifier_cannot_appear_on_a_data_property: diag(1043, ts.DiagnosticCategory.Error, "_0_modifier_cannot_appear_on_a_data_property_1043", "'{0}' modifier cannot appear on a data property."),
         _0_modifier_cannot_appear_on_a_module_or_namespace_element: diag(1044, ts.DiagnosticCategory.Error, "_0_modifier_cannot_appear_on_a_module_or_namespace_element_1044", "'{0}' modifier cannot appear on a module or namespace element."),
         A_0_modifier_cannot_be_used_with_an_interface_declaration: diag(1045, ts.DiagnosticCategory.Error, "A_0_modifier_cannot_be_used_with_an_interface_declaration_1045", "A '{0}' modifier cannot be used with an interface declaration."),
-        A_declare_modifier_is_required_for_a_top_level_declaration_in_a_d_ts_file: diag(1046, ts.DiagnosticCategory.Error, "A_declare_modifier_is_required_for_a_top_level_declaration_in_a_d_ts_file_1046", "A 'declare' modifier is required for a top level declaration in a .d.ts file."),
+        Top_level_declarations_in_d_ts_files_must_start_with_either_a_declare_or_export_modifier: diag(1046, ts.DiagnosticCategory.Error, "Top_level_declarations_in_d_ts_files_must_start_with_either_a_declare_or_export_modifier_1046", "Top-level declarations in .d.ts files must start with either a 'declare' or 'export' modifier."),
         A_rest_parameter_cannot_be_optional: diag(1047, ts.DiagnosticCategory.Error, "A_rest_parameter_cannot_be_optional_1047", "A rest parameter cannot be optional."),
         A_rest_parameter_cannot_have_an_initializer: diag(1048, ts.DiagnosticCategory.Error, "A_rest_parameter_cannot_have_an_initializer_1048", "A rest parameter cannot have an initializer."),
         A_set_accessor_must_have_exactly_one_parameter: diag(1049, ts.DiagnosticCategory.Error, "A_set_accessor_must_have_exactly_one_parameter_1049", "A 'set' accessor must have exactly one parameter."),
@@ -3265,7 +3407,7 @@ var ts;
         Cannot_re_export_a_type_when_the_isolatedModules_flag_is_provided: diag(1205, ts.DiagnosticCategory.Error, "Cannot_re_export_a_type_when_the_isolatedModules_flag_is_provided_1205", "Cannot re-export a type when the '--isolatedModules' flag is provided."),
         Decorators_are_not_valid_here: diag(1206, ts.DiagnosticCategory.Error, "Decorators_are_not_valid_here_1206", "Decorators are not valid here."),
         Decorators_cannot_be_applied_to_multiple_get_Slashset_accessors_of_the_same_name: diag(1207, ts.DiagnosticCategory.Error, "Decorators_cannot_be_applied_to_multiple_get_Slashset_accessors_of_the_same_name_1207", "Decorators cannot be applied to multiple get/set accessors of the same name."),
-        Cannot_compile_namespaces_when_the_isolatedModules_flag_is_provided: diag(1208, ts.DiagnosticCategory.Error, "Cannot_compile_namespaces_when_the_isolatedModules_flag_is_provided_1208", "Cannot compile namespaces when the '--isolatedModules' flag is provided."),
+        All_files_must_be_modules_when_the_isolatedModules_flag_is_provided: diag(1208, ts.DiagnosticCategory.Error, "All_files_must_be_modules_when_the_isolatedModules_flag_is_provided_1208", "All files must be modules when the '--isolatedModules' flag is provided."),
         Invalid_use_of_0_Class_definitions_are_automatically_in_strict_mode: diag(1210, ts.DiagnosticCategory.Error, "Invalid_use_of_0_Class_definitions_are_automatically_in_strict_mode_1210", "Invalid use of '{0}'. Class definitions are automatically in strict mode."),
         A_class_declaration_without_the_default_modifier_must_have_a_name: diag(1211, ts.DiagnosticCategory.Error, "A_class_declaration_without_the_default_modifier_must_have_a_name_1211", "A class declaration without the 'default' modifier must have a name."),
         Identifier_expected_0_is_a_reserved_word_in_strict_mode: diag(1212, ts.DiagnosticCategory.Error, "Identifier_expected_0_is_a_reserved_word_in_strict_mode_1212", "Identifier expected. '{0}' is a reserved word in strict mode."),
@@ -3274,7 +3416,7 @@ var ts;
         Invalid_use_of_0_Modules_are_automatically_in_strict_mode: diag(1215, ts.DiagnosticCategory.Error, "Invalid_use_of_0_Modules_are_automatically_in_strict_mode_1215", "Invalid use of '{0}'. Modules are automatically in strict mode."),
         Identifier_expected_esModule_is_reserved_as_an_exported_marker_when_transforming_ECMAScript_modules: diag(1216, ts.DiagnosticCategory.Error, "Identifier_expected_esModule_is_reserved_as_an_exported_marker_when_transforming_ECMAScript_modules_1216", "Identifier expected. '__esModule' is reserved as an exported marker when transforming ECMAScript modules."),
         Export_assignment_is_not_supported_when_module_flag_is_system: diag(1218, ts.DiagnosticCategory.Error, "Export_assignment_is_not_supported_when_module_flag_is_system_1218", "Export assignment is not supported when '--module' flag is 'system'."),
-        Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_to_remove_this_warning: diag(1219, ts.DiagnosticCategory.Error, "Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_t_1219", "Experimental support for decorators is a feature that is subject to change in a future release. Set the 'experimentalDecorators' option to remove this warning."),
+        Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_in_your_tsconfig_or_jsconfig_to_remove_this_warning: diag(1219, ts.DiagnosticCategory.Error, "Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_t_1219", "Experimental support for decorators is a feature that is subject to change in a future release. Set the 'experimentalDecorators' option in your 'tsconfig' or 'jsconfig' to remove this warning."),
         Generators_are_only_available_when_targeting_ECMAScript_2015_or_higher: diag(1220, ts.DiagnosticCategory.Error, "Generators_are_only_available_when_targeting_ECMAScript_2015_or_higher_1220", "Generators are only available when targeting ECMAScript 2015 or higher."),
         Generators_are_not_allowed_in_an_ambient_context: diag(1221, ts.DiagnosticCategory.Error, "Generators_are_not_allowed_in_an_ambient_context_1221", "Generators are not allowed in an ambient context."),
         An_overload_signature_cannot_be_declared_as_a_generator: diag(1222, ts.DiagnosticCategory.Error, "An_overload_signature_cannot_be_declared_as_a_generator_1222", "An overload signature cannot be declared as a generator."),
@@ -3313,6 +3455,8 @@ var ts;
         A_definite_assignment_assertion_is_not_permitted_in_this_context: diag(1255, ts.DiagnosticCategory.Error, "A_definite_assignment_assertion_is_not_permitted_in_this_context_1255", "A definite assignment assertion '!' is not permitted in this context."),
         A_rest_element_must_be_last_in_a_tuple_type: diag(1256, ts.DiagnosticCategory.Error, "A_rest_element_must_be_last_in_a_tuple_type_1256", "A rest element must be last in a tuple type."),
         A_required_element_cannot_follow_an_optional_element: diag(1257, ts.DiagnosticCategory.Error, "A_required_element_cannot_follow_an_optional_element_1257", "A required element cannot follow an optional element."),
+        Definite_assignment_assertions_can_only_be_used_along_with_a_type_annotation: diag(1258, ts.DiagnosticCategory.Error, "Definite_assignment_assertions_can_only_be_used_along_with_a_type_annotation_1258", "Definite assignment assertions can only be used along with a type annotation."),
+        Module_0_can_only_be_default_imported_using_the_1_flag: diag(1259, ts.DiagnosticCategory.Error, "Module_0_can_only_be_default_imported_using_the_1_flag_1259", "Module '{0}' can only be default-imported using the '{1}' flag"),
         with_statements_are_not_allowed_in_an_async_function_block: diag(1300, ts.DiagnosticCategory.Error, "with_statements_are_not_allowed_in_an_async_function_block_1300", "'with' statements are not allowed in an async function block."),
         await_expression_is_only_allowed_within_an_async_function: diag(1308, ts.DiagnosticCategory.Error, "await_expression_is_only_allowed_within_an_async_function_1308", "'await' expression is only allowed within an async function."),
         can_only_be_used_in_an_object_literal_property_inside_a_destructuring_assignment: diag(1312, ts.DiagnosticCategory.Error, "can_only_be_used_in_an_object_literal_property_inside_a_destructuring_assignment_1312", "'=' can only be used in an object literal property inside a destructuring assignment."),
@@ -3357,7 +3501,8 @@ var ts;
         A_bigint_literal_cannot_use_exponential_notation: diag(1352, ts.DiagnosticCategory.Error, "A_bigint_literal_cannot_use_exponential_notation_1352", "A bigint literal cannot use exponential notation."),
         A_bigint_literal_must_be_an_integer: diag(1353, ts.DiagnosticCategory.Error, "A_bigint_literal_must_be_an_integer_1353", "A bigint literal must be an integer."),
         readonly_type_modifier_is_only_permitted_on_array_and_tuple_literal_types: diag(1354, ts.DiagnosticCategory.Error, "readonly_type_modifier_is_only_permitted_on_array_and_tuple_literal_types_1354", "'readonly' type modifier is only permitted on array and tuple literal types."),
-        A_const_assertion_can_only_be_applied_to_a_string_number_boolean_array_or_object_literal: diag(1355, ts.DiagnosticCategory.Error, "A_const_assertion_can_only_be_applied_to_a_string_number_boolean_array_or_object_literal_1355", "A 'const' assertion can only be applied to a string, number, boolean, array, or object literal."),
+        A_const_assertions_can_only_be_applied_to_references_to_enum_members_or_string_number_boolean_array_or_object_literals: diag(1355, ts.DiagnosticCategory.Error, "A_const_assertions_can_only_be_applied_to_references_to_enum_members_or_string_number_boolean_array__1355", "A 'const' assertions can only be applied to references to enum members, or string, number, boolean, array, or object literals."),
+        Did_you_mean_to_mark_this_function_as_async: diag(1356, ts.DiagnosticCategory.Error, "Did_you_mean_to_mark_this_function_as_async_1356", "Did you mean to mark this function as 'async'?"),
         Duplicate_identifier_0: diag(2300, ts.DiagnosticCategory.Error, "Duplicate_identifier_0_2300", "Duplicate identifier '{0}'."),
         Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor: diag(2301, ts.DiagnosticCategory.Error, "Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor_2301", "Initializer of instance member variable '{0}' cannot reference identifier '{1}' declared in the constructor."),
         Static_members_cannot_reference_class_type_parameters: diag(2302, ts.DiagnosticCategory.Error, "Static_members_cannot_reference_class_type_parameters_2302", "Static members cannot reference class type parameters."),
@@ -3407,9 +3552,9 @@ var ts;
         Call_target_does_not_contain_any_signatures: diag(2346, ts.DiagnosticCategory.Error, "Call_target_does_not_contain_any_signatures_2346", "Call target does not contain any signatures."),
         Untyped_function_calls_may_not_accept_type_arguments: diag(2347, ts.DiagnosticCategory.Error, "Untyped_function_calls_may_not_accept_type_arguments_2347", "Untyped function calls may not accept type arguments."),
         Value_of_type_0_is_not_callable_Did_you_mean_to_include_new: diag(2348, ts.DiagnosticCategory.Error, "Value_of_type_0_is_not_callable_Did_you_mean_to_include_new_2348", "Value of type '{0}' is not callable. Did you mean to include 'new'?"),
-        Cannot_invoke_an_expression_whose_type_lacks_a_call_signature_Type_0_has_no_compatible_call_signatures: diag(2349, ts.DiagnosticCategory.Error, "Cannot_invoke_an_expression_whose_type_lacks_a_call_signature_Type_0_has_no_compatible_call_signatur_2349", "Cannot invoke an expression whose type lacks a call signature. Type '{0}' has no compatible call signatures."),
+        This_expression_is_not_callable: diag(2349, ts.DiagnosticCategory.Error, "This_expression_is_not_callable_2349", "This expression is not callable."),
         Only_a_void_function_can_be_called_with_the_new_keyword: diag(2350, ts.DiagnosticCategory.Error, "Only_a_void_function_can_be_called_with_the_new_keyword_2350", "Only a void function can be called with the 'new' keyword."),
-        Cannot_use_new_with_an_expression_whose_type_lacks_a_call_or_construct_signature: diag(2351, ts.DiagnosticCategory.Error, "Cannot_use_new_with_an_expression_whose_type_lacks_a_call_or_construct_signature_2351", "Cannot use 'new' with an expression whose type lacks a call or construct signature."),
+        This_expression_is_not_constructable: diag(2351, ts.DiagnosticCategory.Error, "This_expression_is_not_constructable_2351", "This expression is not constructable."),
         Conversion_of_type_0_to_type_1_may_be_a_mistake_because_neither_type_sufficiently_overlaps_with_the_other_If_this_was_intentional_convert_the_expression_to_unknown_first: diag(2352, ts.DiagnosticCategory.Error, "Conversion_of_type_0_to_type_1_may_be_a_mistake_because_neither_type_sufficiently_overlaps_with_the__2352", "Conversion of type '{0}' to type '{1}' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first."),
         Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1: diag(2353, ts.DiagnosticCategory.Error, "Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1_2353", "Object literal may only specify known properties, and '{0}' does not exist in type '{1}'."),
         This_syntax_requires_an_imported_helper_but_module_0_cannot_be_found: diag(2354, ts.DiagnosticCategory.Error, "This_syntax_requires_an_imported_helper_but_module_0_cannot_be_found_2354", "This syntax requires an imported helper but module '{0}' cannot be found."),
@@ -3539,7 +3684,7 @@ var ts;
         The_left_hand_side_of_a_for_of_statement_must_be_a_variable_or_a_property_access: diag(2487, ts.DiagnosticCategory.Error, "The_left_hand_side_of_a_for_of_statement_must_be_a_variable_or_a_property_access_2487", "The left-hand side of a 'for...of' statement must be a variable or a property access."),
         Type_0_must_have_a_Symbol_iterator_method_that_returns_an_iterator: diag(2488, ts.DiagnosticCategory.Error, "Type_0_must_have_a_Symbol_iterator_method_that_returns_an_iterator_2488", "Type '{0}' must have a '[Symbol.iterator]()' method that returns an iterator."),
         An_iterator_must_have_a_next_method: diag(2489, ts.DiagnosticCategory.Error, "An_iterator_must_have_a_next_method_2489", "An iterator must have a 'next()' method."),
-        The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property: diag(2490, ts.DiagnosticCategory.Error, "The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property_2490", "The type returned by the 'next()' method of an iterator must have a 'value' property."),
+        The_type_returned_by_the_0_method_of_an_iterator_must_have_a_value_property: diag(2490, ts.DiagnosticCategory.Error, "The_type_returned_by_the_0_method_of_an_iterator_must_have_a_value_property_2490", "The type returned by the '{0}()' method of an iterator must have a 'value' property."),
         The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern: diag(2491, ts.DiagnosticCategory.Error, "The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern_2491", "The left-hand side of a 'for...in' statement cannot be a destructuring pattern."),
         Cannot_redeclare_identifier_0_in_catch_clause: diag(2492, ts.DiagnosticCategory.Error, "Cannot_redeclare_identifier_0_in_catch_clause_2492", "Cannot redeclare identifier '{0}' in catch clause."),
         Tuple_type_0_of_length_1_has_no_element_at_index_2: diag(2493, ts.DiagnosticCategory.Error, "Tuple_type_0_of_length_1_has_no_element_at_index_2_2493", "Tuple type '{0}' of length '{1}' has no element at index '{2}'."),
@@ -3596,7 +3741,7 @@ var ts;
         Expression_resolves_to_variable_declaration_newTarget_that_compiler_uses_to_capture_new_target_meta_property_reference: diag(2544, ts.DiagnosticCategory.Error, "Expression_resolves_to_variable_declaration_newTarget_that_compiler_uses_to_capture_new_target_meta__2544", "Expression resolves to variable declaration '_newTarget' that compiler uses to capture 'new.target' meta-property reference."),
         A_mixin_class_must_have_a_constructor_with_a_single_rest_parameter_of_type_any: diag(2545, ts.DiagnosticCategory.Error, "A_mixin_class_must_have_a_constructor_with_a_single_rest_parameter_of_type_any_2545", "A mixin class must have a constructor with a single rest parameter of type 'any[]'."),
         Property_0_has_conflicting_declarations_and_is_inaccessible_in_type_1: diag(2546, ts.DiagnosticCategory.Error, "Property_0_has_conflicting_declarations_and_is_inaccessible_in_type_1_2546", "Property '{0}' has conflicting declarations and is inaccessible in type '{1}'."),
-        The_type_returned_by_the_next_method_of_an_async_iterator_must_be_a_promise_for_a_type_with_a_value_property: diag(2547, ts.DiagnosticCategory.Error, "The_type_returned_by_the_next_method_of_an_async_iterator_must_be_a_promise_for_a_type_with_a_value__2547", "The type returned by the 'next()' method of an async iterator must be a promise for a type with a 'value' property."),
+        The_type_returned_by_the_0_method_of_an_async_iterator_must_be_a_promise_for_a_type_with_a_value_property: diag(2547, ts.DiagnosticCategory.Error, "The_type_returned_by_the_0_method_of_an_async_iterator_must_be_a_promise_for_a_type_with_a_value_pro_2547", "The type returned by the '{0}()' method of an async iterator must be a promise for a type with a 'value' property."),
         Type_0_is_not_an_array_type_or_does_not_have_a_Symbol_iterator_method_that_returns_an_iterator: diag(2548, ts.DiagnosticCategory.Error, "Type_0_is_not_an_array_type_or_does_not_have_a_Symbol_iterator_method_that_returns_an_iterator_2548", "Type '{0}' is not an array type or does not have a '[Symbol.iterator]()' method that returns an iterator."),
         Type_0_is_not_an_array_type_or_a_string_type_or_does_not_have_a_Symbol_iterator_method_that_returns_an_iterator: diag(2549, ts.DiagnosticCategory.Error, "Type_0_is_not_an_array_type_or_a_string_type_or_does_not_have_a_Symbol_iterator_method_that_returns__2549", "Type '{0}' is not an array type or a string type or does not have a '[Symbol.iterator]()' method that returns an iterator."),
         Property_0_does_not_exist_on_type_1_Did_you_mean_2: diag(2551, ts.DiagnosticCategory.Error, "Property_0_does_not_exist_on_type_1_Did_you_mean_2_2551", "Property '{0}' does not exist on type '{1}'. Did you mean '{2}'?"),
@@ -3617,7 +3762,6 @@ var ts;
         A_rest_element_cannot_have_a_property_name: diag(2566, ts.DiagnosticCategory.Error, "A_rest_element_cannot_have_a_property_name_2566", "A rest element cannot have a property name."),
         Enum_declarations_can_only_merge_with_namespace_or_other_enum_declarations: diag(2567, ts.DiagnosticCategory.Error, "Enum_declarations_can_only_merge_with_namespace_or_other_enum_declarations_2567", "Enum declarations can only merge with namespace or other enum declarations."),
         Type_0_is_not_an_array_type_or_a_string_type_Use_compiler_option_downlevelIteration_to_allow_iterating_of_iterators: diag(2569, ts.DiagnosticCategory.Error, "Type_0_is_not_an_array_type_or_a_string_type_Use_compiler_option_downlevelIteration_to_allow_iterati_2569", "Type '{0}' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators."),
-        Property_0_does_not_exist_on_type_1_Did_you_forget_to_use_await: diag(2570, ts.DiagnosticCategory.Error, "Property_0_does_not_exist_on_type_1_Did_you_forget_to_use_await_2570", "Property '{0}' does not exist on type '{1}'. Did you forget to use 'await'?"),
         Object_is_of_type_unknown: diag(2571, ts.DiagnosticCategory.Error, "Object_is_of_type_unknown_2571", "Object is of type 'unknown'."),
         Rest_signatures_are_incompatible: diag(2572, ts.DiagnosticCategory.Error, "Rest_signatures_are_incompatible_2572", "Rest signatures are incompatible."),
         Property_0_is_incompatible_with_rest_element_type: diag(2573, ts.DiagnosticCategory.Error, "Property_0_is_incompatible_with_rest_element_type_2573", "Property '{0}' is incompatible with rest element type."),
@@ -3639,6 +3783,7 @@ var ts;
         Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_node_Try_npm_i_types_Slashnode_and_then_add_node_to_the_types_field_in_your_tsconfig: diag(2591, ts.DiagnosticCategory.Error, "Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_node_Try_npm_i_types_Slashnode_and_th_2591", "Cannot find name '{0}'. Do you need to install type definitions for node? Try `npm i @types/node` and then add `node` to the types field in your tsconfig."),
         Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_jQuery_Try_npm_i_types_Slashjquery_and_then_add_jquery_to_the_types_field_in_your_tsconfig: diag(2592, ts.DiagnosticCategory.Error, "Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_jQuery_Try_npm_i_types_Slashjquery_an_2592", "Cannot find name '{0}'. Do you need to install type definitions for jQuery? Try `npm i @types/jquery` and then add `jquery` to the types field in your tsconfig."),
         Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_a_test_runner_Try_npm_i_types_Slashjest_or_npm_i_types_Slashmocha_and_then_add_jest_or_mocha_to_the_types_field_in_your_tsconfig: diag(2593, ts.DiagnosticCategory.Error, "Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_a_test_runner_Try_npm_i_types_Slashje_2593", "Cannot find name '{0}'. Do you need to install type definitions for a test runner? Try `npm i @types/jest` or `npm i @types/mocha` and then add `jest` or `mocha` to the types field in your tsconfig."),
+        This_module_is_declared_with_using_export_and_can_only_be_used_with_a_default_import_when_using_the_0_flag: diag(2594, ts.DiagnosticCategory.Error, "This_module_is_declared_with_using_export_and_can_only_be_used_with_a_default_import_when_using_the__2594", "This module is declared with using 'export =', and can only be used with a default import when using the '{0}' flag."),
         JSX_element_attributes_type_0_may_not_be_a_union_type: diag(2600, ts.DiagnosticCategory.Error, "JSX_element_attributes_type_0_may_not_be_a_union_type_2600", "JSX element attributes type '{0}' may not be a union type."),
         The_return_type_of_a_JSX_element_constructor_must_return_an_object_type: diag(2601, ts.DiagnosticCategory.Error, "The_return_type_of_a_JSX_element_constructor_must_return_an_object_type_2601", "The return type of a JSX element constructor must return an object type."),
         JSX_element_implicitly_has_type_any_because_the_global_type_JSX_Element_does_not_exist: diag(2602, ts.DiagnosticCategory.Error, "JSX_element_implicitly_has_type_any_because_the_global_type_JSX_Element_does_not_exist_2602", "JSX element implicitly has type 'any' because the global type 'JSX.Element' does not exist."),
@@ -3749,6 +3894,28 @@ var ts;
         _0_refers_to_a_value_but_is_being_used_as_a_type_here: diag(2749, ts.DiagnosticCategory.Error, "_0_refers_to_a_value_but_is_being_used_as_a_type_here_2749", "'{0}' refers to a value, but is being used as a type here."),
         The_implementation_signature_is_declared_here: diag(2750, ts.DiagnosticCategory.Error, "The_implementation_signature_is_declared_here_2750", "The implementation signature is declared here."),
         Circularity_originates_in_type_at_this_location: diag(2751, ts.DiagnosticCategory.Error, "Circularity_originates_in_type_at_this_location_2751", "Circularity originates in type at this location."),
+        The_first_export_default_is_here: diag(2752, ts.DiagnosticCategory.Error, "The_first_export_default_is_here_2752", "The first export default is here."),
+        Another_export_default_is_here: diag(2753, ts.DiagnosticCategory.Error, "Another_export_default_is_here_2753", "Another export default is here."),
+        super_may_not_use_type_arguments: diag(2754, ts.DiagnosticCategory.Error, "super_may_not_use_type_arguments_2754", "'super' may not use type arguments."),
+        No_constituent_of_type_0_is_callable: diag(2755, ts.DiagnosticCategory.Error, "No_constituent_of_type_0_is_callable_2755", "No constituent of type '{0}' is callable."),
+        Not_all_constituents_of_type_0_are_callable: diag(2756, ts.DiagnosticCategory.Error, "Not_all_constituents_of_type_0_are_callable_2756", "Not all constituents of type '{0}' are callable."),
+        Type_0_has_no_call_signatures: diag(2757, ts.DiagnosticCategory.Error, "Type_0_has_no_call_signatures_2757", "Type '{0}' has no call signatures."),
+        Each_member_of_the_union_type_0_has_signatures_but_none_of_those_signatures_are_compatible_with_each_other: diag(2758, ts.DiagnosticCategory.Error, "Each_member_of_the_union_type_0_has_signatures_but_none_of_those_signatures_are_compatible_with_each_2758", "Each member of the union type '{0}' has signatures, but none of those signatures are compatible with each other."),
+        No_constituent_of_type_0_is_constructable: diag(2759, ts.DiagnosticCategory.Error, "No_constituent_of_type_0_is_constructable_2759", "No constituent of type '{0}' is constructable."),
+        Not_all_constituents_of_type_0_are_constructable: diag(2760, ts.DiagnosticCategory.Error, "Not_all_constituents_of_type_0_are_constructable_2760", "Not all constituents of type '{0}' are constructable."),
+        Type_0_has_no_construct_signatures: diag(2761, ts.DiagnosticCategory.Error, "Type_0_has_no_construct_signatures_2761", "Type '{0}' has no construct signatures."),
+        Each_member_of_the_union_type_0_has_construct_signatures_but_none_of_those_signatures_are_compatible_with_each_other: diag(2762, ts.DiagnosticCategory.Error, "Each_member_of_the_union_type_0_has_construct_signatures_but_none_of_those_signatures_are_compatible_2762", "Each member of the union type '{0}' has construct signatures, but none of those signatures are compatible with each other."),
+        Cannot_iterate_value_because_the_next_method_of_its_iterator_expects_type_1_but_for_of_will_always_send_0: diag(2763, ts.DiagnosticCategory.Error, "Cannot_iterate_value_because_the_next_method_of_its_iterator_expects_type_1_but_for_of_will_always_s_2763", "Cannot iterate value because the 'next' method of its iterator expects type '{1}', but for-of will always send '{0}'."),
+        Cannot_iterate_value_because_the_next_method_of_its_iterator_expects_type_1_but_array_spread_will_always_send_0: diag(2764, ts.DiagnosticCategory.Error, "Cannot_iterate_value_because_the_next_method_of_its_iterator_expects_type_1_but_array_spread_will_al_2764", "Cannot iterate value because the 'next' method of its iterator expects type '{1}', but array spread will always send '{0}'."),
+        Cannot_iterate_value_because_the_next_method_of_its_iterator_expects_type_1_but_array_destructuring_will_always_send_0: diag(2765, ts.DiagnosticCategory.Error, "Cannot_iterate_value_because_the_next_method_of_its_iterator_expects_type_1_but_array_destructuring__2765", "Cannot iterate value because the 'next' method of its iterator expects type '{1}', but array destructuring will always send '{0}'."),
+        Cannot_delegate_iteration_to_value_because_the_next_method_of_its_iterator_expects_type_1_but_the_containing_generator_will_always_send_0: diag(2766, ts.DiagnosticCategory.Error, "Cannot_delegate_iteration_to_value_because_the_next_method_of_its_iterator_expects_type_1_but_the_co_2766", "Cannot delegate iteration to value because the 'next' method of its iterator expects type '{1}', but the containing generator will always send '{0}'."),
+        The_0_property_of_an_iterator_must_be_a_method: diag(2767, ts.DiagnosticCategory.Error, "The_0_property_of_an_iterator_must_be_a_method_2767", "The '{0}' property of an iterator must be a method."),
+        The_0_property_of_an_async_iterator_must_be_a_method: diag(2768, ts.DiagnosticCategory.Error, "The_0_property_of_an_async_iterator_must_be_a_method_2768", "The '{0}' property of an async iterator must be a method."),
+        No_overload_matches_this_call: diag(2769, ts.DiagnosticCategory.Error, "No_overload_matches_this_call_2769", "No overload matches this call."),
+        The_last_overload_gave_the_following_error: diag(2770, ts.DiagnosticCategory.Error, "The_last_overload_gave_the_following_error_2770", "The last overload gave the following error."),
+        The_last_overload_is_declared_here: diag(2771, ts.DiagnosticCategory.Error, "The_last_overload_is_declared_here_2771", "The last overload is declared here."),
+        Overload_0_of_1_2_gave_the_following_error: diag(2772, ts.DiagnosticCategory.Error, "Overload_0_of_1_2_gave_the_following_error_2772", "Overload {0} of {1}, '{2}', gave the following error."),
+        Did_you_forget_to_use_await: diag(2773, ts.DiagnosticCategory.Error, "Did_you_forget_to_use_await_2773", "Did you forget to use 'await'?"),
         Import_declaration_0_is_using_private_name_1: diag(4000, ts.DiagnosticCategory.Error, "Import_declaration_0_is_using_private_name_1_4000", "Import declaration '{0}' is using private name '{1}'."),
         Type_parameter_0_of_exported_class_has_or_is_using_private_name_1: diag(4002, ts.DiagnosticCategory.Error, "Type_parameter_0_of_exported_class_has_or_is_using_private_name_1_4002", "Type parameter '{0}' of exported class has or is using private name '{1}'."),
         Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1: diag(4004, ts.DiagnosticCategory.Error, "Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1_4004", "Type parameter '{0}' of exported interface has or is using private name '{1}'."),
@@ -3833,6 +4000,8 @@ var ts;
         Method_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2: diag(4101, ts.DiagnosticCategory.Error, "Method_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2_4101", "Method '{0}' of exported interface has or is using name '{1}' from private module '{2}'."),
         Method_0_of_exported_interface_has_or_is_using_private_name_1: diag(4102, ts.DiagnosticCategory.Error, "Method_0_of_exported_interface_has_or_is_using_private_name_1_4102", "Method '{0}' of exported interface has or is using private name '{1}'."),
         Type_parameter_0_of_exported_mapped_object_type_is_using_private_name_1: diag(4103, ts.DiagnosticCategory.Error, "Type_parameter_0_of_exported_mapped_object_type_is_using_private_name_1_4103", "Type parameter '{0}' of exported mapped object type is using private name '{1}'."),
+        The_type_0_is_readonly_and_cannot_be_assigned_to_the_mutable_type_1: diag(4104, ts.DiagnosticCategory.Error, "The_type_0_is_readonly_and_cannot_be_assigned_to_the_mutable_type_1_4104", "The type '{0}' is 'readonly' and cannot be assigned to the mutable type '{1}'."),
+        Private_or_protected_member_0_cannot_be_accessed_on_a_type_parameter: diag(4105, ts.DiagnosticCategory.Error, "Private_or_protected_member_0_cannot_be_accessed_on_a_type_parameter_4105", "Private or protected member '{0}' cannot be accessed on a type parameter."),
         The_current_host_does_not_support_the_0_option: diag(5001, ts.DiagnosticCategory.Error, "The_current_host_does_not_support_the_0_option_5001", "The current host does not support the '{0}' option."),
         Cannot_find_the_common_subdirectory_path_for_the_input_files: diag(5009, ts.DiagnosticCategory.Error, "Cannot_find_the_common_subdirectory_path_for_the_input_files_5009", "Cannot find the common subdirectory path for the input files."),
         File_specification_cannot_end_in_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0: diag(5010, ts.DiagnosticCategory.Error, "File_specification_cannot_end_in_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0_5010", "File specification cannot end in a recursive directory wildcard ('**'): '{0}'."),
@@ -3866,6 +4035,8 @@ var ts;
         Option_resolveJsonModule_can_only_be_specified_when_module_code_generation_is_commonjs_amd_es2015_or_esNext: diag(5071, ts.DiagnosticCategory.Error, "Option_resolveJsonModule_can_only_be_specified_when_module_code_generation_is_commonjs_amd_es2015_or_5071", "Option '--resolveJsonModule' can only be specified when module code generation is 'commonjs', 'amd', 'es2015' or 'esNext'."),
         Unknown_build_option_0: diag(5072, ts.DiagnosticCategory.Error, "Unknown_build_option_0_5072", "Unknown build option '{0}'."),
         Build_option_0_requires_a_value_of_type_1: diag(5073, ts.DiagnosticCategory.Error, "Build_option_0_requires_a_value_of_type_1_5073", "Build option '{0}' requires a value of type {1}."),
+        Option_incremental_can_only_be_specified_using_tsconfig_emitting_to_single_file_or_when_option_tsBuildInfoFile_is_specified: diag(5074, ts.DiagnosticCategory.Error, "Option_incremental_can_only_be_specified_using_tsconfig_emitting_to_single_file_or_when_option_tsBui_5074", "Option '--incremental' can only be specified using tsconfig, emitting to single file or when option `--tsBuildInfoFile` is specified."),
+        _0_is_assignable_to_the_constraint_of_type_1_but_1_could_be_instantiated_with_a_different_subtype_of_constraint_2: diag(5075, ts.DiagnosticCategory.Error, "_0_is_assignable_to_the_constraint_of_type_1_but_1_could_be_instantiated_with_a_different_subtype_of_5075", "'{0}' is assignable to the constraint of type '{1}', but '{1}' could be instantiated with a different subtype of constraint '{2}'."),
         Generates_a_sourcemap_for_each_corresponding_d_ts_file: diag(6000, ts.DiagnosticCategory.Message, "Generates_a_sourcemap_for_each_corresponding_d_ts_file_6000", "Generates a sourcemap for each corresponding '.d.ts' file."),
         Concatenate_and_emit_output_to_single_file: diag(6001, ts.DiagnosticCategory.Message, "Concatenate_and_emit_output_to_single_file_6001", "Concatenate and emit output to single file."),
         Generates_corresponding_d_ts_file: diag(6002, ts.DiagnosticCategory.Message, "Generates_corresponding_d_ts_file_6002", "Generates corresponding '.d.ts' file."),
@@ -4042,7 +4213,6 @@ var ts;
         Enable_strict_checking_of_property_initialization_in_classes: diag(6187, ts.DiagnosticCategory.Message, "Enable_strict_checking_of_property_initialization_in_classes_6187", "Enable strict checking of property initialization in classes."),
         Numeric_separators_are_not_allowed_here: diag(6188, ts.DiagnosticCategory.Error, "Numeric_separators_are_not_allowed_here_6188", "Numeric separators are not allowed here."),
         Multiple_consecutive_numeric_separators_are_not_permitted: diag(6189, ts.DiagnosticCategory.Error, "Multiple_consecutive_numeric_separators_are_not_permitted_6189", "Multiple consecutive numeric separators are not permitted."),
-        Found_package_json_at_0_Package_ID_is_1: diag(6190, ts.DiagnosticCategory.Message, "Found_package_json_at_0_Package_ID_is_1_6190", "Found 'package.json' at '{0}'. Package ID is '{1}'."),
         Whether_to_keep_outdated_console_output_in_watch_mode_instead_of_clearing_the_screen: diag(6191, ts.DiagnosticCategory.Message, "Whether_to_keep_outdated_console_output_in_watch_mode_instead_of_clearing_the_screen_6191", "Whether to keep outdated console output in watch mode instead of clearing the screen."),
         All_imports_in_import_declaration_are_unused: diag(6192, ts.DiagnosticCategory.Error, "All_imports_in_import_declaration_are_unused_6192", "All imports in import declaration are unused.", true),
         Found_1_error_Watching_for_file_changes: diag(6193, ts.DiagnosticCategory.Message, "Found_1_error_Watching_for_file_changes_6193", "Found 1 error. Watching for file changes."),
@@ -4069,13 +4239,16 @@ var ts;
         Using_compiler_options_of_project_reference_redirect_0: diag(6215, ts.DiagnosticCategory.Message, "Using_compiler_options_of_project_reference_redirect_0_6215", "Using compiler options of project reference redirect '{0}'."),
         Found_1_error: diag(6216, ts.DiagnosticCategory.Message, "Found_1_error_6216", "Found 1 error."),
         Found_0_errors: diag(6217, ts.DiagnosticCategory.Message, "Found_0_errors_6217", "Found {0} errors."),
+        Module_name_0_was_successfully_resolved_to_1_with_Package_ID_2: diag(6218, ts.DiagnosticCategory.Message, "Module_name_0_was_successfully_resolved_to_1_with_Package_ID_2_6218", "======== Module name '{0}' was successfully resolved to '{1}' with Package ID '{2}'. ========"),
+        Type_reference_directive_0_was_successfully_resolved_to_1_with_Package_ID_2_primary_Colon_3: diag(6219, ts.DiagnosticCategory.Message, "Type_reference_directive_0_was_successfully_resolved_to_1_with_Package_ID_2_primary_Colon_3_6219", "======== Type reference directive '{0}' was successfully resolved to '{1}' with Package ID '{2}', primary: {3}. ========"),
+        package_json_had_a_falsy_0_field: diag(6220, ts.DiagnosticCategory.Message, "package_json_had_a_falsy_0_field_6220", "'package.json' had a falsy '{0}' field."),
         Projects_to_reference: diag(6300, ts.DiagnosticCategory.Message, "Projects_to_reference_6300", "Projects to reference"),
         Enable_project_compilation: diag(6302, ts.DiagnosticCategory.Message, "Enable_project_compilation_6302", "Enable project compilation"),
         Project_references_may_not_form_a_circular_graph_Cycle_detected_Colon_0: diag(6202, ts.DiagnosticCategory.Error, "Project_references_may_not_form_a_circular_graph_Cycle_detected_Colon_0_6202", "Project references may not form a circular graph. Cycle detected: {0}"),
         Composite_projects_may_not_disable_declaration_emit: diag(6304, ts.DiagnosticCategory.Error, "Composite_projects_may_not_disable_declaration_emit_6304", "Composite projects may not disable declaration emit."),
         Output_file_0_has_not_been_built_from_source_file_1: diag(6305, ts.DiagnosticCategory.Error, "Output_file_0_has_not_been_built_from_source_file_1_6305", "Output file '{0}' has not been built from source file '{1}'."),
         Referenced_project_0_must_have_setting_composite_Colon_true: diag(6306, ts.DiagnosticCategory.Error, "Referenced_project_0_must_have_setting_composite_Colon_true_6306", "Referenced project '{0}' must have setting \"composite\": true."),
-        File_0_is_not_in_project_file_list_Projects_must_list_all_files_or_use_an_include_pattern: diag(6307, ts.DiagnosticCategory.Error, "File_0_is_not_in_project_file_list_Projects_must_list_all_files_or_use_an_include_pattern_6307", "File '{0}' is not in project file list. Projects must list all files or use an 'include' pattern."),
+        File_0_is_not_listed_within_the_file_list_of_project_1_Projects_must_list_all_files_or_use_an_include_pattern: diag(6307, ts.DiagnosticCategory.Error, "File_0_is_not_listed_within_the_file_list_of_project_1_Projects_must_list_all_files_or_use_an_includ_6307", "File '{0}' is not listed within the file list of project '{1}'. Projects must list all files or use an 'include' pattern."),
         Cannot_prepend_project_0_because_it_does_not_have_outFile_set: diag(6308, ts.DiagnosticCategory.Error, "Cannot_prepend_project_0_because_it_does_not_have_outFile_set_6308", "Cannot prepend project '{0}' because it does not have 'outFile' set"),
         Output_file_0_from_project_1_does_not_exist: diag(6309, ts.DiagnosticCategory.Error, "Output_file_0_from_project_1_does_not_exist_6309", "Output file '{0}' from project '{1}' does not exist"),
         Project_0_is_out_of_date_because_oldest_output_1_is_older_than_newest_input_2: diag(6350, ts.DiagnosticCategory.Message, "Project_0_is_out_of_date_because_oldest_output_1_is_older_than_newest_input_2_6350", "Project '{0}' is out of date because oldest output '{1}' is older than newest input '{2}'"),
@@ -4130,7 +4303,7 @@ var ts;
         _0_implicitly_has_type_any_because_it_does_not_have_a_type_annotation_and_is_referenced_directly_or_indirectly_in_its_own_initializer: diag(7022, ts.DiagnosticCategory.Error, "_0_implicitly_has_type_any_because_it_does_not_have_a_type_annotation_and_is_referenced_directly_or__7022", "'{0}' implicitly has type 'any' because it does not have a type annotation and is referenced directly or indirectly in its own initializer."),
         _0_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions: diag(7023, ts.DiagnosticCategory.Error, "_0_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_reference_7023", "'{0}' implicitly has return type 'any' because it does not have a return type annotation and is referenced directly or indirectly in one of its return expressions."),
         Function_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions: diag(7024, ts.DiagnosticCategory.Error, "Function_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_ref_7024", "Function implicitly has return type 'any' because it does not have a return type annotation and is referenced directly or indirectly in one of its return expressions."),
-        Generator_implicitly_has_type_0_because_it_does_not_yield_any_values_Consider_supplying_a_return_type: diag(7025, ts.DiagnosticCategory.Error, "Generator_implicitly_has_type_0_because_it_does_not_yield_any_values_Consider_supplying_a_return_typ_7025", "Generator implicitly has type '{0}' because it does not yield any values. Consider supplying a return type."),
+        Generator_implicitly_has_yield_type_0_because_it_does_not_yield_any_values_Consider_supplying_a_return_type_annotation: diag(7025, ts.DiagnosticCategory.Error, "Generator_implicitly_has_yield_type_0_because_it_does_not_yield_any_values_Consider_supplying_a_retu_7025", "Generator implicitly has yield type '{0}' because it does not yield any values. Consider supplying a return type annotation."),
         JSX_element_implicitly_has_type_any_because_no_interface_JSX_0_exists: diag(7026, ts.DiagnosticCategory.Error, "JSX_element_implicitly_has_type_any_because_no_interface_JSX_0_exists_7026", "JSX element implicitly has type 'any' because no interface 'JSX.{0}' exists."),
         Unreachable_code_detected: diag(7027, ts.DiagnosticCategory.Error, "Unreachable_code_detected_7027", "Unreachable code detected.", true),
         Unused_label: diag(7028, ts.DiagnosticCategory.Error, "Unused_label_7028", "Unused label.", true),
@@ -4157,6 +4330,10 @@ var ts;
         Property_0_implicitly_has_type_any_but_a_better_type_for_its_set_accessor_may_be_inferred_from_usage: diag(7049, ts.DiagnosticCategory.Suggestion, "Property_0_implicitly_has_type_any_but_a_better_type_for_its_set_accessor_may_be_inferred_from_usage_7049", "Property '{0}' implicitly has type 'any', but a better type for its set accessor may be inferred from usage."),
         _0_implicitly_has_an_1_return_type_but_a_better_type_may_be_inferred_from_usage: diag(7050, ts.DiagnosticCategory.Suggestion, "_0_implicitly_has_an_1_return_type_but_a_better_type_may_be_inferred_from_usage_7050", "'{0}' implicitly has an '{1}' return type, but a better type may be inferred from usage."),
         Parameter_has_a_name_but_no_type_Did_you_mean_0_Colon_1: diag(7051, ts.DiagnosticCategory.Error, "Parameter_has_a_name_but_no_type_Did_you_mean_0_Colon_1_7051", "Parameter has a name but no type. Did you mean '{0}: {1}'?"),
+        Element_implicitly_has_an_any_type_because_type_0_has_no_index_signature_Did_you_mean_to_call_1: diag(7052, ts.DiagnosticCategory.Error, "Element_implicitly_has_an_any_type_because_type_0_has_no_index_signature_Did_you_mean_to_call_1_7052", "Element implicitly has an 'any' type because type '{0}' has no index signature. Did you mean to call '{1}' ?"),
+        Element_implicitly_has_an_any_type_because_expression_of_type_0_can_t_be_used_to_index_type_1: diag(7053, ts.DiagnosticCategory.Error, "Element_implicitly_has_an_any_type_because_expression_of_type_0_can_t_be_used_to_index_type_1_7053", "Element implicitly has an 'any' type because expression of type '{0}' can't be used to index type '{1}'."),
+        No_index_signature_with_a_parameter_of_type_0_was_found_on_type_1: diag(7054, ts.DiagnosticCategory.Error, "No_index_signature_with_a_parameter_of_type_0_was_found_on_type_1_7054", "No index signature with a parameter of type '{0}' was found on type '{1}'."),
+        _0_which_lacks_return_type_annotation_implicitly_has_an_1_yield_type: diag(7055, ts.DiagnosticCategory.Error, "_0_which_lacks_return_type_annotation_implicitly_has_an_1_yield_type_7055", "'{0}', which lacks return-type annotation, implicitly has an '{1}' yield type."),
         You_cannot_rename_this_element: diag(8000, ts.DiagnosticCategory.Error, "You_cannot_rename_this_element_8000", "You cannot rename this element."),
         You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library: diag(8001, ts.DiagnosticCategory.Error, "You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library_8001", "You cannot rename elements that are defined in the standard TypeScript library."),
         import_can_only_be_used_in_a_ts_file: diag(8002, ts.DiagnosticCategory.Error, "import_can_only_be_used_in_a_ts_file_8002", "'import ... =' can only be used in a .ts file."),
@@ -4220,6 +4397,7 @@ var ts;
         JSDoc_types_may_be_moved_to_TypeScript_types: diag(80004, ts.DiagnosticCategory.Suggestion, "JSDoc_types_may_be_moved_to_TypeScript_types_80004", "JSDoc types may be moved to TypeScript types."),
         require_call_may_be_converted_to_an_import: diag(80005, ts.DiagnosticCategory.Suggestion, "require_call_may_be_converted_to_an_import_80005", "'require' call may be converted to an import."),
         This_may_be_converted_to_an_async_function: diag(80006, ts.DiagnosticCategory.Suggestion, "This_may_be_converted_to_an_async_function_80006", "This may be converted to an async function."),
+        await_has_no_effect_on_the_type_of_this_expression: diag(80007, ts.DiagnosticCategory.Suggestion, "await_has_no_effect_on_the_type_of_this_expression_80007", "'await' has no effect on the type of this expression."),
         Add_missing_super_call: diag(90001, ts.DiagnosticCategory.Message, "Add_missing_super_call_90001", "Add missing 'super()' call"),
         Make_super_call_the_first_statement_in_the_constructor: diag(90002, ts.DiagnosticCategory.Message, "Make_super_call_the_first_statement_in_the_constructor_90002", "Make 'super()' call the first statement in the constructor"),
         Change_extends_to_implements: diag(90003, ts.DiagnosticCategory.Message, "Change_extends_to_implements_90003", "Change 'extends' to 'implements'"),
@@ -4318,22 +4496,35 @@ var ts;
         Add_all_missing_imports: diag(95064, ts.DiagnosticCategory.Message, "Add_all_missing_imports_95064", "Add all missing imports"),
         Convert_to_async_function: diag(95065, ts.DiagnosticCategory.Message, "Convert_to_async_function_95065", "Convert to async function"),
         Convert_all_to_async_functions: diag(95066, ts.DiagnosticCategory.Message, "Convert_all_to_async_functions_95066", "Convert all to async functions"),
-        Generate_types_for_0: diag(95067, ts.DiagnosticCategory.Message, "Generate_types_for_0_95067", "Generate types for '{0}'"),
-        Generate_types_for_all_packages_without_types: diag(95068, ts.DiagnosticCategory.Message, "Generate_types_for_all_packages_without_types_95068", "Generate types for all packages without types"),
         Add_unknown_conversion_for_non_overlapping_types: diag(95069, ts.DiagnosticCategory.Message, "Add_unknown_conversion_for_non_overlapping_types_95069", "Add 'unknown' conversion for non-overlapping types"),
         Add_unknown_to_all_conversions_of_non_overlapping_types: diag(95070, ts.DiagnosticCategory.Message, "Add_unknown_to_all_conversions_of_non_overlapping_types_95070", "Add 'unknown' to all conversions of non-overlapping types"),
         Add_missing_new_operator_to_call: diag(95071, ts.DiagnosticCategory.Message, "Add_missing_new_operator_to_call_95071", "Add missing 'new' operator to call"),
         Add_missing_new_operator_to_all_calls: diag(95072, ts.DiagnosticCategory.Message, "Add_missing_new_operator_to_all_calls_95072", "Add missing 'new' operator to all calls"),
         Add_names_to_all_parameters_without_names: diag(95073, ts.DiagnosticCategory.Message, "Add_names_to_all_parameters_without_names_95073", "Add names to all parameters without names"),
         Enable_the_experimentalDecorators_option_in_your_configuration_file: diag(95074, ts.DiagnosticCategory.Message, "Enable_the_experimentalDecorators_option_in_your_configuration_file_95074", "Enable the 'experimentalDecorators' option in your configuration file"),
-        Convert_to_named_parameters: diag(95075, ts.DiagnosticCategory.Message, "Convert_to_named_parameters_95075", "Convert to named parameters"),
+        Convert_parameters_to_destructured_object: diag(95075, ts.DiagnosticCategory.Message, "Convert_parameters_to_destructured_object_95075", "Convert parameters to destructured object"),
+        Allow_accessing_UMD_globals_from_modules: diag(95076, ts.DiagnosticCategory.Message, "Allow_accessing_UMD_globals_from_modules_95076", "Allow accessing UMD globals from modules."),
+        Extract_type: diag(95077, ts.DiagnosticCategory.Message, "Extract_type_95077", "Extract type"),
+        Extract_to_type_alias: diag(95078, ts.DiagnosticCategory.Message, "Extract_to_type_alias_95078", "Extract to type alias"),
+        Extract_to_typedef: diag(95079, ts.DiagnosticCategory.Message, "Extract_to_typedef_95079", "Extract to typedef"),
+        Infer_this_type_of_0_from_usage: diag(95080, ts.DiagnosticCategory.Message, "Infer_this_type_of_0_from_usage_95080", "Infer 'this' type of '{0}' from usage"),
+        Add_const_to_unresolved_variable: diag(95081, ts.DiagnosticCategory.Message, "Add_const_to_unresolved_variable_95081", "Add 'const' to unresolved variable"),
+        Add_const_to_all_unresolved_variables: diag(95082, ts.DiagnosticCategory.Message, "Add_const_to_all_unresolved_variables_95082", "Add 'const' to all unresolved variables"),
+        Add_await: diag(95083, ts.DiagnosticCategory.Message, "Add_await_95083", "Add 'await'"),
+        Add_await_to_initializer_for_0: diag(95084, ts.DiagnosticCategory.Message, "Add_await_to_initializer_for_0_95084", "Add 'await' to initializer for '{0}'"),
+        Fix_all_expressions_possibly_missing_await: diag(95085, ts.DiagnosticCategory.Message, "Fix_all_expressions_possibly_missing_await_95085", "Fix all expressions possibly missing 'await'"),
+        Remove_unnecessary_await: diag(95086, ts.DiagnosticCategory.Message, "Remove_unnecessary_await_95086", "Remove unnecessary 'await'"),
+        Remove_all_unnecessary_uses_of_await: diag(95087, ts.DiagnosticCategory.Message, "Remove_all_unnecessary_uses_of_await_95087", "Remove all unnecessary uses of 'await'"),
+        No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer: diag(18004, ts.DiagnosticCategory.Error, "No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer_18004", "No value exists in scope for the shorthand property '{0}'. Either declare one or provide an initializer."),
+        Classes_may_not_have_a_field_named_constructor: diag(18006, ts.DiagnosticCategory.Error, "Classes_may_not_have_a_field_named_constructor_18006", "Classes may not have a field named 'constructor'."),
+        JSX_expressions_may_not_use_the_comma_operator_Did_you_mean_to_write_an_array: diag(18007, ts.DiagnosticCategory.Error, "JSX_expressions_may_not_use_the_comma_operator_Did_you_mean_to_write_an_array_18007", "JSX expressions may not use the comma operator. Did you mean to write an array?"),
     };
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
     var _a;
     function tokenIsIdentifierOrKeyword(token) {
-        return token >= 72;
+        return token >= 73;
     }
     ts.tokenIsIdentifierOrKeyword = tokenIsIdentifierOrKeyword;
     function tokenIsIdentifierOrKeywordOrGreaterThan(token) {
@@ -4341,85 +4532,85 @@ var ts;
     }
     ts.tokenIsIdentifierOrKeywordOrGreaterThan = tokenIsIdentifierOrKeywordOrGreaterThan;
     var textToKeywordObj = (_a = {
-            abstract: 118,
-            any: 120,
-            as: 119,
-            bigint: 146,
-            boolean: 123,
-            break: 73,
-            case: 74,
-            catch: 75,
-            class: 76,
-            continue: 78,
-            const: 77
+            abstract: 119,
+            any: 121,
+            as: 120,
+            bigint: 147,
+            boolean: 124,
+            break: 74,
+            case: 75,
+            catch: 76,
+            class: 77,
+            continue: 79,
+            const: 78
         },
-        _a["" + "constructor"] = 124,
-        _a.debugger = 79,
-        _a.declare = 125,
-        _a.default = 80,
-        _a.delete = 81,
-        _a.do = 82,
-        _a.else = 83,
-        _a.enum = 84,
-        _a.export = 85,
-        _a.extends = 86,
-        _a.false = 87,
-        _a.finally = 88,
-        _a.for = 89,
-        _a.from = 144,
-        _a.function = 90,
-        _a.get = 126,
-        _a.if = 91,
-        _a.implements = 109,
-        _a.import = 92,
-        _a.in = 93,
-        _a.infer = 127,
-        _a.instanceof = 94,
-        _a.interface = 110,
-        _a.is = 128,
-        _a.keyof = 129,
-        _a.let = 111,
-        _a.module = 130,
-        _a.namespace = 131,
-        _a.never = 132,
-        _a.new = 95,
-        _a.null = 96,
-        _a.number = 135,
-        _a.object = 136,
-        _a.package = 112,
-        _a.private = 113,
-        _a.protected = 114,
-        _a.public = 115,
-        _a.readonly = 133,
-        _a.require = 134,
-        _a.global = 145,
-        _a.return = 97,
-        _a.set = 137,
-        _a.static = 116,
-        _a.string = 138,
-        _a.super = 98,
-        _a.switch = 99,
-        _a.symbol = 139,
-        _a.this = 100,
-        _a.throw = 101,
-        _a.true = 102,
-        _a.try = 103,
-        _a.type = 140,
-        _a.typeof = 104,
-        _a.undefined = 141,
-        _a.unique = 142,
-        _a.unknown = 143,
-        _a.var = 105,
-        _a.void = 106,
-        _a.while = 107,
-        _a.with = 108,
-        _a.yield = 117,
-        _a.async = 121,
-        _a.await = 122,
-        _a.of = 147,
+        _a["" + "constructor"] = 125,
+        _a.debugger = 80,
+        _a.declare = 126,
+        _a.default = 81,
+        _a.delete = 82,
+        _a.do = 83,
+        _a.else = 84,
+        _a.enum = 85,
+        _a.export = 86,
+        _a.extends = 87,
+        _a.false = 88,
+        _a.finally = 89,
+        _a.for = 90,
+        _a.from = 145,
+        _a.function = 91,
+        _a.get = 127,
+        _a.if = 92,
+        _a.implements = 110,
+        _a.import = 93,
+        _a.in = 94,
+        _a.infer = 128,
+        _a.instanceof = 95,
+        _a.interface = 111,
+        _a.is = 129,
+        _a.keyof = 130,
+        _a.let = 112,
+        _a.module = 131,
+        _a.namespace = 132,
+        _a.never = 133,
+        _a.new = 96,
+        _a.null = 97,
+        _a.number = 136,
+        _a.object = 137,
+        _a.package = 113,
+        _a.private = 114,
+        _a.protected = 115,
+        _a.public = 116,
+        _a.readonly = 134,
+        _a.require = 135,
+        _a.global = 146,
+        _a.return = 98,
+        _a.set = 138,
+        _a.static = 117,
+        _a.string = 139,
+        _a.super = 99,
+        _a.switch = 100,
+        _a.symbol = 140,
+        _a.this = 101,
+        _a.throw = 102,
+        _a.true = 103,
+        _a.try = 104,
+        _a.type = 141,
+        _a.typeof = 105,
+        _a.undefined = 142,
+        _a.unique = 143,
+        _a.unknown = 144,
+        _a.var = 106,
+        _a.void = 107,
+        _a.while = 108,
+        _a.with = 109,
+        _a.yield = 118,
+        _a.async = 122,
+        _a.await = 123,
+        _a.of = 148,
         _a);
     var textToKeyword = ts.createMapFromTemplate(textToKeywordObj);
-    var textToToken = ts.createMapFromTemplate(__assign({}, textToKeywordObj, { "{": 18, "}": 19, "(": 20, ")": 21, "[": 22, "]": 23, ".": 24, "...": 25, ";": 26, ",": 27, "<": 28, ">": 30, "<=": 31, ">=": 32, "==": 33, "!=": 34, "===": 35, "!==": 36, "=>": 37, "+": 38, "-": 39, "**": 41, "*": 40, "/": 42, "%": 43, "++": 44, "--": 45, "<<": 46, "</": 29, ">>": 47, ">>>": 48, "&": 49, "|": 50, "^": 51, "!": 52, "~": 53, "&&": 54, "||": 55, "?": 56, ":": 57, "=": 59, "+=": 60, "-=": 61, "*=": 62, "**=": 63, "/=": 64, "%=": 65, "<<=": 66, ">>=": 67, ">>>=": 68, "&=": 69, "|=": 70, "^=": 71, "@": 58 }));
+    var textToToken = ts.createMapFromTemplate(__assign({}, textToKeywordObj, { "{": 18, "}": 19, "(": 20, ")": 21, "[": 22, "]": 23, ".": 24, "...": 25, ";": 26, ",": 27, "<": 28, ">": 30, "<=": 31, ">=": 32, "==": 33, "!=": 34, "===": 35, "!==": 36, "=>": 37, "+": 38, "-": 39, "**": 41, "*": 40, "/": 42, "%": 43, "++": 44, "--": 45, "<<": 46, "</": 29, ">>": 47, ">>>": 48, "&": 49, "|": 50, "^": 51, "!": 52, "~": 53, "&&": 54, "||": 55, "?": 56, ":": 57, "=": 60, "+=": 61, "-=": 62, "*=": 63, "**=": 64, "/=": 65, "%=": 66, "<<=": 67, ">>=": 68, ">>>=": 69, "&=": 70, "|=": 71, "^=": 72, "@": 58, "`": 59 }));
     var unicodeES3IdentifierStart = [170, 170, 181, 181, 186, 186, 192, 214, 216, 246, 248, 543, 546, 563, 592, 685, 688, 696, 699, 705, 720, 721, 736, 740, 750, 750, 890, 890, 902, 902, 904, 906, 908, 908, 910, 929, 931, 974, 976, 983, 986, 1011, 1024, 1153, 1164, 1220, 1223, 1224, 1227, 1228, 1232, 1269, 1272, 1273, 1329, 1366, 1369, 1369, 1377, 1415, 1488, 1514, 1520, 1522, 1569, 1594, 1600, 1610, 1649, 1747, 1749, 1749, 1765, 1766, 1786, 1788, 1808, 1808, 1810, 1836, 1920, 1957, 2309, 2361, 2365, 2365, 2384, 2384, 2392, 2401, 2437, 2444, 2447, 2448, 2451, 2472, 2474, 2480, 2482, 2482, 2486, 2489, 2524, 2525, 2527, 2529, 2544, 2545, 2565, 2570, 2575, 2576, 2579, 2600, 2602, 2608, 2610, 2611, 2613, 2614, 2616, 2617, 2649, 2652, 2654, 2654, 2674, 2676, 2693, 2699, 2701, 2701, 2703, 2705, 2707, 2728, 2730, 2736, 2738, 2739, 2741, 2745, 2749, 2749, 2768, 2768, 2784, 2784, 2821, 2828, 2831, 2832, 2835, 2856, 2858, 2864, 2866, 2867, 2870, 2873, 2877, 2877, 2908, 2909, 2911, 2913, 2949, 2954, 2958, 2960, 2962, 2965, 2969, 2970, 2972, 2972, 2974, 2975, 2979, 2980, 2984, 2986, 2990, 2997, 2999, 3001, 3077, 3084, 3086, 3088, 3090, 3112, 3114, 3123, 3125, 3129, 3168, 3169, 3205, 3212, 3214, 3216, 3218, 3240, 3242, 3251, 3253, 3257, 3294, 3294, 3296, 3297, 3333, 3340, 3342, 3344, 3346, 3368, 3370, 3385, 3424, 3425, 3461, 3478, 3482, 3505, 3507, 3515, 3517, 3517, 3520, 3526, 3585, 3632, 3634, 3635, 3648, 3654, 3713, 3714, 3716, 3716, 3719, 3720, 3722, 3722, 3725, 3725, 3732, 3735, 3737, 3743, 3745, 3747, 3749, 3749, 3751, 3751, 3754, 3755, 3757, 3760, 3762, 3763, 3773, 3773, 3776, 3780, 3782, 3782, 3804, 3805, 3840, 3840, 3904, 3911, 3913, 3946, 3976, 3979, 4096, 4129, 4131, 4135, 4137, 4138, 4176, 4181, 4256, 4293, 4304, 4342, 4352, 4441, 4447, 4514, 4520, 4601, 4608, 4614, 4616, 4678, 4680, 4680, 4682, 4685, 4688, 4694, 4696, 4696, 4698, 4701, 4704, 4742, 4744, 4744, 4746, 4749, 4752, 4782, 4784, 4784, 4786, 4789, 4792, 4798, 4800, 4800, 4802, 4805, 4808, 4814, 4816, 4822, 4824, 4846, 4848, 4878, 4880, 4880, 4882, 4885, 4888, 4894, 4896, 4934, 4936, 4954, 5024, 5108, 5121, 5740, 5743, 5750, 5761, 5786, 5792, 5866, 6016, 6067, 6176, 6263, 6272, 6312, 7680, 7835, 7840, 7929, 7936, 7957, 7960, 7965, 7968, 8005, 8008, 8013, 8016, 8023, 8025, 8025, 8027, 8027, 8029, 8029, 8031, 8061, 8064, 8116, 8118, 8124, 8126, 8126, 8130, 8132, 8134, 8140, 8144, 8147, 8150, 8155, 8160, 8172, 8178, 8180, 8182, 8188, 8319, 8319, 8450, 8450, 8455, 8455, 8458, 8467, 8469, 8469, 8473, 8477, 8484, 8484, 8486, 8486, 8488, 8488, 8490, 8493, 8495, 8497, 8499, 8505, 8544, 8579, 12293, 12295, 12321, 12329, 12337, 12341, 12344, 12346, 12353, 12436, 12445, 12446, 12449, 12538, 12540, 12542, 12549, 12588, 12593, 12686, 12704, 12727, 13312, 19893, 19968, 40869, 40960, 42124, 44032, 55203, 63744, 64045, 64256, 64262, 64275, 64279, 64285, 64285, 64287, 64296, 64298, 64310, 64312, 64316, 64318, 64318, 64320, 64321, 64323, 64324, 64326, 64433, 64467, 64829, 64848, 64911, 64914, 64967, 65008, 65019, 65136, 65138, 65140, 65140, 65142, 65276, 65313, 65338, 65345, 65370, 65382, 65470, 65474, 65479, 65482, 65487, 65490, 65495, 65498, 65500,];
     var unicodeES3IdentifierPart = [170, 170, 181, 181, 186, 186, 192, 214, 216, 246, 248, 543, 546, 563, 592, 685, 688, 696, 699, 705, 720, 721, 736, 740, 750, 750, 768, 846, 864, 866, 890, 890, 902, 902, 904, 906, 908, 908, 910, 929, 931, 974, 976, 983, 986, 1011, 1024, 1153, 1155, 1158, 1164, 1220, 1223, 1224, 1227, 1228, 1232, 1269, 1272, 1273, 1329, 1366, 1369, 1369, 1377, 1415, 1425, 1441, 1443, 1465, 1467, 1469, 1471, 1471, 1473, 1474, 1476, 1476, 1488, 1514, 1520, 1522, 1569, 1594, 1600, 1621, 1632, 1641, 1648, 1747, 1749, 1756, 1759, 1768, 1770, 1773, 1776, 1788, 1808, 1836, 1840, 1866, 1920, 1968, 2305, 2307, 2309, 2361, 2364, 2381, 2384, 2388, 2392, 2403, 2406, 2415, 2433, 2435, 2437, 2444, 2447, 2448, 2451, 2472, 2474, 2480, 2482, 2482, 2486, 2489, 2492, 2492, 2494, 2500, 2503, 2504, 2507, 2509, 2519, 2519, 2524, 2525, 2527, 2531, 2534, 2545, 2562, 2562, 2565, 2570, 2575, 2576, 2579, 2600, 2602, 2608, 2610, 2611, 2613, 2614, 2616, 2617, 2620, 2620, 2622, 2626, 2631, 2632, 2635, 2637, 2649, 2652, 2654, 2654, 2662, 2676, 2689, 2691, 2693, 2699, 2701, 2701, 2703, 2705, 2707, 2728, 2730, 2736, 2738, 2739, 2741, 2745, 2748, 2757, 2759, 2761, 2763, 2765, 2768, 2768, 2784, 2784, 2790, 2799, 2817, 2819, 2821, 2828, 2831, 2832, 2835, 2856, 2858, 2864, 2866, 2867, 2870, 2873, 2876, 2883, 2887, 2888, 2891, 2893, 2902, 2903, 2908, 2909, 2911, 2913, 2918, 2927, 2946, 2947, 2949, 2954, 2958, 2960, 2962, 2965, 2969, 2970, 2972, 2972, 2974, 2975, 2979, 2980, 2984, 2986, 2990, 2997, 2999, 3001, 3006, 3010, 3014, 3016, 3018, 3021, 3031, 3031, 3047, 3055, 3073, 3075, 3077, 3084, 3086, 3088, 3090, 3112, 3114, 3123, 3125, 3129, 3134, 3140, 3142, 3144, 3146, 3149, 3157, 3158, 3168, 3169, 3174, 3183, 3202, 3203, 3205, 3212, 3214, 3216, 3218, 3240, 3242, 3251, 3253, 3257, 3262, 3268, 3270, 3272, 3274, 3277, 3285, 3286, 3294, 3294, 3296, 3297, 3302, 3311, 3330, 3331, 3333, 3340, 3342, 3344, 3346, 3368, 3370, 3385, 3390, 3395, 3398, 3400, 3402, 3405, 3415, 3415, 3424, 3425, 3430, 3439, 3458, 3459, 3461, 3478, 3482, 3505, 3507, 3515, 3517, 3517, 3520, 3526, 3530, 3530, 3535, 3540, 3542, 3542, 3544, 3551, 3570, 3571, 3585, 3642, 3648, 3662, 3664, 3673, 3713, 3714, 3716, 3716, 3719, 3720, 3722, 3722, 3725, 3725, 3732, 3735, 3737, 3743, 3745, 3747, 3749, 3749, 3751, 3751, 3754, 3755, 3757, 3769, 3771, 3773, 3776, 3780, 3782, 3782, 3784, 3789, 3792, 3801, 3804, 3805, 3840, 3840, 3864, 3865, 3872, 3881, 3893, 3893, 3895, 3895, 3897, 3897, 3902, 3911, 3913, 3946, 3953, 3972, 3974, 3979, 3984, 3991, 3993, 4028, 4038, 4038, 4096, 4129, 4131, 4135, 4137, 4138, 4140, 4146, 4150, 4153, 4160, 4169, 4176, 4185, 4256, 4293, 4304, 4342, 4352, 4441, 4447, 4514, 4520, 4601, 4608, 4614, 4616, 4678, 4680, 4680, 4682, 4685, 4688, 4694, 4696, 4696, 4698, 4701, 4704, 4742, 4744, 4744, 4746, 4749, 4752, 4782, 4784, 4784, 4786, 4789, 4792, 4798, 4800, 4800, 4802, 4805, 4808, 4814, 4816, 4822, 4824, 4846, 4848, 4878, 4880, 4880, 4882, 4885, 4888, 4894, 4896, 4934, 4936, 4954, 4969, 4977, 5024, 5108, 5121, 5740, 5743, 5750, 5761, 5786, 5792, 5866, 6016, 6099, 6112, 6121, 6160, 6169, 6176, 6263, 6272, 6313, 7680, 7835, 7840, 7929, 7936, 7957, 7960, 7965, 7968, 8005, 8008, 8013, 8016, 8023, 8025, 8025, 8027, 8027, 8029, 8029, 8031, 8061, 8064, 8116, 8118, 8124, 8126, 8126, 8130, 8132, 8134, 8140, 8144, 8147, 8150, 8155, 8160, 8172, 8178, 8180, 8182, 8188, 8255, 8256, 8319, 8319, 8400, 8412, 8417, 8417, 8450, 8450, 8455, 8455, 8458, 8467, 8469, 8469, 8473, 8477, 8484, 8484, 8486, 8486, 8488, 8488, 8490, 8493, 8495, 8497, 8499, 8505, 8544, 8579, 12293, 12295, 12321, 12335, 12337, 12341, 12344, 12346, 12353, 12436, 12441, 12442, 12445, 12446, 12449, 12542, 12549, 12588, 12593, 12686, 12704, 12727, 13312, 19893, 19968, 40869, 40960, 42124, 44032, 55203, 63744, 64045, 64256, 64262, 64275, 64279, 64285, 64296, 64298, 64310, 64312, 64316, 64318, 64318, 64320, 64321, 64323, 64324, 64326, 64433, 64467, 64829, 64848, 64911, 64914, 64967, 65008, 65019, 65056, 65059, 65075, 65076, 65101, 65103, 65136, 65138, 65140, 65140, 65142, 65276, 65296, 65305, 65313, 65338, 65343, 65343, 65345, 65370, 65381, 65470, 65474, 65479, 65482, 65487, 65490, 65495, 65498, 65500,];
     var unicodeES5IdentifierStart = [170, 170, 181, 181, 186, 186, 192, 214, 216, 246, 248, 705, 710, 721, 736, 740, 748, 748, 750, 750, 880, 884, 886, 887, 890, 893, 902, 902, 904, 906, 908, 908, 910, 929, 931, 1013, 1015, 1153, 1162, 1319, 1329, 1366, 1369, 1369, 1377, 1415, 1488, 1514, 1520, 1522, 1568, 1610, 1646, 1647, 1649, 1747, 1749, 1749, 1765, 1766, 1774, 1775, 1786, 1788, 1791, 1791, 1808, 1808, 1810, 1839, 1869, 1957, 1969, 1969, 1994, 2026, 2036, 2037, 2042, 2042, 2048, 2069, 2074, 2074, 2084, 2084, 2088, 2088, 2112, 2136, 2208, 2208, 2210, 2220, 2308, 2361, 2365, 2365, 2384, 2384, 2392, 2401, 2417, 2423, 2425, 2431, 2437, 2444, 2447, 2448, 2451, 2472, 2474, 2480, 2482, 2482, 2486, 2489, 2493, 2493, 2510, 2510, 2524, 2525, 2527, 2529, 2544, 2545, 2565, 2570, 2575, 2576, 2579, 2600, 2602, 2608, 2610, 2611, 2613, 2614, 2616, 2617, 2649, 2652, 2654, 2654, 2674, 2676, 2693, 2701, 2703, 2705, 2707, 2728, 2730, 2736, 2738, 2739, 2741, 2745, 2749, 2749, 2768, 2768, 2784, 2785, 2821, 2828, 2831, 2832, 2835, 2856, 2858, 2864, 2866, 2867, 2869, 2873, 2877, 2877, 2908, 2909, 2911, 2913, 2929, 2929, 2947, 2947, 2949, 2954, 2958, 2960, 2962, 2965, 2969, 2970, 2972, 2972, 2974, 2975, 2979, 2980, 2984, 2986, 2990, 3001, 3024, 3024, 3077, 3084, 3086, 3088, 3090, 3112, 3114, 3123, 3125, 3129, 3133, 3133, 3160, 3161, 3168, 3169, 3205, 3212, 3214, 3216, 3218, 3240, 3242, 3251, 3253, 3257, 3261, 3261, 3294, 3294, 3296, 3297, 3313, 3314, 3333, 3340, 3342, 3344, 3346, 3386, 3389, 3389, 3406, 3406, 3424, 3425, 3450, 3455, 3461, 3478, 3482, 3505, 3507, 3515, 3517, 3517, 3520, 3526, 3585, 3632, 3634, 3635, 3648, 3654, 3713, 3714, 3716, 3716, 3719, 3720, 3722, 3722, 3725, 3725, 3732, 3735, 3737, 3743, 3745, 3747, 3749, 3749, 3751, 3751, 3754, 3755, 3757, 3760, 3762, 3763, 3773, 3773, 3776, 3780, 3782, 3782, 3804, 3807, 3840, 3840, 3904, 3911, 3913, 3948, 3976, 3980, 4096, 4138, 4159, 4159, 4176, 4181, 4186, 4189, 4193, 4193, 4197, 4198, 4206, 4208, 4213, 4225, 4238, 4238, 4256, 4293, 4295, 4295, 4301, 4301, 4304, 4346, 4348, 4680, 4682, 4685, 4688, 4694, 4696, 4696, 4698, 4701, 4704, 4744, 4746, 4749, 4752, 4784, 4786, 4789, 4792, 4798, 4800, 4800, 4802, 4805, 4808, 4822, 4824, 4880, 4882, 4885, 4888, 4954, 4992, 5007, 5024, 5108, 5121, 5740, 5743, 5759, 5761, 5786, 5792, 5866, 5870, 5872, 5888, 5900, 5902, 5905, 5920, 5937, 5952, 5969, 5984, 5996, 5998, 6000, 6016, 6067, 6103, 6103, 6108, 6108, 6176, 6263, 6272, 6312, 6314, 6314, 6320, 6389, 6400, 6428, 6480, 6509, 6512, 6516, 6528, 6571, 6593, 6599, 6656, 6678, 6688, 6740, 6823, 6823, 6917, 6963, 6981, 6987, 7043, 7072, 7086, 7087, 7098, 7141, 7168, 7203, 7245, 7247, 7258, 7293, 7401, 7404, 7406, 7409, 7413, 7414, 7424, 7615, 7680, 7957, 7960, 7965, 7968, 8005, 8008, 8013, 8016, 8023, 8025, 8025, 8027, 8027, 8029, 8029, 8031, 8061, 8064, 8116, 8118, 8124, 8126, 8126, 8130, 8132, 8134, 8140, 8144, 8147, 8150, 8155, 8160, 8172, 8178, 8180, 8182, 8188, 8305, 8305, 8319, 8319, 8336, 8348, 8450, 8450, 8455, 8455, 8458, 8467, 8469, 8469, 8473, 8477, 8484, 8484, 8486, 8486, 8488, 8488, 8490, 8493, 8495, 8505, 8508, 8511, 8517, 8521, 8526, 8526, 8544, 8584, 11264, 11310, 11312, 11358, 11360, 11492, 11499, 11502, 11506, 11507, 11520, 11557, 11559, 11559, 11565, 11565, 11568, 11623, 11631, 11631, 11648, 11670, 11680, 11686, 11688, 11694, 11696, 11702, 11704, 11710, 11712, 11718, 11720, 11726, 11728, 11734, 11736, 11742, 11823, 11823, 12293, 12295, 12321, 12329, 12337, 12341, 12344, 12348, 12353, 12438, 12445, 12447, 12449, 12538, 12540, 12543, 12549, 12589, 12593, 12686, 12704, 12730, 12784, 12799, 13312, 19893, 19968, 40908, 40960, 42124, 42192, 42237, 42240, 42508, 42512, 42527, 42538, 42539, 42560, 42606, 42623, 42647, 42656, 42735, 42775, 42783, 42786, 42888, 42891, 42894, 42896, 42899, 42912, 42922, 43000, 43009, 43011, 43013, 43015, 43018, 43020, 43042, 43072, 43123, 43138, 43187, 43250, 43255, 43259, 43259, 43274, 43301, 43312, 43334, 43360, 43388, 43396, 43442, 43471, 43471, 43520, 43560, 43584, 43586, 43588, 43595, 43616, 43638, 43642, 43642, 43648, 43695, 43697, 43697, 43701, 43702, 43705, 43709, 43712, 43712, 43714, 43714, 43739, 43741, 43744, 43754, 43762, 43764, 43777, 43782, 43785, 43790, 43793, 43798, 43808, 43814, 43816, 43822, 43968, 44002, 44032, 55203, 55216, 55238, 55243, 55291, 63744, 64109, 64112, 64217, 64256, 64262, 64275, 64279, 64285, 64285, 64287, 64296, 64298, 64310, 64312, 64316, 64318, 64318, 64320, 64321, 64323, 64324, 64326, 64433, 64467, 64829, 64848, 64911, 64914, 64967, 65008, 65019, 65136, 65140, 65142, 65276, 65313, 65338, 65345, 65370, 65382, 65470, 65474, 65479, 65482, 65487, 65490, 65495, 65498, 65500,];
@@ -4910,8 +5101,8 @@ var ts;
             getTokenValue: function () { return tokenValue; },
             hasExtendedUnicodeEscape: function () { return (tokenFlags & 8) !== 0; },
             hasPrecedingLineBreak: function () { return (tokenFlags & 1) !== 0; },
-            isIdentifier: function () { return token === 72 || token > 108; },
-            isReservedWord: function () { return token >= 73 && token <= 108; },
+            isIdentifier: function () { return token === 73 || token > 109; },
+            isReservedWord: function () { return token >= 74 && token <= 109; },
             isUnterminated: function () { return (tokenFlags & 4) !== 0; },
             getTokenFlags: function () { return tokenFlags; },
             reScanGreaterToken: reScanGreaterToken,
@@ -4922,7 +5113,7 @@ var ts;
             reScanJsxToken: reScanJsxToken,
             reScanLessThanToken: reScanLessThanToken,
             scanJsxToken: scanJsxToken,
-            scanJSDocToken: scanJSDocToken,
+            scanJsDocToken: scanJsDocToken,
             scan: scan,
             getText: getText,
             setText: setText,
@@ -5332,7 +5523,7 @@ var ts;
                     }
                 }
             }
-            return token = 72;
+            return token = 73;
         }
         function scanBinaryOrOctalDigits(base) {
             var value = "";
@@ -5473,7 +5664,7 @@ var ts;
                         return token = scanTemplateAndSetTokenValue();
                     case 37:
                         if (text.charCodeAt(pos + 1) === 61) {
-                            return pos += 2, token = 65;
+                            return pos += 2, token = 66;
                         }
                         pos++;
                         return token = 43;
@@ -5482,7 +5673,7 @@ var ts;
                             return pos += 2, token = 54;
                         }
                         if (text.charCodeAt(pos + 1) === 61) {
-                            return pos += 2, token = 69;
+                            return pos += 2, token = 70;
                         }
                         pos++;
                         return token = 49;
@@ -5494,11 +5685,11 @@ var ts;
                         return token = 21;
                     case 42:
                         if (text.charCodeAt(pos + 1) === 61) {
-                            return pos += 2, token = 62;
+                            return pos += 2, token = 63;
                         }
                         if (text.charCodeAt(pos + 1) === 42) {
                             if (text.charCodeAt(pos + 2) === 61) {
-                                return pos += 3, token = 63;
+                                return pos += 3, token = 64;
                             }
                             return pos += 2, token = 41;
                         }
@@ -5513,7 +5704,7 @@ var ts;
                             return pos += 2, token = 44;
                         }
                         if (text.charCodeAt(pos + 1) === 61) {
-                            return pos += 2, token = 60;
+                            return pos += 2, token = 61;
                         }
                         pos++;
                         return token = 38;
@@ -5525,7 +5716,7 @@ var ts;
                             return pos += 2, token = 45;
                         }
                         if (text.charCodeAt(pos + 1) === 61) {
-                            return pos += 2, token = 61;
+                            return pos += 2, token = 62;
                         }
                         pos++;
                         return token = 39;
@@ -5587,7 +5778,7 @@ var ts;
                             }
                         }
                         if (text.charCodeAt(pos + 1) === 61) {
-                            return pos += 2, token = 64;
+                            return pos += 2, token = 65;
                         }
                         pos++;
                         return token = 42;
@@ -5659,7 +5850,7 @@ var ts;
                         }
                         if (text.charCodeAt(pos + 1) === 60) {
                             if (text.charCodeAt(pos + 2) === 61) {
-                                return pos += 3, token = 66;
+                                return pos += 3, token = 67;
                             }
                             return pos += 2, token = 46;
                         }
@@ -5693,7 +5884,7 @@ var ts;
                             return pos += 2, token = 37;
                         }
                         pos++;
-                        return token = 59;
+                        return token = 60;
                     case 62:
                         if (isConflictMarkerTrivia(text, pos)) {
                             pos = scanConflictMarkerTrivia(text, pos, error);
@@ -5717,7 +5908,7 @@ var ts;
                         return token = 23;
                     case 94:
                         if (text.charCodeAt(pos + 1) === 61) {
-                            return pos += 2, token = 71;
+                            return pos += 2, token = 72;
                         }
                         pos++;
                         return token = 51;
@@ -5738,7 +5929,7 @@ var ts;
                             return pos += 2, token = 55;
                         }
                         if (text.charCodeAt(pos + 1) === 61) {
-                            return pos += 2, token = 70;
+                            return pos += 2, token = 71;
                         }
                         pos++;
                         return token = 50;
@@ -5792,12 +5983,12 @@ var ts;
                 if (text.charCodeAt(pos) === 62) {
                     if (text.charCodeAt(pos + 1) === 62) {
                         if (text.charCodeAt(pos + 2) === 61) {
-                            return pos += 3, token = 68;
+                            return pos += 3, token = 69;
                         }
                         return pos += 2, token = 48;
                     }
                     if (text.charCodeAt(pos + 1) === 61) {
-                        return pos += 2, token = 67;
+                        return pos += 2, token = 68;
                     }
                     pos++;
                     return token = 47;
@@ -5810,7 +6001,7 @@ var ts;
             return token;
         }
         function reScanSlashToken() {
-            if (token === 42 || token === 64) {
+            if (token === 42 || token === 65) {
                 var p = tokenPos + 1;
                 var inEscape = false;
                 var inCharacterClass = false;
@@ -5908,6 +6099,7 @@ var ts;
                 }
                 pos++;
             }
+            tokenValue = text.substring(startPos, pos);
             return firstNonWhitespace === -1 ? 12 : 11;
         }
         function scanJsxIdentifier() {
@@ -5937,7 +6129,7 @@ var ts;
                     return scan();
             }
         }
-        function scanJSDocToken() {
+        function scanJsDocToken() {
             startPos = tokenPos = pos;
             tokenFlags = 0;
             if (pos >= end) {
@@ -5972,22 +6164,19 @@ var ts;
                     return token = 23;
                 case 60:
                     return token = 28;
+                case 62:
+                    return token = 30;
                 case 61:
-                    return token = 59;
+                    return token = 60;
                 case 44:
                     return token = 27;
                 case 46:
                     return token = 24;
                 case 96:
-                    while (pos < end && text.charCodeAt(pos) !== 96) {
-                        pos++;
-                    }
-                    tokenValue = text.substring(tokenPos + 1, pos);
-                    pos++;
-                    return token = 14;
+                    return token = 59;
             }
-            if (isIdentifierStart(ch, 7)) {
-                while (isIdentifierPart(text.charCodeAt(pos), 7) && pos < end) {
+            if (isIdentifierStart(ch, 99)) {
+                while (isIdentifierPart(text.charCodeAt(pos), 99) && pos < end) {
                     pos++;
                 }
                 tokenValue = text.substring(tokenPos, pos);
@@ -6163,11 +6352,16 @@ var ts;
     }
     ts.toPath = toPath;
     function changesAffectModuleResolution(oldOptions, newOptions) {
-        return oldOptions.configFilePath !== newOptions.configFilePath || ts.moduleResolutionOptionDeclarations.some(function (o) {
+        return oldOptions.configFilePath !== newOptions.configFilePath ||
+            optionsHaveModuleResolutionChanges(oldOptions, newOptions);
+    }
+    ts.changesAffectModuleResolution = changesAffectModuleResolution;
+    function optionsHaveModuleResolutionChanges(oldOptions, newOptions) {
+        return ts.moduleResolutionOptionDeclarations.some(function (o) {
             return !ts.isJsonEqual(ts.getCompilerOptionValue(oldOptions, o), ts.getCompilerOptionValue(newOptions, o));
         });
     }
-    ts.changesAffectModuleResolution = changesAffectModuleResolution;
+    ts.optionsHaveModuleResolutionChanges = optionsHaveModuleResolutionChanges;
     function findAncestor(node, callback) {
         while (node) {
             var result = callback(node);
@@ -6196,10 +6390,9 @@ var ts;
     }
     ts.forEachAncestor = forEachAncestor;
     function forEachEntry(map, callback) {
-        var _a;
         var iterator = map.entries();
-        for (var _b = iterator.next(), pair = _b.value, done = _b.done; !done; _a = iterator.next(), pair = _a.value, done = _a.done, _a) {
-            var key = pair[0], value = pair[1];
+        for (var iterResult = iterator.next(); !iterResult.done; iterResult = iterator.next()) {
+            var _a = iterResult.value, key = _a[0], value = _a[1];
             var result = callback(value, key);
             if (result) {
                 return result;
@@ -6209,10 +6402,9 @@ var ts;
     }
     ts.forEachEntry = forEachEntry;
     function forEachKey(map, callback) {
-        var _a;
         var iterator = map.keys();
-        for (var _b = iterator.next(), key = _b.value, done = _b.done; !done; _a = iterator.next(), key = _a.value, done = _a.done, _a) {
-            var result = callback(key);
+        for (var iterResult = iterator.next(); !iterResult.done; iterResult = iterator.next()) {
+            var result = callback(iterResult.value);
             if (result) {
                 return result;
             }
@@ -6328,7 +6520,7 @@ var ts;
         }
     }
     function getSourceFileOfNode(node) {
-        while (node && node.kind !== 284) {
+        while (node && node.kind !== 285) {
             node = node.parent;
         }
         return node;
@@ -6336,11 +6528,11 @@ var ts;
     ts.getSourceFileOfNode = getSourceFileOfNode;
     function isStatementWithLocals(node) {
         switch (node.kind) {
-            case 218:
-            case 246:
-            case 225:
+            case 219:
+            case 247:
             case 226:
             case 227:
+            case 228:
                 return true;
         }
         return false;
@@ -6463,7 +6655,7 @@ var ts;
         if (includeJsDoc && ts.hasJSDocNodes(node)) {
             return getTokenPosOfNode(node.jsDoc[0]);
         }
-        if (node.kind === 311 && node._children.length > 0) {
+        if (node.kind === 313 && node._children.length > 0) {
             return getTokenPosOfNode(node._children[0], sourceFile, includeJsDoc);
         }
         return ts.skipTrivia((sourceFile || getSourceFileOfNode(node)).text, node.pos);
@@ -6482,7 +6674,7 @@ var ts;
     }
     ts.getSourceTextOfNodeFromSourceFile = getSourceTextOfNodeFromSourceFile;
     function isJSDocTypeExpressionOrChild(node) {
-        return node.kind === 288 || (node.parent && isJSDocTypeExpressionOrChild(node.parent));
+        return node.kind === 289 || (node.parent && isJSDocTypeExpressionOrChild(node.parent));
     }
     function getTextOfNodeFromSourceText(sourceText, node, includeTrivia) {
         if (includeTrivia === void 0) { includeTrivia = false; }
@@ -6558,7 +6750,7 @@ var ts;
     ts.isBlockOrCatchScoped = isBlockOrCatchScoped;
     function isCatchClauseVariableDeclarationOrBindingElement(declaration) {
         var node = getRootDeclaration(declaration);
-        return node.kind === 237 && node.parent.kind === 274;
+        return node.kind === 238 && node.parent.kind === 275;
     }
     ts.isCatchClauseVariableDeclarationOrBindingElement = isCatchClauseVariableDeclarationOrBindingElement;
     function isAmbientModule(node) {
@@ -6582,11 +6774,11 @@ var ts;
     }
     ts.isShorthandAmbientModuleSymbol = isShorthandAmbientModuleSymbol;
     function isShorthandAmbientModule(node) {
-        return node && node.kind === 244 && (!node.body);
+        return node && node.kind === 245 && (!node.body);
     }
     function isBlockScopedContainerTopLevel(node) {
-        return node.kind === 284 ||
-            node.kind === 244 ||
+        return node.kind === 285 ||
+            node.kind === 245 ||
             ts.isFunctionLike(node);
     }
     ts.isBlockScopedContainerTopLevel = isBlockScopedContainerTopLevel;
@@ -6600,9 +6792,9 @@ var ts;
     ts.isExternalModuleAugmentation = isExternalModuleAugmentation;
     function isModuleAugmentationExternal(node) {
         switch (node.parent.kind) {
-            case 284:
+            case 285:
                 return ts.isExternalModule(node.parent);
-            case 245:
+            case 246:
                 return isAmbientModule(node.parent.parent) && ts.isSourceFile(node.parent.parent.parent) && !ts.isExternalModule(node.parent.parent.parent);
         }
         return false;
@@ -6618,22 +6810,22 @@ var ts;
     ts.isEffectiveExternalModule = isEffectiveExternalModule;
     function isBlockScope(node, parentNode) {
         switch (node.kind) {
-            case 284:
-            case 246:
-            case 274:
-            case 244:
-            case 225:
+            case 285:
+            case 247:
+            case 275:
+            case 245:
             case 226:
             case 227:
-            case 157:
-            case 156:
+            case 228:
             case 158:
+            case 157:
             case 159:
-            case 239:
-            case 196:
+            case 160:
+            case 240:
             case 197:
+            case 198:
                 return true;
-            case 218:
+            case 219:
                 return !ts.isFunctionLike(parentNode);
         }
         return false;
@@ -6641,9 +6833,9 @@ var ts;
     ts.isBlockScope = isBlockScope;
     function isDeclarationWithTypeParameters(node) {
         switch (node.kind) {
-            case 302:
-            case 309:
-            case 298:
+            case 304:
+            case 311:
+            case 299:
                 return true;
             default:
                 ts.assertType(node);
@@ -6653,25 +6845,25 @@ var ts;
     ts.isDeclarationWithTypeParameters = isDeclarationWithTypeParameters;
     function isDeclarationWithTypeParameterChildren(node) {
         switch (node.kind) {
-            case 160:
             case 161:
-            case 155:
             case 162:
-            case 165:
-            case 166:
-            case 294:
-            case 240:
-            case 209:
-            case 241:
-            case 242:
-            case 308:
-            case 239:
             case 156:
+            case 163:
+            case 166:
+            case 167:
+            case 295:
+            case 241:
+            case 210:
+            case 242:
+            case 243:
+            case 310:
+            case 240:
             case 157:
             case 158:
             case 159:
-            case 196:
+            case 160:
             case 197:
+            case 198:
                 return true;
             default:
                 ts.assertType(node);
@@ -6681,8 +6873,8 @@ var ts;
     ts.isDeclarationWithTypeParameterChildren = isDeclarationWithTypeParameterChildren;
     function isAnyImportSyntax(node) {
         switch (node.kind) {
+            case 250:
             case 249:
-            case 248:
                 return true;
             default:
                 return false;
@@ -6691,15 +6883,15 @@ var ts;
     ts.isAnyImportSyntax = isAnyImportSyntax;
     function isLateVisibilityPaintedStatement(node) {
         switch (node.kind) {
+            case 250:
             case 249:
-            case 248:
-            case 219:
-            case 240:
-            case 239:
-            case 244:
-            case 242:
+            case 220:
             case 241:
+            case 240:
+            case 245:
             case 243:
+            case 242:
+            case 244:
                 return true;
             default:
                 return false;
@@ -6724,13 +6916,13 @@ var ts;
     ts.getNameFromIndexInfo = getNameFromIndexInfo;
     function getTextOfPropertyName(name) {
         switch (name.kind) {
-            case 72:
+            case 73:
                 return name.escapedText;
             case 10:
             case 8:
             case 14:
                 return ts.escapeLeadingUnderscores(name.text);
-            case 149:
+            case 150:
                 if (isStringOrNumericLiteralLike(name.expression))
                     return ts.escapeLeadingUnderscores(name.expression.text);
                 return ts.Debug.fail("Text of property name cannot be read from non-literal-valued ComputedPropertyNames");
@@ -6741,11 +6933,11 @@ var ts;
     ts.getTextOfPropertyName = getTextOfPropertyName;
     function entityNameToString(name) {
         switch (name.kind) {
-            case 72:
+            case 73:
                 return getFullWidth(name) === 0 ? ts.idText(name) : getTextOfNode(name);
-            case 148:
+            case 149:
                 return entityNameToString(name.left) + "." + entityNameToString(name.right);
-            case 189:
+            case 190:
                 return entityNameToString(name.expression) + "." + entityNameToString(name.name);
             default:
                 throw ts.Debug.assertNever(name);
@@ -6790,7 +6982,7 @@ var ts;
     ts.getSpanOfTokenAtPosition = getSpanOfTokenAtPosition;
     function getErrorSpanForArrowFunction(sourceFile, node) {
         var pos = ts.skipTrivia(sourceFile.text, node.pos);
-        if (node.body && node.body.kind === 218) {
+        if (node.body && node.body.kind === 219) {
             var startLine = ts.getLineAndCharacterOfPosition(sourceFile, node.body.pos).line;
             var endLine = ts.getLineAndCharacterOfPosition(sourceFile, node.body.end).line;
             if (startLine < endLine) {
@@ -6802,31 +6994,31 @@ var ts;
     function getErrorSpanForNode(sourceFile, node) {
         var errorNode = node;
         switch (node.kind) {
-            case 284:
+            case 285:
                 var pos_1 = ts.skipTrivia(sourceFile.text, 0, false);
                 if (pos_1 === sourceFile.text.length) {
                     return ts.createTextSpan(0, 0);
                 }
                 return getSpanOfTokenAtPosition(sourceFile, pos_1);
-            case 237:
-            case 186:
-            case 240:
-            case 209:
+            case 238:
+            case 187:
             case 241:
-            case 244:
-            case 243:
-            case 278:
-            case 239:
-            case 196:
-            case 156:
-            case 158:
-            case 159:
+            case 210:
             case 242:
+            case 245:
+            case 244:
+            case 279:
+            case 240:
+            case 197:
+            case 157:
+            case 159:
+            case 160:
+            case 243:
+            case 155:
             case 154:
-            case 153:
                 errorNode = node.name;
                 break;
-            case 197:
+            case 198:
                 return getErrorSpanForArrowFunction(sourceFile, node);
         }
         if (errorNode === undefined) {
@@ -6872,11 +7064,11 @@ var ts;
     }
     ts.isLet = isLet;
     function isSuperCall(n) {
-        return n.kind === 191 && n.expression.kind === 98;
+        return n.kind === 192 && n.expression.kind === 99;
     }
     ts.isSuperCall = isSuperCall;
     function isImportCall(n) {
-        return n.kind === 191 && n.expression.kind === 92;
+        return n.kind === 192 && n.expression.kind === 93;
     }
     ts.isImportCall = isImportCall;
     function isLiteralImportTypeNode(n) {
@@ -6884,7 +7076,7 @@ var ts;
     }
     ts.isLiteralImportTypeNode = isLiteralImportTypeNode;
     function isPrologueDirective(node) {
-        return node.kind === 221
+        return node.kind === 222
             && node.expression.kind === 10;
     }
     ts.isPrologueDirective = isPrologueDirective;
@@ -6893,11 +7085,11 @@ var ts;
     }
     ts.getLeadingCommentRangesOfNode = getLeadingCommentRangesOfNode;
     function getJSDocCommentRanges(node, text) {
-        var commentRanges = (node.kind === 151 ||
-            node.kind === 150 ||
-            node.kind === 196 ||
+        var commentRanges = (node.kind === 152 ||
+            node.kind === 151 ||
             node.kind === 197 ||
-            node.kind === 195) ?
+            node.kind === 198 ||
+            node.kind === 196) ?
             ts.concatenate(ts.getTrailingCommentRanges(text, node.pos), ts.getLeadingCommentRanges(text, node.pos)) :
             ts.getLeadingCommentRanges(text, node.pos);
         return ts.filter(commentRanges, function (comment) {
@@ -6912,79 +7104,79 @@ var ts;
     ts.fullTripleSlashAMDReferencePathRegEx = /^(\/\/\/\s*<amd-dependency\s+path\s*=\s*)('|")(.+?)\2.*?\/>/;
     var defaultLibReferenceRegEx = /^(\/\/\/\s*<reference\s+no-default-lib\s*=\s*)('|")(.+?)\2\s*\/>/;
     function isPartOfTypeNode(node) {
-        if (163 <= node.kind && node.kind <= 183) {
+        if (164 <= node.kind && node.kind <= 184) {
             return true;
         }
         switch (node.kind) {
-            case 120:
-            case 143:
-            case 135:
-            case 146:
-            case 138:
-            case 123:
-            case 139:
+            case 121:
+            case 144:
             case 136:
-            case 141:
-            case 132:
+            case 147:
+            case 139:
+            case 124:
+            case 140:
+            case 137:
+            case 142:
+            case 133:
                 return true;
-            case 106:
-                return node.parent.kind !== 200;
-            case 211:
+            case 107:
+                return node.parent.kind !== 201;
+            case 212:
                 return !isExpressionWithTypeArgumentsInClassExtendsClause(node);
-            case 150:
-                return node.parent.kind === 181 || node.parent.kind === 176;
-            case 72:
-                if (node.parent.kind === 148 && node.parent.right === node) {
+            case 151:
+                return node.parent.kind === 182 || node.parent.kind === 177;
+            case 73:
+                if (node.parent.kind === 149 && node.parent.right === node) {
                     node = node.parent;
                 }
-                else if (node.parent.kind === 189 && node.parent.name === node) {
+                else if (node.parent.kind === 190 && node.parent.name === node) {
                     node = node.parent;
                 }
-                ts.Debug.assert(node.kind === 72 || node.kind === 148 || node.kind === 189, "'node' was expected to be a qualified name, identifier or property access in 'isPartOfTypeNode'.");
-            case 148:
-            case 189:
-            case 100: {
+                ts.Debug.assert(node.kind === 73 || node.kind === 149 || node.kind === 190, "'node' was expected to be a qualified name, identifier or property access in 'isPartOfTypeNode'.");
+            case 149:
+            case 190:
+            case 101: {
                 var parent = node.parent;
-                if (parent.kind === 167) {
+                if (parent.kind === 168) {
                     return false;
                 }
-                if (parent.kind === 183) {
+                if (parent.kind === 184) {
                     return !parent.isTypeOf;
                 }
-                if (163 <= parent.kind && parent.kind <= 183) {
+                if (164 <= parent.kind && parent.kind <= 184) {
                     return true;
                 }
                 switch (parent.kind) {
-                    case 211:
+                    case 212:
                         return !isExpressionWithTypeArgumentsInClassExtendsClause(parent);
-                    case 150:
-                        return node === parent.constraint;
-                    case 308:
-                        return node === parent.constraint;
-                    case 154:
-                    case 153:
                     case 151:
-                    case 237:
+                        return node === parent.constraint;
+                    case 310:
+                        return node === parent.constraint;
+                    case 155:
+                    case 154:
+                    case 152:
+                    case 238:
                         return node === parent.type;
-                    case 239:
-                    case 196:
+                    case 240:
                     case 197:
+                    case 198:
+                    case 158:
                     case 157:
                     case 156:
-                    case 155:
-                    case 158:
                     case 159:
-                        return node === parent.type;
                     case 160:
+                        return node === parent.type;
                     case 161:
                     case 162:
+                    case 163:
                         return node === parent.type;
-                    case 194:
+                    case 195:
                         return node === parent.type;
-                    case 191:
                     case 192:
-                        return ts.contains(parent.typeArguments, node);
                     case 193:
+                        return ts.contains(parent.typeArguments, node);
+                    case 194:
                         return false;
                 }
             }
@@ -7006,23 +7198,23 @@ var ts;
         return traverse(body);
         function traverse(node) {
             switch (node.kind) {
-                case 230:
+                case 231:
                     return visitor(node);
-                case 246:
-                case 218:
-                case 222:
+                case 247:
+                case 219:
                 case 223:
                 case 224:
                 case 225:
                 case 226:
                 case 227:
-                case 231:
+                case 228:
                 case 232:
-                case 271:
-                case 272:
                 case 233:
-                case 235:
-                case 274:
+                case 272:
+                case 273:
+                case 234:
+                case 236:
+                case 275:
                     return ts.forEachChild(node, traverse);
             }
         }
@@ -7032,23 +7224,23 @@ var ts;
         return traverse(body);
         function traverse(node) {
             switch (node.kind) {
-                case 207:
+                case 208:
                     visitor(node);
                     var operand = node.expression;
                     if (operand) {
                         traverse(operand);
                     }
                     return;
-                case 243:
-                case 241:
                 case 244:
                 case 242:
-                case 240:
-                case 209:
+                case 245:
+                case 243:
+                case 241:
+                case 210:
                     return;
                 default:
                     if (ts.isFunctionLike(node)) {
-                        if (node.name && node.name.kind === 149) {
+                        if (node.name && node.name.kind === 150) {
                             traverse(node.name.expression);
                             return;
                         }
@@ -7061,10 +7253,10 @@ var ts;
     }
     ts.forEachYieldExpression = forEachYieldExpression;
     function getRestParameterElementType(node) {
-        if (node && node.kind === 169) {
+        if (node && node.kind === 170) {
             return node.elementType;
         }
-        else if (node && node.kind === 164) {
+        else if (node && node.kind === 165) {
             return ts.singleOrUndefined(node.typeArguments);
         }
         else {
@@ -7074,12 +7266,12 @@ var ts;
     ts.getRestParameterElementType = getRestParameterElementType;
     function getMembersOfDeclaration(node) {
         switch (node.kind) {
+            case 242:
             case 241:
-            case 240:
-            case 209:
-            case 168:
+            case 210:
+            case 169:
                 return node.members;
-            case 188:
+            case 189:
                 return node.properties;
         }
     }
@@ -7087,14 +7279,14 @@ var ts;
     function isVariableLike(node) {
         if (node) {
             switch (node.kind) {
-                case 186:
-                case 278:
-                case 151:
-                case 275:
-                case 154:
-                case 153:
+                case 187:
+                case 279:
+                case 152:
                 case 276:
-                case 237:
+                case 155:
+                case 154:
+                case 277:
+                case 238:
                     return true;
             }
         }
@@ -7106,8 +7298,8 @@ var ts;
     }
     ts.isVariableLikeOrAccessor = isVariableLikeOrAccessor;
     function isVariableDeclarationInVariableStatement(node) {
-        return node.parent.kind === 238
-            && node.parent.parent.kind === 219;
+        return node.parent.kind === 239
+            && node.parent.parent.kind === 220;
     }
     ts.isVariableDeclarationInVariableStatement = isVariableDeclarationInVariableStatement;
     function isValidESSymbolDeclaration(node) {
@@ -7118,13 +7310,13 @@ var ts;
     ts.isValidESSymbolDeclaration = isValidESSymbolDeclaration;
     function introducesArgumentsExoticObject(node) {
         switch (node.kind) {
-            case 156:
-            case 155:
             case 157:
+            case 156:
             case 158:
             case 159:
-            case 239:
-            case 196:
+            case 160:
+            case 240:
+            case 197:
                 return true;
         }
         return false;
@@ -7135,7 +7327,7 @@ var ts;
             if (beforeUnwrapLabelCallback) {
                 beforeUnwrapLabelCallback(node);
             }
-            if (node.statement.kind !== 233) {
+            if (node.statement.kind !== 234) {
                 return node.statement;
             }
             node = node.statement;
@@ -7143,17 +7335,17 @@ var ts;
     }
     ts.unwrapInnermostStatementOfLabel = unwrapInnermostStatementOfLabel;
     function isFunctionBlock(node) {
-        return node && node.kind === 218 && ts.isFunctionLike(node.parent);
+        return node && node.kind === 219 && ts.isFunctionLike(node.parent);
     }
     ts.isFunctionBlock = isFunctionBlock;
     function isObjectLiteralMethod(node) {
-        return node && node.kind === 156 && node.parent.kind === 188;
+        return node && node.kind === 157 && node.parent.kind === 189;
     }
     ts.isObjectLiteralMethod = isObjectLiteralMethod;
     function isObjectLiteralOrClassExpressionMethod(node) {
-        return node.kind === 156 &&
-            (node.parent.kind === 188 ||
-                node.parent.kind === 209);
+        return node.kind === 157 &&
+            (node.parent.kind === 189 ||
+                node.parent.kind === 210);
     }
     ts.isObjectLiteralOrClassExpressionMethod = isObjectLiteralOrClassExpressionMethod;
     function isIdentifierTypePredicate(predicate) {
@@ -7166,7 +7358,7 @@ var ts;
     ts.isThisTypePredicate = isThisTypePredicate;
     function getPropertyAssignment(objectLiteral, key, key2) {
         return objectLiteral.properties.filter(function (property) {
-            if (property.kind === 275) {
+            if (property.kind === 276) {
                 var propName = getTextOfPropertyName(property.name);
                 return key === propName || (!!key2 && key2 === propName);
             }
@@ -7198,51 +7390,55 @@ var ts;
         return findAncestor(node.parent, ts.isFunctionLike);
     }
     ts.getContainingFunction = getContainingFunction;
+    function getContainingFunctionDeclaration(node) {
+        return findAncestor(node.parent, ts.isFunctionLikeDeclaration);
+    }
+    ts.getContainingFunctionDeclaration = getContainingFunctionDeclaration;
     function getContainingClass(node) {
         return findAncestor(node.parent, ts.isClassLike);
     }
     ts.getContainingClass = getContainingClass;
     function getThisContainer(node, includeArrowFunctions) {
-        ts.Debug.assert(node.kind !== 284);
+        ts.Debug.assert(node.kind !== 285);
         while (true) {
             node = node.parent;
             if (!node) {
                 return ts.Debug.fail();
             }
             switch (node.kind) {
-                case 149:
+                case 150:
                     if (ts.isClassLike(node.parent.parent)) {
                         return node;
                     }
                     node = node.parent;
                     break;
-                case 152:
-                    if (node.parent.kind === 151 && ts.isClassElement(node.parent.parent)) {
+                case 153:
+                    if (node.parent.kind === 152 && ts.isClassElement(node.parent.parent)) {
                         node = node.parent.parent;
                     }
                     else if (ts.isClassElement(node.parent)) {
                         node = node.parent;
                     }
                     break;
-                case 197:
+                case 198:
                     if (!includeArrowFunctions) {
                         continue;
                     }
-                case 239:
-                case 196:
-                case 244:
-                case 154:
-                case 153:
-                case 156:
+                case 240:
+                case 197:
+                case 245:
                 case 155:
+                case 154:
                 case 157:
+                case 156:
                 case 158:
                 case 159:
                 case 160:
                 case 161:
                 case 162:
-                case 243:
-                case 284:
+                case 163:
+                case 244:
+                case 285:
                     return node;
             }
         }
@@ -7252,9 +7448,9 @@ var ts;
         var container = getThisContainer(node, false);
         if (container) {
             switch (container.kind) {
-                case 157:
-                case 239:
-                case 196:
+                case 158:
+                case 240:
+                case 197:
                     return container;
             }
         }
@@ -7268,25 +7464,25 @@ var ts;
                 return node;
             }
             switch (node.kind) {
-                case 149:
+                case 150:
                     node = node.parent;
                     break;
-                case 239:
-                case 196:
+                case 240:
                 case 197:
+                case 198:
                     if (!stopOnFunctions) {
                         continue;
                     }
-                case 154:
-                case 153:
-                case 156:
                 case 155:
+                case 154:
                 case 157:
+                case 156:
                 case 158:
                 case 159:
+                case 160:
                     return node;
-                case 152:
-                    if (node.parent.kind === 151 && ts.isClassElement(node.parent.parent)) {
+                case 153:
+                    if (node.parent.kind === 152 && ts.isClassElement(node.parent.parent)) {
                         node = node.parent.parent;
                     }
                     else if (ts.isClassElement(node.parent)) {
@@ -7298,46 +7494,46 @@ var ts;
     }
     ts.getSuperContainer = getSuperContainer;
     function getImmediatelyInvokedFunctionExpression(func) {
-        if (func.kind === 196 || func.kind === 197) {
+        if (func.kind === 197 || func.kind === 198) {
             var prev = func;
             var parent = func.parent;
-            while (parent.kind === 195) {
+            while (parent.kind === 196) {
                 prev = parent;
                 parent = parent.parent;
             }
-            if (parent.kind === 191 && parent.expression === prev) {
+            if (parent.kind === 192 && parent.expression === prev) {
                 return parent;
             }
         }
     }
     ts.getImmediatelyInvokedFunctionExpression = getImmediatelyInvokedFunctionExpression;
     function isSuperOrSuperProperty(node) {
-        return node.kind === 98
+        return node.kind === 99
             || isSuperProperty(node);
     }
     ts.isSuperOrSuperProperty = isSuperOrSuperProperty;
     function isSuperProperty(node) {
         var kind = node.kind;
-        return (kind === 189 || kind === 190)
-            && node.expression.kind === 98;
+        return (kind === 190 || kind === 191)
+            && node.expression.kind === 99;
     }
     ts.isSuperProperty = isSuperProperty;
     function isThisProperty(node) {
         var kind = node.kind;
-        return (kind === 189 || kind === 190)
-            && node.expression.kind === 100;
+        return (kind === 190 || kind === 191)
+            && node.expression.kind === 101;
     }
     ts.isThisProperty = isThisProperty;
     function getEntityNameFromTypeNode(node) {
         switch (node.kind) {
-            case 164:
+            case 165:
                 return node.typeName;
-            case 211:
+            case 212:
                 return isEntityNameExpression(node.expression)
                     ? node.expression
                     : undefined;
-            case 72:
-            case 148:
+            case 73:
+            case 149:
                 return node;
         }
         return undefined;
@@ -7345,10 +7541,10 @@ var ts;
     ts.getEntityNameFromTypeNode = getEntityNameFromTypeNode;
     function getInvokedExpression(node) {
         switch (node.kind) {
-            case 193:
+            case 194:
                 return node.tag;
+            case 263:
             case 262:
-            case 261:
                 return node.tagName;
             default:
                 return node.expression;
@@ -7357,21 +7553,21 @@ var ts;
     ts.getInvokedExpression = getInvokedExpression;
     function nodeCanBeDecorated(node, parent, grandparent) {
         switch (node.kind) {
-            case 240:
+            case 241:
                 return true;
-            case 154:
-                return parent.kind === 240;
-            case 158:
+            case 155:
+                return parent.kind === 241;
             case 159:
-            case 156:
+            case 160:
+            case 157:
                 return node.body !== undefined
-                    && parent.kind === 240;
-            case 151:
+                    && parent.kind === 241;
+            case 152:
                 return parent.body !== undefined
-                    && (parent.kind === 157
-                        || parent.kind === 156
-                        || parent.kind === 159)
-                    && grandparent.kind === 240;
+                    && (parent.kind === 158
+                        || parent.kind === 157
+                        || parent.kind === 160)
+                    && grandparent.kind === 241;
         }
         return false;
     }
@@ -7387,10 +7583,10 @@ var ts;
     ts.nodeOrChildIsDecorated = nodeOrChildIsDecorated;
     function childIsDecorated(node, parent) {
         switch (node.kind) {
-            case 240:
+            case 241:
                 return ts.some(node.members, function (m) { return nodeOrChildIsDecorated(m, node, parent); });
-            case 156:
-            case 159:
+            case 157:
+            case 160:
                 return ts.some(node.parameters, function (p) { return nodeIsDecorated(p, node, parent); });
             default:
                 return false;
@@ -7399,9 +7595,9 @@ var ts;
     ts.childIsDecorated = childIsDecorated;
     function isJSXTagName(node) {
         var parent = node.parent;
-        if (parent.kind === 262 ||
-            parent.kind === 261 ||
-            parent.kind === 263) {
+        if (parent.kind === 263 ||
+            parent.kind === 262 ||
+            parent.kind === 264) {
             return parent.tagName === node;
         }
         return false;
@@ -7409,56 +7605,56 @@ var ts;
     ts.isJSXTagName = isJSXTagName;
     function isExpressionNode(node) {
         switch (node.kind) {
-            case 98:
-            case 96:
-            case 102:
-            case 87:
+            case 99:
+            case 97:
+            case 103:
+            case 88:
             case 13:
-            case 187:
             case 188:
             case 189:
             case 190:
             case 191:
             case 192:
             case 193:
-            case 212:
             case 194:
             case 213:
             case 195:
+            case 214:
             case 196:
-            case 209:
             case 197:
-            case 200:
+            case 210:
             case 198:
+            case 201:
             case 199:
-            case 202:
+            case 200:
             case 203:
             case 204:
             case 205:
-            case 208:
             case 206:
-            case 14:
-            case 210:
-            case 260:
-            case 261:
-            case 264:
+            case 209:
             case 207:
-            case 201:
-            case 214:
+            case 14:
+            case 211:
+            case 261:
+            case 262:
+            case 265:
+            case 208:
+            case 202:
+            case 215:
                 return true;
-            case 148:
-                while (node.parent.kind === 148) {
+            case 149:
+                while (node.parent.kind === 149) {
                     node = node.parent;
                 }
-                return node.parent.kind === 167 || isJSXTagName(node);
-            case 72:
-                if (node.parent.kind === 167 || isJSXTagName(node)) {
+                return node.parent.kind === 168 || isJSXTagName(node);
+            case 73:
+                if (node.parent.kind === 168 || isJSXTagName(node)) {
                     return true;
                 }
             case 8:
             case 9:
             case 10:
-            case 100:
+            case 101:
                 return isInExpressionContext(node);
             default:
                 return false;
@@ -7468,49 +7664,49 @@ var ts;
     function isInExpressionContext(node) {
         var parent = node.parent;
         switch (parent.kind) {
-            case 237:
-            case 151:
+            case 238:
+            case 152:
+            case 155:
             case 154:
-            case 153:
-            case 278:
-            case 275:
-            case 186:
+            case 279:
+            case 276:
+            case 187:
                 return parent.initializer === node;
-            case 221:
             case 222:
             case 223:
             case 224:
-            case 230:
+            case 225:
             case 231:
             case 232:
-            case 271:
-            case 234:
+            case 233:
+            case 272:
+            case 235:
                 return parent.expression === node;
-            case 225:
+            case 226:
                 var forStatement = parent;
-                return (forStatement.initializer === node && forStatement.initializer.kind !== 238) ||
+                return (forStatement.initializer === node && forStatement.initializer.kind !== 239) ||
                     forStatement.condition === node ||
                     forStatement.incrementor === node;
-            case 226:
             case 227:
+            case 228:
                 var forInStatement = parent;
-                return (forInStatement.initializer === node && forInStatement.initializer.kind !== 238) ||
+                return (forInStatement.initializer === node && forInStatement.initializer.kind !== 239) ||
                     forInStatement.expression === node;
-            case 194:
-            case 212:
+            case 195:
+            case 213:
                 return node === parent.expression;
-            case 216:
+            case 217:
                 return node === parent.expression;
-            case 149:
+            case 150:
                 return node === parent.expression;
-            case 152:
+            case 153:
+            case 271:
             case 270:
-            case 269:
-            case 277:
+            case 278:
                 return true;
-            case 211:
+            case 212:
                 return parent.expression === node && isExpressionWithTypeArgumentsInClassExtendsClause(parent);
-            case 276:
+            case 277:
                 return parent.objectAssignmentInitializer === node;
             default:
                 return isExpressionNode(parent);
@@ -7518,7 +7714,7 @@ var ts;
     }
     ts.isInExpressionContext = isInExpressionContext;
     function isExternalModuleImportEqualsDeclaration(node) {
-        return node.kind === 248 && node.moduleReference.kind === 259;
+        return node.kind === 249 && node.moduleReference.kind === 260;
     }
     ts.isExternalModuleImportEqualsDeclaration = isExternalModuleImportEqualsDeclaration;
     function getExternalModuleImportEqualsDeclarationExpression(node) {
@@ -7527,7 +7723,7 @@ var ts;
     }
     ts.getExternalModuleImportEqualsDeclarationExpression = getExternalModuleImportEqualsDeclarationExpression;
     function isInternalModuleImportEqualsDeclaration(node) {
-        return node.kind === 248 && node.moduleReference.kind !== 259;
+        return node.kind === 249 && node.moduleReference.kind !== 260;
     }
     ts.isInternalModuleImportEqualsDeclaration = isInternalModuleImportEqualsDeclaration;
     function isSourceFileJS(file) {
@@ -7555,15 +7751,15 @@ var ts;
             ts.isIdentifier(node.typeName) &&
             node.typeName.escapedText === "Object" &&
             node.typeArguments && node.typeArguments.length === 2 &&
-            (node.typeArguments[0].kind === 138 || node.typeArguments[0].kind === 135);
+            (node.typeArguments[0].kind === 139 || node.typeArguments[0].kind === 136);
     }
     ts.isJSDocIndexSignature = isJSDocIndexSignature;
     function isRequireCall(callExpression, checkArgumentIsStringLiteralLike) {
-        if (callExpression.kind !== 191) {
+        if (callExpression.kind !== 192) {
             return false;
         }
         var _a = callExpression, expression = _a.expression, args = _a.arguments;
-        if (expression.kind !== 72 || expression.escapedText !== "require") {
+        if (expression.kind !== 73 || expression.escapedText !== "require") {
             return false;
         }
         if (args.length !== 1) {
@@ -7594,7 +7790,7 @@ var ts;
             name = node.parent.name;
             decl = node.parent;
         }
-        else if (ts.isBinaryExpression(node.parent) && node.parent.operatorToken.kind === 59 && node.parent.right === node) {
+        else if (ts.isBinaryExpression(node.parent) && node.parent.operatorToken.kind === 60 && node.parent.right === node) {
             name = node.parent.left;
             decl = name;
         }
@@ -7603,7 +7799,7 @@ var ts;
                 name = node.parent.parent.name;
                 decl = node.parent.parent;
             }
-            else if (ts.isBinaryExpression(node.parent.parent) && node.parent.parent.operatorToken.kind === 59 && node.parent.parent.right === node.parent) {
+            else if (ts.isBinaryExpression(node.parent.parent) && node.parent.parent.operatorToken.kind === 60 && node.parent.parent.right === node.parent) {
                 name = node.parent.parent.left;
                 decl = name;
             }
@@ -7639,7 +7835,7 @@ var ts;
         return ts.forEach(node.properties, function (p) { return ts.isPropertyAssignment(p) && ts.isIdentifier(p.name) && p.name.escapedText === "value" && p.initializer && getExpandoInitializer(p.initializer, isPrototypeAssignment); });
     }
     function getAssignedExpandoInitializer(node) {
-        if (node && node.parent && ts.isBinaryExpression(node.parent) && node.parent.operatorToken.kind === 59) {
+        if (node && node.parent && ts.isBinaryExpression(node.parent) && node.parent.operatorToken.kind === 60) {
             var isPrototypeAssignment = isPrototypeAccess(node.parent.left);
             return getExpandoInitializer(node.parent.right, isPrototypeAssignment) ||
                 getDefaultedExpandoInitializer(node.parent.left, node.parent.right, isPrototypeAssignment);
@@ -7655,11 +7851,11 @@ var ts;
     function getExpandoInitializer(initializer, isPrototypeAssignment) {
         if (ts.isCallExpression(initializer)) {
             var e = skipParentheses(initializer.expression);
-            return e.kind === 196 || e.kind === 197 ? initializer : undefined;
+            return e.kind === 197 || e.kind === 198 ? initializer : undefined;
         }
-        if (initializer.kind === 196 ||
-            initializer.kind === 209 ||
-            initializer.kind === 197) {
+        if (initializer.kind === 197 ||
+            initializer.kind === 210 ||
+            initializer.kind === 198) {
             return initializer;
         }
         if (ts.isObjectLiteralExpression(initializer) && (initializer.properties.length === 0 || isPrototypeAssignment)) {
@@ -7675,7 +7871,7 @@ var ts;
     }
     function isDefaultedExpandoInitializer(node) {
         var name = ts.isVariableDeclaration(node.parent) ? node.parent.name :
-            ts.isBinaryExpression(node.parent) && node.parent.operatorToken.kind === 59 ? node.parent.left :
+            ts.isBinaryExpression(node.parent) && node.parent.operatorToken.kind === 60 ? node.parent.left :
                 undefined;
         return name && getExpandoInitializer(node.right, isPrototypeAccess(name)) && isEntityNameExpression(name) && isSameEntityName(name, node.left);
     }
@@ -7683,7 +7879,7 @@ var ts;
     function getNameOfExpando(node) {
         if (ts.isBinaryExpression(node.parent)) {
             var parent = (node.parent.operatorToken.kind === 55 && ts.isBinaryExpression(node.parent.parent)) ? node.parent.parent : node.parent;
-            if (parent.operatorToken.kind === 59 && ts.isIdentifier(parent.left)) {
+            if (parent.operatorToken.kind === 60 && ts.isIdentifier(parent.left)) {
                 return parent.left;
             }
         }
@@ -7697,7 +7893,7 @@ var ts;
             return name.escapedText === initializer.escapedText;
         }
         if (ts.isIdentifier(name) && ts.isPropertyAccessExpression(initializer)) {
-            return (initializer.expression.kind === 100 ||
+            return (initializer.expression.kind === 101 ||
                 ts.isIdentifier(initializer.expression) &&
                     (initializer.expression.escapedText === "window" ||
                         initializer.expression.escapedText === "self" ||
@@ -7753,7 +7949,7 @@ var ts;
             }
             return 7;
         }
-        if (expr.operatorToken.kind !== 59 ||
+        if (expr.operatorToken.kind !== 60 ||
             !ts.isPropertyAccessExpression(expr.left)) {
             return 0;
         }
@@ -7764,7 +7960,7 @@ var ts;
         return getAssignmentDeclarationPropertyAccessKind(lhs);
     }
     function getAssignmentDeclarationPropertyAccessKind(lhs) {
-        if (lhs.expression.kind === 100) {
+        if (lhs.expression.kind === 101) {
             return 4;
         }
         else if (isModuleExportsPropertyAccessExpression(lhs)) {
@@ -7802,7 +7998,7 @@ var ts;
     ts.isPrototypePropertyAssignment = isPrototypePropertyAssignment;
     function isSpecialPropertyDeclaration(expr) {
         return isInJSFile(expr) &&
-            expr.parent && expr.parent.kind === 221 &&
+            expr.parent && expr.parent.kind === 222 &&
             !!ts.getJSDocTypeTag(expr.parent);
     }
     ts.isSpecialPropertyDeclaration = isSpecialPropertyDeclaration;
@@ -7811,23 +8007,23 @@ var ts;
             return false;
         }
         var decl = symbol.valueDeclaration;
-        return decl.kind === 239 || ts.isVariableDeclaration(decl) && decl.initializer && ts.isFunctionLike(decl.initializer);
+        return decl.kind === 240 || ts.isVariableDeclaration(decl) && decl.initializer && ts.isFunctionLike(decl.initializer);
     }
     ts.isFunctionSymbol = isFunctionSymbol;
     function importFromModuleSpecifier(node) {
-        return tryGetImportFromModuleSpecifier(node) || ts.Debug.fail(ts.Debug.showSyntaxKind(node.parent));
+        return tryGetImportFromModuleSpecifier(node) || ts.Debug.failBadSyntaxKind(node.parent);
     }
     ts.importFromModuleSpecifier = importFromModuleSpecifier;
     function tryGetImportFromModuleSpecifier(node) {
         switch (node.parent.kind) {
-            case 249:
-            case 255:
+            case 250:
+            case 256:
                 return node.parent;
-            case 259:
+            case 260:
                 return node.parent.parent;
-            case 191:
+            case 192:
                 return isImportCall(node.parent) || isRequireCall(node.parent, false) ? node.parent : undefined;
-            case 182:
+            case 183:
                 ts.Debug.assert(ts.isStringLiteral(node));
                 return ts.tryCast(node.parent.parent, ts.isImportTypeNode);
             default:
@@ -7837,12 +8033,12 @@ var ts;
     ts.tryGetImportFromModuleSpecifier = tryGetImportFromModuleSpecifier;
     function getExternalModuleName(node) {
         switch (node.kind) {
-            case 249:
-            case 255:
+            case 250:
+            case 256:
                 return node.moduleSpecifier;
-            case 248:
-                return node.moduleReference.kind === 259 ? node.moduleReference.expression : undefined;
-            case 183:
+            case 249:
+                return node.moduleReference.kind === 260 ? node.moduleReference.expression : undefined;
+            case 184:
                 return isLiteralImportTypeNode(node) ? node.argument.literal : undefined;
             default:
                 return ts.Debug.assertNever(node);
@@ -7851,11 +8047,11 @@ var ts;
     ts.getExternalModuleName = getExternalModuleName;
     function getNamespaceDeclarationNode(node) {
         switch (node.kind) {
-            case 249:
+            case 250:
                 return node.importClause && ts.tryCast(node.importClause.namedBindings, ts.isNamespaceImport);
-            case 248:
+            case 249:
                 return node;
-            case 255:
+            case 256:
                 return undefined;
             default:
                 return ts.Debug.assertNever(node);
@@ -7863,19 +8059,19 @@ var ts;
     }
     ts.getNamespaceDeclarationNode = getNamespaceDeclarationNode;
     function isDefaultImport(node) {
-        return node.kind === 249 && !!node.importClause && !!node.importClause.name;
+        return node.kind === 250 && !!node.importClause && !!node.importClause.name;
     }
     ts.isDefaultImport = isDefaultImport;
     function hasQuestionToken(node) {
         if (node) {
             switch (node.kind) {
-                case 151:
+                case 152:
+                case 157:
                 case 156:
-                case 155:
+                case 277:
                 case 276:
-                case 275:
+                case 155:
                 case 154:
-                case 153:
                     return node.questionToken !== undefined;
             }
         }
@@ -7889,7 +8085,7 @@ var ts;
     }
     ts.isJSDocConstructSignature = isJSDocConstructSignature;
     function isJSDocTypeAlias(node) {
-        return node.kind === 309 || node.kind === 302;
+        return node.kind === 311 || node.kind === 304;
     }
     ts.isJSDocTypeAlias = isJSDocTypeAlias;
     function isTypeAlias(node) {
@@ -7899,7 +8095,7 @@ var ts;
     function getSourceOfAssignment(node) {
         return ts.isExpressionStatement(node) &&
             node.expression && ts.isBinaryExpression(node.expression) &&
-            node.expression.operatorToken.kind === 59
+            node.expression.operatorToken.kind === 60
             ? node.expression.right
             : undefined;
     }
@@ -7914,12 +8110,12 @@ var ts;
     }
     function getSingleInitializerOfVariableStatementOrPropertyDeclaration(node) {
         switch (node.kind) {
-            case 219:
+            case 220:
                 var v = getSingleVariableOfVariableStatement(node);
                 return v && v.initializer;
-            case 154:
+            case 155:
                 return node.initializer;
-            case 275:
+            case 276:
                 return node.initializer;
         }
     }
@@ -7930,25 +8126,25 @@ var ts;
     function getNestedModuleDeclaration(node) {
         return ts.isModuleDeclaration(node) &&
             node.body &&
-            node.body.kind === 244
+            node.body.kind === 245
             ? node.body
             : undefined;
     }
     function getJSDocCommentsAndTags(hostNode) {
         var result;
         if (isVariableLike(hostNode) && ts.hasInitializer(hostNode) && ts.hasJSDocNodes(hostNode.initializer)) {
-            result = ts.addRange(result, hostNode.initializer.jsDoc);
+            result = ts.append(result, ts.last(hostNode.initializer.jsDoc));
         }
         var node = hostNode;
         while (node && node.parent) {
             if (ts.hasJSDocNodes(node)) {
-                result = ts.addRange(result, node.jsDoc);
+                result = ts.append(result, ts.last(node.jsDoc));
             }
-            if (node.kind === 151) {
+            if (node.kind === 152) {
                 result = ts.addRange(result, ts.getJSDocParameterTags(node));
                 break;
             }
-            if (node.kind === 150) {
+            if (node.kind === 151) {
                 result = ts.addRange(result, ts.getJSDocTypeParameterTags(node));
                 break;
             }
@@ -7959,16 +8155,17 @@ var ts;
     ts.getJSDocCommentsAndTags = getJSDocCommentsAndTags;
     function getNextJSDocCommentLocation(node) {
         var parent = node.parent;
-        if (parent.kind === 275 ||
-            parent.kind === 154 ||
-            parent.kind === 221 && node.kind === 189 ||
+        if (parent.kind === 276 ||
+            parent.kind === 255 ||
+            parent.kind === 155 ||
+            parent.kind === 222 && node.kind === 190 ||
             getNestedModuleDeclaration(parent) ||
-            ts.isBinaryExpression(node) && node.operatorToken.kind === 59) {
+            ts.isBinaryExpression(node) && node.operatorToken.kind === 60) {
             return parent;
         }
         else if (parent.parent &&
             (getSingleVariableOfVariableStatement(parent.parent) === node ||
-                ts.isBinaryExpression(parent) && parent.operatorToken.kind === 59)) {
+                ts.isBinaryExpression(parent) && parent.operatorToken.kind === 60)) {
             return parent.parent;
         }
         else if (parent.parent && parent.parent.parent &&
@@ -7990,7 +8187,7 @@ var ts;
         if (!decl) {
             return undefined;
         }
-        var parameter = ts.find(decl.parameters, function (p) { return p.name.kind === 72 && p.name.escapedText === name; });
+        var parameter = ts.find(decl.parameters, function (p) { return p.name.kind === 73 && p.name.escapedText === name; });
         return parameter && parameter.symbol;
     }
     ts.getParameterSymbolFromJSDoc = getParameterSymbolFromJSDoc;
@@ -8025,38 +8222,38 @@ var ts;
     ts.hasRestParameter = hasRestParameter;
     function isRestParameter(node) {
         var type = ts.isJSDocParameterTag(node) ? (node.typeExpression && node.typeExpression.type) : node.type;
-        return node.dotDotDotToken !== undefined || !!type && type.kind === 295;
+        return node.dotDotDotToken !== undefined || !!type && type.kind === 296;
     }
     ts.isRestParameter = isRestParameter;
     function getAssignmentTargetKind(node) {
         var parent = node.parent;
         while (true) {
             switch (parent.kind) {
-                case 204:
+                case 205:
                     var binaryOperator = parent.operatorToken.kind;
                     return isAssignmentOperator(binaryOperator) && parent.left === node ?
-                        binaryOperator === 59 ? 1 : 2 :
+                        binaryOperator === 60 ? 1 : 2 :
                         0;
-                case 202:
                 case 203:
+                case 204:
                     var unaryOperator = parent.operator;
                     return unaryOperator === 44 || unaryOperator === 45 ? 2 : 0;
-                case 226:
                 case 227:
+                case 228:
                     return parent.initializer === node ? 1 : 0;
-                case 195:
-                case 187:
-                case 208:
-                case 213:
+                case 196:
+                case 188:
+                case 209:
+                case 214:
                     node = parent;
                     break;
-                case 276:
+                case 277:
                     if (parent.name !== node) {
                         return 0;
                     }
                     node = parent.parent;
                     break;
-                case 275:
+                case 276:
                     if (parent.name === node) {
                         return 0;
                     }
@@ -8075,22 +8272,22 @@ var ts;
     ts.isAssignmentTarget = isAssignmentTarget;
     function isNodeWithPossibleHoistedDeclaration(node) {
         switch (node.kind) {
-            case 218:
             case 219:
-            case 231:
-            case 222:
+            case 220:
             case 232:
-            case 246:
-            case 271:
-            case 272:
+            case 223:
             case 233:
-            case 225:
+            case 247:
+            case 272:
+            case 273:
+            case 234:
             case 226:
             case 227:
-            case 223:
+            case 228:
             case 224:
-            case 235:
-            case 274:
+            case 225:
+            case 236:
+            case 275:
                 return true;
         }
         return false;
@@ -8107,32 +8304,32 @@ var ts;
         return node;
     }
     function walkUpParenthesizedTypes(node) {
-        return walkUp(node, 177);
+        return walkUp(node, 178);
     }
     ts.walkUpParenthesizedTypes = walkUpParenthesizedTypes;
     function walkUpParenthesizedExpressions(node) {
-        return walkUp(node, 195);
+        return walkUp(node, 196);
     }
     ts.walkUpParenthesizedExpressions = walkUpParenthesizedExpressions;
     function skipParentheses(node) {
-        while (node.kind === 195) {
+        while (node.kind === 196) {
             node = node.expression;
         }
         return node;
     }
     ts.skipParentheses = skipParentheses;
     function skipParenthesesUp(node) {
-        while (node.kind === 195) {
+        while (node.kind === 196) {
             node = node.parent;
         }
         return node;
     }
     function isDeleteTarget(node) {
-        if (node.kind !== 189 && node.kind !== 190) {
+        if (node.kind !== 190 && node.kind !== 191) {
             return false;
         }
         node = walkUpParenthesizedExpressions(node.parent);
-        return node && node.kind === 198;
+        return node && node.kind === 199;
     }
     ts.isDeleteTarget = isDeleteTarget;
     function isNodeDescendantOf(node, ancestor) {
@@ -8155,7 +8352,7 @@ var ts;
             case 8:
                 if (ts.isComputedPropertyName(parent))
                     return parent.parent;
-            case 72:
+            case 73:
                 if (ts.isDeclaration(parent)) {
                     return parent.name === name ? parent : undefined;
                 }
@@ -8179,49 +8376,49 @@ var ts;
     ts.getDeclarationFromName = getDeclarationFromName;
     function isLiteralComputedPropertyDeclarationName(node) {
         return (node.kind === 10 || node.kind === 8) &&
-            node.parent.kind === 149 &&
+            node.parent.kind === 150 &&
             ts.isDeclaration(node.parent.parent);
     }
     ts.isLiteralComputedPropertyDeclarationName = isLiteralComputedPropertyDeclarationName;
     function isIdentifierName(node) {
         var parent = node.parent;
         switch (parent.kind) {
-            case 154:
-            case 153:
-            case 156:
             case 155:
-            case 158:
+            case 154:
+            case 157:
+            case 156:
             case 159:
-            case 278:
-            case 275:
-            case 189:
+            case 160:
+            case 279:
+            case 276:
+            case 190:
                 return parent.name === node;
-            case 148:
+            case 149:
                 if (parent.right === node) {
-                    while (parent.kind === 148) {
+                    while (parent.kind === 149) {
                         parent = parent.parent;
                     }
-                    return parent.kind === 167 || parent.kind === 164;
+                    return parent.kind === 168 || parent.kind === 165;
                 }
                 return false;
-            case 186:
-            case 253:
+            case 187:
+            case 254:
                 return parent.propertyName === node;
-            case 257:
-            case 267:
+            case 258:
+            case 268:
                 return true;
         }
         return false;
     }
     ts.isIdentifierName = isIdentifierName;
     function isAliasSymbolDeclaration(node) {
-        return node.kind === 248 ||
-            node.kind === 247 ||
-            node.kind === 250 && !!node.name ||
-            node.kind === 251 ||
-            node.kind === 253 ||
-            node.kind === 257 ||
-            node.kind === 254 && exportAssignmentIsAlias(node) ||
+        return node.kind === 249 ||
+            node.kind === 248 ||
+            node.kind === 251 && !!node.name ||
+            node.kind === 252 ||
+            node.kind === 254 ||
+            node.kind === 258 ||
+            node.kind === 255 && exportAssignmentIsAlias(node) ||
             ts.isBinaryExpression(node) && getAssignmentDeclarationKind(node) === 2 && exportAssignmentIsAlias(node);
     }
     ts.isAliasSymbolDeclaration = isAliasSymbolDeclaration;
@@ -8242,12 +8439,12 @@ var ts;
     }
     ts.getEffectiveBaseTypeNode = getEffectiveBaseTypeNode;
     function getClassExtendsHeritageElement(node) {
-        var heritageClause = getHeritageClause(node.heritageClauses, 86);
+        var heritageClause = getHeritageClause(node.heritageClauses, 87);
         return heritageClause && heritageClause.types.length > 0 ? heritageClause.types[0] : undefined;
     }
     ts.getClassExtendsHeritageElement = getClassExtendsHeritageElement;
     function getClassImplementsHeritageClauseElements(node) {
-        var heritageClause = getHeritageClause(node.heritageClauses, 109);
+        var heritageClause = getHeritageClause(node.heritageClauses, 110);
         return heritageClause ? heritageClause.types : undefined;
     }
     ts.getClassImplementsHeritageClauseElements = getClassImplementsHeritageClauseElements;
@@ -8258,7 +8455,7 @@ var ts;
     }
     ts.getAllSuperTypeNodes = getAllSuperTypeNodes;
     function getInterfaceBaseTypeNodes(node) {
-        var heritageClause = getHeritageClause(node.heritageClauses, 86);
+        var heritageClause = getHeritageClause(node.heritageClauses, 87);
         return heritageClause ? heritageClause.types : undefined;
     }
     ts.getInterfaceBaseTypeNodes = getInterfaceBaseTypeNodes;
@@ -8274,13 +8471,6 @@ var ts;
         return undefined;
     }
     ts.getHeritageClause = getHeritageClause;
-    function tryResolveScriptReference(host, sourceFile, reference) {
-        if (!host.getCompilerOptions().noResolve) {
-            var referenceFileName = ts.isRootedDiskPath(reference.fileName) ? reference.fileName : ts.combinePaths(ts.getDirectoryPath(sourceFile.fileName), reference.fileName);
-            return host.getSourceFile(referenceFileName);
-        }
-    }
-    ts.tryResolveScriptReference = tryResolveScriptReference;
     function getAncestor(node, kind) {
         while (node) {
             if (node.kind === kind) {
@@ -8292,11 +8482,11 @@ var ts;
     }
     ts.getAncestor = getAncestor;
     function isKeyword(token) {
-        return 73 <= token && token <= 147;
+        return 74 <= token && token <= 148;
     }
     ts.isKeyword = isKeyword;
     function isContextualKeyword(token) {
-        return 118 <= token && token <= 147;
+        return 119 <= token && token <= 148;
     }
     ts.isContextualKeyword = isContextualKeyword;
     function isNonContextualKeyword(token) {
@@ -8323,13 +8513,13 @@ var ts;
         }
         var flags = 0;
         switch (node.kind) {
-            case 239:
-            case 196:
-            case 156:
+            case 240:
+            case 197:
+            case 157:
                 if (node.asteriskToken) {
                     flags |= 1;
                 }
-            case 197:
+            case 198:
                 if (hasModifier(node, 256)) {
                     flags |= 2;
                 }
@@ -8343,10 +8533,10 @@ var ts;
     ts.getFunctionFlags = getFunctionFlags;
     function isAsyncFunction(node) {
         switch (node.kind) {
-            case 239:
-            case 196:
+            case 240:
             case 197:
-            case 156:
+            case 198:
+            case 157:
                 return node.body !== undefined
                     && node.asteriskToken === undefined
                     && hasModifier(node, 256);
@@ -8358,14 +8548,19 @@ var ts;
         return ts.isStringLiteralLike(node) || ts.isNumericLiteral(node);
     }
     ts.isStringOrNumericLiteralLike = isStringOrNumericLiteralLike;
+    function isSignedNumericLiteral(node) {
+        return ts.isPrefixUnaryExpression(node) && (node.operator === 38 || node.operator === 39) && ts.isNumericLiteral(node.operand);
+    }
+    ts.isSignedNumericLiteral = isSignedNumericLiteral;
     function hasDynamicName(declaration) {
         var name = ts.getNameOfDeclaration(declaration);
         return !!name && isDynamicName(name);
     }
     ts.hasDynamicName = hasDynamicName;
     function isDynamicName(name) {
-        return name.kind === 149 &&
+        return name.kind === 150 &&
             !isStringOrNumericLiteralLike(name.expression) &&
+            !isSignedNumericLiteral(name.expression) &&
             !isWellKnownSymbolSyntactically(name.expression);
     }
     ts.isDynamicName = isDynamicName;
@@ -8375,12 +8570,12 @@ var ts;
     ts.isWellKnownSymbolSyntactically = isWellKnownSymbolSyntactically;
     function getPropertyNameForPropertyNameNode(name) {
         switch (name.kind) {
-            case 72:
+            case 73:
                 return name.escapedText;
             case 10:
             case 8:
                 return ts.escapeLeadingUnderscores(name.text);
-            case 149:
+            case 150:
                 var nameExpression = name.expression;
                 if (isWellKnownSymbolSyntactically(nameExpression)) {
                     return getPropertyNameForKnownSymbolName(ts.idText(nameExpression.name));
@@ -8396,7 +8591,7 @@ var ts;
     ts.getPropertyNameForPropertyNameNode = getPropertyNameForPropertyNameNode;
     function isPropertyNameLiteral(node) {
         switch (node.kind) {
-            case 72:
+            case 73:
             case 10:
             case 14:
             case 8:
@@ -8407,11 +8602,11 @@ var ts;
     }
     ts.isPropertyNameLiteral = isPropertyNameLiteral;
     function getTextOfIdentifierOrLiteral(node) {
-        return node.kind === 72 ? ts.idText(node) : node.text;
+        return node.kind === 73 ? ts.idText(node) : node.text;
     }
     ts.getTextOfIdentifierOrLiteral = getTextOfIdentifierOrLiteral;
     function getEscapedTextOfIdentifierOrLiteral(node) {
-        return node.kind === 72 ? node.escapedText : ts.escapeLeadingUnderscores(node.text);
+        return node.kind === 73 ? node.escapedText : ts.escapeLeadingUnderscores(node.text);
     }
     ts.getEscapedTextOfIdentifierOrLiteral = getEscapedTextOfIdentifierOrLiteral;
     function getPropertyNameForKnownSymbolName(symbolName) {
@@ -8423,7 +8618,7 @@ var ts;
     }
     ts.isKnownSymbol = isKnownSymbol;
     function isESSymbolIdentifier(node) {
-        return node.kind === 72 && node.escapedText === "Symbol";
+        return node.kind === 73 && node.escapedText === "Symbol";
     }
     ts.isESSymbolIdentifier = isESSymbolIdentifier;
     function isPushOrUnshiftIdentifier(node) {
@@ -8432,11 +8627,11 @@ var ts;
     ts.isPushOrUnshiftIdentifier = isPushOrUnshiftIdentifier;
     function isParameterDeclaration(node) {
         var root = getRootDeclaration(node);
-        return root.kind === 151;
+        return root.kind === 152;
     }
     ts.isParameterDeclaration = isParameterDeclaration;
     function getRootDeclaration(node) {
-        while (node.kind === 186) {
+        while (node.kind === 187) {
             node = node.parent.parent;
         }
         return node;
@@ -8444,15 +8639,15 @@ var ts;
     ts.getRootDeclaration = getRootDeclaration;
     function nodeStartsNewLexicalEnvironment(node) {
         var kind = node.kind;
-        return kind === 157
-            || kind === 196
-            || kind === 239
+        return kind === 158
             || kind === 197
-            || kind === 156
-            || kind === 158
+            || kind === 240
+            || kind === 198
+            || kind === 157
             || kind === 159
-            || kind === 244
-            || kind === 284;
+            || kind === 160
+            || kind === 245
+            || kind === 285;
     }
     ts.nodeStartsNewLexicalEnvironment = nodeStartsNewLexicalEnvironment;
     function nodeIsSynthesized(range) {
@@ -8466,38 +8661,38 @@ var ts;
     ts.getOriginalSourceFile = getOriginalSourceFile;
     function getExpressionAssociativity(expression) {
         var operator = getOperator(expression);
-        var hasArguments = expression.kind === 192 && expression.arguments !== undefined;
+        var hasArguments = expression.kind === 193 && expression.arguments !== undefined;
         return getOperatorAssociativity(expression.kind, operator, hasArguments);
     }
     ts.getExpressionAssociativity = getExpressionAssociativity;
     function getOperatorAssociativity(kind, operator, hasArguments) {
         switch (kind) {
-            case 192:
+            case 193:
                 return hasArguments ? 0 : 1;
-            case 202:
-            case 199:
+            case 203:
             case 200:
-            case 198:
             case 201:
-            case 205:
-            case 207:
+            case 199:
+            case 202:
+            case 206:
+            case 208:
                 return 1;
-            case 204:
+            case 205:
                 switch (operator) {
                     case 41:
-                    case 59:
                     case 60:
                     case 61:
-                    case 63:
                     case 62:
                     case 64:
+                    case 63:
                     case 65:
                     case 66:
                     case 67:
                     case 68:
                     case 69:
-                    case 71:
                     case 70:
+                    case 72:
+                    case 71:
                         return 1;
                 }
         }
@@ -8506,15 +8701,15 @@ var ts;
     ts.getOperatorAssociativity = getOperatorAssociativity;
     function getExpressionPrecedence(expression) {
         var operator = getOperator(expression);
-        var hasArguments = expression.kind === 192 && expression.arguments !== undefined;
+        var hasArguments = expression.kind === 193 && expression.arguments !== undefined;
         return getOperatorPrecedence(expression.kind, operator, hasArguments);
     }
     ts.getExpressionPrecedence = getExpressionPrecedence;
     function getOperator(expression) {
-        if (expression.kind === 204) {
+        if (expression.kind === 205) {
             return expression.operatorToken.kind;
         }
-        else if (expression.kind === 202 || expression.kind === 203) {
+        else if (expression.kind === 203 || expression.kind === 204) {
             return expression.operator;
         }
         else {
@@ -8524,73 +8719,73 @@ var ts;
     ts.getOperator = getOperator;
     function getOperatorPrecedence(nodeKind, operatorKind, hasArguments) {
         switch (nodeKind) {
-            case 314:
+            case 316:
                 return 0;
-            case 208:
+            case 209:
                 return 1;
-            case 207:
+            case 208:
                 return 2;
-            case 205:
+            case 206:
                 return 4;
-            case 204:
+            case 205:
                 switch (operatorKind) {
                     case 27:
                         return 0;
-                    case 59:
                     case 60:
                     case 61:
-                    case 63:
                     case 62:
                     case 64:
+                    case 63:
                     case 65:
                     case 66:
                     case 67:
                     case 68:
                     case 69:
-                    case 71:
                     case 70:
+                    case 72:
+                    case 71:
                         return 3;
                     default:
                         return getBinaryOperatorPrecedence(operatorKind);
                 }
-            case 202:
-            case 199:
-            case 200:
-            case 198:
-            case 201:
-                return 16;
             case 203:
+            case 200:
+            case 201:
+            case 199:
+            case 202:
+                return 16;
+            case 204:
                 return 17;
-            case 191:
-                return 18;
             case 192:
-                return hasArguments ? 19 : 18;
+                return 18;
             case 193:
-            case 189:
+                return hasArguments ? 19 : 18;
+            case 194:
             case 190:
+            case 191:
                 return 19;
-            case 100:
-            case 98:
-            case 72:
-            case 96:
-            case 102:
-            case 87:
+            case 101:
+            case 99:
+            case 73:
+            case 97:
+            case 103:
+            case 88:
             case 8:
             case 9:
             case 10:
-            case 187:
             case 188:
-            case 196:
+            case 189:
             case 197:
-            case 209:
-            case 260:
+            case 198:
+            case 210:
             case 261:
-            case 264:
+            case 262:
+            case 265:
             case 13:
             case 14:
-            case 206:
-            case 195:
-            case 210:
+            case 207:
+            case 196:
+            case 211:
                 return 20;
             default:
                 return -1;
@@ -8618,9 +8813,9 @@ var ts;
             case 30:
             case 31:
             case 32:
+            case 95:
             case 94:
-            case 93:
-            case 119:
+            case 120:
                 return 11;
             case 46:
             case 47:
@@ -8732,6 +8927,18 @@ var ts;
         return s.replace(escapedCharsRegExp, getReplacement);
     }
     ts.escapeString = escapeString;
+    function stripQuotes(name) {
+        var length = name.length;
+        if (length >= 2 && name.charCodeAt(0) === name.charCodeAt(length - 1) && startsWithQuote(name)) {
+            return name.substring(1, length - 1);
+        }
+        return name;
+    }
+    ts.stripQuotes = stripQuotes;
+    function startsWithQuote(name) {
+        return isSingleOrDoubleQuote(name.charCodeAt(0));
+    }
+    ts.startsWithQuote = startsWithQuote;
     function getReplacement(c, offset, input) {
         if (c.charCodeAt(0) === 0) {
             var lookAhead = input.charCodeAt(offset + c.length);
@@ -8974,21 +9181,25 @@ var ts;
     function getSourceFilesToEmit(host, targetSourceFile) {
         var options = host.getCompilerOptions();
         var isSourceFileFromExternalLibrary = function (file) { return host.isSourceFileFromExternalLibrary(file); };
+        var getResolvedProjectReferenceToRedirect = function (fileName) { return host.getResolvedProjectReferenceToRedirect(fileName); };
         if (options.outFile || options.out) {
             var moduleKind = ts.getEmitModuleKind(options);
             var moduleEmitEnabled_1 = options.emitDeclarationOnly || moduleKind === ts.ModuleKind.AMD || moduleKind === ts.ModuleKind.System;
             return ts.filter(host.getSourceFiles(), function (sourceFile) {
-                return (moduleEmitEnabled_1 || !ts.isExternalModule(sourceFile)) && sourceFileMayBeEmitted(sourceFile, options, isSourceFileFromExternalLibrary);
+                return (moduleEmitEnabled_1 || !ts.isExternalModule(sourceFile)) && sourceFileMayBeEmitted(sourceFile, options, isSourceFileFromExternalLibrary, getResolvedProjectReferenceToRedirect);
             });
         }
         else {
             var sourceFiles = targetSourceFile === undefined ? host.getSourceFiles() : [targetSourceFile];
-            return ts.filter(sourceFiles, function (sourceFile) { return sourceFileMayBeEmitted(sourceFile, options, isSourceFileFromExternalLibrary); });
+            return ts.filter(sourceFiles, function (sourceFile) { return sourceFileMayBeEmitted(sourceFile, options, isSourceFileFromExternalLibrary, getResolvedProjectReferenceToRedirect); });
         }
     }
     ts.getSourceFilesToEmit = getSourceFilesToEmit;
-    function sourceFileMayBeEmitted(sourceFile, options, isSourceFileFromExternalLibrary) {
-        return !(options.noEmitForJsFiles && isSourceFileJS(sourceFile)) && !sourceFile.isDeclarationFile && !isSourceFileFromExternalLibrary(sourceFile);
+    function sourceFileMayBeEmitted(sourceFile, options, isSourceFileFromExternalLibrary, getResolvedProjectReferenceToRedirect) {
+        return !(options.noEmitForJsFiles && isSourceFileJS(sourceFile)) &&
+            !sourceFile.isDeclarationFile &&
+            !isSourceFileFromExternalLibrary(sourceFile) &&
+            !(isJsonSourceFile(sourceFile) && getResolvedProjectReferenceToRedirect(sourceFile.fileName));
     }
     ts.sourceFileMayBeEmitted = sourceFileMayBeEmitted;
     function getSourceFilePathInNewDir(fileName, host, newDirPath) {
@@ -9045,11 +9256,11 @@ var ts;
     }
     ts.parameterIsThisKeyword = parameterIsThisKeyword;
     function isThisIdentifier(node) {
-        return !!node && node.kind === 72 && identifierIsThisKeyword(node);
+        return !!node && node.kind === 73 && identifierIsThisKeyword(node);
     }
     ts.isThisIdentifier = isThisIdentifier;
     function identifierIsThisKeyword(id) {
-        return id.originalKeywordKind === 100;
+        return id.originalKeywordKind === 101;
     }
     ts.identifierIsThisKeyword = identifierIsThisKeyword;
     function getAllAccessorDeclarations(declarations, accessor) {
@@ -9059,10 +9270,10 @@ var ts;
         var setAccessor;
         if (hasDynamicName(accessor)) {
             firstAccessor = accessor;
-            if (accessor.kind === 158) {
+            if (accessor.kind === 159) {
                 getAccessor = accessor;
             }
-            else if (accessor.kind === 159) {
+            else if (accessor.kind === 160) {
                 setAccessor = accessor;
             }
             else {
@@ -9082,10 +9293,10 @@ var ts;
                         else if (!secondAccessor) {
                             secondAccessor = member;
                         }
-                        if (member.kind === 158 && !getAccessor) {
+                        if (member.kind === 159 && !getAccessor) {
                             getAccessor = member;
                         }
-                        if (member.kind === 159 && !setAccessor) {
+                        if (member.kind === 160 && !setAccessor) {
                             setAccessor = member;
                         }
                     }
@@ -9122,7 +9333,7 @@ var ts;
     }
     ts.getJSDocTypeParameterDeclarations = getJSDocTypeParameterDeclarations;
     function isNonTypeAliasTemplate(tag) {
-        return ts.isJSDocTemplateTag(tag) && !(tag.parent.kind === 296 && tag.parent.tags.some(isJSDocTypeAlias));
+        return ts.isJSDocTemplateTag(tag) && !(tag.parent.kind === 297 && tag.parent.tags.some(isJSDocTypeAlias));
     }
     function getEffectiveSetAccessorTypeAnnotationNode(node) {
         var parameter = getSetAccessorValueParameter(node);
@@ -9314,7 +9525,7 @@ var ts;
                 flags |= modifierToFlag(modifier.kind);
             }
         }
-        if (node.flags & 4 || (node.kind === 72 && node.isInJSDocNamespace)) {
+        if (node.flags & 4 || (node.kind === 73 && node.isInJSDocNamespace)) {
             flags |= 1;
         }
         return flags;
@@ -9322,17 +9533,17 @@ var ts;
     ts.getModifierFlagsNoCache = getModifierFlagsNoCache;
     function modifierToFlag(token) {
         switch (token) {
-            case 116: return 32;
-            case 115: return 4;
-            case 114: return 16;
-            case 113: return 8;
-            case 118: return 128;
-            case 85: return 1;
-            case 125: return 2;
-            case 77: return 2048;
-            case 80: return 512;
-            case 121: return 256;
-            case 133: return 64;
+            case 117: return 32;
+            case 116: return 4;
+            case 115: return 16;
+            case 114: return 8;
+            case 119: return 128;
+            case 86: return 1;
+            case 126: return 2;
+            case 78: return 2048;
+            case 81: return 512;
+            case 122: return 256;
+            case 134: return 64;
         }
         return 0;
     }
@@ -9344,7 +9555,7 @@ var ts;
     }
     ts.isLogicalOperator = isLogicalOperator;
     function isAssignmentOperator(token) {
-        return token >= 59 && token <= 71;
+        return token >= 60 && token <= 72;
     }
     ts.isAssignmentOperator = isAssignmentOperator;
     function tryGetClassExtendingExpressionWithTypeArguments(node) {
@@ -9356,14 +9567,14 @@ var ts;
         return ts.isExpressionWithTypeArguments(node)
             && ts.isHeritageClause(node.parent)
             && ts.isClassLike(node.parent.parent)
-            ? { class: node.parent.parent, isImplements: node.parent.token === 109 }
+            ? { class: node.parent.parent, isImplements: node.parent.token === 110 }
             : undefined;
     }
     ts.tryGetClassImplementingOrExtendingExpressionWithTypeArguments = tryGetClassImplementingOrExtendingExpressionWithTypeArguments;
     function isAssignmentExpression(node, excludeCompoundAssignment) {
         return ts.isBinaryExpression(node)
             && (excludeCompoundAssignment
-                ? node.operatorToken.kind === 59
+                ? node.operatorToken.kind === 60
                 : isAssignmentOperator(node.operatorToken.kind))
             && ts.isLeftHandSideExpression(node.left);
     }
@@ -9371,8 +9582,8 @@ var ts;
     function isDestructuringAssignment(node) {
         if (isAssignmentExpression(node, true)) {
             var kind = node.left.kind;
-            return kind === 188
-                || kind === 187;
+            return kind === 189
+                || kind === 188;
         }
         return false;
     }
@@ -9382,29 +9593,39 @@ var ts;
     }
     ts.isExpressionWithTypeArgumentsInClassExtendsClause = isExpressionWithTypeArgumentsInClassExtendsClause;
     function isEntityNameExpression(node) {
-        return node.kind === 72 || isPropertyAccessEntityNameExpression(node);
+        return node.kind === 73 || isPropertyAccessEntityNameExpression(node);
     }
     ts.isEntityNameExpression = isEntityNameExpression;
     function isPropertyAccessEntityNameExpression(node) {
         return ts.isPropertyAccessExpression(node) && isEntityNameExpression(node.expression);
     }
     ts.isPropertyAccessEntityNameExpression = isPropertyAccessEntityNameExpression;
+    function tryGetPropertyAccessOrIdentifierToString(expr) {
+        if (ts.isPropertyAccessExpression(expr)) {
+            return tryGetPropertyAccessOrIdentifierToString(expr.expression) + "." + expr.name;
+        }
+        if (ts.isIdentifier(expr)) {
+            return ts.unescapeLeadingUnderscores(expr.escapedText);
+        }
+        return undefined;
+    }
+    ts.tryGetPropertyAccessOrIdentifierToString = tryGetPropertyAccessOrIdentifierToString;
     function isPrototypeAccess(node) {
         return ts.isPropertyAccessExpression(node) && node.name.escapedText === "prototype";
     }
     ts.isPrototypeAccess = isPrototypeAccess;
     function isRightSideOfQualifiedNameOrPropertyAccess(node) {
-        return (node.parent.kind === 148 && node.parent.right === node) ||
-            (node.parent.kind === 189 && node.parent.name === node);
+        return (node.parent.kind === 149 && node.parent.right === node) ||
+            (node.parent.kind === 190 && node.parent.name === node);
     }
     ts.isRightSideOfQualifiedNameOrPropertyAccess = isRightSideOfQualifiedNameOrPropertyAccess;
     function isEmptyObjectLiteral(expression) {
-        return expression.kind === 188 &&
+        return expression.kind === 189 &&
             expression.properties.length === 0;
     }
     ts.isEmptyObjectLiteral = isEmptyObjectLiteral;
     function isEmptyArrayLiteral(expression) {
-        return expression.kind === 187 &&
+        return expression.kind === 188 &&
             expression.elements.length === 0;
     }
     ts.isEmptyArrayLiteral = isEmptyArrayLiteral;
@@ -9571,74 +9792,6 @@ var ts;
         return getNewLine ? getNewLine() : ts.sys ? ts.sys.newLine : carriageReturnLineFeed;
     }
     ts.getNewLineCharacter = getNewLineCharacter;
-    function formatEnum(value, enumObject, isFlags) {
-        if (value === void 0) { value = 0; }
-        var members = getEnumMembers(enumObject);
-        if (value === 0) {
-            return members.length > 0 && members[0][0] === 0 ? members[0][1] : "0";
-        }
-        if (isFlags) {
-            var result = "";
-            var remainingFlags = value;
-            for (var i = members.length - 1; i >= 0 && remainingFlags !== 0; i--) {
-                var _a = members[i], enumValue = _a[0], enumName = _a[1];
-                if (enumValue !== 0 && (remainingFlags & enumValue) === enumValue) {
-                    remainingFlags &= ~enumValue;
-                    result = "" + enumName + (result ? ", " : "") + result;
-                }
-            }
-            if (remainingFlags === 0) {
-                return result;
-            }
-        }
-        else {
-            for (var _i = 0, members_1 = members; _i < members_1.length; _i++) {
-                var _b = members_1[_i], enumValue = _b[0], enumName = _b[1];
-                if (enumValue === value) {
-                    return enumName;
-                }
-            }
-        }
-        return value.toString();
-    }
-    function getEnumMembers(enumObject) {
-        var result = [];
-        for (var name in enumObject) {
-            var value = enumObject[name];
-            if (typeof value === "number") {
-                result.push([value, name]);
-            }
-        }
-        return ts.stableSort(result, function (x, y) { return ts.compareValues(x[0], y[0]); });
-    }
-    function formatSyntaxKind(kind) {
-        return formatEnum(kind, ts.SyntaxKind, false);
-    }
-    ts.formatSyntaxKind = formatSyntaxKind;
-    function formatModifierFlags(flags) {
-        return formatEnum(flags, ts.ModifierFlags, true);
-    }
-    ts.formatModifierFlags = formatModifierFlags;
-    function formatTransformFlags(flags) {
-        return formatEnum(flags, ts.TransformFlags, true);
-    }
-    ts.formatTransformFlags = formatTransformFlags;
-    function formatEmitFlags(flags) {
-        return formatEnum(flags, ts.EmitFlags, true);
-    }
-    ts.formatEmitFlags = formatEmitFlags;
-    function formatSymbolFlags(flags) {
-        return formatEnum(flags, ts.SymbolFlags, true);
-    }
-    ts.formatSymbolFlags = formatSymbolFlags;
-    function formatTypeFlags(flags) {
-        return formatEnum(flags, ts.TypeFlags, true);
-    }
-    ts.formatTypeFlags = formatTypeFlags;
-    function formatObjectFlags(flags) {
-        return formatEnum(flags, ts.ObjectFlags, true);
-    }
-    ts.formatObjectFlags = formatObjectFlags;
     function createRange(pos, end) {
         if (end === void 0) { end = pos; }
         ts.Debug.assert(end >= pos || end === -1);
@@ -9693,6 +9846,10 @@ var ts;
         return positionsAreOnSameLine(range1.end, getStartPositionOfRange(range2, sourceFile), sourceFile);
     }
     ts.rangeEndIsOnSameLineAsRangeStart = rangeEndIsOnSameLineAsRangeStart;
+    function isNodeArrayMultiLine(list, sourceFile) {
+        return !positionsAreOnSameLine(list.pos, list.end, sourceFile);
+    }
+    ts.isNodeArrayMultiLine = isNodeArrayMultiLine;
     function positionsAreOnSameLine(pos1, pos2, sourceFile) {
         return pos1 === pos2 ||
             getLineOfLocalPosition(sourceFile, pos1) === getLineOfLocalPosition(sourceFile, pos2);
@@ -9706,8 +9863,8 @@ var ts;
         var parseNode = ts.getParseTreeNode(node);
         if (parseNode) {
             switch (parseNode.parent.kind) {
-                case 243:
                 case 244:
+                case 245:
                     return parseNode === parseNode.parent.name;
             }
         }
@@ -9740,10 +9897,10 @@ var ts;
         }
         if (getCheckFlags(s) & 6) {
             var checkFlags = s.checkFlags;
-            var accessModifier = checkFlags & 512 ? 8 :
-                checkFlags & 128 ? 4 :
+            var accessModifier = checkFlags & 1024 ? 8 :
+                checkFlags & 256 ? 4 :
                     16;
-            var staticModifier = checkFlags & 1024 ? 32 : 0;
+            var staticModifier = checkFlags & 2048 ? 32 : 0;
             return accessModifier | staticModifier;
         }
         if (s.flags & 4194304) {
@@ -9773,32 +9930,32 @@ var ts;
         if (!parent)
             return 0;
         switch (parent.kind) {
-            case 195:
+            case 196:
                 return accessKind(parent);
+            case 204:
             case 203:
-            case 202:
                 var operator = parent.operator;
                 return operator === 44 || operator === 45 ? writeOrReadWrite() : 0;
-            case 204:
+            case 205:
                 var _a = parent, left = _a.left, operatorToken = _a.operatorToken;
                 return left === node && isAssignmentOperator(operatorToken.kind) ?
-                    operatorToken.kind === 59 ? 1 : writeOrReadWrite()
+                    operatorToken.kind === 60 ? 1 : writeOrReadWrite()
                     : 0;
-            case 189:
+            case 190:
                 return parent.name !== node ? 0 : accessKind(parent);
-            case 275: {
+            case 276: {
                 var parentAccess = accessKind(parent.parent);
                 return node === parent.name ? reverseAccessKind(parentAccess) : parentAccess;
             }
-            case 276:
+            case 277:
                 return node === parent.objectAssignmentInitializer ? 0 : accessKind(parent.parent);
-            case 187:
+            case 188:
                 return accessKind(parent);
             default:
                 return 0;
         }
         function writeOrReadWrite() {
-            return parent.parent && skipParenthesesUp(parent.parent).kind === 221 ? 1 : 2;
+            return parent.parent && skipParenthesesUp(parent.parent).kind === 222 ? 1 : 2;
         }
     }
     function reverseAccessKind(a) {
@@ -9887,7 +10044,7 @@ var ts;
     }
     ts.getClassLikeDeclarationOfSymbol = getClassLikeDeclarationOfSymbol;
     function getObjectFlags(type) {
-        return type.flags & 3768320 ? type.objectFlags : 0;
+        return type.flags & 3899392 ? type.objectFlags : 0;
     }
     ts.getObjectFlags = getObjectFlags;
     function typeHasCallOrConstructSignatures(type, checker) {
@@ -9938,32 +10095,32 @@ var ts;
     }
     ts.isObjectTypeDeclaration = isObjectTypeDeclaration;
     function isTypeNodeKind(kind) {
-        return (kind >= 163 && kind <= 183)
-            || kind === 120
-            || kind === 143
-            || kind === 135
-            || kind === 146
+        return (kind >= 164 && kind <= 184)
+            || kind === 121
+            || kind === 144
             || kind === 136
-            || kind === 123
-            || kind === 138
+            || kind === 147
+            || kind === 137
+            || kind === 124
             || kind === 139
-            || kind === 100
-            || kind === 106
-            || kind === 141
-            || kind === 96
-            || kind === 132
-            || kind === 211
-            || kind === 289
+            || kind === 140
+            || kind === 101
+            || kind === 107
+            || kind === 142
+            || kind === 97
+            || kind === 133
+            || kind === 212
             || kind === 290
             || kind === 291
             || kind === 292
             || kind === 293
             || kind === 294
-            || kind === 295;
+            || kind === 295
+            || kind === 296;
     }
     ts.isTypeNodeKind = isTypeNodeKind;
     function isAccessExpression(node) {
-        return node.kind === 189 || node.kind === 190;
+        return node.kind === 190 || node.kind === 191;
     }
     ts.isAccessExpression = isAccessExpression;
     function isBundleFileTextLike(section) {
@@ -9980,8 +10137,10 @@ var ts;
 (function (ts) {
     function getDefaultLibFileName(options) {
         switch (options.target) {
-            case 7:
+            case 99:
                 return "lib.esnext.full.d.ts";
+            case 7:
+                return "lib.es2020.full.d.ts";
             case 6:
                 return "lib.es2019.full.d.ts";
             case 5:
@@ -10107,9 +10266,9 @@ var ts;
     }
     ts.collapseTextChangeRangesAcrossMultipleVersions = collapseTextChangeRangesAcrossMultipleVersions;
     function getTypeParameterOwner(d) {
-        if (d && d.kind === 150) {
+        if (d && d.kind === 151) {
             for (var current = d; current; current = current.parent) {
-                if (ts.isFunctionLike(current) || ts.isClassLike(current) || current.kind === 241) {
+                if (ts.isFunctionLike(current) || ts.isClassLike(current) || current.kind === 242) {
                     return current;
                 }
             }
@@ -10117,7 +10276,7 @@ var ts;
     }
     ts.getTypeParameterOwner = getTypeParameterOwner;
     function isParameterPropertyDeclaration(node) {
-        return ts.hasModifier(node, 92) && node.parent.kind === 157;
+        return ts.hasModifier(node, 92) && node.parent.kind === 158;
     }
     ts.isParameterPropertyDeclaration = isParameterPropertyDeclaration;
     function isEmptyBindingPattern(node) {
@@ -10147,14 +10306,14 @@ var ts;
             node = walkUpBindingElementsAndPatterns(node);
         }
         var flags = getFlags(node);
-        if (node.kind === 237) {
+        if (node.kind === 238) {
             node = node.parent;
         }
-        if (node && node.kind === 238) {
+        if (node && node.kind === 239) {
             flags |= getFlags(node);
             node = node.parent;
         }
-        if (node && node.kind === 219) {
+        if (node && node.kind === 220) {
             flags |= getFlags(node);
         }
         return flags;
@@ -10265,27 +10424,27 @@ var ts;
             return getDeclarationIdentifier(hostNode);
         }
         switch (hostNode.kind) {
-            case 219:
+            case 220:
                 if (hostNode.declarationList && hostNode.declarationList.declarations[0]) {
                     return getDeclarationIdentifier(hostNode.declarationList.declarations[0]);
                 }
                 break;
-            case 221:
+            case 222:
                 var expr = hostNode.expression;
                 switch (expr.kind) {
-                    case 189:
-                        return expr.name;
                     case 190:
+                        return expr.name;
+                    case 191:
                         var arg = expr.argumentExpression;
                         if (ts.isIdentifier(arg)) {
                             return arg;
                         }
                 }
                 break;
-            case 195: {
+            case 196: {
                 return getDeclarationIdentifier(hostNode.expression);
             }
-            case 233: {
+            case 234: {
                 if (ts.isDeclaration(hostNode.statement) || ts.isExpression(hostNode.statement)) {
                     return getDeclarationIdentifier(hostNode.statement);
                 }
@@ -10307,18 +10466,18 @@ var ts;
     ts.isNamedDeclaration = isNamedDeclaration;
     function getNonAssignedNameOfDeclaration(declaration) {
         switch (declaration.kind) {
-            case 72:
+            case 73:
                 return declaration;
-            case 310:
-            case 304: {
+            case 312:
+            case 306: {
                 var name = declaration.name;
-                if (name.kind === 148) {
+                if (name.kind === 149) {
                     return name.right;
                 }
                 break;
             }
-            case 191:
-            case 204: {
+            case 192:
+            case 205: {
                 var expr = declaration;
                 switch (ts.getAssignmentDeclarationKind(expr)) {
                     case 1:
@@ -10334,9 +10493,9 @@ var ts;
                         return undefined;
                 }
             }
-            case 309:
+            case 311:
                 return getNameOfJSDocTypedef(declaration);
-            case 254: {
+            case 255: {
                 var expression = declaration.expression;
                 return ts.isIdentifier(expression) ? expression : undefined;
             }
@@ -10366,6 +10525,9 @@ var ts;
                 return node.parent.left.name;
             }
         }
+        else if (ts.isVariableDeclaration(node.parent) && ts.isIdentifier(node.parent.name)) {
+            return node.parent.name;
+        }
     }
     function getJSDocParameterTags(param) {
         if (param.name) {
@@ -10476,7 +10638,7 @@ var ts;
             return ts.emptyArray;
         }
         if (ts.isJSDocTypeAlias(node)) {
-            ts.Debug.assert(node.parent.kind === 296);
+            ts.Debug.assert(node.parent.kind === 297);
             return ts.flatMap(node.parent.tags, function (tag) { return ts.isJSDocTemplateTag(tag) ? tag.typeParameters : undefined; });
         }
         if (node.typeParameters) {
@@ -10541,191 +10703,191 @@ var ts;
     }
     ts.isTemplateTail = isTemplateTail;
     function isIdentifier(node) {
-        return node.kind === 72;
+        return node.kind === 73;
     }
     ts.isIdentifier = isIdentifier;
     function isQualifiedName(node) {
-        return node.kind === 148;
+        return node.kind === 149;
     }
     ts.isQualifiedName = isQualifiedName;
     function isComputedPropertyName(node) {
-        return node.kind === 149;
+        return node.kind === 150;
     }
     ts.isComputedPropertyName = isComputedPropertyName;
     function isTypeParameterDeclaration(node) {
-        return node.kind === 150;
+        return node.kind === 151;
     }
     ts.isTypeParameterDeclaration = isTypeParameterDeclaration;
     function isParameter(node) {
-        return node.kind === 151;
+        return node.kind === 152;
     }
     ts.isParameter = isParameter;
     function isDecorator(node) {
-        return node.kind === 152;
+        return node.kind === 153;
     }
     ts.isDecorator = isDecorator;
     function isPropertySignature(node) {
-        return node.kind === 153;
+        return node.kind === 154;
     }
     ts.isPropertySignature = isPropertySignature;
     function isPropertyDeclaration(node) {
-        return node.kind === 154;
+        return node.kind === 155;
     }
     ts.isPropertyDeclaration = isPropertyDeclaration;
     function isMethodSignature(node) {
-        return node.kind === 155;
+        return node.kind === 156;
     }
     ts.isMethodSignature = isMethodSignature;
     function isMethodDeclaration(node) {
-        return node.kind === 156;
+        return node.kind === 157;
     }
     ts.isMethodDeclaration = isMethodDeclaration;
     function isConstructorDeclaration(node) {
-        return node.kind === 157;
+        return node.kind === 158;
     }
     ts.isConstructorDeclaration = isConstructorDeclaration;
     function isGetAccessorDeclaration(node) {
-        return node.kind === 158;
+        return node.kind === 159;
     }
     ts.isGetAccessorDeclaration = isGetAccessorDeclaration;
     function isSetAccessorDeclaration(node) {
-        return node.kind === 159;
+        return node.kind === 160;
     }
     ts.isSetAccessorDeclaration = isSetAccessorDeclaration;
     function isCallSignatureDeclaration(node) {
-        return node.kind === 160;
+        return node.kind === 161;
     }
     ts.isCallSignatureDeclaration = isCallSignatureDeclaration;
     function isConstructSignatureDeclaration(node) {
-        return node.kind === 161;
+        return node.kind === 162;
     }
     ts.isConstructSignatureDeclaration = isConstructSignatureDeclaration;
     function isIndexSignatureDeclaration(node) {
-        return node.kind === 162;
+        return node.kind === 163;
     }
     ts.isIndexSignatureDeclaration = isIndexSignatureDeclaration;
     function isGetOrSetAccessorDeclaration(node) {
-        return node.kind === 159 || node.kind === 158;
+        return node.kind === 160 || node.kind === 159;
     }
     ts.isGetOrSetAccessorDeclaration = isGetOrSetAccessorDeclaration;
     function isTypePredicateNode(node) {
-        return node.kind === 163;
+        return node.kind === 164;
     }
     ts.isTypePredicateNode = isTypePredicateNode;
     function isTypeReferenceNode(node) {
-        return node.kind === 164;
+        return node.kind === 165;
     }
     ts.isTypeReferenceNode = isTypeReferenceNode;
     function isFunctionTypeNode(node) {
-        return node.kind === 165;
+        return node.kind === 166;
     }
     ts.isFunctionTypeNode = isFunctionTypeNode;
     function isConstructorTypeNode(node) {
-        return node.kind === 166;
+        return node.kind === 167;
     }
     ts.isConstructorTypeNode = isConstructorTypeNode;
     function isTypeQueryNode(node) {
-        return node.kind === 167;
+        return node.kind === 168;
     }
     ts.isTypeQueryNode = isTypeQueryNode;
     function isTypeLiteralNode(node) {
-        return node.kind === 168;
+        return node.kind === 169;
     }
     ts.isTypeLiteralNode = isTypeLiteralNode;
     function isArrayTypeNode(node) {
-        return node.kind === 169;
+        return node.kind === 170;
     }
     ts.isArrayTypeNode = isArrayTypeNode;
     function isTupleTypeNode(node) {
-        return node.kind === 170;
+        return node.kind === 171;
     }
     ts.isTupleTypeNode = isTupleTypeNode;
     function isUnionTypeNode(node) {
-        return node.kind === 173;
+        return node.kind === 174;
     }
     ts.isUnionTypeNode = isUnionTypeNode;
     function isIntersectionTypeNode(node) {
-        return node.kind === 174;
+        return node.kind === 175;
     }
     ts.isIntersectionTypeNode = isIntersectionTypeNode;
     function isConditionalTypeNode(node) {
-        return node.kind === 175;
+        return node.kind === 176;
     }
     ts.isConditionalTypeNode = isConditionalTypeNode;
     function isInferTypeNode(node) {
-        return node.kind === 176;
+        return node.kind === 177;
     }
     ts.isInferTypeNode = isInferTypeNode;
     function isParenthesizedTypeNode(node) {
-        return node.kind === 177;
+        return node.kind === 178;
     }
     ts.isParenthesizedTypeNode = isParenthesizedTypeNode;
     function isThisTypeNode(node) {
-        return node.kind === 178;
+        return node.kind === 179;
     }
     ts.isThisTypeNode = isThisTypeNode;
     function isTypeOperatorNode(node) {
-        return node.kind === 179;
+        return node.kind === 180;
     }
     ts.isTypeOperatorNode = isTypeOperatorNode;
     function isIndexedAccessTypeNode(node) {
-        return node.kind === 180;
+        return node.kind === 181;
     }
     ts.isIndexedAccessTypeNode = isIndexedAccessTypeNode;
     function isMappedTypeNode(node) {
-        return node.kind === 181;
+        return node.kind === 182;
     }
     ts.isMappedTypeNode = isMappedTypeNode;
     function isLiteralTypeNode(node) {
-        return node.kind === 182;
+        return node.kind === 183;
     }
     ts.isLiteralTypeNode = isLiteralTypeNode;
     function isImportTypeNode(node) {
-        return node.kind === 183;
+        return node.kind === 184;
     }
     ts.isImportTypeNode = isImportTypeNode;
     function isObjectBindingPattern(node) {
-        return node.kind === 184;
+        return node.kind === 185;
     }
     ts.isObjectBindingPattern = isObjectBindingPattern;
     function isArrayBindingPattern(node) {
-        return node.kind === 185;
+        return node.kind === 186;
     }
     ts.isArrayBindingPattern = isArrayBindingPattern;
     function isBindingElement(node) {
-        return node.kind === 186;
+        return node.kind === 187;
     }
     ts.isBindingElement = isBindingElement;
     function isArrayLiteralExpression(node) {
-        return node.kind === 187;
+        return node.kind === 188;
     }
     ts.isArrayLiteralExpression = isArrayLiteralExpression;
     function isObjectLiteralExpression(node) {
-        return node.kind === 188;
+        return node.kind === 189;
     }
     ts.isObjectLiteralExpression = isObjectLiteralExpression;
     function isPropertyAccessExpression(node) {
-        return node.kind === 189;
+        return node.kind === 190;
     }
     ts.isPropertyAccessExpression = isPropertyAccessExpression;
     function isElementAccessExpression(node) {
-        return node.kind === 190;
+        return node.kind === 191;
     }
     ts.isElementAccessExpression = isElementAccessExpression;
     function isCallExpression(node) {
-        return node.kind === 191;
+        return node.kind === 192;
     }
     ts.isCallExpression = isCallExpression;
     function isNewExpression(node) {
-        return node.kind === 192;
+        return node.kind === 193;
     }
     ts.isNewExpression = isNewExpression;
     function isTaggedTemplateExpression(node) {
-        return node.kind === 193;
+        return node.kind === 194;
     }
     ts.isTaggedTemplateExpression = isTaggedTemplateExpression;
     function isTypeAssertion(node) {
-        return node.kind === 194;
+        return node.kind === 195;
     }
     ts.isTypeAssertion = isTypeAssertion;
     function isConstTypeReference(node) {
@@ -10734,368 +10896,368 @@ var ts;
     }
     ts.isConstTypeReference = isConstTypeReference;
     function isParenthesizedExpression(node) {
-        return node.kind === 195;
+        return node.kind === 196;
     }
     ts.isParenthesizedExpression = isParenthesizedExpression;
     function skipPartiallyEmittedExpressions(node) {
-        while (node.kind === 313) {
+        while (node.kind === 315) {
             node = node.expression;
         }
         return node;
     }
     ts.skipPartiallyEmittedExpressions = skipPartiallyEmittedExpressions;
     function isFunctionExpression(node) {
-        return node.kind === 196;
+        return node.kind === 197;
     }
     ts.isFunctionExpression = isFunctionExpression;
     function isArrowFunction(node) {
-        return node.kind === 197;
+        return node.kind === 198;
     }
     ts.isArrowFunction = isArrowFunction;
     function isDeleteExpression(node) {
-        return node.kind === 198;
+        return node.kind === 199;
     }
     ts.isDeleteExpression = isDeleteExpression;
     function isTypeOfExpression(node) {
-        return node.kind === 199;
+        return node.kind === 200;
     }
     ts.isTypeOfExpression = isTypeOfExpression;
     function isVoidExpression(node) {
-        return node.kind === 200;
+        return node.kind === 201;
     }
     ts.isVoidExpression = isVoidExpression;
     function isAwaitExpression(node) {
-        return node.kind === 201;
+        return node.kind === 202;
     }
     ts.isAwaitExpression = isAwaitExpression;
     function isPrefixUnaryExpression(node) {
-        return node.kind === 202;
+        return node.kind === 203;
     }
     ts.isPrefixUnaryExpression = isPrefixUnaryExpression;
     function isPostfixUnaryExpression(node) {
-        return node.kind === 203;
+        return node.kind === 204;
     }
     ts.isPostfixUnaryExpression = isPostfixUnaryExpression;
     function isBinaryExpression(node) {
-        return node.kind === 204;
+        return node.kind === 205;
     }
     ts.isBinaryExpression = isBinaryExpression;
     function isConditionalExpression(node) {
-        return node.kind === 205;
+        return node.kind === 206;
     }
     ts.isConditionalExpression = isConditionalExpression;
     function isTemplateExpression(node) {
-        return node.kind === 206;
+        return node.kind === 207;
     }
     ts.isTemplateExpression = isTemplateExpression;
     function isYieldExpression(node) {
-        return node.kind === 207;
+        return node.kind === 208;
     }
     ts.isYieldExpression = isYieldExpression;
     function isSpreadElement(node) {
-        return node.kind === 208;
+        return node.kind === 209;
     }
     ts.isSpreadElement = isSpreadElement;
     function isClassExpression(node) {
-        return node.kind === 209;
+        return node.kind === 210;
     }
     ts.isClassExpression = isClassExpression;
     function isOmittedExpression(node) {
-        return node.kind === 210;
+        return node.kind === 211;
     }
     ts.isOmittedExpression = isOmittedExpression;
     function isExpressionWithTypeArguments(node) {
-        return node.kind === 211;
+        return node.kind === 212;
     }
     ts.isExpressionWithTypeArguments = isExpressionWithTypeArguments;
     function isAsExpression(node) {
-        return node.kind === 212;
+        return node.kind === 213;
     }
     ts.isAsExpression = isAsExpression;
     function isNonNullExpression(node) {
-        return node.kind === 213;
+        return node.kind === 214;
     }
     ts.isNonNullExpression = isNonNullExpression;
     function isMetaProperty(node) {
-        return node.kind === 214;
+        return node.kind === 215;
     }
     ts.isMetaProperty = isMetaProperty;
     function isTemplateSpan(node) {
-        return node.kind === 216;
+        return node.kind === 217;
     }
     ts.isTemplateSpan = isTemplateSpan;
     function isSemicolonClassElement(node) {
-        return node.kind === 217;
+        return node.kind === 218;
     }
     ts.isSemicolonClassElement = isSemicolonClassElement;
     function isBlock(node) {
-        return node.kind === 218;
+        return node.kind === 219;
     }
     ts.isBlock = isBlock;
     function isVariableStatement(node) {
-        return node.kind === 219;
+        return node.kind === 220;
     }
     ts.isVariableStatement = isVariableStatement;
     function isEmptyStatement(node) {
-        return node.kind === 220;
+        return node.kind === 221;
     }
     ts.isEmptyStatement = isEmptyStatement;
     function isExpressionStatement(node) {
-        return node.kind === 221;
+        return node.kind === 222;
     }
     ts.isExpressionStatement = isExpressionStatement;
     function isIfStatement(node) {
-        return node.kind === 222;
+        return node.kind === 223;
     }
     ts.isIfStatement = isIfStatement;
     function isDoStatement(node) {
-        return node.kind === 223;
+        return node.kind === 224;
     }
     ts.isDoStatement = isDoStatement;
     function isWhileStatement(node) {
-        return node.kind === 224;
+        return node.kind === 225;
     }
     ts.isWhileStatement = isWhileStatement;
     function isForStatement(node) {
-        return node.kind === 225;
+        return node.kind === 226;
     }
     ts.isForStatement = isForStatement;
     function isForInStatement(node) {
-        return node.kind === 226;
+        return node.kind === 227;
     }
     ts.isForInStatement = isForInStatement;
     function isForOfStatement(node) {
-        return node.kind === 227;
+        return node.kind === 228;
     }
     ts.isForOfStatement = isForOfStatement;
     function isContinueStatement(node) {
-        return node.kind === 228;
+        return node.kind === 229;
     }
     ts.isContinueStatement = isContinueStatement;
     function isBreakStatement(node) {
-        return node.kind === 229;
+        return node.kind === 230;
     }
     ts.isBreakStatement = isBreakStatement;
     function isBreakOrContinueStatement(node) {
-        return node.kind === 229 || node.kind === 228;
+        return node.kind === 230 || node.kind === 229;
     }
     ts.isBreakOrContinueStatement = isBreakOrContinueStatement;
     function isReturnStatement(node) {
-        return node.kind === 230;
+        return node.kind === 231;
     }
     ts.isReturnStatement = isReturnStatement;
     function isWithStatement(node) {
-        return node.kind === 231;
+        return node.kind === 232;
     }
     ts.isWithStatement = isWithStatement;
     function isSwitchStatement(node) {
-        return node.kind === 232;
+        return node.kind === 233;
     }
     ts.isSwitchStatement = isSwitchStatement;
     function isLabeledStatement(node) {
-        return node.kind === 233;
+        return node.kind === 234;
     }
     ts.isLabeledStatement = isLabeledStatement;
     function isThrowStatement(node) {
-        return node.kind === 234;
+        return node.kind === 235;
     }
     ts.isThrowStatement = isThrowStatement;
     function isTryStatement(node) {
-        return node.kind === 235;
+        return node.kind === 236;
     }
     ts.isTryStatement = isTryStatement;
     function isDebuggerStatement(node) {
-        return node.kind === 236;
+        return node.kind === 237;
     }
     ts.isDebuggerStatement = isDebuggerStatement;
     function isVariableDeclaration(node) {
-        return node.kind === 237;
+        return node.kind === 238;
     }
     ts.isVariableDeclaration = isVariableDeclaration;
     function isVariableDeclarationList(node) {
-        return node.kind === 238;
+        return node.kind === 239;
     }
     ts.isVariableDeclarationList = isVariableDeclarationList;
     function isFunctionDeclaration(node) {
-        return node.kind === 239;
+        return node.kind === 240;
     }
     ts.isFunctionDeclaration = isFunctionDeclaration;
     function isClassDeclaration(node) {
-        return node.kind === 240;
+        return node.kind === 241;
     }
     ts.isClassDeclaration = isClassDeclaration;
     function isInterfaceDeclaration(node) {
-        return node.kind === 241;
+        return node.kind === 242;
     }
     ts.isInterfaceDeclaration = isInterfaceDeclaration;
     function isTypeAliasDeclaration(node) {
-        return node.kind === 242;
+        return node.kind === 243;
     }
     ts.isTypeAliasDeclaration = isTypeAliasDeclaration;
     function isEnumDeclaration(node) {
-        return node.kind === 243;
+        return node.kind === 244;
     }
     ts.isEnumDeclaration = isEnumDeclaration;
     function isModuleDeclaration(node) {
-        return node.kind === 244;
+        return node.kind === 245;
     }
     ts.isModuleDeclaration = isModuleDeclaration;
     function isModuleBlock(node) {
-        return node.kind === 245;
+        return node.kind === 246;
     }
     ts.isModuleBlock = isModuleBlock;
     function isCaseBlock(node) {
-        return node.kind === 246;
+        return node.kind === 247;
     }
     ts.isCaseBlock = isCaseBlock;
     function isNamespaceExportDeclaration(node) {
-        return node.kind === 247;
+        return node.kind === 248;
     }
     ts.isNamespaceExportDeclaration = isNamespaceExportDeclaration;
     function isImportEqualsDeclaration(node) {
-        return node.kind === 248;
+        return node.kind === 249;
     }
     ts.isImportEqualsDeclaration = isImportEqualsDeclaration;
     function isImportDeclaration(node) {
-        return node.kind === 249;
+        return node.kind === 250;
     }
     ts.isImportDeclaration = isImportDeclaration;
     function isImportClause(node) {
-        return node.kind === 250;
+        return node.kind === 251;
     }
     ts.isImportClause = isImportClause;
     function isNamespaceImport(node) {
-        return node.kind === 251;
+        return node.kind === 252;
     }
     ts.isNamespaceImport = isNamespaceImport;
     function isNamedImports(node) {
-        return node.kind === 252;
+        return node.kind === 253;
     }
     ts.isNamedImports = isNamedImports;
     function isImportSpecifier(node) {
-        return node.kind === 253;
+        return node.kind === 254;
     }
     ts.isImportSpecifier = isImportSpecifier;
     function isExportAssignment(node) {
-        return node.kind === 254;
+        return node.kind === 255;
     }
     ts.isExportAssignment = isExportAssignment;
     function isExportDeclaration(node) {
-        return node.kind === 255;
+        return node.kind === 256;
     }
     ts.isExportDeclaration = isExportDeclaration;
     function isNamedExports(node) {
-        return node.kind === 256;
+        return node.kind === 257;
     }
     ts.isNamedExports = isNamedExports;
     function isExportSpecifier(node) {
-        return node.kind === 257;
+        return node.kind === 258;
     }
     ts.isExportSpecifier = isExportSpecifier;
     function isMissingDeclaration(node) {
-        return node.kind === 258;
+        return node.kind === 259;
     }
     ts.isMissingDeclaration = isMissingDeclaration;
     function isExternalModuleReference(node) {
-        return node.kind === 259;
+        return node.kind === 260;
     }
     ts.isExternalModuleReference = isExternalModuleReference;
     function isJsxElement(node) {
-        return node.kind === 260;
+        return node.kind === 261;
     }
     ts.isJsxElement = isJsxElement;
     function isJsxSelfClosingElement(node) {
-        return node.kind === 261;
+        return node.kind === 262;
     }
     ts.isJsxSelfClosingElement = isJsxSelfClosingElement;
     function isJsxOpeningElement(node) {
-        return node.kind === 262;
+        return node.kind === 263;
     }
     ts.isJsxOpeningElement = isJsxOpeningElement;
     function isJsxClosingElement(node) {
-        return node.kind === 263;
+        return node.kind === 264;
     }
     ts.isJsxClosingElement = isJsxClosingElement;
     function isJsxFragment(node) {
-        return node.kind === 264;
+        return node.kind === 265;
     }
     ts.isJsxFragment = isJsxFragment;
     function isJsxOpeningFragment(node) {
-        return node.kind === 265;
+        return node.kind === 266;
     }
     ts.isJsxOpeningFragment = isJsxOpeningFragment;
     function isJsxClosingFragment(node) {
-        return node.kind === 266;
+        return node.kind === 267;
     }
     ts.isJsxClosingFragment = isJsxClosingFragment;
     function isJsxAttribute(node) {
-        return node.kind === 267;
+        return node.kind === 268;
     }
     ts.isJsxAttribute = isJsxAttribute;
     function isJsxAttributes(node) {
-        return node.kind === 268;
+        return node.kind === 269;
     }
     ts.isJsxAttributes = isJsxAttributes;
     function isJsxSpreadAttribute(node) {
-        return node.kind === 269;
+        return node.kind === 270;
     }
     ts.isJsxSpreadAttribute = isJsxSpreadAttribute;
     function isJsxExpression(node) {
-        return node.kind === 270;
+        return node.kind === 271;
     }
     ts.isJsxExpression = isJsxExpression;
     function isCaseClause(node) {
-        return node.kind === 271;
+        return node.kind === 272;
     }
     ts.isCaseClause = isCaseClause;
     function isDefaultClause(node) {
-        return node.kind === 272;
+        return node.kind === 273;
     }
     ts.isDefaultClause = isDefaultClause;
     function isHeritageClause(node) {
-        return node.kind === 273;
+        return node.kind === 274;
     }
     ts.isHeritageClause = isHeritageClause;
     function isCatchClause(node) {
-        return node.kind === 274;
+        return node.kind === 275;
     }
     ts.isCatchClause = isCatchClause;
     function isPropertyAssignment(node) {
-        return node.kind === 275;
+        return node.kind === 276;
     }
     ts.isPropertyAssignment = isPropertyAssignment;
     function isShorthandPropertyAssignment(node) {
-        return node.kind === 276;
+        return node.kind === 277;
     }
     ts.isShorthandPropertyAssignment = isShorthandPropertyAssignment;
     function isSpreadAssignment(node) {
-        return node.kind === 277;
+        return node.kind === 278;
     }
     ts.isSpreadAssignment = isSpreadAssignment;
     function isEnumMember(node) {
-        return node.kind === 278;
+        return node.kind === 279;
     }
     ts.isEnumMember = isEnumMember;
     function isSourceFile(node) {
-        return node.kind === 284;
+        return node.kind === 285;
     }
     ts.isSourceFile = isSourceFile;
     function isBundle(node) {
-        return node.kind === 285;
+        return node.kind === 286;
     }
     ts.isBundle = isBundle;
     function isUnparsedSource(node) {
-        return node.kind === 286;
+        return node.kind === 287;
     }
     ts.isUnparsedSource = isUnparsedSource;
     function isUnparsedPrepend(node) {
-        return node.kind === 280;
+        return node.kind === 281;
     }
     ts.isUnparsedPrepend = isUnparsedPrepend;
     function isUnparsedTextLike(node) {
         switch (node.kind) {
-            case 281:
             case 282:
+            case 283:
                 return true;
             default:
                 return false;
@@ -11104,106 +11266,110 @@ var ts;
     ts.isUnparsedTextLike = isUnparsedTextLike;
     function isUnparsedNode(node) {
         return isUnparsedTextLike(node) ||
-            node.kind === 279 ||
-            node.kind === 283;
+            node.kind === 280 ||
+            node.kind === 284;
     }
     ts.isUnparsedNode = isUnparsedNode;
     function isJSDocTypeExpression(node) {
-        return node.kind === 288;
+        return node.kind === 289;
     }
     ts.isJSDocTypeExpression = isJSDocTypeExpression;
     function isJSDocAllType(node) {
-        return node.kind === 289;
+        return node.kind === 290;
     }
     ts.isJSDocAllType = isJSDocAllType;
     function isJSDocUnknownType(node) {
-        return node.kind === 290;
+        return node.kind === 291;
     }
     ts.isJSDocUnknownType = isJSDocUnknownType;
     function isJSDocNullableType(node) {
-        return node.kind === 291;
+        return node.kind === 292;
     }
     ts.isJSDocNullableType = isJSDocNullableType;
     function isJSDocNonNullableType(node) {
-        return node.kind === 292;
+        return node.kind === 293;
     }
     ts.isJSDocNonNullableType = isJSDocNonNullableType;
     function isJSDocOptionalType(node) {
-        return node.kind === 293;
+        return node.kind === 294;
     }
     ts.isJSDocOptionalType = isJSDocOptionalType;
     function isJSDocFunctionType(node) {
-        return node.kind === 294;
+        return node.kind === 295;
     }
     ts.isJSDocFunctionType = isJSDocFunctionType;
     function isJSDocVariadicType(node) {
-        return node.kind === 295;
+        return node.kind === 296;
     }
     ts.isJSDocVariadicType = isJSDocVariadicType;
     function isJSDoc(node) {
-        return node.kind === 296;
+        return node.kind === 297;
     }
     ts.isJSDoc = isJSDoc;
+    function isJSDocAuthorTag(node) {
+        return node.kind === 302;
+    }
+    ts.isJSDocAuthorTag = isJSDocAuthorTag;
     function isJSDocAugmentsTag(node) {
-        return node.kind === 300;
+        return node.kind === 301;
     }
     ts.isJSDocAugmentsTag = isJSDocAugmentsTag;
     function isJSDocClassTag(node) {
-        return node.kind === 301;
+        return node.kind === 303;
     }
     ts.isJSDocClassTag = isJSDocClassTag;
     function isJSDocEnumTag(node) {
-        return node.kind === 303;
+        return node.kind === 305;
     }
     ts.isJSDocEnumTag = isJSDocEnumTag;
     function isJSDocThisTag(node) {
-        return node.kind === 306;
+        return node.kind === 308;
     }
     ts.isJSDocThisTag = isJSDocThisTag;
     function isJSDocParameterTag(node) {
-        return node.kind === 304;
+        return node.kind === 306;
     }
     ts.isJSDocParameterTag = isJSDocParameterTag;
     function isJSDocReturnTag(node) {
-        return node.kind === 305;
+        return node.kind === 307;
     }
     ts.isJSDocReturnTag = isJSDocReturnTag;
     function isJSDocTypeTag(node) {
-        return node.kind === 307;
+        return node.kind === 309;
     }
     ts.isJSDocTypeTag = isJSDocTypeTag;
     function isJSDocTemplateTag(node) {
-        return node.kind === 308;
+        return node.kind === 310;
     }
     ts.isJSDocTemplateTag = isJSDocTemplateTag;
     function isJSDocTypedefTag(node) {
-        return node.kind === 309;
+        return node.kind === 311;
     }
     ts.isJSDocTypedefTag = isJSDocTypedefTag;
     function isJSDocPropertyTag(node) {
-        return node.kind === 310;
+        return node.kind === 312;
     }
     ts.isJSDocPropertyTag = isJSDocPropertyTag;
     function isJSDocPropertyLikeTag(node) {
-        return node.kind === 310 || node.kind === 304;
+        return node.kind === 312 || node.kind === 306;
     }
     ts.isJSDocPropertyLikeTag = isJSDocPropertyLikeTag;
     function isJSDocTypeLiteral(node) {
-        return node.kind === 297;
+        return node.kind === 298;
     }
     ts.isJSDocTypeLiteral = isJSDocTypeLiteral;
     function isJSDocCallbackTag(node) {
-        return node.kind === 302;
+        return node.kind === 304;
     }
     ts.isJSDocCallbackTag = isJSDocCallbackTag;
     function isJSDocSignature(node) {
-        return node.kind === 298;
+        return node.kind === 299;
     }
     ts.isJSDocSignature = isJSDocSignature;
 })(ts || (ts = {}));
 (function (ts) {
     function isSyntaxList(n) {
-        return n.kind === 311;
+        return n.kind === 313;
     }
     ts.isSyntaxList = isSyntaxList;
     function isNode(node) {
@@ -11211,11 +11377,11 @@ var ts;
     }
     ts.isNode = isNode;
     function isNodeKind(kind) {
-        return kind >= 148;
+        return kind >= 149;
     }
     ts.isNodeKind = isNodeKind;
     function isToken(n) {
-        return n.kind >= 0 && n.kind <= 147;
+        return n.kind >= 0 && n.kind <= 148;
     }
     ts.isToken = isToken;
     function isNodeArray(array) {
@@ -11258,17 +11424,17 @@ var ts;
     ts.isGeneratedIdentifier = isGeneratedIdentifier;
     function isModifierKind(token) {
         switch (token) {
-            case 118:
-            case 121:
-            case 77:
-            case 125:
-            case 80:
-            case 85:
-            case 115:
-            case 113:
-            case 114:
-            case 133:
+            case 119:
+            case 122:
+            case 78:
+            case 126:
+            case 81:
+            case 86:
             case 116:
+            case 114:
+            case 115:
+            case 134:
+            case 117:
                 return true;
         }
         return false;
@@ -11279,7 +11445,7 @@ var ts;
     }
     ts.isParameterPropertyModifier = isParameterPropertyModifier;
     function isClassMemberModifier(idToken) {
-        return isParameterPropertyModifier(idToken) || idToken === 116;
+        return isParameterPropertyModifier(idToken) || idToken === 117;
     }
     ts.isClassMemberModifier = isClassMemberModifier;
     function isModifier(node) {
@@ -11288,23 +11454,23 @@ var ts;
     ts.isModifier = isModifier;
     function isEntityName(node) {
         var kind = node.kind;
-        return kind === 148
-            || kind === 72;
+        return kind === 149
+            || kind === 73;
     }
     ts.isEntityName = isEntityName;
     function isPropertyName(node) {
         var kind = node.kind;
-        return kind === 72
+        return kind === 73
             || kind === 10
             || kind === 8
-            || kind === 149;
+            || kind === 150;
     }
     ts.isPropertyName = isPropertyName;
     function isBindingName(node) {
         var kind = node.kind;
-        return kind === 72
-            || kind === 184
-            || kind === 185;
+        return kind === 73
+            || kind === 185
+            || kind === 186;
     }
     ts.isBindingName = isBindingName;
     function isFunctionLike(node) {
@@ -11317,13 +11483,13 @@ var ts;
     ts.isFunctionLikeDeclaration = isFunctionLikeDeclaration;
     function isFunctionLikeDeclarationKind(kind) {
         switch (kind) {
-            case 239:
-            case 156:
+            case 240:
             case 157:
             case 158:
             case 159:
-            case 196:
+            case 160:
             case 197:
+            case 198:
                 return true;
             default:
                 return false;
@@ -11331,14 +11497,14 @@ var ts;
     }
     function isFunctionLikeKind(kind) {
         switch (kind) {
-            case 155:
-            case 160:
-            case 298:
+            case 156:
             case 161:
+            case 299:
             case 162:
-            case 165:
-            case 294:
+            case 163:
             case 166:
+            case 295:
+            case 167:
                 return true;
             default:
                 return isFunctionLikeDeclarationKind(kind);
@@ -11351,28 +11517,28 @@ var ts;
     ts.isFunctionOrModuleBlock = isFunctionOrModuleBlock;
     function isClassElement(node) {
         var kind = node.kind;
-        return kind === 157
-            || kind === 154
-            || kind === 156
-            || kind === 158
+        return kind === 158
+            || kind === 155
+            || kind === 157
             || kind === 159
-            || kind === 162
-            || kind === 217;
+            || kind === 160
+            || kind === 163
+            || kind === 218;
     }
     ts.isClassElement = isClassElement;
     function isClassLike(node) {
-        return node && (node.kind === 240 || node.kind === 209);
+        return node && (node.kind === 241 || node.kind === 210);
     }
     ts.isClassLike = isClassLike;
     function isAccessor(node) {
-        return node && (node.kind === 158 || node.kind === 159);
+        return node && (node.kind === 159 || node.kind === 160);
     }
     ts.isAccessor = isAccessor;
     function isMethodOrAccessor(node) {
         switch (node.kind) {
-            case 156:
-            case 158:
+            case 157:
             case 159:
+            case 160:
                 return true;
             default:
                 return false;
@@ -11381,11 +11547,11 @@ var ts;
     ts.isMethodOrAccessor = isMethodOrAccessor;
     function isTypeElement(node) {
         var kind = node.kind;
-        return kind === 161
-            || kind === 160
-            || kind === 153
-            || kind === 155
-            || kind === 162;
+        return kind === 162
+            || kind === 161
+            || kind === 154
+            || kind === 156
+            || kind === 163;
     }
     ts.isTypeElement = isTypeElement;
     function isClassOrTypeElement(node) {
@@ -11394,12 +11560,12 @@ var ts;
     ts.isClassOrTypeElement = isClassOrTypeElement;
     function isObjectLiteralElementLike(node) {
         var kind = node.kind;
-        return kind === 275
-            || kind === 276
+        return kind === 276
             || kind === 277
-            || kind === 156
-            || kind === 158
-            || kind === 159;
+            || kind === 278
+            || kind === 157
+            || kind === 159
+            || kind === 160;
     }
     ts.isObjectLiteralElementLike = isObjectLiteralElementLike;
     function isTypeNode(node) {
@@ -11408,8 +11574,8 @@ var ts;
     ts.isTypeNode = isTypeNode;
     function isFunctionOrConstructorTypeNode(node) {
         switch (node.kind) {
-            case 165:
             case 166:
+            case 167:
                 return true;
         }
         return false;
@@ -11418,29 +11584,29 @@ var ts;
     function isBindingPattern(node) {
         if (node) {
             var kind = node.kind;
-            return kind === 185
-                || kind === 184;
+            return kind === 186
+                || kind === 185;
         }
         return false;
     }
     ts.isBindingPattern = isBindingPattern;
     function isAssignmentPattern(node) {
         var kind = node.kind;
-        return kind === 187
-            || kind === 188;
+        return kind === 188
+            || kind === 189;
     }
     ts.isAssignmentPattern = isAssignmentPattern;
     function isArrayBindingElement(node) {
         var kind = node.kind;
-        return kind === 186
-            || kind === 210;
+        return kind === 187
+            || kind === 211;
     }
     ts.isArrayBindingElement = isArrayBindingElement;
     function isDeclarationBindingElement(bindingElement) {
         switch (bindingElement.kind) {
-            case 237:
-            case 151:
-            case 186:
+            case 238:
+            case 152:
+            case 187:
                 return true;
         }
         return false;
@@ -11453,8 +11619,8 @@ var ts;
     ts.isBindingOrAssignmentPattern = isBindingOrAssignmentPattern;
     function isObjectBindingOrAssignmentPattern(node) {
         switch (node.kind) {
-            case 184:
-            case 188:
+            case 185:
+            case 189:
                 return true;
         }
         return false;
@@ -11462,8 +11628,8 @@ var ts;
     ts.isObjectBindingOrAssignmentPattern = isObjectBindingOrAssignmentPattern;
     function isArrayBindingOrAssignmentPattern(node) {
         switch (node.kind) {
-            case 185:
-            case 187:
+            case 186:
+            case 188:
                 return true;
         }
         return false;
@@ -11471,25 +11637,25 @@ var ts;
     ts.isArrayBindingOrAssignmentPattern = isArrayBindingOrAssignmentPattern;
     function isPropertyAccessOrQualifiedNameOrImportTypeNode(node) {
         var kind = node.kind;
-        return kind === 189
-            || kind === 148
-            || kind === 183;
+        return kind === 190
+            || kind === 149
+            || kind === 184;
     }
     ts.isPropertyAccessOrQualifiedNameOrImportTypeNode = isPropertyAccessOrQualifiedNameOrImportTypeNode;
     function isPropertyAccessOrQualifiedName(node) {
         var kind = node.kind;
-        return kind === 189
-            || kind === 148;
+        return kind === 190
+            || kind === 149;
     }
     ts.isPropertyAccessOrQualifiedName = isPropertyAccessOrQualifiedName;
     function isCallLikeExpression(node) {
         switch (node.kind) {
+            case 263:
             case 262:
-            case 261:
-            case 191:
             case 192:
             case 193:
-            case 152:
+            case 194:
+            case 153:
                 return true;
             default:
                 return false;
@@ -11497,12 +11663,12 @@ var ts;
     }
     ts.isCallLikeExpression = isCallLikeExpression;
     function isCallOrNewExpression(node) {
-        return node.kind === 191 || node.kind === 192;
+        return node.kind === 192 || node.kind === 193;
     }
     ts.isCallOrNewExpression = isCallOrNewExpression;
     function isTemplateLiteral(node) {
         var kind = node.kind;
-        return kind === 206
+        return kind === 207
             || kind === 14;
     }
     ts.isTemplateLiteral = isTemplateLiteral;
@@ -11512,34 +11678,34 @@ var ts;
     ts.isLeftHandSideExpression = isLeftHandSideExpression;
     function isLeftHandSideExpressionKind(kind) {
         switch (kind) {
-            case 189:
             case 190:
-            case 192:
             case 191:
-            case 260:
-            case 261:
-            case 264:
             case 193:
-            case 187:
-            case 195:
+            case 192:
+            case 261:
+            case 262:
+            case 265:
+            case 194:
             case 188:
-            case 209:
             case 196:
-            case 72:
+            case 189:
+            case 210:
+            case 197:
+            case 73:
             case 13:
             case 8:
             case 9:
             case 10:
             case 14:
-            case 206:
-            case 87:
-            case 96:
-            case 100:
-            case 102:
-            case 98:
-            case 213:
+            case 207:
+            case 88:
+            case 97:
+            case 101:
+            case 103:
+            case 99:
             case 214:
-            case 92:
+            case 215:
+            case 93:
                 return true;
             default:
                 return false;
@@ -11551,13 +11717,13 @@ var ts;
     ts.isUnaryExpression = isUnaryExpression;
     function isUnaryExpressionKind(kind) {
         switch (kind) {
-            case 202:
             case 203:
-            case 198:
+            case 204:
             case 199:
             case 200:
             case 201:
-            case 194:
+            case 202:
+            case 195:
                 return true;
             default:
                 return isLeftHandSideExpressionKind(kind);
@@ -11565,9 +11731,9 @@ var ts;
     }
     function isUnaryExpressionWithWrite(expr) {
         switch (expr.kind) {
-            case 203:
+            case 204:
                 return true;
-            case 202:
+            case 203:
                 return expr.operator === 44 ||
                     expr.operator === 45;
             default:
@@ -11581,15 +11747,15 @@ var ts;
     ts.isExpression = isExpression;
     function isExpressionKind(kind) {
         switch (kind) {
-            case 205:
-            case 207:
-            case 197:
-            case 204:
+            case 206:
             case 208:
-            case 212:
-            case 210:
-            case 314:
-            case 313:
+            case 198:
+            case 205:
+            case 209:
+            case 213:
+            case 211:
+            case 316:
+            case 315:
                 return true;
             default:
                 return isUnaryExpressionKind(kind);
@@ -11597,16 +11763,16 @@ var ts;
     }
     function isAssertionExpression(node) {
         var kind = node.kind;
-        return kind === 194
-            || kind === 212;
+        return kind === 195
+            || kind === 213;
     }
     ts.isAssertionExpression = isAssertionExpression;
     function isPartiallyEmittedExpression(node) {
-        return node.kind === 313;
+        return node.kind === 315;
     }
     ts.isPartiallyEmittedExpression = isPartiallyEmittedExpression;
     function isNotEmittedStatement(node) {
-        return node.kind === 312;
+        return node.kind === 314;
     }
     ts.isNotEmittedStatement = isNotEmittedStatement;
     function isNotEmittedOrPartiallyEmittedNode(node) {
@@ -11616,20 +11782,20 @@ var ts;
     ts.isNotEmittedOrPartiallyEmittedNode = isNotEmittedOrPartiallyEmittedNode;
     function isIterationStatement(node, lookInLabeledStatements) {
         switch (node.kind) {
-            case 225:
             case 226:
             case 227:
-            case 223:
+            case 228:
             case 224:
+            case 225:
                 return true;
-            case 233:
+            case 234:
                 return lookInLabeledStatements && isIterationStatement(node.statement, lookInLabeledStatements);
         }
         return false;
     }
     ts.isIterationStatement = isIterationStatement;
     function isForInOrOfStatement(node) {
-        return node.kind === 226 || node.kind === 227;
+        return node.kind === 227 || node.kind === 228;
     }
     ts.isForInOrOfStatement = isForInOrOfStatement;
     function isConciseBody(node) {
@@ -11648,108 +11814,108 @@ var ts;
     ts.isForInitializer = isForInitializer;
     function isModuleBody(node) {
         var kind = node.kind;
-        return kind === 245
-            || kind === 244
-            || kind === 72;
+        return kind === 246
+            || kind === 245
+            || kind === 73;
     }
     ts.isModuleBody = isModuleBody;
     function isNamespaceBody(node) {
         var kind = node.kind;
-        return kind === 245
-            || kind === 244;
+        return kind === 246
+            || kind === 245;
     }
     ts.isNamespaceBody = isNamespaceBody;
     function isJSDocNamespaceBody(node) {
         var kind = node.kind;
-        return kind === 72
-            || kind === 244;
+        return kind === 73
+            || kind === 245;
     }
     ts.isJSDocNamespaceBody = isJSDocNamespaceBody;
     function isNamedImportBindings(node) {
         var kind = node.kind;
-        return kind === 252
-            || kind === 251;
+        return kind === 253
+            || kind === 252;
     }
     ts.isNamedImportBindings = isNamedImportBindings;
     function isModuleOrEnumDeclaration(node) {
-        return node.kind === 244 || node.kind === 243;
+        return node.kind === 245 || node.kind === 244;
     }
     ts.isModuleOrEnumDeclaration = isModuleOrEnumDeclaration;
     function isDeclarationKind(kind) {
-        return kind === 197
-            || kind === 186
-            || kind === 240
-            || kind === 209
-            || kind === 157
-            || kind === 243
-            || kind === 278
-            || kind === 257
-            || kind === 239
-            || kind === 196
-            || kind === 158
-            || kind === 250
-            || kind === 248
-            || kind === 253
+        return kind === 198
+            || kind === 187
             || kind === 241
-            || kind === 267
-            || kind === 156
-            || kind === 155
+            || kind === 210
+            || kind === 158
             || kind === 244
-            || kind === 247
-            || kind === 251
-            || kind === 151
-            || kind === 275
-            || kind === 154
-            || kind === 153
-            || kind === 159
-            || kind === 276
-            || kind === 242
-            || kind === 150
-            || kind === 237
-            || kind === 309
-            || kind === 302
-            || kind === 310;
-    }
-    function isDeclarationStatementKind(kind) {
-        return kind === 239
+            || kind === 279
             || kind === 258
             || kind === 240
+            || kind === 197
+            || kind === 159
+            || kind === 251
+            || kind === 249
+            || kind === 254
+            || kind === 242
+            || kind === 268
+            || kind === 157
+            || kind === 156
+            || kind === 245
+            || kind === 248
+            || kind === 252
+            || kind === 152
+            || kind === 276
+            || kind === 155
+            || kind === 154
+            || kind === 160
+            || kind === 277
+            || kind === 243
+            || kind === 151
+            || kind === 238
+            || kind === 311
+            || kind === 304
+            || kind === 312;
+    }
+    function isDeclarationStatementKind(kind) {
+        return kind === 240
+            || kind === 259
             || kind === 241
             || kind === 242
             || kind === 243
             || kind === 244
+            || kind === 245
+            || kind === 250
             || kind === 249
-            || kind === 248
+            || kind === 256
             || kind === 255
-            || kind === 254
-            || kind === 247;
+            || kind === 248;
     }
     function isStatementKindButNotDeclarationKind(kind) {
-        return kind === 229
-            || kind === 228
-            || kind === 236
-            || kind === 223
-            || kind === 221
-            || kind === 220
-            || kind === 226
-            || kind === 227
-            || kind === 225
-            || kind === 222
-            || kind === 233
-            || kind === 230
-            || kind === 232
-            || kind === 234
-            || kind === 235
-            || kind === 219
+        return kind === 230
+            || kind === 229
+            || kind === 237
             || kind === 224
+            || kind === 222
+            || kind === 221
+            || kind === 227
+            || kind === 228
+            || kind === 226
+            || kind === 223
+            || kind === 234
             || kind === 231
-            || kind === 312
-            || kind === 316
-            || kind === 315;
+            || kind === 233
+            || kind === 235
+            || kind === 236
+            || kind === 220
+            || kind === 225
+            || kind === 232
+            || kind === 314
+            || kind === 318
+            || kind === 317;
     }
     function isDeclaration(node) {
-        if (node.kind === 150) {
-            return (node.parent && node.parent.kind !== 308) || ts.isInJSFile(node);
+        if (node.kind === 151) {
+            return (node.parent && node.parent.kind !== 310) || ts.isInJSFile(node);
         }
         return isDeclarationKind(node.kind);
     }
@@ -11770,10 +11936,10 @@ var ts;
     }
     ts.isStatement = isStatement;
     function isBlockStatement(node) {
-        if (node.kind !== 218)
+        if (node.kind !== 219)
             return false;
         if (node.parent !== undefined) {
-            if (node.parent.kind === 235 || node.parent.kind === 274) {
+            if (node.parent.kind === 236 || node.parent.kind === 275) {
                 return false;
             }
         }
@@ -11781,69 +11947,69 @@ var ts;
     }
     function isModuleReference(node) {
         var kind = node.kind;
-        return kind === 259
-            || kind === 148
-            || kind === 72;
+        return kind === 260
+            || kind === 149
+            || kind === 73;
     }
     ts.isModuleReference = isModuleReference;
     function isJsxTagNameExpression(node) {
         var kind = node.kind;
-        return kind === 100
-            || kind === 72
-            || kind === 189;
+        return kind === 101
+            || kind === 73
+            || kind === 190;
     }
     ts.isJsxTagNameExpression = isJsxTagNameExpression;
     function isJsxChild(node) {
         var kind = node.kind;
-        return kind === 260
-            || kind === 270
-            || kind === 261
+        return kind === 261
+            || kind === 271
+            || kind === 262
             || kind === 11
-            || kind === 264;
+            || kind === 265;
     }
     ts.isJsxChild = isJsxChild;
     function isJsxAttributeLike(node) {
         var kind = node.kind;
-        return kind === 267
-            || kind === 269;
+        return kind === 268
+            || kind === 270;
     }
     ts.isJsxAttributeLike = isJsxAttributeLike;
     function isStringLiteralOrJsxExpression(node) {
         var kind = node.kind;
         return kind === 10
-            || kind === 270;
+            || kind === 271;
     }
     ts.isStringLiteralOrJsxExpression = isStringLiteralOrJsxExpression;
     function isJsxOpeningLikeElement(node) {
         var kind = node.kind;
-        return kind === 262
-            || kind === 261;
+        return kind === 263
+            || kind === 262;
     }
     ts.isJsxOpeningLikeElement = isJsxOpeningLikeElement;
     function isCaseOrDefaultClause(node) {
         var kind = node.kind;
-        return kind === 271
-            || kind === 272;
+        return kind === 272
+            || kind === 273;
     }
     ts.isCaseOrDefaultClause = isCaseOrDefaultClause;
     function isJSDocNode(node) {
-        return node.kind >= 288 && node.kind <= 310;
+        return node.kind >= 289 && node.kind <= 312;
     }
     ts.isJSDocNode = isJSDocNode;
     function isJSDocCommentContainingNode(node) {
-        return node.kind === 296 || isJSDocTag(node) || ts.isJSDocTypeLiteral(node) || ts.isJSDocSignature(node);
+        return node.kind === 297 || isJSDocTag(node) || ts.isJSDocTypeLiteral(node) || ts.isJSDocSignature(node);
     }
     ts.isJSDocCommentContainingNode = isJSDocCommentContainingNode;
     function isJSDocTag(node) {
-        return node.kind >= 299 && node.kind <= 310;
+        return node.kind >= 300 && node.kind <= 312;
     }
     ts.isJSDocTag = isJSDocTag;
     function isSetAccessor(node) {
-        return node.kind === 159;
+        return node.kind === 160;
     }
     ts.isSetAccessor = isSetAccessor;
     function isGetAccessor(node) {
-        return node.kind === 158;
+        return node.kind === 159;
     }
     ts.isGetAccessor = isGetAccessor;
     function hasJSDocNodes(node) {
@@ -11864,11 +12030,11 @@ var ts;
     }
     ts.hasOnlyExpressionInitializer = hasOnlyExpressionInitializer;
     function isObjectLiteralElement(node) {
-        return node.kind === 267 || node.kind === 269 || isObjectLiteralElementLike(node);
+        return node.kind === 268 || node.kind === 270 || isObjectLiteralElementLike(node);
     }
     ts.isObjectLiteralElement = isObjectLiteralElement;
     function isTypeReferenceType(node) {
-        return node.kind === 164 || node.kind === 211;
+        return node.kind === 165 || node.kind === 212;
     }
     ts.isTypeReferenceType = isTypeReferenceType;
     var MAX_SMI_X86 = 1073741823;
@@ -11902,7 +12068,7 @@ var ts;
 })(ts || (ts = {}));
 (function (ts) {
     function isNamedImportsOrExports(node) {
-        return node.kind === 252 || node.kind === 256;
+        return node.kind === 253 || node.kind === 257;
     }
     ts.isNamedImportsOrExports = isNamedImportsOrExports;
     function Symbol(flags, name) {
@@ -12022,17 +12188,16 @@ var ts;
             messageText: text,
             category: message.category,
             code: message.code,
-            next: details
+            next: details === undefined || Array.isArray(details) ? details : [details]
         };
     }
     ts.chainDiagnosticMessages = chainDiagnosticMessages;
     function concatenateDiagnosticMessageChains(headChain, tailChain) {
         var lastChain = headChain;
         while (lastChain.next) {
-            lastChain = lastChain.next;
+            lastChain = lastChain.next[0];
         }
-        lastChain.next = tailChain;
-        return headChain;
+        lastChain.next = [tailChain];
     }
     ts.concatenateDiagnosticMessageChains = concatenateDiagnosticMessageChains;
     function getDiagnosticFilePath(diagnostic) {
@@ -12066,22 +12231,42 @@ var ts;
         return d1.relatedInformation ? -1 : 1;
     }
     function compareMessageText(t1, t2) {
-        var text1 = t1;
-        var text2 = t2;
-        while (text1 && text2) {
-            var string1 = ts.isString(text1) ? text1 : text1.messageText;
-            var string2 = ts.isString(text2) ? text2 : text2.messageText;
-            var res = ts.compareStringsCaseSensitive(string1, string2);
+        if (typeof t1 === "string" && typeof t2 === "string") {
+            return ts.compareStringsCaseSensitive(t1, t2);
+        }
+        else if (typeof t1 === "string") {
+            return -1;
+        }
+        else if (typeof t2 === "string") {
+            return 1;
+        }
+        var res = ts.compareStringsCaseSensitive(t1.messageText, t2.messageText);
+        if (res) {
+            return res;
+        }
+        if (!t1.next && !t2.next) {
+            return 0;
+        }
+        if (!t1.next) {
+            return -1;
+        }
+        if (!t2.next) {
+            return 1;
+        }
+        var len = Math.min(t1.next.length, t2.next.length);
+        for (var i = 0; i < len; i++) {
+            res = compareMessageText(t1.next[i], t2.next[i]);
             if (res) {
                 return res;
             }
-            text1 = ts.isString(text1) ? undefined : text1.next;
-            text2 = ts.isString(text2) ? undefined : text2.next;
         }
-        if (!text1 && !text2) {
-            return 0;
+        if (t1.next.length < t2.next.length) {
+            return -1;
         }
-        return text1 ? 1 : -1;
+        else if (t1.next.length > t2.next.length) {
+            return 1;
+        }
+        return 0;
     }
     function getEmitScriptTarget(compilerOptions) {
         return compilerOptions.target || 0;
@@ -12150,6 +12335,11 @@ var ts;
             ts.semanticDiagnosticsOptionDeclarations.some(function (option) { return !ts.isJsonEqual(getCompilerOptionValue(oldOptions, option), getCompilerOptionValue(newOptions, option)); });
     }
     ts.compilerOptionsAffectSemanticDiagnostics = compilerOptionsAffectSemanticDiagnostics;
+    function compilerOptionsAffectEmit(newOptions, oldOptions) {
+        return oldOptions !== newOptions &&
+            ts.affectsEmitOptionDeclarations.some(function (option) { return !ts.isJsonEqual(getCompilerOptionValue(oldOptions, option), getCompilerOptionValue(newOptions, option)); });
+    }
+    ts.compilerOptionsAffectEmit = compilerOptionsAffectEmit;
     function getCompilerOptionValue(options, option) {
         return option.strictFlag ? getStrictOptionValue(options, option.name) : options[option.name];
     }
@@ -12349,6 +12539,15 @@ var ts;
         return root + pathComponents.slice(1).join(ts.directorySeparator);
     }
     ts.getPathFromPathComponents = getPathFromPathComponents;
+    function getNormalizedAbsolutePathWithoutRoot(fileName, currentDirectory) {
+        return getPathWithoutRoot(getNormalizedPathComponents(fileName, currentDirectory));
+    }
+    ts.getNormalizedAbsolutePathWithoutRoot = getNormalizedAbsolutePathWithoutRoot;
+    function getPathWithoutRoot(pathComponents) {
+        if (pathComponents.length === 0)
+            return "";
+        return pathComponents.slice(1).join(ts.directorySeparator);
+    }
 })(ts || (ts = {}));
 (function (ts) {
     function getPathComponentsRelativeTo(from, to, stringEqualityComparer, getCanonicalFileName) {
@@ -12378,7 +12577,7 @@ var ts;
     }
     ts.getRelativePathFromFile = getRelativePathFromFile;
     function getRelativePathFromDirectory(fromDirectory, to, getCanonicalFileNameOrIgnoreCase) {
-        Debug.assert((ts.getRootLength(fromDirectory) > 0) === (ts.getRootLength(to) > 0), "Paths must either both be absolute or both be relative");
+        ts.Debug.assert((ts.getRootLength(fromDirectory) > 0) === (ts.getRootLength(to) > 0), "Paths must either both be absolute or both be relative");
         var getCanonicalFileName = typeof getCanonicalFileNameOrIgnoreCase === "function" ? getCanonicalFileNameOrIgnoreCase : ts.identity;
         var ignoreCase = typeof getCanonicalFileNameOrIgnoreCase === "boolean" ? getCanonicalFileNameOrIgnoreCase : false;
         var pathComponents = getPathComponentsRelativeTo(fromDirectory, to, ignoreCase ? ts.equateStringsCaseInsensitive : ts.equateStringsCaseSensitive, getCanonicalFileName);
@@ -12683,7 +12882,7 @@ var ts;
         return new RegExp(pattern, useCaseSensitiveFileNames ? "" : "i");
     }
     ts.getRegexFromPattern = getRegexFromPattern;
-    function matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory, depth, getFileSystemEntries) {
+    function matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory, depth, getFileSystemEntries, realpath) {
         path = ts.normalizePath(path);
         currentDirectory = ts.normalizePath(currentDirectory);
         var patterns = getFileMatcherPatterns(path, excludes, includes, useCaseSensitiveFileNames, currentDirectory);
@@ -12691,12 +12890,18 @@ var ts;
         var includeDirectoryRegex = patterns.includeDirectoryPattern && getRegexFromPattern(patterns.includeDirectoryPattern, useCaseSensitiveFileNames);
         var excludeRegex = patterns.excludePattern && getRegexFromPattern(patterns.excludePattern, useCaseSensitiveFileNames);
         var results = includeFileRegexes ? includeFileRegexes.map(function () { return []; }) : [[]];
+        var visited = ts.createMap();
+        var toCanonical = ts.createGetCanonicalFileName(useCaseSensitiveFileNames);
         for (var _i = 0, _a = patterns.basePaths; _i < _a.length; _i++) {
             var basePath = _a[_i];
             visitDirectory(basePath, combinePaths(currentDirectory, basePath), depth);
         }
         return ts.flatten(results);
         function visitDirectory(path, absolutePath, depth) {
+            var canonicalPath = toCanonical(realpath(absolutePath));
+            if (visited.has(canonicalPath))
+                return;
+            visited.set(canonicalPath, true);
             var _a = getFileSystemEntries(path), files = _a.files, directories = _a.directories;
             var _loop_1 = function (current) {
                 var name = combinePaths(path, current);
@@ -12907,31 +13112,8 @@ var ts;
         return pathext ? path.slice(0, path.length - pathext.length) + (ts.startsWith(ext, ".") ? ext : "." + ext) : path;
     }
     ts.changeAnyExtension = changeAnyExtension;
-    var Debug;
-    (function (Debug) {
-        function showSymbol(symbol) {
-            var symbolFlags = ts.SymbolFlags;
-            return "{ flags: " + (symbolFlags ? showFlags(symbol.flags, symbolFlags) : symbol.flags) + "; declarations: " + ts.map(symbol.declarations, showSyntaxKind) + " }";
-        }
-        Debug.showSymbol = showSymbol;
-        function showFlags(flags, flagsEnum) {
-            var out = [];
-            for (var pow = 0; pow <= 30; pow++) {
-                var n = 1 << pow;
-                if (flags & n) {
-                    out.push(flagsEnum[n]);
-                }
-            }
-            return out.join("|");
-        }
-        function showSyntaxKind(node) {
-            var syntaxKind = ts.SyntaxKind;
-            return syntaxKind ? syntaxKind[node.kind] : node.kind.toString();
-        }
-        Debug.showSyntaxKind = showSyntaxKind;
-    })(Debug = ts.Debug || (ts.Debug = {}));
     function tryParsePattern(pattern) {
-        Debug.assert(ts.hasZeroOrOneAsteriskCharacter(pattern));
+        ts.Debug.assert(ts.hasZeroOrOneAsteriskCharacter(pattern));
         var indexOfStar = pattern.indexOf("*");
         return indexOfStar === -1 ? undefined : {
             prefix: pattern.substr(0, indexOfStar),
@@ -12953,7 +13135,7 @@ var ts;
     ts.resolutionExtensionIsTSOrJson = resolutionExtensionIsTSOrJson;
     function extensionFromPath(path) {
         var ext = tryGetExtensionFromPath(path);
-        return ext !== undefined ? ext : Debug.fail("File " + path + " has unknown extension.");
+        return ext !== undefined ? ext : ts.Debug.fail("File " + path + " has unknown extension.");
     }
     ts.extensionFromPath = extensionFromPath;
     function isAnySupportedFileExtension(path) {
@@ -13017,12 +13199,25 @@ var ts;
     ts.matchPatternOrExact = matchPatternOrExact;
     function sliceAfter(arr, value) {
         var index = arr.indexOf(value);
-        Debug.assert(index !== -1);
+        ts.Debug.assert(index !== -1);
         return arr.slice(index);
     }
     ts.sliceAfter = sliceAfter;
+    function addRelatedInfo(diagnostic) {
+        var _a;
+        var relatedInformation = [];
+        for (var _i = 1; _i < arguments.length; _i++) {
+            relatedInformation[_i - 1] = arguments[_i];
+        }
+        if (!diagnostic.relatedInformation) {
+            diagnostic.relatedInformation = [];
+        }
+        (_a = diagnostic.relatedInformation).push.apply(_a, relatedInformation);
+        return diagnostic;
+    }
+    ts.addRelatedInfo = addRelatedInfo;
     function minAndMax(arr, getValue) {
-        Debug.assert(arr.length !== 0);
+        ts.Debug.assert(arr.length !== 0);
         var min = getValue(arr[0]);
         var max = min;
         for (var i = 1; i < arr.length; i++) {
@@ -13194,10 +13389,10 @@ var ts;
     var IdentifierConstructor;
     var SourceFileConstructor;
     function createNode(kind, pos, end) {
-        if (kind === 284) {
+        if (kind === 285) {
             return new (SourceFileConstructor || (SourceFileConstructor = ts.objectAllocator.getSourceFileConstructor()))(kind, pos, end);
         }
-        else if (kind === 72) {
+        else if (kind === 73) {
             return new (IdentifierConstructor || (IdentifierConstructor = ts.objectAllocator.getIdentifierConstructor()))(kind, pos, end);
         }
         else if (!ts.isNodeKind(kind)) {
@@ -13232,19 +13427,19 @@ var ts;
     }
     ts.isJSDocLikeText = isJSDocLikeText;
     function forEachChild(node, cbNode, cbNodes) {
-        if (!node || node.kind <= 147) {
+        if (!node || node.kind <= 148) {
             return;
         }
         switch (node.kind) {
-            case 148:
+            case 149:
                 return visitNode(cbNode, node.left) ||
                     visitNode(cbNode, node.right);
-            case 150:
+            case 151:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.constraint) ||
                     visitNode(cbNode, node.default) ||
                     visitNode(cbNode, node.expression);
-            case 276:
+            case 277:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
@@ -13252,9 +13447,9 @@ var ts;
                     visitNode(cbNode, node.exclamationToken) ||
                     visitNode(cbNode, node.equalsToken) ||
                     visitNode(cbNode, node.objectAssignmentInitializer);
-            case 277:
+            case 278:
                 return visitNode(cbNode, node.expression);
-            case 151:
+            case 152:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.dotDotDotToken) ||
@@ -13262,59 +13457,59 @@ var ts;
                     visitNode(cbNode, node.questionToken) ||
                     visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.initializer);
+            case 155:
+                return visitNodes(cbNode, cbNodes, node.decorators) ||
+                    visitNodes(cbNode, cbNodes, node.modifiers) ||
+                    visitNode(cbNode, node.name) ||
+                    visitNode(cbNode, node.questionToken) ||
+                    visitNode(cbNode, node.exclamationToken) ||
+                    visitNode(cbNode, node.type) ||
+                    visitNode(cbNode, node.initializer);
             case 154:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.questionToken) ||
-                    visitNode(cbNode, node.exclamationToken) ||
                     visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.initializer);
-            case 153:
-                return visitNodes(cbNode, cbNodes, node.decorators) ||
-                    visitNodes(cbNode, cbNodes, node.modifiers) ||
-                    visitNode(cbNode, node.name) ||
-                    visitNode(cbNode, node.questionToken) ||
-                    visitNode(cbNode, node.type) ||
-                    visitNode(cbNode, node.initializer);
-            case 275:
+            case 276:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.questionToken) ||
                     visitNode(cbNode, node.initializer);
-            case 237:
+            case 238:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.exclamationToken) ||
                     visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.initializer);
-            case 186:
+            case 187:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.dotDotDotToken) ||
                     visitNode(cbNode, node.propertyName) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.initializer);
-            case 165:
             case 166:
-            case 160:
+            case 167:
             case 161:
             case 162:
+            case 163:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNodes(cbNode, cbNodes, node.typeParameters) ||
                     visitNodes(cbNode, cbNodes, node.parameters) ||
                     visitNode(cbNode, node.type);
-            case 156:
-            case 155:
             case 157:
+            case 156:
             case 158:
             case 159:
-            case 196:
-            case 239:
+            case 160:
             case 197:
+            case 240:
+            case 198:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.asteriskToken) ||
@@ -13326,187 +13521,180 @@ var ts;
                     visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.equalsGreaterThanToken) ||
                     visitNode(cbNode, node.body);
-            case 164:
+            case 165:
                 return visitNode(cbNode, node.typeName) ||
                     visitNodes(cbNode, cbNodes, node.typeArguments);
-            case 163:
+            case 164:
                 return visitNode(cbNode, node.parameterName) ||
                     visitNode(cbNode, node.type);
-            case 167:
-                return visitNode(cbNode, node.exprName);
             case 168:
-                return visitNodes(cbNode, cbNodes, node.members);
+                return visitNode(cbNode, node.exprName);
             case 169:
-                return visitNode(cbNode, node.elementType);
+                return visitNodes(cbNode, cbNodes, node.members);
             case 170:
+                return visitNode(cbNode, node.elementType);
+            case 171:
                 return visitNodes(cbNode, cbNodes, node.elementTypes);
-            case 173:
             case 174:
-                return visitNodes(cbNode, cbNodes, node.types);
             case 175:
+                return visitNodes(cbNode, cbNodes, node.types);
+            case 176:
                 return visitNode(cbNode, node.checkType) ||
                     visitNode(cbNode, node.extendsType) ||
                     visitNode(cbNode, node.trueType) ||
                     visitNode(cbNode, node.falseType);
-            case 176:
+            case 177:
                 return visitNode(cbNode, node.typeParameter);
-            case 183:
+            case 184:
                 return visitNode(cbNode, node.argument) ||
                     visitNode(cbNode, node.qualifier) ||
                     visitNodes(cbNode, cbNodes, node.typeArguments);
-            case 177:
-            case 179:
-                return visitNode(cbNode, node.type);
+            case 178:
             case 180:
+                return visitNode(cbNode, node.type);
+            case 181:
                 return visitNode(cbNode, node.objectType) ||
                     visitNode(cbNode, node.indexType);
-            case 181:
+            case 182:
                 return visitNode(cbNode, node.readonlyToken) ||
                     visitNode(cbNode, node.typeParameter) ||
                     visitNode(cbNode, node.questionToken) ||
                     visitNode(cbNode, node.type);
-            case 182:
+            case 183:
                 return visitNode(cbNode, node.literal);
-            case 184:
             case 185:
-                return visitNodes(cbNode, cbNodes, node.elements);
-            case 187:
+            case 186:
                 return visitNodes(cbNode, cbNodes, node.elements);
             case 188:
-                return visitNodes(cbNode, cbNodes, node.properties);
+                return visitNodes(cbNode, cbNodes, node.elements);
             case 189:
-                return visitNode(cbNode, node.expression) ||
-                    visitNode(cbNode, node.name);
+                return visitNodes(cbNode, cbNodes, node.properties);
             case 190:
                 return visitNode(cbNode, node.expression) ||
-                    visitNode(cbNode, node.argumentExpression);
+                    visitNode(cbNode, node.name);
             case 191:
+                return visitNode(cbNode, node.expression) ||
+                    visitNode(cbNode, node.argumentExpression);
             case 192:
+            case 193:
                 return visitNode(cbNode, node.expression) ||
                     visitNodes(cbNode, cbNodes, node.typeArguments) ||
                     visitNodes(cbNode, cbNodes, node.arguments);
-            case 193:
+            case 194:
                 return visitNode(cbNode, node.tag) ||
                     visitNodes(cbNode, cbNodes, node.typeArguments) ||
                     visitNode(cbNode, node.template);
-            case 194:
+            case 195:
                 return visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.expression);
-            case 195:
-                return visitNode(cbNode, node.expression);
-            case 198:
+            case 196:
                 return visitNode(cbNode, node.expression);
             case 199:
                 return visitNode(cbNode, node.expression);
             case 200:
                 return visitNode(cbNode, node.expression);
-            case 202:
-                return visitNode(cbNode, node.operand);
-            case 207:
-                return visitNode(cbNode, node.asteriskToken) ||
-                    visitNode(cbNode, node.expression);
             case 201:
                 return visitNode(cbNode, node.expression);
             case 203:
                 return visitNode(cbNode, node.operand);
+            case 208:
+                return visitNode(cbNode, node.asteriskToken) ||
+                    visitNode(cbNode, node.expression);
+            case 202:
+                return visitNode(cbNode, node.expression);
             case 204:
+                return visitNode(cbNode, node.operand);
+            case 205:
                 return visitNode(cbNode, node.left) ||
                     visitNode(cbNode, node.operatorToken) ||
                     visitNode(cbNode, node.right);
-            case 212:
+            case 213:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.type);
-            case 213:
-                return visitNode(cbNode, node.expression);
             case 214:
+                return visitNode(cbNode, node.expression);
+            case 215:
                 return visitNode(cbNode, node.name);
-            case 205:
+            case 206:
                 return visitNode(cbNode, node.condition) ||
                     visitNode(cbNode, node.questionToken) ||
                     visitNode(cbNode, node.whenTrue) ||
                     visitNode(cbNode, node.colonToken) ||
                     visitNode(cbNode, node.whenFalse);
-            case 208:
+            case 209:
                 return visitNode(cbNode, node.expression);
-            case 218:
-            case 245:
+            case 219:
+            case 246:
                 return visitNodes(cbNode, cbNodes, node.statements);
-            case 284:
+            case 285:
                 return visitNodes(cbNode, cbNodes, node.statements) ||
                     visitNode(cbNode, node.endOfFileToken);
-            case 219:
+            case 220:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.declarationList);
-            case 238:
+            case 239:
                 return visitNodes(cbNode, cbNodes, node.declarations);
-            case 221:
-                return visitNode(cbNode, node.expression);
             case 222:
+                return visitNode(cbNode, node.expression);
+            case 223:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.thenStatement) ||
                     visitNode(cbNode, node.elseStatement);
-            case 223:
+            case 224:
                 return visitNode(cbNode, node.statement) ||
                     visitNode(cbNode, node.expression);
-            case 224:
+            case 225:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.statement);
-            case 225:
+            case 226:
                 return visitNode(cbNode, node.initializer) ||
                     visitNode(cbNode, node.condition) ||
                     visitNode(cbNode, node.incrementor) ||
                     visitNode(cbNode, node.statement);
-            case 226:
+            case 227:
                 return visitNode(cbNode, node.initializer) ||
                     visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.statement);
-            case 227:
+            case 228:
                 return visitNode(cbNode, node.awaitModifier) ||
                     visitNode(cbNode, node.initializer) ||
                     visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.statement);
-            case 228:
             case 229:
-                return visitNode(cbNode, node.label);
             case 230:
-                return visitNode(cbNode, node.expression);
+                return visitNode(cbNode, node.label);
             case 231:
-                return visitNode(cbNode, node.expression) ||
-                    visitNode(cbNode, node.statement);
+                return visitNode(cbNode, node.expression);
             case 232:
+                return visitNode(cbNode, node.expression) ||
+                    visitNode(cbNode, node.statement);
+            case 233:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.caseBlock);
-            case 246:
+            case 247:
                 return visitNodes(cbNode, cbNodes, node.clauses);
-            case 271:
+            case 272:
                 return visitNode(cbNode, node.expression) ||
                     visitNodes(cbNode, cbNodes, node.statements);
-            case 272:
+            case 273:
                 return visitNodes(cbNode, cbNodes, node.statements);
-            case 233:
+            case 234:
                 return visitNode(cbNode, node.label) ||
                     visitNode(cbNode, node.statement);
-            case 234:
-                return visitNode(cbNode, node.expression);
             case 235:
+                return visitNode(cbNode, node.expression);
+            case 236:
                 return visitNode(cbNode, node.tryBlock) ||
                     visitNode(cbNode, node.catchClause) ||
                     visitNode(cbNode, node.finallyBlock);
-            case 274:
+            case 275:
                 return visitNode(cbNode, node.variableDeclaration) ||
                     visitNode(cbNode, node.block);
-            case 152:
+            case 153:
                 return visitNode(cbNode, node.expression);
-            case 240:
-            case 209:
-                return visitNodes(cbNode, cbNodes, node.decorators) ||
-                    visitNodes(cbNode, cbNodes, node.modifiers) ||
-                    visitNode(cbNode, node.name) ||
-                    visitNodes(cbNode, cbNodes, node.typeParameters) ||
-                    visitNodes(cbNode, cbNodes, node.heritageClauses) ||
-                    visitNodes(cbNode, cbNodes, node.members);
             case 241:
+            case 210:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
@@ -13518,151 +13706,160 @@ var ts;
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNodes(cbNode, cbNodes, node.typeParameters) ||
-                    visitNode(cbNode, node.type);
+                    visitNodes(cbNode, cbNodes, node.heritageClauses) ||
+                    visitNodes(cbNode, cbNodes, node.members);
             case 243:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
-                    visitNodes(cbNode, cbNodes, node.members);
-            case 278:
-                return visitNode(cbNode, node.name) ||
-                    visitNode(cbNode, node.initializer);
+                    visitNodes(cbNode, cbNodes, node.typeParameters) ||
+                    visitNode(cbNode, node.type);
             case 244:
+                return visitNodes(cbNode, cbNodes, node.decorators) ||
+                    visitNodes(cbNode, cbNodes, node.modifiers) ||
+                    visitNode(cbNode, node.name) ||
+                    visitNodes(cbNode, cbNodes, node.members);
+            case 279:
+                return visitNode(cbNode, node.name) ||
+                    visitNode(cbNode, node.initializer);
+            case 245:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.body);
-            case 248:
+            case 249:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.moduleReference);
-            case 249:
+            case 250:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.importClause) ||
                     visitNode(cbNode, node.moduleSpecifier);
-            case 250:
+            case 251:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.namedBindings);
-            case 247:
-                return visitNode(cbNode, node.name);
-            case 251:
+            case 248:
                 return visitNode(cbNode, node.name);
             case 252:
-            case 256:
+                return visitNode(cbNode, node.name);
+            case 253:
+            case 257:
                 return visitNodes(cbNode, cbNodes, node.elements);
-            case 255:
+            case 256:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.exportClause) ||
                     visitNode(cbNode, node.moduleSpecifier);
-            case 253:
-            case 257:
+            case 254:
+            case 258:
                 return visitNode(cbNode, node.propertyName) ||
                     visitNode(cbNode, node.name);
-            case 254:
+            case 255:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.expression);
-            case 206:
+            case 207:
                 return visitNode(cbNode, node.head) || visitNodes(cbNode, cbNodes, node.templateSpans);
-            case 216:
+            case 217:
                 return visitNode(cbNode, node.expression) || visitNode(cbNode, node.literal);
-            case 149:
+            case 150:
                 return visitNode(cbNode, node.expression);
-            case 273:
+            case 274:
                 return visitNodes(cbNode, cbNodes, node.types);
-            case 211:
+            case 212:
                 return visitNode(cbNode, node.expression) ||
                     visitNodes(cbNode, cbNodes, node.typeArguments);
-            case 259:
-                return visitNode(cbNode, node.expression);
-            case 258:
-                return visitNodes(cbNode, cbNodes, node.decorators);
-            case 314:
-                return visitNodes(cbNode, cbNodes, node.elements);
             case 260:
+                return visitNode(cbNode, node.expression);
+            case 259:
+                return visitNodes(cbNode, cbNodes, node.decorators);
+            case 316:
+                return visitNodes(cbNode, cbNodes, node.elements);
+            case 261:
                 return visitNode(cbNode, node.openingElement) ||
                     visitNodes(cbNode, cbNodes, node.children) ||
                     visitNode(cbNode, node.closingElement);
-            case 264:
+            case 265:
                 return visitNode(cbNode, node.openingFragment) ||
                     visitNodes(cbNode, cbNodes, node.children) ||
                     visitNode(cbNode, node.closingFragment);
-            case 261:
             case 262:
+            case 263:
                 return visitNode(cbNode, node.tagName) ||
                     visitNodes(cbNode, cbNodes, node.typeArguments) ||
                     visitNode(cbNode, node.attributes);
-            case 268:
+            case 269:
                 return visitNodes(cbNode, cbNodes, node.properties);
-            case 267:
+            case 268:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.initializer);
-            case 269:
-                return visitNode(cbNode, node.expression);
             case 270:
+                return visitNode(cbNode, node.expression);
+            case 271:
                 return visitNode(cbNode, node.dotDotDotToken) ||
                     visitNode(cbNode, node.expression);
-            case 263:
+            case 264:
                 return visitNode(cbNode, node.tagName);
-            case 171:
             case 172:
-            case 288:
-            case 292:
-            case 291:
+            case 173:
+            case 289:
             case 293:
-            case 295:
-                return visitNode(cbNode, node.type);
+            case 292:
             case 294:
+            case 296:
+                return visitNode(cbNode, node.type);
+            case 295:
                 return visitNodes(cbNode, cbNodes, node.parameters) ||
                     visitNode(cbNode, node.type);
-            case 296:
+            case 297:
                 return visitNodes(cbNode, cbNodes, node.tags);
-            case 304:
-            case 310:
+            case 306:
+            case 312:
                 return visitNode(cbNode, node.tagName) ||
                     (node.isNameFirst
                         ? visitNode(cbNode, node.name) ||
                             visitNode(cbNode, node.typeExpression)
                         : visitNode(cbNode, node.typeExpression) ||
                             visitNode(cbNode, node.name));
-            case 300:
+            case 302:
+                return visitNode(cbNode, node.tagName);
+            case 301:
                 return visitNode(cbNode, node.tagName) ||
                     visitNode(cbNode, node.class);
-            case 308:
+            case 310:
                 return visitNode(cbNode, node.tagName) ||
                     visitNode(cbNode, node.constraint) ||
                     visitNodes(cbNode, cbNodes, node.typeParameters);
-            case 309:
+            case 311:
                 return visitNode(cbNode, node.tagName) ||
                     (node.typeExpression &&
-                        node.typeExpression.kind === 288
+                        node.typeExpression.kind === 289
                         ? visitNode(cbNode, node.typeExpression) ||
                             visitNode(cbNode, node.fullName)
                         : visitNode(cbNode, node.fullName) ||
                             visitNode(cbNode, node.typeExpression));
-            case 302:
+            case 304:
                 return visitNode(cbNode, node.tagName) ||
                     visitNode(cbNode, node.fullName) ||
                     visitNode(cbNode, node.typeExpression);
-            case 305:
             case 307:
-            case 306:
-            case 303:
+            case 309:
+            case 308:
+            case 305:
                 return visitNode(cbNode, node.tagName) ||
                     visitNode(cbNode, node.typeExpression);
-            case 298:
+            case 299:
                 return ts.forEach(node.typeParameters, cbNode) ||
                     ts.forEach(node.parameters, cbNode) ||
                     visitNode(cbNode, node.type);
-            case 297:
+            case 298:
                 return ts.forEach(node.jsDocPropertyTags, cbNode);
-            case 299:
-            case 301:
+            case 300:
+            case 303:
                 return visitNode(cbNode, node.tagName);
-            case 313:
+            case 315:
                 return visitNode(cbNode, node.expression);
         }
     }
@@ -13715,7 +13912,7 @@ var ts;
     ts.parseJSDocTypeExpressionForTests = parseJSDocTypeExpressionForTests;
     var Parser;
     (function (Parser) {
-        var scanner = ts.createScanner(7, true);
+        var scanner = ts.createScanner(99, true);
         var disallowInAndDecoratorContext = 2048 | 8192;
         var NodeConstructor;
         var TokenConstructor;
@@ -13773,14 +13970,14 @@ var ts;
                 sourceFile.endOfFileToken = parseTokenNode();
             }
             else {
-                var statement = createNode(221);
+                var statement = createNode(222);
                 switch (token()) {
                     case 22:
                         statement.expression = parseArrayLiteralExpression();
                         break;
-                    case 102:
-                    case 87:
-                    case 96:
+                    case 103:
+                    case 88:
+                    case 97:
                         statement.expression = parseTokenNode();
                         break;
                     case 39:
@@ -13913,7 +14110,7 @@ var ts;
         }
         Parser.fixupParentReferences = fixupParentReferences;
         function createSourceFile(fileName, languageVersion, scriptKind, isDeclarationFile) {
-            var sourceFile = new SourceFileConstructor(284, 0, sourceText.length);
+            var sourceFile = new SourceFileConstructor(285, 0, sourceText.length);
             nodeCount++;
             sourceFile.text = sourceText;
             sourceFile.bindDiagnostics = [];
@@ -14029,6 +14226,9 @@ var ts;
         function nextToken() {
             return currentToken = scanner.scan();
         }
+        function nextTokenJSDoc() {
+            return currentToken = scanner.scanJsDocToken();
+        }
         function reScanGreaterToken() {
             return currentToken = scanner.reScanGreaterToken();
         }
@@ -14073,16 +14273,16 @@ var ts;
             return speculationHelper(callback, false);
         }
         function isIdentifier() {
-            if (token() === 72) {
+            if (token() === 73) {
                 return true;
             }
-            if (token() === 117 && inYieldContext()) {
+            if (token() === 118 && inYieldContext()) {
                 return false;
             }
-            if (token() === 122 && inAwaitContext()) {
+            if (token() === 123 && inAwaitContext()) {
                 return false;
             }
-            return token() > 108;
+            return token() > 109;
         }
         function parseExpected(kind, diagnosticMessage, shouldAdvance) {
             if (shouldAdvance === void 0) { shouldAdvance = true; }
@@ -14100,6 +14300,14 @@ var ts;
             }
             return false;
         }
+        function parseExpectedJSDoc(kind) {
+            if (token() === kind) {
+                nextTokenJSDoc();
+                return true;
+            }
+            parseErrorAtCurrentToken(ts.Diagnostics._0_expected, ts.tokenToString(kind));
+            return false;
+        }
         function parseOptional(t) {
             if (token() === t) {
                 nextToken();
@@ -14113,15 +14321,30 @@ var ts;
             }
             return undefined;
         }
+        function parseOptionalTokenJSDoc(t) {
+            if (token() === t) {
+                return parseTokenNodeJSDoc();
+            }
+            return undefined;
+        }
         function parseExpectedToken(t, diagnosticMessage, arg0) {
             return parseOptionalToken(t) ||
                 createMissingNode(t, false, diagnosticMessage || ts.Diagnostics._0_expected, arg0 || ts.tokenToString(t));
         }
+        function parseExpectedTokenJSDoc(t) {
+            return parseOptionalTokenJSDoc(t) ||
+                createMissingNode(t, false, ts.Diagnostics._0_expected, ts.tokenToString(t));
+        }
         function parseTokenNode() {
             var node = createNode(token());
             nextToken();
             return finishNode(node);
         }
+        function parseTokenNodeJSDoc() {
+            var node = createNode(token());
+            nextTokenJSDoc();
+            return finishNode(node);
+        }
         function canParseSemicolon() {
             if (token() === 26) {
                 return true;
@@ -14143,7 +14366,7 @@ var ts;
             nodeCount++;
             var p = pos >= 0 ? pos : scanner.getStartPos();
             return ts.isNodeKind(kind) || kind === 0 ? new NodeConstructor(kind, p, p) :
-                kind === 72 ? new IdentifierConstructor(kind, p, p) :
+                kind === 73 ? new IdentifierConstructor(kind, p, p) :
                     new TokenConstructor(kind, p, p);
         }
         function createNodeWithJSDoc(kind, pos) {
@@ -14179,7 +14402,7 @@ var ts;
                 parseErrorAtCurrentToken(diagnosticMessage, arg0);
             }
             var result = createNode(kind);
-            if (kind === 72) {
+            if (kind === 73) {
                 result.escapedText = "";
             }
             else if (ts.isLiteralKind(kind) || ts.isTemplateLiteralKind(kind)) {
@@ -14197,8 +14420,8 @@ var ts;
         function createIdentifier(isIdentifier, diagnosticMessage) {
             identifierCount++;
             if (isIdentifier) {
-                var node = createNode(72);
-                if (token() !== 72) {
+                var node = createNode(73);
+                if (token() !== 73) {
                     node.originalKeywordKind = token();
                 }
                 node.escapedText = ts.escapeLeadingUnderscores(internIdentifier(scanner.getTokenValue()));
@@ -14206,7 +14429,7 @@ var ts;
                 return finishNode(node);
             }
             var reportAtCurrentPosition = token() === 1;
-            return createMissingNode(72, reportAtCurrentPosition, diagnosticMessage || ts.Diagnostics.Identifier_expected);
+            return createMissingNode(73, reportAtCurrentPosition, diagnosticMessage || ts.Diagnostics.Identifier_expected);
         }
         function parseIdentifier(diagnosticMessage) {
             return createIdentifier(isIdentifier(), diagnosticMessage);
@@ -14234,7 +14457,7 @@ var ts;
             return parsePropertyNameWorker(true);
         }
         function parseComputedPropertyName() {
-            var node = createNode(149);
+            var node = createNode(150);
             parseExpected(22);
             node.expression = allowInAnd(parseExpression);
             parseExpected(23);
@@ -14252,19 +14475,19 @@ var ts;
         }
         function nextTokenCanFollowModifier() {
             switch (token()) {
-                case 77:
-                    return nextToken() === 84;
-                case 85:
+                case 78:
+                    return nextToken() === 85;
+                case 86:
                     nextToken();
-                    if (token() === 80) {
+                    if (token() === 81) {
                         return lookAhead(nextTokenCanFollowDefaultKeyword);
                     }
-                    return token() !== 40 && token() !== 119 && token() !== 18 && canFollowModifier();
-                case 80:
+                    return token() !== 40 && token() !== 120 && token() !== 18 && canFollowModifier();
+                case 81:
                     return nextTokenCanFollowDefaultKeyword();
-                case 116:
-                case 126:
-                case 137:
+                case 117:
+                case 127:
+                case 138:
                     nextToken();
                     return canFollowModifier();
                 default:
@@ -14283,10 +14506,10 @@ var ts;
         }
         function nextTokenCanFollowDefaultKeyword() {
             nextToken();
-            return token() === 76 || token() === 90 ||
-                token() === 110 ||
-                (token() === 118 && lookAhead(nextTokenIsClassKeywordOnSameLine)) ||
-                (token() === 121 && lookAhead(nextTokenIsFunctionKeywordOnSameLine));
+            return token() === 77 || token() === 91 ||
+                token() === 111 ||
+                (token() === 119 && lookAhead(nextTokenIsClassKeywordOnSameLine)) ||
+                (token() === 122 && lookAhead(nextTokenIsFunctionKeywordOnSameLine));
         }
         function isListElement(parsingContext, inErrorRecovery) {
             var node = currentNode(parsingContext);
@@ -14299,7 +14522,7 @@ var ts;
                 case 3:
                     return !(token() === 26 && inErrorRecovery) && isStartOfStatement();
                 case 2:
-                    return token() === 74 || token() === 80;
+                    return token() === 75 || token() === 81;
                 case 4:
                     return lookAhead(isTypeMemberStart);
                 case 5:
@@ -14366,7 +14589,7 @@ var ts;
             ts.Debug.assert(token() === 18);
             if (nextToken() === 19) {
                 var next = nextToken();
-                return next === 27 || next === 18 || next === 86 || next === 109;
+                return next === 27 || next === 18 || next === 87 || next === 110;
             }
             return true;
         }
@@ -14383,8 +14606,8 @@ var ts;
             return ts.tokenIsIdentifierOrKeywordOrGreaterThan(token());
         }
         function isHeritageClauseExtendsOrImplementsKeyword() {
-            if (token() === 109 ||
-                token() === 86) {
+            if (token() === 110 ||
+                token() === 87) {
                 return lookAhead(nextTokenIsStartOfExpression);
             }
             return false;
@@ -14412,13 +14635,13 @@ var ts;
                 case 23:
                     return token() === 19;
                 case 3:
-                    return token() === 19 || token() === 74 || token() === 80;
+                    return token() === 19 || token() === 75 || token() === 81;
                 case 7:
-                    return token() === 18 || token() === 86 || token() === 109;
+                    return token() === 18 || token() === 87 || token() === 110;
                 case 8:
                     return isVariableDeclaratorListTerminator();
                 case 19:
-                    return token() === 30 || token() === 20 || token() === 18 || token() === 86 || token() === 109;
+                    return token() === 30 || token() === 20 || token() === 18 || token() === 87 || token() === 110;
                 case 11:
                     return token() === 21 || token() === 26;
                 case 15:
@@ -14554,17 +14777,17 @@ var ts;
         function isReusableClassMember(node) {
             if (node) {
                 switch (node.kind) {
-                    case 157:
-                    case 162:
                     case 158:
+                    case 163:
                     case 159:
-                    case 154:
-                    case 217:
+                    case 160:
+                    case 155:
+                    case 218:
                         return true;
-                    case 156:
+                    case 157:
                         var methodDeclaration = node;
-                        var nameIsConstructor = methodDeclaration.name.kind === 72 &&
-                            methodDeclaration.name.originalKeywordKind === 124;
+                        var nameIsConstructor = methodDeclaration.name.kind === 73 &&
+                            methodDeclaration.name.originalKeywordKind === 125;
                         return !nameIsConstructor;
                 }
             }
@@ -14573,8 +14796,8 @@ var ts;
         function isReusableSwitchClause(node) {
             if (node) {
                 switch (node.kind) {
-                    case 271:
                     case 272:
+                    case 273:
                         return true;
                 }
             }
@@ -14583,65 +14806,65 @@ var ts;
         function isReusableStatement(node) {
             if (node) {
                 switch (node.kind) {
-                    case 239:
+                    case 240:
+                    case 220:
                     case 219:
-                    case 218:
+                    case 223:
                     case 222:
-                    case 221:
-                    case 234:
+                    case 235:
+                    case 231:
+                    case 233:
                     case 230:
-                    case 232:
                     case 229:
+                    case 227:
                     case 228:
                     case 226:
-                    case 227:
                     case 225:
-                    case 224:
-                    case 231:
-                    case 220:
-                    case 235:
-                    case 233:
-                    case 223:
+                    case 232:
+                    case 221:
                     case 236:
+                    case 234:
+                    case 224:
+                    case 237:
+                    case 250:
                     case 249:
-                    case 248:
+                    case 256:
                     case 255:
-                    case 254:
-                    case 244:
-                    case 240:
+                    case 245:
                     case 241:
-                    case 243:
                     case 242:
+                    case 244:
+                    case 243:
                         return true;
                 }
             }
             return false;
         }
         function isReusableEnumMember(node) {
-            return node.kind === 278;
+            return node.kind === 279;
         }
         function isReusableTypeMember(node) {
             if (node) {
                 switch (node.kind) {
-                    case 161:
-                    case 155:
                     case 162:
-                    case 153:
-                    case 160:
+                    case 156:
+                    case 163:
+                    case 154:
+                    case 161:
                         return true;
                 }
             }
             return false;
         }
         function isReusableVariableDeclaration(node) {
-            if (node.kind !== 237) {
+            if (node.kind !== 238) {
                 return false;
             }
             var variableDeclarator = node;
             return variableDeclarator.initializer === undefined;
         }
         function isReusableParameter(node) {
-            if (node.kind !== 151) {
+            if (node.kind !== 152) {
                 return false;
             }
             var parameter = node;
@@ -14755,7 +14978,7 @@ var ts;
             return entity;
         }
         function createQualifiedName(entity, name) {
-            var node = createNode(148, entity.pos);
+            var node = createNode(149, entity.pos);
             node.left = entity;
             node.right = name;
             return finishNode(node);
@@ -14764,13 +14987,13 @@ var ts;
             if (scanner.hasPrecedingLineBreak() && ts.tokenIsIdentifierOrKeyword(token())) {
                 var matchesPattern = lookAhead(nextTokenIsIdentifierOrKeywordOnSameLine);
                 if (matchesPattern) {
-                    return createMissingNode(72, true, ts.Diagnostics.Identifier_expected);
+                    return createMissingNode(73, true, ts.Diagnostics.Identifier_expected);
                 }
             }
             return allowIdentifierNames ? parseIdentifierName() : parseIdentifier();
         }
         function parseTemplateExpression() {
-            var template = createNode(206);
+            var template = createNode(207);
             template.head = parseTemplateHead();
             ts.Debug.assert(template.head.kind === 15, "Template head has wrong token kind");
             var list = [];
@@ -14782,7 +15005,7 @@ var ts;
             return finishNode(template);
         }
         function parseTemplateSpan() {
-            var span = createNode(216);
+            var span = createNode(217);
             span.expression = allowInAnd(parseExpression);
             var literal;
             if (token() === 19) {
@@ -14825,7 +15048,7 @@ var ts;
             return node;
         }
         function parseTypeReference() {
-            var node = createNode(164);
+            var node = createNode(165);
             node.typeName = parseEntityName(true, ts.Diagnostics.Type_expected);
             if (!scanner.hasPrecedingLineBreak() && reScanLessThanToken() === 28) {
                 node.typeArguments = parseBracketedList(20, parseType, 28, 30);
@@ -14834,14 +15057,14 @@ var ts;
         }
         function typeHasArrowFunctionBlockingParseError(node) {
             switch (node.kind) {
-                case 164:
-                    return ts.nodeIsMissing(node.typeName);
                 case 165:
-                case 166: {
+                    return ts.nodeIsMissing(node.typeName);
+                case 166:
+                case 167: {
                     var _a = node, parameters = _a.parameters, type = _a.type;
                     return isMissingList(parameters) || typeHasArrowFunctionBlockingParseError(type);
                 }
-                case 177:
+                case 178:
                     return typeHasArrowFunctionBlockingParseError(node.type);
                 default:
                     return false;
@@ -14849,20 +15072,20 @@ var ts;
         }
         function parseThisTypePredicate(lhs) {
             nextToken();
-            var node = createNode(163, lhs.pos);
+            var node = createNode(164, lhs.pos);
             node.parameterName = lhs;
             node.type = parseType();
             return finishNode(node);
         }
         function parseThisTypeNode() {
-            var node = createNode(178);
+            var node = createNode(179);
             nextToken();
             return finishNode(node);
         }
         function parseJSDocAllType(postFixEquals) {
-            var result = createNode(289);
+            var result = createNode(290);
             if (postFixEquals) {
-                return createPostfixType(293, result);
+                return createPostfixType(294, result);
             }
             else {
                 nextToken();
@@ -14870,7 +15093,7 @@ var ts;
             return finishNode(result);
         }
         function parseJSDocNonNullableType() {
-            var result = createNode(292);
+            var result = createNode(293);
             nextToken();
             result.type = parseNonArrayType();
             return finishNode(result);
@@ -14882,31 +15105,31 @@ var ts;
                 token() === 19 ||
                 token() === 21 ||
                 token() === 30 ||
-                token() === 59 ||
+                token() === 60 ||
                 token() === 50) {
-                var result = createNode(290, pos);
+                var result = createNode(291, pos);
                 return finishNode(result);
             }
             else {
-                var result = createNode(291, pos);
+                var result = createNode(292, pos);
                 result.type = parseType();
                 return finishNode(result);
             }
         }
         function parseJSDocFunctionType() {
             if (lookAhead(nextTokenIsOpenParen)) {
-                var result = createNodeWithJSDoc(294);
+                var result = createNodeWithJSDoc(295);
                 nextToken();
                 fillSignature(57, 4 | 32, result);
                 return finishNode(result);
             }
-            var node = createNode(164);
+            var node = createNode(165);
             node.typeName = parseIdentifierName();
             return finishNode(node);
         }
         function parseJSDocParameter() {
-            var parameter = createNode(151);
-            if (token() === 100 || token() === 95) {
+            var parameter = createNode(152);
+            if (token() === 101 || token() === 96) {
                 parameter.name = parseIdentifierName();
                 parseExpected(57);
             }
@@ -14919,25 +15142,25 @@ var ts;
             var type = parseTypeOrTypePredicate();
             scanner.setInJSDocType(false);
             if (dotdotdot) {
-                var variadic = createNode(295, dotdotdot.pos);
+                var variadic = createNode(296, dotdotdot.pos);
                 variadic.type = type;
                 type = finishNode(variadic);
             }
-            if (token() === 59) {
-                return createPostfixType(293, type);
+            if (token() === 60) {
+                return createPostfixType(294, type);
             }
             return type;
         }
         function parseTypeQuery() {
-            var node = createNode(167);
-            parseExpected(104);
+            var node = createNode(168);
+            parseExpected(105);
             node.exprName = parseEntityName(true);
             return finishNode(node);
         }
         function parseTypeParameter() {
-            var node = createNode(150);
+            var node = createNode(151);
             node.name = parseIdentifier();
-            if (parseOptional(86)) {
+            if (parseOptional(87)) {
                 if (isStartOfType() || !isStartOfExpression()) {
                     node.constraint = parseType();
                 }
@@ -14945,7 +15168,7 @@ var ts;
                     node.expression = parseUnaryExpressionOrHigher();
                 }
             }
-            if (parseOptional(59)) {
+            if (parseOptional(60)) {
                 node.default = parseType();
             }
             return finishNode(node);
@@ -14969,8 +15192,8 @@ var ts;
                 isStartOfType(!isJSDocParameter);
         }
         function parseParameter() {
-            var node = createNodeWithJSDoc(151);
-            if (token() === 100) {
+            var node = createNodeWithJSDoc(152);
+            if (token() === 101) {
                 node.name = createIdentifier(true);
                 node.type = parseParameterType();
                 return finishNode(node);
@@ -15038,8 +15261,8 @@ var ts;
         }
         function parseSignatureMember(kind) {
             var node = createNodeWithJSDoc(kind);
-            if (kind === 161) {
-                parseExpected(95);
+            if (kind === 162) {
+                parseExpected(96);
             }
             fillSignature(57, 4, node);
             parseTypeMemberSemicolon();
@@ -15075,7 +15298,7 @@ var ts;
             return token() === 57 || token() === 27 || token() === 23;
         }
         function parseIndexSignatureDeclaration(node) {
-            node.kind = 162;
+            node.kind = 163;
             node.parameters = parseBracketedList(16, parseParameter, 22, 23);
             node.type = parseTypeAnnotation();
             parseTypeMemberSemicolon();
@@ -15085,13 +15308,13 @@ var ts;
             node.name = parsePropertyName();
             node.questionToken = parseOptionalToken(56);
             if (token() === 20 || token() === 28) {
-                node.kind = 155;
+                node.kind = 156;
                 fillSignature(57, 4, node);
             }
             else {
-                node.kind = 153;
+                node.kind = 154;
                 node.type = parseTypeAnnotation();
-                if (token() === 59) {
+                if (token() === 60) {
                     node.initializer = parseInitializer();
                 }
             }
@@ -15126,11 +15349,11 @@ var ts;
         }
         function parseTypeMember() {
             if (token() === 20 || token() === 28) {
-                return parseSignatureMember(160);
-            }
-            if (token() === 95 && lookAhead(nextTokenIsOpenParenOrLessThan)) {
                 return parseSignatureMember(161);
             }
+            if (token() === 96 && lookAhead(nextTokenIsOpenParenOrLessThan)) {
+                return parseSignatureMember(162);
+            }
             var node = createNodeWithJSDoc(0);
             node.modifiers = parseModifiers();
             if (isIndexSignature()) {
@@ -15155,7 +15378,7 @@ var ts;
             return false;
         }
         function parseTypeLiteral() {
-            var node = createNode(168);
+            var node = createNode(169);
             node.members = parseObjectTypeMembers();
             return finishNode(node);
         }
@@ -15173,27 +15396,27 @@ var ts;
         function isStartOfMappedType() {
             nextToken();
             if (token() === 38 || token() === 39) {
-                return nextToken() === 133;
+                return nextToken() === 134;
             }
-            if (token() === 133) {
+            if (token() === 134) {
                 nextToken();
             }
-            return token() === 22 && nextTokenIsIdentifier() && nextToken() === 93;
+            return token() === 22 && nextTokenIsIdentifier() && nextToken() === 94;
         }
         function parseMappedTypeParameter() {
-            var node = createNode(150);
+            var node = createNode(151);
             node.name = parseIdentifier();
-            parseExpected(93);
+            parseExpected(94);
             node.constraint = parseType();
             return finishNode(node);
         }
         function parseMappedType() {
-            var node = createNode(181);
+            var node = createNode(182);
             parseExpected(18);
-            if (token() === 133 || token() === 38 || token() === 39) {
+            if (token() === 134 || token() === 38 || token() === 39) {
                 node.readonlyToken = parseTokenNode();
-                if (node.readonlyToken.kind !== 133) {
-                    parseExpectedToken(133);
+                if (node.readonlyToken.kind !== 134) {
+                    parseExpectedToken(134);
                 }
             }
             parseExpected(22);
@@ -15213,23 +15436,23 @@ var ts;
         function parseTupleElementType() {
             var pos = getNodePos();
             if (parseOptional(25)) {
-                var node = createNode(172, pos);
+                var node = createNode(173, pos);
                 node.type = parseType();
                 return finishNode(node);
             }
             var type = parseType();
-            if (!(contextFlags & 2097152) && type.kind === 291 && type.pos === type.type.pos) {
-                type.kind = 171;
+            if (!(contextFlags & 2097152) && type.kind === 292 && type.pos === type.type.pos) {
+                type.kind = 172;
             }
             return type;
         }
         function parseTupleType() {
-            var node = createNode(170);
+            var node = createNode(171);
             node.elementTypes = parseBracketedList(21, parseTupleElementType, 22, 23);
             return finishNode(node);
         }
         function parseParenthesizedType() {
-            var node = createNode(177);
+            var node = createNode(178);
             parseExpected(20);
             node.type = parseType();
             parseExpected(21);
@@ -15237,7 +15460,7 @@ var ts;
         }
         function parseFunctionOrConstructorType() {
             var pos = getNodePos();
-            var kind = parseOptional(95) ? 166 : 165;
+            var kind = parseOptional(96) ? 167 : 166;
             var node = createNodeWithJSDoc(kind, pos);
             fillSignature(37, 4, node);
             return finishNode(node);
@@ -15247,14 +15470,14 @@ var ts;
             return token() === 24 ? undefined : node;
         }
         function parseLiteralTypeNode(negative) {
-            var node = createNode(182);
+            var node = createNode(183);
             var unaryMinusExpression;
             if (negative) {
-                unaryMinusExpression = createNode(202);
+                unaryMinusExpression = createNode(203);
                 unaryMinusExpression.operator = 39;
                 nextToken();
             }
-            var expression = token() === 102 || token() === 87
+            var expression = token() === 103 || token() === 88
                 ? parseTokenNode()
                 : parseLiteralLikeNode(token());
             if (negative) {
@@ -15267,22 +15490,24 @@ var ts;
         }
         function isStartOfTypeOfImportType() {
             nextToken();
-            return token() === 92;
+            return token() === 93;
         }
         function parseImportType() {
             sourceFile.flags |= 524288;
-            var node = createNode(183);
-            if (parseOptional(104)) {
+            var node = createNode(184);
+            if (parseOptional(105)) {
                 node.isTypeOf = true;
             }
-            parseExpected(92);
+            parseExpected(93);
             parseExpected(20);
             node.argument = parseType();
             parseExpected(21);
             if (parseOptional(24)) {
                 node.qualifier = parseEntityName(true, ts.Diagnostics.Type_expected);
             }
-            node.typeArguments = tryParseTypeArguments();
+            if (!scanner.hasPrecedingLineBreak() && reScanLessThanToken() === 28) {
+                node.typeArguments = parseBracketedList(20, parseType, 28, 30);
+            }
             return finishNode(node);
         }
         function nextTokenIsNumericOrBigIntLiteral() {
@@ -15291,24 +15516,24 @@ var ts;
         }
         function parseNonArrayType() {
             switch (token()) {
-                case 120:
-                case 143:
-                case 138:
-                case 135:
-                case 146:
+                case 121:
+                case 144:
                 case 139:
-                case 123:
-                case 141:
-                case 132:
                 case 136:
+                case 147:
+                case 140:
+                case 124:
+                case 142:
+                case 133:
+                case 137:
                     return tryParse(parseKeywordAndNoDot) || parseTypeReference();
                 case 40:
                     return parseJSDocAllType(false);
-                case 62:
+                case 63:
                     return parseJSDocAllType(true);
                 case 56:
                     return parseJSDocUnknownOrNullableType();
-                case 90:
+                case 91:
                     return parseJSDocFunctionType();
                 case 52:
                     return parseJSDocNonNullableType();
@@ -15316,24 +15541,24 @@ var ts;
                 case 10:
                 case 8:
                 case 9:
-                case 102:
-                case 87:
+                case 103:
+                case 88:
                     return parseLiteralTypeNode();
                 case 39:
                     return lookAhead(nextTokenIsNumericOrBigIntLiteral) ? parseLiteralTypeNode(true) : parseTypeReference();
-                case 106:
-                case 96:
+                case 107:
+                case 97:
                     return parseTokenNode();
-                case 100: {
+                case 101: {
                     var thisKeyword = parseThisTypeNode();
-                    if (token() === 128 && !scanner.hasPrecedingLineBreak()) {
+                    if (token() === 129 && !scanner.hasPrecedingLineBreak()) {
                         return parseThisTypePredicate(thisKeyword);
                     }
                     else {
                         return thisKeyword;
                     }
                 }
-                case 104:
+                case 105:
                     return lookAhead(isStartOfTypeOfImportType) ? parseImportType() : parseTypeQuery();
                 case 18:
                     return lookAhead(isStartOfMappedType) ? parseMappedType() : parseTypeLiteral();
@@ -15341,7 +15566,7 @@ var ts;
                     return parseTupleType();
                 case 20:
                     return parseParenthesizedType();
-                case 92:
+                case 93:
                     return parseImportType();
                 default:
                     return parseTypeReference();
@@ -15349,41 +15574,41 @@ var ts;
         }
         function isStartOfType(inStartOfParameter) {
             switch (token()) {
-                case 120:
-                case 143:
-                case 138:
-                case 135:
-                case 146:
-                case 123:
-                case 133:
+                case 121:
+                case 144:
                 case 139:
+                case 136:
+                case 147:
+                case 124:
+                case 134:
+                case 140:
+                case 143:
+                case 107:
                 case 142:
-                case 106:
-                case 141:
-                case 96:
-                case 100:
-                case 104:
-                case 132:
+                case 97:
+                case 101:
+                case 105:
+                case 133:
                 case 18:
                 case 22:
                 case 28:
                 case 50:
                 case 49:
-                case 95:
+                case 96:
                 case 10:
                 case 8:
                 case 9:
-                case 102:
-                case 87:
-                case 136:
+                case 103:
+                case 88:
+                case 137:
                 case 40:
                 case 56:
                 case 52:
                 case 25:
-                case 127:
-                case 92:
+                case 128:
+                case 93:
                     return true;
-                case 90:
+                case 91:
                     return !inStartOfParameter;
                 case 39:
                     return !inStartOfParameter && lookAhead(nextTokenIsNumericOrBigIntLiteral);
@@ -15402,25 +15627,25 @@ var ts;
             while (!scanner.hasPrecedingLineBreak()) {
                 switch (token()) {
                     case 52:
-                        type = createPostfixType(292, type);
+                        type = createPostfixType(293, type);
                         break;
                     case 56:
                         if (!(contextFlags & 2097152) && lookAhead(nextTokenIsStartOfType)) {
                             return type;
                         }
-                        type = createPostfixType(291, type);
+                        type = createPostfixType(292, type);
                         break;
                     case 22:
                         parseExpected(22);
                         if (isStartOfType()) {
-                            var node = createNode(180, type.pos);
+                            var node = createNode(181, type.pos);
                             node.objectType = type;
                             node.indexType = parseType();
                             parseExpected(23);
                             type = finishNode(node);
                         }
                         else {
-                            var node = createNode(169, type.pos);
+                            var node = createNode(170, type.pos);
                             node.elementType = type;
                             parseExpected(23);
                             type = finishNode(node);
@@ -15439,16 +15664,16 @@ var ts;
             return finishNode(postfix);
         }
         function parseTypeOperator(operator) {
-            var node = createNode(179);
+            var node = createNode(180);
             parseExpected(operator);
             node.operator = operator;
             node.type = parseTypeOperatorOrHigher();
             return finishNode(node);
         }
         function parseInferType() {
-            var node = createNode(176);
-            parseExpected(127);
-            var typeParameter = createNode(150);
+            var node = createNode(177);
+            parseExpected(128);
+            var typeParameter = createNode(151);
             typeParameter.name = parseIdentifier();
             node.typeParameter = finishNode(typeParameter);
             return finishNode(node);
@@ -15456,34 +15681,35 @@ var ts;
         function parseTypeOperatorOrHigher() {
             var operator = token();
             switch (operator) {
-                case 129:
-                case 142:
-                case 133:
+                case 130:
+                case 143:
+                case 134:
                     return parseTypeOperator(operator);
-                case 127:
+                case 128:
                     return parseInferType();
             }
             return parsePostfixTypeOrHigher();
         }
         function parseUnionOrIntersectionType(kind, parseConstituentType, operator) {
-            parseOptional(operator);
+            var start = scanner.getStartPos();
+            var hasLeadingOperator = parseOptional(operator);
             var type = parseConstituentType();
-            if (token() === operator) {
+            if (token() === operator || hasLeadingOperator) {
                 var types = [type];
                 while (parseOptional(operator)) {
                     types.push(parseConstituentType());
                 }
-                var node = createNode(kind, type.pos);
-                node.types = createNodeArray(types, type.pos);
+                var node = createNode(kind, start);
+                node.types = createNodeArray(types, start);
                 type = finishNode(node);
             }
             return type;
         }
         function parseIntersectionTypeOrHigher() {
-            return parseUnionOrIntersectionType(174, parseTypeOperatorOrHigher, 49);
+            return parseUnionOrIntersectionType(175, parseTypeOperatorOrHigher, 49);
         }
         function parseUnionTypeOrHigher() {
-            return parseUnionOrIntersectionType(173, parseIntersectionTypeOrHigher, 50);
+            return parseUnionOrIntersectionType(174, parseIntersectionTypeOrHigher, 50);
         }
         function isStartOfFunctionType() {
             if (token() === 28) {
@@ -15495,7 +15721,7 @@ var ts;
             if (ts.isModifierKind(token())) {
                 parseModifiers();
             }
-            if (isIdentifier() || token() === 100) {
+            if (isIdentifier() || token() === 101) {
                 nextToken();
                 return true;
             }
@@ -15513,7 +15739,7 @@ var ts;
             }
             if (skipParameterStart()) {
                 if (token() === 57 || token() === 27 ||
-                    token() === 56 || token() === 59) {
+                    token() === 56 || token() === 60) {
                     return true;
                 }
                 if (token() === 21) {
@@ -15529,7 +15755,7 @@ var ts;
             var typePredicateVariable = isIdentifier() && tryParse(parseTypePredicatePrefix);
             var type = parseType();
             if (typePredicateVariable) {
-                var node = createNode(163, typePredicateVariable.pos);
+                var node = createNode(164, typePredicateVariable.pos);
                 node.parameterName = typePredicateVariable;
                 node.type = type;
                 return finishNode(node);
@@ -15540,7 +15766,7 @@ var ts;
         }
         function parseTypePredicatePrefix() {
             var id = parseIdentifier();
-            if (token() === 128 && !scanner.hasPrecedingLineBreak()) {
+            if (token() === 129 && !scanner.hasPrecedingLineBreak()) {
                 nextToken();
                 return id;
             }
@@ -15549,12 +15775,12 @@ var ts;
             return doOutsideOfContext(20480, parseTypeWorker);
         }
         function parseTypeWorker(noConditionalTypes) {
-            if (isStartOfFunctionType() || token() === 95) {
+            if (isStartOfFunctionType() || token() === 96) {
                 return parseFunctionOrConstructorType();
             }
             var type = parseUnionTypeOrHigher();
-            if (!noConditionalTypes && !scanner.hasPrecedingLineBreak() && parseOptional(86)) {
-                var node = createNode(175, type.pos);
+            if (!noConditionalTypes && !scanner.hasPrecedingLineBreak() && parseOptional(87)) {
+                var node = createNode(176, type.pos);
                 node.checkType = type;
                 node.extendsType = parseTypeWorker(true);
                 parseExpected(56);
@@ -15570,11 +15796,11 @@ var ts;
         }
         function isStartOfLeftHandSideExpression() {
             switch (token()) {
-                case 100:
-                case 98:
-                case 96:
-                case 102:
-                case 87:
+                case 101:
+                case 99:
+                case 97:
+                case 103:
+                case 88:
                 case 8:
                 case 9:
                 case 10:
@@ -15583,14 +15809,14 @@ var ts;
                 case 20:
                 case 22:
                 case 18:
-                case 90:
-                case 76:
-                case 95:
+                case 91:
+                case 77:
+                case 96:
                 case 42:
-                case 64:
-                case 72:
+                case 65:
+                case 73:
                     return true;
-                case 92:
+                case 93:
                     return lookAhead(nextTokenIsOpenParenOrLessThanOrDot);
                 default:
                     return isIdentifier();
@@ -15605,14 +15831,14 @@ var ts;
                 case 39:
                 case 53:
                 case 52:
-                case 81:
-                case 104:
-                case 106:
+                case 82:
+                case 105:
+                case 107:
                 case 44:
                 case 45:
                 case 28:
-                case 122:
-                case 117:
+                case 123:
+                case 118:
                     return true;
                 default:
                     if (isBinaryOperator()) {
@@ -15623,8 +15849,8 @@ var ts;
         }
         function isStartOfExpressionStatement() {
             return token() !== 18 &&
-                token() !== 90 &&
-                token() !== 76 &&
+                token() !== 91 &&
+                token() !== 77 &&
                 token() !== 58 &&
                 isStartOfExpression();
         }
@@ -15644,7 +15870,7 @@ var ts;
             return expr;
         }
         function parseInitializer() {
-            return parseOptional(59) ? parseAssignmentExpressionOrHigher() : undefined;
+            return parseOptional(60) ? parseAssignmentExpressionOrHigher() : undefined;
         }
         function parseAssignmentExpressionOrHigher() {
             if (isYieldExpression()) {
@@ -15655,7 +15881,7 @@ var ts;
                 return arrowExpression;
             }
             var expr = parseBinaryExpressionOrHigher(0);
-            if (expr.kind === 72 && token() === 37) {
+            if (expr.kind === 73 && token() === 37) {
                 return parseSimpleArrowFunctionExpression(expr);
             }
             if (ts.isLeftHandSideExpression(expr) && ts.isAssignmentOperator(reScanGreaterToken())) {
@@ -15664,7 +15890,7 @@ var ts;
             return parseConditionalExpressionRest(expr);
         }
         function isYieldExpression() {
-            if (token() === 117) {
+            if (token() === 118) {
                 if (inYieldContext()) {
                     return true;
                 }
@@ -15677,7 +15903,7 @@ var ts;
             return !scanner.hasPrecedingLineBreak() && isIdentifier();
         }
         function parseYieldExpression() {
-            var node = createNode(207);
+            var node = createNode(208);
             nextToken();
             if (!scanner.hasPrecedingLineBreak() &&
                 (token() === 40 || isStartOfExpression())) {
@@ -15693,13 +15919,13 @@ var ts;
             ts.Debug.assert(token() === 37, "parseSimpleArrowFunctionExpression should only have been called if we had a =>");
             var node;
             if (asyncModifier) {
-                node = createNode(197, asyncModifier.pos);
+                node = createNode(198, asyncModifier.pos);
                 node.modifiers = asyncModifier;
             }
             else {
-                node = createNode(197, identifier.pos);
+                node = createNode(198, identifier.pos);
             }
-            var parameter = createNode(151, identifier.pos);
+            var parameter = createNode(152, identifier.pos);
             parameter.name = identifier;
             finishNode(parameter);
             node.parameters = createNodeArray([parameter], parameter.pos, parameter.end);
@@ -15727,7 +15953,7 @@ var ts;
             return finishNode(arrowFunction);
         }
         function isParenthesizedArrowFunctionExpression() {
-            if (token() === 20 || token() === 28 || token() === 121) {
+            if (token() === 20 || token() === 28 || token() === 122) {
                 return lookAhead(isParenthesizedArrowFunctionExpressionWorker);
             }
             if (token() === 37) {
@@ -15736,7 +15962,7 @@ var ts;
             return 0;
         }
         function isParenthesizedArrowFunctionExpressionWorker() {
-            if (token() === 121) {
+            if (token() === 122) {
                 nextToken();
                 if (scanner.hasPrecedingLineBreak()) {
                     return 0;
@@ -15765,10 +15991,10 @@ var ts;
                 if (second === 25) {
                     return 1;
                 }
-                if (ts.isModifierKind(second) && second !== 121 && lookAhead(nextTokenIsIdentifier)) {
+                if (ts.isModifierKind(second) && second !== 122 && lookAhead(nextTokenIsIdentifier)) {
                     return 1;
                 }
-                if (!isIdentifier() && second !== 100) {
+                if (!isIdentifier() && second !== 101) {
                     return 0;
                 }
                 switch (nextToken()) {
@@ -15776,12 +16002,12 @@ var ts;
                         return 1;
                     case 56:
                         nextToken();
-                        if (token() === 57 || token() === 27 || token() === 59 || token() === 21) {
+                        if (token() === 57 || token() === 27 || token() === 60 || token() === 21) {
                             return 1;
                         }
                         return 0;
                     case 27:
-                    case 59:
+                    case 60:
                     case 21:
                         return 2;
                 }
@@ -15795,10 +16021,10 @@ var ts;
                 if (sourceFile.languageVariant === 1) {
                     var isArrowFunctionInJsx = lookAhead(function () {
                         var third = nextToken();
-                        if (third === 86) {
+                        if (third === 87) {
                             var fourth = nextToken();
                             switch (fourth) {
-                                case 59:
+                                case 60:
                                 case 30:
                                     return false;
                                 default:
@@ -15822,7 +16048,7 @@ var ts;
             return parseParenthesizedArrowFunctionExpressionHead(false);
         }
         function tryParseAsyncSimpleArrowFunctionExpression() {
-            if (token() === 121) {
+            if (token() === 122) {
                 if (lookAhead(isUnParenthesizedAsyncArrowFunctionWorker) === 1) {
                     var asyncModifier = parseModifiersForArrowFunction();
                     var expr = parseBinaryExpressionOrHigher(0);
@@ -15832,26 +16058,27 @@ var ts;
             return undefined;
         }
         function isUnParenthesizedAsyncArrowFunctionWorker() {
-            if (token() === 121) {
+            if (token() === 122) {
                 nextToken();
                 if (scanner.hasPrecedingLineBreak() || token() === 37) {
                     return 0;
                 }
                 var expr = parseBinaryExpressionOrHigher(0);
-                if (!scanner.hasPrecedingLineBreak() && expr.kind === 72 && token() === 37) {
+                if (!scanner.hasPrecedingLineBreak() && expr.kind === 73 && token() === 37) {
                     return 1;
                 }
             }
             return 0;
         }
         function parseParenthesizedArrowFunctionExpressionHead(allowAmbiguity) {
-            var node = createNodeWithJSDoc(197);
+            var node = createNodeWithJSDoc(198);
             node.modifiers = parseModifiersForArrowFunction();
             var isAsync = ts.hasModifier(node, 256) ? 2 : 0;
             if (!fillSignature(57, isAsync, node) && !allowAmbiguity) {
                 return undefined;
             }
-            if (!allowAmbiguity && token() !== 37 && token() !== 18) {
+            var hasJSDocFunctionType = node.type && ts.isJSDocFunctionType(node.type);
+            if (!allowAmbiguity && token() !== 37 && (hasJSDocFunctionType || token() !== 18)) {
                 return undefined;
             }
             return node;
@@ -15861,8 +16088,8 @@ var ts;
                 return parseFunctionBlock(isAsync ? 2 : 0);
             }
             if (token() !== 26 &&
-                token() !== 90 &&
-                token() !== 76 &&
+                token() !== 91 &&
+                token() !== 77 &&
                 isStartOfStatement() &&
                 !isStartOfExpressionStatement()) {
                 return parseFunctionBlock(16 | (isAsync ? 2 : 0));
@@ -15876,14 +16103,14 @@ var ts;
             if (!questionToken) {
                 return leftOperand;
             }
-            var node = createNode(205, leftOperand.pos);
+            var node = createNode(206, leftOperand.pos);
             node.condition = leftOperand;
             node.questionToken = questionToken;
             node.whenTrue = doOutsideOfContext(disallowInAndDecoratorContext, parseAssignmentExpressionOrHigher);
             node.colonToken = parseExpectedToken(57);
             node.whenFalse = ts.nodeIsPresent(node.colonToken)
                 ? parseAssignmentExpressionOrHigher()
-                : createMissingNode(72, false, ts.Diagnostics._0_expected, ts.tokenToString(57));
+                : createMissingNode(73, false, ts.Diagnostics._0_expected, ts.tokenToString(57));
             return finishNode(node);
         }
         function parseBinaryExpressionOrHigher(precedence) {
@@ -15891,7 +16118,7 @@ var ts;
             return parseBinaryExpressionRest(precedence, leftOperand);
         }
         function isInOrOfKeyword(t) {
-            return t === 93 || t === 147;
+            return t === 94 || t === 148;
         }
         function parseBinaryExpressionRest(precedence, leftOperand) {
             while (true) {
@@ -15903,10 +16130,10 @@ var ts;
                 if (!consumeCurrentOperator) {
                     break;
                 }
-                if (token() === 93 && inDisallowInContext()) {
+                if (token() === 94 && inDisallowInContext()) {
                     break;
                 }
-                if (token() === 119) {
+                if (token() === 120) {
                     if (scanner.hasPrecedingLineBreak()) {
                         break;
                     }
@@ -15922,51 +16149,51 @@ var ts;
             return leftOperand;
         }
         function isBinaryOperator() {
-            if (inDisallowInContext() && token() === 93) {
+            if (inDisallowInContext() && token() === 94) {
                 return false;
             }
             return ts.getBinaryOperatorPrecedence(token()) > 0;
         }
         function makeBinaryExpression(left, operatorToken, right) {
-            var node = createNode(204, left.pos);
+            var node = createNode(205, left.pos);
             node.left = left;
             node.operatorToken = operatorToken;
             node.right = right;
             return finishNode(node);
         }
         function makeAsExpression(left, right) {
-            var node = createNode(212, left.pos);
+            var node = createNode(213, left.pos);
             node.expression = left;
             node.type = right;
             return finishNode(node);
         }
         function parsePrefixUnaryExpression() {
-            var node = createNode(202);
+            var node = createNode(203);
             node.operator = token();
             nextToken();
             node.operand = parseSimpleUnaryExpression();
             return finishNode(node);
         }
         function parseDeleteExpression() {
-            var node = createNode(198);
-            nextToken();
-            node.expression = parseSimpleUnaryExpression();
-            return finishNode(node);
-        }
-        function parseTypeOfExpression() {
             var node = createNode(199);
             nextToken();
             node.expression = parseSimpleUnaryExpression();
             return finishNode(node);
         }
-        function parseVoidExpression() {
+        function parseTypeOfExpression() {
             var node = createNode(200);
             nextToken();
             node.expression = parseSimpleUnaryExpression();
             return finishNode(node);
         }
+        function parseVoidExpression() {
+            var node = createNode(201);
+            nextToken();
+            node.expression = parseSimpleUnaryExpression();
+            return finishNode(node);
+        }
         function isAwaitExpression() {
-            if (token() === 122) {
+            if (token() === 123) {
                 if (inAwaitContext()) {
                     return true;
                 }
@@ -15975,7 +16202,7 @@ var ts;
             return false;
         }
         function parseAwaitExpression() {
-            var node = createNode(201);
+            var node = createNode(202);
             nextToken();
             node.expression = parseSimpleUnaryExpression();
             return finishNode(node);
@@ -15992,7 +16219,7 @@ var ts;
             if (token() === 41) {
                 var pos = ts.skipTrivia(sourceText, simpleUnaryExpression.pos);
                 var end = simpleUnaryExpression.end;
-                if (simpleUnaryExpression.kind === 194) {
+                if (simpleUnaryExpression.kind === 195) {
                     parseErrorAt(pos, end, ts.Diagnostics.A_type_assertion_expression_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Consider_enclosing_the_expression_in_parentheses);
                 }
                 else {
@@ -16008,15 +16235,15 @@ var ts;
                 case 53:
                 case 52:
                     return parsePrefixUnaryExpression();
-                case 81:
+                case 82:
                     return parseDeleteExpression();
-                case 104:
+                case 105:
                     return parseTypeOfExpression();
-                case 106:
+                case 107:
                     return parseVoidExpression();
                 case 28:
                     return parseTypeAssertion();
-                case 122:
+                case 123:
                     if (isAwaitExpression()) {
                         return parseAwaitExpression();
                     }
@@ -16030,10 +16257,10 @@ var ts;
                 case 39:
                 case 53:
                 case 52:
-                case 81:
-                case 104:
-                case 106:
-                case 122:
+                case 82:
+                case 105:
+                case 107:
+                case 123:
                     return false;
                 case 28:
                     if (sourceFile.languageVariant !== 1) {
@@ -16045,7 +16272,7 @@ var ts;
         }
         function parseUpdateExpression() {
             if (token() === 44 || token() === 45) {
-                var node = createNode(202);
+                var node = createNode(203);
                 node.operator = token();
                 nextToken();
                 node.operand = parseLeftHandSideExpressionOrHigher();
@@ -16057,7 +16284,7 @@ var ts;
             var expression = parseLeftHandSideExpressionOrHigher();
             ts.Debug.assert(ts.isLeftHandSideExpression(expression));
             if ((token() === 44 || token() === 45) && !scanner.hasPrecedingLineBreak()) {
-                var node = createNode(203, expression.pos);
+                var node = createNode(204, expression.pos);
                 node.operand = expression;
                 node.operator = token();
                 nextToken();
@@ -16067,7 +16294,7 @@ var ts;
         }
         function parseLeftHandSideExpressionOrHigher() {
             var expression;
-            if (token() === 92) {
+            if (token() === 93) {
                 if (lookAhead(nextTokenIsOpenParenOrLessThan)) {
                     sourceFile.flags |= 524288;
                     expression = parseTokenNode();
@@ -16076,8 +16303,8 @@ var ts;
                     var fullStart = scanner.getStartPos();
                     nextToken();
                     nextToken();
-                    var node = createNode(214, fullStart);
-                    node.keywordToken = 92;
+                    var node = createNode(215, fullStart);
+                    node.keywordToken = 93;
                     node.name = parseIdentifierName();
                     expression = finishNode(node);
                     sourceFile.flags |= 1048576;
@@ -16087,7 +16314,7 @@ var ts;
                 }
             }
             else {
-                expression = token() === 98 ? parseSuperExpression() : parseMemberExpressionOrHigher();
+                expression = token() === 99 ? parseSuperExpression() : parseMemberExpressionOrHigher();
             }
             return parseCallExpressionRest(expression);
         }
@@ -16097,10 +16324,17 @@ var ts;
         }
         function parseSuperExpression() {
             var expression = parseTokenNode();
+            if (token() === 28) {
+                var startPos = getNodePos();
+                var typeArguments = tryParse(parseTypeArgumentsInExpression);
+                if (typeArguments !== undefined) {
+                    parseErrorAt(startPos, getNodePos(), ts.Diagnostics.super_may_not_use_type_arguments);
+                }
+            }
             if (token() === 20 || token() === 24 || token() === 22) {
                 return expression;
             }
-            var node = createNode(189, expression.pos);
+            var node = createNode(190, expression.pos);
             node.expression = expression;
             parseExpectedToken(24, ts.Diagnostics.super_must_be_followed_by_an_argument_list_or_member_access);
             node.name = parseRightSideOfDot(true);
@@ -16109,8 +16343,8 @@ var ts;
         function parseJsxElementOrSelfClosingElementOrFragment(inExpressionContext) {
             var opening = parseJsxOpeningOrSelfClosingElementOrOpeningFragment(inExpressionContext);
             var result;
-            if (opening.kind === 262) {
-                var node = createNode(260, opening.pos);
+            if (opening.kind === 263) {
+                var node = createNode(261, opening.pos);
                 node.openingElement = opening;
                 node.children = parseJsxChildren(node.openingElement);
                 node.closingElement = parseJsxClosingElement(inExpressionContext);
@@ -16119,26 +16353,26 @@ var ts;
                 }
                 result = finishNode(node);
             }
-            else if (opening.kind === 265) {
-                var node = createNode(264, opening.pos);
+            else if (opening.kind === 266) {
+                var node = createNode(265, opening.pos);
                 node.openingFragment = opening;
                 node.children = parseJsxChildren(node.openingFragment);
                 node.closingFragment = parseJsxClosingFragment(inExpressionContext);
                 result = finishNode(node);
             }
             else {
-                ts.Debug.assert(opening.kind === 261);
+                ts.Debug.assert(opening.kind === 262);
                 result = opening;
             }
             if (inExpressionContext && token() === 28) {
                 var invalidElement = tryParse(function () { return parseJsxElementOrSelfClosingElementOrFragment(true); });
                 if (invalidElement) {
                     parseErrorAtCurrentToken(ts.Diagnostics.JSX_expressions_must_have_one_parent_element);
-                    var badNode = createNode(204, result.pos);
+                    var badNode = createNode(205, result.pos);
                     badNode.end = invalidElement.end;
                     badNode.left = result;
                     badNode.right = invalidElement;
-                    badNode.operatorToken = createMissingNode(27, false, undefined);
+                    badNode.operatorToken = createMissingNode(27, false);
                     badNode.operatorToken.pos = badNode.operatorToken.end = badNode.right.pos;
                     return badNode;
                 }
@@ -16147,7 +16381,8 @@ var ts;
         }
         function parseJsxText() {
             var node = createNode(11);
-            node.containsOnlyWhiteSpaces = currentToken === 12;
+            node.text = scanner.getTokenValue();
+            node.containsOnlyTriviaWhiteSpaces = currentToken === 12;
             currentToken = scanner.scanJsxToken();
             return finishNode(node);
         }
@@ -16190,7 +16425,7 @@ var ts;
             return createNodeArray(list, listPos);
         }
         function parseJsxAttributes() {
-            var jsxAttributes = createNode(268);
+            var jsxAttributes = createNode(269);
             jsxAttributes.properties = parseList(13, parseJsxAttribute);
             return finishNode(jsxAttributes);
         }
@@ -16198,7 +16433,7 @@ var ts;
             var fullStart = scanner.getStartPos();
             parseExpected(28);
             if (token() === 30) {
-                var node_1 = createNode(265, fullStart);
+                var node_1 = createNode(266, fullStart);
                 scanJsxText();
                 return finishNode(node_1);
             }
@@ -16207,7 +16442,7 @@ var ts;
             var attributes = parseJsxAttributes();
             var node;
             if (token() === 30) {
-                node = createNode(262, fullStart);
+                node = createNode(263, fullStart);
                 scanJsxText();
             }
             else {
@@ -16219,7 +16454,7 @@ var ts;
                     parseExpected(30, undefined, false);
                     scanJsxText();
                 }
-                node = createNode(261, fullStart);
+                node = createNode(262, fullStart);
             }
             node.tagName = tagName;
             node.typeArguments = typeArguments;
@@ -16228,10 +16463,10 @@ var ts;
         }
         function parseJsxElementName() {
             scanJsxIdentifier();
-            var expression = token() === 100 ?
+            var expression = token() === 101 ?
                 parseTokenNode() : parseIdentifierName();
             while (parseOptional(24)) {
-                var propertyAccess = createNode(189, expression.pos);
+                var propertyAccess = createNode(190, expression.pos);
                 propertyAccess.expression = expression;
                 propertyAccess.name = parseRightSideOfDot(true);
                 expression = finishNode(propertyAccess);
@@ -16239,20 +16474,21 @@ var ts;
             return expression;
         }
         function parseJsxExpression(inExpressionContext) {
-            var node = createNode(270);
+            var node = createNode(271);
             if (!parseExpected(18)) {
                 return undefined;
             }
             if (token() !== 19) {
                 node.dotDotDotToken = parseOptionalToken(25);
-                node.expression = parseAssignmentExpressionOrHigher();
+                node.expression = parseExpression();
             }
             if (inExpressionContext) {
                 parseExpected(19);
             }
             else {
-                parseExpected(19, undefined, false);
-                scanJsxText();
+                if (parseExpected(19, undefined, false)) {
+                    scanJsxText();
+                }
             }
             return finishNode(node);
         }
@@ -16261,9 +16497,9 @@ var ts;
                 return parseJsxSpreadAttribute();
             }
             scanJsxIdentifier();
-            var node = createNode(267);
+            var node = createNode(268);
             node.name = parseIdentifierName();
-            if (token() === 59) {
+            if (token() === 60) {
                 switch (scanJsxAttributeValue()) {
                     case 10:
                         node.initializer = parseLiteralNode();
@@ -16276,7 +16512,7 @@ var ts;
             return finishNode(node);
         }
         function parseJsxSpreadAttribute() {
-            var node = createNode(269);
+            var node = createNode(270);
             parseExpected(18);
             parseExpected(25);
             node.expression = parseExpression();
@@ -16284,7 +16520,7 @@ var ts;
             return finishNode(node);
         }
         function parseJsxClosingElement(inExpressionContext) {
-            var node = createNode(263);
+            var node = createNode(264);
             parseExpected(29);
             node.tagName = parseJsxElementName();
             if (inExpressionContext) {
@@ -16297,7 +16533,7 @@ var ts;
             return finishNode(node);
         }
         function parseJsxClosingFragment(inExpressionContext) {
-            var node = createNode(266);
+            var node = createNode(267);
             parseExpected(29);
             if (ts.tokenIsIdentifierOrKeyword(token())) {
                 parseErrorAtRange(parseJsxElementName(), ts.Diagnostics.Expected_corresponding_closing_tag_for_JSX_fragment);
@@ -16312,7 +16548,7 @@ var ts;
             return finishNode(node);
         }
         function parseTypeAssertion() {
-            var node = createNode(194);
+            var node = createNode(195);
             parseExpected(28);
             node.type = parseType();
             parseExpected(30);
@@ -16323,7 +16559,7 @@ var ts;
             while (true) {
                 var dotToken = parseOptionalToken(24);
                 if (dotToken) {
-                    var propertyAccess = createNode(189, expression.pos);
+                    var propertyAccess = createNode(190, expression.pos);
                     propertyAccess.expression = expression;
                     propertyAccess.name = parseRightSideOfDot(true);
                     expression = finishNode(propertyAccess);
@@ -16331,16 +16567,16 @@ var ts;
                 }
                 if (token() === 52 && !scanner.hasPrecedingLineBreak()) {
                     nextToken();
-                    var nonNullExpression = createNode(213, expression.pos);
+                    var nonNullExpression = createNode(214, expression.pos);
                     nonNullExpression.expression = expression;
                     expression = finishNode(nonNullExpression);
                     continue;
                 }
                 if (!inDecoratorContext() && parseOptional(22)) {
-                    var indexedAccess = createNode(190, expression.pos);
+                    var indexedAccess = createNode(191, expression.pos);
                     indexedAccess.expression = expression;
                     if (token() === 23) {
-                        indexedAccess.argumentExpression = createMissingNode(72, true, ts.Diagnostics.An_element_access_expression_should_take_an_argument);
+                        indexedAccess.argumentExpression = createMissingNode(73, true, ts.Diagnostics.An_element_access_expression_should_take_an_argument);
                     }
                     else {
                         var argument = allowInAnd(parseExpression);
@@ -16364,7 +16600,7 @@ var ts;
             return token() === 14 || token() === 15;
         }
         function parseTaggedTemplateRest(tag, typeArguments) {
-            var tagExpression = createNode(193, tag.pos);
+            var tagExpression = createNode(194, tag.pos);
             tagExpression.tag = tag;
             tagExpression.typeArguments = typeArguments;
             tagExpression.template = token() === 14
@@ -16384,7 +16620,7 @@ var ts;
                         expression = parseTaggedTemplateRest(expression, typeArguments);
                         continue;
                     }
-                    var callExpr = createNode(191, expression.pos);
+                    var callExpr = createNode(192, expression.pos);
                     callExpr.expression = expression;
                     callExpr.typeArguments = typeArguments;
                     callExpr.arguments = parseArgumentList();
@@ -16392,7 +16628,7 @@ var ts;
                     continue;
                 }
                 else if (token() === 20) {
-                    var callExpr = createNode(191, expression.pos);
+                    var callExpr = createNode(192, expression.pos);
                     callExpr.expression = expression;
                     callExpr.arguments = parseArgumentList();
                     expression = finishNode(callExpr);
@@ -16456,11 +16692,11 @@ var ts;
                 case 10:
                 case 14:
                     return parseLiteralNode();
-                case 100:
-                case 98:
-                case 96:
-                case 102:
-                case 87:
+                case 101:
+                case 99:
+                case 97:
+                case 103:
+                case 88:
                     return parseTokenNode();
                 case 20:
                     return parseParenthesizedExpression();
@@ -16468,19 +16704,19 @@ var ts;
                     return parseArrayLiteralExpression();
                 case 18:
                     return parseObjectLiteralExpression();
-                case 121:
+                case 122:
                     if (!lookAhead(nextTokenIsFunctionKeywordOnSameLine)) {
                         break;
                     }
                     return parseFunctionExpression();
-                case 76:
+                case 77:
                     return parseClassExpression();
-                case 90:
+                case 91:
                     return parseFunctionExpression();
-                case 95:
+                case 96:
                     return parseNewExpressionOrNewDotTarget();
                 case 42:
-                case 64:
+                case 65:
                     if (reScanSlashToken() === 13) {
                         return parseLiteralNode();
                     }
@@ -16491,28 +16727,28 @@ var ts;
             return parseIdentifier(ts.Diagnostics.Expression_expected);
         }
         function parseParenthesizedExpression() {
-            var node = createNodeWithJSDoc(195);
+            var node = createNodeWithJSDoc(196);
             parseExpected(20);
             node.expression = allowInAnd(parseExpression);
             parseExpected(21);
             return finishNode(node);
         }
         function parseSpreadElement() {
-            var node = createNode(208);
+            var node = createNode(209);
             parseExpected(25);
             node.expression = parseAssignmentExpressionOrHigher();
             return finishNode(node);
         }
         function parseArgumentOrArrayLiteralElement() {
             return token() === 25 ? parseSpreadElement() :
-                token() === 27 ? createNode(210) :
+                token() === 27 ? createNode(211) :
                     parseAssignmentExpressionOrHigher();
         }
         function parseArgumentExpression() {
             return doOutsideOfContext(disallowInAndDecoratorContext, parseArgumentOrArrayLiteralElement);
         }
         function parseArrayLiteralExpression() {
-            var node = createNode(187);
+            var node = createNode(188);
             parseExpected(22);
             if (scanner.hasPrecedingLineBreak()) {
                 node.multiLine = true;
@@ -16524,18 +16760,18 @@ var ts;
         function parseObjectLiteralElement() {
             var node = createNodeWithJSDoc(0);
             if (parseOptionalToken(25)) {
-                node.kind = 277;
+                node.kind = 278;
                 node.expression = parseAssignmentExpressionOrHigher();
                 return finishNode(node);
             }
             node.decorators = parseDecorators();
             node.modifiers = parseModifiers();
-            if (parseContextualModifier(126)) {
-                return parseAccessorDeclaration(node, 158);
-            }
-            if (parseContextualModifier(137)) {
+            if (parseContextualModifier(127)) {
                 return parseAccessorDeclaration(node, 159);
             }
+            if (parseContextualModifier(138)) {
+                return parseAccessorDeclaration(node, 160);
+            }
             var asteriskToken = parseOptionalToken(40);
             var tokenIsIdentifier = isIdentifier();
             node.name = parsePropertyName();
@@ -16546,22 +16782,22 @@ var ts;
             }
             var isShorthandPropertyAssignment = tokenIsIdentifier && (token() !== 57);
             if (isShorthandPropertyAssignment) {
-                node.kind = 276;
-                var equalsToken = parseOptionalToken(59);
+                node.kind = 277;
+                var equalsToken = parseOptionalToken(60);
                 if (equalsToken) {
                     node.equalsToken = equalsToken;
                     node.objectAssignmentInitializer = allowInAnd(parseAssignmentExpressionOrHigher);
                 }
             }
             else {
-                node.kind = 275;
+                node.kind = 276;
                 parseExpected(57);
                 node.initializer = allowInAnd(parseAssignmentExpressionOrHigher);
             }
             return finishNode(node);
         }
         function parseObjectLiteralExpression() {
-            var node = createNode(188);
+            var node = createNode(189);
             parseExpected(18);
             if (scanner.hasPrecedingLineBreak()) {
                 node.multiLine = true;
@@ -16575,9 +16811,9 @@ var ts;
             if (saveDecoratorContext) {
                 setDecoratorContext(false);
             }
-            var node = createNodeWithJSDoc(196);
+            var node = createNodeWithJSDoc(197);
             node.modifiers = parseModifiers();
-            parseExpected(90);
+            parseExpected(91);
             node.asteriskToken = parseOptionalToken(40);
             var isGenerator = node.asteriskToken ? 1 : 0;
             var isAsync = ts.hasModifier(node, 256) ? 2 : 0;
@@ -16598,10 +16834,10 @@ var ts;
         }
         function parseNewExpressionOrNewDotTarget() {
             var fullStart = scanner.getStartPos();
-            parseExpected(95);
+            parseExpected(96);
             if (parseOptional(24)) {
-                var node_2 = createNode(214, fullStart);
-                node_2.keywordToken = 95;
+                var node_2 = createNode(215, fullStart);
+                node_2.keywordToken = 96;
                 node_2.name = parseIdentifierName();
                 return finishNode(node_2);
             }
@@ -16617,7 +16853,7 @@ var ts;
                 }
                 break;
             }
-            var node = createNode(192, fullStart);
+            var node = createNode(193, fullStart);
             node.expression = expression;
             node.typeArguments = typeArguments;
             if (node.typeArguments || token() === 20) {
@@ -16626,7 +16862,7 @@ var ts;
             return finishNode(node);
         }
         function parseBlock(ignoreMissingOpenBrace, diagnosticMessage) {
-            var node = createNode(218);
+            var node = createNode(219);
             if (parseExpected(18, diagnosticMessage) || ignoreMissingOpenBrace) {
                 if (scanner.hasPrecedingLineBreak()) {
                     node.multiLine = true;
@@ -16657,25 +16893,25 @@ var ts;
             return block;
         }
         function parseEmptyStatement() {
-            var node = createNode(220);
+            var node = createNode(221);
             parseExpected(26);
             return finishNode(node);
         }
         function parseIfStatement() {
-            var node = createNode(222);
-            parseExpected(91);
+            var node = createNode(223);
+            parseExpected(92);
             parseExpected(20);
             node.expression = allowInAnd(parseExpression);
             parseExpected(21);
             node.thenStatement = parseStatement();
-            node.elseStatement = parseOptional(83) ? parseStatement() : undefined;
+            node.elseStatement = parseOptional(84) ? parseStatement() : undefined;
             return finishNode(node);
         }
         function parseDoStatement() {
-            var node = createNode(223);
-            parseExpected(82);
+            var node = createNode(224);
+            parseExpected(83);
             node.statement = parseStatement();
-            parseExpected(107);
+            parseExpected(108);
             parseExpected(20);
             node.expression = allowInAnd(parseExpression);
             parseExpected(21);
@@ -16683,8 +16919,8 @@ var ts;
             return finishNode(node);
         }
         function parseWhileStatement() {
-            var node = createNode(224);
-            parseExpected(107);
+            var node = createNode(225);
+            parseExpected(108);
             parseExpected(20);
             node.expression = allowInAnd(parseExpression);
             parseExpected(21);
@@ -16693,12 +16929,12 @@ var ts;
         }
         function parseForOrForInOrForOfStatement() {
             var pos = getNodePos();
-            parseExpected(89);
-            var awaitToken = parseOptionalToken(122);
+            parseExpected(90);
+            var awaitToken = parseOptionalToken(123);
             parseExpected(20);
             var initializer;
             if (token() !== 26) {
-                if (token() === 105 || token() === 111 || token() === 77) {
+                if (token() === 106 || token() === 112 || token() === 78) {
                     initializer = parseVariableDeclarationList(true);
                 }
                 else {
@@ -16706,23 +16942,23 @@ var ts;
                 }
             }
             var forOrForInOrForOfStatement;
-            if (awaitToken ? parseExpected(147) : parseOptional(147)) {
-                var forOfStatement = createNode(227, pos);
+            if (awaitToken ? parseExpected(148) : parseOptional(148)) {
+                var forOfStatement = createNode(228, pos);
                 forOfStatement.awaitModifier = awaitToken;
                 forOfStatement.initializer = initializer;
                 forOfStatement.expression = allowInAnd(parseAssignmentExpressionOrHigher);
                 parseExpected(21);
                 forOrForInOrForOfStatement = forOfStatement;
             }
-            else if (parseOptional(93)) {
-                var forInStatement = createNode(226, pos);
+            else if (parseOptional(94)) {
+                var forInStatement = createNode(227, pos);
                 forInStatement.initializer = initializer;
                 forInStatement.expression = allowInAnd(parseExpression);
                 parseExpected(21);
                 forOrForInOrForOfStatement = forInStatement;
             }
             else {
-                var forStatement = createNode(225, pos);
+                var forStatement = createNode(226, pos);
                 forStatement.initializer = initializer;
                 parseExpected(26);
                 if (token() !== 26 && token() !== 21) {
@@ -16740,7 +16976,7 @@ var ts;
         }
         function parseBreakOrContinueStatement(kind) {
             var node = createNode(kind);
-            parseExpected(kind === 229 ? 73 : 78);
+            parseExpected(kind === 230 ? 74 : 79);
             if (!canParseSemicolon()) {
                 node.label = parseIdentifier();
             }
@@ -16748,8 +16984,8 @@ var ts;
             return finishNode(node);
         }
         function parseReturnStatement() {
-            var node = createNode(230);
-            parseExpected(97);
+            var node = createNode(231);
+            parseExpected(98);
             if (!canParseSemicolon()) {
                 node.expression = allowInAnd(parseExpression);
             }
@@ -16757,8 +16993,8 @@ var ts;
             return finishNode(node);
         }
         function parseWithStatement() {
-            var node = createNode(231);
-            parseExpected(108);
+            var node = createNode(232);
+            parseExpected(109);
             parseExpected(20);
             node.expression = allowInAnd(parseExpression);
             parseExpected(21);
@@ -16766,30 +17002,30 @@ var ts;
             return finishNode(node);
         }
         function parseCaseClause() {
-            var node = createNode(271);
-            parseExpected(74);
+            var node = createNode(272);
+            parseExpected(75);
             node.expression = allowInAnd(parseExpression);
             parseExpected(57);
             node.statements = parseList(3, parseStatement);
             return finishNode(node);
         }
         function parseDefaultClause() {
-            var node = createNode(272);
-            parseExpected(80);
+            var node = createNode(273);
+            parseExpected(81);
             parseExpected(57);
             node.statements = parseList(3, parseStatement);
             return finishNode(node);
         }
         function parseCaseOrDefaultClause() {
-            return token() === 74 ? parseCaseClause() : parseDefaultClause();
+            return token() === 75 ? parseCaseClause() : parseDefaultClause();
         }
         function parseSwitchStatement() {
-            var node = createNode(232);
-            parseExpected(99);
+            var node = createNode(233);
+            parseExpected(100);
             parseExpected(20);
             node.expression = allowInAnd(parseExpression);
             parseExpected(21);
-            var caseBlock = createNode(246);
+            var caseBlock = createNode(247);
             parseExpected(18);
             caseBlock.clauses = parseList(2, parseCaseOrDefaultClause);
             parseExpected(19);
@@ -16797,26 +17033,26 @@ var ts;
             return finishNode(node);
         }
         function parseThrowStatement() {
-            var node = createNode(234);
-            parseExpected(101);
+            var node = createNode(235);
+            parseExpected(102);
             node.expression = scanner.hasPrecedingLineBreak() ? undefined : allowInAnd(parseExpression);
             parseSemicolon();
             return finishNode(node);
         }
         function parseTryStatement() {
-            var node = createNode(235);
-            parseExpected(103);
+            var node = createNode(236);
+            parseExpected(104);
             node.tryBlock = parseBlock(false);
-            node.catchClause = token() === 75 ? parseCatchClause() : undefined;
-            if (!node.catchClause || token() === 88) {
-                parseExpected(88);
+            node.catchClause = token() === 76 ? parseCatchClause() : undefined;
+            if (!node.catchClause || token() === 89) {
+                parseExpected(89);
                 node.finallyBlock = parseBlock(false);
             }
             return finishNode(node);
         }
         function parseCatchClause() {
-            var result = createNode(274);
-            parseExpected(75);
+            var result = createNode(275);
+            parseExpected(76);
             if (parseOptional(20)) {
                 result.variableDeclaration = parseVariableDeclaration();
                 parseExpected(21);
@@ -16828,21 +17064,21 @@ var ts;
             return finishNode(result);
         }
         function parseDebuggerStatement() {
-            var node = createNode(236);
-            parseExpected(79);
+            var node = createNode(237);
+            parseExpected(80);
             parseSemicolon();
             return finishNode(node);
         }
         function parseExpressionOrLabeledStatement() {
             var node = createNodeWithJSDoc(0);
             var expression = allowInAnd(parseExpression);
-            if (expression.kind === 72 && parseOptional(57)) {
-                node.kind = 233;
+            if (expression.kind === 73 && parseOptional(57)) {
+                node.kind = 234;
                 node.label = expression;
                 node.statement = parseStatement();
             }
             else {
-                node.kind = 221;
+                node.kind = 222;
                 node.expression = expression;
                 parseSemicolon();
             }
@@ -16854,11 +17090,11 @@ var ts;
         }
         function nextTokenIsClassKeywordOnSameLine() {
             nextToken();
-            return token() === 76 && !scanner.hasPrecedingLineBreak();
+            return token() === 77 && !scanner.hasPrecedingLineBreak();
         }
         function nextTokenIsFunctionKeywordOnSameLine() {
             nextToken();
-            return token() === 90 && !scanner.hasPrecedingLineBreak();
+            return token() === 91 && !scanner.hasPrecedingLineBreak();
         }
         function nextTokenIsIdentifierOrKeywordOrLiteralOnSameLine() {
             nextToken();
@@ -16867,47 +17103,47 @@ var ts;
         function isDeclaration() {
             while (true) {
                 switch (token()) {
-                    case 105:
-                    case 111:
+                    case 106:
+                    case 112:
+                    case 78:
+                    case 91:
                     case 77:
-                    case 90:
-                    case 76:
-                    case 84:
+                    case 85:
                         return true;
-                    case 110:
-                    case 140:
+                    case 111:
+                    case 141:
                         return nextTokenIsIdentifierOnSameLine();
-                    case 130:
                     case 131:
+                    case 132:
                         return nextTokenIsIdentifierOrStringLiteralOnSameLine();
-                    case 118:
-                    case 121:
-                    case 125:
-                    case 113:
+                    case 119:
+                    case 122:
+                    case 126:
                     case 114:
                     case 115:
-                    case 133:
+                    case 116:
+                    case 134:
                         nextToken();
                         if (scanner.hasPrecedingLineBreak()) {
                             return false;
                         }
                         continue;
-                    case 145:
+                    case 146:
                         nextToken();
-                        return token() === 18 || token() === 72 || token() === 85;
-                    case 92:
+                        return token() === 18 || token() === 73 || token() === 86;
+                    case 93:
                         nextToken();
                         return token() === 10 || token() === 40 ||
                             token() === 18 || ts.tokenIsIdentifierOrKeyword(token());
-                    case 85:
+                    case 86:
                         nextToken();
-                        if (token() === 59 || token() === 40 ||
-                            token() === 18 || token() === 80 ||
-                            token() === 119) {
+                        if (token() === 60 || token() === 40 ||
+                            token() === 18 || token() === 81 ||
+                            token() === 120) {
                             return true;
                         }
                         continue;
-                    case 116:
+                    case 117:
                         nextToken();
                         continue;
                     default:
@@ -16923,44 +17159,44 @@ var ts;
                 case 58:
                 case 26:
                 case 18:
-                case 105:
-                case 111:
-                case 90:
-                case 76:
-                case 84:
+                case 106:
+                case 112:
                 case 91:
-                case 82:
-                case 107:
-                case 89:
-                case 78:
-                case 73:
-                case 97:
-                case 108:
-                case 99:
-                case 101:
-                case 103:
-                case 79:
-                case 75:
-                case 88:
-                    return true;
-                case 92:
-                    return isStartOfDeclaration() || lookAhead(nextTokenIsOpenParenOrLessThanOrDot);
                 case 77:
                 case 85:
+                case 92:
+                case 83:
+                case 108:
+                case 90:
+                case 79:
+                case 74:
+                case 98:
+                case 109:
+                case 100:
+                case 102:
+                case 104:
+                case 80:
+                case 76:
+                case 89:
+                    return true;
+                case 93:
+                    return isStartOfDeclaration() || lookAhead(nextTokenIsOpenParenOrLessThanOrDot);
+                case 78:
+                case 86:
                     return isStartOfDeclaration();
-                case 121:
-                case 125:
-                case 110:
-                case 130:
+                case 122:
+                case 126:
+                case 111:
                 case 131:
-                case 140:
-                case 145:
+                case 132:
+                case 141:
+                case 146:
                     return true;
-                case 115:
-                case 113:
-                case 114:
                 case 116:
-                case 133:
+                case 114:
+                case 115:
+                case 117:
+                case 134:
                     return isStartOfDeclaration() || !lookAhead(nextTokenIsIdentifierOrKeywordOnSameLine);
                 default:
                     return isStartOfExpression();
@@ -16979,62 +17215,62 @@ var ts;
                     return parseEmptyStatement();
                 case 18:
                     return parseBlock(false);
-                case 105:
-                    return parseVariableStatement(createNodeWithJSDoc(237));
-                case 111:
+                case 106:
+                    return parseVariableStatement(createNodeWithJSDoc(238));
+                case 112:
                     if (isLetDeclaration()) {
-                        return parseVariableStatement(createNodeWithJSDoc(237));
+                        return parseVariableStatement(createNodeWithJSDoc(238));
                     }
                     break;
-                case 90:
-                    return parseFunctionDeclaration(createNodeWithJSDoc(239));
-                case 76:
-                    return parseClassDeclaration(createNodeWithJSDoc(240));
                 case 91:
+                    return parseFunctionDeclaration(createNodeWithJSDoc(240));
+                case 77:
+                    return parseClassDeclaration(createNodeWithJSDoc(241));
+                case 92:
                     return parseIfStatement();
-                case 82:
+                case 83:
                     return parseDoStatement();
-                case 107:
-                    return parseWhileStatement();
-                case 89:
-                    return parseForOrForInOrForOfStatement();
-                case 78:
-                    return parseBreakOrContinueStatement(228);
-                case 73:
-                    return parseBreakOrContinueStatement(229);
-                case 97:
-                    return parseReturnStatement();
                 case 108:
-                    return parseWithStatement();
-                case 99:
-                    return parseSwitchStatement();
-                case 101:
-                    return parseThrowStatement();
-                case 103:
-                case 75:
-                case 88:
-                    return parseTryStatement();
+                    return parseWhileStatement();
+                case 90:
+                    return parseForOrForInOrForOfStatement();
                 case 79:
+                    return parseBreakOrContinueStatement(229);
+                case 74:
+                    return parseBreakOrContinueStatement(230);
+                case 98:
+                    return parseReturnStatement();
+                case 109:
+                    return parseWithStatement();
+                case 100:
+                    return parseSwitchStatement();
+                case 102:
+                    return parseThrowStatement();
+                case 104:
+                case 76:
+                case 89:
+                    return parseTryStatement();
+                case 80:
                     return parseDebuggerStatement();
                 case 58:
                     return parseDeclaration();
-                case 121:
-                case 110:
-                case 140:
-                case 130:
+                case 122:
+                case 111:
+                case 141:
                 case 131:
-                case 125:
-                case 77:
-                case 84:
+                case 132:
+                case 126:
+                case 78:
                 case 85:
-                case 92:
-                case 113:
+                case 86:
+                case 93:
                 case 114:
                 case 115:
-                case 118:
                 case 116:
-                case 133:
-                case 145:
+                case 119:
+                case 117:
+                case 134:
+                case 146:
                     if (isStartOfDeclaration()) {
                         return parseDeclaration();
                     }
@@ -17043,7 +17279,7 @@ var ts;
             return parseExpressionOrLabeledStatement();
         }
         function isDeclareModifier(modifier) {
-            return modifier.kind === 125;
+            return modifier.kind === 126;
         }
         function parseDeclaration() {
             var node = createNodeWithJSDoc(0);
@@ -17062,40 +17298,40 @@ var ts;
         }
         function parseDeclarationWorker(node) {
             switch (token()) {
-                case 105:
-                case 111:
-                case 77:
+                case 106:
+                case 112:
+                case 78:
                     return parseVariableStatement(node);
-                case 90:
+                case 91:
                     return parseFunctionDeclaration(node);
-                case 76:
+                case 77:
                     return parseClassDeclaration(node);
-                case 110:
+                case 111:
                     return parseInterfaceDeclaration(node);
-                case 140:
+                case 141:
                     return parseTypeAliasDeclaration(node);
-                case 84:
-                    return parseEnumDeclaration(node);
-                case 145:
-                case 130:
-                case 131:
-                    return parseModuleDeclaration(node);
-                case 92:
-                    return parseImportDeclarationOrImportEqualsDeclaration(node);
                 case 85:
+                    return parseEnumDeclaration(node);
+                case 146:
+                case 131:
+                case 132:
+                    return parseModuleDeclaration(node);
+                case 93:
+                    return parseImportDeclarationOrImportEqualsDeclaration(node);
+                case 86:
                     nextToken();
                     switch (token()) {
-                        case 80:
-                        case 59:
+                        case 81:
+                        case 60:
                             return parseExportAssignment(node);
-                        case 119:
+                        case 120:
                             return parseNamespaceExportDeclaration(node);
                         default:
                             return parseExportDeclaration(node);
                     }
                 default:
                     if (node.decorators || node.modifiers) {
-                        var missing = createMissingNode(258, true, ts.Diagnostics.Declaration_expected);
+                        var missing = createMissingNode(259, true, ts.Diagnostics.Declaration_expected);
                         missing.pos = node.pos;
                         missing.decorators = node.decorators;
                         missing.modifiers = node.modifiers;
@@ -17117,16 +17353,16 @@ var ts;
         }
         function parseArrayBindingElement() {
             if (token() === 27) {
-                return createNode(210);
+                return createNode(211);
             }
-            var node = createNode(186);
+            var node = createNode(187);
             node.dotDotDotToken = parseOptionalToken(25);
             node.name = parseIdentifierOrPattern();
             node.initializer = parseInitializer();
             return finishNode(node);
         }
         function parseObjectBindingElement() {
-            var node = createNode(186);
+            var node = createNode(187);
             node.dotDotDotToken = parseOptionalToken(25);
             var tokenIsIdentifier = isIdentifier();
             var propertyName = parsePropertyName();
@@ -17142,14 +17378,14 @@ var ts;
             return finishNode(node);
         }
         function parseObjectBindingPattern() {
-            var node = createNode(184);
+            var node = createNode(185);
             parseExpected(18);
             node.elements = parseDelimitedList(9, parseObjectBindingElement);
             parseExpected(19);
             return finishNode(node);
         }
         function parseArrayBindingPattern() {
-            var node = createNode(185);
+            var node = createNode(186);
             parseExpected(22);
             node.elements = parseDelimitedList(10, parseArrayBindingElement);
             parseExpected(23);
@@ -17171,9 +17407,9 @@ var ts;
             return parseVariableDeclaration(true);
         }
         function parseVariableDeclaration(allowExclamation) {
-            var node = createNode(237);
+            var node = createNode(238);
             node.name = parseIdentifierOrPattern();
-            if (allowExclamation && node.name.kind === 72 &&
+            if (allowExclamation && node.name.kind === 73 &&
                 token() === 52 && !scanner.hasPrecedingLineBreak()) {
                 node.exclamationToken = parseTokenNode();
             }
@@ -17184,21 +17420,21 @@ var ts;
             return finishNode(node);
         }
         function parseVariableDeclarationList(inForStatementInitializer) {
-            var node = createNode(238);
+            var node = createNode(239);
             switch (token()) {
-                case 105:
+                case 106:
                     break;
-                case 111:
+                case 112:
                     node.flags |= 1;
                     break;
-                case 77:
+                case 78:
                     node.flags |= 2;
                     break;
                 default:
                     ts.Debug.fail();
             }
             nextToken();
-            if (token() === 147 && lookAhead(canFollowContextualOfKeyword)) {
+            if (token() === 148 && lookAhead(canFollowContextualOfKeyword)) {
                 node.declarations = createMissingList();
             }
             else {
@@ -17213,14 +17449,14 @@ var ts;
             return nextTokenIsIdentifier() && nextToken() === 21;
         }
         function parseVariableStatement(node) {
-            node.kind = 219;
+            node.kind = 220;
             node.declarationList = parseVariableDeclarationList(false);
             parseSemicolon();
             return finishNode(node);
         }
         function parseFunctionDeclaration(node) {
-            node.kind = 239;
-            parseExpected(90);
+            node.kind = 240;
+            parseExpected(91);
             node.asteriskToken = parseOptionalToken(40);
             node.name = ts.hasModifier(node, 512) ? parseOptionalIdentifier() : parseIdentifier();
             var isGenerator = node.asteriskToken ? 1 : 0;
@@ -17229,15 +17465,29 @@ var ts;
             node.body = parseFunctionBlockOrSemicolon(isGenerator | isAsync, ts.Diagnostics.or_expected);
             return finishNode(node);
         }
-        function parseConstructorDeclaration(node) {
-            node.kind = 157;
-            parseExpected(124);
-            fillSignature(57, 0, node);
-            node.body = parseFunctionBlockOrSemicolon(0, ts.Diagnostics.or_expected);
-            return finishNode(node);
+        function parseConstructorName() {
+            if (token() === 125) {
+                return parseExpected(125);
+            }
+            if (token() === 10 && lookAhead(nextToken) === 20) {
+                return tryParse(function () {
+                    var literalNode = parseLiteralNode();
+                    return literalNode.text === "constructor" ? literalNode : undefined;
+                });
+            }
+        }
+        function tryParseConstructorDeclaration(node) {
+            return tryParse(function () {
+                if (parseConstructorName()) {
+                    node.kind = 158;
+                    fillSignature(57, 0, node);
+                    node.body = parseFunctionBlockOrSemicolon(0, ts.Diagnostics.or_expected);
+                    return finishNode(node);
+                }
+            });
         }
         function parseMethodDeclaration(node, asteriskToken, diagnosticMessage) {
-            node.kind = 156;
+            node.kind = 157;
             node.asteriskToken = asteriskToken;
             var isGenerator = asteriskToken ? 1 : 0;
             var isAsync = ts.hasModifier(node, 256) ? 2 : 0;
@@ -17246,7 +17496,7 @@ var ts;
             return finishNode(node);
         }
         function parsePropertyDeclaration(node) {
-            node.kind = 154;
+            node.kind = 155;
             if (!node.questionToken && token() === 52 && !scanner.hasPrecedingLineBreak()) {
                 node.exclamationToken = parseTokenNode();
             }
@@ -17296,7 +17546,7 @@ var ts;
                 return true;
             }
             if (idToken !== undefined) {
-                if (!ts.isKeyword(idToken) || idToken === 137 || idToken === 126) {
+                if (!ts.isKeyword(idToken) || idToken === 138 || idToken === 127) {
                     return true;
                 }
                 switch (token()) {
@@ -17304,7 +17554,7 @@ var ts;
                     case 28:
                     case 52:
                     case 57:
-                    case 59:
+                    case 60:
                     case 56:
                         return true;
                     default:
@@ -17321,7 +17571,7 @@ var ts;
                 if (!parseOptional(58)) {
                     break;
                 }
-                var decorator = createNode(152, decoratorStart);
+                var decorator = createNode(153, decoratorStart);
                 decorator.expression = doInDecoratorContext(parseLeftHandSideExpressionOrHigher);
                 finishNode(decorator);
                 (list || (list = [])).push(decorator);
@@ -17334,7 +17584,7 @@ var ts;
             while (true) {
                 var modifierStart = scanner.getStartPos();
                 var modifierKind = token();
-                if (token() === 77 && permitInvalidConstAsModifier) {
+                if (token() === 78 && permitInvalidConstAsModifier) {
                     if (!tryParse(nextTokenIsOnSameLineAndCanFollowModifier)) {
                         break;
                     }
@@ -17351,7 +17601,7 @@ var ts;
         }
         function parseModifiersForArrowFunction() {
             var modifiers;
-            if (token() === 121) {
+            if (token() === 122) {
                 var modifierStart = scanner.getStartPos();
                 var modifierKind = token();
                 nextToken();
@@ -17362,21 +17612,24 @@ var ts;
         }
         function parseClassElement() {
             if (token() === 26) {
-                var result = createNode(217);
+                var result = createNode(218);
                 nextToken();
                 return finishNode(result);
             }
             var node = createNodeWithJSDoc(0);
             node.decorators = parseDecorators();
             node.modifiers = parseModifiers(true);
-            if (parseContextualModifier(126)) {
-                return parseAccessorDeclaration(node, 158);
-            }
-            if (parseContextualModifier(137)) {
+            if (parseContextualModifier(127)) {
                 return parseAccessorDeclaration(node, 159);
             }
-            if (token() === 124) {
-                return parseConstructorDeclaration(node);
+            if (parseContextualModifier(138)) {
+                return parseAccessorDeclaration(node, 160);
+            }
+            if (token() === 125 || token() === 10) {
+                var constructorDeclaration = tryParseConstructorDeclaration(node);
+                if (constructorDeclaration) {
+                    return constructorDeclaration;
+                }
             }
             if (isIndexSignature()) {
                 return parseIndexSignatureDeclaration(node);
@@ -17389,20 +17642,20 @@ var ts;
                 return parsePropertyOrMethodDeclaration(node);
             }
             if (node.decorators || node.modifiers) {
-                node.name = createMissingNode(72, true, ts.Diagnostics.Declaration_expected);
+                node.name = createMissingNode(73, true, ts.Diagnostics.Declaration_expected);
                 return parsePropertyDeclaration(node);
             }
             return ts.Debug.fail("Should not have attempted to parse class member declaration.");
         }
         function parseClassExpression() {
-            return parseClassDeclarationOrExpression(createNodeWithJSDoc(0), 209);
+            return parseClassDeclarationOrExpression(createNodeWithJSDoc(0), 210);
         }
         function parseClassDeclaration(node) {
-            return parseClassDeclarationOrExpression(node, 240);
+            return parseClassDeclarationOrExpression(node, 241);
         }
         function parseClassDeclarationOrExpression(node, kind) {
             node.kind = kind;
-            parseExpected(76);
+            parseExpected(77);
             node.name = parseNameOfClassDeclarationOrExpression();
             node.typeParameters = parseTypeParameters();
             node.heritageClauses = parseHeritageClauses();
@@ -17421,7 +17674,7 @@ var ts;
                 : undefined;
         }
         function isImplementsClause() {
-            return token() === 109 && lookAhead(nextTokenIsIdentifierOrKeyword);
+            return token() === 110 && lookAhead(nextTokenIsIdentifierOrKeyword);
         }
         function parseHeritageClauses() {
             if (isHeritageClause()) {
@@ -17431,15 +17684,15 @@ var ts;
         }
         function parseHeritageClause() {
             var tok = token();
-            ts.Debug.assert(tok === 86 || tok === 109);
-            var node = createNode(273);
+            ts.Debug.assert(tok === 87 || tok === 110);
+            var node = createNode(274);
             node.token = tok;
             nextToken();
             node.types = parseDelimitedList(7, parseExpressionWithTypeArguments);
             return finishNode(node);
         }
         function parseExpressionWithTypeArguments() {
-            var node = createNode(211);
+            var node = createNode(212);
             node.expression = parseLeftHandSideExpressionOrHigher();
             node.typeArguments = tryParseTypeArguments();
             return finishNode(node);
@@ -17450,14 +17703,14 @@ var ts;
                 : undefined;
         }
         function isHeritageClause() {
-            return token() === 86 || token() === 109;
+            return token() === 87 || token() === 110;
         }
         function parseClassMembers() {
             return parseList(5, parseClassElement);
         }
         function parseInterfaceDeclaration(node) {
-            node.kind = 241;
-            parseExpected(110);
+            node.kind = 242;
+            parseExpected(111);
             node.name = parseIdentifier();
             node.typeParameters = parseTypeParameters();
             node.heritageClauses = parseHeritageClauses();
@@ -17465,24 +17718,24 @@ var ts;
             return finishNode(node);
         }
         function parseTypeAliasDeclaration(node) {
-            node.kind = 242;
-            parseExpected(140);
+            node.kind = 243;
+            parseExpected(141);
             node.name = parseIdentifier();
             node.typeParameters = parseTypeParameters();
-            parseExpected(59);
+            parseExpected(60);
             node.type = parseType();
             parseSemicolon();
             return finishNode(node);
         }
         function parseEnumMember() {
-            var node = createNodeWithJSDoc(278);
+            var node = createNodeWithJSDoc(279);
             node.name = parsePropertyName();
             node.initializer = allowInAnd(parseInitializer);
             return finishNode(node);
         }
         function parseEnumDeclaration(node) {
-            node.kind = 243;
-            parseExpected(84);
+            node.kind = 244;
+            parseExpected(85);
             node.name = parseIdentifier();
             if (parseExpected(18)) {
                 node.members = parseDelimitedList(6, parseEnumMember);
@@ -17494,7 +17747,7 @@ var ts;
             return finishNode(node);
         }
         function parseModuleBlock() {
-            var node = createNode(245);
+            var node = createNode(246);
             if (parseExpected(18)) {
                 node.statements = parseList(1, parseStatement);
                 parseExpected(19);
@@ -17505,7 +17758,7 @@ var ts;
             return finishNode(node);
         }
         function parseModuleOrNamespaceDeclaration(node, flags) {
-            node.kind = 244;
+            node.kind = 245;
             var namespaceFlag = flags & 16;
             node.flags |= flags;
             node.name = parseIdentifier();
@@ -17515,8 +17768,8 @@ var ts;
             return finishNode(node);
         }
         function parseAmbientExternalModuleDeclaration(node) {
-            node.kind = 244;
-            if (token() === 145) {
+            node.kind = 245;
+            if (token() === 146) {
                 node.name = parseIdentifier();
                 node.flags |= 512;
             }
@@ -17534,14 +17787,14 @@ var ts;
         }
         function parseModuleDeclaration(node) {
             var flags = 0;
-            if (token() === 145) {
+            if (token() === 146) {
                 return parseAmbientExternalModuleDeclaration(node);
             }
-            else if (parseOptional(131)) {
+            else if (parseOptional(132)) {
                 flags |= 16;
             }
             else {
-                parseExpected(130);
+                parseExpected(131);
                 if (token() === 10) {
                     return parseAmbientExternalModuleDeclaration(node);
                 }
@@ -17549,7 +17802,7 @@ var ts;
             return parseModuleOrNamespaceDeclaration(node, flags);
         }
         function isExternalModuleReference() {
-            return token() === 134 &&
+            return token() === 135 &&
                 lookAhead(nextTokenIsOpenParen);
         }
         function nextTokenIsOpenParen() {
@@ -17559,50 +17812,50 @@ var ts;
             return nextToken() === 42;
         }
         function parseNamespaceExportDeclaration(node) {
-            node.kind = 247;
-            parseExpected(119);
-            parseExpected(131);
+            node.kind = 248;
+            parseExpected(120);
+            parseExpected(132);
             node.name = parseIdentifier();
             parseSemicolon();
             return finishNode(node);
         }
         function parseImportDeclarationOrImportEqualsDeclaration(node) {
-            parseExpected(92);
+            parseExpected(93);
             var afterImportPos = scanner.getStartPos();
             var identifier;
             if (isIdentifier()) {
                 identifier = parseIdentifier();
-                if (token() !== 27 && token() !== 144) {
+                if (token() !== 27 && token() !== 145) {
                     return parseImportEqualsDeclaration(node, identifier);
                 }
             }
-            node.kind = 249;
+            node.kind = 250;
             if (identifier ||
                 token() === 40 ||
                 token() === 18) {
                 node.importClause = parseImportClause(identifier, afterImportPos);
-                parseExpected(144);
+                parseExpected(145);
             }
             node.moduleSpecifier = parseModuleSpecifier();
             parseSemicolon();
             return finishNode(node);
         }
         function parseImportEqualsDeclaration(node, identifier) {
-            node.kind = 248;
+            node.kind = 249;
             node.name = identifier;
-            parseExpected(59);
+            parseExpected(60);
             node.moduleReference = parseModuleReference();
             parseSemicolon();
             return finishNode(node);
         }
         function parseImportClause(identifier, fullStart) {
-            var importClause = createNode(250, fullStart);
+            var importClause = createNode(251, fullStart);
             if (identifier) {
                 importClause.name = identifier;
             }
             if (!importClause.name ||
                 parseOptional(27)) {
-                importClause.namedBindings = token() === 40 ? parseNamespaceImport() : parseNamedImportsOrExports(252);
+                importClause.namedBindings = token() === 40 ? parseNamespaceImport() : parseNamedImportsOrExports(253);
             }
             return finishNode(importClause);
         }
@@ -17612,8 +17865,8 @@ var ts;
                 : parseEntityName(false);
         }
         function parseExternalModuleReference() {
-            var node = createNode(259);
-            parseExpected(134);
+            var node = createNode(260);
+            parseExpected(135);
             parseExpected(20);
             node.expression = parseModuleSpecifier();
             parseExpected(21);
@@ -17630,22 +17883,22 @@ var ts;
             }
         }
         function parseNamespaceImport() {
-            var namespaceImport = createNode(251);
+            var namespaceImport = createNode(252);
             parseExpected(40);
-            parseExpected(119);
+            parseExpected(120);
             namespaceImport.name = parseIdentifier();
             return finishNode(namespaceImport);
         }
         function parseNamedImportsOrExports(kind) {
             var node = createNode(kind);
-            node.elements = parseBracketedList(23, kind === 252 ? parseImportSpecifier : parseExportSpecifier, 18, 19);
+            node.elements = parseBracketedList(23, kind === 253 ? parseImportSpecifier : parseExportSpecifier, 18, 19);
             return finishNode(node);
         }
         function parseExportSpecifier() {
-            return parseImportOrExportSpecifier(257);
+            return parseImportOrExportSpecifier(258);
         }
         function parseImportSpecifier() {
-            return parseImportOrExportSpecifier(253);
+            return parseImportOrExportSpecifier(254);
         }
         function parseImportOrExportSpecifier(kind) {
             var node = createNode(kind);
@@ -17653,9 +17906,9 @@ var ts;
             var checkIdentifierStart = scanner.getTokenPos();
             var checkIdentifierEnd = scanner.getTextPos();
             var identifierName = parseIdentifierName();
-            if (token() === 119) {
+            if (token() === 120) {
                 node.propertyName = identifierName;
-                parseExpected(119);
+                parseExpected(120);
                 checkIdentifierIsKeyword = ts.isKeyword(token()) && !isIdentifier();
                 checkIdentifierStart = scanner.getTokenPos();
                 checkIdentifierEnd = scanner.getTextPos();
@@ -17664,21 +17917,21 @@ var ts;
             else {
                 node.name = identifierName;
             }
-            if (kind === 253 && checkIdentifierIsKeyword) {
+            if (kind === 254 && checkIdentifierIsKeyword) {
                 parseErrorAt(checkIdentifierStart, checkIdentifierEnd, ts.Diagnostics.Identifier_expected);
             }
             return finishNode(node);
         }
         function parseExportDeclaration(node) {
-            node.kind = 255;
+            node.kind = 256;
             if (parseOptional(40)) {
-                parseExpected(144);
+                parseExpected(145);
                 node.moduleSpecifier = parseModuleSpecifier();
             }
             else {
-                node.exportClause = parseNamedImportsOrExports(256);
-                if (token() === 144 || (token() === 10 && !scanner.hasPrecedingLineBreak())) {
-                    parseExpected(144);
+                node.exportClause = parseNamedImportsOrExports(257);
+                if (token() === 145 || (token() === 10 && !scanner.hasPrecedingLineBreak())) {
+                    parseExpected(145);
                     node.moduleSpecifier = parseModuleSpecifier();
                 }
             }
@@ -17686,12 +17939,12 @@ var ts;
             return finishNode(node);
         }
         function parseExportAssignment(node) {
-            node.kind = 254;
-            if (parseOptional(59)) {
+            node.kind = 255;
+            if (parseOptional(60)) {
                 node.isExportEquals = true;
             }
             else {
-                parseExpected(80);
+                parseExpected(81);
             }
             node.expression = parseAssignmentExpressionOrHigher();
             parseSemicolon();
@@ -17704,10 +17957,10 @@ var ts;
         }
         function isAnExternalModuleIndicatorNode(node) {
             return ts.hasModifier(node, 1)
-                || node.kind === 248 && node.moduleReference.kind === 259
-                || node.kind === 249
-                || node.kind === 254
+                || node.kind === 249 && node.moduleReference.kind === 260
+                || node.kind === 250
                 || node.kind === 255
+                || node.kind === 256
                 ? node
                 : undefined;
         }
@@ -17720,13 +17973,13 @@ var ts;
             return isImportMeta(node) ? node : forEachChild(node, walkTreeForExternalModuleIndicators);
         }
         function isImportMeta(node) {
-            return ts.isMetaProperty(node) && node.keywordToken === 92 && node.name.escapedText === "meta";
+            return ts.isMetaProperty(node) && node.keywordToken === 93 && node.name.escapedText === "meta";
         }
         var JSDocParser;
         (function (JSDocParser) {
             function parseJSDocTypeExpressionForTests(content, start, length) {
-                initializeState(content, 7, undefined, 1);
-                sourceFile = createSourceFile("file.js", 7, 1, false);
+                initializeState(content, 99, undefined, 1);
+                sourceFile = createSourceFile("file.js", 99, 1, false);
                 scanner.setText(content, start, length);
                 currentToken = scanner.scan();
                 var jsDocTypeExpression = parseJSDocTypeExpression();
@@ -17736,18 +17989,18 @@ var ts;
             }
             JSDocParser.parseJSDocTypeExpressionForTests = parseJSDocTypeExpressionForTests;
             function parseJSDocTypeExpression(mayOmitBraces) {
-                var result = createNode(288);
+                var result = createNode(289);
                 var hasBrace = (mayOmitBraces ? parseOptional : parseExpected)(18);
                 result.type = doInsideOfContext(2097152, parseJSDocType);
                 if (!mayOmitBraces || hasBrace) {
-                    parseExpected(19);
+                    parseExpectedJSDoc(19);
                 }
                 fixupParentReferences(result);
                 return finishNode(result);
             }
             JSDocParser.parseJSDocTypeExpression = parseJSDocTypeExpression;
             function parseIsolatedJSDocComment(content, start, length) {
-                initializeState(content, 7, undefined, 1);
+                initializeState(content, 99, undefined, 1);
                 sourceFile = { languageVariant: 0, text: content };
                 var jsDoc = parseJSDocCommentWorker(start, length);
                 var diagnostics = parseDiagnostics;
@@ -17802,7 +18055,7 @@ var ts;
                         comments.push(text);
                         indent += text.length;
                     }
-                    nextJSDocToken();
+                    nextTokenJSDoc();
                     while (parseOptionalJsdoc(5))
                         ;
                     if (parseOptionalJsdoc(4)) {
@@ -17817,7 +18070,6 @@ var ts;
                                     addTag(parseTag(indent));
                                     state = 0;
                                     margin = undefined;
-                                    indent++;
                                 }
                                 else {
                                     pushComment(scanner.getTokenText());
@@ -17856,7 +18108,7 @@ var ts;
                                 pushComment(scanner.getTokenText());
                                 break;
                         }
-                        nextJSDocToken();
+                        nextTokenJSDoc();
                     }
                     removeLeadingNewlines(comments);
                     removeTrailingWhitespace(comments);
@@ -17873,14 +18125,14 @@ var ts;
                     }
                 }
                 function createJSDocComment() {
-                    var result = createNode(296, start);
+                    var result = createNode(297, start);
                     result.tags = tags && createNodeArray(tags, tagsPos, tagsEnd);
                     result.comment = comments.length ? comments.join("") : undefined;
                     return finishNode(result, end);
                 }
                 function isNextNonwhitespaceTokenEndOfFile() {
                     while (true) {
-                        nextJSDocToken();
+                        nextTokenJSDoc();
                         if (token() === 1) {
                             return true;
                         }
@@ -17896,34 +18148,43 @@ var ts;
                         }
                     }
                     while (token() === 5 || token() === 4) {
-                        nextJSDocToken();
+                        nextTokenJSDoc();
                     }
                 }
                 function skipWhitespaceOrAsterisk() {
                     if (token() === 5 || token() === 4) {
                         if (lookAhead(isNextNonwhitespaceTokenEndOfFile)) {
-                            return;
+                            return "";
                         }
                     }
                     var precedingLineBreak = scanner.hasPrecedingLineBreak();
+                    var seenLineBreak = false;
+                    var indentText = "";
                     while ((precedingLineBreak && token() === 40) || token() === 5 || token() === 4) {
+                        indentText += scanner.getTokenText();
                         if (token() === 4) {
                             precedingLineBreak = true;
+                            seenLineBreak = true;
+                            indentText = "";
                         }
                         else if (token() === 40) {
                             precedingLineBreak = false;
                         }
-                        nextJSDocToken();
+                        nextTokenJSDoc();
                     }
+                    return seenLineBreak ? indentText : "";
                 }
-                function parseTag(indent) {
+                function parseTag(margin) {
                     ts.Debug.assert(token() === 58);
                     var start = scanner.getTokenPos();
-                    nextJSDocToken();
+                    nextTokenJSDoc();
                     var tagName = parseJSDocIdentifierName(undefined);
-                    skipWhitespaceOrAsterisk();
+                    var indentText = skipWhitespaceOrAsterisk();
                     var tag;
                     switch (tagName.escapedText) {
+                        case "author":
+                            tag = parseAuthorTag(start, tagName, margin);
+                            break;
                         case "augments":
                         case "extends":
                             tag = parseAugmentsTag(start, tagName);
@@ -17941,7 +18202,7 @@ var ts;
                         case "arg":
                         case "argument":
                         case "param":
-                            return parseParameterOrPropertyTag(start, tagName, 2, indent);
+                            return parseParameterOrPropertyTag(start, tagName, 2, margin);
                         case "return":
                         case "returns":
                             tag = parseReturnTag(start, tagName);
@@ -17953,21 +18214,24 @@ var ts;
                             tag = parseTypeTag(start, tagName);
                             break;
                         case "typedef":
-                            tag = parseTypedefTag(start, tagName, indent);
+                            tag = parseTypedefTag(start, tagName, margin);
                             break;
                         case "callback":
-                            tag = parseCallbackTag(start, tagName, indent);
+                            tag = parseCallbackTag(start, tagName, margin);
                             break;
                         default:
                             tag = parseUnknownTag(start, tagName);
                             break;
                     }
                     if (!tag.comment) {
-                        tag.comment = parseTagComments(indent + tag.end - tag.pos);
+                        if (!indentText) {
+                            margin += tag.end - tag.pos;
+                        }
+                        tag.comment = parseTagComments(margin, indentText.slice(margin));
                     }
                     return tag;
                 }
-                function parseTagComments(indent) {
+                function parseTagComments(indent, initialMargin) {
                     var comments = [];
                     var state = 0;
                     var margin;
@@ -17978,6 +18242,10 @@ var ts;
                         comments.push(text);
                         indent += text.length;
                     }
+                    if (initialMargin) {
+                        pushComment(initialMargin);
+                        state = 2;
+                    }
                     var tok = token();
                     loop: while (true) {
                         switch (tok) {
@@ -17989,28 +18257,41 @@ var ts;
                                 indent = 0;
                                 break;
                             case 58:
+                                if (state === 3) {
+                                    comments.push(scanner.getTokenText());
+                                    break;
+                                }
                                 scanner.setTextPos(scanner.getTextPos() - 1);
                             case 1:
                                 break loop;
                             case 5:
-                                if (state === 2) {
+                                if (state === 2 || state === 3) {
                                     pushComment(scanner.getTokenText());
                                 }
                                 else {
                                     var whitespace = scanner.getTokenText();
                                     if (margin !== undefined && indent + whitespace.length > margin) {
-                                        comments.push(whitespace.slice(margin - indent - 1));
+                                        comments.push(whitespace.slice(margin - indent));
                                     }
                                     indent += whitespace.length;
                                 }
                                 break;
                             case 18:
                                 state = 2;
-                                if (lookAhead(function () { return nextJSDocToken() === 58 && ts.tokenIsIdentifierOrKeyword(nextJSDocToken()) && scanner.getTokenText() === "link"; })) {
+                                if (lookAhead(function () { return nextTokenJSDoc() === 58 && ts.tokenIsIdentifierOrKeyword(nextTokenJSDoc()) && scanner.getTokenText() === "link"; })) {
                                     pushComment(scanner.getTokenText());
-                                    nextJSDocToken();
+                                    nextTokenJSDoc();
                                     pushComment(scanner.getTokenText());
-                                    nextJSDocToken();
+                                    nextTokenJSDoc();
+                                }
+                                pushComment(scanner.getTokenText());
+                                break;
+                            case 59:
+                                if (state === 3) {
+                                    state = 2;
+                                }
+                                else {
+                                    state = 3;
                                 }
                                 pushComment(scanner.getTokenText());
                                 break;
@@ -18021,18 +18302,20 @@ var ts;
                                     break;
                                 }
                             default:
-                                state = 2;
+                                if (state !== 3) {
+                                    state = 2;
+                                }
                                 pushComment(scanner.getTokenText());
                                 break;
                         }
-                        tok = nextJSDocToken();
+                        tok = nextTokenJSDoc();
                     }
                     removeLeadingNewlines(comments);
                     removeTrailingWhitespace(comments);
                     return comments.length === 0 ? undefined : comments.join("");
                 }
                 function parseUnknownTag(start, tagName) {
-                    var result = createNode(299, start);
+                    var result = createNode(300, start);
                     result.tagName = tagName;
                     return finishNode(result);
                 }
@@ -18054,14 +18337,18 @@ var ts;
                     return token() === 18 ? parseJSDocTypeExpression() : undefined;
                 }
                 function parseBracketNameInPropertyAndParamTag() {
-                    if (token() === 14) {
-                        return { name: createIdentifier(true), isBracketed: false };
-                    }
-                    var isBracketed = parseOptional(22);
-                    var name = parseJSDocEntityName();
+                    var isBracketed = parseOptionalJsdoc(22);
                     if (isBracketed) {
                         skipWhitespace();
-                        if (parseOptionalToken(59)) {
+                    }
+                    var isBackquoted = parseOptionalJsdoc(59);
+                    var name = parseJSDocEntityName();
+                    if (isBackquoted) {
+                        parseExpectedTokenJSDoc(59);
+                    }
+                    if (isBracketed) {
+                        skipWhitespace();
+                        if (parseOptionalToken(60)) {
                             parseExpression();
                         }
                         parseExpected(23);
@@ -18070,9 +18357,9 @@ var ts;
                 }
                 function isObjectOrObjectArrayTypeReference(node) {
                     switch (node.kind) {
-                        case 136:
+                        case 137:
                             return true;
-                        case 169:
+                        case 170:
                             return isObjectOrObjectArrayTypeReference(node.elementType);
                         default:
                             return ts.isTypeReferenceNode(node) && ts.isIdentifier(node.typeName) && node.typeName.escapedText === "Object";
@@ -18088,8 +18375,8 @@ var ts;
                         typeExpression = tryParseTypeExpression();
                     }
                     var result = target === 1 ?
-                        createNode(310, start) :
-                        createNode(304, start);
+                        createNode(312, start) :
+                        createNode(306, start);
                     var comment = parseTagComments(indent + scanner.getStartPos() - start);
                     var nestedTypeLiteral = target !== 4 && parseNestedTypeLiteral(typeExpression, name, target, indent);
                     if (nestedTypeLiteral) {
@@ -18106,20 +18393,20 @@ var ts;
                 }
                 function parseNestedTypeLiteral(typeExpression, name, target, indent) {
                     if (typeExpression && isObjectOrObjectArrayTypeReference(typeExpression.type)) {
-                        var typeLiteralExpression = createNode(288, scanner.getTokenPos());
+                        var typeLiteralExpression = createNode(289, scanner.getTokenPos());
                         var child = void 0;
                         var jsdocTypeLiteral = void 0;
                         var start_2 = scanner.getStartPos();
                         var children = void 0;
                         while (child = tryParse(function () { return parseChildParameterOrPropertyTag(target, indent, name); })) {
-                            if (child.kind === 304 || child.kind === 310) {
+                            if (child.kind === 306 || child.kind === 312) {
                                 children = ts.append(children, child);
                             }
                         }
                         if (children) {
-                            jsdocTypeLiteral = createNode(297, start_2);
+                            jsdocTypeLiteral = createNode(298, start_2);
                             jsdocTypeLiteral.jsDocPropertyTags = children;
-                            if (typeExpression.type.kind === 169) {
+                            if (typeExpression.type.kind === 170) {
                                 jsdocTypeLiteral.isArrayType = true;
                             }
                             typeLiteralExpression.type = finishNode(jsdocTypeLiteral);
@@ -18128,32 +18415,86 @@ var ts;
                     }
                 }
                 function parseReturnTag(start, tagName) {
-                    if (ts.forEach(tags, function (t) { return t.kind === 305; })) {
+                    if (ts.some(tags, ts.isJSDocReturnTag)) {
                         parseErrorAt(tagName.pos, scanner.getTokenPos(), ts.Diagnostics._0_tag_already_specified, tagName.escapedText);
                     }
-                    var result = createNode(305, start);
+                    var result = createNode(307, start);
                     result.tagName = tagName;
                     result.typeExpression = tryParseTypeExpression();
                     return finishNode(result);
                 }
                 function parseTypeTag(start, tagName) {
-                    if (ts.forEach(tags, function (t) { return t.kind === 307; })) {
+                    if (ts.some(tags, ts.isJSDocTypeTag)) {
                         parseErrorAt(tagName.pos, scanner.getTokenPos(), ts.Diagnostics._0_tag_already_specified, tagName.escapedText);
                     }
-                    var result = createNode(307, start);
+                    var result = createNode(309, start);
                     result.tagName = tagName;
                     result.typeExpression = parseJSDocTypeExpression(true);
                     return finishNode(result);
                 }
+                function parseAuthorTag(start, tagName, indent) {
+                    var result = createNode(302, start);
+                    result.tagName = tagName;
+                    var authorInfoWithEmail = tryParse(function () { return tryParseAuthorNameAndEmail(); });
+                    if (!authorInfoWithEmail) {
+                        return finishNode(result);
+                    }
+                    result.comment = authorInfoWithEmail;
+                    if (lookAhead(function () { return nextToken() !== 4; })) {
+                        var comment = parseTagComments(indent);
+                        if (comment) {
+                            result.comment += comment;
+                        }
+                    }
+                    return finishNode(result);
+                }
+                function tryParseAuthorNameAndEmail() {
+                    var comments = [];
+                    var seenLessThan = false;
+                    var seenGreaterThan = false;
+                    var token = scanner.getToken();
+                    loop: while (true) {
+                        switch (token) {
+                            case 73:
+                            case 5:
+                            case 24:
+                            case 58:
+                                comments.push(scanner.getTokenText());
+                                break;
+                            case 28:
+                                if (seenLessThan || seenGreaterThan) {
+                                    return;
+                                }
+                                seenLessThan = true;
+                                comments.push(scanner.getTokenText());
+                                break;
+                            case 30:
+                                if (!seenLessThan || seenGreaterThan) {
+                                    return;
+                                }
+                                seenGreaterThan = true;
+                                comments.push(scanner.getTokenText());
+                                scanner.setTextPos(scanner.getTokenPos() + 1);
+                                break loop;
+                            case 4:
+                            case 1:
+                                break loop;
+                        }
+                        token = nextTokenJSDoc();
+                    }
+                    if (seenLessThan && seenGreaterThan) {
+                        return comments.length === 0 ? undefined : comments.join("");
+                    }
+                }
                 function parseAugmentsTag(start, tagName) {
-                    var result = createNode(300, start);
+                    var result = createNode(301, start);
                     result.tagName = tagName;
                     result.class = parseExpressionWithTypeArgumentsForAugments();
                     return finishNode(result);
                 }
                 function parseExpressionWithTypeArgumentsForAugments() {
                     var usedBrace = parseOptional(18);
-                    var node = createNode(211);
+                    var node = createNode(212);
                     node.expression = parsePropertyAccessEntityNameExpression();
                     node.typeArguments = tryParseTypeArguments();
                     var res = finishNode(node);
@@ -18165,7 +18506,7 @@ var ts;
                 function parsePropertyAccessEntityNameExpression() {
                     var node = parseJSDocIdentifierName();
                     while (parseOptional(24)) {
-                        var prop = createNode(189, node.pos);
+                        var prop = createNode(190, node.pos);
                         prop.expression = node;
                         prop.name = parseJSDocIdentifierName();
                         node = finishNode(prop);
@@ -18173,19 +18514,19 @@ var ts;
                     return node;
                 }
                 function parseClassTag(start, tagName) {
-                    var tag = createNode(301, start);
+                    var tag = createNode(303, start);
                     tag.tagName = tagName;
                     return finishNode(tag);
                 }
                 function parseThisTag(start, tagName) {
-                    var tag = createNode(306, start);
+                    var tag = createNode(308, start);
                     tag.tagName = tagName;
                     tag.typeExpression = parseJSDocTypeExpression(true);
                     skipWhitespace();
                     return finishNode(tag);
                 }
                 function parseEnumTag(start, tagName) {
-                    var tag = createNode(303, start);
+                    var tag = createNode(305, start);
                     tag.tagName = tagName;
                     tag.typeExpression = parseJSDocTypeExpression(true);
                     skipWhitespace();
@@ -18194,7 +18535,7 @@ var ts;
                 function parseTypedefTag(start, tagName, indent) {
                     var typeExpression = tryParseTypeExpression();
                     skipWhitespaceOrAsterisk();
-                    var typedefTag = createNode(309, start);
+                    var typedefTag = createNode(311, start);
                     typedefTag.tagName = tagName;
                     typedefTag.fullName = parseJSDocTypeNameWithNamespace();
                     typedefTag.name = getJSDocTypeAliasName(typedefTag.fullName);
@@ -18208,9 +18549,9 @@ var ts;
                         var childTypeTag = void 0;
                         while (child = tryParse(function () { return parseChildPropertyTag(indent); })) {
                             if (!jsdocTypeLiteral) {
-                                jsdocTypeLiteral = createNode(297, start);
+                                jsdocTypeLiteral = createNode(298, start);
                             }
-                            if (child.kind === 307) {
+                            if (child.kind === 309) {
                                 if (childTypeTag) {
                                     break;
                                 }
@@ -18223,7 +18564,7 @@ var ts;
                             }
                         }
                         if (jsdocTypeLiteral) {
-                            if (typeExpression && typeExpression.type.kind === 169) {
+                            if (typeExpression && typeExpression.type.kind === 170) {
                                 jsdocTypeLiteral.isArrayType = true;
                             }
                             typedefTag.typeExpression = childTypeTag && childTypeTag.typeExpression && !isObjectOrObjectArrayTypeReference(childTypeTag.typeExpression.type) ?
@@ -18241,7 +18582,7 @@ var ts;
                     }
                     var typeNameOrNamespaceName = parseJSDocIdentifierName();
                     if (parseOptional(24)) {
-                        var jsDocNamespaceNode = createNode(244, pos);
+                        var jsDocNamespaceNode = createNode(245, pos);
                         if (nested) {
                             jsDocNamespaceNode.flags |= 4;
                         }
@@ -18255,14 +18596,14 @@ var ts;
                     return typeNameOrNamespaceName;
                 }
                 function parseCallbackTag(start, tagName, indent) {
-                    var callbackTag = createNode(302, start);
+                    var callbackTag = createNode(304, start);
                     callbackTag.tagName = tagName;
                     callbackTag.fullName = parseJSDocTypeNameWithNamespace();
                     callbackTag.name = getJSDocTypeAliasName(callbackTag.fullName);
                     skipWhitespace();
                     callbackTag.comment = parseTagComments(indent);
                     var child;
-                    var jsdocSignature = createNode(298, start);
+                    var jsdocSignature = createNode(299, start);
                     jsdocSignature.parameters = [];
                     while (child = tryParse(function () { return parseChildParameterOrPropertyTag(4, indent); })) {
                         jsdocSignature.parameters = ts.append(jsdocSignature.parameters, child);
@@ -18270,7 +18611,7 @@ var ts;
                     var returnTag = tryParse(function () {
                         if (parseOptionalJsdoc(58)) {
                             var tag = parseTag(indent);
-                            if (tag && tag.kind === 305) {
+                            if (tag && tag.kind === 307) {
                                 return tag;
                             }
                         }
@@ -18311,11 +18652,11 @@ var ts;
                     var canParseTag = true;
                     var seenAsterisk = false;
                     while (true) {
-                        switch (nextJSDocToken()) {
+                        switch (nextTokenJSDoc()) {
                             case 58:
                                 if (canParseTag) {
                                     var child = tryParseChildTag(target, indent);
-                                    if (child && (child.kind === 304 || child.kind === 310) &&
+                                    if (child && (child.kind === 306 || child.kind === 312) &&
                                         target !== 4 &&
                                         name && (ts.isIdentifier(child.name) || !escapedTextsEqual(name, child.name.left))) {
                                         return false;
@@ -18334,7 +18675,7 @@ var ts;
                                 }
                                 seenAsterisk = true;
                                 break;
-                            case 72:
+                            case 73:
                                 canParseTag = false;
                                 break;
                             case 1:
@@ -18345,7 +18686,7 @@ var ts;
                 function tryParseChildTag(target, indent) {
                     ts.Debug.assert(token() === 58);
                     var start = scanner.getStartPos();
-                    nextJSDocToken();
+                    nextTokenJSDoc();
                     var tagName = parseJSDocIdentifierName();
                     skipWhitespace();
                     var t;
@@ -18378,25 +18719,22 @@ var ts;
                     var typeParametersPos = getNodePos();
                     do {
                         skipWhitespace();
-                        var typeParameter = createNode(150);
+                        var typeParameter = createNode(151);
                         typeParameter.name = parseJSDocIdentifierName(ts.Diagnostics.Unexpected_token_A_type_parameter_name_was_expected_without_curly_braces);
                         finishNode(typeParameter);
                         skipWhitespace();
                         typeParameters.push(typeParameter);
                     } while (parseOptionalJsdoc(27));
-                    var result = createNode(308, start);
+                    var result = createNode(310, start);
                     result.tagName = tagName;
                     result.constraint = constraint;
                     result.typeParameters = createNodeArray(typeParameters, typeParametersPos);
                     finishNode(result);
                     return result;
                 }
-                function nextJSDocToken() {
-                    return currentToken = scanner.scanJSDocToken();
-                }
                 function parseOptionalJsdoc(t) {
                     if (token() === t) {
-                        nextJSDocToken();
+                        nextTokenJSDoc();
                         return true;
                     }
                     return false;
@@ -18417,14 +18755,14 @@ var ts;
                 }
                 function parseJSDocIdentifierName(message) {
                     if (!ts.tokenIsIdentifierOrKeyword(token())) {
-                        return createMissingNode(72, !message, message || ts.Diagnostics.Identifier_expected);
+                        return createMissingNode(73, !message, message || ts.Diagnostics.Identifier_expected);
                     }
                     var pos = scanner.getTokenPos();
                     var end = scanner.getTextPos();
-                    var result = createNode(72, pos);
+                    var result = createNode(73, pos);
                     result.escapedText = ts.escapeLeadingUnderscores(scanner.getTokenText());
                     finishNode(result, end);
-                    nextJSDocToken();
+                    nextTokenJSDoc();
                     return result;
                 }
             }
@@ -18502,7 +18840,7 @@ var ts;
             switch (node.kind) {
                 case 10:
                 case 8:
-                case 72:
+                case 73:
                     return true;
             }
             return false;
@@ -18724,24 +19062,15 @@ var ts;
     }
     ts.isDeclarationFileName = isDeclarationFileName;
     function processCommentPragmas(context, sourceText) {
-        var triviaScanner = ts.createScanner(context.languageVersion, false, 0, sourceText);
         var pragmas = [];
-        while (true) {
-            var kind = triviaScanner.scan();
-            if (!ts.isTrivia(kind)) {
-                break;
-            }
-            var range = {
-                kind: triviaScanner.getToken(),
-                pos: triviaScanner.getTokenPos(),
-                end: triviaScanner.getTextPos(),
-            };
+        for (var _i = 0, _a = ts.getLeadingCommentRanges(sourceText, 0) || ts.emptyArray; _i < _a.length; _i++) {
+            var range = _a[_i];
             var comment = sourceText.substring(range.pos, range.end);
             extractPragmas(pragmas, range, comment);
         }
         context.pragmas = ts.createMap();
-        for (var _i = 0, pragmas_1 = pragmas; _i < pragmas_1.length; _i++) {
-            var pragma = pragmas_1[_i];
+        for (var _b = 0, pragmas_1 = pragmas; _b < pragmas_1.length; _b++) {
+            var pragma = pragmas_1[_b];
             if (context.pragmas.has(pragma.name)) {
                 var currentValue = context.pragmas.get(pragma.name);
                 if (currentValue instanceof Array) {
@@ -18926,10 +19255,10 @@ var ts;
         if (lhs.kind !== rhs.kind) {
             return false;
         }
-        if (lhs.kind === 72) {
+        if (lhs.kind === 73) {
             return lhs.escapedText === rhs.escapedText;
         }
-        if (lhs.kind === 100) {
+        if (lhs.kind === 101) {
             return true;
         }
         return lhs.name.escapedText === rhs.name.escapedText &&
@@ -18949,6 +19278,7 @@ var ts;
         ["es2017", "lib.es2017.d.ts"],
         ["es2018", "lib.es2018.d.ts"],
         ["es2019", "lib.es2019.d.ts"],
+        ["es2020", "lib.es2020.d.ts"],
         ["esnext", "lib.esnext.d.ts"],
         ["dom", "lib.dom.d.ts"],
         ["dom.iterable", "lib.dom.iterable.d.ts"],
@@ -18970,13 +19300,17 @@ var ts;
         ["es2017.string", "lib.es2017.string.d.ts"],
         ["es2017.intl", "lib.es2017.intl.d.ts"],
         ["es2017.typedarrays", "lib.es2017.typedarrays.d.ts"],
+        ["es2018.asyncgenerator", "lib.es2018.asyncgenerator.d.ts"],
         ["es2018.asynciterable", "lib.es2018.asynciterable.d.ts"],
         ["es2018.intl", "lib.es2018.intl.d.ts"],
         ["es2018.promise", "lib.es2018.promise.d.ts"],
         ["es2018.regexp", "lib.es2018.regexp.d.ts"],
         ["es2019.array", "lib.es2019.array.d.ts"],
+        ["es2019.object", "lib.es2019.object.d.ts"],
         ["es2019.string", "lib.es2019.string.d.ts"],
         ["es2019.symbol", "lib.es2019.symbol.d.ts"],
+        ["es2020.string", "lib.es2020.string.d.ts"],
+        ["es2020.symbol.wellknown", "lib.es2020.symbol.wellknown.d.ts"],
         ["esnext.array", "lib.es2019.array.d.ts"],
         ["esnext.symbol", "lib.es2019.symbol.d.ts"],
         ["esnext.asynciterable", "lib.es2018.asynciterable.d.ts"],
@@ -19051,6 +19385,19 @@ var ts;
             category: ts.Diagnostics.Advanced_Options,
             description: ts.Diagnostics.Show_verbose_diagnostic_information
         },
+        {
+            name: "incremental",
+            shortName: "i",
+            type: "boolean",
+            category: ts.Diagnostics.Basic_Options,
+            description: ts.Diagnostics.Enable_incremental_compilation,
+        },
+        {
+            name: "locale",
+            type: "string",
+            category: ts.Diagnostics.Advanced_Options,
+            description: ts.Diagnostics.The_locale_used_when_displaying_messages_to_the_user_e_g_en_us
+        },
     ];
     ts.optionDeclarations = ts.commonOptionsWithBuild.concat([
         {
@@ -19112,10 +19459,12 @@ var ts;
                 es2017: 4,
                 es2018: 5,
                 es2019: 6,
-                esnext: 7,
+                es2020: 7,
+                esnext: 99,
             }),
             affectsSourceFile: true,
             affectsModuleResolution: true,
+            affectsEmit: true,
             paramType: ts.Diagnostics.VERSION,
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Basic_Options,
@@ -19135,6 +19484,7 @@ var ts;
                 esnext: ts.ModuleKind.ESNext
             }),
             affectsModuleResolution: true,
+            affectsEmit: true,
             paramType: ts.Diagnostics.KIND,
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Basic_Options,
@@ -19183,6 +19533,7 @@ var ts;
             name: "declaration",
             shortName: "d",
             type: "boolean",
+            affectsEmit: true,
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Basic_Options,
             description: ts.Diagnostics.Generates_corresponding_d_ts_file,
@@ -19190,6 +19541,7 @@ var ts;
         {
             name: "declarationMap",
             type: "boolean",
+            affectsEmit: true,
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Basic_Options,
             description: ts.Diagnostics.Generates_a_sourcemap_for_each_corresponding_d_ts_file,
@@ -19197,12 +19549,14 @@ var ts;
         {
             name: "emitDeclarationOnly",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Advanced_Options,
             description: ts.Diagnostics.Only_emit_d_ts_declaration_files,
         },
         {
             name: "sourceMap",
             type: "boolean",
+            affectsEmit: true,
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Basic_Options,
             description: ts.Diagnostics.Generates_corresponding_map_file,
@@ -19210,6 +19564,7 @@ var ts;
         {
             name: "outFile",
             type: "string",
+            affectsEmit: true,
             isFilePath: true,
             paramType: ts.Diagnostics.FILE,
             showInSimplifiedHelpView: true,
@@ -19219,6 +19574,7 @@ var ts;
         {
             name: "outDir",
             type: "string",
+            affectsEmit: true,
             isFilePath: true,
             paramType: ts.Diagnostics.DIRECTORY,
             showInSimplifiedHelpView: true,
@@ -19228,6 +19584,7 @@ var ts;
         {
             name: "rootDir",
             type: "string",
+            affectsEmit: true,
             isFilePath: true,
             paramType: ts.Diagnostics.LOCATION,
             category: ts.Diagnostics.Basic_Options,
@@ -19236,29 +19593,24 @@ var ts;
         {
             name: "composite",
             type: "boolean",
+            affectsEmit: true,
             isTSConfigOnly: true,
             category: ts.Diagnostics.Basic_Options,
             description: ts.Diagnostics.Enable_project_compilation,
         },
-        {
-            name: "incremental",
-            type: "boolean",
-            isTSConfigOnly: true,
-            category: ts.Diagnostics.Basic_Options,
-            description: ts.Diagnostics.Enable_incremental_compilation,
-        },
         {
             name: "tsBuildInfoFile",
             type: "string",
+            affectsEmit: true,
             isFilePath: true,
             paramType: ts.Diagnostics.FILE,
-            isTSConfigOnly: true,
             category: ts.Diagnostics.Basic_Options,
             description: ts.Diagnostics.Specify_file_to_store_incremental_compilation_information,
         },
         {
             name: "removeComments",
             type: "boolean",
+            affectsEmit: true,
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Basic_Options,
             description: ts.Diagnostics.Do_not_emit_comments_to_output,
@@ -19266,6 +19618,7 @@ var ts;
         {
             name: "noEmit",
             type: "boolean",
+            affectsEmit: true,
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Basic_Options,
             description: ts.Diagnostics.Do_not_emit_outputs,
@@ -19273,12 +19626,14 @@ var ts;
         {
             name: "importHelpers",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Basic_Options,
             description: ts.Diagnostics.Import_emit_helpers_from_tslib
         },
         {
             name: "downlevelIteration",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Basic_Options,
             description: ts.Diagnostics.Provide_full_support_for_iterables_in_for_of_spread_and_destructuring_when_targeting_ES5_or_ES3
         },
@@ -19465,6 +19820,7 @@ var ts;
             name: "esModuleInterop",
             type: "boolean",
             affectsSemanticDiagnostics: true,
+            affectsEmit: true,
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Module_Resolution_Options,
             description: ts.Diagnostics.Enables_emit_interoperability_between_CommonJS_and_ES_Modules_via_creation_of_namespace_objects_for_all_imports_Implies_allowSyntheticDefaultImports
@@ -19475,9 +19831,17 @@ var ts;
             category: ts.Diagnostics.Module_Resolution_Options,
             description: ts.Diagnostics.Do_not_resolve_the_real_path_of_symlinks,
         },
+        {
+            name: "allowUmdGlobalAccess",
+            type: "boolean",
+            affectsSemanticDiagnostics: true,
+            category: ts.Diagnostics.Module_Resolution_Options,
+            description: ts.Diagnostics.Allow_accessing_UMD_globals_from_modules,
+        },
         {
             name: "sourceRoot",
             type: "string",
+            affectsEmit: true,
             paramType: ts.Diagnostics.LOCATION,
             category: ts.Diagnostics.Source_Map_Options,
             description: ts.Diagnostics.Specify_the_location_where_debugger_should_locate_TypeScript_files_instead_of_source_locations,
@@ -19485,6 +19849,7 @@ var ts;
         {
             name: "mapRoot",
             type: "string",
+            affectsEmit: true,
             paramType: ts.Diagnostics.LOCATION,
             category: ts.Diagnostics.Source_Map_Options,
             description: ts.Diagnostics.Specify_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations,
@@ -19492,12 +19857,14 @@ var ts;
         {
             name: "inlineSourceMap",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Source_Map_Options,
             description: ts.Diagnostics.Emit_a_single_file_with_source_maps_instead_of_having_a_separate_file
         },
         {
             name: "inlineSources",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Source_Map_Options,
             description: ts.Diagnostics.Emit_the_source_alongside_the_sourcemaps_within_a_single_file_requires_inlineSourceMap_or_sourceMap_to_be_set
         },
@@ -19528,6 +19895,7 @@ var ts;
         {
             name: "out",
             type: "string",
+            affectsEmit: true,
             isFilePath: false,
             category: ts.Diagnostics.Advanced_Options,
             paramType: ts.Diagnostics.FILE,
@@ -19536,6 +19904,7 @@ var ts;
         {
             name: "reactNamespace",
             type: "string",
+            affectsEmit: true,
             category: ts.Diagnostics.Advanced_Options,
             description: ts.Diagnostics.Deprecated_Use_jsxFactory_instead_Specify_the_object_invoked_for_createElement_when_targeting_react_JSX_emit
         },
@@ -19554,21 +19923,17 @@ var ts;
         {
             name: "emitBOM",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Advanced_Options,
             description: ts.Diagnostics.Emit_a_UTF_8_Byte_Order_Mark_BOM_in_the_beginning_of_output_files
         },
-        {
-            name: "locale",
-            type: "string",
-            category: ts.Diagnostics.Advanced_Options,
-            description: ts.Diagnostics.The_locale_used_when_displaying_messages_to_the_user_e_g_en_us
-        },
         {
             name: "newLine",
             type: ts.createMapFromTemplate({
                 crlf: 0,
                 lf: 1
             }),
+            affectsEmit: true,
             paramType: ts.Diagnostics.NEWLINE,
             category: ts.Diagnostics.Advanced_Options,
             description: ts.Diagnostics.Specify_the_end_of_line_sequence_to_be_used_when_emitting_files_Colon_CRLF_dos_or_LF_unix,
@@ -19596,6 +19961,7 @@ var ts;
         {
             name: "stripInternal",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Advanced_Options,
             description: ts.Diagnostics.Do_not_emit_declarations_for_code_that_has_an_internal_annotation,
         },
@@ -19616,24 +19982,28 @@ var ts;
         {
             name: "noEmitHelpers",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Advanced_Options,
             description: ts.Diagnostics.Do_not_generate_custom_helper_functions_like_extends_in_compiled_output
         },
         {
             name: "noEmitOnError",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Advanced_Options,
             description: ts.Diagnostics.Do_not_emit_outputs_if_any_errors_were_reported,
         },
         {
             name: "preserveConstEnums",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Advanced_Options,
             description: ts.Diagnostics.Do_not_erase_const_enum_declarations_in_generated_code
         },
         {
             name: "declarationDir",
             type: "string",
+            affectsEmit: true,
             isFilePath: true,
             paramType: ts.Diagnostics.DIRECTORY,
             category: ts.Diagnostics.Advanced_Options,
@@ -19713,6 +20083,7 @@ var ts;
         }
     ]);
     ts.semanticDiagnosticsOptionDeclarations = ts.optionDeclarations.filter(function (option) { return !!option.affectsSemanticDiagnostics; });
+    ts.affectsEmitOptionDeclarations = ts.optionDeclarations.filter(function (option) { return !!option.affectsEmit; });
     ts.moduleResolutionOptionDeclarations = ts.optionDeclarations.filter(function (option) { return !!option.affectsModuleResolution; });
     ts.sourceFileAffectingCompilerOptions = ts.optionDeclarations.filter(function (option) {
         return !!option.affectsSourceFile || !!option.affectsModuleResolution || !!option.affectsBindDiagnostics;
@@ -19793,6 +20164,7 @@ var ts;
     function getOptionNameMap() {
         return optionNameMapCache || (optionNameMapCache = createOptionNameMap(ts.optionDeclarations));
     }
+    ts.getOptionNameMap = getOptionNameMap;
     function createOptionNameMap(optionDeclarations) {
         var optionNameMap = ts.createMap();
         var shortOptionNames = ts.createMap();
@@ -20083,7 +20455,7 @@ var ts;
         }
     }
     ts.printHelp = printHelp;
-    function getParsedCommandLineOfConfigFile(configFileName, optionsToExtend, host) {
+    function getParsedCommandLineOfConfigFile(configFileName, optionsToExtend, host, extendedConfigCache) {
         var configFileText;
         try {
             configFileText = host.readFile(configFileName);
@@ -20103,7 +20475,7 @@ var ts;
         result.path = ts.toPath(configFileName, cwd, ts.createGetCanonicalFileName(host.useCaseSensitiveFileNames));
         result.resolvedPath = result.path;
         result.originalFileName = result.fileName;
-        return parseJsonSourceFileConfigFileContent(result, host, ts.getNormalizedAbsolutePath(ts.getDirectoryPath(configFileName), cwd), optionsToExtend, ts.getNormalizedAbsolutePath(configFileName, cwd));
+        return parseJsonSourceFileConfigFileContent(result, host, ts.getNormalizedAbsolutePath(ts.getDirectoryPath(configFileName), cwd), optionsToExtend, ts.getNormalizedAbsolutePath(configFileName, cwd), undefined, undefined, extendedConfigCache);
     }
     ts.getParsedCommandLineOfConfigFile = getParsedCommandLineOfConfigFile;
     function readConfigFile(fileName, readFile) {
@@ -20220,7 +20592,7 @@ var ts;
             var result = returnValue ? {} : undefined;
             for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
                 var element = _a[_i];
-                if (element.kind !== 275) {
+                if (element.kind !== 276) {
                     errors.push(ts.createDiagnosticForNodeInSourceFile(sourceFile, element, ts.Diagnostics.Property_assignment_expected));
                     continue;
                 }
@@ -20270,13 +20642,13 @@ var ts;
         }
         function convertPropertyValueToJson(valueExpression, option) {
             switch (valueExpression.kind) {
-                case 102:
+                case 103:
                     reportInvalidOptionValue(option && option.type !== "boolean");
                     return true;
-                case 87:
+                case 88:
                     reportInvalidOptionValue(option && option.type !== "boolean");
                     return false;
-                case 96:
+                case 97:
                     reportInvalidOptionValue(option && option.name === "extends");
                     return null;
                 case 10:
@@ -20295,13 +20667,13 @@ var ts;
                 case 8:
                     reportInvalidOptionValue(option && option.type !== "number");
                     return Number(valueExpression.text);
-                case 202:
+                case 203:
                     if (valueExpression.operator !== 39 || valueExpression.operand.kind !== 8) {
                         break;
                     }
                     reportInvalidOptionValue(option && option.type !== "number");
                     return -Number(valueExpression.operand.text);
-                case 188:
+                case 189:
                     reportInvalidOptionValue(option && option.type !== "object");
                     var objectLiteralExpression = valueExpression;
                     if (option) {
@@ -20311,7 +20683,7 @@ var ts;
                     else {
                         return convertObjectLiteralExpressionToJson(objectLiteralExpression, undefined, undefined, undefined);
                     }
-                case 187:
+                case 188:
                     reportInvalidOptionValue(option && option.type !== "list");
                     return convertArrayLiteralExpressionToJson(valueExpression.elements, option && option.element);
             }
@@ -20462,7 +20834,10 @@ var ts;
                 case "object":
                     return {};
                 default:
-                    return option.type.keys().next().value;
+                    var iterResult = option.type.keys().next();
+                    if (!iterResult.done)
+                        return iterResult.value;
+                    return ts.Debug.fail("Expected 'option.type' to have entries.");
             }
         }
         function makePadding(paddingLength) {
@@ -20533,12 +20908,12 @@ var ts;
         }
     }
     ts.generateTSConfig = generateTSConfig;
-    function parseJsonConfigFileContent(json, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions) {
-        return parseJsonConfigFileContentWorker(json, undefined, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions);
+    function parseJsonConfigFileContent(json, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions, extendedConfigCache) {
+        return parseJsonConfigFileContentWorker(json, undefined, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions, extendedConfigCache);
     }
     ts.parseJsonConfigFileContent = parseJsonConfigFileContent;
-    function parseJsonSourceFileConfigFileContent(sourceFile, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions) {
-        return parseJsonConfigFileContentWorker(undefined, sourceFile, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions);
+    function parseJsonSourceFileConfigFileContent(sourceFile, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions, extendedConfigCache) {
+        return parseJsonConfigFileContentWorker(undefined, sourceFile, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions, extendedConfigCache);
     }
     ts.parseJsonSourceFileConfigFileContent = parseJsonSourceFileConfigFileContent;
     function setConfigFileInOptions(options, configFile) {
@@ -20553,13 +20928,13 @@ var ts;
     function directoryOfCombinedPath(fileName, basePath) {
         return ts.getDirectoryPath(ts.getNormalizedAbsolutePath(fileName, basePath));
     }
-    function parseJsonConfigFileContentWorker(json, sourceFile, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions) {
+    function parseJsonConfigFileContentWorker(json, sourceFile, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions, extendedConfigCache) {
         if (existingOptions === void 0) { existingOptions = {}; }
         if (resolutionStack === void 0) { resolutionStack = []; }
         if (extraFileExtensions === void 0) { extraFileExtensions = []; }
         ts.Debug.assert((json === undefined && sourceFile !== undefined) || (json !== undefined && sourceFile === undefined));
         var errors = [];
-        var parsedConfig = parseConfig(json, sourceFile, host, basePath, configFileName, resolutionStack, errors);
+        var parsedConfig = parseConfig(json, sourceFile, host, basePath, configFileName, resolutionStack, errors, extendedConfigCache);
         var raw = parsedConfig.raw;
         var options = ts.extend(existingOptions, parsedConfig.options || {});
         options.configFilePath = configFileName && ts.normalizeSlashes(configFileName);
@@ -20693,7 +21068,7 @@ var ts;
     function isSuccessfulParsedTsconfig(value) {
         return !!value.options;
     }
-    function parseConfig(json, sourceFile, host, basePath, configFileName, resolutionStack, errors) {
+    function parseConfig(json, sourceFile, host, basePath, configFileName, resolutionStack, errors, extendedConfigCache) {
         basePath = ts.normalizeSlashes(basePath);
         var resolvedPath = ts.getNormalizedAbsolutePath(configFileName || "", basePath);
         if (resolutionStack.indexOf(resolvedPath) >= 0) {
@@ -20705,7 +21080,7 @@ var ts;
             parseOwnConfigOfJsonSourceFile(sourceFile, host, basePath, configFileName, errors);
         if (ownConfig.extendedConfigPath) {
             resolutionStack = resolutionStack.concat([resolvedPath]);
-            var extendedConfig = getExtendedConfig(sourceFile, ownConfig.extendedConfigPath, host, basePath, resolutionStack, errors);
+            var extendedConfig = getExtendedConfig(sourceFile, ownConfig.extendedConfigPath, host, basePath, resolutionStack, errors, extendedConfigCache);
             if (extendedConfig && isSuccessfulParsedTsconfig(extendedConfig)) {
                 var baseRaw_1 = extendedConfig.raw;
                 var raw_1 = ownConfig.raw;
@@ -20799,7 +21174,7 @@ var ts;
             if (!host.fileExists(extendedConfigPath) && !ts.endsWith(extendedConfigPath, ".json")) {
                 extendedConfigPath = extendedConfigPath + ".json";
                 if (!host.fileExists(extendedConfigPath)) {
-                    errors.push(createDiagnostic(ts.Diagnostics.File_0_does_not_exist, extendedConfig));
+                    errors.push(createDiagnostic(ts.Diagnostics.File_0_not_found, extendedConfig));
                     return undefined;
                 }
             }
@@ -20809,37 +21184,51 @@ var ts;
         if (resolved.resolvedModule) {
             return resolved.resolvedModule.resolvedFileName;
         }
-        errors.push(createDiagnostic(ts.Diagnostics.File_0_does_not_exist, extendedConfig));
+        errors.push(createDiagnostic(ts.Diagnostics.File_0_not_found, extendedConfig));
         return undefined;
     }
-    function getExtendedConfig(sourceFile, extendedConfigPath, host, basePath, resolutionStack, errors) {
+    function getExtendedConfig(sourceFile, extendedConfigPath, host, basePath, resolutionStack, errors, extendedConfigCache) {
         var _a;
-        var extendedResult = readJsonConfigFile(extendedConfigPath, function (path) { return host.readFile(path); });
+        var path = host.useCaseSensitiveFileNames ? extendedConfigPath : ts.toLowerCase(extendedConfigPath);
+        var value;
+        var extendedResult;
+        var extendedConfig;
+        if (extendedConfigCache && (value = extendedConfigCache.get(path))) {
+            (extendedResult = value.extendedResult, extendedConfig = value.extendedConfig);
+        }
+        else {
+            extendedResult = readJsonConfigFile(extendedConfigPath, function (path) { return host.readFile(path); });
+            if (!extendedResult.parseDiagnostics.length) {
+                var extendedDirname = ts.getDirectoryPath(extendedConfigPath);
+                extendedConfig = parseConfig(undefined, extendedResult, host, extendedDirname, ts.getBaseFileName(extendedConfigPath), resolutionStack, errors, extendedConfigCache);
+                if (isSuccessfulParsedTsconfig(extendedConfig)) {
+                    var relativeDifference_1 = ts.convertToRelativePath(extendedDirname, basePath, ts.identity);
+                    var updatePath_1 = function (path) { return ts.isRootedDiskPath(path) ? path : ts.combinePaths(relativeDifference_1, path); };
+                    var mapPropertiesInRawIfNotUndefined = function (propertyName) {
+                        if (raw_2[propertyName]) {
+                            raw_2[propertyName] = ts.map(raw_2[propertyName], updatePath_1);
+                        }
+                    };
+                    var raw_2 = extendedConfig.raw;
+                    mapPropertiesInRawIfNotUndefined("include");
+                    mapPropertiesInRawIfNotUndefined("exclude");
+                    mapPropertiesInRawIfNotUndefined("files");
+                }
+            }
+            if (extendedConfigCache) {
+                extendedConfigCache.set(path, { extendedResult: extendedResult, extendedConfig: extendedConfig });
+            }
+        }
         if (sourceFile) {
             sourceFile.extendedSourceFiles = [extendedResult.fileName];
+            if (extendedResult.extendedSourceFiles) {
+                (_a = sourceFile.extendedSourceFiles).push.apply(_a, extendedResult.extendedSourceFiles);
+            }
         }
         if (extendedResult.parseDiagnostics.length) {
             errors.push.apply(errors, extendedResult.parseDiagnostics);
             return undefined;
         }
-        var extendedDirname = ts.getDirectoryPath(extendedConfigPath);
-        var extendedConfig = parseConfig(undefined, extendedResult, host, extendedDirname, ts.getBaseFileName(extendedConfigPath), resolutionStack, errors);
-        if (sourceFile && extendedResult.extendedSourceFiles) {
-            (_a = sourceFile.extendedSourceFiles).push.apply(_a, extendedResult.extendedSourceFiles);
-        }
-        if (isSuccessfulParsedTsconfig(extendedConfig)) {
-            var relativeDifference_1 = ts.convertToRelativePath(extendedDirname, basePath, ts.identity);
-            var updatePath_1 = function (path) { return ts.isRootedDiskPath(path) ? path : ts.combinePaths(relativeDifference_1, path); };
-            var mapPropertiesInRawIfNotUndefined = function (propertyName) {
-                if (raw_2[propertyName]) {
-                    raw_2[propertyName] = ts.map(raw_2[propertyName], updatePath_1);
-                }
-            };
-            var raw_2 = extendedConfig.raw;
-            mapPropertiesInRawIfNotUndefined("include");
-            mapPropertiesInRawIfNotUndefined("exclude");
-            mapPropertiesInRawIfNotUndefined("files");
-        }
         return extendedConfig;
     }
     function convertCompileOnSaveOptionFromJson(jsonOption, basePath, errors) {
@@ -21170,7 +21559,18 @@ var ts;
         return !!compilerOptions.traceResolution && host.trace !== undefined;
     }
     ts.isTraceEnabled = isTraceEnabled;
-    function withPackageId(packageId, r) {
+    function withPackageId(packageInfo, r) {
+        var packageId;
+        if (r && packageInfo) {
+            var packageJsonContent = packageInfo.packageJsonContent;
+            if (typeof packageJsonContent.name === "string" && typeof packageJsonContent.version === "string") {
+                packageId = {
+                    name: packageJsonContent.name,
+                    subModuleName: r.path.slice(packageInfo.packageDirectory.length + ts.directorySeparator.length),
+                    version: packageJsonContent.version
+                };
+            }
+        }
         return r && { path: r.path, extension: r.ext, packageId: packageId };
     }
     function noPackageId(r) {
@@ -21221,8 +21621,15 @@ var ts;
     }
     function readPackageJsonPathField(jsonContent, fieldName, baseDirectory, state) {
         var fileName = readPackageJsonField(jsonContent, fieldName, "string", state);
-        if (fileName === undefined)
+        if (fileName === undefined) {
             return;
+        }
+        if (!fileName) {
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.package_json_had_a_falsy_0_field, fieldName);
+            }
+            return;
+        }
         var path = ts.normalizePath(ts.combinePaths(baseDirectory, fileName));
         if (state.traceEnabled) {
             trace(state.host, ts.Diagnostics.package_json_has_0_field_1_that_references_2, fieldName, fileName, path);
@@ -21363,7 +21770,12 @@ var ts;
             var fileName = resolved.fileName, packageId = resolved.packageId;
             var resolvedFileName = options.preserveSymlinks ? fileName : realPath(fileName, host, traceEnabled);
             if (traceEnabled) {
-                trace(host, ts.Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2, typeReferenceDirectiveName, resolvedFileName, primary);
+                if (packageId) {
+                    trace(host, ts.Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_with_Package_ID_2_primary_Colon_3, typeReferenceDirectiveName, resolvedFileName, ts.packageIdToString(packageId), primary);
+                }
+                else {
+                    trace(host, ts.Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2, typeReferenceDirectiveName, resolvedFileName, primary);
+                }
             }
             resolvedTypeReferenceDirective = { primary: primary, resolvedFileName: resolvedFileName, packageId: packageId, isExternalLibraryImport: pathContainsNodeModules(fileName) };
         }
@@ -21448,19 +21860,27 @@ var ts;
         return result;
     }
     ts.getAutomaticTypeDirectiveNames = getAutomaticTypeDirectiveNames;
-    function createModuleResolutionCache(currentDirectory, getCanonicalFileName) {
-        return createModuleResolutionCacheWithMaps(createCacheWithRedirects(), createCacheWithRedirects(), currentDirectory, getCanonicalFileName);
+    function createModuleResolutionCache(currentDirectory, getCanonicalFileName, options) {
+        return createModuleResolutionCacheWithMaps(createCacheWithRedirects(options), createCacheWithRedirects(options), currentDirectory, getCanonicalFileName);
     }
     ts.createModuleResolutionCache = createModuleResolutionCache;
-    function createCacheWithRedirects() {
+    function createCacheWithRedirects(options) {
         var ownMap = ts.createMap();
         var redirectsMap = ts.createMap();
         return {
             ownMap: ownMap,
             redirectsMap: redirectsMap,
             getOrCreateMapOfCacheRedirects: getOrCreateMapOfCacheRedirects,
-            clear: clear
+            clear: clear,
+            setOwnOptions: setOwnOptions,
+            setOwnMap: setOwnMap
         };
+        function setOwnOptions(newOptions) {
+            options = newOptions;
+        }
+        function setOwnMap(newOwnMap) {
+            ownMap = newOwnMap;
+        }
         function getOrCreateMapOfCacheRedirects(redirectedReference) {
             if (!redirectedReference) {
                 return ownMap;
@@ -21468,7 +21888,7 @@ var ts;
             var path = redirectedReference.sourceFile.path;
             var redirects = redirectsMap.get(path);
             if (!redirects) {
-                redirects = ts.createMap();
+                redirects = !options || ts.optionsHaveModuleResolutionChanges(options, redirectedReference.commandLine.options) ? ts.createMap() : ownMap;
                 redirectsMap.set(path, redirects);
             }
             return redirects;
@@ -21480,7 +21900,7 @@ var ts;
     }
     ts.createCacheWithRedirects = createCacheWithRedirects;
     function createModuleResolutionCacheWithMaps(directoryToModuleNameMap, moduleNameToDirectoryMap, currentDirectory, getCanonicalFileName) {
-        return { getOrCreateCacheForDirectory: getOrCreateCacheForDirectory, getOrCreateCacheForModuleName: getOrCreateCacheForModuleName };
+        return { getOrCreateCacheForDirectory: getOrCreateCacheForDirectory, getOrCreateCacheForModuleName: getOrCreateCacheForModuleName, directoryToModuleNameMap: directoryToModuleNameMap, moduleNameToDirectoryMap: moduleNameToDirectoryMap };
         function getOrCreateCacheForDirectory(directoryName, redirectedReference) {
             var path = ts.toPath(directoryName, currentDirectory, getCanonicalFileName);
             return getOrCreateCache(directoryToModuleNameMap, redirectedReference, path, ts.createMap);
@@ -21603,7 +22023,12 @@ var ts;
         }
         if (traceEnabled) {
             if (result.resolvedModule) {
-                trace(host, ts.Diagnostics.Module_name_0_was_successfully_resolved_to_1, moduleName, result.resolvedModule.resolvedFileName);
+                if (result.resolvedModule.packageId) {
+                    trace(host, ts.Diagnostics.Module_name_0_was_successfully_resolved_to_1_with_Package_ID_2, moduleName, result.resolvedModule.resolvedFileName, ts.packageIdToString(result.resolvedModule.packageId));
+                }
+                else {
+                    trace(host, ts.Diagnostics.Module_name_0_was_successfully_resolved_to_1, moduleName, result.resolvedModule.resolvedFileName);
+                }
             }
             else {
                 trace(host, ts.Diagnostics.Module_name_0_was_not_resolved, moduleName);
@@ -21798,10 +22223,9 @@ var ts;
             }
             var resolvedFromFile = loadModuleFromFile(extensions, candidate, onlyRecordFailures, state);
             if (resolvedFromFile) {
-                var nm = considerPackageJson ? parseNodeModuleFromPath(resolvedFromFile) : undefined;
-                var packageInfo = nm && getPackageJsonInfo(nm.packageDirectory, nm.subModuleName, false, state);
-                var packageId = packageInfo && packageInfo.packageId;
-                return withPackageId(packageId, resolvedFromFile);
+                var packageDirectory = considerPackageJson ? parseNodeModuleFromPath(resolvedFromFile) : undefined;
+                var packageInfo = packageDirectory ? getPackageJsonInfo(packageDirectory, false, state) : undefined;
+                return withPackageId(packageInfo, resolvedFromFile);
             }
         }
         if (!onlyRecordFailures) {
@@ -21831,26 +22255,12 @@ var ts;
         if (path.charCodeAt(indexAfterNodeModules) === 64) {
             indexAfterPackageName = moveToNextDirectorySeparatorIfAvailable(path, indexAfterPackageName);
         }
-        var packageDirectory = path.slice(0, indexAfterPackageName);
-        var subModuleName = ts.removeExtension(path.slice(indexAfterPackageName + 1), resolved.ext) + ".d.ts";
-        return { packageDirectory: packageDirectory, subModuleName: subModuleName };
+        return path.slice(0, indexAfterPackageName);
     }
     function moveToNextDirectorySeparatorIfAvailable(path, prevSeparatorIndex) {
         var nextSeparatorIndex = path.indexOf(ts.directorySeparator, prevSeparatorIndex + 1);
         return nextSeparatorIndex === -1 ? prevSeparatorIndex : nextSeparatorIndex;
     }
-    function addExtensionAndIndex(path) {
-        if (path === "") {
-            return "index.d.ts";
-        }
-        if (ts.endsWith(path, ".d.ts")) {
-            return path;
-        }
-        if (path === "index" || ts.endsWith(path, "/index")) {
-            return path + ".d.ts";
-        }
-        return path + "/index.d.ts";
-    }
     function loadModuleFromFileNoPackageId(extensions, candidate, onlyRecordFailures, state) {
         return noPackageId(loadModuleFromFile(extensions, candidate, onlyRecordFailures, state));
     }
@@ -21914,52 +22324,22 @@ var ts;
     }
     function loadNodeModuleFromDirectory(extensions, candidate, onlyRecordFailures, state, considerPackageJson) {
         if (considerPackageJson === void 0) { considerPackageJson = true; }
-        var packageInfo = considerPackageJson ? getPackageJsonInfo(candidate, "", onlyRecordFailures, state) : undefined;
-        var packageId = packageInfo && packageInfo.packageId;
+        var packageInfo = considerPackageJson ? getPackageJsonInfo(candidate, onlyRecordFailures, state) : undefined;
         var packageJsonContent = packageInfo && packageInfo.packageJsonContent;
-        var versionPaths = packageJsonContent && readPackageJsonTypesVersionPaths(packageJsonContent, state);
-        return withPackageId(packageId, loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageJsonContent, versionPaths));
+        var versionPaths = packageInfo && packageInfo.versionPaths;
+        return withPackageId(packageInfo, loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageJsonContent, versionPaths));
     }
-    function getPackageJsonInfo(packageDirectory, subModuleName, onlyRecordFailures, state) {
+    function getPackageJsonInfo(packageDirectory, onlyRecordFailures, state) {
         var host = state.host, traceEnabled = state.traceEnabled;
         var directoryExists = !onlyRecordFailures && ts.directoryProbablyExists(packageDirectory, host);
         var packageJsonPath = ts.combinePaths(packageDirectory, "package.json");
         if (directoryExists && host.fileExists(packageJsonPath)) {
             var packageJsonContent = ts.readJson(packageJsonPath, host);
-            if (subModuleName === "") {
-                var path = readPackageJsonTypesFields(packageJsonContent, packageDirectory, state);
-                if (typeof path === "string") {
-                    subModuleName = addExtensionAndIndex(path.substring(packageDirectory.length + 1));
-                }
-                else {
-                    var jsPath = readPackageJsonMainField(packageJsonContent, packageDirectory, state);
-                    if (typeof jsPath === "string" && jsPath.length > packageDirectory.length) {
-                        var potentialSubModule_1 = jsPath.substring(packageDirectory.length + 1);
-                        subModuleName = (ts.forEach(ts.supportedJSExtensions, function (extension) {
-                            return ts.tryRemoveExtension(potentialSubModule_1, extension);
-                        }) || potentialSubModule_1) + ".d.ts";
-                    }
-                    else {
-                        subModuleName = "index.d.ts";
-                    }
-                }
-            }
-            if (!ts.endsWith(subModuleName, ".d.ts")) {
-                subModuleName = addExtensionAndIndex(subModuleName);
+            if (traceEnabled) {
+                trace(host, ts.Diagnostics.Found_package_json_at_0, packageJsonPath);
             }
             var versionPaths = readPackageJsonTypesVersionPaths(packageJsonContent, state);
-            var packageId = typeof packageJsonContent.name === "string" && typeof packageJsonContent.version === "string"
-                ? { name: packageJsonContent.name, subModuleName: subModuleName, version: packageJsonContent.version }
-                : undefined;
-            if (traceEnabled) {
-                if (packageId) {
-                    trace(host, ts.Diagnostics.Found_package_json_at_0_Package_ID_is_1, packageJsonPath, ts.packageIdToString(packageId));
-                }
-                else {
-                    trace(host, ts.Diagnostics.Found_package_json_at_0, packageJsonPath);
-                }
-            }
-            return { packageJsonContent: packageJsonContent, packageId: packageId, versionPaths: versionPaths };
+            return { packageDirectory: packageDirectory, packageJsonContent: packageJsonContent, versionPaths: versionPaths };
         }
         else {
             if (directoryExists && traceEnabled) {
@@ -22088,36 +22468,30 @@ var ts;
     }
     function loadModuleFromSpecificNodeModulesDirectory(extensions, moduleName, nodeModulesDirectory, nodeModulesDirectoryExists, state) {
         var candidate = ts.normalizePath(ts.combinePaths(nodeModulesDirectory, moduleName));
-        var packageJsonContent;
-        var packageId;
-        var versionPaths;
-        var packageInfo = getPackageJsonInfo(candidate, "", !nodeModulesDirectoryExists, state);
+        var packageInfo = getPackageJsonInfo(candidate, !nodeModulesDirectoryExists, state);
         if (packageInfo) {
-            (packageJsonContent = packageInfo.packageJsonContent, packageId = packageInfo.packageId, versionPaths = packageInfo.versionPaths);
             var fromFile = loadModuleFromFile(extensions, candidate, !nodeModulesDirectoryExists, state);
             if (fromFile) {
                 return noPackageId(fromFile);
             }
-            var fromDirectory = loadNodeModuleFromDirectoryWorker(extensions, candidate, !nodeModulesDirectoryExists, state, packageJsonContent, versionPaths);
-            return withPackageId(packageId, fromDirectory);
+            var fromDirectory = loadNodeModuleFromDirectoryWorker(extensions, candidate, !nodeModulesDirectoryExists, state, packageInfo.packageJsonContent, packageInfo.versionPaths);
+            return withPackageId(packageInfo, fromDirectory);
         }
         var loader = function (extensions, candidate, onlyRecordFailures, state) {
             var pathAndExtension = loadModuleFromFile(extensions, candidate, onlyRecordFailures, state) ||
-                loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageJsonContent, versionPaths);
-            return withPackageId(packageId, pathAndExtension);
+                loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageInfo && packageInfo.packageJsonContent, packageInfo && packageInfo.versionPaths);
+            return withPackageId(packageInfo, pathAndExtension);
         };
         var _a = parsePackageName(moduleName), packageName = _a.packageName, rest = _a.rest;
         if (rest !== "") {
             var packageDirectory = ts.combinePaths(nodeModulesDirectory, packageName);
-            var packageInfo_1 = getPackageJsonInfo(packageDirectory, rest, !nodeModulesDirectoryExists, state);
-            if (packageInfo_1)
-                (packageId = packageInfo_1.packageId, versionPaths = packageInfo_1.versionPaths);
-            if (versionPaths) {
+            packageInfo = getPackageJsonInfo(packageDirectory, !nodeModulesDirectoryExists, state);
+            if (packageInfo && packageInfo.versionPaths) {
                 if (state.traceEnabled) {
-                    trace(state.host, ts.Diagnostics.package_json_has_a_typesVersions_entry_0_that_matches_compiler_version_1_looking_for_a_pattern_to_match_module_name_2, versionPaths.version, ts.version, rest);
+                    trace(state.host, ts.Diagnostics.package_json_has_a_typesVersions_entry_0_that_matches_compiler_version_1_looking_for_a_pattern_to_match_module_name_2, packageInfo.versionPaths.version, ts.version, rest);
                 }
                 var packageDirectoryExists = nodeModulesDirectoryExists && ts.directoryProbablyExists(packageDirectory, state.host);
-                var fromPaths = tryLoadModuleUsingPaths(extensions, rest, packageDirectory, versionPaths.paths, loader, !packageDirectoryExists, state);
+                var fromPaths = tryLoadModuleUsingPaths(extensions, rest, packageDirectory, packageInfo.versionPaths.paths, loader, !packageDirectoryExists, state);
                 if (fromPaths) {
                     return fromPaths.value;
                 }
@@ -22257,21 +22631,21 @@ var ts;
     ts.getModuleInstanceState = getModuleInstanceState;
     function getModuleInstanceStateWorker(node) {
         switch (node.kind) {
-            case 241:
             case 242:
-                return 0;
             case 243:
+                return 0;
+            case 244:
                 if (ts.isEnumConst(node)) {
                     return 2;
                 }
                 break;
+            case 250:
             case 249:
-            case 248:
                 if (!(ts.hasModifier(node, 1))) {
                     return 0;
                 }
                 break;
-            case 245: {
+            case 246: {
                 var state_1 = 0;
                 ts.forEachChild(node, function (n) {
                     var childState = getModuleInstanceStateWorker(n);
@@ -22290,9 +22664,9 @@ var ts;
                 });
                 return state_1;
             }
-            case 244:
+            case 245:
                 return getModuleInstanceState(node);
-            case 72:
+            case 73:
                 if (node.isInJSDocNamespace) {
                     return 0;
                 }
@@ -22415,7 +22789,7 @@ var ts;
             }
         }
         function getDeclarationName(node) {
-            if (node.kind === 254) {
+            if (node.kind === 255) {
                 return node.isExportEquals ? "export=" : "default";
             }
             var name = ts.getNameOfDeclaration(node);
@@ -22424,42 +22798,45 @@ var ts;
                     var moduleName = ts.getTextOfIdentifierOrLiteral(name);
                     return (ts.isGlobalScopeAugmentation(node) ? "__global" : "\"" + moduleName + "\"");
                 }
-                if (name.kind === 149) {
+                if (name.kind === 150) {
                     var nameExpression = name.expression;
                     if (ts.isStringOrNumericLiteralLike(nameExpression)) {
                         return ts.escapeLeadingUnderscores(nameExpression.text);
                     }
+                    if (ts.isSignedNumericLiteral(nameExpression)) {
+                        return ts.tokenToString(nameExpression.operator) + nameExpression.operand.text;
+                    }
                     ts.Debug.assert(ts.isWellKnownSymbolSyntactically(nameExpression));
                     return ts.getPropertyNameForKnownSymbolName(ts.idText(nameExpression.name));
                 }
                 return ts.isPropertyNameLiteral(name) ? ts.getEscapedTextOfIdentifierOrLiteral(name) : undefined;
             }
             switch (node.kind) {
-                case 157:
+                case 158:
                     return "__constructor";
-                case 165:
-                case 160:
-                case 298:
-                    return "__call";
                 case 166:
                 case 161:
-                    return "__new";
+                case 299:
+                    return "__call";
+                case 167:
                 case 162:
+                    return "__new";
+                case 163:
                     return "__index";
-                case 255:
+                case 256:
                     return "__export";
-                case 284:
+                case 285:
                     return "export=";
-                case 204:
+                case 205:
                     if (ts.getAssignmentDeclarationKind(node) === 2) {
                         return "export=";
                     }
                     ts.Debug.fail("Unknown binary declaration kind");
                     break;
-                case 294:
+                case 295:
                     return (ts.isJSDocConstructSignature(node) ? "__new" : "__call");
-                case 151:
-                    ts.Debug.assert(node.parent.kind === 294, "Impossible parameter parent kind", function () { return "parent is: " + (ts.SyntaxKind ? ts.SyntaxKind[node.parent.kind] : node.parent.kind) + ", expected JSDocFunctionType"; });
+                case 152:
+                    ts.Debug.assert(node.parent.kind === 295, "Impossible parameter parent kind", function () { return "parent is: " + (ts.SyntaxKind ? ts.SyntaxKind[node.parent.kind] : node.parent.kind) + ", expected JSDocFunctionType"; });
                     var functionType = node.parent;
                     var index = functionType.parameters.indexOf(node);
                     return "arg" + index;
@@ -22505,24 +22882,34 @@ var ts;
                             message_1 = ts.Diagnostics.Enum_declarations_can_only_merge_with_namespace_or_other_enum_declarations;
                             messageNeedsName_1 = false;
                         }
-                        if (symbol.declarations && symbol.declarations.length) {
+                        var multipleDefaultExports_1 = false;
+                        if (ts.length(symbol.declarations)) {
                             if (isDefaultExport) {
                                 message_1 = ts.Diagnostics.A_module_cannot_have_multiple_default_exports;
                                 messageNeedsName_1 = false;
+                                multipleDefaultExports_1 = true;
                             }
                             else {
                                 if (symbol.declarations && symbol.declarations.length &&
-                                    (node.kind === 254 && !node.isExportEquals)) {
+                                    (node.kind === 255 && !node.isExportEquals)) {
                                     message_1 = ts.Diagnostics.A_module_cannot_have_multiple_default_exports;
                                     messageNeedsName_1 = false;
+                                    multipleDefaultExports_1 = true;
                                 }
                             }
                         }
-                        var addError = function (decl) {
-                            file.bindDiagnostics.push(createDiagnosticForNode(ts.getNameOfDeclaration(decl) || decl, message_1, messageNeedsName_1 ? getDisplayName(decl) : undefined));
-                        };
-                        ts.forEach(symbol.declarations, addError);
-                        addError(node);
+                        var declarationName_1 = ts.getNameOfDeclaration(node) || node;
+                        var relatedInformation_1 = [];
+                        ts.forEach(symbol.declarations, function (declaration, index) {
+                            var decl = ts.getNameOfDeclaration(declaration) || declaration;
+                            var diag = createDiagnosticForNode(decl, message_1, messageNeedsName_1 ? getDisplayName(declaration) : undefined);
+                            file.bindDiagnostics.push(multipleDefaultExports_1 ? ts.addRelatedInfo(diag, createDiagnosticForNode(declarationName_1, index === 0 ? ts.Diagnostics.Another_export_default_is_here : ts.Diagnostics.and_here)) : diag);
+                            if (multipleDefaultExports_1) {
+                                relatedInformation_1.push(createDiagnosticForNode(decl, ts.Diagnostics.The_first_export_default_is_here));
+                            }
+                        });
+                        var diag = createDiagnosticForNode(declarationName_1, message_1, messageNeedsName_1 ? getDisplayName(node) : undefined);
+                        file.bindDiagnostics.push(multipleDefaultExports_1 ? ts.addRelatedInfo.apply(void 0, [diag].concat(relatedInformation_1)) : diag);
                         symbol = createSymbol(0, name);
                     }
                 }
@@ -22539,7 +22926,7 @@ var ts;
         function declareModuleMember(node, symbolFlags, symbolExcludes) {
             var hasExportModifier = ts.getCombinedModifierFlags(node) & 1;
             if (symbolFlags & 2097152) {
-                if (node.kind === 257 || (node.kind === 248 && hasExportModifier)) {
+                if (node.kind === 258 || (node.kind === 249 && hasExportModifier)) {
                     return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);
                 }
                 else {
@@ -22569,7 +22956,7 @@ var ts;
             var saveThisParentContainer = thisParentContainer;
             var savedBlockScopeContainer = blockScopeContainer;
             if (containerFlags & 1) {
-                if (node.kind !== 197) {
+                if (node.kind !== 198) {
                     thisParentContainer = container;
                 }
                 container = blockScopeContainer = node;
@@ -22598,7 +22985,7 @@ var ts;
                         currentFlow.container = node;
                     }
                 }
-                currentReturnTarget = isIIFE || node.kind === 157 ? createBranchLabel() : undefined;
+                currentReturnTarget = isIIFE || node.kind === 158 ? createBranchLabel() : undefined;
                 currentBreakTarget = undefined;
                 currentContinueTarget = undefined;
                 activeLabels = undefined;
@@ -22611,13 +22998,13 @@ var ts;
                     if (hasExplicitReturn)
                         node.flags |= 256;
                 }
-                if (node.kind === 284) {
+                if (node.kind === 285) {
                     node.flags |= emitFlags;
                 }
                 if (currentReturnTarget) {
                     addAntecedent(currentReturnTarget, currentFlow);
                     currentFlow = finishFlowLabel(currentReturnTarget);
-                    if (node.kind === 157) {
+                    if (node.kind === 158) {
                         node.returnFlowNode = currentFlow;
                     }
                 }
@@ -22661,8 +23048,8 @@ var ts;
             }
         }
         function bindEachFunctionsFirst(nodes) {
-            bindEach(nodes, function (n) { return n.kind === 239 ? bind(n) : undefined; });
-            bindEach(nodes, function (n) { return n.kind !== 239 ? bind(n) : undefined; });
+            bindEach(nodes, function (n) { return n.kind === 240 ? bind(n) : undefined; });
+            bindEach(nodes, function (n) { return n.kind !== 240 ? bind(n) : undefined; });
         }
         function bindEach(nodes, bindFunction) {
             if (bindFunction === void 0) { bindFunction = bind; }
@@ -22695,77 +23082,77 @@ var ts;
                 return;
             }
             switch (node.kind) {
-                case 224:
+                case 225:
                     bindWhileStatement(node);
                     break;
-                case 223:
+                case 224:
                     bindDoStatement(node);
                     break;
-                case 225:
+                case 226:
                     bindForStatement(node);
                     break;
-                case 226:
                 case 227:
+                case 228:
                     bindForInOrForOfStatement(node);
                     break;
-                case 222:
+                case 223:
                     bindIfStatement(node);
                     break;
-                case 230:
-                case 234:
+                case 231:
+                case 235:
                     bindReturnOrThrow(node);
                     break;
+                case 230:
                 case 229:
-                case 228:
                     bindBreakOrContinueStatement(node);
                     break;
-                case 235:
+                case 236:
                     bindTryStatement(node);
                     break;
-                case 232:
+                case 233:
                     bindSwitchStatement(node);
                     break;
-                case 246:
+                case 247:
                     bindCaseBlock(node);
                     break;
-                case 271:
+                case 272:
                     bindCaseClause(node);
                     break;
-                case 233:
+                case 234:
                     bindLabeledStatement(node);
                     break;
-                case 202:
+                case 203:
                     bindPrefixUnaryExpressionFlow(node);
                     break;
-                case 203:
+                case 204:
                     bindPostfixUnaryExpressionFlow(node);
                     break;
-                case 204:
+                case 205:
                     bindBinaryExpressionFlow(node);
                     break;
-                case 198:
+                case 199:
                     bindDeleteExpressionFlow(node);
                     break;
-                case 205:
+                case 206:
                     bindConditionalExpressionFlow(node);
                     break;
-                case 237:
+                case 238:
                     bindVariableDeclarationFlow(node);
                     break;
-                case 191:
+                case 192:
                     bindCallExpressionFlow(node);
                     break;
-                case 309:
-                case 302:
+                case 311:
+                case 304:
                     bindJSDocTypeAlias(node);
                     break;
-                case 284: {
+                case 285: {
                     bindEachFunctionsFirst(node.statements);
                     bind(node.endOfFileToken);
                     break;
                 }
-                case 218:
-                case 245:
+                case 219:
+                case 246:
                     bindEachFunctionsFirst(node.statements);
                     break;
                 default:
@@ -22776,26 +23163,26 @@ var ts;
         }
         function isNarrowingExpression(expr) {
             switch (expr.kind) {
-                case 72:
-                case 100:
-                case 189:
+                case 73:
+                case 101:
                 case 190:
-                    return isNarrowableReference(expr);
                 case 191:
+                    return isNarrowableReference(expr);
+                case 192:
                     return hasNarrowableArgument(expr);
-                case 195:
+                case 196:
                     return isNarrowingExpression(expr.expression);
-                case 204:
+                case 205:
                     return isNarrowingBinaryExpression(expr);
-                case 202:
+                case 203:
                     return expr.operator === 52 && isNarrowingExpression(expr.operand);
-                case 199:
+                case 200:
                     return isNarrowingExpression(expr.expression);
             }
             return false;
         }
         function isNarrowableReference(expr) {
-            return expr.kind === 72 || expr.kind === 100 || expr.kind === 98 ||
+            return expr.kind === 73 || expr.kind === 101 || expr.kind === 99 ||
                 (ts.isPropertyAccessExpression(expr) || ts.isNonNullExpression(expr) || ts.isParenthesizedExpression(expr)) && isNarrowableReference(expr.expression) ||
                 ts.isElementAccessExpression(expr) && expr.argumentExpression &&
                     (ts.isStringLiteral(expr.argumentExpression) || ts.isNumericLiteral(expr.argumentExpression)) &&
@@ -22810,7 +23197,7 @@ var ts;
                     }
                 }
             }
-            if (expr.expression.kind === 189 &&
+            if (expr.expression.kind === 190 &&
                 isNarrowableReference(expr.expression.expression)) {
                 return true;
             }
@@ -22824,7 +23211,7 @@ var ts;
         }
         function isNarrowingBinaryExpression(expr) {
             switch (expr.operatorToken.kind) {
-                case 59:
+                case 60:
                     return isNarrowableReference(expr.left);
                 case 33:
                 case 34:
@@ -22832,9 +23219,9 @@ var ts;
                 case 36:
                     return isNarrowableOperand(expr.left) || isNarrowableOperand(expr.right) ||
                         isNarrowingTypeofOperands(expr.right, expr.left) || isNarrowingTypeofOperands(expr.left, expr.right);
-                case 94:
+                case 95:
                     return isNarrowableOperand(expr.left);
-                case 93:
+                case 94:
                     return isNarrowableInOperands(expr.left, expr.right);
                 case 27:
                     return isNarrowingExpression(expr.right);
@@ -22843,11 +23230,11 @@ var ts;
         }
         function isNarrowableOperand(expr) {
             switch (expr.kind) {
-                case 195:
+                case 196:
                     return isNarrowableOperand(expr.expression);
-                case 204:
+                case 205:
                     switch (expr.operatorToken.kind) {
-                        case 59:
+                        case 60:
                             return isNarrowableOperand(expr.left);
                         case 27:
                             return isNarrowableOperand(expr.right);
@@ -22883,8 +23270,8 @@ var ts;
             if (!expression) {
                 return flags & 32 ? antecedent : unreachableFlow;
             }
-            if (expression.kind === 102 && flags & 64 ||
-                expression.kind === 87 && flags & 32) {
+            if (expression.kind === 103 && flags & 64 ||
+                expression.kind === 88 && flags & 32) {
                 return unreachableFlow;
             }
             if (!isNarrowingExpression(expression)) {
@@ -22922,33 +23309,33 @@ var ts;
         function isStatementCondition(node) {
             var parent = node.parent;
             switch (parent.kind) {
-                case 222:
-                case 224:
                 case 223:
-                    return parent.expression === node;
                 case 225:
-                case 205:
+                case 224:
+                    return parent.expression === node;
+                case 226:
+                case 206:
                     return parent.condition === node;
             }
             return false;
         }
         function isLogicalExpression(node) {
             while (true) {
-                if (node.kind === 195) {
+                if (node.kind === 196) {
                     node = node.expression;
                 }
-                else if (node.kind === 202 && node.operator === 52) {
+                else if (node.kind === 203 && node.operator === 52) {
                     node = node.operand;
                 }
                 else {
-                    return node.kind === 204 && (node.operatorToken.kind === 54 ||
+                    return node.kind === 205 && (node.operatorToken.kind === 54 ||
                         node.operatorToken.kind === 55);
                 }
             }
         }
         function isTopLevelLogicalExpression(node) {
-            while (node.parent.kind === 195 ||
-                node.parent.kind === 202 &&
+            while (node.parent.kind === 196 ||
+                node.parent.kind === 203 &&
                     node.parent.operator === 52) {
                 node = node.parent;
             }
@@ -22990,7 +23377,7 @@ var ts;
         }
         function bindDoStatement(node) {
             var preDoLabel = createLoopLabel();
-            var enclosingLabeledStatement = node.parent.kind === 233
+            var enclosingLabeledStatement = node.parent.kind === 234
                 ? ts.lastOrUndefined(activeLabels)
                 : undefined;
             var preConditionLabel = enclosingLabeledStatement ? enclosingLabeledStatement.continueTarget : createBranchLabel();
@@ -23022,13 +23409,13 @@ var ts;
             var postLoopLabel = createBranchLabel();
             addAntecedent(preLoopLabel, currentFlow);
             currentFlow = preLoopLabel;
-            if (node.kind === 227) {
+            if (node.kind === 228) {
                 bind(node.awaitModifier);
             }
             bind(node.expression);
             addAntecedent(postLoopLabel, currentFlow);
             bind(node.initializer);
-            if (node.initializer.kind !== 238) {
+            if (node.initializer.kind !== 239) {
                 bindAssignmentTargetFlow(node.initializer);
             }
             bindIterativeStatement(node.statement, postLoopLabel, preLoopLabel);
@@ -23050,7 +23437,7 @@ var ts;
         }
         function bindReturnOrThrow(node) {
             bind(node.expression);
-            if (node.kind === 230) {
+            if (node.kind === 231) {
                 hasExplicitReturn = true;
                 if (currentReturnTarget) {
                     addAntecedent(currentReturnTarget, currentFlow);
@@ -23070,7 +23457,7 @@ var ts;
             return undefined;
         }
         function bindBreakOrContinueFlow(node, breakTarget, continueTarget) {
-            var flowLabel = node.kind === 229 ? breakTarget : continueTarget;
+            var flowLabel = node.kind === 230 ? breakTarget : continueTarget;
             if (flowLabel) {
                 addAntecedent(flowLabel, currentFlow);
                 currentFlow = unreachableFlow;
@@ -23160,7 +23547,7 @@ var ts;
             preSwitchCaseFlow = currentFlow;
             bind(node.caseBlock);
             addAntecedent(postSwitchLabel, currentFlow);
-            var hasDefault = ts.forEach(node.caseBlock.clauses, function (c) { return c.kind === 272; });
+            var hasDefault = ts.forEach(node.caseBlock.clauses, function (c) { return c.kind === 273; });
             node.possiblyExhaustive = !hasDefault && !postSwitchLabel.antecedents;
             if (!hasDefault) {
                 addAntecedent(postSwitchLabel, createFlowSwitchClause(preSwitchCaseFlow, node, 0, 0));
@@ -23225,13 +23612,13 @@ var ts;
             if (!activeLabel.referenced && !options.allowUnusedLabels) {
                 errorOrSuggestionOnNode(ts.unusedLabelIsError(options), node.label, ts.Diagnostics.Unused_label);
             }
-            if (!node.statement || node.statement.kind !== 223) {
+            if (!node.statement || node.statement.kind !== 224) {
                 addAntecedent(postStatementLabel, currentFlow);
                 currentFlow = finishFlowLabel(postStatementLabel);
             }
         }
         function bindDestructuringTargetFlow(node) {
-            if (node.kind === 204 && node.operatorToken.kind === 59) {
+            if (node.kind === 205 && node.operatorToken.kind === 60) {
                 bindAssignmentTargetFlow(node.left);
             }
             else {
@@ -23242,10 +23629,10 @@ var ts;
             if (isNarrowableReference(node)) {
                 currentFlow = createFlowAssignment(currentFlow, node);
             }
-            else if (node.kind === 187) {
+            else if (node.kind === 188) {
                 for (var _i = 0, _a = node.elements; _i < _a.length; _i++) {
                     var e = _a[_i];
-                    if (e.kind === 208) {
+                    if (e.kind === 209) {
                         bindAssignmentTargetFlow(e.expression);
                     }
                     else {
@@ -23253,16 +23640,16 @@ var ts;
                     }
                 }
             }
-            else if (node.kind === 188) {
+            else if (node.kind === 189) {
                 for (var _b = 0, _c = node.properties; _b < _c.length; _b++) {
                     var p = _c[_b];
-                    if (p.kind === 275) {
+                    if (p.kind === 276) {
                         bindDestructuringTargetFlow(p.initializer);
                     }
-                    else if (p.kind === 276) {
+                    else if (p.kind === 277) {
                         bindAssignmentTargetFlow(p.name);
                     }
-                    else if (p.kind === 277) {
+                    else if (p.kind === 278) {
                         bindAssignmentTargetFlow(p.expression);
                     }
                 }
@@ -23318,7 +23705,7 @@ var ts;
                 bindEachChild(node);
                 if (ts.isAssignmentOperator(operator) && !ts.isAssignmentTarget(node)) {
                     bindAssignmentTargetFlow(node.left);
-                    if (operator === 59 && node.left.kind === 190) {
+                    if (operator === 60 && node.left.kind === 191) {
                         var elementAccess = node.left;
                         if (isNarrowableOperand(elementAccess.expression)) {
                             currentFlow = createFlowArrayMutation(currentFlow, node);
@@ -23329,7 +23716,7 @@ var ts;
         }
         function bindDeleteExpressionFlow(node) {
             bindEachChild(node);
-            if (node.expression.kind === 189) {
+            if (node.expression.kind === 190) {
                 bindAssignmentTargetFlow(node.expression);
             }
         }
@@ -23374,10 +23761,10 @@ var ts;
         }
         function bindCallExpressionFlow(node) {
             var expr = node.expression;
-            while (expr.kind === 195) {
+            while (expr.kind === 196) {
                 expr = expr.expression;
             }
-            if (expr.kind === 196 || expr.kind === 197) {
+            if (expr.kind === 197 || expr.kind === 198) {
                 bindEach(node.typeArguments);
                 bindEach(node.arguments);
                 bind(node.expression);
@@ -23385,7 +23772,7 @@ var ts;
             else {
                 bindEachChild(node);
             }
-            if (node.expression.kind === 189) {
+            if (node.expression.kind === 190) {
                 var propertyAccess = node.expression;
                 if (isNarrowableOperand(propertyAccess.expression) && ts.isPushOrUnshiftIdentifier(propertyAccess.name)) {
                     currentFlow = createFlowArrayMutation(currentFlow, node);
@@ -23394,53 +23781,53 @@ var ts;
         }
         function getContainerFlags(node) {
             switch (node.kind) {
-                case 209:
-                case 240:
-                case 243:
-                case 188:
-                case 168:
-                case 297:
-                case 268:
-                    return 1;
+                case 210:
                 case 241:
-                    return 1 | 64;
                 case 244:
+                case 189:
+                case 169:
+                case 298:
+                case 269:
+                    return 1;
                 case 242:
-                case 181:
+                    return 1 | 64;
+                case 245:
+                case 243:
+                case 182:
                     return 1 | 32;
-                case 284:
+                case 285:
                     return 1 | 4 | 32;
-                case 156:
+                case 157:
                     if (ts.isObjectLiteralOrClassExpressionMethod(node)) {
                         return 1 | 4 | 32 | 8 | 128;
                     }
-                case 157:
-                case 239:
-                case 155:
                 case 158:
+                case 240:
+                case 156:
                 case 159:
                 case 160:
-                case 298:
-                case 294:
-                case 165:
                 case 161:
-                case 162:
+                case 299:
+                case 295:
                 case 166:
+                case 162:
+                case 163:
+                case 167:
                     return 1 | 4 | 32 | 8;
-                case 196:
                 case 197:
+                case 198:
                     return 1 | 4 | 32 | 8 | 16;
-                case 245:
+                case 246:
                     return 4;
-                case 154:
+                case 155:
                     return node.initializer ? 4 : 0;
-                case 274:
-                case 225:
+                case 275:
                 case 226:
                 case 227:
-                case 246:
+                case 228:
+                case 247:
                     return 2;
-                case 218:
+                case 219:
                     return ts.isFunctionLike(node.parent) ? 0 : 2;
             }
             return 0;
@@ -23453,40 +23840,40 @@ var ts;
         }
         function declareSymbolAndAddToSymbolTable(node, symbolFlags, symbolExcludes) {
             switch (container.kind) {
-                case 244:
+                case 245:
                     return declareModuleMember(node, symbolFlags, symbolExcludes);
-                case 284:
+                case 285:
                     return declareSourceFileMember(node, symbolFlags, symbolExcludes);
-                case 209:
-                case 240:
-                    return declareClassMember(node, symbolFlags, symbolExcludes);
-                case 243:
-                    return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);
-                case 168:
-                case 297:
-                case 188:
+                case 210:
                 case 241:
-                case 268:
-                    return declareSymbol(container.symbol.members, container.symbol, node, symbolFlags, symbolExcludes);
-                case 165:
-                case 166:
-                case 160:
-                case 161:
+                    return declareClassMember(node, symbolFlags, symbolExcludes);
+                case 244:
+                    return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);
+                case 169:
                 case 298:
+                case 189:
+                case 242:
+                case 269:
+                    return declareSymbol(container.symbol.members, container.symbol, node, symbolFlags, symbolExcludes);
+                case 166:
+                case 167:
+                case 161:
                 case 162:
-                case 156:
-                case 155:
+                case 299:
+                case 163:
                 case 157:
+                case 156:
                 case 158:
                 case 159:
-                case 239:
-                case 196:
+                case 160:
+                case 240:
                 case 197:
-                case 294:
-                case 309:
-                case 302:
-                case 242:
-                case 181:
+                case 198:
+                case 295:
+                case 311:
+                case 304:
+                case 243:
+                case 182:
                     return declareSymbol(container.locals, undefined, node, symbolFlags, symbolExcludes);
             }
         }
@@ -23501,16 +23888,8 @@ var ts;
                 : declareSymbol(file.locals, undefined, node, symbolFlags, symbolExcludes);
         }
         function hasExportDeclarations(node) {
-            var body = node.kind === 284 ? node : node.body;
-            if (body && (body.kind === 284 || body.kind === 245)) {
-                for (var _i = 0, _a = body.statements; _i < _a.length; _i++) {
-                    var stat = _a[_i];
-                    if (stat.kind === 255 || stat.kind === 254) {
-                        return true;
-                    }
-                }
-            }
-            return false;
+            var body = ts.isSourceFile(node) ? node : ts.tryCast(node.body, ts.isModuleBlock);
+            return !!body && body.statements.some(function (s) { return ts.isExportDeclaration(s) || ts.isExportAssignment(s); });
         }
         function setExportContextFlag(node) {
             if (node.flags & 4194304 && !hasExportDeclarations(node)) {
@@ -23573,11 +23952,11 @@ var ts;
                 var seen = ts.createUnderscoreEscapedMap();
                 for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
                     var prop = _a[_i];
-                    if (prop.kind === 277 || prop.name.kind !== 72) {
+                    if (prop.kind === 278 || prop.name.kind !== 73) {
                         continue;
                     }
                     var identifier = prop.name;
-                    var currentKind = prop.kind === 275 || prop.kind === 276 || prop.kind === 156
+                    var currentKind = prop.kind === 276 || prop.kind === 277 || prop.kind === 157
                         ? 1
                         : 2;
                     var existingKind = seen.get(identifier.escapedText);
@@ -23609,10 +23988,10 @@ var ts;
         }
         function bindBlockScopedDeclaration(node, symbolFlags, symbolExcludes) {
             switch (blockScopeContainer.kind) {
-                case 244:
+                case 245:
                     declareModuleMember(node, symbolFlags, symbolExcludes);
                     break;
-                case 284:
+                case 285:
                     if (ts.isExternalOrCommonJsModule(container)) {
                         declareModuleMember(node, symbolFlags, symbolExcludes);
                         break;
@@ -23642,7 +24021,7 @@ var ts;
                 currentFlow = { flags: 2 };
                 parent = typeAlias;
                 bind(typeAlias.typeExpression);
-                if (!typeAlias.fullName || typeAlias.fullName.kind === 72) {
+                if (!typeAlias.fullName || typeAlias.fullName.kind === 73) {
                     parent = typeAlias.parent;
                     bindBlockScopedDeclaration(typeAlias, 524288, 67897832);
                 }
@@ -23658,8 +24037,8 @@ var ts;
         }
         function checkStrictModeIdentifier(node) {
             if (inStrictMode &&
-                node.originalKeywordKind >= 109 &&
-                node.originalKeywordKind <= 117 &&
+                node.originalKeywordKind >= 110 &&
+                node.originalKeywordKind <= 118 &&
                 !ts.isIdentifierName(node) &&
                 !(node.flags & 4194304)) {
                 if (!file.parseDiagnostics.length) {
@@ -23687,7 +24066,7 @@ var ts;
             }
         }
         function checkStrictModeDeleteExpression(node) {
-            if (inStrictMode && node.expression.kind === 72) {
+            if (inStrictMode && node.expression.kind === 73) {
                 var span = ts.getErrorSpanForNode(file, node.expression);
                 file.bindDiagnostics.push(ts.createFileDiagnostic(file, span.start, span.length, ts.Diagnostics.delete_cannot_be_called_on_an_identifier_in_strict_mode));
             }
@@ -23696,7 +24075,7 @@ var ts;
             return ts.isIdentifier(node) && (node.escapedText === "eval" || node.escapedText === "arguments");
         }
         function checkStrictModeEvalOrArguments(contextNode, name) {
-            if (name && name.kind === 72) {
+            if (name && name.kind === 73) {
                 var identifier = name;
                 if (isEvalOrArgumentsIdentifier(identifier)) {
                     var span = ts.getErrorSpanForNode(file, name);
@@ -23729,8 +24108,8 @@ var ts;
         }
         function checkStrictModeFunctionDeclaration(node) {
             if (languageVersion < 2) {
-                if (blockScopeContainer.kind !== 284 &&
-                    blockScopeContainer.kind !== 244 &&
+                if (blockScopeContainer.kind !== 285 &&
+                    blockScopeContainer.kind !== 245 &&
                     !ts.isFunctionLike(blockScopeContainer)) {
                     var errorSpan = ts.getErrorSpanForNode(file, node);
                     file.bindDiagnostics.push(ts.createFileDiagnostic(file, errorSpan.start, errorSpan.length, getStrictModeBlockScopeFunctionDeclarationMessage(node)));
@@ -23792,7 +24171,7 @@ var ts;
             node.parent = parent;
             var saveInStrictMode = inStrictMode;
             bindWorker(node);
-            if (node.kind > 147) {
+            if (node.kind > 148) {
                 var saveParent = parent;
                 parent = node;
                 var containerFlags = getContainerFlags(node);
@@ -23850,7 +24229,7 @@ var ts;
         }
         function bindWorker(node) {
             switch (node.kind) {
-                case 72:
+                case 73:
                     if (node.isInJSDocNamespace) {
                         var parentNode = node.parent;
                         while (parentNode && !ts.isJSDocTypeAlias(parentNode)) {
@@ -23859,13 +24238,13 @@ var ts;
                         bindBlockScopedDeclaration(parentNode, 524288, 67897832);
                         break;
                     }
-                case 100:
-                    if (currentFlow && (ts.isExpression(node) || parent.kind === 276)) {
+                case 101:
+                    if (currentFlow && (ts.isExpression(node) || parent.kind === 277)) {
                         node.flowNode = currentFlow;
                     }
                     return checkStrictModeIdentifier(node);
-                case 189:
                 case 190:
+                case 191:
                     if (currentFlow && isNarrowableReference(node)) {
                         node.flowNode = currentFlow;
                     }
@@ -23879,7 +24258,7 @@ var ts;
                         declareSymbol(file.locals, undefined, node.expression, 1 | 134217728, 67220414);
                     }
                     break;
-                case 204:
+                case 205:
                     var specialKind = ts.getAssignmentDeclarationKind(node);
                     switch (specialKind) {
                         case 1:
@@ -23906,72 +24285,72 @@ var ts;
                             ts.Debug.fail("Unknown binary expression special property assignment kind");
                     }
                     return checkStrictModeBinaryExpression(node);
-                case 274:
+                case 275:
                     return checkStrictModeCatchClause(node);
-                case 198:
+                case 199:
                     return checkStrictModeDeleteExpression(node);
                 case 8:
                     return checkStrictModeNumericLiteral(node);
-                case 203:
+                case 204:
                     return checkStrictModePostfixUnaryExpression(node);
-                case 202:
+                case 203:
                     return checkStrictModePrefixUnaryExpression(node);
-                case 231:
+                case 232:
                     return checkStrictModeWithStatement(node);
-                case 233:
+                case 234:
                     return checkStrictModeLabeledStatement(node);
-                case 178:
+                case 179:
                     seenThisKeyword = true;
                     return;
-                case 163:
+                case 164:
                     break;
-                case 150:
-                    return bindTypeParameter(node);
                 case 151:
+                    return bindTypeParameter(node);
+                case 152:
                     return bindParameter(node);
-                case 237:
+                case 238:
                     return bindVariableDeclarationOrBindingElement(node);
-                case 186:
+                case 187:
                     node.flowNode = currentFlow;
                     return bindVariableDeclarationOrBindingElement(node);
+                case 155:
                 case 154:
-                case 153:
                     return bindPropertyWorker(node);
-                case 275:
                 case 276:
+                case 277:
                     return bindPropertyOrMethodOrAccessor(node, 4, 0);
-                case 278:
+                case 279:
                     return bindPropertyOrMethodOrAccessor(node, 8, 68008959);
-                case 160:
                 case 161:
                 case 162:
+                case 163:
                     return declareSymbolAndAddToSymbolTable(node, 131072, 0);
-                case 156:
-                case 155:
-                    return bindPropertyOrMethodOrAccessor(node, 8192 | (node.questionToken ? 16777216 : 0), ts.isObjectLiteralMethod(node) ? 0 : 67212223);
-                case 239:
-                    return bindFunctionDeclaration(node);
                 case 157:
-                    return declareSymbolAndAddToSymbolTable(node, 16384, 0);
+                case 156:
+                    return bindPropertyOrMethodOrAccessor(node, 8192 | (node.questionToken ? 16777216 : 0), ts.isObjectLiteralMethod(node) ? 0 : 67212223);
+                case 240:
+                    return bindFunctionDeclaration(node);
                 case 158:
-                    return bindPropertyOrMethodOrAccessor(node, 32768, 67154879);
+                    return declareSymbolAndAddToSymbolTable(node, 16384, 0);
                 case 159:
+                    return bindPropertyOrMethodOrAccessor(node, 32768, 67154879);
+                case 160:
                     return bindPropertyOrMethodOrAccessor(node, 65536, 67187647);
-                case 165:
-                case 294:
-                case 298:
                 case 166:
+                case 295:
+                case 299:
+                case 167:
                     return bindFunctionOrConstructorType(node);
-                case 168:
-                case 297:
-                case 181:
+                case 169:
+                case 298:
+                case 182:
                     return bindAnonymousTypeWorker(node);
-                case 188:
+                case 189:
                     return bindObjectLiteralExpression(node);
-                case 196:
                 case 197:
+                case 198:
                     return bindFunctionExpression(node);
-                case 191:
+                case 192:
                     var assignmentKind = ts.getAssignmentDeclarationKind(node);
                     switch (assignmentKind) {
                         case 7:
@@ -23989,59 +24368,59 @@ var ts;
                         bindCallExpression(node);
                     }
                     break;
-                case 209:
-                case 240:
+                case 210:
+                case 241:
                     inStrictMode = true;
                     return bindClassLikeDeclaration(node);
-                case 241:
-                    return bindBlockScopedDeclaration(node, 64, 67897736);
                 case 242:
-                    return bindBlockScopedDeclaration(node, 524288, 67897832);
+                    return bindBlockScopedDeclaration(node, 64, 67897736);
                 case 243:
-                    return bindEnumDeclaration(node);
+                    return bindBlockScopedDeclaration(node, 524288, 67897832);
                 case 244:
+                    return bindEnumDeclaration(node);
+                case 245:
                     return bindModuleDeclaration(node);
-                case 268:
+                case 269:
                     return bindJsxAttributes(node);
-                case 267:
+                case 268:
                     return bindJsxAttribute(node, 4, 0);
-                case 248:
-                case 251:
-                case 253:
-                case 257:
-                    return declareSymbolAndAddToSymbolTable(node, 2097152, 2097152);
-                case 247:
-                    return bindNamespaceExportDeclaration(node);
-                case 250:
-                    return bindImportClause(node);
-                case 255:
-                    return bindExportDeclaration(node);
+                case 249:
+                case 252:
                 case 254:
+                case 258:
+                    return declareSymbolAndAddToSymbolTable(node, 2097152, 2097152);
+                case 248:
+                    return bindNamespaceExportDeclaration(node);
+                case 251:
+                    return bindImportClause(node);
+                case 256:
+                    return bindExportDeclaration(node);
+                case 255:
                     return bindExportAssignment(node);
-                case 284:
+                case 285:
                     updateStrictModeStatementList(node.statements);
                     return bindSourceFileIfExternalModule();
-                case 218:
+                case 219:
                     if (!ts.isFunctionLike(node.parent)) {
                         return;
                     }
-                case 245:
+                case 246:
                     return updateStrictModeStatementList(node.statements);
-                case 304:
-                    if (node.parent.kind === 298) {
+                case 306:
+                    if (node.parent.kind === 299) {
                         return bindParameter(node);
                     }
-                    if (node.parent.kind !== 297) {
+                    if (node.parent.kind !== 298) {
                         break;
                     }
-                case 310:
+                case 312:
                     var propTag = node;
-                    var flags = propTag.isBracketed || propTag.typeExpression && propTag.typeExpression.type.kind === 293 ?
+                    var flags = propTag.isBracketed || propTag.typeExpression && propTag.typeExpression.type.kind === 294 ?
                         4 | 16777216 :
                         4;
                     return declareSymbolAndAddToSymbolTable(propTag, flags, 0);
-                case 309:
-                case 302:
+                case 311:
+                case 304:
                     return (delayedTypeAliases || (delayedTypeAliases = [])).push(node);
             }
         }
@@ -24169,10 +24548,10 @@ var ts;
             ts.Debug.assert(ts.isInJSFile(node));
             var thisContainer = ts.getThisContainer(node, false);
             switch (thisContainer.kind) {
-                case 239:
-                case 196:
+                case 240:
+                case 197:
                     var constructorSymbol = thisContainer.symbol;
-                    if (ts.isBinaryExpression(thisContainer.parent) && thisContainer.parent.operatorToken.kind === 59) {
+                    if (ts.isBinaryExpression(thisContainer.parent) && thisContainer.parent.operatorToken.kind === 60) {
                         var l = thisContainer.parent.left;
                         if (ts.isPropertyAccessEntityNameExpression(l) && ts.isPrototypeAccess(l.expression)) {
                             constructorSymbol = lookupSymbolForPropertyAccess(l.expression.expression, thisParentContainer);
@@ -24183,16 +24562,16 @@ var ts;
                         declareSymbol(constructorSymbol.members, constructorSymbol, node, 4, 0 & ~4);
                     }
                     break;
-                case 157:
-                case 154:
-                case 156:
                 case 158:
+                case 155:
+                case 157:
                 case 159:
+                case 160:
                     var containingClass = thisContainer.parent;
                     var symbolTable = ts.hasModifier(thisContainer, 32) ? containingClass.symbol.exports : containingClass.symbol.members;
                     declareSymbol(symbolTable, containingClass.symbol, node, 4, 0, true);
                     break;
-                case 284:
+                case 285:
                     if (thisContainer.commonJsModuleIndicator) {
                         declareSymbol(thisContainer.symbol.exports, thisContainer.symbol, node, 4 | 1048576, 0);
                     }
@@ -24201,14 +24580,14 @@ var ts;
                     }
                     break;
                 default:
-                    ts.Debug.fail(ts.Debug.showSyntaxKind(thisContainer));
+                    ts.Debug.failBadSyntaxKind(thisContainer);
             }
         }
         function bindSpecialPropertyDeclaration(node) {
-            if (node.expression.kind === 100) {
+            if (node.expression.kind === 101) {
                 bindThisPropertyAssignment(node);
             }
-            else if (ts.isPropertyAccessEntityNameExpression(node) && node.parent.parent.kind === 284) {
+            else if (ts.isPropertyAccessEntityNameExpression(node) && node.parent.parent.kind === 285) {
                 if (ts.isPrototypeAccess(node.expression)) {
                     bindPrototypePropertyAssignment(node, node.parent);
                 }
@@ -24237,7 +24616,7 @@ var ts;
         }
         function bindObjectDefinePropertyAssignment(node) {
             var namespaceSymbol = lookupSymbolForPropertyAccess(node.arguments[0]);
-            var isToplevel = node.parent.parent.kind === 284;
+            var isToplevel = node.parent.parent.kind === 285;
             namespaceSymbol = bindPotentiallyMissingNamespaces(namespaceSymbol, node.arguments[0], isToplevel, false);
             bindPotentiallyNewExpandoMemberToNamespace(node, namespaceSymbol, false);
         }
@@ -24249,7 +24628,7 @@ var ts;
             }
             node.left.parent = node;
             node.right.parent = node;
-            if (ts.isIdentifier(lhs.expression) && container === file && isNameOfExportsOrModuleExportsAliasDeclaration(file, lhs.expression)) {
+            if (ts.isIdentifier(lhs.expression) && container === file && isExportsOrModuleExportsOrAlias(file, lhs.expression)) {
                 bindExportsPropertyAssignment(node);
             }
             else {
@@ -24293,8 +24672,8 @@ var ts;
         function bindPropertyAssignment(name, propertyAccess, isPrototypeProperty) {
             var namespaceSymbol = lookupSymbolForPropertyAccess(name);
             var isToplevel = ts.isBinaryExpression(propertyAccess.parent)
-                ? getParentOfBinaryExpression(propertyAccess.parent).parent.kind === 284
-                : propertyAccess.parent.parent.kind === 284;
+                ? getParentOfBinaryExpression(propertyAccess.parent).parent.kind === 285
+                : propertyAccess.parent.parent.kind === 285;
             namespaceSymbol = bindPotentiallyMissingNamespaces(namespaceSymbol, propertyAccess.expression, isToplevel, isPrototypeProperty);
             bindPotentiallyNewExpandoMemberToNamespace(propertyAccess, namespaceSymbol, isPrototypeProperty);
         }
@@ -24343,9 +24722,7 @@ var ts;
             }
             else {
                 var s = forEachIdentifierInEntityName(e.expression, parent, action);
-                if (!s || !s.exports)
-                    return ts.Debug.fail();
-                return action(e.name, s.exports.get(e.name.escapedText), s);
+                return action(e.name, s && s.exports && s.exports.get(e.name.escapedText), s);
             }
         }
         function bindCallExpression(node) {
@@ -24354,7 +24731,7 @@ var ts;
             }
         }
         function bindClassLikeDeclaration(node) {
-            if (node.kind === 240) {
+            if (node.kind === 241) {
                 bindBlockScopedDeclaration(node, 32, 68008383);
             }
             else {
@@ -24401,7 +24778,7 @@ var ts;
             }
         }
         function bindParameter(node) {
-            if (node.kind === 304 && container.kind !== 298) {
+            if (node.kind === 306 && container.kind !== 299) {
                 return;
             }
             if (inStrictMode && !(node.flags & 4194304)) {
@@ -24474,7 +24851,7 @@ var ts;
                     declareSymbolAndAddToSymbolTable(node, 262144, 67635688);
                 }
             }
-            else if (node.parent.kind === 176) {
+            else if (node.parent.kind === 177) {
                 var container_2 = getInferTypeContainer(node.parent);
                 if (container_2) {
                     if (!container_2.locals) {
@@ -24499,9 +24876,9 @@ var ts;
                 return false;
             }
             if (currentFlow === unreachableFlow) {
-                var reportError = (ts.isStatementButNotDeclaration(node) && node.kind !== 220) ||
-                    node.kind === 240 ||
-                    (node.kind === 244 && shouldReportErrorOnModuleDeclaration(node));
+                var reportError = (ts.isStatementButNotDeclaration(node) && node.kind !== 221) ||
+                    node.kind === 241 ||
+                    (node.kind === 245 && shouldReportErrorOnModuleDeclaration(node));
                 if (reportError) {
                     currentFlow = reportedUnreachableFlow;
                     if (!options.allowUnreachableCode) {
@@ -24533,32 +24910,41 @@ var ts;
     }
     function isPurelyTypeDeclaration(s) {
         switch (s.kind) {
-            case 241:
             case 242:
-                return true;
-            case 244:
-                return getModuleInstanceState(s) !== 1;
             case 243:
+                return true;
+            case 245:
+                return getModuleInstanceState(s) !== 1;
+            case 244:
                 return ts.hasModifier(s, 2048);
             default:
                 return false;
         }
     }
     function isExportsOrModuleExportsOrAlias(sourceFile, node) {
-        return ts.isExportsIdentifier(node) ||
-            ts.isModuleExportsPropertyAccessExpression(node) ||
-            ts.isIdentifier(node) && isNameOfExportsOrModuleExportsAliasDeclaration(sourceFile, node);
+        var i = 0;
+        var q = [node];
+        while (q.length && i < 100) {
+            i++;
+            node = q.shift();
+            if (ts.isExportsIdentifier(node) || ts.isModuleExportsPropertyAccessExpression(node)) {
+                return true;
+            }
+            else if (ts.isIdentifier(node)) {
+                var symbol = lookupSymbolForNameWorker(sourceFile, node.escapedText);
+                if (!!symbol && !!symbol.valueDeclaration && ts.isVariableDeclaration(symbol.valueDeclaration) && !!symbol.valueDeclaration.initializer) {
+                    var init = symbol.valueDeclaration.initializer;
+                    q.push(init);
+                    if (ts.isAssignmentExpression(init, true)) {
+                        q.push(init.left);
+                        q.push(init.right);
+                    }
+                }
+            }
+        }
+        return false;
     }
     ts.isExportsOrModuleExportsOrAlias = isExportsOrModuleExportsOrAlias;
-    function isNameOfExportsOrModuleExportsAliasDeclaration(sourceFile, node) {
-        var symbol = lookupSymbolForNameWorker(sourceFile, node.escapedText);
-        return !!symbol && !!symbol.valueDeclaration && ts.isVariableDeclaration(symbol.valueDeclaration) &&
-            !!symbol.valueDeclaration.initializer && isExportsOrModuleExportsOrAliasOrAssignment(sourceFile, symbol.valueDeclaration.initializer);
-    }
-    function isExportsOrModuleExportsOrAliasOrAssignment(sourceFile, node) {
-        return isExportsOrModuleExportsOrAlias(sourceFile, node) ||
-            (ts.isAssignmentExpression(node, true) && (isExportsOrModuleExportsOrAliasOrAssignment(sourceFile, node.left) || isExportsOrModuleExportsOrAliasOrAssignment(sourceFile, node.right)));
-    }
     function lookupSymbolForNameWorker(container, name) {
         var local = container.locals && container.locals.get(name);
         if (local) {
@@ -24572,58 +24958,58 @@ var ts;
     function computeTransformFlagsForNode(node, subtreeFlags) {
         var kind = node.kind;
         switch (kind) {
-            case 191:
-                return computeCallExpression(node, subtreeFlags);
             case 192:
+                return computeCallExpression(node, subtreeFlags);
+            case 193:
                 return computeNewExpression(node, subtreeFlags);
-            case 244:
+            case 245:
                 return computeModuleDeclaration(node, subtreeFlags);
-            case 195:
-                return computeParenthesizedExpression(node, subtreeFlags);
-            case 204:
-                return computeBinaryExpression(node, subtreeFlags);
-            case 221:
-                return computeExpressionStatement(node, subtreeFlags);
-            case 151:
-                return computeParameter(node, subtreeFlags);
-            case 197:
-                return computeArrowFunction(node, subtreeFlags);
             case 196:
+                return computeParenthesizedExpression(node, subtreeFlags);
+            case 205:
+                return computeBinaryExpression(node, subtreeFlags);
+            case 222:
+                return computeExpressionStatement(node, subtreeFlags);
+            case 152:
+                return computeParameter(node, subtreeFlags);
+            case 198:
+                return computeArrowFunction(node, subtreeFlags);
+            case 197:
                 return computeFunctionExpression(node, subtreeFlags);
-            case 239:
-                return computeFunctionDeclaration(node, subtreeFlags);
-            case 237:
-                return computeVariableDeclaration(node, subtreeFlags);
-            case 238:
-                return computeVariableDeclarationList(node, subtreeFlags);
-            case 219:
-                return computeVariableStatement(node, subtreeFlags);
-            case 233:
-                return computeLabeledStatement(node, subtreeFlags);
             case 240:
+                return computeFunctionDeclaration(node, subtreeFlags);
+            case 238:
+                return computeVariableDeclaration(node, subtreeFlags);
+            case 239:
+                return computeVariableDeclarationList(node, subtreeFlags);
+            case 220:
+                return computeVariableStatement(node, subtreeFlags);
+            case 234:
+                return computeLabeledStatement(node, subtreeFlags);
+            case 241:
                 return computeClassDeclaration(node, subtreeFlags);
-            case 209:
+            case 210:
                 return computeClassExpression(node, subtreeFlags);
-            case 273:
-                return computeHeritageClause(node, subtreeFlags);
             case 274:
+                return computeHeritageClause(node, subtreeFlags);
+            case 275:
                 return computeCatchClause(node, subtreeFlags);
-            case 211:
+            case 212:
                 return computeExpressionWithTypeArguments(node, subtreeFlags);
-            case 157:
-                return computeConstructor(node, subtreeFlags);
-            case 154:
-                return computePropertyDeclaration(node, subtreeFlags);
-            case 156:
-                return computeMethod(node, subtreeFlags);
             case 158:
+                return computeConstructor(node, subtreeFlags);
+            case 155:
+                return computePropertyDeclaration(node, subtreeFlags);
+            case 157:
+                return computeMethod(node, subtreeFlags);
             case 159:
+            case 160:
                 return computeAccessor(node, subtreeFlags);
-            case 248:
+            case 249:
                 return computeImportEquals(node, subtreeFlags);
-            case 189:
-                return computePropertyAccess(node, subtreeFlags);
             case 190:
+                return computePropertyAccess(node, subtreeFlags);
+            case 191:
                 return computeElementAccess(node, subtreeFlags);
             default:
                 return computeOther(node, kind, subtreeFlags);
@@ -24643,7 +25029,7 @@ var ts;
                 transformFlags |= 2048;
             }
         }
-        if (expression.kind === 92) {
+        if (expression.kind === 93) {
             transformFlags |= 524288;
         }
         node.transformFlags = transformFlags | 536870912;
@@ -24664,14 +25050,14 @@ var ts;
         var transformFlags = subtreeFlags;
         var operatorTokenKind = node.operatorToken.kind;
         var leftKind = node.left.kind;
-        if (operatorTokenKind === 59 && leftKind === 188) {
+        if (operatorTokenKind === 60 && leftKind === 189) {
             transformFlags |= 16 | 128 | 512;
         }
-        else if (operatorTokenKind === 59 && leftKind === 187) {
+        else if (operatorTokenKind === 60 && leftKind === 188) {
             transformFlags |= 128 | 512;
         }
         else if (operatorTokenKind === 41
-            || operatorTokenKind === 63) {
+            || operatorTokenKind === 64) {
             transformFlags |= 64;
         }
         node.transformFlags = transformFlags | 536870912;
@@ -24704,8 +25090,8 @@ var ts;
         var transformFlags = subtreeFlags;
         var expression = node.expression;
         var expressionKind = expression.kind;
-        if (expressionKind === 212
-            || expressionKind === 194) {
+        if (expressionKind === 213
+            || expressionKind === 195) {
             transformFlags |= 1;
         }
         node.transformFlags = transformFlags | 536870912;
@@ -24738,10 +25124,10 @@ var ts;
     function computeHeritageClause(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
         switch (node.token) {
-            case 86:
+            case 87:
                 transformFlags |= 128;
                 break;
-            case 109:
+            case 110:
                 transformFlags |= 1;
                 break;
             default:
@@ -24788,7 +25174,6 @@ var ts;
             || ts.hasModifier(node, 2270)
             || node.typeParameters
             || node.type
-            || (node.name && ts.isComputedPropertyName(node.name))
             || !node.body) {
             transformFlags |= 1;
         }
@@ -24809,7 +25194,6 @@ var ts;
         if (node.decorators
             || ts.hasModifier(node, 2270)
             || node.type
-            || (node.name && ts.isComputedPropertyName(node.name))
             || !node.body) {
             transformFlags |= 1;
         }
@@ -24820,8 +25204,11 @@ var ts;
         return propagatePropertyNameFlags(node.name, transformFlags & ~537372672);
     }
     function computePropertyDeclaration(node, subtreeFlags) {
-        var transformFlags = subtreeFlags | 1;
-        if (node.initializer || ts.isComputedPropertyName(node.name)) {
+        var transformFlags = subtreeFlags | 1048576;
+        if (ts.some(node.decorators) || ts.hasModifier(node, 2270) || node.type) {
+            transformFlags |= 1;
+        }
+        if (ts.isComputedPropertyName(node.name) || (ts.hasStaticModifier(node) && node.initializer)) {
             transformFlags |= 1024;
         }
         node.transformFlags = transformFlags | 536870912;
@@ -24891,7 +25278,7 @@ var ts;
     }
     function computePropertyAccess(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
-        if (node.expression.kind === 98) {
+        if (node.expression.kind === 99) {
             transformFlags |= 32 | 16;
         }
         node.transformFlags = transformFlags | 536870912;
@@ -24899,7 +25286,7 @@ var ts;
     }
     function computeElementAccess(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
-        if (node.expression.kind === 98) {
+        if (node.expression.kind === 99) {
             transformFlags |= 32 | 16;
         }
         node.transformFlags = transformFlags | 536870912;
@@ -24978,33 +25365,32 @@ var ts;
         var transformFlags = subtreeFlags;
         var excludeFlags = 536870912;
         switch (kind) {
-            case 121:
-            case 201:
+            case 122:
+            case 202:
                 transformFlags |= 16 | 32;
                 break;
-            case 194:
-            case 212:
-            case 313:
+            case 195:
+            case 213:
+            case 315:
                 transformFlags |= 1;
                 excludeFlags = 536870912;
                 break;
-            case 115:
-            case 113:
+            case 116:
             case 114:
-            case 118:
-            case 125:
-            case 77:
-            case 243:
-            case 278:
-            case 213:
-            case 133:
+            case 115:
+            case 119:
+            case 126:
+            case 78:
+            case 244:
+            case 279:
+            case 214:
+            case 134:
                 transformFlags |= 1;
                 break;
-            case 260:
             case 261:
             case 262:
-            case 11:
             case 263:
+            case 11:
             case 264:
             case 265:
             case 266:
@@ -25012,17 +25398,18 @@ var ts;
             case 268:
             case 269:
             case 270:
+            case 271:
                 transformFlags |= 2;
                 break;
             case 14:
             case 15:
             case 16:
             case 17:
-            case 206:
-            case 193:
-            case 276:
-            case 116:
-            case 214:
+            case 207:
+            case 194:
+            case 277:
+            case 117:
+            case 215:
                 transformFlags |= 128;
                 break;
             case 10:
@@ -25038,28 +25425,27 @@ var ts;
             case 9:
                 transformFlags |= 4;
                 break;
-            case 227:
+            case 228:
                 if (node.awaitModifier) {
                     transformFlags |= 16;
                 }
                 transformFlags |= 128;
                 break;
-            case 207:
+            case 208:
                 transformFlags |= 16 | 128 | 131072;
                 break;
-            case 120:
-            case 135:
-            case 146:
-            case 132:
+            case 121:
             case 136:
-            case 138:
-            case 123:
+            case 147:
+            case 133:
+            case 137:
             case 139:
-            case 106:
-            case 150:
-            case 153:
-            case 155:
-            case 160:
+            case 124:
+            case 140:
+            case 107:
+            case 151:
+            case 154:
+            case 156:
             case 161:
             case 162:
             case 163:
@@ -25077,54 +25463,55 @@ var ts;
             case 175:
             case 176:
             case 177:
-            case 241:
-            case 242:
             case 178:
+            case 242:
+            case 243:
             case 179:
             case 180:
             case 181:
             case 182:
-            case 247:
+            case 183:
+            case 248:
                 transformFlags = 1;
                 excludeFlags = -2;
                 break;
-            case 149:
+            case 150:
                 transformFlags |= 16384;
                 break;
-            case 208:
+            case 209:
                 transformFlags |= 128 | 4096;
                 break;
-            case 277:
+            case 278:
                 transformFlags |= 16 | 8192;
                 break;
-            case 98:
+            case 99:
                 transformFlags |= 128;
                 excludeFlags = 536870912;
                 break;
-            case 100:
+            case 101:
                 transformFlags |= 2048;
                 break;
-            case 184:
+            case 185:
                 transformFlags |= 128 | 65536;
                 if (subtreeFlags & 4096) {
                     transformFlags |= 16 | 8192;
                 }
                 excludeFlags = 536875008;
                 break;
-            case 185:
+            case 186:
                 transformFlags |= 128 | 65536;
                 excludeFlags = 536875008;
                 break;
-            case 186:
+            case 187:
                 transformFlags |= 128;
                 if (node.dotDotDotToken) {
                     transformFlags |= 4096;
                 }
                 break;
-            case 152:
+            case 153:
                 transformFlags |= 1 | 1024;
                 break;
-            case 188:
+            case 189:
                 excludeFlags = 536896512;
                 if (subtreeFlags & 16384) {
                     transformFlags |= 128;
@@ -25133,24 +25520,24 @@ var ts;
                     transformFlags |= 16;
                 }
                 break;
-            case 187:
+            case 188:
                 excludeFlags = 536875008;
                 break;
-            case 223:
             case 224:
             case 225:
             case 226:
+            case 227:
                 if (subtreeFlags & 32768) {
                     transformFlags |= 128;
                 }
                 break;
-            case 284:
+            case 285:
                 break;
-            case 230:
+            case 231:
                 transformFlags |= 262144 | 16;
                 break;
-            case 228:
             case 229:
+            case 230:
                 transformFlags |= 262144;
                 break;
         }
@@ -25161,67 +25548,67 @@ var ts;
         return transformFlags | (node.transformFlags & 2048);
     }
     function getTransformFlagsSubtreeExclusions(kind) {
-        if (kind >= 163 && kind <= 183) {
+        if (kind >= 164 && kind <= 184) {
             return -2;
         }
         switch (kind) {
-            case 191:
             case 192:
-            case 187:
+            case 193:
+            case 188:
                 return 536875008;
-            case 244:
+            case 245:
                 return 537168896;
-            case 151:
+            case 152:
                 return 536870912;
-            case 197:
+            case 198:
                 return 537371648;
-            case 196:
-            case 239:
-                return 537373696;
-            case 238:
-                return 536944640;
+            case 197:
             case 240:
-            case 209:
+                return 537373696;
+            case 239:
+                return 536944640;
+            case 241:
+            case 210:
                 return 536888320;
-            case 157:
-                return 537372672;
-            case 156:
             case 158:
-            case 159:
                 return 537372672;
-            case 120:
-            case 135:
-            case 146:
-            case 132:
-            case 138:
-            case 136:
-            case 123:
-            case 139:
-            case 106:
-            case 150:
-            case 153:
-            case 155:
+            case 157:
+            case 159:
             case 160:
+                return 537372672;
+            case 121:
+            case 136:
+            case 147:
+            case 133:
+            case 139:
+            case 137:
+            case 124:
+            case 140:
+            case 107:
+            case 151:
+            case 154:
+            case 156:
             case 161:
             case 162:
-            case 241:
+            case 163:
             case 242:
+            case 243:
                 return -2;
-            case 188:
-                return 536896512;
-            case 274:
-                return 536879104;
-            case 184:
-            case 185:
-                return 536875008;
-            case 194:
-            case 212:
-            case 313:
-            case 195:
-            case 98:
-                return 536870912;
             case 189:
+                return 536896512;
+            case 275:
+                return 536879104;
+            case 185:
+            case 186:
+                return 536875008;
+            case 195:
+            case 213:
+            case 315:
+            case 196:
+            case 99:
+                return 536870912;
             case 190:
+            case 191:
                 return 536870912;
             default:
                 return 536870912;
@@ -25383,7 +25770,7 @@ var ts;
                     symbol.exports.forEach(visitSymbol);
                 }
                 ts.forEach(symbol.declarations, function (d) {
-                    if (d.type && d.type.kind === 167) {
+                    if (d.type && d.type.kind === 168) {
                         var query = d.type;
                         var entity = getResolvedSymbol(getFirstIdentifier(query.exprName));
                         visitSymbol(entity);
@@ -25446,6 +25833,7 @@ var ts;
         var typeCount = 0;
         var symbolCount = 0;
         var enumCount = 0;
+        var instantiationCount = 0;
         var instantiationDepth = 0;
         var constraintDepth = 0;
         var currentNode;
@@ -25470,8 +25858,6 @@ var ts;
         undefinedSymbol.declarations = [];
         var globalThisSymbol = createSymbol(1536, "globalThis", 8);
         globalThisSymbol.exports = globals;
-        globalThisSymbol.valueDeclaration = ts.createNode(72);
-        globalThisSymbol.valueDeclaration.escapedText = "globalThis";
         globals.set(globalThisSymbol.escapedName, globalThisSymbol);
         var argumentsSymbol = createSymbol(4, "arguments");
         var requireSymbol = createSymbol(4, "require");
@@ -25481,6 +25867,11 @@ var ts;
             getIdentifierCount: function () { return ts.sum(host.getSourceFiles(), "identifierCount"); },
             getSymbolCount: function () { return ts.sum(host.getSourceFiles(), "symbolCount") + symbolCount; },
             getTypeCount: function () { return typeCount; },
+            getRelationCacheSizes: function () { return ({
+                assignable: assignableRelation.size,
+                identity: identityRelation.size,
+                subtype: subtypeRelation.size,
+            }); },
             isUndefinedSymbol: function (symbol) { return symbol === undefinedSymbol; },
             isArgumentsSymbol: function (symbol) { return symbol === argumentsSymbol; },
             isUnknownSymbol: function (symbol) { return symbol === unknownSymbol; },
@@ -25547,6 +25938,10 @@ var ts;
                 node = ts.getParseTreeNode(node);
                 return node ? getTypeOfNode(node) : errorType;
             },
+            getTypeOfAssignmentPattern: function (nodeIn) {
+                var node = ts.getParseTreeNode(nodeIn, ts.isAssignmentPattern);
+                return node && getTypeOfAssignmentPattern(node) || errorType;
+            },
             getPropertySymbolOfDestructuringAssignment: function (locationIn) {
                 var location = ts.getParseTreeNode(locationIn, ts.isIdentifier);
                 return location ? getPropertySymbolOfDestructuringAssignment(location) : undefined;
@@ -25595,12 +25990,14 @@ var ts;
             },
             isContextSensitive: isContextSensitive,
             getFullyQualifiedName: getFullyQualifiedName,
-            getResolvedSignature: function (node, candidatesOutArray, agumentCount) {
-                return getResolvedSignatureWorker(node, candidatesOutArray, agumentCount, 0);
+            getResolvedSignature: function (node, candidatesOutArray, argumentCount) {
+                return getResolvedSignatureWorker(node, candidatesOutArray, argumentCount, 0);
             },
-            getResolvedSignatureForSignatureHelp: function (node, candidatesOutArray, agumentCount) {
-                return getResolvedSignatureWorker(node, candidatesOutArray, agumentCount, 16);
+            getResolvedSignatureForSignatureHelp: function (node, candidatesOutArray, argumentCount) {
+                return getResolvedSignatureWorker(node, candidatesOutArray, argumentCount, 16);
             },
+            getExpandedParameters: getExpandedParameters,
+            hasEffectiveRestParameter: hasEffectiveRestParameter,
             getConstantValue: function (nodeIn) {
                 var node = ts.getParseTreeNode(nodeIn, canHaveConstantValue);
                 return node ? getConstantValue(node) : undefined;
@@ -25660,6 +26057,8 @@ var ts;
             getNeverType: function () { return neverType; },
             isSymbolAccessible: isSymbolAccessible,
             getObjectFlags: ts.getObjectFlags,
+            isArrayType: isArrayType,
+            isTupleType: isTupleType,
             isArrayLikeType: isArrayLikeType,
             isTypeInvalidDueToUnionDiscriminant: isTypeInvalidDueToUnionDiscriminant,
             getAllPossiblePropertiesOfTypes: getAllPossiblePropertiesOfTypes,
@@ -25732,7 +26131,7 @@ var ts;
         var intersectionTypes = ts.createMap();
         var literalTypes = ts.createMap();
         var indexedAccessTypes = ts.createMap();
-        var conditionalTypes = ts.createMap();
+        var substitutionTypes = ts.createMap();
         var evolvingArrayTypes = [];
         var undefinedProperties = ts.createMap();
         var unknownSymbol = createSymbol(4, "unknown");
@@ -25742,10 +26141,10 @@ var ts;
         var wildcardType = createIntrinsicType(1, "any");
         var errorType = createIntrinsicType(1, "error");
         var unknownType = createIntrinsicType(2, "unknown");
-        var undefinedType = createNullableType(32768, "undefined", 0);
-        var undefinedWideningType = strictNullChecks ? undefinedType : createNullableType(32768, "undefined", 131072);
-        var nullType = createNullableType(65536, "null", 0);
-        var nullWideningType = strictNullChecks ? nullType : createNullableType(65536, "null", 131072);
+        var undefinedType = createIntrinsicType(32768, "undefined");
+        var undefinedWideningType = strictNullChecks ? undefinedType : createIntrinsicType(32768, "undefined", 262144);
+        var nullType = createIntrinsicType(65536, "null");
+        var nullWideningType = strictNullChecks ? nullType : createIntrinsicType(65536, "null", 262144);
         var stringType = createIntrinsicType(4, "string");
         var numberType = createIntrinsicType(8, "number");
         var bigintType = createIntrinsicType(64, "bigint");
@@ -25769,6 +26168,7 @@ var ts;
         var voidType = createIntrinsicType(16384, "void");
         var neverType = createIntrinsicType(131072, "never");
         var silentNeverType = createIntrinsicType(131072, "never");
+        var nonInferrableType = createIntrinsicType(131072, "never", 1048576);
         var implicitNeverType = createIntrinsicType(131072, "never");
         var nonPrimitiveType = createIntrinsicType(67108864, "object");
         var stringNumberSymbolType = getUnionType([stringType, numberType, esSymbolType]);
@@ -25783,7 +26183,7 @@ var ts;
         var emptyGenericType = createAnonymousType(undefined, emptySymbols, ts.emptyArray, ts.emptyArray, undefined, undefined);
         emptyGenericType.instantiations = ts.createMap();
         var anyFunctionType = createAnonymousType(undefined, emptySymbols, ts.emptyArray, ts.emptyArray, undefined, undefined);
-        anyFunctionType.objectFlags |= 524288;
+        anyFunctionType.objectFlags |= 1048576;
         var noConstraintType = createAnonymousType(undefined, emptySymbols, ts.emptyArray, ts.emptyArray, undefined, undefined);
         var circularConstraintType = createAnonymousType(undefined, emptySymbols, ts.emptyArray, ts.emptyArray, undefined, undefined);
         var resolvingDefaultType = createAnonymousType(undefined, emptySymbols, ts.emptyArray, ts.emptyArray, undefined, undefined);
@@ -25797,10 +26197,46 @@ var ts;
         var resolvingSignature = createSignature(undefined, undefined, undefined, ts.emptyArray, anyType, undefined, 0, false, false);
         var silentNeverSignature = createSignature(undefined, undefined, undefined, ts.emptyArray, silentNeverType, undefined, 0, false, false);
         var enumNumberIndexInfo = createIndexInfo(stringType, true);
+        var iterationTypesCache = ts.createMap();
+        var noIterationTypes = {
+            get yieldType() { throw new Error("Not supported"); },
+            get returnType() { throw new Error("Not supported"); },
+            get nextType() { throw new Error("Not supported"); },
+        };
+        var anyIterationTypes = createIterationTypes(anyType, anyType, anyType);
+        var anyIterationTypesExceptNext = createIterationTypes(anyType, anyType, unknownType);
+        var defaultIterationTypes = createIterationTypes(neverType, anyType, undefinedType);
+        var asyncIterationTypesResolver = {
+            iterableCacheKey: "iterationTypesOfAsyncIterable",
+            iteratorCacheKey: "iterationTypesOfAsyncIterator",
+            iteratorSymbolName: "asyncIterator",
+            getGlobalIteratorType: getGlobalAsyncIteratorType,
+            getGlobalIterableType: getGlobalAsyncIterableType,
+            getGlobalIterableIteratorType: getGlobalAsyncIterableIteratorType,
+            getGlobalGeneratorType: getGlobalAsyncGeneratorType,
+            resolveIterationType: getAwaitedType,
+            mustHaveANextMethodDiagnostic: ts.Diagnostics.An_async_iterator_must_have_a_next_method,
+            mustBeAMethodDiagnostic: ts.Diagnostics.The_0_property_of_an_async_iterator_must_be_a_method,
+            mustHaveAValueDiagnostic: ts.Diagnostics.The_type_returned_by_the_0_method_of_an_async_iterator_must_be_a_promise_for_a_type_with_a_value_property,
+        };
+        var syncIterationTypesResolver = {
+            iterableCacheKey: "iterationTypesOfIterable",
+            iteratorCacheKey: "iterationTypesOfIterator",
+            iteratorSymbolName: "iterator",
+            getGlobalIteratorType: getGlobalIteratorType,
+            getGlobalIterableType: getGlobalIterableType,
+            getGlobalIterableIteratorType: getGlobalIterableIteratorType,
+            getGlobalGeneratorType: getGlobalGeneratorType,
+            resolveIterationType: function (type, _errorNode) { return type; },
+            mustHaveANextMethodDiagnostic: ts.Diagnostics.An_iterator_must_have_a_next_method,
+            mustBeAMethodDiagnostic: ts.Diagnostics.The_0_property_of_an_iterator_must_be_a_method,
+            mustHaveAValueDiagnostic: ts.Diagnostics.The_type_returned_by_the_0_method_of_an_iterator_must_have_a_value_property,
+        };
         var amalgamatedDuplicates;
         var reverseMappedCache = ts.createMap();
         var ambientModulesCache;
         var patternAmbientModules;
+        var patternAmbientModuleAugmentations;
         var globalObjectType;
         var globalFunctionType;
         var globalCallableFunctionType;
@@ -25826,14 +26262,17 @@ var ts;
         var deferredGlobalIterableType;
         var deferredGlobalIteratorType;
         var deferredGlobalIterableIteratorType;
+        var deferredGlobalGeneratorType;
+        var deferredGlobalIteratorYieldResultType;
+        var deferredGlobalIteratorReturnResultType;
         var deferredGlobalAsyncIterableType;
         var deferredGlobalAsyncIteratorType;
         var deferredGlobalAsyncIterableIteratorType;
+        var deferredGlobalAsyncGeneratorType;
         var deferredGlobalTemplateStringsArrayType;
         var deferredGlobalImportMetaType;
         var deferredGlobalExtractSymbol;
-        var deferredGlobalExcludeSymbol;
-        var deferredGlobalPickSymbol;
+        var deferredGlobalOmitSymbol;
         var deferredGlobalBigIntType;
         var allPotentiallyUnusedIdentifiers = ts.createMap();
         var flowLoopStart = 0;
@@ -25852,6 +26291,8 @@ var ts;
         var symbolLinks = [];
         var nodeLinks = [];
         var flowLoopCaches = [];
+        var flowAssignmentKeys = [];
+        var flowAssignmentTypes = [];
         var flowLoopNodes = [];
         var flowLoopKeys = [];
         var flowLoopTypes = [];
@@ -25893,6 +26334,7 @@ var ts;
         var typeofType = createTypeofType();
         var _jsxNamespace;
         var _jsxFactoryEntity;
+        var outofbandVarianceMarkerHandler;
         var subtypeRelation = ts.createMap();
         var assignableRelation = ts.createMap();
         var comparableRelation = ts.createMap();
@@ -25951,18 +26393,6 @@ var ts;
                 return diagnostic;
             }
         }
-        function addRelatedInfo(diagnostic) {
-            var relatedInformation = [];
-            for (var _i = 1; _i < arguments.length; _i++) {
-                relatedInformation[_i - 1] = arguments[_i];
-            }
-            var _a;
-            if (!diagnostic.relatedInformation) {
-                diagnostic.relatedInformation = [];
-            }
-            (_a = diagnostic.relatedInformation).push.apply(_a, relatedInformation);
-            return diagnostic;
-        }
         function error(location, message, arg0, arg1, arg2, arg3) {
             var diagnostic = location
                 ? ts.createDiagnosticForNode(location, message, arg0, arg1, arg2, arg3)
@@ -25981,6 +26411,14 @@ var ts;
         function errorOrSuggestion(isError, location, message, arg0, arg1, arg2, arg3) {
             addErrorOrSuggestion(isError, "message" in message ? ts.createDiagnosticForNode(location, message, arg0, arg1, arg2, arg3) : ts.createDiagnosticForNodeFromMessageChain(location, message));
         }
+        function errorAndMaybeSuggestAwait(location, maybeMissingAwait, message, arg0, arg1, arg2, arg3) {
+            var diagnostic = error(location, message, arg0, arg1, arg2, arg3);
+            if (maybeMissingAwait) {
+                var related = ts.createDiagnosticForNode(location, ts.Diagnostics.Did_you_forget_to_use_await);
+                ts.addRelatedInfo(diagnostic, related);
+            }
+            return diagnostic;
+        }
         function createSymbol(flags, name, checkFlags) {
             symbolCount++;
             var symbol = (new Symbol(flags | 33554432, name));
@@ -26048,7 +26486,8 @@ var ts;
             recordMergedSymbol(result, symbol);
             return result;
         }
-        function mergeSymbol(target, source) {
+        function mergeSymbol(target, source, unidirectional) {
+            if (unidirectional === void 0) { unidirectional = false; }
             if (!(target.flags & getExcludedSymbolFlags(source.flags)) ||
                 (source.flags | target.flags) & 67108864) {
                 ts.Debug.assert(source !== target);
@@ -26073,17 +26512,21 @@ var ts;
                 if (source.members) {
                     if (!target.members)
                         target.members = ts.createSymbolTable();
-                    mergeSymbolTable(target.members, source.members);
+                    mergeSymbolTable(target.members, source.members, unidirectional);
                 }
                 if (source.exports) {
                     if (!target.exports)
                         target.exports = ts.createSymbolTable();
-                    mergeSymbolTable(target.exports, source.exports);
+                    mergeSymbolTable(target.exports, source.exports, unidirectional);
+                }
+                if (!unidirectional) {
+                    recordMergedSymbol(target, source);
                 }
-                recordMergedSymbol(target, source);
             }
             else if (target.flags & 1024) {
-                error(ts.getNameOfDeclaration(source.declarations[0]), ts.Diagnostics.Cannot_augment_module_0_with_value_exports_because_it_resolves_to_a_non_module_entity, symbolToString(target));
+                if (target !== globalThisSymbol) {
+                    error(ts.getNameOfDeclaration(source.declarations[0]), ts.Diagnostics.Cannot_augment_module_0_with_value_exports_because_it_resolves_to_a_non_module_entity, symbolToString(target));
+                }
             }
             else {
                 var isEitherEnum = !!(target.flags & 384 || source.flags & 384);
@@ -26134,7 +26577,7 @@ var ts;
                 err.relatedInformation = err.relatedInformation || [];
                 if (ts.length(err.relatedInformation) >= 5)
                     continue;
-                addRelatedInfo(err, !ts.length(err.relatedInformation) ? ts.createDiagnosticForNode(relatedNode, ts.Diagnostics._0_was_also_declared_here, symbolName) : ts.createDiagnosticForNode(relatedNode, ts.Diagnostics.and_here));
+                ts.addRelatedInfo(err, !ts.length(err.relatedInformation) ? ts.createDiagnosticForNode(relatedNode, ts.Diagnostics._0_was_also_declared_here, symbolName) : ts.createDiagnosticForNode(relatedNode, ts.Diagnostics.and_here));
             }
         }
         function combineSymbolTables(first, second) {
@@ -26147,10 +26590,11 @@ var ts;
             mergeSymbolTable(combined, second);
             return combined;
         }
-        function mergeSymbolTable(target, source) {
+        function mergeSymbolTable(target, source, unidirectional) {
+            if (unidirectional === void 0) { unidirectional = false; }
             source.forEach(function (sourceSymbol, id) {
                 var targetSymbol = target.get(id);
-                target.set(id, targetSymbol ? mergeSymbol(targetSymbol, sourceSymbol) : sourceSymbol);
+                target.set(id, targetSymbol ? mergeSymbol(targetSymbol, sourceSymbol, unidirectional) : sourceSymbol);
             });
         }
         function mergeModuleAugmentation(moduleName) {
@@ -26166,13 +26610,22 @@ var ts;
                 var moduleNotFoundError = !(moduleName.parent.parent.flags & 4194304)
                     ? ts.Diagnostics.Invalid_module_name_in_augmentation_module_0_cannot_be_found
                     : undefined;
-                var mainModule = resolveExternalModuleNameWorker(moduleName, moduleName, moduleNotFoundError, true);
-                if (!mainModule) {
+                var mainModule_1 = resolveExternalModuleNameWorker(moduleName, moduleName, moduleNotFoundError, true);
+                if (!mainModule_1) {
                     return;
                 }
-                mainModule = resolveExternalModuleSymbol(mainModule);
-                if (mainModule.flags & 1920) {
-                    mainModule = mergeSymbol(mainModule, moduleAugmentation.symbol);
+                mainModule_1 = resolveExternalModuleSymbol(mainModule_1);
+                if (mainModule_1.flags & 1920) {
+                    if (ts.some(patternAmbientModules, function (module) { return mainModule_1 === module.symbol; })) {
+                        var merged = mergeSymbol(moduleAugmentation.symbol, mainModule_1, true);
+                        if (!patternAmbientModuleAugmentations) {
+                            patternAmbientModuleAugmentations = ts.createMap();
+                        }
+                        patternAmbientModuleAugmentations.set(moduleName.text, merged);
+                    }
+                    else {
+                        mergeSymbol(mainModule_1, moduleAugmentation.symbol);
+                    }
                 }
                 else {
                     error(moduleName, ts.Diagnostics.Cannot_augment_module_0_because_it_resolves_to_a_non_module_entity, moduleName.text);
@@ -26204,7 +26657,7 @@ var ts;
             return nodeLinks[nodeId] || (nodeLinks[nodeId] = { flags: 0 });
         }
         function isGlobalSourceFile(node) {
-            return node.kind === 284 && !ts.isExternalOrCommonJsModule(node);
+            return node.kind === 285 && !ts.isExternalOrCommonJsModule(node);
         }
         function getSymbol(symbols, name, meaning) {
             if (meaning) {
@@ -26250,26 +26703,29 @@ var ts;
                 return sourceFiles.indexOf(declarationFile) <= sourceFiles.indexOf(useFile);
             }
             if (declaration.pos <= usage.pos) {
-                if (declaration.kind === 186) {
-                    var errorBindingElement = ts.getAncestor(usage, 186);
+                if (declaration.kind === 187) {
+                    var errorBindingElement = ts.getAncestor(usage, 187);
                     if (errorBindingElement) {
                         return ts.findAncestor(errorBindingElement, ts.isBindingElement) !== ts.findAncestor(declaration, ts.isBindingElement) ||
                             declaration.pos < errorBindingElement.pos;
                     }
-                    return isBlockScopedNameDeclaredBeforeUse(ts.getAncestor(declaration, 237), usage);
+                    return isBlockScopedNameDeclaredBeforeUse(ts.getAncestor(declaration, 238), usage);
                 }
-                else if (declaration.kind === 237) {
+                else if (declaration.kind === 238) {
                     return !isImmediatelyUsedInInitializerOfBlockScopedVariable(declaration, usage);
                 }
                 else if (ts.isClassDeclaration(declaration)) {
                     return !ts.findAncestor(usage, function (n) { return ts.isComputedPropertyName(n) && n.parent.parent === declaration; });
                 }
+                else if (ts.isPropertyDeclaration(declaration)) {
+                    return !isPropertyImmediatelyReferencedWithinDeclaration(declaration, usage);
+                }
                 return true;
             }
-            if (usage.parent.kind === 257 || (usage.parent.kind === 254 && usage.parent.isExportEquals)) {
+            if (usage.parent.kind === 258 || (usage.parent.kind === 255 && usage.parent.isExportEquals)) {
                 return true;
             }
-            if (usage.kind === 254 && usage.isExportEquals) {
+            if (usage.kind === 255 && usage.isExportEquals) {
                 return true;
             }
             var container = ts.getEnclosingBlockScopeContainer(declaration);
@@ -26277,9 +26733,9 @@ var ts;
             function isImmediatelyUsedInInitializerOfBlockScopedVariable(declaration, usage) {
                 var container = ts.getEnclosingBlockScopeContainer(declaration);
                 switch (declaration.parent.parent.kind) {
-                    case 219:
-                    case 225:
-                    case 227:
+                    case 220:
+                    case 226:
+                    case 228:
                         if (isSameScopeDescendentOf(usage, declaration, container)) {
                             return true;
                         }
@@ -26297,16 +26753,16 @@ var ts;
                         return true;
                     }
                     var initializerOfProperty = current.parent &&
-                        current.parent.kind === 154 &&
+                        current.parent.kind === 155 &&
                         current.parent.initializer === current;
                     if (initializerOfProperty) {
                         if (ts.hasModifier(current.parent, 32)) {
-                            if (declaration.kind === 156) {
+                            if (declaration.kind === 157) {
                                 return true;
                             }
                         }
                         else {
-                            var isDeclarationInstanceProperty = declaration.kind === 154 && !ts.hasModifier(declaration, 32);
+                            var isDeclarationInstanceProperty = declaration.kind === 155 && !ts.hasModifier(declaration, 32);
                             if (!isDeclarationInstanceProperty || ts.getContainingClass(usage) !== ts.getContainingClass(declaration)) {
                                 return true;
                             }
@@ -26315,6 +26771,33 @@ var ts;
                     return false;
                 });
             }
+            function isPropertyImmediatelyReferencedWithinDeclaration(declaration, usage) {
+                if (usage.end > declaration.end) {
+                    return false;
+                }
+                var ancestorChangingReferenceScope = ts.findAncestor(usage, function (node) {
+                    if (node === declaration) {
+                        return "quit";
+                    }
+                    switch (node.kind) {
+                        case 198:
+                        case 155:
+                            return true;
+                        case 219:
+                            switch (node.parent.kind) {
+                                case 159:
+                                case 157:
+                                case 160:
+                                    return true;
+                                default:
+                                    return false;
+                            }
+                        default:
+                            return false;
+                    }
+                });
+                return ancestorChangingReferenceScope === undefined;
+            }
         }
         function resolveName(location, name, meaning, nameNotFoundMessage, nameArg, isUse, excludeGlobals, suggestedNameNotFoundMessage) {
             if (excludeGlobals === void 0) { excludeGlobals = false; }
@@ -26326,6 +26809,8 @@ var ts;
             var lastLocation;
             var lastSelfReferenceLocation;
             var propertyWithInvalidInitializer;
+            var associatedDeclarationForContainingInitializer;
+            var withinDeferredContext = false;
             var errorLocation = location;
             var grandparent;
             var isInExternalModule = false;
@@ -26334,11 +26819,11 @@ var ts;
                     if (result = lookup(location.locals, name, meaning)) {
                         var useResult = true;
                         if (ts.isFunctionLike(location) && lastLocation && lastLocation !== location.body) {
-                            if (meaning & result.flags & 67897832 && lastLocation.kind !== 296) {
+                            if (meaning & result.flags & 67897832 && lastLocation.kind !== 297) {
                                 useResult = result.flags & 262144
                                     ? lastLocation === location.type ||
-                                        lastLocation.kind === 151 ||
-                                        lastLocation.kind === 150
+                                        lastLocation.kind === 152 ||
+                                        lastLocation.kind === 151
                                     : false;
                             }
                             if (meaning & result.flags & 3) {
@@ -26349,13 +26834,13 @@ var ts;
                                 }
                                 else if (result.flags & 1) {
                                     useResult =
-                                        lastLocation.kind === 151 ||
+                                        lastLocation.kind === 152 ||
                                             (lastLocation === location.type &&
                                                 !!ts.findAncestor(result.valueDeclaration, ts.isParameter));
                                 }
                             }
                         }
-                        else if (location.kind === 175) {
+                        else if (location.kind === 176) {
                             useResult = lastLocation === location.trueType;
                         }
                         if (useResult) {
@@ -26366,14 +26851,15 @@ var ts;
                         }
                     }
                 }
+                withinDeferredContext = withinDeferredContext || getIsDeferredContext(location, lastLocation);
                 switch (location.kind) {
-                    case 284:
+                    case 285:
                         if (!ts.isExternalOrCommonJsModule(location))
                             break;
                         isInExternalModule = true;
-                    case 244:
+                    case 245:
                         var moduleExports = getSymbolOfNode(location).exports;
-                        if (location.kind === 284 || ts.isAmbientModule(location)) {
+                        if (location.kind === 285 || ts.isAmbientModule(location)) {
                             if (result = moduleExports.get("default")) {
                                 var localSymbol = ts.getLocalSymbolForExportDefault(result);
                                 if (localSymbol && (result.flags & meaning) && localSymbol.escapedName === name) {
@@ -26384,7 +26870,7 @@ var ts;
                             var moduleExport = moduleExports.get(name);
                             if (moduleExport &&
                                 moduleExport.flags === 2097152 &&
-                                ts.getDeclarationOfKind(moduleExport, 257)) {
+                                ts.getDeclarationOfKind(moduleExport, 258)) {
                                 break;
                             }
                         }
@@ -26397,14 +26883,13 @@ var ts;
                             }
                         }
                         break;
-                    case 243:
+                    case 244:
                         if (result = lookup(getSymbolOfNode(location).exports, name, meaning & 8)) {
                             break loop;
                         }
                         break;
-                    case 154:
-                    case 153:
-                        if (ts.isClassLike(location.parent) && !ts.hasModifier(location, 32)) {
+                    case 155:
+                        if (!ts.hasModifier(location, 32)) {
                             var ctor = findConstructorDeclaration(location.parent);
                             if (ctor && ctor.locals) {
                                 if (lookup(ctor.locals, name, meaning & 67220415)) {
@@ -26413,9 +26898,9 @@ var ts;
                             }
                         }
                         break;
-                    case 240:
-                    case 209:
                     case 241:
+                    case 210:
+                    case 242:
                         if (result = lookup(getSymbolOfNode(location).members || emptySymbols, name, meaning & 67897832)) {
                             if (!isTypeParameterSymbolDeclaredInContainer(result, location)) {
                                 result = undefined;
@@ -26427,7 +26912,7 @@ var ts;
                             }
                             break loop;
                         }
-                        if (location.kind === 209 && meaning & 32) {
+                        if (location.kind === 210 && meaning & 32) {
                             var className = location.name;
                             if (className && name === className.escapedText) {
                                 result = location.symbol;
@@ -26435,8 +26920,8 @@ var ts;
                             }
                         }
                         break;
-                    case 211:
-                        if (lastLocation === location.expression && location.parent.token === 86) {
+                    case 212:
+                        if (lastLocation === location.expression && location.parent.token === 87) {
                             var container = location.parent.parent;
                             if (ts.isClassLike(container) && (result = lookup(getSymbolOfNode(container).members, name, meaning & 67897832))) {
                                 if (nameNotFoundMessage) {
@@ -26446,30 +26931,30 @@ var ts;
                             }
                         }
                         break;
-                    case 149:
+                    case 150:
                         grandparent = location.parent.parent;
-                        if (ts.isClassLike(grandparent) || grandparent.kind === 241) {
+                        if (ts.isClassLike(grandparent) || grandparent.kind === 242) {
                             if (result = lookup(getSymbolOfNode(grandparent).members, name, meaning & 67897832)) {
                                 error(errorLocation, ts.Diagnostics.A_computed_property_name_cannot_reference_a_type_parameter_from_its_containing_type);
                                 return undefined;
                             }
                         }
                         break;
-                    case 197:
+                    case 198:
                         if (compilerOptions.target >= 2) {
                             break;
                         }
-                    case 156:
                     case 157:
                     case 158:
                     case 159:
-                    case 239:
+                    case 160:
+                    case 240:
                         if (meaning & 3 && name === "arguments") {
                             result = argumentsSymbol;
                             break loop;
                         }
                         break;
-                    case 196:
+                    case 197:
                         if (meaning & 3 && name === "arguments") {
                             result = argumentsSymbol;
                             break loop;
@@ -26482,18 +26967,31 @@ var ts;
                             }
                         }
                         break;
-                    case 152:
-                        if (location.parent && location.parent.kind === 151) {
+                    case 153:
+                        if (location.parent && location.parent.kind === 152) {
                             location = location.parent;
                         }
-                        if (location.parent && ts.isClassElement(location.parent)) {
+                        if (location.parent && (ts.isClassElement(location.parent) || location.parent.kind === 241)) {
                             location = location.parent;
                         }
                         break;
-                    case 309:
-                    case 302:
+                    case 311:
+                    case 304:
                         location = ts.getJSDocHost(location);
                         break;
+                    case 152:
+                        if (lastLocation && lastLocation === location.initializer) {
+                            associatedDeclarationForContainingInitializer = location;
+                        }
+                        break;
+                    case 187:
+                        if (lastLocation && lastLocation === location.initializer) {
+                            var root = ts.getRootDeclaration(location);
+                            if (root.kind === 152) {
+                                associatedDeclarationForContainingInitializer = location;
+                            }
+                        }
+                        break;
                 }
                 if (isSelfReferenceLocation(location)) {
                     lastSelfReferenceLocation = location;
@@ -26506,7 +27004,7 @@ var ts;
             }
             if (!result) {
                 if (lastLocation) {
-                    ts.Debug.assert(lastLocation.kind === 284);
+                    ts.Debug.assert(lastLocation.kind === 285);
                     if (lastLocation.commonJsModuleIndicator && name === "exports" && meaning & lastLocation.symbol.flags) {
                         return lastLocation.symbol;
                     }
@@ -26538,7 +27036,7 @@ var ts;
                                 var suggestionName = symbolToString(suggestion);
                                 var diagnostic = error(errorLocation, suggestedNameNotFoundMessage, diagnosticName(nameArg), suggestionName);
                                 if (suggestion.valueDeclaration) {
-                                    addRelatedInfo(diagnostic, ts.createDiagnosticForNode(suggestion.valueDeclaration, ts.Diagnostics._0_is_declared_here, suggestionName));
+                                    ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(suggestion.valueDeclaration, ts.Diagnostics._0_is_declared_here, suggestionName));
                                 }
                             }
                         }
@@ -26567,20 +27065,43 @@ var ts;
                 if (result && isInExternalModule && (meaning & 67220415) === 67220415 && !(originalLocation.flags & 2097152)) {
                     var merged = getMergedSymbol(result);
                     if (ts.length(merged.declarations) && ts.every(merged.declarations, function (d) { return ts.isNamespaceExportDeclaration(d) || ts.isSourceFile(d) && !!d.symbol.globalExports; })) {
-                        error(errorLocation, ts.Diagnostics._0_refers_to_a_UMD_global_but_the_current_file_is_a_module_Consider_adding_an_import_instead, ts.unescapeLeadingUnderscores(name));
+                        errorOrSuggestion(!compilerOptions.allowUmdGlobalAccess, errorLocation, ts.Diagnostics._0_refers_to_a_UMD_global_but_the_current_file_is_a_module_Consider_adding_an_import_instead, ts.unescapeLeadingUnderscores(name));
+                    }
+                }
+                if (result && associatedDeclarationForContainingInitializer && !withinDeferredContext && (meaning & 67220415) === 67220415) {
+                    var candidate = getMergedSymbol(getLateBoundSymbol(result));
+                    var root = ts.getRootDeclaration(associatedDeclarationForContainingInitializer);
+                    if (candidate === getSymbolOfNode(associatedDeclarationForContainingInitializer)) {
+                        error(errorLocation, ts.Diagnostics.Parameter_0_cannot_be_referenced_in_its_initializer, ts.declarationNameToString(associatedDeclarationForContainingInitializer.name));
+                    }
+                    else if (candidate.valueDeclaration && candidate.valueDeclaration.pos > associatedDeclarationForContainingInitializer.pos && root.parent.locals && lookup(root.parent.locals, candidate.escapedName, meaning) === candidate) {
+                        error(errorLocation, ts.Diagnostics.Initializer_of_parameter_0_cannot_reference_identifier_1_declared_after_it, ts.declarationNameToString(associatedDeclarationForContainingInitializer.name), ts.declarationNameToString(errorLocation));
                     }
                 }
             }
             return result;
         }
+        function getIsDeferredContext(location, lastLocation) {
+            if (location.kind !== 198 && location.kind !== 197) {
+                return ts.isTypeQueryNode(location) || ((ts.isFunctionLikeDeclaration(location) ||
+                    (location.kind === 155 && !ts.hasModifier(location, 32))) && (!lastLocation || lastLocation !== location.name));
+            }
+            if (lastLocation && lastLocation === location.name) {
+                return false;
+            }
+            if (location.asteriskToken || ts.hasModifier(location, 256)) {
+                return true;
+            }
+            return !ts.getImmediatelyInvokedFunctionExpression(location);
+        }
         function isSelfReferenceLocation(node) {
             switch (node.kind) {
-                case 239:
                 case 240:
                 case 241:
-                case 243:
                 case 242:
                 case 244:
+                case 243:
+                case 245:
                     return true;
                 default:
                     return false;
@@ -26592,7 +27113,7 @@ var ts;
         function isTypeParameterSymbolDeclaredInContainer(symbol, container) {
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var decl = _a[_i];
-                if (decl.kind === 150) {
+                if (decl.kind === 151) {
                     var parent = ts.isJSDocTemplateTag(decl.parent) ? ts.getJSDocHost(decl.parent) : decl.parent;
                     if (parent === container) {
                         return !(ts.isJSDocTemplateTag(decl.parent) && ts.find(decl.parent.parent.tags, ts.isJSDocTypeAlias));
@@ -26640,10 +27161,10 @@ var ts;
         }
         function getEntityNameForExtendingInterface(node) {
             switch (node.kind) {
-                case 72:
-                case 189:
+                case 73:
+                case 190:
                     return node.parent ? getEntityNameForExtendingInterface(node.parent) : undefined;
-                case 211:
+                case 212:
                     if (ts.isEntityNameExpression(node.expression)) {
                         return node.expression;
                     }
@@ -26730,7 +27251,7 @@ var ts;
         }
         function checkResolvedBlockScopedVariable(result, errorLocation) {
             ts.Debug.assert(!!(result.flags & 2 || result.flags & 32 || result.flags & 384));
-            var declaration = ts.find(result.declarations, function (d) { return ts.isBlockOrCatchScoped(d) || ts.isClassLike(d) || (d.kind === 243) || ts.isInJSFile(d) && !!ts.getJSDocEnumTag(d); });
+            var declaration = ts.find(result.declarations, function (d) { return ts.isBlockOrCatchScoped(d) || ts.isClassLike(d) || (d.kind === 244) || ts.isInJSFile(d) && !!ts.getJSDocEnumTag(d); });
             if (declaration === undefined)
                 return ts.Debug.fail("Declaration to checkResolvedBlockScopedVariable is undefined");
             if (!(declaration.flags & 4194304) && !isBlockScopedNameDeclaredBeforeUse(declaration, errorLocation)) {
@@ -26752,7 +27273,7 @@ var ts;
                     }
                 }
                 if (diagnosticMessage) {
-                    addRelatedInfo(diagnosticMessage, ts.createDiagnosticForNode(declaration, ts.Diagnostics._0_is_declared_here, declarationName));
+                    ts.addRelatedInfo(diagnosticMessage, ts.createDiagnosticForNode(declaration, ts.Diagnostics._0_is_declared_here, declarationName));
                 }
             }
         }
@@ -26761,13 +27282,13 @@ var ts;
         }
         function getAnyImportSyntax(node) {
             switch (node.kind) {
-                case 248:
+                case 249:
                     return node;
-                case 250:
-                    return node.parent;
                 case 251:
+                    return node.parent;
+                case 252:
                     return node.parent.parent;
-                case 253:
+                case 254:
                     return node.parent.parent.parent;
                 default:
                     return undefined;
@@ -26777,7 +27298,7 @@ var ts;
             return ts.find(symbol.declarations, ts.isAliasSymbolDeclaration);
         }
         function getTargetOfImportEqualsDeclaration(node, dontResolveAlias) {
-            if (node.moduleReference.kind === 259) {
+            if (node.moduleReference.kind === 260) {
                 return resolveExternalModuleSymbol(resolveExternalModuleName(node, ts.getExternalModuleImportEqualsDeclarationExpression(node)));
             }
             return getSymbolOfPartOfRightHandSideOfImportEquals(node.moduleReference, dontResolveAlias);
@@ -26823,7 +27344,16 @@ var ts;
                 var file = ts.find(moduleSymbol.declarations, ts.isSourceFile);
                 var hasSyntheticDefault = canHaveSyntheticDefault(file, moduleSymbol, dontResolveAlias);
                 if (!exportDefaultSymbol && !hasSyntheticDefault) {
-                    error(node.name, ts.Diagnostics.Module_0_has_no_default_export, symbolToString(moduleSymbol));
+                    if (hasExportAssignmentSymbol(moduleSymbol)) {
+                        var compilerOptionName = moduleKind >= ts.ModuleKind.ES2015 ? "allowSyntheticDefaultImports" : "esModuleInterop";
+                        var exportEqualsSymbol = moduleSymbol.exports.get("export=");
+                        var exportAssignment = exportEqualsSymbol.valueDeclaration;
+                        var err = error(node.name, ts.Diagnostics.Module_0_can_only_be_default_imported_using_the_1_flag, symbolToString(moduleSymbol), compilerOptionName);
+                        ts.addRelatedInfo(err, ts.createDiagnosticForNode(exportAssignment, ts.Diagnostics.This_module_is_declared_with_using_export_and_can_only_be_used_with_a_default_import_when_using_the_0_flag, compilerOptionName));
+                    }
+                    else {
+                        error(node.name, ts.Diagnostics.Module_0_has_no_default_export, symbolToString(moduleSymbol));
+                    }
                 }
                 else if (hasSyntheticDefault) {
                     return resolveExternalModuleSymbol(moduleSymbol, dontResolveAlias) || resolveSymbol(moduleSymbol, dontResolveAlias);
@@ -26899,7 +27429,7 @@ var ts;
                             var suggestionName = symbolToString(suggestion);
                             var diagnostic = error(name, ts.Diagnostics.Module_0_has_no_exported_member_1_Did_you_mean_2, moduleName, declarationName, suggestionName);
                             if (suggestion.valueDeclaration) {
-                                addRelatedInfo(diagnostic, ts.createDiagnosticForNode(suggestion.valueDeclaration, ts.Diagnostics._0_is_declared_here, suggestionName));
+                                ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(suggestion.valueDeclaration, ts.Diagnostics._0_is_declared_here, suggestionName));
                             }
                         }
                         else {
@@ -26936,20 +27466,20 @@ var ts;
         function getTargetOfAliasDeclaration(node, dontRecursivelyResolve) {
             if (dontRecursivelyResolve === void 0) { dontRecursivelyResolve = false; }
             switch (node.kind) {
-                case 248:
+                case 249:
                     return getTargetOfImportEqualsDeclaration(node, dontRecursivelyResolve);
-                case 250:
-                    return getTargetOfImportClause(node, dontRecursivelyResolve);
                 case 251:
+                    return getTargetOfImportClause(node, dontRecursivelyResolve);
+                case 252:
                     return getTargetOfNamespaceImport(node, dontRecursivelyResolve);
-                case 253:
-                    return getTargetOfImportSpecifier(node, dontRecursivelyResolve);
-                case 257:
-                    return getTargetOfExportSpecifier(node, 67220415 | 67897832 | 1920, dontRecursivelyResolve);
                 case 254:
-                case 204:
+                    return getTargetOfImportSpecifier(node, dontRecursivelyResolve);
+                case 258:
+                    return getTargetOfExportSpecifier(node, 67220415 | 67897832 | 1920, dontRecursivelyResolve);
+                case 255:
+                case 205:
                     return getTargetOfExportAssignment(node, dontRecursivelyResolve);
-                case 247:
+                case 248:
                     return getTargetOfNamespaceExportDeclaration(node, dontRecursivelyResolve);
                 default:
                     return ts.Debug.fail();
@@ -27003,10 +27533,10 @@ var ts;
                 var node = getDeclarationOfAliasSymbol(symbol);
                 if (!node)
                     return ts.Debug.fail();
-                if (node.kind === 254) {
+                if (node.kind === 255) {
                     checkExpressionCached(node.expression);
                 }
-                else if (node.kind === 257) {
+                else if (node.kind === 258) {
                     checkExpressionCached(node.propertyName || node.name);
                 }
                 else if (ts.isInternalModuleImportEqualsDeclaration(node)) {
@@ -27015,14 +27545,14 @@ var ts;
             }
         }
         function getSymbolOfPartOfRightHandSideOfImportEquals(entityName, dontResolveAlias) {
-            if (entityName.kind === 72 && ts.isRightSideOfQualifiedNameOrPropertyAccess(entityName)) {
+            if (entityName.kind === 73 && ts.isRightSideOfQualifiedNameOrPropertyAccess(entityName)) {
                 entityName = entityName.parent;
             }
-            if (entityName.kind === 72 || entityName.parent.kind === 148) {
+            if (entityName.kind === 73 || entityName.parent.kind === 149) {
                 return resolveEntityName(entityName, 1920, false, dontResolveAlias);
             }
             else {
-                ts.Debug.assert(entityName.parent.kind === 248);
+                ts.Debug.assert(entityName.parent.kind === 249);
                 return resolveEntityName(entityName, 67220415 | 67897832 | 1920, false, dontResolveAlias);
             }
         }
@@ -27035,17 +27565,17 @@ var ts;
             }
             var namespaceMeaning = 1920 | (ts.isInJSFile(name) ? meaning & 67220415 : 0);
             var symbol;
-            if (name.kind === 72) {
-                var message = meaning === namespaceMeaning ? ts.Diagnostics.Cannot_find_namespace_0 : getCannotFindNameDiagnosticForName(getFirstIdentifier(name).escapedText);
+            if (name.kind === 73) {
+                var message = meaning === namespaceMeaning ? ts.Diagnostics.Cannot_find_namespace_0 : getCannotFindNameDiagnosticForName(getFirstIdentifier(name));
                 var symbolFromJSPrototype = ts.isInJSFile(name) ? resolveEntityNameFromAssignmentDeclaration(name, meaning) : undefined;
                 symbol = resolveName(location || name, name.escapedText, meaning, ignoreErrors || symbolFromJSPrototype ? undefined : message, name, true);
                 if (!symbol) {
                     return symbolFromJSPrototype;
                 }
             }
-            else if (name.kind === 148 || name.kind === 189) {
-                var left = name.kind === 148 ? name.left : name.expression;
-                var right = name.kind === 148 ? name.right : name.name;
+            else if (name.kind === 149 || name.kind === 190) {
+                var left = name.kind === 149 ? name.left : name.expression;
+                var right = name.kind === 149 ? name.right : name.name;
                 var namespace = resolveEntityName(left, namespaceMeaning, ignoreErrors, false, location);
                 if (!namespace || ts.nodeIsMissing(right)) {
                     return undefined;
@@ -27170,6 +27700,10 @@ var ts;
             if (patternAmbientModules) {
                 var pattern = ts.findBestPatternMatch(patternAmbientModules, function (_) { return _.pattern; }, moduleReference);
                 if (pattern) {
+                    var augmentation = patternAmbientModuleAugmentations && patternAmbientModuleAugmentations.get(moduleReference);
+                    if (augmentation) {
+                        return getMergedSymbol(augmentation);
+                    }
                     return getMergedSymbol(pattern.symbol);
                 }
             }
@@ -27184,19 +27718,11 @@ var ts;
                 return undefined;
             }
             if (moduleNotFoundError) {
-                if (ts.pathIsRelative(moduleReference)) {
-                    var sourceFile_1 = ts.getSourceFileOfNode(location);
-                    var redirects = sourceFile_1.redirectedReferences;
-                    if (redirects) {
-                        var normalizedTargetPath = ts.getNormalizedAbsolutePath(moduleReference, ts.getDirectoryPath(sourceFile_1.fileName));
-                        for (var _i = 0, _a = [".ts", ".tsx"]; _i < _a.length; _i++) {
-                            var ext = _a[_i];
-                            var probePath = normalizedTargetPath + ext;
-                            if (redirects.indexOf(probePath) >= 0) {
-                                error(errorNode, ts.Diagnostics.Output_file_0_has_not_been_built_from_source_file_1, moduleReference, probePath);
-                                return undefined;
-                            }
-                        }
+                if (resolvedModule) {
+                    var redirect = host.getProjectReferenceRedirect(resolvedModule.resolvedFileName);
+                    if (redirect) {
+                        error(errorNode, ts.Diagnostics.Output_file_0_has_not_been_built_from_source_file_1, redirect, resolvedModule.resolvedFileName);
+                        return undefined;
                     }
                 }
                 if (resolutionDiagnostic) {
@@ -27260,7 +27786,7 @@ var ts;
         function resolveESModuleSymbol(moduleSymbol, referencingLocation, dontResolveAlias) {
             var symbol = resolveExternalModuleSymbol(moduleSymbol, dontResolveAlias);
             if (!dontResolveAlias && symbol) {
-                if (!(symbol.flags & (1536 | 3)) && !ts.getDeclarationOfKind(symbol, 284)) {
+                if (!(symbol.flags & (1536 | 3)) && !ts.getDeclarationOfKind(symbol, 285)) {
                     var compilerOptionName = moduleKind >= ts.ModuleKind.ES2015
                         ? "allowSyntheticDefaultImports"
                         : "esModuleInterop";
@@ -27505,7 +28031,7 @@ var ts;
             var members = node.members;
             for (var _i = 0, members_2 = members; _i < members_2.length; _i++) {
                 var member = members_2[_i];
-                if (member.kind === 157 && ts.nodeIsPresent(member.body)) {
+                if (member.kind === 158 && ts.nodeIsPresent(member.body)) {
                     return member;
                 }
             }
@@ -27516,13 +28042,10 @@ var ts;
             result.id = typeCount;
             return result;
         }
-        function createIntrinsicType(kind, intrinsicName) {
+        function createIntrinsicType(kind, intrinsicName, objectFlags) {
+            if (objectFlags === void 0) { objectFlags = 0; }
             var type = createType(kind);
             type.intrinsicName = intrinsicName;
-            return type;
-        }
-        function createNullableType(kind, intrinsicName, objectFlags) {
-            var type = createIntrinsicType(kind, intrinsicName);
             type.objectFlags = objectFlags;
             return type;
         }
@@ -27589,11 +28112,11 @@ var ts;
                     }
                 }
                 switch (location.kind) {
-                    case 284:
+                    case 285:
                         if (!ts.isExternalOrCommonJsModule(location)) {
                             break;
                         }
-                    case 244:
+                    case 245:
                         if (result = callback(getSymbolOfNode(location).exports)) {
                             return result;
                         }
@@ -27643,7 +28166,7 @@ var ts;
                         && symbolFromSymbolTable.escapedName !== "default"
                         && !(ts.isUMDExportSymbol(symbolFromSymbolTable) && enclosingDeclaration && ts.isExternalModule(ts.getSourceFileOfNode(enclosingDeclaration)))
                         && (!useOnlyExternalAliasing || ts.some(symbolFromSymbolTable.declarations, ts.isExternalModuleImportEqualsDeclaration))
-                        && (ignoreQualification || !ts.getDeclarationOfKind(symbolFromSymbolTable, 257))) {
+                        && (ignoreQualification || !ts.getDeclarationOfKind(symbolFromSymbolTable, 258))) {
                         var resolvedImportedSymbol = resolveAlias(symbolFromSymbolTable);
                         if (isAccessible(symbolFromSymbolTable, resolvedImportedSymbol, ignoreQualification)) {
                             return [symbolFromSymbolTable];
@@ -27672,7 +28195,7 @@ var ts;
                 if (symbolFromSymbolTable === symbol) {
                     return true;
                 }
-                symbolFromSymbolTable = (symbolFromSymbolTable.flags & 2097152 && !ts.getDeclarationOfKind(symbolFromSymbolTable, 257)) ? resolveAlias(symbolFromSymbolTable) : symbolFromSymbolTable;
+                symbolFromSymbolTable = (symbolFromSymbolTable.flags & 2097152 && !ts.getDeclarationOfKind(symbolFromSymbolTable, 258)) ? resolveAlias(symbolFromSymbolTable) : symbolFromSymbolTable;
                 if (symbolFromSymbolTable.flags & meaning) {
                     qualify = true;
                     return true;
@@ -27686,10 +28209,10 @@ var ts;
                 for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                     var declaration = _a[_i];
                     switch (declaration.kind) {
-                        case 154:
-                        case 156:
-                        case 158:
+                        case 155:
+                        case 157:
                         case 159:
+                        case 160:
                             continue;
                         default:
                             return false;
@@ -27777,14 +28300,14 @@ var ts;
             return node && getSymbolOfNode(node);
         }
         function hasExternalModuleSymbol(declaration) {
-            return ts.isAmbientModule(declaration) || (declaration.kind === 284 && ts.isExternalOrCommonJsModule(declaration));
+            return ts.isAmbientModule(declaration) || (declaration.kind === 285 && ts.isExternalOrCommonJsModule(declaration));
         }
         function hasNonGlobalAugmentationExternalModuleSymbol(declaration) {
-            return ts.isModuleWithStringLiteralName(declaration) || (declaration.kind === 284 && ts.isExternalOrCommonJsModule(declaration));
+            return ts.isModuleWithStringLiteralName(declaration) || (declaration.kind === 285 && ts.isExternalOrCommonJsModule(declaration));
         }
         function hasVisibleDeclarations(symbol, shouldComputeAliasToMakeVisible) {
             var aliasesToMakeVisible;
-            if (!ts.every(symbol.declarations, getIsDeclarationVisible)) {
+            if (!ts.every(ts.filter(symbol.declarations, function (d) { return d.kind !== 73; }), getIsDeclarationVisible)) {
                 return undefined;
             }
             return { accessibility: 0, aliasesToMakeVisible: aliasesToMakeVisible };
@@ -27820,13 +28343,13 @@ var ts;
         }
         function isEntityNameVisible(entityName, enclosingDeclaration) {
             var meaning;
-            if (entityName.parent.kind === 167 ||
+            if (entityName.parent.kind === 168 ||
                 ts.isExpressionWithTypeArgumentsInClassExtendsClause(entityName.parent) ||
-                entityName.parent.kind === 149) {
+                entityName.parent.kind === 150) {
                 meaning = 67220415 | 1048576;
             }
-            else if (entityName.kind === 148 || entityName.kind === 189 ||
-                entityName.parent.kind === 248) {
+            else if (entityName.kind === 149 || entityName.kind === 190 ||
+                entityName.parent.kind === 249) {
                 meaning = 1920;
             }
             else {
@@ -27871,10 +28394,10 @@ var ts;
             function signatureToStringWorker(writer) {
                 var sigOutput;
                 if (flags & 262144) {
-                    sigOutput = kind === 1 ? 166 : 165;
+                    sigOutput = kind === 1 ? 167 : 166;
                 }
                 else {
-                    sigOutput = kind === 1 ? 161 : 160;
+                    sigOutput = kind === 1 ? 162 : 161;
                 }
                 var sig = nodeBuilder.signatureToSignatureDeclaration(signature, sigOutput, enclosingDeclaration, toNodeBuilderFlags(flags) | 70221824 | 512);
                 var printer = ts.createPrinter({ removeComments: true, omitTrailingSemicolon: true });
@@ -27901,6 +28424,15 @@ var ts;
             }
             return result;
         }
+        function getTypeNamesForErrorDisplay(left, right) {
+            var leftStr = typeToString(left);
+            var rightStr = typeToString(right);
+            if (leftStr === rightStr) {
+                leftStr = typeToString(left, undefined, 64);
+                rightStr = typeToString(right, undefined, 64);
+            }
+            return [leftStr, rightStr];
+        }
         function toNodeBuilderFlags(flags) {
             if (flags === void 0) { flags = 0; }
             return flags & 9469291;
@@ -27968,26 +28500,26 @@ var ts;
                 }
                 if (type.flags & 1) {
                     context.approximateLength += 3;
-                    return ts.createKeywordTypeNode(120);
+                    return ts.createKeywordTypeNode(121);
                 }
                 if (type.flags & 2) {
-                    return ts.createKeywordTypeNode(143);
+                    return ts.createKeywordTypeNode(144);
                 }
                 if (type.flags & 4) {
                     context.approximateLength += 6;
-                    return ts.createKeywordTypeNode(138);
+                    return ts.createKeywordTypeNode(139);
                 }
                 if (type.flags & 8) {
                     context.approximateLength += 6;
-                    return ts.createKeywordTypeNode(135);
+                    return ts.createKeywordTypeNode(136);
                 }
                 if (type.flags & 64) {
                     context.approximateLength += 6;
-                    return ts.createKeywordTypeNode(146);
+                    return ts.createKeywordTypeNode(147);
                 }
                 if (type.flags & 16) {
                     context.approximateLength += 7;
-                    return ts.createKeywordTypeNode(123);
+                    return ts.createKeywordTypeNode(124);
                 }
                 if (type.flags & 1024 && !(type.flags & 1048576)) {
                     var parentSymbol = getParentOfSymbol(type.symbol);
@@ -28005,8 +28537,9 @@ var ts;
                     return ts.createLiteralTypeNode(ts.setEmitFlags(ts.createLiteral(type.value), 16777216));
                 }
                 if (type.flags & 256) {
-                    context.approximateLength += (("" + type.value).length);
-                    return ts.createLiteralTypeNode((ts.createLiteral(type.value)));
+                    var value = type.value;
+                    context.approximateLength += ("" + value).length;
+                    return ts.createLiteralTypeNode(value < 0 ? ts.createPrefix(39, ts.createLiteral(-value)) : ts.createLiteral(value));
                 }
                 if (type.flags & 2048) {
                     context.approximateLength += (ts.pseudoBigIntToString(type.value).length) + 1;
@@ -28027,33 +28560,33 @@ var ts;
                         }
                     }
                     context.approximateLength += 13;
-                    return ts.createTypeOperatorNode(142, ts.createKeywordTypeNode(139));
+                    return ts.createTypeOperatorNode(143, ts.createKeywordTypeNode(140));
                 }
                 if (type.flags & 16384) {
                     context.approximateLength += 4;
-                    return ts.createKeywordTypeNode(106);
+                    return ts.createKeywordTypeNode(107);
                 }
                 if (type.flags & 32768) {
                     context.approximateLength += 9;
-                    return ts.createKeywordTypeNode(141);
+                    return ts.createKeywordTypeNode(142);
                 }
                 if (type.flags & 65536) {
                     context.approximateLength += 4;
-                    return ts.createKeywordTypeNode(96);
+                    return ts.createKeywordTypeNode(97);
                 }
                 if (type.flags & 131072) {
                     context.approximateLength += 5;
-                    return ts.createKeywordTypeNode(132);
+                    return ts.createKeywordTypeNode(133);
                 }
                 if (type.flags & 4096) {
                     context.approximateLength += 6;
-                    return ts.createKeywordTypeNode(139);
+                    return ts.createKeywordTypeNode(140);
                 }
                 if (type.flags & 67108864) {
                     context.approximateLength += 6;
-                    return ts.createKeywordTypeNode(136);
+                    return ts.createKeywordTypeNode(137);
                 }
-                if (type.flags & 262144 && type.isThisType) {
+                if (isThisTypeParameter(type)) {
                     if (context.flags & 4194304) {
                         if (!context.encounteredError && !(context.flags & 32768)) {
                             context.encounteredError = true;
@@ -28076,14 +28609,10 @@ var ts;
                         return ts.createInferTypeNode(typeParameterToDeclarationWithConstraint(type, context, undefined));
                     }
                     if (context.flags & 4 &&
-                        type.flags & 262144 &&
-                        ts.length(type.symbol.declarations) &&
-                        ts.isTypeParameterDeclaration(type.symbol.declarations[0]) &&
-                        typeParameterShadowsNameInScope(type, context) &&
                         !isTypeSymbolAccessible(type.symbol, context.enclosingDeclaration)) {
-                        var name = type.symbol.declarations[0].name;
+                        var name = typeParameterToName(type, context);
                         context.approximateLength += ts.idText(name).length;
-                        return ts.createTypeReferenceNode(ts.getGeneratedNameForNode(name, 16 | 8), undefined);
+                        return ts.createTypeReferenceNode(ts.createIdentifier(ts.idText(name)), undefined);
                     }
                     return type.symbol
                         ? symbolToTypeNode(type.symbol, context, 67897832)
@@ -28102,7 +28631,7 @@ var ts;
                     }
                     var typeNodes = mapToTypeNodes(types, context, true);
                     if (typeNodes && typeNodes.length > 0) {
-                        var unionOrIntersectionTypeNode = ts.createUnionOrIntersectionTypeNode(type.flags & 1048576 ? 173 : 174, typeNodes);
+                        var unionOrIntersectionTypeNode = ts.createUnionOrIntersectionTypeNode(type.flags & 1048576 ? 174 : 175, typeNodes);
                         return unionOrIntersectionTypeNode;
                     }
                     else {
@@ -28171,7 +28700,7 @@ var ts;
                             var isInstanceType = type === getInferredClassType(symbol) ? 67897832 : 67220415;
                             return symbolToTypeNode(symbol, context, isInstanceType);
                         }
-                        else if (symbol.flags & 32 && !getBaseTypeVariableOfClass(symbol) && !(symbol.valueDeclaration.kind === 209 && context.flags & 2048) ||
+                        else if (symbol.flags & 32 && !getBaseTypeVariableOfClass(symbol) && !(symbol.valueDeclaration.kind === 210 && context.flags & 2048) ||
                             symbol.flags & (384 | 512) ||
                             shouldWriteTypeOfFunctionSymbol()) {
                             return symbolToTypeNode(symbol, context, 67220415);
@@ -28213,7 +28742,7 @@ var ts;
                         var isNonLocalFunctionSymbol = !!(symbol.flags & 16) &&
                             (symbol.parent ||
                                 ts.forEach(symbol.declarations, function (declaration) {
-                                    return declaration.parent.kind === 284 || declaration.parent.kind === 245;
+                                    return declaration.parent.kind === 285 || declaration.parent.kind === 246;
                                 }));
                         if (isStaticMethodSymbol || isNonLocalFunctionSymbol) {
                             return (!!(context.flags & 4096) || (context.visitedTypes && context.visitedTypes.has(typeId))) &&
@@ -28233,12 +28762,12 @@ var ts;
                         }
                         if (resolved.callSignatures.length === 1 && !resolved.constructSignatures.length) {
                             var signature = resolved.callSignatures[0];
-                            var signatureNode = signatureToSignatureDeclarationHelper(signature, 165, context);
+                            var signatureNode = signatureToSignatureDeclarationHelper(signature, 166, context);
                             return signatureNode;
                         }
                         if (resolved.constructSignatures.length === 1 && !resolved.callSignatures.length) {
                             var signature = resolved.constructSignatures[0];
-                            var signatureNode = signatureToSignatureDeclarationHelper(signature, 166, context);
+                            var signatureNode = signatureToSignatureDeclarationHelper(signature, 167, context);
                             return signatureNode;
                         }
                     }
@@ -28259,7 +28788,7 @@ var ts;
                         }
                         var elementType = typeToTypeNodeHelper(typeArguments[0], context);
                         var arrayType = ts.createArrayTypeNode(elementType);
-                        return type.target === globalArrayType ? arrayType : ts.createTypeOperatorNode(133, arrayType);
+                        return type.target === globalArrayType ? arrayType : ts.createTypeOperatorNode(134, arrayType);
                     }
                     else if (type.target.objectFlags & 8) {
                         if (typeArguments.length > 0) {
@@ -28273,12 +28802,12 @@ var ts;
                                         ts.createOptionalTypeNode(tupleConstituentNodes[i]);
                                 }
                                 var tupleTypeNode = ts.createTupleTypeNode(tupleConstituentNodes);
-                                return type.target.readonly ? ts.createTypeOperatorNode(133, tupleTypeNode) : tupleTypeNode;
+                                return type.target.readonly ? ts.createTypeOperatorNode(134, tupleTypeNode) : tupleTypeNode;
                             }
                         }
                         if (context.encounteredError || (context.flags & 524288)) {
                             var tupleTypeNode = ts.createTupleTypeNode([]);
-                            return type.target.readonly ? ts.createTypeOperatorNode(133, tupleTypeNode) : tupleTypeNode;
+                            return type.target.readonly ? ts.createTypeOperatorNode(134, tupleTypeNode) : tupleTypeNode;
                         }
                         context.encounteredError = true;
                         return undefined;
@@ -28366,11 +28895,11 @@ var ts;
                     var typeElements = [];
                     for (var _i = 0, _a = resolvedType.callSignatures; _i < _a.length; _i++) {
                         var signature = _a[_i];
-                        typeElements.push(signatureToSignatureDeclarationHelper(signature, 160, context));
+                        typeElements.push(signatureToSignatureDeclarationHelper(signature, 161, context));
                     }
                     for (var _b = 0, _c = resolvedType.constructSignatures; _b < _c.length; _b++) {
                         var signature = _c[_b];
-                        typeElements.push(signatureToSignatureDeclarationHelper(signature, 161, context));
+                        typeElements.push(signatureToSignatureDeclarationHelper(signature, 162, context));
                     }
                     if (resolvedType.stringIndexInfo) {
                         var indexSignature = void 0;
@@ -28417,15 +28946,15 @@ var ts;
                 if (!(context.flags & 1)) {
                     return ts.createTypeReferenceNode(ts.createIdentifier("..."), undefined);
                 }
-                return ts.createKeywordTypeNode(120);
+                return ts.createKeywordTypeNode(121);
             }
             function addPropertyToElementList(propertySymbol, context, typeElements) {
-                var propertyIsReverseMapped = !!(ts.getCheckFlags(propertySymbol) & 4096);
+                var propertyIsReverseMapped = !!(ts.getCheckFlags(propertySymbol) & 8192);
                 var propertyType = propertyIsReverseMapped && context.flags & 33554432 ?
                     anyType : getTypeOfSymbol(propertySymbol);
                 var saveEnclosingDeclaration = context.enclosingDeclaration;
                 context.enclosingDeclaration = undefined;
-                if (context.tracker.trackSymbol && ts.getCheckFlags(propertySymbol) & 2048) {
+                if (context.tracker.trackSymbol && ts.getCheckFlags(propertySymbol) & 4096) {
                     var decl = ts.first(propertySymbol.declarations);
                     if (hasLateBindableName(decl)) {
                         trackComputedName(decl.name, saveEnclosingDeclaration, context);
@@ -28436,10 +28965,10 @@ var ts;
                 context.enclosingDeclaration = saveEnclosingDeclaration;
                 var optionalToken = propertySymbol.flags & 16777216 ? ts.createToken(56) : undefined;
                 if (propertySymbol.flags & (16 | 8192) && !getPropertiesOfObjectType(propertyType).length && !isReadonlySymbol(propertySymbol)) {
-                    var signatures = getSignaturesOfType(propertyType, 0);
+                    var signatures = getSignaturesOfType(filterType(propertyType, function (t) { return !(t.flags & 32768); }), 0);
                     for (var _i = 0, signatures_1 = signatures; _i < signatures_1.length; _i++) {
                         var signature = signatures_1[_i];
-                        var methodDeclaration = signatureToSignatureDeclarationHelper(signature, 155, context);
+                        var methodDeclaration = signatureToSignatureDeclarationHelper(signature, 156, context);
                         methodDeclaration.name = propertyName;
                         methodDeclaration.questionToken = optionalToken;
                         if (propertySymbol.valueDeclaration) {
@@ -28456,10 +28985,10 @@ var ts;
                         propertyTypeNode = createElidedInformationPlaceholder(context);
                     }
                     else {
-                        propertyTypeNode = propertyType ? typeToTypeNodeHelper(propertyType, context) : ts.createKeywordTypeNode(120);
+                        propertyTypeNode = propertyType ? typeToTypeNodeHelper(propertyType, context) : ts.createKeywordTypeNode(121);
                     }
                     context.flags = savedFlags;
-                    var modifiers = isReadonlySymbol(propertySymbol) ? [ts.createToken(133)] : undefined;
+                    var modifiers = isReadonlySymbol(propertySymbol) ? [ts.createToken(134)] : undefined;
                     if (modifiers) {
                         context.approximateLength += 9;
                     }
@@ -28508,14 +29037,14 @@ var ts;
             }
             function indexInfoToIndexSignatureDeclarationHelper(indexInfo, kind, context) {
                 var name = ts.getNameFromIndexInfo(indexInfo) || "x";
-                var indexerTypeNode = ts.createKeywordTypeNode(kind === 0 ? 138 : 135);
+                var indexerTypeNode = ts.createKeywordTypeNode(kind === 0 ? 139 : 136);
                 var indexingParameter = ts.createParameter(undefined, undefined, undefined, name, undefined, indexerTypeNode, undefined);
                 var typeNode = typeToTypeNodeHelper(indexInfo.type || anyType, context);
                 if (!indexInfo.type && !(context.flags & 2097152)) {
                     context.encounteredError = true;
                 }
                 context.approximateLength += (name.length + 4);
-                return ts.createIndexSignature(undefined, indexInfo.isReadonly ? [ts.createToken(133)] : undefined, [indexingParameter], typeNode);
+                return ts.createIndexSignature(undefined, indexInfo.isReadonly ? [ts.createToken(134)] : undefined, [indexingParameter], typeNode);
             }
             function signatureToSignatureDeclarationHelper(signature, kind, context) {
                 var typeParameters;
@@ -28526,7 +29055,7 @@ var ts;
                 else {
                     typeParameters = signature.typeParameters && signature.typeParameters.map(function (parameter) { return typeParameterToDeclaration(parameter, context); });
                 }
-                var parameters = getExpandedParameters(signature).map(function (parameter) { return symbolToParameterDeclaration(parameter, context, kind === 157); });
+                var parameters = getExpandedParameters(signature).map(function (parameter) { return symbolToParameterDeclaration(parameter, context, kind === 158); });
                 if (signature.thisParameter) {
                     var thisParameter = symbolToParameterDeclaration(signature.thisParameter, context);
                     parameters.unshift(thisParameter);
@@ -28545,29 +29074,20 @@ var ts;
                     returnTypeNode = returnType && typeToTypeNodeHelper(returnType, context);
                 }
                 if (context.flags & 256) {
-                    if (returnTypeNode && returnTypeNode.kind === 120) {
+                    if (returnTypeNode && returnTypeNode.kind === 121) {
                         returnTypeNode = undefined;
                     }
                 }
                 else if (!returnTypeNode) {
-                    returnTypeNode = ts.createKeywordTypeNode(120);
+                    returnTypeNode = ts.createKeywordTypeNode(121);
                 }
                 context.approximateLength += 3;
                 return ts.createSignatureDeclaration(kind, typeParameters, parameters, returnTypeNode, typeArguments);
             }
-            function typeParameterShadowsNameInScope(type, context) {
-                return !!resolveName(context.enclosingDeclaration, type.symbol.escapedName, 67897832, undefined, type.symbol.escapedName, false);
-            }
             function typeParameterToDeclarationWithConstraint(type, context, constraintNode) {
                 var savedContextFlags = context.flags;
                 context.flags &= ~512;
-                var shouldUseGeneratedName = context.flags & 4 &&
-                    type.symbol.declarations && type.symbol.declarations[0] &&
-                    ts.isTypeParameterDeclaration(type.symbol.declarations[0]) &&
-                    typeParameterShadowsNameInScope(type, context);
-                var name = shouldUseGeneratedName
-                    ? ts.getGeneratedNameForNode(type.symbol.declarations[0].name, 16 | 8)
-                    : symbolToName(type.symbol, context, 67897832, true);
+                var name = typeParameterToName(type, context);
                 var defaultParameter = getDefaultFromTypeParameter(type);
                 var defaultParameterNode = defaultParameter && typeToTypeNodeHelper(defaultParameter, context);
                 context.flags = savedContextFlags;
@@ -28579,9 +29099,9 @@ var ts;
                 return typeParameterToDeclarationWithConstraint(type, context, constraintNode);
             }
             function symbolToParameterDeclaration(parameterSymbol, context, preserveModifierFlags) {
-                var parameterDeclaration = ts.getDeclarationOfKind(parameterSymbol, 151);
+                var parameterDeclaration = ts.getDeclarationOfKind(parameterSymbol, 152);
                 if (!parameterDeclaration && !isTransientSymbol(parameterSymbol)) {
-                    parameterDeclaration = ts.getDeclarationOfKind(parameterSymbol, 304);
+                    parameterDeclaration = ts.getDeclarationOfKind(parameterSymbol, 306);
                 }
                 var parameterType = getTypeOfSymbol(parameterSymbol);
                 if (parameterDeclaration && isRequiredInitializedParameter(parameterDeclaration)) {
@@ -28589,16 +29109,16 @@ var ts;
                 }
                 var parameterTypeNode = typeToTypeNodeHelper(parameterType, context);
                 var modifiers = !(context.flags & 8192) && preserveModifierFlags && parameterDeclaration && parameterDeclaration.modifiers ? parameterDeclaration.modifiers.map(ts.getSynthesizedClone) : undefined;
-                var isRest = parameterDeclaration && ts.isRestParameter(parameterDeclaration) || ts.getCheckFlags(parameterSymbol) & 16384;
+                var isRest = parameterDeclaration && ts.isRestParameter(parameterDeclaration) || ts.getCheckFlags(parameterSymbol) & 32768;
                 var dotDotDotToken = isRest ? ts.createToken(25) : undefined;
                 var name = parameterDeclaration
                     ? parameterDeclaration.name ?
-                        parameterDeclaration.name.kind === 72 ? ts.setEmitFlags(ts.getSynthesizedClone(parameterDeclaration.name), 16777216) :
-                            parameterDeclaration.name.kind === 148 ? ts.setEmitFlags(ts.getSynthesizedClone(parameterDeclaration.name.right), 16777216) :
+                        parameterDeclaration.name.kind === 73 ? ts.setEmitFlags(ts.getSynthesizedClone(parameterDeclaration.name), 16777216) :
+                            parameterDeclaration.name.kind === 149 ? ts.setEmitFlags(ts.getSynthesizedClone(parameterDeclaration.name.right), 16777216) :
                                 cloneBindingName(parameterDeclaration.name) :
                         ts.symbolName(parameterSymbol)
                     : ts.symbolName(parameterSymbol);
-                var isOptional = parameterDeclaration && isOptionalParameter(parameterDeclaration) || ts.getCheckFlags(parameterSymbol) & 8192;
+                var isOptional = parameterDeclaration && isOptionalParameter(parameterDeclaration) || ts.getCheckFlags(parameterSymbol) & 16384;
                 var questionToken = isOptional ? ts.createToken(56) : undefined;
                 var parameterNode = ts.createParameter(undefined, modifiers, dotDotDotToken, name, questionToken, parameterTypeNode, undefined);
                 context.approximateLength += ts.symbolName(parameterSymbol).length + 3;
@@ -28611,7 +29131,7 @@ var ts;
                         }
                         var visited = ts.visitEachChild(node, elideInitializerAndSetEmitFlags, ts.nullTransformationContext, undefined, elideInitializerAndSetEmitFlags);
                         var clone = ts.nodeIsSynthesized(visited) ? visited : ts.getSynthesizedClone(visited);
-                        if (clone.kind === 186) {
+                        if (clone.kind === 187) {
                             clone.initializer = undefined;
                         }
                         return ts.setEmitFlags(clone, 1 | 16777216);
@@ -28702,6 +29222,11 @@ var ts;
             function lookupTypeParameterNodes(chain, index, context) {
                 ts.Debug.assert(chain && 0 <= index && index < chain.length);
                 var symbol = chain[index];
+                var symbolId = "" + getSymbolId(symbol);
+                if (context.typeParameterSymbolList && context.typeParameterSymbolList.get(symbolId)) {
+                    return undefined;
+                }
+                (context.typeParameterSymbolList || (context.typeParameterSymbolList = ts.createMap())).set(symbolId, true);
                 var typeParameterNodes;
                 if (context.flags & 512 && index < (chain.length - 1)) {
                     var parentSymbol = symbol;
@@ -28723,7 +29248,7 @@ var ts;
                 return top;
             }
             function getSpecifierForModuleSymbol(symbol, context) {
-                var file = ts.getDeclarationOfKind(symbol, 284);
+                var file = ts.getDeclarationOfKind(symbol, 285);
                 if (file && file.moduleName !== undefined) {
                     return file.moduleName;
                 }
@@ -28836,6 +29361,33 @@ var ts;
                     return identifier;
                 }
             }
+            function typeParameterShadowsNameInScope(escapedName, context) {
+                return !!resolveName(context.enclosingDeclaration, escapedName, 67897832, undefined, escapedName, false);
+            }
+            function typeParameterToName(type, context) {
+                if (context.flags & 4 && context.typeParameterNames) {
+                    var cached = context.typeParameterNames.get("" + getTypeId(type));
+                    if (cached) {
+                        return cached;
+                    }
+                }
+                var result = symbolToName(type.symbol, context, 67897832, true);
+                if (context.flags & 4) {
+                    var rawtext = result.escapedText;
+                    var i = 0;
+                    var text = rawtext;
+                    while ((context.typeParameterNamesByText && context.typeParameterNamesByText.get(text)) || typeParameterShadowsNameInScope(text, context)) {
+                        i++;
+                        text = rawtext + "_" + i;
+                    }
+                    if (text !== rawtext) {
+                        result = ts.createIdentifier(text, result.typeArguments);
+                    }
+                    (context.typeParameterNames || (context.typeParameterNames = ts.createMap())).set("" + getTypeId(type), result);
+                    (context.typeParameterNamesByText || (context.typeParameterNamesByText = ts.createMap())).set(result.escapedText, true);
+                }
+                return result;
+            }
             function symbolToName(symbol, context, meaning, expectsIdentifier) {
                 var chain = lookupSymbolChain(symbol, context, meaning);
                 if (expectsIdentifier && chain.length !== 1
@@ -28953,8 +29505,8 @@ var ts;
         }
         function getTypeAliasForTypeLiteral(type) {
             if (type.symbol && type.symbol.flags & 2048) {
-                var node = ts.findAncestor(type.symbol.declarations[0].parent, function (n) { return n.kind !== 177; });
-                if (node.kind === 242) {
+                var node = ts.findAncestor(type.symbol.declarations[0].parent, function (n) { return n.kind !== 178; });
+                if (node.kind === 243) {
                     return getSymbolOfNode(node);
                 }
             }
@@ -28962,11 +29514,11 @@ var ts;
         }
         function isTopLevelInExternalModuleAugmentation(node) {
             return node && node.parent &&
-                node.parent.kind === 245 &&
+                node.parent.kind === 246 &&
                 ts.isExternalModuleAugmentation(node.parent.parent);
         }
         function isDefaultBindingContext(location) {
-            return location.kind === 284 || ts.isAmbientModule(location);
+            return location.kind === 285 || ts.isAmbientModule(location);
         }
         function getNameOfSymbolFromNameType(symbol, context) {
             var nameType = symbol.nameType;
@@ -28976,6 +29528,9 @@ var ts;
                     if (!ts.isIdentifierText(name, compilerOptions.target) && !isNumericLiteralName(name)) {
                         return "\"" + ts.escapeString(name, 34) + "\"";
                     }
+                    if (isNumericLiteralName(name) && ts.startsWith(name, "-")) {
+                        return "[" + name + "]";
+                    }
                     return name;
                 }
                 if (nameType.flags & 8192) {
@@ -28997,7 +29552,7 @@ var ts;
                     if (ts.isCallExpression(declaration) && ts.isBindableObjectDefinePropertyCall(declaration)) {
                         return ts.symbolName(symbol);
                     }
-                    if (ts.isComputedPropertyName(name_2) && !(ts.getCheckFlags(symbol) & 2048) && symbol.nameType && symbol.nameType.flags & 384) {
+                    if (ts.isComputedPropertyName(name_2) && !(ts.getCheckFlags(symbol) & 4096) && symbol.nameType && symbol.nameType.flags & 384) {
                         var result = getNameOfSymbolFromNameType(symbol, context);
                         if (result !== undefined) {
                             return result;
@@ -29005,17 +29560,17 @@ var ts;
                     }
                     return ts.declarationNameToString(name_2);
                 }
-                if (declaration.parent && declaration.parent.kind === 237) {
+                if (declaration.parent && declaration.parent.kind === 238) {
                     return ts.declarationNameToString(declaration.parent.name);
                 }
                 switch (declaration.kind) {
-                    case 209:
-                    case 196:
+                    case 210:
                     case 197:
+                    case 198:
                         if (context && !context.encounteredError && !(context.flags & 131072)) {
                             context.encounteredError = true;
                         }
-                        return declaration.kind === 209 ? "(Anonymous class)" : "(Anonymous function)";
+                        return declaration.kind === 210 ? "(Anonymous class)" : "(Anonymous function)";
                 }
             }
             var name = getNameOfSymbolFromNameType(symbol, context);
@@ -29032,67 +29587,67 @@ var ts;
             return false;
             function determineIfDeclarationIsVisible() {
                 switch (node.kind) {
-                    case 302:
-                    case 309:
+                    case 304:
+                    case 311:
                         return !!(node.parent && node.parent.parent && node.parent.parent.parent && ts.isSourceFile(node.parent.parent.parent));
-                    case 186:
+                    case 187:
                         return isDeclarationVisible(node.parent.parent);
-                    case 237:
+                    case 238:
                         if (ts.isBindingPattern(node.name) &&
                             !node.name.elements.length) {
                             return false;
                         }
-                    case 244:
-                    case 240:
+                    case 245:
                     case 241:
                     case 242:
-                    case 239:
                     case 243:
-                    case 248:
+                    case 240:
+                    case 244:
+                    case 249:
                         if (ts.isExternalModuleAugmentation(node)) {
                             return true;
                         }
                         var parent = getDeclarationContainer(node);
                         if (!(ts.getCombinedModifierFlags(node) & 1) &&
-                            !(node.kind !== 248 && parent.kind !== 284 && parent.flags & 4194304)) {
+                            !(node.kind !== 249 && parent.kind !== 285 && parent.flags & 4194304)) {
                             return isGlobalSourceFile(parent);
                         }
                         return isDeclarationVisible(parent);
-                    case 154:
-                    case 153:
-                    case 158:
-                    case 159:
-                    case 156:
                     case 155:
+                    case 154:
+                    case 159:
+                    case 160:
+                    case 157:
+                    case 156:
                         if (ts.hasModifier(node, 8 | 16)) {
                             return false;
                         }
-                    case 157:
-                    case 161:
-                    case 160:
+                    case 158:
                     case 162:
-                    case 151:
-                    case 245:
-                    case 165:
+                    case 161:
+                    case 163:
+                    case 152:
+                    case 246:
                     case 166:
-                    case 168:
-                    case 164:
+                    case 167:
                     case 169:
+                    case 165:
                     case 170:
-                    case 173:
+                    case 171:
                     case 174:
-                    case 177:
+                    case 175:
+                    case 178:
                         return isDeclarationVisible(node.parent);
-                    case 250:
                     case 251:
-                    case 253:
-                        return false;
-                    case 150:
-                    case 284:
-                    case 247:
-                        return true;
+                    case 252:
                     case 254:
                         return false;
+                    case 151:
+                    case 285:
+                    case 248:
+                        return true;
+                    case 255:
+                        return false;
                     default:
                         return false;
                 }
@@ -29100,10 +29655,10 @@ var ts;
         }
         function collectLinkedAliases(node, setVisibility) {
             var exportSymbol;
-            if (node.parent && node.parent.kind === 254) {
+            if (node.parent && node.parent.kind === 255) {
                 exportSymbol = resolveName(node, node.escapedText, 67220415 | 67897832 | 1920 | 2097152, undefined, node, false);
             }
-            else if (node.parent.kind === 257) {
+            else if (node.parent.kind === 258) {
                 exportSymbol = getTargetOfExportSpecifier(node.parent, 67220415 | 67897832 | 1920 | 2097152);
             }
             var result;
@@ -29184,12 +29739,12 @@ var ts;
         function getDeclarationContainer(node) {
             return ts.findAncestor(ts.getRootDeclaration(node), function (node) {
                 switch (node.kind) {
-                    case 237:
                     case 238:
+                    case 239:
+                    case 254:
                     case 253:
                     case 252:
                     case 251:
-                    case 250:
                         return false;
                     default:
                         return true;
@@ -29215,7 +29770,7 @@ var ts;
             return symbol && getSymbolLinks(symbol).type || getTypeForVariableLikeDeclaration(node, false);
         }
         function isComputedNonLiteralName(name) {
-            return name.kind === 149 && !ts.isStringOrNumericLiteralLike(name.expression);
+            return name.kind === 150 && !ts.isStringOrNumericLiteralLike(name.expression);
         }
         function getRestType(source, properties, symbol) {
             source = filterType(source, function (t) { return !(t.flags & 98304); });
@@ -29230,13 +29785,11 @@ var ts;
                 if (omitKeyType.flags & 131072) {
                     return source;
                 }
-                var pickTypeAlias = getGlobalPickSymbol();
-                var excludeTypeAlias = getGlobalExcludeSymbol();
-                if (!pickTypeAlias || !excludeTypeAlias) {
+                var omitTypeAlias = getGlobalOmitSymbol();
+                if (!omitTypeAlias) {
                     return errorType;
                 }
-                var pickKeys = getTypeAliasInstantiation(excludeTypeAlias, [getIndexType(source), omitKeyType]);
-                return getTypeAliasInstantiation(pickTypeAlias, [source, pickKeys]);
+                return getTypeAliasInstantiation(omitTypeAlias, [source, omitKeyType]);
             }
             var members = ts.createSymbolTable();
             for (var _i = 0, _a = getPropertiesOfType(source); _i < _a.length; _i++) {
@@ -29260,7 +29813,7 @@ var ts;
             if (parentAccess && parentAccess.flowNode) {
                 var propName = getDestructuringPropertyName(node);
                 if (propName) {
-                    var result = ts.createNode(190, node.pos, node.end);
+                    var result = ts.createNode(191, node.pos, node.end);
                     result.parent = node;
                     result.expression = parentAccess;
                     var literal = ts.createNode(10, node.pos, node.end);
@@ -29275,23 +29828,23 @@ var ts;
         function getParentElementAccess(node) {
             var ancestor = node.parent.parent;
             switch (ancestor.kind) {
-                case 186:
-                case 275:
-                    return getSyntheticElementAccess(ancestor);
                 case 187:
+                case 276:
+                    return getSyntheticElementAccess(ancestor);
+                case 188:
                     return getSyntheticElementAccess(node.parent);
-                case 237:
+                case 238:
                     return ancestor.initializer;
-                case 204:
+                case 205:
                     return ancestor.right;
             }
         }
         function getDestructuringPropertyName(node) {
             var parent = node.parent;
-            if (node.kind === 186 && parent.kind === 184) {
+            if (node.kind === 187 && parent.kind === 185) {
                 return getLiteralPropertyNameText(node.propertyName || node.name);
             }
-            if (node.kind === 275 || node.kind === 276) {
+            if (node.kind === 276 || node.kind === 277) {
                 return getLiteralPropertyNameText(node.name);
             }
             return "" + parent.elements.indexOf(node);
@@ -29310,7 +29863,7 @@ var ts;
                 parentType = getNonNullableType(parentType);
             }
             var type;
-            if (pattern.kind === 184) {
+            if (pattern.kind === 185) {
                 if (declaration.dotDotDotToken) {
                     if (parentType.flags & 2 || !isValidSpreadType(parentType)) {
                         error(declaration, ts.Diagnostics.Rest_types_may_only_be_created_from_object_types);
@@ -29333,7 +29886,7 @@ var ts;
                 }
             }
             else {
-                var elementType = checkIteratedTypeOrElementType(parentType, pattern, false, false);
+                var elementType = checkIteratedTypeOrElementType(65, parentType, undefinedType, pattern);
                 var index_1 = pattern.elements.indexOf(declaration);
                 if (declaration.dotDotDotToken) {
                     type = everyType(parentType, isTupleType) ?
@@ -29342,19 +29895,23 @@ var ts;
                 }
                 else if (isArrayLikeType(parentType)) {
                     var indexType = getLiteralType(index_1);
-                    var declaredType = getConstraintForLocation(getIndexedAccessType(parentType, indexType, declaration.name), declaration.name);
+                    var accessFlags = hasDefaultValue(declaration) ? 8 : 0;
+                    var declaredType = getConstraintForLocation(getIndexedAccessTypeOrUndefined(parentType, indexType, declaration.name, accessFlags) || errorType, declaration.name);
                     type = getFlowTypeOfDestructuring(declaration, declaredType);
                 }
                 else {
                     type = elementType;
                 }
             }
-            if (strictNullChecks && declaration.initializer && !(getFalsyFlags(checkDeclarationInitializer(declaration)) & 32768)) {
-                type = getTypeWithFacts(type, 524288);
+            if (!declaration.initializer) {
+                return type;
             }
-            return declaration.initializer && !ts.getEffectiveTypeAnnotationNode(ts.walkUpBindingElementsAndPatterns(declaration)) ?
-                getUnionType([type, checkDeclarationInitializer(declaration)], 2) :
-                type;
+            if (ts.getEffectiveTypeAnnotationNode(ts.walkUpBindingElementsAndPatterns(declaration))) {
+                return strictNullChecks && !(getFalsyFlags(checkDeclarationInitializer(declaration)) & 32768) ?
+                    getTypeWithFacts(type, 524288) :
+                    type;
+            }
+            return getUnionType([getTypeWithFacts(type, 524288), checkDeclarationInitializer(declaration)], 2);
         }
         function getTypeForDeclarationFromJSDocComment(declaration) {
             var jsdocType = ts.getJSDocType(declaration);
@@ -29365,27 +29922,27 @@ var ts;
         }
         function isNullOrUndefined(node) {
             var expr = ts.skipParentheses(node);
-            return expr.kind === 96 || expr.kind === 72 && getResolvedSymbol(expr) === undefinedSymbol;
+            return expr.kind === 97 || expr.kind === 73 && getResolvedSymbol(expr) === undefinedSymbol;
         }
         function isEmptyArrayLiteral(node) {
             var expr = ts.skipParentheses(node);
-            return expr.kind === 187 && expr.elements.length === 0;
+            return expr.kind === 188 && expr.elements.length === 0;
         }
         function addOptionality(type, optional) {
             if (optional === void 0) { optional = true; }
             return strictNullChecks && optional ? getOptionalType(type) : type;
         }
         function isParameterOfContextuallyTypedFunction(node) {
-            return node.kind === 151 &&
-                (node.parent.kind === 196 || node.parent.kind === 197) &&
+            return node.kind === 152 &&
+                (node.parent.kind === 197 || node.parent.kind === 198) &&
                 !!getContextualType(node.parent);
         }
         function getTypeForVariableLikeDeclaration(declaration, includeOptionality) {
-            if (ts.isVariableDeclaration(declaration) && declaration.parent.parent.kind === 226) {
+            if (ts.isVariableDeclaration(declaration) && declaration.parent.parent.kind === 227) {
                 var indexType = getIndexType(getNonNullableTypeIfNeeded(checkExpression(declaration.parent.parent.expression)));
                 return indexType.flags & (262144 | 4194304) ? getExtractStringType(indexType) : stringType;
             }
-            if (ts.isVariableDeclaration(declaration) && declaration.parent.parent.kind === 227) {
+            if (ts.isVariableDeclaration(declaration) && declaration.parent.parent.kind === 228) {
                 var forOfStatement = declaration.parent.parent;
                 return checkRightHandSideOfForOf(forOfStatement.expression, forOfStatement.awaitModifier) || anyType;
             }
@@ -29399,7 +29956,7 @@ var ts;
                 return addOptionality(declaredType, isOptional);
             }
             if ((noImplicitAny || ts.isInJSFile(declaration)) &&
-                declaration.kind === 237 && !ts.isBindingPattern(declaration.name) &&
+                declaration.kind === 238 && !ts.isBindingPattern(declaration.name) &&
                 !(ts.getCombinedModifierFlags(declaration) & 1) && !(declaration.flags & 4194304)) {
                 if (!(ts.getCombinedNodeFlags(declaration) & 2) && (!declaration.initializer || isNullOrUndefined(declaration.initializer))) {
                     return autoType;
@@ -29408,10 +29965,10 @@ var ts;
                     return autoArrayType;
                 }
             }
-            if (declaration.kind === 151) {
+            if (declaration.kind === 152) {
                 var func = declaration.parent;
-                if (func.kind === 159 && !hasNonBindableDynamicName(func)) {
-                    var getter = ts.getDeclarationOfKind(getSymbolOfNode(declaration.parent), 158);
+                if (func.kind === 160 && !hasNonBindableDynamicName(func)) {
+                    var getter = ts.getDeclarationOfKind(getSymbolOfNode(declaration.parent), 159);
                     if (getter) {
                         var getterSignature = getSignatureFromDeclaration(getter);
                         var thisParameter = getAccessorThisParameter(func);
@@ -29428,7 +29985,7 @@ var ts;
                         return getTypeAtPosition(getSignatureFromDeclaration(typeTag), func.parameters.indexOf(declaration));
                     }
                 }
-                var type = declaration.symbol.escapedName === "this" ? getContextualThisParameterType(func) : getContextuallyTypedParameterType(declaration);
+                var type = declaration.symbol.escapedName === "this" ? getContextualThisParameterType(func) : getContextuallyTypedParameterType(declaration, true);
                 if (type) {
                     return addOptionality(type, isOptional);
                 }
@@ -29451,7 +30008,7 @@ var ts;
             }
             return undefined;
         }
-        function getWidenedTypeFromAssignmentDeclaration(symbol, resolvedSymbol) {
+        function getWidenedTypeForAssignmentDeclaration(symbol, resolvedSymbol) {
             var container = ts.getAssignedExpandoInitializer(symbol.valueDeclaration);
             if (container) {
                 var tag = ts.getJSDocTypeTag(container);
@@ -29483,7 +30040,7 @@ var ts;
                     }
                 }
                 if (!ts.isCallExpression(expression)) {
-                    jsdocType = getJSDocTypeFromAssignmentDeclaration(jsdocType, expression, symbol, declaration);
+                    jsdocType = getAnnotatedTypeForAssignmentDeclaration(jsdocType, expression, symbol, declaration);
                 }
                 if (!jsdocType) {
                     (types || (types = [])).push((ts.isBinaryExpression(expression) || ts.isCallExpression(expression)) ? getInitializerTypeFromAssignmentDeclaration(symbol, resolvedSymbol, expression, kind) : neverType);
@@ -29529,15 +30086,21 @@ var ts;
             type.objectFlags |= 16384;
             return type;
         }
-        function getJSDocTypeFromAssignmentDeclaration(declaredType, expression, _symbol, declaration) {
-            var typeNode = ts.getJSDocType(expression.parent);
+        function getAnnotatedTypeForAssignmentDeclaration(declaredType, expression, symbol, declaration) {
+            var typeNode = ts.getEffectiveTypeAnnotationNode(expression.parent);
             if (typeNode) {
                 var type = getWidenedType(getTypeFromTypeNode(typeNode));
                 if (!declaredType) {
                     return type;
                 }
                 else if (declaredType !== errorType && type !== errorType && !isTypeIdenticalTo(declaredType, type)) {
-                    errorNextVariableOrPropertyDeclarationMustHaveSameType(declaredType, declaration, type);
+                    errorNextVariableOrPropertyDeclarationMustHaveSameType(undefined, declaredType, declaration, type);
+                }
+            }
+            if (symbol.parent) {
+                var typeNode_2 = ts.getEffectiveTypeAnnotationNode(symbol.parent.valueDeclaration);
+                if (typeNode_2) {
+                    return getTypeOfPropertyOfType(getTypeFromTypeNode(typeNode_2), symbol.escapedName);
                 }
             }
             return declaredType;
@@ -29601,9 +30164,9 @@ var ts;
         }
         function isDeclarationInConstructor(expression) {
             var thisContainer = ts.getThisContainer(expression, false);
-            return thisContainer.kind === 157 ||
-                thisContainer.kind === 239 ||
-                (thisContainer.kind === 196 && !ts.isPrototypePropertyAssignment(thisContainer.parent));
+            return thisContainer.kind === 158 ||
+                thisContainer.kind === 240 ||
+                (thisContainer.kind === 197 && !ts.isPrototypePropertyAssignment(thisContainer.parent));
         }
         function getConstructorDefinedThisAssignmentTypes(types, declarations) {
             ts.Debug.assert(types.length === declarations.length);
@@ -29642,7 +30205,7 @@ var ts;
         function getTypeFromObjectBindingPattern(pattern, includePatternInType, reportErrors) {
             var members = ts.createSymbolTable();
             var stringIndexInfo;
-            var objectFlags = 128 | 262144;
+            var objectFlags = 128 | 524288;
             ts.forEach(pattern.elements, function (e) {
                 var name = e.propertyName || e.name;
                 if (e.dotDotDotToken) {
@@ -29671,7 +30234,7 @@ var ts;
         function getTypeFromArrayBindingPattern(pattern, includePatternInType, reportErrors) {
             var elements = pattern.elements;
             var lastElement = ts.lastOrUndefined(elements);
-            var hasRestElement = !!(lastElement && lastElement.kind === 186 && lastElement.dotDotDotToken);
+            var hasRestElement = !!(lastElement && lastElement.kind === 187 && lastElement.dotDotDotToken);
             if (elements.length === 0 || elements.length === 1 && hasRestElement) {
                 return languageVersion >= 2 ? createIterableType(anyType) : anyArrayType;
             }
@@ -29687,7 +30250,7 @@ var ts;
         function getTypeFromBindingPattern(pattern, includePatternInType, reportErrors) {
             if (includePatternInType === void 0) { includePatternInType = false; }
             if (reportErrors === void 0) { reportErrors = false; }
-            return pattern.kind === 184
+            return pattern.kind === 185
                 ? getTypeFromObjectBindingPattern(pattern, includePatternInType, reportErrors)
                 : getTypeFromArrayBindingPattern(pattern, includePatternInType, reportErrors);
         }
@@ -29714,7 +30277,7 @@ var ts;
         }
         function declarationBelongsToPrivateAmbientMember(declaration) {
             var root = ts.getRootDeclaration(declaration);
-            var memberDeclaration = root.kind === 151 ? root.parent : root;
+            var memberDeclaration = root.kind === 152 ? root.parent : root;
             return isPrivateWithinAmbient(memberDeclaration);
         }
         function tryGetTypeFromEffectiveTypeNode(declaration) {
@@ -29760,9 +30323,6 @@ var ts;
                 }
                 return type_1;
             }
-            if (declaration.kind === 254) {
-                return widenTypeForVariableLikeDeclaration(checkExpressionCached(declaration.expression), declaration);
-            }
             if (!pushTypeResolution(symbol, 0)) {
                 if (symbol.flags & 512) {
                     return getTypeOfFuncClassEnumModule(symbol);
@@ -29770,9 +30330,12 @@ var ts;
                 return reportCircularityError(symbol);
             }
             var type;
-            if (ts.isInJSFile(declaration) &&
+            if (declaration.kind === 255) {
+                type = widenTypeForVariableLikeDeclaration(checkExpressionCached(declaration.expression), declaration);
+            }
+            else if (ts.isInJSFile(declaration) &&
                 (ts.isCallExpression(declaration) || ts.isBinaryExpression(declaration) || ts.isPropertyAccessExpression(declaration) && ts.isBinaryExpression(declaration.parent))) {
-                type = getWidenedTypeFromAssignmentDeclaration(symbol);
+                type = getWidenedTypeForAssignmentDeclaration(symbol);
             }
             else if (ts.isJSDocPropertyLikeTag(declaration)
                 || ts.isPropertyAccessExpression(declaration)
@@ -29786,7 +30349,7 @@ var ts;
                     return getTypeOfFuncClassEnumModule(symbol);
                 }
                 type = ts.isBinaryExpression(declaration.parent) ?
-                    getWidenedTypeFromAssignmentDeclaration(symbol) :
+                    getWidenedTypeForAssignmentDeclaration(symbol) :
                     tryGetTypeFromEffectiveTypeNode(declaration) || anyType;
             }
             else if (ts.isPropertyAssignment(declaration)) {
@@ -29815,7 +30378,7 @@ var ts;
                 type = getTypeOfEnumMember(symbol);
             }
             else {
-                return ts.Debug.fail("Unhandled declaration kind! " + ts.Debug.showSyntaxKind(declaration) + " for " + ts.Debug.showSymbol(symbol));
+                return ts.Debug.fail("Unhandled declaration kind! " + ts.Debug.formatSyntaxKind(declaration.kind) + " for " + ts.Debug.formatSymbol(symbol));
             }
             if (!popTypeResolution()) {
                 if (symbol.flags & 512) {
@@ -29827,7 +30390,7 @@ var ts;
         }
         function getAnnotatedAccessorTypeNode(accessor) {
             if (accessor) {
-                if (accessor.kind === 158) {
+                if (accessor.kind === 159) {
                     var getterTypeAnnotation = ts.getEffectiveReturnTypeNode(accessor);
                     return getterTypeAnnotation;
                 }
@@ -29854,8 +30417,8 @@ var ts;
             return links.type || (links.type = getTypeOfAccessorsWorker(symbol));
         }
         function getTypeOfAccessorsWorker(symbol) {
-            var getter = ts.getDeclarationOfKind(symbol, 158);
-            var setter = ts.getDeclarationOfKind(symbol, 159);
+            var getter = ts.getDeclarationOfKind(symbol, 159);
+            var setter = ts.getDeclarationOfKind(symbol, 160);
             if (getter && ts.isInJSFile(getter)) {
                 var jsDocType = getTypeForDeclarationFromJSDocComment(getter);
                 if (jsDocType) {
@@ -29894,7 +30457,7 @@ var ts;
             if (!popTypeResolution()) {
                 type = anyType;
                 if (noImplicitAny) {
-                    var getter_1 = ts.getDeclarationOfKind(symbol, 158);
+                    var getter_1 = ts.getDeclarationOfKind(symbol, 159);
                     error(getter_1, ts.Diagnostics._0_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions, symbolToString(symbol));
                 }
             }
@@ -29933,9 +30496,9 @@ var ts;
             if (symbol.flags & 1536 && ts.isShorthandAmbientModuleSymbol(symbol)) {
                 return anyType;
             }
-            else if (declaration.kind === 204 ||
-                declaration.kind === 189 && declaration.parent.kind === 204) {
-                return getWidenedTypeFromAssignmentDeclaration(symbol);
+            else if (declaration.kind === 205 ||
+                declaration.kind === 190 && declaration.parent.kind === 205) {
+                return getWidenedTypeForAssignmentDeclaration(symbol);
             }
             else if (symbol.flags & 512 && declaration && ts.isSourceFile(declaration) && declaration.commonJsModuleIndicator) {
                 var resolvedModule = resolveExternalModuleSymbol(symbol);
@@ -29944,7 +30507,7 @@ var ts;
                         return errorType;
                     }
                     var exportEquals = getMergedSymbol(symbol.exports.get("export="));
-                    var type_2 = getWidenedTypeFromAssignmentDeclaration(exportEquals, exportEquals === resolvedModule ? undefined : resolvedModule);
+                    var type_2 = getWidenedTypeForAssignmentDeclaration(exportEquals, exportEquals === resolvedModule ? undefined : resolvedModule);
                     if (!popTypeResolution()) {
                         return reportCircularityError(symbol);
                     }
@@ -29994,16 +30557,28 @@ var ts;
                 error(symbol.valueDeclaration, ts.Diagnostics._0_is_referenced_directly_or_indirectly_in_its_own_type_annotation, symbolToString(symbol));
                 return errorType;
             }
-            if (noImplicitAny && (declaration.kind !== 151 || declaration.initializer)) {
+            if (noImplicitAny && (declaration.kind !== 152 || declaration.initializer)) {
                 error(symbol.valueDeclaration, ts.Diagnostics._0_implicitly_has_type_any_because_it_does_not_have_a_type_annotation_and_is_referenced_directly_or_indirectly_in_its_own_initializer, symbolToString(symbol));
             }
             return anyType;
         }
+        function getTypeOfSymbolWithDeferredType(symbol) {
+            var links = getSymbolLinks(symbol);
+            if (!links.type) {
+                ts.Debug.assertDefined(links.deferralParent);
+                ts.Debug.assertDefined(links.deferralConstituents);
+                links.type = links.deferralParent.flags & 1048576 ? getUnionType(links.deferralConstituents) : getIntersectionType(links.deferralConstituents);
+            }
+            return links.type;
+        }
         function getTypeOfSymbol(symbol) {
+            if (ts.getCheckFlags(symbol) & 65536) {
+                return getTypeOfSymbolWithDeferredType(symbol);
+            }
             if (ts.getCheckFlags(symbol) & 1) {
                 return getTypeOfInstantiatedSymbol(symbol);
             }
-            if (ts.getCheckFlags(symbol) & 4096) {
+            if (ts.getCheckFlags(symbol) & 8192) {
                 return getTypeOfReverseMappedSymbol(symbol);
             }
             if (symbol.flags & (3 | 4)) {
@@ -30059,51 +30634,51 @@ var ts;
                     return undefined;
                 }
                 switch (node.kind) {
-                    case 240:
-                    case 209:
                     case 241:
-                    case 160:
-                    case 161:
-                    case 155:
-                    case 165:
-                    case 166:
-                    case 294:
-                    case 239:
-                    case 156:
-                    case 196:
-                    case 197:
+                    case 210:
                     case 242:
-                    case 308:
-                    case 309:
-                    case 302:
-                    case 181:
-                    case 175:
+                    case 161:
+                    case 162:
+                    case 156:
+                    case 166:
+                    case 167:
+                    case 295:
+                    case 240:
+                    case 157:
+                    case 197:
+                    case 198:
+                    case 243:
+                    case 310:
+                    case 311:
+                    case 304:
+                    case 182:
+                    case 176:
                         var outerTypeParameters = getOuterTypeParameters(node, includeThisTypes);
-                        if (node.kind === 181) {
+                        if (node.kind === 182) {
                             return ts.append(outerTypeParameters, getDeclaredTypeOfTypeParameter(getSymbolOfNode(node.typeParameter)));
                         }
-                        else if (node.kind === 175) {
+                        else if (node.kind === 176) {
                             return ts.concatenate(outerTypeParameters, getInferTypeParameters(node));
                         }
                         var outerAndOwnTypeParameters = appendTypeParameters(outerTypeParameters, ts.getEffectiveTypeParameterDeclarations(node));
                         var thisType = includeThisTypes &&
-                            (node.kind === 240 || node.kind === 209 || node.kind === 241) &&
+                            (node.kind === 241 || node.kind === 210 || node.kind === 242) &&
                             getDeclaredTypeOfClassOrInterface(getSymbolOfNode(node)).thisType;
                         return thisType ? ts.append(outerAndOwnTypeParameters, thisType) : outerAndOwnTypeParameters;
                 }
             }
         }
         function getOuterTypeParametersOfClassOrInterface(symbol) {
-            var declaration = symbol.flags & 32 ? symbol.valueDeclaration : ts.getDeclarationOfKind(symbol, 241);
+            var declaration = symbol.flags & 32 ? symbol.valueDeclaration : ts.getDeclarationOfKind(symbol, 242);
             return getOuterTypeParameters(declaration);
         }
         function getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol) {
             var result;
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var node = _a[_i];
-                if (node.kind === 241 ||
-                    node.kind === 240 ||
-                    node.kind === 209 ||
+                if (node.kind === 242 ||
+                    node.kind === 241 ||
+                    node.kind === 210 ||
                     ts.isTypeAlias(node)) {
                     var declaration = node;
                     result = appendTypeParameters(result, ts.getEffectiveTypeParameterDeclarations(declaration));
@@ -30179,7 +30754,7 @@ var ts;
                                 ctorReturn = getReturnTypeOfSignature(ctorSig[0]);
                             }
                         }
-                        addRelatedInfo(err, ts.createDiagnosticForNode(baseConstructorType.symbol.declarations[0], ts.Diagnostics.Did_you_mean_for_0_to_be_constrained_to_type_new_args_Colon_any_1, symbolToString(baseConstructorType.symbol), typeToString(ctorReturn)));
+                        ts.addRelatedInfo(err, ts.createDiagnosticForNode(baseConstructorType.symbol.declarations[0], ts.Diagnostics.Did_you_mean_for_0_to_be_constrained_to_type_new_args_Colon_any_1, symbolToString(baseConstructorType.symbol), typeToString(ctorReturn)));
                     }
                     return type.resolvedBaseConstructorType = errorType;
                 }
@@ -30269,7 +30844,7 @@ var ts;
             type.resolvedBaseTypes = type.resolvedBaseTypes || ts.emptyArray;
             for (var _i = 0, _a = type.symbol.declarations; _i < _a.length; _i++) {
                 var declaration = _a[_i];
-                if (declaration.kind === 241 && ts.getInterfaceBaseTypeNodes(declaration)) {
+                if (declaration.kind === 242 && ts.getInterfaceBaseTypeNodes(declaration)) {
                     for (var _b = 0, _c = ts.getInterfaceBaseTypeNodes(declaration); _b < _c.length; _b++) {
                         var node = _c[_b];
                         var baseType = getTypeFromTypeNode(node);
@@ -30298,7 +30873,7 @@ var ts;
         function isThislessInterface(symbol) {
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var declaration = _a[_i];
-                if (declaration.kind === 241) {
+                if (declaration.kind === 242) {
                     if (declaration.flags & 64) {
                         return false;
                     }
@@ -30348,7 +30923,7 @@ var ts;
                     return errorType;
                 }
                 var declaration = ts.find(symbol.declarations, function (d) {
-                    return ts.isJSDocTypeAlias(d) || d.kind === 242;
+                    return ts.isJSDocTypeAlias(d) || d.kind === 243;
                 });
                 var typeNode = ts.isJSDocTypeAlias(declaration) ? declaration.typeExpression : declaration.type;
                 var type = typeNode ? getTypeFromTypeNode(typeNode) : errorType;
@@ -30372,7 +30947,7 @@ var ts;
             if (expr.kind === 10) {
                 return true;
             }
-            else if (expr.kind === 204) {
+            else if (expr.kind === 205) {
                 return isStringConcatExpression(expr.left) && isStringConcatExpression(expr.right);
             }
             return false;
@@ -30386,12 +30961,12 @@ var ts;
                 case 10:
                 case 8:
                     return true;
-                case 202:
+                case 203:
                     return expr.operator === 39 &&
                         expr.operand.kind === 8;
-                case 72:
+                case 73:
                     return ts.nodeIsMissing(expr) || !!getSymbolOfNode(member.parent).exports.get(expr.escapedText);
-                case 204:
+                case 205:
                     return isStringConcatExpression(expr);
                 default:
                     return false;
@@ -30405,7 +30980,7 @@ var ts;
             var hasNonLiteralMember = false;
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var declaration = _a[_i];
-                if (declaration.kind === 243) {
+                if (declaration.kind === 244) {
                     for (var _b = 0, _c = declaration.members; _b < _c.length; _b++) {
                         var member = _c[_b];
                         if (member.initializer && member.initializer.kind === 10) {
@@ -30432,10 +31007,11 @@ var ts;
                 var memberTypeList = [];
                 for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                     var declaration = _a[_i];
-                    if (declaration.kind === 243) {
+                    if (declaration.kind === 244) {
                         for (var _b = 0, _c = declaration.members; _b < _c.length; _b++) {
                             var member = _c[_b];
-                            var memberType = getFreshTypeOfLiteralType(getLiteralType(getEnumMemberValue(member), enumCount, getSymbolOfNode(member)));
+                            var value = getEnumMemberValue(member);
+                            var memberType = getFreshTypeOfLiteralType(getLiteralType(value !== undefined ? value : 0, enumCount, getSymbolOfNode(member)));
                             getSymbolLinks(getSymbolOfNode(member)).declaredType = memberType;
                             memberTypeList.push(getRegularTypeOfLiteralType(memberType));
                         }
@@ -30498,23 +31074,23 @@ var ts;
         }
         function isThislessType(node) {
             switch (node.kind) {
-                case 120:
-                case 143:
-                case 138:
-                case 135:
-                case 146:
-                case 123:
+                case 121:
+                case 144:
                 case 139:
                 case 136:
-                case 106:
-                case 141:
-                case 96:
-                case 132:
-                case 182:
+                case 147:
+                case 124:
+                case 140:
+                case 137:
+                case 107:
+                case 142:
+                case 97:
+                case 133:
+                case 183:
                     return true;
-                case 169:
+                case 170:
                     return isThislessType(node.elementType);
-                case 164:
+                case 165:
                     return !node.typeArguments || node.typeArguments.every(isThislessType);
             }
             return false;
@@ -30530,7 +31106,7 @@ var ts;
         function isThislessFunctionLikeDeclaration(node) {
             var returnType = ts.getEffectiveReturnTypeNode(node);
             var typeParameters = ts.getEffectiveTypeParameterDeclarations(node);
-            return (node.kind === 157 || (!!returnType && isThislessType(returnType))) &&
+            return (node.kind === 158 || (!!returnType && isThislessType(returnType))) &&
                 node.parameters.every(isThislessVariableLikeDeclaration) &&
                 typeParameters.every(isThislessTypeParameter);
         }
@@ -30539,14 +31115,14 @@ var ts;
                 var declaration = symbol.declarations[0];
                 if (declaration) {
                     switch (declaration.kind) {
-                        case 154:
-                        case 153:
-                            return isThislessVariableLikeDeclaration(declaration);
-                        case 156:
                         case 155:
+                        case 154:
+                            return isThislessVariableLikeDeclaration(declaration);
                         case 157:
+                        case 156:
                         case 158:
                         case 159:
+                        case 160:
                             return isThislessFunctionLikeDeclaration(declaration);
                     }
                 }
@@ -30616,7 +31192,7 @@ var ts;
             return ts.Debug.fail();
         }
         function addDeclarationToLateBoundSymbol(symbol, member, symbolFlags) {
-            ts.Debug.assert(!!(ts.getCheckFlags(symbol) & 2048), "Expected a late-bound symbol.");
+            ts.Debug.assert(!!(ts.getCheckFlags(symbol) & 4096), "Expected a late-bound symbol.");
             symbol.flags |= symbolFlags;
             getSymbolLinks(member.symbol).lateSymbol = symbol;
             if (!symbol.declarations) {
@@ -30642,14 +31218,14 @@ var ts;
                     var symbolFlags = decl.symbol.flags;
                     var lateSymbol = lateSymbols.get(memberName);
                     if (!lateSymbol)
-                        lateSymbols.set(memberName, lateSymbol = createSymbol(0, memberName, 2048));
+                        lateSymbols.set(memberName, lateSymbol = createSymbol(0, memberName, 4096));
                     var earlySymbol = earlySymbols && earlySymbols.get(memberName);
                     if (lateSymbol.flags & getExcludedSymbolFlags(symbolFlags) || earlySymbol) {
                         var declarations = earlySymbol ? ts.concatenate(earlySymbol.declarations, lateSymbol.declarations) : lateSymbol.declarations;
                         var name_3 = !(type.flags & 8192) && ts.unescapeLeadingUnderscores(memberName) || ts.declarationNameToString(decl.name);
                         ts.forEach(declarations, function (declaration) { return error(ts.getNameOfDeclaration(declaration) || declaration, ts.Diagnostics.Property_0_was_also_declared_here, name_3); });
                         error(decl.name || decl, ts.Diagnostics.Duplicate_property_0, name_3);
-                        lateSymbol = createSymbol(0, memberName, 2048);
+                        lateSymbol = createSymbol(0, memberName, 4096);
                     }
                     lateSymbol.nameType = type;
                     addDeclarationToLateBoundSymbol(lateSymbol, decl, symbolFlags);
@@ -30698,11 +31274,12 @@ var ts;
             if (symbol.flags & 106500 && symbol.escapedName === "__computed") {
                 var links = getSymbolLinks(symbol);
                 if (!links.lateSymbol && ts.some(symbol.declarations, hasLateBindableName)) {
+                    var parent = getMergedSymbol(symbol.parent);
                     if (ts.some(symbol.declarations, ts.hasStaticModifier)) {
-                        getExportsOfSymbol(symbol.parent);
+                        getExportsOfSymbol(parent);
                     }
                     else {
-                        getMembersOfSymbol(symbol.parent);
+                        getMembersOfSymbol(parent);
                     }
                 }
                 return links.lateSymbol || (links.lateSymbol = symbol);
@@ -30795,7 +31372,17 @@ var ts;
             return sig;
         }
         function cloneSignature(sig) {
-            return createSignature(sig.declaration, sig.typeParameters, sig.thisParameter, sig.parameters, undefined, undefined, sig.minArgumentCount, sig.hasRestParameter, sig.hasLiteralTypes);
+            var result = createSignature(sig.declaration, sig.typeParameters, sig.thisParameter, sig.parameters, undefined, undefined, sig.minArgumentCount, sig.hasRestParameter, sig.hasLiteralTypes);
+            result.target = sig.target;
+            result.mapper = sig.mapper;
+            return result;
+        }
+        function createUnionSignature(signature, unionSignatures) {
+            var result = cloneSignature(signature);
+            result.unionSignatures = unionSignatures;
+            result.target = undefined;
+            result.mapper = undefined;
+            return result;
         }
         function getExpandedParameters(sig) {
             if (sig.hasRestParameter) {
@@ -30808,8 +31395,8 @@ var ts;
                     var tupleRestIndex_1 = restType.target.hasRestElement ? elementTypes.length - 1 : -1;
                     var restParams = ts.map(elementTypes, function (t, i) {
                         var name = getParameterNameAtPosition(sig, restIndex_1 + i);
-                        var checkFlags = i === tupleRestIndex_1 ? 16384 :
-                            i >= minLength_1 ? 8192 : 0;
+                        var checkFlags = i === tupleRestIndex_1 ? 32768 :
+                            i >= minLength_1 ? 16384 : 0;
                         var symbol = createSymbol(1, name, checkFlags);
                         symbol.type = i === tupleRestIndex_1 ? createArrayType(t) : t;
                         return symbol;
@@ -30890,13 +31477,13 @@ var ts;
                             var s = signature;
                             if (unionSignatures.length > 1) {
                                 var thisParameter = signature.thisParameter;
-                                if (ts.forEach(unionSignatures, function (sig) { return sig.thisParameter; })) {
+                                var firstThisParameterOfUnionSignatures = ts.forEach(unionSignatures, function (sig) { return sig.thisParameter; });
+                                if (firstThisParameterOfUnionSignatures) {
                                     var thisType = getUnionType(ts.map(unionSignatures, function (sig) { return sig.thisParameter ? getTypeOfSymbol(sig.thisParameter) : anyType; }), 2);
-                                    thisParameter = createSymbolWithType(signature.thisParameter, thisType);
+                                    thisParameter = createSymbolWithType(firstThisParameterOfUnionSignatures, thisType);
                                 }
-                                s = cloneSignature(signature);
+                                s = createUnionSignature(signature, unionSignatures);
                                 s.thisParameter = thisParameter;
-                                s.unionSignatures = unionSignatures;
                             }
                             (result || (result = [])).push(s);
                         }
@@ -30934,9 +31521,11 @@ var ts;
             return createSymbolWithType(left, thisType);
         }
         function combineUnionParameters(left, right) {
-            var longest = getParameterCount(left) >= getParameterCount(right) ? left : right;
+            var leftCount = getParameterCount(left);
+            var rightCount = getParameterCount(right);
+            var longest = leftCount >= rightCount ? left : right;
             var shorter = longest === left ? right : left;
-            var longestCount = getParameterCount(longest);
+            var longestCount = longest === left ? leftCount : rightCount;
             var eitherHasEffectiveRest = (hasEffectiveRestParameter(left) || hasEffectiveRestParameter(right));
             var needsExtraRestElement = eitherHasEffectiveRest && !hasEffectiveRestParameter(longest);
             var params = new Array(longestCount + (needsExtraRestElement ? 1 : 0));
@@ -30946,9 +31535,13 @@ var ts;
                 var unionParamType = getIntersectionType([longestParamType, shorterParamType]);
                 var isRestParam = eitherHasEffectiveRest && !needsExtraRestElement && i === (longestCount - 1);
                 var isOptional = i >= getMinArgumentCount(longest) && i >= getMinArgumentCount(shorter);
-                var leftName = getParameterNameAtPosition(left, i);
-                var rightName = getParameterNameAtPosition(right, i);
-                var paramSymbol = createSymbol(1 | (isOptional && !isRestParam ? 16777216 : 0), leftName === rightName ? leftName : "arg" + i);
+                var leftName = i >= leftCount ? undefined : getParameterNameAtPosition(left, i);
+                var rightName = i >= rightCount ? undefined : getParameterNameAtPosition(right, i);
+                var paramName = leftName === rightName ? leftName :
+                    !leftName ? rightName :
+                        !rightName ? leftName :
+                            undefined;
+                var paramSymbol = createSymbol(1 | (isOptional && !isRestParam ? 16777216 : 0), paramName || "arg" + i);
                 paramSymbol.type = isRestParam ? createArrayType(unionParamType) : unionParamType;
                 params[i] = paramSymbol;
             }
@@ -31000,46 +31593,68 @@ var ts;
         function unionSpreadIndexInfos(info1, info2) {
             return info1 && info2 && createIndexInfo(getUnionType([info1.type, info2.type]), info1.isReadonly || info2.isReadonly);
         }
-        function includeMixinType(type, types, index) {
+        function findMixins(types) {
+            var constructorTypeCount = ts.countWhere(types, function (t) { return getSignaturesOfType(t, 1).length > 0; });
+            var mixinFlags = ts.map(types, isMixinConstructorType);
+            if (constructorTypeCount > 0 && constructorTypeCount === ts.countWhere(mixinFlags, function (b) { return b; })) {
+                var firstMixinIndex = mixinFlags.indexOf(true);
+                mixinFlags[firstMixinIndex] = false;
+            }
+            return mixinFlags;
+        }
+        function includeMixinType(type, types, mixinFlags, index) {
             var mixedTypes = [];
             for (var i = 0; i < types.length; i++) {
                 if (i === index) {
                     mixedTypes.push(type);
                 }
-                else if (isMixinConstructorType(types[i])) {
+                else if (mixinFlags[i]) {
                     mixedTypes.push(getReturnTypeOfSignature(getSignaturesOfType(types[i], 1)[0]));
                 }
             }
             return getIntersectionType(mixedTypes);
         }
         function resolveIntersectionTypeMembers(type) {
-            var callSignatures = ts.emptyArray;
-            var constructSignatures = ts.emptyArray;
+            var callSignatures;
+            var constructSignatures;
             var stringIndexInfo;
             var numberIndexInfo;
             var types = type.types;
-            var mixinCount = ts.countWhere(types, isMixinConstructorType);
+            var mixinFlags = findMixins(types);
+            var mixinCount = ts.countWhere(mixinFlags, function (b) { return b; });
             var _loop_6 = function (i) {
                 var t = type.types[i];
-                if (mixinCount === 0 || mixinCount === types.length && i === 0 || !isMixinConstructorType(t)) {
+                if (!mixinFlags[i]) {
                     var signatures = getSignaturesOfType(t, 1);
                     if (signatures.length && mixinCount > 0) {
                         signatures = ts.map(signatures, function (s) {
                             var clone = cloneSignature(s);
-                            clone.resolvedReturnType = includeMixinType(getReturnTypeOfSignature(s), types, i);
+                            clone.resolvedReturnType = includeMixinType(getReturnTypeOfSignature(s), types, mixinFlags, i);
                             return clone;
                         });
                     }
-                    constructSignatures = ts.concatenate(constructSignatures, signatures);
+                    constructSignatures = appendSignatures(constructSignatures, signatures);
                 }
-                callSignatures = ts.concatenate(callSignatures, getSignaturesOfType(t, 0));
+                callSignatures = appendSignatures(callSignatures, getSignaturesOfType(t, 0));
                 stringIndexInfo = intersectIndexInfos(stringIndexInfo, getIndexInfoOfType(t, 0));
                 numberIndexInfo = intersectIndexInfos(numberIndexInfo, getIndexInfoOfType(t, 1));
             };
             for (var i = 0; i < types.length; i++) {
                 _loop_6(i);
             }
-            setStructuredTypeMembers(type, emptySymbols, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
+            setStructuredTypeMembers(type, emptySymbols, callSignatures || ts.emptyArray, constructSignatures || ts.emptyArray, stringIndexInfo, numberIndexInfo);
+        }
+        function appendSignatures(signatures, newSignatures) {
+            var _loop_7 = function (sig) {
+                if (!signatures || ts.every(signatures, function (s) { return !compareSignaturesIdentical(s, sig, false, false, false, compareTypesIdentical); })) {
+                    signatures = ts.append(signatures, sig);
+                }
+            };
+            for (var _i = 0, newSignatures_1 = newSignatures; _i < newSignatures_1.length; _i++) {
+                var sig = newSignatures_1[_i];
+                _loop_7(sig);
+            }
+            return signatures;
         }
         function resolveAnonymousTypeMembers(type) {
             var symbol = type.symbol;
@@ -31066,6 +31681,15 @@ var ts;
                 var stringIndexInfo = void 0;
                 if (symbol.exports) {
                     members = getExportsOfSymbol(symbol);
+                    if (symbol === globalThisSymbol) {
+                        var varsOnly_1 = ts.createMap();
+                        members.forEach(function (p) {
+                            if (!(p.flags & 418)) {
+                                varsOnly_1.set(p.escapedName, p);
+                            }
+                        });
+                        members = varsOnly_1;
+                    }
                 }
                 setStructuredTypeMembers(type, members, ts.emptyArray, ts.emptyArray, undefined, undefined);
                 if (symbol.flags & 32) {
@@ -31079,7 +31703,8 @@ var ts;
                         stringIndexInfo = createIndexInfo(anyType, false);
                     }
                 }
-                var numberIndexInfo = symbol.flags & 384 ? enumNumberIndexInfo : undefined;
+                var numberIndexInfo = symbol.flags & 384 && (getDeclaredTypeOfSymbol(symbol).flags & 32 ||
+                    ts.some(type.properties, function (prop) { return !!(getTypeOfSymbol(prop).flags & 296); })) ? enumNumberIndexInfo : undefined;
                 setStructuredTypeMembers(type, members, ts.emptyArray, ts.emptyArray, stringIndexInfo, numberIndexInfo);
                 if (symbol.flags & (16 | 8192)) {
                     type.callSignatures = getSignaturesOfSymbol(symbol);
@@ -31104,7 +31729,7 @@ var ts;
             var members = ts.createSymbolTable();
             for (var _i = 0, _a = getPropertiesOfType(type.source); _i < _a.length; _i++) {
                 var prop = _a[_i];
-                var checkFlags = 4096 | (readonlyMask && isReadonlySymbol(prop) ? 8 : 0);
+                var checkFlags = 8192 | (readonlyMask && isReadonlySymbol(prop) ? 8 : 0);
                 var inferredProp = createSymbol(4 | prop.flags & optionalMask, prop.escapedName, checkFlags);
                 inferredProp.declarations = prop.declarations;
                 inferredProp.nameType = prop.nameType;
@@ -31123,7 +31748,15 @@ var ts;
                 return getIndexType(getApparentType(type.type));
             }
             if (type.flags & 16777216) {
-                return getLowerBoundOfConditionalType(type);
+                if (type.root.isDistributive) {
+                    var checkType = type.checkType;
+                    var constraint = getLowerBoundOfKeyType(checkType);
+                    if (constraint !== checkType) {
+                        var mapper = makeUnaryTypeMapper(type.root.checkType, constraint);
+                        return getConditionalTypeInstantiation(type, combineTypeMappers(mapper, type.mapper));
+                    }
+                }
+                return type;
             }
             if (type.flags & 1048576) {
                 return getUnionType(ts.sameMap(type.types, getLowerBoundOfKeyType));
@@ -31133,16 +31766,6 @@ var ts;
             }
             return neverType;
         }
-        function getLowerBoundOfConditionalType(type) {
-            if (type.root.isDistributive) {
-                var constraint = getLowerBoundOfKeyType(type.checkType);
-                if (constraint !== type.checkType) {
-                    var mapper = makeUnaryTypeMapper(type.root.checkType, constraint);
-                    return getConditionalTypeInstantiation(type, combineTypeMappers(mapper, type.mapper));
-                }
-            }
-            return type;
-        }
         function resolveMappedTypeMembers(type) {
             var members = ts.createSymbolTable();
             var stringIndexInfo;
@@ -31194,8 +31817,8 @@ var ts;
                 else if (t.flags & (1 | 4)) {
                     stringIndexInfo = createIndexInfo(propType, !!(templateModifiers & 1));
                 }
-                else if (t.flags & 8) {
-                    numberIndexInfo = createIndexInfo(propType, !!(templateModifiers & 1));
+                else if (t.flags & (8 | 32)) {
+                    numberIndexInfo = createIndexInfo(numberIndexInfo ? getUnionType([numberIndexInfo.type, propType]) : propType, !!(templateModifiers & 1));
                 }
             }
         }
@@ -31218,8 +31841,8 @@ var ts;
         }
         function isMappedTypeWithKeyofConstraintDeclaration(type) {
             var constraintDeclaration = getConstraintDeclarationForMappedType(type);
-            return constraintDeclaration.kind === 179 &&
-                constraintDeclaration.operator === 129;
+            return constraintDeclaration.kind === 180 &&
+                constraintDeclaration.operator === 130;
         }
         function getModifiersTypeFromMappedType(type) {
             if (!type.modifiersType) {
@@ -31230,7 +31853,7 @@ var ts;
                     var declaredType = getTypeFromMappedTypeNode(type.declaration);
                     var constraint = getConstraintTypeFromMappedType(declaredType);
                     var extendedConstraint = constraint && constraint.flags & 262144 ? getConstraintOfTypeParameter(constraint) : constraint;
-                    type.modifiersType = extendedConstraint && extendedConstraint.flags & 4194304 ? instantiateType(extendedConstraint.type, type.mapper || identityMapper) : emptyObjectType;
+                    type.modifiersType = extendedConstraint && extendedConstraint.flags & 4194304 ? instantiateType(extendedConstraint.type, type.mapper || identityMapper) : unknownType;
                 }
             }
             return type.modifiersType;
@@ -31320,6 +31943,25 @@ var ts;
             }
             return type.resolvedProperties;
         }
+        function getPossiblePropertiesOfUnionType(type) {
+            if (type.possiblePropertyCache) {
+                return type.possiblePropertyCache.size ? ts.arrayFrom(type.possiblePropertyCache.values()) : ts.emptyArray;
+            }
+            type.possiblePropertyCache = ts.createSymbolTable();
+            for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
+                var t = _a[_i];
+                for (var _b = 0, _c = getPropertiesOfType(t); _b < _c.length; _b++) {
+                    var p = _c[_b];
+                    if (!type.possiblePropertyCache.has(p.escapedName)) {
+                        var prop = getUnionOrIntersectionProperty(type, p.escapedName);
+                        if (prop) {
+                            type.possiblePropertyCache.set(p.escapedName, prop);
+                        }
+                    }
+                }
+            }
+            return type.possiblePropertyCache.size ? ts.arrayFrom(type.possiblePropertyCache.values()) : ts.emptyArray;
+        }
         function getPropertiesOfType(type) {
             type = getApparentType(type);
             return type.flags & 3145728 ?
@@ -31364,28 +32006,29 @@ var ts;
             return hasNonCircularBaseConstraint(typeParameter) ? getConstraintFromTypeParameter(typeParameter) : undefined;
         }
         function getConstraintOfIndexedAccess(type) {
-            var objectType = getConstraintOfType(type.objectType) || type.objectType;
-            if (objectType !== type.objectType) {
-                var constraint = getIndexedAccessType(objectType, type.indexType, undefined, errorType);
-                if (constraint && constraint !== errorType) {
-                    return constraint;
+            return hasNonCircularBaseConstraint(type) ? getConstraintFromIndexedAccess(type) : undefined;
+        }
+        function getSimplifiedTypeOrConstraint(type) {
+            var simplified = getSimplifiedType(type, false);
+            return simplified !== type ? simplified : getConstraintOfType(type);
+        }
+        function getConstraintFromIndexedAccess(type) {
+            var indexConstraint = getSimplifiedTypeOrConstraint(type.indexType);
+            if (indexConstraint && indexConstraint !== type.indexType) {
+                var indexedAccess = getIndexedAccessTypeOrUndefined(type.objectType, indexConstraint);
+                if (indexedAccess) {
+                    return indexedAccess;
                 }
             }
-            var baseConstraint = getBaseConstraintOfType(type);
-            return baseConstraint && baseConstraint !== type ? baseConstraint : undefined;
-        }
-        function getDefaultConstraintOfTrueBranchOfConditionalType(root, combinedMapper, mapper) {
-            var rootTrueType = root.trueType;
-            var rootTrueConstraint = !(rootTrueType.flags & 33554432)
-                ? rootTrueType
-                : instantiateType((rootTrueType.substitute), combinedMapper || mapper).flags & 3
-                    ? rootTrueType.typeVariable
-                    : getIntersectionType([rootTrueType.substitute, rootTrueType.typeVariable]);
-            return instantiateType(rootTrueConstraint, combinedMapper || mapper);
+            var objectConstraint = getSimplifiedTypeOrConstraint(type.objectType);
+            if (objectConstraint && objectConstraint !== type.objectType) {
+                return getIndexedAccessTypeOrUndefined(objectConstraint, type.indexType);
+            }
+            return undefined;
         }
         function getDefaultConstraintOfConditionalType(type) {
             if (!type.resolvedDefaultConstraint) {
-                var trueConstraint = getDefaultConstraintOfTrueBranchOfConditionalType(type.root, type.combinedMapper, type.mapper);
+                var trueConstraint = getInferredTrueTypeFromConditionalType(type);
                 var falseConstraint = getFalseTypeFromConditionalType(type);
                 type.resolvedDefaultConstraint = isTypeAny(trueConstraint) ? falseConstraint : isTypeAny(falseConstraint) ? trueConstraint : getUnionType([trueConstraint, falseConstraint]);
             }
@@ -31393,7 +32036,7 @@ var ts;
         }
         function getConstraintOfDistributiveConditionalType(type) {
             if (type.root.isDistributive && type.restrictiveInstantiation !== type) {
-                var simplified = getSimplifiedType(type.checkType);
+                var simplified = getSimplifiedType(type.checkType, false);
                 var constraint = simplified === type.checkType ? getConstraintOfType(simplified) : simplified;
                 if (constraint && constraint !== type.checkType) {
                     var mapper = makeUnaryTypeMapper(type.root.checkType, constraint);
@@ -31405,9 +32048,12 @@ var ts;
             }
             return undefined;
         }
-        function getConstraintOfConditionalType(type) {
+        function getConstraintFromConditionalType(type) {
             return getConstraintOfDistributiveConditionalType(type) || getDefaultConstraintOfConditionalType(type);
         }
+        function getConstraintOfConditionalType(type) {
+            return hasNonCircularBaseConstraint(type) ? getConstraintFromConditionalType(type) : undefined;
+        }
         function getUnionConstraintOfIntersection(type, targetIsUnion) {
             var constraints;
             var hasDisjointDomainType = false;
@@ -31419,9 +32065,6 @@ var ts;
                         constraint = getConstraintOfType(constraint);
                     }
                     if (constraint) {
-                        if (!(constraint.flags & 1048576)) {
-                            return undefined;
-                        }
                         constraints = ts.append(constraints, constraint);
                     }
                 }
@@ -31464,13 +32107,13 @@ var ts;
                     if (!pushTypeResolution(t, 4)) {
                         return circularConstraintType;
                     }
-                    if (constraintDepth === 50) {
+                    if (constraintDepth >= 50) {
                         error(currentNode, ts.Diagnostics.Type_instantiation_is_excessively_deep_and_possibly_infinite);
                         nonTerminating = true;
                         return t.immediateBaseConstraint = noConstraintType;
                     }
                     constraintDepth++;
-                    var result = computeBaseConstraint(getSimplifiedType(t));
+                    var result = computeBaseConstraint(getSimplifiedType(t, false));
                     constraintDepth--;
                     if (!popTypeResolution()) {
                         if (t.flags & 262144) {
@@ -31478,7 +32121,7 @@ var ts;
                             if (errorNode) {
                                 var diagnostic = error(errorNode, ts.Diagnostics.Type_parameter_0_has_a_circular_constraint, typeToString(t));
                                 if (currentNode && !ts.isNodeDescendantOf(errorNode, currentNode) && !ts.isNodeDescendantOf(currentNode, errorNode)) {
-                                    addRelatedInfo(diagnostic, ts.createDiagnosticForNode(currentNode, ts.Diagnostics.Circularity_originates_in_type_at_this_location));
+                                    ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(currentNode, ts.Diagnostics.Circularity_originates_in_type_at_this_location));
                                 }
                             }
                         }
@@ -31522,12 +32165,15 @@ var ts;
                 if (t.flags & 8388608) {
                     var baseObjectType = getBaseConstraint(t.objectType);
                     var baseIndexType = getBaseConstraint(t.indexType);
-                    var baseIndexedAccess = baseObjectType && baseIndexType ? getIndexedAccessType(baseObjectType, baseIndexType, undefined, errorType) : undefined;
-                    return baseIndexedAccess && baseIndexedAccess !== errorType ? getBaseConstraint(baseIndexedAccess) : undefined;
+                    var baseIndexedAccess = baseObjectType && baseIndexType && getIndexedAccessTypeOrUndefined(baseObjectType, baseIndexType);
+                    return baseIndexedAccess && getBaseConstraint(baseIndexedAccess);
                 }
                 if (t.flags & 16777216) {
-                    var constraint = getConstraintOfConditionalType(t);
-                    return constraint && getBaseConstraint(constraint);
+                    var constraint = getConstraintFromConditionalType(t);
+                    constraintDepth++;
+                    var result = constraint && getBaseConstraint(constraint);
+                    constraintDepth--;
+                    return result;
                 }
                 if (t.flags & 33554432) {
                     return getBaseConstraint(t.substitute);
@@ -31583,24 +32229,25 @@ var ts;
             return type;
         }
         function getApparentType(type) {
-            var t = type.flags & 63176704 ? getBaseConstraintOfType(type) || emptyObjectType : type;
+            var t = type.flags & 63176704 ? getBaseConstraintOfType(type) || unknownType : type;
             return ts.getObjectFlags(t) & 32 ? getApparentTypeOfMappedType(t) :
                 t.flags & 2097152 ? getApparentTypeOfIntersectionType(t) :
                     t.flags & 132 ? globalStringType :
                         t.flags & 296 ? globalNumberType :
-                            t.flags & 2112 ? getGlobalBigIntType(languageVersion >= 7) :
+                            t.flags & 2112 ? getGlobalBigIntType(languageVersion >= 99) :
                                 t.flags & 528 ? globalBooleanType :
                                     t.flags & 12288 ? getGlobalESSymbolType(languageVersion >= 2) :
                                         t.flags & 67108864 ? emptyObjectType :
                                             t.flags & 4194304 ? keyofConstraintType :
-                                                t;
+                                                t.flags & 2 && !strictNullChecks ? emptyObjectType :
+                                                    t;
         }
         function createUnionOrIntersectionProperty(containingType, name) {
-            var props;
+            var propSet = ts.createMap();
             var indexTypes;
             var isUnion = containingType.flags & 1048576;
             var excludeModifiers = isUnion ? 24 : 0;
-            var commonFlags = isUnion ? 0 : 16777216;
+            var optionalFlag = isUnion ? 0 : 16777216;
             var syntheticFlag = 4;
             var checkFlags = 0;
             for (var _i = 0, _a = containingType.types; _i < _a.length; _i++) {
@@ -31610,13 +32257,21 @@ var ts;
                     var prop = getPropertyOfType(type, name);
                     var modifiers = prop ? ts.getDeclarationModifierFlagsFromSymbol(prop) : 0;
                     if (prop && !(modifiers & excludeModifiers)) {
-                        commonFlags &= prop.flags;
-                        props = ts.appendIfUnique(props, prop);
+                        if (isUnion) {
+                            optionalFlag |= (prop.flags & 16777216);
+                        }
+                        else {
+                            optionalFlag &= prop.flags;
+                        }
+                        var id = "" + getSymbolId(prop);
+                        if (!propSet.has(id)) {
+                            propSet.set(id, prop);
+                        }
                         checkFlags |= (isReadonlySymbol(prop) ? 8 : 0) |
-                            (!(modifiers & 24) ? 128 : 0) |
-                            (modifiers & 16 ? 256 : 0) |
-                            (modifiers & 8 ? 512 : 0) |
-                            (modifiers & 32 ? 1024 : 0);
+                            (!(modifiers & 24) ? 256 : 0) |
+                            (modifiers & 16 ? 512 : 0) |
+                            (modifiers & 8 ? 1024 : 0) |
+                            (modifiers & 32 ? 2048 : 0);
                         if (!isPrototypeProperty(prop)) {
                             syntheticFlag = 2;
                         }
@@ -31624,18 +32279,23 @@ var ts;
                     else if (isUnion) {
                         var indexInfo = !isLateBoundName(name) && (isNumericLiteralName(name) && getIndexInfoOfType(type, 1) || getIndexInfoOfType(type, 0));
                         if (indexInfo) {
-                            checkFlags |= indexInfo.isReadonly ? 8 : 0;
+                            checkFlags |= 32 | (indexInfo.isReadonly ? 8 : 0);
                             indexTypes = ts.append(indexTypes, isTupleType(type) ? getRestTypeOfTupleType(type) || undefinedType : indexInfo.type);
                         }
+                        else if (isObjectLiteralType(type)) {
+                            checkFlags |= 32;
+                            indexTypes = ts.append(indexTypes, undefinedType);
+                        }
                         else {
                             checkFlags |= 16;
                         }
                     }
                 }
             }
-            if (!props) {
+            if (!propSet.size) {
                 return undefined;
             }
+            var props = ts.arrayFrom(propSet.values());
             if (props.length === 1 && !(checkFlags & 16) && !indexTypes) {
                 return props[0];
             }
@@ -31660,15 +32320,15 @@ var ts;
                     nameType = prop.nameType;
                 }
                 else if (type !== firstType) {
-                    checkFlags |= 32;
+                    checkFlags |= 64;
                 }
                 if (isLiteralType(type)) {
-                    checkFlags |= 64;
+                    checkFlags |= 128;
                 }
                 propTypes.push(type);
             }
             ts.addRange(propTypes, indexTypes);
-            var result = createSymbol(4 | commonFlags, name, syntheticFlag | checkFlags);
+            var result = createSymbol(4 | optionalFlag, name, syntheticFlag | checkFlags);
             result.containingType = containingType;
             if (!hasNonUniformValueDeclaration && firstValueDeclaration) {
                 result.valueDeclaration = firstValueDeclaration;
@@ -31678,7 +32338,14 @@ var ts;
             }
             result.declarations = declarations;
             result.nameType = nameType;
-            result.type = isUnion ? getUnionType(propTypes) : getIntersectionType(propTypes);
+            if (propTypes.length > 2) {
+                result.checkFlags |= 65536;
+                result.deferralParent = containingType;
+                result.deferralConstituents = propTypes;
+            }
+            else {
+                result.type = isUnion ? getUnionType(propTypes) : getIntersectionType(propTypes);
+            }
             return result;
         }
         function getUnionOrIntersectionProperty(type, name) {
@@ -31756,6 +32423,9 @@ var ts;
                         propTypes.push(getTypeOfSymbol(prop));
                     }
                 }
+                if (kind === 0) {
+                    ts.append(propTypes, getIndexTypeOfType(type, 1));
+                }
                 if (propTypes.length) {
                     return getUnionType(propTypes, 2);
                 }
@@ -31780,10 +32450,10 @@ var ts;
             return result;
         }
         function isJSDocOptionalParameter(node) {
-            return ts.isInJSFile(node) && (node.type && node.type.kind === 293
+            return ts.isInJSFile(node) && (node.type && node.type.kind === 294
                 || ts.getJSDocParameterTags(node).some(function (_a) {
                     var isBracketed = _a.isBracketed, typeExpression = _a.typeExpression;
-                    return isBracketed || !!typeExpression && typeExpression.type.kind === 293;
+                    return isBracketed || !!typeExpression && typeExpression.type.kind === 294;
                 }));
         }
         function tryFindAmbientModule(moduleName, withAugmentations) {
@@ -31816,7 +32486,7 @@ var ts;
                 return false;
             }
             var isBracketed = node.isBracketed, typeExpression = node.typeExpression;
-            return isBracketed || !!typeExpression && typeExpression.type.kind === 293;
+            return isBracketed || !!typeExpression && typeExpression.type.kind === 294;
         }
         function createIdentifierTypePredicate(parameterName, parameterIndex, type) {
             return { kind: 1, parameterName: parameterName, parameterIndex: parameterIndex, type: type };
@@ -31849,7 +32519,7 @@ var ts;
                 var baseDefaultType = getDefaultTypeArgumentType(isJavaScriptImplicitAny);
                 for (var i = numTypeArguments; i < numTypeParameters; i++) {
                     var defaultType = getDefaultFromTypeParameter(typeParameters[i]);
-                    if (isJavaScriptImplicitAny && defaultType && isTypeIdenticalTo(defaultType, emptyObjectType)) {
+                    if (isJavaScriptImplicitAny && defaultType && (isTypeIdenticalTo(defaultType, unknownType) || isTypeIdenticalTo(defaultType, emptyObjectType))) {
                         defaultType = anyType;
                     }
                     result[i] = defaultType ? instantiateType(defaultType, createTypeMapper(typeParameters, result)) : baseDefaultType;
@@ -31889,7 +32559,7 @@ var ts;
                     else {
                         parameters.push(paramSymbol);
                     }
-                    if (type && type.kind === 182) {
+                    if (type && type.kind === 183) {
                         hasLiteralTypes = true;
                     }
                     var isOptionalParameter_1 = isOptionalJSDocParameterTag(param) ||
@@ -31901,16 +32571,16 @@ var ts;
                         minArgumentCount = parameters.length;
                     }
                 }
-                if ((declaration.kind === 158 || declaration.kind === 159) &&
+                if ((declaration.kind === 159 || declaration.kind === 160) &&
                     !hasNonBindableDynamicName(declaration) &&
                     (!hasThisParameter || !thisParameter)) {
-                    var otherKind = declaration.kind === 158 ? 159 : 158;
+                    var otherKind = declaration.kind === 159 ? 160 : 159;
                     var other = ts.getDeclarationOfKind(getSymbolOfNode(declaration), otherKind);
                     if (other) {
                         thisParameter = getAnnotatedAccessorThisParameter(other);
                     }
                 }
-                var classType = declaration.kind === 157 ?
+                var classType = declaration.kind === 158 ?
                     getDeclaredTypeOfClassOrInterface(getMergedSymbol(declaration.parent.symbol))
                     : undefined;
                 var typeParameters = classType ? classType.localTypeParameters : getTypeParametersFromDeclaration(declaration);
@@ -31928,7 +32598,7 @@ var ts;
             var lastParamVariadicType = ts.firstDefined(lastParamTags, function (p) {
                 return p.typeExpression && ts.isJSDocVariadicType(p.typeExpression.type) ? p.typeExpression.type : undefined;
             });
-            var syntheticArgsSymbol = createSymbol(3, "args", 16384);
+            var syntheticArgsSymbol = createSymbol(3, "args", 32768);
             syntheticArgsSymbol.type = lastParamVariadicType ? createArrayType(getTypeFromTypeNode(lastParamVariadicType.type)) : anyArrayType;
             if (lastParamVariadicType) {
                 parameters.pop();
@@ -31960,13 +32630,13 @@ var ts;
                 if (!node)
                     return false;
                 switch (node.kind) {
-                    case 72:
+                    case 73:
                         return node.escapedText === "arguments" && ts.isExpressionNode(node);
-                    case 154:
-                    case 156:
-                    case 158:
+                    case 155:
+                    case 157:
                     case 159:
-                        return node.name.kind === 149
+                    case 160:
+                        return node.name.kind === 150
                             && traverse(node.name);
                     default:
                         return !ts.nodeStartsNewLexicalEnvironment(node) && !ts.isPartOfTypeNode(node) && !!ts.forEachChild(node, traverse);
@@ -32028,32 +32698,23 @@ var ts;
                         }
                     }
                     signature.resolvedTypePredicate = type && ts.isTypePredicateNode(type) ?
-                        createTypePredicateFromTypePredicateNode(type, signature.declaration) :
+                        createTypePredicateFromTypePredicateNode(type, signature) :
                         jsdocPredicate || noTypePredicate;
                 }
                 ts.Debug.assert(!!signature.resolvedTypePredicate);
             }
             return signature.resolvedTypePredicate === noTypePredicate ? undefined : signature.resolvedTypePredicate;
         }
-        function createTypePredicateFromTypePredicateNode(node, func) {
+        function createTypePredicateFromTypePredicateNode(node, signature) {
             var parameterName = node.parameterName;
             var type = getTypeFromTypeNode(node.type);
-            if (parameterName.kind === 72) {
-                return createIdentifierTypePredicate(parameterName.escapedText, getTypePredicateParameterIndex(func.parameters, parameterName), type);
+            if (parameterName.kind === 73) {
+                return createIdentifierTypePredicate(parameterName.escapedText, ts.findIndex(signature.parameters, function (p) { return p.escapedName === parameterName.escapedText; }), type);
             }
             else {
                 return createThisTypePredicate(type);
             }
         }
-        function getTypePredicateParameterIndex(parameterList, parameter) {
-            for (var i = 0; i < parameterList.length; i++) {
-                var param = parameterList[i];
-                if (param.name.kind === 72 && param.name.escapedText === parameter.escapedText) {
-                    return i;
-                }
-            }
-            return -1;
-        }
         function getReturnTypeOfSignature(signature) {
             if (!signature.resolvedReturnType) {
                 if (!pushTypeResolution(signature, 3)) {
@@ -32088,7 +32749,7 @@ var ts;
             return signature.resolvedReturnType;
         }
         function getReturnTypeFromAnnotation(declaration) {
-            if (declaration.kind === 157) {
+            if (declaration.kind === 158) {
                 return getDeclaredTypeOfClassOrInterface(getMergedSymbol(declaration.parent.symbol));
             }
             if (ts.isJSDocConstructSignature(declaration)) {
@@ -32098,12 +32759,12 @@ var ts;
             if (typeNode) {
                 return getTypeFromTypeNode(typeNode);
             }
-            if (declaration.kind === 158 && !hasNonBindableDynamicName(declaration)) {
+            if (declaration.kind === 159 && !hasNonBindableDynamicName(declaration)) {
                 var jsDocType = ts.isInJSFile(declaration) && getTypeForDeclarationFromJSDocComment(declaration);
                 if (jsDocType) {
                     return jsDocType;
                 }
-                var setter = ts.getDeclarationOfKind(getSymbolOfNode(declaration), 159);
+                var setter = ts.getDeclarationOfKind(getSymbolOfNode(declaration), 160);
                 var setterType = getAnnotatedAccessorType(setter);
                 if (setterType) {
                     return setterType;
@@ -32128,12 +32789,10 @@ var ts;
         function getSignatureInstantiation(signature, typeArguments, isJavascript, inferredTypeParameters) {
             var instantiatedSignature = getSignatureInstantiationWithoutFillingInTypeArguments(signature, fillMissingTypeArguments(typeArguments, signature.typeParameters, getMinTypeArgumentCount(signature.typeParameters), isJavascript));
             if (inferredTypeParameters) {
-                var returnSignature = getSingleCallSignature(getReturnTypeOfSignature(instantiatedSignature));
+                var returnSignature = getSingleCallOrConstructSignature(getReturnTypeOfSignature(instantiatedSignature));
                 if (returnSignature) {
                     var newReturnSignature = cloneSignature(returnSignature);
                     newReturnSignature.typeParameters = inferredTypeParameters;
-                    newReturnSignature.target = returnSignature.target;
-                    newReturnSignature.mapper = returnSignature.mapper;
                     var newInstantiatedSignature = cloneSignature(instantiatedSignature);
                     newInstantiatedSignature.resolvedReturnType = getOrCreateTypeFromSignature(newReturnSignature);
                     return newInstantiatedSignature;
@@ -32176,14 +32835,15 @@ var ts;
             var typeParameters = signature.typeParameters;
             if (typeParameters) {
                 var typeEraser_1 = createTypeEraser(typeParameters);
-                var baseConstraints = ts.map(typeParameters, function (tp) { return instantiateType(getBaseConstraintOfType(tp), typeEraser_1) || emptyObjectType; });
+                var baseConstraints = ts.map(typeParameters, function (tp) { return instantiateType(getBaseConstraintOfType(tp), typeEraser_1) || unknownType; });
                 return instantiateSignature(signature, createTypeMapper(typeParameters, baseConstraints), true);
             }
             return signature;
         }
         function getOrCreateTypeFromSignature(signature) {
             if (!signature.isolatedSignatureType) {
-                var isConstructor = signature.declaration.kind === 157 || signature.declaration.kind === 161;
+                var kind = signature.declaration ? signature.declaration.kind : 0;
+                var isConstructor = kind === 158 || kind === 162 || kind === 167;
                 var type = createObjectType(16);
                 type.members = emptySymbols;
                 type.properties = ts.emptyArray;
@@ -32197,7 +32857,7 @@ var ts;
             return symbol.members.get("__index");
         }
         function getIndexDeclarationOfSymbol(symbol, kind) {
-            var syntaxKind = kind === 1 ? 135 : 138;
+            var syntaxKind = kind === 1 ? 136 : 139;
             var indexSymbol = getIndexSymbol(symbol);
             if (indexSymbol) {
                 for (var _i = 0, _a = indexSymbol.declarations; _i < _a.length; _i++) {
@@ -32224,7 +32884,7 @@ var ts;
             return undefined;
         }
         function getConstraintDeclaration(type) {
-            var decl = type.symbol && ts.getDeclarationOfKind(type.symbol, 150);
+            var decl = type.symbol && ts.getDeclarationOfKind(type.symbol, 151);
             return decl && ts.getEffectiveConstraintOfTypeParameter(decl);
         }
         function getInferredTypeParameterConstraint(typeParameter) {
@@ -32232,9 +32892,9 @@ var ts;
             if (typeParameter.symbol) {
                 for (var _i = 0, _a = typeParameter.symbol.declarations; _i < _a.length; _i++) {
                     var declaration = _a[_i];
-                    if (declaration.parent.kind === 176) {
+                    if (declaration.parent.kind === 177) {
                         var grandParent = declaration.parent.parent;
-                        if (grandParent.kind === 164) {
+                        if (grandParent.kind === 165) {
                             var typeReference = grandParent;
                             var typeParameters = getTypeParametersForTypeReference(typeReference);
                             if (typeParameters) {
@@ -32251,7 +32911,7 @@ var ts;
                                 }
                             }
                         }
-                        else if (grandParent.kind === 151 && grandParent.dotDotDotToken) {
+                        else if (grandParent.kind === 152 && grandParent.dotDotDotToken) {
                             inferences = ts.append(inferences, createArrayType(unknownType));
                         }
                     }
@@ -32274,7 +32934,7 @@ var ts;
             return typeParameter.constraint === noConstraintType ? undefined : typeParameter.constraint;
         }
         function getParentSymbolOfTypeParameter(typeParameter) {
-            var tp = ts.getDeclarationOfKind(typeParameter.symbol, 150);
+            var tp = ts.getDeclarationOfKind(typeParameter.symbol, 151);
             var host = ts.isJSDocTemplateTag(tp.parent) ? ts.getHostSignatureFromJSDoc(tp.parent) : tp.parent;
             return host && getSymbolOfNode(host);
         }
@@ -32309,7 +32969,7 @@ var ts;
                     result |= ts.getObjectFlags(type);
                 }
             }
-            return result & 917504;
+            return result & 1835008;
         }
         function createTypeReference(target, typeArguments) {
             var id = getTypeListId(typeArguments);
@@ -32391,9 +33051,9 @@ var ts;
         }
         function getTypeReferenceName(node) {
             switch (node.kind) {
-                case 164:
+                case 165:
                     return node.typeName;
-                case 211:
+                case 212:
                     var expr = node.expression;
                     if (ts.isEntityNameExpression(expr)) {
                         return expr;
@@ -32477,13 +33137,22 @@ var ts;
             }
         }
         function getSubstitutionType(typeVariable, substitute) {
+            if (substitute.flags & 3 || substitute === typeVariable) {
+                return typeVariable;
+            }
+            var id = getTypeId(typeVariable) + ">" + getTypeId(substitute);
+            var cached = substitutionTypes.get(id);
+            if (cached) {
+                return cached;
+            }
             var result = createType(33554432);
             result.typeVariable = typeVariable;
             result.substitute = substitute;
+            substitutionTypes.set(id, result);
             return result;
         }
         function isUnaryTupleTypeNode(node) {
-            return node.kind === 170 && node.elementTypes.length === 1;
+            return node.kind === 171 && node.elementTypes.length === 1;
         }
         function getImpliedConstraint(typeVariable, checkNode, extendsNode) {
             return isUnaryTupleTypeNode(checkNode) && isUnaryTupleTypeNode(extendsNode) ? getImpliedConstraint(typeVariable, checkNode.elementTypes[0], extendsNode.elementTypes[0]) :
@@ -32492,9 +33161,9 @@ var ts;
         }
         function getConstrainedTypeVariable(typeVariable, node) {
             var constraints;
-            while (node && !ts.isStatement(node) && node.kind !== 296) {
+            while (node && !ts.isStatement(node) && node.kind !== 297) {
                 var parent = node.parent;
-                if (parent.kind === 175 && node === parent.trueType) {
+                if (parent.kind === 176 && node === parent.trueType) {
                     var constraint = getImpliedConstraint(typeVariable, parent.checkType, parent.extendsType);
                     if (constraint) {
                         constraints = ts.append(constraints, constraint);
@@ -32505,7 +33174,7 @@ var ts;
             return constraints ? getSubstitutionType(typeVariable, getIntersectionType(ts.append(constraints, typeVariable))) : typeVariable;
         }
         function isJSDocTypeReference(node) {
-            return !!(node.flags & 2097152) && (node.kind === 164 || node.kind === 183);
+            return !!(node.flags & 2097152) && (node.kind === 165 || node.kind === 184);
         }
         function checkNoTypeArguments(node, symbol) {
             if (node.typeArguments) {
@@ -32600,9 +33269,9 @@ var ts;
                 for (var _i = 0, declarations_3 = declarations; _i < declarations_3.length; _i++) {
                     var declaration = declarations_3[_i];
                     switch (declaration.kind) {
-                        case 240:
                         case 241:
-                        case 243:
+                        case 242:
+                        case 244:
                             return declaration;
                     }
                 }
@@ -32665,20 +33334,32 @@ var ts;
             return deferredGlobalAsyncIterableType || (deferredGlobalAsyncIterableType = getGlobalType("AsyncIterable", 1, reportErrors)) || emptyGenericType;
         }
         function getGlobalAsyncIteratorType(reportErrors) {
-            return deferredGlobalAsyncIteratorType || (deferredGlobalAsyncIteratorType = getGlobalType("AsyncIterator", 1, reportErrors)) || emptyGenericType;
+            return deferredGlobalAsyncIteratorType || (deferredGlobalAsyncIteratorType = getGlobalType("AsyncIterator", 3, reportErrors)) || emptyGenericType;
         }
         function getGlobalAsyncIterableIteratorType(reportErrors) {
             return deferredGlobalAsyncIterableIteratorType || (deferredGlobalAsyncIterableIteratorType = getGlobalType("AsyncIterableIterator", 1, reportErrors)) || emptyGenericType;
         }
+        function getGlobalAsyncGeneratorType(reportErrors) {
+            return deferredGlobalAsyncGeneratorType || (deferredGlobalAsyncGeneratorType = getGlobalType("AsyncGenerator", 3, reportErrors)) || emptyGenericType;
+        }
         function getGlobalIterableType(reportErrors) {
             return deferredGlobalIterableType || (deferredGlobalIterableType = getGlobalType("Iterable", 1, reportErrors)) || emptyGenericType;
         }
         function getGlobalIteratorType(reportErrors) {
-            return deferredGlobalIteratorType || (deferredGlobalIteratorType = getGlobalType("Iterator", 1, reportErrors)) || emptyGenericType;
+            return deferredGlobalIteratorType || (deferredGlobalIteratorType = getGlobalType("Iterator", 3, reportErrors)) || emptyGenericType;
         }
         function getGlobalIterableIteratorType(reportErrors) {
             return deferredGlobalIterableIteratorType || (deferredGlobalIterableIteratorType = getGlobalType("IterableIterator", 1, reportErrors)) || emptyGenericType;
         }
+        function getGlobalGeneratorType(reportErrors) {
+            return deferredGlobalGeneratorType || (deferredGlobalGeneratorType = getGlobalType("Generator", 3, reportErrors)) || emptyGenericType;
+        }
+        function getGlobalIteratorYieldResultType(reportErrors) {
+            return deferredGlobalIteratorYieldResultType || (deferredGlobalIteratorYieldResultType = getGlobalType("IteratorYieldResult", 1, reportErrors)) || emptyGenericType;
+        }
+        function getGlobalIteratorReturnResultType(reportErrors) {
+            return deferredGlobalIteratorReturnResultType || (deferredGlobalIteratorReturnResultType = getGlobalType("IteratorReturnResult", 1, reportErrors)) || emptyGenericType;
+        }
         function getGlobalTypeOrUndefined(name, arity) {
             if (arity === void 0) { arity = 0; }
             var symbol = getGlobalSymbol(name, 67897832, undefined);
@@ -32687,11 +33368,8 @@ var ts;
         function getGlobalExtractSymbol() {
             return deferredGlobalExtractSymbol || (deferredGlobalExtractSymbol = getGlobalSymbol("Extract", 524288, ts.Diagnostics.Cannot_find_global_type_0));
         }
-        function getGlobalExcludeSymbol() {
-            return deferredGlobalExcludeSymbol || (deferredGlobalExcludeSymbol = getGlobalSymbol("Exclude", 524288, ts.Diagnostics.Cannot_find_global_type_0));
-        }
-        function getGlobalPickSymbol() {
-            return deferredGlobalPickSymbol || (deferredGlobalPickSymbol = getGlobalSymbol("Pick", 524288, ts.Diagnostics.Cannot_find_global_type_0));
+        function getGlobalOmitSymbol() {
+            return deferredGlobalOmitSymbol || (deferredGlobalOmitSymbol = getGlobalSymbol("Omit", 524288, ts.Diagnostics.Cannot_find_global_type_0));
         }
         function getGlobalBigIntType(reportErrors) {
             return deferredGlobalBigIntType || (deferredGlobalBigIntType = getGlobalType("BigInt", 0, reportErrors)) || emptyObjectType;
@@ -32702,18 +33380,9 @@ var ts;
         function createTypedPropertyDescriptorType(propertyType) {
             return createTypeFromGenericGlobalType(getGlobalTypedPropertyDescriptorType(), [propertyType]);
         }
-        function createAsyncIterableType(iteratedType) {
-            return createTypeFromGenericGlobalType(getGlobalAsyncIterableType(true), [iteratedType]);
-        }
-        function createAsyncIterableIteratorType(iteratedType) {
-            return createTypeFromGenericGlobalType(getGlobalAsyncIterableIteratorType(true), [iteratedType]);
-        }
         function createIterableType(iteratedType) {
             return createTypeFromGenericGlobalType(getGlobalIterableType(true), [iteratedType]);
         }
-        function createIterableIteratorType(iteratedType) {
-            return createTypeFromGenericGlobalType(getGlobalIterableIteratorType(true), [iteratedType]);
-        }
         function createArrayType(elementType, readonly) {
             return createTypeFromGenericGlobalType(readonly ? globalReadonlyArrayType : globalArrayType, [elementType]);
         }
@@ -32725,7 +33394,7 @@ var ts;
             return links.resolvedType;
         }
         function isReadonlyTypeOperator(node) {
-            return ts.isTypeOperatorNode(node) && node.operator === 133;
+            return ts.isTypeOperatorNode(node) && node.operator === 134;
         }
         function createTupleTypeOfArity(arity, minLength, hasRestElement, readonly, associatedNames) {
             var typeParameters;
@@ -32793,8 +33462,8 @@ var ts;
             var links = getNodeLinks(node);
             if (!links.resolvedType) {
                 var lastElement = ts.lastOrUndefined(node.elementTypes);
-                var restElement_1 = lastElement && lastElement.kind === 172 ? lastElement : undefined;
-                var minLength = ts.findLastIndex(node.elementTypes, function (n) { return n.kind !== 171 && n !== restElement_1; }) + 1;
+                var restElement_1 = lastElement && lastElement.kind === 173 ? lastElement : undefined;
+                var minLength = ts.findLastIndex(node.elementTypes, function (n) { return n.kind !== 172 && n !== restElement_1; }) + 1;
                 var elementTypes = ts.map(node.elementTypes, function (n) {
                     var type = getTypeFromTypeNode(n);
                     return n === restElement_1 && getIndexTypeOfType(type, 1) || type;
@@ -32828,39 +33497,19 @@ var ts;
             }
             return false;
         }
-        function isEmptyIntersectionType(type) {
-            var combined = 0;
-            for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
-                var t = _a[_i];
-                if (t.flags & 109440 && combined & 109440) {
-                    return true;
-                }
-                combined |= t.flags;
-                if (combined & 98304 && combined & (524288 | 67108864) ||
-                    combined & 67108864 && combined & (67238908 & ~67108864) ||
-                    combined & 132 && combined & (67238908 & ~132) ||
-                    combined & 296 && combined & (67238908 & ~296) ||
-                    combined & 2112 && combined & (67238908 & ~2112) ||
-                    combined & 12288 && combined & (67238908 & ~12288) ||
-                    combined & 49152 && combined & (67238908 & ~49152)) {
-                    return true;
-                }
-            }
-            return false;
-        }
         function addTypeToUnion(typeSet, includes, type) {
             var flags = type.flags;
             if (flags & 1048576) {
                 return addTypesToUnion(typeSet, includes, type.types);
             }
-            if (!(flags & 131072 || flags & 2097152 && isEmptyIntersectionType(type))) {
-                includes |= flags & 1835007;
+            if (!(flags & 131072)) {
+                includes |= flags & 68943871;
                 if (flags & 66846720)
                     includes |= 262144;
                 if (type === wildcardType)
                     includes |= 4194304;
                 if (!strictNullChecks && flags & 98304) {
-                    if (!(ts.getObjectFlags(type) & 131072))
+                    if (!(ts.getObjectFlags(type) & 262144))
                         includes |= 2097152;
                 }
                 else {
@@ -32973,7 +33622,7 @@ var ts;
                             neverType;
                 }
             }
-            return getUnionTypeFromSortedList(typeSet, includes & 66994211 ? 0 : 65536, aliasSymbol, aliasTypeArguments);
+            return getUnionTypeFromSortedList(typeSet, includes & 66994211 ? 0 : 131072, aliasSymbol, aliasTypeArguments);
         }
         function getUnionTypePredicate(signatures) {
             var first;
@@ -33042,18 +33691,21 @@ var ts;
             if (isEmptyAnonymousObjectType(type)) {
                 if (!(includes & 8388608)) {
                     includes |= 8388608;
-                    typeSet.push(type);
+                    typeSet.set(type.id.toString(), type);
                 }
             }
             else {
-                includes |= flags & 1835007;
                 if (flags & 3) {
                     if (type === wildcardType)
                         includes |= 4194304;
                 }
-                else if ((strictNullChecks || !(flags & 98304)) && !ts.contains(typeSet, type)) {
-                    typeSet.push(type);
+                else if ((strictNullChecks || !(flags & 98304)) && !typeSet.has(type.id.toString())) {
+                    if (type.flags & 109440 && includes & 109440) {
+                        includes |= 67108864;
+                    }
+                    typeSet.set(type.id.toString(), type);
                 }
+                includes |= flags & 68943871;
             }
             return includes;
         }
@@ -33096,14 +33748,14 @@ var ts;
         }
         function intersectUnionsOfPrimitiveTypes(types) {
             var unionTypes;
-            var index = ts.findIndex(types, function (t) { return !!(ts.getObjectFlags(t) & 65536); });
+            var index = ts.findIndex(types, function (t) { return !!(ts.getObjectFlags(t) & 131072); });
             if (index < 0) {
                 return false;
             }
             var i = index + 1;
             while (i < types.length) {
                 var t = types[i];
-                if (ts.getObjectFlags(t) & 65536) {
+                if (ts.getObjectFlags(t) & 131072) {
                     (unionTypes || (unionTypes = [types[index]])).push(t);
                     ts.orderedRemoveItemAt(types, i);
                 }
@@ -33127,13 +33779,29 @@ var ts;
                     }
                 }
             }
-            types[index] = getUnionTypeFromSortedList(result, 65536);
+            types[index] = getUnionTypeFromSortedList(result, 131072);
             return true;
         }
+        function createIntersectionType(types, aliasSymbol, aliasTypeArguments) {
+            var result = createType(2097152);
+            result.objectFlags = getPropagatingFlagsOfTypes(types, 98304);
+            result.types = types;
+            result.aliasSymbol = aliasSymbol;
+            result.aliasTypeArguments = aliasTypeArguments;
+            return result;
+        }
         function getIntersectionType(types, aliasSymbol, aliasTypeArguments) {
-            var typeSet = [];
-            var includes = addTypesToIntersection(typeSet, 0, types);
-            if (includes & 131072) {
+            var typeMembershipMap = ts.createMap();
+            var includes = addTypesToIntersection(typeMembershipMap, 0, types);
+            var typeSet = ts.arrayFrom(typeMembershipMap.values());
+            if (includes & 131072 ||
+                strictNullChecks && includes & 98304 && includes & (524288 | 67108864 | 8388608) ||
+                includes & 67108864 && includes & (67238908 & ~67108864) ||
+                includes & 132 && includes & (67238908 & ~132) ||
+                includes & 296 && includes & (67238908 & ~296) ||
+                includes & 2112 && includes & (67238908 & ~2112) ||
+                includes & 12288 && includes & (67238908 & ~12288) ||
+                includes & 49152 && includes & (67238908 & ~49152)) {
                 return neverType;
             }
             if (includes & 1) {
@@ -33157,25 +33825,30 @@ var ts;
             if (typeSet.length === 1) {
                 return typeSet[0];
             }
-            if (includes & 1048576) {
-                if (intersectUnionsOfPrimitiveTypes(typeSet)) {
-                    return getIntersectionType(typeSet, aliasSymbol, aliasTypeArguments);
-                }
-                var unionIndex_1 = ts.findIndex(typeSet, function (t) { return (t.flags & 1048576) !== 0; });
-                var unionType = typeSet[unionIndex_1];
-                return getUnionType(ts.map(unionType.types, function (t) { return getIntersectionType(ts.replaceElement(typeSet, unionIndex_1, t)); }), 1, aliasSymbol, aliasTypeArguments);
-            }
             var id = getTypeListId(typeSet);
-            var type = intersectionTypes.get(id);
-            if (!type) {
-                type = createType(2097152);
-                intersectionTypes.set(id, type);
-                type.objectFlags = getPropagatingFlagsOfTypes(typeSet, 98304);
-                type.types = typeSet;
-                type.aliasSymbol = aliasSymbol;
-                type.aliasTypeArguments = aliasTypeArguments;
+            var result = intersectionTypes.get(id);
+            if (!result) {
+                if (includes & 1048576) {
+                    if (intersectUnionsOfPrimitiveTypes(typeSet)) {
+                        result = getIntersectionType(typeSet, aliasSymbol, aliasTypeArguments);
+                    }
+                    else {
+                        var size = ts.reduceLeft(typeSet, function (n, t) { return n * (t.flags & 1048576 ? t.types.length : 1); }, 1);
+                        if (size >= 100000) {
+                            error(currentNode, ts.Diagnostics.Expression_produces_a_union_type_that_is_too_complex_to_represent);
+                            return errorType;
+                        }
+                        var unionIndex_1 = ts.findIndex(typeSet, function (t) { return (t.flags & 1048576) !== 0; });
+                        var unionType = typeSet[unionIndex_1];
+                        result = getUnionType(ts.map(unionType.types, function (t) { return getIntersectionType(ts.replaceElement(typeSet, unionIndex_1, t)); }), 1, aliasSymbol, aliasTypeArguments);
+                    }
+                }
+                else {
+                    result = createIntersectionType(typeSet, aliasSymbol, aliasTypeArguments);
+                }
+                intersectionTypes.set(id, result);
             }
-            return type;
+            return result;
         }
         function getTypeFromIntersectionTypeNode(node) {
             var links = getNodeLinks(node);
@@ -33231,18 +33904,19 @@ var ts;
             var numberIndexInfo = getIndexInfoOfType(type, 1);
             return numberIndexInfo !== enumNumberIndexInfo ? numberIndexInfo : undefined;
         }
-        function getIndexType(type, stringsOnly) {
+        function getIndexType(type, stringsOnly, noIndexSignatures) {
             if (stringsOnly === void 0) { stringsOnly = keyofStringsOnly; }
-            return type.flags & 1048576 ? getIntersectionType(ts.map(type.types, function (t) { return getIndexType(t, stringsOnly); })) :
-                type.flags & 2097152 ? getUnionType(ts.map(type.types, function (t) { return getIndexType(t, stringsOnly); })) :
+            return type.flags & 1048576 ? getIntersectionType(ts.map(type.types, function (t) { return getIndexType(t, stringsOnly, noIndexSignatures); })) :
+                type.flags & 2097152 ? getUnionType(ts.map(type.types, function (t) { return getIndexType(t, stringsOnly, noIndexSignatures); })) :
                     maybeTypeOfKind(type, 58982400) ? getIndexTypeForGenericType(type, stringsOnly) :
-                        ts.getObjectFlags(type) & 32 ? getConstraintTypeFromMappedType(type) :
+                        ts.getObjectFlags(type) & 32 ? filterType(getConstraintTypeFromMappedType(type), function (t) { return !(noIndexSignatures && t.flags & (1 | 4)); }) :
                             type === wildcardType ? wildcardType :
-                                type.flags & 1 ? keyofConstraintType :
-                                    stringsOnly ? getIndexInfoOfType(type, 0) ? stringType : getLiteralTypeFromProperties(type, 128) :
-                                        getIndexInfoOfType(type, 0) ? getUnionType([stringType, numberType, getLiteralTypeFromProperties(type, 8192)]) :
-                                            getNonEnumNumberIndexInfo(type) ? getUnionType([numberType, getLiteralTypeFromProperties(type, 128 | 8192)]) :
-                                                getLiteralTypeFromProperties(type, 8576);
+                                type.flags & 2 ? neverType :
+                                    type.flags & (1 | 131072) ? keyofConstraintType :
+                                        stringsOnly ? !noIndexSignatures && getIndexInfoOfType(type, 0) ? stringType : getLiteralTypeFromProperties(type, 128) :
+                                            !noIndexSignatures && getIndexInfoOfType(type, 0) ? getUnionType([stringType, numberType, getLiteralTypeFromProperties(type, 8192)]) :
+                                                getNonEnumNumberIndexInfo(type) ? getUnionType([numberType, getLiteralTypeFromProperties(type, 128 | 8192)]) :
+                                                    getLiteralTypeFromProperties(type, 8576);
         }
         function getExtractStringType(type) {
             if (keyofStringsOnly) {
@@ -33259,15 +33933,15 @@ var ts;
             var links = getNodeLinks(node);
             if (!links.resolvedType) {
                 switch (node.operator) {
-                    case 129:
+                    case 130:
                         links.resolvedType = getIndexType(getTypeFromTypeNode(node.type));
                         break;
-                    case 142:
-                        links.resolvedType = node.type.kind === 139
+                    case 143:
+                        links.resolvedType = node.type.kind === 140
                             ? getESSymbolLikeTypeForNode(ts.walkUpParenthesizedTypes(node.parent))
                             : errorType;
                         break;
-                    case 133:
+                    case 134:
                         links.resolvedType = getTypeFromTypeNode(node.type);
                         break;
                 }
@@ -33298,25 +33972,29 @@ var ts;
             }
             return false;
         }
-        function getPropertyTypeForIndexType(objectType, indexType, accessNode, cacheSymbol, missingType) {
-            var accessExpression = accessNode && accessNode.kind === 190 ? accessNode : undefined;
-            var propName = isTypeUsableAsPropertyName(indexType) ?
+        function getPropertyNameFromIndex(indexType, accessNode) {
+            var accessExpression = accessNode && accessNode.kind === 191 ? accessNode : undefined;
+            return isTypeUsableAsPropertyName(indexType) ?
                 getPropertyNameFromType(indexType) :
                 accessExpression && checkThatExpressionIsProperSymbolReference(accessExpression.argumentExpression, indexType, false) ?
                     ts.getPropertyNameForKnownSymbolName(ts.idText(accessExpression.argumentExpression.name)) :
                     accessNode && ts.isPropertyName(accessNode) ?
                         ts.getPropertyNameForPropertyNameNode(accessNode) :
                         undefined;
+        }
+        function getPropertyTypeForIndexType(originalObjectType, objectType, indexType, fullIndexType, suppressNoImplicitAnyError, accessNode, accessFlags) {
+            var accessExpression = accessNode && accessNode.kind === 191 ? accessNode : undefined;
+            var propName = getPropertyNameFromIndex(indexType, accessNode);
             if (propName !== undefined) {
                 var prop = getPropertyOfType(objectType, propName);
                 if (prop) {
                     if (accessExpression) {
-                        markPropertyAsReferenced(prop, accessExpression, accessExpression.expression.kind === 100);
+                        markPropertyAsReferenced(prop, accessExpression, accessExpression.expression.kind === 101);
                         if (ts.isAssignmentTarget(accessExpression) && (isReferenceToReadonlyEntity(accessExpression, prop) || isReferenceThroughNamespaceImport(accessExpression))) {
                             error(accessExpression.argumentExpression, ts.Diagnostics.Cannot_assign_to_0_because_it_is_a_read_only_property, symbolToString(prop));
-                            return missingType;
+                            return undefined;
                         }
-                        if (cacheSymbol) {
+                        if (accessFlags & 4) {
                             getNodeLinks(accessNode).resolvedSymbol = prop;
                         }
                     }
@@ -33326,7 +34004,7 @@ var ts;
                         propType;
                 }
                 if (everyType(objectType, isTupleType) && isNumericLiteralName(propName) && +propName >= 0) {
-                    if (accessNode && everyType(objectType, function (t) { return !t.target.hasRestElement; })) {
+                    if (accessNode && everyType(objectType, function (t) { return !t.target.hasRestElement; }) && !(accessFlags & 8)) {
                         var indexNode = getIndexNodeForAccessExpression(accessNode);
                         if (isTupleType(objectType)) {
                             error(indexNode, ts.Diagnostics.Tuple_type_0_of_length_1_has_no_element_at_index_2, typeToString(objectType), getTypeReferenceArity(objectType), ts.unescapeLeadingUnderscores(propName));
@@ -33335,6 +34013,7 @@ var ts;
                             error(indexNode, ts.Diagnostics.Property_0_does_not_exist_on_type_1, ts.unescapeLeadingUnderscores(propName), typeToString(objectType));
                         }
                     }
+                    errorIfWritingToReadonlyIndex(getIndexInfoOfType(objectType, 1));
                     return mapType(objectType, function (t) { return getRestTypeOfTupleType(t) || undefinedType; });
                 }
             }
@@ -33342,17 +34021,21 @@ var ts;
                 if (objectType.flags & (1 | 131072)) {
                     return objectType;
                 }
-                var indexInfo = isTypeAssignableToKind(indexType, 296) && getIndexInfoOfType(objectType, 1) ||
-                    getIndexInfoOfType(objectType, 0) ||
-                    undefined;
+                var stringIndexInfo = getIndexInfoOfType(objectType, 0);
+                var indexInfo = isTypeAssignableToKind(indexType, 296) && getIndexInfoOfType(objectType, 1) || stringIndexInfo;
                 if (indexInfo) {
+                    if (accessFlags & 1 && indexInfo === stringIndexInfo) {
+                        if (accessExpression) {
+                            error(accessExpression, ts.Diagnostics.Type_0_cannot_be_used_to_index_type_1, typeToString(indexType), typeToString(originalObjectType));
+                        }
+                        return undefined;
+                    }
                     if (accessNode && !isTypeAssignableToKind(indexType, 4 | 8)) {
                         var indexNode = getIndexNodeForAccessExpression(accessNode);
                         error(indexNode, ts.Diagnostics.Type_0_cannot_be_used_as_an_index_type, typeToString(indexType));
+                        return indexInfo.type;
                     }
-                    else if (accessExpression && indexInfo.isReadonly && (ts.isAssignmentTarget(accessExpression) || ts.isDeleteTarget(accessExpression))) {
-                        error(accessExpression, ts.Diagnostics.Index_signature_in_type_0_only_permits_reading, typeToString(objectType));
-                    }
+                    errorIfWritingToReadonlyIndex(indexInfo);
                     return indexInfo.type;
                 }
                 if (indexType.flags & 131072) {
@@ -33362,7 +34045,10 @@ var ts;
                     return anyType;
                 }
                 if (accessExpression && !isConstEnumObjectType(objectType)) {
-                    if (noImplicitAny && !compilerOptions.suppressImplicitAnyIndexErrors) {
+                    if (objectType.symbol === globalThisSymbol && propName !== undefined && globalThisSymbol.exports.has(propName) && (globalThisSymbol.exports.get(propName).flags & 418)) {
+                        error(accessExpression, ts.Diagnostics.Property_0_does_not_exist_on_type_1, ts.unescapeLeadingUnderscores(propName), typeToString(objectType));
+                    }
+                    else if (noImplicitAny && !compilerOptions.suppressImplicitAnyIndexErrors && !suppressNoImplicitAnyError) {
                         if (propName !== undefined && typeHasStaticProperty(propName, objectType)) {
                             error(accessExpression, ts.Diagnostics.Property_0_is_a_static_member_of_type_1, propName, typeToString(objectType));
                         }
@@ -33377,11 +34063,35 @@ var ts;
                                 }
                             }
                             else {
-                                error(accessExpression, ts.Diagnostics.Element_implicitly_has_an_any_type_because_type_0_has_no_index_signature, typeToString(objectType));
+                                var suggestion_1 = getSuggestionForNonexistentIndexSignature(objectType, accessExpression);
+                                if (suggestion_1 !== undefined) {
+                                    error(accessExpression, ts.Diagnostics.Element_implicitly_has_an_any_type_because_type_0_has_no_index_signature_Did_you_mean_to_call_1, typeToString(objectType), suggestion_1);
+                                }
+                                else {
+                                    var errorInfo = void 0;
+                                    if (indexType.flags & 1024) {
+                                        errorInfo = ts.chainDiagnosticMessages(undefined, ts.Diagnostics.Property_0_does_not_exist_on_type_1, "[" + typeToString(indexType) + "]", typeToString(objectType));
+                                    }
+                                    else if (indexType.flags & 8192) {
+                                        var symbolName_2 = getFullyQualifiedName(indexType.symbol, accessExpression);
+                                        errorInfo = ts.chainDiagnosticMessages(undefined, ts.Diagnostics.Property_0_does_not_exist_on_type_1, "[" + symbolName_2 + "]", typeToString(objectType));
+                                    }
+                                    else if (indexType.flags & 128) {
+                                        errorInfo = ts.chainDiagnosticMessages(undefined, ts.Diagnostics.Property_0_does_not_exist_on_type_1, indexType.value, typeToString(objectType));
+                                    }
+                                    else if (indexType.flags & 256) {
+                                        errorInfo = ts.chainDiagnosticMessages(undefined, ts.Diagnostics.Property_0_does_not_exist_on_type_1, indexType.value, typeToString(objectType));
+                                    }
+                                    else if (indexType.flags & (8 | 4)) {
+                                        errorInfo = ts.chainDiagnosticMessages(undefined, ts.Diagnostics.No_index_signature_with_a_parameter_of_type_0_was_found_on_type_1, typeToString(indexType), typeToString(objectType));
+                                    }
+                                    errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.Element_implicitly_has_an_any_type_because_expression_of_type_0_can_t_be_used_to_index_type_1, typeToString(fullIndexType), typeToString(objectType));
+                                    diagnostics.add(ts.createDiagnosticForNodeFromMessageChain(accessExpression, errorInfo));
+                                }
                             }
                         }
                     }
-                    return missingType;
+                    return undefined;
                 }
             }
             if (isJSLiteralType(objectType)) {
@@ -33402,14 +34112,19 @@ var ts;
             if (isTypeAny(indexType)) {
                 return indexType;
             }
-            return missingType;
+            return undefined;
+            function errorIfWritingToReadonlyIndex(indexInfo) {
+                if (indexInfo && indexInfo.isReadonly && accessExpression && (ts.isAssignmentTarget(accessExpression) || ts.isDeleteTarget(accessExpression))) {
+                    error(accessExpression, ts.Diagnostics.Index_signature_in_type_0_only_permits_reading, typeToString(objectType));
+                }
+            }
         }
         function getIndexNodeForAccessExpression(accessNode) {
-            return accessNode.kind === 190
+            return accessNode.kind === 191
                 ? accessNode.argumentExpression
-                : accessNode.kind === 180
+                : accessNode.kind === 181
                     ? accessNode.indexType
-                    : accessNode.kind === 149
+                    : accessNode.kind === 150
                         ? accessNode.expression
                         : accessNode;
         }
@@ -33419,46 +34134,92 @@ var ts;
         function isGenericIndexType(type) {
             return maybeTypeOfKind(type, 58982400 | 4194304);
         }
-        function getSimplifiedType(type) {
-            return type.flags & 8388608 ? getSimplifiedIndexedAccessType(type) : type;
+        function isThisTypeParameter(type) {
+            return !!(type.flags & 262144 && type.isThisType);
         }
-        function distributeIndexOverObjectType(objectType, indexType) {
-            if (objectType.flags & 1048576) {
-                return mapType(objectType, function (t) { return getSimplifiedType(getIndexedAccessType(t, indexType)); });
-            }
-            if (objectType.flags & 2097152) {
-                return getIntersectionType(ts.map(objectType.types, function (t) { return getSimplifiedType(getIndexedAccessType(t, indexType)); }));
+        function getSimplifiedType(type, writing) {
+            return type.flags & 8388608 ? getSimplifiedIndexedAccessType(type, writing) :
+                type.flags & 16777216 ? getSimplifiedConditionalType(type, writing) :
+                    type;
+        }
+        function distributeIndexOverObjectType(objectType, indexType, writing) {
+            if (objectType.flags & 3145728) {
+                var types = ts.map(objectType.types, function (t) { return getSimplifiedType(getIndexedAccessType(t, indexType), writing); });
+                return objectType.flags & 2097152 || writing ? getIntersectionType(types) : getUnionType(types);
             }
         }
-        function getSimplifiedIndexedAccessType(type) {
-            if (type.simplified) {
-                return type.simplified === circularConstraintType ? type : type.simplified;
-            }
-            type.simplified = circularConstraintType;
-            var objectType = getSimplifiedType(type.objectType);
-            var indexType = getSimplifiedType(type.indexType);
+        function distributeObjectOverIndexType(objectType, indexType, writing) {
             if (indexType.flags & 1048576) {
-                return type.simplified = mapType(indexType, function (t) { return getSimplifiedType(getIndexedAccessType(objectType, t)); });
+                var types = ts.map(indexType.types, function (t) { return getSimplifiedType(getIndexedAccessType(objectType, t), writing); });
+                return writing ? getIntersectionType(types) : getUnionType(types);
+            }
+        }
+        function getSimplifiedIndexedAccessType(type, writing) {
+            var cache = writing ? "simplifiedForWriting" : "simplifiedForReading";
+            if (type[cache]) {
+                return type[cache] === circularConstraintType ? type : type[cache];
+            }
+            type[cache] = circularConstraintType;
+            var objectType = getSimplifiedType(type.objectType, writing);
+            var indexType = getSimplifiedType(type.indexType, writing);
+            var distributedOverIndex = distributeObjectOverIndexType(objectType, indexType, writing);
+            if (distributedOverIndex) {
+                return type[cache] = distributedOverIndex;
             }
             if (!(indexType.flags & 63176704)) {
-                var simplified = distributeIndexOverObjectType(objectType, indexType);
-                if (simplified) {
-                    return type.simplified = simplified;
+                var distributedOverObject = distributeIndexOverObjectType(objectType, indexType, writing);
+                if (distributedOverObject) {
+                    return type[cache] = distributedOverObject;
                 }
             }
             if (isGenericMappedType(objectType)) {
-                var mapper = createTypeMapper([getTypeParameterFromMappedType(objectType)], [type.indexType]);
-                var templateMapper = combineTypeMappers(objectType.mapper, mapper);
-                return type.simplified = mapType(instantiateType(getTemplateTypeFromMappedType(objectType), templateMapper), getSimplifiedType);
+                return type[cache] = mapType(substituteIndexedMappedType(objectType, type.indexType), function (t) { return getSimplifiedType(t, writing); });
             }
-            return type.simplified = type;
+            return type[cache] = type;
         }
-        function getIndexedAccessType(objectType, indexType, accessNode, missingType) {
-            if (missingType === void 0) { missingType = accessNode ? errorType : unknownType; }
+        function getSimplifiedConditionalType(type, writing) {
+            var checkType = type.checkType;
+            var extendsType = type.extendsType;
+            var trueType = getTrueTypeFromConditionalType(type);
+            var falseType = getFalseTypeFromConditionalType(type);
+            if (falseType.flags & 131072 && getActualTypeVariable(trueType) === getActualTypeVariable(checkType)) {
+                if (checkType.flags & 1 || isTypeAssignableTo(getRestrictiveInstantiation(checkType), getRestrictiveInstantiation(extendsType))) {
+                    return getSimplifiedType(trueType, writing);
+                }
+                else if (isIntersectionEmpty(checkType, extendsType)) {
+                    return neverType;
+                }
+            }
+            else if (trueType.flags & 131072 && getActualTypeVariable(falseType) === getActualTypeVariable(checkType)) {
+                if (!(checkType.flags & 1) && isTypeAssignableTo(getRestrictiveInstantiation(checkType), getRestrictiveInstantiation(extendsType))) {
+                    return neverType;
+                }
+                else if (checkType.flags & 1 || isIntersectionEmpty(checkType, extendsType)) {
+                    return getSimplifiedType(falseType, writing);
+                }
+            }
+            return type;
+        }
+        function isIntersectionEmpty(type1, type2) {
+            return !!(getUnionType([intersectTypes(type1, type2), neverType]).flags & 131072);
+        }
+        function substituteIndexedMappedType(objectType, index) {
+            var mapper = createTypeMapper([getTypeParameterFromMappedType(objectType)], [index]);
+            var templateMapper = combineTypeMappers(objectType.mapper, mapper);
+            return instantiateType(getTemplateTypeFromMappedType(objectType), templateMapper);
+        }
+        function getIndexedAccessType(objectType, indexType, accessNode) {
+            return getIndexedAccessTypeOrUndefined(objectType, indexType, accessNode, 0) || (accessNode ? errorType : unknownType);
+        }
+        function getIndexedAccessTypeOrUndefined(objectType, indexType, accessNode, accessFlags) {
+            if (accessFlags === void 0) { accessFlags = 0; }
             if (objectType === wildcardType || indexType === wildcardType) {
                 return wildcardType;
             }
-            if (isGenericIndexType(indexType) || !(accessNode && accessNode.kind !== 180) && isGenericObjectType(objectType)) {
+            if (isStringIndexSignatureOnlyType(objectType) && !(indexType.flags & 98304) && isTypeAssignableToKind(indexType, 4 | 8)) {
+                indexType = stringType;
+            }
+            if (isGenericIndexType(indexType) || !(accessNode && accessNode.kind !== 181) && isGenericObjectType(objectType)) {
                 if (objectType.flags & 3) {
                     return objectType;
                 }
@@ -33475,23 +34236,23 @@ var ts;
                 var wasMissingProp = false;
                 for (var _i = 0, _a = indexType.types; _i < _a.length; _i++) {
                     var t = _a[_i];
-                    var propType = getPropertyTypeForIndexType(apparentObjectType, t, accessNode, false, missingType);
-                    if (propType === missingType) {
-                        if (!accessNode) {
-                            return missingType;
-                        }
-                        else {
-                            wasMissingProp = true;
-                        }
+                    var propType = getPropertyTypeForIndexType(objectType, apparentObjectType, t, indexType, wasMissingProp, accessNode, accessFlags);
+                    if (propType) {
+                        propTypes.push(propType);
+                    }
+                    else if (!accessNode) {
+                        return undefined;
+                    }
+                    else {
+                        wasMissingProp = true;
                     }
-                    propTypes.push(propType);
                 }
                 if (wasMissingProp) {
-                    return missingType;
+                    return undefined;
                 }
-                return getUnionType(propTypes);
+                return accessFlags & 2 ? getIntersectionType(propTypes) : getUnionType(propTypes);
             }
-            return getPropertyTypeForIndexType(apparentObjectType, indexType, accessNode, true, missingType);
+            return getPropertyTypeForIndexType(objectType, apparentObjectType, indexType, indexType, false, accessNode, accessFlags | 4);
         }
         function getTypeFromIndexedAccessTypeNode(node) {
             var links = getNodeLinks(node);
@@ -33519,10 +34280,14 @@ var ts;
             return links.resolvedType;
         }
         function getActualTypeVariable(type) {
-            return type.flags & 33554432 ? type.typeVariable : type;
-        }
-        function isIntersectionEmpty(type1, type2) {
-            return !!(getUnionType([intersectTypes(type1, type2), neverType]).flags & 131072);
+            if (type.flags & 33554432) {
+                return type.typeVariable;
+            }
+            if (type.flags & 8388608 && (type.objectType.flags & 33554432 ||
+                type.indexType.flags & 33554432)) {
+                return getIndexedAccessType(getActualTypeVariable(type.objectType), getActualTypeVariable(type.indexType));
+            }
+            return type;
         }
         function getConditionalType(root, mapper) {
             var checkType = instantiateType(root.checkType, mapper);
@@ -33530,53 +34295,25 @@ var ts;
             if (checkType === wildcardType || extendsType === wildcardType) {
                 return wildcardType;
             }
-            var trueType = instantiateType(root.trueType, mapper);
-            var falseType = instantiateType(root.falseType, mapper);
-            var instantiationId = "" + (root.isDistributive ? "d" : "") + getTypeId(checkType) + ">" + getTypeId(extendsType) + "?" + getTypeId(trueType) + ":" + getTypeId(falseType);
-            var result = conditionalTypes.get(instantiationId);
-            if (result) {
-                return result;
-            }
-            var newResult = getConditionalTypeWorker(root, mapper, checkType, extendsType, trueType, falseType);
-            conditionalTypes.set(instantiationId, newResult);
-            return newResult;
-        }
-        function getConditionalTypeWorker(root, mapper, checkType, extendsType, trueType, falseType) {
-            if (falseType.flags & 131072 && isTypeIdenticalTo(getActualTypeVariable(trueType), getActualTypeVariable(checkType))) {
-                if (checkType.flags & 1 || isTypeAssignableTo(getRestrictiveInstantiation(checkType), getRestrictiveInstantiation(extendsType))) {
-                    return getDefaultConstraintOfTrueBranchOfConditionalType(root, undefined, mapper);
-                }
-                else if (isIntersectionEmpty(checkType, extendsType)) {
-                    return neverType;
-                }
-            }
-            else if (trueType.flags & 131072 && isTypeIdenticalTo(getActualTypeVariable(falseType), getActualTypeVariable(checkType))) {
-                if (!(checkType.flags & 1) && isTypeAssignableTo(getRestrictiveInstantiation(checkType), getRestrictiveInstantiation(extendsType))) {
-                    return neverType;
-                }
-                else if (checkType.flags & 1 || isIntersectionEmpty(checkType, extendsType)) {
-                    return falseType;
-                }
-            }
             var checkTypeInstantiable = maybeTypeOfKind(checkType, 63176704 | 131072);
             var combinedMapper;
             if (root.inferTypeParameters) {
                 var context = createInferenceContext(root.inferTypeParameters, undefined, 0);
                 if (!checkTypeInstantiable) {
-                    inferTypes(context.inferences, checkType, extendsType, 32 | 64);
+                    inferTypes(context.inferences, checkType, extendsType, 64 | 128);
                 }
-                combinedMapper = combineTypeMappers(mapper, context);
+                combinedMapper = combineTypeMappers(mapper, context.mapper);
             }
             var inferredExtendsType = combinedMapper ? instantiateType(root.extendsType, combinedMapper) : extendsType;
             if (!checkTypeInstantiable && !maybeTypeOfKind(inferredExtendsType, 63176704 | 131072)) {
                 if (inferredExtendsType.flags & 3) {
-                    return trueType;
+                    return instantiateType(root.trueType, combinedMapper || mapper);
                 }
                 if (checkType.flags & 1) {
-                    return getUnionType([instantiateType(root.trueType, combinedMapper || mapper), falseType]);
+                    return getUnionType([instantiateType(root.trueType, combinedMapper || mapper), instantiateType(root.falseType, mapper)]);
                 }
                 if (!isTypeAssignableTo(getPermissiveInstantiation(checkType), getPermissiveInstantiation(inferredExtendsType))) {
-                    return falseType;
+                    return instantiateType(root.falseType, mapper);
                 }
                 if (isTypeAssignableTo(getRestrictiveInstantiation(checkType), getRestrictiveInstantiation(inferredExtendsType))) {
                     return instantiateType(root.trueType, combinedMapper || mapper);
@@ -33589,10 +34326,6 @@ var ts;
             result.extendsType = extendsType;
             result.mapper = mapper;
             result.combinedMapper = combinedMapper;
-            if (!combinedMapper) {
-                result.resolvedTrueType = trueType;
-                result.resolvedFalseType = falseType;
-            }
             result.aliasSymbol = root.aliasSymbol;
             result.aliasTypeArguments = instantiateTypes(root.aliasTypeArguments, mapper);
             return result;
@@ -33603,6 +34336,9 @@ var ts;
         function getFalseTypeFromConditionalType(type) {
             return type.resolvedFalseType || (type.resolvedFalseType = instantiateType(type.root.falseType, type.mapper));
         }
+        function getInferredTrueTypeFromConditionalType(type) {
+            return type.resolvedInferredTrueType || (type.resolvedInferredTrueType = type.combinedMapper ? instantiateType(type.root.trueType, type.combinedMapper) : getTrueTypeFromConditionalType(type));
+        }
         function getInferTypeParameters(node) {
             var result;
             if (node.locals) {
@@ -33614,20 +34350,6 @@ var ts;
             }
             return result;
         }
-        function isPossiblyReferencedInConditionalType(tp, node) {
-            if (isTypeParameterPossiblyReferenced(tp, node)) {
-                return true;
-            }
-            while (node) {
-                if (node.kind === 175) {
-                    if (isTypeParameterPossiblyReferenced(tp, node.extendsType)) {
-                        return true;
-                    }
-                }
-                node = node.parent;
-            }
-            return false;
-        }
         function getTypeFromConditionalTypeNode(node) {
             var links = getNodeLinks(node);
             if (!links.resolvedType) {
@@ -33635,7 +34357,7 @@ var ts;
                 var aliasSymbol = getAliasSymbolForTypeNode(node);
                 var aliasTypeArguments = getTypeArgumentsForAliasSymbol(aliasSymbol);
                 var allOuterTypeParameters = getOuterTypeParameters(node, true);
-                var outerTypeParameters = aliasTypeArguments ? allOuterTypeParameters : ts.filter(allOuterTypeParameters, function (tp) { return isPossiblyReferencedInConditionalType(tp, node); });
+                var outerTypeParameters = aliasTypeArguments ? allOuterTypeParameters : ts.filter(allOuterTypeParameters, function (tp) { return isTypeParameterPossiblyReferenced(tp, node); });
                 var root = {
                     node: node,
                     checkType: checkType,
@@ -33844,7 +34566,7 @@ var ts;
                 }
             }
             var spread = createAnonymousType(symbol, members, ts.emptyArray, ts.emptyArray, getIndexInfoWithReadonly(stringIndexInfo, readonly), getIndexInfoWithReadonly(numberIndexInfo, readonly));
-            spread.objectFlags |= 128 | 262144 | 1024 | objectFlags;
+            spread.objectFlags |= 128 | 524288 | 1024 | objectFlags;
             return spread;
         }
         function isSpreadableProperty(prop) {
@@ -33930,9 +34652,9 @@ var ts;
         function getThisType(node) {
             var container = ts.getThisContainer(node, false);
             var parent = container && container.parent;
-            if (parent && (ts.isClassLike(parent) || parent.kind === 241)) {
+            if (parent && (ts.isClassLike(parent) || parent.kind === 242)) {
                 if (!ts.hasModifier(container, 32) &&
-                    (container.kind !== 157 || ts.isNodeDescendantOf(node, container.body))) {
+                    (container.kind !== 158 || ts.isNodeDescendantOf(node, container.body))) {
                     return getDeclaredTypeOfClassOrInterface(getSymbolOfNode(parent)).thisType;
                 }
             }
@@ -33948,87 +34670,87 @@ var ts;
         }
         function getTypeFromTypeNode(node) {
             switch (node.kind) {
-                case 120:
-                case 289:
+                case 121:
                 case 290:
-                    return anyType;
-                case 143:
-                    return unknownType;
-                case 138:
-                    return stringType;
-                case 135:
-                    return numberType;
-                case 146:
-                    return bigintType;
-                case 123:
-                    return booleanType;
-                case 139:
-                    return esSymbolType;
-                case 106:
-                    return voidType;
-                case 141:
-                    return undefinedType;
-                case 96:
-                    return nullType;
-                case 132:
-                    return neverType;
-                case 136:
-                    return node.flags & 65536 ? anyType : nonPrimitiveType;
-                case 178:
-                case 100:
-                    return getTypeFromThisTypeNode(node);
-                case 182:
-                    return getTypeFromLiteralTypeNode(node);
-                case 164:
-                    return getTypeFromTypeReference(node);
-                case 163:
-                    return booleanType;
-                case 211:
-                    return getTypeFromTypeReference(node);
-                case 167:
-                    return getTypeFromTypeQueryNode(node);
-                case 169:
-                    return getTypeFromArrayTypeNode(node);
-                case 170:
-                    return getTypeFromTupleTypeNode(node);
-                case 171:
-                    return getTypeFromOptionalTypeNode(node);
-                case 173:
-                    return getTypeFromUnionTypeNode(node);
-                case 174:
-                    return getTypeFromIntersectionTypeNode(node);
                 case 291:
-                    return getTypeFromJSDocNullableTypeNode(node);
-                case 293:
-                    return addOptionality(getTypeFromTypeNode(node.type));
-                case 177:
-                case 172:
-                case 292:
-                case 288:
-                    return getTypeFromTypeNode(node.type);
-                case 295:
-                    return getTypeFromJSDocVariadicType(node);
-                case 165:
-                case 166:
-                case 168:
-                case 297:
-                case 294:
-                case 298:
-                    return getTypeFromTypeLiteralOrFunctionOrConstructorTypeNode(node);
+                    return anyType;
+                case 144:
+                    return unknownType;
+                case 139:
+                    return stringType;
+                case 136:
+                    return numberType;
+                case 147:
+                    return bigintType;
+                case 124:
+                    return booleanType;
+                case 140:
+                    return esSymbolType;
+                case 107:
+                    return voidType;
+                case 142:
+                    return undefinedType;
+                case 97:
+                    return nullType;
+                case 133:
+                    return neverType;
+                case 137:
+                    return node.flags & 65536 ? anyType : nonPrimitiveType;
                 case 179:
-                    return getTypeFromTypeOperatorNode(node);
-                case 180:
-                    return getTypeFromIndexedAccessTypeNode(node);
-                case 181:
-                    return getTypeFromMappedTypeNode(node);
-                case 175:
-                    return getTypeFromConditionalTypeNode(node);
-                case 176:
-                    return getTypeFromInferTypeNode(node);
+                case 101:
+                    return getTypeFromThisTypeNode(node);
                 case 183:
+                    return getTypeFromLiteralTypeNode(node);
+                case 165:
+                    return getTypeFromTypeReference(node);
+                case 164:
+                    return booleanType;
+                case 212:
+                    return getTypeFromTypeReference(node);
+                case 168:
+                    return getTypeFromTypeQueryNode(node);
+                case 170:
+                    return getTypeFromArrayTypeNode(node);
+                case 171:
+                    return getTypeFromTupleTypeNode(node);
+                case 172:
+                    return getTypeFromOptionalTypeNode(node);
+                case 174:
+                    return getTypeFromUnionTypeNode(node);
+                case 175:
+                    return getTypeFromIntersectionTypeNode(node);
+                case 292:
+                    return getTypeFromJSDocNullableTypeNode(node);
+                case 294:
+                    return addOptionality(getTypeFromTypeNode(node.type));
+                case 178:
+                case 173:
+                case 293:
+                case 289:
+                    return getTypeFromTypeNode(node.type);
+                case 296:
+                    return getTypeFromJSDocVariadicType(node);
+                case 166:
+                case 167:
+                case 169:
+                case 298:
+                case 295:
+                case 299:
+                    return getTypeFromTypeLiteralOrFunctionOrConstructorTypeNode(node);
+                case 180:
+                    return getTypeFromTypeOperatorNode(node);
+                case 181:
+                    return getTypeFromIndexedAccessTypeNode(node);
+                case 182:
+                    return getTypeFromMappedTypeNode(node);
+                case 176:
+                    return getTypeFromConditionalTypeNode(node);
+                case 177:
+                    return getTypeFromInferTypeNode(node);
+                case 184:
                     return getTypeFromImportTypeNode(node);
-                case 72:
-                case 148:
+                case 73:
+                case 149:
                     var symbol = getSymbolAtLocation(node);
                     return symbol ? getDeclaredTypeOfSymbol(symbol) : errorType;
                 default:
@@ -34083,32 +34805,8 @@ var ts;
         function createTypeEraser(sources) {
             return createTypeMapper(sources, undefined);
         }
-        function createBackreferenceMapper(typeParameters, index) {
-            return function (t) { return typeParameters.indexOf(t) >= index ? emptyObjectType : t; };
-        }
-        function isInferenceContext(mapper) {
-            return !!mapper.typeParameters;
-        }
-        function cloneTypeMapper(mapper, extraFlags) {
-            if (extraFlags === void 0) { extraFlags = 0; }
-            return mapper && isInferenceContext(mapper) ?
-                createInferenceContext(mapper.typeParameters, mapper.signature, mapper.flags | extraFlags, mapper.compareTypes, mapper.inferences) :
-                mapper;
-        }
-        function cloneInferredPartOfContext(context) {
-            var params = [];
-            var inferences = [];
-            for (var i = 0; i < context.typeParameters.length; i++) {
-                var info = context.inferences[i];
-                if (info.candidates || info.contraCandidates) {
-                    params.push(context.typeParameters[i]);
-                    inferences.push(info);
-                }
-            }
-            if (!params.length) {
-                return undefined;
-            }
-            return createInferenceContext(params, context.signature, context.flags | 1, context.compareTypes, inferences);
+        function createBackreferenceMapper(context, index) {
+            return function (t) { return ts.findIndex(context.inferences, function (info) { return info.typeParameter === t; }) >= index ? unknownType : t; };
         }
         function combineTypeMappers(mapper1, mapper2) {
             if (!mapper1)
@@ -34176,7 +34874,7 @@ var ts;
                 symbol = links.target;
                 mapper = combineTypeMappers(links.mapper, mapper);
             }
-            var result = createSymbol(symbol.flags, symbol.escapedName, 1 | ts.getCheckFlags(symbol) & (8 | 2048 | 8192 | 16384));
+            var result = createSymbol(symbol.flags, symbol.escapedName, 1 | ts.getCheckFlags(symbol) & (8 | 4096 | 16384 | 32768));
             result.declarations = symbol.declarations;
             result.parent = symbol.parent;
             result.target = symbol;
@@ -34235,25 +34933,28 @@ var ts;
             return type;
         }
         function maybeTypeParameterReference(node) {
-            return !(node.kind === 148 ||
-                node.parent.kind === 164 && node.parent.typeArguments && node === node.parent.typeName);
+            return !(node.kind === 149 ||
+                node.parent.kind === 165 && node.parent.typeArguments && node === node.parent.typeName);
         }
         function isTypeParameterPossiblyReferenced(tp, node) {
             if (tp.symbol && tp.symbol.declarations && tp.symbol.declarations.length === 1) {
-                var container_3 = tp.symbol.declarations[0].parent;
-                if (ts.findAncestor(node, function (n) { return n.kind === 218 ? "quit" : n === container_3; })) {
-                    return !!ts.forEachChild(node, containsReference);
+                var container = tp.symbol.declarations[0].parent;
+                for (var n = node; n !== container; n = n.parent) {
+                    if (!n || n.kind === 219 || n.kind === 176 && ts.forEachChild(n.extendsType, containsReference)) {
+                        return true;
+                    }
                 }
+                return !!ts.forEachChild(node, containsReference);
             }
             return true;
             function containsReference(node) {
                 switch (node.kind) {
-                    case 178:
+                    case 179:
                         return !!tp.isThisType;
-                    case 72:
+                    case 73:
                         return !tp.isThisType && ts.isPartOfTypeNode(node) && maybeTypeParameterReference(node) &&
                             getTypeFromTypeNode(node) === tp;
-                    case 167:
+                    case 168:
                         return true;
                 }
                 return !!ts.forEachChild(node, containsReference);
@@ -34361,10 +35062,11 @@ var ts;
             if (!type || !mapper || mapper === identityMapper) {
                 return type;
             }
-            if (instantiationDepth === 50) {
+            if (instantiationDepth === 50 || instantiationCount >= 5000000) {
                 error(currentNode, ts.Diagnostics.Type_instantiation_is_excessively_deep_and_possibly_infinite);
                 return errorType;
             }
+            instantiationCount++;
             instantiationDepth++;
             var result = instantiateTypeWorker(type, mapper);
             instantiationDepth--;
@@ -34378,7 +35080,7 @@ var ts;
             if (flags & 524288) {
                 var objectFlags = type.objectFlags;
                 if (objectFlags & 16) {
-                    return type.symbol && type.symbol.flags & (16 | 8192 | 32 | 2048 | 4096) && type.symbol.declarations ?
+                    return couldContainTypeVariables(type) ?
                         getAnonymousTypeInstantiation(type, mapper) : type;
                 }
                 if (objectFlags & 32) {
@@ -34416,7 +35118,11 @@ var ts;
                     return getSubstitutionType(maybeVariable, instantiateType(type.substitute, mapper));
                 }
                 else {
-                    return maybeVariable;
+                    var sub = instantiateType(type.substitute, mapper);
+                    if (sub.flags & 3 || isTypeAssignableTo(getRestrictiveInstantiation(maybeVariable), getRestrictiveInstantiation(sub))) {
+                        return maybeVariable;
+                    }
+                    return sub;
                 }
             }
             return type;
@@ -34440,33 +35146,34 @@ var ts;
             return info && createIndexInfo(instantiateType(info.type, mapper), info.isReadonly, info.declaration);
         }
         function isContextSensitive(node) {
-            ts.Debug.assert(node.kind !== 156 || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 157 || ts.isObjectLiteralMethod(node));
             switch (node.kind) {
-                case 196:
                 case 197:
-                case 156:
+                case 198:
+                case 157:
+                case 240:
                     return isContextSensitiveFunctionLikeDeclaration(node);
-                case 188:
+                case 189:
                     return ts.some(node.properties, isContextSensitive);
-                case 187:
+                case 188:
                     return ts.some(node.elements, isContextSensitive);
-                case 205:
+                case 206:
                     return isContextSensitive(node.whenTrue) ||
                         isContextSensitive(node.whenFalse);
-                case 204:
+                case 205:
                     return node.operatorToken.kind === 55 &&
                         (isContextSensitive(node.left) || isContextSensitive(node.right));
-                case 275:
+                case 276:
                     return isContextSensitive(node.initializer);
-                case 195:
+                case 196:
                     return isContextSensitive(node.expression);
-                case 268:
+                case 269:
                     return ts.some(node.properties, isContextSensitive) || ts.isJsxOpeningElement(node.parent) && ts.some(node.parent.parent.children, isContextSensitive);
-                case 267: {
+                case 268: {
                     var initializer = node.initializer;
                     return !!initializer && isContextSensitive(initializer);
                 }
-                case 270: {
+                case 271: {
                     var expression = node.expression;
                     return !!expression && isContextSensitive(expression);
                 }
@@ -34474,13 +35181,16 @@ var ts;
             return false;
         }
         function isContextSensitiveFunctionLikeDeclaration(node) {
+            if (ts.isFunctionDeclaration(node) && (!ts.isInJSFile(node) || !getTypeForDeclarationFromJSDocComment(node))) {
+                return false;
+            }
             if (node.typeParameters) {
                 return false;
             }
             if (ts.some(node.parameters, function (p) { return !ts.getEffectiveTypeAnnotationNode(p); })) {
                 return true;
             }
-            if (node.kind !== 197) {
+            if (node.kind !== 198) {
                 var parameter = ts.firstOrUndefined(node.parameters);
                 if (!(parameter && ts.parameterIsThisKeyword(parameter))) {
                     return true;
@@ -34489,7 +35199,7 @@ var ts;
             return hasContextSensitiveReturnExpression(node);
         }
         function hasContextSensitiveReturnExpression(node) {
-            return !!node.body && node.body.kind !== 218 && isContextSensitive(node.body);
+            return !!node.body && node.body.kind !== 219 && isContextSensitive(node.body);
         }
         function isContextSensitiveFunctionOrObjectLiteralMethod(func) {
             return (ts.isInJSFile(func) && ts.isFunctionDeclaration(func) || isFunctionExpressionOrArrowFunction(func) || ts.isObjectLiteralMethod(func)) &&
@@ -34533,7 +35243,7 @@ var ts;
         function isTypeDerivedFrom(source, target) {
             return source.flags & 1048576 ? ts.every(source.types, function (t) { return isTypeDerivedFrom(t, target); }) :
                 target.flags & 1048576 ? ts.some(target.types, function (t) { return isTypeDerivedFrom(source, t); }) :
-                    source.flags & 58982400 ? isTypeDerivedFrom(getBaseConstraintOfType(source) || emptyObjectType, target) :
+                    source.flags & 58982400 ? isTypeDerivedFrom(getBaseConstraintOfType(source) || unknownType, target) :
                         target === globalObjectType ? !!(source.flags & (524288 | 67108864)) :
                             target === globalFunctionType ? !!(source.flags & 524288) && isFunctionObjectType(source) :
                                 hasBaseType(source, getTargetType(target));
@@ -34548,48 +35258,49 @@ var ts;
             return checkTypeRelatedTo(source, target, assignableRelation, errorNode, headMessage, containingMessageChain, errorOutputObject);
         }
         function checkTypeAssignableToAndOptionallyElaborate(source, target, errorNode, expr, headMessage, containingMessageChain) {
-            return checkTypeRelatedToAndOptionallyElaborate(source, target, assignableRelation, errorNode, expr, headMessage, containingMessageChain);
+            return checkTypeRelatedToAndOptionallyElaborate(source, target, assignableRelation, errorNode, expr, headMessage, containingMessageChain, undefined);
         }
-        function checkTypeRelatedToAndOptionallyElaborate(source, target, relation, errorNode, expr, headMessage, containingMessageChain) {
+        function checkTypeRelatedToAndOptionallyElaborate(source, target, relation, errorNode, expr, headMessage, containingMessageChain, errorOutputContainer) {
             if (isTypeRelatedTo(source, target, relation))
                 return true;
-            if (!errorNode || !elaborateError(expr, source, target, relation, headMessage)) {
-                return checkTypeRelatedTo(source, target, relation, errorNode, headMessage, containingMessageChain);
+            if (!errorNode || !elaborateError(expr, source, target, relation, headMessage, containingMessageChain, errorOutputContainer)) {
+                return checkTypeRelatedTo(source, target, relation, errorNode, headMessage, containingMessageChain, errorOutputContainer);
             }
             return false;
         }
         function isOrHasGenericConditional(type) {
             return !!(type.flags & 16777216 || (type.flags & 2097152 && ts.some(type.types, isOrHasGenericConditional)));
         }
-        function elaborateError(node, source, target, relation, headMessage) {
+        function elaborateError(node, source, target, relation, headMessage, containingMessageChain, errorOutputContainer) {
             if (!node || isOrHasGenericConditional(target))
                 return false;
-            if (!checkTypeRelatedTo(source, target, relation, undefined) && elaborateDidYouMeanToCallOrConstruct(node, source, target, relation, headMessage)) {
+            if (!checkTypeRelatedTo(source, target, relation, undefined)
+                && elaborateDidYouMeanToCallOrConstruct(node, source, target, relation, headMessage, containingMessageChain, errorOutputContainer)) {
                 return true;
             }
             switch (node.kind) {
-                case 270:
-                case 195:
-                    return elaborateError(node.expression, source, target, relation, headMessage);
-                case 204:
+                case 271:
+                case 196:
+                    return elaborateError(node.expression, source, target, relation, headMessage, containingMessageChain, errorOutputContainer);
+                case 205:
                     switch (node.operatorToken.kind) {
-                        case 59:
+                        case 60:
                         case 27:
-                            return elaborateError(node.right, source, target, relation, headMessage);
+                            return elaborateError(node.right, source, target, relation, headMessage, containingMessageChain, errorOutputContainer);
                     }
                     break;
+                case 189:
+                    return elaborateObjectLiteral(node, source, target, relation, containingMessageChain, errorOutputContainer);
                 case 188:
-                    return elaborateObjectLiteral(node, source, target, relation);
-                case 187:
-                    return elaborateArrayLiteral(node, source, target, relation);
-                case 268:
-                    return elaborateJsxComponents(node, source, target, relation);
-                case 197:
-                    return elaborateArrowFunction(node, source, target, relation);
+                    return elaborateArrayLiteral(node, source, target, relation, containingMessageChain, errorOutputContainer);
+                case 269:
+                    return elaborateJsxComponents(node, source, target, relation, containingMessageChain, errorOutputContainer);
+                case 198:
+                    return elaborateArrowFunction(node, source, target, relation, containingMessageChain, errorOutputContainer);
             }
             return false;
         }
-        function elaborateDidYouMeanToCallOrConstruct(node, source, target, relation, headMessage) {
+        function elaborateDidYouMeanToCallOrConstruct(node, source, target, relation, headMessage, containingMessageChain, errorOutputContainer) {
             var callSignatures = getSignaturesOfType(source, 0);
             var constructSignatures = getSignaturesOfType(source, 1);
             for (var _i = 0, _a = [constructSignatures, callSignatures]; _i < _a.length; _i++) {
@@ -34598,16 +35309,16 @@ var ts;
                     var returnType = getReturnTypeOfSignature(s);
                     return !(returnType.flags & (1 | 131072)) && checkTypeRelatedTo(returnType, target, relation, undefined);
                 })) {
-                    var resultObj = {};
-                    checkTypeAssignableTo(source, target, node, headMessage, undefined, resultObj);
-                    var diagnostic = resultObj.error;
-                    addRelatedInfo(diagnostic, ts.createDiagnosticForNode(node, signatures === constructSignatures ? ts.Diagnostics.Did_you_mean_to_use_new_with_this_expression : ts.Diagnostics.Did_you_mean_to_call_this_expression));
+                    var resultObj = errorOutputContainer || {};
+                    checkTypeAssignableTo(source, target, node, headMessage, containingMessageChain, resultObj);
+                    var diagnostic = resultObj.errors[resultObj.errors.length - 1];
+                    ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(node, signatures === constructSignatures ? ts.Diagnostics.Did_you_mean_to_use_new_with_this_expression : ts.Diagnostics.Did_you_mean_to_call_this_expression));
                     return true;
                 }
             }
             return false;
         }
-        function elaborateArrowFunction(node, source, target, relation) {
+        function elaborateArrowFunction(node, source, target, relation, containingMessageChain, errorOutputContainer) {
             if (ts.isBlock(node.body)) {
                 return false;
             }
@@ -34626,43 +35337,43 @@ var ts;
             var sourceReturn = getReturnTypeOfSignature(sourceSig);
             var targetReturn = getUnionType(ts.map(targetSignatures, getReturnTypeOfSignature));
             if (!checkTypeRelatedTo(sourceReturn, targetReturn, relation, undefined)) {
-                var elaborated = returnExpression && elaborateError(returnExpression, sourceReturn, targetReturn, relation, undefined);
+                var elaborated = returnExpression && elaborateError(returnExpression, sourceReturn, targetReturn, relation, undefined, containingMessageChain, errorOutputContainer);
                 if (elaborated) {
                     return elaborated;
                 }
-                var resultObj = {};
-                checkTypeRelatedTo(sourceReturn, targetReturn, relation, returnExpression, undefined, undefined, resultObj);
-                if (resultObj.error) {
+                var resultObj = errorOutputContainer || {};
+                checkTypeRelatedTo(sourceReturn, targetReturn, relation, returnExpression, undefined, containingMessageChain, resultObj);
+                if (resultObj.errors) {
                     if (target.symbol && ts.length(target.symbol.declarations)) {
-                        addRelatedInfo(resultObj.error, ts.createDiagnosticForNode(target.symbol.declarations[0], ts.Diagnostics.The_expected_type_comes_from_the_return_type_of_this_signature));
+                        ts.addRelatedInfo(resultObj.errors[resultObj.errors.length - 1], ts.createDiagnosticForNode(target.symbol.declarations[0], ts.Diagnostics.The_expected_type_comes_from_the_return_type_of_this_signature));
                     }
                     return true;
                 }
             }
             return false;
         }
-        function elaborateElementwise(iterator, source, target, relation) {
+        function elaborateElementwise(iterator, source, target, relation, containingMessageChain, errorOutputContainer) {
             var reportedError = false;
             for (var status = iterator.next(); !status.done; status = iterator.next()) {
                 var _a = status.value, prop = _a.errorNode, next = _a.innerExpression, nameType = _a.nameType, errorMessage = _a.errorMessage;
-                var targetPropType = getIndexedAccessType(target, nameType, undefined, errorType);
-                if (targetPropType === errorType || targetPropType.flags & 8388608)
+                var targetPropType = getIndexedAccessTypeOrUndefined(target, nameType);
+                if (!targetPropType || targetPropType.flags & 8388608)
                     continue;
-                var sourcePropType = getIndexedAccessType(source, nameType, undefined, errorType);
-                if (sourcePropType !== errorType && targetPropType !== errorType && !checkTypeRelatedTo(sourcePropType, targetPropType, relation, undefined)) {
-                    var elaborated = next && elaborateError(next, sourcePropType, targetPropType, relation, undefined);
+                var sourcePropType = getIndexedAccessTypeOrUndefined(source, nameType);
+                if (sourcePropType && !checkTypeRelatedTo(sourcePropType, targetPropType, relation, undefined)) {
+                    var elaborated = next && elaborateError(next, sourcePropType, targetPropType, relation, undefined, containingMessageChain, errorOutputContainer);
                     if (elaborated) {
                         reportedError = true;
                     }
                     else {
-                        var resultObj = {};
+                        var resultObj = errorOutputContainer || {};
                         var specificSource = next ? checkExpressionForMutableLocation(next, 0, sourcePropType) : sourcePropType;
-                        var result = checkTypeRelatedTo(specificSource, targetPropType, relation, prop, errorMessage, undefined, resultObj);
+                        var result = checkTypeRelatedTo(specificSource, targetPropType, relation, prop, errorMessage, containingMessageChain, resultObj);
                         if (result && specificSource !== sourcePropType) {
-                            checkTypeRelatedTo(sourcePropType, targetPropType, relation, prop, errorMessage, undefined, resultObj);
+                            checkTypeRelatedTo(sourcePropType, targetPropType, relation, prop, errorMessage, containingMessageChain, resultObj);
                         }
-                        if (resultObj.error) {
-                            var reportedDiag = resultObj.error;
+                        if (resultObj.errors) {
+                            var reportedDiag = resultObj.errors[resultObj.errors.length - 1];
                             var propertyName = isTypeUsableAsPropertyName(nameType) ? getPropertyNameFromType(nameType) : undefined;
                             var targetProp = propertyName !== undefined ? getPropertyOfType(target, propertyName) : undefined;
                             var issuedElaboration = false;
@@ -34672,13 +35383,13 @@ var ts;
                                     undefined;
                                 if (indexInfo && indexInfo.declaration && !ts.getSourceFileOfNode(indexInfo.declaration).hasNoDefaultLib) {
                                     issuedElaboration = true;
-                                    addRelatedInfo(reportedDiag, ts.createDiagnosticForNode(indexInfo.declaration, ts.Diagnostics.The_expected_type_comes_from_this_index_signature));
+                                    ts.addRelatedInfo(reportedDiag, ts.createDiagnosticForNode(indexInfo.declaration, ts.Diagnostics.The_expected_type_comes_from_this_index_signature));
                                 }
                             }
                             if (!issuedElaboration && (targetProp && ts.length(targetProp.declarations) || target.symbol && ts.length(target.symbol.declarations))) {
                                 var targetNode = targetProp && ts.length(targetProp.declarations) ? targetProp.declarations[0] : target.symbol.declarations[0];
                                 if (!ts.getSourceFileOfNode(targetNode).hasNoDefaultLib) {
-                                    addRelatedInfo(reportedDiag, ts.createDiagnosticForNode(targetNode, ts.Diagnostics.The_expected_type_comes_from_property_0_which_is_declared_here_on_type_1, propertyName && !(nameType.flags & 8192) ? ts.unescapeLeadingUnderscores(propertyName) : typeToString(nameType), typeToString(target)));
+                                    ts.addRelatedInfo(reportedDiag, ts.createDiagnosticForNode(targetNode, ts.Diagnostics.The_expected_type_comes_from_property_0_which_is_declared_here_on_type_1, propertyName && !(nameType.flags & 8192) ? ts.unescapeLeadingUnderscores(propertyName) : typeToString(nameType), typeToString(target)));
                                 }
                             }
                         }
@@ -34745,23 +35456,26 @@ var ts;
         }
         function getElaborationElementForJsxChild(child, nameType, getInvalidTextDiagnostic) {
             switch (child.kind) {
-                case 270:
+                case 271:
                     return { errorNode: child, innerExpression: child.expression, nameType: nameType };
                 case 11:
-                    if (child.containsOnlyWhiteSpaces) {
+                    if (child.containsOnlyTriviaWhiteSpaces) {
                         break;
                     }
                     return { errorNode: child, innerExpression: undefined, nameType: nameType, errorMessage: getInvalidTextDiagnostic() };
-                case 260:
                 case 261:
-                case 264:
+                case 262:
+                case 265:
                     return { errorNode: child, innerExpression: child, nameType: nameType };
                 default:
                     return ts.Debug.assertNever(child, "Found invalid jsx child");
             }
         }
-        function elaborateJsxComponents(node, source, target, relation) {
-            var result = elaborateElementwise(generateJsxAttributes(node), source, target, relation);
+        function getSemanticJsxChildren(children) {
+            return ts.filter(children, function (i) { return !ts.isJsxText(i) || !i.containsOnlyTriviaWhiteSpaces; });
+        }
+        function elaborateJsxComponents(node, source, target, relation, containingMessageChain, errorOutputContainer) {
+            var result = elaborateElementwise(generateJsxAttributes(node), source, target, relation, containingMessageChain, errorOutputContainer);
             var invalidTextDiagnostic;
             if (ts.isJsxOpeningElement(node.parent) && ts.isJsxElement(node.parent.parent)) {
                 var containingElement = node.parent.parent;
@@ -34769,7 +35483,7 @@ var ts;
                 var childrenPropName = childPropName === undefined ? "children" : ts.unescapeLeadingUnderscores(childPropName);
                 var childrenNameType = getLiteralType(childrenPropName);
                 var childrenTargetType = getIndexedAccessType(target, childrenNameType);
-                var validChildren = ts.filter(containingElement.children, function (i) { return !ts.isJsxText(i) || !i.containsOnlyWhiteSpaces; });
+                var validChildren = getSemanticJsxChildren(containingElement.children);
                 if (!ts.length(validChildren)) {
                     return result;
                 }
@@ -34779,11 +35493,15 @@ var ts;
                 if (moreThanOneRealChildren) {
                     if (arrayLikeTargetParts !== neverType) {
                         var realSource = createTupleType(checkJsxChildren(containingElement, 0));
-                        result = elaborateElementwise(generateJsxChildren(containingElement, getInvalidTextualChildDiagnostic), realSource, arrayLikeTargetParts, relation) || result;
+                        var children = generateJsxChildren(containingElement, getInvalidTextualChildDiagnostic);
+                        result = elaborateElementwise(children, realSource, arrayLikeTargetParts, relation, containingMessageChain, errorOutputContainer) || result;
                     }
                     else if (!isTypeRelatedTo(getIndexedAccessType(source, childrenNameType), childrenTargetType, relation)) {
                         result = true;
-                        error(containingElement.openingElement.tagName, ts.Diagnostics.This_JSX_tag_s_0_prop_expects_a_single_child_of_type_1_but_multiple_children_were_provided, childrenPropName, typeToString(childrenTargetType));
+                        var diag = error(containingElement.openingElement.tagName, ts.Diagnostics.This_JSX_tag_s_0_prop_expects_a_single_child_of_type_1_but_multiple_children_were_provided, childrenPropName, typeToString(childrenTargetType));
+                        if (errorOutputContainer && errorOutputContainer.skipLogging) {
+                            (errorOutputContainer.errors || (errorOutputContainer.errors = [])).push(diag);
+                        }
                     }
                 }
                 else {
@@ -34798,12 +35516,15 @@ var ts;
                                         _a.sent();
                                         return [2];
                                 }
-                            }); })(), source, target, relation) || result;
+                            }); })(), source, target, relation, containingMessageChain, errorOutputContainer) || result;
                         }
                     }
                     else if (!isTypeRelatedTo(getIndexedAccessType(source, childrenNameType), childrenTargetType, relation)) {
                         result = true;
-                        error(containingElement.openingElement.tagName, ts.Diagnostics.This_JSX_tag_s_0_prop_expects_type_1_which_requires_multiple_children_but_only_a_single_child_was_provided, childrenPropName, typeToString(childrenTargetType));
+                        var diag = error(containingElement.openingElement.tagName, ts.Diagnostics.This_JSX_tag_s_0_prop_expects_type_1_which_requires_multiple_children_but_only_a_single_child_was_provided, childrenPropName, typeToString(childrenTargetType));
+                        if (errorOutputContainer && errorOutputContainer.skipLogging) {
+                            (errorOutputContainer.errors || (errorOutputContainer.errors = [])).push(diag);
+                        }
                     }
                 }
             }
@@ -34849,13 +35570,15 @@ var ts;
                 }
             });
         }
-        function elaborateArrayLiteral(node, source, target, relation) {
+        function elaborateArrayLiteral(node, source, target, relation, containingMessageChain, errorOutputContainer) {
+            if (target.flags & 131068)
+                return false;
             if (isTupleLikeType(source)) {
-                return elaborateElementwise(generateLimitedTupleElements(node, target), source, target, relation);
+                return elaborateElementwise(generateLimitedTupleElements(node, target), source, target, relation, containingMessageChain, errorOutputContainer);
             }
             var tupleizedType = checkArrayLiteral(node, 1, true);
             if (isTupleLikeType(tupleizedType)) {
-                return elaborateElementwise(generateLimitedTupleElements(node, target), tupleizedType, target, relation);
+                return elaborateElementwise(generateLimitedTupleElements(node, target), tupleizedType, target, relation, containingMessageChain, errorOutputContainer);
             }
             return false;
         }
@@ -34879,11 +35602,11 @@ var ts;
                         }
                         _b = prop.kind;
                         switch (_b) {
+                            case 160: return [3, 2];
                             case 159: return [3, 2];
-                            case 158: return [3, 2];
-                            case 156: return [3, 2];
-                            case 276: return [3, 2];
-                            case 275: return [3, 4];
+                            case 157: return [3, 2];
+                            case 277: return [3, 2];
+                            case 276: return [3, 4];
                         }
                         return [3, 6];
                     case 2: return [4, { errorNode: prop.name, innerExpression: undefined, nameType: type }];
@@ -34904,8 +35627,10 @@ var ts;
                 }
             });
         }
-        function elaborateObjectLiteral(node, source, target, relation) {
-            return elaborateElementwise(generateObjectLiteralElements(node), source, target, relation);
+        function elaborateObjectLiteral(node, source, target, relation, containingMessageChain, errorOutputContainer) {
+            if (target.flags & 131068)
+                return false;
+            return elaborateElementwise(generateObjectLiteralElements(node), source, target, relation, containingMessageChain, errorOutputContainer);
         }
         function checkTypeComparableTo(source, target, errorNode, headMessage, containingMessageChain) {
             return checkTypeRelatedTo(source, target, comparableRelation, errorNode, headMessage, containingMessageChain);
@@ -34913,10 +35638,18 @@ var ts;
         function isSignatureAssignableTo(source, target, ignoreReturnTypes) {
             return compareSignaturesRelated(source, target, 0, ignoreReturnTypes, false, undefined, compareTypesAssignable) !== 0;
         }
+        function isAnySignature(s) {
+            return !s.typeParameters && (!s.thisParameter || isTypeAny(getTypeOfParameter(s.thisParameter))) && s.parameters.length === 1 &&
+                s.hasRestParameter && (getTypeOfParameter(s.parameters[0]) === anyArrayType || isTypeAny(getTypeOfParameter(s.parameters[0]))) &&
+                isTypeAny(getReturnTypeOfSignature(s));
+        }
         function compareSignaturesRelated(source, target, callbackCheck, ignoreReturnTypes, reportErrors, errorReporter, compareTypes) {
             if (source === target) {
                 return -1;
             }
+            if (isAnySignature(target)) {
+                return -1;
+            }
             var targetCount = getParameterCount(target);
             if (!hasEffectiveRestParameter(target) && getMinArgumentCount(source) > targetCount) {
                 return 0;
@@ -34932,8 +35665,8 @@ var ts;
                 return 0;
             }
             var kind = target.declaration ? target.declaration.kind : 0;
-            var strictVariance = !callbackCheck && strictFunctionTypes && kind !== 156 &&
-                kind !== 155 && kind !== 157;
+            var strictVariance = !callbackCheck && strictFunctionTypes && kind !== 157 &&
+                kind !== 156 && kind !== 158;
             var result = -1;
             var sourceThisType = getThisTypeOfSignature(source);
             if (sourceThisType && sourceThisType !== voidType) {
@@ -34971,18 +35704,18 @@ var ts;
                 result &= related;
             }
             if (!ignoreReturnTypes) {
-                var targetReturnType = (target.declaration && isJSConstructor(target.declaration)) ?
+                var targetReturnType = isResolvingReturnTypeOfSignature(target) ? anyType : (target.declaration && isJSConstructor(target.declaration)) ?
                     getJSClassType(target.declaration.symbol) : getReturnTypeOfSignature(target);
                 if (targetReturnType === voidType) {
                     return result;
                 }
-                var sourceReturnType = (source.declaration && isJSConstructor(source.declaration)) ?
+                var sourceReturnType = isResolvingReturnTypeOfSignature(source) ? anyType : (source.declaration && isJSConstructor(source.declaration)) ?
                     getJSClassType(source.declaration.symbol) : getReturnTypeOfSignature(source);
                 var targetTypePredicate = getTypePredicateOfSignature(target);
                 if (targetTypePredicate) {
                     var sourceTypePredicate = getTypePredicateOfSignature(source);
                     if (sourceTypePredicate) {
-                        result &= compareTypePredicateRelatedTo(sourceTypePredicate, targetTypePredicate, source.declaration, target.declaration, reportErrors, errorReporter, compareTypes);
+                        result &= compareTypePredicateRelatedTo(sourceTypePredicate, targetTypePredicate, reportErrors, errorReporter, compareTypes);
                     }
                     else if (ts.isIdentifierTypePredicate(targetTypePredicate)) {
                         if (reportErrors) {
@@ -34998,7 +35731,7 @@ var ts;
             }
             return result;
         }
-        function compareTypePredicateRelatedTo(source, target, sourceDeclaration, targetDeclaration, reportErrors, errorReporter, compareTypes) {
+        function compareTypePredicateRelatedTo(source, target, reportErrors, errorReporter, compareTypes) {
             if (source.kind !== target.kind) {
                 if (reportErrors) {
                     errorReporter(ts.Diagnostics.A_this_based_type_guard_is_not_compatible_with_a_parameter_based_type_guard);
@@ -35007,12 +35740,9 @@ var ts;
                 return 0;
             }
             if (source.kind === 1) {
-                var targetPredicate = target;
-                var sourceIndex = source.parameterIndex - (ts.getThisParameter(sourceDeclaration) ? 1 : 0);
-                var targetIndex = targetPredicate.parameterIndex - (ts.getThisParameter(targetDeclaration) ? 1 : 0);
-                if (sourceIndex !== targetIndex) {
+                if (source.parameterIndex !== target.parameterIndex) {
                     if (reportErrors) {
-                        errorReporter(ts.Diagnostics.Parameter_0_is_not_in_the_same_position_as_parameter_1, source.parameterName, targetPredicate.parameterName);
+                        errorReporter(ts.Diagnostics.Parameter_0_is_not_in_the_same_position_as_parameter_1, source.parameterName, target.parameterName);
                         errorReporter(ts.Diagnostics.Type_predicate_0_is_not_assignable_to_1, typePredicateToString(source), typePredicateToString(target));
                     }
                     return 0;
@@ -35053,6 +35783,11 @@ var ts;
         function isEmptyAnonymousObjectType(type) {
             return !!(ts.getObjectFlags(type) & 16) && isEmptyObjectType(type);
         }
+        function isStringIndexSignatureOnlyType(type) {
+            return type.flags & 524288 && !isGenericMappedType(type) && getPropertiesOfType(type).length === 0 && getIndexInfoOfType(type, 0) && !getIndexInfoOfType(type, 1) ||
+                type.flags & 3145728 && ts.every(type.types, isStringIndexSignatureOnlyType) ||
+                false;
+        }
         function isEnumTypeRelatedTo(sourceSymbol, targetSymbol, errorReporter) {
             if (sourceSymbol === targetSymbol) {
                 return true;
@@ -35158,8 +35893,8 @@ var ts;
             }
             return false;
         }
-        function isIgnoredJsxProperty(source, sourceProp, targetMemberType) {
-            return ts.getObjectFlags(source) & 4096 && !(isUnhyphenatedJsxName(sourceProp.escapedName) || targetMemberType);
+        function isIgnoredJsxProperty(source, sourceProp) {
+            return ts.getObjectFlags(source) & 4096 && !isUnhyphenatedJsxName(sourceProp.escapedName);
         }
         function checkTypeRelatedTo(source, target, relation, errorNode, headMessage, containingMessageChain, errorOutputContainer) {
             var errorInfo;
@@ -35171,17 +35906,21 @@ var ts;
             var depth = 0;
             var expandingFlags = 0;
             var overflow = false;
-            var suppressNextError = false;
+            var overrideNextErrorInfo;
             ts.Debug.assert(relation !== identityRelation || !errorNode, "no error reporting in identity checking");
             var result = isRelatedTo(source, target, !!errorNode, headMessage);
             if (overflow) {
-                error(errorNode, ts.Diagnostics.Excessive_stack_depth_comparing_types_0_and_1, typeToString(source), typeToString(target));
+                var diag = error(errorNode, ts.Diagnostics.Excessive_stack_depth_comparing_types_0_and_1, typeToString(source), typeToString(target));
+                if (errorOutputContainer) {
+                    (errorOutputContainer.errors || (errorOutputContainer.errors = [])).push(diag);
+                }
             }
             else if (errorInfo) {
                 if (containingMessageChain) {
-                    var chain_1 = containingMessageChain();
-                    if (chain_1) {
-                        errorInfo = ts.concatenateDiagnosticMessageChains(chain_1, errorInfo);
+                    var chain = containingMessageChain();
+                    if (chain) {
+                        ts.concatenateDiagnosticMessageChains(chain, errorInfo);
+                        errorInfo = chain;
                     }
                 }
                 var relatedInformation = void 0;
@@ -35197,12 +35936,17 @@ var ts;
                 }
                 var diag = ts.createDiagnosticForNodeFromMessageChain(errorNode, errorInfo, relatedInformation);
                 if (relatedInfo) {
-                    addRelatedInfo.apply(void 0, [diag].concat(relatedInfo));
+                    ts.addRelatedInfo.apply(void 0, [diag].concat(relatedInfo));
                 }
                 if (errorOutputContainer) {
-                    errorOutputContainer.error = diag;
+                    (errorOutputContainer.errors || (errorOutputContainer.errors = [])).push(diag);
                 }
-                diagnostics.add(diag);
+                if (!errorOutputContainer || !errorOutputContainer.skipLogging) {
+                    diagnostics.add(diag);
+                }
+            }
+            if (errorNode && errorOutputContainer && errorOutputContainer.skipLogging && result === 0) {
+                ts.Debug.assert(!!errorOutputContainer.errors, "missed opportunity to interact with error.");
             }
             return result !== 0;
             function reportError(message, arg0, arg1, arg2, arg3) {
@@ -35219,11 +35963,9 @@ var ts;
                 }
             }
             function reportRelationError(message, source, target) {
-                var sourceType = typeToString(source);
-                var targetType = typeToString(target);
-                if (sourceType === targetType) {
-                    sourceType = typeToString(source, undefined, 64);
-                    targetType = typeToString(target, undefined, 64);
+                var _a = getTypeNamesForErrorDisplay(source, target), sourceType = _a[0], targetType = _a[1];
+                if (target.flags & 262144 && target.immediateBaseConstraint !== undefined && isTypeAssignableTo(source, target.immediateBaseConstraint)) {
+                    reportError(ts.Diagnostics._0_is_assignable_to_the_constraint_of_type_1_but_1_could_be_instantiated_with_a_different_subtype_of_constraint_2, sourceType, targetType, typeToString(target.immediateBaseConstraint));
                 }
                 if (!message) {
                     if (relation === comparableRelation) {
@@ -35248,22 +35990,28 @@ var ts;
                     reportError(ts.Diagnostics._0_is_a_primitive_but_1_is_a_wrapper_object_Prefer_using_0_when_possible, targetType, sourceType);
                 }
             }
-            function isUnionOrIntersectionTypeWithoutNullableConstituents(type) {
-                if (!(type.flags & 3145728)) {
+            function tryElaborateArrayLikeErrors(source, target, reportErrors) {
+                if (isTupleLikeType(source)) {
+                    var sourceTuple = source.target;
+                    if (sourceTuple && sourceTuple.readonly && isArrayOrTupleLikeType(target) &&
+                        (!isReadonlyArrayType(target) || isTupleType(target) && !target.target.readonly)) {
+                        if (reportErrors) {
+                            reportError(ts.Diagnostics.The_type_0_is_readonly_and_cannot_be_assigned_to_the_mutable_type_1, typeToString(source), typeToString(target));
+                        }
+                        return false;
+                    }
+                    return isArrayLikeType(target);
+                }
+                if (isTupleLikeType(target)) {
+                    return isArrayLikeType(source);
+                }
+                if (isReadonlyArrayType(source) && isArrayType(target) && !isReadonlyArrayType(target)) {
+                    if (reportErrors) {
+                        reportError(ts.Diagnostics.The_type_0_is_readonly_and_cannot_be_assigned_to_the_mutable_type_1, typeToString(source), typeToString(target));
+                    }
                     return false;
                 }
-                var seenNonNullable = false;
-                for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
-                    var t = _a[_i];
-                    if (t.flags & 98304) {
-                        continue;
-                    }
-                    if (seenNonNullable) {
-                        return true;
-                    }
-                    seenNonNullable = true;
-                }
-                return false;
+                return true;
             }
             function isRelatedTo(source, target, reportErrors, headMessage, isApparentIntersectionConstituent) {
                 if (reportErrors === void 0) { reportErrors = false; }
@@ -35279,11 +36027,11 @@ var ts;
                 if (target.flags & 33554432) {
                     target = target.typeVariable;
                 }
-                if (source.flags & 8388608) {
-                    source = getSimplifiedType(source);
+                if (source.flags & 25165824) {
+                    source = getSimplifiedType(source, false);
                 }
-                if (target.flags & 8388608) {
-                    target = getSimplifiedType(target);
+                if (target.flags & 25165824) {
+                    target = getSimplifiedType(target, true);
                 }
                 if (target.flags & 1048576 && source.flags & 524288 &&
                     target.types.length <= 3 && maybeTypeOfKind(target, 98304)) {
@@ -35301,7 +36049,8 @@ var ts;
                     isSimpleTypeRelatedTo(source, target, relation, reportErrors ? reportError : undefined))
                     return -1;
                 var isComparingJsxAttributes = !!(ts.getObjectFlags(source) & 4096);
-                if (isObjectLiteralType(source) && ts.getObjectFlags(source) & 32768) {
+                var isPerformingExcessPropertyChecks = (isObjectLiteralType(source) && ts.getObjectFlags(source) & 32768);
+                if (isPerformingExcessPropertyChecks) {
                     var discriminantType = target.flags & 1048576 ? findMatchingDiscriminantType(source, target) : undefined;
                     if (hasExcessProperties(source, target, discriminantType, reportErrors)) {
                         if (reportErrors) {
@@ -35309,9 +36058,6 @@ var ts;
                         }
                         return 0;
                     }
-                    if (isUnionOrIntersectionTypeWithoutNullableConstituents(target) && !discriminantType) {
-                        source = getRegularTypeOfObjectLiteral(source);
-                    }
                 }
                 if (relation !== comparableRelation && !isApparentIntersectionConstituent &&
                     source.flags & (131068 | 524288 | 2097152) && source !== globalObjectType &&
@@ -35341,11 +36087,22 @@ var ts;
                 }
                 else {
                     if (target.flags & 1048576) {
-                        result = typeRelatedToSomeType(source, target, reportErrors && !(source.flags & 131068) && !(target.flags & 131068));
+                        result = typeRelatedToSomeType(getRegularTypeOfObjectLiteral(source), target, reportErrors && !(source.flags & 131068) && !(target.flags & 131068));
+                        if (result && isPerformingExcessPropertyChecks) {
+                            var discriminantType = findMatchingDiscriminantType(source, target) || filterPrimitivesIfContainsNonPrimitive(target);
+                            if (!propertiesRelatedTo(source, discriminantType, reportErrors, undefined)) {
+                                return 0;
+                            }
+                        }
                     }
                     else if (target.flags & 2097152) {
                         isIntersectionConstituent = true;
-                        result = typeRelatedToEachType(source, target, reportErrors);
+                        result = typeRelatedToEachType(getRegularTypeOfObjectLiteral(source), target, reportErrors);
+                        if (result && isPerformingExcessPropertyChecks) {
+                            if (!propertiesRelatedTo(source, target, reportErrors, undefined)) {
+                                return 0;
+                            }
+                        }
                     }
                     else if (source.flags & 2097152) {
                         result = someTypeRelatedToType(source, target, false);
@@ -35365,8 +36122,15 @@ var ts;
                     }
                 }
                 if (!result && reportErrors) {
-                    var maybeSuppress = suppressNextError;
-                    suppressNextError = false;
+                    var maybeSuppress = overrideNextErrorInfo;
+                    overrideNextErrorInfo = undefined;
+                    if (source.flags & 524288 && target.flags & 524288) {
+                        var currentError = errorInfo;
+                        tryElaborateArrayLikeErrors(source, target, reportErrors);
+                        if (errorInfo !== currentError) {
+                            maybeSuppress = errorInfo;
+                        }
+                    }
                     if (source.flags & 524288 && target.flags & 131068) {
                         tryElaborateErrorsForPrimitivesAndObjects(source, target);
                     }
@@ -35417,7 +36181,7 @@ var ts;
                     if (discriminant) {
                         return hasExcessProperties(source, discriminant, undefined, reportErrors);
                     }
-                    var _loop_7 = function (prop) {
+                    var _loop_8 = function (prop) {
                         if (shouldCheckAsExcessProperty(prop, source.symbol) && !isKnownProperty(target, prop.escapedName, isComparingJsxAttributes)) {
                             if (reportErrors) {
                                 var errorTarget = filterType(target, isExcessPropertyCheckTarget);
@@ -35449,9 +36213,9 @@ var ts;
                             return { value: true };
                         }
                     };
-                    for (var _i = 0, _a = getPropertiesOfObjectType(source); _i < _a.length; _i++) {
+                    for (var _i = 0, _a = getPropertiesOfType(source); _i < _a.length; _i++) {
                         var prop = _a[_i];
-                        var state_3 = _loop_7(prop);
+                        var state_3 = _loop_8(prop);
                         if (typeof state_3 === "object")
                             return state_3.value;
                     }
@@ -35550,9 +36314,18 @@ var ts;
                 }
                 return bestMatch;
             }
+            function filterPrimitivesIfContainsNonPrimitive(type) {
+                if (maybeTypeOfKind(type, 67108864)) {
+                    var result_3 = filterType(type, function (t) { return !(t.flags & 131068); });
+                    if (!(result_3.flags & 131072)) {
+                        return result_3;
+                    }
+                }
+                return type;
+            }
             function findMatchingDiscriminantType(source, target) {
-                if (target.flags & 1048576) {
-                    var sourceProperties = getPropertiesOfObjectType(source);
+                if (target.flags & 1048576 && source.flags & (2097152 | 524288)) {
+                    var sourceProperties = getPropertiesOfType(source);
                     if (sourceProperties) {
                         var sourcePropertiesFiltered = findDiscriminantProperties(sourceProperties, target);
                         if (sourcePropertiesFiltered) {
@@ -35612,12 +36385,16 @@ var ts;
                 var length = sources.length <= targets.length ? sources.length : targets.length;
                 var result = -1;
                 for (var i = 0; i < length; i++) {
-                    var variance = i < variances.length ? variances[i] : 1;
+                    var varianceFlags = i < variances.length ? variances[i] : 1;
+                    var variance = varianceFlags & 7;
                     if (variance !== 4) {
                         var s = sources[i];
                         var t = targets[i];
                         var related = -1;
-                        if (variance === 1) {
+                        if (varianceFlags & 8) {
+                            related = relation === identityRelation ? isRelatedTo(s, t, false) : compareTypesIdentical(s, t);
+                        }
+                        else if (variance === 1) {
                             related = isRelatedTo(s, t, reportErrors);
                         }
                         else if (variance === 2) {
@@ -35643,6 +36420,17 @@ var ts;
                 }
                 return result;
             }
+            function propagateSidebandVarianceFlags(typeArguments, variances) {
+                for (var i = 0; i < variances.length; i++) {
+                    var v = variances[i];
+                    if (v & 8) {
+                        instantiateType(typeArguments[i], reportUnmeasurableMarkers);
+                    }
+                    if (v & 16) {
+                        instantiateType(typeArguments[i], reportUnreliableMarkers);
+                    }
+                }
+            }
             function recursiveTypeRelatedTo(source, target, reportErrors, isIntersectionConstituent) {
                 if (overflow) {
                     return 0;
@@ -35653,6 +36441,15 @@ var ts;
                     if (reportErrors && related === 2) {
                     }
                     else {
+                        if (outofbandVarianceMarkerHandler) {
+                            if (source.flags & (524288 | 16777216) && source.aliasSymbol &&
+                                source.aliasTypeArguments && source.aliasSymbol === target.aliasSymbol) {
+                                propagateSidebandVarianceFlags(source.aliasTypeArguments, getAliasVariances(source.aliasSymbol));
+                            }
+                            if (ts.getObjectFlags(source) & 4 && ts.getObjectFlags(target) & 4 && source.target === target.target && ts.length(source.typeArguments)) {
+                                propagateSidebandVarianceFlags(source.typeArguments, getVariances(source.target));
+                            }
+                        }
                         return related === 1 ? -1 : 0;
                     }
                 }
@@ -35706,21 +36503,21 @@ var ts;
                     if (flags & 4194304) {
                         return isRelatedTo(source.type, target.type, false);
                     }
-                    var result_3 = 0;
+                    var result_4 = 0;
                     if (flags & 8388608) {
-                        if (result_3 = isRelatedTo(source.objectType, target.objectType, false)) {
-                            if (result_3 &= isRelatedTo(source.indexType, target.indexType, false)) {
-                                return result_3;
+                        if (result_4 = isRelatedTo(source.objectType, target.objectType, false)) {
+                            if (result_4 &= isRelatedTo(source.indexType, target.indexType, false)) {
+                                return result_4;
                             }
                         }
                     }
                     if (flags & 16777216) {
                         if (source.root.isDistributive === target.root.isDistributive) {
-                            if (result_3 = isRelatedTo(source.checkType, target.checkType, false)) {
-                                if (result_3 &= isRelatedTo(source.extendsType, target.extendsType, false)) {
-                                    if (result_3 &= isRelatedTo(getTrueTypeFromConditionalType(source), getTrueTypeFromConditionalType(target), false)) {
-                                        if (result_3 &= isRelatedTo(getFalseTypeFromConditionalType(source), getFalseTypeFromConditionalType(target), false)) {
-                                            return result_3;
+                            if (result_4 = isRelatedTo(source.checkType, target.checkType, false)) {
+                                if (result_4 &= isRelatedTo(source.extendsType, target.extendsType, false)) {
+                                    if (result_4 &= isRelatedTo(getTrueTypeFromConditionalType(source), getTrueTypeFromConditionalType(target), false)) {
+                                        if (result_4 &= isRelatedTo(getFalseTypeFromConditionalType(source), getFalseTypeFromConditionalType(target), false)) {
+                                            return result_4;
                                         }
                                     }
                                 }
@@ -35762,8 +36559,7 @@ var ts;
                             return result;
                         }
                     }
-                    var simplified = getSimplifiedType(target.type);
-                    var constraint = simplified !== target.type ? simplified : getConstraintOfType(target.type);
+                    var constraint = getSimplifiedTypeOrConstraint(target.type);
                     if (constraint) {
                         if (isRelatedTo(source, getIndexType(constraint, target.stringsOnly), reportErrors) === -1) {
                             return -1;
@@ -35771,11 +36567,15 @@ var ts;
                     }
                 }
                 else if (target.flags & 8388608) {
-                    if (relation !== identityRelation &&
-                        !(isGenericObjectType(target.objectType) && isGenericIndexType(target.indexType))) {
-                        var constraint = getBaseConstraintOfType(target);
-                        if (constraint && constraint !== target) {
-                            if (result = isRelatedTo(source, constraint, reportErrors)) {
+                    if (relation !== identityRelation) {
+                        var objectType = target.objectType;
+                        var indexType = target.indexType;
+                        var baseObjectType = getBaseConstraintOfType(objectType) || objectType;
+                        var baseIndexType = getBaseConstraintOfType(indexType) || indexType;
+                        if (!isGenericObjectType(baseObjectType) && !isGenericIndexType(baseIndexType)) {
+                            var accessFlags = 2 | (baseObjectType !== objectType ? 1 : 0);
+                            var constraint = getIndexedAccessTypeOrUndefined(baseObjectType, baseIndexType, undefined, accessFlags);
+                            if (constraint && (result = isRelatedTo(source, constraint, reportErrors))) {
                                 return result;
                             }
                         }
@@ -35791,13 +36591,14 @@ var ts;
                         }
                         if (!isGenericMappedType(source)) {
                             var targetConstraint = getConstraintTypeFromMappedType(target);
-                            var sourceKeys_1 = getIndexType(source);
-                            var hasOptionalUnionKeys = modifiers & 4 && targetConstraint.flags & 1048576;
-                            var filteredByApplicability = hasOptionalUnionKeys ? filterType(targetConstraint, function (t) { return !!isRelatedTo(t, sourceKeys_1); }) : undefined;
-                            if (hasOptionalUnionKeys
+                            var sourceKeys = getIndexType(source, undefined, true);
+                            var includeOptional = modifiers & 4;
+                            var filteredByApplicability = includeOptional ? intersectTypes(targetConstraint, sourceKeys) : undefined;
+                            if (includeOptional
                                 ? !(filteredByApplicability.flags & 131072)
-                                : isRelatedTo(targetConstraint, sourceKeys_1)) {
-                                var indexingType = hasOptionalUnionKeys ? filteredByApplicability : getTypeParameterFromMappedType(target);
+                                : isRelatedTo(targetConstraint, sourceKeys)) {
+                                var typeParameter = getTypeParameterFromMappedType(target);
+                                var indexingType = filteredByApplicability ? getIntersectionType([filteredByApplicability, typeParameter]) : typeParameter;
                                 var indexedAccessType = getIndexedAccessType(source, indexingType);
                                 var templateType = getTemplateTypeFromMappedType(target);
                                 if (result = isRelatedTo(indexedAccessType, templateType, reportErrors)) {
@@ -35819,20 +36620,22 @@ var ts;
                             return result;
                         }
                     }
-                    var constraint = getConstraintOfType(source);
-                    if (!constraint || (source.flags & 262144 && constraint.flags & 1)) {
-                        if (result = isRelatedTo(emptyObjectType, extractTypesOfKind(target, ~67108864))) {
+                    else {
+                        var constraint = getConstraintOfType(source);
+                        if (!constraint || (source.flags & 262144 && constraint.flags & 1)) {
+                            if (result = isRelatedTo(emptyObjectType, extractTypesOfKind(target, ~67108864))) {
+                                errorInfo = saveErrorInfo;
+                                return result;
+                            }
+                        }
+                        else if (result = isRelatedTo(constraint, target, false, undefined, isIntersectionConstituent)) {
+                            errorInfo = saveErrorInfo;
+                            return result;
+                        }
+                        else if (result = isRelatedTo(getTypeWithThisArgument(constraint, source), target, reportErrors, undefined, isIntersectionConstituent)) {
                             errorInfo = saveErrorInfo;
                             return result;
                         }
-                    }
-                    else if (result = isRelatedTo(constraint, target, false, undefined, isIntersectionConstituent)) {
-                        errorInfo = saveErrorInfo;
-                        return result;
-                    }
-                    else if (result = isRelatedTo(getTypeWithThisArgument(constraint, source), target, reportErrors, undefined, isIntersectionConstituent)) {
-                        errorInfo = saveErrorInfo;
-                        return result;
                     }
                 }
                 else if (source.flags & 4194304) {
@@ -35888,6 +36691,9 @@ var ts;
                     if (relation !== identityRelation) {
                         source = getApparentType(source);
                     }
+                    else if (isGenericMappedType(source)) {
+                        return 0;
+                    }
                     if (ts.getObjectFlags(source) & 4 && ts.getObjectFlags(target) & 4 && source.target === target.target &&
                         !(ts.getObjectFlags(source) & 8192 || ts.getObjectFlags(target) & 8192)) {
                         var variances = getVariances(source.target);
@@ -35897,14 +36703,19 @@ var ts;
                         }
                     }
                     else if (isReadonlyArrayType(target) ? isArrayType(source) || isTupleType(source) : isArrayType(target) && isTupleType(source) && !source.target.readonly) {
-                        return isRelatedTo(getIndexTypeOfType(source, 1) || anyType, getIndexTypeOfType(target, 1) || anyType, reportErrors);
+                        if (relation !== identityRelation) {
+                            return isRelatedTo(getIndexTypeOfType(source, 1) || anyType, getIndexTypeOfType(target, 1) || anyType, reportErrors);
+                        }
+                        else {
+                            return 0;
+                        }
                     }
                     else if (relation === subtypeRelation && isEmptyObjectType(target) && ts.getObjectFlags(target) & 32768 && !isEmptyObjectType(source)) {
                         return 0;
                     }
                     if (source.flags & (524288 | 2097152) && target.flags & 524288) {
                         var reportStructuralErrors = reportErrors && errorInfo === saveErrorInfo && !sourceIsPrimitive;
-                        result = propertiesRelatedTo(source, target, reportStructuralErrors);
+                        result = propertiesRelatedTo(source, target, reportStructuralErrors, undefined);
                         if (result) {
                             result &= signaturesRelatedTo(source, target, 0, reportStructuralErrors);
                             if (result) {
@@ -35924,22 +36735,30 @@ var ts;
                             return result;
                         }
                     }
+                    if (source.flags & (524288 | 2097152) && target.flags & 1048576) {
+                        var objectOnlyTarget = extractTypesOfKind(target, 524288);
+                        if (objectOnlyTarget.flags & 1048576) {
+                            var result_5 = typeRelatedToDiscriminatedType(source, objectOnlyTarget);
+                            if (result_5) {
+                                return result_5;
+                            }
+                        }
+                    }
                 }
                 return 0;
-                function isNonGeneric(type) {
-                    if (relation === identityRelation) {
-                        return isRelatedTo(type, getPermissiveInstantiation(type)) === -1;
-                    }
-                    return isTypeIdenticalTo(type, getPermissiveInstantiation(type));
-                }
                 function relateVariances(sourceTypeArguments, targetTypeArguments, variances) {
                     if (result = typeArgumentsRelatedTo(sourceTypeArguments, targetTypeArguments, variances, reportErrors)) {
                         return result;
                     }
-                    var allowStructuralFallback = (targetTypeArguments && hasCovariantVoidArgument(targetTypeArguments, variances)) || isNonGeneric(source) || isNonGeneric(target);
+                    if (ts.some(variances, function (v) { return !!(v & 24); })) {
+                        originalErrorInfo = undefined;
+                        errorInfo = saveErrorInfo;
+                        return undefined;
+                    }
+                    var allowStructuralFallback = targetTypeArguments && hasCovariantVoidArgument(targetTypeArguments, variances);
                     varianceCheckFailed = !allowStructuralFallback;
                     if (variances !== ts.emptyArray && !allowStructuralFallback) {
-                        if (varianceCheckFailed && !(reportErrors && ts.some(variances, function (v) { return v === 0; }))) {
+                        if (varianceCheckFailed && !(reportErrors && ts.some(variances, function (v) { return (v & 7) === 0; }))) {
                             return 0;
                         }
                         originalErrorInfo = errorInfo;
@@ -35947,49 +36766,259 @@ var ts;
                     }
                 }
             }
+            function reportUnmeasurableMarkers(p) {
+                if (outofbandVarianceMarkerHandler && (p === markerSuperType || p === markerSubType || p === markerOtherType)) {
+                    outofbandVarianceMarkerHandler(false);
+                }
+                return p;
+            }
+            function reportUnreliableMarkers(p) {
+                if (outofbandVarianceMarkerHandler && (p === markerSuperType || p === markerSubType || p === markerOtherType)) {
+                    outofbandVarianceMarkerHandler(true);
+                }
+                return p;
+            }
             function mappedTypeRelatedTo(source, target, reportErrors) {
                 var modifiersRelated = relation === comparableRelation || (relation === identityRelation ? getMappedTypeModifiers(source) === getMappedTypeModifiers(target) :
                     getCombinedMappedTypeOptionality(source) <= getCombinedMappedTypeOptionality(target));
                 if (modifiersRelated) {
-                    var result_4;
-                    if (result_4 = isRelatedTo(getConstraintTypeFromMappedType(target), getConstraintTypeFromMappedType(source), reportErrors)) {
+                    var result_6;
+                    var targetConstraint = getConstraintTypeFromMappedType(target);
+                    var sourceConstraint = instantiateType(getConstraintTypeFromMappedType(source), getCombinedMappedTypeOptionality(source) < 0 ? reportUnmeasurableMarkers : reportUnreliableMarkers);
+                    if (result_6 = isRelatedTo(targetConstraint, sourceConstraint, reportErrors)) {
                         var mapper = createTypeMapper([getTypeParameterFromMappedType(source)], [getTypeParameterFromMappedType(target)]);
-                        return result_4 & isRelatedTo(instantiateType(getTemplateTypeFromMappedType(source), mapper), getTemplateTypeFromMappedType(target), reportErrors);
+                        return result_6 & isRelatedTo(instantiateType(getTemplateTypeFromMappedType(source), mapper), getTemplateTypeFromMappedType(target), reportErrors);
                     }
                 }
                 return 0;
             }
-            function propertiesRelatedTo(source, target, reportErrors) {
+            function typeRelatedToDiscriminatedType(source, target) {
+                var sourceProperties = getPropertiesOfObjectType(source);
+                var sourcePropertiesFiltered = findDiscriminantProperties(sourceProperties, target);
+                if (!sourcePropertiesFiltered)
+                    return 0;
+                var numCombinations = 1;
+                for (var _i = 0, sourcePropertiesFiltered_1 = sourcePropertiesFiltered; _i < sourcePropertiesFiltered_1.length; _i++) {
+                    var sourceProperty = sourcePropertiesFiltered_1[_i];
+                    numCombinations *= countTypes(getTypeOfSymbol(sourceProperty));
+                    if (numCombinations > 25) {
+                        return 0;
+                    }
+                }
+                var sourceDiscriminantTypes = new Array(sourcePropertiesFiltered.length);
+                var excludedProperties = ts.createUnderscoreEscapedMap();
+                for (var i = 0; i < sourcePropertiesFiltered.length; i++) {
+                    var sourceProperty = sourcePropertiesFiltered[i];
+                    var sourcePropertyType = getTypeOfSymbol(sourceProperty);
+                    sourceDiscriminantTypes[i] = sourcePropertyType.flags & 1048576
+                        ? sourcePropertyType.types
+                        : [sourcePropertyType];
+                    excludedProperties.set(sourceProperty.escapedName, true);
+                }
+                var discriminantCombinations = ts.cartesianProduct(sourceDiscriminantTypes);
+                var matchingTypes = [];
+                var _loop_9 = function (combination) {
+                    var hasMatch = false;
+                    outer: for (var _i = 0, _a = target.types; _i < _a.length; _i++) {
+                        var type = _a[_i];
+                        var _loop_10 = function (i) {
+                            var sourceProperty = sourcePropertiesFiltered[i];
+                            var targetProperty = getPropertyOfObjectType(type, sourceProperty.escapedName);
+                            if (!targetProperty)
+                                return "continue-outer";
+                            if (sourceProperty === targetProperty)
+                                return "continue";
+                            var related = propertyRelatedTo(source, target, sourceProperty, targetProperty, function (_) { return combination[i]; }, false);
+                            if (!related) {
+                                return "continue-outer";
+                            }
+                        };
+                        for (var i = 0; i < sourcePropertiesFiltered.length; i++) {
+                            var state_5 = _loop_10(i);
+                            switch (state_5) {
+                                case "continue-outer": continue outer;
+                            }
+                        }
+                        ts.pushIfUnique(matchingTypes, type, ts.equateValues);
+                        hasMatch = true;
+                    }
+                    if (!hasMatch) {
+                        return { value: 0 };
+                    }
+                };
+                for (var _a = 0, discriminantCombinations_1 = discriminantCombinations; _a < discriminantCombinations_1.length; _a++) {
+                    var combination = discriminantCombinations_1[_a];
+                    var state_4 = _loop_9(combination);
+                    if (typeof state_4 === "object")
+                        return state_4.value;
+                }
+                var result = -1;
+                for (var _b = 0, matchingTypes_1 = matchingTypes; _b < matchingTypes_1.length; _b++) {
+                    var type = matchingTypes_1[_b];
+                    result &= propertiesRelatedTo(source, type, false, excludedProperties);
+                    if (result) {
+                        result &= signaturesRelatedTo(source, type, 0, false);
+                        if (result) {
+                            result &= signaturesRelatedTo(source, type, 1, false);
+                            if (result) {
+                                result &= indexTypesRelatedTo(source, type, 0, false, false);
+                                if (result) {
+                                    result &= indexTypesRelatedTo(source, type, 1, false, false);
+                                }
+                            }
+                        }
+                    }
+                    if (!result) {
+                        return result;
+                    }
+                }
+                return result;
+            }
+            function excludeProperties(properties, excludedProperties) {
+                if (!excludedProperties || properties.length === 0)
+                    return properties;
+                var result;
+                for (var i = 0; i < properties.length; i++) {
+                    if (!excludedProperties.has(properties[i].escapedName)) {
+                        if (result) {
+                            result.push(properties[i]);
+                        }
+                    }
+                    else if (!result) {
+                        result = properties.slice(0, i);
+                    }
+                }
+                return result || properties;
+            }
+            function isPropertySymbolTypeRelated(sourceProp, targetProp, getTypeOfSourceProperty, reportErrors) {
+                var targetIsOptional = strictNullChecks && !!(ts.getCheckFlags(targetProp) & 48);
+                var source = getTypeOfSourceProperty(sourceProp);
+                if (ts.getCheckFlags(targetProp) & 65536 && !getSymbolLinks(targetProp).type) {
+                    var links = getSymbolLinks(targetProp);
+                    ts.Debug.assertDefined(links.deferralParent);
+                    ts.Debug.assertDefined(links.deferralConstituents);
+                    var unionParent = !!(links.deferralParent.flags & 1048576);
+                    var result_7 = unionParent ? 0 : -1;
+                    var targetTypes = links.deferralConstituents;
+                    for (var _i = 0, targetTypes_3 = targetTypes; _i < targetTypes_3.length; _i++) {
+                        var targetType = targetTypes_3[_i];
+                        var related = isRelatedTo(source, targetType, false, undefined, !unionParent);
+                        if (!unionParent) {
+                            if (!related) {
+                                return isRelatedTo(source, addOptionality(getTypeOfSymbol(targetProp), targetIsOptional), reportErrors);
+                            }
+                            result_7 &= related;
+                        }
+                        else {
+                            if (related) {
+                                return related;
+                            }
+                        }
+                    }
+                    if (unionParent && !result_7 && targetIsOptional) {
+                        result_7 = isRelatedTo(source, undefinedType);
+                    }
+                    if (unionParent && !result_7 && reportErrors) {
+                        return isRelatedTo(source, addOptionality(getTypeOfSymbol(targetProp), targetIsOptional), reportErrors);
+                    }
+                    return result_7;
+                }
+                else {
+                    return isRelatedTo(source, addOptionality(getTypeOfSymbol(targetProp), targetIsOptional), reportErrors);
+                }
+            }
+            function propertyRelatedTo(source, target, sourceProp, targetProp, getTypeOfSourceProperty, reportErrors) {
+                var sourcePropFlags = ts.getDeclarationModifierFlagsFromSymbol(sourceProp);
+                var targetPropFlags = ts.getDeclarationModifierFlagsFromSymbol(targetProp);
+                if (sourcePropFlags & 8 || targetPropFlags & 8) {
+                    var hasDifferingDeclarations = sourceProp.valueDeclaration !== targetProp.valueDeclaration;
+                    if (ts.getCheckFlags(sourceProp) & 1024 && hasDifferingDeclarations) {
+                        if (reportErrors) {
+                            reportError(ts.Diagnostics.Property_0_has_conflicting_declarations_and_is_inaccessible_in_type_1, symbolToString(sourceProp), typeToString(source));
+                        }
+                        return 0;
+                    }
+                    if (hasDifferingDeclarations) {
+                        if (reportErrors) {
+                            if (sourcePropFlags & 8 && targetPropFlags & 8) {
+                                reportError(ts.Diagnostics.Types_have_separate_declarations_of_a_private_property_0, symbolToString(targetProp));
+                            }
+                            else {
+                                reportError(ts.Diagnostics.Property_0_is_private_in_type_1_but_not_in_type_2, symbolToString(targetProp), typeToString(sourcePropFlags & 8 ? source : target), typeToString(sourcePropFlags & 8 ? target : source));
+                            }
+                        }
+                        return 0;
+                    }
+                }
+                else if (targetPropFlags & 16) {
+                    if (!isValidOverrideOf(sourceProp, targetProp)) {
+                        if (reportErrors) {
+                            reportError(ts.Diagnostics.Property_0_is_protected_but_type_1_is_not_a_class_derived_from_2, symbolToString(targetProp), typeToString(getDeclaringClass(sourceProp) || source), typeToString(getDeclaringClass(targetProp) || target));
+                        }
+                        return 0;
+                    }
+                }
+                else if (sourcePropFlags & 16) {
+                    if (reportErrors) {
+                        reportError(ts.Diagnostics.Property_0_is_protected_in_type_1_but_public_in_type_2, symbolToString(targetProp), typeToString(source), typeToString(target));
+                    }
+                    return 0;
+                }
+                var related = isPropertySymbolTypeRelated(sourceProp, targetProp, getTypeOfSourceProperty, reportErrors);
+                if (!related) {
+                    if (reportErrors) {
+                        reportError(ts.Diagnostics.Types_of_property_0_are_incompatible, symbolToString(targetProp));
+                    }
+                    return 0;
+                }
+                if (relation !== comparableRelation && sourceProp.flags & 16777216 && !(targetProp.flags & 16777216)) {
+                    if (reportErrors) {
+                        reportError(ts.Diagnostics.Property_0_is_optional_in_type_1_but_required_in_type_2, symbolToString(targetProp), typeToString(source), typeToString(target));
+                    }
+                    return 0;
+                }
+                return related;
+            }
+            function propertiesRelatedTo(source, target, reportErrors, excludedProperties) {
                 if (relation === identityRelation) {
-                    return propertiesIdenticalTo(source, target);
+                    return propertiesIdenticalTo(source, target, excludedProperties);
                 }
                 var requireOptionalProperties = relation === subtypeRelation && !isObjectLiteralType(source) && !isEmptyArrayLiteralType(source) && !isTupleType(source);
                 var unmatchedProperty = getUnmatchedProperty(source, target, requireOptionalProperties, false);
                 if (unmatchedProperty) {
                     if (reportErrors) {
                         var props = ts.arrayFrom(getUnmatchedProperties(source, target, requireOptionalProperties, false));
+                        var shouldSkipElaboration = false;
                         if (!headMessage || (headMessage.code !== ts.Diagnostics.Class_0_incorrectly_implements_interface_1.code &&
                             headMessage.code !== ts.Diagnostics.Class_0_incorrectly_implements_class_1_Did_you_mean_to_extend_1_and_inherit_its_members_as_a_subclass.code)) {
-                            suppressNextError = true;
+                            shouldSkipElaboration = true;
                         }
                         if (props.length === 1) {
                             var propName = symbolToString(unmatchedProperty);
-                            reportError(ts.Diagnostics.Property_0_is_missing_in_type_1_but_required_in_type_2, propName, typeToString(source), typeToString(target));
+                            reportError.apply(void 0, [ts.Diagnostics.Property_0_is_missing_in_type_1_but_required_in_type_2, propName].concat(getTypeNamesForErrorDisplay(source, target)));
                             if (ts.length(unmatchedProperty.declarations)) {
                                 associateRelatedInfo(ts.createDiagnosticForNode(unmatchedProperty.declarations[0], ts.Diagnostics._0_is_declared_here, propName));
                             }
+                            if (shouldSkipElaboration) {
+                                overrideNextErrorInfo = errorInfo;
+                            }
                         }
-                        else if (props.length > 5) {
-                            reportError(ts.Diagnostics.Type_0_is_missing_the_following_properties_from_type_1_Colon_2_and_3_more, typeToString(source), typeToString(target), ts.map(props.slice(0, 4), function (p) { return symbolToString(p); }).join(", "), props.length - 4);
-                        }
-                        else {
-                            reportError(ts.Diagnostics.Type_0_is_missing_the_following_properties_from_type_1_Colon_2, typeToString(source), typeToString(target), ts.map(props, function (p) { return symbolToString(p); }).join(", "));
+                        else if (tryElaborateArrayLikeErrors(source, target, false)) {
+                            if (props.length > 5) {
+                                reportError(ts.Diagnostics.Type_0_is_missing_the_following_properties_from_type_1_Colon_2_and_3_more, typeToString(source), typeToString(target), ts.map(props.slice(0, 4), function (p) { return symbolToString(p); }).join(", "), props.length - 4);
+                            }
+                            else {
+                                reportError(ts.Diagnostics.Type_0_is_missing_the_following_properties_from_type_1_Colon_2, typeToString(source), typeToString(target), ts.map(props, function (p) { return symbolToString(p); }).join(", "));
+                            }
+                            if (shouldSkipElaboration) {
+                                overrideNextErrorInfo = errorInfo;
+                            }
                         }
                     }
                     return 0;
                 }
                 if (isObjectLiteralType(target)) {
-                    for (var _i = 0, _a = getPropertiesOfType(source); _i < _a.length; _i++) {
+                    for (var _i = 0, _a = excludeProperties(getPropertiesOfType(source), excludedProperties); _i < _a.length; _i++) {
                         var sourceProp = _a[_i];
                         if (!getPropertyOfObjectType(target, sourceProp.escapedName)) {
                             var sourceType = getTypeOfSymbol(sourceProp);
@@ -36030,76 +37059,28 @@ var ts;
                         }
                     }
                 }
-                var properties = getPropertiesOfObjectType(target);
-                for (var _b = 0, properties_2 = properties; _b < properties_2.length; _b++) {
-                    var targetProp = properties_2[_b];
+                var properties = target.flags & 1048576 ? getPossiblePropertiesOfUnionType(target) : getPropertiesOfType(target);
+                for (var _b = 0, _c = excludeProperties(properties, excludedProperties); _b < _c.length; _b++) {
+                    var targetProp = _c[_b];
                     if (!(targetProp.flags & 4194304)) {
                         var sourceProp = getPropertyOfType(source, targetProp.escapedName);
                         if (sourceProp && sourceProp !== targetProp) {
-                            if (isIgnoredJsxProperty(source, sourceProp, getTypeOfSymbol(targetProp))) {
-                                continue;
-                            }
-                            var sourcePropFlags = ts.getDeclarationModifierFlagsFromSymbol(sourceProp);
-                            var targetPropFlags = ts.getDeclarationModifierFlagsFromSymbol(targetProp);
-                            if (sourcePropFlags & 8 || targetPropFlags & 8) {
-                                var hasDifferingDeclarations = sourceProp.valueDeclaration !== targetProp.valueDeclaration;
-                                if (ts.getCheckFlags(sourceProp) & 512 && hasDifferingDeclarations) {
-                                    if (reportErrors) {
-                                        reportError(ts.Diagnostics.Property_0_has_conflicting_declarations_and_is_inaccessible_in_type_1, symbolToString(sourceProp), typeToString(source));
-                                    }
-                                    return 0;
-                                }
-                                if (hasDifferingDeclarations) {
-                                    if (reportErrors) {
-                                        if (sourcePropFlags & 8 && targetPropFlags & 8) {
-                                            reportError(ts.Diagnostics.Types_have_separate_declarations_of_a_private_property_0, symbolToString(targetProp));
-                                        }
-                                        else {
-                                            reportError(ts.Diagnostics.Property_0_is_private_in_type_1_but_not_in_type_2, symbolToString(targetProp), typeToString(sourcePropFlags & 8 ? source : target), typeToString(sourcePropFlags & 8 ? target : source));
-                                        }
-                                    }
-                                    return 0;
-                                }
-                            }
-                            else if (targetPropFlags & 16) {
-                                if (!isValidOverrideOf(sourceProp, targetProp)) {
-                                    if (reportErrors) {
-                                        reportError(ts.Diagnostics.Property_0_is_protected_but_type_1_is_not_a_class_derived_from_2, symbolToString(targetProp), typeToString(getDeclaringClass(sourceProp) || source), typeToString(getDeclaringClass(targetProp) || target));
-                                    }
-                                    return 0;
-                                }
-                            }
-                            else if (sourcePropFlags & 16) {
-                                if (reportErrors) {
-                                    reportError(ts.Diagnostics.Property_0_is_protected_in_type_1_but_public_in_type_2, symbolToString(targetProp), typeToString(source), typeToString(target));
-                                }
-                                return 0;
-                            }
-                            var related = isRelatedTo(getTypeOfSymbol(sourceProp), getTypeOfSymbol(targetProp), reportErrors);
+                            var related = propertyRelatedTo(source, target, sourceProp, targetProp, getTypeOfSymbol, reportErrors);
                             if (!related) {
-                                if (reportErrors) {
-                                    reportError(ts.Diagnostics.Types_of_property_0_are_incompatible, symbolToString(targetProp));
-                                }
                                 return 0;
                             }
                             result &= related;
-                            if (relation !== comparableRelation && sourceProp.flags & 16777216 && !(targetProp.flags & 16777216)) {
-                                if (reportErrors) {
-                                    reportError(ts.Diagnostics.Property_0_is_optional_in_type_1_but_required_in_type_2, symbolToString(targetProp), typeToString(source), typeToString(target));
-                                }
-                                return 0;
-                            }
                         }
                     }
                 }
                 return result;
             }
-            function propertiesIdenticalTo(source, target) {
+            function propertiesIdenticalTo(source, target, excludedProperties) {
                 if (!(source.flags & 524288 && target.flags & 524288)) {
                     return 0;
                 }
-                var sourceProperties = getPropertiesOfObjectType(source);
-                var targetProperties = getPropertiesOfObjectType(target);
+                var sourceProperties = excludeProperties(getPropertiesOfObjectType(source), excludedProperties);
+                var targetProperties = excludeProperties(getPropertiesOfObjectType(target), excludedProperties);
                 if (sourceProperties.length !== targetProperties.length) {
                     return 0;
                 }
@@ -36202,7 +37183,7 @@ var ts;
                 var result = -1;
                 for (var _i = 0, _a = getPropertiesOfObjectType(source); _i < _a.length; _i++) {
                     var prop = _a[_i];
-                    if (isIgnoredJsxProperty(source, prop, undefined)) {
+                    if (isIgnoredJsxProperty(source, prop)) {
                         continue;
                     }
                     if (prop.nameType && prop.nameType.flags & 8192) {
@@ -36233,7 +37214,7 @@ var ts;
                     return indexTypesIdenticalTo(source, target, kind);
                 }
                 var targetInfo = getIndexInfoOfType(target, kind);
-                if (!targetInfo || targetInfo.type.flags & 3 && !sourceIsPrimitive) {
+                if (!targetInfo || targetInfo.type.flags & 1 && !sourceIsPrimitive) {
                     return -1;
                 }
                 var sourceInfo = getIndexInfoOfType(source, kind) ||
@@ -36354,8 +37335,11 @@ var ts;
             if (!variances) {
                 cache.variances = ts.emptyArray;
                 variances = [];
-                for (var _i = 0, typeParameters_1 = typeParameters; _i < typeParameters_1.length; _i++) {
-                    var tp = typeParameters_1[_i];
+                var _loop_11 = function (tp) {
+                    var unmeasurable = false;
+                    var unreliable = false;
+                    var oldHandler = outofbandVarianceMarkerHandler;
+                    outofbandVarianceMarkerHandler = function (onlyUnreliable) { return onlyUnreliable ? unreliable = true : unmeasurable = true; };
                     var typeWithSuper = createMarkerType(cache, tp, markerSuperType);
                     var typeWithSub = createMarkerType(cache, tp, markerSubType);
                     var variance = (isTypeAssignableTo(typeWithSub, typeWithSuper) ? 1 : 0) |
@@ -36363,7 +37347,20 @@ var ts;
                     if (variance === 3 && isTypeAssignableTo(createMarkerType(cache, tp, markerOtherType), typeWithSuper)) {
                         variance = 4;
                     }
+                    outofbandVarianceMarkerHandler = oldHandler;
+                    if (unmeasurable || unreliable) {
+                        if (unmeasurable) {
+                            variance |= 8;
+                        }
+                        if (unreliable) {
+                            variance |= 16;
+                        }
+                    }
                     variances.push(variance);
+                };
+                for (var _i = 0, typeParameters_1 = typeParameters; _i < typeParameters_1.length; _i++) {
+                    var tp = typeParameters_1[_i];
+                    _loop_11(tp);
                 }
                 cache.variances = variances;
             }
@@ -36377,7 +37374,7 @@ var ts;
         }
         function hasCovariantVoidArgument(typeArguments, variances) {
             for (var i = 0; i < variances.length; i++) {
-                if (variances[i] === 1 && typeArguments[i].flags & 16384) {
+                if ((variances[i] & 7) === 1 && typeArguments[i].flags & 16384) {
                     return true;
                 }
             }
@@ -36525,8 +37522,18 @@ var ts;
             if (ts.length(source.typeParameters) !== ts.length(target.typeParameters)) {
                 return 0;
             }
-            source = getErasedSignature(source);
-            target = getErasedSignature(target);
+            if (target.typeParameters) {
+                var mapper = createTypeMapper(source.typeParameters, target.typeParameters);
+                for (var i = 0; i < target.typeParameters.length; i++) {
+                    var s = source.typeParameters[i];
+                    var t = target.typeParameters[i];
+                    if (!(s === t || compareTypes(instantiateType(getConstraintFromTypeParameter(s), mapper) || unknownType, getConstraintFromTypeParameter(t) || unknownType) &&
+                        compareTypes(instantiateType(getDefaultFromTypeParameter(s), mapper) || unknownType, getDefaultFromTypeParameter(t) || unknownType))) {
+                        return 0;
+                    }
+                }
+                source = instantiateSignature(source, mapper, true);
+            }
             var result = -1;
             if (!ignoreThisTypes) {
                 var sourceThisType = getThisTypeOfSignature(source);
@@ -36621,7 +37628,7 @@ var ts;
             if (propType) {
                 return propType;
             }
-            if (everyType(type, isTupleType) && !everyType(type, function (t) { return !t.target.hasRestElement; })) {
+            if (everyType(type, isTupleType)) {
                 return mapType(type, function (t) { return getRestTypeOfTupleType(t) || undefinedType; });
             }
             return undefined;
@@ -36666,6 +37673,23 @@ var ts;
             }
             return type;
         }
+        function getWidenedLiteralLikeTypeForContextualReturnTypeIfNeeded(type, contextualSignatureReturnType, isAsync) {
+            if (type && isUnitType(type)) {
+                var contextualType = !contextualSignatureReturnType ? undefined :
+                    isAsync ? getPromisedTypeOfPromise(contextualSignatureReturnType) :
+                        contextualSignatureReturnType;
+                type = getWidenedLiteralLikeTypeForContextualType(type, contextualType);
+            }
+            return type;
+        }
+        function getWidenedLiteralLikeTypeForContextualIterationTypeIfNeeded(type, contextualSignatureReturnType, kind, isAsyncGenerator) {
+            if (type && isUnitType(type)) {
+                var contextualType = !contextualSignatureReturnType ? undefined :
+                    getIterationTypeOfGeneratorFunctionReturnType(kind, contextualSignatureReturnType, isAsyncGenerator);
+                type = getWidenedLiteralLikeTypeForContextualType(type, contextualType);
+            }
+            return type;
+        }
         function isTupleType(type) {
             return !!(ts.getObjectFlags(type) & 4 && type.target.objectFlags & 8);
         }
@@ -36742,12 +37766,16 @@ var ts;
         function getNonNullableType(type) {
             return strictNullChecks ? getGlobalNonNullableTypeInstantiation(type) : type;
         }
+        function isCoercibleUnderDoubleEquals(source, target) {
+            return ((source.flags & (8 | 4 | 512)) !== 0)
+                && ((target.flags & (8 | 4 | 16)) !== 0);
+        }
         function isObjectTypeWithInferableIndex(type) {
-            return type.symbol && (type.symbol.flags & (4096 | 2048 | 512)) !== 0 &&
+            return type.symbol && (type.symbol.flags & (4096 | 2048 | 384 | 512)) !== 0 &&
                 !typeHasCallOrConstructSignatures(type);
         }
         function createSymbolWithType(source, type) {
-            var symbol = createSymbol(source.flags, source.escapedName);
+            var symbol = createSymbol(source.flags, source.escapedName, ts.getCheckFlags(source) & 8);
             symbol.declarations = source.declarations;
             symbol.parent = source.parent;
             symbol.type = type;
@@ -36859,37 +37887,45 @@ var ts;
             var stringIndexInfo = getIndexInfoOfType(type, 0);
             var numberIndexInfo = getIndexInfoOfType(type, 1);
             var result = createAnonymousType(type.symbol, members, ts.emptyArray, ts.emptyArray, stringIndexInfo && createIndexInfo(getWidenedType(stringIndexInfo.type), stringIndexInfo.isReadonly), numberIndexInfo && createIndexInfo(getWidenedType(numberIndexInfo.type), numberIndexInfo.isReadonly));
-            result.objectFlags |= (ts.getObjectFlags(type) & 16384);
+            result.objectFlags |= (ts.getObjectFlags(type) & (16384 | 1048576));
             return result;
         }
         function getWidenedType(type) {
             return getWidenedTypeWithContext(type, undefined);
         }
         function getWidenedTypeWithContext(type, context) {
-            if (ts.getObjectFlags(type) & 393216) {
+            if (ts.getObjectFlags(type) & 786432) {
+                if (context === undefined && type.widened) {
+                    return type.widened;
+                }
+                var result = void 0;
                 if (type.flags & 98304) {
-                    return anyType;
+                    result = anyType;
                 }
-                if (isObjectLiteralType(type)) {
-                    return getWidenedTypeOfObjectLiteral(type, context);
+                else if (isObjectLiteralType(type)) {
+                    result = getWidenedTypeOfObjectLiteral(type, context);
                 }
-                if (type.flags & 1048576) {
+                else if (type.flags & 1048576) {
                     var unionContext_1 = context || createWideningContext(undefined, undefined, type.types);
                     var widenedTypes = ts.sameMap(type.types, function (t) { return t.flags & 98304 ? t : getWidenedTypeWithContext(t, unionContext_1); });
-                    return getUnionType(widenedTypes, ts.some(widenedTypes, isEmptyObjectType) ? 2 : 1);
+                    result = getUnionType(widenedTypes, ts.some(widenedTypes, isEmptyObjectType) ? 2 : 1);
                 }
-                if (type.flags & 2097152) {
-                    return getIntersectionType(ts.sameMap(type.types, getWidenedType));
+                else if (type.flags & 2097152) {
+                    result = getIntersectionType(ts.sameMap(type.types, getWidenedType));
                 }
-                if (isArrayType(type) || isTupleType(type)) {
-                    return createTypeReference(type.target, ts.sameMap(type.typeArguments, getWidenedType));
+                else if (isArrayType(type) || isTupleType(type)) {
+                    result = createTypeReference(type.target, ts.sameMap(type.typeArguments, getWidenedType));
                 }
+                if (result && context === undefined) {
+                    type.widened = result;
+                }
+                return result || type;
             }
             return type;
         }
         function reportWideningErrorsInType(type) {
             var errorReported = false;
-            if (ts.getObjectFlags(type) & 131072) {
+            if (ts.getObjectFlags(type) & 262144) {
                 if (type.flags & 1048576) {
                     if (ts.some(type.types, isEmptyObjectType)) {
                         errorReported = true;
@@ -36915,7 +37951,7 @@ var ts;
                     for (var _d = 0, _e = getPropertiesOfObjectType(type); _d < _e.length; _d++) {
                         var p = _e[_d];
                         var t = getTypeOfSymbol(p);
-                        if (ts.getObjectFlags(t) & 131072) {
+                        if (ts.getObjectFlags(t) & 262144) {
                             if (!reportWideningErrorsInType(t)) {
                                 error(p.valueDeclaration, ts.Diagnostics.Object_literal_s_property_0_implicitly_has_an_1_type, symbolToString(p), typeToString(getWidenedType(t)));
                             }
@@ -36926,19 +37962,19 @@ var ts;
             }
             return errorReported;
         }
-        function reportImplicitAny(declaration, type) {
+        function reportImplicitAny(declaration, type, wideningKind) {
             var typeAsString = typeToString(getWidenedType(type));
             if (ts.isInJSFile(declaration) && !ts.isCheckJsEnabledForFile(ts.getSourceFileOfNode(declaration), compilerOptions)) {
                 return;
             }
             var diagnostic;
             switch (declaration.kind) {
-                case 204:
+                case 205:
+                case 155:
                 case 154:
-                case 153:
                     diagnostic = noImplicitAny ? ts.Diagnostics.Member_0_implicitly_has_an_1_type : ts.Diagnostics.Member_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage;
                     break;
-                case 151:
+                case 152:
                     var param = declaration;
                     if (ts.isIdentifier(param.name) &&
                         (ts.isCallSignatureDeclaration(param.parent) || ts.isMethodSignature(param.parent) || ts.isFunctionTypeNode(param.parent)) &&
@@ -36953,29 +37989,36 @@ var ts;
                         noImplicitAny ? ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type : ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type_but_a_better_type_may_be_inferred_from_usage :
                         noImplicitAny ? ts.Diagnostics.Parameter_0_implicitly_has_an_1_type : ts.Diagnostics.Parameter_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage;
                     break;
-                case 186:
+                case 187:
                     diagnostic = ts.Diagnostics.Binding_element_0_implicitly_has_an_1_type;
                     if (!noImplicitAny) {
                         return;
                     }
                     break;
-                case 294:
+                case 295:
                     error(declaration, ts.Diagnostics.Function_type_which_lacks_return_type_annotation_implicitly_has_an_0_return_type, typeAsString);
                     return;
-                case 239:
+                case 240:
+                case 157:
                 case 156:
-                case 155:
-                case 158:
                 case 159:
-                case 196:
+                case 160:
                 case 197:
+                case 198:
                     if (noImplicitAny && !declaration.name) {
-                        error(declaration, ts.Diagnostics.Function_expression_which_lacks_return_type_annotation_implicitly_has_an_0_return_type, typeAsString);
+                        if (wideningKind === 1) {
+                            error(declaration, ts.Diagnostics.Generator_implicitly_has_yield_type_0_because_it_does_not_yield_any_values_Consider_supplying_a_return_type_annotation, typeAsString);
+                        }
+                        else {
+                            error(declaration, ts.Diagnostics.Function_expression_which_lacks_return_type_annotation_implicitly_has_an_0_return_type, typeAsString);
+                        }
                         return;
                     }
-                    diagnostic = noImplicitAny ? ts.Diagnostics._0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type : ts.Diagnostics._0_implicitly_has_an_1_return_type_but_a_better_type_may_be_inferred_from_usage;
+                    diagnostic = !noImplicitAny ? ts.Diagnostics._0_implicitly_has_an_1_return_type_but_a_better_type_may_be_inferred_from_usage :
+                        wideningKind === 1 ? ts.Diagnostics._0_which_lacks_return_type_annotation_implicitly_has_an_1_yield_type :
+                            ts.Diagnostics._0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type;
                     break;
-                case 181:
+                case 182:
                     if (noImplicitAny) {
                         error(declaration, ts.Diagnostics.Mapped_object_type_implicitly_has_an_any_template_type);
                     }
@@ -36985,14 +38028,14 @@ var ts;
             }
             errorOrSuggestion(noImplicitAny, declaration, diagnostic, ts.declarationNameToString(ts.getNameOfDeclaration(declaration)), typeAsString);
         }
-        function reportErrorsFromWidening(declaration, type) {
-            if (produceDiagnostics && noImplicitAny && ts.getObjectFlags(type) & 131072) {
+        function reportErrorsFromWidening(declaration, type, wideningKind) {
+            if (produceDiagnostics && noImplicitAny && ts.getObjectFlags(type) & 262144) {
                 if (!reportWideningErrorsInType(type)) {
-                    reportImplicitAny(declaration, type);
+                    reportImplicitAny(declaration, type, wideningKind);
                 }
             }
         }
-        function forEachMatchingParameterType(source, target, callback) {
+        function applyToParameterTypes(source, target, callback) {
             var sourceCount = getParameterCount(source);
             var targetCount = getParameterCount(target);
             var sourceRestType = getEffectiveRestType(source);
@@ -37013,25 +38056,55 @@ var ts;
                 callback(getRestTypeAtPosition(source, paramCount), targetRestType);
             }
         }
-        function createInferenceContext(typeParameters, signature, flags, compareTypes, baseInferences) {
-            var inferences = baseInferences ? baseInferences.map(cloneInferenceInfo) : typeParameters.map(createInferenceInfo);
-            var context = mapper;
-            context.typeParameters = typeParameters;
-            context.signature = signature;
-            context.inferences = inferences;
-            context.flags = flags;
-            context.compareTypes = compareTypes || compareTypesAssignable;
+        function applyToReturnTypes(source, target, callback) {
+            var sourceTypePredicate = getTypePredicateOfSignature(source);
+            var targetTypePredicate = getTypePredicateOfSignature(target);
+            if (sourceTypePredicate && targetTypePredicate && sourceTypePredicate.kind === targetTypePredicate.kind &&
+                (sourceTypePredicate.kind === 0 || sourceTypePredicate.parameterIndex === targetTypePredicate.parameterIndex)) {
+                callback(sourceTypePredicate.type, targetTypePredicate.type);
+            }
+            else {
+                callback(getReturnTypeOfSignature(source), getReturnTypeOfSignature(target));
+            }
+        }
+        function createInferenceContext(typeParameters, signature, flags, compareTypes) {
+            return createInferenceContextWorker(typeParameters.map(createInferenceInfo), signature, flags, compareTypes || compareTypesAssignable);
+        }
+        function cloneInferenceContext(context, extraFlags) {
+            if (extraFlags === void 0) { extraFlags = 0; }
+            return context && createInferenceContextWorker(ts.map(context.inferences, cloneInferenceInfo), context.signature, context.flags | extraFlags, context.compareTypes);
+        }
+        function createInferenceContextWorker(inferences, signature, flags, compareTypes) {
+            var context = {
+                inferences: inferences,
+                signature: signature,
+                flags: flags,
+                compareTypes: compareTypes,
+                mapper: function (t) { return mapToInferredType(context, t, true); },
+                nonFixingMapper: function (t) { return mapToInferredType(context, t, false); },
+            };
             return context;
-            function mapper(t) {
-                for (var i = 0; i < inferences.length; i++) {
-                    if (t === inferences[i].typeParameter) {
-                        if (!(context.flags & 4)) {
-                            inferences[i].isFixed = true;
-                        }
-                        return getInferredType(context, i);
+        }
+        function mapToInferredType(context, t, fix) {
+            var inferences = context.inferences;
+            for (var i = 0; i < inferences.length; i++) {
+                var inference = inferences[i];
+                if (t === inference.typeParameter) {
+                    if (fix && !inference.isFixed) {
+                        clearCachedInferences(inferences);
+                        inference.isFixed = true;
                     }
+                    return getInferredType(context, i);
+                }
+            }
+            return t;
+        }
+        function clearCachedInferences(inferences) {
+            for (var _i = 0, inferences_1 = inferences; _i < inferences_1.length; _i++) {
+                var inference = inferences_1[_i];
+                if (!inference.isFixed) {
+                    inference.inferredType = undefined;
                 }
-                return t;
             }
         }
         function createInferenceInfo(typeParameter) {
@@ -37056,11 +38129,14 @@ var ts;
                 isFixed: inference.isFixed
             };
         }
+        function getMapperFromContext(context) {
+            return context && context.mapper;
+        }
         function couldContainTypeVariables(type) {
             var objectFlags = ts.getObjectFlags(type);
             return !!(type.flags & 63176704 ||
                 objectFlags & 4 && ts.forEach(type.typeArguments, couldContainTypeVariables) ||
-                objectFlags & 16 && type.symbol && type.symbol.flags & (16 | 8192 | 2048 | 32) ||
+                objectFlags & 16 && type.symbol && type.symbol.flags & (16 | 8192 | 32 | 2048 | 4096) && type.symbol.declarations ||
                 objectFlags & 32 ||
                 type.flags & 3145728 && couldUnionOrIntersectionContainTypeVariables(type));
         }
@@ -37071,7 +38147,10 @@ var ts;
             return type.couldContainTypeVariables;
         }
         function isTypeParameterAtTopLevel(type, typeParameter) {
-            return type === typeParameter || !!(type.flags & 3145728) && ts.some(type.types, function (t) { return isTypeParameterAtTopLevel(t, typeParameter); });
+            return !!(type === typeParameter ||
+                type.flags & 3145728 && ts.some(type.types, function (t) { return isTypeParameterAtTopLevel(t, typeParameter); }) ||
+                type.flags & 16777216 && (isTypeParameterAtTopLevel(getTrueTypeFromConditionalType(type), typeParameter) ||
+                    isTypeParameterAtTopLevel(getFalseTypeFromConditionalType(type), typeParameter)));
         }
         function createEmptyObjectTypeFromStringLiteral(type) {
             var members = ts.createSymbolTable();
@@ -37101,17 +38180,14 @@ var ts;
             reverseMappedCache.set(key, type);
             return type;
         }
+        function isPartiallyInferableType(type) {
+            return !(ts.getObjectFlags(type) & 1048576) ||
+                isObjectLiteralType(type) && ts.some(getPropertiesOfType(type), function (prop) { return isPartiallyInferableType(getTypeOfSymbol(prop)); });
+        }
         function createReverseMappedType(source, target, constraint) {
-            var properties = getPropertiesOfType(source);
-            if (properties.length === 0 && !getIndexInfoOfType(source, 0)) {
+            if (!(getIndexInfoOfType(source, 0) || getPropertiesOfType(source).length !== 0 && isPartiallyInferableType(source))) {
                 return undefined;
             }
-            for (var _i = 0, properties_3 = properties; _i < properties_3.length; _i++) {
-                var prop = properties_3[_i];
-                if (ts.getObjectFlags(getTypeOfSymbol(prop)) & 524288) {
-                    return undefined;
-                }
-            }
             if (isArrayType(source)) {
                 return createArrayType(inferReverseMappedType(source.typeArguments[0], target, constraint), isReadonlyArrayType(source));
             }
@@ -37135,20 +38211,20 @@ var ts;
             var templateType = getTemplateTypeFromMappedType(target);
             var inference = createInferenceInfo(typeParameter);
             inferTypes([inference], sourceType, templateType);
-            return getTypeFromInference(inference);
+            return getTypeFromInference(inference) || unknownType;
         }
         function getUnmatchedProperties(source, target, requireOptionalProperties, matchDiscriminantProperties) {
-            var properties, _i, properties_4, targetProp, sourceProp, targetType, sourceType;
+            var properties, _i, properties_2, targetProp, sourceProp, targetType, sourceType;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        properties = target.flags & 2097152 ? getPropertiesOfUnionOrIntersectionType(target) : getPropertiesOfObjectType(target);
-                        _i = 0, properties_4 = properties;
+                        properties = target.flags & 1048576 ? getPossiblePropertiesOfUnionType(target) : getPropertiesOfType(target);
+                        _i = 0, properties_2 = properties;
                         _a.label = 1;
                     case 1:
-                        if (!(_i < properties_4.length)) return [3, 6];
-                        targetProp = properties_4[_i];
-                        if (!(requireOptionalProperties || !(targetProp.flags & 16777216))) return [3, 5];
+                        if (!(_i < properties_2.length)) return [3, 6];
+                        targetProp = properties_2[_i];
+                        if (!(requireOptionalProperties || !(targetProp.flags & 16777216 || ts.getCheckFlags(targetProp) & 48))) return [3, 5];
                         sourceProp = getPropertyOfType(source, targetProp.escapedName);
                         if (!!sourceProp) return [3, 3];
                         return [4, targetProp];
@@ -37173,7 +38249,9 @@ var ts;
             });
         }
         function getUnmatchedProperty(source, target, requireOptionalProperties, matchDiscriminantProperties) {
-            return getUnmatchedProperties(source, target, requireOptionalProperties, matchDiscriminantProperties).next().value;
+            var result = getUnmatchedProperties(source, target, requireOptionalProperties, matchDiscriminantProperties).next();
+            if (!result.done)
+                return result.value;
         }
         function tupleTypesDefinitelyUnrelated(source, target) {
             return target.target.minLength > source.target.minLength ||
@@ -37187,15 +38265,17 @@ var ts;
         function getTypeFromInference(inference) {
             return inference.candidates ? getUnionType(inference.candidates, 2) :
                 inference.contraCandidates ? getIntersectionType(inference.contraCandidates) :
-                    emptyObjectType;
+                    undefined;
         }
-        function inferTypes(inferences, originalSource, originalTarget, priority) {
+        function inferTypes(inferences, originalSource, originalTarget, priority, contravariant) {
             if (priority === void 0) { priority = 0; }
+            if (contravariant === void 0) { contravariant = false; }
             var symbolStack;
             var visited;
-            var contravariant = false;
             var bivariant = false;
             var propagationType;
+            var inferenceCount = 0;
+            var inferenceIncomplete = false;
             var allowComplexConstraintInference = true;
             inferFromTypes(originalSource, originalTarget);
             function inferFromTypes(source, target) {
@@ -37210,11 +38290,7 @@ var ts;
                     return;
                 }
                 if (source.aliasSymbol && source.aliasTypeArguments && source.aliasSymbol === target.aliasSymbol) {
-                    var sourceTypes = source.aliasTypeArguments;
-                    var targetTypes = target.aliasTypeArguments;
-                    for (var i = 0; i < sourceTypes.length; i++) {
-                        inferFromTypes(sourceTypes[i], targetTypes[i]);
-                    }
+                    inferFromTypeArguments(source.aliasTypeArguments, target.aliasTypeArguments, getAliasVariances(source.aliasSymbol));
                     return;
                 }
                 if (source.flags & 1048576 && target.flags & 1048576 && !(source.flags & 1024 && target.flags & 1024) ||
@@ -37229,24 +38305,33 @@ var ts;
                     var matchingTypes = void 0;
                     for (var _b = 0, _c = source.types; _b < _c.length; _b++) {
                         var t = _c[_b];
-                        if (typeIdenticalToSomeType(t, target.types)) {
-                            (matchingTypes || (matchingTypes = [])).push(t);
-                            inferFromTypes(t, t);
-                        }
-                        else if (t.flags & (256 | 128)) {
-                            var b = getBaseTypeOfLiteralType(t);
-                            if (typeIdenticalToSomeType(b, target.types)) {
-                                (matchingTypes || (matchingTypes = [])).push(t, b);
-                            }
+                        var matched = findMatchedType(t, target);
+                        if (matched) {
+                            (matchingTypes || (matchingTypes = [])).push(matched);
+                            inferFromTypes(matched, matched);
                         }
                     }
                     if (matchingTypes) {
-                        source = removeTypesFromUnionOrIntersection(source, matchingTypes);
-                        target = removeTypesFromUnionOrIntersection(target, matchingTypes);
+                        var s = removeTypesFromUnionOrIntersection(source, matchingTypes);
+                        var t = removeTypesFromUnionOrIntersection(target, matchingTypes);
+                        if (!(s && t))
+                            return;
+                        source = s;
+                        target = t;
                     }
                 }
+                else if (target.flags & 1048576 && !(target.flags & 1024) || target.flags & 2097152) {
+                    var matched = findMatchedType(source, target);
+                    if (matched) {
+                        inferFromTypes(matched, matched);
+                        return;
+                    }
+                }
+                else if (target.flags & (8388608 | 33554432)) {
+                    target = getActualTypeVariable(target);
+                }
                 if (target.flags & 8650752) {
-                    if (ts.getObjectFlags(source) & 524288 || source === silentNeverType || (priority & 8 && (source === autoType || source === autoArrayType))) {
+                    if (ts.getObjectFlags(source) & 1048576 || source === silentNeverType || (priority & 16 && (source === autoType || source === autoArrayType))) {
                         return;
                     }
                     var inference = getInferenceInfoForType(target);
@@ -37261,50 +38346,42 @@ var ts;
                             if (priority === inference.priority) {
                                 var candidate = propagationType || source;
                                 if (contravariant && !bivariant) {
-                                    inference.contraCandidates = ts.appendIfUnique(inference.contraCandidates, candidate);
+                                    if (!ts.contains(inference.contraCandidates, candidate)) {
+                                        inference.contraCandidates = ts.append(inference.contraCandidates, candidate);
+                                        clearCachedInferences(inferences);
+                                    }
                                 }
-                                else {
-                                    inference.candidates = ts.appendIfUnique(inference.candidates, candidate);
+                                else if (!ts.contains(inference.candidates, candidate)) {
+                                    inference.candidates = ts.append(inference.candidates, candidate);
+                                    clearCachedInferences(inferences);
                                 }
                             }
-                            if (!(priority & 8) && target.flags & 262144 && !isTypeParameterAtTopLevel(originalTarget, target)) {
+                            if (!(priority & 16) && target.flags & 262144 && inference.topLevel && !isTypeParameterAtTopLevel(originalTarget, target)) {
                                 inference.topLevel = false;
+                                clearCachedInferences(inferences);
                             }
                         }
+                        inferenceCount++;
                         return;
                     }
                     else {
-                        var simplified = getSimplifiedType(target);
+                        var simplified = getSimplifiedType(target, false);
                         if (simplified !== target) {
-                            inferFromTypesOnce(source, simplified);
+                            invokeOnce(source, simplified, inferFromTypes);
                         }
                         else if (target.flags & 8388608) {
-                            var indexType = getSimplifiedType(target.indexType);
+                            var indexType = getSimplifiedType(target.indexType, false);
                             if (indexType.flags & 63176704) {
-                                var simplified_1 = distributeIndexOverObjectType(getSimplifiedType(target.objectType), indexType);
+                                var simplified_1 = distributeIndexOverObjectType(getSimplifiedType(target.objectType, false), indexType, false);
                                 if (simplified_1 && simplified_1 !== target) {
-                                    inferFromTypesOnce(source, simplified_1);
+                                    invokeOnce(source, simplified_1, inferFromTypes);
                                 }
                             }
                         }
                     }
                 }
-                else if (target.flags & 33554432) {
-                    inferFromTypes(source, target.typeVariable);
-                }
-                if (ts.getObjectFlags(source) & 4 && ts.getObjectFlags(target) & 4 && source.target === target.target) {
-                    var sourceTypes = source.typeArguments || ts.emptyArray;
-                    var targetTypes = target.typeArguments || ts.emptyArray;
-                    var count = sourceTypes.length < targetTypes.length ? sourceTypes.length : targetTypes.length;
-                    var variances = getVariances(source.target);
-                    for (var i = 0; i < count; i++) {
-                        if (i < variances.length && variances[i] === 2) {
-                            inferFromContravariantTypes(sourceTypes[i], targetTypes[i]);
-                        }
-                        else {
-                            inferFromTypes(sourceTypes[i], targetTypes[i]);
-                        }
-                    }
+                if (ts.getObjectFlags(source) & 4 && ts.getObjectFlags(target) & 4 && (source.target === target.target || isArrayType(source) && isArrayType(target))) {
+                    inferFromTypeArguments(source.typeArguments || ts.emptyArray, target.typeArguments || ts.emptyArray, getVariances(source.target));
                 }
                 else if (source.flags & 4194304 && target.flags & 4194304) {
                     contravariant = !contravariant;
@@ -37315,7 +38392,7 @@ var ts;
                     var empty = createEmptyObjectTypeFromStringLiteral(source);
                     contravariant = !contravariant;
                     var savePriority = priority;
-                    priority |= 16;
+                    priority |= 32;
                     inferFromTypes(empty, target.type);
                     priority = savePriority;
                     contravariant = !contravariant;
@@ -37330,30 +38407,22 @@ var ts;
                     inferFromTypes(getTrueTypeFromConditionalType(source), getTrueTypeFromConditionalType(target));
                     inferFromTypes(getFalseTypeFromConditionalType(source), getFalseTypeFromConditionalType(target));
                 }
-                else if (target.flags & 16777216) {
-                    inferFromTypes(source, getTrueTypeFromConditionalType(target));
-                    inferFromTypes(source, getFalseTypeFromConditionalType(target));
+                else if (target.flags & 16777216 && !contravariant) {
+                    var targetTypes = [getTrueTypeFromConditionalType(target), getFalseTypeFromConditionalType(target)];
+                    inferToMultipleTypes(source, targetTypes, target.flags);
                 }
                 else if (target.flags & 3145728) {
-                    for (var _d = 0, _e = target.types; _d < _e.length; _d++) {
-                        var t = _e[_d];
-                        var savePriority = priority;
-                        if (getInferenceInfoForType(t)) {
-                            priority |= 1;
-                        }
-                        inferFromTypes(source, t);
-                        priority = savePriority;
-                    }
+                    inferToMultipleTypes(source, target.types, target.flags);
                 }
                 else if (source.flags & 1048576) {
                     var sourceTypes = source.types;
-                    for (var _f = 0, sourceTypes_3 = sourceTypes; _f < sourceTypes_3.length; _f++) {
-                        var sourceType = sourceTypes_3[_f];
+                    for (var _d = 0, sourceTypes_3 = sourceTypes; _d < sourceTypes_3.length; _d++) {
+                        var sourceType = sourceTypes_3[_d];
                         inferFromTypes(sourceType, target);
                     }
                 }
                 else {
-                    if (!(priority & 32 && source.flags & (2097152 | 63176704))) {
+                    if (!(priority & 64 && source.flags & (2097152 | 63176704))) {
                         var apparentSource = getApparentType(source);
                         if (apparentSource !== source && allowComplexConstraintInference && !(apparentSource.flags & (524288 | 2097152))) {
                             allowComplexConstraintInference = false;
@@ -37362,37 +38431,35 @@ var ts;
                         source = apparentSource;
                     }
                     if (source.flags & (524288 | 2097152)) {
-                        var key = source.id + "," + target.id;
-                        if (visited && visited.get(key)) {
-                            return;
-                        }
-                        (visited || (visited = ts.createMap())).set(key, true);
-                        var isNonConstructorObject = target.flags & 524288 &&
-                            !(ts.getObjectFlags(target) & 16 && target.symbol && target.symbol.flags & 32);
-                        var symbol = isNonConstructorObject ? target.symbol : undefined;
-                        if (symbol) {
-                            if (ts.contains(symbolStack, symbol)) {
-                                return;
-                            }
-                            (symbolStack || (symbolStack = [])).push(symbol);
-                            inferFromObjectTypes(source, target);
-                            symbolStack.pop();
-                        }
-                        else {
-                            inferFromObjectTypes(source, target);
-                        }
+                        invokeOnce(source, target, inferFromObjectTypes);
                     }
                 }
-                function inferFromTypesOnce(source, target) {
-                    var key = source.id + "," + target.id;
-                    if (!visited || !visited.get(key)) {
-                        (visited || (visited = ts.createMap())).set(key, true);
-                        inferFromTypes(source, target);
+            }
+            function invokeOnce(source, target, action) {
+                var key = source.id + "," + target.id;
+                var count = visited && visited.get(key);
+                if (count !== undefined) {
+                    inferenceCount += count;
+                    return;
+                }
+                (visited || (visited = ts.createMap())).set(key, 0);
+                var startCount = inferenceCount;
+                action(source, target);
+                visited.set(key, inferenceCount - startCount);
+            }
+            function inferFromTypeArguments(sourceTypes, targetTypes, variances) {
+                var count = sourceTypes.length < targetTypes.length ? sourceTypes.length : targetTypes.length;
+                for (var i = 0; i < count; i++) {
+                    if (i < variances.length && (variances[i] & 7) === 2) {
+                        inferFromContravariantTypes(sourceTypes[i], targetTypes[i]);
+                    }
+                    else {
+                        inferFromTypes(sourceTypes[i], targetTypes[i]);
                     }
                 }
             }
             function inferFromContravariantTypes(source, target) {
-                if (strictFunctionTypes || priority & 64) {
+                if (strictFunctionTypes || priority & 128) {
                     contravariant = !contravariant;
                     inferFromTypes(source, target);
                     contravariant = !contravariant;
@@ -37403,8 +38470,8 @@ var ts;
             }
             function getInferenceInfoForType(type) {
                 if (type.flags & 8650752) {
-                    for (var _i = 0, inferences_1 = inferences; _i < inferences_1.length; _i++) {
-                        var inference = inferences_1[_i];
+                    for (var _i = 0, inferences_2 = inferences; _i < inferences_2.length; _i++) {
+                        var inference = inferences_2[_i];
                         if (type === inference.typeParameter) {
                             return inference;
                         }
@@ -37412,6 +38479,62 @@ var ts;
                 }
                 return undefined;
             }
+            function inferToMultipleTypes(source, targets, targetFlags) {
+                var typeVariableCount = 0;
+                if (targetFlags & 1048576) {
+                    var nakedTypeVariable = void 0;
+                    var sources = source.flags & 1048576 ? source.types : [source];
+                    var matched_1 = new Array(sources.length);
+                    var saveInferenceIncomplete = inferenceIncomplete;
+                    inferenceIncomplete = false;
+                    for (var _i = 0, targets_1 = targets; _i < targets_1.length; _i++) {
+                        var t = targets_1[_i];
+                        if (getInferenceInfoForType(t)) {
+                            nakedTypeVariable = t;
+                            typeVariableCount++;
+                        }
+                        else {
+                            for (var i = 0; i < sources.length; i++) {
+                                var count = inferenceCount;
+                                inferFromTypes(sources[i], t);
+                                if (count !== inferenceCount)
+                                    matched_1[i] = true;
+                            }
+                        }
+                    }
+                    var inferenceComplete = !inferenceIncomplete;
+                    inferenceIncomplete = inferenceIncomplete || saveInferenceIncomplete;
+                    if (typeVariableCount === 1 && inferenceComplete) {
+                        var unmatched = ts.flatMap(sources, function (s, i) { return matched_1[i] ? undefined : s; });
+                        if (unmatched.length) {
+                            inferFromTypes(getUnionType(unmatched), nakedTypeVariable);
+                            return;
+                        }
+                    }
+                }
+                else {
+                    for (var _a = 0, targets_2 = targets; _a < targets_2.length; _a++) {
+                        var t = targets_2[_a];
+                        if (getInferenceInfoForType(t)) {
+                            typeVariableCount++;
+                        }
+                        else {
+                            inferFromTypes(source, t);
+                        }
+                    }
+                }
+                if (targetFlags & 2097152 ? typeVariableCount === 1 : typeVariableCount > 0) {
+                    var savePriority = priority;
+                    priority |= 1;
+                    for (var _b = 0, targets_3 = targets; _b < targets_3.length; _b++) {
+                        var t = targets_3[_b];
+                        if (getInferenceInfoForType(t)) {
+                            inferFromTypes(source, t);
+                        }
+                    }
+                    priority = savePriority;
+                }
+            }
             function inferToMappedType(source, target, constraintType) {
                 if (constraintType.flags & 1048576) {
                     var result = false;
@@ -37427,7 +38550,8 @@ var ts;
                         var inferredType = inferTypeForHomomorphicMappedType(source, target, constraintType);
                         if (inferredType) {
                             var savePriority = priority;
-                            priority |= 2;
+                            priority |= ts.getObjectFlags(source) & 1048576 ?
+                                4 : 2;
                             inferFromTypes(inferredType, inference.typeParameter);
                             priority = savePriority;
                         }
@@ -37436,23 +38560,40 @@ var ts;
                 }
                 if (constraintType.flags & 262144) {
                     var savePriority = priority;
-                    priority |= 4;
+                    priority |= 8;
                     inferFromTypes(getIndexType(source), constraintType);
                     priority = savePriority;
                     var extendedConstraint = getConstraintOfType(constraintType);
                     if (extendedConstraint && inferToMappedType(source, target, extendedConstraint)) {
                         return true;
                     }
-                    var valueTypes = ts.compact([
-                        getIndexTypeOfType(source, 0),
-                        getIndexTypeOfType(source, 1)
-                    ].concat(ts.map(getPropertiesOfType(source), getTypeOfSymbol)));
-                    inferFromTypes(getUnionType(valueTypes), getTemplateTypeFromMappedType(target));
+                    var propTypes = ts.map(getPropertiesOfType(source), getTypeOfSymbol);
+                    var stringIndexType = getIndexTypeOfType(source, 0);
+                    var numberIndexInfo = getNonEnumNumberIndexInfo(source);
+                    var numberIndexType = numberIndexInfo && numberIndexInfo.type;
+                    inferFromTypes(getUnionType(ts.append(ts.append(propTypes, stringIndexType), numberIndexType)), getTemplateTypeFromMappedType(target));
                     return true;
                 }
                 return false;
             }
             function inferFromObjectTypes(source, target) {
+                var isNonConstructorObject = target.flags & 524288 &&
+                    !(ts.getObjectFlags(target) & 16 && target.symbol && target.symbol.flags & 32);
+                var symbol = isNonConstructorObject ? target.symbol : undefined;
+                if (symbol) {
+                    if (ts.contains(symbolStack, symbol)) {
+                        inferenceIncomplete = true;
+                        return;
+                    }
+                    (symbolStack || (symbolStack = [])).push(symbol);
+                    inferFromObjectTypesWorker(source, target);
+                    symbolStack.pop();
+                }
+                else {
+                    inferFromObjectTypesWorker(source, target);
+                }
+            }
+            function inferFromObjectTypesWorker(source, target) {
                 if (isGenericMappedType(source) && isGenericMappedType(target)) {
                     inferFromTypes(getConstraintTypeFromMappedType(source), getConstraintTypeFromMappedType(target));
                     inferFromTypes(getTemplateTypeFromMappedType(source), getTemplateTypeFromMappedType(target));
@@ -37498,8 +38639,8 @@ var ts;
                     }
                 }
                 var properties = getPropertiesOfObjectType(target);
-                for (var _i = 0, properties_5 = properties; _i < properties_5.length; _i++) {
-                    var targetProp = properties_5[_i];
+                for (var _i = 0, properties_3 = properties; _i < properties_3.length; _i++) {
+                    var targetProp = properties_3[_i];
                     var sourceProp = getPropertyOfType(source, targetProp.escapedName);
                     if (sourceProp) {
                         inferFromTypes(getTypeOfSymbol(sourceProp), getTypeOfSymbol(targetProp));
@@ -37512,7 +38653,7 @@ var ts;
                 var sourceLen = sourceSignatures.length;
                 var targetLen = targetSignatures.length;
                 var len = sourceLen < targetLen ? sourceLen : targetLen;
-                var skipParameters = !!(ts.getObjectFlags(source) & 524288);
+                var skipParameters = !!(ts.getObjectFlags(source) & 1048576);
                 for (var i = 0; i < len; i++) {
                     inferFromSignature(getBaseSignature(sourceSignatures[sourceLen - len + i]), getBaseSignature(targetSignatures[targetLen - len + i]), skipParameters);
                 }
@@ -37521,18 +38662,11 @@ var ts;
                 if (!skipParameters) {
                     var saveBivariant = bivariant;
                     var kind = target.declaration ? target.declaration.kind : 0;
-                    bivariant = bivariant || kind === 156 || kind === 155 || kind === 157;
-                    forEachMatchingParameterType(source, target, inferFromContravariantTypes);
+                    bivariant = bivariant || kind === 157 || kind === 156 || kind === 158;
+                    applyToParameterTypes(source, target, inferFromContravariantTypes);
                     bivariant = saveBivariant;
                 }
-                var sourceTypePredicate = getTypePredicateOfSignature(source);
-                var targetTypePredicate = getTypePredicateOfSignature(target);
-                if (sourceTypePredicate && targetTypePredicate && sourceTypePredicate.kind === targetTypePredicate.kind) {
-                    inferFromTypes(sourceTypePredicate.type, targetTypePredicate.type);
-                }
-                else {
-                    inferFromTypes(getReturnTypeOfSignature(source), getReturnTypeOfSignature(target));
-                }
+                applyToReturnTypes(source, target, inferFromTypes);
             }
             function inferFromIndexTypes(source, target) {
                 var targetStringIndexType = getIndexTypeOfType(target, 0);
@@ -37554,24 +38688,39 @@ var ts;
                 }
             }
         }
-        function typeIdenticalToSomeType(type, types) {
+        function isMatchableType(type) {
+            return !(type.flags & 524288) || !!(ts.getObjectFlags(type) & 16);
+        }
+        function typeMatchedBySomeType(type, types) {
             for (var _i = 0, types_11 = types; _i < types_11.length; _i++) {
                 var t = types_11[_i];
-                if (isTypeIdenticalTo(t, type)) {
+                if (t === type || isMatchableType(t) && isMatchableType(type) && isTypeIdenticalTo(t, type)) {
                     return true;
                 }
             }
             return false;
         }
+        function findMatchedType(type, target) {
+            if (typeMatchedBySomeType(type, target.types)) {
+                return type;
+            }
+            if (type.flags & (256 | 128) && target.flags & 1048576) {
+                var base = getBaseTypeOfLiteralType(type);
+                if (typeMatchedBySomeType(base, target.types)) {
+                    return base;
+                }
+            }
+            return undefined;
+        }
         function removeTypesFromUnionOrIntersection(type, typesToRemove) {
             var reducedTypes = [];
             for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
                 var t = _a[_i];
-                if (!typeIdenticalToSomeType(t, typesToRemove)) {
+                if (!typeMatchedBySomeType(t, typesToRemove)) {
                     reducedTypes.push(t);
                 }
             }
-            return type.flags & 1048576 ? getUnionType(reducedTypes) : getIntersectionType(reducedTypes);
+            return reducedTypes.length ? type.flags & 1048576 ? getUnionType(reducedTypes) : getIntersectionType(reducedTypes) : undefined;
         }
         function hasPrimitiveConstraint(type) {
             var constraint = getConstraintOfTypeParameter(type);
@@ -37580,36 +38729,39 @@ var ts;
         function isObjectLiteralType(type) {
             return !!(ts.getObjectFlags(type) & 128);
         }
-        function widenObjectLiteralCandidates(candidates) {
+        function isObjectOrArrayLiteralType(type) {
+            return !!(ts.getObjectFlags(type) & (128 | 65536));
+        }
+        function unionObjectAndArrayLiteralCandidates(candidates) {
             if (candidates.length > 1) {
-                var objectLiterals = ts.filter(candidates, isObjectLiteralType);
+                var objectLiterals = ts.filter(candidates, isObjectOrArrayLiteralType);
                 if (objectLiterals.length) {
-                    var objectLiteralsType = getWidenedType(getUnionType(objectLiterals, 2));
-                    return ts.concatenate(ts.filter(candidates, function (t) { return !isObjectLiteralType(t); }), [objectLiteralsType]);
+                    var literalsType = getUnionType(objectLiterals, 2);
+                    return ts.concatenate(ts.filter(candidates, function (t) { return !isObjectOrArrayLiteralType(t); }), [literalsType]);
                 }
             }
             return candidates;
         }
         function getContravariantInference(inference) {
-            return inference.priority & 28 ? getIntersectionType(inference.contraCandidates) : getCommonSubtype(inference.contraCandidates);
+            return inference.priority & 56 ? getIntersectionType(inference.contraCandidates) : getCommonSubtype(inference.contraCandidates);
         }
         function getCovariantInference(inference, signature) {
-            var candidates = widenObjectLiteralCandidates(inference.candidates);
+            var candidates = unionObjectAndArrayLiteralCandidates(inference.candidates);
             var primitiveConstraint = hasPrimitiveConstraint(inference.typeParameter);
             var widenLiteralTypes = !primitiveConstraint && inference.topLevel &&
                 (inference.isFixed || !isTypeParameterAtTopLevel(getReturnTypeOfSignature(signature), inference.typeParameter));
             var baseCandidates = primitiveConstraint ? ts.sameMap(candidates, getRegularTypeOfLiteralType) :
                 widenLiteralTypes ? ts.sameMap(candidates, getWidenedLiteralType) :
                     candidates;
-            var unwidenedType = inference.priority & 28 ?
+            var unwidenedType = inference.priority & 56 ?
                 getUnionType(baseCandidates, 2) :
                 getCommonSupertype(baseCandidates);
             return getWidenedType(unwidenedType);
         }
         function getInferredType(context, index) {
             var inference = context.inferences[index];
-            var inferredType = inference.inferredType;
-            if (!inferredType) {
+            if (!inference.inferredType) {
+                var inferredType = void 0;
                 var signature = context.signature;
                 if (signature) {
                     var inferredCovariantType = inference.candidates ? getCovariantInference(inference, signature) : undefined;
@@ -37628,31 +38780,26 @@ var ts;
                     else {
                         var defaultType = getDefaultFromTypeParameter(inference.typeParameter);
                         if (defaultType) {
-                            inferredType = instantiateType(defaultType, combineTypeMappers(createBackreferenceMapper(context.typeParameters, index), context));
-                        }
-                        else {
-                            inferredType = getDefaultTypeArgumentType(!!(context.flags & 2));
+                            inferredType = instantiateType(defaultType, combineTypeMappers(createBackreferenceMapper(context, index), context.nonFixingMapper));
                         }
                     }
                 }
                 else {
                     inferredType = getTypeFromInference(inference);
                 }
-                inference.inferredType = inferredType;
+                inference.inferredType = inferredType || getDefaultTypeArgumentType(!!(context.flags & 2));
                 var constraint = getConstraintOfTypeParameter(inference.typeParameter);
                 if (constraint) {
-                    context.flags |= 4;
-                    var instantiatedConstraint = instantiateType(constraint, context);
-                    if (!context.compareTypes(inferredType, getTypeWithThisArgument(instantiatedConstraint, inferredType))) {
+                    var instantiatedConstraint = instantiateType(constraint, context.nonFixingMapper);
+                    if (!inferredType || !context.compareTypes(inferredType, getTypeWithThisArgument(instantiatedConstraint, inferredType))) {
                         inference.inferredType = inferredType = instantiatedConstraint;
                     }
-                    context.flags &= ~4;
                 }
             }
-            return inferredType;
+            return inference.inferredType;
         }
         function getDefaultTypeArgumentType(isInJavaScriptFile) {
-            return isInJavaScriptFile ? anyType : emptyObjectType;
+            return isInJavaScriptFile ? anyType : unknownType;
         }
         function getInferredTypes(context) {
             var result = [];
@@ -37661,8 +38808,8 @@ var ts;
             }
             return result;
         }
-        function getCannotFindNameDiagnosticForName(name) {
-            switch (name) {
+        function getCannotFindNameDiagnosticForName(node) {
+            switch (node.escapedText) {
                 case "document":
                 case "console":
                     return ts.Diagnostics.Cannot_find_name_0_Do_you_need_to_change_your_target_library_Try_changing_the_lib_compiler_option_to_include_dom;
@@ -37693,35 +38840,41 @@ var ts;
                 case "Iterator":
                 case "AsyncIterator":
                     return ts.Diagnostics.Cannot_find_name_0_Do_you_need_to_change_your_target_library_Try_changing_the_lib_compiler_option_to_es2015_or_later;
-                default: return ts.Diagnostics.Cannot_find_name_0;
+                default:
+                    if (node.parent.kind === 277) {
+                        return ts.Diagnostics.No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer;
+                    }
+                    else {
+                        return ts.Diagnostics.Cannot_find_name_0;
+                    }
             }
         }
         function getResolvedSymbol(node) {
             var links = getNodeLinks(node);
             if (!links.resolvedSymbol) {
                 links.resolvedSymbol = !ts.nodeIsMissing(node) &&
-                    resolveName(node, node.escapedText, 67220415 | 1048576, getCannotFindNameDiagnosticForName(node.escapedText), node, !ts.isWriteOnlyAccess(node), false, ts.Diagnostics.Cannot_find_name_0_Did_you_mean_1) || unknownSymbol;
+                    resolveName(node, node.escapedText, 67220415 | 1048576, getCannotFindNameDiagnosticForName(node), node, !ts.isWriteOnlyAccess(node), false, ts.Diagnostics.Cannot_find_name_0_Did_you_mean_1) || unknownSymbol;
             }
             return links.resolvedSymbol;
         }
         function isInTypeQuery(node) {
-            return !!ts.findAncestor(node, function (n) { return n.kind === 167 ? true : n.kind === 72 || n.kind === 148 ? false : "quit"; });
+            return !!ts.findAncestor(node, function (n) { return n.kind === 168 ? true : n.kind === 73 || n.kind === 149 ? false : "quit"; });
         }
-        function getFlowCacheKey(node) {
+        function getFlowCacheKey(node, declaredType, initialType, flowContainer) {
             switch (node.kind) {
-                case 72:
+                case 73:
                     var symbol = getResolvedSymbol(node);
-                    return symbol !== unknownSymbol ? (isConstraintPosition(node) ? "@" : "") + getSymbolId(symbol) : undefined;
-                case 100:
+                    return symbol !== unknownSymbol ? (flowContainer ? getNodeId(flowContainer) : "-1") + "|" + getTypeId(declaredType) + "|" + getTypeId(initialType) + "|" + (isConstraintPosition(node) ? "@" : "") + getSymbolId(symbol) : undefined;
+                case 101:
                     return "0";
-                case 213:
-                case 195:
-                    return getFlowCacheKey(node.expression);
-                case 189:
+                case 214:
+                case 196:
+                    return getFlowCacheKey(node.expression, declaredType, initialType, flowContainer);
                 case 190:
+                case 191:
                     var propName = getAccessedPropertyName(node);
                     if (propName !== undefined) {
-                        var key = getFlowCacheKey(node.expression);
+                        var key = getFlowCacheKey(node.expression, declaredType, initialType, flowContainer);
                         return key && key + "." + propName;
                     }
             }
@@ -37729,24 +38882,24 @@ var ts;
         }
         function isMatchingReference(source, target) {
             switch (target.kind) {
-                case 195:
-                case 213:
+                case 196:
+                case 214:
                     return isMatchingReference(source, target.expression);
             }
             switch (source.kind) {
-                case 72:
-                    return target.kind === 72 && getResolvedSymbol(source) === getResolvedSymbol(target) ||
-                        (target.kind === 237 || target.kind === 186) &&
+                case 73:
+                    return target.kind === 73 && getResolvedSymbol(source) === getResolvedSymbol(target) ||
+                        (target.kind === 238 || target.kind === 187) &&
                             getExportSymbolOfValueSymbolIfExported(getResolvedSymbol(source)) === getSymbolOfNode(target);
-                case 100:
-                    return target.kind === 100;
-                case 98:
-                    return target.kind === 98;
-                case 213:
-                case 195:
+                case 101:
+                    return target.kind === 101;
+                case 99:
+                    return target.kind === 99;
+                case 214:
+                case 196:
                     return isMatchingReference(source.expression, target);
-                case 189:
                 case 190:
+                case 191:
                     return ts.isAccessExpression(target) &&
                         getAccessedPropertyName(source) === getAccessedPropertyName(target) &&
                         isMatchingReference(source.expression, target.expression);
@@ -37754,7 +38907,7 @@ var ts;
             return false;
         }
         function getAccessedPropertyName(access) {
-            return access.kind === 189 ? access.name.escapedText :
+            return access.kind === 190 ? access.name.escapedText :
                 ts.isStringLiteral(access.argumentExpression) || ts.isNumericLiteral(access.argumentExpression) ? ts.escapeLeadingUnderscores(access.argumentExpression.text) :
                     undefined;
         }
@@ -37775,7 +38928,7 @@ var ts;
                 isDiscriminantProperty(getDeclaredTypeOfReference(target.expression), name);
         }
         function getDeclaredTypeOfReference(expr) {
-            if (expr.kind === 72) {
+            if (expr.kind === 73) {
                 return getTypeOfSymbol(getResolvedSymbol(expr));
             }
             if (ts.isAccessExpression(expr)) {
@@ -37797,7 +38950,7 @@ var ts;
                 if (prop && ts.getCheckFlags(prop) & 2) {
                     if (prop.isDiscriminantProperty === undefined) {
                         prop.isDiscriminantProperty =
-                            (prop.checkFlags & 96) === 96 &&
+                            (prop.checkFlags & 192) === 192 &&
                                 isDiscriminantType(getTypeOfSymbol(prop));
                     }
                     return !!prop.isDiscriminantProperty;
@@ -37806,7 +38959,7 @@ var ts;
             return false;
         }
         function isSyntheticThisPropertyAccess(expr) {
-            return ts.isAccessExpression(expr) && expr.expression.kind === 100 && !!(expr.expression.flags & 8);
+            return ts.isAccessExpression(expr) && expr.expression.kind === 101 && !!(expr.expression.flags & 8);
         }
         function findDiscriminantProperties(sourceProperties, target) {
             var result;
@@ -37834,7 +38987,7 @@ var ts;
                     }
                 }
             }
-            if (callExpression.expression.kind === 189 &&
+            if (callExpression.expression.kind === 190 &&
                 isOrContainsMatchingReference(reference, callExpression.expression.expression)) {
                 return true;
             }
@@ -37944,7 +39097,7 @@ var ts;
                 return strictNullChecks ? 7888800 : 16736160;
             }
             if (flags & 63176704) {
-                return getTypeFacts(getBaseConstraintOfType(type) || emptyObjectType);
+                return getTypeFacts(getBaseConstraintOfType(type) || unknownType);
             }
             if (flags & 3145728) {
                 return getTypeFactsOfTypes(type.types);
@@ -37973,22 +39126,22 @@ var ts;
         }
         function getTypeOfDestructuredArrayElement(type, index) {
             return everyType(type, isTupleLikeType) && getTupleElementType(type, index) ||
-                checkIteratedTypeOrElementType(type, undefined, false, false) ||
+                checkIteratedTypeOrElementType(65, type, undefinedType, undefined) ||
                 errorType;
         }
         function getTypeOfDestructuredSpreadExpression(type) {
-            return createArrayType(checkIteratedTypeOrElementType(type, undefined, false, false) || errorType);
+            return createArrayType(checkIteratedTypeOrElementType(65, type, undefinedType, undefined) || errorType);
         }
         function getAssignedTypeOfBinaryExpression(node) {
-            var isDestructuringDefaultAssignment = node.parent.kind === 187 && isDestructuringAssignmentTarget(node.parent) ||
-                node.parent.kind === 275 && isDestructuringAssignmentTarget(node.parent.parent);
+            var isDestructuringDefaultAssignment = node.parent.kind === 188 && isDestructuringAssignmentTarget(node.parent) ||
+                node.parent.kind === 276 && isDestructuringAssignmentTarget(node.parent.parent);
             return isDestructuringDefaultAssignment ?
                 getTypeWithDefault(getAssignedType(node), node.right) :
                 getTypeOfExpression(node.right);
         }
         function isDestructuringAssignmentTarget(parent) {
-            return parent.parent.kind === 204 && parent.parent.left === parent ||
-                parent.parent.kind === 227 && parent.parent.initializer === parent;
+            return parent.parent.kind === 205 && parent.parent.left === parent ||
+                parent.parent.kind === 228 && parent.parent.initializer === parent;
         }
         function getAssignedTypeOfArrayLiteralElement(node, element) {
             return getTypeOfDestructuredArrayElement(getAssignedType(node), node.elements.indexOf(element));
@@ -38005,21 +39158,21 @@ var ts;
         function getAssignedType(node) {
             var parent = node.parent;
             switch (parent.kind) {
-                case 226:
-                    return stringType;
                 case 227:
+                    return stringType;
+                case 228:
                     return checkRightHandSideOfForOf(parent.expression, parent.awaitModifier) || errorType;
-                case 204:
+                case 205:
                     return getAssignedTypeOfBinaryExpression(parent);
-                case 198:
+                case 199:
                     return undefinedType;
-                case 187:
+                case 188:
                     return getAssignedTypeOfArrayLiteralElement(parent, node);
-                case 208:
+                case 209:
                     return getAssignedTypeOfSpreadExpression(parent);
-                case 275:
-                    return getAssignedTypeOfPropertyAssignment(parent);
                 case 276:
+                    return getAssignedTypeOfPropertyAssignment(parent);
+                case 277:
                     return getAssignedTypeOfShorthandPropertyAssignment(parent);
             }
             return errorType;
@@ -38027,7 +39180,7 @@ var ts;
         function getInitialTypeOfBindingElement(node) {
             var pattern = node.parent;
             var parentType = getInitialType(pattern.parent);
-            var type = pattern.kind === 184 ?
+            var type = pattern.kind === 185 ?
                 getTypeOfDestructuredProperty(parentType, node.propertyName || node.name) :
                 !node.dotDotDotToken ?
                     getTypeOfDestructuredArrayElement(parentType, pattern.elements.indexOf(node)) :
@@ -38042,37 +39195,37 @@ var ts;
             if (node.initializer) {
                 return getTypeOfInitializer(node.initializer);
             }
-            if (node.parent.parent.kind === 226) {
+            if (node.parent.parent.kind === 227) {
                 return stringType;
             }
-            if (node.parent.parent.kind === 227) {
+            if (node.parent.parent.kind === 228) {
                 return checkRightHandSideOfForOf(node.parent.parent.expression, node.parent.parent.awaitModifier) || errorType;
             }
             return errorType;
         }
         function getInitialType(node) {
-            return node.kind === 237 ?
+            return node.kind === 238 ?
                 getInitialTypeOfVariableDeclaration(node) :
                 getInitialTypeOfBindingElement(node);
         }
         function getInitialOrAssignedType(node, reference) {
-            return getConstraintForLocation(node.kind === 237 || node.kind === 186 ?
+            return getConstraintForLocation(node.kind === 238 || node.kind === 187 ?
                 getInitialType(node) :
                 getAssignedType(node), reference);
         }
         function isEmptyArrayAssignment(node) {
-            return node.kind === 237 && node.initializer &&
+            return node.kind === 238 && node.initializer &&
                 isEmptyArrayLiteral(node.initializer) ||
-                node.kind !== 186 && node.parent.kind === 204 &&
+                node.kind !== 187 && node.parent.kind === 205 &&
                     isEmptyArrayLiteral(node.parent.right);
         }
         function getReferenceCandidate(node) {
             switch (node.kind) {
-                case 195:
+                case 196:
                     return getReferenceCandidate(node.expression);
-                case 204:
+                case 205:
                     switch (node.operatorToken.kind) {
-                        case 59:
+                        case 60:
                             return getReferenceCandidate(node.left);
                         case 27:
                             return getReferenceCandidate(node.right);
@@ -38082,13 +39235,13 @@ var ts;
         }
         function getReferenceRoot(node) {
             var parent = node.parent;
-            return parent.kind === 195 ||
-                parent.kind === 204 && parent.operatorToken.kind === 59 && parent.left === node ||
-                parent.kind === 204 && parent.operatorToken.kind === 27 && parent.right === node ?
+            return parent.kind === 196 ||
+                parent.kind === 205 && parent.operatorToken.kind === 60 && parent.left === node ||
+                parent.kind === 205 && parent.operatorToken.kind === 27 && parent.right === node ?
                 getReferenceRoot(parent) : node;
         }
         function getTypeOfSwitchClause(clause) {
-            if (clause.kind === 271) {
+            if (clause.kind === 272) {
                 return getRegularTypeOfLiteralType(getTypeOfExpression(clause.expression));
             }
             return neverType;
@@ -38108,7 +39261,7 @@ var ts;
             var witnesses = [];
             for (var _i = 0, _a = switchStatement.caseBlock.clauses; _i < _a.length; _i++) {
                 var clause = _a[_i];
-                if (clause.kind === 271) {
+                if (clause.kind === 272) {
                     if (clause.expression.kind === 10) {
                         witnesses.push(clause.expression.text);
                         continue;
@@ -38154,6 +39307,9 @@ var ts;
             }
             return f(type) ? type : neverType;
         }
+        function countTypes(type) {
+            return type.flags & 1048576 ? type.types.length : 1;
+        }
         function mapType(type, mapper, noReductions) {
             if (type.flags & 131072) {
                 return type;
@@ -38161,25 +39317,20 @@ var ts;
             if (!(type.flags & 1048576)) {
                 return mapper(type);
             }
-            var types = type.types;
-            var mappedType;
             var mappedTypes;
-            for (var _i = 0, types_13 = types; _i < types_13.length; _i++) {
-                var current = types_13[_i];
-                var t = mapper(current);
-                if (t) {
-                    if (!mappedType) {
-                        mappedType = t;
-                    }
-                    else if (!mappedTypes) {
-                        mappedTypes = [mappedType, t];
+            for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
+                var t = _a[_i];
+                var mapped = mapper(t);
+                if (mapped) {
+                    if (!mappedTypes) {
+                        mappedTypes = [mapped];
                     }
                     else {
-                        mappedTypes.push(t);
+                        mappedTypes.push(mapped);
                     }
                 }
             }
-            return mappedTypes ? getUnionType(mappedTypes, noReductions ? 0 : 1) : mappedType;
+            return mappedTypes && getUnionType(mappedTypes, noReductions ? 0 : 1);
         }
         function extractTypesOfKind(type, kind) {
             return filterType(type, function (t) { return (t.flags & kind) !== 0; });
@@ -38236,8 +39387,8 @@ var ts;
         }
         function isEvolvingArrayTypeList(types) {
             var hasEvolvingArrayType = false;
-            for (var _i = 0, types_14 = types; _i < types_14.length; _i++) {
-                var t = types_14[_i];
+            for (var _i = 0, types_13 = types; _i < types_13.length; _i++) {
+                var t = types_13[_i];
                 if (!(t.flags & 131072)) {
                     if (!(ts.getObjectFlags(t) & 256)) {
                         return false;
@@ -38255,12 +39406,12 @@ var ts;
         function isEvolvingArrayOperationTarget(node) {
             var root = getReferenceRoot(node);
             var parent = root.parent;
-            var isLengthPushOrUnshift = parent.kind === 189 && (parent.name.escapedText === "length" ||
-                parent.parent.kind === 191 && ts.isPushOrUnshiftIdentifier(parent.name));
-            var isElementAssignment = parent.kind === 190 &&
+            var isLengthPushOrUnshift = parent.kind === 190 && (parent.name.escapedText === "length" ||
+                parent.parent.kind === 192 && ts.isPushOrUnshiftIdentifier(parent.name));
+            var isElementAssignment = parent.kind === 191 &&
                 parent.expression === root &&
-                parent.parent.kind === 204 &&
-                parent.parent.operatorToken.kind === 59 &&
+                parent.parent.kind === 205 &&
+                parent.parent.operatorToken.kind === 60 &&
                 parent.parent.left === parent &&
                 !ts.isAssignmentTarget(parent.parent) &&
                 isTypeAssignableToKind(getTypeOfExpression(parent.argumentExpression), 296);
@@ -38274,7 +39425,7 @@ var ts;
             return links.maybeTypePredicate;
         }
         function getMaybeTypePredicate(node) {
-            if (node.expression.kind !== 98) {
+            if (node.expression.kind !== 99) {
                 var funcType = checkNonNullExpression(node.expression);
                 if (funcType !== silentNeverType) {
                     var apparentType = getApparentType(funcType);
@@ -38292,6 +39443,7 @@ var ts;
         function getFlowTypeOfReference(reference, declaredType, initialType, flowContainer, couldBeUninitialized) {
             if (initialType === void 0) { initialType = declaredType; }
             var key;
+            var keySet = false;
             var flowDepth = 0;
             if (flowAnalysisDisabled) {
                 return errorType;
@@ -38303,10 +39455,17 @@ var ts;
             var evolvedType = getTypeFromFlowType(getTypeAtFlowNode(reference.flowNode));
             sharedFlowCount = sharedFlowStart;
             var resultType = ts.getObjectFlags(evolvedType) & 256 && isEvolvingArrayOperationTarget(reference) ? autoArrayType : finalizeEvolvingArrayType(evolvedType);
-            if (reference.parent && reference.parent.kind === 213 && getTypeWithFacts(resultType, 2097152).flags & 131072) {
+            if (reference.parent && reference.parent.kind === 214 && getTypeWithFacts(resultType, 2097152).flags & 131072) {
                 return declaredType;
             }
             return resultType;
+            function getOrSetCacheKey() {
+                if (keySet) {
+                    return key;
+                }
+                keySet = true;
+                return key = getFlowCacheKey(reference, declaredType, initialType, flowContainer);
+            }
             function getTypeAtFlowNode(flow) {
                 if (flowDepth === 2000) {
                     flowAnalysisDisabled = true;
@@ -38316,6 +39475,15 @@ var ts;
                 flowDepth++;
                 while (true) {
                     var flags = flow.flags;
+                    if (flags & 8192) {
+                        var key_2 = getOrSetCacheKey();
+                        if (key_2) {
+                            var id = getFlowNodeId(flow);
+                            if (flowAssignmentKeys[id] === key_2) {
+                                return flowAssignmentTypes[id];
+                            }
+                        }
+                    }
                     if (flags & 1024) {
                         for (var i = sharedFlowStart; i < sharedFlowCount; i++) {
                             if (sharedFlowNodes[i] === flow) {
@@ -38340,6 +39508,15 @@ var ts;
                             flow = flow.antecedent;
                             continue;
                         }
+                        else if (flowLoopCount === flowLoopStart) {
+                            var key_3 = getOrSetCacheKey();
+                            if (key_3 && !isIncomplete(type)) {
+                                flow.flags |= 8192;
+                                var id = getFlowNodeId(flow);
+                                flowAssignmentKeys[id] = key_3;
+                                flowAssignmentTypes[id] = type;
+                            }
+                        }
                     }
                     else if (flags & 96) {
                         type = getTypeAtFlowCondition(flow);
@@ -38366,9 +39543,9 @@ var ts;
                     else if (flags & 2) {
                         var container = flow.container;
                         if (container && container !== flowContainer &&
-                            reference.kind !== 189 &&
                             reference.kind !== 190 &&
-                            reference.kind !== 100) {
+                            reference.kind !== 191 &&
+                            reference.kind !== 101) {
                             flow = container.flowNode;
                             continue;
                         }
@@ -38408,13 +39585,13 @@ var ts;
                 if (containsMatchingReference(reference, node)) {
                     if (ts.isVariableDeclaration(node) && (ts.isInJSFile(node) || ts.isVarConst(node))) {
                         var init = ts.getDeclaredExpandoInitializer(node);
-                        if (init && (init.kind === 196 || init.kind === 197)) {
+                        if (init && (init.kind === 197 || init.kind === 198)) {
                             return getTypeAtFlowNode(flow.antecedent);
                         }
                     }
                     return declaredType;
                 }
-                if (ts.isVariableDeclaration(node) && node.parent.parent.kind === 226 && isMatchingReference(reference, node.parent.parent.expression)) {
+                if (ts.isVariableDeclaration(node) && node.parent.parent.kind === 227 && isMatchingReference(reference, node.parent.parent.expression)) {
                     return getNonNullableTypeIfNeeded(getTypeFromFlowType(getTypeAtFlowNode(flow.antecedent)));
                 }
                 return undefined;
@@ -38422,7 +39599,7 @@ var ts;
             function getTypeAtFlowArrayMutation(flow) {
                 if (declaredType === autoType || declaredType === autoArrayType) {
                     var node = flow.node;
-                    var expr = node.kind === 191 ?
+                    var expr = node.kind === 192 ?
                         node.expression.expression :
                         node.left.expression;
                     if (isMatchingReference(reference, getReferenceCandidate(expr))) {
@@ -38430,7 +39607,7 @@ var ts;
                         var type = getTypeFromFlowType(flowType);
                         if (ts.getObjectFlags(type) & 256) {
                             var evolvedType_1 = type;
-                            if (node.kind === 191) {
+                            if (node.kind === 192) {
                                 for (var _i = 0, _a = node.arguments; _i < _a.length; _i++) {
                                     var arg = _a[_i];
                                     evolvedType_1 = addEvolvingArrayElementType(evolvedType_1, arg);
@@ -38475,7 +39652,7 @@ var ts;
                 else if (isMatchingReferenceDiscriminant(expr, type)) {
                     type = narrowTypeByDiscriminant(type, expr, function (t) { return narrowTypeBySwitchOnDiscriminant(t, flow.switchStatement, flow.clauseStart, flow.clauseEnd); });
                 }
-                else if (expr.kind === 199 && isMatchingReference(reference, expr.expression)) {
+                else if (expr.kind === 200 && isMatchingReference(reference, expr.expression)) {
                     type = narrowBySwitchOnTypeOf(type, flow.switchStatement, flow.clauseStart, flow.clauseEnd);
                 }
                 else if (containsMatchingReferenceDiscriminant(reference, expr)) {
@@ -38510,11 +39687,9 @@ var ts;
             function getTypeAtFlowLoopLabel(flow) {
                 var id = getFlowNodeId(flow);
                 var cache = flowLoopCaches[id] || (flowLoopCaches[id] = ts.createMap());
+                var key = getOrSetCacheKey();
                 if (!key) {
-                    key = getFlowCacheKey(reference);
-                    if (!key) {
-                        return declaredType;
-                    }
+                    return declaredType;
                 }
                 var cached = cache.get(key);
                 if (cached) {
@@ -38601,7 +39776,7 @@ var ts;
                 return !assumeTrue;
             }
             function narrowByInKeyword(type, literal, assumeTrue) {
-                if ((type.flags & (1048576 | 524288)) || (type.flags & 262144 && type.isThisType)) {
+                if (type.flags & (1048576 | 524288) || isThisTypeParameter(type)) {
                     var propName_1 = ts.escapeLeadingUnderscores(literal.text);
                     return filterType(type, function (t) { return isTypePresencePossible(t, propName_1, assumeTrue); });
                 }
@@ -38609,8 +39784,8 @@ var ts;
             }
             function narrowTypeByBinaryExpression(type, expr, assumeTrue) {
                 switch (expr.operatorToken.kind) {
-                    case 59:
-                        return narrowTypeByTruthiness(type, expr.left, assumeTrue);
+                    case 60:
+                        return narrowTypeByTruthiness(narrowType(type, expr.right, assumeTrue), expr.left, assumeTrue);
                     case 33:
                     case 34:
                     case 35:
@@ -38618,10 +39793,10 @@ var ts;
                         var operator_1 = expr.operatorToken.kind;
                         var left_1 = getReferenceCandidate(expr.left);
                         var right_1 = getReferenceCandidate(expr.right);
-                        if (left_1.kind === 199 && ts.isStringLiteralLike(right_1)) {
+                        if (left_1.kind === 200 && ts.isStringLiteralLike(right_1)) {
                             return narrowTypeByTypeof(type, left_1, operator_1, right_1, assumeTrue);
                         }
-                        if (right_1.kind === 199 && ts.isStringLiteralLike(left_1)) {
+                        if (right_1.kind === 200 && ts.isStringLiteralLike(left_1)) {
                             return narrowTypeByTypeof(type, right_1, operator_1, left_1, assumeTrue);
                         }
                         if (isMatchingReference(reference, left_1)) {
@@ -38640,9 +39815,9 @@ var ts;
                             return declaredType;
                         }
                         break;
-                    case 94:
+                    case 95:
                         return narrowTypeByInstanceof(type, expr, assumeTrue);
-                    case 93:
+                    case 94:
                         var target = getReferenceCandidate(expr.right);
                         if (ts.isStringLiteralLike(expr.left) && isMatchingReference(reference, target)) {
                             return narrowByInKeyword(type, expr.left, assumeTrue);
@@ -38686,7 +39861,10 @@ var ts;
                     return type;
                 }
                 if (assumeTrue) {
-                    var narrowedType = filterType(type, function (t) { return areTypesComparable(t, valueType); });
+                    var filterFn = operator === 33 ?
+                        (function (t) { return areTypesComparable(t, valueType) || isCoercibleUnderDoubleEquals(t, valueType); }) :
+                        function (t) { return areTypesComparable(t, valueType); };
+                    var narrowedType = filterType(type, filterFn);
                     return narrowedType.flags & 131072 ? type : replacePrimitivesWithLiterals(narrowedType, valueType);
                 }
                 if (isUnitType(valueType)) {
@@ -38884,7 +40062,7 @@ var ts;
                     return type;
                 }
                 if (ts.isIdentifierTypePredicate(predicate)) {
-                    var predicateArgument = callExpression.arguments[predicate.parameterIndex - (signature.thisParameter ? 1 : 0)];
+                    var predicateArgument = callExpression.arguments[predicate.parameterIndex];
                     if (predicateArgument) {
                         if (isMatchingReference(reference, predicateArgument)) {
                             return getNarrowedType(type, predicate.type, assumeTrue, isTypeSubtypeOf);
@@ -38910,19 +40088,19 @@ var ts;
             }
             function narrowType(type, expr, assumeTrue) {
                 switch (expr.kind) {
-                    case 72:
-                    case 100:
-                    case 98:
-                    case 189:
+                    case 73:
+                    case 101:
+                    case 99:
                     case 190:
-                        return narrowTypeByTruthiness(type, expr, assumeTrue);
                     case 191:
+                        return narrowTypeByTruthiness(type, expr, assumeTrue);
+                    case 192:
                         return narrowTypeByTypePredicate(type, expr, assumeTrue);
-                    case 195:
+                    case 196:
                         return narrowType(type, expr.expression, assumeTrue);
-                    case 204:
+                    case 205:
                         return narrowTypeByBinaryExpression(type, expr, assumeTrue);
-                    case 202:
+                    case 203:
                         if (expr.operator === 52) {
                             return narrowType(type, expr.operand, !assumeTrue);
                         }
@@ -38933,7 +40111,7 @@ var ts;
         }
         function getTypeOfSymbolAtLocation(symbol, location) {
             symbol = symbol.exportSymbol || symbol;
-            if (location.kind === 72) {
+            if (location.kind === 73) {
                 if (ts.isRightSideOfQualifiedNameOrPropertyAccess(location)) {
                     location = location.parent;
                 }
@@ -38949,9 +40127,9 @@ var ts;
         function getControlFlowContainer(node) {
             return ts.findAncestor(node.parent, function (node) {
                 return ts.isFunctionLike(node) && !ts.getImmediatelyInvokedFunctionExpression(node) ||
-                    node.kind === 245 ||
-                    node.kind === 284 ||
-                    node.kind === 154;
+                    node.kind === 246 ||
+                    node.kind === 285 ||
+                    node.kind === 155;
             });
         }
         function isParameterAssigned(symbol) {
@@ -38969,10 +40147,10 @@ var ts;
             return !!ts.findAncestor(node.parent, function (node) { return ts.isFunctionLike(node) && !!(getNodeLinks(node).flags & 8388608); });
         }
         function markParameterAssignments(node) {
-            if (node.kind === 72) {
+            if (node.kind === 73) {
                 if (ts.isAssignmentTarget(node)) {
                     var symbol = getResolvedSymbol(node);
-                    if (symbol.valueDeclaration && ts.getRootDeclaration(symbol.valueDeclaration).kind === 151) {
+                    if (symbol.valueDeclaration && ts.getRootDeclaration(symbol.valueDeclaration).kind === 152) {
                         symbol.isAssigned = true;
                     }
                 }
@@ -38986,7 +40164,7 @@ var ts;
         }
         function removeOptionalityFromDeclaredType(declaredType, declaration) {
             var annotationIncludesUndefined = strictNullChecks &&
-                declaration.kind === 151 &&
+                declaration.kind === 152 &&
                 declaration.initializer &&
                 getFalsyFlags(declaredType) & 32768 &&
                 !(getFalsyFlags(checkExpression(declaration.initializer)) & 32768);
@@ -38994,13 +40172,13 @@ var ts;
         }
         function isConstraintPosition(node) {
             var parent = node.parent;
-            return parent.kind === 189 ||
+            return parent.kind === 190 ||
+                parent.kind === 192 && parent.expression === node ||
                 parent.kind === 191 && parent.expression === node ||
-                parent.kind === 190 && parent.expression === node ||
-                parent.kind === 186 && parent.name === node && !!parent.initializer;
+                parent.kind === 187 && parent.name === node && !!parent.initializer;
         }
         function typeHasNullableConstraint(type) {
-            return type.flags & 58982400 && maybeTypeOfKind(getBaseConstraintOfType(type) || emptyObjectType, 98304);
+            return type.flags & 58982400 && maybeTypeOfKind(getBaseConstraintOfType(type) || unknownType, 98304);
         }
         function getConstraintForLocation(type, node) {
             if (type && isConstraintPosition(node) && forEachType(type, typeHasNullableConstraint)) {
@@ -39021,7 +40199,7 @@ var ts;
             if (symbol === argumentsSymbol) {
                 var container = ts.getContainingFunction(node);
                 if (languageVersion < 2) {
-                    if (container.kind === 197) {
+                    if (container.kind === 198) {
                         error(node, ts.Diagnostics.The_arguments_object_cannot_be_referenced_in_an_arrow_function_in_ES3_and_ES5_Consider_using_a_standard_function_expression);
                     }
                     else if (ts.hasModifier(container, 256)) {
@@ -39037,7 +40215,7 @@ var ts;
             var localOrExportSymbol = getExportSymbolOfValueSymbolIfExported(symbol);
             var declaration = localOrExportSymbol.valueDeclaration;
             if (localOrExportSymbol.flags & 32) {
-                if (declaration.kind === 240
+                if (declaration.kind === 241
                     && ts.nodeIsDecorated(declaration)) {
                     var container = ts.getContainingClass(node);
                     while (container !== undefined) {
@@ -39049,11 +40227,11 @@ var ts;
                         container = ts.getContainingClass(container);
                     }
                 }
-                else if (declaration.kind === 209) {
+                else if (declaration.kind === 210) {
                     var container = ts.getThisContainer(node, false);
-                    while (container.kind !== 284) {
+                    while (container.kind !== 285) {
                         if (container.parent === declaration) {
-                            if (container.kind === 154 && ts.hasModifier(container, 32)) {
+                            if (container.kind === 155 && ts.hasModifier(container, 32)) {
                                 getNodeLinks(declaration).flags |= 16777216;
                                 getNodeLinks(node).flags |= 33554432;
                             }
@@ -39097,22 +40275,22 @@ var ts;
             if (!declaration) {
                 return type;
             }
-            var isParameter = ts.getRootDeclaration(declaration).kind === 151;
+            var isParameter = ts.getRootDeclaration(declaration).kind === 152;
             var declarationContainer = getControlFlowContainer(declaration);
             var flowContainer = getControlFlowContainer(node);
             var isOuterVariable = flowContainer !== declarationContainer;
             var isSpreadDestructuringAssignmentTarget = node.parent && node.parent.parent && ts.isSpreadAssignment(node.parent) && isDestructuringAssignmentTarget(node.parent.parent);
             var isModuleExports = symbol.flags & 134217728;
-            while (flowContainer !== declarationContainer && (flowContainer.kind === 196 ||
-                flowContainer.kind === 197 || ts.isObjectLiteralOrClassExpressionMethod(flowContainer)) &&
+            while (flowContainer !== declarationContainer && (flowContainer.kind === 197 ||
+                flowContainer.kind === 198 || ts.isObjectLiteralOrClassExpressionMethod(flowContainer)) &&
                 (isConstVariable(localOrExportSymbol) || isParameter && !isParameterAssigned(localOrExportSymbol))) {
                 flowContainer = getControlFlowContainer(flowContainer);
             }
-            var assumeInitialized = isParameter || isAlias || isOuterVariable || isSpreadDestructuringAssignmentTarget || isModuleExports ||
+            var assumeInitialized = isParameter || isAlias || isOuterVariable || isSpreadDestructuringAssignmentTarget || isModuleExports || ts.isBindingElement(declaration) ||
                 type !== autoType && type !== autoArrayType && (!strictNullChecks || (type.flags & 3) !== 0 ||
-                    isInTypeQuery(node) || node.parent.kind === 257) ||
-                node.parent.kind === 213 ||
-                declaration.kind === 237 && declaration.exclamationToken ||
+                    isInTypeQuery(node) || node.parent.kind === 258) ||
+                node.parent.kind === 214 ||
+                declaration.kind === 238 && declaration.exclamationToken ||
                 declaration.flags & 4194304;
             var initialType = assumeInitialized ? (isParameter ? removeOptionalityFromDeclaredType(type, declaration) : type) :
                 type === autoType || type === autoArrayType ? undefinedType :
@@ -39142,7 +40320,8 @@ var ts;
         function checkNestedBlockScopedBinding(node, symbol) {
             if (languageVersion >= 2 ||
                 (symbol.flags & (2 | 32)) === 0 ||
-                symbol.valueDeclaration.parent.kind === 274) {
+                ts.isSourceFile(symbol.valueDeclaration) ||
+                symbol.valueDeclaration.parent.kind === 275) {
                 return;
             }
             var container = ts.getEnclosingBlockScopeContainer(symbol.valueDeclaration);
@@ -39160,7 +40339,7 @@ var ts;
                 if (usedInFunction) {
                     var capturesBlockScopeBindingInLoopBody = true;
                     if (ts.isForStatement(container) &&
-                        ts.getAncestor(symbol.valueDeclaration, 238).parent === container) {
+                        ts.getAncestor(symbol.valueDeclaration, 239).parent === container) {
                         var part = getPartOfForStatementContainingNode(node.parent, container);
                         if (part) {
                             var links = getNodeLinks(part);
@@ -39176,8 +40355,8 @@ var ts;
                         getNodeLinks(current).flags |= 65536;
                     }
                 }
-                if (container.kind === 225 &&
-                    ts.getAncestor(symbol.valueDeclaration, 238).parent === container &&
+                if (container.kind === 226 &&
+                    ts.getAncestor(symbol.valueDeclaration, 239).parent === container &&
                     isAssignedInBodyOfForStatement(node, container)) {
                     getNodeLinks(symbol.valueDeclaration).flags |= 4194304;
                 }
@@ -39193,14 +40372,14 @@ var ts;
         }
         function isAssignedInBodyOfForStatement(node, container) {
             var current = node;
-            while (current.parent.kind === 195) {
+            while (current.parent.kind === 196) {
                 current = current.parent;
             }
             var isAssigned = false;
             if (ts.isAssignmentTarget(current)) {
                 isAssigned = true;
             }
-            else if ((current.parent.kind === 202 || current.parent.kind === 203)) {
+            else if ((current.parent.kind === 203 || current.parent.kind === 204)) {
                 var expr = current.parent;
                 isAssigned = expr.operator === 44 || expr.operator === 45;
             }
@@ -39211,7 +40390,7 @@ var ts;
         }
         function captureLexicalThis(node, container) {
             getNodeLinks(node).flags |= 2;
-            if (container.kind === 154 || container.kind === 157) {
+            if (container.kind === 155 || container.kind === 158) {
                 var classNode = container.parent;
                 getNodeLinks(classNode).flags |= 4;
             }
@@ -39255,32 +40434,32 @@ var ts;
         function checkThisExpression(node) {
             var container = ts.getThisContainer(node, true);
             var capturedByArrowFunction = false;
-            if (container.kind === 157) {
+            if (container.kind === 158) {
                 checkThisBeforeSuper(node, container, ts.Diagnostics.super_must_be_called_before_accessing_this_in_the_constructor_of_a_derived_class);
             }
-            if (container.kind === 197) {
+            if (container.kind === 198) {
                 container = ts.getThisContainer(container, false);
                 capturedByArrowFunction = true;
             }
             switch (container.kind) {
-                case 244:
+                case 245:
                     error(node, ts.Diagnostics.this_cannot_be_referenced_in_a_module_or_namespace_body);
                     break;
-                case 243:
+                case 244:
                     error(node, ts.Diagnostics.this_cannot_be_referenced_in_current_location);
                     break;
-                case 157:
+                case 158:
                     if (isInConstructorArgumentInitializer(node, container)) {
                         error(node, ts.Diagnostics.this_cannot_be_referenced_in_constructor_arguments);
                     }
                     break;
+                case 155:
                 case 154:
-                case 153:
                     if (ts.hasModifier(container, 32)) {
                         error(node, ts.Diagnostics.this_cannot_be_referenced_in_a_static_property_initializer);
                     }
                     break;
-                case 149:
+                case 150:
                     error(node, ts.Diagnostics.this_cannot_be_referenced_in_a_computed_property_name);
                     break;
             }
@@ -39298,7 +40477,7 @@ var ts;
                     if (!ts.isSourceFile(container)) {
                         var outsideThis = tryGetThisTypeAt(container);
                         if (outsideThis && outsideThis !== globalThisType_1) {
-                            addRelatedInfo(diag, ts.createDiagnosticForNode(container, ts.Diagnostics.An_outer_value_of_this_is_shadowed_by_this_container));
+                            ts.addRelatedInfo(diag, ts.createDiagnosticForNode(container, ts.Diagnostics.An_outer_value_of_this_is_shadowed_by_this_container));
                         }
                     }
                 }
@@ -39322,7 +40501,7 @@ var ts;
                     }
                 }
                 else if (isInJS &&
-                    (container.kind === 196 || container.kind === 239) &&
+                    (container.kind === 197 || container.kind === 240) &&
                     ts.getJSDocClassTag(container)) {
                     var classType = getJSClassType(getMergedSymbol(container.symbol));
                     if (classType) {
@@ -39356,7 +40535,7 @@ var ts;
             }
         }
         function getClassNameFromPrototypeMethod(container) {
-            if (container.kind === 196 &&
+            if (container.kind === 197 &&
                 ts.isBinaryExpression(container.parent) &&
                 ts.getAssignmentDeclarationKind(container.parent) === 3) {
                 return container.parent
@@ -39364,20 +40543,20 @@ var ts;
                     .expression
                     .expression;
             }
-            else if (container.kind === 156 &&
-                container.parent.kind === 188 &&
+            else if (container.kind === 157 &&
+                container.parent.kind === 189 &&
                 ts.isBinaryExpression(container.parent.parent) &&
                 ts.getAssignmentDeclarationKind(container.parent.parent) === 6) {
                 return container.parent.parent.left.expression;
             }
-            else if (container.kind === 196 &&
-                container.parent.kind === 275 &&
-                container.parent.parent.kind === 188 &&
+            else if (container.kind === 197 &&
+                container.parent.kind === 276 &&
+                container.parent.parent.kind === 189 &&
                 ts.isBinaryExpression(container.parent.parent.parent) &&
                 ts.getAssignmentDeclarationKind(container.parent.parent.parent) === 6) {
                 return container.parent.parent.parent.left.expression;
             }
-            else if (container.kind === 196 &&
+            else if (container.kind === 197 &&
                 ts.isPropertyAssignment(container.parent) &&
                 ts.isIdentifier(container.parent.name) &&
                 (container.parent.name.escapedText === "value" || container.parent.name.escapedText === "get" || container.parent.name.escapedText === "set") &&
@@ -39399,7 +40578,7 @@ var ts;
         }
         function getTypeForThisExpressionFromJSDoc(node) {
             var jsdocType = ts.getJSDocType(node);
-            if (jsdocType && jsdocType.kind === 294) {
+            if (jsdocType && jsdocType.kind === 295) {
                 var jsDocFunctionType = jsdocType;
                 if (jsDocFunctionType.parameters.length > 0 &&
                     jsDocFunctionType.parameters[0].name &&
@@ -39413,14 +40592,14 @@ var ts;
             }
         }
         function isInConstructorArgumentInitializer(node, constructorDecl) {
-            return !!ts.findAncestor(node, function (n) { return ts.isFunctionLikeDeclaration(n) ? "quit" : n.kind === 151 && n.parent === constructorDecl; });
+            return !!ts.findAncestor(node, function (n) { return ts.isFunctionLikeDeclaration(n) ? "quit" : n.kind === 152 && n.parent === constructorDecl; });
         }
         function checkSuperExpression(node) {
-            var isCallExpression = node.parent.kind === 191 && node.parent.expression === node;
+            var isCallExpression = node.parent.kind === 192 && node.parent.expression === node;
             var container = ts.getSuperContainer(node, true);
             var needToCaptureLexicalThis = false;
             if (!isCallExpression) {
-                while (container && container.kind === 197) {
+                while (container && container.kind === 198) {
                     container = ts.getSuperContainer(container, true);
                     needToCaptureLexicalThis = languageVersion < 2;
                 }
@@ -39428,14 +40607,14 @@ var ts;
             var canUseSuperExpression = isLegalUsageOfSuperExpression(container);
             var nodeCheckFlag = 0;
             if (!canUseSuperExpression) {
-                var current = ts.findAncestor(node, function (n) { return n === container ? "quit" : n.kind === 149; });
-                if (current && current.kind === 149) {
+                var current = ts.findAncestor(node, function (n) { return n === container ? "quit" : n.kind === 150; });
+                if (current && current.kind === 150) {
                     error(node, ts.Diagnostics.super_cannot_be_referenced_in_a_computed_property_name);
                 }
                 else if (isCallExpression) {
                     error(node, ts.Diagnostics.Super_calls_are_not_permitted_outside_constructors_or_in_nested_functions_inside_constructors);
                 }
-                else if (!container || !container.parent || !(ts.isClassLike(container.parent) || container.parent.kind === 188)) {
+                else if (!container || !container.parent || !(ts.isClassLike(container.parent) || container.parent.kind === 189)) {
                     error(node, ts.Diagnostics.super_can_only_be_referenced_in_members_of_derived_classes_or_object_literal_expressions);
                 }
                 else {
@@ -39443,7 +40622,7 @@ var ts;
                 }
                 return errorType;
             }
-            if (!isCallExpression && container.kind === 157) {
+            if (!isCallExpression && container.kind === 158) {
                 checkThisBeforeSuper(node, container, ts.Diagnostics.super_must_be_called_before_accessing_a_property_of_super_in_the_constructor_of_a_derived_class);
             }
             if (ts.hasModifier(container, 32) || isCallExpression) {
@@ -39453,7 +40632,7 @@ var ts;
                 nodeCheckFlag = 256;
             }
             getNodeLinks(node).flags |= nodeCheckFlag;
-            if (container.kind === 156 && ts.hasModifier(container, 256)) {
+            if (container.kind === 157 && ts.hasModifier(container, 256)) {
                 if (ts.isSuperProperty(node.parent) && ts.isAssignmentTarget(node.parent)) {
                     getNodeLinks(container).flags |= 4096;
                 }
@@ -39464,7 +40643,7 @@ var ts;
             if (needToCaptureLexicalThis) {
                 captureLexicalThis(node.parent, container);
             }
-            if (container.parent.kind === 188) {
+            if (container.parent.kind === 189) {
                 if (languageVersion < 2) {
                     error(node, ts.Diagnostics.super_is_only_allowed_in_members_of_object_literal_expressions_when_option_target_is_ES2015_or_higher);
                     return errorType;
@@ -39483,7 +40662,7 @@ var ts;
             if (!baseClassType) {
                 return errorType;
             }
-            if (container.kind === 157 && isInConstructorArgumentInitializer(node, container)) {
+            if (container.kind === 158 && isInConstructorArgumentInitializer(node, container)) {
                 error(node, ts.Diagnostics.super_cannot_be_referenced_in_constructor_arguments);
                 return errorType;
             }
@@ -39495,24 +40674,24 @@ var ts;
                     return false;
                 }
                 if (isCallExpression) {
-                    return container.kind === 157;
+                    return container.kind === 158;
                 }
                 else {
-                    if (ts.isClassLike(container.parent) || container.parent.kind === 188) {
+                    if (ts.isClassLike(container.parent) || container.parent.kind === 189) {
                         if (ts.hasModifier(container, 32)) {
-                            return container.kind === 156 ||
-                                container.kind === 155 ||
-                                container.kind === 158 ||
-                                container.kind === 159;
+                            return container.kind === 157 ||
+                                container.kind === 156 ||
+                                container.kind === 159 ||
+                                container.kind === 160;
                         }
                         else {
-                            return container.kind === 156 ||
-                                container.kind === 155 ||
-                                container.kind === 158 ||
+                            return container.kind === 157 ||
+                                container.kind === 156 ||
                                 container.kind === 159 ||
+                                container.kind === 160 ||
+                                container.kind === 155 ||
                                 container.kind === 154 ||
-                                container.kind === 153 ||
-                                container.kind === 157;
+                                container.kind === 158;
                         }
                     }
                 }
@@ -39520,10 +40699,10 @@ var ts;
             }
         }
         function getContainingObjectLiteral(func) {
-            return (func.kind === 156 ||
-                func.kind === 158 ||
-                func.kind === 159) && func.parent.kind === 188 ? func.parent :
-                func.kind === 196 && func.parent.kind === 275 ? func.parent.parent :
+            return (func.kind === 157 ||
+                func.kind === 159 ||
+                func.kind === 160) && func.parent.kind === 189 ? func.parent :
+                func.kind === 197 && func.parent.kind === 276 ? func.parent.parent :
                     undefined;
         }
         function getThisTypeArgument(type) {
@@ -39535,7 +40714,7 @@ var ts;
             });
         }
         function getContextualThisParameterType(func) {
-            if (func.kind === 197) {
+            if (func.kind === 198) {
                 return undefined;
             }
             if (isContextSensitiveFunctionOrObjectLiteralMethod(func)) {
@@ -39557,20 +40736,20 @@ var ts;
                     while (type) {
                         var thisType = getThisTypeFromContextualType(type);
                         if (thisType) {
-                            return instantiateType(thisType, getContextualMapper(containingLiteral));
+                            return instantiateType(thisType, getMapperFromContext(getInferenceContext(containingLiteral)));
                         }
-                        if (literal.parent.kind !== 275) {
+                        if (literal.parent.kind !== 276) {
                             break;
                         }
                         literal = literal.parent.parent;
                         type = getApparentTypeOfContextualType(literal);
                     }
-                    return contextualType ? getNonNullableType(contextualType) : checkExpressionCached(containingLiteral);
+                    return getWidenedType(contextualType ? getNonNullableType(contextualType) : checkExpressionCached(containingLiteral));
                 }
                 var parent = func.parent;
-                if (parent.kind === 204 && parent.operatorToken.kind === 59) {
+                if (parent.kind === 205 && parent.operatorToken.kind === 60) {
                     var target = parent.left;
-                    if (target.kind === 189 || target.kind === 190) {
+                    if (target.kind === 190 || target.kind === 191) {
                         var expression = target.expression;
                         if (inJs && ts.isIdentifier(expression)) {
                             var sourceFile = ts.getSourceFileOfNode(parent);
@@ -39578,13 +40757,13 @@ var ts;
                                 return undefined;
                             }
                         }
-                        return checkExpressionCached(expression);
+                        return getWidenedType(checkExpressionCached(expression));
                     }
                 }
             }
             return undefined;
         }
-        function getContextuallyTypedParameterType(parameter) {
+        function getContextuallyTypedParameterType(parameter, forCache) {
             var func = parameter.parent;
             if (!isContextSensitiveFunctionOrObjectLiteralMethod(func)) {
                 return undefined;
@@ -39607,6 +40786,14 @@ var ts;
             }
             var contextualSignature = getContextualSignature(func);
             if (contextualSignature) {
+                if (forCache) {
+                    contextuallyCheckFunctionExpressionOrObjectLiteralMethod(func);
+                    var type = getTypeOfSymbol(getMergedSymbol(func.symbol));
+                    if (isTypeAny(type)) {
+                        return type;
+                    }
+                    contextualSignature = getSignaturesOfType(type, 0)[0];
+                }
                 var index = func.parameters.indexOf(parameter) - (ts.getThisParameter(func) ? 1 : 0);
                 return parameter.dotDotDotToken && ts.lastOrUndefined(func.parameters) === parameter ?
                     getRestTypeAtPosition(contextualSignature, index) :
@@ -39619,9 +40806,9 @@ var ts;
                 return getTypeFromTypeNode(typeNode);
             }
             switch (declaration.kind) {
-                case 151:
-                    return getContextuallyTypedParameterType(declaration);
-                case 186:
+                case 152:
+                    return getContextuallyTypedParameterType(declaration, false);
+                case 187:
                     return getContextualTypeForBindingElement(declaration);
             }
         }
@@ -39684,7 +40871,7 @@ var ts;
                 if (contextualReturnType) {
                     return node.asteriskToken
                         ? contextualReturnType
-                        : getIteratedTypeOfGenerator(contextualReturnType, (functionFlags & 2) !== 0);
+                        : getIterationTypeOfGeneratorFunctionReturnType(0, contextualReturnType, (functionFlags & 2) !== 0);
                 }
             }
             return undefined;
@@ -39726,16 +40913,16 @@ var ts;
             return getTypeAtPosition(signature, argIndex);
         }
         function getContextualTypeForSubstitutionExpression(template, substitutionExpression) {
-            if (template.parent.kind === 193) {
+            if (template.parent.kind === 194) {
                 return getContextualTypeForArgument(template.parent, substitutionExpression);
             }
             return undefined;
         }
-        function getContextualTypeForBinaryOperand(node) {
+        function getContextualTypeForBinaryOperand(node, contextFlags) {
             var binaryExpression = node.parent;
             var left = binaryExpression.left, operatorToken = binaryExpression.operatorToken, right = binaryExpression.right;
             switch (operatorToken.kind) {
-                case 59:
+                case 60:
                     if (node !== right) {
                         return undefined;
                     }
@@ -39745,12 +40932,12 @@ var ts;
                     }
                     return contextSensitive === true ? getTypeOfExpression(left) : contextSensitive;
                 case 55:
-                    var type = getContextualType(binaryExpression);
-                    return !type && node === right && !ts.isDefaultedExpandoInitializer(binaryExpression) ?
+                    var type = getContextualType(binaryExpression, contextFlags);
+                    return node === right && (type && type.pattern || !type && !ts.isDefaultedExpandoInitializer(binaryExpression)) ?
                         getTypeOfExpression(left) : type;
                 case 54:
                 case 27:
-                    return node === right ? getContextualType(binaryExpression) : undefined;
+                    return node === right ? getContextualType(binaryExpression, contextFlags) : undefined;
                 default:
                     return undefined;
             }
@@ -39822,7 +41009,15 @@ var ts;
         }
         function getTypeOfPropertyOfContextualType(type, name) {
             return mapType(type, function (t) {
-                if (t.flags & 3670016) {
+                if (isGenericMappedType(t)) {
+                    var constraint = getConstraintTypeFromMappedType(t);
+                    var constraintOfConstraint = getBaseConstraintOfType(constraint) || constraint;
+                    var propertyNameType = getLiteralType(ts.unescapeLeadingUnderscores(name));
+                    if (isTypeAssignableTo(propertyNameType, constraintOfConstraint)) {
+                        return substituteIndexedMappedType(t, propertyNameType);
+                    }
+                }
+                else if (t.flags & 3670016) {
                     var prop = getPropertyOfType(t, name);
                     if (prop) {
                         return getTypeOfSymbol(prop);
@@ -39842,20 +41037,20 @@ var ts;
         function getIndexTypeOfContextualType(type, kind) {
             return mapType(type, function (t) { return getIndexTypeOfStructuredType(t, kind); }, true);
         }
-        function getContextualTypeForObjectLiteralMethod(node) {
+        function getContextualTypeForObjectLiteralMethod(node, contextFlags) {
             ts.Debug.assert(ts.isObjectLiteralMethod(node));
             if (node.flags & 8388608) {
                 return undefined;
             }
-            return getContextualTypeForObjectLiteralElement(node);
+            return getContextualTypeForObjectLiteralElement(node, contextFlags);
         }
-        function getContextualTypeForObjectLiteralElement(element) {
+        function getContextualTypeForObjectLiteralElement(element, contextFlags) {
             var objectLiteral = element.parent;
-            var type = getApparentTypeOfContextualType(objectLiteral);
+            var type = getApparentTypeOfContextualType(objectLiteral, contextFlags);
             if (type) {
                 if (!hasNonBindableDynamicName(element)) {
-                    var symbolName_2 = getSymbolOfNode(element).escapedName;
-                    var propertyType = getTypeOfPropertyOfContextualType(type, symbolName_2);
+                    var symbolName_3 = getSymbolOfNode(element).escapedName;
+                    var propertyType = getTypeOfPropertyOfContextualType(type, symbolName_3);
                     if (propertyType) {
                         return propertyType;
                     }
@@ -39867,11 +41062,11 @@ var ts;
         }
         function getContextualTypeForElementExpression(arrayContextualType, index) {
             return arrayContextualType && (getTypeOfPropertyOfContextualType(arrayContextualType, "" + index)
-                || getIteratedTypeOrElementType(arrayContextualType, undefined, false, false, false));
+                || getIteratedTypeOrElementType(1, arrayContextualType, undefinedType, undefined, false));
         }
-        function getContextualTypeForConditionalOperand(node) {
+        function getContextualTypeForConditionalOperand(node, contextFlags) {
             var conditional = node.parent;
-            return node === conditional.whenTrue || node === conditional.whenFalse ? getContextualType(conditional) : undefined;
+            return node === conditional.whenTrue || node === conditional.whenFalse ? getContextualType(conditional, contextFlags) : undefined;
         }
         function getContextualTypeForChildJsxExpression(node, child) {
             var attributesType = getApparentTypeOfContextualType(node.openingElement.tagName);
@@ -39879,16 +41074,17 @@ var ts;
             if (!(attributesType && !isTypeAny(attributesType) && jsxChildrenPropertyName && jsxChildrenPropertyName !== "")) {
                 return undefined;
             }
-            var childIndex = node.children.indexOf(child);
+            var realChildren = getSemanticJsxChildren(node.children);
+            var childIndex = realChildren.indexOf(child);
             var childFieldType = getTypeOfPropertyOfContextualType(attributesType, jsxChildrenPropertyName);
-            return childFieldType && mapType(childFieldType, function (t) {
+            return childFieldType && (realChildren.length === 1 ? childFieldType : mapType(childFieldType, function (t) {
                 if (isArrayLikeType(t)) {
                     return getIndexedAccessType(t, getLiteralType(childIndex));
                 }
                 else {
                     return t;
                 }
-            }, true);
+            }, true));
         }
         function getContextualTypeForJsxExpression(node) {
             var exprParent = node.parent;
@@ -39916,28 +41112,28 @@ var ts;
                 case 8:
                 case 9:
                 case 14:
-                case 102:
-                case 87:
-                case 96:
-                case 72:
-                case 141:
+                case 103:
+                case 88:
+                case 97:
+                case 73:
+                case 142:
                     return true;
-                case 189:
-                case 195:
+                case 190:
+                case 196:
                     return isPossiblyDiscriminantValue(node.expression);
-                case 270:
+                case 271:
                     return !node.expression || isPossiblyDiscriminantValue(node.expression);
             }
             return false;
         }
         function discriminateContextualTypeByObjectMembers(node, contextualType) {
-            return discriminateTypeByDiscriminableItems(contextualType, ts.map(ts.filter(node.properties, function (p) { return !!p.symbol && p.kind === 275 && isPossiblyDiscriminantValue(p.initializer) && isDiscriminantProperty(contextualType, p.symbol.escapedName); }), function (prop) { return [function () { return checkExpression(prop.initializer); }, prop.symbol.escapedName]; }), isTypeAssignableTo, contextualType);
+            return discriminateTypeByDiscriminableItems(contextualType, ts.map(ts.filter(node.properties, function (p) { return !!p.symbol && p.kind === 276 && isPossiblyDiscriminantValue(p.initializer) && isDiscriminantProperty(contextualType, p.symbol.escapedName); }), function (prop) { return [function () { return checkExpression(prop.initializer); }, prop.symbol.escapedName]; }), isTypeAssignableTo, contextualType);
         }
         function discriminateContextualTypeByJSXAttributes(node, contextualType) {
-            return discriminateTypeByDiscriminableItems(contextualType, ts.map(ts.filter(node.properties, function (p) { return !!p.symbol && p.kind === 267 && isDiscriminantProperty(contextualType, p.symbol.escapedName) && (!p.initializer || isPossiblyDiscriminantValue(p.initializer)); }), function (prop) { return [!prop.initializer ? (function () { return trueType; }) : (function () { return checkExpression(prop.initializer); }), prop.symbol.escapedName]; }), isTypeAssignableTo, contextualType);
+            return discriminateTypeByDiscriminableItems(contextualType, ts.map(ts.filter(node.properties, function (p) { return !!p.symbol && p.kind === 268 && isDiscriminantProperty(contextualType, p.symbol.escapedName) && (!p.initializer || isPossiblyDiscriminantValue(p.initializer)); }), function (prop) { return [!prop.initializer ? (function () { return trueType; }) : (function () { return checkExpression(prop.initializer); }), prop.symbol.escapedName]; }), isTypeAssignableTo, contextualType);
         }
-        function getApparentTypeOfContextualType(node) {
-            var contextualType = instantiateContextualType(getContextualType(node), node);
+        function getApparentTypeOfContextualType(node, contextFlags) {
+            var contextualType = instantiateContextualType(getContextualType(node, contextFlags), node, contextFlags);
             if (contextualType) {
                 var apparentType = mapType(contextualType, getApparentType, true);
                 if (apparentType.flags & 1048576) {
@@ -39951,11 +41147,16 @@ var ts;
                 return apparentType;
             }
         }
-        function instantiateContextualType(contextualType, node) {
+        function instantiateContextualType(contextualType, node, contextFlags) {
             if (contextualType && maybeTypeOfKind(contextualType, 63176704)) {
-                var returnMapper = getContextualMapper(node).returnMapper;
-                if (returnMapper) {
-                    return instantiateInstantiableTypes(contextualType, returnMapper);
+                var inferenceContext = getInferenceContext(node);
+                if (inferenceContext && ts.some(inferenceContext.inferences, hasInferenceCandidates)) {
+                    if (contextFlags && contextFlags & 1) {
+                        return instantiateInstantiableTypes(contextualType, inferenceContext.nonFixingMapper);
+                    }
+                    if (inferenceContext.returnMapper) {
+                        return instantiateInstantiableTypes(contextualType, inferenceContext.returnMapper);
+                    }
                 }
             }
             return contextualType;
@@ -39972,7 +41173,7 @@ var ts;
             }
             return type;
         }
-        function getContextualType(node) {
+        function getContextualType(node, contextFlags) {
             if (node.flags & 8388608) {
                 return undefined;
             }
@@ -39981,60 +41182,63 @@ var ts;
             }
             var parent = node.parent;
             switch (parent.kind) {
-                case 237:
-                case 151:
+                case 238:
+                case 152:
+                case 155:
                 case 154:
-                case 153:
-                case 186:
+                case 187:
                     return getContextualTypeForInitializerExpression(node);
-                case 197:
-                case 230:
+                case 198:
+                case 231:
                     return getContextualTypeForReturnExpression(node);
-                case 207:
+                case 208:
                     return getContextualTypeForYieldOperand(parent);
-                case 201:
+                case 202:
                     return getContextualTypeForAwaitOperand(parent);
-                case 191:
                 case 192:
+                    if (parent.expression.kind === 93) {
+                        return stringType;
+                    }
+                case 193:
                     return getContextualTypeForArgument(parent, node);
-                case 194:
-                case 212:
+                case 195:
+                case 213:
                     return ts.isConstTypeReference(parent.type) ? undefined : getTypeFromTypeNode(parent.type);
-                case 204:
-                    return getContextualTypeForBinaryOperand(node);
-                case 275:
+                case 205:
+                    return getContextualTypeForBinaryOperand(node, contextFlags);
                 case 276:
-                    return getContextualTypeForObjectLiteralElement(parent);
                 case 277:
-                    return getApparentTypeOfContextualType(parent.parent);
-                case 187: {
+                    return getContextualTypeForObjectLiteralElement(parent, contextFlags);
+                case 278:
+                    return getApparentTypeOfContextualType(parent.parent, contextFlags);
+                case 188: {
                     var arrayLiteral = parent;
-                    var type = getApparentTypeOfContextualType(arrayLiteral);
+                    var type = getApparentTypeOfContextualType(arrayLiteral, contextFlags);
                     return getContextualTypeForElementExpression(type, ts.indexOfNode(arrayLiteral.elements, node));
                 }
-                case 205:
-                    return getContextualTypeForConditionalOperand(node);
-                case 216:
-                    ts.Debug.assert(parent.parent.kind === 206);
+                case 206:
+                    return getContextualTypeForConditionalOperand(node, contextFlags);
+                case 217:
+                    ts.Debug.assert(parent.parent.kind === 207);
                     return getContextualTypeForSubstitutionExpression(parent.parent, node);
-                case 195: {
+                case 196: {
                     var tag = ts.isInJSFile(parent) ? ts.getJSDocTypeTag(parent) : undefined;
-                    return tag ? getTypeFromTypeNode(tag.typeExpression.type) : getContextualType(parent);
+                    return tag ? getTypeFromTypeNode(tag.typeExpression.type) : getContextualType(parent, contextFlags);
                 }
-                case 270:
+                case 271:
                     return getContextualTypeForJsxExpression(parent);
-                case 267:
-                case 269:
+                case 268:
+                case 270:
                     return getContextualTypeForJsxAttribute(parent);
+                case 263:
                 case 262:
-                case 261:
                     return getContextualJsxElementAttributesType(parent);
             }
             return undefined;
         }
-        function getContextualMapper(node) {
-            var ancestor = ts.findAncestor(node, function (n) { return !!n.contextualMapper; });
-            return ancestor ? ancestor.contextualMapper : identityMapper;
+        function getInferenceContext(node) {
+            var ancestor = ts.findAncestor(node, function (n) { return !!n.inferenceContext; });
+            return ancestor && ancestor.inferenceContext;
         }
         function getContextualJsxElementAttributesType(node) {
             if (ts.isJsxOpeningElement(node) && node.parent.contextualType) {
@@ -40046,7 +41250,7 @@ var ts;
             return getJsxReferenceKind(node) !== 0 ? getJsxPropsTypeFromCallSignature(signature, node) : getJsxPropsTypeFromClassType(signature, node);
         }
         function getJsxPropsTypeFromCallSignature(sig, context) {
-            var propsType = getTypeOfFirstParameterOfSignatureWithFallback(sig, emptyObjectType);
+            var propsType = getTypeOfFirstParameterOfSignatureWithFallback(sig, unknownType);
             propsType = getJsxManagedAttributesFromLocatedAttributes(context, getJsxNamespaceAt(context), propsType);
             var intrinsicAttribs = getJsxType(JsxNames.IntrinsicAttributes, context);
             if (intrinsicAttribs !== errorType) {
@@ -40111,7 +41315,7 @@ var ts;
             var ns = getJsxNamespaceAt(context);
             var forcedLookupLocation = getJsxElementPropertiesName(ns);
             var attributesType = forcedLookupLocation === undefined
-                ? getTypeOfFirstParameterOfSignatureWithFallback(sig, emptyObjectType)
+                ? getTypeOfFirstParameterOfSignatureWithFallback(sig, unknownType)
                 : forcedLookupLocation === ""
                     ? getReturnTypeOfSignature(sig)
                     : getJsxPropsTypeForSignatureFromMember(sig, forcedLookupLocation);
@@ -40119,7 +41323,7 @@ var ts;
                 if (!!forcedLookupLocation && !!ts.length(context.attributes.properties)) {
                     error(context, ts.Diagnostics.JSX_element_class_does_not_support_attributes_because_it_does_not_have_a_0_property, ts.unescapeLeadingUnderscores(forcedLookupLocation));
                 }
-                return emptyObjectType;
+                return unknownType;
             }
             attributesType = getJsxManagedAttributesFromLocatedAttributes(context, ns, attributesType);
             if (isTypeAny(attributesType)) {
@@ -40165,25 +41369,22 @@ var ts;
             return !hasEffectiveRestParameter(signature) && getParameterCount(signature) < targetParameterCount;
         }
         function isFunctionExpressionOrArrowFunction(node) {
-            return node.kind === 196 || node.kind === 197;
+            return node.kind === 197 || node.kind === 198;
         }
         function getContextualSignatureForFunctionLikeDeclaration(node) {
             return isFunctionExpressionOrArrowFunction(node) || ts.isObjectLiteralMethod(node)
                 ? getContextualSignature(node)
                 : undefined;
         }
-        function getContextualTypeForFunctionLikeDeclaration(node) {
-            return ts.isObjectLiteralMethod(node) ?
-                getContextualTypeForObjectLiteralMethod(node) :
-                getApparentTypeOfContextualType(node);
-        }
         function getContextualSignature(node) {
-            ts.Debug.assert(node.kind !== 156 || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 157 || ts.isObjectLiteralMethod(node));
             var typeTagSignature = getSignatureOfTypeTag(node);
             if (typeTagSignature) {
                 return typeTagSignature;
             }
-            var type = getContextualTypeForFunctionLikeDeclaration(node);
+            var type = ts.isObjectLiteralMethod(node) ?
+                getContextualTypeForObjectLiteralMethod(node, 1) :
+                getApparentTypeOfContextualType(node, 1);
             if (!type) {
                 return undefined;
             }
@@ -40192,8 +41393,8 @@ var ts;
             }
             var signatureList;
             var types = type.types;
-            for (var _i = 0, types_15 = types; _i < types_15.length; _i++) {
-                var current = types_15[_i];
+            for (var _i = 0, types_14 = types; _i < types_14.length; _i++) {
+                var current = types_14[_i];
                 var signature = getContextualCallSignature(current, node);
                 if (signature) {
                     if (!signatureList) {
@@ -40207,23 +41408,20 @@ var ts;
                     }
                 }
             }
-            var result;
             if (signatureList) {
-                result = cloneSignature(signatureList[0]);
-                result.unionSignatures = signatureList;
+                return signatureList.length === 1 ? signatureList[0] : createUnionSignature(signatureList[0], signatureList);
             }
-            return result;
         }
         function checkSpreadExpression(node, checkMode) {
-            if (languageVersion < 2 && compilerOptions.downlevelIteration) {
-                checkExternalEmitHelpers(node, 1536);
+            if (languageVersion < 2) {
+                checkExternalEmitHelpers(node, compilerOptions.downlevelIteration ? 1536 : 2048);
             }
             var arrayOrIterableType = checkExpression(node.expression, checkMode);
-            return checkIteratedTypeOrElementType(arrayOrIterableType, node.expression, false, false);
+            return checkIteratedTypeOrElementType(33, arrayOrIterableType, undefinedType, node.expression);
         }
         function hasDefaultValue(node) {
-            return (node.kind === 186 && !!node.initializer) ||
-                (node.kind === 204 && node.operatorToken.kind === 59);
+            return (node.kind === 187 && !!node.initializer) ||
+                (node.kind === 205 && node.operatorToken.kind === 60);
         }
         function checkArrayLiteral(node, checkMode, forceTuple) {
             var elements = node.elements;
@@ -40235,10 +41433,10 @@ var ts;
             var inConstContext = isConstContext(node);
             for (var index = 0; index < elementCount; index++) {
                 var e = elements[index];
-                if (inDestructuringPattern && e.kind === 208) {
+                if (inDestructuringPattern && e.kind === 209) {
                     var restArrayType = checkExpression(e.expression, checkMode, forceTuple);
                     var restElementType = getIndexTypeOfType(restArrayType, 1) ||
-                        getIteratedTypeOrElementType(restArrayType, undefined, false, false, false);
+                        getIteratedTypeOrElementType(65, restArrayType, undefinedType, undefined, false);
                     if (restElementType) {
                         elementTypes.push(restElementType);
                     }
@@ -40248,12 +41446,12 @@ var ts;
                     var type = checkExpressionForMutableLocation(e, checkMode, elementContextualType, forceTuple);
                     elementTypes.push(type);
                 }
-                if (index < elementCount - 1 && e.kind === 208) {
+                if (index < elementCount - 1 && e.kind === 209) {
                     hasNonEndingSpreadElement = true;
                 }
             }
             if (!hasNonEndingSpreadElement) {
-                var hasRestElement = elementCount > 0 && elements[elementCount - 1].kind === 208;
+                var hasRestElement = elementCount > 0 && elements[elementCount - 1].kind === 209;
                 var minLength = elementCount - (hasRestElement ? 1 : 0);
                 var tupleResult = void 0;
                 if (inDestructuringPattern && minLength > 0) {
@@ -40262,45 +41460,39 @@ var ts;
                     return type;
                 }
                 else if (tupleResult = getArrayLiteralTupleTypeIfApplicable(elementTypes, contextualType, hasRestElement, elementCount, inConstContext)) {
-                    return tupleResult;
+                    return createArrayLiteralType(tupleResult);
                 }
                 else if (forceTuple) {
-                    return createTupleType(elementTypes, minLength, hasRestElement);
+                    return createArrayLiteralType(createTupleType(elementTypes, minLength, hasRestElement));
                 }
             }
-            return createArrayType(elementTypes.length ?
+            return createArrayLiteralType(createArrayType(elementTypes.length ?
                 getUnionType(elementTypes, 2) :
-                strictNullChecks ? implicitNeverType : undefinedWideningType, inConstContext);
+                strictNullChecks ? implicitNeverType : undefinedWideningType, inConstContext));
+        }
+        function createArrayLiteralType(type) {
+            if (!(ts.getObjectFlags(type) & 4)) {
+                return type;
+            }
+            var literalType = type.literalType;
+            if (!literalType) {
+                literalType = type.literalType = cloneTypeReference(type);
+                literalType.objectFlags |= 65536 | 524288;
+            }
+            return literalType;
         }
         function getArrayLiteralTupleTypeIfApplicable(elementTypes, contextualType, hasRestElement, elementCount, readonly) {
             if (elementCount === void 0) { elementCount = elementTypes.length; }
             if (readonly === void 0) { readonly = false; }
             if (readonly || (contextualType && forEachType(contextualType, isTupleLikeType))) {
-                var minLength = elementCount - (hasRestElement ? 1 : 0);
-                var pattern = contextualType && contextualType.pattern;
-                if (!hasRestElement && pattern && (pattern.kind === 185 || pattern.kind === 187)) {
-                    var patternElements = pattern.elements;
-                    for (var i = elementCount; i < patternElements.length; i++) {
-                        var e = patternElements[i];
-                        if (hasDefaultValue(e)) {
-                            elementTypes.push(contextualType.typeArguments[i]);
-                        }
-                        else if (i < patternElements.length - 1 || !(e.kind === 186 && e.dotDotDotToken || e.kind === 208)) {
-                            if (e.kind !== 210) {
-                                error(e, ts.Diagnostics.Initializer_provides_no_value_for_this_binding_element_and_the_binding_element_has_no_default_value);
-                            }
-                            elementTypes.push(strictNullChecks ? implicitNeverType : undefinedWideningType);
-                        }
-                    }
-                }
-                return createTupleType(elementTypes, minLength, hasRestElement, readonly);
+                return createTupleType(elementTypes, elementCount - (hasRestElement ? 1 : 0), hasRestElement, readonly);
             }
         }
         function isNumericName(name) {
             switch (name.kind) {
-                case 149:
+                case 150:
                     return isNumericComputedName(name);
-                case 72:
+                case 73:
                     return isNumericLiteralName(name.escapedText);
                 case 8:
                 case 10:
@@ -40362,7 +41554,7 @@ var ts;
             var spread = emptyObjectType;
             var contextualType = getApparentTypeOfContextualType(node);
             var contextualTypeHasPattern = contextualType && contextualType.pattern &&
-                (contextualType.pattern.kind === 184 || contextualType.pattern.kind === 188);
+                (contextualType.pattern.kind === 185 || contextualType.pattern.kind === 189);
             var inConstContext = isConstContext(node);
             var checkFlags = inConstContext ? 8 : 0;
             var isInJavascript = ts.isInJSFile(node) && !ts.isInJsonFile(node);
@@ -40377,13 +41569,13 @@ var ts;
             for (var i = 0; i < node.properties.length; i++) {
                 var memberDecl = node.properties[i];
                 var member = getSymbolOfNode(memberDecl);
-                var computedNameType = memberDecl.name && memberDecl.name.kind === 149 && !ts.isWellKnownSymbolSyntactically(memberDecl.name.expression) ?
+                var computedNameType = memberDecl.name && memberDecl.name.kind === 150 && !ts.isWellKnownSymbolSyntactically(memberDecl.name.expression) ?
                     checkComputedPropertyName(memberDecl.name) : undefined;
-                if (memberDecl.kind === 275 ||
-                    memberDecl.kind === 276 ||
+                if (memberDecl.kind === 276 ||
+                    memberDecl.kind === 277 ||
                     ts.isObjectLiteralMethod(memberDecl)) {
-                    var type = memberDecl.kind === 275 ? checkPropertyAssignment(memberDecl, checkMode) :
-                        memberDecl.kind === 276 ? checkExpressionForMutableLocation(memberDecl.name, checkMode) :
+                    var type = memberDecl.kind === 276 ? checkPropertyAssignment(memberDecl, checkMode) :
+                        memberDecl.kind === 277 ? checkExpressionForMutableLocation(memberDecl.name, checkMode) :
                             checkObjectLiteralMethod(memberDecl, checkMode);
                     if (isInJavascript) {
                         var jsDocType = getTypeForDeclarationFromJSDocComment(memberDecl);
@@ -40395,17 +41587,17 @@ var ts;
                             checkTypeAssignableTo(type, getTypeFromTypeNode(enumTag.typeExpression), memberDecl);
                         }
                     }
-                    objectFlags |= ts.getObjectFlags(type) & 917504;
+                    objectFlags |= ts.getObjectFlags(type) & 1835008;
                     var nameType = computedNameType && isTypeUsableAsPropertyName(computedNameType) ? computedNameType : undefined;
                     var prop = nameType ?
-                        createSymbol(4 | member.flags, getPropertyNameFromType(nameType), checkFlags | 2048) :
+                        createSymbol(4 | member.flags, getPropertyNameFromType(nameType), checkFlags | 4096) :
                         createSymbol(4 | member.flags, member.escapedName, checkFlags);
                     if (nameType) {
                         prop.nameType = nameType;
                     }
                     if (inDestructuringPattern) {
-                        var isOptional = (memberDecl.kind === 275 && hasDefaultValue(memberDecl.initializer)) ||
-                            (memberDecl.kind === 276 && memberDecl.objectAssignmentInitializer);
+                        var isOptional = (memberDecl.kind === 276 && hasDefaultValue(memberDecl.initializer)) ||
+                            (memberDecl.kind === 277 && memberDecl.objectAssignmentInitializer);
                         if (isOptional) {
                             prop.flags |= 16777216;
                         }
@@ -40428,7 +41620,7 @@ var ts;
                     prop.target = member;
                     member = prop;
                 }
-                else if (memberDecl.kind === 277) {
+                else if (memberDecl.kind === 278) {
                     if (languageVersion < 2) {
                         checkExternalEmitHelpers(memberDecl, 2);
                     }
@@ -40449,7 +41641,7 @@ var ts;
                     continue;
                 }
                 else {
-                    ts.Debug.assert(memberDecl.kind === 158 || memberDecl.kind === 159);
+                    ts.Debug.assert(memberDecl.kind === 159 || memberDecl.kind === 160);
                     checkNodeDeferred(memberDecl);
                 }
                 if (computedNameType && !(computedNameType.flags & 8576)) {
@@ -40493,7 +41685,7 @@ var ts;
                 var stringIndexInfo = hasComputedStringProperty ? getObjectLiteralIndexInfo(node, offset, propertiesArray, 0) : undefined;
                 var numberIndexInfo = hasComputedNumberProperty ? getObjectLiteralIndexInfo(node, offset, propertiesArray, 1) : undefined;
                 var result = createAnonymousType(node.symbol, propertiesTable, ts.emptyArray, ts.emptyArray, stringIndexInfo, numberIndexInfo);
-                result.objectFlags |= objectFlags | 128 | 262144;
+                result.objectFlags |= objectFlags | 128 | 524288;
                 if (isJSObjectLiteral) {
                     result.objectFlags |= 16384;
                 }
@@ -40546,7 +41738,7 @@ var ts;
             return !ts.stringContains(name, "-");
         }
         function isJsxIntrinsicIdentifier(tagName) {
-            return tagName.kind === 72 && ts.isIntrinsicJsxName(tagName.escapedText);
+            return tagName.kind === 73 && ts.isIntrinsicJsxName(tagName.escapedText);
         }
         function checkJsxAttribute(node, checkMode) {
             return node.initializer
@@ -40567,7 +41759,7 @@ var ts;
                 var member = attributeDecl.symbol;
                 if (ts.isJsxAttribute(attributeDecl)) {
                     var exprType = checkJsxAttribute(attributeDecl, checkMode);
-                    objectFlags |= ts.getObjectFlags(exprType) & 917504;
+                    objectFlags |= ts.getObjectFlags(exprType) & 1835008;
                     var attributeSymbol = createSymbol(4 | 33554432 | member.flags, member.escapedName);
                     attributeSymbol.declarations = member.declarations;
                     attributeSymbol.parent = member.parent;
@@ -40582,7 +41774,7 @@ var ts;
                     }
                 }
                 else {
-                    ts.Debug.assert(attributeDecl.kind === 269);
+                    ts.Debug.assert(attributeDecl.kind === 270);
                     if (attributesTable.size > 0) {
                         spread = getSpreadType(spread, createJsxAttributesType(), attributes.symbol, objectFlags, false);
                         attributesTable = ts.createSymbolTable();
@@ -40604,7 +41796,7 @@ var ts;
                     spread = getSpreadType(spread, createJsxAttributesType(), attributes.symbol, objectFlags, false);
                 }
             }
-            var parent = openingLikeElement.parent.kind === 260 ? openingLikeElement.parent : undefined;
+            var parent = openingLikeElement.parent.kind === 261 ? openingLikeElement.parent : undefined;
             if (parent && parent.openingElement === openingLikeElement && parent.children.length > 0) {
                 var childrenTypes = checkJsxChildren(parent, checkMode);
                 if (!hasSpreadAnyType && jsxChildrenPropertyName && jsxChildrenPropertyName !== "") {
@@ -40635,7 +41827,7 @@ var ts;
             function createJsxAttributesType() {
                 objectFlags |= freshObjectLiteralFlag;
                 var result = createAnonymousType(attributes.symbol, attributesTable, ts.emptyArray, ts.emptyArray, undefined, undefined);
-                result.objectFlags |= objectFlags | 128 | 262144;
+                result.objectFlags |= objectFlags | 128 | 524288;
                 return result;
             }
         }
@@ -40644,7 +41836,7 @@ var ts;
             for (var _i = 0, _a = node.children; _i < _a.length; _i++) {
                 var child = _a[_i];
                 if (child.kind === 11) {
-                    if (!child.containsOnlyWhiteSpaces) {
+                    if (!child.containsOnlyTriviaWhiteSpaces) {
                         childrenTypes.push(stringType);
                     }
                 }
@@ -40899,6 +42091,7 @@ var ts;
                 type.flags & 2097152 && ts.every(type.types, isExcessPropertyCheckTarget));
         }
         function checkJsxExpression(node, checkMode) {
+            checkGrammarJsxExpression(node);
             if (node.expression) {
                 var type = checkExpression(node.expression, checkMode);
                 if (node.dotDotDotToken && type !== anyType && !isArrayType(type)) {
@@ -40925,8 +42118,8 @@ var ts;
         }
         function checkPropertyAccessibility(node, isSuper, type, prop) {
             var flags = ts.getDeclarationModifierFlagsFromSymbol(prop);
-            var errorNode = node.kind === 148 ? node.right : node.kind === 183 ? node : node.name;
-            if (ts.getCheckFlags(prop) & 512) {
+            var errorNode = node.kind === 149 ? node.right : node.kind === 184 ? node : node.name;
+            if (ts.getCheckFlags(prop) & 1024) {
                 error(errorNode, ts.Diagnostics.Property_0_has_conflicting_declarations_and_is_inaccessible_in_type_1, symbolToString(prop), typeToString(type));
                 return false;
             }
@@ -41006,7 +42199,7 @@ var ts;
             return type;
         }
         function checkNonNullType(type, node, nullDiagnostic, undefinedDiagnostic, nullOrUndefinedDiagnostic) {
-            if (type.flags & 2) {
+            if (strictNullChecks && type.flags & 2) {
                 error(node, ts.Diagnostics.Object_is_of_type_unknown);
                 return errorType;
             }
@@ -41021,42 +42214,58 @@ var ts;
             }
             return type;
         }
+        function checkNonNullNonVoidType(type, node) {
+            var nonNullType = checkNonNullType(type, node);
+            if (nonNullType !== errorType && nonNullType.flags & 16384) {
+                error(node, ts.Diagnostics.Object_is_possibly_undefined);
+            }
+            return nonNullType;
+        }
         function checkPropertyAccessExpression(node) {
             return checkPropertyAccessExpressionOrQualifiedName(node, node.expression, node.name);
         }
         function checkQualifiedName(node) {
             return checkPropertyAccessExpressionOrQualifiedName(node, node.left, node.right);
         }
+        function isMethodAccessForCall(node) {
+            while (node.parent.kind === 196) {
+                node = node.parent;
+            }
+            return ts.isCallOrNewExpression(node.parent) && node.parent.expression === node;
+        }
         function checkPropertyAccessExpressionOrQualifiedName(node, left, right) {
             var propType;
             var leftType = checkNonNullExpression(left);
             var parentSymbol = getNodeLinks(left).resolvedSymbol;
-            var apparentType = getApparentType(getWidenedType(leftType));
+            var assignmentKind = ts.getAssignmentTargetKind(node);
+            var apparentType = getApparentType(assignmentKind !== 0 || isMethodAccessForCall(node) ? getWidenedType(leftType) : leftType);
             if (isTypeAny(apparentType) || apparentType === silentNeverType) {
                 if (ts.isIdentifier(left) && parentSymbol) {
                     markAliasReferenced(parentSymbol, node);
                 }
                 return apparentType;
             }
-            var assignmentKind = ts.getAssignmentTargetKind(node);
             var prop = getPropertyOfType(apparentType, right.escapedText);
             if (ts.isIdentifier(left) && parentSymbol && !(prop && isConstEnumOrConstEnumOnlyModule(prop))) {
                 markAliasReferenced(parentSymbol, node);
             }
             if (!prop) {
-                var indexInfo = getIndexInfoOfType(apparentType, 0);
+                var indexInfo = assignmentKind === 0 || !isGenericObjectType(leftType) || isThisTypeParameter(leftType) ? getIndexInfoOfType(apparentType, 0) : undefined;
                 if (!(indexInfo && indexInfo.type)) {
                     if (isJSLiteralType(leftType)) {
                         return anyType;
                     }
                     if (leftType.symbol === globalThisSymbol) {
-                        if (noImplicitAny) {
+                        if (globalThisSymbol.exports.has(right.escapedText) && (globalThisSymbol.exports.get(right.escapedText).flags & 418)) {
+                            error(right, ts.Diagnostics.Property_0_does_not_exist_on_type_1, ts.unescapeLeadingUnderscores(right.escapedText), typeToString(leftType));
+                        }
+                        else if (noImplicitAny) {
                             error(right, ts.Diagnostics.Element_implicitly_has_an_any_type_because_type_0_has_no_index_signature, typeToString(leftType));
                         }
                         return anyType;
                     }
                     if (right.escapedText && !checkAndReportErrorForExtendingInterface(node)) {
-                        reportNonexistentProperty(right, leftType.flags & 262144 && leftType.isThisType ? apparentType : leftType);
+                        reportNonexistentProperty(right, isThisTypeParameter(leftType) ? apparentType : leftType);
                     }
                     return errorType;
                 }
@@ -41067,9 +42276,9 @@ var ts;
             }
             else {
                 checkPropertyNotUsedBeforeDeclaration(prop, node, right);
-                markPropertyAsReferenced(prop, node, left.kind === 100);
+                markPropertyAsReferenced(prop, node, left.kind === 101);
                 getNodeLinks(node).resolvedSymbol = prop;
-                checkPropertyAccessibility(node, left.kind === 98, apparentType, prop);
+                checkPropertyAccessibility(node, left.kind === 99, apparentType, prop);
                 if (assignmentKind) {
                     if (isReferenceToReadonlyEntity(node, prop) || isReferenceThroughNamespaceImport(node)) {
                         error(right, ts.Diagnostics.Cannot_assign_to_0_because_it_is_a_read_only_property, ts.idText(right));
@@ -41078,17 +42287,21 @@ var ts;
                 }
                 propType = getConstraintForLocation(getTypeOfSymbol(prop), node);
             }
-            if (node.kind !== 189 ||
+            return getFlowTypeOfAccessExpression(node, prop, propType, right);
+        }
+        function getFlowTypeOfAccessExpression(node, prop, propType, errorNode) {
+            var assignmentKind = ts.getAssignmentTargetKind(node);
+            if (node.kind !== 191 && node.kind !== 190 ||
                 assignmentKind === 1 ||
                 prop && !(prop.flags & (3 | 4 | 98304)) && !(prop.flags & 8192 && propType.flags & 1048576)) {
                 return propType;
             }
             var assumeUninitialized = false;
-            if (strictNullChecks && strictPropertyInitialization && left.kind === 100) {
+            if (strictNullChecks && strictPropertyInitialization && node.expression.kind === 101) {
                 var declaration = prop && prop.valueDeclaration;
                 if (declaration && isInstancePropertyWithoutInitializer(declaration)) {
                     var flowContainer = getControlFlowContainer(node);
-                    if (flowContainer.kind === 157 && flowContainer.parent === declaration.parent) {
+                    if (flowContainer.kind === 158 && flowContainer.parent === declaration.parent) {
                         assumeUninitialized = true;
                     }
                 }
@@ -41101,7 +42314,7 @@ var ts;
             }
             var flowType = getFlowTypeOfReference(node, propType, assumeUninitialized ? getOptionalType(propType) : propType);
             if (assumeUninitialized && !(getFalsyFlags(propType) & 32768) && getFalsyFlags(flowType) & 32768) {
-                error(right, ts.Diagnostics.Property_0_is_used_before_being_assigned, symbolToString(prop));
+                error(errorNode, ts.Diagnostics.Property_0_is_used_before_being_assigned, symbolToString(prop));
                 return propType;
             }
             return assignmentKind ? getBaseTypeOfLiteralType(flowType) : flowType;
@@ -41118,35 +42331,35 @@ var ts;
                 && !isPropertyDeclaredInAncestorClass(prop)) {
                 diagnosticMessage = error(right, ts.Diagnostics.Property_0_is_used_before_its_initialization, declarationName);
             }
-            else if (valueDeclaration.kind === 240 &&
-                node.parent.kind !== 164 &&
+            else if (valueDeclaration.kind === 241 &&
+                node.parent.kind !== 165 &&
                 !(valueDeclaration.flags & 4194304) &&
                 !isBlockScopedNameDeclaredBeforeUse(valueDeclaration, right)) {
                 diagnosticMessage = error(right, ts.Diagnostics.Class_0_used_before_its_declaration, declarationName);
             }
             if (diagnosticMessage) {
-                addRelatedInfo(diagnosticMessage, ts.createDiagnosticForNode(valueDeclaration, ts.Diagnostics._0_is_declared_here, declarationName));
+                ts.addRelatedInfo(diagnosticMessage, ts.createDiagnosticForNode(valueDeclaration, ts.Diagnostics._0_is_declared_here, declarationName));
             }
         }
         function isInPropertyInitializer(node) {
             return !!ts.findAncestor(node, function (node) {
                 switch (node.kind) {
-                    case 154:
+                    case 155:
                         return true;
-                    case 275:
-                    case 156:
-                    case 158:
+                    case 276:
+                    case 157:
                     case 159:
-                    case 277:
-                    case 149:
-                    case 216:
-                    case 270:
-                    case 267:
+                    case 160:
+                    case 278:
+                    case 150:
+                    case 217:
+                    case 271:
                     case 268:
                     case 269:
-                    case 262:
-                    case 211:
-                    case 273:
+                    case 270:
+                    case 263:
+                    case 212:
+                    case 274:
                         return false;
                     default:
                         return ts.isExpressionNode(node) ? false : "quit";
@@ -41194,7 +42407,8 @@ var ts;
             else {
                 var promisedType = getPromisedTypeOfPromise(containingType);
                 if (promisedType && getPropertyOfType(promisedType, propNode.escapedText)) {
-                    errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.Property_0_does_not_exist_on_type_1_Did_you_forget_to_use_await, ts.declarationNameToString(propNode), typeToString(containingType));
+                    errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.Property_0_does_not_exist_on_type_1, ts.declarationNameToString(propNode), typeToString(containingType));
+                    relatedInfo = ts.createDiagnosticForNode(propNode, ts.Diagnostics.Did_you_forget_to_use_await);
                 }
                 else {
                     var suggestion = getSuggestedSymbolForNonexistentProperty(propNode, containingType);
@@ -41210,7 +42424,7 @@ var ts;
             }
             var resultDiagnostic = ts.createDiagnosticForNodeFromMessageChain(propNode, errorInfo);
             if (relatedInfo) {
-                addRelatedInfo(resultDiagnostic, relatedInfo);
+                ts.addRelatedInfo(resultDiagnostic, relatedInfo);
             }
             diagnostics.add(resultDiagnostic);
         }
@@ -41245,6 +42459,31 @@ var ts;
             var suggestion = getSuggestedSymbolForNonexistentModule(name, targetModule);
             return suggestion && ts.symbolName(suggestion);
         }
+        function getSuggestionForNonexistentIndexSignature(objectType, expr) {
+            var hasProp = function (name, argCount) {
+                if (argCount === void 0) { argCount = 1; }
+                var prop = getPropertyOfObjectType(objectType, name);
+                if (prop) {
+                    var s = getSingleCallSignature(getTypeOfSymbol(prop));
+                    if (s && getMinArgumentCount(s) === argCount && typeToString(getTypeAtPosition(s, 0)) === "string") {
+                        return true;
+                    }
+                }
+                return false;
+            };
+            var suggestedMethod = ts.isAssignmentTarget(expr) ? "set" : "get";
+            if (!hasProp(suggestedMethod)) {
+                return undefined;
+            }
+            var suggestion = ts.tryGetPropertyAccessOrIdentifierToString(expr);
+            if (suggestion === undefined) {
+                suggestion = suggestedMethod;
+            }
+            else {
+                suggestion += "." + suggestedMethod;
+            }
+            return suggestion;
+        }
         function getSpellingSuggestionForName(name, symbols, meaning) {
             return ts.getSpellingSuggestion(name, symbols, getCandidateName);
             function getCandidateName(candidate) {
@@ -41269,34 +42508,16 @@ var ts;
         }
         function isValidPropertyAccess(node, propertyName) {
             switch (node.kind) {
-                case 189:
-                    return isValidPropertyAccessWithType(node, node.expression.kind === 98, propertyName, getWidenedType(checkExpression(node.expression)));
-                case 148:
+                case 190:
+                    return isValidPropertyAccessWithType(node, node.expression.kind === 99, propertyName, getWidenedType(checkExpression(node.expression)));
+                case 149:
                     return isValidPropertyAccessWithType(node, false, propertyName, getWidenedType(checkExpression(node.left)));
-                case 183:
+                case 184:
                     return isValidPropertyAccessWithType(node, false, propertyName, getTypeFromTypeNode(node));
             }
         }
         function isValidPropertyAccessForCompletions(node, type, property) {
-            return isValidPropertyAccessWithType(node, node.kind === 189 && node.expression.kind === 98, property.escapedName, type)
-                && (!(property.flags & 8192) || isValidMethodAccess(property, type));
-        }
-        function isValidMethodAccess(method, actualThisType) {
-            var propType = getTypeOfPropertyOfType(actualThisType, method.escapedName);
-            var signatures = getSignaturesOfType(getNonNullableType(propType), 0);
-            ts.Debug.assert(signatures.length !== 0);
-            return signatures.some(function (sig) {
-                var signatureThisType = getThisTypeOfSignature(sig);
-                return !signatureThisType || isTypeAssignableTo(actualThisType, getInstantiatedSignatureThisType(sig, signatureThisType, actualThisType));
-            });
-        }
-        function getInstantiatedSignatureThisType(sig, signatureThisType, actualThisType) {
-            if (!sig.typeParameters) {
-                return signatureThisType;
-            }
-            var context = createInferenceContext(sig.typeParameters, sig, 0);
-            inferTypes(context.inferences, actualThisType, signatureThisType);
-            return instantiateType(signatureThisType, createSignatureTypeMapper(sig, getInferredTypes(context)));
+            return isValidPropertyAccessWithType(node, node.kind === 190 && node.expression.kind === 99, property.escapedName, type);
         }
         function isValidPropertyAccessWithType(node, isSuper, propertyName, type) {
             if (type === errorType || isTypeAny(type)) {
@@ -41308,13 +42529,13 @@ var ts;
         }
         function getForInVariableSymbol(node) {
             var initializer = node.initializer;
-            if (initializer.kind === 238) {
+            if (initializer.kind === 239) {
                 var variable = initializer.declarations[0];
                 if (variable && !ts.isBindingPattern(variable.name)) {
                     return getSymbolOfNode(variable);
                 }
             }
-            else if (initializer.kind === 72) {
+            else if (initializer.kind === 73) {
                 return getResolvedSymbol(initializer);
             }
             return undefined;
@@ -41324,13 +42545,13 @@ var ts;
         }
         function isForInVariableForNumericPropertyNames(expr) {
             var e = ts.skipParentheses(expr);
-            if (e.kind === 72) {
+            if (e.kind === 73) {
                 var symbol = getResolvedSymbol(e);
                 if (symbol.flags & 3) {
                     var child = expr;
                     var node = expr.parent;
                     while (node) {
-                        if (node.kind === 226 &&
+                        if (node.kind === 227 &&
                             child === node.statement &&
                             getForInVariableSymbol(node) === symbol &&
                             hasNumericPropertyNames(getTypeOfExpression(node.expression))) {
@@ -41344,11 +42565,12 @@ var ts;
             return false;
         }
         function checkIndexedAccess(node) {
-            var objectType = checkNonNullExpression(node.expression);
+            var exprType = checkNonNullExpression(node.expression);
+            var objectType = ts.getAssignmentTargetKind(node) !== 0 || isMethodAccessForCall(node) ? getWidenedType(exprType) : exprType;
             var indexExpression = node.argumentExpression;
             if (!indexExpression) {
                 var sourceFile = ts.getSourceFileOfNode(node);
-                if (node.parent.kind === 192 && node.parent.expression === node) {
+                if (node.parent.kind === 193 && node.parent.expression === node) {
                     var start = ts.skipTrivia(sourceFile.text, node.expression.end);
                     var end = node.end;
                     grammarErrorAtPos(sourceFile, start, end - start, ts.Diagnostics.new_T_cannot_be_used_to_create_an_array_Use_new_Array_T_instead);
@@ -41368,7 +42590,12 @@ var ts;
                 error(indexExpression, ts.Diagnostics.A_const_enum_member_can_only_be_accessed_using_a_string_literal);
                 return errorType;
             }
-            return checkIndexedAccessIndexType(getIndexedAccessType(objectType, isForInVariableForNumericPropertyNames(indexExpression) ? numberType : indexType, node), node);
+            var effectiveIndexType = isForInVariableForNumericPropertyNames(indexExpression) ? numberType : indexType;
+            var accessFlags = ts.isAssignmentTarget(node) ?
+                2 | (isGenericObjectType(objectType) && !isThisTypeParameter(objectType) ? 1 : 0) :
+                0;
+            var indexedAccessType = getIndexedAccessTypeOrUndefined(objectType, effectiveIndexType, node, accessFlags) || errorType;
+            return checkIndexedAccessIndexType(getFlowTypeOfAccessExpression(node, indexedAccessType.symbol, indexedAccessType, indexExpression), node);
         }
         function checkThatExpressionIsProperSymbolReference(expression, expressionType, reportError) {
             if (expressionType === errorType) {
@@ -41407,13 +42634,13 @@ var ts;
             if (callLikeExpressionMayHaveTypeArguments(node)) {
                 ts.forEach(node.typeArguments, checkSourceElement);
             }
-            if (node.kind === 193) {
+            if (node.kind === 194) {
                 checkExpression(node.template);
             }
             else if (ts.isJsxOpeningLikeElement(node)) {
                 checkExpression(node.attributes);
             }
-            else if (node.kind !== 152) {
+            else if (node.kind !== 153) {
                 ts.forEach(node.arguments, function (argument) {
                     checkExpression(argument);
                 });
@@ -41462,7 +42689,7 @@ var ts;
             }
         }
         function isSpreadArgument(arg) {
-            return !!arg && (arg.kind === 208 || arg.kind === 215 && arg.isSpread);
+            return !!arg && (arg.kind === 209 || arg.kind === 216 && arg.isSpread);
         }
         function getSpreadArgumentIndex(args) {
             return ts.findIndex(args, isSpreadArgument);
@@ -41476,9 +42703,9 @@ var ts;
             var callIsIncomplete = false;
             var effectiveParameterCount = getParameterCount(signature);
             var effectiveMinimumArguments = getMinArgumentCount(signature);
-            if (node.kind === 193) {
+            if (node.kind === 194) {
                 argCount = args.length;
-                if (node.template.kind === 206) {
+                if (node.template.kind === 207) {
                     var lastSpan = ts.last(node.template.templateSpans);
                     callIsIncomplete = ts.nodeIsMissing(lastSpan.literal) || !!lastSpan.literal.isUnterminated;
                 }
@@ -41488,7 +42715,7 @@ var ts;
                     callIsIncomplete = !!templateLiteral.isUnterminated;
                 }
             }
-            else if (node.kind === 152) {
+            else if (node.kind === 153) {
                 argCount = getDecoratorArgumentCount(node, signature);
             }
             else if (ts.isJsxOpeningLikeElement(node)) {
@@ -41502,7 +42729,7 @@ var ts;
             }
             else {
                 if (!node.arguments) {
-                    ts.Debug.assert(node.kind === 192);
+                    ts.Debug.assert(node.kind === 193);
                     return getMinArgumentCount(signature) === 0;
                 }
                 argCount = signatureHelpTrailingComma ? args.length + 1 : args.length;
@@ -41533,31 +42760,38 @@ var ts;
                 (typeArguments.length >= minTypeArgumentCount && typeArguments.length <= numTypeParameters);
         }
         function getSingleCallSignature(type) {
+            return getSingleSignature(type, 0, false);
+        }
+        function getSingleCallOrConstructSignature(type) {
+            return getSingleSignature(type, 0, false) ||
+                getSingleSignature(type, 1, false);
+        }
+        function getSingleSignature(type, kind, allowMembers) {
             if (type.flags & 524288) {
                 var resolved = resolveStructuredTypeMembers(type);
-                if (resolved.callSignatures.length === 1 && resolved.constructSignatures.length === 0 &&
-                    resolved.properties.length === 0 && !resolved.stringIndexInfo && !resolved.numberIndexInfo) {
-                    return resolved.callSignatures[0];
+                if (allowMembers || resolved.properties.length === 0 && !resolved.stringIndexInfo && !resolved.numberIndexInfo) {
+                    if (kind === 0 && resolved.callSignatures.length === 1 && resolved.constructSignatures.length === 0) {
+                        return resolved.callSignatures[0];
+                    }
+                    if (kind === 1 && resolved.constructSignatures.length === 1 && resolved.callSignatures.length === 0) {
+                        return resolved.constructSignatures[0];
+                    }
                 }
             }
             return undefined;
         }
-        function instantiateSignatureInContextOf(signature, contextualSignature, contextualMapper, compareTypes) {
+        function instantiateSignatureInContextOf(signature, contextualSignature, inferenceContext, compareTypes) {
             var context = createInferenceContext(signature.typeParameters, signature, 0, compareTypes);
             var restType = getEffectiveRestType(contextualSignature);
-            var mapper = contextualMapper && restType && restType.flags & 262144 ? cloneTypeMapper(contextualMapper) : contextualMapper;
+            var mapper = inferenceContext && (restType && restType.flags & 262144 ? inferenceContext.nonFixingMapper : inferenceContext.mapper);
             var sourceSignature = mapper ? instantiateSignature(contextualSignature, mapper) : contextualSignature;
-            forEachMatchingParameterType(sourceSignature, signature, function (source, target) {
+            applyToParameterTypes(sourceSignature, signature, function (source, target) {
                 inferTypes(context.inferences, source, target);
             });
-            if (!contextualMapper) {
-                inferTypes(context.inferences, getReturnTypeOfSignature(contextualSignature), getReturnTypeOfSignature(signature), 8);
-                var signaturePredicate = getTypePredicateOfSignature(signature);
-                var contextualPredicate = getTypePredicateOfSignature(sourceSignature);
-                if (signaturePredicate && contextualPredicate && signaturePredicate.kind === contextualPredicate.kind &&
-                    (signaturePredicate.kind === 0 || signaturePredicate.parameterIndex === contextualPredicate.parameterIndex)) {
-                    inferTypes(context.inferences, contextualPredicate.type, signaturePredicate.type, 8);
-                }
+            if (!inferenceContext) {
+                applyToReturnTypes(contextualSignature, signature, function (source, target) {
+                    inferTypes(context.inferences, source, target, 16);
+                });
             }
             return getSignatureInstantiation(signature, getInferredTypes(context), ts.isInJSFile(contextualSignature.declaration));
         }
@@ -41568,26 +42802,25 @@ var ts;
             return getInferredTypes(context);
         }
         function inferTypeArguments(node, signature, args, checkMode, context) {
-            for (var _i = 0, _a = context.inferences; _i < _a.length; _i++) {
-                var inference = _a[_i];
-                if (!inference.isFixed) {
-                    inference.inferredType = undefined;
-                }
-            }
             if (ts.isJsxOpeningLikeElement(node)) {
                 return inferJsxTypeArguments(node, signature, checkMode, context);
             }
-            if (node.kind !== 152) {
+            if (node.kind !== 153) {
                 var contextualType = getContextualType(node);
                 if (contextualType) {
-                    var instantiatedType = instantiateType(contextualType, cloneTypeMapper(getContextualMapper(node), 1));
+                    var outerContext = getInferenceContext(node);
+                    var outerMapper = getMapperFromContext(cloneInferenceContext(outerContext, 1));
+                    var instantiatedType = instantiateType(contextualType, outerMapper);
                     var contextualSignature = getSingleCallSignature(instantiatedType);
                     var inferenceSourceType = contextualSignature && contextualSignature.typeParameters ?
                         getOrCreateTypeFromSignature(getSignatureInstantiationWithoutFillingInTypeArguments(contextualSignature, contextualSignature.typeParameters)) :
                         instantiatedType;
                     var inferenceTargetType = getReturnTypeOfSignature(signature);
-                    inferTypes(context.inferences, inferenceSourceType, inferenceTargetType, 8);
-                    context.returnMapper = cloneInferredPartOfContext(context);
+                    inferTypes(context.inferences, inferenceSourceType, inferenceTargetType, 16);
+                    var returnContext = createInferenceContext(signature.typeParameters, signature, context.flags);
+                    var returnSourceType = instantiateType(contextualType, outerContext && outerContext.returnMapper);
+                    inferTypes(returnContext.inferences, returnSourceType, inferenceTargetType);
+                    context.returnMapper = ts.some(returnContext.inferences, hasInferenceCandidates) ? getMapperFromContext(returnContext) : undefined;
                 }
             }
             var thisType = getThisTypeOfSignature(signature);
@@ -41600,7 +42833,7 @@ var ts;
             var argCount = restType ? Math.min(getParameterCount(signature) - 1, args.length) : args.length;
             for (var i = 0; i < argCount; i++) {
                 var arg = args[i];
-                if (arg.kind !== 210) {
+                if (arg.kind !== 211) {
                     var paramType = getTypeAtPosition(signature, i);
                     var argType = checkExpressionWithContextualType(arg, paramType, context, checkMode);
                     inferTypes(context.inferences, argType, paramType);
@@ -41614,7 +42847,7 @@ var ts;
         }
         function getArrayifiedType(type) {
             if (forEachType(type, function (t) { return !(t.flags & (1 | 63176704) || isArrayType(t) || isTupleType(t)); })) {
-                return createArrayType(getIndexTypeOfType(type, 1) || errorType);
+                return createArrayType(getIndexedAccessType(type, numberType));
             }
             return type;
         }
@@ -41622,20 +42855,20 @@ var ts;
             if (index >= argCount - 1) {
                 var arg = args[argCount - 1];
                 if (isSpreadArgument(arg)) {
-                    return arg.kind === 215 ?
+                    return arg.kind === 216 ?
                         createArrayType(arg.type) :
                         getArrayifiedType(checkExpressionWithContextualType(arg.expression, restType, context, 0));
                 }
             }
-            var contextualType = getIndexTypeOfType(restType, 1) || anyType;
-            var hasPrimitiveContextualType = maybeTypeOfKind(contextualType, 131068 | 4194304);
             var types = [];
             var spreadIndex = -1;
             for (var i = index; i < argCount; i++) {
+                var contextualType = getIndexedAccessType(restType, getLiteralType(i - index));
                 var argType = checkExpressionWithContextualType(args[i], contextualType, context, 0);
                 if (spreadIndex < 0 && isSpreadArgument(args[i])) {
                     spreadIndex = i - index;
                 }
+                var hasPrimitiveContextualType = maybeTypeOfKind(contextualType, 131068 | 4194304);
                 types.push(hasPrimitiveContextualType ? getRegularTypeOfLiteralType(argType) : getWidenedLiteralType(argType));
             }
             return spreadIndex < 0 ?
@@ -41677,23 +42910,29 @@ var ts;
             }
             return 2;
         }
-        function checkApplicableSignatureForJsxOpeningLikeElement(node, signature, relation, checkMode, reportErrors) {
+        function checkApplicableSignatureForJsxOpeningLikeElement(node, signature, relation, checkMode, reportErrors, containingMessageChain, errorOutputContainer) {
             var paramType = getEffectiveFirstArgumentForJsxSignature(signature, node);
             var attributesType = checkExpressionWithContextualType(node.attributes, paramType, undefined, checkMode);
-            return checkTypeRelatedToAndOptionallyElaborate(attributesType, paramType, relation, reportErrors ? node.tagName : undefined, node.attributes);
+            return checkTypeRelatedToAndOptionallyElaborate(attributesType, paramType, relation, reportErrors ? node.tagName : undefined, node.attributes, undefined, containingMessageChain, errorOutputContainer);
         }
-        function checkApplicableSignature(node, args, signature, relation, checkMode, reportErrors) {
+        function getSignatureApplicabilityError(node, args, signature, relation, checkMode, reportErrors, containingMessageChain) {
+            var errorOutputContainer = { errors: undefined, skipLogging: true };
             if (ts.isJsxOpeningLikeElement(node)) {
-                return checkApplicableSignatureForJsxOpeningLikeElement(node, signature, relation, checkMode, reportErrors);
+                if (!checkApplicableSignatureForJsxOpeningLikeElement(node, signature, relation, checkMode, reportErrors, containingMessageChain, errorOutputContainer)) {
+                    ts.Debug.assert(!reportErrors || !!errorOutputContainer.errors, "jsx should have errors when reporting errors");
+                    return errorOutputContainer.errors || [];
+                }
+                return undefined;
             }
             var thisType = getThisTypeOfSignature(signature);
-            if (thisType && thisType !== voidType && node.kind !== 192) {
+            if (thisType && thisType !== voidType && node.kind !== 193) {
                 var thisArgumentNode = getThisArgumentOfCall(node);
                 var thisArgumentType = thisArgumentNode ? checkExpression(thisArgumentNode) : voidType;
                 var errorNode = reportErrors ? (thisArgumentNode || node) : undefined;
                 var headMessage_1 = ts.Diagnostics.The_this_context_of_type_0_is_not_assignable_to_method_s_this_of_type_1;
-                if (!checkTypeRelatedTo(thisArgumentType, thisType, relation, errorNode, headMessage_1)) {
-                    return false;
+                if (!checkTypeRelatedTo(thisArgumentType, thisType, relation, errorNode, headMessage_1, containingMessageChain, errorOutputContainer)) {
+                    ts.Debug.assert(!reportErrors || !!errorOutputContainer.errors, "this parameter should have errors when reporting errors");
+                    return errorOutputContainer.errors || [];
                 }
             }
             var headMessage = ts.Diagnostics.Argument_of_type_0_is_not_assignable_to_parameter_of_type_1;
@@ -41701,49 +42940,66 @@ var ts;
             var argCount = restType ? Math.min(getParameterCount(signature) - 1, args.length) : args.length;
             for (var i = 0; i < argCount; i++) {
                 var arg = args[i];
-                if (arg.kind !== 210) {
+                if (arg.kind !== 211) {
                     var paramType = getTypeAtPosition(signature, i);
                     var argType = checkExpressionWithContextualType(arg, paramType, undefined, checkMode);
                     var checkArgType = checkMode & 4 ? getRegularTypeOfObjectLiteral(argType) : argType;
-                    if (!checkTypeRelatedToAndOptionallyElaborate(checkArgType, paramType, relation, reportErrors ? arg : undefined, arg, headMessage)) {
-                        return false;
+                    if (!checkTypeRelatedToAndOptionallyElaborate(checkArgType, paramType, relation, reportErrors ? arg : undefined, arg, headMessage, containingMessageChain, errorOutputContainer)) {
+                        ts.Debug.assert(!reportErrors || !!errorOutputContainer.errors, "parameter should have errors when reporting errors");
+                        maybeAddMissingAwaitInfo(arg, checkArgType, paramType);
+                        return errorOutputContainer.errors || [];
                     }
                 }
             }
             if (restType) {
                 var spreadType = getSpreadArgumentType(args, argCount, args.length, restType, undefined);
                 var errorNode = reportErrors ? argCount < args.length ? args[argCount] : node : undefined;
-                return checkTypeRelatedTo(spreadType, restType, relation, errorNode, headMessage);
+                if (!checkTypeRelatedTo(spreadType, restType, relation, errorNode, headMessage, undefined, errorOutputContainer)) {
+                    ts.Debug.assert(!reportErrors || !!errorOutputContainer.errors, "rest parameter should have errors when reporting errors");
+                    maybeAddMissingAwaitInfo(errorNode, spreadType, restType);
+                    return errorOutputContainer.errors || [];
+                }
+            }
+            return undefined;
+            function maybeAddMissingAwaitInfo(errorNode, source, target) {
+                if (errorNode && reportErrors && errorOutputContainer.errors && errorOutputContainer.errors.length) {
+                    if (getAwaitedTypeOfPromise(target)) {
+                        return;
+                    }
+                    var awaitedTypeOfSource = getAwaitedTypeOfPromise(source);
+                    if (awaitedTypeOfSource && isTypeRelatedTo(awaitedTypeOfSource, target, relation)) {
+                        ts.addRelatedInfo(errorOutputContainer.errors[0], ts.createDiagnosticForNode(errorNode, ts.Diagnostics.Did_you_forget_to_use_await));
+                    }
+                }
             }
-            return true;
         }
         function getThisArgumentOfCall(node) {
-            if (node.kind === 191) {
+            if (node.kind === 192) {
                 var callee = ts.skipOuterExpressions(node.expression);
-                if (callee.kind === 189 || callee.kind === 190) {
+                if (callee.kind === 190 || callee.kind === 191) {
                     return callee.expression;
                 }
             }
         }
         function createSyntheticExpression(parent, type, isSpread) {
-            var result = ts.createNode(215, parent.pos, parent.end);
+            var result = ts.createNode(216, parent.pos, parent.end);
             result.parent = parent;
             result.type = type;
             result.isSpread = isSpread || false;
             return result;
         }
         function getEffectiveCallArguments(node) {
-            if (node.kind === 193) {
+            if (node.kind === 194) {
                 var template = node.template;
-                var args_4 = [createSyntheticExpression(template, getGlobalTemplateStringsArrayType())];
-                if (template.kind === 206) {
+                var args_3 = [createSyntheticExpression(template, getGlobalTemplateStringsArrayType())];
+                if (template.kind === 207) {
                     ts.forEach(template.templateSpans, function (span) {
-                        args_4.push(span.expression);
+                        args_3.push(span.expression);
                     });
                 }
-                return args_4;
+                return args_3;
             }
-            if (node.kind === 152) {
+            if (node.kind === 153) {
                 return getEffectiveDecoratorArguments(node);
             }
             if (ts.isJsxOpeningLikeElement(node)) {
@@ -41753,7 +43009,7 @@ var ts;
             var length = args.length;
             if (length && isSpreadArgument(args[length - 1]) && getSpreadArgumentIndex(args) === length - 1) {
                 var spreadArgument_1 = args[length - 1];
-                var type = checkExpressionCached(spreadArgument_1.expression);
+                var type = flowLoopCount ? checkExpression(spreadArgument_1.expression) : checkExpressionCached(spreadArgument_1.expression);
                 if (isTupleType(type)) {
                     var typeArguments = type.typeArguments || ts.emptyArray;
                     var restIndex_2 = type.target.hasRestElement ? typeArguments.length - 1 : -1;
@@ -41767,23 +43023,23 @@ var ts;
             var parent = node.parent;
             var expr = node.expression;
             switch (parent.kind) {
-                case 240:
-                case 209:
+                case 241:
+                case 210:
                     return [
                         createSyntheticExpression(expr, getTypeOfSymbol(getSymbolOfNode(parent)))
                     ];
-                case 151:
+                case 152:
                     var func = parent.parent;
                     return [
-                        createSyntheticExpression(expr, parent.parent.kind === 157 ? getTypeOfSymbol(getSymbolOfNode(func)) : errorType),
+                        createSyntheticExpression(expr, parent.parent.kind === 158 ? getTypeOfSymbol(getSymbolOfNode(func)) : errorType),
                         createSyntheticExpression(expr, anyType),
                         createSyntheticExpression(expr, numberType)
                     ];
-                case 154:
-                case 156:
-                case 158:
+                case 155:
+                case 157:
                 case 159:
-                    var hasPropDesc = parent.kind !== 154 && languageVersion !== 0;
+                case 160:
+                    var hasPropDesc = parent.kind !== 155 && languageVersion !== 0;
                     return [
                         createSyntheticExpression(expr, getParentTypeOfClassElement(parent)),
                         createSyntheticExpression(expr, getClassElementPropertyKeyType(parent)),
@@ -41794,21 +43050,46 @@ var ts;
         }
         function getDecoratorArgumentCount(node, signature) {
             switch (node.parent.kind) {
-                case 240:
-                case 209:
+                case 241:
+                case 210:
                     return 1;
-                case 154:
+                case 155:
                     return 2;
-                case 156:
-                case 158:
+                case 157:
                 case 159:
+                case 160:
                     return languageVersion === 0 || signature.parameters.length <= 2 ? 2 : 3;
-                case 151:
+                case 152:
                     return 3;
                 default:
                     return ts.Debug.fail();
             }
         }
+        function getDiagnosticSpanForCallNode(node, doNotIncludeArguments) {
+            var start;
+            var length;
+            var sourceFile = ts.getSourceFileOfNode(node);
+            if (ts.isPropertyAccessExpression(node.expression)) {
+                var nameSpan = ts.getErrorSpanForNode(sourceFile, node.expression.name);
+                start = nameSpan.start;
+                length = doNotIncludeArguments ? nameSpan.length : node.end - start;
+            }
+            else {
+                var expressionSpan = ts.getErrorSpanForNode(sourceFile, node.expression);
+                start = expressionSpan.start;
+                length = doNotIncludeArguments ? expressionSpan.length : node.end - start;
+            }
+            return { start: start, length: length, sourceFile: sourceFile };
+        }
+        function getDiagnosticForCallNode(node, message, arg0, arg1, arg2, arg3) {
+            if (ts.isCallExpression(node)) {
+                var _a = getDiagnosticSpanForCallNode(node), sourceFile = _a.sourceFile, start = _a.start, length_4 = _a.length;
+                return ts.createFileDiagnostic(sourceFile, start, length_4, message, arg0, arg1, arg2, arg3);
+            }
+            else {
+                return ts.createDiagnosticForNode(node, message, arg0, arg1, arg2, arg3);
+            }
+        }
         function getArgumentArityError(node, signatures, args) {
             var min = Number.POSITIVE_INFINITY;
             var max = Number.NEGATIVE_INFINITY;
@@ -41838,25 +43119,41 @@ var ts;
             if (argCount <= max && hasSpreadArgument) {
                 argCount--;
             }
+            var spanArray;
             var related;
+            var error = hasRestParameter || hasSpreadArgument ? hasRestParameter && hasSpreadArgument ? ts.Diagnostics.Expected_at_least_0_arguments_but_got_1_or_more :
+                hasRestParameter ? ts.Diagnostics.Expected_at_least_0_arguments_but_got_1 :
+                    ts.Diagnostics.Expected_0_arguments_but_got_1_or_more : ts.Diagnostics.Expected_0_arguments_but_got_1;
             if (closestSignature && getMinArgumentCount(closestSignature) > argCount && closestSignature.declaration) {
                 var paramDecl = closestSignature.declaration.parameters[closestSignature.thisParameter ? argCount + 1 : argCount];
                 if (paramDecl) {
                     related = ts.createDiagnosticForNode(paramDecl, ts.isBindingPattern(paramDecl.name) ? ts.Diagnostics.An_argument_matching_this_binding_pattern_was_not_provided : ts.Diagnostics.An_argument_for_0_was_not_provided, !paramDecl.name ? argCount : !ts.isBindingPattern(paramDecl.name) ? ts.idText(getFirstIdentifier(paramDecl.name)) : undefined);
                 }
             }
-            if (hasRestParameter || hasSpreadArgument) {
-                var error_1 = hasRestParameter && hasSpreadArgument ? ts.Diagnostics.Expected_at_least_0_arguments_but_got_1_or_more :
-                    hasRestParameter ? ts.Diagnostics.Expected_at_least_0_arguments_but_got_1 :
-                        ts.Diagnostics.Expected_0_arguments_but_got_1_or_more;
-                var diagnostic_1 = ts.createDiagnosticForNode(node, error_1, paramRange, argCount);
-                return related ? addRelatedInfo(diagnostic_1, related) : diagnostic_1;
-            }
             if (min < argCount && argCount < max) {
-                return ts.createDiagnosticForNode(node, ts.Diagnostics.No_overload_expects_0_arguments_but_overloads_do_exist_that_expect_either_1_or_2_arguments, argCount, belowArgCount, aboveArgCount);
+                return getDiagnosticForCallNode(node, ts.Diagnostics.No_overload_expects_0_arguments_but_overloads_do_exist_that_expect_either_1_or_2_arguments, argCount, belowArgCount, aboveArgCount);
             }
-            var diagnostic = ts.createDiagnosticForNode(node, ts.Diagnostics.Expected_0_arguments_but_got_1, paramRange, argCount);
-            return related ? addRelatedInfo(diagnostic, related) : diagnostic;
+            if (!hasSpreadArgument && argCount < min) {
+                var diagnostic_1 = getDiagnosticForCallNode(node, error, paramRange, argCount);
+                return related ? ts.addRelatedInfo(diagnostic_1, related) : diagnostic_1;
+            }
+            if (hasRestParameter || hasSpreadArgument) {
+                spanArray = ts.createNodeArray(args);
+                if (hasSpreadArgument && argCount) {
+                    var nextArg = ts.elementAt(args, getSpreadArgumentIndex(args) + 1) || undefined;
+                    spanArray = ts.createNodeArray(args.slice(max > argCount && nextArg ? args.indexOf(nextArg) : Math.min(max, args.length - 1)));
+                }
+            }
+            else {
+                spanArray = ts.createNodeArray(args.slice(max));
+            }
+            spanArray.pos = ts.first(spanArray).pos;
+            spanArray.end = ts.last(spanArray).end;
+            if (spanArray.end === spanArray.pos) {
+                spanArray.end++;
+            }
+            var diagnostic = ts.createDiagnosticForNodeArray(ts.getSourceFileOfNode(node), spanArray, error, paramRange, argCount);
+            return related ? ts.addRelatedInfo(diagnostic, related) : diagnostic;
         }
         function getTypeArgumentArityError(node, signatures, typeArguments) {
             var argCount = typeArguments.length;
@@ -41885,14 +43182,14 @@ var ts;
             return ts.createDiagnosticForNodeArray(ts.getSourceFileOfNode(node), typeArguments, ts.Diagnostics.Expected_0_type_arguments_but_got_1, belowArgCount === -Infinity ? aboveArgCount : belowArgCount, argCount);
         }
         function resolveCall(node, signatures, candidatesOutArray, checkMode, fallbackError) {
-            var isTaggedTemplate = node.kind === 193;
-            var isDecorator = node.kind === 152;
+            var isTaggedTemplate = node.kind === 194;
+            var isDecorator = node.kind === 153;
             var isJsxOpeningOrSelfClosingElement = ts.isJsxOpeningLikeElement(node);
             var reportErrors = !candidatesOutArray;
             var typeArguments;
             if (!isDecorator) {
                 typeArguments = node.typeArguments;
-                if (isTaggedTemplate || isJsxOpeningOrSelfClosingElement || node.expression.kind !== 98) {
+                if (isTaggedTemplate || isJsxOpeningOrSelfClosingElement || node.expression.kind !== 99) {
                     ts.forEach(typeArguments, checkSourceElement);
                 }
             }
@@ -41900,18 +43197,18 @@ var ts;
             reorderCandidates(signatures, candidates);
             if (!candidates.length) {
                 if (reportErrors) {
-                    diagnostics.add(ts.createDiagnosticForNode(node, ts.Diagnostics.Call_target_does_not_contain_any_signatures));
+                    diagnostics.add(getDiagnosticForCallNode(node, ts.Diagnostics.Call_target_does_not_contain_any_signatures));
                 }
                 return resolveErrorCall(node);
             }
             var args = getEffectiveCallArguments(node);
             var isSingleNonGenericCandidate = candidates.length === 1 && !candidates[0].typeParameters;
             var argCheckMode = !isDecorator && !isSingleNonGenericCandidate && ts.some(args, isContextSensitive) ? 4 : 0;
-            var candidateForArgumentError;
+            var candidatesForArgumentError;
             var candidateForArgumentArityError;
             var candidateForTypeArgumentError;
             var result;
-            var signatureHelpTrailingComma = !!(checkMode & 16) && node.kind === 191 && node.arguments.hasTrailingComma;
+            var signatureHelpTrailingComma = !!(checkMode & 16) && node.kind === 192 && node.arguments.hasTrailingComma;
             if (candidates.length > 1) {
                 result = chooseOverload(candidates, subtypeRelation, signatureHelpTrailingComma);
             }
@@ -41922,8 +43219,66 @@ var ts;
                 return result;
             }
             if (reportErrors) {
-                if (candidateForArgumentError) {
-                    checkApplicableSignature(node, args, candidateForArgumentError, assignableRelation, 0, true);
+                if (candidatesForArgumentError) {
+                    if (candidatesForArgumentError.length === 1 || candidatesForArgumentError.length > 3) {
+                        var last_2 = candidatesForArgumentError[candidatesForArgumentError.length - 1];
+                        var chain_1;
+                        if (candidatesForArgumentError.length > 3) {
+                            chain_1 = ts.chainDiagnosticMessages(chain_1, ts.Diagnostics.The_last_overload_gave_the_following_error);
+                            chain_1 = ts.chainDiagnosticMessages(chain_1, ts.Diagnostics.No_overload_matches_this_call);
+                        }
+                        var diags = getSignatureApplicabilityError(node, args, last_2, assignableRelation, 0, true, function () { return chain_1; });
+                        if (diags) {
+                            for (var _i = 0, diags_1 = diags; _i < diags_1.length; _i++) {
+                                var d = diags_1[_i];
+                                if (last_2.declaration && candidatesForArgumentError.length > 3) {
+                                    ts.addRelatedInfo(d, ts.createDiagnosticForNode(last_2.declaration, ts.Diagnostics.The_last_overload_is_declared_here));
+                                }
+                                diagnostics.add(d);
+                            }
+                        }
+                        else {
+                            ts.Debug.fail("No error for last overload signature");
+                        }
+                    }
+                    else {
+                        var allDiagnostics = [];
+                        var max = 0;
+                        var min_3 = Number.MAX_VALUE;
+                        var minIndex = 0;
+                        var i_1 = 0;
+                        var _loop_12 = function (c) {
+                            var chain_2 = function () { return ts.chainDiagnosticMessages(undefined, ts.Diagnostics.Overload_0_of_1_2_gave_the_following_error, i_1 + 1, candidates.length, signatureToString(c)); };
+                            var diags_2 = getSignatureApplicabilityError(node, args, c, assignableRelation, 0, true, chain_2);
+                            if (diags_2) {
+                                if (diags_2.length <= min_3) {
+                                    min_3 = diags_2.length;
+                                    minIndex = i_1;
+                                }
+                                max = Math.max(max, diags_2.length);
+                                allDiagnostics.push(diags_2);
+                            }
+                            else {
+                                ts.Debug.fail("No error for 3 or fewer overload signatures");
+                            }
+                            i_1++;
+                        };
+                        for (var _a = 0, candidatesForArgumentError_1 = candidatesForArgumentError; _a < candidatesForArgumentError_1.length; _a++) {
+                            var c = candidatesForArgumentError_1[_a];
+                            _loop_12(c);
+                        }
+                        var diags_3 = max > 1 ? allDiagnostics[minIndex] : ts.flatten(allDiagnostics);
+                        ts.Debug.assert(diags_3.length > 0, "No errors reported for 3 or fewer overload signatures");
+                        var chain = ts.chainDiagnosticMessages(ts.map(diags_3, function (d) { return typeof d.messageText === "string" ? d : d.messageText; }), ts.Diagnostics.No_overload_matches_this_call);
+                        var related = ts.flatMap(diags_3, function (d) { return d.relatedInformation; });
+                        if (ts.every(diags_3, function (d) { return d.start === diags_3[0].start && d.length === diags_3[0].length && d.file === diags_3[0].file; })) {
+                            var _b = diags_3[0], file = _b.file, start = _b.start, length_5 = _b.length;
+                            diagnostics.add({ file: file, start: start, length: length_5, code: chain.code, category: chain.category, messageText: chain, relatedInformation: related });
+                        }
+                        else {
+                            diagnostics.add(ts.createDiagnosticForNodeFromMessageChain(node, chain, related));
+                        }
+                    }
                 }
                 else if (candidateForArgumentArityError) {
                     diagnostics.add(getArgumentArityError(node, [candidateForArgumentArityError], args));
@@ -41940,14 +43295,14 @@ var ts;
                         diagnostics.add(getArgumentArityError(node, signaturesWithCorrectTypeArgumentArity, args));
                     }
                     else if (fallbackError) {
-                        diagnostics.add(ts.createDiagnosticForNode(node, fallbackError));
+                        diagnostics.add(getDiagnosticForCallNode(node, fallbackError));
                     }
                 }
             }
             return produceDiagnostics || !args ? resolveErrorCall(node) : getCandidateForOverloadFailure(node, candidates, args, !!candidatesOutArray);
             function chooseOverload(candidates, relation, signatureHelpTrailingComma) {
                 if (signatureHelpTrailingComma === void 0) { signatureHelpTrailingComma = false; }
-                candidateForArgumentError = undefined;
+                candidatesForArgumentError = undefined;
                 candidateForArgumentArityError = undefined;
                 candidateForTypeArgumentError = undefined;
                 if (isSingleNonGenericCandidate) {
@@ -41955,8 +43310,8 @@ var ts;
                     if (typeArguments || !hasCorrectArity(node, args, candidate, signatureHelpTrailingComma)) {
                         return undefined;
                     }
-                    if (!checkApplicableSignature(node, args, candidate, relation, 0, false)) {
-                        candidateForArgumentError = candidate;
+                    if (getSignatureApplicabilityError(node, args, candidate, relation, 0, false, undefined)) {
+                        candidatesForArgumentError = [candidate];
                         return undefined;
                     }
                     return candidate;
@@ -41980,7 +43335,7 @@ var ts;
                         else {
                             inferenceContext = createInferenceContext(candidate.typeParameters, candidate, ts.isInJSFile(node) ? 2 : 0);
                             typeArgumentTypes = inferTypeArguments(node, candidate, args, argCheckMode | 8, inferenceContext);
-                            argCheckMode |= inferenceContext.flags & 8 ? 8 : 0;
+                            argCheckMode |= inferenceContext.flags & 4 ? 8 : 0;
                         }
                         checkCandidate = getSignatureInstantiation(candidate, typeArgumentTypes, ts.isInJSFile(candidate.declaration), inferenceContext && inferenceContext.inferredTypeParameters);
                         if (getNonArrayRestType(candidate) && !hasCorrectArity(node, args, checkCandidate, signatureHelpTrailingComma)) {
@@ -41991,10 +43346,8 @@ var ts;
                     else {
                         checkCandidate = candidate;
                     }
-                    if (!checkApplicableSignature(node, args, checkCandidate, relation, argCheckMode, false)) {
-                        if (!candidateForArgumentError || getEffectiveRestType(candidateForArgumentError) || !getEffectiveRestType(checkCandidate)) {
-                            candidateForArgumentError = checkCandidate;
-                        }
+                    if (getSignatureApplicabilityError(node, args, checkCandidate, relation, argCheckMode, false, undefined)) {
+                        (candidatesForArgumentError || (candidatesForArgumentError = [])).push(checkCandidate);
                         continue;
                     }
                     if (argCheckMode) {
@@ -42007,10 +43360,8 @@ var ts;
                                 continue;
                             }
                         }
-                        if (!checkApplicableSignature(node, args, checkCandidate, relation, argCheckMode, false)) {
-                            if (!candidateForArgumentError || getEffectiveRestType(candidateForArgumentError) || !getEffectiveRestType(checkCandidate)) {
-                                candidateForArgumentError = checkCandidate;
-                            }
+                        if (getSignatureApplicabilityError(node, args, checkCandidate, relation, argCheckMode, false, undefined)) {
+                            (candidatesForArgumentError || (candidatesForArgumentError = [])).push(checkCandidate);
                             continue;
                         }
                     }
@@ -42034,7 +43385,7 @@ var ts;
             }
             var _a = ts.minAndMax(candidates, getNumNonRestParameters), minArgumentCount = _a.min, maxNonRestParam = _a.max;
             var parameters = [];
-            var _loop_8 = function (i) {
+            var _loop_13 = function (i) {
                 var symbols = ts.mapDefined(candidates, function (_a) {
                     var parameters = _a.parameters, hasRestParameter = _a.hasRestParameter;
                     return hasRestParameter ?
@@ -42045,7 +43396,7 @@ var ts;
                 parameters.push(createCombinedSymbolFromTypes(symbols, ts.mapDefined(candidates, function (candidate) { return tryGetTypeAtPosition(candidate, i); })));
             };
             for (var i = 0; i < maxNonRestParam; i++) {
-                _loop_8(i);
+                _loop_13(i);
             }
             var restParameterSymbols = ts.mapDefined(candidates, function (c) { return c.hasRestParameter ? ts.last(c.parameters) : undefined; });
             var hasRestParameter = restParameterSymbols.length !== 0;
@@ -42111,7 +43462,7 @@ var ts;
             return maxParamsIndex;
         }
         function resolveCallExpression(node, candidatesOutArray, checkMode) {
-            if (node.expression.kind === 98) {
+            if (node.expression.kind === 99) {
                 var superType = checkSuperExpression(node.expression);
                 if (isTypeAny(superType)) {
                     for (var _i = 0, _a = node.arguments; _i < _a.length; _i++) {
@@ -42157,7 +43508,7 @@ var ts;
                             relatedInformation = ts.createDiagnosticForNode(node.expression, ts.Diagnostics.It_is_highly_likely_that_you_are_missing_a_semicolon);
                         }
                     }
-                    invocationError(node, apparentType, 0, relatedInformation);
+                    invocationError(node.expression, apparentType, 0, relatedInformation);
                 }
                 return resolveErrorCall(node);
             }
@@ -42224,7 +43575,7 @@ var ts;
                 }
                 return signature;
             }
-            invocationError(node, expressionType, 1);
+            invocationError(node.expression, expressionType, 1);
             return resolveErrorCall(node);
         }
         function typeHasProtectedAccessibleBase(target, type) {
@@ -42235,12 +43586,11 @@ var ts;
             var firstBase = baseTypes[0];
             if (firstBase.flags & 2097152) {
                 var types = firstBase.types;
-                var mixinCount = ts.countWhere(types, isMixinConstructorType);
+                var mixinFlags = findMixins(types);
                 var i = 0;
                 for (var _i = 0, _a = firstBase.types; _i < _a.length; _i++) {
                     var intersectionMember = _a[_i];
-                    i++;
-                    if (mixinCount === 0 || mixinCount === types.length && i === 0 || !isMixinConstructorType(intersectionMember)) {
+                    if (!mixinFlags[i]) {
                         if (ts.getObjectFlags(intersectionMember) & (1 | 2)) {
                             if (intersectionMember.symbol === target) {
                                 return true;
@@ -42250,6 +43600,7 @@ var ts;
                             }
                         }
                     }
+                    i++;
                 }
                 return false;
             }
@@ -42287,11 +43638,71 @@ var ts;
             }
             return true;
         }
-        function invocationError(node, apparentType, kind, relatedInformation) {
-            var diagnostic = error(node, (kind === 0 ?
-                ts.Diagnostics.Cannot_invoke_an_expression_whose_type_lacks_a_call_signature_Type_0_has_no_compatible_call_signatures :
-                ts.Diagnostics.Cannot_use_new_with_an_expression_whose_type_lacks_a_call_or_construct_signature), typeToString(apparentType));
-            invocationErrorRecovery(apparentType, kind, relatedInformation ? addRelatedInfo(diagnostic, relatedInformation) : diagnostic);
+        function invocationErrorDetails(apparentType, kind) {
+            var errorInfo;
+            var isCall = kind === 0;
+            var awaitedType = getAwaitedType(apparentType);
+            var maybeMissingAwait = awaitedType && getSignaturesOfType(awaitedType, kind).length > 0;
+            if (apparentType.flags & 1048576) {
+                var types = apparentType.types;
+                var hasSignatures = false;
+                for (var _i = 0, types_15 = types; _i < types_15.length; _i++) {
+                    var constituent = types_15[_i];
+                    var signatures = getSignaturesOfType(constituent, kind);
+                    if (signatures.length !== 0) {
+                        hasSignatures = true;
+                        if (errorInfo) {
+                            break;
+                        }
+                    }
+                    else {
+                        if (!errorInfo) {
+                            errorInfo = ts.chainDiagnosticMessages(errorInfo, isCall ?
+                                ts.Diagnostics.Type_0_has_no_call_signatures :
+                                ts.Diagnostics.Type_0_has_no_construct_signatures, typeToString(constituent));
+                            errorInfo = ts.chainDiagnosticMessages(errorInfo, isCall ?
+                                ts.Diagnostics.Not_all_constituents_of_type_0_are_callable :
+                                ts.Diagnostics.Not_all_constituents_of_type_0_are_constructable, typeToString(apparentType));
+                        }
+                        if (hasSignatures) {
+                            break;
+                        }
+                    }
+                }
+                if (!hasSignatures) {
+                    errorInfo = ts.chainDiagnosticMessages(undefined, isCall ?
+                        ts.Diagnostics.No_constituent_of_type_0_is_callable :
+                        ts.Diagnostics.No_constituent_of_type_0_is_constructable, typeToString(apparentType));
+                }
+                if (!errorInfo) {
+                    errorInfo = ts.chainDiagnosticMessages(errorInfo, isCall ?
+                        ts.Diagnostics.Each_member_of_the_union_type_0_has_signatures_but_none_of_those_signatures_are_compatible_with_each_other :
+                        ts.Diagnostics.Each_member_of_the_union_type_0_has_construct_signatures_but_none_of_those_signatures_are_compatible_with_each_other, typeToString(apparentType));
+                }
+            }
+            else {
+                errorInfo = ts.chainDiagnosticMessages(errorInfo, isCall ?
+                    ts.Diagnostics.Type_0_has_no_call_signatures :
+                    ts.Diagnostics.Type_0_has_no_construct_signatures, typeToString(apparentType));
+            }
+            return {
+                messageChain: ts.chainDiagnosticMessages(errorInfo, isCall ? ts.Diagnostics.This_expression_is_not_callable : ts.Diagnostics.This_expression_is_not_constructable),
+                relatedMessage: maybeMissingAwait ? ts.Diagnostics.Did_you_forget_to_use_await : undefined,
+            };
+        }
+        function invocationError(errorTarget, apparentType, kind, relatedInformation) {
+            var _a = invocationErrorDetails(apparentType, kind), messageChain = _a.messageChain, relatedInfo = _a.relatedMessage;
+            var diagnostic = ts.createDiagnosticForNodeFromMessageChain(errorTarget, messageChain);
+            if (relatedInfo) {
+                ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(errorTarget, relatedInfo));
+            }
+            if (ts.isCallExpression(errorTarget.parent)) {
+                var _b = getDiagnosticSpanForCallNode(errorTarget.parent, true), start = _b.start, length_6 = _b.length;
+                diagnostic.start = start;
+                diagnostic.length = length_6;
+            }
+            diagnostics.add(diagnostic);
+            invocationErrorRecovery(apparentType, kind, relatedInformation ? ts.addRelatedInfo(diagnostic, relatedInformation) : diagnostic);
         }
         function invocationErrorRecovery(apparentType, kind, diagnostic) {
             if (!apparentType.symbol) {
@@ -42302,7 +43713,7 @@ var ts;
                 var sigs = getSignaturesOfType(getTypeOfSymbol(getSymbolLinks(apparentType.symbol).target), kind);
                 if (!sigs || !sigs.length)
                     return;
-                addRelatedInfo(diagnostic, ts.createDiagnosticForNode(importNode, ts.Diagnostics.Type_originates_at_this_import_A_namespace_style_import_cannot_be_called_or_constructed_and_will_cause_a_failure_at_runtime_Consider_using_a_default_import_or_import_require_here_instead));
+                ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(importNode, ts.Diagnostics.Type_originates_at_this_import_A_namespace_style_import_cannot_be_called_or_constructed_and_will_cause_a_failure_at_runtime_Consider_using_a_default_import_or_import_require_here_instead));
             }
         }
         function resolveTaggedTemplateExpression(node, candidatesOutArray, checkMode) {
@@ -42317,23 +43728,23 @@ var ts;
                 return resolveUntypedCall(node);
             }
             if (!callSignatures.length) {
-                invocationError(node, apparentType, 0);
+                invocationError(node.tag, apparentType, 0);
                 return resolveErrorCall(node);
             }
             return resolveCall(node, callSignatures, candidatesOutArray, checkMode);
         }
         function getDiagnosticHeadMessageForDecoratorResolution(node) {
             switch (node.parent.kind) {
-                case 240:
-                case 209:
+                case 241:
+                case 210:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_class_decorator_when_called_as_an_expression;
-                case 151:
+                case 152:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_parameter_decorator_when_called_as_an_expression;
-                case 154:
+                case 155:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_property_decorator_when_called_as_an_expression;
-                case 156:
-                case 158:
+                case 157:
                 case 159:
+                case 160:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_method_decorator_when_called_as_an_expression;
                 default:
                     return ts.Debug.fail();
@@ -42357,9 +43768,12 @@ var ts;
             }
             var headMessage = getDiagnosticHeadMessageForDecoratorResolution(node);
             if (!callSignatures.length) {
-                var errorInfo = ts.chainDiagnosticMessages(undefined, ts.Diagnostics.Cannot_invoke_an_expression_whose_type_lacks_a_call_signature_Type_0_has_no_compatible_call_signatures, typeToString(apparentType));
-                errorInfo = ts.chainDiagnosticMessages(errorInfo, headMessage);
-                var diag = ts.createDiagnosticForNodeFromMessageChain(node, errorInfo);
+                var errorDetails = invocationErrorDetails(apparentType, 0);
+                var messageChain = ts.chainDiagnosticMessages(errorDetails.messageChain, headMessage);
+                var diag = ts.createDiagnosticForNodeFromMessageChain(node.expression, messageChain);
+                if (errorDetails.relatedMessage) {
+                    ts.addRelatedInfo(diag, ts.createDiagnosticForNode(node.expression, errorDetails.relatedMessage));
+                }
                 diagnostics.add(diag);
                 invocationErrorRecovery(apparentType, 0, diag);
                 return resolveErrorCall(node);
@@ -42371,7 +43785,7 @@ var ts;
             var exports = namespace && getExportsOfSymbol(namespace);
             var typeSymbol = exports && getSymbol(exports, JsxNames.Element, 67897832);
             var returnNode = typeSymbol && nodeBuilder.symbolToEntityName(typeSymbol, 67897832, node);
-            var declaration = ts.createFunctionTypeNode(undefined, [ts.createParameter(undefined, undefined, undefined, "props", undefined, nodeBuilder.typeToTypeNode(result, node))], returnNode ? ts.createTypeReferenceNode(returnNode, undefined) : ts.createKeywordTypeNode(120));
+            var declaration = ts.createFunctionTypeNode(undefined, [ts.createParameter(undefined, undefined, undefined, "props", undefined, nodeBuilder.typeToTypeNode(result, node))], returnNode ? ts.createTypeReferenceNode(returnNode, undefined) : ts.createKeywordTypeNode(121));
             var parameterSymbol = createSymbol(1, "props");
             parameterSymbol.type = result;
             return createSignature(declaration, undefined, undefined, [parameterSymbol], typeSymbol ? getDeclaredTypeOfSymbol(typeSymbol) : errorType, undefined, 1, false, false);
@@ -42407,16 +43821,16 @@ var ts;
         }
         function resolveSignature(node, candidatesOutArray, checkMode) {
             switch (node.kind) {
-                case 191:
-                    return resolveCallExpression(node, candidatesOutArray, checkMode);
                 case 192:
-                    return resolveNewExpression(node, candidatesOutArray, checkMode);
+                    return resolveCallExpression(node, candidatesOutArray, checkMode);
                 case 193:
+                    return resolveNewExpression(node, candidatesOutArray, checkMode);
+                case 194:
                     return resolveTaggedTemplateExpression(node, candidatesOutArray, checkMode);
-                case 152:
+                case 153:
                     return resolveDecorator(node, candidatesOutArray, checkMode);
+                case 263:
                 case 262:
-                case 261:
                     return resolveJsxOpeningLikeElement(node, candidatesOutArray, checkMode);
             }
             throw ts.Debug.assertNever(node, "Branch in 'resolveSignature' should be unreachable.");
@@ -42474,17 +43888,17 @@ var ts;
                     ts.isVariableDeclaration(decl.parent) && getSymbolOfNode(decl.parent));
             var prototype = assignmentSymbol && assignmentSymbol.exports && assignmentSymbol.exports.get("prototype");
             var init = prototype && prototype.valueDeclaration && getAssignedJSPrototype(prototype.valueDeclaration);
-            return init ? checkExpression(init) : undefined;
+            return init ? getWidenedType(checkExpressionCached(init)) : undefined;
         }
         function getAssignedJSPrototype(node) {
             if (!node.parent) {
                 return false;
             }
             var parent = node.parent;
-            while (parent && parent.kind === 189) {
+            while (parent && parent.kind === 190) {
                 parent = parent.parent;
             }
-            if (parent && ts.isBinaryExpression(parent) && ts.isPrototypeAccess(parent.left) && parent.operatorToken.kind === 59) {
+            if (parent && ts.isBinaryExpression(parent) && ts.isPrototypeAccess(parent.left) && parent.operatorToken.kind === 60) {
                 var right = ts.getInitializerOfBinaryExpression(parent);
                 return ts.isObjectLiteralExpression(right) && right;
             }
@@ -42501,17 +43915,17 @@ var ts;
                 checkGrammarArguments(node.arguments);
             var signature = getResolvedSignature(node, undefined, checkMode);
             if (signature === resolvingSignature) {
-                return silentNeverType;
+                return nonInferrableType;
             }
-            if (node.expression.kind === 98) {
+            if (node.expression.kind === 99) {
                 return voidType;
             }
-            if (node.kind === 192) {
+            if (node.kind === 193) {
                 var declaration = signature.declaration;
                 if (declaration &&
-                    declaration.kind !== 157 &&
-                    declaration.kind !== 161 &&
-                    declaration.kind !== 166 &&
+                    declaration.kind !== 158 &&
+                    declaration.kind !== 162 &&
+                    declaration.kind !== 167 &&
                     !ts.isJSDocConstructSignature(declaration) &&
                     !isJSConstructor(declaration)) {
                     if (noImplicitAny) {
@@ -42618,9 +44032,9 @@ var ts;
                 return false;
             }
             var targetDeclarationKind = resolvedRequire.flags & 16
-                ? 239
+                ? 240
                 : resolvedRequire.flags & 3
-                    ? 237
+                    ? 238
                     : 0;
             if (targetDeclarationKind !== 0) {
                 var decl = ts.getDeclarationOfKind(resolvedRequire, targetDeclarationKind);
@@ -42631,7 +44045,7 @@ var ts;
         function checkTaggedTemplateExpression(node) {
             checkGrammarTypeArguments(node, node.typeArguments);
             if (languageVersion < 2) {
-                checkExternalEmitHelpers(node, 65536);
+                checkExternalEmitHelpers(node, 131072);
             }
             return getReturnTypeOfSignature(getResolvedSignature(node));
         }
@@ -42644,18 +44058,28 @@ var ts;
                 case 14:
                 case 8:
                 case 9:
-                case 102:
-                case 87:
-                case 187:
+                case 103:
+                case 88:
                 case 188:
+                case 189:
                     return true;
-                case 195:
+                case 196:
                     return isValidConstAssertionArgument(node.expression);
-                case 202:
+                case 203:
                     var op = node.operator;
                     var arg = node.operand;
                     return op === 39 && (arg.kind === 8 || arg.kind === 9) ||
                         op === 38 && arg.kind === 8;
+                case 190:
+                case 191:
+                    var expr = node.expression;
+                    if (ts.isIdentifier(expr)) {
+                        var symbol = getSymbolAtLocation(expr);
+                        if (symbol && symbol.flags & 2097152) {
+                            symbol = resolveAlias(symbol);
+                        }
+                        return !!(symbol && (symbol.flags & 384) && getEnumKind(symbol) === 1);
+                    }
             }
             return false;
         }
@@ -42663,7 +44087,7 @@ var ts;
             var exprType = checkExpression(expression, checkMode);
             if (ts.isConstTypeReference(type)) {
                 if (!isValidConstAssertionArgument(expression)) {
-                    error(expression, ts.Diagnostics.A_const_assertion_can_only_be_applied_to_a_string_number_boolean_array_or_object_literal);
+                    error(expression, ts.Diagnostics.A_const_assertions_can_only_be_applied_to_references_to_enum_members_or_string_number_boolean_array_or_object_literals);
                 }
                 return getRegularTypeOfLiteralType(exprType);
             }
@@ -42683,10 +44107,10 @@ var ts;
         }
         function checkMetaProperty(node) {
             checkGrammarMetaProperty(node);
-            if (node.keywordToken === 95) {
+            if (node.keywordToken === 96) {
                 return checkNewTargetMetaProperty(node);
             }
-            if (node.keywordToken === 92) {
+            if (node.keywordToken === 93) {
                 return checkImportMetaProperty(node);
             }
             return ts.Debug.assertNever(node.keywordToken);
@@ -42697,7 +44121,7 @@ var ts;
                 error(node, ts.Diagnostics.Meta_property_0_is_only_allowed_in_the_body_of_a_function_declaration_function_expression_or_constructor, "new.target");
                 return errorType;
             }
-            else if (container.kind === 157) {
+            else if (container.kind === 158) {
                 var symbol = getSymbolOfNode(container.parent);
                 return getTypeOfSymbol(symbol);
             }
@@ -42707,7 +44131,7 @@ var ts;
             }
         }
         function checkImportMetaProperty(node) {
-            if (languageVersion < 7 || moduleKind < ts.ModuleKind.ESNext) {
+            if (languageVersion < 99 || moduleKind < ts.ModuleKind.ESNext) {
                 error(node, ts.Diagnostics.The_import_meta_meta_property_is_only_allowed_using_ESNext_for_the_target_and_module_compiler_options);
             }
             var file = ts.getSourceFileOfNode(node);
@@ -42749,8 +44173,10 @@ var ts;
             }
             if (signature.hasRestParameter) {
                 var restType = getTypeOfSymbol(signature.parameters[paramCount]);
-                var indexType = getLiteralType(pos - paramCount);
-                return getIndexedAccessType(restType, indexType);
+                var index = pos - paramCount;
+                if (!isTupleType(restType) || restType.target.hasRestElement || index < (restType.typeArguments || ts.emptyArray).length) {
+                    return getIndexedAccessType(restType, getLiteralType(index));
+                }
             }
             return undefined;
         }
@@ -42821,23 +44247,23 @@ var ts;
         function getTypeOfFirstParameterOfSignatureWithFallback(signature, fallbackType) {
             return signature.parameters.length > 0 ? getTypeAtPosition(signature, 0) : fallbackType;
         }
-        function inferFromAnnotatedParameters(signature, context, mapper) {
+        function inferFromAnnotatedParameters(signature, context, inferenceContext) {
             var len = signature.parameters.length - (signature.hasRestParameter ? 1 : 0);
             for (var i = 0; i < len; i++) {
                 var declaration = signature.parameters[i].valueDeclaration;
                 if (declaration.type) {
                     var typeNode = ts.getEffectiveTypeAnnotationNode(declaration);
                     if (typeNode) {
-                        inferTypes(mapper.inferences, getTypeFromTypeNode(typeNode), getTypeAtPosition(context, i));
+                        inferTypes(inferenceContext.inferences, getTypeFromTypeNode(typeNode), getTypeAtPosition(context, i));
                     }
                 }
             }
             var restType = getEffectiveRestType(context);
             if (restType && restType.flags & 262144) {
-                var instantiatedContext = instantiateSignature(context, cloneTypeMapper(mapper));
+                var instantiatedContext = instantiateSignature(context, inferenceContext.nonFixingMapper);
                 assignContextualParameterTypes(signature, instantiatedContext);
                 var restPos = getParameterCount(context) - 1;
-                inferTypes(mapper.inferences, getRestTypeAtPosition(signature, restPos), restType);
+                inferTypes(inferenceContext.inferences, getRestTypeAtPosition(signature, restPos), restType);
             }
         }
         function assignContextualParameterTypes(signature, context) {
@@ -42871,7 +44297,7 @@ var ts;
             for (var _i = 0, _a = pattern.elements; _i < _a.length; _i++) {
                 var element = _a[_i];
                 if (!ts.isOmittedExpression(element)) {
-                    if (element.name.kind === 72) {
+                    if (element.name.kind === 73) {
                         getSymbolLinks(getSymbolOfNode(element)).type = getTypeForBindingElement(element);
                     }
                     else {
@@ -42885,8 +44311,8 @@ var ts;
             if (!links.type) {
                 links.type = contextualType;
                 var decl = parameter.valueDeclaration;
-                if (decl.name.kind !== 72) {
-                    if (links.type === emptyObjectType) {
+                if (decl.name.kind !== 73) {
+                    if (links.type === unknownType) {
                         links.type = getTypeFromBindingPattern(decl.name);
                     }
                     assignBindingElementTypes(decl.name);
@@ -42896,22 +44322,22 @@ var ts;
         function createPromiseType(promisedType) {
             var globalPromiseType = getGlobalPromiseType(true);
             if (globalPromiseType !== emptyGenericType) {
-                promisedType = getAwaitedType(promisedType) || emptyObjectType;
+                promisedType = getAwaitedType(promisedType) || unknownType;
                 return createTypeReference(globalPromiseType, [promisedType]);
             }
-            return emptyObjectType;
+            return unknownType;
         }
         function createPromiseLikeType(promisedType) {
             var globalPromiseLikeType = getGlobalPromiseLikeType(true);
             if (globalPromiseLikeType !== emptyGenericType) {
-                promisedType = getAwaitedType(promisedType) || emptyObjectType;
+                promisedType = getAwaitedType(promisedType) || unknownType;
                 return createTypeReference(globalPromiseLikeType, [promisedType]);
             }
-            return emptyObjectType;
+            return unknownType;
         }
         function createPromiseReturnType(func, promisedType) {
             var promiseType = createPromiseType(promisedType);
-            if (promiseType === emptyObjectType) {
+            if (promiseType === unknownType) {
                 error(func, ts.isImportCall(func) ?
                     ts.Diagnostics.A_dynamic_import_call_returns_a_Promise_Make_sure_you_have_a_declaration_for_Promise_or_include_ES2015_in_your_lib_option :
                     ts.Diagnostics.An_async_function_or_method_must_return_a_Promise_Make_sure_you_have_a_declaration_for_Promise_or_include_ES2015_in_your_lib_option);
@@ -42929,88 +44355,132 @@ var ts;
                 return errorType;
             }
             var functionFlags = ts.getFunctionFlags(func);
-            var type;
-            if (func.body.kind !== 218) {
-                type = checkExpressionCached(func.body, checkMode && checkMode & ~8);
-                if (functionFlags & 2) {
-                    type = checkAwaitedType(type, func, ts.Diagnostics.The_return_type_of_an_async_function_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member);
+            var isAsync = (functionFlags & 2) !== 0;
+            var isGenerator = (functionFlags & 1) !== 0;
+            var returnType;
+            var yieldType;
+            var nextType;
+            var fallbackReturnType = voidType;
+            if (func.body.kind !== 219) {
+                returnType = checkExpressionCached(func.body, checkMode && checkMode & ~8);
+                if (isAsync) {
+                    returnType = checkAwaitedType(returnType, func, ts.Diagnostics.The_return_type_of_an_async_function_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member);
                 }
             }
+            else if (isGenerator) {
+                var returnTypes = checkAndAggregateReturnExpressionTypes(func, checkMode);
+                if (!returnTypes) {
+                    fallbackReturnType = neverType;
+                }
+                else if (returnTypes.length > 0) {
+                    returnType = getUnionType(returnTypes, 2);
+                }
+                var _a = checkAndAggregateYieldOperandTypes(func, checkMode), yieldTypes = _a.yieldTypes, nextTypes = _a.nextTypes;
+                yieldType = ts.some(yieldTypes) ? getUnionType(yieldTypes, 2) : undefined;
+                nextType = ts.some(nextTypes) ? getIntersectionType(nextTypes) : undefined;
+            }
             else {
                 var types = checkAndAggregateReturnExpressionTypes(func, checkMode);
-                if (functionFlags & 1) {
-                    types = ts.concatenate(checkAndAggregateYieldOperandTypes(func, checkMode), types);
-                    if (!types || types.length === 0) {
-                        var iterableIteratorAny = functionFlags & 2
-                            ? createAsyncIterableIteratorType(anyType)
-                            : createIterableIteratorType(anyType);
-                        if (noImplicitAny) {
-                            error(func.asteriskToken, ts.Diagnostics.Generator_implicitly_has_type_0_because_it_does_not_yield_any_values_Consider_supplying_a_return_type, typeToString(iterableIteratorAny));
-                        }
-                        return iterableIteratorAny;
+                if (!types) {
+                    return functionFlags & 2
+                        ? createPromiseReturnType(func, neverType)
+                        : neverType;
+                }
+                if (types.length === 0) {
+                    return functionFlags & 2
+                        ? createPromiseReturnType(func, voidType)
+                        : voidType;
+                }
+                returnType = getUnionType(types, 2);
+            }
+            if (returnType || yieldType || nextType) {
+                var contextualSignature = getContextualSignatureForFunctionLikeDeclaration(func);
+                if (!contextualSignature) {
+                    if (yieldType)
+                        reportErrorsFromWidening(func, yieldType, 1);
+                    if (returnType)
+                        reportErrorsFromWidening(func, returnType);
+                    if (nextType)
+                        reportErrorsFromWidening(func, nextType);
+                }
+                if (returnType && isUnitType(returnType) ||
+                    yieldType && isUnitType(yieldType) ||
+                    nextType && isUnitType(nextType)) {
+                    var contextualType = !contextualSignature ? undefined :
+                        contextualSignature === getSignatureFromDeclaration(func) ? isGenerator ? undefined : returnType :
+                            instantiateContextualType(getReturnTypeOfSignature(contextualSignature), func);
+                    if (isGenerator) {
+                        yieldType = getWidenedLiteralLikeTypeForContextualIterationTypeIfNeeded(yieldType, contextualType, 0, isAsync);
+                        returnType = getWidenedLiteralLikeTypeForContextualIterationTypeIfNeeded(returnType, contextualType, 1, isAsync);
+                        nextType = getWidenedLiteralLikeTypeForContextualIterationTypeIfNeeded(nextType, contextualType, 2, isAsync);
+                    }
+                    else {
+                        returnType = getWidenedLiteralLikeTypeForContextualReturnTypeIfNeeded(returnType, contextualType, isAsync);
                     }
                 }
-                else {
-                    if (!types) {
-                        return functionFlags & 2
-                            ? createPromiseReturnType(func, neverType)
-                            : neverType;
-                    }
-                    if (types.length === 0) {
-                        return functionFlags & 2
-                            ? createPromiseReturnType(func, voidType)
-                            : voidType;
+                if (yieldType)
+                    yieldType = getWidenedType(yieldType);
+                if (returnType)
+                    returnType = getWidenedType(returnType);
+                if (nextType)
+                    nextType = getWidenedType(nextType);
+            }
+            if (isGenerator) {
+                return createGeneratorReturnType(yieldType || neverType, returnType || fallbackReturnType, nextType || unknownType, isAsync);
+            }
+            else {
+                return isAsync
+                    ? createPromiseType(returnType || fallbackReturnType)
+                    : returnType || fallbackReturnType;
+            }
+        }
+        function createGeneratorReturnType(yieldType, returnType, nextType, isAsyncGenerator) {
+            var resolver = isAsyncGenerator ? asyncIterationTypesResolver : syncIterationTypesResolver;
+            var globalGeneratorType = resolver.getGlobalGeneratorType(false);
+            yieldType = resolver.resolveIterationType(yieldType, undefined) || unknownType;
+            returnType = resolver.resolveIterationType(returnType, undefined) || unknownType;
+            nextType = resolver.resolveIterationType(nextType, undefined) || unknownType;
+            if (globalGeneratorType === emptyGenericType) {
+                var globalType = resolver.getGlobalIterableIteratorType(false);
+                var iterationTypes = globalType !== emptyGenericType ? getIterationTypesOfGlobalIterableType(globalType, resolver) : undefined;
+                var iterableIteratorReturnType = iterationTypes ? iterationTypes.returnType : anyType;
+                var iterableIteratorNextType = iterationTypes ? iterationTypes.nextType : undefinedType;
+                if (isTypeAssignableTo(returnType, iterableIteratorReturnType) &&
+                    isTypeAssignableTo(iterableIteratorNextType, nextType)) {
+                    if (globalType !== emptyGenericType) {
+                        return createTypeFromGenericGlobalType(globalType, [yieldType]);
                     }
+                    resolver.getGlobalIterableIteratorType(true);
+                    return emptyObjectType;
                 }
-                type = getUnionType(types, 2);
-            }
-            var contextualSignature = getContextualSignatureForFunctionLikeDeclaration(func);
-            if (!contextualSignature) {
-                reportErrorsFromWidening(func, type);
-            }
-            if (isUnitType(type)) {
-                var contextualType = !contextualSignature ? undefined :
-                    contextualSignature === getSignatureFromDeclaration(func) ? type :
-                        getReturnTypeOfSignature(contextualSignature);
-                if (contextualType) {
-                    switch (functionFlags & 3) {
-                        case 3:
-                            contextualType = getIteratedTypeOfGenerator(contextualType, true);
-                            break;
-                        case 1:
-                            contextualType = getIteratedTypeOfGenerator(contextualType, false);
-                            break;
-                        case 2:
-                            contextualType = getPromisedTypeOfPromise(contextualType);
-                            break;
-                    }
-                }
-                type = getWidenedLiteralLikeTypeForContextualType(type, contextualType);
-            }
-            var widenedType = getWidenedType(type);
-            switch (functionFlags & 3) {
-                case 3:
-                    return createAsyncIterableIteratorType(widenedType);
-                case 1:
-                    return createIterableIteratorType(widenedType);
-                case 2:
-                    return createPromiseType(widenedType);
-                default:
-                    return widenedType;
+                resolver.getGlobalGeneratorType(true);
+                return emptyObjectType;
             }
+            return createTypeFromGenericGlobalType(globalGeneratorType, [yieldType, returnType, nextType]);
         }
         function checkAndAggregateYieldOperandTypes(func, checkMode) {
-            var aggregatedTypes = [];
+            var yieldTypes = [];
+            var nextTypes = [];
             var isAsync = (ts.getFunctionFlags(func) & 2) !== 0;
             ts.forEachYieldExpression(func.body, function (yieldExpression) {
-                ts.pushIfUnique(aggregatedTypes, getYieldedTypeOfYieldExpression(yieldExpression, isAsync, checkMode));
+                var yieldExpressionType = yieldExpression.expression ? checkExpression(yieldExpression.expression, checkMode) : undefinedWideningType;
+                ts.pushIfUnique(yieldTypes, getYieldedTypeOfYieldExpression(yieldExpression, yieldExpressionType, anyType, isAsync));
+                var nextType;
+                if (yieldExpression.asteriskToken) {
+                    var iterationTypes = getIterationTypesOfIterable(yieldExpressionType, isAsync ? 19 : 17, yieldExpression.expression);
+                    nextType = iterationTypes && iterationTypes.nextType;
+                }
+                else {
+                    nextType = getContextualType(yieldExpression);
+                }
+                if (nextType)
+                    ts.pushIfUnique(nextTypes, nextType);
             });
-            return aggregatedTypes;
+            return { yieldTypes: yieldTypes, nextTypes: nextTypes };
         }
-        function getYieldedTypeOfYieldExpression(node, isAsync, checkMode) {
+        function getYieldedTypeOfYieldExpression(node, expressionType, sentType, isAsync) {
             var errorNode = node.expression || node;
-            var expressionType = node.expression ? checkExpression(node.expression, checkMode) : undefinedWideningType;
-            var yieldedType = node.asteriskToken ? checkIteratedTypeOrElementType(expressionType, errorNode, false, isAsync) : expressionType;
+            var yieldedType = node.asteriskToken ? checkIteratedTypeOrElementType(isAsync ? 19 : 17, expressionType, sentType, errorNode) : expressionType;
             return !isAsync ? yieldedType : getAwaitedType(yieldedType, errorNode, node.asteriskToken
                 ? ts.Diagnostics.Type_of_iterated_elements_of_a_yield_Asterisk_operand_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member
                 : ts.Diagnostics.Type_of_yield_operand_in_an_async_generator_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member);
@@ -43042,7 +44512,7 @@ var ts;
             if (!node.possiblyExhaustive) {
                 return false;
             }
-            if (node.expression.kind === 199) {
+            if (node.expression.kind === 200) {
                 var operandType = getTypeOfExpression(node.expression.expression);
                 var witnesses = getSwitchClauseTypeOfWitnesses(node);
                 var notEqualFacts_1 = getFactsFromTypeofSwitch(0, 0, witnesses, true);
@@ -43063,7 +44533,7 @@ var ts;
             if (!(func.flags & 128)) {
                 return false;
             }
-            if (ts.some(func.body.statements, function (statement) { return statement.kind === 232 && isExhaustiveSwitchStatement(statement); })) {
+            if (ts.some(func.body.statements, function (statement) { return statement.kind === 233 && isExhaustiveSwitchStatement(statement); })) {
                 return false;
             }
             return true;
@@ -43100,11 +44570,11 @@ var ts;
         }
         function mayReturnNever(func) {
             switch (func.kind) {
-                case 196:
                 case 197:
+                case 198:
                     return true;
-                case 156:
-                    return func.parent.kind === 188;
+                case 157:
+                    return func.parent.kind === 189;
                 default:
                     return false;
             }
@@ -43113,24 +44583,26 @@ var ts;
             if (!produceDiagnostics) {
                 return;
             }
-            if (returnType && maybeTypeOfKind(returnType, 1 | 16384)) {
+            var functionFlags = ts.getFunctionFlags(func);
+            var type = returnType && getReturnOrPromisedType(returnType, functionFlags);
+            if (type && maybeTypeOfKind(type, 1 | 16384)) {
                 return;
             }
-            if (func.kind === 155 || ts.nodeIsMissing(func.body) || func.body.kind !== 218 || !functionHasImplicitReturn(func)) {
+            if (func.kind === 156 || ts.nodeIsMissing(func.body) || func.body.kind !== 219 || !functionHasImplicitReturn(func)) {
                 return;
             }
             var hasExplicitReturn = func.flags & 256;
-            if (returnType && returnType.flags & 131072) {
+            if (type && type.flags & 131072) {
                 error(ts.getEffectiveReturnTypeNode(func), ts.Diagnostics.A_function_returning_never_cannot_have_a_reachable_end_point);
             }
-            else if (returnType && !hasExplicitReturn) {
+            else if (type && !hasExplicitReturn) {
                 error(ts.getEffectiveReturnTypeNode(func), ts.Diagnostics.A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value);
             }
-            else if (returnType && strictNullChecks && !isTypeAssignableTo(undefinedType, returnType)) {
+            else if (type && strictNullChecks && !isTypeAssignableTo(undefinedType, type)) {
                 error(ts.getEffectiveReturnTypeNode(func), ts.Diagnostics.Function_lacks_ending_return_statement_and_return_type_does_not_include_undefined);
             }
             else if (compilerOptions.noImplicitReturns) {
-                if (!returnType) {
+                if (!type) {
                     if (!hasExplicitReturn) {
                         return;
                     }
@@ -43143,44 +44615,52 @@ var ts;
             }
         }
         function checkFunctionExpressionOrObjectLiteralMethod(node, checkMode) {
-            ts.Debug.assert(node.kind !== 156 || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 157 || ts.isObjectLiteralMethod(node));
             checkNodeDeferred(node);
             if (checkMode && checkMode & 4 && isContextSensitive(node)) {
                 if (!ts.getEffectiveReturnTypeNode(node) && hasContextSensitiveReturnExpression(node)) {
-                    var links_1 = getNodeLinks(node);
-                    if (links_1.contextFreeType) {
-                        return links_1.contextFreeType;
+                    var links = getNodeLinks(node);
+                    if (links.contextFreeType) {
+                        return links.contextFreeType;
                     }
                     var returnType = getReturnTypeFromBody(node, checkMode);
                     var returnOnlySignature = createSignature(undefined, undefined, undefined, ts.emptyArray, returnType, undefined, 0, false, false);
                     var returnOnlyType = createAnonymousType(node.symbol, emptySymbols, [returnOnlySignature], ts.emptyArray, undefined, undefined);
-                    returnOnlyType.objectFlags |= 524288;
-                    return links_1.contextFreeType = returnOnlyType;
+                    returnOnlyType.objectFlags |= 1048576;
+                    return links.contextFreeType = returnOnlyType;
                 }
                 return anyFunctionType;
             }
             var hasGrammarError = checkGrammarFunctionLikeDeclaration(node);
-            if (!hasGrammarError && node.kind === 196) {
+            if (!hasGrammarError && node.kind === 197) {
                 checkGrammarForGenerator(node);
             }
-            var links = getNodeLinks(node);
             var type = getTypeOfSymbol(getMergedSymbol(node.symbol));
             if (isTypeAny(type)) {
                 return type;
             }
+            contextuallyCheckFunctionExpressionOrObjectLiteralMethod(node, checkMode);
+            return type;
+        }
+        function contextuallyCheckFunctionExpressionOrObjectLiteralMethod(node, checkMode) {
+            var links = getNodeLinks(node);
             if (!(links.flags & 1024)) {
                 var contextualSignature = getContextualSignature(node);
                 if (!(links.flags & 1024)) {
                     links.flags |= 1024;
                     if (contextualSignature) {
+                        var type = getTypeOfSymbol(getMergedSymbol(node.symbol));
+                        if (isTypeAny(type)) {
+                            return;
+                        }
                         var signature = getSignaturesOfType(type, 0)[0];
                         if (isContextSensitive(node)) {
-                            var contextualMapper = getContextualMapper(node);
+                            var inferenceContext = getInferenceContext(node);
                             if (checkMode && checkMode & 2) {
-                                inferFromAnnotatedParameters(signature, contextualSignature, contextualMapper);
+                                inferFromAnnotatedParameters(signature, contextualSignature, inferenceContext);
                             }
-                            var instantiatedContextualSignature = contextualMapper === identityMapper ?
-                                contextualSignature : instantiateSignature(contextualSignature, contextualMapper);
+                            var instantiatedContextualSignature = inferenceContext ?
+                                instantiateSignature(contextualSignature, inferenceContext.mapper) : contextualSignature;
                             assignContextualParameterTypes(signature, instantiatedContextualSignature);
                         }
                         if (!getReturnTypeFromAnnotation(node) && !signature.resolvedReturnType) {
@@ -43193,29 +44673,29 @@ var ts;
                     checkSignatureDeclaration(node);
                 }
             }
-            return type;
         }
-        function getReturnOrPromisedType(node, functionFlags) {
-            var type = getReturnTypeFromAnnotation(node);
-            return type && ((functionFlags & 3) === 2) ?
-                getAwaitedType(type) || errorType : type;
+        function getReturnOrPromisedType(type, functionFlags) {
+            var isGenerator = !!(functionFlags & 1);
+            var isAsync = !!(functionFlags & 2);
+            return type && isGenerator ? getIterationTypeOfGeneratorFunctionReturnType(1, type, isAsync) || errorType :
+                type && isAsync ? getAwaitedType(type) || errorType :
+                    type;
         }
         function checkFunctionExpressionOrObjectLiteralMethodDeferred(node) {
-            ts.Debug.assert(node.kind !== 156 || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 157 || ts.isObjectLiteralMethod(node));
             var functionFlags = ts.getFunctionFlags(node);
-            var returnOrPromisedType = getReturnOrPromisedType(node, functionFlags);
-            if ((functionFlags & 1) === 0) {
-                checkAllCodePathsInNonVoidFunctionReturnOrThrow(node, returnOrPromisedType);
-            }
+            var returnType = getReturnTypeFromAnnotation(node);
+            checkAllCodePathsInNonVoidFunctionReturnOrThrow(node, returnType);
             if (node.body) {
                 if (!ts.getEffectiveReturnTypeNode(node)) {
                     getReturnTypeOfSignature(getSignatureFromDeclaration(node));
                 }
-                if (node.body.kind === 218) {
+                if (node.body.kind === 219) {
                     checkSourceElement(node.body);
                 }
                 else {
                     var exprType = checkExpression(node.body);
+                    var returnOrPromisedType = getReturnOrPromisedType(returnType, functionFlags);
                     if (returnOrPromisedType) {
                         if ((functionFlags & 3) === 2) {
                             var awaitedType = checkAwaitedType(exprType, node.body, ts.Diagnostics.The_return_type_of_an_async_function_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member);
@@ -43228,9 +44708,11 @@ var ts;
                 }
             }
         }
-        function checkArithmeticOperandType(operand, type, diagnostic) {
+        function checkArithmeticOperandType(operand, type, diagnostic, isAwaitValid) {
+            if (isAwaitValid === void 0) { isAwaitValid = false; }
             if (!isTypeAssignableTo(type, numberOrBigIntType)) {
-                error(operand, diagnostic);
+                var awaitedType = isAwaitValid && getAwaitedTypeOfPromise(type);
+                errorAndMaybeSuggestAwait(operand, !!awaitedType && isTypeAssignableTo(awaitedType, numberOrBigIntType), diagnostic);
                 return false;
             }
             return true;
@@ -43273,10 +44755,10 @@ var ts;
         function isReferenceToReadonlyEntity(expr, symbol) {
             if (isReadonlySymbol(symbol)) {
                 if (symbol.flags & 4 &&
-                    (expr.kind === 189 || expr.kind === 190) &&
-                    expr.expression.kind === 100) {
+                    (expr.kind === 190 || expr.kind === 191) &&
+                    expr.expression.kind === 101) {
                     var func = ts.getContainingFunction(expr);
-                    if (!(func && func.kind === 157)) {
+                    if (!(func && func.kind === 158)) {
                         return true;
                     }
                     return !symbol.valueDeclaration || !(func.parent === symbol.valueDeclaration.parent || func === symbol.valueDeclaration.parent);
@@ -43286,13 +44768,13 @@ var ts;
             return false;
         }
         function isReferenceThroughNamespaceImport(expr) {
-            if (expr.kind === 189 || expr.kind === 190) {
+            if (expr.kind === 190 || expr.kind === 191) {
                 var node = ts.skipParentheses(expr.expression);
-                if (node.kind === 72) {
+                if (node.kind === 73) {
                     var symbol = getNodeLinks(node).resolvedSymbol;
                     if (symbol.flags & 2097152) {
                         var declaration = getDeclarationOfAliasSymbol(symbol);
-                        return !!declaration && declaration.kind === 251;
+                        return !!declaration && declaration.kind === 252;
                     }
                 }
             }
@@ -43300,7 +44782,7 @@ var ts;
         }
         function checkReferenceExpression(expr, invalidReferenceMessage) {
             var node = ts.skipOuterExpressions(expr, 2 | 1);
-            if (node.kind !== 72 && node.kind !== 189 && node.kind !== 190) {
+            if (node.kind !== 73 && node.kind !== 190 && node.kind !== 191) {
                 error(expr, invalidReferenceMessage);
                 return false;
             }
@@ -43309,7 +44791,7 @@ var ts;
         function checkDeleteExpression(node) {
             checkExpression(node.expression);
             var expr = ts.skipParentheses(node.expression);
-            if (expr.kind !== 189 && expr.kind !== 190) {
+            if (expr.kind !== 190 && expr.kind !== 191) {
                 error(expr, ts.Diagnostics.The_operand_of_a_delete_operator_must_be_a_property_reference);
                 return booleanType;
             }
@@ -43331,7 +44813,18 @@ var ts;
         function checkAwaitExpression(node) {
             if (produceDiagnostics) {
                 if (!(node.flags & 16384)) {
-                    grammarErrorOnFirstToken(node, ts.Diagnostics.await_expression_is_only_allowed_within_an_async_function);
+                    var sourceFile = ts.getSourceFileOfNode(node);
+                    if (!hasParseDiagnostics(sourceFile)) {
+                        var span = ts.getSpanOfTokenAtPosition(sourceFile, node.pos);
+                        var diagnostic = ts.createFileDiagnostic(sourceFile, span.start, span.length, ts.Diagnostics.await_expression_is_only_allowed_within_an_async_function);
+                        var func = ts.getContainingFunction(node);
+                        if (func && func.kind !== 158) {
+                            ts.Debug.assert((ts.getFunctionFlags(func) & 2) === 0, "Enclosing function should never be an async function.");
+                            var relatedInfo = ts.createDiagnosticForNode(func, ts.Diagnostics.Did_you_mean_to_mark_this_function_as_async);
+                            ts.addRelatedInfo(diagnostic, relatedInfo);
+                        }
+                        diagnostics.add(diagnostic);
+                    }
                 }
                 if (isInParameterInitializerBeforeContainingFunction(node)) {
                     error(node, ts.Diagnostics.await_expressions_cannot_be_used_in_a_parameter_initializer);
@@ -43488,15 +44981,16 @@ var ts;
             if (strictNullChecks && properties.length === 0) {
                 return checkNonNullType(sourceType, node);
             }
-            for (var _i = 0, properties_6 = properties; _i < properties_6.length; _i++) {
-                var p = properties_6[_i];
-                checkObjectLiteralDestructuringPropertyAssignment(sourceType, p, properties, rightIsThis);
+            for (var i = 0; i < properties.length; i++) {
+                checkObjectLiteralDestructuringPropertyAssignment(node, sourceType, i, properties, rightIsThis);
             }
             return sourceType;
         }
-        function checkObjectLiteralDestructuringPropertyAssignment(objectLiteralType, property, allProperties, rightIsThis) {
+        function checkObjectLiteralDestructuringPropertyAssignment(node, objectLiteralType, propertyIndex, allProperties, rightIsThis) {
             if (rightIsThis === void 0) { rightIsThis = false; }
-            if (property.kind === 275 || property.kind === 276) {
+            var properties = node.properties;
+            var property = properties[propertyIndex];
+            if (property.kind === 276 || property.kind === 277) {
                 var name = property.name;
                 var exprType = getLiteralTypeFromPropertyName(name);
                 if (isTypeUsableAsPropertyName(exprType)) {
@@ -43509,21 +45003,29 @@ var ts;
                 }
                 var elementType = getIndexedAccessType(objectLiteralType, exprType, name);
                 var type = getFlowTypeOfDestructuring(property, elementType);
-                return checkDestructuringAssignment(property.kind === 276 ? property : property.initializer, type);
+                return checkDestructuringAssignment(property.kind === 277 ? property : property.initializer, type);
             }
-            else if (property.kind === 277) {
-                if (languageVersion < 7) {
-                    checkExternalEmitHelpers(property, 4);
+            else if (property.kind === 278) {
+                if (propertyIndex < properties.length - 1) {
+                    error(property, ts.Diagnostics.A_rest_element_must_be_last_in_a_destructuring_pattern);
                 }
-                var nonRestNames = [];
-                if (allProperties) {
-                    for (var i = 0; i < allProperties.length - 1; i++) {
-                        nonRestNames.push(allProperties[i].name);
+                else {
+                    if (languageVersion < 99) {
+                        checkExternalEmitHelpers(property, 4);
                     }
+                    var nonRestNames = [];
+                    if (allProperties) {
+                        for (var _i = 0, allProperties_1 = allProperties; _i < allProperties_1.length; _i++) {
+                            var otherProperty = allProperties_1[_i];
+                            if (!ts.isSpreadAssignment(otherProperty)) {
+                                nonRestNames.push(otherProperty.name);
+                            }
+                        }
+                    }
+                    var type = getRestType(objectLiteralType, nonRestNames, objectLiteralType.symbol);
+                    checkGrammarForDisallowedTrailingComma(allProperties, ts.Diagnostics.A_rest_parameter_or_binding_pattern_may_not_have_a_trailing_comma);
+                    return checkDestructuringAssignment(property.expression, type);
                 }
-                var type = getRestType(objectLiteralType, nonRestNames, objectLiteralType.symbol);
-                checkGrammarForDisallowedTrailingComma(allProperties, ts.Diagnostics.A_rest_parameter_or_binding_pattern_may_not_have_a_trailing_comma);
-                return checkDestructuringAssignment(property.expression, type);
             }
             else {
                 error(property, ts.Diagnostics.Property_assignment_expected);
@@ -43534,7 +45036,7 @@ var ts;
             if (languageVersion < 2 && compilerOptions.downlevelIteration) {
                 checkExternalEmitHelpers(node, 512);
             }
-            var elementType = checkIteratedTypeOrElementType(sourceType, node, false, false) || errorType;
+            var elementType = checkIteratedTypeOrElementType(65, sourceType, undefinedType, node) || errorType;
             for (var i = 0; i < elements.length; i++) {
                 checkArrayLiteralDestructuringElementAssignment(node, sourceType, i, elementType, checkMode);
             }
@@ -43543,12 +45045,14 @@ var ts;
         function checkArrayLiteralDestructuringElementAssignment(node, sourceType, elementIndex, elementType, checkMode) {
             var elements = node.elements;
             var element = elements[elementIndex];
-            if (element.kind !== 210) {
-                if (element.kind !== 208) {
+            if (element.kind !== 211) {
+                if (element.kind !== 209) {
                     var indexType = getLiteralType(elementIndex);
                     if (isArrayLikeType(sourceType)) {
-                        var elementType_2 = getIndexedAccessType(sourceType, indexType, createSyntheticExpression(element, indexType));
-                        var type = getFlowTypeOfDestructuring(element, elementType_2);
+                        var accessFlags = hasDefaultValue(element) ? 8 : 0;
+                        var elementType_2 = getIndexedAccessTypeOrUndefined(sourceType, indexType, createSyntheticExpression(element, indexType), accessFlags) || errorType;
+                        var assignedType = hasDefaultValue(element) ? getTypeWithFacts(elementType_2, 524288) : elementType_2;
+                        var type = getFlowTypeOfDestructuring(element, assignedType);
                         return checkDestructuringAssignment(element, type, checkMode);
                     }
                     return checkDestructuringAssignment(element, elementType, checkMode);
@@ -43558,7 +45062,7 @@ var ts;
                 }
                 else {
                     var restExpression = element.expression;
-                    if (restExpression.kind === 204 && restExpression.operatorToken.kind === 59) {
+                    if (restExpression.kind === 205 && restExpression.operatorToken.kind === 60) {
                         error(restExpression.operatorToken, ts.Diagnostics.A_rest_element_cannot_have_an_initializer);
                     }
                     else {
@@ -43574,7 +45078,7 @@ var ts;
         }
         function checkDestructuringAssignment(exprOrAssignment, sourceType, checkMode, rightIsThis) {
             var target;
-            if (exprOrAssignment.kind === 276) {
+            if (exprOrAssignment.kind === 277) {
                 var prop = exprOrAssignment;
                 if (prop.objectAssignmentInitializer) {
                     if (strictNullChecks &&
@@ -43588,21 +45092,21 @@ var ts;
             else {
                 target = exprOrAssignment;
             }
-            if (target.kind === 204 && target.operatorToken.kind === 59) {
+            if (target.kind === 205 && target.operatorToken.kind === 60) {
                 checkBinaryExpression(target, checkMode);
                 target = target.left;
             }
-            if (target.kind === 188) {
+            if (target.kind === 189) {
                 return checkObjectLiteralAssignment(target, sourceType, rightIsThis);
             }
-            if (target.kind === 187) {
+            if (target.kind === 188) {
                 return checkArrayLiteralAssignment(target, sourceType, checkMode);
             }
             return checkReferenceAssignment(target, sourceType, checkMode);
         }
         function checkReferenceAssignment(target, sourceType, checkMode) {
             var targetType = checkExpression(target, checkMode);
-            var error = target.parent.kind === 277 ?
+            var error = target.parent.kind === 278 ?
                 ts.Diagnostics.The_target_of_an_object_rest_assignment_must_be_a_variable_or_a_property_access :
                 ts.Diagnostics.The_left_hand_side_of_an_assignment_expression_must_be_a_variable_or_a_property_access;
             if (checkReferenceExpression(target, error)) {
@@ -43613,39 +45117,39 @@ var ts;
         function isSideEffectFree(node) {
             node = ts.skipParentheses(node);
             switch (node.kind) {
-                case 72:
+                case 73:
                 case 10:
                 case 13:
-                case 193:
-                case 206:
+                case 194:
+                case 207:
                 case 14:
                 case 8:
                 case 9:
-                case 102:
-                case 87:
-                case 96:
-                case 141:
-                case 196:
-                case 209:
+                case 103:
+                case 88:
+                case 97:
+                case 142:
                 case 197:
-                case 187:
+                case 210:
+                case 198:
                 case 188:
-                case 199:
-                case 213:
+                case 189:
+                case 200:
+                case 214:
+                case 262:
                 case 261:
-                case 260:
                     return true;
-                case 205:
+                case 206:
                     return isSideEffectFree(node.whenTrue) &&
                         isSideEffectFree(node.whenFalse);
-                case 204:
+                case 205:
                     if (ts.isAssignmentOperator(node.operatorToken.kind)) {
                         return false;
                     }
                     return isSideEffectFree(node.left) &&
                         isSideEffectFree(node.right);
-                case 202:
                 case 203:
+                case 204:
                     switch (node.operator) {
                         case 52:
                         case 38:
@@ -43654,9 +45158,9 @@ var ts;
                             return true;
                     }
                     return false;
-                case 200:
-                case 194:
-                case 212:
+                case 201:
+                case 195:
+                case 213:
                 default:
                     return false;
             }
@@ -43672,8 +45176,8 @@ var ts;
         }
         function checkBinaryLikeExpression(left, operatorToken, right, checkMode, errorNode) {
             var operator = operatorToken.kind;
-            if (operator === 59 && (left.kind === 188 || left.kind === 187)) {
-                return checkDestructuringAssignment(left, checkExpression(right, checkMode), checkMode, right.kind === 100);
+            if (operator === 60 && (left.kind === 189 || left.kind === 188)) {
+                return checkDestructuringAssignment(left, checkExpression(right, checkMode), checkMode, right.kind === 101);
             }
             var leftType;
             if (operator === 54 || operator === 55) {
@@ -43686,26 +45190,26 @@ var ts;
             switch (operator) {
                 case 40:
                 case 41:
-                case 62:
                 case 63:
-                case 42:
                 case 64:
-                case 43:
+                case 42:
                 case 65:
-                case 39:
-                case 61:
-                case 46:
+                case 43:
                 case 66:
-                case 47:
+                case 39:
+                case 62:
+                case 46:
                 case 67:
-                case 48:
+                case 47:
                 case 68:
-                case 50:
-                case 70:
-                case 51:
-                case 71:
-                case 49:
+                case 48:
                 case 69:
+                case 50:
+                case 71:
+                case 51:
+                case 72:
+                case 49:
+                case 70:
                     if (leftType === silentNeverType || rightType === silentNeverType) {
                         return silentNeverType;
                     }
@@ -43719,8 +45223,8 @@ var ts;
                         return numberType;
                     }
                     else {
-                        var leftOk = checkArithmeticOperandType(left, leftType, ts.Diagnostics.The_left_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_bigint_or_an_enum_type);
-                        var rightOk = checkArithmeticOperandType(right, rightType, ts.Diagnostics.The_right_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_bigint_or_an_enum_type);
+                        var leftOk = checkArithmeticOperandType(left, leftType, ts.Diagnostics.The_left_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_bigint_or_an_enum_type, true);
+                        var rightOk = checkArithmeticOperandType(right, rightType, ts.Diagnostics.The_right_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_bigint_or_an_enum_type, true);
                         var resultType_1;
                         if ((isTypeAssignableToKind(leftType, 3) && isTypeAssignableToKind(rightType, 3)) ||
                             !(maybeTypeOfKind(leftType, 2112) || maybeTypeOfKind(rightType, 2112))) {
@@ -43729,13 +45233,13 @@ var ts;
                         else if (isTypeAssignableToKind(leftType, 2112) && isTypeAssignableToKind(rightType, 2112)) {
                             switch (operator) {
                                 case 48:
-                                case 68:
+                                case 69:
                                     reportOperatorError();
                             }
                             resultType_1 = bigintType;
                         }
                         else {
-                            reportOperatorError();
+                            reportOperatorError(function (awaitedLeft, awaitedRight) { return isTypeAssignableToKind(awaitedLeft, 2112) && isTypeAssignableToKind(awaitedRight, 2112); });
                             resultType_1 = errorType;
                         }
                         if (leftOk && rightOk) {
@@ -43744,7 +45248,7 @@ var ts;
                         return resultType_1;
                     }
                 case 38:
-                case 60:
+                case 61:
                     if (leftType === silentNeverType || rightType === silentNeverType) {
                         return silentNeverType;
                     }
@@ -43769,10 +45273,14 @@ var ts;
                         return resultType;
                     }
                     if (!resultType) {
-                        reportOperatorError();
+                        var closeEnoughKind_1 = 296 | 2112 | 132 | 3;
+                        reportOperatorError(function (awaitedLeft, awaitedRight) {
+                            return isTypeAssignableToKind(awaitedLeft, closeEnoughKind_1) &&
+                                isTypeAssignableToKind(awaitedRight, closeEnoughKind_1);
+                        });
                         return anyType;
                     }
-                    if (operator === 60) {
+                    if (operator === 61) {
                         checkAssignmentOperator(resultType);
                     }
                     return resultType;
@@ -43783,29 +45291,20 @@ var ts;
                     if (checkForDisallowedESSymbolOperand(operator)) {
                         leftType = getBaseTypeOfLiteralType(checkNonNullType(leftType, left));
                         rightType = getBaseTypeOfLiteralType(checkNonNullType(rightType, right));
-                        if (!(isTypeComparableTo(leftType, rightType) || isTypeComparableTo(rightType, leftType) ||
-                            (isTypeAssignableTo(leftType, numberOrBigIntType) && isTypeAssignableTo(rightType, numberOrBigIntType)))) {
-                            reportOperatorError();
-                        }
+                        reportOperatorErrorUnless(function (left, right) {
+                            return isTypeComparableTo(left, right) || isTypeComparableTo(right, left) || (isTypeAssignableTo(left, numberOrBigIntType) && isTypeAssignableTo(right, numberOrBigIntType));
+                        });
                     }
                     return booleanType;
                 case 33:
                 case 34:
                 case 35:
                 case 36:
-                    var leftIsLiteral = isLiteralType(leftType);
-                    var rightIsLiteral = isLiteralType(rightType);
-                    if (!leftIsLiteral || !rightIsLiteral) {
-                        leftType = leftIsLiteral ? getBaseTypeOfLiteralType(leftType) : leftType;
-                        rightType = rightIsLiteral ? getBaseTypeOfLiteralType(rightType) : rightType;
-                    }
-                    if (!isTypeEqualityComparableTo(leftType, rightType) && !isTypeEqualityComparableTo(rightType, leftType)) {
-                        reportOperatorError();
-                    }
+                    reportOperatorErrorUnless(function (left, right) { return isTypeEqualityComparableTo(left, right) || isTypeEqualityComparableTo(right, left); });
                     return booleanType;
-                case 94:
+                case 95:
                     return checkInstanceOfExpression(left, right, leftType, rightType);
-                case 93:
+                case 94:
                     return checkInExpression(left, right, leftType, rightType);
                 case 54:
                     return getTypeFacts(leftType) & 4194304 ?
@@ -43815,7 +45314,7 @@ var ts;
                     return getTypeFacts(leftType) & 8388608 ?
                         getUnionType([removeDefinitelyFalsyTypes(leftType), rightType], 2) :
                         leftType;
-                case 59:
+                case 60:
                     var declKind = ts.isBinaryExpression(left.parent) ? ts.getAssignmentDeclarationKind(left.parent) : 0;
                     checkAssignmentDeclaration(declKind, rightType);
                     if (isAssignmentDeclaration(declKind)) {
@@ -43858,7 +45357,7 @@ var ts;
                 }
             }
             function isEvalNode(node) {
-                return node.kind === 72 && node.escapedText === "eval";
+                return node.kind === 73 && node.escapedText === "eval";
             }
             function checkForDisallowedESSymbolOperand(operator) {
                 var offendingSymbolOperand = maybeTypeOfKind(leftType, 12288) ? left :
@@ -43873,13 +45372,13 @@ var ts;
             function getSuggestedBooleanOperator(operator) {
                 switch (operator) {
                     case 50:
-                    case 70:
+                    case 71:
                         return 55;
                     case 51:
-                    case 71:
+                    case 72:
                         return 36;
                     case 49:
-                    case 69:
+                    case 70:
                         return 54;
                     default:
                         return undefined;
@@ -43910,22 +45409,41 @@ var ts;
                         return false;
                 }
             }
-            function reportOperatorError() {
-                var leftStr = typeToString(leftType);
-                var rightStr = typeToString(rightType);
+            function reportOperatorErrorUnless(typesAreCompatible) {
+                if (!typesAreCompatible(leftType, rightType)) {
+                    reportOperatorError(typesAreCompatible);
+                    return true;
+                }
+                return false;
+            }
+            function reportOperatorError(awaitedTypesAreCompatible) {
+                var wouldWorkWithAwait = false;
                 var errNode = errorNode || operatorToken;
-                if (!tryGiveBetterPrimaryError(errNode, leftStr, rightStr)) {
-                    error(errNode, ts.Diagnostics.Operator_0_cannot_be_applied_to_types_1_and_2, ts.tokenToString(operatorToken.kind), leftStr, rightStr);
+                var _a = getTypeNamesForErrorDisplay(leftType, rightType), leftStr = _a[0], rightStr = _a[1];
+                if (awaitedTypesAreCompatible) {
+                    var awaitedLeftType = getAwaitedType(leftType);
+                    var awaitedRightType = getAwaitedType(rightType);
+                    wouldWorkWithAwait = !(awaitedLeftType === leftType && awaitedRightType === rightType)
+                        && !!(awaitedLeftType && awaitedRightType)
+                        && awaitedTypesAreCompatible(awaitedLeftType, awaitedRightType);
+                }
+                if (!tryGiveBetterPrimaryError(errNode, wouldWorkWithAwait, leftStr, rightStr)) {
+                    errorAndMaybeSuggestAwait(errNode, wouldWorkWithAwait, ts.Diagnostics.Operator_0_cannot_be_applied_to_types_1_and_2, ts.tokenToString(operatorToken.kind), leftStr, rightStr);
                 }
             }
-            function tryGiveBetterPrimaryError(errNode, leftStr, rightStr) {
+            function tryGiveBetterPrimaryError(errNode, maybeMissingAwait, leftStr, rightStr) {
+                var typeName;
                 switch (operatorToken.kind) {
                     case 35:
                     case 33:
-                        return error(errNode, ts.Diagnostics.This_condition_will_always_return_0_since_the_types_1_and_2_have_no_overlap, "false", leftStr, rightStr);
+                        typeName = "false";
+                        break;
                     case 36:
                     case 34:
-                        return error(errNode, ts.Diagnostics.This_condition_will_always_return_0_since_the_types_1_and_2_have_no_overlap, "true", leftStr, rightStr);
+                        typeName = "true";
+                }
+                if (typeName) {
+                    return errorAndMaybeSuggestAwait(errNode, maybeMissingAwait, ts.Diagnostics.This_condition_will_always_return_0_since_the_types_1_and_2_have_no_overlap, typeName, leftStr, rightStr);
                 }
                 return undefined;
             }
@@ -43961,22 +45479,38 @@ var ts;
             if (!(functionFlags & 1)) {
                 return anyType;
             }
+            var isAsync = (functionFlags & 2) !== 0;
             if (node.asteriskToken) {
-                if ((functionFlags & 3) === 3 &&
-                    languageVersion < 7) {
-                    checkExternalEmitHelpers(node, 26624);
+                if (isAsync && languageVersion < 99) {
+                    checkExternalEmitHelpers(node, 53248);
                 }
-                if ((functionFlags & 3) === 1 &&
-                    languageVersion < 2 && compilerOptions.downlevelIteration) {
+                if (!isAsync && languageVersion < 2 && compilerOptions.downlevelIteration) {
                     checkExternalEmitHelpers(node, 256);
                 }
             }
-            var isAsync = (functionFlags & 2) !== 0;
-            var yieldedType = getYieldedTypeOfYieldExpression(node, isAsync);
             var returnType = getReturnTypeFromAnnotation(func);
-            if (returnType) {
-                var signatureElementType = getIteratedTypeOfGenerator(returnType, isAsync) || anyType;
-                checkTypeAssignableToAndOptionallyElaborate(yieldedType, signatureElementType, node.expression || node, node.expression);
+            var iterationTypes = returnType && getIterationTypesOfGeneratorFunctionReturnType(returnType, isAsync);
+            var signatureYieldType = iterationTypes && iterationTypes.yieldType || anyType;
+            var signatureNextType = iterationTypes && iterationTypes.nextType || anyType;
+            var resolvedSignatureNextType = isAsync ? getAwaitedType(signatureNextType) || anyType : signatureNextType;
+            var yieldExpressionType = node.expression ? checkExpression(node.expression) : undefinedWideningType;
+            var yieldedType = getYieldedTypeOfYieldExpression(node, yieldExpressionType, resolvedSignatureNextType, isAsync);
+            if (returnType && yieldedType) {
+                checkTypeAssignableToAndOptionallyElaborate(yieldedType, signatureYieldType, node.expression || node, node.expression);
+            }
+            if (node.asteriskToken) {
+                var use = isAsync ? 19 : 17;
+                return getIterationTypeOfIterable(use, 1, yieldExpressionType, node.expression)
+                    || anyType;
+            }
+            else if (returnType) {
+                return getIterationTypeOfGeneratorFunctionReturnType(2, returnType, isAsync)
+                    || anyType;
+            }
+            var contextualReturnType = getContextualReturnType(func);
+            if (contextualReturnType) {
+                return getIterationTypeOfGeneratorFunctionReturnType(2, contextualReturnType, isAsync)
+                    || anyType;
             }
             return anyType;
         }
@@ -43995,22 +45529,22 @@ var ts;
             return stringType;
         }
         function getContextNode(node) {
-            if (node.kind === 268 && !ts.isJsxSelfClosingElement(node.parent)) {
+            if (node.kind === 269 && !ts.isJsxSelfClosingElement(node.parent)) {
                 return node.parent.parent;
             }
             return node;
         }
-        function checkExpressionWithContextualType(node, contextualType, contextualMapper, checkMode) {
+        function checkExpressionWithContextualType(node, contextualType, inferenceContext, checkMode) {
             var context = getContextNode(node);
             var saveContextualType = context.contextualType;
-            var saveContextualMapper = context.contextualMapper;
+            var saveInferenceContext = context.inferenceContext;
             context.contextualType = contextualType;
-            context.contextualMapper = contextualMapper;
-            var type = checkExpression(node, checkMode | 1 | (contextualMapper ? 2 : 0));
+            context.inferenceContext = inferenceContext;
+            var type = checkExpression(node, checkMode | 1 | (inferenceContext ? 2 : 0));
             var result = maybeTypeOfKind(type, 2944) && isLiteralOfContextualType(type, instantiateContextualType(contextualType, node)) ?
                 getRegularTypeOfLiteralType(type) : type;
             context.contextualType = saveContextualType;
-            context.contextualMapper = saveContextualMapper;
+            context.inferenceContext = saveInferenceContext;
             return result;
         }
         function checkExpressionCached(node, checkMode) {
@@ -44028,15 +45562,18 @@ var ts;
         }
         function isTypeAssertion(node) {
             node = ts.skipParentheses(node);
-            return node.kind === 194 || node.kind === 212;
+            return node.kind === 195 || node.kind === 213;
         }
         function checkDeclarationInitializer(declaration) {
             var initializer = ts.getEffectiveInitializer(declaration);
             var type = getTypeOfExpression(initializer, true);
+            var padded = ts.isParameter(declaration) && declaration.name.kind === 186 &&
+                isTupleType(type) && !type.target.hasRestElement && getTypeReferenceArity(type) < declaration.name.elements.length ?
+                padTupleType(type, declaration.name) : type;
             var widened = ts.getCombinedNodeFlags(declaration) & 2 ||
                 ts.isDeclarationReadonly(declaration) ||
                 isTypeAssertion(initializer) ||
-                isLiteralOfContextualType(type, getContextualType(initializer)) ? type : getWidenedLiteralType(type);
+                isLiteralOfContextualType(padded, getContextualType(initializer)) ? padded : getWidenedLiteralType(padded);
             if (ts.isInJSFile(declaration)) {
                 if (widened.flags & 98304) {
                     reportImplicitAny(declaration, anyType);
@@ -44049,6 +45586,21 @@ var ts;
             }
             return widened;
         }
+        function padTupleType(type, pattern) {
+            var patternElements = pattern.elements;
+            var arity = getTypeReferenceArity(type);
+            var elementTypes = arity ? type.typeArguments.slice() : [];
+            for (var i = arity; i < patternElements.length; i++) {
+                var e = patternElements[i];
+                if (i < patternElements.length - 1 || !(e.kind === 187 && e.dotDotDotToken)) {
+                    elementTypes.push(!ts.isOmittedExpression(e) && hasDefaultValue(e) ? getTypeFromBindingElement(e, false, false) : anyType);
+                    if (!ts.isOmittedExpression(e) && !hasDefaultValue(e)) {
+                        reportImplicitAny(e, anyType);
+                    }
+                }
+            }
+            return createTupleType(elementTypes, type.target.minLength, false, type.target.readonly);
+        }
         function isLiteralOfContextualType(candidateType, contextualType) {
             if (contextualType) {
                 if (contextualType.flags & 3145728) {
@@ -44056,7 +45608,7 @@ var ts;
                     return ts.some(types, function (t) { return isLiteralOfContextualType(candidateType, t); });
                 }
                 if (contextualType.flags & 58982400) {
-                    var constraint = getBaseConstraintOfType(contextualType) || emptyObjectType;
+                    var constraint = getBaseConstraintOfType(contextualType) || unknownType;
                     return maybeTypeOfKind(constraint, 4) && maybeTypeOfKind(candidateType, 128) ||
                         maybeTypeOfKind(constraint, 8) && maybeTypeOfKind(candidateType, 256) ||
                         maybeTypeOfKind(constraint, 64) && maybeTypeOfKind(candidateType, 2048) ||
@@ -44084,14 +45636,14 @@ var ts;
                     getWidenedLiteralLikeTypeForContextualType(type, instantiateContextualType(arguments.length === 2 ? getContextualType(node) : contextualType, node));
         }
         function checkPropertyAssignment(node, checkMode) {
-            if (node.name.kind === 149) {
+            if (node.name.kind === 150) {
                 checkComputedPropertyName(node.name);
             }
             return checkExpressionForMutableLocation(node.initializer, checkMode);
         }
         function checkObjectLiteralMethod(node, checkMode) {
             checkGrammarMethod(node);
-            if (node.name.kind === 149) {
+            if (node.name.kind === 150) {
                 checkComputedPropertyName(node.name);
             }
             var uninstantiatedType = checkFunctionExpressionOrObjectLiteralMethod(node, checkMode);
@@ -44099,27 +45651,37 @@ var ts;
         }
         function instantiateTypeWithSingleGenericCallSignature(node, type, checkMode) {
             if (checkMode && checkMode & (2 | 8)) {
-                var signature = getSingleCallSignature(type);
+                var callSignature = getSingleSignature(type, 0, true);
+                var constructSignature = getSingleSignature(type, 1, true);
+                var signature = callSignature || constructSignature;
                 if (signature && signature.typeParameters) {
-                    if (checkMode & 8) {
-                        skippedGenericFunction(node, checkMode);
-                        return anyFunctionType;
-                    }
                     var contextualType = getApparentTypeOfContextualType(node);
-                    if (contextualType) {
-                        var contextualSignature = getSingleCallSignature(getNonNullableType(contextualType));
+                    if (contextualType && !isMixinConstructorType(contextualType)) {
+                        var contextualSignature = getSingleSignature(getNonNullableType(contextualType), callSignature ? 0 : 1, false);
                         if (contextualSignature && !contextualSignature.typeParameters) {
-                            var context = getContextualMapper(node);
-                            var returnSignature = context.signature && getSingleCallSignature(getReturnTypeOfSignature(context.signature));
+                            if (checkMode & 8) {
+                                skippedGenericFunction(node, checkMode);
+                                return anyFunctionType;
+                            }
+                            var context = getInferenceContext(node);
+                            var returnType = context.signature && getReturnTypeOfSignature(context.signature);
+                            var returnSignature = returnType && getSingleCallOrConstructSignature(returnType);
                             if (returnSignature && !returnSignature.typeParameters && !ts.every(context.inferences, hasInferenceCandidates)) {
                                 var uniqueTypeParameters = getUniqueTypeParameters(context, signature.typeParameters);
-                                var strippedType = getOrCreateTypeFromSignature(getSignatureInstantiationWithoutFillingInTypeArguments(signature, uniqueTypeParameters));
-                                var inferences = ts.map(context.typeParameters, createInferenceInfo);
-                                inferTypes(inferences, strippedType, contextualType);
-                                if (ts.some(inferences, hasInferenceCandidates) && !hasOverlappingInferences(context.inferences, inferences)) {
-                                    mergeInferences(context.inferences, inferences);
-                                    context.inferredTypeParameters = ts.concatenate(context.inferredTypeParameters, uniqueTypeParameters);
-                                    return strippedType;
+                                var instantiatedSignature = getSignatureInstantiationWithoutFillingInTypeArguments(signature, uniqueTypeParameters);
+                                var inferences_3 = ts.map(context.inferences, function (info) { return createInferenceInfo(info.typeParameter); });
+                                applyToParameterTypes(instantiatedSignature, contextualSignature, function (source, target) {
+                                    inferTypes(inferences_3, source, target, 0, true);
+                                });
+                                if (ts.some(inferences_3, hasInferenceCandidates)) {
+                                    applyToReturnTypes(instantiatedSignature, contextualSignature, function (source, target) {
+                                        inferTypes(inferences_3, source, target);
+                                    });
+                                    if (!hasOverlappingInferences(context.inferences, inferences_3)) {
+                                        mergeInferences(context.inferences, inferences_3);
+                                        context.inferredTypeParameters = ts.concatenate(context.inferredTypeParameters, uniqueTypeParameters);
+                                        return getOrCreateTypeFromSignature(instantiatedSignature);
+                                    }
                                 }
                             }
                             return getOrCreateTypeFromSignature(instantiateSignatureInContextOf(signature, contextualSignature, context));
@@ -44131,8 +45693,8 @@ var ts;
         }
         function skippedGenericFunction(node, checkMode) {
             if (checkMode & 2) {
-                var context = getContextualMapper(node);
-                context.flags |= 8;
+                var context = getInferenceContext(node);
+                context.flags |= 4;
             }
         }
         function hasInferenceCandidates(info) {
@@ -44199,7 +45761,7 @@ var ts;
         }
         function getTypeOfExpression(node, cache) {
             var expr = ts.skipParentheses(node);
-            if (expr.kind === 191 && expr.expression.kind !== 98 && !ts.isRequireCall(expr, true) && !isSymbolOrSymbolForCall(expr)) {
+            if (expr.kind === 192 && expr.expression.kind !== 99 && !ts.isRequireCall(expr, true) && !isSymbolOrSymbolForCall(expr)) {
                 var funcType = checkNonNullExpression(expr.expression);
                 var signature = getSingleCallSignature(funcType);
                 if (signature && !signature.typeParameters) {
@@ -44225,6 +45787,7 @@ var ts;
         function checkExpression(node, checkMode, forceTuple) {
             var saveCurrentNode = currentNode;
             currentNode = node;
+            instantiationCount = 0;
             var uninstantiatedType = checkExpressionWorker(node, checkMode, forceTuple);
             var type = instantiateTypeWithSingleGenericCallSignature(node, uninstantiatedType, checkMode);
             if (isConstEnumObjectType(type)) {
@@ -44234,10 +45797,10 @@ var ts;
             return type;
         }
         function checkConstEnumAccess(node, type) {
-            var ok = (node.parent.kind === 189 && node.parent.expression === node) ||
-                (node.parent.kind === 190 && node.parent.expression === node) ||
-                ((node.kind === 72 || node.kind === 148) && isInRightSideOfImportOrExportAssignment(node) ||
-                    (node.parent.kind === 167 && node.parent.exprName === node));
+            var ok = (node.parent.kind === 190 && node.parent.expression === node) ||
+                (node.parent.kind === 191 && node.parent.expression === node) ||
+                ((node.kind === 73 || node.kind === 149) && isInRightSideOfImportOrExportAssignment(node) ||
+                    (node.parent.kind === 168 && node.parent.exprName === node));
             if (!ok) {
                 error(node, ts.Diagnostics.const_enums_can_only_be_used_in_property_or_index_access_expressions_or_the_right_hand_side_of_an_import_declaration_or_export_assignment_or_type_query);
             }
@@ -44258,13 +45821,13 @@ var ts;
         }
         function checkExpressionWorker(node, checkMode, forceTuple) {
             switch (node.kind) {
-                case 72:
+                case 73:
                     return checkIdentifier(node);
-                case 100:
+                case 101:
                     return checkThisExpression(node);
-                case 98:
+                case 99:
                     return checkSuperExpression(node);
-                case 96:
+                case 97:
                     return nullWideningType;
                 case 14:
                 case 10:
@@ -44275,81 +45838,81 @@ var ts;
                 case 9:
                     checkGrammarBigIntLiteral(node);
                     return getFreshTypeOfLiteralType(getBigIntLiteralType(node));
-                case 102:
+                case 103:
                     return trueType;
-                case 87:
+                case 88:
                     return falseType;
-                case 206:
+                case 207:
                     return checkTemplateExpression(node);
                 case 13:
                     return globalRegExpType;
-                case 187:
-                    return checkArrayLiteral(node, checkMode, forceTuple);
                 case 188:
-                    return checkObjectLiteral(node, checkMode);
+                    return checkArrayLiteral(node, checkMode, forceTuple);
                 case 189:
-                    return checkPropertyAccessExpression(node);
-                case 148:
-                    return checkQualifiedName(node);
+                    return checkObjectLiteral(node, checkMode);
                 case 190:
-                    return checkIndexedAccess(node);
+                    return checkPropertyAccessExpression(node);
+                case 149:
+                    return checkQualifiedName(node);
                 case 191:
-                    if (node.expression.kind === 92) {
+                    return checkIndexedAccess(node);
+                case 192:
+                    if (node.expression.kind === 93) {
                         return checkImportCallExpression(node);
                     }
-                case 192:
-                    return checkCallExpression(node, checkMode);
                 case 193:
-                    return checkTaggedTemplateExpression(node);
-                case 195:
-                    return checkParenthesizedExpression(node, checkMode);
-                case 209:
-                    return checkClassExpression(node);
-                case 196:
-                case 197:
-                    return checkFunctionExpressionOrObjectLiteralMethod(node, checkMode);
-                case 199:
-                    return checkTypeOfExpression(node);
+                    return checkCallExpression(node, checkMode);
                 case 194:
-                case 212:
-                    return checkAssertion(node);
-                case 213:
-                    return checkNonNullAssertion(node);
-                case 214:
-                    return checkMetaProperty(node);
-                case 198:
-                    return checkDeleteExpression(node);
-                case 200:
-                    return checkVoidExpression(node);
-                case 201:
-                    return checkAwaitExpression(node);
-                case 202:
-                    return checkPrefixUnaryExpression(node);
-                case 203:
-                    return checkPostfixUnaryExpression(node);
-                case 204:
-                    return checkBinaryExpression(node, checkMode);
-                case 205:
-                    return checkConditionalExpression(node, checkMode);
-                case 208:
-                    return checkSpreadExpression(node, checkMode);
+                    return checkTaggedTemplateExpression(node);
+                case 196:
+                    return checkParenthesizedExpression(node, checkMode);
                 case 210:
-                    return undefinedWideningType;
-                case 207:
-                    return checkYieldExpression(node);
+                    return checkClassExpression(node);
+                case 197:
+                case 198:
+                    return checkFunctionExpressionOrObjectLiteralMethod(node, checkMode);
+                case 200:
+                    return checkTypeOfExpression(node);
+                case 195:
+                case 213:
+                    return checkAssertion(node);
+                case 214:
+                    return checkNonNullAssertion(node);
                 case 215:
+                    return checkMetaProperty(node);
+                case 199:
+                    return checkDeleteExpression(node);
+                case 201:
+                    return checkVoidExpression(node);
+                case 202:
+                    return checkAwaitExpression(node);
+                case 203:
+                    return checkPrefixUnaryExpression(node);
+                case 204:
+                    return checkPostfixUnaryExpression(node);
+                case 205:
+                    return checkBinaryExpression(node, checkMode);
+                case 206:
+                    return checkConditionalExpression(node, checkMode);
+                case 209:
+                    return checkSpreadExpression(node, checkMode);
+                case 211:
+                    return undefinedWideningType;
+                case 208:
+                    return checkYieldExpression(node);
+                case 216:
                     return node.type;
-                case 270:
+                case 271:
                     return checkJsxExpression(node, checkMode);
-                case 260:
-                    return checkJsxElement(node, checkMode);
                 case 261:
-                    return checkJsxSelfClosingElement(node, checkMode);
-                case 264:
-                    return checkJsxFragment(node);
-                case 268:
-                    return checkJsxAttributes(node, checkMode);
+                    return checkJsxElement(node, checkMode);
                 case 262:
+                    return checkJsxSelfClosingElement(node, checkMode);
+                case 265:
+                    return checkJsxFragment(node);
+                case 269:
+                    return checkJsxAttributes(node, checkMode);
+                case 263:
                     ts.Debug.fail("Shouldn't ever directly check a JsxOpeningElement");
             }
             return errorType;
@@ -44368,7 +45931,7 @@ var ts;
             var constraintType = getConstraintOfTypeParameter(typeParameter);
             var defaultType = getDefaultFromTypeParameter(typeParameter);
             if (constraintType && defaultType) {
-                checkTypeAssignableTo(defaultType, getTypeWithThisArgument(constraintType, defaultType), node.default, ts.Diagnostics.Type_0_does_not_satisfy_the_constraint_1);
+                checkTypeAssignableTo(defaultType, getTypeWithThisArgument(instantiateType(constraintType, makeUnaryTypeMapper(typeParameter, defaultType)), defaultType), node.default, ts.Diagnostics.Type_0_does_not_satisfy_the_constraint_1);
             }
             if (produceDiagnostics) {
                 checkTypeNameIsReserved(node.name, ts.Diagnostics.Type_parameter_name_cannot_be_0);
@@ -44379,7 +45942,7 @@ var ts;
             checkVariableLikeDeclaration(node);
             var func = ts.getContainingFunction(node);
             if (ts.hasModifier(node, 92)) {
-                if (!(func.kind === 157 && ts.nodeIsPresent(func.body))) {
+                if (!(func.kind === 158 && ts.nodeIsPresent(func.body))) {
                     error(node, ts.Diagnostics.A_parameter_property_is_only_allowed_in_a_constructor_implementation);
                 }
             }
@@ -44390,10 +45953,10 @@ var ts;
                 if (func.parameters.indexOf(node) !== 0) {
                     error(node, ts.Diagnostics.A_0_parameter_must_be_the_first_parameter, node.name.escapedText);
                 }
-                if (func.kind === 157 || func.kind === 161 || func.kind === 166) {
+                if (func.kind === 158 || func.kind === 162 || func.kind === 167) {
                     error(node, ts.Diagnostics.A_constructor_cannot_have_a_this_parameter);
                 }
-                if (func.kind === 197) {
+                if (func.kind === 198) {
                     error(node, ts.Diagnostics.An_arrow_function_cannot_have_a_this_parameter);
                 }
             }
@@ -44407,7 +45970,8 @@ var ts;
                 error(node, ts.Diagnostics.A_type_predicate_is_only_allowed_in_return_type_position_for_functions_and_methods);
                 return;
             }
-            var typePredicate = getTypePredicateOfSignature(getSignatureFromDeclaration(parent));
+            var signature = getSignatureFromDeclaration(parent);
+            var typePredicate = getTypePredicateOfSignature(signature);
             if (!typePredicate) {
                 return;
             }
@@ -44418,12 +45982,12 @@ var ts;
             }
             else {
                 if (typePredicate.parameterIndex >= 0) {
-                    if (parent.parameters[typePredicate.parameterIndex].dotDotDotToken) {
+                    if (signature.hasRestParameter && typePredicate.parameterIndex === signature.parameters.length - 1) {
                         error(parameterName, ts.Diagnostics.A_type_predicate_cannot_reference_a_rest_parameter);
                     }
                     else {
                         var leadingError = function () { return ts.chainDiagnosticMessages(undefined, ts.Diagnostics.A_type_predicate_s_type_must_be_assignable_to_its_parameter_s_type); };
-                        checkTypeAssignableTo(typePredicate.type, getTypeOfNode(parent.parameters[typePredicate.parameterIndex]), node.type, undefined, leadingError);
+                        checkTypeAssignableTo(typePredicate.type, getTypeOfSymbol(signature.parameters[typePredicate.parameterIndex]), node.type, undefined, leadingError);
                     }
                 }
                 else if (parameterName) {
@@ -44444,13 +46008,13 @@ var ts;
         }
         function getTypePredicateParent(node) {
             switch (node.parent.kind) {
+                case 198:
+                case 161:
+                case 240:
                 case 197:
-                case 160:
-                case 239:
-                case 196:
-                case 165:
+                case 166:
+                case 157:
                 case 156:
-                case 155:
                     var parent = node.parent;
                     if (node === parent.type) {
                         return parent;
@@ -44464,11 +46028,11 @@ var ts;
                     continue;
                 }
                 var name = element.name;
-                if (name.kind === 72 && name.escapedText === predicateVariableName) {
+                if (name.kind === 73 && name.escapedText === predicateVariableName) {
                     error(predicateVariableNode, ts.Diagnostics.A_type_predicate_cannot_reference_element_0_in_a_binding_pattern, predicateVariableName);
                     return true;
                 }
-                else if (name.kind === 185 || name.kind === 184) {
+                else if (name.kind === 186 || name.kind === 185) {
                     if (checkIfTypePredicateVariableIsDeclaredInBindingPattern(name, predicateVariableNode, predicateVariableName)) {
                         return true;
                     }
@@ -44476,18 +46040,18 @@ var ts;
             }
         }
         function checkSignatureDeclaration(node) {
-            if (node.kind === 162) {
+            if (node.kind === 163) {
                 checkGrammarIndexSignature(node);
             }
-            else if (node.kind === 165 || node.kind === 239 || node.kind === 166 ||
-                node.kind === 160 || node.kind === 157 ||
-                node.kind === 161) {
+            else if (node.kind === 166 || node.kind === 240 || node.kind === 167 ||
+                node.kind === 161 || node.kind === 158 ||
+                node.kind === 162) {
                 checkGrammarFunctionLikeDeclaration(node);
             }
             var functionFlags = ts.getFunctionFlags(node);
             if (!(functionFlags & 4)) {
-                if ((functionFlags & 3) === 3 && languageVersion < 7) {
-                    checkExternalEmitHelpers(node, 6144);
+                if ((functionFlags & 3) === 3 && languageVersion < 99) {
+                    checkExternalEmitHelpers(node, 12288);
                 }
                 if ((functionFlags & 3) === 2 && languageVersion < 4) {
                     checkExternalEmitHelpers(node, 64);
@@ -44506,10 +46070,10 @@ var ts;
                 var returnTypeNode = ts.getEffectiveReturnTypeNode(node);
                 if (noImplicitAny && !returnTypeNode) {
                     switch (node.kind) {
-                        case 161:
+                        case 162:
                             error(node, ts.Diagnostics.Construct_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type);
                             break;
-                        case 160:
+                        case 161:
                             error(node, ts.Diagnostics.Call_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type);
                             break;
                     }
@@ -44522,18 +46086,18 @@ var ts;
                             error(returnTypeNode, ts.Diagnostics.A_generator_cannot_have_a_void_type_annotation);
                         }
                         else {
-                            var generatorElementType = getIteratedTypeOfGenerator(returnType, (functionFlags_1 & 2) !== 0) || anyType;
-                            var iterableIteratorInstantiation = functionFlags_1 & 2
-                                ? createAsyncIterableIteratorType(generatorElementType)
-                                : createIterableIteratorType(generatorElementType);
-                            checkTypeAssignableTo(iterableIteratorInstantiation, returnType, returnTypeNode);
+                            var generatorYieldType = getIterationTypeOfGeneratorFunctionReturnType(0, returnType, (functionFlags_1 & 2) !== 0) || anyType;
+                            var generatorReturnType = getIterationTypeOfGeneratorFunctionReturnType(1, returnType, (functionFlags_1 & 2) !== 0) || generatorYieldType;
+                            var generatorNextType = getIterationTypeOfGeneratorFunctionReturnType(2, returnType, (functionFlags_1 & 2) !== 0) || unknownType;
+                            var generatorInstantiation = createGeneratorReturnType(generatorYieldType, generatorReturnType, generatorNextType, !!(functionFlags_1 & 2));
+                            checkTypeAssignableTo(generatorInstantiation, returnType, returnTypeNode);
                         }
                     }
                     else if ((functionFlags_1 & 3) === 2) {
                         checkAsyncFunctionReturnType(node, returnTypeNode);
                     }
                 }
-                if (node.kind !== 162 && node.kind !== 294) {
+                if (node.kind !== 163 && node.kind !== 295) {
                     registerForUnusedIdentifiersCheck(node);
                 }
             }
@@ -44543,7 +46107,7 @@ var ts;
             var staticNames = ts.createUnderscoreEscapedMap();
             for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                 var member = _a[_i];
-                if (member.kind === 157) {
+                if (member.kind === 158) {
                     for (var _b = 0, _c = member.parameters; _b < _c.length; _b++) {
                         var param = _c[_b];
                         if (ts.isParameterPropertyDeclaration(param) && !ts.isBindingPattern(param.name)) {
@@ -44558,16 +46122,16 @@ var ts;
                     var memberName = name && ts.getPropertyNameForPropertyNameNode(name);
                     if (name && memberName) {
                         switch (member.kind) {
-                            case 158:
+                            case 159:
                                 addName(names, name, memberName, 1);
                                 break;
-                            case 159:
+                            case 160:
                                 addName(names, name, memberName, 2);
                                 break;
-                            case 154:
+                            case 155:
                                 addName(names, name, memberName, 3);
                                 break;
-                            case 156:
+                            case 157:
                                 addName(names, name, memberName, 4);
                                 break;
                         }
@@ -44619,7 +46183,7 @@ var ts;
             var names = ts.createMap();
             for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                 var member = _a[_i];
-                if (member.kind === 153) {
+                if (member.kind === 154) {
                     var memberName = void 0;
                     var name = member.name;
                     switch (name.kind) {
@@ -44627,7 +46191,7 @@ var ts;
                         case 8:
                             memberName = name.text;
                             break;
-                        case 72:
+                        case 73:
                             memberName = ts.idText(name);
                             break;
                         default:
@@ -44644,7 +46208,7 @@ var ts;
             }
         }
         function checkTypeForDuplicateIndexSignatures(node) {
-            if (node.kind === 241) {
+            if (node.kind === 242) {
                 var nodeSymbol = getSymbolOfNode(node);
                 if (nodeSymbol.declarations.length > 0 && nodeSymbol.declarations[0] !== node) {
                     return;
@@ -44659,7 +46223,7 @@ var ts;
                     var declaration = decl;
                     if (declaration.parameters.length === 1 && declaration.parameters[0].type) {
                         switch (declaration.parameters[0].type.kind) {
-                            case 138:
+                            case 139:
                                 if (!seenStringIndexer) {
                                     seenStringIndexer = true;
                                 }
@@ -44667,7 +46231,7 @@ var ts;
                                     error(declaration, ts.Diagnostics.Duplicate_string_index_signature);
                                 }
                                 break;
-                            case 135:
+                            case 136:
                                 if (!seenNumericIndexer) {
                                     seenNumericIndexer = true;
                                 }
@@ -44689,7 +46253,7 @@ var ts;
             if (!checkGrammarMethod(node))
                 checkGrammarComputedPropertyName(node.name);
             checkFunctionOrMethodDeclaration(node);
-            if (ts.hasModifier(node, 128) && node.kind === 156 && node.body) {
+            if (ts.hasModifier(node, 128) && node.kind === 157 && node.body) {
                 error(node, ts.Diagnostics.Method_0_cannot_have_an_implementation_because_it_is_marked_abstract, ts.declarationNameToString(node.name));
             }
         }
@@ -44710,7 +46274,7 @@ var ts;
                 return;
             }
             function isInstancePropertyWithInitializer(n) {
-                return n.kind === 154 &&
+                return n.kind === 155 &&
                     !ts.hasModifier(n, 32) &&
                     !!n.initializer;
             }
@@ -44730,7 +46294,7 @@ var ts;
                         var superCallStatement = void 0;
                         for (var _i = 0, statements_2 = statements; _i < statements_2.length; _i++) {
                             var statement = statements_2[_i];
-                            if (statement.kind === 221 && ts.isSuperCall(statement.expression)) {
+                            if (statement.kind === 222 && ts.isSuperCall(statement.expression)) {
                                 superCallStatement = statement;
                                 break;
                             }
@@ -44754,18 +46318,18 @@ var ts;
                     checkGrammarComputedPropertyName(node.name);
                 checkDecorators(node);
                 checkSignatureDeclaration(node);
-                if (node.kind === 158) {
+                if (node.kind === 159) {
                     if (!(node.flags & 4194304) && ts.nodeIsPresent(node.body) && (node.flags & 128)) {
                         if (!(node.flags & 256)) {
                             error(node.name, ts.Diagnostics.A_get_accessor_must_return_a_value);
                         }
                     }
                 }
-                if (node.name.kind === 149) {
+                if (node.name.kind === 150) {
                     checkComputedPropertyName(node.name);
                 }
                 if (!hasNonBindableDynamicName(node)) {
-                    var otherKind = node.kind === 158 ? 159 : 158;
+                    var otherKind = node.kind === 159 ? 160 : 159;
                     var otherAccessor = ts.getDeclarationOfKind(getSymbolOfNode(node), otherKind);
                     if (otherAccessor) {
                         var nodeFlags = ts.getModifierFlags(node);
@@ -44781,7 +46345,7 @@ var ts;
                     }
                 }
                 var returnType = getTypeOfAccessors(getSymbolOfNode(node));
-                if (node.kind === 158) {
+                if (node.kind === 159) {
                     checkAllCodePathsInNonVoidFunctionReturnOrThrow(node, returnType);
                 }
             }
@@ -44829,7 +46393,7 @@ var ts;
         }
         function checkTypeReferenceNode(node) {
             checkGrammarTypeArguments(node, node.typeArguments);
-            if (node.kind === 164 && node.typeName.jsdocDotPos !== undefined && !ts.isInJSFile(node) && !ts.isInJSDoc(node)) {
+            if (node.kind === 165 && node.typeName.jsdocDotPos !== undefined && !ts.isInJSFile(node) && !ts.isInJSDoc(node)) {
                 grammarErrorAtPos(node, node.typeName.jsdocDotPos, 1, ts.Diagnostics.JSDoc_types_can_only_be_used_inside_documentation_comments);
             }
             var type = getTypeFromTypeReference(node);
@@ -44876,7 +46440,7 @@ var ts;
             var seenOptionalElement = false;
             for (var i = 0; i < elementTypes.length; i++) {
                 var e = elementTypes[i];
-                if (e.kind === 172) {
+                if (e.kind === 173) {
                     if (i !== elementTypes.length - 1) {
                         grammarErrorOnNode(e, ts.Diagnostics.A_rest_element_must_be_last_in_a_tuple_type);
                         break;
@@ -44885,7 +46449,7 @@ var ts;
                         error(e, ts.Diagnostics.A_rest_element_type_must_be_an_array_type);
                     }
                 }
-                else if (e.kind === 171) {
+                else if (e.kind === 172) {
                     seenOptionalElement = true;
                 }
                 else if (seenOptionalElement) {
@@ -44905,17 +46469,28 @@ var ts;
             var objectType = type.objectType;
             var indexType = type.indexType;
             if (isTypeAssignableTo(indexType, getIndexType(objectType, false))) {
-                if (accessNode.kind === 190 && ts.isAssignmentTarget(accessNode) &&
+                if (accessNode.kind === 191 && ts.isAssignmentTarget(accessNode) &&
                     ts.getObjectFlags(objectType) & 32 && getMappedTypeModifiers(objectType) & 1) {
                     error(accessNode, ts.Diagnostics.Index_signature_in_type_0_only_permits_reading, typeToString(objectType));
                 }
                 return type;
             }
-            if (getIndexInfoOfType(getApparentType(objectType), 1) && isTypeAssignableToKind(indexType, 296)) {
+            var apparentObjectType = getApparentType(objectType);
+            if (getIndexInfoOfType(apparentObjectType, 1) && isTypeAssignableToKind(indexType, 296)) {
                 return type;
             }
+            if (isGenericObjectType(objectType)) {
+                var propertyName_1 = getPropertyNameFromIndex(indexType, accessNode);
+                if (propertyName_1) {
+                    var propertySymbol = forEachType(apparentObjectType, function (t) { return getPropertyOfType(t, propertyName_1); });
+                    if (propertySymbol && ts.getDeclarationModifierFlagsFromSymbol(propertySymbol) & 24) {
+                        error(accessNode, ts.Diagnostics.Private_or_protected_member_0_cannot_be_accessed_on_a_type_parameter, ts.unescapeLeadingUnderscores(propertyName_1));
+                        return errorType;
+                    }
+                }
+            }
             error(accessNode, ts.Diagnostics.Type_0_cannot_be_used_to_index_type_1, typeToString(indexType), typeToString(objectType));
-            return type;
+            return errorType;
         }
         function checkIndexedAccessType(node) {
             checkSourceElement(node.objectType);
@@ -44943,7 +46518,7 @@ var ts;
             ts.forEachChild(node, checkSourceElement);
         }
         function checkInferType(node) {
-            if (!ts.findAncestor(node, function (n) { return n.parent && n.parent.kind === 175 && n.parent.extendsType === n; })) {
+            if (!ts.findAncestor(node, function (n) { return n.parent && n.parent.kind === 176 && n.parent.extendsType === n; })) {
                 grammarErrorOnNode(node, ts.Diagnostics.infer_declarations_are_only_permitted_in_the_extends_clause_of_a_conditional_type);
             }
             checkSourceElement(node.typeParameter);
@@ -44958,9 +46533,9 @@ var ts;
         }
         function getEffectiveDeclarationFlags(n, flagsToCheck) {
             var flags = ts.getCombinedModifierFlags(n);
-            if (n.parent.kind !== 241 &&
-                n.parent.kind !== 240 &&
-                n.parent.kind !== 209 &&
+            if (n.parent.kind !== 242 &&
+                n.parent.kind !== 241 &&
+                n.parent.kind !== 210 &&
                 n.flags & 4194304) {
                 if (!(flags & 2) && !(ts.isModuleBlock(n.parent) && ts.isModuleDeclaration(n.parent.parent) && ts.isGlobalScopeAugmentation(n.parent.parent))) {
                     flags |= 1;
@@ -45040,7 +46615,7 @@ var ts;
                         if (node.name && subsequentName &&
                             (ts.isComputedPropertyName(node.name) && ts.isComputedPropertyName(subsequentName) ||
                                 !ts.isComputedPropertyName(node.name) && !ts.isComputedPropertyName(subsequentName) && ts.getEscapedTextOfIdentifierOrLiteral(node.name) === ts.getEscapedTextOfIdentifierOrLiteral(subsequentName))) {
-                            var reportError = (node.kind === 156 || node.kind === 155) &&
+                            var reportError = (node.kind === 157 || node.kind === 156) &&
                                 ts.hasModifier(node, 32) !== ts.hasModifier(subsequentNode, 32);
                             if (reportError) {
                                 var diagnostic = ts.hasModifier(node, 32) ? ts.Diagnostics.Function_overload_must_be_static : ts.Diagnostics.Function_overload_must_not_be_static;
@@ -45073,11 +46648,11 @@ var ts;
                 var current = declarations_4[_i];
                 var node = current;
                 var inAmbientContext = node.flags & 4194304;
-                var inAmbientContextOrInterface = node.parent.kind === 241 || node.parent.kind === 168 || inAmbientContext;
+                var inAmbientContextOrInterface = node.parent.kind === 242 || node.parent.kind === 169 || inAmbientContext;
                 if (inAmbientContextOrInterface) {
                     previousDeclaration = undefined;
                 }
-                if (node.kind === 239 || node.kind === 156 || node.kind === 155 || node.kind === 157) {
+                if (node.kind === 240 || node.kind === 157 || node.kind === 156 || node.kind === 158) {
                     var currentNodeFlags = getEffectiveDeclarationFlags(node, flagsToCheck);
                     someNodeFlags |= currentNodeFlags;
                     allNodeFlags &= currentNodeFlags;
@@ -45131,7 +46706,7 @@ var ts;
                     for (var _a = 0, signatures_6 = signatures; _a < signatures_6.length; _a++) {
                         var signature = signatures_6[_a];
                         if (!isImplementationCompatibleWithOverload(bodySignature, signature)) {
-                            addRelatedInfo(error(signature.declaration, ts.Diagnostics.This_overload_signature_is_not_compatible_with_its_implementation_signature), ts.createDiagnosticForNode(bodyDeclaration, ts.Diagnostics.The_implementation_signature_is_declared_here));
+                            ts.addRelatedInfo(error(signature.declaration, ts.Diagnostics.This_overload_signature_is_not_compatible_with_its_implementation_signature), ts.createDiagnosticForNode(bodyDeclaration, ts.Diagnostics.The_implementation_signature_is_declared_here));
                             break;
                         }
                     }
@@ -45190,45 +46765,45 @@ var ts;
             function getDeclarationSpaces(decl) {
                 var d = decl;
                 switch (d.kind) {
-                    case 241:
                     case 242:
-                    case 309:
-                    case 302:
+                    case 243:
+                    case 311:
+                    case 304:
                         return 2;
-                    case 244:
+                    case 245:
                         return ts.isAmbientModule(d) || ts.getModuleInstanceState(d) !== 0
                             ? 4 | 1
                             : 4;
-                    case 240:
-                    case 243:
+                    case 241:
+                    case 244:
                         return 2 | 1;
-                    case 284:
+                    case 285:
                         return 2 | 1 | 4;
-                    case 254:
+                    case 255:
                         if (!ts.isEntityNameExpression(d.expression)) {
                             return 1;
                         }
                         d = d.expression;
-                    case 248:
+                    case 249:
+                    case 252:
                     case 251:
-                    case 250:
-                        var result_5 = 0;
+                        var result_8 = 0;
                         var target = resolveAlias(getSymbolOfNode(d));
-                        ts.forEach(target.declarations, function (d) { result_5 |= getDeclarationSpaces(d); });
-                        return result_5;
-                    case 237:
-                    case 186:
-                    case 239:
-                    case 253:
+                        ts.forEach(target.declarations, function (d) { result_8 |= getDeclarationSpaces(d); });
+                        return result_8;
+                    case 238:
+                    case 187:
+                    case 240:
+                    case 254:
                         return 1;
                     default:
-                        return ts.Debug.fail(ts.Debug.showSyntaxKind(d));
+                        return ts.Debug.failBadSyntaxKind(d);
                 }
             }
         }
-        function getAwaitedTypeOfPromise(type, errorNode, diagnosticMessage) {
+        function getAwaitedTypeOfPromise(type, errorNode, diagnosticMessage, arg0) {
             var promisedType = getPromisedTypeOfPromise(type, errorNode);
-            return promisedType && getAwaitedType(promisedType, errorNode, diagnosticMessage);
+            return promisedType && getAwaitedType(promisedType, errorNode, diagnosticMessage, arg0);
         }
         function getPromisedTypeOfPromise(promise, errorNode) {
             if (isTypeAny(promise)) {
@@ -45265,10 +46840,14 @@ var ts;
             }
             return typeAsPromise.promisedTypeOfPromise = getUnionType(ts.map(onfulfilledParameterSignatures, getTypeOfFirstParameterOfSignature), 2);
         }
-        function checkAwaitedType(type, errorNode, diagnosticMessage) {
-            return getAwaitedType(type, errorNode, diagnosticMessage) || errorType;
+        function checkAwaitedType(type, errorNode, diagnosticMessage, arg0) {
+            var awaitedType = getAwaitedType(type, errorNode, diagnosticMessage, arg0);
+            if (awaitedType === type && !(type.flags & 3)) {
+                addErrorOrSuggestion(false, ts.createDiagnosticForNode(errorNode, ts.Diagnostics.await_has_no_effect_on_the_type_of_this_expression));
+            }
+            return awaitedType || errorType;
         }
-        function getAwaitedType(type, errorNode, diagnosticMessage) {
+        function getAwaitedType(type, errorNode, diagnosticMessage, arg0) {
             var typeAsAwaitable = type;
             if (typeAsAwaitable.awaitedTypeOfType) {
                 return typeAsAwaitable.awaitedTypeOfType;
@@ -45280,7 +46859,7 @@ var ts;
                 var types = void 0;
                 for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
                     var constituentType = _a[_i];
-                    types = ts.append(types, getAwaitedType(constituentType, errorNode, diagnosticMessage));
+                    types = ts.append(types, getAwaitedType(constituentType, errorNode, diagnosticMessage, arg0));
                 }
                 if (!types) {
                     return undefined;
@@ -45296,7 +46875,7 @@ var ts;
                     return undefined;
                 }
                 awaitedTypeStack.push(type.id);
-                var awaitedType = getAwaitedType(promisedType, errorNode, diagnosticMessage);
+                var awaitedType = getAwaitedType(promisedType, errorNode, diagnosticMessage, arg0);
                 awaitedTypeStack.pop();
                 if (!awaitedType) {
                     return undefined;
@@ -45308,7 +46887,7 @@ var ts;
                 if (errorNode) {
                     if (!diagnosticMessage)
                         return ts.Debug.fail();
-                    error(errorNode, diagnosticMessage);
+                    error(errorNode, diagnosticMessage, arg0);
                 }
                 return undefined;
             }
@@ -45339,7 +46918,7 @@ var ts;
                 var promiseConstructorSymbol = resolveEntityName(promiseConstructorName, 67220415, true);
                 var promiseConstructorType = promiseConstructorSymbol ? getTypeOfSymbol(promiseConstructorSymbol) : errorType;
                 if (promiseConstructorType === errorType) {
-                    if (promiseConstructorName.kind === 72 && promiseConstructorName.escapedText === "Promise" && getTargetType(returnType) === getGlobalPromiseType(false)) {
+                    if (promiseConstructorName.kind === 73 && promiseConstructorName.escapedText === "Promise" && getTargetType(returnType) === getGlobalPromiseType(false)) {
                         error(returnTypeNode, ts.Diagnostics.An_async_function_or_method_in_ES5_SlashES3_requires_the_Promise_constructor_Make_sure_you_have_a_declaration_for_the_Promise_constructor_or_include_ES2015_in_your_lib_option);
                     }
                     else {
@@ -45374,22 +46953,22 @@ var ts;
             var headMessage = getDiagnosticHeadMessageForDecoratorResolution(node);
             var errorInfo;
             switch (node.parent.kind) {
-                case 240:
+                case 241:
                     var classSymbol = getSymbolOfNode(node.parent);
                     var classConstructorType = getTypeOfSymbol(classSymbol);
                     expectedReturnType = getUnionType([classConstructorType, voidType]);
                     break;
-                case 151:
+                case 152:
                     expectedReturnType = voidType;
                     errorInfo = ts.chainDiagnosticMessages(undefined, ts.Diagnostics.The_return_type_of_a_parameter_decorator_function_must_be_either_void_or_any);
                     break;
-                case 154:
+                case 155:
                     expectedReturnType = voidType;
                     errorInfo = ts.chainDiagnosticMessages(undefined, ts.Diagnostics.The_return_type_of_a_property_decorator_function_must_be_either_void_or_any);
                     break;
-                case 156:
-                case 158:
+                case 157:
                 case 159:
+                case 160:
                     var methodType = getTypeOfNode(node.parent);
                     var descriptorType = createTypedPropertyDescriptorType(methodType);
                     expectedReturnType = getUnionType([descriptorType, voidType]);
@@ -45406,7 +46985,7 @@ var ts;
             if (!typeName)
                 return;
             var rootName = getFirstIdentifier(typeName);
-            var meaning = (typeName.kind === 72 ? 67897832 : 1920) | 2097152;
+            var meaning = (typeName.kind === 73 ? 67897832 : 1920) | 2097152;
             var rootSymbol = resolveName(rootName, rootName.escapedText, meaning, undefined, undefined, true);
             if (rootSymbol
                 && rootSymbol.flags & 2097152
@@ -45424,14 +47003,14 @@ var ts;
         function getEntityNameForDecoratorMetadata(node) {
             if (node) {
                 switch (node.kind) {
-                    case 174:
-                    case 173:
-                        return getEntityNameForDecoratorMetadataFromTypeList(node.types);
                     case 175:
+                    case 174:
+                        return getEntityNameForDecoratorMetadataFromTypeList(node.types);
+                    case 176:
                         return getEntityNameForDecoratorMetadataFromTypeList([node.trueType, node.falseType]);
-                    case 177:
+                    case 178:
                         return getEntityNameForDecoratorMetadata(node.type);
-                    case 164:
+                    case 165:
                         return node.typeName;
                 }
             }
@@ -45440,13 +47019,13 @@ var ts;
             var commonEntityName;
             for (var _i = 0, types_17 = types; _i < types_17.length; _i++) {
                 var typeNode = types_17[_i];
-                while (typeNode.kind === 177) {
+                while (typeNode.kind === 178) {
                     typeNode = typeNode.type;
                 }
-                if (typeNode.kind === 132) {
+                if (typeNode.kind === 133) {
                     continue;
                 }
-                if (!strictNullChecks && (typeNode.kind === 96 || typeNode.kind === 141)) {
+                if (!strictNullChecks && (typeNode.kind === 97 || typeNode.kind === 142)) {
                     continue;
                 }
                 var individualEntityName = getEntityNameForDecoratorMetadata(typeNode);
@@ -45478,17 +47057,17 @@ var ts;
                 return;
             }
             if (!compilerOptions.experimentalDecorators) {
-                error(node, ts.Diagnostics.Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_to_remove_this_warning);
+                error(node, ts.Diagnostics.Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_in_your_tsconfig_or_jsconfig_to_remove_this_warning);
             }
             var firstDecorator = node.decorators[0];
             checkExternalEmitHelpers(firstDecorator, 8);
-            if (node.kind === 151) {
+            if (node.kind === 152) {
                 checkExternalEmitHelpers(firstDecorator, 32);
             }
             if (compilerOptions.emitDecoratorMetadata) {
                 checkExternalEmitHelpers(firstDecorator, 16);
                 switch (node.kind) {
-                    case 240:
+                    case 241:
                         var constructor = ts.getFirstConstructorWithBody(node);
                         if (constructor) {
                             for (var _i = 0, _a = constructor.parameters; _i < _a.length; _i++) {
@@ -45497,23 +47076,23 @@ var ts;
                             }
                         }
                         break;
-                    case 158:
                     case 159:
-                        var otherKind = node.kind === 158 ? 159 : 158;
+                    case 160:
+                        var otherKind = node.kind === 159 ? 160 : 159;
                         var otherAccessor = ts.getDeclarationOfKind(getSymbolOfNode(node), otherKind);
                         markDecoratorMedataDataTypeNodeAsReferenced(getAnnotatedAccessorTypeNode(node) || otherAccessor && getAnnotatedAccessorTypeNode(otherAccessor));
                         break;
-                    case 156:
+                    case 157:
                         for (var _b = 0, _c = node.parameters; _b < _c.length; _b++) {
                             var parameter = _c[_b];
                             markDecoratorMedataDataTypeNodeAsReferenced(getParameterTypeNodeForDecoratorCheck(parameter));
                         }
                         markDecoratorMedataDataTypeNodeAsReferenced(ts.getEffectiveReturnTypeNode(node));
                         break;
-                    case 154:
+                    case 155:
                         markDecoratorMedataDataTypeNodeAsReferenced(ts.getEffectiveTypeAnnotationNode(node));
                         break;
-                    case 151:
+                    case 152:
                         markDecoratorMedataDataTypeNodeAsReferenced(getParameterTypeNodeForDecoratorCheck(node));
                         var containingSignature = node.parent;
                         for (var _d = 0, _e = containingSignature.parameters; _d < _e.length; _d++) {
@@ -45572,7 +47151,7 @@ var ts;
                     else if (ts.findLast(ts.getJSDocTags(decl), ts.isJSDocParameterTag) === node &&
                         node.typeExpression && node.typeExpression.type &&
                         !isArrayType(getTypeFromTypeNode(node.typeExpression.type))) {
-                        error(node.name, ts.Diagnostics.JSDoc_param_tag_has_name_0_but_there_is_no_parameter_with_that_name_It_would_match_arguments_if_it_had_an_array_type, ts.idText(node.name.kind === 148 ? node.name.right : node.name));
+                        error(node.name, ts.Diagnostics.JSDoc_param_tag_has_name_0_but_there_is_no_parameter_with_that_name_It_would_match_arguments_if_it_had_an_array_type, ts.idText(node.name.kind === 149 ? node.name.right : node.name));
                     }
                 }
             }
@@ -45605,9 +47184,9 @@ var ts;
         }
         function getIdentifierFromEntityNameExpression(node) {
             switch (node.kind) {
-                case 72:
+                case 73:
                     return node;
-                case 189:
+                case 190:
                     return node.name;
                 default:
                     return undefined;
@@ -45617,7 +47196,7 @@ var ts;
             checkDecorators(node);
             checkSignatureDeclaration(node);
             var functionFlags = ts.getFunctionFlags(node);
-            if (node.name && node.name.kind === 149) {
+            if (node.name && node.name.kind === 150) {
                 checkComputedPropertyName(node.name);
             }
             if (!hasNonBindableDynamicName(node)) {
@@ -45633,12 +47212,9 @@ var ts;
                     }
                 }
             }
-            var body = node.kind === 155 ? undefined : node.body;
+            var body = node.kind === 156 ? undefined : node.body;
             checkSourceElement(body);
-            if ((functionFlags & 1) === 0) {
-                var returnOrPromisedType = getReturnOrPromisedType(node, functionFlags);
-                checkAllCodePathsInNonVoidFunctionReturnOrThrow(node, returnOrPromisedType);
-            }
+            checkAllCodePathsInNonVoidFunctionReturnOrThrow(node, getReturnTypeFromAnnotation(node));
             if (produceDiagnostics && !ts.getEffectiveReturnTypeNode(node)) {
                 if (ts.nodeIsMissing(body) && !isPrivateWithinAmbient(node)) {
                     reportImplicitAny(node, anyType);
@@ -45669,42 +47245,42 @@ var ts;
             for (var _i = 0, potentiallyUnusedIdentifiers_1 = potentiallyUnusedIdentifiers; _i < potentiallyUnusedIdentifiers_1.length; _i++) {
                 var node = potentiallyUnusedIdentifiers_1[_i];
                 switch (node.kind) {
-                    case 240:
-                    case 209:
+                    case 241:
+                    case 210:
                         checkUnusedClassMembers(node, addDiagnostic);
                         checkUnusedTypeParameters(node, addDiagnostic);
                         break;
-                    case 284:
-                    case 244:
-                    case 218:
-                    case 246:
-                    case 225:
+                    case 285:
+                    case 245:
+                    case 219:
+                    case 247:
                     case 226:
                     case 227:
+                    case 228:
                         checkUnusedLocalsAndParameters(node, addDiagnostic);
                         break;
-                    case 157:
-                    case 196:
-                    case 239:
-                    case 197:
-                    case 156:
                     case 158:
+                    case 197:
+                    case 240:
+                    case 198:
+                    case 157:
                     case 159:
+                    case 160:
                         if (node.body) {
                             checkUnusedLocalsAndParameters(node, addDiagnostic);
                         }
                         checkUnusedTypeParameters(node, addDiagnostic);
                         break;
-                    case 155:
-                    case 160:
+                    case 156:
                     case 161:
-                    case 165:
+                    case 162:
                     case 166:
+                    case 167:
+                    case 243:
                     case 242:
-                    case 241:
                         checkUnusedTypeParameters(node, addDiagnostic);
                         break;
-                    case 176:
+                    case 177:
                         checkUnusedInferTypeParameter(node, addDiagnostic);
                         break;
                     default:
@@ -45724,11 +47300,11 @@ var ts;
             for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                 var member = _a[_i];
                 switch (member.kind) {
-                    case 156:
-                    case 154:
-                    case 158:
+                    case 157:
+                    case 155:
                     case 159:
-                        if (member.kind === 159 && member.symbol.flags & 32768) {
+                    case 160:
+                        if (member.kind === 160 && member.symbol.flags & 32768) {
                             break;
                         }
                         var symbol = getSymbolOfNode(member);
@@ -45736,7 +47312,7 @@ var ts;
                             addDiagnostic(member, 0, ts.createDiagnosticForNode(member.name, ts.Diagnostics._0_is_declared_but_its_value_is_never_read, symbolToString(symbol)));
                         }
                         break;
-                    case 157:
+                    case 158:
                         for (var _b = 0, _c = member.parameters; _b < _c.length; _b++) {
                             var parameter = _c[_b];
                             if (!parameter.symbol.isReferenced && ts.hasModifier(parameter, 8)) {
@@ -45744,8 +47320,8 @@ var ts;
                             }
                         }
                         break;
-                    case 162:
-                    case 217:
+                    case 163:
+                    case 218:
                         break;
                     default:
                         ts.Debug.fail();
@@ -45769,7 +47345,7 @@ var ts;
                     continue;
                 var name = ts.idText(typeParameter.name);
                 var parent = typeParameter.parent;
-                if (parent.kind !== 176 && parent.typeParameters.every(isTypeParameterUnused)) {
+                if (parent.kind !== 177 && parent.typeParameters.every(isTypeParameterUnused)) {
                     if (seenParentsWithEveryUnused.tryAdd(parent)) {
                         var range = ts.isJSDocTemplateTag(parent)
                             ? ts.rangeOfNode(parent)
@@ -45848,7 +47424,7 @@ var ts;
                 var importDecl = importClause.parent;
                 var nDeclarations = (importClause.name ? 1 : 0) +
                     (importClause.namedBindings ?
-                        (importClause.namedBindings.kind === 251 ? 1 : importClause.namedBindings.elements.length)
+                        (importClause.namedBindings.kind === 252 ? 1 : importClause.namedBindings.elements.length)
                         : 0);
                 if (nDeclarations === unuseds.length) {
                     addDiagnostic(importDecl, 0, unuseds.length === 1
@@ -45866,7 +47442,7 @@ var ts;
                 var bindingPattern = _a[0], bindingElements = _a[1];
                 var kind = tryGetRootParameterDeclaration(bindingPattern.parent) ? 1 : 0;
                 if (bindingPattern.elements.length === bindingElements.length) {
-                    if (bindingElements.length === 1 && bindingPattern.parent.kind === 237 && bindingPattern.parent.parent.kind === 238) {
+                    if (bindingElements.length === 1 && bindingPattern.parent.kind === 238 && bindingPattern.parent.parent.kind === 239) {
                         addToGroup(unusedVariables, bindingPattern.parent.parent, bindingPattern.parent, getNodeId);
                     }
                     else {
@@ -45887,7 +47463,7 @@ var ts;
                 if (declarationList.declarations.length === declarations.length) {
                     addDiagnostic(declarationList, 0, declarations.length === 1
                         ? ts.createDiagnosticForNode(ts.first(declarations).name, ts.Diagnostics._0_is_declared_but_its_value_is_never_read, bindingNameText(ts.first(declarations).name))
-                        : ts.createDiagnosticForNode(declarationList.parent.kind === 219 ? declarationList.parent : declarationList, ts.Diagnostics.All_variables_are_unused));
+                        : ts.createDiagnosticForNode(declarationList.parent.kind === 220 ? declarationList.parent : declarationList, ts.Diagnostics.All_variables_are_unused));
                 }
                 else {
                     for (var _i = 0, declarations_5 = declarations; _i < declarations_5.length; _i++) {
@@ -45899,23 +47475,23 @@ var ts;
         }
         function bindingNameText(name) {
             switch (name.kind) {
-                case 72:
+                case 73:
                     return ts.idText(name);
+                case 186:
                 case 185:
-                case 184:
                     return bindingNameText(ts.cast(ts.first(name.elements), ts.isBindingElement).name);
                 default:
                     return ts.Debug.assertNever(name);
             }
         }
         function isImportedDeclaration(node) {
-            return node.kind === 250 || node.kind === 253 || node.kind === 251;
+            return node.kind === 251 || node.kind === 254 || node.kind === 252;
         }
         function importClauseFromImported(decl) {
-            return decl.kind === 250 ? decl : decl.kind === 251 ? decl.parent : decl.parent.parent;
+            return decl.kind === 251 ? decl : decl.kind === 252 ? decl.parent : decl.parent.parent;
         }
         function checkBlock(node) {
-            if (node.kind === 218) {
+            if (node.kind === 219) {
                 checkGrammarStatementInAmbientContext(node);
             }
             if (ts.isFunctionOrModuleBlock(node)) {
@@ -45944,19 +47520,19 @@ var ts;
             if (!(identifier && identifier.escapedText === name)) {
                 return false;
             }
-            if (node.kind === 154 ||
-                node.kind === 153 ||
+            if (node.kind === 155 ||
+                node.kind === 154 ||
+                node.kind === 157 ||
                 node.kind === 156 ||
-                node.kind === 155 ||
-                node.kind === 158 ||
-                node.kind === 159) {
+                node.kind === 159 ||
+                node.kind === 160) {
                 return false;
             }
             if (node.flags & 4194304) {
                 return false;
             }
             var root = ts.getRootDeclaration(node);
-            if (root.kind === 151 && ts.nodeIsMissing(root.parent.body)) {
+            if (root.kind === 152 && ts.nodeIsMissing(root.parent.body)) {
                 return false;
             }
             return true;
@@ -45964,7 +47540,7 @@ var ts;
         function checkIfThisIsCapturedInEnclosingScope(node) {
             ts.findAncestor(node, function (current) {
                 if (getNodeCheckFlags(current) & 4) {
-                    var isDeclaration_1 = node.kind !== 72;
+                    var isDeclaration_1 = node.kind !== 73;
                     if (isDeclaration_1) {
                         error(ts.getNameOfDeclaration(node), ts.Diagnostics.Duplicate_identifier_this_Compiler_uses_variable_declaration_this_to_capture_this_reference);
                     }
@@ -45979,7 +47555,7 @@ var ts;
         function checkIfNewTargetIsCapturedInEnclosingScope(node) {
             ts.findAncestor(node, function (current) {
                 if (getNodeCheckFlags(current) & 8) {
-                    var isDeclaration_2 = node.kind !== 72;
+                    var isDeclaration_2 = node.kind !== 73;
                     if (isDeclaration_2) {
                         error(ts.getNameOfDeclaration(node), ts.Diagnostics.Duplicate_identifier_newTarget_Compiler_uses_variable_declaration_newTarget_to_capture_new_target_meta_property_reference);
                     }
@@ -46002,7 +47578,7 @@ var ts;
                 return;
             }
             var parent = getDeclarationContainer(node);
-            if (parent.kind === 284 && ts.isExternalOrCommonJsModule(parent)) {
+            if (parent.kind === 285 && ts.isExternalOrCommonJsModule(parent)) {
                 error(name, ts.Diagnostics.Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module, ts.declarationNameToString(name), ts.declarationNameToString(name));
             }
         }
@@ -46014,7 +47590,7 @@ var ts;
                 return;
             }
             var parent = getDeclarationContainer(node);
-            if (parent.kind === 284 && ts.isExternalOrCommonJsModule(parent) && parent.flags & 1024) {
+            if (parent.kind === 285 && ts.isExternalOrCommonJsModule(parent) && parent.flags & 1024) {
                 error(name, ts.Diagnostics.Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module_containing_async_functions, ts.declarationNameToString(name), ts.declarationNameToString(name));
             }
         }
@@ -46022,7 +47598,7 @@ var ts;
             if ((ts.getCombinedNodeFlags(node) & 3) !== 0 || ts.isParameterDeclaration(node)) {
                 return;
             }
-            if (node.kind === 237 && !node.initializer) {
+            if (node.kind === 238 && !node.initializer) {
                 return;
             }
             var symbol = getSymbolOfNode(node);
@@ -46034,15 +47610,15 @@ var ts;
                     localDeclarationSymbol !== symbol &&
                     localDeclarationSymbol.flags & 2) {
                     if (getDeclarationNodeFlagsFromSymbol(localDeclarationSymbol) & 3) {
-                        var varDeclList = ts.getAncestor(localDeclarationSymbol.valueDeclaration, 238);
-                        var container = varDeclList.parent.kind === 219 && varDeclList.parent.parent
+                        var varDeclList = ts.getAncestor(localDeclarationSymbol.valueDeclaration, 239);
+                        var container = varDeclList.parent.kind === 220 && varDeclList.parent.parent
                             ? varDeclList.parent.parent
                             : undefined;
                         var namesShareScope = container &&
-                            (container.kind === 218 && ts.isFunctionLike(container.parent) ||
+                            (container.kind === 219 && ts.isFunctionLike(container.parent) ||
+                                container.kind === 246 ||
                                 container.kind === 245 ||
-                                container.kind === 244 ||
-                                container.kind === 284);
+                                container.kind === 285);
                         if (!namesShareScope) {
                             var name = symbolToString(localDeclarationSymbol);
                             error(node, ts.Diagnostics.Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1, name, name);
@@ -46051,55 +47627,6 @@ var ts;
                 }
             }
         }
-        function checkParameterInitializer(node) {
-            if (ts.getRootDeclaration(node).kind !== 151) {
-                return;
-            }
-            var func = ts.getContainingFunction(node);
-            visit(node.initializer);
-            function visit(n) {
-                if (ts.isTypeNode(n) || ts.isDeclarationName(n)) {
-                    return;
-                }
-                if (n.kind === 189) {
-                    return visit(n.expression);
-                }
-                else if (n.kind === 72) {
-                    var symbol = resolveName(n, n.escapedText, 67220415 | 2097152, undefined, undefined, false);
-                    if (!symbol || symbol === unknownSymbol || !symbol.valueDeclaration) {
-                        return;
-                    }
-                    if (symbol.valueDeclaration === node) {
-                        error(n, ts.Diagnostics.Parameter_0_cannot_be_referenced_in_its_initializer, ts.declarationNameToString(node.name));
-                        return;
-                    }
-                    var enclosingContainer = ts.getEnclosingBlockScopeContainer(symbol.valueDeclaration);
-                    if (enclosingContainer === func) {
-                        if (symbol.valueDeclaration.kind === 151 ||
-                            symbol.valueDeclaration.kind === 186) {
-                            if (symbol.valueDeclaration.pos < node.pos) {
-                                return;
-                            }
-                            if (ts.findAncestor(n, function (current) {
-                                if (current === node.initializer) {
-                                    return "quit";
-                                }
-                                return ts.isFunctionLike(current.parent) ||
-                                    (current.parent.kind === 154 &&
-                                        !(ts.hasModifier(current.parent, 32)) &&
-                                        ts.isClassLike(current.parent.parent));
-                            })) {
-                                return;
-                            }
-                        }
-                        error(n, ts.Diagnostics.Initializer_of_parameter_0_cannot_reference_identifier_1_declared_after_it, ts.declarationNameToString(node.name), ts.declarationNameToString(n));
-                    }
-                }
-                else {
-                    return ts.forEachChild(n, visit);
-                }
-            }
-        }
         function convertAutoToAny(type) {
             return type === autoType ? anyType : type === autoArrayType ? anyArrayType : type;
         }
@@ -46111,17 +47638,17 @@ var ts;
             if (!node.name) {
                 return;
             }
-            if (node.name.kind === 149) {
+            if (node.name.kind === 150) {
                 checkComputedPropertyName(node.name);
                 if (node.initializer) {
                     checkExpressionCached(node.initializer);
                 }
             }
-            if (node.kind === 186) {
-                if (node.parent.kind === 184 && languageVersion < 7) {
+            if (node.kind === 187) {
+                if (node.parent.kind === 185 && languageVersion < 99) {
                     checkExternalEmitHelpers(node, 4);
                 }
-                if (node.propertyName && node.propertyName.kind === 149) {
+                if (node.propertyName && node.propertyName.kind === 150) {
                     checkComputedPropertyName(node.propertyName);
                 }
                 var parent = node.parent.parent;
@@ -46134,31 +47661,43 @@ var ts;
                         var property = getPropertyOfType(parentType, nameText);
                         if (property) {
                             markPropertyAsReferenced(property, undefined, false);
-                            checkPropertyAccessibility(parent, !!parent.initializer && parent.initializer.kind === 98, parentType, property);
+                            checkPropertyAccessibility(parent, !!parent.initializer && parent.initializer.kind === 99, parentType, property);
                         }
                     }
                 }
             }
             if (ts.isBindingPattern(node.name)) {
-                if (node.name.kind === 185 && languageVersion < 2 && compilerOptions.downlevelIteration) {
+                if (node.name.kind === 186 && languageVersion < 2 && compilerOptions.downlevelIteration) {
                     checkExternalEmitHelpers(node, 512);
                 }
                 ts.forEach(node.name.elements, checkSourceElement);
             }
-            if (node.initializer && ts.getRootDeclaration(node).kind === 151 && ts.nodeIsMissing(ts.getContainingFunction(node).body)) {
+            if (node.initializer && ts.getRootDeclaration(node).kind === 152 && ts.nodeIsMissing(ts.getContainingFunction(node).body)) {
                 error(node, ts.Diagnostics.A_parameter_initializer_is_only_allowed_in_a_function_or_constructor_implementation);
                 return;
             }
             if (ts.isBindingPattern(node.name)) {
-                if (node.initializer && node.parent.parent.kind !== 226) {
-                    var initializerType = checkExpressionCached(node.initializer);
-                    if (strictNullChecks && node.name.elements.length === 0) {
-                        checkNonNullType(initializerType, node);
+                var needCheckInitializer = node.initializer && node.parent.parent.kind !== 227;
+                var needCheckWidenedType = node.name.elements.length === 0;
+                if (needCheckInitializer || needCheckWidenedType) {
+                    var widenedType = getWidenedTypeForVariableLikeDeclaration(node);
+                    if (needCheckInitializer) {
+                        var initializerType = checkExpressionCached(node.initializer);
+                        if (strictNullChecks && needCheckWidenedType) {
+                            checkNonNullNonVoidType(initializerType, node);
+                        }
+                        else {
+                            checkTypeAssignableToAndOptionallyElaborate(initializerType, getWidenedTypeForVariableLikeDeclaration(node), node, node.initializer);
+                        }
                     }
-                    else {
-                        checkTypeAssignableToAndOptionallyElaborate(initializerType, getWidenedTypeForVariableLikeDeclaration(node), node, node.initializer);
+                    if (needCheckWidenedType) {
+                        if (ts.isArrayBindingPattern(node.name)) {
+                            checkIteratedTypeOrElementType(65, widenedType, undefinedType, node);
+                        }
+                        else if (strictNullChecks) {
+                            checkNonNullNonVoidType(widenedType, node);
+                        }
                     }
-                    checkParameterInitializer(node);
                 }
                 return;
             }
@@ -46171,9 +47710,8 @@ var ts;
                         ts.isObjectLiteralExpression(initializer) &&
                         (initializer.properties.length === 0 || ts.isPrototypeAccess(node.name)) &&
                         ts.hasEntries(symbol.exports);
-                    if (!isJSObjectLiteralInitializer && node.parent.parent.kind !== 226) {
+                    if (!isJSObjectLiteralInitializer && node.parent.parent.kind !== 227) {
                         checkTypeAssignableToAndOptionallyElaborate(checkExpressionCached(initializer), type, node, initializer, undefined);
-                        checkParameterInitializer(node);
                     }
                 }
                 if (symbol.declarations.length > 1) {
@@ -46187,7 +47725,7 @@ var ts;
                 if (type !== errorType && declarationType !== errorType &&
                     !isTypeIdenticalTo(type, declarationType) &&
                     !(symbol.flags & 67108864)) {
-                    errorNextVariableOrPropertyDeclarationMustHaveSameType(type, node, declarationType);
+                    errorNextVariableOrPropertyDeclarationMustHaveSameType(symbol.valueDeclaration, type, node, declarationType);
                 }
                 if (node.initializer) {
                     checkTypeAssignableToAndOptionallyElaborate(checkExpressionCached(node.initializer), declarationType, node, node.initializer, undefined);
@@ -46196,25 +47734,29 @@ var ts;
                     error(node.name, ts.Diagnostics.All_declarations_of_0_must_have_identical_modifiers, ts.declarationNameToString(node.name));
                 }
             }
-            if (node.kind !== 154 && node.kind !== 153) {
+            if (node.kind !== 155 && node.kind !== 154) {
                 checkExportsOnMergedDeclarations(node);
-                if (node.kind === 237 || node.kind === 186) {
+                if (node.kind === 238 || node.kind === 187) {
                     checkVarDeclaredNamesNotShadowed(node);
                 }
                 checkCollisionWithRequireExportsInGeneratedCode(node, node.name);
                 checkCollisionWithGlobalPromiseInGeneratedCode(node, node.name);
             }
         }
-        function errorNextVariableOrPropertyDeclarationMustHaveSameType(firstType, nextDeclaration, nextType) {
+        function errorNextVariableOrPropertyDeclarationMustHaveSameType(firstDeclaration, firstType, nextDeclaration, nextType) {
             var nextDeclarationName = ts.getNameOfDeclaration(nextDeclaration);
-            var message = nextDeclaration.kind === 154 || nextDeclaration.kind === 153
+            var message = nextDeclaration.kind === 155 || nextDeclaration.kind === 154
                 ? ts.Diagnostics.Subsequent_property_declarations_must_have_the_same_type_Property_0_must_be_of_type_1_but_here_has_type_2
                 : ts.Diagnostics.Subsequent_variable_declarations_must_have_the_same_type_Variable_0_must_be_of_type_1_but_here_has_type_2;
-            error(nextDeclarationName, message, ts.declarationNameToString(nextDeclarationName), typeToString(firstType), typeToString(nextType));
+            var declName = ts.declarationNameToString(nextDeclarationName);
+            var err = error(nextDeclarationName, message, declName, typeToString(firstType), typeToString(nextType));
+            if (firstDeclaration) {
+                ts.addRelatedInfo(err, ts.createDiagnosticForNode(firstDeclaration, ts.Diagnostics._0_was_also_declared_here, declName));
+            }
         }
         function areDeclarationFlagsIdentical(left, right) {
-            if ((left.kind === 151 && right.kind === 237) ||
-                (left.kind === 237 && right.kind === 151)) {
+            if ((left.kind === 152 && right.kind === 238) ||
+                (left.kind === 238 && right.kind === 152)) {
                 return true;
             }
             if (ts.hasQuestionToken(left) !== ts.hasQuestionToken(right)) {
@@ -46249,7 +47791,7 @@ var ts;
             checkGrammarStatementInAmbientContext(node);
             checkTruthinessExpression(node.expression);
             checkSourceElement(node.thenStatement);
-            if (node.thenStatement.kind === 220) {
+            if (node.thenStatement.kind === 221) {
                 error(node.thenStatement, ts.Diagnostics.The_body_of_an_if_statement_cannot_be_the_empty_statement);
             }
             checkSourceElement(node.elseStatement);
@@ -46273,12 +47815,12 @@ var ts;
         }
         function checkForStatement(node) {
             if (!checkGrammarStatementInAmbientContext(node)) {
-                if (node.initializer && node.initializer.kind === 238) {
+                if (node.initializer && node.initializer.kind === 239) {
                     checkGrammarVariableDeclarationList(node.initializer);
                 }
             }
             if (node.initializer) {
-                if (node.initializer.kind === 238) {
+                if (node.initializer.kind === 239) {
                     ts.forEach(node.initializer.declarations, checkVariableDeclaration);
                 }
                 else {
@@ -46298,20 +47840,20 @@ var ts;
             checkGrammarForInOrForOfStatement(node);
             if (node.awaitModifier) {
                 var functionFlags = ts.getFunctionFlags(ts.getContainingFunction(node));
-                if ((functionFlags & (4 | 2)) === 2 && languageVersion < 7) {
-                    checkExternalEmitHelpers(node, 16384);
+                if ((functionFlags & (4 | 2)) === 2 && languageVersion < 99) {
+                    checkExternalEmitHelpers(node, 32768);
                 }
             }
             else if (compilerOptions.downlevelIteration && languageVersion < 2) {
                 checkExternalEmitHelpers(node, 256);
             }
-            if (node.initializer.kind === 238) {
+            if (node.initializer.kind === 239) {
                 checkForInOrForOfVariableDeclaration(node);
             }
             else {
                 var varExpr = node.initializer;
                 var iteratedType = checkRightHandSideOfForOf(node.expression, node.awaitModifier);
-                if (varExpr.kind === 187 || varExpr.kind === 188) {
+                if (varExpr.kind === 188 || varExpr.kind === 189) {
                     checkDestructuringAssignment(varExpr, iteratedType || errorType);
                 }
                 else {
@@ -46330,7 +47872,7 @@ var ts;
         function checkForInStatement(node) {
             checkGrammarForInOrForOfStatement(node);
             var rightType = getNonNullableTypeIfNeeded(checkExpression(node.expression));
-            if (node.initializer.kind === 238) {
+            if (node.initializer.kind === 239) {
                 var variable = node.initializer.declarations[0];
                 if (variable && ts.isBindingPattern(variable.name)) {
                     error(variable.name, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern);
@@ -46340,7 +47882,7 @@ var ts;
             else {
                 var varExpr = node.initializer;
                 var leftType = checkExpression(varExpr);
-                if (varExpr.kind === 187 || varExpr.kind === 188) {
+                if (varExpr.kind === 188 || varExpr.kind === 189) {
                     error(varExpr, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern);
                 }
                 else if (!isTypeAssignableTo(getIndexTypeOrString(rightType), leftType)) {
@@ -46367,15 +47909,17 @@ var ts;
         }
         function checkRightHandSideOfForOf(rhsExpression, awaitModifier) {
             var expressionType = checkNonNullExpression(rhsExpression);
-            return checkIteratedTypeOrElementType(expressionType, rhsExpression, true, awaitModifier !== undefined);
+            var use = awaitModifier ? 15 : 13;
+            return checkIteratedTypeOrElementType(use, expressionType, undefinedType, rhsExpression);
         }
-        function checkIteratedTypeOrElementType(inputType, errorNode, allowStringInput, allowAsyncIterables) {
+        function checkIteratedTypeOrElementType(use, inputType, sentType, errorNode) {
             if (isTypeAny(inputType)) {
                 return inputType;
             }
-            return getIteratedTypeOrElementType(inputType, errorNode, allowStringInput, allowAsyncIterables, true) || anyType;
+            return getIteratedTypeOrElementType(use, inputType, sentType, errorNode, true) || anyType;
         }
-        function getIteratedTypeOrElementType(inputType, errorNode, allowStringInput, allowAsyncIterables, checkAssignability) {
+        function getIteratedTypeOrElementType(use, inputType, sentType, errorNode, checkAssignability) {
+            var allowAsyncIterables = (use & 2) !== 0;
             if (inputType === neverType) {
                 reportTypeNotIterableError(errorNode, inputType, allowAsyncIterables);
                 return undefined;
@@ -46383,15 +47927,27 @@ var ts;
             var uplevelIteration = languageVersion >= 2;
             var downlevelIteration = !uplevelIteration && compilerOptions.downlevelIteration;
             if (uplevelIteration || downlevelIteration || allowAsyncIterables) {
-                var iteratedType = getIteratedTypeOfIterable(inputType, uplevelIteration ? errorNode : undefined, allowAsyncIterables, true, checkAssignability);
-                if (iteratedType || uplevelIteration) {
-                    return iteratedType;
+                var iterationTypes = getIterationTypesOfIterable(inputType, use, uplevelIteration ? errorNode : undefined);
+                if (checkAssignability) {
+                    if (iterationTypes) {
+                        var diagnostic = use & 8 ? ts.Diagnostics.Cannot_iterate_value_because_the_next_method_of_its_iterator_expects_type_1_but_for_of_will_always_send_0 :
+                            use & 32 ? ts.Diagnostics.Cannot_iterate_value_because_the_next_method_of_its_iterator_expects_type_1_but_array_spread_will_always_send_0 :
+                                use & 64 ? ts.Diagnostics.Cannot_iterate_value_because_the_next_method_of_its_iterator_expects_type_1_but_array_destructuring_will_always_send_0 :
+                                    use & 16 ? ts.Diagnostics.Cannot_delegate_iteration_to_value_because_the_next_method_of_its_iterator_expects_type_1_but_the_containing_generator_will_always_send_0 :
+                                        undefined;
+                        if (diagnostic) {
+                            checkTypeAssignableTo(sentType, iterationTypes.nextType, errorNode, diagnostic);
+                        }
+                    }
+                }
+                if (iterationTypes || uplevelIteration) {
+                    return iterationTypes && iterationTypes.yieldType;
                 }
             }
             var arrayType = inputType;
             var reportedError = false;
             var hasStringConstituent = false;
-            if (allowStringInput) {
+            if (use & 4) {
                 if (arrayType.flags & 1048576) {
                     var arrayTypes = inputType.types;
                     var filteredTypes = ts.filter(arrayTypes, function (t) { return !(t.flags & 132); });
@@ -46417,19 +47973,19 @@ var ts;
             }
             if (!isArrayLikeType(arrayType)) {
                 if (errorNode && !reportedError) {
-                    var isIterable = !!getIteratedTypeOfIterable(inputType, undefined, allowAsyncIterables, true, checkAssignability);
-                    var diagnostic = !allowStringInput || hasStringConstituent
+                    var yieldType = getIterationTypeOfIterable(use, 0, inputType, undefined);
+                    var _a = !(use & 4) || hasStringConstituent
                         ? downlevelIteration
-                            ? ts.Diagnostics.Type_0_is_not_an_array_type_or_does_not_have_a_Symbol_iterator_method_that_returns_an_iterator
-                            : isIterable
-                                ? ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type_Use_compiler_option_downlevelIteration_to_allow_iterating_of_iterators
-                                : ts.Diagnostics.Type_0_is_not_an_array_type
+                            ? [ts.Diagnostics.Type_0_is_not_an_array_type_or_does_not_have_a_Symbol_iterator_method_that_returns_an_iterator, true]
+                            : yieldType
+                                ? [ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type_Use_compiler_option_downlevelIteration_to_allow_iterating_of_iterators, false]
+                                : [ts.Diagnostics.Type_0_is_not_an_array_type, true]
                         : downlevelIteration
-                            ? ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type_or_does_not_have_a_Symbol_iterator_method_that_returns_an_iterator
-                            : isIterable
-                                ? ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type_Use_compiler_option_downlevelIteration_to_allow_iterating_of_iterators
-                                : ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type;
-                    error(errorNode, diagnostic, typeToString(arrayType));
+                            ? [ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type_or_does_not_have_a_Symbol_iterator_method_that_returns_an_iterator, true]
+                            : yieldType
+                                ? [ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type_Use_compiler_option_downlevelIteration_to_allow_iterating_of_iterators, false]
+                                : [ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type, true], defaultDiagnostic = _a[0], maybeMissingAwait = _a[1];
+                    errorAndMaybeSuggestAwait(errorNode, maybeMissingAwait && !!getAwaitedTypeOfPromise(arrayType), defaultDiagnostic, typeToString(arrayType));
                 }
                 return hasStringConstituent ? stringType : undefined;
             }
@@ -46442,132 +47998,340 @@ var ts;
             }
             return arrayElementType;
         }
-        function getIteratedTypeOfIterable(type, errorNode, allowAsyncIterables, allowSyncIterables, checkAssignability) {
-            if (isTypeAny(type)) {
+        function getIterationTypeOfIterable(use, typeKind, inputType, errorNode) {
+            if (isTypeAny(inputType)) {
                 return undefined;
             }
-            return mapType(type, getIteratedType);
-            function getIteratedType(type) {
-                var typeAsIterable = type;
-                if (allowAsyncIterables) {
-                    if (typeAsIterable.iteratedTypeOfAsyncIterable) {
-                        return typeAsIterable.iteratedTypeOfAsyncIterable;
-                    }
-                    if (isReferenceToType(type, getGlobalAsyncIterableType(false)) ||
-                        isReferenceToType(type, getGlobalAsyncIterableIteratorType(false))) {
-                        return typeAsIterable.iteratedTypeOfAsyncIterable = type.typeArguments[0];
-                    }
+            var iterationTypes = getIterationTypesOfIterable(inputType, use, errorNode);
+            return iterationTypes && iterationTypes[getIterationTypesKeyFromIterationTypeKind(typeKind)];
+        }
+        function createIterationTypes(yieldType, returnType, nextType) {
+            if (yieldType === void 0) { yieldType = neverType; }
+            if (returnType === void 0) { returnType = neverType; }
+            if (nextType === void 0) { nextType = unknownType; }
+            if (yieldType.flags & 67359327 &&
+                returnType.flags & (1 | 131072 | 2 | 16384 | 32768) &&
+                nextType.flags & (1 | 131072 | 2 | 16384 | 32768)) {
+                var id = getTypeListId([yieldType, returnType, nextType]);
+                var iterationTypes = iterationTypesCache.get(id);
+                if (!iterationTypes) {
+                    iterationTypes = { yieldType: yieldType, returnType: returnType, nextType: nextType };
+                    iterationTypesCache.set(id, iterationTypes);
                 }
-                if (allowSyncIterables) {
-                    if (typeAsIterable.iteratedTypeOfIterable) {
-                        return allowAsyncIterables
-                            ? typeAsIterable.iteratedTypeOfAsyncIterable = getAwaitedType(typeAsIterable.iteratedTypeOfIterable)
-                            : typeAsIterable.iteratedTypeOfIterable;
-                    }
-                    if (isReferenceToType(type, getGlobalIterableType(false)) ||
-                        isReferenceToType(type, getGlobalIterableIteratorType(false))) {
-                        return allowAsyncIterables
-                            ? typeAsIterable.iteratedTypeOfAsyncIterable = getAwaitedType(type.typeArguments[0])
-                            : typeAsIterable.iteratedTypeOfIterable = type.typeArguments[0];
-                    }
+                return iterationTypes;
+            }
+            return { yieldType: yieldType, returnType: returnType, nextType: nextType };
+        }
+        function combineIterationTypes(array) {
+            var yieldTypes;
+            var returnTypes;
+            var nextTypes;
+            for (var _i = 0, array_10 = array; _i < array_10.length; _i++) {
+                var iterationTypes = array_10[_i];
+                if (iterationTypes === undefined || iterationTypes === noIterationTypes) {
+                    continue;
                 }
-                var asyncMethodType = allowAsyncIterables && getTypeOfPropertyOfType(type, ts.getPropertyNameForKnownSymbolName("asyncIterator"));
-                var methodType = asyncMethodType || (allowSyncIterables ? getTypeOfPropertyOfType(type, ts.getPropertyNameForKnownSymbolName("iterator")) : undefined);
-                if (isTypeAny(methodType)) {
+                if (iterationTypes === anyIterationTypes) {
+                    return anyIterationTypes;
+                }
+                yieldTypes = ts.append(yieldTypes, iterationTypes.yieldType);
+                returnTypes = ts.append(returnTypes, iterationTypes.returnType);
+                nextTypes = ts.append(nextTypes, iterationTypes.nextType);
+            }
+            if (yieldTypes || returnTypes || nextTypes) {
+                return createIterationTypes(yieldTypes && getUnionType(yieldTypes), returnTypes && getUnionType(returnTypes), nextTypes && getIntersectionType(nextTypes));
+            }
+            return noIterationTypes;
+        }
+        function getIterationTypesOfIterable(type, use, errorNode) {
+            if (isTypeAny(type)) {
+                return anyIterationTypes;
+            }
+            if (!(type.flags & 1048576)) {
+                var iterationTypes_1 = getIterationTypesOfIterableWorker(type, use, errorNode);
+                if (iterationTypes_1 === noIterationTypes) {
+                    if (errorNode) {
+                        reportTypeNotIterableError(errorNode, type, !!(use & 2));
+                    }
                     return undefined;
                 }
-                var signatures = methodType ? getSignaturesOfType(methodType, 0) : undefined;
-                if (!ts.some(signatures)) {
+                return iterationTypes_1;
+            }
+            var cacheKey = use & 2 ? "iterationTypesOfAsyncIterable" : "iterationTypesOfIterable";
+            var cachedTypes = type[cacheKey];
+            if (cachedTypes)
+                return cachedTypes === noIterationTypes ? undefined : cachedTypes;
+            var allIterationTypes;
+            for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
+                var constituent = _a[_i];
+                var iterationTypes_2 = getIterationTypesOfIterableWorker(constituent, use, errorNode);
+                if (iterationTypes_2 === noIterationTypes) {
                     if (errorNode) {
-                        reportTypeNotIterableError(errorNode, type, allowAsyncIterables);
+                        reportTypeNotIterableError(errorNode, type, !!(use & 2));
                         errorNode = undefined;
                     }
-                    return undefined;
                 }
-                var returnType = getUnionType(ts.map(signatures, getReturnTypeOfSignature), 2);
-                var iteratedType = getIteratedTypeOfIterator(returnType, errorNode, !!asyncMethodType);
-                if (checkAssignability && errorNode && iteratedType) {
-                    checkTypeAssignableTo(type, asyncMethodType
-                        ? createAsyncIterableType(iteratedType)
-                        : createIterableType(iteratedType), errorNode);
-                }
-                if (iteratedType) {
-                    return allowAsyncIterables
-                        ? typeAsIterable.iteratedTypeOfAsyncIterable = asyncMethodType ? iteratedType : getAwaitedType(iteratedType)
-                        : typeAsIterable.iteratedTypeOfIterable = iteratedType;
+                else {
+                    allIterationTypes = ts.append(allIterationTypes, iterationTypes_2);
                 }
             }
+            var iterationTypes = allIterationTypes ? combineIterationTypes(allIterationTypes) : noIterationTypes;
+            type[cacheKey] = iterationTypes;
+            return iterationTypes === noIterationTypes ? undefined : iterationTypes;
+        }
+        function getAsyncFromSyncIterationTypes(iterationTypes, errorNode) {
+            if (iterationTypes === noIterationTypes)
+                return noIterationTypes;
+            if (iterationTypes === anyIterationTypes)
+                return anyIterationTypes;
+            var yieldType = iterationTypes.yieldType, returnType = iterationTypes.returnType, nextType = iterationTypes.nextType;
+            return createIterationTypes(getAwaitedType(yieldType, errorNode) || anyType, getAwaitedType(returnType, errorNode) || anyType, nextType);
+        }
+        function getIterationTypesOfIterableWorker(type, use, errorNode) {
+            if (isTypeAny(type)) {
+                return anyIterationTypes;
+            }
+            if (use & 2) {
+                var iterationTypes = getIterationTypesOfIterableCached(type, asyncIterationTypesResolver) ||
+                    getIterationTypesOfIterableFast(type, asyncIterationTypesResolver);
+                if (iterationTypes) {
+                    return iterationTypes;
+                }
+            }
+            if (use & 1) {
+                var iterationTypes = getIterationTypesOfIterableCached(type, syncIterationTypesResolver) ||
+                    getIterationTypesOfIterableFast(type, syncIterationTypesResolver);
+                if (iterationTypes) {
+                    if (use & 2) {
+                        if (iterationTypes !== noIterationTypes) {
+                            return type.iterationTypesOfAsyncIterable = getAsyncFromSyncIterationTypes(iterationTypes, errorNode);
+                        }
+                    }
+                    else {
+                        return iterationTypes;
+                    }
+                }
+            }
+            if (use & 2) {
+                var iterationTypes = getIterationTypesOfIterableSlow(type, asyncIterationTypesResolver, errorNode);
+                if (iterationTypes !== noIterationTypes) {
+                    return iterationTypes;
+                }
+            }
+            if (use & 1) {
+                var iterationTypes = getIterationTypesOfIterableSlow(type, syncIterationTypesResolver, errorNode);
+                if (iterationTypes !== noIterationTypes) {
+                    if (use & 2) {
+                        return type.iterationTypesOfAsyncIterable = iterationTypes
+                            ? getAsyncFromSyncIterationTypes(iterationTypes, errorNode)
+                            : noIterationTypes;
+                    }
+                    else {
+                        return iterationTypes;
+                    }
+                }
+            }
+            return noIterationTypes;
+        }
+        function getIterationTypesOfIterableCached(type, resolver) {
+            return type[resolver.iterableCacheKey];
+        }
+        function getIterationTypesOfGlobalIterableType(globalType, resolver) {
+            var globalIterationTypes = getIterationTypesOfIterableCached(globalType, resolver) ||
+                getIterationTypesOfIterableSlow(globalType, resolver, undefined);
+            return globalIterationTypes === noIterationTypes ? defaultIterationTypes : globalIterationTypes;
+        }
+        function getIterationTypesOfIterableFast(type, resolver) {
+            var globalType;
+            if (isReferenceToType(type, globalType = resolver.getGlobalIterableType(false)) ||
+                isReferenceToType(type, globalType = resolver.getGlobalIterableIteratorType(false))) {
+                var yieldType = type.typeArguments[0];
+                var _a = getIterationTypesOfGlobalIterableType(globalType, resolver), returnType = _a.returnType, nextType = _a.nextType;
+                return type[resolver.iterableCacheKey] = createIterationTypes(yieldType, returnType, nextType);
+            }
+            if (isReferenceToType(type, resolver.getGlobalGeneratorType(false))) {
+                var _b = type.typeArguments, yieldType = _b[0], returnType = _b[1], nextType = _b[2];
+                return type[resolver.iterableCacheKey] = createIterationTypes(yieldType, returnType, nextType);
+            }
+        }
+        function getIterationTypesOfIterableSlow(type, resolver, errorNode) {
+            var method = getPropertyOfType(type, ts.getPropertyNameForKnownSymbolName(resolver.iteratorSymbolName));
+            var methodType = method && !(method.flags & 16777216) ? getTypeOfSymbol(method) : undefined;
+            if (isTypeAny(methodType)) {
+                return type[resolver.iterableCacheKey] = anyIterationTypes;
+            }
+            var signatures = methodType ? getSignaturesOfType(methodType, 0) : undefined;
+            if (!ts.some(signatures)) {
+                return type[resolver.iterableCacheKey] = noIterationTypes;
+            }
+            var iteratorType = getUnionType(ts.map(signatures, getReturnTypeOfSignature), 2);
+            var iterationTypes = getIterationTypesOfIterator(iteratorType, resolver, errorNode) || noIterationTypes;
+            return type[resolver.iterableCacheKey] = iterationTypes;
         }
         function reportTypeNotIterableError(errorNode, type, allowAsyncIterables) {
-            error(errorNode, allowAsyncIterables
+            var message = allowAsyncIterables
                 ? ts.Diagnostics.Type_0_must_have_a_Symbol_asyncIterator_method_that_returns_an_async_iterator
-                : ts.Diagnostics.Type_0_must_have_a_Symbol_iterator_method_that_returns_an_iterator, typeToString(type));
+                : ts.Diagnostics.Type_0_must_have_a_Symbol_iterator_method_that_returns_an_iterator;
+            errorAndMaybeSuggestAwait(errorNode, !!getAwaitedTypeOfPromise(type), message, typeToString(type));
         }
-        function getIteratedTypeOfIterator(type, errorNode, isAsyncIterator) {
+        function getIterationTypesOfIterator(type, resolver, errorNode) {
             if (isTypeAny(type)) {
-                return undefined;
+                return anyIterationTypes;
             }
-            var typeAsIterator = type;
-            if (isAsyncIterator ? typeAsIterator.iteratedTypeOfAsyncIterator : typeAsIterator.iteratedTypeOfIterator) {
-                return isAsyncIterator ? typeAsIterator.iteratedTypeOfAsyncIterator : typeAsIterator.iteratedTypeOfIterator;
-            }
-            var getIteratorType = isAsyncIterator ? getGlobalAsyncIteratorType : getGlobalIteratorType;
-            if (isReferenceToType(type, getIteratorType(false))) {
-                return isAsyncIterator
-                    ? typeAsIterator.iteratedTypeOfAsyncIterator = type.typeArguments[0]
-                    : typeAsIterator.iteratedTypeOfIterator = type.typeArguments[0];
-            }
-            var nextMethod = getTypeOfPropertyOfType(type, "next");
-            if (isTypeAny(nextMethod)) {
-                return undefined;
-            }
-            var nextMethodSignatures = nextMethod ? getSignaturesOfType(nextMethod, 0) : ts.emptyArray;
-            if (nextMethodSignatures.length === 0) {
-                if (errorNode) {
-                    error(errorNode, isAsyncIterator
-                        ? ts.Diagnostics.An_async_iterator_must_have_a_next_method
-                        : ts.Diagnostics.An_iterator_must_have_a_next_method);
-                }
-                return undefined;
-            }
-            var nextResult = getUnionType(ts.map(nextMethodSignatures, getReturnTypeOfSignature), 2);
-            if (isTypeAny(nextResult)) {
-                return undefined;
-            }
-            if (isAsyncIterator) {
-                nextResult = getAwaitedTypeOfPromise(nextResult, errorNode, ts.Diagnostics.The_type_returned_by_the_next_method_of_an_async_iterator_must_be_a_promise_for_a_type_with_a_value_property);
-                if (isTypeAny(nextResult)) {
-                    return undefined;
-                }
-            }
-            var nextValue = nextResult && getTypeOfPropertyOfType(nextResult, "value");
-            if (!nextValue) {
-                if (errorNode) {
-                    error(errorNode, isAsyncIterator
-                        ? ts.Diagnostics.The_type_returned_by_the_next_method_of_an_async_iterator_must_be_a_promise_for_a_type_with_a_value_property
-                        : ts.Diagnostics.The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property);
-                }
-                return undefined;
-            }
-            return isAsyncIterator
-                ? typeAsIterator.iteratedTypeOfAsyncIterator = nextValue
-                : typeAsIterator.iteratedTypeOfIterator = nextValue;
+            var iterationTypes = getIterationTypesOfIteratorCached(type, resolver) ||
+                getIterationTypesOfIteratorFast(type, resolver) ||
+                getIterationTypesOfIteratorSlow(type, resolver, errorNode);
+            return iterationTypes === noIterationTypes ? undefined : iterationTypes;
         }
-        function getIteratedTypeOfGenerator(returnType, isAsyncGenerator) {
+        function getIterationTypesOfIteratorCached(type, resolver) {
+            return type[resolver.iteratorCacheKey];
+        }
+        function getIterationTypesOfIteratorFast(type, resolver) {
+            var globalType = resolver.getGlobalIterableIteratorType(false);
+            if (isReferenceToType(type, globalType)) {
+                var yieldType = type.typeArguments[0];
+                var globalIterationTypes = getIterationTypesOfIteratorCached(globalType, resolver) ||
+                    getIterationTypesOfIteratorSlow(globalType, resolver, undefined);
+                var _a = globalIterationTypes === noIterationTypes ? defaultIterationTypes : globalIterationTypes, returnType = _a.returnType, nextType = _a.nextType;
+                return type[resolver.iteratorCacheKey] = createIterationTypes(yieldType, returnType, nextType);
+            }
+            if (isReferenceToType(type, resolver.getGlobalIteratorType(false)) ||
+                isReferenceToType(type, resolver.getGlobalGeneratorType(false))) {
+                var _b = type.typeArguments, yieldType = _b[0], returnType = _b[1], nextType = _b[2];
+                return type[resolver.iteratorCacheKey] = createIterationTypes(yieldType, returnType, nextType);
+            }
+        }
+        function isIteratorResult(type, kind) {
+            var doneType = getTypeOfPropertyOfType(type, "done") || falseType;
+            return isTypeAssignableTo(kind === 0 ? falseType : trueType, doneType);
+        }
+        function isYieldIteratorResult(type) {
+            return isIteratorResult(type, 0);
+        }
+        function isReturnIteratorResult(type) {
+            return isIteratorResult(type, 1);
+        }
+        function getIterationTypesOfIteratorResult(type) {
+            if (isTypeAny(type)) {
+                return anyIterationTypes;
+            }
+            var cachedTypes = type.iterationTypesOfIteratorResult;
+            if (cachedTypes) {
+                return cachedTypes;
+            }
+            if (isReferenceToType(type, getGlobalIteratorYieldResultType(false))) {
+                var yieldType_1 = type.typeArguments[0];
+                return type.iterationTypesOfIteratorResult = createIterationTypes(yieldType_1, undefined, undefined);
+            }
+            if (isReferenceToType(type, getGlobalIteratorReturnResultType(false))) {
+                var returnType_1 = type.typeArguments[0];
+                return type.iterationTypesOfIteratorResult = createIterationTypes(undefined, returnType_1, undefined);
+            }
+            var yieldIteratorResult = filterType(type, isYieldIteratorResult);
+            var yieldType = yieldIteratorResult !== neverType ? getTypeOfPropertyOfType(yieldIteratorResult, "value") : undefined;
+            var returnIteratorResult = filterType(type, isReturnIteratorResult);
+            var returnType = returnIteratorResult !== neverType ? getTypeOfPropertyOfType(returnIteratorResult, "value") : undefined;
+            if (!yieldType && !returnType) {
+                return type.iterationTypesOfIteratorResult = noIterationTypes;
+            }
+            return type.iterationTypesOfIteratorResult = createIterationTypes(yieldType, returnType || voidType, undefined);
+        }
+        function getIterationTypesOfMethod(type, resolver, methodName, errorNode) {
+            var method = getPropertyOfType(type, methodName);
+            if (!method && methodName !== "next") {
+                return undefined;
+            }
+            var methodType = method && !(methodName === "next" && (method.flags & 16777216))
+                ? methodName === "next" ? getTypeOfSymbol(method) : getTypeWithFacts(getTypeOfSymbol(method), 2097152)
+                : undefined;
+            if (isTypeAny(methodType)) {
+                return methodName === "next" ? anyIterationTypes : anyIterationTypesExceptNext;
+            }
+            var methodSignatures = methodType ? getSignaturesOfType(methodType, 0) : ts.emptyArray;
+            if (methodSignatures.length === 0) {
+                if (errorNode) {
+                    var diagnostic = methodName === "next"
+                        ? resolver.mustHaveANextMethodDiagnostic
+                        : resolver.mustBeAMethodDiagnostic;
+                    error(errorNode, diagnostic, methodName);
+                }
+                return methodName === "next" ? anyIterationTypes : undefined;
+            }
+            var methodParameterTypes;
+            var methodReturnTypes;
+            for (var _i = 0, methodSignatures_1 = methodSignatures; _i < methodSignatures_1.length; _i++) {
+                var signature = methodSignatures_1[_i];
+                if (methodName !== "throw" && ts.some(signature.parameters)) {
+                    methodParameterTypes = ts.append(methodParameterTypes, getTypeAtPosition(signature, 0));
+                }
+                methodReturnTypes = ts.append(methodReturnTypes, getReturnTypeOfSignature(signature));
+            }
+            var returnTypes;
+            var nextType;
+            if (methodName !== "throw") {
+                var methodParameterType = methodParameterTypes ? getUnionType(methodParameterTypes) : unknownType;
+                var resolvedMethodParameterType = resolver.resolveIterationType(methodParameterType, errorNode) || anyType;
+                if (methodName === "next") {
+                    nextType = resolvedMethodParameterType;
+                }
+                else if (methodName === "return") {
+                    returnTypes = ts.append(returnTypes, resolvedMethodParameterType);
+                }
+            }
+            var yieldType;
+            var methodReturnType = methodReturnTypes ? getUnionType(methodReturnTypes, 2) : neverType;
+            var resolvedMethodReturnType = resolver.resolveIterationType(methodReturnType, errorNode) || anyType;
+            var iterationTypes = getIterationTypesOfIteratorResult(resolvedMethodReturnType);
+            if (iterationTypes === noIterationTypes) {
+                if (errorNode) {
+                    error(errorNode, resolver.mustHaveAValueDiagnostic, methodName);
+                }
+                yieldType = anyType;
+                returnTypes = ts.append(returnTypes, anyType);
+            }
+            else {
+                yieldType = iterationTypes.yieldType;
+                returnTypes = ts.append(returnTypes, iterationTypes.returnType);
+            }
+            return createIterationTypes(yieldType, getUnionType(returnTypes), nextType);
+        }
+        function getIterationTypesOfIteratorSlow(type, resolver, errorNode) {
+            var iterationTypes = combineIterationTypes([
+                getIterationTypesOfMethod(type, resolver, "next", errorNode),
+                getIterationTypesOfMethod(type, resolver, "return", errorNode),
+                getIterationTypesOfMethod(type, resolver, "throw", errorNode),
+            ]);
+            return type[resolver.iteratorCacheKey] = iterationTypes;
+        }
+        function getIterationTypeOfGeneratorFunctionReturnType(kind, returnType, isAsyncGenerator) {
             if (isTypeAny(returnType)) {
                 return undefined;
             }
-            return getIteratedTypeOfIterable(returnType, undefined, isAsyncGenerator, !isAsyncGenerator, false)
-                || getIteratedTypeOfIterator(returnType, undefined, isAsyncGenerator);
+            var iterationTypes = getIterationTypesOfGeneratorFunctionReturnType(returnType, isAsyncGenerator);
+            return iterationTypes && iterationTypes[getIterationTypesKeyFromIterationTypeKind(kind)];
+        }
+        function getIterationTypesOfGeneratorFunctionReturnType(type, isAsyncGenerator) {
+            if (isTypeAny(type)) {
+                return anyIterationTypes;
+            }
+            var use = isAsyncGenerator ? 2 : 1;
+            var resolver = isAsyncGenerator ? asyncIterationTypesResolver : syncIterationTypesResolver;
+            return getIterationTypesOfIterable(type, use, undefined) ||
+                getIterationTypesOfIterator(type, resolver, undefined);
         }
         function checkBreakOrContinueStatement(node) {
             if (!checkGrammarStatementInAmbientContext(node))
                 checkGrammarBreakOrContinueStatement(node);
         }
+        function unwrapReturnType(returnType, functionFlags) {
+            var isGenerator = !!(functionFlags & 1);
+            var isAsync = !!(functionFlags & 2);
+            return isGenerator ? getIterationTypeOfGeneratorFunctionReturnType(1, returnType, isAsync) || errorType :
+                isAsync ? getPromisedTypeOfPromise(returnType) || errorType :
+                    returnType;
+        }
         function isUnwrappedReturnTypeVoidOrAny(func, returnType) {
-            var unwrappedReturnType = (ts.getFunctionFlags(func) & 3) === 2
-                ? getPromisedTypeOfPromise(returnType)
-                : returnType;
+            var unwrappedReturnType = unwrapReturnType(returnType, ts.getFunctionFlags(func));
             return !!unwrappedReturnType && maybeTypeOfKind(unwrappedReturnType, 16384 | 3);
         }
         function checkReturnStatement(node) {
@@ -46582,36 +48346,29 @@ var ts;
             var signature = getSignatureFromDeclaration(func);
             var returnType = getReturnTypeOfSignature(signature);
             var functionFlags = ts.getFunctionFlags(func);
-            var isGenerator = functionFlags & 1;
             if (strictNullChecks || node.expression || returnType.flags & 131072) {
                 var exprType = node.expression ? checkExpressionCached(node.expression) : undefinedType;
-                if (isGenerator) {
-                    return;
-                }
-                else if (func.kind === 159) {
+                if (func.kind === 160) {
                     if (node.expression) {
                         error(node, ts.Diagnostics.Setters_cannot_return_a_value);
                     }
                 }
-                else if (func.kind === 157) {
+                else if (func.kind === 158) {
                     if (node.expression && !checkTypeAssignableToAndOptionallyElaborate(exprType, returnType, node, node.expression)) {
                         error(node, ts.Diagnostics.Return_type_of_constructor_signature_must_be_assignable_to_the_instance_type_of_the_class);
                     }
                 }
                 else if (getReturnTypeFromAnnotation(func)) {
-                    if (functionFlags & 2) {
-                        var promisedType = getPromisedTypeOfPromise(returnType);
-                        var awaitedType = checkAwaitedType(exprType, node, ts.Diagnostics.The_return_type_of_an_async_function_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member);
-                        if (promisedType) {
-                            checkTypeAssignableTo(awaitedType, promisedType, node);
-                        }
-                    }
-                    else {
-                        checkTypeAssignableToAndOptionallyElaborate(exprType, returnType, node, node.expression);
+                    var unwrappedReturnType = unwrapReturnType(returnType, functionFlags);
+                    var unwrappedExprType = functionFlags & 2
+                        ? checkAwaitedType(exprType, node, ts.Diagnostics.The_return_type_of_an_async_function_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member)
+                        : exprType;
+                    if (unwrappedReturnType) {
+                        checkTypeAssignableToAndOptionallyElaborate(unwrappedExprType, unwrappedReturnType, node, node.expression);
                     }
                 }
             }
-            else if (func.kind !== 157 && compilerOptions.noImplicitReturns && !isUnwrappedReturnTypeVoidOrAny(func, returnType) && !isGenerator) {
+            else if (func.kind !== 158 && compilerOptions.noImplicitReturns && !isUnwrappedReturnTypeVoidOrAny(func, returnType)) {
                 error(node, ts.Diagnostics.Not_all_code_paths_return_a_value);
             }
         }
@@ -46636,7 +48393,7 @@ var ts;
             var expressionType = checkExpression(node.expression);
             var expressionIsLiteral = isLiteralType(expressionType);
             ts.forEach(node.caseBlock.clauses, function (clause) {
-                if (clause.kind === 272 && !hasDuplicateDefaultClause) {
+                if (clause.kind === 273 && !hasDuplicateDefaultClause) {
                     if (firstDefaultClause === undefined) {
                         firstDefaultClause = clause;
                     }
@@ -46648,7 +48405,7 @@ var ts;
                         hasDuplicateDefaultClause = true;
                     }
                 }
-                if (produceDiagnostics && clause.kind === 271) {
+                if (produceDiagnostics && clause.kind === 272) {
                     var caseType = checkExpression(clause.expression);
                     var caseIsLiteral = isLiteralType(caseType);
                     var comparedExpressionType = expressionType;
@@ -46672,7 +48429,7 @@ var ts;
                     if (ts.isFunctionLike(current)) {
                         return "quit";
                     }
-                    if (current.kind === 233 && current.label.escapedText === node.label.escapedText) {
+                    if (current.kind === 234 && current.label.escapedText === node.label.escapedText) {
                         grammarErrorOnNode(node.label, ts.Diagnostics.Duplicate_label_0, ts.getTextOfNode(node.label));
                         return true;
                     }
@@ -46767,8 +48524,8 @@ var ts;
                 }
                 var errorNode;
                 if (propDeclaration && name &&
-                    (propDeclaration.kind === 204 ||
-                        name.kind === 149 ||
+                    (propDeclaration.kind === 205 ||
+                        name.kind === 150 ||
                         prop.parent === containingType.symbol)) {
                     errorNode = propDeclaration;
                 }
@@ -46833,7 +48590,7 @@ var ts;
         function checkTypeParametersNotReferenced(root, typeParameters, index) {
             visit(root);
             function visit(node) {
-                if (node.kind === 164) {
+                if (node.kind === 165) {
                     var type = getTypeFromTypeReference(node);
                     if (type.flags & 262144) {
                         for (var i = index; i < typeParameters.length; i++) {
@@ -46944,6 +48701,10 @@ var ts;
                 if (languageVersion < 2) {
                     checkExternalEmitHelpers(baseTypeNode.parent, 1);
                 }
+                var extendsNode = ts.getClassExtendsHeritageElement(node);
+                if (extendsNode && extendsNode !== baseTypeNode) {
+                    checkExpression(extendsNode.expression);
+                }
                 var baseTypes = getBaseTypes(type);
                 if (baseTypes.length && produceDiagnostics) {
                     var baseType_1 = baseTypes[0];
@@ -46951,10 +48712,6 @@ var ts;
                     var staticBaseType = getApparentType(baseConstructorType);
                     checkBaseTypeAccessibility(staticBaseType, baseTypeNode);
                     checkSourceElement(baseTypeNode.expression);
-                    var extendsNode = ts.getClassExtendsHeritageElement(node);
-                    if (extendsNode && extendsNode !== baseTypeNode) {
-                        checkExpression(extendsNode.expression);
-                    }
                     if (ts.some(baseTypeNode.typeArguments)) {
                         ts.forEach(baseTypeNode.typeArguments, checkSourceElement);
                         for (var _i = 0, _a = getConstructorsForTypeArguments(staticBaseType, baseTypeNode.typeArguments, baseTypeNode); _i < _a.length; _i++) {
@@ -47018,7 +48775,7 @@ var ts;
         }
         function issueMemberSpecificError(node, typeWithThis, baseWithThis, broadDiag) {
             var issuedMemberError = false;
-            var _loop_9 = function (member) {
+            var _loop_14 = function (member) {
                 if (ts.hasStaticModifier(member)) {
                     return "continue";
                 }
@@ -47036,7 +48793,7 @@ var ts;
             };
             for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                 var member = _a[_i];
-                _loop_9(member);
+                _loop_14(member);
             }
             if (!issuedMemberError) {
                 checkTypeAssignableTo(typeWithThis, baseWithThis, node.name || node, broadDiag);
@@ -47059,7 +48816,7 @@ var ts;
         }
         function getClassOrInterfaceDeclarationsOfSymbol(symbol) {
             return ts.filter(symbol.declarations, function (d) {
-                return d.kind === 240 || d.kind === 241;
+                return d.kind === 241 || d.kind === 242;
             });
         }
         function checkKindsOfPropertyMemberOverrides(type, baseType) {
@@ -47077,7 +48834,7 @@ var ts;
                     if (derived === base) {
                         var derivedClassDecl = ts.getClassLikeDeclarationOfSymbol(type.symbol);
                         if (baseDeclarationFlags & 128 && (!derivedClassDecl || !ts.hasModifier(derivedClassDecl, 128))) {
-                            if (derivedClassDecl.kind === 209) {
+                            if (derivedClassDecl.kind === 210) {
                                 error(derivedClassDecl, ts.Diagnostics.Non_abstract_class_expression_does_not_implement_inherited_abstract_member_0_from_class_1, symbolToString(baseProperty), typeToString(baseType));
                             }
                             else {
@@ -47124,8 +48881,8 @@ var ts;
             for (var _i = 0, baseTypes_2 = baseTypes; _i < baseTypes_2.length; _i++) {
                 var base = baseTypes_2[_i];
                 var properties = getPropertiesOfType(getTypeWithThisArgument(base, type.thisType));
-                for (var _a = 0, properties_7 = properties; _a < properties_7.length; _a++) {
-                    var prop = properties_7[_a];
+                for (var _a = 0, properties_4 = properties; _a < properties_4.length; _a++) {
+                    var prop = properties_4[_a];
                     var existing = seen.get(prop.escapedName);
                     if (!existing) {
                         seen.set(prop.escapedName, { prop: prop, containingType: base });
@@ -47166,7 +48923,7 @@ var ts;
             }
         }
         function isInstancePropertyWithoutInitializer(node) {
-            return node.kind === 154 &&
+            return node.kind === 155 &&
                 !ts.hasModifier(node, 32 | 128) &&
                 !node.exclamationToken &&
                 !node.initializer;
@@ -47188,7 +48945,7 @@ var ts;
                 checkExportsOnMergedDeclarations(node);
                 var symbol = getSymbolOfNode(node);
                 checkTypeParameterListsIdentical(symbol);
-                var firstInterfaceDecl = ts.getDeclarationOfKind(symbol, 241);
+                var firstInterfaceDecl = ts.getDeclarationOfKind(symbol, 242);
                 if (node === firstInterfaceDecl) {
                     var type = getDeclaredTypeOfSymbol(symbol);
                     var typeWithThis = getTypeWithThisArgument(type);
@@ -47247,7 +49004,7 @@ var ts;
             if (member.initializer) {
                 return computeConstantValue(member);
             }
-            if (member.parent.flags & 4194304 && !ts.isEnumConst(member.parent)) {
+            if (member.parent.flags & 4194304 && !ts.isEnumConst(member.parent) && getEnumKind(getSymbolOfNode(member.parent)) === 0) {
                 return undefined;
             }
             if (autoValue !== undefined) {
@@ -47284,7 +49041,7 @@ var ts;
             return value;
             function evaluate(expr) {
                 switch (expr.kind) {
-                    case 202:
+                    case 203:
                         var value_2 = evaluate(expr.operand);
                         if (typeof value_2 === "number") {
                             switch (expr.operator) {
@@ -47294,7 +49051,7 @@ var ts;
                             }
                         }
                         break;
-                    case 204:
+                    case 205:
                         var left = evaluate(expr.left);
                         var right = evaluate(expr.right);
                         if (typeof left === "number" && typeof right === "number") {
@@ -47322,22 +49079,22 @@ var ts;
                     case 8:
                         checkGrammarNumericLiteral(expr);
                         return +expr.text;
-                    case 195:
+                    case 196:
                         return evaluate(expr.expression);
-                    case 72:
+                    case 73:
                         var identifier = expr;
                         if (isInfinityOrNaNString(identifier.escapedText)) {
                             return +(identifier.escapedText);
                         }
                         return ts.nodeIsMissing(expr) ? 0 : evaluateEnumMember(expr, getSymbolOfNode(member.parent), identifier.escapedText);
+                    case 191:
                     case 190:
-                    case 189:
                         var ex = expr;
                         if (isConstantMemberAccess(ex)) {
                             var type = getTypeOfExpression(ex.expression);
                             if (type.symbol && type.symbol.flags & 384) {
                                 var name = void 0;
-                                if (ex.kind === 189) {
+                                if (ex.kind === 190) {
                                     name = ex.name.escapedText;
                                 }
                                 else {
@@ -47368,9 +49125,9 @@ var ts;
             }
         }
         function isConstantMemberAccess(node) {
-            return node.kind === 72 ||
-                node.kind === 189 && isConstantMemberAccess(node.expression) ||
-                node.kind === 190 && isConstantMemberAccess(node.expression) &&
+            return node.kind === 73 ||
+                node.kind === 190 && isConstantMemberAccess(node.expression) ||
+                node.kind === 191 && isConstantMemberAccess(node.expression) &&
                     node.argumentExpression.kind === 10;
         }
         function checkEnumDeclaration(node) {
@@ -47396,7 +49153,7 @@ var ts;
                 }
                 var seenEnumMissingInitialInitializer_1 = false;
                 ts.forEach(enumSymbol.declarations, function (declaration) {
-                    if (declaration.kind !== 243) {
+                    if (declaration.kind !== 244) {
                         return false;
                     }
                     var enumDeclaration = declaration;
@@ -47419,8 +49176,8 @@ var ts;
             var declarations = symbol.declarations;
             for (var _i = 0, declarations_8 = declarations; _i < declarations_8.length; _i++) {
                 var declaration = declarations_8[_i];
-                if ((declaration.kind === 240 ||
-                    (declaration.kind === 239 && ts.nodeIsPresent(declaration.body))) &&
+                if ((declaration.kind === 241 ||
+                    (declaration.kind === 240 && ts.nodeIsPresent(declaration.body))) &&
                     !(declaration.flags & 4194304)) {
                     return declaration;
                 }
@@ -47466,8 +49223,8 @@ var ts;
                 checkExportsOnMergedDeclarations(node);
                 var symbol = getSymbolOfNode(node);
                 if (symbol.flags & 512
-                    && symbol.declarations.length > 1
                     && !inAmbientContext
+                    && symbol.declarations.length > 1
                     && isInstantiatedModule(node, !!compilerOptions.preserveConstEnums || !!compilerOptions.isolatedModules)) {
                     var firstNonAmbientClassOrFunc = getFirstNonAmbientClassOrFunctionDeclaration(symbol);
                     if (firstNonAmbientClassOrFunc) {
@@ -47478,7 +49235,7 @@ var ts;
                             error(node.name, ts.Diagnostics.A_namespace_declaration_cannot_be_located_prior_to_a_class_or_function_with_which_it_is_merged);
                         }
                     }
-                    var mergedClass = ts.getDeclarationOfKind(symbol, 240);
+                    var mergedClass = ts.getDeclarationOfKind(symbol, 241);
                     if (mergedClass &&
                         inSameLexicalScope(node, mergedClass)) {
                         getNodeLinks(node).flags |= 32768;
@@ -47521,22 +49278,22 @@ var ts;
         }
         function checkModuleAugmentationElement(node, isGlobalAugmentation) {
             switch (node.kind) {
-                case 219:
+                case 220:
                     for (var _i = 0, _a = node.declarationList.declarations; _i < _a.length; _i++) {
                         var decl = _a[_i];
                         checkModuleAugmentationElement(decl, isGlobalAugmentation);
                     }
                     break;
-                case 254:
                 case 255:
+                case 256:
                     grammarErrorOnFirstToken(node, ts.Diagnostics.Exports_and_export_assignments_are_not_permitted_in_module_augmentations);
                     break;
-                case 248:
                 case 249:
+                case 250:
                     grammarErrorOnFirstToken(node, ts.Diagnostics.Imports_are_not_permitted_in_module_augmentations_Consider_moving_them_to_the_enclosing_external_module);
                     break;
-                case 186:
-                case 237:
+                case 187:
+                case 238:
                     var name = node.name;
                     if (ts.isBindingPattern(name)) {
                         for (var _b = 0, _c = name.elements; _b < _c.length; _b++) {
@@ -47545,12 +49302,12 @@ var ts;
                         }
                         break;
                     }
-                case 240:
-                case 243:
-                case 239:
                 case 241:
                 case 244:
+                case 240:
                 case 242:
+                case 245:
+                case 243:
                     if (isGlobalAugmentation) {
                         return;
                     }
@@ -47566,17 +49323,17 @@ var ts;
         }
         function getFirstIdentifier(node) {
             switch (node.kind) {
-                case 72:
+                case 73:
                     return node;
-                case 148:
+                case 149:
                     do {
                         node = node.left;
-                    } while (node.kind !== 72);
+                    } while (node.kind !== 73);
                     return node;
-                case 189:
+                case 190:
                     do {
                         node = node.expression;
-                    } while (node.kind !== 72);
+                    } while (node.kind !== 73);
                     return node;
             }
         }
@@ -47589,9 +49346,9 @@ var ts;
                 error(moduleName, ts.Diagnostics.String_literal_expected);
                 return false;
             }
-            var inAmbientExternalModule = node.parent.kind === 245 && ts.isAmbientModule(node.parent.parent);
-            if (node.parent.kind !== 284 && !inAmbientExternalModule) {
-                error(moduleName, node.kind === 255 ?
+            var inAmbientExternalModule = node.parent.kind === 246 && ts.isAmbientModule(node.parent.parent);
+            if (node.parent.kind !== 285 && !inAmbientExternalModule) {
+                error(moduleName, node.kind === 256 ?
                     ts.Diagnostics.Export_declarations_are_not_permitted_in_a_namespace :
                     ts.Diagnostics.Import_declarations_in_a_namespace_cannot_reference_a_module);
                 return false;
@@ -47612,13 +49369,13 @@ var ts;
                     (symbol.flags & 67897832 ? 67897832 : 0) |
                     (symbol.flags & 1920 ? 1920 : 0);
                 if (target.flags & excludedMeanings) {
-                    var message = node.kind === 257 ?
+                    var message = node.kind === 258 ?
                         ts.Diagnostics.Export_declaration_conflicts_with_exported_declaration_of_0 :
                         ts.Diagnostics.Import_declaration_conflicts_with_local_declaration_of_0;
                     error(node, message, symbolToString(symbol));
                 }
                 if (compilerOptions.isolatedModules
-                    && node.kind === 257
+                    && node.kind === 258
                     && !(target.flags & 67220415)
                     && !(node.flags & 4194304)) {
                     error(node, ts.Diagnostics.Cannot_re_export_a_type_when_the_isolatedModules_flag_is_provided);
@@ -47644,7 +49401,7 @@ var ts;
                         checkImportBinding(importClause);
                     }
                     if (importClause.namedBindings) {
-                        if (importClause.namedBindings.kind === 251) {
+                        if (importClause.namedBindings.kind === 252) {
                             checkImportBinding(importClause.namedBindings);
                         }
                         else {
@@ -47667,7 +49424,7 @@ var ts;
                 if (ts.hasModifier(node, 1)) {
                     markExportAsReferenced(node);
                 }
-                if (node.moduleReference.kind !== 259) {
+                if (node.moduleReference.kind !== 260) {
                     var target = resolveAlias(getSymbolOfNode(node));
                     if (target !== unknownSymbol) {
                         if (target.flags & 67220415) {
@@ -47698,10 +49455,10 @@ var ts;
             if (!node.moduleSpecifier || checkExternalImportOrExportDeclaration(node)) {
                 if (node.exportClause) {
                     ts.forEach(node.exportClause.elements, checkExportSpecifier);
-                    var inAmbientExternalModule = node.parent.kind === 245 && ts.isAmbientModule(node.parent.parent);
-                    var inAmbientNamespaceDeclaration = !inAmbientExternalModule && node.parent.kind === 245 &&
+                    var inAmbientExternalModule = node.parent.kind === 246 && ts.isAmbientModule(node.parent.parent);
+                    var inAmbientNamespaceDeclaration = !inAmbientExternalModule && node.parent.kind === 246 &&
                         !node.moduleSpecifier && node.flags & 4194304;
-                    if (node.parent.kind !== 284 && !inAmbientExternalModule && !inAmbientNamespaceDeclaration) {
+                    if (node.parent.kind !== 285 && !inAmbientExternalModule && !inAmbientNamespaceDeclaration) {
                         error(node, ts.Diagnostics.Export_declarations_are_not_permitted_in_a_namespace);
                     }
                 }
@@ -47711,13 +49468,13 @@ var ts;
                         error(node.moduleSpecifier, ts.Diagnostics.Module_0_uses_export_and_cannot_be_used_with_export_Asterisk, symbolToString(moduleSymbol));
                     }
                     if (moduleKind !== ts.ModuleKind.System && moduleKind !== ts.ModuleKind.ES2015 && moduleKind !== ts.ModuleKind.ESNext) {
-                        checkExternalEmitHelpers(node, 32768);
+                        checkExternalEmitHelpers(node, 65536);
                     }
                 }
             }
         }
         function checkGrammarModuleElementContext(node, errorMessage) {
-            var isInAppropriateContext = node.parent.kind === 284 || node.parent.kind === 245 || node.parent.kind === 244;
+            var isInAppropriateContext = node.parent.kind === 285 || node.parent.kind === 246 || node.parent.kind === 245;
             if (!isInAppropriateContext) {
                 grammarErrorOnFirstToken(node, errorMessage);
             }
@@ -47743,8 +49500,8 @@ var ts;
             if (checkGrammarModuleElementContext(node, ts.Diagnostics.An_export_assignment_can_only_be_used_in_a_module)) {
                 return;
             }
-            var container = node.parent.kind === 284 ? node.parent : node.parent.parent;
-            if (container.kind === 244 && !ts.isAmbientModule(container)) {
+            var container = node.parent.kind === 285 ? node.parent : node.parent.parent;
+            if (container.kind === 245 && !ts.isAmbientModule(container)) {
                 if (node.isExportEquals) {
                     error(node, ts.Diagnostics.An_export_assignment_cannot_be_used_in_a_namespace);
                 }
@@ -47756,7 +49513,7 @@ var ts;
             if (!checkGrammarDecoratorsAndModifiers(node) && ts.hasModifiers(node)) {
                 grammarErrorOnFirstToken(node, ts.Diagnostics.An_export_assignment_cannot_have_modifiers);
             }
-            if (node.expression.kind === 72) {
+            if (node.expression.kind === 73) {
                 markExportAsReferenced(node);
                 if (ts.getEmitDeclarations(compilerOptions)) {
                     collectLinkedAliases(node.expression, true);
@@ -47823,13 +49580,14 @@ var ts;
             return !ts.isAccessor(declaration);
         }
         function isNotOverload(declaration) {
-            return (declaration.kind !== 239 && declaration.kind !== 156) ||
+            return (declaration.kind !== 240 && declaration.kind !== 157) ||
                 !!declaration.body;
         }
         function checkSourceElement(node) {
             if (node) {
                 var saveCurrentNode = currentNode;
                 currentNode = node;
+                instantiationCount = 0;
                 checkSourceElementWorker(node);
                 currentNode = saveCurrentNode;
             }
@@ -47844,157 +49602,157 @@ var ts;
             var kind = node.kind;
             if (cancellationToken) {
                 switch (kind) {
-                    case 244:
-                    case 240:
+                    case 245:
                     case 241:
-                    case 239:
+                    case 242:
+                    case 240:
                         cancellationToken.throwIfCancellationRequested();
                 }
             }
             switch (kind) {
-                case 150:
-                    return checkTypeParameter(node);
                 case 151:
+                    return checkTypeParameter(node);
+                case 152:
                     return checkParameter(node);
+                case 155:
                 case 154:
-                case 153:
                     return checkPropertyDeclaration(node);
-                case 165:
                 case 166:
-                case 160:
+                case 167:
                 case 161:
                 case 162:
-                    return checkSignatureDeclaration(node);
-                case 156:
-                case 155:
-                    return checkMethodDeclaration(node);
-                case 157:
-                    return checkConstructorDeclaration(node);
-                case 158:
-                case 159:
-                    return checkAccessorDeclaration(node);
-                case 164:
-                    return checkTypeReferenceNode(node);
                 case 163:
+                    return checkSignatureDeclaration(node);
+                case 157:
+                case 156:
+                    return checkMethodDeclaration(node);
+                case 158:
+                    return checkConstructorDeclaration(node);
+                case 159:
+                case 160:
+                    return checkAccessorDeclaration(node);
+                case 165:
+                    return checkTypeReferenceNode(node);
+                case 164:
                     return checkTypePredicate(node);
-                case 167:
-                    return checkTypeQuery(node);
                 case 168:
-                    return checkTypeLiteral(node);
+                    return checkTypeQuery(node);
                 case 169:
-                    return checkArrayType(node);
+                    return checkTypeLiteral(node);
                 case 170:
-                    return checkTupleType(node);
-                case 173:
-                case 174:
-                    return checkUnionOrIntersectionType(node);
-                case 177:
+                    return checkArrayType(node);
                 case 171:
-                case 172:
-                    return checkSourceElement(node.type);
-                case 178:
-                    return checkThisType(node);
-                case 179:
-                    return checkTypeOperator(node);
+                    return checkTupleType(node);
+                case 174:
                 case 175:
-                    return checkConditionalType(node);
+                    return checkUnionOrIntersectionType(node);
+                case 178:
+                case 172:
+                case 173:
+                    return checkSourceElement(node.type);
+                case 179:
+                    return checkThisType(node);
+                case 180:
+                    return checkTypeOperator(node);
                 case 176:
+                    return checkConditionalType(node);
+                case 177:
                     return checkInferType(node);
-                case 183:
+                case 184:
                     return checkImportType(node);
-                case 300:
+                case 301:
                     return checkJSDocAugmentsTag(node);
-                case 309:
-                case 302:
-                    return checkJSDocTypeAliasTag(node);
-                case 308:
-                    return checkJSDocTemplateTag(node);
-                case 307:
-                    return checkJSDocTypeTag(node);
+                case 311:
                 case 304:
+                    return checkJSDocTypeAliasTag(node);
+                case 310:
+                    return checkJSDocTemplateTag(node);
+                case 309:
+                    return checkJSDocTypeTag(node);
+                case 306:
                     return checkJSDocParameterTag(node);
-                case 294:
+                case 295:
                     checkJSDocFunctionType(node);
+                case 293:
                 case 292:
-                case 291:
-                case 289:
                 case 290:
-                case 297:
+                case 291:
+                case 298:
                     checkJSDocTypeIsInJsFile(node);
                     ts.forEachChild(node, checkSourceElement);
                     return;
-                case 295:
+                case 296:
                     checkJSDocVariadicType(node);
                     return;
-                case 288:
+                case 289:
                     return checkSourceElement(node.type);
-                case 180:
-                    return checkIndexedAccessType(node);
                 case 181:
+                    return checkIndexedAccessType(node);
+                case 182:
                     return checkMappedType(node);
-                case 239:
-                    return checkFunctionDeclaration(node);
-                case 218:
-                case 245:
-                    return checkBlock(node);
-                case 219:
-                    return checkVariableStatement(node);
-                case 221:
-                    return checkExpressionStatement(node);
-                case 222:
-                    return checkIfStatement(node);
-                case 223:
-                    return checkDoStatement(node);
-                case 224:
-                    return checkWhileStatement(node);
-                case 225:
-                    return checkForStatement(node);
-                case 226:
-                    return checkForInStatement(node);
-                case 227:
-                    return checkForOfStatement(node);
-                case 228:
-                case 229:
-                    return checkBreakOrContinueStatement(node);
-                case 230:
-                    return checkReturnStatement(node);
-                case 231:
-                    return checkWithStatement(node);
-                case 232:
-                    return checkSwitchStatement(node);
-                case 233:
-                    return checkLabeledStatement(node);
-                case 234:
-                    return checkThrowStatement(node);
-                case 235:
-                    return checkTryStatement(node);
-                case 237:
-                    return checkVariableDeclaration(node);
-                case 186:
-                    return checkBindingElement(node);
                 case 240:
-                    return checkClassDeclaration(node);
-                case 241:
-                    return checkInterfaceDeclaration(node);
-                case 242:
-                    return checkTypeAliasDeclaration(node);
-                case 243:
-                    return checkEnumDeclaration(node);
-                case 244:
-                    return checkModuleDeclaration(node);
-                case 249:
-                    return checkImportDeclaration(node);
-                case 248:
-                    return checkImportEqualsDeclaration(node);
-                case 255:
-                    return checkExportDeclaration(node);
-                case 254:
-                    return checkExportAssignment(node);
+                    return checkFunctionDeclaration(node);
+                case 219:
+                case 246:
+                    return checkBlock(node);
                 case 220:
+                    return checkVariableStatement(node);
+                case 222:
+                    return checkExpressionStatement(node);
+                case 223:
+                    return checkIfStatement(node);
+                case 224:
+                    return checkDoStatement(node);
+                case 225:
+                    return checkWhileStatement(node);
+                case 226:
+                    return checkForStatement(node);
+                case 227:
+                    return checkForInStatement(node);
+                case 228:
+                    return checkForOfStatement(node);
+                case 229:
+                case 230:
+                    return checkBreakOrContinueStatement(node);
+                case 231:
+                    return checkReturnStatement(node);
+                case 232:
+                    return checkWithStatement(node);
+                case 233:
+                    return checkSwitchStatement(node);
+                case 234:
+                    return checkLabeledStatement(node);
+                case 235:
+                    return checkThrowStatement(node);
                 case 236:
+                    return checkTryStatement(node);
+                case 238:
+                    return checkVariableDeclaration(node);
+                case 187:
+                    return checkBindingElement(node);
+                case 241:
+                    return checkClassDeclaration(node);
+                case 242:
+                    return checkInterfaceDeclaration(node);
+                case 243:
+                    return checkTypeAliasDeclaration(node);
+                case 244:
+                    return checkEnumDeclaration(node);
+                case 245:
+                    return checkModuleDeclaration(node);
+                case 250:
+                    return checkImportDeclaration(node);
+                case 249:
+                    return checkImportEqualsDeclaration(node);
+                case 256:
+                    return checkExportDeclaration(node);
+                case 255:
+                    return checkExportAssignment(node);
+                case 221:
+                case 237:
                     checkGrammarStatementInAmbientContext(node);
                     return;
-                case 258:
+                case 259:
                     return checkMissingDeclaration(node);
             }
         }
@@ -48068,24 +49826,25 @@ var ts;
         function checkDeferredNode(node) {
             var saveCurrentNode = currentNode;
             currentNode = node;
+            instantiationCount = 0;
             switch (node.kind) {
-                case 196:
                 case 197:
+                case 198:
+                case 157:
                 case 156:
-                case 155:
                     checkFunctionExpressionOrObjectLiteralMethodDeferred(node);
                     break;
-                case 158:
                 case 159:
+                case 160:
                     checkAccessorDeclaration(node);
                     break;
-                case 209:
+                case 210:
                     checkClassExpressionDeferred(node);
                     break;
-                case 261:
+                case 262:
                     checkJsxSelfClosingElementDeferred(node);
                     break;
-                case 260:
+                case 261:
                     checkJsxElementDeferred(node);
                     break;
             }
@@ -48199,27 +49958,27 @@ var ts;
                         copySymbols(location.locals, meaning);
                     }
                     switch (location.kind) {
-                        case 284:
+                        case 285:
                             if (!ts.isExternalOrCommonJsModule(location))
                                 break;
-                        case 244:
+                        case 245:
                             copySymbols(getSymbolOfNode(location).exports, meaning & 2623475);
                             break;
-                        case 243:
+                        case 244:
                             copySymbols(getSymbolOfNode(location).exports, meaning & 8);
                             break;
-                        case 209:
+                        case 210:
                             var className = location.name;
                             if (className) {
                                 copySymbol(location.symbol, meaning);
                             }
-                        case 240:
                         case 241:
+                        case 242:
                             if (!isStatic) {
                                 copySymbols(getMembersOfSymbol(getSymbolOfNode(location)), meaning & 67897832);
                             }
                             break;
-                        case 196:
+                        case 197:
                             var funcName = location.name;
                             if (funcName) {
                                 copySymbol(location.symbol, meaning);
@@ -48251,33 +50010,33 @@ var ts;
             }
         }
         function isTypeDeclarationName(name) {
-            return name.kind === 72 &&
+            return name.kind === 73 &&
                 isTypeDeclaration(name.parent) &&
                 name.parent.name === name;
         }
         function isTypeDeclaration(node) {
             switch (node.kind) {
-                case 150:
-                case 240:
+                case 151:
                 case 241:
                 case 242:
                 case 243:
+                case 244:
                     return true;
                 default:
                     return false;
             }
         }
         function isTypeReferenceIdentifier(node) {
-            while (node.parent.kind === 148) {
+            while (node.parent.kind === 149) {
                 node = node.parent;
             }
-            return node.parent.kind === 164;
+            return node.parent.kind === 165;
         }
         function isHeritageClauseElementIdentifier(node) {
-            while (node.parent.kind === 189) {
+            while (node.parent.kind === 190) {
                 node = node.parent;
             }
-            return node.parent.kind === 211;
+            return node.parent.kind === 212;
         }
         function forEachEnclosingClass(node, callback) {
             var result;
@@ -48305,13 +50064,13 @@ var ts;
             return !!forEachEnclosingClass(node, function (n) { return n === classDeclaration; });
         }
         function getLeftSideOfImportEqualsOrExportAssignment(nodeOnRightSide) {
-            while (nodeOnRightSide.parent.kind === 148) {
+            while (nodeOnRightSide.parent.kind === 149) {
                 nodeOnRightSide = nodeOnRightSide.parent;
             }
-            if (nodeOnRightSide.parent.kind === 248) {
+            if (nodeOnRightSide.parent.kind === 249) {
                 return nodeOnRightSide.parent.moduleReference === nodeOnRightSide ? nodeOnRightSide.parent : undefined;
             }
-            if (nodeOnRightSide.parent.kind === 254) {
+            if (nodeOnRightSide.parent.kind === 255) {
                 return nodeOnRightSide.parent.expression === nodeOnRightSide ? nodeOnRightSide.parent : undefined;
             }
             return undefined;
@@ -48337,7 +50096,7 @@ var ts;
                 node = parent;
                 parent = parent.parent;
             }
-            if (parent && parent.kind === 183 && parent.qualifier === node) {
+            if (parent && parent.kind === 184 && parent.qualifier === node) {
                 return parent;
             }
             return undefined;
@@ -48347,21 +50106,21 @@ var ts;
                 return getSymbolOfNode(entityName.parent);
             }
             if (ts.isInJSFile(entityName) &&
-                entityName.parent.kind === 189 &&
+                entityName.parent.kind === 190 &&
                 entityName.parent === entityName.parent.parent.left) {
                 var specialPropertyAssignmentSymbol = getSpecialPropertyAssignmentSymbolFromEntityName(entityName);
                 if (specialPropertyAssignmentSymbol) {
                     return specialPropertyAssignmentSymbol;
                 }
             }
-            if (entityName.parent.kind === 254 && ts.isEntityNameExpression(entityName)) {
+            if (entityName.parent.kind === 255 && ts.isEntityNameExpression(entityName)) {
                 var success = resolveEntityName(entityName, 67220415 | 67897832 | 1920 | 2097152, true);
                 if (success && success !== unknownSymbol) {
                     return success;
                 }
             }
             else if (!ts.isPropertyAccessExpression(entityName) && isInRightSideOfImportOrExportAssignment(entityName)) {
-                var importEqualsDeclaration = ts.getAncestor(entityName, 248);
+                var importEqualsDeclaration = ts.getAncestor(entityName, 249);
                 ts.Debug.assert(importEqualsDeclaration !== undefined);
                 return getSymbolOfPartOfRightHandSideOfImportEquals(entityName, true);
             }
@@ -48378,7 +50137,7 @@ var ts;
             }
             if (isHeritageClauseElementIdentifier(entityName)) {
                 var meaning = 0;
-                if (entityName.parent.kind === 211) {
+                if (entityName.parent.kind === 212) {
                     meaning = 67897832;
                     if (ts.isExpressionWithTypeArgumentsInClassExtendsClause(entityName.parent)) {
                         meaning |= 67220415;
@@ -48393,10 +50152,10 @@ var ts;
                     return entityNameSymbol;
                 }
             }
-            if (entityName.parent.kind === 304) {
+            if (entityName.parent.kind === 306) {
                 return ts.getParameterSymbolFromJSDoc(entityName.parent);
             }
-            if (entityName.parent.kind === 150 && entityName.parent.parent.kind === 308) {
+            if (entityName.parent.kind === 151 && entityName.parent.parent.kind === 310) {
                 ts.Debug.assert(!ts.isInJSFile(entityName));
                 var typeParameter = ts.getTypeParameterFromJsDoc(entityName.parent);
                 return typeParameter && typeParameter.symbol;
@@ -48405,19 +50164,19 @@ var ts;
                 if (ts.nodeIsMissing(entityName)) {
                     return undefined;
                 }
-                if (entityName.kind === 72) {
+                if (entityName.kind === 73) {
                     if (ts.isJSXTagName(entityName) && isJsxIntrinsicIdentifier(entityName)) {
                         var symbol = getIntrinsicTagSymbol(entityName.parent);
                         return symbol === unknownSymbol ? undefined : symbol;
                     }
                     return resolveEntityName(entityName, 67220415, false, true);
                 }
-                else if (entityName.kind === 189 || entityName.kind === 148) {
+                else if (entityName.kind === 190 || entityName.kind === 149) {
                     var links = getNodeLinks(entityName);
                     if (links.resolvedSymbol) {
                         return links.resolvedSymbol;
                     }
-                    if (entityName.kind === 189) {
+                    if (entityName.kind === 190) {
                         checkPropertyAccessExpression(entityName);
                     }
                     else {
@@ -48427,16 +50186,16 @@ var ts;
                 }
             }
             else if (isTypeReferenceIdentifier(entityName)) {
-                var meaning = entityName.parent.kind === 164 ? 67897832 : 1920;
+                var meaning = entityName.parent.kind === 165 ? 67897832 : 1920;
                 return resolveEntityName(entityName, meaning, false, true);
             }
-            if (entityName.parent.kind === 163) {
+            if (entityName.parent.kind === 164) {
                 return resolveEntityName(entityName, 1);
             }
             return undefined;
         }
         function getSymbolAtLocation(node) {
-            if (node.kind === 284) {
+            if (node.kind === 285) {
                 return ts.isExternalModule(node) ? getMergedSymbol(node.symbol) : undefined;
             }
             var parent = node.parent;
@@ -48453,12 +50212,12 @@ var ts;
             else if (ts.isLiteralComputedPropertyDeclarationName(node)) {
                 return getSymbolOfNode(parent.parent);
             }
-            if (node.kind === 72) {
+            if (node.kind === 73) {
                 if (isInRightSideOfImportOrExportAssignment(node)) {
                     return getSymbolOfEntityNameOrPropertyAccessExpression(node);
                 }
-                else if (parent.kind === 186 &&
-                    grandParent.kind === 184 &&
+                else if (parent.kind === 187 &&
+                    grandParent.kind === 185 &&
                     node === parent.propertyName) {
                     var typeOfPattern = getTypeOfNode(grandParent);
                     var propertyDeclaration = getPropertyOfType(typeOfPattern, node.escapedText);
@@ -48468,11 +50227,11 @@ var ts;
                 }
             }
             switch (node.kind) {
-                case 72:
-                case 189:
-                case 148:
+                case 73:
+                case 190:
+                case 149:
                     return getSymbolOfEntityNameOrPropertyAccessExpression(node);
-                case 100:
+                case 101:
                     var container = ts.getThisContainer(node, false);
                     if (ts.isFunctionLike(container)) {
                         var sig = getSignatureFromDeclaration(container);
@@ -48483,20 +50242,20 @@ var ts;
                     if (ts.isInExpressionContext(node)) {
                         return checkExpression(node).symbol;
                     }
-                case 178:
+                case 179:
                     return getTypeFromThisTypeNode(node).symbol;
-                case 98:
+                case 99:
                     return checkExpression(node).symbol;
-                case 124:
+                case 125:
                     var constructorDeclaration = node.parent;
-                    if (constructorDeclaration && constructorDeclaration.kind === 157) {
+                    if (constructorDeclaration && constructorDeclaration.kind === 158) {
                         return constructorDeclaration.parent.symbol;
                     }
                     return undefined;
                 case 10:
                 case 14:
                     if ((ts.isExternalModuleImportEqualsDeclaration(node.parent.parent) && ts.getExternalModuleImportEqualsDeclarationExpression(node.parent.parent) === node) ||
-                        ((node.parent.kind === 249 || node.parent.kind === 255) && node.parent.moduleSpecifier === node) ||
+                        ((node.parent.kind === 250 || node.parent.kind === 256) && node.parent.moduleSpecifier === node) ||
                         ((ts.isInJSFile(node) && ts.isRequireCall(node.parent, false)) || ts.isImportCall(node.parent)) ||
                         (ts.isLiteralTypeNode(node.parent) && ts.isLiteralImportTypeNode(node.parent.parent) && node.parent.parent.argument === node.parent)) {
                         return resolveExternalModuleName(node, node);
@@ -48511,21 +50270,21 @@ var ts;
                             ? getTypeFromTypeNode(grandParent.objectType)
                             : undefined;
                     return objectType && getPropertyOfType(objectType, ts.escapeLeadingUnderscores(node.text));
-                case 80:
-                case 90:
+                case 81:
+                case 91:
                 case 37:
-                case 76:
+                case 77:
                     return getSymbolOfNode(node.parent);
-                case 183:
+                case 184:
                     return ts.isLiteralImportTypeNode(node) ? getSymbolAtLocation(node.argument.literal) : undefined;
-                case 85:
+                case 86:
                     return ts.isExportAssignment(node.parent) ? ts.Debug.assertDefined(node.parent.symbol) : undefined;
                 default:
                     return undefined;
             }
         }
         function getShorthandAssignmentValueSymbol(location) {
-            if (location && location.kind === 276) {
+            if (location && location.kind === 277) {
                 return resolveEntityName(location.name, 67220415 | 2097152);
             }
             return undefined;
@@ -48580,27 +50339,29 @@ var ts;
             }
             return errorType;
         }
-        function getTypeOfArrayLiteralOrObjectLiteralDestructuringAssignment(expr) {
-            ts.Debug.assert(expr.kind === 188 || expr.kind === 187);
-            if (expr.parent.kind === 227) {
+        function getTypeOfAssignmentPattern(expr) {
+            ts.Debug.assert(expr.kind === 189 || expr.kind === 188);
+            if (expr.parent.kind === 228) {
                 var iteratedType = checkRightHandSideOfForOf(expr.parent.expression, expr.parent.awaitModifier);
                 return checkDestructuringAssignment(expr, iteratedType || errorType);
             }
-            if (expr.parent.kind === 204) {
+            if (expr.parent.kind === 205) {
                 var iteratedType = getTypeOfExpression(expr.parent.right);
                 return checkDestructuringAssignment(expr, iteratedType || errorType);
             }
-            if (expr.parent.kind === 275) {
-                var typeOfParentObjectLiteral = getTypeOfArrayLiteralOrObjectLiteralDestructuringAssignment(expr.parent.parent);
-                return checkObjectLiteralDestructuringPropertyAssignment(typeOfParentObjectLiteral || errorType, expr.parent);
+            if (expr.parent.kind === 276) {
+                var node_3 = ts.cast(expr.parent.parent, ts.isObjectLiteralExpression);
+                var typeOfParentObjectLiteral = getTypeOfAssignmentPattern(node_3) || errorType;
+                var propertyIndex = ts.indexOfNode(node_3.properties, expr.parent);
+                return checkObjectLiteralDestructuringPropertyAssignment(node_3, typeOfParentObjectLiteral, propertyIndex);
             }
-            ts.Debug.assert(expr.parent.kind === 187);
-            var typeOfArrayLiteral = getTypeOfArrayLiteralOrObjectLiteralDestructuringAssignment(expr.parent);
-            var elementType = checkIteratedTypeOrElementType(typeOfArrayLiteral || errorType, expr.parent, false, false) || errorType;
-            return checkArrayLiteralDestructuringElementAssignment(expr.parent, typeOfArrayLiteral, expr.parent.elements.indexOf(expr), elementType || errorType);
+            var node = ts.cast(expr.parent, ts.isArrayLiteralExpression);
+            var typeOfArrayLiteral = getTypeOfAssignmentPattern(node) || errorType;
+            var elementType = checkIteratedTypeOrElementType(65, typeOfArrayLiteral, undefinedType, expr.parent) || errorType;
+            return checkArrayLiteralDestructuringElementAssignment(node, typeOfArrayLiteral, node.elements.indexOf(expr), elementType);
         }
         function getPropertySymbolOfDestructuringAssignment(location) {
-            var typeOfObjectLiteral = getTypeOfArrayLiteralOrObjectLiteralDestructuringAssignment(location.parent.parent);
+            var typeOfObjectLiteral = getTypeOfAssignmentPattern(ts.cast(location.parent.parent, ts.isAssignmentPattern));
             return typeOfObjectLiteral && getPropertyOfType(typeOfObjectLiteral, location.escapedText);
         }
         function getRegularTypeOfExpression(expr) {
@@ -48618,12 +50379,12 @@ var ts;
         function getClassElementPropertyKeyType(element) {
             var name = element.name;
             switch (name.kind) {
-                case 72:
+                case 73:
                     return getLiteralType(ts.idText(name));
                 case 8:
                 case 10:
                     return getLiteralType(name.text);
-                case 149:
+                case 150:
                     var nameType = checkComputedPropertyName(name);
                     return isTypeAssignableToKind(nameType, 12288) ? nameType : stringType;
                 default:
@@ -48677,7 +50438,7 @@ var ts;
             if (!ts.isGeneratedIdentifier(nodeIn)) {
                 var node = ts.getParseTreeNode(nodeIn, ts.isIdentifier);
                 if (node) {
-                    var isPropertyName_1 = node.parent.kind === 189 && node.parent.name === node;
+                    var isPropertyName_1 = node.parent.kind === 190 && node.parent.name === node;
                     return !isPropertyName_1 && getReferencedValueSymbol(node) === argumentsSymbol;
                 }
             }
@@ -48719,7 +50480,7 @@ var ts;
                     }
                     var parentSymbol_1 = getParentOfSymbol(symbol);
                     if (parentSymbol_1) {
-                        if (parentSymbol_1.flags & 512 && parentSymbol_1.valueDeclaration.kind === 284) {
+                        if (parentSymbol_1.flags & 512 && parentSymbol_1.valueDeclaration.kind === 285) {
                             var symbolFile = parentSymbol_1.valueDeclaration;
                             var referenceFile = ts.getSourceFileOfNode(node);
                             var symbolIsUmdExport = symbolFile !== referenceFile;
@@ -48740,12 +50501,16 @@ var ts;
             }
             return undefined;
         }
+        function isSymbolOfDestructuredElementOfCatchBinding(symbol) {
+            return ts.isBindingElement(symbol.valueDeclaration)
+                && ts.walkUpBindingElementsAndPatterns(symbol.valueDeclaration).parent.kind === 275;
+        }
         function isSymbolOfDeclarationWithCollidingName(symbol) {
-            if (symbol.flags & 418) {
+            if (symbol.flags & 418 && !ts.isSourceFile(symbol.valueDeclaration)) {
                 var links = getSymbolLinks(symbol);
                 if (links.isDeclarationWithCollidingName === undefined) {
                     var container = ts.getEnclosingBlockScopeContainer(symbol.valueDeclaration);
-                    if (ts.isStatementWithLocals(container)) {
+                    if (ts.isStatementWithLocals(container) || isSymbolOfDestructuredElementOfCatchBinding(symbol)) {
                         var nodeLinks_1 = getNodeLinks(symbol.valueDeclaration);
                         if (resolveName(container.parent, symbol.escapedName, 67220415, undefined, undefined, false)) {
                             links.isDeclarationWithCollidingName = true;
@@ -48753,7 +50518,7 @@ var ts;
                         else if (nodeLinks_1.flags & 262144) {
                             var isDeclaredInLoop = nodeLinks_1.flags & 524288;
                             var inLoopInitializer = ts.isIterationStatement(container, false);
-                            var inLoopBodyBlock = container.kind === 218 && ts.isIterationStatement(container.parent, false);
+                            var inLoopBodyBlock = container.kind === 219 && ts.isIterationStatement(container.parent, false);
                             links.isDeclarationWithCollidingName = !ts.isBlockScopedContainerTopLevel(container) && (!isDeclaredInLoop || (!inLoopInitializer && !inLoopBodyBlock));
                         }
                         else {
@@ -48789,18 +50554,18 @@ var ts;
         }
         function isValueAliasDeclaration(node) {
             switch (node.kind) {
-                case 248:
-                case 250:
+                case 249:
                 case 251:
-                case 253:
-                case 257:
+                case 252:
+                case 254:
+                case 258:
                     return isAliasResolvedToValue(getSymbolOfNode(node) || unknownSymbol);
-                case 255:
+                case 256:
                     var exportClause = node.exportClause;
                     return !!exportClause && ts.some(exportClause.elements, isValueAliasDeclaration);
-                case 254:
+                case 255:
                     return node.expression
-                        && node.expression.kind === 72
+                        && node.expression.kind === 73
                         ? isAliasResolvedToValue(getSymbolOfNode(node) || unknownSymbol)
                         : true;
             }
@@ -48808,7 +50573,7 @@ var ts;
         }
         function isTopLevelValueImportEqualsWithEntityName(nodeIn) {
             var node = ts.getParseTreeNode(nodeIn, ts.isImportEqualsDeclaration);
-            if (node === undefined || node.parent.kind !== 284 || !ts.isInternalModuleImportEqualsDeclaration(node)) {
+            if (node === undefined || node.parent.kind !== 285 || !ts.isInternalModuleImportEqualsDeclaration(node)) {
                 return false;
             }
             var isValue = isAliasResolvedToValue(getSymbolOfNode(node));
@@ -48894,15 +50659,15 @@ var ts;
         }
         function canHaveConstantValue(node) {
             switch (node.kind) {
-                case 278:
-                case 189:
+                case 279:
                 case 190:
+                case 191:
                     return true;
             }
             return false;
         }
         function getConstantValue(node) {
-            if (node.kind === 278) {
+            if (node.kind === 279) {
                 return getEnumMemberValue(node);
             }
             var symbol = getNodeLinks(node).resolvedSymbol;
@@ -48982,7 +50747,7 @@ var ts;
         function createTypeOfDeclaration(declarationIn, enclosingDeclaration, flags, tracker, addUndefined) {
             var declaration = ts.getParseTreeNode(declarationIn, ts.isVariableLikeOrAccessor);
             if (!declaration) {
-                return ts.createToken(120);
+                return ts.createToken(121);
             }
             var symbol = getSymbolOfNode(declaration);
             var type = symbol && !(symbol.flags & (2048 | 131072))
@@ -49000,7 +50765,7 @@ var ts;
         function createReturnTypeOfSignatureDeclaration(signatureDeclarationIn, enclosingDeclaration, flags, tracker) {
             var signatureDeclaration = ts.getParseTreeNode(signatureDeclarationIn, ts.isFunctionLike);
             if (!signatureDeclaration) {
-                return ts.createToken(120);
+                return ts.createToken(121);
             }
             var signature = getSignatureFromDeclaration(signatureDeclaration);
             return nodeBuilder.typeToTypeNode(getReturnTypeOfSignature(signature), enclosingDeclaration, flags | 1024, tracker);
@@ -49008,7 +50773,7 @@ var ts;
         function createTypeOfExpression(exprIn, enclosingDeclaration, flags, tracker) {
             var expr = ts.getParseTreeNode(exprIn, ts.isExpression);
             if (!expr) {
-                return ts.createToken(120);
+                return ts.createToken(121);
             }
             var type = getWidenedType(getRegularTypeOfExpression(expr));
             return nodeBuilder.typeToTypeNode(type, enclosingDeclaration, flags | 1024, tracker);
@@ -49118,17 +50883,17 @@ var ts;
                 isLateBound: function (nodeIn) {
                     var node = ts.getParseTreeNode(nodeIn, ts.isDeclaration);
                     var symbol = node && getSymbolOfNode(node);
-                    return !!(symbol && ts.getCheckFlags(symbol) & 2048);
+                    return !!(symbol && ts.getCheckFlags(symbol) & 4096);
                 },
                 getJsxFactoryEntity: function (location) { return location ? (getJsxNamespace(location), (ts.getSourceFileOfNode(location).localJsxFactory || _jsxFactoryEntity)) : _jsxFactoryEntity; },
                 getAllAccessorDeclarations: function (accessor) {
                     accessor = ts.getParseTreeNode(accessor, ts.isGetOrSetAccessorDeclaration);
-                    var otherKind = accessor.kind === 159 ? 158 : 159;
+                    var otherKind = accessor.kind === 160 ? 159 : 160;
                     var otherAccessor = ts.getDeclarationOfKind(getSymbolOfNode(accessor), otherKind);
                     var firstAccessor = otherAccessor && (otherAccessor.pos < accessor.pos) ? otherAccessor : accessor;
                     var secondAccessor = otherAccessor && (otherAccessor.pos < accessor.pos) ? accessor : otherAccessor;
-                    var setAccessor = accessor.kind === 159 ? accessor : otherAccessor;
-                    var getAccessor = accessor.kind === 158 ? accessor : otherAccessor;
+                    var setAccessor = accessor.kind === 160 ? accessor : otherAccessor;
+                    var getAccessor = accessor.kind === 159 ? accessor : otherAccessor;
                     return {
                         firstAccessor: firstAccessor,
                         secondAccessor: secondAccessor,
@@ -49144,14 +50909,14 @@ var ts;
                 }
             };
             function isInHeritageClause(node) {
-                return node.parent && node.parent.kind === 211 && node.parent.parent && node.parent.parent.kind === 273;
+                return node.parent && node.parent.kind === 212 && node.parent.parent && node.parent.parent.kind === 274;
             }
             function getTypeReferenceDirectivesForEntityName(node) {
                 if (!fileToDirective) {
                     return undefined;
                 }
                 var meaning = 67897832 | 1920;
-                if ((node.kind === 72 && isInTypeQuery(node)) || (node.kind === 189 && !isInHeritageClause(node))) {
+                if ((node.kind === 73 && isInTypeQuery(node)) || (node.kind === 190 && !isInHeritageClause(node))) {
                     meaning = 67220415 | 1048576;
                 }
                 var symbol = resolveEntityName(node, meaning, true);
@@ -49194,7 +50959,7 @@ var ts;
                         break;
                     }
                 }
-                if (current.valueDeclaration && current.valueDeclaration.kind === 284 && current.flags & 512) {
+                if (current.valueDeclaration && current.valueDeclaration.kind === 285 && current.flags & 512) {
                     return false;
                 }
                 for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
@@ -49221,12 +50986,12 @@ var ts;
             }
         }
         function getExternalModuleFileFromDeclaration(declaration) {
-            var specifier = declaration.kind === 244 ? ts.tryCast(declaration.name, ts.isStringLiteral) : ts.getExternalModuleName(declaration);
+            var specifier = declaration.kind === 245 ? ts.tryCast(declaration.name, ts.isStringLiteral) : ts.getExternalModuleName(declaration);
             var moduleSymbol = resolveExternalModuleNameWorker(specifier, specifier, undefined);
             if (!moduleSymbol) {
                 return undefined;
             }
-            return ts.getDeclarationOfKind(moduleSymbol, 284);
+            return ts.getDeclarationOfKind(moduleSymbol, 285);
         }
         function initializeTypeChecker() {
             for (var _i = 0, _a = host.getSourceFiles(); _i < _a.length; _i++) {
@@ -49241,6 +51006,13 @@ var ts;
                     continue;
                 }
                 if (!ts.isExternalOrCommonJsModule(file)) {
+                    var fileGlobalThisSymbol = file.locals.get("globalThis");
+                    if (fileGlobalThisSymbol) {
+                        for (var _d = 0, _e = fileGlobalThisSymbol.declarations; _d < _e.length; _d++) {
+                            var declaration = _e[_d];
+                            diagnostics.add(ts.createDiagnosticForNode(declaration, ts.Diagnostics.Declaration_name_conflicts_with_built_in_global_identifier_0, "globalThis"));
+                        }
+                    }
                     mergeSymbolTable(globals, file.locals);
                 }
                 if (file.jsGlobalAugmentations) {
@@ -49262,10 +51034,10 @@ var ts;
                 }
             }
             if (augmentations) {
-                for (var _d = 0, augmentations_1 = augmentations; _d < augmentations_1.length; _d++) {
-                    var list = augmentations_1[_d];
-                    for (var _e = 0, list_1 = list; _e < list_1.length; _e++) {
-                        var augmentation = list_1[_e];
+                for (var _f = 0, augmentations_1 = augmentations; _f < augmentations_1.length; _f++) {
+                    var list = augmentations_1[_f];
+                    for (var _g = 0, list_1 = list; _g < list_1.length; _g++) {
+                        var augmentation = list_1[_g];
                         if (!ts.isGlobalScopeAugmentation(augmentation.parent))
                             continue;
                         mergeModuleAugmentation(augmentation);
@@ -49276,6 +51048,7 @@ var ts;
             getSymbolLinks(undefinedSymbol).type = undefinedWideningType;
             getSymbolLinks(argumentsSymbol).type = getGlobalType("IArguments", 0, true);
             getSymbolLinks(unknownSymbol).type = errorType;
+            getSymbolLinks(globalThisSymbol).type = createObjectType(16, globalThisSymbol);
             globalArrayType = getGlobalType("Array", 1, true);
             globalObjectType = getGlobalType("Object", 0, true);
             globalFunctionType = getGlobalType("Function", 0, true);
@@ -49290,14 +51063,14 @@ var ts;
             if (autoArrayType === emptyObjectType) {
                 autoArrayType = createAnonymousType(undefined, emptySymbols, ts.emptyArray, ts.emptyArray, undefined, undefined);
             }
-            globalReadonlyArrayType = getGlobalTypeOrUndefined("ReadonlyArray", 1);
+            globalReadonlyArrayType = getGlobalTypeOrUndefined("ReadonlyArray", 1) || globalArrayType;
             anyReadonlyArrayType = globalReadonlyArrayType ? createTypeFromGenericGlobalType(globalReadonlyArrayType, [anyType]) : anyArrayType;
             globalThisType = getGlobalTypeOrUndefined("ThisType", 1);
             if (augmentations) {
-                for (var _f = 0, augmentations_2 = augmentations; _f < augmentations_2.length; _f++) {
-                    var list = augmentations_2[_f];
-                    for (var _g = 0, list_2 = list; _g < list_2.length; _g++) {
-                        var augmentation = list_2[_g];
+                for (var _h = 0, augmentations_2 = augmentations; _h < augmentations_2.length; _h++) {
+                    var list = augmentations_2[_h];
+                    for (var _j = 0, list_2 = list; _j < list_2.length; _j++) {
+                        var augmentation = list_2[_j];
                         if (ts.isGlobalScopeAugmentation(augmentation.parent))
                             continue;
                         mergeModuleAugmentation(augmentation);
@@ -49322,8 +51095,8 @@ var ts;
                 }
                 else {
                     var list = ts.arrayFrom(conflictingSymbols.keys()).join(", ");
-                    diagnostics.add(addRelatedInfo(ts.createDiagnosticForNode(firstFile, ts.Diagnostics.Definitions_of_the_following_identifiers_conflict_with_those_in_another_file_Colon_0, list), ts.createDiagnosticForNode(secondFile, ts.Diagnostics.Conflicts_are_in_this_file)));
-                    diagnostics.add(addRelatedInfo(ts.createDiagnosticForNode(secondFile, ts.Diagnostics.Definitions_of_the_following_identifiers_conflict_with_those_in_another_file_Colon_0, list), ts.createDiagnosticForNode(firstFile, ts.Diagnostics.Conflicts_are_in_this_file)));
+                    diagnostics.add(ts.addRelatedInfo(ts.createDiagnosticForNode(firstFile, ts.Diagnostics.Definitions_of_the_following_identifiers_conflict_with_those_in_another_file_Colon_0, list), ts.createDiagnosticForNode(secondFile, ts.Diagnostics.Conflicts_are_in_this_file)));
+                    diagnostics.add(ts.addRelatedInfo(ts.createDiagnosticForNode(secondFile, ts.Diagnostics.Definitions_of_the_following_identifiers_conflict_with_those_in_another_file_Colon_0, list), ts.createDiagnosticForNode(firstFile, ts.Diagnostics.Conflicts_are_in_this_file)));
                 }
             });
             amalgamatedDuplicates = undefined;
@@ -49335,7 +51108,7 @@ var ts;
                     var helpersModule = resolveHelpersModule(sourceFile, location);
                     if (helpersModule !== unknownSymbol) {
                         var uncheckedHelpers = helpers & ~requestedExternalEmitHelpers;
-                        for (var helper = 1; helper <= 65536; helper <<= 1) {
+                        for (var helper = 1; helper <= 131072; helper <<= 1) {
                             if (uncheckedHelpers & helper) {
                                 var name = getHelperName(helper);
                                 var symbol = getSymbol(helpersModule.exports, ts.escapeLeadingUnderscores(name), 67220415);
@@ -49362,12 +51135,13 @@ var ts;
                 case 256: return "__values";
                 case 512: return "__read";
                 case 1024: return "__spread";
-                case 2048: return "__await";
-                case 4096: return "__asyncGenerator";
-                case 8192: return "__asyncDelegator";
-                case 16384: return "__asyncValues";
-                case 32768: return "__exportStar";
-                case 65536: return "__makeTemplateObject";
+                case 2048: return "__spreadArrays";
+                case 4096: return "__await";
+                case 8192: return "__asyncGenerator";
+                case 16384: return "__asyncDelegator";
+                case 32768: return "__asyncValues";
+                case 65536: return "__exportStar";
+                case 131072: return "__makeTemplateObject";
                 default: return ts.Debug.fail("Unrecognized helper");
             }
         }
@@ -49385,14 +51159,14 @@ var ts;
                 return false;
             }
             if (!ts.nodeCanBeDecorated(node, node.parent, node.parent.parent)) {
-                if (node.kind === 156 && !ts.nodeIsPresent(node.body)) {
+                if (node.kind === 157 && !ts.nodeIsPresent(node.body)) {
                     return grammarErrorOnFirstToken(node, ts.Diagnostics.A_decorator_can_only_decorate_a_method_implementation_not_an_overload);
                 }
                 else {
                     return grammarErrorOnFirstToken(node, ts.Diagnostics.Decorators_are_not_valid_here);
                 }
             }
-            else if (node.kind === 158 || node.kind === 159) {
+            else if (node.kind === 159 || node.kind === 160) {
                 var accessors = ts.getAllAccessorDeclarations(node.parent.members, node);
                 if (accessors.firstAccessor.decorators && node === accessors.secondAccessor) {
                     return grammarErrorOnFirstToken(node, ts.Diagnostics.Decorators_cannot_be_applied_to_multiple_get_Slashset_accessors_of_the_same_name);
@@ -49409,23 +51183,23 @@ var ts;
             var flags = 0;
             for (var _i = 0, _a = node.modifiers; _i < _a.length; _i++) {
                 var modifier = _a[_i];
-                if (modifier.kind !== 133) {
-                    if (node.kind === 153 || node.kind === 155) {
+                if (modifier.kind !== 134) {
+                    if (node.kind === 154 || node.kind === 156) {
                         return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_type_member, ts.tokenToString(modifier.kind));
                     }
-                    if (node.kind === 162) {
+                    if (node.kind === 163) {
                         return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_an_index_signature, ts.tokenToString(modifier.kind));
                     }
                 }
                 switch (modifier.kind) {
-                    case 77:
-                        if (node.kind !== 243) {
-                            return grammarErrorOnNode(node, ts.Diagnostics.A_class_member_cannot_have_the_0_keyword, ts.tokenToString(77));
+                    case 78:
+                        if (node.kind !== 244) {
+                            return grammarErrorOnNode(node, ts.Diagnostics.A_class_member_cannot_have_the_0_keyword, ts.tokenToString(78));
                         }
                         break;
+                    case 116:
                     case 115:
                     case 114:
-                    case 113:
                         var text = visibilityToString(ts.modifierToFlag(modifier.kind));
                         if (flags & 28) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics.Accessibility_modifier_already_seen);
@@ -49439,11 +51213,11 @@ var ts;
                         else if (flags & 256) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, text, "async");
                         }
-                        else if (node.parent.kind === 245 || node.parent.kind === 284) {
+                        else if (node.parent.kind === 246 || node.parent.kind === 285) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_module_or_namespace_element, text);
                         }
                         else if (flags & 128) {
-                            if (modifier.kind === 113) {
+                            if (modifier.kind === 114) {
                                 return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_with_1_modifier, text, "abstract");
                             }
                             else {
@@ -49452,7 +51226,7 @@ var ts;
                         }
                         flags |= ts.modifierToFlag(modifier.kind);
                         break;
-                    case 116:
+                    case 117:
                         if (flags & 32) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "static");
                         }
@@ -49462,10 +51236,10 @@ var ts;
                         else if (flags & 256) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, "static", "async");
                         }
-                        else if (node.parent.kind === 245 || node.parent.kind === 284) {
+                        else if (node.parent.kind === 246 || node.parent.kind === 285) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_module_or_namespace_element, "static");
                         }
-                        else if (node.kind === 151) {
+                        else if (node.kind === 152) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "static");
                         }
                         else if (flags & 128) {
@@ -49474,17 +51248,17 @@ var ts;
                         flags |= 32;
                         lastStatic = modifier;
                         break;
-                    case 133:
+                    case 134:
                         if (flags & 64) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "readonly");
                         }
-                        else if (node.kind !== 154 && node.kind !== 153 && node.kind !== 162 && node.kind !== 151) {
+                        else if (node.kind !== 155 && node.kind !== 154 && node.kind !== 163 && node.kind !== 152) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics.readonly_modifier_can_only_appear_on_a_property_declaration_or_index_signature);
                         }
                         flags |= 64;
                         lastReadonly = modifier;
                         break;
-                    case 85:
+                    case 86:
                         if (flags & 1) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "export");
                         }
@@ -49497,52 +51271,52 @@ var ts;
                         else if (flags & 256) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, "export", "async");
                         }
-                        else if (node.parent.kind === 240) {
+                        else if (node.parent.kind === 241) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_class_element, "export");
                         }
-                        else if (node.kind === 151) {
+                        else if (node.kind === 152) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "export");
                         }
                         flags |= 1;
                         break;
-                    case 80:
-                        var container = node.parent.kind === 284 ? node.parent : node.parent.parent;
-                        if (container.kind === 244 && !ts.isAmbientModule(container)) {
+                    case 81:
+                        var container = node.parent.kind === 285 ? node.parent : node.parent.parent;
+                        if (container.kind === 245 && !ts.isAmbientModule(container)) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics.A_default_export_can_only_be_used_in_an_ECMAScript_style_module);
                         }
                         flags |= 512;
                         break;
-                    case 125:
+                    case 126:
                         if (flags & 2) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "declare");
                         }
                         else if (flags & 256) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_in_an_ambient_context, "async");
                         }
-                        else if (node.parent.kind === 240) {
+                        else if (node.parent.kind === 241) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_class_element, "declare");
                         }
-                        else if (node.kind === 151) {
+                        else if (node.kind === 152) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "declare");
                         }
-                        else if ((node.parent.flags & 4194304) && node.parent.kind === 245) {
+                        else if ((node.parent.flags & 4194304) && node.parent.kind === 246) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics.A_declare_modifier_cannot_be_used_in_an_already_ambient_context);
                         }
                         flags |= 2;
                         lastDeclare = modifier;
                         break;
-                    case 118:
+                    case 119:
                         if (flags & 128) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "abstract");
                         }
-                        if (node.kind !== 240) {
-                            if (node.kind !== 156 &&
-                                node.kind !== 154 &&
-                                node.kind !== 158 &&
-                                node.kind !== 159) {
+                        if (node.kind !== 241) {
+                            if (node.kind !== 157 &&
+                                node.kind !== 155 &&
+                                node.kind !== 159 &&
+                                node.kind !== 160) {
                                 return grammarErrorOnNode(modifier, ts.Diagnostics.abstract_modifier_can_only_appear_on_a_class_method_or_property_declaration);
                             }
-                            if (!(node.parent.kind === 240 && ts.hasModifier(node.parent, 128))) {
+                            if (!(node.parent.kind === 241 && ts.hasModifier(node.parent, 128))) {
                                 return grammarErrorOnNode(modifier, ts.Diagnostics.Abstract_methods_can_only_appear_within_an_abstract_class);
                             }
                             if (flags & 32) {
@@ -49554,14 +51328,14 @@ var ts;
                         }
                         flags |= 128;
                         break;
-                    case 121:
+                    case 122:
                         if (flags & 256) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "async");
                         }
                         else if (flags & 2 || node.parent.flags & 4194304) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_in_an_ambient_context, "async");
                         }
-                        else if (node.kind === 151) {
+                        else if (node.kind === 152) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "async");
                         }
                         flags |= 256;
@@ -49569,7 +51343,7 @@ var ts;
                         break;
                 }
             }
-            if (node.kind === 157) {
+            if (node.kind === 158) {
                 if (flags & 32) {
                     return grammarErrorOnNode(lastStatic, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "static");
                 }
@@ -49584,13 +51358,13 @@ var ts;
                 }
                 return false;
             }
-            else if ((node.kind === 249 || node.kind === 248) && flags & 2) {
+            else if ((node.kind === 250 || node.kind === 249) && flags & 2) {
                 return grammarErrorOnNode(lastDeclare, ts.Diagnostics.A_0_modifier_cannot_be_used_with_an_import_declaration, "declare");
             }
-            else if (node.kind === 151 && (flags & 92) && ts.isBindingPattern(node.name)) {
+            else if (node.kind === 152 && (flags & 92) && ts.isBindingPattern(node.name)) {
                 return grammarErrorOnNode(node, ts.Diagnostics.A_parameter_property_may_not_be_declared_using_a_binding_pattern);
             }
-            else if (node.kind === 151 && (flags & 92) && node.dotDotDotToken) {
+            else if (node.kind === 152 && (flags & 92) && node.dotDotDotToken) {
                 return grammarErrorOnNode(node, ts.Diagnostics.A_parameter_property_cannot_be_declared_using_a_rest_parameter);
             }
             if (flags & 256) {
@@ -49607,38 +51381,38 @@ var ts;
         }
         function shouldReportBadModifier(node) {
             switch (node.kind) {
-                case 158:
                 case 159:
-                case 157:
-                case 154:
-                case 153:
-                case 156:
+                case 160:
+                case 158:
                 case 155:
-                case 162:
-                case 244:
+                case 154:
+                case 157:
+                case 156:
+                case 163:
+                case 245:
+                case 250:
                 case 249:
-                case 248:
+                case 256:
                 case 255:
-                case 254:
-                case 196:
                 case 197:
-                case 151:
+                case 198:
+                case 152:
                     return false;
                 default:
-                    if (node.parent.kind === 245 || node.parent.kind === 284) {
+                    if (node.parent.kind === 246 || node.parent.kind === 285) {
                         return false;
                     }
                     switch (node.kind) {
-                        case 239:
-                            return nodeHasAnyModifiersExcept(node, 121);
                         case 240:
-                            return nodeHasAnyModifiersExcept(node, 118);
+                            return nodeHasAnyModifiersExcept(node, 122);
                         case 241:
-                        case 219:
+                            return nodeHasAnyModifiersExcept(node, 119);
                         case 242:
-                            return true;
+                        case 220:
                         case 243:
-                            return nodeHasAnyModifiersExcept(node, 77);
+                            return true;
+                        case 244:
+                            return nodeHasAnyModifiersExcept(node, 78);
                         default:
                             ts.Debug.fail();
                             return false;
@@ -49650,10 +51424,10 @@ var ts;
         }
         function checkGrammarAsyncModifier(node, asyncModifier) {
             switch (node.kind) {
-                case 156:
-                case 239:
-                case 196:
+                case 157:
+                case 240:
                 case 197:
+                case 198:
                     return false;
             }
             return grammarErrorOnNode(asyncModifier, ts.Diagnostics._0_modifier_cannot_be_used_here, "async");
@@ -49713,10 +51487,10 @@ var ts;
                     var nonSimpleParameters = getNonSimpleParameters(node.parameters);
                     if (ts.length(nonSimpleParameters)) {
                         ts.forEach(nonSimpleParameters, function (parameter) {
-                            addRelatedInfo(error(parameter, ts.Diagnostics.This_parameter_is_not_allowed_with_use_strict_directive), ts.createDiagnosticForNode(useStrictDirective_1, ts.Diagnostics.use_strict_directive_used_here));
+                            ts.addRelatedInfo(error(parameter, ts.Diagnostics.This_parameter_is_not_allowed_with_use_strict_directive), ts.createDiagnosticForNode(useStrictDirective_1, ts.Diagnostics.use_strict_directive_used_here));
                         });
                         var diagnostics_1 = nonSimpleParameters.map(function (parameter, index) { return (index === 0 ? ts.createDiagnosticForNode(parameter, ts.Diagnostics.Non_simple_parameter_declared_here) : ts.createDiagnosticForNode(parameter, ts.Diagnostics.and_here)); });
-                        addRelatedInfo.apply(void 0, [error(useStrictDirective_1, ts.Diagnostics.use_strict_directive_cannot_be_used_with_non_simple_parameter_list)].concat(diagnostics_1));
+                        ts.addRelatedInfo.apply(void 0, [error(useStrictDirective_1, ts.Diagnostics.use_strict_directive_cannot_be_used_with_non_simple_parameter_list)].concat(diagnostics_1));
                         return true;
                     }
                 }
@@ -49767,10 +51541,10 @@ var ts;
             if (!parameter.type) {
                 return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_must_have_a_type_annotation);
             }
-            if (parameter.type.kind !== 138 && parameter.type.kind !== 135) {
+            if (parameter.type.kind !== 139 && parameter.type.kind !== 136) {
                 var type = getTypeFromTypeNode(parameter.type);
                 if (type.flags & 4 || type.flags & 8) {
-                    return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_type_cannot_be_a_type_alias_Consider_writing_0_Colon_1_Colon_2_instead, ts.getTextOfNode(parameter.name), typeToString(type), typeToString(getTypeFromTypeNode(node.type)));
+                    return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_type_cannot_be_a_type_alias_Consider_writing_0_Colon_1_Colon_2_instead, ts.getTextOfNode(parameter.name), typeToString(type), typeToString(node.type ? getTypeFromTypeNode(node.type) : anyType));
                 }
                 if (type.flags & 1048576 && allTypesAssignableToKind(type, 128, true)) {
                     return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_type_cannot_be_a_union_type_Consider_using_a_mapped_object_type_instead);
@@ -49800,9 +51574,9 @@ var ts;
         }
         function checkGrammarForOmittedArgument(args) {
             if (args) {
-                for (var _i = 0, args_5 = args; _i < args_5.length; _i++) {
-                    var arg = args_5[_i];
-                    if (arg.kind === 210) {
+                for (var _i = 0, args_4 = args; _i < args_4.length; _i++) {
+                    var arg = args_4[_i];
+                    if (arg.kind === 211) {
                         return grammarErrorAtPos(arg, arg.pos, 0, ts.Diagnostics.Argument_expression_expected);
                     }
                 }
@@ -49832,7 +51606,7 @@ var ts;
             if (!checkGrammarDecoratorsAndModifiers(node) && node.heritageClauses) {
                 for (var _i = 0, _a = node.heritageClauses; _i < _a.length; _i++) {
                     var heritageClause = _a[_i];
-                    if (heritageClause.token === 86) {
+                    if (heritageClause.token === 87) {
                         if (seenExtendsClause) {
                             return grammarErrorOnFirstToken(heritageClause, ts.Diagnostics.extends_clause_already_seen);
                         }
@@ -49845,7 +51619,7 @@ var ts;
                         seenExtendsClause = true;
                     }
                     else {
-                        ts.Debug.assert(heritageClause.token === 109);
+                        ts.Debug.assert(heritageClause.token === 110);
                         if (seenImplementsClause) {
                             return grammarErrorOnFirstToken(heritageClause, ts.Diagnostics.implements_clause_already_seen);
                         }
@@ -49860,14 +51634,14 @@ var ts;
             if (node.heritageClauses) {
                 for (var _i = 0, _a = node.heritageClauses; _i < _a.length; _i++) {
                     var heritageClause = _a[_i];
-                    if (heritageClause.token === 86) {
+                    if (heritageClause.token === 87) {
                         if (seenExtendsClause) {
                             return grammarErrorOnFirstToken(heritageClause, ts.Diagnostics.extends_clause_already_seen);
                         }
                         seenExtendsClause = true;
                     }
                     else {
-                        ts.Debug.assert(heritageClause.token === 109);
+                        ts.Debug.assert(heritageClause.token === 110);
                         return grammarErrorOnFirstToken(heritageClause, ts.Diagnostics.Interface_declaration_cannot_have_implements_clause);
                     }
                     checkGrammarHeritageClause(heritageClause);
@@ -49876,20 +51650,20 @@ var ts;
             return false;
         }
         function checkGrammarComputedPropertyName(node) {
-            if (node.kind !== 149) {
+            if (node.kind !== 150) {
                 return false;
             }
             var computedPropertyName = node;
-            if (computedPropertyName.expression.kind === 204 && computedPropertyName.expression.operatorToken.kind === 27) {
+            if (computedPropertyName.expression.kind === 205 && computedPropertyName.expression.operatorToken.kind === 27) {
                 return grammarErrorOnNode(computedPropertyName.expression, ts.Diagnostics.A_comma_expression_is_not_allowed_in_a_computed_property_name);
             }
             return false;
         }
         function checkGrammarForGenerator(node) {
             if (node.asteriskToken) {
-                ts.Debug.assert(node.kind === 239 ||
-                    node.kind === 196 ||
-                    node.kind === 156);
+                ts.Debug.assert(node.kind === 240 ||
+                    node.kind === 197 ||
+                    node.kind === 157);
                 if (node.flags & 4194304) {
                     return grammarErrorOnNode(node.asteriskToken, ts.Diagnostics.Generators_are_not_allowed_in_an_ambient_context);
                 }
@@ -49908,40 +51682,46 @@ var ts;
             var seen = ts.createUnderscoreEscapedMap();
             for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
                 var prop = _a[_i];
-                if (prop.kind === 277) {
+                if (prop.kind === 278) {
+                    if (inDestructuring) {
+                        var expression = ts.skipParentheses(prop.expression);
+                        if (ts.isArrayLiteralExpression(expression) || ts.isObjectLiteralExpression(expression)) {
+                            return grammarErrorOnNode(prop.expression, ts.Diagnostics.A_rest_element_cannot_contain_a_binding_pattern);
+                        }
+                    }
                     continue;
                 }
                 var name = prop.name;
-                if (name.kind === 149) {
+                if (name.kind === 150) {
                     checkGrammarComputedPropertyName(name);
                 }
-                if (prop.kind === 276 && !inDestructuring && prop.objectAssignmentInitializer) {
+                if (prop.kind === 277 && !inDestructuring && prop.objectAssignmentInitializer) {
                     return grammarErrorOnNode(prop.equalsToken, ts.Diagnostics.can_only_be_used_in_an_object_literal_property_inside_a_destructuring_assignment);
                 }
                 if (prop.modifiers) {
                     for (var _b = 0, _c = prop.modifiers; _b < _c.length; _b++) {
                         var mod = _c[_b];
-                        if (mod.kind !== 121 || prop.kind !== 156) {
+                        if (mod.kind !== 122 || prop.kind !== 157) {
                             grammarErrorOnNode(mod, ts.Diagnostics._0_modifier_cannot_be_used_here, ts.getTextOfNode(mod));
                         }
                     }
                 }
                 var currentKind = void 0;
                 switch (prop.kind) {
-                    case 276:
+                    case 277:
                         checkGrammarForInvalidExclamationToken(prop.exclamationToken, ts.Diagnostics.A_definite_assignment_assertion_is_not_permitted_in_this_context);
-                    case 275:
+                    case 276:
                         checkGrammarForInvalidQuestionMark(prop.questionToken, ts.Diagnostics.An_object_member_cannot_be_declared_optional);
                         if (name.kind === 8) {
                             checkGrammarNumericLiteral(name);
                         }
-                    case 156:
+                    case 157:
                         currentKind = 1;
                         break;
-                    case 158:
+                    case 159:
                         currentKind = 2;
                         break;
-                    case 159:
+                    case 160:
                         currentKind = 4;
                         break;
                     default:
@@ -49978,7 +51758,7 @@ var ts;
             var seen = ts.createUnderscoreEscapedMap();
             for (var _i = 0, _a = node.attributes.properties; _i < _a.length; _i++) {
                 var attr = _a[_i];
-                if (attr.kind === 269) {
+                if (attr.kind === 270) {
                     continue;
                 }
                 var name = attr.name, initializer = attr.initializer;
@@ -49988,21 +51768,38 @@ var ts;
                 else {
                     return grammarErrorOnNode(name, ts.Diagnostics.JSX_elements_cannot_have_multiple_attributes_with_the_same_name);
                 }
-                if (initializer && initializer.kind === 270 && !initializer.expression) {
+                if (initializer && initializer.kind === 271 && !initializer.expression) {
                     return grammarErrorOnNode(initializer, ts.Diagnostics.JSX_attributes_must_only_be_assigned_a_non_empty_expression);
                 }
             }
         }
+        function checkGrammarJsxExpression(node) {
+            if (node.expression && ts.isCommaSequence(node.expression)) {
+                return grammarErrorOnNode(node.expression, ts.Diagnostics.JSX_expressions_may_not_use_the_comma_operator_Did_you_mean_to_write_an_array);
+            }
+        }
         function checkGrammarForInOrForOfStatement(forInOrOfStatement) {
             if (checkGrammarStatementInAmbientContext(forInOrOfStatement)) {
                 return true;
             }
-            if (forInOrOfStatement.kind === 227 && forInOrOfStatement.awaitModifier) {
+            if (forInOrOfStatement.kind === 228 && forInOrOfStatement.awaitModifier) {
                 if ((forInOrOfStatement.flags & 16384) === 0) {
-                    return grammarErrorOnNode(forInOrOfStatement.awaitModifier, ts.Diagnostics.A_for_await_of_statement_is_only_allowed_within_an_async_function_or_async_generator);
+                    var sourceFile = ts.getSourceFileOfNode(forInOrOfStatement);
+                    if (!hasParseDiagnostics(sourceFile)) {
+                        var diagnostic = ts.createDiagnosticForNode(forInOrOfStatement.awaitModifier, ts.Diagnostics.A_for_await_of_statement_is_only_allowed_within_an_async_function_or_async_generator);
+                        var func = ts.getContainingFunction(forInOrOfStatement);
+                        if (func && func.kind !== 158) {
+                            ts.Debug.assert((ts.getFunctionFlags(func) & 2) === 0, "Enclosing function should never be an async function.");
+                            var relatedInfo = ts.createDiagnosticForNode(func, ts.Diagnostics.Did_you_mean_to_mark_this_function_as_async);
+                            ts.addRelatedInfo(diagnostic, relatedInfo);
+                        }
+                        diagnostics.add(diagnostic);
+                        return true;
+                    }
+                    return false;
                 }
             }
-            if (forInOrOfStatement.initializer.kind === 238) {
+            if (forInOrOfStatement.initializer.kind === 239) {
                 var variableList = forInOrOfStatement.initializer;
                 if (!checkGrammarVariableDeclarationList(variableList)) {
                     var declarations = variableList.declarations;
@@ -50010,20 +51807,20 @@ var ts;
                         return false;
                     }
                     if (declarations.length > 1) {
-                        var diagnostic = forInOrOfStatement.kind === 226
+                        var diagnostic = forInOrOfStatement.kind === 227
                             ? ts.Diagnostics.Only_a_single_variable_declaration_is_allowed_in_a_for_in_statement
                             : ts.Diagnostics.Only_a_single_variable_declaration_is_allowed_in_a_for_of_statement;
                         return grammarErrorOnFirstToken(variableList.declarations[1], diagnostic);
                     }
                     var firstDeclaration = declarations[0];
                     if (firstDeclaration.initializer) {
-                        var diagnostic = forInOrOfStatement.kind === 226
+                        var diagnostic = forInOrOfStatement.kind === 227
                             ? ts.Diagnostics.The_variable_declaration_of_a_for_in_statement_cannot_have_an_initializer
                             : ts.Diagnostics.The_variable_declaration_of_a_for_of_statement_cannot_have_an_initializer;
                         return grammarErrorOnNode(firstDeclaration.name, diagnostic);
                     }
                     if (firstDeclaration.type) {
-                        var diagnostic = forInOrOfStatement.kind === 226
+                        var diagnostic = forInOrOfStatement.kind === 227
                             ? ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_use_a_type_annotation
                             : ts.Diagnostics.The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation;
                         return grammarErrorOnNode(firstDeclaration, diagnostic);
@@ -50050,11 +51847,11 @@ var ts;
                 return grammarErrorOnNode(accessor.name, ts.Diagnostics.An_accessor_cannot_have_type_parameters);
             }
             else if (!doesAccessorHaveCorrectParameterCount(accessor)) {
-                return grammarErrorOnNode(accessor.name, kind === 158 ?
+                return grammarErrorOnNode(accessor.name, kind === 159 ?
                     ts.Diagnostics.A_get_accessor_cannot_have_parameters :
                     ts.Diagnostics.A_set_accessor_must_have_exactly_one_parameter);
             }
-            else if (kind === 159) {
+            else if (kind === 160) {
                 if (accessor.type) {
                     return grammarErrorOnNode(accessor.name, ts.Diagnostics.A_set_accessor_cannot_have_a_return_type_annotation);
                 }
@@ -50074,23 +51871,23 @@ var ts;
             return false;
         }
         function doesAccessorHaveCorrectParameterCount(accessor) {
-            return getAccessorThisParameter(accessor) || accessor.parameters.length === (accessor.kind === 158 ? 0 : 1);
+            return getAccessorThisParameter(accessor) || accessor.parameters.length === (accessor.kind === 159 ? 0 : 1);
         }
         function getAccessorThisParameter(accessor) {
-            if (accessor.parameters.length === (accessor.kind === 158 ? 1 : 2)) {
+            if (accessor.parameters.length === (accessor.kind === 159 ? 1 : 2)) {
                 return ts.getThisParameter(accessor);
             }
         }
         function checkGrammarTypeOperatorNode(node) {
-            if (node.operator === 142) {
-                if (node.type.kind !== 139) {
-                    return grammarErrorOnNode(node.type, ts.Diagnostics._0_expected, ts.tokenToString(139));
+            if (node.operator === 143) {
+                if (node.type.kind !== 140) {
+                    return grammarErrorOnNode(node.type, ts.Diagnostics._0_expected, ts.tokenToString(140));
                 }
                 var parent = ts.walkUpParenthesizedTypes(node.parent);
                 switch (parent.kind) {
-                    case 237:
+                    case 238:
                         var decl = parent;
-                        if (decl.name.kind !== 72) {
+                        if (decl.name.kind !== 73) {
                             return grammarErrorOnNode(node, ts.Diagnostics.unique_symbol_types_may_not_be_used_on_a_variable_declaration_with_a_binding_name);
                         }
                         if (!ts.isVariableDeclarationInVariableStatement(decl)) {
@@ -50100,13 +51897,13 @@ var ts;
                             return grammarErrorOnNode(parent.name, ts.Diagnostics.A_variable_whose_type_is_a_unique_symbol_type_must_be_const);
                         }
                         break;
-                    case 154:
+                    case 155:
                         if (!ts.hasModifier(parent, 32) ||
                             !ts.hasModifier(parent, 64)) {
                             return grammarErrorOnNode(parent.name, ts.Diagnostics.A_property_of_a_class_whose_type_is_a_unique_symbol_type_must_be_both_static_and_readonly);
                         }
                         break;
-                    case 153:
+                    case 154:
                         if (!ts.hasModifier(parent, 64)) {
                             return grammarErrorOnNode(parent.name, ts.Diagnostics.A_property_of_an_interface_or_type_literal_whose_type_is_a_unique_symbol_type_must_be_readonly);
                         }
@@ -50115,9 +51912,9 @@ var ts;
                         return grammarErrorOnNode(node, ts.Diagnostics.unique_symbol_types_are_not_allowed_here);
                 }
             }
-            else if (node.operator === 133) {
-                if (node.type.kind !== 169 && node.type.kind !== 170) {
-                    return grammarErrorOnFirstToken(node, ts.Diagnostics.readonly_type_modifier_is_only_permitted_on_array_and_tuple_literal_types, ts.tokenToString(139));
+            else if (node.operator === 134) {
+                if (node.type.kind !== 170 && node.type.kind !== 171) {
+                    return grammarErrorOnFirstToken(node, ts.Diagnostics.readonly_type_modifier_is_only_permitted_on_array_and_tuple_literal_types, ts.tokenToString(140));
                 }
             }
         }
@@ -50130,9 +51927,9 @@ var ts;
             if (checkGrammarFunctionLikeDeclaration(node)) {
                 return true;
             }
-            if (node.kind === 156) {
-                if (node.parent.kind === 188) {
-                    if (node.modifiers && !(node.modifiers.length === 1 && ts.first(node.modifiers).kind === 121)) {
+            if (node.kind === 157) {
+                if (node.parent.kind === 189) {
+                    if (node.modifiers && !(node.modifiers.length === 1 && ts.first(node.modifiers).kind === 122)) {
                         return grammarErrorOnFirstToken(node, ts.Diagnostics.Modifiers_cannot_appear_here);
                     }
                     else if (checkGrammarForInvalidQuestionMark(node.questionToken, ts.Diagnostics.An_object_member_cannot_be_declared_optional)) {
@@ -50153,14 +51950,14 @@ var ts;
                 if (node.flags & 4194304) {
                     return checkGrammarForInvalidDynamicName(node.name, ts.Diagnostics.A_computed_property_name_in_an_ambient_context_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type);
                 }
-                else if (node.kind === 156 && !node.body) {
+                else if (node.kind === 157 && !node.body) {
                     return checkGrammarForInvalidDynamicName(node.name, ts.Diagnostics.A_computed_property_name_in_a_method_overload_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type);
                 }
             }
-            else if (node.parent.kind === 241) {
+            else if (node.parent.kind === 242) {
                 return checkGrammarForInvalidDynamicName(node.name, ts.Diagnostics.A_computed_property_name_in_an_interface_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type);
             }
-            else if (node.parent.kind === 168) {
+            else if (node.parent.kind === 169) {
                 return checkGrammarForInvalidDynamicName(node.name, ts.Diagnostics.A_computed_property_name_in_a_type_literal_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type);
             }
         }
@@ -50171,9 +51968,9 @@ var ts;
                     return grammarErrorOnNode(node, ts.Diagnostics.Jump_target_cannot_cross_function_boundary);
                 }
                 switch (current.kind) {
-                    case 233:
+                    case 234:
                         if (node.label && current.label.escapedText === node.label.escapedText) {
-                            var isMisplacedContinueLabel = node.kind === 228
+                            var isMisplacedContinueLabel = node.kind === 229
                                 && !ts.isIterationStatement(current.statement, true);
                             if (isMisplacedContinueLabel) {
                                 return grammarErrorOnNode(node, ts.Diagnostics.A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement);
@@ -50181,8 +51978,8 @@ var ts;
                             return false;
                         }
                         break;
-                    case 232:
-                        if (node.kind === 229 && !node.label) {
+                    case 233:
+                        if (node.kind === 230 && !node.label) {
                             return false;
                         }
                         break;
@@ -50195,13 +51992,13 @@ var ts;
                 current = current.parent;
             }
             if (node.label) {
-                var message = node.kind === 229
+                var message = node.kind === 230
                     ? ts.Diagnostics.A_break_statement_can_only_jump_to_a_label_of_an_enclosing_statement
                     : ts.Diagnostics.A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement;
                 return grammarErrorOnNode(node, message);
             }
             else {
-                var message = node.kind === 229
+                var message = node.kind === 230
                     ? ts.Diagnostics.A_break_statement_can_only_be_used_within_an_enclosing_iteration_or_switch_statement
                     : ts.Diagnostics.A_continue_statement_can_only_be_used_within_an_enclosing_iteration_statement;
                 return grammarErrorOnNode(node, message);
@@ -50224,12 +52021,12 @@ var ts;
         }
         function isStringOrNumberLiteralExpression(expr) {
             return expr.kind === 10 || expr.kind === 8 ||
-                expr.kind === 202 && expr.operator === 39 &&
+                expr.kind === 203 && expr.operator === 39 &&
                     expr.operand.kind === 8;
         }
         function isBigIntLiteralExpression(expr) {
             return expr.kind === 9 ||
-                expr.kind === 202 && expr.operator === 39 &&
+                expr.kind === 203 && expr.operator === 39 &&
                     expr.operand.kind === 9;
         }
         function isSimpleLiteralEnumReference(expr) {
@@ -50242,7 +52039,7 @@ var ts;
             if (initializer) {
                 var isInvalidInitializer = !(isStringOrNumberLiteralExpression(initializer) ||
                     isSimpleLiteralEnumReference(initializer) ||
-                    initializer.kind === 102 || initializer.kind === 87 ||
+                    initializer.kind === 103 || initializer.kind === 88 ||
                     isBigIntLiteralExpression(initializer));
                 var isConstOrReadonly = ts.isDeclarationReadonly(node) || ts.isVariableDeclaration(node) && ts.isVarConst(node);
                 if (isConstOrReadonly && !node.type) {
@@ -50259,7 +52056,7 @@ var ts;
             }
         }
         function checkGrammarVariableDeclaration(node) {
-            if (node.parent.parent.kind !== 226 && node.parent.parent.kind !== 227) {
+            if (node.parent.parent.kind !== 227 && node.parent.parent.kind !== 228) {
                 if (node.flags & 4194304) {
                     checkAmbientInitializer(node);
                 }
@@ -50272,8 +52069,8 @@ var ts;
                     }
                 }
             }
-            if (node.exclamationToken && (node.parent.parent.kind !== 219 || !node.type || node.initializer || node.flags & 4194304)) {
-                return grammarErrorOnNode(node.exclamationToken, ts.Diagnostics.A_definite_assignment_assertion_is_not_permitted_in_this_context);
+            if (node.exclamationToken && (node.parent.parent.kind !== 220 || !node.type || node.initializer || node.flags & 4194304)) {
+                return grammarErrorOnNode(node.exclamationToken, ts.Diagnostics.Definite_assignment_assertions_can_only_be_used_along_with_a_type_annotation);
             }
             if (compilerOptions.module !== ts.ModuleKind.ES2015 && compilerOptions.module !== ts.ModuleKind.ESNext && compilerOptions.module !== ts.ModuleKind.System && !compilerOptions.noEmit &&
                 !(node.parent.parent.flags & 4194304) && ts.hasModifier(node.parent.parent, 1)) {
@@ -50283,7 +52080,7 @@ var ts;
             return checkLetConstNames && checkGrammarNameInLetOrConstDeclarations(node.name);
         }
         function checkESModuleMarker(name) {
-            if (name.kind === 72) {
+            if (name.kind === 73) {
                 if (ts.idText(name) === "__esModule") {
                     return grammarErrorOnNode(name, ts.Diagnostics.Identifier_expected_esModule_is_reserved_as_an_exported_marker_when_transforming_ECMAScript_modules);
                 }
@@ -50300,8 +52097,8 @@ var ts;
             return false;
         }
         function checkGrammarNameInLetOrConstDeclarations(name) {
-            if (name.kind === 72) {
-                if (name.originalKeywordKind === 111) {
+            if (name.kind === 73) {
+                if (name.originalKeywordKind === 112) {
                     return grammarErrorOnNode(name, ts.Diagnostics.let_is_not_allowed_to_be_used_as_a_name_in_let_or_const_declarations);
                 }
             }
@@ -50328,15 +52125,15 @@ var ts;
         }
         function allowLetAndConstDeclarations(parent) {
             switch (parent.kind) {
-                case 222:
                 case 223:
                 case 224:
-                case 231:
                 case 225:
+                case 232:
                 case 226:
                 case 227:
+                case 228:
                     return false;
-                case 233:
+                case 234:
                     return allowLetAndConstDeclarations(parent.parent);
             }
             return true;
@@ -50354,12 +52151,12 @@ var ts;
         function checkGrammarMetaProperty(node) {
             var escapedText = node.name.escapedText;
             switch (node.keywordToken) {
-                case 95:
+                case 96:
                     if (escapedText !== "target") {
                         return grammarErrorOnNode(node.name, ts.Diagnostics._0_is_not_a_valid_meta_property_for_keyword_1_Did_you_mean_2, node.name.escapedText, ts.tokenToString(node.keywordToken), "target");
                     }
                     break;
-                case 92:
+                case 93:
                     if (escapedText !== "meta") {
                         return grammarErrorOnNode(node.name, ts.Diagnostics._0_is_not_a_valid_meta_property_for_keyword_1_Did_you_mean_2, node.name.escapedText, ts.tokenToString(node.keywordToken), "meta");
                     }
@@ -50410,11 +52207,14 @@ var ts;
         }
         function checkGrammarProperty(node) {
             if (ts.isClassLike(node.parent)) {
+                if (ts.isStringLiteral(node.name) && node.name.text === "constructor") {
+                    return grammarErrorOnNode(node.name, ts.Diagnostics.Classes_may_not_have_a_field_named_constructor);
+                }
                 if (checkGrammarForInvalidDynamicName(node.name, ts.Diagnostics.A_computed_property_name_in_a_class_property_declaration_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type)) {
                     return true;
                 }
             }
-            else if (node.parent.kind === 241) {
+            else if (node.parent.kind === 242) {
                 if (checkGrammarForInvalidDynamicName(node.name, ts.Diagnostics.A_computed_property_name_in_an_interface_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type)) {
                     return true;
                 }
@@ -50422,7 +52222,7 @@ var ts;
                     return grammarErrorOnNode(node.initializer, ts.Diagnostics.An_interface_property_cannot_have_an_initializer);
                 }
             }
-            else if (node.parent.kind === 168) {
+            else if (node.parent.kind === 169) {
                 if (checkGrammarForInvalidDynamicName(node.name, ts.Diagnostics.A_computed_property_name_in_a_type_literal_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type)) {
                     return true;
                 }
@@ -50439,22 +52239,22 @@ var ts;
             }
         }
         function checkGrammarTopLevelElementForRequiredDeclareModifier(node) {
-            if (node.kind === 241 ||
-                node.kind === 242 ||
+            if (node.kind === 242 ||
+                node.kind === 243 ||
+                node.kind === 250 ||
                 node.kind === 249 ||
-                node.kind === 248 ||
+                node.kind === 256 ||
                 node.kind === 255 ||
-                node.kind === 254 ||
-                node.kind === 247 ||
+                node.kind === 248 ||
                 ts.hasModifier(node, 2 | 1 | 512)) {
                 return false;
             }
-            return grammarErrorOnFirstToken(node, ts.Diagnostics.A_declare_modifier_is_required_for_a_top_level_declaration_in_a_d_ts_file);
+            return grammarErrorOnFirstToken(node, ts.Diagnostics.Top_level_declarations_in_d_ts_files_must_start_with_either_a_declare_or_export_modifier);
         }
         function checkGrammarTopLevelElementsForRequiredDeclareModifier(file) {
             for (var _i = 0, _a = file.statements; _i < _a.length; _i++) {
                 var decl = _a[_i];
-                if (ts.isDeclaration(decl) || decl.kind === 219) {
+                if (ts.isDeclaration(decl) || decl.kind === 220) {
                     if (checkGrammarTopLevelElementForRequiredDeclareModifier(decl)) {
                         return true;
                     }
@@ -50474,10 +52274,10 @@ var ts;
                 if (!links.hasReportedStatementInAmbientContext && ts.isFunctionLike(node.parent)) {
                     return getNodeLinks(node).hasReportedStatementInAmbientContext = grammarErrorOnFirstToken(node, ts.Diagnostics.An_implementation_cannot_be_declared_in_ambient_contexts);
                 }
-                if (node.parent.kind === 218 || node.parent.kind === 245 || node.parent.kind === 284) {
-                    var links_2 = getNodeLinks(node.parent);
-                    if (!links_2.hasReportedStatementInAmbientContext) {
-                        return links_2.hasReportedStatementInAmbientContext = grammarErrorOnFirstToken(node, ts.Diagnostics.Statements_are_not_allowed_in_ambient_contexts);
+                if (node.parent.kind === 219 || node.parent.kind === 246 || node.parent.kind === 285) {
+                    var links_1 = getNodeLinks(node.parent);
+                    if (!links_1.hasReportedStatementInAmbientContext) {
+                        return links_1.hasReportedStatementInAmbientContext = grammarErrorOnFirstToken(node, ts.Diagnostics.Statements_are_not_allowed_in_ambient_contexts);
                     }
                 }
                 else {
@@ -50491,10 +52291,10 @@ var ts;
                 if (languageVersion >= 1) {
                     diagnosticMessage = ts.Diagnostics.Octal_literals_are_not_available_when_targeting_ECMAScript_5_and_higher_Use_the_syntax_0;
                 }
-                else if (ts.isChildOfNodeWithKind(node, 182)) {
+                else if (ts.isChildOfNodeWithKind(node, 183)) {
                     diagnosticMessage = ts.Diagnostics.Octal_literal_types_must_use_ES2015_syntax_Use_the_syntax_0;
                 }
-                else if (ts.isChildOfNodeWithKind(node, 278)) {
+                else if (ts.isChildOfNodeWithKind(node, 279)) {
                     diagnosticMessage = ts.Diagnostics.Octal_literals_are_not_allowed_in_enums_members_initializer_Use_the_syntax_0;
                 }
                 if (diagnosticMessage) {
@@ -50509,7 +52309,7 @@ var ts;
             var literalType = ts.isLiteralTypeNode(node.parent) ||
                 ts.isPrefixUnaryExpression(node.parent) && ts.isLiteralTypeNode(node.parent.parent);
             if (!literalType) {
-                if (languageVersion < 7) {
+                if (languageVersion < 99) {
                     if (grammarErrorOnNode(node, ts.Diagnostics.BigInt_literals_are_not_available_when_targeting_lower_than_ESNext)) {
                         return true;
                     }
@@ -50558,8 +52358,8 @@ var ts;
     ts.createTypeChecker = createTypeChecker;
     function isDeclarationNameOrImportPropertyName(name) {
         switch (name.parent.kind) {
-            case 253:
-            case 257:
+            case 254:
+            case 258:
                 return ts.isIdentifier(name);
             default:
                 return ts.isDeclarationName(name);
@@ -50567,13 +52367,13 @@ var ts;
     }
     function isSomeImportDeclaration(decl) {
         switch (decl.kind) {
-            case 250:
-            case 248:
             case 251:
-            case 253:
+            case 249:
+            case 252:
+            case 254:
                 return true;
-            case 72:
-                return decl.parent.kind === 253;
+            case 73:
+                return decl.parent.kind === 254;
             default:
                 return false;
         }
@@ -50590,6 +52390,13 @@ var ts;
         JsxNames.IntrinsicClassAttributes = "IntrinsicClassAttributes";
         JsxNames.LibraryManagedAttributes = "LibraryManagedAttributes";
     })(JsxNames || (JsxNames = {}));
+    function getIterationTypesKeyFromIterationTypeKind(typeKind) {
+        switch (typeKind) {
+            case 0: return "yieldType";
+            case 1: return "returnType";
+            case 2: return "nextType";
+        }
+    }
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
@@ -50688,7 +52495,7 @@ var ts;
         return node;
     }
     function createIdentifier(text, typeArguments) {
-        var node = createSynthesizedNode(72);
+        var node = createSynthesizedNode(73);
         node.escapedText = ts.escapeLeadingUnderscores(text);
         node.originalKeywordKind = text ? ts.stringToToken(text) : 0;
         node.autoGenerateFlags = 0;
@@ -50764,23 +52571,23 @@ var ts;
     }
     ts.createToken = createToken;
     function createSuper() {
-        return createSynthesizedNode(98);
+        return createSynthesizedNode(99);
     }
     ts.createSuper = createSuper;
     function createThis() {
-        return createSynthesizedNode(100);
+        return createSynthesizedNode(101);
     }
     ts.createThis = createThis;
     function createNull() {
-        return createSynthesizedNode(96);
+        return createSynthesizedNode(97);
     }
     ts.createNull = createNull;
     function createTrue() {
-        return createSynthesizedNode(102);
+        return createSynthesizedNode(103);
     }
     ts.createTrue = createTrue;
     function createFalse() {
-        return createSynthesizedNode(87);
+        return createSynthesizedNode(88);
     }
     ts.createFalse = createFalse;
     function createModifier(kind) {
@@ -50790,43 +52597,43 @@ var ts;
     function createModifiersFromModifierFlags(flags) {
         var result = [];
         if (flags & 1) {
-            result.push(createModifier(85));
+            result.push(createModifier(86));
         }
         if (flags & 2) {
-            result.push(createModifier(125));
+            result.push(createModifier(126));
         }
         if (flags & 512) {
-            result.push(createModifier(80));
+            result.push(createModifier(81));
         }
         if (flags & 2048) {
-            result.push(createModifier(77));
+            result.push(createModifier(78));
         }
         if (flags & 4) {
-            result.push(createModifier(115));
-        }
-        if (flags & 8) {
-            result.push(createModifier(113));
-        }
-        if (flags & 16) {
-            result.push(createModifier(114));
-        }
-        if (flags & 128) {
-            result.push(createModifier(118));
-        }
-        if (flags & 32) {
             result.push(createModifier(116));
         }
+        if (flags & 8) {
+            result.push(createModifier(114));
+        }
+        if (flags & 16) {
+            result.push(createModifier(115));
+        }
+        if (flags & 128) {
+            result.push(createModifier(119));
+        }
+        if (flags & 32) {
+            result.push(createModifier(117));
+        }
         if (flags & 64) {
-            result.push(createModifier(133));
+            result.push(createModifier(134));
         }
         if (flags & 256) {
-            result.push(createModifier(121));
+            result.push(createModifier(122));
         }
         return result;
     }
     ts.createModifiersFromModifierFlags = createModifiersFromModifierFlags;
     function createQualifiedName(left, right) {
-        var node = createSynthesizedNode(148);
+        var node = createSynthesizedNode(149);
         node.left = left;
         node.right = asName(right);
         return node;
@@ -50845,7 +52652,7 @@ var ts;
             : expression;
     }
     function createComputedPropertyName(expression) {
-        var node = createSynthesizedNode(149);
+        var node = createSynthesizedNode(150);
         node.expression = parenthesizeForComputedName(expression);
         return node;
     }
@@ -50857,7 +52664,7 @@ var ts;
     }
     ts.updateComputedPropertyName = updateComputedPropertyName;
     function createTypeParameterDeclaration(name, constraint, defaultType) {
-        var node = createSynthesizedNode(150);
+        var node = createSynthesizedNode(151);
         node.name = asName(name);
         node.constraint = constraint;
         node.default = defaultType;
@@ -50873,7 +52680,7 @@ var ts;
     }
     ts.updateTypeParameterDeclaration = updateTypeParameterDeclaration;
     function createParameter(decorators, modifiers, dotDotDotToken, name, questionToken, type, initializer) {
-        var node = createSynthesizedNode(151);
+        var node = createSynthesizedNode(152);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.dotDotDotToken = dotDotDotToken;
@@ -50897,7 +52704,7 @@ var ts;
     }
     ts.updateParameter = updateParameter;
     function createDecorator(expression) {
-        var node = createSynthesizedNode(152);
+        var node = createSynthesizedNode(153);
         node.expression = ts.parenthesizeForAccess(expression);
         return node;
     }
@@ -50909,7 +52716,7 @@ var ts;
     }
     ts.updateDecorator = updateDecorator;
     function createPropertySignature(modifiers, name, questionToken, type, initializer) {
-        var node = createSynthesizedNode(153);
+        var node = createSynthesizedNode(154);
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
         node.questionToken = questionToken;
@@ -50929,7 +52736,7 @@ var ts;
     }
     ts.updatePropertySignature = updatePropertySignature;
     function createProperty(decorators, modifiers, name, questionOrExclamationToken, type, initializer) {
-        var node = createSynthesizedNode(154);
+        var node = createSynthesizedNode(155);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
@@ -50953,7 +52760,7 @@ var ts;
     }
     ts.updateProperty = updateProperty;
     function createMethodSignature(typeParameters, parameters, type, name, questionToken) {
-        var node = createSignatureDeclaration(155, typeParameters, parameters, type);
+        var node = createSignatureDeclaration(156, typeParameters, parameters, type);
         node.name = asName(name);
         node.questionToken = questionToken;
         return node;
@@ -50970,7 +52777,7 @@ var ts;
     }
     ts.updateMethodSignature = updateMethodSignature;
     function createMethod(decorators, modifiers, asteriskToken, name, questionToken, typeParameters, parameters, type, body) {
-        var node = createSynthesizedNode(156);
+        var node = createSynthesizedNode(157);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.asteriskToken = asteriskToken;
@@ -50998,7 +52805,7 @@ var ts;
     }
     ts.updateMethod = updateMethod;
     function createConstructor(decorators, modifiers, parameters, body) {
-        var node = createSynthesizedNode(157);
+        var node = createSynthesizedNode(158);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.typeParameters = undefined;
@@ -51018,7 +52825,7 @@ var ts;
     }
     ts.updateConstructor = updateConstructor;
     function createGetAccessor(decorators, modifiers, name, parameters, type, body) {
-        var node = createSynthesizedNode(158);
+        var node = createSynthesizedNode(159);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
@@ -51041,7 +52848,7 @@ var ts;
     }
     ts.updateGetAccessor = updateGetAccessor;
     function createSetAccessor(decorators, modifiers, name, parameters, body) {
-        var node = createSynthesizedNode(159);
+        var node = createSynthesizedNode(160);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
@@ -51062,7 +52869,7 @@ var ts;
     }
     ts.updateSetAccessor = updateSetAccessor;
     function createCallSignature(typeParameters, parameters, type) {
-        return createSignatureDeclaration(160, typeParameters, parameters, type);
+        return createSignatureDeclaration(161, typeParameters, parameters, type);
     }
     ts.createCallSignature = createCallSignature;
     function updateCallSignature(node, typeParameters, parameters, type) {
@@ -51070,7 +52877,7 @@ var ts;
     }
     ts.updateCallSignature = updateCallSignature;
     function createConstructSignature(typeParameters, parameters, type) {
-        return createSignatureDeclaration(161, typeParameters, parameters, type);
+        return createSignatureDeclaration(162, typeParameters, parameters, type);
     }
     ts.createConstructSignature = createConstructSignature;
     function updateConstructSignature(node, typeParameters, parameters, type) {
@@ -51078,7 +52885,7 @@ var ts;
     }
     ts.updateConstructSignature = updateConstructSignature;
     function createIndexSignature(decorators, modifiers, parameters, type) {
-        var node = createSynthesizedNode(162);
+        var node = createSynthesizedNode(163);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.parameters = createNodeArray(parameters);
@@ -51116,7 +52923,7 @@ var ts;
     }
     ts.createKeywordTypeNode = createKeywordTypeNode;
     function createTypePredicateNode(parameterName, type) {
-        var node = createSynthesizedNode(163);
+        var node = createSynthesizedNode(164);
         node.parameterName = asName(parameterName);
         node.type = type;
         return node;
@@ -51130,7 +52937,7 @@ var ts;
     }
     ts.updateTypePredicateNode = updateTypePredicateNode;
     function createTypeReferenceNode(typeName, typeArguments) {
-        var node = createSynthesizedNode(164);
+        var node = createSynthesizedNode(165);
         node.typeName = asName(typeName);
         node.typeArguments = typeArguments && ts.parenthesizeTypeParameters(typeArguments);
         return node;
@@ -51144,7 +52951,7 @@ var ts;
     }
     ts.updateTypeReferenceNode = updateTypeReferenceNode;
     function createFunctionTypeNode(typeParameters, parameters, type) {
-        return createSignatureDeclaration(165, typeParameters, parameters, type);
+        return createSignatureDeclaration(166, typeParameters, parameters, type);
     }
     ts.createFunctionTypeNode = createFunctionTypeNode;
     function updateFunctionTypeNode(node, typeParameters, parameters, type) {
@@ -51152,7 +52959,7 @@ var ts;
     }
     ts.updateFunctionTypeNode = updateFunctionTypeNode;
     function createConstructorTypeNode(typeParameters, parameters, type) {
-        return createSignatureDeclaration(166, typeParameters, parameters, type);
+        return createSignatureDeclaration(167, typeParameters, parameters, type);
     }
     ts.createConstructorTypeNode = createConstructorTypeNode;
     function updateConstructorTypeNode(node, typeParameters, parameters, type) {
@@ -51160,7 +52967,7 @@ var ts;
     }
     ts.updateConstructorTypeNode = updateConstructorTypeNode;
     function createTypeQueryNode(exprName) {
-        var node = createSynthesizedNode(167);
+        var node = createSynthesizedNode(168);
         node.exprName = exprName;
         return node;
     }
@@ -51172,7 +52979,7 @@ var ts;
     }
     ts.updateTypeQueryNode = updateTypeQueryNode;
     function createTypeLiteralNode(members) {
-        var node = createSynthesizedNode(168);
+        var node = createSynthesizedNode(169);
         node.members = createNodeArray(members);
         return node;
     }
@@ -51184,7 +52991,7 @@ var ts;
     }
     ts.updateTypeLiteralNode = updateTypeLiteralNode;
     function createArrayTypeNode(elementType) {
-        var node = createSynthesizedNode(169);
+        var node = createSynthesizedNode(170);
         node.elementType = ts.parenthesizeArrayTypeMember(elementType);
         return node;
     }
@@ -51196,7 +53003,7 @@ var ts;
     }
     ts.updateArrayTypeNode = updateArrayTypeNode;
     function createTupleTypeNode(elementTypes) {
-        var node = createSynthesizedNode(170);
+        var node = createSynthesizedNode(171);
         node.elementTypes = createNodeArray(elementTypes);
         return node;
     }
@@ -51208,7 +53015,7 @@ var ts;
     }
     ts.updateTupleTypeNode = updateTupleTypeNode;
     function createOptionalTypeNode(type) {
-        var node = createSynthesizedNode(171);
+        var node = createSynthesizedNode(172);
         node.type = ts.parenthesizeArrayTypeMember(type);
         return node;
     }
@@ -51220,7 +53027,7 @@ var ts;
     }
     ts.updateOptionalTypeNode = updateOptionalTypeNode;
     function createRestTypeNode(type) {
-        var node = createSynthesizedNode(172);
+        var node = createSynthesizedNode(173);
         node.type = type;
         return node;
     }
@@ -51232,7 +53039,7 @@ var ts;
     }
     ts.updateRestTypeNode = updateRestTypeNode;
     function createUnionTypeNode(types) {
-        return createUnionOrIntersectionTypeNode(173, types);
+        return createUnionOrIntersectionTypeNode(174, types);
     }
     ts.createUnionTypeNode = createUnionTypeNode;
     function updateUnionTypeNode(node, types) {
@@ -51240,7 +53047,7 @@ var ts;
     }
     ts.updateUnionTypeNode = updateUnionTypeNode;
     function createIntersectionTypeNode(types) {
-        return createUnionOrIntersectionTypeNode(174, types);
+        return createUnionOrIntersectionTypeNode(175, types);
     }
     ts.createIntersectionTypeNode = createIntersectionTypeNode;
     function updateIntersectionTypeNode(node, types) {
@@ -51259,7 +53066,7 @@ var ts;
             : node;
     }
     function createConditionalTypeNode(checkType, extendsType, trueType, falseType) {
-        var node = createSynthesizedNode(175);
+        var node = createSynthesizedNode(176);
         node.checkType = ts.parenthesizeConditionalTypeMember(checkType);
         node.extendsType = ts.parenthesizeConditionalTypeMember(extendsType);
         node.trueType = trueType;
@@ -51277,7 +53084,7 @@ var ts;
     }
     ts.updateConditionalTypeNode = updateConditionalTypeNode;
     function createInferTypeNode(typeParameter) {
-        var node = createSynthesizedNode(176);
+        var node = createSynthesizedNode(177);
         node.typeParameter = typeParameter;
         return node;
     }
@@ -51289,10 +53096,10 @@ var ts;
     }
     ts.updateInferTypeNode = updateInferTypeNode;
     function createImportTypeNode(argument, qualifier, typeArguments, isTypeOf) {
-        var node = createSynthesizedNode(183);
+        var node = createSynthesizedNode(184);
         node.argument = argument;
         node.qualifier = qualifier;
-        node.typeArguments = asNodeArray(typeArguments);
+        node.typeArguments = ts.parenthesizeTypeParameters(typeArguments);
         node.isTypeOf = isTypeOf;
         return node;
     }
@@ -51307,7 +53114,7 @@ var ts;
     }
     ts.updateImportTypeNode = updateImportTypeNode;
     function createParenthesizedType(type) {
-        var node = createSynthesizedNode(177);
+        var node = createSynthesizedNode(178);
         node.type = type;
         return node;
     }
@@ -51319,12 +53126,12 @@ var ts;
     }
     ts.updateParenthesizedType = updateParenthesizedType;
     function createThisTypeNode() {
-        return createSynthesizedNode(178);
+        return createSynthesizedNode(179);
     }
     ts.createThisTypeNode = createThisTypeNode;
     function createTypeOperatorNode(operatorOrType, type) {
-        var node = createSynthesizedNode(179);
-        node.operator = typeof operatorOrType === "number" ? operatorOrType : 129;
+        var node = createSynthesizedNode(180);
+        node.operator = typeof operatorOrType === "number" ? operatorOrType : 130;
         node.type = ts.parenthesizeElementTypeMember(typeof operatorOrType === "number" ? type : operatorOrType);
         return node;
     }
@@ -51334,7 +53141,7 @@ var ts;
     }
     ts.updateTypeOperatorNode = updateTypeOperatorNode;
     function createIndexedAccessTypeNode(objectType, indexType) {
-        var node = createSynthesizedNode(180);
+        var node = createSynthesizedNode(181);
         node.objectType = ts.parenthesizeElementTypeMember(objectType);
         node.indexType = indexType;
         return node;
@@ -51348,7 +53155,7 @@ var ts;
     }
     ts.updateIndexedAccessTypeNode = updateIndexedAccessTypeNode;
     function createMappedTypeNode(readonlyToken, typeParameter, questionToken, type) {
-        var node = createSynthesizedNode(181);
+        var node = createSynthesizedNode(182);
         node.readonlyToken = readonlyToken;
         node.typeParameter = typeParameter;
         node.questionToken = questionToken;
@@ -51366,7 +53173,7 @@ var ts;
     }
     ts.updateMappedTypeNode = updateMappedTypeNode;
     function createLiteralTypeNode(literal) {
-        var node = createSynthesizedNode(182);
+        var node = createSynthesizedNode(183);
         node.literal = literal;
         return node;
     }
@@ -51378,7 +53185,7 @@ var ts;
     }
     ts.updateLiteralTypeNode = updateLiteralTypeNode;
     function createObjectBindingPattern(elements) {
-        var node = createSynthesizedNode(184);
+        var node = createSynthesizedNode(185);
         node.elements = createNodeArray(elements);
         return node;
     }
@@ -51390,7 +53197,7 @@ var ts;
     }
     ts.updateObjectBindingPattern = updateObjectBindingPattern;
     function createArrayBindingPattern(elements) {
-        var node = createSynthesizedNode(185);
+        var node = createSynthesizedNode(186);
         node.elements = createNodeArray(elements);
         return node;
     }
@@ -51402,7 +53209,7 @@ var ts;
     }
     ts.updateArrayBindingPattern = updateArrayBindingPattern;
     function createBindingElement(dotDotDotToken, propertyName, name, initializer) {
-        var node = createSynthesizedNode(186);
+        var node = createSynthesizedNode(187);
         node.dotDotDotToken = dotDotDotToken;
         node.propertyName = asName(propertyName);
         node.name = asName(name);
@@ -51420,7 +53227,7 @@ var ts;
     }
     ts.updateBindingElement = updateBindingElement;
     function createArrayLiteral(elements, multiLine) {
-        var node = createSynthesizedNode(187);
+        var node = createSynthesizedNode(188);
         node.elements = ts.parenthesizeListElements(createNodeArray(elements));
         if (multiLine)
             node.multiLine = true;
@@ -51434,7 +53241,7 @@ var ts;
     }
     ts.updateArrayLiteral = updateArrayLiteral;
     function createObjectLiteral(properties, multiLine) {
-        var node = createSynthesizedNode(188);
+        var node = createSynthesizedNode(189);
         node.properties = createNodeArray(properties);
         if (multiLine)
             node.multiLine = true;
@@ -51448,7 +53255,7 @@ var ts;
     }
     ts.updateObjectLiteral = updateObjectLiteral;
     function createPropertyAccess(expression, name) {
-        var node = createSynthesizedNode(189);
+        var node = createSynthesizedNode(190);
         node.expression = ts.parenthesizeForAccess(expression);
         node.name = asName(name);
         setEmitFlags(node, 131072);
@@ -51463,7 +53270,7 @@ var ts;
     }
     ts.updatePropertyAccess = updatePropertyAccess;
     function createElementAccess(expression, index) {
-        var node = createSynthesizedNode(190);
+        var node = createSynthesizedNode(191);
         node.expression = ts.parenthesizeForAccess(expression);
         node.argumentExpression = asExpression(index);
         return node;
@@ -51477,7 +53284,7 @@ var ts;
     }
     ts.updateElementAccess = updateElementAccess;
     function createCall(expression, typeArguments, argumentsArray) {
-        var node = createSynthesizedNode(191);
+        var node = createSynthesizedNode(192);
         node.expression = ts.parenthesizeForAccess(expression);
         node.typeArguments = asNodeArray(typeArguments);
         node.arguments = ts.parenthesizeListElements(createNodeArray(argumentsArray));
@@ -51493,7 +53300,7 @@ var ts;
     }
     ts.updateCall = updateCall;
     function createNew(expression, typeArguments, argumentsArray) {
-        var node = createSynthesizedNode(192);
+        var node = createSynthesizedNode(193);
         node.expression = ts.parenthesizeForNew(expression);
         node.typeArguments = asNodeArray(typeArguments);
         node.arguments = argumentsArray ? ts.parenthesizeListElements(createNodeArray(argumentsArray)) : undefined;
@@ -51509,7 +53316,7 @@ var ts;
     }
     ts.updateNew = updateNew;
     function createTaggedTemplate(tag, typeArgumentsOrTemplate, template) {
-        var node = createSynthesizedNode(193);
+        var node = createSynthesizedNode(194);
         node.tag = ts.parenthesizeForAccess(tag);
         if (template) {
             node.typeArguments = asNodeArray(typeArgumentsOrTemplate);
@@ -51532,7 +53339,7 @@ var ts;
     }
     ts.updateTaggedTemplate = updateTaggedTemplate;
     function createTypeAssertion(type, expression) {
-        var node = createSynthesizedNode(194);
+        var node = createSynthesizedNode(195);
         node.type = type;
         node.expression = ts.parenthesizePrefixOperand(expression);
         return node;
@@ -51546,7 +53353,7 @@ var ts;
     }
     ts.updateTypeAssertion = updateTypeAssertion;
     function createParen(expression) {
-        var node = createSynthesizedNode(195);
+        var node = createSynthesizedNode(196);
         node.expression = expression;
         return node;
     }
@@ -51558,7 +53365,7 @@ var ts;
     }
     ts.updateParen = updateParen;
     function createFunctionExpression(modifiers, asteriskToken, name, typeParameters, parameters, type, body) {
-        var node = createSynthesizedNode(196);
+        var node = createSynthesizedNode(197);
         node.modifiers = asNodeArray(modifiers);
         node.asteriskToken = asteriskToken;
         node.name = asName(name);
@@ -51582,7 +53389,7 @@ var ts;
     }
     ts.updateFunctionExpression = updateFunctionExpression;
     function createArrowFunction(modifiers, typeParameters, parameters, type, equalsGreaterThanToken, body) {
-        var node = createSynthesizedNode(197);
+        var node = createSynthesizedNode(198);
         node.modifiers = asNodeArray(modifiers);
         node.typeParameters = asNodeArray(typeParameters);
         node.parameters = createNodeArray(parameters);
@@ -51604,7 +53411,7 @@ var ts;
     }
     ts.updateArrowFunction = updateArrowFunction;
     function createDelete(expression) {
-        var node = createSynthesizedNode(198);
+        var node = createSynthesizedNode(199);
         node.expression = ts.parenthesizePrefixOperand(expression);
         return node;
     }
@@ -51616,7 +53423,7 @@ var ts;
     }
     ts.updateDelete = updateDelete;
     function createTypeOf(expression) {
-        var node = createSynthesizedNode(199);
+        var node = createSynthesizedNode(200);
         node.expression = ts.parenthesizePrefixOperand(expression);
         return node;
     }
@@ -51628,7 +53435,7 @@ var ts;
     }
     ts.updateTypeOf = updateTypeOf;
     function createVoid(expression) {
-        var node = createSynthesizedNode(200);
+        var node = createSynthesizedNode(201);
         node.expression = ts.parenthesizePrefixOperand(expression);
         return node;
     }
@@ -51640,7 +53447,7 @@ var ts;
     }
     ts.updateVoid = updateVoid;
     function createAwait(expression) {
-        var node = createSynthesizedNode(201);
+        var node = createSynthesizedNode(202);
         node.expression = ts.parenthesizePrefixOperand(expression);
         return node;
     }
@@ -51652,7 +53459,7 @@ var ts;
     }
     ts.updateAwait = updateAwait;
     function createPrefix(operator, operand) {
-        var node = createSynthesizedNode(202);
+        var node = createSynthesizedNode(203);
         node.operator = operator;
         node.operand = ts.parenthesizePrefixOperand(operand);
         return node;
@@ -51665,7 +53472,7 @@ var ts;
     }
     ts.updatePrefix = updatePrefix;
     function createPostfix(operand, operator) {
-        var node = createSynthesizedNode(203);
+        var node = createSynthesizedNode(204);
         node.operand = ts.parenthesizePostfixOperand(operand);
         node.operator = operator;
         return node;
@@ -51678,7 +53485,7 @@ var ts;
     }
     ts.updatePostfix = updatePostfix;
     function createBinary(left, operator, right) {
-        var node = createSynthesizedNode(204);
+        var node = createSynthesizedNode(205);
         var operatorToken = asToken(operator);
         var operatorKind = operatorToken.kind;
         node.left = ts.parenthesizeBinaryOperand(operatorKind, left, true, undefined);
@@ -51695,7 +53502,7 @@ var ts;
     }
     ts.updateBinary = updateBinary;
     function createConditional(condition, questionTokenOrWhenTrue, whenTrueOrWhenFalse, colonToken, whenFalse) {
-        var node = createSynthesizedNode(205);
+        var node = createSynthesizedNode(206);
         node.condition = ts.parenthesizeForConditionalHead(condition);
         node.questionToken = whenFalse ? questionTokenOrWhenTrue : createToken(56);
         node.whenTrue = ts.parenthesizeSubexpressionOfConditionalExpression(whenFalse ? whenTrueOrWhenFalse : questionTokenOrWhenTrue);
@@ -51715,7 +53522,7 @@ var ts;
     }
     ts.updateConditional = updateConditional;
     function createTemplateExpression(head, templateSpans) {
-        var node = createSynthesizedNode(206);
+        var node = createSynthesizedNode(207);
         node.head = head;
         node.templateSpans = createNodeArray(templateSpans);
         return node;
@@ -51753,7 +53560,7 @@ var ts;
     }
     ts.createNoSubstitutionTemplateLiteral = createNoSubstitutionTemplateLiteral;
     function createYield(asteriskTokenOrExpression, expression) {
-        var node = createSynthesizedNode(207);
+        var node = createSynthesizedNode(208);
         node.asteriskToken = asteriskTokenOrExpression && asteriskTokenOrExpression.kind === 40 ? asteriskTokenOrExpression : undefined;
         node.expression = asteriskTokenOrExpression && asteriskTokenOrExpression.kind !== 40 ? asteriskTokenOrExpression : expression;
         return node;
@@ -51767,7 +53574,7 @@ var ts;
     }
     ts.updateYield = updateYield;
     function createSpread(expression) {
-        var node = createSynthesizedNode(208);
+        var node = createSynthesizedNode(209);
         node.expression = ts.parenthesizeExpressionForList(expression);
         return node;
     }
@@ -51779,7 +53586,7 @@ var ts;
     }
     ts.updateSpread = updateSpread;
     function createClassExpression(modifiers, name, typeParameters, heritageClauses, members) {
-        var node = createSynthesizedNode(209);
+        var node = createSynthesizedNode(210);
         node.decorators = undefined;
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
@@ -51800,11 +53607,11 @@ var ts;
     }
     ts.updateClassExpression = updateClassExpression;
     function createOmittedExpression() {
-        return createSynthesizedNode(210);
+        return createSynthesizedNode(211);
     }
     ts.createOmittedExpression = createOmittedExpression;
     function createExpressionWithTypeArguments(typeArguments, expression) {
-        var node = createSynthesizedNode(211);
+        var node = createSynthesizedNode(212);
         node.expression = ts.parenthesizeForAccess(expression);
         node.typeArguments = asNodeArray(typeArguments);
         return node;
@@ -51818,7 +53625,7 @@ var ts;
     }
     ts.updateExpressionWithTypeArguments = updateExpressionWithTypeArguments;
     function createAsExpression(expression, type) {
-        var node = createSynthesizedNode(212);
+        var node = createSynthesizedNode(213);
         node.expression = expression;
         node.type = type;
         return node;
@@ -51832,7 +53639,7 @@ var ts;
     }
     ts.updateAsExpression = updateAsExpression;
     function createNonNullExpression(expression) {
-        var node = createSynthesizedNode(213);
+        var node = createSynthesizedNode(214);
         node.expression = ts.parenthesizeForAccess(expression);
         return node;
     }
@@ -51844,7 +53651,7 @@ var ts;
     }
     ts.updateNonNullExpression = updateNonNullExpression;
     function createMetaProperty(keywordToken, name) {
-        var node = createSynthesizedNode(214);
+        var node = createSynthesizedNode(215);
         node.keywordToken = keywordToken;
         node.name = name;
         return node;
@@ -51857,7 +53664,7 @@ var ts;
     }
     ts.updateMetaProperty = updateMetaProperty;
     function createTemplateSpan(expression, literal) {
-        var node = createSynthesizedNode(216);
+        var node = createSynthesizedNode(217);
         node.expression = expression;
         node.literal = literal;
         return node;
@@ -51871,11 +53678,11 @@ var ts;
     }
     ts.updateTemplateSpan = updateTemplateSpan;
     function createSemicolonClassElement() {
-        return createSynthesizedNode(217);
+        return createSynthesizedNode(218);
     }
     ts.createSemicolonClassElement = createSemicolonClassElement;
     function createBlock(statements, multiLine) {
-        var block = createSynthesizedNode(218);
+        var block = createSynthesizedNode(219);
         block.statements = createNodeArray(statements);
         if (multiLine)
             block.multiLine = multiLine;
@@ -51889,7 +53696,7 @@ var ts;
     }
     ts.updateBlock = updateBlock;
     function createVariableStatement(modifiers, declarationList) {
-        var node = createSynthesizedNode(219);
+        var node = createSynthesizedNode(220);
         node.decorators = undefined;
         node.modifiers = asNodeArray(modifiers);
         node.declarationList = ts.isArray(declarationList) ? createVariableDeclarationList(declarationList) : declarationList;
@@ -51904,11 +53711,11 @@ var ts;
     }
     ts.updateVariableStatement = updateVariableStatement;
     function createEmptyStatement() {
-        return createSynthesizedNode(220);
+        return createSynthesizedNode(221);
     }
     ts.createEmptyStatement = createEmptyStatement;
     function createExpressionStatement(expression) {
-        var node = createSynthesizedNode(221);
+        var node = createSynthesizedNode(222);
         node.expression = ts.parenthesizeExpressionForExpressionStatement(expression);
         return node;
     }
@@ -51922,10 +53729,10 @@ var ts;
     ts.createStatement = createExpressionStatement;
     ts.updateStatement = updateExpressionStatement;
     function createIf(expression, thenStatement, elseStatement) {
-        var node = createSynthesizedNode(222);
+        var node = createSynthesizedNode(223);
         node.expression = expression;
-        node.thenStatement = thenStatement;
-        node.elseStatement = elseStatement;
+        node.thenStatement = asEmbeddedStatement(thenStatement);
+        node.elseStatement = asEmbeddedStatement(elseStatement);
         return node;
     }
     ts.createIf = createIf;
@@ -51938,8 +53745,8 @@ var ts;
     }
     ts.updateIf = updateIf;
     function createDo(statement, expression) {
-        var node = createSynthesizedNode(223);
-        node.statement = statement;
+        var node = createSynthesizedNode(224);
+        node.statement = asEmbeddedStatement(statement);
         node.expression = expression;
         return node;
     }
@@ -51952,9 +53759,9 @@ var ts;
     }
     ts.updateDo = updateDo;
     function createWhile(expression, statement) {
-        var node = createSynthesizedNode(224);
+        var node = createSynthesizedNode(225);
         node.expression = expression;
-        node.statement = statement;
+        node.statement = asEmbeddedStatement(statement);
         return node;
     }
     ts.createWhile = createWhile;
@@ -51966,11 +53773,11 @@ var ts;
     }
     ts.updateWhile = updateWhile;
     function createFor(initializer, condition, incrementor, statement) {
-        var node = createSynthesizedNode(225);
+        var node = createSynthesizedNode(226);
         node.initializer = initializer;
         node.condition = condition;
         node.incrementor = incrementor;
-        node.statement = statement;
+        node.statement = asEmbeddedStatement(statement);
         return node;
     }
     ts.createFor = createFor;
@@ -51984,10 +53791,10 @@ var ts;
     }
     ts.updateFor = updateFor;
     function createForIn(initializer, expression, statement) {
-        var node = createSynthesizedNode(226);
+        var node = createSynthesizedNode(227);
         node.initializer = initializer;
         node.expression = expression;
-        node.statement = statement;
+        node.statement = asEmbeddedStatement(statement);
         return node;
     }
     ts.createForIn = createForIn;
@@ -52000,11 +53807,11 @@ var ts;
     }
     ts.updateForIn = updateForIn;
     function createForOf(awaitModifier, initializer, expression, statement) {
-        var node = createSynthesizedNode(227);
+        var node = createSynthesizedNode(228);
         node.awaitModifier = awaitModifier;
         node.initializer = initializer;
         node.expression = expression;
-        node.statement = statement;
+        node.statement = asEmbeddedStatement(statement);
         return node;
     }
     ts.createForOf = createForOf;
@@ -52018,7 +53825,7 @@ var ts;
     }
     ts.updateForOf = updateForOf;
     function createContinue(label) {
-        var node = createSynthesizedNode(228);
+        var node = createSynthesizedNode(229);
         node.label = asName(label);
         return node;
     }
@@ -52030,7 +53837,7 @@ var ts;
     }
     ts.updateContinue = updateContinue;
     function createBreak(label) {
-        var node = createSynthesizedNode(229);
+        var node = createSynthesizedNode(230);
         node.label = asName(label);
         return node;
     }
@@ -52042,7 +53849,7 @@ var ts;
     }
     ts.updateBreak = updateBreak;
     function createReturn(expression) {
-        var node = createSynthesizedNode(230);
+        var node = createSynthesizedNode(231);
         node.expression = expression;
         return node;
     }
@@ -52054,9 +53861,9 @@ var ts;
     }
     ts.updateReturn = updateReturn;
     function createWith(expression, statement) {
-        var node = createSynthesizedNode(231);
+        var node = createSynthesizedNode(232);
         node.expression = expression;
-        node.statement = statement;
+        node.statement = asEmbeddedStatement(statement);
         return node;
     }
     ts.createWith = createWith;
@@ -52068,7 +53875,7 @@ var ts;
     }
     ts.updateWith = updateWith;
     function createSwitch(expression, caseBlock) {
-        var node = createSynthesizedNode(232);
+        var node = createSynthesizedNode(233);
         node.expression = ts.parenthesizeExpressionForList(expression);
         node.caseBlock = caseBlock;
         return node;
@@ -52082,9 +53889,9 @@ var ts;
     }
     ts.updateSwitch = updateSwitch;
     function createLabel(label, statement) {
-        var node = createSynthesizedNode(233);
+        var node = createSynthesizedNode(234);
         node.label = asName(label);
-        node.statement = statement;
+        node.statement = asEmbeddedStatement(statement);
         return node;
     }
     ts.createLabel = createLabel;
@@ -52096,7 +53903,7 @@ var ts;
     }
     ts.updateLabel = updateLabel;
     function createThrow(expression) {
-        var node = createSynthesizedNode(234);
+        var node = createSynthesizedNode(235);
         node.expression = expression;
         return node;
     }
@@ -52108,7 +53915,7 @@ var ts;
     }
     ts.updateThrow = updateThrow;
     function createTry(tryBlock, catchClause, finallyBlock) {
-        var node = createSynthesizedNode(235);
+        var node = createSynthesizedNode(236);
         node.tryBlock = tryBlock;
         node.catchClause = catchClause;
         node.finallyBlock = finallyBlock;
@@ -52124,11 +53931,11 @@ var ts;
     }
     ts.updateTry = updateTry;
     function createDebuggerStatement() {
-        return createSynthesizedNode(236);
+        return createSynthesizedNode(237);
     }
     ts.createDebuggerStatement = createDebuggerStatement;
     function createVariableDeclaration(name, type, initializer) {
-        var node = createSynthesizedNode(237);
+        var node = createSynthesizedNode(238);
         node.name = asName(name);
         node.type = type;
         node.initializer = initializer !== undefined ? ts.parenthesizeExpressionForList(initializer) : undefined;
@@ -52145,7 +53952,7 @@ var ts;
     ts.updateVariableDeclaration = updateVariableDeclaration;
     function createVariableDeclarationList(declarations, flags) {
         if (flags === void 0) { flags = 0; }
-        var node = createSynthesizedNode(238);
+        var node = createSynthesizedNode(239);
         node.flags |= flags & 3;
         node.declarations = createNodeArray(declarations);
         return node;
@@ -52158,7 +53965,7 @@ var ts;
     }
     ts.updateVariableDeclarationList = updateVariableDeclarationList;
     function createFunctionDeclaration(decorators, modifiers, asteriskToken, name, typeParameters, parameters, type, body) {
-        var node = createSynthesizedNode(239);
+        var node = createSynthesizedNode(240);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.asteriskToken = asteriskToken;
@@ -52184,7 +53991,7 @@ var ts;
     }
     ts.updateFunctionDeclaration = updateFunctionDeclaration;
     function createClassDeclaration(decorators, modifiers, name, typeParameters, heritageClauses, members) {
-        var node = createSynthesizedNode(240);
+        var node = createSynthesizedNode(241);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
@@ -52206,7 +54013,7 @@ var ts;
     }
     ts.updateClassDeclaration = updateClassDeclaration;
     function createInterfaceDeclaration(decorators, modifiers, name, typeParameters, heritageClauses, members) {
-        var node = createSynthesizedNode(241);
+        var node = createSynthesizedNode(242);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
@@ -52228,7 +54035,7 @@ var ts;
     }
     ts.updateInterfaceDeclaration = updateInterfaceDeclaration;
     function createTypeAliasDeclaration(decorators, modifiers, name, typeParameters, type) {
-        var node = createSynthesizedNode(242);
+        var node = createSynthesizedNode(243);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
@@ -52248,7 +54055,7 @@ var ts;
     }
     ts.updateTypeAliasDeclaration = updateTypeAliasDeclaration;
     function createEnumDeclaration(decorators, modifiers, name, members) {
-        var node = createSynthesizedNode(243);
+        var node = createSynthesizedNode(244);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
@@ -52267,7 +54074,7 @@ var ts;
     ts.updateEnumDeclaration = updateEnumDeclaration;
     function createModuleDeclaration(decorators, modifiers, name, body, flags) {
         if (flags === void 0) { flags = 0; }
-        var node = createSynthesizedNode(244);
+        var node = createSynthesizedNode(245);
         node.flags |= flags & (16 | 4 | 512);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
@@ -52286,7 +54093,7 @@ var ts;
     }
     ts.updateModuleDeclaration = updateModuleDeclaration;
     function createModuleBlock(statements) {
-        var node = createSynthesizedNode(245);
+        var node = createSynthesizedNode(246);
         node.statements = createNodeArray(statements);
         return node;
     }
@@ -52298,7 +54105,7 @@ var ts;
     }
     ts.updateModuleBlock = updateModuleBlock;
     function createCaseBlock(clauses) {
-        var node = createSynthesizedNode(246);
+        var node = createSynthesizedNode(247);
         node.clauses = createNodeArray(clauses);
         return node;
     }
@@ -52310,7 +54117,7 @@ var ts;
     }
     ts.updateCaseBlock = updateCaseBlock;
     function createNamespaceExportDeclaration(name) {
-        var node = createSynthesizedNode(247);
+        var node = createSynthesizedNode(248);
         node.name = asName(name);
         return node;
     }
@@ -52322,7 +54129,7 @@ var ts;
     }
     ts.updateNamespaceExportDeclaration = updateNamespaceExportDeclaration;
     function createImportEqualsDeclaration(decorators, modifiers, name, moduleReference) {
-        var node = createSynthesizedNode(248);
+        var node = createSynthesizedNode(249);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
@@ -52340,7 +54147,7 @@ var ts;
     }
     ts.updateImportEqualsDeclaration = updateImportEqualsDeclaration;
     function createImportDeclaration(decorators, modifiers, importClause, moduleSpecifier) {
-        var node = createSynthesizedNode(249);
+        var node = createSynthesizedNode(250);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.importClause = importClause;
@@ -52358,7 +54165,7 @@ var ts;
     }
     ts.updateImportDeclaration = updateImportDeclaration;
     function createImportClause(name, namedBindings) {
-        var node = createSynthesizedNode(250);
+        var node = createSynthesizedNode(251);
         node.name = name;
         node.namedBindings = namedBindings;
         return node;
@@ -52372,7 +54179,7 @@ var ts;
     }
     ts.updateImportClause = updateImportClause;
     function createNamespaceImport(name) {
-        var node = createSynthesizedNode(251);
+        var node = createSynthesizedNode(252);
         node.name = name;
         return node;
     }
@@ -52384,7 +54191,7 @@ var ts;
     }
     ts.updateNamespaceImport = updateNamespaceImport;
     function createNamedImports(elements) {
-        var node = createSynthesizedNode(252);
+        var node = createSynthesizedNode(253);
         node.elements = createNodeArray(elements);
         return node;
     }
@@ -52396,7 +54203,7 @@ var ts;
     }
     ts.updateNamedImports = updateNamedImports;
     function createImportSpecifier(propertyName, name) {
-        var node = createSynthesizedNode(253);
+        var node = createSynthesizedNode(254);
         node.propertyName = propertyName;
         node.name = name;
         return node;
@@ -52410,11 +54217,11 @@ var ts;
     }
     ts.updateImportSpecifier = updateImportSpecifier;
     function createExportAssignment(decorators, modifiers, isExportEquals, expression) {
-        var node = createSynthesizedNode(254);
+        var node = createSynthesizedNode(255);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.isExportEquals = isExportEquals;
-        node.expression = isExportEquals ? ts.parenthesizeBinaryOperand(59, expression, false, undefined) : ts.parenthesizeDefaultExpression(expression);
+        node.expression = isExportEquals ? ts.parenthesizeBinaryOperand(60, expression, false, undefined) : ts.parenthesizeDefaultExpression(expression);
         return node;
     }
     ts.createExportAssignment = createExportAssignment;
@@ -52427,7 +54234,7 @@ var ts;
     }
     ts.updateExportAssignment = updateExportAssignment;
     function createExportDeclaration(decorators, modifiers, exportClause, moduleSpecifier) {
-        var node = createSynthesizedNode(255);
+        var node = createSynthesizedNode(256);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.exportClause = exportClause;
@@ -52445,7 +54252,7 @@ var ts;
     }
     ts.updateExportDeclaration = updateExportDeclaration;
     function createNamedExports(elements) {
-        var node = createSynthesizedNode(256);
+        var node = createSynthesizedNode(257);
         node.elements = createNodeArray(elements);
         return node;
     }
@@ -52457,7 +54264,7 @@ var ts;
     }
     ts.updateNamedExports = updateNamedExports;
     function createExportSpecifier(propertyName, name) {
-        var node = createSynthesizedNode(257);
+        var node = createSynthesizedNode(258);
         node.propertyName = asName(propertyName);
         node.name = asName(name);
         return node;
@@ -52471,7 +54278,7 @@ var ts;
     }
     ts.updateExportSpecifier = updateExportSpecifier;
     function createExternalModuleReference(expression) {
-        var node = createSynthesizedNode(259);
+        var node = createSynthesizedNode(260);
         node.expression = expression;
         return node;
     }
@@ -52483,27 +54290,33 @@ var ts;
     }
     ts.updateExternalModuleReference = updateExternalModuleReference;
     function createJSDocTypeExpression(type) {
-        var node = createSynthesizedNode(288);
+        var node = createSynthesizedNode(289);
         node.type = type;
         return node;
     }
     ts.createJSDocTypeExpression = createJSDocTypeExpression;
     function createJSDocTypeTag(typeExpression, comment) {
-        var tag = createJSDocTag(307, "type");
+        var tag = createJSDocTag(309, "type");
         tag.typeExpression = typeExpression;
         tag.comment = comment;
         return tag;
     }
     ts.createJSDocTypeTag = createJSDocTypeTag;
     function createJSDocReturnTag(typeExpression, comment) {
-        var tag = createJSDocTag(305, "returns");
+        var tag = createJSDocTag(307, "returns");
         tag.typeExpression = typeExpression;
         tag.comment = comment;
         return tag;
     }
     ts.createJSDocReturnTag = createJSDocReturnTag;
+    function createJSDocThisTag(typeExpression) {
+        var tag = createJSDocTag(308, "this");
+        tag.typeExpression = typeExpression;
+        return tag;
+    }
+    ts.createJSDocThisTag = createJSDocThisTag;
     function createJSDocParamTag(name, isBracketed, typeExpression, comment) {
-        var tag = createJSDocTag(304, "param");
+        var tag = createJSDocTag(306, "param");
         tag.typeExpression = typeExpression;
         tag.name = name;
         tag.isBracketed = isBracketed;
@@ -52512,7 +54325,7 @@ var ts;
     }
     ts.createJSDocParamTag = createJSDocParamTag;
     function createJSDocComment(comment, tags) {
-        var node = createSynthesizedNode(296);
+        var node = createSynthesizedNode(297);
         node.comment = comment;
         node.tags = tags;
         return node;
@@ -52524,7 +54337,7 @@ var ts;
         return node;
     }
     function createJsxElement(openingElement, children, closingElement) {
-        var node = createSynthesizedNode(260);
+        var node = createSynthesizedNode(261);
         node.openingElement = openingElement;
         node.children = createNodeArray(children);
         node.closingElement = closingElement;
@@ -52540,7 +54353,7 @@ var ts;
     }
     ts.updateJsxElement = updateJsxElement;
     function createJsxSelfClosingElement(tagName, typeArguments, attributes) {
-        var node = createSynthesizedNode(261);
+        var node = createSynthesizedNode(262);
         node.tagName = tagName;
         node.typeArguments = asNodeArray(typeArguments);
         node.attributes = attributes;
@@ -52556,7 +54369,7 @@ var ts;
     }
     ts.updateJsxSelfClosingElement = updateJsxSelfClosingElement;
     function createJsxOpeningElement(tagName, typeArguments, attributes) {
-        var node = createSynthesizedNode(262);
+        var node = createSynthesizedNode(263);
         node.tagName = tagName;
         node.typeArguments = asNodeArray(typeArguments);
         node.attributes = attributes;
@@ -52572,7 +54385,7 @@ var ts;
     }
     ts.updateJsxOpeningElement = updateJsxOpeningElement;
     function createJsxClosingElement(tagName) {
-        var node = createSynthesizedNode(263);
+        var node = createSynthesizedNode(264);
         node.tagName = tagName;
         return node;
     }
@@ -52584,13 +54397,35 @@ var ts;
     }
     ts.updateJsxClosingElement = updateJsxClosingElement;
     function createJsxFragment(openingFragment, children, closingFragment) {
-        var node = createSynthesizedNode(264);
+        var node = createSynthesizedNode(265);
         node.openingFragment = openingFragment;
         node.children = createNodeArray(children);
         node.closingFragment = closingFragment;
         return node;
     }
     ts.createJsxFragment = createJsxFragment;
+    function createJsxText(text, containsOnlyTriviaWhiteSpaces) {
+        var node = createSynthesizedNode(11);
+        node.text = text;
+        node.containsOnlyTriviaWhiteSpaces = !!containsOnlyTriviaWhiteSpaces;
+        return node;
+    }
+    ts.createJsxText = createJsxText;
+    function updateJsxText(node, text, containsOnlyTriviaWhiteSpaces) {
+        return node.text !== text
+            || node.containsOnlyTriviaWhiteSpaces !== containsOnlyTriviaWhiteSpaces
+            ? updateNode(createJsxText(text, containsOnlyTriviaWhiteSpaces), node)
+            : node;
+    }
+    ts.updateJsxText = updateJsxText;
+    function createJsxOpeningFragment() {
+        return createSynthesizedNode(266);
+    }
+    ts.createJsxOpeningFragment = createJsxOpeningFragment;
+    function createJsxJsxClosingFragment() {
+        return createSynthesizedNode(267);
+    }
+    ts.createJsxJsxClosingFragment = createJsxJsxClosingFragment;
     function updateJsxFragment(node, openingFragment, children, closingFragment) {
         return node.openingFragment !== openingFragment
             || node.children !== children
@@ -52600,7 +54435,7 @@ var ts;
     }
     ts.updateJsxFragment = updateJsxFragment;
     function createJsxAttribute(name, initializer) {
-        var node = createSynthesizedNode(267);
+        var node = createSynthesizedNode(268);
         node.name = name;
         node.initializer = initializer;
         return node;
@@ -52614,7 +54449,7 @@ var ts;
     }
     ts.updateJsxAttribute = updateJsxAttribute;
     function createJsxAttributes(properties) {
-        var node = createSynthesizedNode(268);
+        var node = createSynthesizedNode(269);
         node.properties = createNodeArray(properties);
         return node;
     }
@@ -52626,7 +54461,7 @@ var ts;
     }
     ts.updateJsxAttributes = updateJsxAttributes;
     function createJsxSpreadAttribute(expression) {
-        var node = createSynthesizedNode(269);
+        var node = createSynthesizedNode(270);
         node.expression = expression;
         return node;
     }
@@ -52638,7 +54473,7 @@ var ts;
     }
     ts.updateJsxSpreadAttribute = updateJsxSpreadAttribute;
     function createJsxExpression(dotDotDotToken, expression) {
-        var node = createSynthesizedNode(270);
+        var node = createSynthesizedNode(271);
         node.dotDotDotToken = dotDotDotToken;
         node.expression = expression;
         return node;
@@ -52651,7 +54486,7 @@ var ts;
     }
     ts.updateJsxExpression = updateJsxExpression;
     function createCaseClause(expression, statements) {
-        var node = createSynthesizedNode(271);
+        var node = createSynthesizedNode(272);
         node.expression = ts.parenthesizeExpressionForList(expression);
         node.statements = createNodeArray(statements);
         return node;
@@ -52665,7 +54500,7 @@ var ts;
     }
     ts.updateCaseClause = updateCaseClause;
     function createDefaultClause(statements) {
-        var node = createSynthesizedNode(272);
+        var node = createSynthesizedNode(273);
         node.statements = createNodeArray(statements);
         return node;
     }
@@ -52677,7 +54512,7 @@ var ts;
     }
     ts.updateDefaultClause = updateDefaultClause;
     function createHeritageClause(token, types) {
-        var node = createSynthesizedNode(273);
+        var node = createSynthesizedNode(274);
         node.token = token;
         node.types = createNodeArray(types);
         return node;
@@ -52690,7 +54525,7 @@ var ts;
     }
     ts.updateHeritageClause = updateHeritageClause;
     function createCatchClause(variableDeclaration, block) {
-        var node = createSynthesizedNode(274);
+        var node = createSynthesizedNode(275);
         node.variableDeclaration = ts.isString(variableDeclaration) ? createVariableDeclaration(variableDeclaration) : variableDeclaration;
         node.block = block;
         return node;
@@ -52704,7 +54539,7 @@ var ts;
     }
     ts.updateCatchClause = updateCatchClause;
     function createPropertyAssignment(name, initializer) {
-        var node = createSynthesizedNode(275);
+        var node = createSynthesizedNode(276);
         node.name = asName(name);
         node.questionToken = undefined;
         node.initializer = ts.parenthesizeExpressionForList(initializer);
@@ -52719,7 +54554,7 @@ var ts;
     }
     ts.updatePropertyAssignment = updatePropertyAssignment;
     function createShorthandPropertyAssignment(name, objectAssignmentInitializer) {
-        var node = createSynthesizedNode(276);
+        var node = createSynthesizedNode(277);
         node.name = asName(name);
         node.objectAssignmentInitializer = objectAssignmentInitializer !== undefined ? ts.parenthesizeExpressionForList(objectAssignmentInitializer) : undefined;
         return node;
@@ -52733,8 +54568,8 @@ var ts;
     }
     ts.updateShorthandPropertyAssignment = updateShorthandPropertyAssignment;
     function createSpreadAssignment(expression) {
-        var node = createSynthesizedNode(277);
-        node.expression = expression !== undefined ? ts.parenthesizeExpressionForList(expression) : undefined;
+        var node = createSynthesizedNode(278);
+        node.expression = ts.parenthesizeExpressionForList(expression);
         return node;
     }
     ts.createSpreadAssignment = createSpreadAssignment;
@@ -52745,7 +54580,7 @@ var ts;
     }
     ts.updateSpreadAssignment = updateSpreadAssignment;
     function createEnumMember(name, initializer) {
-        var node = createSynthesizedNode(278);
+        var node = createSynthesizedNode(279);
         node.name = asName(name);
         node.initializer = initializer && ts.parenthesizeExpressionForList(initializer);
         return node;
@@ -52765,7 +54600,7 @@ var ts;
             (typeReferences !== undefined && node.typeReferenceDirectives !== typeReferences) ||
             (libReferences !== undefined && node.libReferenceDirectives !== libReferences) ||
             (hasNoDefaultLib !== undefined && node.hasNoDefaultLib !== hasNoDefaultLib)) {
-            var updated = createSynthesizedNode(284);
+            var updated = createSynthesizedNode(285);
             updated.flags |= node.flags;
             updated.statements = createNodeArray(statements);
             updated.endOfFileToken = node.endOfFileToken;
@@ -52839,28 +54674,28 @@ var ts;
     }
     ts.getMutableClone = getMutableClone;
     function createNotEmittedStatement(original) {
-        var node = createSynthesizedNode(312);
+        var node = createSynthesizedNode(314);
         node.original = original;
         setTextRange(node, original);
         return node;
     }
     ts.createNotEmittedStatement = createNotEmittedStatement;
     function createEndOfDeclarationMarker(original) {
-        var node = createSynthesizedNode(316);
+        var node = createSynthesizedNode(318);
         node.emitNode = {};
         node.original = original;
         return node;
     }
     ts.createEndOfDeclarationMarker = createEndOfDeclarationMarker;
     function createMergeDeclarationMarker(original) {
-        var node = createSynthesizedNode(315);
+        var node = createSynthesizedNode(317);
         node.emitNode = {};
         node.original = original;
         return node;
     }
     ts.createMergeDeclarationMarker = createMergeDeclarationMarker;
     function createPartiallyEmittedExpression(expression, original) {
-        var node = createSynthesizedNode(313);
+        var node = createSynthesizedNode(315);
         node.expression = expression;
         node.original = original;
         setTextRange(node, original);
@@ -52876,7 +54711,7 @@ var ts;
     ts.updatePartiallyEmittedExpression = updatePartiallyEmittedExpression;
     function flattenCommaElements(node) {
         if (ts.nodeIsSynthesized(node) && !ts.isParseTreeNode(node) && !node.original && !node.emitNode && !node.id) {
-            if (node.kind === 314) {
+            if (node.kind === 316) {
                 return node.elements;
             }
             if (ts.isBinaryExpression(node) && node.operatorToken.kind === 27) {
@@ -52886,7 +54721,7 @@ var ts;
         return node;
     }
     function createCommaList(elements) {
-        var node = createSynthesizedNode(314);
+        var node = createSynthesizedNode(316);
         node.elements = createNodeArray(ts.sameFlatMap(elements, flattenCommaElements));
         return node;
     }
@@ -52899,7 +54734,7 @@ var ts;
     ts.updateCommaList = updateCommaList;
     function createBundle(sourceFiles, prepends) {
         if (prepends === void 0) { prepends = ts.emptyArray; }
-        var node = ts.createNode(285);
+        var node = ts.createNode(286);
         node.prepends = prepends;
         node.sourceFiles = sourceFiles;
         return node;
@@ -52911,6 +54746,7 @@ var ts;
             ts.valuesHelper,
             ts.readHelper,
             ts.spreadHelper,
+            ts.spreadArraysHelper,
             ts.restHelper,
             ts.decorateHelper,
             ts.metadataHelper,
@@ -52929,7 +54765,7 @@ var ts;
         ], function (helper) { return helper.name; }));
     }
     function createUnparsedSource() {
-        var node = ts.createNode(286);
+        var node = ts.createNode(287);
         node.prologues = ts.emptyArray;
         node.referencedFiles = ts.emptyArray;
         node.libReferenceDirectives = ts.emptyArray;
@@ -53059,10 +54895,10 @@ var ts;
     }
     function mapBundleFileSectionKindToSyntaxKind(kind) {
         switch (kind) {
-            case "prologue": return 279;
-            case "prepend": return 280;
-            case "internal": return 282;
-            case "text": return 281;
+            case "prologue": return 280;
+            case "prepend": return 281;
+            case "internal": return 283;
+            case "text": return 282;
             case "emitHelpers":
             case "no-default-lib":
             case "reference":
@@ -53080,14 +54916,14 @@ var ts;
         return node;
     }
     function createUnparsedSyntheticReference(section, parent) {
-        var node = ts.createNode(283, section.pos, section.end);
+        var node = ts.createNode(284, section.pos, section.end);
         node.parent = parent;
         node.data = section.data;
         node.section = section;
         return node;
     }
     function createInputFiles(javascriptTextOrReadFileText, declarationTextOrJavascriptPath, javascriptMapPath, javascriptMapTextOrDeclarationPath, declarationMapPath, declarationMapTextOrBuildInfoPath, javascriptPath, declarationPath, buildInfoPath, buildInfo, oldFileOfCurrentEmit) {
-        var node = ts.createNode(287);
+        var node = ts.createNode(288);
         if (!ts.isString(javascriptTextOrReadFileText)) {
             var cache_1 = ts.createMap();
             var textGetter_1 = function (path) {
@@ -53166,7 +55002,7 @@ var ts;
     }
     ts.createLessThan = createLessThan;
     function createAssignment(left, right) {
-        return createBinary(left, 59, right);
+        return createBinary(left, 60, right);
     }
     ts.createAssignment = createAssignment;
     function createStrictEquality(left, right) {
@@ -53225,6 +55061,9 @@ var ts;
     function asToken(value) {
         return typeof value === "number" ? createToken(value) : value;
     }
+    function asEmbeddedStatement(statement) {
+        return statement && ts.isNotEmittedStatement(statement) ? setTextRange(setOriginalNode(createEmptyStatement(), statement), statement) : statement;
+    }
     function disposeEmitNodes(sourceFile) {
         sourceFile = ts.getSourceFileOfNode(ts.getParseTreeNode(sourceFile));
         var emitNode = sourceFile && sourceFile.emitNode;
@@ -53240,7 +55079,7 @@ var ts;
     function getOrCreateEmitNode(node) {
         if (!node.emitNode) {
             if (ts.isParseTreeNode(node)) {
-                if (node.kind === 284) {
+                if (node.kind === 285) {
                     return node.emitNode = { annotatedNodes: [node] };
                 }
                 var sourceFile = ts.getSourceFileOfNode(ts.getParseTreeNode(ts.getSourceFileOfNode(node)));
@@ -53251,6 +55090,14 @@ var ts;
         return node.emitNode;
     }
     ts.getOrCreateEmitNode = getOrCreateEmitNode;
+    function removeAllComments(node) {
+        var emitNode = getOrCreateEmitNode(node);
+        emitNode.flags |= 1536;
+        emitNode.leadingComments = undefined;
+        emitNode.trailingComments = undefined;
+        return node;
+    }
+    ts.removeAllComments = removeAllComments;
     function setTextRange(range, location) {
         if (location) {
             range.pos = location.pos;
@@ -53480,7 +55327,7 @@ var ts;
     ts.nullTransformationContext = {
         enableEmitNotification: ts.noop,
         enableSubstitution: ts.noop,
-        endLexicalEnvironment: function () { return undefined; },
+        endLexicalEnvironment: ts.returnUndefined,
         getCompilerOptions: ts.notImplemented,
         getEmitHost: ts.notImplemented,
         getEmitResolver: ts.notImplemented,
@@ -53646,6 +55493,16 @@ var ts;
         return ts.setTextRange(ts.createCall(getHelperName("__spread"), undefined, argumentList), location);
     }
     ts.createSpreadHelper = createSpreadHelper;
+    ts.spreadArraysHelper = {
+        name: "typescript:spreadArrays",
+        scoped: false,
+        text: "\n            var __spreadArrays = (this && this.__spreadArrays) || function () {\n                for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;\n                for (var r = Array(s), k = 0, i = 0; i < il; i++)\n                    for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)\n                        r[k] = a[j];\n                return r;\n            };"
+    };
+    function createSpreadArraysHelper(context, argumentList, location) {
+        context.requestEmitHelper(ts.spreadArraysHelper);
+        return ts.setTextRange(ts.createCall(getHelperName("__spreadArrays"), undefined, argumentList), location);
+    }
+    ts.createSpreadArraysHelper = createSpreadArraysHelper;
     function createForOfBindingStatement(node, boundValue) {
         if (ts.isVariableDeclarationList(node)) {
             var firstDeclaration = ts.first(node.declarations);
@@ -53671,7 +55528,7 @@ var ts;
         if (!outermostLabeledStatement) {
             return node;
         }
-        var updated = ts.updateLabel(outermostLabeledStatement, outermostLabeledStatement.label, outermostLabeledStatement.statement.kind === 233
+        var updated = ts.updateLabel(outermostLabeledStatement, outermostLabeledStatement.label, outermostLabeledStatement.statement.kind === 234
             ? restoreEnclosingLabel(node, outermostLabeledStatement.statement)
             : node);
         if (afterRestoreLabelCallback) {
@@ -53683,20 +55540,20 @@ var ts;
     function shouldBeCapturedInTempVariable(node, cacheIdentifiers) {
         var target = ts.skipParentheses(node);
         switch (target.kind) {
-            case 72:
+            case 73:
                 return cacheIdentifiers;
-            case 100:
+            case 101:
             case 8:
             case 9:
             case 10:
                 return false;
-            case 187:
+            case 188:
                 var elements = target.elements;
                 if (elements.length === 0) {
                     return false;
                 }
                 return true;
-            case 188:
+            case 189:
                 return target.properties.length > 0;
             default:
                 return true;
@@ -53711,7 +55568,7 @@ var ts;
             thisArg = ts.createThis();
             target = callee;
         }
-        else if (callee.kind === 98) {
+        else if (callee.kind === 99) {
             thisArg = ts.createThis();
             target = languageVersion < 2
                 ? ts.setTextRange(ts.createIdentifier("_super"), callee)
@@ -53723,7 +55580,7 @@ var ts;
         }
         else {
             switch (callee.kind) {
-                case 189: {
+                case 190: {
                     if (shouldBeCapturedInTempVariable(callee.expression, cacheIdentifiers)) {
                         thisArg = ts.createTempVariable(recordTempVariable);
                         target = ts.createPropertyAccess(ts.setTextRange(ts.createAssignment(thisArg, callee.expression), callee.expression), callee.name);
@@ -53735,7 +55592,7 @@ var ts;
                     }
                     break;
                 }
-                case 190: {
+                case 191: {
                     if (shouldBeCapturedInTempVariable(callee.expression, cacheIdentifiers)) {
                         thisArg = ts.createTempVariable(recordTempVariable);
                         target = ts.createElementAccess(ts.setTextRange(ts.createAssignment(thisArg, callee.expression), callee.expression), callee.argumentExpression);
@@ -53788,14 +55645,14 @@ var ts;
     ts.createExpressionForPropertyName = createExpressionForPropertyName;
     function createExpressionForObjectLiteralElementLike(node, property, receiver) {
         switch (property.kind) {
-            case 158:
             case 159:
+            case 160:
                 return createExpressionForAccessorDeclaration(node.properties, property, receiver, !!node.multiLine);
-            case 275:
-                return createExpressionForPropertyAssignment(property, receiver);
             case 276:
+                return createExpressionForPropertyAssignment(property, receiver);
+            case 277:
                 return createExpressionForShorthandPropertyAssignment(property, receiver);
-            case 156:
+            case 157:
                 return createExpressionForMethodDeclaration(property, receiver);
         }
     }
@@ -53803,27 +55660,27 @@ var ts;
     function createExpressionForAccessorDeclaration(properties, property, receiver, multiLine) {
         var _a = ts.getAllAccessorDeclarations(properties, property), firstAccessor = _a.firstAccessor, getAccessor = _a.getAccessor, setAccessor = _a.setAccessor;
         if (property === firstAccessor) {
-            var properties_8 = [];
+            var properties_5 = [];
             if (getAccessor) {
                 var getterFunction = ts.createFunctionExpression(getAccessor.modifiers, undefined, undefined, undefined, getAccessor.parameters, undefined, getAccessor.body);
                 ts.setTextRange(getterFunction, getAccessor);
                 ts.setOriginalNode(getterFunction, getAccessor);
                 var getter = ts.createPropertyAssignment("get", getterFunction);
-                properties_8.push(getter);
+                properties_5.push(getter);
             }
             if (setAccessor) {
                 var setterFunction = ts.createFunctionExpression(setAccessor.modifiers, undefined, undefined, undefined, setAccessor.parameters, undefined, setAccessor.body);
                 ts.setTextRange(setterFunction, setAccessor);
                 ts.setOriginalNode(setterFunction, setAccessor);
                 var setter = ts.createPropertyAssignment("set", setterFunction);
-                properties_8.push(setter);
+                properties_5.push(setter);
             }
-            properties_8.push(ts.createPropertyAssignment("enumerable", ts.createTrue()));
-            properties_8.push(ts.createPropertyAssignment("configurable", ts.createTrue()));
+            properties_5.push(ts.createPropertyAssignment("enumerable", ts.createTrue()));
+            properties_5.push(ts.createPropertyAssignment("configurable", ts.createTrue()));
             var expression = ts.setTextRange(ts.createCall(ts.createPropertyAccess(ts.createIdentifier("Object"), "defineProperty"), undefined, [
                 receiver,
                 createExpressionForPropertyName(property.name),
-                ts.createObjectLiteral(properties_8, multiLine)
+                ts.createObjectLiteral(properties_5, multiLine)
             ]), firstAccessor);
             return ts.aggregateTransformFlags(expression);
         }
@@ -54000,7 +55857,7 @@ var ts;
     ts.ensureUseStrict = ensureUseStrict;
     function parenthesizeBinaryOperand(binaryOperator, operand, isLeftSideOfBinary, leftOperand) {
         var skipped = ts.skipPartiallyEmittedExpressions(operand);
-        if (skipped.kind === 195) {
+        if (skipped.kind === 196) {
             return operand;
         }
         return binaryOperandNeedsParentheses(binaryOperator, operand, isLeftSideOfBinary, leftOperand)
@@ -54009,10 +55866,10 @@ var ts;
     }
     ts.parenthesizeBinaryOperand = parenthesizeBinaryOperand;
     function binaryOperandNeedsParentheses(binaryOperator, operand, isLeftSideOfBinary, leftOperand) {
-        var binaryOperatorPrecedence = ts.getOperatorPrecedence(204, binaryOperator);
-        var binaryOperatorAssociativity = ts.getOperatorAssociativity(204, binaryOperator);
+        var binaryOperatorPrecedence = ts.getOperatorPrecedence(205, binaryOperator);
+        var binaryOperatorAssociativity = ts.getOperatorAssociativity(205, binaryOperator);
         var emittedOperand = ts.skipPartiallyEmittedExpressions(operand);
-        if (!isLeftSideOfBinary && operand.kind === 197 && binaryOperatorPrecedence > 4) {
+        if (!isLeftSideOfBinary && operand.kind === 198 && binaryOperatorPrecedence > 4) {
             return true;
         }
         var operandPrecedence = ts.getExpressionPrecedence(emittedOperand);
@@ -54020,7 +55877,7 @@ var ts;
             case -1:
                 if (!isLeftSideOfBinary
                     && binaryOperatorAssociativity === 1
-                    && operand.kind === 207) {
+                    && operand.kind === 208) {
                     return false;
                 }
                 return true;
@@ -54059,7 +55916,7 @@ var ts;
         if (ts.isLiteralKind(node.kind)) {
             return node.kind;
         }
-        if (node.kind === 204 && node.operatorToken.kind === 38) {
+        if (node.kind === 205 && node.operatorToken.kind === 38) {
             if (node.cachedLiteralKind !== undefined) {
                 return node.cachedLiteralKind;
             }
@@ -54074,7 +55931,7 @@ var ts;
         return 0;
     }
     function parenthesizeForConditionalHead(condition) {
-        var conditionalPrecedence = ts.getOperatorPrecedence(205, 56);
+        var conditionalPrecedence = ts.getOperatorPrecedence(206, 56);
         var emittedCondition = ts.skipPartiallyEmittedExpressions(condition);
         var conditionPrecedence = ts.getExpressionPrecedence(emittedCondition);
         if (ts.compareValues(conditionPrecedence, conditionalPrecedence) === -1) {
@@ -54095,8 +55952,8 @@ var ts;
         var needsParens = isCommaSequence(check);
         if (!needsParens) {
             switch (getLeftmostExpression(check, false).kind) {
-                case 209:
-                case 196:
+                case 210:
+                case 197:
                     needsParens = true;
             }
         }
@@ -54106,9 +55963,9 @@ var ts;
     function parenthesizeForNew(expression) {
         var leftmostExpr = getLeftmostExpression(expression, true);
         switch (leftmostExpr.kind) {
-            case 191:
-                return ts.createParen(expression);
             case 192:
+                return ts.createParen(expression);
+            case 193:
                 return !leftmostExpr.arguments
                     ? ts.createParen(expression)
                     : expression;
@@ -54119,7 +55976,7 @@ var ts;
     function parenthesizeForAccess(expression) {
         var emittedExpression = ts.skipPartiallyEmittedExpressions(expression);
         if (ts.isLeftHandSideExpression(emittedExpression)
-            && (emittedExpression.kind !== 192 || emittedExpression.arguments)) {
+            && (emittedExpression.kind !== 193 || emittedExpression.arguments)) {
             return expression;
         }
         return ts.setTextRange(ts.createParen(expression), expression);
@@ -54157,7 +56014,7 @@ var ts;
     function parenthesizeExpressionForList(expression) {
         var emittedExpression = ts.skipPartiallyEmittedExpressions(expression);
         var expressionPrecedence = ts.getExpressionPrecedence(emittedExpression);
-        var commaPrecedence = ts.getOperatorPrecedence(204, 27);
+        var commaPrecedence = ts.getOperatorPrecedence(205, 27);
         return expressionPrecedence > commaPrecedence
             ? expression
             : ts.setTextRange(ts.createParen(expression), expression);
@@ -54168,29 +56025,29 @@ var ts;
         if (ts.isCallExpression(emittedExpression)) {
             var callee = emittedExpression.expression;
             var kind = ts.skipPartiallyEmittedExpressions(callee).kind;
-            if (kind === 196 || kind === 197) {
+            if (kind === 197 || kind === 198) {
                 var mutableCall = ts.getMutableClone(emittedExpression);
                 mutableCall.expression = ts.setTextRange(ts.createParen(callee), callee);
                 return recreateOuterExpressions(expression, mutableCall, 4);
             }
         }
         var leftmostExpressionKind = getLeftmostExpression(emittedExpression, false).kind;
-        if (leftmostExpressionKind === 188 || leftmostExpressionKind === 196) {
+        if (leftmostExpressionKind === 189 || leftmostExpressionKind === 197) {
             return ts.setTextRange(ts.createParen(expression), expression);
         }
         return expression;
     }
     ts.parenthesizeExpressionForExpressionStatement = parenthesizeExpressionForExpressionStatement;
     function parenthesizeConditionalTypeMember(member) {
-        return member.kind === 175 ? ts.createParenthesizedType(member) : member;
+        return member.kind === 176 ? ts.createParenthesizedType(member) : member;
     }
     ts.parenthesizeConditionalTypeMember = parenthesizeConditionalTypeMember;
     function parenthesizeElementTypeMember(member) {
         switch (member.kind) {
-            case 173:
             case 174:
-            case 165:
+            case 175:
             case 166:
+            case 167:
                 return ts.createParenthesizedType(member);
         }
         return parenthesizeConditionalTypeMember(member);
@@ -54198,9 +56055,9 @@ var ts;
     ts.parenthesizeElementTypeMember = parenthesizeElementTypeMember;
     function parenthesizeArrayTypeMember(member) {
         switch (member.kind) {
-            case 167:
-            case 179:
-            case 176:
+            case 168:
+            case 180:
+            case 177:
                 return ts.createParenthesizedType(member);
         }
         return parenthesizeElementTypeMember(member);
@@ -54226,55 +56083,56 @@ var ts;
     function getLeftmostExpression(node, stopAtCallExpressions) {
         while (true) {
             switch (node.kind) {
-                case 203:
+                case 204:
                     node = node.operand;
                     continue;
-                case 204:
+                case 205:
                     node = node.left;
                     continue;
-                case 205:
+                case 206:
                     node = node.condition;
                     continue;
-                case 193:
+                case 194:
                     node = node.tag;
                     continue;
-                case 191:
+                case 192:
                     if (stopAtCallExpressions) {
                         return node;
                     }
-                case 212:
-                case 190:
-                case 189:
                 case 213:
-                case 313:
+                case 191:
+                case 190:
+                case 214:
+                case 315:
                     node = node.expression;
                     continue;
             }
             return node;
         }
     }
+    ts.getLeftmostExpression = getLeftmostExpression;
     function parenthesizeConciseBody(body) {
-        if (!ts.isBlock(body) && (isCommaSequence(body) || getLeftmostExpression(body, false).kind === 188)) {
+        if (!ts.isBlock(body) && (isCommaSequence(body) || getLeftmostExpression(body, false).kind === 189)) {
             return ts.setTextRange(ts.createParen(body), body);
         }
         return body;
     }
     ts.parenthesizeConciseBody = parenthesizeConciseBody;
     function isCommaSequence(node) {
-        return node.kind === 204 && node.operatorToken.kind === 27 ||
-            node.kind === 314;
+        return node.kind === 205 && node.operatorToken.kind === 27 ||
+            node.kind === 316;
     }
     ts.isCommaSequence = isCommaSequence;
     function isOuterExpression(node, kinds) {
         if (kinds === void 0) { kinds = 7; }
         switch (node.kind) {
-            case 195:
+            case 196:
                 return (kinds & 1) !== 0;
-            case 194:
-            case 212:
+            case 195:
             case 213:
+            case 214:
                 return (kinds & 2) !== 0;
-            case 313:
+            case 315:
                 return (kinds & 4) !== 0;
         }
         return false;
@@ -54299,7 +56157,7 @@ var ts;
     }
     ts.skipOuterExpressions = skipOuterExpressions;
     function skipAssertions(node) {
-        while (ts.isAssertionExpression(node) || node.kind === 213) {
+        while (ts.isAssertionExpression(node) || node.kind === 214) {
             node = node.expression;
         }
         return node;
@@ -54307,15 +56165,15 @@ var ts;
     ts.skipAssertions = skipAssertions;
     function updateOuterExpression(outerExpression, expression) {
         switch (outerExpression.kind) {
-            case 195: return ts.updateParen(outerExpression, expression);
-            case 194: return ts.updateTypeAssertion(outerExpression, outerExpression.type, expression);
-            case 212: return ts.updateAsExpression(outerExpression, expression, outerExpression.type);
-            case 213: return ts.updateNonNullExpression(outerExpression, expression);
-            case 313: return ts.updatePartiallyEmittedExpression(outerExpression, expression);
+            case 196: return ts.updateParen(outerExpression, expression);
+            case 195: return ts.updateTypeAssertion(outerExpression, outerExpression.type, expression);
+            case 213: return ts.updateAsExpression(outerExpression, expression, outerExpression.type);
+            case 214: return ts.updateNonNullExpression(outerExpression, expression);
+            case 315: return ts.updatePartiallyEmittedExpression(outerExpression, expression);
         }
     }
     function isIgnorableParen(node) {
-        return node.kind === 195
+        return node.kind === 196
             && ts.nodeIsSynthesized(node)
             && ts.nodeIsSynthesized(ts.getSourceMapRange(node))
             && ts.nodeIsSynthesized(ts.getCommentRange(node))
@@ -54377,10 +56235,10 @@ var ts;
             var name = namespaceDeclaration.name;
             return ts.isGeneratedIdentifier(name) ? name : ts.createIdentifier(ts.getSourceTextOfNodeFromSourceFile(sourceFile, name) || ts.idText(name));
         }
-        if (node.kind === 249 && node.importClause) {
+        if (node.kind === 250 && node.importClause) {
             return ts.getGeneratedNameForNode(node);
         }
-        if (node.kind === 255 && node.moduleSpecifier) {
+        if (node.kind === 256 && node.moduleSpecifier) {
             return ts.getGeneratedNameForNode(node);
         }
         return undefined;
@@ -54443,11 +56301,11 @@ var ts;
         }
         if (ts.isObjectLiteralElementLike(bindingElement)) {
             switch (bindingElement.kind) {
-                case 275:
-                    return getTargetOfBindingOrAssignmentElement(bindingElement.initializer);
                 case 276:
-                    return bindingElement.name;
+                    return getTargetOfBindingOrAssignmentElement(bindingElement.initializer);
                 case 277:
+                    return bindingElement.name;
+                case 278:
                     return getTargetOfBindingOrAssignmentElement(bindingElement.expression);
             }
             return undefined;
@@ -54463,11 +56321,11 @@ var ts;
     ts.getTargetOfBindingOrAssignmentElement = getTargetOfBindingOrAssignmentElement;
     function getRestIndicatorOfBindingOrAssignmentElement(bindingElement) {
         switch (bindingElement.kind) {
-            case 151:
-            case 186:
+            case 152:
+            case 187:
                 return bindingElement.dotDotDotToken;
-            case 208:
-            case 277:
+            case 209:
+            case 278:
                 return bindingElement;
         }
         return undefined;
@@ -54475,7 +56333,7 @@ var ts;
     ts.getRestIndicatorOfBindingOrAssignmentElement = getRestIndicatorOfBindingOrAssignmentElement;
     function getPropertyNameOfBindingOrAssignmentElement(bindingElement) {
         switch (bindingElement.kind) {
-            case 186:
+            case 187:
                 if (bindingElement.propertyName) {
                     var propertyName = bindingElement.propertyName;
                     return ts.isComputedPropertyName(propertyName) && isStringOrNumericLiteral(propertyName.expression)
@@ -54483,7 +56341,7 @@ var ts;
                         : propertyName;
                 }
                 break;
-            case 275:
+            case 276:
                 if (bindingElement.name) {
                     var propertyName = bindingElement.name;
                     return ts.isComputedPropertyName(propertyName) && isStringOrNumericLiteral(propertyName.expression)
@@ -54491,7 +56349,7 @@ var ts;
                         : propertyName;
                 }
                 break;
-            case 277:
+            case 278:
                 return bindingElement.name;
         }
         var target = getTargetOfBindingOrAssignmentElement(bindingElement);
@@ -54510,11 +56368,11 @@ var ts;
     }
     function getElementsOfBindingOrAssignmentPattern(name) {
         switch (name.kind) {
-            case 184:
             case 185:
-            case 187:
-                return name.elements;
+            case 186:
             case 188:
+                return name.elements;
+            case 189:
                 return name.properties;
         }
     }
@@ -54553,11 +56411,11 @@ var ts;
     ts.convertToObjectAssignmentElement = convertToObjectAssignmentElement;
     function convertToAssignmentPattern(node) {
         switch (node.kind) {
-            case 185:
-            case 187:
-                return convertToArrayAssignmentPattern(node);
-            case 184:
+            case 186:
             case 188:
+                return convertToArrayAssignmentPattern(node);
+            case 185:
+            case 189:
                 return convertToObjectAssignmentPattern(node);
         }
     }
@@ -54694,261 +56552,261 @@ var ts;
             return undefined;
         }
         var kind = node.kind;
-        if ((kind > 0 && kind <= 147) || kind === 178) {
+        if ((kind > 0 && kind <= 148) || kind === 179) {
             return node;
         }
         switch (kind) {
-            case 72:
+            case 73:
                 return ts.updateIdentifier(node, nodesVisitor(node.typeArguments, visitor, isTypeNodeOrTypeParameterDeclaration));
-            case 148:
-                return ts.updateQualifiedName(node, visitNode(node.left, visitor, ts.isEntityName), visitNode(node.right, visitor, ts.isIdentifier));
             case 149:
-                return ts.updateComputedPropertyName(node, visitNode(node.expression, visitor, ts.isExpression));
+                return ts.updateQualifiedName(node, visitNode(node.left, visitor, ts.isEntityName), visitNode(node.right, visitor, ts.isIdentifier));
             case 150:
-                return ts.updateTypeParameterDeclaration(node, visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.constraint, visitor, ts.isTypeNode), visitNode(node.default, visitor, ts.isTypeNode));
+                return ts.updateComputedPropertyName(node, visitNode(node.expression, visitor, ts.isExpression));
             case 151:
-                return ts.updateParameter(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.dotDotDotToken, tokenVisitor, ts.isToken), visitNode(node.name, visitor, ts.isBindingName), visitNode(node.questionToken, tokenVisitor, ts.isToken), visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.initializer, visitor, ts.isExpression));
+                return ts.updateTypeParameterDeclaration(node, visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.constraint, visitor, ts.isTypeNode), visitNode(node.default, visitor, ts.isTypeNode));
             case 152:
-                return ts.updateDecorator(node, visitNode(node.expression, visitor, ts.isExpression));
+                return ts.updateParameter(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.dotDotDotToken, tokenVisitor, ts.isToken), visitNode(node.name, visitor, ts.isBindingName), visitNode(node.questionToken, tokenVisitor, ts.isToken), visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.initializer, visitor, ts.isExpression));
             case 153:
-                return ts.updatePropertySignature(node, nodesVisitor(node.modifiers, visitor, ts.isToken), visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.questionToken, tokenVisitor, ts.isToken), visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.initializer, visitor, ts.isExpression));
+                return ts.updateDecorator(node, visitNode(node.expression, visitor, ts.isExpression));
             case 154:
-                return ts.updateProperty(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.questionToken, tokenVisitor, ts.isToken), visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.initializer, visitor, ts.isExpression));
+                return ts.updatePropertySignature(node, nodesVisitor(node.modifiers, visitor, ts.isToken), visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.questionToken, tokenVisitor, ts.isToken), visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.initializer, visitor, ts.isExpression));
             case 155:
-                return ts.updateMethodSignature(node, nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.questionToken, tokenVisitor, ts.isToken));
+                return ts.updateProperty(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.questionToken || node.exclamationToken, tokenVisitor, ts.isToken), visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.initializer, visitor, ts.isExpression));
             case 156:
-                return ts.updateMethod(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.asteriskToken, tokenVisitor, ts.isToken), visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.questionToken, tokenVisitor, ts.isToken), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitNode(node.type, visitor, ts.isTypeNode), visitFunctionBody(node.body, visitor, context));
+                return ts.updateMethodSignature(node, nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.questionToken, tokenVisitor, ts.isToken));
             case 157:
-                return ts.updateConstructor(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitFunctionBody(node.body, visitor, context));
+                return ts.updateMethod(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.asteriskToken, tokenVisitor, ts.isToken), visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.questionToken, tokenVisitor, ts.isToken), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitNode(node.type, visitor, ts.isTypeNode), visitFunctionBody(node.body, visitor, context));
             case 158:
-                return ts.updateGetAccessor(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitNode(node.type, visitor, ts.isTypeNode), visitFunctionBody(node.body, visitor, context));
+                return ts.updateConstructor(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitFunctionBody(node.body, visitor, context));
             case 159:
-                return ts.updateSetAccessor(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitFunctionBody(node.body, visitor, context));
+                return ts.updateGetAccessor(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitNode(node.type, visitor, ts.isTypeNode), visitFunctionBody(node.body, visitor, context));
             case 160:
-                return ts.updateCallSignature(node, nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode));
+                return ts.updateSetAccessor(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitFunctionBody(node.body, visitor, context));
             case 161:
-                return ts.updateConstructSignature(node, nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode));
+                return ts.updateCallSignature(node, nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode));
             case 162:
-                return ts.updateIndexSignature(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode));
+                return ts.updateConstructSignature(node, nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode));
             case 163:
-                return ts.updateTypePredicateNode(node, visitNode(node.parameterName, visitor), visitNode(node.type, visitor, ts.isTypeNode));
+                return ts.updateIndexSignature(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode));
             case 164:
-                return ts.updateTypeReferenceNode(node, visitNode(node.typeName, visitor, ts.isEntityName), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode));
+                return ts.updateTypePredicateNode(node, visitNode(node.parameterName, visitor), visitNode(node.type, visitor, ts.isTypeNode));
             case 165:
-                return ts.updateFunctionTypeNode(node, nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode));
+                return ts.updateTypeReferenceNode(node, visitNode(node.typeName, visitor, ts.isEntityName), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode));
             case 166:
-                return ts.updateConstructorTypeNode(node, nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode));
+                return ts.updateFunctionTypeNode(node, nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode));
             case 167:
-                return ts.updateTypeQueryNode(node, visitNode(node.exprName, visitor, ts.isEntityName));
+                return ts.updateConstructorTypeNode(node, nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode));
             case 168:
-                return ts.updateTypeLiteralNode(node, nodesVisitor(node.members, visitor, ts.isTypeElement));
+                return ts.updateTypeQueryNode(node, visitNode(node.exprName, visitor, ts.isEntityName));
             case 169:
-                return ts.updateArrayTypeNode(node, visitNode(node.elementType, visitor, ts.isTypeNode));
+                return ts.updateTypeLiteralNode(node, nodesVisitor(node.members, visitor, ts.isTypeElement));
             case 170:
-                return ts.updateTupleTypeNode(node, nodesVisitor(node.elementTypes, visitor, ts.isTypeNode));
+                return ts.updateArrayTypeNode(node, visitNode(node.elementType, visitor, ts.isTypeNode));
             case 171:
-                return ts.updateOptionalTypeNode(node, visitNode(node.type, visitor, ts.isTypeNode));
+                return ts.updateTupleTypeNode(node, nodesVisitor(node.elementTypes, visitor, ts.isTypeNode));
             case 172:
-                return ts.updateRestTypeNode(node, visitNode(node.type, visitor, ts.isTypeNode));
+                return ts.updateOptionalTypeNode(node, visitNode(node.type, visitor, ts.isTypeNode));
             case 173:
-                return ts.updateUnionTypeNode(node, nodesVisitor(node.types, visitor, ts.isTypeNode));
+                return ts.updateRestTypeNode(node, visitNode(node.type, visitor, ts.isTypeNode));
             case 174:
-                return ts.updateIntersectionTypeNode(node, nodesVisitor(node.types, visitor, ts.isTypeNode));
+                return ts.updateUnionTypeNode(node, nodesVisitor(node.types, visitor, ts.isTypeNode));
             case 175:
-                return ts.updateConditionalTypeNode(node, visitNode(node.checkType, visitor, ts.isTypeNode), visitNode(node.extendsType, visitor, ts.isTypeNode), visitNode(node.trueType, visitor, ts.isTypeNode), visitNode(node.falseType, visitor, ts.isTypeNode));
+                return ts.updateIntersectionTypeNode(node, nodesVisitor(node.types, visitor, ts.isTypeNode));
             case 176:
-                return ts.updateInferTypeNode(node, visitNode(node.typeParameter, visitor, ts.isTypeParameterDeclaration));
-            case 183:
-                return ts.updateImportTypeNode(node, visitNode(node.argument, visitor, ts.isTypeNode), visitNode(node.qualifier, visitor, ts.isEntityName), visitNodes(node.typeArguments, visitor, ts.isTypeNode), node.isTypeOf);
+                return ts.updateConditionalTypeNode(node, visitNode(node.checkType, visitor, ts.isTypeNode), visitNode(node.extendsType, visitor, ts.isTypeNode), visitNode(node.trueType, visitor, ts.isTypeNode), visitNode(node.falseType, visitor, ts.isTypeNode));
             case 177:
-                return ts.updateParenthesizedType(node, visitNode(node.type, visitor, ts.isTypeNode));
-            case 179:
-                return ts.updateTypeOperatorNode(node, visitNode(node.type, visitor, ts.isTypeNode));
-            case 180:
-                return ts.updateIndexedAccessTypeNode(node, visitNode(node.objectType, visitor, ts.isTypeNode), visitNode(node.indexType, visitor, ts.isTypeNode));
-            case 181:
-                return ts.updateMappedTypeNode(node, visitNode(node.readonlyToken, tokenVisitor, ts.isToken), visitNode(node.typeParameter, visitor, ts.isTypeParameterDeclaration), visitNode(node.questionToken, tokenVisitor, ts.isToken), visitNode(node.type, visitor, ts.isTypeNode));
-            case 182:
-                return ts.updateLiteralTypeNode(node, visitNode(node.literal, visitor, ts.isExpression));
+                return ts.updateInferTypeNode(node, visitNode(node.typeParameter, visitor, ts.isTypeParameterDeclaration));
             case 184:
-                return ts.updateObjectBindingPattern(node, nodesVisitor(node.elements, visitor, ts.isBindingElement));
+                return ts.updateImportTypeNode(node, visitNode(node.argument, visitor, ts.isTypeNode), visitNode(node.qualifier, visitor, ts.isEntityName), visitNodes(node.typeArguments, visitor, ts.isTypeNode), node.isTypeOf);
+            case 178:
+                return ts.updateParenthesizedType(node, visitNode(node.type, visitor, ts.isTypeNode));
+            case 180:
+                return ts.updateTypeOperatorNode(node, visitNode(node.type, visitor, ts.isTypeNode));
+            case 181:
+                return ts.updateIndexedAccessTypeNode(node, visitNode(node.objectType, visitor, ts.isTypeNode), visitNode(node.indexType, visitor, ts.isTypeNode));
+            case 182:
+                return ts.updateMappedTypeNode(node, visitNode(node.readonlyToken, tokenVisitor, ts.isToken), visitNode(node.typeParameter, visitor, ts.isTypeParameterDeclaration), visitNode(node.questionToken, tokenVisitor, ts.isToken), visitNode(node.type, visitor, ts.isTypeNode));
+            case 183:
+                return ts.updateLiteralTypeNode(node, visitNode(node.literal, visitor, ts.isExpression));
             case 185:
-                return ts.updateArrayBindingPattern(node, nodesVisitor(node.elements, visitor, ts.isArrayBindingElement));
+                return ts.updateObjectBindingPattern(node, nodesVisitor(node.elements, visitor, ts.isBindingElement));
             case 186:
-                return ts.updateBindingElement(node, visitNode(node.dotDotDotToken, tokenVisitor, ts.isToken), visitNode(node.propertyName, visitor, ts.isPropertyName), visitNode(node.name, visitor, ts.isBindingName), visitNode(node.initializer, visitor, ts.isExpression));
+                return ts.updateArrayBindingPattern(node, nodesVisitor(node.elements, visitor, ts.isArrayBindingElement));
             case 187:
-                return ts.updateArrayLiteral(node, nodesVisitor(node.elements, visitor, ts.isExpression));
+                return ts.updateBindingElement(node, visitNode(node.dotDotDotToken, tokenVisitor, ts.isToken), visitNode(node.propertyName, visitor, ts.isPropertyName), visitNode(node.name, visitor, ts.isBindingName), visitNode(node.initializer, visitor, ts.isExpression));
             case 188:
-                return ts.updateObjectLiteral(node, nodesVisitor(node.properties, visitor, ts.isObjectLiteralElementLike));
+                return ts.updateArrayLiteral(node, nodesVisitor(node.elements, visitor, ts.isExpression));
             case 189:
-                return ts.updatePropertyAccess(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.name, visitor, ts.isIdentifier));
+                return ts.updateObjectLiteral(node, nodesVisitor(node.properties, visitor, ts.isObjectLiteralElementLike));
             case 190:
-                return ts.updateElementAccess(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.argumentExpression, visitor, ts.isExpression));
+                return ts.updatePropertyAccess(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.name, visitor, ts.isIdentifier));
             case 191:
-                return ts.updateCall(node, visitNode(node.expression, visitor, ts.isExpression), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode), nodesVisitor(node.arguments, visitor, ts.isExpression));
+                return ts.updateElementAccess(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.argumentExpression, visitor, ts.isExpression));
             case 192:
-                return ts.updateNew(node, visitNode(node.expression, visitor, ts.isExpression), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode), nodesVisitor(node.arguments, visitor, ts.isExpression));
+                return ts.updateCall(node, visitNode(node.expression, visitor, ts.isExpression), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode), nodesVisitor(node.arguments, visitor, ts.isExpression));
             case 193:
-                return ts.updateTaggedTemplate(node, visitNode(node.tag, visitor, ts.isExpression), visitNodes(node.typeArguments, visitor, ts.isExpression), visitNode(node.template, visitor, ts.isTemplateLiteral));
+                return ts.updateNew(node, visitNode(node.expression, visitor, ts.isExpression), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode), nodesVisitor(node.arguments, visitor, ts.isExpression));
             case 194:
-                return ts.updateTypeAssertion(node, visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.expression, visitor, ts.isExpression));
+                return ts.updateTaggedTemplate(node, visitNode(node.tag, visitor, ts.isExpression), visitNodes(node.typeArguments, visitor, ts.isExpression), visitNode(node.template, visitor, ts.isTemplateLiteral));
             case 195:
-                return ts.updateParen(node, visitNode(node.expression, visitor, ts.isExpression));
+                return ts.updateTypeAssertion(node, visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.expression, visitor, ts.isExpression));
             case 196:
-                return ts.updateFunctionExpression(node, nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.asteriskToken, tokenVisitor, ts.isToken), visitNode(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitNode(node.type, visitor, ts.isTypeNode), visitFunctionBody(node.body, visitor, context));
+                return ts.updateParen(node, visitNode(node.expression, visitor, ts.isExpression));
             case 197:
-                return ts.updateArrowFunction(node, nodesVisitor(node.modifiers, visitor, ts.isModifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.equalsGreaterThanToken, visitor, ts.isToken), visitFunctionBody(node.body, visitor, context));
+                return ts.updateFunctionExpression(node, nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.asteriskToken, tokenVisitor, ts.isToken), visitNode(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitNode(node.type, visitor, ts.isTypeNode), visitFunctionBody(node.body, visitor, context));
             case 198:
-                return ts.updateDelete(node, visitNode(node.expression, visitor, ts.isExpression));
+                return ts.updateArrowFunction(node, nodesVisitor(node.modifiers, visitor, ts.isModifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.equalsGreaterThanToken, visitor, ts.isToken), visitFunctionBody(node.body, visitor, context));
             case 199:
-                return ts.updateTypeOf(node, visitNode(node.expression, visitor, ts.isExpression));
+                return ts.updateDelete(node, visitNode(node.expression, visitor, ts.isExpression));
             case 200:
-                return ts.updateVoid(node, visitNode(node.expression, visitor, ts.isExpression));
+                return ts.updateTypeOf(node, visitNode(node.expression, visitor, ts.isExpression));
             case 201:
-                return ts.updateAwait(node, visitNode(node.expression, visitor, ts.isExpression));
+                return ts.updateVoid(node, visitNode(node.expression, visitor, ts.isExpression));
             case 202:
-                return ts.updatePrefix(node, visitNode(node.operand, visitor, ts.isExpression));
+                return ts.updateAwait(node, visitNode(node.expression, visitor, ts.isExpression));
             case 203:
-                return ts.updatePostfix(node, visitNode(node.operand, visitor, ts.isExpression));
+                return ts.updatePrefix(node, visitNode(node.operand, visitor, ts.isExpression));
             case 204:
-                return ts.updateBinary(node, visitNode(node.left, visitor, ts.isExpression), visitNode(node.right, visitor, ts.isExpression), visitNode(node.operatorToken, visitor, ts.isToken));
+                return ts.updatePostfix(node, visitNode(node.operand, visitor, ts.isExpression));
             case 205:
-                return ts.updateConditional(node, visitNode(node.condition, visitor, ts.isExpression), visitNode(node.questionToken, visitor, ts.isToken), visitNode(node.whenTrue, visitor, ts.isExpression), visitNode(node.colonToken, visitor, ts.isToken), visitNode(node.whenFalse, visitor, ts.isExpression));
+                return ts.updateBinary(node, visitNode(node.left, visitor, ts.isExpression), visitNode(node.right, visitor, ts.isExpression), visitNode(node.operatorToken, visitor, ts.isToken));
             case 206:
-                return ts.updateTemplateExpression(node, visitNode(node.head, visitor, ts.isTemplateHead), nodesVisitor(node.templateSpans, visitor, ts.isTemplateSpan));
+                return ts.updateConditional(node, visitNode(node.condition, visitor, ts.isExpression), visitNode(node.questionToken, visitor, ts.isToken), visitNode(node.whenTrue, visitor, ts.isExpression), visitNode(node.colonToken, visitor, ts.isToken), visitNode(node.whenFalse, visitor, ts.isExpression));
             case 207:
-                return ts.updateYield(node, visitNode(node.asteriskToken, tokenVisitor, ts.isToken), visitNode(node.expression, visitor, ts.isExpression));
+                return ts.updateTemplateExpression(node, visitNode(node.head, visitor, ts.isTemplateHead), nodesVisitor(node.templateSpans, visitor, ts.isTemplateSpan));
             case 208:
-                return ts.updateSpread(node, visitNode(node.expression, visitor, ts.isExpression));
+                return ts.updateYield(node, visitNode(node.asteriskToken, tokenVisitor, ts.isToken), visitNode(node.expression, visitor, ts.isExpression));
             case 209:
+                return ts.updateSpread(node, visitNode(node.expression, visitor, ts.isExpression));
+            case 210:
                 return ts.updateClassExpression(node, nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.heritageClauses, visitor, ts.isHeritageClause), nodesVisitor(node.members, visitor, ts.isClassElement));
-            case 211:
-                return ts.updateExpressionWithTypeArguments(node, nodesVisitor(node.typeArguments, visitor, ts.isTypeNode), visitNode(node.expression, visitor, ts.isExpression));
             case 212:
-                return ts.updateAsExpression(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.type, visitor, ts.isTypeNode));
+                return ts.updateExpressionWithTypeArguments(node, nodesVisitor(node.typeArguments, visitor, ts.isTypeNode), visitNode(node.expression, visitor, ts.isExpression));
             case 213:
-                return ts.updateNonNullExpression(node, visitNode(node.expression, visitor, ts.isExpression));
+                return ts.updateAsExpression(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.type, visitor, ts.isTypeNode));
             case 214:
+                return ts.updateNonNullExpression(node, visitNode(node.expression, visitor, ts.isExpression));
+            case 215:
                 return ts.updateMetaProperty(node, visitNode(node.name, visitor, ts.isIdentifier));
-            case 216:
+            case 217:
                 return ts.updateTemplateSpan(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.literal, visitor, ts.isTemplateMiddleOrTemplateTail));
-            case 218:
-                return ts.updateBlock(node, nodesVisitor(node.statements, visitor, ts.isStatement));
             case 219:
+                return ts.updateBlock(node, nodesVisitor(node.statements, visitor, ts.isStatement));
+            case 220:
                 return ts.updateVariableStatement(node, nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.declarationList, visitor, ts.isVariableDeclarationList));
-            case 221:
-                return ts.updateExpressionStatement(node, visitNode(node.expression, visitor, ts.isExpression));
             case 222:
-                return ts.updateIf(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.thenStatement, visitor, ts.isStatement, ts.liftToBlock), visitNode(node.elseStatement, visitor, ts.isStatement, ts.liftToBlock));
+                return ts.updateExpressionStatement(node, visitNode(node.expression, visitor, ts.isExpression));
             case 223:
-                return ts.updateDo(node, visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock), visitNode(node.expression, visitor, ts.isExpression));
+                return ts.updateIf(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.thenStatement, visitor, ts.isStatement, ts.liftToBlock), visitNode(node.elseStatement, visitor, ts.isStatement, ts.liftToBlock));
             case 224:
-                return ts.updateWhile(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock));
+                return ts.updateDo(node, visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock), visitNode(node.expression, visitor, ts.isExpression));
             case 225:
-                return ts.updateFor(node, visitNode(node.initializer, visitor, ts.isForInitializer), visitNode(node.condition, visitor, ts.isExpression), visitNode(node.incrementor, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock));
+                return ts.updateWhile(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock));
             case 226:
-                return ts.updateForIn(node, visitNode(node.initializer, visitor, ts.isForInitializer), visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock));
+                return ts.updateFor(node, visitNode(node.initializer, visitor, ts.isForInitializer), visitNode(node.condition, visitor, ts.isExpression), visitNode(node.incrementor, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock));
             case 227:
-                return ts.updateForOf(node, visitNode(node.awaitModifier, visitor, ts.isToken), visitNode(node.initializer, visitor, ts.isForInitializer), visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock));
+                return ts.updateForIn(node, visitNode(node.initializer, visitor, ts.isForInitializer), visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock));
             case 228:
-                return ts.updateContinue(node, visitNode(node.label, visitor, ts.isIdentifier));
+                return ts.updateForOf(node, visitNode(node.awaitModifier, visitor, ts.isToken), visitNode(node.initializer, visitor, ts.isForInitializer), visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock));
             case 229:
-                return ts.updateBreak(node, visitNode(node.label, visitor, ts.isIdentifier));
+                return ts.updateContinue(node, visitNode(node.label, visitor, ts.isIdentifier));
             case 230:
-                return ts.updateReturn(node, visitNode(node.expression, visitor, ts.isExpression));
+                return ts.updateBreak(node, visitNode(node.label, visitor, ts.isIdentifier));
             case 231:
-                return ts.updateWith(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock));
+                return ts.updateReturn(node, visitNode(node.expression, visitor, ts.isExpression));
             case 232:
-                return ts.updateSwitch(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.caseBlock, visitor, ts.isCaseBlock));
+                return ts.updateWith(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock));
             case 233:
-                return ts.updateLabel(node, visitNode(node.label, visitor, ts.isIdentifier), visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock));
+                return ts.updateSwitch(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.caseBlock, visitor, ts.isCaseBlock));
             case 234:
-                return ts.updateThrow(node, visitNode(node.expression, visitor, ts.isExpression));
+                return ts.updateLabel(node, visitNode(node.label, visitor, ts.isIdentifier), visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock));
             case 235:
+                return ts.updateThrow(node, visitNode(node.expression, visitor, ts.isExpression));
+            case 236:
                 return ts.updateTry(node, visitNode(node.tryBlock, visitor, ts.isBlock), visitNode(node.catchClause, visitor, ts.isCatchClause), visitNode(node.finallyBlock, visitor, ts.isBlock));
-            case 237:
-                return ts.updateVariableDeclaration(node, visitNode(node.name, visitor, ts.isBindingName), visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.initializer, visitor, ts.isExpression));
             case 238:
-                return ts.updateVariableDeclarationList(node, nodesVisitor(node.declarations, visitor, ts.isVariableDeclaration));
+                return ts.updateVariableDeclaration(node, visitNode(node.name, visitor, ts.isBindingName), visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.initializer, visitor, ts.isExpression));
             case 239:
-                return ts.updateFunctionDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.asteriskToken, tokenVisitor, ts.isToken), visitNode(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitNode(node.type, visitor, ts.isTypeNode), visitFunctionBody(node.body, visitor, context));
+                return ts.updateVariableDeclarationList(node, nodesVisitor(node.declarations, visitor, ts.isVariableDeclaration));
             case 240:
-                return ts.updateClassDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.heritageClauses, visitor, ts.isHeritageClause), nodesVisitor(node.members, visitor, ts.isClassElement));
+                return ts.updateFunctionDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.asteriskToken, tokenVisitor, ts.isToken), visitNode(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitNode(node.type, visitor, ts.isTypeNode), visitFunctionBody(node.body, visitor, context));
             case 241:
-                return ts.updateInterfaceDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.heritageClauses, visitor, ts.isHeritageClause), nodesVisitor(node.members, visitor, ts.isTypeElement));
+                return ts.updateClassDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.heritageClauses, visitor, ts.isHeritageClause), nodesVisitor(node.members, visitor, ts.isClassElement));
             case 242:
-                return ts.updateTypeAliasDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode));
+                return ts.updateInterfaceDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.heritageClauses, visitor, ts.isHeritageClause), nodesVisitor(node.members, visitor, ts.isTypeElement));
             case 243:
-                return ts.updateEnumDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier), nodesVisitor(node.members, visitor, ts.isEnumMember));
+                return ts.updateTypeAliasDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode));
             case 244:
-                return ts.updateModuleDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.body, visitor, ts.isModuleBody));
+                return ts.updateEnumDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier), nodesVisitor(node.members, visitor, ts.isEnumMember));
             case 245:
-                return ts.updateModuleBlock(node, nodesVisitor(node.statements, visitor, ts.isStatement));
+                return ts.updateModuleDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.body, visitor, ts.isModuleBody));
             case 246:
-                return ts.updateCaseBlock(node, nodesVisitor(node.clauses, visitor, ts.isCaseOrDefaultClause));
+                return ts.updateModuleBlock(node, nodesVisitor(node.statements, visitor, ts.isStatement));
             case 247:
-                return ts.updateNamespaceExportDeclaration(node, visitNode(node.name, visitor, ts.isIdentifier));
+                return ts.updateCaseBlock(node, nodesVisitor(node.clauses, visitor, ts.isCaseOrDefaultClause));
             case 248:
-                return ts.updateImportEqualsDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.moduleReference, visitor, ts.isModuleReference));
+                return ts.updateNamespaceExportDeclaration(node, visitNode(node.name, visitor, ts.isIdentifier));
             case 249:
-                return ts.updateImportDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.importClause, visitor, ts.isImportClause), visitNode(node.moduleSpecifier, visitor, ts.isExpression));
+                return ts.updateImportEqualsDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.moduleReference, visitor, ts.isModuleReference));
             case 250:
-                return ts.updateImportClause(node, visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.namedBindings, visitor, ts.isNamedImportBindings));
+                return ts.updateImportDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.importClause, visitor, ts.isImportClause), visitNode(node.moduleSpecifier, visitor, ts.isExpression));
             case 251:
-                return ts.updateNamespaceImport(node, visitNode(node.name, visitor, ts.isIdentifier));
+                return ts.updateImportClause(node, visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.namedBindings, visitor, ts.isNamedImportBindings));
             case 252:
-                return ts.updateNamedImports(node, nodesVisitor(node.elements, visitor, ts.isImportSpecifier));
+                return ts.updateNamespaceImport(node, visitNode(node.name, visitor, ts.isIdentifier));
             case 253:
-                return ts.updateImportSpecifier(node, visitNode(node.propertyName, visitor, ts.isIdentifier), visitNode(node.name, visitor, ts.isIdentifier));
+                return ts.updateNamedImports(node, nodesVisitor(node.elements, visitor, ts.isImportSpecifier));
             case 254:
-                return ts.updateExportAssignment(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.expression, visitor, ts.isExpression));
+                return ts.updateImportSpecifier(node, visitNode(node.propertyName, visitor, ts.isIdentifier), visitNode(node.name, visitor, ts.isIdentifier));
             case 255:
-                return ts.updateExportDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.exportClause, visitor, ts.isNamedExports), visitNode(node.moduleSpecifier, visitor, ts.isExpression));
+                return ts.updateExportAssignment(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.expression, visitor, ts.isExpression));
             case 256:
-                return ts.updateNamedExports(node, nodesVisitor(node.elements, visitor, ts.isExportSpecifier));
+                return ts.updateExportDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.exportClause, visitor, ts.isNamedExports), visitNode(node.moduleSpecifier, visitor, ts.isExpression));
             case 257:
+                return ts.updateNamedExports(node, nodesVisitor(node.elements, visitor, ts.isExportSpecifier));
+            case 258:
                 return ts.updateExportSpecifier(node, visitNode(node.propertyName, visitor, ts.isIdentifier), visitNode(node.name, visitor, ts.isIdentifier));
-            case 259:
-                return ts.updateExternalModuleReference(node, visitNode(node.expression, visitor, ts.isExpression));
             case 260:
-                return ts.updateJsxElement(node, visitNode(node.openingElement, visitor, ts.isJsxOpeningElement), nodesVisitor(node.children, visitor, ts.isJsxChild), visitNode(node.closingElement, visitor, ts.isJsxClosingElement));
+                return ts.updateExternalModuleReference(node, visitNode(node.expression, visitor, ts.isExpression));
             case 261:
-                return ts.updateJsxSelfClosingElement(node, visitNode(node.tagName, visitor, ts.isJsxTagNameExpression), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode), visitNode(node.attributes, visitor, ts.isJsxAttributes));
+                return ts.updateJsxElement(node, visitNode(node.openingElement, visitor, ts.isJsxOpeningElement), nodesVisitor(node.children, visitor, ts.isJsxChild), visitNode(node.closingElement, visitor, ts.isJsxClosingElement));
             case 262:
-                return ts.updateJsxOpeningElement(node, visitNode(node.tagName, visitor, ts.isJsxTagNameExpression), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode), visitNode(node.attributes, visitor, ts.isJsxAttributes));
+                return ts.updateJsxSelfClosingElement(node, visitNode(node.tagName, visitor, ts.isJsxTagNameExpression), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode), visitNode(node.attributes, visitor, ts.isJsxAttributes));
             case 263:
-                return ts.updateJsxClosingElement(node, visitNode(node.tagName, visitor, ts.isJsxTagNameExpression));
+                return ts.updateJsxOpeningElement(node, visitNode(node.tagName, visitor, ts.isJsxTagNameExpression), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode), visitNode(node.attributes, visitor, ts.isJsxAttributes));
             case 264:
+                return ts.updateJsxClosingElement(node, visitNode(node.tagName, visitor, ts.isJsxTagNameExpression));
+            case 265:
                 return ts.updateJsxFragment(node, visitNode(node.openingFragment, visitor, ts.isJsxOpeningFragment), nodesVisitor(node.children, visitor, ts.isJsxChild), visitNode(node.closingFragment, visitor, ts.isJsxClosingFragment));
-            case 267:
-                return ts.updateJsxAttribute(node, visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.initializer, visitor, ts.isStringLiteralOrJsxExpression));
             case 268:
-                return ts.updateJsxAttributes(node, nodesVisitor(node.properties, visitor, ts.isJsxAttributeLike));
+                return ts.updateJsxAttribute(node, visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.initializer, visitor, ts.isStringLiteralOrJsxExpression));
             case 269:
-                return ts.updateJsxSpreadAttribute(node, visitNode(node.expression, visitor, ts.isExpression));
+                return ts.updateJsxAttributes(node, nodesVisitor(node.properties, visitor, ts.isJsxAttributeLike));
             case 270:
-                return ts.updateJsxExpression(node, visitNode(node.expression, visitor, ts.isExpression));
+                return ts.updateJsxSpreadAttribute(node, visitNode(node.expression, visitor, ts.isExpression));
             case 271:
-                return ts.updateCaseClause(node, visitNode(node.expression, visitor, ts.isExpression), nodesVisitor(node.statements, visitor, ts.isStatement));
+                return ts.updateJsxExpression(node, visitNode(node.expression, visitor, ts.isExpression));
             case 272:
-                return ts.updateDefaultClause(node, nodesVisitor(node.statements, visitor, ts.isStatement));
+                return ts.updateCaseClause(node, visitNode(node.expression, visitor, ts.isExpression), nodesVisitor(node.statements, visitor, ts.isStatement));
             case 273:
-                return ts.updateHeritageClause(node, nodesVisitor(node.types, visitor, ts.isExpressionWithTypeArguments));
+                return ts.updateDefaultClause(node, nodesVisitor(node.statements, visitor, ts.isStatement));
             case 274:
-                return ts.updateCatchClause(node, visitNode(node.variableDeclaration, visitor, ts.isVariableDeclaration), visitNode(node.block, visitor, ts.isBlock));
+                return ts.updateHeritageClause(node, nodesVisitor(node.types, visitor, ts.isExpressionWithTypeArguments));
             case 275:
-                return ts.updatePropertyAssignment(node, visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.initializer, visitor, ts.isExpression));
+                return ts.updateCatchClause(node, visitNode(node.variableDeclaration, visitor, ts.isVariableDeclaration), visitNode(node.block, visitor, ts.isBlock));
             case 276:
-                return ts.updateShorthandPropertyAssignment(node, visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.objectAssignmentInitializer, visitor, ts.isExpression));
+                return ts.updatePropertyAssignment(node, visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.initializer, visitor, ts.isExpression));
             case 277:
-                return ts.updateSpreadAssignment(node, visitNode(node.expression, visitor, ts.isExpression));
+                return ts.updateShorthandPropertyAssignment(node, visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.objectAssignmentInitializer, visitor, ts.isExpression));
             case 278:
+                return ts.updateSpreadAssignment(node, visitNode(node.expression, visitor, ts.isExpression));
+            case 279:
                 return ts.updateEnumMember(node, visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.initializer, visitor, ts.isExpression));
-            case 284:
+            case 285:
                 return ts.updateSourceFileNode(node, visitLexicalEnvironment(node.statements, visitor, context));
-            case 313:
+            case 315:
                 return ts.updatePartiallyEmittedExpression(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 314:
+            case 316:
                 return ts.updateCommaList(node, nodesVisitor(node.elements, visitor, ts.isExpression));
             default:
                 return node;
@@ -54974,52 +56832,52 @@ var ts;
         var reduceNodes = cbNodeArray ? reduceNodeArray : ts.reduceLeft;
         var cbNodes = cbNodeArray || cbNode;
         var kind = node.kind;
-        if ((kind > 0 && kind <= 147)) {
+        if ((kind > 0 && kind <= 148)) {
             return initial;
         }
-        if ((kind >= 163 && kind <= 182)) {
+        if ((kind >= 164 && kind <= 183)) {
             return initial;
         }
         var result = initial;
         switch (node.kind) {
-            case 217:
-            case 220:
-            case 210:
-            case 236:
-            case 312:
+            case 218:
+            case 221:
+            case 211:
+            case 237:
+            case 314:
                 break;
-            case 148:
+            case 149:
                 result = reduceNode(node.left, cbNode, result);
                 result = reduceNode(node.right, cbNode, result);
                 break;
-            case 149:
+            case 150:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
-            case 151:
+            case 152:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.type, cbNode, result);
                 result = reduceNode(node.initializer, cbNode, result);
                 break;
-            case 152:
+            case 153:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
-            case 153:
+            case 154:
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.questionToken, cbNode, result);
                 result = reduceNode(node.type, cbNode, result);
                 result = reduceNode(node.initializer, cbNode, result);
                 break;
-            case 154:
+            case 155:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.type, cbNode, result);
                 result = reduceNode(node.initializer, cbNode, result);
                 break;
-            case 156:
+            case 157:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
@@ -55028,53 +56886,48 @@ var ts;
                 result = reduceNode(node.type, cbNode, result);
                 result = reduceNode(node.body, cbNode, result);
                 break;
-            case 157:
-                result = reduceNodes(node.modifiers, cbNodes, result);
-                result = reduceNodes(node.parameters, cbNodes, result);
-                result = reduceNode(node.body, cbNode, result);
-                break;
             case 158:
-                result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
-                result = reduceNode(node.name, cbNode, result);
                 result = reduceNodes(node.parameters, cbNodes, result);
-                result = reduceNode(node.type, cbNode, result);
                 result = reduceNode(node.body, cbNode, result);
                 break;
             case 159:
+                result = reduceNodes(node.decorators, cbNodes, result);
+                result = reduceNodes(node.modifiers, cbNodes, result);
+                result = reduceNode(node.name, cbNode, result);
+                result = reduceNodes(node.parameters, cbNodes, result);
+                result = reduceNode(node.type, cbNode, result);
+                result = reduceNode(node.body, cbNode, result);
+                break;
+            case 160:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNodes(node.parameters, cbNodes, result);
                 result = reduceNode(node.body, cbNode, result);
                 break;
-            case 184:
             case 185:
+            case 186:
                 result = reduceNodes(node.elements, cbNodes, result);
                 break;
-            case 186:
+            case 187:
                 result = reduceNode(node.propertyName, cbNode, result);
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.initializer, cbNode, result);
                 break;
-            case 187:
+            case 188:
                 result = reduceNodes(node.elements, cbNodes, result);
                 break;
-            case 188:
-                result = reduceNodes(node.properties, cbNodes, result);
-                break;
             case 189:
-                result = reduceNode(node.expression, cbNode, result);
-                result = reduceNode(node.name, cbNode, result);
+                result = reduceNodes(node.properties, cbNodes, result);
                 break;
             case 190:
                 result = reduceNode(node.expression, cbNode, result);
-                result = reduceNode(node.argumentExpression, cbNode, result);
+                result = reduceNode(node.name, cbNode, result);
                 break;
             case 191:
                 result = reduceNode(node.expression, cbNode, result);
-                result = reduceNodes(node.typeArguments, cbNodes, result);
-                result = reduceNodes(node.arguments, cbNodes, result);
+                result = reduceNode(node.argumentExpression, cbNode, result);
                 break;
             case 192:
                 result = reduceNode(node.expression, cbNode, result);
@@ -55082,15 +56935,20 @@ var ts;
                 result = reduceNodes(node.arguments, cbNodes, result);
                 break;
             case 193:
+                result = reduceNode(node.expression, cbNode, result);
+                result = reduceNodes(node.typeArguments, cbNodes, result);
+                result = reduceNodes(node.arguments, cbNodes, result);
+                break;
+            case 194:
                 result = reduceNode(node.tag, cbNode, result);
                 result = reduceNodes(node.typeArguments, cbNodes, result);
                 result = reduceNode(node.template, cbNode, result);
                 break;
-            case 194:
+            case 195:
                 result = reduceNode(node.type, cbNode, result);
                 result = reduceNode(node.expression, cbNode, result);
                 break;
-            case 196:
+            case 197:
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNodes(node.typeParameters, cbNodes, result);
@@ -55098,263 +56956,263 @@ var ts;
                 result = reduceNode(node.type, cbNode, result);
                 result = reduceNode(node.body, cbNode, result);
                 break;
-            case 197:
+            case 198:
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNodes(node.typeParameters, cbNodes, result);
                 result = reduceNodes(node.parameters, cbNodes, result);
                 result = reduceNode(node.type, cbNode, result);
                 result = reduceNode(node.body, cbNode, result);
                 break;
-            case 195:
-            case 198:
+            case 196:
             case 199:
             case 200:
             case 201:
-            case 207:
+            case 202:
             case 208:
-            case 213:
+            case 209:
+            case 214:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
-            case 202:
             case 203:
+            case 204:
                 result = reduceNode(node.operand, cbNode, result);
                 break;
-            case 204:
+            case 205:
                 result = reduceNode(node.left, cbNode, result);
                 result = reduceNode(node.right, cbNode, result);
                 break;
-            case 205:
+            case 206:
                 result = reduceNode(node.condition, cbNode, result);
                 result = reduceNode(node.whenTrue, cbNode, result);
                 result = reduceNode(node.whenFalse, cbNode, result);
                 break;
-            case 206:
+            case 207:
                 result = reduceNode(node.head, cbNode, result);
                 result = reduceNodes(node.templateSpans, cbNodes, result);
                 break;
-            case 209:
+            case 210:
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNodes(node.typeParameters, cbNodes, result);
                 result = reduceNodes(node.heritageClauses, cbNodes, result);
                 result = reduceNodes(node.members, cbNodes, result);
                 break;
-            case 211:
+            case 212:
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNodes(node.typeArguments, cbNodes, result);
                 break;
-            case 212:
+            case 213:
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNode(node.type, cbNode, result);
                 break;
-            case 216:
+            case 217:
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNode(node.literal, cbNode, result);
                 break;
-            case 218:
+            case 219:
                 result = reduceNodes(node.statements, cbNodes, result);
                 break;
-            case 219:
+            case 220:
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.declarationList, cbNode, result);
                 break;
-            case 221:
+            case 222:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
-            case 222:
+            case 223:
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNode(node.thenStatement, cbNode, result);
                 result = reduceNode(node.elseStatement, cbNode, result);
                 break;
-            case 223:
-                result = reduceNode(node.statement, cbNode, result);
-                result = reduceNode(node.expression, cbNode, result);
-                break;
             case 224:
-            case 231:
-                result = reduceNode(node.expression, cbNode, result);
                 result = reduceNode(node.statement, cbNode, result);
+                result = reduceNode(node.expression, cbNode, result);
                 break;
             case 225:
+            case 232:
+                result = reduceNode(node.expression, cbNode, result);
+                result = reduceNode(node.statement, cbNode, result);
+                break;
+            case 226:
                 result = reduceNode(node.initializer, cbNode, result);
                 result = reduceNode(node.condition, cbNode, result);
                 result = reduceNode(node.incrementor, cbNode, result);
                 result = reduceNode(node.statement, cbNode, result);
                 break;
-            case 226:
             case 227:
+            case 228:
                 result = reduceNode(node.initializer, cbNode, result);
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNode(node.statement, cbNode, result);
                 break;
-            case 230:
-            case 234:
+            case 231:
+            case 235:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
-            case 232:
+            case 233:
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNode(node.caseBlock, cbNode, result);
                 break;
-            case 233:
+            case 234:
                 result = reduceNode(node.label, cbNode, result);
                 result = reduceNode(node.statement, cbNode, result);
                 break;
-            case 235:
+            case 236:
                 result = reduceNode(node.tryBlock, cbNode, result);
                 result = reduceNode(node.catchClause, cbNode, result);
                 result = reduceNode(node.finallyBlock, cbNode, result);
                 break;
-            case 237:
+            case 238:
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.type, cbNode, result);
                 result = reduceNode(node.initializer, cbNode, result);
                 break;
-            case 238:
-                result = reduceNodes(node.declarations, cbNodes, result);
-                break;
             case 239:
-                result = reduceNodes(node.decorators, cbNodes, result);
-                result = reduceNodes(node.modifiers, cbNodes, result);
-                result = reduceNode(node.name, cbNode, result);
-                result = reduceNodes(node.typeParameters, cbNodes, result);
-                result = reduceNodes(node.parameters, cbNodes, result);
-                result = reduceNode(node.type, cbNode, result);
-                result = reduceNode(node.body, cbNode, result);
+                result = reduceNodes(node.declarations, cbNodes, result);
                 break;
             case 240:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNodes(node.typeParameters, cbNodes, result);
-                result = reduceNodes(node.heritageClauses, cbNodes, result);
-                result = reduceNodes(node.members, cbNodes, result);
+                result = reduceNodes(node.parameters, cbNodes, result);
+                result = reduceNode(node.type, cbNode, result);
+                result = reduceNode(node.body, cbNode, result);
                 break;
-            case 243:
+            case 241:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
+                result = reduceNodes(node.typeParameters, cbNodes, result);
+                result = reduceNodes(node.heritageClauses, cbNodes, result);
                 result = reduceNodes(node.members, cbNodes, result);
                 break;
             case 244:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
-                result = reduceNode(node.body, cbNode, result);
+                result = reduceNodes(node.members, cbNodes, result);
                 break;
             case 245:
-                result = reduceNodes(node.statements, cbNodes, result);
+                result = reduceNodes(node.decorators, cbNodes, result);
+                result = reduceNodes(node.modifiers, cbNodes, result);
+                result = reduceNode(node.name, cbNode, result);
+                result = reduceNode(node.body, cbNode, result);
                 break;
             case 246:
+                result = reduceNodes(node.statements, cbNodes, result);
+                break;
+            case 247:
                 result = reduceNodes(node.clauses, cbNodes, result);
                 break;
-            case 248:
+            case 249:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.moduleReference, cbNode, result);
                 break;
-            case 249:
+            case 250:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.importClause, cbNode, result);
                 result = reduceNode(node.moduleSpecifier, cbNode, result);
                 break;
-            case 250:
+            case 251:
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.namedBindings, cbNode, result);
                 break;
-            case 251:
-                result = reduceNode(node.name, cbNode, result);
-                break;
             case 252:
-            case 256:
-                result = reduceNodes(node.elements, cbNodes, result);
+                result = reduceNode(node.name, cbNode, result);
                 break;
             case 253:
             case 257:
+                result = reduceNodes(node.elements, cbNodes, result);
+                break;
+            case 254:
+            case 258:
                 result = reduceNode(node.propertyName, cbNode, result);
                 result = reduceNode(node.name, cbNode, result);
                 break;
-            case 254:
+            case 255:
                 result = ts.reduceLeft(node.decorators, cbNode, result);
                 result = ts.reduceLeft(node.modifiers, cbNode, result);
                 result = reduceNode(node.expression, cbNode, result);
                 break;
-            case 255:
+            case 256:
                 result = ts.reduceLeft(node.decorators, cbNode, result);
                 result = ts.reduceLeft(node.modifiers, cbNode, result);
                 result = reduceNode(node.exportClause, cbNode, result);
                 result = reduceNode(node.moduleSpecifier, cbNode, result);
                 break;
-            case 259:
+            case 260:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
-            case 260:
+            case 261:
                 result = reduceNode(node.openingElement, cbNode, result);
                 result = ts.reduceLeft(node.children, cbNode, result);
                 result = reduceNode(node.closingElement, cbNode, result);
                 break;
-            case 264:
+            case 265:
                 result = reduceNode(node.openingFragment, cbNode, result);
                 result = ts.reduceLeft(node.children, cbNode, result);
                 result = reduceNode(node.closingFragment, cbNode, result);
                 break;
-            case 261:
             case 262:
+            case 263:
                 result = reduceNode(node.tagName, cbNode, result);
                 result = reduceNodes(node.typeArguments, cbNode, result);
                 result = reduceNode(node.attributes, cbNode, result);
                 break;
-            case 268:
+            case 269:
                 result = reduceNodes(node.properties, cbNodes, result);
                 break;
-            case 263:
+            case 264:
                 result = reduceNode(node.tagName, cbNode, result);
                 break;
-            case 267:
+            case 268:
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.initializer, cbNode, result);
                 break;
-            case 269:
-                result = reduceNode(node.expression, cbNode, result);
-                break;
             case 270:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
             case 271:
                 result = reduceNode(node.expression, cbNode, result);
+                break;
             case 272:
+                result = reduceNode(node.expression, cbNode, result);
+            case 273:
                 result = reduceNodes(node.statements, cbNodes, result);
                 break;
-            case 273:
+            case 274:
                 result = reduceNodes(node.types, cbNodes, result);
                 break;
-            case 274:
+            case 275:
                 result = reduceNode(node.variableDeclaration, cbNode, result);
                 result = reduceNode(node.block, cbNode, result);
                 break;
-            case 275:
+            case 276:
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.initializer, cbNode, result);
                 break;
-            case 276:
+            case 277:
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.objectAssignmentInitializer, cbNode, result);
                 break;
-            case 277:
+            case 278:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
-            case 278:
+            case 279:
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.initializer, cbNode, result);
                 break;
-            case 284:
+            case 285:
                 result = reduceNodes(node.statements, cbNodes, result);
                 break;
-            case 313:
+            case 315:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
-            case 314:
+            case 316:
                 result = reduceNodes(node.elements, cbNodes, result);
                 break;
             default:
@@ -55373,7 +57231,7 @@ var ts;
     }
     ts.mergeLexicalEnvironment = mergeLexicalEnvironment;
     function liftToBlock(nodes) {
-        Debug.assert(ts.every(nodes, ts.isStatement), "Cannot lift nodes to a Block.");
+        ts.Debug.assert(ts.every(nodes, ts.isStatement), "Cannot lift nodes to a Block.");
         return ts.singleOrUndefined(nodes) || ts.createBlock(nodes);
     }
     ts.liftToBlock = liftToBlock;
@@ -55407,7 +57265,7 @@ var ts;
         return subtreeFlags;
     }
     function aggregateTransformFlagsForSubtree(node) {
-        if (ts.hasModifier(node, 2) || (ts.isTypeNode(node) && node.kind !== 211)) {
+        if (ts.hasModifier(node, 2) || (ts.isTypeNode(node) && node.kind !== 212)) {
             return 0;
         }
         return reduceEachChild(node, 0, aggregateTransformFlagsForChildNode, aggregateTransformFlagsForChildNodes);
@@ -55418,69 +57276,6 @@ var ts;
     function aggregateTransformFlagsForChildNodes(transformFlags, nodes) {
         return transformFlags | aggregateTransformFlagsForNodeArray(nodes);
     }
-    var Debug;
-    (function (Debug) {
-        var isDebugInfoEnabled = false;
-        function failBadSyntaxKind(node, message) {
-            return Debug.fail((message || "Unexpected node.") + "\r\nNode " + ts.formatSyntaxKind(node.kind) + " was unexpected.", failBadSyntaxKind);
-        }
-        Debug.failBadSyntaxKind = failBadSyntaxKind;
-        Debug.assertEachNode = Debug.shouldAssert(1)
-            ? function (nodes, test, message) { return Debug.assert(test === undefined || ts.every(nodes, test), message || "Unexpected node.", function () { return "Node array did not pass test '" + Debug.getFunctionName(test) + "'."; }, Debug.assertEachNode); }
-            : ts.noop;
-        Debug.assertNode = Debug.shouldAssert(1)
-            ? function (node, test, message) { return Debug.assert(test === undefined || test(node), message || "Unexpected node.", function () { return "Node " + ts.formatSyntaxKind(node.kind) + " did not pass test '" + Debug.getFunctionName(test) + "'."; }, Debug.assertNode); }
-            : ts.noop;
-        Debug.assertOptionalNode = Debug.shouldAssert(1)
-            ? function (node, test, message) { return Debug.assert(test === undefined || node === undefined || test(node), message || "Unexpected node.", function () { return "Node " + ts.formatSyntaxKind(node.kind) + " did not pass test '" + Debug.getFunctionName(test) + "'."; }, Debug.assertOptionalNode); }
-            : ts.noop;
-        Debug.assertOptionalToken = Debug.shouldAssert(1)
-            ? function (node, kind, message) { return Debug.assert(kind === undefined || node === undefined || node.kind === kind, message || "Unexpected node.", function () { return "Node " + ts.formatSyntaxKind(node.kind) + " was not a '" + ts.formatSyntaxKind(kind) + "' token."; }, Debug.assertOptionalToken); }
-            : ts.noop;
-        Debug.assertMissingNode = Debug.shouldAssert(1)
-            ? function (node, message) { return Debug.assert(node === undefined, message || "Unexpected node.", function () { return "Node " + ts.formatSyntaxKind(node.kind) + " was unexpected'."; }, Debug.assertMissingNode); }
-            : ts.noop;
-        function enableDebugInfo() {
-            if (isDebugInfoEnabled)
-                return;
-            Object.defineProperties(ts.objectAllocator.getSymbolConstructor().prototype, {
-                __debugFlags: { get: function () { return ts.formatSymbolFlags(this.flags); } }
-            });
-            Object.defineProperties(ts.objectAllocator.getTypeConstructor().prototype, {
-                __debugFlags: { get: function () { return ts.formatTypeFlags(this.flags); } },
-                __debugObjectFlags: { get: function () { return this.flags & 524288 ? ts.formatObjectFlags(this.objectFlags) : ""; } },
-                __debugTypeToString: { value: function () { return this.checker.typeToString(this); } },
-            });
-            var nodeConstructors = [
-                ts.objectAllocator.getNodeConstructor(),
-                ts.objectAllocator.getIdentifierConstructor(),
-                ts.objectAllocator.getTokenConstructor(),
-                ts.objectAllocator.getSourceFileConstructor()
-            ];
-            for (var _i = 0, nodeConstructors_1 = nodeConstructors; _i < nodeConstructors_1.length; _i++) {
-                var ctor = nodeConstructors_1[_i];
-                if (!ctor.prototype.hasOwnProperty("__debugKind")) {
-                    Object.defineProperties(ctor.prototype, {
-                        __debugKind: { get: function () { return ts.formatSyntaxKind(this.kind); } },
-                        __debugModifierFlags: { get: function () { return ts.formatModifierFlags(ts.getModifierFlagsNoCache(this)); } },
-                        __debugTransformFlags: { get: function () { return ts.formatTransformFlags(this.transformFlags); } },
-                        __debugEmitFlags: { get: function () { return ts.formatEmitFlags(ts.getEmitFlags(this)); } },
-                        __debugGetText: {
-                            value: function (includeTrivia) {
-                                if (ts.nodeIsSynthesized(this))
-                                    return "";
-                                var parseNode = ts.getParseTreeNode(this);
-                                var sourceFile = parseNode && ts.getSourceFileOfNode(parseNode);
-                                return sourceFile ? ts.getSourceTextOfNodeFromSourceFile(sourceFile, parseNode, includeTrivia) : "";
-                            }
-                        }
-                    });
-                }
-            }
-            isDebugInfoEnabled = true;
-        }
-        Debug.enableDebugInfo = enableDebugInfo;
-    })(Debug = ts.Debug || (ts.Debug = {}));
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
@@ -55601,14 +57396,14 @@ var ts;
             exit();
         }
         function appendSourceMap(generatedLine, generatedCharacter, map, sourceMapPath, start, end) {
-            var _a;
             ts.Debug.assert(generatedLine >= pendingGeneratedLine, "generatedLine cannot backtrack");
             ts.Debug.assert(generatedCharacter >= 0, "generatedCharacter cannot be negative");
             enter();
             var sourceIndexToNewSourceIndexMap = [];
             var nameIndexToNewNameIndexMap;
             var mappingIterator = decodeMappings(map.mappings);
-            for (var _b = mappingIterator.next(), raw = _b.value, done = _b.done; !done; _a = mappingIterator.next(), raw = _a.value, done = _a.done, _a) {
+            for (var iterResult = mappingIterator.next(); !iterResult.done; iterResult = mappingIterator.next()) {
+                var raw = iterResult.value;
                 if (end && (raw.generatedLine > end.line ||
                     (raw.generatedLine === end.line && raw.generatedCharacter > end.character))) {
                     break;
@@ -56093,7 +57888,7 @@ var ts;
     function chainBundle(transformSourceFile) {
         return transformSourceFileOrBundle;
         function transformSourceFileOrBundle(node) {
-            return node.kind === 284 ? transformSourceFile(node) : transformBundle(node);
+            return node.kind === 285 ? transformSourceFile(node) : transformBundle(node);
         }
         function transformBundle(node) {
             return ts.createBundle(ts.map(node.sourceFiles, transformSourceFile), node.prepends);
@@ -56137,16 +57932,16 @@ var ts;
         for (var _i = 0, _a = sourceFile.statements; _i < _a.length; _i++) {
             var node = _a[_i];
             switch (node.kind) {
-                case 249:
+                case 250:
                     externalImports.push(node);
                     hasImportStarOrImportDefault = hasImportStarOrImportDefault || getImportNeedsImportStarHelper(node) || getImportNeedsImportDefaultHelper(node);
                     break;
-                case 248:
-                    if (node.moduleReference.kind === 259) {
+                case 249:
+                    if (node.moduleReference.kind === 260) {
                         externalImports.push(node);
                     }
                     break;
-                case 255:
+                case 256:
                     if (node.moduleSpecifier) {
                         if (!node.exportClause) {
                             externalImports.push(node);
@@ -56173,12 +57968,12 @@ var ts;
                         }
                     }
                     break;
-                case 254:
+                case 255:
                     if (node.isExportEquals && !exportEquals) {
                         exportEquals = node;
                     }
                     break;
-                case 219:
+                case 220:
                     if (ts.hasModifier(node, 1)) {
                         for (var _d = 0, _e = node.declarationList.declarations; _d < _e.length; _d++) {
                             var decl = _e[_d];
@@ -56186,7 +57981,7 @@ var ts;
                         }
                     }
                     break;
-                case 239:
+                case 240:
                     if (ts.hasModifier(node, 1)) {
                         if (ts.hasModifier(node, 512)) {
                             if (!hasExportDefault) {
@@ -56204,7 +57999,7 @@ var ts;
                         }
                     }
                     break;
-                case 240:
+                case 241:
                     if (ts.hasModifier(node, 1)) {
                         if (ts.hasModifier(node, 512)) {
                             if (!hasExportDefault) {
@@ -56268,6 +58063,28 @@ var ts;
             ts.isIdentifier(expression);
     }
     ts.isSimpleCopiableExpression = isSimpleCopiableExpression;
+    function isSimpleInlineableExpression(expression) {
+        return !ts.isIdentifier(expression) && isSimpleCopiableExpression(expression) ||
+            ts.isWellKnownSymbolSyntactically(expression);
+    }
+    ts.isSimpleInlineableExpression = isSimpleInlineableExpression;
+    function addPrologueDirectivesAndInitialSuperCall(ctor, result, visitor) {
+        if (ctor.body) {
+            var statements = ctor.body.statements;
+            var index = ts.addPrologue(result, statements, false, visitor);
+            if (index === statements.length) {
+                return index;
+            }
+            var statement = statements[index];
+            if (statement.kind === 222 && ts.isSuperCall(statement.expression)) {
+                result.push(ts.visitNode(statement, visitor, ts.isStatement));
+                return index + 1;
+            }
+            return index;
+        }
+        return 0;
+    }
+    ts.addPrologueDirectivesAndInitialSuperCall = addPrologueDirectivesAndInitialSuperCall;
     function helperString(input) {
         var args = [];
         for (var _i = 1; _i < arguments.length; _i++) {
@@ -56284,6 +58101,23 @@ var ts;
         };
     }
     ts.helperString = helperString;
+    function getInitializedProperties(node, isStatic) {
+        return ts.filter(node.members, isStatic ? isStaticInitializedProperty : isInstanceInitializedProperty);
+    }
+    ts.getInitializedProperties = getInitializedProperties;
+    function isStaticInitializedProperty(member) {
+        return isInitializedProperty(member) && ts.hasStaticModifier(member);
+    }
+    ts.isStaticInitializedProperty = isStaticInitializedProperty;
+    function isInstanceInitializedProperty(member) {
+        return isInitializedProperty(member) && !ts.hasStaticModifier(member);
+    }
+    ts.isInstanceInitializedProperty = isInstanceInitializedProperty;
+    function isInitializedProperty(member) {
+        return member.kind === 155
+            && member.initializer !== undefined;
+    }
+    ts.isInitializedProperty = isInitializedProperty;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
@@ -56610,7 +58444,7 @@ var ts;
     ts.restHelper = {
         name: "typescript:rest",
         scoped: false,
-        text: "\n            var __rest = (this && this.__rest) || function (s, e) {\n                var t = {};\n                for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)\n                    t[p] = s[p];\n                if (s != null && typeof Object.getOwnPropertySymbols === \"function\")\n                    for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)\n                        t[p[i]] = s[p[i]];\n                return t;\n            };"
+        text: "\n            var __rest = (this && this.__rest) || function (s, e) {\n                var t = {};\n                for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)\n                    t[p] = s[p];\n                if (s != null && typeof Object.getOwnPropertySymbols === \"function\")\n                    for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {\n                        if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))\n                            t[p[i]] = s[p[i]];\n                    }\n                return t;\n            };"
     };
     function createRestCall(context, value, elements, computedTempVariables, location) {
         context.requestEmitHelper(ts.restHelper);
@@ -56649,28 +58483,28 @@ var ts;
         var previousOnSubstituteNode = context.onSubstituteNode;
         context.onEmitNode = onEmitNode;
         context.onSubstituteNode = onSubstituteNode;
-        context.enableSubstitution(189);
         context.enableSubstitution(190);
+        context.enableSubstitution(191);
         var currentSourceFile;
         var currentNamespace;
         var currentNamespaceContainerName;
         var currentLexicalScope;
         var currentNameScope;
         var currentScopeFirstDeclarationsOfName;
+        var currentClassHasParameterProperties;
         var enabledSubstitutions;
         var classAliases;
         var applicableSubstitutions;
-        var pendingExpressions;
         return transformSourceFileOrBundle;
         function transformSourceFileOrBundle(node) {
-            if (node.kind === 285) {
+            if (node.kind === 286) {
                 return transformBundle(node);
             }
             return transformSourceFile(node);
         }
         function transformBundle(node) {
             return ts.createBundle(node.sourceFiles.map(transformSourceFile), ts.mapDefined(node.prepends, function (prepend) {
-                if (prepend.kind === 287) {
+                if (prepend.kind === 288) {
                     return ts.createUnparsedSourceFile(prepend, "js");
                 }
                 return prepend;
@@ -56690,6 +58524,7 @@ var ts;
             var savedCurrentScope = currentLexicalScope;
             var savedCurrentNameScope = currentNameScope;
             var savedCurrentScopeFirstDeclarationsOfName = currentScopeFirstDeclarationsOfName;
+            var savedCurrentClassHasParameterProperties = currentClassHasParameterProperties;
             onBeforeVisitNode(node);
             var visited = f(node);
             if (currentLexicalScope !== savedCurrentScope) {
@@ -56697,20 +58532,21 @@ var ts;
             }
             currentLexicalScope = savedCurrentScope;
             currentNameScope = savedCurrentNameScope;
+            currentClassHasParameterProperties = savedCurrentClassHasParameterProperties;
             return visited;
         }
         function onBeforeVisitNode(node) {
             switch (node.kind) {
-                case 284:
+                case 285:
+                case 247:
                 case 246:
-                case 245:
-                case 218:
+                case 219:
                     currentLexicalScope = node;
                     currentNameScope = undefined;
                     currentScopeFirstDeclarationsOfName = undefined;
                     break;
+                case 241:
                 case 240:
-                case 239:
                     if (ts.hasModifier(node, 2)) {
                         break;
                     }
@@ -56718,7 +58554,7 @@ var ts;
                         recordEmittedDeclarationInScope(node);
                     }
                     else {
-                        ts.Debug.assert(node.kind === 240 || ts.hasModifier(node, 512));
+                        ts.Debug.assert(node.kind === 241 || ts.hasModifier(node, 512));
                     }
                     if (ts.isClassDeclaration(node)) {
                         currentNameScope = node;
@@ -56740,10 +58576,10 @@ var ts;
         }
         function sourceElementVisitorWorker(node) {
             switch (node.kind) {
+                case 250:
                 case 249:
-                case 248:
-                case 254:
                 case 255:
+                case 256:
                     return visitEllidableStatement(node);
                 default:
                     return visitorWorker(node);
@@ -56758,13 +58594,13 @@ var ts;
                 return node;
             }
             switch (node.kind) {
-                case 249:
+                case 250:
                     return visitImportDeclaration(node);
-                case 248:
+                case 249:
                     return visitImportEqualsDeclaration(node);
-                case 254:
-                    return visitExportAssignment(node);
                 case 255:
+                    return visitExportAssignment(node);
+                case 256:
                     return visitExportDeclaration(node);
                 default:
                     ts.Debug.fail("Unhandled ellided statement");
@@ -56774,11 +58610,11 @@ var ts;
             return saveStateAndInvoke(node, namespaceElementVisitorWorker);
         }
         function namespaceElementVisitorWorker(node) {
-            if (node.kind === 255 ||
-                node.kind === 249 ||
+            if (node.kind === 256 ||
                 node.kind === 250 ||
-                (node.kind === 248 &&
-                    node.moduleReference.kind === 259)) {
+                node.kind === 251 ||
+                (node.kind === 249 &&
+                    node.moduleReference.kind === 260)) {
                 return undefined;
             }
             else if (node.transformFlags & 1 || ts.hasModifier(node, 1)) {
@@ -56791,15 +58627,16 @@ var ts;
         }
         function classElementVisitorWorker(node) {
             switch (node.kind) {
-                case 157:
-                    return undefined;
-                case 154:
-                case 162:
                 case 158:
+                    return visitConstructor(node);
+                case 155:
+                    return visitPropertyDeclaration(node);
+                case 163:
                 case 159:
-                case 156:
+                case 160:
+                case 157:
                     return visitorWorker(node);
-                case 217:
+                case 218:
                     return node;
                 default:
                     return ts.Debug.failBadSyntaxKind(node);
@@ -56809,7 +58646,7 @@ var ts;
             if (ts.modifierToFlag(node.kind) & 2270) {
                 return undefined;
             }
-            else if (currentNamespace && node.kind === 85) {
+            else if (currentNamespace && node.kind === 86) {
                 return undefined;
             }
             return node;
@@ -56819,100 +58656,100 @@ var ts;
                 return ts.createNotEmittedStatement(node);
             }
             switch (node.kind) {
-                case 85:
-                case 80:
+                case 86:
+                case 81:
                     return currentNamespace ? undefined : node;
-                case 115:
-                case 113:
+                case 116:
                 case 114:
-                case 118:
-                case 77:
-                case 125:
-                case 133:
-                case 169:
+                case 115:
+                case 119:
+                case 78:
+                case 126:
+                case 134:
                 case 170:
                 case 171:
                 case 172:
-                case 168:
-                case 163:
-                case 150:
-                case 120:
-                case 143:
-                case 123:
-                case 138:
-                case 135:
-                case 132:
-                case 106:
-                case 139:
-                case 166:
-                case 165:
-                case 167:
-                case 164:
                 case 173:
+                case 169:
+                case 164:
+                case 151:
+                case 121:
+                case 144:
+                case 124:
+                case 139:
+                case 136:
+                case 133:
+                case 107:
+                case 140:
+                case 167:
+                case 166:
+                case 168:
+                case 165:
                 case 174:
                 case 175:
-                case 177:
+                case 176:
                 case 178:
                 case 179:
                 case 180:
                 case 181:
                 case 182:
-                case 162:
-                case 152:
-                case 242:
-                    return undefined;
-                case 154:
-                    return visitPropertyDeclaration(node);
-                case 247:
-                    return undefined;
-                case 157:
-                    return visitConstructor(node);
-                case 241:
-                    return ts.createNotEmittedStatement(node);
-                case 240:
-                    return visitClassDeclaration(node);
-                case 209:
-                    return visitClassExpression(node);
-                case 273:
-                    return visitHeritageClause(node);
-                case 211:
-                    return visitExpressionWithTypeArguments(node);
-                case 156:
-                    return visitMethodDeclaration(node);
-                case 158:
-                    return visitGetAccessor(node);
-                case 159:
-                    return visitSetAccessor(node);
-                case 239:
-                    return visitFunctionDeclaration(node);
-                case 196:
-                    return visitFunctionExpression(node);
-                case 197:
-                    return visitArrowFunction(node);
-                case 151:
-                    return visitParameter(node);
-                case 195:
-                    return visitParenthesizedExpression(node);
-                case 194:
-                case 212:
-                    return visitAssertionExpression(node);
-                case 191:
-                    return visitCallExpression(node);
-                case 192:
-                    return visitNewExpression(node);
-                case 193:
-                    return visitTaggedTemplateExpression(node);
-                case 213:
-                    return visitNonNullExpression(node);
+                case 183:
+                case 163:
+                case 153:
                 case 243:
-                    return visitEnumDeclaration(node);
-                case 219:
-                    return visitVariableStatement(node);
-                case 237:
-                    return visitVariableDeclaration(node);
-                case 244:
-                    return visitModuleDeclaration(node);
+                    return undefined;
+                case 155:
+                    return visitPropertyDeclaration(node);
                 case 248:
+                    return undefined;
+                case 158:
+                    return visitConstructor(node);
+                case 242:
+                    return ts.createNotEmittedStatement(node);
+                case 241:
+                    return visitClassDeclaration(node);
+                case 210:
+                    return visitClassExpression(node);
+                case 274:
+                    return visitHeritageClause(node);
+                case 212:
+                    return visitExpressionWithTypeArguments(node);
+                case 157:
+                    return visitMethodDeclaration(node);
+                case 159:
+                    return visitGetAccessor(node);
+                case 160:
+                    return visitSetAccessor(node);
+                case 240:
+                    return visitFunctionDeclaration(node);
+                case 197:
+                    return visitFunctionExpression(node);
+                case 198:
+                    return visitArrowFunction(node);
+                case 152:
+                    return visitParameter(node);
+                case 196:
+                    return visitParenthesizedExpression(node);
+                case 195:
+                case 213:
+                    return visitAssertionExpression(node);
+                case 192:
+                    return visitCallExpression(node);
+                case 193:
+                    return visitNewExpression(node);
+                case 194:
+                    return visitTaggedTemplateExpression(node);
+                case 214:
+                    return visitNonNullExpression(node);
+                case 244:
+                    return visitEnumDeclaration(node);
+                case 220:
+                    return visitVariableStatement(node);
+                case 238:
+                    return visitVariableDeclaration(node);
+                case 245:
+                    return visitModuleDeclaration(node);
+                case 249:
                     return visitImportEqualsDeclaration(node);
                 default:
                     return ts.visitEachChild(node, visitor, context);
@@ -56942,7 +58779,7 @@ var ts;
             if (ts.some(staticProperties))
                 facts |= 1;
             var extendsClauseElement = ts.getEffectiveBaseTypeNode(node);
-            if (extendsClauseElement && ts.skipOuterExpressions(extendsClauseElement.expression).kind !== 96)
+            if (extendsClauseElement && ts.skipOuterExpressions(extendsClauseElement.expression).kind !== 97)
                 facts |= 64;
             if (shouldEmitDecorateCallForClass(node))
                 facts |= 2;
@@ -56971,25 +58808,16 @@ var ts;
             if (!isClassLikeDeclarationWithTypeScriptSyntax(node) && !(currentNamespace && ts.hasModifier(node, 1))) {
                 return ts.visitEachChild(node, visitor, context);
             }
-            var savedPendingExpressions = pendingExpressions;
-            pendingExpressions = undefined;
-            var staticProperties = getInitializedProperties(node, true);
+            var staticProperties = ts.getInitializedProperties(node, true);
             var facts = getClassFacts(node, staticProperties);
             if (facts & 128) {
                 context.startLexicalEnvironment();
             }
             var name = node.name || (facts & 5 ? ts.getGeneratedNameForNode(node) : undefined);
             var classStatement = facts & 2
-                ? createClassDeclarationHeadWithDecorators(node, name, facts)
+                ? createClassDeclarationHeadWithDecorators(node, name)
                 : createClassDeclarationHeadWithoutDecorators(node, name, facts);
             var statements = [classStatement];
-            if (ts.some(pendingExpressions)) {
-                statements.push(ts.createExpressionStatement(ts.inlineExpressions(pendingExpressions)));
-            }
-            pendingExpressions = savedPendingExpressions;
-            if (facts & 1) {
-                addInitializedPropertyStatements(statements, staticProperties, facts & 128 ? ts.getInternalName(node) : ts.getLocalName(node));
-            }
             addClassElementDecorationStatements(statements, node, false);
             addClassElementDecorationStatements(statements, node, true);
             addConstructorDecorationStatement(statements, node);
@@ -57036,23 +58864,25 @@ var ts;
             var modifiers = !(facts & 128)
                 ? ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier)
                 : undefined;
-            var classDeclaration = ts.createClassDeclaration(undefined, modifiers, name, undefined, ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), transformClassMembers(node, (facts & 64) !== 0));
+            var classDeclaration = ts.createClassDeclaration(undefined, modifiers, name, undefined, ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), transformClassMembers(node));
             var emitFlags = ts.getEmitFlags(node);
             if (facts & 1) {
                 emitFlags |= 32;
             }
+            ts.aggregateTransformFlags(classDeclaration);
             ts.setTextRange(classDeclaration, node);
             ts.setOriginalNode(classDeclaration, node);
             ts.setEmitFlags(classDeclaration, emitFlags);
             return classDeclaration;
         }
-        function createClassDeclarationHeadWithDecorators(node, name, facts) {
+        function createClassDeclarationHeadWithDecorators(node, name) {
             var location = ts.moveRangePastDecorators(node);
             var classAlias = getClassAliasIfNeeded(node);
             var declName = ts.getLocalName(node, false, true);
             var heritageClauses = ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause);
-            var members = transformClassMembers(node, (facts & 64) !== 0);
+            var members = transformClassMembers(node);
             var classExpression = ts.createClassExpression(undefined, name, undefined, heritageClauses, members);
+            ts.aggregateTransformFlags(classExpression);
             ts.setOriginalNode(classExpression, node);
             ts.setTextRange(classExpression, location);
             var statement = ts.createVariableStatement(undefined, ts.createVariableDeclarationList([
@@ -57067,158 +58897,28 @@ var ts;
             if (!isClassLikeDeclarationWithTypeScriptSyntax(node)) {
                 return ts.visitEachChild(node, visitor, context);
             }
-            var savedPendingExpressions = pendingExpressions;
-            pendingExpressions = undefined;
-            var staticProperties = getInitializedProperties(node, true);
-            var heritageClauses = ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause);
-            var members = transformClassMembers(node, ts.some(heritageClauses, function (c) { return c.token === 86; }));
-            var classExpression = ts.createClassExpression(undefined, node.name, undefined, heritageClauses, members);
+            var classExpression = ts.createClassExpression(undefined, node.name, undefined, ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), transformClassMembers(node));
+            ts.aggregateTransformFlags(classExpression);
             ts.setOriginalNode(classExpression, node);
             ts.setTextRange(classExpression, node);
-            if (ts.some(staticProperties) || ts.some(pendingExpressions)) {
-                var expressions = [];
-                var isClassWithConstructorReference = resolver.getNodeCheckFlags(node) & 16777216;
-                var temp = ts.createTempVariable(hoistVariableDeclaration, !!isClassWithConstructorReference);
-                if (isClassWithConstructorReference) {
-                    enableSubstitutionForClassAliases();
-                    var alias = ts.getSynthesizedClone(temp);
-                    alias.autoGenerateFlags &= ~8;
-                    classAliases[ts.getOriginalNodeId(node)] = alias;
-                }
-                ts.setEmitFlags(classExpression, 65536 | ts.getEmitFlags(classExpression));
-                expressions.push(ts.startOnNewLine(ts.createAssignment(temp, classExpression)));
-                ts.addRange(expressions, ts.map(pendingExpressions, ts.startOnNewLine));
-                pendingExpressions = savedPendingExpressions;
-                ts.addRange(expressions, generateInitializedPropertyExpressions(staticProperties, temp));
-                expressions.push(ts.startOnNewLine(temp));
-                return ts.inlineExpressions(expressions);
-            }
-            pendingExpressions = savedPendingExpressions;
             return classExpression;
         }
-        function transformClassMembers(node, isDerivedClass) {
+        function transformClassMembers(node) {
             var members = [];
-            var constructor = transformConstructor(node, isDerivedClass);
-            if (constructor) {
-                members.push(constructor);
+            var constructor = ts.getFirstConstructorWithBody(node);
+            var parametersWithPropertyAssignments = constructor &&
+                ts.filter(constructor.parameters, ts.isParameterPropertyDeclaration);
+            if (parametersWithPropertyAssignments) {
+                for (var _i = 0, parametersWithPropertyAssignments_1 = parametersWithPropertyAssignments; _i < parametersWithPropertyAssignments_1.length; _i++) {
+                    var parameter = parametersWithPropertyAssignments_1[_i];
+                    if (ts.isIdentifier(parameter.name)) {
+                        members.push(ts.aggregateTransformFlags(ts.createProperty(undefined, undefined, parameter.name, undefined, undefined, undefined)));
+                    }
+                }
             }
             ts.addRange(members, ts.visitNodes(node.members, classElementVisitor, ts.isClassElement));
             return ts.setTextRange(ts.createNodeArray(members), node.members);
         }
-        function transformConstructor(node, isDerivedClass) {
-            var constructor = ts.getFirstConstructorWithBody(node);
-            var hasInstancePropertyWithInitializer = ts.forEach(node.members, isInstanceInitializedProperty);
-            var hasParameterPropertyAssignments = constructor &&
-                constructor.transformFlags & 1024 &&
-                ts.forEach(constructor.parameters, isParameterWithPropertyAssignment);
-            if (!hasInstancePropertyWithInitializer && !hasParameterPropertyAssignments) {
-                return ts.visitEachChild(constructor, visitor, context);
-            }
-            var parameters = transformConstructorParameters(constructor);
-            var body = transformConstructorBody(node, constructor, isDerivedClass);
-            return ts.startOnNewLine(ts.setOriginalNode(ts.setTextRange(ts.createConstructor(undefined, undefined, parameters, body), constructor || node), constructor));
-        }
-        function transformConstructorParameters(constructor) {
-            return ts.visitParameterList(constructor && constructor.parameters, visitor, context)
-                || [];
-        }
-        function transformConstructorBody(node, constructor, isDerivedClass) {
-            var statements = [];
-            var indexOfFirstStatement = 0;
-            resumeLexicalEnvironment();
-            if (constructor) {
-                indexOfFirstStatement = addPrologueDirectivesAndInitialSuperCall(constructor, statements);
-                var propertyAssignments = getParametersWithPropertyAssignments(constructor);
-                ts.addRange(statements, ts.map(propertyAssignments, transformParameterWithPropertyAssignment));
-            }
-            else if (isDerivedClass) {
-                statements.push(ts.createExpressionStatement(ts.createCall(ts.createSuper(), undefined, [ts.createSpread(ts.createIdentifier("arguments"))])));
-            }
-            var properties = getInitializedProperties(node, false);
-            addInitializedPropertyStatements(statements, properties, ts.createThis());
-            if (constructor) {
-                ts.addRange(statements, ts.visitNodes(constructor.body.statements, visitor, ts.isStatement, indexOfFirstStatement));
-            }
-            statements = ts.mergeLexicalEnvironment(statements, endLexicalEnvironment());
-            return ts.setTextRange(ts.createBlock(ts.setTextRange(ts.createNodeArray(statements), constructor ? constructor.body.statements : node.members), true), constructor ? constructor.body : undefined);
-        }
-        function addPrologueDirectivesAndInitialSuperCall(ctor, result) {
-            if (ctor.body) {
-                var statements = ctor.body.statements;
-                var index = ts.addPrologue(result, statements, false, visitor);
-                if (index === statements.length) {
-                    return index;
-                }
-                var statement = statements[index];
-                if (statement.kind === 221 && ts.isSuperCall(statement.expression)) {
-                    result.push(ts.visitNode(statement, visitor, ts.isStatement));
-                    return index + 1;
-                }
-                return index;
-            }
-            return 0;
-        }
-        function getParametersWithPropertyAssignments(node) {
-            return ts.filter(node.parameters, isParameterWithPropertyAssignment);
-        }
-        function isParameterWithPropertyAssignment(parameter) {
-            return ts.hasModifier(parameter, 92)
-                && ts.isIdentifier(parameter.name);
-        }
-        function transformParameterWithPropertyAssignment(node) {
-            ts.Debug.assert(ts.isIdentifier(node.name));
-            var name = node.name;
-            var propertyName = ts.getMutableClone(name);
-            ts.setEmitFlags(propertyName, 1536 | 48);
-            var localName = ts.getMutableClone(name);
-            ts.setEmitFlags(localName, 1536);
-            return ts.startOnNewLine(ts.setEmitFlags(ts.setTextRange(ts.createExpressionStatement(ts.createAssignment(ts.setTextRange(ts.createPropertyAccess(ts.createThis(), propertyName), node.name), localName)), ts.moveRangePos(node, -1)), 1536));
-        }
-        function getInitializedProperties(node, isStatic) {
-            return ts.filter(node.members, isStatic ? isStaticInitializedProperty : isInstanceInitializedProperty);
-        }
-        function isStaticInitializedProperty(member) {
-            return isInitializedProperty(member, true);
-        }
-        function isInstanceInitializedProperty(member) {
-            return isInitializedProperty(member, false);
-        }
-        function isInitializedProperty(member, isStatic) {
-            return member.kind === 154
-                && isStatic === ts.hasModifier(member, 32)
-                && member.initializer !== undefined;
-        }
-        function addInitializedPropertyStatements(statements, properties, receiver) {
-            for (var _i = 0, properties_9 = properties; _i < properties_9.length; _i++) {
-                var property = properties_9[_i];
-                var statement = ts.createExpressionStatement(transformInitializedProperty(property, receiver));
-                ts.setSourceMapRange(statement, ts.moveRangePastModifiers(property));
-                ts.setCommentRange(statement, property);
-                ts.setOriginalNode(statement, property);
-                statements.push(statement);
-            }
-        }
-        function generateInitializedPropertyExpressions(properties, receiver) {
-            var expressions = [];
-            for (var _i = 0, properties_10 = properties; _i < properties_10.length; _i++) {
-                var property = properties_10[_i];
-                var expression = transformInitializedProperty(property, receiver);
-                ts.startOnNewLine(expression);
-                ts.setSourceMapRange(expression, ts.moveRangePastModifiers(property));
-                ts.setCommentRange(expression, property);
-                ts.setOriginalNode(expression, property);
-                expressions.push(expression);
-            }
-            return expressions;
-        }
-        function transformInitializedProperty(property, receiver) {
-            var propertyName = ts.isComputedPropertyName(property.name) && !isSimpleInlineableExpression(property.name.expression)
-                ? ts.updateComputedPropertyName(property.name, ts.getGeneratedNameForNode(property.name))
-                : property.name;
-            var initializer = ts.visitNode(property.initializer, visitor, ts.isExpression);
-            var memberAccess = ts.createMemberAccessForPropertyName(receiver, propertyName, propertyName);
-            return ts.createAssignment(memberAccess, initializer);
-        }
         function getDecoratedClassElements(node, isStatic) {
             return ts.filter(node.members, isStatic ? function (m) { return isStaticDecoratedClassElement(m, node); } : function (m) { return isInstanceDecoratedClassElement(m, node); });
         }
@@ -57236,11 +58936,14 @@ var ts;
             var decorators;
             if (node) {
                 var parameters = node.parameters;
-                for (var i = 0; i < parameters.length; i++) {
-                    var parameter = parameters[i];
+                var firstParameterIsThis = parameters.length > 0 && ts.parameterIsThisKeyword(parameters[0]);
+                var firstParameterOffset = firstParameterIsThis ? 1 : 0;
+                var numParameters = firstParameterIsThis ? parameters.length - 1 : parameters.length;
+                for (var i = 0; i < numParameters; i++) {
+                    var parameter = parameters[i + firstParameterOffset];
                     if (decorators || parameter.decorators) {
                         if (!decorators) {
-                            decorators = new Array(parameters.length);
+                            decorators = new Array(numParameters);
                         }
                         decorators[i] = parameter.decorators;
                     }
@@ -57261,12 +58964,12 @@ var ts;
         }
         function getAllDecoratorsOfClassElement(node, member) {
             switch (member.kind) {
-                case 158:
                 case 159:
+                case 160:
                     return getAllDecoratorsOfAccessors(node, member);
-                case 156:
+                case 157:
                     return getAllDecoratorsOfMethod(member);
-                case 154:
+                case 155:
                     return getAllDecoratorsOfProperty(member);
                 default:
                     return undefined;
@@ -57345,7 +59048,7 @@ var ts;
             var prefix = getClassMemberPrefix(node, member);
             var memberName = getExpressionForPropertyName(member, true);
             var descriptor = languageVersion > 0
-                ? member.kind === 154
+                ? member.kind === 155
                     ? ts.createVoidZero()
                     : ts.createNull()
                 : undefined;
@@ -57429,22 +59132,22 @@ var ts;
         }
         function shouldAddTypeMetadata(node) {
             var kind = node.kind;
-            return kind === 156
-                || kind === 158
+            return kind === 157
                 || kind === 159
-                || kind === 154;
+                || kind === 160
+                || kind === 155;
         }
         function shouldAddReturnTypeMetadata(node) {
-            return node.kind === 156;
+            return node.kind === 157;
         }
         function shouldAddParamTypesMetadata(node) {
             switch (node.kind) {
-                case 240:
-                case 209:
+                case 241:
+                case 210:
                     return ts.getFirstConstructorWithBody(node) !== undefined;
-                case 156:
-                case 158:
+                case 157:
                 case 159:
+                case 160:
                     return true;
             }
             return false;
@@ -57456,15 +59159,15 @@ var ts;
         }
         function serializeTypeOfNode(node) {
             switch (node.kind) {
-                case 154:
-                case 151:
+                case 155:
+                case 152:
                     return serializeTypeNode(node.type);
+                case 160:
                 case 159:
-                case 158:
                     return serializeTypeNode(getAccessorTypeNode(node));
-                case 240:
-                case 209:
-                case 156:
+                case 241:
+                case 210:
+                case 157:
                     return ts.createIdentifier("Function");
                 default:
                     return ts.createVoidZero();
@@ -57496,7 +59199,7 @@ var ts;
             return ts.createArrayLiteral(expressions);
         }
         function getParametersOfDecoratedDeclaration(node, container) {
-            if (container && node.kind === 158) {
+            if (container && node.kind === 159) {
                 var setAccessor = ts.getAllAccessorDeclarations(container.members, node).setAccessor;
                 if (setAccessor) {
                     return setAccessor.parameters;
@@ -57518,69 +59221,69 @@ var ts;
                 return ts.createIdentifier("Object");
             }
             switch (node.kind) {
-                case 106:
-                case 141:
-                case 96:
-                case 132:
+                case 107:
+                case 142:
+                case 97:
+                case 133:
                     return ts.createVoidZero();
-                case 177:
+                case 178:
                     return serializeTypeNode(node.type);
-                case 165:
                 case 166:
+                case 167:
                     return ts.createIdentifier("Function");
-                case 169:
                 case 170:
+                case 171:
                     return ts.createIdentifier("Array");
-                case 163:
-                case 123:
+                case 164:
+                case 124:
                     return ts.createIdentifier("Boolean");
-                case 138:
+                case 139:
                     return ts.createIdentifier("String");
-                case 136:
+                case 137:
                     return ts.createIdentifier("Object");
-                case 182:
+                case 183:
                     switch (node.literal.kind) {
                         case 10:
                             return ts.createIdentifier("String");
-                        case 202:
+                        case 203:
                         case 8:
                             return ts.createIdentifier("Number");
                         case 9:
                             return getGlobalBigIntNameWithFallback();
-                        case 102:
-                        case 87:
+                        case 103:
+                        case 88:
                             return ts.createIdentifier("Boolean");
                         default:
                             return ts.Debug.failBadSyntaxKind(node.literal);
                     }
-                case 135:
+                case 136:
                     return ts.createIdentifier("Number");
-                case 146:
+                case 147:
                     return getGlobalBigIntNameWithFallback();
-                case 139:
+                case 140:
                     return languageVersion < 2
                         ? getGlobalSymbolNameWithFallback()
                         : ts.createIdentifier("Symbol");
-                case 164:
+                case 165:
                     return serializeTypeReferenceNode(node);
-                case 174:
-                case 173:
-                    return serializeTypeList(node.types);
                 case 175:
+                case 174:
+                    return serializeTypeList(node.types);
+                case 176:
                     return serializeTypeList([node.trueType, node.falseType]);
-                case 179:
-                    if (node.operator === 133) {
+                case 180:
+                    if (node.operator === 134) {
                         return serializeTypeNode(node.type);
                     }
                     break;
-                case 167:
-                case 180:
-                case 181:
                 case 168:
-                case 120:
-                case 143:
-                case 178:
-                case 183:
+                case 181:
+                case 182:
+                case 169:
+                case 121:
+                case 144:
+                case 179:
+                case 184:
                     break;
                 default:
                     return ts.Debug.failBadSyntaxKind(node);
@@ -57591,13 +59294,13 @@ var ts;
             var serializedUnion;
             for (var _i = 0, types_18 = types; _i < types_18.length; _i++) {
                 var typeNode = types_18[_i];
-                while (typeNode.kind === 177) {
+                while (typeNode.kind === 178) {
                     typeNode = typeNode.type;
                 }
-                if (typeNode.kind === 132) {
+                if (typeNode.kind === 133) {
                     continue;
                 }
-                if (!strictNullChecks && (typeNode.kind === 96 || typeNode.kind === 141)) {
+                if (!strictNullChecks && (typeNode.kind === 97 || typeNode.kind === 142)) {
                     continue;
                 }
                 var serializedIndividual = serializeTypeNode(typeNode);
@@ -57659,11 +59362,11 @@ var ts;
             return ts.createLogicalAnd(ts.createStrictInequality(ts.createTypeOf(left), ts.createLiteral("undefined")), right);
         }
         function serializeEntityNameAsExpressionFallback(node) {
-            if (node.kind === 72) {
+            if (node.kind === 73) {
                 var copied = serializeEntityNameAsExpression(node);
                 return createCheckedValue(copied, copied);
             }
-            if (node.left.kind === 72) {
+            if (node.left.kind === 73) {
                 return createCheckedValue(serializeEntityNameAsExpression(node.left), serializeEntityNameAsExpression(node));
             }
             var left = serializeEntityNameAsExpressionFallback(node.left);
@@ -57672,13 +59375,13 @@ var ts;
         }
         function serializeEntityNameAsExpression(node) {
             switch (node.kind) {
-                case 72:
+                case 73:
                     var name = ts.getMutableClone(node);
                     name.flags &= ~8;
                     name.original = undefined;
                     name.parent = ts.getParseTreeNode(currentLexicalScope);
                     return name;
-                case 148:
+                case 149:
                     return serializeQualifiedNameAsExpression(node);
             }
         }
@@ -57689,18 +59392,14 @@ var ts;
             return ts.createConditional(ts.createTypeCheck(ts.createIdentifier("Symbol"), "function"), ts.createIdentifier("Symbol"), ts.createIdentifier("Object"));
         }
         function getGlobalBigIntNameWithFallback() {
-            return languageVersion < 7
+            return languageVersion < 99
                 ? ts.createConditional(ts.createTypeCheck(ts.createIdentifier("BigInt"), "function"), ts.createIdentifier("BigInt"), ts.createIdentifier("Object"))
                 : ts.createIdentifier("BigInt");
         }
-        function isSimpleInlineableExpression(expression) {
-            return !ts.isIdentifier(expression) && ts.isSimpleCopiableExpression(expression) ||
-                ts.isWellKnownSymbolSyntactically(expression);
-        }
         function getExpressionForPropertyName(member, generateNameForComputedPropertyName) {
             var name = member.name;
             if (ts.isComputedPropertyName(name)) {
-                return generateNameForComputedPropertyName && !isSimpleInlineableExpression(name.expression)
+                return generateNameForComputedPropertyName && !ts.isSimpleInlineableExpression(name.expression)
                     ? ts.getGeneratedNameForNode(name)
                     : name.expression;
             }
@@ -57711,35 +59410,21 @@ var ts;
                 return ts.getSynthesizedClone(name);
             }
         }
-        function getPropertyNameExpressionIfNeeded(name, shouldHoist, omitSimple) {
-            if (ts.isComputedPropertyName(name)) {
-                var expression = ts.visitNode(name.expression, visitor, ts.isExpression);
-                var innerExpression = ts.skipPartiallyEmittedExpressions(expression);
-                var inlinable = isSimpleInlineableExpression(innerExpression);
-                if (!inlinable && shouldHoist) {
-                    var generatedName = ts.getGeneratedNameForNode(name);
-                    hoistVariableDeclaration(generatedName);
-                    return ts.createAssignment(generatedName, expression);
-                }
-                return (omitSimple && (inlinable || ts.isIdentifier(innerExpression))) ? undefined : expression;
-            }
-        }
         function visitPropertyNameOfClassElement(member) {
             var name = member.name;
-            var expr = getPropertyNameExpressionIfNeeded(name, ts.some(member.decorators), false);
-            if (expr) {
-                if (ts.some(pendingExpressions)) {
-                    expr = ts.inlineExpressions(pendingExpressions.concat([expr]));
-                    pendingExpressions.length = 0;
+            if (ts.isComputedPropertyName(name) && ((!ts.hasStaticModifier(member) && currentClassHasParameterProperties) || ts.some(member.decorators))) {
+                var expression = ts.visitNode(name.expression, visitor, ts.isExpression);
+                var innerExpression = ts.skipPartiallyEmittedExpressions(expression);
+                if (!ts.isSimpleInlineableExpression(innerExpression)) {
+                    var generatedName = ts.getGeneratedNameForNode(name);
+                    hoistVariableDeclaration(generatedName);
+                    return ts.updateComputedPropertyName(name, ts.createAssignment(generatedName, expression));
                 }
-                return ts.updateComputedPropertyName(name, expr);
-            }
-            else {
-                return name;
             }
+            return ts.visitNode(name, visitor, ts.isPropertyName);
         }
         function visitHeritageClause(node) {
-            if (node.token === 109) {
+            if (node.token === 110) {
                 return undefined;
             }
             return ts.visitEachChild(node, visitor, context);
@@ -57751,17 +59436,47 @@ var ts;
             return !ts.nodeIsMissing(node.body);
         }
         function visitPropertyDeclaration(node) {
-            var expr = getPropertyNameExpressionIfNeeded(node.name, ts.some(node.decorators) || !!node.initializer, true);
-            if (expr && !isSimpleInlineableExpression(expr)) {
-                (pendingExpressions || (pendingExpressions = [])).push(expr);
+            var updated = ts.updateProperty(node, undefined, ts.visitNodes(node.modifiers, visitor, ts.isModifier), visitPropertyNameOfClassElement(node), undefined, undefined, ts.visitNode(node.initializer, visitor));
+            if (updated !== node) {
+                ts.setCommentRange(updated, node);
+                ts.setSourceMapRange(updated, ts.moveRangePastDecorators(node));
             }
-            return undefined;
+            return updated;
         }
         function visitConstructor(node) {
             if (!shouldEmitFunctionLikeDeclaration(node)) {
                 return undefined;
             }
-            return ts.updateConstructor(node, ts.visitNodes(node.decorators, visitor, ts.isDecorator), ts.visitNodes(node.modifiers, visitor, ts.isModifier), ts.visitParameterList(node.parameters, visitor, context), ts.visitFunctionBody(node.body, visitor, context));
+            return ts.updateConstructor(node, undefined, undefined, ts.visitParameterList(node.parameters, visitor, context), transformConstructorBody(node.body, node));
+        }
+        function transformConstructorBody(body, constructor) {
+            var parametersWithPropertyAssignments = constructor &&
+                ts.filter(constructor.parameters, ts.isParameterPropertyDeclaration);
+            if (!ts.some(parametersWithPropertyAssignments)) {
+                return ts.visitFunctionBody(body, visitor, context);
+            }
+            var statements = [];
+            var indexOfFirstStatement = 0;
+            resumeLexicalEnvironment();
+            indexOfFirstStatement = ts.addPrologueDirectivesAndInitialSuperCall(constructor, statements, visitor);
+            ts.addRange(statements, ts.map(parametersWithPropertyAssignments, transformParameterWithPropertyAssignment));
+            ts.addRange(statements, ts.visitNodes(body.statements, visitor, ts.isStatement, indexOfFirstStatement));
+            statements = ts.mergeLexicalEnvironment(statements, endLexicalEnvironment());
+            var block = ts.createBlock(ts.setTextRange(ts.createNodeArray(statements), body.statements), true);
+            ts.setTextRange(block, body);
+            ts.setOriginalNode(block, body);
+            return block;
+        }
+        function transformParameterWithPropertyAssignment(node) {
+            var name = node.name;
+            if (!ts.isIdentifier(name)) {
+                return undefined;
+            }
+            var propertyName = ts.getMutableClone(name);
+            ts.setEmitFlags(propertyName, 1536 | 48);
+            var localName = ts.getMutableClone(name);
+            ts.setEmitFlags(localName, 1536);
+            return ts.startOnNewLine(ts.removeAllComments(ts.setTextRange(ts.setOriginalNode(ts.createExpressionStatement(ts.createAssignment(ts.setTextRange(ts.createPropertyAccess(ts.createThis(), propertyName), node.name), localName)), node), ts.moveRangePos(node, -1))));
         }
         function visitMethodDeclaration(node) {
             if (!shouldEmitFunctionLikeDeclaration(node)) {
@@ -57894,7 +59609,7 @@ var ts;
         }
         function visitEnumDeclaration(node) {
             if (!shouldEmitEnumDeclaration(node)) {
-                return undefined;
+                return ts.createNotEmittedStatement(node);
             }
             var statements = [];
             var emitFlags = 2;
@@ -57994,11 +59709,11 @@ var ts;
         function addVarForEnumOrModuleDeclaration(statements, node) {
             var statement = ts.createVariableStatement(ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), ts.createVariableDeclarationList([
                 ts.createVariableDeclaration(ts.getLocalName(node, false, true))
-            ], currentLexicalScope.kind === 284 ? 0 : 1));
+            ], currentLexicalScope.kind === 285 ? 0 : 1));
             ts.setOriginalNode(statement, node);
             recordEmittedDeclarationInScope(node);
             if (isFirstEmittedDeclarationInScope(node)) {
-                if (node.kind === 243) {
+                if (node.kind === 244) {
                     ts.setSourceMapRange(statement.declarationList, node);
                 }
                 else {
@@ -58064,7 +59779,7 @@ var ts;
             var statementsLocation;
             var blockLocation;
             var body = node.body;
-            if (body.kind === 245) {
+            if (body.kind === 246) {
                 saveStateAndInvoke(body, function (body) { return ts.addRange(statements, ts.visitNodes(body.statements, namespaceElementVisitor, ts.isStatement)); });
                 statementsLocation = body.statements;
                 blockLocation = body;
@@ -58088,13 +59803,13 @@ var ts;
             currentScopeFirstDeclarationsOfName = savedCurrentScopeFirstDeclarationsOfName;
             var block = ts.createBlock(ts.setTextRange(ts.createNodeArray(statements), statementsLocation), true);
             ts.setTextRange(block, blockLocation);
-            if (body.kind !== 245) {
+            if (body.kind !== 246) {
                 ts.setEmitFlags(block, ts.getEmitFlags(block) | 1536);
             }
             return block;
         }
         function getInnerMostModuleDeclarationFromDottedModule(moduleDeclaration) {
-            if (moduleDeclaration.body.kind === 244) {
+            if (moduleDeclaration.body.kind === 245) {
                 var recursiveInnerModule = getInnerMostModuleDeclarationFromDottedModule(moduleDeclaration.body);
                 return recursiveInnerModule || moduleDeclaration.body;
             }
@@ -58114,7 +59829,7 @@ var ts;
             return (name || namedBindings) ? ts.updateImportClause(node, name, namedBindings) : undefined;
         }
         function visitNamedImportBindings(node) {
-            if (node.kind === 251) {
+            if (node.kind === 252) {
                 return resolver.isReferencedAliasDeclaration(node) ? node : undefined;
             }
             else {
@@ -58235,29 +59950,29 @@ var ts;
         function enableSubstitutionForNonQualifiedEnumMembers() {
             if ((enabledSubstitutions & 8) === 0) {
                 enabledSubstitutions |= 8;
-                context.enableSubstitution(72);
+                context.enableSubstitution(73);
             }
         }
         function enableSubstitutionForClassAliases() {
             if ((enabledSubstitutions & 1) === 0) {
                 enabledSubstitutions |= 1;
-                context.enableSubstitution(72);
+                context.enableSubstitution(73);
                 classAliases = [];
             }
         }
         function enableSubstitutionForNamespaceExports() {
             if ((enabledSubstitutions & 2) === 0) {
                 enabledSubstitutions |= 2;
-                context.enableSubstitution(72);
-                context.enableSubstitution(276);
-                context.enableEmitNotification(244);
+                context.enableSubstitution(73);
+                context.enableSubstitution(277);
+                context.enableEmitNotification(245);
             }
         }
         function isTransformedModuleDeclaration(node) {
-            return ts.getOriginalNode(node).kind === 244;
+            return ts.getOriginalNode(node).kind === 245;
         }
         function isTransformedEnumDeclaration(node) {
-            return ts.getOriginalNode(node).kind === 243;
+            return ts.getOriginalNode(node).kind === 244;
         }
         function onEmitNode(hint, node, emitCallback) {
             var savedApplicableSubstitutions = applicableSubstitutions;
@@ -58301,11 +60016,11 @@ var ts;
         }
         function substituteExpression(node) {
             switch (node.kind) {
-                case 72:
+                case 73:
                     return substituteExpressionIdentifier(node);
-                case 189:
-                    return substitutePropertyAccessExpression(node);
                 case 190:
+                    return substitutePropertyAccessExpression(node);
+                case 191:
                     return substituteElementAccessExpression(node);
             }
             return node;
@@ -58335,9 +60050,9 @@ var ts;
         function trySubstituteNamespaceExportedName(node) {
             if (enabledSubstitutions & applicableSubstitutions && !ts.isGeneratedIdentifier(node) && !ts.isLocalName(node)) {
                 var container = resolver.getReferencedExportContainer(node, false);
-                if (container && container.kind !== 284) {
-                    var substitute = (applicableSubstitutions & 2 && container.kind === 244) ||
-                        (applicableSubstitutions & 8 && container.kind === 243);
+                if (container && container.kind !== 285) {
+                    var substitute = (applicableSubstitutions & 2 && container.kind === 245) ||
+                        (applicableSubstitutions & 8 && container.kind === 244);
                     if (substitute) {
                         return ts.setTextRange(ts.createPropertyAccess(ts.getGeneratedNameForNode(container), node), node);
                     }
@@ -58421,6 +60136,297 @@ var ts;
     };
 })(ts || (ts = {}));
 var ts;
+(function (ts) {
+    function transformClassFields(context) {
+        var hoistVariableDeclaration = context.hoistVariableDeclaration, endLexicalEnvironment = context.endLexicalEnvironment, resumeLexicalEnvironment = context.resumeLexicalEnvironment;
+        var resolver = context.getEmitResolver();
+        var previousOnSubstituteNode = context.onSubstituteNode;
+        context.onSubstituteNode = onSubstituteNode;
+        var enabledSubstitutions;
+        var classAliases;
+        var pendingExpressions;
+        var pendingStatements;
+        return ts.chainBundle(transformSourceFile);
+        function transformSourceFile(node) {
+            if (node.isDeclarationFile) {
+                return node;
+            }
+            var visited = ts.visitEachChild(node, visitor, context);
+            ts.addEmitHelpers(visited, context.readEmitHelpers());
+            return visited;
+        }
+        function visitor(node) {
+            if (!(node.transformFlags & 1048576))
+                return node;
+            switch (node.kind) {
+                case 210:
+                    return visitClassExpression(node);
+                case 241:
+                    return visitClassDeclaration(node);
+                case 220:
+                    return visitVariableStatement(node);
+            }
+            return ts.visitEachChild(node, visitor, context);
+        }
+        function classElementVisitor(node) {
+            switch (node.kind) {
+                case 158:
+                    return undefined;
+                case 159:
+                case 160:
+                case 157:
+                    return ts.visitEachChild(node, classElementVisitor, context);
+                case 155:
+                    return visitPropertyDeclaration(node);
+                case 150:
+                    return visitComputedPropertyName(node);
+                case 218:
+                    return node;
+                default:
+                    return visitor(node);
+            }
+        }
+        function visitVariableStatement(node) {
+            var savedPendingStatements = pendingStatements;
+            pendingStatements = [];
+            var visitedNode = ts.visitEachChild(node, visitor, context);
+            var statement = ts.some(pendingStatements) ? [visitedNode].concat(pendingStatements) :
+                visitedNode;
+            pendingStatements = savedPendingStatements;
+            return statement;
+        }
+        function visitComputedPropertyName(name) {
+            var node = ts.visitEachChild(name, visitor, context);
+            if (ts.some(pendingExpressions)) {
+                var expressions = pendingExpressions;
+                expressions.push(name.expression);
+                pendingExpressions = [];
+                node = ts.updateComputedPropertyName(node, ts.inlineExpressions(expressions));
+            }
+            return node;
+        }
+        function visitPropertyDeclaration(node) {
+            ts.Debug.assert(!ts.some(node.decorators));
+            var expr = getPropertyNameExpressionIfNeeded(node.name, !!node.initializer);
+            if (expr && !ts.isSimpleInlineableExpression(expr)) {
+                (pendingExpressions || (pendingExpressions = [])).push(expr);
+            }
+            return undefined;
+        }
+        function visitClassDeclaration(node) {
+            if (!ts.forEach(node.members, ts.isPropertyDeclaration)) {
+                return ts.visitEachChild(node, visitor, context);
+            }
+            var savedPendingExpressions = pendingExpressions;
+            pendingExpressions = undefined;
+            var extendsClauseElement = ts.getEffectiveBaseTypeNode(node);
+            var isDerivedClass = !!(extendsClauseElement && ts.skipOuterExpressions(extendsClauseElement.expression).kind !== 97);
+            var statements = [
+                ts.updateClassDeclaration(node, undefined, node.modifiers, node.name, undefined, ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), transformClassMembers(node, isDerivedClass))
+            ];
+            if (ts.some(pendingExpressions)) {
+                statements.push(ts.createExpressionStatement(ts.inlineExpressions(pendingExpressions)));
+            }
+            pendingExpressions = savedPendingExpressions;
+            var staticProperties = ts.getInitializedProperties(node, true);
+            if (ts.some(staticProperties)) {
+                addInitializedPropertyStatements(statements, staticProperties, ts.getInternalName(node));
+            }
+            return statements;
+        }
+        function visitClassExpression(node) {
+            if (!ts.forEach(node.members, ts.isPropertyDeclaration)) {
+                return ts.visitEachChild(node, visitor, context);
+            }
+            var savedPendingExpressions = pendingExpressions;
+            pendingExpressions = undefined;
+            var isDecoratedClassDeclaration = ts.isClassDeclaration(ts.getOriginalNode(node));
+            var staticProperties = ts.getInitializedProperties(node, true);
+            var extendsClauseElement = ts.getEffectiveBaseTypeNode(node);
+            var isDerivedClass = !!(extendsClauseElement && ts.skipOuterExpressions(extendsClauseElement.expression).kind !== 97);
+            var classExpression = ts.updateClassExpression(node, node.modifiers, node.name, undefined, ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), transformClassMembers(node, isDerivedClass));
+            if (ts.some(staticProperties) || ts.some(pendingExpressions)) {
+                if (isDecoratedClassDeclaration) {
+                    ts.Debug.assertDefined(pendingStatements, "Decorated classes transformed by TypeScript are expected to be within a variable declaration.");
+                    if (pendingStatements && pendingExpressions && ts.some(pendingExpressions)) {
+                        pendingStatements.push(ts.createExpressionStatement(ts.inlineExpressions(pendingExpressions)));
+                    }
+                    pendingExpressions = savedPendingExpressions;
+                    if (pendingStatements && ts.some(staticProperties)) {
+                        addInitializedPropertyStatements(pendingStatements, staticProperties, ts.getInternalName(node));
+                    }
+                    return classExpression;
+                }
+                else {
+                    var expressions = [];
+                    var isClassWithConstructorReference = resolver.getNodeCheckFlags(node) & 16777216;
+                    var temp = ts.createTempVariable(hoistVariableDeclaration, !!isClassWithConstructorReference);
+                    if (isClassWithConstructorReference) {
+                        enableSubstitutionForClassAliases();
+                        var alias = ts.getSynthesizedClone(temp);
+                        alias.autoGenerateFlags &= ~8;
+                        classAliases[ts.getOriginalNodeId(node)] = alias;
+                    }
+                    ts.setEmitFlags(classExpression, 65536 | ts.getEmitFlags(classExpression));
+                    expressions.push(ts.startOnNewLine(ts.createAssignment(temp, classExpression)));
+                    ts.addRange(expressions, ts.map(pendingExpressions, ts.startOnNewLine));
+                    ts.addRange(expressions, generateInitializedPropertyExpressions(staticProperties, temp));
+                    expressions.push(ts.startOnNewLine(temp));
+                    pendingExpressions = savedPendingExpressions;
+                    return ts.inlineExpressions(expressions);
+                }
+            }
+            pendingExpressions = savedPendingExpressions;
+            return classExpression;
+        }
+        function transformClassMembers(node, isDerivedClass) {
+            var members = [];
+            var constructor = transformConstructor(node, isDerivedClass);
+            if (constructor) {
+                members.push(constructor);
+            }
+            ts.addRange(members, ts.visitNodes(node.members, classElementVisitor, ts.isClassElement));
+            return ts.setTextRange(ts.createNodeArray(members), node.members);
+        }
+        function transformConstructor(node, isDerivedClass) {
+            var constructor = ts.visitNode(ts.getFirstConstructorWithBody(node), visitor, ts.isConstructorDeclaration);
+            var containsPropertyInitializer = ts.forEach(node.members, ts.isInitializedProperty);
+            if (!containsPropertyInitializer) {
+                return constructor;
+            }
+            var parameters = ts.visitParameterList(constructor ? constructor.parameters : undefined, visitor, context);
+            var body = transformConstructorBody(node, constructor, isDerivedClass);
+            if (!body) {
+                return undefined;
+            }
+            return ts.startOnNewLine(ts.setOriginalNode(ts.setTextRange(ts.createConstructor(undefined, undefined, parameters, body), constructor || node), constructor));
+        }
+        function transformConstructorBody(node, constructor, isDerivedClass) {
+            var properties = ts.getInitializedProperties(node, false);
+            if (!constructor && !ts.some(properties)) {
+                return ts.visitFunctionBody(undefined, visitor, context);
+            }
+            resumeLexicalEnvironment();
+            var indexOfFirstStatement = 0;
+            var statements = [];
+            if (!constructor && isDerivedClass) {
+                statements.push(ts.createExpressionStatement(ts.createCall(ts.createSuper(), undefined, [ts.createSpread(ts.createIdentifier("arguments"))])));
+            }
+            if (constructor) {
+                indexOfFirstStatement = ts.addPrologueDirectivesAndInitialSuperCall(constructor, statements, visitor);
+            }
+            if (constructor && constructor.body) {
+                var parameterPropertyDeclarationCount = 0;
+                for (var i = indexOfFirstStatement; i < constructor.body.statements.length; i++) {
+                    if (ts.isParameterPropertyDeclaration(ts.getOriginalNode(constructor.body.statements[i]))) {
+                        parameterPropertyDeclarationCount++;
+                    }
+                    else {
+                        break;
+                    }
+                }
+                if (parameterPropertyDeclarationCount > 0) {
+                    ts.addRange(statements, ts.visitNodes(constructor.body.statements, visitor, ts.isStatement, indexOfFirstStatement, parameterPropertyDeclarationCount));
+                    indexOfFirstStatement += parameterPropertyDeclarationCount;
+                }
+            }
+            addInitializedPropertyStatements(statements, properties, ts.createThis());
+            if (constructor) {
+                ts.addRange(statements, ts.visitNodes(constructor.body.statements, visitor, ts.isStatement, indexOfFirstStatement));
+            }
+            statements = ts.mergeLexicalEnvironment(statements, endLexicalEnvironment());
+            return ts.setTextRange(ts.createBlock(ts.setTextRange(ts.createNodeArray(statements), constructor ? constructor.body.statements : node.members), true), constructor ? constructor.body : undefined);
+        }
+        function addInitializedPropertyStatements(statements, properties, receiver) {
+            for (var _i = 0, properties_6 = properties; _i < properties_6.length; _i++) {
+                var property = properties_6[_i];
+                var statement = ts.createExpressionStatement(transformInitializedProperty(property, receiver));
+                ts.setSourceMapRange(statement, ts.moveRangePastModifiers(property));
+                ts.setCommentRange(statement, property);
+                ts.setOriginalNode(statement, property);
+                statements.push(statement);
+            }
+        }
+        function generateInitializedPropertyExpressions(properties, receiver) {
+            var expressions = [];
+            for (var _i = 0, properties_7 = properties; _i < properties_7.length; _i++) {
+                var property = properties_7[_i];
+                var expression = transformInitializedProperty(property, receiver);
+                ts.startOnNewLine(expression);
+                ts.setSourceMapRange(expression, ts.moveRangePastModifiers(property));
+                ts.setCommentRange(expression, property);
+                ts.setOriginalNode(expression, property);
+                expressions.push(expression);
+            }
+            return expressions;
+        }
+        function transformInitializedProperty(property, receiver) {
+            var propertyName = ts.isComputedPropertyName(property.name) && !ts.isSimpleInlineableExpression(property.name.expression)
+                ? ts.updateComputedPropertyName(property.name, ts.getGeneratedNameForNode(property.name))
+                : property.name;
+            var initializer = ts.visitNode(property.initializer, visitor, ts.isExpression);
+            var memberAccess = ts.createMemberAccessForPropertyName(receiver, propertyName, propertyName);
+            return ts.createAssignment(memberAccess, initializer);
+        }
+        function enableSubstitutionForClassAliases() {
+            if ((enabledSubstitutions & 1) === 0) {
+                enabledSubstitutions |= 1;
+                context.enableSubstitution(73);
+                classAliases = [];
+            }
+        }
+        function onSubstituteNode(hint, node) {
+            node = previousOnSubstituteNode(hint, node);
+            if (hint === 1) {
+                return substituteExpression(node);
+            }
+            return node;
+        }
+        function substituteExpression(node) {
+            switch (node.kind) {
+                case 73:
+                    return substituteExpressionIdentifier(node);
+            }
+            return node;
+        }
+        function substituteExpressionIdentifier(node) {
+            return trySubstituteClassAlias(node) || node;
+        }
+        function trySubstituteClassAlias(node) {
+            if (enabledSubstitutions & 1) {
+                if (resolver.getNodeCheckFlags(node) & 33554432) {
+                    var declaration = resolver.getReferencedValueDeclaration(node);
+                    if (declaration) {
+                        var classAlias = classAliases[declaration.id];
+                        if (classAlias) {
+                            var clone_2 = ts.getSynthesizedClone(classAlias);
+                            ts.setSourceMapRange(clone_2, node);
+                            ts.setCommentRange(clone_2, node);
+                            return clone_2;
+                        }
+                    }
+                }
+            }
+            return undefined;
+        }
+        function getPropertyNameExpressionIfNeeded(name, shouldHoist) {
+            if (ts.isComputedPropertyName(name)) {
+                var expression = ts.visitNode(name.expression, visitor, ts.isExpression);
+                var innerExpression = ts.skipPartiallyEmittedExpressions(expression);
+                var inlinable = ts.isSimpleInlineableExpression(innerExpression);
+                var alreadyTransformed = ts.isAssignmentExpression(innerExpression) && ts.isGeneratedIdentifier(innerExpression.left);
+                if (!alreadyTransformed && !inlinable && shouldHoist) {
+                    var generatedName = ts.getGeneratedNameForNode(name);
+                    hoistVariableDeclaration(generatedName);
+                    return ts.createAssignment(generatedName, expression);
+                }
+                return (inlinable || ts.isIdentifier(innerExpression)) ? undefined : expression;
+            }
+        }
+    }
+    ts.transformClassFields = transformClassFields;
+})(ts || (ts = {}));
+var ts;
 (function (ts) {
     function transformES2017(context) {
         var resumeLexicalEnvironment = context.resumeLexicalEnvironment, endLexicalEnvironment = context.endLexicalEnvironment, hoistVariableDeclaration = context.hoistVariableDeclaration;
@@ -58451,25 +60457,25 @@ var ts;
                 return node;
             }
             switch (node.kind) {
-                case 121:
+                case 122:
                     return undefined;
-                case 201:
+                case 202:
                     return visitAwaitExpression(node);
-                case 156:
+                case 157:
                     return visitMethodDeclaration(node);
-                case 239:
+                case 240:
                     return visitFunctionDeclaration(node);
-                case 196:
-                    return visitFunctionExpression(node);
                 case 197:
+                    return visitFunctionExpression(node);
+                case 198:
                     return visitArrowFunction(node);
-                case 189:
-                    if (capturedSuperProperties && ts.isPropertyAccessExpression(node) && node.expression.kind === 98) {
+                case 190:
+                    if (capturedSuperProperties && ts.isPropertyAccessExpression(node) && node.expression.kind === 99) {
                         capturedSuperProperties.set(node.name.escapedText, true);
                     }
                     return ts.visitEachChild(node, visitor, context);
-                case 190:
-                    if (capturedSuperProperties && node.expression.kind === 98) {
+                case 191:
+                    if (capturedSuperProperties && node.expression.kind === 99) {
                         hasSuperElementAccess = true;
                     }
                     return ts.visitEachChild(node, visitor, context);
@@ -58480,27 +60486,27 @@ var ts;
         function asyncBodyVisitor(node) {
             if (ts.isNodeWithPossibleHoistedDeclaration(node)) {
                 switch (node.kind) {
-                    case 219:
+                    case 220:
                         return visitVariableStatementInAsyncBody(node);
-                    case 225:
-                        return visitForStatementInAsyncBody(node);
                     case 226:
-                        return visitForInStatementInAsyncBody(node);
+                        return visitForStatementInAsyncBody(node);
                     case 227:
+                        return visitForInStatementInAsyncBody(node);
+                    case 228:
                         return visitForOfStatementInAsyncBody(node);
-                    case 274:
+                    case 275:
                         return visitCatchClauseInAsyncBody(node);
-                    case 218:
-                    case 232:
-                    case 246:
-                    case 271:
-                    case 272:
-                    case 235:
-                    case 223:
-                    case 224:
-                    case 222:
-                    case 231:
+                    case 219:
                     case 233:
+                    case 247:
+                    case 272:
+                    case 273:
+                    case 236:
+                    case 224:
+                    case 225:
+                    case 223:
+                    case 232:
+                    case 234:
                         return ts.visitEachChild(node, asyncBodyVisitor, context);
                     default:
                         return ts.Debug.assertNever(node, "Unhandled node.");
@@ -58649,7 +60655,7 @@ var ts;
             var original = ts.getOriginalNode(node, ts.isFunctionLike);
             var nodeType = original.type;
             var promiseConstructor = languageVersion < 2 ? getPromiseConstructor(nodeType) : undefined;
-            var isArrowFunction = node.kind === 197;
+            var isArrowFunction = node.kind === 198;
             var hasLexicalArguments = (resolver.getNodeCheckFlags(node) & 8192) !== 0;
             var savedEnclosingFunctionParameterNames = enclosingFunctionParameterNames;
             enclosingFunctionParameterNames = ts.createUnderscoreEscapedMap();
@@ -58659,8 +60665,10 @@ var ts;
             }
             var savedCapturedSuperProperties = capturedSuperProperties;
             var savedHasSuperElementAccess = hasSuperElementAccess;
-            capturedSuperProperties = ts.createUnderscoreEscapedMap();
-            hasSuperElementAccess = false;
+            if (!isArrowFunction) {
+                capturedSuperProperties = ts.createUnderscoreEscapedMap();
+                hasSuperElementAccess = false;
+            }
             var result;
             if (!isArrowFunction) {
                 var statements = [];
@@ -58670,9 +60678,11 @@ var ts;
                 var emitSuperHelpers = languageVersion >= 2 && resolver.getNodeCheckFlags(node) & (4096 | 2048);
                 if (emitSuperHelpers) {
                     enableSubstitutionForAsyncMethodsWithSuper();
-                    var variableStatement = createSuperAccessVariableStatement(resolver, node, capturedSuperProperties);
-                    substitutedSuperAccessors[ts.getNodeId(variableStatement)] = true;
-                    ts.insertStatementsAfterStandardPrologue(statements, [variableStatement]);
+                    if (ts.hasEntries(capturedSuperProperties)) {
+                        var variableStatement = createSuperAccessVariableStatement(resolver, node, capturedSuperProperties);
+                        substitutedSuperAccessors[ts.getNodeId(variableStatement)] = true;
+                        ts.insertStatementsAfterStandardPrologue(statements, [variableStatement]);
+                    }
                 }
                 var block = ts.createBlock(statements, true);
                 ts.setTextRange(block, node.body);
@@ -58698,8 +60708,10 @@ var ts;
                 }
             }
             enclosingFunctionParameterNames = savedEnclosingFunctionParameterNames;
-            capturedSuperProperties = savedCapturedSuperProperties;
-            hasSuperElementAccess = savedHasSuperElementAccess;
+            if (!isArrowFunction) {
+                capturedSuperProperties = savedCapturedSuperProperties;
+                hasSuperElementAccess = savedHasSuperElementAccess;
+            }
             return result;
         }
         function transformAsyncFunctionBodyWorker(body, start) {
@@ -58724,15 +60736,15 @@ var ts;
         function enableSubstitutionForAsyncMethodsWithSuper() {
             if ((enabledSubstitutions & 1) === 0) {
                 enabledSubstitutions |= 1;
-                context.enableSubstitution(191);
-                context.enableSubstitution(189);
+                context.enableSubstitution(192);
                 context.enableSubstitution(190);
-                context.enableEmitNotification(240);
-                context.enableEmitNotification(156);
-                context.enableEmitNotification(158);
-                context.enableEmitNotification(159);
+                context.enableSubstitution(191);
+                context.enableEmitNotification(241);
                 context.enableEmitNotification(157);
-                context.enableEmitNotification(219);
+                context.enableEmitNotification(159);
+                context.enableEmitNotification(160);
+                context.enableEmitNotification(158);
+                context.enableEmitNotification(220);
             }
         }
         function onEmitNode(hint, node, emitCallback) {
@@ -58764,23 +60776,23 @@ var ts;
         }
         function substituteExpression(node) {
             switch (node.kind) {
-                case 189:
-                    return substitutePropertyAccessExpression(node);
                 case 190:
-                    return substituteElementAccessExpression(node);
+                    return substitutePropertyAccessExpression(node);
                 case 191:
+                    return substituteElementAccessExpression(node);
+                case 192:
                     return substituteCallExpression(node);
             }
             return node;
         }
         function substitutePropertyAccessExpression(node) {
-            if (node.expression.kind === 98) {
+            if (node.expression.kind === 99) {
                 return ts.setTextRange(ts.createPropertyAccess(ts.createFileLevelUniqueName("_super"), node.name), node);
             }
             return node;
         }
         function substituteElementAccessExpression(node) {
-            if (node.expression.kind === 98) {
+            if (node.expression.kind === 99) {
                 return createSuperElementAccessInAsyncMethod(node.argumentExpression, node);
             }
             return node;
@@ -58799,11 +60811,11 @@ var ts;
         }
         function isSuperContainer(node) {
             var kind = node.kind;
-            return kind === 240
-                || kind === 157
-                || kind === 156
+            return kind === 241
                 || kind === 158
-                || kind === 159;
+                || kind === 157
+                || kind === 159
+                || kind === 160;
         }
         function createSuperElementAccessInAsyncMethod(argumentExpression, location) {
             if (enclosingSuperContainerFlags & 4096) {
@@ -58821,11 +60833,11 @@ var ts;
         names.forEach(function (_, key) {
             var name = ts.unescapeLeadingUnderscores(key);
             var getterAndSetter = [];
-            getterAndSetter.push(ts.createPropertyAssignment("get", ts.createArrowFunction(undefined, undefined, [], undefined, undefined, ts.createPropertyAccess(ts.createSuper(), name))));
+            getterAndSetter.push(ts.createPropertyAssignment("get", ts.createArrowFunction(undefined, undefined, [], undefined, undefined, ts.setEmitFlags(ts.createPropertyAccess(ts.setEmitFlags(ts.createSuper(), 4), name), 4))));
             if (hasBinding) {
                 getterAndSetter.push(ts.createPropertyAssignment("set", ts.createArrowFunction(undefined, undefined, [
                     ts.createParameter(undefined, undefined, undefined, "v", undefined, undefined, undefined)
-                ], undefined, undefined, ts.createAssignment(ts.createPropertyAccess(ts.createSuper(), name), ts.createIdentifier("v")))));
+                ], undefined, undefined, ts.createAssignment(ts.setEmitFlags(ts.createPropertyAccess(ts.setEmitFlags(ts.createSuper(), 4), name), 4), ts.createIdentifier("v")))));
             }
             accessors.push(ts.createPropertyAssignment(name, ts.createObjectLiteral(getterAndSetter)));
         });
@@ -58841,7 +60853,7 @@ var ts;
         name: "typescript:awaiter",
         scoped: false,
         priority: 5,
-        text: "\n            var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {\n                return new (P || (P = Promise))(function (resolve, reject) {\n                    function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }\n                    function rejected(value) { try { step(generator[\"throw\"](value)); } catch (e) { reject(e); } }\n                    function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }\n                    step((generator = generator.apply(thisArg, _arguments || [])).next());\n                });\n            };"
+        text: "\n            var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {\n                function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }\n                return new (P || (P = Promise))(function (resolve, reject) {\n                    function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }\n                    function rejected(value) { try { step(generator[\"throw\"](value)); } catch (e) { reject(e); } }\n                    function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }\n                    step((generator = generator.apply(thisArg, _arguments || [])).next());\n                });\n            };"
     };
     function createAwaiterHelper(context, hasLexicalArguments, promiseConstructor, body) {
         context.requestEmitHelper(ts.awaiterHelper);
@@ -58898,7 +60910,7 @@ var ts;
             return visitorWorker(node, true);
         }
         function visitorNoAsyncModifier(node) {
-            if (node.kind === 121) {
+            if (node.kind === 122) {
                 return undefined;
             }
             return node;
@@ -58908,53 +60920,55 @@ var ts;
                 return node;
             }
             switch (node.kind) {
-                case 201:
+                case 202:
                     return visitAwaitExpression(node);
-                case 207:
+                case 208:
                     return visitYieldExpression(node);
-                case 230:
+                case 231:
                     return visitReturnStatement(node);
-                case 233:
+                case 234:
                     return visitLabeledStatement(node);
-                case 188:
-                    return visitObjectLiteralExpression(node);
-                case 204:
-                    return visitBinaryExpression(node, noDestructuringValue);
-                case 237:
-                    return visitVariableDeclaration(node);
-                case 227:
-                    return visitForOfStatement(node, undefined);
-                case 225:
-                    return visitForStatement(node);
-                case 200:
-                    return visitVoidExpression(node);
-                case 157:
-                    return visitConstructorDeclaration(node);
-                case 156:
-                    return visitMethodDeclaration(node);
-                case 158:
-                    return visitGetAccessorDeclaration(node);
-                case 159:
-                    return visitSetAccessorDeclaration(node);
-                case 239:
-                    return visitFunctionDeclaration(node);
-                case 196:
-                    return visitFunctionExpression(node);
-                case 197:
-                    return visitArrowFunction(node);
-                case 151:
-                    return visitParameter(node);
-                case 221:
-                    return visitExpressionStatement(node);
-                case 195:
-                    return visitParenthesizedExpression(node, noDestructuringValue);
                 case 189:
-                    if (capturedSuperProperties && ts.isPropertyAccessExpression(node) && node.expression.kind === 98) {
+                    return visitObjectLiteralExpression(node);
+                case 205:
+                    return visitBinaryExpression(node, noDestructuringValue);
+                case 275:
+                    return visitCatchClause(node);
+                case 238:
+                    return visitVariableDeclaration(node);
+                case 228:
+                    return visitForOfStatement(node, undefined);
+                case 226:
+                    return visitForStatement(node);
+                case 201:
+                    return visitVoidExpression(node);
+                case 158:
+                    return visitConstructorDeclaration(node);
+                case 157:
+                    return visitMethodDeclaration(node);
+                case 159:
+                    return visitGetAccessorDeclaration(node);
+                case 160:
+                    return visitSetAccessorDeclaration(node);
+                case 240:
+                    return visitFunctionDeclaration(node);
+                case 197:
+                    return visitFunctionExpression(node);
+                case 198:
+                    return visitArrowFunction(node);
+                case 152:
+                    return visitParameter(node);
+                case 222:
+                    return visitExpressionStatement(node);
+                case 196:
+                    return visitParenthesizedExpression(node, noDestructuringValue);
+                case 190:
+                    if (capturedSuperProperties && ts.isPropertyAccessExpression(node) && node.expression.kind === 99) {
                         capturedSuperProperties.set(node.name.escapedText, true);
                     }
                     return ts.visitEachChild(node, visitor, context);
-                case 190:
-                    if (capturedSuperProperties && node.expression.kind === 98) {
+                case 191:
+                    if (capturedSuperProperties && node.expression.kind === 99) {
                         hasSuperElementAccess = true;
                     }
                     return ts.visitEachChild(node, visitor, context);
@@ -58989,7 +61003,7 @@ var ts;
         function visitLabeledStatement(node) {
             if (enclosingFunctionFlags & 2) {
                 var statement = ts.unwrapInnermostStatementOfLabel(node);
-                if (statement.kind === 227 && statement.awaitModifier) {
+                if (statement.kind === 228 && statement.awaitModifier) {
                     return visitForOfStatement(statement, node);
                 }
                 return ts.restoreEnclosingLabel(ts.visitEachChild(statement, visitor, context), node);
@@ -59001,7 +61015,7 @@ var ts;
             var objects = [];
             for (var _i = 0, elements_4 = elements; _i < elements_4.length; _i++) {
                 var e = elements_4[_i];
-                if (e.kind === 277) {
+                if (e.kind === 278) {
                     if (chunkObject) {
                         objects.push(ts.createObjectLiteral(chunkObject));
                         chunkObject = undefined;
@@ -59010,7 +61024,7 @@ var ts;
                     objects.push(ts.visitNode(target, visitor, ts.isExpression));
                 }
                 else {
-                    chunkObject = ts.append(chunkObject, e.kind === 275
+                    chunkObject = ts.append(chunkObject, e.kind === 276
                         ? ts.createPropertyAssignment(e.name, ts.visitNode(e.initializer, visitor, ts.isExpression))
                         : ts.visitNode(e, visitor, ts.isObjectLiteralElementLike));
                 }
@@ -59023,10 +61037,19 @@ var ts;
         function visitObjectLiteralExpression(node) {
             if (node.transformFlags & 8192) {
                 var objects = chunkObjectLiteralElements(node.properties);
-                if (objects.length && objects[0].kind !== 188) {
+                if (objects.length && objects[0].kind !== 189) {
                     objects.unshift(ts.createObjectLiteral());
                 }
-                return createAssignHelper(context, objects);
+                var expression = objects[0];
+                if (objects.length > 1) {
+                    for (var i = 1; i < objects.length; i++) {
+                        expression = createAssignHelper(context, [expression, objects[i]]);
+                    }
+                    return expression;
+                }
+                else {
+                    return createAssignHelper(context, objects);
+                }
             }
             return ts.visitEachChild(node, visitor, context);
         }
@@ -59045,6 +61068,23 @@ var ts;
             }
             return ts.visitEachChild(node, visitor, context);
         }
+        function visitCatchClause(node) {
+            if (node.variableDeclaration &&
+                ts.isBindingPattern(node.variableDeclaration.name) &&
+                node.variableDeclaration.name.transformFlags & 8192) {
+                var name = ts.getGeneratedNameForNode(node.variableDeclaration.name);
+                var updatedDecl = ts.updateVariableDeclaration(node.variableDeclaration, node.variableDeclaration.name, undefined, name);
+                var visitedBindings = ts.flattenDestructuringBinding(updatedDecl, visitor, context, 1);
+                var block = ts.visitNode(node.block, visitor, ts.isBlock);
+                if (ts.some(visitedBindings)) {
+                    block = ts.updateBlock(block, [
+                        ts.createVariableStatement(undefined, visitedBindings)
+                    ].concat(block.statements));
+                }
+                return ts.updateCatchClause(node, ts.updateVariableDeclaration(node.variableDeclaration, name, undefined, undefined), block);
+            }
+            return ts.visitEachChild(node, visitor, context);
+        }
         function visitVariableDeclaration(node) {
             if (ts.isBindingPattern(node.name) && node.name.transformFlags & 8192) {
                 return ts.flattenDestructuringBinding(node, visitor, context, 1);
@@ -59285,15 +61325,15 @@ var ts;
         function enableSubstitutionForAsyncMethodsWithSuper() {
             if ((enabledSubstitutions & 1) === 0) {
                 enabledSubstitutions |= 1;
-                context.enableSubstitution(191);
-                context.enableSubstitution(189);
+                context.enableSubstitution(192);
                 context.enableSubstitution(190);
-                context.enableEmitNotification(240);
-                context.enableEmitNotification(156);
-                context.enableEmitNotification(158);
-                context.enableEmitNotification(159);
+                context.enableSubstitution(191);
+                context.enableEmitNotification(241);
                 context.enableEmitNotification(157);
-                context.enableEmitNotification(219);
+                context.enableEmitNotification(159);
+                context.enableEmitNotification(160);
+                context.enableEmitNotification(158);
+                context.enableEmitNotification(220);
             }
         }
         function onEmitNode(hint, node, emitCallback) {
@@ -59325,23 +61365,23 @@ var ts;
         }
         function substituteExpression(node) {
             switch (node.kind) {
-                case 189:
-                    return substitutePropertyAccessExpression(node);
                 case 190:
-                    return substituteElementAccessExpression(node);
+                    return substitutePropertyAccessExpression(node);
                 case 191:
+                    return substituteElementAccessExpression(node);
+                case 192:
                     return substituteCallExpression(node);
             }
             return node;
         }
         function substitutePropertyAccessExpression(node) {
-            if (node.expression.kind === 98) {
+            if (node.expression.kind === 99) {
                 return ts.setTextRange(ts.createPropertyAccess(ts.createFileLevelUniqueName("_super"), node.name), node);
             }
             return node;
         }
         function substituteElementAccessExpression(node) {
-            if (node.expression.kind === 98) {
+            if (node.expression.kind === 99) {
                 return createSuperElementAccessInAsyncMethod(node.argumentExpression, node);
             }
             return node;
@@ -59360,11 +61400,11 @@ var ts;
         }
         function isSuperContainer(node) {
             var kind = node.kind;
-            return kind === 240
-                || kind === 157
-                || kind === 156
+            return kind === 241
                 || kind === 158
-                || kind === 159;
+                || kind === 157
+                || kind === 159
+                || kind === 160;
         }
         function createSuperElementAccessInAsyncMethod(argumentExpression, location) {
             if (enclosingSuperContainerFlags & 4096) {
@@ -59449,7 +61489,7 @@ var ts;
                 return node;
             }
             switch (node.kind) {
-                case 274:
+                case 275:
                     return visitCatchClause(node);
                 default:
                     return ts.visitEachChild(node, visitor, context);
@@ -59511,13 +61551,13 @@ var ts;
         }
         function visitorWorker(node) {
             switch (node.kind) {
-                case 260:
-                    return visitJsxElement(node, false);
                 case 261:
+                    return visitJsxElement(node, false);
+                case 262:
                     return visitJsxSelfClosingElement(node, false);
-                case 264:
+                case 265:
                     return visitJsxFragment(node, false);
-                case 270:
+                case 271:
                     return visitJsxExpression(node);
                 default:
                     return ts.visitEachChild(node, visitor, context);
@@ -59527,13 +61567,13 @@ var ts;
             switch (node.kind) {
                 case 11:
                     return visitJsxText(node);
-                case 270:
+                case 271:
                     return visitJsxExpression(node);
-                case 260:
-                    return visitJsxElement(node, true);
                 case 261:
+                    return visitJsxElement(node, true);
+                case 262:
                     return visitJsxSelfClosingElement(node, true);
-                case 264:
+                case 265:
                     return visitJsxFragment(node, true);
                 default:
                     return ts.Debug.failBadSyntaxKind(node);
@@ -59597,7 +61637,7 @@ var ts;
                 literal.singleQuote = node.singleQuote !== undefined ? node.singleQuote : !ts.isStringDoubleQuoted(node, currentSourceFile);
                 return ts.setTextRange(literal, node);
             }
-            else if (node.kind === 270) {
+            else if (node.kind === 271) {
                 if (node.expression === undefined) {
                     return ts.createTrue();
                 }
@@ -59608,7 +61648,7 @@ var ts;
             }
         }
         function visitJsxText(node) {
-            var fixed = fixupWhitespaceAndDecodeEntities(ts.getTextOfNode(node, true));
+            var fixed = fixupWhitespaceAndDecodeEntities(node.text);
             return fixed === undefined ? undefined : ts.createLiteral(fixed);
         }
         function fixupWhitespaceAndDecodeEntities(text) {
@@ -59657,7 +61697,7 @@ var ts;
             return decoded === text ? undefined : decoded;
         }
         function getTagName(node) {
-            if (node.kind === 260) {
+            if (node.kind === 261) {
                 return getTagName(node.openingElement);
             }
             else {
@@ -59957,7 +61997,7 @@ var ts;
                 return node;
             }
             switch (node.kind) {
-                case 204:
+                case 205:
                     return visitBinaryExpression(node);
                 default:
                     return ts.visitEachChild(node, visitor, context);
@@ -59965,7 +62005,7 @@ var ts;
         }
         function visitBinaryExpression(node) {
             switch (node.operatorToken.kind) {
-                case 63:
+                case 64:
                     return visitExponentiationAssignmentExpression(node);
                 case 41:
                     return visitExponentiationExpression(node);
@@ -60039,21 +62079,21 @@ var ts;
         }
         function enterSubtree(excludeFacts, includeFacts) {
             var ancestorFacts = hierarchyFacts;
-            hierarchyFacts = (hierarchyFacts & ~excludeFacts | includeFacts) & 8191;
+            hierarchyFacts = (hierarchyFacts & ~excludeFacts | includeFacts) & 16383;
             return ancestorFacts;
         }
         function exitSubtree(ancestorFacts, excludeFacts, includeFacts) {
-            hierarchyFacts = (hierarchyFacts & ~excludeFacts | includeFacts) & -8192 | ancestorFacts;
+            hierarchyFacts = (hierarchyFacts & ~excludeFacts | includeFacts) & -16384 | ancestorFacts;
         }
         function isReturnVoidStatementInConstructorWithCapturedSuper(node) {
-            return (hierarchyFacts & 4096) !== 0
-                && node.kind === 230
+            return (hierarchyFacts & 8192) !== 0
+                && node.kind === 231
                 && !node.expression;
         }
         function shouldVisitNode(node) {
             return (node.transformFlags & 128) !== 0
                 || convertedLoopState !== undefined
-                || (hierarchyFacts & 4096 && (ts.isStatement(node) || (node.kind === 218)))
+                || (hierarchyFacts & 8192 && (ts.isStatement(node) || (node.kind === 219)))
                 || (ts.isIterationStatement(node, false) && shouldConvertIterationStatement(node))
                 || (ts.getEmitFlags(node) & 33554432) !== 0;
         }
@@ -60066,72 +62106,72 @@ var ts;
             }
         }
         function callExpressionVisitor(node) {
-            if (node.kind === 98) {
+            if (node.kind === 99) {
                 return visitSuperKeyword(true);
             }
             return visitor(node);
         }
         function visitJavaScript(node) {
             switch (node.kind) {
-                case 116:
+                case 117:
                     return undefined;
-                case 240:
+                case 241:
                     return visitClassDeclaration(node);
-                case 209:
+                case 210:
                     return visitClassExpression(node);
-                case 151:
+                case 152:
                     return visitParameter(node);
-                case 239:
+                case 240:
                     return visitFunctionDeclaration(node);
-                case 197:
+                case 198:
                     return visitArrowFunction(node);
-                case 196:
+                case 197:
                     return visitFunctionExpression(node);
-                case 237:
-                    return visitVariableDeclaration(node);
-                case 72:
-                    return visitIdentifier(node);
                 case 238:
+                    return visitVariableDeclaration(node);
+                case 73:
+                    return visitIdentifier(node);
+                case 239:
                     return visitVariableDeclarationList(node);
-                case 232:
-                    return visitSwitchStatement(node);
-                case 246:
-                    return visitCaseBlock(node);
-                case 218:
-                    return visitBlock(node, false);
-                case 229:
-                case 228:
-                    return visitBreakOrContinueStatement(node);
                 case 233:
+                    return visitSwitchStatement(node);
+                case 247:
+                    return visitCaseBlock(node);
+                case 219:
+                    return visitBlock(node, false);
+                case 230:
+                case 229:
+                    return visitBreakOrContinueStatement(node);
+                case 234:
                     return visitLabeledStatement(node);
-                case 223:
                 case 224:
-                    return visitDoOrWhileStatement(node, undefined);
                 case 225:
-                    return visitForStatement(node, undefined);
+                    return visitDoOrWhileStatement(node, undefined);
                 case 226:
-                    return visitForInStatement(node, undefined);
+                    return visitForStatement(node, undefined);
                 case 227:
+                    return visitForInStatement(node, undefined);
+                case 228:
                     return visitForOfStatement(node, undefined);
-                case 221:
+                case 222:
                     return visitExpressionStatement(node);
-                case 188:
+                case 189:
                     return visitObjectLiteralExpression(node);
-                case 274:
+                case 275:
                     return visitCatchClause(node);
-                case 276:
+                case 277:
                     return visitShorthandPropertyAssignment(node);
-                case 149:
+                case 150:
                     return visitComputedPropertyName(node);
-                case 187:
+                case 188:
                     return visitArrayLiteralExpression(node);
-                case 191:
-                    return visitCallExpression(node);
                 case 192:
+                    return visitCallExpression(node);
+                case 193:
                     return visitNewExpression(node);
-                case 195:
+                case 196:
                     return visitParenthesizedExpression(node, true);
-                case 204:
+                case 205:
                     return visitBinaryExpression(node, true);
                 case 14:
                 case 15:
@@ -60142,35 +62182,35 @@ var ts;
                     return visitStringLiteral(node);
                 case 8:
                     return visitNumericLiteral(node);
-                case 193:
+                case 194:
                     return visitTaggedTemplateExpression(node);
-                case 206:
-                    return visitTemplateExpression(node);
                 case 207:
-                    return visitYieldExpression(node);
+                    return visitTemplateExpression(node);
                 case 208:
+                    return visitYieldExpression(node);
+                case 209:
                     return visitSpreadElement(node);
-                case 98:
+                case 99:
                     return visitSuperKeyword(false);
-                case 100:
+                case 101:
                     return visitThisKeyword(node);
-                case 214:
+                case 215:
                     return visitMetaProperty(node);
-                case 156:
+                case 157:
                     return visitMethodDeclaration(node);
-                case 158:
                 case 159:
+                case 160:
                     return visitAccessorDeclaration(node);
-                case 219:
+                case 220:
                     return visitVariableStatement(node);
-                case 230:
+                case 231:
                     return visitReturnStatement(node);
                 default:
                     return ts.visitEachChild(node, visitor, context);
             }
         }
         function visitSourceFile(node) {
-            var ancestorFacts = enterSubtree(3968, 64);
+            var ancestorFacts = enterSubtree(8064, 64);
             var prologue = [];
             var statements = [];
             startLexicalEnvironment();
@@ -60196,7 +62236,7 @@ var ts;
             return ts.visitEachChild(node, visitor, context);
         }
         function visitCaseBlock(node) {
-            var ancestorFacts = enterSubtree(4032, 0);
+            var ancestorFacts = enterSubtree(7104, 0);
             var updated = ts.visitEachChild(node, visitor, context);
             exitSubtree(ancestorFacts, 0, 0);
             return updated;
@@ -60223,7 +62263,7 @@ var ts;
         }
         function visitThisKeyword(node) {
             if (hierarchyFacts & 2) {
-                hierarchyFacts |= 16384;
+                hierarchyFacts |= 32768;
             }
             if (convertedLoopState) {
                 if (hierarchyFacts & 2) {
@@ -60248,14 +62288,14 @@ var ts;
         }
         function visitBreakOrContinueStatement(node) {
             if (convertedLoopState) {
-                var jump = node.kind === 229 ? 2 : 4;
+                var jump = node.kind === 230 ? 2 : 4;
                 var canUseBreakOrContinue = (node.label && convertedLoopState.labels && convertedLoopState.labels.get(ts.idText(node.label))) ||
                     (!node.label && (convertedLoopState.allowedNonLabeledJumps & jump));
                 if (!canUseBreakOrContinue) {
                     var labelMarker = void 0;
                     var label = node.label;
                     if (!label) {
-                        if (node.kind === 229) {
+                        if (node.kind === 230) {
                             convertedLoopState.nonLocalJumps |= 2;
                             labelMarker = "break";
                         }
@@ -60265,7 +62305,7 @@ var ts;
                         }
                     }
                     else {
-                        if (node.kind === 229) {
+                        if (node.kind === 230) {
                             labelMarker = "break-" + label.escapedText;
                             setLabeledJump(convertedLoopState, true, ts.idText(label), labelMarker);
                         }
@@ -60367,7 +62407,7 @@ var ts;
         function addConstructor(statements, node, extendsClauseElement) {
             var savedConvertedLoopState = convertedLoopState;
             convertedLoopState = undefined;
-            var ancestorFacts = enterSubtree(8086, 73);
+            var ancestorFacts = enterSubtree(16278, 73);
             var constructor = ts.getFirstConstructorWithBody(node);
             var hasSynthesizedSuper = hasSynthesizedDefaultSuperCall(constructor, extendsClauseElement !== undefined);
             var constructorFunction = ts.createFunctionDeclaration(undefined, undefined, undefined, ts.getInternalName(node), undefined, transformConstructorParameters(constructor, hasSynthesizedSuper), undefined, transformConstructorBody(constructor, node, extendsClauseElement, hasSynthesizedSuper));
@@ -60376,7 +62416,7 @@ var ts;
                 ts.setEmitFlags(constructorFunction, 8);
             }
             statements.push(constructorFunction);
-            exitSubtree(ancestorFacts, 24576, 0);
+            exitSubtree(ancestorFacts, 49152, 0);
             convertedLoopState = savedConvertedLoopState;
         }
         function transformConstructorParameters(constructor, hasSynthesizedSuper) {
@@ -60398,7 +62438,7 @@ var ts;
             return block;
         }
         function transformConstructorBody(constructor, node, extendsClauseElement, hasSynthesizedSuper) {
-            var isDerivedClass = !!extendsClauseElement && ts.skipOuterExpressions(extendsClauseElement.expression).kind !== 96;
+            var isDerivedClass = !!extendsClauseElement && ts.skipOuterExpressions(extendsClauseElement.expression).kind !== 97;
             if (!constructor)
                 return createDefaultConstructorBody(node, isDerivedClass);
             var prologue = [];
@@ -60422,7 +62462,7 @@ var ts;
                 }
             }
             if (superCallExpression) {
-                hierarchyFacts |= 4096;
+                hierarchyFacts |= 8192;
                 statementOffset++;
             }
             ts.addRange(statements, ts.visitNodes(constructor.body.statements, visitor, ts.isStatement, statementOffset));
@@ -60451,17 +62491,17 @@ var ts;
             return block;
         }
         function isSufficientlyCoveredByReturnStatements(statement) {
-            if (statement.kind === 230) {
+            if (statement.kind === 231) {
                 return true;
             }
-            else if (statement.kind === 222) {
+            else if (statement.kind === 223) {
                 var ifStatement = statement;
                 if (ifStatement.elseStatement) {
                     return isSufficientlyCoveredByReturnStatements(ifStatement.thenStatement) &&
                         isSufficientlyCoveredByReturnStatements(ifStatement.elseStatement);
                 }
             }
-            else if (statement.kind === 218) {
+            else if (statement.kind === 219) {
                 var lastStatement = ts.lastOrUndefined(statement.statements);
                 if (lastStatement && isSufficientlyCoveredByReturnStatements(lastStatement)) {
                     return true;
@@ -60544,9 +62584,9 @@ var ts;
             if (!shouldAddRestParameter(parameter, inConstructorWithSynthesizedSuper)) {
                 return false;
             }
-            var declarationName = parameter.name.kind === 72 ? ts.getMutableClone(parameter.name) : ts.createTempVariable(undefined);
+            var declarationName = parameter.name.kind === 73 ? ts.getMutableClone(parameter.name) : ts.createTempVariable(undefined);
             ts.setEmitFlags(declarationName, 48);
-            var expressionName = parameter.name.kind === 72 ? ts.getSynthesizedClone(parameter.name) : declarationName;
+            var expressionName = parameter.name.kind === 73 ? ts.getSynthesizedClone(parameter.name) : declarationName;
             var restIndex = node.parameters.length - 1;
             var temp = ts.createLoopVariable();
             prologueStatements.push(ts.setEmitFlags(ts.setTextRange(ts.createVariableStatement(undefined, ts.createVariableDeclarationList([
@@ -60562,14 +62602,14 @@ var ts;
             ts.setEmitFlags(forStatement, 1048576);
             ts.startOnNewLine(forStatement);
             prologueStatements.push(forStatement);
-            if (parameter.name.kind !== 72) {
+            if (parameter.name.kind !== 73) {
                 prologueStatements.push(ts.setEmitFlags(ts.setTextRange(ts.createVariableStatement(undefined, ts.createVariableDeclarationList(ts.flattenDestructuringBinding(parameter, visitor, context, 0, expressionName))), parameter), 1048576));
             }
             ts.insertStatementsAfterCustomPrologue(statements, prologueStatements);
             return true;
         }
         function insertCaptureThisForNodeIfNeeded(statements, node) {
-            if (hierarchyFacts & 16384 && node.kind !== 197) {
+            if (hierarchyFacts & 32768 && node.kind !== 198) {
                 insertCaptureThisForNode(statements, node, ts.createThis());
                 return true;
             }
@@ -60585,22 +62625,22 @@ var ts;
             ts.insertStatementAfterCustomPrologue(statements, captureThisStatement);
         }
         function insertCaptureNewTargetIfNeeded(statements, node, copyOnWrite) {
-            if (hierarchyFacts & 8192) {
+            if (hierarchyFacts & 16384) {
                 var newTarget = void 0;
                 switch (node.kind) {
-                    case 197:
+                    case 198:
                         return statements;
-                    case 156:
-                    case 158:
+                    case 157:
                     case 159:
+                    case 160:
                         newTarget = ts.createVoidZero();
                         break;
-                    case 157:
+                    case 158:
                         newTarget = ts.createPropertyAccess(ts.setEmitFlags(ts.createThis(), 4), "constructor");
                         break;
-                    case 239:
-                    case 196:
-                        newTarget = ts.createConditional(ts.createLogicalAnd(ts.setEmitFlags(ts.createThis(), 4), ts.createBinary(ts.setEmitFlags(ts.createThis(), 4), 94, ts.getLocalName(node))), ts.createPropertyAccess(ts.setEmitFlags(ts.createThis(), 4), "constructor"), ts.createVoidZero());
+                    case 240:
+                    case 197:
+                        newTarget = ts.createConditional(ts.createLogicalAnd(ts.setEmitFlags(ts.createThis(), 4), ts.createBinary(ts.setEmitFlags(ts.createThis(), 4), 95, ts.getLocalName(node))), ts.createPropertyAccess(ts.setEmitFlags(ts.createThis(), 4), "constructor"), ts.createVoidZero());
                         break;
                     default:
                         return ts.Debug.failBadSyntaxKind(node);
@@ -60620,23 +62660,23 @@ var ts;
             for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                 var member = _a[_i];
                 switch (member.kind) {
-                    case 217:
+                    case 218:
                         statements.push(transformSemicolonClassElementToStatement(member));
                         break;
-                    case 156:
+                    case 157:
                         statements.push(transformClassMethodDeclarationToStatement(getClassMemberPrefix(node, member), member, node));
                         break;
-                    case 158:
                     case 159:
+                    case 160:
                         var accessors = ts.getAllAccessorDeclarations(node.members, member);
                         if (member === accessors.firstAccessor) {
                             statements.push(transformAccessorsToStatement(getClassMemberPrefix(node, member), accessors, node));
                         }
                         break;
-                    case 157:
+                    case 158:
                         break;
                     default:
-                        ts.Debug.failBadSyntaxKind(node);
+                        ts.Debug.failBadSyntaxKind(member, currentSourceFile && currentSourceFile.fileName);
                         break;
                 }
             }
@@ -60701,16 +62741,16 @@ var ts;
         }
         function visitArrowFunction(node) {
             if (node.transformFlags & 2048) {
-                hierarchyFacts |= 16384;
+                hierarchyFacts |= 32768;
             }
             var savedConvertedLoopState = convertedLoopState;
             convertedLoopState = undefined;
-            var ancestorFacts = enterSubtree(8064, 66);
+            var ancestorFacts = enterSubtree(15232, 66);
             var func = ts.createFunctionExpression(undefined, undefined, undefined, undefined, ts.visitParameterList(node.parameters, visitor, context), undefined, transformFunctionBody(node));
             ts.setTextRange(func, node);
             ts.setOriginalNode(func, node);
             ts.setEmitFlags(func, 8);
-            if (hierarchyFacts & 16384) {
+            if (hierarchyFacts & 32768) {
                 enableSubstitutionsForCapturedThis();
             }
             exitSubtree(ancestorFacts, 0, 0);
@@ -60719,29 +62759,29 @@ var ts;
         }
         function visitFunctionExpression(node) {
             var ancestorFacts = ts.getEmitFlags(node) & 262144
-                ? enterSubtree(8086, 69)
-                : enterSubtree(8094, 65);
+                ? enterSubtree(16278, 69)
+                : enterSubtree(16286, 65);
             var savedConvertedLoopState = convertedLoopState;
             convertedLoopState = undefined;
             var parameters = ts.visitParameterList(node.parameters, visitor, context);
             var body = transformFunctionBody(node);
-            var name = hierarchyFacts & 8192
+            var name = hierarchyFacts & 16384
                 ? ts.getLocalName(node)
                 : node.name;
-            exitSubtree(ancestorFacts, 24576, 0);
+            exitSubtree(ancestorFacts, 49152, 0);
             convertedLoopState = savedConvertedLoopState;
             return ts.updateFunctionExpression(node, undefined, node.asteriskToken, name, undefined, parameters, undefined, body);
         }
         function visitFunctionDeclaration(node) {
             var savedConvertedLoopState = convertedLoopState;
             convertedLoopState = undefined;
-            var ancestorFacts = enterSubtree(8094, 65);
+            var ancestorFacts = enterSubtree(16286, 65);
             var parameters = ts.visitParameterList(node.parameters, visitor, context);
             var body = transformFunctionBody(node);
-            var name = hierarchyFacts & 8192
+            var name = hierarchyFacts & 16384
                 ? ts.getLocalName(node)
                 : node.name;
-            exitSubtree(ancestorFacts, 24576, 0);
+            exitSubtree(ancestorFacts, 49152, 0);
             convertedLoopState = savedConvertedLoopState;
             return ts.updateFunctionDeclaration(node, undefined, ts.visitNodes(node.modifiers, visitor, ts.isModifier), node.asteriskToken, name, undefined, parameters, undefined, body);
         }
@@ -60749,14 +62789,14 @@ var ts;
             var savedConvertedLoopState = convertedLoopState;
             convertedLoopState = undefined;
             var ancestorFacts = container && ts.isClassLike(container) && !ts.hasModifier(node, 32)
-                ? enterSubtree(8094, 65 | 8)
-                : enterSubtree(8094, 65);
+                ? enterSubtree(16286, 65 | 8)
+                : enterSubtree(16286, 65);
             var parameters = ts.visitParameterList(node.parameters, visitor, context);
             var body = transformFunctionBody(node);
-            if (hierarchyFacts & 8192 && !name && (node.kind === 239 || node.kind === 196)) {
+            if (hierarchyFacts & 16384 && !name && (node.kind === 240 || node.kind === 197)) {
                 name = ts.getGeneratedNameForNode(node);
             }
-            exitSubtree(ancestorFacts, 24576, 0);
+            exitSubtree(ancestorFacts, 49152, 0);
             convertedLoopState = savedConvertedLoopState;
             return ts.setOriginalNode(ts.setTextRange(ts.createFunctionExpression(undefined, node.asteriskToken, name, undefined, parameters, undefined, body), location), node);
         }
@@ -60784,7 +62824,7 @@ var ts;
                 }
             }
             else {
-                ts.Debug.assert(node.kind === 197);
+                ts.Debug.assert(node.kind === 198);
                 statementsLocation = ts.moveRangeEnd(body, -1);
                 var equalsGreaterThanToken = node.equalsGreaterThanToken;
                 if (!ts.nodeIsSynthesized(equalsGreaterThanToken) && !ts.nodeIsSynthesized(body)) {
@@ -60829,17 +62869,17 @@ var ts;
                 return ts.visitEachChild(node, visitor, context);
             }
             var ancestorFacts = hierarchyFacts & 256
-                ? enterSubtree(4032, 512)
-                : enterSubtree(3904, 128);
+                ? enterSubtree(7104, 512)
+                : enterSubtree(6976, 128);
             var updated = ts.visitEachChild(node, visitor, context);
             exitSubtree(ancestorFacts, 0, 0);
             return updated;
         }
         function visitExpressionStatement(node) {
             switch (node.expression.kind) {
-                case 195:
+                case 196:
                     return ts.updateExpressionStatement(node, visitParenthesizedExpression(node.expression, false));
-                case 204:
+                case 205:
                     return ts.updateExpressionStatement(node, visitBinaryExpression(node.expression, false));
             }
             return ts.visitEachChild(node, visitor, context);
@@ -60847,9 +62887,9 @@ var ts;
         function visitParenthesizedExpression(node, needsDestructuringValue) {
             if (!needsDestructuringValue) {
                 switch (node.expression.kind) {
-                    case 195:
+                    case 196:
                         return ts.updateParen(node, visitParenthesizedExpression(node.expression, false));
-                    case 204:
+                    case 205:
                         return ts.updateParen(node, visitBinaryExpression(node.expression, false));
                 }
             }
@@ -60875,7 +62915,7 @@ var ts;
                             assignment = ts.flattenDestructuringAssignment(decl, visitor, context, 0);
                         }
                         else {
-                            assignment = ts.createBinary(decl.name, 59, ts.visitNode(decl.initializer, visitor, ts.isExpression));
+                            assignment = ts.createBinary(decl.name, 60, ts.visitNode(decl.initializer, visitor, ts.isExpression));
                             ts.setTextRange(assignment, decl);
                         }
                         assignments = ts.append(assignments, assignment);
@@ -60932,11 +62972,11 @@ var ts;
                     && isDeclaredInLoop
                     && (hierarchyFacts & 512) !== 0);
             var emitExplicitInitializer = !emittedAsTopLevel
-                && (hierarchyFacts & 2048) === 0
+                && (hierarchyFacts & 4096) === 0
                 && (!resolver.isDeclarationWithCollidingName(node)
                     || (isDeclaredInLoop
                         && !isCapturedInFunction
-                        && (hierarchyFacts & (1024 | 2048)) === 0));
+                        && (hierarchyFacts & (2048 | 4096)) === 0));
             return emitExplicitInitializer;
         }
         function visitVariableDeclarationInLetDeclarationList(node) {
@@ -60945,9 +62985,9 @@ var ts;
                 return visitVariableDeclaration(node);
             }
             if (!node.initializer && shouldEmitExplicitInitializerForLetDeclaration(node)) {
-                var clone_2 = ts.getMutableClone(node);
-                clone_2.initializer = ts.createVoidZero();
-                return clone_2;
+                var clone_3 = ts.getMutableClone(node);
+                clone_3.initializer = ts.createVoidZero();
+                return clone_3;
             }
             return ts.visitEachChild(node, visitor, context);
         }
@@ -60980,34 +63020,34 @@ var ts;
         }
         function visitIterationStatement(node, outermostLabeledStatement) {
             switch (node.kind) {
-                case 223:
                 case 224:
-                    return visitDoOrWhileStatement(node, outermostLabeledStatement);
                 case 225:
-                    return visitForStatement(node, outermostLabeledStatement);
+                    return visitDoOrWhileStatement(node, outermostLabeledStatement);
                 case 226:
-                    return visitForInStatement(node, outermostLabeledStatement);
+                    return visitForStatement(node, outermostLabeledStatement);
                 case 227:
+                    return visitForInStatement(node, outermostLabeledStatement);
+                case 228:
                     return visitForOfStatement(node, outermostLabeledStatement);
             }
         }
         function visitIterationStatementWithFacts(excludeFacts, includeFacts, node, outermostLabeledStatement, convert) {
             var ancestorFacts = enterSubtree(excludeFacts, includeFacts);
-            var updated = convertIterationStatementBodyIfNecessary(node, outermostLabeledStatement, convert);
+            var updated = convertIterationStatementBodyIfNecessary(node, outermostLabeledStatement, ancestorFacts, convert);
             exitSubtree(ancestorFacts, 0, 0);
             return updated;
         }
         function visitDoOrWhileStatement(node, outermostLabeledStatement) {
-            return visitIterationStatementWithFacts(0, 256, node, outermostLabeledStatement);
+            return visitIterationStatementWithFacts(0, 1280, node, outermostLabeledStatement);
         }
         function visitForStatement(node, outermostLabeledStatement) {
-            return visitIterationStatementWithFacts(3008, 1280, node, outermostLabeledStatement);
+            return visitIterationStatementWithFacts(5056, 3328, node, outermostLabeledStatement);
         }
         function visitForInStatement(node, outermostLabeledStatement) {
-            return visitIterationStatementWithFacts(1984, 2304, node, outermostLabeledStatement);
+            return visitIterationStatementWithFacts(3008, 5376, node, outermostLabeledStatement);
         }
         function visitForOfStatement(node, outermostLabeledStatement) {
-            return visitIterationStatementWithFacts(1984, 2304, node, outermostLabeledStatement, compilerOptions.downlevelIteration ? convertForOfStatementForIterable : convertForOfStatementForArray);
+            return visitIterationStatementWithFacts(3008, 5376, node, outermostLabeledStatement, compilerOptions.downlevelIteration ? convertForOfStatementForIterable : convertForOfStatementForArray);
         }
         function convertForOfStatementHead(node, boundValue, convertedLoopBodyStatements) {
             var statements = [];
@@ -61071,7 +63111,7 @@ var ts;
             ts.setTextRange(forStatement, node);
             return ts.restoreEnclosingLabel(forStatement, outermostLabeledStatement, convertedLoopState && resetLabel);
         }
-        function convertForOfStatementForIterable(node, outermostLabeledStatement, convertedLoopBodyStatements) {
+        function convertForOfStatementForIterable(node, outermostLabeledStatement, convertedLoopBodyStatements, ancestorFacts) {
             var expression = ts.visitNode(node.expression, visitor, ts.isExpression);
             var iterator = ts.isIdentifier(expression) ? ts.getGeneratedNameForNode(expression) : ts.createTempVariable(undefined);
             var result = ts.isIdentifier(expression) ? ts.getGeneratedNameForNode(iterator) : ts.createTempVariable(undefined);
@@ -61082,8 +63122,11 @@ var ts;
             var next = ts.createCall(ts.createPropertyAccess(iterator, "next"), undefined, []);
             hoistVariableDeclaration(errorRecord);
             hoistVariableDeclaration(returnMethod);
+            var initializer = ancestorFacts & 1024
+                ? ts.inlineExpressions([ts.createAssignment(errorRecord, ts.createVoidZero()), values])
+                : values;
             var forStatement = ts.setEmitFlags(ts.setTextRange(ts.createFor(ts.setEmitFlags(ts.setTextRange(ts.createVariableDeclarationList([
-                ts.setTextRange(ts.createVariableDeclaration(iterator, undefined, values), node.expression),
+                ts.setTextRange(ts.createVariableDeclaration(iterator, undefined, initializer), node.expression),
                 ts.createVariableDeclaration(result, undefined, next)
             ]), node.expression), 2097152), ts.createLogicalNot(ts.createPropertyAccess(result, "done")), ts.createAssignment(result, next), convertForOfStatementHead(node, ts.createPropertyAccess(result, "value"), convertedLoopBodyStatements)), node), 256);
             return ts.createTry(ts.createBlock([
@@ -61111,7 +63154,7 @@ var ts;
                     && i < numInitialPropertiesWithoutYield) {
                     numInitialPropertiesWithoutYield = i;
                 }
-                if (property.name.kind === 149) {
+                if (property.name.kind === 150) {
                     numInitialProperties = i;
                     break;
                 }
@@ -61158,7 +63201,7 @@ var ts;
             }
             visit(node.name);
             function visit(node) {
-                if (node.kind === 72) {
+                if (node.kind === 73) {
                     state.hoistedLocalVariables.push(node);
                 }
                 else {
@@ -61171,7 +63214,7 @@ var ts;
                 }
             }
         }
-        function convertIterationStatementBodyIfNecessary(node, outermostLabeledStatement, convert) {
+        function convertIterationStatementBodyIfNecessary(node, outermostLabeledStatement, ancestorFacts, convert) {
             if (!shouldConvertIterationStatement(node)) {
                 var saveAllowedNonLabeledJumps = void 0;
                 if (convertedLoopState) {
@@ -61179,7 +63222,7 @@ var ts;
                     convertedLoopState.allowedNonLabeledJumps = 2 | 4;
                 }
                 var result = convert
-                    ? convert(node, outermostLabeledStatement, undefined)
+                    ? convert(node, outermostLabeledStatement, undefined, ancestorFacts)
                     : ts.restoreEnclosingLabel(ts.visitEachChild(node, visitor, context), outermostLabeledStatement, convertedLoopState && resetLabel);
                 if (convertedLoopState) {
                     convertedLoopState.allowedNonLabeledJumps = saveAllowedNonLabeledJumps;
@@ -61204,29 +63247,29 @@ var ts;
             var loop;
             if (bodyFunction) {
                 if (convert) {
-                    loop = convert(node, outermostLabeledStatement, bodyFunction.part);
+                    loop = convert(node, outermostLabeledStatement, bodyFunction.part, ancestorFacts);
                 }
                 else {
-                    var clone_3 = convertIterationStatementCore(node, initializerFunction, ts.createBlock(bodyFunction.part, true));
-                    ts.aggregateTransformFlags(clone_3);
-                    loop = ts.restoreEnclosingLabel(clone_3, outermostLabeledStatement, convertedLoopState && resetLabel);
+                    var clone_4 = convertIterationStatementCore(node, initializerFunction, ts.createBlock(bodyFunction.part, true));
+                    ts.aggregateTransformFlags(clone_4);
+                    loop = ts.restoreEnclosingLabel(clone_4, outermostLabeledStatement, convertedLoopState && resetLabel);
                 }
             }
             else {
-                var clone_4 = convertIterationStatementCore(node, initializerFunction, ts.visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock));
-                ts.aggregateTransformFlags(clone_4);
-                loop = ts.restoreEnclosingLabel(clone_4, outermostLabeledStatement, convertedLoopState && resetLabel);
+                var clone_5 = convertIterationStatementCore(node, initializerFunction, ts.visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock));
+                ts.aggregateTransformFlags(clone_5);
+                loop = ts.restoreEnclosingLabel(clone_5, outermostLabeledStatement, convertedLoopState && resetLabel);
             }
             statements.push(loop);
             return statements;
         }
         function convertIterationStatementCore(node, initializerFunction, convertedLoopBody) {
             switch (node.kind) {
-                case 225: return convertForStatement(node, initializerFunction, convertedLoopBody);
-                case 226: return convertForInStatement(node, convertedLoopBody);
-                case 227: return convertForOfStatement(node, convertedLoopBody);
-                case 223: return convertDoStatement(node, convertedLoopBody);
-                case 224: return convertWhileStatement(node, convertedLoopBody);
+                case 226: return convertForStatement(node, initializerFunction, convertedLoopBody);
+                case 227: return convertForInStatement(node, convertedLoopBody);
+                case 228: return convertForOfStatement(node, convertedLoopBody);
+                case 224: return convertDoStatement(node, convertedLoopBody);
+                case 225: return convertWhileStatement(node, convertedLoopBody);
                 default: return ts.Debug.failBadSyntaxKind(node, "IterationStatement expected");
             }
         }
@@ -61250,11 +63293,11 @@ var ts;
         function createConvertedLoopState(node) {
             var loopInitializer;
             switch (node.kind) {
-                case 225:
                 case 226:
                 case 227:
+                case 228:
                     var initializer = node.initializer;
-                    if (initializer && initializer.kind === 238) {
+                    if (initializer && initializer.kind === 239) {
                         loopInitializer = initializer;
                     }
                     break;
@@ -61392,7 +63435,7 @@ var ts;
         function copyOutParameter(outParam, copyDirection) {
             var source = copyDirection === 0 ? outParam.outParamName : outParam.originalName;
             var target = copyDirection === 0 ? outParam.originalName : outParam.outParamName;
-            return ts.createBinary(target, 59, source);
+            return ts.createBinary(target, 60, source);
         }
         function copyOutParameters(outParams, partFlags, copyDirection, statements) {
             for (var _i = 0, outParams_1 = outParams; _i < outParams_1.length; _i++) {
@@ -61513,20 +63556,20 @@ var ts;
             for (var i = start; i < numProperties; i++) {
                 var property = properties[i];
                 switch (property.kind) {
-                    case 158:
                     case 159:
+                    case 160:
                         var accessors = ts.getAllAccessorDeclarations(node.properties, property);
                         if (property === accessors.firstAccessor) {
                             expressions.push(transformAccessorsToExpression(receiver, accessors, node, !!node.multiLine));
                         }
                         break;
-                    case 156:
+                    case 157:
                         expressions.push(transformObjectLiteralMethodDeclarationToExpression(property, receiver, node, node.multiLine));
                         break;
-                    case 275:
+                    case 276:
                         expressions.push(transformPropertyAssignmentToExpression(property, receiver, node.multiLine));
                         break;
-                    case 276:
+                    case 277:
                         expressions.push(transformShorthandPropertyAssignmentToExpression(property, receiver, node.multiLine));
                         break;
                     default:
@@ -61560,7 +63603,7 @@ var ts;
             return expression;
         }
         function visitCatchClause(node) {
-            var ancestorFacts = enterSubtree(4032, 0);
+            var ancestorFacts = enterSubtree(7104, 0);
             var updated;
             ts.Debug.assert(!!node.variableDeclaration, "Catch clause variable should always be present when downleveling ES2015.");
             if (ts.isBindingPattern(node.variableDeclaration.name)) {
@@ -61593,17 +63636,17 @@ var ts;
             ts.Debug.assert(!ts.isComputedPropertyName(node.name));
             var savedConvertedLoopState = convertedLoopState;
             convertedLoopState = undefined;
-            var ancestorFacts = enterSubtree(8094, 65);
+            var ancestorFacts = enterSubtree(16286, 65);
             var updated;
             var parameters = ts.visitParameterList(node.parameters, visitor, context);
             var body = transformFunctionBody(node);
-            if (node.kind === 158) {
+            if (node.kind === 159) {
                 updated = ts.updateGetAccessor(node, node.decorators, node.modifiers, node.name, parameters, node.type, body);
             }
             else {
                 updated = ts.updateSetAccessor(node, node.decorators, node.modifiers, node.name, parameters, body);
             }
-            exitSubtree(ancestorFacts, 24576, 0);
+            exitSubtree(ancestorFacts, 49152, 0);
             convertedLoopState = savedConvertedLoopState;
             return updated;
         }
@@ -61627,7 +63670,7 @@ var ts;
                 return visitTypeScriptClassWrapper(node);
             }
             var expression = ts.skipOuterExpressions(node.expression);
-            if (expression.kind === 98 ||
+            if (expression.kind === 99 ||
                 ts.isSuperProperty(expression) ||
                 ts.some(node.arguments, ts.isSpreadElement)) {
                 return visitCallExpressionWithPotentialCapturedThisAssignment(node, true);
@@ -61676,20 +63719,20 @@ var ts;
         }
         function visitCallExpressionWithPotentialCapturedThisAssignment(node, assignToCapturedThis) {
             if (node.transformFlags & 4096 ||
-                node.expression.kind === 98 ||
+                node.expression.kind === 99 ||
                 ts.isSuperProperty(ts.skipOuterExpressions(node.expression))) {
                 var _a = ts.createCallBinding(node.expression, hoistVariableDeclaration), target = _a.target, thisArg = _a.thisArg;
-                if (node.expression.kind === 98) {
+                if (node.expression.kind === 99) {
                     ts.setEmitFlags(thisArg, 4);
                 }
                 var resultingCall = void 0;
                 if (node.transformFlags & 4096) {
-                    resultingCall = ts.createFunctionApply(ts.visitNode(target, callExpressionVisitor, ts.isExpression), node.expression.kind === 98 ? thisArg : ts.visitNode(thisArg, visitor, ts.isExpression), transformAndSpreadElements(node.arguments, false, false, false));
+                    resultingCall = ts.createFunctionApply(ts.visitNode(target, callExpressionVisitor, ts.isExpression), node.expression.kind === 99 ? thisArg : ts.visitNode(thisArg, visitor, ts.isExpression), transformAndSpreadElements(node.arguments, false, false, false));
                 }
                 else {
-                    resultingCall = ts.createFunctionCall(ts.visitNode(target, callExpressionVisitor, ts.isExpression), node.expression.kind === 98 ? thisArg : ts.visitNode(thisArg, visitor, ts.isExpression), ts.visitNodes(node.arguments, visitor, ts.isExpression), node);
+                    resultingCall = ts.createFunctionCall(ts.visitNode(target, callExpressionVisitor, ts.isExpression), node.expression.kind === 99 ? thisArg : ts.visitNode(thisArg, visitor, ts.isExpression), ts.visitNodes(node.arguments, visitor, ts.isExpression), node);
                 }
-                if (node.expression.kind === 98) {
+                if (node.expression.kind === 99) {
                     var initializer = ts.createLogicalOr(resultingCall, createActualThis());
                     resultingCall = assignToCapturedThis
                         ? ts.createAssignment(ts.createFileLevelUniqueName("_this"), initializer)
@@ -61714,10 +63757,7 @@ var ts;
             if (compilerOptions.downlevelIteration) {
                 if (segments.length === 1) {
                     var firstSegment = segments[0];
-                    if (ts.isCallExpression(firstSegment)
-                        && ts.isIdentifier(firstSegment.expression)
-                        && (ts.getEmitFlags(firstSegment.expression) & 4096)
-                        && firstSegment.expression.escapedText === "___spread") {
+                    if (isCallToHelper(firstSegment, "___spread")) {
                         return segments[0];
                     }
                 }
@@ -61725,14 +63765,28 @@ var ts;
             }
             else {
                 if (segments.length === 1) {
-                    var firstElement = elements[0];
-                    return needsUniqueCopy && ts.isSpreadElement(firstElement) && firstElement.expression.kind !== 187
-                        ? ts.createArraySlice(segments[0])
-                        : segments[0];
+                    var firstSegment = segments[0];
+                    if (!needsUniqueCopy
+                        || isPackedArrayLiteral(firstSegment)
+                        || isCallToHelper(firstSegment, "___spreadArrays")) {
+                        return segments[0];
+                    }
                 }
-                return ts.createArrayConcat(segments.shift(), segments);
+                return ts.createSpreadArraysHelper(context, segments);
             }
         }
+        function isPackedElement(node) {
+            return !ts.isOmittedExpression(node);
+        }
+        function isPackedArrayLiteral(node) {
+            return ts.isArrayLiteralExpression(node) && ts.every(node.elements, isPackedElement);
+        }
+        function isCallToHelper(firstSegment, helperName) {
+            return ts.isCallExpression(firstSegment)
+                && ts.isIdentifier(firstSegment.expression)
+                && (ts.getEmitFlags(firstSegment.expression) & 4096)
+                && firstSegment.expression.escapedText === helperName;
+        }
         function partitionSpread(node) {
             return ts.isSpreadElement(node)
                 ? visitSpanOfSpreads
@@ -61840,15 +63894,15 @@ var ts;
                 : ts.createFileLevelUniqueName("_super");
         }
         function visitMetaProperty(node) {
-            if (node.keywordToken === 95 && node.name.escapedText === "target") {
-                hierarchyFacts |= 8192;
+            if (node.keywordToken === 96 && node.name.escapedText === "target") {
+                hierarchyFacts |= 16384;
                 return ts.createFileLevelUniqueName("_newTarget");
             }
             return node;
         }
         function onEmitNode(hint, node, emitCallback) {
             if (enabledSubstitutions & 1 && ts.isFunctionLike(node)) {
-                var ancestorFacts = enterSubtree(8094, ts.getEmitFlags(node) & 8
+                var ancestorFacts = enterSubtree(16286, ts.getEmitFlags(node) & 8
                     ? 65 | 16
                     : 65);
                 previousOnEmitNode(hint, node, emitCallback);
@@ -61860,20 +63914,20 @@ var ts;
         function enableSubstitutionsForBlockScopedBindings() {
             if ((enabledSubstitutions & 2) === 0) {
                 enabledSubstitutions |= 2;
-                context.enableSubstitution(72);
+                context.enableSubstitution(73);
             }
         }
         function enableSubstitutionsForCapturedThis() {
             if ((enabledSubstitutions & 1) === 0) {
                 enabledSubstitutions |= 1;
-                context.enableSubstitution(100);
-                context.enableEmitNotification(157);
-                context.enableEmitNotification(156);
+                context.enableSubstitution(101);
                 context.enableEmitNotification(158);
+                context.enableEmitNotification(157);
                 context.enableEmitNotification(159);
+                context.enableEmitNotification(160);
+                context.enableEmitNotification(198);
                 context.enableEmitNotification(197);
-                context.enableEmitNotification(196);
-                context.enableEmitNotification(239);
+                context.enableEmitNotification(240);
             }
         }
         function onSubstituteNode(hint, node) {
@@ -61897,10 +63951,10 @@ var ts;
         }
         function isNameOfDeclarationWithCollidingName(node) {
             switch (node.parent.kind) {
-                case 186:
-                case 240:
-                case 243:
-                case 237:
+                case 187:
+                case 241:
+                case 244:
+                case 238:
                     return node.parent.name === node
                         && resolver.isDeclarationWithCollidingName(node.parent);
             }
@@ -61908,9 +63962,9 @@ var ts;
         }
         function substituteExpression(node) {
             switch (node.kind) {
-                case 72:
+                case 73:
                     return substituteExpressionIdentifier(node);
-                case 100:
+                case 101:
                     return substituteThisKeyword(node);
             }
             return node;
@@ -61961,19 +64015,19 @@ var ts;
                 return false;
             }
             var statement = ts.firstOrUndefined(constructor.body.statements);
-            if (!statement || !ts.nodeIsSynthesized(statement) || statement.kind !== 221) {
+            if (!statement || !ts.nodeIsSynthesized(statement) || statement.kind !== 222) {
                 return false;
             }
             var statementExpression = statement.expression;
-            if (!ts.nodeIsSynthesized(statementExpression) || statementExpression.kind !== 191) {
+            if (!ts.nodeIsSynthesized(statementExpression) || statementExpression.kind !== 192) {
                 return false;
             }
             var callTarget = statementExpression.expression;
-            if (!ts.nodeIsSynthesized(callTarget) || callTarget.kind !== 98) {
+            if (!ts.nodeIsSynthesized(callTarget) || callTarget.kind !== 99) {
                 return false;
             }
             var callArgument = ts.singleOrUndefined(statementExpression.arguments);
-            if (!callArgument || !ts.nodeIsSynthesized(callArgument) || callArgument.kind !== 208) {
+            if (!callArgument || !ts.nodeIsSynthesized(callArgument) || callArgument.kind !== 209) {
                 return false;
             }
             var expression = callArgument.expression;
@@ -62017,24 +64071,24 @@ var ts;
         if (compilerOptions.jsx === 1 || compilerOptions.jsx === 3) {
             previousOnEmitNode = context.onEmitNode;
             context.onEmitNode = onEmitNode;
-            context.enableEmitNotification(262);
             context.enableEmitNotification(263);
-            context.enableEmitNotification(261);
+            context.enableEmitNotification(264);
+            context.enableEmitNotification(262);
             noSubstitution = [];
         }
         var previousOnSubstituteNode = context.onSubstituteNode;
         context.onSubstituteNode = onSubstituteNode;
-        context.enableSubstitution(189);
-        context.enableSubstitution(275);
+        context.enableSubstitution(190);
+        context.enableSubstitution(276);
         return ts.chainBundle(transformSourceFile);
         function transformSourceFile(node) {
             return node;
         }
         function onEmitNode(hint, node, emitCallback) {
             switch (node.kind) {
-                case 262:
                 case 263:
-                case 261:
+                case 264:
+                case 262:
                     var tagName = node.tagName;
                     noSubstitution[ts.getOriginalNodeId(tagName)] = true;
                     break;
@@ -62070,7 +64124,7 @@ var ts;
         }
         function trySubstituteReservedName(name) {
             var token = name.originalKeywordKind || (ts.nodeIsSynthesized(name) ? ts.stringToToken(ts.idText(name)) : undefined);
-            if (token !== undefined && token >= 73 && token <= 108) {
+            if (token !== undefined && token >= 74 && token <= 109) {
                 return ts.setTextRange(ts.createLiteral(name), name);
             }
             return undefined;
@@ -62151,13 +64205,13 @@ var ts;
         }
         function visitJavaScriptInStatementContainingYield(node) {
             switch (node.kind) {
-                case 223:
-                    return visitDoStatement(node);
                 case 224:
+                    return visitDoStatement(node);
+                case 225:
                     return visitWhileStatement(node);
-                case 232:
-                    return visitSwitchStatement(node);
                 case 233:
+                    return visitSwitchStatement(node);
+                case 234:
                     return visitLabeledStatement(node);
                 default:
                     return visitJavaScriptInGeneratorFunctionBody(node);
@@ -62165,24 +64219,24 @@ var ts;
         }
         function visitJavaScriptInGeneratorFunctionBody(node) {
             switch (node.kind) {
-                case 239:
+                case 240:
                     return visitFunctionDeclaration(node);
-                case 196:
+                case 197:
                     return visitFunctionExpression(node);
-                case 158:
                 case 159:
+                case 160:
                     return visitAccessorDeclaration(node);
-                case 219:
+                case 220:
                     return visitVariableStatement(node);
-                case 225:
-                    return visitForStatement(node);
                 case 226:
+                    return visitForStatement(node);
+                case 227:
                     return visitForInStatement(node);
-                case 229:
-                    return visitBreakStatement(node);
-                case 228:
-                    return visitContinueStatement(node);
                 case 230:
+                    return visitBreakStatement(node);
+                case 229:
+                    return visitContinueStatement(node);
+                case 231:
                     return visitReturnStatement(node);
                 default:
                     if (node.transformFlags & 131072) {
@@ -62198,21 +64252,21 @@ var ts;
         }
         function visitJavaScriptContainingYield(node) {
             switch (node.kind) {
-                case 204:
-                    return visitBinaryExpression(node);
                 case 205:
+                    return visitBinaryExpression(node);
+                case 206:
                     return visitConditionalExpression(node);
-                case 207:
+                case 208:
                     return visitYieldExpression(node);
-                case 187:
-                    return visitArrayLiteralExpression(node);
                 case 188:
+                    return visitArrayLiteralExpression(node);
+                case 189:
                     return visitObjectLiteralExpression(node);
-                case 190:
-                    return visitElementAccessExpression(node);
                 case 191:
-                    return visitCallExpression(node);
+                    return visitElementAccessExpression(node);
                 case 192:
+                    return visitCallExpression(node);
+                case 193:
                     return visitNewExpression(node);
                 default:
                     return ts.visitEachChild(node, visitor, context);
@@ -62220,9 +64274,9 @@ var ts;
         }
         function visitGenerator(node) {
             switch (node.kind) {
-                case 239:
+                case 240:
                     return visitFunctionDeclaration(node);
-                case 196:
+                case 197:
                     return visitFunctionExpression(node);
                 default:
                     return ts.Debug.failBadSyntaxKind(node);
@@ -62355,23 +64409,23 @@ var ts;
             }
         }
         function isCompoundAssignment(kind) {
-            return kind >= 60
-                && kind <= 71;
+            return kind >= 61
+                && kind <= 72;
         }
         function getOperatorForCompoundAssignment(kind) {
             switch (kind) {
-                case 60: return 38;
-                case 61: return 39;
-                case 62: return 40;
-                case 63: return 41;
-                case 64: return 42;
-                case 65: return 43;
-                case 66: return 46;
-                case 67: return 47;
-                case 68: return 48;
-                case 69: return 49;
-                case 70: return 50;
-                case 71: return 51;
+                case 61: return 38;
+                case 62: return 39;
+                case 63: return 40;
+                case 64: return 41;
+                case 65: return 42;
+                case 66: return 43;
+                case 67: return 46;
+                case 68: return 47;
+                case 69: return 48;
+                case 70: return 49;
+                case 71: return 50;
+                case 72: return 51;
             }
         }
         function visitRightAssociativeBinaryExpression(node) {
@@ -62379,10 +64433,10 @@ var ts;
             if (containsYield(right)) {
                 var target = void 0;
                 switch (left.kind) {
-                    case 189:
+                    case 190:
                         target = ts.updatePropertyAccess(left, cacheExpression(ts.visitNode(left.expression, visitor, ts.isLeftHandSideExpression)), left.name);
                         break;
-                    case 190:
+                    case 191:
                         target = ts.updateElementAccess(left, cacheExpression(ts.visitNode(left.expression, visitor, ts.isLeftHandSideExpression)), cacheExpression(ts.visitNode(left.argumentExpression, visitor, ts.isExpression)));
                         break;
                     default:
@@ -62407,10 +64461,10 @@ var ts;
                 else if (node.operatorToken.kind === 27) {
                     return visitCommaExpression(node);
                 }
-                var clone_5 = ts.getMutableClone(node);
-                clone_5.left = cacheExpression(ts.visitNode(node.left, visitor, ts.isExpression));
-                clone_5.right = ts.visitNode(node.right, visitor, ts.isExpression);
-                return clone_5;
+                var clone_6 = ts.getMutableClone(node);
+                clone_6.left = cacheExpression(ts.visitNode(node.left, visitor, ts.isExpression));
+                clone_6.right = ts.visitNode(node.right, visitor, ts.isExpression);
+                return clone_6;
             }
             return ts.visitEachChild(node, visitor, context);
         }
@@ -62537,10 +64591,10 @@ var ts;
         }
         function visitElementAccessExpression(node) {
             if (containsYield(node.argumentExpression)) {
-                var clone_6 = ts.getMutableClone(node);
-                clone_6.expression = cacheExpression(ts.visitNode(node.expression, visitor, ts.isLeftHandSideExpression));
-                clone_6.argumentExpression = ts.visitNode(node.argumentExpression, visitor, ts.isExpression);
-                return clone_6;
+                var clone_7 = ts.getMutableClone(node);
+                clone_7.expression = cacheExpression(ts.visitNode(node.expression, visitor, ts.isLeftHandSideExpression));
+                clone_7.argumentExpression = ts.visitNode(node.argumentExpression, visitor, ts.isExpression);
+                return clone_7;
             }
             return ts.visitEachChild(node, visitor, context);
         }
@@ -62583,35 +64637,35 @@ var ts;
         }
         function transformAndEmitStatementWorker(node) {
             switch (node.kind) {
-                case 218:
+                case 219:
                     return transformAndEmitBlock(node);
-                case 221:
-                    return transformAndEmitExpressionStatement(node);
                 case 222:
-                    return transformAndEmitIfStatement(node);
+                    return transformAndEmitExpressionStatement(node);
                 case 223:
-                    return transformAndEmitDoStatement(node);
+                    return transformAndEmitIfStatement(node);
                 case 224:
-                    return transformAndEmitWhileStatement(node);
+                    return transformAndEmitDoStatement(node);
                 case 225:
-                    return transformAndEmitForStatement(node);
+                    return transformAndEmitWhileStatement(node);
                 case 226:
+                    return transformAndEmitForStatement(node);
+                case 227:
                     return transformAndEmitForInStatement(node);
-                case 228:
-                    return transformAndEmitContinueStatement(node);
                 case 229:
-                    return transformAndEmitBreakStatement(node);
+                    return transformAndEmitContinueStatement(node);
                 case 230:
-                    return transformAndEmitReturnStatement(node);
+                    return transformAndEmitBreakStatement(node);
                 case 231:
-                    return transformAndEmitWithStatement(node);
+                    return transformAndEmitReturnStatement(node);
                 case 232:
-                    return transformAndEmitSwitchStatement(node);
+                    return transformAndEmitWithStatement(node);
                 case 233:
-                    return transformAndEmitLabeledStatement(node);
+                    return transformAndEmitSwitchStatement(node);
                 case 234:
-                    return transformAndEmitThrowStatement(node);
+                    return transformAndEmitLabeledStatement(node);
                 case 235:
+                    return transformAndEmitThrowStatement(node);
+                case 236:
                     return transformAndEmitTryStatement(node);
                 default:
                     return emitStatement(ts.visitNode(node, visitor, ts.isStatement));
@@ -62905,7 +64959,7 @@ var ts;
                 for (var i = 0; i < numClauses; i++) {
                     var clause = caseBlock.clauses[i];
                     clauseLabels.push(defineLabel());
-                    if (clause.kind === 272 && defaultClauseIndex === -1) {
+                    if (clause.kind === 273 && defaultClauseIndex === -1) {
                         defaultClauseIndex = i;
                     }
                 }
@@ -62915,7 +64969,7 @@ var ts;
                     var defaultClausesSkipped = 0;
                     for (var i = clausesWritten; i < numClauses; i++) {
                         var clause = caseBlock.clauses[i];
-                        if (clause.kind === 271) {
+                        if (clause.kind === 272) {
                             if (containsYield(clause.expression) && pendingClauses.length > 0) {
                                 break;
                             }
@@ -63037,10 +65091,10 @@ var ts;
                     if (declaration) {
                         var name = renamedCatchVariableDeclarations[ts.getOriginalNodeId(declaration)];
                         if (name) {
-                            var clone_7 = ts.getMutableClone(name);
-                            ts.setSourceMapRange(clone_7, node);
-                            ts.setCommentRange(clone_7, node);
-                            return clone_7;
+                            var clone_8 = ts.getMutableClone(name);
+                            ts.setSourceMapRange(clone_8, node);
+                            ts.setCommentRange(clone_8, node);
+                            return clone_8;
                         }
                     }
                 }
@@ -63150,7 +65204,7 @@ var ts;
                 if (!renamedCatchVariables) {
                     renamedCatchVariables = ts.createMap();
                     renamedCatchVariableDeclarations = [];
-                    context.enableSubstitution(72);
+                    context.enableSubstitution(73);
                 }
                 renamedCatchVariables.set(text, true);
                 renamedCatchVariableDeclarations[ts.getOriginalNodeId(variable)] = name;
@@ -63730,12 +65784,12 @@ var ts;
         var previousOnEmitNode = context.onEmitNode;
         context.onSubstituteNode = onSubstituteNode;
         context.onEmitNode = onEmitNode;
-        context.enableSubstitution(72);
-        context.enableSubstitution(204);
-        context.enableSubstitution(202);
+        context.enableSubstitution(73);
+        context.enableSubstitution(205);
         context.enableSubstitution(203);
-        context.enableSubstitution(276);
-        context.enableEmitNotification(284);
+        context.enableSubstitution(204);
+        context.enableSubstitution(277);
+        context.enableEmitNotification(285);
         var moduleInfoMap = [];
         var deferredExports = [];
         var currentSourceFile;
@@ -63926,23 +65980,23 @@ var ts;
         }
         function sourceElementVisitor(node) {
             switch (node.kind) {
-                case 249:
+                case 250:
                     return visitImportDeclaration(node);
-                case 248:
+                case 249:
                     return visitImportEqualsDeclaration(node);
-                case 255:
+                case 256:
                     return visitExportDeclaration(node);
-                case 254:
+                case 255:
                     return visitExportAssignment(node);
-                case 219:
+                case 220:
                     return visitVariableStatement(node);
-                case 239:
-                    return visitFunctionDeclaration(node);
                 case 240:
+                    return visitFunctionDeclaration(node);
+                case 241:
                     return visitClassDeclaration(node);
-                case 315:
+                case 317:
                     return visitMergeDeclarationMarker(node);
-                case 316:
+                case 318:
                     return visitEndOfDeclarationMarker(node);
                 default:
                     return ts.visitEachChild(node, moduleExpressionElementVisitor, context);
@@ -63967,24 +66021,24 @@ var ts;
                 for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
                     var elem = _a[_i];
                     switch (elem.kind) {
-                        case 275:
+                        case 276:
                             if (destructuringNeedsFlattening(elem.initializer)) {
                                 return true;
                             }
                             break;
-                        case 276:
+                        case 277:
                             if (destructuringNeedsFlattening(elem.name)) {
                                 return true;
                             }
                             break;
-                        case 277:
+                        case 278:
                             if (destructuringNeedsFlattening(elem.expression)) {
                                 return true;
                             }
                             break;
-                        case 156:
-                        case 158:
+                        case 157:
                         case 159:
+                        case 160:
                             return false;
                         default: ts.Debug.assertNever(elem, "Unhandled object member kind");
                     }
@@ -64299,7 +66353,7 @@ var ts;
             }
         }
         function visitMergeDeclarationMarker(node) {
-            if (hasAssociatedEndOfDeclarationMarker(node) && node.original.kind === 219) {
+            if (hasAssociatedEndOfDeclarationMarker(node) && node.original.kind === 220) {
                 var id = ts.getOriginalNodeId(node);
                 deferredExports[id] = appendExportsOfVariableStatement(deferredExports[id], node.original);
             }
@@ -64331,10 +66385,10 @@ var ts;
             var namedBindings = importClause.namedBindings;
             if (namedBindings) {
                 switch (namedBindings.kind) {
-                    case 251:
+                    case 252:
                         statements = appendExportsOfDeclaration(statements, namedBindings);
                         break;
-                    case 252:
+                    case 253:
                         for (var _i = 0, _a = namedBindings.elements; _i < _a.length; _i++) {
                             var importBinding = _a[_i];
                             statements = appendExportsOfDeclaration(statements, importBinding);
@@ -64435,14 +66489,14 @@ var ts;
         }
         function modifierVisitor(node) {
             switch (node.kind) {
-                case 85:
-                case 80:
+                case 86:
+                case 81:
                     return undefined;
             }
             return node;
         }
         function onEmitNode(hint, node, emitCallback) {
-            if (node.kind === 284) {
+            if (node.kind === 285) {
                 currentSourceFile = node;
                 currentModuleInfo = moduleInfoMap[ts.getOriginalNodeId(currentSourceFile)];
                 noSubstitution = [];
@@ -64482,12 +66536,12 @@ var ts;
         }
         function substituteExpression(node) {
             switch (node.kind) {
-                case 72:
+                case 73:
                     return substituteExpressionIdentifier(node);
-                case 204:
+                case 205:
                     return substituteBinaryExpression(node);
+                case 204:
                 case 203:
-                case 202:
                     return substituteUnaryExpression(node);
             }
             return node;
@@ -64502,7 +66556,7 @@ var ts;
             }
             if (!ts.isGeneratedIdentifier(node) && !ts.isLocalName(node)) {
                 var exportContainer = resolver.getReferencedExportContainer(node, ts.isExportName(node));
-                if (exportContainer && exportContainer.kind === 284) {
+                if (exportContainer && exportContainer.kind === 285) {
                     return ts.setTextRange(ts.createPropertyAccess(ts.createIdentifier("exports"), ts.getSynthesizedClone(node)), node);
                 }
                 var importDeclaration = resolver.getReferencedImportDeclaration(node);
@@ -64545,8 +66599,8 @@ var ts;
                 && !ts.isDeclarationNameOfEnumOrNamespace(node.operand)) {
                 var exportedNames = getExports(node.operand);
                 if (exportedNames) {
-                    var expression = node.kind === 203
-                        ? ts.setTextRange(ts.createBinary(node.operand, ts.createToken(node.operator === 44 ? 60 : 61), ts.createLiteral(1)), node)
+                    var expression = node.kind === 204
+                        ? ts.setTextRange(ts.createBinary(node.operand, ts.createToken(node.operator === 44 ? 61 : 62), ts.createLiteral(1)), node)
                         : node;
                     for (var _i = 0, exportedNames_3 = exportedNames; _i < exportedNames_3.length; _i++) {
                         var exportName = exportedNames_3[_i];
@@ -64608,12 +66662,12 @@ var ts;
         var previousOnEmitNode = context.onEmitNode;
         context.onSubstituteNode = onSubstituteNode;
         context.onEmitNode = onEmitNode;
-        context.enableSubstitution(72);
-        context.enableSubstitution(276);
-        context.enableSubstitution(204);
-        context.enableSubstitution(202);
+        context.enableSubstitution(73);
+        context.enableSubstitution(277);
+        context.enableSubstitution(205);
         context.enableSubstitution(203);
-        context.enableEmitNotification(284);
+        context.enableSubstitution(204);
+        context.enableEmitNotification(285);
         var moduleInfoMap = [];
         var deferredExports = [];
         var exportFunctionsMap = [];
@@ -64717,7 +66771,7 @@ var ts;
                 var hasExportDeclarationWithExportClause = false;
                 for (var _i = 0, _a = moduleInfo.externalImports; _i < _a.length; _i++) {
                     var externalImport = _a[_i];
-                    if (externalImport.kind === 255 && externalImport.exportClause) {
+                    if (externalImport.kind === 256 && externalImport.exportClause) {
                         hasExportDeclarationWithExportClause = true;
                         break;
                     }
@@ -64740,7 +66794,7 @@ var ts;
             }
             for (var _d = 0, _e = moduleInfo.externalImports; _d < _e.length; _d++) {
                 var externalImport = _e[_d];
-                if (externalImport.kind !== 255) {
+                if (externalImport.kind !== 256) {
                     continue;
                 }
                 if (!externalImport.exportClause) {
@@ -64791,15 +66845,15 @@ var ts;
                     var entry = _b[_a];
                     var importVariableName = ts.getLocalNameForExternalImport(entry, currentSourceFile);
                     switch (entry.kind) {
-                        case 249:
+                        case 250:
                             if (!entry.importClause) {
                                 break;
                             }
-                        case 248:
+                        case 249:
                             ts.Debug.assert(importVariableName !== undefined);
                             statements.push(ts.createExpressionStatement(ts.createAssignment(importVariableName, parameterName)));
                             break;
-                        case 255:
+                        case 256:
                             ts.Debug.assert(importVariableName !== undefined);
                             if (entry.exportClause) {
                                 var properties = [];
@@ -64821,13 +66875,13 @@ var ts;
         }
         function sourceElementVisitor(node) {
             switch (node.kind) {
-                case 249:
+                case 250:
                     return visitImportDeclaration(node);
-                case 248:
+                case 249:
                     return visitImportEqualsDeclaration(node);
-                case 255:
+                case 256:
                     return undefined;
-                case 254:
+                case 255:
                     return visitExportAssignment(node);
                 default:
                     return nestedElementVisitor(node);
@@ -64948,7 +67002,7 @@ var ts;
         }
         function shouldHoistVariableDeclarationList(node) {
             return (ts.getEmitFlags(node) & 2097152) === 0
-                && (enclosingBlockScopedContainer.kind === 284
+                && (enclosingBlockScopedContainer.kind === 285
                     || (ts.getOriginalNode(node).flags & 3) === 0);
         }
         function transformInitializedVariable(node, isExportedDeclaration) {
@@ -64970,7 +67024,7 @@ var ts;
                 : preventSubstitution(ts.setTextRange(ts.createAssignment(name, value), location));
         }
         function visitMergeDeclarationMarker(node) {
-            if (hasAssociatedEndOfDeclarationMarker(node) && node.original.kind === 219) {
+            if (hasAssociatedEndOfDeclarationMarker(node) && node.original.kind === 220) {
                 var id = ts.getOriginalNodeId(node);
                 var isExportedDeclaration = ts.hasModifier(node.original, 1);
                 deferredExports[id] = appendExportsOfVariableStatement(deferredExports[id], node.original, isExportedDeclaration);
@@ -65009,10 +67063,10 @@ var ts;
             var namedBindings = importClause.namedBindings;
             if (namedBindings) {
                 switch (namedBindings.kind) {
-                    case 251:
+                    case 252:
                         statements = appendExportsOfDeclaration(statements, namedBindings);
                         break;
-                    case 252:
+                    case 253:
                         for (var _i = 0, _a = namedBindings.elements; _i < _a.length; _i++) {
                             var importBinding = _a[_i];
                             statements = appendExportsOfDeclaration(statements, importBinding);
@@ -65112,43 +67166,43 @@ var ts;
         }
         function nestedElementVisitor(node) {
             switch (node.kind) {
-                case 219:
+                case 220:
                     return visitVariableStatement(node);
-                case 239:
-                    return visitFunctionDeclaration(node);
                 case 240:
+                    return visitFunctionDeclaration(node);
+                case 241:
                     return visitClassDeclaration(node);
-                case 225:
-                    return visitForStatement(node);
                 case 226:
-                    return visitForInStatement(node);
+                    return visitForStatement(node);
                 case 227:
+                    return visitForInStatement(node);
+                case 228:
                     return visitForOfStatement(node);
-                case 223:
-                    return visitDoStatement(node);
                 case 224:
+                    return visitDoStatement(node);
+                case 225:
                     return visitWhileStatement(node);
-                case 233:
+                case 234:
                     return visitLabeledStatement(node);
-                case 231:
-                    return visitWithStatement(node);
                 case 232:
+                    return visitWithStatement(node);
+                case 233:
                     return visitSwitchStatement(node);
-                case 246:
+                case 247:
                     return visitCaseBlock(node);
-                case 271:
-                    return visitCaseClause(node);
                 case 272:
+                    return visitCaseClause(node);
+                case 273:
                     return visitDefaultClause(node);
-                case 235:
+                case 236:
                     return visitTryStatement(node);
-                case 274:
+                case 275:
                     return visitCatchClause(node);
-                case 218:
+                case 219:
                     return visitBlock(node);
-                case 315:
+                case 317:
                     return visitMergeDeclarationMarker(node);
-                case 316:
+                case 318:
                     return visitEndOfDeclarationMarker(node);
                 default:
                     return destructuringAndImportCallVisitor(node);
@@ -65284,7 +67338,7 @@ var ts;
             }
             else if (ts.isIdentifier(node)) {
                 var container = resolver.getReferencedExportContainer(node);
-                return container !== undefined && container.kind === 284;
+                return container !== undefined && container.kind === 285;
             }
             else {
                 return false;
@@ -65292,14 +67346,14 @@ var ts;
         }
         function modifierVisitor(node) {
             switch (node.kind) {
-                case 85:
-                case 80:
+                case 86:
+                case 81:
                     return undefined;
             }
             return node;
         }
         function onEmitNode(hint, node, emitCallback) {
-            if (node.kind === 284) {
+            if (node.kind === 285) {
                 var id = ts.getOriginalNodeId(node);
                 currentSourceFile = node;
                 moduleInfo = moduleInfoMap[id];
@@ -65333,7 +67387,7 @@ var ts;
         }
         function substituteUnspecified(node) {
             switch (node.kind) {
-                case 276:
+                case 277:
                     return substituteShorthandPropertyAssignment(node);
             }
             return node;
@@ -65355,12 +67409,12 @@ var ts;
         }
         function substituteExpression(node) {
             switch (node.kind) {
-                case 72:
+                case 73:
                     return substituteExpressionIdentifier(node);
-                case 204:
+                case 205:
                     return substituteBinaryExpression(node);
-                case 202:
                 case 203:
+                case 204:
                     return substituteUnaryExpression(node);
             }
             return node;
@@ -65412,14 +67466,14 @@ var ts;
                 && !ts.isDeclarationNameOfEnumOrNamespace(node.operand)) {
                 var exportedNames = getExports(node.operand);
                 if (exportedNames) {
-                    var expression = node.kind === 203
+                    var expression = node.kind === 204
                         ? ts.setTextRange(ts.createPrefix(node.operator, node.operand), node)
                         : node;
                     for (var _i = 0, exportedNames_5 = exportedNames; _i < exportedNames_5.length; _i++) {
                         var exportName = exportedNames_5[_i];
                         expression = createExportExpression(exportName, preventSubstitution(expression));
                     }
-                    if (node.kind === 203) {
+                    if (node.kind === 204) {
                         expression = node.operator === 44
                             ? ts.createSubtract(preventSubstitution(expression), ts.createLiteral(1))
                             : ts.createAdd(preventSubstitution(expression), ts.createLiteral(1));
@@ -65436,7 +67490,7 @@ var ts;
                     || resolver.getReferencedValueDeclaration(name);
                 if (valueDeclaration) {
                     var exportContainer = resolver.getReferencedExportContainer(name, false);
-                    if (exportContainer && exportContainer.kind === 284) {
+                    if (exportContainer && exportContainer.kind === 285) {
                         exportedNames = ts.append(exportedNames, ts.getDeclarationName(valueDeclaration));
                     }
                     exportedNames = ts.addRange(exportedNames, moduleInfo && moduleInfo.exportedBindings[ts.getOriginalNodeId(valueDeclaration)]);
@@ -65464,8 +67518,8 @@ var ts;
         var previousOnSubstituteNode = context.onSubstituteNode;
         context.onEmitNode = onEmitNode;
         context.onSubstituteNode = onSubstituteNode;
-        context.enableEmitNotification(284);
-        context.enableSubstitution(72);
+        context.enableEmitNotification(285);
+        context.enableSubstitution(73);
         var currentSourceFile;
         return ts.chainBundle(transformSourceFile);
         function transformSourceFile(node) {
@@ -65491,9 +67545,9 @@ var ts;
         }
         function visitor(node) {
             switch (node.kind) {
-                case 248:
+                case 249:
                     return undefined;
-                case 254:
+                case 255:
                     return visitExportAssignment(node);
             }
             return node;
@@ -65580,7 +67634,7 @@ var ts;
                         ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 :
                     ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_private_name_1;
             }
-            else if (node.parent.kind === 240) {
+            else if (node.parent.kind === 241) {
                 return symbolAccessibilityResult.errorModuleName ?
                     symbolAccessibilityResult.accessibility === 2 ?
                         ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
@@ -65609,7 +67663,7 @@ var ts;
                         ts.Diagnostics.Public_static_method_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 :
                     ts.Diagnostics.Public_static_method_0_of_exported_class_has_or_is_using_private_name_1;
             }
-            else if (node.parent.kind === 240) {
+            else if (node.parent.kind === 241) {
                 return symbolAccessibilityResult.errorModuleName ?
                     symbolAccessibilityResult.accessibility === 2 ?
                         ts.Diagnostics.Public_method_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
@@ -65656,15 +67710,15 @@ var ts;
             return ts.Debug.assertNever(node, "Attempted to set a declaration diagnostic context for unhandled node kind: " + ts.SyntaxKind[node.kind]);
         }
         function getVariableDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult) {
-            if (node.kind === 237 || node.kind === 186) {
+            if (node.kind === 238 || node.kind === 187) {
                 return symbolAccessibilityResult.errorModuleName ?
                     symbolAccessibilityResult.accessibility === 2 ?
                         ts.Diagnostics.Exported_variable_0_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
                         ts.Diagnostics.Exported_variable_0_has_or_is_using_name_1_from_private_module_2 :
                     ts.Diagnostics.Exported_variable_0_has_or_is_using_private_name_1;
             }
-            else if (node.kind === 154 || node.kind === 189 || node.kind === 153 ||
-                (node.kind === 151 && ts.hasModifier(node.parent, 8))) {
+            else if (node.kind === 155 || node.kind === 190 || node.kind === 154 ||
+                (node.kind === 152 && ts.hasModifier(node.parent, 8))) {
                 if (ts.hasModifier(node, 32)) {
                     return symbolAccessibilityResult.errorModuleName ?
                         symbolAccessibilityResult.accessibility === 2 ?
@@ -65672,7 +67726,7 @@ var ts;
                             ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 :
                         ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_private_name_1;
                 }
-                else if (node.parent.kind === 240 || node.kind === 151) {
+                else if (node.parent.kind === 241 || node.kind === 152) {
                     return symbolAccessibilityResult.errorModuleName ?
                         symbolAccessibilityResult.accessibility === 2 ?
                             ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
@@ -65696,7 +67750,7 @@ var ts;
         }
         function getAccessorDeclarationTypeVisibilityError(symbolAccessibilityResult) {
             var diagnosticMessage;
-            if (node.kind === 159) {
+            if (node.kind === 160) {
                 if (ts.hasModifier(node, 32)) {
                     diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                         ts.Diagnostics.Parameter_type_of_public_static_setter_0_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
@@ -65733,23 +67787,23 @@ var ts;
         function getReturnTypeVisibilityError(symbolAccessibilityResult) {
             var diagnosticMessage;
             switch (node.kind) {
-                case 161:
+                case 162:
                     diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                         ts.Diagnostics.Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 :
                         ts.Diagnostics.Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_0;
                     break;
-                case 160:
+                case 161:
                     diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                         ts.Diagnostics.Return_type_of_call_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 :
                         ts.Diagnostics.Return_type_of_call_signature_from_exported_interface_has_or_is_using_private_name_0;
                     break;
-                case 162:
+                case 163:
                     diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                         ts.Diagnostics.Return_type_of_index_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 :
                         ts.Diagnostics.Return_type_of_index_signature_from_exported_interface_has_or_is_using_private_name_0;
                     break;
+                case 157:
                 case 156:
-                case 155:
                     if (ts.hasModifier(node, 32)) {
                         diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                             symbolAccessibilityResult.accessibility === 2 ?
@@ -65757,7 +67811,7 @@ var ts;
                                 ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_private_module_1 :
                             ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_private_name_0;
                     }
-                    else if (node.parent.kind === 240) {
+                    else if (node.parent.kind === 241) {
                         diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                             symbolAccessibilityResult.accessibility === 2 ?
                                 ts.Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named :
@@ -65770,7 +67824,7 @@ var ts;
                             ts.Diagnostics.Return_type_of_method_from_exported_interface_has_or_is_using_private_name_0;
                     }
                     break;
-                case 239:
+                case 240:
                     diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                         symbolAccessibilityResult.accessibility === 2 ?
                             ts.Diagnostics.Return_type_of_exported_function_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named :
@@ -65795,27 +67849,27 @@ var ts;
         }
         function getParameterDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult) {
             switch (node.parent.kind) {
-                case 157:
+                case 158:
                     return symbolAccessibilityResult.errorModuleName ?
                         symbolAccessibilityResult.accessibility === 2 ?
                             ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
                             ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
                         ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_private_name_1;
-                case 161:
-                case 166:
+                case 162:
+                case 167:
                     return symbolAccessibilityResult.errorModuleName ?
                         ts.Diagnostics.Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 :
                         ts.Diagnostics.Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1;
-                case 160:
+                case 161:
                     return symbolAccessibilityResult.errorModuleName ?
                         ts.Diagnostics.Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 :
                         ts.Diagnostics.Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1;
-                case 162:
+                case 163:
                     return symbolAccessibilityResult.errorModuleName ?
                         ts.Diagnostics.Parameter_0_of_index_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 :
                         ts.Diagnostics.Parameter_0_of_index_signature_from_exported_interface_has_or_is_using_private_name_1;
+                case 157:
                 case 156:
-                case 155:
                     if (ts.hasModifier(node.parent, 32)) {
                         return symbolAccessibilityResult.errorModuleName ?
                             symbolAccessibilityResult.accessibility === 2 ?
@@ -65823,7 +67877,7 @@ var ts;
                                 ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
                             ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1;
                     }
-                    else if (node.parent.parent.kind === 240) {
+                    else if (node.parent.parent.kind === 241) {
                         return symbolAccessibilityResult.errorModuleName ?
                             symbolAccessibilityResult.accessibility === 2 ?
                                 ts.Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
@@ -65835,8 +67889,8 @@ var ts;
                             ts.Diagnostics.Parameter_0_of_method_from_exported_interface_has_or_is_using_name_1_from_private_module_2 :
                             ts.Diagnostics.Parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1;
                     }
-                case 239:
-                case 165:
+                case 240:
+                case 166:
                     return symbolAccessibilityResult.errorModuleName ?
                         symbolAccessibilityResult.accessibility === 2 ?
                             ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
@@ -65849,39 +67903,39 @@ var ts;
         function getTypeParameterConstraintVisibilityError() {
             var diagnosticMessage;
             switch (node.parent.kind) {
-                case 240:
+                case 241:
                     diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_class_has_or_is_using_private_name_1;
                     break;
-                case 241:
+                case 242:
                     diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1;
                     break;
-                case 181:
+                case 182:
                     diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_mapped_object_type_is_using_private_name_1;
                     break;
-                case 166:
-                case 161:
+                case 167:
+                case 162:
                     diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1;
                     break;
-                case 160:
+                case 161:
                     diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1;
                     break;
+                case 157:
                 case 156:
-                case 155:
                     if (ts.hasModifier(node.parent, 32)) {
                         diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1;
                     }
-                    else if (node.parent.parent.kind === 240) {
+                    else if (node.parent.parent.kind === 241) {
                         diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1;
                     }
                     else {
                         diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1;
                     }
                     break;
-                case 165:
-                case 239:
+                case 166:
+                case 240:
                     diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_function_has_or_is_using_private_name_1;
                     break;
-                case 242:
+                case 243:
                     diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_type_alias_has_or_is_using_private_name_1;
                     break;
                 default:
@@ -65895,8 +67949,8 @@ var ts;
         }
         function getHeritageClauseVisibilityError() {
             var diagnosticMessage;
-            if (node.parent.parent.kind === 240) {
-                diagnosticMessage = ts.isHeritageClause(node.parent) && node.parent.token === 109 ?
+            if (node.parent.parent.kind === 241) {
+                diagnosticMessage = ts.isHeritageClause(node.parent) && node.parent.token === 110 ?
                     ts.Diagnostics.Implements_clause_of_exported_class_0_has_or_is_using_private_name_1 :
                     ts.Diagnostics.extends_clause_of_exported_class_0_has_or_is_using_private_name_1;
             }
@@ -65937,12 +67991,24 @@ var ts;
         return result.diagnostics;
     }
     ts.getDeclarationDiagnostics = getDeclarationDiagnostics;
+    function hasInternalAnnotation(range, currentSourceFile) {
+        var comment = currentSourceFile.text.substring(range.pos, range.end);
+        return ts.stringContains(comment, "@internal");
+    }
     function isInternalDeclaration(node, currentSourceFile) {
         var parseTreeNode = ts.getParseTreeNode(node);
+        if (parseTreeNode && parseTreeNode.kind === 152) {
+            var paramIdx = parseTreeNode.parent.parameters.indexOf(parseTreeNode);
+            var previousSibling = paramIdx > 0 ? parseTreeNode.parent.parameters[paramIdx - 1] : undefined;
+            var text = currentSourceFile.text;
+            var commentRanges = previousSibling
+                ? ts.concatenate(ts.getTrailingCommentRanges(text, ts.skipTrivia(text, previousSibling.end + 1, false, true)), ts.getLeadingCommentRanges(text, node.pos))
+                : ts.getTrailingCommentRanges(text, ts.skipTrivia(text, node.pos, false, true));
+            return commentRanges && commentRanges.length && hasInternalAnnotation(ts.last(commentRanges), currentSourceFile);
+        }
         var leadingCommentRanges = parseTreeNode && ts.getLeadingCommentRangesOfNode(parseTreeNode, currentSourceFile);
         return !!ts.forEach(leadingCommentRanges, function (range) {
-            var comment = currentSourceFile.text.substring(range.pos, range.end);
-            return ts.stringContains(comment, "@internal");
+            return hasInternalAnnotation(range, currentSourceFile);
         });
     }
     ts.isInternalDeclaration = isInternalDeclaration;
@@ -66062,11 +68128,14 @@ var ts;
                 context.addDiagnostic(ts.createDiagnosticForNode(errorNameNode, ts.Diagnostics.The_inferred_type_of_0_cannot_be_named_without_a_reference_to_1_This_is_likely_not_portable_A_type_annotation_is_necessary, ts.declarationNameToString(errorNameNode), specifier));
             }
         }
+        function createEmptyExports() {
+            return ts.createExportDeclaration(undefined, undefined, ts.createNamedExports([]), undefined);
+        }
         function transformRoot(node) {
-            if (node.kind === 284 && (node.isDeclarationFile || ts.isSourceFileJS(node))) {
+            if (node.kind === 285 && (node.isDeclarationFile || ts.isSourceFileJS(node))) {
                 return node;
             }
-            if (node.kind === 285) {
+            if (node.kind === 286) {
                 isBundledEmit = true;
                 refs = ts.createMap();
                 libs = ts.createMap();
@@ -66089,14 +68158,14 @@ var ts;
                         resultHasExternalModuleIndicator = false;
                         needsDeclare = false;
                         var statements_4 = ts.visitNodes(sourceFile.statements, visitDeclarationStatements);
-                        var newFile = ts.updateSourceFileNode(sourceFile, [ts.createModuleDeclaration([], [ts.createModifier(125)], ts.createLiteral(ts.getResolvedExternalModuleName(context.getEmitHost(), sourceFile)), ts.createModuleBlock(ts.setTextRange(ts.createNodeArray(transformAndReplaceLatePaintedStatements(statements_4)), sourceFile.statements)))], true, [], [], false, []);
+                        var newFile = ts.updateSourceFileNode(sourceFile, [ts.createModuleDeclaration([], [ts.createModifier(126)], ts.createLiteral(ts.getResolvedExternalModuleName(context.getEmitHost(), sourceFile)), ts.createModuleBlock(ts.setTextRange(ts.createNodeArray(transformAndReplaceLatePaintedStatements(statements_4)), sourceFile.statements)))], true, [], [], false, []);
                         return newFile;
                     }
                     needsDeclare = true;
                     var updated = ts.visitNodes(sourceFile.statements, visitDeclarationStatements);
                     return ts.updateSourceFileNode(sourceFile, transformAndReplaceLatePaintedStatements(updated), true, [], [], false, []);
                 }), ts.mapDefined(node.prepends, function (prepend) {
-                    if (prepend.kind === 287) {
+                    if (prepend.kind === 288) {
                         var sourceFile = ts.createUnparsedSourceFile(prepend, "dts", stripInternal);
                         hasNoDefaultLib_1 = hasNoDefaultLib_1 || !!sourceFile.hasNoDefaultLib;
                         collectReferences(sourceFile, refs);
@@ -66137,7 +68206,7 @@ var ts;
             refs.forEach(referenceVisitor);
             var emittedImports = ts.filter(combinedStatements, ts.isAnyImportSyntax);
             if (ts.isExternalModule(node) && (!resultHasExternalModuleIndicator || (needsScopeFixMarker && !resultHasScopeMarker))) {
-                combinedStatements = ts.setTextRange(ts.createNodeArray(combinedStatements.concat([ts.createExportDeclaration(undefined, undefined, ts.createNamedExports([]), undefined)])), combinedStatements);
+                combinedStatements = ts.setTextRange(ts.createNodeArray(combinedStatements.concat([createEmptyExports()])), combinedStatements);
             }
             var updated = ts.updateSourceFileNode(node, combinedStatements, true, references, getFileReferencesForUsedTypeReferences(), node.hasNoDefaultLib, getLibReferences());
             updated.exportedModulesFromDeclarationEmit = exportedModulesFromDeclarationEmit;
@@ -66194,7 +68263,7 @@ var ts;
             if (noResolve || (!ts.isUnparsedSource(sourceFile) && ts.isSourceFileJS(sourceFile)))
                 return ret;
             ts.forEach(sourceFile.referencedFiles, function (f) {
-                var elem = ts.tryResolveScriptReference(host, sourceFile, f);
+                var elem = host.getSourceFileFromReference(sourceFile, f);
                 if (elem) {
                     ret.set("" + ts.getOriginalNodeId(elem), elem);
                 }
@@ -66211,11 +68280,11 @@ var ts;
             return ret;
         }
         function filterBindingPatternInitializers(name) {
-            if (name.kind === 72) {
+            if (name.kind === 73) {
                 return name;
             }
             else {
-                if (name.kind === 185) {
+                if (name.kind === 186) {
                     return ts.updateArrayBindingPattern(name, ts.visitNodes(name.elements, visitBindingElement));
                 }
                 else {
@@ -66223,7 +68292,7 @@ var ts;
                 }
             }
             function visitBindingElement(elem) {
-                if (elem.kind === 210) {
+                if (elem.kind === 211) {
                     return elem;
                 }
                 return ts.updateBindingElement(elem, elem.dotDotDotToken, elem.propertyName, filterBindingPatternInitializers(elem.name), shouldPrintWithInitializer(elem) ? elem.initializer : undefined);
@@ -66257,17 +68326,17 @@ var ts;
             if (shouldPrintWithInitializer(node)) {
                 return;
             }
-            var shouldUseResolverType = node.kind === 151 &&
+            var shouldUseResolverType = node.kind === 152 &&
                 (resolver.isRequiredInitializedParameter(node) ||
                     resolver.isOptionalUninitializedParameterProperty(node));
             if (type && !shouldUseResolverType) {
                 return ts.visitNode(type, visitDeclarationSubtree);
             }
             if (!ts.getParseTreeNode(node)) {
-                return type ? ts.visitNode(type, visitDeclarationSubtree) : ts.createKeywordTypeNode(120);
+                return type ? ts.visitNode(type, visitDeclarationSubtree) : ts.createKeywordTypeNode(121);
             }
-            if (node.kind === 159) {
-                return ts.createKeywordTypeNode(120);
+            if (node.kind === 160) {
+                return ts.createKeywordTypeNode(121);
             }
             errorNameNode = node.name;
             var oldDiag;
@@ -66275,12 +68344,12 @@ var ts;
                 oldDiag = getSymbolAccessibilityDiagnostic;
                 getSymbolAccessibilityDiagnostic = ts.createGetSymbolAccessibilityDiagnosticForNode(node);
             }
-            if (node.kind === 237 || node.kind === 186) {
+            if (node.kind === 238 || node.kind === 187) {
                 return cleanup(resolver.createTypeOfDeclaration(node, enclosingDeclaration, declarationEmitNodeBuilderFlags, symbolTracker));
             }
-            if (node.kind === 151
-                || node.kind === 154
-                || node.kind === 153) {
+            if (node.kind === 152
+                || node.kind === 155
+                || node.kind === 154) {
                 if (!node.initializer)
                     return cleanup(resolver.createTypeOfDeclaration(node, enclosingDeclaration, declarationEmitNodeBuilderFlags, symbolTracker, shouldUseResolverType));
                 return cleanup(resolver.createTypeOfDeclaration(node, enclosingDeclaration, declarationEmitNodeBuilderFlags, symbolTracker, shouldUseResolverType) || resolver.createTypeOfExpression(node.initializer, enclosingDeclaration, declarationEmitNodeBuilderFlags, symbolTracker));
@@ -66291,25 +68360,25 @@ var ts;
                 if (!suppressNewDiagnosticContexts) {
                     getSymbolAccessibilityDiagnostic = oldDiag;
                 }
-                return returnValue || ts.createKeywordTypeNode(120);
+                return returnValue || ts.createKeywordTypeNode(121);
             }
         }
         function isDeclarationAndNotVisible(node) {
             node = ts.getParseTreeNode(node);
             switch (node.kind) {
-                case 239:
-                case 244:
-                case 241:
                 case 240:
+                case 245:
                 case 242:
+                case 241:
                 case 243:
+                case 244:
                     return !resolver.isDeclarationVisible(node);
-                case 237:
+                case 238:
                     return !getBindingNameVisible(node);
-                case 248:
                 case 249:
+                case 250:
+                case 256:
                 case 255:
-                case 254:
                     return false;
             }
             return false;
@@ -66362,7 +68431,7 @@ var ts;
         function rewriteModuleSpecifier(parent, input) {
             if (!input)
                 return undefined;
-            resultHasExternalModuleIndicator = resultHasExternalModuleIndicator || (parent.kind !== 244 && parent.kind !== 183);
+            resultHasExternalModuleIndicator = resultHasExternalModuleIndicator || (parent.kind !== 245 && parent.kind !== 184);
             if (ts.isStringLiteralLike(input)) {
                 if (isBundledEmit) {
                     var newName = ts.getExternalModuleNameFromDeclaration(context.getEmitHost(), resolver, parent);
@@ -66382,7 +68451,7 @@ var ts;
         function transformImportEqualsDeclaration(decl) {
             if (!resolver.isDeclarationVisible(decl))
                 return;
-            if (decl.moduleReference.kind === 259) {
+            if (decl.moduleReference.kind === 260) {
                 var specifier = ts.getExternalModuleImportEqualsDeclarationExpression(decl);
                 return ts.updateImportEqualsDeclaration(decl, undefined, decl.modifiers, decl.name, ts.updateExternalModuleReference(decl.moduleReference, rewriteModuleSpecifier(decl, specifier)));
             }
@@ -66402,7 +68471,7 @@ var ts;
             if (!decl.importClause.namedBindings) {
                 return visibleDefaultBinding && ts.updateImportDeclaration(decl, undefined, decl.modifiers, ts.updateImportClause(decl.importClause, visibleDefaultBinding, undefined), rewriteModuleSpecifier(decl, decl.moduleSpecifier));
             }
-            if (decl.importClause.namedBindings.kind === 251) {
+            if (decl.importClause.namedBindings.kind === 252) {
                 var namedBindings = resolver.isDeclarationVisible(decl.importClause.namedBindings) ? decl.importClause.namedBindings : undefined;
                 return visibleDefaultBinding || namedBindings ? ts.updateImportDeclaration(decl, undefined, decl.modifiers, ts.updateImportClause(decl.importClause, visibleDefaultBinding, namedBindings), rewriteModuleSpecifier(decl, decl.moduleSpecifier)) : undefined;
             }
@@ -66419,7 +68488,7 @@ var ts;
                 }
                 var priorNeedsDeclare = needsDeclare;
                 needsDeclare = i.parent && ts.isSourceFile(i.parent) && !(ts.isExternalModule(i.parent) && isBundledEmit);
-                var result = transformTopLevelDeclaration(i, true);
+                var result = transformTopLevelDeclaration(i);
                 needsDeclare = priorNeedsDeclare;
                 lateStatementReplacementMap.set("" + ts.getOriginalNodeId(i), result);
             }
@@ -66430,11 +68499,11 @@ var ts;
                     if (lateStatementReplacementMap.has(key)) {
                         var result = lateStatementReplacementMap.get(key);
                         lateStatementReplacementMap.delete(key);
-                        if (result && ts.isSourceFile(statement.parent)) {
+                        if (result) {
                             if (ts.isArray(result) ? ts.some(result, needsScopeMarker) : needsScopeMarker(result)) {
                                 needsScopeFixMarker = true;
                             }
-                            if (ts.isArray(result) ? ts.some(result, isExternalModuleIndicator) : isExternalModuleIndicator(result)) {
+                            if (ts.isSourceFile(statement.parent) && (ts.isArray(result) ? ts.some(result, isExternalModuleIndicator) : isExternalModuleIndicator(result))) {
                                 resultHasExternalModuleIndicator = true;
                             }
                         }
@@ -66485,61 +68554,61 @@ var ts;
                 checkEntityNameVisibility(input.exprName, enclosingDeclaration);
             }
             var oldWithinObjectLiteralType = suppressNewDiagnosticContexts;
-            var shouldEnterSuppressNewDiagnosticsContextContext = ((input.kind === 168 || input.kind === 181) && input.parent.kind !== 242);
+            var shouldEnterSuppressNewDiagnosticsContextContext = ((input.kind === 169 || input.kind === 182) && input.parent.kind !== 243);
             if (shouldEnterSuppressNewDiagnosticsContextContext) {
                 suppressNewDiagnosticContexts = true;
             }
             if (isProcessedComponent(input)) {
                 switch (input.kind) {
-                    case 211: {
+                    case 212: {
                         if ((ts.isEntityName(input.expression) || ts.isEntityNameExpression(input.expression))) {
                             checkEntityNameVisibility(input.expression, enclosingDeclaration);
                         }
                         var node = ts.visitEachChild(input, visitDeclarationSubtree, context);
                         return cleanup(ts.updateExpressionWithTypeArguments(node, ts.parenthesizeTypeParameters(node.typeArguments), node.expression));
                     }
-                    case 164: {
+                    case 165: {
                         checkEntityNameVisibility(input.typeName, enclosingDeclaration);
                         var node = ts.visitEachChild(input, visitDeclarationSubtree, context);
                         return cleanup(ts.updateTypeReferenceNode(node, node.typeName, ts.parenthesizeTypeParameters(node.typeArguments)));
                     }
-                    case 161:
+                    case 162:
                         return cleanup(ts.updateConstructSignature(input, ensureTypeParams(input, input.typeParameters), updateParamsList(input, input.parameters), ensureType(input, input.type)));
-                    case 157: {
+                    case 158: {
                         var isPrivate = ts.hasModifier(input, 8);
-                        var ctor = ts.createSignatureDeclaration(157, isPrivate ? undefined : ensureTypeParams(input, input.typeParameters), isPrivate ? undefined : updateParamsList(input, input.parameters, 0), undefined);
+                        var ctor = ts.createSignatureDeclaration(158, isPrivate ? undefined : ensureTypeParams(input, input.typeParameters), isPrivate ? undefined : updateParamsList(input, input.parameters, 0), undefined);
                         ctor.modifiers = ts.createNodeArray(ensureModifiers(input));
                         return cleanup(ctor);
                     }
-                    case 156: {
-                        var sig = ts.createSignatureDeclaration(155, ensureTypeParams(input, input.typeParameters), updateParamsList(input, input.parameters), ensureType(input, input.type));
+                    case 157: {
+                        var sig = ts.createSignatureDeclaration(156, ensureTypeParams(input, input.typeParameters), updateParamsList(input, input.parameters), ensureType(input, input.type));
                         sig.name = input.name;
                         sig.modifiers = ts.createNodeArray(ensureModifiers(input));
                         sig.questionToken = input.questionToken;
                         return cleanup(sig);
                     }
-                    case 158: {
-                        var newNode = ensureAccessor(input);
-                        return cleanup(newNode);
-                    }
                     case 159: {
                         var newNode = ensureAccessor(input);
                         return cleanup(newNode);
                     }
-                    case 154:
+                    case 160: {
+                        var newNode = ensureAccessor(input);
+                        return cleanup(newNode);
+                    }
+                    case 155:
                         return cleanup(ts.updateProperty(input, undefined, ensureModifiers(input), input.name, input.questionToken, !ts.hasModifier(input, 8) ? ensureType(input, input.type) : undefined, ensureNoInitializer(input)));
-                    case 153:
+                    case 154:
                         return cleanup(ts.updatePropertySignature(input, ensureModifiers(input), input.name, input.questionToken, !ts.hasModifier(input, 8) ? ensureType(input, input.type) : undefined, ensureNoInitializer(input)));
-                    case 155: {
+                    case 156: {
                         return cleanup(ts.updateMethodSignature(input, ensureTypeParams(input, input.typeParameters), updateParamsList(input, input.parameters), ensureType(input, input.type), input.name, input.questionToken));
                     }
-                    case 160: {
+                    case 161: {
                         return cleanup(ts.updateCallSignature(input, ensureTypeParams(input, input.typeParameters), updateParamsList(input, input.parameters), ensureType(input, input.type)));
                     }
-                    case 162: {
-                        return cleanup(ts.updateIndexSignature(input, undefined, ensureModifiers(input), updateParamsList(input, input.parameters), ts.visitNode(input.type, visitDeclarationSubtree) || ts.createKeywordTypeNode(120)));
+                    case 163: {
+                        return cleanup(ts.updateIndexSignature(input, undefined, ensureModifiers(input), updateParamsList(input, input.parameters), ts.visitNode(input.type, visitDeclarationSubtree) || ts.createKeywordTypeNode(121)));
                     }
-                    case 237: {
+                    case 238: {
                         if (ts.isBindingPattern(input.name)) {
                             return recreateBindingPattern(input.name);
                         }
@@ -66547,13 +68616,13 @@ var ts;
                         suppressNewDiagnosticContexts = true;
                         return cleanup(ts.updateVariableDeclaration(input, input.name, ensureType(input, input.type), ensureNoInitializer(input)));
                     }
-                    case 150: {
+                    case 151: {
                         if (isPrivateMethodTypeParameter(input) && (input.default || input.constraint)) {
                             return cleanup(ts.updateTypeParameterDeclaration(input, input.name, undefined, undefined));
                         }
                         return cleanup(ts.visitEachChild(input, visitDeclarationSubtree, context));
                     }
-                    case 175: {
+                    case 176: {
                         var checkType = ts.visitNode(input.checkType, visitDeclarationSubtree);
                         var extendsType = ts.visitNode(input.extendsType, visitDeclarationSubtree);
                         var oldEnclosingDecl = enclosingDeclaration;
@@ -66563,13 +68632,13 @@ var ts;
                         var falseType = ts.visitNode(input.falseType, visitDeclarationSubtree);
                         return cleanup(ts.updateConditionalTypeNode(input, checkType, extendsType, trueType, falseType));
                     }
-                    case 165: {
+                    case 166: {
                         return cleanup(ts.updateFunctionTypeNode(input, ts.visitNodes(input.typeParameters, visitDeclarationSubtree), updateParamsList(input, input.parameters), ts.visitNode(input.type, visitDeclarationSubtree)));
                     }
-                    case 166: {
+                    case 167: {
                         return cleanup(ts.updateConstructorTypeNode(input, ts.visitNodes(input.typeParameters, visitDeclarationSubtree), updateParamsList(input, input.parameters), ts.visitNode(input.type, visitDeclarationSubtree)));
                     }
-                    case 183: {
+                    case 184: {
                         if (!ts.isLiteralImportTypeNode(input))
                             return cleanup(input);
                         return cleanup(ts.updateImportTypeNode(input, ts.updateLiteralTypeNode(input.argument, rewriteModuleSpecifier(input, input.argument.literal)), input.qualifier, ts.visitNodes(input.typeArguments, visitDeclarationSubtree, ts.isTypeNode), input.isTypeOf));
@@ -66598,7 +68667,7 @@ var ts;
             }
         }
         function isPrivateMethodTypeParameter(node) {
-            return node.parent.kind === 156 && ts.hasModifier(node.parent, 8);
+            return node.parent.kind === 157 && ts.hasModifier(node.parent, 8);
         }
         function visitDeclarationStatements(input) {
             if (!isPreservedDeclarationStatement(input)) {
@@ -66607,19 +68676,19 @@ var ts;
             if (shouldStripInternal(input))
                 return;
             switch (input.kind) {
+                case 256: {
+                    if (ts.isSourceFile(input.parent)) {
+                        resultHasExternalModuleIndicator = true;
+                    }
+                    resultHasScopeMarker = true;
+                    return ts.updateExportDeclaration(input, undefined, input.modifiers, input.exportClause, rewriteModuleSpecifier(input, input.moduleSpecifier));
+                }
                 case 255: {
                     if (ts.isSourceFile(input.parent)) {
                         resultHasExternalModuleIndicator = true;
-                        resultHasScopeMarker = true;
                     }
-                    return ts.updateExportDeclaration(input, undefined, input.modifiers, input.exportClause, rewriteModuleSpecifier(input, input.moduleSpecifier));
-                }
-                case 254: {
-                    if (ts.isSourceFile(input.parent)) {
-                        resultHasExternalModuleIndicator = true;
-                        resultHasScopeMarker = true;
-                    }
-                    if (input.expression.kind === 72) {
+                    resultHasScopeMarker = true;
+                    if (input.expression.kind === 73) {
                         return input;
                     }
                     else {
@@ -66629,7 +68698,7 @@ var ts;
                             errorNode: input
                         }); };
                         var varDecl = ts.createVariableDeclaration(newId, resolver.createTypeOfExpression(input.expression, input, declarationEmitNodeBuilderFlags, symbolTracker), undefined);
-                        var statement = ts.createVariableStatement(needsDeclare ? [ts.createModifier(125)] : [], ts.createVariableDeclarationList([varDecl], 2));
+                        var statement = ts.createVariableStatement(needsDeclare ? [ts.createModifier(126)] : [], ts.createVariableDeclarationList([varDecl], 2));
                         return [statement, ts.updateExportAssignment(input, input.decorators, input.modifiers, newId)];
                     }
                 }
@@ -66638,14 +68707,23 @@ var ts;
             lateStatementReplacementMap.set("" + ts.getOriginalNodeId(input), result);
             return input;
         }
-        function transformTopLevelDeclaration(input, isPrivate) {
+        function stripExportModifiers(statement) {
+            if (ts.isImportEqualsDeclaration(statement) || ts.hasModifier(statement, 512)) {
+                return statement;
+            }
+            var clone = ts.getMutableClone(statement);
+            var modifiers = ts.createModifiersFromModifierFlags(ts.getModifierFlags(statement) & (3071 ^ 1));
+            clone.modifiers = modifiers.length ? ts.createNodeArray(modifiers) : undefined;
+            return clone;
+        }
+        function transformTopLevelDeclaration(input) {
             if (shouldStripInternal(input))
                 return;
             switch (input.kind) {
-                case 248: {
+                case 249: {
                     return transformImportEqualsDeclaration(input);
                 }
-                case 249: {
+                case 250: {
                     return transformImportDeclaration(input);
                 }
             }
@@ -66665,44 +68743,79 @@ var ts;
             }
             var previousNeedsDeclare = needsDeclare;
             switch (input.kind) {
-                case 242:
-                    return cleanup(ts.updateTypeAliasDeclaration(input, undefined, ensureModifiers(input, isPrivate), input.name, ts.visitNodes(input.typeParameters, visitDeclarationSubtree, ts.isTypeParameterDeclaration), ts.visitNode(input.type, visitDeclarationSubtree, ts.isTypeNode)));
-                case 241: {
-                    return cleanup(ts.updateInterfaceDeclaration(input, undefined, ensureModifiers(input, isPrivate), input.name, ensureTypeParams(input, input.typeParameters), transformHeritageClauses(input.heritageClauses), ts.visitNodes(input.members, visitDeclarationSubtree)));
+                case 243:
+                    return cleanup(ts.updateTypeAliasDeclaration(input, undefined, ensureModifiers(input), input.name, ts.visitNodes(input.typeParameters, visitDeclarationSubtree, ts.isTypeParameterDeclaration), ts.visitNode(input.type, visitDeclarationSubtree, ts.isTypeNode)));
+                case 242: {
+                    return cleanup(ts.updateInterfaceDeclaration(input, undefined, ensureModifiers(input), input.name, ensureTypeParams(input, input.typeParameters), transformHeritageClauses(input.heritageClauses), ts.visitNodes(input.members, visitDeclarationSubtree)));
                 }
-                case 239: {
-                    var clean = cleanup(ts.updateFunctionDeclaration(input, undefined, ensureModifiers(input, isPrivate), undefined, input.name, ensureTypeParams(input, input.typeParameters), updateParamsList(input, input.parameters), ensureType(input, input.type), undefined));
+                case 240: {
+                    var clean = cleanup(ts.updateFunctionDeclaration(input, undefined, ensureModifiers(input), undefined, input.name, ensureTypeParams(input, input.typeParameters), updateParamsList(input, input.parameters), ensureType(input, input.type), undefined));
                     if (clean && resolver.isExpandoFunctionDeclaration(input)) {
-                        var declarations = ts.mapDefined(resolver.getPropertiesOfContainerFunction(input), function (p) {
+                        var props = resolver.getPropertiesOfContainerFunction(input);
+                        var fakespace_1 = ts.createModuleDeclaration(undefined, undefined, clean.name || ts.createIdentifier("_default"), ts.createModuleBlock([]), 16);
+                        fakespace_1.flags ^= 8;
+                        fakespace_1.parent = enclosingDeclaration;
+                        fakespace_1.locals = ts.createSymbolTable(props);
+                        fakespace_1.symbol = props[0].parent;
+                        var declarations = ts.mapDefined(props, function (p) {
                             if (!ts.isPropertyAccessExpression(p.valueDeclaration)) {
                                 return undefined;
                             }
                             getSymbolAccessibilityDiagnostic = ts.createGetSymbolAccessibilityDiagnosticForNode(p.valueDeclaration);
-                            var type = resolver.createTypeOfDeclaration(p.valueDeclaration, enclosingDeclaration, declarationEmitNodeBuilderFlags, symbolTracker);
+                            var type = resolver.createTypeOfDeclaration(p.valueDeclaration, fakespace_1, declarationEmitNodeBuilderFlags, symbolTracker);
                             getSymbolAccessibilityDiagnostic = oldDiag;
                             var varDecl = ts.createVariableDeclaration(ts.unescapeLeadingUnderscores(p.escapedName), type, undefined);
                             return ts.createVariableStatement(undefined, ts.createVariableDeclarationList([varDecl]));
                         });
-                        var namespaceDecl = ts.createModuleDeclaration(undefined, ensureModifiers(input, isPrivate), input.name, ts.createModuleBlock(declarations), 16);
-                        return [clean, namespaceDecl];
+                        var namespaceDecl = ts.createModuleDeclaration(undefined, ensureModifiers(input), input.name, ts.createModuleBlock(declarations), 16);
+                        if (!ts.hasModifier(clean, 512)) {
+                            return [clean, namespaceDecl];
+                        }
+                        var modifiers = ts.createModifiersFromModifierFlags((ts.getModifierFlags(clean) & ~513) | 2);
+                        var cleanDeclaration = ts.updateFunctionDeclaration(clean, undefined, modifiers, undefined, clean.name, clean.typeParameters, clean.parameters, clean.type, undefined);
+                        var namespaceDeclaration = ts.updateModuleDeclaration(namespaceDecl, undefined, modifiers, namespaceDecl.name, namespaceDecl.body);
+                        var exportDefaultDeclaration = ts.createExportAssignment(undefined, undefined, false, namespaceDecl.name);
+                        if (ts.isSourceFile(input.parent)) {
+                            resultHasExternalModuleIndicator = true;
+                        }
+                        resultHasScopeMarker = true;
+                        return [cleanDeclaration, namespaceDeclaration, exportDefaultDeclaration];
                     }
                     else {
                         return clean;
                     }
                 }
-                case 244: {
+                case 245: {
                     needsDeclare = false;
                     var inner = input.body;
-                    if (inner && inner.kind === 245) {
+                    if (inner && inner.kind === 246) {
+                        var oldNeedsScopeFix = needsScopeFixMarker;
+                        var oldHasScopeFix = resultHasScopeMarker;
+                        resultHasScopeMarker = false;
+                        needsScopeFixMarker = false;
                         var statements = ts.visitNodes(inner.statements, visitDeclarationStatements);
-                        var body = ts.updateModuleBlock(inner, transformAndReplaceLatePaintedStatements(statements));
+                        var lateStatements = transformAndReplaceLatePaintedStatements(statements);
+                        if (input.flags & 4194304) {
+                            needsScopeFixMarker = false;
+                        }
+                        if (!ts.isGlobalScopeAugmentation(input) && !hasScopeMarker(lateStatements) && !resultHasScopeMarker) {
+                            if (needsScopeFixMarker) {
+                                lateStatements = ts.createNodeArray(lateStatements.concat([createEmptyExports()]));
+                            }
+                            else {
+                                lateStatements = ts.visitNodes(lateStatements, stripExportModifiers);
+                            }
+                        }
+                        var body = ts.updateModuleBlock(inner, lateStatements);
                         needsDeclare = previousNeedsDeclare;
-                        var mods = ensureModifiers(input, isPrivate);
+                        needsScopeFixMarker = oldNeedsScopeFix;
+                        resultHasScopeMarker = oldHasScopeFix;
+                        var mods = ensureModifiers(input);
                         return cleanup(ts.updateModuleDeclaration(input, undefined, mods, ts.isExternalModuleAugmentation(input) ? rewriteModuleSpecifier(input, input.name) : input.name, body));
                     }
                     else {
                         needsDeclare = previousNeedsDeclare;
-                        var mods = ensureModifiers(input, isPrivate);
+                        var mods = ensureModifiers(input);
                         needsDeclare = false;
                         ts.visitNode(inner, visitDeclarationStatements);
                         var id = "" + ts.getOriginalNodeId(inner);
@@ -66711,18 +68824,18 @@ var ts;
                         return cleanup(ts.updateModuleDeclaration(input, undefined, mods, input.name, body));
                     }
                 }
-                case 240: {
-                    var modifiers = ts.createNodeArray(ensureModifiers(input, isPrivate));
+                case 241: {
+                    var modifiers = ts.createNodeArray(ensureModifiers(input));
                     var typeParameters = ensureTypeParams(input, input.typeParameters);
                     var ctor = ts.getFirstConstructorWithBody(input);
                     var parameterProperties = void 0;
                     if (ctor) {
                         var oldDiag_1 = getSymbolAccessibilityDiagnostic;
                         parameterProperties = ts.compact(ts.flatMap(ctor.parameters, function (param) {
-                            if (!ts.hasModifier(param, 92))
+                            if (!ts.hasModifier(param, 92) || shouldStripInternal(param))
                                 return;
                             getSymbolAccessibilityDiagnostic = ts.createGetSymbolAccessibilityDiagnosticForNode(param);
-                            if (param.name.kind === 72) {
+                            if (param.name.kind === 73) {
                                 return preserveJsDoc(ts.createProperty(undefined, ensureModifiers(param), param.name, param.questionToken, ensureType(param, param.type), ensureNoInitializer(param)), param);
                             }
                             else {
@@ -66747,7 +68860,7 @@ var ts;
                     }
                     var members = ts.createNodeArray(ts.concatenate(parameterProperties, ts.visitNodes(input.members, visitDeclarationSubtree)));
                     var extendsClause_1 = ts.getEffectiveBaseTypeNode(input);
-                    if (extendsClause_1 && !ts.isEntityNameExpression(extendsClause_1.expression) && extendsClause_1.expression.kind !== 96) {
+                    if (extendsClause_1 && !ts.isEntityNameExpression(extendsClause_1.expression) && extendsClause_1.expression.kind !== 97) {
                         var oldId = input.name ? ts.unescapeLeadingUnderscores(input.name.escapedText) : "default";
                         var newId_1 = ts.createOptimisticUniqueName(oldId + "_base");
                         getSymbolAccessibilityDiagnostic = function () { return ({
@@ -66756,16 +68869,16 @@ var ts;
                             typeName: input.name
                         }); };
                         var varDecl = ts.createVariableDeclaration(newId_1, resolver.createTypeOfExpression(extendsClause_1.expression, input, declarationEmitNodeBuilderFlags, symbolTracker), undefined);
-                        var statement = ts.createVariableStatement(needsDeclare ? [ts.createModifier(125)] : [], ts.createVariableDeclarationList([varDecl], 2));
+                        var statement = ts.createVariableStatement(needsDeclare ? [ts.createModifier(126)] : [], ts.createVariableDeclarationList([varDecl], 2));
                         var heritageClauses = ts.createNodeArray(ts.map(input.heritageClauses, function (clause) {
-                            if (clause.token === 86) {
+                            if (clause.token === 87) {
                                 var oldDiag_2 = getSymbolAccessibilityDiagnostic;
                                 getSymbolAccessibilityDiagnostic = ts.createGetSymbolAccessibilityDiagnosticForNode(clause.types[0]);
                                 var newClause = ts.updateHeritageClause(clause, ts.map(clause.types, function (t) { return ts.updateExpressionWithTypeArguments(t, ts.visitNodes(t.typeArguments, visitDeclarationSubtree), newId_1); }));
                                 getSymbolAccessibilityDiagnostic = oldDiag_2;
                                 return newClause;
                             }
-                            return ts.updateHeritageClause(clause, ts.visitNodes(ts.createNodeArray(ts.filter(clause.types, function (t) { return ts.isEntityNameExpression(t.expression) || t.expression.kind === 96; })), visitDeclarationSubtree));
+                            return ts.updateHeritageClause(clause, ts.visitNodes(ts.createNodeArray(ts.filter(clause.types, function (t) { return ts.isEntityNameExpression(t.expression) || t.expression.kind === 97; })), visitDeclarationSubtree));
                         }));
                         return [statement, cleanup(ts.updateClassDeclaration(input, undefined, modifiers, input.name, typeParameters, heritageClauses, members))];
                     }
@@ -66774,11 +68887,11 @@ var ts;
                         return cleanup(ts.updateClassDeclaration(input, undefined, modifiers, input.name, typeParameters, heritageClauses, members));
                     }
                 }
-                case 219: {
-                    return cleanup(transformVariableStatement(input, isPrivate));
+                case 220: {
+                    return cleanup(transformVariableStatement(input));
                 }
-                case 243: {
-                    return cleanup(ts.updateEnumDeclaration(input, undefined, ts.createNodeArray(ensureModifiers(input, isPrivate)), input.name, ts.createNodeArray(ts.mapDefined(input.members, function (m) {
+                case 244: {
+                    return cleanup(ts.updateEnumDeclaration(input, undefined, ts.createNodeArray(ensureModifiers(input)), input.name, ts.createNodeArray(ts.mapDefined(input.members, function (m) {
                         if (shouldStripInternal(m))
                             return;
                         var constValue = resolver.getConstantValue(m);
@@ -66794,7 +68907,7 @@ var ts;
                 if (canProdiceDiagnostic) {
                     getSymbolAccessibilityDiagnostic = oldDiag;
                 }
-                if (input.kind === 244) {
+                if (input.kind === 245) {
                     needsDeclare = previousNeedsDeclare;
                 }
                 if (node === input) {
@@ -66803,19 +68916,19 @@ var ts;
                 return node && ts.setOriginalNode(preserveJsDoc(node, input), input);
             }
         }
-        function transformVariableStatement(input, privateDeclaration) {
+        function transformVariableStatement(input) {
             if (!ts.forEach(input.declarationList.declarations, getBindingNameVisible))
                 return;
             var nodes = ts.visitNodes(input.declarationList.declarations, visitDeclarationSubtree);
             if (!ts.length(nodes))
                 return;
-            return ts.updateVariableStatement(input, ts.createNodeArray(ensureModifiers(input, privateDeclaration)), ts.updateVariableDeclarationList(input.declarationList, nodes));
+            return ts.updateVariableStatement(input, ts.createNodeArray(ensureModifiers(input)), ts.updateVariableDeclarationList(input.declarationList, nodes));
         }
         function recreateBindingPattern(d) {
             return ts.flatten(ts.mapDefined(d.elements, function (e) { return recreateBindingElement(e); }));
         }
         function recreateBindingElement(e) {
-            if (e.kind === 210) {
+            if (e.kind === 211) {
                 return;
             }
             if (e.name) {
@@ -66851,26 +68964,23 @@ var ts;
         function isScopeMarker(node) {
             return ts.isExportAssignment(node) || ts.isExportDeclaration(node);
         }
-        function hasScopeMarker(node) {
-            if (ts.isModuleBlock(node)) {
-                return ts.some(node.statements, isScopeMarker);
-            }
-            return false;
+        function hasScopeMarker(statements) {
+            return ts.some(statements, isScopeMarker);
         }
-        function ensureModifiers(node, privateDeclaration) {
+        function ensureModifiers(node) {
             var currentFlags = ts.getModifierFlags(node);
-            var newFlags = ensureModifierFlags(node, privateDeclaration);
+            var newFlags = ensureModifierFlags(node);
             if (currentFlags === newFlags) {
                 return node.modifiers;
             }
             return ts.createModifiersFromModifierFlags(newFlags);
         }
-        function ensureModifierFlags(node, privateDeclaration) {
+        function ensureModifierFlags(node) {
             var mask = 3071 ^ (4 | 256);
             var additions = (needsDeclare && !isAlwaysType(node)) ? 2 : 0;
-            var parentIsFile = node.parent.kind === 284;
+            var parentIsFile = node.parent.kind === 285;
             if (!parentIsFile || (isBundledEmit && parentIsFile && ts.isExternalModule(node.parent))) {
-                mask ^= ((privateDeclaration || (isBundledEmit && parentIsFile) || hasScopeMarker(node.parent) ? 0 : 1) | 2);
+                mask ^= 2;
                 additions = 0;
             }
             return maskModifierFlags(node, mask, additions);
@@ -66888,7 +68998,7 @@ var ts;
             var prop = ts.createProperty(undefined, maskModifiers(node, undefined, (!accessors.setAccessor) ? 64 : 0), node.name, node.questionToken, ensureType(node, accessorType), undefined);
             var leadingsSyntheticCommentRanges = accessors.secondAccessor && ts.getLeadingCommentRangesOfNode(accessors.secondAccessor, currentSourceFile);
             if (leadingsSyntheticCommentRanges) {
-                var _loop_10 = function (range) {
+                var _loop_15 = function (range) {
                     if (range.kind === 3) {
                         var text = currentSourceFile.text.slice(range.pos + 2, range.end - 2);
                         var lines = text.split(/\r\n?|\n/g);
@@ -66902,20 +69012,20 @@ var ts;
                 };
                 for (var _i = 0, leadingsSyntheticCommentRanges_1 = leadingsSyntheticCommentRanges; _i < leadingsSyntheticCommentRanges_1.length; _i++) {
                     var range = leadingsSyntheticCommentRanges_1[_i];
-                    _loop_10(range);
+                    _loop_15(range);
                 }
             }
             return prop;
         }
         function transformHeritageClauses(nodes) {
             return ts.createNodeArray(ts.filter(ts.map(nodes, function (clause) { return ts.updateHeritageClause(clause, ts.visitNodes(ts.createNodeArray(ts.filter(clause.types, function (t) {
-                return ts.isEntityNameExpression(t.expression) || (clause.token === 86 && t.expression.kind === 96);
+                return ts.isEntityNameExpression(t.expression) || (clause.token === 87 && t.expression.kind === 97);
             })), visitDeclarationSubtree)); }), function (clause) { return clause.types && !!clause.types.length; }));
         }
     }
     ts.transformDeclarations = transformDeclarations;
     function isAlwaysType(node) {
-        if (node.kind === 241) {
+        if (node.kind === 242) {
             return true;
         }
         return false;
@@ -66937,7 +69047,7 @@ var ts;
     }
     function getTypeAnnotationFromAccessor(accessor) {
         if (accessor) {
-            return accessor.kind === 158
+            return accessor.kind === 159
                 ? accessor.type
                 : accessor.parameters.length > 0
                     ? accessor.parameters[0].type
@@ -66946,52 +69056,52 @@ var ts;
     }
     function canHaveLiteralInitializer(node) {
         switch (node.kind) {
+            case 155:
             case 154:
-            case 153:
                 return !ts.hasModifier(node, 8);
-            case 151:
-            case 237:
+            case 152:
+            case 238:
                 return true;
         }
         return false;
     }
     function isPreservedDeclarationStatement(node) {
         switch (node.kind) {
-            case 239:
-            case 244:
-            case 248:
-            case 241:
             case 240:
-            case 242:
-            case 243:
-            case 219:
+            case 245:
             case 249:
+            case 242:
+            case 241:
+            case 243:
+            case 244:
+            case 220:
+            case 250:
+            case 256:
             case 255:
-            case 254:
                 return true;
         }
         return false;
     }
     function isProcessedComponent(node) {
         switch (node.kind) {
-            case 161:
-            case 157:
-            case 156:
-            case 158:
-            case 159:
-            case 154:
-            case 153:
-            case 155:
-            case 160:
             case 162:
-            case 237:
-            case 150:
-            case 211:
-            case 164:
-            case 175:
+            case 158:
+            case 157:
+            case 159:
+            case 160:
+            case 155:
+            case 154:
+            case 156:
+            case 161:
+            case 163:
+            case 238:
+            case 151:
+            case 212:
             case 165:
+            case 176:
             case 166:
-            case 183:
+            case 167:
+            case 184:
                 return true;
         }
         return false;
@@ -67010,17 +69120,28 @@ var ts;
                 return ts.transformModule;
         }
     }
-    function getTransformers(compilerOptions, customTransformers) {
+    ts.noTransformers = { scriptTransformers: ts.emptyArray, declarationTransformers: ts.emptyArray };
+    function getTransformers(compilerOptions, customTransformers, emitOnlyDtsFiles) {
+        return {
+            scriptTransformers: getScriptTransformers(compilerOptions, customTransformers, emitOnlyDtsFiles),
+            declarationTransformers: getDeclarationTransformers(customTransformers),
+        };
+    }
+    ts.getTransformers = getTransformers;
+    function getScriptTransformers(compilerOptions, customTransformers, emitOnlyDtsFiles) {
+        if (emitOnlyDtsFiles)
+            return ts.emptyArray;
         var jsx = compilerOptions.jsx;
         var languageVersion = ts.getEmitScriptTarget(compilerOptions);
         var moduleKind = ts.getEmitModuleKind(compilerOptions);
         var transformers = [];
-        ts.addRange(transformers, customTransformers && customTransformers.before);
+        ts.addRange(transformers, customTransformers && ts.map(customTransformers.before, wrapScriptTransformerFactory));
         transformers.push(ts.transformTypeScript);
+        transformers.push(ts.transformClassFields);
         if (jsx === 2) {
             transformers.push(ts.transformJsx);
         }
-        if (languageVersion < 7) {
+        if (languageVersion < 99) {
             transformers.push(ts.transformESNext);
         }
         if (languageVersion < 6) {
@@ -67043,10 +69164,32 @@ var ts;
         if (languageVersion < 1) {
             transformers.push(ts.transformES5);
         }
-        ts.addRange(transformers, customTransformers && customTransformers.after);
+        ts.addRange(transformers, customTransformers && ts.map(customTransformers.after, wrapScriptTransformerFactory));
         return transformers;
     }
-    ts.getTransformers = getTransformers;
+    function getDeclarationTransformers(customTransformers) {
+        var transformers = [];
+        transformers.push(ts.transformDeclarations);
+        ts.addRange(transformers, customTransformers && ts.map(customTransformers.afterDeclarations, wrapDeclarationTransformerFactory));
+        return transformers;
+    }
+    function wrapCustomTransformer(transformer) {
+        return function (node) { return ts.isBundle(node) ? transformer.transformBundle(node) : transformer.transformSourceFile(node); };
+    }
+    function wrapCustomTransformerFactory(transformer, handleDefault) {
+        return function (context) {
+            var customTransformer = transformer(context);
+            return typeof customTransformer === "function"
+                ? handleDefault(customTransformer)
+                : wrapCustomTransformer(customTransformer);
+        };
+    }
+    function wrapScriptTransformerFactory(transformer) {
+        return wrapCustomTransformerFactory(transformer, ts.chainBundle);
+    }
+    function wrapDeclarationTransformerFactory(transformer) {
+        return wrapCustomTransformerFactory(transformer, ts.identity);
+    }
     function noEmitSubstitution(_hint, node) {
         return node;
     }
@@ -67056,7 +69199,7 @@ var ts;
     }
     ts.noEmitNotification = noEmitNotification;
     function transformNodes(resolver, host, options, nodes, transformers, allowDtsFiles) {
-        var enabledSyntaxKindFeatures = new Array(317);
+        var enabledSyntaxKindFeatures = new Array(319);
         var lexicalEnvironmentVariableDeclarations;
         var lexicalEnvironmentFunctionDeclarations;
         var lexicalEnvironmentVariableDeclarationsStack = [];
@@ -67105,7 +69248,14 @@ var ts;
             ts.disposeEmitNodes(ts.getSourceFileOfNode(ts.getParseTreeNode(node)));
         }
         ts.performance.mark("beforeTransform");
-        var transformation = ts.chain.apply(void 0, transformers)(context);
+        var transformersWithContext = transformers.map(function (t) { return t(context); });
+        var transformation = function (node) {
+            for (var _i = 0, transformersWithContext_1 = transformersWithContext; _i < transformersWithContext_1.length; _i++) {
+                var transform = transformersWithContext_1[_i];
+                node = transform(node);
+            }
+            return node;
+        };
         state = 1;
         var transformed = ts.map(nodes, allowDtsFiles ? transformation : transformRoot);
         state = 2;
@@ -67206,6 +69356,7 @@ var ts;
                 }
                 if (lexicalEnvironmentVariableDeclarations) {
                     var statement = ts.createVariableStatement(undefined, ts.createVariableDeclarationList(lexicalEnvironmentVariableDeclarations));
+                    ts.setEmitFlags(statement, 1048576);
                     if (!statements) {
                         statements = [statement];
                     }
@@ -67297,7 +69448,7 @@ var ts;
     ts.forEachEmittedFile = forEachEmittedFile;
     function getOutputPathForBuildInfo(options) {
         var configFile = options.configFilePath;
-        if (!configFile || !ts.isIncrementalCompilation(options))
+        if (!ts.isIncrementalCompilation(options))
             return undefined;
         if (options.tsBuildInfoFile)
             return options.tsBuildInfoFile;
@@ -67307,6 +69458,8 @@ var ts;
             buildInfoExtensionLess = ts.removeFileExtension(outPath);
         }
         else {
+            if (!configFile)
+                return undefined;
             var configFileExtensionLess = ts.removeFileExtension(configFile);
             buildInfoExtensionLess = options.outDir ?
                 options.rootDir ?
@@ -67329,7 +69482,7 @@ var ts;
     ts.getOutputPathsForBundle = getOutputPathsForBundle;
     function getOutputPathsFor(sourceFile, host, forceDtsPaths) {
         var options = host.getCompilerOptions();
-        if (sourceFile.kind === 285) {
+        if (sourceFile.kind === 286) {
             return getOutputPathsForBundle(options, forceDtsPaths);
         }
         else {
@@ -67365,14 +69518,94 @@ var ts;
         return ".js";
     }
     ts.getOutputExtension = getOutputExtension;
-    function emitFiles(resolver, host, targetSourceFile, emitOnlyDtsFiles, transformers, declarationTransformers, onlyBuildInfo) {
+    function rootDirOfOptions(configFile) {
+        return configFile.options.rootDir || ts.getDirectoryPath(ts.Debug.assertDefined(configFile.options.configFilePath));
+    }
+    function getOutputPathWithoutChangingExt(inputFileName, configFile, ignoreCase, outputDir) {
+        return outputDir ?
+            ts.resolvePath(outputDir, ts.getRelativePathFromDirectory(rootDirOfOptions(configFile), inputFileName, ignoreCase)) :
+            inputFileName;
+    }
+    function getOutputDeclarationFileName(inputFileName, configFile, ignoreCase) {
+        ts.Debug.assert(!ts.fileExtensionIs(inputFileName, ".d.ts") && ts.hasTSFileExtension(inputFileName));
+        return ts.changeExtension(getOutputPathWithoutChangingExt(inputFileName, configFile, ignoreCase, configFile.options.declarationDir || configFile.options.outDir), ".d.ts");
+    }
+    ts.getOutputDeclarationFileName = getOutputDeclarationFileName;
+    function getOutputJSFileName(inputFileName, configFile, ignoreCase) {
+        var isJsonFile = ts.fileExtensionIs(inputFileName, ".json");
+        var outputFileName = ts.changeExtension(getOutputPathWithoutChangingExt(inputFileName, configFile, ignoreCase, configFile.options.outDir), isJsonFile ?
+            ".json" :
+            ts.fileExtensionIs(inputFileName, ".tsx") && configFile.options.jsx === 1 ?
+                ".jsx" :
+                ".js");
+        return !isJsonFile || ts.comparePaths(inputFileName, outputFileName, ts.Debug.assertDefined(configFile.options.configFilePath), ignoreCase) !== 0 ?
+            outputFileName :
+            undefined;
+    }
+    function getAllProjectOutputs(configFile, ignoreCase) {
+        var outputs;
+        var addOutput = function (path) { return path && (outputs || (outputs = [])).push(path); };
+        if (configFile.options.outFile || configFile.options.out) {
+            var _a = getOutputPathsForBundle(configFile.options, false), jsFilePath = _a.jsFilePath, sourceMapFilePath = _a.sourceMapFilePath, declarationFilePath = _a.declarationFilePath, declarationMapPath = _a.declarationMapPath, buildInfoPath = _a.buildInfoPath;
+            addOutput(jsFilePath);
+            addOutput(sourceMapFilePath);
+            addOutput(declarationFilePath);
+            addOutput(declarationMapPath);
+            addOutput(buildInfoPath);
+        }
+        else {
+            for (var _b = 0, _c = configFile.fileNames; _b < _c.length; _b++) {
+                var inputFileName = _c[_b];
+                if (ts.fileExtensionIs(inputFileName, ".d.ts"))
+                    continue;
+                var js = getOutputJSFileName(inputFileName, configFile, ignoreCase);
+                addOutput(js);
+                if (ts.fileExtensionIs(inputFileName, ".json"))
+                    continue;
+                if (configFile.options.sourceMap) {
+                    addOutput(js + ".map");
+                }
+                if (ts.getEmitDeclarations(configFile.options) && ts.hasTSFileExtension(inputFileName)) {
+                    var dts = getOutputDeclarationFileName(inputFileName, configFile, ignoreCase);
+                    addOutput(dts);
+                    if (configFile.options.declarationMap) {
+                        addOutput(dts + ".map");
+                    }
+                }
+            }
+            addOutput(getOutputPathForBuildInfo(configFile.options));
+        }
+        return outputs || ts.emptyArray;
+    }
+    ts.getAllProjectOutputs = getAllProjectOutputs;
+    function getFirstProjectOutput(configFile, ignoreCase) {
+        if (configFile.options.outFile || configFile.options.out) {
+            var jsFilePath = getOutputPathsForBundle(configFile.options, false).jsFilePath;
+            return ts.Debug.assertDefined(jsFilePath, "project " + configFile.options.configFilePath + " expected to have at least one output");
+        }
+        for (var _a = 0, _b = configFile.fileNames; _a < _b.length; _a++) {
+            var inputFileName = _b[_a];
+            if (ts.fileExtensionIs(inputFileName, ".d.ts"))
+                continue;
+            var jsFilePath = getOutputJSFileName(inputFileName, configFile, ignoreCase);
+            if (jsFilePath)
+                return jsFilePath;
+        }
+        var buildInfoPath = getOutputPathForBuildInfo(configFile.options);
+        if (buildInfoPath)
+            return buildInfoPath;
+        return ts.Debug.fail("project " + configFile.options.configFilePath + " expected to have at least one output");
+    }
+    ts.getFirstProjectOutput = getFirstProjectOutput;
+    function emitFiles(resolver, host, targetSourceFile, _a, emitOnlyDtsFiles, onlyBuildInfo) {
+        var scriptTransformers = _a.scriptTransformers, declarationTransformers = _a.declarationTransformers;
         var compilerOptions = host.getCompilerOptions();
         var sourceMapDataList = (compilerOptions.sourceMap || compilerOptions.inlineSourceMap || ts.getAreDeclarationMapsEnabled(compilerOptions)) ? [] : undefined;
         var emittedFilesList = compilerOptions.listEmittedFiles ? [] : undefined;
         var emitterDiagnostics = ts.createDiagnosticCollection();
         var newLine = ts.getNewLineCharacter(compilerOptions, function () { return host.getNewLine(); });
         var writer = ts.createTextWriter(newLine);
-        var _a = ts.performance.createTimer("printTime", "beforePrint", "afterPrint"), enter = _a.enter, exit = _a.exit;
+        var _b = ts.performance.createTimer("printTime", "beforePrint", "afterPrint"), enter = _b.enter, exit = _b.exit;
         var bundleBuildInfo;
         var emitSkipped = false;
         var exportedModulesFromDeclarationEmit;
@@ -67388,14 +69621,16 @@ var ts;
         };
         function emitSourceFileOrBundle(_a, sourceFileOrBundle) {
             var jsFilePath = _a.jsFilePath, sourceMapFilePath = _a.sourceMapFilePath, declarationFilePath = _a.declarationFilePath, declarationMapPath = _a.declarationMapPath, buildInfoPath = _a.buildInfoPath;
+            var buildInfoDirectory;
             if (buildInfoPath && sourceFileOrBundle && ts.isBundle(sourceFileOrBundle)) {
+                buildInfoDirectory = ts.getDirectoryPath(ts.getNormalizedAbsolutePath(buildInfoPath, host.getCurrentDirectory()));
                 bundleBuildInfo = {
-                    commonSourceDirectory: host.getCommonSourceDirectory(),
-                    sourceFiles: sourceFileOrBundle.sourceFiles.map(function (file) { return file.fileName; })
+                    commonSourceDirectory: relativeToBuildInfo(host.getCommonSourceDirectory()),
+                    sourceFiles: sourceFileOrBundle.sourceFiles.map(function (file) { return relativeToBuildInfo(ts.getNormalizedAbsolutePath(file.fileName, host.getCurrentDirectory())); })
                 };
             }
-            emitJsFileOrBundle(sourceFileOrBundle, jsFilePath, sourceMapFilePath);
-            emitDeclarationFileOrBundle(sourceFileOrBundle, declarationFilePath, declarationMapPath);
+            emitJsFileOrBundle(sourceFileOrBundle, jsFilePath, sourceMapFilePath, relativeToBuildInfo);
+            emitDeclarationFileOrBundle(sourceFileOrBundle, declarationFilePath, declarationMapPath, relativeToBuildInfo);
             emitBuildInfo(bundleBuildInfo, buildInfoPath);
             if (!emitSkipped && emittedFilesList) {
                 if (!emitOnlyDtsFiles) {
@@ -67416,20 +69651,21 @@ var ts;
                     emittedFilesList.push(declarationMapPath);
                 }
             }
+            function relativeToBuildInfo(path) {
+                return ts.ensurePathIsNonModuleName(ts.getRelativePathFromDirectory(buildInfoDirectory, path, host.getCanonicalFileName));
+            }
         }
         function emitBuildInfo(bundle, buildInfoPath) {
             if (!buildInfoPath || targetSourceFile || emitSkipped)
                 return;
             var program = host.getProgramBuildInfo();
-            if (!bundle && !program)
-                return;
             if (host.isEmitBlocked(buildInfoPath) || compilerOptions.noEmit) {
                 emitSkipped = true;
                 return;
             }
             ts.writeFile(host, emitterDiagnostics, buildInfoPath, getBuildInfoText({ bundle: bundle, program: program, version: ts.version }), false);
         }
-        function emitJsFileOrBundle(sourceFileOrBundle, jsFilePath, sourceMapFilePath) {
+        function emitJsFileOrBundle(sourceFileOrBundle, jsFilePath, sourceMapFilePath, relativeToBuildInfo) {
             if (!sourceFileOrBundle || emitOnlyDtsFiles || !jsFilePath) {
                 return;
             }
@@ -67437,7 +69673,7 @@ var ts;
                 emitSkipped = true;
                 return;
             }
-            var transform = ts.transformNodes(resolver, host, compilerOptions, [sourceFileOrBundle], transformers, false);
+            var transform = ts.transformNodes(resolver, host, compilerOptions, [sourceFileOrBundle], scriptTransformers, false);
             var printerOptions = {
                 removeComments: compilerOptions.removeComments,
                 newLine: compilerOptions.newLine,
@@ -67448,7 +69684,8 @@ var ts;
                 inlineSourceMap: compilerOptions.inlineSourceMap,
                 inlineSources: compilerOptions.inlineSources,
                 extendedDiagnostics: compilerOptions.extendedDiagnostics,
-                writeBundleFileInfo: !!bundleBuildInfo
+                writeBundleFileInfo: !!bundleBuildInfo,
+                relativeToBuildInfo: relativeToBuildInfo
             };
             var printer = createPrinter(printerOptions, {
                 hasGlobalName: resolver.hasGlobalName,
@@ -67461,7 +69698,7 @@ var ts;
             if (bundleBuildInfo)
                 bundleBuildInfo.js = printer.bundleFileInfo;
         }
-        function emitDeclarationFileOrBundle(sourceFileOrBundle, declarationFilePath, declarationMapPath) {
+        function emitDeclarationFileOrBundle(sourceFileOrBundle, declarationFilePath, declarationMapPath, relativeToBuildInfo) {
             if (!sourceFileOrBundle || !(declarationFilePath && !ts.isInJSFile(sourceFileOrBundle))) {
                 return;
             }
@@ -67471,7 +69708,7 @@ var ts;
             if (emitOnlyDtsFiles && !ts.getEmitDeclarations(compilerOptions)) {
                 nonJsFiles.forEach(collectLinkedAliases);
             }
-            var declarationTransform = ts.transformNodes(resolver, host, compilerOptions, inputListOrBundle, ts.concatenate([ts.transformDeclarations], declarationTransformers), false);
+            var declarationTransform = ts.transformNodes(resolver, host, compilerOptions, inputListOrBundle, declarationTransformers, false);
             if (ts.length(declarationTransform.diagnostics)) {
                 for (var _a = 0, _b = declarationTransform.diagnostics; _a < _b.length; _a++) {
                     var diagnostic = _b[_a];
@@ -67489,7 +69726,8 @@ var ts;
                 extendedDiagnostics: compilerOptions.extendedDiagnostics,
                 onlyPrintJsDocStyle: true,
                 writeBundleFileInfo: !!bundleBuildInfo,
-                recordInternalSection: !!bundleBuildInfo
+                recordInternalSection: !!bundleBuildInfo,
+                relativeToBuildInfo: relativeToBuildInfo
             };
             var declarationPrinter = createPrinter(printerOptions, {
                 hasGlobalName: resolver.hasGlobalName,
@@ -67506,7 +69744,7 @@ var ts;
                     mapRoot: compilerOptions.mapRoot,
                     extendedDiagnostics: compilerOptions.extendedDiagnostics,
                 });
-                if (emitOnlyDtsFiles && declarationTransform.transformed[0].kind === 284) {
+                if (emitOnlyDtsFiles && declarationTransform.transformed[0].kind === 285) {
                     var sourceFile = declarationTransform.transformed[0];
                     exportedModulesFromDeclarationEmit = sourceFile.exportedModulesFromDeclarationEmit;
                 }
@@ -67517,7 +69755,7 @@ var ts;
         }
         function collectLinkedAliases(node) {
             if (ts.isExportAssignment(node)) {
-                if (node.expression.kind === 72) {
+                if (node.expression.kind === 73) {
                     resolver.collectLinkedAliases(node.expression, true);
                 }
                 return;
@@ -67529,8 +69767,8 @@ var ts;
             ts.forEachChild(node, collectLinkedAliases);
         }
         function printSourceFileOrBundle(jsFilePath, sourceMapFilePath, sourceFileOrBundle, printer, mapOptions) {
-            var bundle = sourceFileOrBundle.kind === 285 ? sourceFileOrBundle : undefined;
-            var sourceFile = sourceFileOrBundle.kind === 284 ? sourceFileOrBundle : undefined;
+            var bundle = sourceFileOrBundle.kind === 286 ? sourceFileOrBundle : undefined;
+            var sourceFile = sourceFileOrBundle.kind === 285 ? sourceFileOrBundle : undefined;
             var sourceFiles = bundle ? bundle.sourceFiles : [sourceFile];
             var sourceMapGenerator;
             if (shouldEmitSourceMaps(mapOptions, sourceFileOrBundle)) {
@@ -67568,7 +69806,7 @@ var ts;
         }
         function shouldEmitSourceMaps(mapOptions, sourceFileOrBundle) {
             return (mapOptions.sourceMap || mapOptions.inlineSourceMap)
-                && (sourceFileOrBundle.kind !== 284 || !ts.fileExtensionIs(sourceFileOrBundle.fileName, ".json"));
+                && (sourceFileOrBundle.kind !== 285 || !ts.fileExtensionIs(sourceFileOrBundle.fileName, ".json"));
         }
         function getSourceRoot(mapOptions) {
             var sourceRoot = ts.normalizeSlashes(mapOptions.sourceRoot || "");
@@ -67660,10 +69898,10 @@ var ts;
         getSymbolOfExternalModuleSpecifier: ts.notImplemented,
         isBindingCapturedByNode: ts.notImplemented,
     };
-    function createSourceFilesFromBundleBuildInfo(bundle) {
+    function createSourceFilesFromBundleBuildInfo(bundle, buildInfoDirectory, host) {
         var sourceFiles = bundle.sourceFiles.map(function (fileName) {
-            var sourceFile = ts.createNode(284, 0, 0);
-            sourceFile.fileName = fileName;
+            var sourceFile = ts.createNode(285, 0, 0);
+            sourceFile.fileName = ts.getRelativePathFromDirectory(host.getCurrentDirectory(), ts.getNormalizedAbsolutePath(fileName, buildInfoDirectory), !host.useCaseSensitiveFileNames());
             sourceFile.text = "";
             sourceFile.statements = ts.createNodeArray();
             return sourceFile;
@@ -67674,7 +69912,7 @@ var ts;
             sourceFile.text = prologueInfo.text;
             sourceFile.end = prologueInfo.text.length;
             sourceFile.statements = ts.createNodeArray(prologueInfo.directives.map(function (directive) {
-                var statement = ts.createNode(221, directive.pos, directive.end);
+                var statement = ts.createNode(222, directive.pos, directive.end);
                 statement.expression = ts.createNode(10, directive.expression.pos, directive.expression.end);
                 statement.expression.text = directive.expression.text;
                 return statement;
@@ -67682,7 +69920,7 @@ var ts;
         });
         return sourceFiles;
     }
-    function emitUsingBuildInfo(config, host, getCommandLine) {
+    function emitUsingBuildInfo(config, host, getCommandLine, customTransformers) {
         var _a = getOutputPathsForBundle(config.options, false), buildInfoPath = _a.buildInfoPath, jsFilePath = _a.jsFilePath, sourceMapFilePath = _a.sourceMapFilePath, declarationFilePath = _a.declarationFilePath, declarationMapPath = _a.declarationMapPath;
         var buildInfoText = host.readFile(ts.Debug.assertDefined(buildInfoPath));
         if (!buildInfoText)
@@ -67702,22 +69940,24 @@ var ts;
         var buildInfo = getBuildInfo(buildInfoText);
         if (!buildInfo.bundle || !buildInfo.bundle.js || (declarationText && !buildInfo.bundle.dts))
             return buildInfoPath;
+        var buildInfoDirectory = ts.getDirectoryPath(ts.getNormalizedAbsolutePath(buildInfoPath, host.getCurrentDirectory()));
         var ownPrependInput = ts.createInputFiles(jsFileText, declarationText, sourceMapFilePath, sourceMapText, declarationMapPath, declarationMapText, jsFilePath, declarationFilePath, buildInfoPath, buildInfo, true);
         var outputFiles = [];
         var prependNodes = ts.createPrependNodes(config.projectReferences, getCommandLine, function (f) { return host.readFile(f); });
-        var sourceFilesForJsEmit = createSourceFilesFromBundleBuildInfo(buildInfo.bundle);
+        var sourceFilesForJsEmit = createSourceFilesFromBundleBuildInfo(buildInfo.bundle, buildInfoDirectory, host);
         var emitHost = {
             getPrependNodes: ts.memoize(function () { return prependNodes.concat([ownPrependInput]); }),
             getCanonicalFileName: host.getCanonicalFileName,
-            getCommonSourceDirectory: function () { return buildInfo.bundle.commonSourceDirectory; },
+            getCommonSourceDirectory: function () { return ts.getNormalizedAbsolutePath(buildInfo.bundle.commonSourceDirectory, buildInfoDirectory); },
             getCompilerOptions: function () { return config.options; },
             getCurrentDirectory: function () { return host.getCurrentDirectory(); },
             getNewLine: function () { return host.getNewLine(); },
-            getSourceFile: function () { return undefined; },
-            getSourceFileByPath: function () { return undefined; },
+            getSourceFile: ts.returnUndefined,
+            getSourceFileByPath: ts.returnUndefined,
             getSourceFiles: function () { return sourceFilesForJsEmit; },
             getLibFileFromReference: ts.notImplemented,
             isSourceFileFromExternalLibrary: ts.returnFalse,
+            getResolvedProjectReferenceToRedirect: ts.returnUndefined,
             writeFile: function (name, text, writeByteOrderMark) {
                 switch (name) {
                     case jsFilePath:
@@ -67757,9 +69997,10 @@ var ts;
             fileExists: function (f) { return host.fileExists(f); },
             directoryExists: host.directoryExists && (function (f) { return host.directoryExists(f); }),
             useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); },
-            getProgramBuildInfo: function () { return undefined; }
+            getProgramBuildInfo: ts.returnUndefined,
+            getSourceFileFromReference: ts.returnUndefined,
         };
-        emitFiles(ts.notImplementedResolver, emitHost, undefined, false, ts.getTransformers(config.options));
+        emitFiles(ts.notImplementedResolver, emitHost, undefined, ts.getTransformers(config.options, customTransformers));
         return outputFiles;
     }
     ts.emitUsingBuildInfo = emitUsingBuildInfo;
@@ -67784,6 +70025,7 @@ var ts;
         var write = writeBase;
         var isOwnFileEmit;
         var bundleFileInfo = printerOptions.writeBundleFileInfo ? { sections: [] } : undefined;
+        var relativeToBuildInfo = bundleFileInfo ? ts.Debug.assertDefined(printerOptions.relativeToBuildInfo) : undefined;
         var recordInternalSection = printerOptions.recordInternalSection;
         var sourceFileTextPos = 0;
         var sourceFileTextKind = "text";
@@ -67824,9 +70066,9 @@ var ts;
                     break;
             }
             switch (node.kind) {
-                case 284: return printFile(node);
-                case 285: return printBundle(node);
-                case 286: return printUnparsedSource(node);
+                case 285: return printFile(node);
+                case 286: return printBundle(node);
+                case 287: return printUnparsedSource(node);
             }
             writeNode(hint, node, sourceFile, beginPrint());
             return endPrint();
@@ -67929,7 +70171,13 @@ var ts;
                         (_a = bundleFileInfo.sections).push.apply(_a, newSections);
                     else {
                         newSections.forEach(function (section) { return ts.Debug.assert(ts.isBundleFileTextLike(section)); });
-                        bundleFileInfo.sections.push({ pos: pos, end: writer.getTextPos(), kind: "prepend", data: prepend.fileName, texts: newSections });
+                        bundleFileInfo.sections.push({
+                            pos: pos,
+                            end: writer.getTextPos(),
+                            kind: "prepend",
+                            data: relativeToBuildInfo(prepend.fileName),
+                            texts: newSections
+                        });
                     }
                 }
             }
@@ -68052,11 +70300,11 @@ var ts;
                         return pipelineEmitWithSubstitution;
                     }
                 case 2:
-                    if (!commentsDisabled && node.kind !== 284) {
+                    if (!commentsDisabled && node.kind !== 285) {
                         return pipelineEmitWithComments;
                     }
                 case 3:
-                    if (!sourceMapsDisabled && node.kind !== 284 && !ts.isInJsonFile(node)) {
+                    if (!sourceMapsDisabled && node.kind !== 285 && !ts.isInJsonFile(node)) {
                         return pipelineEmitWithSourceMap;
                     }
                 case 4:
@@ -68091,256 +70339,256 @@ var ts;
                     case 16:
                     case 17:
                         return emitLiteral(node);
-                    case 286:
-                    case 280:
-                        return emitUnparsedSourceOrPrepend(node);
-                    case 279:
-                        return writeUnparsedNode(node);
+                    case 287:
                     case 281:
+                        return emitUnparsedSourceOrPrepend(node);
+                    case 280:
+                        return writeUnparsedNode(node);
                     case 282:
-                        return emitUnparsedTextLike(node);
                     case 283:
+                        return emitUnparsedTextLike(node);
+                    case 284:
                         return emitUnparsedSyntheticReference(node);
-                    case 72:
+                    case 73:
                         return emitIdentifier(node);
-                    case 148:
-                        return emitQualifiedName(node);
                     case 149:
-                        return emitComputedPropertyName(node);
+                        return emitQualifiedName(node);
                     case 150:
-                        return emitTypeParameter(node);
+                        return emitComputedPropertyName(node);
                     case 151:
-                        return emitParameter(node);
+                        return emitTypeParameter(node);
                     case 152:
-                        return emitDecorator(node);
+                        return emitParameter(node);
                     case 153:
-                        return emitPropertySignature(node);
+                        return emitDecorator(node);
                     case 154:
-                        return emitPropertyDeclaration(node);
+                        return emitPropertySignature(node);
                     case 155:
-                        return emitMethodSignature(node);
+                        return emitPropertyDeclaration(node);
                     case 156:
-                        return emitMethodDeclaration(node);
+                        return emitMethodSignature(node);
                     case 157:
-                        return emitConstructor(node);
+                        return emitMethodDeclaration(node);
                     case 158:
+                        return emitConstructor(node);
                     case 159:
-                        return emitAccessorDeclaration(node);
                     case 160:
-                        return emitCallSignature(node);
+                        return emitAccessorDeclaration(node);
                     case 161:
-                        return emitConstructSignature(node);
+                        return emitCallSignature(node);
                     case 162:
-                        return emitIndexSignature(node);
+                        return emitConstructSignature(node);
                     case 163:
-                        return emitTypePredicate(node);
+                        return emitIndexSignature(node);
                     case 164:
-                        return emitTypeReference(node);
+                        return emitTypePredicate(node);
                     case 165:
-                        return emitFunctionType(node);
-                    case 294:
-                        return emitJSDocFunctionType(node);
+                        return emitTypeReference(node);
                     case 166:
-                        return emitConstructorType(node);
+                        return emitFunctionType(node);
+                    case 295:
+                        return emitJSDocFunctionType(node);
                     case 167:
-                        return emitTypeQuery(node);
+                        return emitConstructorType(node);
                     case 168:
-                        return emitTypeLiteral(node);
+                        return emitTypeQuery(node);
                     case 169:
-                        return emitArrayType(node);
+                        return emitTypeLiteral(node);
                     case 170:
-                        return emitTupleType(node);
+                        return emitArrayType(node);
                     case 171:
+                        return emitTupleType(node);
+                    case 172:
                         return emitOptionalType(node);
-                    case 173:
-                        return emitUnionType(node);
                     case 174:
-                        return emitIntersectionType(node);
+                        return emitUnionType(node);
                     case 175:
-                        return emitConditionalType(node);
+                        return emitIntersectionType(node);
                     case 176:
-                        return emitInferType(node);
+                        return emitConditionalType(node);
                     case 177:
-                        return emitParenthesizedType(node);
-                    case 211:
-                        return emitExpressionWithTypeArguments(node);
+                        return emitInferType(node);
                     case 178:
-                        return emitThisType();
+                        return emitParenthesizedType(node);
+                    case 212:
+                        return emitExpressionWithTypeArguments(node);
                     case 179:
-                        return emitTypeOperator(node);
+                        return emitThisType();
                     case 180:
-                        return emitIndexedAccessType(node);
+                        return emitTypeOperator(node);
                     case 181:
-                        return emitMappedType(node);
+                        return emitIndexedAccessType(node);
                     case 182:
-                        return emitLiteralType(node);
+                        return emitMappedType(node);
                     case 183:
+                        return emitLiteralType(node);
+                    case 184:
                         return emitImportTypeNode(node);
-                    case 289:
+                    case 290:
                         writePunctuation("*");
                         return;
-                    case 290:
+                    case 291:
                         writePunctuation("?");
                         return;
-                    case 291:
-                        return emitJSDocNullableType(node);
                     case 292:
-                        return emitJSDocNonNullableType(node);
+                        return emitJSDocNullableType(node);
                     case 293:
+                        return emitJSDocNonNullableType(node);
+                    case 294:
                         return emitJSDocOptionalType(node);
-                    case 172:
-                    case 295:
+                    case 173:
+                    case 296:
                         return emitRestOrJSDocVariadicType(node);
-                    case 184:
-                        return emitObjectBindingPattern(node);
                     case 185:
-                        return emitArrayBindingPattern(node);
+                        return emitObjectBindingPattern(node);
                     case 186:
+                        return emitArrayBindingPattern(node);
+                    case 187:
                         return emitBindingElement(node);
-                    case 216:
-                        return emitTemplateSpan(node);
                     case 217:
-                        return emitSemicolonClassElement();
+                        return emitTemplateSpan(node);
                     case 218:
-                        return emitBlock(node);
+                        return emitSemicolonClassElement();
                     case 219:
-                        return emitVariableStatement(node);
+                        return emitBlock(node);
                     case 220:
-                        return emitEmptyStatement(false);
+                        return emitVariableStatement(node);
                     case 221:
-                        return emitExpressionStatement(node);
+                        return emitEmptyStatement(false);
                     case 222:
-                        return emitIfStatement(node);
+                        return emitExpressionStatement(node);
                     case 223:
-                        return emitDoStatement(node);
+                        return emitIfStatement(node);
                     case 224:
-                        return emitWhileStatement(node);
+                        return emitDoStatement(node);
                     case 225:
-                        return emitForStatement(node);
+                        return emitWhileStatement(node);
                     case 226:
-                        return emitForInStatement(node);
+                        return emitForStatement(node);
                     case 227:
-                        return emitForOfStatement(node);
+                        return emitForInStatement(node);
                     case 228:
-                        return emitContinueStatement(node);
+                        return emitForOfStatement(node);
                     case 229:
-                        return emitBreakStatement(node);
+                        return emitContinueStatement(node);
                     case 230:
-                        return emitReturnStatement(node);
+                        return emitBreakStatement(node);
                     case 231:
-                        return emitWithStatement(node);
+                        return emitReturnStatement(node);
                     case 232:
-                        return emitSwitchStatement(node);
+                        return emitWithStatement(node);
                     case 233:
-                        return emitLabeledStatement(node);
+                        return emitSwitchStatement(node);
                     case 234:
-                        return emitThrowStatement(node);
+                        return emitLabeledStatement(node);
                     case 235:
-                        return emitTryStatement(node);
+                        return emitThrowStatement(node);
                     case 236:
-                        return emitDebuggerStatement(node);
+                        return emitTryStatement(node);
                     case 237:
-                        return emitVariableDeclaration(node);
+                        return emitDebuggerStatement(node);
                     case 238:
-                        return emitVariableDeclarationList(node);
+                        return emitVariableDeclaration(node);
                     case 239:
-                        return emitFunctionDeclaration(node);
+                        return emitVariableDeclarationList(node);
                     case 240:
-                        return emitClassDeclaration(node);
+                        return emitFunctionDeclaration(node);
                     case 241:
-                        return emitInterfaceDeclaration(node);
+                        return emitClassDeclaration(node);
                     case 242:
-                        return emitTypeAliasDeclaration(node);
+                        return emitInterfaceDeclaration(node);
                     case 243:
-                        return emitEnumDeclaration(node);
+                        return emitTypeAliasDeclaration(node);
                     case 244:
-                        return emitModuleDeclaration(node);
+                        return emitEnumDeclaration(node);
                     case 245:
-                        return emitModuleBlock(node);
+                        return emitModuleDeclaration(node);
                     case 246:
-                        return emitCaseBlock(node);
+                        return emitModuleBlock(node);
                     case 247:
-                        return emitNamespaceExportDeclaration(node);
+                        return emitCaseBlock(node);
                     case 248:
-                        return emitImportEqualsDeclaration(node);
+                        return emitNamespaceExportDeclaration(node);
                     case 249:
-                        return emitImportDeclaration(node);
+                        return emitImportEqualsDeclaration(node);
                     case 250:
-                        return emitImportClause(node);
+                        return emitImportDeclaration(node);
                     case 251:
-                        return emitNamespaceImport(node);
+                        return emitImportClause(node);
                     case 252:
-                        return emitNamedImports(node);
+                        return emitNamespaceImport(node);
                     case 253:
-                        return emitImportSpecifier(node);
+                        return emitNamedImports(node);
                     case 254:
-                        return emitExportAssignment(node);
+                        return emitImportSpecifier(node);
                     case 255:
-                        return emitExportDeclaration(node);
+                        return emitExportAssignment(node);
                     case 256:
-                        return emitNamedExports(node);
+                        return emitExportDeclaration(node);
                     case 257:
-                        return emitExportSpecifier(node);
+                        return emitNamedExports(node);
                     case 258:
-                        return;
+                        return emitExportSpecifier(node);
                     case 259:
+                        return;
+                    case 260:
                         return emitExternalModuleReference(node);
                     case 11:
                         return emitJsxText(node);
-                    case 262:
-                    case 265:
-                        return emitJsxOpeningElementOrFragment(node);
                     case 263:
                     case 266:
-                        return emitJsxClosingElementOrFragment(node);
+                        return emitJsxOpeningElementOrFragment(node);
+                    case 264:
                     case 267:
-                        return emitJsxAttribute(node);
+                        return emitJsxClosingElementOrFragment(node);
                     case 268:
-                        return emitJsxAttributes(node);
+                        return emitJsxAttribute(node);
                     case 269:
-                        return emitJsxSpreadAttribute(node);
+                        return emitJsxAttributes(node);
                     case 270:
-                        return emitJsxExpression(node);
+                        return emitJsxSpreadAttribute(node);
                     case 271:
-                        return emitCaseClause(node);
+                        return emitJsxExpression(node);
                     case 272:
-                        return emitDefaultClause(node);
+                        return emitCaseClause(node);
                     case 273:
-                        return emitHeritageClause(node);
+                        return emitDefaultClause(node);
                     case 274:
-                        return emitCatchClause(node);
+                        return emitHeritageClause(node);
                     case 275:
-                        return emitPropertyAssignment(node);
+                        return emitCatchClause(node);
                     case 276:
-                        return emitShorthandPropertyAssignment(node);
+                        return emitPropertyAssignment(node);
                     case 277:
-                        return emitSpreadAssignment(node);
+                        return emitShorthandPropertyAssignment(node);
                     case 278:
+                        return emitSpreadAssignment(node);
+                    case 279:
                         return emitEnumMember(node);
-                    case 304:
-                    case 310:
-                        return emitJSDocPropertyLikeTag(node);
-                    case 305:
-                    case 307:
                     case 306:
-                    case 303:
-                        return emitJSDocSimpleTypedTag(node);
-                    case 300:
-                        return emitJSDocAugmentsTag(node);
-                    case 308:
-                        return emitJSDocTemplateTag(node);
+                    case 312:
+                        return emitJSDocPropertyLikeTag(node);
+                    case 307:
                     case 309:
-                        return emitJSDocTypedefTag(node);
-                    case 302:
-                        return emitJSDocCallbackTag(node);
-                    case 298:
-                        return emitJSDocSignature(node);
-                    case 297:
-                        return emitJSDocTypeLiteral(node);
+                    case 308:
+                    case 305:
+                        return emitJSDocSimpleTypedTag(node);
                     case 301:
+                        return emitJSDocAugmentsTag(node);
+                    case 310:
+                        return emitJSDocTemplateTag(node);
+                    case 311:
+                        return emitJSDocTypedefTag(node);
+                    case 304:
+                        return emitJSDocCallbackTag(node);
                     case 299:
+                        return emitJSDocSignature(node);
+                    case 298:
+                        return emitJSDocTypeLiteral(node);
+                    case 303:
+                    case 300:
                         return emitJSDocSimpleTag(node);
-                    case 296:
+                    case 297:
                         return emitJSDoc(node);
                 }
                 if (ts.isExpression(node)) {
@@ -68362,79 +70610,79 @@ var ts;
                     case 13:
                     case 14:
                         return emitLiteral(node);
-                    case 72:
+                    case 73:
                         return emitIdentifier(node);
-                    case 87:
-                    case 96:
-                    case 98:
-                    case 102:
-                    case 100:
-                    case 92:
+                    case 88:
+                    case 97:
+                    case 99:
+                    case 103:
+                    case 101:
+                    case 93:
                         writeTokenNode(node, writeKeyword);
                         return;
-                    case 187:
-                        return emitArrayLiteralExpression(node);
                     case 188:
-                        return emitObjectLiteralExpression(node);
+                        return emitArrayLiteralExpression(node);
                     case 189:
-                        return emitPropertyAccessExpression(node);
+                        return emitObjectLiteralExpression(node);
                     case 190:
-                        return emitElementAccessExpression(node);
+                        return emitPropertyAccessExpression(node);
                     case 191:
-                        return emitCallExpression(node);
+                        return emitElementAccessExpression(node);
                     case 192:
-                        return emitNewExpression(node);
+                        return emitCallExpression(node);
                     case 193:
-                        return emitTaggedTemplateExpression(node);
+                        return emitNewExpression(node);
                     case 194:
-                        return emitTypeAssertionExpression(node);
+                        return emitTaggedTemplateExpression(node);
                     case 195:
-                        return emitParenthesizedExpression(node);
+                        return emitTypeAssertionExpression(node);
                     case 196:
-                        return emitFunctionExpression(node);
+                        return emitParenthesizedExpression(node);
                     case 197:
-                        return emitArrowFunction(node);
+                        return emitFunctionExpression(node);
                     case 198:
-                        return emitDeleteExpression(node);
+                        return emitArrowFunction(node);
                     case 199:
-                        return emitTypeOfExpression(node);
+                        return emitDeleteExpression(node);
                     case 200:
-                        return emitVoidExpression(node);
+                        return emitTypeOfExpression(node);
                     case 201:
-                        return emitAwaitExpression(node);
+                        return emitVoidExpression(node);
                     case 202:
-                        return emitPrefixUnaryExpression(node);
+                        return emitAwaitExpression(node);
                     case 203:
-                        return emitPostfixUnaryExpression(node);
+                        return emitPrefixUnaryExpression(node);
                     case 204:
-                        return emitBinaryExpression(node);
+                        return emitPostfixUnaryExpression(node);
                     case 205:
-                        return emitConditionalExpression(node);
+                        return emitBinaryExpression(node);
                     case 206:
-                        return emitTemplateExpression(node);
+                        return emitConditionalExpression(node);
                     case 207:
-                        return emitYieldExpression(node);
+                        return emitTemplateExpression(node);
                     case 208:
-                        return emitSpreadExpression(node);
+                        return emitYieldExpression(node);
                     case 209:
-                        return emitClassExpression(node);
+                        return emitSpreadExpression(node);
                     case 210:
+                        return emitClassExpression(node);
+                    case 211:
                         return;
-                    case 212:
-                        return emitAsExpression(node);
                     case 213:
-                        return emitNonNullExpression(node);
+                        return emitAsExpression(node);
                     case 214:
+                        return emitNonNullExpression(node);
+                    case 215:
                         return emitMetaProperty(node);
-                    case 260:
-                        return emitJsxElement(node);
                     case 261:
+                        return emitJsxElement(node);
+                    case 262:
                         return emitJsxSelfClosingElement(node);
-                    case 264:
+                    case 265:
                         return emitJsxFragment(node);
-                    case 313:
+                    case 315:
                         return emitPartiallyEmittedExpression(node);
-                    case 314:
+                    case 316:
                         return emitCommaList(node);
                 }
             }
@@ -68474,7 +70722,7 @@ var ts;
         }
         function emitHelpers(node) {
             var helpersEmitted = false;
-            var bundle = node.kind === 285 ? node : undefined;
+            var bundle = node.kind === 286 ? node : undefined;
             if (bundle && moduleKind === ts.ModuleKind.None) {
                 return;
             }
@@ -68548,7 +70796,7 @@ var ts;
             var pos = getTextPosWithWriteLine();
             writeUnparsedNode(unparsed);
             if (bundleFileInfo) {
-                updateOrPushBundleFileTextLike(pos, writer.getTextPos(), unparsed.kind === 281 ?
+                updateOrPushBundleFileTextLike(pos, writer.getTextPos(), unparsed.kind === 282 ?
                     "text" :
                     "internal");
             }
@@ -68574,7 +70822,7 @@ var ts;
             emit(node.right);
         }
         function emitEntityName(node) {
-            if (node.kind === 72) {
+            if (node.kind === 73) {
                 emitExpression(node);
             }
             else {
@@ -68607,7 +70855,7 @@ var ts;
             emit(node.dotDotDotToken);
             emitNodeWithWriter(node.name, writeParameter);
             emit(node.questionToken);
-            if (node.parent && node.parent.kind === 294 && !node.name) {
+            if (node.parent && node.parent.kind === 295 && !node.name) {
                 emit(node.type);
             }
             else {
@@ -68665,7 +70913,7 @@ var ts;
         function emitAccessorDeclaration(node) {
             emitDecorators(node, node.decorators);
             emitModifiers(node, node.modifiers);
-            writeKeyword(node.kind === 158 ? "get" : "set");
+            writeKeyword(node.kind === 159 ? "get" : "set");
             writeSpace();
             emit(node.name);
             emitSignatureAndBody(node, emitSignatureHead);
@@ -68839,7 +71087,7 @@ var ts;
             }
             if (node.readonlyToken) {
                 emit(node.readonlyToken);
-                if (node.readonlyToken.kind !== 133) {
+                if (node.readonlyToken.kind !== 134) {
                     writeKeyword("readonly");
                 }
                 writeSpace();
@@ -68974,7 +71222,7 @@ var ts;
             emitExpressionList(node, node.arguments, 2576);
         }
         function emitNewExpression(node) {
-            emitTokenWithComment(95, node.pos, writeKeyword, node);
+            emitTokenWithComment(96, node.pos, writeKeyword, node);
             writeSpace();
             emitExpression(node.expression);
             emitTypeArguments(node, node.typeArguments);
@@ -69014,22 +71262,22 @@ var ts;
             emit(node.equalsGreaterThanToken);
         }
         function emitDeleteExpression(node) {
-            emitTokenWithComment(81, node.pos, writeKeyword, node);
+            emitTokenWithComment(82, node.pos, writeKeyword, node);
             writeSpace();
             emitExpression(node.expression);
         }
         function emitTypeOfExpression(node) {
-            emitTokenWithComment(104, node.pos, writeKeyword, node);
+            emitTokenWithComment(105, node.pos, writeKeyword, node);
             writeSpace();
             emitExpression(node.expression);
         }
         function emitVoidExpression(node) {
-            emitTokenWithComment(106, node.pos, writeKeyword, node);
+            emitTokenWithComment(107, node.pos, writeKeyword, node);
             writeSpace();
             emitExpression(node.expression);
         }
         function emitAwaitExpression(node) {
-            emitTokenWithComment(122, node.pos, writeKeyword, node);
+            emitTokenWithComment(123, node.pos, writeKeyword, node);
             writeSpace();
             emitExpression(node.expression);
         }
@@ -69042,7 +71290,7 @@ var ts;
         }
         function shouldEmitWhitespaceBeforeOperand(node) {
             var operand = node.operand;
-            return operand.kind === 202
+            return operand.kind === 203
                 && ((node.operator === 38 && (operand.operator === 38 || operand.operator === 44))
                     || (node.operator === 39 && (operand.operator === 39 || operand.operator === 45)));
         }
@@ -69057,7 +71305,7 @@ var ts;
             emitExpression(node.left);
             increaseIndentIf(indentBeforeOperator, isCommaOperator);
             emitLeadingCommentsOfPosition(node.operatorToken.pos);
-            writeTokenNode(node.operatorToken, node.operatorToken.kind === 93 ? writeKeyword : writeOperator);
+            writeTokenNode(node.operatorToken, node.operatorToken.kind === 94 ? writeKeyword : writeOperator);
             emitTrailingCommentsOfPosition(node.operatorToken.end, true);
             increaseIndentIf(indentAfterOperator, true);
             emitExpression(node.right);
@@ -69085,7 +71333,7 @@ var ts;
             emitList(node, node.templateSpans, 262144);
         }
         function emitYieldExpression(node) {
-            emitTokenWithComment(117, node.pos, writeKeyword, node);
+            emitTokenWithComment(118, node.pos, writeKeyword, node);
             emit(node.asteriskToken);
             emitExpressionWithLeadingSpace(node.expression);
         }
@@ -69152,7 +71400,7 @@ var ts;
             }
         }
         function emitIfStatement(node) {
-            var openParenPos = emitTokenWithComment(91, node.pos, writeKeyword, node);
+            var openParenPos = emitTokenWithComment(92, node.pos, writeKeyword, node);
             writeSpace();
             emitTokenWithComment(20, openParenPos, writePunctuation, node);
             emitExpression(node.expression);
@@ -69160,8 +71408,8 @@ var ts;
             emitEmbeddedStatement(node, node.thenStatement);
             if (node.elseStatement) {
                 writeLineOrSpace(node);
-                emitTokenWithComment(83, node.thenStatement.end, writeKeyword, node);
-                if (node.elseStatement.kind === 222) {
+                emitTokenWithComment(84, node.thenStatement.end, writeKeyword, node);
+                if (node.elseStatement.kind === 223) {
                     writeSpace();
                     emit(node.elseStatement);
                 }
@@ -69171,14 +71419,14 @@ var ts;
             }
         }
         function emitWhileClause(node, startPos) {
-            var openParenPos = emitTokenWithComment(107, startPos, writeKeyword, node);
+            var openParenPos = emitTokenWithComment(108, startPos, writeKeyword, node);
             writeSpace();
             emitTokenWithComment(20, openParenPos, writePunctuation, node);
             emitExpression(node.expression);
             emitTokenWithComment(21, node.expression.end, writePunctuation, node);
         }
         function emitDoStatement(node) {
-            emitTokenWithComment(82, node.pos, writeKeyword, node);
+            emitTokenWithComment(83, node.pos, writeKeyword, node);
             emitEmbeddedStatement(node, node.statement);
             if (ts.isBlock(node.statement)) {
                 writeSpace();
@@ -69194,7 +71442,7 @@ var ts;
             emitEmbeddedStatement(node, node.statement);
         }
         function emitForStatement(node) {
-            var openParenPos = emitTokenWithComment(89, node.pos, writeKeyword, node);
+            var openParenPos = emitTokenWithComment(90, node.pos, writeKeyword, node);
             writeSpace();
             var pos = emitTokenWithComment(20, openParenPos, writePunctuation, node);
             emitForBinding(node.initializer);
@@ -69206,25 +71454,25 @@ var ts;
             emitEmbeddedStatement(node, node.statement);
         }
         function emitForInStatement(node) {
-            var openParenPos = emitTokenWithComment(89, node.pos, writeKeyword, node);
+            var openParenPos = emitTokenWithComment(90, node.pos, writeKeyword, node);
             writeSpace();
             emitTokenWithComment(20, openParenPos, writePunctuation, node);
             emitForBinding(node.initializer);
             writeSpace();
-            emitTokenWithComment(93, node.initializer.end, writeKeyword, node);
+            emitTokenWithComment(94, node.initializer.end, writeKeyword, node);
             writeSpace();
             emitExpression(node.expression);
             emitTokenWithComment(21, node.expression.end, writePunctuation, node);
             emitEmbeddedStatement(node, node.statement);
         }
         function emitForOfStatement(node) {
-            var openParenPos = emitTokenWithComment(89, node.pos, writeKeyword, node);
+            var openParenPos = emitTokenWithComment(90, node.pos, writeKeyword, node);
             writeSpace();
             emitWithTrailingSpace(node.awaitModifier);
             emitTokenWithComment(20, openParenPos, writePunctuation, node);
             emitForBinding(node.initializer);
             writeSpace();
-            emitTokenWithComment(147, node.initializer.end, writeKeyword, node);
+            emitTokenWithComment(148, node.initializer.end, writeKeyword, node);
             writeSpace();
             emitExpression(node.expression);
             emitTokenWithComment(21, node.expression.end, writePunctuation, node);
@@ -69232,7 +71480,7 @@ var ts;
         }
         function emitForBinding(node) {
             if (node !== undefined) {
-                if (node.kind === 238) {
+                if (node.kind === 239) {
                     emit(node);
                 }
                 else {
@@ -69241,12 +71489,12 @@ var ts;
             }
         }
         function emitContinueStatement(node) {
-            emitTokenWithComment(78, node.pos, writeKeyword, node);
+            emitTokenWithComment(79, node.pos, writeKeyword, node);
             emitWithLeadingSpace(node.label);
             writeTrailingSemicolon();
         }
         function emitBreakStatement(node) {
-            emitTokenWithComment(73, node.pos, writeKeyword, node);
+            emitTokenWithComment(74, node.pos, writeKeyword, node);
             emitWithLeadingSpace(node.label);
             writeTrailingSemicolon();
         }
@@ -69274,12 +71522,12 @@ var ts;
             return pos;
         }
         function emitReturnStatement(node) {
-            emitTokenWithComment(97, node.pos, writeKeyword, node);
+            emitTokenWithComment(98, node.pos, writeKeyword, node);
             emitExpressionWithLeadingSpace(node.expression);
             writeTrailingSemicolon();
         }
         function emitWithStatement(node) {
-            var openParenPos = emitTokenWithComment(108, node.pos, writeKeyword, node);
+            var openParenPos = emitTokenWithComment(109, node.pos, writeKeyword, node);
             writeSpace();
             emitTokenWithComment(20, openParenPos, writePunctuation, node);
             emitExpression(node.expression);
@@ -69287,7 +71535,7 @@ var ts;
             emitEmbeddedStatement(node, node.statement);
         }
         function emitSwitchStatement(node) {
-            var openParenPos = emitTokenWithComment(99, node.pos, writeKeyword, node);
+            var openParenPos = emitTokenWithComment(100, node.pos, writeKeyword, node);
             writeSpace();
             emitTokenWithComment(20, openParenPos, writePunctuation, node);
             emitExpression(node.expression);
@@ -69302,12 +71550,12 @@ var ts;
             emit(node.statement);
         }
         function emitThrowStatement(node) {
-            emitTokenWithComment(101, node.pos, writeKeyword, node);
+            emitTokenWithComment(102, node.pos, writeKeyword, node);
             emitExpressionWithLeadingSpace(node.expression);
             writeTrailingSemicolon();
         }
         function emitTryStatement(node) {
-            emitTokenWithComment(103, node.pos, writeKeyword, node);
+            emitTokenWithComment(104, node.pos, writeKeyword, node);
             writeSpace();
             emit(node.tryBlock);
             if (node.catchClause) {
@@ -69316,13 +71564,13 @@ var ts;
             }
             if (node.finallyBlock) {
                 writeLineOrSpace(node);
-                emitTokenWithComment(88, (node.catchClause || node.tryBlock).end, writeKeyword, node);
+                emitTokenWithComment(89, (node.catchClause || node.tryBlock).end, writeKeyword, node);
                 writeSpace();
                 emit(node.finallyBlock);
             }
         }
         function emitDebuggerStatement(node) {
-            writeToken(79, node.pos, writeKeyword);
+            writeToken(80, node.pos, writeKeyword);
             writeTrailingSemicolon();
         }
         function emitVariableDeclaration(node) {
@@ -69517,7 +71765,7 @@ var ts;
             var body = node.body;
             if (!body)
                 return writeTrailingSemicolon();
-            while (body.kind === 244) {
+            while (body.kind === 245) {
                 writePunctuation(".");
                 emit(body.name);
                 body = body.body;
@@ -69538,17 +71786,17 @@ var ts;
         }
         function emitImportEqualsDeclaration(node) {
             emitModifiers(node, node.modifiers);
-            emitTokenWithComment(92, node.modifiers ? node.modifiers.end : node.pos, writeKeyword, node);
+            emitTokenWithComment(93, node.modifiers ? node.modifiers.end : node.pos, writeKeyword, node);
             writeSpace();
             emit(node.name);
             writeSpace();
-            emitTokenWithComment(59, node.name.end, writePunctuation, node);
+            emitTokenWithComment(60, node.name.end, writePunctuation, node);
             writeSpace();
             emitModuleReference(node.moduleReference);
             writeTrailingSemicolon();
         }
         function emitModuleReference(node) {
-            if (node.kind === 72) {
+            if (node.kind === 73) {
                 emitExpression(node);
             }
             else {
@@ -69557,12 +71805,12 @@ var ts;
         }
         function emitImportDeclaration(node) {
             emitModifiers(node, node.modifiers);
-            emitTokenWithComment(92, node.modifiers ? node.modifiers.end : node.pos, writeKeyword, node);
+            emitTokenWithComment(93, node.modifiers ? node.modifiers.end : node.pos, writeKeyword, node);
             writeSpace();
             if (node.importClause) {
                 emit(node.importClause);
                 writeSpace();
-                emitTokenWithComment(144, node.importClause.end, writeKeyword, node);
+                emitTokenWithComment(145, node.importClause.end, writeKeyword, node);
                 writeSpace();
             }
             emitExpression(node.moduleSpecifier);
@@ -69579,7 +71827,7 @@ var ts;
         function emitNamespaceImport(node) {
             var asPos = emitTokenWithComment(40, node.pos, writePunctuation, node);
             writeSpace();
-            emitTokenWithComment(119, asPos, writeKeyword, node);
+            emitTokenWithComment(120, asPos, writeKeyword, node);
             writeSpace();
             emit(node.name);
         }
@@ -69590,20 +71838,20 @@ var ts;
             emitImportOrExportSpecifier(node);
         }
         function emitExportAssignment(node) {
-            var nextPos = emitTokenWithComment(85, node.pos, writeKeyword, node);
+            var nextPos = emitTokenWithComment(86, node.pos, writeKeyword, node);
             writeSpace();
             if (node.isExportEquals) {
-                emitTokenWithComment(59, nextPos, writeOperator, node);
+                emitTokenWithComment(60, nextPos, writeOperator, node);
             }
             else {
-                emitTokenWithComment(80, nextPos, writeKeyword, node);
+                emitTokenWithComment(81, nextPos, writeKeyword, node);
             }
             writeSpace();
             emitExpression(node.expression);
             writeTrailingSemicolon();
         }
         function emitExportDeclaration(node) {
-            var nextPos = emitTokenWithComment(85, node.pos, writeKeyword, node);
+            var nextPos = emitTokenWithComment(86, node.pos, writeKeyword, node);
             writeSpace();
             if (node.exportClause) {
                 emit(node.exportClause);
@@ -69614,18 +71862,18 @@ var ts;
             if (node.moduleSpecifier) {
                 writeSpace();
                 var fromPos = node.exportClause ? node.exportClause.end : nextPos;
-                emitTokenWithComment(144, fromPos, writeKeyword, node);
+                emitTokenWithComment(145, fromPos, writeKeyword, node);
                 writeSpace();
                 emitExpression(node.moduleSpecifier);
             }
             writeTrailingSemicolon();
         }
         function emitNamespaceExportDeclaration(node) {
-            var nextPos = emitTokenWithComment(85, node.pos, writeKeyword, node);
+            var nextPos = emitTokenWithComment(86, node.pos, writeKeyword, node);
             writeSpace();
-            nextPos = emitTokenWithComment(119, nextPos, writeKeyword, node);
+            nextPos = emitTokenWithComment(120, nextPos, writeKeyword, node);
             writeSpace();
-            nextPos = emitTokenWithComment(131, nextPos, writeKeyword, node);
+            nextPos = emitTokenWithComment(132, nextPos, writeKeyword, node);
             writeSpace();
             emit(node.name);
             writeTrailingSemicolon();
@@ -69645,7 +71893,7 @@ var ts;
             if (node.propertyName) {
                 emit(node.propertyName);
                 writeSpace();
-                emitTokenWithComment(119, node.propertyName.end, writeKeyword, node);
+                emitTokenWithComment(120, node.propertyName.end, writeKeyword, node);
                 writeSpace();
             }
             emit(node.name);
@@ -69687,7 +71935,7 @@ var ts;
             writePunctuation(">");
         }
         function emitJsxText(node) {
-            writer.writeLiteral(getTextOfNode(node, true));
+            writer.writeLiteral(node.text);
         }
         function emitJsxClosingElementOrFragment(node) {
             writePunctuation("</");
@@ -69717,7 +71965,7 @@ var ts;
             }
         }
         function emitJsxTagName(node) {
-            if (node.kind === 72) {
+            if (node.kind === 73) {
                 emitExpression(node);
             }
             else {
@@ -69725,13 +71973,13 @@ var ts;
             }
         }
         function emitCaseClause(node) {
-            emitTokenWithComment(74, node.pos, writeKeyword, node);
+            emitTokenWithComment(75, node.pos, writeKeyword, node);
             writeSpace();
             emitExpression(node.expression);
             emitCaseOrDefaultClauseRest(node, node.statements, node.expression.end);
         }
         function emitDefaultClause(node) {
-            var pos = emitTokenWithComment(80, node.pos, writeKeyword, node);
+            var pos = emitTokenWithComment(81, node.pos, writeKeyword, node);
             emitCaseOrDefaultClauseRest(node, node.statements, pos);
         }
         function emitCaseOrDefaultClauseRest(parentNode, statements, colonPos) {
@@ -69757,7 +72005,7 @@ var ts;
             emitList(node, node.types, 528);
         }
         function emitCatchClause(node) {
-            var openParenPos = emitTokenWithComment(75, node.pos, writeKeyword, node);
+            var openParenPos = emitTokenWithComment(76, node.pos, writeKeyword, node);
             writeSpace();
             if (node.variableDeclaration) {
                 emitTokenWithComment(20, openParenPos, writePunctuation, node);
@@ -69811,7 +72059,7 @@ var ts;
                 }
             }
             if (node.tags) {
-                if (node.tags.length === 1 && node.tags[0].kind === 307 && !node.comment) {
+                if (node.tags.length === 1 && node.tags[0].kind === 309 && !node.comment) {
                     writeSpace();
                     emit(node.tags[0]);
                 }
@@ -69845,7 +72093,7 @@ var ts;
         function emitJSDocTypedefTag(tag) {
             emitJSDocTagName(tag.tagName);
             if (tag.typeExpression) {
-                if (tag.typeExpression.kind === 288) {
+                if (tag.typeExpression.kind === 289) {
                     emitJSDocTypeExpression(tag.typeExpression);
                 }
                 else {
@@ -69864,7 +72112,7 @@ var ts;
                 emit(tag.fullName);
             }
             emitJSDocComment(tag.comment);
-            if (tag.typeExpression && tag.typeExpression.kind === 297) {
+            if (tag.typeExpression && tag.typeExpression.kind === 298) {
                 emitJSDocTypeLiteral(tag.typeExpression);
             }
         }
@@ -70164,7 +72412,7 @@ var ts;
         function emitInitializer(node, equalCommentStartPos, container) {
             if (node) {
                 writeSpace();
-                emitTokenWithComment(59, equalCommentStartPos, writeOperator, container);
+                emitTokenWithComment(60, equalCommentStartPos, writeOperator, container);
                 writeSpace();
                 emitExpression(node);
             }
@@ -70594,7 +72842,7 @@ var ts;
                 && ts.rangeEndIsOnSameLineAsRangeStart(block, block, currentSourceFile);
         }
         function skipSynthesizedParentheses(node) {
-            while (node.kind === 195 && ts.nodeIsSynthesized(node)) {
+            while (node.kind === 196 && ts.nodeIsSynthesized(node)) {
                 node = node.expression;
             }
             return node;
@@ -70653,81 +72901,81 @@ var ts;
             if (!node)
                 return;
             switch (node.kind) {
-                case 218:
+                case 219:
                     ts.forEach(node.statements, generateNames);
                     break;
-                case 233:
-                case 231:
-                case 223:
+                case 234:
+                case 232:
                 case 224:
+                case 225:
                     generateNames(node.statement);
                     break;
-                case 222:
+                case 223:
                     generateNames(node.thenStatement);
                     generateNames(node.elseStatement);
                     break;
-                case 225:
-                case 227:
                 case 226:
+                case 228:
+                case 227:
                     generateNames(node.initializer);
                     generateNames(node.statement);
                     break;
-                case 232:
+                case 233:
                     generateNames(node.caseBlock);
                     break;
-                case 246:
+                case 247:
                     ts.forEach(node.clauses, generateNames);
                     break;
-                case 271:
                 case 272:
+                case 273:
                     ts.forEach(node.statements, generateNames);
                     break;
-                case 235:
+                case 236:
                     generateNames(node.tryBlock);
                     generateNames(node.catchClause);
                     generateNames(node.finallyBlock);
                     break;
-                case 274:
+                case 275:
                     generateNames(node.variableDeclaration);
                     generateNames(node.block);
                     break;
-                case 219:
+                case 220:
                     generateNames(node.declarationList);
                     break;
-                case 238:
+                case 239:
                     ts.forEach(node.declarations, generateNames);
                     break;
-                case 237:
-                case 151:
-                case 186:
-                case 240:
+                case 238:
+                case 152:
+                case 187:
+                case 241:
                     generateNameIfNeeded(node.name);
                     break;
-                case 239:
+                case 240:
                     generateNameIfNeeded(node.name);
                     if (ts.getEmitFlags(node) & 524288) {
                         ts.forEach(node.parameters, generateNames);
                         generateNames(node.body);
                     }
                     break;
-                case 184:
                 case 185:
+                case 186:
                     ts.forEach(node.elements, generateNames);
                     break;
-                case 249:
-                    generateNames(node.importClause);
-                    break;
                 case 250:
-                    generateNameIfNeeded(node.name);
-                    generateNames(node.namedBindings);
+                    generateNames(node.importClause);
                     break;
                 case 251:
                     generateNameIfNeeded(node.name);
+                    generateNames(node.namedBindings);
                     break;
                 case 252:
-                    ts.forEach(node.elements, generateNames);
+                    generateNameIfNeeded(node.name);
                     break;
                 case 253:
+                    ts.forEach(node.elements, generateNames);
+                    break;
+                case 254:
                     generateNameIfNeeded(node.propertyName || node.name);
                     break;
             }
@@ -70736,12 +72984,12 @@ var ts;
             if (!node)
                 return;
             switch (node.kind) {
-                case 275:
                 case 276:
-                case 154:
-                case 156:
-                case 158:
+                case 277:
+                case 155:
+                case 157:
                 case 159:
+                case 160:
                     generateNameIfNeeded(node.name);
                     break;
             }
@@ -70873,24 +73121,26 @@ var ts;
         }
         function generateNameForNode(node, flags) {
             switch (node.kind) {
-                case 72:
+                case 73:
                     return makeUniqueName(getTextOfNode(node), isUniqueName, !!(flags & 16), !!(flags & 8));
+                case 245:
                 case 244:
-                case 243:
                     return generateNameForModuleOrEnum(node);
-                case 249:
-                case 255:
+                case 250:
+                case 256:
                     return generateNameForImportOrExportDeclaration(node);
-                case 239:
                 case 240:
-                case 254:
+                case 241:
+                case 255:
                     return generateNameForExportDefault();
-                case 209:
+                case 210:
                     return generateNameForClassExpression();
-                case 156:
-                case 158:
+                case 157:
                 case 159:
+                case 160:
                     return generateNameForMethodOrAccessor(node);
+                case 150:
+                    return makeTempVariableName(0, true);
                 default:
                     return makeTempVariableName(0);
             }
@@ -70926,7 +73176,7 @@ var ts;
             hasWrittenComment = false;
             var emitFlags = ts.getEmitFlags(node);
             var _a = ts.getCommentRange(node), pos = _a.pos, end = _a.end;
-            var isEmittedNode = node.kind !== 312;
+            var isEmittedNode = node.kind !== 314;
             var skipLeadingComments = pos < 0 || (emitFlags & 512) !== 0 || node.kind === 11;
             var skipTrailingComments = end < 0 || (emitFlags & 1024) !== 0 || node.kind === 11;
             var savedContainerPos = containerPos;
@@ -70941,7 +73191,7 @@ var ts;
                 }
                 if (!skipTrailingComments || (end >= 0 && (emitFlags & 1024) !== 0)) {
                     containerEnd = end;
-                    if (node.kind === 238) {
+                    if (node.kind === 239) {
                         declarationListContainerEnd = end;
                     }
                 }
@@ -71175,7 +73425,7 @@ var ts;
             else {
                 var _a = ts.getSourceMapRange(node), pos = _a.pos, end = _a.end, _b = _a.source, source = _b === void 0 ? sourceMapSource : _b;
                 var emitFlags = ts.getEmitFlags(node);
-                if (node.kind !== 312
+                if (node.kind !== 314
                     && (emitFlags & 16) === 0
                     && pos >= 0) {
                     emitSourcePos(source, skipSourceTrivia(source, pos));
@@ -71188,7 +73438,7 @@ var ts;
                 else {
                     pipelinePhase(hint, node);
                 }
-                if (node.kind !== 312
+                if (node.kind !== 314
                     && (emitFlags & 32) === 0
                     && end >= 0) {
                     emitSourcePos(source, end);
@@ -71288,7 +73538,8 @@ var ts;
             writeFile: host.writeFile && writeFile,
             addOrDeleteFileOrDirectory: addOrDeleteFileOrDirectory,
             addOrDeleteFile: addOrDeleteFile,
-            clearCache: clearCache
+            clearCache: clearCache,
+            realpath: host.realpath && realpath
         };
         function toPath(fileName) {
             return ts.toPath(fileName, currentDirectory, getCanonicalFileName);
@@ -71379,7 +73630,7 @@ var ts;
             var rootDirPath = toPath(rootDir);
             var result = tryReadDirectory(rootDir, rootDirPath);
             if (result) {
-                return ts.matchFiles(rootDir, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory, depth, getFileSystemEntries);
+                return ts.matchFiles(rootDir, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory, depth, getFileSystemEntries, realpath);
             }
             return host.readDirectory(rootDir, extensions, excludes, includes, depth);
             function getFileSystemEntries(dir) {
@@ -71390,6 +73641,9 @@ var ts;
                 return tryReadDirectory(dir, path) || ts.emptyFileSystemEntries;
             }
         }
+        function realpath(s) {
+            return host.realpath ? host.realpath(s) : s;
+        }
         function addOrDeleteFileOrDirectory(fileOrDirectory, fileOrDirectoryPath) {
             var existingResult = getCachedFileSystemEntries(fileOrDirectoryPath);
             if (existingResult) {
@@ -71624,9 +73878,7 @@ var ts;
     function createCompilerHostWorker(options, setParentNodes, system) {
         if (system === void 0) { system = ts.sys; }
         var existingDirectories = ts.createMap();
-        function getCanonicalFileName(fileName) {
-            return system.useCaseSensitiveFileNames ? fileName : fileName.toLowerCase();
-        }
+        var getCanonicalFileName = ts.createGetCanonicalFileName(system.useCaseSensitiveFileNames);
         function getSourceFile(fileName, languageVersion, onError) {
             var text;
             try {
@@ -71730,7 +73982,8 @@ var ts;
             getDirectories: function (path) { return system.getDirectories(path); },
             realpath: realpath,
             readDirectory: function (path, extensions, include, exclude, depth) { return system.readDirectory(path, extensions, include, exclude, depth); },
-            createDirectory: function (d) { return system.createDirectory(d); }
+            createDirectory: function (d) { return system.createDirectory(d); },
+            createHash: ts.maybeBind(system, system.createHash)
         };
         return compilerHost;
     }
@@ -71963,11 +74216,11 @@ var ts;
                 if (diagnostic.relatedInformation) {
                     output += host.getNewLine();
                     for (var _a = 0, _b = diagnostic.relatedInformation; _a < _b.length; _a++) {
-                        var _c = _b[_a], file = _c.file, start = _c.start, length_4 = _c.length, messageText = _c.messageText;
+                        var _c = _b[_a], file = _c.file, start = _c.start, length_7 = _c.length, messageText = _c.messageText;
                         if (file) {
                             output += host.getNewLine();
                             output += halfIndent + formatLocation(file, start, host);
-                            output += formatCodeSpan(file, start, length_4, indent, ForegroundColorEscapeSequences.Cyan, host);
+                            output += formatCodeSpan(file, start, length_7, indent, ForegroundColorEscapeSequences.Cyan, host);
                         }
                         output += host.getNewLine();
                         output += indent + flattenDiagnosticMessageText(messageText, host.getNewLine());
@@ -71979,27 +74232,30 @@ var ts;
         return output;
     }
     ts.formatDiagnosticsWithColorAndContext = formatDiagnosticsWithColorAndContext;
-    function flattenDiagnosticMessageText(messageText, newLine) {
-        if (ts.isString(messageText)) {
-            return messageText;
+    function flattenDiagnosticMessageText(diag, newLine, indent) {
+        if (indent === void 0) { indent = 0; }
+        if (ts.isString(diag)) {
+            return diag;
         }
-        else {
-            var diagnosticChain = messageText;
-            var result = "";
-            var indent_1 = 0;
-            while (diagnosticChain) {
-                if (indent_1) {
-                    result += newLine;
-                    for (var i = 0; i < indent_1; i++) {
-                        result += "  ";
-                    }
-                }
-                result += diagnosticChain.messageText;
-                indent_1++;
-                diagnosticChain = diagnosticChain.next;
+        else if (diag === undefined) {
+            return "";
+        }
+        var result = "";
+        if (indent) {
+            result += newLine;
+            for (var i = 0; i < indent; i++) {
+                result += "  ";
             }
-            return result;
         }
+        result += diag.messageText;
+        indent++;
+        if (diag.next) {
+            for (var _i = 0, _a = diag.next; _i < _a.length; _i++) {
+                var kid = _a[_i];
+                result += flattenDiagnosticMessageText(kid, newLine, indent);
+            }
+        }
+        return result;
     }
     ts.flattenDiagnosticMessageText = flattenDiagnosticMessageText;
     function loadWithLocalCache(names, containingFile, redirectedReference, loader) {
@@ -72021,6 +74277,7 @@ var ts;
         }
         return resolutions;
     }
+    ts.loadWithLocalCache = loadWithLocalCache;
     function isProgramUptoDate(program, rootFileNames, newOptions, getSourceVersion, fileExists, hasInvalidatedResolution, hasChangedAutomaticTypeDirectiveNames, projectReferences) {
         if (!program || hasChangedAutomaticTypeDirectiveNames) {
             return false;
@@ -72145,7 +74402,7 @@ var ts;
             }); };
         }
         else {
-            moduleResolutionCache = ts.createModuleResolutionCache(currentDirectory, function (x) { return host.getCanonicalFileName(x); });
+            moduleResolutionCache = ts.createModuleResolutionCache(currentDirectory, function (x) { return host.getCanonicalFileName(x); }, options);
             var loader_1 = function (moduleName, containingFile, redirectedReference) { return ts.resolveModuleName(moduleName, containingFile, options, host, moduleResolutionCache, redirectedReference).resolvedModule; };
             resolveModuleNamesWorker = function (moduleNames, containingFile, _reusedNames, redirectedReference) { return loadWithLocalCache(ts.Debug.assertEachDefined(moduleNames), containingFile, redirectedReference, loader_1); };
         }
@@ -72178,11 +74435,18 @@ var ts;
                 if (rootNames.length) {
                     for (var _i = 0, resolvedProjectReferences_1 = resolvedProjectReferences; _i < resolvedProjectReferences_1.length; _i++) {
                         var parsedRef = resolvedProjectReferences_1[_i];
-                        if (parsedRef) {
-                            var out = parsedRef.commandLine.options.outFile || parsedRef.commandLine.options.out;
-                            if (out) {
-                                var dtsOutfile = ts.changeExtension(out, ".d.ts");
-                                processSourceFile(dtsOutfile, false, false, undefined);
+                        if (!parsedRef)
+                            continue;
+                        var out = parsedRef.commandLine.options.outFile || parsedRef.commandLine.options.out;
+                        if (out) {
+                            processSourceFile(ts.changeExtension(out, ".d.ts"), false, false, undefined);
+                        }
+                        else if (ts.getEmitModuleKind(parsedRef.commandLine.options) === ts.ModuleKind.None) {
+                            for (var _a = 0, _b = parsedRef.commandLine.fileNames; _a < _b.length; _a++) {
+                                var fileName = _b[_a];
+                                if (!ts.fileExtensionIs(fileName, ".d.ts") && ts.hasTSFileExtension(fileName)) {
+                                    processSourceFile(ts.getOutputDeclarationFileName(fileName, parsedRef.commandLine, !host.useCaseSensitiveFileNames()), false, false, undefined);
+                                }
                             }
                         }
                     }
@@ -72220,8 +74484,8 @@ var ts;
         ts.Debug.assert(!!missingFilePaths);
         if (oldProgram && host.onReleaseOldSourceFile) {
             var oldSourceFiles = oldProgram.getSourceFiles();
-            for (var _a = 0, oldSourceFiles_1 = oldSourceFiles; _a < oldSourceFiles_1.length; _a++) {
-                var oldSourceFile = oldSourceFiles_1[_a];
+            for (var _c = 0, oldSourceFiles_1 = oldSourceFiles; _c < oldSourceFiles_1.length; _c++) {
+                var oldSourceFile = oldSourceFiles_1[_c];
                 var newFile = getSourceFileByPath(oldSourceFile.resolvedPath);
                 if (shouldCreateNewSourceFile || !newFile ||
                     (oldSourceFile.resolvedPath === oldSourceFile.path && newFile.resolvedPath !== oldSourceFile.path)) {
@@ -72258,6 +74522,7 @@ var ts;
             getIdentifierCount: function () { return getDiagnosticsProducingTypeChecker().getIdentifierCount(); },
             getSymbolCount: function () { return getDiagnosticsProducingTypeChecker().getSymbolCount(); },
             getTypeCount: function () { return getDiagnosticsProducingTypeChecker().getTypeCount(); },
+            getRelationCacheSizes: function () { return getDiagnosticsProducingTypeChecker().getRelationCacheSizes(); },
             getFileProcessingDiagnostics: function () { return fileProcessingDiagnostics; },
             getResolvedTypeReferenceDirectives: function () { return resolvedTypeReferenceDirectives; },
             isSourceFileFromExternalLibrary: isSourceFileFromExternalLibrary,
@@ -72305,7 +74570,7 @@ var ts;
         }
         function getCommonSourceDirectory() {
             if (commonSourceDirectory === undefined) {
-                var emittedFiles = ts.filter(files, function (file) { return ts.sourceFileMayBeEmitted(file, options, isSourceFileFromExternalLibrary); });
+                var emittedFiles = ts.filter(files, function (file) { return ts.sourceFileMayBeEmitted(file, options, isSourceFileFromExternalLibrary, getResolvedProjectReferenceToRedirect); });
                 if (options.rootDir && checkSourceFilesBelongToPath(emittedFiles, options.rootDir)) {
                     commonSourceDirectory = ts.getNormalizedAbsolutePath(options.rootDir, currentDirectory);
                 }
@@ -72339,13 +74604,13 @@ var ts;
             }
             var oldSourceFile = oldProgram && oldProgram.getSourceFile(containingFile);
             if (oldSourceFile !== file && file.resolvedModules) {
-                var result_6 = [];
+                var result_9 = [];
                 for (var _i = 0, moduleNames_1 = moduleNames; _i < moduleNames_1.length; _i++) {
                     var moduleName = moduleNames_1[_i];
                     var resolvedModule = file.resolvedModules.get(moduleName);
-                    result_6.push(resolvedModule);
+                    result_9.push(resolvedModule);
                 }
-                return result_6;
+                return result_9;
             }
             var unknownModuleNames;
             var result;
@@ -72405,7 +74670,7 @@ var ts;
             function moduleNameResolvesToAmbientModuleInNonModifiedFile(moduleName) {
                 var resolutionToFile = ts.getResolvedModule(oldSourceFile, moduleName);
                 var resolvedFile = resolutionToFile && oldProgram.getSourceFile(resolutionToFile.resolvedFileName);
-                if (resolutionToFile && resolvedFile && !resolvedFile.externalModuleIndicator) {
+                if (resolutionToFile && resolvedFile) {
                     return false;
                 }
                 var unmodifiedFile = ambientModuleNameToUnmodifiedFileName.get(moduleName);
@@ -72585,7 +74850,7 @@ var ts;
                 var newSourceFile = newSourceFiles_1[_f];
                 var filePath = newSourceFile.path;
                 addFileToFilesByName(newSourceFile, filePath, newSourceFile.resolvedPath);
-                if (oldProgram.isSourceFileFromExternalLibrary(oldProgram.getSourceFileByPath(filePath))) {
+                if (oldProgram.isSourceFileFromExternalLibrary(oldProgram.getSourceFileByPath(newSourceFile.resolvedPath))) {
                     sourceFilesFoundSearchingNodeModules.set(filePath, true);
                 }
             }
@@ -72602,19 +74867,20 @@ var ts;
         }
         function getEmitHost(writeFileCallback) {
             return __assign({ getPrependNodes: getPrependNodes,
-                getCanonicalFileName: getCanonicalFileName, getCommonSourceDirectory: program.getCommonSourceDirectory, getCompilerOptions: program.getCompilerOptions, getCurrentDirectory: function () { return currentDirectory; }, getNewLine: function () { return host.getNewLine(); }, getSourceFile: program.getSourceFile, getSourceFileByPath: program.getSourceFileByPath, getSourceFiles: program.getSourceFiles, getLibFileFromReference: program.getLibFileFromReference, isSourceFileFromExternalLibrary: isSourceFileFromExternalLibrary, writeFile: writeFileCallback || (function (fileName, data, writeByteOrderMark, onError, sourceFiles) { return host.writeFile(fileName, data, writeByteOrderMark, onError, sourceFiles); }), isEmitBlocked: isEmitBlocked, readFile: function (f) { return host.readFile(f); }, fileExists: function (f) {
+                getCanonicalFileName: getCanonicalFileName, getCommonSourceDirectory: program.getCommonSourceDirectory, getCompilerOptions: program.getCompilerOptions, getCurrentDirectory: function () { return currentDirectory; }, getNewLine: function () { return host.getNewLine(); }, getSourceFile: program.getSourceFile, getSourceFileByPath: program.getSourceFileByPath, getSourceFiles: program.getSourceFiles, getLibFileFromReference: program.getLibFileFromReference, isSourceFileFromExternalLibrary: isSourceFileFromExternalLibrary,
+                getResolvedProjectReferenceToRedirect: getResolvedProjectReferenceToRedirect, writeFile: writeFileCallback || (function (fileName, data, writeByteOrderMark, onError, sourceFiles) { return host.writeFile(fileName, data, writeByteOrderMark, onError, sourceFiles); }), isEmitBlocked: isEmitBlocked, readFile: function (f) { return host.readFile(f); }, fileExists: function (f) {
                     var path = toPath(f);
                     if (getSourceFileByPath(path))
                         return true;
                     if (ts.contains(missingFilePaths, path))
                         return false;
                     return host.fileExists(f);
-                } }, (host.directoryExists ? { directoryExists: function (f) { return host.directoryExists(f); } } : {}), { useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); }, getProgramBuildInfo: function () { return program.getProgramBuildInfo && program.getProgramBuildInfo(); } });
+                } }, (host.directoryExists ? { directoryExists: function (f) { return host.directoryExists(f); } } : {}), { useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); }, getProgramBuildInfo: function () { return program.getProgramBuildInfo && program.getProgramBuildInfo(); }, getSourceFileFromReference: function (file, ref) { return program.getSourceFileFromReference(file, ref); } });
         }
         function emitBuildInfo(writeFileCallback) {
             ts.Debug.assert(!options.out && !options.outFile);
             ts.performance.mark("beforeEmit");
-            var emitResult = ts.emitFiles(ts.notImplementedResolver, getEmitHost(writeFileCallback), undefined, false, undefined, undefined, true);
+            var emitResult = ts.emitFiles(ts.notImplementedResolver, getEmitHost(writeFileCallback), undefined, ts.noTransformers, false, true);
             ts.performance.mark("afterEmit");
             ts.performance.measure("Emit", "beforeEmit", "afterEmit");
             return emitResult;
@@ -72688,8 +74954,7 @@ var ts;
             }
             var emitResolver = getDiagnosticsProducingTypeChecker().getEmitResolver((options.outFile || options.out) ? undefined : sourceFile, cancellationToken);
             ts.performance.mark("beforeEmit");
-            var transformers = emitOnlyDtsFiles ? [] : ts.getTransformers(options, customTransformers);
-            var emitResult = ts.emitFiles(emitResolver, getEmitHost(writeFileCallback), sourceFile, emitOnlyDtsFiles, transformers, customTransformers && customTransformers.afterDeclarations);
+            var emitResult = ts.emitFiles(emitResolver, getEmitHost(writeFileCallback), sourceFile, ts.getTransformers(options, customTransformers, emitOnlyDtsFiles), emitOnlyDtsFiles);
             ts.performance.mark("afterEmit");
             ts.performance.measure("Emit", "beforeEmit", "afterEmit");
             return emitResult;
@@ -72768,8 +75033,8 @@ var ts;
                 for (var _i = 0, _a = [bindDiagnostics, checkDiagnostics, fileProcessingDiagnosticsInFile, programDiagnosticsInFile, isCheckJs ? sourceFile.jsDocDiagnostics : undefined]; _i < _a.length; _i++) {
                     var diags = _a[_i];
                     if (diags) {
-                        for (var _b = 0, diags_1 = diags; _b < diags_1.length; _b++) {
-                            var diag = diags_1[_b];
+                        for (var _b = 0, diags_4 = diags; _b < diags_4.length; _b++) {
+                            var diag = diags_4[_b];
                             if (shouldReportDiagnostic(diag)) {
                                 diagnostics = ts.append(diagnostics, diag);
                             }
@@ -72811,62 +75076,62 @@ var ts;
                 return diagnostics;
                 function walk(node) {
                     switch (parent.kind) {
-                        case 151:
-                        case 154:
+                        case 152:
+                        case 155:
                             if (parent.questionToken === node) {
                                 diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics._0_can_only_be_used_in_a_ts_file, "?"));
                                 return;
                             }
-                        case 156:
-                        case 155:
                         case 157:
+                        case 156:
                         case 158:
                         case 159:
-                        case 196:
-                        case 239:
+                        case 160:
                         case 197:
-                        case 237:
+                        case 240:
+                        case 198:
+                        case 238:
                             if (parent.type === node) {
                                 diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.types_can_only_be_used_in_a_ts_file));
                                 return;
                             }
                     }
                     switch (node.kind) {
-                        case 248:
+                        case 249:
                             diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.import_can_only_be_used_in_a_ts_file));
                             return;
-                        case 254:
+                        case 255:
                             if (node.isExportEquals) {
                                 diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.export_can_only_be_used_in_a_ts_file));
                                 return;
                             }
                             break;
-                        case 273:
+                        case 274:
                             var heritageClause = node;
-                            if (heritageClause.token === 109) {
+                            if (heritageClause.token === 110) {
                                 diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.implements_clauses_can_only_be_used_in_a_ts_file));
                                 return;
                             }
                             break;
-                        case 241:
+                        case 242:
                             diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.interface_declarations_can_only_be_used_in_a_ts_file));
                             return;
-                        case 244:
+                        case 245:
                             diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.module_declarations_can_only_be_used_in_a_ts_file));
                             return;
-                        case 242:
+                        case 243:
                             diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.type_aliases_can_only_be_used_in_a_ts_file));
                             return;
-                        case 243:
+                        case 244:
                             diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.enum_declarations_can_only_be_used_in_a_ts_file));
                             return;
-                        case 213:
+                        case 214:
                             diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.non_null_assertions_can_only_be_used_in_a_ts_file));
                             return;
-                        case 212:
+                        case 213:
                             diagnostics.push(createDiagnosticForNode(node.type, ts.Diagnostics.type_assertion_expressions_can_only_be_used_in_a_ts_file));
                             return;
-                        case 194:
+                        case 195:
                             ts.Debug.fail();
                     }
                     var prevParent = parent;
@@ -72876,49 +75141,49 @@ var ts;
                 }
                 function walkArray(nodes) {
                     if (parent.decorators === nodes && !options.experimentalDecorators) {
-                        diagnostics.push(createDiagnosticForNode(parent, ts.Diagnostics.Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_to_remove_this_warning));
+                        diagnostics.push(createDiagnosticForNode(parent, ts.Diagnostics.Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_in_your_tsconfig_or_jsconfig_to_remove_this_warning));
                     }
                     switch (parent.kind) {
-                        case 240:
-                        case 156:
-                        case 155:
+                        case 241:
                         case 157:
+                        case 156:
                         case 158:
                         case 159:
-                        case 196:
-                        case 239:
+                        case 160:
                         case 197:
+                        case 240:
+                        case 198:
                             if (nodes === parent.typeParameters) {
                                 diagnostics.push(createDiagnosticForNodeArray(nodes, ts.Diagnostics.type_parameter_declarations_can_only_be_used_in_a_ts_file));
                                 return;
                             }
-                        case 219:
+                        case 220:
                             if (nodes === parent.modifiers) {
-                                return checkModifiers(nodes, parent.kind === 219);
+                                return checkModifiers(nodes, parent.kind === 220);
                             }
                             break;
-                        case 154:
+                        case 155:
                             if (nodes === parent.modifiers) {
                                 for (var _i = 0, _a = nodes; _i < _a.length; _i++) {
                                     var modifier = _a[_i];
-                                    if (modifier.kind !== 116) {
+                                    if (modifier.kind !== 117) {
                                         diagnostics.push(createDiagnosticForNode(modifier, ts.Diagnostics._0_can_only_be_used_in_a_ts_file, ts.tokenToString(modifier.kind)));
                                     }
                                 }
                                 return;
                             }
                             break;
-                        case 151:
+                        case 152:
                             if (nodes === parent.modifiers) {
                                 diagnostics.push(createDiagnosticForNodeArray(nodes, ts.Diagnostics.parameter_modifiers_can_only_be_used_in_a_ts_file));
                                 return;
                             }
                             break;
-                        case 191:
                         case 192:
-                        case 211:
-                        case 261:
+                        case 193:
+                        case 212:
                         case 262:
+                        case 263:
                             if (nodes === parent.typeArguments) {
                                 diagnostics.push(createDiagnosticForNodeArray(nodes, ts.Diagnostics.type_arguments_can_only_be_used_in_a_ts_file));
                                 return;
@@ -72934,21 +75199,21 @@ var ts;
                     for (var _i = 0, modifiers_1 = modifiers; _i < modifiers_1.length; _i++) {
                         var modifier = modifiers_1[_i];
                         switch (modifier.kind) {
-                            case 77:
+                            case 78:
                                 if (isConstValid) {
                                     continue;
                                 }
-                            case 115:
-                            case 113:
+                            case 116:
                             case 114:
-                            case 133:
-                            case 125:
-                            case 118:
+                            case 115:
+                            case 134:
+                            case 126:
+                            case 119:
                                 diagnostics.push(createDiagnosticForNode(modifier, ts.Diagnostics._0_can_only_be_used_in_a_ts_file, ts.tokenToString(modifier.kind)));
                                 break;
-                            case 116:
-                            case 85:
-                            case 80:
+                            case 117:
+                            case 86:
+                            case 81:
                         }
                     }
                 }
@@ -73020,8 +75285,8 @@ var ts;
             return a.fileName === b.fileName;
         }
         function moduleNameIsEqualTo(a, b) {
-            return a.kind === 72
-                ? b.kind === 72 && a.escapedText === b.escapedText
+            return a.kind === 73
+                ? b.kind === 73 && a.escapedText === b.escapedText
                 : b.kind === 10 && a.text === b.text;
         }
         function collectExternalModuleReferences(file) {
@@ -73210,7 +75475,9 @@ var ts;
                     if (isRedirect) {
                         inputName = getProjectReferenceRedirect(fileName) || fileName;
                     }
-                    if (ts.getNormalizedAbsolutePath(checkedName, currentDirectory) !== ts.getNormalizedAbsolutePath(inputName, currentDirectory)) {
+                    var checkedAbsolutePath = ts.getNormalizedAbsolutePathWithoutRoot(checkedName, currentDirectory);
+                    var inputAbsolutePath = ts.getNormalizedAbsolutePathWithoutRoot(inputName, currentDirectory);
+                    if (checkedAbsolutePath !== inputAbsolutePath) {
                         reportFileNamesDifferOnlyInCasingError(inputName, checkedName, refFile, refPos, refEnd);
                     }
                 }
@@ -73236,9 +75503,12 @@ var ts;
             }
             var redirectedPath;
             if (refFile) {
-                var redirect = getProjectReferenceRedirect(fileName);
-                if (redirect) {
-                    (refFile.redirectedReferences || (refFile.redirectedReferences = [])).push(fileName);
+                var redirectProject = getProjectReferenceRedirectProject(fileName);
+                if (redirectProject) {
+                    if (redirectProject.commandLine.options.outFile || redirectProject.commandLine.options.out) {
+                        return undefined;
+                    }
+                    var redirect = getProjectReferenceOutputName(redirectProject, fileName);
                     fileName = redirect;
                     redirectedPath = toPath(redirect);
                 }
@@ -73311,17 +75581,20 @@ var ts;
             }
         }
         function getProjectReferenceRedirect(fileName) {
+            var referencedProject = getProjectReferenceRedirectProject(fileName);
+            return referencedProject && getProjectReferenceOutputName(referencedProject, fileName);
+        }
+        function getProjectReferenceRedirectProject(fileName) {
             if (!resolvedProjectReferences || !resolvedProjectReferences.length || ts.fileExtensionIs(fileName, ".d.ts") || !ts.fileExtensionIsOneOf(fileName, ts.supportedTSExtensions)) {
                 return undefined;
             }
-            var referencedProject = getResolvedProjectReferenceToRedirect(fileName);
-            if (!referencedProject) {
-                return undefined;
-            }
+            return getResolvedProjectReferenceToRedirect(fileName);
+        }
+        function getProjectReferenceOutputName(referencedProject, fileName) {
             var out = referencedProject.commandLine.options.outFile || referencedProject.commandLine.options.out;
             return out ?
                 ts.changeExtension(out, ".d.ts") :
-                ts.getOutputDeclarationFileName(fileName, referencedProject.commandLine);
+                ts.getOutputDeclarationFileName(fileName, referencedProject.commandLine, !host.useCaseSensitiveFileNames());
         }
         function getResolvedProjectReferenceToRedirect(fileName) {
             if (mapFromFileToProjectReferenceRedirects === undefined) {
@@ -73535,17 +75808,32 @@ var ts;
             if (fromCache !== undefined) {
                 return fromCache || undefined;
             }
-            var basePath = ts.getNormalizedAbsolutePath(ts.getDirectoryPath(refPath), host.getCurrentDirectory());
-            var sourceFile = host.getSourceFile(refPath, 100);
-            addFileToFilesByName(sourceFile, sourceFilePath, undefined);
-            if (sourceFile === undefined) {
-                projectReferenceRedirects.set(sourceFilePath, false);
-                return undefined;
+            var commandLine;
+            var sourceFile;
+            if (host.getParsedCommandLine) {
+                commandLine = host.getParsedCommandLine(refPath);
+                if (!commandLine) {
+                    addFileToFilesByName(undefined, sourceFilePath, undefined);
+                    projectReferenceRedirects.set(sourceFilePath, false);
+                    return undefined;
+                }
+                sourceFile = ts.Debug.assertDefined(commandLine.options.configFile);
+                ts.Debug.assert(!sourceFile.path || sourceFile.path === sourceFilePath);
+                addFileToFilesByName(sourceFile, sourceFilePath, undefined);
+            }
+            else {
+                var basePath = ts.getNormalizedAbsolutePath(ts.getDirectoryPath(refPath), host.getCurrentDirectory());
+                sourceFile = host.getSourceFile(refPath, 100);
+                addFileToFilesByName(sourceFile, sourceFilePath, undefined);
+                if (sourceFile === undefined) {
+                    projectReferenceRedirects.set(sourceFilePath, false);
+                    return undefined;
+                }
+                commandLine = ts.parseJsonSourceFileConfigFileContent(sourceFile, configParsingHost, basePath, undefined, refPath);
             }
             sourceFile.path = sourceFilePath;
             sourceFile.resolvedPath = sourceFilePath;
             sourceFile.originalFileName = refPath;
-            var commandLine = ts.parseJsonSourceFileConfigFileContent(sourceFile, configParsingHost, basePath, undefined, refPath);
             var resolvedRef = { commandLine: commandLine, sourceFile: sourceFile };
             projectReferenceRedirects.set(sourceFilePath, resolvedRef);
             if (commandLine.projectReferences) {
@@ -73561,9 +75849,6 @@ var ts;
                 if (ts.getEmitDeclarations(options)) {
                     createDiagnosticForOptionName(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, getEmitDeclarationOptionName(options), "isolatedModules");
                 }
-                if (options.noEmitOnError) {
-                    createDiagnosticForOptionName(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "noEmitOnError", "isolatedModules");
-                }
                 if (options.out) {
                     createDiagnosticForOptionName(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "out", "isolatedModules");
                 }
@@ -73595,16 +75880,18 @@ var ts;
                     createDiagnosticForOptionName(ts.Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1_or_option_2, "tsBuildInfoFile", "incremental", "composite");
                 }
             }
+            else if (options.incremental && !options.outFile && !options.out && !options.configFilePath) {
+                programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_incremental_can_only_be_specified_using_tsconfig_emitting_to_single_file_or_when_option_tsBuildInfoFile_is_specified));
+            }
             verifyProjectReferences();
             if (options.composite) {
-                var sourceFiles = files.filter(function (f) { return !f.isDeclarationFile; });
-                if (rootNames.length < sourceFiles.length) {
-                    var normalizedRootNames = rootNames.map(function (r) { return ts.normalizePath(r).toLowerCase(); });
-                    for (var _i = 0, _a = sourceFiles.map(function (f) { return ts.normalizePath(f.path).toLowerCase(); }); _i < _a.length; _i++) {
-                        var file = _a[_i];
-                        if (normalizedRootNames.indexOf(file) === -1) {
-                            programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.File_0_is_not_in_project_file_list_Projects_must_list_all_files_or_use_an_include_pattern, file));
-                        }
+                var rootPaths = rootNames.map(toPath);
+                for (var _i = 0, files_3 = files; _i < files_3.length; _i++) {
+                    var file = files_3[_i];
+                    if (!ts.sourceFileMayBeEmitted(file, options, isSourceFileFromExternalLibrary, getResolvedProjectReferenceToRedirect))
+                        continue;
+                    if (rootPaths.indexOf(file.path) === -1) {
+                        programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.File_0_is_not_listed_within_the_file_list_of_project_1_Projects_must_list_all_files_or_use_an_include_pattern, file.fileName, options.configFilePath || ""));
                     }
                 }
             }
@@ -73677,10 +75964,10 @@ var ts;
                 if (options.module === ts.ModuleKind.None && languageVersion < 2) {
                     createDiagnosticForOptionName(ts.Diagnostics.Option_isolatedModules_can_only_be_used_when_either_option_module_is_provided_or_option_target_is_ES2015_or_higher, "isolatedModules", "target");
                 }
-                var firstNonExternalModuleSourceFile = ts.find(files, function (f) { return !ts.isExternalModule(f) && !f.isDeclarationFile && f.scriptKind !== 6; });
+                var firstNonExternalModuleSourceFile = ts.find(files, function (f) { return !ts.isExternalModule(f) && !ts.isSourceFileJS(f) && !f.isDeclarationFile && f.scriptKind !== 6; });
                 if (firstNonExternalModuleSourceFile) {
                     var span = ts.getErrorSpanForNode(firstNonExternalModuleSourceFile, firstNonExternalModuleSourceFile);
-                    programDiagnostics.add(ts.createFileDiagnostic(firstNonExternalModuleSourceFile, span.start, span.length, ts.Diagnostics.Cannot_compile_namespaces_when_the_isolatedModules_flag_is_provided));
+                    programDiagnostics.add(ts.createFileDiagnostic(firstNonExternalModuleSourceFile, span.start, span.length, ts.Diagnostics.All_files_must_be_modules_when_the_isolatedModules_flag_is_provided));
                 }
             }
             else if (firstNonAmbientExternalModuleSourceFile && languageVersion < 2 && options.module === ts.ModuleKind.None) {
@@ -73755,12 +76042,12 @@ var ts;
                 if (emitFileName) {
                     var emitFilePath = toPath(emitFileName);
                     if (filesByName.has(emitFilePath)) {
-                        var chain_2;
+                        var chain = void 0;
                         if (!options.configFilePath) {
-                            chain_2 = ts.chainDiagnosticMessages(undefined, ts.Diagnostics.Adding_a_tsconfig_json_file_will_help_organize_projects_that_contain_both_TypeScript_and_JavaScript_files_Learn_more_at_https_Colon_Slash_Slashaka_ms_Slashtsconfig);
+                            chain = ts.chainDiagnosticMessages(undefined, ts.Diagnostics.Adding_a_tsconfig_json_file_will_help_organize_projects_that_contain_both_TypeScript_and_JavaScript_files_Learn_more_at_https_Colon_Slash_Slashaka_ms_Slashtsconfig);
                         }
-                        chain_2 = ts.chainDiagnosticMessages(chain_2, ts.Diagnostics.Cannot_write_file_0_because_it_would_overwrite_input_file, emitFileName);
-                        blockEmittingOfFile(emitFileName, ts.createCompilerDiagnosticFromMessageChain(chain_2));
+                        chain = ts.chainDiagnosticMessages(chain, ts.Diagnostics.Cannot_write_file_0_because_it_would_overwrite_input_file, emitFileName);
+                        blockEmittingOfFile(emitFileName, ts.createCompilerDiagnosticFromMessageChain(chain));
                     }
                     var emitFileKey = !host.useCaseSensitiveFileNames() ? emitFilePath.toLocaleLowerCase() : emitFilePath;
                     if (emitFilesSeen.has(emitFileKey)) {
@@ -73941,7 +76228,7 @@ var ts;
             readFile: function (f) { return directoryStructureHost.readFile(f); },
             useCaseSensitiveFileNames: host.useCaseSensitiveFileNames(),
             getCurrentDirectory: function () { return host.getCurrentDirectory(); },
-            onUnRecoverableConfigFileDiagnostic: host.onUnRecoverableConfigFileDiagnostic || (function () { return undefined; }),
+            onUnRecoverableConfigFileDiagnostic: host.onUnRecoverableConfigFileDiagnostic || ts.returnUndefined,
             trace: host.trace ? function (s) { return host.trace(s); } : undefined
         };
     }
@@ -74123,7 +76410,7 @@ var ts;
             var useOldState = canReuseOldState(referencedMap, oldState);
             for (var _i = 0, _a = newProgram.getSourceFiles(); _i < _a.length; _i++) {
                 var sourceFile = _a[_i];
-                var version_1 = sourceFile.version;
+                var version_1 = ts.Debug.assertDefined(sourceFile.version, "Program intended to be used with Builder should have source files with versions set");
                 var oldInfo = useOldState ? oldState.fileInfos.get(sourceFile.path) : undefined;
                 if (referencedMap) {
                     var newReferences = getReferencedFiles(newProgram, sourceFile, getCanonicalFileName);
@@ -74221,6 +76508,7 @@ var ts;
             cacheToUpdateSignature.set(sourceFile.path, latestSignature);
             return !prevSignature || latestSignature !== prevSignature;
         }
+        BuilderState.updateShapeSignature = updateShapeSignature;
         function updateExportedModules(sourceFile, exportedModulesFromDeclarationEmit, exportedModulesMapCache) {
             if (!exportedModulesFromDeclarationEmit) {
                 exportedModulesMapCache.set(sourceFile.path, false);
@@ -74253,7 +76541,6 @@ var ts;
         }
         BuilderState.updateExportedFilesMapFromCache = updateExportedFilesMapFromCache;
         function getAllDependencies(state, programOfThisState, sourceFile) {
-            var _a;
             var compilerOptions = programOfThisState.getCompilerOptions();
             if (compilerOptions.outFile || compilerOptions.out) {
                 return getAllFileNames(state, programOfThisState);
@@ -74270,8 +76557,8 @@ var ts;
                     var references = state.referencedMap.get(path);
                     if (references) {
                         var iterator = references.keys();
-                        for (var _b = iterator.next(), value = _b.value, done = _b.done; !done; _a = iterator.next(), value = _a.value, done = _a.done, _a) {
-                            queue.push(value);
+                        for (var iterResult = iterator.next(); !iterResult.done; iterResult = iterator.next()) {
+                            queue.push(iterResult.value);
                         }
                     }
                 }
@@ -74422,7 +76709,7 @@ var ts;
                 }
                 var diagnostics = oldState.semanticDiagnosticsPerFile.get(sourceFilePath);
                 if (diagnostics) {
-                    state.semanticDiagnosticsPerFile.set(sourceFilePath, oldState.hasReusableDiagnostic ? convertToDiagnostics(diagnostics, newProgram) : diagnostics);
+                    state.semanticDiagnosticsPerFile.set(sourceFilePath, oldState.hasReusableDiagnostic ? convertToDiagnostics(diagnostics, newProgram, getCanonicalFileName) : diagnostics);
                     if (!state.semanticDiagnosticsFromOldState) {
                         state.semanticDiagnosticsFromOldState = ts.createMap();
                     }
@@ -74430,43 +76717,36 @@ var ts;
                 }
             }
         });
-        if (oldCompilerOptions &&
-            (oldCompilerOptions.outDir !== compilerOptions.outDir ||
-                oldCompilerOptions.declarationDir !== compilerOptions.declarationDir ||
-                (oldCompilerOptions.outFile || oldCompilerOptions.out) !== (compilerOptions.outFile || compilerOptions.out))) {
-            state.affectedFilesPendingEmit = ts.concatenate(state.affectedFilesPendingEmit, newProgram.getSourceFiles().map(function (f) { return f.path; }));
-            if (state.affectedFilesPendingEmitIndex === undefined) {
-                state.affectedFilesPendingEmitIndex = 0;
-            }
+        if (oldCompilerOptions && ts.compilerOptionsAffectEmit(compilerOptions, oldCompilerOptions)) {
+            addToAffectedFilesPendingEmit(state, newProgram.getSourceFiles().map(function (f) { return f.path; }));
             ts.Debug.assert(state.seenAffectedFiles === undefined);
             state.seenAffectedFiles = ts.createMap();
         }
         return state;
     }
-    function convertToDiagnostics(diagnostics, newProgram) {
+    function convertToDiagnostics(diagnostics, newProgram, getCanonicalFileName) {
         if (!diagnostics.length)
             return ts.emptyArray;
+        var buildInfoDirectory = ts.getDirectoryPath(ts.getNormalizedAbsolutePath(ts.getOutputPathForBuildInfo(newProgram.getCompilerOptions()), newProgram.getCurrentDirectory()));
         return diagnostics.map(function (diagnostic) {
-            var result = convertToDiagnosticRelatedInformation(diagnostic, newProgram);
+            var result = convertToDiagnosticRelatedInformation(diagnostic, newProgram, toPath);
             result.reportsUnnecessary = diagnostic.reportsUnnecessary;
             result.source = diagnostic.source;
             var relatedInformation = diagnostic.relatedInformation;
             result.relatedInformation = relatedInformation ?
                 relatedInformation.length ?
-                    relatedInformation.map(function (r) { return convertToDiagnosticRelatedInformation(r, newProgram); }) :
+                    relatedInformation.map(function (r) { return convertToDiagnosticRelatedInformation(r, newProgram, toPath); }) :
                     ts.emptyArray :
                 undefined;
             return result;
         });
+        function toPath(path) {
+            return ts.toPath(path, buildInfoDirectory, getCanonicalFileName);
+        }
     }
-    function convertToDiagnosticRelatedInformation(diagnostic, newProgram) {
-        var file = diagnostic.file, messageText = diagnostic.messageText;
-        return __assign({}, diagnostic, { file: file && newProgram.getSourceFileByPath(file), messageText: messageText === undefined || ts.isString(messageText) ?
-                messageText :
-                convertToDiagnosticMessageChain(messageText, newProgram) });
-    }
-    function convertToDiagnosticMessageChain(diagnostic, newProgram) {
-        return __assign({}, diagnostic, { next: diagnostic.next && convertToDiagnosticMessageChain(diagnostic.next, newProgram) });
+    function convertToDiagnosticRelatedInformation(diagnostic, newProgram, toPath) {
+        var file = diagnostic.file;
+        return __assign({}, diagnostic, { file: file ? newProgram.getSourceFileByPath(toPath(file)) : undefined });
     }
     function releaseCache(state) {
         ts.BuilderState.releaseCache(state);
@@ -74505,7 +76785,7 @@ var ts;
                     var affectedFile = affectedFiles[affectedFilesIndex];
                     if (!seenAffectedFiles.has(affectedFile.path)) {
                         state.affectedFilesIndex = affectedFilesIndex;
-                        cleanSemanticDiagnosticsOfAffectedFile(state, affectedFile);
+                        handleDtsMayChangeOfAffectedFile(state, affectedFile, cancellationToken, computeHash);
                         return affectedFile;
                     }
                     seenAffectedFiles.set(affectedFile.path, true);
@@ -74554,72 +76834,36 @@ var ts;
         }
         return undefined;
     }
-    function cleanSemanticDiagnosticsOfAffectedFile(state, affectedFile) {
-        if (removeSemanticDiagnosticsOf(state, affectedFile.path)) {
+    function handleDtsMayChangeOfAffectedFile(state, affectedFile, cancellationToken, computeHash) {
+        removeSemanticDiagnosticsOf(state, affectedFile.path);
+        if (state.allFilesExcludingDefaultLibraryFile === state.affectedFiles) {
+            if (!state.cleanedDiagnosticsOfLibFiles) {
+                state.cleanedDiagnosticsOfLibFiles = true;
+                var program_1 = ts.Debug.assertDefined(state.program);
+                var options_2 = program_1.getCompilerOptions();
+                ts.forEach(program_1.getSourceFiles(), function (f) {
+                    return program_1.isSourceFileDefaultLibrary(f) &&
+                        !ts.skipTypeChecking(f, options_2) &&
+                        removeSemanticDiagnosticsOf(state, f.path);
+                });
+            }
             return;
         }
-        if (state.allFilesExcludingDefaultLibraryFile === state.affectedFiles && !state.cleanedDiagnosticsOfLibFiles) {
-            state.cleanedDiagnosticsOfLibFiles = true;
-            var program_1 = ts.Debug.assertDefined(state.program);
-            var options_2 = program_1.getCompilerOptions();
-            if (ts.forEach(program_1.getSourceFiles(), function (f) {
-                return program_1.isSourceFileDefaultLibrary(f) &&
-                    !ts.skipTypeChecking(f, options_2) &&
-                    removeSemanticDiagnosticsOf(state, f.path);
-            })) {
-                return;
+        forEachReferencingModulesOfExportOfAffectedFile(state, affectedFile, function (state, path) { return handleDtsMayChangeOf(state, path, cancellationToken, computeHash); });
+    }
+    function handleDtsMayChangeOf(state, path, cancellationToken, computeHash) {
+        removeSemanticDiagnosticsOf(state, path);
+        if (!state.changedFilesSet.has(path)) {
+            var program = ts.Debug.assertDefined(state.program);
+            var sourceFile = program.getSourceFileByPath(path);
+            if (sourceFile) {
+                ts.BuilderState.updateShapeSignature(state, program, sourceFile, ts.Debug.assertDefined(state.currentAffectedFilesSignatures), cancellationToken, computeHash, state.currentAffectedFilesExportedModulesMap);
+                if (ts.getEmitDeclarations(state.compilerOptions)) {
+                    addToAffectedFilesPendingEmit(state, [path]);
+                }
             }
         }
-        if (!state.exportedModulesMap || state.affectedFiles.length === 1 || !state.changedFilesSet.has(affectedFile.path)) {
-            return;
-        }
-        ts.Debug.assert(!!state.currentAffectedFilesExportedModulesMap);
-        var seenFileAndExportsOfFile = ts.createMap();
-        if (ts.forEachEntry(state.currentAffectedFilesExportedModulesMap, function (exportedModules, exportedFromPath) {
-            return exportedModules &&
-                exportedModules.has(affectedFile.path) &&
-                removeSemanticDiagnosticsOfFilesReferencingPath(state, exportedFromPath, seenFileAndExportsOfFile);
-        })) {
-            return;
-        }
-        ts.forEachEntry(state.exportedModulesMap, function (exportedModules, exportedFromPath) {
-            return !state.currentAffectedFilesExportedModulesMap.has(exportedFromPath) &&
-                exportedModules.has(affectedFile.path) &&
-                removeSemanticDiagnosticsOfFilesReferencingPath(state, exportedFromPath, seenFileAndExportsOfFile);
-        });
-    }
-    function removeSemanticDiagnosticsOfFilesReferencingPath(state, referencedPath, seenFileAndExportsOfFile) {
-        return ts.forEachEntry(state.referencedMap, function (referencesInFile, filePath) {
-            return referencesInFile.has(referencedPath) && removeSemanticDiagnosticsOfFileAndExportsOfFile(state, filePath, seenFileAndExportsOfFile);
-        });
-    }
-    function removeSemanticDiagnosticsOfFileAndExportsOfFile(state, filePath, seenFileAndExportsOfFile) {
-        if (!ts.addToSeen(seenFileAndExportsOfFile, filePath)) {
-            return false;
-        }
-        if (removeSemanticDiagnosticsOf(state, filePath)) {
-            return true;
-        }
-        ts.Debug.assert(!!state.currentAffectedFilesExportedModulesMap);
-        if (ts.forEachEntry(state.currentAffectedFilesExportedModulesMap, function (exportedModules, exportedFromPath) {
-            return exportedModules &&
-                exportedModules.has(filePath) &&
-                removeSemanticDiagnosticsOfFileAndExportsOfFile(state, exportedFromPath, seenFileAndExportsOfFile);
-        })) {
-            return true;
-        }
-        if (ts.forEachEntry(state.exportedModulesMap, function (exportedModules, exportedFromPath) {
-            return !state.currentAffectedFilesExportedModulesMap.has(exportedFromPath) &&
-                exportedModules.has(filePath) &&
-                removeSemanticDiagnosticsOfFileAndExportsOfFile(state, exportedFromPath, seenFileAndExportsOfFile);
-        })) {
-            return true;
-        }
-        return !!ts.forEachEntry(state.referencedMap, function (referencesInFile, referencingFilePath) {
-            return referencesInFile.has(filePath) &&
-                !seenFileAndExportsOfFile.has(referencingFilePath) &&
-                removeSemanticDiagnosticsOf(state, referencingFilePath);
-        });
+        return false;
     }
     function removeSemanticDiagnosticsOf(state, path) {
         if (!state.semanticDiagnosticsFromOldState) {
@@ -74629,6 +76873,58 @@ var ts;
         state.semanticDiagnosticsPerFile.delete(path);
         return !state.semanticDiagnosticsFromOldState.size;
     }
+    function forEachReferencingModulesOfExportOfAffectedFile(state, affectedFile, fn) {
+        if (!state.exportedModulesMap || state.affectedFiles.length === 1 || !state.changedFilesSet.has(affectedFile.path)) {
+            return;
+        }
+        ts.Debug.assert(!!state.currentAffectedFilesExportedModulesMap);
+        var seenFileAndExportsOfFile = ts.createMap();
+        if (ts.forEachEntry(state.currentAffectedFilesExportedModulesMap, function (exportedModules, exportedFromPath) {
+            return exportedModules &&
+                exportedModules.has(affectedFile.path) &&
+                forEachFilesReferencingPath(state, exportedFromPath, seenFileAndExportsOfFile, fn);
+        })) {
+            return;
+        }
+        ts.forEachEntry(state.exportedModulesMap, function (exportedModules, exportedFromPath) {
+            return !state.currentAffectedFilesExportedModulesMap.has(exportedFromPath) &&
+                exportedModules.has(affectedFile.path) &&
+                forEachFilesReferencingPath(state, exportedFromPath, seenFileAndExportsOfFile, fn);
+        });
+    }
+    function forEachFilesReferencingPath(state, referencedPath, seenFileAndExportsOfFile, fn) {
+        return ts.forEachEntry(state.referencedMap, function (referencesInFile, filePath) {
+            return referencesInFile.has(referencedPath) && forEachFileAndExportsOfFile(state, filePath, seenFileAndExportsOfFile, fn);
+        });
+    }
+    function forEachFileAndExportsOfFile(state, filePath, seenFileAndExportsOfFile, fn) {
+        if (!ts.addToSeen(seenFileAndExportsOfFile, filePath)) {
+            return false;
+        }
+        if (fn(state, filePath)) {
+            return true;
+        }
+        ts.Debug.assert(!!state.currentAffectedFilesExportedModulesMap);
+        if (ts.forEachEntry(state.currentAffectedFilesExportedModulesMap, function (exportedModules, exportedFromPath) {
+            return exportedModules &&
+                exportedModules.has(filePath) &&
+                forEachFileAndExportsOfFile(state, exportedFromPath, seenFileAndExportsOfFile, fn);
+        })) {
+            return true;
+        }
+        if (ts.forEachEntry(state.exportedModulesMap, function (exportedModules, exportedFromPath) {
+            return !state.currentAffectedFilesExportedModulesMap.has(exportedFromPath) &&
+                exportedModules.has(filePath) &&
+                forEachFileAndExportsOfFile(state, exportedFromPath, seenFileAndExportsOfFile, fn);
+        })) {
+            return true;
+        }
+        return !!ts.forEachEntry(state.referencedMap, function (referencesInFile, referencingFilePath) {
+            return referencesInFile.has(filePath) &&
+                !seenFileAndExportsOfFile.has(referencingFilePath) &&
+                fn(state, referencingFilePath);
+        });
+    }
     function doneWithAffectedFile(state, affected, isPendingEmit, isBuildInfoEmit) {
         if (isBuildInfoEmit) {
             state.emittedBuildInfo = true;
@@ -74665,19 +76961,24 @@ var ts;
         }
         return diagnostics;
     }
-    function getProgramBuildInfo(state) {
+    function getProgramBuildInfo(state, getCanonicalFileName) {
         if (state.compilerOptions.outFile || state.compilerOptions.out)
             return undefined;
+        var currentDirectory = ts.Debug.assertDefined(state.program).getCurrentDirectory();
+        var buildInfoDirectory = ts.getDirectoryPath(ts.getNormalizedAbsolutePath(ts.getOutputPathForBuildInfo(state.compilerOptions), currentDirectory));
         var fileInfos = {};
         state.fileInfos.forEach(function (value, key) {
             var signature = state.currentAffectedFilesSignatures && state.currentAffectedFilesSignatures.get(key);
-            fileInfos[key] = signature === undefined ? value : { version: value.version, signature: signature };
+            fileInfos[relativeToBuildInfo(key)] = signature === undefined ? value : { version: value.version, signature: signature };
         });
-        var result = { fileInfos: fileInfos, options: state.compilerOptions };
+        var result = {
+            fileInfos: fileInfos,
+            options: convertToReusableCompilerOptions(state.compilerOptions, relativeToBuildInfoEnsuringAbsolutePath)
+        };
         if (state.referencedMap) {
             var referencedMap_1 = {};
             state.referencedMap.forEach(function (value, key) {
-                referencedMap_1[key] = ts.arrayFrom(value.keys());
+                referencedMap_1[relativeToBuildInfo(key)] = ts.arrayFrom(value.keys(), relativeToBuildInfo);
             });
             result.referencedMap = referencedMap_1;
         }
@@ -74686,9 +76987,9 @@ var ts;
             state.exportedModulesMap.forEach(function (value, key) {
                 var newValue = state.currentAffectedFilesExportedModulesMap && state.currentAffectedFilesExportedModulesMap.get(key);
                 if (newValue === undefined)
-                    exportedModulesMap_1[key] = ts.arrayFrom(value.keys());
+                    exportedModulesMap_1[relativeToBuildInfo(key)] = ts.arrayFrom(value.keys(), relativeToBuildInfo);
                 else if (newValue)
-                    exportedModulesMap_1[key] = ts.arrayFrom(newValue.keys());
+                    exportedModulesMap_1[relativeToBuildInfo(key)] = ts.arrayFrom(newValue.keys(), relativeToBuildInfo);
             });
             result.exportedModulesMap = exportedModulesMap_1;
         }
@@ -74696,39 +76997,67 @@ var ts;
             var semanticDiagnosticsPerFile_1 = [];
             state.semanticDiagnosticsPerFile.forEach(function (value, key) { return semanticDiagnosticsPerFile_1.push(value.length ?
                 [
-                    key,
+                    relativeToBuildInfo(key),
                     state.hasReusableDiagnostic ?
                         value :
-                        convertToReusableDiagnostics(value)
+                        convertToReusableDiagnostics(value, relativeToBuildInfo)
                 ] :
-                key); });
+                relativeToBuildInfo(key)); });
             result.semanticDiagnosticsPerFile = semanticDiagnosticsPerFile_1;
         }
         return result;
+        function relativeToBuildInfoEnsuringAbsolutePath(path) {
+            return relativeToBuildInfo(ts.getNormalizedAbsolutePath(path, currentDirectory));
+        }
+        function relativeToBuildInfo(path) {
+            return ts.ensurePathIsNonModuleName(ts.getRelativePathFromDirectory(buildInfoDirectory, path, getCanonicalFileName));
+        }
     }
-    function convertToReusableDiagnostics(diagnostics) {
+    function convertToReusableCompilerOptions(options, relativeToBuildInfo) {
+        var result = {};
+        var optionsNameMap = ts.getOptionNameMap().optionNameMap;
+        for (var name in options) {
+            if (ts.hasProperty(options, name)) {
+                result[name] = convertToReusableCompilerOptionValue(optionsNameMap.get(name.toLowerCase()), options[name], relativeToBuildInfo);
+            }
+        }
+        if (result.configFilePath) {
+            result.configFilePath = relativeToBuildInfo(result.configFilePath);
+        }
+        return result;
+    }
+    function convertToReusableCompilerOptionValue(option, value, relativeToBuildInfo) {
+        if (option) {
+            if (option.type === "list") {
+                var values = value;
+                if (option.element.isFilePath && values.length) {
+                    return values.map(relativeToBuildInfo);
+                }
+            }
+            else if (option.isFilePath) {
+                return relativeToBuildInfo(value);
+            }
+        }
+        return value;
+    }
+    function convertToReusableDiagnostics(diagnostics, relativeToBuildInfo) {
         ts.Debug.assert(!!diagnostics.length);
         return diagnostics.map(function (diagnostic) {
-            var result = convertToReusableDiagnosticRelatedInformation(diagnostic);
+            var result = convertToReusableDiagnosticRelatedInformation(diagnostic, relativeToBuildInfo);
             result.reportsUnnecessary = diagnostic.reportsUnnecessary;
             result.source = diagnostic.source;
             var relatedInformation = diagnostic.relatedInformation;
             result.relatedInformation = relatedInformation ?
                 relatedInformation.length ?
-                    relatedInformation.map(function (r) { return convertToReusableDiagnosticRelatedInformation(r); }) :
+                    relatedInformation.map(function (r) { return convertToReusableDiagnosticRelatedInformation(r, relativeToBuildInfo); }) :
                     ts.emptyArray :
                 undefined;
             return result;
         });
     }
-    function convertToReusableDiagnosticRelatedInformation(diagnostic) {
-        var file = diagnostic.file, messageText = diagnostic.messageText;
-        return __assign({}, diagnostic, { file: file && file.path, messageText: messageText === undefined || ts.isString(messageText) ?
-                messageText :
-                convertToReusableDiagnosticMessageChain(messageText) });
-    }
-    function convertToReusableDiagnosticMessageChain(diagnostic) {
-        return __assign({}, diagnostic, { next: diagnostic.next && convertToReusableDiagnosticMessageChain(diagnostic.next) });
+    function convertToReusableDiagnosticRelatedInformation(diagnostic, relativeToBuildInfo) {
+        var file = diagnostic.file;
+        return __assign({}, diagnostic, { file: file ? relativeToBuildInfo(file.path) : undefined });
     }
     var BuilderProgramKind;
     (function (BuilderProgramKind) {
@@ -74779,7 +77108,7 @@ var ts;
         var computeHash = host.createHash || ts.generateDjb2Hash;
         var state = createBuilderProgramState(newProgram, getCanonicalFileName, oldState);
         var backupState;
-        newProgram.getProgramBuildInfo = function () { return getProgramBuildInfo(state); };
+        newProgram.getProgramBuildInfo = function () { return getProgramBuildInfo(state, getCanonicalFileName); };
         newProgram = undefined;
         oldProgram = undefined;
         oldState = undefined;
@@ -74804,6 +77133,7 @@ var ts;
             result.getSemanticDiagnosticsOfNextAffectedFile = getSemanticDiagnosticsOfNextAffectedFile;
         }
         else if (kind === BuilderProgramKind.EmitAndSemanticDiagnosticsBuilderProgram) {
+            result.getSemanticDiagnosticsOfNextAffectedFile = getSemanticDiagnosticsOfNextAffectedFile;
             result.emitNextAffectedFile = emitNextAffectedFile;
         }
         else {
@@ -74821,7 +77151,7 @@ var ts;
                             return undefined;
                         }
                         var affected_1 = ts.Debug.assertDefined(state.program);
-                        return toAffectedFileResult(state, affected_1.emitBuildInfo(writeFile || host.writeFile, cancellationToken), affected_1, false, true);
+                        return toAffectedFileResult(state, affected_1.emitBuildInfo(writeFile || ts.maybeBind(host, host.writeFile), cancellationToken), affected_1, false, true);
                     }
                     isPendingEmitFile = true;
                 }
@@ -74834,10 +77164,7 @@ var ts;
                     affected = program;
                 }
             }
-            if (state.affectedFilesPendingEmit && state.program !== affected) {
-                (state.seenEmittedFiles || (state.seenEmittedFiles = ts.createMap())).set(affected.path, true);
-            }
-            return toAffectedFileResult(state, ts.Debug.assertDefined(state.program).emit(affected === state.program ? undefined : affected, writeFile || host.writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers), affected, isPendingEmitFile);
+            return toAffectedFileResult(state, ts.Debug.assertDefined(state.program).emit(affected === state.program ? undefined : affected, writeFile || ts.maybeBind(host, host.writeFile), cancellationToken, emitOnlyDtsFiles, customTransformers), affected, isPendingEmitFile);
         }
         function emit(targetSourceFile, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers) {
             if (kind === BuilderProgramKind.EmitAndSemanticDiagnosticsBuilderProgram) {
@@ -74862,7 +77189,7 @@ var ts;
                     };
                 }
             }
-            return ts.Debug.assertDefined(state.program).emit(targetSourceFile, writeFile || host.writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers);
+            return ts.Debug.assertDefined(state.program).emit(targetSourceFile, writeFile || ts.maybeBind(host, host.writeFile), cancellationToken, emitOnlyDtsFiles, customTransformers);
         }
         function getSemanticDiagnosticsOfNextAffectedFile(cancellationToken, ignoreSourceFile) {
             while (true) {
@@ -74873,6 +77200,9 @@ var ts;
                 else if (affected === state.program) {
                     return toAffectedFileResult(state, state.program.getSemanticDiagnostics(undefined, cancellationToken), affected);
                 }
+                if (kind === BuilderProgramKind.EmitAndSemanticDiagnosticsBuilderProgram) {
+                    addToAffectedFilesPendingEmit(state, [affected.path]);
+                }
                 if (ignoreSourceFile && ignoreSourceFile(affected)) {
                     doneWithAffectedFile(state, affected);
                     continue;
@@ -74890,47 +77220,48 @@ var ts;
             if (sourceFile) {
                 return getSemanticDiagnosticsOfFile(state, sourceFile, cancellationToken);
             }
-            var affected;
-            var affectedFilesPendingEmit;
-            while (affected = getNextAffectedFile(state, cancellationToken, computeHash)) {
-                if (affected !== state.program && kind === BuilderProgramKind.EmitAndSemanticDiagnosticsBuilderProgram) {
-                    (affectedFilesPendingEmit || (affectedFilesPendingEmit = [])).push(affected.path);
-                }
-                doneWithAffectedFile(state, affected);
-            }
-            if (affectedFilesPendingEmit) {
-                state.affectedFilesPendingEmit = ts.concatenate(state.affectedFilesPendingEmit, affectedFilesPendingEmit);
-                if (state.affectedFilesPendingEmitIndex === undefined) {
-                    state.affectedFilesPendingEmitIndex = 0;
-                }
+            while (getSemanticDiagnosticsOfNextAffectedFile(cancellationToken)) {
             }
             var diagnostics;
             for (var _i = 0, _a = ts.Debug.assertDefined(state.program).getSourceFiles(); _i < _a.length; _i++) {
-                var sourceFile_2 = _a[_i];
-                diagnostics = ts.addRange(diagnostics, getSemanticDiagnosticsOfFile(state, sourceFile_2, cancellationToken));
+                var sourceFile_1 = _a[_i];
+                diagnostics = ts.addRange(diagnostics, getSemanticDiagnosticsOfFile(state, sourceFile_1, cancellationToken));
             }
             return diagnostics || ts.emptyArray;
         }
     }
     ts.createBuilderProgram = createBuilderProgram;
-    function getMapOfReferencedSet(mapLike) {
+    function addToAffectedFilesPendingEmit(state, affectedFilesPendingEmit) {
+        state.affectedFilesPendingEmit = ts.concatenate(state.affectedFilesPendingEmit, affectedFilesPendingEmit);
+        if (state.affectedFilesPendingEmitIndex === undefined) {
+            state.affectedFilesPendingEmitIndex = 0;
+        }
+    }
+    function getMapOfReferencedSet(mapLike, toPath) {
         if (!mapLike)
             return undefined;
         var map = ts.createMap();
         for (var key in mapLike) {
             if (ts.hasProperty(mapLike, key)) {
-                map.set(key, ts.arrayToSet(mapLike[key]));
+                map.set(toPath(key), ts.arrayToSet(mapLike[key], toPath));
             }
         }
         return map;
     }
-    function createBuildProgramUsingProgramBuildInfo(program) {
-        var fileInfos = ts.createMapFromTemplate(program.fileInfos);
+    function createBuildProgramUsingProgramBuildInfo(program, buildInfoPath, host) {
+        var buildInfoDirectory = ts.getDirectoryPath(ts.getNormalizedAbsolutePath(buildInfoPath, host.getCurrentDirectory()));
+        var getCanonicalFileName = ts.createGetCanonicalFileName(host.useCaseSensitiveFileNames());
+        var fileInfos = ts.createMap();
+        for (var key in program.fileInfos) {
+            if (ts.hasProperty(program.fileInfos, key)) {
+                fileInfos.set(toPath(key), program.fileInfos[key]);
+            }
+        }
         var state = {
             fileInfos: fileInfos,
-            compilerOptions: program.options,
-            referencedMap: getMapOfReferencedSet(program.referencedMap),
-            exportedModulesMap: getMapOfReferencedSet(program.exportedModulesMap),
+            compilerOptions: convertFromReusableCompilerOptions(program.options, toAbsolutePath),
+            referencedMap: getMapOfReferencedSet(program.referencedMap, toPath),
+            exportedModulesMap: getMapOfReferencedSet(program.exportedModulesMap, toPath),
             semanticDiagnosticsPerFile: program.semanticDiagnosticsPerFile && ts.arrayToMap(program.semanticDiagnosticsPerFile, function (value) { return ts.isString(value) ? value : value[0]; }, function (value) { return ts.isString(value) ? ts.emptyArray : value[1]; }),
             hasReusableDiagnostic: true
         };
@@ -74939,7 +77270,7 @@ var ts;
             backupState: ts.noop,
             restoreState: ts.noop,
             getProgram: ts.notImplemented,
-            getProgramOrUndefined: function () { return undefined; },
+            getProgramOrUndefined: ts.returnUndefined,
             releaseProgram: ts.noop,
             getCompilerOptions: function () { return state.compilerOptions; },
             getSourceFile: ts.notImplemented,
@@ -74956,8 +77287,41 @@ var ts;
             emitNextAffectedFile: ts.notImplemented,
             getSemanticDiagnosticsOfNextAffectedFile: ts.notImplemented,
         };
+        function toPath(path) {
+            return ts.toPath(path, buildInfoDirectory, getCanonicalFileName);
+        }
+        function toAbsolutePath(path) {
+            return ts.getNormalizedAbsolutePath(path, buildInfoDirectory);
+        }
     }
     ts.createBuildProgramUsingProgramBuildInfo = createBuildProgramUsingProgramBuildInfo;
+    function convertFromReusableCompilerOptions(options, toAbsolutePath) {
+        var result = {};
+        var optionsNameMap = ts.getOptionNameMap().optionNameMap;
+        for (var name in options) {
+            if (ts.hasProperty(options, name)) {
+                result[name] = convertFromReusableCompilerOptionValue(optionsNameMap.get(name.toLowerCase()), options[name], toAbsolutePath);
+            }
+        }
+        if (result.configFilePath) {
+            result.configFilePath = toAbsolutePath(result.configFilePath);
+        }
+        return result;
+    }
+    function convertFromReusableCompilerOptionValue(option, value, toAbsolutePath) {
+        if (option) {
+            if (option.type === "list") {
+                var values = value;
+                if (option.element.isFilePath && values.length) {
+                    return values.map(toAbsolutePath);
+                }
+            }
+            else if (option.isFilePath) {
+                return toAbsolutePath(value);
+            }
+        }
+        return value;
+    }
     function createRedirectedBuilderProgram(state, configFileParsingDiagnostics) {
         return {
             getState: ts.notImplemented,
@@ -75006,6 +77370,28 @@ var ts;
         return ts.some(ts.ignoredPaths, function (searchPath) { return ts.stringContains(path, searchPath); });
     }
     ts.isPathIgnored = isPathIgnored;
+    function canWatchDirectory(dirPath) {
+        var rootLength = ts.getRootLength(dirPath);
+        if (dirPath.length === rootLength) {
+            return false;
+        }
+        var nextDirectorySeparator = dirPath.indexOf(ts.directorySeparator, rootLength);
+        if (nextDirectorySeparator === -1) {
+            return false;
+        }
+        if (dirPath.charCodeAt(0) !== 47 &&
+            dirPath.substr(rootLength, nextDirectorySeparator).search(/users/i) === -1) {
+            return true;
+        }
+        for (var searchIndex = nextDirectorySeparator + 1, searchLevels = 2; searchLevels > 0; searchLevels--) {
+            searchIndex = dirPath.indexOf(ts.directorySeparator, searchIndex) + 1;
+            if (searchIndex === 0) {
+                return false;
+            }
+        }
+        return true;
+    }
+    ts.canWatchDirectory = canWatchDirectory;
     ts.maxNumberOfFilesToIterateForInvalidation = 256;
     function createResolutionCache(resolutionHost, rootDirForResolution, logChangesWhenResolvingModule) {
         var filesWithChangedSetOfUnresolvedImports;
@@ -75116,7 +77502,7 @@ var ts;
             }
             var globalCache = resolutionHost.getGlobalCache();
             if (globalCache !== undefined && !ts.isExternalModuleNameRelative(moduleName) && !(primaryResult.resolvedModule && ts.extensionIsTS(primaryResult.resolvedModule.extension))) {
-                var _a = ts.loadModuleFromGlobalCache(moduleName, resolutionHost.projectName, compilerOptions, host, globalCache), resolvedModule = _a.resolvedModule, failedLookupLocations = _a.failedLookupLocations;
+                var _a = ts.loadModuleFromGlobalCache(ts.Debug.assertDefined(resolutionHost.globalCacheResolutionModuleName)(moduleName), resolutionHost.projectName, compilerOptions, host, globalCache), resolvedModule = _a.resolvedModule, failedLookupLocations = _a.failedLookupLocations;
                 if (resolvedModule) {
                     return { resolvedModule: resolvedModule, failedLookupLocations: ts.addRange(primaryResult.failedLookupLocations, failedLookupLocations) };
                 }
@@ -75212,27 +77598,6 @@ var ts;
         function isNodeModulesAtTypesDirectory(dirPath) {
             return ts.endsWith(dirPath, "/node_modules/@types");
         }
-        function canWatchDirectory(dirPath) {
-            var rootLength = ts.getRootLength(dirPath);
-            if (dirPath.length === rootLength) {
-                return false;
-            }
-            var nextDirectorySeparator = dirPath.indexOf(ts.directorySeparator, rootLength);
-            if (nextDirectorySeparator === -1) {
-                return false;
-            }
-            if (dirPath.charCodeAt(0) !== 47 &&
-                dirPath.substr(rootLength, nextDirectorySeparator).search(/users/i) === -1) {
-                return true;
-            }
-            for (var searchIndex = nextDirectorySeparator + 1, searchLevels = 2; searchLevels > 0; searchLevels--) {
-                searchIndex = dirPath.indexOf(ts.directorySeparator, searchIndex) + 1;
-                if (searchIndex === 0) {
-                    return false;
-                }
-            }
-            return true;
-        }
         function getDirectoryToWatchFailedLookupLocation(failedLookupLocation, failedLookupLocationPath) {
             if (isInDirectoryPath(rootPath, failedLookupLocationPath)) {
                 failedLookupLocation = ts.isRootedDiskPath(failedLookupLocation) ? ts.normalizePath(failedLookupLocation) : ts.getNormalizedAbsolutePath(failedLookupLocation, getCurrentDirectory());
@@ -75467,6 +77832,9 @@ var ts;
             else {
                 if (isPathIgnored(fileOrDirectoryPath))
                     return false;
+                if (resolutionHost.fileIsOpen(fileOrDirectoryPath)) {
+                    return false;
+                }
                 var dirOfFileOrDirectory = ts.getDirectoryPath(fileOrDirectoryPath);
                 if (isNodeModulesAtTypesDirectory(fileOrDirectoryPath) || isNodeModulesDirectory(fileOrDirectoryPath) ||
                     isNodeModulesAtTypesDirectory(dirOfFileOrDirectory) || isNodeModulesDirectory(dirOfFileOrDirectory)) {
@@ -75661,11 +78029,11 @@ var ts;
         }
         function discoverProbableSymlinks(files, getCanonicalFileName, cwd) {
             var result = ts.createMap();
-            var symlinks = ts.mapDefined(files, function (sf) {
-                return sf.resolvedModules && ts.firstDefinedIterator(sf.resolvedModules.values(), function (res) {
+            var symlinks = ts.flatten(ts.mapDefined(files, function (sf) {
+                return sf.resolvedModules && ts.compact(ts.arrayFrom(ts.mapIterator(sf.resolvedModules.values(), function (res) {
                     return res && res.originalPath && res.resolvedFileName !== res.originalPath ? [res.resolvedFileName, res.originalPath] : undefined;
-                });
-            });
+                })));
+            }));
             for (var _i = 0, symlinks_1 = symlinks; _i < symlinks_1.length; _i++) {
                 var _a = symlinks_1[_i], resolvedPath = _a[0], originalPath = _a[1];
                 var _b = guessDirectorySymlink(resolvedPath, originalPath, cwd, getCanonicalFileName), commonResolved = _b[0], commonOriginal = _b[1];
@@ -75972,18 +78340,27 @@ var ts;
         return "" + newLine + ts.flattenDiagnosticMessageText(d.messageText, newLine) + newLine + newLine;
     }
     ts.getErrorSummaryText = getErrorSummaryText;
-    function emitFilesAndReportErrors(program, reportDiagnostic, writeFileName, reportSummary, writeFile) {
+    function listFiles(program, writeFileName) {
+        if (program.getCompilerOptions().listFiles) {
+            ts.forEach(program.getSourceFiles(), function (file) {
+                writeFileName(file.fileName);
+            });
+        }
+    }
+    ts.listFiles = listFiles;
+    function emitFilesAndReportErrors(program, reportDiagnostic, writeFileName, reportSummary, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers) {
         var diagnostics = program.getConfigFileParsingDiagnostics().slice();
         var configFileParsingDiagnosticsLength = diagnostics.length;
-        ts.addRange(diagnostics, program.getSyntacticDiagnostics());
+        ts.addRange(diagnostics, program.getSyntacticDiagnostics(undefined, cancellationToken));
         if (diagnostics.length === configFileParsingDiagnosticsLength) {
-            ts.addRange(diagnostics, program.getOptionsDiagnostics());
-            ts.addRange(diagnostics, program.getGlobalDiagnostics());
+            ts.addRange(diagnostics, program.getOptionsDiagnostics(cancellationToken));
+            ts.addRange(diagnostics, program.getGlobalDiagnostics(cancellationToken));
             if (diagnostics.length === configFileParsingDiagnosticsLength) {
-                ts.addRange(diagnostics, program.getSemanticDiagnostics());
+                ts.addRange(diagnostics, program.getSemanticDiagnostics(undefined, cancellationToken));
             }
         }
-        var _a = program.emit(undefined, writeFile), emittedFiles = _a.emittedFiles, emitSkipped = _a.emitSkipped, emitDiagnostics = _a.diagnostics;
+        var emitResult = program.emit(undefined, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers);
+        var emittedFiles = emitResult.emittedFiles, emitDiagnostics = emitResult.diagnostics;
         ts.addRange(diagnostics, emitDiagnostics);
         ts.sortAndDeduplicateDiagnostics(diagnostics).forEach(reportDiagnostic);
         if (writeFileName) {
@@ -75992,16 +78369,20 @@ var ts;
                 var filepath = ts.getNormalizedAbsolutePath(file, currentDir_1);
                 writeFileName("TSFILE: " + filepath);
             });
-            if (program.getCompilerOptions().listFiles) {
-                ts.forEach(program.getSourceFiles(), function (file) {
-                    writeFileName(file.fileName);
-                });
-            }
+            listFiles(program, writeFileName);
         }
         if (reportSummary) {
             reportSummary(getErrorCountForSummary(diagnostics));
         }
-        if (emitSkipped && diagnostics.length > 0) {
+        return {
+            emitResult: emitResult,
+            diagnostics: diagnostics,
+        };
+    }
+    ts.emitFilesAndReportErrors = emitFilesAndReportErrors;
+    function emitFilesAndReportErrorsAndGetExitStatus(program, reportDiagnostic, writeFileName, reportSummary, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers) {
+        var _a = emitFilesAndReportErrors(program, reportDiagnostic, writeFileName, reportSummary, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers), emitResult = _a.emitResult, diagnostics = _a.diagnostics;
+        if (emitResult.emitSkipped && diagnostics.length > 0) {
             return ts.ExitStatus.DiagnosticsPresent_OutputsSkipped;
         }
         else if (diagnostics.length > 0) {
@@ -76009,15 +78390,15 @@ var ts;
         }
         return ts.ExitStatus.Success;
     }
-    ts.emitFilesAndReportErrors = emitFilesAndReportErrors;
-    var noopFileWatcher = { close: ts.noop };
+    ts.emitFilesAndReportErrorsAndGetExitStatus = emitFilesAndReportErrorsAndGetExitStatus;
+    ts.noopFileWatcher = { close: ts.noop };
     function createWatchHost(system, reportWatchStatus) {
         if (system === void 0) { system = ts.sys; }
         var onWatchStatusChange = reportWatchStatus || createWatchStatusReporter(system);
         return {
             onWatchStatusChange: onWatchStatusChange,
-            watchFile: ts.maybeBind(system, system.watchFile) || (function () { return noopFileWatcher; }),
-            watchDirectory: ts.maybeBind(system, system.watchDirectory) || (function () { return noopFileWatcher; }),
+            watchFile: ts.maybeBind(system, system.watchFile) || (function () { return ts.noopFileWatcher; }),
+            watchDirectory: ts.maybeBind(system, system.watchDirectory) || (function () { return ts.noopFileWatcher; }),
             setTimeout: ts.maybeBind(system, system.setTimeout) || ts.noop,
             clearTimeout: ts.maybeBind(system, system.clearTimeout) || ts.noop
         };
@@ -76093,7 +78474,7 @@ var ts;
         }
     }
     ts.createCompilerHostFromProgramHost = createCompilerHostFromProgramHost;
-    function setCreateSourceFileAsHashVersioned(compilerHost, host) {
+    function setGetSourceFileAsHashVersioned(compilerHost, host) {
         var originalGetSourceFile = compilerHost.getSourceFile;
         var computeHash = host.createHash || ts.generateDjb2Hash;
         compilerHost.getSourceFile = function () {
@@ -76108,7 +78489,7 @@ var ts;
             return result;
         };
     }
-    ts.setCreateSourceFileAsHashVersioned = setCreateSourceFileAsHashVersioned;
+    ts.setGetSourceFileAsHashVersioned = setGetSourceFileAsHashVersioned;
     function createProgramHost(system, createProgram) {
         var getDefaultLibLocation = ts.memoize(function () { return ts.getDirectoryPath(ts.normalizePath(system.getExecutingFilePath())); });
         var host = system;
@@ -76168,13 +78549,25 @@ var ts;
         return host;
     }
     ts.createWatchCompilerHostOfFilesAndCompilerOptions = createWatchCompilerHostOfFilesAndCompilerOptions;
-    function readBuilderProgram(compilerOptions, readFile) {
+    function performIncrementalCompilation(input) {
+        var system = input.system || ts.sys;
+        var host = input.host || (input.host = ts.createIncrementalCompilerHost(input.options, system));
+        var builderProgram = ts.createIncrementalProgram(input);
+        var exitStatus = emitFilesAndReportErrorsAndGetExitStatus(builderProgram, input.reportDiagnostic || createDiagnosticReporter(system), function (s) { return host.trace && host.trace(s); }, input.reportErrorSummary || input.options.pretty ? function (errorCount) { return system.write(getErrorSummaryText(errorCount, system.newLine)); } : undefined);
+        if (input.afterProgramEmitAndDiagnostics)
+            input.afterProgramEmitAndDiagnostics(builderProgram);
+        return exitStatus;
+    }
+    ts.performIncrementalCompilation = performIncrementalCompilation;
+})(ts || (ts = {}));
+(function (ts) {
+    function readBuilderProgram(compilerOptions, host) {
         if (compilerOptions.out || compilerOptions.outFile)
             return undefined;
         var buildInfoPath = ts.getOutputPathForBuildInfo(compilerOptions);
         if (!buildInfoPath)
             return undefined;
-        var content = readFile(buildInfoPath);
+        var content = host.readFile(buildInfoPath);
         if (!content)
             return undefined;
         var buildInfo = ts.getBuildInfo(content);
@@ -76182,11 +78575,26 @@ var ts;
             return undefined;
         if (!buildInfo.program)
             return undefined;
-        return ts.createBuildProgramUsingProgramBuildInfo(buildInfo.program);
+        return ts.createBuildProgramUsingProgramBuildInfo(buildInfo.program, buildInfoPath, host);
     }
     ts.readBuilderProgram = readBuilderProgram;
-})(ts || (ts = {}));
-(function (ts) {
+    function createIncrementalCompilerHost(options, system) {
+        if (system === void 0) { system = ts.sys; }
+        var host = ts.createCompilerHostWorker(options, undefined, system);
+        host.createHash = ts.maybeBind(system, system.createHash);
+        ts.setGetSourceFileAsHashVersioned(host, system);
+        ts.changeCompilerHostLikeToUseCache(host, function (fileName) { return ts.toPath(fileName, host.getCurrentDirectory(), host.getCanonicalFileName); });
+        return host;
+    }
+    ts.createIncrementalCompilerHost = createIncrementalCompilerHost;
+    function createIncrementalProgram(_a) {
+        var rootNames = _a.rootNames, options = _a.options, configFileParsingDiagnostics = _a.configFileParsingDiagnostics, projectReferences = _a.projectReferences, host = _a.host, createProgram = _a.createProgram;
+        host = host || createIncrementalCompilerHost(options);
+        createProgram = createProgram || ts.createEmitAndSemanticDiagnosticsBuilderProgram;
+        var oldProgram = readBuilderProgram(options, host);
+        return createProgram(rootNames, options, host, oldProgram, configFileParsingDiagnostics, projectReferences);
+    }
+    ts.createIncrementalProgram = createIncrementalProgram;
     function createWatchCompilerHost(rootFilesOrConfigFileName, options, system, createProgram, reportDiagnostic, reportWatchStatus, projectReferences) {
         if (ts.isArray(rootFilesOrConfigFileName)) {
             return ts.createWatchCompilerHostOfFilesAndCompilerOptions(rootFilesOrConfigFileName, options, system, createProgram, reportDiagnostic, reportWatchStatus, projectReferences);
@@ -76240,7 +78648,7 @@ var ts;
             configFileWatcher = watchFile(host, configFileName, scheduleProgramReload, ts.PollingInterval.High, "Config file");
         }
         var compilerHost = ts.createCompilerHostFromProgramHost(host, function () { return compilerOptions; }, directoryStructureHost);
-        ts.setCreateSourceFileAsHashVersioned(compilerHost, host);
+        ts.setGetSourceFileAsHashVersioned(compilerHost, host);
         var getNewSourceFile = compilerHost.getSourceFile;
         compilerHost.getSourceFile = function (fileName) {
             var args = [];
@@ -76263,6 +78671,7 @@ var ts;
             hasChangedAutomaticTypeDirectiveNames = true;
             scheduleProgramUpdate();
         };
+        compilerHost.fileIsOpen = ts.returnFalse;
         compilerHost.maxNumberOfFilesToIterateForInvalidation = host.maxNumberOfFilesToIterateForInvalidation;
         compilerHost.getCurrentProgram = getCurrentProgram;
         compilerHost.writeLog = writeLog;
@@ -76276,7 +78685,7 @@ var ts;
             (function (typeDirectiveNames, containingFile, redirectedReference) { return host.resolveTypeReferenceDirectives(typeDirectiveNames, containingFile, redirectedReference); }) :
             (function (typeDirectiveNames, containingFile, redirectedReference) { return resolutionCache.resolveTypeReferenceDirectives(typeDirectiveNames, containingFile, redirectedReference); });
         var userProvidedResolution = !!host.resolveModuleNames || !!host.resolveTypeReferenceDirectives;
-        builderProgram = ts.readBuilderProgram(compilerOptions, function (path) { return compilerHost.readFile(path); });
+        builderProgram = readBuilderProgram(compilerOptions, compilerHost);
         synchronizeProgram();
         watchConfigFileWildCardDirectories();
         return configFileName ?
@@ -76574,20 +78983,6 @@ var ts;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
-    var minimumDate = new Date(-8640000000000000);
-    var maximumDate = new Date(8640000000000000);
-    var BuildResultFlags;
-    (function (BuildResultFlags) {
-        BuildResultFlags[BuildResultFlags["None"] = 0] = "None";
-        BuildResultFlags[BuildResultFlags["Success"] = 1] = "Success";
-        BuildResultFlags[BuildResultFlags["DeclarationOutputUnchanged"] = 2] = "DeclarationOutputUnchanged";
-        BuildResultFlags[BuildResultFlags["ConfigFileErrors"] = 4] = "ConfigFileErrors";
-        BuildResultFlags[BuildResultFlags["SyntaxErrors"] = 8] = "SyntaxErrors";
-        BuildResultFlags[BuildResultFlags["TypeErrors"] = 16] = "TypeErrors";
-        BuildResultFlags[BuildResultFlags["DeclarationEmitErrors"] = 32] = "DeclarationEmitErrors";
-        BuildResultFlags[BuildResultFlags["EmitErrors"] = 64] = "EmitErrors";
-        BuildResultFlags[BuildResultFlags["AnyErrors"] = 124] = "AnyErrors";
-    })(BuildResultFlags || (BuildResultFlags = {}));
     var UpToDateStatusType;
     (function (UpToDateStatusType) {
         UpToDateStatusType[UpToDateStatusType["Unbuildable"] = 0] = "Unbuildable";
@@ -76603,99 +78998,44 @@ var ts;
         UpToDateStatusType[UpToDateStatusType["TsVersionOutputOfDate"] = 10] = "TsVersionOutputOfDate";
         UpToDateStatusType[UpToDateStatusType["ContainerOnly"] = 11] = "ContainerOnly";
     })(UpToDateStatusType = ts.UpToDateStatusType || (ts.UpToDateStatusType = {}));
-    function createFileMap(toPath) {
-        var lookup = ts.createMap();
-        return {
-            setValue: setValue,
-            getValue: getValue,
-            removeKey: removeKey,
-            forEach: forEach,
-            hasKey: hasKey,
-            getSize: getSize,
-            clear: clear
-        };
-        function forEach(action) {
-            lookup.forEach(action);
-        }
-        function hasKey(fileName) {
-            return lookup.has(toPath(fileName));
-        }
-        function removeKey(fileName) {
-            lookup.delete(toPath(fileName));
-        }
-        function setValue(fileName, value) {
-            lookup.set(toPath(fileName), value);
-        }
-        function getValue(fileName) {
-            return lookup.get(toPath(fileName));
-        }
-        function getSize() {
-            return lookup.size;
-        }
-        function clear() {
-            lookup.clear();
+    function resolveConfigFileProjectName(project) {
+        if (ts.fileExtensionIs(project, ".json")) {
+            return project;
         }
+        return ts.combinePaths(project, "tsconfig.json");
+    }
+    ts.resolveConfigFileProjectName = resolveConfigFileProjectName;
+})(ts || (ts = {}));
+(function (ts) {
+    var minimumDate = new Date(-8640000000000000);
+    var maximumDate = new Date(8640000000000000);
+    var BuildResultFlags;
+    (function (BuildResultFlags) {
+        BuildResultFlags[BuildResultFlags["None"] = 0] = "None";
+        BuildResultFlags[BuildResultFlags["Success"] = 1] = "Success";
+        BuildResultFlags[BuildResultFlags["DeclarationOutputUnchanged"] = 2] = "DeclarationOutputUnchanged";
+        BuildResultFlags[BuildResultFlags["ConfigFileErrors"] = 4] = "ConfigFileErrors";
+        BuildResultFlags[BuildResultFlags["SyntaxErrors"] = 8] = "SyntaxErrors";
+        BuildResultFlags[BuildResultFlags["TypeErrors"] = 16] = "TypeErrors";
+        BuildResultFlags[BuildResultFlags["DeclarationEmitErrors"] = 32] = "DeclarationEmitErrors";
+        BuildResultFlags[BuildResultFlags["EmitErrors"] = 64] = "EmitErrors";
+        BuildResultFlags[BuildResultFlags["AnyErrors"] = 124] = "AnyErrors";
+    })(BuildResultFlags || (BuildResultFlags = {}));
+    function createConfigFileMap() {
+        return ts.createMap();
     }
     function getOrCreateValueFromConfigFileMap(configFileMap, resolved, createT) {
-        var existingValue = configFileMap.getValue(resolved);
+        var existingValue = configFileMap.get(resolved);
         var newValue;
         if (!existingValue) {
             newValue = createT();
-            configFileMap.setValue(resolved, newValue);
+            configFileMap.set(resolved, newValue);
         }
         return existingValue || newValue;
     }
     function getOrCreateValueMapFromConfigFileMap(configFileMap, resolved) {
         return getOrCreateValueFromConfigFileMap(configFileMap, resolved, ts.createMap);
     }
-    function getOutputDeclarationFileName(inputFileName, configFile) {
-        var relativePath = ts.getRelativePathFromDirectory(rootDirOfOptions(configFile.options, configFile.options.configFilePath), inputFileName, true);
-        var outputPath = ts.resolvePath(configFile.options.declarationDir || configFile.options.outDir || ts.getDirectoryPath(configFile.options.configFilePath), relativePath);
-        return ts.changeExtension(outputPath, ".d.ts");
-    }
-    ts.getOutputDeclarationFileName = getOutputDeclarationFileName;
-    function getOutputJSFileName(inputFileName, configFile) {
-        var relativePath = ts.getRelativePathFromDirectory(rootDirOfOptions(configFile.options, configFile.options.configFilePath), inputFileName, true);
-        var outputPath = ts.resolvePath(configFile.options.outDir || ts.getDirectoryPath(configFile.options.configFilePath), relativePath);
-        var newExtension = ts.fileExtensionIs(inputFileName, ".json") ? ".json" :
-            ts.fileExtensionIs(inputFileName, ".tsx") && configFile.options.jsx === 1 ? ".jsx" : ".js";
-        return ts.changeExtension(outputPath, newExtension);
-    }
-    function getOutputFileNames(inputFileName, configFile) {
-        if (configFile.options.outFile || configFile.options.out || ts.fileExtensionIs(inputFileName, ".d.ts")) {
-            return ts.emptyArray;
-        }
-        var outputs = [];
-        var js = getOutputJSFileName(inputFileName, configFile);
-        outputs.push(js);
-        if (configFile.options.sourceMap) {
-            outputs.push(js + ".map");
-        }
-        if (ts.getEmitDeclarations(configFile.options) && !ts.fileExtensionIs(inputFileName, ".json")) {
-            var dts = getOutputDeclarationFileName(inputFileName, configFile);
-            outputs.push(dts);
-            if (configFile.options.declarationMap) {
-                outputs.push(dts + ".map");
-            }
-        }
-        return outputs;
-    }
-    function getOutFileOutputs(project, ignoreBuildInfo) {
-        ts.Debug.assert(!!project.options.outFile || !!project.options.out, "outFile must be set");
-        var _a = ts.getOutputPathsForBundle(project.options, false), jsFilePath = _a.jsFilePath, sourceMapFilePath = _a.sourceMapFilePath, declarationFilePath = _a.declarationFilePath, declarationMapPath = _a.declarationMapPath, buildInfoPath = _a.buildInfoPath;
-        var outputs = [];
-        var addOutput = function (path) { return path && (outputs || (outputs = [])).push(path); };
-        addOutput(jsFilePath);
-        addOutput(sourceMapFilePath);
-        addOutput(declarationFilePath);
-        addOutput(declarationMapPath);
-        if (!ignoreBuildInfo)
-            addOutput(buildInfoPath);
-        return outputs || ts.emptyArray;
-    }
-    function rootDirOfOptions(opts, configFileName) {
-        return opts.rootDir || ts.getDirectoryPath(configFileName);
-    }
     function newer(date1, date2) {
         return date2 > date1 ? date2 : date1;
     }
@@ -76712,7 +79052,7 @@ var ts;
     ts.createBuilderStatusReporter = createBuilderStatusReporter;
     function createSolutionBuilderHostBase(system, createProgram, reportDiagnostic, reportSolutionBuilderStatus) {
         var host = ts.createProgramHost(system, createProgram);
-        host.getModifiedTime = system.getModifiedTime ? function (path) { return system.getModifiedTime(path); } : function () { return undefined; };
+        host.getModifiedTime = system.getModifiedTime ? function (path) { return system.getModifiedTime(path); } : ts.returnUndefined;
         host.setModifiedTime = system.setModifiedTime ? function (path, date) { return system.setModifiedTime(path, date); } : ts.noop;
         host.deleteFile = system.deleteFile ? function (path) { return system.deleteFile(path); } : ts.noop;
         host.reportDiagnostic = reportDiagnostic || ts.createDiagnosticReporter(system);
@@ -76737,588 +79077,441 @@ var ts;
     function getCompilerOptionsOfBuildOptions(buildOptions) {
         var result = {};
         ts.commonOptionsWithBuild.forEach(function (option) {
-            result[option.name] = buildOptions[option.name];
+            if (ts.hasProperty(buildOptions, option.name))
+                result[option.name] = buildOptions[option.name];
         });
         return result;
     }
     function createSolutionBuilder(host, rootNames, defaultOptions) {
-        var hostWithWatch = host;
+        return createSolutionBuilderWorker(false, host, rootNames, defaultOptions);
+    }
+    ts.createSolutionBuilder = createSolutionBuilder;
+    function createSolutionBuilderWithWatch(host, rootNames, defaultOptions) {
+        return createSolutionBuilderWorker(true, host, rootNames, defaultOptions);
+    }
+    ts.createSolutionBuilderWithWatch = createSolutionBuilderWithWatch;
+    function createSolutionBuilderState(watch, hostOrHostWithWatch, rootNames, options) {
+        var host = hostOrHostWithWatch;
+        var hostWithWatch = hostOrHostWithWatch;
         var currentDirectory = host.getCurrentDirectory();
         var getCanonicalFileName = ts.createGetCanonicalFileName(host.useCaseSensitiveFileNames());
-        var parseConfigFileHost = ts.parseConfigHostFromCompilerHostLike(host);
-        var options = defaultOptions;
         var baseCompilerOptions = getCompilerOptionsOfBuildOptions(options);
-        var configFileCache = createFileMap(toPath);
-        var unchangedOutputs = createFileMap(toPath);
-        var projectStatus = createFileMap(toPath);
-        var missingRoots = ts.createMap();
-        var globalDependencyGraph;
-        var writeFileName = function (s) { return host.trace && host.trace(s); };
-        var readFileWithCache = function (f) { return host.readFile(f); };
-        var projectCompilerOptions = baseCompilerOptions;
-        var compilerHost = ts.createCompilerHostFromProgramHost(host, function () { return projectCompilerOptions; });
-        ts.setCreateSourceFileAsHashVersioned(compilerHost, host);
-        var buildInfoChecked = createFileMap(toPath);
-        var builderPrograms = createFileMap(toPath);
-        var diagnostics = createFileMap(toPath);
-        var projectPendingBuild = createFileMap(toPath);
-        var projectErrorsReported = createFileMap(toPath);
-        var invalidatedProjectQueue = [];
-        var nextProjectToBuild = 0;
-        var timerToBuildInvalidatedProject;
-        var reportFileChangeDetected = false;
-        var _a = ts.createWatchFactory(host, options), watchFile = _a.watchFile, watchFilePath = _a.watchFilePath, watchDirectory = _a.watchDirectory, writeLog = _a.writeLog;
-        var allWatchedWildcardDirectories = createFileMap(toPath);
-        var allWatchedInputFiles = createFileMap(toPath);
-        var allWatchedConfigFiles = createFileMap(toPath);
-        return {
-            buildAllProjects: buildAllProjects,
-            getUpToDateStatusOfFile: getUpToDateStatusOfFile,
-            cleanAllProjects: cleanAllProjects,
-            resetBuildContext: resetBuildContext,
-            getBuildGraph: getBuildGraph,
-            invalidateProject: invalidateProject,
-            buildInvalidatedProject: buildInvalidatedProject,
-            resolveProjectName: resolveProjectName,
-            startWatching: startWatching
+        var compilerHost = ts.createCompilerHostFromProgramHost(host, function () { return state.projectCompilerOptions; });
+        ts.setGetSourceFileAsHashVersioned(compilerHost, host);
+        compilerHost.getParsedCommandLine = function (fileName) { return parseConfigFile(state, fileName, toResolvedConfigFilePath(state, fileName)); };
+        compilerHost.resolveModuleNames = ts.maybeBind(host, host.resolveModuleNames);
+        compilerHost.resolveTypeReferenceDirectives = ts.maybeBind(host, host.resolveTypeReferenceDirectives);
+        var moduleResolutionCache = !compilerHost.resolveModuleNames ? ts.createModuleResolutionCache(currentDirectory, getCanonicalFileName) : undefined;
+        if (!compilerHost.resolveModuleNames) {
+            var loader_3 = function (moduleName, containingFile, redirectedReference) { return ts.resolveModuleName(moduleName, containingFile, state.projectCompilerOptions, compilerHost, moduleResolutionCache, redirectedReference).resolvedModule; };
+            compilerHost.resolveModuleNames = function (moduleNames, containingFile, _reusedNames, redirectedReference) {
+                return ts.loadWithLocalCache(ts.Debug.assertEachDefined(moduleNames), containingFile, redirectedReference, loader_3);
+            };
+        }
+        var _a = ts.createWatchFactory(hostWithWatch, options), watchFile = _a.watchFile, watchFilePath = _a.watchFilePath, watchDirectory = _a.watchDirectory, writeLog = _a.writeLog;
+        var state = {
+            host: host,
+            hostWithWatch: hostWithWatch,
+            currentDirectory: currentDirectory,
+            getCanonicalFileName: getCanonicalFileName,
+            parseConfigFileHost: ts.parseConfigHostFromCompilerHostLike(host),
+            writeFileName: host.trace ? function (s) { return host.trace(s); } : undefined,
+            options: options,
+            baseCompilerOptions: baseCompilerOptions,
+            rootNames: rootNames,
+            resolvedConfigFilePaths: ts.createMap(),
+            configFileCache: createConfigFileMap(),
+            projectStatus: createConfigFileMap(),
+            buildInfoChecked: createConfigFileMap(),
+            extendedConfigCache: ts.createMap(),
+            builderPrograms: createConfigFileMap(),
+            diagnostics: createConfigFileMap(),
+            projectPendingBuild: createConfigFileMap(),
+            projectErrorsReported: createConfigFileMap(),
+            compilerHost: compilerHost,
+            moduleResolutionCache: moduleResolutionCache,
+            buildOrder: undefined,
+            readFileWithCache: function (f) { return host.readFile(f); },
+            projectCompilerOptions: baseCompilerOptions,
+            cache: undefined,
+            allProjectBuildPending: true,
+            needsSummary: true,
+            watchAllProjectsPending: watch,
+            currentInvalidatedProject: undefined,
+            watch: watch,
+            allWatchedWildcardDirectories: createConfigFileMap(),
+            allWatchedInputFiles: createConfigFileMap(),
+            allWatchedConfigFiles: createConfigFileMap(),
+            timerToBuildInvalidatedProject: undefined,
+            reportFileChangeDetected: false,
+            watchFile: watchFile,
+            watchFilePath: watchFilePath,
+            watchDirectory: watchDirectory,
+            writeLog: writeLog,
         };
-        function toPath(fileName) {
-            return ts.toPath(fileName, currentDirectory, getCanonicalFileName);
+        return state;
+    }
+    function toPath(state, fileName) {
+        return ts.toPath(fileName, state.currentDirectory, state.getCanonicalFileName);
+    }
+    function toResolvedConfigFilePath(state, fileName) {
+        var resolvedConfigFilePaths = state.resolvedConfigFilePaths;
+        var path = resolvedConfigFilePaths.get(fileName);
+        if (path !== undefined)
+            return path;
+        var resolvedPath = toPath(state, fileName);
+        resolvedConfigFilePaths.set(fileName, resolvedPath);
+        return resolvedPath;
+    }
+    function isParsedCommandLine(entry) {
+        return !!entry.options;
+    }
+    function parseConfigFile(state, configFileName, configFilePath) {
+        var configFileCache = state.configFileCache;
+        var value = configFileCache.get(configFilePath);
+        if (value) {
+            return isParsedCommandLine(value) ? value : undefined;
         }
-        function resetBuildContext(opts) {
-            if (opts === void 0) { opts = defaultOptions; }
-            options = opts;
-            baseCompilerOptions = getCompilerOptionsOfBuildOptions(options);
-            configFileCache.clear();
-            unchangedOutputs.clear();
-            projectStatus.clear();
-            missingRoots.clear();
-            globalDependencyGraph = undefined;
-            buildInfoChecked.clear();
-            diagnostics.clear();
-            projectPendingBuild.clear();
-            projectErrorsReported.clear();
-            invalidatedProjectQueue.length = 0;
-            nextProjectToBuild = 0;
-            if (timerToBuildInvalidatedProject) {
-                clearTimeout(timerToBuildInvalidatedProject);
-                timerToBuildInvalidatedProject = undefined;
-            }
-            reportFileChangeDetected = false;
-            ts.clearMap(allWatchedWildcardDirectories, function (wildCardWatches) { return ts.clearMap(wildCardWatches, ts.closeFileWatcherOf); });
-            ts.clearMap(allWatchedInputFiles, function (inputFileWatches) { return ts.clearMap(inputFileWatches, ts.closeFileWatcher); });
-            ts.clearMap(allWatchedConfigFiles, ts.closeFileWatcher);
-            builderPrograms.clear();
+        var diagnostic;
+        var parseConfigFileHost = state.parseConfigFileHost, baseCompilerOptions = state.baseCompilerOptions, extendedConfigCache = state.extendedConfigCache, host = state.host;
+        var parsed;
+        if (host.getParsedCommandLine) {
+            parsed = host.getParsedCommandLine(configFileName);
+            if (!parsed)
+                diagnostic = ts.createCompilerDiagnostic(ts.Diagnostics.File_0_not_found, configFileName);
         }
-        function isParsedCommandLine(entry) {
-            return !!entry.options;
-        }
-        function parseConfigFile(configFilePath) {
-            var value = configFileCache.getValue(configFilePath);
-            if (value) {
-                return isParsedCommandLine(value) ? value : undefined;
-            }
-            var diagnostic;
+        else {
             parseConfigFileHost.onUnRecoverableConfigFileDiagnostic = function (d) { return diagnostic = d; };
-            var parsed = ts.getParsedCommandLineOfConfigFile(configFilePath, baseCompilerOptions, parseConfigFileHost);
+            parsed = ts.getParsedCommandLineOfConfigFile(configFileName, baseCompilerOptions, parseConfigFileHost, extendedConfigCache);
             parseConfigFileHost.onUnRecoverableConfigFileDiagnostic = ts.noop;
-            configFileCache.setValue(configFilePath, parsed || diagnostic);
-            return parsed;
         }
-        function reportStatus(message) {
+        configFileCache.set(configFilePath, parsed || diagnostic);
+        return parsed;
+    }
+    function resolveProjectName(state, name) {
+        return ts.resolveConfigFileProjectName(ts.resolvePath(state.currentDirectory, name));
+    }
+    function createBuildOrder(state, roots) {
+        var temporaryMarks = ts.createMap();
+        var permanentMarks = ts.createMap();
+        var circularityReportStack = [];
+        var buildOrder;
+        for (var _i = 0, roots_1 = roots; _i < roots_1.length; _i++) {
+            var root = roots_1[_i];
+            visit(root);
+        }
+        return buildOrder || ts.emptyArray;
+        function visit(configFileName, inCircularContext) {
+            var projPath = toResolvedConfigFilePath(state, configFileName);
+            if (permanentMarks.has(projPath))
+                return;
+            if (temporaryMarks.has(projPath)) {
+                if (!inCircularContext) {
+                    reportStatus(state, ts.Diagnostics.Project_references_may_not_form_a_circular_graph_Cycle_detected_Colon_0, circularityReportStack.join("\r\n"));
+                }
+                return;
+            }
+            temporaryMarks.set(projPath, true);
+            circularityReportStack.push(configFileName);
+            var parsed = parseConfigFile(state, configFileName, projPath);
+            if (parsed && parsed.projectReferences) {
+                for (var _i = 0, _a = parsed.projectReferences; _i < _a.length; _i++) {
+                    var ref = _a[_i];
+                    var resolvedRefPath = resolveProjectName(state, ref.path);
+                    visit(resolvedRefPath, inCircularContext || ref.circular);
+                }
+            }
+            circularityReportStack.pop();
+            permanentMarks.set(projPath, true);
+            (buildOrder || (buildOrder = [])).push(configFileName);
+        }
+    }
+    function getBuildOrder(state) {
+        return state.buildOrder ||
+            (state.buildOrder = createBuildOrder(state, state.rootNames.map(function (f) { return resolveProjectName(state, f); })));
+    }
+    function getBuildOrderFor(state, project, onlyReferences) {
+        var resolvedProject = project && resolveProjectName(state, project);
+        var buildOrderFromState = getBuildOrder(state);
+        if (resolvedProject) {
+            var projectPath_1 = toResolvedConfigFilePath(state, resolvedProject);
+            var projectIndex = ts.findIndex(buildOrderFromState, function (configFileName) { return toResolvedConfigFilePath(state, configFileName) === projectPath_1; });
+            if (projectIndex === -1)
+                return undefined;
+        }
+        var buildOrder = resolvedProject ? createBuildOrder(state, [resolvedProject]) : buildOrderFromState;
+        ts.Debug.assert(!onlyReferences || resolvedProject !== undefined);
+        ts.Debug.assert(!onlyReferences || buildOrder[buildOrder.length - 1] === resolvedProject);
+        return onlyReferences ? buildOrder.slice(0, buildOrder.length - 1) : buildOrder;
+    }
+    function enableCache(state) {
+        if (state.cache) {
+            disableCache(state);
+        }
+        var compilerHost = state.compilerHost, host = state.host;
+        var originalReadFileWithCache = state.readFileWithCache;
+        var originalGetSourceFile = compilerHost.getSourceFile;
+        var _a = ts.changeCompilerHostLikeToUseCache(host, function (fileName) { return toPath(state, fileName); }, function () {
             var args = [];
-            for (var _i = 1; _i < arguments.length; _i++) {
-                args[_i - 1] = arguments[_i];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                args[_i] = arguments[_i];
             }
-            host.reportSolutionBuilderStatus(ts.createCompilerDiagnostic.apply(void 0, [message].concat(args)));
+            return originalGetSourceFile.call.apply(originalGetSourceFile, [compilerHost].concat(args));
+        }), originalReadFile = _a.originalReadFile, originalFileExists = _a.originalFileExists, originalDirectoryExists = _a.originalDirectoryExists, originalCreateDirectory = _a.originalCreateDirectory, originalWriteFile = _a.originalWriteFile, getSourceFileWithCache = _a.getSourceFileWithCache, readFileWithCache = _a.readFileWithCache;
+        state.readFileWithCache = readFileWithCache;
+        compilerHost.getSourceFile = getSourceFileWithCache;
+        state.cache = {
+            originalReadFile: originalReadFile,
+            originalFileExists: originalFileExists,
+            originalDirectoryExists: originalDirectoryExists,
+            originalCreateDirectory: originalCreateDirectory,
+            originalWriteFile: originalWriteFile,
+            originalReadFileWithCache: originalReadFileWithCache,
+            originalGetSourceFile: originalGetSourceFile,
+        };
+    }
+    function disableCache(state) {
+        if (!state.cache)
+            return;
+        var cache = state.cache, host = state.host, compilerHost = state.compilerHost, extendedConfigCache = state.extendedConfigCache, moduleResolutionCache = state.moduleResolutionCache;
+        host.readFile = cache.originalReadFile;
+        host.fileExists = cache.originalFileExists;
+        host.directoryExists = cache.originalDirectoryExists;
+        host.createDirectory = cache.originalCreateDirectory;
+        host.writeFile = cache.originalWriteFile;
+        compilerHost.getSourceFile = cache.originalGetSourceFile;
+        state.readFileWithCache = cache.originalReadFileWithCache;
+        extendedConfigCache.clear();
+        if (moduleResolutionCache) {
+            moduleResolutionCache.directoryToModuleNameMap.clear();
+            moduleResolutionCache.moduleNameToDirectoryMap.clear();
         }
-        function reportWatchStatus(message) {
-            var args = [];
-            for (var _i = 1; _i < arguments.length; _i++) {
-                args[_i - 1] = arguments[_i];
-            }
-            if (hostWithWatch.onWatchStatusChange) {
-                hostWithWatch.onWatchStatusChange(ts.createCompilerDiagnostic.apply(void 0, [message].concat(args)), host.getNewLine(), baseCompilerOptions);
-            }
+        state.cache = undefined;
+    }
+    function clearProjectStatus(state, resolved) {
+        state.projectStatus.delete(resolved);
+        state.diagnostics.delete(resolved);
+    }
+    function addProjToQueue(_a, proj, reloadLevel) {
+        var projectPendingBuild = _a.projectPendingBuild;
+        var value = projectPendingBuild.get(proj);
+        if (value === undefined) {
+            projectPendingBuild.set(proj, reloadLevel);
         }
-        function startWatching() {
-            var graph = getGlobalDependencyGraph();
-            for (var _i = 0, _a = graph.buildQueue; _i < _a.length; _i++) {
-                var resolved = _a[_i];
-                watchConfigFile(resolved);
-                var cfg = parseConfigFile(resolved);
-                if (cfg) {
-                    watchWildCardDirectories(resolved, cfg);
-                    watchInputFiles(resolved, cfg);
+        else if (value < reloadLevel) {
+            projectPendingBuild.set(proj, reloadLevel);
+        }
+    }
+    function setupInitialBuild(state, cancellationToken) {
+        if (!state.allProjectBuildPending)
+            return;
+        state.allProjectBuildPending = false;
+        if (state.options.watch) {
+            reportWatchStatus(state, ts.Diagnostics.Starting_compilation_in_watch_mode);
+        }
+        enableCache(state);
+        var buildOrder = getBuildOrder(state);
+        buildOrder.forEach(function (configFileName) {
+            return state.projectPendingBuild.set(toResolvedConfigFilePath(state, configFileName), ts.ConfigFileProgramReloadLevel.None);
+        });
+        if (cancellationToken) {
+            cancellationToken.throwIfCancellationRequested();
+        }
+    }
+    var InvalidatedProjectKind;
+    (function (InvalidatedProjectKind) {
+        InvalidatedProjectKind[InvalidatedProjectKind["Build"] = 0] = "Build";
+        InvalidatedProjectKind[InvalidatedProjectKind["UpdateBundle"] = 1] = "UpdateBundle";
+        InvalidatedProjectKind[InvalidatedProjectKind["UpdateOutputFileStamps"] = 2] = "UpdateOutputFileStamps";
+    })(InvalidatedProjectKind = ts.InvalidatedProjectKind || (ts.InvalidatedProjectKind = {}));
+    function doneInvalidatedProject(state, projectPath) {
+        state.projectPendingBuild.delete(projectPath);
+        state.currentInvalidatedProject = undefined;
+        return state.diagnostics.has(projectPath) ?
+            ts.ExitStatus.DiagnosticsPresent_OutputsSkipped :
+            ts.ExitStatus.Success;
+    }
+    function createUpdateOutputFileStampsProject(state, project, projectPath, config, buildOrder) {
+        var updateOutputFileStampsPending = true;
+        return {
+            kind: InvalidatedProjectKind.UpdateOutputFileStamps,
+            project: project,
+            projectPath: projectPath,
+            buildOrder: buildOrder,
+            getCompilerOptions: function () { return config.options; },
+            getCurrentDirectory: function () { return state.currentDirectory; },
+            updateOutputFileStatmps: function () {
+                updateOutputTimestamps(state, config, projectPath);
+                updateOutputFileStampsPending = false;
+            },
+            done: function () {
+                if (updateOutputFileStampsPending) {
+                    updateOutputTimestamps(state, config, projectPath);
                 }
+                return doneInvalidatedProject(state, projectPath);
             }
-        }
-        function watchConfigFile(resolved) {
-            if (options.watch && !allWatchedConfigFiles.hasKey(resolved)) {
-                allWatchedConfigFiles.setValue(resolved, watchFile(hostWithWatch, resolved, function () {
-                    invalidateProjectAndScheduleBuilds(resolved, ts.ConfigFileProgramReloadLevel.Full);
-                }, ts.PollingInterval.High, "Config file", resolved));
-            }
-        }
-        function watchWildCardDirectories(resolved, parsed) {
-            if (!options.watch)
-                return;
-            ts.updateWatchingWildcardDirectories(getOrCreateValueMapFromConfigFileMap(allWatchedWildcardDirectories, resolved), ts.createMapFromTemplate(parsed.configFileSpecs.wildcardDirectories), function (dir, flags) {
-                return watchDirectory(hostWithWatch, dir, function (fileOrDirectory) {
-                    var fileOrDirectoryPath = toPath(fileOrDirectory);
-                    if (fileOrDirectoryPath !== toPath(dir) && ts.hasExtension(fileOrDirectoryPath) && !ts.isSupportedSourceFileName(fileOrDirectory, parsed.options)) {
-                        writeLog("Project: " + resolved + " Detected file add/remove of non supported extension: " + fileOrDirectory);
-                        return;
+        };
+    }
+    function createBuildOrUpdateInvalidedProject(kind, state, project, projectPath, projectIndex, config, buildOrder) {
+        var Step;
+        (function (Step) {
+            Step[Step["CreateProgram"] = 0] = "CreateProgram";
+            Step[Step["SyntaxDiagnostics"] = 1] = "SyntaxDiagnostics";
+            Step[Step["SemanticDiagnostics"] = 2] = "SemanticDiagnostics";
+            Step[Step["Emit"] = 3] = "Emit";
+            Step[Step["EmitBundle"] = 4] = "EmitBundle";
+            Step[Step["BuildInvalidatedProjectOfBundle"] = 5] = "BuildInvalidatedProjectOfBundle";
+            Step[Step["QueueReferencingProjects"] = 6] = "QueueReferencingProjects";
+            Step[Step["Done"] = 7] = "Done";
+        })(Step || (Step = {}));
+        var step = kind === InvalidatedProjectKind.Build ? Step.CreateProgram : Step.EmitBundle;
+        var program;
+        var buildResult;
+        var invalidatedProjectOfBundle;
+        return kind === InvalidatedProjectKind.Build ?
+            {
+                kind: kind,
+                project: project,
+                projectPath: projectPath,
+                buildOrder: buildOrder,
+                getCompilerOptions: function () { return config.options; },
+                getCurrentDirectory: function () { return state.currentDirectory; },
+                getBuilderProgram: function () { return withProgramOrUndefined(ts.identity); },
+                getProgram: function () {
+                    return withProgramOrUndefined(function (program) { return program.getProgramOrUndefined(); });
+                },
+                getSourceFile: function (fileName) {
+                    return withProgramOrUndefined(function (program) { return program.getSourceFile(fileName); });
+                },
+                getSourceFiles: function () {
+                    return withProgramOrEmptyArray(function (program) { return program.getSourceFiles(); });
+                },
+                getOptionsDiagnostics: function (cancellationToken) {
+                    return withProgramOrEmptyArray(function (program) { return program.getOptionsDiagnostics(cancellationToken); });
+                },
+                getGlobalDiagnostics: function (cancellationToken) {
+                    return withProgramOrEmptyArray(function (program) { return program.getGlobalDiagnostics(cancellationToken); });
+                },
+                getConfigFileParsingDiagnostics: function () {
+                    return withProgramOrEmptyArray(function (program) { return program.getConfigFileParsingDiagnostics(); });
+                },
+                getSyntacticDiagnostics: function (sourceFile, cancellationToken) {
+                    return withProgramOrEmptyArray(function (program) { return program.getSyntacticDiagnostics(sourceFile, cancellationToken); });
+                },
+                getAllDependencies: function (sourceFile) {
+                    return withProgramOrEmptyArray(function (program) { return program.getAllDependencies(sourceFile); });
+                },
+                getSemanticDiagnostics: function (sourceFile, cancellationToken) {
+                    return withProgramOrEmptyArray(function (program) { return program.getSemanticDiagnostics(sourceFile, cancellationToken); });
+                },
+                getSemanticDiagnosticsOfNextAffectedFile: function (cancellationToken, ignoreSourceFile) {
+                    return withProgramOrUndefined(function (program) {
+                        return (program.getSemanticDiagnosticsOfNextAffectedFile) &&
+                            program.getSemanticDiagnosticsOfNextAffectedFile(cancellationToken, ignoreSourceFile);
+                    });
+                },
+                emit: function (targetSourceFile, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers) {
+                    if (targetSourceFile || emitOnlyDtsFiles) {
+                        return withProgramOrUndefined(function (program) { return program.emit(targetSourceFile, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers); });
                     }
-                    if (isOutputFile(fileOrDirectory, parsed)) {
-                        writeLog(fileOrDirectory + " is output file");
-                        return;
-                    }
-                    invalidateProjectAndScheduleBuilds(resolved, ts.ConfigFileProgramReloadLevel.Partial);
-                }, flags, "Wild card directory", resolved);
-            });
-        }
-        function watchInputFiles(resolved, parsed) {
-            if (!options.watch)
-                return;
-            ts.mutateMap(getOrCreateValueMapFromConfigFileMap(allWatchedInputFiles, resolved), ts.arrayToMap(parsed.fileNames, toPath), {
-                createNewValue: function (path, input) { return watchFilePath(hostWithWatch, input, function () { return invalidateProjectAndScheduleBuilds(resolved, ts.ConfigFileProgramReloadLevel.None); }, ts.PollingInterval.Low, path, "Source file", resolved); },
-                onDeleteValue: ts.closeFileWatcher,
-            });
-        }
-        function isOutputFile(fileName, configFile) {
-            if (configFile.options.noEmit)
-                return false;
-            if (!ts.fileExtensionIs(fileName, ".d.ts") &&
-                (ts.fileExtensionIs(fileName, ".ts") || ts.fileExtensionIs(fileName, ".tsx"))) {
-                return false;
-            }
-            var out = configFile.options.outFile || configFile.options.out;
-            if (out && (isSameFile(fileName, out) || isSameFile(fileName, ts.removeFileExtension(out) + ".d.ts"))) {
-                return true;
-            }
-            if (configFile.options.declarationDir && ts.containsPath(configFile.options.declarationDir, fileName, currentDirectory, !host.useCaseSensitiveFileNames())) {
-                return true;
-            }
-            if (configFile.options.outDir && ts.containsPath(configFile.options.outDir, fileName, currentDirectory, !host.useCaseSensitiveFileNames())) {
-                return true;
-            }
-            return !ts.forEach(configFile.fileNames, function (inputFile) { return isSameFile(fileName, inputFile); });
-        }
-        function isSameFile(file1, file2) {
-            return ts.comparePaths(file1, file2, currentDirectory, !host.useCaseSensitiveFileNames()) === 0;
-        }
-        function invalidateProjectAndScheduleBuilds(resolved, reloadLevel) {
-            reportFileChangeDetected = true;
-            invalidateResolvedProject(resolved, reloadLevel);
-            scheduleBuildInvalidatedProject();
-        }
-        function getUpToDateStatusOfFile(configFileName) {
-            return getUpToDateStatus(parseConfigFile(configFileName));
-        }
-        function getBuildGraph(configFileNames) {
-            return createDependencyGraph(resolveProjectNames(configFileNames));
-        }
-        function getGlobalDependencyGraph() {
-            return globalDependencyGraph || (globalDependencyGraph = getBuildGraph(rootNames));
-        }
-        function getUpToDateStatus(project) {
-            if (project === undefined) {
-                return { type: UpToDateStatusType.Unbuildable, reason: "File deleted mid-build" };
-            }
-            var prior = projectStatus.getValue(project.options.configFilePath);
-            if (prior !== undefined) {
-                return prior;
-            }
-            var actual = getUpToDateStatusWorker(project);
-            projectStatus.setValue(project.options.configFilePath, actual);
-            return actual;
-        }
-        function getUpToDateStatusWorker(project) {
-            var newestInputFileName = undefined;
-            var newestInputFileTime = minimumDate;
-            for (var _i = 0, _a = project.fileNames; _i < _a.length; _i++) {
-                var inputFile = _a[_i];
-                if (!host.fileExists(inputFile)) {
-                    return {
-                        type: UpToDateStatusType.Unbuildable,
-                        reason: inputFile + " does not exist"
-                    };
-                }
-                var inputTime = host.getModifiedTime(inputFile) || ts.missingFileModifiedTime;
-                if (inputTime > newestInputFileTime) {
-                    newestInputFileName = inputFile;
-                    newestInputFileTime = inputTime;
-                }
-            }
-            var outputs = getAllProjectOutputs(project);
-            if (outputs.length === 0) {
-                return {
-                    type: UpToDateStatusType.ContainerOnly
-                };
-            }
-            var oldestOutputFileName = "(none)";
-            var oldestOutputFileTime = maximumDate;
-            var newestOutputFileName = "(none)";
-            var newestOutputFileTime = minimumDate;
-            var missingOutputFileName;
-            var newestDeclarationFileContentChangedTime = minimumDate;
-            var isOutOfDateWithInputs = false;
-            for (var _b = 0, outputs_1 = outputs; _b < outputs_1.length; _b++) {
-                var output = outputs_1[_b];
-                if (!host.fileExists(output)) {
-                    missingOutputFileName = output;
-                    break;
-                }
-                var outputTime = host.getModifiedTime(output) || ts.missingFileModifiedTime;
-                if (outputTime < oldestOutputFileTime) {
-                    oldestOutputFileTime = outputTime;
-                    oldestOutputFileName = output;
-                }
-                if (outputTime < newestInputFileTime) {
-                    isOutOfDateWithInputs = true;
-                    break;
-                }
-                if (outputTime > newestOutputFileTime) {
-                    newestOutputFileTime = outputTime;
-                    newestOutputFileName = output;
-                }
-                if (isDeclarationFile(output)) {
-                    var unchangedTime = unchangedOutputs.getValue(output);
-                    if (unchangedTime !== undefined) {
-                        newestDeclarationFileContentChangedTime = newer(unchangedTime, newestDeclarationFileContentChangedTime);
-                    }
-                    else {
-                        var outputModifiedTime = host.getModifiedTime(output) || ts.missingFileModifiedTime;
-                        newestDeclarationFileContentChangedTime = newer(newestDeclarationFileContentChangedTime, outputModifiedTime);
-                    }
-                }
-            }
-            var pseudoUpToDate = false;
-            var usesPrepend = false;
-            var upstreamChangedProject;
-            if (project.projectReferences) {
-                projectStatus.setValue(project.options.configFilePath, { type: UpToDateStatusType.ComputingUpstream });
-                for (var _c = 0, _d = project.projectReferences; _c < _d.length; _c++) {
-                    var ref = _d[_c];
-                    usesPrepend = usesPrepend || !!(ref.prepend);
-                    var resolvedRef = ts.resolveProjectReferencePath(ref);
-                    var refStatus = getUpToDateStatus(parseConfigFile(resolvedRef));
-                    if (refStatus.type === UpToDateStatusType.ComputingUpstream) {
-                        continue;
-                    }
-                    if (refStatus.type === UpToDateStatusType.Unbuildable) {
-                        return {
-                            type: UpToDateStatusType.UpstreamBlocked,
-                            upstreamProjectName: ref.path
-                        };
-                    }
-                    if (refStatus.type !== UpToDateStatusType.UpToDate) {
-                        return {
-                            type: UpToDateStatusType.UpstreamOutOfDate,
-                            upstreamProjectName: ref.path
-                        };
-                    }
-                    if (!missingOutputFileName) {
-                        if (refStatus.newestInputFileTime && refStatus.newestInputFileTime <= oldestOutputFileTime) {
-                            continue;
-                        }
-                        if (refStatus.newestDeclarationFileContentChangedTime && refStatus.newestDeclarationFileContentChangedTime <= oldestOutputFileTime) {
-                            pseudoUpToDate = true;
-                            upstreamChangedProject = ref.path;
-                            continue;
-                        }
-                        ts.Debug.assert(oldestOutputFileName !== undefined, "Should have an oldest output filename here");
-                        return {
-                            type: UpToDateStatusType.OutOfDateWithUpstream,
-                            outOfDateOutputFileName: oldestOutputFileName,
-                            newerProjectName: ref.path
-                        };
-                    }
-                }
-            }
-            if (missingOutputFileName !== undefined) {
-                return {
-                    type: UpToDateStatusType.OutputMissing,
-                    missingOutputFileName: missingOutputFileName
-                };
-            }
-            if (isOutOfDateWithInputs) {
-                return {
-                    type: UpToDateStatusType.OutOfDateWithSelf,
-                    outOfDateOutputFileName: oldestOutputFileName,
-                    newerInputFileName: newestInputFileName
-                };
-            }
-            if (!buildInfoChecked.hasKey(project.options.configFilePath)) {
-                buildInfoChecked.setValue(project.options.configFilePath, true);
-                var buildInfoPath = ts.getOutputPathForBuildInfo(project.options);
-                if (buildInfoPath) {
-                    var value = readFileWithCache(buildInfoPath);
-                    var buildInfo = value && ts.getBuildInfo(value);
-                    if (buildInfo && buildInfo.version !== ts.version) {
-                        return {
-                            type: UpToDateStatusType.TsVersionOutputOfDate,
-                            version: buildInfo.version
-                        };
-                    }
-                }
-            }
-            if (usesPrepend && pseudoUpToDate) {
-                return {
-                    type: UpToDateStatusType.OutOfDateWithPrepend,
-                    outOfDateOutputFileName: oldestOutputFileName,
-                    newerProjectName: upstreamChangedProject
-                };
-            }
-            return {
-                type: pseudoUpToDate ? UpToDateStatusType.UpToDateWithUpstreamTypes : UpToDateStatusType.UpToDate,
-                newestDeclarationFileContentChangedTime: newestDeclarationFileContentChangedTime,
-                newestInputFileTime: newestInputFileTime,
-                newestOutputFileTime: newestOutputFileTime,
-                newestInputFileName: newestInputFileName,
-                newestOutputFileName: newestOutputFileName,
-                oldestOutputFileName: oldestOutputFileName
+                    executeSteps(Step.SemanticDiagnostics, cancellationToken);
+                    if (step !== Step.Emit)
+                        return undefined;
+                    return emit(writeFile, cancellationToken, customTransformers);
+                },
+                done: done
+            } :
+            {
+                kind: kind,
+                project: project,
+                projectPath: projectPath,
+                buildOrder: buildOrder,
+                getCompilerOptions: function () { return config.options; },
+                getCurrentDirectory: function () { return state.currentDirectory; },
+                emit: function (writeFile, customTransformers) {
+                    if (step !== Step.EmitBundle)
+                        return invalidatedProjectOfBundle;
+                    return emitBundle(writeFile, customTransformers);
+                },
+                done: done,
             };
+        function done(cancellationToken, writeFile, customTransformers) {
+            executeSteps(Step.Done, cancellationToken, writeFile, customTransformers);
+            return doneInvalidatedProject(state, projectPath);
         }
-        function invalidateProject(configFileName, reloadLevel) {
-            invalidateResolvedProject(resolveProjectName(configFileName), reloadLevel);
+        function withProgramOrUndefined(action) {
+            executeSteps(Step.CreateProgram);
+            return program && action(program);
         }
-        function invalidateResolvedProject(resolved, reloadLevel) {
-            if (reloadLevel === ts.ConfigFileProgramReloadLevel.Full) {
-                configFileCache.removeKey(resolved);
-                globalDependencyGraph = undefined;
-            }
-            projectStatus.removeKey(resolved);
-            diagnostics.removeKey(resolved);
-            addProjToQueue(resolved, reloadLevel);
+        function withProgramOrEmptyArray(action) {
+            return withProgramOrUndefined(action) || ts.emptyArray;
         }
-        function addProjToQueue(proj, reloadLevel) {
-            var value = projectPendingBuild.getValue(proj);
-            if (value === undefined) {
-                projectPendingBuild.setValue(proj, reloadLevel || ts.ConfigFileProgramReloadLevel.None);
-                invalidatedProjectQueue.push(proj);
-            }
-            else if (value < (reloadLevel || ts.ConfigFileProgramReloadLevel.None)) {
-                projectPendingBuild.setValue(proj, reloadLevel || ts.ConfigFileProgramReloadLevel.None);
-            }
-        }
-        function getNextInvalidatedProject() {
-            if (nextProjectToBuild < invalidatedProjectQueue.length) {
-                var project = invalidatedProjectQueue[nextProjectToBuild];
-                nextProjectToBuild++;
-                var reloadLevel = projectPendingBuild.getValue(project);
-                projectPendingBuild.removeKey(project);
-                if (!projectPendingBuild.getSize()) {
-                    invalidatedProjectQueue.length = 0;
-                    nextProjectToBuild = 0;
-                }
-                return { project: project, reloadLevel: reloadLevel };
-            }
-        }
-        function hasPendingInvalidatedProjects() {
-            return !!projectPendingBuild.getSize();
-        }
-        function scheduleBuildInvalidatedProject() {
-            if (!hostWithWatch.setTimeout || !hostWithWatch.clearTimeout) {
+        function createProgram() {
+            ts.Debug.assert(program === undefined);
+            if (state.options.dry) {
+                reportStatus(state, ts.Diagnostics.A_non_dry_build_would_build_project_0, project);
+                buildResult = BuildResultFlags.Success;
+                step = Step.QueueReferencingProjects;
                 return;
             }
-            if (timerToBuildInvalidatedProject) {
-                hostWithWatch.clearTimeout(timerToBuildInvalidatedProject);
-            }
-            timerToBuildInvalidatedProject = hostWithWatch.setTimeout(buildInvalidatedProject, 250);
-        }
-        function buildInvalidatedProject() {
-            timerToBuildInvalidatedProject = undefined;
-            if (reportFileChangeDetected) {
-                reportFileChangeDetected = false;
-                projectErrorsReported.clear();
-                reportWatchStatus(ts.Diagnostics.File_change_detected_Starting_incremental_compilation);
-            }
-            var buildProject = getNextInvalidatedProject();
-            if (buildProject) {
-                buildSingleInvalidatedProject(buildProject.project, buildProject.reloadLevel);
-                if (hasPendingInvalidatedProjects()) {
-                    if (options.watch && !timerToBuildInvalidatedProject) {
-                        scheduleBuildInvalidatedProject();
-                    }
-                }
-                else {
-                    reportErrorSummary();
-                }
-            }
-        }
-        function reportErrorSummary() {
-            if (options.watch || host.reportErrorSummary) {
-                getGlobalDependencyGraph().buildQueue.forEach(function (project) {
-                    if (!projectErrorsReported.hasKey(project)) {
-                        reportErrors(diagnostics.getValue(project) || ts.emptyArray);
-                    }
-                });
-                var totalErrors_1 = 0;
-                diagnostics.forEach(function (singleProjectErrors) { return totalErrors_1 += ts.getErrorCountForSummary(singleProjectErrors); });
-                if (options.watch) {
-                    reportWatchStatus(ts.getWatchErrorSummaryDiagnosticMessage(totalErrors_1), totalErrors_1);
-                }
-                else {
-                    host.reportErrorSummary(totalErrors_1);
-                }
-            }
-        }
-        function buildSingleInvalidatedProject(resolved, reloadLevel) {
-            var proj = parseConfigFile(resolved);
-            if (!proj) {
-                reportParseConfigFileDiagnostic(resolved);
+            if (state.options.verbose)
+                reportStatus(state, ts.Diagnostics.Building_project_0, project);
+            if (config.fileNames.length === 0) {
+                reportAndStoreErrors(state, projectPath, config.errors);
+                buildResult = BuildResultFlags.None;
+                step = Step.QueueReferencingProjects;
                 return;
             }
-            if (reloadLevel === ts.ConfigFileProgramReloadLevel.Full) {
-                watchConfigFile(resolved);
-                watchWildCardDirectories(resolved, proj);
-                watchInputFiles(resolved, proj);
+            var host = state.host, compilerHost = state.compilerHost;
+            state.projectCompilerOptions = config.options;
+            updateModuleResolutionCache(state, project, config);
+            program = host.createProgram(config.fileNames, config.options, compilerHost, getOldProgram(state, projectPath, config), config.errors, config.projectReferences);
+            step++;
+        }
+        function handleDiagnostics(diagnostics, errorFlags, errorType) {
+            if (diagnostics.length) {
+                buildResult = buildErrors(state, projectPath, program, diagnostics, errorFlags, errorType);
+                step = Step.QueueReferencingProjects;
             }
-            else if (reloadLevel === ts.ConfigFileProgramReloadLevel.Partial) {
-                var result = ts.getFileNamesFromConfigSpecs(proj.configFileSpecs, ts.getDirectoryPath(resolved), proj.options, parseConfigFileHost);
-                ts.updateErrorForNoInputFiles(result, resolved, proj.configFileSpecs, proj.errors, ts.canJsonReportNoInutFiles(proj.raw));
-                proj.fileNames = result.fileNames;
-                watchInputFiles(resolved, proj);
-            }
-            var status = getUpToDateStatus(proj);
-            verboseReportProjectStatus(resolved, status);
-            if (status.type === UpToDateStatusType.UpstreamBlocked) {
-                if (options.verbose)
-                    reportStatus(ts.Diagnostics.Skipping_build_of_project_0_because_its_dependency_1_has_errors, resolved, status.upstreamProjectName);
-                return;
-            }
-            if (status.type === UpToDateStatusType.UpToDateWithUpstreamTypes) {
-                updateOutputTimestamps(proj);
-                return;
-            }
-            var buildResult = status.type === UpToDateStatusType.OutOfDateWithPrepend ?
-                updateBundle(resolved) :
-                buildSingleProject(resolved);
-            if (buildResult & BuildResultFlags.AnyErrors)
-                return;
-            var _a = getGlobalDependencyGraph(), referencingProjectsMap = _a.referencingProjectsMap, buildQueue = _a.buildQueue;
-            var referencingProjects = referencingProjectsMap.getValue(resolved);
-            if (!referencingProjects)
-                return;
-            for (var index = buildQueue.indexOf(resolved) + 1; index < buildQueue.length; index++) {
-                var project = buildQueue[index];
-                var prepend = referencingProjects.getValue(project);
-                if (prepend !== undefined) {
-                    var status_1 = projectStatus.getValue(project);
-                    if (!(buildResult & BuildResultFlags.DeclarationOutputUnchanged)) {
-                        if (status_1 && (status_1.type === UpToDateStatusType.UpToDate || status_1.type === UpToDateStatusType.UpToDateWithUpstreamTypes || status_1.type === UpToDateStatusType.OutOfDateWithPrepend)) {
-                            projectStatus.setValue(project, {
-                                type: UpToDateStatusType.OutOfDateWithUpstream,
-                                outOfDateOutputFileName: status_1.type === UpToDateStatusType.OutOfDateWithPrepend ? status_1.outOfDateOutputFileName : status_1.oldestOutputFileName,
-                                newerProjectName: resolved
-                            });
-                        }
-                    }
-                    else if (status_1 && status_1.type === UpToDateStatusType.UpToDate) {
-                        if (prepend) {
-                            projectStatus.setValue(project, {
-                                type: UpToDateStatusType.OutOfDateWithPrepend,
-                                outOfDateOutputFileName: status_1.oldestOutputFileName,
-                                newerProjectName: resolved
-                            });
-                        }
-                        else {
-                            status_1.type = UpToDateStatusType.UpToDateWithUpstreamTypes;
-                        }
-                    }
-                    addProjToQueue(project);
-                }
+            else {
+                step++;
             }
         }
-        function createDependencyGraph(roots) {
-            var temporaryMarks = createFileMap(toPath);
-            var permanentMarks = createFileMap(toPath);
-            var circularityReportStack = [];
-            var buildOrder = [];
-            var referencingProjectsMap = createFileMap(toPath);
-            for (var _i = 0, roots_1 = roots; _i < roots_1.length; _i++) {
-                var root = roots_1[_i];
-                visit(root);
-            }
-            return {
-                buildQueue: buildOrder,
-                referencingProjectsMap: referencingProjectsMap
-            };
-            function visit(projPath, inCircularContext) {
-                if (permanentMarks.hasKey(projPath))
-                    return;
-                if (temporaryMarks.hasKey(projPath)) {
-                    if (!inCircularContext) {
-                        reportStatus(ts.Diagnostics.Project_references_may_not_form_a_circular_graph_Cycle_detected_Colon_0, circularityReportStack.join("\r\n"));
-                    }
-                    return;
-                }
-                temporaryMarks.setValue(projPath, true);
-                circularityReportStack.push(projPath);
-                var parsed = parseConfigFile(projPath);
-                if (parsed && parsed.projectReferences) {
-                    for (var _i = 0, _a = parsed.projectReferences; _i < _a.length; _i++) {
-                        var ref = _a[_i];
-                        var resolvedRefPath = resolveProjectName(ref.path);
-                        visit(resolvedRefPath, inCircularContext || ref.circular);
-                        var referencingProjects = getOrCreateValueFromConfigFileMap(referencingProjectsMap, resolvedRefPath, function () { return createFileMap(toPath); });
-                        referencingProjects.setValue(projPath, !!ref.prepend);
-                    }
-                }
-                circularityReportStack.pop();
-                permanentMarks.setValue(projPath, true);
-                buildOrder.push(projPath);
-            }
+        function getSyntaxDiagnostics(cancellationToken) {
+            ts.Debug.assertDefined(program);
+            handleDiagnostics(program.getConfigFileParsingDiagnostics().concat(program.getOptionsDiagnostics(cancellationToken), program.getGlobalDiagnostics(cancellationToken), program.getSyntacticDiagnostics(undefined, cancellationToken)), BuildResultFlags.SyntaxErrors, "Syntactic");
         }
-        function buildSingleProject(proj) {
-            if (options.dry) {
-                reportStatus(ts.Diagnostics.A_non_dry_build_would_build_project_0, proj);
-                return BuildResultFlags.Success;
-            }
-            if (options.verbose)
-                reportStatus(ts.Diagnostics.Building_project_0, proj);
-            var resultFlags = BuildResultFlags.DeclarationOutputUnchanged;
-            var configFile = parseConfigFile(proj);
-            if (!configFile) {
-                resultFlags |= BuildResultFlags.ConfigFileErrors;
-                reportParseConfigFileDiagnostic(proj);
-                projectStatus.setValue(proj, { type: UpToDateStatusType.Unbuildable, reason: "Config file errors" });
-                return resultFlags;
-            }
-            if (configFile.fileNames.length === 0) {
-                reportAndStoreErrors(proj, configFile.errors);
-                return BuildResultFlags.None;
-            }
-            projectCompilerOptions = configFile.options;
-            var program = host.createProgram(configFile.fileNames, configFile.options, compilerHost, getOldProgram(proj, configFile), configFile.errors, configFile.projectReferences);
-            var syntaxDiagnostics = program.getConfigFileParsingDiagnostics().concat(program.getOptionsDiagnostics(), program.getGlobalDiagnostics(), program.getSyntacticDiagnostics());
-            if (syntaxDiagnostics.length) {
-                return buildErrors(syntaxDiagnostics, BuildResultFlags.SyntaxErrors, "Syntactic");
-            }
-            var semanticDiagnostics = program.getSemanticDiagnostics();
-            if (semanticDiagnostics.length) {
-                return buildErrors(semanticDiagnostics, BuildResultFlags.TypeErrors, "Semantic");
-            }
+        function getSemanticDiagnostics(cancellationToken) {
+            handleDiagnostics(ts.Debug.assertDefined(program).getSemanticDiagnostics(undefined, cancellationToken), BuildResultFlags.TypeErrors, "Semantic");
+        }
+        function emit(writeFileCallback, cancellationToken, customTransformers) {
+            ts.Debug.assertDefined(program);
+            ts.Debug.assert(step === Step.Emit);
             program.backupState();
-            var newestDeclarationFileContentChangedTime = minimumDate;
-            var anyDtsChanged = false;
             var declDiagnostics;
             var reportDeclarationDiagnostics = function (d) { return (declDiagnostics || (declDiagnostics = [])).push(d); };
             var outputFiles = [];
-            ts.emitFilesAndReportErrors(program, reportDeclarationDiagnostics, writeFileName, undefined, function (name, text, writeByteOrderMark) { return outputFiles.push({ name: name, text: text, writeByteOrderMark: writeByteOrderMark }); });
+            var emitResult = ts.emitFilesAndReportErrors(program, reportDeclarationDiagnostics, undefined, undefined, function (name, text, writeByteOrderMark) { return outputFiles.push({ name: name, text: text, writeByteOrderMark: writeByteOrderMark }); }, cancellationToken, false, customTransformers).emitResult;
             if (declDiagnostics) {
                 program.restoreState();
-                return buildErrors(declDiagnostics, BuildResultFlags.DeclarationEmitErrors, "Declaration file");
+                buildResult = buildErrors(state, projectPath, program, declDiagnostics, BuildResultFlags.DeclarationEmitErrors, "Declaration file");
+                step = Step.QueueReferencingProjects;
+                return {
+                    emitSkipped: true,
+                    diagnostics: emitResult.diagnostics
+                };
             }
+            var host = state.host, compilerHost = state.compilerHost;
+            var resultFlags = BuildResultFlags.DeclarationOutputUnchanged;
+            var newestDeclarationFileContentChangedTime = minimumDate;
+            var anyDtsChanged = false;
             var emitterDiagnostics = ts.createDiagnosticCollection();
-            var emittedOutputs = createFileMap(toPath);
+            var emittedOutputs = ts.createMap();
             outputFiles.forEach(function (_a) {
                 var name = _a.name, text = _a.text, writeByteOrderMark = _a.writeByteOrderMark;
                 var priorChangeTime;
                 if (!anyDtsChanged && isDeclarationFile(name)) {
-                    if (host.fileExists(name) && readFileWithCache(name) === text) {
+                    if (host.fileExists(name) && state.readFileWithCache(name) === text) {
                         priorChangeTime = host.getModifiedTime(name);
                     }
                     else {
@@ -77326,448 +79519,805 @@ var ts;
                         anyDtsChanged = true;
                     }
                 }
-                emittedOutputs.setValue(name, true);
-                ts.writeFile(compilerHost, emitterDiagnostics, name, text, writeByteOrderMark);
+                emittedOutputs.set(toPath(state, name), name);
+                ts.writeFile(writeFileCallback ? { writeFile: writeFileCallback } : compilerHost, emitterDiagnostics, name, text, writeByteOrderMark);
                 if (priorChangeTime !== undefined) {
                     newestDeclarationFileContentChangedTime = newer(priorChangeTime, newestDeclarationFileContentChangedTime);
-                    unchangedOutputs.setValue(name, priorChangeTime);
                 }
             });
+            finishEmit(emitterDiagnostics, emittedOutputs, newestDeclarationFileContentChangedTime, anyDtsChanged, outputFiles.length ? outputFiles[0].name : ts.getFirstProjectOutput(config, !host.useCaseSensitiveFileNames()), resultFlags);
+            return emitResult;
+        }
+        function finishEmit(emitterDiagnostics, emittedOutputs, priorNewestUpdateTime, newestDeclarationFileContentChangedTimeIsMaximumDate, oldestOutputFileName, resultFlags) {
             var emitDiagnostics = emitterDiagnostics.getDiagnostics();
             if (emitDiagnostics.length) {
-                return buildErrors(emitDiagnostics, BuildResultFlags.EmitErrors, "Emit");
+                buildResult = buildErrors(state, projectPath, program, emitDiagnostics, BuildResultFlags.EmitErrors, "Emit");
+                step = Step.QueueReferencingProjects;
+                return emitDiagnostics;
             }
-            newestDeclarationFileContentChangedTime = updateOutputTimestampsWorker(configFile, newestDeclarationFileContentChangedTime, ts.Diagnostics.Updating_unchanged_output_timestamps_of_project_0, emittedOutputs);
-            var status = {
-                type: UpToDateStatusType.UpToDate,
-                newestDeclarationFileContentChangedTime: anyDtsChanged ? maximumDate : newestDeclarationFileContentChangedTime,
-                oldestOutputFileName: outputFiles.length ? outputFiles[0].name : getFirstProjectOutput(configFile)
-            };
-            diagnostics.removeKey(proj);
-            projectStatus.setValue(proj, status);
-            afterProgramCreate(proj, program);
-            projectCompilerOptions = baseCompilerOptions;
-            return resultFlags;
-            function buildErrors(diagnostics, errorFlags, errorType) {
-                resultFlags |= errorFlags;
-                reportAndStoreErrors(proj, diagnostics);
-                projectStatus.setValue(proj, { type: UpToDateStatusType.Unbuildable, reason: errorType + " errors" });
-                afterProgramCreate(proj, program);
-                projectCompilerOptions = baseCompilerOptions;
-                return resultFlags;
+            if (state.writeFileName) {
+                emittedOutputs.forEach(function (name) { return listEmittedFile(state, config, name); });
+                if (program)
+                    ts.listFiles(program, state.writeFileName);
             }
+            var newestDeclarationFileContentChangedTime = updateOutputTimestampsWorker(state, config, priorNewestUpdateTime, ts.Diagnostics.Updating_unchanged_output_timestamps_of_project_0, emittedOutputs);
+            state.diagnostics.delete(projectPath);
+            state.projectStatus.set(projectPath, {
+                type: ts.UpToDateStatusType.UpToDate,
+                newestDeclarationFileContentChangedTime: newestDeclarationFileContentChangedTimeIsMaximumDate ?
+                    maximumDate :
+                    newestDeclarationFileContentChangedTime,
+                oldestOutputFileName: oldestOutputFileName
+            });
+            if (program)
+                afterProgramCreate(state, projectPath, program);
+            state.projectCompilerOptions = state.baseCompilerOptions;
+            step = Step.QueueReferencingProjects;
+            buildResult = resultFlags;
+            return emitDiagnostics;
         }
-        function afterProgramCreate(proj, program) {
-            if (host.afterProgramEmitAndDiagnostics) {
-                host.afterProgramEmitAndDiagnostics(program);
+        function emitBundle(writeFileCallback, customTransformers) {
+            ts.Debug.assert(kind === InvalidatedProjectKind.UpdateBundle);
+            if (state.options.dry) {
+                reportStatus(state, ts.Diagnostics.A_non_dry_build_would_update_output_of_project_0, project);
+                buildResult = BuildResultFlags.Success;
+                step = Step.QueueReferencingProjects;
+                return undefined;
             }
-            if (options.watch) {
-                program.releaseProgram();
-                builderPrograms.setValue(proj, program);
-            }
-        }
-        function getOldProgram(proj, parsed) {
-            var value = builderPrograms.getValue(proj);
-            if (value)
-                return value;
-            return ts.readBuilderProgram(parsed.options, readFileWithCache);
-        }
-        function updateBundle(proj) {
-            if (options.dry) {
-                reportStatus(ts.Diagnostics.A_non_dry_build_would_update_output_of_project_0, proj);
-                return BuildResultFlags.Success;
-            }
-            if (options.verbose)
-                reportStatus(ts.Diagnostics.Updating_output_of_project_0, proj);
-            var config = ts.Debug.assertDefined(parseConfigFile(proj));
-            projectCompilerOptions = config.options;
-            var outputFiles = ts.emitUsingBuildInfo(config, compilerHost, function (ref) { return parseConfigFile(resolveProjectName(ref.path)); });
+            if (state.options.verbose)
+                reportStatus(state, ts.Diagnostics.Updating_output_of_project_0, project);
+            var compilerHost = state.compilerHost;
+            state.projectCompilerOptions = config.options;
+            var outputFiles = ts.emitUsingBuildInfo(config, compilerHost, function (ref) {
+                var refName = resolveProjectName(state, ref.path);
+                return parseConfigFile(state, refName, toResolvedConfigFilePath(state, refName));
+            }, customTransformers);
             if (ts.isString(outputFiles)) {
-                reportStatus(ts.Diagnostics.Cannot_update_output_of_project_0_because_there_was_error_reading_file_1, proj, relName(outputFiles));
-                return buildSingleProject(proj);
+                reportStatus(state, ts.Diagnostics.Cannot_update_output_of_project_0_because_there_was_error_reading_file_1, project, relName(state, outputFiles));
+                step = Step.BuildInvalidatedProjectOfBundle;
+                return invalidatedProjectOfBundle = createBuildOrUpdateInvalidedProject(InvalidatedProjectKind.Build, state, project, projectPath, projectIndex, config, buildOrder);
             }
             ts.Debug.assert(!!outputFiles.length);
             var emitterDiagnostics = ts.createDiagnosticCollection();
-            var emittedOutputs = createFileMap(toPath);
+            var emittedOutputs = ts.createMap();
             outputFiles.forEach(function (_a) {
                 var name = _a.name, text = _a.text, writeByteOrderMark = _a.writeByteOrderMark;
-                emittedOutputs.setValue(name, true);
-                ts.writeFile(compilerHost, emitterDiagnostics, name, text, writeByteOrderMark);
+                emittedOutputs.set(toPath(state, name), name);
+                ts.writeFile(writeFileCallback ? { writeFile: writeFileCallback } : compilerHost, emitterDiagnostics, name, text, writeByteOrderMark);
             });
-            var emitDiagnostics = emitterDiagnostics.getDiagnostics();
-            if (emitDiagnostics.length) {
-                reportAndStoreErrors(proj, emitDiagnostics);
-                projectStatus.setValue(proj, { type: UpToDateStatusType.Unbuildable, reason: "Emit errors" });
-                projectCompilerOptions = baseCompilerOptions;
-                return BuildResultFlags.DeclarationOutputUnchanged | BuildResultFlags.EmitErrors;
+            var emitDiagnostics = finishEmit(emitterDiagnostics, emittedOutputs, minimumDate, false, outputFiles[0].name, BuildResultFlags.DeclarationOutputUnchanged);
+            return { emitSkipped: false, diagnostics: emitDiagnostics };
+        }
+        function executeSteps(till, cancellationToken, writeFile, customTransformers) {
+            while (step <= till && step < Step.Done) {
+                var currentStep = step;
+                switch (step) {
+                    case Step.CreateProgram:
+                        createProgram();
+                        break;
+                    case Step.SyntaxDiagnostics:
+                        getSyntaxDiagnostics(cancellationToken);
+                        break;
+                    case Step.SemanticDiagnostics:
+                        getSemanticDiagnostics(cancellationToken);
+                        break;
+                    case Step.Emit:
+                        emit(writeFile, cancellationToken, customTransformers);
+                        break;
+                    case Step.EmitBundle:
+                        emitBundle(writeFile, customTransformers);
+                        break;
+                    case Step.BuildInvalidatedProjectOfBundle:
+                        ts.Debug.assertDefined(invalidatedProjectOfBundle).done(cancellationToken);
+                        step = Step.Done;
+                        break;
+                    case Step.QueueReferencingProjects:
+                        queueReferencingProjects(state, project, projectPath, projectIndex, config, buildOrder, ts.Debug.assertDefined(buildResult));
+                        step++;
+                        break;
+                    case Step.Done:
+                    default:
+                        ts.assertType(step);
+                }
+                ts.Debug.assert(step > currentStep);
             }
-            var newestDeclarationFileContentChangedTime = updateOutputTimestampsWorker(config, minimumDate, ts.Diagnostics.Updating_unchanged_output_timestamps_of_project_0, emittedOutputs);
-            var status = {
-                type: UpToDateStatusType.UpToDate,
-                newestDeclarationFileContentChangedTime: newestDeclarationFileContentChangedTime,
-                oldestOutputFileName: outputFiles[0].name
-            };
-            diagnostics.removeKey(proj);
-            projectStatus.setValue(proj, status);
-            projectCompilerOptions = baseCompilerOptions;
-            return BuildResultFlags.DeclarationOutputUnchanged;
-        }
-        function updateOutputTimestamps(proj) {
-            if (options.dry) {
-                return reportStatus(ts.Diagnostics.A_non_dry_build_would_update_timestamps_for_output_of_project_0, proj.options.configFilePath);
-            }
-            var priorNewestUpdateTime = updateOutputTimestampsWorker(proj, minimumDate, ts.Diagnostics.Updating_output_timestamps_of_project_0);
-            projectStatus.setValue(proj.options.configFilePath, { type: UpToDateStatusType.UpToDate, newestDeclarationFileContentChangedTime: priorNewestUpdateTime });
-        }
-        function updateOutputTimestampsWorker(proj, priorNewestUpdateTime, verboseMessage, skipOutputs) {
-            var outputs = getAllProjectOutputs(proj);
-            if (!skipOutputs || outputs.length !== skipOutputs.getSize()) {
-                if (options.verbose) {
-                    reportStatus(verboseMessage, proj.options.configFilePath);
-                }
-                var now = host.now ? host.now() : new Date();
-                for (var _i = 0, outputs_2 = outputs; _i < outputs_2.length; _i++) {
-                    var file = outputs_2[_i];
-                    if (skipOutputs && skipOutputs.hasKey(file)) {
-                        continue;
-                    }
-                    if (isDeclarationFile(file)) {
-                        priorNewestUpdateTime = newer(priorNewestUpdateTime, host.getModifiedTime(file) || ts.missingFileModifiedTime);
-                    }
-                    host.setModifiedTime(file, now);
-                    if (proj.options.listEmittedFiles) {
-                        writeFileName("TSFILE: " + file);
-                    }
-                }
-            }
-            return priorNewestUpdateTime;
-        }
-        function getFilesToClean() {
-            var graph = getGlobalDependencyGraph();
-            var filesToDelete = [];
-            for (var _i = 0, _a = graph.buildQueue; _i < _a.length; _i++) {
-                var proj = _a[_i];
-                var parsed = parseConfigFile(proj);
-                if (parsed === undefined) {
-                    reportParseConfigFileDiagnostic(proj);
-                    continue;
-                }
-                var outputs = getAllProjectOutputs(parsed);
-                for (var _b = 0, outputs_3 = outputs; _b < outputs_3.length; _b++) {
-                    var output = outputs_3[_b];
-                    if (host.fileExists(output)) {
-                        filesToDelete.push(output);
-                    }
-                }
-            }
-            return filesToDelete;
-        }
-        function cleanAllProjects() {
-            var filesToDelete = getFilesToClean();
-            if (options.dry) {
-                reportStatus(ts.Diagnostics.A_non_dry_build_would_delete_the_following_files_Colon_0, filesToDelete.map(function (f) { return "\r\n * " + f; }).join(""));
-                return ts.ExitStatus.Success;
-            }
-            for (var _i = 0, filesToDelete_1 = filesToDelete; _i < filesToDelete_1.length; _i++) {
-                var output = filesToDelete_1[_i];
-                host.deleteFile(output);
-            }
-            return ts.ExitStatus.Success;
-        }
-        function resolveProjectName(name) {
-            return resolveConfigFileProjectName(ts.resolvePath(host.getCurrentDirectory(), name));
-        }
-        function resolveProjectNames(configFileNames) {
-            return configFileNames.map(resolveProjectName);
-        }
-        function buildAllProjects() {
-            if (options.watch) {
-                reportWatchStatus(ts.Diagnostics.Starting_compilation_in_watch_mode);
-            }
-            var savedReadFileWithCache = readFileWithCache;
-            var savedGetSourceFile = compilerHost.getSourceFile;
-            var _a = ts.changeCompilerHostLikeToUseCache(host, toPath, function () {
-                var args = [];
-                for (var _i = 0; _i < arguments.length; _i++) {
-                    args[_i] = arguments[_i];
-                }
-                return savedGetSourceFile.call.apply(savedGetSourceFile, [compilerHost].concat(args));
-            }), originalReadFile = _a.originalReadFile, originalFileExists = _a.originalFileExists, originalDirectoryExists = _a.originalDirectoryExists, originalCreateDirectory = _a.originalCreateDirectory, originalWriteFile = _a.originalWriteFile, getSourceFileWithCache = _a.getSourceFileWithCache, newReadFileWithCache = _a.readFileWithCache;
-            readFileWithCache = newReadFileWithCache;
-            compilerHost.getSourceFile = getSourceFileWithCache;
-            var graph = getGlobalDependencyGraph();
-            reportBuildQueue(graph);
-            var anyFailed = false;
-            for (var _i = 0, _b = graph.buildQueue; _i < _b.length; _i++) {
-                var next = _b[_i];
-                var proj = parseConfigFile(next);
-                if (proj === undefined) {
-                    reportParseConfigFileDiagnostic(next);
-                    anyFailed = true;
-                    break;
-                }
-                var errors = proj.errors;
-                var status = getUpToDateStatus(proj);
-                verboseReportProjectStatus(next, status);
-                var projName = proj.options.configFilePath;
-                if (status.type === UpToDateStatusType.UpToDate && !options.force) {
-                    reportAndStoreErrors(next, errors);
-                    if (defaultOptions.dry) {
-                        reportStatus(ts.Diagnostics.Project_0_is_up_to_date, projName);
-                    }
-                    continue;
-                }
-                if (status.type === UpToDateStatusType.UpToDateWithUpstreamTypes && !options.force) {
-                    reportAndStoreErrors(next, errors);
-                    updateOutputTimestamps(proj);
-                    continue;
-                }
-                if (status.type === UpToDateStatusType.UpstreamBlocked) {
-                    reportAndStoreErrors(next, errors);
-                    if (options.verbose)
-                        reportStatus(ts.Diagnostics.Skipping_build_of_project_0_because_its_dependency_1_has_errors, projName, status.upstreamProjectName);
-                    continue;
-                }
-                if (status.type === UpToDateStatusType.ContainerOnly) {
-                    reportAndStoreErrors(next, errors);
-                    continue;
-                }
-                var buildResult = status.type === UpToDateStatusType.OutOfDateWithPrepend && !options.force ?
-                    updateBundle(next) :
-                    buildSingleProject(next);
-                anyFailed = anyFailed || !!(buildResult & BuildResultFlags.AnyErrors);
-            }
-            reportErrorSummary();
-            host.readFile = originalReadFile;
-            host.fileExists = originalFileExists;
-            host.directoryExists = originalDirectoryExists;
-            host.createDirectory = originalCreateDirectory;
-            host.writeFile = originalWriteFile;
-            compilerHost.getSourceFile = savedGetSourceFile;
-            readFileWithCache = savedReadFileWithCache;
-            return anyFailed ? ts.ExitStatus.DiagnosticsPresent_OutputsSkipped : ts.ExitStatus.Success;
-        }
-        function reportParseConfigFileDiagnostic(proj) {
-            reportAndStoreErrors(proj, [configFileCache.getValue(proj)]);
-        }
-        function reportAndStoreErrors(proj, errors) {
-            reportErrors(errors);
-            projectErrorsReported.setValue(proj, true);
-            diagnostics.setValue(proj, errors);
-        }
-        function reportErrors(errors) {
-            errors.forEach(function (err) { return host.reportDiagnostic(err); });
-        }
-        function reportBuildQueue(graph) {
-            if (options.verbose) {
-                reportStatus(ts.Diagnostics.Projects_in_this_build_Colon_0, graph.buildQueue.map(function (s) { return "\r\n    * " + relName(s); }).join(""));
-            }
-        }
-        function relName(path) {
-            return ts.convertToRelativePath(path, host.getCurrentDirectory(), function (f) { return compilerHost.getCanonicalFileName(f); });
-        }
-        function verboseReportProjectStatus(configFileName, status) {
-            if (!options.verbose)
-                return;
-            return formatUpToDateStatus(configFileName, status, relName, reportStatus);
         }
     }
-    ts.createSolutionBuilder = createSolutionBuilder;
-    function resolveConfigFileProjectName(project) {
-        if (ts.fileExtensionIs(project, ".json")) {
-            return project;
-        }
-        return ts.combinePaths(project, "tsconfig.json");
+    function needsBuild(_a, status, config) {
+        var options = _a.options;
+        if (status.type !== ts.UpToDateStatusType.OutOfDateWithPrepend || options.force)
+            return true;
+        return config.fileNames.length === 0 ||
+            !!config.errors.length ||
+            !ts.isIncrementalCompilation(config.options);
     }
-    ts.resolveConfigFileProjectName = resolveConfigFileProjectName;
-    function getAllProjectOutputs(project) {
-        if (project.options.outFile || project.options.out) {
-            return getOutFileOutputs(project);
+    function getNextInvalidatedProject(state, buildOrder, reportQueue) {
+        if (!state.projectPendingBuild.size)
+            return undefined;
+        if (state.currentInvalidatedProject) {
+            return ts.arrayIsEqualTo(state.currentInvalidatedProject.buildOrder, buildOrder) ?
+                state.currentInvalidatedProject :
+                undefined;
+        }
+        var options = state.options, projectPendingBuild = state.projectPendingBuild;
+        for (var projectIndex = 0; projectIndex < buildOrder.length; projectIndex++) {
+            var project = buildOrder[projectIndex];
+            var projectPath = toResolvedConfigFilePath(state, project);
+            var reloadLevel = state.projectPendingBuild.get(projectPath);
+            if (reloadLevel === undefined)
+                continue;
+            if (reportQueue) {
+                reportQueue = false;
+                reportBuildQueue(state, buildOrder);
+            }
+            var config = parseConfigFile(state, project, projectPath);
+            if (!config) {
+                reportParseConfigFileDiagnostic(state, projectPath);
+                projectPendingBuild.delete(projectPath);
+                continue;
+            }
+            if (reloadLevel === ts.ConfigFileProgramReloadLevel.Full) {
+                watchConfigFile(state, project, projectPath);
+                watchWildCardDirectories(state, project, projectPath, config);
+                watchInputFiles(state, project, projectPath, config);
+            }
+            else if (reloadLevel === ts.ConfigFileProgramReloadLevel.Partial) {
+                var result = ts.getFileNamesFromConfigSpecs(config.configFileSpecs, ts.getDirectoryPath(project), config.options, state.parseConfigFileHost);
+                ts.updateErrorForNoInputFiles(result, project, config.configFileSpecs, config.errors, ts.canJsonReportNoInutFiles(config.raw));
+                config.fileNames = result.fileNames;
+                watchInputFiles(state, project, projectPath, config);
+            }
+            var status = getUpToDateStatus(state, config, projectPath);
+            verboseReportProjectStatus(state, project, status);
+            if (!options.force) {
+                if (status.type === ts.UpToDateStatusType.UpToDate) {
+                    reportAndStoreErrors(state, projectPath, config.errors);
+                    projectPendingBuild.delete(projectPath);
+                    if (options.dry) {
+                        reportStatus(state, ts.Diagnostics.Project_0_is_up_to_date, project);
+                    }
+                    continue;
+                }
+                if (status.type === ts.UpToDateStatusType.UpToDateWithUpstreamTypes) {
+                    reportAndStoreErrors(state, projectPath, config.errors);
+                    return createUpdateOutputFileStampsProject(state, project, projectPath, config, buildOrder);
+                }
+            }
+            if (status.type === ts.UpToDateStatusType.UpstreamBlocked) {
+                reportAndStoreErrors(state, projectPath, config.errors);
+                projectPendingBuild.delete(projectPath);
+                if (options.verbose)
+                    reportStatus(state, ts.Diagnostics.Skipping_build_of_project_0_because_its_dependency_1_has_errors, project, status.upstreamProjectName);
+                continue;
+            }
+            if (status.type === ts.UpToDateStatusType.ContainerOnly) {
+                reportAndStoreErrors(state, projectPath, config.errors);
+                projectPendingBuild.delete(projectPath);
+                continue;
+            }
+            return createBuildOrUpdateInvalidedProject(needsBuild(state, status, config) ?
+                InvalidatedProjectKind.Build :
+                InvalidatedProjectKind.UpdateBundle, state, project, projectPath, projectIndex, config, buildOrder);
+        }
+        return undefined;
+    }
+    function listEmittedFile(_a, proj, file) {
+        var writeFileName = _a.writeFileName;
+        if (writeFileName && proj.options.listEmittedFiles) {
+            writeFileName("TSFILE: " + file);
+        }
+    }
+    function getOldProgram(_a, proj, parsed) {
+        var options = _a.options, builderPrograms = _a.builderPrograms, compilerHost = _a.compilerHost;
+        if (options.force)
+            return undefined;
+        var value = builderPrograms.get(proj);
+        if (value)
+            return value;
+        return ts.readBuilderProgram(parsed.options, compilerHost);
+    }
+    function afterProgramCreate(_a, proj, program) {
+        var host = _a.host, watch = _a.watch, builderPrograms = _a.builderPrograms;
+        if (host.afterProgramEmitAndDiagnostics) {
+            host.afterProgramEmitAndDiagnostics(program);
+        }
+        if (watch) {
+            program.releaseProgram();
+            builderPrograms.set(proj, program);
+        }
+    }
+    function buildErrors(state, resolvedPath, program, diagnostics, errorFlags, errorType) {
+        reportAndStoreErrors(state, resolvedPath, diagnostics);
+        if (program && state.writeFileName)
+            ts.listFiles(program, state.writeFileName);
+        state.projectStatus.set(resolvedPath, { type: ts.UpToDateStatusType.Unbuildable, reason: errorType + " errors" });
+        if (program)
+            afterProgramCreate(state, resolvedPath, program);
+        state.projectCompilerOptions = state.baseCompilerOptions;
+        return errorFlags;
+    }
+    function updateModuleResolutionCache(state, proj, config) {
+        if (!state.moduleResolutionCache)
+            return;
+        var moduleResolutionCache = state.moduleResolutionCache;
+        var projPath = toPath(state, proj);
+        if (moduleResolutionCache.directoryToModuleNameMap.redirectsMap.size === 0) {
+            ts.Debug.assert(moduleResolutionCache.moduleNameToDirectoryMap.redirectsMap.size === 0);
+            moduleResolutionCache.directoryToModuleNameMap.redirectsMap.set(projPath, moduleResolutionCache.directoryToModuleNameMap.ownMap);
+            moduleResolutionCache.moduleNameToDirectoryMap.redirectsMap.set(projPath, moduleResolutionCache.moduleNameToDirectoryMap.ownMap);
         }
         else {
-            var outputs = [];
-            for (var _i = 0, _a = project.fileNames; _i < _a.length; _i++) {
-                var inputFile = _a[_i];
-                outputs.push.apply(outputs, getOutputFileNames(inputFile, project));
-            }
-            var buildInfoPath = ts.getOutputPathForBuildInfo(project.options);
-            if (buildInfoPath)
-                outputs.push(buildInfoPath);
-            return outputs;
+            ts.Debug.assert(moduleResolutionCache.moduleNameToDirectoryMap.redirectsMap.size > 0);
+            var ref = {
+                sourceFile: config.options.configFile,
+                commandLine: config
+            };
+            moduleResolutionCache.directoryToModuleNameMap.setOwnMap(moduleResolutionCache.directoryToModuleNameMap.getOrCreateMapOfCacheRedirects(ref));
+            moduleResolutionCache.moduleNameToDirectoryMap.setOwnMap(moduleResolutionCache.moduleNameToDirectoryMap.getOrCreateMapOfCacheRedirects(ref));
+        }
+        moduleResolutionCache.directoryToModuleNameMap.setOwnOptions(config.options);
+        moduleResolutionCache.moduleNameToDirectoryMap.setOwnOptions(config.options);
+    }
+    function checkConfigFileUpToDateStatus(state, configFile, oldestOutputFileTime, oldestOutputFileName) {
+        var tsconfigTime = state.host.getModifiedTime(configFile) || ts.missingFileModifiedTime;
+        if (oldestOutputFileTime < tsconfigTime) {
+            return {
+                type: ts.UpToDateStatusType.OutOfDateWithSelf,
+                outOfDateOutputFileName: oldestOutputFileName,
+                newerInputFileName: configFile
+            };
         }
     }
-    ts.getAllProjectOutputs = getAllProjectOutputs;
-    function getFirstProjectOutput(project) {
-        if (project.options.outFile || project.options.out) {
-            return ts.first(getOutFileOutputs(project));
-        }
+    function getUpToDateStatusWorker(state, project, resolvedPath) {
+        var newestInputFileName = undefined;
+        var newestInputFileTime = minimumDate;
+        var host = state.host;
         for (var _i = 0, _a = project.fileNames; _i < _a.length; _i++) {
             var inputFile = _a[_i];
-            var outputs = getOutputFileNames(inputFile, project);
-            if (outputs.length) {
-                return ts.first(outputs);
+            if (!host.fileExists(inputFile)) {
+                return {
+                    type: ts.UpToDateStatusType.Unbuildable,
+                    reason: inputFile + " does not exist"
+                };
+            }
+            var inputTime = host.getModifiedTime(inputFile) || ts.missingFileModifiedTime;
+            if (inputTime > newestInputFileTime) {
+                newestInputFileName = inputFile;
+                newestInputFileTime = inputTime;
             }
         }
-        return ts.Debug.fail("project " + project.options.configFilePath + " expected to have at least one output");
+        if (!project.fileNames.length && !ts.canJsonReportNoInutFiles(project.raw)) {
+            return {
+                type: ts.UpToDateStatusType.ContainerOnly
+            };
+        }
+        var outputs = ts.getAllProjectOutputs(project, !host.useCaseSensitiveFileNames());
+        var oldestOutputFileName = "(none)";
+        var oldestOutputFileTime = maximumDate;
+        var newestOutputFileName = "(none)";
+        var newestOutputFileTime = minimumDate;
+        var missingOutputFileName;
+        var newestDeclarationFileContentChangedTime = minimumDate;
+        var isOutOfDateWithInputs = false;
+        for (var _b = 0, outputs_1 = outputs; _b < outputs_1.length; _b++) {
+            var output = outputs_1[_b];
+            if (!host.fileExists(output)) {
+                missingOutputFileName = output;
+                break;
+            }
+            var outputTime = host.getModifiedTime(output) || ts.missingFileModifiedTime;
+            if (outputTime < oldestOutputFileTime) {
+                oldestOutputFileTime = outputTime;
+                oldestOutputFileName = output;
+            }
+            if (outputTime < newestInputFileTime) {
+                isOutOfDateWithInputs = true;
+                break;
+            }
+            if (outputTime > newestOutputFileTime) {
+                newestOutputFileTime = outputTime;
+                newestOutputFileName = output;
+            }
+            if (isDeclarationFile(output)) {
+                var outputModifiedTime = host.getModifiedTime(output) || ts.missingFileModifiedTime;
+                newestDeclarationFileContentChangedTime = newer(newestDeclarationFileContentChangedTime, outputModifiedTime);
+            }
+        }
+        var pseudoUpToDate = false;
+        var usesPrepend = false;
+        var upstreamChangedProject;
+        if (project.projectReferences) {
+            state.projectStatus.set(resolvedPath, { type: ts.UpToDateStatusType.ComputingUpstream });
+            for (var _c = 0, _d = project.projectReferences; _c < _d.length; _c++) {
+                var ref = _d[_c];
+                usesPrepend = usesPrepend || !!(ref.prepend);
+                var resolvedRef = ts.resolveProjectReferencePath(ref);
+                var resolvedRefPath = toResolvedConfigFilePath(state, resolvedRef);
+                var refStatus = getUpToDateStatus(state, parseConfigFile(state, resolvedRef, resolvedRefPath), resolvedRefPath);
+                if (refStatus.type === ts.UpToDateStatusType.ComputingUpstream ||
+                    refStatus.type === ts.UpToDateStatusType.ContainerOnly) {
+                    continue;
+                }
+                if (refStatus.type === ts.UpToDateStatusType.Unbuildable) {
+                    return {
+                        type: ts.UpToDateStatusType.UpstreamBlocked,
+                        upstreamProjectName: ref.path
+                    };
+                }
+                if (refStatus.type !== ts.UpToDateStatusType.UpToDate) {
+                    return {
+                        type: ts.UpToDateStatusType.UpstreamOutOfDate,
+                        upstreamProjectName: ref.path
+                    };
+                }
+                if (!missingOutputFileName) {
+                    if (refStatus.newestInputFileTime && refStatus.newestInputFileTime <= oldestOutputFileTime) {
+                        continue;
+                    }
+                    if (refStatus.newestDeclarationFileContentChangedTime && refStatus.newestDeclarationFileContentChangedTime <= oldestOutputFileTime) {
+                        pseudoUpToDate = true;
+                        upstreamChangedProject = ref.path;
+                        continue;
+                    }
+                    ts.Debug.assert(oldestOutputFileName !== undefined, "Should have an oldest output filename here");
+                    return {
+                        type: ts.UpToDateStatusType.OutOfDateWithUpstream,
+                        outOfDateOutputFileName: oldestOutputFileName,
+                        newerProjectName: ref.path
+                    };
+                }
+            }
+        }
+        if (missingOutputFileName !== undefined) {
+            return {
+                type: ts.UpToDateStatusType.OutputMissing,
+                missingOutputFileName: missingOutputFileName
+            };
+        }
+        if (isOutOfDateWithInputs) {
+            return {
+                type: ts.UpToDateStatusType.OutOfDateWithSelf,
+                outOfDateOutputFileName: oldestOutputFileName,
+                newerInputFileName: newestInputFileName
+            };
+        }
+        else {
+            var configStatus = checkConfigFileUpToDateStatus(state, project.options.configFilePath, oldestOutputFileTime, oldestOutputFileName);
+            if (configStatus)
+                return configStatus;
+            var extendedConfigStatus = ts.forEach(project.options.configFile.extendedSourceFiles || ts.emptyArray, function (configFile) { return checkConfigFileUpToDateStatus(state, configFile, oldestOutputFileTime, oldestOutputFileName); });
+            if (extendedConfigStatus)
+                return extendedConfigStatus;
+        }
+        if (!state.buildInfoChecked.has(resolvedPath)) {
+            state.buildInfoChecked.set(resolvedPath, true);
+            var buildInfoPath = ts.getOutputPathForBuildInfo(project.options);
+            if (buildInfoPath) {
+                var value = state.readFileWithCache(buildInfoPath);
+                var buildInfo = value && ts.getBuildInfo(value);
+                if (buildInfo && (buildInfo.bundle || buildInfo.program) && buildInfo.version !== ts.version) {
+                    return {
+                        type: ts.UpToDateStatusType.TsVersionOutputOfDate,
+                        version: buildInfo.version
+                    };
+                }
+            }
+        }
+        if (usesPrepend && pseudoUpToDate) {
+            return {
+                type: ts.UpToDateStatusType.OutOfDateWithPrepend,
+                outOfDateOutputFileName: oldestOutputFileName,
+                newerProjectName: upstreamChangedProject
+            };
+        }
+        return {
+            type: pseudoUpToDate ? ts.UpToDateStatusType.UpToDateWithUpstreamTypes : ts.UpToDateStatusType.UpToDate,
+            newestDeclarationFileContentChangedTime: newestDeclarationFileContentChangedTime,
+            newestInputFileTime: newestInputFileTime,
+            newestOutputFileTime: newestOutputFileTime,
+            newestInputFileName: newestInputFileName,
+            newestOutputFileName: newestOutputFileName,
+            oldestOutputFileName: oldestOutputFileName
+        };
     }
-    function formatUpToDateStatus(configFileName, status, relName, formatMessage) {
+    function getUpToDateStatus(state, project, resolvedPath) {
+        if (project === undefined) {
+            return { type: ts.UpToDateStatusType.Unbuildable, reason: "File deleted mid-build" };
+        }
+        var prior = state.projectStatus.get(resolvedPath);
+        if (prior !== undefined) {
+            return prior;
+        }
+        var actual = getUpToDateStatusWorker(state, project, resolvedPath);
+        state.projectStatus.set(resolvedPath, actual);
+        return actual;
+    }
+    function updateOutputTimestampsWorker(state, proj, priorNewestUpdateTime, verboseMessage, skipOutputs) {
+        var host = state.host;
+        var outputs = ts.getAllProjectOutputs(proj, !host.useCaseSensitiveFileNames());
+        if (!skipOutputs || outputs.length !== skipOutputs.size) {
+            var reportVerbose = !!state.options.verbose;
+            var now = host.now ? host.now() : new Date();
+            for (var _i = 0, outputs_2 = outputs; _i < outputs_2.length; _i++) {
+                var file = outputs_2[_i];
+                if (skipOutputs && skipOutputs.has(toPath(state, file))) {
+                    continue;
+                }
+                if (reportVerbose) {
+                    reportVerbose = false;
+                    reportStatus(state, verboseMessage, proj.options.configFilePath);
+                }
+                if (isDeclarationFile(file)) {
+                    priorNewestUpdateTime = newer(priorNewestUpdateTime, host.getModifiedTime(file) || ts.missingFileModifiedTime);
+                }
+                host.setModifiedTime(file, now);
+                listEmittedFile(state, proj, file);
+            }
+        }
+        return priorNewestUpdateTime;
+    }
+    function updateOutputTimestamps(state, proj, resolvedPath) {
+        if (state.options.dry) {
+            return reportStatus(state, ts.Diagnostics.A_non_dry_build_would_update_timestamps_for_output_of_project_0, proj.options.configFilePath);
+        }
+        var priorNewestUpdateTime = updateOutputTimestampsWorker(state, proj, minimumDate, ts.Diagnostics.Updating_output_timestamps_of_project_0);
+        state.projectStatus.set(resolvedPath, {
+            type: ts.UpToDateStatusType.UpToDate,
+            newestDeclarationFileContentChangedTime: priorNewestUpdateTime,
+            oldestOutputFileName: ts.getFirstProjectOutput(proj, !state.host.useCaseSensitiveFileNames())
+        });
+    }
+    function queueReferencingProjects(state, project, projectPath, projectIndex, config, buildOrder, buildResult) {
+        if (buildResult & BuildResultFlags.AnyErrors)
+            return;
+        if (!config.options.composite)
+            return;
+        for (var index = projectIndex + 1; index < buildOrder.length; index++) {
+            var nextProject = buildOrder[index];
+            var nextProjectPath = toResolvedConfigFilePath(state, nextProject);
+            if (state.projectPendingBuild.has(nextProjectPath))
+                continue;
+            var nextProjectConfig = parseConfigFile(state, nextProject, nextProjectPath);
+            if (!nextProjectConfig || !nextProjectConfig.projectReferences)
+                continue;
+            for (var _i = 0, _a = nextProjectConfig.projectReferences; _i < _a.length; _i++) {
+                var ref = _a[_i];
+                var resolvedRefPath = resolveProjectName(state, ref.path);
+                if (toResolvedConfigFilePath(state, resolvedRefPath) !== projectPath)
+                    continue;
+                var status = state.projectStatus.get(nextProjectPath);
+                if (status) {
+                    switch (status.type) {
+                        case ts.UpToDateStatusType.UpToDate:
+                            if (buildResult & BuildResultFlags.DeclarationOutputUnchanged) {
+                                if (ref.prepend) {
+                                    state.projectStatus.set(nextProjectPath, {
+                                        type: ts.UpToDateStatusType.OutOfDateWithPrepend,
+                                        outOfDateOutputFileName: status.oldestOutputFileName,
+                                        newerProjectName: project
+                                    });
+                                }
+                                else {
+                                    status.type = ts.UpToDateStatusType.UpToDateWithUpstreamTypes;
+                                }
+                                break;
+                            }
+                        case ts.UpToDateStatusType.UpToDateWithUpstreamTypes:
+                        case ts.UpToDateStatusType.OutOfDateWithPrepend:
+                            if (!(buildResult & BuildResultFlags.DeclarationOutputUnchanged)) {
+                                state.projectStatus.set(nextProjectPath, {
+                                    type: ts.UpToDateStatusType.OutOfDateWithUpstream,
+                                    outOfDateOutputFileName: status.type === ts.UpToDateStatusType.OutOfDateWithPrepend ? status.outOfDateOutputFileName : status.oldestOutputFileName,
+                                    newerProjectName: project
+                                });
+                            }
+                            break;
+                        case ts.UpToDateStatusType.UpstreamBlocked:
+                            if (toResolvedConfigFilePath(state, resolveProjectName(state, status.upstreamProjectName)) === projectPath) {
+                                clearProjectStatus(state, nextProjectPath);
+                            }
+                            break;
+                    }
+                }
+                addProjToQueue(state, nextProjectPath, ts.ConfigFileProgramReloadLevel.None);
+                break;
+            }
+        }
+    }
+    function build(state, project, cancellationToken, onlyReferences) {
+        var buildOrder = getBuildOrderFor(state, project, onlyReferences);
+        if (!buildOrder)
+            return ts.ExitStatus.InvalidProject_OutputsSkipped;
+        setupInitialBuild(state, cancellationToken);
+        var reportQueue = true;
+        var successfulProjects = 0;
+        var errorProjects = 0;
+        while (true) {
+            var invalidatedProject = getNextInvalidatedProject(state, buildOrder, reportQueue);
+            if (!invalidatedProject)
+                break;
+            reportQueue = false;
+            invalidatedProject.done(cancellationToken);
+            if (state.diagnostics.has(invalidatedProject.projectPath)) {
+                errorProjects++;
+            }
+            else {
+                successfulProjects++;
+            }
+        }
+        disableCache(state);
+        reportErrorSummary(state, buildOrder);
+        startWatching(state, buildOrder);
+        return errorProjects ?
+            successfulProjects ?
+                ts.ExitStatus.DiagnosticsPresent_OutputsGenerated :
+                ts.ExitStatus.DiagnosticsPresent_OutputsSkipped :
+            ts.ExitStatus.Success;
+    }
+    function clean(state, project, onlyReferences) {
+        var buildOrder = getBuildOrderFor(state, project, onlyReferences);
+        if (!buildOrder)
+            return ts.ExitStatus.InvalidProject_OutputsSkipped;
+        var options = state.options, host = state.host;
+        var filesToDelete = options.dry ? [] : undefined;
+        for (var _i = 0, buildOrder_1 = buildOrder; _i < buildOrder_1.length; _i++) {
+            var proj = buildOrder_1[_i];
+            var resolvedPath = toResolvedConfigFilePath(state, proj);
+            var parsed = parseConfigFile(state, proj, resolvedPath);
+            if (parsed === undefined) {
+                reportParseConfigFileDiagnostic(state, resolvedPath);
+                continue;
+            }
+            var outputs = ts.getAllProjectOutputs(parsed, !host.useCaseSensitiveFileNames());
+            for (var _a = 0, outputs_3 = outputs; _a < outputs_3.length; _a++) {
+                var output = outputs_3[_a];
+                if (host.fileExists(output)) {
+                    if (filesToDelete) {
+                        filesToDelete.push(output);
+                    }
+                    else {
+                        host.deleteFile(output);
+                        invalidateProject(state, resolvedPath, ts.ConfigFileProgramReloadLevel.None);
+                    }
+                }
+            }
+        }
+        if (filesToDelete) {
+            reportStatus(state, ts.Diagnostics.A_non_dry_build_would_delete_the_following_files_Colon_0, filesToDelete.map(function (f) { return "\r\n * " + f; }).join(""));
+        }
+        return ts.ExitStatus.Success;
+    }
+    function invalidateProject(state, resolved, reloadLevel) {
+        if (state.host.getParsedCommandLine && reloadLevel === ts.ConfigFileProgramReloadLevel.Partial) {
+            reloadLevel = ts.ConfigFileProgramReloadLevel.Full;
+        }
+        if (reloadLevel === ts.ConfigFileProgramReloadLevel.Full) {
+            state.configFileCache.delete(resolved);
+            state.buildOrder = undefined;
+        }
+        state.needsSummary = true;
+        clearProjectStatus(state, resolved);
+        addProjToQueue(state, resolved, reloadLevel);
+        enableCache(state);
+    }
+    function invalidateProjectAndScheduleBuilds(state, resolvedPath, reloadLevel) {
+        state.reportFileChangeDetected = true;
+        invalidateProject(state, resolvedPath, reloadLevel);
+        scheduleBuildInvalidatedProject(state);
+    }
+    function scheduleBuildInvalidatedProject(state) {
+        var hostWithWatch = state.hostWithWatch;
+        if (!hostWithWatch.setTimeout || !hostWithWatch.clearTimeout) {
+            return;
+        }
+        if (state.timerToBuildInvalidatedProject) {
+            hostWithWatch.clearTimeout(state.timerToBuildInvalidatedProject);
+        }
+        state.timerToBuildInvalidatedProject = hostWithWatch.setTimeout(buildNextInvalidatedProject, 250, state);
+    }
+    function buildNextInvalidatedProject(state) {
+        state.timerToBuildInvalidatedProject = undefined;
+        if (state.reportFileChangeDetected) {
+            state.reportFileChangeDetected = false;
+            state.projectErrorsReported.clear();
+            reportWatchStatus(state, ts.Diagnostics.File_change_detected_Starting_incremental_compilation);
+        }
+        var buildOrder = getBuildOrder(state);
+        var invalidatedProject = getNextInvalidatedProject(state, buildOrder, false);
+        if (invalidatedProject) {
+            invalidatedProject.done();
+            if (state.projectPendingBuild.size) {
+                if (state.watch && !state.timerToBuildInvalidatedProject) {
+                    scheduleBuildInvalidatedProject(state);
+                }
+                return;
+            }
+        }
+        disableCache(state);
+        reportErrorSummary(state, buildOrder);
+    }
+    function watchConfigFile(state, resolved, resolvedPath) {
+        if (!state.watch || state.allWatchedConfigFiles.has(resolvedPath))
+            return;
+        state.allWatchedConfigFiles.set(resolvedPath, state.watchFile(state.hostWithWatch, resolved, function () {
+            invalidateProjectAndScheduleBuilds(state, resolvedPath, ts.ConfigFileProgramReloadLevel.Full);
+        }, ts.PollingInterval.High, "Config file", resolved));
+    }
+    function isSameFile(state, file1, file2) {
+        return ts.comparePaths(file1, file2, state.currentDirectory, !state.host.useCaseSensitiveFileNames()) === 0;
+    }
+    function isOutputFile(state, fileName, configFile) {
+        if (configFile.options.noEmit)
+            return false;
+        if (!ts.fileExtensionIs(fileName, ".d.ts") &&
+            (ts.fileExtensionIs(fileName, ".ts") || ts.fileExtensionIs(fileName, ".tsx"))) {
+            return false;
+        }
+        var out = configFile.options.outFile || configFile.options.out;
+        if (out && (isSameFile(state, fileName, out) || isSameFile(state, fileName, ts.removeFileExtension(out) + ".d.ts"))) {
+            return true;
+        }
+        if (configFile.options.declarationDir && ts.containsPath(configFile.options.declarationDir, fileName, state.currentDirectory, !state.host.useCaseSensitiveFileNames())) {
+            return true;
+        }
+        if (configFile.options.outDir && ts.containsPath(configFile.options.outDir, fileName, state.currentDirectory, !state.host.useCaseSensitiveFileNames())) {
+            return true;
+        }
+        return !ts.forEach(configFile.fileNames, function (inputFile) { return isSameFile(state, fileName, inputFile); });
+    }
+    function watchWildCardDirectories(state, resolved, resolvedPath, parsed) {
+        if (!state.watch)
+            return;
+        ts.updateWatchingWildcardDirectories(getOrCreateValueMapFromConfigFileMap(state.allWatchedWildcardDirectories, resolvedPath), ts.createMapFromTemplate(parsed.configFileSpecs.wildcardDirectories), function (dir, flags) { return state.watchDirectory(state.hostWithWatch, dir, function (fileOrDirectory) {
+            var fileOrDirectoryPath = toPath(state, fileOrDirectory);
+            if (fileOrDirectoryPath !== toPath(state, dir) && ts.hasExtension(fileOrDirectoryPath) && !ts.isSupportedSourceFileName(fileOrDirectory, parsed.options)) {
+                state.writeLog("Project: " + resolved + " Detected file add/remove of non supported extension: " + fileOrDirectory);
+                return;
+            }
+            if (isOutputFile(state, fileOrDirectory, parsed)) {
+                state.writeLog(fileOrDirectory + " is output file");
+                return;
+            }
+            invalidateProjectAndScheduleBuilds(state, resolvedPath, ts.ConfigFileProgramReloadLevel.Partial);
+        }, flags, "Wild card directory", resolved); });
+    }
+    function watchInputFiles(state, resolved, resolvedPath, parsed) {
+        if (!state.watch)
+            return;
+        ts.mutateMap(getOrCreateValueMapFromConfigFileMap(state.allWatchedInputFiles, resolvedPath), ts.arrayToMap(parsed.fileNames, function (fileName) { return toPath(state, fileName); }), {
+            createNewValue: function (path, input) { return state.watchFilePath(state.hostWithWatch, input, function () { return invalidateProjectAndScheduleBuilds(state, resolvedPath, ts.ConfigFileProgramReloadLevel.None); }, ts.PollingInterval.Low, path, "Source file", resolved); },
+            onDeleteValue: ts.closeFileWatcher,
+        });
+    }
+    function startWatching(state, buildOrder) {
+        if (!state.watchAllProjectsPending)
+            return;
+        state.watchAllProjectsPending = false;
+        for (var _i = 0, buildOrder_2 = buildOrder; _i < buildOrder_2.length; _i++) {
+            var resolved = buildOrder_2[_i];
+            var resolvedPath = toResolvedConfigFilePath(state, resolved);
+            watchConfigFile(state, resolved, resolvedPath);
+            var cfg = parseConfigFile(state, resolved, resolvedPath);
+            if (cfg) {
+                watchWildCardDirectories(state, resolved, resolvedPath, cfg);
+                watchInputFiles(state, resolved, resolvedPath, cfg);
+            }
+        }
+    }
+    function createSolutionBuilderWorker(watch, hostOrHostWithWatch, rootNames, options) {
+        var state = createSolutionBuilderState(watch, hostOrHostWithWatch, rootNames, options);
+        return {
+            build: function (project, cancellationToken) { return build(state, project, cancellationToken); },
+            clean: function (project) { return clean(state, project); },
+            buildReferences: function (project, cancellationToken) { return build(state, project, cancellationToken, true); },
+            cleanReferences: function (project) { return clean(state, project, true); },
+            getNextInvalidatedProject: function (cancellationToken) {
+                setupInitialBuild(state, cancellationToken);
+                return getNextInvalidatedProject(state, getBuildOrder(state), false);
+            },
+            getBuildOrder: function () { return getBuildOrder(state); },
+            getUpToDateStatusOfProject: function (project) {
+                var configFileName = resolveProjectName(state, project);
+                var configFilePath = toResolvedConfigFilePath(state, configFileName);
+                return getUpToDateStatus(state, parseConfigFile(state, configFileName, configFilePath), configFilePath);
+            },
+            invalidateProject: function (configFilePath, reloadLevel) { return invalidateProject(state, configFilePath, reloadLevel || ts.ConfigFileProgramReloadLevel.None); },
+            buildNextInvalidatedProject: function () { return buildNextInvalidatedProject(state); },
+        };
+    }
+    function relName(state, path) {
+        return ts.convertToRelativePath(path, state.currentDirectory, function (f) { return state.getCanonicalFileName(f); });
+    }
+    function reportStatus(state, message) {
+        var args = [];
+        for (var _i = 2; _i < arguments.length; _i++) {
+            args[_i - 2] = arguments[_i];
+        }
+        state.host.reportSolutionBuilderStatus(ts.createCompilerDiagnostic.apply(void 0, [message].concat(args)));
+    }
+    function reportWatchStatus(state, message) {
+        var args = [];
+        for (var _i = 2; _i < arguments.length; _i++) {
+            args[_i - 2] = arguments[_i];
+        }
+        if (state.hostWithWatch.onWatchStatusChange) {
+            state.hostWithWatch.onWatchStatusChange(ts.createCompilerDiagnostic.apply(void 0, [message].concat(args)), state.host.getNewLine(), state.baseCompilerOptions);
+        }
+    }
+    function reportErrors(_a, errors) {
+        var host = _a.host;
+        errors.forEach(function (err) { return host.reportDiagnostic(err); });
+    }
+    function reportAndStoreErrors(state, proj, errors) {
+        reportErrors(state, errors);
+        state.projectErrorsReported.set(proj, true);
+        if (errors.length) {
+            state.diagnostics.set(proj, errors);
+        }
+    }
+    function reportParseConfigFileDiagnostic(state, proj) {
+        reportAndStoreErrors(state, proj, [state.configFileCache.get(proj)]);
+    }
+    function reportErrorSummary(state, buildOrder) {
+        if (!state.needsSummary || (!state.watch && !state.host.reportErrorSummary))
+            return;
+        state.needsSummary = false;
+        var diagnostics = state.diagnostics;
+        buildOrder.forEach(function (project) {
+            var projectPath = toResolvedConfigFilePath(state, project);
+            if (!state.projectErrorsReported.has(projectPath)) {
+                reportErrors(state, diagnostics.get(projectPath) || ts.emptyArray);
+            }
+        });
+        var totalErrors = 0;
+        diagnostics.forEach(function (singleProjectErrors) { return totalErrors += ts.getErrorCountForSummary(singleProjectErrors); });
+        if (state.watch) {
+            reportWatchStatus(state, ts.getWatchErrorSummaryDiagnosticMessage(totalErrors), totalErrors);
+        }
+        else {
+            state.host.reportErrorSummary(totalErrors);
+        }
+    }
+    function reportBuildQueue(state, buildQueue) {
+        if (state.options.verbose) {
+            reportStatus(state, ts.Diagnostics.Projects_in_this_build_Colon_0, buildQueue.map(function (s) { return "\r\n    * " + relName(state, s); }).join(""));
+        }
+    }
+    function reportUpToDateStatus(state, configFileName, status) {
         switch (status.type) {
-            case UpToDateStatusType.OutOfDateWithSelf:
-                return formatMessage(ts.Diagnostics.Project_0_is_out_of_date_because_oldest_output_1_is_older_than_newest_input_2, relName(configFileName), relName(status.outOfDateOutputFileName), relName(status.newerInputFileName));
-            case UpToDateStatusType.OutOfDateWithUpstream:
-                return formatMessage(ts.Diagnostics.Project_0_is_out_of_date_because_oldest_output_1_is_older_than_newest_input_2, relName(configFileName), relName(status.outOfDateOutputFileName), relName(status.newerProjectName));
-            case UpToDateStatusType.OutputMissing:
-                return formatMessage(ts.Diagnostics.Project_0_is_out_of_date_because_output_file_1_does_not_exist, relName(configFileName), relName(status.missingOutputFileName));
-            case UpToDateStatusType.UpToDate:
+            case ts.UpToDateStatusType.OutOfDateWithSelf:
+                return reportStatus(state, ts.Diagnostics.Project_0_is_out_of_date_because_oldest_output_1_is_older_than_newest_input_2, relName(state, configFileName), relName(state, status.outOfDateOutputFileName), relName(state, status.newerInputFileName));
+            case ts.UpToDateStatusType.OutOfDateWithUpstream:
+                return reportStatus(state, ts.Diagnostics.Project_0_is_out_of_date_because_oldest_output_1_is_older_than_newest_input_2, relName(state, configFileName), relName(state, status.outOfDateOutputFileName), relName(state, status.newerProjectName));
+            case ts.UpToDateStatusType.OutputMissing:
+                return reportStatus(state, ts.Diagnostics.Project_0_is_out_of_date_because_output_file_1_does_not_exist, relName(state, configFileName), relName(state, status.missingOutputFileName));
+            case ts.UpToDateStatusType.UpToDate:
                 if (status.newestInputFileTime !== undefined) {
-                    return formatMessage(ts.Diagnostics.Project_0_is_up_to_date_because_newest_input_1_is_older_than_oldest_output_2, relName(configFileName), relName(status.newestInputFileName || ""), relName(status.oldestOutputFileName || ""));
+                    return reportStatus(state, ts.Diagnostics.Project_0_is_up_to_date_because_newest_input_1_is_older_than_oldest_output_2, relName(state, configFileName), relName(state, status.newestInputFileName || ""), relName(state, status.oldestOutputFileName || ""));
                 }
                 break;
-            case UpToDateStatusType.OutOfDateWithPrepend:
-                return formatMessage(ts.Diagnostics.Project_0_is_out_of_date_because_output_of_its_dependency_1_has_changed, relName(configFileName), relName(status.newerProjectName));
-            case UpToDateStatusType.UpToDateWithUpstreamTypes:
-                return formatMessage(ts.Diagnostics.Project_0_is_up_to_date_with_d_ts_files_from_its_dependencies, relName(configFileName));
-            case UpToDateStatusType.UpstreamOutOfDate:
-                return formatMessage(ts.Diagnostics.Project_0_is_out_of_date_because_its_dependency_1_is_out_of_date, relName(configFileName), relName(status.upstreamProjectName));
-            case UpToDateStatusType.UpstreamBlocked:
-                return formatMessage(ts.Diagnostics.Project_0_can_t_be_built_because_its_dependency_1_has_errors, relName(configFileName), relName(status.upstreamProjectName));
-            case UpToDateStatusType.Unbuildable:
-                return formatMessage(ts.Diagnostics.Failed_to_parse_file_0_Colon_1, relName(configFileName), status.reason);
-            case UpToDateStatusType.TsVersionOutputOfDate:
-                return formatMessage(ts.Diagnostics.Project_0_is_out_of_date_because_output_for_it_was_generated_with_version_1_that_differs_with_current_version_2, relName(configFileName), status.version, ts.version);
-            case UpToDateStatusType.ContainerOnly:
-            case UpToDateStatusType.ComputingUpstream:
+            case ts.UpToDateStatusType.OutOfDateWithPrepend:
+                return reportStatus(state, ts.Diagnostics.Project_0_is_out_of_date_because_output_of_its_dependency_1_has_changed, relName(state, configFileName), relName(state, status.newerProjectName));
+            case ts.UpToDateStatusType.UpToDateWithUpstreamTypes:
+                return reportStatus(state, ts.Diagnostics.Project_0_is_up_to_date_with_d_ts_files_from_its_dependencies, relName(state, configFileName));
+            case ts.UpToDateStatusType.UpstreamOutOfDate:
+                return reportStatus(state, ts.Diagnostics.Project_0_is_out_of_date_because_its_dependency_1_is_out_of_date, relName(state, configFileName), relName(state, status.upstreamProjectName));
+            case ts.UpToDateStatusType.UpstreamBlocked:
+                return reportStatus(state, ts.Diagnostics.Project_0_can_t_be_built_because_its_dependency_1_has_errors, relName(state, configFileName), relName(state, status.upstreamProjectName));
+            case ts.UpToDateStatusType.Unbuildable:
+                return reportStatus(state, ts.Diagnostics.Failed_to_parse_file_0_Colon_1, relName(state, configFileName), status.reason);
+            case ts.UpToDateStatusType.TsVersionOutputOfDate:
+                return reportStatus(state, ts.Diagnostics.Project_0_is_out_of_date_because_output_for_it_was_generated_with_version_1_that_differs_with_current_version_2, relName(state, configFileName), status.version, ts.version);
+            case ts.UpToDateStatusType.ContainerOnly:
+            case ts.UpToDateStatusType.ComputingUpstream:
                 break;
             default:
                 ts.assertType(status);
         }
     }
-    ts.formatUpToDateStatus = formatUpToDateStatus;
-})(ts || (ts = {}));
-var ts;
-(function (ts) {
-    function inspectModule(fileNameToRequire) {
-        return inspectValue(ts.removeFileExtension(ts.getBaseFileName(fileNameToRequire)), tryRequire(fileNameToRequire));
-    }
-    ts.inspectModule = inspectModule;
-    function inspectValue(name, value) {
-        return getValueInfo(name, value, getRecurser());
-    }
-    ts.inspectValue = inspectValue;
-    function getRecurser() {
-        var seen = [];
-        var nameStack = [];
-        return function (obj, name, cbOk, cbFail) {
-            if (seen.indexOf(obj) !== -1 || nameStack.length > 4) {
-                return cbFail(seen.indexOf(obj) !== -1, nameStack);
-            }
-            seen.push(obj);
-            nameStack.push(name);
-            var res = cbOk();
-            nameStack.pop();
-            seen.pop();
-            return res;
-        };
-    }
-    function getValueInfo(name, value, recurser) {
-        return recurser(value, name, function () {
-            if (typeof value === "function")
-                return getFunctionOrClassInfo(value, name, recurser);
-            if (typeof value === "object") {
-                var builtin = getBuiltinType(name, value, recurser);
-                if (builtin !== undefined)
-                    return builtin;
-                var entries = getEntriesOfObject(value);
-                var hasNontrivialPrototype = Object.getPrototypeOf(value) !== Object.prototype;
-                var members = ts.flatMap(entries, function (_a) {
-                    var key = _a.key, value = _a.value;
-                    return getValueInfo(key, value, recurser);
-                });
-                return { kind: 3, name: name, hasNontrivialPrototype: hasNontrivialPrototype, members: members };
-            }
-            return { kind: 0, name: name, typeName: isNullOrUndefined(value) ? "any" : typeof value };
-        }, function (isCircularReference, keyStack) { return anyValue(name, " " + (isCircularReference ? "Circular reference" : "Too-deep object hierarchy") + " from " + keyStack.join(".")); });
-    }
-    function getFunctionOrClassInfo(fn, name, recurser) {
-        var prototypeMembers = getPrototypeMembers(fn, recurser);
-        var namespaceMembers = ts.flatMap(getEntriesOfObject(fn), function (_a) {
-            var key = _a.key, value = _a.value;
-            return getValueInfo(key, value, recurser);
-        });
-        var toString = ts.cast(Function.prototype.toString.call(fn), ts.isString);
-        var source = ts.stringContains(toString, "{ [native code] }") ? getFunctionLength(fn) : toString;
-        return { kind: 2, name: name, source: source, namespaceMembers: namespaceMembers, prototypeMembers: prototypeMembers };
-    }
-    var builtins = ts.memoize(function () {
-        var map = ts.createMap();
-        for (var _i = 0, _a = getEntriesOfObject(global); _i < _a.length; _i++) {
-            var _b = _a[_i], key = _b.key, value = _b.value;
-            if (typeof value === "function" && typeof value.prototype === "object" && value !== Object) {
-                map.set(key, value);
-            }
-        }
-        return map;
-    });
-    function getBuiltinType(name, value, recurser) {
-        return ts.isArray(value)
-            ? { name: name, kind: 1, inner: value.length && getValueInfo("element", ts.first(value), recurser) || anyValue(name) }
-            : ts.forEachEntry(builtins(), function (builtin, builtinName) {
-                return value instanceof builtin ? { kind: 0, name: name, typeName: builtinName } : undefined;
-            });
-    }
-    function getPrototypeMembers(fn, recurser) {
-        var prototype = fn.prototype;
-        return typeof prototype !== "object" || prototype === null ? ts.emptyArray : ts.mapDefined(getEntriesOfObject(prototype), function (_a) {
-            var key = _a.key, value = _a.value;
-            return key === "constructor" ? undefined : getValueInfo(key, value, recurser);
-        });
-    }
-    var ignoredProperties = ["arguments", "caller", "constructor", "eval", "super_"];
-    var reservedFunctionProperties = Object.getOwnPropertyNames(ts.noop);
-    function getEntriesOfObject(obj) {
-        var seen = ts.createMap();
-        var entries = [];
-        var chain = obj;
-        while (!isNullOrUndefined(chain) && chain !== Object.prototype && chain !== Function.prototype) {
-            for (var _i = 0, _a = Object.getOwnPropertyNames(chain); _i < _a.length; _i++) {
-                var key = _a[_i];
-                if (!isJsPrivate(key) &&
-                    ignoredProperties.indexOf(key) === -1 &&
-                    (typeof obj !== "function" || reservedFunctionProperties.indexOf(key) === -1) &&
-                    ts.addToSeen(seen, key)) {
-                    var value = safeGetPropertyOfObject(chain, key);
-                    if (!(key === "toString" && typeof value === "function" && value.length === 0)) {
-                        entries.push({ key: key, value: value });
-                    }
-                }
-            }
-            chain = Object.getPrototypeOf(chain);
-        }
-        return entries.sort(function (e1, e2) { return ts.compareStringsCaseSensitive(e1.key, e2.key); });
-    }
-    function getFunctionLength(fn) {
-        return ts.tryCast(safeGetPropertyOfObject(fn, "length"), ts.isNumber) || 0;
-    }
-    function safeGetPropertyOfObject(obj, key) {
-        var desc = Object.getOwnPropertyDescriptor(obj, key);
-        return desc && desc.value;
-    }
-    function isNullOrUndefined(value) {
-        return value == null;
-    }
-    function anyValue(name, comment) {
-        return { kind: 0, name: name, typeName: "any", comment: comment };
-    }
-    function isJsPrivate(name) {
-        return ts.startsWith(name, "_");
-    }
-    ts.isJsPrivate = isJsPrivate;
-    function tryRequire(fileNameToRequire) {
-        try {
-            return require(fileNameToRequire);
-        }
-        catch (_a) {
-            return undefined;
+    function verboseReportProjectStatus(state, configFileName, status) {
+        if (state.options.verbose) {
+            reportUpToDateStatus(state, configFileName, status);
         }
     }
 })(ts || (ts = {}));
@@ -77915,6 +80465,9 @@ var ts;
                 reportWatchModeWithoutSysSupport();
                 createWatchOfFilesAndCompilerOptions(commandLine.fileNames, commandLineOptions);
             }
+            else if (ts.isIncrementalCompilation(commandLineOptions)) {
+                performIncrementalCompilation(commandLine);
+            }
             else {
                 performCompilation(commandLine.fileNames, /*references*/ undefined, commandLineOptions);
             }
@@ -77929,6 +80482,11 @@ var ts;
     }
     function performBuild(args) {
         var _a = ts.parseBuildCommand(args), buildOptions = _a.buildOptions, projects = _a.projects, errors = _a.errors;
+        // Update to pretty if host supports it
+        updateReportDiagnostic(buildOptions);
+        if (buildOptions.locale) {
+            ts.validateLocaleAndSetLanguage(buildOptions.locale, ts.sys, errors);
+        }
         if (errors.length > 0) {
             errors.forEach(reportDiagnostic);
             return ts.sys.exit(ts.ExitStatus.DiagnosticsPresent_OutputsSkipped);
@@ -77938,8 +80496,6 @@ var ts;
             ts.printHelp(ts.buildOpts, "--build ");
             return ts.sys.exit(ts.ExitStatus.Success);
         }
-        // Update to pretty if host supports it
-        updateReportDiagnostic();
         if (projects.length === 0) {
             ts.printVersion();
             ts.printHelp(ts.buildOpts, "--build ");
@@ -77951,21 +80507,18 @@ var ts;
         }
         if (buildOptions.watch) {
             reportWatchModeWithoutSysSupport();
+            var buildHost_1 = ts.createSolutionBuilderWithWatchHost(ts.sys, /*createProgram*/ undefined, reportDiagnostic, ts.createBuilderStatusReporter(ts.sys, shouldBePretty(buildOptions)), createWatchStatusReporter(buildOptions));
+            updateCreateProgram(buildHost_1);
+            buildHost_1.afterProgramEmitAndDiagnostics = function (program) { return reportStatistics(program.getProgram()); };
+            var builder_1 = ts.createSolutionBuilderWithWatch(buildHost_1, projects, buildOptions);
+            builder_1.build();
+            return;
         }
-        var buildHost = buildOptions.watch ?
-            ts.createSolutionBuilderWithWatchHost(ts.sys, ts.createEmitAndSemanticDiagnosticsBuilderProgram, reportDiagnostic, ts.createBuilderStatusReporter(ts.sys, shouldBePretty()), createWatchStatusReporter()) :
-            ts.createSolutionBuilderHost(ts.sys, ts.createAbstractBuilder, reportDiagnostic, ts.createBuilderStatusReporter(ts.sys, shouldBePretty()), createReportErrorSummary(buildOptions));
+        var buildHost = ts.createSolutionBuilderHost(ts.sys, /*createProgram*/ undefined, reportDiagnostic, ts.createBuilderStatusReporter(ts.sys, shouldBePretty(buildOptions)), createReportErrorSummary(buildOptions));
         updateCreateProgram(buildHost);
         buildHost.afterProgramEmitAndDiagnostics = function (program) { return reportStatistics(program.getProgram()); };
         var builder = ts.createSolutionBuilder(buildHost, projects, buildOptions);
-        if (buildOptions.clean) {
-            return ts.sys.exit(builder.cleanAllProjects());
-        }
-        if (buildOptions.watch) {
-            builder.buildAllProjects();
-            return builder.startWatching();
-        }
-        return ts.sys.exit(builder.buildAllProjects());
+        return ts.sys.exit(buildOptions.clean ? builder.clean() : builder.build());
     }
     function createReportErrorSummary(options) {
         return shouldBePretty(options) ?
@@ -77986,35 +80539,22 @@ var ts;
             configFileParsingDiagnostics: configFileParsingDiagnostics
         };
         var program = ts.createProgram(programOptions);
-        var exitStatus = ts.emitFilesAndReportErrors(program, reportDiagnostic, function (s) { return ts.sys.write(s + ts.sys.newLine); }, createReportErrorSummary(options));
+        var exitStatus = ts.emitFilesAndReportErrorsAndGetExitStatus(program, reportDiagnostic, function (s) { return ts.sys.write(s + ts.sys.newLine); }, createReportErrorSummary(options));
         reportStatistics(program);
         return ts.sys.exit(exitStatus);
     }
     function performIncrementalCompilation(config) {
         var options = config.options, fileNames = config.fileNames, projectReferences = config.projectReferences;
-        var host = ts.createCompilerHost(options);
-        var currentDirectory = host.getCurrentDirectory();
-        var getCanonicalFileName = ts.createGetCanonicalFileName(host.useCaseSensitiveFileNames());
-        ts.changeCompilerHostLikeToUseCache(host, function (fileName) { return ts.toPath(fileName, currentDirectory, getCanonicalFileName); });
         enableStatistics(options);
-        var oldProgram = ts.readBuilderProgram(options, function (path) { return host.readFile(path); });
-        var configFileParsingDiagnostics = ts.getConfigFileParsingDiagnostics(config);
-        var programOptions = {
+        return ts.sys.exit(ts.performIncrementalCompilation({
             rootNames: fileNames,
             options: options,
-            projectReferences: projectReferences,
-            host: host,
             configFileParsingDiagnostics: ts.getConfigFileParsingDiagnostics(config),
-        };
-        var program = ts.createProgram(programOptions);
-        var builderProgram = ts.createEmitAndSemanticDiagnosticsBuilderProgram(program, {
-            useCaseSensitiveFileNames: function () { return ts.sys.useCaseSensitiveFileNames; },
-            createHash: ts.maybeBind(ts.sys, ts.sys.createHash),
-            writeFile: function (path, data, writeByteOrderMark) { return ts.sys.writeFile(path, data, writeByteOrderMark); }
-        }, oldProgram, configFileParsingDiagnostics);
-        var exitStatus = ts.emitFilesAndReportErrors(builderProgram, reportDiagnostic, function (s) { return ts.sys.write(s + ts.sys.newLine); }, createReportErrorSummary(options));
-        reportStatistics(program);
-        return ts.sys.exit(exitStatus);
+            projectReferences: projectReferences,
+            reportDiagnostic: reportDiagnostic,
+            reportErrorSummary: createReportErrorSummary(options),
+            afterProgramEmitAndDiagnostics: function (builderProgram) { return reportStatistics(builderProgram.getProgram()); }
+        }));
     }
     function updateCreateProgram(host) {
         var compileUsingBuilder = host.createProgram;
@@ -78073,6 +80613,10 @@ var ts;
             var checkTime = ts.performance.getDuration("Check");
             var emitTime = ts.performance.getDuration("Emit");
             if (compilerOptions.extendedDiagnostics) {
+                var caches = program.getRelationCacheSizes();
+                reportCountStatistic("Assignability cache size", caches.assignable);
+                reportCountStatistic("Identity cache size", caches.identity);
+                reportCountStatistic("Subtype cache size", caches.subtype);
                 ts.performance.forEachMeasure(function (name, duration) { return reportTimeStatistic(name + " time", duration); });
             }
             else {
diff --git a/lib/tsserver.js b/lib/tsserver.js
index 503e7fee6ea..a7782a87174 100644
--- a/lib/tsserver.js
+++ b/lib/tsserver.js
@@ -83,7 +83,7 @@ var ts;
 (function (ts) {
     // WARNING: The script `configureNightly.ts` uses a regexp to parse out these values.
     // If changing the text in this section, be sure to test `configureNightly` too.
-    ts.versionMajorMinor = "3.4";
+    ts.versionMajorMinor = "3.6";
     /** The version of the TypeScript compiler release */
     ts.version = ts.versionMajorMinor + ".0-dev";
 })(ts || (ts = {}));
@@ -215,7 +215,7 @@ var ts;
                         entry.nextEntry.previousEntry = previousEntry;
                     }
                     // When the deleted entry was the last one, we need to
-                    // adust the lastEntry reference.
+                    // adjust the lastEntry reference.
                     if (this.lastEntry === entry) {
                         this.lastEntry = previousEntry;
                     }
@@ -264,11 +264,12 @@ var ts;
             class_1.prototype.forEach = function (action) {
                 var iterator = this.entries();
                 while (true) {
-                    var _a = iterator.next(), entry = _a.value, done = _a.done;
-                    if (done) {
+                    var iterResult = iterator.next();
+                    if (iterResult.done) {
                         break;
                     }
-                    action(entry[1], entry[0]);
+                    var _a = iterResult.value, key = _a[0], value = _a[1];
+                    action(value, key);
                 }
             };
             return class_1;
@@ -312,11 +313,11 @@ var ts;
     ts.firstDefined = firstDefined;
     function firstDefinedIterator(iter, callback) {
         while (true) {
-            var _a = iter.next(), value = _a.value, done = _a.done;
-            if (done) {
+            var iterResult = iter.next();
+            if (iterResult.done) {
                 return undefined;
             }
-            var result = callback(value);
+            var result = callback(iterResult.value);
             if (result !== undefined) {
                 return result;
             }
@@ -325,7 +326,7 @@ var ts;
     ts.firstDefinedIterator = firstDefinedIterator;
     function zipWith(arrayA, arrayB, callback) {
         var result = [];
-        Debug.assertEqual(arrayA.length, arrayB.length);
+        ts.Debug.assertEqual(arrayA.length, arrayB.length);
         for (var i = 0; i < arrayA.length; i++) {
             result.push(callback(arrayA[i], arrayB[i], i));
         }
@@ -333,7 +334,7 @@ var ts;
     }
     ts.zipWith = zipWith;
     function zipToIterator(arrayA, arrayB) {
-        Debug.assertEqual(arrayA.length, arrayB.length);
+        ts.Debug.assertEqual(arrayA.length, arrayB.length);
         var i = 0;
         return {
             next: function () {
@@ -347,7 +348,7 @@ var ts;
     }
     ts.zipToIterator = zipToIterator;
     function zipToMap(keys, values) {
-        Debug.assert(keys.length === values.length);
+        ts.Debug.assert(keys.length === values.length);
         var map = createMap();
         for (var i = 0; i < keys.length; ++i) {
             map.set(keys[i], values[i]);
@@ -421,7 +422,7 @@ var ts;
                 return result;
             }
         }
-        return Debug.fail();
+        return ts.Debug.fail();
     }
     ts.findMap = findMap;
     function contains(array, value, equalityComparer) {
@@ -539,19 +540,21 @@ var ts;
         return array;
     }
     ts.sameMap = sameMap;
+    /**
+     * Flattens an array containing a mix of array or non-array elements.
+     *
+     * @param array The array to flatten.
+     */
     function flatten(array) {
-        var result;
-        if (array) {
-            result = [];
-            for (var _i = 0, array_2 = array; _i < array_2.length; _i++) {
-                var v = array_2[_i];
-                if (v) {
-                    if (isArray(v)) {
-                        addRange(result, v);
-                    }
-                    else {
-                        result.push(v);
-                    }
+        var result = [];
+        for (var _i = 0, array_2 = array; _i < array_2.length; _i++) {
+            var v = array_2[_i];
+            if (v) {
+                if (isArray(v)) {
+                    addRange(result, v);
+                }
+                else {
+                    result.push(v);
                 }
             }
         }
@@ -851,7 +854,7 @@ var ts;
                     continue;
                 case -1 /* LessThan */:
                     // If `array` is sorted, `next` should **never** be less than `last`.
-                    return Debug.fail("Array is unsorted.");
+                    return ts.Debug.fail("Array is unsorted.");
             }
             deduplicated.push(last = next);
         }
@@ -918,13 +921,13 @@ var ts;
         loopB: for (var offsetA = 0, offsetB = 0; offsetB < arrayB.length; offsetB++) {
             if (offsetB > 0) {
                 // Ensure `arrayB` is properly sorted.
-                Debug.assertGreaterThanOrEqual(comparer(arrayB[offsetB], arrayB[offsetB - 1]), 0 /* EqualTo */);
+                ts.Debug.assertGreaterThanOrEqual(comparer(arrayB[offsetB], arrayB[offsetB - 1]), 0 /* EqualTo */);
             }
             loopA: for (var startA = offsetA; offsetA < arrayA.length; offsetA++) {
                 if (offsetA > startA) {
                     // Ensure `arrayA` is properly sorted. We only need to perform this check if
                     // `offsetA` has changed since we entered the loop.
-                    Debug.assertGreaterThanOrEqual(comparer(arrayA[offsetA], arrayA[offsetA - 1]), 0 /* EqualTo */);
+                    ts.Debug.assertGreaterThanOrEqual(comparer(arrayA[offsetA], arrayA[offsetA - 1]), 0 /* EqualTo */);
                 }
                 switch (comparer(arrayB[offsetB], arrayA[offsetA])) {
                     case -1 /* LessThan */:
@@ -1094,7 +1097,7 @@ var ts;
     }
     ts.firstOrUndefined = firstOrUndefined;
     function first(array) {
-        Debug.assert(array.length !== 0);
+        ts.Debug.assert(array.length !== 0);
         return array[0];
     }
     ts.first = first;
@@ -1106,7 +1109,7 @@ var ts;
     }
     ts.lastOrUndefined = lastOrUndefined;
     function last(array) {
-        Debug.assert(array.length !== 0);
+        ts.Debug.assert(array.length !== 0);
         return array[array.length - 1];
     }
     ts.last = last;
@@ -1248,10 +1251,9 @@ var ts;
     }
     ts.getOwnValues = getOwnValues;
     function arrayFrom(iterator, map) {
-        var _a;
         var result = [];
-        for (var _b = iterator.next(), value = _b.value, done = _b.done; !done; _a = iterator.next(), value = _a.value, done = _a.done, _a) {
-            result.push(map ? map(value) : value);
+        for (var iterResult = iterator.next(); !iterResult.done; iterResult = iterator.next()) {
+            result.push(map ? map(iterResult.value) : iterResult.value);
         }
         return result;
     }
@@ -1431,7 +1433,7 @@ var ts;
     function cast(value, test) {
         if (value !== undefined && test(value))
             return value;
-        return Debug.fail("Invalid cast. The supplied value " + value + " did not pass the test '" + Debug.getFunctionName(test) + "'.");
+        return ts.Debug.fail("Invalid cast. The supplied value " + value + " did not pass the test '" + ts.Debug.getFunctionName(test) + "'.");
     }
     ts.cast = cast;
     /** Does nothing. */
@@ -1443,6 +1445,9 @@ var ts;
     /** Do nothing and return true */
     function returnTrue() { return true; }
     ts.returnTrue = returnTrue;
+    /** Do nothing and return undefined */
+    function returnUndefined() { return undefined; }
+    ts.returnUndefined = returnUndefined;
     /** Returns its argument. */
     function identity(x) { return x; }
     ts.identity = identity;
@@ -1465,38 +1470,13 @@ var ts;
         };
     }
     ts.memoize = memoize;
-    function chain(a, b, c, d, e) {
+    function compose(a, b, c, d, e) {
         if (e) {
             var args_2 = [];
             for (var i = 0; i < arguments.length; i++) {
                 args_2[i] = arguments[i];
             }
-            return function (t) { return compose.apply(void 0, map(args_2, function (f) { return f(t); })); };
-        }
-        else if (d) {
-            return function (t) { return compose(a(t), b(t), c(t), d(t)); };
-        }
-        else if (c) {
-            return function (t) { return compose(a(t), b(t), c(t)); };
-        }
-        else if (b) {
-            return function (t) { return compose(a(t), b(t)); };
-        }
-        else if (a) {
-            return function (t) { return compose(a(t)); };
-        }
-        else {
-            return function (_) { return function (u) { return u; }; };
-        }
-    }
-    ts.chain = chain;
-    function compose(a, b, c, d, e) {
-        if (e) {
-            var args_3 = [];
-            for (var i = 0; i < arguments.length; i++) {
-                args_3[i] = arguments[i];
-            }
-            return function (t) { return reduceLeft(args_3, function (u, f) { return f(u); }, t); };
+            return function (t) { return reduceLeft(args_2, function (u, f) { return f(u); }, t); };
         }
         else if (d) {
             return function (t) { return d(c(b(a(t)))); };
@@ -1522,92 +1502,6 @@ var ts;
         AssertionLevel[AssertionLevel["Aggressive"] = 2] = "Aggressive";
         AssertionLevel[AssertionLevel["VeryAggressive"] = 3] = "VeryAggressive";
     })(AssertionLevel = ts.AssertionLevel || (ts.AssertionLevel = {}));
-    var Debug;
-    (function (Debug) {
-        Debug.currentAssertionLevel = 0 /* None */;
-        Debug.isDebugging = false;
-        function shouldAssert(level) {
-            return Debug.currentAssertionLevel >= level;
-        }
-        Debug.shouldAssert = shouldAssert;
-        function assert(expression, message, verboseDebugInfo, stackCrawlMark) {
-            if (!expression) {
-                if (verboseDebugInfo) {
-                    message += "\r\nVerbose Debug Information: " + (typeof verboseDebugInfo === "string" ? verboseDebugInfo : verboseDebugInfo());
-                }
-                fail(message ? "False expression: " + message : "False expression.", stackCrawlMark || assert);
-            }
-        }
-        Debug.assert = assert;
-        function assertEqual(a, b, msg, msg2) {
-            if (a !== b) {
-                var message = msg ? msg2 ? msg + " " + msg2 : msg : "";
-                fail("Expected " + a + " === " + b + ". " + message);
-            }
-        }
-        Debug.assertEqual = assertEqual;
-        function assertLessThan(a, b, msg) {
-            if (a >= b) {
-                fail("Expected " + a + " < " + b + ". " + (msg || ""));
-            }
-        }
-        Debug.assertLessThan = assertLessThan;
-        function assertLessThanOrEqual(a, b) {
-            if (a > b) {
-                fail("Expected " + a + " <= " + b);
-            }
-        }
-        Debug.assertLessThanOrEqual = assertLessThanOrEqual;
-        function assertGreaterThanOrEqual(a, b) {
-            if (a < b) {
-                fail("Expected " + a + " >= " + b);
-            }
-        }
-        Debug.assertGreaterThanOrEqual = assertGreaterThanOrEqual;
-        function fail(message, stackCrawlMark) {
-            debugger;
-            var e = new Error(message ? "Debug Failure. " + message : "Debug Failure.");
-            if (Error.captureStackTrace) {
-                Error.captureStackTrace(e, stackCrawlMark || fail);
-            }
-            throw e;
-        }
-        Debug.fail = fail;
-        function assertDefined(value, message) {
-            if (value === undefined || value === null)
-                return fail(message);
-            return value;
-        }
-        Debug.assertDefined = assertDefined;
-        function assertEachDefined(value, message) {
-            for (var _i = 0, value_1 = value; _i < value_1.length; _i++) {
-                var v = value_1[_i];
-                assertDefined(v, message);
-            }
-            return value;
-        }
-        Debug.assertEachDefined = assertEachDefined;
-        function assertNever(member, message, stackCrawlMark) {
-            if (message === void 0) { message = "Illegal value:"; }
-            var detail = typeof member === "object" && "kind" in member && "pos" in member ? "SyntaxKind: " + Debug.showSyntaxKind(member) : JSON.stringify(member);
-            return fail(message + " " + detail, stackCrawlMark || assertNever);
-        }
-        Debug.assertNever = assertNever;
-        function getFunctionName(func) {
-            if (typeof func !== "function") {
-                return "";
-            }
-            else if (func.hasOwnProperty("name")) {
-                return func.name;
-            }
-            else {
-                var text = Function.prototype.toString.call(func);
-                var match = /^function\s+([\w\$]+)\s*\(/.exec(text);
-                return match ? match[1] : "";
-            }
-        }
-        Debug.getFunctionName = getFunctionName;
-    })(Debug = ts.Debug || (ts.Debug = {}));
     function equateValues(a, b) {
         return a === b;
     }
@@ -1864,7 +1758,7 @@ var ts;
                     bestCandidate = candidate;
                 }
                 else {
-                    Debug.assert(distance < bestDistance); // Else `levenshteinWithMax` should return undefined
+                    ts.Debug.assert(distance < bestDistance); // Else `levenshteinWithMax` should return undefined
                     bestDistance = distance;
                     bestCandidate = candidate;
                 }
@@ -2008,7 +1902,7 @@ var ts;
      * E.g.: matchedText(tryParsePattern("foo*baz"), "foobarbaz") === "bar"
      */
     function matchedText(pattern, candidate) {
-        Debug.assert(isPatternMatch(pattern, candidate));
+        ts.Debug.assert(isPatternMatch(pattern, candidate));
         return candidate.substring(pattern.prefix.length, candidate.length - pattern.suffix.length);
     }
     ts.matchedText = matchedText;
@@ -2101,6 +1995,267 @@ var ts;
         return result;
     }
     ts.fill = fill;
+    function cartesianProduct(arrays) {
+        var result = [];
+        cartesianProductWorker(arrays, result, /*outer*/ undefined, 0);
+        return result;
+    }
+    ts.cartesianProduct = cartesianProduct;
+    function cartesianProductWorker(arrays, result, outer, index) {
+        for (var _i = 0, _a = arrays[index]; _i < _a.length; _i++) {
+            var element = _a[_i];
+            var inner = void 0;
+            if (outer) {
+                inner = outer.slice();
+                inner.push(element);
+            }
+            else {
+                inner = [element];
+            }
+            if (index === arrays.length - 1) {
+                result.push(inner);
+            }
+            else {
+                cartesianProductWorker(arrays, result, inner, index + 1);
+            }
+        }
+    }
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var Debug;
+    (function (Debug) {
+        Debug.currentAssertionLevel = 0 /* None */;
+        Debug.isDebugging = false;
+        function shouldAssert(level) {
+            return Debug.currentAssertionLevel >= level;
+        }
+        Debug.shouldAssert = shouldAssert;
+        function assert(expression, message, verboseDebugInfo, stackCrawlMark) {
+            if (!expression) {
+                if (verboseDebugInfo) {
+                    message += "\r\nVerbose Debug Information: " + (typeof verboseDebugInfo === "string" ? verboseDebugInfo : verboseDebugInfo());
+                }
+                fail(message ? "False expression: " + message : "False expression.", stackCrawlMark || assert);
+            }
+        }
+        Debug.assert = assert;
+        function assertEqual(a, b, msg, msg2) {
+            if (a !== b) {
+                var message = msg ? msg2 ? msg + " " + msg2 : msg : "";
+                fail("Expected " + a + " === " + b + ". " + message);
+            }
+        }
+        Debug.assertEqual = assertEqual;
+        function assertLessThan(a, b, msg) {
+            if (a >= b) {
+                fail("Expected " + a + " < " + b + ". " + (msg || ""));
+            }
+        }
+        Debug.assertLessThan = assertLessThan;
+        function assertLessThanOrEqual(a, b) {
+            if (a > b) {
+                fail("Expected " + a + " <= " + b);
+            }
+        }
+        Debug.assertLessThanOrEqual = assertLessThanOrEqual;
+        function assertGreaterThanOrEqual(a, b) {
+            if (a < b) {
+                fail("Expected " + a + " >= " + b);
+            }
+        }
+        Debug.assertGreaterThanOrEqual = assertGreaterThanOrEqual;
+        function fail(message, stackCrawlMark) {
+            debugger;
+            var e = new Error(message ? "Debug Failure. " + message : "Debug Failure.");
+            if (Error.captureStackTrace) {
+                Error.captureStackTrace(e, stackCrawlMark || fail);
+            }
+            throw e;
+        }
+        Debug.fail = fail;
+        function assertDefined(value, message) {
+            if (value === undefined || value === null)
+                return fail(message);
+            return value;
+        }
+        Debug.assertDefined = assertDefined;
+        function assertEachDefined(value, message) {
+            for (var _i = 0, value_1 = value; _i < value_1.length; _i++) {
+                var v = value_1[_i];
+                assertDefined(v, message);
+            }
+            return value;
+        }
+        Debug.assertEachDefined = assertEachDefined;
+        function assertNever(member, message, stackCrawlMark) {
+            if (message === void 0) { message = "Illegal value:"; }
+            var detail = typeof member === "object" && "kind" in member && "pos" in member && formatSyntaxKind ? "SyntaxKind: " + formatSyntaxKind(member.kind) : JSON.stringify(member);
+            return fail(message + " " + detail, stackCrawlMark || assertNever);
+        }
+        Debug.assertNever = assertNever;
+        function getFunctionName(func) {
+            if (typeof func !== "function") {
+                return "";
+            }
+            else if (func.hasOwnProperty("name")) {
+                return func.name;
+            }
+            else {
+                var text = Function.prototype.toString.call(func);
+                var match = /^function\s+([\w\$]+)\s*\(/.exec(text);
+                return match ? match[1] : "";
+            }
+        }
+        Debug.getFunctionName = getFunctionName;
+        function formatSymbol(symbol) {
+            return "{ name: " + ts.unescapeLeadingUnderscores(symbol.escapedName) + "; flags: " + formatSymbolFlags(symbol.flags) + "; declarations: " + ts.map(symbol.declarations, function (node) { return formatSyntaxKind(node.kind); }) + " }";
+        }
+        Debug.formatSymbol = formatSymbol;
+        /**
+         * Formats an enum value as a string for debugging and debug assertions.
+         */
+        function formatEnum(value, enumObject, isFlags) {
+            if (value === void 0) { value = 0; }
+            var members = getEnumMembers(enumObject);
+            if (value === 0) {
+                return members.length > 0 && members[0][0] === 0 ? members[0][1] : "0";
+            }
+            if (isFlags) {
+                var result = "";
+                var remainingFlags = value;
+                for (var i = members.length - 1; i >= 0 && remainingFlags !== 0; i--) {
+                    var _a = members[i], enumValue = _a[0], enumName = _a[1];
+                    if (enumValue !== 0 && (remainingFlags & enumValue) === enumValue) {
+                        remainingFlags &= ~enumValue;
+                        result = "" + enumName + (result ? "|" : "") + result;
+                    }
+                }
+                if (remainingFlags === 0) {
+                    return result;
+                }
+            }
+            else {
+                for (var _i = 0, members_1 = members; _i < members_1.length; _i++) {
+                    var _b = members_1[_i], enumValue = _b[0], enumName = _b[1];
+                    if (enumValue === value) {
+                        return enumName;
+                    }
+                }
+            }
+            return value.toString();
+        }
+        Debug.formatEnum = formatEnum;
+        function getEnumMembers(enumObject) {
+            var result = [];
+            for (var name in enumObject) {
+                var value = enumObject[name];
+                if (typeof value === "number") {
+                    result.push([value, name]);
+                }
+            }
+            return ts.stableSort(result, function (x, y) { return ts.compareValues(x[0], y[0]); });
+        }
+        function formatSyntaxKind(kind) {
+            return formatEnum(kind, ts.SyntaxKind, /*isFlags*/ false);
+        }
+        Debug.formatSyntaxKind = formatSyntaxKind;
+        function formatNodeFlags(flags) {
+            return formatEnum(flags, ts.NodeFlags, /*isFlags*/ true);
+        }
+        Debug.formatNodeFlags = formatNodeFlags;
+        function formatModifierFlags(flags) {
+            return formatEnum(flags, ts.ModifierFlags, /*isFlags*/ true);
+        }
+        Debug.formatModifierFlags = formatModifierFlags;
+        function formatTransformFlags(flags) {
+            return formatEnum(flags, ts.TransformFlags, /*isFlags*/ true);
+        }
+        Debug.formatTransformFlags = formatTransformFlags;
+        function formatEmitFlags(flags) {
+            return formatEnum(flags, ts.EmitFlags, /*isFlags*/ true);
+        }
+        Debug.formatEmitFlags = formatEmitFlags;
+        function formatSymbolFlags(flags) {
+            return formatEnum(flags, ts.SymbolFlags, /*isFlags*/ true);
+        }
+        Debug.formatSymbolFlags = formatSymbolFlags;
+        function formatTypeFlags(flags) {
+            return formatEnum(flags, ts.TypeFlags, /*isFlags*/ true);
+        }
+        Debug.formatTypeFlags = formatTypeFlags;
+        function formatObjectFlags(flags) {
+            return formatEnum(flags, ts.ObjectFlags, /*isFlags*/ true);
+        }
+        Debug.formatObjectFlags = formatObjectFlags;
+        function failBadSyntaxKind(node, message) {
+            return fail((message || "Unexpected node.") + "\r\nNode " + formatSyntaxKind(node.kind) + " was unexpected.", failBadSyntaxKind);
+        }
+        Debug.failBadSyntaxKind = failBadSyntaxKind;
+        Debug.assertEachNode = shouldAssert(1 /* Normal */)
+            ? function (nodes, test, message) { return assert(test === undefined || ts.every(nodes, test), message || "Unexpected node.", function () { return "Node array did not pass test '" + getFunctionName(test) + "'."; }, Debug.assertEachNode); }
+            : ts.noop;
+        Debug.assertNode = shouldAssert(1 /* Normal */)
+            ? function (node, test, message) { return assert(test === undefined || test(node), message || "Unexpected node.", function () { return "Node " + formatSyntaxKind(node.kind) + " did not pass test '" + getFunctionName(test) + "'."; }, Debug.assertNode); }
+            : ts.noop;
+        Debug.assertOptionalNode = shouldAssert(1 /* Normal */)
+            ? function (node, test, message) { return assert(test === undefined || node === undefined || test(node), message || "Unexpected node.", function () { return "Node " + formatSyntaxKind(node.kind) + " did not pass test '" + getFunctionName(test) + "'."; }, Debug.assertOptionalNode); }
+            : ts.noop;
+        Debug.assertOptionalToken = shouldAssert(1 /* Normal */)
+            ? function (node, kind, message) { return assert(kind === undefined || node === undefined || node.kind === kind, message || "Unexpected node.", function () { return "Node " + formatSyntaxKind(node.kind) + " was not a '" + formatSyntaxKind(kind) + "' token."; }, Debug.assertOptionalToken); }
+            : ts.noop;
+        Debug.assertMissingNode = shouldAssert(1 /* Normal */)
+            ? function (node, message) { return assert(node === undefined, message || "Unexpected node.", function () { return "Node " + formatSyntaxKind(node.kind) + " was unexpected'."; }, Debug.assertMissingNode); }
+            : ts.noop;
+        var isDebugInfoEnabled = false;
+        /**
+         * Injects debug information into frequently used types.
+         */
+        function enableDebugInfo() {
+            if (isDebugInfoEnabled)
+                return;
+            // Add additional properties in debug mode to assist with debugging.
+            Object.defineProperties(ts.objectAllocator.getSymbolConstructor().prototype, {
+                __debugFlags: { get: function () { return formatSymbolFlags(this.flags); } }
+            });
+            Object.defineProperties(ts.objectAllocator.getTypeConstructor().prototype, {
+                __debugFlags: { get: function () { return formatTypeFlags(this.flags); } },
+                __debugObjectFlags: { get: function () { return this.flags & 524288 /* Object */ ? formatObjectFlags(this.objectFlags) : ""; } },
+                __debugTypeToString: { value: function () { return this.checker.typeToString(this); } },
+            });
+            var nodeConstructors = [
+                ts.objectAllocator.getNodeConstructor(),
+                ts.objectAllocator.getIdentifierConstructor(),
+                ts.objectAllocator.getTokenConstructor(),
+                ts.objectAllocator.getSourceFileConstructor()
+            ];
+            for (var _i = 0, nodeConstructors_1 = nodeConstructors; _i < nodeConstructors_1.length; _i++) {
+                var ctor = nodeConstructors_1[_i];
+                if (!ctor.prototype.hasOwnProperty("__debugKind")) {
+                    Object.defineProperties(ctor.prototype, {
+                        __debugKind: { get: function () { return formatSyntaxKind(this.kind); } },
+                        __debugNodeFlags: { get: function () { return formatNodeFlags(this.flags); } },
+                        __debugModifierFlags: { get: function () { return formatModifierFlags(ts.getModifierFlagsNoCache(this)); } },
+                        __debugTransformFlags: { get: function () { return formatTransformFlags(this.transformFlags); } },
+                        __debugIsParseTreeNode: { get: function () { return ts.isParseTreeNode(this); } },
+                        __debugEmitFlags: { get: function () { return formatEmitFlags(ts.getEmitFlags(this)); } },
+                        __debugGetText: {
+                            value: function (includeTrivia) {
+                                if (ts.nodeIsSynthesized(this))
+                                    return "";
+                                var parseNode = ts.getParseTreeNode(this);
+                                var sourceFile = parseNode && ts.getSourceFileOfNode(parseNode);
+                                return sourceFile ? ts.getSourceTextOfNodeFromSourceFile(sourceFile, parseNode, includeTrivia) : "";
+                            }
+                        }
+                    });
+                }
+            }
+            isDebugInfoEnabled = true;
+        }
+        Debug.enableDebugInfo = enableDebugInfo;
+    })(Debug = ts.Debug || (ts.Debug = {}));
 })(ts || (ts = {}));
 /*@internal*/
 var ts;
@@ -2653,309 +2808,312 @@ var ts;
         SyntaxKind[SyntaxKind["QuestionToken"] = 56] = "QuestionToken";
         SyntaxKind[SyntaxKind["ColonToken"] = 57] = "ColonToken";
         SyntaxKind[SyntaxKind["AtToken"] = 58] = "AtToken";
+        /** Only the JSDoc scanner produces BacktickToken. The normal scanner produces NoSubstitutionTemplateLiteral and related kinds. */
+        SyntaxKind[SyntaxKind["BacktickToken"] = 59] = "BacktickToken";
         // Assignments
-        SyntaxKind[SyntaxKind["EqualsToken"] = 59] = "EqualsToken";
-        SyntaxKind[SyntaxKind["PlusEqualsToken"] = 60] = "PlusEqualsToken";
-        SyntaxKind[SyntaxKind["MinusEqualsToken"] = 61] = "MinusEqualsToken";
-        SyntaxKind[SyntaxKind["AsteriskEqualsToken"] = 62] = "AsteriskEqualsToken";
-        SyntaxKind[SyntaxKind["AsteriskAsteriskEqualsToken"] = 63] = "AsteriskAsteriskEqualsToken";
-        SyntaxKind[SyntaxKind["SlashEqualsToken"] = 64] = "SlashEqualsToken";
-        SyntaxKind[SyntaxKind["PercentEqualsToken"] = 65] = "PercentEqualsToken";
-        SyntaxKind[SyntaxKind["LessThanLessThanEqualsToken"] = 66] = "LessThanLessThanEqualsToken";
-        SyntaxKind[SyntaxKind["GreaterThanGreaterThanEqualsToken"] = 67] = "GreaterThanGreaterThanEqualsToken";
-        SyntaxKind[SyntaxKind["GreaterThanGreaterThanGreaterThanEqualsToken"] = 68] = "GreaterThanGreaterThanGreaterThanEqualsToken";
-        SyntaxKind[SyntaxKind["AmpersandEqualsToken"] = 69] = "AmpersandEqualsToken";
-        SyntaxKind[SyntaxKind["BarEqualsToken"] = 70] = "BarEqualsToken";
-        SyntaxKind[SyntaxKind["CaretEqualsToken"] = 71] = "CaretEqualsToken";
+        SyntaxKind[SyntaxKind["EqualsToken"] = 60] = "EqualsToken";
+        SyntaxKind[SyntaxKind["PlusEqualsToken"] = 61] = "PlusEqualsToken";
+        SyntaxKind[SyntaxKind["MinusEqualsToken"] = 62] = "MinusEqualsToken";
+        SyntaxKind[SyntaxKind["AsteriskEqualsToken"] = 63] = "AsteriskEqualsToken";
+        SyntaxKind[SyntaxKind["AsteriskAsteriskEqualsToken"] = 64] = "AsteriskAsteriskEqualsToken";
+        SyntaxKind[SyntaxKind["SlashEqualsToken"] = 65] = "SlashEqualsToken";
+        SyntaxKind[SyntaxKind["PercentEqualsToken"] = 66] = "PercentEqualsToken";
+        SyntaxKind[SyntaxKind["LessThanLessThanEqualsToken"] = 67] = "LessThanLessThanEqualsToken";
+        SyntaxKind[SyntaxKind["GreaterThanGreaterThanEqualsToken"] = 68] = "GreaterThanGreaterThanEqualsToken";
+        SyntaxKind[SyntaxKind["GreaterThanGreaterThanGreaterThanEqualsToken"] = 69] = "GreaterThanGreaterThanGreaterThanEqualsToken";
+        SyntaxKind[SyntaxKind["AmpersandEqualsToken"] = 70] = "AmpersandEqualsToken";
+        SyntaxKind[SyntaxKind["BarEqualsToken"] = 71] = "BarEqualsToken";
+        SyntaxKind[SyntaxKind["CaretEqualsToken"] = 72] = "CaretEqualsToken";
         // Identifiers
-        SyntaxKind[SyntaxKind["Identifier"] = 72] = "Identifier";
+        SyntaxKind[SyntaxKind["Identifier"] = 73] = "Identifier";
         // Reserved words
-        SyntaxKind[SyntaxKind["BreakKeyword"] = 73] = "BreakKeyword";
-        SyntaxKind[SyntaxKind["CaseKeyword"] = 74] = "CaseKeyword";
-        SyntaxKind[SyntaxKind["CatchKeyword"] = 75] = "CatchKeyword";
-        SyntaxKind[SyntaxKind["ClassKeyword"] = 76] = "ClassKeyword";
-        SyntaxKind[SyntaxKind["ConstKeyword"] = 77] = "ConstKeyword";
-        SyntaxKind[SyntaxKind["ContinueKeyword"] = 78] = "ContinueKeyword";
-        SyntaxKind[SyntaxKind["DebuggerKeyword"] = 79] = "DebuggerKeyword";
-        SyntaxKind[SyntaxKind["DefaultKeyword"] = 80] = "DefaultKeyword";
-        SyntaxKind[SyntaxKind["DeleteKeyword"] = 81] = "DeleteKeyword";
-        SyntaxKind[SyntaxKind["DoKeyword"] = 82] = "DoKeyword";
-        SyntaxKind[SyntaxKind["ElseKeyword"] = 83] = "ElseKeyword";
-        SyntaxKind[SyntaxKind["EnumKeyword"] = 84] = "EnumKeyword";
-        SyntaxKind[SyntaxKind["ExportKeyword"] = 85] = "ExportKeyword";
-        SyntaxKind[SyntaxKind["ExtendsKeyword"] = 86] = "ExtendsKeyword";
-        SyntaxKind[SyntaxKind["FalseKeyword"] = 87] = "FalseKeyword";
-        SyntaxKind[SyntaxKind["FinallyKeyword"] = 88] = "FinallyKeyword";
-        SyntaxKind[SyntaxKind["ForKeyword"] = 89] = "ForKeyword";
-        SyntaxKind[SyntaxKind["FunctionKeyword"] = 90] = "FunctionKeyword";
-        SyntaxKind[SyntaxKind["IfKeyword"] = 91] = "IfKeyword";
-        SyntaxKind[SyntaxKind["ImportKeyword"] = 92] = "ImportKeyword";
-        SyntaxKind[SyntaxKind["InKeyword"] = 93] = "InKeyword";
-        SyntaxKind[SyntaxKind["InstanceOfKeyword"] = 94] = "InstanceOfKeyword";
-        SyntaxKind[SyntaxKind["NewKeyword"] = 95] = "NewKeyword";
-        SyntaxKind[SyntaxKind["NullKeyword"] = 96] = "NullKeyword";
-        SyntaxKind[SyntaxKind["ReturnKeyword"] = 97] = "ReturnKeyword";
-        SyntaxKind[SyntaxKind["SuperKeyword"] = 98] = "SuperKeyword";
-        SyntaxKind[SyntaxKind["SwitchKeyword"] = 99] = "SwitchKeyword";
-        SyntaxKind[SyntaxKind["ThisKeyword"] = 100] = "ThisKeyword";
-        SyntaxKind[SyntaxKind["ThrowKeyword"] = 101] = "ThrowKeyword";
-        SyntaxKind[SyntaxKind["TrueKeyword"] = 102] = "TrueKeyword";
-        SyntaxKind[SyntaxKind["TryKeyword"] = 103] = "TryKeyword";
-        SyntaxKind[SyntaxKind["TypeOfKeyword"] = 104] = "TypeOfKeyword";
-        SyntaxKind[SyntaxKind["VarKeyword"] = 105] = "VarKeyword";
-        SyntaxKind[SyntaxKind["VoidKeyword"] = 106] = "VoidKeyword";
-        SyntaxKind[SyntaxKind["WhileKeyword"] = 107] = "WhileKeyword";
-        SyntaxKind[SyntaxKind["WithKeyword"] = 108] = "WithKeyword";
+        SyntaxKind[SyntaxKind["BreakKeyword"] = 74] = "BreakKeyword";
+        SyntaxKind[SyntaxKind["CaseKeyword"] = 75] = "CaseKeyword";
+        SyntaxKind[SyntaxKind["CatchKeyword"] = 76] = "CatchKeyword";
+        SyntaxKind[SyntaxKind["ClassKeyword"] = 77] = "ClassKeyword";
+        SyntaxKind[SyntaxKind["ConstKeyword"] = 78] = "ConstKeyword";
+        SyntaxKind[SyntaxKind["ContinueKeyword"] = 79] = "ContinueKeyword";
+        SyntaxKind[SyntaxKind["DebuggerKeyword"] = 80] = "DebuggerKeyword";
+        SyntaxKind[SyntaxKind["DefaultKeyword"] = 81] = "DefaultKeyword";
+        SyntaxKind[SyntaxKind["DeleteKeyword"] = 82] = "DeleteKeyword";
+        SyntaxKind[SyntaxKind["DoKeyword"] = 83] = "DoKeyword";
+        SyntaxKind[SyntaxKind["ElseKeyword"] = 84] = "ElseKeyword";
+        SyntaxKind[SyntaxKind["EnumKeyword"] = 85] = "EnumKeyword";
+        SyntaxKind[SyntaxKind["ExportKeyword"] = 86] = "ExportKeyword";
+        SyntaxKind[SyntaxKind["ExtendsKeyword"] = 87] = "ExtendsKeyword";
+        SyntaxKind[SyntaxKind["FalseKeyword"] = 88] = "FalseKeyword";
+        SyntaxKind[SyntaxKind["FinallyKeyword"] = 89] = "FinallyKeyword";
+        SyntaxKind[SyntaxKind["ForKeyword"] = 90] = "ForKeyword";
+        SyntaxKind[SyntaxKind["FunctionKeyword"] = 91] = "FunctionKeyword";
+        SyntaxKind[SyntaxKind["IfKeyword"] = 92] = "IfKeyword";
+        SyntaxKind[SyntaxKind["ImportKeyword"] = 93] = "ImportKeyword";
+        SyntaxKind[SyntaxKind["InKeyword"] = 94] = "InKeyword";
+        SyntaxKind[SyntaxKind["InstanceOfKeyword"] = 95] = "InstanceOfKeyword";
+        SyntaxKind[SyntaxKind["NewKeyword"] = 96] = "NewKeyword";
+        SyntaxKind[SyntaxKind["NullKeyword"] = 97] = "NullKeyword";
+        SyntaxKind[SyntaxKind["ReturnKeyword"] = 98] = "ReturnKeyword";
+        SyntaxKind[SyntaxKind["SuperKeyword"] = 99] = "SuperKeyword";
+        SyntaxKind[SyntaxKind["SwitchKeyword"] = 100] = "SwitchKeyword";
+        SyntaxKind[SyntaxKind["ThisKeyword"] = 101] = "ThisKeyword";
+        SyntaxKind[SyntaxKind["ThrowKeyword"] = 102] = "ThrowKeyword";
+        SyntaxKind[SyntaxKind["TrueKeyword"] = 103] = "TrueKeyword";
+        SyntaxKind[SyntaxKind["TryKeyword"] = 104] = "TryKeyword";
+        SyntaxKind[SyntaxKind["TypeOfKeyword"] = 105] = "TypeOfKeyword";
+        SyntaxKind[SyntaxKind["VarKeyword"] = 106] = "VarKeyword";
+        SyntaxKind[SyntaxKind["VoidKeyword"] = 107] = "VoidKeyword";
+        SyntaxKind[SyntaxKind["WhileKeyword"] = 108] = "WhileKeyword";
+        SyntaxKind[SyntaxKind["WithKeyword"] = 109] = "WithKeyword";
         // Strict mode reserved words
-        SyntaxKind[SyntaxKind["ImplementsKeyword"] = 109] = "ImplementsKeyword";
-        SyntaxKind[SyntaxKind["InterfaceKeyword"] = 110] = "InterfaceKeyword";
-        SyntaxKind[SyntaxKind["LetKeyword"] = 111] = "LetKeyword";
-        SyntaxKind[SyntaxKind["PackageKeyword"] = 112] = "PackageKeyword";
-        SyntaxKind[SyntaxKind["PrivateKeyword"] = 113] = "PrivateKeyword";
-        SyntaxKind[SyntaxKind["ProtectedKeyword"] = 114] = "ProtectedKeyword";
-        SyntaxKind[SyntaxKind["PublicKeyword"] = 115] = "PublicKeyword";
-        SyntaxKind[SyntaxKind["StaticKeyword"] = 116] = "StaticKeyword";
-        SyntaxKind[SyntaxKind["YieldKeyword"] = 117] = "YieldKeyword";
+        SyntaxKind[SyntaxKind["ImplementsKeyword"] = 110] = "ImplementsKeyword";
+        SyntaxKind[SyntaxKind["InterfaceKeyword"] = 111] = "InterfaceKeyword";
+        SyntaxKind[SyntaxKind["LetKeyword"] = 112] = "LetKeyword";
+        SyntaxKind[SyntaxKind["PackageKeyword"] = 113] = "PackageKeyword";
+        SyntaxKind[SyntaxKind["PrivateKeyword"] = 114] = "PrivateKeyword";
+        SyntaxKind[SyntaxKind["ProtectedKeyword"] = 115] = "ProtectedKeyword";
+        SyntaxKind[SyntaxKind["PublicKeyword"] = 116] = "PublicKeyword";
+        SyntaxKind[SyntaxKind["StaticKeyword"] = 117] = "StaticKeyword";
+        SyntaxKind[SyntaxKind["YieldKeyword"] = 118] = "YieldKeyword";
         // Contextual keywords
-        SyntaxKind[SyntaxKind["AbstractKeyword"] = 118] = "AbstractKeyword";
-        SyntaxKind[SyntaxKind["AsKeyword"] = 119] = "AsKeyword";
-        SyntaxKind[SyntaxKind["AnyKeyword"] = 120] = "AnyKeyword";
-        SyntaxKind[SyntaxKind["AsyncKeyword"] = 121] = "AsyncKeyword";
-        SyntaxKind[SyntaxKind["AwaitKeyword"] = 122] = "AwaitKeyword";
-        SyntaxKind[SyntaxKind["BooleanKeyword"] = 123] = "BooleanKeyword";
-        SyntaxKind[SyntaxKind["ConstructorKeyword"] = 124] = "ConstructorKeyword";
-        SyntaxKind[SyntaxKind["DeclareKeyword"] = 125] = "DeclareKeyword";
-        SyntaxKind[SyntaxKind["GetKeyword"] = 126] = "GetKeyword";
-        SyntaxKind[SyntaxKind["InferKeyword"] = 127] = "InferKeyword";
-        SyntaxKind[SyntaxKind["IsKeyword"] = 128] = "IsKeyword";
-        SyntaxKind[SyntaxKind["KeyOfKeyword"] = 129] = "KeyOfKeyword";
-        SyntaxKind[SyntaxKind["ModuleKeyword"] = 130] = "ModuleKeyword";
-        SyntaxKind[SyntaxKind["NamespaceKeyword"] = 131] = "NamespaceKeyword";
-        SyntaxKind[SyntaxKind["NeverKeyword"] = 132] = "NeverKeyword";
-        SyntaxKind[SyntaxKind["ReadonlyKeyword"] = 133] = "ReadonlyKeyword";
-        SyntaxKind[SyntaxKind["RequireKeyword"] = 134] = "RequireKeyword";
-        SyntaxKind[SyntaxKind["NumberKeyword"] = 135] = "NumberKeyword";
-        SyntaxKind[SyntaxKind["ObjectKeyword"] = 136] = "ObjectKeyword";
-        SyntaxKind[SyntaxKind["SetKeyword"] = 137] = "SetKeyword";
-        SyntaxKind[SyntaxKind["StringKeyword"] = 138] = "StringKeyword";
-        SyntaxKind[SyntaxKind["SymbolKeyword"] = 139] = "SymbolKeyword";
-        SyntaxKind[SyntaxKind["TypeKeyword"] = 140] = "TypeKeyword";
-        SyntaxKind[SyntaxKind["UndefinedKeyword"] = 141] = "UndefinedKeyword";
-        SyntaxKind[SyntaxKind["UniqueKeyword"] = 142] = "UniqueKeyword";
-        SyntaxKind[SyntaxKind["UnknownKeyword"] = 143] = "UnknownKeyword";
-        SyntaxKind[SyntaxKind["FromKeyword"] = 144] = "FromKeyword";
-        SyntaxKind[SyntaxKind["GlobalKeyword"] = 145] = "GlobalKeyword";
-        SyntaxKind[SyntaxKind["BigIntKeyword"] = 146] = "BigIntKeyword";
-        SyntaxKind[SyntaxKind["OfKeyword"] = 147] = "OfKeyword";
+        SyntaxKind[SyntaxKind["AbstractKeyword"] = 119] = "AbstractKeyword";
+        SyntaxKind[SyntaxKind["AsKeyword"] = 120] = "AsKeyword";
+        SyntaxKind[SyntaxKind["AnyKeyword"] = 121] = "AnyKeyword";
+        SyntaxKind[SyntaxKind["AsyncKeyword"] = 122] = "AsyncKeyword";
+        SyntaxKind[SyntaxKind["AwaitKeyword"] = 123] = "AwaitKeyword";
+        SyntaxKind[SyntaxKind["BooleanKeyword"] = 124] = "BooleanKeyword";
+        SyntaxKind[SyntaxKind["ConstructorKeyword"] = 125] = "ConstructorKeyword";
+        SyntaxKind[SyntaxKind["DeclareKeyword"] = 126] = "DeclareKeyword";
+        SyntaxKind[SyntaxKind["GetKeyword"] = 127] = "GetKeyword";
+        SyntaxKind[SyntaxKind["InferKeyword"] = 128] = "InferKeyword";
+        SyntaxKind[SyntaxKind["IsKeyword"] = 129] = "IsKeyword";
+        SyntaxKind[SyntaxKind["KeyOfKeyword"] = 130] = "KeyOfKeyword";
+        SyntaxKind[SyntaxKind["ModuleKeyword"] = 131] = "ModuleKeyword";
+        SyntaxKind[SyntaxKind["NamespaceKeyword"] = 132] = "NamespaceKeyword";
+        SyntaxKind[SyntaxKind["NeverKeyword"] = 133] = "NeverKeyword";
+        SyntaxKind[SyntaxKind["ReadonlyKeyword"] = 134] = "ReadonlyKeyword";
+        SyntaxKind[SyntaxKind["RequireKeyword"] = 135] = "RequireKeyword";
+        SyntaxKind[SyntaxKind["NumberKeyword"] = 136] = "NumberKeyword";
+        SyntaxKind[SyntaxKind["ObjectKeyword"] = 137] = "ObjectKeyword";
+        SyntaxKind[SyntaxKind["SetKeyword"] = 138] = "SetKeyword";
+        SyntaxKind[SyntaxKind["StringKeyword"] = 139] = "StringKeyword";
+        SyntaxKind[SyntaxKind["SymbolKeyword"] = 140] = "SymbolKeyword";
+        SyntaxKind[SyntaxKind["TypeKeyword"] = 141] = "TypeKeyword";
+        SyntaxKind[SyntaxKind["UndefinedKeyword"] = 142] = "UndefinedKeyword";
+        SyntaxKind[SyntaxKind["UniqueKeyword"] = 143] = "UniqueKeyword";
+        SyntaxKind[SyntaxKind["UnknownKeyword"] = 144] = "UnknownKeyword";
+        SyntaxKind[SyntaxKind["FromKeyword"] = 145] = "FromKeyword";
+        SyntaxKind[SyntaxKind["GlobalKeyword"] = 146] = "GlobalKeyword";
+        SyntaxKind[SyntaxKind["BigIntKeyword"] = 147] = "BigIntKeyword";
+        SyntaxKind[SyntaxKind["OfKeyword"] = 148] = "OfKeyword";
         // Parse tree nodes
         // Names
-        SyntaxKind[SyntaxKind["QualifiedName"] = 148] = "QualifiedName";
-        SyntaxKind[SyntaxKind["ComputedPropertyName"] = 149] = "ComputedPropertyName";
+        SyntaxKind[SyntaxKind["QualifiedName"] = 149] = "QualifiedName";
+        SyntaxKind[SyntaxKind["ComputedPropertyName"] = 150] = "ComputedPropertyName";
         // Signature elements
-        SyntaxKind[SyntaxKind["TypeParameter"] = 150] = "TypeParameter";
-        SyntaxKind[SyntaxKind["Parameter"] = 151] = "Parameter";
-        SyntaxKind[SyntaxKind["Decorator"] = 152] = "Decorator";
+        SyntaxKind[SyntaxKind["TypeParameter"] = 151] = "TypeParameter";
+        SyntaxKind[SyntaxKind["Parameter"] = 152] = "Parameter";
+        SyntaxKind[SyntaxKind["Decorator"] = 153] = "Decorator";
         // TypeMember
-        SyntaxKind[SyntaxKind["PropertySignature"] = 153] = "PropertySignature";
-        SyntaxKind[SyntaxKind["PropertyDeclaration"] = 154] = "PropertyDeclaration";
-        SyntaxKind[SyntaxKind["MethodSignature"] = 155] = "MethodSignature";
-        SyntaxKind[SyntaxKind["MethodDeclaration"] = 156] = "MethodDeclaration";
-        SyntaxKind[SyntaxKind["Constructor"] = 157] = "Constructor";
-        SyntaxKind[SyntaxKind["GetAccessor"] = 158] = "GetAccessor";
-        SyntaxKind[SyntaxKind["SetAccessor"] = 159] = "SetAccessor";
-        SyntaxKind[SyntaxKind["CallSignature"] = 160] = "CallSignature";
-        SyntaxKind[SyntaxKind["ConstructSignature"] = 161] = "ConstructSignature";
-        SyntaxKind[SyntaxKind["IndexSignature"] = 162] = "IndexSignature";
+        SyntaxKind[SyntaxKind["PropertySignature"] = 154] = "PropertySignature";
+        SyntaxKind[SyntaxKind["PropertyDeclaration"] = 155] = "PropertyDeclaration";
+        SyntaxKind[SyntaxKind["MethodSignature"] = 156] = "MethodSignature";
+        SyntaxKind[SyntaxKind["MethodDeclaration"] = 157] = "MethodDeclaration";
+        SyntaxKind[SyntaxKind["Constructor"] = 158] = "Constructor";
+        SyntaxKind[SyntaxKind["GetAccessor"] = 159] = "GetAccessor";
+        SyntaxKind[SyntaxKind["SetAccessor"] = 160] = "SetAccessor";
+        SyntaxKind[SyntaxKind["CallSignature"] = 161] = "CallSignature";
+        SyntaxKind[SyntaxKind["ConstructSignature"] = 162] = "ConstructSignature";
+        SyntaxKind[SyntaxKind["IndexSignature"] = 163] = "IndexSignature";
         // Type
-        SyntaxKind[SyntaxKind["TypePredicate"] = 163] = "TypePredicate";
-        SyntaxKind[SyntaxKind["TypeReference"] = 164] = "TypeReference";
-        SyntaxKind[SyntaxKind["FunctionType"] = 165] = "FunctionType";
-        SyntaxKind[SyntaxKind["ConstructorType"] = 166] = "ConstructorType";
-        SyntaxKind[SyntaxKind["TypeQuery"] = 167] = "TypeQuery";
-        SyntaxKind[SyntaxKind["TypeLiteral"] = 168] = "TypeLiteral";
-        SyntaxKind[SyntaxKind["ArrayType"] = 169] = "ArrayType";
-        SyntaxKind[SyntaxKind["TupleType"] = 170] = "TupleType";
-        SyntaxKind[SyntaxKind["OptionalType"] = 171] = "OptionalType";
-        SyntaxKind[SyntaxKind["RestType"] = 172] = "RestType";
-        SyntaxKind[SyntaxKind["UnionType"] = 173] = "UnionType";
-        SyntaxKind[SyntaxKind["IntersectionType"] = 174] = "IntersectionType";
-        SyntaxKind[SyntaxKind["ConditionalType"] = 175] = "ConditionalType";
-        SyntaxKind[SyntaxKind["InferType"] = 176] = "InferType";
-        SyntaxKind[SyntaxKind["ParenthesizedType"] = 177] = "ParenthesizedType";
-        SyntaxKind[SyntaxKind["ThisType"] = 178] = "ThisType";
-        SyntaxKind[SyntaxKind["TypeOperator"] = 179] = "TypeOperator";
-        SyntaxKind[SyntaxKind["IndexedAccessType"] = 180] = "IndexedAccessType";
-        SyntaxKind[SyntaxKind["MappedType"] = 181] = "MappedType";
-        SyntaxKind[SyntaxKind["LiteralType"] = 182] = "LiteralType";
-        SyntaxKind[SyntaxKind["ImportType"] = 183] = "ImportType";
+        SyntaxKind[SyntaxKind["TypePredicate"] = 164] = "TypePredicate";
+        SyntaxKind[SyntaxKind["TypeReference"] = 165] = "TypeReference";
+        SyntaxKind[SyntaxKind["FunctionType"] = 166] = "FunctionType";
+        SyntaxKind[SyntaxKind["ConstructorType"] = 167] = "ConstructorType";
+        SyntaxKind[SyntaxKind["TypeQuery"] = 168] = "TypeQuery";
+        SyntaxKind[SyntaxKind["TypeLiteral"] = 169] = "TypeLiteral";
+        SyntaxKind[SyntaxKind["ArrayType"] = 170] = "ArrayType";
+        SyntaxKind[SyntaxKind["TupleType"] = 171] = "TupleType";
+        SyntaxKind[SyntaxKind["OptionalType"] = 172] = "OptionalType";
+        SyntaxKind[SyntaxKind["RestType"] = 173] = "RestType";
+        SyntaxKind[SyntaxKind["UnionType"] = 174] = "UnionType";
+        SyntaxKind[SyntaxKind["IntersectionType"] = 175] = "IntersectionType";
+        SyntaxKind[SyntaxKind["ConditionalType"] = 176] = "ConditionalType";
+        SyntaxKind[SyntaxKind["InferType"] = 177] = "InferType";
+        SyntaxKind[SyntaxKind["ParenthesizedType"] = 178] = "ParenthesizedType";
+        SyntaxKind[SyntaxKind["ThisType"] = 179] = "ThisType";
+        SyntaxKind[SyntaxKind["TypeOperator"] = 180] = "TypeOperator";
+        SyntaxKind[SyntaxKind["IndexedAccessType"] = 181] = "IndexedAccessType";
+        SyntaxKind[SyntaxKind["MappedType"] = 182] = "MappedType";
+        SyntaxKind[SyntaxKind["LiteralType"] = 183] = "LiteralType";
+        SyntaxKind[SyntaxKind["ImportType"] = 184] = "ImportType";
         // Binding patterns
-        SyntaxKind[SyntaxKind["ObjectBindingPattern"] = 184] = "ObjectBindingPattern";
-        SyntaxKind[SyntaxKind["ArrayBindingPattern"] = 185] = "ArrayBindingPattern";
-        SyntaxKind[SyntaxKind["BindingElement"] = 186] = "BindingElement";
+        SyntaxKind[SyntaxKind["ObjectBindingPattern"] = 185] = "ObjectBindingPattern";
+        SyntaxKind[SyntaxKind["ArrayBindingPattern"] = 186] = "ArrayBindingPattern";
+        SyntaxKind[SyntaxKind["BindingElement"] = 187] = "BindingElement";
         // Expression
-        SyntaxKind[SyntaxKind["ArrayLiteralExpression"] = 187] = "ArrayLiteralExpression";
-        SyntaxKind[SyntaxKind["ObjectLiteralExpression"] = 188] = "ObjectLiteralExpression";
-        SyntaxKind[SyntaxKind["PropertyAccessExpression"] = 189] = "PropertyAccessExpression";
-        SyntaxKind[SyntaxKind["ElementAccessExpression"] = 190] = "ElementAccessExpression";
-        SyntaxKind[SyntaxKind["CallExpression"] = 191] = "CallExpression";
-        SyntaxKind[SyntaxKind["NewExpression"] = 192] = "NewExpression";
-        SyntaxKind[SyntaxKind["TaggedTemplateExpression"] = 193] = "TaggedTemplateExpression";
-        SyntaxKind[SyntaxKind["TypeAssertionExpression"] = 194] = "TypeAssertionExpression";
-        SyntaxKind[SyntaxKind["ParenthesizedExpression"] = 195] = "ParenthesizedExpression";
-        SyntaxKind[SyntaxKind["FunctionExpression"] = 196] = "FunctionExpression";
-        SyntaxKind[SyntaxKind["ArrowFunction"] = 197] = "ArrowFunction";
-        SyntaxKind[SyntaxKind["DeleteExpression"] = 198] = "DeleteExpression";
-        SyntaxKind[SyntaxKind["TypeOfExpression"] = 199] = "TypeOfExpression";
-        SyntaxKind[SyntaxKind["VoidExpression"] = 200] = "VoidExpression";
-        SyntaxKind[SyntaxKind["AwaitExpression"] = 201] = "AwaitExpression";
-        SyntaxKind[SyntaxKind["PrefixUnaryExpression"] = 202] = "PrefixUnaryExpression";
-        SyntaxKind[SyntaxKind["PostfixUnaryExpression"] = 203] = "PostfixUnaryExpression";
-        SyntaxKind[SyntaxKind["BinaryExpression"] = 204] = "BinaryExpression";
-        SyntaxKind[SyntaxKind["ConditionalExpression"] = 205] = "ConditionalExpression";
-        SyntaxKind[SyntaxKind["TemplateExpression"] = 206] = "TemplateExpression";
-        SyntaxKind[SyntaxKind["YieldExpression"] = 207] = "YieldExpression";
-        SyntaxKind[SyntaxKind["SpreadElement"] = 208] = "SpreadElement";
-        SyntaxKind[SyntaxKind["ClassExpression"] = 209] = "ClassExpression";
-        SyntaxKind[SyntaxKind["OmittedExpression"] = 210] = "OmittedExpression";
-        SyntaxKind[SyntaxKind["ExpressionWithTypeArguments"] = 211] = "ExpressionWithTypeArguments";
-        SyntaxKind[SyntaxKind["AsExpression"] = 212] = "AsExpression";
-        SyntaxKind[SyntaxKind["NonNullExpression"] = 213] = "NonNullExpression";
-        SyntaxKind[SyntaxKind["MetaProperty"] = 214] = "MetaProperty";
-        SyntaxKind[SyntaxKind["SyntheticExpression"] = 215] = "SyntheticExpression";
+        SyntaxKind[SyntaxKind["ArrayLiteralExpression"] = 188] = "ArrayLiteralExpression";
+        SyntaxKind[SyntaxKind["ObjectLiteralExpression"] = 189] = "ObjectLiteralExpression";
+        SyntaxKind[SyntaxKind["PropertyAccessExpression"] = 190] = "PropertyAccessExpression";
+        SyntaxKind[SyntaxKind["ElementAccessExpression"] = 191] = "ElementAccessExpression";
+        SyntaxKind[SyntaxKind["CallExpression"] = 192] = "CallExpression";
+        SyntaxKind[SyntaxKind["NewExpression"] = 193] = "NewExpression";
+        SyntaxKind[SyntaxKind["TaggedTemplateExpression"] = 194] = "TaggedTemplateExpression";
+        SyntaxKind[SyntaxKind["TypeAssertionExpression"] = 195] = "TypeAssertionExpression";
+        SyntaxKind[SyntaxKind["ParenthesizedExpression"] = 196] = "ParenthesizedExpression";
+        SyntaxKind[SyntaxKind["FunctionExpression"] = 197] = "FunctionExpression";
+        SyntaxKind[SyntaxKind["ArrowFunction"] = 198] = "ArrowFunction";
+        SyntaxKind[SyntaxKind["DeleteExpression"] = 199] = "DeleteExpression";
+        SyntaxKind[SyntaxKind["TypeOfExpression"] = 200] = "TypeOfExpression";
+        SyntaxKind[SyntaxKind["VoidExpression"] = 201] = "VoidExpression";
+        SyntaxKind[SyntaxKind["AwaitExpression"] = 202] = "AwaitExpression";
+        SyntaxKind[SyntaxKind["PrefixUnaryExpression"] = 203] = "PrefixUnaryExpression";
+        SyntaxKind[SyntaxKind["PostfixUnaryExpression"] = 204] = "PostfixUnaryExpression";
+        SyntaxKind[SyntaxKind["BinaryExpression"] = 205] = "BinaryExpression";
+        SyntaxKind[SyntaxKind["ConditionalExpression"] = 206] = "ConditionalExpression";
+        SyntaxKind[SyntaxKind["TemplateExpression"] = 207] = "TemplateExpression";
+        SyntaxKind[SyntaxKind["YieldExpression"] = 208] = "YieldExpression";
+        SyntaxKind[SyntaxKind["SpreadElement"] = 209] = "SpreadElement";
+        SyntaxKind[SyntaxKind["ClassExpression"] = 210] = "ClassExpression";
+        SyntaxKind[SyntaxKind["OmittedExpression"] = 211] = "OmittedExpression";
+        SyntaxKind[SyntaxKind["ExpressionWithTypeArguments"] = 212] = "ExpressionWithTypeArguments";
+        SyntaxKind[SyntaxKind["AsExpression"] = 213] = "AsExpression";
+        SyntaxKind[SyntaxKind["NonNullExpression"] = 214] = "NonNullExpression";
+        SyntaxKind[SyntaxKind["MetaProperty"] = 215] = "MetaProperty";
+        SyntaxKind[SyntaxKind["SyntheticExpression"] = 216] = "SyntheticExpression";
         // Misc
-        SyntaxKind[SyntaxKind["TemplateSpan"] = 216] = "TemplateSpan";
-        SyntaxKind[SyntaxKind["SemicolonClassElement"] = 217] = "SemicolonClassElement";
+        SyntaxKind[SyntaxKind["TemplateSpan"] = 217] = "TemplateSpan";
+        SyntaxKind[SyntaxKind["SemicolonClassElement"] = 218] = "SemicolonClassElement";
         // Element
-        SyntaxKind[SyntaxKind["Block"] = 218] = "Block";
-        SyntaxKind[SyntaxKind["VariableStatement"] = 219] = "VariableStatement";
-        SyntaxKind[SyntaxKind["EmptyStatement"] = 220] = "EmptyStatement";
-        SyntaxKind[SyntaxKind["ExpressionStatement"] = 221] = "ExpressionStatement";
-        SyntaxKind[SyntaxKind["IfStatement"] = 222] = "IfStatement";
-        SyntaxKind[SyntaxKind["DoStatement"] = 223] = "DoStatement";
-        SyntaxKind[SyntaxKind["WhileStatement"] = 224] = "WhileStatement";
-        SyntaxKind[SyntaxKind["ForStatement"] = 225] = "ForStatement";
-        SyntaxKind[SyntaxKind["ForInStatement"] = 226] = "ForInStatement";
-        SyntaxKind[SyntaxKind["ForOfStatement"] = 227] = "ForOfStatement";
-        SyntaxKind[SyntaxKind["ContinueStatement"] = 228] = "ContinueStatement";
-        SyntaxKind[SyntaxKind["BreakStatement"] = 229] = "BreakStatement";
-        SyntaxKind[SyntaxKind["ReturnStatement"] = 230] = "ReturnStatement";
-        SyntaxKind[SyntaxKind["WithStatement"] = 231] = "WithStatement";
-        SyntaxKind[SyntaxKind["SwitchStatement"] = 232] = "SwitchStatement";
-        SyntaxKind[SyntaxKind["LabeledStatement"] = 233] = "LabeledStatement";
-        SyntaxKind[SyntaxKind["ThrowStatement"] = 234] = "ThrowStatement";
-        SyntaxKind[SyntaxKind["TryStatement"] = 235] = "TryStatement";
-        SyntaxKind[SyntaxKind["DebuggerStatement"] = 236] = "DebuggerStatement";
-        SyntaxKind[SyntaxKind["VariableDeclaration"] = 237] = "VariableDeclaration";
-        SyntaxKind[SyntaxKind["VariableDeclarationList"] = 238] = "VariableDeclarationList";
-        SyntaxKind[SyntaxKind["FunctionDeclaration"] = 239] = "FunctionDeclaration";
-        SyntaxKind[SyntaxKind["ClassDeclaration"] = 240] = "ClassDeclaration";
-        SyntaxKind[SyntaxKind["InterfaceDeclaration"] = 241] = "InterfaceDeclaration";
-        SyntaxKind[SyntaxKind["TypeAliasDeclaration"] = 242] = "TypeAliasDeclaration";
-        SyntaxKind[SyntaxKind["EnumDeclaration"] = 243] = "EnumDeclaration";
-        SyntaxKind[SyntaxKind["ModuleDeclaration"] = 244] = "ModuleDeclaration";
-        SyntaxKind[SyntaxKind["ModuleBlock"] = 245] = "ModuleBlock";
-        SyntaxKind[SyntaxKind["CaseBlock"] = 246] = "CaseBlock";
-        SyntaxKind[SyntaxKind["NamespaceExportDeclaration"] = 247] = "NamespaceExportDeclaration";
-        SyntaxKind[SyntaxKind["ImportEqualsDeclaration"] = 248] = "ImportEqualsDeclaration";
-        SyntaxKind[SyntaxKind["ImportDeclaration"] = 249] = "ImportDeclaration";
-        SyntaxKind[SyntaxKind["ImportClause"] = 250] = "ImportClause";
-        SyntaxKind[SyntaxKind["NamespaceImport"] = 251] = "NamespaceImport";
-        SyntaxKind[SyntaxKind["NamedImports"] = 252] = "NamedImports";
-        SyntaxKind[SyntaxKind["ImportSpecifier"] = 253] = "ImportSpecifier";
-        SyntaxKind[SyntaxKind["ExportAssignment"] = 254] = "ExportAssignment";
-        SyntaxKind[SyntaxKind["ExportDeclaration"] = 255] = "ExportDeclaration";
-        SyntaxKind[SyntaxKind["NamedExports"] = 256] = "NamedExports";
-        SyntaxKind[SyntaxKind["ExportSpecifier"] = 257] = "ExportSpecifier";
-        SyntaxKind[SyntaxKind["MissingDeclaration"] = 258] = "MissingDeclaration";
+        SyntaxKind[SyntaxKind["Block"] = 219] = "Block";
+        SyntaxKind[SyntaxKind["VariableStatement"] = 220] = "VariableStatement";
+        SyntaxKind[SyntaxKind["EmptyStatement"] = 221] = "EmptyStatement";
+        SyntaxKind[SyntaxKind["ExpressionStatement"] = 222] = "ExpressionStatement";
+        SyntaxKind[SyntaxKind["IfStatement"] = 223] = "IfStatement";
+        SyntaxKind[SyntaxKind["DoStatement"] = 224] = "DoStatement";
+        SyntaxKind[SyntaxKind["WhileStatement"] = 225] = "WhileStatement";
+        SyntaxKind[SyntaxKind["ForStatement"] = 226] = "ForStatement";
+        SyntaxKind[SyntaxKind["ForInStatement"] = 227] = "ForInStatement";
+        SyntaxKind[SyntaxKind["ForOfStatement"] = 228] = "ForOfStatement";
+        SyntaxKind[SyntaxKind["ContinueStatement"] = 229] = "ContinueStatement";
+        SyntaxKind[SyntaxKind["BreakStatement"] = 230] = "BreakStatement";
+        SyntaxKind[SyntaxKind["ReturnStatement"] = 231] = "ReturnStatement";
+        SyntaxKind[SyntaxKind["WithStatement"] = 232] = "WithStatement";
+        SyntaxKind[SyntaxKind["SwitchStatement"] = 233] = "SwitchStatement";
+        SyntaxKind[SyntaxKind["LabeledStatement"] = 234] = "LabeledStatement";
+        SyntaxKind[SyntaxKind["ThrowStatement"] = 235] = "ThrowStatement";
+        SyntaxKind[SyntaxKind["TryStatement"] = 236] = "TryStatement";
+        SyntaxKind[SyntaxKind["DebuggerStatement"] = 237] = "DebuggerStatement";
+        SyntaxKind[SyntaxKind["VariableDeclaration"] = 238] = "VariableDeclaration";
+        SyntaxKind[SyntaxKind["VariableDeclarationList"] = 239] = "VariableDeclarationList";
+        SyntaxKind[SyntaxKind["FunctionDeclaration"] = 240] = "FunctionDeclaration";
+        SyntaxKind[SyntaxKind["ClassDeclaration"] = 241] = "ClassDeclaration";
+        SyntaxKind[SyntaxKind["InterfaceDeclaration"] = 242] = "InterfaceDeclaration";
+        SyntaxKind[SyntaxKind["TypeAliasDeclaration"] = 243] = "TypeAliasDeclaration";
+        SyntaxKind[SyntaxKind["EnumDeclaration"] = 244] = "EnumDeclaration";
+        SyntaxKind[SyntaxKind["ModuleDeclaration"] = 245] = "ModuleDeclaration";
+        SyntaxKind[SyntaxKind["ModuleBlock"] = 246] = "ModuleBlock";
+        SyntaxKind[SyntaxKind["CaseBlock"] = 247] = "CaseBlock";
+        SyntaxKind[SyntaxKind["NamespaceExportDeclaration"] = 248] = "NamespaceExportDeclaration";
+        SyntaxKind[SyntaxKind["ImportEqualsDeclaration"] = 249] = "ImportEqualsDeclaration";
+        SyntaxKind[SyntaxKind["ImportDeclaration"] = 250] = "ImportDeclaration";
+        SyntaxKind[SyntaxKind["ImportClause"] = 251] = "ImportClause";
+        SyntaxKind[SyntaxKind["NamespaceImport"] = 252] = "NamespaceImport";
+        SyntaxKind[SyntaxKind["NamedImports"] = 253] = "NamedImports";
+        SyntaxKind[SyntaxKind["ImportSpecifier"] = 254] = "ImportSpecifier";
+        SyntaxKind[SyntaxKind["ExportAssignment"] = 255] = "ExportAssignment";
+        SyntaxKind[SyntaxKind["ExportDeclaration"] = 256] = "ExportDeclaration";
+        SyntaxKind[SyntaxKind["NamedExports"] = 257] = "NamedExports";
+        SyntaxKind[SyntaxKind["ExportSpecifier"] = 258] = "ExportSpecifier";
+        SyntaxKind[SyntaxKind["MissingDeclaration"] = 259] = "MissingDeclaration";
         // Module references
-        SyntaxKind[SyntaxKind["ExternalModuleReference"] = 259] = "ExternalModuleReference";
+        SyntaxKind[SyntaxKind["ExternalModuleReference"] = 260] = "ExternalModuleReference";
         // JSX
-        SyntaxKind[SyntaxKind["JsxElement"] = 260] = "JsxElement";
-        SyntaxKind[SyntaxKind["JsxSelfClosingElement"] = 261] = "JsxSelfClosingElement";
-        SyntaxKind[SyntaxKind["JsxOpeningElement"] = 262] = "JsxOpeningElement";
-        SyntaxKind[SyntaxKind["JsxClosingElement"] = 263] = "JsxClosingElement";
-        SyntaxKind[SyntaxKind["JsxFragment"] = 264] = "JsxFragment";
-        SyntaxKind[SyntaxKind["JsxOpeningFragment"] = 265] = "JsxOpeningFragment";
-        SyntaxKind[SyntaxKind["JsxClosingFragment"] = 266] = "JsxClosingFragment";
-        SyntaxKind[SyntaxKind["JsxAttribute"] = 267] = "JsxAttribute";
-        SyntaxKind[SyntaxKind["JsxAttributes"] = 268] = "JsxAttributes";
-        SyntaxKind[SyntaxKind["JsxSpreadAttribute"] = 269] = "JsxSpreadAttribute";
-        SyntaxKind[SyntaxKind["JsxExpression"] = 270] = "JsxExpression";
+        SyntaxKind[SyntaxKind["JsxElement"] = 261] = "JsxElement";
+        SyntaxKind[SyntaxKind["JsxSelfClosingElement"] = 262] = "JsxSelfClosingElement";
+        SyntaxKind[SyntaxKind["JsxOpeningElement"] = 263] = "JsxOpeningElement";
+        SyntaxKind[SyntaxKind["JsxClosingElement"] = 264] = "JsxClosingElement";
+        SyntaxKind[SyntaxKind["JsxFragment"] = 265] = "JsxFragment";
+        SyntaxKind[SyntaxKind["JsxOpeningFragment"] = 266] = "JsxOpeningFragment";
+        SyntaxKind[SyntaxKind["JsxClosingFragment"] = 267] = "JsxClosingFragment";
+        SyntaxKind[SyntaxKind["JsxAttribute"] = 268] = "JsxAttribute";
+        SyntaxKind[SyntaxKind["JsxAttributes"] = 269] = "JsxAttributes";
+        SyntaxKind[SyntaxKind["JsxSpreadAttribute"] = 270] = "JsxSpreadAttribute";
+        SyntaxKind[SyntaxKind["JsxExpression"] = 271] = "JsxExpression";
         // Clauses
-        SyntaxKind[SyntaxKind["CaseClause"] = 271] = "CaseClause";
-        SyntaxKind[SyntaxKind["DefaultClause"] = 272] = "DefaultClause";
-        SyntaxKind[SyntaxKind["HeritageClause"] = 273] = "HeritageClause";
-        SyntaxKind[SyntaxKind["CatchClause"] = 274] = "CatchClause";
+        SyntaxKind[SyntaxKind["CaseClause"] = 272] = "CaseClause";
+        SyntaxKind[SyntaxKind["DefaultClause"] = 273] = "DefaultClause";
+        SyntaxKind[SyntaxKind["HeritageClause"] = 274] = "HeritageClause";
+        SyntaxKind[SyntaxKind["CatchClause"] = 275] = "CatchClause";
         // Property assignments
-        SyntaxKind[SyntaxKind["PropertyAssignment"] = 275] = "PropertyAssignment";
-        SyntaxKind[SyntaxKind["ShorthandPropertyAssignment"] = 276] = "ShorthandPropertyAssignment";
-        SyntaxKind[SyntaxKind["SpreadAssignment"] = 277] = "SpreadAssignment";
+        SyntaxKind[SyntaxKind["PropertyAssignment"] = 276] = "PropertyAssignment";
+        SyntaxKind[SyntaxKind["ShorthandPropertyAssignment"] = 277] = "ShorthandPropertyAssignment";
+        SyntaxKind[SyntaxKind["SpreadAssignment"] = 278] = "SpreadAssignment";
         // Enum
-        SyntaxKind[SyntaxKind["EnumMember"] = 278] = "EnumMember";
+        SyntaxKind[SyntaxKind["EnumMember"] = 279] = "EnumMember";
         // Unparsed
-        SyntaxKind[SyntaxKind["UnparsedPrologue"] = 279] = "UnparsedPrologue";
-        SyntaxKind[SyntaxKind["UnparsedPrepend"] = 280] = "UnparsedPrepend";
-        SyntaxKind[SyntaxKind["UnparsedText"] = 281] = "UnparsedText";
-        SyntaxKind[SyntaxKind["UnparsedInternalText"] = 282] = "UnparsedInternalText";
-        SyntaxKind[SyntaxKind["UnparsedSyntheticReference"] = 283] = "UnparsedSyntheticReference";
+        SyntaxKind[SyntaxKind["UnparsedPrologue"] = 280] = "UnparsedPrologue";
+        SyntaxKind[SyntaxKind["UnparsedPrepend"] = 281] = "UnparsedPrepend";
+        SyntaxKind[SyntaxKind["UnparsedText"] = 282] = "UnparsedText";
+        SyntaxKind[SyntaxKind["UnparsedInternalText"] = 283] = "UnparsedInternalText";
+        SyntaxKind[SyntaxKind["UnparsedSyntheticReference"] = 284] = "UnparsedSyntheticReference";
         // Top-level nodes
-        SyntaxKind[SyntaxKind["SourceFile"] = 284] = "SourceFile";
-        SyntaxKind[SyntaxKind["Bundle"] = 285] = "Bundle";
-        SyntaxKind[SyntaxKind["UnparsedSource"] = 286] = "UnparsedSource";
-        SyntaxKind[SyntaxKind["InputFiles"] = 287] = "InputFiles";
+        SyntaxKind[SyntaxKind["SourceFile"] = 285] = "SourceFile";
+        SyntaxKind[SyntaxKind["Bundle"] = 286] = "Bundle";
+        SyntaxKind[SyntaxKind["UnparsedSource"] = 287] = "UnparsedSource";
+        SyntaxKind[SyntaxKind["InputFiles"] = 288] = "InputFiles";
         // JSDoc nodes
-        SyntaxKind[SyntaxKind["JSDocTypeExpression"] = 288] = "JSDocTypeExpression";
+        SyntaxKind[SyntaxKind["JSDocTypeExpression"] = 289] = "JSDocTypeExpression";
         // The * type
-        SyntaxKind[SyntaxKind["JSDocAllType"] = 289] = "JSDocAllType";
+        SyntaxKind[SyntaxKind["JSDocAllType"] = 290] = "JSDocAllType";
         // The ? type
-        SyntaxKind[SyntaxKind["JSDocUnknownType"] = 290] = "JSDocUnknownType";
-        SyntaxKind[SyntaxKind["JSDocNullableType"] = 291] = "JSDocNullableType";
-        SyntaxKind[SyntaxKind["JSDocNonNullableType"] = 292] = "JSDocNonNullableType";
-        SyntaxKind[SyntaxKind["JSDocOptionalType"] = 293] = "JSDocOptionalType";
-        SyntaxKind[SyntaxKind["JSDocFunctionType"] = 294] = "JSDocFunctionType";
-        SyntaxKind[SyntaxKind["JSDocVariadicType"] = 295] = "JSDocVariadicType";
-        SyntaxKind[SyntaxKind["JSDocComment"] = 296] = "JSDocComment";
-        SyntaxKind[SyntaxKind["JSDocTypeLiteral"] = 297] = "JSDocTypeLiteral";
-        SyntaxKind[SyntaxKind["JSDocSignature"] = 298] = "JSDocSignature";
-        SyntaxKind[SyntaxKind["JSDocTag"] = 299] = "JSDocTag";
-        SyntaxKind[SyntaxKind["JSDocAugmentsTag"] = 300] = "JSDocAugmentsTag";
-        SyntaxKind[SyntaxKind["JSDocClassTag"] = 301] = "JSDocClassTag";
-        SyntaxKind[SyntaxKind["JSDocCallbackTag"] = 302] = "JSDocCallbackTag";
-        SyntaxKind[SyntaxKind["JSDocEnumTag"] = 303] = "JSDocEnumTag";
-        SyntaxKind[SyntaxKind["JSDocParameterTag"] = 304] = "JSDocParameterTag";
-        SyntaxKind[SyntaxKind["JSDocReturnTag"] = 305] = "JSDocReturnTag";
-        SyntaxKind[SyntaxKind["JSDocThisTag"] = 306] = "JSDocThisTag";
-        SyntaxKind[SyntaxKind["JSDocTypeTag"] = 307] = "JSDocTypeTag";
-        SyntaxKind[SyntaxKind["JSDocTemplateTag"] = 308] = "JSDocTemplateTag";
-        SyntaxKind[SyntaxKind["JSDocTypedefTag"] = 309] = "JSDocTypedefTag";
-        SyntaxKind[SyntaxKind["JSDocPropertyTag"] = 310] = "JSDocPropertyTag";
+        SyntaxKind[SyntaxKind["JSDocUnknownType"] = 291] = "JSDocUnknownType";
+        SyntaxKind[SyntaxKind["JSDocNullableType"] = 292] = "JSDocNullableType";
+        SyntaxKind[SyntaxKind["JSDocNonNullableType"] = 293] = "JSDocNonNullableType";
+        SyntaxKind[SyntaxKind["JSDocOptionalType"] = 294] = "JSDocOptionalType";
+        SyntaxKind[SyntaxKind["JSDocFunctionType"] = 295] = "JSDocFunctionType";
+        SyntaxKind[SyntaxKind["JSDocVariadicType"] = 296] = "JSDocVariadicType";
+        SyntaxKind[SyntaxKind["JSDocComment"] = 297] = "JSDocComment";
+        SyntaxKind[SyntaxKind["JSDocTypeLiteral"] = 298] = "JSDocTypeLiteral";
+        SyntaxKind[SyntaxKind["JSDocSignature"] = 299] = "JSDocSignature";
+        SyntaxKind[SyntaxKind["JSDocTag"] = 300] = "JSDocTag";
+        SyntaxKind[SyntaxKind["JSDocAugmentsTag"] = 301] = "JSDocAugmentsTag";
+        SyntaxKind[SyntaxKind["JSDocAuthorTag"] = 302] = "JSDocAuthorTag";
+        SyntaxKind[SyntaxKind["JSDocClassTag"] = 303] = "JSDocClassTag";
+        SyntaxKind[SyntaxKind["JSDocCallbackTag"] = 304] = "JSDocCallbackTag";
+        SyntaxKind[SyntaxKind["JSDocEnumTag"] = 305] = "JSDocEnumTag";
+        SyntaxKind[SyntaxKind["JSDocParameterTag"] = 306] = "JSDocParameterTag";
+        SyntaxKind[SyntaxKind["JSDocReturnTag"] = 307] = "JSDocReturnTag";
+        SyntaxKind[SyntaxKind["JSDocThisTag"] = 308] = "JSDocThisTag";
+        SyntaxKind[SyntaxKind["JSDocTypeTag"] = 309] = "JSDocTypeTag";
+        SyntaxKind[SyntaxKind["JSDocTemplateTag"] = 310] = "JSDocTemplateTag";
+        SyntaxKind[SyntaxKind["JSDocTypedefTag"] = 311] = "JSDocTypedefTag";
+        SyntaxKind[SyntaxKind["JSDocPropertyTag"] = 312] = "JSDocPropertyTag";
         // Synthesized list
-        SyntaxKind[SyntaxKind["SyntaxList"] = 311] = "SyntaxList";
+        SyntaxKind[SyntaxKind["SyntaxList"] = 313] = "SyntaxList";
         // Transformation nodes
-        SyntaxKind[SyntaxKind["NotEmittedStatement"] = 312] = "NotEmittedStatement";
-        SyntaxKind[SyntaxKind["PartiallyEmittedExpression"] = 313] = "PartiallyEmittedExpression";
-        SyntaxKind[SyntaxKind["CommaListExpression"] = 314] = "CommaListExpression";
-        SyntaxKind[SyntaxKind["MergeDeclarationMarker"] = 315] = "MergeDeclarationMarker";
-        SyntaxKind[SyntaxKind["EndOfDeclarationMarker"] = 316] = "EndOfDeclarationMarker";
+        SyntaxKind[SyntaxKind["NotEmittedStatement"] = 314] = "NotEmittedStatement";
+        SyntaxKind[SyntaxKind["PartiallyEmittedExpression"] = 315] = "PartiallyEmittedExpression";
+        SyntaxKind[SyntaxKind["CommaListExpression"] = 316] = "CommaListExpression";
+        SyntaxKind[SyntaxKind["MergeDeclarationMarker"] = 317] = "MergeDeclarationMarker";
+        SyntaxKind[SyntaxKind["EndOfDeclarationMarker"] = 318] = "EndOfDeclarationMarker";
         // Enum value count
-        SyntaxKind[SyntaxKind["Count"] = 317] = "Count";
+        SyntaxKind[SyntaxKind["Count"] = 319] = "Count";
         // Markers
-        SyntaxKind[SyntaxKind["FirstAssignment"] = 59] = "FirstAssignment";
-        SyntaxKind[SyntaxKind["LastAssignment"] = 71] = "LastAssignment";
-        SyntaxKind[SyntaxKind["FirstCompoundAssignment"] = 60] = "FirstCompoundAssignment";
-        SyntaxKind[SyntaxKind["LastCompoundAssignment"] = 71] = "LastCompoundAssignment";
-        SyntaxKind[SyntaxKind["FirstReservedWord"] = 73] = "FirstReservedWord";
-        SyntaxKind[SyntaxKind["LastReservedWord"] = 108] = "LastReservedWord";
-        SyntaxKind[SyntaxKind["FirstKeyword"] = 73] = "FirstKeyword";
-        SyntaxKind[SyntaxKind["LastKeyword"] = 147] = "LastKeyword";
-        SyntaxKind[SyntaxKind["FirstFutureReservedWord"] = 109] = "FirstFutureReservedWord";
-        SyntaxKind[SyntaxKind["LastFutureReservedWord"] = 117] = "LastFutureReservedWord";
-        SyntaxKind[SyntaxKind["FirstTypeNode"] = 163] = "FirstTypeNode";
-        SyntaxKind[SyntaxKind["LastTypeNode"] = 183] = "LastTypeNode";
+        SyntaxKind[SyntaxKind["FirstAssignment"] = 60] = "FirstAssignment";
+        SyntaxKind[SyntaxKind["LastAssignment"] = 72] = "LastAssignment";
+        SyntaxKind[SyntaxKind["FirstCompoundAssignment"] = 61] = "FirstCompoundAssignment";
+        SyntaxKind[SyntaxKind["LastCompoundAssignment"] = 72] = "LastCompoundAssignment";
+        SyntaxKind[SyntaxKind["FirstReservedWord"] = 74] = "FirstReservedWord";
+        SyntaxKind[SyntaxKind["LastReservedWord"] = 109] = "LastReservedWord";
+        SyntaxKind[SyntaxKind["FirstKeyword"] = 74] = "FirstKeyword";
+        SyntaxKind[SyntaxKind["LastKeyword"] = 148] = "LastKeyword";
+        SyntaxKind[SyntaxKind["FirstFutureReservedWord"] = 110] = "FirstFutureReservedWord";
+        SyntaxKind[SyntaxKind["LastFutureReservedWord"] = 118] = "LastFutureReservedWord";
+        SyntaxKind[SyntaxKind["FirstTypeNode"] = 164] = "FirstTypeNode";
+        SyntaxKind[SyntaxKind["LastTypeNode"] = 184] = "LastTypeNode";
         SyntaxKind[SyntaxKind["FirstPunctuation"] = 18] = "FirstPunctuation";
-        SyntaxKind[SyntaxKind["LastPunctuation"] = 71] = "LastPunctuation";
+        SyntaxKind[SyntaxKind["LastPunctuation"] = 72] = "LastPunctuation";
         SyntaxKind[SyntaxKind["FirstToken"] = 0] = "FirstToken";
-        SyntaxKind[SyntaxKind["LastToken"] = 147] = "LastToken";
+        SyntaxKind[SyntaxKind["LastToken"] = 148] = "LastToken";
         SyntaxKind[SyntaxKind["FirstTriviaToken"] = 2] = "FirstTriviaToken";
         SyntaxKind[SyntaxKind["LastTriviaToken"] = 7] = "LastTriviaToken";
         SyntaxKind[SyntaxKind["FirstLiteralToken"] = 8] = "FirstLiteralToken";
@@ -2963,14 +3121,14 @@ var ts;
         SyntaxKind[SyntaxKind["FirstTemplateToken"] = 14] = "FirstTemplateToken";
         SyntaxKind[SyntaxKind["LastTemplateToken"] = 17] = "LastTemplateToken";
         SyntaxKind[SyntaxKind["FirstBinaryOperator"] = 28] = "FirstBinaryOperator";
-        SyntaxKind[SyntaxKind["LastBinaryOperator"] = 71] = "LastBinaryOperator";
-        SyntaxKind[SyntaxKind["FirstNode"] = 148] = "FirstNode";
-        SyntaxKind[SyntaxKind["FirstJSDocNode"] = 288] = "FirstJSDocNode";
-        SyntaxKind[SyntaxKind["LastJSDocNode"] = 310] = "LastJSDocNode";
-        SyntaxKind[SyntaxKind["FirstJSDocTagNode"] = 299] = "FirstJSDocTagNode";
-        SyntaxKind[SyntaxKind["LastJSDocTagNode"] = 310] = "LastJSDocTagNode";
-        /* @internal */ SyntaxKind[SyntaxKind["FirstContextualKeyword"] = 118] = "FirstContextualKeyword";
-        /* @internal */ SyntaxKind[SyntaxKind["LastContextualKeyword"] = 147] = "LastContextualKeyword";
+        SyntaxKind[SyntaxKind["LastBinaryOperator"] = 72] = "LastBinaryOperator";
+        SyntaxKind[SyntaxKind["FirstNode"] = 149] = "FirstNode";
+        SyntaxKind[SyntaxKind["FirstJSDocNode"] = 289] = "FirstJSDocNode";
+        SyntaxKind[SyntaxKind["LastJSDocNode"] = 312] = "LastJSDocNode";
+        SyntaxKind[SyntaxKind["FirstJSDocTagNode"] = 300] = "FirstJSDocTagNode";
+        SyntaxKind[SyntaxKind["LastJSDocTagNode"] = 312] = "LastJSDocTagNode";
+        /* @internal */ SyntaxKind[SyntaxKind["FirstContextualKeyword"] = 119] = "FirstContextualKeyword";
+        /* @internal */ SyntaxKind[SyntaxKind["LastContextualKeyword"] = 148] = "LastContextualKeyword";
     })(SyntaxKind = ts.SyntaxKind || (ts.SyntaxKind = {}));
     var NodeFlags;
     (function (NodeFlags) {
@@ -3113,6 +3271,8 @@ var ts;
         FlowFlags[FlowFlags["Shared"] = 1024] = "Shared";
         FlowFlags[FlowFlags["PreFinally"] = 2048] = "PreFinally";
         FlowFlags[FlowFlags["AfterFinally"] = 4096] = "AfterFinally";
+        /** @internal */
+        FlowFlags[FlowFlags["Cached"] = 8192] = "Cached";
         FlowFlags[FlowFlags["Label"] = 12] = "Label";
         FlowFlags[FlowFlags["Condition"] = 96] = "Condition";
     })(FlowFlags = ts.FlowFlags || (ts.FlowFlags = {}));
@@ -3140,6 +3300,8 @@ var ts;
         ExitStatus[ExitStatus["DiagnosticsPresent_OutputsSkipped"] = 1] = "DiagnosticsPresent_OutputsSkipped";
         // Diagnostics were produced and outputs were generated in spite of them.
         ExitStatus[ExitStatus["DiagnosticsPresent_OutputsGenerated"] = 2] = "DiagnosticsPresent_OutputsGenerated";
+        // When build skipped because passed in project is invalid
+        ExitStatus[ExitStatus["InvalidProject_OutputsSkipped"] = 3] = "InvalidProject_OutputsSkipped";
     })(ExitStatus = ts.ExitStatus || (ts.ExitStatus = {}));
     /* @internal */
     var UnionReduction;
@@ -3365,19 +3527,22 @@ var ts;
         CheckFlags[CheckFlags["SyntheticProperty"] = 2] = "SyntheticProperty";
         CheckFlags[CheckFlags["SyntheticMethod"] = 4] = "SyntheticMethod";
         CheckFlags[CheckFlags["Readonly"] = 8] = "Readonly";
-        CheckFlags[CheckFlags["Partial"] = 16] = "Partial";
-        CheckFlags[CheckFlags["HasNonUniformType"] = 32] = "HasNonUniformType";
-        CheckFlags[CheckFlags["HasLiteralType"] = 64] = "HasLiteralType";
-        CheckFlags[CheckFlags["ContainsPublic"] = 128] = "ContainsPublic";
-        CheckFlags[CheckFlags["ContainsProtected"] = 256] = "ContainsProtected";
-        CheckFlags[CheckFlags["ContainsPrivate"] = 512] = "ContainsPrivate";
-        CheckFlags[CheckFlags["ContainsStatic"] = 1024] = "ContainsStatic";
-        CheckFlags[CheckFlags["Late"] = 2048] = "Late";
-        CheckFlags[CheckFlags["ReverseMapped"] = 4096] = "ReverseMapped";
-        CheckFlags[CheckFlags["OptionalParameter"] = 8192] = "OptionalParameter";
-        CheckFlags[CheckFlags["RestParameter"] = 16384] = "RestParameter";
+        CheckFlags[CheckFlags["ReadPartial"] = 16] = "ReadPartial";
+        CheckFlags[CheckFlags["WritePartial"] = 32] = "WritePartial";
+        CheckFlags[CheckFlags["HasNonUniformType"] = 64] = "HasNonUniformType";
+        CheckFlags[CheckFlags["HasLiteralType"] = 128] = "HasLiteralType";
+        CheckFlags[CheckFlags["ContainsPublic"] = 256] = "ContainsPublic";
+        CheckFlags[CheckFlags["ContainsProtected"] = 512] = "ContainsProtected";
+        CheckFlags[CheckFlags["ContainsPrivate"] = 1024] = "ContainsPrivate";
+        CheckFlags[CheckFlags["ContainsStatic"] = 2048] = "ContainsStatic";
+        CheckFlags[CheckFlags["Late"] = 4096] = "Late";
+        CheckFlags[CheckFlags["ReverseMapped"] = 8192] = "ReverseMapped";
+        CheckFlags[CheckFlags["OptionalParameter"] = 16384] = "OptionalParameter";
+        CheckFlags[CheckFlags["RestParameter"] = 32768] = "RestParameter";
+        CheckFlags[CheckFlags["DeferredType"] = 65536] = "DeferredType";
         CheckFlags[CheckFlags["Synthetic"] = 6] = "Synthetic";
-        CheckFlags[CheckFlags["Discriminant"] = 96] = "Discriminant";
+        CheckFlags[CheckFlags["Discriminant"] = 192] = "Discriminant";
+        CheckFlags[CheckFlags["Partial"] = 48] = "Partial";
     })(CheckFlags = ts.CheckFlags || (ts.CheckFlags = {}));
     var InternalSymbolName;
     (function (InternalSymbolName) {
@@ -3487,7 +3652,9 @@ var ts;
         TypeFlags[TypeFlags["Instantiable"] = 63176704] = "Instantiable";
         TypeFlags[TypeFlags["StructuredOrInstantiable"] = 66846720] = "StructuredOrInstantiable";
         /* @internal */
-        TypeFlags[TypeFlags["ObjectFlagsType"] = 3768320] = "ObjectFlagsType";
+        TypeFlags[TypeFlags["ObjectFlagsType"] = 3899392] = "ObjectFlagsType";
+        /* @internal */
+        TypeFlags[TypeFlags["Simplifiable"] = 25165824] = "Simplifiable";
         // 'Narrowable' types are types where narrowing actually narrows.
         // This *should* be every type other than null, undefined, void, and never
         TypeFlags[TypeFlags["Narrowable"] = 133970943] = "Narrowable";
@@ -3496,7 +3663,7 @@ var ts;
         TypeFlags[TypeFlags["NotPrimitiveUnion"] = 66994211] = "NotPrimitiveUnion";
         // The following flags are aggregated during union and intersection type construction
         /* @internal */
-        TypeFlags[TypeFlags["IncludesMask"] = 1835007] = "IncludesMask";
+        TypeFlags[TypeFlags["IncludesMask"] = 68943871] = "IncludesMask";
         // The following flags are used for different purposes during union and intersection type construction
         /* @internal */
         TypeFlags[TypeFlags["IncludesStructuredOrInstantiable"] = 262144] = "IncludesStructuredOrInstantiable";
@@ -3528,29 +3695,34 @@ var ts;
         ObjectFlags[ObjectFlags["MarkerType"] = 8192] = "MarkerType";
         ObjectFlags[ObjectFlags["JSLiteral"] = 16384] = "JSLiteral";
         ObjectFlags[ObjectFlags["FreshLiteral"] = 32768] = "FreshLiteral";
+        ObjectFlags[ObjectFlags["ArrayLiteral"] = 65536] = "ArrayLiteral";
         /* @internal */
-        ObjectFlags[ObjectFlags["PrimitiveUnion"] = 65536] = "PrimitiveUnion";
+        ObjectFlags[ObjectFlags["PrimitiveUnion"] = 131072] = "PrimitiveUnion";
         /* @internal */
-        ObjectFlags[ObjectFlags["ContainsWideningType"] = 131072] = "ContainsWideningType";
+        ObjectFlags[ObjectFlags["ContainsWideningType"] = 262144] = "ContainsWideningType";
         /* @internal */
-        ObjectFlags[ObjectFlags["ContainsObjectLiteral"] = 262144] = "ContainsObjectLiteral";
+        ObjectFlags[ObjectFlags["ContainsObjectOrArrayLiteral"] = 524288] = "ContainsObjectOrArrayLiteral";
         /* @internal */
-        ObjectFlags[ObjectFlags["ContainsAnyFunctionType"] = 524288] = "ContainsAnyFunctionType";
+        ObjectFlags[ObjectFlags["NonInferrableType"] = 1048576] = "NonInferrableType";
         ObjectFlags[ObjectFlags["ClassOrInterface"] = 3] = "ClassOrInterface";
         /* @internal */
-        ObjectFlags[ObjectFlags["RequiresWidening"] = 393216] = "RequiresWidening";
+        ObjectFlags[ObjectFlags["RequiresWidening"] = 786432] = "RequiresWidening";
         /* @internal */
-        ObjectFlags[ObjectFlags["PropagatingFlags"] = 917504] = "PropagatingFlags";
+        ObjectFlags[ObjectFlags["PropagatingFlags"] = 1835008] = "PropagatingFlags";
     })(ObjectFlags = ts.ObjectFlags || (ts.ObjectFlags = {}));
     /* @internal */
-    var Variance;
-    (function (Variance) {
-        Variance[Variance["Invariant"] = 0] = "Invariant";
-        Variance[Variance["Covariant"] = 1] = "Covariant";
-        Variance[Variance["Contravariant"] = 2] = "Contravariant";
-        Variance[Variance["Bivariant"] = 3] = "Bivariant";
-        Variance[Variance["Independent"] = 4] = "Independent";
-    })(Variance = ts.Variance || (ts.Variance = {}));
+    var VarianceFlags;
+    (function (VarianceFlags) {
+        VarianceFlags[VarianceFlags["Invariant"] = 0] = "Invariant";
+        VarianceFlags[VarianceFlags["Covariant"] = 1] = "Covariant";
+        VarianceFlags[VarianceFlags["Contravariant"] = 2] = "Contravariant";
+        VarianceFlags[VarianceFlags["Bivariant"] = 3] = "Bivariant";
+        VarianceFlags[VarianceFlags["Independent"] = 4] = "Independent";
+        VarianceFlags[VarianceFlags["VarianceMask"] = 7] = "VarianceMask";
+        VarianceFlags[VarianceFlags["Unmeasurable"] = 8] = "Unmeasurable";
+        VarianceFlags[VarianceFlags["Unreliable"] = 16] = "Unreliable";
+        VarianceFlags[VarianceFlags["AllowsStructuralFallback"] = 24] = "AllowsStructuralFallback";
+    })(VarianceFlags = ts.VarianceFlags || (ts.VarianceFlags = {}));
     /* @internal */
     var JsxReferenceKind;
     (function (JsxReferenceKind) {
@@ -3572,12 +3744,13 @@ var ts;
     (function (InferencePriority) {
         InferencePriority[InferencePriority["NakedTypeVariable"] = 1] = "NakedTypeVariable";
         InferencePriority[InferencePriority["HomomorphicMappedType"] = 2] = "HomomorphicMappedType";
-        InferencePriority[InferencePriority["MappedTypeConstraint"] = 4] = "MappedTypeConstraint";
-        InferencePriority[InferencePriority["ReturnType"] = 8] = "ReturnType";
-        InferencePriority[InferencePriority["LiteralKeyof"] = 16] = "LiteralKeyof";
-        InferencePriority[InferencePriority["NoConstraints"] = 32] = "NoConstraints";
-        InferencePriority[InferencePriority["AlwaysStrict"] = 64] = "AlwaysStrict";
-        InferencePriority[InferencePriority["PriorityImpliesCombination"] = 28] = "PriorityImpliesCombination";
+        InferencePriority[InferencePriority["PartialHomomorphicMappedType"] = 4] = "PartialHomomorphicMappedType";
+        InferencePriority[InferencePriority["MappedTypeConstraint"] = 8] = "MappedTypeConstraint";
+        InferencePriority[InferencePriority["ReturnType"] = 16] = "ReturnType";
+        InferencePriority[InferencePriority["LiteralKeyof"] = 32] = "LiteralKeyof";
+        InferencePriority[InferencePriority["NoConstraints"] = 64] = "NoConstraints";
+        InferencePriority[InferencePriority["AlwaysStrict"] = 128] = "AlwaysStrict";
+        InferencePriority[InferencePriority["PriorityImpliesCombination"] = 56] = "PriorityImpliesCombination";
     })(InferencePriority = ts.InferencePriority || (ts.InferencePriority = {}));
     /* @internal */
     var InferenceFlags;
@@ -3585,8 +3758,7 @@ var ts;
         InferenceFlags[InferenceFlags["None"] = 0] = "None";
         InferenceFlags[InferenceFlags["NoDefault"] = 1] = "NoDefault";
         InferenceFlags[InferenceFlags["AnyDefault"] = 2] = "AnyDefault";
-        InferenceFlags[InferenceFlags["NoFixing"] = 4] = "NoFixing";
-        InferenceFlags[InferenceFlags["SkippedGenericFunction"] = 8] = "SkippedGenericFunction";
+        InferenceFlags[InferenceFlags["SkippedGenericFunction"] = 4] = "SkippedGenericFunction";
     })(InferenceFlags = ts.InferenceFlags || (ts.InferenceFlags = {}));
     /**
      * Ternary values are defined such that
@@ -3657,7 +3829,7 @@ var ts;
         ModuleKind[ModuleKind["UMD"] = 3] = "UMD";
         ModuleKind[ModuleKind["System"] = 4] = "System";
         ModuleKind[ModuleKind["ES2015"] = 5] = "ES2015";
-        ModuleKind[ModuleKind["ESNext"] = 6] = "ESNext";
+        ModuleKind[ModuleKind["ESNext"] = 99] = "ESNext";
     })(ModuleKind = ts.ModuleKind || (ts.ModuleKind = {}));
     var JsxEmit;
     (function (JsxEmit) {
@@ -3695,9 +3867,10 @@ var ts;
         ScriptTarget[ScriptTarget["ES2017"] = 4] = "ES2017";
         ScriptTarget[ScriptTarget["ES2018"] = 5] = "ES2018";
         ScriptTarget[ScriptTarget["ES2019"] = 6] = "ES2019";
-        ScriptTarget[ScriptTarget["ESNext"] = 7] = "ESNext";
+        ScriptTarget[ScriptTarget["ES2020"] = 7] = "ES2020";
+        ScriptTarget[ScriptTarget["ESNext"] = 99] = "ESNext";
         ScriptTarget[ScriptTarget["JSON"] = 100] = "JSON";
-        ScriptTarget[ScriptTarget["Latest"] = 7] = "Latest";
+        ScriptTarget[ScriptTarget["Latest"] = 99] = "Latest";
     })(ScriptTarget = ts.ScriptTarget || (ts.ScriptTarget = {}));
     var LanguageVariant;
     (function (LanguageVariant) {
@@ -3876,6 +4049,7 @@ var ts;
         TransformFlags[TransformFlags["ContainsYield"] = 131072] = "ContainsYield";
         TransformFlags[TransformFlags["ContainsHoistedDeclarationOrCompletion"] = 262144] = "ContainsHoistedDeclarationOrCompletion";
         TransformFlags[TransformFlags["ContainsDynamicImport"] = 524288] = "ContainsDynamicImport";
+        TransformFlags[TransformFlags["ContainsClassFields"] = 1048576] = "ContainsClassFields";
         // Please leave this as 1 << 29.
         // It is the maximum bit we can set before we outgrow the size of a v8 small integer (SMI) on an x86 system.
         // It is a good reminder of how much room we have left
@@ -3970,22 +4144,23 @@ var ts;
         ExternalEmitHelpers[ExternalEmitHelpers["Values"] = 256] = "Values";
         ExternalEmitHelpers[ExternalEmitHelpers["Read"] = 512] = "Read";
         ExternalEmitHelpers[ExternalEmitHelpers["Spread"] = 1024] = "Spread";
-        ExternalEmitHelpers[ExternalEmitHelpers["Await"] = 2048] = "Await";
-        ExternalEmitHelpers[ExternalEmitHelpers["AsyncGenerator"] = 4096] = "AsyncGenerator";
-        ExternalEmitHelpers[ExternalEmitHelpers["AsyncDelegator"] = 8192] = "AsyncDelegator";
-        ExternalEmitHelpers[ExternalEmitHelpers["AsyncValues"] = 16384] = "AsyncValues";
-        ExternalEmitHelpers[ExternalEmitHelpers["ExportStar"] = 32768] = "ExportStar";
-        ExternalEmitHelpers[ExternalEmitHelpers["MakeTemplateObject"] = 65536] = "MakeTemplateObject";
+        ExternalEmitHelpers[ExternalEmitHelpers["SpreadArrays"] = 2048] = "SpreadArrays";
+        ExternalEmitHelpers[ExternalEmitHelpers["Await"] = 4096] = "Await";
+        ExternalEmitHelpers[ExternalEmitHelpers["AsyncGenerator"] = 8192] = "AsyncGenerator";
+        ExternalEmitHelpers[ExternalEmitHelpers["AsyncDelegator"] = 16384] = "AsyncDelegator";
+        ExternalEmitHelpers[ExternalEmitHelpers["AsyncValues"] = 32768] = "AsyncValues";
+        ExternalEmitHelpers[ExternalEmitHelpers["ExportStar"] = 65536] = "ExportStar";
+        ExternalEmitHelpers[ExternalEmitHelpers["MakeTemplateObject"] = 131072] = "MakeTemplateObject";
         ExternalEmitHelpers[ExternalEmitHelpers["FirstEmitHelper"] = 1] = "FirstEmitHelper";
-        ExternalEmitHelpers[ExternalEmitHelpers["LastEmitHelper"] = 65536] = "LastEmitHelper";
+        ExternalEmitHelpers[ExternalEmitHelpers["LastEmitHelper"] = 131072] = "LastEmitHelper";
         // Helpers included by ES2015 for..of
         ExternalEmitHelpers[ExternalEmitHelpers["ForOfIncludes"] = 256] = "ForOfIncludes";
         // Helpers included by ES2017 for..await..of
-        ExternalEmitHelpers[ExternalEmitHelpers["ForAwaitOfIncludes"] = 16384] = "ForAwaitOfIncludes";
+        ExternalEmitHelpers[ExternalEmitHelpers["ForAwaitOfIncludes"] = 32768] = "ForAwaitOfIncludes";
         // Helpers included by ES2017 async generators
-        ExternalEmitHelpers[ExternalEmitHelpers["AsyncGeneratorIncludes"] = 6144] = "AsyncGeneratorIncludes";
+        ExternalEmitHelpers[ExternalEmitHelpers["AsyncGeneratorIncludes"] = 12288] = "AsyncGeneratorIncludes";
         // Helpers included by yield* in ES2017 async generators
-        ExternalEmitHelpers[ExternalEmitHelpers["AsyncDelegatorIncludes"] = 26624] = "AsyncDelegatorIncludes";
+        ExternalEmitHelpers[ExternalEmitHelpers["AsyncDelegatorIncludes"] = 53248] = "AsyncDelegatorIncludes";
         // Helpers included by ES2015 spread
         ExternalEmitHelpers[ExternalEmitHelpers["SpreadIncludes"] = 1536] = "SpreadIncludes";
     })(ExternalEmitHelpers = ts.ExternalEmitHelpers || (ts.ExternalEmitHelpers = {}));
@@ -4110,17 +4285,10 @@ var ts;
         PragmaKindFlags[PragmaKindFlags["All"] = 7] = "All";
         PragmaKindFlags[PragmaKindFlags["Default"] = 7] = "Default";
     })(PragmaKindFlags = ts.PragmaKindFlags || (ts.PragmaKindFlags = {}));
-    /**
-     * This function only exists to cause exact types to be inferred for all the literals within `commentPragmas`
-     */
-    /* @internal */
-    function _contextuallyTypePragmas(args) {
-        return args;
-    }
     // While not strictly a type, this is here because `PragmaMap` needs to be here to be used with `SourceFile`, and we don't
     //  fancy effectively defining it twice, once in value-space and once in type-space
     /* @internal */
-    ts.commentPragmas = _contextuallyTypePragmas({
+    ts.commentPragmas = {
         "reference": {
             args: [
                 { name: "types", optional: true, captureSpan: true },
@@ -4148,7 +4316,7 @@ var ts;
             args: [{ name: "factory" }],
             kind: 4 /* MultiLine */
         },
-    });
+    };
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
@@ -4158,8 +4326,11 @@ var ts;
      */
     /* @internal */
     function generateDjb2Hash(data) {
-        var chars = data.split("").map(function (str) { return str.charCodeAt(0); });
-        return "" + chars.reduce(function (prev, curr) { return ((prev << 5) + prev) + curr; }, 5381);
+        var acc = 5381;
+        for (var i = 0; i < data.length; i++) {
+            acc = ((acc << 5) + acc) + data.charCodeAt(i);
+        }
+        return acc.toString();
     }
     ts.generateDjb2Hash = generateDjb2Hash;
     /**
@@ -4420,7 +4591,7 @@ var ts;
     }
     ts.getFileWatcherEventKind = getFileWatcherEventKind;
     /*@internal*/
-    ts.ignoredPaths = ["/node_modules/.", "/.git"];
+    ts.ignoredPaths = ["/node_modules/.", "/.git", "/.#"];
     /**
      * Watch the directory recursively using host provided method to watch child directories
      * that means if this is recursive watcher, watch the children directories as well
@@ -5006,7 +5177,7 @@ var ts;
                 }
             }
             function readDirectory(path, extensions, excludes, includes, depth) {
-                return ts.matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, process.cwd(), depth, getAccessibleFileSystemEntries);
+                return ts.matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, process.cwd(), depth, getAccessibleFileSystemEntries, realpath);
             }
             function fileSystemEntryExists(path, entryKind) {
                 try {
@@ -5192,7 +5363,7 @@ var ts;
         _0_modifier_cannot_appear_on_a_data_property: diag(1043, ts.DiagnosticCategory.Error, "_0_modifier_cannot_appear_on_a_data_property_1043", "'{0}' modifier cannot appear on a data property."),
         _0_modifier_cannot_appear_on_a_module_or_namespace_element: diag(1044, ts.DiagnosticCategory.Error, "_0_modifier_cannot_appear_on_a_module_or_namespace_element_1044", "'{0}' modifier cannot appear on a module or namespace element."),
         A_0_modifier_cannot_be_used_with_an_interface_declaration: diag(1045, ts.DiagnosticCategory.Error, "A_0_modifier_cannot_be_used_with_an_interface_declaration_1045", "A '{0}' modifier cannot be used with an interface declaration."),
-        A_declare_modifier_is_required_for_a_top_level_declaration_in_a_d_ts_file: diag(1046, ts.DiagnosticCategory.Error, "A_declare_modifier_is_required_for_a_top_level_declaration_in_a_d_ts_file_1046", "A 'declare' modifier is required for a top level declaration in a .d.ts file."),
+        Top_level_declarations_in_d_ts_files_must_start_with_either_a_declare_or_export_modifier: diag(1046, ts.DiagnosticCategory.Error, "Top_level_declarations_in_d_ts_files_must_start_with_either_a_declare_or_export_modifier_1046", "Top-level declarations in .d.ts files must start with either a 'declare' or 'export' modifier."),
         A_rest_parameter_cannot_be_optional: diag(1047, ts.DiagnosticCategory.Error, "A_rest_parameter_cannot_be_optional_1047", "A rest parameter cannot be optional."),
         A_rest_parameter_cannot_have_an_initializer: diag(1048, ts.DiagnosticCategory.Error, "A_rest_parameter_cannot_have_an_initializer_1048", "A rest parameter cannot have an initializer."),
         A_set_accessor_must_have_exactly_one_parameter: diag(1049, ts.DiagnosticCategory.Error, "A_set_accessor_must_have_exactly_one_parameter_1049", "A 'set' accessor must have exactly one parameter."),
@@ -5321,7 +5492,7 @@ var ts;
         Cannot_re_export_a_type_when_the_isolatedModules_flag_is_provided: diag(1205, ts.DiagnosticCategory.Error, "Cannot_re_export_a_type_when_the_isolatedModules_flag_is_provided_1205", "Cannot re-export a type when the '--isolatedModules' flag is provided."),
         Decorators_are_not_valid_here: diag(1206, ts.DiagnosticCategory.Error, "Decorators_are_not_valid_here_1206", "Decorators are not valid here."),
         Decorators_cannot_be_applied_to_multiple_get_Slashset_accessors_of_the_same_name: diag(1207, ts.DiagnosticCategory.Error, "Decorators_cannot_be_applied_to_multiple_get_Slashset_accessors_of_the_same_name_1207", "Decorators cannot be applied to multiple get/set accessors of the same name."),
-        Cannot_compile_namespaces_when_the_isolatedModules_flag_is_provided: diag(1208, ts.DiagnosticCategory.Error, "Cannot_compile_namespaces_when_the_isolatedModules_flag_is_provided_1208", "Cannot compile namespaces when the '--isolatedModules' flag is provided."),
+        All_files_must_be_modules_when_the_isolatedModules_flag_is_provided: diag(1208, ts.DiagnosticCategory.Error, "All_files_must_be_modules_when_the_isolatedModules_flag_is_provided_1208", "All files must be modules when the '--isolatedModules' flag is provided."),
         Invalid_use_of_0_Class_definitions_are_automatically_in_strict_mode: diag(1210, ts.DiagnosticCategory.Error, "Invalid_use_of_0_Class_definitions_are_automatically_in_strict_mode_1210", "Invalid use of '{0}'. Class definitions are automatically in strict mode."),
         A_class_declaration_without_the_default_modifier_must_have_a_name: diag(1211, ts.DiagnosticCategory.Error, "A_class_declaration_without_the_default_modifier_must_have_a_name_1211", "A class declaration without the 'default' modifier must have a name."),
         Identifier_expected_0_is_a_reserved_word_in_strict_mode: diag(1212, ts.DiagnosticCategory.Error, "Identifier_expected_0_is_a_reserved_word_in_strict_mode_1212", "Identifier expected. '{0}' is a reserved word in strict mode."),
@@ -5330,7 +5501,7 @@ var ts;
         Invalid_use_of_0_Modules_are_automatically_in_strict_mode: diag(1215, ts.DiagnosticCategory.Error, "Invalid_use_of_0_Modules_are_automatically_in_strict_mode_1215", "Invalid use of '{0}'. Modules are automatically in strict mode."),
         Identifier_expected_esModule_is_reserved_as_an_exported_marker_when_transforming_ECMAScript_modules: diag(1216, ts.DiagnosticCategory.Error, "Identifier_expected_esModule_is_reserved_as_an_exported_marker_when_transforming_ECMAScript_modules_1216", "Identifier expected. '__esModule' is reserved as an exported marker when transforming ECMAScript modules."),
         Export_assignment_is_not_supported_when_module_flag_is_system: diag(1218, ts.DiagnosticCategory.Error, "Export_assignment_is_not_supported_when_module_flag_is_system_1218", "Export assignment is not supported when '--module' flag is 'system'."),
-        Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_to_remove_this_warning: diag(1219, ts.DiagnosticCategory.Error, "Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_t_1219", "Experimental support for decorators is a feature that is subject to change in a future release. Set the 'experimentalDecorators' option to remove this warning."),
+        Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_in_your_tsconfig_or_jsconfig_to_remove_this_warning: diag(1219, ts.DiagnosticCategory.Error, "Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_t_1219", "Experimental support for decorators is a feature that is subject to change in a future release. Set the 'experimentalDecorators' option in your 'tsconfig' or 'jsconfig' to remove this warning."),
         Generators_are_only_available_when_targeting_ECMAScript_2015_or_higher: diag(1220, ts.DiagnosticCategory.Error, "Generators_are_only_available_when_targeting_ECMAScript_2015_or_higher_1220", "Generators are only available when targeting ECMAScript 2015 or higher."),
         Generators_are_not_allowed_in_an_ambient_context: diag(1221, ts.DiagnosticCategory.Error, "Generators_are_not_allowed_in_an_ambient_context_1221", "Generators are not allowed in an ambient context."),
         An_overload_signature_cannot_be_declared_as_a_generator: diag(1222, ts.DiagnosticCategory.Error, "An_overload_signature_cannot_be_declared_as_a_generator_1222", "An overload signature cannot be declared as a generator."),
@@ -5369,6 +5540,8 @@ var ts;
         A_definite_assignment_assertion_is_not_permitted_in_this_context: diag(1255, ts.DiagnosticCategory.Error, "A_definite_assignment_assertion_is_not_permitted_in_this_context_1255", "A definite assignment assertion '!' is not permitted in this context."),
         A_rest_element_must_be_last_in_a_tuple_type: diag(1256, ts.DiagnosticCategory.Error, "A_rest_element_must_be_last_in_a_tuple_type_1256", "A rest element must be last in a tuple type."),
         A_required_element_cannot_follow_an_optional_element: diag(1257, ts.DiagnosticCategory.Error, "A_required_element_cannot_follow_an_optional_element_1257", "A required element cannot follow an optional element."),
+        Definite_assignment_assertions_can_only_be_used_along_with_a_type_annotation: diag(1258, ts.DiagnosticCategory.Error, "Definite_assignment_assertions_can_only_be_used_along_with_a_type_annotation_1258", "Definite assignment assertions can only be used along with a type annotation."),
+        Module_0_can_only_be_default_imported_using_the_1_flag: diag(1259, ts.DiagnosticCategory.Error, "Module_0_can_only_be_default_imported_using_the_1_flag_1259", "Module '{0}' can only be default-imported using the '{1}' flag"),
         with_statements_are_not_allowed_in_an_async_function_block: diag(1300, ts.DiagnosticCategory.Error, "with_statements_are_not_allowed_in_an_async_function_block_1300", "'with' statements are not allowed in an async function block."),
         await_expression_is_only_allowed_within_an_async_function: diag(1308, ts.DiagnosticCategory.Error, "await_expression_is_only_allowed_within_an_async_function_1308", "'await' expression is only allowed within an async function."),
         can_only_be_used_in_an_object_literal_property_inside_a_destructuring_assignment: diag(1312, ts.DiagnosticCategory.Error, "can_only_be_used_in_an_object_literal_property_inside_a_destructuring_assignment_1312", "'=' can only be used in an object literal property inside a destructuring assignment."),
@@ -5413,7 +5586,8 @@ var ts;
         A_bigint_literal_cannot_use_exponential_notation: diag(1352, ts.DiagnosticCategory.Error, "A_bigint_literal_cannot_use_exponential_notation_1352", "A bigint literal cannot use exponential notation."),
         A_bigint_literal_must_be_an_integer: diag(1353, ts.DiagnosticCategory.Error, "A_bigint_literal_must_be_an_integer_1353", "A bigint literal must be an integer."),
         readonly_type_modifier_is_only_permitted_on_array_and_tuple_literal_types: diag(1354, ts.DiagnosticCategory.Error, "readonly_type_modifier_is_only_permitted_on_array_and_tuple_literal_types_1354", "'readonly' type modifier is only permitted on array and tuple literal types."),
-        A_const_assertion_can_only_be_applied_to_a_string_number_boolean_array_or_object_literal: diag(1355, ts.DiagnosticCategory.Error, "A_const_assertion_can_only_be_applied_to_a_string_number_boolean_array_or_object_literal_1355", "A 'const' assertion can only be applied to a string, number, boolean, array, or object literal."),
+        A_const_assertions_can_only_be_applied_to_references_to_enum_members_or_string_number_boolean_array_or_object_literals: diag(1355, ts.DiagnosticCategory.Error, "A_const_assertions_can_only_be_applied_to_references_to_enum_members_or_string_number_boolean_array__1355", "A 'const' assertions can only be applied to references to enum members, or string, number, boolean, array, or object literals."),
+        Did_you_mean_to_mark_this_function_as_async: diag(1356, ts.DiagnosticCategory.Error, "Did_you_mean_to_mark_this_function_as_async_1356", "Did you mean to mark this function as 'async'?"),
         Duplicate_identifier_0: diag(2300, ts.DiagnosticCategory.Error, "Duplicate_identifier_0_2300", "Duplicate identifier '{0}'."),
         Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor: diag(2301, ts.DiagnosticCategory.Error, "Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor_2301", "Initializer of instance member variable '{0}' cannot reference identifier '{1}' declared in the constructor."),
         Static_members_cannot_reference_class_type_parameters: diag(2302, ts.DiagnosticCategory.Error, "Static_members_cannot_reference_class_type_parameters_2302", "Static members cannot reference class type parameters."),
@@ -5463,9 +5637,9 @@ var ts;
         Call_target_does_not_contain_any_signatures: diag(2346, ts.DiagnosticCategory.Error, "Call_target_does_not_contain_any_signatures_2346", "Call target does not contain any signatures."),
         Untyped_function_calls_may_not_accept_type_arguments: diag(2347, ts.DiagnosticCategory.Error, "Untyped_function_calls_may_not_accept_type_arguments_2347", "Untyped function calls may not accept type arguments."),
         Value_of_type_0_is_not_callable_Did_you_mean_to_include_new: diag(2348, ts.DiagnosticCategory.Error, "Value_of_type_0_is_not_callable_Did_you_mean_to_include_new_2348", "Value of type '{0}' is not callable. Did you mean to include 'new'?"),
-        Cannot_invoke_an_expression_whose_type_lacks_a_call_signature_Type_0_has_no_compatible_call_signatures: diag(2349, ts.DiagnosticCategory.Error, "Cannot_invoke_an_expression_whose_type_lacks_a_call_signature_Type_0_has_no_compatible_call_signatur_2349", "Cannot invoke an expression whose type lacks a call signature. Type '{0}' has no compatible call signatures."),
+        This_expression_is_not_callable: diag(2349, ts.DiagnosticCategory.Error, "This_expression_is_not_callable_2349", "This expression is not callable."),
         Only_a_void_function_can_be_called_with_the_new_keyword: diag(2350, ts.DiagnosticCategory.Error, "Only_a_void_function_can_be_called_with_the_new_keyword_2350", "Only a void function can be called with the 'new' keyword."),
-        Cannot_use_new_with_an_expression_whose_type_lacks_a_call_or_construct_signature: diag(2351, ts.DiagnosticCategory.Error, "Cannot_use_new_with_an_expression_whose_type_lacks_a_call_or_construct_signature_2351", "Cannot use 'new' with an expression whose type lacks a call or construct signature."),
+        This_expression_is_not_constructable: diag(2351, ts.DiagnosticCategory.Error, "This_expression_is_not_constructable_2351", "This expression is not constructable."),
         Conversion_of_type_0_to_type_1_may_be_a_mistake_because_neither_type_sufficiently_overlaps_with_the_other_If_this_was_intentional_convert_the_expression_to_unknown_first: diag(2352, ts.DiagnosticCategory.Error, "Conversion_of_type_0_to_type_1_may_be_a_mistake_because_neither_type_sufficiently_overlaps_with_the__2352", "Conversion of type '{0}' to type '{1}' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first."),
         Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1: diag(2353, ts.DiagnosticCategory.Error, "Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1_2353", "Object literal may only specify known properties, and '{0}' does not exist in type '{1}'."),
         This_syntax_requires_an_imported_helper_but_module_0_cannot_be_found: diag(2354, ts.DiagnosticCategory.Error, "This_syntax_requires_an_imported_helper_but_module_0_cannot_be_found_2354", "This syntax requires an imported helper but module '{0}' cannot be found."),
@@ -5595,7 +5769,7 @@ var ts;
         The_left_hand_side_of_a_for_of_statement_must_be_a_variable_or_a_property_access: diag(2487, ts.DiagnosticCategory.Error, "The_left_hand_side_of_a_for_of_statement_must_be_a_variable_or_a_property_access_2487", "The left-hand side of a 'for...of' statement must be a variable or a property access."),
         Type_0_must_have_a_Symbol_iterator_method_that_returns_an_iterator: diag(2488, ts.DiagnosticCategory.Error, "Type_0_must_have_a_Symbol_iterator_method_that_returns_an_iterator_2488", "Type '{0}' must have a '[Symbol.iterator]()' method that returns an iterator."),
         An_iterator_must_have_a_next_method: diag(2489, ts.DiagnosticCategory.Error, "An_iterator_must_have_a_next_method_2489", "An iterator must have a 'next()' method."),
-        The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property: diag(2490, ts.DiagnosticCategory.Error, "The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property_2490", "The type returned by the 'next()' method of an iterator must have a 'value' property."),
+        The_type_returned_by_the_0_method_of_an_iterator_must_have_a_value_property: diag(2490, ts.DiagnosticCategory.Error, "The_type_returned_by_the_0_method_of_an_iterator_must_have_a_value_property_2490", "The type returned by the '{0}()' method of an iterator must have a 'value' property."),
         The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern: diag(2491, ts.DiagnosticCategory.Error, "The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern_2491", "The left-hand side of a 'for...in' statement cannot be a destructuring pattern."),
         Cannot_redeclare_identifier_0_in_catch_clause: diag(2492, ts.DiagnosticCategory.Error, "Cannot_redeclare_identifier_0_in_catch_clause_2492", "Cannot redeclare identifier '{0}' in catch clause."),
         Tuple_type_0_of_length_1_has_no_element_at_index_2: diag(2493, ts.DiagnosticCategory.Error, "Tuple_type_0_of_length_1_has_no_element_at_index_2_2493", "Tuple type '{0}' of length '{1}' has no element at index '{2}'."),
@@ -5652,7 +5826,7 @@ var ts;
         Expression_resolves_to_variable_declaration_newTarget_that_compiler_uses_to_capture_new_target_meta_property_reference: diag(2544, ts.DiagnosticCategory.Error, "Expression_resolves_to_variable_declaration_newTarget_that_compiler_uses_to_capture_new_target_meta__2544", "Expression resolves to variable declaration '_newTarget' that compiler uses to capture 'new.target' meta-property reference."),
         A_mixin_class_must_have_a_constructor_with_a_single_rest_parameter_of_type_any: diag(2545, ts.DiagnosticCategory.Error, "A_mixin_class_must_have_a_constructor_with_a_single_rest_parameter_of_type_any_2545", "A mixin class must have a constructor with a single rest parameter of type 'any[]'."),
         Property_0_has_conflicting_declarations_and_is_inaccessible_in_type_1: diag(2546, ts.DiagnosticCategory.Error, "Property_0_has_conflicting_declarations_and_is_inaccessible_in_type_1_2546", "Property '{0}' has conflicting declarations and is inaccessible in type '{1}'."),
-        The_type_returned_by_the_next_method_of_an_async_iterator_must_be_a_promise_for_a_type_with_a_value_property: diag(2547, ts.DiagnosticCategory.Error, "The_type_returned_by_the_next_method_of_an_async_iterator_must_be_a_promise_for_a_type_with_a_value__2547", "The type returned by the 'next()' method of an async iterator must be a promise for a type with a 'value' property."),
+        The_type_returned_by_the_0_method_of_an_async_iterator_must_be_a_promise_for_a_type_with_a_value_property: diag(2547, ts.DiagnosticCategory.Error, "The_type_returned_by_the_0_method_of_an_async_iterator_must_be_a_promise_for_a_type_with_a_value_pro_2547", "The type returned by the '{0}()' method of an async iterator must be a promise for a type with a 'value' property."),
         Type_0_is_not_an_array_type_or_does_not_have_a_Symbol_iterator_method_that_returns_an_iterator: diag(2548, ts.DiagnosticCategory.Error, "Type_0_is_not_an_array_type_or_does_not_have_a_Symbol_iterator_method_that_returns_an_iterator_2548", "Type '{0}' is not an array type or does not have a '[Symbol.iterator]()' method that returns an iterator."),
         Type_0_is_not_an_array_type_or_a_string_type_or_does_not_have_a_Symbol_iterator_method_that_returns_an_iterator: diag(2549, ts.DiagnosticCategory.Error, "Type_0_is_not_an_array_type_or_a_string_type_or_does_not_have_a_Symbol_iterator_method_that_returns__2549", "Type '{0}' is not an array type or a string type or does not have a '[Symbol.iterator]()' method that returns an iterator."),
         Property_0_does_not_exist_on_type_1_Did_you_mean_2: diag(2551, ts.DiagnosticCategory.Error, "Property_0_does_not_exist_on_type_1_Did_you_mean_2_2551", "Property '{0}' does not exist on type '{1}'. Did you mean '{2}'?"),
@@ -5673,7 +5847,6 @@ var ts;
         A_rest_element_cannot_have_a_property_name: diag(2566, ts.DiagnosticCategory.Error, "A_rest_element_cannot_have_a_property_name_2566", "A rest element cannot have a property name."),
         Enum_declarations_can_only_merge_with_namespace_or_other_enum_declarations: diag(2567, ts.DiagnosticCategory.Error, "Enum_declarations_can_only_merge_with_namespace_or_other_enum_declarations_2567", "Enum declarations can only merge with namespace or other enum declarations."),
         Type_0_is_not_an_array_type_or_a_string_type_Use_compiler_option_downlevelIteration_to_allow_iterating_of_iterators: diag(2569, ts.DiagnosticCategory.Error, "Type_0_is_not_an_array_type_or_a_string_type_Use_compiler_option_downlevelIteration_to_allow_iterati_2569", "Type '{0}' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators."),
-        Property_0_does_not_exist_on_type_1_Did_you_forget_to_use_await: diag(2570, ts.DiagnosticCategory.Error, "Property_0_does_not_exist_on_type_1_Did_you_forget_to_use_await_2570", "Property '{0}' does not exist on type '{1}'. Did you forget to use 'await'?"),
         Object_is_of_type_unknown: diag(2571, ts.DiagnosticCategory.Error, "Object_is_of_type_unknown_2571", "Object is of type 'unknown'."),
         Rest_signatures_are_incompatible: diag(2572, ts.DiagnosticCategory.Error, "Rest_signatures_are_incompatible_2572", "Rest signatures are incompatible."),
         Property_0_is_incompatible_with_rest_element_type: diag(2573, ts.DiagnosticCategory.Error, "Property_0_is_incompatible_with_rest_element_type_2573", "Property '{0}' is incompatible with rest element type."),
@@ -5695,6 +5868,7 @@ var ts;
         Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_node_Try_npm_i_types_Slashnode_and_then_add_node_to_the_types_field_in_your_tsconfig: diag(2591, ts.DiagnosticCategory.Error, "Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_node_Try_npm_i_types_Slashnode_and_th_2591", "Cannot find name '{0}'. Do you need to install type definitions for node? Try `npm i @types/node` and then add `node` to the types field in your tsconfig."),
         Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_jQuery_Try_npm_i_types_Slashjquery_and_then_add_jquery_to_the_types_field_in_your_tsconfig: diag(2592, ts.DiagnosticCategory.Error, "Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_jQuery_Try_npm_i_types_Slashjquery_an_2592", "Cannot find name '{0}'. Do you need to install type definitions for jQuery? Try `npm i @types/jquery` and then add `jquery` to the types field in your tsconfig."),
         Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_a_test_runner_Try_npm_i_types_Slashjest_or_npm_i_types_Slashmocha_and_then_add_jest_or_mocha_to_the_types_field_in_your_tsconfig: diag(2593, ts.DiagnosticCategory.Error, "Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_a_test_runner_Try_npm_i_types_Slashje_2593", "Cannot find name '{0}'. Do you need to install type definitions for a test runner? Try `npm i @types/jest` or `npm i @types/mocha` and then add `jest` or `mocha` to the types field in your tsconfig."),
+        This_module_is_declared_with_using_export_and_can_only_be_used_with_a_default_import_when_using_the_0_flag: diag(2594, ts.DiagnosticCategory.Error, "This_module_is_declared_with_using_export_and_can_only_be_used_with_a_default_import_when_using_the__2594", "This module is declared with using 'export =', and can only be used with a default import when using the '{0}' flag."),
         JSX_element_attributes_type_0_may_not_be_a_union_type: diag(2600, ts.DiagnosticCategory.Error, "JSX_element_attributes_type_0_may_not_be_a_union_type_2600", "JSX element attributes type '{0}' may not be a union type."),
         The_return_type_of_a_JSX_element_constructor_must_return_an_object_type: diag(2601, ts.DiagnosticCategory.Error, "The_return_type_of_a_JSX_element_constructor_must_return_an_object_type_2601", "The return type of a JSX element constructor must return an object type."),
         JSX_element_implicitly_has_type_any_because_the_global_type_JSX_Element_does_not_exist: diag(2602, ts.DiagnosticCategory.Error, "JSX_element_implicitly_has_type_any_because_the_global_type_JSX_Element_does_not_exist_2602", "JSX element implicitly has type 'any' because the global type 'JSX.Element' does not exist."),
@@ -5805,6 +5979,28 @@ var ts;
         _0_refers_to_a_value_but_is_being_used_as_a_type_here: diag(2749, ts.DiagnosticCategory.Error, "_0_refers_to_a_value_but_is_being_used_as_a_type_here_2749", "'{0}' refers to a value, but is being used as a type here."),
         The_implementation_signature_is_declared_here: diag(2750, ts.DiagnosticCategory.Error, "The_implementation_signature_is_declared_here_2750", "The implementation signature is declared here."),
         Circularity_originates_in_type_at_this_location: diag(2751, ts.DiagnosticCategory.Error, "Circularity_originates_in_type_at_this_location_2751", "Circularity originates in type at this location."),
+        The_first_export_default_is_here: diag(2752, ts.DiagnosticCategory.Error, "The_first_export_default_is_here_2752", "The first export default is here."),
+        Another_export_default_is_here: diag(2753, ts.DiagnosticCategory.Error, "Another_export_default_is_here_2753", "Another export default is here."),
+        super_may_not_use_type_arguments: diag(2754, ts.DiagnosticCategory.Error, "super_may_not_use_type_arguments_2754", "'super' may not use type arguments."),
+        No_constituent_of_type_0_is_callable: diag(2755, ts.DiagnosticCategory.Error, "No_constituent_of_type_0_is_callable_2755", "No constituent of type '{0}' is callable."),
+        Not_all_constituents_of_type_0_are_callable: diag(2756, ts.DiagnosticCategory.Error, "Not_all_constituents_of_type_0_are_callable_2756", "Not all constituents of type '{0}' are callable."),
+        Type_0_has_no_call_signatures: diag(2757, ts.DiagnosticCategory.Error, "Type_0_has_no_call_signatures_2757", "Type '{0}' has no call signatures."),
+        Each_member_of_the_union_type_0_has_signatures_but_none_of_those_signatures_are_compatible_with_each_other: diag(2758, ts.DiagnosticCategory.Error, "Each_member_of_the_union_type_0_has_signatures_but_none_of_those_signatures_are_compatible_with_each_2758", "Each member of the union type '{0}' has signatures, but none of those signatures are compatible with each other."),
+        No_constituent_of_type_0_is_constructable: diag(2759, ts.DiagnosticCategory.Error, "No_constituent_of_type_0_is_constructable_2759", "No constituent of type '{0}' is constructable."),
+        Not_all_constituents_of_type_0_are_constructable: diag(2760, ts.DiagnosticCategory.Error, "Not_all_constituents_of_type_0_are_constructable_2760", "Not all constituents of type '{0}' are constructable."),
+        Type_0_has_no_construct_signatures: diag(2761, ts.DiagnosticCategory.Error, "Type_0_has_no_construct_signatures_2761", "Type '{0}' has no construct signatures."),
+        Each_member_of_the_union_type_0_has_construct_signatures_but_none_of_those_signatures_are_compatible_with_each_other: diag(2762, ts.DiagnosticCategory.Error, "Each_member_of_the_union_type_0_has_construct_signatures_but_none_of_those_signatures_are_compatible_2762", "Each member of the union type '{0}' has construct signatures, but none of those signatures are compatible with each other."),
+        Cannot_iterate_value_because_the_next_method_of_its_iterator_expects_type_1_but_for_of_will_always_send_0: diag(2763, ts.DiagnosticCategory.Error, "Cannot_iterate_value_because_the_next_method_of_its_iterator_expects_type_1_but_for_of_will_always_s_2763", "Cannot iterate value because the 'next' method of its iterator expects type '{1}', but for-of will always send '{0}'."),
+        Cannot_iterate_value_because_the_next_method_of_its_iterator_expects_type_1_but_array_spread_will_always_send_0: diag(2764, ts.DiagnosticCategory.Error, "Cannot_iterate_value_because_the_next_method_of_its_iterator_expects_type_1_but_array_spread_will_al_2764", "Cannot iterate value because the 'next' method of its iterator expects type '{1}', but array spread will always send '{0}'."),
+        Cannot_iterate_value_because_the_next_method_of_its_iterator_expects_type_1_but_array_destructuring_will_always_send_0: diag(2765, ts.DiagnosticCategory.Error, "Cannot_iterate_value_because_the_next_method_of_its_iterator_expects_type_1_but_array_destructuring__2765", "Cannot iterate value because the 'next' method of its iterator expects type '{1}', but array destructuring will always send '{0}'."),
+        Cannot_delegate_iteration_to_value_because_the_next_method_of_its_iterator_expects_type_1_but_the_containing_generator_will_always_send_0: diag(2766, ts.DiagnosticCategory.Error, "Cannot_delegate_iteration_to_value_because_the_next_method_of_its_iterator_expects_type_1_but_the_co_2766", "Cannot delegate iteration to value because the 'next' method of its iterator expects type '{1}', but the containing generator will always send '{0}'."),
+        The_0_property_of_an_iterator_must_be_a_method: diag(2767, ts.DiagnosticCategory.Error, "The_0_property_of_an_iterator_must_be_a_method_2767", "The '{0}' property of an iterator must be a method."),
+        The_0_property_of_an_async_iterator_must_be_a_method: diag(2768, ts.DiagnosticCategory.Error, "The_0_property_of_an_async_iterator_must_be_a_method_2768", "The '{0}' property of an async iterator must be a method."),
+        No_overload_matches_this_call: diag(2769, ts.DiagnosticCategory.Error, "No_overload_matches_this_call_2769", "No overload matches this call."),
+        The_last_overload_gave_the_following_error: diag(2770, ts.DiagnosticCategory.Error, "The_last_overload_gave_the_following_error_2770", "The last overload gave the following error."),
+        The_last_overload_is_declared_here: diag(2771, ts.DiagnosticCategory.Error, "The_last_overload_is_declared_here_2771", "The last overload is declared here."),
+        Overload_0_of_1_2_gave_the_following_error: diag(2772, ts.DiagnosticCategory.Error, "Overload_0_of_1_2_gave_the_following_error_2772", "Overload {0} of {1}, '{2}', gave the following error."),
+        Did_you_forget_to_use_await: diag(2773, ts.DiagnosticCategory.Error, "Did_you_forget_to_use_await_2773", "Did you forget to use 'await'?"),
         Import_declaration_0_is_using_private_name_1: diag(4000, ts.DiagnosticCategory.Error, "Import_declaration_0_is_using_private_name_1_4000", "Import declaration '{0}' is using private name '{1}'."),
         Type_parameter_0_of_exported_class_has_or_is_using_private_name_1: diag(4002, ts.DiagnosticCategory.Error, "Type_parameter_0_of_exported_class_has_or_is_using_private_name_1_4002", "Type parameter '{0}' of exported class has or is using private name '{1}'."),
         Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1: diag(4004, ts.DiagnosticCategory.Error, "Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1_4004", "Type parameter '{0}' of exported interface has or is using private name '{1}'."),
@@ -5889,6 +6085,8 @@ var ts;
         Method_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2: diag(4101, ts.DiagnosticCategory.Error, "Method_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2_4101", "Method '{0}' of exported interface has or is using name '{1}' from private module '{2}'."),
         Method_0_of_exported_interface_has_or_is_using_private_name_1: diag(4102, ts.DiagnosticCategory.Error, "Method_0_of_exported_interface_has_or_is_using_private_name_1_4102", "Method '{0}' of exported interface has or is using private name '{1}'."),
         Type_parameter_0_of_exported_mapped_object_type_is_using_private_name_1: diag(4103, ts.DiagnosticCategory.Error, "Type_parameter_0_of_exported_mapped_object_type_is_using_private_name_1_4103", "Type parameter '{0}' of exported mapped object type is using private name '{1}'."),
+        The_type_0_is_readonly_and_cannot_be_assigned_to_the_mutable_type_1: diag(4104, ts.DiagnosticCategory.Error, "The_type_0_is_readonly_and_cannot_be_assigned_to_the_mutable_type_1_4104", "The type '{0}' is 'readonly' and cannot be assigned to the mutable type '{1}'."),
+        Private_or_protected_member_0_cannot_be_accessed_on_a_type_parameter: diag(4105, ts.DiagnosticCategory.Error, "Private_or_protected_member_0_cannot_be_accessed_on_a_type_parameter_4105", "Private or protected member '{0}' cannot be accessed on a type parameter."),
         The_current_host_does_not_support_the_0_option: diag(5001, ts.DiagnosticCategory.Error, "The_current_host_does_not_support_the_0_option_5001", "The current host does not support the '{0}' option."),
         Cannot_find_the_common_subdirectory_path_for_the_input_files: diag(5009, ts.DiagnosticCategory.Error, "Cannot_find_the_common_subdirectory_path_for_the_input_files_5009", "Cannot find the common subdirectory path for the input files."),
         File_specification_cannot_end_in_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0: diag(5010, ts.DiagnosticCategory.Error, "File_specification_cannot_end_in_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0_5010", "File specification cannot end in a recursive directory wildcard ('**'): '{0}'."),
@@ -5922,6 +6120,8 @@ var ts;
         Option_resolveJsonModule_can_only_be_specified_when_module_code_generation_is_commonjs_amd_es2015_or_esNext: diag(5071, ts.DiagnosticCategory.Error, "Option_resolveJsonModule_can_only_be_specified_when_module_code_generation_is_commonjs_amd_es2015_or_5071", "Option '--resolveJsonModule' can only be specified when module code generation is 'commonjs', 'amd', 'es2015' or 'esNext'."),
         Unknown_build_option_0: diag(5072, ts.DiagnosticCategory.Error, "Unknown_build_option_0_5072", "Unknown build option '{0}'."),
         Build_option_0_requires_a_value_of_type_1: diag(5073, ts.DiagnosticCategory.Error, "Build_option_0_requires_a_value_of_type_1_5073", "Build option '{0}' requires a value of type {1}."),
+        Option_incremental_can_only_be_specified_using_tsconfig_emitting_to_single_file_or_when_option_tsBuildInfoFile_is_specified: diag(5074, ts.DiagnosticCategory.Error, "Option_incremental_can_only_be_specified_using_tsconfig_emitting_to_single_file_or_when_option_tsBui_5074", "Option '--incremental' can only be specified using tsconfig, emitting to single file or when option `--tsBuildInfoFile` is specified."),
+        _0_is_assignable_to_the_constraint_of_type_1_but_1_could_be_instantiated_with_a_different_subtype_of_constraint_2: diag(5075, ts.DiagnosticCategory.Error, "_0_is_assignable_to_the_constraint_of_type_1_but_1_could_be_instantiated_with_a_different_subtype_of_5075", "'{0}' is assignable to the constraint of type '{1}', but '{1}' could be instantiated with a different subtype of constraint '{2}'."),
         Generates_a_sourcemap_for_each_corresponding_d_ts_file: diag(6000, ts.DiagnosticCategory.Message, "Generates_a_sourcemap_for_each_corresponding_d_ts_file_6000", "Generates a sourcemap for each corresponding '.d.ts' file."),
         Concatenate_and_emit_output_to_single_file: diag(6001, ts.DiagnosticCategory.Message, "Concatenate_and_emit_output_to_single_file_6001", "Concatenate and emit output to single file."),
         Generates_corresponding_d_ts_file: diag(6002, ts.DiagnosticCategory.Message, "Generates_corresponding_d_ts_file_6002", "Generates corresponding '.d.ts' file."),
@@ -6098,7 +6298,6 @@ var ts;
         Enable_strict_checking_of_property_initialization_in_classes: diag(6187, ts.DiagnosticCategory.Message, "Enable_strict_checking_of_property_initialization_in_classes_6187", "Enable strict checking of property initialization in classes."),
         Numeric_separators_are_not_allowed_here: diag(6188, ts.DiagnosticCategory.Error, "Numeric_separators_are_not_allowed_here_6188", "Numeric separators are not allowed here."),
         Multiple_consecutive_numeric_separators_are_not_permitted: diag(6189, ts.DiagnosticCategory.Error, "Multiple_consecutive_numeric_separators_are_not_permitted_6189", "Multiple consecutive numeric separators are not permitted."),
-        Found_package_json_at_0_Package_ID_is_1: diag(6190, ts.DiagnosticCategory.Message, "Found_package_json_at_0_Package_ID_is_1_6190", "Found 'package.json' at '{0}'. Package ID is '{1}'."),
         Whether_to_keep_outdated_console_output_in_watch_mode_instead_of_clearing_the_screen: diag(6191, ts.DiagnosticCategory.Message, "Whether_to_keep_outdated_console_output_in_watch_mode_instead_of_clearing_the_screen_6191", "Whether to keep outdated console output in watch mode instead of clearing the screen."),
         All_imports_in_import_declaration_are_unused: diag(6192, ts.DiagnosticCategory.Error, "All_imports_in_import_declaration_are_unused_6192", "All imports in import declaration are unused.", /*reportsUnnecessary*/ true),
         Found_1_error_Watching_for_file_changes: diag(6193, ts.DiagnosticCategory.Message, "Found_1_error_Watching_for_file_changes_6193", "Found 1 error. Watching for file changes."),
@@ -6125,13 +6324,16 @@ var ts;
         Using_compiler_options_of_project_reference_redirect_0: diag(6215, ts.DiagnosticCategory.Message, "Using_compiler_options_of_project_reference_redirect_0_6215", "Using compiler options of project reference redirect '{0}'."),
         Found_1_error: diag(6216, ts.DiagnosticCategory.Message, "Found_1_error_6216", "Found 1 error."),
         Found_0_errors: diag(6217, ts.DiagnosticCategory.Message, "Found_0_errors_6217", "Found {0} errors."),
+        Module_name_0_was_successfully_resolved_to_1_with_Package_ID_2: diag(6218, ts.DiagnosticCategory.Message, "Module_name_0_was_successfully_resolved_to_1_with_Package_ID_2_6218", "======== Module name '{0}' was successfully resolved to '{1}' with Package ID '{2}'. ========"),
+        Type_reference_directive_0_was_successfully_resolved_to_1_with_Package_ID_2_primary_Colon_3: diag(6219, ts.DiagnosticCategory.Message, "Type_reference_directive_0_was_successfully_resolved_to_1_with_Package_ID_2_primary_Colon_3_6219", "======== Type reference directive '{0}' was successfully resolved to '{1}' with Package ID '{2}', primary: {3}. ========"),
+        package_json_had_a_falsy_0_field: diag(6220, ts.DiagnosticCategory.Message, "package_json_had_a_falsy_0_field_6220", "'package.json' had a falsy '{0}' field."),
         Projects_to_reference: diag(6300, ts.DiagnosticCategory.Message, "Projects_to_reference_6300", "Projects to reference"),
         Enable_project_compilation: diag(6302, ts.DiagnosticCategory.Message, "Enable_project_compilation_6302", "Enable project compilation"),
         Project_references_may_not_form_a_circular_graph_Cycle_detected_Colon_0: diag(6202, ts.DiagnosticCategory.Error, "Project_references_may_not_form_a_circular_graph_Cycle_detected_Colon_0_6202", "Project references may not form a circular graph. Cycle detected: {0}"),
         Composite_projects_may_not_disable_declaration_emit: diag(6304, ts.DiagnosticCategory.Error, "Composite_projects_may_not_disable_declaration_emit_6304", "Composite projects may not disable declaration emit."),
         Output_file_0_has_not_been_built_from_source_file_1: diag(6305, ts.DiagnosticCategory.Error, "Output_file_0_has_not_been_built_from_source_file_1_6305", "Output file '{0}' has not been built from source file '{1}'."),
         Referenced_project_0_must_have_setting_composite_Colon_true: diag(6306, ts.DiagnosticCategory.Error, "Referenced_project_0_must_have_setting_composite_Colon_true_6306", "Referenced project '{0}' must have setting \"composite\": true."),
-        File_0_is_not_in_project_file_list_Projects_must_list_all_files_or_use_an_include_pattern: diag(6307, ts.DiagnosticCategory.Error, "File_0_is_not_in_project_file_list_Projects_must_list_all_files_or_use_an_include_pattern_6307", "File '{0}' is not in project file list. Projects must list all files or use an 'include' pattern."),
+        File_0_is_not_listed_within_the_file_list_of_project_1_Projects_must_list_all_files_or_use_an_include_pattern: diag(6307, ts.DiagnosticCategory.Error, "File_0_is_not_listed_within_the_file_list_of_project_1_Projects_must_list_all_files_or_use_an_includ_6307", "File '{0}' is not listed within the file list of project '{1}'. Projects must list all files or use an 'include' pattern."),
         Cannot_prepend_project_0_because_it_does_not_have_outFile_set: diag(6308, ts.DiagnosticCategory.Error, "Cannot_prepend_project_0_because_it_does_not_have_outFile_set_6308", "Cannot prepend project '{0}' because it does not have 'outFile' set"),
         Output_file_0_from_project_1_does_not_exist: diag(6309, ts.DiagnosticCategory.Error, "Output_file_0_from_project_1_does_not_exist_6309", "Output file '{0}' from project '{1}' does not exist"),
         Project_0_is_out_of_date_because_oldest_output_1_is_older_than_newest_input_2: diag(6350, ts.DiagnosticCategory.Message, "Project_0_is_out_of_date_because_oldest_output_1_is_older_than_newest_input_2_6350", "Project '{0}' is out of date because oldest output '{1}' is older than newest input '{2}'"),
@@ -6186,7 +6388,7 @@ var ts;
         _0_implicitly_has_type_any_because_it_does_not_have_a_type_annotation_and_is_referenced_directly_or_indirectly_in_its_own_initializer: diag(7022, ts.DiagnosticCategory.Error, "_0_implicitly_has_type_any_because_it_does_not_have_a_type_annotation_and_is_referenced_directly_or__7022", "'{0}' implicitly has type 'any' because it does not have a type annotation and is referenced directly or indirectly in its own initializer."),
         _0_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions: diag(7023, ts.DiagnosticCategory.Error, "_0_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_reference_7023", "'{0}' implicitly has return type 'any' because it does not have a return type annotation and is referenced directly or indirectly in one of its return expressions."),
         Function_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions: diag(7024, ts.DiagnosticCategory.Error, "Function_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_ref_7024", "Function implicitly has return type 'any' because it does not have a return type annotation and is referenced directly or indirectly in one of its return expressions."),
-        Generator_implicitly_has_type_0_because_it_does_not_yield_any_values_Consider_supplying_a_return_type: diag(7025, ts.DiagnosticCategory.Error, "Generator_implicitly_has_type_0_because_it_does_not_yield_any_values_Consider_supplying_a_return_typ_7025", "Generator implicitly has type '{0}' because it does not yield any values. Consider supplying a return type."),
+        Generator_implicitly_has_yield_type_0_because_it_does_not_yield_any_values_Consider_supplying_a_return_type_annotation: diag(7025, ts.DiagnosticCategory.Error, "Generator_implicitly_has_yield_type_0_because_it_does_not_yield_any_values_Consider_supplying_a_retu_7025", "Generator implicitly has yield type '{0}' because it does not yield any values. Consider supplying a return type annotation."),
         JSX_element_implicitly_has_type_any_because_no_interface_JSX_0_exists: diag(7026, ts.DiagnosticCategory.Error, "JSX_element_implicitly_has_type_any_because_no_interface_JSX_0_exists_7026", "JSX element implicitly has type 'any' because no interface 'JSX.{0}' exists."),
         Unreachable_code_detected: diag(7027, ts.DiagnosticCategory.Error, "Unreachable_code_detected_7027", "Unreachable code detected.", /*reportsUnnecessary*/ true),
         Unused_label: diag(7028, ts.DiagnosticCategory.Error, "Unused_label_7028", "Unused label.", /*reportsUnnecessary*/ true),
@@ -6213,6 +6415,10 @@ var ts;
         Property_0_implicitly_has_type_any_but_a_better_type_for_its_set_accessor_may_be_inferred_from_usage: diag(7049, ts.DiagnosticCategory.Suggestion, "Property_0_implicitly_has_type_any_but_a_better_type_for_its_set_accessor_may_be_inferred_from_usage_7049", "Property '{0}' implicitly has type 'any', but a better type for its set accessor may be inferred from usage."),
         _0_implicitly_has_an_1_return_type_but_a_better_type_may_be_inferred_from_usage: diag(7050, ts.DiagnosticCategory.Suggestion, "_0_implicitly_has_an_1_return_type_but_a_better_type_may_be_inferred_from_usage_7050", "'{0}' implicitly has an '{1}' return type, but a better type may be inferred from usage."),
         Parameter_has_a_name_but_no_type_Did_you_mean_0_Colon_1: diag(7051, ts.DiagnosticCategory.Error, "Parameter_has_a_name_but_no_type_Did_you_mean_0_Colon_1_7051", "Parameter has a name but no type. Did you mean '{0}: {1}'?"),
+        Element_implicitly_has_an_any_type_because_type_0_has_no_index_signature_Did_you_mean_to_call_1: diag(7052, ts.DiagnosticCategory.Error, "Element_implicitly_has_an_any_type_because_type_0_has_no_index_signature_Did_you_mean_to_call_1_7052", "Element implicitly has an 'any' type because type '{0}' has no index signature. Did you mean to call '{1}' ?"),
+        Element_implicitly_has_an_any_type_because_expression_of_type_0_can_t_be_used_to_index_type_1: diag(7053, ts.DiagnosticCategory.Error, "Element_implicitly_has_an_any_type_because_expression_of_type_0_can_t_be_used_to_index_type_1_7053", "Element implicitly has an 'any' type because expression of type '{0}' can't be used to index type '{1}'."),
+        No_index_signature_with_a_parameter_of_type_0_was_found_on_type_1: diag(7054, ts.DiagnosticCategory.Error, "No_index_signature_with_a_parameter_of_type_0_was_found_on_type_1_7054", "No index signature with a parameter of type '{0}' was found on type '{1}'."),
+        _0_which_lacks_return_type_annotation_implicitly_has_an_1_yield_type: diag(7055, ts.DiagnosticCategory.Error, "_0_which_lacks_return_type_annotation_implicitly_has_an_1_yield_type_7055", "'{0}', which lacks return-type annotation, implicitly has an '{1}' yield type."),
         You_cannot_rename_this_element: diag(8000, ts.DiagnosticCategory.Error, "You_cannot_rename_this_element_8000", "You cannot rename this element."),
         You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library: diag(8001, ts.DiagnosticCategory.Error, "You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library_8001", "You cannot rename elements that are defined in the standard TypeScript library."),
         import_can_only_be_used_in_a_ts_file: diag(8002, ts.DiagnosticCategory.Error, "import_can_only_be_used_in_a_ts_file_8002", "'import ... =' can only be used in a .ts file."),
@@ -6276,6 +6482,7 @@ var ts;
         JSDoc_types_may_be_moved_to_TypeScript_types: diag(80004, ts.DiagnosticCategory.Suggestion, "JSDoc_types_may_be_moved_to_TypeScript_types_80004", "JSDoc types may be moved to TypeScript types."),
         require_call_may_be_converted_to_an_import: diag(80005, ts.DiagnosticCategory.Suggestion, "require_call_may_be_converted_to_an_import_80005", "'require' call may be converted to an import."),
         This_may_be_converted_to_an_async_function: diag(80006, ts.DiagnosticCategory.Suggestion, "This_may_be_converted_to_an_async_function_80006", "This may be converted to an async function."),
+        await_has_no_effect_on_the_type_of_this_expression: diag(80007, ts.DiagnosticCategory.Suggestion, "await_has_no_effect_on_the_type_of_this_expression_80007", "'await' has no effect on the type of this expression."),
         Add_missing_super_call: diag(90001, ts.DiagnosticCategory.Message, "Add_missing_super_call_90001", "Add missing 'super()' call"),
         Make_super_call_the_first_statement_in_the_constructor: diag(90002, ts.DiagnosticCategory.Message, "Make_super_call_the_first_statement_in_the_constructor_90002", "Make 'super()' call the first statement in the constructor"),
         Change_extends_to_implements: diag(90003, ts.DiagnosticCategory.Message, "Change_extends_to_implements_90003", "Change 'extends' to 'implements'"),
@@ -6374,15 +6581,28 @@ var ts;
         Add_all_missing_imports: diag(95064, ts.DiagnosticCategory.Message, "Add_all_missing_imports_95064", "Add all missing imports"),
         Convert_to_async_function: diag(95065, ts.DiagnosticCategory.Message, "Convert_to_async_function_95065", "Convert to async function"),
         Convert_all_to_async_functions: diag(95066, ts.DiagnosticCategory.Message, "Convert_all_to_async_functions_95066", "Convert all to async functions"),
-        Generate_types_for_0: diag(95067, ts.DiagnosticCategory.Message, "Generate_types_for_0_95067", "Generate types for '{0}'"),
-        Generate_types_for_all_packages_without_types: diag(95068, ts.DiagnosticCategory.Message, "Generate_types_for_all_packages_without_types_95068", "Generate types for all packages without types"),
         Add_unknown_conversion_for_non_overlapping_types: diag(95069, ts.DiagnosticCategory.Message, "Add_unknown_conversion_for_non_overlapping_types_95069", "Add 'unknown' conversion for non-overlapping types"),
         Add_unknown_to_all_conversions_of_non_overlapping_types: diag(95070, ts.DiagnosticCategory.Message, "Add_unknown_to_all_conversions_of_non_overlapping_types_95070", "Add 'unknown' to all conversions of non-overlapping types"),
         Add_missing_new_operator_to_call: diag(95071, ts.DiagnosticCategory.Message, "Add_missing_new_operator_to_call_95071", "Add missing 'new' operator to call"),
         Add_missing_new_operator_to_all_calls: diag(95072, ts.DiagnosticCategory.Message, "Add_missing_new_operator_to_all_calls_95072", "Add missing 'new' operator to all calls"),
         Add_names_to_all_parameters_without_names: diag(95073, ts.DiagnosticCategory.Message, "Add_names_to_all_parameters_without_names_95073", "Add names to all parameters without names"),
         Enable_the_experimentalDecorators_option_in_your_configuration_file: diag(95074, ts.DiagnosticCategory.Message, "Enable_the_experimentalDecorators_option_in_your_configuration_file_95074", "Enable the 'experimentalDecorators' option in your configuration file"),
-        Convert_to_named_parameters: diag(95075, ts.DiagnosticCategory.Message, "Convert_to_named_parameters_95075", "Convert to named parameters"),
+        Convert_parameters_to_destructured_object: diag(95075, ts.DiagnosticCategory.Message, "Convert_parameters_to_destructured_object_95075", "Convert parameters to destructured object"),
+        Allow_accessing_UMD_globals_from_modules: diag(95076, ts.DiagnosticCategory.Message, "Allow_accessing_UMD_globals_from_modules_95076", "Allow accessing UMD globals from modules."),
+        Extract_type: diag(95077, ts.DiagnosticCategory.Message, "Extract_type_95077", "Extract type"),
+        Extract_to_type_alias: diag(95078, ts.DiagnosticCategory.Message, "Extract_to_type_alias_95078", "Extract to type alias"),
+        Extract_to_typedef: diag(95079, ts.DiagnosticCategory.Message, "Extract_to_typedef_95079", "Extract to typedef"),
+        Infer_this_type_of_0_from_usage: diag(95080, ts.DiagnosticCategory.Message, "Infer_this_type_of_0_from_usage_95080", "Infer 'this' type of '{0}' from usage"),
+        Add_const_to_unresolved_variable: diag(95081, ts.DiagnosticCategory.Message, "Add_const_to_unresolved_variable_95081", "Add 'const' to unresolved variable"),
+        Add_const_to_all_unresolved_variables: diag(95082, ts.DiagnosticCategory.Message, "Add_const_to_all_unresolved_variables_95082", "Add 'const' to all unresolved variables"),
+        Add_await: diag(95083, ts.DiagnosticCategory.Message, "Add_await_95083", "Add 'await'"),
+        Add_await_to_initializer_for_0: diag(95084, ts.DiagnosticCategory.Message, "Add_await_to_initializer_for_0_95084", "Add 'await' to initializer for '{0}'"),
+        Fix_all_expressions_possibly_missing_await: diag(95085, ts.DiagnosticCategory.Message, "Fix_all_expressions_possibly_missing_await_95085", "Fix all expressions possibly missing 'await'"),
+        Remove_unnecessary_await: diag(95086, ts.DiagnosticCategory.Message, "Remove_unnecessary_await_95086", "Remove unnecessary 'await'"),
+        Remove_all_unnecessary_uses_of_await: diag(95087, ts.DiagnosticCategory.Message, "Remove_all_unnecessary_uses_of_await_95087", "Remove all unnecessary uses of 'await'"),
+        No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer: diag(18004, ts.DiagnosticCategory.Error, "No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer_18004", "No value exists in scope for the shorthand property '{0}'. Either declare one or provide an initializer."),
+        Classes_may_not_have_a_field_named_constructor: diag(18006, ts.DiagnosticCategory.Error, "Classes_may_not_have_a_field_named_constructor_18006", "Classes may not have a field named 'constructor'."),
+        JSX_expressions_may_not_use_the_comma_operator_Did_you_mean_to_write_an_array: diag(18007, ts.DiagnosticCategory.Error, "JSX_expressions_may_not_use_the_comma_operator_Did_you_mean_to_write_an_array_18007", "JSX expressions may not use the comma operator. Did you mean to write an array?"),
     };
 })(ts || (ts = {}));
 var ts;
@@ -6390,7 +6610,7 @@ var ts;
     var _a;
     /* @internal */
     function tokenIsIdentifierOrKeyword(token) {
-        return token >= 72 /* Identifier */;
+        return token >= 73 /* Identifier */;
     }
     ts.tokenIsIdentifierOrKeyword = tokenIsIdentifierOrKeyword;
     /* @internal */
@@ -6399,85 +6619,85 @@ var ts;
     }
     ts.tokenIsIdentifierOrKeywordOrGreaterThan = tokenIsIdentifierOrKeywordOrGreaterThan;
     var textToKeywordObj = (_a = {
-            abstract: 118 /* AbstractKeyword */,
-            any: 120 /* AnyKeyword */,
-            as: 119 /* AsKeyword */,
-            bigint: 146 /* BigIntKeyword */,
-            boolean: 123 /* BooleanKeyword */,
-            break: 73 /* BreakKeyword */,
-            case: 74 /* CaseKeyword */,
-            catch: 75 /* CatchKeyword */,
-            class: 76 /* ClassKeyword */,
-            continue: 78 /* ContinueKeyword */,
-            const: 77 /* ConstKeyword */
+            abstract: 119 /* AbstractKeyword */,
+            any: 121 /* AnyKeyword */,
+            as: 120 /* AsKeyword */,
+            bigint: 147 /* BigIntKeyword */,
+            boolean: 124 /* BooleanKeyword */,
+            break: 74 /* BreakKeyword */,
+            case: 75 /* CaseKeyword */,
+            catch: 76 /* CatchKeyword */,
+            class: 77 /* ClassKeyword */,
+            continue: 79 /* ContinueKeyword */,
+            const: 78 /* ConstKeyword */
         },
-        _a["" + "constructor"] = 124 /* ConstructorKeyword */,
-        _a.debugger = 79 /* DebuggerKeyword */,
-        _a.declare = 125 /* DeclareKeyword */,
-        _a.default = 80 /* DefaultKeyword */,
-        _a.delete = 81 /* DeleteKeyword */,
-        _a.do = 82 /* DoKeyword */,
-        _a.else = 83 /* ElseKeyword */,
-        _a.enum = 84 /* EnumKeyword */,
-        _a.export = 85 /* ExportKeyword */,
-        _a.extends = 86 /* ExtendsKeyword */,
-        _a.false = 87 /* FalseKeyword */,
-        _a.finally = 88 /* FinallyKeyword */,
-        _a.for = 89 /* ForKeyword */,
-        _a.from = 144 /* FromKeyword */,
-        _a.function = 90 /* FunctionKeyword */,
-        _a.get = 126 /* GetKeyword */,
-        _a.if = 91 /* IfKeyword */,
-        _a.implements = 109 /* ImplementsKeyword */,
-        _a.import = 92 /* ImportKeyword */,
-        _a.in = 93 /* InKeyword */,
-        _a.infer = 127 /* InferKeyword */,
-        _a.instanceof = 94 /* InstanceOfKeyword */,
-        _a.interface = 110 /* InterfaceKeyword */,
-        _a.is = 128 /* IsKeyword */,
-        _a.keyof = 129 /* KeyOfKeyword */,
-        _a.let = 111 /* LetKeyword */,
-        _a.module = 130 /* ModuleKeyword */,
-        _a.namespace = 131 /* NamespaceKeyword */,
-        _a.never = 132 /* NeverKeyword */,
-        _a.new = 95 /* NewKeyword */,
-        _a.null = 96 /* NullKeyword */,
-        _a.number = 135 /* NumberKeyword */,
-        _a.object = 136 /* ObjectKeyword */,
-        _a.package = 112 /* PackageKeyword */,
-        _a.private = 113 /* PrivateKeyword */,
-        _a.protected = 114 /* ProtectedKeyword */,
-        _a.public = 115 /* PublicKeyword */,
-        _a.readonly = 133 /* ReadonlyKeyword */,
-        _a.require = 134 /* RequireKeyword */,
-        _a.global = 145 /* GlobalKeyword */,
-        _a.return = 97 /* ReturnKeyword */,
-        _a.set = 137 /* SetKeyword */,
-        _a.static = 116 /* StaticKeyword */,
-        _a.string = 138 /* StringKeyword */,
-        _a.super = 98 /* SuperKeyword */,
-        _a.switch = 99 /* SwitchKeyword */,
-        _a.symbol = 139 /* SymbolKeyword */,
-        _a.this = 100 /* ThisKeyword */,
-        _a.throw = 101 /* ThrowKeyword */,
-        _a.true = 102 /* TrueKeyword */,
-        _a.try = 103 /* TryKeyword */,
-        _a.type = 140 /* TypeKeyword */,
-        _a.typeof = 104 /* TypeOfKeyword */,
-        _a.undefined = 141 /* UndefinedKeyword */,
-        _a.unique = 142 /* UniqueKeyword */,
-        _a.unknown = 143 /* UnknownKeyword */,
-        _a.var = 105 /* VarKeyword */,
-        _a.void = 106 /* VoidKeyword */,
-        _a.while = 107 /* WhileKeyword */,
-        _a.with = 108 /* WithKeyword */,
-        _a.yield = 117 /* YieldKeyword */,
-        _a.async = 121 /* AsyncKeyword */,
-        _a.await = 122 /* AwaitKeyword */,
-        _a.of = 147 /* OfKeyword */,
+        _a["" + "constructor"] = 125 /* ConstructorKeyword */,
+        _a.debugger = 80 /* DebuggerKeyword */,
+        _a.declare = 126 /* DeclareKeyword */,
+        _a.default = 81 /* DefaultKeyword */,
+        _a.delete = 82 /* DeleteKeyword */,
+        _a.do = 83 /* DoKeyword */,
+        _a.else = 84 /* ElseKeyword */,
+        _a.enum = 85 /* EnumKeyword */,
+        _a.export = 86 /* ExportKeyword */,
+        _a.extends = 87 /* ExtendsKeyword */,
+        _a.false = 88 /* FalseKeyword */,
+        _a.finally = 89 /* FinallyKeyword */,
+        _a.for = 90 /* ForKeyword */,
+        _a.from = 145 /* FromKeyword */,
+        _a.function = 91 /* FunctionKeyword */,
+        _a.get = 127 /* GetKeyword */,
+        _a.if = 92 /* IfKeyword */,
+        _a.implements = 110 /* ImplementsKeyword */,
+        _a.import = 93 /* ImportKeyword */,
+        _a.in = 94 /* InKeyword */,
+        _a.infer = 128 /* InferKeyword */,
+        _a.instanceof = 95 /* InstanceOfKeyword */,
+        _a.interface = 111 /* InterfaceKeyword */,
+        _a.is = 129 /* IsKeyword */,
+        _a.keyof = 130 /* KeyOfKeyword */,
+        _a.let = 112 /* LetKeyword */,
+        _a.module = 131 /* ModuleKeyword */,
+        _a.namespace = 132 /* NamespaceKeyword */,
+        _a.never = 133 /* NeverKeyword */,
+        _a.new = 96 /* NewKeyword */,
+        _a.null = 97 /* NullKeyword */,
+        _a.number = 136 /* NumberKeyword */,
+        _a.object = 137 /* ObjectKeyword */,
+        _a.package = 113 /* PackageKeyword */,
+        _a.private = 114 /* PrivateKeyword */,
+        _a.protected = 115 /* ProtectedKeyword */,
+        _a.public = 116 /* PublicKeyword */,
+        _a.readonly = 134 /* ReadonlyKeyword */,
+        _a.require = 135 /* RequireKeyword */,
+        _a.global = 146 /* GlobalKeyword */,
+        _a.return = 98 /* ReturnKeyword */,
+        _a.set = 138 /* SetKeyword */,
+        _a.static = 117 /* StaticKeyword */,
+        _a.string = 139 /* StringKeyword */,
+        _a.super = 99 /* SuperKeyword */,
+        _a.switch = 100 /* SwitchKeyword */,
+        _a.symbol = 140 /* SymbolKeyword */,
+        _a.this = 101 /* ThisKeyword */,
+        _a.throw = 102 /* ThrowKeyword */,
+        _a.true = 103 /* TrueKeyword */,
+        _a.try = 104 /* TryKeyword */,
+        _a.type = 141 /* TypeKeyword */,
+        _a.typeof = 105 /* TypeOfKeyword */,
+        _a.undefined = 142 /* UndefinedKeyword */,
+        _a.unique = 143 /* UniqueKeyword */,
+        _a.unknown = 144 /* UnknownKeyword */,
+        _a.var = 106 /* VarKeyword */,
+        _a.void = 107 /* VoidKeyword */,
+        _a.while = 108 /* WhileKeyword */,
+        _a.with = 109 /* WithKeyword */,
+        _a.yield = 118 /* YieldKeyword */,
+        _a.async = 122 /* AsyncKeyword */,
+        _a.await = 123 /* AwaitKeyword */,
+        _a.of = 148 /* OfKeyword */,
         _a);
     var textToKeyword = ts.createMapFromTemplate(textToKeywordObj);
-    var textToToken = ts.createMapFromTemplate(__assign({}, textToKeywordObj, { "{": 18 /* OpenBraceToken */, "}": 19 /* CloseBraceToken */, "(": 20 /* OpenParenToken */, ")": 21 /* CloseParenToken */, "[": 22 /* OpenBracketToken */, "]": 23 /* CloseBracketToken */, ".": 24 /* DotToken */, "...": 25 /* DotDotDotToken */, ";": 26 /* SemicolonToken */, ",": 27 /* CommaToken */, "<": 28 /* LessThanToken */, ">": 30 /* GreaterThanToken */, "<=": 31 /* LessThanEqualsToken */, ">=": 32 /* GreaterThanEqualsToken */, "==": 33 /* EqualsEqualsToken */, "!=": 34 /* ExclamationEqualsToken */, "===": 35 /* EqualsEqualsEqualsToken */, "!==": 36 /* ExclamationEqualsEqualsToken */, "=>": 37 /* EqualsGreaterThanToken */, "+": 38 /* PlusToken */, "-": 39 /* MinusToken */, "**": 41 /* AsteriskAsteriskToken */, "*": 40 /* AsteriskToken */, "/": 42 /* SlashToken */, "%": 43 /* PercentToken */, "++": 44 /* PlusPlusToken */, "--": 45 /* MinusMinusToken */, "<<": 46 /* LessThanLessThanToken */, "</": 29 /* LessThanSlashToken */, ">>": 47 /* GreaterThanGreaterThanToken */, ">>>": 48 /* GreaterThanGreaterThanGreaterThanToken */, "&": 49 /* AmpersandToken */, "|": 50 /* BarToken */, "^": 51 /* CaretToken */, "!": 52 /* ExclamationToken */, "~": 53 /* TildeToken */, "&&": 54 /* AmpersandAmpersandToken */, "||": 55 /* BarBarToken */, "?": 56 /* QuestionToken */, ":": 57 /* ColonToken */, "=": 59 /* EqualsToken */, "+=": 60 /* PlusEqualsToken */, "-=": 61 /* MinusEqualsToken */, "*=": 62 /* AsteriskEqualsToken */, "**=": 63 /* AsteriskAsteriskEqualsToken */, "/=": 64 /* SlashEqualsToken */, "%=": 65 /* PercentEqualsToken */, "<<=": 66 /* LessThanLessThanEqualsToken */, ">>=": 67 /* GreaterThanGreaterThanEqualsToken */, ">>>=": 68 /* GreaterThanGreaterThanGreaterThanEqualsToken */, "&=": 69 /* AmpersandEqualsToken */, "|=": 70 /* BarEqualsToken */, "^=": 71 /* CaretEqualsToken */, "@": 58 /* AtToken */ }));
+    var textToToken = ts.createMapFromTemplate(__assign({}, textToKeywordObj, { "{": 18 /* OpenBraceToken */, "}": 19 /* CloseBraceToken */, "(": 20 /* OpenParenToken */, ")": 21 /* CloseParenToken */, "[": 22 /* OpenBracketToken */, "]": 23 /* CloseBracketToken */, ".": 24 /* DotToken */, "...": 25 /* DotDotDotToken */, ";": 26 /* SemicolonToken */, ",": 27 /* CommaToken */, "<": 28 /* LessThanToken */, ">": 30 /* GreaterThanToken */, "<=": 31 /* LessThanEqualsToken */, ">=": 32 /* GreaterThanEqualsToken */, "==": 33 /* EqualsEqualsToken */, "!=": 34 /* ExclamationEqualsToken */, "===": 35 /* EqualsEqualsEqualsToken */, "!==": 36 /* ExclamationEqualsEqualsToken */, "=>": 37 /* EqualsGreaterThanToken */, "+": 38 /* PlusToken */, "-": 39 /* MinusToken */, "**": 41 /* AsteriskAsteriskToken */, "*": 40 /* AsteriskToken */, "/": 42 /* SlashToken */, "%": 43 /* PercentToken */, "++": 44 /* PlusPlusToken */, "--": 45 /* MinusMinusToken */, "<<": 46 /* LessThanLessThanToken */, "</": 29 /* LessThanSlashToken */, ">>": 47 /* GreaterThanGreaterThanToken */, ">>>": 48 /* GreaterThanGreaterThanGreaterThanToken */, "&": 49 /* AmpersandToken */, "|": 50 /* BarToken */, "^": 51 /* CaretToken */, "!": 52 /* ExclamationToken */, "~": 53 /* TildeToken */, "&&": 54 /* AmpersandAmpersandToken */, "||": 55 /* BarBarToken */, "?": 56 /* QuestionToken */, ":": 57 /* ColonToken */, "=": 60 /* EqualsToken */, "+=": 61 /* PlusEqualsToken */, "-=": 62 /* MinusEqualsToken */, "*=": 63 /* AsteriskEqualsToken */, "**=": 64 /* AsteriskAsteriskEqualsToken */, "/=": 65 /* SlashEqualsToken */, "%=": 66 /* PercentEqualsToken */, "<<=": 67 /* LessThanLessThanEqualsToken */, ">>=": 68 /* GreaterThanGreaterThanEqualsToken */, ">>>=": 69 /* GreaterThanGreaterThanGreaterThanEqualsToken */, "&=": 70 /* AmpersandEqualsToken */, "|=": 71 /* BarEqualsToken */, "^=": 72 /* CaretEqualsToken */, "@": 58 /* AtToken */, "`": 59 /* BacktickToken */ }));
     /*
         As per ECMAScript Language Specification 3th Edition, Section 7.6: Identifiers
         IdentifierStart ::
@@ -7091,8 +7311,8 @@ var ts;
             getTokenValue: function () { return tokenValue; },
             hasExtendedUnicodeEscape: function () { return (tokenFlags & 8 /* ExtendedUnicodeEscape */) !== 0; },
             hasPrecedingLineBreak: function () { return (tokenFlags & 1 /* PrecedingLineBreak */) !== 0; },
-            isIdentifier: function () { return token === 72 /* Identifier */ || token > 108 /* LastReservedWord */; },
-            isReservedWord: function () { return token >= 73 /* FirstReservedWord */ && token <= 108 /* LastReservedWord */; },
+            isIdentifier: function () { return token === 73 /* Identifier */ || token > 109 /* LastReservedWord */; },
+            isReservedWord: function () { return token >= 74 /* FirstReservedWord */ && token <= 109 /* LastReservedWord */; },
             isUnterminated: function () { return (tokenFlags & 4 /* Unterminated */) !== 0; },
             getTokenFlags: function () { return tokenFlags; },
             reScanGreaterToken: reScanGreaterToken,
@@ -7103,7 +7323,7 @@ var ts;
             reScanJsxToken: reScanJsxToken,
             reScanLessThanToken: reScanLessThanToken,
             scanJsxToken: scanJsxToken,
-            scanJSDocToken: scanJSDocToken,
+            scanJsDocToken: scanJsDocToken,
             scan: scan,
             getText: getText,
             setText: setText,
@@ -7543,7 +7763,7 @@ var ts;
                     }
                 }
             }
-            return token = 72 /* Identifier */;
+            return token = 73 /* Identifier */;
         }
         function scanBinaryOrOctalDigits(base) {
             var value = "";
@@ -7692,7 +7912,7 @@ var ts;
                         return token = scanTemplateAndSetTokenValue();
                     case 37 /* percent */:
                         if (text.charCodeAt(pos + 1) === 61 /* equals */) {
-                            return pos += 2, token = 65 /* PercentEqualsToken */;
+                            return pos += 2, token = 66 /* PercentEqualsToken */;
                         }
                         pos++;
                         return token = 43 /* PercentToken */;
@@ -7701,7 +7921,7 @@ var ts;
                             return pos += 2, token = 54 /* AmpersandAmpersandToken */;
                         }
                         if (text.charCodeAt(pos + 1) === 61 /* equals */) {
-                            return pos += 2, token = 69 /* AmpersandEqualsToken */;
+                            return pos += 2, token = 70 /* AmpersandEqualsToken */;
                         }
                         pos++;
                         return token = 49 /* AmpersandToken */;
@@ -7713,11 +7933,11 @@ var ts;
                         return token = 21 /* CloseParenToken */;
                     case 42 /* asterisk */:
                         if (text.charCodeAt(pos + 1) === 61 /* equals */) {
-                            return pos += 2, token = 62 /* AsteriskEqualsToken */;
+                            return pos += 2, token = 63 /* AsteriskEqualsToken */;
                         }
                         if (text.charCodeAt(pos + 1) === 42 /* asterisk */) {
                             if (text.charCodeAt(pos + 2) === 61 /* equals */) {
-                                return pos += 3, token = 63 /* AsteriskAsteriskEqualsToken */;
+                                return pos += 3, token = 64 /* AsteriskAsteriskEqualsToken */;
                             }
                             return pos += 2, token = 41 /* AsteriskAsteriskToken */;
                         }
@@ -7733,7 +7953,7 @@ var ts;
                             return pos += 2, token = 44 /* PlusPlusToken */;
                         }
                         if (text.charCodeAt(pos + 1) === 61 /* equals */) {
-                            return pos += 2, token = 60 /* PlusEqualsToken */;
+                            return pos += 2, token = 61 /* PlusEqualsToken */;
                         }
                         pos++;
                         return token = 38 /* PlusToken */;
@@ -7745,7 +7965,7 @@ var ts;
                             return pos += 2, token = 45 /* MinusMinusToken */;
                         }
                         if (text.charCodeAt(pos + 1) === 61 /* equals */) {
-                            return pos += 2, token = 61 /* MinusEqualsToken */;
+                            return pos += 2, token = 62 /* MinusEqualsToken */;
                         }
                         pos++;
                         return token = 39 /* MinusToken */;
@@ -7809,7 +8029,7 @@ var ts;
                             }
                         }
                         if (text.charCodeAt(pos + 1) === 61 /* equals */) {
-                            return pos += 2, token = 64 /* SlashEqualsToken */;
+                            return pos += 2, token = 65 /* SlashEqualsToken */;
                         }
                         pos++;
                         return token = 42 /* SlashToken */;
@@ -7886,7 +8106,7 @@ var ts;
                         }
                         if (text.charCodeAt(pos + 1) === 60 /* lessThan */) {
                             if (text.charCodeAt(pos + 2) === 61 /* equals */) {
-                                return pos += 3, token = 66 /* LessThanLessThanEqualsToken */;
+                                return pos += 3, token = 67 /* LessThanLessThanEqualsToken */;
                             }
                             return pos += 2, token = 46 /* LessThanLessThanToken */;
                         }
@@ -7920,7 +8140,7 @@ var ts;
                             return pos += 2, token = 37 /* EqualsGreaterThanToken */;
                         }
                         pos++;
-                        return token = 59 /* EqualsToken */;
+                        return token = 60 /* EqualsToken */;
                     case 62 /* greaterThan */:
                         if (isConflictMarkerTrivia(text, pos)) {
                             pos = scanConflictMarkerTrivia(text, pos, error);
@@ -7944,7 +8164,7 @@ var ts;
                         return token = 23 /* CloseBracketToken */;
                     case 94 /* caret */:
                         if (text.charCodeAt(pos + 1) === 61 /* equals */) {
-                            return pos += 2, token = 71 /* CaretEqualsToken */;
+                            return pos += 2, token = 72 /* CaretEqualsToken */;
                         }
                         pos++;
                         return token = 51 /* CaretToken */;
@@ -7965,7 +8185,7 @@ var ts;
                             return pos += 2, token = 55 /* BarBarToken */;
                         }
                         if (text.charCodeAt(pos + 1) === 61 /* equals */) {
-                            return pos += 2, token = 70 /* BarEqualsToken */;
+                            return pos += 2, token = 71 /* BarEqualsToken */;
                         }
                         pos++;
                         return token = 50 /* BarToken */;
@@ -8019,12 +8239,12 @@ var ts;
                 if (text.charCodeAt(pos) === 62 /* greaterThan */) {
                     if (text.charCodeAt(pos + 1) === 62 /* greaterThan */) {
                         if (text.charCodeAt(pos + 2) === 61 /* equals */) {
-                            return pos += 3, token = 68 /* GreaterThanGreaterThanGreaterThanEqualsToken */;
+                            return pos += 3, token = 69 /* GreaterThanGreaterThanGreaterThanEqualsToken */;
                         }
                         return pos += 2, token = 48 /* GreaterThanGreaterThanGreaterThanToken */;
                     }
                     if (text.charCodeAt(pos + 1) === 61 /* equals */) {
-                        return pos += 2, token = 67 /* GreaterThanGreaterThanEqualsToken */;
+                        return pos += 2, token = 68 /* GreaterThanGreaterThanEqualsToken */;
                     }
                     pos++;
                     return token = 47 /* GreaterThanGreaterThanToken */;
@@ -8037,7 +8257,7 @@ var ts;
             return token;
         }
         function reScanSlashToken() {
-            if (token === 42 /* SlashToken */ || token === 64 /* SlashEqualsToken */) {
+            if (token === 42 /* SlashToken */ || token === 65 /* SlashEqualsToken */) {
                 var p = tokenPos + 1;
                 var inEscape = false;
                 var inCharacterClass = false;
@@ -8153,6 +8373,7 @@ var ts;
                 }
                 pos++;
             }
+            tokenValue = text.substring(startPos, pos);
             return firstNonWhitespace === -1 ? 12 /* JsxTextAllWhiteSpaces */ : 11 /* JsxText */;
         }
         // Scans a JSX identifier; these differ from normal identifiers in that
@@ -8185,7 +8406,7 @@ var ts;
                     return scan();
             }
         }
-        function scanJSDocToken() {
+        function scanJsDocToken() {
             startPos = tokenPos = pos;
             tokenFlags = 0;
             if (pos >= end) {
@@ -8220,22 +8441,19 @@ var ts;
                     return token = 23 /* CloseBracketToken */;
                 case 60 /* lessThan */:
                     return token = 28 /* LessThanToken */;
+                case 62 /* greaterThan */:
+                    return token = 30 /* GreaterThanToken */;
                 case 61 /* equals */:
-                    return token = 59 /* EqualsToken */;
+                    return token = 60 /* EqualsToken */;
                 case 44 /* comma */:
                     return token = 27 /* CommaToken */;
                 case 46 /* dot */:
                     return token = 24 /* DotToken */;
                 case 96 /* backtick */:
-                    while (pos < end && text.charCodeAt(pos) !== 96 /* backtick */) {
-                        pos++;
-                    }
-                    tokenValue = text.substring(tokenPos + 1, pos);
-                    pos++;
-                    return token = 14 /* NoSubstitutionTemplateLiteral */;
+                    return token = 59 /* BacktickToken */;
             }
-            if (isIdentifierStart(ch, 7 /* Latest */)) {
-                while (isIdentifierPart(text.charCodeAt(pos), 7 /* Latest */) && pos < end) {
+            if (isIdentifierStart(ch, 99 /* Latest */)) {
+                while (isIdentifierPart(text.charCodeAt(pos), 99 /* Latest */) && pos < end) {
                     pos++;
                 }
                 tokenValue = text.substring(tokenPos, pos);
@@ -8420,11 +8638,16 @@ var ts;
     }
     ts.toPath = toPath;
     function changesAffectModuleResolution(oldOptions, newOptions) {
-        return oldOptions.configFilePath !== newOptions.configFilePath || ts.moduleResolutionOptionDeclarations.some(function (o) {
+        return oldOptions.configFilePath !== newOptions.configFilePath ||
+            optionsHaveModuleResolutionChanges(oldOptions, newOptions);
+    }
+    ts.changesAffectModuleResolution = changesAffectModuleResolution;
+    function optionsHaveModuleResolutionChanges(oldOptions, newOptions) {
+        return ts.moduleResolutionOptionDeclarations.some(function (o) {
             return !ts.isJsonEqual(ts.getCompilerOptionValue(oldOptions, o), ts.getCompilerOptionValue(newOptions, o));
         });
     }
-    ts.changesAffectModuleResolution = changesAffectModuleResolution;
+    ts.optionsHaveModuleResolutionChanges = optionsHaveModuleResolutionChanges;
     function findAncestor(node, callback) {
         while (node) {
             var result = callback(node);
@@ -8453,10 +8676,9 @@ var ts;
     }
     ts.forEachAncestor = forEachAncestor;
     function forEachEntry(map, callback) {
-        var _a;
         var iterator = map.entries();
-        for (var _b = iterator.next(), pair = _b.value, done = _b.done; !done; _a = iterator.next(), pair = _a.value, done = _a.done, _a) {
-            var key = pair[0], value = pair[1];
+        for (var iterResult = iterator.next(); !iterResult.done; iterResult = iterator.next()) {
+            var _a = iterResult.value, key = _a[0], value = _a[1];
             var result = callback(value, key);
             if (result) {
                 return result;
@@ -8466,10 +8688,9 @@ var ts;
     }
     ts.forEachEntry = forEachEntry;
     function forEachKey(map, callback) {
-        var _a;
         var iterator = map.keys();
-        for (var _b = iterator.next(), key = _b.value, done = _b.done; !done; _a = iterator.next(), key = _a.value, done = _a.done, _a) {
-            var result = callback(key);
+        for (var iterResult = iterator.next(); !iterResult.done; iterResult = iterator.next()) {
+            var result = callback(iterResult.value);
             if (result) {
                 return result;
             }
@@ -8593,7 +8814,7 @@ var ts;
         }
     }
     function getSourceFileOfNode(node) {
-        while (node && node.kind !== 284 /* SourceFile */) {
+        while (node && node.kind !== 285 /* SourceFile */) {
             node = node.parent;
         }
         return node;
@@ -8601,11 +8822,11 @@ var ts;
     ts.getSourceFileOfNode = getSourceFileOfNode;
     function isStatementWithLocals(node) {
         switch (node.kind) {
-            case 218 /* Block */:
-            case 246 /* CaseBlock */:
-            case 225 /* ForStatement */:
-            case 226 /* ForInStatement */:
-            case 227 /* ForOfStatement */:
+            case 219 /* Block */:
+            case 247 /* CaseBlock */:
+            case 226 /* ForStatement */:
+            case 227 /* ForInStatement */:
+            case 228 /* ForOfStatement */:
                 return true;
         }
         return false;
@@ -8773,7 +8994,7 @@ var ts;
         // the syntax list itself considers them as normal trivia. Therefore if we simply skip
         // trivia for the list, we may have skipped the JSDocComment as well. So we should process its
         // first child to determine the actual position of its first token.
-        if (node.kind === 311 /* SyntaxList */ && node._children.length > 0) {
+        if (node.kind === 313 /* SyntaxList */ && node._children.length > 0) {
             return getTokenPosOfNode(node._children[0], sourceFile, includeJsDoc);
         }
         return ts.skipTrivia((sourceFile || getSourceFileOfNode(node)).text, node.pos);
@@ -8792,7 +9013,7 @@ var ts;
     }
     ts.getSourceTextOfNodeFromSourceFile = getSourceTextOfNodeFromSourceFile;
     function isJSDocTypeExpressionOrChild(node) {
-        return node.kind === 288 /* JSDocTypeExpression */ || (node.parent && isJSDocTypeExpressionOrChild(node.parent));
+        return node.kind === 289 /* JSDocTypeExpression */ || (node.parent && isJSDocTypeExpressionOrChild(node.parent));
     }
     function getTextOfNodeFromSourceText(sourceText, node, includeTrivia) {
         if (includeTrivia === void 0) { includeTrivia = false; }
@@ -8884,7 +9105,7 @@ var ts;
     ts.isBlockOrCatchScoped = isBlockOrCatchScoped;
     function isCatchClauseVariableDeclarationOrBindingElement(declaration) {
         var node = getRootDeclaration(declaration);
-        return node.kind === 237 /* VariableDeclaration */ && node.parent.kind === 274 /* CatchClause */;
+        return node.kind === 238 /* VariableDeclaration */ && node.parent.kind === 275 /* CatchClause */;
     }
     ts.isCatchClauseVariableDeclarationOrBindingElement = isCatchClauseVariableDeclarationOrBindingElement;
     function isAmbientModule(node) {
@@ -8916,11 +9137,11 @@ var ts;
     ts.isShorthandAmbientModuleSymbol = isShorthandAmbientModuleSymbol;
     function isShorthandAmbientModule(node) {
         // The only kind of module that can be missing a body is a shorthand ambient module.
-        return node && node.kind === 244 /* ModuleDeclaration */ && (!node.body);
+        return node && node.kind === 245 /* ModuleDeclaration */ && (!node.body);
     }
     function isBlockScopedContainerTopLevel(node) {
-        return node.kind === 284 /* SourceFile */ ||
-            node.kind === 244 /* ModuleDeclaration */ ||
+        return node.kind === 285 /* SourceFile */ ||
+            node.kind === 245 /* ModuleDeclaration */ ||
             ts.isFunctionLike(node);
     }
     ts.isBlockScopedContainerTopLevel = isBlockScopedContainerTopLevel;
@@ -8937,9 +9158,9 @@ var ts;
         // - defined in the top level scope and source file is an external module
         // - defined inside ambient module declaration located in the top level scope and source file not an external module
         switch (node.parent.kind) {
-            case 284 /* SourceFile */:
+            case 285 /* SourceFile */:
                 return ts.isExternalModule(node.parent);
-            case 245 /* ModuleBlock */:
+            case 246 /* ModuleBlock */:
                 return isAmbientModule(node.parent.parent) && ts.isSourceFile(node.parent.parent.parent) && !ts.isExternalModule(node.parent.parent.parent);
         }
         return false;
@@ -8955,22 +9176,22 @@ var ts;
     ts.isEffectiveExternalModule = isEffectiveExternalModule;
     function isBlockScope(node, parentNode) {
         switch (node.kind) {
-            case 284 /* SourceFile */:
-            case 246 /* CaseBlock */:
-            case 274 /* CatchClause */:
-            case 244 /* ModuleDeclaration */:
-            case 225 /* ForStatement */:
-            case 226 /* ForInStatement */:
-            case 227 /* ForOfStatement */:
-            case 157 /* Constructor */:
-            case 156 /* MethodDeclaration */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
-            case 239 /* FunctionDeclaration */:
-            case 196 /* FunctionExpression */:
-            case 197 /* ArrowFunction */:
+            case 285 /* SourceFile */:
+            case 247 /* CaseBlock */:
+            case 275 /* CatchClause */:
+            case 245 /* ModuleDeclaration */:
+            case 226 /* ForStatement */:
+            case 227 /* ForInStatement */:
+            case 228 /* ForOfStatement */:
+            case 158 /* Constructor */:
+            case 157 /* MethodDeclaration */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
+            case 240 /* FunctionDeclaration */:
+            case 197 /* FunctionExpression */:
+            case 198 /* ArrowFunction */:
                 return true;
-            case 218 /* Block */:
+            case 219 /* Block */:
                 // function block is not considered block-scope container
                 // see comment in binder.ts: bind(...), case for SyntaxKind.Block
                 return !ts.isFunctionLike(parentNode);
@@ -8980,9 +9201,9 @@ var ts;
     ts.isBlockScope = isBlockScope;
     function isDeclarationWithTypeParameters(node) {
         switch (node.kind) {
-            case 302 /* JSDocCallbackTag */:
-            case 309 /* JSDocTypedefTag */:
-            case 298 /* JSDocSignature */:
+            case 304 /* JSDocCallbackTag */:
+            case 311 /* JSDocTypedefTag */:
+            case 299 /* JSDocSignature */:
                 return true;
             default:
                 ts.assertType(node);
@@ -8992,25 +9213,25 @@ var ts;
     ts.isDeclarationWithTypeParameters = isDeclarationWithTypeParameters;
     function isDeclarationWithTypeParameterChildren(node) {
         switch (node.kind) {
-            case 160 /* CallSignature */:
-            case 161 /* ConstructSignature */:
-            case 155 /* MethodSignature */:
-            case 162 /* IndexSignature */:
-            case 165 /* FunctionType */:
-            case 166 /* ConstructorType */:
-            case 294 /* JSDocFunctionType */:
-            case 240 /* ClassDeclaration */:
-            case 209 /* ClassExpression */:
-            case 241 /* InterfaceDeclaration */:
-            case 242 /* TypeAliasDeclaration */:
-            case 308 /* JSDocTemplateTag */:
-            case 239 /* FunctionDeclaration */:
-            case 156 /* MethodDeclaration */:
-            case 157 /* Constructor */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
-            case 196 /* FunctionExpression */:
-            case 197 /* ArrowFunction */:
+            case 161 /* CallSignature */:
+            case 162 /* ConstructSignature */:
+            case 156 /* MethodSignature */:
+            case 163 /* IndexSignature */:
+            case 166 /* FunctionType */:
+            case 167 /* ConstructorType */:
+            case 295 /* JSDocFunctionType */:
+            case 241 /* ClassDeclaration */:
+            case 210 /* ClassExpression */:
+            case 242 /* InterfaceDeclaration */:
+            case 243 /* TypeAliasDeclaration */:
+            case 310 /* JSDocTemplateTag */:
+            case 240 /* FunctionDeclaration */:
+            case 157 /* MethodDeclaration */:
+            case 158 /* Constructor */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
+            case 197 /* FunctionExpression */:
+            case 198 /* ArrowFunction */:
                 return true;
             default:
                 ts.assertType(node);
@@ -9020,8 +9241,8 @@ var ts;
     ts.isDeclarationWithTypeParameterChildren = isDeclarationWithTypeParameterChildren;
     function isAnyImportSyntax(node) {
         switch (node.kind) {
-            case 249 /* ImportDeclaration */:
-            case 248 /* ImportEqualsDeclaration */:
+            case 250 /* ImportDeclaration */:
+            case 249 /* ImportEqualsDeclaration */:
                 return true;
             default:
                 return false;
@@ -9030,15 +9251,15 @@ var ts;
     ts.isAnyImportSyntax = isAnyImportSyntax;
     function isLateVisibilityPaintedStatement(node) {
         switch (node.kind) {
-            case 249 /* ImportDeclaration */:
-            case 248 /* ImportEqualsDeclaration */:
-            case 219 /* VariableStatement */:
-            case 240 /* ClassDeclaration */:
-            case 239 /* FunctionDeclaration */:
-            case 244 /* ModuleDeclaration */:
-            case 242 /* TypeAliasDeclaration */:
-            case 241 /* InterfaceDeclaration */:
-            case 243 /* EnumDeclaration */:
+            case 250 /* ImportDeclaration */:
+            case 249 /* ImportEqualsDeclaration */:
+            case 220 /* VariableStatement */:
+            case 241 /* ClassDeclaration */:
+            case 240 /* FunctionDeclaration */:
+            case 245 /* ModuleDeclaration */:
+            case 243 /* TypeAliasDeclaration */:
+            case 242 /* InterfaceDeclaration */:
+            case 244 /* EnumDeclaration */:
                 return true;
             default:
                 return false;
@@ -9068,13 +9289,13 @@ var ts;
     ts.getNameFromIndexInfo = getNameFromIndexInfo;
     function getTextOfPropertyName(name) {
         switch (name.kind) {
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 return name.escapedText;
             case 10 /* StringLiteral */:
             case 8 /* NumericLiteral */:
             case 14 /* NoSubstitutionTemplateLiteral */:
                 return ts.escapeLeadingUnderscores(name.text);
-            case 149 /* ComputedPropertyName */:
+            case 150 /* ComputedPropertyName */:
                 if (isStringOrNumericLiteralLike(name.expression))
                     return ts.escapeLeadingUnderscores(name.expression.text);
                 return ts.Debug.fail("Text of property name cannot be read from non-literal-valued ComputedPropertyNames");
@@ -9085,11 +9306,11 @@ var ts;
     ts.getTextOfPropertyName = getTextOfPropertyName;
     function entityNameToString(name) {
         switch (name.kind) {
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 return getFullWidth(name) === 0 ? ts.idText(name) : getTextOfNode(name);
-            case 148 /* QualifiedName */:
+            case 149 /* QualifiedName */:
                 return entityNameToString(name.left) + "." + entityNameToString(name.right);
-            case 189 /* PropertyAccessExpression */:
+            case 190 /* PropertyAccessExpression */:
                 return entityNameToString(name.expression) + "." + entityNameToString(name.name);
             default:
                 throw ts.Debug.assertNever(name);
@@ -9134,7 +9355,7 @@ var ts;
     ts.getSpanOfTokenAtPosition = getSpanOfTokenAtPosition;
     function getErrorSpanForArrowFunction(sourceFile, node) {
         var pos = ts.skipTrivia(sourceFile.text, node.pos);
-        if (node.body && node.body.kind === 218 /* Block */) {
+        if (node.body && node.body.kind === 219 /* Block */) {
             var startLine = ts.getLineAndCharacterOfPosition(sourceFile, node.body.pos).line;
             var endLine = ts.getLineAndCharacterOfPosition(sourceFile, node.body.end).line;
             if (startLine < endLine) {
@@ -9148,7 +9369,7 @@ var ts;
     function getErrorSpanForNode(sourceFile, node) {
         var errorNode = node;
         switch (node.kind) {
-            case 284 /* SourceFile */:
+            case 285 /* SourceFile */:
                 var pos_1 = ts.skipTrivia(sourceFile.text, 0, /*stopAfterLineBreak*/ false);
                 if (pos_1 === sourceFile.text.length) {
                     // file is empty - return span for the beginning of the file
@@ -9157,25 +9378,25 @@ var ts;
                 return getSpanOfTokenAtPosition(sourceFile, pos_1);
             // This list is a work in progress. Add missing node kinds to improve their error
             // spans.
-            case 237 /* VariableDeclaration */:
-            case 186 /* BindingElement */:
-            case 240 /* ClassDeclaration */:
-            case 209 /* ClassExpression */:
-            case 241 /* InterfaceDeclaration */:
-            case 244 /* ModuleDeclaration */:
-            case 243 /* EnumDeclaration */:
-            case 278 /* EnumMember */:
-            case 239 /* FunctionDeclaration */:
-            case 196 /* FunctionExpression */:
-            case 156 /* MethodDeclaration */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
-            case 242 /* TypeAliasDeclaration */:
-            case 154 /* PropertyDeclaration */:
-            case 153 /* PropertySignature */:
+            case 238 /* VariableDeclaration */:
+            case 187 /* BindingElement */:
+            case 241 /* ClassDeclaration */:
+            case 210 /* ClassExpression */:
+            case 242 /* InterfaceDeclaration */:
+            case 245 /* ModuleDeclaration */:
+            case 244 /* EnumDeclaration */:
+            case 279 /* EnumMember */:
+            case 240 /* FunctionDeclaration */:
+            case 197 /* FunctionExpression */:
+            case 157 /* MethodDeclaration */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
+            case 243 /* TypeAliasDeclaration */:
+            case 155 /* PropertyDeclaration */:
+            case 154 /* PropertySignature */:
                 errorNode = node.name;
                 break;
-            case 197 /* ArrowFunction */:
+            case 198 /* ArrowFunction */:
                 return getErrorSpanForArrowFunction(sourceFile, node);
         }
         if (errorNode === undefined) {
@@ -9224,11 +9445,11 @@ var ts;
     }
     ts.isLet = isLet;
     function isSuperCall(n) {
-        return n.kind === 191 /* CallExpression */ && n.expression.kind === 98 /* SuperKeyword */;
+        return n.kind === 192 /* CallExpression */ && n.expression.kind === 99 /* SuperKeyword */;
     }
     ts.isSuperCall = isSuperCall;
     function isImportCall(n) {
-        return n.kind === 191 /* CallExpression */ && n.expression.kind === 92 /* ImportKeyword */;
+        return n.kind === 192 /* CallExpression */ && n.expression.kind === 93 /* ImportKeyword */;
     }
     ts.isImportCall = isImportCall;
     function isLiteralImportTypeNode(n) {
@@ -9236,7 +9457,7 @@ var ts;
     }
     ts.isLiteralImportTypeNode = isLiteralImportTypeNode;
     function isPrologueDirective(node) {
-        return node.kind === 221 /* ExpressionStatement */
+        return node.kind === 222 /* ExpressionStatement */
             && node.expression.kind === 10 /* StringLiteral */;
     }
     ts.isPrologueDirective = isPrologueDirective;
@@ -9245,11 +9466,11 @@ var ts;
     }
     ts.getLeadingCommentRangesOfNode = getLeadingCommentRangesOfNode;
     function getJSDocCommentRanges(node, text) {
-        var commentRanges = (node.kind === 151 /* Parameter */ ||
-            node.kind === 150 /* TypeParameter */ ||
-            node.kind === 196 /* FunctionExpression */ ||
-            node.kind === 197 /* ArrowFunction */ ||
-            node.kind === 195 /* ParenthesizedExpression */) ?
+        var commentRanges = (node.kind === 152 /* Parameter */ ||
+            node.kind === 151 /* TypeParameter */ ||
+            node.kind === 197 /* FunctionExpression */ ||
+            node.kind === 198 /* ArrowFunction */ ||
+            node.kind === 196 /* ParenthesizedExpression */) ?
             ts.concatenate(ts.getTrailingCommentRanges(text, node.pos), ts.getLeadingCommentRanges(text, node.pos)) :
             ts.getLeadingCommentRanges(text, node.pos);
         // True if the comment starts with '/**' but not if it is '/**/'
@@ -9265,48 +9486,48 @@ var ts;
     ts.fullTripleSlashAMDReferencePathRegEx = /^(\/\/\/\s*<amd-dependency\s+path\s*=\s*)('|")(.+?)\2.*?\/>/;
     var defaultLibReferenceRegEx = /^(\/\/\/\s*<reference\s+no-default-lib\s*=\s*)('|")(.+?)\2\s*\/>/;
     function isPartOfTypeNode(node) {
-        if (163 /* FirstTypeNode */ <= node.kind && node.kind <= 183 /* LastTypeNode */) {
+        if (164 /* FirstTypeNode */ <= node.kind && node.kind <= 184 /* LastTypeNode */) {
             return true;
         }
         switch (node.kind) {
-            case 120 /* AnyKeyword */:
-            case 143 /* UnknownKeyword */:
-            case 135 /* NumberKeyword */:
-            case 146 /* BigIntKeyword */:
-            case 138 /* StringKeyword */:
-            case 123 /* BooleanKeyword */:
-            case 139 /* SymbolKeyword */:
-            case 136 /* ObjectKeyword */:
-            case 141 /* UndefinedKeyword */:
-            case 132 /* NeverKeyword */:
+            case 121 /* AnyKeyword */:
+            case 144 /* UnknownKeyword */:
+            case 136 /* NumberKeyword */:
+            case 147 /* BigIntKeyword */:
+            case 139 /* StringKeyword */:
+            case 124 /* BooleanKeyword */:
+            case 140 /* SymbolKeyword */:
+            case 137 /* ObjectKeyword */:
+            case 142 /* UndefinedKeyword */:
+            case 133 /* NeverKeyword */:
                 return true;
-            case 106 /* VoidKeyword */:
-                return node.parent.kind !== 200 /* VoidExpression */;
-            case 211 /* ExpressionWithTypeArguments */:
+            case 107 /* VoidKeyword */:
+                return node.parent.kind !== 201 /* VoidExpression */;
+            case 212 /* ExpressionWithTypeArguments */:
                 return !isExpressionWithTypeArgumentsInClassExtendsClause(node);
-            case 150 /* TypeParameter */:
-                return node.parent.kind === 181 /* MappedType */ || node.parent.kind === 176 /* InferType */;
+            case 151 /* TypeParameter */:
+                return node.parent.kind === 182 /* MappedType */ || node.parent.kind === 177 /* InferType */;
             // Identifiers and qualified names may be type nodes, depending on their context. Climb
             // above them to find the lowest container
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 // If the identifier is the RHS of a qualified name, then it's a type iff its parent is.
-                if (node.parent.kind === 148 /* QualifiedName */ && node.parent.right === node) {
+                if (node.parent.kind === 149 /* QualifiedName */ && node.parent.right === node) {
                     node = node.parent;
                 }
-                else if (node.parent.kind === 189 /* PropertyAccessExpression */ && node.parent.name === node) {
+                else if (node.parent.kind === 190 /* PropertyAccessExpression */ && node.parent.name === node) {
                     node = node.parent;
                 }
                 // At this point, node is either a qualified name or an identifier
-                ts.Debug.assert(node.kind === 72 /* Identifier */ || node.kind === 148 /* QualifiedName */ || node.kind === 189 /* PropertyAccessExpression */, "'node' was expected to be a qualified name, identifier or property access in 'isPartOfTypeNode'.");
+                ts.Debug.assert(node.kind === 73 /* Identifier */ || node.kind === 149 /* QualifiedName */ || node.kind === 190 /* PropertyAccessExpression */, "'node' was expected to be a qualified name, identifier or property access in 'isPartOfTypeNode'.");
             // falls through
-            case 148 /* QualifiedName */:
-            case 189 /* PropertyAccessExpression */:
-            case 100 /* ThisKeyword */: {
+            case 149 /* QualifiedName */:
+            case 190 /* PropertyAccessExpression */:
+            case 101 /* ThisKeyword */: {
                 var parent = node.parent;
-                if (parent.kind === 167 /* TypeQuery */) {
+                if (parent.kind === 168 /* TypeQuery */) {
                     return false;
                 }
-                if (parent.kind === 183 /* ImportType */) {
+                if (parent.kind === 184 /* ImportType */) {
                     return !parent.isTypeOf;
                 }
                 // Do not recursively call isPartOfTypeNode on the parent. In the example:
@@ -9315,40 +9536,40 @@ var ts;
                 //
                 // Calling isPartOfTypeNode would consider the qualified name A.B a type node.
                 // Only C and A.B.C are type nodes.
-                if (163 /* FirstTypeNode */ <= parent.kind && parent.kind <= 183 /* LastTypeNode */) {
+                if (164 /* FirstTypeNode */ <= parent.kind && parent.kind <= 184 /* LastTypeNode */) {
                     return true;
                 }
                 switch (parent.kind) {
-                    case 211 /* ExpressionWithTypeArguments */:
+                    case 212 /* ExpressionWithTypeArguments */:
                         return !isExpressionWithTypeArgumentsInClassExtendsClause(parent);
-                    case 150 /* TypeParameter */:
+                    case 151 /* TypeParameter */:
                         return node === parent.constraint;
-                    case 308 /* JSDocTemplateTag */:
+                    case 310 /* JSDocTemplateTag */:
                         return node === parent.constraint;
-                    case 154 /* PropertyDeclaration */:
-                    case 153 /* PropertySignature */:
-                    case 151 /* Parameter */:
-                    case 237 /* VariableDeclaration */:
+                    case 155 /* PropertyDeclaration */:
+                    case 154 /* PropertySignature */:
+                    case 152 /* Parameter */:
+                    case 238 /* VariableDeclaration */:
                         return node === parent.type;
-                    case 239 /* FunctionDeclaration */:
-                    case 196 /* FunctionExpression */:
-                    case 197 /* ArrowFunction */:
-                    case 157 /* Constructor */:
-                    case 156 /* MethodDeclaration */:
-                    case 155 /* MethodSignature */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
+                    case 240 /* FunctionDeclaration */:
+                    case 197 /* FunctionExpression */:
+                    case 198 /* ArrowFunction */:
+                    case 158 /* Constructor */:
+                    case 157 /* MethodDeclaration */:
+                    case 156 /* MethodSignature */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
                         return node === parent.type;
-                    case 160 /* CallSignature */:
-                    case 161 /* ConstructSignature */:
-                    case 162 /* IndexSignature */:
+                    case 161 /* CallSignature */:
+                    case 162 /* ConstructSignature */:
+                    case 163 /* IndexSignature */:
                         return node === parent.type;
-                    case 194 /* TypeAssertionExpression */:
+                    case 195 /* TypeAssertionExpression */:
                         return node === parent.type;
-                    case 191 /* CallExpression */:
-                    case 192 /* NewExpression */:
+                    case 192 /* CallExpression */:
+                    case 193 /* NewExpression */:
                         return ts.contains(parent.typeArguments, node);
-                    case 193 /* TaggedTemplateExpression */:
+                    case 194 /* TaggedTemplateExpression */:
                         // TODO (drosen): TaggedTemplateExpressions may eventually support type arguments.
                         return false;
                 }
@@ -9373,23 +9594,23 @@ var ts;
         return traverse(body);
         function traverse(node) {
             switch (node.kind) {
-                case 230 /* ReturnStatement */:
+                case 231 /* ReturnStatement */:
                     return visitor(node);
-                case 246 /* CaseBlock */:
-                case 218 /* Block */:
-                case 222 /* IfStatement */:
-                case 223 /* DoStatement */:
-                case 224 /* WhileStatement */:
-                case 225 /* ForStatement */:
-                case 226 /* ForInStatement */:
-                case 227 /* ForOfStatement */:
-                case 231 /* WithStatement */:
-                case 232 /* SwitchStatement */:
-                case 271 /* CaseClause */:
-                case 272 /* DefaultClause */:
-                case 233 /* LabeledStatement */:
-                case 235 /* TryStatement */:
-                case 274 /* CatchClause */:
+                case 247 /* CaseBlock */:
+                case 219 /* Block */:
+                case 223 /* IfStatement */:
+                case 224 /* DoStatement */:
+                case 225 /* WhileStatement */:
+                case 226 /* ForStatement */:
+                case 227 /* ForInStatement */:
+                case 228 /* ForOfStatement */:
+                case 232 /* WithStatement */:
+                case 233 /* SwitchStatement */:
+                case 272 /* CaseClause */:
+                case 273 /* DefaultClause */:
+                case 234 /* LabeledStatement */:
+                case 236 /* TryStatement */:
+                case 275 /* CatchClause */:
                     return ts.forEachChild(node, traverse);
             }
         }
@@ -9399,26 +9620,26 @@ var ts;
         return traverse(body);
         function traverse(node) {
             switch (node.kind) {
-                case 207 /* YieldExpression */:
+                case 208 /* YieldExpression */:
                     visitor(node);
                     var operand = node.expression;
                     if (operand) {
                         traverse(operand);
                     }
                     return;
-                case 243 /* EnumDeclaration */:
-                case 241 /* InterfaceDeclaration */:
-                case 244 /* ModuleDeclaration */:
-                case 242 /* TypeAliasDeclaration */:
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
+                case 244 /* EnumDeclaration */:
+                case 242 /* InterfaceDeclaration */:
+                case 245 /* ModuleDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
                     // These are not allowed inside a generator now, but eventually they may be allowed
                     // as local types. Regardless, any yield statements contained within them should be
                     // skipped in this traversal.
                     return;
                 default:
                     if (ts.isFunctionLike(node)) {
-                        if (node.name && node.name.kind === 149 /* ComputedPropertyName */) {
+                        if (node.name && node.name.kind === 150 /* ComputedPropertyName */) {
                             // Note that we will not include methods/accessors of a class because they would require
                             // first descending into the class. This is by design.
                             traverse(node.name.expression);
@@ -9441,10 +9662,10 @@ var ts;
      * @param node The type node.
      */
     function getRestParameterElementType(node) {
-        if (node && node.kind === 169 /* ArrayType */) {
+        if (node && node.kind === 170 /* ArrayType */) {
             return node.elementType;
         }
-        else if (node && node.kind === 164 /* TypeReference */) {
+        else if (node && node.kind === 165 /* TypeReference */) {
             return ts.singleOrUndefined(node.typeArguments);
         }
         else {
@@ -9454,12 +9675,12 @@ var ts;
     ts.getRestParameterElementType = getRestParameterElementType;
     function getMembersOfDeclaration(node) {
         switch (node.kind) {
-            case 241 /* InterfaceDeclaration */:
-            case 240 /* ClassDeclaration */:
-            case 209 /* ClassExpression */:
-            case 168 /* TypeLiteral */:
+            case 242 /* InterfaceDeclaration */:
+            case 241 /* ClassDeclaration */:
+            case 210 /* ClassExpression */:
+            case 169 /* TypeLiteral */:
                 return node.members;
-            case 188 /* ObjectLiteralExpression */:
+            case 189 /* ObjectLiteralExpression */:
                 return node.properties;
         }
     }
@@ -9467,14 +9688,14 @@ var ts;
     function isVariableLike(node) {
         if (node) {
             switch (node.kind) {
-                case 186 /* BindingElement */:
-                case 278 /* EnumMember */:
-                case 151 /* Parameter */:
-                case 275 /* PropertyAssignment */:
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
-                case 276 /* ShorthandPropertyAssignment */:
-                case 237 /* VariableDeclaration */:
+                case 187 /* BindingElement */:
+                case 279 /* EnumMember */:
+                case 152 /* Parameter */:
+                case 276 /* PropertyAssignment */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
+                case 277 /* ShorthandPropertyAssignment */:
+                case 238 /* VariableDeclaration */:
                     return true;
             }
         }
@@ -9486,8 +9707,8 @@ var ts;
     }
     ts.isVariableLikeOrAccessor = isVariableLikeOrAccessor;
     function isVariableDeclarationInVariableStatement(node) {
-        return node.parent.kind === 238 /* VariableDeclarationList */
-            && node.parent.parent.kind === 219 /* VariableStatement */;
+        return node.parent.kind === 239 /* VariableDeclarationList */
+            && node.parent.parent.kind === 220 /* VariableStatement */;
     }
     ts.isVariableDeclarationInVariableStatement = isVariableDeclarationInVariableStatement;
     function isValidESSymbolDeclaration(node) {
@@ -9498,13 +9719,13 @@ var ts;
     ts.isValidESSymbolDeclaration = isValidESSymbolDeclaration;
     function introducesArgumentsExoticObject(node) {
         switch (node.kind) {
-            case 156 /* MethodDeclaration */:
-            case 155 /* MethodSignature */:
-            case 157 /* Constructor */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
-            case 239 /* FunctionDeclaration */:
-            case 196 /* FunctionExpression */:
+            case 157 /* MethodDeclaration */:
+            case 156 /* MethodSignature */:
+            case 158 /* Constructor */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
+            case 240 /* FunctionDeclaration */:
+            case 197 /* FunctionExpression */:
                 return true;
         }
         return false;
@@ -9515,7 +9736,7 @@ var ts;
             if (beforeUnwrapLabelCallback) {
                 beforeUnwrapLabelCallback(node);
             }
-            if (node.statement.kind !== 233 /* LabeledStatement */) {
+            if (node.statement.kind !== 234 /* LabeledStatement */) {
                 return node.statement;
             }
             node = node.statement;
@@ -9523,17 +9744,17 @@ var ts;
     }
     ts.unwrapInnermostStatementOfLabel = unwrapInnermostStatementOfLabel;
     function isFunctionBlock(node) {
-        return node && node.kind === 218 /* Block */ && ts.isFunctionLike(node.parent);
+        return node && node.kind === 219 /* Block */ && ts.isFunctionLike(node.parent);
     }
     ts.isFunctionBlock = isFunctionBlock;
     function isObjectLiteralMethod(node) {
-        return node && node.kind === 156 /* MethodDeclaration */ && node.parent.kind === 188 /* ObjectLiteralExpression */;
+        return node && node.kind === 157 /* MethodDeclaration */ && node.parent.kind === 189 /* ObjectLiteralExpression */;
     }
     ts.isObjectLiteralMethod = isObjectLiteralMethod;
     function isObjectLiteralOrClassExpressionMethod(node) {
-        return node.kind === 156 /* MethodDeclaration */ &&
-            (node.parent.kind === 188 /* ObjectLiteralExpression */ ||
-                node.parent.kind === 209 /* ClassExpression */);
+        return node.kind === 157 /* MethodDeclaration */ &&
+            (node.parent.kind === 189 /* ObjectLiteralExpression */ ||
+                node.parent.kind === 210 /* ClassExpression */);
     }
     ts.isObjectLiteralOrClassExpressionMethod = isObjectLiteralOrClassExpressionMethod;
     function isIdentifierTypePredicate(predicate) {
@@ -9546,7 +9767,7 @@ var ts;
     ts.isThisTypePredicate = isThisTypePredicate;
     function getPropertyAssignment(objectLiteral, key, key2) {
         return objectLiteral.properties.filter(function (property) {
-            if (property.kind === 275 /* PropertyAssignment */) {
+            if (property.kind === 276 /* PropertyAssignment */) {
                 var propName = getTextOfPropertyName(property.name);
                 return key === propName || (!!key2 && key2 === propName);
             }
@@ -9578,19 +9799,23 @@ var ts;
         return findAncestor(node.parent, ts.isFunctionLike);
     }
     ts.getContainingFunction = getContainingFunction;
+    function getContainingFunctionDeclaration(node) {
+        return findAncestor(node.parent, ts.isFunctionLikeDeclaration);
+    }
+    ts.getContainingFunctionDeclaration = getContainingFunctionDeclaration;
     function getContainingClass(node) {
         return findAncestor(node.parent, ts.isClassLike);
     }
     ts.getContainingClass = getContainingClass;
     function getThisContainer(node, includeArrowFunctions) {
-        ts.Debug.assert(node.kind !== 284 /* SourceFile */);
+        ts.Debug.assert(node.kind !== 285 /* SourceFile */);
         while (true) {
             node = node.parent;
             if (!node) {
                 return ts.Debug.fail(); // If we never pass in a SourceFile, this should be unreachable, since we'll stop when we reach that.
             }
             switch (node.kind) {
-                case 149 /* ComputedPropertyName */:
+                case 150 /* ComputedPropertyName */:
                     // If the grandparent node is an object literal (as opposed to a class),
                     // then the computed property is not a 'this' container.
                     // A computed property name in a class needs to be a this container
@@ -9605,9 +9830,9 @@ var ts;
                     // the *body* of the container.
                     node = node.parent;
                     break;
-                case 152 /* Decorator */:
+                case 153 /* Decorator */:
                     // Decorators are always applied outside of the body of a class or method.
-                    if (node.parent.kind === 151 /* Parameter */ && ts.isClassElement(node.parent.parent)) {
+                    if (node.parent.kind === 152 /* Parameter */ && ts.isClassElement(node.parent.parent)) {
                         // If the decorator's parent is a Parameter, we resolve the this container from
                         // the grandparent class declaration.
                         node = node.parent.parent;
@@ -9618,26 +9843,26 @@ var ts;
                         node = node.parent;
                     }
                     break;
-                case 197 /* ArrowFunction */:
+                case 198 /* ArrowFunction */:
                     if (!includeArrowFunctions) {
                         continue;
                     }
                 // falls through
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
-                case 244 /* ModuleDeclaration */:
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
-                case 157 /* Constructor */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
-                case 160 /* CallSignature */:
-                case 161 /* ConstructSignature */:
-                case 162 /* IndexSignature */:
-                case 243 /* EnumDeclaration */:
-                case 284 /* SourceFile */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 245 /* ModuleDeclaration */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
+                case 158 /* Constructor */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
+                case 161 /* CallSignature */:
+                case 162 /* ConstructSignature */:
+                case 163 /* IndexSignature */:
+                case 244 /* EnumDeclaration */:
+                case 285 /* SourceFile */:
                     return node;
             }
         }
@@ -9647,9 +9872,9 @@ var ts;
         var container = getThisContainer(node, /*includeArrowFunctions*/ false);
         if (container) {
             switch (container.kind) {
-                case 157 /* Constructor */:
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
+                case 158 /* Constructor */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
                     return container;
             }
         }
@@ -9671,27 +9896,27 @@ var ts;
                 return node;
             }
             switch (node.kind) {
-                case 149 /* ComputedPropertyName */:
+                case 150 /* ComputedPropertyName */:
                     node = node.parent;
                     break;
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
                     if (!stopOnFunctions) {
                         continue;
                     }
                 // falls through
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
-                case 157 /* Constructor */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
+                case 158 /* Constructor */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     return node;
-                case 152 /* Decorator */:
+                case 153 /* Decorator */:
                     // Decorators are always applied outside of the body of a class or method.
-                    if (node.parent.kind === 151 /* Parameter */ && ts.isClassElement(node.parent.parent)) {
+                    if (node.parent.kind === 152 /* Parameter */ && ts.isClassElement(node.parent.parent)) {
                         // If the decorator's parent is a Parameter, we resolve the this container from
                         // the grandparent class declaration.
                         node = node.parent.parent;
@@ -9707,21 +9932,21 @@ var ts;
     }
     ts.getSuperContainer = getSuperContainer;
     function getImmediatelyInvokedFunctionExpression(func) {
-        if (func.kind === 196 /* FunctionExpression */ || func.kind === 197 /* ArrowFunction */) {
+        if (func.kind === 197 /* FunctionExpression */ || func.kind === 198 /* ArrowFunction */) {
             var prev = func;
             var parent = func.parent;
-            while (parent.kind === 195 /* ParenthesizedExpression */) {
+            while (parent.kind === 196 /* ParenthesizedExpression */) {
                 prev = parent;
                 parent = parent.parent;
             }
-            if (parent.kind === 191 /* CallExpression */ && parent.expression === prev) {
+            if (parent.kind === 192 /* CallExpression */ && parent.expression === prev) {
                 return parent;
             }
         }
     }
     ts.getImmediatelyInvokedFunctionExpression = getImmediatelyInvokedFunctionExpression;
     function isSuperOrSuperProperty(node) {
-        return node.kind === 98 /* SuperKeyword */
+        return node.kind === 99 /* SuperKeyword */
             || isSuperProperty(node);
     }
     ts.isSuperOrSuperProperty = isSuperOrSuperProperty;
@@ -9730,8 +9955,8 @@ var ts;
      */
     function isSuperProperty(node) {
         var kind = node.kind;
-        return (kind === 189 /* PropertyAccessExpression */ || kind === 190 /* ElementAccessExpression */)
-            && node.expression.kind === 98 /* SuperKeyword */;
+        return (kind === 190 /* PropertyAccessExpression */ || kind === 191 /* ElementAccessExpression */)
+            && node.expression.kind === 99 /* SuperKeyword */;
     }
     ts.isSuperProperty = isSuperProperty;
     /**
@@ -9739,20 +9964,20 @@ var ts;
      */
     function isThisProperty(node) {
         var kind = node.kind;
-        return (kind === 189 /* PropertyAccessExpression */ || kind === 190 /* ElementAccessExpression */)
-            && node.expression.kind === 100 /* ThisKeyword */;
+        return (kind === 190 /* PropertyAccessExpression */ || kind === 191 /* ElementAccessExpression */)
+            && node.expression.kind === 101 /* ThisKeyword */;
     }
     ts.isThisProperty = isThisProperty;
     function getEntityNameFromTypeNode(node) {
         switch (node.kind) {
-            case 164 /* TypeReference */:
+            case 165 /* TypeReference */:
                 return node.typeName;
-            case 211 /* ExpressionWithTypeArguments */:
+            case 212 /* ExpressionWithTypeArguments */:
                 return isEntityNameExpression(node.expression)
                     ? node.expression
                     : undefined;
-            case 72 /* Identifier */:
-            case 148 /* QualifiedName */:
+            case 73 /* Identifier */:
+            case 149 /* QualifiedName */:
                 return node;
         }
         return undefined;
@@ -9760,10 +9985,10 @@ var ts;
     ts.getEntityNameFromTypeNode = getEntityNameFromTypeNode;
     function getInvokedExpression(node) {
         switch (node.kind) {
-            case 193 /* TaggedTemplateExpression */:
+            case 194 /* TaggedTemplateExpression */:
                 return node.tag;
-            case 262 /* JsxOpeningElement */:
-            case 261 /* JsxSelfClosingElement */:
+            case 263 /* JsxOpeningElement */:
+            case 262 /* JsxSelfClosingElement */:
                 return node.tagName;
             default:
                 return node.expression;
@@ -9772,25 +9997,25 @@ var ts;
     ts.getInvokedExpression = getInvokedExpression;
     function nodeCanBeDecorated(node, parent, grandparent) {
         switch (node.kind) {
-            case 240 /* ClassDeclaration */:
+            case 241 /* ClassDeclaration */:
                 // classes are valid targets
                 return true;
-            case 154 /* PropertyDeclaration */:
+            case 155 /* PropertyDeclaration */:
                 // property declarations are valid if their parent is a class declaration.
-                return parent.kind === 240 /* ClassDeclaration */;
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
-            case 156 /* MethodDeclaration */:
+                return parent.kind === 241 /* ClassDeclaration */;
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
+            case 157 /* MethodDeclaration */:
                 // if this method has a body and its parent is a class declaration, this is a valid target.
                 return node.body !== undefined
-                    && parent.kind === 240 /* ClassDeclaration */;
-            case 151 /* Parameter */:
+                    && parent.kind === 241 /* ClassDeclaration */;
+            case 152 /* Parameter */:
                 // if the parameter's parent has a body and its grandparent is a class declaration, this is a valid target;
                 return parent.body !== undefined
-                    && (parent.kind === 157 /* Constructor */
-                        || parent.kind === 156 /* MethodDeclaration */
-                        || parent.kind === 159 /* SetAccessor */)
-                    && grandparent.kind === 240 /* ClassDeclaration */;
+                    && (parent.kind === 158 /* Constructor */
+                        || parent.kind === 157 /* MethodDeclaration */
+                        || parent.kind === 160 /* SetAccessor */)
+                    && grandparent.kind === 241 /* ClassDeclaration */;
         }
         return false;
     }
@@ -9806,10 +10031,10 @@ var ts;
     ts.nodeOrChildIsDecorated = nodeOrChildIsDecorated;
     function childIsDecorated(node, parent) {
         switch (node.kind) {
-            case 240 /* ClassDeclaration */:
+            case 241 /* ClassDeclaration */:
                 return ts.some(node.members, function (m) { return nodeOrChildIsDecorated(m, node, parent); }); // TODO: GH#18217
-            case 156 /* MethodDeclaration */:
-            case 159 /* SetAccessor */:
+            case 157 /* MethodDeclaration */:
+            case 160 /* SetAccessor */:
                 return ts.some(node.parameters, function (p) { return nodeIsDecorated(p, node, parent); }); // TODO: GH#18217
             default:
                 return false;
@@ -9818,9 +10043,9 @@ var ts;
     ts.childIsDecorated = childIsDecorated;
     function isJSXTagName(node) {
         var parent = node.parent;
-        if (parent.kind === 262 /* JsxOpeningElement */ ||
-            parent.kind === 261 /* JsxSelfClosingElement */ ||
-            parent.kind === 263 /* JsxClosingElement */) {
+        if (parent.kind === 263 /* JsxOpeningElement */ ||
+            parent.kind === 262 /* JsxSelfClosingElement */ ||
+            parent.kind === 264 /* JsxClosingElement */) {
             return parent.tagName === node;
         }
         return false;
@@ -9828,57 +10053,57 @@ var ts;
     ts.isJSXTagName = isJSXTagName;
     function isExpressionNode(node) {
         switch (node.kind) {
-            case 98 /* SuperKeyword */:
-            case 96 /* NullKeyword */:
-            case 102 /* TrueKeyword */:
-            case 87 /* FalseKeyword */:
+            case 99 /* SuperKeyword */:
+            case 97 /* NullKeyword */:
+            case 103 /* TrueKeyword */:
+            case 88 /* FalseKeyword */:
             case 13 /* RegularExpressionLiteral */:
-            case 187 /* ArrayLiteralExpression */:
-            case 188 /* ObjectLiteralExpression */:
-            case 189 /* PropertyAccessExpression */:
-            case 190 /* ElementAccessExpression */:
-            case 191 /* CallExpression */:
-            case 192 /* NewExpression */:
-            case 193 /* TaggedTemplateExpression */:
-            case 212 /* AsExpression */:
-            case 194 /* TypeAssertionExpression */:
-            case 213 /* NonNullExpression */:
-            case 195 /* ParenthesizedExpression */:
-            case 196 /* FunctionExpression */:
-            case 209 /* ClassExpression */:
-            case 197 /* ArrowFunction */:
-            case 200 /* VoidExpression */:
-            case 198 /* DeleteExpression */:
-            case 199 /* TypeOfExpression */:
-            case 202 /* PrefixUnaryExpression */:
-            case 203 /* PostfixUnaryExpression */:
-            case 204 /* BinaryExpression */:
-            case 205 /* ConditionalExpression */:
-            case 208 /* SpreadElement */:
-            case 206 /* TemplateExpression */:
+            case 188 /* ArrayLiteralExpression */:
+            case 189 /* ObjectLiteralExpression */:
+            case 190 /* PropertyAccessExpression */:
+            case 191 /* ElementAccessExpression */:
+            case 192 /* CallExpression */:
+            case 193 /* NewExpression */:
+            case 194 /* TaggedTemplateExpression */:
+            case 213 /* AsExpression */:
+            case 195 /* TypeAssertionExpression */:
+            case 214 /* NonNullExpression */:
+            case 196 /* ParenthesizedExpression */:
+            case 197 /* FunctionExpression */:
+            case 210 /* ClassExpression */:
+            case 198 /* ArrowFunction */:
+            case 201 /* VoidExpression */:
+            case 199 /* DeleteExpression */:
+            case 200 /* TypeOfExpression */:
+            case 203 /* PrefixUnaryExpression */:
+            case 204 /* PostfixUnaryExpression */:
+            case 205 /* BinaryExpression */:
+            case 206 /* ConditionalExpression */:
+            case 209 /* SpreadElement */:
+            case 207 /* TemplateExpression */:
             case 14 /* NoSubstitutionTemplateLiteral */:
-            case 210 /* OmittedExpression */:
-            case 260 /* JsxElement */:
-            case 261 /* JsxSelfClosingElement */:
-            case 264 /* JsxFragment */:
-            case 207 /* YieldExpression */:
-            case 201 /* AwaitExpression */:
-            case 214 /* MetaProperty */:
+            case 211 /* OmittedExpression */:
+            case 261 /* JsxElement */:
+            case 262 /* JsxSelfClosingElement */:
+            case 265 /* JsxFragment */:
+            case 208 /* YieldExpression */:
+            case 202 /* AwaitExpression */:
+            case 215 /* MetaProperty */:
                 return true;
-            case 148 /* QualifiedName */:
-                while (node.parent.kind === 148 /* QualifiedName */) {
+            case 149 /* QualifiedName */:
+                while (node.parent.kind === 149 /* QualifiedName */) {
                     node = node.parent;
                 }
-                return node.parent.kind === 167 /* TypeQuery */ || isJSXTagName(node);
-            case 72 /* Identifier */:
-                if (node.parent.kind === 167 /* TypeQuery */ || isJSXTagName(node)) {
+                return node.parent.kind === 168 /* TypeQuery */ || isJSXTagName(node);
+            case 73 /* Identifier */:
+                if (node.parent.kind === 168 /* TypeQuery */ || isJSXTagName(node)) {
                     return true;
                 }
             // falls through
             case 8 /* NumericLiteral */:
             case 9 /* BigIntLiteral */:
             case 10 /* StringLiteral */:
-            case 100 /* ThisKeyword */:
+            case 101 /* ThisKeyword */:
                 return isInExpressionContext(node);
             default:
                 return false;
@@ -9888,49 +10113,49 @@ var ts;
     function isInExpressionContext(node) {
         var parent = node.parent;
         switch (parent.kind) {
-            case 237 /* VariableDeclaration */:
-            case 151 /* Parameter */:
-            case 154 /* PropertyDeclaration */:
-            case 153 /* PropertySignature */:
-            case 278 /* EnumMember */:
-            case 275 /* PropertyAssignment */:
-            case 186 /* BindingElement */:
+            case 238 /* VariableDeclaration */:
+            case 152 /* Parameter */:
+            case 155 /* PropertyDeclaration */:
+            case 154 /* PropertySignature */:
+            case 279 /* EnumMember */:
+            case 276 /* PropertyAssignment */:
+            case 187 /* BindingElement */:
                 return parent.initializer === node;
-            case 221 /* ExpressionStatement */:
-            case 222 /* IfStatement */:
-            case 223 /* DoStatement */:
-            case 224 /* WhileStatement */:
-            case 230 /* ReturnStatement */:
-            case 231 /* WithStatement */:
-            case 232 /* SwitchStatement */:
-            case 271 /* CaseClause */:
-            case 234 /* ThrowStatement */:
+            case 222 /* ExpressionStatement */:
+            case 223 /* IfStatement */:
+            case 224 /* DoStatement */:
+            case 225 /* WhileStatement */:
+            case 231 /* ReturnStatement */:
+            case 232 /* WithStatement */:
+            case 233 /* SwitchStatement */:
+            case 272 /* CaseClause */:
+            case 235 /* ThrowStatement */:
                 return parent.expression === node;
-            case 225 /* ForStatement */:
+            case 226 /* ForStatement */:
                 var forStatement = parent;
-                return (forStatement.initializer === node && forStatement.initializer.kind !== 238 /* VariableDeclarationList */) ||
+                return (forStatement.initializer === node && forStatement.initializer.kind !== 239 /* VariableDeclarationList */) ||
                     forStatement.condition === node ||
                     forStatement.incrementor === node;
-            case 226 /* ForInStatement */:
-            case 227 /* ForOfStatement */:
+            case 227 /* ForInStatement */:
+            case 228 /* ForOfStatement */:
                 var forInStatement = parent;
-                return (forInStatement.initializer === node && forInStatement.initializer.kind !== 238 /* VariableDeclarationList */) ||
+                return (forInStatement.initializer === node && forInStatement.initializer.kind !== 239 /* VariableDeclarationList */) ||
                     forInStatement.expression === node;
-            case 194 /* TypeAssertionExpression */:
-            case 212 /* AsExpression */:
+            case 195 /* TypeAssertionExpression */:
+            case 213 /* AsExpression */:
                 return node === parent.expression;
-            case 216 /* TemplateSpan */:
+            case 217 /* TemplateSpan */:
                 return node === parent.expression;
-            case 149 /* ComputedPropertyName */:
+            case 150 /* ComputedPropertyName */:
                 return node === parent.expression;
-            case 152 /* Decorator */:
-            case 270 /* JsxExpression */:
-            case 269 /* JsxSpreadAttribute */:
-            case 277 /* SpreadAssignment */:
+            case 153 /* Decorator */:
+            case 271 /* JsxExpression */:
+            case 270 /* JsxSpreadAttribute */:
+            case 278 /* SpreadAssignment */:
                 return true;
-            case 211 /* ExpressionWithTypeArguments */:
+            case 212 /* ExpressionWithTypeArguments */:
                 return parent.expression === node && isExpressionWithTypeArgumentsInClassExtendsClause(parent);
-            case 276 /* ShorthandPropertyAssignment */:
+            case 277 /* ShorthandPropertyAssignment */:
                 return parent.objectAssignmentInitializer === node;
             default:
                 return isExpressionNode(parent);
@@ -9938,7 +10163,7 @@ var ts;
     }
     ts.isInExpressionContext = isInExpressionContext;
     function isExternalModuleImportEqualsDeclaration(node) {
-        return node.kind === 248 /* ImportEqualsDeclaration */ && node.moduleReference.kind === 259 /* ExternalModuleReference */;
+        return node.kind === 249 /* ImportEqualsDeclaration */ && node.moduleReference.kind === 260 /* ExternalModuleReference */;
     }
     ts.isExternalModuleImportEqualsDeclaration = isExternalModuleImportEqualsDeclaration;
     function getExternalModuleImportEqualsDeclarationExpression(node) {
@@ -9947,7 +10172,7 @@ var ts;
     }
     ts.getExternalModuleImportEqualsDeclarationExpression = getExternalModuleImportEqualsDeclarationExpression;
     function isInternalModuleImportEqualsDeclaration(node) {
-        return node.kind === 248 /* ImportEqualsDeclaration */ && node.moduleReference.kind !== 259 /* ExternalModuleReference */;
+        return node.kind === 249 /* ImportEqualsDeclaration */ && node.moduleReference.kind !== 260 /* ExternalModuleReference */;
     }
     ts.isInternalModuleImportEqualsDeclaration = isInternalModuleImportEqualsDeclaration;
     function isSourceFileJS(file) {
@@ -9975,15 +10200,15 @@ var ts;
             ts.isIdentifier(node.typeName) &&
             node.typeName.escapedText === "Object" &&
             node.typeArguments && node.typeArguments.length === 2 &&
-            (node.typeArguments[0].kind === 138 /* StringKeyword */ || node.typeArguments[0].kind === 135 /* NumberKeyword */);
+            (node.typeArguments[0].kind === 139 /* StringKeyword */ || node.typeArguments[0].kind === 136 /* NumberKeyword */);
     }
     ts.isJSDocIndexSignature = isJSDocIndexSignature;
     function isRequireCall(callExpression, checkArgumentIsStringLiteralLike) {
-        if (callExpression.kind !== 191 /* CallExpression */) {
+        if (callExpression.kind !== 192 /* CallExpression */) {
             return false;
         }
         var _a = callExpression, expression = _a.expression, args = _a.arguments;
-        if (expression.kind !== 72 /* Identifier */ || expression.escapedText !== "require") {
+        if (expression.kind !== 73 /* Identifier */ || expression.escapedText !== "require") {
             return false;
         }
         if (args.length !== 1) {
@@ -10014,7 +10239,7 @@ var ts;
             name = node.parent.name;
             decl = node.parent;
         }
-        else if (ts.isBinaryExpression(node.parent) && node.parent.operatorToken.kind === 59 /* EqualsToken */ && node.parent.right === node) {
+        else if (ts.isBinaryExpression(node.parent) && node.parent.operatorToken.kind === 60 /* EqualsToken */ && node.parent.right === node) {
             name = node.parent.left;
             decl = name;
         }
@@ -10023,7 +10248,7 @@ var ts;
                 name = node.parent.parent.name;
                 decl = node.parent.parent;
             }
-            else if (ts.isBinaryExpression(node.parent.parent) && node.parent.parent.operatorToken.kind === 59 /* EqualsToken */ && node.parent.parent.right === node.parent) {
+            else if (ts.isBinaryExpression(node.parent.parent) && node.parent.parent.operatorToken.kind === 60 /* EqualsToken */ && node.parent.parent.right === node.parent) {
                 name = node.parent.parent.left;
                 decl = name;
             }
@@ -10065,7 +10290,7 @@ var ts;
      * We treat the right hand side of assignments with container-like initalizers as declarations.
      */
     function getAssignedExpandoInitializer(node) {
-        if (node && node.parent && ts.isBinaryExpression(node.parent) && node.parent.operatorToken.kind === 59 /* EqualsToken */) {
+        if (node && node.parent && ts.isBinaryExpression(node.parent) && node.parent.operatorToken.kind === 60 /* EqualsToken */) {
             var isPrototypeAssignment = isPrototypeAccess(node.parent.left);
             return getExpandoInitializer(node.parent.right, isPrototypeAssignment) ||
                 getDefaultedExpandoInitializer(node.parent.left, node.parent.right, isPrototypeAssignment);
@@ -10091,11 +10316,11 @@ var ts;
     function getExpandoInitializer(initializer, isPrototypeAssignment) {
         if (ts.isCallExpression(initializer)) {
             var e = skipParentheses(initializer.expression);
-            return e.kind === 196 /* FunctionExpression */ || e.kind === 197 /* ArrowFunction */ ? initializer : undefined;
+            return e.kind === 197 /* FunctionExpression */ || e.kind === 198 /* ArrowFunction */ ? initializer : undefined;
         }
-        if (initializer.kind === 196 /* FunctionExpression */ ||
-            initializer.kind === 209 /* ClassExpression */ ||
-            initializer.kind === 197 /* ArrowFunction */) {
+        if (initializer.kind === 197 /* FunctionExpression */ ||
+            initializer.kind === 210 /* ClassExpression */ ||
+            initializer.kind === 198 /* ArrowFunction */) {
             return initializer;
         }
         if (ts.isObjectLiteralExpression(initializer) && (initializer.properties.length === 0 || isPrototypeAssignment)) {
@@ -10119,7 +10344,7 @@ var ts;
     }
     function isDefaultedExpandoInitializer(node) {
         var name = ts.isVariableDeclaration(node.parent) ? node.parent.name :
-            ts.isBinaryExpression(node.parent) && node.parent.operatorToken.kind === 59 /* EqualsToken */ ? node.parent.left :
+            ts.isBinaryExpression(node.parent) && node.parent.operatorToken.kind === 60 /* EqualsToken */ ? node.parent.left :
                 undefined;
         return name && getExpandoInitializer(node.right, isPrototypeAccess(name)) && isEntityNameExpression(name) && isSameEntityName(name, node.left);
     }
@@ -10128,7 +10353,7 @@ var ts;
     function getNameOfExpando(node) {
         if (ts.isBinaryExpression(node.parent)) {
             var parent = (node.parent.operatorToken.kind === 55 /* BarBarToken */ && ts.isBinaryExpression(node.parent.parent)) ? node.parent.parent : node.parent;
-            if (parent.operatorToken.kind === 59 /* EqualsToken */ && ts.isIdentifier(parent.left)) {
+            if (parent.operatorToken.kind === 60 /* EqualsToken */ && ts.isIdentifier(parent.left)) {
                 return parent.left;
             }
         }
@@ -10151,7 +10376,7 @@ var ts;
             return name.escapedText === initializer.escapedText;
         }
         if (ts.isIdentifier(name) && ts.isPropertyAccessExpression(initializer)) {
-            return (initializer.expression.kind === 100 /* ThisKeyword */ ||
+            return (initializer.expression.kind === 101 /* ThisKeyword */ ||
                 ts.isIdentifier(initializer.expression) &&
                     (initializer.expression.escapedText === "window" ||
                         initializer.expression.escapedText === "self" ||
@@ -10209,7 +10434,7 @@ var ts;
             }
             return 7 /* ObjectDefinePropertyValue */;
         }
-        if (expr.operatorToken.kind !== 59 /* EqualsToken */ ||
+        if (expr.operatorToken.kind !== 60 /* EqualsToken */ ||
             !ts.isPropertyAccessExpression(expr.left)) {
             return 0 /* None */;
         }
@@ -10221,7 +10446,7 @@ var ts;
         return getAssignmentDeclarationPropertyAccessKind(lhs);
     }
     function getAssignmentDeclarationPropertyAccessKind(lhs) {
-        if (lhs.expression.kind === 100 /* ThisKeyword */) {
+        if (lhs.expression.kind === 101 /* ThisKeyword */) {
             return 4 /* ThisProperty */;
         }
         else if (isModuleExportsPropertyAccessExpression(lhs)) {
@@ -10263,7 +10488,7 @@ var ts;
     ts.isPrototypePropertyAssignment = isPrototypePropertyAssignment;
     function isSpecialPropertyDeclaration(expr) {
         return isInJSFile(expr) &&
-            expr.parent && expr.parent.kind === 221 /* ExpressionStatement */ &&
+            expr.parent && expr.parent.kind === 222 /* ExpressionStatement */ &&
             !!ts.getJSDocTypeTag(expr.parent);
     }
     ts.isSpecialPropertyDeclaration = isSpecialPropertyDeclaration;
@@ -10272,23 +10497,23 @@ var ts;
             return false;
         }
         var decl = symbol.valueDeclaration;
-        return decl.kind === 239 /* FunctionDeclaration */ || ts.isVariableDeclaration(decl) && decl.initializer && ts.isFunctionLike(decl.initializer);
+        return decl.kind === 240 /* FunctionDeclaration */ || ts.isVariableDeclaration(decl) && decl.initializer && ts.isFunctionLike(decl.initializer);
     }
     ts.isFunctionSymbol = isFunctionSymbol;
     function importFromModuleSpecifier(node) {
-        return tryGetImportFromModuleSpecifier(node) || ts.Debug.fail(ts.Debug.showSyntaxKind(node.parent));
+        return tryGetImportFromModuleSpecifier(node) || ts.Debug.failBadSyntaxKind(node.parent);
     }
     ts.importFromModuleSpecifier = importFromModuleSpecifier;
     function tryGetImportFromModuleSpecifier(node) {
         switch (node.parent.kind) {
-            case 249 /* ImportDeclaration */:
-            case 255 /* ExportDeclaration */:
+            case 250 /* ImportDeclaration */:
+            case 256 /* ExportDeclaration */:
                 return node.parent;
-            case 259 /* ExternalModuleReference */:
+            case 260 /* ExternalModuleReference */:
                 return node.parent.parent;
-            case 191 /* CallExpression */:
+            case 192 /* CallExpression */:
                 return isImportCall(node.parent) || isRequireCall(node.parent, /*checkArg*/ false) ? node.parent : undefined;
-            case 182 /* LiteralType */:
+            case 183 /* LiteralType */:
                 ts.Debug.assert(ts.isStringLiteral(node));
                 return ts.tryCast(node.parent.parent, ts.isImportTypeNode);
             default:
@@ -10298,12 +10523,12 @@ var ts;
     ts.tryGetImportFromModuleSpecifier = tryGetImportFromModuleSpecifier;
     function getExternalModuleName(node) {
         switch (node.kind) {
-            case 249 /* ImportDeclaration */:
-            case 255 /* ExportDeclaration */:
+            case 250 /* ImportDeclaration */:
+            case 256 /* ExportDeclaration */:
                 return node.moduleSpecifier;
-            case 248 /* ImportEqualsDeclaration */:
-                return node.moduleReference.kind === 259 /* ExternalModuleReference */ ? node.moduleReference.expression : undefined;
-            case 183 /* ImportType */:
+            case 249 /* ImportEqualsDeclaration */:
+                return node.moduleReference.kind === 260 /* ExternalModuleReference */ ? node.moduleReference.expression : undefined;
+            case 184 /* ImportType */:
                 return isLiteralImportTypeNode(node) ? node.argument.literal : undefined;
             default:
                 return ts.Debug.assertNever(node);
@@ -10312,11 +10537,11 @@ var ts;
     ts.getExternalModuleName = getExternalModuleName;
     function getNamespaceDeclarationNode(node) {
         switch (node.kind) {
-            case 249 /* ImportDeclaration */:
+            case 250 /* ImportDeclaration */:
                 return node.importClause && ts.tryCast(node.importClause.namedBindings, ts.isNamespaceImport);
-            case 248 /* ImportEqualsDeclaration */:
+            case 249 /* ImportEqualsDeclaration */:
                 return node;
-            case 255 /* ExportDeclaration */:
+            case 256 /* ExportDeclaration */:
                 return undefined;
             default:
                 return ts.Debug.assertNever(node);
@@ -10324,19 +10549,19 @@ var ts;
     }
     ts.getNamespaceDeclarationNode = getNamespaceDeclarationNode;
     function isDefaultImport(node) {
-        return node.kind === 249 /* ImportDeclaration */ && !!node.importClause && !!node.importClause.name;
+        return node.kind === 250 /* ImportDeclaration */ && !!node.importClause && !!node.importClause.name;
     }
     ts.isDefaultImport = isDefaultImport;
     function hasQuestionToken(node) {
         if (node) {
             switch (node.kind) {
-                case 151 /* Parameter */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
-                case 276 /* ShorthandPropertyAssignment */:
-                case 275 /* PropertyAssignment */:
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
+                case 152 /* Parameter */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
+                case 277 /* ShorthandPropertyAssignment */:
+                case 276 /* PropertyAssignment */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
                     return node.questionToken !== undefined;
             }
         }
@@ -10350,7 +10575,7 @@ var ts;
     }
     ts.isJSDocConstructSignature = isJSDocConstructSignature;
     function isJSDocTypeAlias(node) {
-        return node.kind === 309 /* JSDocTypedefTag */ || node.kind === 302 /* JSDocCallbackTag */;
+        return node.kind === 311 /* JSDocTypedefTag */ || node.kind === 304 /* JSDocCallbackTag */;
     }
     ts.isJSDocTypeAlias = isJSDocTypeAlias;
     function isTypeAlias(node) {
@@ -10360,7 +10585,7 @@ var ts;
     function getSourceOfAssignment(node) {
         return ts.isExpressionStatement(node) &&
             node.expression && ts.isBinaryExpression(node.expression) &&
-            node.expression.operatorToken.kind === 59 /* EqualsToken */
+            node.expression.operatorToken.kind === 60 /* EqualsToken */
             ? node.expression.right
             : undefined;
     }
@@ -10375,12 +10600,12 @@ var ts;
     }
     function getSingleInitializerOfVariableStatementOrPropertyDeclaration(node) {
         switch (node.kind) {
-            case 219 /* VariableStatement */:
+            case 220 /* VariableStatement */:
                 var v = getSingleVariableOfVariableStatement(node);
                 return v && v.initializer;
-            case 154 /* PropertyDeclaration */:
+            case 155 /* PropertyDeclaration */:
                 return node.initializer;
-            case 275 /* PropertyAssignment */:
+            case 276 /* PropertyAssignment */:
                 return node.initializer;
         }
     }
@@ -10391,7 +10616,7 @@ var ts;
     function getNestedModuleDeclaration(node) {
         return ts.isModuleDeclaration(node) &&
             node.body &&
-            node.body.kind === 244 /* ModuleDeclaration */
+            node.body.kind === 245 /* ModuleDeclaration */
             ? node.body
             : undefined;
     }
@@ -10399,18 +10624,18 @@ var ts;
         var result;
         // Pull parameter comments from declaring function as well
         if (isVariableLike(hostNode) && ts.hasInitializer(hostNode) && ts.hasJSDocNodes(hostNode.initializer)) {
-            result = ts.addRange(result, hostNode.initializer.jsDoc);
+            result = ts.append(result, ts.last(hostNode.initializer.jsDoc));
         }
         var node = hostNode;
         while (node && node.parent) {
             if (ts.hasJSDocNodes(node)) {
-                result = ts.addRange(result, node.jsDoc);
+                result = ts.append(result, ts.last(node.jsDoc));
             }
-            if (node.kind === 151 /* Parameter */) {
+            if (node.kind === 152 /* Parameter */) {
                 result = ts.addRange(result, ts.getJSDocParameterTags(node));
                 break;
             }
-            if (node.kind === 150 /* TypeParameter */) {
+            if (node.kind === 151 /* TypeParameter */) {
                 result = ts.addRange(result, ts.getJSDocTypeParameterTags(node));
                 break;
             }
@@ -10421,11 +10646,12 @@ var ts;
     ts.getJSDocCommentsAndTags = getJSDocCommentsAndTags;
     function getNextJSDocCommentLocation(node) {
         var parent = node.parent;
-        if (parent.kind === 275 /* PropertyAssignment */ ||
-            parent.kind === 154 /* PropertyDeclaration */ ||
-            parent.kind === 221 /* ExpressionStatement */ && node.kind === 189 /* PropertyAccessExpression */ ||
+        if (parent.kind === 276 /* PropertyAssignment */ ||
+            parent.kind === 255 /* ExportAssignment */ ||
+            parent.kind === 155 /* PropertyDeclaration */ ||
+            parent.kind === 222 /* ExpressionStatement */ && node.kind === 190 /* PropertyAccessExpression */ ||
             getNestedModuleDeclaration(parent) ||
-            ts.isBinaryExpression(node) && node.operatorToken.kind === 59 /* EqualsToken */) {
+            ts.isBinaryExpression(node) && node.operatorToken.kind === 60 /* EqualsToken */) {
             return parent;
         }
         // Try to recognize this pattern when node is initializer of variable declaration and JSDoc comments are on containing variable statement.
@@ -10436,7 +10662,7 @@ var ts;
         // var x = function(name) { return name.length; }
         else if (parent.parent &&
             (getSingleVariableOfVariableStatement(parent.parent) === node ||
-                ts.isBinaryExpression(parent) && parent.operatorToken.kind === 59 /* EqualsToken */)) {
+                ts.isBinaryExpression(parent) && parent.operatorToken.kind === 60 /* EqualsToken */)) {
             return parent.parent;
         }
         else if (parent.parent && parent.parent.parent &&
@@ -10459,7 +10685,7 @@ var ts;
         if (!decl) {
             return undefined;
         }
-        var parameter = ts.find(decl.parameters, function (p) { return p.name.kind === 72 /* Identifier */ && p.name.escapedText === name; });
+        var parameter = ts.find(decl.parameters, function (p) { return p.name.kind === 73 /* Identifier */ && p.name.escapedText === name; });
         return parameter && parameter.symbol;
     }
     ts.getParameterSymbolFromJSDoc = getParameterSymbolFromJSDoc;
@@ -10494,7 +10720,7 @@ var ts;
     ts.hasRestParameter = hasRestParameter;
     function isRestParameter(node) {
         var type = ts.isJSDocParameterTag(node) ? (node.typeExpression && node.typeExpression.type) : node.type;
-        return node.dotDotDotToken !== undefined || !!type && type.kind === 295 /* JSDocVariadicType */;
+        return node.dotDotDotToken !== undefined || !!type && type.kind === 296 /* JSDocVariadicType */;
     }
     ts.isRestParameter = isRestParameter;
     var AssignmentKind;
@@ -10507,31 +10733,31 @@ var ts;
         var parent = node.parent;
         while (true) {
             switch (parent.kind) {
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     var binaryOperator = parent.operatorToken.kind;
                     return isAssignmentOperator(binaryOperator) && parent.left === node ?
-                        binaryOperator === 59 /* EqualsToken */ ? 1 /* Definite */ : 2 /* Compound */ :
+                        binaryOperator === 60 /* EqualsToken */ ? 1 /* Definite */ : 2 /* Compound */ :
                         0 /* None */;
-                case 202 /* PrefixUnaryExpression */:
-                case 203 /* PostfixUnaryExpression */:
+                case 203 /* PrefixUnaryExpression */:
+                case 204 /* PostfixUnaryExpression */:
                     var unaryOperator = parent.operator;
                     return unaryOperator === 44 /* PlusPlusToken */ || unaryOperator === 45 /* MinusMinusToken */ ? 2 /* Compound */ : 0 /* None */;
-                case 226 /* ForInStatement */:
-                case 227 /* ForOfStatement */:
+                case 227 /* ForInStatement */:
+                case 228 /* ForOfStatement */:
                     return parent.initializer === node ? 1 /* Definite */ : 0 /* None */;
-                case 195 /* ParenthesizedExpression */:
-                case 187 /* ArrayLiteralExpression */:
-                case 208 /* SpreadElement */:
-                case 213 /* NonNullExpression */:
+                case 196 /* ParenthesizedExpression */:
+                case 188 /* ArrayLiteralExpression */:
+                case 209 /* SpreadElement */:
+                case 214 /* NonNullExpression */:
                     node = parent;
                     break;
-                case 276 /* ShorthandPropertyAssignment */:
+                case 277 /* ShorthandPropertyAssignment */:
                     if (parent.name !== node) {
                         return 0 /* None */;
                     }
                     node = parent.parent;
                     break;
-                case 275 /* PropertyAssignment */:
+                case 276 /* PropertyAssignment */:
                     if (parent.name === node) {
                         return 0 /* None */;
                     }
@@ -10558,22 +10784,22 @@ var ts;
      */
     function isNodeWithPossibleHoistedDeclaration(node) {
         switch (node.kind) {
-            case 218 /* Block */:
-            case 219 /* VariableStatement */:
-            case 231 /* WithStatement */:
-            case 222 /* IfStatement */:
-            case 232 /* SwitchStatement */:
-            case 246 /* CaseBlock */:
-            case 271 /* CaseClause */:
-            case 272 /* DefaultClause */:
-            case 233 /* LabeledStatement */:
-            case 225 /* ForStatement */:
-            case 226 /* ForInStatement */:
-            case 227 /* ForOfStatement */:
-            case 223 /* DoStatement */:
-            case 224 /* WhileStatement */:
-            case 235 /* TryStatement */:
-            case 274 /* CatchClause */:
+            case 219 /* Block */:
+            case 220 /* VariableStatement */:
+            case 232 /* WithStatement */:
+            case 223 /* IfStatement */:
+            case 233 /* SwitchStatement */:
+            case 247 /* CaseBlock */:
+            case 272 /* CaseClause */:
+            case 273 /* DefaultClause */:
+            case 234 /* LabeledStatement */:
+            case 226 /* ForStatement */:
+            case 227 /* ForInStatement */:
+            case 228 /* ForOfStatement */:
+            case 224 /* DoStatement */:
+            case 225 /* WhileStatement */:
+            case 236 /* TryStatement */:
+            case 275 /* CatchClause */:
                 return true;
         }
         return false;
@@ -10590,33 +10816,33 @@ var ts;
         return node;
     }
     function walkUpParenthesizedTypes(node) {
-        return walkUp(node, 177 /* ParenthesizedType */);
+        return walkUp(node, 178 /* ParenthesizedType */);
     }
     ts.walkUpParenthesizedTypes = walkUpParenthesizedTypes;
     function walkUpParenthesizedExpressions(node) {
-        return walkUp(node, 195 /* ParenthesizedExpression */);
+        return walkUp(node, 196 /* ParenthesizedExpression */);
     }
     ts.walkUpParenthesizedExpressions = walkUpParenthesizedExpressions;
     function skipParentheses(node) {
-        while (node.kind === 195 /* ParenthesizedExpression */) {
+        while (node.kind === 196 /* ParenthesizedExpression */) {
             node = node.expression;
         }
         return node;
     }
     ts.skipParentheses = skipParentheses;
     function skipParenthesesUp(node) {
-        while (node.kind === 195 /* ParenthesizedExpression */) {
+        while (node.kind === 196 /* ParenthesizedExpression */) {
             node = node.parent;
         }
         return node;
     }
     // a node is delete target iff. it is PropertyAccessExpression/ElementAccessExpression with parentheses skipped
     function isDeleteTarget(node) {
-        if (node.kind !== 189 /* PropertyAccessExpression */ && node.kind !== 190 /* ElementAccessExpression */) {
+        if (node.kind !== 190 /* PropertyAccessExpression */ && node.kind !== 191 /* ElementAccessExpression */) {
             return false;
         }
         node = walkUpParenthesizedExpressions(node.parent);
-        return node && node.kind === 198 /* DeleteExpression */;
+        return node && node.kind === 199 /* DeleteExpression */;
     }
     ts.isDeleteTarget = isDeleteTarget;
     function isNodeDescendantOf(node, ancestor) {
@@ -10642,7 +10868,7 @@ var ts;
                 if (ts.isComputedPropertyName(parent))
                     return parent.parent;
             // falls through
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 if (ts.isDeclaration(parent)) {
                     return parent.name === name ? parent : undefined;
                 }
@@ -10666,7 +10892,7 @@ var ts;
     ts.getDeclarationFromName = getDeclarationFromName;
     function isLiteralComputedPropertyDeclarationName(node) {
         return (node.kind === 10 /* StringLiteral */ || node.kind === 8 /* NumericLiteral */) &&
-            node.parent.kind === 149 /* ComputedPropertyName */ &&
+            node.parent.kind === 150 /* ComputedPropertyName */ &&
             ts.isDeclaration(node.parent.parent);
     }
     ts.isLiteralComputedPropertyDeclarationName = isLiteralComputedPropertyDeclarationName;
@@ -10674,32 +10900,32 @@ var ts;
     function isIdentifierName(node) {
         var parent = node.parent;
         switch (parent.kind) {
-            case 154 /* PropertyDeclaration */:
-            case 153 /* PropertySignature */:
-            case 156 /* MethodDeclaration */:
-            case 155 /* MethodSignature */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
-            case 278 /* EnumMember */:
-            case 275 /* PropertyAssignment */:
-            case 189 /* PropertyAccessExpression */:
+            case 155 /* PropertyDeclaration */:
+            case 154 /* PropertySignature */:
+            case 157 /* MethodDeclaration */:
+            case 156 /* MethodSignature */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
+            case 279 /* EnumMember */:
+            case 276 /* PropertyAssignment */:
+            case 190 /* PropertyAccessExpression */:
                 // Name in member declaration or property name in property access
                 return parent.name === node;
-            case 148 /* QualifiedName */:
+            case 149 /* QualifiedName */:
                 // Name on right hand side of dot in a type query or type reference
                 if (parent.right === node) {
-                    while (parent.kind === 148 /* QualifiedName */) {
+                    while (parent.kind === 149 /* QualifiedName */) {
                         parent = parent.parent;
                     }
-                    return parent.kind === 167 /* TypeQuery */ || parent.kind === 164 /* TypeReference */;
+                    return parent.kind === 168 /* TypeQuery */ || parent.kind === 165 /* TypeReference */;
                 }
                 return false;
-            case 186 /* BindingElement */:
-            case 253 /* ImportSpecifier */:
+            case 187 /* BindingElement */:
+            case 254 /* ImportSpecifier */:
                 // Property name in binding element or import specifier
                 return parent.propertyName === node;
-            case 257 /* ExportSpecifier */:
-            case 267 /* JsxAttribute */:
+            case 258 /* ExportSpecifier */:
+            case 268 /* JsxAttribute */:
                 // Any name in an export specifier or JSX Attribute
                 return true;
         }
@@ -10716,13 +10942,13 @@ var ts;
     // export default <EntityNameExpression>
     // module.exports = <EntityNameExpression>
     function isAliasSymbolDeclaration(node) {
-        return node.kind === 248 /* ImportEqualsDeclaration */ ||
-            node.kind === 247 /* NamespaceExportDeclaration */ ||
-            node.kind === 250 /* ImportClause */ && !!node.name ||
-            node.kind === 251 /* NamespaceImport */ ||
-            node.kind === 253 /* ImportSpecifier */ ||
-            node.kind === 257 /* ExportSpecifier */ ||
-            node.kind === 254 /* ExportAssignment */ && exportAssignmentIsAlias(node) ||
+        return node.kind === 249 /* ImportEqualsDeclaration */ ||
+            node.kind === 248 /* NamespaceExportDeclaration */ ||
+            node.kind === 251 /* ImportClause */ && !!node.name ||
+            node.kind === 252 /* NamespaceImport */ ||
+            node.kind === 254 /* ImportSpecifier */ ||
+            node.kind === 258 /* ExportSpecifier */ ||
+            node.kind === 255 /* ExportAssignment */ && exportAssignmentIsAlias(node) ||
             ts.isBinaryExpression(node) && getAssignmentDeclarationKind(node) === 2 /* ModuleExports */ && exportAssignmentIsAlias(node);
     }
     ts.isAliasSymbolDeclaration = isAliasSymbolDeclaration;
@@ -10744,12 +10970,12 @@ var ts;
     }
     ts.getEffectiveBaseTypeNode = getEffectiveBaseTypeNode;
     function getClassExtendsHeritageElement(node) {
-        var heritageClause = getHeritageClause(node.heritageClauses, 86 /* ExtendsKeyword */);
+        var heritageClause = getHeritageClause(node.heritageClauses, 87 /* ExtendsKeyword */);
         return heritageClause && heritageClause.types.length > 0 ? heritageClause.types[0] : undefined;
     }
     ts.getClassExtendsHeritageElement = getClassExtendsHeritageElement;
     function getClassImplementsHeritageClauseElements(node) {
-        var heritageClause = getHeritageClause(node.heritageClauses, 109 /* ImplementsKeyword */);
+        var heritageClause = getHeritageClause(node.heritageClauses, 110 /* ImplementsKeyword */);
         return heritageClause ? heritageClause.types : undefined;
     }
     ts.getClassImplementsHeritageClauseElements = getClassImplementsHeritageClauseElements;
@@ -10761,7 +10987,7 @@ var ts;
     }
     ts.getAllSuperTypeNodes = getAllSuperTypeNodes;
     function getInterfaceBaseTypeNodes(node) {
-        var heritageClause = getHeritageClause(node.heritageClauses, 86 /* ExtendsKeyword */);
+        var heritageClause = getHeritageClause(node.heritageClauses, 87 /* ExtendsKeyword */);
         return heritageClause ? heritageClause.types : undefined;
     }
     ts.getInterfaceBaseTypeNodes = getInterfaceBaseTypeNodes;
@@ -10777,13 +11003,6 @@ var ts;
         return undefined;
     }
     ts.getHeritageClause = getHeritageClause;
-    function tryResolveScriptReference(host, sourceFile, reference) {
-        if (!host.getCompilerOptions().noResolve) {
-            var referenceFileName = ts.isRootedDiskPath(reference.fileName) ? reference.fileName : ts.combinePaths(ts.getDirectoryPath(sourceFile.fileName), reference.fileName);
-            return host.getSourceFile(referenceFileName);
-        }
-    }
-    ts.tryResolveScriptReference = tryResolveScriptReference;
     function getAncestor(node, kind) {
         while (node) {
             if (node.kind === kind) {
@@ -10795,11 +11014,11 @@ var ts;
     }
     ts.getAncestor = getAncestor;
     function isKeyword(token) {
-        return 73 /* FirstKeyword */ <= token && token <= 147 /* LastKeyword */;
+        return 74 /* FirstKeyword */ <= token && token <= 148 /* LastKeyword */;
     }
     ts.isKeyword = isKeyword;
     function isContextualKeyword(token) {
-        return 118 /* FirstContextualKeyword */ <= token && token <= 147 /* LastContextualKeyword */;
+        return 119 /* FirstContextualKeyword */ <= token && token <= 148 /* LastContextualKeyword */;
     }
     ts.isContextualKeyword = isContextualKeyword;
     function isNonContextualKeyword(token) {
@@ -10834,14 +11053,14 @@ var ts;
         }
         var flags = 0 /* Normal */;
         switch (node.kind) {
-            case 239 /* FunctionDeclaration */:
-            case 196 /* FunctionExpression */:
-            case 156 /* MethodDeclaration */:
+            case 240 /* FunctionDeclaration */:
+            case 197 /* FunctionExpression */:
+            case 157 /* MethodDeclaration */:
                 if (node.asteriskToken) {
                     flags |= 1 /* Generator */;
                 }
             // falls through
-            case 197 /* ArrowFunction */:
+            case 198 /* ArrowFunction */:
                 if (hasModifier(node, 256 /* Async */)) {
                     flags |= 2 /* Async */;
                 }
@@ -10855,10 +11074,10 @@ var ts;
     ts.getFunctionFlags = getFunctionFlags;
     function isAsyncFunction(node) {
         switch (node.kind) {
-            case 239 /* FunctionDeclaration */:
-            case 196 /* FunctionExpression */:
-            case 197 /* ArrowFunction */:
-            case 156 /* MethodDeclaration */:
+            case 240 /* FunctionDeclaration */:
+            case 197 /* FunctionExpression */:
+            case 198 /* ArrowFunction */:
+            case 157 /* MethodDeclaration */:
                 return node.body !== undefined
                     && node.asteriskToken === undefined
                     && hasModifier(node, 256 /* Async */);
@@ -10870,11 +11089,19 @@ var ts;
         return ts.isStringLiteralLike(node) || ts.isNumericLiteral(node);
     }
     ts.isStringOrNumericLiteralLike = isStringOrNumericLiteralLike;
+    function isSignedNumericLiteral(node) {
+        return ts.isPrefixUnaryExpression(node) && (node.operator === 38 /* PlusToken */ || node.operator === 39 /* MinusToken */) && ts.isNumericLiteral(node.operand);
+    }
+    ts.isSignedNumericLiteral = isSignedNumericLiteral;
     /**
-     * A declaration has a dynamic name if both of the following are true:
-     *   1. The declaration has a computed property name
-     *   2. The computed name is *not* expressed as Symbol.<name>, where name
-     *      is a property of the Symbol constructor that denotes a built in
+     * A declaration has a dynamic name if all of the following are true:
+     *   1. The declaration has a computed property name.
+     *   2. The computed name is *not* expressed as a StringLiteral.
+     *   3. The computed name is *not* expressed as a NumericLiteral.
+     *   4. The computed name is *not* expressed as a PlusToken or MinusToken
+     *      immediately followed by a NumericLiteral.
+     *   5. The computed name is *not* expressed as `Symbol.<name>`, where `<name>`
+     *      is a property of the Symbol constructor that denotes a built-in
      *      Symbol.
      */
     function hasDynamicName(declaration) {
@@ -10883,8 +11110,9 @@ var ts;
     }
     ts.hasDynamicName = hasDynamicName;
     function isDynamicName(name) {
-        return name.kind === 149 /* ComputedPropertyName */ &&
+        return name.kind === 150 /* ComputedPropertyName */ &&
             !isStringOrNumericLiteralLike(name.expression) &&
+            !isSignedNumericLiteral(name.expression) &&
             !isWellKnownSymbolSyntactically(name.expression);
     }
     ts.isDynamicName = isDynamicName;
@@ -10899,12 +11127,12 @@ var ts;
     ts.isWellKnownSymbolSyntactically = isWellKnownSymbolSyntactically;
     function getPropertyNameForPropertyNameNode(name) {
         switch (name.kind) {
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 return name.escapedText;
             case 10 /* StringLiteral */:
             case 8 /* NumericLiteral */:
                 return ts.escapeLeadingUnderscores(name.text);
-            case 149 /* ComputedPropertyName */:
+            case 150 /* ComputedPropertyName */:
                 var nameExpression = name.expression;
                 if (isWellKnownSymbolSyntactically(nameExpression)) {
                     return getPropertyNameForKnownSymbolName(ts.idText(nameExpression.name));
@@ -10920,7 +11148,7 @@ var ts;
     ts.getPropertyNameForPropertyNameNode = getPropertyNameForPropertyNameNode;
     function isPropertyNameLiteral(node) {
         switch (node.kind) {
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
             case 10 /* StringLiteral */:
             case 14 /* NoSubstitutionTemplateLiteral */:
             case 8 /* NumericLiteral */:
@@ -10931,11 +11159,11 @@ var ts;
     }
     ts.isPropertyNameLiteral = isPropertyNameLiteral;
     function getTextOfIdentifierOrLiteral(node) {
-        return node.kind === 72 /* Identifier */ ? ts.idText(node) : node.text;
+        return node.kind === 73 /* Identifier */ ? ts.idText(node) : node.text;
     }
     ts.getTextOfIdentifierOrLiteral = getTextOfIdentifierOrLiteral;
     function getEscapedTextOfIdentifierOrLiteral(node) {
-        return node.kind === 72 /* Identifier */ ? node.escapedText : ts.escapeLeadingUnderscores(node.text);
+        return node.kind === 73 /* Identifier */ ? node.escapedText : ts.escapeLeadingUnderscores(node.text);
     }
     ts.getEscapedTextOfIdentifierOrLiteral = getEscapedTextOfIdentifierOrLiteral;
     function getPropertyNameForKnownSymbolName(symbolName) {
@@ -10950,7 +11178,7 @@ var ts;
      * Includes the word "Symbol" with unicode escapes
      */
     function isESSymbolIdentifier(node) {
-        return node.kind === 72 /* Identifier */ && node.escapedText === "Symbol";
+        return node.kind === 73 /* Identifier */ && node.escapedText === "Symbol";
     }
     ts.isESSymbolIdentifier = isESSymbolIdentifier;
     function isPushOrUnshiftIdentifier(node) {
@@ -10959,11 +11187,11 @@ var ts;
     ts.isPushOrUnshiftIdentifier = isPushOrUnshiftIdentifier;
     function isParameterDeclaration(node) {
         var root = getRootDeclaration(node);
-        return root.kind === 151 /* Parameter */;
+        return root.kind === 152 /* Parameter */;
     }
     ts.isParameterDeclaration = isParameterDeclaration;
     function getRootDeclaration(node) {
-        while (node.kind === 186 /* BindingElement */) {
+        while (node.kind === 187 /* BindingElement */) {
             node = node.parent.parent;
         }
         return node;
@@ -10971,15 +11199,15 @@ var ts;
     ts.getRootDeclaration = getRootDeclaration;
     function nodeStartsNewLexicalEnvironment(node) {
         var kind = node.kind;
-        return kind === 157 /* Constructor */
-            || kind === 196 /* FunctionExpression */
-            || kind === 239 /* FunctionDeclaration */
-            || kind === 197 /* ArrowFunction */
-            || kind === 156 /* MethodDeclaration */
-            || kind === 158 /* GetAccessor */
-            || kind === 159 /* SetAccessor */
-            || kind === 244 /* ModuleDeclaration */
-            || kind === 284 /* SourceFile */;
+        return kind === 158 /* Constructor */
+            || kind === 197 /* FunctionExpression */
+            || kind === 240 /* FunctionDeclaration */
+            || kind === 198 /* ArrowFunction */
+            || kind === 157 /* MethodDeclaration */
+            || kind === 159 /* GetAccessor */
+            || kind === 160 /* SetAccessor */
+            || kind === 245 /* ModuleDeclaration */
+            || kind === 285 /* SourceFile */;
     }
     ts.nodeStartsNewLexicalEnvironment = nodeStartsNewLexicalEnvironment;
     function nodeIsSynthesized(range) {
@@ -10998,38 +11226,38 @@ var ts;
     })(Associativity = ts.Associativity || (ts.Associativity = {}));
     function getExpressionAssociativity(expression) {
         var operator = getOperator(expression);
-        var hasArguments = expression.kind === 192 /* NewExpression */ && expression.arguments !== undefined;
+        var hasArguments = expression.kind === 193 /* NewExpression */ && expression.arguments !== undefined;
         return getOperatorAssociativity(expression.kind, operator, hasArguments);
     }
     ts.getExpressionAssociativity = getExpressionAssociativity;
     function getOperatorAssociativity(kind, operator, hasArguments) {
         switch (kind) {
-            case 192 /* NewExpression */:
+            case 193 /* NewExpression */:
                 return hasArguments ? 0 /* Left */ : 1 /* Right */;
-            case 202 /* PrefixUnaryExpression */:
-            case 199 /* TypeOfExpression */:
-            case 200 /* VoidExpression */:
-            case 198 /* DeleteExpression */:
-            case 201 /* AwaitExpression */:
-            case 205 /* ConditionalExpression */:
-            case 207 /* YieldExpression */:
+            case 203 /* PrefixUnaryExpression */:
+            case 200 /* TypeOfExpression */:
+            case 201 /* VoidExpression */:
+            case 199 /* DeleteExpression */:
+            case 202 /* AwaitExpression */:
+            case 206 /* ConditionalExpression */:
+            case 208 /* YieldExpression */:
                 return 1 /* Right */;
-            case 204 /* BinaryExpression */:
+            case 205 /* BinaryExpression */:
                 switch (operator) {
                     case 41 /* AsteriskAsteriskToken */:
-                    case 59 /* EqualsToken */:
-                    case 60 /* PlusEqualsToken */:
-                    case 61 /* MinusEqualsToken */:
-                    case 63 /* AsteriskAsteriskEqualsToken */:
-                    case 62 /* AsteriskEqualsToken */:
-                    case 64 /* SlashEqualsToken */:
-                    case 65 /* PercentEqualsToken */:
-                    case 66 /* LessThanLessThanEqualsToken */:
-                    case 67 /* GreaterThanGreaterThanEqualsToken */:
-                    case 68 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
-                    case 69 /* AmpersandEqualsToken */:
-                    case 71 /* CaretEqualsToken */:
-                    case 70 /* BarEqualsToken */:
+                    case 60 /* EqualsToken */:
+                    case 61 /* PlusEqualsToken */:
+                    case 62 /* MinusEqualsToken */:
+                    case 64 /* AsteriskAsteriskEqualsToken */:
+                    case 63 /* AsteriskEqualsToken */:
+                    case 65 /* SlashEqualsToken */:
+                    case 66 /* PercentEqualsToken */:
+                    case 67 /* LessThanLessThanEqualsToken */:
+                    case 68 /* GreaterThanGreaterThanEqualsToken */:
+                    case 69 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
+                    case 70 /* AmpersandEqualsToken */:
+                    case 72 /* CaretEqualsToken */:
+                    case 71 /* BarEqualsToken */:
                         return 1 /* Right */;
                 }
         }
@@ -11038,15 +11266,15 @@ var ts;
     ts.getOperatorAssociativity = getOperatorAssociativity;
     function getExpressionPrecedence(expression) {
         var operator = getOperator(expression);
-        var hasArguments = expression.kind === 192 /* NewExpression */ && expression.arguments !== undefined;
+        var hasArguments = expression.kind === 193 /* NewExpression */ && expression.arguments !== undefined;
         return getOperatorPrecedence(expression.kind, operator, hasArguments);
     }
     ts.getExpressionPrecedence = getExpressionPrecedence;
     function getOperator(expression) {
-        if (expression.kind === 204 /* BinaryExpression */) {
+        if (expression.kind === 205 /* BinaryExpression */) {
             return expression.operatorToken.kind;
         }
-        else if (expression.kind === 202 /* PrefixUnaryExpression */ || expression.kind === 203 /* PostfixUnaryExpression */) {
+        else if (expression.kind === 203 /* PrefixUnaryExpression */ || expression.kind === 204 /* PostfixUnaryExpression */) {
             return expression.operator;
         }
         else {
@@ -11056,73 +11284,73 @@ var ts;
     ts.getOperator = getOperator;
     function getOperatorPrecedence(nodeKind, operatorKind, hasArguments) {
         switch (nodeKind) {
-            case 314 /* CommaListExpression */:
+            case 316 /* CommaListExpression */:
                 return 0;
-            case 208 /* SpreadElement */:
+            case 209 /* SpreadElement */:
                 return 1;
-            case 207 /* YieldExpression */:
+            case 208 /* YieldExpression */:
                 return 2;
-            case 205 /* ConditionalExpression */:
+            case 206 /* ConditionalExpression */:
                 return 4;
-            case 204 /* BinaryExpression */:
+            case 205 /* BinaryExpression */:
                 switch (operatorKind) {
                     case 27 /* CommaToken */:
                         return 0;
-                    case 59 /* EqualsToken */:
-                    case 60 /* PlusEqualsToken */:
-                    case 61 /* MinusEqualsToken */:
-                    case 63 /* AsteriskAsteriskEqualsToken */:
-                    case 62 /* AsteriskEqualsToken */:
-                    case 64 /* SlashEqualsToken */:
-                    case 65 /* PercentEqualsToken */:
-                    case 66 /* LessThanLessThanEqualsToken */:
-                    case 67 /* GreaterThanGreaterThanEqualsToken */:
-                    case 68 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
-                    case 69 /* AmpersandEqualsToken */:
-                    case 71 /* CaretEqualsToken */:
-                    case 70 /* BarEqualsToken */:
+                    case 60 /* EqualsToken */:
+                    case 61 /* PlusEqualsToken */:
+                    case 62 /* MinusEqualsToken */:
+                    case 64 /* AsteriskAsteriskEqualsToken */:
+                    case 63 /* AsteriskEqualsToken */:
+                    case 65 /* SlashEqualsToken */:
+                    case 66 /* PercentEqualsToken */:
+                    case 67 /* LessThanLessThanEqualsToken */:
+                    case 68 /* GreaterThanGreaterThanEqualsToken */:
+                    case 69 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
+                    case 70 /* AmpersandEqualsToken */:
+                    case 72 /* CaretEqualsToken */:
+                    case 71 /* BarEqualsToken */:
                         return 3;
                     default:
                         return getBinaryOperatorPrecedence(operatorKind);
                 }
-            case 202 /* PrefixUnaryExpression */:
-            case 199 /* TypeOfExpression */:
-            case 200 /* VoidExpression */:
-            case 198 /* DeleteExpression */:
-            case 201 /* AwaitExpression */:
+            case 203 /* PrefixUnaryExpression */:
+            case 200 /* TypeOfExpression */:
+            case 201 /* VoidExpression */:
+            case 199 /* DeleteExpression */:
+            case 202 /* AwaitExpression */:
                 return 16;
-            case 203 /* PostfixUnaryExpression */:
+            case 204 /* PostfixUnaryExpression */:
                 return 17;
-            case 191 /* CallExpression */:
+            case 192 /* CallExpression */:
                 return 18;
-            case 192 /* NewExpression */:
+            case 193 /* NewExpression */:
                 return hasArguments ? 19 : 18;
-            case 193 /* TaggedTemplateExpression */:
-            case 189 /* PropertyAccessExpression */:
-            case 190 /* ElementAccessExpression */:
+            case 194 /* TaggedTemplateExpression */:
+            case 190 /* PropertyAccessExpression */:
+            case 191 /* ElementAccessExpression */:
                 return 19;
-            case 100 /* ThisKeyword */:
-            case 98 /* SuperKeyword */:
-            case 72 /* Identifier */:
-            case 96 /* NullKeyword */:
-            case 102 /* TrueKeyword */:
-            case 87 /* FalseKeyword */:
+            case 101 /* ThisKeyword */:
+            case 99 /* SuperKeyword */:
+            case 73 /* Identifier */:
+            case 97 /* NullKeyword */:
+            case 103 /* TrueKeyword */:
+            case 88 /* FalseKeyword */:
             case 8 /* NumericLiteral */:
             case 9 /* BigIntLiteral */:
             case 10 /* StringLiteral */:
-            case 187 /* ArrayLiteralExpression */:
-            case 188 /* ObjectLiteralExpression */:
-            case 196 /* FunctionExpression */:
-            case 197 /* ArrowFunction */:
-            case 209 /* ClassExpression */:
-            case 260 /* JsxElement */:
-            case 261 /* JsxSelfClosingElement */:
-            case 264 /* JsxFragment */:
+            case 188 /* ArrayLiteralExpression */:
+            case 189 /* ObjectLiteralExpression */:
+            case 197 /* FunctionExpression */:
+            case 198 /* ArrowFunction */:
+            case 210 /* ClassExpression */:
+            case 261 /* JsxElement */:
+            case 262 /* JsxSelfClosingElement */:
+            case 265 /* JsxFragment */:
             case 13 /* RegularExpressionLiteral */:
             case 14 /* NoSubstitutionTemplateLiteral */:
-            case 206 /* TemplateExpression */:
-            case 195 /* ParenthesizedExpression */:
-            case 210 /* OmittedExpression */:
+            case 207 /* TemplateExpression */:
+            case 196 /* ParenthesizedExpression */:
+            case 211 /* OmittedExpression */:
                 return 20;
             default:
                 return -1;
@@ -11150,9 +11378,9 @@ var ts;
             case 30 /* GreaterThanToken */:
             case 31 /* LessThanEqualsToken */:
             case 32 /* GreaterThanEqualsToken */:
-            case 94 /* InstanceOfKeyword */:
-            case 93 /* InKeyword */:
-            case 119 /* AsKeyword */:
+            case 95 /* InstanceOfKeyword */:
+            case 94 /* InKeyword */:
+            case 120 /* AsKeyword */:
                 return 11;
             case 46 /* LessThanLessThanToken */:
             case 47 /* GreaterThanGreaterThanToken */:
@@ -11277,6 +11505,23 @@ var ts;
         return s.replace(escapedCharsRegExp, getReplacement);
     }
     ts.escapeString = escapeString;
+    /**
+     * Strip off existed single quotes or double quotes from a given string
+     *
+     * @return non-quoted string
+     */
+    function stripQuotes(name) {
+        var length = name.length;
+        if (length >= 2 && name.charCodeAt(0) === name.charCodeAt(length - 1) && startsWithQuote(name)) {
+            return name.substring(1, length - 1);
+        }
+        return name;
+    }
+    ts.stripQuotes = stripQuotes;
+    function startsWithQuote(name) {
+        return isSingleOrDoubleQuote(name.charCodeAt(0));
+    }
+    ts.startsWithQuote = startsWithQuote;
     function getReplacement(c, offset, input) {
         if (c.charCodeAt(0) === 0 /* nullCharacter */) {
             var lookAhead = input.charCodeAt(offset + c.length);
@@ -11535,23 +11780,27 @@ var ts;
     function getSourceFilesToEmit(host, targetSourceFile) {
         var options = host.getCompilerOptions();
         var isSourceFileFromExternalLibrary = function (file) { return host.isSourceFileFromExternalLibrary(file); };
+        var getResolvedProjectReferenceToRedirect = function (fileName) { return host.getResolvedProjectReferenceToRedirect(fileName); };
         if (options.outFile || options.out) {
             var moduleKind = ts.getEmitModuleKind(options);
             var moduleEmitEnabled_1 = options.emitDeclarationOnly || moduleKind === ts.ModuleKind.AMD || moduleKind === ts.ModuleKind.System;
             // Can emit only sources that are not declaration file and are either non module code or module with --module or --target es6 specified
             return ts.filter(host.getSourceFiles(), function (sourceFile) {
-                return (moduleEmitEnabled_1 || !ts.isExternalModule(sourceFile)) && sourceFileMayBeEmitted(sourceFile, options, isSourceFileFromExternalLibrary);
+                return (moduleEmitEnabled_1 || !ts.isExternalModule(sourceFile)) && sourceFileMayBeEmitted(sourceFile, options, isSourceFileFromExternalLibrary, getResolvedProjectReferenceToRedirect);
             });
         }
         else {
             var sourceFiles = targetSourceFile === undefined ? host.getSourceFiles() : [targetSourceFile];
-            return ts.filter(sourceFiles, function (sourceFile) { return sourceFileMayBeEmitted(sourceFile, options, isSourceFileFromExternalLibrary); });
+            return ts.filter(sourceFiles, function (sourceFile) { return sourceFileMayBeEmitted(sourceFile, options, isSourceFileFromExternalLibrary, getResolvedProjectReferenceToRedirect); });
         }
     }
     ts.getSourceFilesToEmit = getSourceFilesToEmit;
     /** Don't call this for `--outFile`, just for `--outDir` or plain emit. `--outFile` needs additional checks. */
-    function sourceFileMayBeEmitted(sourceFile, options, isSourceFileFromExternalLibrary) {
-        return !(options.noEmitForJsFiles && isSourceFileJS(sourceFile)) && !sourceFile.isDeclarationFile && !isSourceFileFromExternalLibrary(sourceFile);
+    function sourceFileMayBeEmitted(sourceFile, options, isSourceFileFromExternalLibrary, getResolvedProjectReferenceToRedirect) {
+        return !(options.noEmitForJsFiles && isSourceFileJS(sourceFile)) &&
+            !sourceFile.isDeclarationFile &&
+            !isSourceFileFromExternalLibrary(sourceFile) &&
+            !(isJsonSourceFile(sourceFile) && getResolvedProjectReferenceToRedirect(sourceFile.fileName));
     }
     ts.sourceFileMayBeEmitted = sourceFileMayBeEmitted;
     function getSourceFilePathInNewDir(fileName, host, newDirPath) {
@@ -11610,11 +11859,11 @@ var ts;
     }
     ts.parameterIsThisKeyword = parameterIsThisKeyword;
     function isThisIdentifier(node) {
-        return !!node && node.kind === 72 /* Identifier */ && identifierIsThisKeyword(node);
+        return !!node && node.kind === 73 /* Identifier */ && identifierIsThisKeyword(node);
     }
     ts.isThisIdentifier = isThisIdentifier;
     function identifierIsThisKeyword(id) {
-        return id.originalKeywordKind === 100 /* ThisKeyword */;
+        return id.originalKeywordKind === 101 /* ThisKeyword */;
     }
     ts.identifierIsThisKeyword = identifierIsThisKeyword;
     function getAllAccessorDeclarations(declarations, accessor) {
@@ -11625,10 +11874,10 @@ var ts;
         var setAccessor;
         if (hasDynamicName(accessor)) {
             firstAccessor = accessor;
-            if (accessor.kind === 158 /* GetAccessor */) {
+            if (accessor.kind === 159 /* GetAccessor */) {
                 getAccessor = accessor;
             }
-            else if (accessor.kind === 159 /* SetAccessor */) {
+            else if (accessor.kind === 160 /* SetAccessor */) {
                 setAccessor = accessor;
             }
             else {
@@ -11648,10 +11897,10 @@ var ts;
                         else if (!secondAccessor) {
                             secondAccessor = member;
                         }
-                        if (member.kind === 158 /* GetAccessor */ && !getAccessor) {
+                        if (member.kind === 159 /* GetAccessor */ && !getAccessor) {
                             getAccessor = member;
                         }
-                        if (member.kind === 159 /* SetAccessor */ && !setAccessor) {
+                        if (member.kind === 160 /* SetAccessor */ && !setAccessor) {
                             setAccessor = member;
                         }
                     }
@@ -11697,7 +11946,7 @@ var ts;
     ts.getJSDocTypeParameterDeclarations = getJSDocTypeParameterDeclarations;
     /** template tags are only available when a typedef isn't already using them */
     function isNonTypeAliasTemplate(tag) {
-        return ts.isJSDocTemplateTag(tag) && !(tag.parent.kind === 296 /* JSDocComment */ && tag.parent.tags.some(isJSDocTypeAlias));
+        return ts.isJSDocTemplateTag(tag) && !(tag.parent.kind === 297 /* JSDocComment */ && tag.parent.tags.some(isJSDocTypeAlias));
     }
     /**
      * Gets the effective type annotation of the value parameter of a set accessor. If the node
@@ -11937,7 +12186,7 @@ var ts;
                 flags |= modifierToFlag(modifier.kind);
             }
         }
-        if (node.flags & 4 /* NestedNamespace */ || (node.kind === 72 /* Identifier */ && node.isInJSDocNamespace)) {
+        if (node.flags & 4 /* NestedNamespace */ || (node.kind === 73 /* Identifier */ && node.isInJSDocNamespace)) {
             flags |= 1 /* Export */;
         }
         return flags;
@@ -11945,17 +12194,17 @@ var ts;
     ts.getModifierFlagsNoCache = getModifierFlagsNoCache;
     function modifierToFlag(token) {
         switch (token) {
-            case 116 /* StaticKeyword */: return 32 /* Static */;
-            case 115 /* PublicKeyword */: return 4 /* Public */;
-            case 114 /* ProtectedKeyword */: return 16 /* Protected */;
-            case 113 /* PrivateKeyword */: return 8 /* Private */;
-            case 118 /* AbstractKeyword */: return 128 /* Abstract */;
-            case 85 /* ExportKeyword */: return 1 /* Export */;
-            case 125 /* DeclareKeyword */: return 2 /* Ambient */;
-            case 77 /* ConstKeyword */: return 2048 /* Const */;
-            case 80 /* DefaultKeyword */: return 512 /* Default */;
-            case 121 /* AsyncKeyword */: return 256 /* Async */;
-            case 133 /* ReadonlyKeyword */: return 64 /* Readonly */;
+            case 117 /* StaticKeyword */: return 32 /* Static */;
+            case 116 /* PublicKeyword */: return 4 /* Public */;
+            case 115 /* ProtectedKeyword */: return 16 /* Protected */;
+            case 114 /* PrivateKeyword */: return 8 /* Private */;
+            case 119 /* AbstractKeyword */: return 128 /* Abstract */;
+            case 86 /* ExportKeyword */: return 1 /* Export */;
+            case 126 /* DeclareKeyword */: return 2 /* Ambient */;
+            case 78 /* ConstKeyword */: return 2048 /* Const */;
+            case 81 /* DefaultKeyword */: return 512 /* Default */;
+            case 122 /* AsyncKeyword */: return 256 /* Async */;
+            case 134 /* ReadonlyKeyword */: return 64 /* Readonly */;
         }
         return 0 /* None */;
     }
@@ -11967,7 +12216,7 @@ var ts;
     }
     ts.isLogicalOperator = isLogicalOperator;
     function isAssignmentOperator(token) {
-        return token >= 59 /* FirstAssignment */ && token <= 71 /* LastAssignment */;
+        return token >= 60 /* FirstAssignment */ && token <= 72 /* LastAssignment */;
     }
     ts.isAssignmentOperator = isAssignmentOperator;
     /** Get `C` given `N` if `N` is in the position `class C extends N` where `N` is an ExpressionWithTypeArguments. */
@@ -11980,14 +12229,14 @@ var ts;
         return ts.isExpressionWithTypeArguments(node)
             && ts.isHeritageClause(node.parent)
             && ts.isClassLike(node.parent.parent)
-            ? { class: node.parent.parent, isImplements: node.parent.token === 109 /* ImplementsKeyword */ }
+            ? { class: node.parent.parent, isImplements: node.parent.token === 110 /* ImplementsKeyword */ }
             : undefined;
     }
     ts.tryGetClassImplementingOrExtendingExpressionWithTypeArguments = tryGetClassImplementingOrExtendingExpressionWithTypeArguments;
     function isAssignmentExpression(node, excludeCompoundAssignment) {
         return ts.isBinaryExpression(node)
             && (excludeCompoundAssignment
-                ? node.operatorToken.kind === 59 /* EqualsToken */
+                ? node.operatorToken.kind === 60 /* EqualsToken */
                 : isAssignmentOperator(node.operatorToken.kind))
             && ts.isLeftHandSideExpression(node.left);
     }
@@ -11995,8 +12244,8 @@ var ts;
     function isDestructuringAssignment(node) {
         if (isAssignmentExpression(node, /*excludeCompoundAssignment*/ true)) {
             var kind = node.left.kind;
-            return kind === 188 /* ObjectLiteralExpression */
-                || kind === 187 /* ArrayLiteralExpression */;
+            return kind === 189 /* ObjectLiteralExpression */
+                || kind === 188 /* ArrayLiteralExpression */;
         }
         return false;
     }
@@ -12006,29 +12255,39 @@ var ts;
     }
     ts.isExpressionWithTypeArgumentsInClassExtendsClause = isExpressionWithTypeArgumentsInClassExtendsClause;
     function isEntityNameExpression(node) {
-        return node.kind === 72 /* Identifier */ || isPropertyAccessEntityNameExpression(node);
+        return node.kind === 73 /* Identifier */ || isPropertyAccessEntityNameExpression(node);
     }
     ts.isEntityNameExpression = isEntityNameExpression;
     function isPropertyAccessEntityNameExpression(node) {
         return ts.isPropertyAccessExpression(node) && isEntityNameExpression(node.expression);
     }
     ts.isPropertyAccessEntityNameExpression = isPropertyAccessEntityNameExpression;
+    function tryGetPropertyAccessOrIdentifierToString(expr) {
+        if (ts.isPropertyAccessExpression(expr)) {
+            return tryGetPropertyAccessOrIdentifierToString(expr.expression) + "." + expr.name;
+        }
+        if (ts.isIdentifier(expr)) {
+            return ts.unescapeLeadingUnderscores(expr.escapedText);
+        }
+        return undefined;
+    }
+    ts.tryGetPropertyAccessOrIdentifierToString = tryGetPropertyAccessOrIdentifierToString;
     function isPrototypeAccess(node) {
         return ts.isPropertyAccessExpression(node) && node.name.escapedText === "prototype";
     }
     ts.isPrototypeAccess = isPrototypeAccess;
     function isRightSideOfQualifiedNameOrPropertyAccess(node) {
-        return (node.parent.kind === 148 /* QualifiedName */ && node.parent.right === node) ||
-            (node.parent.kind === 189 /* PropertyAccessExpression */ && node.parent.name === node);
+        return (node.parent.kind === 149 /* QualifiedName */ && node.parent.right === node) ||
+            (node.parent.kind === 190 /* PropertyAccessExpression */ && node.parent.name === node);
     }
     ts.isRightSideOfQualifiedNameOrPropertyAccess = isRightSideOfQualifiedNameOrPropertyAccess;
     function isEmptyObjectLiteral(expression) {
-        return expression.kind === 188 /* ObjectLiteralExpression */ &&
+        return expression.kind === 189 /* ObjectLiteralExpression */ &&
             expression.properties.length === 0;
     }
     ts.isEmptyObjectLiteral = isEmptyObjectLiteral;
     function isEmptyArrayLiteral(expression) {
-        return expression.kind === 187 /* ArrayLiteralExpression */ &&
+        return expression.kind === 188 /* ArrayLiteralExpression */ &&
             expression.elements.length === 0;
     }
     ts.isEmptyArrayLiteral = isEmptyArrayLiteral;
@@ -12216,77 +12475,6 @@ var ts;
         return getNewLine ? getNewLine() : ts.sys ? ts.sys.newLine : carriageReturnLineFeed;
     }
     ts.getNewLineCharacter = getNewLineCharacter;
-    /**
-     * Formats an enum value as a string for debugging and debug assertions.
-     */
-    function formatEnum(value, enumObject, isFlags) {
-        if (value === void 0) { value = 0; }
-        var members = getEnumMembers(enumObject);
-        if (value === 0) {
-            return members.length > 0 && members[0][0] === 0 ? members[0][1] : "0";
-        }
-        if (isFlags) {
-            var result = "";
-            var remainingFlags = value;
-            for (var i = members.length - 1; i >= 0 && remainingFlags !== 0; i--) {
-                var _a = members[i], enumValue = _a[0], enumName = _a[1];
-                if (enumValue !== 0 && (remainingFlags & enumValue) === enumValue) {
-                    remainingFlags &= ~enumValue;
-                    result = "" + enumName + (result ? ", " : "") + result;
-                }
-            }
-            if (remainingFlags === 0) {
-                return result;
-            }
-        }
-        else {
-            for (var _i = 0, members_1 = members; _i < members_1.length; _i++) {
-                var _b = members_1[_i], enumValue = _b[0], enumName = _b[1];
-                if (enumValue === value) {
-                    return enumName;
-                }
-            }
-        }
-        return value.toString();
-    }
-    function getEnumMembers(enumObject) {
-        var result = [];
-        for (var name in enumObject) {
-            var value = enumObject[name];
-            if (typeof value === "number") {
-                result.push([value, name]);
-            }
-        }
-        return ts.stableSort(result, function (x, y) { return ts.compareValues(x[0], y[0]); });
-    }
-    function formatSyntaxKind(kind) {
-        return formatEnum(kind, ts.SyntaxKind, /*isFlags*/ false);
-    }
-    ts.formatSyntaxKind = formatSyntaxKind;
-    function formatModifierFlags(flags) {
-        return formatEnum(flags, ts.ModifierFlags, /*isFlags*/ true);
-    }
-    ts.formatModifierFlags = formatModifierFlags;
-    function formatTransformFlags(flags) {
-        return formatEnum(flags, ts.TransformFlags, /*isFlags*/ true);
-    }
-    ts.formatTransformFlags = formatTransformFlags;
-    function formatEmitFlags(flags) {
-        return formatEnum(flags, ts.EmitFlags, /*isFlags*/ true);
-    }
-    ts.formatEmitFlags = formatEmitFlags;
-    function formatSymbolFlags(flags) {
-        return formatEnum(flags, ts.SymbolFlags, /*isFlags*/ true);
-    }
-    ts.formatSymbolFlags = formatSymbolFlags;
-    function formatTypeFlags(flags) {
-        return formatEnum(flags, ts.TypeFlags, /*isFlags*/ true);
-    }
-    ts.formatTypeFlags = formatTypeFlags;
-    function formatObjectFlags(flags) {
-        return formatEnum(flags, ts.ObjectFlags, /*isFlags*/ true);
-    }
-    ts.formatObjectFlags = formatObjectFlags;
     /**
      * Creates a new TextRange from the provided pos and end.
      *
@@ -12376,6 +12564,10 @@ var ts;
         return positionsAreOnSameLine(range1.end, getStartPositionOfRange(range2, sourceFile), sourceFile);
     }
     ts.rangeEndIsOnSameLineAsRangeStart = rangeEndIsOnSameLineAsRangeStart;
+    function isNodeArrayMultiLine(list, sourceFile) {
+        return !positionsAreOnSameLine(list.pos, list.end, sourceFile);
+    }
+    ts.isNodeArrayMultiLine = isNodeArrayMultiLine;
     function positionsAreOnSameLine(pos1, pos2, sourceFile) {
         return pos1 === pos2 ||
             getLineOfLocalPosition(sourceFile, pos1) === getLineOfLocalPosition(sourceFile, pos2);
@@ -12393,8 +12585,8 @@ var ts;
         var parseNode = ts.getParseTreeNode(node);
         if (parseNode) {
             switch (parseNode.parent.kind) {
-                case 243 /* EnumDeclaration */:
-                case 244 /* ModuleDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     return parseNode === parseNode.parent.name;
             }
         }
@@ -12428,10 +12620,10 @@ var ts;
         }
         if (getCheckFlags(s) & 6 /* Synthetic */) {
             var checkFlags = s.checkFlags;
-            var accessModifier = checkFlags & 512 /* ContainsPrivate */ ? 8 /* Private */ :
-                checkFlags & 128 /* ContainsPublic */ ? 4 /* Public */ :
+            var accessModifier = checkFlags & 1024 /* ContainsPrivate */ ? 8 /* Private */ :
+                checkFlags & 256 /* ContainsPublic */ ? 4 /* Public */ :
                     16 /* Protected */;
-            var staticModifier = checkFlags & 1024 /* ContainsStatic */ ? 32 /* Static */ : 0;
+            var staticModifier = checkFlags & 2048 /* ContainsStatic */ ? 32 /* Static */ : 0;
             return accessModifier | staticModifier;
         }
         if (s.flags & 4194304 /* Prototype */) {
@@ -12471,35 +12663,35 @@ var ts;
         if (!parent)
             return 0 /* Read */;
         switch (parent.kind) {
-            case 195 /* ParenthesizedExpression */:
+            case 196 /* ParenthesizedExpression */:
                 return accessKind(parent);
-            case 203 /* PostfixUnaryExpression */:
-            case 202 /* PrefixUnaryExpression */:
+            case 204 /* PostfixUnaryExpression */:
+            case 203 /* PrefixUnaryExpression */:
                 var operator = parent.operator;
                 return operator === 44 /* PlusPlusToken */ || operator === 45 /* MinusMinusToken */ ? writeOrReadWrite() : 0 /* Read */;
-            case 204 /* BinaryExpression */:
+            case 205 /* BinaryExpression */:
                 var _a = parent, left = _a.left, operatorToken = _a.operatorToken;
                 return left === node && isAssignmentOperator(operatorToken.kind) ?
-                    operatorToken.kind === 59 /* EqualsToken */ ? 1 /* Write */ : writeOrReadWrite()
+                    operatorToken.kind === 60 /* EqualsToken */ ? 1 /* Write */ : writeOrReadWrite()
                     : 0 /* Read */;
-            case 189 /* PropertyAccessExpression */:
+            case 190 /* PropertyAccessExpression */:
                 return parent.name !== node ? 0 /* Read */ : accessKind(parent);
-            case 275 /* PropertyAssignment */: {
+            case 276 /* PropertyAssignment */: {
                 var parentAccess = accessKind(parent.parent);
                 // In `({ x: varname }) = { x: 1 }`, the left `x` is a read, the right `x` is a write.
                 return node === parent.name ? reverseAccessKind(parentAccess) : parentAccess;
             }
-            case 276 /* ShorthandPropertyAssignment */:
+            case 277 /* ShorthandPropertyAssignment */:
                 // Assume it's the local variable being accessed, since we don't check public properties for --noUnusedLocals.
                 return node === parent.objectAssignmentInitializer ? 0 /* Read */ : accessKind(parent.parent);
-            case 187 /* ArrayLiteralExpression */:
+            case 188 /* ArrayLiteralExpression */:
                 return accessKind(parent);
             default:
                 return 0 /* Read */;
         }
         function writeOrReadWrite() {
             // If grandparent is not an ExpressionStatement, this is used as an expression in addition to having a side effect.
-            return parent.parent && skipParenthesesUp(parent.parent).kind === 221 /* ExpressionStatement */ ? 1 /* Write */ : 2 /* ReadWrite */;
+            return parent.parent && skipParenthesesUp(parent.parent).kind === 222 /* ExpressionStatement */ ? 1 /* Write */ : 2 /* ReadWrite */;
         }
     }
     function reverseAccessKind(a) {
@@ -12602,7 +12794,7 @@ var ts;
     }
     ts.getClassLikeDeclarationOfSymbol = getClassLikeDeclarationOfSymbol;
     function getObjectFlags(type) {
-        return type.flags & 3768320 /* ObjectFlagsType */ ? type.objectFlags : 0;
+        return type.flags & 3899392 /* ObjectFlagsType */ ? type.objectFlags : 0;
     }
     ts.getObjectFlags = getObjectFlags;
     function typeHasCallOrConstructSignatures(type, checker) {
@@ -12654,32 +12846,32 @@ var ts;
     }
     ts.isObjectTypeDeclaration = isObjectTypeDeclaration;
     function isTypeNodeKind(kind) {
-        return (kind >= 163 /* FirstTypeNode */ && kind <= 183 /* LastTypeNode */)
-            || kind === 120 /* AnyKeyword */
-            || kind === 143 /* UnknownKeyword */
-            || kind === 135 /* NumberKeyword */
-            || kind === 146 /* BigIntKeyword */
-            || kind === 136 /* ObjectKeyword */
-            || kind === 123 /* BooleanKeyword */
-            || kind === 138 /* StringKeyword */
-            || kind === 139 /* SymbolKeyword */
-            || kind === 100 /* ThisKeyword */
-            || kind === 106 /* VoidKeyword */
-            || kind === 141 /* UndefinedKeyword */
-            || kind === 96 /* NullKeyword */
-            || kind === 132 /* NeverKeyword */
-            || kind === 211 /* ExpressionWithTypeArguments */
-            || kind === 289 /* JSDocAllType */
-            || kind === 290 /* JSDocUnknownType */
-            || kind === 291 /* JSDocNullableType */
-            || kind === 292 /* JSDocNonNullableType */
-            || kind === 293 /* JSDocOptionalType */
-            || kind === 294 /* JSDocFunctionType */
-            || kind === 295 /* JSDocVariadicType */;
+        return (kind >= 164 /* FirstTypeNode */ && kind <= 184 /* LastTypeNode */)
+            || kind === 121 /* AnyKeyword */
+            || kind === 144 /* UnknownKeyword */
+            || kind === 136 /* NumberKeyword */
+            || kind === 147 /* BigIntKeyword */
+            || kind === 137 /* ObjectKeyword */
+            || kind === 124 /* BooleanKeyword */
+            || kind === 139 /* StringKeyword */
+            || kind === 140 /* SymbolKeyword */
+            || kind === 101 /* ThisKeyword */
+            || kind === 107 /* VoidKeyword */
+            || kind === 142 /* UndefinedKeyword */
+            || kind === 97 /* NullKeyword */
+            || kind === 133 /* NeverKeyword */
+            || kind === 212 /* ExpressionWithTypeArguments */
+            || kind === 290 /* JSDocAllType */
+            || kind === 291 /* JSDocUnknownType */
+            || kind === 292 /* JSDocNullableType */
+            || kind === 293 /* JSDocNonNullableType */
+            || kind === 294 /* JSDocOptionalType */
+            || kind === 295 /* JSDocFunctionType */
+            || kind === 296 /* JSDocVariadicType */;
     }
     ts.isTypeNodeKind = isTypeNodeKind;
     function isAccessExpression(node) {
-        return node.kind === 189 /* PropertyAccessExpression */ || node.kind === 190 /* ElementAccessExpression */;
+        return node.kind === 190 /* PropertyAccessExpression */ || node.kind === 191 /* ElementAccessExpression */;
     }
     ts.isAccessExpression = isAccessExpression;
     function isBundleFileTextLike(section) {
@@ -12696,8 +12888,10 @@ var ts;
 (function (ts) {
     function getDefaultLibFileName(options) {
         switch (options.target) {
-            case 7 /* ESNext */:
+            case 99 /* ESNext */:
                 return "lib.esnext.full.d.ts";
+            case 7 /* ES2020 */:
+                return "lib.es2020.full.d.ts";
             case 6 /* ES2019 */:
                 return "lib.es2019.full.d.ts";
             case 5 /* ES2018 */:
@@ -12914,9 +13108,9 @@ var ts;
     }
     ts.collapseTextChangeRangesAcrossMultipleVersions = collapseTextChangeRangesAcrossMultipleVersions;
     function getTypeParameterOwner(d) {
-        if (d && d.kind === 150 /* TypeParameter */) {
+        if (d && d.kind === 151 /* TypeParameter */) {
             for (var current = d; current; current = current.parent) {
-                if (ts.isFunctionLike(current) || ts.isClassLike(current) || current.kind === 241 /* InterfaceDeclaration */) {
+                if (ts.isFunctionLike(current) || ts.isClassLike(current) || current.kind === 242 /* InterfaceDeclaration */) {
                     return current;
                 }
             }
@@ -12924,7 +13118,7 @@ var ts;
     }
     ts.getTypeParameterOwner = getTypeParameterOwner;
     function isParameterPropertyDeclaration(node) {
-        return ts.hasModifier(node, 92 /* ParameterPropertyModifier */) && node.parent.kind === 157 /* Constructor */;
+        return ts.hasModifier(node, 92 /* ParameterPropertyModifier */) && node.parent.kind === 158 /* Constructor */;
     }
     ts.isParameterPropertyDeclaration = isParameterPropertyDeclaration;
     function isEmptyBindingPattern(node) {
@@ -12954,14 +13148,14 @@ var ts;
             node = walkUpBindingElementsAndPatterns(node);
         }
         var flags = getFlags(node);
-        if (node.kind === 237 /* VariableDeclaration */) {
+        if (node.kind === 238 /* VariableDeclaration */) {
             node = node.parent;
         }
-        if (node && node.kind === 238 /* VariableDeclarationList */) {
+        if (node && node.kind === 239 /* VariableDeclarationList */) {
             flags |= getFlags(node);
             node = node.parent;
         }
-        if (node && node.kind === 219 /* VariableStatement */) {
+        if (node && node.kind === 220 /* VariableStatement */) {
             flags |= getFlags(node);
         }
         return flags;
@@ -13107,27 +13301,27 @@ var ts;
         }
         // Covers remaining cases (returning undefined if none match).
         switch (hostNode.kind) {
-            case 219 /* VariableStatement */:
+            case 220 /* VariableStatement */:
                 if (hostNode.declarationList && hostNode.declarationList.declarations[0]) {
                     return getDeclarationIdentifier(hostNode.declarationList.declarations[0]);
                 }
                 break;
-            case 221 /* ExpressionStatement */:
+            case 222 /* ExpressionStatement */:
                 var expr = hostNode.expression;
                 switch (expr.kind) {
-                    case 189 /* PropertyAccessExpression */:
+                    case 190 /* PropertyAccessExpression */:
                         return expr.name;
-                    case 190 /* ElementAccessExpression */:
+                    case 191 /* ElementAccessExpression */:
                         var arg = expr.argumentExpression;
                         if (ts.isIdentifier(arg)) {
                             return arg;
                         }
                 }
                 break;
-            case 195 /* ParenthesizedExpression */: {
+            case 196 /* ParenthesizedExpression */: {
                 return getDeclarationIdentifier(hostNode.expression);
             }
-            case 233 /* LabeledStatement */: {
+            case 234 /* LabeledStatement */: {
                 if (ts.isDeclaration(hostNode.statement) || ts.isExpression(hostNode.statement)) {
                     return getDeclarationIdentifier(hostNode.statement);
                 }
@@ -13151,18 +13345,18 @@ var ts;
     /** @internal */
     function getNonAssignedNameOfDeclaration(declaration) {
         switch (declaration.kind) {
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 return declaration;
-            case 310 /* JSDocPropertyTag */:
-            case 304 /* JSDocParameterTag */: {
+            case 312 /* JSDocPropertyTag */:
+            case 306 /* JSDocParameterTag */: {
                 var name = declaration.name;
-                if (name.kind === 148 /* QualifiedName */) {
+                if (name.kind === 149 /* QualifiedName */) {
                     return name.right;
                 }
                 break;
             }
-            case 191 /* CallExpression */:
-            case 204 /* BinaryExpression */: {
+            case 192 /* CallExpression */:
+            case 205 /* BinaryExpression */: {
                 var expr = declaration;
                 switch (ts.getAssignmentDeclarationKind(expr)) {
                     case 1 /* ExportsProperty */:
@@ -13178,9 +13372,9 @@ var ts;
                         return undefined;
                 }
             }
-            case 309 /* JSDocTypedefTag */:
+            case 311 /* JSDocTypedefTag */:
                 return getNameOfJSDocTypedef(declaration);
-            case 254 /* ExportAssignment */: {
+            case 255 /* ExportAssignment */: {
                 var expression = declaration.expression;
                 return ts.isIdentifier(expression) ? expression : undefined;
             }
@@ -13210,6 +13404,9 @@ var ts;
                 return node.parent.left.name;
             }
         }
+        else if (ts.isVariableDeclaration(node.parent) && ts.isIdentifier(node.parent.name)) {
+            return node.parent.name;
+        }
     }
     /**
      * Gets the JSDoc parameter tags for the node if present.
@@ -13382,7 +13579,7 @@ var ts;
             return ts.emptyArray;
         }
         if (ts.isJSDocTypeAlias(node)) {
-            ts.Debug.assert(node.parent.kind === 296 /* JSDocComment */);
+            ts.Debug.assert(node.parent.kind === 297 /* JSDocComment */);
             return ts.flatMap(node.parent.tags, function (tag) { return ts.isJSDocTemplateTag(tag) ? tag.typeParameters : undefined; });
         }
         if (node.typeParameters) {
@@ -13450,198 +13647,198 @@ var ts;
     }
     ts.isTemplateTail = isTemplateTail;
     function isIdentifier(node) {
-        return node.kind === 72 /* Identifier */;
+        return node.kind === 73 /* Identifier */;
     }
     ts.isIdentifier = isIdentifier;
     // Names
     function isQualifiedName(node) {
-        return node.kind === 148 /* QualifiedName */;
+        return node.kind === 149 /* QualifiedName */;
     }
     ts.isQualifiedName = isQualifiedName;
     function isComputedPropertyName(node) {
-        return node.kind === 149 /* ComputedPropertyName */;
+        return node.kind === 150 /* ComputedPropertyName */;
     }
     ts.isComputedPropertyName = isComputedPropertyName;
     // Signature elements
     function isTypeParameterDeclaration(node) {
-        return node.kind === 150 /* TypeParameter */;
+        return node.kind === 151 /* TypeParameter */;
     }
     ts.isTypeParameterDeclaration = isTypeParameterDeclaration;
     function isParameter(node) {
-        return node.kind === 151 /* Parameter */;
+        return node.kind === 152 /* Parameter */;
     }
     ts.isParameter = isParameter;
     function isDecorator(node) {
-        return node.kind === 152 /* Decorator */;
+        return node.kind === 153 /* Decorator */;
     }
     ts.isDecorator = isDecorator;
     // TypeMember
     function isPropertySignature(node) {
-        return node.kind === 153 /* PropertySignature */;
+        return node.kind === 154 /* PropertySignature */;
     }
     ts.isPropertySignature = isPropertySignature;
     function isPropertyDeclaration(node) {
-        return node.kind === 154 /* PropertyDeclaration */;
+        return node.kind === 155 /* PropertyDeclaration */;
     }
     ts.isPropertyDeclaration = isPropertyDeclaration;
     function isMethodSignature(node) {
-        return node.kind === 155 /* MethodSignature */;
+        return node.kind === 156 /* MethodSignature */;
     }
     ts.isMethodSignature = isMethodSignature;
     function isMethodDeclaration(node) {
-        return node.kind === 156 /* MethodDeclaration */;
+        return node.kind === 157 /* MethodDeclaration */;
     }
     ts.isMethodDeclaration = isMethodDeclaration;
     function isConstructorDeclaration(node) {
-        return node.kind === 157 /* Constructor */;
+        return node.kind === 158 /* Constructor */;
     }
     ts.isConstructorDeclaration = isConstructorDeclaration;
     function isGetAccessorDeclaration(node) {
-        return node.kind === 158 /* GetAccessor */;
+        return node.kind === 159 /* GetAccessor */;
     }
     ts.isGetAccessorDeclaration = isGetAccessorDeclaration;
     function isSetAccessorDeclaration(node) {
-        return node.kind === 159 /* SetAccessor */;
+        return node.kind === 160 /* SetAccessor */;
     }
     ts.isSetAccessorDeclaration = isSetAccessorDeclaration;
     function isCallSignatureDeclaration(node) {
-        return node.kind === 160 /* CallSignature */;
+        return node.kind === 161 /* CallSignature */;
     }
     ts.isCallSignatureDeclaration = isCallSignatureDeclaration;
     function isConstructSignatureDeclaration(node) {
-        return node.kind === 161 /* ConstructSignature */;
+        return node.kind === 162 /* ConstructSignature */;
     }
     ts.isConstructSignatureDeclaration = isConstructSignatureDeclaration;
     function isIndexSignatureDeclaration(node) {
-        return node.kind === 162 /* IndexSignature */;
+        return node.kind === 163 /* IndexSignature */;
     }
     ts.isIndexSignatureDeclaration = isIndexSignatureDeclaration;
     /* @internal */
     function isGetOrSetAccessorDeclaration(node) {
-        return node.kind === 159 /* SetAccessor */ || node.kind === 158 /* GetAccessor */;
+        return node.kind === 160 /* SetAccessor */ || node.kind === 159 /* GetAccessor */;
     }
     ts.isGetOrSetAccessorDeclaration = isGetOrSetAccessorDeclaration;
     // Type
     function isTypePredicateNode(node) {
-        return node.kind === 163 /* TypePredicate */;
+        return node.kind === 164 /* TypePredicate */;
     }
     ts.isTypePredicateNode = isTypePredicateNode;
     function isTypeReferenceNode(node) {
-        return node.kind === 164 /* TypeReference */;
+        return node.kind === 165 /* TypeReference */;
     }
     ts.isTypeReferenceNode = isTypeReferenceNode;
     function isFunctionTypeNode(node) {
-        return node.kind === 165 /* FunctionType */;
+        return node.kind === 166 /* FunctionType */;
     }
     ts.isFunctionTypeNode = isFunctionTypeNode;
     function isConstructorTypeNode(node) {
-        return node.kind === 166 /* ConstructorType */;
+        return node.kind === 167 /* ConstructorType */;
     }
     ts.isConstructorTypeNode = isConstructorTypeNode;
     function isTypeQueryNode(node) {
-        return node.kind === 167 /* TypeQuery */;
+        return node.kind === 168 /* TypeQuery */;
     }
     ts.isTypeQueryNode = isTypeQueryNode;
     function isTypeLiteralNode(node) {
-        return node.kind === 168 /* TypeLiteral */;
+        return node.kind === 169 /* TypeLiteral */;
     }
     ts.isTypeLiteralNode = isTypeLiteralNode;
     function isArrayTypeNode(node) {
-        return node.kind === 169 /* ArrayType */;
+        return node.kind === 170 /* ArrayType */;
     }
     ts.isArrayTypeNode = isArrayTypeNode;
     function isTupleTypeNode(node) {
-        return node.kind === 170 /* TupleType */;
+        return node.kind === 171 /* TupleType */;
     }
     ts.isTupleTypeNode = isTupleTypeNode;
     function isUnionTypeNode(node) {
-        return node.kind === 173 /* UnionType */;
+        return node.kind === 174 /* UnionType */;
     }
     ts.isUnionTypeNode = isUnionTypeNode;
     function isIntersectionTypeNode(node) {
-        return node.kind === 174 /* IntersectionType */;
+        return node.kind === 175 /* IntersectionType */;
     }
     ts.isIntersectionTypeNode = isIntersectionTypeNode;
     function isConditionalTypeNode(node) {
-        return node.kind === 175 /* ConditionalType */;
+        return node.kind === 176 /* ConditionalType */;
     }
     ts.isConditionalTypeNode = isConditionalTypeNode;
     function isInferTypeNode(node) {
-        return node.kind === 176 /* InferType */;
+        return node.kind === 177 /* InferType */;
     }
     ts.isInferTypeNode = isInferTypeNode;
     function isParenthesizedTypeNode(node) {
-        return node.kind === 177 /* ParenthesizedType */;
+        return node.kind === 178 /* ParenthesizedType */;
     }
     ts.isParenthesizedTypeNode = isParenthesizedTypeNode;
     function isThisTypeNode(node) {
-        return node.kind === 178 /* ThisType */;
+        return node.kind === 179 /* ThisType */;
     }
     ts.isThisTypeNode = isThisTypeNode;
     function isTypeOperatorNode(node) {
-        return node.kind === 179 /* TypeOperator */;
+        return node.kind === 180 /* TypeOperator */;
     }
     ts.isTypeOperatorNode = isTypeOperatorNode;
     function isIndexedAccessTypeNode(node) {
-        return node.kind === 180 /* IndexedAccessType */;
+        return node.kind === 181 /* IndexedAccessType */;
     }
     ts.isIndexedAccessTypeNode = isIndexedAccessTypeNode;
     function isMappedTypeNode(node) {
-        return node.kind === 181 /* MappedType */;
+        return node.kind === 182 /* MappedType */;
     }
     ts.isMappedTypeNode = isMappedTypeNode;
     function isLiteralTypeNode(node) {
-        return node.kind === 182 /* LiteralType */;
+        return node.kind === 183 /* LiteralType */;
     }
     ts.isLiteralTypeNode = isLiteralTypeNode;
     function isImportTypeNode(node) {
-        return node.kind === 183 /* ImportType */;
+        return node.kind === 184 /* ImportType */;
     }
     ts.isImportTypeNode = isImportTypeNode;
     // Binding patterns
     function isObjectBindingPattern(node) {
-        return node.kind === 184 /* ObjectBindingPattern */;
+        return node.kind === 185 /* ObjectBindingPattern */;
     }
     ts.isObjectBindingPattern = isObjectBindingPattern;
     function isArrayBindingPattern(node) {
-        return node.kind === 185 /* ArrayBindingPattern */;
+        return node.kind === 186 /* ArrayBindingPattern */;
     }
     ts.isArrayBindingPattern = isArrayBindingPattern;
     function isBindingElement(node) {
-        return node.kind === 186 /* BindingElement */;
+        return node.kind === 187 /* BindingElement */;
     }
     ts.isBindingElement = isBindingElement;
     // Expression
     function isArrayLiteralExpression(node) {
-        return node.kind === 187 /* ArrayLiteralExpression */;
+        return node.kind === 188 /* ArrayLiteralExpression */;
     }
     ts.isArrayLiteralExpression = isArrayLiteralExpression;
     function isObjectLiteralExpression(node) {
-        return node.kind === 188 /* ObjectLiteralExpression */;
+        return node.kind === 189 /* ObjectLiteralExpression */;
     }
     ts.isObjectLiteralExpression = isObjectLiteralExpression;
     function isPropertyAccessExpression(node) {
-        return node.kind === 189 /* PropertyAccessExpression */;
+        return node.kind === 190 /* PropertyAccessExpression */;
     }
     ts.isPropertyAccessExpression = isPropertyAccessExpression;
     function isElementAccessExpression(node) {
-        return node.kind === 190 /* ElementAccessExpression */;
+        return node.kind === 191 /* ElementAccessExpression */;
     }
     ts.isElementAccessExpression = isElementAccessExpression;
     function isCallExpression(node) {
-        return node.kind === 191 /* CallExpression */;
+        return node.kind === 192 /* CallExpression */;
     }
     ts.isCallExpression = isCallExpression;
     function isNewExpression(node) {
-        return node.kind === 192 /* NewExpression */;
+        return node.kind === 193 /* NewExpression */;
     }
     ts.isNewExpression = isNewExpression;
     function isTaggedTemplateExpression(node) {
-        return node.kind === 193 /* TaggedTemplateExpression */;
+        return node.kind === 194 /* TaggedTemplateExpression */;
     }
     ts.isTaggedTemplateExpression = isTaggedTemplateExpression;
     function isTypeAssertion(node) {
-        return node.kind === 194 /* TypeAssertionExpression */;
+        return node.kind === 195 /* TypeAssertionExpression */;
     }
     ts.isTypeAssertion = isTypeAssertion;
     function isConstTypeReference(node) {
@@ -13650,376 +13847,376 @@ var ts;
     }
     ts.isConstTypeReference = isConstTypeReference;
     function isParenthesizedExpression(node) {
-        return node.kind === 195 /* ParenthesizedExpression */;
+        return node.kind === 196 /* ParenthesizedExpression */;
     }
     ts.isParenthesizedExpression = isParenthesizedExpression;
     function skipPartiallyEmittedExpressions(node) {
-        while (node.kind === 313 /* PartiallyEmittedExpression */) {
+        while (node.kind === 315 /* PartiallyEmittedExpression */) {
             node = node.expression;
         }
         return node;
     }
     ts.skipPartiallyEmittedExpressions = skipPartiallyEmittedExpressions;
     function isFunctionExpression(node) {
-        return node.kind === 196 /* FunctionExpression */;
+        return node.kind === 197 /* FunctionExpression */;
     }
     ts.isFunctionExpression = isFunctionExpression;
     function isArrowFunction(node) {
-        return node.kind === 197 /* ArrowFunction */;
+        return node.kind === 198 /* ArrowFunction */;
     }
     ts.isArrowFunction = isArrowFunction;
     function isDeleteExpression(node) {
-        return node.kind === 198 /* DeleteExpression */;
+        return node.kind === 199 /* DeleteExpression */;
     }
     ts.isDeleteExpression = isDeleteExpression;
     function isTypeOfExpression(node) {
-        return node.kind === 199 /* TypeOfExpression */;
+        return node.kind === 200 /* TypeOfExpression */;
     }
     ts.isTypeOfExpression = isTypeOfExpression;
     function isVoidExpression(node) {
-        return node.kind === 200 /* VoidExpression */;
+        return node.kind === 201 /* VoidExpression */;
     }
     ts.isVoidExpression = isVoidExpression;
     function isAwaitExpression(node) {
-        return node.kind === 201 /* AwaitExpression */;
+        return node.kind === 202 /* AwaitExpression */;
     }
     ts.isAwaitExpression = isAwaitExpression;
     function isPrefixUnaryExpression(node) {
-        return node.kind === 202 /* PrefixUnaryExpression */;
+        return node.kind === 203 /* PrefixUnaryExpression */;
     }
     ts.isPrefixUnaryExpression = isPrefixUnaryExpression;
     function isPostfixUnaryExpression(node) {
-        return node.kind === 203 /* PostfixUnaryExpression */;
+        return node.kind === 204 /* PostfixUnaryExpression */;
     }
     ts.isPostfixUnaryExpression = isPostfixUnaryExpression;
     function isBinaryExpression(node) {
-        return node.kind === 204 /* BinaryExpression */;
+        return node.kind === 205 /* BinaryExpression */;
     }
     ts.isBinaryExpression = isBinaryExpression;
     function isConditionalExpression(node) {
-        return node.kind === 205 /* ConditionalExpression */;
+        return node.kind === 206 /* ConditionalExpression */;
     }
     ts.isConditionalExpression = isConditionalExpression;
     function isTemplateExpression(node) {
-        return node.kind === 206 /* TemplateExpression */;
+        return node.kind === 207 /* TemplateExpression */;
     }
     ts.isTemplateExpression = isTemplateExpression;
     function isYieldExpression(node) {
-        return node.kind === 207 /* YieldExpression */;
+        return node.kind === 208 /* YieldExpression */;
     }
     ts.isYieldExpression = isYieldExpression;
     function isSpreadElement(node) {
-        return node.kind === 208 /* SpreadElement */;
+        return node.kind === 209 /* SpreadElement */;
     }
     ts.isSpreadElement = isSpreadElement;
     function isClassExpression(node) {
-        return node.kind === 209 /* ClassExpression */;
+        return node.kind === 210 /* ClassExpression */;
     }
     ts.isClassExpression = isClassExpression;
     function isOmittedExpression(node) {
-        return node.kind === 210 /* OmittedExpression */;
+        return node.kind === 211 /* OmittedExpression */;
     }
     ts.isOmittedExpression = isOmittedExpression;
     function isExpressionWithTypeArguments(node) {
-        return node.kind === 211 /* ExpressionWithTypeArguments */;
+        return node.kind === 212 /* ExpressionWithTypeArguments */;
     }
     ts.isExpressionWithTypeArguments = isExpressionWithTypeArguments;
     function isAsExpression(node) {
-        return node.kind === 212 /* AsExpression */;
+        return node.kind === 213 /* AsExpression */;
     }
     ts.isAsExpression = isAsExpression;
     function isNonNullExpression(node) {
-        return node.kind === 213 /* NonNullExpression */;
+        return node.kind === 214 /* NonNullExpression */;
     }
     ts.isNonNullExpression = isNonNullExpression;
     function isMetaProperty(node) {
-        return node.kind === 214 /* MetaProperty */;
+        return node.kind === 215 /* MetaProperty */;
     }
     ts.isMetaProperty = isMetaProperty;
     // Misc
     function isTemplateSpan(node) {
-        return node.kind === 216 /* TemplateSpan */;
+        return node.kind === 217 /* TemplateSpan */;
     }
     ts.isTemplateSpan = isTemplateSpan;
     function isSemicolonClassElement(node) {
-        return node.kind === 217 /* SemicolonClassElement */;
+        return node.kind === 218 /* SemicolonClassElement */;
     }
     ts.isSemicolonClassElement = isSemicolonClassElement;
     // Block
     function isBlock(node) {
-        return node.kind === 218 /* Block */;
+        return node.kind === 219 /* Block */;
     }
     ts.isBlock = isBlock;
     function isVariableStatement(node) {
-        return node.kind === 219 /* VariableStatement */;
+        return node.kind === 220 /* VariableStatement */;
     }
     ts.isVariableStatement = isVariableStatement;
     function isEmptyStatement(node) {
-        return node.kind === 220 /* EmptyStatement */;
+        return node.kind === 221 /* EmptyStatement */;
     }
     ts.isEmptyStatement = isEmptyStatement;
     function isExpressionStatement(node) {
-        return node.kind === 221 /* ExpressionStatement */;
+        return node.kind === 222 /* ExpressionStatement */;
     }
     ts.isExpressionStatement = isExpressionStatement;
     function isIfStatement(node) {
-        return node.kind === 222 /* IfStatement */;
+        return node.kind === 223 /* IfStatement */;
     }
     ts.isIfStatement = isIfStatement;
     function isDoStatement(node) {
-        return node.kind === 223 /* DoStatement */;
+        return node.kind === 224 /* DoStatement */;
     }
     ts.isDoStatement = isDoStatement;
     function isWhileStatement(node) {
-        return node.kind === 224 /* WhileStatement */;
+        return node.kind === 225 /* WhileStatement */;
     }
     ts.isWhileStatement = isWhileStatement;
     function isForStatement(node) {
-        return node.kind === 225 /* ForStatement */;
+        return node.kind === 226 /* ForStatement */;
     }
     ts.isForStatement = isForStatement;
     function isForInStatement(node) {
-        return node.kind === 226 /* ForInStatement */;
+        return node.kind === 227 /* ForInStatement */;
     }
     ts.isForInStatement = isForInStatement;
     function isForOfStatement(node) {
-        return node.kind === 227 /* ForOfStatement */;
+        return node.kind === 228 /* ForOfStatement */;
     }
     ts.isForOfStatement = isForOfStatement;
     function isContinueStatement(node) {
-        return node.kind === 228 /* ContinueStatement */;
+        return node.kind === 229 /* ContinueStatement */;
     }
     ts.isContinueStatement = isContinueStatement;
     function isBreakStatement(node) {
-        return node.kind === 229 /* BreakStatement */;
+        return node.kind === 230 /* BreakStatement */;
     }
     ts.isBreakStatement = isBreakStatement;
     function isBreakOrContinueStatement(node) {
-        return node.kind === 229 /* BreakStatement */ || node.kind === 228 /* ContinueStatement */;
+        return node.kind === 230 /* BreakStatement */ || node.kind === 229 /* ContinueStatement */;
     }
     ts.isBreakOrContinueStatement = isBreakOrContinueStatement;
     function isReturnStatement(node) {
-        return node.kind === 230 /* ReturnStatement */;
+        return node.kind === 231 /* ReturnStatement */;
     }
     ts.isReturnStatement = isReturnStatement;
     function isWithStatement(node) {
-        return node.kind === 231 /* WithStatement */;
+        return node.kind === 232 /* WithStatement */;
     }
     ts.isWithStatement = isWithStatement;
     function isSwitchStatement(node) {
-        return node.kind === 232 /* SwitchStatement */;
+        return node.kind === 233 /* SwitchStatement */;
     }
     ts.isSwitchStatement = isSwitchStatement;
     function isLabeledStatement(node) {
-        return node.kind === 233 /* LabeledStatement */;
+        return node.kind === 234 /* LabeledStatement */;
     }
     ts.isLabeledStatement = isLabeledStatement;
     function isThrowStatement(node) {
-        return node.kind === 234 /* ThrowStatement */;
+        return node.kind === 235 /* ThrowStatement */;
     }
     ts.isThrowStatement = isThrowStatement;
     function isTryStatement(node) {
-        return node.kind === 235 /* TryStatement */;
+        return node.kind === 236 /* TryStatement */;
     }
     ts.isTryStatement = isTryStatement;
     function isDebuggerStatement(node) {
-        return node.kind === 236 /* DebuggerStatement */;
+        return node.kind === 237 /* DebuggerStatement */;
     }
     ts.isDebuggerStatement = isDebuggerStatement;
     function isVariableDeclaration(node) {
-        return node.kind === 237 /* VariableDeclaration */;
+        return node.kind === 238 /* VariableDeclaration */;
     }
     ts.isVariableDeclaration = isVariableDeclaration;
     function isVariableDeclarationList(node) {
-        return node.kind === 238 /* VariableDeclarationList */;
+        return node.kind === 239 /* VariableDeclarationList */;
     }
     ts.isVariableDeclarationList = isVariableDeclarationList;
     function isFunctionDeclaration(node) {
-        return node.kind === 239 /* FunctionDeclaration */;
+        return node.kind === 240 /* FunctionDeclaration */;
     }
     ts.isFunctionDeclaration = isFunctionDeclaration;
     function isClassDeclaration(node) {
-        return node.kind === 240 /* ClassDeclaration */;
+        return node.kind === 241 /* ClassDeclaration */;
     }
     ts.isClassDeclaration = isClassDeclaration;
     function isInterfaceDeclaration(node) {
-        return node.kind === 241 /* InterfaceDeclaration */;
+        return node.kind === 242 /* InterfaceDeclaration */;
     }
     ts.isInterfaceDeclaration = isInterfaceDeclaration;
     function isTypeAliasDeclaration(node) {
-        return node.kind === 242 /* TypeAliasDeclaration */;
+        return node.kind === 243 /* TypeAliasDeclaration */;
     }
     ts.isTypeAliasDeclaration = isTypeAliasDeclaration;
     function isEnumDeclaration(node) {
-        return node.kind === 243 /* EnumDeclaration */;
+        return node.kind === 244 /* EnumDeclaration */;
     }
     ts.isEnumDeclaration = isEnumDeclaration;
     function isModuleDeclaration(node) {
-        return node.kind === 244 /* ModuleDeclaration */;
+        return node.kind === 245 /* ModuleDeclaration */;
     }
     ts.isModuleDeclaration = isModuleDeclaration;
     function isModuleBlock(node) {
-        return node.kind === 245 /* ModuleBlock */;
+        return node.kind === 246 /* ModuleBlock */;
     }
     ts.isModuleBlock = isModuleBlock;
     function isCaseBlock(node) {
-        return node.kind === 246 /* CaseBlock */;
+        return node.kind === 247 /* CaseBlock */;
     }
     ts.isCaseBlock = isCaseBlock;
     function isNamespaceExportDeclaration(node) {
-        return node.kind === 247 /* NamespaceExportDeclaration */;
+        return node.kind === 248 /* NamespaceExportDeclaration */;
     }
     ts.isNamespaceExportDeclaration = isNamespaceExportDeclaration;
     function isImportEqualsDeclaration(node) {
-        return node.kind === 248 /* ImportEqualsDeclaration */;
+        return node.kind === 249 /* ImportEqualsDeclaration */;
     }
     ts.isImportEqualsDeclaration = isImportEqualsDeclaration;
     function isImportDeclaration(node) {
-        return node.kind === 249 /* ImportDeclaration */;
+        return node.kind === 250 /* ImportDeclaration */;
     }
     ts.isImportDeclaration = isImportDeclaration;
     function isImportClause(node) {
-        return node.kind === 250 /* ImportClause */;
+        return node.kind === 251 /* ImportClause */;
     }
     ts.isImportClause = isImportClause;
     function isNamespaceImport(node) {
-        return node.kind === 251 /* NamespaceImport */;
+        return node.kind === 252 /* NamespaceImport */;
     }
     ts.isNamespaceImport = isNamespaceImport;
     function isNamedImports(node) {
-        return node.kind === 252 /* NamedImports */;
+        return node.kind === 253 /* NamedImports */;
     }
     ts.isNamedImports = isNamedImports;
     function isImportSpecifier(node) {
-        return node.kind === 253 /* ImportSpecifier */;
+        return node.kind === 254 /* ImportSpecifier */;
     }
     ts.isImportSpecifier = isImportSpecifier;
     function isExportAssignment(node) {
-        return node.kind === 254 /* ExportAssignment */;
+        return node.kind === 255 /* ExportAssignment */;
     }
     ts.isExportAssignment = isExportAssignment;
     function isExportDeclaration(node) {
-        return node.kind === 255 /* ExportDeclaration */;
+        return node.kind === 256 /* ExportDeclaration */;
     }
     ts.isExportDeclaration = isExportDeclaration;
     function isNamedExports(node) {
-        return node.kind === 256 /* NamedExports */;
+        return node.kind === 257 /* NamedExports */;
     }
     ts.isNamedExports = isNamedExports;
     function isExportSpecifier(node) {
-        return node.kind === 257 /* ExportSpecifier */;
+        return node.kind === 258 /* ExportSpecifier */;
     }
     ts.isExportSpecifier = isExportSpecifier;
     function isMissingDeclaration(node) {
-        return node.kind === 258 /* MissingDeclaration */;
+        return node.kind === 259 /* MissingDeclaration */;
     }
     ts.isMissingDeclaration = isMissingDeclaration;
     // Module References
     function isExternalModuleReference(node) {
-        return node.kind === 259 /* ExternalModuleReference */;
+        return node.kind === 260 /* ExternalModuleReference */;
     }
     ts.isExternalModuleReference = isExternalModuleReference;
     // JSX
     function isJsxElement(node) {
-        return node.kind === 260 /* JsxElement */;
+        return node.kind === 261 /* JsxElement */;
     }
     ts.isJsxElement = isJsxElement;
     function isJsxSelfClosingElement(node) {
-        return node.kind === 261 /* JsxSelfClosingElement */;
+        return node.kind === 262 /* JsxSelfClosingElement */;
     }
     ts.isJsxSelfClosingElement = isJsxSelfClosingElement;
     function isJsxOpeningElement(node) {
-        return node.kind === 262 /* JsxOpeningElement */;
+        return node.kind === 263 /* JsxOpeningElement */;
     }
     ts.isJsxOpeningElement = isJsxOpeningElement;
     function isJsxClosingElement(node) {
-        return node.kind === 263 /* JsxClosingElement */;
+        return node.kind === 264 /* JsxClosingElement */;
     }
     ts.isJsxClosingElement = isJsxClosingElement;
     function isJsxFragment(node) {
-        return node.kind === 264 /* JsxFragment */;
+        return node.kind === 265 /* JsxFragment */;
     }
     ts.isJsxFragment = isJsxFragment;
     function isJsxOpeningFragment(node) {
-        return node.kind === 265 /* JsxOpeningFragment */;
+        return node.kind === 266 /* JsxOpeningFragment */;
     }
     ts.isJsxOpeningFragment = isJsxOpeningFragment;
     function isJsxClosingFragment(node) {
-        return node.kind === 266 /* JsxClosingFragment */;
+        return node.kind === 267 /* JsxClosingFragment */;
     }
     ts.isJsxClosingFragment = isJsxClosingFragment;
     function isJsxAttribute(node) {
-        return node.kind === 267 /* JsxAttribute */;
+        return node.kind === 268 /* JsxAttribute */;
     }
     ts.isJsxAttribute = isJsxAttribute;
     function isJsxAttributes(node) {
-        return node.kind === 268 /* JsxAttributes */;
+        return node.kind === 269 /* JsxAttributes */;
     }
     ts.isJsxAttributes = isJsxAttributes;
     function isJsxSpreadAttribute(node) {
-        return node.kind === 269 /* JsxSpreadAttribute */;
+        return node.kind === 270 /* JsxSpreadAttribute */;
     }
     ts.isJsxSpreadAttribute = isJsxSpreadAttribute;
     function isJsxExpression(node) {
-        return node.kind === 270 /* JsxExpression */;
+        return node.kind === 271 /* JsxExpression */;
     }
     ts.isJsxExpression = isJsxExpression;
     // Clauses
     function isCaseClause(node) {
-        return node.kind === 271 /* CaseClause */;
+        return node.kind === 272 /* CaseClause */;
     }
     ts.isCaseClause = isCaseClause;
     function isDefaultClause(node) {
-        return node.kind === 272 /* DefaultClause */;
+        return node.kind === 273 /* DefaultClause */;
     }
     ts.isDefaultClause = isDefaultClause;
     function isHeritageClause(node) {
-        return node.kind === 273 /* HeritageClause */;
+        return node.kind === 274 /* HeritageClause */;
     }
     ts.isHeritageClause = isHeritageClause;
     function isCatchClause(node) {
-        return node.kind === 274 /* CatchClause */;
+        return node.kind === 275 /* CatchClause */;
     }
     ts.isCatchClause = isCatchClause;
     // Property assignments
     function isPropertyAssignment(node) {
-        return node.kind === 275 /* PropertyAssignment */;
+        return node.kind === 276 /* PropertyAssignment */;
     }
     ts.isPropertyAssignment = isPropertyAssignment;
     function isShorthandPropertyAssignment(node) {
-        return node.kind === 276 /* ShorthandPropertyAssignment */;
+        return node.kind === 277 /* ShorthandPropertyAssignment */;
     }
     ts.isShorthandPropertyAssignment = isShorthandPropertyAssignment;
     function isSpreadAssignment(node) {
-        return node.kind === 277 /* SpreadAssignment */;
+        return node.kind === 278 /* SpreadAssignment */;
     }
     ts.isSpreadAssignment = isSpreadAssignment;
     // Enum
     function isEnumMember(node) {
-        return node.kind === 278 /* EnumMember */;
+        return node.kind === 279 /* EnumMember */;
     }
     ts.isEnumMember = isEnumMember;
     // Top-level nodes
     function isSourceFile(node) {
-        return node.kind === 284 /* SourceFile */;
+        return node.kind === 285 /* SourceFile */;
     }
     ts.isSourceFile = isSourceFile;
     function isBundle(node) {
-        return node.kind === 285 /* Bundle */;
+        return node.kind === 286 /* Bundle */;
     }
     ts.isBundle = isBundle;
     function isUnparsedSource(node) {
-        return node.kind === 286 /* UnparsedSource */;
+        return node.kind === 287 /* UnparsedSource */;
     }
     ts.isUnparsedSource = isUnparsedSource;
     function isUnparsedPrepend(node) {
-        return node.kind === 280 /* UnparsedPrepend */;
+        return node.kind === 281 /* UnparsedPrepend */;
     }
     ts.isUnparsedPrepend = isUnparsedPrepend;
     function isUnparsedTextLike(node) {
         switch (node.kind) {
-            case 281 /* UnparsedText */:
-            case 282 /* UnparsedInternalText */:
+            case 282 /* UnparsedText */:
+            case 283 /* UnparsedInternalText */:
                 return true;
             default:
                 return false;
@@ -14028,101 +14225,105 @@ var ts;
     ts.isUnparsedTextLike = isUnparsedTextLike;
     function isUnparsedNode(node) {
         return isUnparsedTextLike(node) ||
-            node.kind === 279 /* UnparsedPrologue */ ||
-            node.kind === 283 /* UnparsedSyntheticReference */;
+            node.kind === 280 /* UnparsedPrologue */ ||
+            node.kind === 284 /* UnparsedSyntheticReference */;
     }
     ts.isUnparsedNode = isUnparsedNode;
     // JSDoc
     function isJSDocTypeExpression(node) {
-        return node.kind === 288 /* JSDocTypeExpression */;
+        return node.kind === 289 /* JSDocTypeExpression */;
     }
     ts.isJSDocTypeExpression = isJSDocTypeExpression;
     function isJSDocAllType(node) {
-        return node.kind === 289 /* JSDocAllType */;
+        return node.kind === 290 /* JSDocAllType */;
     }
     ts.isJSDocAllType = isJSDocAllType;
     function isJSDocUnknownType(node) {
-        return node.kind === 290 /* JSDocUnknownType */;
+        return node.kind === 291 /* JSDocUnknownType */;
     }
     ts.isJSDocUnknownType = isJSDocUnknownType;
     function isJSDocNullableType(node) {
-        return node.kind === 291 /* JSDocNullableType */;
+        return node.kind === 292 /* JSDocNullableType */;
     }
     ts.isJSDocNullableType = isJSDocNullableType;
     function isJSDocNonNullableType(node) {
-        return node.kind === 292 /* JSDocNonNullableType */;
+        return node.kind === 293 /* JSDocNonNullableType */;
     }
     ts.isJSDocNonNullableType = isJSDocNonNullableType;
     function isJSDocOptionalType(node) {
-        return node.kind === 293 /* JSDocOptionalType */;
+        return node.kind === 294 /* JSDocOptionalType */;
     }
     ts.isJSDocOptionalType = isJSDocOptionalType;
     function isJSDocFunctionType(node) {
-        return node.kind === 294 /* JSDocFunctionType */;
+        return node.kind === 295 /* JSDocFunctionType */;
     }
     ts.isJSDocFunctionType = isJSDocFunctionType;
     function isJSDocVariadicType(node) {
-        return node.kind === 295 /* JSDocVariadicType */;
+        return node.kind === 296 /* JSDocVariadicType */;
     }
     ts.isJSDocVariadicType = isJSDocVariadicType;
     function isJSDoc(node) {
-        return node.kind === 296 /* JSDocComment */;
+        return node.kind === 297 /* JSDocComment */;
     }
     ts.isJSDoc = isJSDoc;
+    function isJSDocAuthorTag(node) {
+        return node.kind === 302 /* JSDocAuthorTag */;
+    }
+    ts.isJSDocAuthorTag = isJSDocAuthorTag;
     function isJSDocAugmentsTag(node) {
-        return node.kind === 300 /* JSDocAugmentsTag */;
+        return node.kind === 301 /* JSDocAugmentsTag */;
     }
     ts.isJSDocAugmentsTag = isJSDocAugmentsTag;
     function isJSDocClassTag(node) {
-        return node.kind === 301 /* JSDocClassTag */;
+        return node.kind === 303 /* JSDocClassTag */;
     }
     ts.isJSDocClassTag = isJSDocClassTag;
     function isJSDocEnumTag(node) {
-        return node.kind === 303 /* JSDocEnumTag */;
+        return node.kind === 305 /* JSDocEnumTag */;
     }
     ts.isJSDocEnumTag = isJSDocEnumTag;
     function isJSDocThisTag(node) {
-        return node.kind === 306 /* JSDocThisTag */;
+        return node.kind === 308 /* JSDocThisTag */;
     }
     ts.isJSDocThisTag = isJSDocThisTag;
     function isJSDocParameterTag(node) {
-        return node.kind === 304 /* JSDocParameterTag */;
+        return node.kind === 306 /* JSDocParameterTag */;
     }
     ts.isJSDocParameterTag = isJSDocParameterTag;
     function isJSDocReturnTag(node) {
-        return node.kind === 305 /* JSDocReturnTag */;
+        return node.kind === 307 /* JSDocReturnTag */;
     }
     ts.isJSDocReturnTag = isJSDocReturnTag;
     function isJSDocTypeTag(node) {
-        return node.kind === 307 /* JSDocTypeTag */;
+        return node.kind === 309 /* JSDocTypeTag */;
     }
     ts.isJSDocTypeTag = isJSDocTypeTag;
     function isJSDocTemplateTag(node) {
-        return node.kind === 308 /* JSDocTemplateTag */;
+        return node.kind === 310 /* JSDocTemplateTag */;
     }
     ts.isJSDocTemplateTag = isJSDocTemplateTag;
     function isJSDocTypedefTag(node) {
-        return node.kind === 309 /* JSDocTypedefTag */;
+        return node.kind === 311 /* JSDocTypedefTag */;
     }
     ts.isJSDocTypedefTag = isJSDocTypedefTag;
     function isJSDocPropertyTag(node) {
-        return node.kind === 310 /* JSDocPropertyTag */;
+        return node.kind === 312 /* JSDocPropertyTag */;
     }
     ts.isJSDocPropertyTag = isJSDocPropertyTag;
     function isJSDocPropertyLikeTag(node) {
-        return node.kind === 310 /* JSDocPropertyTag */ || node.kind === 304 /* JSDocParameterTag */;
+        return node.kind === 312 /* JSDocPropertyTag */ || node.kind === 306 /* JSDocParameterTag */;
     }
     ts.isJSDocPropertyLikeTag = isJSDocPropertyLikeTag;
     function isJSDocTypeLiteral(node) {
-        return node.kind === 297 /* JSDocTypeLiteral */;
+        return node.kind === 298 /* JSDocTypeLiteral */;
     }
     ts.isJSDocTypeLiteral = isJSDocTypeLiteral;
     function isJSDocCallbackTag(node) {
-        return node.kind === 302 /* JSDocCallbackTag */;
+        return node.kind === 304 /* JSDocCallbackTag */;
     }
     ts.isJSDocCallbackTag = isJSDocCallbackTag;
     function isJSDocSignature(node) {
-        return node.kind === 298 /* JSDocSignature */;
+        return node.kind === 299 /* JSDocSignature */;
     }
     ts.isJSDocSignature = isJSDocSignature;
 })(ts || (ts = {}));
@@ -14133,7 +14334,7 @@ var ts;
 (function (ts) {
     /* @internal */
     function isSyntaxList(n) {
-        return n.kind === 311 /* SyntaxList */;
+        return n.kind === 313 /* SyntaxList */;
     }
     ts.isSyntaxList = isSyntaxList;
     /* @internal */
@@ -14143,7 +14344,7 @@ var ts;
     ts.isNode = isNode;
     /* @internal */
     function isNodeKind(kind) {
-        return kind >= 148 /* FirstNode */;
+        return kind >= 149 /* FirstNode */;
     }
     ts.isNodeKind = isNodeKind;
     /**
@@ -14152,7 +14353,7 @@ var ts;
      * Literals are considered tokens, except TemplateLiteral, but does include TemplateHead/Middle/Tail.
      */
     function isToken(n) {
-        return n.kind >= 0 /* FirstToken */ && n.kind <= 147 /* LastToken */;
+        return n.kind >= 0 /* FirstToken */ && n.kind <= 148 /* LastToken */;
     }
     ts.isToken = isToken;
     // Node Arrays
@@ -14205,17 +14406,17 @@ var ts;
     /* @internal */
     function isModifierKind(token) {
         switch (token) {
-            case 118 /* AbstractKeyword */:
-            case 121 /* AsyncKeyword */:
-            case 77 /* ConstKeyword */:
-            case 125 /* DeclareKeyword */:
-            case 80 /* DefaultKeyword */:
-            case 85 /* ExportKeyword */:
-            case 115 /* PublicKeyword */:
-            case 113 /* PrivateKeyword */:
-            case 114 /* ProtectedKeyword */:
-            case 133 /* ReadonlyKeyword */:
-            case 116 /* StaticKeyword */:
+            case 119 /* AbstractKeyword */:
+            case 122 /* AsyncKeyword */:
+            case 78 /* ConstKeyword */:
+            case 126 /* DeclareKeyword */:
+            case 81 /* DefaultKeyword */:
+            case 86 /* ExportKeyword */:
+            case 116 /* PublicKeyword */:
+            case 114 /* PrivateKeyword */:
+            case 115 /* ProtectedKeyword */:
+            case 134 /* ReadonlyKeyword */:
+            case 117 /* StaticKeyword */:
                 return true;
         }
         return false;
@@ -14228,7 +14429,7 @@ var ts;
     ts.isParameterPropertyModifier = isParameterPropertyModifier;
     /* @internal */
     function isClassMemberModifier(idToken) {
-        return isParameterPropertyModifier(idToken) || idToken === 116 /* StaticKeyword */;
+        return isParameterPropertyModifier(idToken) || idToken === 117 /* StaticKeyword */;
     }
     ts.isClassMemberModifier = isClassMemberModifier;
     function isModifier(node) {
@@ -14237,23 +14438,23 @@ var ts;
     ts.isModifier = isModifier;
     function isEntityName(node) {
         var kind = node.kind;
-        return kind === 148 /* QualifiedName */
-            || kind === 72 /* Identifier */;
+        return kind === 149 /* QualifiedName */
+            || kind === 73 /* Identifier */;
     }
     ts.isEntityName = isEntityName;
     function isPropertyName(node) {
         var kind = node.kind;
-        return kind === 72 /* Identifier */
+        return kind === 73 /* Identifier */
             || kind === 10 /* StringLiteral */
             || kind === 8 /* NumericLiteral */
-            || kind === 149 /* ComputedPropertyName */;
+            || kind === 150 /* ComputedPropertyName */;
     }
     ts.isPropertyName = isPropertyName;
     function isBindingName(node) {
         var kind = node.kind;
-        return kind === 72 /* Identifier */
-            || kind === 184 /* ObjectBindingPattern */
-            || kind === 185 /* ArrayBindingPattern */;
+        return kind === 73 /* Identifier */
+            || kind === 185 /* ObjectBindingPattern */
+            || kind === 186 /* ArrayBindingPattern */;
     }
     ts.isBindingName = isBindingName;
     // Functions
@@ -14268,13 +14469,13 @@ var ts;
     ts.isFunctionLikeDeclaration = isFunctionLikeDeclaration;
     function isFunctionLikeDeclarationKind(kind) {
         switch (kind) {
-            case 239 /* FunctionDeclaration */:
-            case 156 /* MethodDeclaration */:
-            case 157 /* Constructor */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
-            case 196 /* FunctionExpression */:
-            case 197 /* ArrowFunction */:
+            case 240 /* FunctionDeclaration */:
+            case 157 /* MethodDeclaration */:
+            case 158 /* Constructor */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
+            case 197 /* FunctionExpression */:
+            case 198 /* ArrowFunction */:
                 return true;
             default:
                 return false;
@@ -14283,14 +14484,14 @@ var ts;
     /* @internal */
     function isFunctionLikeKind(kind) {
         switch (kind) {
-            case 155 /* MethodSignature */:
-            case 160 /* CallSignature */:
-            case 298 /* JSDocSignature */:
-            case 161 /* ConstructSignature */:
-            case 162 /* IndexSignature */:
-            case 165 /* FunctionType */:
-            case 294 /* JSDocFunctionType */:
-            case 166 /* ConstructorType */:
+            case 156 /* MethodSignature */:
+            case 161 /* CallSignature */:
+            case 299 /* JSDocSignature */:
+            case 162 /* ConstructSignature */:
+            case 163 /* IndexSignature */:
+            case 166 /* FunctionType */:
+            case 295 /* JSDocFunctionType */:
+            case 167 /* ConstructorType */:
                 return true;
             default:
                 return isFunctionLikeDeclarationKind(kind);
@@ -14305,29 +14506,29 @@ var ts;
     // Classes
     function isClassElement(node) {
         var kind = node.kind;
-        return kind === 157 /* Constructor */
-            || kind === 154 /* PropertyDeclaration */
-            || kind === 156 /* MethodDeclaration */
-            || kind === 158 /* GetAccessor */
-            || kind === 159 /* SetAccessor */
-            || kind === 162 /* IndexSignature */
-            || kind === 217 /* SemicolonClassElement */;
+        return kind === 158 /* Constructor */
+            || kind === 155 /* PropertyDeclaration */
+            || kind === 157 /* MethodDeclaration */
+            || kind === 159 /* GetAccessor */
+            || kind === 160 /* SetAccessor */
+            || kind === 163 /* IndexSignature */
+            || kind === 218 /* SemicolonClassElement */;
     }
     ts.isClassElement = isClassElement;
     function isClassLike(node) {
-        return node && (node.kind === 240 /* ClassDeclaration */ || node.kind === 209 /* ClassExpression */);
+        return node && (node.kind === 241 /* ClassDeclaration */ || node.kind === 210 /* ClassExpression */);
     }
     ts.isClassLike = isClassLike;
     function isAccessor(node) {
-        return node && (node.kind === 158 /* GetAccessor */ || node.kind === 159 /* SetAccessor */);
+        return node && (node.kind === 159 /* GetAccessor */ || node.kind === 160 /* SetAccessor */);
     }
     ts.isAccessor = isAccessor;
     /* @internal */
     function isMethodOrAccessor(node) {
         switch (node.kind) {
-            case 156 /* MethodDeclaration */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
+            case 157 /* MethodDeclaration */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
                 return true;
             default:
                 return false;
@@ -14337,11 +14538,11 @@ var ts;
     // Type members
     function isTypeElement(node) {
         var kind = node.kind;
-        return kind === 161 /* ConstructSignature */
-            || kind === 160 /* CallSignature */
-            || kind === 153 /* PropertySignature */
-            || kind === 155 /* MethodSignature */
-            || kind === 162 /* IndexSignature */;
+        return kind === 162 /* ConstructSignature */
+            || kind === 161 /* CallSignature */
+            || kind === 154 /* PropertySignature */
+            || kind === 156 /* MethodSignature */
+            || kind === 163 /* IndexSignature */;
     }
     ts.isTypeElement = isTypeElement;
     function isClassOrTypeElement(node) {
@@ -14350,12 +14551,12 @@ var ts;
     ts.isClassOrTypeElement = isClassOrTypeElement;
     function isObjectLiteralElementLike(node) {
         var kind = node.kind;
-        return kind === 275 /* PropertyAssignment */
-            || kind === 276 /* ShorthandPropertyAssignment */
-            || kind === 277 /* SpreadAssignment */
-            || kind === 156 /* MethodDeclaration */
-            || kind === 158 /* GetAccessor */
-            || kind === 159 /* SetAccessor */;
+        return kind === 276 /* PropertyAssignment */
+            || kind === 277 /* ShorthandPropertyAssignment */
+            || kind === 278 /* SpreadAssignment */
+            || kind === 157 /* MethodDeclaration */
+            || kind === 159 /* GetAccessor */
+            || kind === 160 /* SetAccessor */;
     }
     ts.isObjectLiteralElementLike = isObjectLiteralElementLike;
     // Type
@@ -14370,8 +14571,8 @@ var ts;
     ts.isTypeNode = isTypeNode;
     function isFunctionOrConstructorTypeNode(node) {
         switch (node.kind) {
-            case 165 /* FunctionType */:
-            case 166 /* ConstructorType */:
+            case 166 /* FunctionType */:
+            case 167 /* ConstructorType */:
                 return true;
         }
         return false;
@@ -14382,8 +14583,8 @@ var ts;
     function isBindingPattern(node) {
         if (node) {
             var kind = node.kind;
-            return kind === 185 /* ArrayBindingPattern */
-                || kind === 184 /* ObjectBindingPattern */;
+            return kind === 186 /* ArrayBindingPattern */
+                || kind === 185 /* ObjectBindingPattern */;
         }
         return false;
     }
@@ -14391,15 +14592,15 @@ var ts;
     /* @internal */
     function isAssignmentPattern(node) {
         var kind = node.kind;
-        return kind === 187 /* ArrayLiteralExpression */
-            || kind === 188 /* ObjectLiteralExpression */;
+        return kind === 188 /* ArrayLiteralExpression */
+            || kind === 189 /* ObjectLiteralExpression */;
     }
     ts.isAssignmentPattern = isAssignmentPattern;
     /* @internal */
     function isArrayBindingElement(node) {
         var kind = node.kind;
-        return kind === 186 /* BindingElement */
-            || kind === 210 /* OmittedExpression */;
+        return kind === 187 /* BindingElement */
+            || kind === 211 /* OmittedExpression */;
     }
     ts.isArrayBindingElement = isArrayBindingElement;
     /**
@@ -14408,9 +14609,9 @@ var ts;
     /* @internal */
     function isDeclarationBindingElement(bindingElement) {
         switch (bindingElement.kind) {
-            case 237 /* VariableDeclaration */:
-            case 151 /* Parameter */:
-            case 186 /* BindingElement */:
+            case 238 /* VariableDeclaration */:
+            case 152 /* Parameter */:
+            case 187 /* BindingElement */:
                 return true;
         }
         return false;
@@ -14431,8 +14632,8 @@ var ts;
     /* @internal */
     function isObjectBindingOrAssignmentPattern(node) {
         switch (node.kind) {
-            case 184 /* ObjectBindingPattern */:
-            case 188 /* ObjectLiteralExpression */:
+            case 185 /* ObjectBindingPattern */:
+            case 189 /* ObjectLiteralExpression */:
                 return true;
         }
         return false;
@@ -14444,8 +14645,8 @@ var ts;
     /* @internal */
     function isArrayBindingOrAssignmentPattern(node) {
         switch (node.kind) {
-            case 185 /* ArrayBindingPattern */:
-            case 187 /* ArrayLiteralExpression */:
+            case 186 /* ArrayBindingPattern */:
+            case 188 /* ArrayLiteralExpression */:
                 return true;
         }
         return false;
@@ -14454,26 +14655,26 @@ var ts;
     /* @internal */
     function isPropertyAccessOrQualifiedNameOrImportTypeNode(node) {
         var kind = node.kind;
-        return kind === 189 /* PropertyAccessExpression */
-            || kind === 148 /* QualifiedName */
-            || kind === 183 /* ImportType */;
+        return kind === 190 /* PropertyAccessExpression */
+            || kind === 149 /* QualifiedName */
+            || kind === 184 /* ImportType */;
     }
     ts.isPropertyAccessOrQualifiedNameOrImportTypeNode = isPropertyAccessOrQualifiedNameOrImportTypeNode;
     // Expression
     function isPropertyAccessOrQualifiedName(node) {
         var kind = node.kind;
-        return kind === 189 /* PropertyAccessExpression */
-            || kind === 148 /* QualifiedName */;
+        return kind === 190 /* PropertyAccessExpression */
+            || kind === 149 /* QualifiedName */;
     }
     ts.isPropertyAccessOrQualifiedName = isPropertyAccessOrQualifiedName;
     function isCallLikeExpression(node) {
         switch (node.kind) {
-            case 262 /* JsxOpeningElement */:
-            case 261 /* JsxSelfClosingElement */:
-            case 191 /* CallExpression */:
-            case 192 /* NewExpression */:
-            case 193 /* TaggedTemplateExpression */:
-            case 152 /* Decorator */:
+            case 263 /* JsxOpeningElement */:
+            case 262 /* JsxSelfClosingElement */:
+            case 192 /* CallExpression */:
+            case 193 /* NewExpression */:
+            case 194 /* TaggedTemplateExpression */:
+            case 153 /* Decorator */:
                 return true;
             default:
                 return false;
@@ -14481,12 +14682,12 @@ var ts;
     }
     ts.isCallLikeExpression = isCallLikeExpression;
     function isCallOrNewExpression(node) {
-        return node.kind === 191 /* CallExpression */ || node.kind === 192 /* NewExpression */;
+        return node.kind === 192 /* CallExpression */ || node.kind === 193 /* NewExpression */;
     }
     ts.isCallOrNewExpression = isCallOrNewExpression;
     function isTemplateLiteral(node) {
         var kind = node.kind;
-        return kind === 206 /* TemplateExpression */
+        return kind === 207 /* TemplateExpression */
             || kind === 14 /* NoSubstitutionTemplateLiteral */;
     }
     ts.isTemplateLiteral = isTemplateLiteral;
@@ -14497,34 +14698,34 @@ var ts;
     ts.isLeftHandSideExpression = isLeftHandSideExpression;
     function isLeftHandSideExpressionKind(kind) {
         switch (kind) {
-            case 189 /* PropertyAccessExpression */:
-            case 190 /* ElementAccessExpression */:
-            case 192 /* NewExpression */:
-            case 191 /* CallExpression */:
-            case 260 /* JsxElement */:
-            case 261 /* JsxSelfClosingElement */:
-            case 264 /* JsxFragment */:
-            case 193 /* TaggedTemplateExpression */:
-            case 187 /* ArrayLiteralExpression */:
-            case 195 /* ParenthesizedExpression */:
-            case 188 /* ObjectLiteralExpression */:
-            case 209 /* ClassExpression */:
-            case 196 /* FunctionExpression */:
-            case 72 /* Identifier */:
+            case 190 /* PropertyAccessExpression */:
+            case 191 /* ElementAccessExpression */:
+            case 193 /* NewExpression */:
+            case 192 /* CallExpression */:
+            case 261 /* JsxElement */:
+            case 262 /* JsxSelfClosingElement */:
+            case 265 /* JsxFragment */:
+            case 194 /* TaggedTemplateExpression */:
+            case 188 /* ArrayLiteralExpression */:
+            case 196 /* ParenthesizedExpression */:
+            case 189 /* ObjectLiteralExpression */:
+            case 210 /* ClassExpression */:
+            case 197 /* FunctionExpression */:
+            case 73 /* Identifier */:
             case 13 /* RegularExpressionLiteral */:
             case 8 /* NumericLiteral */:
             case 9 /* BigIntLiteral */:
             case 10 /* StringLiteral */:
             case 14 /* NoSubstitutionTemplateLiteral */:
-            case 206 /* TemplateExpression */:
-            case 87 /* FalseKeyword */:
-            case 96 /* NullKeyword */:
-            case 100 /* ThisKeyword */:
-            case 102 /* TrueKeyword */:
-            case 98 /* SuperKeyword */:
-            case 213 /* NonNullExpression */:
-            case 214 /* MetaProperty */:
-            case 92 /* ImportKeyword */: // technically this is only an Expression if it's in a CallExpression
+            case 207 /* TemplateExpression */:
+            case 88 /* FalseKeyword */:
+            case 97 /* NullKeyword */:
+            case 101 /* ThisKeyword */:
+            case 103 /* TrueKeyword */:
+            case 99 /* SuperKeyword */:
+            case 214 /* NonNullExpression */:
+            case 215 /* MetaProperty */:
+            case 93 /* ImportKeyword */: // technically this is only an Expression if it's in a CallExpression
                 return true;
             default:
                 return false;
@@ -14537,13 +14738,13 @@ var ts;
     ts.isUnaryExpression = isUnaryExpression;
     function isUnaryExpressionKind(kind) {
         switch (kind) {
-            case 202 /* PrefixUnaryExpression */:
-            case 203 /* PostfixUnaryExpression */:
-            case 198 /* DeleteExpression */:
-            case 199 /* TypeOfExpression */:
-            case 200 /* VoidExpression */:
-            case 201 /* AwaitExpression */:
-            case 194 /* TypeAssertionExpression */:
+            case 203 /* PrefixUnaryExpression */:
+            case 204 /* PostfixUnaryExpression */:
+            case 199 /* DeleteExpression */:
+            case 200 /* TypeOfExpression */:
+            case 201 /* VoidExpression */:
+            case 202 /* AwaitExpression */:
+            case 195 /* TypeAssertionExpression */:
                 return true;
             default:
                 return isLeftHandSideExpressionKind(kind);
@@ -14552,9 +14753,9 @@ var ts;
     /* @internal */
     function isUnaryExpressionWithWrite(expr) {
         switch (expr.kind) {
-            case 203 /* PostfixUnaryExpression */:
+            case 204 /* PostfixUnaryExpression */:
                 return true;
-            case 202 /* PrefixUnaryExpression */:
+            case 203 /* PrefixUnaryExpression */:
                 return expr.operator === 44 /* PlusPlusToken */ ||
                     expr.operator === 45 /* MinusMinusToken */;
             default:
@@ -14573,15 +14774,15 @@ var ts;
     ts.isExpression = isExpression;
     function isExpressionKind(kind) {
         switch (kind) {
-            case 205 /* ConditionalExpression */:
-            case 207 /* YieldExpression */:
-            case 197 /* ArrowFunction */:
-            case 204 /* BinaryExpression */:
-            case 208 /* SpreadElement */:
-            case 212 /* AsExpression */:
-            case 210 /* OmittedExpression */:
-            case 314 /* CommaListExpression */:
-            case 313 /* PartiallyEmittedExpression */:
+            case 206 /* ConditionalExpression */:
+            case 208 /* YieldExpression */:
+            case 198 /* ArrowFunction */:
+            case 205 /* BinaryExpression */:
+            case 209 /* SpreadElement */:
+            case 213 /* AsExpression */:
+            case 211 /* OmittedExpression */:
+            case 316 /* CommaListExpression */:
+            case 315 /* PartiallyEmittedExpression */:
                 return true;
             default:
                 return isUnaryExpressionKind(kind);
@@ -14589,18 +14790,18 @@ var ts;
     }
     function isAssertionExpression(node) {
         var kind = node.kind;
-        return kind === 194 /* TypeAssertionExpression */
-            || kind === 212 /* AsExpression */;
+        return kind === 195 /* TypeAssertionExpression */
+            || kind === 213 /* AsExpression */;
     }
     ts.isAssertionExpression = isAssertionExpression;
     /* @internal */
     function isPartiallyEmittedExpression(node) {
-        return node.kind === 313 /* PartiallyEmittedExpression */;
+        return node.kind === 315 /* PartiallyEmittedExpression */;
     }
     ts.isPartiallyEmittedExpression = isPartiallyEmittedExpression;
     /* @internal */
     function isNotEmittedStatement(node) {
-        return node.kind === 312 /* NotEmittedStatement */;
+        return node.kind === 314 /* NotEmittedStatement */;
     }
     ts.isNotEmittedStatement = isNotEmittedStatement;
     /* @internal */
@@ -14611,13 +14812,13 @@ var ts;
     ts.isNotEmittedOrPartiallyEmittedNode = isNotEmittedOrPartiallyEmittedNode;
     function isIterationStatement(node, lookInLabeledStatements) {
         switch (node.kind) {
-            case 225 /* ForStatement */:
-            case 226 /* ForInStatement */:
-            case 227 /* ForOfStatement */:
-            case 223 /* DoStatement */:
-            case 224 /* WhileStatement */:
+            case 226 /* ForStatement */:
+            case 227 /* ForInStatement */:
+            case 228 /* ForOfStatement */:
+            case 224 /* DoStatement */:
+            case 225 /* WhileStatement */:
                 return true;
-            case 233 /* LabeledStatement */:
+            case 234 /* LabeledStatement */:
                 return lookInLabeledStatements && isIterationStatement(node.statement, lookInLabeledStatements);
         }
         return false;
@@ -14625,7 +14826,7 @@ var ts;
     ts.isIterationStatement = isIterationStatement;
     /* @internal */
     function isForInOrOfStatement(node) {
-        return node.kind === 226 /* ForInStatement */ || node.kind === 227 /* ForOfStatement */;
+        return node.kind === 227 /* ForInStatement */ || node.kind === 228 /* ForOfStatement */;
     }
     ts.isForInOrOfStatement = isForInOrOfStatement;
     // Element
@@ -14649,113 +14850,113 @@ var ts;
     /* @internal */
     function isModuleBody(node) {
         var kind = node.kind;
-        return kind === 245 /* ModuleBlock */
-            || kind === 244 /* ModuleDeclaration */
-            || kind === 72 /* Identifier */;
+        return kind === 246 /* ModuleBlock */
+            || kind === 245 /* ModuleDeclaration */
+            || kind === 73 /* Identifier */;
     }
     ts.isModuleBody = isModuleBody;
     /* @internal */
     function isNamespaceBody(node) {
         var kind = node.kind;
-        return kind === 245 /* ModuleBlock */
-            || kind === 244 /* ModuleDeclaration */;
+        return kind === 246 /* ModuleBlock */
+            || kind === 245 /* ModuleDeclaration */;
     }
     ts.isNamespaceBody = isNamespaceBody;
     /* @internal */
     function isJSDocNamespaceBody(node) {
         var kind = node.kind;
-        return kind === 72 /* Identifier */
-            || kind === 244 /* ModuleDeclaration */;
+        return kind === 73 /* Identifier */
+            || kind === 245 /* ModuleDeclaration */;
     }
     ts.isJSDocNamespaceBody = isJSDocNamespaceBody;
     /* @internal */
     function isNamedImportBindings(node) {
         var kind = node.kind;
-        return kind === 252 /* NamedImports */
-            || kind === 251 /* NamespaceImport */;
+        return kind === 253 /* NamedImports */
+            || kind === 252 /* NamespaceImport */;
     }
     ts.isNamedImportBindings = isNamedImportBindings;
     /* @internal */
     function isModuleOrEnumDeclaration(node) {
-        return node.kind === 244 /* ModuleDeclaration */ || node.kind === 243 /* EnumDeclaration */;
+        return node.kind === 245 /* ModuleDeclaration */ || node.kind === 244 /* EnumDeclaration */;
     }
     ts.isModuleOrEnumDeclaration = isModuleOrEnumDeclaration;
     function isDeclarationKind(kind) {
-        return kind === 197 /* ArrowFunction */
-            || kind === 186 /* BindingElement */
-            || kind === 240 /* ClassDeclaration */
-            || kind === 209 /* ClassExpression */
-            || kind === 157 /* Constructor */
-            || kind === 243 /* EnumDeclaration */
-            || kind === 278 /* EnumMember */
-            || kind === 257 /* ExportSpecifier */
-            || kind === 239 /* FunctionDeclaration */
-            || kind === 196 /* FunctionExpression */
-            || kind === 158 /* GetAccessor */
-            || kind === 250 /* ImportClause */
-            || kind === 248 /* ImportEqualsDeclaration */
-            || kind === 253 /* ImportSpecifier */
-            || kind === 241 /* InterfaceDeclaration */
-            || kind === 267 /* JsxAttribute */
-            || kind === 156 /* MethodDeclaration */
-            || kind === 155 /* MethodSignature */
-            || kind === 244 /* ModuleDeclaration */
-            || kind === 247 /* NamespaceExportDeclaration */
-            || kind === 251 /* NamespaceImport */
-            || kind === 151 /* Parameter */
-            || kind === 275 /* PropertyAssignment */
-            || kind === 154 /* PropertyDeclaration */
-            || kind === 153 /* PropertySignature */
-            || kind === 159 /* SetAccessor */
-            || kind === 276 /* ShorthandPropertyAssignment */
-            || kind === 242 /* TypeAliasDeclaration */
-            || kind === 150 /* TypeParameter */
-            || kind === 237 /* VariableDeclaration */
-            || kind === 309 /* JSDocTypedefTag */
-            || kind === 302 /* JSDocCallbackTag */
-            || kind === 310 /* JSDocPropertyTag */;
+        return kind === 198 /* ArrowFunction */
+            || kind === 187 /* BindingElement */
+            || kind === 241 /* ClassDeclaration */
+            || kind === 210 /* ClassExpression */
+            || kind === 158 /* Constructor */
+            || kind === 244 /* EnumDeclaration */
+            || kind === 279 /* EnumMember */
+            || kind === 258 /* ExportSpecifier */
+            || kind === 240 /* FunctionDeclaration */
+            || kind === 197 /* FunctionExpression */
+            || kind === 159 /* GetAccessor */
+            || kind === 251 /* ImportClause */
+            || kind === 249 /* ImportEqualsDeclaration */
+            || kind === 254 /* ImportSpecifier */
+            || kind === 242 /* InterfaceDeclaration */
+            || kind === 268 /* JsxAttribute */
+            || kind === 157 /* MethodDeclaration */
+            || kind === 156 /* MethodSignature */
+            || kind === 245 /* ModuleDeclaration */
+            || kind === 248 /* NamespaceExportDeclaration */
+            || kind === 252 /* NamespaceImport */
+            || kind === 152 /* Parameter */
+            || kind === 276 /* PropertyAssignment */
+            || kind === 155 /* PropertyDeclaration */
+            || kind === 154 /* PropertySignature */
+            || kind === 160 /* SetAccessor */
+            || kind === 277 /* ShorthandPropertyAssignment */
+            || kind === 243 /* TypeAliasDeclaration */
+            || kind === 151 /* TypeParameter */
+            || kind === 238 /* VariableDeclaration */
+            || kind === 311 /* JSDocTypedefTag */
+            || kind === 304 /* JSDocCallbackTag */
+            || kind === 312 /* JSDocPropertyTag */;
     }
     function isDeclarationStatementKind(kind) {
-        return kind === 239 /* FunctionDeclaration */
-            || kind === 258 /* MissingDeclaration */
-            || kind === 240 /* ClassDeclaration */
-            || kind === 241 /* InterfaceDeclaration */
-            || kind === 242 /* TypeAliasDeclaration */
-            || kind === 243 /* EnumDeclaration */
-            || kind === 244 /* ModuleDeclaration */
-            || kind === 249 /* ImportDeclaration */
-            || kind === 248 /* ImportEqualsDeclaration */
-            || kind === 255 /* ExportDeclaration */
-            || kind === 254 /* ExportAssignment */
-            || kind === 247 /* NamespaceExportDeclaration */;
+        return kind === 240 /* FunctionDeclaration */
+            || kind === 259 /* MissingDeclaration */
+            || kind === 241 /* ClassDeclaration */
+            || kind === 242 /* InterfaceDeclaration */
+            || kind === 243 /* TypeAliasDeclaration */
+            || kind === 244 /* EnumDeclaration */
+            || kind === 245 /* ModuleDeclaration */
+            || kind === 250 /* ImportDeclaration */
+            || kind === 249 /* ImportEqualsDeclaration */
+            || kind === 256 /* ExportDeclaration */
+            || kind === 255 /* ExportAssignment */
+            || kind === 248 /* NamespaceExportDeclaration */;
     }
     function isStatementKindButNotDeclarationKind(kind) {
-        return kind === 229 /* BreakStatement */
-            || kind === 228 /* ContinueStatement */
-            || kind === 236 /* DebuggerStatement */
-            || kind === 223 /* DoStatement */
-            || kind === 221 /* ExpressionStatement */
-            || kind === 220 /* EmptyStatement */
-            || kind === 226 /* ForInStatement */
-            || kind === 227 /* ForOfStatement */
-            || kind === 225 /* ForStatement */
-            || kind === 222 /* IfStatement */
-            || kind === 233 /* LabeledStatement */
-            || kind === 230 /* ReturnStatement */
-            || kind === 232 /* SwitchStatement */
-            || kind === 234 /* ThrowStatement */
-            || kind === 235 /* TryStatement */
-            || kind === 219 /* VariableStatement */
-            || kind === 224 /* WhileStatement */
-            || kind === 231 /* WithStatement */
-            || kind === 312 /* NotEmittedStatement */
-            || kind === 316 /* EndOfDeclarationMarker */
-            || kind === 315 /* MergeDeclarationMarker */;
+        return kind === 230 /* BreakStatement */
+            || kind === 229 /* ContinueStatement */
+            || kind === 237 /* DebuggerStatement */
+            || kind === 224 /* DoStatement */
+            || kind === 222 /* ExpressionStatement */
+            || kind === 221 /* EmptyStatement */
+            || kind === 227 /* ForInStatement */
+            || kind === 228 /* ForOfStatement */
+            || kind === 226 /* ForStatement */
+            || kind === 223 /* IfStatement */
+            || kind === 234 /* LabeledStatement */
+            || kind === 231 /* ReturnStatement */
+            || kind === 233 /* SwitchStatement */
+            || kind === 235 /* ThrowStatement */
+            || kind === 236 /* TryStatement */
+            || kind === 220 /* VariableStatement */
+            || kind === 225 /* WhileStatement */
+            || kind === 232 /* WithStatement */
+            || kind === 314 /* NotEmittedStatement */
+            || kind === 318 /* EndOfDeclarationMarker */
+            || kind === 317 /* MergeDeclarationMarker */;
     }
     /* @internal */
     function isDeclaration(node) {
-        if (node.kind === 150 /* TypeParameter */) {
-            return (node.parent && node.parent.kind !== 308 /* JSDocTemplateTag */) || ts.isInJSFile(node);
+        if (node.kind === 151 /* TypeParameter */) {
+            return (node.parent && node.parent.kind !== 310 /* JSDocTemplateTag */) || ts.isInJSFile(node);
         }
         return isDeclarationKind(node.kind);
     }
@@ -14782,10 +14983,10 @@ var ts;
     }
     ts.isStatement = isStatement;
     function isBlockStatement(node) {
-        if (node.kind !== 218 /* Block */)
+        if (node.kind !== 219 /* Block */)
             return false;
         if (node.parent !== undefined) {
-            if (node.parent.kind === 235 /* TryStatement */ || node.parent.kind === 274 /* CatchClause */) {
+            if (node.parent.kind === 236 /* TryStatement */ || node.parent.kind === 275 /* CatchClause */) {
                 return false;
             }
         }
@@ -14795,81 +14996,81 @@ var ts;
     /* @internal */
     function isModuleReference(node) {
         var kind = node.kind;
-        return kind === 259 /* ExternalModuleReference */
-            || kind === 148 /* QualifiedName */
-            || kind === 72 /* Identifier */;
+        return kind === 260 /* ExternalModuleReference */
+            || kind === 149 /* QualifiedName */
+            || kind === 73 /* Identifier */;
     }
     ts.isModuleReference = isModuleReference;
     // JSX
     /* @internal */
     function isJsxTagNameExpression(node) {
         var kind = node.kind;
-        return kind === 100 /* ThisKeyword */
-            || kind === 72 /* Identifier */
-            || kind === 189 /* PropertyAccessExpression */;
+        return kind === 101 /* ThisKeyword */
+            || kind === 73 /* Identifier */
+            || kind === 190 /* PropertyAccessExpression */;
     }
     ts.isJsxTagNameExpression = isJsxTagNameExpression;
     /* @internal */
     function isJsxChild(node) {
         var kind = node.kind;
-        return kind === 260 /* JsxElement */
-            || kind === 270 /* JsxExpression */
-            || kind === 261 /* JsxSelfClosingElement */
+        return kind === 261 /* JsxElement */
+            || kind === 271 /* JsxExpression */
+            || kind === 262 /* JsxSelfClosingElement */
             || kind === 11 /* JsxText */
-            || kind === 264 /* JsxFragment */;
+            || kind === 265 /* JsxFragment */;
     }
     ts.isJsxChild = isJsxChild;
     /* @internal */
     function isJsxAttributeLike(node) {
         var kind = node.kind;
-        return kind === 267 /* JsxAttribute */
-            || kind === 269 /* JsxSpreadAttribute */;
+        return kind === 268 /* JsxAttribute */
+            || kind === 270 /* JsxSpreadAttribute */;
     }
     ts.isJsxAttributeLike = isJsxAttributeLike;
     /* @internal */
     function isStringLiteralOrJsxExpression(node) {
         var kind = node.kind;
         return kind === 10 /* StringLiteral */
-            || kind === 270 /* JsxExpression */;
+            || kind === 271 /* JsxExpression */;
     }
     ts.isStringLiteralOrJsxExpression = isStringLiteralOrJsxExpression;
     function isJsxOpeningLikeElement(node) {
         var kind = node.kind;
-        return kind === 262 /* JsxOpeningElement */
-            || kind === 261 /* JsxSelfClosingElement */;
+        return kind === 263 /* JsxOpeningElement */
+            || kind === 262 /* JsxSelfClosingElement */;
     }
     ts.isJsxOpeningLikeElement = isJsxOpeningLikeElement;
     // Clauses
     function isCaseOrDefaultClause(node) {
         var kind = node.kind;
-        return kind === 271 /* CaseClause */
-            || kind === 272 /* DefaultClause */;
+        return kind === 272 /* CaseClause */
+            || kind === 273 /* DefaultClause */;
     }
     ts.isCaseOrDefaultClause = isCaseOrDefaultClause;
     // JSDoc
     /** True if node is of some JSDoc syntax kind. */
     /* @internal */
     function isJSDocNode(node) {
-        return node.kind >= 288 /* FirstJSDocNode */ && node.kind <= 310 /* LastJSDocNode */;
+        return node.kind >= 289 /* FirstJSDocNode */ && node.kind <= 312 /* LastJSDocNode */;
     }
     ts.isJSDocNode = isJSDocNode;
     /** True if node is of a kind that may contain comment text. */
     function isJSDocCommentContainingNode(node) {
-        return node.kind === 296 /* JSDocComment */ || isJSDocTag(node) || ts.isJSDocTypeLiteral(node) || ts.isJSDocSignature(node);
+        return node.kind === 297 /* JSDocComment */ || isJSDocTag(node) || ts.isJSDocTypeLiteral(node) || ts.isJSDocSignature(node);
     }
     ts.isJSDocCommentContainingNode = isJSDocCommentContainingNode;
     // TODO: determine what this does before making it public.
     /* @internal */
     function isJSDocTag(node) {
-        return node.kind >= 299 /* FirstJSDocTagNode */ && node.kind <= 310 /* LastJSDocTagNode */;
+        return node.kind >= 300 /* FirstJSDocTagNode */ && node.kind <= 312 /* LastJSDocTagNode */;
     }
     ts.isJSDocTag = isJSDocTag;
     function isSetAccessor(node) {
-        return node.kind === 159 /* SetAccessor */;
+        return node.kind === 160 /* SetAccessor */;
     }
     ts.isSetAccessor = isSetAccessor;
     function isGetAccessor(node) {
-        return node.kind === 158 /* GetAccessor */;
+        return node.kind === 159 /* GetAccessor */;
     }
     ts.isGetAccessor = isGetAccessor;
     /** True if has jsdoc nodes attached to it. */
@@ -14899,12 +15100,12 @@ var ts;
     }
     ts.hasOnlyExpressionInitializer = hasOnlyExpressionInitializer;
     function isObjectLiteralElement(node) {
-        return node.kind === 267 /* JsxAttribute */ || node.kind === 269 /* JsxSpreadAttribute */ || isObjectLiteralElementLike(node);
+        return node.kind === 268 /* JsxAttribute */ || node.kind === 270 /* JsxSpreadAttribute */ || isObjectLiteralElementLike(node);
     }
     ts.isObjectLiteralElement = isObjectLiteralElement;
     /* @internal */
     function isTypeReferenceType(node) {
-        return node.kind === 164 /* TypeReference */ || node.kind === 211 /* ExpressionWithTypeArguments */;
+        return node.kind === 165 /* TypeReference */ || node.kind === 212 /* ExpressionWithTypeArguments */;
     }
     ts.isTypeReferenceType = isTypeReferenceType;
     var MAX_SMI_X86 = 1073741823;
@@ -14940,7 +15141,7 @@ var ts;
 /* @internal */
 (function (ts) {
     function isNamedImportsOrExports(node) {
-        return node.kind === 252 /* NamedImports */ || node.kind === 256 /* NamedExports */;
+        return node.kind === 253 /* NamedImports */ || node.kind === 257 /* NamedExports */;
     }
     ts.isNamedImportsOrExports = isNamedImportsOrExports;
     function Symbol(flags, name) {
@@ -15060,17 +15261,16 @@ var ts;
             messageText: text,
             category: message.category,
             code: message.code,
-            next: details
+            next: details === undefined || Array.isArray(details) ? details : [details]
         };
     }
     ts.chainDiagnosticMessages = chainDiagnosticMessages;
     function concatenateDiagnosticMessageChains(headChain, tailChain) {
         var lastChain = headChain;
         while (lastChain.next) {
-            lastChain = lastChain.next;
+            lastChain = lastChain.next[0];
         }
-        lastChain.next = tailChain;
-        return headChain;
+        lastChain.next = [tailChain];
     }
     ts.concatenateDiagnosticMessageChains = concatenateDiagnosticMessageChains;
     function getDiagnosticFilePath(diagnostic) {
@@ -15104,25 +15304,42 @@ var ts;
         return d1.relatedInformation ? -1 /* LessThan */ : 1 /* GreaterThan */;
     }
     function compareMessageText(t1, t2) {
-        var text1 = t1;
-        var text2 = t2;
-        while (text1 && text2) {
-            // We still have both chains.
-            var string1 = ts.isString(text1) ? text1 : text1.messageText;
-            var string2 = ts.isString(text2) ? text2 : text2.messageText;
-            var res = ts.compareStringsCaseSensitive(string1, string2);
+        if (typeof t1 === "string" && typeof t2 === "string") {
+            return ts.compareStringsCaseSensitive(t1, t2);
+        }
+        else if (typeof t1 === "string") {
+            return -1 /* LessThan */;
+        }
+        else if (typeof t2 === "string") {
+            return 1 /* GreaterThan */;
+        }
+        var res = ts.compareStringsCaseSensitive(t1.messageText, t2.messageText);
+        if (res) {
+            return res;
+        }
+        if (!t1.next && !t2.next) {
+            return 0 /* EqualTo */;
+        }
+        if (!t1.next) {
+            return -1 /* LessThan */;
+        }
+        if (!t2.next) {
+            return 1 /* GreaterThan */;
+        }
+        var len = Math.min(t1.next.length, t2.next.length);
+        for (var i = 0; i < len; i++) {
+            res = compareMessageText(t1.next[i], t2.next[i]);
             if (res) {
                 return res;
             }
-            text1 = ts.isString(text1) ? undefined : text1.next;
-            text2 = ts.isString(text2) ? undefined : text2.next;
         }
-        if (!text1 && !text2) {
-            // if the chains are done, then these messages are the same.
-            return 0 /* EqualTo */;
+        if (t1.next.length < t2.next.length) {
+            return -1 /* LessThan */;
         }
-        // We still have one chain remaining.  The shorter chain should come first.
-        return text1 ? 1 /* GreaterThan */ : -1 /* LessThan */;
+        else if (t1.next.length > t2.next.length) {
+            return 1 /* GreaterThan */;
+        }
+        return 0 /* EqualTo */;
     }
     function getEmitScriptTarget(compilerOptions) {
         return compilerOptions.target || 0 /* ES3 */;
@@ -15191,6 +15408,11 @@ var ts;
             ts.semanticDiagnosticsOptionDeclarations.some(function (option) { return !ts.isJsonEqual(getCompilerOptionValue(oldOptions, option), getCompilerOptionValue(newOptions, option)); });
     }
     ts.compilerOptionsAffectSemanticDiagnostics = compilerOptionsAffectSemanticDiagnostics;
+    function compilerOptionsAffectEmit(newOptions, oldOptions) {
+        return oldOptions !== newOptions &&
+            ts.affectsEmitOptionDeclarations.some(function (option) { return !ts.isJsonEqual(getCompilerOptionValue(oldOptions, option), getCompilerOptionValue(newOptions, option)); });
+    }
+    ts.compilerOptionsAffectEmit = compilerOptionsAffectEmit;
     function getCompilerOptionValue(options, option) {
         return option.strictFlag ? getStrictOptionValue(options, option.name) : options[option.name];
     }
@@ -15469,6 +15691,15 @@ var ts;
         return root + pathComponents.slice(1).join(ts.directorySeparator);
     }
     ts.getPathFromPathComponents = getPathFromPathComponents;
+    function getNormalizedAbsolutePathWithoutRoot(fileName, currentDirectory) {
+        return getPathWithoutRoot(getNormalizedPathComponents(fileName, currentDirectory));
+    }
+    ts.getNormalizedAbsolutePathWithoutRoot = getNormalizedAbsolutePathWithoutRoot;
+    function getPathWithoutRoot(pathComponents) {
+        if (pathComponents.length === 0)
+            return "";
+        return pathComponents.slice(1).join(ts.directorySeparator);
+    }
 })(ts || (ts = {}));
 /* @internal */
 (function (ts) {
@@ -15499,7 +15730,7 @@ var ts;
     }
     ts.getRelativePathFromFile = getRelativePathFromFile;
     function getRelativePathFromDirectory(fromDirectory, to, getCanonicalFileNameOrIgnoreCase) {
-        Debug.assert((ts.getRootLength(fromDirectory) > 0) === (ts.getRootLength(to) > 0), "Paths must either both be absolute or both be relative");
+        ts.Debug.assert((ts.getRootLength(fromDirectory) > 0) === (ts.getRootLength(to) > 0), "Paths must either both be absolute or both be relative");
         var getCanonicalFileName = typeof getCanonicalFileNameOrIgnoreCase === "function" ? getCanonicalFileNameOrIgnoreCase : ts.identity;
         var ignoreCase = typeof getCanonicalFileNameOrIgnoreCase === "boolean" ? getCanonicalFileNameOrIgnoreCase : false;
         var pathComponents = getPathComponentsRelativeTo(fromDirectory, to, ignoreCase ? ts.equateStringsCaseInsensitive : ts.equateStringsCaseSensitive, getCanonicalFileName);
@@ -15869,7 +16100,7 @@ var ts;
     }
     ts.getRegexFromPattern = getRegexFromPattern;
     /** @param path directory of the tsconfig.json */
-    function matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory, depth, getFileSystemEntries) {
+    function matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory, depth, getFileSystemEntries, realpath) {
         path = ts.normalizePath(path);
         currentDirectory = ts.normalizePath(currentDirectory);
         var patterns = getFileMatcherPatterns(path, excludes, includes, useCaseSensitiveFileNames, currentDirectory);
@@ -15879,12 +16110,18 @@ var ts;
         // Associate an array of results with each include regex. This keeps results in order of the "include" order.
         // If there are no "includes", then just put everything in results[0].
         var results = includeFileRegexes ? includeFileRegexes.map(function () { return []; }) : [[]];
+        var visited = ts.createMap();
+        var toCanonical = ts.createGetCanonicalFileName(useCaseSensitiveFileNames);
         for (var _i = 0, _a = patterns.basePaths; _i < _a.length; _i++) {
             var basePath = _a[_i];
             visitDirectory(basePath, combinePaths(currentDirectory, basePath), depth);
         }
         return ts.flatten(results);
         function visitDirectory(path, absolutePath, depth) {
+            var canonicalPath = toCanonical(realpath(absolutePath));
+            if (visited.has(canonicalPath))
+                return;
+            visited.set(canonicalPath, true);
             var _a = getFileSystemEntries(path), files = _a.files, directories = _a.directories;
             var _loop_1 = function (current) {
                 var name = combinePaths(path, current);
@@ -16137,32 +16374,9 @@ var ts;
         return pathext ? path.slice(0, path.length - pathext.length) + (ts.startsWith(ext, ".") ? ext : "." + ext) : path;
     }
     ts.changeAnyExtension = changeAnyExtension;
-    var Debug;
-    (function (Debug) {
-        function showSymbol(symbol) {
-            var symbolFlags = ts.SymbolFlags;
-            return "{ flags: " + (symbolFlags ? showFlags(symbol.flags, symbolFlags) : symbol.flags) + "; declarations: " + ts.map(symbol.declarations, showSyntaxKind) + " }";
-        }
-        Debug.showSymbol = showSymbol;
-        function showFlags(flags, flagsEnum) {
-            var out = [];
-            for (var pow = 0; pow <= 30; pow++) {
-                var n = 1 << pow;
-                if (flags & n) {
-                    out.push(flagsEnum[n]);
-                }
-            }
-            return out.join("|");
-        }
-        function showSyntaxKind(node) {
-            var syntaxKind = ts.SyntaxKind;
-            return syntaxKind ? syntaxKind[node.kind] : node.kind.toString();
-        }
-        Debug.showSyntaxKind = showSyntaxKind;
-    })(Debug = ts.Debug || (ts.Debug = {}));
     function tryParsePattern(pattern) {
         // This should be verified outside of here and a proper error thrown.
-        Debug.assert(ts.hasZeroOrOneAsteriskCharacter(pattern));
+        ts.Debug.assert(ts.hasZeroOrOneAsteriskCharacter(pattern));
         var indexOfStar = pattern.indexOf("*");
         return indexOfStar === -1 ? undefined : {
             prefix: pattern.substr(0, indexOfStar),
@@ -16191,7 +16405,7 @@ var ts;
      */
     function extensionFromPath(path) {
         var ext = tryGetExtensionFromPath(path);
-        return ext !== undefined ? ext : Debug.fail("File " + path + " has unknown extension.");
+        return ext !== undefined ? ext : ts.Debug.fail("File " + path + " has unknown extension.");
     }
     ts.extensionFromPath = extensionFromPath;
     function isAnySupportedFileExtension(path) {
@@ -16263,12 +16477,25 @@ var ts;
     ts.matchPatternOrExact = matchPatternOrExact;
     function sliceAfter(arr, value) {
         var index = arr.indexOf(value);
-        Debug.assert(index !== -1);
+        ts.Debug.assert(index !== -1);
         return arr.slice(index);
     }
     ts.sliceAfter = sliceAfter;
+    function addRelatedInfo(diagnostic) {
+        var _a;
+        var relatedInformation = [];
+        for (var _i = 1; _i < arguments.length; _i++) {
+            relatedInformation[_i - 1] = arguments[_i];
+        }
+        if (!diagnostic.relatedInformation) {
+            diagnostic.relatedInformation = [];
+        }
+        (_a = diagnostic.relatedInformation).push.apply(_a, relatedInformation);
+        return diagnostic;
+    }
+    ts.addRelatedInfo = addRelatedInfo;
     function minAndMax(arr, getValue) {
-        Debug.assert(arr.length !== 0);
+        ts.Debug.assert(arr.length !== 0);
         var min = getValue(arr[0]);
         var max = min;
         for (var i = 1; i < arr.length; i++) {
@@ -16466,10 +16693,10 @@ var ts;
     var SourceFileConstructor;
     // tslint:enable variable-name
     function createNode(kind, pos, end) {
-        if (kind === 284 /* SourceFile */) {
+        if (kind === 285 /* SourceFile */) {
             return new (SourceFileConstructor || (SourceFileConstructor = ts.objectAllocator.getSourceFileConstructor()))(kind, pos, end);
         }
-        else if (kind === 72 /* Identifier */) {
+        else if (kind === 73 /* Identifier */) {
             return new (IdentifierConstructor || (IdentifierConstructor = ts.objectAllocator.getIdentifierConstructor()))(kind, pos, end);
         }
         else if (!ts.isNodeKind(kind)) {
@@ -16518,19 +16745,19 @@ var ts;
      * that they appear in the source code. The language service depends on this property to locate nodes by position.
      */
     function forEachChild(node, cbNode, cbNodes) {
-        if (!node || node.kind <= 147 /* LastToken */) {
+        if (!node || node.kind <= 148 /* LastToken */) {
             return;
         }
         switch (node.kind) {
-            case 148 /* QualifiedName */:
+            case 149 /* QualifiedName */:
                 return visitNode(cbNode, node.left) ||
                     visitNode(cbNode, node.right);
-            case 150 /* TypeParameter */:
+            case 151 /* TypeParameter */:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.constraint) ||
                     visitNode(cbNode, node.default) ||
                     visitNode(cbNode, node.expression);
-            case 276 /* ShorthandPropertyAssignment */:
+            case 277 /* ShorthandPropertyAssignment */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
@@ -16538,9 +16765,9 @@ var ts;
                     visitNode(cbNode, node.exclamationToken) ||
                     visitNode(cbNode, node.equalsToken) ||
                     visitNode(cbNode, node.objectAssignmentInitializer);
-            case 277 /* SpreadAssignment */:
+            case 278 /* SpreadAssignment */:
                 return visitNode(cbNode, node.expression);
-            case 151 /* Parameter */:
+            case 152 /* Parameter */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.dotDotDotToken) ||
@@ -16548,7 +16775,7 @@ var ts;
                     visitNode(cbNode, node.questionToken) ||
                     visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.initializer);
-            case 154 /* PropertyDeclaration */:
+            case 155 /* PropertyDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
@@ -16556,51 +16783,51 @@ var ts;
                     visitNode(cbNode, node.exclamationToken) ||
                     visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.initializer);
-            case 153 /* PropertySignature */:
+            case 154 /* PropertySignature */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.questionToken) ||
                     visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.initializer);
-            case 275 /* PropertyAssignment */:
+            case 276 /* PropertyAssignment */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.questionToken) ||
                     visitNode(cbNode, node.initializer);
-            case 237 /* VariableDeclaration */:
+            case 238 /* VariableDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.exclamationToken) ||
                     visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.initializer);
-            case 186 /* BindingElement */:
+            case 187 /* BindingElement */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.dotDotDotToken) ||
                     visitNode(cbNode, node.propertyName) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.initializer);
-            case 165 /* FunctionType */:
-            case 166 /* ConstructorType */:
-            case 160 /* CallSignature */:
-            case 161 /* ConstructSignature */:
-            case 162 /* IndexSignature */:
+            case 166 /* FunctionType */:
+            case 167 /* ConstructorType */:
+            case 161 /* CallSignature */:
+            case 162 /* ConstructSignature */:
+            case 163 /* IndexSignature */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNodes(cbNode, cbNodes, node.typeParameters) ||
                     visitNodes(cbNode, cbNodes, node.parameters) ||
                     visitNode(cbNode, node.type);
-            case 156 /* MethodDeclaration */:
-            case 155 /* MethodSignature */:
-            case 157 /* Constructor */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
-            case 196 /* FunctionExpression */:
-            case 239 /* FunctionDeclaration */:
-            case 197 /* ArrowFunction */:
+            case 157 /* MethodDeclaration */:
+            case 156 /* MethodSignature */:
+            case 158 /* Constructor */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
+            case 197 /* FunctionExpression */:
+            case 240 /* FunctionDeclaration */:
+            case 198 /* ArrowFunction */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.asteriskToken) ||
@@ -16612,343 +16839,345 @@ var ts;
                     visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.equalsGreaterThanToken) ||
                     visitNode(cbNode, node.body);
-            case 164 /* TypeReference */:
+            case 165 /* TypeReference */:
                 return visitNode(cbNode, node.typeName) ||
                     visitNodes(cbNode, cbNodes, node.typeArguments);
-            case 163 /* TypePredicate */:
+            case 164 /* TypePredicate */:
                 return visitNode(cbNode, node.parameterName) ||
                     visitNode(cbNode, node.type);
-            case 167 /* TypeQuery */:
+            case 168 /* TypeQuery */:
                 return visitNode(cbNode, node.exprName);
-            case 168 /* TypeLiteral */:
+            case 169 /* TypeLiteral */:
                 return visitNodes(cbNode, cbNodes, node.members);
-            case 169 /* ArrayType */:
+            case 170 /* ArrayType */:
                 return visitNode(cbNode, node.elementType);
-            case 170 /* TupleType */:
+            case 171 /* TupleType */:
                 return visitNodes(cbNode, cbNodes, node.elementTypes);
-            case 173 /* UnionType */:
-            case 174 /* IntersectionType */:
+            case 174 /* UnionType */:
+            case 175 /* IntersectionType */:
                 return visitNodes(cbNode, cbNodes, node.types);
-            case 175 /* ConditionalType */:
+            case 176 /* ConditionalType */:
                 return visitNode(cbNode, node.checkType) ||
                     visitNode(cbNode, node.extendsType) ||
                     visitNode(cbNode, node.trueType) ||
                     visitNode(cbNode, node.falseType);
-            case 176 /* InferType */:
+            case 177 /* InferType */:
                 return visitNode(cbNode, node.typeParameter);
-            case 183 /* ImportType */:
+            case 184 /* ImportType */:
                 return visitNode(cbNode, node.argument) ||
                     visitNode(cbNode, node.qualifier) ||
                     visitNodes(cbNode, cbNodes, node.typeArguments);
-            case 177 /* ParenthesizedType */:
-            case 179 /* TypeOperator */:
+            case 178 /* ParenthesizedType */:
+            case 180 /* TypeOperator */:
                 return visitNode(cbNode, node.type);
-            case 180 /* IndexedAccessType */:
+            case 181 /* IndexedAccessType */:
                 return visitNode(cbNode, node.objectType) ||
                     visitNode(cbNode, node.indexType);
-            case 181 /* MappedType */:
+            case 182 /* MappedType */:
                 return visitNode(cbNode, node.readonlyToken) ||
                     visitNode(cbNode, node.typeParameter) ||
                     visitNode(cbNode, node.questionToken) ||
                     visitNode(cbNode, node.type);
-            case 182 /* LiteralType */:
+            case 183 /* LiteralType */:
                 return visitNode(cbNode, node.literal);
-            case 184 /* ObjectBindingPattern */:
-            case 185 /* ArrayBindingPattern */:
+            case 185 /* ObjectBindingPattern */:
+            case 186 /* ArrayBindingPattern */:
                 return visitNodes(cbNode, cbNodes, node.elements);
-            case 187 /* ArrayLiteralExpression */:
+            case 188 /* ArrayLiteralExpression */:
                 return visitNodes(cbNode, cbNodes, node.elements);
-            case 188 /* ObjectLiteralExpression */:
+            case 189 /* ObjectLiteralExpression */:
                 return visitNodes(cbNode, cbNodes, node.properties);
-            case 189 /* PropertyAccessExpression */:
+            case 190 /* PropertyAccessExpression */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.name);
-            case 190 /* ElementAccessExpression */:
+            case 191 /* ElementAccessExpression */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.argumentExpression);
-            case 191 /* CallExpression */:
-            case 192 /* NewExpression */:
+            case 192 /* CallExpression */:
+            case 193 /* NewExpression */:
                 return visitNode(cbNode, node.expression) ||
                     visitNodes(cbNode, cbNodes, node.typeArguments) ||
                     visitNodes(cbNode, cbNodes, node.arguments);
-            case 193 /* TaggedTemplateExpression */:
+            case 194 /* TaggedTemplateExpression */:
                 return visitNode(cbNode, node.tag) ||
                     visitNodes(cbNode, cbNodes, node.typeArguments) ||
                     visitNode(cbNode, node.template);
-            case 194 /* TypeAssertionExpression */:
+            case 195 /* TypeAssertionExpression */:
                 return visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.expression);
-            case 195 /* ParenthesizedExpression */:
+            case 196 /* ParenthesizedExpression */:
                 return visitNode(cbNode, node.expression);
-            case 198 /* DeleteExpression */:
+            case 199 /* DeleteExpression */:
                 return visitNode(cbNode, node.expression);
-            case 199 /* TypeOfExpression */:
+            case 200 /* TypeOfExpression */:
                 return visitNode(cbNode, node.expression);
-            case 200 /* VoidExpression */:
+            case 201 /* VoidExpression */:
                 return visitNode(cbNode, node.expression);
-            case 202 /* PrefixUnaryExpression */:
+            case 203 /* PrefixUnaryExpression */:
                 return visitNode(cbNode, node.operand);
-            case 207 /* YieldExpression */:
+            case 208 /* YieldExpression */:
                 return visitNode(cbNode, node.asteriskToken) ||
                     visitNode(cbNode, node.expression);
-            case 201 /* AwaitExpression */:
+            case 202 /* AwaitExpression */:
                 return visitNode(cbNode, node.expression);
-            case 203 /* PostfixUnaryExpression */:
+            case 204 /* PostfixUnaryExpression */:
                 return visitNode(cbNode, node.operand);
-            case 204 /* BinaryExpression */:
+            case 205 /* BinaryExpression */:
                 return visitNode(cbNode, node.left) ||
                     visitNode(cbNode, node.operatorToken) ||
                     visitNode(cbNode, node.right);
-            case 212 /* AsExpression */:
+            case 213 /* AsExpression */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.type);
-            case 213 /* NonNullExpression */:
+            case 214 /* NonNullExpression */:
                 return visitNode(cbNode, node.expression);
-            case 214 /* MetaProperty */:
+            case 215 /* MetaProperty */:
                 return visitNode(cbNode, node.name);
-            case 205 /* ConditionalExpression */:
+            case 206 /* ConditionalExpression */:
                 return visitNode(cbNode, node.condition) ||
                     visitNode(cbNode, node.questionToken) ||
                     visitNode(cbNode, node.whenTrue) ||
                     visitNode(cbNode, node.colonToken) ||
                     visitNode(cbNode, node.whenFalse);
-            case 208 /* SpreadElement */:
+            case 209 /* SpreadElement */:
                 return visitNode(cbNode, node.expression);
-            case 218 /* Block */:
-            case 245 /* ModuleBlock */:
+            case 219 /* Block */:
+            case 246 /* ModuleBlock */:
                 return visitNodes(cbNode, cbNodes, node.statements);
-            case 284 /* SourceFile */:
+            case 285 /* SourceFile */:
                 return visitNodes(cbNode, cbNodes, node.statements) ||
                     visitNode(cbNode, node.endOfFileToken);
-            case 219 /* VariableStatement */:
+            case 220 /* VariableStatement */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.declarationList);
-            case 238 /* VariableDeclarationList */:
+            case 239 /* VariableDeclarationList */:
                 return visitNodes(cbNode, cbNodes, node.declarations);
-            case 221 /* ExpressionStatement */:
+            case 222 /* ExpressionStatement */:
                 return visitNode(cbNode, node.expression);
-            case 222 /* IfStatement */:
+            case 223 /* IfStatement */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.thenStatement) ||
                     visitNode(cbNode, node.elseStatement);
-            case 223 /* DoStatement */:
+            case 224 /* DoStatement */:
                 return visitNode(cbNode, node.statement) ||
                     visitNode(cbNode, node.expression);
-            case 224 /* WhileStatement */:
+            case 225 /* WhileStatement */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.statement);
-            case 225 /* ForStatement */:
+            case 226 /* ForStatement */:
                 return visitNode(cbNode, node.initializer) ||
                     visitNode(cbNode, node.condition) ||
                     visitNode(cbNode, node.incrementor) ||
                     visitNode(cbNode, node.statement);
-            case 226 /* ForInStatement */:
+            case 227 /* ForInStatement */:
                 return visitNode(cbNode, node.initializer) ||
                     visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.statement);
-            case 227 /* ForOfStatement */:
+            case 228 /* ForOfStatement */:
                 return visitNode(cbNode, node.awaitModifier) ||
                     visitNode(cbNode, node.initializer) ||
                     visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.statement);
-            case 228 /* ContinueStatement */:
-            case 229 /* BreakStatement */:
+            case 229 /* ContinueStatement */:
+            case 230 /* BreakStatement */:
                 return visitNode(cbNode, node.label);
-            case 230 /* ReturnStatement */:
+            case 231 /* ReturnStatement */:
                 return visitNode(cbNode, node.expression);
-            case 231 /* WithStatement */:
+            case 232 /* WithStatement */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.statement);
-            case 232 /* SwitchStatement */:
+            case 233 /* SwitchStatement */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.caseBlock);
-            case 246 /* CaseBlock */:
+            case 247 /* CaseBlock */:
                 return visitNodes(cbNode, cbNodes, node.clauses);
-            case 271 /* CaseClause */:
+            case 272 /* CaseClause */:
                 return visitNode(cbNode, node.expression) ||
                     visitNodes(cbNode, cbNodes, node.statements);
-            case 272 /* DefaultClause */:
+            case 273 /* DefaultClause */:
                 return visitNodes(cbNode, cbNodes, node.statements);
-            case 233 /* LabeledStatement */:
+            case 234 /* LabeledStatement */:
                 return visitNode(cbNode, node.label) ||
                     visitNode(cbNode, node.statement);
-            case 234 /* ThrowStatement */:
+            case 235 /* ThrowStatement */:
                 return visitNode(cbNode, node.expression);
-            case 235 /* TryStatement */:
+            case 236 /* TryStatement */:
                 return visitNode(cbNode, node.tryBlock) ||
                     visitNode(cbNode, node.catchClause) ||
                     visitNode(cbNode, node.finallyBlock);
-            case 274 /* CatchClause */:
+            case 275 /* CatchClause */:
                 return visitNode(cbNode, node.variableDeclaration) ||
                     visitNode(cbNode, node.block);
-            case 152 /* Decorator */:
+            case 153 /* Decorator */:
                 return visitNode(cbNode, node.expression);
-            case 240 /* ClassDeclaration */:
-            case 209 /* ClassExpression */:
+            case 241 /* ClassDeclaration */:
+            case 210 /* ClassExpression */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNodes(cbNode, cbNodes, node.typeParameters) ||
                     visitNodes(cbNode, cbNodes, node.heritageClauses) ||
                     visitNodes(cbNode, cbNodes, node.members);
-            case 241 /* InterfaceDeclaration */:
+            case 242 /* InterfaceDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNodes(cbNode, cbNodes, node.typeParameters) ||
                     visitNodes(cbNode, cbNodes, node.heritageClauses) ||
                     visitNodes(cbNode, cbNodes, node.members);
-            case 242 /* TypeAliasDeclaration */:
+            case 243 /* TypeAliasDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNodes(cbNode, cbNodes, node.typeParameters) ||
                     visitNode(cbNode, node.type);
-            case 243 /* EnumDeclaration */:
+            case 244 /* EnumDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNodes(cbNode, cbNodes, node.members);
-            case 278 /* EnumMember */:
+            case 279 /* EnumMember */:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.initializer);
-            case 244 /* ModuleDeclaration */:
+            case 245 /* ModuleDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.body);
-            case 248 /* ImportEqualsDeclaration */:
+            case 249 /* ImportEqualsDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.moduleReference);
-            case 249 /* ImportDeclaration */:
+            case 250 /* ImportDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.importClause) ||
                     visitNode(cbNode, node.moduleSpecifier);
-            case 250 /* ImportClause */:
+            case 251 /* ImportClause */:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.namedBindings);
-            case 247 /* NamespaceExportDeclaration */:
+            case 248 /* NamespaceExportDeclaration */:
                 return visitNode(cbNode, node.name);
-            case 251 /* NamespaceImport */:
+            case 252 /* NamespaceImport */:
                 return visitNode(cbNode, node.name);
-            case 252 /* NamedImports */:
-            case 256 /* NamedExports */:
+            case 253 /* NamedImports */:
+            case 257 /* NamedExports */:
                 return visitNodes(cbNode, cbNodes, node.elements);
-            case 255 /* ExportDeclaration */:
+            case 256 /* ExportDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.exportClause) ||
                     visitNode(cbNode, node.moduleSpecifier);
-            case 253 /* ImportSpecifier */:
-            case 257 /* ExportSpecifier */:
+            case 254 /* ImportSpecifier */:
+            case 258 /* ExportSpecifier */:
                 return visitNode(cbNode, node.propertyName) ||
                     visitNode(cbNode, node.name);
-            case 254 /* ExportAssignment */:
+            case 255 /* ExportAssignment */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.expression);
-            case 206 /* TemplateExpression */:
+            case 207 /* TemplateExpression */:
                 return visitNode(cbNode, node.head) || visitNodes(cbNode, cbNodes, node.templateSpans);
-            case 216 /* TemplateSpan */:
+            case 217 /* TemplateSpan */:
                 return visitNode(cbNode, node.expression) || visitNode(cbNode, node.literal);
-            case 149 /* ComputedPropertyName */:
+            case 150 /* ComputedPropertyName */:
                 return visitNode(cbNode, node.expression);
-            case 273 /* HeritageClause */:
+            case 274 /* HeritageClause */:
                 return visitNodes(cbNode, cbNodes, node.types);
-            case 211 /* ExpressionWithTypeArguments */:
+            case 212 /* ExpressionWithTypeArguments */:
                 return visitNode(cbNode, node.expression) ||
                     visitNodes(cbNode, cbNodes, node.typeArguments);
-            case 259 /* ExternalModuleReference */:
+            case 260 /* ExternalModuleReference */:
                 return visitNode(cbNode, node.expression);
-            case 258 /* MissingDeclaration */:
+            case 259 /* MissingDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators);
-            case 314 /* CommaListExpression */:
+            case 316 /* CommaListExpression */:
                 return visitNodes(cbNode, cbNodes, node.elements);
-            case 260 /* JsxElement */:
+            case 261 /* JsxElement */:
                 return visitNode(cbNode, node.openingElement) ||
                     visitNodes(cbNode, cbNodes, node.children) ||
                     visitNode(cbNode, node.closingElement);
-            case 264 /* JsxFragment */:
+            case 265 /* JsxFragment */:
                 return visitNode(cbNode, node.openingFragment) ||
                     visitNodes(cbNode, cbNodes, node.children) ||
                     visitNode(cbNode, node.closingFragment);
-            case 261 /* JsxSelfClosingElement */:
-            case 262 /* JsxOpeningElement */:
+            case 262 /* JsxSelfClosingElement */:
+            case 263 /* JsxOpeningElement */:
                 return visitNode(cbNode, node.tagName) ||
                     visitNodes(cbNode, cbNodes, node.typeArguments) ||
                     visitNode(cbNode, node.attributes);
-            case 268 /* JsxAttributes */:
+            case 269 /* JsxAttributes */:
                 return visitNodes(cbNode, cbNodes, node.properties);
-            case 267 /* JsxAttribute */:
+            case 268 /* JsxAttribute */:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.initializer);
-            case 269 /* JsxSpreadAttribute */:
+            case 270 /* JsxSpreadAttribute */:
                 return visitNode(cbNode, node.expression);
-            case 270 /* JsxExpression */:
+            case 271 /* JsxExpression */:
                 return visitNode(cbNode, node.dotDotDotToken) ||
                     visitNode(cbNode, node.expression);
-            case 263 /* JsxClosingElement */:
+            case 264 /* JsxClosingElement */:
                 return visitNode(cbNode, node.tagName);
-            case 171 /* OptionalType */:
-            case 172 /* RestType */:
-            case 288 /* JSDocTypeExpression */:
-            case 292 /* JSDocNonNullableType */:
-            case 291 /* JSDocNullableType */:
-            case 293 /* JSDocOptionalType */:
-            case 295 /* JSDocVariadicType */:
+            case 172 /* OptionalType */:
+            case 173 /* RestType */:
+            case 289 /* JSDocTypeExpression */:
+            case 293 /* JSDocNonNullableType */:
+            case 292 /* JSDocNullableType */:
+            case 294 /* JSDocOptionalType */:
+            case 296 /* JSDocVariadicType */:
                 return visitNode(cbNode, node.type);
-            case 294 /* JSDocFunctionType */:
+            case 295 /* JSDocFunctionType */:
                 return visitNodes(cbNode, cbNodes, node.parameters) ||
                     visitNode(cbNode, node.type);
-            case 296 /* JSDocComment */:
+            case 297 /* JSDocComment */:
                 return visitNodes(cbNode, cbNodes, node.tags);
-            case 304 /* JSDocParameterTag */:
-            case 310 /* JSDocPropertyTag */:
+            case 306 /* JSDocParameterTag */:
+            case 312 /* JSDocPropertyTag */:
                 return visitNode(cbNode, node.tagName) ||
                     (node.isNameFirst
                         ? visitNode(cbNode, node.name) ||
                             visitNode(cbNode, node.typeExpression)
                         : visitNode(cbNode, node.typeExpression) ||
                             visitNode(cbNode, node.name));
-            case 300 /* JSDocAugmentsTag */:
+            case 302 /* JSDocAuthorTag */:
+                return visitNode(cbNode, node.tagName);
+            case 301 /* JSDocAugmentsTag */:
                 return visitNode(cbNode, node.tagName) ||
                     visitNode(cbNode, node.class);
-            case 308 /* JSDocTemplateTag */:
+            case 310 /* JSDocTemplateTag */:
                 return visitNode(cbNode, node.tagName) ||
                     visitNode(cbNode, node.constraint) ||
                     visitNodes(cbNode, cbNodes, node.typeParameters);
-            case 309 /* JSDocTypedefTag */:
+            case 311 /* JSDocTypedefTag */:
                 return visitNode(cbNode, node.tagName) ||
                     (node.typeExpression &&
-                        node.typeExpression.kind === 288 /* JSDocTypeExpression */
+                        node.typeExpression.kind === 289 /* JSDocTypeExpression */
                         ? visitNode(cbNode, node.typeExpression) ||
                             visitNode(cbNode, node.fullName)
                         : visitNode(cbNode, node.fullName) ||
                             visitNode(cbNode, node.typeExpression));
-            case 302 /* JSDocCallbackTag */:
+            case 304 /* JSDocCallbackTag */:
                 return visitNode(cbNode, node.tagName) ||
                     visitNode(cbNode, node.fullName) ||
                     visitNode(cbNode, node.typeExpression);
-            case 305 /* JSDocReturnTag */:
-            case 307 /* JSDocTypeTag */:
-            case 306 /* JSDocThisTag */:
-            case 303 /* JSDocEnumTag */:
+            case 307 /* JSDocReturnTag */:
+            case 309 /* JSDocTypeTag */:
+            case 308 /* JSDocThisTag */:
+            case 305 /* JSDocEnumTag */:
                 return visitNode(cbNode, node.tagName) ||
                     visitNode(cbNode, node.typeExpression);
-            case 298 /* JSDocSignature */:
+            case 299 /* JSDocSignature */:
                 return ts.forEach(node.typeParameters, cbNode) ||
                     ts.forEach(node.parameters, cbNode) ||
                     visitNode(cbNode, node.type);
-            case 297 /* JSDocTypeLiteral */:
+            case 298 /* JSDocTypeLiteral */:
                 return ts.forEach(node.jsDocPropertyTags, cbNode);
-            case 299 /* JSDocTag */:
-            case 301 /* JSDocClassTag */:
+            case 300 /* JSDocTag */:
+            case 303 /* JSDocClassTag */:
                 return visitNode(cbNode, node.tagName);
-            case 313 /* PartiallyEmittedExpression */:
+            case 315 /* PartiallyEmittedExpression */:
                 return visitNode(cbNode, node.expression);
         }
     }
@@ -17028,7 +17257,7 @@ var ts;
     (function (Parser) {
         // Share a single scanner across all calls to parse a source file.  This helps speed things
         // up by avoiding the cost of creating/compiling scanners over and over again.
-        var scanner = ts.createScanner(7 /* Latest */, /*skipTrivia*/ true);
+        var scanner = ts.createScanner(99 /* Latest */, /*skipTrivia*/ true);
         var disallowInAndDecoratorContext = 2048 /* DisallowInContext */ | 8192 /* DecoratorContext */;
         // capture constructors in 'initializeState' to avoid null checks
         // tslint:disable variable-name
@@ -17166,14 +17395,14 @@ var ts;
                 sourceFile.endOfFileToken = parseTokenNode();
             }
             else {
-                var statement = createNode(221 /* ExpressionStatement */);
+                var statement = createNode(222 /* ExpressionStatement */);
                 switch (token()) {
                     case 22 /* OpenBracketToken */:
                         statement.expression = parseArrayLiteralExpression();
                         break;
-                    case 102 /* TrueKeyword */:
-                    case 87 /* FalseKeyword */:
-                    case 96 /* NullKeyword */:
+                    case 103 /* TrueKeyword */:
+                    case 88 /* FalseKeyword */:
+                    case 97 /* NullKeyword */:
                         statement.expression = parseTokenNode();
                         break;
                     case 39 /* MinusToken */:
@@ -17322,7 +17551,7 @@ var ts;
         function createSourceFile(fileName, languageVersion, scriptKind, isDeclarationFile) {
             // code from createNode is inlined here so createNode won't have to deal with special case of creating source files
             // this is quite rare comparing to other nodes and createNode should be as fast as possible
-            var sourceFile = new SourceFileConstructor(284 /* SourceFile */, /*pos*/ 0, /* end */ sourceText.length);
+            var sourceFile = new SourceFileConstructor(285 /* SourceFile */, /*pos*/ 0, /* end */ sourceText.length);
             nodeCount++;
             sourceFile.text = sourceText;
             sourceFile.bindDiagnostics = [];
@@ -17465,6 +17694,9 @@ var ts;
         function nextToken() {
             return currentToken = scanner.scan();
         }
+        function nextTokenJSDoc() {
+            return currentToken = scanner.scanJsDocToken();
+        }
         function reScanGreaterToken() {
             return currentToken = scanner.reScanGreaterToken();
         }
@@ -17530,20 +17762,20 @@ var ts;
         }
         // Ignore strict mode flag because we will report an error in type checker instead.
         function isIdentifier() {
-            if (token() === 72 /* Identifier */) {
+            if (token() === 73 /* Identifier */) {
                 return true;
             }
             // If we have a 'yield' keyword, and we're in the [yield] context, then 'yield' is
             // considered a keyword and is not an identifier.
-            if (token() === 117 /* YieldKeyword */ && inYieldContext()) {
+            if (token() === 118 /* YieldKeyword */ && inYieldContext()) {
                 return false;
             }
             // If we have a 'await' keyword, and we're in the [Await] context, then 'await' is
             // considered a keyword and is not an identifier.
-            if (token() === 122 /* AwaitKeyword */ && inAwaitContext()) {
+            if (token() === 123 /* AwaitKeyword */ && inAwaitContext()) {
                 return false;
             }
-            return token() > 108 /* LastReservedWord */;
+            return token() > 109 /* LastReservedWord */;
         }
         function parseExpected(kind, diagnosticMessage, shouldAdvance) {
             if (shouldAdvance === void 0) { shouldAdvance = true; }
@@ -17562,6 +17794,14 @@ var ts;
             }
             return false;
         }
+        function parseExpectedJSDoc(kind) {
+            if (token() === kind) {
+                nextTokenJSDoc();
+                return true;
+            }
+            parseErrorAtCurrentToken(ts.Diagnostics._0_expected, ts.tokenToString(kind));
+            return false;
+        }
         function parseOptional(t) {
             if (token() === t) {
                 nextToken();
@@ -17575,15 +17815,30 @@ var ts;
             }
             return undefined;
         }
+        function parseOptionalTokenJSDoc(t) {
+            if (token() === t) {
+                return parseTokenNodeJSDoc();
+            }
+            return undefined;
+        }
         function parseExpectedToken(t, diagnosticMessage, arg0) {
             return parseOptionalToken(t) ||
                 createMissingNode(t, /*reportAtCurrentPosition*/ false, diagnosticMessage || ts.Diagnostics._0_expected, arg0 || ts.tokenToString(t));
         }
+        function parseExpectedTokenJSDoc(t) {
+            return parseOptionalTokenJSDoc(t) ||
+                createMissingNode(t, /*reportAtCurrentPosition*/ false, ts.Diagnostics._0_expected, ts.tokenToString(t));
+        }
         function parseTokenNode() {
             var node = createNode(token());
             nextToken();
             return finishNode(node);
         }
+        function parseTokenNodeJSDoc() {
+            var node = createNode(token());
+            nextTokenJSDoc();
+            return finishNode(node);
+        }
         function canParseSemicolon() {
             // If there's a real semicolon, then we can always parse it out.
             if (token() === 26 /* SemicolonToken */) {
@@ -17608,7 +17863,7 @@ var ts;
             nodeCount++;
             var p = pos >= 0 ? pos : scanner.getStartPos();
             return ts.isNodeKind(kind) || kind === 0 /* Unknown */ ? new NodeConstructor(kind, p, p) :
-                kind === 72 /* Identifier */ ? new IdentifierConstructor(kind, p, p) :
+                kind === 73 /* Identifier */ ? new IdentifierConstructor(kind, p, p) :
                     new TokenConstructor(kind, p, p);
         }
         function createNodeWithJSDoc(kind, pos) {
@@ -17650,7 +17905,7 @@ var ts;
                 parseErrorAtCurrentToken(diagnosticMessage, arg0);
             }
             var result = createNode(kind);
-            if (kind === 72 /* Identifier */) {
+            if (kind === 73 /* Identifier */) {
                 result.escapedText = "";
             }
             else if (ts.isLiteralKind(kind) || ts.isTemplateLiteralKind(kind)) {
@@ -17671,9 +17926,9 @@ var ts;
         function createIdentifier(isIdentifier, diagnosticMessage) {
             identifierCount++;
             if (isIdentifier) {
-                var node = createNode(72 /* Identifier */);
+                var node = createNode(73 /* Identifier */);
                 // Store original token kind if it is not just an Identifier so we can report appropriate error later in type checker
-                if (token() !== 72 /* Identifier */) {
+                if (token() !== 73 /* Identifier */) {
                     node.originalKeywordKind = token();
                 }
                 node.escapedText = ts.escapeLeadingUnderscores(internIdentifier(scanner.getTokenValue()));
@@ -17682,7 +17937,7 @@ var ts;
             }
             // Only for end of file because the error gets reported incorrectly on embedded script tags.
             var reportAtCurrentPosition = token() === 1 /* EndOfFileToken */;
-            return createMissingNode(72 /* Identifier */, reportAtCurrentPosition, diagnosticMessage || ts.Diagnostics.Identifier_expected);
+            return createMissingNode(73 /* Identifier */, reportAtCurrentPosition, diagnosticMessage || ts.Diagnostics.Identifier_expected);
         }
         function parseIdentifier(diagnosticMessage) {
             return createIdentifier(isIdentifier(), diagnosticMessage);
@@ -17713,7 +17968,7 @@ var ts;
             // PropertyName [Yield]:
             //      LiteralPropertyName
             //      ComputedPropertyName[?Yield]
-            var node = createNode(149 /* ComputedPropertyName */);
+            var node = createNode(150 /* ComputedPropertyName */);
             parseExpected(22 /* OpenBracketToken */);
             // We parse any expression (including a comma expression). But the grammar
             // says that only an assignment expression is allowed, so the grammar checker
@@ -17734,20 +17989,20 @@ var ts;
         }
         function nextTokenCanFollowModifier() {
             switch (token()) {
-                case 77 /* ConstKeyword */:
+                case 78 /* ConstKeyword */:
                     // 'const' is only a modifier if followed by 'enum'.
-                    return nextToken() === 84 /* EnumKeyword */;
-                case 85 /* ExportKeyword */:
+                    return nextToken() === 85 /* EnumKeyword */;
+                case 86 /* ExportKeyword */:
                     nextToken();
-                    if (token() === 80 /* DefaultKeyword */) {
+                    if (token() === 81 /* DefaultKeyword */) {
                         return lookAhead(nextTokenCanFollowDefaultKeyword);
                     }
-                    return token() !== 40 /* AsteriskToken */ && token() !== 119 /* AsKeyword */ && token() !== 18 /* OpenBraceToken */ && canFollowModifier();
-                case 80 /* DefaultKeyword */:
+                    return token() !== 40 /* AsteriskToken */ && token() !== 120 /* AsKeyword */ && token() !== 18 /* OpenBraceToken */ && canFollowModifier();
+                case 81 /* DefaultKeyword */:
                     return nextTokenCanFollowDefaultKeyword();
-                case 116 /* StaticKeyword */:
-                case 126 /* GetKeyword */:
-                case 137 /* SetKeyword */:
+                case 117 /* StaticKeyword */:
+                case 127 /* GetKeyword */:
+                case 138 /* SetKeyword */:
                     nextToken();
                     return canFollowModifier();
                 default:
@@ -17766,10 +18021,10 @@ var ts;
         }
         function nextTokenCanFollowDefaultKeyword() {
             nextToken();
-            return token() === 76 /* ClassKeyword */ || token() === 90 /* FunctionKeyword */ ||
-                token() === 110 /* InterfaceKeyword */ ||
-                (token() === 118 /* AbstractKeyword */ && lookAhead(nextTokenIsClassKeywordOnSameLine)) ||
-                (token() === 121 /* AsyncKeyword */ && lookAhead(nextTokenIsFunctionKeywordOnSameLine));
+            return token() === 77 /* ClassKeyword */ || token() === 91 /* FunctionKeyword */ ||
+                token() === 111 /* InterfaceKeyword */ ||
+                (token() === 119 /* AbstractKeyword */ && lookAhead(nextTokenIsClassKeywordOnSameLine)) ||
+                (token() === 122 /* AsyncKeyword */ && lookAhead(nextTokenIsFunctionKeywordOnSameLine));
         }
         // True if positioned at the start of a list element
         function isListElement(parsingContext, inErrorRecovery) {
@@ -17789,7 +18044,7 @@ var ts;
                     // outer module.  We just want to consume and move on.
                     return !(token() === 26 /* SemicolonToken */ && inErrorRecovery) && isStartOfStatement();
                 case 2 /* SwitchClauses */:
-                    return token() === 74 /* CaseKeyword */ || token() === 80 /* DefaultKeyword */;
+                    return token() === 75 /* CaseKeyword */ || token() === 81 /* DefaultKeyword */;
                 case 4 /* TypeMembers */:
                     return lookAhead(isTypeMemberStart);
                 case 5 /* ClassMembers */:
@@ -17875,7 +18130,7 @@ var ts;
                 //      extends {} extends
                 //      extends {} implements
                 var next = nextToken();
-                return next === 27 /* CommaToken */ || next === 18 /* OpenBraceToken */ || next === 86 /* ExtendsKeyword */ || next === 109 /* ImplementsKeyword */;
+                return next === 27 /* CommaToken */ || next === 18 /* OpenBraceToken */ || next === 87 /* ExtendsKeyword */ || next === 110 /* ImplementsKeyword */;
             }
             return true;
         }
@@ -17892,8 +18147,8 @@ var ts;
             return ts.tokenIsIdentifierOrKeywordOrGreaterThan(token());
         }
         function isHeritageClauseExtendsOrImplementsKeyword() {
-            if (token() === 109 /* ImplementsKeyword */ ||
-                token() === 86 /* ExtendsKeyword */) {
+            if (token() === 110 /* ImplementsKeyword */ ||
+                token() === 87 /* ExtendsKeyword */) {
                 return lookAhead(nextTokenIsStartOfExpression);
             }
             return false;
@@ -17923,14 +18178,14 @@ var ts;
                 case 23 /* ImportOrExportSpecifiers */:
                     return token() === 19 /* CloseBraceToken */;
                 case 3 /* SwitchClauseStatements */:
-                    return token() === 19 /* CloseBraceToken */ || token() === 74 /* CaseKeyword */ || token() === 80 /* DefaultKeyword */;
+                    return token() === 19 /* CloseBraceToken */ || token() === 75 /* CaseKeyword */ || token() === 81 /* DefaultKeyword */;
                 case 7 /* HeritageClauseElement */:
-                    return token() === 18 /* OpenBraceToken */ || token() === 86 /* ExtendsKeyword */ || token() === 109 /* ImplementsKeyword */;
+                    return token() === 18 /* OpenBraceToken */ || token() === 87 /* ExtendsKeyword */ || token() === 110 /* ImplementsKeyword */;
                 case 8 /* VariableDeclarations */:
                     return isVariableDeclaratorListTerminator();
                 case 19 /* TypeParameters */:
                     // Tokens other than '>' are here for better error recovery
-                    return token() === 30 /* GreaterThanToken */ || token() === 20 /* OpenParenToken */ || token() === 18 /* OpenBraceToken */ || token() === 86 /* ExtendsKeyword */ || token() === 109 /* ImplementsKeyword */;
+                    return token() === 30 /* GreaterThanToken */ || token() === 20 /* OpenParenToken */ || token() === 18 /* OpenBraceToken */ || token() === 87 /* ExtendsKeyword */ || token() === 110 /* ImplementsKeyword */;
                 case 11 /* ArgumentExpressions */:
                     // Tokens other than ')' are here for better error recovery
                     return token() === 21 /* CloseParenToken */ || token() === 26 /* SemicolonToken */;
@@ -18147,20 +18402,20 @@ var ts;
         function isReusableClassMember(node) {
             if (node) {
                 switch (node.kind) {
-                    case 157 /* Constructor */:
-                    case 162 /* IndexSignature */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
-                    case 154 /* PropertyDeclaration */:
-                    case 217 /* SemicolonClassElement */:
+                    case 158 /* Constructor */:
+                    case 163 /* IndexSignature */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
+                    case 155 /* PropertyDeclaration */:
+                    case 218 /* SemicolonClassElement */:
                         return true;
-                    case 156 /* MethodDeclaration */:
+                    case 157 /* MethodDeclaration */:
                         // Method declarations are not necessarily reusable.  An object-literal
                         // may have a method calls "constructor(...)" and we must reparse that
                         // into an actual .ConstructorDeclaration.
                         var methodDeclaration = node;
-                        var nameIsConstructor = methodDeclaration.name.kind === 72 /* Identifier */ &&
-                            methodDeclaration.name.originalKeywordKind === 124 /* ConstructorKeyword */;
+                        var nameIsConstructor = methodDeclaration.name.kind === 73 /* Identifier */ &&
+                            methodDeclaration.name.originalKeywordKind === 125 /* ConstructorKeyword */;
                         return !nameIsConstructor;
                 }
             }
@@ -18169,8 +18424,8 @@ var ts;
         function isReusableSwitchClause(node) {
             if (node) {
                 switch (node.kind) {
-                    case 271 /* CaseClause */:
-                    case 272 /* DefaultClause */:
+                    case 272 /* CaseClause */:
+                    case 273 /* DefaultClause */:
                         return true;
                 }
             }
@@ -18179,58 +18434,58 @@ var ts;
         function isReusableStatement(node) {
             if (node) {
                 switch (node.kind) {
-                    case 239 /* FunctionDeclaration */:
-                    case 219 /* VariableStatement */:
-                    case 218 /* Block */:
-                    case 222 /* IfStatement */:
-                    case 221 /* ExpressionStatement */:
-                    case 234 /* ThrowStatement */:
-                    case 230 /* ReturnStatement */:
-                    case 232 /* SwitchStatement */:
-                    case 229 /* BreakStatement */:
-                    case 228 /* ContinueStatement */:
-                    case 226 /* ForInStatement */:
-                    case 227 /* ForOfStatement */:
-                    case 225 /* ForStatement */:
-                    case 224 /* WhileStatement */:
-                    case 231 /* WithStatement */:
-                    case 220 /* EmptyStatement */:
-                    case 235 /* TryStatement */:
-                    case 233 /* LabeledStatement */:
-                    case 223 /* DoStatement */:
-                    case 236 /* DebuggerStatement */:
-                    case 249 /* ImportDeclaration */:
-                    case 248 /* ImportEqualsDeclaration */:
-                    case 255 /* ExportDeclaration */:
-                    case 254 /* ExportAssignment */:
-                    case 244 /* ModuleDeclaration */:
-                    case 240 /* ClassDeclaration */:
-                    case 241 /* InterfaceDeclaration */:
-                    case 243 /* EnumDeclaration */:
-                    case 242 /* TypeAliasDeclaration */:
+                    case 240 /* FunctionDeclaration */:
+                    case 220 /* VariableStatement */:
+                    case 219 /* Block */:
+                    case 223 /* IfStatement */:
+                    case 222 /* ExpressionStatement */:
+                    case 235 /* ThrowStatement */:
+                    case 231 /* ReturnStatement */:
+                    case 233 /* SwitchStatement */:
+                    case 230 /* BreakStatement */:
+                    case 229 /* ContinueStatement */:
+                    case 227 /* ForInStatement */:
+                    case 228 /* ForOfStatement */:
+                    case 226 /* ForStatement */:
+                    case 225 /* WhileStatement */:
+                    case 232 /* WithStatement */:
+                    case 221 /* EmptyStatement */:
+                    case 236 /* TryStatement */:
+                    case 234 /* LabeledStatement */:
+                    case 224 /* DoStatement */:
+                    case 237 /* DebuggerStatement */:
+                    case 250 /* ImportDeclaration */:
+                    case 249 /* ImportEqualsDeclaration */:
+                    case 256 /* ExportDeclaration */:
+                    case 255 /* ExportAssignment */:
+                    case 245 /* ModuleDeclaration */:
+                    case 241 /* ClassDeclaration */:
+                    case 242 /* InterfaceDeclaration */:
+                    case 244 /* EnumDeclaration */:
+                    case 243 /* TypeAliasDeclaration */:
                         return true;
                 }
             }
             return false;
         }
         function isReusableEnumMember(node) {
-            return node.kind === 278 /* EnumMember */;
+            return node.kind === 279 /* EnumMember */;
         }
         function isReusableTypeMember(node) {
             if (node) {
                 switch (node.kind) {
-                    case 161 /* ConstructSignature */:
-                    case 155 /* MethodSignature */:
-                    case 162 /* IndexSignature */:
-                    case 153 /* PropertySignature */:
-                    case 160 /* CallSignature */:
+                    case 162 /* ConstructSignature */:
+                    case 156 /* MethodSignature */:
+                    case 163 /* IndexSignature */:
+                    case 154 /* PropertySignature */:
+                    case 161 /* CallSignature */:
                         return true;
                 }
             }
             return false;
         }
         function isReusableVariableDeclaration(node) {
-            if (node.kind !== 237 /* VariableDeclaration */) {
+            if (node.kind !== 238 /* VariableDeclaration */) {
                 return false;
             }
             // Very subtle incremental parsing bug.  Consider the following code:
@@ -18251,7 +18506,7 @@ var ts;
             return variableDeclarator.initializer === undefined;
         }
         function isReusableParameter(node) {
-            if (node.kind !== 151 /* Parameter */) {
+            if (node.kind !== 152 /* Parameter */) {
                 return false;
             }
             // See the comment in isReusableVariableDeclaration for why we do this.
@@ -18387,7 +18642,7 @@ var ts;
             return entity;
         }
         function createQualifiedName(entity, name) {
-            var node = createNode(148 /* QualifiedName */, entity.pos);
+            var node = createNode(149 /* QualifiedName */, entity.pos);
             node.left = entity;
             node.right = name;
             return finishNode(node);
@@ -18418,13 +18673,13 @@ var ts;
                     // Report that we need an identifier.  However, report it right after the dot,
                     // and not on the next token.  This is because the next token might actually
                     // be an identifier and the error would be quite confusing.
-                    return createMissingNode(72 /* Identifier */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Identifier_expected);
+                    return createMissingNode(73 /* Identifier */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Identifier_expected);
                 }
             }
             return allowIdentifierNames ? parseIdentifierName() : parseIdentifier();
         }
         function parseTemplateExpression() {
-            var template = createNode(206 /* TemplateExpression */);
+            var template = createNode(207 /* TemplateExpression */);
             template.head = parseTemplateHead();
             ts.Debug.assert(template.head.kind === 15 /* TemplateHead */, "Template head has wrong token kind");
             var list = [];
@@ -18436,7 +18691,7 @@ var ts;
             return finishNode(template);
         }
         function parseTemplateSpan() {
-            var span = createNode(216 /* TemplateSpan */);
+            var span = createNode(217 /* TemplateSpan */);
             span.expression = allowInAnd(parseExpression);
             var literal;
             if (token() === 19 /* CloseBraceToken */) {
@@ -18486,7 +18741,7 @@ var ts;
         }
         // TYPES
         function parseTypeReference() {
-            var node = createNode(164 /* TypeReference */);
+            var node = createNode(165 /* TypeReference */);
             node.typeName = parseEntityName(/*allowReservedWords*/ true, ts.Diagnostics.Type_expected);
             if (!scanner.hasPrecedingLineBreak() && reScanLessThanToken() === 28 /* LessThanToken */) {
                 node.typeArguments = parseBracketedList(20 /* TypeArguments */, parseType, 28 /* LessThanToken */, 30 /* GreaterThanToken */);
@@ -18496,14 +18751,14 @@ var ts;
         // If true, we should abort parsing an error function.
         function typeHasArrowFunctionBlockingParseError(node) {
             switch (node.kind) {
-                case 164 /* TypeReference */:
+                case 165 /* TypeReference */:
                     return ts.nodeIsMissing(node.typeName);
-                case 165 /* FunctionType */:
-                case 166 /* ConstructorType */: {
+                case 166 /* FunctionType */:
+                case 167 /* ConstructorType */: {
                     var _a = node, parameters = _a.parameters, type = _a.type;
                     return isMissingList(parameters) || typeHasArrowFunctionBlockingParseError(type);
                 }
-                case 177 /* ParenthesizedType */:
+                case 178 /* ParenthesizedType */:
                     return typeHasArrowFunctionBlockingParseError(node.type);
                 default:
                     return false;
@@ -18511,20 +18766,20 @@ var ts;
         }
         function parseThisTypePredicate(lhs) {
             nextToken();
-            var node = createNode(163 /* TypePredicate */, lhs.pos);
+            var node = createNode(164 /* TypePredicate */, lhs.pos);
             node.parameterName = lhs;
             node.type = parseType();
             return finishNode(node);
         }
         function parseThisTypeNode() {
-            var node = createNode(178 /* ThisType */);
+            var node = createNode(179 /* ThisType */);
             nextToken();
             return finishNode(node);
         }
         function parseJSDocAllType(postFixEquals) {
-            var result = createNode(289 /* JSDocAllType */);
+            var result = createNode(290 /* JSDocAllType */);
             if (postFixEquals) {
-                return createPostfixType(293 /* JSDocOptionalType */, result);
+                return createPostfixType(294 /* JSDocOptionalType */, result);
             }
             else {
                 nextToken();
@@ -18532,7 +18787,7 @@ var ts;
             return finishNode(result);
         }
         function parseJSDocNonNullableType() {
-            var result = createNode(292 /* JSDocNonNullableType */);
+            var result = createNode(293 /* JSDocNonNullableType */);
             nextToken();
             result.type = parseNonArrayType();
             return finishNode(result);
@@ -18554,31 +18809,31 @@ var ts;
                 token() === 19 /* CloseBraceToken */ ||
                 token() === 21 /* CloseParenToken */ ||
                 token() === 30 /* GreaterThanToken */ ||
-                token() === 59 /* EqualsToken */ ||
+                token() === 60 /* EqualsToken */ ||
                 token() === 50 /* BarToken */) {
-                var result = createNode(290 /* JSDocUnknownType */, pos);
+                var result = createNode(291 /* JSDocUnknownType */, pos);
                 return finishNode(result);
             }
             else {
-                var result = createNode(291 /* JSDocNullableType */, pos);
+                var result = createNode(292 /* JSDocNullableType */, pos);
                 result.type = parseType();
                 return finishNode(result);
             }
         }
         function parseJSDocFunctionType() {
             if (lookAhead(nextTokenIsOpenParen)) {
-                var result = createNodeWithJSDoc(294 /* JSDocFunctionType */);
+                var result = createNodeWithJSDoc(295 /* JSDocFunctionType */);
                 nextToken();
                 fillSignature(57 /* ColonToken */, 4 /* Type */ | 32 /* JSDoc */, result);
                 return finishNode(result);
             }
-            var node = createNode(164 /* TypeReference */);
+            var node = createNode(165 /* TypeReference */);
             node.typeName = parseIdentifierName();
             return finishNode(node);
         }
         function parseJSDocParameter() {
-            var parameter = createNode(151 /* Parameter */);
-            if (token() === 100 /* ThisKeyword */ || token() === 95 /* NewKeyword */) {
+            var parameter = createNode(152 /* Parameter */);
+            if (token() === 101 /* ThisKeyword */ || token() === 96 /* NewKeyword */) {
                 parameter.name = parseIdentifierName();
                 parseExpected(57 /* ColonToken */);
             }
@@ -18591,25 +18846,25 @@ var ts;
             var type = parseTypeOrTypePredicate();
             scanner.setInJSDocType(false);
             if (dotdotdot) {
-                var variadic = createNode(295 /* JSDocVariadicType */, dotdotdot.pos);
+                var variadic = createNode(296 /* JSDocVariadicType */, dotdotdot.pos);
                 variadic.type = type;
                 type = finishNode(variadic);
             }
-            if (token() === 59 /* EqualsToken */) {
-                return createPostfixType(293 /* JSDocOptionalType */, type);
+            if (token() === 60 /* EqualsToken */) {
+                return createPostfixType(294 /* JSDocOptionalType */, type);
             }
             return type;
         }
         function parseTypeQuery() {
-            var node = createNode(167 /* TypeQuery */);
-            parseExpected(104 /* TypeOfKeyword */);
+            var node = createNode(168 /* TypeQuery */);
+            parseExpected(105 /* TypeOfKeyword */);
             node.exprName = parseEntityName(/*allowReservedWords*/ true);
             return finishNode(node);
         }
         function parseTypeParameter() {
-            var node = createNode(150 /* TypeParameter */);
+            var node = createNode(151 /* TypeParameter */);
             node.name = parseIdentifier();
-            if (parseOptional(86 /* ExtendsKeyword */)) {
+            if (parseOptional(87 /* ExtendsKeyword */)) {
                 // It's not uncommon for people to write improper constraints to a generic.  If the
                 // user writes a constraint that is an expression and not an actual type, then parse
                 // it out as an expression (so we can recover well), but report that a type is needed
@@ -18628,7 +18883,7 @@ var ts;
                     node.expression = parseUnaryExpressionOrHigher();
                 }
             }
-            if (parseOptional(59 /* EqualsToken */)) {
+            if (parseOptional(60 /* EqualsToken */)) {
                 node.default = parseType();
             }
             return finishNode(node);
@@ -18652,8 +18907,8 @@ var ts;
                 isStartOfType(/*inStartOfParameter*/ !isJSDocParameter);
         }
         function parseParameter() {
-            var node = createNodeWithJSDoc(151 /* Parameter */);
-            if (token() === 100 /* ThisKeyword */) {
+            var node = createNodeWithJSDoc(152 /* Parameter */);
+            if (token() === 101 /* ThisKeyword */) {
                 node.name = createIdentifier(/*isIdentifier*/ true);
                 node.type = parseParameterType();
                 return finishNode(node);
@@ -18753,8 +19008,8 @@ var ts;
         }
         function parseSignatureMember(kind) {
             var node = createNodeWithJSDoc(kind);
-            if (kind === 161 /* ConstructSignature */) {
-                parseExpected(95 /* NewKeyword */);
+            if (kind === 162 /* ConstructSignature */) {
+                parseExpected(96 /* NewKeyword */);
             }
             fillSignature(57 /* ColonToken */, 4 /* Type */, node);
             parseTypeMemberSemicolon();
@@ -18814,7 +19069,7 @@ var ts;
             return token() === 57 /* ColonToken */ || token() === 27 /* CommaToken */ || token() === 23 /* CloseBracketToken */;
         }
         function parseIndexSignatureDeclaration(node) {
-            node.kind = 162 /* IndexSignature */;
+            node.kind = 163 /* IndexSignature */;
             node.parameters = parseBracketedList(16 /* Parameters */, parseParameter, 22 /* OpenBracketToken */, 23 /* CloseBracketToken */);
             node.type = parseTypeAnnotation();
             parseTypeMemberSemicolon();
@@ -18824,15 +19079,15 @@ var ts;
             node.name = parsePropertyName();
             node.questionToken = parseOptionalToken(56 /* QuestionToken */);
             if (token() === 20 /* OpenParenToken */ || token() === 28 /* LessThanToken */) {
-                node.kind = 155 /* MethodSignature */;
+                node.kind = 156 /* MethodSignature */;
                 // Method signatures don't exist in expression contexts.  So they have neither
                 // [Yield] nor [Await]
                 fillSignature(57 /* ColonToken */, 4 /* Type */, node);
             }
             else {
-                node.kind = 153 /* PropertySignature */;
+                node.kind = 154 /* PropertySignature */;
                 node.type = parseTypeAnnotation();
-                if (token() === 59 /* EqualsToken */) {
+                if (token() === 60 /* EqualsToken */) {
                     // Although type literal properties cannot not have initializers, we attempt
                     // to parse an initializer so we can report in the checker that an interface
                     // property or type literal property cannot have an initializer.
@@ -18876,10 +19131,10 @@ var ts;
         }
         function parseTypeMember() {
             if (token() === 20 /* OpenParenToken */ || token() === 28 /* LessThanToken */) {
-                return parseSignatureMember(160 /* CallSignature */);
+                return parseSignatureMember(161 /* CallSignature */);
             }
-            if (token() === 95 /* NewKeyword */ && lookAhead(nextTokenIsOpenParenOrLessThan)) {
-                return parseSignatureMember(161 /* ConstructSignature */);
+            if (token() === 96 /* NewKeyword */ && lookAhead(nextTokenIsOpenParenOrLessThan)) {
+                return parseSignatureMember(162 /* ConstructSignature */);
             }
             var node = createNodeWithJSDoc(0 /* Unknown */);
             node.modifiers = parseModifiers();
@@ -18905,7 +19160,7 @@ var ts;
             return false;
         }
         function parseTypeLiteral() {
-            var node = createNode(168 /* TypeLiteral */);
+            var node = createNode(169 /* TypeLiteral */);
             node.members = parseObjectTypeMembers();
             return finishNode(node);
         }
@@ -18923,27 +19178,27 @@ var ts;
         function isStartOfMappedType() {
             nextToken();
             if (token() === 38 /* PlusToken */ || token() === 39 /* MinusToken */) {
-                return nextToken() === 133 /* ReadonlyKeyword */;
+                return nextToken() === 134 /* ReadonlyKeyword */;
             }
-            if (token() === 133 /* ReadonlyKeyword */) {
+            if (token() === 134 /* ReadonlyKeyword */) {
                 nextToken();
             }
-            return token() === 22 /* OpenBracketToken */ && nextTokenIsIdentifier() && nextToken() === 93 /* InKeyword */;
+            return token() === 22 /* OpenBracketToken */ && nextTokenIsIdentifier() && nextToken() === 94 /* InKeyword */;
         }
         function parseMappedTypeParameter() {
-            var node = createNode(150 /* TypeParameter */);
+            var node = createNode(151 /* TypeParameter */);
             node.name = parseIdentifier();
-            parseExpected(93 /* InKeyword */);
+            parseExpected(94 /* InKeyword */);
             node.constraint = parseType();
             return finishNode(node);
         }
         function parseMappedType() {
-            var node = createNode(181 /* MappedType */);
+            var node = createNode(182 /* MappedType */);
             parseExpected(18 /* OpenBraceToken */);
-            if (token() === 133 /* ReadonlyKeyword */ || token() === 38 /* PlusToken */ || token() === 39 /* MinusToken */) {
+            if (token() === 134 /* ReadonlyKeyword */ || token() === 38 /* PlusToken */ || token() === 39 /* MinusToken */) {
                 node.readonlyToken = parseTokenNode();
-                if (node.readonlyToken.kind !== 133 /* ReadonlyKeyword */) {
-                    parseExpectedToken(133 /* ReadonlyKeyword */);
+                if (node.readonlyToken.kind !== 134 /* ReadonlyKeyword */) {
+                    parseExpectedToken(134 /* ReadonlyKeyword */);
                 }
             }
             parseExpected(22 /* OpenBracketToken */);
@@ -18963,23 +19218,23 @@ var ts;
         function parseTupleElementType() {
             var pos = getNodePos();
             if (parseOptional(25 /* DotDotDotToken */)) {
-                var node = createNode(172 /* RestType */, pos);
+                var node = createNode(173 /* RestType */, pos);
                 node.type = parseType();
                 return finishNode(node);
             }
             var type = parseType();
-            if (!(contextFlags & 2097152 /* JSDoc */) && type.kind === 291 /* JSDocNullableType */ && type.pos === type.type.pos) {
-                type.kind = 171 /* OptionalType */;
+            if (!(contextFlags & 2097152 /* JSDoc */) && type.kind === 292 /* JSDocNullableType */ && type.pos === type.type.pos) {
+                type.kind = 172 /* OptionalType */;
             }
             return type;
         }
         function parseTupleType() {
-            var node = createNode(170 /* TupleType */);
+            var node = createNode(171 /* TupleType */);
             node.elementTypes = parseBracketedList(21 /* TupleElementTypes */, parseTupleElementType, 22 /* OpenBracketToken */, 23 /* CloseBracketToken */);
             return finishNode(node);
         }
         function parseParenthesizedType() {
-            var node = createNode(177 /* ParenthesizedType */);
+            var node = createNode(178 /* ParenthesizedType */);
             parseExpected(20 /* OpenParenToken */);
             node.type = parseType();
             parseExpected(21 /* CloseParenToken */);
@@ -18987,7 +19242,7 @@ var ts;
         }
         function parseFunctionOrConstructorType() {
             var pos = getNodePos();
-            var kind = parseOptional(95 /* NewKeyword */) ? 166 /* ConstructorType */ : 165 /* FunctionType */;
+            var kind = parseOptional(96 /* NewKeyword */) ? 167 /* ConstructorType */ : 166 /* FunctionType */;
             var node = createNodeWithJSDoc(kind, pos);
             fillSignature(37 /* EqualsGreaterThanToken */, 4 /* Type */, node);
             return finishNode(node);
@@ -18997,14 +19252,14 @@ var ts;
             return token() === 24 /* DotToken */ ? undefined : node;
         }
         function parseLiteralTypeNode(negative) {
-            var node = createNode(182 /* LiteralType */);
+            var node = createNode(183 /* LiteralType */);
             var unaryMinusExpression;
             if (negative) {
-                unaryMinusExpression = createNode(202 /* PrefixUnaryExpression */);
+                unaryMinusExpression = createNode(203 /* PrefixUnaryExpression */);
                 unaryMinusExpression.operator = 39 /* MinusToken */;
                 nextToken();
             }
-            var expression = token() === 102 /* TrueKeyword */ || token() === 87 /* FalseKeyword */
+            var expression = token() === 103 /* TrueKeyword */ || token() === 88 /* FalseKeyword */
                 ? parseTokenNode()
                 : parseLiteralLikeNode(token());
             if (negative) {
@@ -19017,22 +19272,24 @@ var ts;
         }
         function isStartOfTypeOfImportType() {
             nextToken();
-            return token() === 92 /* ImportKeyword */;
+            return token() === 93 /* ImportKeyword */;
         }
         function parseImportType() {
             sourceFile.flags |= 524288 /* PossiblyContainsDynamicImport */;
-            var node = createNode(183 /* ImportType */);
-            if (parseOptional(104 /* TypeOfKeyword */)) {
+            var node = createNode(184 /* ImportType */);
+            if (parseOptional(105 /* TypeOfKeyword */)) {
                 node.isTypeOf = true;
             }
-            parseExpected(92 /* ImportKeyword */);
+            parseExpected(93 /* ImportKeyword */);
             parseExpected(20 /* OpenParenToken */);
             node.argument = parseType();
             parseExpected(21 /* CloseParenToken */);
             if (parseOptional(24 /* DotToken */)) {
                 node.qualifier = parseEntityName(/*allowReservedWords*/ true, ts.Diagnostics.Type_expected);
             }
-            node.typeArguments = tryParseTypeArguments();
+            if (!scanner.hasPrecedingLineBreak() && reScanLessThanToken() === 28 /* LessThanToken */) {
+                node.typeArguments = parseBracketedList(20 /* TypeArguments */, parseType, 28 /* LessThanToken */, 30 /* GreaterThanToken */);
+            }
             return finishNode(node);
         }
         function nextTokenIsNumericOrBigIntLiteral() {
@@ -19041,25 +19298,25 @@ var ts;
         }
         function parseNonArrayType() {
             switch (token()) {
-                case 120 /* AnyKeyword */:
-                case 143 /* UnknownKeyword */:
-                case 138 /* StringKeyword */:
-                case 135 /* NumberKeyword */:
-                case 146 /* BigIntKeyword */:
-                case 139 /* SymbolKeyword */:
-                case 123 /* BooleanKeyword */:
-                case 141 /* UndefinedKeyword */:
-                case 132 /* NeverKeyword */:
-                case 136 /* ObjectKeyword */:
+                case 121 /* AnyKeyword */:
+                case 144 /* UnknownKeyword */:
+                case 139 /* StringKeyword */:
+                case 136 /* NumberKeyword */:
+                case 147 /* BigIntKeyword */:
+                case 140 /* SymbolKeyword */:
+                case 124 /* BooleanKeyword */:
+                case 142 /* UndefinedKeyword */:
+                case 133 /* NeverKeyword */:
+                case 137 /* ObjectKeyword */:
                     // If these are followed by a dot, then parse these out as a dotted type reference instead.
                     return tryParse(parseKeywordAndNoDot) || parseTypeReference();
                 case 40 /* AsteriskToken */:
                     return parseJSDocAllType(/*postfixEquals*/ false);
-                case 62 /* AsteriskEqualsToken */:
+                case 63 /* AsteriskEqualsToken */:
                     return parseJSDocAllType(/*postfixEquals*/ true);
                 case 56 /* QuestionToken */:
                     return parseJSDocUnknownOrNullableType();
-                case 90 /* FunctionKeyword */:
+                case 91 /* FunctionKeyword */:
                     return parseJSDocFunctionType();
                 case 52 /* ExclamationToken */:
                     return parseJSDocNonNullableType();
@@ -19067,24 +19324,24 @@ var ts;
                 case 10 /* StringLiteral */:
                 case 8 /* NumericLiteral */:
                 case 9 /* BigIntLiteral */:
-                case 102 /* TrueKeyword */:
-                case 87 /* FalseKeyword */:
+                case 103 /* TrueKeyword */:
+                case 88 /* FalseKeyword */:
                     return parseLiteralTypeNode();
                 case 39 /* MinusToken */:
                     return lookAhead(nextTokenIsNumericOrBigIntLiteral) ? parseLiteralTypeNode(/*negative*/ true) : parseTypeReference();
-                case 106 /* VoidKeyword */:
-                case 96 /* NullKeyword */:
+                case 107 /* VoidKeyword */:
+                case 97 /* NullKeyword */:
                     return parseTokenNode();
-                case 100 /* ThisKeyword */: {
+                case 101 /* ThisKeyword */: {
                     var thisKeyword = parseThisTypeNode();
-                    if (token() === 128 /* IsKeyword */ && !scanner.hasPrecedingLineBreak()) {
+                    if (token() === 129 /* IsKeyword */ && !scanner.hasPrecedingLineBreak()) {
                         return parseThisTypePredicate(thisKeyword);
                     }
                     else {
                         return thisKeyword;
                     }
                 }
-                case 104 /* TypeOfKeyword */:
+                case 105 /* TypeOfKeyword */:
                     return lookAhead(isStartOfTypeOfImportType) ? parseImportType() : parseTypeQuery();
                 case 18 /* OpenBraceToken */:
                     return lookAhead(isStartOfMappedType) ? parseMappedType() : parseTypeLiteral();
@@ -19092,7 +19349,7 @@ var ts;
                     return parseTupleType();
                 case 20 /* OpenParenToken */:
                     return parseParenthesizedType();
-                case 92 /* ImportKeyword */:
+                case 93 /* ImportKeyword */:
                     return parseImportType();
                 default:
                     return parseTypeReference();
@@ -19100,41 +19357,41 @@ var ts;
         }
         function isStartOfType(inStartOfParameter) {
             switch (token()) {
-                case 120 /* AnyKeyword */:
-                case 143 /* UnknownKeyword */:
-                case 138 /* StringKeyword */:
-                case 135 /* NumberKeyword */:
-                case 146 /* BigIntKeyword */:
-                case 123 /* BooleanKeyword */:
-                case 133 /* ReadonlyKeyword */:
-                case 139 /* SymbolKeyword */:
-                case 142 /* UniqueKeyword */:
-                case 106 /* VoidKeyword */:
-                case 141 /* UndefinedKeyword */:
-                case 96 /* NullKeyword */:
-                case 100 /* ThisKeyword */:
-                case 104 /* TypeOfKeyword */:
-                case 132 /* NeverKeyword */:
+                case 121 /* AnyKeyword */:
+                case 144 /* UnknownKeyword */:
+                case 139 /* StringKeyword */:
+                case 136 /* NumberKeyword */:
+                case 147 /* BigIntKeyword */:
+                case 124 /* BooleanKeyword */:
+                case 134 /* ReadonlyKeyword */:
+                case 140 /* SymbolKeyword */:
+                case 143 /* UniqueKeyword */:
+                case 107 /* VoidKeyword */:
+                case 142 /* UndefinedKeyword */:
+                case 97 /* NullKeyword */:
+                case 101 /* ThisKeyword */:
+                case 105 /* TypeOfKeyword */:
+                case 133 /* NeverKeyword */:
                 case 18 /* OpenBraceToken */:
                 case 22 /* OpenBracketToken */:
                 case 28 /* LessThanToken */:
                 case 50 /* BarToken */:
                 case 49 /* AmpersandToken */:
-                case 95 /* NewKeyword */:
+                case 96 /* NewKeyword */:
                 case 10 /* StringLiteral */:
                 case 8 /* NumericLiteral */:
                 case 9 /* BigIntLiteral */:
-                case 102 /* TrueKeyword */:
-                case 87 /* FalseKeyword */:
-                case 136 /* ObjectKeyword */:
+                case 103 /* TrueKeyword */:
+                case 88 /* FalseKeyword */:
+                case 137 /* ObjectKeyword */:
                 case 40 /* AsteriskToken */:
                 case 56 /* QuestionToken */:
                 case 52 /* ExclamationToken */:
                 case 25 /* DotDotDotToken */:
-                case 127 /* InferKeyword */:
-                case 92 /* ImportKeyword */:
+                case 128 /* InferKeyword */:
+                case 93 /* ImportKeyword */:
                     return true;
-                case 90 /* FunctionKeyword */:
+                case 91 /* FunctionKeyword */:
                     return !inStartOfParameter;
                 case 39 /* MinusToken */:
                     return !inStartOfParameter && lookAhead(nextTokenIsNumericOrBigIntLiteral);
@@ -19155,26 +19412,26 @@ var ts;
             while (!scanner.hasPrecedingLineBreak()) {
                 switch (token()) {
                     case 52 /* ExclamationToken */:
-                        type = createPostfixType(292 /* JSDocNonNullableType */, type);
+                        type = createPostfixType(293 /* JSDocNonNullableType */, type);
                         break;
                     case 56 /* QuestionToken */:
                         // If not in JSDoc and next token is start of a type we have a conditional type
                         if (!(contextFlags & 2097152 /* JSDoc */) && lookAhead(nextTokenIsStartOfType)) {
                             return type;
                         }
-                        type = createPostfixType(291 /* JSDocNullableType */, type);
+                        type = createPostfixType(292 /* JSDocNullableType */, type);
                         break;
                     case 22 /* OpenBracketToken */:
                         parseExpected(22 /* OpenBracketToken */);
                         if (isStartOfType()) {
-                            var node = createNode(180 /* IndexedAccessType */, type.pos);
+                            var node = createNode(181 /* IndexedAccessType */, type.pos);
                             node.objectType = type;
                             node.indexType = parseType();
                             parseExpected(23 /* CloseBracketToken */);
                             type = finishNode(node);
                         }
                         else {
-                            var node = createNode(169 /* ArrayType */, type.pos);
+                            var node = createNode(170 /* ArrayType */, type.pos);
                             node.elementType = type;
                             parseExpected(23 /* CloseBracketToken */);
                             type = finishNode(node);
@@ -19193,16 +19450,16 @@ var ts;
             return finishNode(postfix);
         }
         function parseTypeOperator(operator) {
-            var node = createNode(179 /* TypeOperator */);
+            var node = createNode(180 /* TypeOperator */);
             parseExpected(operator);
             node.operator = operator;
             node.type = parseTypeOperatorOrHigher();
             return finishNode(node);
         }
         function parseInferType() {
-            var node = createNode(176 /* InferType */);
-            parseExpected(127 /* InferKeyword */);
-            var typeParameter = createNode(150 /* TypeParameter */);
+            var node = createNode(177 /* InferType */);
+            parseExpected(128 /* InferKeyword */);
+            var typeParameter = createNode(151 /* TypeParameter */);
             typeParameter.name = parseIdentifier();
             node.typeParameter = finishNode(typeParameter);
             return finishNode(node);
@@ -19210,34 +19467,35 @@ var ts;
         function parseTypeOperatorOrHigher() {
             var operator = token();
             switch (operator) {
-                case 129 /* KeyOfKeyword */:
-                case 142 /* UniqueKeyword */:
-                case 133 /* ReadonlyKeyword */:
+                case 130 /* KeyOfKeyword */:
+                case 143 /* UniqueKeyword */:
+                case 134 /* ReadonlyKeyword */:
                     return parseTypeOperator(operator);
-                case 127 /* InferKeyword */:
+                case 128 /* InferKeyword */:
                     return parseInferType();
             }
             return parsePostfixTypeOrHigher();
         }
         function parseUnionOrIntersectionType(kind, parseConstituentType, operator) {
-            parseOptional(operator);
+            var start = scanner.getStartPos();
+            var hasLeadingOperator = parseOptional(operator);
             var type = parseConstituentType();
-            if (token() === operator) {
+            if (token() === operator || hasLeadingOperator) {
                 var types = [type];
                 while (parseOptional(operator)) {
                     types.push(parseConstituentType());
                 }
-                var node = createNode(kind, type.pos);
-                node.types = createNodeArray(types, type.pos);
+                var node = createNode(kind, start);
+                node.types = createNodeArray(types, start);
                 type = finishNode(node);
             }
             return type;
         }
         function parseIntersectionTypeOrHigher() {
-            return parseUnionOrIntersectionType(174 /* IntersectionType */, parseTypeOperatorOrHigher, 49 /* AmpersandToken */);
+            return parseUnionOrIntersectionType(175 /* IntersectionType */, parseTypeOperatorOrHigher, 49 /* AmpersandToken */);
         }
         function parseUnionTypeOrHigher() {
-            return parseUnionOrIntersectionType(173 /* UnionType */, parseIntersectionTypeOrHigher, 50 /* BarToken */);
+            return parseUnionOrIntersectionType(174 /* UnionType */, parseIntersectionTypeOrHigher, 50 /* BarToken */);
         }
         function isStartOfFunctionType() {
             if (token() === 28 /* LessThanToken */) {
@@ -19250,7 +19508,7 @@ var ts;
                 // Skip modifiers
                 parseModifiers();
             }
-            if (isIdentifier() || token() === 100 /* ThisKeyword */) {
+            if (isIdentifier() || token() === 101 /* ThisKeyword */) {
                 nextToken();
                 return true;
             }
@@ -19273,7 +19531,7 @@ var ts;
                 // We successfully skipped modifiers (if any) and an identifier or binding pattern,
                 // now see if we have something that indicates a parameter declaration
                 if (token() === 57 /* ColonToken */ || token() === 27 /* CommaToken */ ||
-                    token() === 56 /* QuestionToken */ || token() === 59 /* EqualsToken */) {
+                    token() === 56 /* QuestionToken */ || token() === 60 /* EqualsToken */) {
                     // ( xxx :
                     // ( xxx ,
                     // ( xxx ?
@@ -19294,7 +19552,7 @@ var ts;
             var typePredicateVariable = isIdentifier() && tryParse(parseTypePredicatePrefix);
             var type = parseType();
             if (typePredicateVariable) {
-                var node = createNode(163 /* TypePredicate */, typePredicateVariable.pos);
+                var node = createNode(164 /* TypePredicate */, typePredicateVariable.pos);
                 node.parameterName = typePredicateVariable;
                 node.type = type;
                 return finishNode(node);
@@ -19305,7 +19563,7 @@ var ts;
         }
         function parseTypePredicatePrefix() {
             var id = parseIdentifier();
-            if (token() === 128 /* IsKeyword */ && !scanner.hasPrecedingLineBreak()) {
+            if (token() === 129 /* IsKeyword */ && !scanner.hasPrecedingLineBreak()) {
                 nextToken();
                 return id;
             }
@@ -19316,12 +19574,12 @@ var ts;
             return doOutsideOfContext(20480 /* TypeExcludesFlags */, parseTypeWorker);
         }
         function parseTypeWorker(noConditionalTypes) {
-            if (isStartOfFunctionType() || token() === 95 /* NewKeyword */) {
+            if (isStartOfFunctionType() || token() === 96 /* NewKeyword */) {
                 return parseFunctionOrConstructorType();
             }
             var type = parseUnionTypeOrHigher();
-            if (!noConditionalTypes && !scanner.hasPrecedingLineBreak() && parseOptional(86 /* ExtendsKeyword */)) {
-                var node = createNode(175 /* ConditionalType */, type.pos);
+            if (!noConditionalTypes && !scanner.hasPrecedingLineBreak() && parseOptional(87 /* ExtendsKeyword */)) {
+                var node = createNode(176 /* ConditionalType */, type.pos);
                 node.checkType = type;
                 // The type following 'extends' is not permitted to be another conditional type
                 node.extendsType = parseTypeWorker(/*noConditionalTypes*/ true);
@@ -19339,11 +19597,11 @@ var ts;
         // EXPRESSIONS
         function isStartOfLeftHandSideExpression() {
             switch (token()) {
-                case 100 /* ThisKeyword */:
-                case 98 /* SuperKeyword */:
-                case 96 /* NullKeyword */:
-                case 102 /* TrueKeyword */:
-                case 87 /* FalseKeyword */:
+                case 101 /* ThisKeyword */:
+                case 99 /* SuperKeyword */:
+                case 97 /* NullKeyword */:
+                case 103 /* TrueKeyword */:
+                case 88 /* FalseKeyword */:
                 case 8 /* NumericLiteral */:
                 case 9 /* BigIntLiteral */:
                 case 10 /* StringLiteral */:
@@ -19352,14 +19610,14 @@ var ts;
                 case 20 /* OpenParenToken */:
                 case 22 /* OpenBracketToken */:
                 case 18 /* OpenBraceToken */:
-                case 90 /* FunctionKeyword */:
-                case 76 /* ClassKeyword */:
-                case 95 /* NewKeyword */:
+                case 91 /* FunctionKeyword */:
+                case 77 /* ClassKeyword */:
+                case 96 /* NewKeyword */:
                 case 42 /* SlashToken */:
-                case 64 /* SlashEqualsToken */:
-                case 72 /* Identifier */:
+                case 65 /* SlashEqualsToken */:
+                case 73 /* Identifier */:
                     return true;
-                case 92 /* ImportKeyword */:
+                case 93 /* ImportKeyword */:
                     return lookAhead(nextTokenIsOpenParenOrLessThanOrDot);
                 default:
                     return isIdentifier();
@@ -19374,14 +19632,14 @@ var ts;
                 case 39 /* MinusToken */:
                 case 53 /* TildeToken */:
                 case 52 /* ExclamationToken */:
-                case 81 /* DeleteKeyword */:
-                case 104 /* TypeOfKeyword */:
-                case 106 /* VoidKeyword */:
+                case 82 /* DeleteKeyword */:
+                case 105 /* TypeOfKeyword */:
+                case 107 /* VoidKeyword */:
                 case 44 /* PlusPlusToken */:
                 case 45 /* MinusMinusToken */:
                 case 28 /* LessThanToken */:
-                case 122 /* AwaitKeyword */:
-                case 117 /* YieldKeyword */:
+                case 123 /* AwaitKeyword */:
+                case 118 /* YieldKeyword */:
                     // Yield/await always starts an expression.  Either it is an identifier (in which case
                     // it is definitely an expression).  Or it's a keyword (either because we're in
                     // a generator or async function, or in strict mode (or both)) and it started a yield or await expression.
@@ -19400,8 +19658,8 @@ var ts;
         function isStartOfExpressionStatement() {
             // As per the grammar, none of '{' or 'function' or 'class' can start an expression statement.
             return token() !== 18 /* OpenBraceToken */ &&
-                token() !== 90 /* FunctionKeyword */ &&
-                token() !== 76 /* ClassKeyword */ &&
+                token() !== 91 /* FunctionKeyword */ &&
+                token() !== 77 /* ClassKeyword */ &&
                 token() !== 58 /* AtToken */ &&
                 isStartOfExpression();
         }
@@ -19425,7 +19683,7 @@ var ts;
             return expr;
         }
         function parseInitializer() {
-            return parseOptional(59 /* EqualsToken */) ? parseAssignmentExpressionOrHigher() : undefined;
+            return parseOptional(60 /* EqualsToken */) ? parseAssignmentExpressionOrHigher() : undefined;
         }
         function parseAssignmentExpressionOrHigher() {
             //  AssignmentExpression[in,yield]:
@@ -19470,7 +19728,7 @@ var ts;
             // To avoid a look-ahead, we did not handle the case of an arrow function with a single un-parenthesized
             // parameter ('x => ...') above. We handle it here by checking if the parsed expression was a single
             // identifier and the current token is an arrow.
-            if (expr.kind === 72 /* Identifier */ && token() === 37 /* EqualsGreaterThanToken */) {
+            if (expr.kind === 73 /* Identifier */ && token() === 37 /* EqualsGreaterThanToken */) {
                 return parseSimpleArrowFunctionExpression(expr);
             }
             // Now see if we might be in cases '2' or '3'.
@@ -19486,7 +19744,7 @@ var ts;
             return parseConditionalExpressionRest(expr);
         }
         function isYieldExpression() {
-            if (token() === 117 /* YieldKeyword */) {
+            if (token() === 118 /* YieldKeyword */) {
                 // If we have a 'yield' keyword, and this is a context where yield expressions are
                 // allowed, then definitely parse out a yield expression.
                 if (inYieldContext()) {
@@ -19515,7 +19773,7 @@ var ts;
             return !scanner.hasPrecedingLineBreak() && isIdentifier();
         }
         function parseYieldExpression() {
-            var node = createNode(207 /* YieldExpression */);
+            var node = createNode(208 /* YieldExpression */);
             // YieldExpression[In] :
             //      yield
             //      yield [no LineTerminator here] [Lexical goal InputElementRegExp]AssignmentExpression[?In, Yield]
@@ -19537,13 +19795,13 @@ var ts;
             ts.Debug.assert(token() === 37 /* EqualsGreaterThanToken */, "parseSimpleArrowFunctionExpression should only have been called if we had a =>");
             var node;
             if (asyncModifier) {
-                node = createNode(197 /* ArrowFunction */, asyncModifier.pos);
+                node = createNode(198 /* ArrowFunction */, asyncModifier.pos);
                 node.modifiers = asyncModifier;
             }
             else {
-                node = createNode(197 /* ArrowFunction */, identifier.pos);
+                node = createNode(198 /* ArrowFunction */, identifier.pos);
             }
-            var parameter = createNode(151 /* Parameter */, identifier.pos);
+            var parameter = createNode(152 /* Parameter */, identifier.pos);
             parameter.name = identifier;
             finishNode(parameter);
             node.parameters = createNodeArray([parameter], parameter.pos, parameter.end);
@@ -19583,7 +19841,7 @@ var ts;
         //  Unknown     -> There *might* be a parenthesized arrow function here.
         //                 Speculatively look ahead to be sure, and rollback if not.
         function isParenthesizedArrowFunctionExpression() {
-            if (token() === 20 /* OpenParenToken */ || token() === 28 /* LessThanToken */ || token() === 121 /* AsyncKeyword */) {
+            if (token() === 20 /* OpenParenToken */ || token() === 28 /* LessThanToken */ || token() === 122 /* AsyncKeyword */) {
                 return lookAhead(isParenthesizedArrowFunctionExpressionWorker);
             }
             if (token() === 37 /* EqualsGreaterThanToken */) {
@@ -19596,7 +19854,7 @@ var ts;
             return 0 /* False */;
         }
         function isParenthesizedArrowFunctionExpressionWorker() {
-            if (token() === 121 /* AsyncKeyword */) {
+            if (token() === 122 /* AsyncKeyword */) {
                 nextToken();
                 if (scanner.hasPrecedingLineBreak()) {
                     return 0 /* False */;
@@ -19640,13 +19898,13 @@ var ts;
                 // Check for "(xxx yyy", where xxx is a modifier and yyy is an identifier. This
                 // isn't actually allowed, but we want to treat it as a lambda so we can provide
                 // a good error message.
-                if (ts.isModifierKind(second) && second !== 121 /* AsyncKeyword */ && lookAhead(nextTokenIsIdentifier)) {
+                if (ts.isModifierKind(second) && second !== 122 /* AsyncKeyword */ && lookAhead(nextTokenIsIdentifier)) {
                     return 1 /* True */;
                 }
                 // If we had "(" followed by something that's not an identifier,
                 // then this definitely doesn't look like a lambda.  "this" is not
                 // valid, but we want to parse it and then give a semantic error.
-                if (!isIdentifier() && second !== 100 /* ThisKeyword */) {
+                if (!isIdentifier() && second !== 101 /* ThisKeyword */) {
                     return 0 /* False */;
                 }
                 switch (nextToken()) {
@@ -19657,13 +19915,13 @@ var ts;
                     case 56 /* QuestionToken */:
                         nextToken();
                         // If we have "(a?:" or "(a?," or "(a?=" or "(a?)" then it is definitely a lambda.
-                        if (token() === 57 /* ColonToken */ || token() === 27 /* CommaToken */ || token() === 59 /* EqualsToken */ || token() === 21 /* CloseParenToken */) {
+                        if (token() === 57 /* ColonToken */ || token() === 27 /* CommaToken */ || token() === 60 /* EqualsToken */ || token() === 21 /* CloseParenToken */) {
                             return 1 /* True */;
                         }
                         // Otherwise it is definitely not a lambda.
                         return 0 /* False */;
                     case 27 /* CommaToken */:
-                    case 59 /* EqualsToken */:
+                    case 60 /* EqualsToken */:
                     case 21 /* CloseParenToken */:
                         // If we have "(a," or "(a=" or "(a)" this *could* be an arrow function
                         return 2 /* Unknown */;
@@ -19682,10 +19940,10 @@ var ts;
                 if (sourceFile.languageVariant === 1 /* JSX */) {
                     var isArrowFunctionInJsx = lookAhead(function () {
                         var third = nextToken();
-                        if (third === 86 /* ExtendsKeyword */) {
+                        if (third === 87 /* ExtendsKeyword */) {
                             var fourth = nextToken();
                             switch (fourth) {
-                                case 59 /* EqualsToken */:
+                                case 60 /* EqualsToken */:
                                 case 30 /* GreaterThanToken */:
                                     return false;
                                 default:
@@ -19711,7 +19969,7 @@ var ts;
         }
         function tryParseAsyncSimpleArrowFunctionExpression() {
             // We do a check here so that we won't be doing unnecessarily call to "lookAhead"
-            if (token() === 121 /* AsyncKeyword */) {
+            if (token() === 122 /* AsyncKeyword */) {
                 if (lookAhead(isUnParenthesizedAsyncArrowFunctionWorker) === 1 /* True */) {
                     var asyncModifier = parseModifiersForArrowFunction();
                     var expr = parseBinaryExpressionOrHigher(/*precedence*/ 0);
@@ -19724,7 +19982,7 @@ var ts;
             // AsyncArrowFunctionExpression:
             //      1) async[no LineTerminator here]AsyncArrowBindingIdentifier[?Yield][no LineTerminator here]=>AsyncConciseBody[?In]
             //      2) CoverCallExpressionAndAsyncArrowHead[?Yield, ?Await][no LineTerminator here]=>AsyncConciseBody[?In]
-            if (token() === 121 /* AsyncKeyword */) {
+            if (token() === 122 /* AsyncKeyword */) {
                 nextToken();
                 // If the "async" is followed by "=>" token then it is not a beginning of an async arrow-function
                 // but instead a simple arrow-function which will be parsed inside "parseAssignmentExpressionOrHigher"
@@ -19733,14 +19991,14 @@ var ts;
                 }
                 // Check for un-parenthesized AsyncArrowFunction
                 var expr = parseBinaryExpressionOrHigher(/*precedence*/ 0);
-                if (!scanner.hasPrecedingLineBreak() && expr.kind === 72 /* Identifier */ && token() === 37 /* EqualsGreaterThanToken */) {
+                if (!scanner.hasPrecedingLineBreak() && expr.kind === 73 /* Identifier */ && token() === 37 /* EqualsGreaterThanToken */) {
                     return 1 /* True */;
                 }
             }
             return 0 /* False */;
         }
         function parseParenthesizedArrowFunctionExpressionHead(allowAmbiguity) {
-            var node = createNodeWithJSDoc(197 /* ArrowFunction */);
+            var node = createNodeWithJSDoc(198 /* ArrowFunction */);
             node.modifiers = parseModifiersForArrowFunction();
             var isAsync = ts.hasModifier(node, 256 /* Async */) ? 2 /* Await */ : 0 /* None */;
             // Arrow functions are never generators.
@@ -19759,9 +20017,11 @@ var ts;
             //  - "(x = 10)" is an assignment expression parsed as a signature with a default parameter value.
             //  - "(x,y)" is a comma expression parsed as a signature with two parameters.
             //  - "a ? (b): c" will have "(b):" parsed as a signature with a return type annotation.
+            //  - "a ? (b): function() {}" will too, since function() is a valid JSDoc function type.
             //
             // So we need just a bit of lookahead to ensure that it can only be a signature.
-            if (!allowAmbiguity && token() !== 37 /* EqualsGreaterThanToken */ && token() !== 18 /* OpenBraceToken */) {
+            var hasJSDocFunctionType = node.type && ts.isJSDocFunctionType(node.type);
+            if (!allowAmbiguity && token() !== 37 /* EqualsGreaterThanToken */ && (hasJSDocFunctionType || token() !== 18 /* OpenBraceToken */)) {
                 // Returning undefined here will cause our caller to rewind to where we started from.
                 return undefined;
             }
@@ -19772,8 +20032,8 @@ var ts;
                 return parseFunctionBlock(isAsync ? 2 /* Await */ : 0 /* None */);
             }
             if (token() !== 26 /* SemicolonToken */ &&
-                token() !== 90 /* FunctionKeyword */ &&
-                token() !== 76 /* ClassKeyword */ &&
+                token() !== 91 /* FunctionKeyword */ &&
+                token() !== 77 /* ClassKeyword */ &&
                 isStartOfStatement() &&
                 !isStartOfExpressionStatement()) {
                 // Check if we got a plain statement (i.e. no expression-statements, no function/class expressions/declarations)
@@ -19804,14 +20064,14 @@ var ts;
             }
             // Note: we explicitly 'allowIn' in the whenTrue part of the condition expression, and
             // we do not that for the 'whenFalse' part.
-            var node = createNode(205 /* ConditionalExpression */, leftOperand.pos);
+            var node = createNode(206 /* ConditionalExpression */, leftOperand.pos);
             node.condition = leftOperand;
             node.questionToken = questionToken;
             node.whenTrue = doOutsideOfContext(disallowInAndDecoratorContext, parseAssignmentExpressionOrHigher);
             node.colonToken = parseExpectedToken(57 /* ColonToken */);
             node.whenFalse = ts.nodeIsPresent(node.colonToken)
                 ? parseAssignmentExpressionOrHigher()
-                : createMissingNode(72 /* Identifier */, /*reportAtCurrentPosition*/ false, ts.Diagnostics._0_expected, ts.tokenToString(57 /* ColonToken */));
+                : createMissingNode(73 /* Identifier */, /*reportAtCurrentPosition*/ false, ts.Diagnostics._0_expected, ts.tokenToString(57 /* ColonToken */));
             return finishNode(node);
         }
         function parseBinaryExpressionOrHigher(precedence) {
@@ -19819,7 +20079,7 @@ var ts;
             return parseBinaryExpressionRest(precedence, leftOperand);
         }
         function isInOrOfKeyword(t) {
-            return t === 93 /* InKeyword */ || t === 147 /* OfKeyword */;
+            return t === 94 /* InKeyword */ || t === 148 /* OfKeyword */;
         }
         function parseBinaryExpressionRest(precedence, leftOperand) {
             while (true) {
@@ -19854,10 +20114,10 @@ var ts;
                 if (!consumeCurrentOperator) {
                     break;
                 }
-                if (token() === 93 /* InKeyword */ && inDisallowInContext()) {
+                if (token() === 94 /* InKeyword */ && inDisallowInContext()) {
                     break;
                 }
-                if (token() === 119 /* AsKeyword */) {
+                if (token() === 120 /* AsKeyword */) {
                     // Make sure we *do* perform ASI for constructs like this:
                     //    var x = foo
                     //    as (Bar)
@@ -19878,51 +20138,51 @@ var ts;
             return leftOperand;
         }
         function isBinaryOperator() {
-            if (inDisallowInContext() && token() === 93 /* InKeyword */) {
+            if (inDisallowInContext() && token() === 94 /* InKeyword */) {
                 return false;
             }
             return ts.getBinaryOperatorPrecedence(token()) > 0;
         }
         function makeBinaryExpression(left, operatorToken, right) {
-            var node = createNode(204 /* BinaryExpression */, left.pos);
+            var node = createNode(205 /* BinaryExpression */, left.pos);
             node.left = left;
             node.operatorToken = operatorToken;
             node.right = right;
             return finishNode(node);
         }
         function makeAsExpression(left, right) {
-            var node = createNode(212 /* AsExpression */, left.pos);
+            var node = createNode(213 /* AsExpression */, left.pos);
             node.expression = left;
             node.type = right;
             return finishNode(node);
         }
         function parsePrefixUnaryExpression() {
-            var node = createNode(202 /* PrefixUnaryExpression */);
+            var node = createNode(203 /* PrefixUnaryExpression */);
             node.operator = token();
             nextToken();
             node.operand = parseSimpleUnaryExpression();
             return finishNode(node);
         }
         function parseDeleteExpression() {
-            var node = createNode(198 /* DeleteExpression */);
+            var node = createNode(199 /* DeleteExpression */);
             nextToken();
             node.expression = parseSimpleUnaryExpression();
             return finishNode(node);
         }
         function parseTypeOfExpression() {
-            var node = createNode(199 /* TypeOfExpression */);
+            var node = createNode(200 /* TypeOfExpression */);
             nextToken();
             node.expression = parseSimpleUnaryExpression();
             return finishNode(node);
         }
         function parseVoidExpression() {
-            var node = createNode(200 /* VoidExpression */);
+            var node = createNode(201 /* VoidExpression */);
             nextToken();
             node.expression = parseSimpleUnaryExpression();
             return finishNode(node);
         }
         function isAwaitExpression() {
-            if (token() === 122 /* AwaitKeyword */) {
+            if (token() === 123 /* AwaitKeyword */) {
                 if (inAwaitContext()) {
                     return true;
                 }
@@ -19932,7 +20192,7 @@ var ts;
             return false;
         }
         function parseAwaitExpression() {
-            var node = createNode(201 /* AwaitExpression */);
+            var node = createNode(202 /* AwaitExpression */);
             nextToken();
             node.expression = parseSimpleUnaryExpression();
             return finishNode(node);
@@ -19976,7 +20236,7 @@ var ts;
             if (token() === 41 /* AsteriskAsteriskToken */) {
                 var pos = ts.skipTrivia(sourceText, simpleUnaryExpression.pos);
                 var end = simpleUnaryExpression.end;
-                if (simpleUnaryExpression.kind === 194 /* TypeAssertionExpression */) {
+                if (simpleUnaryExpression.kind === 195 /* TypeAssertionExpression */) {
                     parseErrorAt(pos, end, ts.Diagnostics.A_type_assertion_expression_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Consider_enclosing_the_expression_in_parentheses);
                 }
                 else {
@@ -20006,18 +20266,18 @@ var ts;
                 case 53 /* TildeToken */:
                 case 52 /* ExclamationToken */:
                     return parsePrefixUnaryExpression();
-                case 81 /* DeleteKeyword */:
+                case 82 /* DeleteKeyword */:
                     return parseDeleteExpression();
-                case 104 /* TypeOfKeyword */:
+                case 105 /* TypeOfKeyword */:
                     return parseTypeOfExpression();
-                case 106 /* VoidKeyword */:
+                case 107 /* VoidKeyword */:
                     return parseVoidExpression();
                 case 28 /* LessThanToken */:
                     // This is modified UnaryExpression grammar in TypeScript
                     //  UnaryExpression (modified):
                     //      < type > UnaryExpression
                     return parseTypeAssertion();
-                case 122 /* AwaitKeyword */:
+                case 123 /* AwaitKeyword */:
                     if (isAwaitExpression()) {
                         return parseAwaitExpression();
                     }
@@ -20044,10 +20304,10 @@ var ts;
                 case 39 /* MinusToken */:
                 case 53 /* TildeToken */:
                 case 52 /* ExclamationToken */:
-                case 81 /* DeleteKeyword */:
-                case 104 /* TypeOfKeyword */:
-                case 106 /* VoidKeyword */:
-                case 122 /* AwaitKeyword */:
+                case 82 /* DeleteKeyword */:
+                case 105 /* TypeOfKeyword */:
+                case 107 /* VoidKeyword */:
+                case 123 /* AwaitKeyword */:
                     return false;
                 case 28 /* LessThanToken */:
                     // If we are not in JSX context, we are parsing TypeAssertion which is an UnaryExpression
@@ -20073,7 +20333,7 @@ var ts;
          */
         function parseUpdateExpression() {
             if (token() === 44 /* PlusPlusToken */ || token() === 45 /* MinusMinusToken */) {
-                var node = createNode(202 /* PrefixUnaryExpression */);
+                var node = createNode(203 /* PrefixUnaryExpression */);
                 node.operator = token();
                 nextToken();
                 node.operand = parseLeftHandSideExpressionOrHigher();
@@ -20086,7 +20346,7 @@ var ts;
             var expression = parseLeftHandSideExpressionOrHigher();
             ts.Debug.assert(ts.isLeftHandSideExpression(expression));
             if ((token() === 44 /* PlusPlusToken */ || token() === 45 /* MinusMinusToken */) && !scanner.hasPrecedingLineBreak()) {
-                var node = createNode(203 /* PostfixUnaryExpression */, expression.pos);
+                var node = createNode(204 /* PostfixUnaryExpression */, expression.pos);
                 node.operand = expression;
                 node.operator = token();
                 nextToken();
@@ -20127,7 +20387,7 @@ var ts;
             // 3)we have a MemberExpression which either completes the LeftHandSideExpression,
             // or starts the beginning of the first four CallExpression productions.
             var expression;
-            if (token() === 92 /* ImportKeyword */) {
+            if (token() === 93 /* ImportKeyword */) {
                 if (lookAhead(nextTokenIsOpenParenOrLessThan)) {
                     // We don't want to eagerly consume all import keyword as import call expression so we look ahead to find "("
                     // For example:
@@ -20142,8 +20402,8 @@ var ts;
                     var fullStart = scanner.getStartPos();
                     nextToken(); // advance past the 'import'
                     nextToken(); // advance past the dot
-                    var node = createNode(214 /* MetaProperty */, fullStart);
-                    node.keywordToken = 92 /* ImportKeyword */;
+                    var node = createNode(215 /* MetaProperty */, fullStart);
+                    node.keywordToken = 93 /* ImportKeyword */;
                     node.name = parseIdentifierName();
                     expression = finishNode(node);
                     sourceFile.flags |= 1048576 /* PossiblyContainsImportMeta */;
@@ -20153,7 +20413,7 @@ var ts;
                 }
             }
             else {
-                expression = token() === 98 /* SuperKeyword */ ? parseSuperExpression() : parseMemberExpressionOrHigher();
+                expression = token() === 99 /* SuperKeyword */ ? parseSuperExpression() : parseMemberExpressionOrHigher();
             }
             // Now, we *may* be complete.  However, we might have consumed the start of a
             // CallExpression.  As such, we need to consume the rest of it here to be complete.
@@ -20212,12 +20472,19 @@ var ts;
         }
         function parseSuperExpression() {
             var expression = parseTokenNode();
+            if (token() === 28 /* LessThanToken */) {
+                var startPos = getNodePos();
+                var typeArguments = tryParse(parseTypeArgumentsInExpression);
+                if (typeArguments !== undefined) {
+                    parseErrorAt(startPos, getNodePos(), ts.Diagnostics.super_may_not_use_type_arguments);
+                }
+            }
             if (token() === 20 /* OpenParenToken */ || token() === 24 /* DotToken */ || token() === 22 /* OpenBracketToken */) {
                 return expression;
             }
             // If we have seen "super" it must be followed by '(' or '.'.
             // If it wasn't then just try to parse out a '.' and report an error.
-            var node = createNode(189 /* PropertyAccessExpression */, expression.pos);
+            var node = createNode(190 /* PropertyAccessExpression */, expression.pos);
             node.expression = expression;
             parseExpectedToken(24 /* DotToken */, ts.Diagnostics.super_must_be_followed_by_an_argument_list_or_member_access);
             node.name = parseRightSideOfDot(/*allowIdentifierNames*/ true);
@@ -20226,8 +20493,8 @@ var ts;
         function parseJsxElementOrSelfClosingElementOrFragment(inExpressionContext) {
             var opening = parseJsxOpeningOrSelfClosingElementOrOpeningFragment(inExpressionContext);
             var result;
-            if (opening.kind === 262 /* JsxOpeningElement */) {
-                var node = createNode(260 /* JsxElement */, opening.pos);
+            if (opening.kind === 263 /* JsxOpeningElement */) {
+                var node = createNode(261 /* JsxElement */, opening.pos);
                 node.openingElement = opening;
                 node.children = parseJsxChildren(node.openingElement);
                 node.closingElement = parseJsxClosingElement(inExpressionContext);
@@ -20236,15 +20503,15 @@ var ts;
                 }
                 result = finishNode(node);
             }
-            else if (opening.kind === 265 /* JsxOpeningFragment */) {
-                var node = createNode(264 /* JsxFragment */, opening.pos);
+            else if (opening.kind === 266 /* JsxOpeningFragment */) {
+                var node = createNode(265 /* JsxFragment */, opening.pos);
                 node.openingFragment = opening;
                 node.children = parseJsxChildren(node.openingFragment);
                 node.closingFragment = parseJsxClosingFragment(inExpressionContext);
                 result = finishNode(node);
             }
             else {
-                ts.Debug.assert(opening.kind === 261 /* JsxSelfClosingElement */);
+                ts.Debug.assert(opening.kind === 262 /* JsxSelfClosingElement */);
                 // Nothing else to do for self-closing elements
                 result = opening;
             }
@@ -20259,11 +20526,11 @@ var ts;
                 var invalidElement = tryParse(function () { return parseJsxElementOrSelfClosingElementOrFragment(/*inExpressionContext*/ true); });
                 if (invalidElement) {
                     parseErrorAtCurrentToken(ts.Diagnostics.JSX_expressions_must_have_one_parent_element);
-                    var badNode = createNode(204 /* BinaryExpression */, result.pos);
+                    var badNode = createNode(205 /* BinaryExpression */, result.pos);
                     badNode.end = invalidElement.end;
                     badNode.left = result;
                     badNode.right = invalidElement;
-                    badNode.operatorToken = createMissingNode(27 /* CommaToken */, /*reportAtCurrentPosition*/ false, /*diagnosticMessage*/ undefined); // TODO: GH#18217
+                    badNode.operatorToken = createMissingNode(27 /* CommaToken */, /*reportAtCurrentPosition*/ false);
                     badNode.operatorToken.pos = badNode.operatorToken.end = badNode.right.pos;
                     return badNode;
                 }
@@ -20272,7 +20539,8 @@ var ts;
         }
         function parseJsxText() {
             var node = createNode(11 /* JsxText */);
-            node.containsOnlyWhiteSpaces = currentToken === 12 /* JsxTextAllWhiteSpaces */;
+            node.text = scanner.getTokenValue();
+            node.containsOnlyTriviaWhiteSpaces = currentToken === 12 /* JsxTextAllWhiteSpaces */;
             currentToken = scanner.scanJsxToken();
             return finishNode(node);
         }
@@ -20317,7 +20585,7 @@ var ts;
             return createNodeArray(list, listPos);
         }
         function parseJsxAttributes() {
-            var jsxAttributes = createNode(268 /* JsxAttributes */);
+            var jsxAttributes = createNode(269 /* JsxAttributes */);
             jsxAttributes.properties = parseList(13 /* JsxAttributes */, parseJsxAttribute);
             return finishNode(jsxAttributes);
         }
@@ -20326,7 +20594,7 @@ var ts;
             parseExpected(28 /* LessThanToken */);
             if (token() === 30 /* GreaterThanToken */) {
                 // See below for explanation of scanJsxText
-                var node_1 = createNode(265 /* JsxOpeningFragment */, fullStart);
+                var node_1 = createNode(266 /* JsxOpeningFragment */, fullStart);
                 scanJsxText();
                 return finishNode(node_1);
             }
@@ -20338,7 +20606,7 @@ var ts;
                 // Closing tag, so scan the immediately-following text with the JSX scanning instead
                 // of regular scanning to avoid treating illegal characters (e.g. '#') as immediate
                 // scanning errors
-                node = createNode(262 /* JsxOpeningElement */, fullStart);
+                node = createNode(263 /* JsxOpeningElement */, fullStart);
                 scanJsxText();
             }
             else {
@@ -20350,7 +20618,7 @@ var ts;
                     parseExpected(30 /* GreaterThanToken */, /*diagnostic*/ undefined, /*shouldAdvance*/ false);
                     scanJsxText();
                 }
-                node = createNode(261 /* JsxSelfClosingElement */, fullStart);
+                node = createNode(262 /* JsxSelfClosingElement */, fullStart);
             }
             node.tagName = tagName;
             node.typeArguments = typeArguments;
@@ -20364,10 +20632,10 @@ var ts;
             //      primaryExpression in the form of an identifier and "this" keyword
             // We can't just simply use parseLeftHandSideExpressionOrHigher because then we will start consider class,function etc as a keyword
             // We only want to consider "this" as a primaryExpression
-            var expression = token() === 100 /* ThisKeyword */ ?
+            var expression = token() === 101 /* ThisKeyword */ ?
                 parseTokenNode() : parseIdentifierName();
             while (parseOptional(24 /* DotToken */)) {
-                var propertyAccess = createNode(189 /* PropertyAccessExpression */, expression.pos);
+                var propertyAccess = createNode(190 /* PropertyAccessExpression */, expression.pos);
                 propertyAccess.expression = expression;
                 propertyAccess.name = parseRightSideOfDot(/*allowIdentifierNames*/ true);
                 expression = finishNode(propertyAccess);
@@ -20375,20 +20643,24 @@ var ts;
             return expression;
         }
         function parseJsxExpression(inExpressionContext) {
-            var node = createNode(270 /* JsxExpression */);
+            var node = createNode(271 /* JsxExpression */);
             if (!parseExpected(18 /* OpenBraceToken */)) {
                 return undefined;
             }
             if (token() !== 19 /* CloseBraceToken */) {
                 node.dotDotDotToken = parseOptionalToken(25 /* DotDotDotToken */);
-                node.expression = parseAssignmentExpressionOrHigher();
+                // Only an AssignmentExpression is valid here per the JSX spec,
+                // but we can unambiguously parse a comma sequence and provide
+                // a better error message in grammar checking.
+                node.expression = parseExpression();
             }
             if (inExpressionContext) {
                 parseExpected(19 /* CloseBraceToken */);
             }
             else {
-                parseExpected(19 /* CloseBraceToken */, /*message*/ undefined, /*shouldAdvance*/ false);
-                scanJsxText();
+                if (parseExpected(19 /* CloseBraceToken */, /*message*/ undefined, /*shouldAdvance*/ false)) {
+                    scanJsxText();
+                }
             }
             return finishNode(node);
         }
@@ -20397,9 +20669,9 @@ var ts;
                 return parseJsxSpreadAttribute();
             }
             scanJsxIdentifier();
-            var node = createNode(267 /* JsxAttribute */);
+            var node = createNode(268 /* JsxAttribute */);
             node.name = parseIdentifierName();
-            if (token() === 59 /* EqualsToken */) {
+            if (token() === 60 /* EqualsToken */) {
                 switch (scanJsxAttributeValue()) {
                     case 10 /* StringLiteral */:
                         node.initializer = parseLiteralNode();
@@ -20412,7 +20684,7 @@ var ts;
             return finishNode(node);
         }
         function parseJsxSpreadAttribute() {
-            var node = createNode(269 /* JsxSpreadAttribute */);
+            var node = createNode(270 /* JsxSpreadAttribute */);
             parseExpected(18 /* OpenBraceToken */);
             parseExpected(25 /* DotDotDotToken */);
             node.expression = parseExpression();
@@ -20420,7 +20692,7 @@ var ts;
             return finishNode(node);
         }
         function parseJsxClosingElement(inExpressionContext) {
-            var node = createNode(263 /* JsxClosingElement */);
+            var node = createNode(264 /* JsxClosingElement */);
             parseExpected(29 /* LessThanSlashToken */);
             node.tagName = parseJsxElementName();
             if (inExpressionContext) {
@@ -20433,7 +20705,7 @@ var ts;
             return finishNode(node);
         }
         function parseJsxClosingFragment(inExpressionContext) {
-            var node = createNode(266 /* JsxClosingFragment */);
+            var node = createNode(267 /* JsxClosingFragment */);
             parseExpected(29 /* LessThanSlashToken */);
             if (ts.tokenIsIdentifierOrKeyword(token())) {
                 parseErrorAtRange(parseJsxElementName(), ts.Diagnostics.Expected_corresponding_closing_tag_for_JSX_fragment);
@@ -20448,7 +20720,7 @@ var ts;
             return finishNode(node);
         }
         function parseTypeAssertion() {
-            var node = createNode(194 /* TypeAssertionExpression */);
+            var node = createNode(195 /* TypeAssertionExpression */);
             parseExpected(28 /* LessThanToken */);
             node.type = parseType();
             parseExpected(30 /* GreaterThanToken */);
@@ -20459,7 +20731,7 @@ var ts;
             while (true) {
                 var dotToken = parseOptionalToken(24 /* DotToken */);
                 if (dotToken) {
-                    var propertyAccess = createNode(189 /* PropertyAccessExpression */, expression.pos);
+                    var propertyAccess = createNode(190 /* PropertyAccessExpression */, expression.pos);
                     propertyAccess.expression = expression;
                     propertyAccess.name = parseRightSideOfDot(/*allowIdentifierNames*/ true);
                     expression = finishNode(propertyAccess);
@@ -20467,17 +20739,17 @@ var ts;
                 }
                 if (token() === 52 /* ExclamationToken */ && !scanner.hasPrecedingLineBreak()) {
                     nextToken();
-                    var nonNullExpression = createNode(213 /* NonNullExpression */, expression.pos);
+                    var nonNullExpression = createNode(214 /* NonNullExpression */, expression.pos);
                     nonNullExpression.expression = expression;
                     expression = finishNode(nonNullExpression);
                     continue;
                 }
                 // when in the [Decorator] context, we do not parse ElementAccess as it could be part of a ComputedPropertyName
                 if (!inDecoratorContext() && parseOptional(22 /* OpenBracketToken */)) {
-                    var indexedAccess = createNode(190 /* ElementAccessExpression */, expression.pos);
+                    var indexedAccess = createNode(191 /* ElementAccessExpression */, expression.pos);
                     indexedAccess.expression = expression;
                     if (token() === 23 /* CloseBracketToken */) {
-                        indexedAccess.argumentExpression = createMissingNode(72 /* Identifier */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.An_element_access_expression_should_take_an_argument);
+                        indexedAccess.argumentExpression = createMissingNode(73 /* Identifier */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.An_element_access_expression_should_take_an_argument);
                     }
                     else {
                         var argument = allowInAnd(parseExpression);
@@ -20501,7 +20773,7 @@ var ts;
             return token() === 14 /* NoSubstitutionTemplateLiteral */ || token() === 15 /* TemplateHead */;
         }
         function parseTaggedTemplateRest(tag, typeArguments) {
-            var tagExpression = createNode(193 /* TaggedTemplateExpression */, tag.pos);
+            var tagExpression = createNode(194 /* TaggedTemplateExpression */, tag.pos);
             tagExpression.tag = tag;
             tagExpression.typeArguments = typeArguments;
             tagExpression.template = token() === 14 /* NoSubstitutionTemplateLiteral */
@@ -20526,7 +20798,7 @@ var ts;
                         expression = parseTaggedTemplateRest(expression, typeArguments);
                         continue;
                     }
-                    var callExpr = createNode(191 /* CallExpression */, expression.pos);
+                    var callExpr = createNode(192 /* CallExpression */, expression.pos);
                     callExpr.expression = expression;
                     callExpr.typeArguments = typeArguments;
                     callExpr.arguments = parseArgumentList();
@@ -20534,7 +20806,7 @@ var ts;
                     continue;
                 }
                 else if (token() === 20 /* OpenParenToken */) {
-                    var callExpr = createNode(191 /* CallExpression */, expression.pos);
+                    var callExpr = createNode(192 /* CallExpression */, expression.pos);
                     callExpr.expression = expression;
                     callExpr.arguments = parseArgumentList();
                     expression = finishNode(callExpr);
@@ -20610,11 +20882,11 @@ var ts;
                 case 10 /* StringLiteral */:
                 case 14 /* NoSubstitutionTemplateLiteral */:
                     return parseLiteralNode();
-                case 100 /* ThisKeyword */:
-                case 98 /* SuperKeyword */:
-                case 96 /* NullKeyword */:
-                case 102 /* TrueKeyword */:
-                case 87 /* FalseKeyword */:
+                case 101 /* ThisKeyword */:
+                case 99 /* SuperKeyword */:
+                case 97 /* NullKeyword */:
+                case 103 /* TrueKeyword */:
+                case 88 /* FalseKeyword */:
                     return parseTokenNode();
                 case 20 /* OpenParenToken */:
                     return parseParenthesizedExpression();
@@ -20622,7 +20894,7 @@ var ts;
                     return parseArrayLiteralExpression();
                 case 18 /* OpenBraceToken */:
                     return parseObjectLiteralExpression();
-                case 121 /* AsyncKeyword */:
+                case 122 /* AsyncKeyword */:
                     // Async arrow functions are parsed earlier in parseAssignmentExpressionOrHigher.
                     // If we encounter `async [no LineTerminator here] function` then this is an async
                     // function; otherwise, its an identifier.
@@ -20630,14 +20902,14 @@ var ts;
                         break;
                     }
                     return parseFunctionExpression();
-                case 76 /* ClassKeyword */:
+                case 77 /* ClassKeyword */:
                     return parseClassExpression();
-                case 90 /* FunctionKeyword */:
+                case 91 /* FunctionKeyword */:
                     return parseFunctionExpression();
-                case 95 /* NewKeyword */:
+                case 96 /* NewKeyword */:
                     return parseNewExpressionOrNewDotTarget();
                 case 42 /* SlashToken */:
-                case 64 /* SlashEqualsToken */:
+                case 65 /* SlashEqualsToken */:
                     if (reScanSlashToken() === 13 /* RegularExpressionLiteral */) {
                         return parseLiteralNode();
                     }
@@ -20648,28 +20920,28 @@ var ts;
             return parseIdentifier(ts.Diagnostics.Expression_expected);
         }
         function parseParenthesizedExpression() {
-            var node = createNodeWithJSDoc(195 /* ParenthesizedExpression */);
+            var node = createNodeWithJSDoc(196 /* ParenthesizedExpression */);
             parseExpected(20 /* OpenParenToken */);
             node.expression = allowInAnd(parseExpression);
             parseExpected(21 /* CloseParenToken */);
             return finishNode(node);
         }
         function parseSpreadElement() {
-            var node = createNode(208 /* SpreadElement */);
+            var node = createNode(209 /* SpreadElement */);
             parseExpected(25 /* DotDotDotToken */);
             node.expression = parseAssignmentExpressionOrHigher();
             return finishNode(node);
         }
         function parseArgumentOrArrayLiteralElement() {
             return token() === 25 /* DotDotDotToken */ ? parseSpreadElement() :
-                token() === 27 /* CommaToken */ ? createNode(210 /* OmittedExpression */) :
+                token() === 27 /* CommaToken */ ? createNode(211 /* OmittedExpression */) :
                     parseAssignmentExpressionOrHigher();
         }
         function parseArgumentExpression() {
             return doOutsideOfContext(disallowInAndDecoratorContext, parseArgumentOrArrayLiteralElement);
         }
         function parseArrayLiteralExpression() {
-            var node = createNode(187 /* ArrayLiteralExpression */);
+            var node = createNode(188 /* ArrayLiteralExpression */);
             parseExpected(22 /* OpenBracketToken */);
             if (scanner.hasPrecedingLineBreak()) {
                 node.multiLine = true;
@@ -20681,17 +20953,17 @@ var ts;
         function parseObjectLiteralElement() {
             var node = createNodeWithJSDoc(0 /* Unknown */);
             if (parseOptionalToken(25 /* DotDotDotToken */)) {
-                node.kind = 277 /* SpreadAssignment */;
+                node.kind = 278 /* SpreadAssignment */;
                 node.expression = parseAssignmentExpressionOrHigher();
                 return finishNode(node);
             }
             node.decorators = parseDecorators();
             node.modifiers = parseModifiers();
-            if (parseContextualModifier(126 /* GetKeyword */)) {
-                return parseAccessorDeclaration(node, 158 /* GetAccessor */);
+            if (parseContextualModifier(127 /* GetKeyword */)) {
+                return parseAccessorDeclaration(node, 159 /* GetAccessor */);
             }
-            if (parseContextualModifier(137 /* SetKeyword */)) {
-                return parseAccessorDeclaration(node, 159 /* SetAccessor */);
+            if (parseContextualModifier(138 /* SetKeyword */)) {
+                return parseAccessorDeclaration(node, 160 /* SetAccessor */);
             }
             var asteriskToken = parseOptionalToken(40 /* AsteriskToken */);
             var tokenIsIdentifier = isIdentifier();
@@ -20709,22 +20981,22 @@ var ts;
             // this is necessary because ObjectLiteral productions are also used to cover grammar for ObjectAssignmentPattern
             var isShorthandPropertyAssignment = tokenIsIdentifier && (token() !== 57 /* ColonToken */);
             if (isShorthandPropertyAssignment) {
-                node.kind = 276 /* ShorthandPropertyAssignment */;
-                var equalsToken = parseOptionalToken(59 /* EqualsToken */);
+                node.kind = 277 /* ShorthandPropertyAssignment */;
+                var equalsToken = parseOptionalToken(60 /* EqualsToken */);
                 if (equalsToken) {
                     node.equalsToken = equalsToken;
                     node.objectAssignmentInitializer = allowInAnd(parseAssignmentExpressionOrHigher);
                 }
             }
             else {
-                node.kind = 275 /* PropertyAssignment */;
+                node.kind = 276 /* PropertyAssignment */;
                 parseExpected(57 /* ColonToken */);
                 node.initializer = allowInAnd(parseAssignmentExpressionOrHigher);
             }
             return finishNode(node);
         }
         function parseObjectLiteralExpression() {
-            var node = createNode(188 /* ObjectLiteralExpression */);
+            var node = createNode(189 /* ObjectLiteralExpression */);
             parseExpected(18 /* OpenBraceToken */);
             if (scanner.hasPrecedingLineBreak()) {
                 node.multiLine = true;
@@ -20743,9 +21015,9 @@ var ts;
             if (saveDecoratorContext) {
                 setDecoratorContext(/*val*/ false);
             }
-            var node = createNodeWithJSDoc(196 /* FunctionExpression */);
+            var node = createNodeWithJSDoc(197 /* FunctionExpression */);
             node.modifiers = parseModifiers();
-            parseExpected(90 /* FunctionKeyword */);
+            parseExpected(91 /* FunctionKeyword */);
             node.asteriskToken = parseOptionalToken(40 /* AsteriskToken */);
             var isGenerator = node.asteriskToken ? 1 /* Yield */ : 0 /* None */;
             var isAsync = ts.hasModifier(node, 256 /* Async */) ? 2 /* Await */ : 0 /* None */;
@@ -20766,10 +21038,10 @@ var ts;
         }
         function parseNewExpressionOrNewDotTarget() {
             var fullStart = scanner.getStartPos();
-            parseExpected(95 /* NewKeyword */);
+            parseExpected(96 /* NewKeyword */);
             if (parseOptional(24 /* DotToken */)) {
-                var node_2 = createNode(214 /* MetaProperty */, fullStart);
-                node_2.keywordToken = 95 /* NewKeyword */;
+                var node_2 = createNode(215 /* MetaProperty */, fullStart);
+                node_2.keywordToken = 96 /* NewKeyword */;
                 node_2.name = parseIdentifierName();
                 return finishNode(node_2);
             }
@@ -20785,7 +21057,7 @@ var ts;
                 }
                 break;
             }
-            var node = createNode(192 /* NewExpression */, fullStart);
+            var node = createNode(193 /* NewExpression */, fullStart);
             node.expression = expression;
             node.typeArguments = typeArguments;
             if (node.typeArguments || token() === 20 /* OpenParenToken */) {
@@ -20795,7 +21067,7 @@ var ts;
         }
         // STATEMENTS
         function parseBlock(ignoreMissingOpenBrace, diagnosticMessage) {
-            var node = createNode(218 /* Block */);
+            var node = createNode(219 /* Block */);
             if (parseExpected(18 /* OpenBraceToken */, diagnosticMessage) || ignoreMissingOpenBrace) {
                 if (scanner.hasPrecedingLineBreak()) {
                     node.multiLine = true;
@@ -20828,25 +21100,25 @@ var ts;
             return block;
         }
         function parseEmptyStatement() {
-            var node = createNode(220 /* EmptyStatement */);
+            var node = createNode(221 /* EmptyStatement */);
             parseExpected(26 /* SemicolonToken */);
             return finishNode(node);
         }
         function parseIfStatement() {
-            var node = createNode(222 /* IfStatement */);
-            parseExpected(91 /* IfKeyword */);
+            var node = createNode(223 /* IfStatement */);
+            parseExpected(92 /* IfKeyword */);
             parseExpected(20 /* OpenParenToken */);
             node.expression = allowInAnd(parseExpression);
             parseExpected(21 /* CloseParenToken */);
             node.thenStatement = parseStatement();
-            node.elseStatement = parseOptional(83 /* ElseKeyword */) ? parseStatement() : undefined;
+            node.elseStatement = parseOptional(84 /* ElseKeyword */) ? parseStatement() : undefined;
             return finishNode(node);
         }
         function parseDoStatement() {
-            var node = createNode(223 /* DoStatement */);
-            parseExpected(82 /* DoKeyword */);
+            var node = createNode(224 /* DoStatement */);
+            parseExpected(83 /* DoKeyword */);
             node.statement = parseStatement();
-            parseExpected(107 /* WhileKeyword */);
+            parseExpected(108 /* WhileKeyword */);
             parseExpected(20 /* OpenParenToken */);
             node.expression = allowInAnd(parseExpression);
             parseExpected(21 /* CloseParenToken */);
@@ -20858,8 +21130,8 @@ var ts;
             return finishNode(node);
         }
         function parseWhileStatement() {
-            var node = createNode(224 /* WhileStatement */);
-            parseExpected(107 /* WhileKeyword */);
+            var node = createNode(225 /* WhileStatement */);
+            parseExpected(108 /* WhileKeyword */);
             parseExpected(20 /* OpenParenToken */);
             node.expression = allowInAnd(parseExpression);
             parseExpected(21 /* CloseParenToken */);
@@ -20868,12 +21140,12 @@ var ts;
         }
         function parseForOrForInOrForOfStatement() {
             var pos = getNodePos();
-            parseExpected(89 /* ForKeyword */);
-            var awaitToken = parseOptionalToken(122 /* AwaitKeyword */);
+            parseExpected(90 /* ForKeyword */);
+            var awaitToken = parseOptionalToken(123 /* AwaitKeyword */);
             parseExpected(20 /* OpenParenToken */);
             var initializer;
             if (token() !== 26 /* SemicolonToken */) {
-                if (token() === 105 /* VarKeyword */ || token() === 111 /* LetKeyword */ || token() === 77 /* ConstKeyword */) {
+                if (token() === 106 /* VarKeyword */ || token() === 112 /* LetKeyword */ || token() === 78 /* ConstKeyword */) {
                     initializer = parseVariableDeclarationList(/*inForStatementInitializer*/ true);
                 }
                 else {
@@ -20881,23 +21153,23 @@ var ts;
                 }
             }
             var forOrForInOrForOfStatement;
-            if (awaitToken ? parseExpected(147 /* OfKeyword */) : parseOptional(147 /* OfKeyword */)) {
-                var forOfStatement = createNode(227 /* ForOfStatement */, pos);
+            if (awaitToken ? parseExpected(148 /* OfKeyword */) : parseOptional(148 /* OfKeyword */)) {
+                var forOfStatement = createNode(228 /* ForOfStatement */, pos);
                 forOfStatement.awaitModifier = awaitToken;
                 forOfStatement.initializer = initializer;
                 forOfStatement.expression = allowInAnd(parseAssignmentExpressionOrHigher);
                 parseExpected(21 /* CloseParenToken */);
                 forOrForInOrForOfStatement = forOfStatement;
             }
-            else if (parseOptional(93 /* InKeyword */)) {
-                var forInStatement = createNode(226 /* ForInStatement */, pos);
+            else if (parseOptional(94 /* InKeyword */)) {
+                var forInStatement = createNode(227 /* ForInStatement */, pos);
                 forInStatement.initializer = initializer;
                 forInStatement.expression = allowInAnd(parseExpression);
                 parseExpected(21 /* CloseParenToken */);
                 forOrForInOrForOfStatement = forInStatement;
             }
             else {
-                var forStatement = createNode(225 /* ForStatement */, pos);
+                var forStatement = createNode(226 /* ForStatement */, pos);
                 forStatement.initializer = initializer;
                 parseExpected(26 /* SemicolonToken */);
                 if (token() !== 26 /* SemicolonToken */ && token() !== 21 /* CloseParenToken */) {
@@ -20915,7 +21187,7 @@ var ts;
         }
         function parseBreakOrContinueStatement(kind) {
             var node = createNode(kind);
-            parseExpected(kind === 229 /* BreakStatement */ ? 73 /* BreakKeyword */ : 78 /* ContinueKeyword */);
+            parseExpected(kind === 230 /* BreakStatement */ ? 74 /* BreakKeyword */ : 79 /* ContinueKeyword */);
             if (!canParseSemicolon()) {
                 node.label = parseIdentifier();
             }
@@ -20923,8 +21195,8 @@ var ts;
             return finishNode(node);
         }
         function parseReturnStatement() {
-            var node = createNode(230 /* ReturnStatement */);
-            parseExpected(97 /* ReturnKeyword */);
+            var node = createNode(231 /* ReturnStatement */);
+            parseExpected(98 /* ReturnKeyword */);
             if (!canParseSemicolon()) {
                 node.expression = allowInAnd(parseExpression);
             }
@@ -20932,8 +21204,8 @@ var ts;
             return finishNode(node);
         }
         function parseWithStatement() {
-            var node = createNode(231 /* WithStatement */);
-            parseExpected(108 /* WithKeyword */);
+            var node = createNode(232 /* WithStatement */);
+            parseExpected(109 /* WithKeyword */);
             parseExpected(20 /* OpenParenToken */);
             node.expression = allowInAnd(parseExpression);
             parseExpected(21 /* CloseParenToken */);
@@ -20941,30 +21213,30 @@ var ts;
             return finishNode(node);
         }
         function parseCaseClause() {
-            var node = createNode(271 /* CaseClause */);
-            parseExpected(74 /* CaseKeyword */);
+            var node = createNode(272 /* CaseClause */);
+            parseExpected(75 /* CaseKeyword */);
             node.expression = allowInAnd(parseExpression);
             parseExpected(57 /* ColonToken */);
             node.statements = parseList(3 /* SwitchClauseStatements */, parseStatement);
             return finishNode(node);
         }
         function parseDefaultClause() {
-            var node = createNode(272 /* DefaultClause */);
-            parseExpected(80 /* DefaultKeyword */);
+            var node = createNode(273 /* DefaultClause */);
+            parseExpected(81 /* DefaultKeyword */);
             parseExpected(57 /* ColonToken */);
             node.statements = parseList(3 /* SwitchClauseStatements */, parseStatement);
             return finishNode(node);
         }
         function parseCaseOrDefaultClause() {
-            return token() === 74 /* CaseKeyword */ ? parseCaseClause() : parseDefaultClause();
+            return token() === 75 /* CaseKeyword */ ? parseCaseClause() : parseDefaultClause();
         }
         function parseSwitchStatement() {
-            var node = createNode(232 /* SwitchStatement */);
-            parseExpected(99 /* SwitchKeyword */);
+            var node = createNode(233 /* SwitchStatement */);
+            parseExpected(100 /* SwitchKeyword */);
             parseExpected(20 /* OpenParenToken */);
             node.expression = allowInAnd(parseExpression);
             parseExpected(21 /* CloseParenToken */);
-            var caseBlock = createNode(246 /* CaseBlock */);
+            var caseBlock = createNode(247 /* CaseBlock */);
             parseExpected(18 /* OpenBraceToken */);
             caseBlock.clauses = parseList(2 /* SwitchClauses */, parseCaseOrDefaultClause);
             parseExpected(19 /* CloseBraceToken */);
@@ -20979,29 +21251,29 @@ var ts;
             // directly as that might consume an expression on the following line.
             // We just return 'undefined' in that case.  The actual error will be reported in the
             // grammar walker.
-            var node = createNode(234 /* ThrowStatement */);
-            parseExpected(101 /* ThrowKeyword */);
+            var node = createNode(235 /* ThrowStatement */);
+            parseExpected(102 /* ThrowKeyword */);
             node.expression = scanner.hasPrecedingLineBreak() ? undefined : allowInAnd(parseExpression);
             parseSemicolon();
             return finishNode(node);
         }
         // TODO: Review for error recovery
         function parseTryStatement() {
-            var node = createNode(235 /* TryStatement */);
-            parseExpected(103 /* TryKeyword */);
+            var node = createNode(236 /* TryStatement */);
+            parseExpected(104 /* TryKeyword */);
             node.tryBlock = parseBlock(/*ignoreMissingOpenBrace*/ false);
-            node.catchClause = token() === 75 /* CatchKeyword */ ? parseCatchClause() : undefined;
+            node.catchClause = token() === 76 /* CatchKeyword */ ? parseCatchClause() : undefined;
             // If we don't have a catch clause, then we must have a finally clause.  Try to parse
             // one out no matter what.
-            if (!node.catchClause || token() === 88 /* FinallyKeyword */) {
-                parseExpected(88 /* FinallyKeyword */);
+            if (!node.catchClause || token() === 89 /* FinallyKeyword */) {
+                parseExpected(89 /* FinallyKeyword */);
                 node.finallyBlock = parseBlock(/*ignoreMissingOpenBrace*/ false);
             }
             return finishNode(node);
         }
         function parseCatchClause() {
-            var result = createNode(274 /* CatchClause */);
-            parseExpected(75 /* CatchKeyword */);
+            var result = createNode(275 /* CatchClause */);
+            parseExpected(76 /* CatchKeyword */);
             if (parseOptional(20 /* OpenParenToken */)) {
                 result.variableDeclaration = parseVariableDeclaration();
                 parseExpected(21 /* CloseParenToken */);
@@ -21014,8 +21286,8 @@ var ts;
             return finishNode(result);
         }
         function parseDebuggerStatement() {
-            var node = createNode(236 /* DebuggerStatement */);
-            parseExpected(79 /* DebuggerKeyword */);
+            var node = createNode(237 /* DebuggerStatement */);
+            parseExpected(80 /* DebuggerKeyword */);
             parseSemicolon();
             return finishNode(node);
         }
@@ -21025,13 +21297,13 @@ var ts;
             // a colon.
             var node = createNodeWithJSDoc(0 /* Unknown */);
             var expression = allowInAnd(parseExpression);
-            if (expression.kind === 72 /* Identifier */ && parseOptional(57 /* ColonToken */)) {
-                node.kind = 233 /* LabeledStatement */;
+            if (expression.kind === 73 /* Identifier */ && parseOptional(57 /* ColonToken */)) {
+                node.kind = 234 /* LabeledStatement */;
                 node.label = expression;
                 node.statement = parseStatement();
             }
             else {
-                node.kind = 221 /* ExpressionStatement */;
+                node.kind = 222 /* ExpressionStatement */;
                 node.expression = expression;
                 parseSemicolon();
             }
@@ -21043,11 +21315,11 @@ var ts;
         }
         function nextTokenIsClassKeywordOnSameLine() {
             nextToken();
-            return token() === 76 /* ClassKeyword */ && !scanner.hasPrecedingLineBreak();
+            return token() === 77 /* ClassKeyword */ && !scanner.hasPrecedingLineBreak();
         }
         function nextTokenIsFunctionKeywordOnSameLine() {
             nextToken();
-            return token() === 90 /* FunctionKeyword */ && !scanner.hasPrecedingLineBreak();
+            return token() === 91 /* FunctionKeyword */ && !scanner.hasPrecedingLineBreak();
         }
         function nextTokenIsIdentifierOrKeywordOrLiteralOnSameLine() {
             nextToken();
@@ -21056,12 +21328,12 @@ var ts;
         function isDeclaration() {
             while (true) {
                 switch (token()) {
-                    case 105 /* VarKeyword */:
-                    case 111 /* LetKeyword */:
-                    case 77 /* ConstKeyword */:
-                    case 90 /* FunctionKeyword */:
-                    case 76 /* ClassKeyword */:
-                    case 84 /* EnumKeyword */:
+                    case 106 /* VarKeyword */:
+                    case 112 /* LetKeyword */:
+                    case 78 /* ConstKeyword */:
+                    case 91 /* FunctionKeyword */:
+                    case 77 /* ClassKeyword */:
+                    case 85 /* EnumKeyword */:
                         return true;
                     // 'declare', 'module', 'namespace', 'interface'* and 'type' are all legal JavaScript identifiers;
                     // however, an identifier cannot be followed by another identifier on the same line. This is what we
@@ -21084,41 +21356,41 @@ var ts;
                     //   I {}
                     //
                     // could be legal, it would add complexity for very little gain.
-                    case 110 /* InterfaceKeyword */:
-                    case 140 /* TypeKeyword */:
+                    case 111 /* InterfaceKeyword */:
+                    case 141 /* TypeKeyword */:
                         return nextTokenIsIdentifierOnSameLine();
-                    case 130 /* ModuleKeyword */:
-                    case 131 /* NamespaceKeyword */:
+                    case 131 /* ModuleKeyword */:
+                    case 132 /* NamespaceKeyword */:
                         return nextTokenIsIdentifierOrStringLiteralOnSameLine();
-                    case 118 /* AbstractKeyword */:
-                    case 121 /* AsyncKeyword */:
-                    case 125 /* DeclareKeyword */:
-                    case 113 /* PrivateKeyword */:
-                    case 114 /* ProtectedKeyword */:
-                    case 115 /* PublicKeyword */:
-                    case 133 /* ReadonlyKeyword */:
+                    case 119 /* AbstractKeyword */:
+                    case 122 /* AsyncKeyword */:
+                    case 126 /* DeclareKeyword */:
+                    case 114 /* PrivateKeyword */:
+                    case 115 /* ProtectedKeyword */:
+                    case 116 /* PublicKeyword */:
+                    case 134 /* ReadonlyKeyword */:
                         nextToken();
                         // ASI takes effect for this modifier.
                         if (scanner.hasPrecedingLineBreak()) {
                             return false;
                         }
                         continue;
-                    case 145 /* GlobalKeyword */:
+                    case 146 /* GlobalKeyword */:
                         nextToken();
-                        return token() === 18 /* OpenBraceToken */ || token() === 72 /* Identifier */ || token() === 85 /* ExportKeyword */;
-                    case 92 /* ImportKeyword */:
+                        return token() === 18 /* OpenBraceToken */ || token() === 73 /* Identifier */ || token() === 86 /* ExportKeyword */;
+                    case 93 /* ImportKeyword */:
                         nextToken();
                         return token() === 10 /* StringLiteral */ || token() === 40 /* AsteriskToken */ ||
                             token() === 18 /* OpenBraceToken */ || ts.tokenIsIdentifierOrKeyword(token());
-                    case 85 /* ExportKeyword */:
+                    case 86 /* ExportKeyword */:
                         nextToken();
-                        if (token() === 59 /* EqualsToken */ || token() === 40 /* AsteriskToken */ ||
-                            token() === 18 /* OpenBraceToken */ || token() === 80 /* DefaultKeyword */ ||
-                            token() === 119 /* AsKeyword */) {
+                        if (token() === 60 /* EqualsToken */ || token() === 40 /* AsteriskToken */ ||
+                            token() === 18 /* OpenBraceToken */ || token() === 81 /* DefaultKeyword */ ||
+                            token() === 120 /* AsKeyword */) {
                             return true;
                         }
                         continue;
-                    case 116 /* StaticKeyword */:
+                    case 117 /* StaticKeyword */:
                         nextToken();
                         continue;
                     default:
@@ -21134,47 +21406,47 @@ var ts;
                 case 58 /* AtToken */:
                 case 26 /* SemicolonToken */:
                 case 18 /* OpenBraceToken */:
-                case 105 /* VarKeyword */:
-                case 111 /* LetKeyword */:
-                case 90 /* FunctionKeyword */:
-                case 76 /* ClassKeyword */:
-                case 84 /* EnumKeyword */:
-                case 91 /* IfKeyword */:
-                case 82 /* DoKeyword */:
-                case 107 /* WhileKeyword */:
-                case 89 /* ForKeyword */:
-                case 78 /* ContinueKeyword */:
-                case 73 /* BreakKeyword */:
-                case 97 /* ReturnKeyword */:
-                case 108 /* WithKeyword */:
-                case 99 /* SwitchKeyword */:
-                case 101 /* ThrowKeyword */:
-                case 103 /* TryKeyword */:
-                case 79 /* DebuggerKeyword */:
+                case 106 /* VarKeyword */:
+                case 112 /* LetKeyword */:
+                case 91 /* FunctionKeyword */:
+                case 77 /* ClassKeyword */:
+                case 85 /* EnumKeyword */:
+                case 92 /* IfKeyword */:
+                case 83 /* DoKeyword */:
+                case 108 /* WhileKeyword */:
+                case 90 /* ForKeyword */:
+                case 79 /* ContinueKeyword */:
+                case 74 /* BreakKeyword */:
+                case 98 /* ReturnKeyword */:
+                case 109 /* WithKeyword */:
+                case 100 /* SwitchKeyword */:
+                case 102 /* ThrowKeyword */:
+                case 104 /* TryKeyword */:
+                case 80 /* DebuggerKeyword */:
                 // 'catch' and 'finally' do not actually indicate that the code is part of a statement,
                 // however, we say they are here so that we may gracefully parse them and error later.
-                case 75 /* CatchKeyword */:
-                case 88 /* FinallyKeyword */:
+                case 76 /* CatchKeyword */:
+                case 89 /* FinallyKeyword */:
                     return true;
-                case 92 /* ImportKeyword */:
+                case 93 /* ImportKeyword */:
                     return isStartOfDeclaration() || lookAhead(nextTokenIsOpenParenOrLessThanOrDot);
-                case 77 /* ConstKeyword */:
-                case 85 /* ExportKeyword */:
+                case 78 /* ConstKeyword */:
+                case 86 /* ExportKeyword */:
                     return isStartOfDeclaration();
-                case 121 /* AsyncKeyword */:
-                case 125 /* DeclareKeyword */:
-                case 110 /* InterfaceKeyword */:
-                case 130 /* ModuleKeyword */:
-                case 131 /* NamespaceKeyword */:
-                case 140 /* TypeKeyword */:
-                case 145 /* GlobalKeyword */:
+                case 122 /* AsyncKeyword */:
+                case 126 /* DeclareKeyword */:
+                case 111 /* InterfaceKeyword */:
+                case 131 /* ModuleKeyword */:
+                case 132 /* NamespaceKeyword */:
+                case 141 /* TypeKeyword */:
+                case 146 /* GlobalKeyword */:
                     // When these don't start a declaration, they're an identifier in an expression statement
                     return true;
-                case 115 /* PublicKeyword */:
-                case 113 /* PrivateKeyword */:
-                case 114 /* ProtectedKeyword */:
-                case 116 /* StaticKeyword */:
-                case 133 /* ReadonlyKeyword */:
+                case 116 /* PublicKeyword */:
+                case 114 /* PrivateKeyword */:
+                case 115 /* ProtectedKeyword */:
+                case 117 /* StaticKeyword */:
+                case 134 /* ReadonlyKeyword */:
                     // When these don't start a declaration, they may be the start of a class member if an identifier
                     // immediately follows. Otherwise they're an identifier in an expression statement.
                     return isStartOfDeclaration() || !lookAhead(nextTokenIsIdentifierOrKeywordOnSameLine);
@@ -21197,63 +21469,63 @@ var ts;
                     return parseEmptyStatement();
                 case 18 /* OpenBraceToken */:
                     return parseBlock(/*ignoreMissingOpenBrace*/ false);
-                case 105 /* VarKeyword */:
-                    return parseVariableStatement(createNodeWithJSDoc(237 /* VariableDeclaration */));
-                case 111 /* LetKeyword */:
+                case 106 /* VarKeyword */:
+                    return parseVariableStatement(createNodeWithJSDoc(238 /* VariableDeclaration */));
+                case 112 /* LetKeyword */:
                     if (isLetDeclaration()) {
-                        return parseVariableStatement(createNodeWithJSDoc(237 /* VariableDeclaration */));
+                        return parseVariableStatement(createNodeWithJSDoc(238 /* VariableDeclaration */));
                     }
                     break;
-                case 90 /* FunctionKeyword */:
-                    return parseFunctionDeclaration(createNodeWithJSDoc(239 /* FunctionDeclaration */));
-                case 76 /* ClassKeyword */:
-                    return parseClassDeclaration(createNodeWithJSDoc(240 /* ClassDeclaration */));
-                case 91 /* IfKeyword */:
+                case 91 /* FunctionKeyword */:
+                    return parseFunctionDeclaration(createNodeWithJSDoc(240 /* FunctionDeclaration */));
+                case 77 /* ClassKeyword */:
+                    return parseClassDeclaration(createNodeWithJSDoc(241 /* ClassDeclaration */));
+                case 92 /* IfKeyword */:
                     return parseIfStatement();
-                case 82 /* DoKeyword */:
+                case 83 /* DoKeyword */:
                     return parseDoStatement();
-                case 107 /* WhileKeyword */:
+                case 108 /* WhileKeyword */:
                     return parseWhileStatement();
-                case 89 /* ForKeyword */:
+                case 90 /* ForKeyword */:
                     return parseForOrForInOrForOfStatement();
-                case 78 /* ContinueKeyword */:
-                    return parseBreakOrContinueStatement(228 /* ContinueStatement */);
-                case 73 /* BreakKeyword */:
-                    return parseBreakOrContinueStatement(229 /* BreakStatement */);
-                case 97 /* ReturnKeyword */:
+                case 79 /* ContinueKeyword */:
+                    return parseBreakOrContinueStatement(229 /* ContinueStatement */);
+                case 74 /* BreakKeyword */:
+                    return parseBreakOrContinueStatement(230 /* BreakStatement */);
+                case 98 /* ReturnKeyword */:
                     return parseReturnStatement();
-                case 108 /* WithKeyword */:
+                case 109 /* WithKeyword */:
                     return parseWithStatement();
-                case 99 /* SwitchKeyword */:
+                case 100 /* SwitchKeyword */:
                     return parseSwitchStatement();
-                case 101 /* ThrowKeyword */:
+                case 102 /* ThrowKeyword */:
                     return parseThrowStatement();
-                case 103 /* TryKeyword */:
+                case 104 /* TryKeyword */:
                 // Include 'catch' and 'finally' for error recovery.
-                case 75 /* CatchKeyword */:
-                case 88 /* FinallyKeyword */:
+                case 76 /* CatchKeyword */:
+                case 89 /* FinallyKeyword */:
                     return parseTryStatement();
-                case 79 /* DebuggerKeyword */:
+                case 80 /* DebuggerKeyword */:
                     return parseDebuggerStatement();
                 case 58 /* AtToken */:
                     return parseDeclaration();
-                case 121 /* AsyncKeyword */:
-                case 110 /* InterfaceKeyword */:
-                case 140 /* TypeKeyword */:
-                case 130 /* ModuleKeyword */:
-                case 131 /* NamespaceKeyword */:
-                case 125 /* DeclareKeyword */:
-                case 77 /* ConstKeyword */:
-                case 84 /* EnumKeyword */:
-                case 85 /* ExportKeyword */:
-                case 92 /* ImportKeyword */:
-                case 113 /* PrivateKeyword */:
-                case 114 /* ProtectedKeyword */:
-                case 115 /* PublicKeyword */:
-                case 118 /* AbstractKeyword */:
-                case 116 /* StaticKeyword */:
-                case 133 /* ReadonlyKeyword */:
-                case 145 /* GlobalKeyword */:
+                case 122 /* AsyncKeyword */:
+                case 111 /* InterfaceKeyword */:
+                case 141 /* TypeKeyword */:
+                case 131 /* ModuleKeyword */:
+                case 132 /* NamespaceKeyword */:
+                case 126 /* DeclareKeyword */:
+                case 78 /* ConstKeyword */:
+                case 85 /* EnumKeyword */:
+                case 86 /* ExportKeyword */:
+                case 93 /* ImportKeyword */:
+                case 114 /* PrivateKeyword */:
+                case 115 /* ProtectedKeyword */:
+                case 116 /* PublicKeyword */:
+                case 119 /* AbstractKeyword */:
+                case 117 /* StaticKeyword */:
+                case 134 /* ReadonlyKeyword */:
+                case 146 /* GlobalKeyword */:
                     if (isStartOfDeclaration()) {
                         return parseDeclaration();
                     }
@@ -21262,7 +21534,7 @@ var ts;
             return parseExpressionOrLabeledStatement();
         }
         function isDeclareModifier(modifier) {
-            return modifier.kind === 125 /* DeclareKeyword */;
+            return modifier.kind === 126 /* DeclareKeyword */;
         }
         function parseDeclaration() {
             var node = createNodeWithJSDoc(0 /* Unknown */);
@@ -21281,33 +21553,33 @@ var ts;
         }
         function parseDeclarationWorker(node) {
             switch (token()) {
-                case 105 /* VarKeyword */:
-                case 111 /* LetKeyword */:
-                case 77 /* ConstKeyword */:
+                case 106 /* VarKeyword */:
+                case 112 /* LetKeyword */:
+                case 78 /* ConstKeyword */:
                     return parseVariableStatement(node);
-                case 90 /* FunctionKeyword */:
+                case 91 /* FunctionKeyword */:
                     return parseFunctionDeclaration(node);
-                case 76 /* ClassKeyword */:
+                case 77 /* ClassKeyword */:
                     return parseClassDeclaration(node);
-                case 110 /* InterfaceKeyword */:
+                case 111 /* InterfaceKeyword */:
                     return parseInterfaceDeclaration(node);
-                case 140 /* TypeKeyword */:
+                case 141 /* TypeKeyword */:
                     return parseTypeAliasDeclaration(node);
-                case 84 /* EnumKeyword */:
+                case 85 /* EnumKeyword */:
                     return parseEnumDeclaration(node);
-                case 145 /* GlobalKeyword */:
-                case 130 /* ModuleKeyword */:
-                case 131 /* NamespaceKeyword */:
+                case 146 /* GlobalKeyword */:
+                case 131 /* ModuleKeyword */:
+                case 132 /* NamespaceKeyword */:
                     return parseModuleDeclaration(node);
-                case 92 /* ImportKeyword */:
+                case 93 /* ImportKeyword */:
                     return parseImportDeclarationOrImportEqualsDeclaration(node);
-                case 85 /* ExportKeyword */:
+                case 86 /* ExportKeyword */:
                     nextToken();
                     switch (token()) {
-                        case 80 /* DefaultKeyword */:
-                        case 59 /* EqualsToken */:
+                        case 81 /* DefaultKeyword */:
+                        case 60 /* EqualsToken */:
                             return parseExportAssignment(node);
-                        case 119 /* AsKeyword */:
+                        case 120 /* AsKeyword */:
                             return parseNamespaceExportDeclaration(node);
                         default:
                             return parseExportDeclaration(node);
@@ -21316,7 +21588,7 @@ var ts;
                     if (node.decorators || node.modifiers) {
                         // We reached this point because we encountered decorators and/or modifiers and assumed a declaration
                         // would follow. For recovery and error reporting purposes, return an incomplete declaration.
-                        var missing = createMissingNode(258 /* MissingDeclaration */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Declaration_expected);
+                        var missing = createMissingNode(259 /* MissingDeclaration */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Declaration_expected);
                         missing.pos = node.pos;
                         missing.decorators = node.decorators;
                         missing.modifiers = node.modifiers;
@@ -21339,16 +21611,16 @@ var ts;
         // DECLARATIONS
         function parseArrayBindingElement() {
             if (token() === 27 /* CommaToken */) {
-                return createNode(210 /* OmittedExpression */);
+                return createNode(211 /* OmittedExpression */);
             }
-            var node = createNode(186 /* BindingElement */);
+            var node = createNode(187 /* BindingElement */);
             node.dotDotDotToken = parseOptionalToken(25 /* DotDotDotToken */);
             node.name = parseIdentifierOrPattern();
             node.initializer = parseInitializer();
             return finishNode(node);
         }
         function parseObjectBindingElement() {
-            var node = createNode(186 /* BindingElement */);
+            var node = createNode(187 /* BindingElement */);
             node.dotDotDotToken = parseOptionalToken(25 /* DotDotDotToken */);
             var tokenIsIdentifier = isIdentifier();
             var propertyName = parsePropertyName();
@@ -21364,14 +21636,14 @@ var ts;
             return finishNode(node);
         }
         function parseObjectBindingPattern() {
-            var node = createNode(184 /* ObjectBindingPattern */);
+            var node = createNode(185 /* ObjectBindingPattern */);
             parseExpected(18 /* OpenBraceToken */);
             node.elements = parseDelimitedList(9 /* ObjectBindingElements */, parseObjectBindingElement);
             parseExpected(19 /* CloseBraceToken */);
             return finishNode(node);
         }
         function parseArrayBindingPattern() {
-            var node = createNode(185 /* ArrayBindingPattern */);
+            var node = createNode(186 /* ArrayBindingPattern */);
             parseExpected(22 /* OpenBracketToken */);
             node.elements = parseDelimitedList(10 /* ArrayBindingElements */, parseArrayBindingElement);
             parseExpected(23 /* CloseBracketToken */);
@@ -21393,9 +21665,9 @@ var ts;
             return parseVariableDeclaration(/*allowExclamation*/ true);
         }
         function parseVariableDeclaration(allowExclamation) {
-            var node = createNode(237 /* VariableDeclaration */);
+            var node = createNode(238 /* VariableDeclaration */);
             node.name = parseIdentifierOrPattern();
-            if (allowExclamation && node.name.kind === 72 /* Identifier */ &&
+            if (allowExclamation && node.name.kind === 73 /* Identifier */ &&
                 token() === 52 /* ExclamationToken */ && !scanner.hasPrecedingLineBreak()) {
                 node.exclamationToken = parseTokenNode();
             }
@@ -21406,14 +21678,14 @@ var ts;
             return finishNode(node);
         }
         function parseVariableDeclarationList(inForStatementInitializer) {
-            var node = createNode(238 /* VariableDeclarationList */);
+            var node = createNode(239 /* VariableDeclarationList */);
             switch (token()) {
-                case 105 /* VarKeyword */:
+                case 106 /* VarKeyword */:
                     break;
-                case 111 /* LetKeyword */:
+                case 112 /* LetKeyword */:
                     node.flags |= 1 /* Let */;
                     break;
-                case 77 /* ConstKeyword */:
+                case 78 /* ConstKeyword */:
                     node.flags |= 2 /* Const */;
                     break;
                 default:
@@ -21429,7 +21701,7 @@ var ts;
             // So we need to look ahead to determine if 'of' should be treated as a keyword in
             // this context.
             // The checker will then give an error that there is an empty declaration list.
-            if (token() === 147 /* OfKeyword */ && lookAhead(canFollowContextualOfKeyword)) {
+            if (token() === 148 /* OfKeyword */ && lookAhead(canFollowContextualOfKeyword)) {
                 node.declarations = createMissingList();
             }
             else {
@@ -21444,14 +21716,14 @@ var ts;
             return nextTokenIsIdentifier() && nextToken() === 21 /* CloseParenToken */;
         }
         function parseVariableStatement(node) {
-            node.kind = 219 /* VariableStatement */;
+            node.kind = 220 /* VariableStatement */;
             node.declarationList = parseVariableDeclarationList(/*inForStatementInitializer*/ false);
             parseSemicolon();
             return finishNode(node);
         }
         function parseFunctionDeclaration(node) {
-            node.kind = 239 /* FunctionDeclaration */;
-            parseExpected(90 /* FunctionKeyword */);
+            node.kind = 240 /* FunctionDeclaration */;
+            parseExpected(91 /* FunctionKeyword */);
             node.asteriskToken = parseOptionalToken(40 /* AsteriskToken */);
             node.name = ts.hasModifier(node, 512 /* Default */) ? parseOptionalIdentifier() : parseIdentifier();
             var isGenerator = node.asteriskToken ? 1 /* Yield */ : 0 /* None */;
@@ -21460,15 +21732,29 @@ var ts;
             node.body = parseFunctionBlockOrSemicolon(isGenerator | isAsync, ts.Diagnostics.or_expected);
             return finishNode(node);
         }
-        function parseConstructorDeclaration(node) {
-            node.kind = 157 /* Constructor */;
-            parseExpected(124 /* ConstructorKeyword */);
-            fillSignature(57 /* ColonToken */, 0 /* None */, node);
-            node.body = parseFunctionBlockOrSemicolon(0 /* None */, ts.Diagnostics.or_expected);
-            return finishNode(node);
+        function parseConstructorName() {
+            if (token() === 125 /* ConstructorKeyword */) {
+                return parseExpected(125 /* ConstructorKeyword */);
+            }
+            if (token() === 10 /* StringLiteral */ && lookAhead(nextToken) === 20 /* OpenParenToken */) {
+                return tryParse(function () {
+                    var literalNode = parseLiteralNode();
+                    return literalNode.text === "constructor" ? literalNode : undefined;
+                });
+            }
+        }
+        function tryParseConstructorDeclaration(node) {
+            return tryParse(function () {
+                if (parseConstructorName()) {
+                    node.kind = 158 /* Constructor */;
+                    fillSignature(57 /* ColonToken */, 0 /* None */, node);
+                    node.body = parseFunctionBlockOrSemicolon(0 /* None */, ts.Diagnostics.or_expected);
+                    return finishNode(node);
+                }
+            });
         }
         function parseMethodDeclaration(node, asteriskToken, diagnosticMessage) {
-            node.kind = 156 /* MethodDeclaration */;
+            node.kind = 157 /* MethodDeclaration */;
             node.asteriskToken = asteriskToken;
             var isGenerator = asteriskToken ? 1 /* Yield */ : 0 /* None */;
             var isAsync = ts.hasModifier(node, 256 /* Async */) ? 2 /* Await */ : 0 /* None */;
@@ -21477,7 +21763,7 @@ var ts;
             return finishNode(node);
         }
         function parsePropertyDeclaration(node) {
-            node.kind = 154 /* PropertyDeclaration */;
+            node.kind = 155 /* PropertyDeclaration */;
             if (!node.questionToken && token() === 52 /* ExclamationToken */ && !scanner.hasPrecedingLineBreak()) {
                 node.exclamationToken = parseTokenNode();
             }
@@ -21550,7 +21836,7 @@ var ts;
             // If we were able to get any potential identifier...
             if (idToken !== undefined) {
                 // If we have a non-keyword identifier, or if we have an accessor, then it's safe to parse.
-                if (!ts.isKeyword(idToken) || idToken === 137 /* SetKeyword */ || idToken === 126 /* GetKeyword */) {
+                if (!ts.isKeyword(idToken) || idToken === 138 /* SetKeyword */ || idToken === 127 /* GetKeyword */) {
                     return true;
                 }
                 // If it *is* a keyword, but not an accessor, check a little farther along
@@ -21560,7 +21846,7 @@ var ts;
                     case 28 /* LessThanToken */: // Generic Method declaration
                     case 52 /* ExclamationToken */: // Non-null assertion on property name
                     case 57 /* ColonToken */: // Type Annotation for declaration
-                    case 59 /* EqualsToken */: // Initializer for declaration
+                    case 60 /* EqualsToken */: // Initializer for declaration
                     case 56 /* QuestionToken */: // Not valid, but permitted so that it gets caught later on.
                         return true;
                     default:
@@ -21582,7 +21868,7 @@ var ts;
                 if (!parseOptional(58 /* AtToken */)) {
                     break;
                 }
-                var decorator = createNode(152 /* Decorator */, decoratorStart);
+                var decorator = createNode(153 /* Decorator */, decoratorStart);
                 decorator.expression = doInDecoratorContext(parseLeftHandSideExpressionOrHigher);
                 finishNode(decorator);
                 (list || (list = [])).push(decorator);
@@ -21602,7 +21888,7 @@ var ts;
             while (true) {
                 var modifierStart = scanner.getStartPos();
                 var modifierKind = token();
-                if (token() === 77 /* ConstKeyword */ && permitInvalidConstAsModifier) {
+                if (token() === 78 /* ConstKeyword */ && permitInvalidConstAsModifier) {
                     // We need to ensure that any subsequent modifiers appear on the same line
                     // so that when 'const' is a standalone declaration, we don't issue an error.
                     if (!tryParse(nextTokenIsOnSameLineAndCanFollowModifier)) {
@@ -21621,7 +21907,7 @@ var ts;
         }
         function parseModifiersForArrowFunction() {
             var modifiers;
-            if (token() === 121 /* AsyncKeyword */) {
+            if (token() === 122 /* AsyncKeyword */) {
                 var modifierStart = scanner.getStartPos();
                 var modifierKind = token();
                 nextToken();
@@ -21632,21 +21918,24 @@ var ts;
         }
         function parseClassElement() {
             if (token() === 26 /* SemicolonToken */) {
-                var result = createNode(217 /* SemicolonClassElement */);
+                var result = createNode(218 /* SemicolonClassElement */);
                 nextToken();
                 return finishNode(result);
             }
             var node = createNodeWithJSDoc(0 /* Unknown */);
             node.decorators = parseDecorators();
             node.modifiers = parseModifiers(/*permitInvalidConstAsModifier*/ true);
-            if (parseContextualModifier(126 /* GetKeyword */)) {
-                return parseAccessorDeclaration(node, 158 /* GetAccessor */);
+            if (parseContextualModifier(127 /* GetKeyword */)) {
+                return parseAccessorDeclaration(node, 159 /* GetAccessor */);
             }
-            if (parseContextualModifier(137 /* SetKeyword */)) {
-                return parseAccessorDeclaration(node, 159 /* SetAccessor */);
+            if (parseContextualModifier(138 /* SetKeyword */)) {
+                return parseAccessorDeclaration(node, 160 /* SetAccessor */);
             }
-            if (token() === 124 /* ConstructorKeyword */) {
-                return parseConstructorDeclaration(node);
+            if (token() === 125 /* ConstructorKeyword */ || token() === 10 /* StringLiteral */) {
+                var constructorDeclaration = tryParseConstructorDeclaration(node);
+                if (constructorDeclaration) {
+                    return constructorDeclaration;
+                }
             }
             if (isIndexSignature()) {
                 return parseIndexSignatureDeclaration(node);
@@ -21662,21 +21951,21 @@ var ts;
             }
             if (node.decorators || node.modifiers) {
                 // treat this as a property declaration with a missing name.
-                node.name = createMissingNode(72 /* Identifier */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Declaration_expected);
+                node.name = createMissingNode(73 /* Identifier */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Declaration_expected);
                 return parsePropertyDeclaration(node);
             }
             // 'isClassMemberStart' should have hinted not to attempt parsing.
             return ts.Debug.fail("Should not have attempted to parse class member declaration.");
         }
         function parseClassExpression() {
-            return parseClassDeclarationOrExpression(createNodeWithJSDoc(0 /* Unknown */), 209 /* ClassExpression */);
+            return parseClassDeclarationOrExpression(createNodeWithJSDoc(0 /* Unknown */), 210 /* ClassExpression */);
         }
         function parseClassDeclaration(node) {
-            return parseClassDeclarationOrExpression(node, 240 /* ClassDeclaration */);
+            return parseClassDeclarationOrExpression(node, 241 /* ClassDeclaration */);
         }
         function parseClassDeclarationOrExpression(node, kind) {
             node.kind = kind;
-            parseExpected(76 /* ClassKeyword */);
+            parseExpected(77 /* ClassKeyword */);
             node.name = parseNameOfClassDeclarationOrExpression();
             node.typeParameters = parseTypeParameters();
             node.heritageClauses = parseHeritageClauses();
@@ -21702,7 +21991,7 @@ var ts;
                 : undefined;
         }
         function isImplementsClause() {
-            return token() === 109 /* ImplementsKeyword */ && lookAhead(nextTokenIsIdentifierOrKeyword);
+            return token() === 110 /* ImplementsKeyword */ && lookAhead(nextTokenIsIdentifierOrKeyword);
         }
         function parseHeritageClauses() {
             // ClassTail[Yield,Await] : (Modified) See 14.5
@@ -21714,15 +22003,15 @@ var ts;
         }
         function parseHeritageClause() {
             var tok = token();
-            ts.Debug.assert(tok === 86 /* ExtendsKeyword */ || tok === 109 /* ImplementsKeyword */); // isListElement() should ensure this.
-            var node = createNode(273 /* HeritageClause */);
+            ts.Debug.assert(tok === 87 /* ExtendsKeyword */ || tok === 110 /* ImplementsKeyword */); // isListElement() should ensure this.
+            var node = createNode(274 /* HeritageClause */);
             node.token = tok;
             nextToken();
             node.types = parseDelimitedList(7 /* HeritageClauseElement */, parseExpressionWithTypeArguments);
             return finishNode(node);
         }
         function parseExpressionWithTypeArguments() {
-            var node = createNode(211 /* ExpressionWithTypeArguments */);
+            var node = createNode(212 /* ExpressionWithTypeArguments */);
             node.expression = parseLeftHandSideExpressionOrHigher();
             node.typeArguments = tryParseTypeArguments();
             return finishNode(node);
@@ -21733,14 +22022,14 @@ var ts;
                 : undefined;
         }
         function isHeritageClause() {
-            return token() === 86 /* ExtendsKeyword */ || token() === 109 /* ImplementsKeyword */;
+            return token() === 87 /* ExtendsKeyword */ || token() === 110 /* ImplementsKeyword */;
         }
         function parseClassMembers() {
             return parseList(5 /* ClassMembers */, parseClassElement);
         }
         function parseInterfaceDeclaration(node) {
-            node.kind = 241 /* InterfaceDeclaration */;
-            parseExpected(110 /* InterfaceKeyword */);
+            node.kind = 242 /* InterfaceDeclaration */;
+            parseExpected(111 /* InterfaceKeyword */);
             node.name = parseIdentifier();
             node.typeParameters = parseTypeParameters();
             node.heritageClauses = parseHeritageClauses();
@@ -21748,11 +22037,11 @@ var ts;
             return finishNode(node);
         }
         function parseTypeAliasDeclaration(node) {
-            node.kind = 242 /* TypeAliasDeclaration */;
-            parseExpected(140 /* TypeKeyword */);
+            node.kind = 243 /* TypeAliasDeclaration */;
+            parseExpected(141 /* TypeKeyword */);
             node.name = parseIdentifier();
             node.typeParameters = parseTypeParameters();
-            parseExpected(59 /* EqualsToken */);
+            parseExpected(60 /* EqualsToken */);
             node.type = parseType();
             parseSemicolon();
             return finishNode(node);
@@ -21762,14 +22051,14 @@ var ts;
         // ConstantEnumMemberSection, which starts at the beginning of an enum declaration
         // or any time an integer literal initializer is encountered.
         function parseEnumMember() {
-            var node = createNodeWithJSDoc(278 /* EnumMember */);
+            var node = createNodeWithJSDoc(279 /* EnumMember */);
             node.name = parsePropertyName();
             node.initializer = allowInAnd(parseInitializer);
             return finishNode(node);
         }
         function parseEnumDeclaration(node) {
-            node.kind = 243 /* EnumDeclaration */;
-            parseExpected(84 /* EnumKeyword */);
+            node.kind = 244 /* EnumDeclaration */;
+            parseExpected(85 /* EnumKeyword */);
             node.name = parseIdentifier();
             if (parseExpected(18 /* OpenBraceToken */)) {
                 node.members = parseDelimitedList(6 /* EnumMembers */, parseEnumMember);
@@ -21781,7 +22070,7 @@ var ts;
             return finishNode(node);
         }
         function parseModuleBlock() {
-            var node = createNode(245 /* ModuleBlock */);
+            var node = createNode(246 /* ModuleBlock */);
             if (parseExpected(18 /* OpenBraceToken */)) {
                 node.statements = parseList(1 /* BlockStatements */, parseStatement);
                 parseExpected(19 /* CloseBraceToken */);
@@ -21792,7 +22081,7 @@ var ts;
             return finishNode(node);
         }
         function parseModuleOrNamespaceDeclaration(node, flags) {
-            node.kind = 244 /* ModuleDeclaration */;
+            node.kind = 245 /* ModuleDeclaration */;
             // If we are parsing a dotted namespace name, we want to
             // propagate the 'Namespace' flag across the names if set.
             var namespaceFlag = flags & 16 /* Namespace */;
@@ -21804,8 +22093,8 @@ var ts;
             return finishNode(node);
         }
         function parseAmbientExternalModuleDeclaration(node) {
-            node.kind = 244 /* ModuleDeclaration */;
-            if (token() === 145 /* GlobalKeyword */) {
+            node.kind = 245 /* ModuleDeclaration */;
+            if (token() === 146 /* GlobalKeyword */) {
                 // parse 'global' as name of global scope augmentation
                 node.name = parseIdentifier();
                 node.flags |= 512 /* GlobalAugmentation */;
@@ -21824,15 +22113,15 @@ var ts;
         }
         function parseModuleDeclaration(node) {
             var flags = 0;
-            if (token() === 145 /* GlobalKeyword */) {
+            if (token() === 146 /* GlobalKeyword */) {
                 // global augmentation
                 return parseAmbientExternalModuleDeclaration(node);
             }
-            else if (parseOptional(131 /* NamespaceKeyword */)) {
+            else if (parseOptional(132 /* NamespaceKeyword */)) {
                 flags |= 16 /* Namespace */;
             }
             else {
-                parseExpected(130 /* ModuleKeyword */);
+                parseExpected(131 /* ModuleKeyword */);
                 if (token() === 10 /* StringLiteral */) {
                     return parseAmbientExternalModuleDeclaration(node);
                 }
@@ -21840,7 +22129,7 @@ var ts;
             return parseModuleOrNamespaceDeclaration(node, flags);
         }
         function isExternalModuleReference() {
-            return token() === 134 /* RequireKeyword */ &&
+            return token() === 135 /* RequireKeyword */ &&
                 lookAhead(nextTokenIsOpenParen);
         }
         function nextTokenIsOpenParen() {
@@ -21850,25 +22139,25 @@ var ts;
             return nextToken() === 42 /* SlashToken */;
         }
         function parseNamespaceExportDeclaration(node) {
-            node.kind = 247 /* NamespaceExportDeclaration */;
-            parseExpected(119 /* AsKeyword */);
-            parseExpected(131 /* NamespaceKeyword */);
+            node.kind = 248 /* NamespaceExportDeclaration */;
+            parseExpected(120 /* AsKeyword */);
+            parseExpected(132 /* NamespaceKeyword */);
             node.name = parseIdentifier();
             parseSemicolon();
             return finishNode(node);
         }
         function parseImportDeclarationOrImportEqualsDeclaration(node) {
-            parseExpected(92 /* ImportKeyword */);
+            parseExpected(93 /* ImportKeyword */);
             var afterImportPos = scanner.getStartPos();
             var identifier;
             if (isIdentifier()) {
                 identifier = parseIdentifier();
-                if (token() !== 27 /* CommaToken */ && token() !== 144 /* FromKeyword */) {
+                if (token() !== 27 /* CommaToken */ && token() !== 145 /* FromKeyword */) {
                     return parseImportEqualsDeclaration(node, identifier);
                 }
             }
             // Import statement
-            node.kind = 249 /* ImportDeclaration */;
+            node.kind = 250 /* ImportDeclaration */;
             // ImportDeclaration:
             //  import ImportClause from ModuleSpecifier ;
             //  import ModuleSpecifier;
@@ -21876,16 +22165,16 @@ var ts;
                 token() === 40 /* AsteriskToken */ || // import *
                 token() === 18 /* OpenBraceToken */) { // import {
                 node.importClause = parseImportClause(identifier, afterImportPos);
-                parseExpected(144 /* FromKeyword */);
+                parseExpected(145 /* FromKeyword */);
             }
             node.moduleSpecifier = parseModuleSpecifier();
             parseSemicolon();
             return finishNode(node);
         }
         function parseImportEqualsDeclaration(node, identifier) {
-            node.kind = 248 /* ImportEqualsDeclaration */;
+            node.kind = 249 /* ImportEqualsDeclaration */;
             node.name = identifier;
-            parseExpected(59 /* EqualsToken */);
+            parseExpected(60 /* EqualsToken */);
             node.moduleReference = parseModuleReference();
             parseSemicolon();
             return finishNode(node);
@@ -21897,7 +22186,7 @@ var ts;
             //  NamedImports
             //  ImportedDefaultBinding, NameSpaceImport
             //  ImportedDefaultBinding, NamedImports
-            var importClause = createNode(250 /* ImportClause */, fullStart);
+            var importClause = createNode(251 /* ImportClause */, fullStart);
             if (identifier) {
                 // ImportedDefaultBinding:
                 //  ImportedBinding
@@ -21907,7 +22196,7 @@ var ts;
             // parse namespace or named imports
             if (!importClause.name ||
                 parseOptional(27 /* CommaToken */)) {
-                importClause.namedBindings = token() === 40 /* AsteriskToken */ ? parseNamespaceImport() : parseNamedImportsOrExports(252 /* NamedImports */);
+                importClause.namedBindings = token() === 40 /* AsteriskToken */ ? parseNamespaceImport() : parseNamedImportsOrExports(253 /* NamedImports */);
             }
             return finishNode(importClause);
         }
@@ -21917,8 +22206,8 @@ var ts;
                 : parseEntityName(/*allowReservedWords*/ false);
         }
         function parseExternalModuleReference() {
-            var node = createNode(259 /* ExternalModuleReference */);
-            parseExpected(134 /* RequireKeyword */);
+            var node = createNode(260 /* ExternalModuleReference */);
+            parseExpected(135 /* RequireKeyword */);
             parseExpected(20 /* OpenParenToken */);
             node.expression = parseModuleSpecifier();
             parseExpected(21 /* CloseParenToken */);
@@ -21940,9 +22229,9 @@ var ts;
         function parseNamespaceImport() {
             // NameSpaceImport:
             //  * as ImportedBinding
-            var namespaceImport = createNode(251 /* NamespaceImport */);
+            var namespaceImport = createNode(252 /* NamespaceImport */);
             parseExpected(40 /* AsteriskToken */);
-            parseExpected(119 /* AsKeyword */);
+            parseExpected(120 /* AsKeyword */);
             namespaceImport.name = parseIdentifier();
             return finishNode(namespaceImport);
         }
@@ -21955,14 +22244,14 @@ var ts;
             // ImportsList:
             //  ImportSpecifier
             //  ImportsList, ImportSpecifier
-            node.elements = parseBracketedList(23 /* ImportOrExportSpecifiers */, kind === 252 /* NamedImports */ ? parseImportSpecifier : parseExportSpecifier, 18 /* OpenBraceToken */, 19 /* CloseBraceToken */);
+            node.elements = parseBracketedList(23 /* ImportOrExportSpecifiers */, kind === 253 /* NamedImports */ ? parseImportSpecifier : parseExportSpecifier, 18 /* OpenBraceToken */, 19 /* CloseBraceToken */);
             return finishNode(node);
         }
         function parseExportSpecifier() {
-            return parseImportOrExportSpecifier(257 /* ExportSpecifier */);
+            return parseImportOrExportSpecifier(258 /* ExportSpecifier */);
         }
         function parseImportSpecifier() {
-            return parseImportOrExportSpecifier(253 /* ImportSpecifier */);
+            return parseImportOrExportSpecifier(254 /* ImportSpecifier */);
         }
         function parseImportOrExportSpecifier(kind) {
             var node = createNode(kind);
@@ -21976,9 +22265,9 @@ var ts;
             var checkIdentifierStart = scanner.getTokenPos();
             var checkIdentifierEnd = scanner.getTextPos();
             var identifierName = parseIdentifierName();
-            if (token() === 119 /* AsKeyword */) {
+            if (token() === 120 /* AsKeyword */) {
                 node.propertyName = identifierName;
-                parseExpected(119 /* AsKeyword */);
+                parseExpected(120 /* AsKeyword */);
                 checkIdentifierIsKeyword = ts.isKeyword(token()) && !isIdentifier();
                 checkIdentifierStart = scanner.getTokenPos();
                 checkIdentifierEnd = scanner.getTextPos();
@@ -21987,24 +22276,24 @@ var ts;
             else {
                 node.name = identifierName;
             }
-            if (kind === 253 /* ImportSpecifier */ && checkIdentifierIsKeyword) {
+            if (kind === 254 /* ImportSpecifier */ && checkIdentifierIsKeyword) {
                 parseErrorAt(checkIdentifierStart, checkIdentifierEnd, ts.Diagnostics.Identifier_expected);
             }
             return finishNode(node);
         }
         function parseExportDeclaration(node) {
-            node.kind = 255 /* ExportDeclaration */;
+            node.kind = 256 /* ExportDeclaration */;
             if (parseOptional(40 /* AsteriskToken */)) {
-                parseExpected(144 /* FromKeyword */);
+                parseExpected(145 /* FromKeyword */);
                 node.moduleSpecifier = parseModuleSpecifier();
             }
             else {
-                node.exportClause = parseNamedImportsOrExports(256 /* NamedExports */);
+                node.exportClause = parseNamedImportsOrExports(257 /* NamedExports */);
                 // It is not uncommon to accidentally omit the 'from' keyword. Additionally, in editing scenarios,
                 // the 'from' keyword can be parsed as a named export when the export clause is unterminated (i.e. `export { from "moduleName";`)
                 // If we don't have a 'from' keyword, see if we have a string literal such that ASI won't take effect.
-                if (token() === 144 /* FromKeyword */ || (token() === 10 /* StringLiteral */ && !scanner.hasPrecedingLineBreak())) {
-                    parseExpected(144 /* FromKeyword */);
+                if (token() === 145 /* FromKeyword */ || (token() === 10 /* StringLiteral */ && !scanner.hasPrecedingLineBreak())) {
+                    parseExpected(145 /* FromKeyword */);
                     node.moduleSpecifier = parseModuleSpecifier();
                 }
             }
@@ -22012,12 +22301,12 @@ var ts;
             return finishNode(node);
         }
         function parseExportAssignment(node) {
-            node.kind = 254 /* ExportAssignment */;
-            if (parseOptional(59 /* EqualsToken */)) {
+            node.kind = 255 /* ExportAssignment */;
+            if (parseOptional(60 /* EqualsToken */)) {
                 node.isExportEquals = true;
             }
             else {
-                parseExpected(80 /* DefaultKeyword */);
+                parseExpected(81 /* DefaultKeyword */);
             }
             node.expression = parseAssignmentExpressionOrHigher();
             parseSemicolon();
@@ -22032,10 +22321,10 @@ var ts;
         }
         function isAnExternalModuleIndicatorNode(node) {
             return ts.hasModifier(node, 1 /* Export */)
-                || node.kind === 248 /* ImportEqualsDeclaration */ && node.moduleReference.kind === 259 /* ExternalModuleReference */
-                || node.kind === 249 /* ImportDeclaration */
-                || node.kind === 254 /* ExportAssignment */
-                || node.kind === 255 /* ExportDeclaration */
+                || node.kind === 249 /* ImportEqualsDeclaration */ && node.moduleReference.kind === 260 /* ExternalModuleReference */
+                || node.kind === 250 /* ImportDeclaration */
+                || node.kind === 255 /* ExportAssignment */
+                || node.kind === 256 /* ExportDeclaration */
                 ? node
                 : undefined;
         }
@@ -22048,7 +22337,7 @@ var ts;
             return isImportMeta(node) ? node : forEachChild(node, walkTreeForExternalModuleIndicators);
         }
         function isImportMeta(node) {
-            return ts.isMetaProperty(node) && node.keywordToken === 92 /* ImportKeyword */ && node.name.escapedText === "meta";
+            return ts.isMetaProperty(node) && node.keywordToken === 93 /* ImportKeyword */ && node.name.escapedText === "meta";
         }
         var ParsingContext;
         (function (ParsingContext) {
@@ -22087,8 +22376,8 @@ var ts;
         var JSDocParser;
         (function (JSDocParser) {
             function parseJSDocTypeExpressionForTests(content, start, length) {
-                initializeState(content, 7 /* Latest */, /*_syntaxCursor:*/ undefined, 1 /* JS */);
-                sourceFile = createSourceFile("file.js", 7 /* Latest */, 1 /* JS */, /*isDeclarationFile*/ false);
+                initializeState(content, 99 /* Latest */, /*_syntaxCursor:*/ undefined, 1 /* JS */);
+                sourceFile = createSourceFile("file.js", 99 /* Latest */, 1 /* JS */, /*isDeclarationFile*/ false);
                 scanner.setText(content, start, length);
                 currentToken = scanner.scan();
                 var jsDocTypeExpression = parseJSDocTypeExpression();
@@ -22099,18 +22388,18 @@ var ts;
             JSDocParser.parseJSDocTypeExpressionForTests = parseJSDocTypeExpressionForTests;
             // Parses out a JSDoc type expression.
             function parseJSDocTypeExpression(mayOmitBraces) {
-                var result = createNode(288 /* JSDocTypeExpression */);
+                var result = createNode(289 /* JSDocTypeExpression */);
                 var hasBrace = (mayOmitBraces ? parseOptional : parseExpected)(18 /* OpenBraceToken */);
                 result.type = doInsideOfContext(2097152 /* JSDoc */, parseJSDocType);
                 if (!mayOmitBraces || hasBrace) {
-                    parseExpected(19 /* CloseBraceToken */);
+                    parseExpectedJSDoc(19 /* CloseBraceToken */);
                 }
                 fixupParentReferences(result);
                 return finishNode(result);
             }
             JSDocParser.parseJSDocTypeExpression = parseJSDocTypeExpression;
             function parseIsolatedJSDocComment(content, start, length) {
-                initializeState(content, 7 /* Latest */, /*_syntaxCursor:*/ undefined, 1 /* JS */);
+                initializeState(content, 99 /* Latest */, /*_syntaxCursor:*/ undefined, 1 /* JS */);
                 sourceFile = { languageVariant: 0 /* Standard */, text: content }; // tslint:disable-line no-object-literal-type-assertion
                 var jsDoc = parseJSDocCommentWorker(start, length);
                 var diagnostics = parseDiagnostics;
@@ -22144,6 +22433,7 @@ var ts;
                 JSDocState[JSDocState["BeginningOfLine"] = 0] = "BeginningOfLine";
                 JSDocState[JSDocState["SawAsterisk"] = 1] = "SawAsterisk";
                 JSDocState[JSDocState["SavingComments"] = 2] = "SavingComments";
+                JSDocState[JSDocState["SavingBackticks"] = 3] = "SavingBackticks";
             })(JSDocState || (JSDocState = {}));
             var PropertyLikeParse;
             (function (PropertyLikeParse) {
@@ -22182,7 +22472,7 @@ var ts;
                         comments.push(text);
                         indent += text.length;
                     }
-                    nextJSDocToken();
+                    nextTokenJSDoc();
                     while (parseOptionalJsdoc(5 /* WhitespaceTrivia */))
                         ;
                     if (parseOptionalJsdoc(4 /* NewLineTrivia */)) {
@@ -22200,7 +22490,6 @@ var ts;
                                     // for malformed examples like `/** @param {string} x @returns {number} the length */`
                                     state = 0 /* BeginningOfLine */;
                                     margin = undefined;
-                                    indent++;
                                 }
                                 else {
                                     pushComment(scanner.getTokenText());
@@ -22245,7 +22534,7 @@ var ts;
                                 pushComment(scanner.getTokenText());
                                 break;
                         }
-                        nextJSDocToken();
+                        nextTokenJSDoc();
                     }
                     removeLeadingNewlines(comments);
                     removeTrailingWhitespace(comments);
@@ -22262,7 +22551,7 @@ var ts;
                     }
                 }
                 function createJSDocComment() {
-                    var result = createNode(296 /* JSDocComment */, start);
+                    var result = createNode(297 /* JSDocComment */, start);
                     result.tags = tags && createNodeArray(tags, tagsPos, tagsEnd);
                     result.comment = comments.length ? comments.join("") : undefined;
                     return finishNode(result, end);
@@ -22270,7 +22559,7 @@ var ts;
                 function isNextNonwhitespaceTokenEndOfFile() {
                     // We must use infinite lookahead, as there could be any number of newlines :(
                     while (true) {
-                        nextJSDocToken();
+                        nextTokenJSDoc();
                         if (token() === 1 /* EndOfFileToken */) {
                             return true;
                         }
@@ -22286,34 +22575,43 @@ var ts;
                         }
                     }
                     while (token() === 5 /* WhitespaceTrivia */ || token() === 4 /* NewLineTrivia */) {
-                        nextJSDocToken();
+                        nextTokenJSDoc();
                     }
                 }
                 function skipWhitespaceOrAsterisk() {
                     if (token() === 5 /* WhitespaceTrivia */ || token() === 4 /* NewLineTrivia */) {
                         if (lookAhead(isNextNonwhitespaceTokenEndOfFile)) {
-                            return; // Don't skip whitespace prior to EoF (or end of comment) - that shouldn't be included in any node's range
+                            return ""; // Don't skip whitespace prior to EoF (or end of comment) - that shouldn't be included in any node's range
                         }
                     }
                     var precedingLineBreak = scanner.hasPrecedingLineBreak();
+                    var seenLineBreak = false;
+                    var indentText = "";
                     while ((precedingLineBreak && token() === 40 /* AsteriskToken */) || token() === 5 /* WhitespaceTrivia */ || token() === 4 /* NewLineTrivia */) {
+                        indentText += scanner.getTokenText();
                         if (token() === 4 /* NewLineTrivia */) {
                             precedingLineBreak = true;
+                            seenLineBreak = true;
+                            indentText = "";
                         }
                         else if (token() === 40 /* AsteriskToken */) {
                             precedingLineBreak = false;
                         }
-                        nextJSDocToken();
+                        nextTokenJSDoc();
                     }
+                    return seenLineBreak ? indentText : "";
                 }
-                function parseTag(indent) {
+                function parseTag(margin) {
                     ts.Debug.assert(token() === 58 /* AtToken */);
                     var start = scanner.getTokenPos();
-                    nextJSDocToken();
+                    nextTokenJSDoc();
                     var tagName = parseJSDocIdentifierName(/*message*/ undefined);
-                    skipWhitespaceOrAsterisk();
+                    var indentText = skipWhitespaceOrAsterisk();
                     var tag;
                     switch (tagName.escapedText) {
+                        case "author":
+                            tag = parseAuthorTag(start, tagName, margin);
+                            break;
                         case "augments":
                         case "extends":
                             tag = parseAugmentsTag(start, tagName);
@@ -22331,7 +22629,7 @@ var ts;
                         case "arg":
                         case "argument":
                         case "param":
-                            return parseParameterOrPropertyTag(start, tagName, 2 /* Parameter */, indent);
+                            return parseParameterOrPropertyTag(start, tagName, 2 /* Parameter */, margin);
                         case "return":
                         case "returns":
                             tag = parseReturnTag(start, tagName);
@@ -22343,10 +22641,10 @@ var ts;
                             tag = parseTypeTag(start, tagName);
                             break;
                         case "typedef":
-                            tag = parseTypedefTag(start, tagName, indent);
+                            tag = parseTypedefTag(start, tagName, margin);
                             break;
                         case "callback":
-                            tag = parseCallbackTag(start, tagName, indent);
+                            tag = parseCallbackTag(start, tagName, margin);
                             break;
                         default:
                             tag = parseUnknownTag(start, tagName);
@@ -22354,11 +22652,14 @@ var ts;
                     }
                     if (!tag.comment) {
                         // some tags, like typedef and callback, have already parsed their comments earlier
-                        tag.comment = parseTagComments(indent + tag.end - tag.pos);
+                        if (!indentText) {
+                            margin += tag.end - tag.pos;
+                        }
+                        tag.comment = parseTagComments(margin, indentText.slice(margin));
                     }
                     return tag;
                 }
-                function parseTagComments(indent) {
+                function parseTagComments(indent, initialMargin) {
                     var comments = [];
                     var state = 0 /* BeginningOfLine */;
                     var margin;
@@ -22369,42 +22670,61 @@ var ts;
                         comments.push(text);
                         indent += text.length;
                     }
+                    if (initialMargin) {
+                        // jump straight to saving comments if there is some initial indentation
+                        pushComment(initialMargin);
+                        state = 2 /* SavingComments */;
+                    }
                     var tok = token();
                     loop: while (true) {
                         switch (tok) {
                             case 4 /* NewLineTrivia */:
                                 if (state >= 1 /* SawAsterisk */) {
                                     state = 0 /* BeginningOfLine */;
+                                    // don't use pushComment here because we want to keep the margin unchanged
                                     comments.push(scanner.getTokenText());
                                 }
                                 indent = 0;
                                 break;
                             case 58 /* AtToken */:
+                                if (state === 3 /* SavingBackticks */) {
+                                    comments.push(scanner.getTokenText());
+                                    break;
+                                }
                                 scanner.setTextPos(scanner.getTextPos() - 1);
                             // falls through
                             case 1 /* EndOfFileToken */:
                                 // Done
                                 break loop;
                             case 5 /* WhitespaceTrivia */:
-                                if (state === 2 /* SavingComments */) {
+                                if (state === 2 /* SavingComments */ || state === 3 /* SavingBackticks */) {
                                     pushComment(scanner.getTokenText());
                                 }
                                 else {
                                     var whitespace = scanner.getTokenText();
                                     // if the whitespace crosses the margin, take only the whitespace that passes the margin
                                     if (margin !== undefined && indent + whitespace.length > margin) {
-                                        comments.push(whitespace.slice(margin - indent - 1));
+                                        comments.push(whitespace.slice(margin - indent));
                                     }
                                     indent += whitespace.length;
                                 }
                                 break;
                             case 18 /* OpenBraceToken */:
                                 state = 2 /* SavingComments */;
-                                if (lookAhead(function () { return nextJSDocToken() === 58 /* AtToken */ && ts.tokenIsIdentifierOrKeyword(nextJSDocToken()) && scanner.getTokenText() === "link"; })) {
+                                if (lookAhead(function () { return nextTokenJSDoc() === 58 /* AtToken */ && ts.tokenIsIdentifierOrKeyword(nextTokenJSDoc()) && scanner.getTokenText() === "link"; })) {
                                     pushComment(scanner.getTokenText());
-                                    nextJSDocToken();
+                                    nextTokenJSDoc();
                                     pushComment(scanner.getTokenText());
-                                    nextJSDocToken();
+                                    nextTokenJSDoc();
+                                }
+                                pushComment(scanner.getTokenText());
+                                break;
+                            case 59 /* BacktickToken */:
+                                if (state === 3 /* SavingBackticks */) {
+                                    state = 2 /* SavingComments */;
+                                }
+                                else {
+                                    state = 3 /* SavingBackticks */;
                                 }
                                 pushComment(scanner.getTokenText());
                                 break;
@@ -22418,18 +22738,20 @@ var ts;
                             // record the * as a comment
                             // falls through
                             default:
-                                state = 2 /* SavingComments */; // leading identifiers start recording as well
+                                if (state !== 3 /* SavingBackticks */) {
+                                    state = 2 /* SavingComments */; // leading identifiers start recording as well
+                                }
                                 pushComment(scanner.getTokenText());
                                 break;
                         }
-                        tok = nextJSDocToken();
+                        tok = nextTokenJSDoc();
                     }
                     removeLeadingNewlines(comments);
                     removeTrailingWhitespace(comments);
                     return comments.length === 0 ? undefined : comments.join("");
                 }
                 function parseUnknownTag(start, tagName) {
-                    var result = createNode(299 /* JSDocTag */, start);
+                    var result = createNode(300 /* JSDocTag */, start);
                     result.tagName = tagName;
                     return finishNode(result);
                 }
@@ -22451,17 +22773,21 @@ var ts;
                     return token() === 18 /* OpenBraceToken */ ? parseJSDocTypeExpression() : undefined;
                 }
                 function parseBracketNameInPropertyAndParamTag() {
-                    if (token() === 14 /* NoSubstitutionTemplateLiteral */) {
-                        // a markdown-quoted name: `arg` is not legal jsdoc, but occurs in the wild
-                        return { name: createIdentifier(/*isIdentifier*/ true), isBracketed: false };
-                    }
                     // Looking for something like '[foo]', 'foo', '[foo.bar]' or 'foo.bar'
-                    var isBracketed = parseOptional(22 /* OpenBracketToken */);
+                    var isBracketed = parseOptionalJsdoc(22 /* OpenBracketToken */);
+                    if (isBracketed) {
+                        skipWhitespace();
+                    }
+                    // a markdown-quoted name: `arg` is not legal jsdoc, but occurs in the wild
+                    var isBackquoted = parseOptionalJsdoc(59 /* BacktickToken */);
                     var name = parseJSDocEntityName();
+                    if (isBackquoted) {
+                        parseExpectedTokenJSDoc(59 /* BacktickToken */);
+                    }
                     if (isBracketed) {
                         skipWhitespace();
                         // May have an optional default, e.g. '[foo = 42]'
-                        if (parseOptionalToken(59 /* EqualsToken */)) {
+                        if (parseOptionalToken(60 /* EqualsToken */)) {
                             parseExpression();
                         }
                         parseExpected(23 /* CloseBracketToken */);
@@ -22470,9 +22796,9 @@ var ts;
                 }
                 function isObjectOrObjectArrayTypeReference(node) {
                     switch (node.kind) {
-                        case 136 /* ObjectKeyword */:
+                        case 137 /* ObjectKeyword */:
                             return true;
-                        case 169 /* ArrayType */:
+                        case 170 /* ArrayType */:
                             return isObjectOrObjectArrayTypeReference(node.elementType);
                         default:
                             return ts.isTypeReferenceNode(node) && ts.isIdentifier(node.typeName) && node.typeName.escapedText === "Object";
@@ -22488,8 +22814,8 @@ var ts;
                         typeExpression = tryParseTypeExpression();
                     }
                     var result = target === 1 /* Property */ ?
-                        createNode(310 /* JSDocPropertyTag */, start) :
-                        createNode(304 /* JSDocParameterTag */, start);
+                        createNode(312 /* JSDocPropertyTag */, start) :
+                        createNode(306 /* JSDocParameterTag */, start);
                     var comment = parseTagComments(indent + scanner.getStartPos() - start);
                     var nestedTypeLiteral = target !== 4 /* CallbackParameter */ && parseNestedTypeLiteral(typeExpression, name, target, indent);
                     if (nestedTypeLiteral) {
@@ -22506,20 +22832,20 @@ var ts;
                 }
                 function parseNestedTypeLiteral(typeExpression, name, target, indent) {
                     if (typeExpression && isObjectOrObjectArrayTypeReference(typeExpression.type)) {
-                        var typeLiteralExpression = createNode(288 /* JSDocTypeExpression */, scanner.getTokenPos());
+                        var typeLiteralExpression = createNode(289 /* JSDocTypeExpression */, scanner.getTokenPos());
                         var child = void 0;
                         var jsdocTypeLiteral = void 0;
                         var start_2 = scanner.getStartPos();
                         var children = void 0;
                         while (child = tryParse(function () { return parseChildParameterOrPropertyTag(target, indent, name); })) {
-                            if (child.kind === 304 /* JSDocParameterTag */ || child.kind === 310 /* JSDocPropertyTag */) {
+                            if (child.kind === 306 /* JSDocParameterTag */ || child.kind === 312 /* JSDocPropertyTag */) {
                                 children = ts.append(children, child);
                             }
                         }
                         if (children) {
-                            jsdocTypeLiteral = createNode(297 /* JSDocTypeLiteral */, start_2);
+                            jsdocTypeLiteral = createNode(298 /* JSDocTypeLiteral */, start_2);
                             jsdocTypeLiteral.jsDocPropertyTags = children;
-                            if (typeExpression.type.kind === 169 /* ArrayType */) {
+                            if (typeExpression.type.kind === 170 /* ArrayType */) {
                                 jsdocTypeLiteral.isArrayType = true;
                             }
                             typeLiteralExpression.type = finishNode(jsdocTypeLiteral);
@@ -22528,32 +22854,86 @@ var ts;
                     }
                 }
                 function parseReturnTag(start, tagName) {
-                    if (ts.forEach(tags, function (t) { return t.kind === 305 /* JSDocReturnTag */; })) {
+                    if (ts.some(tags, ts.isJSDocReturnTag)) {
                         parseErrorAt(tagName.pos, scanner.getTokenPos(), ts.Diagnostics._0_tag_already_specified, tagName.escapedText);
                     }
-                    var result = createNode(305 /* JSDocReturnTag */, start);
+                    var result = createNode(307 /* JSDocReturnTag */, start);
                     result.tagName = tagName;
                     result.typeExpression = tryParseTypeExpression();
                     return finishNode(result);
                 }
                 function parseTypeTag(start, tagName) {
-                    if (ts.forEach(tags, function (t) { return t.kind === 307 /* JSDocTypeTag */; })) {
+                    if (ts.some(tags, ts.isJSDocTypeTag)) {
                         parseErrorAt(tagName.pos, scanner.getTokenPos(), ts.Diagnostics._0_tag_already_specified, tagName.escapedText);
                     }
-                    var result = createNode(307 /* JSDocTypeTag */, start);
+                    var result = createNode(309 /* JSDocTypeTag */, start);
                     result.tagName = tagName;
                     result.typeExpression = parseJSDocTypeExpression(/*mayOmitBraces*/ true);
                     return finishNode(result);
                 }
+                function parseAuthorTag(start, tagName, indent) {
+                    var result = createNode(302 /* JSDocAuthorTag */, start);
+                    result.tagName = tagName;
+                    var authorInfoWithEmail = tryParse(function () { return tryParseAuthorNameAndEmail(); });
+                    if (!authorInfoWithEmail) {
+                        return finishNode(result);
+                    }
+                    result.comment = authorInfoWithEmail;
+                    if (lookAhead(function () { return nextToken() !== 4 /* NewLineTrivia */; })) {
+                        var comment = parseTagComments(indent);
+                        if (comment) {
+                            result.comment += comment;
+                        }
+                    }
+                    return finishNode(result);
+                }
+                function tryParseAuthorNameAndEmail() {
+                    var comments = [];
+                    var seenLessThan = false;
+                    var seenGreaterThan = false;
+                    var token = scanner.getToken();
+                    loop: while (true) {
+                        switch (token) {
+                            case 73 /* Identifier */:
+                            case 5 /* WhitespaceTrivia */:
+                            case 24 /* DotToken */:
+                            case 58 /* AtToken */:
+                                comments.push(scanner.getTokenText());
+                                break;
+                            case 28 /* LessThanToken */:
+                                if (seenLessThan || seenGreaterThan) {
+                                    return;
+                                }
+                                seenLessThan = true;
+                                comments.push(scanner.getTokenText());
+                                break;
+                            case 30 /* GreaterThanToken */:
+                                if (!seenLessThan || seenGreaterThan) {
+                                    return;
+                                }
+                                seenGreaterThan = true;
+                                comments.push(scanner.getTokenText());
+                                scanner.setTextPos(scanner.getTokenPos() + 1);
+                                break loop;
+                            case 4 /* NewLineTrivia */:
+                            case 1 /* EndOfFileToken */:
+                                break loop;
+                        }
+                        token = nextTokenJSDoc();
+                    }
+                    if (seenLessThan && seenGreaterThan) {
+                        return comments.length === 0 ? undefined : comments.join("");
+                    }
+                }
                 function parseAugmentsTag(start, tagName) {
-                    var result = createNode(300 /* JSDocAugmentsTag */, start);
+                    var result = createNode(301 /* JSDocAugmentsTag */, start);
                     result.tagName = tagName;
                     result.class = parseExpressionWithTypeArgumentsForAugments();
                     return finishNode(result);
                 }
                 function parseExpressionWithTypeArgumentsForAugments() {
                     var usedBrace = parseOptional(18 /* OpenBraceToken */);
-                    var node = createNode(211 /* ExpressionWithTypeArguments */);
+                    var node = createNode(212 /* ExpressionWithTypeArguments */);
                     node.expression = parsePropertyAccessEntityNameExpression();
                     node.typeArguments = tryParseTypeArguments();
                     var res = finishNode(node);
@@ -22565,7 +22945,7 @@ var ts;
                 function parsePropertyAccessEntityNameExpression() {
                     var node = parseJSDocIdentifierName();
                     while (parseOptional(24 /* DotToken */)) {
-                        var prop = createNode(189 /* PropertyAccessExpression */, node.pos);
+                        var prop = createNode(190 /* PropertyAccessExpression */, node.pos);
                         prop.expression = node;
                         prop.name = parseJSDocIdentifierName();
                         node = finishNode(prop);
@@ -22573,19 +22953,19 @@ var ts;
                     return node;
                 }
                 function parseClassTag(start, tagName) {
-                    var tag = createNode(301 /* JSDocClassTag */, start);
+                    var tag = createNode(303 /* JSDocClassTag */, start);
                     tag.tagName = tagName;
                     return finishNode(tag);
                 }
                 function parseThisTag(start, tagName) {
-                    var tag = createNode(306 /* JSDocThisTag */, start);
+                    var tag = createNode(308 /* JSDocThisTag */, start);
                     tag.tagName = tagName;
                     tag.typeExpression = parseJSDocTypeExpression(/*mayOmitBraces*/ true);
                     skipWhitespace();
                     return finishNode(tag);
                 }
                 function parseEnumTag(start, tagName) {
-                    var tag = createNode(303 /* JSDocEnumTag */, start);
+                    var tag = createNode(305 /* JSDocEnumTag */, start);
                     tag.tagName = tagName;
                     tag.typeExpression = parseJSDocTypeExpression(/*mayOmitBraces*/ true);
                     skipWhitespace();
@@ -22594,7 +22974,7 @@ var ts;
                 function parseTypedefTag(start, tagName, indent) {
                     var typeExpression = tryParseTypeExpression();
                     skipWhitespaceOrAsterisk();
-                    var typedefTag = createNode(309 /* JSDocTypedefTag */, start);
+                    var typedefTag = createNode(311 /* JSDocTypedefTag */, start);
                     typedefTag.tagName = tagName;
                     typedefTag.fullName = parseJSDocTypeNameWithNamespace();
                     typedefTag.name = getJSDocTypeAliasName(typedefTag.fullName);
@@ -22608,9 +22988,9 @@ var ts;
                         var childTypeTag = void 0;
                         while (child = tryParse(function () { return parseChildPropertyTag(indent); })) {
                             if (!jsdocTypeLiteral) {
-                                jsdocTypeLiteral = createNode(297 /* JSDocTypeLiteral */, start);
+                                jsdocTypeLiteral = createNode(298 /* JSDocTypeLiteral */, start);
                             }
-                            if (child.kind === 307 /* JSDocTypeTag */) {
+                            if (child.kind === 309 /* JSDocTypeTag */) {
                                 if (childTypeTag) {
                                     break;
                                 }
@@ -22623,7 +23003,7 @@ var ts;
                             }
                         }
                         if (jsdocTypeLiteral) {
-                            if (typeExpression && typeExpression.type.kind === 169 /* ArrayType */) {
+                            if (typeExpression && typeExpression.type.kind === 170 /* ArrayType */) {
                                 jsdocTypeLiteral.isArrayType = true;
                             }
                             typedefTag.typeExpression = childTypeTag && childTypeTag.typeExpression && !isObjectOrObjectArrayTypeReference(childTypeTag.typeExpression.type) ?
@@ -22642,7 +23022,7 @@ var ts;
                     }
                     var typeNameOrNamespaceName = parseJSDocIdentifierName();
                     if (parseOptional(24 /* DotToken */)) {
-                        var jsDocNamespaceNode = createNode(244 /* ModuleDeclaration */, pos);
+                        var jsDocNamespaceNode = createNode(245 /* ModuleDeclaration */, pos);
                         if (nested) {
                             jsDocNamespaceNode.flags |= 4 /* NestedNamespace */;
                         }
@@ -22656,14 +23036,14 @@ var ts;
                     return typeNameOrNamespaceName;
                 }
                 function parseCallbackTag(start, tagName, indent) {
-                    var callbackTag = createNode(302 /* JSDocCallbackTag */, start);
+                    var callbackTag = createNode(304 /* JSDocCallbackTag */, start);
                     callbackTag.tagName = tagName;
                     callbackTag.fullName = parseJSDocTypeNameWithNamespace();
                     callbackTag.name = getJSDocTypeAliasName(callbackTag.fullName);
                     skipWhitespace();
                     callbackTag.comment = parseTagComments(indent);
                     var child;
-                    var jsdocSignature = createNode(298 /* JSDocSignature */, start);
+                    var jsdocSignature = createNode(299 /* JSDocSignature */, start);
                     jsdocSignature.parameters = [];
                     while (child = tryParse(function () { return parseChildParameterOrPropertyTag(4 /* CallbackParameter */, indent); })) {
                         jsdocSignature.parameters = ts.append(jsdocSignature.parameters, child);
@@ -22671,7 +23051,7 @@ var ts;
                     var returnTag = tryParse(function () {
                         if (parseOptionalJsdoc(58 /* AtToken */)) {
                             var tag = parseTag(indent);
-                            if (tag && tag.kind === 305 /* JSDocReturnTag */) {
+                            if (tag && tag.kind === 307 /* JSDocReturnTag */) {
                                 return tag;
                             }
                         }
@@ -22712,11 +23092,11 @@ var ts;
                     var canParseTag = true;
                     var seenAsterisk = false;
                     while (true) {
-                        switch (nextJSDocToken()) {
+                        switch (nextTokenJSDoc()) {
                             case 58 /* AtToken */:
                                 if (canParseTag) {
                                     var child = tryParseChildTag(target, indent);
-                                    if (child && (child.kind === 304 /* JSDocParameterTag */ || child.kind === 310 /* JSDocPropertyTag */) &&
+                                    if (child && (child.kind === 306 /* JSDocParameterTag */ || child.kind === 312 /* JSDocPropertyTag */) &&
                                         target !== 4 /* CallbackParameter */ &&
                                         name && (ts.isIdentifier(child.name) || !escapedTextsEqual(name, child.name.left))) {
                                         return false;
@@ -22735,7 +23115,7 @@ var ts;
                                 }
                                 seenAsterisk = true;
                                 break;
-                            case 72 /* Identifier */:
+                            case 73 /* Identifier */:
                                 canParseTag = false;
                                 break;
                             case 1 /* EndOfFileToken */:
@@ -22746,7 +23126,7 @@ var ts;
                 function tryParseChildTag(target, indent) {
                     ts.Debug.assert(token() === 58 /* AtToken */);
                     var start = scanner.getStartPos();
-                    nextJSDocToken();
+                    nextTokenJSDoc();
                     var tagName = parseJSDocIdentifierName();
                     skipWhitespace();
                     var t;
@@ -22780,25 +23160,22 @@ var ts;
                     var typeParametersPos = getNodePos();
                     do {
                         skipWhitespace();
-                        var typeParameter = createNode(150 /* TypeParameter */);
+                        var typeParameter = createNode(151 /* TypeParameter */);
                         typeParameter.name = parseJSDocIdentifierName(ts.Diagnostics.Unexpected_token_A_type_parameter_name_was_expected_without_curly_braces);
                         finishNode(typeParameter);
                         skipWhitespace();
                         typeParameters.push(typeParameter);
                     } while (parseOptionalJsdoc(27 /* CommaToken */));
-                    var result = createNode(308 /* JSDocTemplateTag */, start);
+                    var result = createNode(310 /* JSDocTemplateTag */, start);
                     result.tagName = tagName;
                     result.constraint = constraint;
                     result.typeParameters = createNodeArray(typeParameters, typeParametersPos);
                     finishNode(result);
                     return result;
                 }
-                function nextJSDocToken() {
-                    return currentToken = scanner.scanJSDocToken();
-                }
                 function parseOptionalJsdoc(t) {
                     if (token() === t) {
-                        nextJSDocToken();
+                        nextTokenJSDoc();
                         return true;
                     }
                     return false;
@@ -22822,14 +23199,14 @@ var ts;
                 }
                 function parseJSDocIdentifierName(message) {
                     if (!ts.tokenIsIdentifierOrKeyword(token())) {
-                        return createMissingNode(72 /* Identifier */, /*reportAtCurrentPosition*/ !message, message || ts.Diagnostics.Identifier_expected);
+                        return createMissingNode(73 /* Identifier */, /*reportAtCurrentPosition*/ !message, message || ts.Diagnostics.Identifier_expected);
                     }
                     var pos = scanner.getTokenPos();
                     var end = scanner.getTextPos();
-                    var result = createNode(72 /* Identifier */, pos);
+                    var result = createNode(73 /* Identifier */, pos);
                     result.escapedText = ts.escapeLeadingUnderscores(scanner.getTokenText());
                     finishNode(result, end);
-                    nextJSDocToken();
+                    nextTokenJSDoc();
                     return result;
                 }
             }
@@ -22954,7 +23331,7 @@ var ts;
             switch (node.kind) {
                 case 10 /* StringLiteral */:
                 case 8 /* NumericLiteral */:
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return true;
             }
             return false;
@@ -23321,28 +23698,16 @@ var ts;
     ts.isDeclarationFileName = isDeclarationFileName;
     /*@internal*/
     function processCommentPragmas(context, sourceText) {
-        var triviaScanner = ts.createScanner(context.languageVersion, /*skipTrivia*/ false, 0 /* Standard */, sourceText);
         var pragmas = [];
-        // Keep scanning all the leading trivia in the file until we get to something that
-        // isn't trivia.  Any single line comment will be analyzed to see if it is a
-        // reference comment.
-        while (true) {
-            var kind = triviaScanner.scan();
-            if (!ts.isTrivia(kind)) {
-                break;
-            }
-            var range = {
-                kind: triviaScanner.getToken(),
-                pos: triviaScanner.getTokenPos(),
-                end: triviaScanner.getTextPos(),
-            };
+        for (var _i = 0, _a = ts.getLeadingCommentRanges(sourceText, 0) || ts.emptyArray; _i < _a.length; _i++) {
+            var range = _a[_i];
             var comment = sourceText.substring(range.pos, range.end);
             extractPragmas(pragmas, range, comment);
         }
         context.pragmas = ts.createMap();
-        for (var _i = 0, pragmas_1 = pragmas; _i < pragmas_1.length; _i++) {
-            var pragma = pragmas_1[_i];
-            if (context.pragmas.has(pragma.name)) { // TODO: GH#18217
+        for (var _b = 0, pragmas_1 = pragmas; _b < pragmas_1.length; _b++) {
+            var pragma = pragmas_1[_b];
+            if (context.pragmas.has(pragma.name)) {
                 var currentValue = context.pragmas.get(pragma.name);
                 if (currentValue instanceof Array) {
                     currentValue.push(pragma.args);
@@ -23373,7 +23738,6 @@ var ts;
                     var typeReferenceDirectives_1 = context.typeReferenceDirectives;
                     var libReferenceDirectives_1 = context.libReferenceDirectives;
                     ts.forEach(ts.toArray(entryOrList), function (arg) {
-                        // TODO: GH#18217
                         var _a = arg.arguments, types = _a.types, lib = _a.lib, path = _a.path;
                         if (arg.arguments["no-default-lib"]) {
                             context.hasNoDefaultLib = true;
@@ -23394,7 +23758,7 @@ var ts;
                     break;
                 }
                 case "amd-dependency": {
-                    context.amdDependencies = ts.map(ts.toArray(entryOrList), function (x) { return ({ name: x.arguments.name, path: x.arguments.path }); }); // TODO: GH#18217
+                    context.amdDependencies = ts.map(ts.toArray(entryOrList), function (x) { return ({ name: x.arguments.name, path: x.arguments.path }); });
                     break;
                 }
                 case "amd-module": {
@@ -23417,7 +23781,7 @@ var ts;
                 case "ts-check": {
                     // _last_ of either nocheck or check in a file is the "winner"
                     ts.forEach(ts.toArray(entryOrList), function (entry) {
-                        if (!context.checkJsDirective || entry.range.pos > context.checkJsDirective.pos) { // TODO: GH#18217
+                        if (!context.checkJsDirective || entry.range.pos > context.checkJsDirective.pos) {
                             context.checkJsDirective = {
                                 enabled: key === "ts-check",
                                 end: entry.range.end,
@@ -23533,10 +23897,10 @@ var ts;
         if (lhs.kind !== rhs.kind) {
             return false;
         }
-        if (lhs.kind === 72 /* Identifier */) {
+        if (lhs.kind === 73 /* Identifier */) {
             return lhs.escapedText === rhs.escapedText;
         }
-        if (lhs.kind === 100 /* ThisKeyword */) {
+        if (lhs.kind === 101 /* ThisKeyword */) {
             return true;
         }
         // If we are at this statement then we must have PropertyAccessExpression and because tag name in Jsx element can only
@@ -23565,6 +23929,7 @@ var ts;
         ["es2017", "lib.es2017.d.ts"],
         ["es2018", "lib.es2018.d.ts"],
         ["es2019", "lib.es2019.d.ts"],
+        ["es2020", "lib.es2020.d.ts"],
         ["esnext", "lib.esnext.d.ts"],
         // Host only
         ["dom", "lib.dom.d.ts"],
@@ -23588,13 +23953,17 @@ var ts;
         ["es2017.string", "lib.es2017.string.d.ts"],
         ["es2017.intl", "lib.es2017.intl.d.ts"],
         ["es2017.typedarrays", "lib.es2017.typedarrays.d.ts"],
+        ["es2018.asyncgenerator", "lib.es2018.asyncgenerator.d.ts"],
         ["es2018.asynciterable", "lib.es2018.asynciterable.d.ts"],
         ["es2018.intl", "lib.es2018.intl.d.ts"],
         ["es2018.promise", "lib.es2018.promise.d.ts"],
         ["es2018.regexp", "lib.es2018.regexp.d.ts"],
         ["es2019.array", "lib.es2019.array.d.ts"],
+        ["es2019.object", "lib.es2019.object.d.ts"],
         ["es2019.string", "lib.es2019.string.d.ts"],
         ["es2019.symbol", "lib.es2019.symbol.d.ts"],
+        ["es2020.string", "lib.es2020.string.d.ts"],
+        ["es2020.symbol.wellknown", "lib.es2020.symbol.wellknown.d.ts"],
         ["esnext.array", "lib.es2019.array.d.ts"],
         ["esnext.symbol", "lib.es2019.symbol.d.ts"],
         ["esnext.asynciterable", "lib.es2018.asynciterable.d.ts"],
@@ -23681,6 +24050,19 @@ var ts;
             category: ts.Diagnostics.Advanced_Options,
             description: ts.Diagnostics.Show_verbose_diagnostic_information
         },
+        {
+            name: "incremental",
+            shortName: "i",
+            type: "boolean",
+            category: ts.Diagnostics.Basic_Options,
+            description: ts.Diagnostics.Enable_incremental_compilation,
+        },
+        {
+            name: "locale",
+            type: "string",
+            category: ts.Diagnostics.Advanced_Options,
+            description: ts.Diagnostics.The_locale_used_when_displaying_messages_to_the_user_e_g_en_us
+        },
     ];
     /* @internal */
     ts.optionDeclarations = ts.commonOptionsWithBuild.concat([
@@ -23744,10 +24126,12 @@ var ts;
                 es2017: 4 /* ES2017 */,
                 es2018: 5 /* ES2018 */,
                 es2019: 6 /* ES2019 */,
-                esnext: 7 /* ESNext */,
+                es2020: 7 /* ES2020 */,
+                esnext: 99 /* ESNext */,
             }),
             affectsSourceFile: true,
             affectsModuleResolution: true,
+            affectsEmit: true,
             paramType: ts.Diagnostics.VERSION,
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Basic_Options,
@@ -23767,6 +24151,7 @@ var ts;
                 esnext: ts.ModuleKind.ESNext
             }),
             affectsModuleResolution: true,
+            affectsEmit: true,
             paramType: ts.Diagnostics.KIND,
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Basic_Options,
@@ -23815,6 +24200,7 @@ var ts;
             name: "declaration",
             shortName: "d",
             type: "boolean",
+            affectsEmit: true,
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Basic_Options,
             description: ts.Diagnostics.Generates_corresponding_d_ts_file,
@@ -23822,6 +24208,7 @@ var ts;
         {
             name: "declarationMap",
             type: "boolean",
+            affectsEmit: true,
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Basic_Options,
             description: ts.Diagnostics.Generates_a_sourcemap_for_each_corresponding_d_ts_file,
@@ -23829,12 +24216,14 @@ var ts;
         {
             name: "emitDeclarationOnly",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Advanced_Options,
             description: ts.Diagnostics.Only_emit_d_ts_declaration_files,
         },
         {
             name: "sourceMap",
             type: "boolean",
+            affectsEmit: true,
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Basic_Options,
             description: ts.Diagnostics.Generates_corresponding_map_file,
@@ -23842,6 +24231,7 @@ var ts;
         {
             name: "outFile",
             type: "string",
+            affectsEmit: true,
             isFilePath: true,
             paramType: ts.Diagnostics.FILE,
             showInSimplifiedHelpView: true,
@@ -23851,6 +24241,7 @@ var ts;
         {
             name: "outDir",
             type: "string",
+            affectsEmit: true,
             isFilePath: true,
             paramType: ts.Diagnostics.DIRECTORY,
             showInSimplifiedHelpView: true,
@@ -23860,6 +24251,7 @@ var ts;
         {
             name: "rootDir",
             type: "string",
+            affectsEmit: true,
             isFilePath: true,
             paramType: ts.Diagnostics.LOCATION,
             category: ts.Diagnostics.Basic_Options,
@@ -23868,29 +24260,24 @@ var ts;
         {
             name: "composite",
             type: "boolean",
+            affectsEmit: true,
             isTSConfigOnly: true,
             category: ts.Diagnostics.Basic_Options,
             description: ts.Diagnostics.Enable_project_compilation,
         },
-        {
-            name: "incremental",
-            type: "boolean",
-            isTSConfigOnly: true,
-            category: ts.Diagnostics.Basic_Options,
-            description: ts.Diagnostics.Enable_incremental_compilation,
-        },
         {
             name: "tsBuildInfoFile",
             type: "string",
+            affectsEmit: true,
             isFilePath: true,
             paramType: ts.Diagnostics.FILE,
-            isTSConfigOnly: true,
             category: ts.Diagnostics.Basic_Options,
             description: ts.Diagnostics.Specify_file_to_store_incremental_compilation_information,
         },
         {
             name: "removeComments",
             type: "boolean",
+            affectsEmit: true,
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Basic_Options,
             description: ts.Diagnostics.Do_not_emit_comments_to_output,
@@ -23898,6 +24285,7 @@ var ts;
         {
             name: "noEmit",
             type: "boolean",
+            affectsEmit: true,
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Basic_Options,
             description: ts.Diagnostics.Do_not_emit_outputs,
@@ -23905,12 +24293,14 @@ var ts;
         {
             name: "importHelpers",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Basic_Options,
             description: ts.Diagnostics.Import_emit_helpers_from_tslib
         },
         {
             name: "downlevelIteration",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Basic_Options,
             description: ts.Diagnostics.Provide_full_support_for_iterables_in_for_of_spread_and_destructuring_when_targeting_ES5_or_ES3
         },
@@ -24104,6 +24494,7 @@ var ts;
             name: "esModuleInterop",
             type: "boolean",
             affectsSemanticDiagnostics: true,
+            affectsEmit: true,
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Module_Resolution_Options,
             description: ts.Diagnostics.Enables_emit_interoperability_between_CommonJS_and_ES_Modules_via_creation_of_namespace_objects_for_all_imports_Implies_allowSyntheticDefaultImports
@@ -24114,10 +24505,18 @@ var ts;
             category: ts.Diagnostics.Module_Resolution_Options,
             description: ts.Diagnostics.Do_not_resolve_the_real_path_of_symlinks,
         },
+        {
+            name: "allowUmdGlobalAccess",
+            type: "boolean",
+            affectsSemanticDiagnostics: true,
+            category: ts.Diagnostics.Module_Resolution_Options,
+            description: ts.Diagnostics.Allow_accessing_UMD_globals_from_modules,
+        },
         // Source Maps
         {
             name: "sourceRoot",
             type: "string",
+            affectsEmit: true,
             paramType: ts.Diagnostics.LOCATION,
             category: ts.Diagnostics.Source_Map_Options,
             description: ts.Diagnostics.Specify_the_location_where_debugger_should_locate_TypeScript_files_instead_of_source_locations,
@@ -24125,6 +24524,7 @@ var ts;
         {
             name: "mapRoot",
             type: "string",
+            affectsEmit: true,
             paramType: ts.Diagnostics.LOCATION,
             category: ts.Diagnostics.Source_Map_Options,
             description: ts.Diagnostics.Specify_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations,
@@ -24132,12 +24532,14 @@ var ts;
         {
             name: "inlineSourceMap",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Source_Map_Options,
             description: ts.Diagnostics.Emit_a_single_file_with_source_maps_instead_of_having_a_separate_file
         },
         {
             name: "inlineSources",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Source_Map_Options,
             description: ts.Diagnostics.Emit_the_source_alongside_the_sourcemaps_within_a_single_file_requires_inlineSourceMap_or_sourceMap_to_be_set
         },
@@ -24170,6 +24572,7 @@ var ts;
         {
             name: "out",
             type: "string",
+            affectsEmit: true,
             isFilePath: false,
             // for correct behaviour, please use outFile
             category: ts.Diagnostics.Advanced_Options,
@@ -24179,6 +24582,7 @@ var ts;
         {
             name: "reactNamespace",
             type: "string",
+            affectsEmit: true,
             category: ts.Diagnostics.Advanced_Options,
             description: ts.Diagnostics.Deprecated_Use_jsxFactory_instead_Specify_the_object_invoked_for_createElement_when_targeting_react_JSX_emit
         },
@@ -24197,21 +24601,17 @@ var ts;
         {
             name: "emitBOM",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Advanced_Options,
             description: ts.Diagnostics.Emit_a_UTF_8_Byte_Order_Mark_BOM_in_the_beginning_of_output_files
         },
-        {
-            name: "locale",
-            type: "string",
-            category: ts.Diagnostics.Advanced_Options,
-            description: ts.Diagnostics.The_locale_used_when_displaying_messages_to_the_user_e_g_en_us
-        },
         {
             name: "newLine",
             type: ts.createMapFromTemplate({
                 crlf: 0 /* CarriageReturnLineFeed */,
                 lf: 1 /* LineFeed */
             }),
+            affectsEmit: true,
             paramType: ts.Diagnostics.NEWLINE,
             category: ts.Diagnostics.Advanced_Options,
             description: ts.Diagnostics.Specify_the_end_of_line_sequence_to_be_used_when_emitting_files_Colon_CRLF_dos_or_LF_unix,
@@ -24239,6 +24639,7 @@ var ts;
         {
             name: "stripInternal",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Advanced_Options,
             description: ts.Diagnostics.Do_not_emit_declarations_for_code_that_has_an_internal_annotation,
         },
@@ -24259,24 +24660,28 @@ var ts;
         {
             name: "noEmitHelpers",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Advanced_Options,
             description: ts.Diagnostics.Do_not_generate_custom_helper_functions_like_extends_in_compiled_output
         },
         {
             name: "noEmitOnError",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Advanced_Options,
             description: ts.Diagnostics.Do_not_emit_outputs_if_any_errors_were_reported,
         },
         {
             name: "preserveConstEnums",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Advanced_Options,
             description: ts.Diagnostics.Do_not_erase_const_enum_declarations_in_generated_code
         },
         {
             name: "declarationDir",
             type: "string",
+            affectsEmit: true,
             isFilePath: true,
             paramType: ts.Diagnostics.DIRECTORY,
             category: ts.Diagnostics.Advanced_Options,
@@ -24359,6 +24764,8 @@ var ts;
     /* @internal */
     ts.semanticDiagnosticsOptionDeclarations = ts.optionDeclarations.filter(function (option) { return !!option.affectsSemanticDiagnostics; });
     /* @internal */
+    ts.affectsEmitOptionDeclarations = ts.optionDeclarations.filter(function (option) { return !!option.affectsEmit; });
+    /* @internal */
     ts.moduleResolutionOptionDeclarations = ts.optionDeclarations.filter(function (option) { return !!option.affectsModuleResolution; });
     /* @internal */
     ts.sourceFileAffectingCompilerOptions = ts.optionDeclarations.filter(function (option) {
@@ -24445,9 +24852,11 @@ var ts;
         return typeAcquisition;
     }
     ts.convertEnableAutoDiscoveryToEnable = convertEnableAutoDiscoveryToEnable;
+    /* @internal */
     function getOptionNameMap() {
         return optionNameMapCache || (optionNameMapCache = createOptionNameMap(ts.optionDeclarations));
     }
+    ts.getOptionNameMap = getOptionNameMap;
     /*@internal*/
     function createOptionNameMap(optionDeclarations) {
         var optionNameMap = ts.createMap();
@@ -24766,7 +25175,7 @@ var ts;
     /**
      * Reads the config file, reports errors if any and exits if the config file cannot be found
      */
-    function getParsedCommandLineOfConfigFile(configFileName, optionsToExtend, host) {
+    function getParsedCommandLineOfConfigFile(configFileName, optionsToExtend, host, extendedConfigCache) {
         var configFileText;
         try {
             configFileText = host.readFile(configFileName);
@@ -24786,7 +25195,9 @@ var ts;
         result.path = ts.toPath(configFileName, cwd, ts.createGetCanonicalFileName(host.useCaseSensitiveFileNames));
         result.resolvedPath = result.path;
         result.originalFileName = result.fileName;
-        return parseJsonSourceFileConfigFileContent(result, host, ts.getNormalizedAbsolutePath(ts.getDirectoryPath(configFileName), cwd), optionsToExtend, ts.getNormalizedAbsolutePath(configFileName, cwd));
+        return parseJsonSourceFileConfigFileContent(result, host, ts.getNormalizedAbsolutePath(ts.getDirectoryPath(configFileName), cwd), optionsToExtend, ts.getNormalizedAbsolutePath(configFileName, cwd), 
+        /*resolutionStack*/ undefined, 
+        /*extraFileExtension*/ undefined, extendedConfigCache);
     }
     ts.getParsedCommandLineOfConfigFile = getParsedCommandLineOfConfigFile;
     /**
@@ -24925,7 +25336,7 @@ var ts;
             var result = returnValue ? {} : undefined;
             for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
                 var element = _a[_i];
-                if (element.kind !== 275 /* PropertyAssignment */) {
+                if (element.kind !== 276 /* PropertyAssignment */) {
                     errors.push(ts.createDiagnosticForNodeInSourceFile(sourceFile, element, ts.Diagnostics.Property_assignment_expected));
                     continue;
                 }
@@ -24981,13 +25392,13 @@ var ts;
         }
         function convertPropertyValueToJson(valueExpression, option) {
             switch (valueExpression.kind) {
-                case 102 /* TrueKeyword */:
+                case 103 /* TrueKeyword */:
                     reportInvalidOptionValue(option && option.type !== "boolean");
                     return true;
-                case 87 /* FalseKeyword */:
+                case 88 /* FalseKeyword */:
                     reportInvalidOptionValue(option && option.type !== "boolean");
                     return false;
-                case 96 /* NullKeyword */:
+                case 97 /* NullKeyword */:
                     reportInvalidOptionValue(option && option.name === "extends"); // "extends" is the only option we don't allow null/undefined for
                     return null; // tslint:disable-line:no-null-keyword
                 case 10 /* StringLiteral */:
@@ -25007,13 +25418,13 @@ var ts;
                 case 8 /* NumericLiteral */:
                     reportInvalidOptionValue(option && option.type !== "number");
                     return Number(valueExpression.text);
-                case 202 /* PrefixUnaryExpression */:
+                case 203 /* PrefixUnaryExpression */:
                     if (valueExpression.operator !== 39 /* MinusToken */ || valueExpression.operand.kind !== 8 /* NumericLiteral */) {
                         break; // not valid JSON syntax
                     }
                     reportInvalidOptionValue(option && option.type !== "number");
                     return -Number(valueExpression.operand.text);
-                case 188 /* ObjectLiteralExpression */:
+                case 189 /* ObjectLiteralExpression */:
                     reportInvalidOptionValue(option && option.type !== "object");
                     var objectLiteralExpression = valueExpression;
                     // Currently having element option declaration in the tsconfig with type "object"
@@ -25030,7 +25441,7 @@ var ts;
                         return convertObjectLiteralExpressionToJson(objectLiteralExpression, /* knownOptions*/ undefined, 
                         /*extraKeyDiagnosticMessage */ undefined, /*parentOption*/ undefined);
                     }
-                case 187 /* ArrayLiteralExpression */:
+                case 188 /* ArrayLiteralExpression */:
                     reportInvalidOptionValue(option && option.type !== "list");
                     return convertArrayLiteralExpressionToJson(valueExpression.elements, option && option.element);
             }
@@ -25202,7 +25613,10 @@ var ts;
                 case "object":
                     return {};
                 default:
-                    return option.type.keys().next().value;
+                    var iterResult = option.type.keys().next();
+                    if (!iterResult.done)
+                        return iterResult.value;
+                    return ts.Debug.fail("Expected 'option.type' to have entries.");
             }
         }
         function makePadding(paddingLength) {
@@ -25286,8 +25700,8 @@ var ts;
      * @param basePath A root directory to resolve relative path entries in the config
      *    file to. e.g. outDir
      */
-    function parseJsonConfigFileContent(json, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions) {
-        return parseJsonConfigFileContentWorker(json, /*sourceFile*/ undefined, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions);
+    function parseJsonConfigFileContent(json, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions, extendedConfigCache) {
+        return parseJsonConfigFileContentWorker(json, /*sourceFile*/ undefined, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions, extendedConfigCache);
     }
     ts.parseJsonConfigFileContent = parseJsonConfigFileContent;
     /**
@@ -25297,8 +25711,8 @@ var ts;
      * @param basePath A root directory to resolve relative path entries in the config
      *    file to. e.g. outDir
      */
-    function parseJsonSourceFileConfigFileContent(sourceFile, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions) {
-        return parseJsonConfigFileContentWorker(/*json*/ undefined, sourceFile, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions);
+    function parseJsonSourceFileConfigFileContent(sourceFile, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions, extendedConfigCache) {
+        return parseJsonConfigFileContentWorker(/*json*/ undefined, sourceFile, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions, extendedConfigCache);
     }
     ts.parseJsonSourceFileConfigFileContent = parseJsonSourceFileConfigFileContent;
     /*@internal*/
@@ -25326,13 +25740,13 @@ var ts;
      *    file to. e.g. outDir
      * @param resolutionStack Only present for backwards-compatibility. Should be empty.
      */
-    function parseJsonConfigFileContentWorker(json, sourceFile, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions) {
+    function parseJsonConfigFileContentWorker(json, sourceFile, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions, extendedConfigCache) {
         if (existingOptions === void 0) { existingOptions = {}; }
         if (resolutionStack === void 0) { resolutionStack = []; }
         if (extraFileExtensions === void 0) { extraFileExtensions = []; }
         ts.Debug.assert((json === undefined && sourceFile !== undefined) || (json !== undefined && sourceFile === undefined));
         var errors = [];
-        var parsedConfig = parseConfig(json, sourceFile, host, basePath, configFileName, resolutionStack, errors);
+        var parsedConfig = parseConfig(json, sourceFile, host, basePath, configFileName, resolutionStack, errors, extendedConfigCache);
         var raw = parsedConfig.raw;
         var options = ts.extend(existingOptions, parsedConfig.options || {});
         options.configFilePath = configFileName && ts.normalizeSlashes(configFileName);
@@ -25472,7 +25886,7 @@ var ts;
      * This *just* extracts options/include/exclude/files out of a config file.
      * It does *not* resolve the included files.
      */
-    function parseConfig(json, sourceFile, host, basePath, configFileName, resolutionStack, errors) {
+    function parseConfig(json, sourceFile, host, basePath, configFileName, resolutionStack, errors, extendedConfigCache) {
         basePath = ts.normalizeSlashes(basePath);
         var resolvedPath = ts.getNormalizedAbsolutePath(configFileName || "", basePath);
         if (resolutionStack.indexOf(resolvedPath) >= 0) {
@@ -25485,7 +25899,7 @@ var ts;
         if (ownConfig.extendedConfigPath) {
             // copy the resolution stack so it is never reused between branches in potential diamond-problem scenarios.
             resolutionStack = resolutionStack.concat([resolvedPath]);
-            var extendedConfig = getExtendedConfig(sourceFile, ownConfig.extendedConfigPath, host, basePath, resolutionStack, errors);
+            var extendedConfig = getExtendedConfig(sourceFile, ownConfig.extendedConfigPath, host, basePath, resolutionStack, errors, extendedConfigCache);
             if (extendedConfig && isSuccessfulParsedTsconfig(extendedConfig)) {
                 var baseRaw_1 = extendedConfig.raw;
                 var raw_1 = ownConfig.raw;
@@ -25582,7 +25996,7 @@ var ts;
             if (!host.fileExists(extendedConfigPath) && !ts.endsWith(extendedConfigPath, ".json" /* Json */)) {
                 extendedConfigPath = extendedConfigPath + ".json";
                 if (!host.fileExists(extendedConfigPath)) {
-                    errors.push(createDiagnostic(ts.Diagnostics.File_0_does_not_exist, extendedConfig));
+                    errors.push(createDiagnostic(ts.Diagnostics.File_0_not_found, extendedConfig));
                     return undefined;
                 }
             }
@@ -25593,38 +26007,52 @@ var ts;
         if (resolved.resolvedModule) {
             return resolved.resolvedModule.resolvedFileName;
         }
-        errors.push(createDiagnostic(ts.Diagnostics.File_0_does_not_exist, extendedConfig));
+        errors.push(createDiagnostic(ts.Diagnostics.File_0_not_found, extendedConfig));
         return undefined;
     }
-    function getExtendedConfig(sourceFile, extendedConfigPath, host, basePath, resolutionStack, errors) {
+    function getExtendedConfig(sourceFile, extendedConfigPath, host, basePath, resolutionStack, errors, extendedConfigCache) {
         var _a;
-        var extendedResult = readJsonConfigFile(extendedConfigPath, function (path) { return host.readFile(path); });
+        var path = host.useCaseSensitiveFileNames ? extendedConfigPath : ts.toLowerCase(extendedConfigPath);
+        var value;
+        var extendedResult;
+        var extendedConfig;
+        if (extendedConfigCache && (value = extendedConfigCache.get(path))) {
+            (extendedResult = value.extendedResult, extendedConfig = value.extendedConfig);
+        }
+        else {
+            extendedResult = readJsonConfigFile(extendedConfigPath, function (path) { return host.readFile(path); });
+            if (!extendedResult.parseDiagnostics.length) {
+                var extendedDirname = ts.getDirectoryPath(extendedConfigPath);
+                extendedConfig = parseConfig(/*json*/ undefined, extendedResult, host, extendedDirname, ts.getBaseFileName(extendedConfigPath), resolutionStack, errors, extendedConfigCache);
+                if (isSuccessfulParsedTsconfig(extendedConfig)) {
+                    // Update the paths to reflect base path
+                    var relativeDifference_1 = ts.convertToRelativePath(extendedDirname, basePath, ts.identity);
+                    var updatePath_1 = function (path) { return ts.isRootedDiskPath(path) ? path : ts.combinePaths(relativeDifference_1, path); };
+                    var mapPropertiesInRawIfNotUndefined = function (propertyName) {
+                        if (raw_2[propertyName]) {
+                            raw_2[propertyName] = ts.map(raw_2[propertyName], updatePath_1);
+                        }
+                    };
+                    var raw_2 = extendedConfig.raw;
+                    mapPropertiesInRawIfNotUndefined("include");
+                    mapPropertiesInRawIfNotUndefined("exclude");
+                    mapPropertiesInRawIfNotUndefined("files");
+                }
+            }
+            if (extendedConfigCache) {
+                extendedConfigCache.set(path, { extendedResult: extendedResult, extendedConfig: extendedConfig });
+            }
+        }
         if (sourceFile) {
             sourceFile.extendedSourceFiles = [extendedResult.fileName];
+            if (extendedResult.extendedSourceFiles) {
+                (_a = sourceFile.extendedSourceFiles).push.apply(_a, extendedResult.extendedSourceFiles);
+            }
         }
         if (extendedResult.parseDiagnostics.length) {
             errors.push.apply(errors, extendedResult.parseDiagnostics);
             return undefined;
         }
-        var extendedDirname = ts.getDirectoryPath(extendedConfigPath);
-        var extendedConfig = parseConfig(/*json*/ undefined, extendedResult, host, extendedDirname, ts.getBaseFileName(extendedConfigPath), resolutionStack, errors);
-        if (sourceFile && extendedResult.extendedSourceFiles) {
-            (_a = sourceFile.extendedSourceFiles).push.apply(_a, extendedResult.extendedSourceFiles);
-        }
-        if (isSuccessfulParsedTsconfig(extendedConfig)) {
-            // Update the paths to reflect base path
-            var relativeDifference_1 = ts.convertToRelativePath(extendedDirname, basePath, ts.identity);
-            var updatePath_1 = function (path) { return ts.isRootedDiskPath(path) ? path : ts.combinePaths(relativeDifference_1, path); };
-            var mapPropertiesInRawIfNotUndefined = function (propertyName) {
-                if (raw_2[propertyName]) {
-                    raw_2[propertyName] = ts.map(raw_2[propertyName], updatePath_1);
-                }
-            };
-            var raw_2 = extendedConfig.raw;
-            mapPropertiesInRawIfNotUndefined("include");
-            mapPropertiesInRawIfNotUndefined("exclude");
-            mapPropertiesInRawIfNotUndefined("files");
-        }
         return extendedConfig;
     }
     function convertCompileOnSaveOptionFromJson(jsonOption, basePath, errors) {
@@ -26094,11 +26522,22 @@ var ts;
         return !!compilerOptions.traceResolution && host.trace !== undefined;
     }
     ts.isTraceEnabled = isTraceEnabled;
-    function withPackageId(packageId, r) {
+    function withPackageId(packageInfo, r) {
+        var packageId;
+        if (r && packageInfo) {
+            var packageJsonContent = packageInfo.packageJsonContent;
+            if (typeof packageJsonContent.name === "string" && typeof packageJsonContent.version === "string") {
+                packageId = {
+                    name: packageJsonContent.name,
+                    subModuleName: r.path.slice(packageInfo.packageDirectory.length + ts.directorySeparator.length),
+                    version: packageJsonContent.version
+                };
+            }
+        }
         return r && { path: r.path, extension: r.ext, packageId: packageId };
     }
     function noPackageId(r) {
-        return withPackageId(/*packageId*/ undefined, r);
+        return withPackageId(/*packageInfo*/ undefined, r);
     }
     function removeIgnoredPackageId(r) {
         if (r) {
@@ -26150,8 +26589,15 @@ var ts;
     }
     function readPackageJsonPathField(jsonContent, fieldName, baseDirectory, state) {
         var fileName = readPackageJsonField(jsonContent, fieldName, "string", state);
-        if (fileName === undefined)
+        if (fileName === undefined) {
             return;
+        }
+        if (!fileName) {
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.package_json_had_a_falsy_0_field, fieldName);
+            }
+            return;
+        }
         var path = ts.normalizePath(ts.combinePaths(baseDirectory, fileName));
         if (state.traceEnabled) {
             trace(state.host, ts.Diagnostics.package_json_has_0_field_1_that_references_2, fieldName, fileName, path);
@@ -26304,7 +26750,12 @@ var ts;
             var fileName = resolved.fileName, packageId = resolved.packageId;
             var resolvedFileName = options.preserveSymlinks ? fileName : realPath(fileName, host, traceEnabled);
             if (traceEnabled) {
-                trace(host, ts.Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2, typeReferenceDirectiveName, resolvedFileName, primary);
+                if (packageId) {
+                    trace(host, ts.Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_with_Package_ID_2_primary_Colon_3, typeReferenceDirectiveName, resolvedFileName, ts.packageIdToString(packageId), primary);
+                }
+                else {
+                    trace(host, ts.Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2, typeReferenceDirectiveName, resolvedFileName, primary);
+                }
             }
             resolvedTypeReferenceDirective = { primary: primary, resolvedFileName: resolvedFileName, packageId: packageId, isExternalLibraryImport: pathContainsNodeModules(fileName) };
         }
@@ -26406,20 +26857,28 @@ var ts;
         return result;
     }
     ts.getAutomaticTypeDirectiveNames = getAutomaticTypeDirectiveNames;
-    function createModuleResolutionCache(currentDirectory, getCanonicalFileName) {
-        return createModuleResolutionCacheWithMaps(createCacheWithRedirects(), createCacheWithRedirects(), currentDirectory, getCanonicalFileName);
+    function createModuleResolutionCache(currentDirectory, getCanonicalFileName, options) {
+        return createModuleResolutionCacheWithMaps(createCacheWithRedirects(options), createCacheWithRedirects(options), currentDirectory, getCanonicalFileName);
     }
     ts.createModuleResolutionCache = createModuleResolutionCache;
     /*@internal*/
-    function createCacheWithRedirects() {
+    function createCacheWithRedirects(options) {
         var ownMap = ts.createMap();
         var redirectsMap = ts.createMap();
         return {
             ownMap: ownMap,
             redirectsMap: redirectsMap,
             getOrCreateMapOfCacheRedirects: getOrCreateMapOfCacheRedirects,
-            clear: clear
+            clear: clear,
+            setOwnOptions: setOwnOptions,
+            setOwnMap: setOwnMap
         };
+        function setOwnOptions(newOptions) {
+            options = newOptions;
+        }
+        function setOwnMap(newOwnMap) {
+            ownMap = newOwnMap;
+        }
         function getOrCreateMapOfCacheRedirects(redirectedReference) {
             if (!redirectedReference) {
                 return ownMap;
@@ -26427,7 +26886,8 @@ var ts;
             var path = redirectedReference.sourceFile.path;
             var redirects = redirectsMap.get(path);
             if (!redirects) {
-                redirects = ts.createMap();
+                // Reuse map if redirected reference map uses same resolution
+                redirects = !options || ts.optionsHaveModuleResolutionChanges(options, redirectedReference.commandLine.options) ? ts.createMap() : ownMap;
                 redirectsMap.set(path, redirects);
             }
             return redirects;
@@ -26440,7 +26900,7 @@ var ts;
     ts.createCacheWithRedirects = createCacheWithRedirects;
     /*@internal*/
     function createModuleResolutionCacheWithMaps(directoryToModuleNameMap, moduleNameToDirectoryMap, currentDirectory, getCanonicalFileName) {
-        return { getOrCreateCacheForDirectory: getOrCreateCacheForDirectory, getOrCreateCacheForModuleName: getOrCreateCacheForModuleName };
+        return { getOrCreateCacheForDirectory: getOrCreateCacheForDirectory, getOrCreateCacheForModuleName: getOrCreateCacheForModuleName, directoryToModuleNameMap: directoryToModuleNameMap, moduleNameToDirectoryMap: moduleNameToDirectoryMap };
         function getOrCreateCacheForDirectory(directoryName, redirectedReference) {
             var path = ts.toPath(directoryName, currentDirectory, getCanonicalFileName);
             return getOrCreateCache(directoryToModuleNameMap, redirectedReference, path, ts.createMap);
@@ -26583,7 +27043,12 @@ var ts;
         }
         if (traceEnabled) {
             if (result.resolvedModule) {
-                trace(host, ts.Diagnostics.Module_name_0_was_successfully_resolved_to_1, moduleName, result.resolvedModule.resolvedFileName);
+                if (result.resolvedModule.packageId) {
+                    trace(host, ts.Diagnostics.Module_name_0_was_successfully_resolved_to_1_with_Package_ID_2, moduleName, result.resolvedModule.resolvedFileName, ts.packageIdToString(result.resolvedModule.packageId));
+                }
+                else {
+                    trace(host, ts.Diagnostics.Module_name_0_was_successfully_resolved_to_1, moduleName, result.resolvedModule.resolvedFileName);
+                }
             }
             else {
                 trace(host, ts.Diagnostics.Module_name_0_was_not_resolved, moduleName);
@@ -26853,10 +27318,9 @@ var ts;
             }
             var resolvedFromFile = loadModuleFromFile(extensions, candidate, onlyRecordFailures, state);
             if (resolvedFromFile) {
-                var nm = considerPackageJson ? parseNodeModuleFromPath(resolvedFromFile) : undefined;
-                var packageInfo = nm && getPackageJsonInfo(nm.packageDirectory, nm.subModuleName, /*onlyRecordFailures*/ false, state);
-                var packageId = packageInfo && packageInfo.packageId;
-                return withPackageId(packageId, resolvedFromFile);
+                var packageDirectory = considerPackageJson ? parseNodeModuleFromPath(resolvedFromFile) : undefined;
+                var packageInfo = packageDirectory ? getPackageJsonInfo(packageDirectory, /*onlyRecordFailures*/ false, state) : undefined;
+                return withPackageId(packageInfo, resolvedFromFile);
             }
         }
         if (!onlyRecordFailures) {
@@ -26882,11 +27346,10 @@ var ts;
      * (Not neeeded for `loadModuleFromNodeModules` as that looks up the `package.json` as part of resolution.)
      *
      * packageDirectory is the directory of the package itself.
-     * subModuleName is the path within the package.
-     *   For `blah/node_modules/foo/index.d.ts` this is { packageDirectory: "foo", subModuleName: "index.d.ts" }. (Part before "/node_modules/" is ignored.)
-     *   For `/node_modules/foo/bar.d.ts` this is { packageDirectory: "foo", subModuleName": "bar/index.d.ts" }.
-     *   For `/node_modules/@types/foo/bar/index.d.ts` this is { packageDirectory: "@types/foo", subModuleName: "bar/index.d.ts" }.
-     *   For `/node_modules/foo/bar/index.d.ts` this is { packageDirectory: "foo", subModuleName": "bar/index.d.ts" }.
+     *   For `blah/node_modules/foo/index.d.ts` this is packageDirectory: "foo"
+     *   For `/node_modules/foo/bar.d.ts` this is packageDirectory: "foo"
+     *   For `/node_modules/@types/foo/bar/index.d.ts` this is packageDirectory: "@types/foo"
+     *   For `/node_modules/foo/bar/index.d.ts` this is packageDirectory: "foo"
      */
     function parseNodeModuleFromPath(resolved) {
         var path = ts.normalizePath(resolved.path);
@@ -26899,26 +27362,12 @@ var ts;
         if (path.charCodeAt(indexAfterNodeModules) === 64 /* at */) {
             indexAfterPackageName = moveToNextDirectorySeparatorIfAvailable(path, indexAfterPackageName);
         }
-        var packageDirectory = path.slice(0, indexAfterPackageName);
-        var subModuleName = ts.removeExtension(path.slice(indexAfterPackageName + 1), resolved.ext) + ".d.ts" /* Dts */;
-        return { packageDirectory: packageDirectory, subModuleName: subModuleName };
+        return path.slice(0, indexAfterPackageName);
     }
     function moveToNextDirectorySeparatorIfAvailable(path, prevSeparatorIndex) {
         var nextSeparatorIndex = path.indexOf(ts.directorySeparator, prevSeparatorIndex + 1);
         return nextSeparatorIndex === -1 ? prevSeparatorIndex : nextSeparatorIndex;
     }
-    function addExtensionAndIndex(path) {
-        if (path === "") {
-            return "index.d.ts";
-        }
-        if (ts.endsWith(path, ".d.ts")) {
-            return path;
-        }
-        if (path === "index" || ts.endsWith(path, "/index")) {
-            return path + ".d.ts";
-        }
-        return path + "/index.d.ts";
-    }
     function loadModuleFromFileNoPackageId(extensions, candidate, onlyRecordFailures, state) {
         return noPackageId(loadModuleFromFile(extensions, candidate, onlyRecordFailures, state));
     }
@@ -26992,52 +27441,22 @@ var ts;
     }
     function loadNodeModuleFromDirectory(extensions, candidate, onlyRecordFailures, state, considerPackageJson) {
         if (considerPackageJson === void 0) { considerPackageJson = true; }
-        var packageInfo = considerPackageJson ? getPackageJsonInfo(candidate, "", onlyRecordFailures, state) : undefined;
-        var packageId = packageInfo && packageInfo.packageId;
+        var packageInfo = considerPackageJson ? getPackageJsonInfo(candidate, onlyRecordFailures, state) : undefined;
         var packageJsonContent = packageInfo && packageInfo.packageJsonContent;
-        var versionPaths = packageJsonContent && readPackageJsonTypesVersionPaths(packageJsonContent, state);
-        return withPackageId(packageId, loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageJsonContent, versionPaths));
+        var versionPaths = packageInfo && packageInfo.versionPaths;
+        return withPackageId(packageInfo, loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageJsonContent, versionPaths));
     }
-    function getPackageJsonInfo(packageDirectory, subModuleName, onlyRecordFailures, state) {
+    function getPackageJsonInfo(packageDirectory, onlyRecordFailures, state) {
         var host = state.host, traceEnabled = state.traceEnabled;
         var directoryExists = !onlyRecordFailures && ts.directoryProbablyExists(packageDirectory, host);
         var packageJsonPath = ts.combinePaths(packageDirectory, "package.json");
         if (directoryExists && host.fileExists(packageJsonPath)) {
             var packageJsonContent = ts.readJson(packageJsonPath, host);
-            if (subModuleName === "") { // looking up the root - need to handle types/typings/main redirects for subModuleName
-                var path = readPackageJsonTypesFields(packageJsonContent, packageDirectory, state);
-                if (typeof path === "string") {
-                    subModuleName = addExtensionAndIndex(path.substring(packageDirectory.length + 1));
-                }
-                else {
-                    var jsPath = readPackageJsonMainField(packageJsonContent, packageDirectory, state);
-                    if (typeof jsPath === "string" && jsPath.length > packageDirectory.length) {
-                        var potentialSubModule_1 = jsPath.substring(packageDirectory.length + 1);
-                        subModuleName = (ts.forEach(ts.supportedJSExtensions, function (extension) {
-                            return ts.tryRemoveExtension(potentialSubModule_1, extension);
-                        }) || potentialSubModule_1) + ".d.ts" /* Dts */;
-                    }
-                    else {
-                        subModuleName = "index.d.ts";
-                    }
-                }
-            }
-            if (!ts.endsWith(subModuleName, ".d.ts" /* Dts */)) {
-                subModuleName = addExtensionAndIndex(subModuleName);
+            if (traceEnabled) {
+                trace(host, ts.Diagnostics.Found_package_json_at_0, packageJsonPath);
             }
             var versionPaths = readPackageJsonTypesVersionPaths(packageJsonContent, state);
-            var packageId = typeof packageJsonContent.name === "string" && typeof packageJsonContent.version === "string"
-                ? { name: packageJsonContent.name, subModuleName: subModuleName, version: packageJsonContent.version }
-                : undefined;
-            if (traceEnabled) {
-                if (packageId) {
-                    trace(host, ts.Diagnostics.Found_package_json_at_0_Package_ID_is_1, packageJsonPath, ts.packageIdToString(packageId));
-                }
-                else {
-                    trace(host, ts.Diagnostics.Found_package_json_at_0, packageJsonPath);
-                }
-            }
-            return { packageJsonContent: packageJsonContent, packageId: packageId, versionPaths: versionPaths };
+            return { packageDirectory: packageDirectory, packageJsonContent: packageJsonContent, versionPaths: versionPaths };
         }
         else {
             if (directoryExists && traceEnabled) {
@@ -27176,37 +27595,31 @@ var ts;
     function loadModuleFromSpecificNodeModulesDirectory(extensions, moduleName, nodeModulesDirectory, nodeModulesDirectoryExists, state) {
         var candidate = ts.normalizePath(ts.combinePaths(nodeModulesDirectory, moduleName));
         // First look for a nested package.json, as in `node_modules/foo/bar/package.json`.
-        var packageJsonContent;
-        var packageId;
-        var versionPaths;
-        var packageInfo = getPackageJsonInfo(candidate, "", !nodeModulesDirectoryExists, state);
+        var packageInfo = getPackageJsonInfo(candidate, !nodeModulesDirectoryExists, state);
         if (packageInfo) {
-            (packageJsonContent = packageInfo.packageJsonContent, packageId = packageInfo.packageId, versionPaths = packageInfo.versionPaths);
             var fromFile = loadModuleFromFile(extensions, candidate, !nodeModulesDirectoryExists, state);
             if (fromFile) {
                 return noPackageId(fromFile);
             }
-            var fromDirectory = loadNodeModuleFromDirectoryWorker(extensions, candidate, !nodeModulesDirectoryExists, state, packageJsonContent, versionPaths);
-            return withPackageId(packageId, fromDirectory);
+            var fromDirectory = loadNodeModuleFromDirectoryWorker(extensions, candidate, !nodeModulesDirectoryExists, state, packageInfo.packageJsonContent, packageInfo.versionPaths);
+            return withPackageId(packageInfo, fromDirectory);
         }
         var loader = function (extensions, candidate, onlyRecordFailures, state) {
             var pathAndExtension = loadModuleFromFile(extensions, candidate, onlyRecordFailures, state) ||
-                loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageJsonContent, versionPaths);
-            return withPackageId(packageId, pathAndExtension);
+                loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageInfo && packageInfo.packageJsonContent, packageInfo && packageInfo.versionPaths);
+            return withPackageId(packageInfo, pathAndExtension);
         };
         var _a = parsePackageName(moduleName), packageName = _a.packageName, rest = _a.rest;
         if (rest !== "") { // If "rest" is empty, we just did this search above.
             var packageDirectory = ts.combinePaths(nodeModulesDirectory, packageName);
             // Don't use a "types" or "main" from here because we're not loading the root, but a subdirectory -- just here for the packageId and path mappings.
-            var packageInfo_1 = getPackageJsonInfo(packageDirectory, rest, !nodeModulesDirectoryExists, state);
-            if (packageInfo_1)
-                (packageId = packageInfo_1.packageId, versionPaths = packageInfo_1.versionPaths);
-            if (versionPaths) {
+            packageInfo = getPackageJsonInfo(packageDirectory, !nodeModulesDirectoryExists, state);
+            if (packageInfo && packageInfo.versionPaths) {
                 if (state.traceEnabled) {
-                    trace(state.host, ts.Diagnostics.package_json_has_a_typesVersions_entry_0_that_matches_compiler_version_1_looking_for_a_pattern_to_match_module_name_2, versionPaths.version, ts.version, rest);
+                    trace(state.host, ts.Diagnostics.package_json_has_a_typesVersions_entry_0_that_matches_compiler_version_1_looking_for_a_pattern_to_match_module_name_2, packageInfo.versionPaths.version, ts.version, rest);
                 }
                 var packageDirectoryExists = nodeModulesDirectoryExists && ts.directoryProbablyExists(packageDirectory, state.host);
-                var fromPaths = tryLoadModuleUsingPaths(extensions, rest, packageDirectory, versionPaths.paths, loader, !packageDirectoryExists, state);
+                var fromPaths = tryLoadModuleUsingPaths(extensions, rest, packageDirectory, packageInfo.versionPaths.paths, loader, !packageDirectoryExists, state);
                 if (fromPaths) {
                     return fromPaths.value;
                 }
@@ -27334,8 +27747,8 @@ var ts;
     }
     ts.classicNameResolver = classicNameResolver;
     /**
-     * LSHost may load a module from a global cache of typings.
-     * This is the minumum code needed to expose that functionality; the rest is in LSHost.
+     * A host may load a module from a global cache of typings.
+     * This is the minumum code needed to expose that functionality; the rest is in the host.
      */
     /* @internal */
     function loadModuleFromGlobalCache(moduleName, projectName, compilerOptions, host, globalCache) {
@@ -27374,24 +27787,24 @@ var ts;
         // A module is uninstantiated if it contains only
         switch (node.kind) {
             // 1. interface declarations, type alias declarations
-            case 241 /* InterfaceDeclaration */:
-            case 242 /* TypeAliasDeclaration */:
+            case 242 /* InterfaceDeclaration */:
+            case 243 /* TypeAliasDeclaration */:
                 return 0 /* NonInstantiated */;
             // 2. const enum declarations
-            case 243 /* EnumDeclaration */:
+            case 244 /* EnumDeclaration */:
                 if (ts.isEnumConst(node)) {
                     return 2 /* ConstEnumOnly */;
                 }
                 break;
             // 3. non-exported import declarations
-            case 249 /* ImportDeclaration */:
-            case 248 /* ImportEqualsDeclaration */:
+            case 250 /* ImportDeclaration */:
+            case 249 /* ImportEqualsDeclaration */:
                 if (!(ts.hasModifier(node, 1 /* Export */))) {
                     return 0 /* NonInstantiated */;
                 }
                 break;
             // 4. other uninstantiated module declarations.
-            case 245 /* ModuleBlock */: {
+            case 246 /* ModuleBlock */: {
                 var state_1 = 0 /* NonInstantiated */;
                 ts.forEachChild(node, function (n) {
                     var childState = getModuleInstanceStateWorker(n);
@@ -27413,9 +27826,9 @@ var ts;
                 });
                 return state_1;
             }
-            case 244 /* ModuleDeclaration */:
+            case 245 /* ModuleDeclaration */:
                 return getModuleInstanceState(node);
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 // Only jsdoc typedef definition can exist in jsdoc namespace, and it should
                 // be considered the same as type alias
                 if (node.isInJSDocNamespace) {
@@ -27581,7 +27994,7 @@ var ts;
         // Should not be called on a declaration with a computed property name,
         // unless it is a well known Symbol.
         function getDeclarationName(node) {
-            if (node.kind === 254 /* ExportAssignment */) {
+            if (node.kind === 255 /* ExportAssignment */) {
                 return node.isExportEquals ? "export=" /* ExportEquals */ : "default" /* Default */;
             }
             var name = ts.getNameOfDeclaration(node);
@@ -27590,48 +28003,51 @@ var ts;
                     var moduleName = ts.getTextOfIdentifierOrLiteral(name);
                     return (ts.isGlobalScopeAugmentation(node) ? "__global" : "\"" + moduleName + "\"");
                 }
-                if (name.kind === 149 /* ComputedPropertyName */) {
+                if (name.kind === 150 /* ComputedPropertyName */) {
                     var nameExpression = name.expression;
                     // treat computed property names where expression is string/numeric literal as just string/numeric literal
                     if (ts.isStringOrNumericLiteralLike(nameExpression)) {
                         return ts.escapeLeadingUnderscores(nameExpression.text);
                     }
+                    if (ts.isSignedNumericLiteral(nameExpression)) {
+                        return ts.tokenToString(nameExpression.operator) + nameExpression.operand.text;
+                    }
                     ts.Debug.assert(ts.isWellKnownSymbolSyntactically(nameExpression));
                     return ts.getPropertyNameForKnownSymbolName(ts.idText(nameExpression.name));
                 }
                 return ts.isPropertyNameLiteral(name) ? ts.getEscapedTextOfIdentifierOrLiteral(name) : undefined;
             }
             switch (node.kind) {
-                case 157 /* Constructor */:
+                case 158 /* Constructor */:
                     return "__constructor" /* Constructor */;
-                case 165 /* FunctionType */:
-                case 160 /* CallSignature */:
-                case 298 /* JSDocSignature */:
+                case 166 /* FunctionType */:
+                case 161 /* CallSignature */:
+                case 299 /* JSDocSignature */:
                     return "__call" /* Call */;
-                case 166 /* ConstructorType */:
-                case 161 /* ConstructSignature */:
+                case 167 /* ConstructorType */:
+                case 162 /* ConstructSignature */:
                     return "__new" /* New */;
-                case 162 /* IndexSignature */:
+                case 163 /* IndexSignature */:
                     return "__index" /* Index */;
-                case 255 /* ExportDeclaration */:
+                case 256 /* ExportDeclaration */:
                     return "__export" /* ExportStar */;
-                case 284 /* SourceFile */:
+                case 285 /* SourceFile */:
                     // json file should behave as
                     // module.exports = ...
                     return "export=" /* ExportEquals */;
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     if (ts.getAssignmentDeclarationKind(node) === 2 /* ModuleExports */) {
                         // module.exports = ...
                         return "export=" /* ExportEquals */;
                     }
                     ts.Debug.fail("Unknown binary declaration kind");
                     break;
-                case 294 /* JSDocFunctionType */:
+                case 295 /* JSDocFunctionType */:
                     return (ts.isJSDocConstructSignature(node) ? "__new" /* New */ : "__call" /* Call */);
-                case 151 /* Parameter */:
+                case 152 /* Parameter */:
                     // Parameters with names are handled at the top of this function.  Parameters
                     // without names can only come from JSDocFunctionTypes.
-                    ts.Debug.assert(node.parent.kind === 294 /* JSDocFunctionType */, "Impossible parameter parent kind", function () { return "parent is: " + (ts.SyntaxKind ? ts.SyntaxKind[node.parent.kind] : node.parent.kind) + ", expected JSDocFunctionType"; });
+                    ts.Debug.assert(node.parent.kind === 295 /* JSDocFunctionType */, "Impossible parameter parent kind", function () { return "parent is: " + (ts.SyntaxKind ? ts.SyntaxKind[node.parent.kind] : node.parent.kind) + ", expected JSDocFunctionType"; });
                     var functionType = node.parent;
                     var index = functionType.parameters.indexOf(node);
                     return "arg" + index;
@@ -27715,13 +28131,15 @@ var ts;
                             message_1 = ts.Diagnostics.Enum_declarations_can_only_merge_with_namespace_or_other_enum_declarations;
                             messageNeedsName_1 = false;
                         }
-                        if (symbol.declarations && symbol.declarations.length) {
+                        var multipleDefaultExports_1 = false;
+                        if (ts.length(symbol.declarations)) {
                             // If the current node is a default export of some sort, then check if
                             // there are any other default exports that we need to error on.
                             // We'll know whether we have other default exports depending on if `symbol` already has a declaration list set.
                             if (isDefaultExport) {
                                 message_1 = ts.Diagnostics.A_module_cannot_have_multiple_default_exports;
                                 messageNeedsName_1 = false;
+                                multipleDefaultExports_1 = true;
                             }
                             else {
                                 // This is to properly report an error in the case "export default { }" is after export default of class declaration or function declaration.
@@ -27729,17 +28147,25 @@ var ts;
                                 // 1. multiple export default of class declaration or function declaration by checking NodeFlags.Default
                                 // 2. multiple export default of export assignment. This one doesn't have NodeFlags.Default on (as export default doesn't considered as modifiers)
                                 if (symbol.declarations && symbol.declarations.length &&
-                                    (node.kind === 254 /* ExportAssignment */ && !node.isExportEquals)) {
+                                    (node.kind === 255 /* ExportAssignment */ && !node.isExportEquals)) {
                                     message_1 = ts.Diagnostics.A_module_cannot_have_multiple_default_exports;
                                     messageNeedsName_1 = false;
+                                    multipleDefaultExports_1 = true;
                                 }
                             }
                         }
-                        var addError = function (decl) {
-                            file.bindDiagnostics.push(createDiagnosticForNode(ts.getNameOfDeclaration(decl) || decl, message_1, messageNeedsName_1 ? getDisplayName(decl) : undefined));
-                        };
-                        ts.forEach(symbol.declarations, addError);
-                        addError(node);
+                        var declarationName_1 = ts.getNameOfDeclaration(node) || node;
+                        var relatedInformation_1 = [];
+                        ts.forEach(symbol.declarations, function (declaration, index) {
+                            var decl = ts.getNameOfDeclaration(declaration) || declaration;
+                            var diag = createDiagnosticForNode(decl, message_1, messageNeedsName_1 ? getDisplayName(declaration) : undefined);
+                            file.bindDiagnostics.push(multipleDefaultExports_1 ? ts.addRelatedInfo(diag, createDiagnosticForNode(declarationName_1, index === 0 ? ts.Diagnostics.Another_export_default_is_here : ts.Diagnostics.and_here)) : diag);
+                            if (multipleDefaultExports_1) {
+                                relatedInformation_1.push(createDiagnosticForNode(decl, ts.Diagnostics.The_first_export_default_is_here));
+                            }
+                        });
+                        var diag = createDiagnosticForNode(declarationName_1, message_1, messageNeedsName_1 ? getDisplayName(node) : undefined);
+                        file.bindDiagnostics.push(multipleDefaultExports_1 ? ts.addRelatedInfo.apply(void 0, [diag].concat(relatedInformation_1)) : diag);
                         symbol = createSymbol(0 /* None */, name);
                     }
                 }
@@ -27756,7 +28182,7 @@ var ts;
         function declareModuleMember(node, symbolFlags, symbolExcludes) {
             var hasExportModifier = ts.getCombinedModifierFlags(node) & 1 /* Export */;
             if (symbolFlags & 2097152 /* Alias */) {
-                if (node.kind === 257 /* ExportSpecifier */ || (node.kind === 248 /* ImportEqualsDeclaration */ && hasExportModifier)) {
+                if (node.kind === 258 /* ExportSpecifier */ || (node.kind === 249 /* ImportEqualsDeclaration */ && hasExportModifier)) {
                     return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);
                 }
                 else {
@@ -27823,7 +28249,7 @@ var ts;
             // for it.  We must clear this so we don't accidentally move any stale data forward from
             // a previous compilation.
             if (containerFlags & 1 /* IsContainer */) {
-                if (node.kind !== 197 /* ArrowFunction */) {
+                if (node.kind !== 198 /* ArrowFunction */) {
                     thisParentContainer = container;
                 }
                 container = blockScopeContainer = node;
@@ -27856,7 +28282,7 @@ var ts;
                 }
                 // We create a return control flow graph for IIFEs and constructors. For constructors
                 // we use the return control flow graph in strict property initialization checks.
-                currentReturnTarget = isIIFE || node.kind === 157 /* Constructor */ ? createBranchLabel() : undefined;
+                currentReturnTarget = isIIFE || node.kind === 158 /* Constructor */ ? createBranchLabel() : undefined;
                 currentBreakTarget = undefined;
                 currentContinueTarget = undefined;
                 activeLabels = undefined;
@@ -27870,13 +28296,13 @@ var ts;
                     if (hasExplicitReturn)
                         node.flags |= 256 /* HasExplicitReturn */;
                 }
-                if (node.kind === 284 /* SourceFile */) {
+                if (node.kind === 285 /* SourceFile */) {
                     node.flags |= emitFlags;
                 }
                 if (currentReturnTarget) {
                     addAntecedent(currentReturnTarget, currentFlow);
                     currentFlow = finishFlowLabel(currentReturnTarget);
-                    if (node.kind === 157 /* Constructor */) {
+                    if (node.kind === 158 /* Constructor */) {
                         node.returnFlowNode = currentFlow;
                     }
                 }
@@ -27920,8 +28346,8 @@ var ts;
             }
         }
         function bindEachFunctionsFirst(nodes) {
-            bindEach(nodes, function (n) { return n.kind === 239 /* FunctionDeclaration */ ? bind(n) : undefined; });
-            bindEach(nodes, function (n) { return n.kind !== 239 /* FunctionDeclaration */ ? bind(n) : undefined; });
+            bindEach(nodes, function (n) { return n.kind === 240 /* FunctionDeclaration */ ? bind(n) : undefined; });
+            bindEach(nodes, function (n) { return n.kind !== 240 /* FunctionDeclaration */ ? bind(n) : undefined; });
         }
         function bindEach(nodes, bindFunction) {
             if (bindFunction === void 0) { bindFunction = bind; }
@@ -27954,78 +28380,78 @@ var ts;
                 return;
             }
             switch (node.kind) {
-                case 224 /* WhileStatement */:
+                case 225 /* WhileStatement */:
                     bindWhileStatement(node);
                     break;
-                case 223 /* DoStatement */:
+                case 224 /* DoStatement */:
                     bindDoStatement(node);
                     break;
-                case 225 /* ForStatement */:
+                case 226 /* ForStatement */:
                     bindForStatement(node);
                     break;
-                case 226 /* ForInStatement */:
-                case 227 /* ForOfStatement */:
+                case 227 /* ForInStatement */:
+                case 228 /* ForOfStatement */:
                     bindForInOrForOfStatement(node);
                     break;
-                case 222 /* IfStatement */:
+                case 223 /* IfStatement */:
                     bindIfStatement(node);
                     break;
-                case 230 /* ReturnStatement */:
-                case 234 /* ThrowStatement */:
+                case 231 /* ReturnStatement */:
+                case 235 /* ThrowStatement */:
                     bindReturnOrThrow(node);
                     break;
-                case 229 /* BreakStatement */:
-                case 228 /* ContinueStatement */:
+                case 230 /* BreakStatement */:
+                case 229 /* ContinueStatement */:
                     bindBreakOrContinueStatement(node);
                     break;
-                case 235 /* TryStatement */:
+                case 236 /* TryStatement */:
                     bindTryStatement(node);
                     break;
-                case 232 /* SwitchStatement */:
+                case 233 /* SwitchStatement */:
                     bindSwitchStatement(node);
                     break;
-                case 246 /* CaseBlock */:
+                case 247 /* CaseBlock */:
                     bindCaseBlock(node);
                     break;
-                case 271 /* CaseClause */:
+                case 272 /* CaseClause */:
                     bindCaseClause(node);
                     break;
-                case 233 /* LabeledStatement */:
+                case 234 /* LabeledStatement */:
                     bindLabeledStatement(node);
                     break;
-                case 202 /* PrefixUnaryExpression */:
+                case 203 /* PrefixUnaryExpression */:
                     bindPrefixUnaryExpressionFlow(node);
                     break;
-                case 203 /* PostfixUnaryExpression */:
+                case 204 /* PostfixUnaryExpression */:
                     bindPostfixUnaryExpressionFlow(node);
                     break;
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     bindBinaryExpressionFlow(node);
                     break;
-                case 198 /* DeleteExpression */:
+                case 199 /* DeleteExpression */:
                     bindDeleteExpressionFlow(node);
                     break;
-                case 205 /* ConditionalExpression */:
+                case 206 /* ConditionalExpression */:
                     bindConditionalExpressionFlow(node);
                     break;
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     bindVariableDeclarationFlow(node);
                     break;
-                case 191 /* CallExpression */:
+                case 192 /* CallExpression */:
                     bindCallExpressionFlow(node);
                     break;
-                case 309 /* JSDocTypedefTag */:
-                case 302 /* JSDocCallbackTag */:
+                case 311 /* JSDocTypedefTag */:
+                case 304 /* JSDocCallbackTag */:
                     bindJSDocTypeAlias(node);
                     break;
                 // In source files and blocks, bind functions first to match hoisting that occurs at runtime
-                case 284 /* SourceFile */: {
+                case 285 /* SourceFile */: {
                     bindEachFunctionsFirst(node.statements);
                     bind(node.endOfFileToken);
                     break;
                 }
-                case 218 /* Block */:
-                case 245 /* ModuleBlock */:
+                case 219 /* Block */:
+                case 246 /* ModuleBlock */:
                     bindEachFunctionsFirst(node.statements);
                     break;
                 default:
@@ -28036,26 +28462,26 @@ var ts;
         }
         function isNarrowingExpression(expr) {
             switch (expr.kind) {
-                case 72 /* Identifier */:
-                case 100 /* ThisKeyword */:
-                case 189 /* PropertyAccessExpression */:
-                case 190 /* ElementAccessExpression */:
+                case 73 /* Identifier */:
+                case 101 /* ThisKeyword */:
+                case 190 /* PropertyAccessExpression */:
+                case 191 /* ElementAccessExpression */:
                     return isNarrowableReference(expr);
-                case 191 /* CallExpression */:
+                case 192 /* CallExpression */:
                     return hasNarrowableArgument(expr);
-                case 195 /* ParenthesizedExpression */:
+                case 196 /* ParenthesizedExpression */:
                     return isNarrowingExpression(expr.expression);
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return isNarrowingBinaryExpression(expr);
-                case 202 /* PrefixUnaryExpression */:
+                case 203 /* PrefixUnaryExpression */:
                     return expr.operator === 52 /* ExclamationToken */ && isNarrowingExpression(expr.operand);
-                case 199 /* TypeOfExpression */:
+                case 200 /* TypeOfExpression */:
                     return isNarrowingExpression(expr.expression);
             }
             return false;
         }
         function isNarrowableReference(expr) {
-            return expr.kind === 72 /* Identifier */ || expr.kind === 100 /* ThisKeyword */ || expr.kind === 98 /* SuperKeyword */ ||
+            return expr.kind === 73 /* Identifier */ || expr.kind === 101 /* ThisKeyword */ || expr.kind === 99 /* SuperKeyword */ ||
                 (ts.isPropertyAccessExpression(expr) || ts.isNonNullExpression(expr) || ts.isParenthesizedExpression(expr)) && isNarrowableReference(expr.expression) ||
                 ts.isElementAccessExpression(expr) && expr.argumentExpression &&
                     (ts.isStringLiteral(expr.argumentExpression) || ts.isNumericLiteral(expr.argumentExpression)) &&
@@ -28070,7 +28496,7 @@ var ts;
                     }
                 }
             }
-            if (expr.expression.kind === 189 /* PropertyAccessExpression */ &&
+            if (expr.expression.kind === 190 /* PropertyAccessExpression */ &&
                 isNarrowableReference(expr.expression.expression)) {
                 return true;
             }
@@ -28084,7 +28510,7 @@ var ts;
         }
         function isNarrowingBinaryExpression(expr) {
             switch (expr.operatorToken.kind) {
-                case 59 /* EqualsToken */:
+                case 60 /* EqualsToken */:
                     return isNarrowableReference(expr.left);
                 case 33 /* EqualsEqualsToken */:
                 case 34 /* ExclamationEqualsToken */:
@@ -28092,9 +28518,9 @@ var ts;
                 case 36 /* ExclamationEqualsEqualsToken */:
                     return isNarrowableOperand(expr.left) || isNarrowableOperand(expr.right) ||
                         isNarrowingTypeofOperands(expr.right, expr.left) || isNarrowingTypeofOperands(expr.left, expr.right);
-                case 94 /* InstanceOfKeyword */:
+                case 95 /* InstanceOfKeyword */:
                     return isNarrowableOperand(expr.left);
-                case 93 /* InKeyword */:
+                case 94 /* InKeyword */:
                     return isNarrowableInOperands(expr.left, expr.right);
                 case 27 /* CommaToken */:
                     return isNarrowingExpression(expr.right);
@@ -28103,11 +28529,11 @@ var ts;
         }
         function isNarrowableOperand(expr) {
             switch (expr.kind) {
-                case 195 /* ParenthesizedExpression */:
+                case 196 /* ParenthesizedExpression */:
                     return isNarrowableOperand(expr.expression);
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     switch (expr.operatorToken.kind) {
-                        case 59 /* EqualsToken */:
+                        case 60 /* EqualsToken */:
                             return isNarrowableOperand(expr.left);
                         case 27 /* CommaToken */:
                             return isNarrowableOperand(expr.right);
@@ -28144,8 +28570,8 @@ var ts;
             if (!expression) {
                 return flags & 32 /* TrueCondition */ ? antecedent : unreachableFlow;
             }
-            if (expression.kind === 102 /* TrueKeyword */ && flags & 64 /* FalseCondition */ ||
-                expression.kind === 87 /* FalseKeyword */ && flags & 32 /* TrueCondition */) {
+            if (expression.kind === 103 /* TrueKeyword */ && flags & 64 /* FalseCondition */ ||
+                expression.kind === 88 /* FalseKeyword */ && flags & 32 /* TrueCondition */) {
                 return unreachableFlow;
             }
             if (!isNarrowingExpression(expression)) {
@@ -28183,33 +28609,33 @@ var ts;
         function isStatementCondition(node) {
             var parent = node.parent;
             switch (parent.kind) {
-                case 222 /* IfStatement */:
-                case 224 /* WhileStatement */:
-                case 223 /* DoStatement */:
+                case 223 /* IfStatement */:
+                case 225 /* WhileStatement */:
+                case 224 /* DoStatement */:
                     return parent.expression === node;
-                case 225 /* ForStatement */:
-                case 205 /* ConditionalExpression */:
+                case 226 /* ForStatement */:
+                case 206 /* ConditionalExpression */:
                     return parent.condition === node;
             }
             return false;
         }
         function isLogicalExpression(node) {
             while (true) {
-                if (node.kind === 195 /* ParenthesizedExpression */) {
+                if (node.kind === 196 /* ParenthesizedExpression */) {
                     node = node.expression;
                 }
-                else if (node.kind === 202 /* PrefixUnaryExpression */ && node.operator === 52 /* ExclamationToken */) {
+                else if (node.kind === 203 /* PrefixUnaryExpression */ && node.operator === 52 /* ExclamationToken */) {
                     node = node.operand;
                 }
                 else {
-                    return node.kind === 204 /* BinaryExpression */ && (node.operatorToken.kind === 54 /* AmpersandAmpersandToken */ ||
+                    return node.kind === 205 /* BinaryExpression */ && (node.operatorToken.kind === 54 /* AmpersandAmpersandToken */ ||
                         node.operatorToken.kind === 55 /* BarBarToken */);
                 }
             }
         }
         function isTopLevelLogicalExpression(node) {
-            while (node.parent.kind === 195 /* ParenthesizedExpression */ ||
-                node.parent.kind === 202 /* PrefixUnaryExpression */ &&
+            while (node.parent.kind === 196 /* ParenthesizedExpression */ ||
+                node.parent.kind === 203 /* PrefixUnaryExpression */ &&
                     node.parent.operator === 52 /* ExclamationToken */) {
                 node = node.parent;
             }
@@ -28251,7 +28677,7 @@ var ts;
         }
         function bindDoStatement(node) {
             var preDoLabel = createLoopLabel();
-            var enclosingLabeledStatement = node.parent.kind === 233 /* LabeledStatement */
+            var enclosingLabeledStatement = node.parent.kind === 234 /* LabeledStatement */
                 ? ts.lastOrUndefined(activeLabels)
                 : undefined;
             // if do statement is wrapped in labeled statement then target labels for break/continue with or without
@@ -28285,13 +28711,13 @@ var ts;
             var postLoopLabel = createBranchLabel();
             addAntecedent(preLoopLabel, currentFlow);
             currentFlow = preLoopLabel;
-            if (node.kind === 227 /* ForOfStatement */) {
+            if (node.kind === 228 /* ForOfStatement */) {
                 bind(node.awaitModifier);
             }
             bind(node.expression);
             addAntecedent(postLoopLabel, currentFlow);
             bind(node.initializer);
-            if (node.initializer.kind !== 238 /* VariableDeclarationList */) {
+            if (node.initializer.kind !== 239 /* VariableDeclarationList */) {
                 bindAssignmentTargetFlow(node.initializer);
             }
             bindIterativeStatement(node.statement, postLoopLabel, preLoopLabel);
@@ -28313,7 +28739,7 @@ var ts;
         }
         function bindReturnOrThrow(node) {
             bind(node.expression);
-            if (node.kind === 230 /* ReturnStatement */) {
+            if (node.kind === 231 /* ReturnStatement */) {
                 hasExplicitReturn = true;
                 if (currentReturnTarget) {
                     addAntecedent(currentReturnTarget, currentFlow);
@@ -28333,7 +28759,7 @@ var ts;
             return undefined;
         }
         function bindBreakOrContinueFlow(node, breakTarget, continueTarget) {
-            var flowLabel = node.kind === 229 /* BreakStatement */ ? breakTarget : continueTarget;
+            var flowLabel = node.kind === 230 /* BreakStatement */ ? breakTarget : continueTarget;
             if (flowLabel) {
                 addAntecedent(flowLabel, currentFlow);
                 currentFlow = unreachableFlow;
@@ -28461,7 +28887,7 @@ var ts;
             preSwitchCaseFlow = currentFlow;
             bind(node.caseBlock);
             addAntecedent(postSwitchLabel, currentFlow);
-            var hasDefault = ts.forEach(node.caseBlock.clauses, function (c) { return c.kind === 272 /* DefaultClause */; });
+            var hasDefault = ts.forEach(node.caseBlock.clauses, function (c) { return c.kind === 273 /* DefaultClause */; });
             // We mark a switch statement as possibly exhaustive if it has no default clause and if all
             // case clauses have unreachable end points (e.g. they all return).
             node.possiblyExhaustive = !hasDefault && !postSwitchLabel.antecedents;
@@ -28528,14 +28954,14 @@ var ts;
             if (!activeLabel.referenced && !options.allowUnusedLabels) {
                 errorOrSuggestionOnNode(ts.unusedLabelIsError(options), node.label, ts.Diagnostics.Unused_label);
             }
-            if (!node.statement || node.statement.kind !== 223 /* DoStatement */) {
+            if (!node.statement || node.statement.kind !== 224 /* DoStatement */) {
                 // do statement sets current flow inside bindDoStatement
                 addAntecedent(postStatementLabel, currentFlow);
                 currentFlow = finishFlowLabel(postStatementLabel);
             }
         }
         function bindDestructuringTargetFlow(node) {
-            if (node.kind === 204 /* BinaryExpression */ && node.operatorToken.kind === 59 /* EqualsToken */) {
+            if (node.kind === 205 /* BinaryExpression */ && node.operatorToken.kind === 60 /* EqualsToken */) {
                 bindAssignmentTargetFlow(node.left);
             }
             else {
@@ -28546,10 +28972,10 @@ var ts;
             if (isNarrowableReference(node)) {
                 currentFlow = createFlowAssignment(currentFlow, node);
             }
-            else if (node.kind === 187 /* ArrayLiteralExpression */) {
+            else if (node.kind === 188 /* ArrayLiteralExpression */) {
                 for (var _i = 0, _a = node.elements; _i < _a.length; _i++) {
                     var e = _a[_i];
-                    if (e.kind === 208 /* SpreadElement */) {
+                    if (e.kind === 209 /* SpreadElement */) {
                         bindAssignmentTargetFlow(e.expression);
                     }
                     else {
@@ -28557,16 +28983,16 @@ var ts;
                     }
                 }
             }
-            else if (node.kind === 188 /* ObjectLiteralExpression */) {
+            else if (node.kind === 189 /* ObjectLiteralExpression */) {
                 for (var _b = 0, _c = node.properties; _b < _c.length; _b++) {
                     var p = _c[_b];
-                    if (p.kind === 275 /* PropertyAssignment */) {
+                    if (p.kind === 276 /* PropertyAssignment */) {
                         bindDestructuringTargetFlow(p.initializer);
                     }
-                    else if (p.kind === 276 /* ShorthandPropertyAssignment */) {
+                    else if (p.kind === 277 /* ShorthandPropertyAssignment */) {
                         bindAssignmentTargetFlow(p.name);
                     }
-                    else if (p.kind === 277 /* SpreadAssignment */) {
+                    else if (p.kind === 278 /* SpreadAssignment */) {
                         bindAssignmentTargetFlow(p.expression);
                     }
                 }
@@ -28622,7 +29048,7 @@ var ts;
                 bindEachChild(node);
                 if (ts.isAssignmentOperator(operator) && !ts.isAssignmentTarget(node)) {
                     bindAssignmentTargetFlow(node.left);
-                    if (operator === 59 /* EqualsToken */ && node.left.kind === 190 /* ElementAccessExpression */) {
+                    if (operator === 60 /* EqualsToken */ && node.left.kind === 191 /* ElementAccessExpression */) {
                         var elementAccess = node.left;
                         if (isNarrowableOperand(elementAccess.expression)) {
                             currentFlow = createFlowArrayMutation(currentFlow, node);
@@ -28633,7 +29059,7 @@ var ts;
         }
         function bindDeleteExpressionFlow(node) {
             bindEachChild(node);
-            if (node.expression.kind === 189 /* PropertyAccessExpression */) {
+            if (node.expression.kind === 190 /* PropertyAccessExpression */) {
                 bindAssignmentTargetFlow(node.expression);
             }
         }
@@ -28681,10 +29107,10 @@ var ts;
             // an immediately invoked function expression (IIFE). Initialize the flowNode property to
             // the current control flow (which includes evaluation of the IIFE arguments).
             var expr = node.expression;
-            while (expr.kind === 195 /* ParenthesizedExpression */) {
+            while (expr.kind === 196 /* ParenthesizedExpression */) {
                 expr = expr.expression;
             }
-            if (expr.kind === 196 /* FunctionExpression */ || expr.kind === 197 /* ArrowFunction */) {
+            if (expr.kind === 197 /* FunctionExpression */ || expr.kind === 198 /* ArrowFunction */) {
                 bindEach(node.typeArguments);
                 bindEach(node.arguments);
                 bind(node.expression);
@@ -28692,7 +29118,7 @@ var ts;
             else {
                 bindEachChild(node);
             }
-            if (node.expression.kind === 189 /* PropertyAccessExpression */) {
+            if (node.expression.kind === 190 /* PropertyAccessExpression */) {
                 var propertyAccess = node.expression;
                 if (isNarrowableOperand(propertyAccess.expression) && ts.isPushOrUnshiftIdentifier(propertyAccess.name)) {
                     currentFlow = createFlowArrayMutation(currentFlow, node);
@@ -28701,54 +29127,54 @@ var ts;
         }
         function getContainerFlags(node) {
             switch (node.kind) {
-                case 209 /* ClassExpression */:
-                case 240 /* ClassDeclaration */:
-                case 243 /* EnumDeclaration */:
-                case 188 /* ObjectLiteralExpression */:
-                case 168 /* TypeLiteral */:
-                case 297 /* JSDocTypeLiteral */:
-                case 268 /* JsxAttributes */:
+                case 210 /* ClassExpression */:
+                case 241 /* ClassDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 189 /* ObjectLiteralExpression */:
+                case 169 /* TypeLiteral */:
+                case 298 /* JSDocTypeLiteral */:
+                case 269 /* JsxAttributes */:
                     return 1 /* IsContainer */;
-                case 241 /* InterfaceDeclaration */:
+                case 242 /* InterfaceDeclaration */:
                     return 1 /* IsContainer */ | 64 /* IsInterface */;
-                case 244 /* ModuleDeclaration */:
-                case 242 /* TypeAliasDeclaration */:
-                case 181 /* MappedType */:
+                case 245 /* ModuleDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
+                case 182 /* MappedType */:
                     return 1 /* IsContainer */ | 32 /* HasLocals */;
-                case 284 /* SourceFile */:
+                case 285 /* SourceFile */:
                     return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */;
-                case 156 /* MethodDeclaration */:
+                case 157 /* MethodDeclaration */:
                     if (ts.isObjectLiteralOrClassExpressionMethod(node)) {
                         return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */ | 8 /* IsFunctionLike */ | 128 /* IsObjectLiteralOrClassExpressionMethod */;
                     }
                 // falls through
-                case 157 /* Constructor */:
-                case 239 /* FunctionDeclaration */:
-                case 155 /* MethodSignature */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
-                case 160 /* CallSignature */:
-                case 298 /* JSDocSignature */:
-                case 294 /* JSDocFunctionType */:
-                case 165 /* FunctionType */:
-                case 161 /* ConstructSignature */:
-                case 162 /* IndexSignature */:
-                case 166 /* ConstructorType */:
+                case 158 /* Constructor */:
+                case 240 /* FunctionDeclaration */:
+                case 156 /* MethodSignature */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
+                case 161 /* CallSignature */:
+                case 299 /* JSDocSignature */:
+                case 295 /* JSDocFunctionType */:
+                case 166 /* FunctionType */:
+                case 162 /* ConstructSignature */:
+                case 163 /* IndexSignature */:
+                case 167 /* ConstructorType */:
                     return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */ | 8 /* IsFunctionLike */;
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
                     return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */ | 8 /* IsFunctionLike */ | 16 /* IsFunctionExpression */;
-                case 245 /* ModuleBlock */:
+                case 246 /* ModuleBlock */:
                     return 4 /* IsControlFlowContainer */;
-                case 154 /* PropertyDeclaration */:
+                case 155 /* PropertyDeclaration */:
                     return node.initializer ? 4 /* IsControlFlowContainer */ : 0;
-                case 274 /* CatchClause */:
-                case 225 /* ForStatement */:
-                case 226 /* ForInStatement */:
-                case 227 /* ForOfStatement */:
-                case 246 /* CaseBlock */:
+                case 275 /* CatchClause */:
+                case 226 /* ForStatement */:
+                case 227 /* ForInStatement */:
+                case 228 /* ForOfStatement */:
+                case 247 /* CaseBlock */:
                     return 2 /* IsBlockScopedContainer */;
-                case 218 /* Block */:
+                case 219 /* Block */:
                     // do not treat blocks directly inside a function as a block-scoped-container.
                     // Locals that reside in this block should go to the function locals. Otherwise 'x'
                     // would not appear to be a redeclaration of a block scoped local in the following
@@ -28781,45 +29207,45 @@ var ts;
                 // members are declared (for example, a member of a class will go into a specific
                 // symbol table depending on if it is static or not). We defer to specialized
                 // handlers to take care of declaring these child members.
-                case 244 /* ModuleDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     return declareModuleMember(node, symbolFlags, symbolExcludes);
-                case 284 /* SourceFile */:
+                case 285 /* SourceFile */:
                     return declareSourceFileMember(node, symbolFlags, symbolExcludes);
-                case 209 /* ClassExpression */:
-                case 240 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
+                case 241 /* ClassDeclaration */:
                     return declareClassMember(node, symbolFlags, symbolExcludes);
-                case 243 /* EnumDeclaration */:
+                case 244 /* EnumDeclaration */:
                     return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);
-                case 168 /* TypeLiteral */:
-                case 297 /* JSDocTypeLiteral */:
-                case 188 /* ObjectLiteralExpression */:
-                case 241 /* InterfaceDeclaration */:
-                case 268 /* JsxAttributes */:
+                case 169 /* TypeLiteral */:
+                case 298 /* JSDocTypeLiteral */:
+                case 189 /* ObjectLiteralExpression */:
+                case 242 /* InterfaceDeclaration */:
+                case 269 /* JsxAttributes */:
                     // Interface/Object-types always have their children added to the 'members' of
                     // their container. They are only accessible through an instance of their
                     // container, and are never in scope otherwise (even inside the body of the
                     // object / type / interface declaring them). An exception is type parameters,
                     // which are in scope without qualification (similar to 'locals').
                     return declareSymbol(container.symbol.members, container.symbol, node, symbolFlags, symbolExcludes);
-                case 165 /* FunctionType */:
-                case 166 /* ConstructorType */:
-                case 160 /* CallSignature */:
-                case 161 /* ConstructSignature */:
-                case 298 /* JSDocSignature */:
-                case 162 /* IndexSignature */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
-                case 157 /* Constructor */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
-                case 294 /* JSDocFunctionType */:
-                case 309 /* JSDocTypedefTag */:
-                case 302 /* JSDocCallbackTag */:
-                case 242 /* TypeAliasDeclaration */:
-                case 181 /* MappedType */:
+                case 166 /* FunctionType */:
+                case 167 /* ConstructorType */:
+                case 161 /* CallSignature */:
+                case 162 /* ConstructSignature */:
+                case 299 /* JSDocSignature */:
+                case 163 /* IndexSignature */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
+                case 158 /* Constructor */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
+                case 295 /* JSDocFunctionType */:
+                case 311 /* JSDocTypedefTag */:
+                case 304 /* JSDocCallbackTag */:
+                case 243 /* TypeAliasDeclaration */:
+                case 182 /* MappedType */:
                     // All the children of these container types are never visible through another
                     // symbol (i.e. through another symbol's 'exports' or 'members').  Instead,
                     // they're only accessed 'lexically' (i.e. from code that exists underneath
@@ -28840,16 +29266,8 @@ var ts;
                 : declareSymbol(file.locals, /*parent*/ undefined, node, symbolFlags, symbolExcludes);
         }
         function hasExportDeclarations(node) {
-            var body = node.kind === 284 /* SourceFile */ ? node : node.body;
-            if (body && (body.kind === 284 /* SourceFile */ || body.kind === 245 /* ModuleBlock */)) {
-                for (var _i = 0, _a = body.statements; _i < _a.length; _i++) {
-                    var stat = _a[_i];
-                    if (stat.kind === 255 /* ExportDeclaration */ || stat.kind === 254 /* ExportAssignment */) {
-                        return true;
-                    }
-                }
-            }
-            return false;
+            var body = ts.isSourceFile(node) ? node : ts.tryCast(node.body, ts.isModuleBlock);
+            return !!body && body.statements.some(function (s) { return ts.isExportDeclaration(s) || ts.isExportAssignment(s); });
         }
         function setExportContextFlag(node) {
             // A declaration source file or ambient module declaration that contains no export declarations (but possibly regular
@@ -28928,7 +29346,7 @@ var ts;
                 var seen = ts.createUnderscoreEscapedMap();
                 for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
                     var prop = _a[_i];
-                    if (prop.kind === 277 /* SpreadAssignment */ || prop.name.kind !== 72 /* Identifier */) {
+                    if (prop.kind === 278 /* SpreadAssignment */ || prop.name.kind !== 73 /* Identifier */) {
                         continue;
                     }
                     var identifier = prop.name;
@@ -28940,7 +29358,7 @@ var ts;
                     //    c.IsAccessorDescriptor(previous) is true and IsDataDescriptor(propId.descriptor) is true.
                     //    d.IsAccessorDescriptor(previous) is true and IsAccessorDescriptor(propId.descriptor) is true
                     // and either both previous and propId.descriptor have[[Get]] fields or both previous and propId.descriptor have[[Set]] fields
-                    var currentKind = prop.kind === 275 /* PropertyAssignment */ || prop.kind === 276 /* ShorthandPropertyAssignment */ || prop.kind === 156 /* MethodDeclaration */
+                    var currentKind = prop.kind === 276 /* PropertyAssignment */ || prop.kind === 277 /* ShorthandPropertyAssignment */ || prop.kind === 157 /* MethodDeclaration */
                         ? 1 /* Property */
                         : 2 /* Accessor */;
                     var existingKind = seen.get(identifier.escapedText);
@@ -28972,10 +29390,10 @@ var ts;
         }
         function bindBlockScopedDeclaration(node, symbolFlags, symbolExcludes) {
             switch (blockScopeContainer.kind) {
-                case 244 /* ModuleDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     declareModuleMember(node, symbolFlags, symbolExcludes);
                     break;
-                case 284 /* SourceFile */:
+                case 285 /* SourceFile */:
                     if (ts.isExternalOrCommonJsModule(container)) {
                         declareModuleMember(node, symbolFlags, symbolExcludes);
                         break;
@@ -29006,7 +29424,7 @@ var ts;
                 currentFlow = { flags: 2 /* Start */ };
                 parent = typeAlias;
                 bind(typeAlias.typeExpression);
-                if (!typeAlias.fullName || typeAlias.fullName.kind === 72 /* Identifier */) {
+                if (!typeAlias.fullName || typeAlias.fullName.kind === 73 /* Identifier */) {
                     parent = typeAlias.parent;
                     bindBlockScopedDeclaration(typeAlias, 524288 /* TypeAlias */, 67897832 /* TypeAliasExcludes */);
                 }
@@ -29024,8 +29442,8 @@ var ts;
         // check for reserved words used as identifiers in strict mode code.
         function checkStrictModeIdentifier(node) {
             if (inStrictMode &&
-                node.originalKeywordKind >= 109 /* FirstFutureReservedWord */ &&
-                node.originalKeywordKind <= 117 /* LastFutureReservedWord */ &&
+                node.originalKeywordKind >= 110 /* FirstFutureReservedWord */ &&
+                node.originalKeywordKind <= 118 /* LastFutureReservedWord */ &&
                 !ts.isIdentifierName(node) &&
                 !(node.flags & 4194304 /* Ambient */)) {
                 // Report error only if there are no parse errors in file
@@ -29061,7 +29479,7 @@ var ts;
         }
         function checkStrictModeDeleteExpression(node) {
             // Grammar checking
-            if (inStrictMode && node.expression.kind === 72 /* Identifier */) {
+            if (inStrictMode && node.expression.kind === 73 /* Identifier */) {
                 // When a delete operator occurs within strict mode code, a SyntaxError is thrown if its
                 // UnaryExpression is a direct reference to a variable, function argument, or function name
                 var span = ts.getErrorSpanForNode(file, node.expression);
@@ -29072,7 +29490,7 @@ var ts;
             return ts.isIdentifier(node) && (node.escapedText === "eval" || node.escapedText === "arguments");
         }
         function checkStrictModeEvalOrArguments(contextNode, name) {
-            if (name && name.kind === 72 /* Identifier */) {
+            if (name && name.kind === 73 /* Identifier */) {
                 var identifier = name;
                 if (isEvalOrArgumentsIdentifier(identifier)) {
                     // We check first if the name is inside class declaration or class expression; if so give explicit message
@@ -29113,8 +29531,8 @@ var ts;
         function checkStrictModeFunctionDeclaration(node) {
             if (languageVersion < 2 /* ES2015 */) {
                 // Report error if function is not top level function declaration
-                if (blockScopeContainer.kind !== 284 /* SourceFile */ &&
-                    blockScopeContainer.kind !== 244 /* ModuleDeclaration */ &&
+                if (blockScopeContainer.kind !== 285 /* SourceFile */ &&
+                    blockScopeContainer.kind !== 245 /* ModuleDeclaration */ &&
                     !ts.isFunctionLike(blockScopeContainer)) {
                     // We check first if the name is inside class declaration or class expression; if so give explicit message
                     // otherwise report generic error message.
@@ -29209,7 +29627,7 @@ var ts;
             // the current 'container' node when it changes. This helps us know which symbol table
             // a local should go into for example. Since terminal nodes are known not to have
             // children, as an optimization we don't process those.
-            if (node.kind > 147 /* LastToken */) {
+            if (node.kind > 148 /* LastToken */) {
                 var saveParent = parent;
                 parent = node;
                 var containerFlags = getContainerFlags(node);
@@ -29271,7 +29689,7 @@ var ts;
         function bindWorker(node) {
             switch (node.kind) {
                 /* Strict mode checks */
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     // for typedef type names with namespaces, bind the new jsdoc type symbol here
                     // because it requires all containing namespaces to be in effect, namely the
                     // current "blockScopeContainer" needs to be set to its immediate namespace parent.
@@ -29284,13 +29702,13 @@ var ts;
                         break;
                     }
                 // falls through
-                case 100 /* ThisKeyword */:
-                    if (currentFlow && (ts.isExpression(node) || parent.kind === 276 /* ShorthandPropertyAssignment */)) {
+                case 101 /* ThisKeyword */:
+                    if (currentFlow && (ts.isExpression(node) || parent.kind === 277 /* ShorthandPropertyAssignment */)) {
                         node.flowNode = currentFlow;
                     }
                     return checkStrictModeIdentifier(node);
-                case 189 /* PropertyAccessExpression */:
-                case 190 /* ElementAccessExpression */:
+                case 190 /* PropertyAccessExpression */:
+                case 191 /* ElementAccessExpression */:
                     if (currentFlow && isNarrowableReference(node)) {
                         node.flowNode = currentFlow;
                     }
@@ -29304,7 +29722,7 @@ var ts;
                         declareSymbol(file.locals, /*parent*/ undefined, node.expression, 1 /* FunctionScopedVariable */ | 134217728 /* ModuleExports */, 67220414 /* FunctionScopedVariableExcludes */);
                     }
                     break;
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     var specialKind = ts.getAssignmentDeclarationKind(node);
                     switch (specialKind) {
                         case 1 /* ExportsProperty */:
@@ -29332,76 +29750,76 @@ var ts;
                             ts.Debug.fail("Unknown binary expression special property assignment kind");
                     }
                     return checkStrictModeBinaryExpression(node);
-                case 274 /* CatchClause */:
+                case 275 /* CatchClause */:
                     return checkStrictModeCatchClause(node);
-                case 198 /* DeleteExpression */:
+                case 199 /* DeleteExpression */:
                     return checkStrictModeDeleteExpression(node);
                 case 8 /* NumericLiteral */:
                     return checkStrictModeNumericLiteral(node);
-                case 203 /* PostfixUnaryExpression */:
+                case 204 /* PostfixUnaryExpression */:
                     return checkStrictModePostfixUnaryExpression(node);
-                case 202 /* PrefixUnaryExpression */:
+                case 203 /* PrefixUnaryExpression */:
                     return checkStrictModePrefixUnaryExpression(node);
-                case 231 /* WithStatement */:
+                case 232 /* WithStatement */:
                     return checkStrictModeWithStatement(node);
-                case 233 /* LabeledStatement */:
+                case 234 /* LabeledStatement */:
                     return checkStrictModeLabeledStatement(node);
-                case 178 /* ThisType */:
+                case 179 /* ThisType */:
                     seenThisKeyword = true;
                     return;
-                case 163 /* TypePredicate */:
+                case 164 /* TypePredicate */:
                     break; // Binding the children will handle everything
-                case 150 /* TypeParameter */:
+                case 151 /* TypeParameter */:
                     return bindTypeParameter(node);
-                case 151 /* Parameter */:
+                case 152 /* Parameter */:
                     return bindParameter(node);
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     return bindVariableDeclarationOrBindingElement(node);
-                case 186 /* BindingElement */:
+                case 187 /* BindingElement */:
                     node.flowNode = currentFlow;
                     return bindVariableDeclarationOrBindingElement(node);
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
                     return bindPropertyWorker(node);
-                case 275 /* PropertyAssignment */:
-                case 276 /* ShorthandPropertyAssignment */:
+                case 276 /* PropertyAssignment */:
+                case 277 /* ShorthandPropertyAssignment */:
                     return bindPropertyOrMethodOrAccessor(node, 4 /* Property */, 0 /* PropertyExcludes */);
-                case 278 /* EnumMember */:
+                case 279 /* EnumMember */:
                     return bindPropertyOrMethodOrAccessor(node, 8 /* EnumMember */, 68008959 /* EnumMemberExcludes */);
-                case 160 /* CallSignature */:
-                case 161 /* ConstructSignature */:
-                case 162 /* IndexSignature */:
+                case 161 /* CallSignature */:
+                case 162 /* ConstructSignature */:
+                case 163 /* IndexSignature */:
                     return declareSymbolAndAddToSymbolTable(node, 131072 /* Signature */, 0 /* None */);
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
                     // If this is an ObjectLiteralExpression method, then it sits in the same space
                     // as other properties in the object literal.  So we use SymbolFlags.PropertyExcludes
                     // so that it will conflict with any other object literal members with the same
                     // name.
                     return bindPropertyOrMethodOrAccessor(node, 8192 /* Method */ | (node.questionToken ? 16777216 /* Optional */ : 0 /* None */), ts.isObjectLiteralMethod(node) ? 0 /* PropertyExcludes */ : 67212223 /* MethodExcludes */);
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     return bindFunctionDeclaration(node);
-                case 157 /* Constructor */:
+                case 158 /* Constructor */:
                     return declareSymbolAndAddToSymbolTable(node, 16384 /* Constructor */, /*symbolExcludes:*/ 0 /* None */);
-                case 158 /* GetAccessor */:
+                case 159 /* GetAccessor */:
                     return bindPropertyOrMethodOrAccessor(node, 32768 /* GetAccessor */, 67154879 /* GetAccessorExcludes */);
-                case 159 /* SetAccessor */:
+                case 160 /* SetAccessor */:
                     return bindPropertyOrMethodOrAccessor(node, 65536 /* SetAccessor */, 67187647 /* SetAccessorExcludes */);
-                case 165 /* FunctionType */:
-                case 294 /* JSDocFunctionType */:
-                case 298 /* JSDocSignature */:
-                case 166 /* ConstructorType */:
+                case 166 /* FunctionType */:
+                case 295 /* JSDocFunctionType */:
+                case 299 /* JSDocSignature */:
+                case 167 /* ConstructorType */:
                     return bindFunctionOrConstructorType(node);
-                case 168 /* TypeLiteral */:
-                case 297 /* JSDocTypeLiteral */:
-                case 181 /* MappedType */:
+                case 169 /* TypeLiteral */:
+                case 298 /* JSDocTypeLiteral */:
+                case 182 /* MappedType */:
                     return bindAnonymousTypeWorker(node);
-                case 188 /* ObjectLiteralExpression */:
+                case 189 /* ObjectLiteralExpression */:
                     return bindObjectLiteralExpression(node);
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
                     return bindFunctionExpression(node);
-                case 191 /* CallExpression */:
+                case 192 /* CallExpression */:
                     var assignmentKind = ts.getAssignmentDeclarationKind(node);
                     switch (assignmentKind) {
                         case 7 /* ObjectDefinePropertyValue */:
@@ -29420,64 +29838,64 @@ var ts;
                     }
                     break;
                 // Members of classes, interfaces, and modules
-                case 209 /* ClassExpression */:
-                case 240 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
+                case 241 /* ClassDeclaration */:
                     // All classes are automatically in strict mode in ES6.
                     inStrictMode = true;
                     return bindClassLikeDeclaration(node);
-                case 241 /* InterfaceDeclaration */:
+                case 242 /* InterfaceDeclaration */:
                     return bindBlockScopedDeclaration(node, 64 /* Interface */, 67897736 /* InterfaceExcludes */);
-                case 242 /* TypeAliasDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
                     return bindBlockScopedDeclaration(node, 524288 /* TypeAlias */, 67897832 /* TypeAliasExcludes */);
-                case 243 /* EnumDeclaration */:
+                case 244 /* EnumDeclaration */:
                     return bindEnumDeclaration(node);
-                case 244 /* ModuleDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     return bindModuleDeclaration(node);
                 // Jsx-attributes
-                case 268 /* JsxAttributes */:
+                case 269 /* JsxAttributes */:
                     return bindJsxAttributes(node);
-                case 267 /* JsxAttribute */:
+                case 268 /* JsxAttribute */:
                     return bindJsxAttribute(node, 4 /* Property */, 0 /* PropertyExcludes */);
                 // Imports and exports
-                case 248 /* ImportEqualsDeclaration */:
-                case 251 /* NamespaceImport */:
-                case 253 /* ImportSpecifier */:
-                case 257 /* ExportSpecifier */:
+                case 249 /* ImportEqualsDeclaration */:
+                case 252 /* NamespaceImport */:
+                case 254 /* ImportSpecifier */:
+                case 258 /* ExportSpecifier */:
                     return declareSymbolAndAddToSymbolTable(node, 2097152 /* Alias */, 2097152 /* AliasExcludes */);
-                case 247 /* NamespaceExportDeclaration */:
+                case 248 /* NamespaceExportDeclaration */:
                     return bindNamespaceExportDeclaration(node);
-                case 250 /* ImportClause */:
+                case 251 /* ImportClause */:
                     return bindImportClause(node);
-                case 255 /* ExportDeclaration */:
+                case 256 /* ExportDeclaration */:
                     return bindExportDeclaration(node);
-                case 254 /* ExportAssignment */:
+                case 255 /* ExportAssignment */:
                     return bindExportAssignment(node);
-                case 284 /* SourceFile */:
+                case 285 /* SourceFile */:
                     updateStrictModeStatementList(node.statements);
                     return bindSourceFileIfExternalModule();
-                case 218 /* Block */:
+                case 219 /* Block */:
                     if (!ts.isFunctionLike(node.parent)) {
                         return;
                     }
                 // falls through
-                case 245 /* ModuleBlock */:
+                case 246 /* ModuleBlock */:
                     return updateStrictModeStatementList(node.statements);
-                case 304 /* JSDocParameterTag */:
-                    if (node.parent.kind === 298 /* JSDocSignature */) {
+                case 306 /* JSDocParameterTag */:
+                    if (node.parent.kind === 299 /* JSDocSignature */) {
                         return bindParameter(node);
                     }
-                    if (node.parent.kind !== 297 /* JSDocTypeLiteral */) {
+                    if (node.parent.kind !== 298 /* JSDocTypeLiteral */) {
                         break;
                     }
                 // falls through
-                case 310 /* JSDocPropertyTag */:
+                case 312 /* JSDocPropertyTag */:
                     var propTag = node;
-                    var flags = propTag.isBracketed || propTag.typeExpression && propTag.typeExpression.type.kind === 293 /* JSDocOptionalType */ ?
+                    var flags = propTag.isBracketed || propTag.typeExpression && propTag.typeExpression.type.kind === 294 /* JSDocOptionalType */ ?
                         4 /* Property */ | 16777216 /* Optional */ :
                         4 /* Property */;
                     return declareSymbolAndAddToSymbolTable(propTag, flags, 0 /* PropertyExcludes */);
-                case 309 /* JSDocTypedefTag */:
-                case 302 /* JSDocCallbackTag */:
+                case 311 /* JSDocTypedefTag */:
+                case 304 /* JSDocCallbackTag */:
                     return (delayedTypeAliases || (delayedTypeAliases = [])).push(node);
             }
         }
@@ -29621,11 +30039,11 @@ var ts;
             ts.Debug.assert(ts.isInJSFile(node));
             var thisContainer = ts.getThisContainer(node, /*includeArrowFunctions*/ false);
             switch (thisContainer.kind) {
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
                     var constructorSymbol = thisContainer.symbol;
                     // For `f.prototype.m = function() { this.x = 0; }`, `this.x = 0` should modify `f`'s members, not the function expression.
-                    if (ts.isBinaryExpression(thisContainer.parent) && thisContainer.parent.operatorToken.kind === 59 /* EqualsToken */) {
+                    if (ts.isBinaryExpression(thisContainer.parent) && thisContainer.parent.operatorToken.kind === 60 /* EqualsToken */) {
                         var l = thisContainer.parent.left;
                         if (ts.isPropertyAccessEntityNameExpression(l) && ts.isPrototypeAccess(l.expression)) {
                             constructorSymbol = lookupSymbolForPropertyAccess(l.expression.expression, thisParentContainer);
@@ -29638,18 +30056,18 @@ var ts;
                         declareSymbol(constructorSymbol.members, constructorSymbol, node, 4 /* Property */, 0 /* PropertyExcludes */ & ~4 /* Property */);
                     }
                     break;
-                case 157 /* Constructor */:
-                case 154 /* PropertyDeclaration */:
-                case 156 /* MethodDeclaration */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 158 /* Constructor */:
+                case 155 /* PropertyDeclaration */:
+                case 157 /* MethodDeclaration */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     // this.foo assignment in a JavaScript class
                     // Bind this property to the containing class
                     var containingClass = thisContainer.parent;
                     var symbolTable = ts.hasModifier(thisContainer, 32 /* Static */) ? containingClass.symbol.exports : containingClass.symbol.members;
                     declareSymbol(symbolTable, containingClass.symbol, node, 4 /* Property */, 0 /* None */, /*isReplaceableByMethod*/ true);
                     break;
-                case 284 /* SourceFile */:
+                case 285 /* SourceFile */:
                     // this.property = assignment in a source file -- declare symbol in exports for a module, in locals for a script
                     if (thisContainer.commonJsModuleIndicator) {
                         declareSymbol(thisContainer.symbol.exports, thisContainer.symbol, node, 4 /* Property */ | 1048576 /* ExportValue */, 0 /* None */);
@@ -29659,14 +30077,14 @@ var ts;
                     }
                     break;
                 default:
-                    ts.Debug.fail(ts.Debug.showSyntaxKind(thisContainer));
+                    ts.Debug.failBadSyntaxKind(thisContainer);
             }
         }
         function bindSpecialPropertyDeclaration(node) {
-            if (node.expression.kind === 100 /* ThisKeyword */) {
+            if (node.expression.kind === 101 /* ThisKeyword */) {
                 bindThisPropertyAssignment(node);
             }
-            else if (ts.isPropertyAccessEntityNameExpression(node) && node.parent.parent.kind === 284 /* SourceFile */) {
+            else if (ts.isPropertyAccessEntityNameExpression(node) && node.parent.parent.kind === 285 /* SourceFile */) {
                 if (ts.isPrototypeAccess(node.expression)) {
                     bindPrototypePropertyAssignment(node, node.parent);
                 }
@@ -29703,7 +30121,7 @@ var ts;
         }
         function bindObjectDefinePropertyAssignment(node) {
             var namespaceSymbol = lookupSymbolForPropertyAccess(node.arguments[0]);
-            var isToplevel = node.parent.parent.kind === 284 /* SourceFile */;
+            var isToplevel = node.parent.parent.kind === 285 /* SourceFile */;
             namespaceSymbol = bindPotentiallyMissingNamespaces(namespaceSymbol, node.arguments[0], isToplevel, /*isPrototypeProperty*/ false);
             bindPotentiallyNewExpandoMemberToNamespace(node, namespaceSymbol, /*isPrototypeProperty*/ false);
         }
@@ -29717,7 +30135,7 @@ var ts;
             // Fix up parent pointers since we're going to use these nodes before we bind into them
             node.left.parent = node;
             node.right.parent = node;
-            if (ts.isIdentifier(lhs.expression) && container === file && isNameOfExportsOrModuleExportsAliasDeclaration(file, lhs.expression)) {
+            if (ts.isIdentifier(lhs.expression) && container === file && isExportsOrModuleExportsOrAlias(file, lhs.expression)) {
                 // This can be an alias for the 'exports' or 'module.exports' names, e.g.
                 //    var util = module.exports;
                 //    util.property = function ...
@@ -29770,8 +30188,8 @@ var ts;
         function bindPropertyAssignment(name, propertyAccess, isPrototypeProperty) {
             var namespaceSymbol = lookupSymbolForPropertyAccess(name);
             var isToplevel = ts.isBinaryExpression(propertyAccess.parent)
-                ? getParentOfBinaryExpression(propertyAccess.parent).parent.kind === 284 /* SourceFile */
-                : propertyAccess.parent.parent.kind === 284 /* SourceFile */;
+                ? getParentOfBinaryExpression(propertyAccess.parent).parent.kind === 285 /* SourceFile */
+                : propertyAccess.parent.parent.kind === 285 /* SourceFile */;
             namespaceSymbol = bindPotentiallyMissingNamespaces(namespaceSymbol, propertyAccess.expression, isToplevel, isPrototypeProperty);
             bindPotentiallyNewExpandoMemberToNamespace(propertyAccess, namespaceSymbol, isPrototypeProperty);
         }
@@ -29830,9 +30248,7 @@ var ts;
             }
             else {
                 var s = forEachIdentifierInEntityName(e.expression, parent, action);
-                if (!s || !s.exports)
-                    return ts.Debug.fail();
-                return action(e.name, s.exports.get(e.name.escapedText), s);
+                return action(e.name, s && s.exports && s.exports.get(e.name.escapedText), s);
             }
         }
         function bindCallExpression(node) {
@@ -29843,7 +30259,7 @@ var ts;
             }
         }
         function bindClassLikeDeclaration(node) {
-            if (node.kind === 240 /* ClassDeclaration */) {
+            if (node.kind === 241 /* ClassDeclaration */) {
                 bindBlockScopedDeclaration(node, 32 /* Class */, 68008383 /* ClassExcludes */);
             }
             else {
@@ -29909,7 +30325,7 @@ var ts;
             }
         }
         function bindParameter(node) {
-            if (node.kind === 304 /* JSDocParameterTag */ && container.kind !== 298 /* JSDocSignature */) {
+            if (node.kind === 306 /* JSDocParameterTag */ && container.kind !== 299 /* JSDocSignature */) {
                 return;
             }
             if (inStrictMode && !(node.flags & 4194304 /* Ambient */)) {
@@ -29986,7 +30402,7 @@ var ts;
                     declareSymbolAndAddToSymbolTable(node, 262144 /* TypeParameter */, 67635688 /* TypeParameterExcludes */);
                 }
             }
-            else if (node.parent.kind === 176 /* InferType */) {
+            else if (node.parent.kind === 177 /* InferType */) {
                 var container_2 = getInferTypeContainer(node.parent);
                 if (container_2) {
                     if (!container_2.locals) {
@@ -30014,11 +30430,11 @@ var ts;
             if (currentFlow === unreachableFlow) {
                 var reportError = 
                 // report error on all statements except empty ones
-                (ts.isStatementButNotDeclaration(node) && node.kind !== 220 /* EmptyStatement */) ||
+                (ts.isStatementButNotDeclaration(node) && node.kind !== 221 /* EmptyStatement */) ||
                     // report error on class declarations
-                    node.kind === 240 /* ClassDeclaration */ ||
+                    node.kind === 241 /* ClassDeclaration */ ||
                     // report error on instantiated modules or const-enums only modules if preserveConstEnums is set
-                    (node.kind === 244 /* ModuleDeclaration */ && shouldReportErrorOnModuleDeclaration(node));
+                    (node.kind === 245 /* ModuleDeclaration */ && shouldReportErrorOnModuleDeclaration(node));
                 if (reportError) {
                     currentFlow = reportedUnreachableFlow;
                     if (!options.allowUnreachableCode) {
@@ -30062,32 +30478,41 @@ var ts;
     }
     function isPurelyTypeDeclaration(s) {
         switch (s.kind) {
-            case 241 /* InterfaceDeclaration */:
-            case 242 /* TypeAliasDeclaration */:
+            case 242 /* InterfaceDeclaration */:
+            case 243 /* TypeAliasDeclaration */:
                 return true;
-            case 244 /* ModuleDeclaration */:
+            case 245 /* ModuleDeclaration */:
                 return getModuleInstanceState(s) !== 1 /* Instantiated */;
-            case 243 /* EnumDeclaration */:
+            case 244 /* EnumDeclaration */:
                 return ts.hasModifier(s, 2048 /* Const */);
             default:
                 return false;
         }
     }
     function isExportsOrModuleExportsOrAlias(sourceFile, node) {
-        return ts.isExportsIdentifier(node) ||
-            ts.isModuleExportsPropertyAccessExpression(node) ||
-            ts.isIdentifier(node) && isNameOfExportsOrModuleExportsAliasDeclaration(sourceFile, node);
+        var i = 0;
+        var q = [node];
+        while (q.length && i < 100) {
+            i++;
+            node = q.shift();
+            if (ts.isExportsIdentifier(node) || ts.isModuleExportsPropertyAccessExpression(node)) {
+                return true;
+            }
+            else if (ts.isIdentifier(node)) {
+                var symbol = lookupSymbolForNameWorker(sourceFile, node.escapedText);
+                if (!!symbol && !!symbol.valueDeclaration && ts.isVariableDeclaration(symbol.valueDeclaration) && !!symbol.valueDeclaration.initializer) {
+                    var init = symbol.valueDeclaration.initializer;
+                    q.push(init);
+                    if (ts.isAssignmentExpression(init, /*excludeCompoundAssignment*/ true)) {
+                        q.push(init.left);
+                        q.push(init.right);
+                    }
+                }
+            }
+        }
+        return false;
     }
     ts.isExportsOrModuleExportsOrAlias = isExportsOrModuleExportsOrAlias;
-    function isNameOfExportsOrModuleExportsAliasDeclaration(sourceFile, node) {
-        var symbol = lookupSymbolForNameWorker(sourceFile, node.escapedText);
-        return !!symbol && !!symbol.valueDeclaration && ts.isVariableDeclaration(symbol.valueDeclaration) &&
-            !!symbol.valueDeclaration.initializer && isExportsOrModuleExportsOrAliasOrAssignment(sourceFile, symbol.valueDeclaration.initializer);
-    }
-    function isExportsOrModuleExportsOrAliasOrAssignment(sourceFile, node) {
-        return isExportsOrModuleExportsOrAlias(sourceFile, node) ||
-            (ts.isAssignmentExpression(node, /*excludeCompoundAssignment*/ true) && (isExportsOrModuleExportsOrAliasOrAssignment(sourceFile, node.left) || isExportsOrModuleExportsOrAliasOrAssignment(sourceFile, node.right)));
-    }
     function lookupSymbolForNameWorker(container, name) {
         var local = container.locals && container.locals.get(name);
         if (local) {
@@ -30107,58 +30532,58 @@ var ts;
     function computeTransformFlagsForNode(node, subtreeFlags) {
         var kind = node.kind;
         switch (kind) {
-            case 191 /* CallExpression */:
+            case 192 /* CallExpression */:
                 return computeCallExpression(node, subtreeFlags);
-            case 192 /* NewExpression */:
+            case 193 /* NewExpression */:
                 return computeNewExpression(node, subtreeFlags);
-            case 244 /* ModuleDeclaration */:
+            case 245 /* ModuleDeclaration */:
                 return computeModuleDeclaration(node, subtreeFlags);
-            case 195 /* ParenthesizedExpression */:
+            case 196 /* ParenthesizedExpression */:
                 return computeParenthesizedExpression(node, subtreeFlags);
-            case 204 /* BinaryExpression */:
+            case 205 /* BinaryExpression */:
                 return computeBinaryExpression(node, subtreeFlags);
-            case 221 /* ExpressionStatement */:
+            case 222 /* ExpressionStatement */:
                 return computeExpressionStatement(node, subtreeFlags);
-            case 151 /* Parameter */:
+            case 152 /* Parameter */:
                 return computeParameter(node, subtreeFlags);
-            case 197 /* ArrowFunction */:
+            case 198 /* ArrowFunction */:
                 return computeArrowFunction(node, subtreeFlags);
-            case 196 /* FunctionExpression */:
+            case 197 /* FunctionExpression */:
                 return computeFunctionExpression(node, subtreeFlags);
-            case 239 /* FunctionDeclaration */:
+            case 240 /* FunctionDeclaration */:
                 return computeFunctionDeclaration(node, subtreeFlags);
-            case 237 /* VariableDeclaration */:
+            case 238 /* VariableDeclaration */:
                 return computeVariableDeclaration(node, subtreeFlags);
-            case 238 /* VariableDeclarationList */:
+            case 239 /* VariableDeclarationList */:
                 return computeVariableDeclarationList(node, subtreeFlags);
-            case 219 /* VariableStatement */:
+            case 220 /* VariableStatement */:
                 return computeVariableStatement(node, subtreeFlags);
-            case 233 /* LabeledStatement */:
+            case 234 /* LabeledStatement */:
                 return computeLabeledStatement(node, subtreeFlags);
-            case 240 /* ClassDeclaration */:
+            case 241 /* ClassDeclaration */:
                 return computeClassDeclaration(node, subtreeFlags);
-            case 209 /* ClassExpression */:
+            case 210 /* ClassExpression */:
                 return computeClassExpression(node, subtreeFlags);
-            case 273 /* HeritageClause */:
+            case 274 /* HeritageClause */:
                 return computeHeritageClause(node, subtreeFlags);
-            case 274 /* CatchClause */:
+            case 275 /* CatchClause */:
                 return computeCatchClause(node, subtreeFlags);
-            case 211 /* ExpressionWithTypeArguments */:
+            case 212 /* ExpressionWithTypeArguments */:
                 return computeExpressionWithTypeArguments(node, subtreeFlags);
-            case 157 /* Constructor */:
+            case 158 /* Constructor */:
                 return computeConstructor(node, subtreeFlags);
-            case 154 /* PropertyDeclaration */:
+            case 155 /* PropertyDeclaration */:
                 return computePropertyDeclaration(node, subtreeFlags);
-            case 156 /* MethodDeclaration */:
+            case 157 /* MethodDeclaration */:
                 return computeMethod(node, subtreeFlags);
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
                 return computeAccessor(node, subtreeFlags);
-            case 248 /* ImportEqualsDeclaration */:
+            case 249 /* ImportEqualsDeclaration */:
                 return computeImportEquals(node, subtreeFlags);
-            case 189 /* PropertyAccessExpression */:
+            case 190 /* PropertyAccessExpression */:
                 return computePropertyAccess(node, subtreeFlags);
-            case 190 /* ElementAccessExpression */:
+            case 191 /* ElementAccessExpression */:
                 return computeElementAccess(node, subtreeFlags);
             default:
                 return computeOther(node, kind, subtreeFlags);
@@ -30180,7 +30605,7 @@ var ts;
                 transformFlags |= 2048 /* ContainsLexicalThis */;
             }
         }
-        if (expression.kind === 92 /* ImportKeyword */) {
+        if (expression.kind === 93 /* ImportKeyword */) {
             transformFlags |= 524288 /* ContainsDynamicImport */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
@@ -30203,17 +30628,17 @@ var ts;
         var transformFlags = subtreeFlags;
         var operatorTokenKind = node.operatorToken.kind;
         var leftKind = node.left.kind;
-        if (operatorTokenKind === 59 /* EqualsToken */ && leftKind === 188 /* ObjectLiteralExpression */) {
+        if (operatorTokenKind === 60 /* EqualsToken */ && leftKind === 189 /* ObjectLiteralExpression */) {
             // Destructuring object assignments with are ES2015 syntax
             // and possibly ES2018 if they contain rest
             transformFlags |= 16 /* AssertES2018 */ | 128 /* AssertES2015 */ | 512 /* AssertDestructuringAssignment */;
         }
-        else if (operatorTokenKind === 59 /* EqualsToken */ && leftKind === 187 /* ArrayLiteralExpression */) {
+        else if (operatorTokenKind === 60 /* EqualsToken */ && leftKind === 188 /* ArrayLiteralExpression */) {
             // Destructuring assignments are ES2015 syntax.
             transformFlags |= 128 /* AssertES2015 */ | 512 /* AssertDestructuringAssignment */;
         }
         else if (operatorTokenKind === 41 /* AsteriskAsteriskToken */
-            || operatorTokenKind === 63 /* AsteriskAsteriskEqualsToken */) {
+            || operatorTokenKind === 64 /* AsteriskAsteriskEqualsToken */) {
             // Exponentiation is ES2016 syntax.
             transformFlags |= 64 /* AssertES2016 */;
         }
@@ -30256,8 +30681,8 @@ var ts;
         // If the node is synthesized, it means the emitter put the parentheses there,
         // not the user. If we didn't want them, the emitter would not have put them
         // there.
-        if (expressionKind === 212 /* AsExpression */
-            || expressionKind === 194 /* TypeAssertionExpression */) {
+        if (expressionKind === 213 /* AsExpression */
+            || expressionKind === 195 /* TypeAssertionExpression */) {
             transformFlags |= 1 /* AssertTypeScript */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
@@ -30272,8 +30697,7 @@ var ts;
         else {
             // A ClassDeclaration is ES6 syntax.
             transformFlags = subtreeFlags | 128 /* AssertES2015 */;
-            // A class with a parameter property assignment, property initializer, computed property name, or decorator is
-            // TypeScript syntax.
+            // A class with a parameter property assignment or decorator is TypeScript syntax.
             // An exported declaration may be TypeScript syntax, but is handled by the visitor
             // for a namespace declaration.
             if ((subtreeFlags & 1024 /* ContainsTypeScriptClassSyntax */)
@@ -30287,8 +30711,7 @@ var ts;
     function computeClassExpression(node, subtreeFlags) {
         // A ClassExpression is ES6 syntax.
         var transformFlags = subtreeFlags | 128 /* AssertES2015 */;
-        // A class with a parameter property assignment, property initializer, or decorator is
-        // TypeScript syntax.
+        // A class with a parameter property assignment or decorator is TypeScript syntax.
         if (subtreeFlags & 1024 /* ContainsTypeScriptClassSyntax */
             || node.typeParameters) {
             transformFlags |= 1 /* AssertTypeScript */;
@@ -30299,11 +30722,11 @@ var ts;
     function computeHeritageClause(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
         switch (node.token) {
-            case 86 /* ExtendsKeyword */:
+            case 87 /* ExtendsKeyword */:
                 // An `extends` HeritageClause is ES6 syntax.
                 transformFlags |= 128 /* AssertES2015 */;
                 break;
-            case 109 /* ImplementsKeyword */:
+            case 110 /* ImplementsKeyword */:
                 // An `implements` HeritageClause is TypeScript syntax.
                 transformFlags |= 1 /* AssertTypeScript */;
                 break;
@@ -30360,7 +30783,6 @@ var ts;
             || ts.hasModifier(node, 2270 /* TypeScriptModifier */)
             || node.typeParameters
             || node.type
-            || (node.name && ts.isComputedPropertyName(node.name)) // While computed method names aren't typescript, the TS transform must visit them to emit property declarations correctly
             || !node.body) {
             transformFlags |= 1 /* AssertTypeScript */;
         }
@@ -30385,7 +30807,6 @@ var ts;
         if (node.decorators
             || ts.hasModifier(node, 2270 /* TypeScriptModifier */)
             || node.type
-            || (node.name && ts.isComputedPropertyName(node.name)) // While computed accessor names aren't typescript, the TS transform must visit them to emit property declarations correctly
             || !node.body) {
             transformFlags |= 1 /* AssertTypeScript */;
         }
@@ -30397,11 +30818,13 @@ var ts;
         return propagatePropertyNameFlags(node.name, transformFlags & ~537372672 /* MethodOrAccessorExcludes */);
     }
     function computePropertyDeclaration(node, subtreeFlags) {
-        // A PropertyDeclaration is TypeScript syntax.
-        var transformFlags = subtreeFlags | 1 /* AssertTypeScript */;
-        // If the PropertyDeclaration has an initializer or a computed name, we need to inform its ancestor
-        // so that it handle the transformation.
-        if (node.initializer || ts.isComputedPropertyName(node.name)) {
+        var transformFlags = subtreeFlags | 1048576 /* ContainsClassFields */;
+        // Decorators, TypeScript-specific modifiers, and type annotations are TypeScript syntax.
+        if (ts.some(node.decorators) || ts.hasModifier(node, 2270 /* TypeScriptModifier */) || node.type) {
+            transformFlags |= 1 /* AssertTypeScript */;
+        }
+        // Hoisted variables related to class properties should live within the TypeScript class wrapper.
+        if (ts.isComputedPropertyName(node.name) || (ts.hasStaticModifier(node) && node.initializer)) {
             transformFlags |= 1024 /* ContainsTypeScriptClassSyntax */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
@@ -30496,7 +30919,7 @@ var ts;
         var transformFlags = subtreeFlags;
         // If a PropertyAccessExpression starts with a super keyword, then it is
         // ES6 syntax, and requires a lexical `this` binding.
-        if (node.expression.kind === 98 /* SuperKeyword */) {
+        if (node.expression.kind === 99 /* SuperKeyword */) {
             // super inside of an async function requires hoisting the super access (ES2017).
             // same for super inside of an async generator, which is ES2018.
             transformFlags |= 32 /* ContainsES2017 */ | 16 /* ContainsES2018 */;
@@ -30508,7 +30931,7 @@ var ts;
         var transformFlags = subtreeFlags;
         // If an ElementAccessExpression starts with a super keyword, then it is
         // ES6 syntax, and requires a lexical `this` binding.
-        if (node.expression.kind === 98 /* SuperKeyword */) {
+        if (node.expression.kind === 99 /* SuperKeyword */) {
             // super inside of an async function requires hoisting the super access (ES2017).
             // same for super inside of an async generator, which is ES2018.
             transformFlags |= 32 /* ContainsES2017 */ | 16 /* ContainsES2018 */;
@@ -30596,43 +31019,43 @@ var ts;
         var transformFlags = subtreeFlags;
         var excludeFlags = 536870912 /* NodeExcludes */;
         switch (kind) {
-            case 121 /* AsyncKeyword */:
-            case 201 /* AwaitExpression */:
+            case 122 /* AsyncKeyword */:
+            case 202 /* AwaitExpression */:
                 // async/await is ES2017 syntax, but may be ES2018 syntax (for async generators)
                 transformFlags |= 16 /* AssertES2018 */ | 32 /* AssertES2017 */;
                 break;
-            case 194 /* TypeAssertionExpression */:
-            case 212 /* AsExpression */:
-            case 313 /* PartiallyEmittedExpression */:
+            case 195 /* TypeAssertionExpression */:
+            case 213 /* AsExpression */:
+            case 315 /* PartiallyEmittedExpression */:
                 // These nodes are TypeScript syntax.
                 transformFlags |= 1 /* AssertTypeScript */;
                 excludeFlags = 536870912 /* OuterExpressionExcludes */;
                 break;
-            case 115 /* PublicKeyword */:
-            case 113 /* PrivateKeyword */:
-            case 114 /* ProtectedKeyword */:
-            case 118 /* AbstractKeyword */:
-            case 125 /* DeclareKeyword */:
-            case 77 /* ConstKeyword */:
-            case 243 /* EnumDeclaration */:
-            case 278 /* EnumMember */:
-            case 213 /* NonNullExpression */:
-            case 133 /* ReadonlyKeyword */:
+            case 116 /* PublicKeyword */:
+            case 114 /* PrivateKeyword */:
+            case 115 /* ProtectedKeyword */:
+            case 119 /* AbstractKeyword */:
+            case 126 /* DeclareKeyword */:
+            case 78 /* ConstKeyword */:
+            case 244 /* EnumDeclaration */:
+            case 279 /* EnumMember */:
+            case 214 /* NonNullExpression */:
+            case 134 /* ReadonlyKeyword */:
                 // These nodes are TypeScript syntax.
                 transformFlags |= 1 /* AssertTypeScript */;
                 break;
-            case 260 /* JsxElement */:
-            case 261 /* JsxSelfClosingElement */:
-            case 262 /* JsxOpeningElement */:
+            case 261 /* JsxElement */:
+            case 262 /* JsxSelfClosingElement */:
+            case 263 /* JsxOpeningElement */:
             case 11 /* JsxText */:
-            case 263 /* JsxClosingElement */:
-            case 264 /* JsxFragment */:
-            case 265 /* JsxOpeningFragment */:
-            case 266 /* JsxClosingFragment */:
-            case 267 /* JsxAttribute */:
-            case 268 /* JsxAttributes */:
-            case 269 /* JsxSpreadAttribute */:
-            case 270 /* JsxExpression */:
+            case 264 /* JsxClosingElement */:
+            case 265 /* JsxFragment */:
+            case 266 /* JsxOpeningFragment */:
+            case 267 /* JsxClosingFragment */:
+            case 268 /* JsxAttribute */:
+            case 269 /* JsxAttributes */:
+            case 270 /* JsxSpreadAttribute */:
+            case 271 /* JsxExpression */:
                 // These nodes are Jsx syntax.
                 transformFlags |= 2 /* AssertJsx */;
                 break;
@@ -30640,11 +31063,11 @@ var ts;
             case 15 /* TemplateHead */:
             case 16 /* TemplateMiddle */:
             case 17 /* TemplateTail */:
-            case 206 /* TemplateExpression */:
-            case 193 /* TaggedTemplateExpression */:
-            case 276 /* ShorthandPropertyAssignment */:
-            case 116 /* StaticKeyword */:
-            case 214 /* MetaProperty */:
+            case 207 /* TemplateExpression */:
+            case 194 /* TaggedTemplateExpression */:
+            case 277 /* ShorthandPropertyAssignment */:
+            case 117 /* StaticKeyword */:
+            case 215 /* MetaProperty */:
                 // These nodes are ES6 syntax.
                 transformFlags |= 128 /* AssertES2015 */;
                 break;
@@ -30661,103 +31084,103 @@ var ts;
             case 9 /* BigIntLiteral */:
                 transformFlags |= 4 /* AssertESNext */;
                 break;
-            case 227 /* ForOfStatement */:
+            case 228 /* ForOfStatement */:
                 // This node is either ES2015 syntax or ES2017 syntax (if it is a for-await-of).
                 if (node.awaitModifier) {
                     transformFlags |= 16 /* AssertES2018 */;
                 }
                 transformFlags |= 128 /* AssertES2015 */;
                 break;
-            case 207 /* YieldExpression */:
+            case 208 /* YieldExpression */:
                 // This node is either ES2015 syntax (in a generator) or ES2017 syntax (in an async
                 // generator).
                 transformFlags |= 16 /* AssertES2018 */ | 128 /* AssertES2015 */ | 131072 /* ContainsYield */;
                 break;
-            case 120 /* AnyKeyword */:
-            case 135 /* NumberKeyword */:
-            case 146 /* BigIntKeyword */:
-            case 132 /* NeverKeyword */:
-            case 136 /* ObjectKeyword */:
-            case 138 /* StringKeyword */:
-            case 123 /* BooleanKeyword */:
-            case 139 /* SymbolKeyword */:
-            case 106 /* VoidKeyword */:
-            case 150 /* TypeParameter */:
-            case 153 /* PropertySignature */:
-            case 155 /* MethodSignature */:
-            case 160 /* CallSignature */:
-            case 161 /* ConstructSignature */:
-            case 162 /* IndexSignature */:
-            case 163 /* TypePredicate */:
-            case 164 /* TypeReference */:
-            case 165 /* FunctionType */:
-            case 166 /* ConstructorType */:
-            case 167 /* TypeQuery */:
-            case 168 /* TypeLiteral */:
-            case 169 /* ArrayType */:
-            case 170 /* TupleType */:
-            case 171 /* OptionalType */:
-            case 172 /* RestType */:
-            case 173 /* UnionType */:
-            case 174 /* IntersectionType */:
-            case 175 /* ConditionalType */:
-            case 176 /* InferType */:
-            case 177 /* ParenthesizedType */:
-            case 241 /* InterfaceDeclaration */:
-            case 242 /* TypeAliasDeclaration */:
-            case 178 /* ThisType */:
-            case 179 /* TypeOperator */:
-            case 180 /* IndexedAccessType */:
-            case 181 /* MappedType */:
-            case 182 /* LiteralType */:
-            case 247 /* NamespaceExportDeclaration */:
+            case 121 /* AnyKeyword */:
+            case 136 /* NumberKeyword */:
+            case 147 /* BigIntKeyword */:
+            case 133 /* NeverKeyword */:
+            case 137 /* ObjectKeyword */:
+            case 139 /* StringKeyword */:
+            case 124 /* BooleanKeyword */:
+            case 140 /* SymbolKeyword */:
+            case 107 /* VoidKeyword */:
+            case 151 /* TypeParameter */:
+            case 154 /* PropertySignature */:
+            case 156 /* MethodSignature */:
+            case 161 /* CallSignature */:
+            case 162 /* ConstructSignature */:
+            case 163 /* IndexSignature */:
+            case 164 /* TypePredicate */:
+            case 165 /* TypeReference */:
+            case 166 /* FunctionType */:
+            case 167 /* ConstructorType */:
+            case 168 /* TypeQuery */:
+            case 169 /* TypeLiteral */:
+            case 170 /* ArrayType */:
+            case 171 /* TupleType */:
+            case 172 /* OptionalType */:
+            case 173 /* RestType */:
+            case 174 /* UnionType */:
+            case 175 /* IntersectionType */:
+            case 176 /* ConditionalType */:
+            case 177 /* InferType */:
+            case 178 /* ParenthesizedType */:
+            case 242 /* InterfaceDeclaration */:
+            case 243 /* TypeAliasDeclaration */:
+            case 179 /* ThisType */:
+            case 180 /* TypeOperator */:
+            case 181 /* IndexedAccessType */:
+            case 182 /* MappedType */:
+            case 183 /* LiteralType */:
+            case 248 /* NamespaceExportDeclaration */:
                 // Types and signatures are TypeScript syntax, and exclude all other facts.
                 transformFlags = 1 /* AssertTypeScript */;
                 excludeFlags = -2 /* TypeExcludes */;
                 break;
-            case 149 /* ComputedPropertyName */:
+            case 150 /* ComputedPropertyName */:
                 // Even though computed property names are ES6, we don't treat them as such.
                 // This is so that they can flow through PropertyName transforms unaffected.
                 // Instead, we mark the container as ES6, so that it can properly handle the transform.
                 transformFlags |= 16384 /* ContainsComputedPropertyName */;
                 break;
-            case 208 /* SpreadElement */:
+            case 209 /* SpreadElement */:
                 transformFlags |= 128 /* AssertES2015 */ | 4096 /* ContainsRestOrSpread */;
                 break;
-            case 277 /* SpreadAssignment */:
+            case 278 /* SpreadAssignment */:
                 transformFlags |= 16 /* AssertES2018 */ | 8192 /* ContainsObjectRestOrSpread */;
                 break;
-            case 98 /* SuperKeyword */:
+            case 99 /* SuperKeyword */:
                 // This node is ES6 syntax.
                 transformFlags |= 128 /* AssertES2015 */;
                 excludeFlags = 536870912 /* OuterExpressionExcludes */; // must be set to persist `Super`
                 break;
-            case 100 /* ThisKeyword */:
+            case 101 /* ThisKeyword */:
                 // Mark this node and its ancestors as containing a lexical `this` keyword.
                 transformFlags |= 2048 /* ContainsLexicalThis */;
                 break;
-            case 184 /* ObjectBindingPattern */:
+            case 185 /* ObjectBindingPattern */:
                 transformFlags |= 128 /* AssertES2015 */ | 65536 /* ContainsBindingPattern */;
                 if (subtreeFlags & 4096 /* ContainsRestOrSpread */) {
                     transformFlags |= 16 /* AssertES2018 */ | 8192 /* ContainsObjectRestOrSpread */;
                 }
                 excludeFlags = 536875008 /* BindingPatternExcludes */;
                 break;
-            case 185 /* ArrayBindingPattern */:
+            case 186 /* ArrayBindingPattern */:
                 transformFlags |= 128 /* AssertES2015 */ | 65536 /* ContainsBindingPattern */;
                 excludeFlags = 536875008 /* BindingPatternExcludes */;
                 break;
-            case 186 /* BindingElement */:
+            case 187 /* BindingElement */:
                 transformFlags |= 128 /* AssertES2015 */;
                 if (node.dotDotDotToken) {
                     transformFlags |= 4096 /* ContainsRestOrSpread */;
                 }
                 break;
-            case 152 /* Decorator */:
+            case 153 /* Decorator */:
                 // This node is TypeScript syntax, and marks its container as also being TypeScript syntax.
                 transformFlags |= 1 /* AssertTypeScript */ | 1024 /* ContainsTypeScriptClassSyntax */;
                 break;
-            case 188 /* ObjectLiteralExpression */:
+            case 189 /* ObjectLiteralExpression */:
                 excludeFlags = 536896512 /* ObjectLiteralExcludes */;
                 if (subtreeFlags & 16384 /* ContainsComputedPropertyName */) {
                     // If an ObjectLiteralExpression contains a ComputedPropertyName, then it
@@ -30770,26 +31193,26 @@ var ts;
                     transformFlags |= 16 /* AssertES2018 */;
                 }
                 break;
-            case 187 /* ArrayLiteralExpression */:
+            case 188 /* ArrayLiteralExpression */:
                 excludeFlags = 536875008 /* ArrayLiteralOrCallOrNewExcludes */;
                 break;
-            case 223 /* DoStatement */:
-            case 224 /* WhileStatement */:
-            case 225 /* ForStatement */:
-            case 226 /* ForInStatement */:
+            case 224 /* DoStatement */:
+            case 225 /* WhileStatement */:
+            case 226 /* ForStatement */:
+            case 227 /* ForInStatement */:
                 // A loop containing a block scoped binding *may* need to be transformed from ES6.
                 if (subtreeFlags & 32768 /* ContainsBlockScopedBinding */) {
                     transformFlags |= 128 /* AssertES2015 */;
                 }
                 break;
-            case 284 /* SourceFile */:
+            case 285 /* SourceFile */:
                 break;
-            case 230 /* ReturnStatement */:
+            case 231 /* ReturnStatement */:
                 // Return statements may require an `await` in ES2018.
                 transformFlags |= 262144 /* ContainsHoistedDeclarationOrCompletion */ | 16 /* AssertES2018 */;
                 break;
-            case 228 /* ContinueStatement */:
-            case 229 /* BreakStatement */:
+            case 229 /* ContinueStatement */:
+            case 230 /* BreakStatement */:
                 transformFlags |= 262144 /* ContainsHoistedDeclarationOrCompletion */;
                 break;
         }
@@ -30807,67 +31230,67 @@ var ts;
      *       than calling this function.
      */
     function getTransformFlagsSubtreeExclusions(kind) {
-        if (kind >= 163 /* FirstTypeNode */ && kind <= 183 /* LastTypeNode */) {
+        if (kind >= 164 /* FirstTypeNode */ && kind <= 184 /* LastTypeNode */) {
             return -2 /* TypeExcludes */;
         }
         switch (kind) {
-            case 191 /* CallExpression */:
-            case 192 /* NewExpression */:
-            case 187 /* ArrayLiteralExpression */:
+            case 192 /* CallExpression */:
+            case 193 /* NewExpression */:
+            case 188 /* ArrayLiteralExpression */:
                 return 536875008 /* ArrayLiteralOrCallOrNewExcludes */;
-            case 244 /* ModuleDeclaration */:
+            case 245 /* ModuleDeclaration */:
                 return 537168896 /* ModuleExcludes */;
-            case 151 /* Parameter */:
+            case 152 /* Parameter */:
                 return 536870912 /* ParameterExcludes */;
-            case 197 /* ArrowFunction */:
+            case 198 /* ArrowFunction */:
                 return 537371648 /* ArrowFunctionExcludes */;
-            case 196 /* FunctionExpression */:
-            case 239 /* FunctionDeclaration */:
+            case 197 /* FunctionExpression */:
+            case 240 /* FunctionDeclaration */:
                 return 537373696 /* FunctionExcludes */;
-            case 238 /* VariableDeclarationList */:
+            case 239 /* VariableDeclarationList */:
                 return 536944640 /* VariableDeclarationListExcludes */;
-            case 240 /* ClassDeclaration */:
-            case 209 /* ClassExpression */:
+            case 241 /* ClassDeclaration */:
+            case 210 /* ClassExpression */:
                 return 536888320 /* ClassExcludes */;
-            case 157 /* Constructor */:
+            case 158 /* Constructor */:
                 return 537372672 /* ConstructorExcludes */;
-            case 156 /* MethodDeclaration */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
+            case 157 /* MethodDeclaration */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
                 return 537372672 /* MethodOrAccessorExcludes */;
-            case 120 /* AnyKeyword */:
-            case 135 /* NumberKeyword */:
-            case 146 /* BigIntKeyword */:
-            case 132 /* NeverKeyword */:
-            case 138 /* StringKeyword */:
-            case 136 /* ObjectKeyword */:
-            case 123 /* BooleanKeyword */:
-            case 139 /* SymbolKeyword */:
-            case 106 /* VoidKeyword */:
-            case 150 /* TypeParameter */:
-            case 153 /* PropertySignature */:
-            case 155 /* MethodSignature */:
-            case 160 /* CallSignature */:
-            case 161 /* ConstructSignature */:
-            case 162 /* IndexSignature */:
-            case 241 /* InterfaceDeclaration */:
-            case 242 /* TypeAliasDeclaration */:
+            case 121 /* AnyKeyword */:
+            case 136 /* NumberKeyword */:
+            case 147 /* BigIntKeyword */:
+            case 133 /* NeverKeyword */:
+            case 139 /* StringKeyword */:
+            case 137 /* ObjectKeyword */:
+            case 124 /* BooleanKeyword */:
+            case 140 /* SymbolKeyword */:
+            case 107 /* VoidKeyword */:
+            case 151 /* TypeParameter */:
+            case 154 /* PropertySignature */:
+            case 156 /* MethodSignature */:
+            case 161 /* CallSignature */:
+            case 162 /* ConstructSignature */:
+            case 163 /* IndexSignature */:
+            case 242 /* InterfaceDeclaration */:
+            case 243 /* TypeAliasDeclaration */:
                 return -2 /* TypeExcludes */;
-            case 188 /* ObjectLiteralExpression */:
+            case 189 /* ObjectLiteralExpression */:
                 return 536896512 /* ObjectLiteralExcludes */;
-            case 274 /* CatchClause */:
+            case 275 /* CatchClause */:
                 return 536879104 /* CatchClauseExcludes */;
-            case 184 /* ObjectBindingPattern */:
-            case 185 /* ArrayBindingPattern */:
+            case 185 /* ObjectBindingPattern */:
+            case 186 /* ArrayBindingPattern */:
                 return 536875008 /* BindingPatternExcludes */;
-            case 194 /* TypeAssertionExpression */:
-            case 212 /* AsExpression */:
-            case 313 /* PartiallyEmittedExpression */:
-            case 195 /* ParenthesizedExpression */:
-            case 98 /* SuperKeyword */:
+            case 195 /* TypeAssertionExpression */:
+            case 213 /* AsExpression */:
+            case 315 /* PartiallyEmittedExpression */:
+            case 196 /* ParenthesizedExpression */:
+            case 99 /* SuperKeyword */:
                 return 536870912 /* OuterExpressionExcludes */;
-            case 189 /* PropertyAccessExpression */:
-            case 190 /* ElementAccessExpression */:
+            case 190 /* PropertyAccessExpression */:
+            case 191 /* ElementAccessExpression */:
                 return 536870912 /* PropertyAccessExcludes */;
             default:
                 return 536870912 /* NodeExcludes */;
@@ -31042,7 +31465,7 @@ var ts;
                     //  (their type resolved directly to the member deeply referenced)
                     // So to get the intervening symbols, we need to check if there's a type
                     // query node on any of the symbol's declarations and get symbols there
-                    if (d.type && d.type.kind === 167 /* TypeQuery */) {
+                    if (d.type && d.type.kind === 168 /* TypeQuery */) {
                         var query = d.type;
                         var entity = getResolvedSymbol(getFirstIdentifier(query.exprName));
                         visitSymbol(entity);
@@ -31062,6 +31485,37 @@ var ts;
     var nextNodeId = 1;
     var nextMergeId = 1;
     var nextFlowId = 1;
+    var IterationUse;
+    (function (IterationUse) {
+        IterationUse[IterationUse["AllowsSyncIterablesFlag"] = 1] = "AllowsSyncIterablesFlag";
+        IterationUse[IterationUse["AllowsAsyncIterablesFlag"] = 2] = "AllowsAsyncIterablesFlag";
+        IterationUse[IterationUse["AllowsStringInputFlag"] = 4] = "AllowsStringInputFlag";
+        IterationUse[IterationUse["ForOfFlag"] = 8] = "ForOfFlag";
+        IterationUse[IterationUse["YieldStarFlag"] = 16] = "YieldStarFlag";
+        IterationUse[IterationUse["SpreadFlag"] = 32] = "SpreadFlag";
+        IterationUse[IterationUse["DestructuringFlag"] = 64] = "DestructuringFlag";
+        // Spread, Destructuring, Array element assignment
+        IterationUse[IterationUse["Element"] = 1] = "Element";
+        IterationUse[IterationUse["Spread"] = 33] = "Spread";
+        IterationUse[IterationUse["Destructuring"] = 65] = "Destructuring";
+        IterationUse[IterationUse["ForOf"] = 13] = "ForOf";
+        IterationUse[IterationUse["ForAwaitOf"] = 15] = "ForAwaitOf";
+        IterationUse[IterationUse["YieldStar"] = 17] = "YieldStar";
+        IterationUse[IterationUse["AsyncYieldStar"] = 19] = "AsyncYieldStar";
+        IterationUse[IterationUse["GeneratorReturnType"] = 1] = "GeneratorReturnType";
+        IterationUse[IterationUse["AsyncGeneratorReturnType"] = 2] = "AsyncGeneratorReturnType";
+    })(IterationUse || (IterationUse = {}));
+    var IterationTypeKind;
+    (function (IterationTypeKind) {
+        IterationTypeKind[IterationTypeKind["Yield"] = 0] = "Yield";
+        IterationTypeKind[IterationTypeKind["Return"] = 1] = "Return";
+        IterationTypeKind[IterationTypeKind["Next"] = 2] = "Next";
+    })(IterationTypeKind || (IterationTypeKind = {}));
+    var WideningKind;
+    (function (WideningKind) {
+        WideningKind[WideningKind["Normal"] = 0] = "Normal";
+        WideningKind[WideningKind["GeneratorYield"] = 1] = "GeneratorYield";
+    })(WideningKind || (WideningKind = {}));
     function getNodeId(node) {
         if (!node.id) {
             node.id = nextNodeId;
@@ -31117,6 +31571,7 @@ var ts;
         var typeCount = 0;
         var symbolCount = 0;
         var enumCount = 0;
+        var instantiationCount = 0;
         var instantiationDepth = 0;
         var constraintDepth = 0;
         var currentNode;
@@ -31141,8 +31596,6 @@ var ts;
         undefinedSymbol.declarations = [];
         var globalThisSymbol = createSymbol(1536 /* Module */, "globalThis", 8 /* Readonly */);
         globalThisSymbol.exports = globals;
-        globalThisSymbol.valueDeclaration = ts.createNode(72 /* Identifier */);
-        globalThisSymbol.valueDeclaration.escapedText = "globalThis";
         globals.set(globalThisSymbol.escapedName, globalThisSymbol);
         var argumentsSymbol = createSymbol(4 /* Property */, "arguments");
         var requireSymbol = createSymbol(4 /* Property */, "require");
@@ -31158,6 +31611,11 @@ var ts;
             getIdentifierCount: function () { return ts.sum(host.getSourceFiles(), "identifierCount"); },
             getSymbolCount: function () { return ts.sum(host.getSourceFiles(), "symbolCount") + symbolCount; },
             getTypeCount: function () { return typeCount; },
+            getRelationCacheSizes: function () { return ({
+                assignable: assignableRelation.size,
+                identity: identityRelation.size,
+                subtype: subtypeRelation.size,
+            }); },
             isUndefinedSymbol: function (symbol) { return symbol === undefinedSymbol; },
             isArgumentsSymbol: function (symbol) { return symbol === argumentsSymbol; },
             isUnknownSymbol: function (symbol) { return symbol === unknownSymbol; },
@@ -31224,6 +31682,10 @@ var ts;
                 node = ts.getParseTreeNode(node);
                 return node ? getTypeOfNode(node) : errorType;
             },
+            getTypeOfAssignmentPattern: function (nodeIn) {
+                var node = ts.getParseTreeNode(nodeIn, ts.isAssignmentPattern);
+                return node && getTypeOfAssignmentPattern(node) || errorType;
+            },
             getPropertySymbolOfDestructuringAssignment: function (locationIn) {
                 var location = ts.getParseTreeNode(locationIn, ts.isIdentifier);
                 return location ? getPropertySymbolOfDestructuringAssignment(location) : undefined;
@@ -31272,12 +31734,14 @@ var ts;
             },
             isContextSensitive: isContextSensitive,
             getFullyQualifiedName: getFullyQualifiedName,
-            getResolvedSignature: function (node, candidatesOutArray, agumentCount) {
-                return getResolvedSignatureWorker(node, candidatesOutArray, agumentCount, 0 /* Normal */);
+            getResolvedSignature: function (node, candidatesOutArray, argumentCount) {
+                return getResolvedSignatureWorker(node, candidatesOutArray, argumentCount, 0 /* Normal */);
             },
-            getResolvedSignatureForSignatureHelp: function (node, candidatesOutArray, agumentCount) {
-                return getResolvedSignatureWorker(node, candidatesOutArray, agumentCount, 16 /* IsForSignatureHelp */);
+            getResolvedSignatureForSignatureHelp: function (node, candidatesOutArray, argumentCount) {
+                return getResolvedSignatureWorker(node, candidatesOutArray, argumentCount, 16 /* IsForSignatureHelp */);
             },
+            getExpandedParameters: getExpandedParameters,
+            hasEffectiveRestParameter: hasEffectiveRestParameter,
             getConstantValue: function (nodeIn) {
                 var node = ts.getParseTreeNode(nodeIn, canHaveConstantValue);
                 return node ? getConstantValue(node) : undefined;
@@ -31339,6 +31803,8 @@ var ts;
             getNeverType: function () { return neverType; },
             isSymbolAccessible: isSymbolAccessible,
             getObjectFlags: ts.getObjectFlags,
+            isArrayType: isArrayType,
+            isTupleType: isTupleType,
             isArrayLikeType: isArrayLikeType,
             isTypeInvalidDueToUnionDiscriminant: isTypeInvalidDueToUnionDiscriminant,
             getAllPossiblePropertiesOfTypes: getAllPossiblePropertiesOfTypes,
@@ -31415,7 +31881,7 @@ var ts;
         var intersectionTypes = ts.createMap();
         var literalTypes = ts.createMap();
         var indexedAccessTypes = ts.createMap();
-        var conditionalTypes = ts.createMap();
+        var substitutionTypes = ts.createMap();
         var evolvingArrayTypes = [];
         var undefinedProperties = ts.createMap();
         var unknownSymbol = createSymbol(4 /* Property */, "unknown");
@@ -31425,10 +31891,10 @@ var ts;
         var wildcardType = createIntrinsicType(1 /* Any */, "any");
         var errorType = createIntrinsicType(1 /* Any */, "error");
         var unknownType = createIntrinsicType(2 /* Unknown */, "unknown");
-        var undefinedType = createNullableType(32768 /* Undefined */, "undefined", 0);
-        var undefinedWideningType = strictNullChecks ? undefinedType : createNullableType(32768 /* Undefined */, "undefined", 131072 /* ContainsWideningType */);
-        var nullType = createNullableType(65536 /* Null */, "null", 0);
-        var nullWideningType = strictNullChecks ? nullType : createNullableType(65536 /* Null */, "null", 131072 /* ContainsWideningType */);
+        var undefinedType = createIntrinsicType(32768 /* Undefined */, "undefined");
+        var undefinedWideningType = strictNullChecks ? undefinedType : createIntrinsicType(32768 /* Undefined */, "undefined", 262144 /* ContainsWideningType */);
+        var nullType = createIntrinsicType(65536 /* Null */, "null");
+        var nullWideningType = strictNullChecks ? nullType : createIntrinsicType(65536 /* Null */, "null", 262144 /* ContainsWideningType */);
         var stringType = createIntrinsicType(4 /* String */, "string");
         var numberType = createIntrinsicType(8 /* Number */, "number");
         var bigintType = createIntrinsicType(64 /* BigInt */, "bigint");
@@ -31454,6 +31920,7 @@ var ts;
         var voidType = createIntrinsicType(16384 /* Void */, "void");
         var neverType = createIntrinsicType(131072 /* Never */, "never");
         var silentNeverType = createIntrinsicType(131072 /* Never */, "never");
+        var nonInferrableType = createIntrinsicType(131072 /* Never */, "never", 1048576 /* NonInferrableType */);
         var implicitNeverType = createIntrinsicType(131072 /* Never */, "never");
         var nonPrimitiveType = createIntrinsicType(67108864 /* NonPrimitive */, "object");
         var stringNumberSymbolType = getUnionType([stringType, numberType, esSymbolType]);
@@ -31470,7 +31937,7 @@ var ts;
         var anyFunctionType = createAnonymousType(undefined, emptySymbols, ts.emptyArray, ts.emptyArray, undefined, undefined);
         // The anyFunctionType contains the anyFunctionType by definition. The flag is further propagated
         // in getPropagatingFlagsOfTypes, and it is checked in inferFromTypes.
-        anyFunctionType.objectFlags |= 524288 /* ContainsAnyFunctionType */;
+        anyFunctionType.objectFlags |= 1048576 /* NonInferrableType */;
         var noConstraintType = createAnonymousType(undefined, emptySymbols, ts.emptyArray, ts.emptyArray, undefined, undefined);
         var circularConstraintType = createAnonymousType(undefined, emptySymbols, ts.emptyArray, ts.emptyArray, undefined, undefined);
         var resolvingDefaultType = createAnonymousType(undefined, emptySymbols, ts.emptyArray, ts.emptyArray, undefined, undefined);
@@ -31484,6 +31951,41 @@ var ts;
         var resolvingSignature = createSignature(undefined, undefined, undefined, ts.emptyArray, anyType, /*resolvedTypePredicate*/ undefined, 0, /*hasRestParameter*/ false, /*hasLiteralTypes*/ false);
         var silentNeverSignature = createSignature(undefined, undefined, undefined, ts.emptyArray, silentNeverType, /*resolvedTypePredicate*/ undefined, 0, /*hasRestParameter*/ false, /*hasLiteralTypes*/ false);
         var enumNumberIndexInfo = createIndexInfo(stringType, /*isReadonly*/ true);
+        var iterationTypesCache = ts.createMap(); // cache for common IterationTypes instances
+        var noIterationTypes = {
+            get yieldType() { throw new Error("Not supported"); },
+            get returnType() { throw new Error("Not supported"); },
+            get nextType() { throw new Error("Not supported"); },
+        };
+        var anyIterationTypes = createIterationTypes(anyType, anyType, anyType);
+        var anyIterationTypesExceptNext = createIterationTypes(anyType, anyType, unknownType);
+        var defaultIterationTypes = createIterationTypes(neverType, anyType, undefinedType); // default iteration types for `Iterator`.
+        var asyncIterationTypesResolver = {
+            iterableCacheKey: "iterationTypesOfAsyncIterable",
+            iteratorCacheKey: "iterationTypesOfAsyncIterator",
+            iteratorSymbolName: "asyncIterator",
+            getGlobalIteratorType: getGlobalAsyncIteratorType,
+            getGlobalIterableType: getGlobalAsyncIterableType,
+            getGlobalIterableIteratorType: getGlobalAsyncIterableIteratorType,
+            getGlobalGeneratorType: getGlobalAsyncGeneratorType,
+            resolveIterationType: getAwaitedType,
+            mustHaveANextMethodDiagnostic: ts.Diagnostics.An_async_iterator_must_have_a_next_method,
+            mustBeAMethodDiagnostic: ts.Diagnostics.The_0_property_of_an_async_iterator_must_be_a_method,
+            mustHaveAValueDiagnostic: ts.Diagnostics.The_type_returned_by_the_0_method_of_an_async_iterator_must_be_a_promise_for_a_type_with_a_value_property,
+        };
+        var syncIterationTypesResolver = {
+            iterableCacheKey: "iterationTypesOfIterable",
+            iteratorCacheKey: "iterationTypesOfIterator",
+            iteratorSymbolName: "iterator",
+            getGlobalIteratorType: getGlobalIteratorType,
+            getGlobalIterableType: getGlobalIterableType,
+            getGlobalIterableIteratorType: getGlobalIterableIteratorType,
+            getGlobalGeneratorType: getGlobalGeneratorType,
+            resolveIterationType: function (type, _errorNode) { return type; },
+            mustHaveANextMethodDiagnostic: ts.Diagnostics.An_iterator_must_have_a_next_method,
+            mustBeAMethodDiagnostic: ts.Diagnostics.The_0_property_of_an_iterator_must_be_a_method,
+            mustHaveAValueDiagnostic: ts.Diagnostics.The_type_returned_by_the_0_method_of_an_iterator_must_have_a_value_property,
+        };
         /** Key is "/path/to/a.ts|/path/to/b.ts". */
         var amalgamatedDuplicates;
         var reverseMappedCache = ts.createMap();
@@ -31494,6 +31996,7 @@ var ts;
          * This is only used if there is no exact match.
          */
         var patternAmbientModules;
+        var patternAmbientModuleAugmentations;
         var globalObjectType;
         var globalFunctionType;
         var globalCallableFunctionType;
@@ -31522,14 +32025,17 @@ var ts;
         var deferredGlobalIterableType;
         var deferredGlobalIteratorType;
         var deferredGlobalIterableIteratorType;
+        var deferredGlobalGeneratorType;
+        var deferredGlobalIteratorYieldResultType;
+        var deferredGlobalIteratorReturnResultType;
         var deferredGlobalAsyncIterableType;
         var deferredGlobalAsyncIteratorType;
         var deferredGlobalAsyncIterableIteratorType;
+        var deferredGlobalAsyncGeneratorType;
         var deferredGlobalTemplateStringsArrayType;
         var deferredGlobalImportMetaType;
         var deferredGlobalExtractSymbol;
-        var deferredGlobalExcludeSymbol;
-        var deferredGlobalPickSymbol;
+        var deferredGlobalOmitSymbol;
         var deferredGlobalBigIntType;
         var allPotentiallyUnusedIdentifiers = ts.createMap(); // key is file name
         var flowLoopStart = 0;
@@ -31548,6 +32054,8 @@ var ts;
         var symbolLinks = [];
         var nodeLinks = [];
         var flowLoopCaches = [];
+        var flowAssignmentKeys = [];
+        var flowAssignmentTypes = [];
         var flowLoopNodes = [];
         var flowLoopKeys = [];
         var flowLoopTypes = [];
@@ -31664,6 +32172,7 @@ var ts;
         var typeofType = createTypeofType();
         var _jsxNamespace;
         var _jsxFactoryEntity;
+        var outofbandVarianceMarkerHandler;
         var subtypeRelation = ts.createMap();
         var assignableRelation = ts.createMap();
         var comparableRelation = ts.createMap();
@@ -31688,6 +32197,19 @@ var ts;
             CheckMode[CheckMode["SkipGenericFunctions"] = 8] = "SkipGenericFunctions";
             CheckMode[CheckMode["IsForSignatureHelp"] = 16] = "IsForSignatureHelp";
         })(CheckMode || (CheckMode = {}));
+        var ContextFlags;
+        (function (ContextFlags) {
+            ContextFlags[ContextFlags["None"] = 0] = "None";
+            ContextFlags[ContextFlags["Signature"] = 1] = "Signature";
+        })(ContextFlags || (ContextFlags = {}));
+        var AccessFlags;
+        (function (AccessFlags) {
+            AccessFlags[AccessFlags["None"] = 0] = "None";
+            AccessFlags[AccessFlags["NoIndexSignatures"] = 1] = "NoIndexSignatures";
+            AccessFlags[AccessFlags["Writing"] = 2] = "Writing";
+            AccessFlags[AccessFlags["CacheSymbol"] = 4] = "CacheSymbol";
+            AccessFlags[AccessFlags["NoTupleBoundsCheck"] = 8] = "NoTupleBoundsCheck";
+        })(AccessFlags || (AccessFlags = {}));
         var CallbackCheck;
         (function (CallbackCheck) {
             CallbackCheck[CallbackCheck["None"] = 0] = "None";
@@ -31773,18 +32295,6 @@ var ts;
                 return diagnostic;
             }
         }
-        function addRelatedInfo(diagnostic) {
-            var relatedInformation = [];
-            for (var _i = 1; _i < arguments.length; _i++) {
-                relatedInformation[_i - 1] = arguments[_i];
-            }
-            var _a;
-            if (!diagnostic.relatedInformation) {
-                diagnostic.relatedInformation = [];
-            }
-            (_a = diagnostic.relatedInformation).push.apply(_a, relatedInformation);
-            return diagnostic;
-        }
         function error(location, message, arg0, arg1, arg2, arg3) {
             var diagnostic = location
                 ? ts.createDiagnosticForNode(location, message, arg0, arg1, arg2, arg3)
@@ -31803,6 +32313,14 @@ var ts;
         function errorOrSuggestion(isError, location, message, arg0, arg1, arg2, arg3) {
             addErrorOrSuggestion(isError, "message" in message ? ts.createDiagnosticForNode(location, message, arg0, arg1, arg2, arg3) : ts.createDiagnosticForNodeFromMessageChain(location, message));
         }
+        function errorAndMaybeSuggestAwait(location, maybeMissingAwait, message, arg0, arg1, arg2, arg3) {
+            var diagnostic = error(location, message, arg0, arg1, arg2, arg3);
+            if (maybeMissingAwait) {
+                var related = ts.createDiagnosticForNode(location, ts.Diagnostics.Did_you_forget_to_use_await);
+                ts.addRelatedInfo(diagnostic, related);
+            }
+            return diagnostic;
+        }
         function createSymbol(flags, name, checkFlags) {
             symbolCount++;
             var symbol = (new Symbol(flags | 33554432 /* Transient */, name));
@@ -31874,7 +32392,8 @@ var ts;
          * Note: if target is transient, then it is mutable, and mergeSymbol with both mutate and return it.
          * If target is not transient, mergeSymbol will produce a transient clone, mutate that and return it.
          */
-        function mergeSymbol(target, source) {
+        function mergeSymbol(target, source, unidirectional) {
+            if (unidirectional === void 0) { unidirectional = false; }
             if (!(target.flags & getExcludedSymbolFlags(source.flags)) ||
                 (source.flags | target.flags) & 67108864 /* Assignment */) {
                 ts.Debug.assert(source !== target);
@@ -31902,17 +32421,24 @@ var ts;
                 if (source.members) {
                     if (!target.members)
                         target.members = ts.createSymbolTable();
-                    mergeSymbolTable(target.members, source.members);
+                    mergeSymbolTable(target.members, source.members, unidirectional);
                 }
                 if (source.exports) {
                     if (!target.exports)
                         target.exports = ts.createSymbolTable();
-                    mergeSymbolTable(target.exports, source.exports);
+                    mergeSymbolTable(target.exports, source.exports, unidirectional);
+                }
+                if (!unidirectional) {
+                    recordMergedSymbol(target, source);
                 }
-                recordMergedSymbol(target, source);
             }
             else if (target.flags & 1024 /* NamespaceModule */) {
-                error(ts.getNameOfDeclaration(source.declarations[0]), ts.Diagnostics.Cannot_augment_module_0_with_value_exports_because_it_resolves_to_a_non_module_entity, symbolToString(target));
+                // Do not report an error when merging `var globalThis` with the built-in `globalThis`,
+                // as we will already report a "Declaration name conflicts..." error, and this error
+                // won't make much sense.
+                if (target !== globalThisSymbol) {
+                    error(ts.getNameOfDeclaration(source.declarations[0]), ts.Diagnostics.Cannot_augment_module_0_with_value_exports_because_it_resolves_to_a_non_module_entity, symbolToString(target));
+                }
             }
             else { // error
                 var isEitherEnum = !!(target.flags & 384 /* Enum */ || source.flags & 384 /* Enum */);
@@ -31964,7 +32490,7 @@ var ts;
                 err.relatedInformation = err.relatedInformation || [];
                 if (ts.length(err.relatedInformation) >= 5)
                     continue;
-                addRelatedInfo(err, !ts.length(err.relatedInformation) ? ts.createDiagnosticForNode(relatedNode, ts.Diagnostics._0_was_also_declared_here, symbolName) : ts.createDiagnosticForNode(relatedNode, ts.Diagnostics.and_here));
+                ts.addRelatedInfo(err, !ts.length(err.relatedInformation) ? ts.createDiagnosticForNode(relatedNode, ts.Diagnostics._0_was_also_declared_here, symbolName) : ts.createDiagnosticForNode(relatedNode, ts.Diagnostics.and_here));
             }
         }
         function combineSymbolTables(first, second) {
@@ -31977,10 +32503,11 @@ var ts;
             mergeSymbolTable(combined, second);
             return combined;
         }
-        function mergeSymbolTable(target, source) {
+        function mergeSymbolTable(target, source, unidirectional) {
+            if (unidirectional === void 0) { unidirectional = false; }
             source.forEach(function (sourceSymbol, id) {
                 var targetSymbol = target.get(id);
-                target.set(id, targetSymbol ? mergeSymbol(targetSymbol, sourceSymbol) : sourceSymbol);
+                target.set(id, targetSymbol ? mergeSymbol(targetSymbol, sourceSymbol, unidirectional) : sourceSymbol);
             });
         }
         function mergeModuleAugmentation(moduleName) {
@@ -32001,14 +32528,29 @@ var ts;
                 var moduleNotFoundError = !(moduleName.parent.parent.flags & 4194304 /* Ambient */)
                     ? ts.Diagnostics.Invalid_module_name_in_augmentation_module_0_cannot_be_found
                     : undefined;
-                var mainModule = resolveExternalModuleNameWorker(moduleName, moduleName, moduleNotFoundError, /*isForAugmentation*/ true);
-                if (!mainModule) {
+                var mainModule_1 = resolveExternalModuleNameWorker(moduleName, moduleName, moduleNotFoundError, /*isForAugmentation*/ true);
+                if (!mainModule_1) {
                     return;
                 }
                 // obtain item referenced by 'export='
-                mainModule = resolveExternalModuleSymbol(mainModule);
-                if (mainModule.flags & 1920 /* Namespace */) {
-                    mainModule = mergeSymbol(mainModule, moduleAugmentation.symbol);
+                mainModule_1 = resolveExternalModuleSymbol(mainModule_1);
+                if (mainModule_1.flags & 1920 /* Namespace */) {
+                    // If we’re merging an augmentation to a pattern ambient module, we want to
+                    // perform the merge unidirectionally from the augmentation ('a.foo') to
+                    // the pattern ('*.foo'), so that 'getMergedSymbol()' on a.foo gives you
+                    // all the exports both from the pattern and from the augmentation, but
+                    // 'getMergedSymbol()' on *.foo only gives you exports from *.foo.
+                    if (ts.some(patternAmbientModules, function (module) { return mainModule_1 === module.symbol; })) {
+                        var merged = mergeSymbol(moduleAugmentation.symbol, mainModule_1, /*unidirectional*/ true);
+                        if (!patternAmbientModuleAugmentations) {
+                            patternAmbientModuleAugmentations = ts.createMap();
+                        }
+                        // moduleName will be a StringLiteral since this is not `declare global`.
+                        patternAmbientModuleAugmentations.set(moduleName.text, merged);
+                    }
+                    else {
+                        mergeSymbol(mainModule_1, moduleAugmentation.symbol);
+                    }
                 }
                 else {
                     // moduleName will be a StringLiteral since this is not `declare global`.
@@ -32042,7 +32584,7 @@ var ts;
             return nodeLinks[nodeId] || (nodeLinks[nodeId] = { flags: 0 });
         }
         function isGlobalSourceFile(node) {
-            return node.kind === 284 /* SourceFile */ && !ts.isExternalOrCommonJsModule(node);
+            return node.kind === 285 /* SourceFile */ && !ts.isExternalOrCommonJsModule(node);
         }
         function getSymbol(symbols, name, meaning) {
             if (meaning) {
@@ -32100,17 +32642,17 @@ var ts;
             }
             if (declaration.pos <= usage.pos) {
                 // declaration is before usage
-                if (declaration.kind === 186 /* BindingElement */) {
+                if (declaration.kind === 187 /* BindingElement */) {
                     // still might be illegal if declaration and usage are both binding elements (eg var [a = b, b = b] = [1, 2])
-                    var errorBindingElement = ts.getAncestor(usage, 186 /* BindingElement */);
+                    var errorBindingElement = ts.getAncestor(usage, 187 /* BindingElement */);
                     if (errorBindingElement) {
                         return ts.findAncestor(errorBindingElement, ts.isBindingElement) !== ts.findAncestor(declaration, ts.isBindingElement) ||
                             declaration.pos < errorBindingElement.pos;
                     }
                     // or it might be illegal if usage happens before parent variable is declared (eg var [a] = a)
-                    return isBlockScopedNameDeclaredBeforeUse(ts.getAncestor(declaration, 237 /* VariableDeclaration */), usage);
+                    return isBlockScopedNameDeclaredBeforeUse(ts.getAncestor(declaration, 238 /* VariableDeclaration */), usage);
                 }
-                else if (declaration.kind === 237 /* VariableDeclaration */) {
+                else if (declaration.kind === 238 /* VariableDeclaration */) {
                     // still might be illegal if usage is in the initializer of the variable declaration (eg var a = a)
                     return !isImmediatelyUsedInInitializerOfBlockScopedVariable(declaration, usage);
                 }
@@ -32118,6 +32660,10 @@ var ts;
                     // still might be illegal if the usage is within a computed property name in the class (eg class A { static p = "a"; [A.p]() {} })
                     return !ts.findAncestor(usage, function (n) { return ts.isComputedPropertyName(n) && n.parent.parent === declaration; });
                 }
+                else if (ts.isPropertyDeclaration(declaration)) {
+                    // still might be illegal if a self-referencing property initializer (eg private x = this.x)
+                    return !isPropertyImmediatelyReferencedWithinDeclaration(declaration, usage);
+                }
                 return true;
             }
             // declaration is after usage, but it can still be legal if usage is deferred:
@@ -32129,12 +32675,12 @@ var ts;
             // or if usage is in a type context:
             // 1. inside a type query (typeof in type position)
             // 2. inside a jsdoc comment
-            if (usage.parent.kind === 257 /* ExportSpecifier */ || (usage.parent.kind === 254 /* ExportAssignment */ && usage.parent.isExportEquals)) {
+            if (usage.parent.kind === 258 /* ExportSpecifier */ || (usage.parent.kind === 255 /* ExportAssignment */ && usage.parent.isExportEquals)) {
                 // export specifiers do not use the variable, they only make it available for use
                 return true;
             }
             // When resolving symbols for exports, the `usage` location passed in can be the export site directly
-            if (usage.kind === 254 /* ExportAssignment */ && usage.isExportEquals) {
+            if (usage.kind === 255 /* ExportAssignment */ && usage.isExportEquals) {
                 return true;
             }
             var container = ts.getEnclosingBlockScopeContainer(declaration);
@@ -32142,9 +32688,9 @@ var ts;
             function isImmediatelyUsedInInitializerOfBlockScopedVariable(declaration, usage) {
                 var container = ts.getEnclosingBlockScopeContainer(declaration);
                 switch (declaration.parent.parent.kind) {
-                    case 219 /* VariableStatement */:
-                    case 225 /* ForStatement */:
-                    case 227 /* ForOfStatement */:
+                    case 220 /* VariableStatement */:
+                    case 226 /* ForStatement */:
+                    case 228 /* ForOfStatement */:
                         // variable statement/for/for-of statement case,
                         // use site should not be inside variable declaration (initializer of declaration or binding element)
                         if (isSameScopeDescendentOf(usage, declaration, container)) {
@@ -32165,16 +32711,16 @@ var ts;
                         return true;
                     }
                     var initializerOfProperty = current.parent &&
-                        current.parent.kind === 154 /* PropertyDeclaration */ &&
+                        current.parent.kind === 155 /* PropertyDeclaration */ &&
                         current.parent.initializer === current;
                     if (initializerOfProperty) {
                         if (ts.hasModifier(current.parent, 32 /* Static */)) {
-                            if (declaration.kind === 156 /* MethodDeclaration */) {
+                            if (declaration.kind === 157 /* MethodDeclaration */) {
                                 return true;
                             }
                         }
                         else {
-                            var isDeclarationInstanceProperty = declaration.kind === 154 /* PropertyDeclaration */ && !ts.hasModifier(declaration, 32 /* Static */);
+                            var isDeclarationInstanceProperty = declaration.kind === 155 /* PropertyDeclaration */ && !ts.hasModifier(declaration, 32 /* Static */);
                             if (!isDeclarationInstanceProperty || ts.getContainingClass(usage) !== ts.getContainingClass(declaration)) {
                                 return true;
                             }
@@ -32183,6 +32729,36 @@ var ts;
                     return false;
                 });
             }
+            function isPropertyImmediatelyReferencedWithinDeclaration(declaration, usage) {
+                // always legal if usage is after declaration
+                if (usage.end > declaration.end) {
+                    return false;
+                }
+                // still might be legal if usage is deferred (e.g. x: any = () => this.x)
+                // otherwise illegal if immediately referenced within the declaration (e.g. x: any = this.x)
+                var ancestorChangingReferenceScope = ts.findAncestor(usage, function (node) {
+                    if (node === declaration) {
+                        return "quit";
+                    }
+                    switch (node.kind) {
+                        case 198 /* ArrowFunction */:
+                        case 155 /* PropertyDeclaration */:
+                            return true;
+                        case 219 /* Block */:
+                            switch (node.parent.kind) {
+                                case 159 /* GetAccessor */:
+                                case 157 /* MethodDeclaration */:
+                                case 160 /* SetAccessor */:
+                                    return true;
+                                default:
+                                    return false;
+                            }
+                        default:
+                            return false;
+                    }
+                });
+                return ancestorChangingReferenceScope === undefined;
+            }
         }
         /**
          * Resolve a given name for a given meaning at a given location. An error is reported if the name was not found and
@@ -32201,6 +32777,8 @@ var ts;
             var lastLocation;
             var lastSelfReferenceLocation;
             var propertyWithInvalidInitializer;
+            var associatedDeclarationForContainingInitializer;
+            var withinDeferredContext = false;
             var errorLocation = location;
             var grandparent;
             var isInExternalModule = false;
@@ -32216,12 +32794,12 @@ var ts;
                             // - parameters are only in the scope of function body
                             // This restriction does not apply to JSDoc comment types because they are parented
                             // at a higher level than type parameters would normally be
-                            if (meaning & result.flags & 67897832 /* Type */ && lastLocation.kind !== 296 /* JSDocComment */) {
+                            if (meaning & result.flags & 67897832 /* Type */ && lastLocation.kind !== 297 /* JSDocComment */) {
                                 useResult = result.flags & 262144 /* TypeParameter */
                                     // type parameters are visible in parameter list, return type and type parameter list
                                     ? lastLocation === location.type ||
-                                        lastLocation.kind === 151 /* Parameter */ ||
-                                        lastLocation.kind === 150 /* TypeParameter */
+                                        lastLocation.kind === 152 /* Parameter */ ||
+                                        lastLocation.kind === 151 /* TypeParameter */
                                     // local types not visible outside the function body
                                     : false;
                             }
@@ -32238,13 +32816,13 @@ var ts;
                                     // however it is detected separately when checking initializers of parameters
                                     // to make sure that they reference no variables declared after them.
                                     useResult =
-                                        lastLocation.kind === 151 /* Parameter */ ||
+                                        lastLocation.kind === 152 /* Parameter */ ||
                                             (lastLocation === location.type &&
                                                 !!ts.findAncestor(result.valueDeclaration, ts.isParameter));
                                 }
                             }
                         }
-                        else if (location.kind === 175 /* ConditionalType */) {
+                        else if (location.kind === 176 /* ConditionalType */) {
                             // A type parameter declared using 'infer T' in a conditional type is visible only in
                             // the true branch of the conditional type.
                             useResult = lastLocation === location.trueType;
@@ -32257,15 +32835,16 @@ var ts;
                         }
                     }
                 }
+                withinDeferredContext = withinDeferredContext || getIsDeferredContext(location, lastLocation);
                 switch (location.kind) {
-                    case 284 /* SourceFile */:
+                    case 285 /* SourceFile */:
                         if (!ts.isExternalOrCommonJsModule(location))
                             break;
                         isInExternalModule = true;
                     // falls through
-                    case 244 /* ModuleDeclaration */:
+                    case 245 /* ModuleDeclaration */:
                         var moduleExports = getSymbolOfNode(location).exports;
-                        if (location.kind === 284 /* SourceFile */ || ts.isAmbientModule(location)) {
+                        if (location.kind === 285 /* SourceFile */ || ts.isAmbientModule(location)) {
                             // It's an external module. First see if the module has an export default and if the local
                             // name of that export default matches.
                             if (result = moduleExports.get("default" /* Default */)) {
@@ -32289,7 +32868,7 @@ var ts;
                             var moduleExport = moduleExports.get(name);
                             if (moduleExport &&
                                 moduleExport.flags === 2097152 /* Alias */ &&
-                                ts.getDeclarationOfKind(moduleExport, 257 /* ExportSpecifier */)) {
+                                ts.getDeclarationOfKind(moduleExport, 258 /* ExportSpecifier */)) {
                                 break;
                             }
                         }
@@ -32303,20 +32882,19 @@ var ts;
                             }
                         }
                         break;
-                    case 243 /* EnumDeclaration */:
+                    case 244 /* EnumDeclaration */:
                         if (result = lookup(getSymbolOfNode(location).exports, name, meaning & 8 /* EnumMember */)) {
                             break loop;
                         }
                         break;
-                    case 154 /* PropertyDeclaration */:
-                    case 153 /* PropertySignature */:
+                    case 155 /* PropertyDeclaration */:
                         // TypeScript 1.0 spec (April 2014): 8.4.1
                         // Initializer expressions for instance member variables are evaluated in the scope
                         // of the class constructor body but are not permitted to reference parameters or
                         // local variables of the constructor. This effectively means that entities from outer scopes
                         // by the same name as a constructor parameter or local variable are inaccessible
                         // in initializer expressions for instance member variables.
-                        if (ts.isClassLike(location.parent) && !ts.hasModifier(location, 32 /* Static */)) {
+                        if (!ts.hasModifier(location, 32 /* Static */)) {
                             var ctor = findConstructorDeclaration(location.parent);
                             if (ctor && ctor.locals) {
                                 if (lookup(ctor.locals, name, meaning & 67220415 /* Value */)) {
@@ -32326,9 +32904,9 @@ var ts;
                             }
                         }
                         break;
-                    case 240 /* ClassDeclaration */:
-                    case 209 /* ClassExpression */:
-                    case 241 /* InterfaceDeclaration */:
+                    case 241 /* ClassDeclaration */:
+                    case 210 /* ClassExpression */:
+                    case 242 /* InterfaceDeclaration */:
                         // The below is used to lookup type parameters within a class or interface, as they are added to the class/interface locals
                         // These can never be latebound, so the symbol's raw members are sufficient. `getMembersOfNode` cannot be used, as it would
                         // trigger resolving late-bound names, which we may already be in the process of doing while we're here!
@@ -32347,7 +32925,7 @@ var ts;
                             }
                             break loop;
                         }
-                        if (location.kind === 209 /* ClassExpression */ && meaning & 32 /* Class */) {
+                        if (location.kind === 210 /* ClassExpression */ && meaning & 32 /* Class */) {
                             var className = location.name;
                             if (className && name === className.escapedText) {
                                 result = location.symbol;
@@ -32355,9 +32933,9 @@ var ts;
                             }
                         }
                         break;
-                    case 211 /* ExpressionWithTypeArguments */:
+                    case 212 /* ExpressionWithTypeArguments */:
                         // The type parameters of a class are not in scope in the base class expression.
-                        if (lastLocation === location.expression && location.parent.token === 86 /* ExtendsKeyword */) {
+                        if (lastLocation === location.expression && location.parent.token === 87 /* ExtendsKeyword */) {
                             var container = location.parent.parent;
                             if (ts.isClassLike(container) && (result = lookup(getSymbolOfNode(container).members, name, meaning & 67897832 /* Type */))) {
                                 if (nameNotFoundMessage) {
@@ -32375,9 +32953,9 @@ var ts;
                     //       [foo<T>()]() { } // <-- Reference to T from class's own computed property
                     //   }
                     //
-                    case 149 /* ComputedPropertyName */:
+                    case 150 /* ComputedPropertyName */:
                         grandparent = location.parent.parent;
-                        if (ts.isClassLike(grandparent) || grandparent.kind === 241 /* InterfaceDeclaration */) {
+                        if (ts.isClassLike(grandparent) || grandparent.kind === 242 /* InterfaceDeclaration */) {
                             // A reference to this grandparent's type parameters would be an error
                             if (result = lookup(getSymbolOfNode(grandparent).members, name, meaning & 67897832 /* Type */)) {
                                 error(errorLocation, ts.Diagnostics.A_computed_property_name_cannot_reference_a_type_parameter_from_its_containing_type);
@@ -32385,24 +32963,24 @@ var ts;
                             }
                         }
                         break;
-                    case 197 /* ArrowFunction */:
+                    case 198 /* ArrowFunction */:
                         // when targeting ES6 or higher there is no 'arguments' in an arrow function
                         // for lower compile targets the resolved symbol is used to emit an error
                         if (compilerOptions.target >= 2 /* ES2015 */) {
                             break;
                         }
                     // falls through
-                    case 156 /* MethodDeclaration */:
-                    case 157 /* Constructor */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
-                    case 239 /* FunctionDeclaration */:
+                    case 157 /* MethodDeclaration */:
+                    case 158 /* Constructor */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
+                    case 240 /* FunctionDeclaration */:
                         if (meaning & 3 /* Variable */ && name === "arguments") {
                             result = argumentsSymbol;
                             break loop;
                         }
                         break;
-                    case 196 /* FunctionExpression */:
+                    case 197 /* FunctionExpression */:
                         if (meaning & 3 /* Variable */ && name === "arguments") {
                             result = argumentsSymbol;
                             break loop;
@@ -32415,7 +32993,7 @@ var ts;
                             }
                         }
                         break;
-                    case 152 /* Decorator */:
+                    case 153 /* Decorator */:
                         // Decorators are resolved at the class declaration. Resolving at the parameter
                         // or member would result in looking up locals in the method.
                         //
@@ -32424,7 +33002,7 @@ var ts;
                         //       method(@y x, y) {} // <-- decorator y should be resolved at the class declaration, not the parameter.
                         //   }
                         //
-                        if (location.parent && location.parent.kind === 151 /* Parameter */) {
+                        if (location.parent && location.parent.kind === 152 /* Parameter */) {
                             location = location.parent;
                         }
                         //
@@ -32433,15 +33011,34 @@ var ts;
                         //       @y method(x, y) {} // <-- decorator y should be resolved at the class declaration, not the method.
                         //   }
                         //
-                        if (location.parent && ts.isClassElement(location.parent)) {
+                        // class Decorators are resolved outside of the class to avoid referencing type parameters of that class.
+                        //
+                        //   type T = number;
+                        //   declare function y(x: T): any;
+                        //   @param(1 as T) // <-- T should resolve to the type alias outside of class C
+                        //   class C<T> {}
+                        if (location.parent && (ts.isClassElement(location.parent) || location.parent.kind === 241 /* ClassDeclaration */)) {
                             location = location.parent;
                         }
                         break;
-                    case 309 /* JSDocTypedefTag */:
-                    case 302 /* JSDocCallbackTag */:
+                    case 311 /* JSDocTypedefTag */:
+                    case 304 /* JSDocCallbackTag */:
                         // js type aliases do not resolve names from their host, so skip past it
                         location = ts.getJSDocHost(location);
                         break;
+                    case 152 /* Parameter */:
+                        if (lastLocation && lastLocation === location.initializer) {
+                            associatedDeclarationForContainingInitializer = location;
+                        }
+                        break;
+                    case 187 /* BindingElement */:
+                        if (lastLocation && lastLocation === location.initializer) {
+                            var root = ts.getRootDeclaration(location);
+                            if (root.kind === 152 /* Parameter */) {
+                                associatedDeclarationForContainingInitializer = location;
+                            }
+                        }
+                        break;
                 }
                 if (isSelfReferenceLocation(location)) {
                     lastSelfReferenceLocation = location;
@@ -32457,7 +33054,7 @@ var ts;
             }
             if (!result) {
                 if (lastLocation) {
-                    ts.Debug.assert(lastLocation.kind === 284 /* SourceFile */);
+                    ts.Debug.assert(lastLocation.kind === 285 /* SourceFile */);
                     if (lastLocation.commonJsModuleIndicator && name === "exports" && meaning & lastLocation.symbol.flags) {
                         return lastLocation.symbol;
                     }
@@ -32489,7 +33086,7 @@ var ts;
                                 var suggestionName = symbolToString(suggestion);
                                 var diagnostic = error(errorLocation, suggestedNameNotFoundMessage, diagnosticName(nameArg), suggestionName);
                                 if (suggestion.valueDeclaration) {
-                                    addRelatedInfo(diagnostic, ts.createDiagnosticForNode(suggestion.valueDeclaration, ts.Diagnostics._0_is_declared_here, suggestionName));
+                                    ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(suggestion.valueDeclaration, ts.Diagnostics._0_is_declared_here, suggestionName));
                                 }
                             }
                         }
@@ -32533,20 +33130,48 @@ var ts;
                 if (result && isInExternalModule && (meaning & 67220415 /* Value */) === 67220415 /* Value */ && !(originalLocation.flags & 2097152 /* JSDoc */)) {
                     var merged = getMergedSymbol(result);
                     if (ts.length(merged.declarations) && ts.every(merged.declarations, function (d) { return ts.isNamespaceExportDeclaration(d) || ts.isSourceFile(d) && !!d.symbol.globalExports; })) {
-                        error(errorLocation, ts.Diagnostics._0_refers_to_a_UMD_global_but_the_current_file_is_a_module_Consider_adding_an_import_instead, ts.unescapeLeadingUnderscores(name)); // TODO: GH#18217
+                        errorOrSuggestion(!compilerOptions.allowUmdGlobalAccess, errorLocation, ts.Diagnostics._0_refers_to_a_UMD_global_but_the_current_file_is_a_module_Consider_adding_an_import_instead, ts.unescapeLeadingUnderscores(name));
+                    }
+                }
+                // If we're in a parameter initializer, we can't reference the values of the parameter whose initializer we're within or parameters to the right
+                if (result && associatedDeclarationForContainingInitializer && !withinDeferredContext && (meaning & 67220415 /* Value */) === 67220415 /* Value */) {
+                    var candidate = getMergedSymbol(getLateBoundSymbol(result));
+                    var root = ts.getRootDeclaration(associatedDeclarationForContainingInitializer);
+                    // A parameter initializer or binding pattern initializer within a parameter cannot refer to itself
+                    if (candidate === getSymbolOfNode(associatedDeclarationForContainingInitializer)) {
+                        error(errorLocation, ts.Diagnostics.Parameter_0_cannot_be_referenced_in_its_initializer, ts.declarationNameToString(associatedDeclarationForContainingInitializer.name));
+                    }
+                    // And it cannot refer to any declarations which come after it
+                    else if (candidate.valueDeclaration && candidate.valueDeclaration.pos > associatedDeclarationForContainingInitializer.pos && root.parent.locals && lookup(root.parent.locals, candidate.escapedName, meaning) === candidate) {
+                        error(errorLocation, ts.Diagnostics.Initializer_of_parameter_0_cannot_reference_identifier_1_declared_after_it, ts.declarationNameToString(associatedDeclarationForContainingInitializer.name), ts.declarationNameToString(errorLocation));
                     }
                 }
             }
             return result;
         }
+        function getIsDeferredContext(location, lastLocation) {
+            if (location.kind !== 198 /* ArrowFunction */ && location.kind !== 197 /* FunctionExpression */) {
+                // initializers in instance property declaration of class like entities are executed in constructor and thus deferred
+                return ts.isTypeQueryNode(location) || ((ts.isFunctionLikeDeclaration(location) ||
+                    (location.kind === 155 /* PropertyDeclaration */ && !ts.hasModifier(location, 32 /* Static */))) && (!lastLocation || lastLocation !== location.name)); // A name is evaluated within the enclosing scope - so it shouldn't count as deferred
+            }
+            if (lastLocation && lastLocation === location.name) {
+                return false;
+            }
+            // generator functions and async functions are not inlined in control flow when immediately invoked
+            if (location.asteriskToken || ts.hasModifier(location, 256 /* Async */)) {
+                return true;
+            }
+            return !ts.getImmediatelyInvokedFunctionExpression(location);
+        }
         function isSelfReferenceLocation(node) {
             switch (node.kind) {
-                case 239 /* FunctionDeclaration */:
-                case 240 /* ClassDeclaration */:
-                case 241 /* InterfaceDeclaration */:
-                case 243 /* EnumDeclaration */:
-                case 242 /* TypeAliasDeclaration */:
-                case 244 /* ModuleDeclaration */: // For `namespace N { N; }`
+                case 240 /* FunctionDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 242 /* InterfaceDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
+                case 245 /* ModuleDeclaration */: // For `namespace N { N; }`
                     return true;
                 default:
                     return false;
@@ -32558,7 +33183,7 @@ var ts;
         function isTypeParameterSymbolDeclaredInContainer(symbol, container) {
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var decl = _a[_i];
-                if (decl.kind === 150 /* TypeParameter */) {
+                if (decl.kind === 151 /* TypeParameter */) {
                     var parent = ts.isJSDocTemplateTag(decl.parent) ? ts.getJSDocHost(decl.parent) : decl.parent;
                     if (parent === container) {
                         return !(ts.isJSDocTemplateTag(decl.parent) && ts.find(decl.parent.parent.tags, ts.isJSDocTypeAlias)); // TODO: GH#18217
@@ -32613,10 +33238,10 @@ var ts;
          */
         function getEntityNameForExtendingInterface(node) {
             switch (node.kind) {
-                case 72 /* Identifier */:
-                case 189 /* PropertyAccessExpression */:
+                case 73 /* Identifier */:
+                case 190 /* PropertyAccessExpression */:
                     return node.parent ? getEntityNameForExtendingInterface(node.parent) : undefined;
-                case 211 /* ExpressionWithTypeArguments */:
+                case 212 /* ExpressionWithTypeArguments */:
                     if (ts.isEntityNameExpression(node.expression)) {
                         return node.expression;
                     }
@@ -32705,7 +33330,7 @@ var ts;
         function checkResolvedBlockScopedVariable(result, errorLocation) {
             ts.Debug.assert(!!(result.flags & 2 /* BlockScopedVariable */ || result.flags & 32 /* Class */ || result.flags & 384 /* Enum */));
             // Block-scoped variables cannot be used before their definition
-            var declaration = ts.find(result.declarations, function (d) { return ts.isBlockOrCatchScoped(d) || ts.isClassLike(d) || (d.kind === 243 /* EnumDeclaration */) || ts.isInJSFile(d) && !!ts.getJSDocEnumTag(d); });
+            var declaration = ts.find(result.declarations, function (d) { return ts.isBlockOrCatchScoped(d) || ts.isClassLike(d) || (d.kind === 244 /* EnumDeclaration */) || ts.isInJSFile(d) && !!ts.getJSDocEnumTag(d); });
             if (declaration === undefined)
                 return ts.Debug.fail("Declaration to checkResolvedBlockScopedVariable is undefined");
             if (!(declaration.flags & 4194304 /* Ambient */) && !isBlockScopedNameDeclaredBeforeUse(declaration, errorLocation)) {
@@ -32727,7 +33352,7 @@ var ts;
                     }
                 }
                 if (diagnosticMessage) {
-                    addRelatedInfo(diagnosticMessage, ts.createDiagnosticForNode(declaration, ts.Diagnostics._0_is_declared_here, declarationName));
+                    ts.addRelatedInfo(diagnosticMessage, ts.createDiagnosticForNode(declaration, ts.Diagnostics._0_is_declared_here, declarationName));
                 }
             }
         }
@@ -32740,13 +33365,13 @@ var ts;
         }
         function getAnyImportSyntax(node) {
             switch (node.kind) {
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return node;
-                case 250 /* ImportClause */:
+                case 251 /* ImportClause */:
                     return node.parent;
-                case 251 /* NamespaceImport */:
+                case 252 /* NamespaceImport */:
                     return node.parent.parent;
-                case 253 /* ImportSpecifier */:
+                case 254 /* ImportSpecifier */:
                     return node.parent.parent.parent;
                 default:
                     return undefined;
@@ -32756,7 +33381,7 @@ var ts;
             return ts.find(symbol.declarations, ts.isAliasSymbolDeclaration);
         }
         function getTargetOfImportEqualsDeclaration(node, dontResolveAlias) {
-            if (node.moduleReference.kind === 259 /* ExternalModuleReference */) {
+            if (node.moduleReference.kind === 260 /* ExternalModuleReference */) {
                 return resolveExternalModuleSymbol(resolveExternalModuleName(node, ts.getExternalModuleImportEqualsDeclarationExpression(node)));
             }
             return getSymbolOfPartOfRightHandSideOfImportEquals(node.moduleReference, dontResolveAlias);
@@ -32813,7 +33438,16 @@ var ts;
                 var file = ts.find(moduleSymbol.declarations, ts.isSourceFile);
                 var hasSyntheticDefault = canHaveSyntheticDefault(file, moduleSymbol, dontResolveAlias);
                 if (!exportDefaultSymbol && !hasSyntheticDefault) {
-                    error(node.name, ts.Diagnostics.Module_0_has_no_default_export, symbolToString(moduleSymbol));
+                    if (hasExportAssignmentSymbol(moduleSymbol)) {
+                        var compilerOptionName = moduleKind >= ts.ModuleKind.ES2015 ? "allowSyntheticDefaultImports" : "esModuleInterop";
+                        var exportEqualsSymbol = moduleSymbol.exports.get("export=" /* ExportEquals */);
+                        var exportAssignment = exportEqualsSymbol.valueDeclaration;
+                        var err = error(node.name, ts.Diagnostics.Module_0_can_only_be_default_imported_using_the_1_flag, symbolToString(moduleSymbol), compilerOptionName);
+                        ts.addRelatedInfo(err, ts.createDiagnosticForNode(exportAssignment, ts.Diagnostics.This_module_is_declared_with_using_export_and_can_only_be_used_with_a_default_import_when_using_the_0_flag, compilerOptionName));
+                    }
+                    else {
+                        error(node.name, ts.Diagnostics.Module_0_has_no_default_export, symbolToString(moduleSymbol));
+                    }
                 }
                 else if (hasSyntheticDefault) {
                     // per emit behavior, a synthetic default overrides a "real" .default member if `__esModule` is not present
@@ -32911,7 +33545,7 @@ var ts;
                             var suggestionName = symbolToString(suggestion);
                             var diagnostic = error(name, ts.Diagnostics.Module_0_has_no_exported_member_1_Did_you_mean_2, moduleName, declarationName, suggestionName);
                             if (suggestion.valueDeclaration) {
-                                addRelatedInfo(diagnostic, ts.createDiagnosticForNode(suggestion.valueDeclaration, ts.Diagnostics._0_is_declared_here, suggestionName));
+                                ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(suggestion.valueDeclaration, ts.Diagnostics._0_is_declared_here, suggestionName));
                             }
                         }
                         else {
@@ -32948,20 +33582,20 @@ var ts;
         function getTargetOfAliasDeclaration(node, dontRecursivelyResolve) {
             if (dontRecursivelyResolve === void 0) { dontRecursivelyResolve = false; }
             switch (node.kind) {
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return getTargetOfImportEqualsDeclaration(node, dontRecursivelyResolve);
-                case 250 /* ImportClause */:
+                case 251 /* ImportClause */:
                     return getTargetOfImportClause(node, dontRecursivelyResolve);
-                case 251 /* NamespaceImport */:
+                case 252 /* NamespaceImport */:
                     return getTargetOfNamespaceImport(node, dontRecursivelyResolve);
-                case 253 /* ImportSpecifier */:
+                case 254 /* ImportSpecifier */:
                     return getTargetOfImportSpecifier(node, dontRecursivelyResolve);
-                case 257 /* ExportSpecifier */:
+                case 258 /* ExportSpecifier */:
                     return getTargetOfExportSpecifier(node, 67220415 /* Value */ | 67897832 /* Type */ | 1920 /* Namespace */, dontRecursivelyResolve);
-                case 254 /* ExportAssignment */:
-                case 204 /* BinaryExpression */:
+                case 255 /* ExportAssignment */:
+                case 205 /* BinaryExpression */:
                     return getTargetOfExportAssignment(node, dontRecursivelyResolve);
-                case 247 /* NamespaceExportDeclaration */:
+                case 248 /* NamespaceExportDeclaration */:
                     return getTargetOfNamespaceExportDeclaration(node, dontRecursivelyResolve);
                 default:
                     return ts.Debug.fail();
@@ -33022,11 +33656,11 @@ var ts;
                 var node = getDeclarationOfAliasSymbol(symbol);
                 if (!node)
                     return ts.Debug.fail();
-                if (node.kind === 254 /* ExportAssignment */) {
+                if (node.kind === 255 /* ExportAssignment */) {
                     // export default <symbol>
                     checkExpressionCached(node.expression);
                 }
-                else if (node.kind === 257 /* ExportSpecifier */) {
+                else if (node.kind === 258 /* ExportSpecifier */) {
                     // export { <symbol> } or export { <symbol> as foo }
                     checkExpressionCached(node.propertyName || node.name);
                 }
@@ -33044,17 +33678,17 @@ var ts;
             //     import a = |b|; // Namespace
             //     import a = |b.c|; // Value, type, namespace
             //     import a = |b.c|.d; // Namespace
-            if (entityName.kind === 72 /* Identifier */ && ts.isRightSideOfQualifiedNameOrPropertyAccess(entityName)) {
+            if (entityName.kind === 73 /* Identifier */ && ts.isRightSideOfQualifiedNameOrPropertyAccess(entityName)) {
                 entityName = entityName.parent;
             }
             // Check for case 1 and 3 in the above example
-            if (entityName.kind === 72 /* Identifier */ || entityName.parent.kind === 148 /* QualifiedName */) {
+            if (entityName.kind === 73 /* Identifier */ || entityName.parent.kind === 149 /* QualifiedName */) {
                 return resolveEntityName(entityName, 1920 /* Namespace */, /*ignoreErrors*/ false, dontResolveAlias);
             }
             else {
                 // Case 2 in above example
                 // entityName.kind could be a QualifiedName or a Missing identifier
-                ts.Debug.assert(entityName.parent.kind === 248 /* ImportEqualsDeclaration */);
+                ts.Debug.assert(entityName.parent.kind === 249 /* ImportEqualsDeclaration */);
                 return resolveEntityName(entityName, 67220415 /* Value */ | 67897832 /* Type */ | 1920 /* Namespace */, /*ignoreErrors*/ false, dontResolveAlias);
             }
         }
@@ -33070,17 +33704,17 @@ var ts;
             }
             var namespaceMeaning = 1920 /* Namespace */ | (ts.isInJSFile(name) ? meaning & 67220415 /* Value */ : 0);
             var symbol;
-            if (name.kind === 72 /* Identifier */) {
-                var message = meaning === namespaceMeaning ? ts.Diagnostics.Cannot_find_namespace_0 : getCannotFindNameDiagnosticForName(getFirstIdentifier(name).escapedText);
+            if (name.kind === 73 /* Identifier */) {
+                var message = meaning === namespaceMeaning ? ts.Diagnostics.Cannot_find_namespace_0 : getCannotFindNameDiagnosticForName(getFirstIdentifier(name));
                 var symbolFromJSPrototype = ts.isInJSFile(name) ? resolveEntityNameFromAssignmentDeclaration(name, meaning) : undefined;
                 symbol = resolveName(location || name, name.escapedText, meaning, ignoreErrors || symbolFromJSPrototype ? undefined : message, name, /*isUse*/ true);
                 if (!symbol) {
                     return symbolFromJSPrototype;
                 }
             }
-            else if (name.kind === 148 /* QualifiedName */ || name.kind === 189 /* PropertyAccessExpression */) {
-                var left = name.kind === 148 /* QualifiedName */ ? name.left : name.expression;
-                var right = name.kind === 148 /* QualifiedName */ ? name.right : name.name;
+            else if (name.kind === 149 /* QualifiedName */ || name.kind === 190 /* PropertyAccessExpression */) {
+                var left = name.kind === 149 /* QualifiedName */ ? name.left : name.expression;
+                var right = name.kind === 149 /* QualifiedName */ ? name.right : name.name;
                 var namespace = resolveEntityName(left, namespaceMeaning, ignoreErrors, /*dontResolveAlias*/ false, location);
                 if (!namespace || ts.nodeIsMissing(right)) {
                     return undefined;
@@ -33215,6 +33849,14 @@ var ts;
             if (patternAmbientModules) {
                 var pattern = ts.findBestPatternMatch(patternAmbientModules, function (_) { return _.pattern; }, moduleReference);
                 if (pattern) {
+                    // If the module reference matched a pattern ambient module ('*.foo') but there’s also a
+                    // module augmentation by the specific name requested ('a.foo'), we store the merged symbol
+                    // by the augmentation name ('a.foo'), because asking for *.foo should not give you exports
+                    // from a.foo.
+                    var augmentation = patternAmbientModuleAugmentations && patternAmbientModuleAugmentations.get(moduleReference);
+                    if (augmentation) {
+                        return getMergedSymbol(augmentation);
+                    }
                     return getMergedSymbol(pattern.symbol);
                 }
             }
@@ -33231,20 +33873,12 @@ var ts;
                 return undefined;
             }
             if (moduleNotFoundError) {
-                // For relative paths, see if this was possibly a projectReference redirect
-                if (ts.pathIsRelative(moduleReference)) {
-                    var sourceFile_1 = ts.getSourceFileOfNode(location);
-                    var redirects = sourceFile_1.redirectedReferences;
-                    if (redirects) {
-                        var normalizedTargetPath = ts.getNormalizedAbsolutePath(moduleReference, ts.getDirectoryPath(sourceFile_1.fileName));
-                        for (var _i = 0, _a = [".ts" /* Ts */, ".tsx" /* Tsx */]; _i < _a.length; _i++) {
-                            var ext = _a[_i];
-                            var probePath = normalizedTargetPath + ext;
-                            if (redirects.indexOf(probePath) >= 0) {
-                                error(errorNode, ts.Diagnostics.Output_file_0_has_not_been_built_from_source_file_1, moduleReference, probePath);
-                                return undefined;
-                            }
-                        }
+                // See if this was possibly a projectReference redirect
+                if (resolvedModule) {
+                    var redirect = host.getProjectReferenceRedirect(resolvedModule.resolvedFileName);
+                    if (redirect) {
+                        error(errorNode, ts.Diagnostics.Output_file_0_has_not_been_built_from_source_file_1, redirect, resolvedModule.resolvedFileName);
+                        return undefined;
                     }
                 }
                 if (resolutionDiagnostic) {
@@ -33313,7 +33947,7 @@ var ts;
         function resolveESModuleSymbol(moduleSymbol, referencingLocation, dontResolveAlias) {
             var symbol = resolveExternalModuleSymbol(moduleSymbol, dontResolveAlias);
             if (!dontResolveAlias && symbol) {
-                if (!(symbol.flags & (1536 /* Module */ | 3 /* Variable */)) && !ts.getDeclarationOfKind(symbol, 284 /* SourceFile */)) {
+                if (!(symbol.flags & (1536 /* Module */ | 3 /* Variable */)) && !ts.getDeclarationOfKind(symbol, 285 /* SourceFile */)) {
                     var compilerOptionName = moduleKind >= ts.ModuleKind.ES2015
                         ? "allowSyntheticDefaultImports"
                         : "esModuleInterop";
@@ -33575,7 +34209,7 @@ var ts;
             var members = node.members;
             for (var _i = 0, members_2 = members; _i < members_2.length; _i++) {
                 var member = members_2[_i];
-                if (member.kind === 157 /* Constructor */ && ts.nodeIsPresent(member.body)) {
+                if (member.kind === 158 /* Constructor */ && ts.nodeIsPresent(member.body)) {
                     return member;
                 }
             }
@@ -33586,13 +34220,10 @@ var ts;
             result.id = typeCount;
             return result;
         }
-        function createIntrinsicType(kind, intrinsicName) {
+        function createIntrinsicType(kind, intrinsicName, objectFlags) {
+            if (objectFlags === void 0) { objectFlags = 0; }
             var type = createType(kind);
             type.intrinsicName = intrinsicName;
-            return type;
-        }
-        function createNullableType(kind, intrinsicName, objectFlags) {
-            var type = createIntrinsicType(kind, intrinsicName);
             type.objectFlags = objectFlags;
             return type;
         }
@@ -33664,12 +34295,12 @@ var ts;
                     }
                 }
                 switch (location.kind) {
-                    case 284 /* SourceFile */:
+                    case 285 /* SourceFile */:
                         if (!ts.isExternalOrCommonJsModule(location)) {
                             break;
                         }
                     // falls through
-                    case 244 /* ModuleDeclaration */:
+                    case 245 /* ModuleDeclaration */:
                         if (result = callback(getSymbolOfNode(location).exports)) {
                             return result;
                         }
@@ -33733,7 +34364,7 @@ var ts;
                         && (!useOnlyExternalAliasing || ts.some(symbolFromSymbolTable.declarations, ts.isExternalModuleImportEqualsDeclaration))
                         // While exports are generally considered to be in scope, export-specifier declared symbols are _not_
                         // See similar comment in `resolveName` for details
-                        && (ignoreQualification || !ts.getDeclarationOfKind(symbolFromSymbolTable, 257 /* ExportSpecifier */))) {
+                        && (ignoreQualification || !ts.getDeclarationOfKind(symbolFromSymbolTable, 258 /* ExportSpecifier */))) {
                         var resolvedImportedSymbol = resolveAlias(symbolFromSymbolTable);
                         if (isAccessible(symbolFromSymbolTable, resolvedImportedSymbol, ignoreQualification)) {
                             return [symbolFromSymbolTable];
@@ -33769,7 +34400,7 @@ var ts;
                     return true;
                 }
                 // Qualify if the symbol from symbol table has same meaning as expected
-                symbolFromSymbolTable = (symbolFromSymbolTable.flags & 2097152 /* Alias */ && !ts.getDeclarationOfKind(symbolFromSymbolTable, 257 /* ExportSpecifier */)) ? resolveAlias(symbolFromSymbolTable) : symbolFromSymbolTable;
+                symbolFromSymbolTable = (symbolFromSymbolTable.flags & 2097152 /* Alias */ && !ts.getDeclarationOfKind(symbolFromSymbolTable, 258 /* ExportSpecifier */)) ? resolveAlias(symbolFromSymbolTable) : symbolFromSymbolTable;
                 if (symbolFromSymbolTable.flags & meaning) {
                     qualify = true;
                     return true;
@@ -33784,10 +34415,10 @@ var ts;
                 for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                     var declaration = _a[_i];
                     switch (declaration.kind) {
-                        case 154 /* PropertyDeclaration */:
-                        case 156 /* MethodDeclaration */:
-                        case 158 /* GetAccessor */:
-                        case 159 /* SetAccessor */:
+                        case 155 /* PropertyDeclaration */:
+                        case 157 /* MethodDeclaration */:
+                        case 159 /* GetAccessor */:
+                        case 160 /* SetAccessor */:
                             continue;
                         default:
                             return false;
@@ -33843,7 +34474,7 @@ var ts;
                 var containers = getContainersOfSymbol(symbol, enclosingDeclaration);
                 // If we're trying to reference some object literal in, eg `var a = { x: 1 }`, the symbol for the literal, `__object`, is distinct
                 // from the symbol of the declaration it is being assigned to. Since we can use the declaration to refer to the literal, however,
-                // we'd like to make that connection here - potentially causing us to paint the declararation's visibiility, and therefore the literal.
+                // we'd like to make that connection here - potentially causing us to paint the declaration's visibility, and therefore the literal.
                 var firstDecl = ts.first(symbol.declarations);
                 if (!ts.length(containers) && meaning & 67220415 /* Value */ && firstDecl && ts.isObjectLiteralExpression(firstDecl)) {
                     if (firstDecl.parent && ts.isVariableDeclaration(firstDecl.parent) && firstDecl === firstDecl.parent.initializer) {
@@ -33904,14 +34535,14 @@ var ts;
             return node && getSymbolOfNode(node);
         }
         function hasExternalModuleSymbol(declaration) {
-            return ts.isAmbientModule(declaration) || (declaration.kind === 284 /* SourceFile */ && ts.isExternalOrCommonJsModule(declaration));
+            return ts.isAmbientModule(declaration) || (declaration.kind === 285 /* SourceFile */ && ts.isExternalOrCommonJsModule(declaration));
         }
         function hasNonGlobalAugmentationExternalModuleSymbol(declaration) {
-            return ts.isModuleWithStringLiteralName(declaration) || (declaration.kind === 284 /* SourceFile */ && ts.isExternalOrCommonJsModule(declaration));
+            return ts.isModuleWithStringLiteralName(declaration) || (declaration.kind === 285 /* SourceFile */ && ts.isExternalOrCommonJsModule(declaration));
         }
         function hasVisibleDeclarations(symbol, shouldComputeAliasToMakeVisible) {
             var aliasesToMakeVisible;
-            if (!ts.every(symbol.declarations, getIsDeclarationVisible)) {
+            if (!ts.every(ts.filter(symbol.declarations, function (d) { return d.kind !== 73 /* Identifier */; }), getIsDeclarationVisible)) {
                 return undefined;
             }
             return { accessibility: 0 /* Accessible */, aliasesToMakeVisible: aliasesToMakeVisible };
@@ -33954,14 +34585,14 @@ var ts;
         function isEntityNameVisible(entityName, enclosingDeclaration) {
             // get symbol of the first identifier of the entityName
             var meaning;
-            if (entityName.parent.kind === 167 /* TypeQuery */ ||
+            if (entityName.parent.kind === 168 /* TypeQuery */ ||
                 ts.isExpressionWithTypeArgumentsInClassExtendsClause(entityName.parent) ||
-                entityName.parent.kind === 149 /* ComputedPropertyName */) {
+                entityName.parent.kind === 150 /* ComputedPropertyName */) {
                 // Typeof value
                 meaning = 67220415 /* Value */ | 1048576 /* ExportValue */;
             }
-            else if (entityName.kind === 148 /* QualifiedName */ || entityName.kind === 189 /* PropertyAccessExpression */ ||
-                entityName.parent.kind === 248 /* ImportEqualsDeclaration */) {
+            else if (entityName.kind === 149 /* QualifiedName */ || entityName.kind === 190 /* PropertyAccessExpression */ ||
+                entityName.parent.kind === 249 /* ImportEqualsDeclaration */) {
                 // Left identifier from type reference or TypeAlias
                 // Entity name of the import declaration
                 meaning = 1920 /* Namespace */;
@@ -34010,10 +34641,10 @@ var ts;
             function signatureToStringWorker(writer) {
                 var sigOutput;
                 if (flags & 262144 /* WriteArrowStyleSignature */) {
-                    sigOutput = kind === 1 /* Construct */ ? 166 /* ConstructorType */ : 165 /* FunctionType */;
+                    sigOutput = kind === 1 /* Construct */ ? 167 /* ConstructorType */ : 166 /* FunctionType */;
                 }
                 else {
-                    sigOutput = kind === 1 /* Construct */ ? 161 /* ConstructSignature */ : 160 /* CallSignature */;
+                    sigOutput = kind === 1 /* Construct */ ? 162 /* ConstructSignature */ : 161 /* CallSignature */;
                 }
                 var sig = nodeBuilder.signatureToSignatureDeclaration(signature, sigOutput, enclosingDeclaration, toNodeBuilderFlags(flags) | 70221824 /* IgnoreErrors */ | 512 /* WriteTypeParametersInQualifiedName */);
                 var printer = ts.createPrinter({ removeComments: true, omitTrailingSemicolon: true });
@@ -34040,6 +34671,15 @@ var ts;
             }
             return result;
         }
+        function getTypeNamesForErrorDisplay(left, right) {
+            var leftStr = typeToString(left);
+            var rightStr = typeToString(right);
+            if (leftStr === rightStr) {
+                leftStr = typeToString(left, /*enclosingDeclaration*/ undefined, 64 /* UseFullyQualifiedType */);
+                rightStr = typeToString(right, /*enclosingDeclaration*/ undefined, 64 /* UseFullyQualifiedType */);
+            }
+            return [leftStr, rightStr];
+        }
         function toNodeBuilderFlags(flags) {
             if (flags === void 0) { flags = 0 /* None */; }
             return flags & 9469291 /* NodeBuilderFlagsMask */;
@@ -34108,26 +34748,26 @@ var ts;
                 }
                 if (type.flags & 1 /* Any */) {
                     context.approximateLength += 3;
-                    return ts.createKeywordTypeNode(120 /* AnyKeyword */);
+                    return ts.createKeywordTypeNode(121 /* AnyKeyword */);
                 }
                 if (type.flags & 2 /* Unknown */) {
-                    return ts.createKeywordTypeNode(143 /* UnknownKeyword */);
+                    return ts.createKeywordTypeNode(144 /* UnknownKeyword */);
                 }
                 if (type.flags & 4 /* String */) {
                     context.approximateLength += 6;
-                    return ts.createKeywordTypeNode(138 /* StringKeyword */);
+                    return ts.createKeywordTypeNode(139 /* StringKeyword */);
                 }
                 if (type.flags & 8 /* Number */) {
                     context.approximateLength += 6;
-                    return ts.createKeywordTypeNode(135 /* NumberKeyword */);
+                    return ts.createKeywordTypeNode(136 /* NumberKeyword */);
                 }
                 if (type.flags & 64 /* BigInt */) {
                     context.approximateLength += 6;
-                    return ts.createKeywordTypeNode(146 /* BigIntKeyword */);
+                    return ts.createKeywordTypeNode(147 /* BigIntKeyword */);
                 }
                 if (type.flags & 16 /* Boolean */) {
                     context.approximateLength += 7;
-                    return ts.createKeywordTypeNode(123 /* BooleanKeyword */);
+                    return ts.createKeywordTypeNode(124 /* BooleanKeyword */);
                 }
                 if (type.flags & 1024 /* EnumLiteral */ && !(type.flags & 1048576 /* Union */)) {
                     var parentSymbol = getParentOfSymbol(type.symbol);
@@ -34145,8 +34785,9 @@ var ts;
                     return ts.createLiteralTypeNode(ts.setEmitFlags(ts.createLiteral(type.value), 16777216 /* NoAsciiEscaping */));
                 }
                 if (type.flags & 256 /* NumberLiteral */) {
-                    context.approximateLength += (("" + type.value).length);
-                    return ts.createLiteralTypeNode((ts.createLiteral(type.value)));
+                    var value = type.value;
+                    context.approximateLength += ("" + value).length;
+                    return ts.createLiteralTypeNode(value < 0 ? ts.createPrefix(39 /* MinusToken */, ts.createLiteral(-value)) : ts.createLiteral(value));
                 }
                 if (type.flags & 2048 /* BigIntLiteral */) {
                     context.approximateLength += (ts.pseudoBigIntToString(type.value).length) + 1;
@@ -34167,33 +34808,33 @@ var ts;
                         }
                     }
                     context.approximateLength += 13;
-                    return ts.createTypeOperatorNode(142 /* UniqueKeyword */, ts.createKeywordTypeNode(139 /* SymbolKeyword */));
+                    return ts.createTypeOperatorNode(143 /* UniqueKeyword */, ts.createKeywordTypeNode(140 /* SymbolKeyword */));
                 }
                 if (type.flags & 16384 /* Void */) {
                     context.approximateLength += 4;
-                    return ts.createKeywordTypeNode(106 /* VoidKeyword */);
+                    return ts.createKeywordTypeNode(107 /* VoidKeyword */);
                 }
                 if (type.flags & 32768 /* Undefined */) {
                     context.approximateLength += 9;
-                    return ts.createKeywordTypeNode(141 /* UndefinedKeyword */);
+                    return ts.createKeywordTypeNode(142 /* UndefinedKeyword */);
                 }
                 if (type.flags & 65536 /* Null */) {
                     context.approximateLength += 4;
-                    return ts.createKeywordTypeNode(96 /* NullKeyword */);
+                    return ts.createKeywordTypeNode(97 /* NullKeyword */);
                 }
                 if (type.flags & 131072 /* Never */) {
                     context.approximateLength += 5;
-                    return ts.createKeywordTypeNode(132 /* NeverKeyword */);
+                    return ts.createKeywordTypeNode(133 /* NeverKeyword */);
                 }
                 if (type.flags & 4096 /* ESSymbol */) {
                     context.approximateLength += 6;
-                    return ts.createKeywordTypeNode(139 /* SymbolKeyword */);
+                    return ts.createKeywordTypeNode(140 /* SymbolKeyword */);
                 }
                 if (type.flags & 67108864 /* NonPrimitive */) {
                     context.approximateLength += 6;
-                    return ts.createKeywordTypeNode(136 /* ObjectKeyword */);
+                    return ts.createKeywordTypeNode(137 /* ObjectKeyword */);
                 }
-                if (type.flags & 262144 /* TypeParameter */ && type.isThisType) {
+                if (isThisTypeParameter(type)) {
                     if (context.flags & 4194304 /* InObjectTypeLiteral */) {
                         if (!context.encounteredError && !(context.flags & 32768 /* AllowThisInObjectLiteral */)) {
                             context.encounteredError = true;
@@ -34216,14 +34857,10 @@ var ts;
                         return ts.createInferTypeNode(typeParameterToDeclarationWithConstraint(type, context, /*constraintNode*/ undefined));
                     }
                     if (context.flags & 4 /* GenerateNamesForShadowedTypeParams */ &&
-                        type.flags & 262144 /* TypeParameter */ &&
-                        ts.length(type.symbol.declarations) &&
-                        ts.isTypeParameterDeclaration(type.symbol.declarations[0]) &&
-                        typeParameterShadowsNameInScope(type, context) &&
                         !isTypeSymbolAccessible(type.symbol, context.enclosingDeclaration)) {
-                        var name = type.symbol.declarations[0].name;
+                        var name = typeParameterToName(type, context);
                         context.approximateLength += ts.idText(name).length;
-                        return ts.createTypeReferenceNode(ts.getGeneratedNameForNode(name, 16 /* Optimistic */ | 8 /* ReservedInNestedScopes */), /*typeArguments*/ undefined);
+                        return ts.createTypeReferenceNode(ts.createIdentifier(ts.idText(name)), /*typeArguments*/ undefined);
                     }
                     // Ignore constraint/default when creating a usage (as opposed to declaration) of a type parameter.
                     return type.symbol
@@ -34243,7 +34880,7 @@ var ts;
                     }
                     var typeNodes = mapToTypeNodes(types, context, /*isBareList*/ true);
                     if (typeNodes && typeNodes.length > 0) {
-                        var unionOrIntersectionTypeNode = ts.createUnionOrIntersectionTypeNode(type.flags & 1048576 /* Union */ ? 173 /* UnionType */ : 174 /* IntersectionType */, typeNodes);
+                        var unionOrIntersectionTypeNode = ts.createUnionOrIntersectionTypeNode(type.flags & 1048576 /* Union */ ? 174 /* UnionType */ : 175 /* IntersectionType */, typeNodes);
                         return unionOrIntersectionTypeNode;
                     }
                     else {
@@ -34317,7 +34954,7 @@ var ts;
                             return symbolToTypeNode(symbol, context, isInstanceType);
                         }
                         // Always use 'typeof T' for type of class, enum, and module objects
-                        else if (symbol.flags & 32 /* Class */ && !getBaseTypeVariableOfClass(symbol) && !(symbol.valueDeclaration.kind === 209 /* ClassExpression */ && context.flags & 2048 /* WriteClassExpressionAsTypeLiteral */) ||
+                        else if (symbol.flags & 32 /* Class */ && !getBaseTypeVariableOfClass(symbol) && !(symbol.valueDeclaration.kind === 210 /* ClassExpression */ && context.flags & 2048 /* WriteClassExpressionAsTypeLiteral */) ||
                             symbol.flags & (384 /* Enum */ | 512 /* ValueModule */) ||
                             shouldWriteTypeOfFunctionSymbol()) {
                             return symbolToTypeNode(symbol, context, 67220415 /* Value */);
@@ -34364,7 +35001,7 @@ var ts;
                         var isNonLocalFunctionSymbol = !!(symbol.flags & 16 /* Function */) &&
                             (symbol.parent || // is exported function symbol
                                 ts.forEach(symbol.declarations, function (declaration) {
-                                    return declaration.parent.kind === 284 /* SourceFile */ || declaration.parent.kind === 245 /* ModuleBlock */;
+                                    return declaration.parent.kind === 285 /* SourceFile */ || declaration.parent.kind === 246 /* ModuleBlock */;
                                 }));
                         if (isStaticMethodSymbol || isNonLocalFunctionSymbol) {
                             // typeof is allowed only for static/non local functions
@@ -34385,12 +35022,12 @@ var ts;
                         }
                         if (resolved.callSignatures.length === 1 && !resolved.constructSignatures.length) {
                             var signature = resolved.callSignatures[0];
-                            var signatureNode = signatureToSignatureDeclarationHelper(signature, 165 /* FunctionType */, context);
+                            var signatureNode = signatureToSignatureDeclarationHelper(signature, 166 /* FunctionType */, context);
                             return signatureNode;
                         }
                         if (resolved.constructSignatures.length === 1 && !resolved.callSignatures.length) {
                             var signature = resolved.constructSignatures[0];
-                            var signatureNode = signatureToSignatureDeclarationHelper(signature, 166 /* ConstructorType */, context);
+                            var signatureNode = signatureToSignatureDeclarationHelper(signature, 167 /* ConstructorType */, context);
                             return signatureNode;
                         }
                     }
@@ -34411,7 +35048,7 @@ var ts;
                         }
                         var elementType = typeToTypeNodeHelper(typeArguments[0], context);
                         var arrayType = ts.createArrayTypeNode(elementType);
-                        return type.target === globalArrayType ? arrayType : ts.createTypeOperatorNode(133 /* ReadonlyKeyword */, arrayType);
+                        return type.target === globalArrayType ? arrayType : ts.createTypeOperatorNode(134 /* ReadonlyKeyword */, arrayType);
                     }
                     else if (type.target.objectFlags & 8 /* Tuple */) {
                         if (typeArguments.length > 0) {
@@ -34425,12 +35062,12 @@ var ts;
                                         ts.createOptionalTypeNode(tupleConstituentNodes[i]);
                                 }
                                 var tupleTypeNode = ts.createTupleTypeNode(tupleConstituentNodes);
-                                return type.target.readonly ? ts.createTypeOperatorNode(133 /* ReadonlyKeyword */, tupleTypeNode) : tupleTypeNode;
+                                return type.target.readonly ? ts.createTypeOperatorNode(134 /* ReadonlyKeyword */, tupleTypeNode) : tupleTypeNode;
                             }
                         }
                         if (context.encounteredError || (context.flags & 524288 /* AllowEmptyTuple */)) {
                             var tupleTypeNode = ts.createTupleTypeNode([]);
-                            return type.target.readonly ? ts.createTypeOperatorNode(133 /* ReadonlyKeyword */, tupleTypeNode) : tupleTypeNode;
+                            return type.target.readonly ? ts.createTypeOperatorNode(134 /* ReadonlyKeyword */, tupleTypeNode) : tupleTypeNode;
                         }
                         context.encounteredError = true;
                         return undefined; // TODO: GH#18217
@@ -34525,11 +35162,11 @@ var ts;
                     var typeElements = [];
                     for (var _i = 0, _a = resolvedType.callSignatures; _i < _a.length; _i++) {
                         var signature = _a[_i];
-                        typeElements.push(signatureToSignatureDeclarationHelper(signature, 160 /* CallSignature */, context));
+                        typeElements.push(signatureToSignatureDeclarationHelper(signature, 161 /* CallSignature */, context));
                     }
                     for (var _b = 0, _c = resolvedType.constructSignatures; _b < _c.length; _b++) {
                         var signature = _c[_b];
-                        typeElements.push(signatureToSignatureDeclarationHelper(signature, 161 /* ConstructSignature */, context));
+                        typeElements.push(signatureToSignatureDeclarationHelper(signature, 162 /* ConstructSignature */, context));
                     }
                     if (resolvedType.stringIndexInfo) {
                         var indexSignature = void 0;
@@ -34576,15 +35213,15 @@ var ts;
                 if (!(context.flags & 1 /* NoTruncation */)) {
                     return ts.createTypeReferenceNode(ts.createIdentifier("..."), /*typeArguments*/ undefined);
                 }
-                return ts.createKeywordTypeNode(120 /* AnyKeyword */);
+                return ts.createKeywordTypeNode(121 /* AnyKeyword */);
             }
             function addPropertyToElementList(propertySymbol, context, typeElements) {
-                var propertyIsReverseMapped = !!(ts.getCheckFlags(propertySymbol) & 4096 /* ReverseMapped */);
+                var propertyIsReverseMapped = !!(ts.getCheckFlags(propertySymbol) & 8192 /* ReverseMapped */);
                 var propertyType = propertyIsReverseMapped && context.flags & 33554432 /* InReverseMappedType */ ?
                     anyType : getTypeOfSymbol(propertySymbol);
                 var saveEnclosingDeclaration = context.enclosingDeclaration;
                 context.enclosingDeclaration = undefined;
-                if (context.tracker.trackSymbol && ts.getCheckFlags(propertySymbol) & 2048 /* Late */) {
+                if (context.tracker.trackSymbol && ts.getCheckFlags(propertySymbol) & 4096 /* Late */) {
                     var decl = ts.first(propertySymbol.declarations);
                     if (hasLateBindableName(decl)) {
                         trackComputedName(decl.name, saveEnclosingDeclaration, context);
@@ -34595,10 +35232,10 @@ var ts;
                 context.enclosingDeclaration = saveEnclosingDeclaration;
                 var optionalToken = propertySymbol.flags & 16777216 /* Optional */ ? ts.createToken(56 /* QuestionToken */) : undefined;
                 if (propertySymbol.flags & (16 /* Function */ | 8192 /* Method */) && !getPropertiesOfObjectType(propertyType).length && !isReadonlySymbol(propertySymbol)) {
-                    var signatures = getSignaturesOfType(propertyType, 0 /* Call */);
+                    var signatures = getSignaturesOfType(filterType(propertyType, function (t) { return !(t.flags & 32768 /* Undefined */); }), 0 /* Call */);
                     for (var _i = 0, signatures_1 = signatures; _i < signatures_1.length; _i++) {
                         var signature = signatures_1[_i];
-                        var methodDeclaration = signatureToSignatureDeclarationHelper(signature, 155 /* MethodSignature */, context);
+                        var methodDeclaration = signatureToSignatureDeclarationHelper(signature, 156 /* MethodSignature */, context);
                         methodDeclaration.name = propertyName;
                         methodDeclaration.questionToken = optionalToken;
                         if (propertySymbol.valueDeclaration) {
@@ -34616,10 +35253,10 @@ var ts;
                         propertyTypeNode = createElidedInformationPlaceholder(context);
                     }
                     else {
-                        propertyTypeNode = propertyType ? typeToTypeNodeHelper(propertyType, context) : ts.createKeywordTypeNode(120 /* AnyKeyword */);
+                        propertyTypeNode = propertyType ? typeToTypeNodeHelper(propertyType, context) : ts.createKeywordTypeNode(121 /* AnyKeyword */);
                     }
                     context.flags = savedFlags;
-                    var modifiers = isReadonlySymbol(propertySymbol) ? [ts.createToken(133 /* ReadonlyKeyword */)] : undefined;
+                    var modifiers = isReadonlySymbol(propertySymbol) ? [ts.createToken(134 /* ReadonlyKeyword */)] : undefined;
                     if (modifiers) {
                         context.approximateLength += 9;
                     }
@@ -34670,7 +35307,7 @@ var ts;
             }
             function indexInfoToIndexSignatureDeclarationHelper(indexInfo, kind, context) {
                 var name = ts.getNameFromIndexInfo(indexInfo) || "x";
-                var indexerTypeNode = ts.createKeywordTypeNode(kind === 0 /* String */ ? 138 /* StringKeyword */ : 135 /* NumberKeyword */);
+                var indexerTypeNode = ts.createKeywordTypeNode(kind === 0 /* String */ ? 139 /* StringKeyword */ : 136 /* NumberKeyword */);
                 var indexingParameter = ts.createParameter(
                 /*decorators*/ undefined, 
                 /*modifiers*/ undefined, 
@@ -34683,7 +35320,7 @@ var ts;
                 }
                 context.approximateLength += (name.length + 4);
                 return ts.createIndexSignature(
-                /*decorators*/ undefined, indexInfo.isReadonly ? [ts.createToken(133 /* ReadonlyKeyword */)] : undefined, [indexingParameter], typeNode);
+                /*decorators*/ undefined, indexInfo.isReadonly ? [ts.createToken(134 /* ReadonlyKeyword */)] : undefined, [indexingParameter], typeNode);
             }
             function signatureToSignatureDeclarationHelper(signature, kind, context) {
                 var typeParameters;
@@ -34694,7 +35331,7 @@ var ts;
                 else {
                     typeParameters = signature.typeParameters && signature.typeParameters.map(function (parameter) { return typeParameterToDeclaration(parameter, context); });
                 }
-                var parameters = getExpandedParameters(signature).map(function (parameter) { return symbolToParameterDeclaration(parameter, context, kind === 157 /* Constructor */); });
+                var parameters = getExpandedParameters(signature).map(function (parameter) { return symbolToParameterDeclaration(parameter, context, kind === 158 /* Constructor */); });
                 if (signature.thisParameter) {
                     var thisParameter = symbolToParameterDeclaration(signature.thisParameter, context);
                     parameters.unshift(thisParameter);
@@ -34713,29 +35350,20 @@ var ts;
                     returnTypeNode = returnType && typeToTypeNodeHelper(returnType, context);
                 }
                 if (context.flags & 256 /* SuppressAnyReturnType */) {
-                    if (returnTypeNode && returnTypeNode.kind === 120 /* AnyKeyword */) {
+                    if (returnTypeNode && returnTypeNode.kind === 121 /* AnyKeyword */) {
                         returnTypeNode = undefined;
                     }
                 }
                 else if (!returnTypeNode) {
-                    returnTypeNode = ts.createKeywordTypeNode(120 /* AnyKeyword */);
+                    returnTypeNode = ts.createKeywordTypeNode(121 /* AnyKeyword */);
                 }
                 context.approximateLength += 3; // Usually a signature contributes a few more characters than this, but 3 is the minimum
                 return ts.createSignatureDeclaration(kind, typeParameters, parameters, returnTypeNode, typeArguments);
             }
-            function typeParameterShadowsNameInScope(type, context) {
-                return !!resolveName(context.enclosingDeclaration, type.symbol.escapedName, 67897832 /* Type */, /*nameNotFoundArg*/ undefined, type.symbol.escapedName, /*isUse*/ false);
-            }
             function typeParameterToDeclarationWithConstraint(type, context, constraintNode) {
                 var savedContextFlags = context.flags;
                 context.flags &= ~512 /* WriteTypeParametersInQualifiedName */; // Avoids potential infinite loop when building for a claimspace with a generic
-                var shouldUseGeneratedName = context.flags & 4 /* GenerateNamesForShadowedTypeParams */ &&
-                    type.symbol.declarations && type.symbol.declarations[0] &&
-                    ts.isTypeParameterDeclaration(type.symbol.declarations[0]) &&
-                    typeParameterShadowsNameInScope(type, context);
-                var name = shouldUseGeneratedName
-                    ? ts.getGeneratedNameForNode(type.symbol.declarations[0].name, 16 /* Optimistic */ | 8 /* ReservedInNestedScopes */)
-                    : symbolToName(type.symbol, context, 67897832 /* Type */, /*expectsIdentifier*/ true);
+                var name = typeParameterToName(type, context);
                 var defaultParameter = getDefaultFromTypeParameter(type);
                 var defaultParameterNode = defaultParameter && typeToTypeNodeHelper(defaultParameter, context);
                 context.flags = savedContextFlags;
@@ -34747,9 +35375,9 @@ var ts;
                 return typeParameterToDeclarationWithConstraint(type, context, constraintNode);
             }
             function symbolToParameterDeclaration(parameterSymbol, context, preserveModifierFlags) {
-                var parameterDeclaration = ts.getDeclarationOfKind(parameterSymbol, 151 /* Parameter */);
+                var parameterDeclaration = ts.getDeclarationOfKind(parameterSymbol, 152 /* Parameter */);
                 if (!parameterDeclaration && !isTransientSymbol(parameterSymbol)) {
-                    parameterDeclaration = ts.getDeclarationOfKind(parameterSymbol, 304 /* JSDocParameterTag */);
+                    parameterDeclaration = ts.getDeclarationOfKind(parameterSymbol, 306 /* JSDocParameterTag */);
                 }
                 var parameterType = getTypeOfSymbol(parameterSymbol);
                 if (parameterDeclaration && isRequiredInitializedParameter(parameterDeclaration)) {
@@ -34757,16 +35385,16 @@ var ts;
                 }
                 var parameterTypeNode = typeToTypeNodeHelper(parameterType, context);
                 var modifiers = !(context.flags & 8192 /* OmitParameterModifiers */) && preserveModifierFlags && parameterDeclaration && parameterDeclaration.modifiers ? parameterDeclaration.modifiers.map(ts.getSynthesizedClone) : undefined;
-                var isRest = parameterDeclaration && ts.isRestParameter(parameterDeclaration) || ts.getCheckFlags(parameterSymbol) & 16384 /* RestParameter */;
+                var isRest = parameterDeclaration && ts.isRestParameter(parameterDeclaration) || ts.getCheckFlags(parameterSymbol) & 32768 /* RestParameter */;
                 var dotDotDotToken = isRest ? ts.createToken(25 /* DotDotDotToken */) : undefined;
                 var name = parameterDeclaration
                     ? parameterDeclaration.name ?
-                        parameterDeclaration.name.kind === 72 /* Identifier */ ? ts.setEmitFlags(ts.getSynthesizedClone(parameterDeclaration.name), 16777216 /* NoAsciiEscaping */) :
-                            parameterDeclaration.name.kind === 148 /* QualifiedName */ ? ts.setEmitFlags(ts.getSynthesizedClone(parameterDeclaration.name.right), 16777216 /* NoAsciiEscaping */) :
+                        parameterDeclaration.name.kind === 73 /* Identifier */ ? ts.setEmitFlags(ts.getSynthesizedClone(parameterDeclaration.name), 16777216 /* NoAsciiEscaping */) :
+                            parameterDeclaration.name.kind === 149 /* QualifiedName */ ? ts.setEmitFlags(ts.getSynthesizedClone(parameterDeclaration.name.right), 16777216 /* NoAsciiEscaping */) :
                                 cloneBindingName(parameterDeclaration.name) :
                         ts.symbolName(parameterSymbol)
                     : ts.symbolName(parameterSymbol);
-                var isOptional = parameterDeclaration && isOptionalParameter(parameterDeclaration) || ts.getCheckFlags(parameterSymbol) & 8192 /* OptionalParameter */;
+                var isOptional = parameterDeclaration && isOptionalParameter(parameterDeclaration) || ts.getCheckFlags(parameterSymbol) & 16384 /* OptionalParameter */;
                 var questionToken = isOptional ? ts.createToken(56 /* QuestionToken */) : undefined;
                 var parameterNode = ts.createParameter(
                 /*decorators*/ undefined, modifiers, dotDotDotToken, name, questionToken, parameterTypeNode, 
@@ -34781,7 +35409,7 @@ var ts;
                         }
                         var visited = ts.visitEachChild(node, elideInitializerAndSetEmitFlags, ts.nullTransformationContext, /*nodesVisitor*/ undefined, elideInitializerAndSetEmitFlags);
                         var clone = ts.nodeIsSynthesized(visited) ? visited : ts.getSynthesizedClone(visited);
-                        if (clone.kind === 186 /* BindingElement */) {
+                        if (clone.kind === 187 /* BindingElement */) {
                             clone.initializer = undefined;
                         }
                         return ts.setEmitFlags(clone, 1 /* SingleLine */ | 16777216 /* NoAsciiEscaping */);
@@ -34883,6 +35511,11 @@ var ts;
             function lookupTypeParameterNodes(chain, index, context) {
                 ts.Debug.assert(chain && 0 <= index && index < chain.length);
                 var symbol = chain[index];
+                var symbolId = "" + getSymbolId(symbol);
+                if (context.typeParameterSymbolList && context.typeParameterSymbolList.get(symbolId)) {
+                    return undefined;
+                }
+                (context.typeParameterSymbolList || (context.typeParameterSymbolList = ts.createMap())).set(symbolId, true);
                 var typeParameterNodes;
                 if (context.flags & 512 /* WriteTypeParametersInQualifiedName */ && index < (chain.length - 1)) {
                     var parentSymbol = symbol;
@@ -34907,7 +35540,7 @@ var ts;
                 return top;
             }
             function getSpecifierForModuleSymbol(symbol, context) {
-                var file = ts.getDeclarationOfKind(symbol, 284 /* SourceFile */);
+                var file = ts.getDeclarationOfKind(symbol, 285 /* SourceFile */);
                 if (file && file.moduleName !== undefined) {
                     // Use the amd name if it is available
                     return file.moduleName;
@@ -35030,6 +35663,33 @@ var ts;
                     return identifier;
                 }
             }
+            function typeParameterShadowsNameInScope(escapedName, context) {
+                return !!resolveName(context.enclosingDeclaration, escapedName, 67897832 /* Type */, /*nameNotFoundArg*/ undefined, escapedName, /*isUse*/ false);
+            }
+            function typeParameterToName(type, context) {
+                if (context.flags & 4 /* GenerateNamesForShadowedTypeParams */ && context.typeParameterNames) {
+                    var cached = context.typeParameterNames.get("" + getTypeId(type));
+                    if (cached) {
+                        return cached;
+                    }
+                }
+                var result = symbolToName(type.symbol, context, 67897832 /* Type */, /*expectsIdentifier*/ true);
+                if (context.flags & 4 /* GenerateNamesForShadowedTypeParams */) {
+                    var rawtext = result.escapedText;
+                    var i = 0;
+                    var text = rawtext;
+                    while ((context.typeParameterNamesByText && context.typeParameterNamesByText.get(text)) || typeParameterShadowsNameInScope(text, context)) {
+                        i++;
+                        text = rawtext + "_" + i;
+                    }
+                    if (text !== rawtext) {
+                        result = ts.createIdentifier(text, result.typeArguments);
+                    }
+                    (context.typeParameterNames || (context.typeParameterNames = ts.createMap())).set("" + getTypeId(type), result);
+                    (context.typeParameterNamesByText || (context.typeParameterNamesByText = ts.createMap())).set(result.escapedText, true);
+                }
+                return result;
+            }
             function symbolToName(symbol, context, meaning, expectsIdentifier) {
                 var chain = lookupSymbolChain(symbol, context, meaning);
                 if (expectsIdentifier && chain.length !== 1
@@ -35147,8 +35807,8 @@ var ts;
         }
         function getTypeAliasForTypeLiteral(type) {
             if (type.symbol && type.symbol.flags & 2048 /* TypeLiteral */) {
-                var node = ts.findAncestor(type.symbol.declarations[0].parent, function (n) { return n.kind !== 177 /* ParenthesizedType */; });
-                if (node.kind === 242 /* TypeAliasDeclaration */) {
+                var node = ts.findAncestor(type.symbol.declarations[0].parent, function (n) { return n.kind !== 178 /* ParenthesizedType */; });
+                if (node.kind === 243 /* TypeAliasDeclaration */) {
                     return getSymbolOfNode(node);
                 }
             }
@@ -35156,11 +35816,11 @@ var ts;
         }
         function isTopLevelInExternalModuleAugmentation(node) {
             return node && node.parent &&
-                node.parent.kind === 245 /* ModuleBlock */ &&
+                node.parent.kind === 246 /* ModuleBlock */ &&
                 ts.isExternalModuleAugmentation(node.parent.parent);
         }
         function isDefaultBindingContext(location) {
-            return location.kind === 284 /* SourceFile */ || ts.isAmbientModule(location);
+            return location.kind === 285 /* SourceFile */ || ts.isAmbientModule(location);
         }
         function getNameOfSymbolFromNameType(symbol, context) {
             var nameType = symbol.nameType;
@@ -35170,6 +35830,9 @@ var ts;
                     if (!ts.isIdentifierText(name, compilerOptions.target) && !isNumericLiteralName(name)) {
                         return "\"" + ts.escapeString(name, 34 /* doubleQuote */) + "\"";
                     }
+                    if (isNumericLiteralName(name) && ts.startsWith(name, "-")) {
+                        return "[" + name + "]";
+                    }
                     return name;
                 }
                 if (nameType.flags & 8192 /* UniqueESSymbol */) {
@@ -35201,7 +35864,7 @@ var ts;
                     if (ts.isCallExpression(declaration) && ts.isBindableObjectDefinePropertyCall(declaration)) {
                         return ts.symbolName(symbol);
                     }
-                    if (ts.isComputedPropertyName(name_2) && !(ts.getCheckFlags(symbol) & 2048 /* Late */) && symbol.nameType && symbol.nameType.flags & 384 /* StringOrNumberLiteral */) {
+                    if (ts.isComputedPropertyName(name_2) && !(ts.getCheckFlags(symbol) & 4096 /* Late */) && symbol.nameType && symbol.nameType.flags & 384 /* StringOrNumberLiteral */) {
                         // Computed property name isn't late bound, but has a well-known name type - use name type to generate a symbol name
                         var result = getNameOfSymbolFromNameType(symbol, context);
                         if (result !== undefined) {
@@ -35210,17 +35873,17 @@ var ts;
                     }
                     return ts.declarationNameToString(name_2);
                 }
-                if (declaration.parent && declaration.parent.kind === 237 /* VariableDeclaration */) {
+                if (declaration.parent && declaration.parent.kind === 238 /* VariableDeclaration */) {
                     return ts.declarationNameToString(declaration.parent.name);
                 }
                 switch (declaration.kind) {
-                    case 209 /* ClassExpression */:
-                    case 196 /* FunctionExpression */:
-                    case 197 /* ArrowFunction */:
+                    case 210 /* ClassExpression */:
+                    case 197 /* FunctionExpression */:
+                    case 198 /* ArrowFunction */:
                         if (context && !context.encounteredError && !(context.flags & 131072 /* AllowAnonymousIdentifier */)) {
                             context.encounteredError = true;
                         }
-                        return declaration.kind === 209 /* ClassExpression */ ? "(Anonymous class)" : "(Anonymous function)";
+                        return declaration.kind === 210 /* ClassExpression */ ? "(Anonymous class)" : "(Anonymous function)";
                 }
             }
             var name = getNameOfSymbolFromNameType(symbol, context);
@@ -35237,27 +35900,27 @@ var ts;
             return false;
             function determineIfDeclarationIsVisible() {
                 switch (node.kind) {
-                    case 302 /* JSDocCallbackTag */:
-                    case 309 /* JSDocTypedefTag */:
+                    case 304 /* JSDocCallbackTag */:
+                    case 311 /* JSDocTypedefTag */:
                         // Top-level jsdoc type aliases are considered exported
                         // First parent is comment node, second is hosting declaration or token; we only care about those tokens or declarations whose parent is a source file
                         return !!(node.parent && node.parent.parent && node.parent.parent.parent && ts.isSourceFile(node.parent.parent.parent));
-                    case 186 /* BindingElement */:
+                    case 187 /* BindingElement */:
                         return isDeclarationVisible(node.parent.parent);
-                    case 237 /* VariableDeclaration */:
+                    case 238 /* VariableDeclaration */:
                         if (ts.isBindingPattern(node.name) &&
                             !node.name.elements.length) {
                             // If the binding pattern is empty, this variable declaration is not visible
                             return false;
                         }
                     // falls through
-                    case 244 /* ModuleDeclaration */:
-                    case 240 /* ClassDeclaration */:
-                    case 241 /* InterfaceDeclaration */:
-                    case 242 /* TypeAliasDeclaration */:
-                    case 239 /* FunctionDeclaration */:
-                    case 243 /* EnumDeclaration */:
-                    case 248 /* ImportEqualsDeclaration */:
+                    case 245 /* ModuleDeclaration */:
+                    case 241 /* ClassDeclaration */:
+                    case 242 /* InterfaceDeclaration */:
+                    case 243 /* TypeAliasDeclaration */:
+                    case 240 /* FunctionDeclaration */:
+                    case 244 /* EnumDeclaration */:
+                    case 249 /* ImportEqualsDeclaration */:
                         // external module augmentation is always visible
                         if (ts.isExternalModuleAugmentation(node)) {
                             return true;
@@ -35265,53 +35928,53 @@ var ts;
                         var parent = getDeclarationContainer(node);
                         // If the node is not exported or it is not ambient module element (except import declaration)
                         if (!(ts.getCombinedModifierFlags(node) & 1 /* Export */) &&
-                            !(node.kind !== 248 /* ImportEqualsDeclaration */ && parent.kind !== 284 /* SourceFile */ && parent.flags & 4194304 /* Ambient */)) {
+                            !(node.kind !== 249 /* ImportEqualsDeclaration */ && parent.kind !== 285 /* SourceFile */ && parent.flags & 4194304 /* Ambient */)) {
                             return isGlobalSourceFile(parent);
                         }
                         // Exported members/ambient module elements (exception import declaration) are visible if parent is visible
                         return isDeclarationVisible(parent);
-                    case 154 /* PropertyDeclaration */:
-                    case 153 /* PropertySignature */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
-                    case 156 /* MethodDeclaration */:
-                    case 155 /* MethodSignature */:
+                    case 155 /* PropertyDeclaration */:
+                    case 154 /* PropertySignature */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
+                    case 157 /* MethodDeclaration */:
+                    case 156 /* MethodSignature */:
                         if (ts.hasModifier(node, 8 /* Private */ | 16 /* Protected */)) {
                             // Private/protected properties/methods are not visible
                             return false;
                         }
                     // Public properties/methods are visible if its parents are visible, so:
                     // falls through
-                    case 157 /* Constructor */:
-                    case 161 /* ConstructSignature */:
-                    case 160 /* CallSignature */:
-                    case 162 /* IndexSignature */:
-                    case 151 /* Parameter */:
-                    case 245 /* ModuleBlock */:
-                    case 165 /* FunctionType */:
-                    case 166 /* ConstructorType */:
-                    case 168 /* TypeLiteral */:
-                    case 164 /* TypeReference */:
-                    case 169 /* ArrayType */:
-                    case 170 /* TupleType */:
-                    case 173 /* UnionType */:
-                    case 174 /* IntersectionType */:
-                    case 177 /* ParenthesizedType */:
+                    case 158 /* Constructor */:
+                    case 162 /* ConstructSignature */:
+                    case 161 /* CallSignature */:
+                    case 163 /* IndexSignature */:
+                    case 152 /* Parameter */:
+                    case 246 /* ModuleBlock */:
+                    case 166 /* FunctionType */:
+                    case 167 /* ConstructorType */:
+                    case 169 /* TypeLiteral */:
+                    case 165 /* TypeReference */:
+                    case 170 /* ArrayType */:
+                    case 171 /* TupleType */:
+                    case 174 /* UnionType */:
+                    case 175 /* IntersectionType */:
+                    case 178 /* ParenthesizedType */:
                         return isDeclarationVisible(node.parent);
                     // Default binding, import specifier and namespace import is visible
                     // only on demand so by default it is not visible
-                    case 250 /* ImportClause */:
-                    case 251 /* NamespaceImport */:
-                    case 253 /* ImportSpecifier */:
+                    case 251 /* ImportClause */:
+                    case 252 /* NamespaceImport */:
+                    case 254 /* ImportSpecifier */:
                         return false;
                     // Type parameters are always visible
-                    case 150 /* TypeParameter */:
+                    case 151 /* TypeParameter */:
                     // Source file and namespace export are always visible
-                    case 284 /* SourceFile */:
-                    case 247 /* NamespaceExportDeclaration */:
+                    case 285 /* SourceFile */:
+                    case 248 /* NamespaceExportDeclaration */:
                         return true;
                     // Export assignments do not create name bindings outside the module
-                    case 254 /* ExportAssignment */:
+                    case 255 /* ExportAssignment */:
                         return false;
                     default:
                         return false;
@@ -35320,10 +35983,10 @@ var ts;
         }
         function collectLinkedAliases(node, setVisibility) {
             var exportSymbol;
-            if (node.parent && node.parent.kind === 254 /* ExportAssignment */) {
+            if (node.parent && node.parent.kind === 255 /* ExportAssignment */) {
                 exportSymbol = resolveName(node, node.escapedText, 67220415 /* Value */ | 67897832 /* Type */ | 1920 /* Namespace */ | 2097152 /* Alias */, /*nameNotFoundMessage*/ undefined, node, /*isUse*/ false);
             }
-            else if (node.parent.kind === 257 /* ExportSpecifier */) {
+            else if (node.parent.kind === 258 /* ExportSpecifier */) {
                 exportSymbol = getTargetOfExportSpecifier(node.parent, 67220415 /* Value */ | 67897832 /* Type */ | 1920 /* Namespace */ | 2097152 /* Alias */);
             }
             var result;
@@ -35419,12 +36082,12 @@ var ts;
         function getDeclarationContainer(node) {
             return ts.findAncestor(ts.getRootDeclaration(node), function (node) {
                 switch (node.kind) {
-                    case 237 /* VariableDeclaration */:
-                    case 238 /* VariableDeclarationList */:
-                    case 253 /* ImportSpecifier */:
-                    case 252 /* NamedImports */:
-                    case 251 /* NamespaceImport */:
-                    case 250 /* ImportClause */:
+                    case 238 /* VariableDeclaration */:
+                    case 239 /* VariableDeclarationList */:
+                    case 254 /* ImportSpecifier */:
+                    case 253 /* NamedImports */:
+                    case 252 /* NamespaceImport */:
+                    case 251 /* ImportClause */:
                         return false;
                     default:
                         return true;
@@ -35457,7 +36120,7 @@ var ts;
             return symbol && getSymbolLinks(symbol).type || getTypeForVariableLikeDeclaration(node, /*includeOptionality*/ false);
         }
         function isComputedNonLiteralName(name) {
-            return name.kind === 149 /* ComputedPropertyName */ && !ts.isStringOrNumericLiteralLike(name.expression);
+            return name.kind === 150 /* ComputedPropertyName */ && !ts.isStringOrNumericLiteralLike(name.expression);
         }
         function getRestType(source, properties, symbol) {
             source = filterType(source, function (t) { return !(t.flags & 98304 /* Nullable */); });
@@ -35472,13 +36135,11 @@ var ts;
                 if (omitKeyType.flags & 131072 /* Never */) {
                     return source;
                 }
-                var pickTypeAlias = getGlobalPickSymbol();
-                var excludeTypeAlias = getGlobalExcludeSymbol();
-                if (!pickTypeAlias || !excludeTypeAlias) {
+                var omitTypeAlias = getGlobalOmitSymbol();
+                if (!omitTypeAlias) {
                     return errorType;
                 }
-                var pickKeys = getTypeAliasInstantiation(excludeTypeAlias, [getIndexType(source), omitKeyType]);
-                return getTypeAliasInstantiation(pickTypeAlias, [source, pickKeys]);
+                return getTypeAliasInstantiation(omitTypeAlias, [source, omitKeyType]);
             }
             var members = ts.createSymbolTable();
             for (var _i = 0, _a = getPropertiesOfType(source); _i < _a.length; _i++) {
@@ -35511,7 +36172,7 @@ var ts;
             if (parentAccess && parentAccess.flowNode) {
                 var propName = getDestructuringPropertyName(node);
                 if (propName) {
-                    var result = ts.createNode(190 /* ElementAccessExpression */, node.pos, node.end);
+                    var result = ts.createNode(191 /* ElementAccessExpression */, node.pos, node.end);
                     result.parent = node;
                     result.expression = parentAccess;
                     var literal = ts.createNode(10 /* StringLiteral */, node.pos, node.end);
@@ -35526,23 +36187,23 @@ var ts;
         function getParentElementAccess(node) {
             var ancestor = node.parent.parent;
             switch (ancestor.kind) {
-                case 186 /* BindingElement */:
-                case 275 /* PropertyAssignment */:
+                case 187 /* BindingElement */:
+                case 276 /* PropertyAssignment */:
                     return getSyntheticElementAccess(ancestor);
-                case 187 /* ArrayLiteralExpression */:
+                case 188 /* ArrayLiteralExpression */:
                     return getSyntheticElementAccess(node.parent);
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     return ancestor.initializer;
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return ancestor.right;
             }
         }
         function getDestructuringPropertyName(node) {
             var parent = node.parent;
-            if (node.kind === 186 /* BindingElement */ && parent.kind === 184 /* ObjectBindingPattern */) {
+            if (node.kind === 187 /* BindingElement */ && parent.kind === 185 /* ObjectBindingPattern */) {
                 return getLiteralPropertyNameText(node.propertyName || node.name);
             }
-            if (node.kind === 275 /* PropertyAssignment */ || node.kind === 276 /* ShorthandPropertyAssignment */) {
+            if (node.kind === 276 /* PropertyAssignment */ || node.kind === 277 /* ShorthandPropertyAssignment */) {
                 return getLiteralPropertyNameText(node.name);
             }
             return "" + parent.elements.indexOf(node);
@@ -35564,7 +36225,7 @@ var ts;
                 parentType = getNonNullableType(parentType);
             }
             var type;
-            if (pattern.kind === 184 /* ObjectBindingPattern */) {
+            if (pattern.kind === 185 /* ObjectBindingPattern */) {
                 if (declaration.dotDotDotToken) {
                     if (parentType.flags & 2 /* Unknown */ || !isValidSpreadType(parentType)) {
                         error(declaration, ts.Diagnostics.Rest_types_may_only_be_created_from_object_types);
@@ -35591,7 +36252,7 @@ var ts;
                 // This elementType will be used if the specific property corresponding to this index is not
                 // present (aka the tuple element property). This call also checks that the parentType is in
                 // fact an iterable or array (depending on target language).
-                var elementType = checkIteratedTypeOrElementType(parentType, pattern, /*allowStringInput*/ false, /*allowAsyncIterables*/ false);
+                var elementType = checkIteratedTypeOrElementType(65 /* Destructuring */, parentType, undefinedType, pattern);
                 var index_1 = pattern.elements.indexOf(declaration);
                 if (declaration.dotDotDotToken) {
                     // If the parent is a tuple type, the rest element has a tuple type of the
@@ -35603,21 +36264,25 @@ var ts;
                 }
                 else if (isArrayLikeType(parentType)) {
                     var indexType = getLiteralType(index_1);
-                    var declaredType = getConstraintForLocation(getIndexedAccessType(parentType, indexType, declaration.name), declaration.name);
+                    var accessFlags = hasDefaultValue(declaration) ? 8 /* NoTupleBoundsCheck */ : 0;
+                    var declaredType = getConstraintForLocation(getIndexedAccessTypeOrUndefined(parentType, indexType, declaration.name, accessFlags) || errorType, declaration.name);
                     type = getFlowTypeOfDestructuring(declaration, declaredType);
                 }
                 else {
                     type = elementType;
                 }
             }
-            // In strict null checking mode, if a default value of a non-undefined type is specified, remove
-            // undefined from the final type.
-            if (strictNullChecks && declaration.initializer && !(getFalsyFlags(checkDeclarationInitializer(declaration)) & 32768 /* Undefined */)) {
-                type = getTypeWithFacts(type, 524288 /* NEUndefined */);
+            if (!declaration.initializer) {
+                return type;
             }
-            return declaration.initializer && !ts.getEffectiveTypeAnnotationNode(ts.walkUpBindingElementsAndPatterns(declaration)) ?
-                getUnionType([type, checkDeclarationInitializer(declaration)], 2 /* Subtype */) :
-                type;
+            if (ts.getEffectiveTypeAnnotationNode(ts.walkUpBindingElementsAndPatterns(declaration))) {
+                // In strict null checking mode, if a default value of a non-undefined type is specified, remove
+                // undefined from the final type.
+                return strictNullChecks && !(getFalsyFlags(checkDeclarationInitializer(declaration)) & 32768 /* Undefined */) ?
+                    getTypeWithFacts(type, 524288 /* NEUndefined */) :
+                    type;
+            }
+            return getUnionType([getTypeWithFacts(type, 524288 /* NEUndefined */), checkDeclarationInitializer(declaration)], 2 /* Subtype */);
         }
         function getTypeForDeclarationFromJSDocComment(declaration) {
             var jsdocType = ts.getJSDocType(declaration);
@@ -35628,30 +36293,30 @@ var ts;
         }
         function isNullOrUndefined(node) {
             var expr = ts.skipParentheses(node);
-            return expr.kind === 96 /* NullKeyword */ || expr.kind === 72 /* Identifier */ && getResolvedSymbol(expr) === undefinedSymbol;
+            return expr.kind === 97 /* NullKeyword */ || expr.kind === 73 /* Identifier */ && getResolvedSymbol(expr) === undefinedSymbol;
         }
         function isEmptyArrayLiteral(node) {
             var expr = ts.skipParentheses(node);
-            return expr.kind === 187 /* ArrayLiteralExpression */ && expr.elements.length === 0;
+            return expr.kind === 188 /* ArrayLiteralExpression */ && expr.elements.length === 0;
         }
         function addOptionality(type, optional) {
             if (optional === void 0) { optional = true; }
             return strictNullChecks && optional ? getOptionalType(type) : type;
         }
         function isParameterOfContextuallyTypedFunction(node) {
-            return node.kind === 151 /* Parameter */ &&
-                (node.parent.kind === 196 /* FunctionExpression */ || node.parent.kind === 197 /* ArrowFunction */) &&
+            return node.kind === 152 /* Parameter */ &&
+                (node.parent.kind === 197 /* FunctionExpression */ || node.parent.kind === 198 /* ArrowFunction */) &&
                 !!getContextualType(node.parent);
         }
         // Return the inferred type for a variable, parameter, or property declaration
         function getTypeForVariableLikeDeclaration(declaration, includeOptionality) {
             // A variable declared in a for..in statement is of type string, or of type keyof T when the
             // right hand expression is of a type parameter type.
-            if (ts.isVariableDeclaration(declaration) && declaration.parent.parent.kind === 226 /* ForInStatement */) {
+            if (ts.isVariableDeclaration(declaration) && declaration.parent.parent.kind === 227 /* ForInStatement */) {
                 var indexType = getIndexType(getNonNullableTypeIfNeeded(checkExpression(declaration.parent.parent.expression)));
                 return indexType.flags & (262144 /* TypeParameter */ | 4194304 /* Index */) ? getExtractStringType(indexType) : stringType;
             }
-            if (ts.isVariableDeclaration(declaration) && declaration.parent.parent.kind === 227 /* ForOfStatement */) {
+            if (ts.isVariableDeclaration(declaration) && declaration.parent.parent.kind === 228 /* ForOfStatement */) {
                 // checkRightHandSideOfForOf will return undefined if the for-of expression type was
                 // missing properties/signatures required to get its iteratedType (like
                 // [Symbol.iterator] or next). This may be because we accessed properties from anyType,
@@ -35670,7 +36335,7 @@ var ts;
                 return addOptionality(declaredType, isOptional);
             }
             if ((noImplicitAny || ts.isInJSFile(declaration)) &&
-                declaration.kind === 237 /* VariableDeclaration */ && !ts.isBindingPattern(declaration.name) &&
+                declaration.kind === 238 /* VariableDeclaration */ && !ts.isBindingPattern(declaration.name) &&
                 !(ts.getCombinedModifierFlags(declaration) & 1 /* Export */) && !(declaration.flags & 4194304 /* Ambient */)) {
                 // If --noImplicitAny is on or the declaration is in a Javascript file,
                 // use control flow tracked 'any' type for non-ambient, non-exported var or let variables with no
@@ -35684,11 +36349,11 @@ var ts;
                     return autoArrayType;
                 }
             }
-            if (declaration.kind === 151 /* Parameter */) {
+            if (declaration.kind === 152 /* Parameter */) {
                 var func = declaration.parent;
                 // For a parameter of a set accessor, use the type of the get accessor if one is present
-                if (func.kind === 159 /* SetAccessor */ && !hasNonBindableDynamicName(func)) {
-                    var getter = ts.getDeclarationOfKind(getSymbolOfNode(declaration.parent), 158 /* GetAccessor */);
+                if (func.kind === 160 /* SetAccessor */ && !hasNonBindableDynamicName(func)) {
+                    var getter = ts.getDeclarationOfKind(getSymbolOfNode(declaration.parent), 159 /* GetAccessor */);
                     if (getter) {
                         var getterSignature = getSignatureFromDeclaration(getter);
                         var thisParameter = getAccessorThisParameter(func);
@@ -35707,7 +36372,7 @@ var ts;
                     }
                 }
                 // Use contextual parameter type if one is available
-                var type = declaration.symbol.escapedName === "this" /* This */ ? getContextualThisParameterType(func) : getContextuallyTypedParameterType(declaration);
+                var type = declaration.symbol.escapedName === "this" /* This */ ? getContextualThisParameterType(func) : getContextuallyTypedParameterType(declaration, /*forCache*/ true);
                 if (type) {
                     return addOptionality(type, isOptional);
                 }
@@ -35737,7 +36402,7 @@ var ts;
             // No type specified and nothing can be inferred
             return undefined;
         }
-        function getWidenedTypeFromAssignmentDeclaration(symbol, resolvedSymbol) {
+        function getWidenedTypeForAssignmentDeclaration(symbol, resolvedSymbol) {
             // function/class/{} initializers are themselves containers, so they won't merge in the same way as other initializers
             var container = ts.getAssignedExpandoInitializer(symbol.valueDeclaration);
             if (container) {
@@ -35770,7 +36435,7 @@ var ts;
                     }
                 }
                 if (!ts.isCallExpression(expression)) {
-                    jsdocType = getJSDocTypeFromAssignmentDeclaration(jsdocType, expression, symbol, declaration);
+                    jsdocType = getAnnotatedTypeForAssignmentDeclaration(jsdocType, expression, symbol, declaration);
                 }
                 if (!jsdocType) {
                     (types || (types = [])).push((ts.isBinaryExpression(expression) || ts.isCallExpression(expression)) ? getInitializerTypeFromAssignmentDeclaration(symbol, resolvedSymbol, expression, kind) : neverType);
@@ -35817,15 +36482,21 @@ var ts;
             type.objectFlags |= 16384 /* JSLiteral */;
             return type;
         }
-        function getJSDocTypeFromAssignmentDeclaration(declaredType, expression, _symbol, declaration) {
-            var typeNode = ts.getJSDocType(expression.parent);
+        function getAnnotatedTypeForAssignmentDeclaration(declaredType, expression, symbol, declaration) {
+            var typeNode = ts.getEffectiveTypeAnnotationNode(expression.parent);
             if (typeNode) {
                 var type = getWidenedType(getTypeFromTypeNode(typeNode));
                 if (!declaredType) {
                     return type;
                 }
                 else if (declaredType !== errorType && type !== errorType && !isTypeIdenticalTo(declaredType, type)) {
-                    errorNextVariableOrPropertyDeclarationMustHaveSameType(declaredType, declaration, type);
+                    errorNextVariableOrPropertyDeclarationMustHaveSameType(/*firstDeclaration*/ undefined, declaredType, declaration, type);
+                }
+            }
+            if (symbol.parent) {
+                var typeNode_2 = ts.getEffectiveTypeAnnotationNode(symbol.parent.valueDeclaration);
+                if (typeNode_2) {
+                    return getTypeOfPropertyOfType(getTypeFromTypeNode(typeNode_2), symbol.escapedName);
                 }
             }
             return declaredType;
@@ -35892,9 +36563,9 @@ var ts;
             var thisContainer = ts.getThisContainer(expression, /*includeArrowFunctions*/ false);
             // Properties defined in a constructor (or base constructor, or javascript constructor function) don't get undefined added.
             // Function expressions that are assigned to the prototype count as methods.
-            return thisContainer.kind === 157 /* Constructor */ ||
-                thisContainer.kind === 239 /* FunctionDeclaration */ ||
-                (thisContainer.kind === 196 /* FunctionExpression */ && !ts.isPrototypePropertyAssignment(thisContainer.parent));
+            return thisContainer.kind === 158 /* Constructor */ ||
+                thisContainer.kind === 240 /* FunctionDeclaration */ ||
+                (thisContainer.kind === 197 /* FunctionExpression */ && !ts.isPrototypePropertyAssignment(thisContainer.parent));
         }
         function getConstructorDefinedThisAssignmentTypes(types, declarations) {
             ts.Debug.assert(types.length === declarations.length);
@@ -35938,7 +36609,7 @@ var ts;
         function getTypeFromObjectBindingPattern(pattern, includePatternInType, reportErrors) {
             var members = ts.createSymbolTable();
             var stringIndexInfo;
-            var objectFlags = 128 /* ObjectLiteral */ | 262144 /* ContainsObjectLiteral */;
+            var objectFlags = 128 /* ObjectLiteral */ | 524288 /* ContainsObjectOrArrayLiteral */;
             ts.forEach(pattern.elements, function (e) {
                 var name = e.propertyName || e.name;
                 if (e.dotDotDotToken) {
@@ -35969,7 +36640,7 @@ var ts;
         function getTypeFromArrayBindingPattern(pattern, includePatternInType, reportErrors) {
             var elements = pattern.elements;
             var lastElement = ts.lastOrUndefined(elements);
-            var hasRestElement = !!(lastElement && lastElement.kind === 186 /* BindingElement */ && lastElement.dotDotDotToken);
+            var hasRestElement = !!(lastElement && lastElement.kind === 187 /* BindingElement */ && lastElement.dotDotDotToken);
             if (elements.length === 0 || elements.length === 1 && hasRestElement) {
                 return languageVersion >= 2 /* ES2015 */ ? createIterableType(anyType) : anyArrayType;
             }
@@ -35992,7 +36663,7 @@ var ts;
         function getTypeFromBindingPattern(pattern, includePatternInType, reportErrors) {
             if (includePatternInType === void 0) { includePatternInType = false; }
             if (reportErrors === void 0) { reportErrors = false; }
-            return pattern.kind === 184 /* ObjectBindingPattern */
+            return pattern.kind === 185 /* ObjectBindingPattern */
                 ? getTypeFromObjectBindingPattern(pattern, includePatternInType, reportErrors)
                 : getTypeFromArrayBindingPattern(pattern, includePatternInType, reportErrors);
         }
@@ -36031,7 +36702,7 @@ var ts;
         }
         function declarationBelongsToPrivateAmbientMember(declaration) {
             var root = ts.getRootDeclaration(declaration);
-            var memberDeclaration = root.kind === 151 /* Parameter */ ? root.parent : root;
+            var memberDeclaration = root.kind === 152 /* Parameter */ ? root.parent : root;
             return isPrivateWithinAmbient(memberDeclaration);
         }
         function tryGetTypeFromEffectiveTypeNode(declaration) {
@@ -36084,9 +36755,6 @@ var ts;
                 }
                 return type_1;
             }
-            if (declaration.kind === 254 /* ExportAssignment */) {
-                return widenTypeForVariableLikeDeclaration(checkExpressionCached(declaration.expression), declaration);
-            }
             // Handle variable, parameter or property
             if (!pushTypeResolution(symbol, 0 /* Type */)) {
                 // Symbol is property of some kind that is merged with something - should use `getTypeOfFuncClassEnumModule` and not `getTypeOfVariableOrParameterOrProperty`
@@ -36096,9 +36764,12 @@ var ts;
                 return reportCircularityError(symbol);
             }
             var type;
-            if (ts.isInJSFile(declaration) &&
+            if (declaration.kind === 255 /* ExportAssignment */) {
+                type = widenTypeForVariableLikeDeclaration(checkExpressionCached(declaration.expression), declaration);
+            }
+            else if (ts.isInJSFile(declaration) &&
                 (ts.isCallExpression(declaration) || ts.isBinaryExpression(declaration) || ts.isPropertyAccessExpression(declaration) && ts.isBinaryExpression(declaration.parent))) {
-                type = getWidenedTypeFromAssignmentDeclaration(symbol);
+                type = getWidenedTypeForAssignmentDeclaration(symbol);
             }
             else if (ts.isJSDocPropertyLikeTag(declaration)
                 || ts.isPropertyAccessExpression(declaration)
@@ -36113,7 +36784,7 @@ var ts;
                     return getTypeOfFuncClassEnumModule(symbol);
                 }
                 type = ts.isBinaryExpression(declaration.parent) ?
-                    getWidenedTypeFromAssignmentDeclaration(symbol) :
+                    getWidenedTypeForAssignmentDeclaration(symbol) :
                     tryGetTypeFromEffectiveTypeNode(declaration) || anyType;
             }
             else if (ts.isPropertyAssignment(declaration)) {
@@ -36144,7 +36815,7 @@ var ts;
                 type = getTypeOfEnumMember(symbol);
             }
             else {
-                return ts.Debug.fail("Unhandled declaration kind! " + ts.Debug.showSyntaxKind(declaration) + " for " + ts.Debug.showSymbol(symbol));
+                return ts.Debug.fail("Unhandled declaration kind! " + ts.Debug.formatSyntaxKind(declaration.kind) + " for " + ts.Debug.formatSymbol(symbol));
             }
             if (!popTypeResolution()) {
                 // Symbol is property of some kind that is merged with something - should use `getTypeOfFuncClassEnumModule` and not `getTypeOfVariableOrParameterOrProperty`
@@ -36157,7 +36828,7 @@ var ts;
         }
         function getAnnotatedAccessorTypeNode(accessor) {
             if (accessor) {
-                if (accessor.kind === 158 /* GetAccessor */) {
+                if (accessor.kind === 159 /* GetAccessor */) {
                     var getterTypeAnnotation = ts.getEffectiveReturnTypeNode(accessor);
                     return getterTypeAnnotation;
                 }
@@ -36184,8 +36855,8 @@ var ts;
             return links.type || (links.type = getTypeOfAccessorsWorker(symbol));
         }
         function getTypeOfAccessorsWorker(symbol) {
-            var getter = ts.getDeclarationOfKind(symbol, 158 /* GetAccessor */);
-            var setter = ts.getDeclarationOfKind(symbol, 159 /* SetAccessor */);
+            var getter = ts.getDeclarationOfKind(symbol, 159 /* GetAccessor */);
+            var setter = ts.getDeclarationOfKind(symbol, 160 /* SetAccessor */);
             if (getter && ts.isInJSFile(getter)) {
                 var jsDocType = getTypeForDeclarationFromJSDocComment(getter);
                 if (jsDocType) {
@@ -36228,7 +36899,7 @@ var ts;
             if (!popTypeResolution()) {
                 type = anyType;
                 if (noImplicitAny) {
-                    var getter_1 = ts.getDeclarationOfKind(symbol, 158 /* GetAccessor */);
+                    var getter_1 = ts.getDeclarationOfKind(symbol, 159 /* GetAccessor */);
                     error(getter_1, ts.Diagnostics._0_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions, symbolToString(symbol));
                 }
             }
@@ -36268,9 +36939,9 @@ var ts;
             if (symbol.flags & 1536 /* Module */ && ts.isShorthandAmbientModuleSymbol(symbol)) {
                 return anyType;
             }
-            else if (declaration.kind === 204 /* BinaryExpression */ ||
-                declaration.kind === 189 /* PropertyAccessExpression */ && declaration.parent.kind === 204 /* BinaryExpression */) {
-                return getWidenedTypeFromAssignmentDeclaration(symbol);
+            else if (declaration.kind === 205 /* BinaryExpression */ ||
+                declaration.kind === 190 /* PropertyAccessExpression */ && declaration.parent.kind === 205 /* BinaryExpression */) {
+                return getWidenedTypeForAssignmentDeclaration(symbol);
             }
             else if (symbol.flags & 512 /* ValueModule */ && declaration && ts.isSourceFile(declaration) && declaration.commonJsModuleIndicator) {
                 var resolvedModule = resolveExternalModuleSymbol(symbol);
@@ -36279,7 +36950,7 @@ var ts;
                         return errorType;
                     }
                     var exportEquals = getMergedSymbol(symbol.exports.get("export=" /* ExportEquals */));
-                    var type_2 = getWidenedTypeFromAssignmentDeclaration(exportEquals, exportEquals === resolvedModule ? undefined : resolvedModule);
+                    var type_2 = getWidenedTypeForAssignmentDeclaration(exportEquals, exportEquals === resolvedModule ? undefined : resolvedModule);
                     if (!popTypeResolution()) {
                         return reportCircularityError(symbol);
                     }
@@ -36336,7 +37007,7 @@ var ts;
                 return errorType;
             }
             // Check if variable has initializer that circularly references the variable itself
-            if (noImplicitAny && (declaration.kind !== 151 /* Parameter */ || declaration.initializer)) {
+            if (noImplicitAny && (declaration.kind !== 152 /* Parameter */ || declaration.initializer)) {
                 error(symbol.valueDeclaration, ts.Diagnostics._0_implicitly_has_type_any_because_it_does_not_have_a_type_annotation_and_is_referenced_directly_or_indirectly_in_its_own_initializer, symbolToString(symbol));
             }
             // Circularities could also result from parameters in function expressions that end up
@@ -36344,11 +37015,23 @@ var ts;
             // we have already reported an implicit any error so we don't report anything here.
             return anyType;
         }
+        function getTypeOfSymbolWithDeferredType(symbol) {
+            var links = getSymbolLinks(symbol);
+            if (!links.type) {
+                ts.Debug.assertDefined(links.deferralParent);
+                ts.Debug.assertDefined(links.deferralConstituents);
+                links.type = links.deferralParent.flags & 1048576 /* Union */ ? getUnionType(links.deferralConstituents) : getIntersectionType(links.deferralConstituents);
+            }
+            return links.type;
+        }
         function getTypeOfSymbol(symbol) {
+            if (ts.getCheckFlags(symbol) & 65536 /* DeferredType */) {
+                return getTypeOfSymbolWithDeferredType(symbol);
+            }
             if (ts.getCheckFlags(symbol) & 1 /* Instantiated */) {
                 return getTypeOfInstantiatedSymbol(symbol);
             }
-            if (ts.getCheckFlags(symbol) & 4096 /* ReverseMapped */) {
+            if (ts.getCheckFlags(symbol) & 8192 /* ReverseMapped */) {
                 return getTypeOfReverseMappedSymbol(symbol);
             }
             if (symbol.flags & (3 /* Variable */ | 4 /* Property */)) {
@@ -36409,35 +37092,35 @@ var ts;
                     return undefined;
                 }
                 switch (node.kind) {
-                    case 240 /* ClassDeclaration */:
-                    case 209 /* ClassExpression */:
-                    case 241 /* InterfaceDeclaration */:
-                    case 160 /* CallSignature */:
-                    case 161 /* ConstructSignature */:
-                    case 155 /* MethodSignature */:
-                    case 165 /* FunctionType */:
-                    case 166 /* ConstructorType */:
-                    case 294 /* JSDocFunctionType */:
-                    case 239 /* FunctionDeclaration */:
-                    case 156 /* MethodDeclaration */:
-                    case 196 /* FunctionExpression */:
-                    case 197 /* ArrowFunction */:
-                    case 242 /* TypeAliasDeclaration */:
-                    case 308 /* JSDocTemplateTag */:
-                    case 309 /* JSDocTypedefTag */:
-                    case 302 /* JSDocCallbackTag */:
-                    case 181 /* MappedType */:
-                    case 175 /* ConditionalType */:
+                    case 241 /* ClassDeclaration */:
+                    case 210 /* ClassExpression */:
+                    case 242 /* InterfaceDeclaration */:
+                    case 161 /* CallSignature */:
+                    case 162 /* ConstructSignature */:
+                    case 156 /* MethodSignature */:
+                    case 166 /* FunctionType */:
+                    case 167 /* ConstructorType */:
+                    case 295 /* JSDocFunctionType */:
+                    case 240 /* FunctionDeclaration */:
+                    case 157 /* MethodDeclaration */:
+                    case 197 /* FunctionExpression */:
+                    case 198 /* ArrowFunction */:
+                    case 243 /* TypeAliasDeclaration */:
+                    case 310 /* JSDocTemplateTag */:
+                    case 311 /* JSDocTypedefTag */:
+                    case 304 /* JSDocCallbackTag */:
+                    case 182 /* MappedType */:
+                    case 176 /* ConditionalType */:
                         var outerTypeParameters = getOuterTypeParameters(node, includeThisTypes);
-                        if (node.kind === 181 /* MappedType */) {
+                        if (node.kind === 182 /* MappedType */) {
                             return ts.append(outerTypeParameters, getDeclaredTypeOfTypeParameter(getSymbolOfNode(node.typeParameter)));
                         }
-                        else if (node.kind === 175 /* ConditionalType */) {
+                        else if (node.kind === 176 /* ConditionalType */) {
                             return ts.concatenate(outerTypeParameters, getInferTypeParameters(node));
                         }
                         var outerAndOwnTypeParameters = appendTypeParameters(outerTypeParameters, ts.getEffectiveTypeParameterDeclarations(node));
                         var thisType = includeThisTypes &&
-                            (node.kind === 240 /* ClassDeclaration */ || node.kind === 209 /* ClassExpression */ || node.kind === 241 /* InterfaceDeclaration */) &&
+                            (node.kind === 241 /* ClassDeclaration */ || node.kind === 210 /* ClassExpression */ || node.kind === 242 /* InterfaceDeclaration */) &&
                             getDeclaredTypeOfClassOrInterface(getSymbolOfNode(node)).thisType;
                         return thisType ? ts.append(outerAndOwnTypeParameters, thisType) : outerAndOwnTypeParameters;
                 }
@@ -36445,7 +37128,7 @@ var ts;
         }
         // The outer type parameters are those defined by enclosing generic classes, methods, or functions.
         function getOuterTypeParametersOfClassOrInterface(symbol) {
-            var declaration = symbol.flags & 32 /* Class */ ? symbol.valueDeclaration : ts.getDeclarationOfKind(symbol, 241 /* InterfaceDeclaration */);
+            var declaration = symbol.flags & 32 /* Class */ ? symbol.valueDeclaration : ts.getDeclarationOfKind(symbol, 242 /* InterfaceDeclaration */);
             return getOuterTypeParameters(declaration);
         }
         // The local type parameters are the combined set of type parameters from all declarations of the class,
@@ -36454,9 +37137,9 @@ var ts;
             var result;
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var node = _a[_i];
-                if (node.kind === 241 /* InterfaceDeclaration */ ||
-                    node.kind === 240 /* ClassDeclaration */ ||
-                    node.kind === 209 /* ClassExpression */ ||
+                if (node.kind === 242 /* InterfaceDeclaration */ ||
+                    node.kind === 241 /* ClassDeclaration */ ||
+                    node.kind === 210 /* ClassExpression */ ||
                     ts.isTypeAlias(node)) {
                     var declaration = node;
                     result = appendTypeParameters(result, ts.getEffectiveTypeParameterDeclarations(declaration));
@@ -36546,7 +37229,7 @@ var ts;
                                 ctorReturn = getReturnTypeOfSignature(ctorSig[0]);
                             }
                         }
-                        addRelatedInfo(err, ts.createDiagnosticForNode(baseConstructorType.symbol.declarations[0], ts.Diagnostics.Did_you_mean_for_0_to_be_constrained_to_type_new_args_Colon_any_1, symbolToString(baseConstructorType.symbol), typeToString(ctorReturn)));
+                        ts.addRelatedInfo(err, ts.createDiagnosticForNode(baseConstructorType.symbol.declarations[0], ts.Diagnostics.Did_you_mean_for_0_to_be_constrained_to_type_new_args_Colon_any_1, symbolToString(baseConstructorType.symbol), typeToString(ctorReturn)));
                     }
                     return type.resolvedBaseConstructorType = errorType;
                 }
@@ -36650,7 +37333,7 @@ var ts;
             type.resolvedBaseTypes = type.resolvedBaseTypes || ts.emptyArray;
             for (var _i = 0, _a = type.symbol.declarations; _i < _a.length; _i++) {
                 var declaration = _a[_i];
-                if (declaration.kind === 241 /* InterfaceDeclaration */ && ts.getInterfaceBaseTypeNodes(declaration)) {
+                if (declaration.kind === 242 /* InterfaceDeclaration */ && ts.getInterfaceBaseTypeNodes(declaration)) {
                     for (var _b = 0, _c = ts.getInterfaceBaseTypeNodes(declaration); _b < _c.length; _b++) {
                         var node = _c[_b];
                         var baseType = getTypeFromTypeNode(node);
@@ -36686,7 +37369,7 @@ var ts;
         function isThislessInterface(symbol) {
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var declaration = _a[_i];
-                if (declaration.kind === 241 /* InterfaceDeclaration */) {
+                if (declaration.kind === 242 /* InterfaceDeclaration */) {
                     if (declaration.flags & 64 /* ContainsThis */) {
                         return false;
                     }
@@ -36743,7 +37426,7 @@ var ts;
                     return errorType;
                 }
                 var declaration = ts.find(symbol.declarations, function (d) {
-                    return ts.isJSDocTypeAlias(d) || d.kind === 242 /* TypeAliasDeclaration */;
+                    return ts.isJSDocTypeAlias(d) || d.kind === 243 /* TypeAliasDeclaration */;
                 });
                 var typeNode = ts.isJSDocTypeAlias(declaration) ? declaration.typeExpression : declaration.type;
                 // If typeNode is missing, we will error in checkJSDocTypedefTag.
@@ -36770,7 +37453,7 @@ var ts;
             if (expr.kind === 10 /* StringLiteral */) {
                 return true;
             }
-            else if (expr.kind === 204 /* BinaryExpression */) {
+            else if (expr.kind === 205 /* BinaryExpression */) {
                 return isStringConcatExpression(expr.left) && isStringConcatExpression(expr.right);
             }
             return false;
@@ -36784,12 +37467,12 @@ var ts;
                 case 10 /* StringLiteral */:
                 case 8 /* NumericLiteral */:
                     return true;
-                case 202 /* PrefixUnaryExpression */:
+                case 203 /* PrefixUnaryExpression */:
                     return expr.operator === 39 /* MinusToken */ &&
                         expr.operand.kind === 8 /* NumericLiteral */;
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return ts.nodeIsMissing(expr) || !!getSymbolOfNode(member.parent).exports.get(expr.escapedText);
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return isStringConcatExpression(expr);
                 default:
                     return false;
@@ -36803,7 +37486,7 @@ var ts;
             var hasNonLiteralMember = false;
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var declaration = _a[_i];
-                if (declaration.kind === 243 /* EnumDeclaration */) {
+                if (declaration.kind === 244 /* EnumDeclaration */) {
                     for (var _b = 0, _c = declaration.members; _b < _c.length; _b++) {
                         var member = _c[_b];
                         if (member.initializer && member.initializer.kind === 10 /* StringLiteral */) {
@@ -36830,10 +37513,11 @@ var ts;
                 var memberTypeList = [];
                 for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                     var declaration = _a[_i];
-                    if (declaration.kind === 243 /* EnumDeclaration */) {
+                    if (declaration.kind === 244 /* EnumDeclaration */) {
                         for (var _b = 0, _c = declaration.members; _b < _c.length; _b++) {
                             var member = _c[_b];
-                            var memberType = getFreshTypeOfLiteralType(getLiteralType(getEnumMemberValue(member), enumCount, getSymbolOfNode(member))); // TODO: GH#18217
+                            var value = getEnumMemberValue(member);
+                            var memberType = getFreshTypeOfLiteralType(getLiteralType(value !== undefined ? value : 0, enumCount, getSymbolOfNode(member)));
                             getSymbolLinks(getSymbolOfNode(member)).declaredType = memberType;
                             memberTypeList.push(getRegularTypeOfLiteralType(memberType));
                         }
@@ -36901,23 +37585,23 @@ var ts;
          */
         function isThislessType(node) {
             switch (node.kind) {
-                case 120 /* AnyKeyword */:
-                case 143 /* UnknownKeyword */:
-                case 138 /* StringKeyword */:
-                case 135 /* NumberKeyword */:
-                case 146 /* BigIntKeyword */:
-                case 123 /* BooleanKeyword */:
-                case 139 /* SymbolKeyword */:
-                case 136 /* ObjectKeyword */:
-                case 106 /* VoidKeyword */:
-                case 141 /* UndefinedKeyword */:
-                case 96 /* NullKeyword */:
-                case 132 /* NeverKeyword */:
-                case 182 /* LiteralType */:
+                case 121 /* AnyKeyword */:
+                case 144 /* UnknownKeyword */:
+                case 139 /* StringKeyword */:
+                case 136 /* NumberKeyword */:
+                case 147 /* BigIntKeyword */:
+                case 124 /* BooleanKeyword */:
+                case 140 /* SymbolKeyword */:
+                case 137 /* ObjectKeyword */:
+                case 107 /* VoidKeyword */:
+                case 142 /* UndefinedKeyword */:
+                case 97 /* NullKeyword */:
+                case 133 /* NeverKeyword */:
+                case 183 /* LiteralType */:
                     return true;
-                case 169 /* ArrayType */:
+                case 170 /* ArrayType */:
                     return isThislessType(node.elementType);
-                case 164 /* TypeReference */:
+                case 165 /* TypeReference */:
                     return !node.typeArguments || node.typeArguments.every(isThislessType);
             }
             return false;
@@ -36943,7 +37627,7 @@ var ts;
         function isThislessFunctionLikeDeclaration(node) {
             var returnType = ts.getEffectiveReturnTypeNode(node);
             var typeParameters = ts.getEffectiveTypeParameterDeclarations(node);
-            return (node.kind === 157 /* Constructor */ || (!!returnType && isThislessType(returnType))) &&
+            return (node.kind === 158 /* Constructor */ || (!!returnType && isThislessType(returnType))) &&
                 node.parameters.every(isThislessVariableLikeDeclaration) &&
                 typeParameters.every(isThislessTypeParameter);
         }
@@ -36959,14 +37643,14 @@ var ts;
                 var declaration = symbol.declarations[0];
                 if (declaration) {
                     switch (declaration.kind) {
-                        case 154 /* PropertyDeclaration */:
-                        case 153 /* PropertySignature */:
+                        case 155 /* PropertyDeclaration */:
+                        case 154 /* PropertySignature */:
                             return isThislessVariableLikeDeclaration(declaration);
-                        case 156 /* MethodDeclaration */:
-                        case 155 /* MethodSignature */:
-                        case 157 /* Constructor */:
-                        case 158 /* GetAccessor */:
-                        case 159 /* SetAccessor */:
+                        case 157 /* MethodDeclaration */:
+                        case 156 /* MethodSignature */:
+                        case 158 /* Constructor */:
+                        case 159 /* GetAccessor */:
+                        case 160 /* SetAccessor */:
                             return isThislessFunctionLikeDeclaration(declaration);
                     }
                 }
@@ -37067,7 +37751,7 @@ var ts;
          * members.
          */
         function addDeclarationToLateBoundSymbol(symbol, member, symbolFlags) {
-            ts.Debug.assert(!!(ts.getCheckFlags(symbol) & 2048 /* Late */), "Expected a late-bound symbol.");
+            ts.Debug.assert(!!(ts.getCheckFlags(symbol) & 4096 /* Late */), "Expected a late-bound symbol.");
             symbol.flags |= symbolFlags;
             getSymbolLinks(member.symbol).lateSymbol = symbol;
             if (!symbol.declarations) {
@@ -37124,7 +37808,7 @@ var ts;
                     // Get or add a late-bound symbol for the member. This allows us to merge late-bound accessor declarations.
                     var lateSymbol = lateSymbols.get(memberName);
                     if (!lateSymbol)
-                        lateSymbols.set(memberName, lateSymbol = createSymbol(0 /* None */, memberName, 2048 /* Late */));
+                        lateSymbols.set(memberName, lateSymbol = createSymbol(0 /* None */, memberName, 4096 /* Late */));
                     // Report an error if a late-bound member has the same name as an early-bound member,
                     // or if we have another early-bound symbol declaration with the same name and
                     // conflicting flags.
@@ -37136,7 +37820,7 @@ var ts;
                         var name_3 = !(type.flags & 8192 /* UniqueESSymbol */) && ts.unescapeLeadingUnderscores(memberName) || ts.declarationNameToString(decl.name);
                         ts.forEach(declarations, function (declaration) { return error(ts.getNameOfDeclaration(declaration) || declaration, ts.Diagnostics.Property_0_was_also_declared_here, name_3); });
                         error(decl.name || decl, ts.Diagnostics.Duplicate_property_0, name_3);
-                        lateSymbol = createSymbol(0 /* None */, memberName, 2048 /* Late */);
+                        lateSymbol = createSymbol(0 /* None */, memberName, 4096 /* Late */);
                     }
                     lateSymbol.nameType = type;
                     addDeclarationToLateBoundSymbol(lateSymbol, decl, symbolFlags);
@@ -37201,11 +37885,12 @@ var ts;
                 var links = getSymbolLinks(symbol);
                 if (!links.lateSymbol && ts.some(symbol.declarations, hasLateBindableName)) {
                     // force late binding of members/exports. This will set the late-bound symbol
+                    var parent = getMergedSymbol(symbol.parent);
                     if (ts.some(symbol.declarations, ts.hasStaticModifier)) {
-                        getExportsOfSymbol(symbol.parent);
+                        getExportsOfSymbol(parent);
                     }
                     else {
-                        getMembersOfSymbol(symbol.parent);
+                        getMembersOfSymbol(parent);
                     }
                 }
                 return links.lateSymbol || (links.lateSymbol = symbol);
@@ -37298,8 +37983,18 @@ var ts;
             return sig;
         }
         function cloneSignature(sig) {
-            return createSignature(sig.declaration, sig.typeParameters, sig.thisParameter, sig.parameters, /*resolvedReturnType*/ undefined, 
+            var result = createSignature(sig.declaration, sig.typeParameters, sig.thisParameter, sig.parameters, /*resolvedReturnType*/ undefined, 
             /*resolvedTypePredicate*/ undefined, sig.minArgumentCount, sig.hasRestParameter, sig.hasLiteralTypes);
+            result.target = sig.target;
+            result.mapper = sig.mapper;
+            return result;
+        }
+        function createUnionSignature(signature, unionSignatures) {
+            var result = cloneSignature(signature);
+            result.unionSignatures = unionSignatures;
+            result.target = undefined;
+            result.mapper = undefined;
+            return result;
         }
         function getExpandedParameters(sig) {
             if (sig.hasRestParameter) {
@@ -37312,8 +38007,8 @@ var ts;
                     var tupleRestIndex_1 = restType.target.hasRestElement ? elementTypes.length - 1 : -1;
                     var restParams = ts.map(elementTypes, function (t, i) {
                         var name = getParameterNameAtPosition(sig, restIndex_1 + i);
-                        var checkFlags = i === tupleRestIndex_1 ? 16384 /* RestParameter */ :
-                            i >= minLength_1 ? 8192 /* OptionalParameter */ : 0;
+                        var checkFlags = i === tupleRestIndex_1 ? 32768 /* RestParameter */ :
+                            i >= minLength_1 ? 16384 /* OptionalParameter */ : 0;
                         var symbol = createSymbol(1 /* FunctionScopedVariable */, name, checkFlags);
                         symbol.type = i === tupleRestIndex_1 ? createArrayType(t) : t;
                         return symbol;
@@ -37403,14 +38098,13 @@ var ts;
                             // Union the result types when more than one signature matches
                             if (unionSignatures.length > 1) {
                                 var thisParameter = signature.thisParameter;
-                                if (ts.forEach(unionSignatures, function (sig) { return sig.thisParameter; })) {
-                                    // TODO: GH#18217 We tested that *some* has thisParameter and now act as if *all* do
+                                var firstThisParameterOfUnionSignatures = ts.forEach(unionSignatures, function (sig) { return sig.thisParameter; });
+                                if (firstThisParameterOfUnionSignatures) {
                                     var thisType = getUnionType(ts.map(unionSignatures, function (sig) { return sig.thisParameter ? getTypeOfSymbol(sig.thisParameter) : anyType; }), 2 /* Subtype */);
-                                    thisParameter = createSymbolWithType(signature.thisParameter, thisType);
+                                    thisParameter = createSymbolWithType(firstThisParameterOfUnionSignatures, thisType);
                                 }
-                                s = cloneSignature(signature);
+                                s = createUnionSignature(signature, unionSignatures);
                                 s.thisParameter = thisParameter;
-                                s.unionSignatures = unionSignatures;
                             }
                             (result || (result = [])).push(s);
                         }
@@ -37455,9 +38149,11 @@ var ts;
             return createSymbolWithType(left, thisType);
         }
         function combineUnionParameters(left, right) {
-            var longest = getParameterCount(left) >= getParameterCount(right) ? left : right;
+            var leftCount = getParameterCount(left);
+            var rightCount = getParameterCount(right);
+            var longest = leftCount >= rightCount ? left : right;
             var shorter = longest === left ? right : left;
-            var longestCount = getParameterCount(longest);
+            var longestCount = longest === left ? leftCount : rightCount;
             var eitherHasEffectiveRest = (hasEffectiveRestParameter(left) || hasEffectiveRestParameter(right));
             var needsExtraRestElement = eitherHasEffectiveRest && !hasEffectiveRestParameter(longest);
             var params = new Array(longestCount + (needsExtraRestElement ? 1 : 0));
@@ -37467,9 +38163,13 @@ var ts;
                 var unionParamType = getIntersectionType([longestParamType, shorterParamType]);
                 var isRestParam = eitherHasEffectiveRest && !needsExtraRestElement && i === (longestCount - 1);
                 var isOptional = i >= getMinArgumentCount(longest) && i >= getMinArgumentCount(shorter);
-                var leftName = getParameterNameAtPosition(left, i);
-                var rightName = getParameterNameAtPosition(right, i);
-                var paramSymbol = createSymbol(1 /* FunctionScopedVariable */ | (isOptional && !isRestParam ? 16777216 /* Optional */ : 0), leftName === rightName ? leftName : "arg" + i);
+                var leftName = i >= leftCount ? undefined : getParameterNameAtPosition(left, i);
+                var rightName = i >= rightCount ? undefined : getParameterNameAtPosition(right, i);
+                var paramName = leftName === rightName ? leftName :
+                    !leftName ? rightName :
+                        !rightName ? leftName :
+                            undefined;
+                var paramSymbol = createSymbol(1 /* FunctionScopedVariable */ | (isOptional && !isRestParam ? 16777216 /* Optional */ : 0), paramName || "arg" + i);
                 paramSymbol.type = isRestParam ? createArrayType(unionParamType) : unionParamType;
                 params[i] = paramSymbol;
             }
@@ -37525,13 +38225,22 @@ var ts;
         function unionSpreadIndexInfos(info1, info2) {
             return info1 && info2 && createIndexInfo(getUnionType([info1.type, info2.type]), info1.isReadonly || info2.isReadonly);
         }
-        function includeMixinType(type, types, index) {
+        function findMixins(types) {
+            var constructorTypeCount = ts.countWhere(types, function (t) { return getSignaturesOfType(t, 1 /* Construct */).length > 0; });
+            var mixinFlags = ts.map(types, isMixinConstructorType);
+            if (constructorTypeCount > 0 && constructorTypeCount === ts.countWhere(mixinFlags, function (b) { return b; })) {
+                var firstMixinIndex = mixinFlags.indexOf(/*searchElement*/ true);
+                mixinFlags[firstMixinIndex] = false;
+            }
+            return mixinFlags;
+        }
+        function includeMixinType(type, types, mixinFlags, index) {
             var mixedTypes = [];
             for (var i = 0; i < types.length; i++) {
                 if (i === index) {
                     mixedTypes.push(type);
                 }
-                else if (isMixinConstructorType(types[i])) {
+                else if (mixinFlags[i]) {
                     mixedTypes.push(getReturnTypeOfSignature(getSignaturesOfType(types[i], 1 /* Construct */)[0]));
                 }
             }
@@ -37540,12 +38249,13 @@ var ts;
         function resolveIntersectionTypeMembers(type) {
             // The members and properties collections are empty for intersection types. To get all properties of an
             // intersection type use getPropertiesOfType (only the language service uses this).
-            var callSignatures = ts.emptyArray;
-            var constructSignatures = ts.emptyArray;
+            var callSignatures;
+            var constructSignatures;
             var stringIndexInfo;
             var numberIndexInfo;
             var types = type.types;
-            var mixinCount = ts.countWhere(types, isMixinConstructorType);
+            var mixinFlags = findMixins(types);
+            var mixinCount = ts.countWhere(mixinFlags, function (b) { return b; });
             var _loop_6 = function (i) {
                 var t = type.types[i];
                 // When an intersection type contains mixin constructor types, the construct signatures from
@@ -37553,25 +38263,37 @@ var ts;
                 // other construct signatures in the intersection type. For example, the intersection type
                 // '{ new(...args: any[]) => A } & { new(s: string) => B }' has a single construct signature
                 // 'new(s: string) => A & B'.
-                if (mixinCount === 0 || mixinCount === types.length && i === 0 || !isMixinConstructorType(t)) {
+                if (!mixinFlags[i]) {
                     var signatures = getSignaturesOfType(t, 1 /* Construct */);
                     if (signatures.length && mixinCount > 0) {
                         signatures = ts.map(signatures, function (s) {
                             var clone = cloneSignature(s);
-                            clone.resolvedReturnType = includeMixinType(getReturnTypeOfSignature(s), types, i);
+                            clone.resolvedReturnType = includeMixinType(getReturnTypeOfSignature(s), types, mixinFlags, i);
                             return clone;
                         });
                     }
-                    constructSignatures = ts.concatenate(constructSignatures, signatures);
+                    constructSignatures = appendSignatures(constructSignatures, signatures);
                 }
-                callSignatures = ts.concatenate(callSignatures, getSignaturesOfType(t, 0 /* Call */));
+                callSignatures = appendSignatures(callSignatures, getSignaturesOfType(t, 0 /* Call */));
                 stringIndexInfo = intersectIndexInfos(stringIndexInfo, getIndexInfoOfType(t, 0 /* String */));
                 numberIndexInfo = intersectIndexInfos(numberIndexInfo, getIndexInfoOfType(t, 1 /* Number */));
             };
             for (var i = 0; i < types.length; i++) {
                 _loop_6(i);
             }
-            setStructuredTypeMembers(type, emptySymbols, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
+            setStructuredTypeMembers(type, emptySymbols, callSignatures || ts.emptyArray, constructSignatures || ts.emptyArray, stringIndexInfo, numberIndexInfo);
+        }
+        function appendSignatures(signatures, newSignatures) {
+            var _loop_7 = function (sig) {
+                if (!signatures || ts.every(signatures, function (s) { return !compareSignaturesIdentical(s, sig, /*partialMatch*/ false, /*ignoreThisTypes*/ false, /*ignoreReturnTypes*/ false, compareTypesIdentical); })) {
+                    signatures = ts.append(signatures, sig);
+                }
+            };
+            for (var _i = 0, newSignatures_1 = newSignatures; _i < newSignatures_1.length; _i++) {
+                var sig = newSignatures_1[_i];
+                _loop_7(sig);
+            }
+            return signatures;
         }
         /**
          * Converts an AnonymousType to a ResolvedType.
@@ -37602,6 +38324,15 @@ var ts;
                 var stringIndexInfo = void 0;
                 if (symbol.exports) {
                     members = getExportsOfSymbol(symbol);
+                    if (symbol === globalThisSymbol) {
+                        var varsOnly_1 = ts.createMap();
+                        members.forEach(function (p) {
+                            if (!(p.flags & 418 /* BlockScoped */)) {
+                                varsOnly_1.set(p.escapedName, p);
+                            }
+                        });
+                        members = varsOnly_1;
+                    }
                 }
                 setStructuredTypeMembers(type, members, ts.emptyArray, ts.emptyArray, undefined, undefined);
                 if (symbol.flags & 32 /* Class */) {
@@ -37615,7 +38346,8 @@ var ts;
                         stringIndexInfo = createIndexInfo(anyType, /*isReadonly*/ false);
                     }
                 }
-                var numberIndexInfo = symbol.flags & 384 /* Enum */ ? enumNumberIndexInfo : undefined;
+                var numberIndexInfo = symbol.flags & 384 /* Enum */ && (getDeclaredTypeOfSymbol(symbol).flags & 32 /* Enum */ ||
+                    ts.some(type.properties, function (prop) { return !!(getTypeOfSymbol(prop).flags & 296 /* NumberLike */); })) ? enumNumberIndexInfo : undefined;
                 setStructuredTypeMembers(type, members, ts.emptyArray, ts.emptyArray, stringIndexInfo, numberIndexInfo);
                 // We resolve the members before computing the signatures because a signature may use
                 // typeof with a qualified name expression that circularly references the type we are
@@ -37645,7 +38377,7 @@ var ts;
             var members = ts.createSymbolTable();
             for (var _i = 0, _a = getPropertiesOfType(type.source); _i < _a.length; _i++) {
                 var prop = _a[_i];
-                var checkFlags = 4096 /* ReverseMapped */ | (readonlyMask && isReadonlySymbol(prop) ? 8 /* Readonly */ : 0);
+                var checkFlags = 8192 /* ReverseMapped */ | (readonlyMask && isReadonlySymbol(prop) ? 8 /* Readonly */ : 0);
                 var inferredProp = createSymbol(4 /* Property */ | prop.flags & optionalMask, prop.escapedName, checkFlags);
                 inferredProp.declarations = prop.declarations;
                 inferredProp.nameType = prop.nameType;
@@ -37667,7 +38399,15 @@ var ts;
                 return getIndexType(getApparentType(type.type));
             }
             if (type.flags & 16777216 /* Conditional */) {
-                return getLowerBoundOfConditionalType(type);
+                if (type.root.isDistributive) {
+                    var checkType = type.checkType;
+                    var constraint = getLowerBoundOfKeyType(checkType);
+                    if (constraint !== checkType) {
+                        var mapper = makeUnaryTypeMapper(type.root.checkType, constraint);
+                        return getConditionalTypeInstantiation(type, combineTypeMappers(mapper, type.mapper));
+                    }
+                }
+                return type;
             }
             if (type.flags & 1048576 /* Union */) {
                 return getUnionType(ts.sameMap(type.types, getLowerBoundOfKeyType));
@@ -37677,16 +38417,6 @@ var ts;
             }
             return neverType;
         }
-        function getLowerBoundOfConditionalType(type) {
-            if (type.root.isDistributive) {
-                var constraint = getLowerBoundOfKeyType(type.checkType);
-                if (constraint !== type.checkType) {
-                    var mapper = makeUnaryTypeMapper(type.root.checkType, constraint);
-                    return getConditionalTypeInstantiation(type, combineTypeMappers(mapper, type.mapper));
-                }
-            }
-            return type;
-        }
         /** Resolve the members of a mapped type { [P in K]: T } */
         function resolveMappedTypeMembers(type) {
             var members = ts.createSymbolTable();
@@ -37751,8 +38481,8 @@ var ts;
                 else if (t.flags & (1 /* Any */ | 4 /* String */)) {
                     stringIndexInfo = createIndexInfo(propType, !!(templateModifiers & 1 /* IncludeReadonly */));
                 }
-                else if (t.flags & 8 /* Number */) {
-                    numberIndexInfo = createIndexInfo(propType, !!(templateModifiers & 1 /* IncludeReadonly */));
+                else if (t.flags & (8 /* Number */ | 32 /* Enum */)) {
+                    numberIndexInfo = createIndexInfo(numberIndexInfo ? getUnionType([numberIndexInfo.type, propType]) : propType, !!(templateModifiers & 1 /* IncludeReadonly */));
                 }
             }
         }
@@ -37775,8 +38505,8 @@ var ts;
         }
         function isMappedTypeWithKeyofConstraintDeclaration(type) {
             var constraintDeclaration = getConstraintDeclarationForMappedType(type); // TODO: GH#18217
-            return constraintDeclaration.kind === 179 /* TypeOperator */ &&
-                constraintDeclaration.operator === 129 /* KeyOfKeyword */;
+            return constraintDeclaration.kind === 180 /* TypeOperator */ &&
+                constraintDeclaration.operator === 130 /* KeyOfKeyword */;
         }
         function getModifiersTypeFromMappedType(type) {
             if (!type.modifiersType) {
@@ -37793,7 +38523,7 @@ var ts;
                     var declaredType = getTypeFromMappedTypeNode(type.declaration);
                     var constraint = getConstraintTypeFromMappedType(declaredType);
                     var extendedConstraint = constraint && constraint.flags & 262144 /* TypeParameter */ ? getConstraintOfTypeParameter(constraint) : constraint;
-                    type.modifiersType = extendedConstraint && extendedConstraint.flags & 4194304 /* Index */ ? instantiateType(extendedConstraint.type, type.mapper || identityMapper) : emptyObjectType;
+                    type.modifiersType = extendedConstraint && extendedConstraint.flags & 4194304 /* Index */ ? instantiateType(extendedConstraint.type, type.mapper || identityMapper) : unknownType;
                 }
             }
             return type.modifiersType;
@@ -37889,6 +38619,26 @@ var ts;
             }
             return type.resolvedProperties;
         }
+        function getPossiblePropertiesOfUnionType(type) {
+            if (type.possiblePropertyCache) {
+                return type.possiblePropertyCache.size ? ts.arrayFrom(type.possiblePropertyCache.values()) : ts.emptyArray;
+            }
+            type.possiblePropertyCache = ts.createSymbolTable();
+            for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
+                var t = _a[_i];
+                for (var _b = 0, _c = getPropertiesOfType(t); _b < _c.length; _b++) {
+                    var p = _c[_b];
+                    if (!type.possiblePropertyCache.has(p.escapedName)) {
+                        var prop = getUnionOrIntersectionProperty(type, p.escapedName);
+                        if (prop) {
+                            type.possiblePropertyCache.set(p.escapedName, prop);
+                        }
+                    }
+                }
+            }
+            // We can't simply use the normal property cache here, since that will contain cached apparent type members :(
+            return type.possiblePropertyCache.size ? ts.arrayFrom(type.possiblePropertyCache.values()) : ts.emptyArray;
+        }
         function getPropertiesOfType(type) {
             type = getApparentType(type);
             return type.flags & 3145728 /* UnionOrIntersection */ ?
@@ -37934,24 +38684,25 @@ var ts;
             return hasNonCircularBaseConstraint(typeParameter) ? getConstraintFromTypeParameter(typeParameter) : undefined;
         }
         function getConstraintOfIndexedAccess(type) {
-            var objectType = getConstraintOfType(type.objectType) || type.objectType;
-            if (objectType !== type.objectType) {
-                var constraint = getIndexedAccessType(objectType, type.indexType, /*accessNode*/ undefined, errorType);
-                if (constraint && constraint !== errorType) {
-                    return constraint;
+            return hasNonCircularBaseConstraint(type) ? getConstraintFromIndexedAccess(type) : undefined;
+        }
+        function getSimplifiedTypeOrConstraint(type) {
+            var simplified = getSimplifiedType(type, /*writing*/ false);
+            return simplified !== type ? simplified : getConstraintOfType(type);
+        }
+        function getConstraintFromIndexedAccess(type) {
+            var indexConstraint = getSimplifiedTypeOrConstraint(type.indexType);
+            if (indexConstraint && indexConstraint !== type.indexType) {
+                var indexedAccess = getIndexedAccessTypeOrUndefined(type.objectType, indexConstraint);
+                if (indexedAccess) {
+                    return indexedAccess;
                 }
             }
-            var baseConstraint = getBaseConstraintOfType(type);
-            return baseConstraint && baseConstraint !== type ? baseConstraint : undefined;
-        }
-        function getDefaultConstraintOfTrueBranchOfConditionalType(root, combinedMapper, mapper) {
-            var rootTrueType = root.trueType;
-            var rootTrueConstraint = !(rootTrueType.flags & 33554432 /* Substitution */)
-                ? rootTrueType
-                : instantiateType((rootTrueType.substitute), combinedMapper || mapper).flags & 3 /* AnyOrUnknown */
-                    ? rootTrueType.typeVariable
-                    : getIntersectionType([rootTrueType.substitute, rootTrueType.typeVariable]);
-            return instantiateType(rootTrueConstraint, combinedMapper || mapper);
+            var objectConstraint = getSimplifiedTypeOrConstraint(type.objectType);
+            if (objectConstraint && objectConstraint !== type.objectType) {
+                return getIndexedAccessTypeOrUndefined(objectConstraint, type.indexType);
+            }
+            return undefined;
         }
         function getDefaultConstraintOfConditionalType(type) {
             if (!type.resolvedDefaultConstraint) {
@@ -37959,7 +38710,7 @@ var ts;
                 // a conditional type with a single branch of type `any` would be assignable to anything, since it's constraint would simplify to
                 // just `any`. This result is _usually_ unwanted - so instead here we elide an `any` branch from the constraint type,
                 // in effect treating `any` like `never` rather than `unknown` in this location.
-                var trueConstraint = getDefaultConstraintOfTrueBranchOfConditionalType(type.root, type.combinedMapper, type.mapper);
+                var trueConstraint = getInferredTrueTypeFromConditionalType(type);
                 var falseConstraint = getFalseTypeFromConditionalType(type);
                 type.resolvedDefaultConstraint = isTypeAny(trueConstraint) ? falseConstraint : isTypeAny(falseConstraint) ? trueConstraint : getUnionType([trueConstraint, falseConstraint]);
             }
@@ -37978,7 +38729,7 @@ var ts;
             // a union - once negated types exist and are applied to the conditional false branch, this "constraint"
             // likely doesn't need to exist.
             if (type.root.isDistributive && type.restrictiveInstantiation !== type) {
-                var simplified = getSimplifiedType(type.checkType);
+                var simplified = getSimplifiedType(type.checkType, /*writing*/ false);
                 var constraint = simplified === type.checkType ? getConstraintOfType(simplified) : simplified;
                 if (constraint && constraint !== type.checkType) {
                     var mapper = makeUnaryTypeMapper(type.root.checkType, constraint);
@@ -37990,9 +38741,12 @@ var ts;
             }
             return undefined;
         }
-        function getConstraintOfConditionalType(type) {
+        function getConstraintFromConditionalType(type) {
             return getConstraintOfDistributiveConditionalType(type) || getDefaultConstraintOfConditionalType(type);
         }
+        function getConstraintOfConditionalType(type) {
+            return hasNonCircularBaseConstraint(type) ? getConstraintFromConditionalType(type) : undefined;
+        }
         function getUnionConstraintOfIntersection(type, targetIsUnion) {
             var constraints;
             var hasDisjointDomainType = false;
@@ -38006,11 +38760,6 @@ var ts;
                         constraint = getConstraintOfType(constraint);
                     }
                     if (constraint) {
-                        // A constraint that isn't a union type implies that the final type would be a non-union
-                        // type as well. Since non-union constraints are of no interest, we can exit here.
-                        if (!(constraint.flags & 1048576 /* Union */)) {
-                            return undefined;
-                        }
                         constraints = ts.append(constraints, constraint);
                     }
                 }
@@ -38019,10 +38768,10 @@ var ts;
                 }
             }
             // If the target is a union type or if we are intersecting with types belonging to one of the
-            // disjoint domans, we may end up producing a constraint that hasn't been examined before.
+            // disjoint domains, we may end up producing a constraint that hasn't been examined before.
             if (constraints && (targetIsUnion || hasDisjointDomainType)) {
                 if (hasDisjointDomainType) {
-                    // We add any types belong to one of the disjoint domans because they might cause the final
+                    // We add any types belong to one of the disjoint domains because they might cause the final
                     // intersection operation to reduce the union constraints.
                     for (var _b = 0, _c = type.types; _b < _c.length; _b++) {
                         var t = _c[_b];
@@ -38066,9 +38815,9 @@ var ts;
                     if (!pushTypeResolution(t, 4 /* ImmediateBaseConstraint */)) {
                         return circularConstraintType;
                     }
-                    if (constraintDepth === 50) {
+                    if (constraintDepth >= 50) {
                         // We have reached 50 recursive invocations of getImmediateBaseConstraint and there is a
-                        // very high likelyhood we're dealing with an infinite generic type that perpetually generates
+                        // very high likelihood we're dealing with an infinite generic type that perpetually generates
                         // new type identities as we descend into it. We stop the recursion here and mark this type
                         // and the outer types as having circular constraints.
                         error(currentNode, ts.Diagnostics.Type_instantiation_is_excessively_deep_and_possibly_infinite);
@@ -38076,7 +38825,7 @@ var ts;
                         return t.immediateBaseConstraint = noConstraintType;
                     }
                     constraintDepth++;
-                    var result = computeBaseConstraint(getSimplifiedType(t));
+                    var result = computeBaseConstraint(getSimplifiedType(t, /*writing*/ false));
                     constraintDepth--;
                     if (!popTypeResolution()) {
                         if (t.flags & 262144 /* TypeParameter */) {
@@ -38084,7 +38833,7 @@ var ts;
                             if (errorNode) {
                                 var diagnostic = error(errorNode, ts.Diagnostics.Type_parameter_0_has_a_circular_constraint, typeToString(t));
                                 if (currentNode && !ts.isNodeDescendantOf(errorNode, currentNode) && !ts.isNodeDescendantOf(currentNode, errorNode)) {
-                                    addRelatedInfo(diagnostic, ts.createDiagnosticForNode(currentNode, ts.Diagnostics.Circularity_originates_in_type_at_this_location));
+                                    ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(currentNode, ts.Diagnostics.Circularity_originates_in_type_at_this_location));
                                 }
                             }
                         }
@@ -38128,12 +38877,15 @@ var ts;
                 if (t.flags & 8388608 /* IndexedAccess */) {
                     var baseObjectType = getBaseConstraint(t.objectType);
                     var baseIndexType = getBaseConstraint(t.indexType);
-                    var baseIndexedAccess = baseObjectType && baseIndexType ? getIndexedAccessType(baseObjectType, baseIndexType, /*accessNode*/ undefined, errorType) : undefined;
-                    return baseIndexedAccess && baseIndexedAccess !== errorType ? getBaseConstraint(baseIndexedAccess) : undefined;
+                    var baseIndexedAccess = baseObjectType && baseIndexType && getIndexedAccessTypeOrUndefined(baseObjectType, baseIndexType);
+                    return baseIndexedAccess && getBaseConstraint(baseIndexedAccess);
                 }
                 if (t.flags & 16777216 /* Conditional */) {
-                    var constraint = getConstraintOfConditionalType(t);
-                    return constraint && getBaseConstraint(constraint);
+                    var constraint = getConstraintFromConditionalType(t);
+                    constraintDepth++; // Penalize repeating conditional types (this captures the recursion within getConstraintFromConditionalType and carries it forward)
+                    var result = constraint && getBaseConstraint(constraint);
+                    constraintDepth--;
+                    return result;
                 }
                 if (t.flags & 33554432 /* Substitution */) {
                     return getBaseConstraint(t.substitute);
@@ -38207,25 +38959,26 @@ var ts;
          * type itself. Note that the apparent type of a union type is the union type itself.
          */
         function getApparentType(type) {
-            var t = type.flags & 63176704 /* Instantiable */ ? getBaseConstraintOfType(type) || emptyObjectType : type;
+            var t = type.flags & 63176704 /* Instantiable */ ? getBaseConstraintOfType(type) || unknownType : type;
             return ts.getObjectFlags(t) & 32 /* Mapped */ ? getApparentTypeOfMappedType(t) :
                 t.flags & 2097152 /* Intersection */ ? getApparentTypeOfIntersectionType(t) :
                     t.flags & 132 /* StringLike */ ? globalStringType :
                         t.flags & 296 /* NumberLike */ ? globalNumberType :
-                            t.flags & 2112 /* BigIntLike */ ? getGlobalBigIntType(/*reportErrors*/ languageVersion >= 7 /* ESNext */) :
+                            t.flags & 2112 /* BigIntLike */ ? getGlobalBigIntType(/*reportErrors*/ languageVersion >= 99 /* ESNext */) :
                                 t.flags & 528 /* BooleanLike */ ? globalBooleanType :
                                     t.flags & 12288 /* ESSymbolLike */ ? getGlobalESSymbolType(/*reportErrors*/ languageVersion >= 2 /* ES2015 */) :
                                         t.flags & 67108864 /* NonPrimitive */ ? emptyObjectType :
                                             t.flags & 4194304 /* Index */ ? keyofConstraintType :
-                                                t;
+                                                t.flags & 2 /* Unknown */ && !strictNullChecks ? emptyObjectType :
+                                                    t;
         }
         function createUnionOrIntersectionProperty(containingType, name) {
-            var props;
+            var propSet = ts.createMap();
             var indexTypes;
             var isUnion = containingType.flags & 1048576 /* Union */;
             var excludeModifiers = isUnion ? 24 /* NonPublicAccessibilityModifier */ : 0;
             // Flags we want to propagate to the result if they exist in all source symbols
-            var commonFlags = isUnion ? 0 /* None */ : 16777216 /* Optional */;
+            var optionalFlag = isUnion ? 0 /* None */ : 16777216 /* Optional */;
             var syntheticFlag = 4 /* SyntheticMethod */;
             var checkFlags = 0;
             for (var _i = 0, _a = containingType.types; _i < _a.length; _i++) {
@@ -38235,13 +38988,21 @@ var ts;
                     var prop = getPropertyOfType(type, name);
                     var modifiers = prop ? ts.getDeclarationModifierFlagsFromSymbol(prop) : 0;
                     if (prop && !(modifiers & excludeModifiers)) {
-                        commonFlags &= prop.flags;
-                        props = ts.appendIfUnique(props, prop);
+                        if (isUnion) {
+                            optionalFlag |= (prop.flags & 16777216 /* Optional */);
+                        }
+                        else {
+                            optionalFlag &= prop.flags;
+                        }
+                        var id = "" + getSymbolId(prop);
+                        if (!propSet.has(id)) {
+                            propSet.set(id, prop);
+                        }
                         checkFlags |= (isReadonlySymbol(prop) ? 8 /* Readonly */ : 0) |
-                            (!(modifiers & 24 /* NonPublicAccessibilityModifier */) ? 128 /* ContainsPublic */ : 0) |
-                            (modifiers & 16 /* Protected */ ? 256 /* ContainsProtected */ : 0) |
-                            (modifiers & 8 /* Private */ ? 512 /* ContainsPrivate */ : 0) |
-                            (modifiers & 32 /* Static */ ? 1024 /* ContainsStatic */ : 0);
+                            (!(modifiers & 24 /* NonPublicAccessibilityModifier */) ? 256 /* ContainsPublic */ : 0) |
+                            (modifiers & 16 /* Protected */ ? 512 /* ContainsProtected */ : 0) |
+                            (modifiers & 8 /* Private */ ? 1024 /* ContainsPrivate */ : 0) |
+                            (modifiers & 32 /* Static */ ? 2048 /* ContainsStatic */ : 0);
                         if (!isPrototypeProperty(prop)) {
                             syntheticFlag = 2 /* SyntheticProperty */;
                         }
@@ -38249,19 +39010,24 @@ var ts;
                     else if (isUnion) {
                         var indexInfo = !isLateBoundName(name) && (isNumericLiteralName(name) && getIndexInfoOfType(type, 1 /* Number */) || getIndexInfoOfType(type, 0 /* String */));
                         if (indexInfo) {
-                            checkFlags |= indexInfo.isReadonly ? 8 /* Readonly */ : 0;
+                            checkFlags |= 32 /* WritePartial */ | (indexInfo.isReadonly ? 8 /* Readonly */ : 0);
                             indexTypes = ts.append(indexTypes, isTupleType(type) ? getRestTypeOfTupleType(type) || undefinedType : indexInfo.type);
                         }
+                        else if (isObjectLiteralType(type)) {
+                            checkFlags |= 32 /* WritePartial */;
+                            indexTypes = ts.append(indexTypes, undefinedType);
+                        }
                         else {
-                            checkFlags |= 16 /* Partial */;
+                            checkFlags |= 16 /* ReadPartial */;
                         }
                     }
                 }
             }
-            if (!props) {
+            if (!propSet.size) {
                 return undefined;
             }
-            if (props.length === 1 && !(checkFlags & 16 /* Partial */) && !indexTypes) {
+            var props = ts.arrayFrom(propSet.values());
+            if (props.length === 1 && !(checkFlags & 16 /* ReadPartial */) && !indexTypes) {
                 return props[0];
             }
             var declarations;
@@ -38285,15 +39051,15 @@ var ts;
                     nameType = prop.nameType;
                 }
                 else if (type !== firstType) {
-                    checkFlags |= 32 /* HasNonUniformType */;
+                    checkFlags |= 64 /* HasNonUniformType */;
                 }
                 if (isLiteralType(type)) {
-                    checkFlags |= 64 /* HasLiteralType */;
+                    checkFlags |= 128 /* HasLiteralType */;
                 }
                 propTypes.push(type);
             }
             ts.addRange(propTypes, indexTypes);
-            var result = createSymbol(4 /* Property */ | commonFlags, name, syntheticFlag | checkFlags);
+            var result = createSymbol(4 /* Property */ | optionalFlag, name, syntheticFlag | checkFlags);
             result.containingType = containingType;
             if (!hasNonUniformValueDeclaration && firstValueDeclaration) {
                 result.valueDeclaration = firstValueDeclaration;
@@ -38304,7 +39070,15 @@ var ts;
             }
             result.declarations = declarations;
             result.nameType = nameType;
-            result.type = isUnion ? getUnionType(propTypes) : getIntersectionType(propTypes);
+            if (propTypes.length > 2) {
+                // When `propTypes` has the potential to explode in size when normalized, defer normalization until absolutely needed
+                result.checkFlags |= 65536 /* DeferredType */;
+                result.deferralParent = containingType;
+                result.deferralConstituents = propTypes;
+            }
+            else {
+                result.type = isUnion ? getUnionType(propTypes) : getIntersectionType(propTypes);
+            }
             return result;
         }
         // Return the symbol for a given property in a union or intersection type, or undefined if the property
@@ -38326,7 +39100,7 @@ var ts;
         function getPropertyOfUnionOrIntersectionType(type, name) {
             var property = getUnionOrIntersectionProperty(type, name);
             // We need to filter out partial properties in union types
-            return property && !(ts.getCheckFlags(property) & 16 /* Partial */) ? property : undefined;
+            return property && !(ts.getCheckFlags(property) & 16 /* ReadPartial */) ? property : undefined;
         }
         /**
          * Return the symbol for the property with the given name in the given type. Creates synthetic union properties when
@@ -38404,6 +39178,9 @@ var ts;
                         propTypes.push(getTypeOfSymbol(prop));
                     }
                 }
+                if (kind === 0 /* String */) {
+                    ts.append(propTypes, getIndexTypeOfType(type, 1 /* Number */));
+                }
                 if (propTypes.length) {
                     return getUnionType(propTypes, 2 /* Subtype */);
                 }
@@ -38432,10 +39209,10 @@ var ts;
         function isJSDocOptionalParameter(node) {
             return ts.isInJSFile(node) && (
             // node.type should only be a JSDocOptionalType when node is a parameter of a JSDocFunctionType
-            node.type && node.type.kind === 293 /* JSDocOptionalType */
+            node.type && node.type.kind === 294 /* JSDocOptionalType */
                 || ts.getJSDocParameterTags(node).some(function (_a) {
                     var isBracketed = _a.isBracketed, typeExpression = _a.typeExpression;
-                    return isBracketed || !!typeExpression && typeExpression.type.kind === 293 /* JSDocOptionalType */;
+                    return isBracketed || !!typeExpression && typeExpression.type.kind === 294 /* JSDocOptionalType */;
                 }));
         }
         function tryFindAmbientModule(moduleName, withAugmentations) {
@@ -38469,7 +39246,7 @@ var ts;
                 return false;
             }
             var isBracketed = node.isBracketed, typeExpression = node.typeExpression;
-            return isBracketed || !!typeExpression && typeExpression.type.kind === 293 /* JSDocOptionalType */;
+            return isBracketed || !!typeExpression && typeExpression.type.kind === 294 /* JSDocOptionalType */;
         }
         function createIdentifierTypePredicate(parameterName, parameterIndex, type) {
             return { kind: 1 /* Identifier */, parameterName: parameterName, parameterIndex: parameterIndex, type: type };
@@ -38507,7 +39284,7 @@ var ts;
                 var baseDefaultType = getDefaultTypeArgumentType(isJavaScriptImplicitAny);
                 for (var i = numTypeArguments; i < numTypeParameters; i++) {
                     var defaultType = getDefaultFromTypeParameter(typeParameters[i]);
-                    if (isJavaScriptImplicitAny && defaultType && isTypeIdenticalTo(defaultType, emptyObjectType)) {
+                    if (isJavaScriptImplicitAny && defaultType && (isTypeIdenticalTo(defaultType, unknownType) || isTypeIdenticalTo(defaultType, emptyObjectType))) {
                         defaultType = anyType;
                     }
                     result[i] = defaultType ? instantiateType(defaultType, createTypeMapper(typeParameters, result)) : baseDefaultType;
@@ -38551,7 +39328,7 @@ var ts;
                     else {
                         parameters.push(paramSymbol);
                     }
-                    if (type && type.kind === 182 /* LiteralType */) {
+                    if (type && type.kind === 183 /* LiteralType */) {
                         hasLiteralTypes = true;
                     }
                     // Record a new minimum argument count if this is not an optional parameter
@@ -38565,16 +39342,16 @@ var ts;
                     }
                 }
                 // If only one accessor includes a this-type annotation, the other behaves as if it had the same type annotation
-                if ((declaration.kind === 158 /* GetAccessor */ || declaration.kind === 159 /* SetAccessor */) &&
+                if ((declaration.kind === 159 /* GetAccessor */ || declaration.kind === 160 /* SetAccessor */) &&
                     !hasNonBindableDynamicName(declaration) &&
                     (!hasThisParameter || !thisParameter)) {
-                    var otherKind = declaration.kind === 158 /* GetAccessor */ ? 159 /* SetAccessor */ : 158 /* GetAccessor */;
+                    var otherKind = declaration.kind === 159 /* GetAccessor */ ? 160 /* SetAccessor */ : 159 /* GetAccessor */;
                     var other = ts.getDeclarationOfKind(getSymbolOfNode(declaration), otherKind);
                     if (other) {
                         thisParameter = getAnnotatedAccessorThisParameter(other);
                     }
                 }
-                var classType = declaration.kind === 157 /* Constructor */ ?
+                var classType = declaration.kind === 158 /* Constructor */ ?
                     getDeclaredTypeOfClassOrInterface(getMergedSymbol(declaration.parent.symbol))
                     : undefined;
                 var typeParameters = classType ? classType.localTypeParameters : getTypeParametersFromDeclaration(declaration);
@@ -38599,7 +39376,7 @@ var ts;
             var lastParamVariadicType = ts.firstDefined(lastParamTags, function (p) {
                 return p.typeExpression && ts.isJSDocVariadicType(p.typeExpression.type) ? p.typeExpression.type : undefined;
             });
-            var syntheticArgsSymbol = createSymbol(3 /* Variable */, "args", 16384 /* RestParameter */);
+            var syntheticArgsSymbol = createSymbol(3 /* Variable */, "args", 32768 /* RestParameter */);
             syntheticArgsSymbol.type = lastParamVariadicType ? createArrayType(getTypeFromTypeNode(lastParamVariadicType.type)) : anyArrayType;
             if (lastParamVariadicType) {
                 // Replace the last parameter with a rest parameter.
@@ -38632,13 +39409,13 @@ var ts;
                 if (!node)
                     return false;
                 switch (node.kind) {
-                    case 72 /* Identifier */:
+                    case 73 /* Identifier */:
                         return node.escapedText === "arguments" && ts.isExpressionNode(node);
-                    case 154 /* PropertyDeclaration */:
-                    case 156 /* MethodDeclaration */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
-                        return node.name.kind === 149 /* ComputedPropertyName */
+                    case 155 /* PropertyDeclaration */:
+                    case 157 /* MethodDeclaration */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
+                        return node.name.kind === 150 /* ComputedPropertyName */
                             && traverse(node.name);
                     default:
                         return !ts.nodeStartsNewLexicalEnvironment(node) && !ts.isPartOfTypeNode(node) && !!ts.forEachChild(node, traverse);
@@ -38703,32 +39480,23 @@ var ts;
                         }
                     }
                     signature.resolvedTypePredicate = type && ts.isTypePredicateNode(type) ?
-                        createTypePredicateFromTypePredicateNode(type, signature.declaration) :
+                        createTypePredicateFromTypePredicateNode(type, signature) :
                         jsdocPredicate || noTypePredicate;
                 }
                 ts.Debug.assert(!!signature.resolvedTypePredicate);
             }
             return signature.resolvedTypePredicate === noTypePredicate ? undefined : signature.resolvedTypePredicate;
         }
-        function createTypePredicateFromTypePredicateNode(node, func) {
+        function createTypePredicateFromTypePredicateNode(node, signature) {
             var parameterName = node.parameterName;
             var type = getTypeFromTypeNode(node.type);
-            if (parameterName.kind === 72 /* Identifier */) {
-                return createIdentifierTypePredicate(parameterName.escapedText, getTypePredicateParameterIndex(func.parameters, parameterName), type);
+            if (parameterName.kind === 73 /* Identifier */) {
+                return createIdentifierTypePredicate(parameterName.escapedText, ts.findIndex(signature.parameters, function (p) { return p.escapedName === parameterName.escapedText; }), type);
             }
             else {
                 return createThisTypePredicate(type);
             }
         }
-        function getTypePredicateParameterIndex(parameterList, parameter) {
-            for (var i = 0; i < parameterList.length; i++) {
-                var param = parameterList[i];
-                if (param.name.kind === 72 /* Identifier */ && param.name.escapedText === parameter.escapedText) {
-                    return i;
-                }
-            }
-            return -1;
-        }
         function getReturnTypeOfSignature(signature) {
             if (!signature.resolvedReturnType) {
                 if (!pushTypeResolution(signature, 3 /* ResolvedReturnType */)) {
@@ -38763,7 +39531,7 @@ var ts;
             return signature.resolvedReturnType;
         }
         function getReturnTypeFromAnnotation(declaration) {
-            if (declaration.kind === 157 /* Constructor */) {
+            if (declaration.kind === 158 /* Constructor */) {
                 return getDeclaredTypeOfClassOrInterface(getMergedSymbol(declaration.parent.symbol));
             }
             if (ts.isJSDocConstructSignature(declaration)) {
@@ -38773,12 +39541,12 @@ var ts;
             if (typeNode) {
                 return getTypeFromTypeNode(typeNode);
             }
-            if (declaration.kind === 158 /* GetAccessor */ && !hasNonBindableDynamicName(declaration)) {
+            if (declaration.kind === 159 /* GetAccessor */ && !hasNonBindableDynamicName(declaration)) {
                 var jsDocType = ts.isInJSFile(declaration) && getTypeForDeclarationFromJSDocComment(declaration);
                 if (jsDocType) {
                     return jsDocType;
                 }
-                var setter = ts.getDeclarationOfKind(getSymbolOfNode(declaration), 159 /* SetAccessor */);
+                var setter = ts.getDeclarationOfKind(getSymbolOfNode(declaration), 160 /* SetAccessor */);
                 var setterType = getAnnotatedAccessorType(setter);
                 if (setterType) {
                     return setterType;
@@ -38803,12 +39571,10 @@ var ts;
         function getSignatureInstantiation(signature, typeArguments, isJavascript, inferredTypeParameters) {
             var instantiatedSignature = getSignatureInstantiationWithoutFillingInTypeArguments(signature, fillMissingTypeArguments(typeArguments, signature.typeParameters, getMinTypeArgumentCount(signature.typeParameters), isJavascript));
             if (inferredTypeParameters) {
-                var returnSignature = getSingleCallSignature(getReturnTypeOfSignature(instantiatedSignature));
+                var returnSignature = getSingleCallOrConstructSignature(getReturnTypeOfSignature(instantiatedSignature));
                 if (returnSignature) {
                     var newReturnSignature = cloneSignature(returnSignature);
                     newReturnSignature.typeParameters = inferredTypeParameters;
-                    newReturnSignature.target = returnSignature.target;
-                    newReturnSignature.mapper = returnSignature.mapper;
                     var newInstantiatedSignature = cloneSignature(instantiatedSignature);
                     newInstantiatedSignature.resolvedReturnType = getOrCreateTypeFromSignature(newReturnSignature);
                     return newInstantiatedSignature;
@@ -38858,7 +39624,7 @@ var ts;
             var typeParameters = signature.typeParameters;
             if (typeParameters) {
                 var typeEraser_1 = createTypeEraser(typeParameters);
-                var baseConstraints = ts.map(typeParameters, function (tp) { return instantiateType(getBaseConstraintOfType(tp), typeEraser_1) || emptyObjectType; });
+                var baseConstraints = ts.map(typeParameters, function (tp) { return instantiateType(getBaseConstraintOfType(tp), typeEraser_1) || unknownType; });
                 return instantiateSignature(signature, createTypeMapper(typeParameters, baseConstraints), /*eraseTypeParameters*/ true);
             }
             return signature;
@@ -38869,7 +39635,8 @@ var ts;
             // object type literal or interface (using the new keyword). Each way of declaring a constructor
             // will result in a different declaration kind.
             if (!signature.isolatedSignatureType) {
-                var isConstructor = signature.declaration.kind === 157 /* Constructor */ || signature.declaration.kind === 161 /* ConstructSignature */; // TODO: GH#18217
+                var kind = signature.declaration ? signature.declaration.kind : 0 /* Unknown */;
+                var isConstructor = kind === 158 /* Constructor */ || kind === 162 /* ConstructSignature */ || kind === 167 /* ConstructorType */;
                 var type = createObjectType(16 /* Anonymous */);
                 type.members = emptySymbols;
                 type.properties = ts.emptyArray;
@@ -38883,7 +39650,7 @@ var ts;
             return symbol.members.get("__index" /* Index */);
         }
         function getIndexDeclarationOfSymbol(symbol, kind) {
-            var syntaxKind = kind === 1 /* Number */ ? 135 /* NumberKeyword */ : 138 /* StringKeyword */;
+            var syntaxKind = kind === 1 /* Number */ ? 136 /* NumberKeyword */ : 139 /* StringKeyword */;
             var indexSymbol = getIndexSymbol(symbol);
             if (indexSymbol) {
                 for (var _i = 0, _a = indexSymbol.declarations; _i < _a.length; _i++) {
@@ -38910,7 +39677,7 @@ var ts;
             return undefined;
         }
         function getConstraintDeclaration(type) {
-            var decl = type.symbol && ts.getDeclarationOfKind(type.symbol, 150 /* TypeParameter */);
+            var decl = type.symbol && ts.getDeclarationOfKind(type.symbol, 151 /* TypeParameter */);
             return decl && ts.getEffectiveConstraintOfTypeParameter(decl);
         }
         function getInferredTypeParameterConstraint(typeParameter) {
@@ -38918,13 +39685,13 @@ var ts;
             if (typeParameter.symbol) {
                 for (var _i = 0, _a = typeParameter.symbol.declarations; _i < _a.length; _i++) {
                     var declaration = _a[_i];
-                    if (declaration.parent.kind === 176 /* InferType */) {
+                    if (declaration.parent.kind === 177 /* InferType */) {
                         // When an 'infer T' declaration is immediately contained in a type reference node
                         // (such as 'Foo<infer T>'), T's constraint is inferred from the constraint of the
                         // corresponding type parameter in 'Foo'. When multiple 'infer T' declarations are
                         // present, we form an intersection of the inferred constraint types.
                         var grandParent = declaration.parent.parent;
-                        if (grandParent.kind === 164 /* TypeReference */) {
+                        if (grandParent.kind === 165 /* TypeReference */) {
                             var typeReference = grandParent;
                             var typeParameters = getTypeParametersForTypeReference(typeReference);
                             if (typeParameters) {
@@ -38949,7 +39716,7 @@ var ts;
                         }
                         // When an 'infer T' declaration is immediately contained in a rest parameter
                         // declaration, we infer an 'unknown[]' constraint.
-                        else if (grandParent.kind === 151 /* Parameter */ && grandParent.dotDotDotToken) {
+                        else if (grandParent.kind === 152 /* Parameter */ && grandParent.dotDotDotToken) {
                             inferences = ts.append(inferences, createArrayType(unknownType));
                         }
                     }
@@ -38973,7 +39740,7 @@ var ts;
             return typeParameter.constraint === noConstraintType ? undefined : typeParameter.constraint;
         }
         function getParentSymbolOfTypeParameter(typeParameter) {
-            var tp = ts.getDeclarationOfKind(typeParameter.symbol, 150 /* TypeParameter */);
+            var tp = ts.getDeclarationOfKind(typeParameter.symbol, 151 /* TypeParameter */);
             var host = ts.isJSDocTemplateTag(tp.parent) ? ts.getHostSignatureFromJSDoc(tp.parent) : tp.parent;
             return host && getSymbolOfNode(host);
         }
@@ -39012,7 +39779,7 @@ var ts;
                     result |= ts.getObjectFlags(type);
                 }
             }
-            return result & 917504 /* PropagatingFlags */;
+            return result & 1835008 /* PropagatingFlags */;
         }
         function createTypeReference(target, typeArguments) {
             var id = getTypeListId(typeArguments);
@@ -39106,9 +39873,9 @@ var ts;
         }
         function getTypeReferenceName(node) {
             switch (node.kind) {
-                case 164 /* TypeReference */:
+                case 165 /* TypeReference */:
                     return node.typeName;
-                case 211 /* ExpressionWithTypeArguments */:
+                case 212 /* ExpressionWithTypeArguments */:
                     // We only support expressions that are simple qualified names. For other
                     // expressions this produces undefined.
                     var expr = node.expression;
@@ -39207,13 +39974,22 @@ var ts;
             }
         }
         function getSubstitutionType(typeVariable, substitute) {
+            if (substitute.flags & 3 /* AnyOrUnknown */ || substitute === typeVariable) {
+                return typeVariable;
+            }
+            var id = getTypeId(typeVariable) + ">" + getTypeId(substitute);
+            var cached = substitutionTypes.get(id);
+            if (cached) {
+                return cached;
+            }
             var result = createType(33554432 /* Substitution */);
             result.typeVariable = typeVariable;
             result.substitute = substitute;
+            substitutionTypes.set(id, result);
             return result;
         }
         function isUnaryTupleTypeNode(node) {
-            return node.kind === 170 /* TupleType */ && node.elementTypes.length === 1;
+            return node.kind === 171 /* TupleType */ && node.elementTypes.length === 1;
         }
         function getImpliedConstraint(typeVariable, checkNode, extendsNode) {
             return isUnaryTupleTypeNode(checkNode) && isUnaryTupleTypeNode(extendsNode) ? getImpliedConstraint(typeVariable, checkNode.elementTypes[0], extendsNode.elementTypes[0]) :
@@ -39222,9 +39998,9 @@ var ts;
         }
         function getConstrainedTypeVariable(typeVariable, node) {
             var constraints;
-            while (node && !ts.isStatement(node) && node.kind !== 296 /* JSDocComment */) {
+            while (node && !ts.isStatement(node) && node.kind !== 297 /* JSDocComment */) {
                 var parent = node.parent;
-                if (parent.kind === 175 /* ConditionalType */ && node === parent.trueType) {
+                if (parent.kind === 176 /* ConditionalType */ && node === parent.trueType) {
                     var constraint = getImpliedConstraint(typeVariable, parent.checkType, parent.extendsType);
                     if (constraint) {
                         constraints = ts.append(constraints, constraint);
@@ -39235,7 +40011,7 @@ var ts;
             return constraints ? getSubstitutionType(typeVariable, getIntersectionType(ts.append(constraints, typeVariable))) : typeVariable;
         }
         function isJSDocTypeReference(node) {
-            return !!(node.flags & 2097152 /* JSDoc */) && (node.kind === 164 /* TypeReference */ || node.kind === 183 /* ImportType */);
+            return !!(node.flags & 2097152 /* JSDoc */) && (node.kind === 165 /* TypeReference */ || node.kind === 184 /* ImportType */);
         }
         function checkNoTypeArguments(node, symbol) {
             if (node.typeArguments) {
@@ -39336,9 +40112,9 @@ var ts;
                 for (var _i = 0, declarations_3 = declarations; _i < declarations_3.length; _i++) {
                     var declaration = declarations_3[_i];
                     switch (declaration.kind) {
-                        case 240 /* ClassDeclaration */:
-                        case 241 /* InterfaceDeclaration */:
-                        case 243 /* EnumDeclaration */:
+                        case 241 /* ClassDeclaration */:
+                        case 242 /* InterfaceDeclaration */:
+                        case 244 /* EnumDeclaration */:
                             return declaration;
                     }
                 }
@@ -39402,20 +40178,32 @@ var ts;
             return deferredGlobalAsyncIterableType || (deferredGlobalAsyncIterableType = getGlobalType("AsyncIterable", /*arity*/ 1, reportErrors)) || emptyGenericType;
         }
         function getGlobalAsyncIteratorType(reportErrors) {
-            return deferredGlobalAsyncIteratorType || (deferredGlobalAsyncIteratorType = getGlobalType("AsyncIterator", /*arity*/ 1, reportErrors)) || emptyGenericType;
+            return deferredGlobalAsyncIteratorType || (deferredGlobalAsyncIteratorType = getGlobalType("AsyncIterator", /*arity*/ 3, reportErrors)) || emptyGenericType;
         }
         function getGlobalAsyncIterableIteratorType(reportErrors) {
             return deferredGlobalAsyncIterableIteratorType || (deferredGlobalAsyncIterableIteratorType = getGlobalType("AsyncIterableIterator", /*arity*/ 1, reportErrors)) || emptyGenericType;
         }
+        function getGlobalAsyncGeneratorType(reportErrors) {
+            return deferredGlobalAsyncGeneratorType || (deferredGlobalAsyncGeneratorType = getGlobalType("AsyncGenerator", /*arity*/ 3, reportErrors)) || emptyGenericType;
+        }
         function getGlobalIterableType(reportErrors) {
             return deferredGlobalIterableType || (deferredGlobalIterableType = getGlobalType("Iterable", /*arity*/ 1, reportErrors)) || emptyGenericType;
         }
         function getGlobalIteratorType(reportErrors) {
-            return deferredGlobalIteratorType || (deferredGlobalIteratorType = getGlobalType("Iterator", /*arity*/ 1, reportErrors)) || emptyGenericType;
+            return deferredGlobalIteratorType || (deferredGlobalIteratorType = getGlobalType("Iterator", /*arity*/ 3, reportErrors)) || emptyGenericType;
         }
         function getGlobalIterableIteratorType(reportErrors) {
             return deferredGlobalIterableIteratorType || (deferredGlobalIterableIteratorType = getGlobalType("IterableIterator", /*arity*/ 1, reportErrors)) || emptyGenericType;
         }
+        function getGlobalGeneratorType(reportErrors) {
+            return deferredGlobalGeneratorType || (deferredGlobalGeneratorType = getGlobalType("Generator", /*arity*/ 3, reportErrors)) || emptyGenericType;
+        }
+        function getGlobalIteratorYieldResultType(reportErrors) {
+            return deferredGlobalIteratorYieldResultType || (deferredGlobalIteratorYieldResultType = getGlobalType("IteratorYieldResult", /*arity*/ 1, reportErrors)) || emptyGenericType;
+        }
+        function getGlobalIteratorReturnResultType(reportErrors) {
+            return deferredGlobalIteratorReturnResultType || (deferredGlobalIteratorReturnResultType = getGlobalType("IteratorReturnResult", /*arity*/ 1, reportErrors)) || emptyGenericType;
+        }
         function getGlobalTypeOrUndefined(name, arity) {
             if (arity === void 0) { arity = 0; }
             var symbol = getGlobalSymbol(name, 67897832 /* Type */, /*diagnostic*/ undefined);
@@ -39424,11 +40212,8 @@ var ts;
         function getGlobalExtractSymbol() {
             return deferredGlobalExtractSymbol || (deferredGlobalExtractSymbol = getGlobalSymbol("Extract", 524288 /* TypeAlias */, ts.Diagnostics.Cannot_find_global_type_0)); // TODO: GH#18217
         }
-        function getGlobalExcludeSymbol() {
-            return deferredGlobalExcludeSymbol || (deferredGlobalExcludeSymbol = getGlobalSymbol("Exclude", 524288 /* TypeAlias */, ts.Diagnostics.Cannot_find_global_type_0)); // TODO: GH#18217
-        }
-        function getGlobalPickSymbol() {
-            return deferredGlobalPickSymbol || (deferredGlobalPickSymbol = getGlobalSymbol("Pick", 524288 /* TypeAlias */, ts.Diagnostics.Cannot_find_global_type_0)); // TODO: GH#18217
+        function getGlobalOmitSymbol() {
+            return deferredGlobalOmitSymbol || (deferredGlobalOmitSymbol = getGlobalSymbol("Omit", 524288 /* TypeAlias */, ts.Diagnostics.Cannot_find_global_type_0)); // TODO: GH#18217
         }
         function getGlobalBigIntType(reportErrors) {
             return deferredGlobalBigIntType || (deferredGlobalBigIntType = getGlobalType("BigInt", /*arity*/ 0, reportErrors)) || emptyObjectType;
@@ -39442,18 +40227,9 @@ var ts;
         function createTypedPropertyDescriptorType(propertyType) {
             return createTypeFromGenericGlobalType(getGlobalTypedPropertyDescriptorType(), [propertyType]);
         }
-        function createAsyncIterableType(iteratedType) {
-            return createTypeFromGenericGlobalType(getGlobalAsyncIterableType(/*reportErrors*/ true), [iteratedType]);
-        }
-        function createAsyncIterableIteratorType(iteratedType) {
-            return createTypeFromGenericGlobalType(getGlobalAsyncIterableIteratorType(/*reportErrors*/ true), [iteratedType]);
-        }
         function createIterableType(iteratedType) {
             return createTypeFromGenericGlobalType(getGlobalIterableType(/*reportErrors*/ true), [iteratedType]);
         }
-        function createIterableIteratorType(iteratedType) {
-            return createTypeFromGenericGlobalType(getGlobalIterableIteratorType(/*reportErrors*/ true), [iteratedType]);
-        }
         function createArrayType(elementType, readonly) {
             return createTypeFromGenericGlobalType(readonly ? globalReadonlyArrayType : globalArrayType, [elementType]);
         }
@@ -39465,7 +40241,7 @@ var ts;
             return links.resolvedType;
         }
         function isReadonlyTypeOperator(node) {
-            return ts.isTypeOperatorNode(node) && node.operator === 133 /* ReadonlyKeyword */;
+            return ts.isTypeOperatorNode(node) && node.operator === 134 /* ReadonlyKeyword */;
         }
         // We represent tuple types as type references to synthesized generic interface types created by
         // this function. The types are of the form:
@@ -39540,8 +40316,8 @@ var ts;
             var links = getNodeLinks(node);
             if (!links.resolvedType) {
                 var lastElement = ts.lastOrUndefined(node.elementTypes);
-                var restElement_1 = lastElement && lastElement.kind === 172 /* RestType */ ? lastElement : undefined;
-                var minLength = ts.findLastIndex(node.elementTypes, function (n) { return n.kind !== 171 /* OptionalType */ && n !== restElement_1; }) + 1;
+                var restElement_1 = lastElement && lastElement.kind === 173 /* RestType */ ? lastElement : undefined;
+                var minLength = ts.findLastIndex(node.elementTypes, function (n) { return n.kind !== 172 /* OptionalType */ && n !== restElement_1; }) + 1;
                 var elementTypes = ts.map(node.elementTypes, function (n) {
                     var type = getTypeFromTypeNode(n);
                     return n === restElement_1 && getIndexTypeOfType(type, 1 /* Number */) || type;
@@ -39576,51 +40352,20 @@ var ts;
             }
             return false;
         }
-        // Return true if the given intersection type contains
-        // more than one unit type or,
-        // an object type and a nullable type (null or undefined), or
-        // a string-like type and a type known to be non-string-like, or
-        // a number-like type and a type known to be non-number-like, or
-        // a symbol-like type and a type known to be non-symbol-like, or
-        // a void-like type and a type known to be non-void-like, or
-        // a non-primitive type and a type known to be primitive.
-        function isEmptyIntersectionType(type) {
-            var combined = 0;
-            for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
-                var t = _a[_i];
-                if (t.flags & 109440 /* Unit */ && combined & 109440 /* Unit */) {
-                    return true;
-                }
-                combined |= t.flags;
-                if (combined & 98304 /* Nullable */ && combined & (524288 /* Object */ | 67108864 /* NonPrimitive */) ||
-                    combined & 67108864 /* NonPrimitive */ && combined & (67238908 /* DisjointDomains */ & ~67108864 /* NonPrimitive */) ||
-                    combined & 132 /* StringLike */ && combined & (67238908 /* DisjointDomains */ & ~132 /* StringLike */) ||
-                    combined & 296 /* NumberLike */ && combined & (67238908 /* DisjointDomains */ & ~296 /* NumberLike */) ||
-                    combined & 2112 /* BigIntLike */ && combined & (67238908 /* DisjointDomains */ & ~2112 /* BigIntLike */) ||
-                    combined & 12288 /* ESSymbolLike */ && combined & (67238908 /* DisjointDomains */ & ~12288 /* ESSymbolLike */) ||
-                    combined & 49152 /* VoidLike */ && combined & (67238908 /* DisjointDomains */ & ~49152 /* VoidLike */)) {
-                    return true;
-                }
-            }
-            return false;
-        }
         function addTypeToUnion(typeSet, includes, type) {
             var flags = type.flags;
             if (flags & 1048576 /* Union */) {
                 return addTypesToUnion(typeSet, includes, type.types);
             }
-            // We ignore 'never' types in unions. Likewise, we ignore intersections of unit types as they are
-            // another form of 'never' (in that they have an empty value domain). We could in theory turn
-            // intersections of unit types into 'never' upon construction, but deferring the reduction makes it
-            // easier to reason about their origin.
-            if (!(flags & 131072 /* Never */ || flags & 2097152 /* Intersection */ && isEmptyIntersectionType(type))) {
-                includes |= flags & 1835007 /* IncludesMask */;
+            // We ignore 'never' types in unions
+            if (!(flags & 131072 /* Never */)) {
+                includes |= flags & 68943871 /* IncludesMask */;
                 if (flags & 66846720 /* StructuredOrInstantiable */)
                     includes |= 262144 /* IncludesStructuredOrInstantiable */;
                 if (type === wildcardType)
                     includes |= 4194304 /* IncludesWildcard */;
                 if (!strictNullChecks && flags & 98304 /* Nullable */) {
-                    if (!(ts.getObjectFlags(type) & 131072 /* ContainsWideningType */))
+                    if (!(ts.getObjectFlags(type) & 262144 /* ContainsWideningType */))
                         includes |= 2097152 /* IncludesNonWideningType */;
                 }
                 else {
@@ -39747,7 +40492,7 @@ var ts;
                             neverType;
                 }
             }
-            return getUnionTypeFromSortedList(typeSet, includes & 66994211 /* NotPrimitiveUnion */ ? 0 : 65536 /* PrimitiveUnion */, aliasSymbol, aliasTypeArguments);
+            return getUnionTypeFromSortedList(typeSet, includes & 66994211 /* NotPrimitiveUnion */ ? 0 : 131072 /* PrimitiveUnion */, aliasSymbol, aliasTypeArguments);
         }
         function getUnionTypePredicate(signatures) {
             var first;
@@ -39825,18 +40570,23 @@ var ts;
             if (isEmptyAnonymousObjectType(type)) {
                 if (!(includes & 8388608 /* IncludesEmptyObject */)) {
                     includes |= 8388608 /* IncludesEmptyObject */;
-                    typeSet.push(type);
+                    typeSet.set(type.id.toString(), type);
                 }
             }
             else {
-                includes |= flags & 1835007 /* IncludesMask */;
                 if (flags & 3 /* AnyOrUnknown */) {
                     if (type === wildcardType)
                         includes |= 4194304 /* IncludesWildcard */;
                 }
-                else if ((strictNullChecks || !(flags & 98304 /* Nullable */)) && !ts.contains(typeSet, type)) {
-                    typeSet.push(type);
+                else if ((strictNullChecks || !(flags & 98304 /* Nullable */)) && !typeSet.has(type.id.toString())) {
+                    if (type.flags & 109440 /* Unit */ && includes & 109440 /* Unit */) {
+                        // We have seen two distinct unit types which means we should reduce to an
+                        // empty intersection. Adding TypeFlags.NonPrimitive causes that to happen.
+                        includes |= 67108864 /* NonPrimitive */;
+                    }
+                    typeSet.set(type.id.toString(), type);
                 }
+                includes |= flags & 68943871 /* IncludesMask */;
             }
             return includes;
         }
@@ -39887,7 +40637,7 @@ var ts;
         // other unions and return true. Otherwise, do nothing and return false.
         function intersectUnionsOfPrimitiveTypes(types) {
             var unionTypes;
-            var index = ts.findIndex(types, function (t) { return !!(ts.getObjectFlags(t) & 65536 /* PrimitiveUnion */); });
+            var index = ts.findIndex(types, function (t) { return !!(ts.getObjectFlags(t) & 131072 /* PrimitiveUnion */); });
             if (index < 0) {
                 return false;
             }
@@ -39896,7 +40646,7 @@ var ts;
             // the unionTypes array.
             while (i < types.length) {
                 var t = types[i];
-                if (ts.getObjectFlags(t) & 65536 /* PrimitiveUnion */) {
+                if (ts.getObjectFlags(t) & 131072 /* PrimitiveUnion */) {
                     (unionTypes || (unionTypes = [types[index]])).push(t);
                     ts.orderedRemoveItemAt(types, i);
                 }
@@ -39925,9 +40675,17 @@ var ts;
                 }
             }
             // Finally replace the first union with the result
-            types[index] = getUnionTypeFromSortedList(result, 65536 /* PrimitiveUnion */);
+            types[index] = getUnionTypeFromSortedList(result, 131072 /* PrimitiveUnion */);
             return true;
         }
+        function createIntersectionType(types, aliasSymbol, aliasTypeArguments) {
+            var result = createType(2097152 /* Intersection */);
+            result.objectFlags = getPropagatingFlagsOfTypes(types, /*excludeKinds*/ 98304 /* Nullable */);
+            result.types = types;
+            result.aliasSymbol = aliasSymbol; // See comment in `getUnionTypeFromSortedList`.
+            result.aliasTypeArguments = aliasTypeArguments;
+            return result;
+        }
         // We normalize combinations of intersection and union types based on the distributive property of the '&'
         // operator. Specifically, because X & (A | B) is equivalent to X & A | X & B, we can transform intersection
         // types with union type constituents into equivalent union types with intersection type constituents and
@@ -39939,9 +40697,26 @@ var ts;
         // Also, unlike union types, the order of the constituent types is preserved in order that overload resolution
         // for intersections of types with signatures can be deterministic.
         function getIntersectionType(types, aliasSymbol, aliasTypeArguments) {
-            var typeSet = [];
-            var includes = addTypesToIntersection(typeSet, 0, types);
-            if (includes & 131072 /* Never */) {
+            var typeMembershipMap = ts.createMap();
+            var includes = addTypesToIntersection(typeMembershipMap, 0, types);
+            var typeSet = ts.arrayFrom(typeMembershipMap.values());
+            // An intersection type is considered empty if it contains
+            // the type never, or
+            // more than one unit type or,
+            // an object type and a nullable type (null or undefined), or
+            // a string-like type and a type known to be non-string-like, or
+            // a number-like type and a type known to be non-number-like, or
+            // a symbol-like type and a type known to be non-symbol-like, or
+            // a void-like type and a type known to be non-void-like, or
+            // a non-primitive type and a type known to be primitive.
+            if (includes & 131072 /* Never */ ||
+                strictNullChecks && includes & 98304 /* Nullable */ && includes & (524288 /* Object */ | 67108864 /* NonPrimitive */ | 8388608 /* IncludesEmptyObject */) ||
+                includes & 67108864 /* NonPrimitive */ && includes & (67238908 /* DisjointDomains */ & ~67108864 /* NonPrimitive */) ||
+                includes & 132 /* StringLike */ && includes & (67238908 /* DisjointDomains */ & ~132 /* StringLike */) ||
+                includes & 296 /* NumberLike */ && includes & (67238908 /* DisjointDomains */ & ~296 /* NumberLike */) ||
+                includes & 2112 /* BigIntLike */ && includes & (67238908 /* DisjointDomains */ & ~2112 /* BigIntLike */) ||
+                includes & 12288 /* ESSymbolLike */ && includes & (67238908 /* DisjointDomains */ & ~12288 /* ESSymbolLike */) ||
+                includes & 49152 /* VoidLike */ && includes & (67238908 /* DisjointDomains */ & ~49152 /* VoidLike */)) {
                 return neverType;
             }
             if (includes & 1 /* Any */) {
@@ -39965,30 +40740,36 @@ var ts;
             if (typeSet.length === 1) {
                 return typeSet[0];
             }
-            if (includes & 1048576 /* Union */) {
-                if (intersectUnionsOfPrimitiveTypes(typeSet)) {
-                    // When the intersection creates a reduced set (which might mean that *all* union types have
-                    // disappeared), we restart the operation to get a new set of combined flags. Once we have
-                    // reduced we'll never reduce again, so this occurs at most once.
-                    return getIntersectionType(typeSet, aliasSymbol, aliasTypeArguments);
-                }
-                // We are attempting to construct a type of the form X & (A | B) & Y. Transform this into a type of
-                // the form X & A & Y | X & B & Y and recursively reduce until no union type constituents remain.
-                var unionIndex_1 = ts.findIndex(typeSet, function (t) { return (t.flags & 1048576 /* Union */) !== 0; });
-                var unionType = typeSet[unionIndex_1];
-                return getUnionType(ts.map(unionType.types, function (t) { return getIntersectionType(ts.replaceElement(typeSet, unionIndex_1, t)); }), 1 /* Literal */, aliasSymbol, aliasTypeArguments);
-            }
             var id = getTypeListId(typeSet);
-            var type = intersectionTypes.get(id);
-            if (!type) {
-                type = createType(2097152 /* Intersection */);
-                intersectionTypes.set(id, type);
-                type.objectFlags = getPropagatingFlagsOfTypes(typeSet, /*excludeKinds*/ 98304 /* Nullable */);
-                type.types = typeSet;
-                type.aliasSymbol = aliasSymbol; // See comment in `getUnionTypeFromSortedList`.
-                type.aliasTypeArguments = aliasTypeArguments;
+            var result = intersectionTypes.get(id);
+            if (!result) {
+                if (includes & 1048576 /* Union */) {
+                    if (intersectUnionsOfPrimitiveTypes(typeSet)) {
+                        // When the intersection creates a reduced set (which might mean that *all* union types have
+                        // disappeared), we restart the operation to get a new set of combined flags. Once we have
+                        // reduced we'll never reduce again, so this occurs at most once.
+                        result = getIntersectionType(typeSet, aliasSymbol, aliasTypeArguments);
+                    }
+                    else {
+                        // We are attempting to construct a type of the form X & (A | B) & Y. Transform this into a type of
+                        // the form X & A & Y | X & B & Y and recursively reduce until no union type constituents remain.
+                        // If the estimated size of the resulting union type exceeds 100000 constituents, report an error.
+                        var size = ts.reduceLeft(typeSet, function (n, t) { return n * (t.flags & 1048576 /* Union */ ? t.types.length : 1); }, 1);
+                        if (size >= 100000) {
+                            error(currentNode, ts.Diagnostics.Expression_produces_a_union_type_that_is_too_complex_to_represent);
+                            return errorType;
+                        }
+                        var unionIndex_1 = ts.findIndex(typeSet, function (t) { return (t.flags & 1048576 /* Union */) !== 0; });
+                        var unionType = typeSet[unionIndex_1];
+                        result = getUnionType(ts.map(unionType.types, function (t) { return getIntersectionType(ts.replaceElement(typeSet, unionIndex_1, t)); }), 1 /* Literal */, aliasSymbol, aliasTypeArguments);
+                    }
+                }
+                else {
+                    result = createIntersectionType(typeSet, aliasSymbol, aliasTypeArguments);
+                }
+                intersectionTypes.set(id, result);
             }
-            return type;
+            return result;
         }
         function getTypeFromIntersectionTypeNode(node) {
             var links = getNodeLinks(node);
@@ -40044,18 +40825,19 @@ var ts;
             var numberIndexInfo = getIndexInfoOfType(type, 1 /* Number */);
             return numberIndexInfo !== enumNumberIndexInfo ? numberIndexInfo : undefined;
         }
-        function getIndexType(type, stringsOnly) {
+        function getIndexType(type, stringsOnly, noIndexSignatures) {
             if (stringsOnly === void 0) { stringsOnly = keyofStringsOnly; }
-            return type.flags & 1048576 /* Union */ ? getIntersectionType(ts.map(type.types, function (t) { return getIndexType(t, stringsOnly); })) :
-                type.flags & 2097152 /* Intersection */ ? getUnionType(ts.map(type.types, function (t) { return getIndexType(t, stringsOnly); })) :
+            return type.flags & 1048576 /* Union */ ? getIntersectionType(ts.map(type.types, function (t) { return getIndexType(t, stringsOnly, noIndexSignatures); })) :
+                type.flags & 2097152 /* Intersection */ ? getUnionType(ts.map(type.types, function (t) { return getIndexType(t, stringsOnly, noIndexSignatures); })) :
                     maybeTypeOfKind(type, 58982400 /* InstantiableNonPrimitive */) ? getIndexTypeForGenericType(type, stringsOnly) :
-                        ts.getObjectFlags(type) & 32 /* Mapped */ ? getConstraintTypeFromMappedType(type) :
+                        ts.getObjectFlags(type) & 32 /* Mapped */ ? filterType(getConstraintTypeFromMappedType(type), function (t) { return !(noIndexSignatures && t.flags & (1 /* Any */ | 4 /* String */)); }) :
                             type === wildcardType ? wildcardType :
-                                type.flags & 1 /* Any */ ? keyofConstraintType :
-                                    stringsOnly ? getIndexInfoOfType(type, 0 /* String */) ? stringType : getLiteralTypeFromProperties(type, 128 /* StringLiteral */) :
-                                        getIndexInfoOfType(type, 0 /* String */) ? getUnionType([stringType, numberType, getLiteralTypeFromProperties(type, 8192 /* UniqueESSymbol */)]) :
-                                            getNonEnumNumberIndexInfo(type) ? getUnionType([numberType, getLiteralTypeFromProperties(type, 128 /* StringLiteral */ | 8192 /* UniqueESSymbol */)]) :
-                                                getLiteralTypeFromProperties(type, 8576 /* StringOrNumberLiteralOrUnique */);
+                                type.flags & 2 /* Unknown */ ? neverType :
+                                    type.flags & (1 /* Any */ | 131072 /* Never */) ? keyofConstraintType :
+                                        stringsOnly ? !noIndexSignatures && getIndexInfoOfType(type, 0 /* String */) ? stringType : getLiteralTypeFromProperties(type, 128 /* StringLiteral */) :
+                                            !noIndexSignatures && getIndexInfoOfType(type, 0 /* String */) ? getUnionType([stringType, numberType, getLiteralTypeFromProperties(type, 8192 /* UniqueESSymbol */)]) :
+                                                getNonEnumNumberIndexInfo(type) ? getUnionType([numberType, getLiteralTypeFromProperties(type, 128 /* StringLiteral */ | 8192 /* UniqueESSymbol */)]) :
+                                                    getLiteralTypeFromProperties(type, 8576 /* StringOrNumberLiteralOrUnique */);
         }
         function getExtractStringType(type) {
             if (keyofStringsOnly) {
@@ -40072,15 +40854,15 @@ var ts;
             var links = getNodeLinks(node);
             if (!links.resolvedType) {
                 switch (node.operator) {
-                    case 129 /* KeyOfKeyword */:
+                    case 130 /* KeyOfKeyword */:
                         links.resolvedType = getIndexType(getTypeFromTypeNode(node.type));
                         break;
-                    case 142 /* UniqueKeyword */:
-                        links.resolvedType = node.type.kind === 139 /* SymbolKeyword */
+                    case 143 /* UniqueKeyword */:
+                        links.resolvedType = node.type.kind === 140 /* SymbolKeyword */
                             ? getESSymbolLikeTypeForNode(ts.walkUpParenthesizedTypes(node.parent))
                             : errorType;
                         break;
-                    case 133 /* ReadonlyKeyword */:
+                    case 134 /* ReadonlyKeyword */:
                         links.resolvedType = getTypeFromTypeNode(node.type);
                         break;
                 }
@@ -40120,9 +40902,9 @@ var ts;
             }
             return false;
         }
-        function getPropertyTypeForIndexType(objectType, indexType, accessNode, cacheSymbol, missingType) {
-            var accessExpression = accessNode && accessNode.kind === 190 /* ElementAccessExpression */ ? accessNode : undefined;
-            var propName = isTypeUsableAsPropertyName(indexType) ?
+        function getPropertyNameFromIndex(indexType, accessNode) {
+            var accessExpression = accessNode && accessNode.kind === 191 /* ElementAccessExpression */ ? accessNode : undefined;
+            return isTypeUsableAsPropertyName(indexType) ?
                 getPropertyNameFromType(indexType) :
                 accessExpression && checkThatExpressionIsProperSymbolReference(accessExpression.argumentExpression, indexType, /*reportError*/ false) ?
                     ts.getPropertyNameForKnownSymbolName(ts.idText(accessExpression.argumentExpression.name)) :
@@ -40130,16 +40912,20 @@ var ts;
                         // late bound names are handled in the first branch, so here we only need to handle normal names
                         ts.getPropertyNameForPropertyNameNode(accessNode) :
                         undefined;
+        }
+        function getPropertyTypeForIndexType(originalObjectType, objectType, indexType, fullIndexType, suppressNoImplicitAnyError, accessNode, accessFlags) {
+            var accessExpression = accessNode && accessNode.kind === 191 /* ElementAccessExpression */ ? accessNode : undefined;
+            var propName = getPropertyNameFromIndex(indexType, accessNode);
             if (propName !== undefined) {
                 var prop = getPropertyOfType(objectType, propName);
                 if (prop) {
                     if (accessExpression) {
-                        markPropertyAsReferenced(prop, accessExpression, /*isThisAccess*/ accessExpression.expression.kind === 100 /* ThisKeyword */);
+                        markPropertyAsReferenced(prop, accessExpression, /*isThisAccess*/ accessExpression.expression.kind === 101 /* ThisKeyword */);
                         if (ts.isAssignmentTarget(accessExpression) && (isReferenceToReadonlyEntity(accessExpression, prop) || isReferenceThroughNamespaceImport(accessExpression))) {
                             error(accessExpression.argumentExpression, ts.Diagnostics.Cannot_assign_to_0_because_it_is_a_read_only_property, symbolToString(prop));
-                            return missingType;
+                            return undefined;
                         }
-                        if (cacheSymbol) {
+                        if (accessFlags & 4 /* CacheSymbol */) {
                             getNodeLinks(accessNode).resolvedSymbol = prop;
                         }
                     }
@@ -40149,7 +40935,7 @@ var ts;
                         propType;
                 }
                 if (everyType(objectType, isTupleType) && isNumericLiteralName(propName) && +propName >= 0) {
-                    if (accessNode && everyType(objectType, function (t) { return !t.target.hasRestElement; })) {
+                    if (accessNode && everyType(objectType, function (t) { return !t.target.hasRestElement; }) && !(accessFlags & 8 /* NoTupleBoundsCheck */)) {
                         var indexNode = getIndexNodeForAccessExpression(accessNode);
                         if (isTupleType(objectType)) {
                             error(indexNode, ts.Diagnostics.Tuple_type_0_of_length_1_has_no_element_at_index_2, typeToString(objectType), getTypeReferenceArity(objectType), ts.unescapeLeadingUnderscores(propName));
@@ -40158,6 +40944,7 @@ var ts;
                             error(indexNode, ts.Diagnostics.Property_0_does_not_exist_on_type_1, ts.unescapeLeadingUnderscores(propName), typeToString(objectType));
                         }
                     }
+                    errorIfWritingToReadonlyIndex(getIndexInfoOfType(objectType, 1 /* Number */));
                     return mapType(objectType, function (t) { return getRestTypeOfTupleType(t) || undefinedType; });
                 }
             }
@@ -40165,17 +40952,21 @@ var ts;
                 if (objectType.flags & (1 /* Any */ | 131072 /* Never */)) {
                     return objectType;
                 }
-                var indexInfo = isTypeAssignableToKind(indexType, 296 /* NumberLike */) && getIndexInfoOfType(objectType, 1 /* Number */) ||
-                    getIndexInfoOfType(objectType, 0 /* String */) ||
-                    undefined;
+                var stringIndexInfo = getIndexInfoOfType(objectType, 0 /* String */);
+                var indexInfo = isTypeAssignableToKind(indexType, 296 /* NumberLike */) && getIndexInfoOfType(objectType, 1 /* Number */) || stringIndexInfo;
                 if (indexInfo) {
+                    if (accessFlags & 1 /* NoIndexSignatures */ && indexInfo === stringIndexInfo) {
+                        if (accessExpression) {
+                            error(accessExpression, ts.Diagnostics.Type_0_cannot_be_used_to_index_type_1, typeToString(indexType), typeToString(originalObjectType));
+                        }
+                        return undefined;
+                    }
                     if (accessNode && !isTypeAssignableToKind(indexType, 4 /* String */ | 8 /* Number */)) {
                         var indexNode = getIndexNodeForAccessExpression(accessNode);
                         error(indexNode, ts.Diagnostics.Type_0_cannot_be_used_as_an_index_type, typeToString(indexType));
+                        return indexInfo.type;
                     }
-                    else if (accessExpression && indexInfo.isReadonly && (ts.isAssignmentTarget(accessExpression) || ts.isDeleteTarget(accessExpression))) {
-                        error(accessExpression, ts.Diagnostics.Index_signature_in_type_0_only_permits_reading, typeToString(objectType));
-                    }
+                    errorIfWritingToReadonlyIndex(indexInfo);
                     return indexInfo.type;
                 }
                 if (indexType.flags & 131072 /* Never */) {
@@ -40185,7 +40976,10 @@ var ts;
                     return anyType;
                 }
                 if (accessExpression && !isConstEnumObjectType(objectType)) {
-                    if (noImplicitAny && !compilerOptions.suppressImplicitAnyIndexErrors) {
+                    if (objectType.symbol === globalThisSymbol && propName !== undefined && globalThisSymbol.exports.has(propName) && (globalThisSymbol.exports.get(propName).flags & 418 /* BlockScoped */)) {
+                        error(accessExpression, ts.Diagnostics.Property_0_does_not_exist_on_type_1, ts.unescapeLeadingUnderscores(propName), typeToString(objectType));
+                    }
+                    else if (noImplicitAny && !compilerOptions.suppressImplicitAnyIndexErrors && !suppressNoImplicitAnyError) {
                         if (propName !== undefined && typeHasStaticProperty(propName, objectType)) {
                             error(accessExpression, ts.Diagnostics.Property_0_is_a_static_member_of_type_1, propName, typeToString(objectType));
                         }
@@ -40200,11 +40994,35 @@ var ts;
                                 }
                             }
                             else {
-                                error(accessExpression, ts.Diagnostics.Element_implicitly_has_an_any_type_because_type_0_has_no_index_signature, typeToString(objectType));
+                                var suggestion_1 = getSuggestionForNonexistentIndexSignature(objectType, accessExpression);
+                                if (suggestion_1 !== undefined) {
+                                    error(accessExpression, ts.Diagnostics.Element_implicitly_has_an_any_type_because_type_0_has_no_index_signature_Did_you_mean_to_call_1, typeToString(objectType), suggestion_1);
+                                }
+                                else {
+                                    var errorInfo = void 0;
+                                    if (indexType.flags & 1024 /* EnumLiteral */) {
+                                        errorInfo = ts.chainDiagnosticMessages(/* details */ undefined, ts.Diagnostics.Property_0_does_not_exist_on_type_1, "[" + typeToString(indexType) + "]", typeToString(objectType));
+                                    }
+                                    else if (indexType.flags & 8192 /* UniqueESSymbol */) {
+                                        var symbolName_2 = getFullyQualifiedName(indexType.symbol, accessExpression);
+                                        errorInfo = ts.chainDiagnosticMessages(/* details */ undefined, ts.Diagnostics.Property_0_does_not_exist_on_type_1, "[" + symbolName_2 + "]", typeToString(objectType));
+                                    }
+                                    else if (indexType.flags & 128 /* StringLiteral */) {
+                                        errorInfo = ts.chainDiagnosticMessages(/* details */ undefined, ts.Diagnostics.Property_0_does_not_exist_on_type_1, indexType.value, typeToString(objectType));
+                                    }
+                                    else if (indexType.flags & 256 /* NumberLiteral */) {
+                                        errorInfo = ts.chainDiagnosticMessages(/* details */ undefined, ts.Diagnostics.Property_0_does_not_exist_on_type_1, indexType.value, typeToString(objectType));
+                                    }
+                                    else if (indexType.flags & (8 /* Number */ | 4 /* String */)) {
+                                        errorInfo = ts.chainDiagnosticMessages(/* details */ undefined, ts.Diagnostics.No_index_signature_with_a_parameter_of_type_0_was_found_on_type_1, typeToString(indexType), typeToString(objectType));
+                                    }
+                                    errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.Element_implicitly_has_an_any_type_because_expression_of_type_0_can_t_be_used_to_index_type_1, typeToString(fullIndexType), typeToString(objectType));
+                                    diagnostics.add(ts.createDiagnosticForNodeFromMessageChain(accessExpression, errorInfo));
+                                }
                             }
                         }
                     }
-                    return missingType;
+                    return undefined;
                 }
             }
             if (isJSLiteralType(objectType)) {
@@ -40225,14 +41043,19 @@ var ts;
             if (isTypeAny(indexType)) {
                 return indexType;
             }
-            return missingType;
+            return undefined;
+            function errorIfWritingToReadonlyIndex(indexInfo) {
+                if (indexInfo && indexInfo.isReadonly && accessExpression && (ts.isAssignmentTarget(accessExpression) || ts.isDeleteTarget(accessExpression))) {
+                    error(accessExpression, ts.Diagnostics.Index_signature_in_type_0_only_permits_reading, typeToString(objectType));
+                }
+            }
         }
         function getIndexNodeForAccessExpression(accessNode) {
-            return accessNode.kind === 190 /* ElementAccessExpression */
+            return accessNode.kind === 191 /* ElementAccessExpression */
                 ? accessNode.argumentExpression
-                : accessNode.kind === 180 /* IndexedAccessType */
+                : accessNode.kind === 181 /* IndexedAccessType */
                     ? accessNode.indexType
-                    : accessNode.kind === 149 /* ComputedPropertyName */
+                    : accessNode.kind === 150 /* ComputedPropertyName */
                         ? accessNode.expression
                         : accessNode;
         }
@@ -40242,64 +41065,124 @@ var ts;
         function isGenericIndexType(type) {
             return maybeTypeOfKind(type, 58982400 /* InstantiableNonPrimitive */ | 4194304 /* Index */);
         }
-        function getSimplifiedType(type) {
-            return type.flags & 8388608 /* IndexedAccess */ ? getSimplifiedIndexedAccessType(type) : type;
+        function isThisTypeParameter(type) {
+            return !!(type.flags & 262144 /* TypeParameter */ && type.isThisType);
         }
-        function distributeIndexOverObjectType(objectType, indexType) {
-            // (T | U)[K] -> T[K] | U[K]
-            if (objectType.flags & 1048576 /* Union */) {
-                return mapType(objectType, function (t) { return getSimplifiedType(getIndexedAccessType(t, indexType)); });
-            }
+        function getSimplifiedType(type, writing) {
+            return type.flags & 8388608 /* IndexedAccess */ ? getSimplifiedIndexedAccessType(type, writing) :
+                type.flags & 16777216 /* Conditional */ ? getSimplifiedConditionalType(type, writing) :
+                    type;
+        }
+        function distributeIndexOverObjectType(objectType, indexType, writing) {
+            // (T | U)[K] -> T[K] | U[K] (reading)
+            // (T | U)[K] -> T[K] & U[K] (writing)
             // (T & U)[K] -> T[K] & U[K]
-            if (objectType.flags & 2097152 /* Intersection */) {
-                return getIntersectionType(ts.map(objectType.types, function (t) { return getSimplifiedType(getIndexedAccessType(t, indexType)); }));
+            if (objectType.flags & 3145728 /* UnionOrIntersection */) {
+                var types = ts.map(objectType.types, function (t) { return getSimplifiedType(getIndexedAccessType(t, indexType), writing); });
+                return objectType.flags & 2097152 /* Intersection */ || writing ? getIntersectionType(types) : getUnionType(types);
+            }
+        }
+        function distributeObjectOverIndexType(objectType, indexType, writing) {
+            // T[A | B] -> T[A] | T[B] (reading)
+            // T[A | B] -> T[A] & T[B] (writing)
+            if (indexType.flags & 1048576 /* Union */) {
+                var types = ts.map(indexType.types, function (t) { return getSimplifiedType(getIndexedAccessType(objectType, t), writing); });
+                return writing ? getIntersectionType(types) : getUnionType(types);
             }
         }
         // Transform an indexed access to a simpler form, if possible. Return the simpler form, or return
-        // the type itself if no transformation is possible.
-        function getSimplifiedIndexedAccessType(type) {
-            if (type.simplified) {
-                return type.simplified === circularConstraintType ? type : type.simplified;
+        // the type itself if no transformation is possible. The writing flag indicates that the type is
+        // the target of an assignment.
+        function getSimplifiedIndexedAccessType(type, writing) {
+            var cache = writing ? "simplifiedForWriting" : "simplifiedForReading";
+            if (type[cache]) {
+                return type[cache] === circularConstraintType ? type : type[cache];
             }
-            type.simplified = circularConstraintType;
+            type[cache] = circularConstraintType;
             // We recursively simplify the object type as it may in turn be an indexed access type. For example, with
             // '{ [P in T]: { [Q in U]: number } }[T][U]' we want to first simplify the inner indexed access type.
-            var objectType = getSimplifiedType(type.objectType);
-            var indexType = getSimplifiedType(type.indexType);
-            // T[A | B] -> T[A] | T[B]
-            if (indexType.flags & 1048576 /* Union */) {
-                return type.simplified = mapType(indexType, function (t) { return getSimplifiedType(getIndexedAccessType(objectType, t)); });
+            var objectType = getSimplifiedType(type.objectType, writing);
+            var indexType = getSimplifiedType(type.indexType, writing);
+            // T[A | B] -> T[A] | T[B] (reading)
+            // T[A | B] -> T[A] & T[B] (writing)
+            var distributedOverIndex = distributeObjectOverIndexType(objectType, indexType, writing);
+            if (distributedOverIndex) {
+                return type[cache] = distributedOverIndex;
             }
             // Only do the inner distributions if the index can no longer be instantiated to cause index distribution again
             if (!(indexType.flags & 63176704 /* Instantiable */)) {
-                var simplified = distributeIndexOverObjectType(objectType, indexType);
-                if (simplified) {
-                    return type.simplified = simplified;
+                // (T | U)[K] -> T[K] | U[K] (reading)
+                // (T | U)[K] -> T[K] & U[K] (writing)
+                // (T & U)[K] -> T[K] & U[K]
+                var distributedOverObject = distributeIndexOverObjectType(objectType, indexType, writing);
+                if (distributedOverObject) {
+                    return type[cache] = distributedOverObject;
                 }
             }
-            // So ultimately:
+            // So ultimately (reading):
             // ((A & B) | C)[K1 | K2] -> ((A & B) | C)[K1] | ((A & B) | C)[K2] -> (A & B)[K1] | C[K1] | (A & B)[K2] | C[K2] -> (A[K1] & B[K1]) | C[K1] | (A[K2] & B[K2]) | C[K2]
             // If the object type is a mapped type { [P in K]: E }, where K is generic, instantiate E using a mapper
             // that substitutes the index type for P. For example, for an index access { [P in K]: Box<T[P]> }[X], we
             // construct the type Box<T[X]>.
             if (isGenericMappedType(objectType)) {
-                var mapper = createTypeMapper([getTypeParameterFromMappedType(objectType)], [type.indexType]);
-                var templateMapper = combineTypeMappers(objectType.mapper, mapper);
-                return type.simplified = mapType(instantiateType(getTemplateTypeFromMappedType(objectType), templateMapper), getSimplifiedType);
+                return type[cache] = mapType(substituteIndexedMappedType(objectType, type.indexType), function (t) { return getSimplifiedType(t, writing); });
             }
-            return type.simplified = type;
+            return type[cache] = type;
         }
-        function getIndexedAccessType(objectType, indexType, accessNode, missingType) {
-            if (missingType === void 0) { missingType = accessNode ? errorType : unknownType; }
+        function getSimplifiedConditionalType(type, writing) {
+            var checkType = type.checkType;
+            var extendsType = type.extendsType;
+            var trueType = getTrueTypeFromConditionalType(type);
+            var falseType = getFalseTypeFromConditionalType(type);
+            // Simplifications for types of the form `T extends U ? T : never` and `T extends U ? never : T`.
+            if (falseType.flags & 131072 /* Never */ && getActualTypeVariable(trueType) === getActualTypeVariable(checkType)) {
+                if (checkType.flags & 1 /* Any */ || isTypeAssignableTo(getRestrictiveInstantiation(checkType), getRestrictiveInstantiation(extendsType))) { // Always true
+                    return getSimplifiedType(trueType, writing);
+                }
+                else if (isIntersectionEmpty(checkType, extendsType)) { // Always false
+                    return neverType;
+                }
+            }
+            else if (trueType.flags & 131072 /* Never */ && getActualTypeVariable(falseType) === getActualTypeVariable(checkType)) {
+                if (!(checkType.flags & 1 /* Any */) && isTypeAssignableTo(getRestrictiveInstantiation(checkType), getRestrictiveInstantiation(extendsType))) { // Always true
+                    return neverType;
+                }
+                else if (checkType.flags & 1 /* Any */ || isIntersectionEmpty(checkType, extendsType)) { // Always false
+                    return getSimplifiedType(falseType, writing);
+                }
+            }
+            return type;
+        }
+        /**
+         * Invokes union simplification logic to determine if an intersection is considered empty as a union constituent
+         */
+        function isIntersectionEmpty(type1, type2) {
+            return !!(getUnionType([intersectTypes(type1, type2), neverType]).flags & 131072 /* Never */);
+        }
+        function substituteIndexedMappedType(objectType, index) {
+            var mapper = createTypeMapper([getTypeParameterFromMappedType(objectType)], [index]);
+            var templateMapper = combineTypeMappers(objectType.mapper, mapper);
+            return instantiateType(getTemplateTypeFromMappedType(objectType), templateMapper);
+        }
+        function getIndexedAccessType(objectType, indexType, accessNode) {
+            return getIndexedAccessTypeOrUndefined(objectType, indexType, accessNode, 0 /* None */) || (accessNode ? errorType : unknownType);
+        }
+        function getIndexedAccessTypeOrUndefined(objectType, indexType, accessNode, accessFlags) {
+            if (accessFlags === void 0) { accessFlags = 0 /* None */; }
             if (objectType === wildcardType || indexType === wildcardType) {
                 return wildcardType;
             }
+            // If the object type has a string index signature and no other members we know that the result will
+            // always be the type of that index signature and we can simplify accordingly.
+            if (isStringIndexSignatureOnlyType(objectType) && !(indexType.flags & 98304 /* Nullable */) && isTypeAssignableToKind(indexType, 4 /* String */ | 8 /* Number */)) {
+                indexType = stringType;
+            }
             // If the index type is generic, or if the object type is generic and doesn't originate in an expression,
             // we are performing a higher-order index access where we cannot meaningfully access the properties of the
             // object type. Note that for a generic T and a non-generic K, we eagerly resolve T[K] if it originates in
             // an expression. This is to preserve backwards compatibility. For example, an element access 'this["foo"]'
             // has always been resolved eagerly using the constraint type of 'this' at the given location.
-            if (isGenericIndexType(indexType) || !(accessNode && accessNode.kind !== 180 /* IndexedAccessType */) && isGenericObjectType(objectType)) {
+            if (isGenericIndexType(indexType) || !(accessNode && accessNode.kind !== 181 /* IndexedAccessType */) && isGenericObjectType(objectType)) {
                 if (objectType.flags & 3 /* AnyOrUnknown */) {
                     return objectType;
                 }
@@ -40320,25 +41203,25 @@ var ts;
                 var wasMissingProp = false;
                 for (var _i = 0, _a = indexType.types; _i < _a.length; _i++) {
                     var t = _a[_i];
-                    var propType = getPropertyTypeForIndexType(apparentObjectType, t, accessNode, /*cacheSymbol*/ false, missingType);
-                    if (propType === missingType) {
-                        if (!accessNode) {
-                            // If there's no error node, we can immeditely stop, since error reporting is off
-                            return missingType;
-                        }
-                        else {
-                            // Otherwise we set a flag and return at the end of the loop so we still mark all errors
-                            wasMissingProp = true;
-                        }
+                    var propType = getPropertyTypeForIndexType(objectType, apparentObjectType, t, indexType, wasMissingProp, accessNode, accessFlags);
+                    if (propType) {
+                        propTypes.push(propType);
+                    }
+                    else if (!accessNode) {
+                        // If there's no error node, we can immeditely stop, since error reporting is off
+                        return undefined;
+                    }
+                    else {
+                        // Otherwise we set a flag and return at the end of the loop so we still mark all errors
+                        wasMissingProp = true;
                     }
-                    propTypes.push(propType);
                 }
                 if (wasMissingProp) {
-                    return missingType;
+                    return undefined;
                 }
-                return getUnionType(propTypes);
+                return accessFlags & 2 /* Writing */ ? getIntersectionType(propTypes) : getUnionType(propTypes);
             }
-            return getPropertyTypeForIndexType(apparentObjectType, indexType, accessNode, /*cacheSymbol*/ true, missingType);
+            return getPropertyTypeForIndexType(objectType, apparentObjectType, indexType, indexType, /* supressNoImplicitAnyError */ false, accessNode, accessFlags | 4 /* CacheSymbol */);
         }
         function getTypeFromIndexedAccessTypeNode(node) {
             var links = getNodeLinks(node);
@@ -40368,13 +41251,14 @@ var ts;
             return links.resolvedType;
         }
         function getActualTypeVariable(type) {
-            return type.flags & 33554432 /* Substitution */ ? type.typeVariable : type;
-        }
-        /**
-         * Invokes union simplification logic to determine if an intersection is considered empty as a union constituent
-         */
-        function isIntersectionEmpty(type1, type2) {
-            return !!(getUnionType([intersectTypes(type1, type2), neverType]).flags & 131072 /* Never */);
+            if (type.flags & 33554432 /* Substitution */) {
+                return type.typeVariable;
+            }
+            if (type.flags & 8388608 /* IndexedAccess */ && (type.objectType.flags & 33554432 /* Substitution */ ||
+                type.indexType.flags & 33554432 /* Substitution */)) {
+                return getIndexedAccessType(getActualTypeVariable(type.objectType), getActualTypeVariable(type.indexType));
+            }
+            return type;
         }
         function getConditionalType(root, mapper) {
             var checkType = instantiateType(root.checkType, mapper);
@@ -40382,35 +41266,6 @@ var ts;
             if (checkType === wildcardType || extendsType === wildcardType) {
                 return wildcardType;
             }
-            var trueType = instantiateType(root.trueType, mapper);
-            var falseType = instantiateType(root.falseType, mapper);
-            var instantiationId = "" + (root.isDistributive ? "d" : "") + getTypeId(checkType) + ">" + getTypeId(extendsType) + "?" + getTypeId(trueType) + ":" + getTypeId(falseType);
-            var result = conditionalTypes.get(instantiationId);
-            if (result) {
-                return result;
-            }
-            var newResult = getConditionalTypeWorker(root, mapper, checkType, extendsType, trueType, falseType);
-            conditionalTypes.set(instantiationId, newResult);
-            return newResult;
-        }
-        function getConditionalTypeWorker(root, mapper, checkType, extendsType, trueType, falseType) {
-            // Simplifications for types of the form `T extends U ? T : never` and `T extends U ? never : T`.
-            if (falseType.flags & 131072 /* Never */ && isTypeIdenticalTo(getActualTypeVariable(trueType), getActualTypeVariable(checkType))) {
-                if (checkType.flags & 1 /* Any */ || isTypeAssignableTo(getRestrictiveInstantiation(checkType), getRestrictiveInstantiation(extendsType))) { // Always true
-                    return getDefaultConstraintOfTrueBranchOfConditionalType(root, /*combinedMapper*/ undefined, mapper);
-                }
-                else if (isIntersectionEmpty(checkType, extendsType)) { // Always false
-                    return neverType;
-                }
-            }
-            else if (trueType.flags & 131072 /* Never */ && isTypeIdenticalTo(getActualTypeVariable(falseType), getActualTypeVariable(checkType))) {
-                if (!(checkType.flags & 1 /* Any */) && isTypeAssignableTo(getRestrictiveInstantiation(checkType), getRestrictiveInstantiation(extendsType))) { // Always true
-                    return neverType;
-                }
-                else if (checkType.flags & 1 /* Any */ || isIntersectionEmpty(checkType, extendsType)) { // Always false
-                    return falseType; // TODO: Intersect negated `extends` type here
-                }
-            }
             var checkTypeInstantiable = maybeTypeOfKind(checkType, 63176704 /* Instantiable */ | 131072 /* GenericMappedType */);
             var combinedMapper;
             if (root.inferTypeParameters) {
@@ -40419,27 +41274,27 @@ var ts;
                     // We don't want inferences from constraints as they may cause us to eagerly resolve the
                     // conditional type instead of deferring resolution. Also, we always want strict function
                     // types rules (i.e. proper contravariance) for inferences.
-                    inferTypes(context.inferences, checkType, extendsType, 32 /* NoConstraints */ | 64 /* AlwaysStrict */);
+                    inferTypes(context.inferences, checkType, extendsType, 64 /* NoConstraints */ | 128 /* AlwaysStrict */);
                 }
-                combinedMapper = combineTypeMappers(mapper, context);
+                combinedMapper = combineTypeMappers(mapper, context.mapper);
             }
             // Instantiate the extends type including inferences for 'infer T' type parameters
             var inferredExtendsType = combinedMapper ? instantiateType(root.extendsType, combinedMapper) : extendsType;
             // We attempt to resolve the conditional type only when the check and extends types are non-generic
             if (!checkTypeInstantiable && !maybeTypeOfKind(inferredExtendsType, 63176704 /* Instantiable */ | 131072 /* GenericMappedType */)) {
                 if (inferredExtendsType.flags & 3 /* AnyOrUnknown */) {
-                    return trueType;
+                    return instantiateType(root.trueType, combinedMapper || mapper);
                 }
                 // Return union of trueType and falseType for 'any' since it matches anything
                 if (checkType.flags & 1 /* Any */) {
-                    return getUnionType([instantiateType(root.trueType, combinedMapper || mapper), falseType]);
+                    return getUnionType([instantiateType(root.trueType, combinedMapper || mapper), instantiateType(root.falseType, mapper)]);
                 }
                 // Return falseType for a definitely false extends check. We check an instantiations of the two
                 // types with type parameters mapped to the wildcard type, the most permissive instantiations
                 // possible (the wildcard type is assignable to and from all types). If those are not related,
                 // then no instantiations will be and we can just return the false branch type.
                 if (!isTypeAssignableTo(getPermissiveInstantiation(checkType), getPermissiveInstantiation(inferredExtendsType))) {
-                    return falseType;
+                    return instantiateType(root.falseType, mapper);
                 }
                 // Return trueType for a definitely true extends check. We check instantiations of the two
                 // types with type parameters mapped to their restrictive form, i.e. a form of the type parameter
@@ -40458,10 +41313,6 @@ var ts;
             result.extendsType = extendsType;
             result.mapper = mapper;
             result.combinedMapper = combinedMapper;
-            if (!combinedMapper) {
-                result.resolvedTrueType = trueType;
-                result.resolvedFalseType = falseType;
-            }
             result.aliasSymbol = root.aliasSymbol;
             result.aliasTypeArguments = instantiateTypes(root.aliasTypeArguments, mapper); // TODO: GH#18217
             return result;
@@ -40472,6 +41323,9 @@ var ts;
         function getFalseTypeFromConditionalType(type) {
             return type.resolvedFalseType || (type.resolvedFalseType = instantiateType(type.root.falseType, type.mapper));
         }
+        function getInferredTrueTypeFromConditionalType(type) {
+            return type.resolvedInferredTrueType || (type.resolvedInferredTrueType = type.combinedMapper ? instantiateType(type.root.trueType, type.combinedMapper) : getTrueTypeFromConditionalType(type));
+        }
         function getInferTypeParameters(node) {
             var result;
             if (node.locals) {
@@ -40483,20 +41337,6 @@ var ts;
             }
             return result;
         }
-        function isPossiblyReferencedInConditionalType(tp, node) {
-            if (isTypeParameterPossiblyReferenced(tp, node)) {
-                return true;
-            }
-            while (node) {
-                if (node.kind === 175 /* ConditionalType */) {
-                    if (isTypeParameterPossiblyReferenced(tp, node.extendsType)) {
-                        return true;
-                    }
-                }
-                node = node.parent;
-            }
-            return false;
-        }
         function getTypeFromConditionalTypeNode(node) {
             var links = getNodeLinks(node);
             if (!links.resolvedType) {
@@ -40504,7 +41344,7 @@ var ts;
                 var aliasSymbol = getAliasSymbolForTypeNode(node);
                 var aliasTypeArguments = getTypeArgumentsForAliasSymbol(aliasSymbol);
                 var allOuterTypeParameters = getOuterTypeParameters(node, /*includeThisTypes*/ true);
-                var outerTypeParameters = aliasTypeArguments ? allOuterTypeParameters : ts.filter(allOuterTypeParameters, function (tp) { return isPossiblyReferencedInConditionalType(tp, node); });
+                var outerTypeParameters = aliasTypeArguments ? allOuterTypeParameters : ts.filter(allOuterTypeParameters, function (tp) { return isTypeParameterPossiblyReferenced(tp, node); });
                 var root = {
                     node: node,
                     checkType: checkType,
@@ -40724,7 +41564,7 @@ var ts;
                 }
             }
             var spread = createAnonymousType(symbol, members, ts.emptyArray, ts.emptyArray, getIndexInfoWithReadonly(stringIndexInfo, readonly), getIndexInfoWithReadonly(numberIndexInfo, readonly));
-            spread.objectFlags |= 128 /* ObjectLiteral */ | 262144 /* ContainsObjectLiteral */ | 1024 /* ContainsSpread */ | objectFlags;
+            spread.objectFlags |= 128 /* ObjectLiteral */ | 524288 /* ContainsObjectOrArrayLiteral */ | 1024 /* ContainsSpread */ | objectFlags;
             return spread;
         }
         /** We approximate own properties as non-methods plus methods that are inside the object literal */
@@ -40815,9 +41655,9 @@ var ts;
         function getThisType(node) {
             var container = ts.getThisContainer(node, /*includeArrowFunctions*/ false);
             var parent = container && container.parent;
-            if (parent && (ts.isClassLike(parent) || parent.kind === 241 /* InterfaceDeclaration */)) {
+            if (parent && (ts.isClassLike(parent) || parent.kind === 242 /* InterfaceDeclaration */)) {
                 if (!ts.hasModifier(container, 32 /* Static */) &&
-                    (container.kind !== 157 /* Constructor */ || ts.isNodeDescendantOf(node, container.body))) {
+                    (container.kind !== 158 /* Constructor */ || ts.isNodeDescendantOf(node, container.body))) {
                     return getDeclaredTypeOfClassOrInterface(getSymbolOfNode(parent)).thisType;
                 }
             }
@@ -40833,89 +41673,89 @@ var ts;
         }
         function getTypeFromTypeNode(node) {
             switch (node.kind) {
-                case 120 /* AnyKeyword */:
-                case 289 /* JSDocAllType */:
-                case 290 /* JSDocUnknownType */:
+                case 121 /* AnyKeyword */:
+                case 290 /* JSDocAllType */:
+                case 291 /* JSDocUnknownType */:
                     return anyType;
-                case 143 /* UnknownKeyword */:
+                case 144 /* UnknownKeyword */:
                     return unknownType;
-                case 138 /* StringKeyword */:
+                case 139 /* StringKeyword */:
                     return stringType;
-                case 135 /* NumberKeyword */:
+                case 136 /* NumberKeyword */:
                     return numberType;
-                case 146 /* BigIntKeyword */:
+                case 147 /* BigIntKeyword */:
                     return bigintType;
-                case 123 /* BooleanKeyword */:
+                case 124 /* BooleanKeyword */:
                     return booleanType;
-                case 139 /* SymbolKeyword */:
+                case 140 /* SymbolKeyword */:
                     return esSymbolType;
-                case 106 /* VoidKeyword */:
+                case 107 /* VoidKeyword */:
                     return voidType;
-                case 141 /* UndefinedKeyword */:
+                case 142 /* UndefinedKeyword */:
                     return undefinedType;
-                case 96 /* NullKeyword */:
+                case 97 /* NullKeyword */:
                     return nullType;
-                case 132 /* NeverKeyword */:
+                case 133 /* NeverKeyword */:
                     return neverType;
-                case 136 /* ObjectKeyword */:
+                case 137 /* ObjectKeyword */:
                     return node.flags & 65536 /* JavaScriptFile */ ? anyType : nonPrimitiveType;
-                case 178 /* ThisType */:
-                case 100 /* ThisKeyword */:
+                case 179 /* ThisType */:
+                case 101 /* ThisKeyword */:
                     return getTypeFromThisTypeNode(node);
-                case 182 /* LiteralType */:
+                case 183 /* LiteralType */:
                     return getTypeFromLiteralTypeNode(node);
-                case 164 /* TypeReference */:
+                case 165 /* TypeReference */:
                     return getTypeFromTypeReference(node);
-                case 163 /* TypePredicate */:
+                case 164 /* TypePredicate */:
                     return booleanType;
-                case 211 /* ExpressionWithTypeArguments */:
+                case 212 /* ExpressionWithTypeArguments */:
                     return getTypeFromTypeReference(node);
-                case 167 /* TypeQuery */:
+                case 168 /* TypeQuery */:
                     return getTypeFromTypeQueryNode(node);
-                case 169 /* ArrayType */:
+                case 170 /* ArrayType */:
                     return getTypeFromArrayTypeNode(node);
-                case 170 /* TupleType */:
+                case 171 /* TupleType */:
                     return getTypeFromTupleTypeNode(node);
-                case 171 /* OptionalType */:
+                case 172 /* OptionalType */:
                     return getTypeFromOptionalTypeNode(node);
-                case 173 /* UnionType */:
+                case 174 /* UnionType */:
                     return getTypeFromUnionTypeNode(node);
-                case 174 /* IntersectionType */:
+                case 175 /* IntersectionType */:
                     return getTypeFromIntersectionTypeNode(node);
-                case 291 /* JSDocNullableType */:
+                case 292 /* JSDocNullableType */:
                     return getTypeFromJSDocNullableTypeNode(node);
-                case 293 /* JSDocOptionalType */:
+                case 294 /* JSDocOptionalType */:
                     return addOptionality(getTypeFromTypeNode(node.type));
-                case 177 /* ParenthesizedType */:
-                case 172 /* RestType */:
-                case 292 /* JSDocNonNullableType */:
-                case 288 /* JSDocTypeExpression */:
+                case 178 /* ParenthesizedType */:
+                case 173 /* RestType */:
+                case 293 /* JSDocNonNullableType */:
+                case 289 /* JSDocTypeExpression */:
                     return getTypeFromTypeNode(node.type);
-                case 295 /* JSDocVariadicType */:
+                case 296 /* JSDocVariadicType */:
                     return getTypeFromJSDocVariadicType(node);
-                case 165 /* FunctionType */:
-                case 166 /* ConstructorType */:
-                case 168 /* TypeLiteral */:
-                case 297 /* JSDocTypeLiteral */:
-                case 294 /* JSDocFunctionType */:
-                case 298 /* JSDocSignature */:
+                case 166 /* FunctionType */:
+                case 167 /* ConstructorType */:
+                case 169 /* TypeLiteral */:
+                case 298 /* JSDocTypeLiteral */:
+                case 295 /* JSDocFunctionType */:
+                case 299 /* JSDocSignature */:
                     return getTypeFromTypeLiteralOrFunctionOrConstructorTypeNode(node);
-                case 179 /* TypeOperator */:
+                case 180 /* TypeOperator */:
                     return getTypeFromTypeOperatorNode(node);
-                case 180 /* IndexedAccessType */:
+                case 181 /* IndexedAccessType */:
                     return getTypeFromIndexedAccessTypeNode(node);
-                case 181 /* MappedType */:
+                case 182 /* MappedType */:
                     return getTypeFromMappedTypeNode(node);
-                case 175 /* ConditionalType */:
+                case 176 /* ConditionalType */:
                     return getTypeFromConditionalTypeNode(node);
-                case 176 /* InferType */:
+                case 177 /* InferType */:
                     return getTypeFromInferTypeNode(node);
-                case 183 /* ImportType */:
+                case 184 /* ImportType */:
                     return getTypeFromImportTypeNode(node);
                 // This function assumes that an identifier or qualified name is a type expression
                 // Callers should first ensure this by calling isTypeNode
-                case 72 /* Identifier */:
-                case 148 /* QualifiedName */:
+                case 73 /* Identifier */:
+                case 149 /* QualifiedName */:
                     var symbol = getSymbolAtLocation(node);
                     return symbol ? getDeclaredTypeOfSymbol(symbol) : errorType;
                 default:
@@ -40974,33 +41814,8 @@ var ts;
          * Maps forward-references to later types parameters to the empty object type.
          * This is used during inference when instantiating type parameter defaults.
          */
-        function createBackreferenceMapper(typeParameters, index) {
-            return function (t) { return typeParameters.indexOf(t) >= index ? emptyObjectType : t; };
-        }
-        function isInferenceContext(mapper) {
-            return !!mapper.typeParameters;
-        }
-        function cloneTypeMapper(mapper, extraFlags) {
-            if (extraFlags === void 0) { extraFlags = 0; }
-            return mapper && isInferenceContext(mapper) ?
-                createInferenceContext(mapper.typeParameters, mapper.signature, mapper.flags | extraFlags, mapper.compareTypes, mapper.inferences) :
-                mapper;
-        }
-        function cloneInferredPartOfContext(context) {
-            // Filter context to only those parameters which actually have inference candidates
-            var params = [];
-            var inferences = [];
-            for (var i = 0; i < context.typeParameters.length; i++) {
-                var info = context.inferences[i];
-                if (info.candidates || info.contraCandidates) {
-                    params.push(context.typeParameters[i]);
-                    inferences.push(info);
-                }
-            }
-            if (!params.length) {
-                return undefined;
-            }
-            return createInferenceContext(params, context.signature, context.flags | 1 /* NoDefault */, context.compareTypes, inferences);
+        function createBackreferenceMapper(context, index) {
+            return function (t) { return ts.findIndex(context.inferences, function (info) { return info.typeParameter === t; }) >= index ? unknownType : t; };
         }
         function combineTypeMappers(mapper1, mapper2) {
             if (!mapper1)
@@ -41083,7 +41898,7 @@ var ts;
             }
             // Keep the flags from the symbol we're instantiating.  Mark that is instantiated, and
             // also transient so that we can just store data on it directly.
-            var result = createSymbol(symbol.flags, symbol.escapedName, 1 /* Instantiated */ | ts.getCheckFlags(symbol) & (8 /* Readonly */ | 2048 /* Late */ | 8192 /* OptionalParameter */ | 16384 /* RestParameter */));
+            var result = createSymbol(symbol.flags, symbol.escapedName, 1 /* Instantiated */ | ts.getCheckFlags(symbol) & (8 /* Readonly */ | 4096 /* Late */ | 16384 /* OptionalParameter */ | 32768 /* RestParameter */));
             result.declarations = symbol.declarations;
             result.parent = symbol.parent;
             result.target = symbol;
@@ -41149,28 +41964,31 @@ var ts;
             return type;
         }
         function maybeTypeParameterReference(node) {
-            return !(node.kind === 148 /* QualifiedName */ ||
-                node.parent.kind === 164 /* TypeReference */ && node.parent.typeArguments && node === node.parent.typeName);
+            return !(node.kind === 149 /* QualifiedName */ ||
+                node.parent.kind === 165 /* TypeReference */ && node.parent.typeArguments && node === node.parent.typeName);
         }
         function isTypeParameterPossiblyReferenced(tp, node) {
             // If the type parameter doesn't have exactly one declaration, if there are invening statement blocks
             // between the node and the type parameter declaration, if the node contains actual references to the
             // type parameter, or if the node contains type queries, we consider the type parameter possibly referenced.
             if (tp.symbol && tp.symbol.declarations && tp.symbol.declarations.length === 1) {
-                var container_3 = tp.symbol.declarations[0].parent;
-                if (ts.findAncestor(node, function (n) { return n.kind === 218 /* Block */ ? "quit" : n === container_3; })) {
-                    return !!ts.forEachChild(node, containsReference);
+                var container = tp.symbol.declarations[0].parent;
+                for (var n = node; n !== container; n = n.parent) {
+                    if (!n || n.kind === 219 /* Block */ || n.kind === 176 /* ConditionalType */ && ts.forEachChild(n.extendsType, containsReference)) {
+                        return true;
+                    }
                 }
+                return !!ts.forEachChild(node, containsReference);
             }
             return true;
             function containsReference(node) {
                 switch (node.kind) {
-                    case 178 /* ThisType */:
+                    case 179 /* ThisType */:
                         return !!tp.isThisType;
-                    case 72 /* Identifier */:
+                    case 73 /* Identifier */:
                         return !tp.isThisType && ts.isPartOfTypeNode(node) && maybeTypeParameterReference(node) &&
                             getTypeFromTypeNode(node) === tp;
-                    case 167 /* TypeQuery */:
+                    case 168 /* TypeQuery */:
                         return true;
                 }
                 return !!ts.forEachChild(node, containsReference);
@@ -41295,13 +42113,14 @@ var ts;
             if (!type || !mapper || mapper === identityMapper) {
                 return type;
             }
-            if (instantiationDepth === 50) {
+            if (instantiationDepth === 50 || instantiationCount >= 5000000) {
                 // We have reached 50 recursive type instantiations and there is a very high likelyhood we're dealing
                 // with a combination of infinite generic types that perpetually generate new type identities. We stop
                 // the recursion here by yielding the error type.
                 error(currentNode, ts.Diagnostics.Type_instantiation_is_excessively_deep_and_possibly_infinite);
                 return errorType;
             }
+            instantiationCount++;
             instantiationDepth++;
             var result = instantiateTypeWorker(type, mapper);
             instantiationDepth--;
@@ -41318,7 +42137,7 @@ var ts;
                     // If the anonymous type originates in a declaration of a function, method, class, or
                     // interface, in an object type literal, or in an object literal expression, we may need
                     // to instantiate the type because it might reference a type parameter.
-                    return type.symbol && type.symbol.flags & (16 /* Function */ | 8192 /* Method */ | 32 /* Class */ | 2048 /* TypeLiteral */ | 4096 /* ObjectLiteral */) && type.symbol.declarations ?
+                    return couldContainTypeVariables(type) ?
                         getAnonymousTypeInstantiation(type, mapper) : type;
                 }
                 if (objectFlags & 32 /* Mapped */) {
@@ -41356,7 +42175,11 @@ var ts;
                     return getSubstitutionType(maybeVariable, instantiateType(type.substitute, mapper));
                 }
                 else {
-                    return maybeVariable;
+                    var sub = instantiateType(type.substitute, mapper);
+                    if (sub.flags & 3 /* AnyOrUnknown */ || isTypeAssignableTo(getRestrictiveInstantiation(maybeVariable), getRestrictiveInstantiation(sub))) {
+                        return maybeVariable;
+                    }
+                    return sub;
                 }
             }
             return type;
@@ -41387,34 +42210,35 @@ var ts;
         // Returns true if the given expression contains (at any level of nesting) a function or arrow expression
         // that is subject to contextual typing.
         function isContextSensitive(node) {
-            ts.Debug.assert(node.kind !== 156 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 157 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
             switch (node.kind) {
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
-                case 156 /* MethodDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
+                case 157 /* MethodDeclaration */:
+                case 240 /* FunctionDeclaration */: // Function declarations can have context when annotated with a jsdoc @type
                     return isContextSensitiveFunctionLikeDeclaration(node);
-                case 188 /* ObjectLiteralExpression */:
+                case 189 /* ObjectLiteralExpression */:
                     return ts.some(node.properties, isContextSensitive);
-                case 187 /* ArrayLiteralExpression */:
+                case 188 /* ArrayLiteralExpression */:
                     return ts.some(node.elements, isContextSensitive);
-                case 205 /* ConditionalExpression */:
+                case 206 /* ConditionalExpression */:
                     return isContextSensitive(node.whenTrue) ||
                         isContextSensitive(node.whenFalse);
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return node.operatorToken.kind === 55 /* BarBarToken */ &&
                         (isContextSensitive(node.left) || isContextSensitive(node.right));
-                case 275 /* PropertyAssignment */:
+                case 276 /* PropertyAssignment */:
                     return isContextSensitive(node.initializer);
-                case 195 /* ParenthesizedExpression */:
+                case 196 /* ParenthesizedExpression */:
                     return isContextSensitive(node.expression);
-                case 268 /* JsxAttributes */:
+                case 269 /* JsxAttributes */:
                     return ts.some(node.properties, isContextSensitive) || ts.isJsxOpeningElement(node.parent) && ts.some(node.parent.parent.children, isContextSensitive);
-                case 267 /* JsxAttribute */: {
+                case 268 /* JsxAttribute */: {
                     // If there is no initializer, JSX attribute has a boolean value of true which is not context sensitive.
                     var initializer = node.initializer;
                     return !!initializer && isContextSensitive(initializer);
                 }
-                case 270 /* JsxExpression */: {
+                case 271 /* JsxExpression */: {
                     // It is possible to that node.expression is undefined (e.g <div x={} />)
                     var expression = node.expression;
                     return !!expression && isContextSensitive(expression);
@@ -41423,6 +42247,9 @@ var ts;
             return false;
         }
         function isContextSensitiveFunctionLikeDeclaration(node) {
+            if (ts.isFunctionDeclaration(node) && (!ts.isInJSFile(node) || !getTypeForDeclarationFromJSDocComment(node))) {
+                return false;
+            }
             // Functions with type parameters are not context sensitive.
             if (node.typeParameters) {
                 return false;
@@ -41431,7 +42258,7 @@ var ts;
             if (ts.some(node.parameters, function (p) { return !ts.getEffectiveTypeAnnotationNode(p); })) {
                 return true;
             }
-            if (node.kind !== 197 /* ArrowFunction */) {
+            if (node.kind !== 198 /* ArrowFunction */) {
                 // If the first parameter is not an explicit 'this' parameter, then the function has
                 // an implicit 'this' parameter which is subject to contextual typing.
                 var parameter = ts.firstOrUndefined(node.parameters);
@@ -41443,7 +42270,7 @@ var ts;
         }
         function hasContextSensitiveReturnExpression(node) {
             // TODO(anhans): A block should be context-sensitive if it has a context-sensitive return value.
-            return !!node.body && node.body.kind !== 218 /* Block */ && isContextSensitive(node.body);
+            return !!node.body && node.body.kind !== 219 /* Block */ && isContextSensitive(node.body);
         }
         function isContextSensitiveFunctionOrObjectLiteralMethod(func) {
             return (ts.isInJSFile(func) && ts.isFunctionDeclaration(func) || isFunctionExpressionOrArrowFunction(func) || ts.isObjectLiteralMethod(func)) &&
@@ -41496,7 +42323,7 @@ var ts;
         function isTypeDerivedFrom(source, target) {
             return source.flags & 1048576 /* Union */ ? ts.every(source.types, function (t) { return isTypeDerivedFrom(t, target); }) :
                 target.flags & 1048576 /* Union */ ? ts.some(target.types, function (t) { return isTypeDerivedFrom(source, t); }) :
-                    source.flags & 58982400 /* InstantiableNonPrimitive */ ? isTypeDerivedFrom(getBaseConstraintOfType(source) || emptyObjectType, target) :
+                    source.flags & 58982400 /* InstantiableNonPrimitive */ ? isTypeDerivedFrom(getBaseConstraintOfType(source) || unknownType, target) :
                         target === globalObjectType ? !!(source.flags & (524288 /* Object */ | 67108864 /* NonPrimitive */)) :
                             target === globalFunctionType ? !!(source.flags & 524288 /* Object */) && isFunctionObjectType(source) :
                                 hasBaseType(source, getTargetType(target));
@@ -41525,48 +42352,49 @@ var ts;
          * attempt to issue more specific errors on, for example, specific object literal properties or tuple members.
          */
         function checkTypeAssignableToAndOptionallyElaborate(source, target, errorNode, expr, headMessage, containingMessageChain) {
-            return checkTypeRelatedToAndOptionallyElaborate(source, target, assignableRelation, errorNode, expr, headMessage, containingMessageChain);
+            return checkTypeRelatedToAndOptionallyElaborate(source, target, assignableRelation, errorNode, expr, headMessage, containingMessageChain, /*errorOutputContainer*/ undefined);
         }
-        function checkTypeRelatedToAndOptionallyElaborate(source, target, relation, errorNode, expr, headMessage, containingMessageChain) {
+        function checkTypeRelatedToAndOptionallyElaborate(source, target, relation, errorNode, expr, headMessage, containingMessageChain, errorOutputContainer) {
             if (isTypeRelatedTo(source, target, relation))
                 return true;
-            if (!errorNode || !elaborateError(expr, source, target, relation, headMessage)) {
-                return checkTypeRelatedTo(source, target, relation, errorNode, headMessage, containingMessageChain);
+            if (!errorNode || !elaborateError(expr, source, target, relation, headMessage, containingMessageChain, errorOutputContainer)) {
+                return checkTypeRelatedTo(source, target, relation, errorNode, headMessage, containingMessageChain, errorOutputContainer);
             }
             return false;
         }
         function isOrHasGenericConditional(type) {
             return !!(type.flags & 16777216 /* Conditional */ || (type.flags & 2097152 /* Intersection */ && ts.some(type.types, isOrHasGenericConditional)));
         }
-        function elaborateError(node, source, target, relation, headMessage) {
+        function elaborateError(node, source, target, relation, headMessage, containingMessageChain, errorOutputContainer) {
             if (!node || isOrHasGenericConditional(target))
                 return false;
-            if (!checkTypeRelatedTo(source, target, relation, /*errorNode*/ undefined) && elaborateDidYouMeanToCallOrConstruct(node, source, target, relation, headMessage)) {
+            if (!checkTypeRelatedTo(source, target, relation, /*errorNode*/ undefined)
+                && elaborateDidYouMeanToCallOrConstruct(node, source, target, relation, headMessage, containingMessageChain, errorOutputContainer)) {
                 return true;
             }
             switch (node.kind) {
-                case 270 /* JsxExpression */:
-                case 195 /* ParenthesizedExpression */:
-                    return elaborateError(node.expression, source, target, relation, headMessage);
-                case 204 /* BinaryExpression */:
+                case 271 /* JsxExpression */:
+                case 196 /* ParenthesizedExpression */:
+                    return elaborateError(node.expression, source, target, relation, headMessage, containingMessageChain, errorOutputContainer);
+                case 205 /* BinaryExpression */:
                     switch (node.operatorToken.kind) {
-                        case 59 /* EqualsToken */:
+                        case 60 /* EqualsToken */:
                         case 27 /* CommaToken */:
-                            return elaborateError(node.right, source, target, relation, headMessage);
+                            return elaborateError(node.right, source, target, relation, headMessage, containingMessageChain, errorOutputContainer);
                     }
                     break;
-                case 188 /* ObjectLiteralExpression */:
-                    return elaborateObjectLiteral(node, source, target, relation);
-                case 187 /* ArrayLiteralExpression */:
-                    return elaborateArrayLiteral(node, source, target, relation);
-                case 268 /* JsxAttributes */:
-                    return elaborateJsxComponents(node, source, target, relation);
-                case 197 /* ArrowFunction */:
-                    return elaborateArrowFunction(node, source, target, relation);
+                case 189 /* ObjectLiteralExpression */:
+                    return elaborateObjectLiteral(node, source, target, relation, containingMessageChain, errorOutputContainer);
+                case 188 /* ArrayLiteralExpression */:
+                    return elaborateArrayLiteral(node, source, target, relation, containingMessageChain, errorOutputContainer);
+                case 269 /* JsxAttributes */:
+                    return elaborateJsxComponents(node, source, target, relation, containingMessageChain, errorOutputContainer);
+                case 198 /* ArrowFunction */:
+                    return elaborateArrowFunction(node, source, target, relation, containingMessageChain, errorOutputContainer);
             }
             return false;
         }
-        function elaborateDidYouMeanToCallOrConstruct(node, source, target, relation, headMessage) {
+        function elaborateDidYouMeanToCallOrConstruct(node, source, target, relation, headMessage, containingMessageChain, errorOutputContainer) {
             var callSignatures = getSignaturesOfType(source, 0 /* Call */);
             var constructSignatures = getSignaturesOfType(source, 1 /* Construct */);
             for (var _i = 0, _a = [constructSignatures, callSignatures]; _i < _a.length; _i++) {
@@ -41575,16 +42403,16 @@ var ts;
                     var returnType = getReturnTypeOfSignature(s);
                     return !(returnType.flags & (1 /* Any */ | 131072 /* Never */)) && checkTypeRelatedTo(returnType, target, relation, /*errorNode*/ undefined);
                 })) {
-                    var resultObj = {};
-                    checkTypeAssignableTo(source, target, node, headMessage, /*containingChain*/ undefined, resultObj);
-                    var diagnostic = resultObj.error;
-                    addRelatedInfo(diagnostic, ts.createDiagnosticForNode(node, signatures === constructSignatures ? ts.Diagnostics.Did_you_mean_to_use_new_with_this_expression : ts.Diagnostics.Did_you_mean_to_call_this_expression));
+                    var resultObj = errorOutputContainer || {};
+                    checkTypeAssignableTo(source, target, node, headMessage, containingMessageChain, resultObj);
+                    var diagnostic = resultObj.errors[resultObj.errors.length - 1];
+                    ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(node, signatures === constructSignatures ? ts.Diagnostics.Did_you_mean_to_use_new_with_this_expression : ts.Diagnostics.Did_you_mean_to_call_this_expression));
                     return true;
                 }
             }
             return false;
         }
-        function elaborateArrowFunction(node, source, target, relation) {
+        function elaborateArrowFunction(node, source, target, relation, containingMessageChain, errorOutputContainer) {
             // Don't elaborate blocks
             if (ts.isBlock(node.body)) {
                 return false;
@@ -41605,15 +42433,15 @@ var ts;
             var sourceReturn = getReturnTypeOfSignature(sourceSig);
             var targetReturn = getUnionType(ts.map(targetSignatures, getReturnTypeOfSignature));
             if (!checkTypeRelatedTo(sourceReturn, targetReturn, relation, /*errorNode*/ undefined)) {
-                var elaborated = returnExpression && elaborateError(returnExpression, sourceReturn, targetReturn, relation, /*headMessage*/ undefined);
+                var elaborated = returnExpression && elaborateError(returnExpression, sourceReturn, targetReturn, relation, /*headMessage*/ undefined, containingMessageChain, errorOutputContainer);
                 if (elaborated) {
                     return elaborated;
                 }
-                var resultObj = {};
-                checkTypeRelatedTo(sourceReturn, targetReturn, relation, returnExpression, /*message*/ undefined, /*chain*/ undefined, resultObj);
-                if (resultObj.error) {
+                var resultObj = errorOutputContainer || {};
+                checkTypeRelatedTo(sourceReturn, targetReturn, relation, returnExpression, /*message*/ undefined, containingMessageChain, resultObj);
+                if (resultObj.errors) {
                     if (target.symbol && ts.length(target.symbol.declarations)) {
-                        addRelatedInfo(resultObj.error, ts.createDiagnosticForNode(target.symbol.declarations[0], ts.Diagnostics.The_expected_type_comes_from_the_return_type_of_this_signature));
+                        ts.addRelatedInfo(resultObj.errors[resultObj.errors.length - 1], ts.createDiagnosticForNode(target.symbol.declarations[0], ts.Diagnostics.The_expected_type_comes_from_the_return_type_of_this_signature));
                     }
                     return true;
                 }
@@ -41625,32 +42453,32 @@ var ts;
          * If that element would issue an error, we first attempt to dive into that element's inner expression and issue a more specific error by recuring into `elaborateError`
          * Otherwise, we issue an error on _every_ element which fail the assignability check
          */
-        function elaborateElementwise(iterator, source, target, relation) {
+        function elaborateElementwise(iterator, source, target, relation, containingMessageChain, errorOutputContainer) {
             // Assignability failure - check each prop individually, and if that fails, fall back on the bad error span
             var reportedError = false;
             for (var status = iterator.next(); !status.done; status = iterator.next()) {
                 var _a = status.value, prop = _a.errorNode, next = _a.innerExpression, nameType = _a.nameType, errorMessage = _a.errorMessage;
-                var targetPropType = getIndexedAccessType(target, nameType, /*accessNode*/ undefined, errorType);
-                if (targetPropType === errorType || targetPropType.flags & 8388608 /* IndexedAccess */)
+                var targetPropType = getIndexedAccessTypeOrUndefined(target, nameType);
+                if (!targetPropType || targetPropType.flags & 8388608 /* IndexedAccess */)
                     continue; // Don't elaborate on indexes on generic variables
-                var sourcePropType = getIndexedAccessType(source, nameType, /*accessNode*/ undefined, errorType);
-                if (sourcePropType !== errorType && targetPropType !== errorType && !checkTypeRelatedTo(sourcePropType, targetPropType, relation, /*errorNode*/ undefined)) {
-                    var elaborated = next && elaborateError(next, sourcePropType, targetPropType, relation, /*headMessage*/ undefined);
+                var sourcePropType = getIndexedAccessTypeOrUndefined(source, nameType);
+                if (sourcePropType && !checkTypeRelatedTo(sourcePropType, targetPropType, relation, /*errorNode*/ undefined)) {
+                    var elaborated = next && elaborateError(next, sourcePropType, targetPropType, relation, /*headMessage*/ undefined, containingMessageChain, errorOutputContainer);
                     if (elaborated) {
                         reportedError = true;
                     }
                     else {
                         // Issue error on the prop itself, since the prop couldn't elaborate the error
-                        var resultObj = {};
+                        var resultObj = errorOutputContainer || {};
                         // Use the expression type, if available
                         var specificSource = next ? checkExpressionForMutableLocation(next, 0 /* Normal */, sourcePropType) : sourcePropType;
-                        var result = checkTypeRelatedTo(specificSource, targetPropType, relation, prop, errorMessage, /*containingChain*/ undefined, resultObj);
+                        var result = checkTypeRelatedTo(specificSource, targetPropType, relation, prop, errorMessage, containingMessageChain, resultObj);
                         if (result && specificSource !== sourcePropType) {
                             // If for whatever reason the expression type doesn't yield an error, make sure we still issue an error on the sourcePropType
-                            checkTypeRelatedTo(sourcePropType, targetPropType, relation, prop, errorMessage, /*containingChain*/ undefined, resultObj);
+                            checkTypeRelatedTo(sourcePropType, targetPropType, relation, prop, errorMessage, containingMessageChain, resultObj);
                         }
-                        if (resultObj.error) {
-                            var reportedDiag = resultObj.error;
+                        if (resultObj.errors) {
+                            var reportedDiag = resultObj.errors[resultObj.errors.length - 1];
                             var propertyName = isTypeUsableAsPropertyName(nameType) ? getPropertyNameFromType(nameType) : undefined;
                             var targetProp = propertyName !== undefined ? getPropertyOfType(target, propertyName) : undefined;
                             var issuedElaboration = false;
@@ -41660,13 +42488,13 @@ var ts;
                                     undefined;
                                 if (indexInfo && indexInfo.declaration && !ts.getSourceFileOfNode(indexInfo.declaration).hasNoDefaultLib) {
                                     issuedElaboration = true;
-                                    addRelatedInfo(reportedDiag, ts.createDiagnosticForNode(indexInfo.declaration, ts.Diagnostics.The_expected_type_comes_from_this_index_signature));
+                                    ts.addRelatedInfo(reportedDiag, ts.createDiagnosticForNode(indexInfo.declaration, ts.Diagnostics.The_expected_type_comes_from_this_index_signature));
                                 }
                             }
                             if (!issuedElaboration && (targetProp && ts.length(targetProp.declarations) || target.symbol && ts.length(target.symbol.declarations))) {
                                 var targetNode = targetProp && ts.length(targetProp.declarations) ? targetProp.declarations[0] : target.symbol.declarations[0];
                                 if (!ts.getSourceFileOfNode(targetNode).hasNoDefaultLib) {
-                                    addRelatedInfo(reportedDiag, ts.createDiagnosticForNode(targetNode, ts.Diagnostics.The_expected_type_comes_from_property_0_which_is_declared_here_on_type_1, propertyName && !(nameType.flags & 8192 /* UniqueESSymbol */) ? ts.unescapeLeadingUnderscores(propertyName) : typeToString(nameType), typeToString(target)));
+                                    ts.addRelatedInfo(reportedDiag, ts.createDiagnosticForNode(targetNode, ts.Diagnostics.The_expected_type_comes_from_property_0_which_is_declared_here_on_type_1, propertyName && !(nameType.flags & 8192 /* UniqueESSymbol */) ? ts.unescapeLeadingUnderscores(propertyName) : typeToString(nameType), typeToString(target)));
                                 }
                             }
                         }
@@ -41733,26 +42561,29 @@ var ts;
         }
         function getElaborationElementForJsxChild(child, nameType, getInvalidTextDiagnostic) {
             switch (child.kind) {
-                case 270 /* JsxExpression */:
+                case 271 /* JsxExpression */:
                     // child is of the type of the expression
                     return { errorNode: child, innerExpression: child.expression, nameType: nameType };
                 case 11 /* JsxText */:
-                    if (child.containsOnlyWhiteSpaces) {
+                    if (child.containsOnlyTriviaWhiteSpaces) {
                         break; // Whitespace only jsx text isn't real jsx text
                     }
                     // child is a string
                     return { errorNode: child, innerExpression: undefined, nameType: nameType, errorMessage: getInvalidTextDiagnostic() };
-                case 260 /* JsxElement */:
-                case 261 /* JsxSelfClosingElement */:
-                case 264 /* JsxFragment */:
+                case 261 /* JsxElement */:
+                case 262 /* JsxSelfClosingElement */:
+                case 265 /* JsxFragment */:
                     // child is of type JSX.Element
                     return { errorNode: child, innerExpression: child, nameType: nameType };
                 default:
                     return ts.Debug.assertNever(child, "Found invalid jsx child");
             }
         }
-        function elaborateJsxComponents(node, source, target, relation) {
-            var result = elaborateElementwise(generateJsxAttributes(node), source, target, relation);
+        function getSemanticJsxChildren(children) {
+            return ts.filter(children, function (i) { return !ts.isJsxText(i) || !i.containsOnlyTriviaWhiteSpaces; });
+        }
+        function elaborateJsxComponents(node, source, target, relation, containingMessageChain, errorOutputContainer) {
+            var result = elaborateElementwise(generateJsxAttributes(node), source, target, relation, containingMessageChain, errorOutputContainer);
             var invalidTextDiagnostic;
             if (ts.isJsxOpeningElement(node.parent) && ts.isJsxElement(node.parent.parent)) {
                 var containingElement = node.parent.parent;
@@ -41760,7 +42591,7 @@ var ts;
                 var childrenPropName = childPropName === undefined ? "children" : ts.unescapeLeadingUnderscores(childPropName);
                 var childrenNameType = getLiteralType(childrenPropName);
                 var childrenTargetType = getIndexedAccessType(target, childrenNameType);
-                var validChildren = ts.filter(containingElement.children, function (i) { return !ts.isJsxText(i) || !i.containsOnlyWhiteSpaces; });
+                var validChildren = getSemanticJsxChildren(containingElement.children);
                 if (!ts.length(validChildren)) {
                     return result;
                 }
@@ -41770,12 +42601,16 @@ var ts;
                 if (moreThanOneRealChildren) {
                     if (arrayLikeTargetParts !== neverType) {
                         var realSource = createTupleType(checkJsxChildren(containingElement, 0 /* Normal */));
-                        result = elaborateElementwise(generateJsxChildren(containingElement, getInvalidTextualChildDiagnostic), realSource, arrayLikeTargetParts, relation) || result;
+                        var children = generateJsxChildren(containingElement, getInvalidTextualChildDiagnostic);
+                        result = elaborateElementwise(children, realSource, arrayLikeTargetParts, relation, containingMessageChain, errorOutputContainer) || result;
                     }
                     else if (!isTypeRelatedTo(getIndexedAccessType(source, childrenNameType), childrenTargetType, relation)) {
                         // arity mismatch
                         result = true;
-                        error(containingElement.openingElement.tagName, ts.Diagnostics.This_JSX_tag_s_0_prop_expects_a_single_child_of_type_1_but_multiple_children_were_provided, childrenPropName, typeToString(childrenTargetType));
+                        var diag = error(containingElement.openingElement.tagName, ts.Diagnostics.This_JSX_tag_s_0_prop_expects_a_single_child_of_type_1_but_multiple_children_were_provided, childrenPropName, typeToString(childrenTargetType));
+                        if (errorOutputContainer && errorOutputContainer.skipLogging) {
+                            (errorOutputContainer.errors || (errorOutputContainer.errors = [])).push(diag);
+                        }
                     }
                 }
                 else {
@@ -41790,13 +42625,16 @@ var ts;
                                         _a.sent();
                                         return [2 /*return*/];
                                 }
-                            }); })(), source, target, relation) || result;
+                            }); })(), source, target, relation, containingMessageChain, errorOutputContainer) || result;
                         }
                     }
                     else if (!isTypeRelatedTo(getIndexedAccessType(source, childrenNameType), childrenTargetType, relation)) {
                         // arity mismatch
                         result = true;
-                        error(containingElement.openingElement.tagName, ts.Diagnostics.This_JSX_tag_s_0_prop_expects_type_1_which_requires_multiple_children_but_only_a_single_child_was_provided, childrenPropName, typeToString(childrenTargetType));
+                        var diag = error(containingElement.openingElement.tagName, ts.Diagnostics.This_JSX_tag_s_0_prop_expects_type_1_which_requires_multiple_children_but_only_a_single_child_was_provided, childrenPropName, typeToString(childrenTargetType));
+                        if (errorOutputContainer && errorOutputContainer.skipLogging) {
+                            (errorOutputContainer.errors || (errorOutputContainer.errors = [])).push(diag);
+                        }
                     }
                 }
             }
@@ -41843,14 +42681,16 @@ var ts;
                 }
             });
         }
-        function elaborateArrayLiteral(node, source, target, relation) {
+        function elaborateArrayLiteral(node, source, target, relation, containingMessageChain, errorOutputContainer) {
+            if (target.flags & 131068 /* Primitive */)
+                return false;
             if (isTupleLikeType(source)) {
-                return elaborateElementwise(generateLimitedTupleElements(node, target), source, target, relation);
+                return elaborateElementwise(generateLimitedTupleElements(node, target), source, target, relation, containingMessageChain, errorOutputContainer);
             }
             // recreate a tuple from the elements, if possible
             var tupleizedType = checkArrayLiteral(node, 1 /* Contextual */, /*forceTuple*/ true);
             if (isTupleLikeType(tupleizedType)) {
-                return elaborateElementwise(generateLimitedTupleElements(node, target), tupleizedType, target, relation);
+                return elaborateElementwise(generateLimitedTupleElements(node, target), tupleizedType, target, relation, containingMessageChain, errorOutputContainer);
             }
             return false;
         }
@@ -41874,11 +42714,11 @@ var ts;
                         }
                         _b = prop.kind;
                         switch (_b) {
-                            case 159 /* SetAccessor */: return [3 /*break*/, 2];
-                            case 158 /* GetAccessor */: return [3 /*break*/, 2];
-                            case 156 /* MethodDeclaration */: return [3 /*break*/, 2];
-                            case 276 /* ShorthandPropertyAssignment */: return [3 /*break*/, 2];
-                            case 275 /* PropertyAssignment */: return [3 /*break*/, 4];
+                            case 160 /* SetAccessor */: return [3 /*break*/, 2];
+                            case 159 /* GetAccessor */: return [3 /*break*/, 2];
+                            case 157 /* MethodDeclaration */: return [3 /*break*/, 2];
+                            case 277 /* ShorthandPropertyAssignment */: return [3 /*break*/, 2];
+                            case 276 /* PropertyAssignment */: return [3 /*break*/, 4];
                         }
                         return [3 /*break*/, 6];
                     case 2: return [4 /*yield*/, { errorNode: prop.name, innerExpression: undefined, nameType: type }];
@@ -41899,8 +42739,10 @@ var ts;
                 }
             });
         }
-        function elaborateObjectLiteral(node, source, target, relation) {
-            return elaborateElementwise(generateObjectLiteralElements(node), source, target, relation);
+        function elaborateObjectLiteral(node, source, target, relation, containingMessageChain, errorOutputContainer) {
+            if (target.flags & 131068 /* Primitive */)
+                return false;
+            return elaborateElementwise(generateObjectLiteralElements(node), source, target, relation, containingMessageChain, errorOutputContainer);
         }
         /**
          * This is *not* a bi-directional relationship.
@@ -41913,6 +42755,14 @@ var ts;
             return compareSignaturesRelated(source, target, 0 /* None */, ignoreReturnTypes, /*reportErrors*/ false, 
             /*errorReporter*/ undefined, compareTypesAssignable) !== 0 /* False */;
         }
+        /**
+         * Returns true if `s` is `(...args: any[]) => any` or `(this: any, ...args: any[]) => any`
+         */
+        function isAnySignature(s) {
+            return !s.typeParameters && (!s.thisParameter || isTypeAny(getTypeOfParameter(s.thisParameter))) && s.parameters.length === 1 &&
+                s.hasRestParameter && (getTypeOfParameter(s.parameters[0]) === anyArrayType || isTypeAny(getTypeOfParameter(s.parameters[0]))) &&
+                isTypeAny(getReturnTypeOfSignature(s));
+        }
         /**
          * See signatureRelatedTo, compareSignaturesIdentical
          */
@@ -41921,13 +42771,16 @@ var ts;
             if (source === target) {
                 return -1 /* True */;
             }
+            if (isAnySignature(target)) {
+                return -1 /* True */;
+            }
             var targetCount = getParameterCount(target);
             if (!hasEffectiveRestParameter(target) && getMinArgumentCount(source) > targetCount) {
                 return 0 /* False */;
             }
             if (source.typeParameters && source.typeParameters !== target.typeParameters) {
                 target = getCanonicalSignature(target);
-                source = instantiateSignatureInContextOf(source, target, /*contextualMapper*/ undefined, compareTypes);
+                source = instantiateSignatureInContextOf(source, target, /*inferenceContext*/ undefined, compareTypes);
             }
             var sourceCount = getParameterCount(source);
             var sourceRestType = getNonArrayRestType(source);
@@ -41937,8 +42790,8 @@ var ts;
                 return 0 /* False */;
             }
             var kind = target.declaration ? target.declaration.kind : 0 /* Unknown */;
-            var strictVariance = !callbackCheck && strictFunctionTypes && kind !== 156 /* MethodDeclaration */ &&
-                kind !== 155 /* MethodSignature */ && kind !== 157 /* Constructor */;
+            var strictVariance = !callbackCheck && strictFunctionTypes && kind !== 157 /* MethodDeclaration */ &&
+                kind !== 156 /* MethodSignature */ && kind !== 158 /* Constructor */;
             var result = -1 /* True */;
             var sourceThisType = getThisTypeOfSignature(source);
             if (sourceThisType && sourceThisType !== voidType) {
@@ -41986,19 +42839,21 @@ var ts;
                 result &= related;
             }
             if (!ignoreReturnTypes) {
-                var targetReturnType = (target.declaration && isJSConstructor(target.declaration)) ?
+                // If a signature reolution is already in-flight, skip issuing a circularity error
+                // here and just use the `any` type directly
+                var targetReturnType = isResolvingReturnTypeOfSignature(target) ? anyType : (target.declaration && isJSConstructor(target.declaration)) ?
                     getJSClassType(target.declaration.symbol) : getReturnTypeOfSignature(target);
                 if (targetReturnType === voidType) {
                     return result;
                 }
-                var sourceReturnType = (source.declaration && isJSConstructor(source.declaration)) ?
+                var sourceReturnType = isResolvingReturnTypeOfSignature(source) ? anyType : (source.declaration && isJSConstructor(source.declaration)) ?
                     getJSClassType(source.declaration.symbol) : getReturnTypeOfSignature(source);
                 // The following block preserves behavior forbidding boolean returning functions from being assignable to type guard returning functions
                 var targetTypePredicate = getTypePredicateOfSignature(target);
                 if (targetTypePredicate) {
                     var sourceTypePredicate = getTypePredicateOfSignature(source);
                     if (sourceTypePredicate) {
-                        result &= compareTypePredicateRelatedTo(sourceTypePredicate, targetTypePredicate, source.declaration, target.declaration, reportErrors, errorReporter, compareTypes); // TODO: GH#18217
+                        result &= compareTypePredicateRelatedTo(sourceTypePredicate, targetTypePredicate, reportErrors, errorReporter, compareTypes);
                     }
                     else if (ts.isIdentifierTypePredicate(targetTypePredicate)) {
                         if (reportErrors) {
@@ -42017,7 +42872,7 @@ var ts;
             }
             return result;
         }
-        function compareTypePredicateRelatedTo(source, target, sourceDeclaration, targetDeclaration, reportErrors, errorReporter, compareTypes) {
+        function compareTypePredicateRelatedTo(source, target, reportErrors, errorReporter, compareTypes) {
             if (source.kind !== target.kind) {
                 if (reportErrors) {
                     errorReporter(ts.Diagnostics.A_this_based_type_guard_is_not_compatible_with_a_parameter_based_type_guard);
@@ -42026,12 +42881,9 @@ var ts;
                 return 0 /* False */;
             }
             if (source.kind === 1 /* Identifier */) {
-                var targetPredicate = target;
-                var sourceIndex = source.parameterIndex - (ts.getThisParameter(sourceDeclaration) ? 1 : 0);
-                var targetIndex = targetPredicate.parameterIndex - (ts.getThisParameter(targetDeclaration) ? 1 : 0);
-                if (sourceIndex !== targetIndex) {
+                if (source.parameterIndex !== target.parameterIndex) {
                     if (reportErrors) {
-                        errorReporter(ts.Diagnostics.Parameter_0_is_not_in_the_same_position_as_parameter_1, source.parameterName, targetPredicate.parameterName);
+                        errorReporter(ts.Diagnostics.Parameter_0_is_not_in_the_same_position_as_parameter_1, source.parameterName, target.parameterName);
                         errorReporter(ts.Diagnostics.Type_predicate_0_is_not_assignable_to_1, typePredicateToString(source), typePredicateToString(target));
                     }
                     return 0 /* False */;
@@ -42073,6 +42925,11 @@ var ts;
         function isEmptyAnonymousObjectType(type) {
             return !!(ts.getObjectFlags(type) & 16 /* Anonymous */) && isEmptyObjectType(type);
         }
+        function isStringIndexSignatureOnlyType(type) {
+            return type.flags & 524288 /* Object */ && !isGenericMappedType(type) && getPropertiesOfType(type).length === 0 && getIndexInfoOfType(type, 0 /* String */) && !getIndexInfoOfType(type, 1 /* Number */) ||
+                type.flags & 3145728 /* UnionOrIntersection */ && ts.every(type.types, isStringIndexSignatureOnlyType) ||
+                false;
+        }
         function isEnumTypeRelatedTo(sourceSymbol, targetSymbol, errorReporter) {
             if (sourceSymbol === targetSymbol) {
                 return true;
@@ -42181,8 +43038,8 @@ var ts;
             }
             return false;
         }
-        function isIgnoredJsxProperty(source, sourceProp, targetMemberType) {
-            return ts.getObjectFlags(source) & 4096 /* JsxAttributes */ && !(isUnhyphenatedJsxName(sourceProp.escapedName) || targetMemberType);
+        function isIgnoredJsxProperty(source, sourceProp) {
+            return ts.getObjectFlags(source) & 4096 /* JsxAttributes */ && !isUnhyphenatedJsxName(sourceProp.escapedName);
         }
         /**
          * Checks if 'source' is related to 'target' (e.g.: is a assignable to).
@@ -42193,6 +43050,7 @@ var ts;
          * @param errorNode The suggested node upon which all errors will be reported, if defined. This may or may not be the actual node used.
          * @param headMessage If the error chain should be prepended by a head message, then headMessage will be used.
          * @param containingMessageChain A chain of errors to prepend any new errors found.
+         * @param errorOutputContainer Return the diagnostic. Do not log if 'skipLogging' is truthy.
          */
         function checkTypeRelatedTo(source, target, relation, errorNode, headMessage, containingMessageChain, errorOutputContainer) {
             var errorInfo;
@@ -42204,17 +43062,21 @@ var ts;
             var depth = 0;
             var expandingFlags = 0 /* None */;
             var overflow = false;
-            var suppressNextError = false;
+            var overrideNextErrorInfo;
             ts.Debug.assert(relation !== identityRelation || !errorNode, "no error reporting in identity checking");
             var result = isRelatedTo(source, target, /*reportErrors*/ !!errorNode, headMessage);
             if (overflow) {
-                error(errorNode, ts.Diagnostics.Excessive_stack_depth_comparing_types_0_and_1, typeToString(source), typeToString(target));
+                var diag = error(errorNode, ts.Diagnostics.Excessive_stack_depth_comparing_types_0_and_1, typeToString(source), typeToString(target));
+                if (errorOutputContainer) {
+                    (errorOutputContainer.errors || (errorOutputContainer.errors = [])).push(diag);
+                }
             }
             else if (errorInfo) {
                 if (containingMessageChain) {
-                    var chain_1 = containingMessageChain();
-                    if (chain_1) {
-                        errorInfo = ts.concatenateDiagnosticMessageChains(chain_1, errorInfo);
+                    var chain = containingMessageChain();
+                    if (chain) {
+                        ts.concatenateDiagnosticMessageChains(chain, errorInfo);
+                        errorInfo = chain;
                     }
                 }
                 var relatedInformation = void 0;
@@ -42232,12 +43094,17 @@ var ts;
                 }
                 var diag = ts.createDiagnosticForNodeFromMessageChain(errorNode, errorInfo, relatedInformation);
                 if (relatedInfo) {
-                    addRelatedInfo.apply(void 0, [diag].concat(relatedInfo));
+                    ts.addRelatedInfo.apply(void 0, [diag].concat(relatedInfo));
                 }
                 if (errorOutputContainer) {
-                    errorOutputContainer.error = diag;
+                    (errorOutputContainer.errors || (errorOutputContainer.errors = [])).push(diag);
                 }
-                diagnostics.add(diag); // TODO: GH#18217
+                if (!errorOutputContainer || !errorOutputContainer.skipLogging) {
+                    diagnostics.add(diag);
+                }
+            }
+            if (errorNode && errorOutputContainer && errorOutputContainer.skipLogging && result === 0 /* False */) {
+                ts.Debug.assert(!!errorOutputContainer.errors, "missed opportunity to interact with error.");
             }
             return result !== 0 /* False */;
             function reportError(message, arg0, arg1, arg2, arg3) {
@@ -42254,11 +43121,9 @@ var ts;
                 }
             }
             function reportRelationError(message, source, target) {
-                var sourceType = typeToString(source);
-                var targetType = typeToString(target);
-                if (sourceType === targetType) {
-                    sourceType = typeToString(source, /*enclosingDeclaration*/ undefined, 64 /* UseFullyQualifiedType */);
-                    targetType = typeToString(target, /*enclosingDeclaration*/ undefined, 64 /* UseFullyQualifiedType */);
+                var _a = getTypeNamesForErrorDisplay(source, target), sourceType = _a[0], targetType = _a[1];
+                if (target.flags & 262144 /* TypeParameter */ && target.immediateBaseConstraint !== undefined && isTypeAssignableTo(source, target.immediateBaseConstraint)) {
+                    reportError(ts.Diagnostics._0_is_assignable_to_the_constraint_of_type_1_but_1_could_be_instantiated_with_a_different_subtype_of_constraint_2, sourceType, targetType, typeToString(target.immediateBaseConstraint));
                 }
                 if (!message) {
                     if (relation === comparableRelation) {
@@ -42283,24 +43148,38 @@ var ts;
                     reportError(ts.Diagnostics._0_is_a_primitive_but_1_is_a_wrapper_object_Prefer_using_0_when_possible, targetType, sourceType);
                 }
             }
-            function isUnionOrIntersectionTypeWithoutNullableConstituents(type) {
-                if (!(type.flags & 3145728 /* UnionOrIntersection */)) {
+            /**
+             * Try and elaborate array and tuple errors. Returns false
+             * if we have found an elaboration, or we should ignore
+             * any other elaborations when relating the `source` and
+             * `target` types.
+             *
+             * @param source
+             * @param target
+             * @param reportErrors
+             */
+            function tryElaborateArrayLikeErrors(source, target, reportErrors) {
+                if (isTupleLikeType(source)) {
+                    var sourceTuple = source.target;
+                    if (sourceTuple && sourceTuple.readonly && isArrayOrTupleLikeType(target) &&
+                        (!isReadonlyArrayType(target) || isTupleType(target) && !target.target.readonly)) {
+                        if (reportErrors) {
+                            reportError(ts.Diagnostics.The_type_0_is_readonly_and_cannot_be_assigned_to_the_mutable_type_1, typeToString(source), typeToString(target));
+                        }
+                        return false;
+                    }
+                    return isArrayLikeType(target);
+                }
+                if (isTupleLikeType(target)) {
+                    return isArrayLikeType(source);
+                }
+                if (isReadonlyArrayType(source) && isArrayType(target) && !isReadonlyArrayType(target)) {
+                    if (reportErrors) {
+                        reportError(ts.Diagnostics.The_type_0_is_readonly_and_cannot_be_assigned_to_the_mutable_type_1, typeToString(source), typeToString(target));
+                    }
                     return false;
                 }
-                // at this point we know that this is union or intersection type possibly with nullable constituents.
-                // check if we still will have compound type if we ignore nullable components.
-                var seenNonNullable = false;
-                for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
-                    var t = _a[_i];
-                    if (t.flags & 98304 /* Nullable */) {
-                        continue;
-                    }
-                    if (seenNonNullable) {
-                        return true;
-                    }
-                    seenNonNullable = true;
-                }
-                return false;
+                return true;
             }
             /**
              * Compare two types and return
@@ -42322,11 +43201,11 @@ var ts;
                 if (target.flags & 33554432 /* Substitution */) {
                     target = target.typeVariable;
                 }
-                if (source.flags & 8388608 /* IndexedAccess */) {
-                    source = getSimplifiedType(source);
+                if (source.flags & 25165824 /* Simplifiable */) {
+                    source = getSimplifiedType(source, /*writing*/ false);
                 }
-                if (target.flags & 8388608 /* IndexedAccess */) {
-                    target = getSimplifiedType(target);
+                if (target.flags & 25165824 /* Simplifiable */) {
+                    target = getSimplifiedType(target, /*writing*/ true);
                 }
                 // Try to see if we're relating something like `Foo` -> `Bar | null | undefined`.
                 // If so, reporting the `null` and `undefined` in the type is hardly useful.
@@ -42354,7 +43233,8 @@ var ts;
                     isSimpleTypeRelatedTo(source, target, relation, reportErrors ? reportError : undefined))
                     return -1 /* True */;
                 var isComparingJsxAttributes = !!(ts.getObjectFlags(source) & 4096 /* JsxAttributes */);
-                if (isObjectLiteralType(source) && ts.getObjectFlags(source) & 32768 /* FreshLiteral */) {
+                var isPerformingExcessPropertyChecks = (isObjectLiteralType(source) && ts.getObjectFlags(source) & 32768 /* FreshLiteral */);
+                if (isPerformingExcessPropertyChecks) {
                     var discriminantType = target.flags & 1048576 /* Union */ ? findMatchingDiscriminantType(source, target) : undefined;
                     if (hasExcessProperties(source, target, discriminantType, reportErrors)) {
                         if (reportErrors) {
@@ -42362,13 +43242,6 @@ var ts;
                         }
                         return 0 /* False */;
                     }
-                    // Above we check for excess properties with respect to the entire target type. When union
-                    // and intersection types are further deconstructed on the target side, we don't want to
-                    // make the check again (as it might fail for a partial target type). Therefore we obtain
-                    // the regular source type and proceed with that.
-                    if (isUnionOrIntersectionTypeWithoutNullableConstituents(target) && !discriminantType) {
-                        source = getRegularTypeOfObjectLiteral(source);
-                    }
                 }
                 if (relation !== comparableRelation && !isApparentIntersectionConstituent &&
                     source.flags & (131068 /* Primitive */ | 524288 /* Object */ | 2097152 /* Intersection */) && source !== globalObjectType &&
@@ -42401,11 +43274,24 @@ var ts;
                 }
                 else {
                     if (target.flags & 1048576 /* Union */) {
-                        result = typeRelatedToSomeType(source, target, reportErrors && !(source.flags & 131068 /* Primitive */) && !(target.flags & 131068 /* Primitive */));
+                        result = typeRelatedToSomeType(getRegularTypeOfObjectLiteral(source), target, reportErrors && !(source.flags & 131068 /* Primitive */) && !(target.flags & 131068 /* Primitive */));
+                        if (result && isPerformingExcessPropertyChecks) {
+                            // Validate against excess props using the original `source`
+                            var discriminantType = findMatchingDiscriminantType(source, target) || filterPrimitivesIfContainsNonPrimitive(target);
+                            if (!propertiesRelatedTo(source, discriminantType, reportErrors, /*excludedProperties*/ undefined)) {
+                                return 0 /* False */;
+                            }
+                        }
                     }
                     else if (target.flags & 2097152 /* Intersection */) {
                         isIntersectionConstituent = true; // set here to affect the following trio of checks
-                        result = typeRelatedToEachType(source, target, reportErrors);
+                        result = typeRelatedToEachType(getRegularTypeOfObjectLiteral(source), target, reportErrors);
+                        if (result && isPerformingExcessPropertyChecks) {
+                            // Validate against excess props using the original `source`
+                            if (!propertiesRelatedTo(source, target, reportErrors, /*excludedProperties*/ undefined)) {
+                                return 0 /* False */;
+                            }
+                        }
                     }
                     else if (source.flags & 2097152 /* Intersection */) {
                         // Check to see if any constituents of the intersection are immediately related to the target.
@@ -42447,8 +43333,15 @@ var ts;
                     }
                 }
                 if (!result && reportErrors) {
-                    var maybeSuppress = suppressNextError;
-                    suppressNextError = false;
+                    var maybeSuppress = overrideNextErrorInfo;
+                    overrideNextErrorInfo = undefined;
+                    if (source.flags & 524288 /* Object */ && target.flags & 524288 /* Object */) {
+                        var currentError = errorInfo;
+                        tryElaborateArrayLikeErrors(source, target, reportErrors);
+                        if (errorInfo !== currentError) {
+                            maybeSuppress = errorInfo;
+                        }
+                    }
                     if (source.flags & 524288 /* Object */ && target.flags & 131068 /* Primitive */) {
                         tryElaborateErrorsForPrimitivesAndObjects(source, target);
                     }
@@ -42502,7 +43395,7 @@ var ts;
                         // check excess properties against discriminant type only, not the entire union
                         return hasExcessProperties(source, discriminant, /*discriminant*/ undefined, reportErrors);
                     }
-                    var _loop_7 = function (prop) {
+                    var _loop_8 = function (prop) {
                         if (shouldCheckAsExcessProperty(prop, source.symbol) && !isKnownProperty(target, prop.escapedName, isComparingJsxAttributes)) {
                             if (reportErrors) {
                                 // Report error in terms of object types in the target as those are the only ones
@@ -42543,9 +43436,9 @@ var ts;
                             return { value: true };
                         }
                     };
-                    for (var _i = 0, _a = getPropertiesOfObjectType(source); _i < _a.length; _i++) {
+                    for (var _i = 0, _a = getPropertiesOfType(source); _i < _a.length; _i++) {
                         var prop = _a[_i];
-                        var state_3 = _loop_7(prop);
+                        var state_3 = _loop_8(prop);
                         if (typeof state_3 === "object")
                             return state_3.value;
                     }
@@ -42648,10 +43541,19 @@ var ts;
                 }
                 return bestMatch;
             }
+            function filterPrimitivesIfContainsNonPrimitive(type) {
+                if (maybeTypeOfKind(type, 67108864 /* NonPrimitive */)) {
+                    var result_3 = filterType(type, function (t) { return !(t.flags & 131068 /* Primitive */); });
+                    if (!(result_3.flags & 131072 /* Never */)) {
+                        return result_3;
+                    }
+                }
+                return type;
+            }
             // Keep this up-to-date with the same logic within `getApparentTypeOfContextualType`, since they should behave similarly
             function findMatchingDiscriminantType(source, target) {
-                if (target.flags & 1048576 /* Union */) {
-                    var sourceProperties = getPropertiesOfObjectType(source);
+                if (target.flags & 1048576 /* Union */ && source.flags & (2097152 /* Intersection */ | 524288 /* Object */)) {
+                    var sourceProperties = getPropertiesOfType(source);
                     if (sourceProperties) {
                         var sourcePropertiesFiltered = findDiscriminantProperties(sourceProperties, target);
                         if (sourcePropertiesFiltered) {
@@ -42714,13 +43616,20 @@ var ts;
                     // When variance information isn't available we default to covariance. This happens
                     // in the process of computing variance information for recursive types and when
                     // comparing 'this' type arguments.
-                    var variance = i < variances.length ? variances[i] : 1 /* Covariant */;
+                    var varianceFlags = i < variances.length ? variances[i] : 1 /* Covariant */;
+                    var variance = varianceFlags & 7 /* VarianceMask */;
                     // We ignore arguments for independent type parameters (because they're never witnessed).
                     if (variance !== 4 /* Independent */) {
                         var s = sources[i];
                         var t = targets[i];
                         var related = -1 /* True */;
-                        if (variance === 1 /* Covariant */) {
+                        if (varianceFlags & 8 /* Unmeasurable */) {
+                            // Even an `Unmeasurable` variance works out without a structural check if the source and target are _identical_.
+                            // We can't simply assume invariance, because `Unmeasurable` marks nonlinear relations, for example, a relation tained by
+                            // the `-?` modifier in a mapped type (where, no matter how the inputs are related, the outputs still might not be)
+                            related = relation === identityRelation ? isRelatedTo(s, t, /*reportErrors*/ false) : compareTypesIdentical(s, t);
+                        }
+                        else if (variance === 1 /* Covariant */) {
                             related = isRelatedTo(s, t, reportErrors);
                         }
                         else if (variance === 2 /* Contravariant */) {
@@ -42753,6 +43662,17 @@ var ts;
                 }
                 return result;
             }
+            function propagateSidebandVarianceFlags(typeArguments, variances) {
+                for (var i = 0; i < variances.length; i++) {
+                    var v = variances[i];
+                    if (v & 8 /* Unmeasurable */) {
+                        instantiateType(typeArguments[i], reportUnmeasurableMarkers);
+                    }
+                    if (v & 16 /* Unreliable */) {
+                        instantiateType(typeArguments[i], reportUnreliableMarkers);
+                    }
+                }
+            }
             // Determine if possibly recursive types are related. First, check if the result is already available in the global cache.
             // Second, check if we have already started a comparison of the given two types in which case we assume the result to be true.
             // Third, check if both types are part of deeply nested chains of generic type instantiations and if so assume the types are
@@ -42770,6 +43690,16 @@ var ts;
                         // as a failure, and should be updated as a reported failure by the bottom of this function.
                     }
                     else {
+                        if (outofbandVarianceMarkerHandler) {
+                            // We're in the middle of variance checking - integrate any unmeasurable/unreliable flags from this cached component
+                            if (source.flags & (524288 /* Object */ | 16777216 /* Conditional */) && source.aliasSymbol &&
+                                source.aliasTypeArguments && source.aliasSymbol === target.aliasSymbol) {
+                                propagateSidebandVarianceFlags(source.aliasTypeArguments, getAliasVariances(source.aliasSymbol));
+                            }
+                            if (ts.getObjectFlags(source) & 4 /* Reference */ && ts.getObjectFlags(target) & 4 /* Reference */ && source.target === target.target && ts.length(source.typeArguments)) {
+                                propagateSidebandVarianceFlags(source.typeArguments, getVariances(source.target));
+                            }
+                        }
                         return related === 1 /* Succeeded */ ? -1 /* True */ : 0 /* False */;
                     }
                 }
@@ -42827,21 +43757,21 @@ var ts;
                     if (flags & 4194304 /* Index */) {
                         return isRelatedTo(source.type, target.type, /*reportErrors*/ false);
                     }
-                    var result_3 = 0 /* False */;
+                    var result_4 = 0 /* False */;
                     if (flags & 8388608 /* IndexedAccess */) {
-                        if (result_3 = isRelatedTo(source.objectType, target.objectType, /*reportErrors*/ false)) {
-                            if (result_3 &= isRelatedTo(source.indexType, target.indexType, /*reportErrors*/ false)) {
-                                return result_3;
+                        if (result_4 = isRelatedTo(source.objectType, target.objectType, /*reportErrors*/ false)) {
+                            if (result_4 &= isRelatedTo(source.indexType, target.indexType, /*reportErrors*/ false)) {
+                                return result_4;
                             }
                         }
                     }
                     if (flags & 16777216 /* Conditional */) {
                         if (source.root.isDistributive === target.root.isDistributive) {
-                            if (result_3 = isRelatedTo(source.checkType, target.checkType, /*reportErrors*/ false)) {
-                                if (result_3 &= isRelatedTo(source.extendsType, target.extendsType, /*reportErrors*/ false)) {
-                                    if (result_3 &= isRelatedTo(getTrueTypeFromConditionalType(source), getTrueTypeFromConditionalType(target), /*reportErrors*/ false)) {
-                                        if (result_3 &= isRelatedTo(getFalseTypeFromConditionalType(source), getFalseTypeFromConditionalType(target), /*reportErrors*/ false)) {
-                                            return result_3;
+                            if (result_4 = isRelatedTo(source.checkType, target.checkType, /*reportErrors*/ false)) {
+                                if (result_4 &= isRelatedTo(source.extendsType, target.extendsType, /*reportErrors*/ false)) {
+                                    if (result_4 &= isRelatedTo(getTrueTypeFromConditionalType(source), getTrueTypeFromConditionalType(target), /*reportErrors*/ false)) {
+                                        if (result_4 &= isRelatedTo(getFalseTypeFromConditionalType(source), getFalseTypeFromConditionalType(target), /*reportErrors*/ false)) {
+                                            return result_4;
                                         }
                                     }
                                 }
@@ -42890,8 +43820,7 @@ var ts;
                     }
                     // A type S is assignable to keyof T if S is assignable to keyof C, where C is the
                     // simplified form of T or, if T doesn't simplify, the constraint of T.
-                    var simplified = getSimplifiedType(target.type);
-                    var constraint = simplified !== target.type ? simplified : getConstraintOfType(target.type);
+                    var constraint = getSimplifiedTypeOrConstraint(target.type);
                     if (constraint) {
                         // We require Ternary.True here such that circular constraints don't cause
                         // false positives. For example, given 'T extends { [K in keyof T]: string }',
@@ -42903,13 +43832,17 @@ var ts;
                     }
                 }
                 else if (target.flags & 8388608 /* IndexedAccess */) {
-                    // A type S is related to a type T[K], where T and K aren't both type variables, if S is related to C,
-                    // where C is the base constraint of T[K]
-                    if (relation !== identityRelation &&
-                        !(isGenericObjectType(target.objectType) && isGenericIndexType(target.indexType))) {
-                        var constraint = getBaseConstraintOfType(target);
-                        if (constraint && constraint !== target) {
-                            if (result = isRelatedTo(source, constraint, reportErrors)) {
+                    // A type S is related to a type T[K] if S is related to C, where C is the base
+                    // constraint of T[K] for writing.
+                    if (relation !== identityRelation) {
+                        var objectType = target.objectType;
+                        var indexType = target.indexType;
+                        var baseObjectType = getBaseConstraintOfType(objectType) || objectType;
+                        var baseIndexType = getBaseConstraintOfType(indexType) || indexType;
+                        if (!isGenericObjectType(baseObjectType) && !isGenericIndexType(baseIndexType)) {
+                            var accessFlags = 2 /* Writing */ | (baseObjectType !== objectType ? 1 /* NoIndexSignatures */ : 0);
+                            var constraint = getIndexedAccessTypeOrUndefined(baseObjectType, baseIndexType, /*accessNode*/ undefined, accessFlags);
+                            if (constraint && (result = isRelatedTo(source, constraint, reportErrors))) {
                                 return result;
                             }
                         }
@@ -42926,15 +43859,16 @@ var ts;
                         }
                         if (!isGenericMappedType(source)) {
                             var targetConstraint = getConstraintTypeFromMappedType(target);
-                            var sourceKeys_1 = getIndexType(source);
-                            var hasOptionalUnionKeys = modifiers & 4 /* IncludeOptional */ && targetConstraint.flags & 1048576 /* Union */;
-                            var filteredByApplicability = hasOptionalUnionKeys ? filterType(targetConstraint, function (t) { return !!isRelatedTo(t, sourceKeys_1); }) : undefined;
+                            var sourceKeys = getIndexType(source, /*stringsOnly*/ undefined, /*noIndexSignatures*/ true);
+                            var includeOptional = modifiers & 4 /* IncludeOptional */;
+                            var filteredByApplicability = includeOptional ? intersectTypes(targetConstraint, sourceKeys) : undefined;
                             // A source type T is related to a target type { [P in Q]: X } if Q is related to keyof T and T[Q] is related to X.
                             // A source type T is related to a target type { [P in Q]?: X } if some constituent Q' of Q is related to keyof T and T[Q'] is related to X.
-                            if (hasOptionalUnionKeys
+                            if (includeOptional
                                 ? !(filteredByApplicability.flags & 131072 /* Never */)
-                                : isRelatedTo(targetConstraint, sourceKeys_1)) {
-                                var indexingType = hasOptionalUnionKeys ? filteredByApplicability : getTypeParameterFromMappedType(target);
+                                : isRelatedTo(targetConstraint, sourceKeys)) {
+                                var typeParameter = getTypeParameterFromMappedType(target);
+                                var indexingType = filteredByApplicability ? getIntersectionType([filteredByApplicability, typeParameter]) : typeParameter;
                                 var indexedAccessType = getIndexedAccessType(source, indexingType);
                                 var templateType = getTemplateTypeFromMappedType(target);
                                 if (result = isRelatedTo(indexedAccessType, templateType, reportErrors)) {
@@ -42957,23 +43891,25 @@ var ts;
                             return result;
                         }
                     }
-                    var constraint = getConstraintOfType(source);
-                    if (!constraint || (source.flags & 262144 /* TypeParameter */ && constraint.flags & 1 /* Any */)) {
-                        // A type variable with no constraint is not related to the non-primitive object type.
-                        if (result = isRelatedTo(emptyObjectType, extractTypesOfKind(target, ~67108864 /* NonPrimitive */))) {
+                    else {
+                        var constraint = getConstraintOfType(source);
+                        if (!constraint || (source.flags & 262144 /* TypeParameter */ && constraint.flags & 1 /* Any */)) {
+                            // A type variable with no constraint is not related to the non-primitive object type.
+                            if (result = isRelatedTo(emptyObjectType, extractTypesOfKind(target, ~67108864 /* NonPrimitive */))) {
+                                errorInfo = saveErrorInfo;
+                                return result;
+                            }
+                        }
+                        // hi-speed no-this-instantiation check (less accurate, but avoids costly `this`-instantiation when the constraint will suffice), see #28231 for report on why this is needed
+                        else if (result = isRelatedTo(constraint, target, /*reportErrors*/ false, /*headMessage*/ undefined, isIntersectionConstituent)) {
+                            errorInfo = saveErrorInfo;
+                            return result;
+                        }
+                        // slower, fuller, this-instantiated check (necessary when comparing raw `this` types from base classes), see `subclassWithPolymorphicThisIsAssignable.ts` test for example
+                        else if (result = isRelatedTo(getTypeWithThisArgument(constraint, source), target, reportErrors, /*headMessage*/ undefined, isIntersectionConstituent)) {
                             errorInfo = saveErrorInfo;
                             return result;
                         }
-                    }
-                    // hi-speed no-this-instantiation check (less accurate, but avoids costly `this`-instantiation when the constraint will suffice), see #28231 for report on why this is needed
-                    else if (result = isRelatedTo(constraint, target, /*reportErrors*/ false, /*headMessage*/ undefined, isIntersectionConstituent)) {
-                        errorInfo = saveErrorInfo;
-                        return result;
-                    }
-                    // slower, fuller, this-instantiated check (necessary when comparing raw `this` types from base classes), see `subclassWithPolymorphicThisIsAssignable.ts` test for example
-                    else if (result = isRelatedTo(getTypeWithThisArgument(constraint, source), target, reportErrors, /*headMessage*/ undefined, isIntersectionConstituent)) {
-                        errorInfo = saveErrorInfo;
-                        return result;
                     }
                 }
                 else if (source.flags & 4194304 /* Index */) {
@@ -43033,6 +43969,9 @@ var ts;
                     if (relation !== identityRelation) {
                         source = getApparentType(source);
                     }
+                    else if (isGenericMappedType(source)) {
+                        return 0 /* False */;
+                    }
                     if (ts.getObjectFlags(source) & 4 /* Reference */ && ts.getObjectFlags(target) & 4 /* Reference */ && source.target === target.target &&
                         !(ts.getObjectFlags(source) & 8192 /* MarkerType */ || ts.getObjectFlags(target) & 8192 /* MarkerType */)) {
                         // We have type references to the same generic type, and the type references are not marker
@@ -43045,7 +43984,14 @@ var ts;
                         }
                     }
                     else if (isReadonlyArrayType(target) ? isArrayType(source) || isTupleType(source) : isArrayType(target) && isTupleType(source) && !source.target.readonly) {
-                        return isRelatedTo(getIndexTypeOfType(source, 1 /* Number */) || anyType, getIndexTypeOfType(target, 1 /* Number */) || anyType, reportErrors);
+                        if (relation !== identityRelation) {
+                            return isRelatedTo(getIndexTypeOfType(source, 1 /* Number */) || anyType, getIndexTypeOfType(target, 1 /* Number */) || anyType, reportErrors);
+                        }
+                        else {
+                            // By flags alone, we know that the `target` is a readonly array while the source is a normal array or tuple
+                            // or `target` is an array and source is a tuple - in both cases the types cannot be identical, by construction
+                            return 0 /* False */;
+                        }
                     }
                     // Consider a fresh empty object literal type "closed" under the subtype relationship - this way `{} <- {[idx: string]: any} <- fresh({})`
                     // and not `{} <- fresh({}) <- {[idx: string]: any}`
@@ -43060,7 +44006,7 @@ var ts;
                     if (source.flags & (524288 /* Object */ | 2097152 /* Intersection */) && target.flags & 524288 /* Object */) {
                         // Report structural errors only if we haven't reported any errors yet
                         var reportStructuralErrors = reportErrors && errorInfo === saveErrorInfo && !sourceIsPrimitive;
-                        result = propertiesRelatedTo(source, target, reportStructuralErrors);
+                        result = propertiesRelatedTo(source, target, reportStructuralErrors, /*excludedProperties*/ undefined);
                         if (result) {
                             result &= signaturesRelatedTo(source, target, 0 /* Call */, reportStructuralErrors);
                             if (result) {
@@ -43080,22 +44026,35 @@ var ts;
                             return result;
                         }
                     }
+                    // If S is an object type and T is a discriminated union, S may be related to T if
+                    // there exists a constituent of T for every combination of the discriminants of S
+                    // with respect to T. We do not report errors here, as we will use the existing
+                    // error result from checking each constituent of the union.
+                    if (source.flags & (524288 /* Object */ | 2097152 /* Intersection */) && target.flags & 1048576 /* Union */) {
+                        var objectOnlyTarget = extractTypesOfKind(target, 524288 /* Object */);
+                        if (objectOnlyTarget.flags & 1048576 /* Union */) {
+                            var result_5 = typeRelatedToDiscriminatedType(source, objectOnlyTarget);
+                            if (result_5) {
+                                return result_5;
+                            }
+                        }
+                    }
                 }
                 return 0 /* False */;
-                function isNonGeneric(type) {
-                    // If we're already in identity relationship checking, we should use `isRelatedTo`
-                    // to catch the `Maybe` from an excessively deep type (which we then assume means
-                    // that the type could possibly contain a generic)
-                    if (relation === identityRelation) {
-                        return isRelatedTo(type, getPermissiveInstantiation(type)) === -1 /* True */;
-                    }
-                    return isTypeIdenticalTo(type, getPermissiveInstantiation(type));
-                }
                 function relateVariances(sourceTypeArguments, targetTypeArguments, variances) {
                     if (result = typeArgumentsRelatedTo(sourceTypeArguments, targetTypeArguments, variances, reportErrors)) {
                         return result;
                     }
-                    var allowStructuralFallback = (targetTypeArguments && hasCovariantVoidArgument(targetTypeArguments, variances)) || isNonGeneric(source) || isNonGeneric(target);
+                    if (ts.some(variances, function (v) { return !!(v & 24 /* AllowsStructuralFallback */); })) {
+                        // If some type parameter was `Unmeasurable` or `Unreliable`, and we couldn't pass by assuming it was identical, then we
+                        // have to allow a structural fallback check
+                        // We elide the variance-based error elaborations, since those might not be too helpful, since we'll potentially
+                        // be assuming identity of the type parameter.
+                        originalErrorInfo = undefined;
+                        errorInfo = saveErrorInfo;
+                        return undefined;
+                    }
+                    var allowStructuralFallback = targetTypeArguments && hasCovariantVoidArgument(targetTypeArguments, variances);
                     varianceCheckFailed = !allowStructuralFallback;
                     // The type arguments did not relate appropriately, but it may be because we have no variance
                     // information (in which case typeArgumentsRelatedTo defaulted to covariance for all type
@@ -43113,7 +44072,7 @@ var ts;
                         // reveal the reason).
                         // We can switch on `reportErrors` here, since varianceCheckFailed guarantees we return `False`,
                         // we can return `False` early here to skip calculating the structural error message we don't need.
-                        if (varianceCheckFailed && !(reportErrors && ts.some(variances, function (v) { return v === 0 /* Invariant */; }))) {
+                        if (varianceCheckFailed && !(reportErrors && ts.some(variances, function (v) { return (v & 7 /* VarianceMask */) === 0 /* Invariant */; }))) {
                             return 0 /* False */;
                         }
                         // We remember the original error information so we can restore it in case the structural
@@ -43124,6 +44083,18 @@ var ts;
                     }
                 }
             }
+            function reportUnmeasurableMarkers(p) {
+                if (outofbandVarianceMarkerHandler && (p === markerSuperType || p === markerSubType || p === markerOtherType)) {
+                    outofbandVarianceMarkerHandler(/*onlyUnreliable*/ false);
+                }
+                return p;
+            }
+            function reportUnreliableMarkers(p) {
+                if (outofbandVarianceMarkerHandler && (p === markerSuperType || p === markerSubType || p === markerOtherType)) {
+                    outofbandVarianceMarkerHandler(/*onlyUnreliable*/ true);
+                }
+                return p;
+            }
             // A type [P in S]: X is related to a type [Q in T]: Y if T is related to S and X' is
             // related to Y, where X' is an instantiation of X in which P is replaced with Q. Notice
             // that S and T are contra-variant whereas X and Y are co-variant.
@@ -43131,45 +44102,281 @@ var ts;
                 var modifiersRelated = relation === comparableRelation || (relation === identityRelation ? getMappedTypeModifiers(source) === getMappedTypeModifiers(target) :
                     getCombinedMappedTypeOptionality(source) <= getCombinedMappedTypeOptionality(target));
                 if (modifiersRelated) {
-                    var result_4;
-                    if (result_4 = isRelatedTo(getConstraintTypeFromMappedType(target), getConstraintTypeFromMappedType(source), reportErrors)) {
+                    var result_6;
+                    var targetConstraint = getConstraintTypeFromMappedType(target);
+                    var sourceConstraint = instantiateType(getConstraintTypeFromMappedType(source), getCombinedMappedTypeOptionality(source) < 0 ? reportUnmeasurableMarkers : reportUnreliableMarkers);
+                    if (result_6 = isRelatedTo(targetConstraint, sourceConstraint, reportErrors)) {
                         var mapper = createTypeMapper([getTypeParameterFromMappedType(source)], [getTypeParameterFromMappedType(target)]);
-                        return result_4 & isRelatedTo(instantiateType(getTemplateTypeFromMappedType(source), mapper), getTemplateTypeFromMappedType(target), reportErrors);
+                        return result_6 & isRelatedTo(instantiateType(getTemplateTypeFromMappedType(source), mapper), getTemplateTypeFromMappedType(target), reportErrors);
                     }
                 }
                 return 0 /* False */;
             }
-            function propertiesRelatedTo(source, target, reportErrors) {
+            function typeRelatedToDiscriminatedType(source, target) {
+                // 1. Generate the combinations of discriminant properties & types 'source' can satisfy.
+                //    a. If the number of combinations is above a set limit, the comparison is too complex.
+                // 2. Filter 'target' to the subset of types whose discriminants exist in the matrix.
+                //    a. If 'target' does not satisfy all discriminants in the matrix, 'source' is not related.
+                // 3. For each type in the filtered 'target', determine if all non-discriminant properties of
+                //    'target' are related to a property in 'source'.
+                //
+                // NOTE: See ~/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithDiscriminatedUnion.ts
+                //       for examples.
+                var sourceProperties = getPropertiesOfObjectType(source);
+                var sourcePropertiesFiltered = findDiscriminantProperties(sourceProperties, target);
+                if (!sourcePropertiesFiltered)
+                    return 0 /* False */;
+                // Though we could compute the number of combinations as we generate
+                // the matrix, this would incur additional memory overhead due to
+                // array allocations. To reduce this overhead, we first compute
+                // the number of combinations to ensure we will not surpass our
+                // fixed limit before incurring the cost of any allocations:
+                var numCombinations = 1;
+                for (var _i = 0, sourcePropertiesFiltered_1 = sourcePropertiesFiltered; _i < sourcePropertiesFiltered_1.length; _i++) {
+                    var sourceProperty = sourcePropertiesFiltered_1[_i];
+                    numCombinations *= countTypes(getTypeOfSymbol(sourceProperty));
+                    if (numCombinations > 25) {
+                        // We've reached the complexity limit.
+                        return 0 /* False */;
+                    }
+                }
+                // Compute the set of types for each discriminant property.
+                var sourceDiscriminantTypes = new Array(sourcePropertiesFiltered.length);
+                var excludedProperties = ts.createUnderscoreEscapedMap();
+                for (var i = 0; i < sourcePropertiesFiltered.length; i++) {
+                    var sourceProperty = sourcePropertiesFiltered[i];
+                    var sourcePropertyType = getTypeOfSymbol(sourceProperty);
+                    sourceDiscriminantTypes[i] = sourcePropertyType.flags & 1048576 /* Union */
+                        ? sourcePropertyType.types
+                        : [sourcePropertyType];
+                    excludedProperties.set(sourceProperty.escapedName, true);
+                }
+                // Match each combination of the cartesian product of discriminant properties to one or more
+                // constituents of 'target'. If any combination does not have a match then 'source' is not relatable.
+                var discriminantCombinations = ts.cartesianProduct(sourceDiscriminantTypes);
+                var matchingTypes = [];
+                var _loop_9 = function (combination) {
+                    var hasMatch = false;
+                    outer: for (var _i = 0, _a = target.types; _i < _a.length; _i++) {
+                        var type = _a[_i];
+                        var _loop_10 = function (i) {
+                            var sourceProperty = sourcePropertiesFiltered[i];
+                            var targetProperty = getPropertyOfObjectType(type, sourceProperty.escapedName);
+                            if (!targetProperty)
+                                return "continue-outer";
+                            if (sourceProperty === targetProperty)
+                                return "continue";
+                            // We compare the source property to the target in the context of a single discriminant type.
+                            var related = propertyRelatedTo(source, target, sourceProperty, targetProperty, function (_) { return combination[i]; }, /*reportErrors*/ false);
+                            // If the target property could not be found, or if the properties were not related,
+                            // then this constituent is not a match.
+                            if (!related) {
+                                return "continue-outer";
+                            }
+                        };
+                        for (var i = 0; i < sourcePropertiesFiltered.length; i++) {
+                            var state_5 = _loop_10(i);
+                            switch (state_5) {
+                                case "continue-outer": continue outer;
+                            }
+                        }
+                        ts.pushIfUnique(matchingTypes, type, ts.equateValues);
+                        hasMatch = true;
+                    }
+                    if (!hasMatch) {
+                        return { value: 0 /* False */ };
+                    }
+                };
+                for (var _a = 0, discriminantCombinations_1 = discriminantCombinations; _a < discriminantCombinations_1.length; _a++) {
+                    var combination = discriminantCombinations_1[_a];
+                    var state_4 = _loop_9(combination);
+                    if (typeof state_4 === "object")
+                        return state_4.value;
+                }
+                // Compare the remaining non-discriminant properties of each match.
+                var result = -1 /* True */;
+                for (var _b = 0, matchingTypes_1 = matchingTypes; _b < matchingTypes_1.length; _b++) {
+                    var type = matchingTypes_1[_b];
+                    result &= propertiesRelatedTo(source, type, /*reportErrors*/ false, excludedProperties);
+                    if (result) {
+                        result &= signaturesRelatedTo(source, type, 0 /* Call */, /*reportStructuralErrors*/ false);
+                        if (result) {
+                            result &= signaturesRelatedTo(source, type, 1 /* Construct */, /*reportStructuralErrors*/ false);
+                            if (result) {
+                                result &= indexTypesRelatedTo(source, type, 0 /* String */, /*sourceIsPrimitive*/ false, /*reportStructuralErrors*/ false);
+                                if (result) {
+                                    result &= indexTypesRelatedTo(source, type, 1 /* Number */, /*sourceIsPrimitive*/ false, /*reportStructuralErrors*/ false);
+                                }
+                            }
+                        }
+                    }
+                    if (!result) {
+                        return result;
+                    }
+                }
+                return result;
+            }
+            function excludeProperties(properties, excludedProperties) {
+                if (!excludedProperties || properties.length === 0)
+                    return properties;
+                var result;
+                for (var i = 0; i < properties.length; i++) {
+                    if (!excludedProperties.has(properties[i].escapedName)) {
+                        if (result) {
+                            result.push(properties[i]);
+                        }
+                    }
+                    else if (!result) {
+                        result = properties.slice(0, i);
+                    }
+                }
+                return result || properties;
+            }
+            function isPropertySymbolTypeRelated(sourceProp, targetProp, getTypeOfSourceProperty, reportErrors) {
+                var targetIsOptional = strictNullChecks && !!(ts.getCheckFlags(targetProp) & 48 /* Partial */);
+                var source = getTypeOfSourceProperty(sourceProp);
+                if (ts.getCheckFlags(targetProp) & 65536 /* DeferredType */ && !getSymbolLinks(targetProp).type) {
+                    // Rather than resolving (and normalizing) the type, relate constituent-by-constituent without performing normalization or seconadary passes
+                    var links = getSymbolLinks(targetProp);
+                    ts.Debug.assertDefined(links.deferralParent);
+                    ts.Debug.assertDefined(links.deferralConstituents);
+                    var unionParent = !!(links.deferralParent.flags & 1048576 /* Union */);
+                    var result_7 = unionParent ? 0 /* False */ : -1 /* True */;
+                    var targetTypes = links.deferralConstituents;
+                    for (var _i = 0, targetTypes_3 = targetTypes; _i < targetTypes_3.length; _i++) {
+                        var targetType = targetTypes_3[_i];
+                        var related = isRelatedTo(source, targetType, /*reportErrors*/ false, /*headMessage*/ undefined, /*isIntersectionConstituent*/ !unionParent);
+                        if (!unionParent) {
+                            if (!related) {
+                                // Can't assign to a target individually - have to fallback to assigning to the _whole_ intersection (which forces normalization)
+                                return isRelatedTo(source, addOptionality(getTypeOfSymbol(targetProp), targetIsOptional), reportErrors);
+                            }
+                            result_7 &= related;
+                        }
+                        else {
+                            if (related) {
+                                return related;
+                            }
+                        }
+                    }
+                    if (unionParent && !result_7 && targetIsOptional) {
+                        result_7 = isRelatedTo(source, undefinedType);
+                    }
+                    if (unionParent && !result_7 && reportErrors) {
+                        // The easiest way to get the right errors here is to un-defer (which may be costly)
+                        // If it turns out this is too costly too often, we can replicate the error handling logic within
+                        // typeRelatedToSomeType without the discriminatable type branch (as that requires a manifest union
+                        // type on which to hand discriminable properties, which we are expressly trying to avoid here)
+                        return isRelatedTo(source, addOptionality(getTypeOfSymbol(targetProp), targetIsOptional), reportErrors);
+                    }
+                    return result_7;
+                }
+                else {
+                    return isRelatedTo(source, addOptionality(getTypeOfSymbol(targetProp), targetIsOptional), reportErrors);
+                }
+            }
+            function propertyRelatedTo(source, target, sourceProp, targetProp, getTypeOfSourceProperty, reportErrors) {
+                var sourcePropFlags = ts.getDeclarationModifierFlagsFromSymbol(sourceProp);
+                var targetPropFlags = ts.getDeclarationModifierFlagsFromSymbol(targetProp);
+                if (sourcePropFlags & 8 /* Private */ || targetPropFlags & 8 /* Private */) {
+                    var hasDifferingDeclarations = sourceProp.valueDeclaration !== targetProp.valueDeclaration;
+                    if (ts.getCheckFlags(sourceProp) & 1024 /* ContainsPrivate */ && hasDifferingDeclarations) {
+                        if (reportErrors) {
+                            reportError(ts.Diagnostics.Property_0_has_conflicting_declarations_and_is_inaccessible_in_type_1, symbolToString(sourceProp), typeToString(source));
+                        }
+                        return 0 /* False */;
+                    }
+                    if (hasDifferingDeclarations) {
+                        if (reportErrors) {
+                            if (sourcePropFlags & 8 /* Private */ && targetPropFlags & 8 /* Private */) {
+                                reportError(ts.Diagnostics.Types_have_separate_declarations_of_a_private_property_0, symbolToString(targetProp));
+                            }
+                            else {
+                                reportError(ts.Diagnostics.Property_0_is_private_in_type_1_but_not_in_type_2, symbolToString(targetProp), typeToString(sourcePropFlags & 8 /* Private */ ? source : target), typeToString(sourcePropFlags & 8 /* Private */ ? target : source));
+                            }
+                        }
+                        return 0 /* False */;
+                    }
+                }
+                else if (targetPropFlags & 16 /* Protected */) {
+                    if (!isValidOverrideOf(sourceProp, targetProp)) {
+                        if (reportErrors) {
+                            reportError(ts.Diagnostics.Property_0_is_protected_but_type_1_is_not_a_class_derived_from_2, symbolToString(targetProp), typeToString(getDeclaringClass(sourceProp) || source), typeToString(getDeclaringClass(targetProp) || target));
+                        }
+                        return 0 /* False */;
+                    }
+                }
+                else if (sourcePropFlags & 16 /* Protected */) {
+                    if (reportErrors) {
+                        reportError(ts.Diagnostics.Property_0_is_protected_in_type_1_but_public_in_type_2, symbolToString(targetProp), typeToString(source), typeToString(target));
+                    }
+                    return 0 /* False */;
+                }
+                // If the target comes from a partial union prop, allow `undefined` in the target type
+                var related = isPropertySymbolTypeRelated(sourceProp, targetProp, getTypeOfSourceProperty, reportErrors);
+                if (!related) {
+                    if (reportErrors) {
+                        reportError(ts.Diagnostics.Types_of_property_0_are_incompatible, symbolToString(targetProp));
+                    }
+                    return 0 /* False */;
+                }
+                // When checking for comparability, be more lenient with optional properties.
+                if (relation !== comparableRelation && sourceProp.flags & 16777216 /* Optional */ && !(targetProp.flags & 16777216 /* Optional */)) {
+                    // TypeScript 1.0 spec (April 2014): 3.8.3
+                    // S is a subtype of a type T, and T is a supertype of S if ...
+                    // S' and T are object types and, for each member M in T..
+                    // M is a property and S' contains a property N where
+                    // if M is a required property, N is also a required property
+                    // (M - property in T)
+                    // (N - property in S)
+                    if (reportErrors) {
+                        reportError(ts.Diagnostics.Property_0_is_optional_in_type_1_but_required_in_type_2, symbolToString(targetProp), typeToString(source), typeToString(target));
+                    }
+                    return 0 /* False */;
+                }
+                return related;
+            }
+            function propertiesRelatedTo(source, target, reportErrors, excludedProperties) {
                 if (relation === identityRelation) {
-                    return propertiesIdenticalTo(source, target);
+                    return propertiesIdenticalTo(source, target, excludedProperties);
                 }
                 var requireOptionalProperties = relation === subtypeRelation && !isObjectLiteralType(source) && !isEmptyArrayLiteralType(source) && !isTupleType(source);
                 var unmatchedProperty = getUnmatchedProperty(source, target, requireOptionalProperties, /*matchDiscriminantProperties*/ false);
                 if (unmatchedProperty) {
                     if (reportErrors) {
                         var props = ts.arrayFrom(getUnmatchedProperties(source, target, requireOptionalProperties, /*matchDiscriminantProperties*/ false));
+                        var shouldSkipElaboration = false;
                         if (!headMessage || (headMessage.code !== ts.Diagnostics.Class_0_incorrectly_implements_interface_1.code &&
                             headMessage.code !== ts.Diagnostics.Class_0_incorrectly_implements_class_1_Did_you_mean_to_extend_1_and_inherit_its_members_as_a_subclass.code)) {
-                            suppressNextError = true; // Retain top-level error for interface implementing issues, otherwise omit it
+                            shouldSkipElaboration = true; // Retain top-level error for interface implementing issues, otherwise omit it
                         }
                         if (props.length === 1) {
                             var propName = symbolToString(unmatchedProperty);
-                            reportError(ts.Diagnostics.Property_0_is_missing_in_type_1_but_required_in_type_2, propName, typeToString(source), typeToString(target));
+                            reportError.apply(void 0, [ts.Diagnostics.Property_0_is_missing_in_type_1_but_required_in_type_2, propName].concat(getTypeNamesForErrorDisplay(source, target)));
                             if (ts.length(unmatchedProperty.declarations)) {
                                 associateRelatedInfo(ts.createDiagnosticForNode(unmatchedProperty.declarations[0], ts.Diagnostics._0_is_declared_here, propName));
                             }
+                            if (shouldSkipElaboration) {
+                                overrideNextErrorInfo = errorInfo;
+                            }
                         }
-                        else if (props.length > 5) { // arbitrary cutoff for too-long list form
-                            reportError(ts.Diagnostics.Type_0_is_missing_the_following_properties_from_type_1_Colon_2_and_3_more, typeToString(source), typeToString(target), ts.map(props.slice(0, 4), function (p) { return symbolToString(p); }).join(", "), props.length - 4);
-                        }
-                        else {
-                            reportError(ts.Diagnostics.Type_0_is_missing_the_following_properties_from_type_1_Colon_2, typeToString(source), typeToString(target), ts.map(props, function (p) { return symbolToString(p); }).join(", "));
+                        else if (tryElaborateArrayLikeErrors(source, target, /*reportErrors*/ false)) {
+                            if (props.length > 5) { // arbitrary cutoff for too-long list form
+                                reportError(ts.Diagnostics.Type_0_is_missing_the_following_properties_from_type_1_Colon_2_and_3_more, typeToString(source), typeToString(target), ts.map(props.slice(0, 4), function (p) { return symbolToString(p); }).join(", "), props.length - 4);
+                            }
+                            else {
+                                reportError(ts.Diagnostics.Type_0_is_missing_the_following_properties_from_type_1_Colon_2, typeToString(source), typeToString(target), ts.map(props, function (p) { return symbolToString(p); }).join(", "));
+                            }
+                            if (shouldSkipElaboration) {
+                                overrideNextErrorInfo = errorInfo;
+                            }
                         }
+                        // ELSE: No array like or unmatched property error - just issue top level error (errorInfo = undefined)
                     }
                     return 0 /* False */;
                 }
                 if (isObjectLiteralType(target)) {
-                    for (var _i = 0, _a = getPropertiesOfType(source); _i < _a.length; _i++) {
+                    for (var _i = 0, _a = excludeProperties(getPropertiesOfType(source), excludedProperties); _i < _a.length; _i++) {
                         var sourceProp = _a[_i];
                         if (!getPropertyOfObjectType(target, sourceProp.escapedName)) {
                             var sourceType = getTypeOfSymbol(sourceProp);
@@ -43210,84 +44417,30 @@ var ts;
                         }
                     }
                 }
-                var properties = getPropertiesOfObjectType(target);
-                for (var _b = 0, properties_2 = properties; _b < properties_2.length; _b++) {
-                    var targetProp = properties_2[_b];
+                // We only call this for union target types when we're attempting to do excess property checking - in those cases, we want to get _all possible props_
+                // from the target union, across all members
+                var properties = target.flags & 1048576 /* Union */ ? getPossiblePropertiesOfUnionType(target) : getPropertiesOfType(target);
+                for (var _b = 0, _c = excludeProperties(properties, excludedProperties); _b < _c.length; _b++) {
+                    var targetProp = _c[_b];
                     if (!(targetProp.flags & 4194304 /* Prototype */)) {
                         var sourceProp = getPropertyOfType(source, targetProp.escapedName);
                         if (sourceProp && sourceProp !== targetProp) {
-                            if (isIgnoredJsxProperty(source, sourceProp, getTypeOfSymbol(targetProp))) {
-                                continue;
-                            }
-                            var sourcePropFlags = ts.getDeclarationModifierFlagsFromSymbol(sourceProp);
-                            var targetPropFlags = ts.getDeclarationModifierFlagsFromSymbol(targetProp);
-                            if (sourcePropFlags & 8 /* Private */ || targetPropFlags & 8 /* Private */) {
-                                var hasDifferingDeclarations = sourceProp.valueDeclaration !== targetProp.valueDeclaration;
-                                if (ts.getCheckFlags(sourceProp) & 512 /* ContainsPrivate */ && hasDifferingDeclarations) {
-                                    if (reportErrors) {
-                                        reportError(ts.Diagnostics.Property_0_has_conflicting_declarations_and_is_inaccessible_in_type_1, symbolToString(sourceProp), typeToString(source));
-                                    }
-                                    return 0 /* False */;
-                                }
-                                if (hasDifferingDeclarations) {
-                                    if (reportErrors) {
-                                        if (sourcePropFlags & 8 /* Private */ && targetPropFlags & 8 /* Private */) {
-                                            reportError(ts.Diagnostics.Types_have_separate_declarations_of_a_private_property_0, symbolToString(targetProp));
-                                        }
-                                        else {
-                                            reportError(ts.Diagnostics.Property_0_is_private_in_type_1_but_not_in_type_2, symbolToString(targetProp), typeToString(sourcePropFlags & 8 /* Private */ ? source : target), typeToString(sourcePropFlags & 8 /* Private */ ? target : source));
-                                        }
-                                    }
-                                    return 0 /* False */;
-                                }
-                            }
-                            else if (targetPropFlags & 16 /* Protected */) {
-                                if (!isValidOverrideOf(sourceProp, targetProp)) {
-                                    if (reportErrors) {
-                                        reportError(ts.Diagnostics.Property_0_is_protected_but_type_1_is_not_a_class_derived_from_2, symbolToString(targetProp), typeToString(getDeclaringClass(sourceProp) || source), typeToString(getDeclaringClass(targetProp) || target));
-                                    }
-                                    return 0 /* False */;
-                                }
-                            }
-                            else if (sourcePropFlags & 16 /* Protected */) {
-                                if (reportErrors) {
-                                    reportError(ts.Diagnostics.Property_0_is_protected_in_type_1_but_public_in_type_2, symbolToString(targetProp), typeToString(source), typeToString(target));
-                                }
-                                return 0 /* False */;
-                            }
-                            var related = isRelatedTo(getTypeOfSymbol(sourceProp), getTypeOfSymbol(targetProp), reportErrors);
+                            var related = propertyRelatedTo(source, target, sourceProp, targetProp, getTypeOfSymbol, reportErrors);
                             if (!related) {
-                                if (reportErrors) {
-                                    reportError(ts.Diagnostics.Types_of_property_0_are_incompatible, symbolToString(targetProp));
-                                }
                                 return 0 /* False */;
                             }
                             result &= related;
-                            // When checking for comparability, be more lenient with optional properties.
-                            if (relation !== comparableRelation && sourceProp.flags & 16777216 /* Optional */ && !(targetProp.flags & 16777216 /* Optional */)) {
-                                // TypeScript 1.0 spec (April 2014): 3.8.3
-                                // S is a subtype of a type T, and T is a supertype of S if ...
-                                // S' and T are object types and, for each member M in T..
-                                // M is a property and S' contains a property N where
-                                // if M is a required property, N is also a required property
-                                // (M - property in T)
-                                // (N - property in S)
-                                if (reportErrors) {
-                                    reportError(ts.Diagnostics.Property_0_is_optional_in_type_1_but_required_in_type_2, symbolToString(targetProp), typeToString(source), typeToString(target));
-                                }
-                                return 0 /* False */;
-                            }
                         }
                     }
                 }
                 return result;
             }
-            function propertiesIdenticalTo(source, target) {
+            function propertiesIdenticalTo(source, target, excludedProperties) {
                 if (!(source.flags & 524288 /* Object */ && target.flags & 524288 /* Object */)) {
                     return 0 /* False */;
                 }
-                var sourceProperties = getPropertiesOfObjectType(source);
-                var targetProperties = getPropertiesOfObjectType(target);
+                var sourceProperties = excludeProperties(getPropertiesOfObjectType(source), excludedProperties);
+                var targetProperties = excludeProperties(getPropertiesOfObjectType(target), excludedProperties);
                 if (sourceProperties.length !== targetProperties.length) {
                     return 0 /* False */;
                 }
@@ -43407,7 +44560,7 @@ var ts;
                 var result = -1 /* True */;
                 for (var _i = 0, _a = getPropertiesOfObjectType(source); _i < _a.length; _i++) {
                     var prop = _a[_i];
-                    if (isIgnoredJsxProperty(source, prop, /*targetMemberType*/ undefined)) {
+                    if (isIgnoredJsxProperty(source, prop)) {
                         continue;
                     }
                     // Skip over symbol-named members
@@ -43439,7 +44592,7 @@ var ts;
                     return indexTypesIdenticalTo(source, target, kind);
                 }
                 var targetInfo = getIndexInfoOfType(target, kind);
-                if (!targetInfo || targetInfo.type.flags & 3 /* AnyOrUnknown */ && !sourceIsPrimitive) {
+                if (!targetInfo || targetInfo.type.flags & 1 /* Any */ && !sourceIsPrimitive) {
                     // Index signature of type any permits assignment from everything but primitives
                     return -1 /* True */;
                 }
@@ -43579,8 +44732,11 @@ var ts;
                 // The emptyArray singleton is used to signal a recursive invocation.
                 cache.variances = ts.emptyArray;
                 variances = [];
-                for (var _i = 0, typeParameters_1 = typeParameters; _i < typeParameters_1.length; _i++) {
-                    var tp = typeParameters_1[_i];
+                var _loop_11 = function (tp) {
+                    var unmeasurable = false;
+                    var unreliable = false;
+                    var oldHandler = outofbandVarianceMarkerHandler;
+                    outofbandVarianceMarkerHandler = function (onlyUnreliable) { return onlyUnreliable ? unreliable = true : unmeasurable = true; };
                     // We first compare instantiations where the type parameter is replaced with
                     // marker types that have a known subtype relationship. From this we can infer
                     // invariance, covariance, contravariance or bivariance.
@@ -43595,7 +44751,20 @@ var ts;
                     if (variance === 3 /* Bivariant */ && isTypeAssignableTo(createMarkerType(cache, tp, markerOtherType), typeWithSuper)) {
                         variance = 4 /* Independent */;
                     }
+                    outofbandVarianceMarkerHandler = oldHandler;
+                    if (unmeasurable || unreliable) {
+                        if (unmeasurable) {
+                            variance |= 8 /* Unmeasurable */;
+                        }
+                        if (unreliable) {
+                            variance |= 16 /* Unreliable */;
+                        }
+                    }
                     variances.push(variance);
+                };
+                for (var _i = 0, typeParameters_1 = typeParameters; _i < typeParameters_1.length; _i++) {
+                    var tp = typeParameters_1[_i];
+                    _loop_11(tp);
                 }
                 cache.variances = variances;
             }
@@ -43612,7 +44781,7 @@ var ts;
         // See comment at call in recursiveTypeRelatedTo for when this case matters.
         function hasCovariantVoidArgument(typeArguments, variances) {
             for (var i = 0; i < variances.length; i++) {
-                if (variances[i] === 1 /* Covariant */ && typeArguments[i].flags & 16384 /* Void */) {
+                if ((variances[i] & 7 /* VarianceMask */) === 1 /* Covariant */ && typeArguments[i].flags & 16384 /* Void */) {
                     return true;
                 }
             }
@@ -43790,18 +44959,24 @@ var ts;
             if (!(isMatchingSignature(source, target, partialMatch))) {
                 return 0 /* False */;
             }
-            // Check that the two signatures have the same number of type parameters. We might consider
-            // also checking that any type parameter constraints match, but that would require instantiating
-            // the constraints with a common set of type arguments to get relatable entities in places where
-            // type parameters occur in the constraints. The complexity of doing that doesn't seem worthwhile,
-            // particularly as we're comparing erased versions of the signatures below.
+            // Check that the two signatures have the same number of type parameters.
             if (ts.length(source.typeParameters) !== ts.length(target.typeParameters)) {
                 return 0 /* False */;
             }
-            // Spec 1.0 Section 3.8.3 & 3.8.4:
-            // M and N (the signatures) are instantiated using type Any as the type argument for all type parameters declared by M and N
-            source = getErasedSignature(source);
-            target = getErasedSignature(target);
+            // Check that type parameter constraints and defaults match. If they do, instantiate the source
+            // signature with the type parameters of the target signature and continue the comparison.
+            if (target.typeParameters) {
+                var mapper = createTypeMapper(source.typeParameters, target.typeParameters);
+                for (var i = 0; i < target.typeParameters.length; i++) {
+                    var s = source.typeParameters[i];
+                    var t = target.typeParameters[i];
+                    if (!(s === t || compareTypes(instantiateType(getConstraintFromTypeParameter(s), mapper) || unknownType, getConstraintFromTypeParameter(t) || unknownType) &&
+                        compareTypes(instantiateType(getDefaultFromTypeParameter(s), mapper) || unknownType, getDefaultFromTypeParameter(t) || unknownType))) {
+                        return 0 /* False */;
+                    }
+                }
+                source = instantiateSignature(source, mapper, /*eraseTypeParameters*/ true);
+            }
             var result = -1 /* True */;
             if (!ignoreThisTypes) {
                 var sourceThisType = getThisTypeOfSignature(source);
@@ -43903,7 +45078,7 @@ var ts;
             if (propType) {
                 return propType;
             }
-            if (everyType(type, isTupleType) && !everyType(type, function (t) { return !t.target.hasRestElement; })) {
+            if (everyType(type, isTupleType)) {
                 return mapType(type, function (t) { return getRestTypeOfTupleType(t) || undefinedType; });
             }
             return undefined;
@@ -43948,6 +45123,23 @@ var ts;
             }
             return type;
         }
+        function getWidenedLiteralLikeTypeForContextualReturnTypeIfNeeded(type, contextualSignatureReturnType, isAsync) {
+            if (type && isUnitType(type)) {
+                var contextualType = !contextualSignatureReturnType ? undefined :
+                    isAsync ? getPromisedTypeOfPromise(contextualSignatureReturnType) :
+                        contextualSignatureReturnType;
+                type = getWidenedLiteralLikeTypeForContextualType(type, contextualType);
+            }
+            return type;
+        }
+        function getWidenedLiteralLikeTypeForContextualIterationTypeIfNeeded(type, contextualSignatureReturnType, kind, isAsyncGenerator) {
+            if (type && isUnitType(type)) {
+                var contextualType = !contextualSignatureReturnType ? undefined :
+                    getIterationTypeOfGeneratorFunctionReturnType(kind, contextualSignatureReturnType, isAsyncGenerator);
+                type = getWidenedLiteralLikeTypeForContextualType(type, contextualType);
+            }
+            return type;
+        }
         /**
          * Check if a Type was written as a tuple type literal.
          * Prefer using isTupleLikeType() unless the use of `elementTypes` is required.
@@ -44037,16 +45229,40 @@ var ts;
         function getNonNullableType(type) {
             return strictNullChecks ? getGlobalNonNullableTypeInstantiation(type) : type;
         }
+        /**
+         * Is source potentially coercible to target type under `==`.
+         * Assumes that `source` is a constituent of a union, hence
+         * the boolean literal flag on the LHS, but not on the RHS.
+         *
+         * This does not fully replicate the semantics of `==`. The
+         * intention is to catch cases that are clearly not right.
+         *
+         * Comparing (string | number) to number should not remove the
+         * string element.
+         *
+         * Comparing (string | number) to 1 will remove the string
+         * element, though this is not sound. This is a pragmatic
+         * choice.
+         *
+         * @see narrowTypeByEquality
+         *
+         * @param source
+         * @param target
+         */
+        function isCoercibleUnderDoubleEquals(source, target) {
+            return ((source.flags & (8 /* Number */ | 4 /* String */ | 512 /* BooleanLiteral */)) !== 0)
+                && ((target.flags & (8 /* Number */ | 4 /* String */ | 16 /* Boolean */)) !== 0);
+        }
         /**
          * Return true if type was inferred from an object literal, written as an object type literal, or is the shape of a module
          * with no call or construct signatures.
          */
         function isObjectTypeWithInferableIndex(type) {
-            return type.symbol && (type.symbol.flags & (4096 /* ObjectLiteral */ | 2048 /* TypeLiteral */ | 512 /* ValueModule */)) !== 0 &&
+            return type.symbol && (type.symbol.flags & (4096 /* ObjectLiteral */ | 2048 /* TypeLiteral */ | 384 /* Enum */ | 512 /* ValueModule */)) !== 0 &&
                 !typeHasCallOrConstructSignatures(type);
         }
         function createSymbolWithType(source, type) {
-            var symbol = createSymbol(source.flags, source.escapedName);
+            var symbol = createSymbol(source.flags, source.escapedName, ts.getCheckFlags(source) & 8 /* Readonly */);
             symbol.declarations = source.declarations;
             symbol.parent = source.parent;
             symbol.type = type;
@@ -44165,34 +45381,42 @@ var ts;
             var stringIndexInfo = getIndexInfoOfType(type, 0 /* String */);
             var numberIndexInfo = getIndexInfoOfType(type, 1 /* Number */);
             var result = createAnonymousType(type.symbol, members, ts.emptyArray, ts.emptyArray, stringIndexInfo && createIndexInfo(getWidenedType(stringIndexInfo.type), stringIndexInfo.isReadonly), numberIndexInfo && createIndexInfo(getWidenedType(numberIndexInfo.type), numberIndexInfo.isReadonly));
-            result.objectFlags |= (ts.getObjectFlags(type) & 16384 /* JSLiteral */); // Retain js literal flag through widening
+            result.objectFlags |= (ts.getObjectFlags(type) & (16384 /* JSLiteral */ | 1048576 /* NonInferrableType */)); // Retain js literal flag through widening
             return result;
         }
         function getWidenedType(type) {
             return getWidenedTypeWithContext(type, /*context*/ undefined);
         }
         function getWidenedTypeWithContext(type, context) {
-            if (ts.getObjectFlags(type) & 393216 /* RequiresWidening */) {
+            if (ts.getObjectFlags(type) & 786432 /* RequiresWidening */) {
+                if (context === undefined && type.widened) {
+                    return type.widened;
+                }
+                var result = void 0;
                 if (type.flags & 98304 /* Nullable */) {
-                    return anyType;
+                    result = anyType;
                 }
-                if (isObjectLiteralType(type)) {
-                    return getWidenedTypeOfObjectLiteral(type, context);
+                else if (isObjectLiteralType(type)) {
+                    result = getWidenedTypeOfObjectLiteral(type, context);
                 }
-                if (type.flags & 1048576 /* Union */) {
+                else if (type.flags & 1048576 /* Union */) {
                     var unionContext_1 = context || createWideningContext(/*parent*/ undefined, /*propertyName*/ undefined, type.types);
                     var widenedTypes = ts.sameMap(type.types, function (t) { return t.flags & 98304 /* Nullable */ ? t : getWidenedTypeWithContext(t, unionContext_1); });
                     // Widening an empty object literal transitions from a highly restrictive type to
                     // a highly inclusive one. For that reason we perform subtype reduction here if the
                     // union includes empty object types (e.g. reducing {} | string to just {}).
-                    return getUnionType(widenedTypes, ts.some(widenedTypes, isEmptyObjectType) ? 2 /* Subtype */ : 1 /* Literal */);
+                    result = getUnionType(widenedTypes, ts.some(widenedTypes, isEmptyObjectType) ? 2 /* Subtype */ : 1 /* Literal */);
                 }
-                if (type.flags & 2097152 /* Intersection */) {
-                    return getIntersectionType(ts.sameMap(type.types, getWidenedType));
+                else if (type.flags & 2097152 /* Intersection */) {
+                    result = getIntersectionType(ts.sameMap(type.types, getWidenedType));
                 }
-                if (isArrayType(type) || isTupleType(type)) {
-                    return createTypeReference(type.target, ts.sameMap(type.typeArguments, getWidenedType));
+                else if (isArrayType(type) || isTupleType(type)) {
+                    result = createTypeReference(type.target, ts.sameMap(type.typeArguments, getWidenedType));
                 }
+                if (result && context === undefined) {
+                    type.widened = result;
+                }
+                return result || type;
             }
             return type;
         }
@@ -44209,7 +45433,7 @@ var ts;
          */
         function reportWideningErrorsInType(type) {
             var errorReported = false;
-            if (ts.getObjectFlags(type) & 131072 /* ContainsWideningType */) {
+            if (ts.getObjectFlags(type) & 262144 /* ContainsWideningType */) {
                 if (type.flags & 1048576 /* Union */) {
                     if (ts.some(type.types, isEmptyObjectType)) {
                         errorReported = true;
@@ -44235,7 +45459,7 @@ var ts;
                     for (var _d = 0, _e = getPropertiesOfObjectType(type); _d < _e.length; _d++) {
                         var p = _e[_d];
                         var t = getTypeOfSymbol(p);
-                        if (ts.getObjectFlags(t) & 131072 /* ContainsWideningType */) {
+                        if (ts.getObjectFlags(t) & 262144 /* ContainsWideningType */) {
                             if (!reportWideningErrorsInType(t)) {
                                 error(p.valueDeclaration, ts.Diagnostics.Object_literal_s_property_0_implicitly_has_an_1_type, symbolToString(p), typeToString(getWidenedType(t)));
                             }
@@ -44246,7 +45470,7 @@ var ts;
             }
             return errorReported;
         }
-        function reportImplicitAny(declaration, type) {
+        function reportImplicitAny(declaration, type, wideningKind) {
             var typeAsString = typeToString(getWidenedType(type));
             if (ts.isInJSFile(declaration) && !ts.isCheckJsEnabledForFile(ts.getSourceFileOfNode(declaration), compilerOptions)) {
                 // Only report implicit any errors/suggestions in TS and ts-check JS files
@@ -44254,12 +45478,12 @@ var ts;
             }
             var diagnostic;
             switch (declaration.kind) {
-                case 204 /* BinaryExpression */:
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
+                case 205 /* BinaryExpression */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
                     diagnostic = noImplicitAny ? ts.Diagnostics.Member_0_implicitly_has_an_1_type : ts.Diagnostics.Member_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage;
                     break;
-                case 151 /* Parameter */:
+                case 152 /* Parameter */:
                     var param = declaration;
                     if (ts.isIdentifier(param.name) &&
                         (ts.isCallSignatureDeclaration(param.parent) || ts.isMethodSignature(param.parent) || ts.isFunctionTypeNode(param.parent)) &&
@@ -44274,30 +45498,37 @@ var ts;
                         noImplicitAny ? ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type : ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type_but_a_better_type_may_be_inferred_from_usage :
                         noImplicitAny ? ts.Diagnostics.Parameter_0_implicitly_has_an_1_type : ts.Diagnostics.Parameter_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage;
                     break;
-                case 186 /* BindingElement */:
+                case 187 /* BindingElement */:
                     diagnostic = ts.Diagnostics.Binding_element_0_implicitly_has_an_1_type;
                     if (!noImplicitAny) {
                         // Don't issue a suggestion for binding elements since the codefix doesn't yet support them.
                         return;
                     }
                     break;
-                case 294 /* JSDocFunctionType */:
+                case 295 /* JSDocFunctionType */:
                     error(declaration, ts.Diagnostics.Function_type_which_lacks_return_type_annotation_implicitly_has_an_0_return_type, typeAsString);
                     return;
-                case 239 /* FunctionDeclaration */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
+                case 240 /* FunctionDeclaration */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
                     if (noImplicitAny && !declaration.name) {
-                        error(declaration, ts.Diagnostics.Function_expression_which_lacks_return_type_annotation_implicitly_has_an_0_return_type, typeAsString);
+                        if (wideningKind === 1 /* GeneratorYield */) {
+                            error(declaration, ts.Diagnostics.Generator_implicitly_has_yield_type_0_because_it_does_not_yield_any_values_Consider_supplying_a_return_type_annotation, typeAsString);
+                        }
+                        else {
+                            error(declaration, ts.Diagnostics.Function_expression_which_lacks_return_type_annotation_implicitly_has_an_0_return_type, typeAsString);
+                        }
                         return;
                     }
-                    diagnostic = noImplicitAny ? ts.Diagnostics._0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type : ts.Diagnostics._0_implicitly_has_an_1_return_type_but_a_better_type_may_be_inferred_from_usage;
+                    diagnostic = !noImplicitAny ? ts.Diagnostics._0_implicitly_has_an_1_return_type_but_a_better_type_may_be_inferred_from_usage :
+                        wideningKind === 1 /* GeneratorYield */ ? ts.Diagnostics._0_which_lacks_return_type_annotation_implicitly_has_an_1_yield_type :
+                            ts.Diagnostics._0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type;
                     break;
-                case 181 /* MappedType */:
+                case 182 /* MappedType */:
                     if (noImplicitAny) {
                         error(declaration, ts.Diagnostics.Mapped_object_type_implicitly_has_an_any_template_type);
                     }
@@ -44307,15 +45538,15 @@ var ts;
             }
             errorOrSuggestion(noImplicitAny, declaration, diagnostic, ts.declarationNameToString(ts.getNameOfDeclaration(declaration)), typeAsString);
         }
-        function reportErrorsFromWidening(declaration, type) {
-            if (produceDiagnostics && noImplicitAny && ts.getObjectFlags(type) & 131072 /* ContainsWideningType */) {
+        function reportErrorsFromWidening(declaration, type, wideningKind) {
+            if (produceDiagnostics && noImplicitAny && ts.getObjectFlags(type) & 262144 /* ContainsWideningType */) {
                 // Report implicit any error within type if possible, otherwise report error on declaration
                 if (!reportWideningErrorsInType(type)) {
-                    reportImplicitAny(declaration, type);
+                    reportImplicitAny(declaration, type, wideningKind);
                 }
             }
         }
-        function forEachMatchingParameterType(source, target, callback) {
+        function applyToParameterTypes(source, target, callback) {
             var sourceCount = getParameterCount(source);
             var targetCount = getParameterCount(target);
             var sourceRestType = getEffectiveRestType(source);
@@ -44336,25 +45567,55 @@ var ts;
                 callback(getRestTypeAtPosition(source, paramCount), targetRestType);
             }
         }
-        function createInferenceContext(typeParameters, signature, flags, compareTypes, baseInferences) {
-            var inferences = baseInferences ? baseInferences.map(cloneInferenceInfo) : typeParameters.map(createInferenceInfo);
-            var context = mapper;
-            context.typeParameters = typeParameters;
-            context.signature = signature;
-            context.inferences = inferences;
-            context.flags = flags;
-            context.compareTypes = compareTypes || compareTypesAssignable;
+        function applyToReturnTypes(source, target, callback) {
+            var sourceTypePredicate = getTypePredicateOfSignature(source);
+            var targetTypePredicate = getTypePredicateOfSignature(target);
+            if (sourceTypePredicate && targetTypePredicate && sourceTypePredicate.kind === targetTypePredicate.kind &&
+                (sourceTypePredicate.kind === 0 /* This */ || sourceTypePredicate.parameterIndex === targetTypePredicate.parameterIndex)) {
+                callback(sourceTypePredicate.type, targetTypePredicate.type);
+            }
+            else {
+                callback(getReturnTypeOfSignature(source), getReturnTypeOfSignature(target));
+            }
+        }
+        function createInferenceContext(typeParameters, signature, flags, compareTypes) {
+            return createInferenceContextWorker(typeParameters.map(createInferenceInfo), signature, flags, compareTypes || compareTypesAssignable);
+        }
+        function cloneInferenceContext(context, extraFlags) {
+            if (extraFlags === void 0) { extraFlags = 0; }
+            return context && createInferenceContextWorker(ts.map(context.inferences, cloneInferenceInfo), context.signature, context.flags | extraFlags, context.compareTypes);
+        }
+        function createInferenceContextWorker(inferences, signature, flags, compareTypes) {
+            var context = {
+                inferences: inferences,
+                signature: signature,
+                flags: flags,
+                compareTypes: compareTypes,
+                mapper: function (t) { return mapToInferredType(context, t, /*fix*/ true); },
+                nonFixingMapper: function (t) { return mapToInferredType(context, t, /*fix*/ false); },
+            };
             return context;
-            function mapper(t) {
-                for (var i = 0; i < inferences.length; i++) {
-                    if (t === inferences[i].typeParameter) {
-                        if (!(context.flags & 4 /* NoFixing */)) {
-                            inferences[i].isFixed = true;
-                        }
-                        return getInferredType(context, i);
+        }
+        function mapToInferredType(context, t, fix) {
+            var inferences = context.inferences;
+            for (var i = 0; i < inferences.length; i++) {
+                var inference = inferences[i];
+                if (t === inference.typeParameter) {
+                    if (fix && !inference.isFixed) {
+                        clearCachedInferences(inferences);
+                        inference.isFixed = true;
                     }
+                    return getInferredType(context, i);
+                }
+            }
+            return t;
+        }
+        function clearCachedInferences(inferences) {
+            for (var _i = 0, inferences_1 = inferences; _i < inferences_1.length; _i++) {
+                var inference = inferences_1[_i];
+                if (!inference.isFixed) {
+                    inference.inferredType = undefined;
                 }
-                return t;
             }
         }
         function createInferenceInfo(typeParameter) {
@@ -44379,6 +45640,9 @@ var ts;
                 isFixed: inference.isFixed
             };
         }
+        function getMapperFromContext(context) {
+            return context && context.mapper;
+        }
         // Return true if the given type could possibly reference a type parameter for which
         // we perform type inference (i.e. a type parameter of a generic function). We cache
         // results for union and intersection types for performance reasons.
@@ -44386,7 +45650,7 @@ var ts;
             var objectFlags = ts.getObjectFlags(type);
             return !!(type.flags & 63176704 /* Instantiable */ ||
                 objectFlags & 4 /* Reference */ && ts.forEach(type.typeArguments, couldContainTypeVariables) ||
-                objectFlags & 16 /* Anonymous */ && type.symbol && type.symbol.flags & (16 /* Function */ | 8192 /* Method */ | 2048 /* TypeLiteral */ | 32 /* Class */) ||
+                objectFlags & 16 /* Anonymous */ && type.symbol && type.symbol.flags & (16 /* Function */ | 8192 /* Method */ | 32 /* Class */ | 2048 /* TypeLiteral */ | 4096 /* ObjectLiteral */) && type.symbol.declarations ||
                 objectFlags & 32 /* Mapped */ ||
                 type.flags & 3145728 /* UnionOrIntersection */ && couldUnionOrIntersectionContainTypeVariables(type));
         }
@@ -44397,7 +45661,10 @@ var ts;
             return type.couldContainTypeVariables;
         }
         function isTypeParameterAtTopLevel(type, typeParameter) {
-            return type === typeParameter || !!(type.flags & 3145728 /* UnionOrIntersection */) && ts.some(type.types, function (t) { return isTypeParameterAtTopLevel(t, typeParameter); });
+            return !!(type === typeParameter ||
+                type.flags & 3145728 /* UnionOrIntersection */ && ts.some(type.types, function (t) { return isTypeParameterAtTopLevel(t, typeParameter); }) ||
+                type.flags & 16777216 /* Conditional */ && (isTypeParameterAtTopLevel(getTrueTypeFromConditionalType(type), typeParameter) ||
+                    isTypeParameterAtTopLevel(getFalseTypeFromConditionalType(type), typeParameter)));
         }
         /** Create an object with properties named in the string literal type. Every property has type `any` */
         function createEmptyObjectTypeFromStringLiteral(type) {
@@ -44434,19 +45701,20 @@ var ts;
             reverseMappedCache.set(key, type);
             return type;
         }
+        // We consider a type to be partially inferable if it isn't marked non-inferable or if it is
+        // an object literal type with at least one property of an inferable type. For example, an object
+        // literal { a: 123, b: x => true } is marked non-inferable because it contains a context sensitive
+        // arrow function, but is considered partially inferable because property 'a' has an inferable type.
+        function isPartiallyInferableType(type) {
+            return !(ts.getObjectFlags(type) & 1048576 /* NonInferrableType */) ||
+                isObjectLiteralType(type) && ts.some(getPropertiesOfType(type), function (prop) { return isPartiallyInferableType(getTypeOfSymbol(prop)); });
+        }
         function createReverseMappedType(source, target, constraint) {
-            var properties = getPropertiesOfType(source);
-            if (properties.length === 0 && !getIndexInfoOfType(source, 0 /* String */)) {
+            // We consider a source type reverse mappable if it has a string index signature or if
+            // it has one or more properties and is of a partially inferable type.
+            if (!(getIndexInfoOfType(source, 0 /* String */) || getPropertiesOfType(source).length !== 0 && isPartiallyInferableType(source))) {
                 return undefined;
             }
-            // If any property contains context sensitive functions that have been skipped, the source type
-            // is incomplete and we can't infer a meaningful input type.
-            for (var _i = 0, properties_3 = properties; _i < properties_3.length; _i++) {
-                var prop = properties_3[_i];
-                if (ts.getObjectFlags(getTypeOfSymbol(prop)) & 524288 /* ContainsAnyFunctionType */) {
-                    return undefined;
-                }
-            }
             // For arrays and tuples we infer new arrays and tuples where the reverse mapping has been
             // applied to the element type(s).
             if (isArrayType(source)) {
@@ -44474,20 +45742,20 @@ var ts;
             var templateType = getTemplateTypeFromMappedType(target);
             var inference = createInferenceInfo(typeParameter);
             inferTypes([inference], sourceType, templateType);
-            return getTypeFromInference(inference);
+            return getTypeFromInference(inference) || unknownType;
         }
         function getUnmatchedProperties(source, target, requireOptionalProperties, matchDiscriminantProperties) {
-            var properties, _i, properties_4, targetProp, sourceProp, targetType, sourceType;
+            var properties, _i, properties_2, targetProp, sourceProp, targetType, sourceType;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        properties = target.flags & 2097152 /* Intersection */ ? getPropertiesOfUnionOrIntersectionType(target) : getPropertiesOfObjectType(target);
-                        _i = 0, properties_4 = properties;
+                        properties = target.flags & 1048576 /* Union */ ? getPossiblePropertiesOfUnionType(target) : getPropertiesOfType(target);
+                        _i = 0, properties_2 = properties;
                         _a.label = 1;
                     case 1:
-                        if (!(_i < properties_4.length)) return [3 /*break*/, 6];
-                        targetProp = properties_4[_i];
-                        if (!(requireOptionalProperties || !(targetProp.flags & 16777216 /* Optional */))) return [3 /*break*/, 5];
+                        if (!(_i < properties_2.length)) return [3 /*break*/, 6];
+                        targetProp = properties_2[_i];
+                        if (!(requireOptionalProperties || !(targetProp.flags & 16777216 /* Optional */ || ts.getCheckFlags(targetProp) & 48 /* Partial */))) return [3 /*break*/, 5];
                         sourceProp = getPropertyOfType(source, targetProp.escapedName);
                         if (!!sourceProp) return [3 /*break*/, 3];
                         return [4 /*yield*/, targetProp];
@@ -44512,7 +45780,9 @@ var ts;
             });
         }
         function getUnmatchedProperty(source, target, requireOptionalProperties, matchDiscriminantProperties) {
-            return getUnmatchedProperties(source, target, requireOptionalProperties, matchDiscriminantProperties).next().value;
+            var result = getUnmatchedProperties(source, target, requireOptionalProperties, matchDiscriminantProperties).next();
+            if (!result.done)
+                return result.value;
         }
         function tupleTypesDefinitelyUnrelated(source, target) {
             return target.target.minLength > source.target.minLength ||
@@ -44528,15 +45798,17 @@ var ts;
         function getTypeFromInference(inference) {
             return inference.candidates ? getUnionType(inference.candidates, 2 /* Subtype */) :
                 inference.contraCandidates ? getIntersectionType(inference.contraCandidates) :
-                    emptyObjectType;
+                    undefined;
         }
-        function inferTypes(inferences, originalSource, originalTarget, priority) {
+        function inferTypes(inferences, originalSource, originalTarget, priority, contravariant) {
             if (priority === void 0) { priority = 0; }
+            if (contravariant === void 0) { contravariant = false; }
             var symbolStack;
             var visited;
-            var contravariant = false;
             var bivariant = false;
             var propagationType;
+            var inferenceCount = 0;
+            var inferenceIncomplete = false;
             var allowComplexConstraintInference = true;
             inferFromTypes(originalSource, originalTarget);
             function inferFromTypes(source, target) {
@@ -44556,11 +45828,7 @@ var ts;
                 if (source.aliasSymbol && source.aliasTypeArguments && source.aliasSymbol === target.aliasSymbol) {
                     // Source and target are types originating in the same generic type alias declaration.
                     // Simply infer from source type arguments to target type arguments.
-                    var sourceTypes = source.aliasTypeArguments;
-                    var targetTypes = target.aliasTypeArguments;
-                    for (var i = 0; i < sourceTypes.length; i++) {
-                        inferFromTypes(sourceTypes[i], targetTypes[i]);
-                    }
+                    inferFromTypeArguments(source.aliasTypeArguments, target.aliasTypeArguments, getAliasVariances(source.aliasSymbol));
                     return;
                 }
                 if (source.flags & 1048576 /* Union */ && target.flags & 1048576 /* Union */ && !(source.flags & 1024 /* EnumLiteral */ && target.flags & 1024 /* EnumLiteral */) ||
@@ -44583,25 +45851,34 @@ var ts;
                     var matchingTypes = void 0;
                     for (var _b = 0, _c = source.types; _b < _c.length; _b++) {
                         var t = _c[_b];
-                        if (typeIdenticalToSomeType(t, target.types)) {
-                            (matchingTypes || (matchingTypes = [])).push(t);
-                            inferFromTypes(t, t);
-                        }
-                        else if (t.flags & (256 /* NumberLiteral */ | 128 /* StringLiteral */)) {
-                            var b = getBaseTypeOfLiteralType(t);
-                            if (typeIdenticalToSomeType(b, target.types)) {
-                                (matchingTypes || (matchingTypes = [])).push(t, b);
-                            }
+                        var matched = findMatchedType(t, target);
+                        if (matched) {
+                            (matchingTypes || (matchingTypes = [])).push(matched);
+                            inferFromTypes(matched, matched);
                         }
                     }
                     // Next, to improve the quality of inferences, reduce the source and target types by
                     // removing the identically matched constituents. For example, when inferring from
                     // 'string | string[]' to 'string | T' we reduce the types to 'string[]' and 'T'.
                     if (matchingTypes) {
-                        source = removeTypesFromUnionOrIntersection(source, matchingTypes);
-                        target = removeTypesFromUnionOrIntersection(target, matchingTypes);
+                        var s = removeTypesFromUnionOrIntersection(source, matchingTypes);
+                        var t = removeTypesFromUnionOrIntersection(target, matchingTypes);
+                        if (!(s && t))
+                            return;
+                        source = s;
+                        target = t;
                     }
                 }
+                else if (target.flags & 1048576 /* Union */ && !(target.flags & 1024 /* EnumLiteral */) || target.flags & 2097152 /* Intersection */) {
+                    var matched = findMatchedType(source, target);
+                    if (matched) {
+                        inferFromTypes(matched, matched);
+                        return;
+                    }
+                }
+                else if (target.flags & (8388608 /* IndexedAccess */ | 33554432 /* Substitution */)) {
+                    target = getActualTypeVariable(target);
+                }
                 if (target.flags & 8650752 /* TypeVariable */) {
                     // If target is a type parameter, make an inference, unless the source type contains
                     // the anyFunctionType (the wildcard type that's used to avoid contextually typing functions).
@@ -44610,7 +45887,7 @@ var ts;
                     // not contain anyFunctionType when we come back to this argument for its second round
                     // of inference. Also, we exclude inferences for silentNeverType (which is used as a wildcard
                     // when constructing types from type parameters that had no inference candidates).
-                    if (ts.getObjectFlags(source) & 524288 /* ContainsAnyFunctionType */ || source === silentNeverType || (priority & 8 /* ReturnType */ && (source === autoType || source === autoArrayType))) {
+                    if (ts.getObjectFlags(source) & 1048576 /* NonInferrableType */ || source === silentNeverType || (priority & 16 /* ReturnType */ && (source === autoType || source === autoArrayType))) {
                         return;
                     }
                     var inference = getInferenceInfoForType(target);
@@ -44627,54 +45904,46 @@ var ts;
                                 // We make contravariant inferences only if we are in a pure contravariant position,
                                 // i.e. only if we have not descended into a bivariant position.
                                 if (contravariant && !bivariant) {
-                                    inference.contraCandidates = ts.appendIfUnique(inference.contraCandidates, candidate);
+                                    if (!ts.contains(inference.contraCandidates, candidate)) {
+                                        inference.contraCandidates = ts.append(inference.contraCandidates, candidate);
+                                        clearCachedInferences(inferences);
+                                    }
                                 }
-                                else {
-                                    inference.candidates = ts.appendIfUnique(inference.candidates, candidate);
+                                else if (!ts.contains(inference.candidates, candidate)) {
+                                    inference.candidates = ts.append(inference.candidates, candidate);
+                                    clearCachedInferences(inferences);
                                 }
                             }
-                            if (!(priority & 8 /* ReturnType */) && target.flags & 262144 /* TypeParameter */ && !isTypeParameterAtTopLevel(originalTarget, target)) {
+                            if (!(priority & 16 /* ReturnType */) && target.flags & 262144 /* TypeParameter */ && inference.topLevel && !isTypeParameterAtTopLevel(originalTarget, target)) {
                                 inference.topLevel = false;
+                                clearCachedInferences(inferences);
                             }
                         }
+                        inferenceCount++;
                         return;
                     }
                     else {
                         // Infer to the simplified version of an indexed access, if possible, to (hopefully) expose more bare type parameters to the inference engine
-                        var simplified = getSimplifiedType(target);
+                        var simplified = getSimplifiedType(target, /*writing*/ false);
                         if (simplified !== target) {
-                            inferFromTypesOnce(source, simplified);
+                            invokeOnce(source, simplified, inferFromTypes);
                         }
                         else if (target.flags & 8388608 /* IndexedAccess */) {
-                            var indexType = getSimplifiedType(target.indexType);
+                            var indexType = getSimplifiedType(target.indexType, /*writing*/ false);
                             // Generally simplifications of instantiable indexes are avoided to keep relationship checking correct, however if our target is an access, we can consider
                             // that key of that access to be "instantiated", since we're looking to find the infernce goal in any way we can.
                             if (indexType.flags & 63176704 /* Instantiable */) {
-                                var simplified_1 = distributeIndexOverObjectType(getSimplifiedType(target.objectType), indexType);
+                                var simplified_1 = distributeIndexOverObjectType(getSimplifiedType(target.objectType, /*writing*/ false), indexType, /*writing*/ false);
                                 if (simplified_1 && simplified_1 !== target) {
-                                    inferFromTypesOnce(source, simplified_1);
+                                    invokeOnce(source, simplified_1, inferFromTypes);
                                 }
                             }
                         }
                     }
                 }
-                else if (target.flags & 33554432 /* Substitution */) {
-                    inferFromTypes(source, target.typeVariable);
-                }
-                if (ts.getObjectFlags(source) & 4 /* Reference */ && ts.getObjectFlags(target) & 4 /* Reference */ && source.target === target.target) {
+                if (ts.getObjectFlags(source) & 4 /* Reference */ && ts.getObjectFlags(target) & 4 /* Reference */ && (source.target === target.target || isArrayType(source) && isArrayType(target))) {
                     // If source and target are references to the same generic type, infer from type arguments
-                    var sourceTypes = source.typeArguments || ts.emptyArray;
-                    var targetTypes = target.typeArguments || ts.emptyArray;
-                    var count = sourceTypes.length < targetTypes.length ? sourceTypes.length : targetTypes.length;
-                    var variances = getVariances(source.target);
-                    for (var i = 0; i < count; i++) {
-                        if (i < variances.length && variances[i] === 2 /* Contravariant */) {
-                            inferFromContravariantTypes(sourceTypes[i], targetTypes[i]);
-                        }
-                        else {
-                            inferFromTypes(sourceTypes[i], targetTypes[i]);
-                        }
-                    }
+                    inferFromTypeArguments(source.typeArguments || ts.emptyArray, target.typeArguments || ts.emptyArray, getVariances(source.target));
                 }
                 else if (source.flags & 4194304 /* Index */ && target.flags & 4194304 /* Index */) {
                     contravariant = !contravariant;
@@ -44685,7 +45954,7 @@ var ts;
                     var empty = createEmptyObjectTypeFromStringLiteral(source);
                     contravariant = !contravariant;
                     var savePriority = priority;
-                    priority |= 16 /* LiteralKeyof */;
+                    priority |= 32 /* LiteralKeyof */;
                     inferFromTypes(empty, target.type);
                     priority = savePriority;
                     contravariant = !contravariant;
@@ -44700,34 +45969,23 @@ var ts;
                     inferFromTypes(getTrueTypeFromConditionalType(source), getTrueTypeFromConditionalType(target));
                     inferFromTypes(getFalseTypeFromConditionalType(source), getFalseTypeFromConditionalType(target));
                 }
-                else if (target.flags & 16777216 /* Conditional */) {
-                    inferFromTypes(source, getTrueTypeFromConditionalType(target));
-                    inferFromTypes(source, getFalseTypeFromConditionalType(target));
+                else if (target.flags & 16777216 /* Conditional */ && !contravariant) {
+                    var targetTypes = [getTrueTypeFromConditionalType(target), getFalseTypeFromConditionalType(target)];
+                    inferToMultipleTypes(source, targetTypes, target.flags);
                 }
                 else if (target.flags & 3145728 /* UnionOrIntersection */) {
-                    for (var _d = 0, _e = target.types; _d < _e.length; _d++) {
-                        var t = _e[_d];
-                        var savePriority = priority;
-                        // Inferences directly to naked type variables are given lower priority as they are
-                        // less specific. For example, when inferring from Promise<string> to T | Promise<T>,
-                        // we want to infer string for T, not Promise<string> | string.
-                        if (getInferenceInfoForType(t)) {
-                            priority |= 1 /* NakedTypeVariable */;
-                        }
-                        inferFromTypes(source, t);
-                        priority = savePriority;
-                    }
+                    inferToMultipleTypes(source, target.types, target.flags);
                 }
                 else if (source.flags & 1048576 /* Union */) {
                     // Source is a union or intersection type, infer from each constituent type
                     var sourceTypes = source.types;
-                    for (var _f = 0, sourceTypes_3 = sourceTypes; _f < sourceTypes_3.length; _f++) {
-                        var sourceType = sourceTypes_3[_f];
+                    for (var _d = 0, sourceTypes_3 = sourceTypes; _d < sourceTypes_3.length; _d++) {
+                        var sourceType = sourceTypes_3[_d];
                         inferFromTypes(sourceType, target);
                     }
                 }
                 else {
-                    if (!(priority & 32 /* NoConstraints */ && source.flags & (2097152 /* Intersection */ | 63176704 /* Instantiable */))) {
+                    if (!(priority & 64 /* NoConstraints */ && source.flags & (2097152 /* Intersection */ | 63176704 /* Instantiable */))) {
                         var apparentSource = getApparentType(source);
                         // getApparentType can return _any_ type, since an indexed access or conditional may simplify to any other type.
                         // If that occurs and it doesn't simplify to an object or intersection, we'll need to restart `inferFromTypes`
@@ -44746,41 +46004,35 @@ var ts;
                         source = apparentSource;
                     }
                     if (source.flags & (524288 /* Object */ | 2097152 /* Intersection */)) {
-                        var key = source.id + "," + target.id;
-                        if (visited && visited.get(key)) {
-                            return;
-                        }
-                        (visited || (visited = ts.createMap())).set(key, true);
-                        // If we are already processing another target type with the same associated symbol (such as
-                        // an instantiation of the same generic type), we do not explore this target as it would yield
-                        // no further inferences. We exclude the static side of classes from this check since it shares
-                        // its symbol with the instance side which would lead to false positives.
-                        var isNonConstructorObject = target.flags & 524288 /* Object */ &&
-                            !(ts.getObjectFlags(target) & 16 /* Anonymous */ && target.symbol && target.symbol.flags & 32 /* Class */);
-                        var symbol = isNonConstructorObject ? target.symbol : undefined;
-                        if (symbol) {
-                            if (ts.contains(symbolStack, symbol)) {
-                                return;
-                            }
-                            (symbolStack || (symbolStack = [])).push(symbol);
-                            inferFromObjectTypes(source, target);
-                            symbolStack.pop();
-                        }
-                        else {
-                            inferFromObjectTypes(source, target);
-                        }
+                        invokeOnce(source, target, inferFromObjectTypes);
                     }
                 }
-                function inferFromTypesOnce(source, target) {
-                    var key = source.id + "," + target.id;
-                    if (!visited || !visited.get(key)) {
-                        (visited || (visited = ts.createMap())).set(key, true);
-                        inferFromTypes(source, target);
+            }
+            function invokeOnce(source, target, action) {
+                var key = source.id + "," + target.id;
+                var count = visited && visited.get(key);
+                if (count !== undefined) {
+                    inferenceCount += count;
+                    return;
+                }
+                (visited || (visited = ts.createMap())).set(key, 0);
+                var startCount = inferenceCount;
+                action(source, target);
+                visited.set(key, inferenceCount - startCount);
+            }
+            function inferFromTypeArguments(sourceTypes, targetTypes, variances) {
+                var count = sourceTypes.length < targetTypes.length ? sourceTypes.length : targetTypes.length;
+                for (var i = 0; i < count; i++) {
+                    if (i < variances.length && (variances[i] & 7 /* VarianceMask */) === 2 /* Contravariant */) {
+                        inferFromContravariantTypes(sourceTypes[i], targetTypes[i]);
+                    }
+                    else {
+                        inferFromTypes(sourceTypes[i], targetTypes[i]);
                     }
                 }
             }
             function inferFromContravariantTypes(source, target) {
-                if (strictFunctionTypes || priority & 64 /* AlwaysStrict */) {
+                if (strictFunctionTypes || priority & 128 /* AlwaysStrict */) {
                     contravariant = !contravariant;
                     inferFromTypes(source, target);
                     contravariant = !contravariant;
@@ -44791,8 +46043,8 @@ var ts;
             }
             function getInferenceInfoForType(type) {
                 if (type.flags & 8650752 /* TypeVariable */) {
-                    for (var _i = 0, inferences_1 = inferences; _i < inferences_1.length; _i++) {
-                        var inference = inferences_1[_i];
+                    for (var _i = 0, inferences_2 = inferences; _i < inferences_2.length; _i++) {
+                        var inference = inferences_2[_i];
                         if (type === inference.typeParameter) {
                             return inference;
                         }
@@ -44800,6 +46052,74 @@ var ts;
                 }
                 return undefined;
             }
+            function inferToMultipleTypes(source, targets, targetFlags) {
+                var typeVariableCount = 0;
+                if (targetFlags & 1048576 /* Union */) {
+                    var nakedTypeVariable = void 0;
+                    var sources = source.flags & 1048576 /* Union */ ? source.types : [source];
+                    var matched_1 = new Array(sources.length);
+                    var saveInferenceIncomplete = inferenceIncomplete;
+                    inferenceIncomplete = false;
+                    // First infer to types that are not naked type variables. For each source type we
+                    // track whether inferences were made from that particular type to some target.
+                    for (var _i = 0, targets_1 = targets; _i < targets_1.length; _i++) {
+                        var t = targets_1[_i];
+                        if (getInferenceInfoForType(t)) {
+                            nakedTypeVariable = t;
+                            typeVariableCount++;
+                        }
+                        else {
+                            for (var i = 0; i < sources.length; i++) {
+                                var count = inferenceCount;
+                                inferFromTypes(sources[i], t);
+                                if (count !== inferenceCount)
+                                    matched_1[i] = true;
+                            }
+                        }
+                    }
+                    var inferenceComplete = !inferenceIncomplete;
+                    inferenceIncomplete = inferenceIncomplete || saveInferenceIncomplete;
+                    // If the target has a single naked type variable and inference completed (meaning we
+                    // explored the types fully), create a union of the source types from which no inferences
+                    // have been made so far and infer from that union to the naked type variable.
+                    if (typeVariableCount === 1 && inferenceComplete) {
+                        var unmatched = ts.flatMap(sources, function (s, i) { return matched_1[i] ? undefined : s; });
+                        if (unmatched.length) {
+                            inferFromTypes(getUnionType(unmatched), nakedTypeVariable);
+                            return;
+                        }
+                    }
+                }
+                else {
+                    // We infer from types that are not naked type variables first so that inferences we
+                    // make from nested naked type variables and given slightly higher priority by virtue
+                    // of being first in the candidates array.
+                    for (var _a = 0, targets_2 = targets; _a < targets_2.length; _a++) {
+                        var t = targets_2[_a];
+                        if (getInferenceInfoForType(t)) {
+                            typeVariableCount++;
+                        }
+                        else {
+                            inferFromTypes(source, t);
+                        }
+                    }
+                }
+                // Inferences directly to naked type variables are given lower priority as they are
+                // less specific. For example, when inferring from Promise<string> to T | Promise<T>,
+                // we want to infer string for T, not Promise<string> | string. For intersection types
+                // we only infer to single naked type variables.
+                if (targetFlags & 2097152 /* Intersection */ ? typeVariableCount === 1 : typeVariableCount > 0) {
+                    var savePriority = priority;
+                    priority |= 1 /* NakedTypeVariable */;
+                    for (var _b = 0, targets_3 = targets; _b < targets_3.length; _b++) {
+                        var t = targets_3[_b];
+                        if (getInferenceInfoForType(t)) {
+                            inferFromTypes(source, t);
+                        }
+                    }
+                    priority = savePriority;
+                }
+            }
             function inferToMappedType(source, target, constraintType) {
                 if (constraintType.flags & 1048576 /* Union */) {
                     var result = false;
@@ -44819,7 +46139,11 @@ var ts;
                         var inferredType = inferTypeForHomomorphicMappedType(source, target, constraintType);
                         if (inferredType) {
                             var savePriority = priority;
-                            priority |= 2 /* HomomorphicMappedType */;
+                            // We assign a lower priority to inferences made from types containing non-inferrable
+                            // types because we may only have a partial result (i.e. we may have failed to make
+                            // reverse inferences for some properties).
+                            priority |= ts.getObjectFlags(source) & 1048576 /* NonInferrableType */ ?
+                                4 /* PartialHomomorphicMappedType */ : 2 /* HomomorphicMappedType */;
                             inferFromTypes(inferredType, inference.typeParameter);
                             priority = savePriority;
                         }
@@ -44830,7 +46154,7 @@ var ts;
                     // We're inferring from some source type S to a mapped type { [P in K]: X }, where K is a type
                     // parameter. First infer from 'keyof S' to K.
                     var savePriority = priority;
-                    priority |= 4 /* MappedTypeConstraint */;
+                    priority |= 8 /* MappedTypeConstraint */;
                     inferFromTypes(getIndexType(source), constraintType);
                     priority = savePriority;
                     // If K is constrained to a type C, also infer to C. Thus, for a mapped type { [P in K]: X },
@@ -44843,16 +46167,37 @@ var ts;
                     }
                     // If no inferences can be made to K's constraint, infer from a union of the property types
                     // in the source to the template type X.
-                    var valueTypes = ts.compact([
-                        getIndexTypeOfType(source, 0 /* String */),
-                        getIndexTypeOfType(source, 1 /* Number */)
-                    ].concat(ts.map(getPropertiesOfType(source), getTypeOfSymbol)));
-                    inferFromTypes(getUnionType(valueTypes), getTemplateTypeFromMappedType(target));
+                    var propTypes = ts.map(getPropertiesOfType(source), getTypeOfSymbol);
+                    var stringIndexType = getIndexTypeOfType(source, 0 /* String */);
+                    var numberIndexInfo = getNonEnumNumberIndexInfo(source);
+                    var numberIndexType = numberIndexInfo && numberIndexInfo.type;
+                    inferFromTypes(getUnionType(ts.append(ts.append(propTypes, stringIndexType), numberIndexType)), getTemplateTypeFromMappedType(target));
                     return true;
                 }
                 return false;
             }
             function inferFromObjectTypes(source, target) {
+                // If we are already processing another target type with the same associated symbol (such as
+                // an instantiation of the same generic type), we do not explore this target as it would yield
+                // no further inferences. We exclude the static side of classes from this check since it shares
+                // its symbol with the instance side which would lead to false positives.
+                var isNonConstructorObject = target.flags & 524288 /* Object */ &&
+                    !(ts.getObjectFlags(target) & 16 /* Anonymous */ && target.symbol && target.symbol.flags & 32 /* Class */);
+                var symbol = isNonConstructorObject ? target.symbol : undefined;
+                if (symbol) {
+                    if (ts.contains(symbolStack, symbol)) {
+                        inferenceIncomplete = true;
+                        return;
+                    }
+                    (symbolStack || (symbolStack = [])).push(symbol);
+                    inferFromObjectTypesWorker(source, target);
+                    symbolStack.pop();
+                }
+                else {
+                    inferFromObjectTypesWorker(source, target);
+                }
+            }
+            function inferFromObjectTypesWorker(source, target) {
                 if (isGenericMappedType(source) && isGenericMappedType(target)) {
                     // The source and target types are generic types { [P in S]: X } and { [P in T]: Y }, so we infer
                     // from S to T and from X to Y.
@@ -44901,8 +46246,8 @@ var ts;
                     }
                 }
                 var properties = getPropertiesOfObjectType(target);
-                for (var _i = 0, properties_5 = properties; _i < properties_5.length; _i++) {
-                    var targetProp = properties_5[_i];
+                for (var _i = 0, properties_3 = properties; _i < properties_3.length; _i++) {
+                    var targetProp = properties_3[_i];
                     var sourceProp = getPropertyOfType(source, targetProp.escapedName);
                     if (sourceProp) {
                         inferFromTypes(getTypeOfSymbol(sourceProp), getTypeOfSymbol(targetProp));
@@ -44915,7 +46260,7 @@ var ts;
                 var sourceLen = sourceSignatures.length;
                 var targetLen = targetSignatures.length;
                 var len = sourceLen < targetLen ? sourceLen : targetLen;
-                var skipParameters = !!(ts.getObjectFlags(source) & 524288 /* ContainsAnyFunctionType */);
+                var skipParameters = !!(ts.getObjectFlags(source) & 1048576 /* NonInferrableType */);
                 for (var i = 0; i < len; i++) {
                     inferFromSignature(getBaseSignature(sourceSignatures[sourceLen - len + i]), getBaseSignature(targetSignatures[targetLen - len + i]), skipParameters);
                 }
@@ -44925,18 +46270,11 @@ var ts;
                     var saveBivariant = bivariant;
                     var kind = target.declaration ? target.declaration.kind : 0 /* Unknown */;
                     // Once we descend into a bivariant signature we remain bivariant for all nested inferences
-                    bivariant = bivariant || kind === 156 /* MethodDeclaration */ || kind === 155 /* MethodSignature */ || kind === 157 /* Constructor */;
-                    forEachMatchingParameterType(source, target, inferFromContravariantTypes);
+                    bivariant = bivariant || kind === 157 /* MethodDeclaration */ || kind === 156 /* MethodSignature */ || kind === 158 /* Constructor */;
+                    applyToParameterTypes(source, target, inferFromContravariantTypes);
                     bivariant = saveBivariant;
                 }
-                var sourceTypePredicate = getTypePredicateOfSignature(source);
-                var targetTypePredicate = getTypePredicateOfSignature(target);
-                if (sourceTypePredicate && targetTypePredicate && sourceTypePredicate.kind === targetTypePredicate.kind) {
-                    inferFromTypes(sourceTypePredicate.type, targetTypePredicate.type);
-                }
-                else {
-                    inferFromTypes(getReturnTypeOfSignature(source), getReturnTypeOfSignature(target));
-                }
+                applyToReturnTypes(source, target, inferFromTypes);
             }
             function inferFromIndexTypes(source, target) {
                 var targetStringIndexType = getIndexTypeOfType(target, 0 /* String */);
@@ -44958,15 +46296,33 @@ var ts;
                 }
             }
         }
-        function typeIdenticalToSomeType(type, types) {
+        function isMatchableType(type) {
+            // We exclude non-anonymous object types because some frameworks (e.g. Ember) rely on the ability to
+            // infer between types that don't witness their type variables. Such types would otherwise be eliminated
+            // because they appear identical.
+            return !(type.flags & 524288 /* Object */) || !!(ts.getObjectFlags(type) & 16 /* Anonymous */);
+        }
+        function typeMatchedBySomeType(type, types) {
             for (var _i = 0, types_11 = types; _i < types_11.length; _i++) {
                 var t = types_11[_i];
-                if (isTypeIdenticalTo(t, type)) {
+                if (t === type || isMatchableType(t) && isMatchableType(type) && isTypeIdenticalTo(t, type)) {
                     return true;
                 }
             }
             return false;
         }
+        function findMatchedType(type, target) {
+            if (typeMatchedBySomeType(type, target.types)) {
+                return type;
+            }
+            if (type.flags & (256 /* NumberLiteral */ | 128 /* StringLiteral */) && target.flags & 1048576 /* Union */) {
+                var base = getBaseTypeOfLiteralType(type);
+                if (typeMatchedBySomeType(base, target.types)) {
+                    return base;
+                }
+            }
+            return undefined;
+        }
         /**
          * Return a new union or intersection type computed by removing a given set of types
          * from a given union or intersection type.
@@ -44975,11 +46331,11 @@ var ts;
             var reducedTypes = [];
             for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
                 var t = _a[_i];
-                if (!typeIdenticalToSomeType(t, typesToRemove)) {
+                if (!typeMatchedBySomeType(t, typesToRemove)) {
                     reducedTypes.push(t);
                 }
             }
-            return type.flags & 1048576 /* Union */ ? getUnionType(reducedTypes) : getIntersectionType(reducedTypes);
+            return reducedTypes.length ? type.flags & 1048576 /* Union */ ? getUnionType(reducedTypes) : getIntersectionType(reducedTypes) : undefined;
         }
         function hasPrimitiveConstraint(type) {
             var constraint = getConstraintOfTypeParameter(type);
@@ -44988,22 +46344,25 @@ var ts;
         function isObjectLiteralType(type) {
             return !!(ts.getObjectFlags(type) & 128 /* ObjectLiteral */);
         }
-        function widenObjectLiteralCandidates(candidates) {
+        function isObjectOrArrayLiteralType(type) {
+            return !!(ts.getObjectFlags(type) & (128 /* ObjectLiteral */ | 65536 /* ArrayLiteral */));
+        }
+        function unionObjectAndArrayLiteralCandidates(candidates) {
             if (candidates.length > 1) {
-                var objectLiterals = ts.filter(candidates, isObjectLiteralType);
+                var objectLiterals = ts.filter(candidates, isObjectOrArrayLiteralType);
                 if (objectLiterals.length) {
-                    var objectLiteralsType = getWidenedType(getUnionType(objectLiterals, 2 /* Subtype */));
-                    return ts.concatenate(ts.filter(candidates, function (t) { return !isObjectLiteralType(t); }), [objectLiteralsType]);
+                    var literalsType = getUnionType(objectLiterals, 2 /* Subtype */);
+                    return ts.concatenate(ts.filter(candidates, function (t) { return !isObjectOrArrayLiteralType(t); }), [literalsType]);
                 }
             }
             return candidates;
         }
         function getContravariantInference(inference) {
-            return inference.priority & 28 /* PriorityImpliesCombination */ ? getIntersectionType(inference.contraCandidates) : getCommonSubtype(inference.contraCandidates);
+            return inference.priority & 56 /* PriorityImpliesCombination */ ? getIntersectionType(inference.contraCandidates) : getCommonSubtype(inference.contraCandidates);
         }
         function getCovariantInference(inference, signature) {
-            // Extract all object literal types and replace them with a single widened and normalized type.
-            var candidates = widenObjectLiteralCandidates(inference.candidates);
+            // Extract all object and array literal types and replace them with a single widened and normalized type.
+            var candidates = unionObjectAndArrayLiteralCandidates(inference.candidates);
             // We widen inferred literal types if
             // all inferences were made to top-level occurrences of the type parameter, and
             // the type parameter has no constraint or its constraint includes no primitive or literal types, and
@@ -45016,15 +46375,15 @@ var ts;
                     candidates;
             // If all inferences were made from a position that implies a combined result, infer a union type.
             // Otherwise, infer a common supertype.
-            var unwidenedType = inference.priority & 28 /* PriorityImpliesCombination */ ?
+            var unwidenedType = inference.priority & 56 /* PriorityImpliesCombination */ ?
                 getUnionType(baseCandidates, 2 /* Subtype */) :
                 getCommonSupertype(baseCandidates);
             return getWidenedType(unwidenedType);
         }
         function getInferredType(context, index) {
             var inference = context.inferences[index];
-            var inferredType = inference.inferredType;
-            if (!inferredType) {
+            if (!inference.inferredType) {
+                var inferredType = void 0;
                 var signature = context.signature;
                 if (signature) {
                     var inferredCovariantType = inference.candidates ? getCovariantInference(inference, signature) : undefined;
@@ -45053,31 +46412,26 @@ var ts;
                         if (defaultType) {
                             // Instantiate the default type. Any forward reference to a type
                             // parameter should be instantiated to the empty object type.
-                            inferredType = instantiateType(defaultType, combineTypeMappers(createBackreferenceMapper(context.typeParameters, index), context));
-                        }
-                        else {
-                            inferredType = getDefaultTypeArgumentType(!!(context.flags & 2 /* AnyDefault */));
+                            inferredType = instantiateType(defaultType, combineTypeMappers(createBackreferenceMapper(context, index), context.nonFixingMapper));
                         }
                     }
                 }
                 else {
                     inferredType = getTypeFromInference(inference);
                 }
-                inference.inferredType = inferredType;
+                inference.inferredType = inferredType || getDefaultTypeArgumentType(!!(context.flags & 2 /* AnyDefault */));
                 var constraint = getConstraintOfTypeParameter(inference.typeParameter);
                 if (constraint) {
-                    context.flags |= 4 /* NoFixing */;
-                    var instantiatedConstraint = instantiateType(constraint, context);
-                    if (!context.compareTypes(inferredType, getTypeWithThisArgument(instantiatedConstraint, inferredType))) {
+                    var instantiatedConstraint = instantiateType(constraint, context.nonFixingMapper);
+                    if (!inferredType || !context.compareTypes(inferredType, getTypeWithThisArgument(instantiatedConstraint, inferredType))) {
                         inference.inferredType = inferredType = instantiatedConstraint;
                     }
-                    context.flags &= ~4 /* NoFixing */;
                 }
             }
-            return inferredType;
+            return inference.inferredType;
         }
         function getDefaultTypeArgumentType(isInJavaScriptFile) {
-            return isInJavaScriptFile ? anyType : emptyObjectType;
+            return isInJavaScriptFile ? anyType : unknownType;
         }
         function getInferredTypes(context) {
             var result = [];
@@ -45087,8 +46441,8 @@ var ts;
             return result;
         }
         // EXPRESSION TYPE CHECKING
-        function getCannotFindNameDiagnosticForName(name) {
-            switch (name) {
+        function getCannotFindNameDiagnosticForName(node) {
+            switch (node.escapedText) {
                 case "document":
                 case "console":
                     return ts.Diagnostics.Cannot_find_name_0_Do_you_need_to_change_your_target_library_Try_changing_the_lib_compiler_option_to_include_dom;
@@ -45119,14 +46473,20 @@ var ts;
                 case "Iterator":
                 case "AsyncIterator":
                     return ts.Diagnostics.Cannot_find_name_0_Do_you_need_to_change_your_target_library_Try_changing_the_lib_compiler_option_to_es2015_or_later;
-                default: return ts.Diagnostics.Cannot_find_name_0;
+                default:
+                    if (node.parent.kind === 277 /* ShorthandPropertyAssignment */) {
+                        return ts.Diagnostics.No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer;
+                    }
+                    else {
+                        return ts.Diagnostics.Cannot_find_name_0;
+                    }
             }
         }
         function getResolvedSymbol(node) {
             var links = getNodeLinks(node);
             if (!links.resolvedSymbol) {
                 links.resolvedSymbol = !ts.nodeIsMissing(node) &&
-                    resolveName(node, node.escapedText, 67220415 /* Value */ | 1048576 /* ExportValue */, getCannotFindNameDiagnosticForName(node.escapedText), node, !ts.isWriteOnlyAccess(node), 
+                    resolveName(node, node.escapedText, 67220415 /* Value */ | 1048576 /* ExportValue */, getCannotFindNameDiagnosticForName(node), node, !ts.isWriteOnlyAccess(node), 
                     /*excludeGlobals*/ false, ts.Diagnostics.Cannot_find_name_0_Did_you_mean_1) || unknownSymbol;
             }
             return links.resolvedSymbol;
@@ -45135,7 +46495,7 @@ var ts;
             // TypeScript 1.0 spec (April 2014): 3.6.3
             // A type query consists of the keyword typeof followed by an expression.
             // The expression is restricted to a single identifier or a sequence of identifiers separated by periods
-            return !!ts.findAncestor(node, function (n) { return n.kind === 167 /* TypeQuery */ ? true : n.kind === 72 /* Identifier */ || n.kind === 148 /* QualifiedName */ ? false : "quit"; });
+            return !!ts.findAncestor(node, function (n) { return n.kind === 168 /* TypeQuery */ ? true : n.kind === 73 /* Identifier */ || n.kind === 149 /* QualifiedName */ ? false : "quit"; });
         }
         // Return the flow cache key for a "dotted name" (i.e. a sequence of identifiers
         // separated by dots). The key consists of the id of the symbol referenced by the
@@ -45143,21 +46503,21 @@ var ts;
         // The result is undefined if the reference isn't a dotted name. We prefix nodes
         // occurring in an apparent type position with '@' because the control flow type
         // of such nodes may be based on the apparent type instead of the declared type.
-        function getFlowCacheKey(node) {
+        function getFlowCacheKey(node, declaredType, initialType, flowContainer) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     var symbol = getResolvedSymbol(node);
-                    return symbol !== unknownSymbol ? (isConstraintPosition(node) ? "@" : "") + getSymbolId(symbol) : undefined;
-                case 100 /* ThisKeyword */:
+                    return symbol !== unknownSymbol ? (flowContainer ? getNodeId(flowContainer) : "-1") + "|" + getTypeId(declaredType) + "|" + getTypeId(initialType) + "|" + (isConstraintPosition(node) ? "@" : "") + getSymbolId(symbol) : undefined;
+                case 101 /* ThisKeyword */:
                     return "0";
-                case 213 /* NonNullExpression */:
-                case 195 /* ParenthesizedExpression */:
-                    return getFlowCacheKey(node.expression);
-                case 189 /* PropertyAccessExpression */:
-                case 190 /* ElementAccessExpression */:
+                case 214 /* NonNullExpression */:
+                case 196 /* ParenthesizedExpression */:
+                    return getFlowCacheKey(node.expression, declaredType, initialType, flowContainer);
+                case 190 /* PropertyAccessExpression */:
+                case 191 /* ElementAccessExpression */:
                     var propName = getAccessedPropertyName(node);
                     if (propName !== undefined) {
-                        var key = getFlowCacheKey(node.expression);
+                        var key = getFlowCacheKey(node.expression, declaredType, initialType, flowContainer);
                         return key && key + "." + propName;
                     }
             }
@@ -45165,24 +46525,24 @@ var ts;
         }
         function isMatchingReference(source, target) {
             switch (target.kind) {
-                case 195 /* ParenthesizedExpression */:
-                case 213 /* NonNullExpression */:
+                case 196 /* ParenthesizedExpression */:
+                case 214 /* NonNullExpression */:
                     return isMatchingReference(source, target.expression);
             }
             switch (source.kind) {
-                case 72 /* Identifier */:
-                    return target.kind === 72 /* Identifier */ && getResolvedSymbol(source) === getResolvedSymbol(target) ||
-                        (target.kind === 237 /* VariableDeclaration */ || target.kind === 186 /* BindingElement */) &&
+                case 73 /* Identifier */:
+                    return target.kind === 73 /* Identifier */ && getResolvedSymbol(source) === getResolvedSymbol(target) ||
+                        (target.kind === 238 /* VariableDeclaration */ || target.kind === 187 /* BindingElement */) &&
                             getExportSymbolOfValueSymbolIfExported(getResolvedSymbol(source)) === getSymbolOfNode(target);
-                case 100 /* ThisKeyword */:
-                    return target.kind === 100 /* ThisKeyword */;
-                case 98 /* SuperKeyword */:
-                    return target.kind === 98 /* SuperKeyword */;
-                case 213 /* NonNullExpression */:
-                case 195 /* ParenthesizedExpression */:
+                case 101 /* ThisKeyword */:
+                    return target.kind === 101 /* ThisKeyword */;
+                case 99 /* SuperKeyword */:
+                    return target.kind === 99 /* SuperKeyword */;
+                case 214 /* NonNullExpression */:
+                case 196 /* ParenthesizedExpression */:
                     return isMatchingReference(source.expression, target);
-                case 189 /* PropertyAccessExpression */:
-                case 190 /* ElementAccessExpression */:
+                case 190 /* PropertyAccessExpression */:
+                case 191 /* ElementAccessExpression */:
                     return ts.isAccessExpression(target) &&
                         getAccessedPropertyName(source) === getAccessedPropertyName(target) &&
                         isMatchingReference(source.expression, target.expression);
@@ -45190,7 +46550,7 @@ var ts;
             return false;
         }
         function getAccessedPropertyName(access) {
-            return access.kind === 189 /* PropertyAccessExpression */ ? access.name.escapedText :
+            return access.kind === 190 /* PropertyAccessExpression */ ? access.name.escapedText :
                 ts.isStringLiteral(access.argumentExpression) || ts.isNumericLiteral(access.argumentExpression) ? ts.escapeLeadingUnderscores(access.argumentExpression.text) :
                     undefined;
         }
@@ -45215,7 +46575,7 @@ var ts;
                 isDiscriminantProperty(getDeclaredTypeOfReference(target.expression), name);
         }
         function getDeclaredTypeOfReference(expr) {
-            if (expr.kind === 72 /* Identifier */) {
+            if (expr.kind === 73 /* Identifier */) {
                 return getTypeOfSymbol(getResolvedSymbol(expr));
             }
             if (ts.isAccessExpression(expr)) {
@@ -45237,7 +46597,7 @@ var ts;
                 if (prop && ts.getCheckFlags(prop) & 2 /* SyntheticProperty */) {
                     if (prop.isDiscriminantProperty === undefined) {
                         prop.isDiscriminantProperty =
-                            (prop.checkFlags & 96 /* Discriminant */) === 96 /* Discriminant */ &&
+                            (prop.checkFlags & 192 /* Discriminant */) === 192 /* Discriminant */ &&
                                 isDiscriminantType(getTypeOfSymbol(prop));
                     }
                     return !!prop.isDiscriminantProperty;
@@ -45246,7 +46606,7 @@ var ts;
             return false;
         }
         function isSyntheticThisPropertyAccess(expr) {
-            return ts.isAccessExpression(expr) && expr.expression.kind === 100 /* ThisKeyword */ && !!(expr.expression.flags & 8 /* Synthesized */);
+            return ts.isAccessExpression(expr) && expr.expression.kind === 101 /* ThisKeyword */ && !!(expr.expression.flags & 8 /* Synthesized */);
         }
         function findDiscriminantProperties(sourceProperties, target) {
             var result;
@@ -45274,7 +46634,7 @@ var ts;
                     }
                 }
             }
-            if (callExpression.expression.kind === 189 /* PropertyAccessExpression */ &&
+            if (callExpression.expression.kind === 190 /* PropertyAccessExpression */ &&
                 isOrContainsMatchingReference(reference, callExpression.expression.expression)) {
                 return true;
             }
@@ -45393,7 +46753,7 @@ var ts;
                 return strictNullChecks ? 7888800 /* ObjectStrictFacts */ : 16736160 /* ObjectFacts */;
             }
             if (flags & 63176704 /* Instantiable */) {
-                return getTypeFacts(getBaseConstraintOfType(type) || emptyObjectType);
+                return getTypeFacts(getBaseConstraintOfType(type) || unknownType);
             }
             if (flags & 3145728 /* UnionOrIntersection */) {
                 return getTypeFactsOfTypes(type.types);
@@ -45422,22 +46782,22 @@ var ts;
         }
         function getTypeOfDestructuredArrayElement(type, index) {
             return everyType(type, isTupleLikeType) && getTupleElementType(type, index) ||
-                checkIteratedTypeOrElementType(type, /*errorNode*/ undefined, /*allowStringInput*/ false, /*allowAsyncIterables*/ false) ||
+                checkIteratedTypeOrElementType(65 /* Destructuring */, type, undefinedType, /*errorNode*/ undefined) ||
                 errorType;
         }
         function getTypeOfDestructuredSpreadExpression(type) {
-            return createArrayType(checkIteratedTypeOrElementType(type, /*errorNode*/ undefined, /*allowStringInput*/ false, /*allowAsyncIterables*/ false) || errorType);
+            return createArrayType(checkIteratedTypeOrElementType(65 /* Destructuring */, type, undefinedType, /*errorNode*/ undefined) || errorType);
         }
         function getAssignedTypeOfBinaryExpression(node) {
-            var isDestructuringDefaultAssignment = node.parent.kind === 187 /* ArrayLiteralExpression */ && isDestructuringAssignmentTarget(node.parent) ||
-                node.parent.kind === 275 /* PropertyAssignment */ && isDestructuringAssignmentTarget(node.parent.parent);
+            var isDestructuringDefaultAssignment = node.parent.kind === 188 /* ArrayLiteralExpression */ && isDestructuringAssignmentTarget(node.parent) ||
+                node.parent.kind === 276 /* PropertyAssignment */ && isDestructuringAssignmentTarget(node.parent.parent);
             return isDestructuringDefaultAssignment ?
                 getTypeWithDefault(getAssignedType(node), node.right) :
                 getTypeOfExpression(node.right);
         }
         function isDestructuringAssignmentTarget(parent) {
-            return parent.parent.kind === 204 /* BinaryExpression */ && parent.parent.left === parent ||
-                parent.parent.kind === 227 /* ForOfStatement */ && parent.parent.initializer === parent;
+            return parent.parent.kind === 205 /* BinaryExpression */ && parent.parent.left === parent ||
+                parent.parent.kind === 228 /* ForOfStatement */ && parent.parent.initializer === parent;
         }
         function getAssignedTypeOfArrayLiteralElement(node, element) {
             return getTypeOfDestructuredArrayElement(getAssignedType(node), node.elements.indexOf(element));
@@ -45454,21 +46814,21 @@ var ts;
         function getAssignedType(node) {
             var parent = node.parent;
             switch (parent.kind) {
-                case 226 /* ForInStatement */:
+                case 227 /* ForInStatement */:
                     return stringType;
-                case 227 /* ForOfStatement */:
+                case 228 /* ForOfStatement */:
                     return checkRightHandSideOfForOf(parent.expression, parent.awaitModifier) || errorType;
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return getAssignedTypeOfBinaryExpression(parent);
-                case 198 /* DeleteExpression */:
+                case 199 /* DeleteExpression */:
                     return undefinedType;
-                case 187 /* ArrayLiteralExpression */:
+                case 188 /* ArrayLiteralExpression */:
                     return getAssignedTypeOfArrayLiteralElement(parent, node);
-                case 208 /* SpreadElement */:
+                case 209 /* SpreadElement */:
                     return getAssignedTypeOfSpreadExpression(parent);
-                case 275 /* PropertyAssignment */:
+                case 276 /* PropertyAssignment */:
                     return getAssignedTypeOfPropertyAssignment(parent);
-                case 276 /* ShorthandPropertyAssignment */:
+                case 277 /* ShorthandPropertyAssignment */:
                     return getAssignedTypeOfShorthandPropertyAssignment(parent);
             }
             return errorType;
@@ -45476,7 +46836,7 @@ var ts;
         function getInitialTypeOfBindingElement(node) {
             var pattern = node.parent;
             var parentType = getInitialType(pattern.parent);
-            var type = pattern.kind === 184 /* ObjectBindingPattern */ ?
+            var type = pattern.kind === 185 /* ObjectBindingPattern */ ?
                 getTypeOfDestructuredProperty(parentType, node.propertyName || node.name) :
                 !node.dotDotDotToken ?
                     getTypeOfDestructuredArrayElement(parentType, pattern.elements.indexOf(node)) :
@@ -45494,37 +46854,37 @@ var ts;
             if (node.initializer) {
                 return getTypeOfInitializer(node.initializer);
             }
-            if (node.parent.parent.kind === 226 /* ForInStatement */) {
+            if (node.parent.parent.kind === 227 /* ForInStatement */) {
                 return stringType;
             }
-            if (node.parent.parent.kind === 227 /* ForOfStatement */) {
+            if (node.parent.parent.kind === 228 /* ForOfStatement */) {
                 return checkRightHandSideOfForOf(node.parent.parent.expression, node.parent.parent.awaitModifier) || errorType;
             }
             return errorType;
         }
         function getInitialType(node) {
-            return node.kind === 237 /* VariableDeclaration */ ?
+            return node.kind === 238 /* VariableDeclaration */ ?
                 getInitialTypeOfVariableDeclaration(node) :
                 getInitialTypeOfBindingElement(node);
         }
         function getInitialOrAssignedType(node, reference) {
-            return getConstraintForLocation(node.kind === 237 /* VariableDeclaration */ || node.kind === 186 /* BindingElement */ ?
+            return getConstraintForLocation(node.kind === 238 /* VariableDeclaration */ || node.kind === 187 /* BindingElement */ ?
                 getInitialType(node) :
                 getAssignedType(node), reference);
         }
         function isEmptyArrayAssignment(node) {
-            return node.kind === 237 /* VariableDeclaration */ && node.initializer &&
+            return node.kind === 238 /* VariableDeclaration */ && node.initializer &&
                 isEmptyArrayLiteral(node.initializer) ||
-                node.kind !== 186 /* BindingElement */ && node.parent.kind === 204 /* BinaryExpression */ &&
+                node.kind !== 187 /* BindingElement */ && node.parent.kind === 205 /* BinaryExpression */ &&
                     isEmptyArrayLiteral(node.parent.right);
         }
         function getReferenceCandidate(node) {
             switch (node.kind) {
-                case 195 /* ParenthesizedExpression */:
+                case 196 /* ParenthesizedExpression */:
                     return getReferenceCandidate(node.expression);
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     switch (node.operatorToken.kind) {
-                        case 59 /* EqualsToken */:
+                        case 60 /* EqualsToken */:
                             return getReferenceCandidate(node.left);
                         case 27 /* CommaToken */:
                             return getReferenceCandidate(node.right);
@@ -45534,13 +46894,13 @@ var ts;
         }
         function getReferenceRoot(node) {
             var parent = node.parent;
-            return parent.kind === 195 /* ParenthesizedExpression */ ||
-                parent.kind === 204 /* BinaryExpression */ && parent.operatorToken.kind === 59 /* EqualsToken */ && parent.left === node ||
-                parent.kind === 204 /* BinaryExpression */ && parent.operatorToken.kind === 27 /* CommaToken */ && parent.right === node ?
+            return parent.kind === 196 /* ParenthesizedExpression */ ||
+                parent.kind === 205 /* BinaryExpression */ && parent.operatorToken.kind === 60 /* EqualsToken */ && parent.left === node ||
+                parent.kind === 205 /* BinaryExpression */ && parent.operatorToken.kind === 27 /* CommaToken */ && parent.right === node ?
                 getReferenceRoot(parent) : node;
         }
         function getTypeOfSwitchClause(clause) {
-            if (clause.kind === 271 /* CaseClause */) {
+            if (clause.kind === 272 /* CaseClause */) {
                 return getRegularTypeOfLiteralType(getTypeOfExpression(clause.expression));
             }
             return neverType;
@@ -45562,7 +46922,7 @@ var ts;
             var witnesses = [];
             for (var _i = 0, _a = switchStatement.caseBlock.clauses; _i < _a.length; _i++) {
                 var clause = _a[_i];
-                if (clause.kind === 271 /* CaseClause */) {
+                if (clause.kind === 272 /* CaseClause */) {
                     if (clause.expression.kind === 10 /* StringLiteral */) {
                         witnesses.push(clause.expression.text);
                         continue;
@@ -45608,6 +46968,9 @@ var ts;
             }
             return f(type) ? type : neverType;
         }
+        function countTypes(type) {
+            return type.flags & 1048576 /* Union */ ? type.types.length : 1;
+        }
         function mapType(type, mapper, noReductions) {
             if (type.flags & 131072 /* Never */) {
                 return type;
@@ -45615,25 +46978,20 @@ var ts;
             if (!(type.flags & 1048576 /* Union */)) {
                 return mapper(type);
             }
-            var types = type.types;
-            var mappedType;
             var mappedTypes;
-            for (var _i = 0, types_13 = types; _i < types_13.length; _i++) {
-                var current = types_13[_i];
-                var t = mapper(current);
-                if (t) {
-                    if (!mappedType) {
-                        mappedType = t;
-                    }
-                    else if (!mappedTypes) {
-                        mappedTypes = [mappedType, t];
+            for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
+                var t = _a[_i];
+                var mapped = mapper(t);
+                if (mapped) {
+                    if (!mappedTypes) {
+                        mappedTypes = [mapped];
                     }
                     else {
-                        mappedTypes.push(t);
+                        mappedTypes.push(mapped);
                     }
                 }
             }
-            return mappedTypes ? getUnionType(mappedTypes, noReductions ? 0 /* None */ : 1 /* Literal */) : mappedType;
+            return mappedTypes && getUnionType(mappedTypes, noReductions ? 0 /* None */ : 1 /* Literal */);
         }
         function extractTypesOfKind(type, kind) {
             return filterType(type, function (t) { return (t.flags & kind) !== 0; });
@@ -45701,8 +47059,8 @@ var ts;
         }
         function isEvolvingArrayTypeList(types) {
             var hasEvolvingArrayType = false;
-            for (var _i = 0, types_14 = types; _i < types_14.length; _i++) {
-                var t = types_14[_i];
+            for (var _i = 0, types_13 = types; _i < types_13.length; _i++) {
+                var t = types_13[_i];
                 if (!(t.flags & 131072 /* Never */)) {
                     if (!(ts.getObjectFlags(t) & 256 /* EvolvingArray */)) {
                         return false;
@@ -45725,12 +47083,12 @@ var ts;
         function isEvolvingArrayOperationTarget(node) {
             var root = getReferenceRoot(node);
             var parent = root.parent;
-            var isLengthPushOrUnshift = parent.kind === 189 /* PropertyAccessExpression */ && (parent.name.escapedText === "length" ||
-                parent.parent.kind === 191 /* CallExpression */ && ts.isPushOrUnshiftIdentifier(parent.name));
-            var isElementAssignment = parent.kind === 190 /* ElementAccessExpression */ &&
+            var isLengthPushOrUnshift = parent.kind === 190 /* PropertyAccessExpression */ && (parent.name.escapedText === "length" ||
+                parent.parent.kind === 192 /* CallExpression */ && ts.isPushOrUnshiftIdentifier(parent.name));
+            var isElementAssignment = parent.kind === 191 /* ElementAccessExpression */ &&
                 parent.expression === root &&
-                parent.parent.kind === 204 /* BinaryExpression */ &&
-                parent.parent.operatorToken.kind === 59 /* EqualsToken */ &&
+                parent.parent.kind === 205 /* BinaryExpression */ &&
+                parent.parent.operatorToken.kind === 60 /* EqualsToken */ &&
                 parent.parent.left === parent &&
                 !ts.isAssignmentTarget(parent.parent) &&
                 isTypeAssignableToKind(getTypeOfExpression(parent.argumentExpression), 296 /* NumberLike */);
@@ -45744,7 +47102,7 @@ var ts;
             return links.maybeTypePredicate;
         }
         function getMaybeTypePredicate(node) {
-            if (node.expression.kind !== 98 /* SuperKeyword */) {
+            if (node.expression.kind !== 99 /* SuperKeyword */) {
                 var funcType = checkNonNullExpression(node.expression);
                 if (funcType !== silentNeverType) {
                     var apparentType = getApparentType(funcType);
@@ -45762,6 +47120,7 @@ var ts;
         function getFlowTypeOfReference(reference, declaredType, initialType, flowContainer, couldBeUninitialized) {
             if (initialType === void 0) { initialType = declaredType; }
             var key;
+            var keySet = false;
             var flowDepth = 0;
             if (flowAnalysisDisabled) {
                 return errorType;
@@ -45777,10 +47136,17 @@ var ts;
             // on empty arrays are possible without implicit any errors and new element types can be inferred without
             // type mismatch errors.
             var resultType = ts.getObjectFlags(evolvedType) & 256 /* EvolvingArray */ && isEvolvingArrayOperationTarget(reference) ? autoArrayType : finalizeEvolvingArrayType(evolvedType);
-            if (reference.parent && reference.parent.kind === 213 /* NonNullExpression */ && getTypeWithFacts(resultType, 2097152 /* NEUndefinedOrNull */).flags & 131072 /* Never */) {
+            if (reference.parent && reference.parent.kind === 214 /* NonNullExpression */ && getTypeWithFacts(resultType, 2097152 /* NEUndefinedOrNull */).flags & 131072 /* Never */) {
                 return declaredType;
             }
             return resultType;
+            function getOrSetCacheKey() {
+                if (keySet) {
+                    return key;
+                }
+                keySet = true;
+                return key = getFlowCacheKey(reference, declaredType, initialType, flowContainer);
+            }
             function getTypeAtFlowNode(flow) {
                 if (flowDepth === 2000) {
                     // We have made 2000 recursive invocations. To avoid overflowing the call stack we report an error
@@ -45792,6 +47158,15 @@ var ts;
                 flowDepth++;
                 while (true) {
                     var flags = flow.flags;
+                    if (flags & 8192 /* Cached */) {
+                        var key_2 = getOrSetCacheKey();
+                        if (key_2) {
+                            var id = getFlowNodeId(flow);
+                            if (flowAssignmentKeys[id] === key_2) {
+                                return flowAssignmentTypes[id];
+                            }
+                        }
+                    }
                     if (flags & 1024 /* Shared */) {
                         // We cache results of flow type resolution for shared nodes that were previously visited in
                         // the same getFlowTypeOfReference invocation. A node is considered shared when it is the
@@ -45822,6 +47197,15 @@ var ts;
                             flow = flow.antecedent;
                             continue;
                         }
+                        else if (flowLoopCount === flowLoopStart) { // Only cache assignments when not within loop analysis
+                            var key_3 = getOrSetCacheKey();
+                            if (key_3 && !isIncomplete(type)) {
+                                flow.flags |= 8192 /* Cached */;
+                                var id = getFlowNodeId(flow);
+                                flowAssignmentKeys[id] = key_3;
+                                flowAssignmentTypes[id] = type;
+                            }
+                        }
                     }
                     else if (flags & 96 /* Condition */) {
                         type = getTypeAtFlowCondition(flow);
@@ -45849,9 +47233,9 @@ var ts;
                         // Check if we should continue with the control flow of the containing function.
                         var container = flow.container;
                         if (container && container !== flowContainer &&
-                            reference.kind !== 189 /* PropertyAccessExpression */ &&
-                            reference.kind !== 190 /* ElementAccessExpression */ &&
-                            reference.kind !== 100 /* ThisKeyword */) {
+                            reference.kind !== 190 /* PropertyAccessExpression */ &&
+                            reference.kind !== 191 /* ElementAccessExpression */ &&
+                            reference.kind !== 101 /* ThisKeyword */) {
                             flow = container.flowNode;
                             continue;
                         }
@@ -45903,14 +47287,14 @@ var ts;
                     // in which case we continue control flow analysis back to the function's declaration
                     if (ts.isVariableDeclaration(node) && (ts.isInJSFile(node) || ts.isVarConst(node))) {
                         var init = ts.getDeclaredExpandoInitializer(node);
-                        if (init && (init.kind === 196 /* FunctionExpression */ || init.kind === 197 /* ArrowFunction */)) {
+                        if (init && (init.kind === 197 /* FunctionExpression */ || init.kind === 198 /* ArrowFunction */)) {
                             return getTypeAtFlowNode(flow.antecedent);
                         }
                     }
                     return declaredType;
                 }
                 // for (const _ in ref) acts as a nonnull on ref
-                if (ts.isVariableDeclaration(node) && node.parent.parent.kind === 226 /* ForInStatement */ && isMatchingReference(reference, node.parent.parent.expression)) {
+                if (ts.isVariableDeclaration(node) && node.parent.parent.kind === 227 /* ForInStatement */ && isMatchingReference(reference, node.parent.parent.expression)) {
                     return getNonNullableTypeIfNeeded(getTypeFromFlowType(getTypeAtFlowNode(flow.antecedent)));
                 }
                 // Assignment doesn't affect reference
@@ -45919,7 +47303,7 @@ var ts;
             function getTypeAtFlowArrayMutation(flow) {
                 if (declaredType === autoType || declaredType === autoArrayType) {
                     var node = flow.node;
-                    var expr = node.kind === 191 /* CallExpression */ ?
+                    var expr = node.kind === 192 /* CallExpression */ ?
                         node.expression.expression :
                         node.left.expression;
                     if (isMatchingReference(reference, getReferenceCandidate(expr))) {
@@ -45927,7 +47311,7 @@ var ts;
                         var type = getTypeFromFlowType(flowType);
                         if (ts.getObjectFlags(type) & 256 /* EvolvingArray */) {
                             var evolvedType_1 = type;
-                            if (node.kind === 191 /* CallExpression */) {
+                            if (node.kind === 192 /* CallExpression */) {
                                 for (var _i = 0, _a = node.arguments; _i < _a.length; _i++) {
                                     var arg = _a[_i];
                                     evolvedType_1 = addEvolvingArrayElementType(evolvedType_1, arg);
@@ -45980,7 +47364,7 @@ var ts;
                 else if (isMatchingReferenceDiscriminant(expr, type)) {
                     type = narrowTypeByDiscriminant(type, expr, function (t) { return narrowTypeBySwitchOnDiscriminant(t, flow.switchStatement, flow.clauseStart, flow.clauseEnd); });
                 }
-                else if (expr.kind === 199 /* TypeOfExpression */ && isMatchingReference(reference, expr.expression)) {
+                else if (expr.kind === 200 /* TypeOfExpression */ && isMatchingReference(reference, expr.expression)) {
                     type = narrowBySwitchOnTypeOf(type, flow.switchStatement, flow.clauseStart, flow.clauseEnd);
                 }
                 else if (containsMatchingReferenceDiscriminant(reference, expr)) {
@@ -46027,12 +47411,10 @@ var ts;
                 // this flow loop junction, return the cached type.
                 var id = getFlowNodeId(flow);
                 var cache = flowLoopCaches[id] || (flowLoopCaches[id] = ts.createMap());
+                var key = getOrSetCacheKey();
                 if (!key) {
-                    key = getFlowCacheKey(reference);
                     // No cache key is generated when binding patterns are in unnarrowable situations
-                    if (!key) {
-                        return declaredType;
-                    }
+                    return declaredType;
                 }
                 var cached = cache.get(key);
                 if (cached) {
@@ -46140,7 +47522,7 @@ var ts;
                 return !assumeTrue;
             }
             function narrowByInKeyword(type, literal, assumeTrue) {
-                if ((type.flags & (1048576 /* Union */ | 524288 /* Object */)) || (type.flags & 262144 /* TypeParameter */ && type.isThisType)) {
+                if (type.flags & (1048576 /* Union */ | 524288 /* Object */) || isThisTypeParameter(type)) {
                     var propName_1 = ts.escapeLeadingUnderscores(literal.text);
                     return filterType(type, function (t) { return isTypePresencePossible(t, propName_1, assumeTrue); });
                 }
@@ -46148,8 +47530,8 @@ var ts;
             }
             function narrowTypeByBinaryExpression(type, expr, assumeTrue) {
                 switch (expr.operatorToken.kind) {
-                    case 59 /* EqualsToken */:
-                        return narrowTypeByTruthiness(type, expr.left, assumeTrue);
+                    case 60 /* EqualsToken */:
+                        return narrowTypeByTruthiness(narrowType(type, expr.right, assumeTrue), expr.left, assumeTrue);
                     case 33 /* EqualsEqualsToken */:
                     case 34 /* ExclamationEqualsToken */:
                     case 35 /* EqualsEqualsEqualsToken */:
@@ -46157,10 +47539,10 @@ var ts;
                         var operator_1 = expr.operatorToken.kind;
                         var left_1 = getReferenceCandidate(expr.left);
                         var right_1 = getReferenceCandidate(expr.right);
-                        if (left_1.kind === 199 /* TypeOfExpression */ && ts.isStringLiteralLike(right_1)) {
+                        if (left_1.kind === 200 /* TypeOfExpression */ && ts.isStringLiteralLike(right_1)) {
                             return narrowTypeByTypeof(type, left_1, operator_1, right_1, assumeTrue);
                         }
-                        if (right_1.kind === 199 /* TypeOfExpression */ && ts.isStringLiteralLike(left_1)) {
+                        if (right_1.kind === 200 /* TypeOfExpression */ && ts.isStringLiteralLike(left_1)) {
                             return narrowTypeByTypeof(type, right_1, operator_1, left_1, assumeTrue);
                         }
                         if (isMatchingReference(reference, left_1)) {
@@ -46179,9 +47561,9 @@ var ts;
                             return declaredType;
                         }
                         break;
-                    case 94 /* InstanceOfKeyword */:
+                    case 95 /* InstanceOfKeyword */:
                         return narrowTypeByInstanceof(type, expr, assumeTrue);
-                    case 93 /* InKeyword */:
+                    case 94 /* InKeyword */:
                         var target = getReferenceCandidate(expr.right);
                         if (ts.isStringLiteralLike(expr.left) && isMatchingReference(reference, target)) {
                             return narrowByInKeyword(type, expr.left, assumeTrue);
@@ -46225,7 +47607,10 @@ var ts;
                     return type;
                 }
                 if (assumeTrue) {
-                    var narrowedType = filterType(type, function (t) { return areTypesComparable(t, valueType); });
+                    var filterFn = operator === 33 /* EqualsEqualsToken */ ?
+                        (function (t) { return areTypesComparable(t, valueType) || isCoercibleUnderDoubleEquals(t, valueType); }) :
+                        function (t) { return areTypesComparable(t, valueType); };
+                    var narrowedType = filterType(type, filterFn);
                     return narrowedType.flags & 131072 /* Never */ ? type : replacePrimitivesWithLiterals(narrowedType, valueType);
                 }
                 if (isUnitType(valueType)) {
@@ -46486,7 +47871,7 @@ var ts;
                     return type;
                 }
                 if (ts.isIdentifierTypePredicate(predicate)) {
-                    var predicateArgument = callExpression.arguments[predicate.parameterIndex - (signature.thisParameter ? 1 : 0)];
+                    var predicateArgument = callExpression.arguments[predicate.parameterIndex];
                     if (predicateArgument) {
                         if (isMatchingReference(reference, predicateArgument)) {
                             return getNarrowedType(type, predicate.type, assumeTrue, isTypeSubtypeOf);
@@ -46514,19 +47899,19 @@ var ts;
             // will be a subtype or the same type as the argument.
             function narrowType(type, expr, assumeTrue) {
                 switch (expr.kind) {
-                    case 72 /* Identifier */:
-                    case 100 /* ThisKeyword */:
-                    case 98 /* SuperKeyword */:
-                    case 189 /* PropertyAccessExpression */:
-                    case 190 /* ElementAccessExpression */:
+                    case 73 /* Identifier */:
+                    case 101 /* ThisKeyword */:
+                    case 99 /* SuperKeyword */:
+                    case 190 /* PropertyAccessExpression */:
+                    case 191 /* ElementAccessExpression */:
                         return narrowTypeByTruthiness(type, expr, assumeTrue);
-                    case 191 /* CallExpression */:
+                    case 192 /* CallExpression */:
                         return narrowTypeByTypePredicate(type, expr, assumeTrue);
-                    case 195 /* ParenthesizedExpression */:
+                    case 196 /* ParenthesizedExpression */:
                         return narrowType(type, expr.expression, assumeTrue);
-                    case 204 /* BinaryExpression */:
+                    case 205 /* BinaryExpression */:
                         return narrowTypeByBinaryExpression(type, expr, assumeTrue);
-                    case 202 /* PrefixUnaryExpression */:
+                    case 203 /* PrefixUnaryExpression */:
                         if (expr.operator === 52 /* ExclamationToken */) {
                             return narrowType(type, expr.operand, !assumeTrue);
                         }
@@ -46541,7 +47926,7 @@ var ts;
             // an dotted name expression, and if the location is not an assignment target, obtain the type
             // of the expression (which will reflect control flow analysis). If the expression indeed
             // resolved to the given symbol, return the narrowed type.
-            if (location.kind === 72 /* Identifier */) {
+            if (location.kind === 73 /* Identifier */) {
                 if (ts.isRightSideOfQualifiedNameOrPropertyAccess(location)) {
                     location = location.parent;
                 }
@@ -46562,9 +47947,9 @@ var ts;
         function getControlFlowContainer(node) {
             return ts.findAncestor(node.parent, function (node) {
                 return ts.isFunctionLike(node) && !ts.getImmediatelyInvokedFunctionExpression(node) ||
-                    node.kind === 245 /* ModuleBlock */ ||
-                    node.kind === 284 /* SourceFile */ ||
-                    node.kind === 154 /* PropertyDeclaration */;
+                    node.kind === 246 /* ModuleBlock */ ||
+                    node.kind === 285 /* SourceFile */ ||
+                    node.kind === 155 /* PropertyDeclaration */;
             });
         }
         // Check if a parameter is assigned anywhere within its declaring function.
@@ -46583,10 +47968,10 @@ var ts;
             return !!ts.findAncestor(node.parent, function (node) { return ts.isFunctionLike(node) && !!(getNodeLinks(node).flags & 8388608 /* AssignmentsMarked */); });
         }
         function markParameterAssignments(node) {
-            if (node.kind === 72 /* Identifier */) {
+            if (node.kind === 73 /* Identifier */) {
                 if (ts.isAssignmentTarget(node)) {
                     var symbol = getResolvedSymbol(node);
-                    if (symbol.valueDeclaration && ts.getRootDeclaration(symbol.valueDeclaration).kind === 151 /* Parameter */) {
+                    if (symbol.valueDeclaration && ts.getRootDeclaration(symbol.valueDeclaration).kind === 152 /* Parameter */) {
                         symbol.isAssigned = true;
                     }
                 }
@@ -46601,7 +47986,7 @@ var ts;
         /** remove undefined from the annotated type of a parameter when there is an initializer (that doesn't include undefined) */
         function removeOptionalityFromDeclaredType(declaredType, declaration) {
             var annotationIncludesUndefined = strictNullChecks &&
-                declaration.kind === 151 /* Parameter */ &&
+                declaration.kind === 152 /* Parameter */ &&
                 declaration.initializer &&
                 getFalsyFlags(declaredType) & 32768 /* Undefined */ &&
                 !(getFalsyFlags(checkExpression(declaration.initializer)) & 32768 /* Undefined */);
@@ -46609,13 +47994,13 @@ var ts;
         }
         function isConstraintPosition(node) {
             var parent = node.parent;
-            return parent.kind === 189 /* PropertyAccessExpression */ ||
-                parent.kind === 191 /* CallExpression */ && parent.expression === node ||
-                parent.kind === 190 /* ElementAccessExpression */ && parent.expression === node ||
-                parent.kind === 186 /* BindingElement */ && parent.name === node && !!parent.initializer;
+            return parent.kind === 190 /* PropertyAccessExpression */ ||
+                parent.kind === 192 /* CallExpression */ && parent.expression === node ||
+                parent.kind === 191 /* ElementAccessExpression */ && parent.expression === node ||
+                parent.kind === 187 /* BindingElement */ && parent.name === node && !!parent.initializer;
         }
         function typeHasNullableConstraint(type) {
-            return type.flags & 58982400 /* InstantiableNonPrimitive */ && maybeTypeOfKind(getBaseConstraintOfType(type) || emptyObjectType, 98304 /* Nullable */);
+            return type.flags & 58982400 /* InstantiableNonPrimitive */ && maybeTypeOfKind(getBaseConstraintOfType(type) || unknownType, 98304 /* Nullable */);
         }
         function getConstraintForLocation(type, node) {
             // When a node is the left hand expression of a property access, element access, or call expression,
@@ -46646,7 +48031,7 @@ var ts;
             if (symbol === argumentsSymbol) {
                 var container = ts.getContainingFunction(node);
                 if (languageVersion < 2 /* ES2015 */) {
-                    if (container.kind === 197 /* ArrowFunction */) {
+                    if (container.kind === 198 /* ArrowFunction */) {
                         error(node, ts.Diagnostics.The_arguments_object_cannot_be_referenced_in_an_arrow_function_in_ES3_and_ES5_Consider_using_a_standard_function_expression);
                     }
                     else if (ts.hasModifier(container, 256 /* Async */)) {
@@ -46667,7 +48052,7 @@ var ts;
                 // Due to the emit for class decorators, any reference to the class from inside of the class body
                 // must instead be rewritten to point to a temporary variable to avoid issues with the double-bind
                 // behavior of class names in ES6.
-                if (declaration.kind === 240 /* ClassDeclaration */
+                if (declaration.kind === 241 /* ClassDeclaration */
                     && ts.nodeIsDecorated(declaration)) {
                     var container = ts.getContainingClass(node);
                     while (container !== undefined) {
@@ -46679,14 +48064,14 @@ var ts;
                         container = ts.getContainingClass(container);
                     }
                 }
-                else if (declaration.kind === 209 /* ClassExpression */) {
+                else if (declaration.kind === 210 /* ClassExpression */) {
                     // When we emit a class expression with static members that contain a reference
                     // to the constructor in the initializer, we will need to substitute that
                     // binding with an alias as the class name is not in scope.
                     var container = ts.getThisContainer(node, /*includeArrowFunctions*/ false);
-                    while (container.kind !== 284 /* SourceFile */) {
+                    while (container.kind !== 285 /* SourceFile */) {
                         if (container.parent === declaration) {
-                            if (container.kind === 154 /* PropertyDeclaration */ && ts.hasModifier(container, 32 /* Static */)) {
+                            if (container.kind === 155 /* PropertyDeclaration */ && ts.hasModifier(container, 32 /* Static */)) {
                                 getNodeLinks(declaration).flags |= 16777216 /* ClassWithConstructorReference */;
                                 getNodeLinks(node).flags |= 33554432 /* ConstructorReferenceInClass */;
                             }
@@ -46735,7 +48120,7 @@ var ts;
             // The declaration container is the innermost function that encloses the declaration of the variable
             // or parameter. The flow container is the innermost function starting with which we analyze the control
             // flow graph to determine the control flow based type.
-            var isParameter = ts.getRootDeclaration(declaration).kind === 151 /* Parameter */;
+            var isParameter = ts.getRootDeclaration(declaration).kind === 152 /* Parameter */;
             var declarationContainer = getControlFlowContainer(declaration);
             var flowContainer = getControlFlowContainer(node);
             var isOuterVariable = flowContainer !== declarationContainer;
@@ -46744,19 +48129,19 @@ var ts;
             // When the control flow originates in a function expression or arrow function and we are referencing
             // a const variable or parameter from an outer function, we extend the origin of the control flow
             // analysis to include the immediately enclosing function.
-            while (flowContainer !== declarationContainer && (flowContainer.kind === 196 /* FunctionExpression */ ||
-                flowContainer.kind === 197 /* ArrowFunction */ || ts.isObjectLiteralOrClassExpressionMethod(flowContainer)) &&
+            while (flowContainer !== declarationContainer && (flowContainer.kind === 197 /* FunctionExpression */ ||
+                flowContainer.kind === 198 /* ArrowFunction */ || ts.isObjectLiteralOrClassExpressionMethod(flowContainer)) &&
                 (isConstVariable(localOrExportSymbol) || isParameter && !isParameterAssigned(localOrExportSymbol))) {
                 flowContainer = getControlFlowContainer(flowContainer);
             }
             // We only look for uninitialized variables in strict null checking mode, and only when we can analyze
             // the entire control flow graph from the variable's declaration (i.e. when the flow container and
             // declaration container are the same).
-            var assumeInitialized = isParameter || isAlias || isOuterVariable || isSpreadDestructuringAssignmentTarget || isModuleExports ||
+            var assumeInitialized = isParameter || isAlias || isOuterVariable || isSpreadDestructuringAssignmentTarget || isModuleExports || ts.isBindingElement(declaration) ||
                 type !== autoType && type !== autoArrayType && (!strictNullChecks || (type.flags & 3 /* AnyOrUnknown */) !== 0 ||
-                    isInTypeQuery(node) || node.parent.kind === 257 /* ExportSpecifier */) ||
-                node.parent.kind === 213 /* NonNullExpression */ ||
-                declaration.kind === 237 /* VariableDeclaration */ && declaration.exclamationToken ||
+                    isInTypeQuery(node) || node.parent.kind === 258 /* ExportSpecifier */) ||
+                node.parent.kind === 214 /* NonNullExpression */ ||
+                declaration.kind === 238 /* VariableDeclaration */ && declaration.exclamationToken ||
                 declaration.flags & 4194304 /* Ambient */;
             var initialType = assumeInitialized ? (isParameter ? removeOptionalityFromDeclaredType(type, declaration) : type) :
                 type === autoType || type === autoArrayType ? undefinedType :
@@ -46790,7 +48175,8 @@ var ts;
         function checkNestedBlockScopedBinding(node, symbol) {
             if (languageVersion >= 2 /* ES2015 */ ||
                 (symbol.flags & (2 /* BlockScopedVariable */ | 32 /* Class */)) === 0 ||
-                symbol.valueDeclaration.parent.kind === 274 /* CatchClause */) {
+                ts.isSourceFile(symbol.valueDeclaration) ||
+                symbol.valueDeclaration.parent.kind === 275 /* CatchClause */) {
                 return;
             }
             // 1. walk from the use site up to the declaration and check
@@ -46813,7 +48199,7 @@ var ts;
                     // mark iteration statement as containing block-scoped binding captured in some function
                     var capturesBlockScopeBindingInLoopBody = true;
                     if (ts.isForStatement(container) &&
-                        ts.getAncestor(symbol.valueDeclaration, 238 /* VariableDeclarationList */).parent === container) {
+                        ts.getAncestor(symbol.valueDeclaration, 239 /* VariableDeclarationList */).parent === container) {
                         var part = getPartOfForStatementContainingNode(node.parent, container);
                         if (part) {
                             var links = getNodeLinks(part);
@@ -46831,8 +48217,8 @@ var ts;
                 }
                 // mark variables that are declared in loop initializer and reassigned inside the body of ForStatement.
                 // if body of ForStatement will be converted to function then we'll need a extra machinery to propagate reassigned values back.
-                if (container.kind === 225 /* ForStatement */ &&
-                    ts.getAncestor(symbol.valueDeclaration, 238 /* VariableDeclarationList */).parent === container &&
+                if (container.kind === 226 /* ForStatement */ &&
+                    ts.getAncestor(symbol.valueDeclaration, 239 /* VariableDeclarationList */).parent === container &&
                     isAssignedInBodyOfForStatement(node, container)) {
                     getNodeLinks(symbol.valueDeclaration).flags |= 4194304 /* NeedsLoopOutParameter */;
                 }
@@ -46850,7 +48236,7 @@ var ts;
         function isAssignedInBodyOfForStatement(node, container) {
             // skip parenthesized nodes
             var current = node;
-            while (current.parent.kind === 195 /* ParenthesizedExpression */) {
+            while (current.parent.kind === 196 /* ParenthesizedExpression */) {
                 current = current.parent;
             }
             // check if node is used as LHS in some assignment expression
@@ -46858,7 +48244,7 @@ var ts;
             if (ts.isAssignmentTarget(current)) {
                 isAssigned = true;
             }
-            else if ((current.parent.kind === 202 /* PrefixUnaryExpression */ || current.parent.kind === 203 /* PostfixUnaryExpression */)) {
+            else if ((current.parent.kind === 203 /* PrefixUnaryExpression */ || current.parent.kind === 204 /* PostfixUnaryExpression */)) {
                 var expr = current.parent;
                 isAssigned = expr.operator === 44 /* PlusPlusToken */ || expr.operator === 45 /* MinusMinusToken */;
             }
@@ -46871,7 +48257,7 @@ var ts;
         }
         function captureLexicalThis(node, container) {
             getNodeLinks(node).flags |= 2 /* LexicalThis */;
-            if (container.kind === 154 /* PropertyDeclaration */ || container.kind === 157 /* Constructor */) {
+            if (container.kind === 155 /* PropertyDeclaration */ || container.kind === 158 /* Constructor */) {
                 var classNode = container.parent;
                 getNodeLinks(classNode).flags |= 4 /* CaptureThis */;
             }
@@ -46939,37 +48325,37 @@ var ts;
             // tell whether 'this' needs to be captured.
             var container = ts.getThisContainer(node, /* includeArrowFunctions */ true);
             var capturedByArrowFunction = false;
-            if (container.kind === 157 /* Constructor */) {
+            if (container.kind === 158 /* Constructor */) {
                 checkThisBeforeSuper(node, container, ts.Diagnostics.super_must_be_called_before_accessing_this_in_the_constructor_of_a_derived_class);
             }
             // Now skip arrow functions to get the "real" owner of 'this'.
-            if (container.kind === 197 /* ArrowFunction */) {
+            if (container.kind === 198 /* ArrowFunction */) {
                 container = ts.getThisContainer(container, /* includeArrowFunctions */ false);
                 capturedByArrowFunction = true;
             }
             switch (container.kind) {
-                case 244 /* ModuleDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     error(node, ts.Diagnostics.this_cannot_be_referenced_in_a_module_or_namespace_body);
                     // do not return here so in case if lexical this is captured - it will be reflected in flags on NodeLinks
                     break;
-                case 243 /* EnumDeclaration */:
+                case 244 /* EnumDeclaration */:
                     error(node, ts.Diagnostics.this_cannot_be_referenced_in_current_location);
                     // do not return here so in case if lexical this is captured - it will be reflected in flags on NodeLinks
                     break;
-                case 157 /* Constructor */:
+                case 158 /* Constructor */:
                     if (isInConstructorArgumentInitializer(node, container)) {
                         error(node, ts.Diagnostics.this_cannot_be_referenced_in_constructor_arguments);
                         // do not return here so in case if lexical this is captured - it will be reflected in flags on NodeLinks
                     }
                     break;
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
                     if (ts.hasModifier(container, 32 /* Static */)) {
                         error(node, ts.Diagnostics.this_cannot_be_referenced_in_a_static_property_initializer);
                         // do not return here so in case if lexical this is captured - it will be reflected in flags on NodeLinks
                     }
                     break;
-                case 149 /* ComputedPropertyName */:
+                case 150 /* ComputedPropertyName */:
                     error(node, ts.Diagnostics.this_cannot_be_referenced_in_a_computed_property_name);
                     break;
             }
@@ -46989,7 +48375,7 @@ var ts;
                     if (!ts.isSourceFile(container)) {
                         var outsideThis = tryGetThisTypeAt(container);
                         if (outsideThis && outsideThis !== globalThisType_1) {
-                            addRelatedInfo(diag, ts.createDiagnosticForNode(container, ts.Diagnostics.An_outer_value_of_this_is_shadowed_by_this_container));
+                            ts.addRelatedInfo(diag, ts.createDiagnosticForNode(container, ts.Diagnostics.An_outer_value_of_this_is_shadowed_by_this_container));
                         }
                     }
                 }
@@ -47019,7 +48405,7 @@ var ts;
                 //   * /** @constructor */ function [name]() { ... }
                 //   * /** @constructor */ var x = function() { ... }
                 else if (isInJS &&
-                    (container.kind === 196 /* FunctionExpression */ || container.kind === 239 /* FunctionDeclaration */) &&
+                    (container.kind === 197 /* FunctionExpression */ || container.kind === 240 /* FunctionDeclaration */) &&
                     ts.getJSDocClassTag(container)) {
                     var classType = getJSClassType(getMergedSymbol(container.symbol));
                     if (classType) {
@@ -47055,7 +48441,7 @@ var ts;
         }
         function getClassNameFromPrototypeMethod(container) {
             // Check if it's the RHS of a x.prototype.y = function [name]() { .... }
-            if (container.kind === 196 /* FunctionExpression */ &&
+            if (container.kind === 197 /* FunctionExpression */ &&
                 ts.isBinaryExpression(container.parent) &&
                 ts.getAssignmentDeclarationKind(container.parent) === 3 /* PrototypeProperty */) {
                 // Get the 'x' of 'x.prototype.y = container'
@@ -47065,16 +48451,16 @@ var ts;
                     .expression; // x
             }
             // x.prototype = { method() { } }
-            else if (container.kind === 156 /* MethodDeclaration */ &&
-                container.parent.kind === 188 /* ObjectLiteralExpression */ &&
+            else if (container.kind === 157 /* MethodDeclaration */ &&
+                container.parent.kind === 189 /* ObjectLiteralExpression */ &&
                 ts.isBinaryExpression(container.parent.parent) &&
                 ts.getAssignmentDeclarationKind(container.parent.parent) === 6 /* Prototype */) {
                 return container.parent.parent.left.expression;
             }
             // x.prototype = { method: function() { } }
-            else if (container.kind === 196 /* FunctionExpression */ &&
-                container.parent.kind === 275 /* PropertyAssignment */ &&
-                container.parent.parent.kind === 188 /* ObjectLiteralExpression */ &&
+            else if (container.kind === 197 /* FunctionExpression */ &&
+                container.parent.kind === 276 /* PropertyAssignment */ &&
+                container.parent.parent.kind === 189 /* ObjectLiteralExpression */ &&
                 ts.isBinaryExpression(container.parent.parent.parent) &&
                 ts.getAssignmentDeclarationKind(container.parent.parent.parent) === 6 /* Prototype */) {
                 return container.parent.parent.parent.left.expression;
@@ -47082,7 +48468,7 @@ var ts;
             // Object.defineProperty(x, "method", { value: function() { } });
             // Object.defineProperty(x, "method", { set: (x: () => void) => void });
             // Object.defineProperty(x, "method", { get: () => function() { }) });
-            else if (container.kind === 196 /* FunctionExpression */ &&
+            else if (container.kind === 197 /* FunctionExpression */ &&
                 ts.isPropertyAssignment(container.parent) &&
                 ts.isIdentifier(container.parent.name) &&
                 (container.parent.name.escapedText === "value" || container.parent.name.escapedText === "get" || container.parent.name.escapedText === "set") &&
@@ -47107,7 +48493,7 @@ var ts;
         }
         function getTypeForThisExpressionFromJSDoc(node) {
             var jsdocType = ts.getJSDocType(node);
-            if (jsdocType && jsdocType.kind === 294 /* JSDocFunctionType */) {
+            if (jsdocType && jsdocType.kind === 295 /* JSDocFunctionType */) {
                 var jsDocFunctionType = jsdocType;
                 if (jsDocFunctionType.parameters.length > 0 &&
                     jsDocFunctionType.parameters[0].name &&
@@ -47121,15 +48507,15 @@ var ts;
             }
         }
         function isInConstructorArgumentInitializer(node, constructorDecl) {
-            return !!ts.findAncestor(node, function (n) { return ts.isFunctionLikeDeclaration(n) ? "quit" : n.kind === 151 /* Parameter */ && n.parent === constructorDecl; });
+            return !!ts.findAncestor(node, function (n) { return ts.isFunctionLikeDeclaration(n) ? "quit" : n.kind === 152 /* Parameter */ && n.parent === constructorDecl; });
         }
         function checkSuperExpression(node) {
-            var isCallExpression = node.parent.kind === 191 /* CallExpression */ && node.parent.expression === node;
+            var isCallExpression = node.parent.kind === 192 /* CallExpression */ && node.parent.expression === node;
             var container = ts.getSuperContainer(node, /*stopOnFunctions*/ true);
             var needToCaptureLexicalThis = false;
             // adjust the container reference in case if super is used inside arrow functions with arbitrarily deep nesting
             if (!isCallExpression) {
-                while (container && container.kind === 197 /* ArrowFunction */) {
+                while (container && container.kind === 198 /* ArrowFunction */) {
                     container = ts.getSuperContainer(container, /*stopOnFunctions*/ true);
                     needToCaptureLexicalThis = languageVersion < 2 /* ES2015 */;
                 }
@@ -47142,14 +48528,14 @@ var ts;
                 // class B {
                 //     [super.foo()]() {}
                 // }
-                var current = ts.findAncestor(node, function (n) { return n === container ? "quit" : n.kind === 149 /* ComputedPropertyName */; });
-                if (current && current.kind === 149 /* ComputedPropertyName */) {
+                var current = ts.findAncestor(node, function (n) { return n === container ? "quit" : n.kind === 150 /* ComputedPropertyName */; });
+                if (current && current.kind === 150 /* ComputedPropertyName */) {
                     error(node, ts.Diagnostics.super_cannot_be_referenced_in_a_computed_property_name);
                 }
                 else if (isCallExpression) {
                     error(node, ts.Diagnostics.Super_calls_are_not_permitted_outside_constructors_or_in_nested_functions_inside_constructors);
                 }
-                else if (!container || !container.parent || !(ts.isClassLike(container.parent) || container.parent.kind === 188 /* ObjectLiteralExpression */)) {
+                else if (!container || !container.parent || !(ts.isClassLike(container.parent) || container.parent.kind === 189 /* ObjectLiteralExpression */)) {
                     error(node, ts.Diagnostics.super_can_only_be_referenced_in_members_of_derived_classes_or_object_literal_expressions);
                 }
                 else {
@@ -47157,7 +48543,7 @@ var ts;
                 }
                 return errorType;
             }
-            if (!isCallExpression && container.kind === 157 /* Constructor */) {
+            if (!isCallExpression && container.kind === 158 /* Constructor */) {
                 checkThisBeforeSuper(node, container, ts.Diagnostics.super_must_be_called_before_accessing_a_property_of_super_in_the_constructor_of_a_derived_class);
             }
             if (ts.hasModifier(container, 32 /* Static */) || isCallExpression) {
@@ -47226,7 +48612,7 @@ var ts;
             // as a call expression cannot be used as the target of a destructuring assignment while a property access can.
             //
             // For element access expressions (`super[x]`), we emit a generic helper that forwards the element access in both situations.
-            if (container.kind === 156 /* MethodDeclaration */ && ts.hasModifier(container, 256 /* Async */)) {
+            if (container.kind === 157 /* MethodDeclaration */ && ts.hasModifier(container, 256 /* Async */)) {
                 if (ts.isSuperProperty(node.parent) && ts.isAssignmentTarget(node.parent)) {
                     getNodeLinks(container).flags |= 4096 /* AsyncMethodWithSuperBinding */;
                 }
@@ -47240,7 +48626,7 @@ var ts;
                 // in this case they should also use correct lexical this
                 captureLexicalThis(node.parent, container);
             }
-            if (container.parent.kind === 188 /* ObjectLiteralExpression */) {
+            if (container.parent.kind === 189 /* ObjectLiteralExpression */) {
                 if (languageVersion < 2 /* ES2015 */) {
                     error(node, ts.Diagnostics.super_is_only_allowed_in_members_of_object_literal_expressions_when_option_target_is_ES2015_or_higher);
                     return errorType;
@@ -47261,7 +48647,7 @@ var ts;
             if (!baseClassType) {
                 return errorType;
             }
-            if (container.kind === 157 /* Constructor */ && isInConstructorArgumentInitializer(node, container)) {
+            if (container.kind === 158 /* Constructor */ && isInConstructorArgumentInitializer(node, container)) {
                 // issue custom error message for super property access in constructor arguments (to be aligned with old compiler)
                 error(node, ts.Diagnostics.super_cannot_be_referenced_in_constructor_arguments);
                 return errorType;
@@ -47276,7 +48662,7 @@ var ts;
                 if (isCallExpression) {
                     // TS 1.0 SPEC (April 2014): 4.8.1
                     // Super calls are only permitted in constructors of derived classes
-                    return container.kind === 157 /* Constructor */;
+                    return container.kind === 158 /* Constructor */;
                 }
                 else {
                     // TS 1.0 SPEC (April 2014)
@@ -47284,21 +48670,21 @@ var ts;
                     // - In a constructor, instance member function, instance member accessor, or instance member variable initializer where this references a derived class instance
                     // - In a static member function or static member accessor
                     // topmost container must be something that is directly nested in the class declaration\object literal expression
-                    if (ts.isClassLike(container.parent) || container.parent.kind === 188 /* ObjectLiteralExpression */) {
+                    if (ts.isClassLike(container.parent) || container.parent.kind === 189 /* ObjectLiteralExpression */) {
                         if (ts.hasModifier(container, 32 /* Static */)) {
-                            return container.kind === 156 /* MethodDeclaration */ ||
-                                container.kind === 155 /* MethodSignature */ ||
-                                container.kind === 158 /* GetAccessor */ ||
-                                container.kind === 159 /* SetAccessor */;
+                            return container.kind === 157 /* MethodDeclaration */ ||
+                                container.kind === 156 /* MethodSignature */ ||
+                                container.kind === 159 /* GetAccessor */ ||
+                                container.kind === 160 /* SetAccessor */;
                         }
                         else {
-                            return container.kind === 156 /* MethodDeclaration */ ||
-                                container.kind === 155 /* MethodSignature */ ||
-                                container.kind === 158 /* GetAccessor */ ||
-                                container.kind === 159 /* SetAccessor */ ||
-                                container.kind === 154 /* PropertyDeclaration */ ||
-                                container.kind === 153 /* PropertySignature */ ||
-                                container.kind === 157 /* Constructor */;
+                            return container.kind === 157 /* MethodDeclaration */ ||
+                                container.kind === 156 /* MethodSignature */ ||
+                                container.kind === 159 /* GetAccessor */ ||
+                                container.kind === 160 /* SetAccessor */ ||
+                                container.kind === 155 /* PropertyDeclaration */ ||
+                                container.kind === 154 /* PropertySignature */ ||
+                                container.kind === 158 /* Constructor */;
                         }
                     }
                 }
@@ -47306,10 +48692,10 @@ var ts;
             }
         }
         function getContainingObjectLiteral(func) {
-            return (func.kind === 156 /* MethodDeclaration */ ||
-                func.kind === 158 /* GetAccessor */ ||
-                func.kind === 159 /* SetAccessor */) && func.parent.kind === 188 /* ObjectLiteralExpression */ ? func.parent :
-                func.kind === 196 /* FunctionExpression */ && func.parent.kind === 275 /* PropertyAssignment */ ? func.parent.parent :
+            return (func.kind === 157 /* MethodDeclaration */ ||
+                func.kind === 159 /* GetAccessor */ ||
+                func.kind === 160 /* SetAccessor */) && func.parent.kind === 189 /* ObjectLiteralExpression */ ? func.parent :
+                func.kind === 197 /* FunctionExpression */ && func.parent.kind === 276 /* PropertyAssignment */ ? func.parent.parent :
                     undefined;
         }
         function getThisTypeArgument(type) {
@@ -47321,7 +48707,7 @@ var ts;
             });
         }
         function getContextualThisParameterType(func) {
-            if (func.kind === 197 /* ArrowFunction */) {
+            if (func.kind === 198 /* ArrowFunction */) {
                 return undefined;
             }
             if (isContextSensitiveFunctionOrObjectLiteralMethod(func)) {
@@ -47346,9 +48732,9 @@ var ts;
                     while (type) {
                         var thisType = getThisTypeFromContextualType(type);
                         if (thisType) {
-                            return instantiateType(thisType, getContextualMapper(containingLiteral));
+                            return instantiateType(thisType, getMapperFromContext(getInferenceContext(containingLiteral)));
                         }
-                        if (literal.parent.kind !== 275 /* PropertyAssignment */) {
+                        if (literal.parent.kind !== 276 /* PropertyAssignment */) {
                             break;
                         }
                         literal = literal.parent.parent;
@@ -47357,14 +48743,14 @@ var ts;
                     // There was no contextual ThisType<T> for the containing object literal, so the contextual type
                     // for 'this' is the non-null form of the contextual type for the containing object literal or
                     // the type of the object literal itself.
-                    return contextualType ? getNonNullableType(contextualType) : checkExpressionCached(containingLiteral);
+                    return getWidenedType(contextualType ? getNonNullableType(contextualType) : checkExpressionCached(containingLiteral));
                 }
                 // In an assignment of the form 'obj.xxx = function(...)' or 'obj[xxx] = function(...)', the
                 // contextual type for 'this' is 'obj'.
                 var parent = func.parent;
-                if (parent.kind === 204 /* BinaryExpression */ && parent.operatorToken.kind === 59 /* EqualsToken */) {
+                if (parent.kind === 205 /* BinaryExpression */ && parent.operatorToken.kind === 60 /* EqualsToken */) {
                     var target = parent.left;
-                    if (target.kind === 189 /* PropertyAccessExpression */ || target.kind === 190 /* ElementAccessExpression */) {
+                    if (target.kind === 190 /* PropertyAccessExpression */ || target.kind === 191 /* ElementAccessExpression */) {
                         var expression = target.expression;
                         // Don't contextually type `this` as `exports` in `exports.Point = function(x, y) { this.x = x; this.y = y; }`
                         if (inJs && ts.isIdentifier(expression)) {
@@ -47373,14 +48759,14 @@ var ts;
                                 return undefined;
                             }
                         }
-                        return checkExpressionCached(expression);
+                        return getWidenedType(checkExpressionCached(expression));
                     }
                 }
             }
             return undefined;
         }
         // Return contextual type of parameter or undefined if no contextual type is available
-        function getContextuallyTypedParameterType(parameter) {
+        function getContextuallyTypedParameterType(parameter, forCache) {
             var func = parameter.parent;
             if (!isContextSensitiveFunctionOrObjectLiteralMethod(func)) {
                 return undefined;
@@ -47403,6 +48789,19 @@ var ts;
             }
             var contextualSignature = getContextualSignature(func);
             if (contextualSignature) {
+                if (forCache) {
+                    // Calling the below guarantees the types are primed and assigned in the same way
+                    // as when the parameter is reached via `checkFunctionExpressionOrObjectLiteralMethod`.
+                    // This should prevent any uninstantiated inference variables in the contextual signature
+                    // from leaking, and should lock in cached parameter types via `assignContextualParameterTypes`
+                    // which we will then immediately use the results of below.
+                    contextuallyCheckFunctionExpressionOrObjectLiteralMethod(func);
+                    var type = getTypeOfSymbol(getMergedSymbol(func.symbol));
+                    if (isTypeAny(type)) {
+                        return type;
+                    }
+                    contextualSignature = getSignaturesOfType(type, 0 /* Call */)[0];
+                }
                 var index = func.parameters.indexOf(parameter) - (ts.getThisParameter(func) ? 1 : 0);
                 return parameter.dotDotDotToken && ts.lastOrUndefined(func.parameters) === parameter ?
                     getRestTypeAtPosition(contextualSignature, index) :
@@ -47415,9 +48814,9 @@ var ts;
                 return getTypeFromTypeNode(typeNode);
             }
             switch (declaration.kind) {
-                case 151 /* Parameter */:
-                    return getContextuallyTypedParameterType(declaration);
-                case 186 /* BindingElement */:
+                case 152 /* Parameter */:
+                    return getContextuallyTypedParameterType(declaration, /*forCache*/ false);
+                case 187 /* BindingElement */:
                     return getContextualTypeForBindingElement(declaration);
                 // By default, do nothing and return undefined - only parameters and binding elements have context implied by a parent
             }
@@ -47489,7 +48888,7 @@ var ts;
                 if (contextualReturnType) {
                     return node.asteriskToken
                         ? contextualReturnType
-                        : getIteratedTypeOfGenerator(contextualReturnType, (functionFlags & 2 /* Async */) !== 0);
+                        : getIterationTypeOfGeneratorFunctionReturnType(0 /* Yield */, contextualReturnType, (functionFlags & 2 /* Async */) !== 0);
                 }
             }
             return undefined;
@@ -47538,16 +48937,16 @@ var ts;
             return getTypeAtPosition(signature, argIndex);
         }
         function getContextualTypeForSubstitutionExpression(template, substitutionExpression) {
-            if (template.parent.kind === 193 /* TaggedTemplateExpression */) {
+            if (template.parent.kind === 194 /* TaggedTemplateExpression */) {
                 return getContextualTypeForArgument(template.parent, substitutionExpression);
             }
             return undefined;
         }
-        function getContextualTypeForBinaryOperand(node) {
+        function getContextualTypeForBinaryOperand(node, contextFlags) {
             var binaryExpression = node.parent;
             var left = binaryExpression.left, operatorToken = binaryExpression.operatorToken, right = binaryExpression.right;
             switch (operatorToken.kind) {
-                case 59 /* EqualsToken */:
+                case 60 /* EqualsToken */:
                     if (node !== right) {
                         return undefined;
                     }
@@ -47557,15 +48956,17 @@ var ts;
                     }
                     return contextSensitive === true ? getTypeOfExpression(left) : contextSensitive;
                 case 55 /* BarBarToken */:
-                    // When an || expression has a contextual type, the operands are contextually typed by that type. When an ||
-                    // expression has no contextual type, the right operand is contextually typed by the type of the left operand,
-                    // except for the special case of Javascript declarations of the form `namespace.prop = namespace.prop || {}`
-                    var type = getContextualType(binaryExpression);
-                    return !type && node === right && !ts.isDefaultedExpandoInitializer(binaryExpression) ?
+                    // When an || expression has a contextual type, the operands are contextually typed by that type, except
+                    // when that type originates in a binding pattern, the right operand is contextually typed by the type of
+                    // the left operand. When an || expression has no contextual type, the right operand is contextually typed
+                    // by the type of the left operand, except for the special case of Javascript declarations of the form
+                    // `namespace.prop = namespace.prop || {}`.
+                    var type = getContextualType(binaryExpression, contextFlags);
+                    return node === right && (type && type.pattern || !type && !ts.isDefaultedExpandoInitializer(binaryExpression)) ?
                         getTypeOfExpression(left) : type;
                 case 54 /* AmpersandAmpersandToken */:
                 case 27 /* CommaToken */:
-                    return node === right ? getContextualType(binaryExpression) : undefined;
+                    return node === right ? getContextualType(binaryExpression, contextFlags) : undefined;
                 default:
                     return undefined;
             }
@@ -47641,7 +49042,15 @@ var ts;
         }
         function getTypeOfPropertyOfContextualType(type, name) {
             return mapType(type, function (t) {
-                if (t.flags & 3670016 /* StructuredType */) {
+                if (isGenericMappedType(t)) {
+                    var constraint = getConstraintTypeFromMappedType(t);
+                    var constraintOfConstraint = getBaseConstraintOfType(constraint) || constraint;
+                    var propertyNameType = getLiteralType(ts.unescapeLeadingUnderscores(name));
+                    if (isTypeAssignableTo(propertyNameType, constraintOfConstraint)) {
+                        return substituteIndexedMappedType(t, propertyNameType);
+                    }
+                }
+                else if (t.flags & 3670016 /* StructuredType */) {
                     var prop = getPropertyOfType(t, name);
                     if (prop) {
                         return getTypeOfSymbol(prop);
@@ -47664,24 +49073,24 @@ var ts;
         // In an object literal contextually typed by a type T, the contextual type of a property assignment is the type of
         // the matching property in T, if one exists. Otherwise, it is the type of the numeric index signature in T, if one
         // exists. Otherwise, it is the type of the string index signature in T, if one exists.
-        function getContextualTypeForObjectLiteralMethod(node) {
+        function getContextualTypeForObjectLiteralMethod(node, contextFlags) {
             ts.Debug.assert(ts.isObjectLiteralMethod(node));
             if (node.flags & 8388608 /* InWithStatement */) {
                 // We cannot answer semantic questions within a with block, do not proceed any further
                 return undefined;
             }
-            return getContextualTypeForObjectLiteralElement(node);
+            return getContextualTypeForObjectLiteralElement(node, contextFlags);
         }
-        function getContextualTypeForObjectLiteralElement(element) {
+        function getContextualTypeForObjectLiteralElement(element, contextFlags) {
             var objectLiteral = element.parent;
-            var type = getApparentTypeOfContextualType(objectLiteral);
+            var type = getApparentTypeOfContextualType(objectLiteral, contextFlags);
             if (type) {
                 if (!hasNonBindableDynamicName(element)) {
                     // For a (non-symbol) computed property, there is no reason to look up the name
                     // in the type. It will just be "__computed", which does not appear in any
                     // SymbolTable.
-                    var symbolName_2 = getSymbolOfNode(element).escapedName;
-                    var propertyType = getTypeOfPropertyOfContextualType(type, symbolName_2);
+                    var symbolName_3 = getSymbolOfNode(element).escapedName;
+                    var propertyType = getTypeOfPropertyOfContextualType(type, symbolName_3);
                     if (propertyType) {
                         return propertyType;
                     }
@@ -47697,12 +49106,12 @@ var ts;
         // type of T.
         function getContextualTypeForElementExpression(arrayContextualType, index) {
             return arrayContextualType && (getTypeOfPropertyOfContextualType(arrayContextualType, "" + index)
-                || getIteratedTypeOrElementType(arrayContextualType, /*errorNode*/ undefined, /*allowStringInput*/ false, /*allowAsyncIterables*/ false, /*checkAssignability*/ false));
+                || getIteratedTypeOrElementType(1 /* Element */, arrayContextualType, undefinedType, /*errorNode*/ undefined, /*checkAssignability*/ false));
         }
         // In a contextually typed conditional expression, the true/false expressions are contextually typed by the same type.
-        function getContextualTypeForConditionalOperand(node) {
+        function getContextualTypeForConditionalOperand(node, contextFlags) {
             var conditional = node.parent;
-            return node === conditional.whenTrue || node === conditional.whenFalse ? getContextualType(conditional) : undefined;
+            return node === conditional.whenTrue || node === conditional.whenFalse ? getContextualType(conditional, contextFlags) : undefined;
         }
         function getContextualTypeForChildJsxExpression(node, child) {
             var attributesType = getApparentTypeOfContextualType(node.openingElement.tagName);
@@ -47711,16 +49120,17 @@ var ts;
             if (!(attributesType && !isTypeAny(attributesType) && jsxChildrenPropertyName && jsxChildrenPropertyName !== "")) {
                 return undefined;
             }
-            var childIndex = node.children.indexOf(child);
+            var realChildren = getSemanticJsxChildren(node.children);
+            var childIndex = realChildren.indexOf(child);
             var childFieldType = getTypeOfPropertyOfContextualType(attributesType, jsxChildrenPropertyName);
-            return childFieldType && mapType(childFieldType, function (t) {
+            return childFieldType && (realChildren.length === 1 ? childFieldType : mapType(childFieldType, function (t) {
                 if (isArrayLikeType(t)) {
                     return getIndexedAccessType(t, getLiteralType(childIndex));
                 }
                 else {
                     return t;
                 }
-            }, /*noReductions*/ true);
+            }, /*noReductions*/ true));
         }
         function getContextualTypeForJsxExpression(node) {
             var exprParent = node.parent;
@@ -47754,30 +49164,30 @@ var ts;
                 case 8 /* NumericLiteral */:
                 case 9 /* BigIntLiteral */:
                 case 14 /* NoSubstitutionTemplateLiteral */:
-                case 102 /* TrueKeyword */:
-                case 87 /* FalseKeyword */:
-                case 96 /* NullKeyword */:
-                case 72 /* Identifier */:
-                case 141 /* UndefinedKeyword */:
+                case 103 /* TrueKeyword */:
+                case 88 /* FalseKeyword */:
+                case 97 /* NullKeyword */:
+                case 73 /* Identifier */:
+                case 142 /* UndefinedKeyword */:
                     return true;
-                case 189 /* PropertyAccessExpression */:
-                case 195 /* ParenthesizedExpression */:
+                case 190 /* PropertyAccessExpression */:
+                case 196 /* ParenthesizedExpression */:
                     return isPossiblyDiscriminantValue(node.expression);
-                case 270 /* JsxExpression */:
+                case 271 /* JsxExpression */:
                     return !node.expression || isPossiblyDiscriminantValue(node.expression);
             }
             return false;
         }
         function discriminateContextualTypeByObjectMembers(node, contextualType) {
-            return discriminateTypeByDiscriminableItems(contextualType, ts.map(ts.filter(node.properties, function (p) { return !!p.symbol && p.kind === 275 /* PropertyAssignment */ && isPossiblyDiscriminantValue(p.initializer) && isDiscriminantProperty(contextualType, p.symbol.escapedName); }), function (prop) { return [function () { return checkExpression(prop.initializer); }, prop.symbol.escapedName]; }), isTypeAssignableTo, contextualType);
+            return discriminateTypeByDiscriminableItems(contextualType, ts.map(ts.filter(node.properties, function (p) { return !!p.symbol && p.kind === 276 /* PropertyAssignment */ && isPossiblyDiscriminantValue(p.initializer) && isDiscriminantProperty(contextualType, p.symbol.escapedName); }), function (prop) { return [function () { return checkExpression(prop.initializer); }, prop.symbol.escapedName]; }), isTypeAssignableTo, contextualType);
         }
         function discriminateContextualTypeByJSXAttributes(node, contextualType) {
-            return discriminateTypeByDiscriminableItems(contextualType, ts.map(ts.filter(node.properties, function (p) { return !!p.symbol && p.kind === 267 /* JsxAttribute */ && isDiscriminantProperty(contextualType, p.symbol.escapedName) && (!p.initializer || isPossiblyDiscriminantValue(p.initializer)); }), function (prop) { return [!prop.initializer ? (function () { return trueType; }) : (function () { return checkExpression(prop.initializer); }), prop.symbol.escapedName]; }), isTypeAssignableTo, contextualType);
+            return discriminateTypeByDiscriminableItems(contextualType, ts.map(ts.filter(node.properties, function (p) { return !!p.symbol && p.kind === 268 /* JsxAttribute */ && isDiscriminantProperty(contextualType, p.symbol.escapedName) && (!p.initializer || isPossiblyDiscriminantValue(p.initializer)); }), function (prop) { return [!prop.initializer ? (function () { return trueType; }) : (function () { return checkExpression(prop.initializer); }), prop.symbol.escapedName]; }), isTypeAssignableTo, contextualType);
         }
         // Return the contextual type for a given expression node. During overload resolution, a contextual type may temporarily
         // be "pushed" onto a node using the contextualType property.
-        function getApparentTypeOfContextualType(node) {
-            var contextualType = instantiateContextualType(getContextualType(node), node);
+        function getApparentTypeOfContextualType(node, contextFlags) {
+            var contextualType = instantiateContextualType(getContextualType(node, contextFlags), node, contextFlags);
             if (contextualType) {
                 var apparentType = mapType(contextualType, getApparentType, /*noReductions*/ true);
                 if (apparentType.flags & 1048576 /* Union */) {
@@ -47793,11 +49203,22 @@ var ts;
         }
         // If the given contextual type contains instantiable types and if a mapper representing
         // return type inferences is available, instantiate those types using that mapper.
-        function instantiateContextualType(contextualType, node) {
+        function instantiateContextualType(contextualType, node, contextFlags) {
             if (contextualType && maybeTypeOfKind(contextualType, 63176704 /* Instantiable */)) {
-                var returnMapper = getContextualMapper(node).returnMapper;
-                if (returnMapper) {
-                    return instantiateInstantiableTypes(contextualType, returnMapper);
+                var inferenceContext = getInferenceContext(node);
+                // If no inferences have been made, nothing is gained from instantiating as type parameters
+                // would just be replaced with their defaults similar to the apparent type.
+                if (inferenceContext && ts.some(inferenceContext.inferences, hasInferenceCandidates)) {
+                    // For contextual signatures we incorporate all inferences made so far, e.g. from return
+                    // types as well as arguments to the left in a function call.
+                    if (contextFlags && contextFlags & 1 /* Signature */) {
+                        return instantiateInstantiableTypes(contextualType, inferenceContext.nonFixingMapper);
+                    }
+                    // For other purposes (e.g. determining whether to produce literal types) we only
+                    // incorporate inferences made from the return type in a function call.
+                    if (inferenceContext.returnMapper) {
+                        return instantiateInstantiableTypes(contextualType, inferenceContext.returnMapper);
+                    }
                 }
             }
             return contextualType;
@@ -47818,7 +49239,7 @@ var ts;
             return type;
         }
         /**
-         * Woah! Do you really want to use this function?
+         * Whoa! Do you really want to use this function?
          *
          * Unless you're trying to get the *non-apparent* type for a
          * value-literal type or you're authoring relevant portions of this algorithm,
@@ -47834,7 +49255,7 @@ var ts;
          * @param node the expression whose contextual type will be returned.
          * @returns the contextual type of an expression.
          */
-        function getContextualType(node) {
+        function getContextualType(node, contextFlags) {
             if (node.flags & 8388608 /* InWithStatement */) {
                 // We cannot answer semantic questions within a with block, do not proceed any further
                 return undefined;
@@ -47844,61 +49265,65 @@ var ts;
             }
             var parent = node.parent;
             switch (parent.kind) {
-                case 237 /* VariableDeclaration */:
-                case 151 /* Parameter */:
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
-                case 186 /* BindingElement */:
+                case 238 /* VariableDeclaration */:
+                case 152 /* Parameter */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
+                case 187 /* BindingElement */:
                     return getContextualTypeForInitializerExpression(node);
-                case 197 /* ArrowFunction */:
-                case 230 /* ReturnStatement */:
+                case 198 /* ArrowFunction */:
+                case 231 /* ReturnStatement */:
                     return getContextualTypeForReturnExpression(node);
-                case 207 /* YieldExpression */:
+                case 208 /* YieldExpression */:
                     return getContextualTypeForYieldOperand(parent);
-                case 201 /* AwaitExpression */:
+                case 202 /* AwaitExpression */:
                     return getContextualTypeForAwaitOperand(parent);
-                case 191 /* CallExpression */:
-                case 192 /* NewExpression */:
+                case 192 /* CallExpression */:
+                    if (parent.expression.kind === 93 /* ImportKeyword */) {
+                        return stringType;
+                    }
+                /* falls through */
+                case 193 /* NewExpression */:
                     return getContextualTypeForArgument(parent, node);
-                case 194 /* TypeAssertionExpression */:
-                case 212 /* AsExpression */:
+                case 195 /* TypeAssertionExpression */:
+                case 213 /* AsExpression */:
                     return ts.isConstTypeReference(parent.type) ? undefined : getTypeFromTypeNode(parent.type);
-                case 204 /* BinaryExpression */:
-                    return getContextualTypeForBinaryOperand(node);
-                case 275 /* PropertyAssignment */:
-                case 276 /* ShorthandPropertyAssignment */:
-                    return getContextualTypeForObjectLiteralElement(parent);
-                case 277 /* SpreadAssignment */:
-                    return getApparentTypeOfContextualType(parent.parent);
-                case 187 /* ArrayLiteralExpression */: {
+                case 205 /* BinaryExpression */:
+                    return getContextualTypeForBinaryOperand(node, contextFlags);
+                case 276 /* PropertyAssignment */:
+                case 277 /* ShorthandPropertyAssignment */:
+                    return getContextualTypeForObjectLiteralElement(parent, contextFlags);
+                case 278 /* SpreadAssignment */:
+                    return getApparentTypeOfContextualType(parent.parent, contextFlags);
+                case 188 /* ArrayLiteralExpression */: {
                     var arrayLiteral = parent;
-                    var type = getApparentTypeOfContextualType(arrayLiteral);
+                    var type = getApparentTypeOfContextualType(arrayLiteral, contextFlags);
                     return getContextualTypeForElementExpression(type, ts.indexOfNode(arrayLiteral.elements, node));
                 }
-                case 205 /* ConditionalExpression */:
-                    return getContextualTypeForConditionalOperand(node);
-                case 216 /* TemplateSpan */:
-                    ts.Debug.assert(parent.parent.kind === 206 /* TemplateExpression */);
+                case 206 /* ConditionalExpression */:
+                    return getContextualTypeForConditionalOperand(node, contextFlags);
+                case 217 /* TemplateSpan */:
+                    ts.Debug.assert(parent.parent.kind === 207 /* TemplateExpression */);
                     return getContextualTypeForSubstitutionExpression(parent.parent, node);
-                case 195 /* ParenthesizedExpression */: {
+                case 196 /* ParenthesizedExpression */: {
                     // Like in `checkParenthesizedExpression`, an `/** @type {xyz} */` comment before a parenthesized expression acts as a type cast.
                     var tag = ts.isInJSFile(parent) ? ts.getJSDocTypeTag(parent) : undefined;
-                    return tag ? getTypeFromTypeNode(tag.typeExpression.type) : getContextualType(parent);
+                    return tag ? getTypeFromTypeNode(tag.typeExpression.type) : getContextualType(parent, contextFlags);
                 }
-                case 270 /* JsxExpression */:
+                case 271 /* JsxExpression */:
                     return getContextualTypeForJsxExpression(parent);
-                case 267 /* JsxAttribute */:
-                case 269 /* JsxSpreadAttribute */:
+                case 268 /* JsxAttribute */:
+                case 270 /* JsxSpreadAttribute */:
                     return getContextualTypeForJsxAttribute(parent);
-                case 262 /* JsxOpeningElement */:
-                case 261 /* JsxSelfClosingElement */:
+                case 263 /* JsxOpeningElement */:
+                case 262 /* JsxSelfClosingElement */:
                     return getContextualJsxElementAttributesType(parent);
             }
             return undefined;
         }
-        function getContextualMapper(node) {
-            var ancestor = ts.findAncestor(node, function (n) { return !!n.contextualMapper; });
-            return ancestor ? ancestor.contextualMapper : identityMapper;
+        function getInferenceContext(node) {
+            var ancestor = ts.findAncestor(node, function (n) { return !!n.inferenceContext; });
+            return ancestor && ancestor.inferenceContext;
         }
         function getContextualJsxElementAttributesType(node) {
             if (ts.isJsxOpeningElement(node) && node.parent.contextualType) {
@@ -47913,7 +49338,7 @@ var ts;
             return getJsxReferenceKind(node) !== 0 /* Component */ ? getJsxPropsTypeFromCallSignature(signature, node) : getJsxPropsTypeFromClassType(signature, node);
         }
         function getJsxPropsTypeFromCallSignature(sig, context) {
-            var propsType = getTypeOfFirstParameterOfSignatureWithFallback(sig, emptyObjectType);
+            var propsType = getTypeOfFirstParameterOfSignatureWithFallback(sig, unknownType);
             propsType = getJsxManagedAttributesFromLocatedAttributes(context, getJsxNamespaceAt(context), propsType);
             var intrinsicAttribs = getJsxType(JsxNames.IntrinsicAttributes, context);
             if (intrinsicAttribs !== errorType) {
@@ -47984,7 +49409,7 @@ var ts;
             var forcedLookupLocation = getJsxElementPropertiesName(ns);
             var attributesType = forcedLookupLocation === undefined
                 // If there is no type ElementAttributesProperty, return the type of the first parameter of the signature, which should be the props type
-                ? getTypeOfFirstParameterOfSignatureWithFallback(sig, emptyObjectType)
+                ? getTypeOfFirstParameterOfSignatureWithFallback(sig, unknownType)
                 : forcedLookupLocation === ""
                     // If there is no e.g. 'props' member in ElementAttributesProperty, use the element class type instead
                     ? getReturnTypeOfSignature(sig)
@@ -47995,7 +49420,7 @@ var ts;
                 if (!!forcedLookupLocation && !!ts.length(context.attributes.properties)) {
                     error(context, ts.Diagnostics.JSX_element_class_does_not_support_attributes_because_it_does_not_have_a_0_property, ts.unescapeLeadingUnderscores(forcedLookupLocation));
                 }
-                return emptyObjectType;
+                return unknownType;
             }
             attributesType = getJsxManagedAttributesFromLocatedAttributes(context, ns, attributesType);
             if (isTypeAny(attributesType)) {
@@ -48046,7 +49471,7 @@ var ts;
             return !hasEffectiveRestParameter(signature) && getParameterCount(signature) < targetParameterCount;
         }
         function isFunctionExpressionOrArrowFunction(node) {
-            return node.kind === 196 /* FunctionExpression */ || node.kind === 197 /* ArrowFunction */;
+            return node.kind === 197 /* FunctionExpression */ || node.kind === 198 /* ArrowFunction */;
         }
         function getContextualSignatureForFunctionLikeDeclaration(node) {
             // Only function expressions, arrow functions, and object literal methods are contextually typed.
@@ -48054,23 +49479,20 @@ var ts;
                 ? getContextualSignature(node)
                 : undefined;
         }
-        function getContextualTypeForFunctionLikeDeclaration(node) {
-            return ts.isObjectLiteralMethod(node) ?
-                getContextualTypeForObjectLiteralMethod(node) :
-                getApparentTypeOfContextualType(node);
-        }
         // Return the contextual signature for a given expression node. A contextual type provides a
         // contextual signature if it has a single call signature and if that call signature is non-generic.
         // If the contextual type is a union type, get the signature from each type possible and if they are
         // all identical ignoring their return type, the result is same signature but with return type as
         // union type of return types from these signatures
         function getContextualSignature(node) {
-            ts.Debug.assert(node.kind !== 156 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 157 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
             var typeTagSignature = getSignatureOfTypeTag(node);
             if (typeTagSignature) {
                 return typeTagSignature;
             }
-            var type = getContextualTypeForFunctionLikeDeclaration(node);
+            var type = ts.isObjectLiteralMethod(node) ?
+                getContextualTypeForObjectLiteralMethod(node, 1 /* Signature */) :
+                getApparentTypeOfContextualType(node, 1 /* Signature */);
             if (!type) {
                 return undefined;
             }
@@ -48079,8 +49501,8 @@ var ts;
             }
             var signatureList;
             var types = type.types;
-            for (var _i = 0, types_15 = types; _i < types_15.length; _i++) {
-                var current = types_15[_i];
+            for (var _i = 0, types_14 = types; _i < types_14.length; _i++) {
+                var current = types_14[_i];
                 var signature = getContextualCallSignature(current, node);
                 if (signature) {
                     if (!signatureList) {
@@ -48098,23 +49520,20 @@ var ts;
                 }
             }
             // Result is union of signatures collected (return type is union of return types of this signature set)
-            var result;
             if (signatureList) {
-                result = cloneSignature(signatureList[0]);
-                result.unionSignatures = signatureList;
+                return signatureList.length === 1 ? signatureList[0] : createUnionSignature(signatureList[0], signatureList);
             }
-            return result;
         }
         function checkSpreadExpression(node, checkMode) {
-            if (languageVersion < 2 /* ES2015 */ && compilerOptions.downlevelIteration) {
-                checkExternalEmitHelpers(node, 1536 /* SpreadIncludes */);
+            if (languageVersion < 2 /* ES2015 */) {
+                checkExternalEmitHelpers(node, compilerOptions.downlevelIteration ? 1536 /* SpreadIncludes */ : 2048 /* SpreadArrays */);
             }
             var arrayOrIterableType = checkExpression(node.expression, checkMode);
-            return checkIteratedTypeOrElementType(arrayOrIterableType, node.expression, /*allowStringInput*/ false, /*allowAsyncIterables*/ false);
+            return checkIteratedTypeOrElementType(33 /* Spread */, arrayOrIterableType, undefinedType, node.expression);
         }
         function hasDefaultValue(node) {
-            return (node.kind === 186 /* BindingElement */ && !!node.initializer) ||
-                (node.kind === 204 /* BinaryExpression */ && node.operatorToken.kind === 59 /* EqualsToken */);
+            return (node.kind === 187 /* BindingElement */ && !!node.initializer) ||
+                (node.kind === 205 /* BinaryExpression */ && node.operatorToken.kind === 60 /* EqualsToken */);
         }
         function checkArrayLiteral(node, checkMode, forceTuple) {
             var elements = node.elements;
@@ -48126,7 +49545,7 @@ var ts;
             var inConstContext = isConstContext(node);
             for (var index = 0; index < elementCount; index++) {
                 var e = elements[index];
-                if (inDestructuringPattern && e.kind === 208 /* SpreadElement */) {
+                if (inDestructuringPattern && e.kind === 209 /* SpreadElement */) {
                     // Given the following situation:
                     //    var c: {};
                     //    [...c] = ["", 0];
@@ -48141,7 +49560,7 @@ var ts;
                     // if there is no index type / iterated type.
                     var restArrayType = checkExpression(e.expression, checkMode, forceTuple);
                     var restElementType = getIndexTypeOfType(restArrayType, 1 /* Number */) ||
-                        getIteratedTypeOrElementType(restArrayType, /*errorNode*/ undefined, /*allowStringInput*/ false, /*allowAsyncIterables*/ false, /*checkAssignability*/ false);
+                        getIteratedTypeOrElementType(65 /* Destructuring */, restArrayType, undefinedType, /*errorNode*/ undefined, /*checkAssignability*/ false);
                     if (restElementType) {
                         elementTypes.push(restElementType);
                     }
@@ -48151,12 +49570,12 @@ var ts;
                     var type = checkExpressionForMutableLocation(e, checkMode, elementContextualType, forceTuple);
                     elementTypes.push(type);
                 }
-                if (index < elementCount - 1 && e.kind === 208 /* SpreadElement */) {
+                if (index < elementCount - 1 && e.kind === 209 /* SpreadElement */) {
                     hasNonEndingSpreadElement = true;
                 }
             }
             if (!hasNonEndingSpreadElement) {
-                var hasRestElement = elementCount > 0 && elements[elementCount - 1].kind === 208 /* SpreadElement */;
+                var hasRestElement = elementCount > 0 && elements[elementCount - 1].kind === 209 /* SpreadElement */;
                 var minLength = elementCount - (hasRestElement ? 1 : 0);
                 // If array literal is actually a destructuring pattern, mark it as an implied type. We do this such
                 // that we get the same behavior for "var [x, y] = []" and "[x, y] = []".
@@ -48167,48 +49586,40 @@ var ts;
                     return type;
                 }
                 else if (tupleResult = getArrayLiteralTupleTypeIfApplicable(elementTypes, contextualType, hasRestElement, elementCount, inConstContext)) {
-                    return tupleResult;
+                    return createArrayLiteralType(tupleResult);
                 }
                 else if (forceTuple) {
-                    return createTupleType(elementTypes, minLength, hasRestElement);
+                    return createArrayLiteralType(createTupleType(elementTypes, minLength, hasRestElement));
                 }
             }
-            return createArrayType(elementTypes.length ?
+            return createArrayLiteralType(createArrayType(elementTypes.length ?
                 getUnionType(elementTypes, 2 /* Subtype */) :
-                strictNullChecks ? implicitNeverType : undefinedWideningType, inConstContext);
+                strictNullChecks ? implicitNeverType : undefinedWideningType, inConstContext));
+        }
+        function createArrayLiteralType(type) {
+            if (!(ts.getObjectFlags(type) & 4 /* Reference */)) {
+                return type;
+            }
+            var literalType = type.literalType;
+            if (!literalType) {
+                literalType = type.literalType = cloneTypeReference(type);
+                literalType.objectFlags |= 65536 /* ArrayLiteral */ | 524288 /* ContainsObjectOrArrayLiteral */;
+            }
+            return literalType;
         }
         function getArrayLiteralTupleTypeIfApplicable(elementTypes, contextualType, hasRestElement, elementCount, readonly) {
             if (elementCount === void 0) { elementCount = elementTypes.length; }
             if (readonly === void 0) { readonly = false; }
             // Infer a tuple type when the contextual type is or contains a tuple-like type
             if (readonly || (contextualType && forEachType(contextualType, isTupleLikeType))) {
-                var minLength = elementCount - (hasRestElement ? 1 : 0);
-                var pattern = contextualType && contextualType.pattern;
-                // If array literal is contextually typed by a binding pattern or an assignment pattern, pad the resulting
-                // tuple type with the corresponding binding or assignment element types to make the lengths equal.
-                if (!hasRestElement && pattern && (pattern.kind === 185 /* ArrayBindingPattern */ || pattern.kind === 187 /* ArrayLiteralExpression */)) {
-                    var patternElements = pattern.elements;
-                    for (var i = elementCount; i < patternElements.length; i++) {
-                        var e = patternElements[i];
-                        if (hasDefaultValue(e)) {
-                            elementTypes.push(contextualType.typeArguments[i]);
-                        }
-                        else if (i < patternElements.length - 1 || !(e.kind === 186 /* BindingElement */ && e.dotDotDotToken || e.kind === 208 /* SpreadElement */)) {
-                            if (e.kind !== 210 /* OmittedExpression */) {
-                                error(e, ts.Diagnostics.Initializer_provides_no_value_for_this_binding_element_and_the_binding_element_has_no_default_value);
-                            }
-                            elementTypes.push(strictNullChecks ? implicitNeverType : undefinedWideningType);
-                        }
-                    }
-                }
-                return createTupleType(elementTypes, minLength, hasRestElement, readonly);
+                return createTupleType(elementTypes, elementCount - (hasRestElement ? 1 : 0), hasRestElement, readonly);
             }
         }
         function isNumericName(name) {
             switch (name.kind) {
-                case 149 /* ComputedPropertyName */:
+                case 150 /* ComputedPropertyName */:
                     return isNumericComputedName(name);
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return isNumericLiteralName(name.escapedText);
                 case 8 /* NumericLiteral */:
                 case 10 /* StringLiteral */:
@@ -48296,7 +49707,7 @@ var ts;
             var spread = emptyObjectType;
             var contextualType = getApparentTypeOfContextualType(node);
             var contextualTypeHasPattern = contextualType && contextualType.pattern &&
-                (contextualType.pattern.kind === 184 /* ObjectBindingPattern */ || contextualType.pattern.kind === 188 /* ObjectLiteralExpression */);
+                (contextualType.pattern.kind === 185 /* ObjectBindingPattern */ || contextualType.pattern.kind === 189 /* ObjectLiteralExpression */);
             var inConstContext = isConstContext(node);
             var checkFlags = inConstContext ? 8 /* Readonly */ : 0;
             var isInJavascript = ts.isInJSFile(node) && !ts.isInJsonFile(node);
@@ -48311,13 +49722,13 @@ var ts;
             for (var i = 0; i < node.properties.length; i++) {
                 var memberDecl = node.properties[i];
                 var member = getSymbolOfNode(memberDecl);
-                var computedNameType = memberDecl.name && memberDecl.name.kind === 149 /* ComputedPropertyName */ && !ts.isWellKnownSymbolSyntactically(memberDecl.name.expression) ?
+                var computedNameType = memberDecl.name && memberDecl.name.kind === 150 /* ComputedPropertyName */ && !ts.isWellKnownSymbolSyntactically(memberDecl.name.expression) ?
                     checkComputedPropertyName(memberDecl.name) : undefined;
-                if (memberDecl.kind === 275 /* PropertyAssignment */ ||
-                    memberDecl.kind === 276 /* ShorthandPropertyAssignment */ ||
+                if (memberDecl.kind === 276 /* PropertyAssignment */ ||
+                    memberDecl.kind === 277 /* ShorthandPropertyAssignment */ ||
                     ts.isObjectLiteralMethod(memberDecl)) {
-                    var type = memberDecl.kind === 275 /* PropertyAssignment */ ? checkPropertyAssignment(memberDecl, checkMode) :
-                        memberDecl.kind === 276 /* ShorthandPropertyAssignment */ ? checkExpressionForMutableLocation(memberDecl.name, checkMode) :
+                    var type = memberDecl.kind === 276 /* PropertyAssignment */ ? checkPropertyAssignment(memberDecl, checkMode) :
+                        memberDecl.kind === 277 /* ShorthandPropertyAssignment */ ? checkExpressionForMutableLocation(memberDecl.name, checkMode) :
                             checkObjectLiteralMethod(memberDecl, checkMode);
                     if (isInJavascript) {
                         var jsDocType = getTypeForDeclarationFromJSDocComment(memberDecl);
@@ -48329,10 +49740,10 @@ var ts;
                             checkTypeAssignableTo(type, getTypeFromTypeNode(enumTag.typeExpression), memberDecl);
                         }
                     }
-                    objectFlags |= ts.getObjectFlags(type) & 917504 /* PropagatingFlags */;
+                    objectFlags |= ts.getObjectFlags(type) & 1835008 /* PropagatingFlags */;
                     var nameType = computedNameType && isTypeUsableAsPropertyName(computedNameType) ? computedNameType : undefined;
                     var prop = nameType ?
-                        createSymbol(4 /* Property */ | member.flags, getPropertyNameFromType(nameType), checkFlags | 2048 /* Late */) :
+                        createSymbol(4 /* Property */ | member.flags, getPropertyNameFromType(nameType), checkFlags | 4096 /* Late */) :
                         createSymbol(4 /* Property */ | member.flags, member.escapedName, checkFlags);
                     if (nameType) {
                         prop.nameType = nameType;
@@ -48340,8 +49751,8 @@ var ts;
                     if (inDestructuringPattern) {
                         // If object literal is an assignment pattern and if the assignment pattern specifies a default value
                         // for the property, make the property optional.
-                        var isOptional = (memberDecl.kind === 275 /* PropertyAssignment */ && hasDefaultValue(memberDecl.initializer)) ||
-                            (memberDecl.kind === 276 /* ShorthandPropertyAssignment */ && memberDecl.objectAssignmentInitializer);
+                        var isOptional = (memberDecl.kind === 276 /* PropertyAssignment */ && hasDefaultValue(memberDecl.initializer)) ||
+                            (memberDecl.kind === 277 /* ShorthandPropertyAssignment */ && memberDecl.objectAssignmentInitializer);
                         if (isOptional) {
                             prop.flags |= 16777216 /* Optional */;
                         }
@@ -48366,7 +49777,7 @@ var ts;
                     prop.target = member;
                     member = prop;
                 }
-                else if (memberDecl.kind === 277 /* SpreadAssignment */) {
+                else if (memberDecl.kind === 278 /* SpreadAssignment */) {
                     if (languageVersion < 2 /* ES2015 */) {
                         checkExternalEmitHelpers(memberDecl, 2 /* Assign */);
                     }
@@ -48392,7 +49803,7 @@ var ts;
                     // an ordinary function declaration(section 6.1) with no parameters.
                     // A set accessor declaration is processed in the same manner
                     // as an ordinary function declaration with a single parameter and a Void return type.
-                    ts.Debug.assert(memberDecl.kind === 158 /* GetAccessor */ || memberDecl.kind === 159 /* SetAccessor */);
+                    ts.Debug.assert(memberDecl.kind === 159 /* GetAccessor */ || memberDecl.kind === 160 /* SetAccessor */);
                     checkNodeDeferred(memberDecl);
                 }
                 if (computedNameType && !(computedNameType.flags & 8576 /* StringOrNumberLiteralOrUnique */)) {
@@ -48438,7 +49849,7 @@ var ts;
                 var stringIndexInfo = hasComputedStringProperty ? getObjectLiteralIndexInfo(node, offset, propertiesArray, 0 /* String */) : undefined;
                 var numberIndexInfo = hasComputedNumberProperty ? getObjectLiteralIndexInfo(node, offset, propertiesArray, 1 /* Number */) : undefined;
                 var result = createAnonymousType(node.symbol, propertiesTable, ts.emptyArray, ts.emptyArray, stringIndexInfo, numberIndexInfo);
-                result.objectFlags |= objectFlags | 128 /* ObjectLiteral */ | 262144 /* ContainsObjectLiteral */;
+                result.objectFlags |= objectFlags | 128 /* ObjectLiteral */ | 524288 /* ContainsObjectOrArrayLiteral */;
                 if (isJSObjectLiteral) {
                     result.objectFlags |= 16384 /* JSLiteral */;
                 }
@@ -48500,7 +49911,7 @@ var ts;
          * Returns true iff React would emit this tag name as a string rather than an identifier or qualified name
          */
         function isJsxIntrinsicIdentifier(tagName) {
-            return tagName.kind === 72 /* Identifier */ && ts.isIntrinsicJsxName(tagName.escapedText);
+            return tagName.kind === 73 /* Identifier */ && ts.isIntrinsicJsxName(tagName.escapedText);
         }
         function checkJsxAttribute(node, checkMode) {
             return node.initializer
@@ -48530,7 +49941,7 @@ var ts;
                 var member = attributeDecl.symbol;
                 if (ts.isJsxAttribute(attributeDecl)) {
                     var exprType = checkJsxAttribute(attributeDecl, checkMode);
-                    objectFlags |= ts.getObjectFlags(exprType) & 917504 /* PropagatingFlags */;
+                    objectFlags |= ts.getObjectFlags(exprType) & 1835008 /* PropagatingFlags */;
                     var attributeSymbol = createSymbol(4 /* Property */ | 33554432 /* Transient */ | member.flags, member.escapedName);
                     attributeSymbol.declarations = member.declarations;
                     attributeSymbol.parent = member.parent;
@@ -48545,7 +49956,7 @@ var ts;
                     }
                 }
                 else {
-                    ts.Debug.assert(attributeDecl.kind === 269 /* JsxSpreadAttribute */);
+                    ts.Debug.assert(attributeDecl.kind === 270 /* JsxSpreadAttribute */);
                     if (attributesTable.size > 0) {
                         spread = getSpreadType(spread, createJsxAttributesType(), attributes.symbol, objectFlags, /*readonly*/ false);
                         attributesTable = ts.createSymbolTable();
@@ -48568,7 +49979,7 @@ var ts;
                 }
             }
             // Handle children attribute
-            var parent = openingLikeElement.parent.kind === 260 /* JsxElement */ ? openingLikeElement.parent : undefined;
+            var parent = openingLikeElement.parent.kind === 261 /* JsxElement */ ? openingLikeElement.parent : undefined;
             // We have to check that openingElement of the parent is the one we are visiting as this may not be true for selfClosingElement
             if (parent && parent.openingElement === openingLikeElement && parent.children.length > 0) {
                 var childrenTypes = checkJsxChildren(parent, checkMode);
@@ -48610,7 +50021,7 @@ var ts;
             function createJsxAttributesType() {
                 objectFlags |= freshObjectLiteralFlag;
                 var result = createAnonymousType(attributes.symbol, attributesTable, ts.emptyArray, ts.emptyArray, /*stringIndexInfo*/ undefined, /*numberIndexInfo*/ undefined);
-                result.objectFlags |= objectFlags | 128 /* ObjectLiteral */ | 262144 /* ContainsObjectLiteral */;
+                result.objectFlags |= objectFlags | 128 /* ObjectLiteral */ | 524288 /* ContainsObjectOrArrayLiteral */;
                 return result;
             }
         }
@@ -48621,7 +50032,7 @@ var ts;
                 // In React, JSX text that contains only whitespaces will be ignored so we don't want to type-check that
                 // because then type of children property will have constituent of string type.
                 if (child.kind === 11 /* JsxText */) {
-                    if (!child.containsOnlyWhiteSpaces) {
+                    if (!child.containsOnlyTriviaWhiteSpaces) {
                         childrenTypes.push(stringType);
                     }
                 }
@@ -48948,6 +50359,7 @@ var ts;
                 type.flags & 2097152 /* Intersection */ && ts.every(type.types, isExcessPropertyCheckTarget));
         }
         function checkJsxExpression(node, checkMode) {
+            checkGrammarJsxExpression(node);
             if (node.expression) {
                 var type = checkExpression(node.expression, checkMode);
                 if (node.dotDotDotToken && type !== anyType && !isArrayType(type)) {
@@ -48986,8 +50398,8 @@ var ts;
          */
         function checkPropertyAccessibility(node, isSuper, type, prop) {
             var flags = ts.getDeclarationModifierFlagsFromSymbol(prop);
-            var errorNode = node.kind === 148 /* QualifiedName */ ? node.right : node.kind === 183 /* ImportType */ ? node : node.name;
-            if (ts.getCheckFlags(prop) & 512 /* ContainsPrivate */) {
+            var errorNode = node.kind === 149 /* QualifiedName */ ? node.right : node.kind === 184 /* ImportType */ ? node : node.name;
+            if (ts.getCheckFlags(prop) & 1024 /* ContainsPrivate */) {
                 // Synthetic property with private constituent property
                 error(errorNode, ts.Diagnostics.Property_0_has_conflicting_declarations_and_is_inaccessible_in_type_1, symbolToString(prop), typeToString(type));
                 return false;
@@ -49092,7 +50504,7 @@ var ts;
             return type;
         }
         function checkNonNullType(type, node, nullDiagnostic, undefinedDiagnostic, nullOrUndefinedDiagnostic) {
-            if (type.flags & 2 /* Unknown */) {
+            if (strictNullChecks && type.flags & 2 /* Unknown */) {
                 error(node, ts.Diagnostics.Object_is_of_type_unknown);
                 return errorType;
             }
@@ -49107,42 +50519,58 @@ var ts;
             }
             return type;
         }
+        function checkNonNullNonVoidType(type, node) {
+            var nonNullType = checkNonNullType(type, node);
+            if (nonNullType !== errorType && nonNullType.flags & 16384 /* Void */) {
+                error(node, ts.Diagnostics.Object_is_possibly_undefined);
+            }
+            return nonNullType;
+        }
         function checkPropertyAccessExpression(node) {
             return checkPropertyAccessExpressionOrQualifiedName(node, node.expression, node.name);
         }
         function checkQualifiedName(node) {
             return checkPropertyAccessExpressionOrQualifiedName(node, node.left, node.right);
         }
+        function isMethodAccessForCall(node) {
+            while (node.parent.kind === 196 /* ParenthesizedExpression */) {
+                node = node.parent;
+            }
+            return ts.isCallOrNewExpression(node.parent) && node.parent.expression === node;
+        }
         function checkPropertyAccessExpressionOrQualifiedName(node, left, right) {
             var propType;
             var leftType = checkNonNullExpression(left);
             var parentSymbol = getNodeLinks(left).resolvedSymbol;
-            var apparentType = getApparentType(getWidenedType(leftType));
+            var assignmentKind = ts.getAssignmentTargetKind(node);
+            var apparentType = getApparentType(assignmentKind !== 0 /* None */ || isMethodAccessForCall(node) ? getWidenedType(leftType) : leftType);
             if (isTypeAny(apparentType) || apparentType === silentNeverType) {
                 if (ts.isIdentifier(left) && parentSymbol) {
                     markAliasReferenced(parentSymbol, node);
                 }
                 return apparentType;
             }
-            var assignmentKind = ts.getAssignmentTargetKind(node);
             var prop = getPropertyOfType(apparentType, right.escapedText);
             if (ts.isIdentifier(left) && parentSymbol && !(prop && isConstEnumOrConstEnumOnlyModule(prop))) {
                 markAliasReferenced(parentSymbol, node);
             }
             if (!prop) {
-                var indexInfo = getIndexInfoOfType(apparentType, 0 /* String */);
+                var indexInfo = assignmentKind === 0 /* None */ || !isGenericObjectType(leftType) || isThisTypeParameter(leftType) ? getIndexInfoOfType(apparentType, 0 /* String */) : undefined;
                 if (!(indexInfo && indexInfo.type)) {
                     if (isJSLiteralType(leftType)) {
                         return anyType;
                     }
                     if (leftType.symbol === globalThisSymbol) {
-                        if (noImplicitAny) {
+                        if (globalThisSymbol.exports.has(right.escapedText) && (globalThisSymbol.exports.get(right.escapedText).flags & 418 /* BlockScoped */)) {
+                            error(right, ts.Diagnostics.Property_0_does_not_exist_on_type_1, ts.unescapeLeadingUnderscores(right.escapedText), typeToString(leftType));
+                        }
+                        else if (noImplicitAny) {
                             error(right, ts.Diagnostics.Element_implicitly_has_an_any_type_because_type_0_has_no_index_signature, typeToString(leftType));
                         }
                         return anyType;
                     }
                     if (right.escapedText && !checkAndReportErrorForExtendingInterface(node)) {
-                        reportNonexistentProperty(right, leftType.flags & 262144 /* TypeParameter */ && leftType.isThisType ? apparentType : leftType);
+                        reportNonexistentProperty(right, isThisTypeParameter(leftType) ? apparentType : leftType);
                     }
                     return errorType;
                 }
@@ -49153,9 +50581,9 @@ var ts;
             }
             else {
                 checkPropertyNotUsedBeforeDeclaration(prop, node, right);
-                markPropertyAsReferenced(prop, node, left.kind === 100 /* ThisKeyword */);
+                markPropertyAsReferenced(prop, node, left.kind === 101 /* ThisKeyword */);
                 getNodeLinks(node).resolvedSymbol = prop;
-                checkPropertyAccessibility(node, left.kind === 98 /* SuperKeyword */, apparentType, prop);
+                checkPropertyAccessibility(node, left.kind === 99 /* SuperKeyword */, apparentType, prop);
                 if (assignmentKind) {
                     if (isReferenceToReadonlyEntity(node, prop) || isReferenceThroughNamespaceImport(node)) {
                         error(right, ts.Diagnostics.Cannot_assign_to_0_because_it_is_a_read_only_property, ts.idText(right));
@@ -49164,10 +50592,14 @@ var ts;
                 }
                 propType = getConstraintForLocation(getTypeOfSymbol(prop), node);
             }
+            return getFlowTypeOfAccessExpression(node, prop, propType, right);
+        }
+        function getFlowTypeOfAccessExpression(node, prop, propType, errorNode) {
             // Only compute control flow type if this is a property access expression that isn't an
             // assignment target, and the referenced property was declared as a variable, property,
             // accessor, or optional method.
-            if (node.kind !== 189 /* PropertyAccessExpression */ ||
+            var assignmentKind = ts.getAssignmentTargetKind(node);
+            if (node.kind !== 191 /* ElementAccessExpression */ && node.kind !== 190 /* PropertyAccessExpression */ ||
                 assignmentKind === 1 /* Definite */ ||
                 prop && !(prop.flags & (3 /* Variable */ | 4 /* Property */ | 98304 /* Accessor */)) && !(prop.flags & 8192 /* Method */ && propType.flags & 1048576 /* Union */)) {
                 return propType;
@@ -49177,11 +50609,11 @@ var ts;
             // and if we are in a constructor of the same class as the property declaration, assume that
             // the property is uninitialized at the top of the control flow.
             var assumeUninitialized = false;
-            if (strictNullChecks && strictPropertyInitialization && left.kind === 100 /* ThisKeyword */) {
+            if (strictNullChecks && strictPropertyInitialization && node.expression.kind === 101 /* ThisKeyword */) {
                 var declaration = prop && prop.valueDeclaration;
                 if (declaration && isInstancePropertyWithoutInitializer(declaration)) {
                     var flowContainer = getControlFlowContainer(node);
-                    if (flowContainer.kind === 157 /* Constructor */ && flowContainer.parent === declaration.parent) {
+                    if (flowContainer.kind === 158 /* Constructor */ && flowContainer.parent === declaration.parent) {
                         assumeUninitialized = true;
                     }
                 }
@@ -49194,7 +50626,7 @@ var ts;
             }
             var flowType = getFlowTypeOfReference(node, propType, assumeUninitialized ? getOptionalType(propType) : propType);
             if (assumeUninitialized && !(getFalsyFlags(propType) & 32768 /* Undefined */) && getFalsyFlags(flowType) & 32768 /* Undefined */) {
-                error(right, ts.Diagnostics.Property_0_is_used_before_being_assigned, symbolToString(prop)); // TODO: GH#18217
+                error(errorNode, ts.Diagnostics.Property_0_is_used_before_being_assigned, symbolToString(prop)); // TODO: GH#18217
                 // Return the declared type to reduce follow-on errors
                 return propType;
             }
@@ -49212,35 +50644,35 @@ var ts;
                 && !isPropertyDeclaredInAncestorClass(prop)) {
                 diagnosticMessage = error(right, ts.Diagnostics.Property_0_is_used_before_its_initialization, declarationName);
             }
-            else if (valueDeclaration.kind === 240 /* ClassDeclaration */ &&
-                node.parent.kind !== 164 /* TypeReference */ &&
+            else if (valueDeclaration.kind === 241 /* ClassDeclaration */ &&
+                node.parent.kind !== 165 /* TypeReference */ &&
                 !(valueDeclaration.flags & 4194304 /* Ambient */) &&
                 !isBlockScopedNameDeclaredBeforeUse(valueDeclaration, right)) {
                 diagnosticMessage = error(right, ts.Diagnostics.Class_0_used_before_its_declaration, declarationName);
             }
             if (diagnosticMessage) {
-                addRelatedInfo(diagnosticMessage, ts.createDiagnosticForNode(valueDeclaration, ts.Diagnostics._0_is_declared_here, declarationName));
+                ts.addRelatedInfo(diagnosticMessage, ts.createDiagnosticForNode(valueDeclaration, ts.Diagnostics._0_is_declared_here, declarationName));
             }
         }
         function isInPropertyInitializer(node) {
             return !!ts.findAncestor(node, function (node) {
                 switch (node.kind) {
-                    case 154 /* PropertyDeclaration */:
+                    case 155 /* PropertyDeclaration */:
                         return true;
-                    case 275 /* PropertyAssignment */:
-                    case 156 /* MethodDeclaration */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
-                    case 277 /* SpreadAssignment */:
-                    case 149 /* ComputedPropertyName */:
-                    case 216 /* TemplateSpan */:
-                    case 270 /* JsxExpression */:
-                    case 267 /* JsxAttribute */:
-                    case 268 /* JsxAttributes */:
-                    case 269 /* JsxSpreadAttribute */:
-                    case 262 /* JsxOpeningElement */:
-                    case 211 /* ExpressionWithTypeArguments */:
-                    case 273 /* HeritageClause */:
+                    case 276 /* PropertyAssignment */:
+                    case 157 /* MethodDeclaration */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
+                    case 278 /* SpreadAssignment */:
+                    case 150 /* ComputedPropertyName */:
+                    case 217 /* TemplateSpan */:
+                    case 271 /* JsxExpression */:
+                    case 268 /* JsxAttribute */:
+                    case 269 /* JsxAttributes */:
+                    case 270 /* JsxSpreadAttribute */:
+                    case 263 /* JsxOpeningElement */:
+                    case 212 /* ExpressionWithTypeArguments */:
+                    case 274 /* HeritageClause */:
                         return false;
                     default:
                         return ts.isExpressionNode(node) ? false : "quit";
@@ -49292,7 +50724,8 @@ var ts;
             else {
                 var promisedType = getPromisedTypeOfPromise(containingType);
                 if (promisedType && getPropertyOfType(promisedType, propNode.escapedText)) {
-                    errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.Property_0_does_not_exist_on_type_1_Did_you_forget_to_use_await, ts.declarationNameToString(propNode), typeToString(containingType));
+                    errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.Property_0_does_not_exist_on_type_1, ts.declarationNameToString(propNode), typeToString(containingType));
+                    relatedInfo = ts.createDiagnosticForNode(propNode, ts.Diagnostics.Did_you_forget_to_use_await);
                 }
                 else {
                     var suggestion = getSuggestedSymbolForNonexistentProperty(propNode, containingType);
@@ -49308,7 +50741,7 @@ var ts;
             }
             var resultDiagnostic = ts.createDiagnosticForNodeFromMessageChain(propNode, errorInfo);
             if (relatedInfo) {
-                addRelatedInfo(resultDiagnostic, relatedInfo);
+                ts.addRelatedInfo(resultDiagnostic, relatedInfo);
             }
             diagnostics.add(resultDiagnostic);
         }
@@ -49346,6 +50779,32 @@ var ts;
             var suggestion = getSuggestedSymbolForNonexistentModule(name, targetModule);
             return suggestion && ts.symbolName(suggestion);
         }
+        function getSuggestionForNonexistentIndexSignature(objectType, expr) {
+            // check if object type has setter or getter
+            var hasProp = function (name, argCount) {
+                if (argCount === void 0) { argCount = 1; }
+                var prop = getPropertyOfObjectType(objectType, name);
+                if (prop) {
+                    var s = getSingleCallSignature(getTypeOfSymbol(prop));
+                    if (s && getMinArgumentCount(s) === argCount && typeToString(getTypeAtPosition(s, 0)) === "string") {
+                        return true;
+                    }
+                }
+                return false;
+            };
+            var suggestedMethod = ts.isAssignmentTarget(expr) ? "set" : "get";
+            if (!hasProp(suggestedMethod)) {
+                return undefined;
+            }
+            var suggestion = ts.tryGetPropertyAccessOrIdentifierToString(expr);
+            if (suggestion === undefined) {
+                suggestion = suggestedMethod;
+            }
+            else {
+                suggestion += "." + suggestedMethod;
+            }
+            return suggestion;
+        }
         /**
          * Given a name and a list of symbols whose names are *not* equal to the name, return a spelling suggestion if there is one that is close enough.
          * Names less than length 3 only check for case-insensitive equality, not levenshtein distance.
@@ -49386,34 +50845,17 @@ var ts;
         }
         function isValidPropertyAccess(node, propertyName) {
             switch (node.kind) {
-                case 189 /* PropertyAccessExpression */:
-                    return isValidPropertyAccessWithType(node, node.expression.kind === 98 /* SuperKeyword */, propertyName, getWidenedType(checkExpression(node.expression)));
-                case 148 /* QualifiedName */:
+                case 190 /* PropertyAccessExpression */:
+                    return isValidPropertyAccessWithType(node, node.expression.kind === 99 /* SuperKeyword */, propertyName, getWidenedType(checkExpression(node.expression)));
+                case 149 /* QualifiedName */:
                     return isValidPropertyAccessWithType(node, /*isSuper*/ false, propertyName, getWidenedType(checkExpression(node.left)));
-                case 183 /* ImportType */:
+                case 184 /* ImportType */:
                     return isValidPropertyAccessWithType(node, /*isSuper*/ false, propertyName, getTypeFromTypeNode(node));
             }
         }
         function isValidPropertyAccessForCompletions(node, type, property) {
-            return isValidPropertyAccessWithType(node, node.kind === 189 /* PropertyAccessExpression */ && node.expression.kind === 98 /* SuperKeyword */, property.escapedName, type)
-                && (!(property.flags & 8192 /* Method */) || isValidMethodAccess(property, type));
-        }
-        function isValidMethodAccess(method, actualThisType) {
-            var propType = getTypeOfPropertyOfType(actualThisType, method.escapedName);
-            var signatures = getSignaturesOfType(getNonNullableType(propType), 0 /* Call */);
-            ts.Debug.assert(signatures.length !== 0);
-            return signatures.some(function (sig) {
-                var signatureThisType = getThisTypeOfSignature(sig);
-                return !signatureThisType || isTypeAssignableTo(actualThisType, getInstantiatedSignatureThisType(sig, signatureThisType, actualThisType));
-            });
-        }
-        function getInstantiatedSignatureThisType(sig, signatureThisType, actualThisType) {
-            if (!sig.typeParameters) {
-                return signatureThisType;
-            }
-            var context = createInferenceContext(sig.typeParameters, sig, 0 /* None */);
-            inferTypes(context.inferences, actualThisType, signatureThisType);
-            return instantiateType(signatureThisType, createSignatureTypeMapper(sig, getInferredTypes(context)));
+            return isValidPropertyAccessWithType(node, node.kind === 190 /* PropertyAccessExpression */ && node.expression.kind === 99 /* SuperKeyword */, property.escapedName, type);
+            // Previously we validated the 'this' type of methods but this adversely affected performance. See #31377 for more context.
         }
         function isValidPropertyAccessWithType(node, isSuper, propertyName, type) {
             if (type === errorType || isTypeAny(type)) {
@@ -49429,13 +50871,13 @@ var ts;
          */
         function getForInVariableSymbol(node) {
             var initializer = node.initializer;
-            if (initializer.kind === 238 /* VariableDeclarationList */) {
+            if (initializer.kind === 239 /* VariableDeclarationList */) {
                 var variable = initializer.declarations[0];
                 if (variable && !ts.isBindingPattern(variable.name)) {
                     return getSymbolOfNode(variable);
                 }
             }
-            else if (initializer.kind === 72 /* Identifier */) {
+            else if (initializer.kind === 73 /* Identifier */) {
                 return getResolvedSymbol(initializer);
             }
             return undefined;
@@ -49452,13 +50894,13 @@ var ts;
          */
         function isForInVariableForNumericPropertyNames(expr) {
             var e = ts.skipParentheses(expr);
-            if (e.kind === 72 /* Identifier */) {
+            if (e.kind === 73 /* Identifier */) {
                 var symbol = getResolvedSymbol(e);
                 if (symbol.flags & 3 /* Variable */) {
                     var child = expr;
                     var node = expr.parent;
                     while (node) {
-                        if (node.kind === 226 /* ForInStatement */ &&
+                        if (node.kind === 227 /* ForInStatement */ &&
                             child === node.statement &&
                             getForInVariableSymbol(node) === symbol &&
                             hasNumericPropertyNames(getTypeOfExpression(node.expression))) {
@@ -49472,11 +50914,12 @@ var ts;
             return false;
         }
         function checkIndexedAccess(node) {
-            var objectType = checkNonNullExpression(node.expression);
+            var exprType = checkNonNullExpression(node.expression);
+            var objectType = ts.getAssignmentTargetKind(node) !== 0 /* None */ || isMethodAccessForCall(node) ? getWidenedType(exprType) : exprType;
             var indexExpression = node.argumentExpression;
             if (!indexExpression) {
                 var sourceFile = ts.getSourceFileOfNode(node);
-                if (node.parent.kind === 192 /* NewExpression */ && node.parent.expression === node) {
+                if (node.parent.kind === 193 /* NewExpression */ && node.parent.expression === node) {
                     var start = ts.skipTrivia(sourceFile.text, node.expression.end);
                     var end = node.end;
                     grammarErrorAtPos(sourceFile, start, end - start, ts.Diagnostics.new_T_cannot_be_used_to_create_an_array_Use_new_Array_T_instead);
@@ -49496,7 +50939,12 @@ var ts;
                 error(indexExpression, ts.Diagnostics.A_const_enum_member_can_only_be_accessed_using_a_string_literal);
                 return errorType;
             }
-            return checkIndexedAccessIndexType(getIndexedAccessType(objectType, isForInVariableForNumericPropertyNames(indexExpression) ? numberType : indexType, node), node);
+            var effectiveIndexType = isForInVariableForNumericPropertyNames(indexExpression) ? numberType : indexType;
+            var accessFlags = ts.isAssignmentTarget(node) ?
+                2 /* Writing */ | (isGenericObjectType(objectType) && !isThisTypeParameter(objectType) ? 1 /* NoIndexSignatures */ : 0) :
+                0 /* None */;
+            var indexedAccessType = getIndexedAccessTypeOrUndefined(objectType, effectiveIndexType, node, accessFlags) || errorType;
+            return checkIndexedAccessIndexType(getFlowTypeOfAccessExpression(node, indexedAccessType.symbol, indexedAccessType, indexExpression), node);
         }
         function checkThatExpressionIsProperSymbolReference(expression, expressionType, reportError) {
             if (expressionType === errorType) {
@@ -49542,13 +50990,13 @@ var ts;
                 // This gets us diagnostics for the type arguments and marks them as referenced.
                 ts.forEach(node.typeArguments, checkSourceElement);
             }
-            if (node.kind === 193 /* TaggedTemplateExpression */) {
+            if (node.kind === 194 /* TaggedTemplateExpression */) {
                 checkExpression(node.template);
             }
             else if (ts.isJsxOpeningLikeElement(node)) {
                 checkExpression(node.attributes);
             }
-            else if (node.kind !== 152 /* Decorator */) {
+            else if (node.kind !== 153 /* Decorator */) {
                 ts.forEach(node.arguments, function (argument) {
                     checkExpression(argument);
                 });
@@ -49612,7 +51060,7 @@ var ts;
             }
         }
         function isSpreadArgument(arg) {
-            return !!arg && (arg.kind === 208 /* SpreadElement */ || arg.kind === 215 /* SyntheticExpression */ && arg.isSpread);
+            return !!arg && (arg.kind === 209 /* SpreadElement */ || arg.kind === 216 /* SyntheticExpression */ && arg.isSpread);
         }
         function getSpreadArgumentIndex(args) {
             return ts.findIndex(args, isSpreadArgument);
@@ -49626,9 +51074,9 @@ var ts;
             var callIsIncomplete = false; // In incomplete call we want to be lenient when we have too few arguments
             var effectiveParameterCount = getParameterCount(signature);
             var effectiveMinimumArguments = getMinArgumentCount(signature);
-            if (node.kind === 193 /* TaggedTemplateExpression */) {
+            if (node.kind === 194 /* TaggedTemplateExpression */) {
                 argCount = args.length;
-                if (node.template.kind === 206 /* TemplateExpression */) {
+                if (node.template.kind === 207 /* TemplateExpression */) {
                     // If a tagged template expression lacks a tail literal, the call is incomplete.
                     // Specifically, a template only can end in a TemplateTail or a Missing literal.
                     var lastSpan = ts.last(node.template.templateSpans); // we should always have at least one span.
@@ -49643,7 +51091,7 @@ var ts;
                     callIsIncomplete = !!templateLiteral.isUnterminated;
                 }
             }
-            else if (node.kind === 152 /* Decorator */) {
+            else if (node.kind === 153 /* Decorator */) {
                 argCount = getDecoratorArgumentCount(node, signature);
             }
             else if (ts.isJsxOpeningLikeElement(node)) {
@@ -49658,7 +51106,7 @@ var ts;
             else {
                 if (!node.arguments) {
                     // This only happens when we have something of the form: 'new C'
-                    ts.Debug.assert(node.kind === 192 /* NewExpression */);
+                    ts.Debug.assert(node.kind === 193 /* NewExpression */);
                     return getMinArgumentCount(signature) === 0;
                 }
                 argCount = signatureHelpTrailingComma ? args.length + 1 : args.length;
@@ -49697,36 +51145,43 @@ var ts;
         }
         // If type has a single call signature and no other members, return that signature. Otherwise, return undefined.
         function getSingleCallSignature(type) {
+            return getSingleSignature(type, 0 /* Call */, /*allowMembers*/ false);
+        }
+        function getSingleCallOrConstructSignature(type) {
+            return getSingleSignature(type, 0 /* Call */, /*allowMembers*/ false) ||
+                getSingleSignature(type, 1 /* Construct */, /*allowMembers*/ false);
+        }
+        function getSingleSignature(type, kind, allowMembers) {
             if (type.flags & 524288 /* Object */) {
                 var resolved = resolveStructuredTypeMembers(type);
-                if (resolved.callSignatures.length === 1 && resolved.constructSignatures.length === 0 &&
-                    resolved.properties.length === 0 && !resolved.stringIndexInfo && !resolved.numberIndexInfo) {
-                    return resolved.callSignatures[0];
+                if (allowMembers || resolved.properties.length === 0 && !resolved.stringIndexInfo && !resolved.numberIndexInfo) {
+                    if (kind === 0 /* Call */ && resolved.callSignatures.length === 1 && resolved.constructSignatures.length === 0) {
+                        return resolved.callSignatures[0];
+                    }
+                    if (kind === 1 /* Construct */ && resolved.constructSignatures.length === 1 && resolved.callSignatures.length === 0) {
+                        return resolved.constructSignatures[0];
+                    }
                 }
             }
             return undefined;
         }
         // Instantiate a generic signature in the context of a non-generic signature (section 3.8.5 in TypeScript spec)
-        function instantiateSignatureInContextOf(signature, contextualSignature, contextualMapper, compareTypes) {
+        function instantiateSignatureInContextOf(signature, contextualSignature, inferenceContext, compareTypes) {
             var context = createInferenceContext(signature.typeParameters, signature, 0 /* None */, compareTypes);
-            // We clone the contextualMapper to avoid fixing. For example, when the source signature is <T>(x: T) => T[] and
+            // We clone the inferenceContext to avoid fixing. For example, when the source signature is <T>(x: T) => T[] and
             // the contextual signature is (...args: A) => B, we want to infer the element type of A's constraint (say 'any')
             // for T but leave it possible to later infer '[any]' back to A.
             var restType = getEffectiveRestType(contextualSignature);
-            var mapper = contextualMapper && restType && restType.flags & 262144 /* TypeParameter */ ? cloneTypeMapper(contextualMapper) : contextualMapper;
+            var mapper = inferenceContext && (restType && restType.flags & 262144 /* TypeParameter */ ? inferenceContext.nonFixingMapper : inferenceContext.mapper);
             var sourceSignature = mapper ? instantiateSignature(contextualSignature, mapper) : contextualSignature;
-            forEachMatchingParameterType(sourceSignature, signature, function (source, target) {
+            applyToParameterTypes(sourceSignature, signature, function (source, target) {
                 // Type parameters from outer context referenced by source type are fixed by instantiation of the source type
                 inferTypes(context.inferences, source, target);
             });
-            if (!contextualMapper) {
-                inferTypes(context.inferences, getReturnTypeOfSignature(contextualSignature), getReturnTypeOfSignature(signature), 8 /* ReturnType */);
-                var signaturePredicate = getTypePredicateOfSignature(signature);
-                var contextualPredicate = getTypePredicateOfSignature(sourceSignature);
-                if (signaturePredicate && contextualPredicate && signaturePredicate.kind === contextualPredicate.kind &&
-                    (signaturePredicate.kind === 0 /* This */ || signaturePredicate.parameterIndex === contextualPredicate.parameterIndex)) {
-                    inferTypes(context.inferences, contextualPredicate.type, signaturePredicate.type, 8 /* ReturnType */);
-                }
+            if (!inferenceContext) {
+                applyToReturnTypes(contextualSignature, signature, function (source, target) {
+                    inferTypes(context.inferences, source, target, 16 /* ReturnType */);
+                });
             }
             return getSignatureInstantiation(signature, getInferredTypes(context), ts.isInJSFile(contextualSignature.declaration));
         }
@@ -49737,17 +51192,6 @@ var ts;
             return getInferredTypes(context);
         }
         function inferTypeArguments(node, signature, args, checkMode, context) {
-            // Clear out all the inference results from the last time inferTypeArguments was called on this context
-            for (var _i = 0, _a = context.inferences; _i < _a.length; _i++) {
-                var inference = _a[_i];
-                // As an optimization, we don't have to clear (and later recompute) inferred types
-                // for type parameters that have already been fixed on the previous call to inferTypeArguments.
-                // It would be just as correct to reset all of them. But then we'd be repeating the same work
-                // for the type parameters that were fixed, namely the work done by getInferredType.
-                if (!inference.isFixed) {
-                    inference.inferredType = undefined;
-                }
-            }
             if (ts.isJsxOpeningLikeElement(node)) {
                 return inferJsxTypeArguments(node, signature, checkMode, context);
             }
@@ -49755,13 +51199,15 @@ var ts;
             // example, given a 'function wrap<T, U>(cb: (x: T) => U): (x: T) => U' and a call expression
             // 'let f: (x: string) => number = wrap(s => s.length)', we infer from the declared type of 'f' to the
             // return type of 'wrap'.
-            if (node.kind !== 152 /* Decorator */) {
+            if (node.kind !== 153 /* Decorator */) {
                 var contextualType = getContextualType(node);
                 if (contextualType) {
-                    // We clone the contextual mapper to avoid disturbing a resolution in progress for an
+                    // We clone the inference context to avoid disturbing a resolution in progress for an
                     // outer call expression. Effectively we just want a snapshot of whatever has been
                     // inferred for any outer call expression so far.
-                    var instantiatedType = instantiateType(contextualType, cloneTypeMapper(getContextualMapper(node), 1 /* NoDefault */));
+                    var outerContext = getInferenceContext(node);
+                    var outerMapper = getMapperFromContext(cloneInferenceContext(outerContext, 1 /* NoDefault */));
+                    var instantiatedType = instantiateType(contextualType, outerMapper);
                     // If the contextual type is a generic function type with a single call signature, we
                     // instantiate the type with its own type parameters and type arguments. This ensures that
                     // the type parameters are not erased to type any during type inference such that they can
@@ -49775,10 +51221,15 @@ var ts;
                         instantiatedType;
                     var inferenceTargetType = getReturnTypeOfSignature(signature);
                     // Inferences made from return types have lower priority than all other inferences.
-                    inferTypes(context.inferences, inferenceSourceType, inferenceTargetType, 8 /* ReturnType */);
+                    inferTypes(context.inferences, inferenceSourceType, inferenceTargetType, 16 /* ReturnType */);
                     // Create a type mapper for instantiating generic contextual types using the inferences made
-                    // from the return type.
-                    context.returnMapper = cloneInferredPartOfContext(context);
+                    // from the return type. We need a separate inference pass here because (a) instantiation of
+                    // the source type uses the outer context's return mapper (which excludes inferences made from
+                    // outer arguments), and (b) we don't want any further inferences going into this context.
+                    var returnContext = createInferenceContext(signature.typeParameters, signature, context.flags);
+                    var returnSourceType = instantiateType(contextualType, outerContext && outerContext.returnMapper);
+                    inferTypes(returnContext.inferences, returnSourceType, inferenceTargetType);
+                    context.returnMapper = ts.some(returnContext.inferences, hasInferenceCandidates) ? getMapperFromContext(returnContext) : undefined;
                 }
             }
             var thisType = getThisTypeOfSignature(signature);
@@ -49791,7 +51242,7 @@ var ts;
             var argCount = restType ? Math.min(getParameterCount(signature) - 1, args.length) : args.length;
             for (var i = 0; i < argCount; i++) {
                 var arg = args[i];
-                if (arg.kind !== 210 /* OmittedExpression */) {
+                if (arg.kind !== 211 /* OmittedExpression */) {
                     var paramType = getTypeAtPosition(signature, i);
                     var argType = checkExpressionWithContextualType(arg, paramType, context, checkMode);
                     inferTypes(context.inferences, argType, paramType);
@@ -49805,7 +51256,7 @@ var ts;
         }
         function getArrayifiedType(type) {
             if (forEachType(type, function (t) { return !(t.flags & (1 /* Any */ | 63176704 /* Instantiable */) || isArrayType(t) || isTupleType(t)); })) {
-                return createArrayType(getIndexTypeOfType(type, 1 /* Number */) || errorType);
+                return createArrayType(getIndexedAccessType(type, numberType));
             }
             return type;
         }
@@ -49815,20 +51266,20 @@ var ts;
                 if (isSpreadArgument(arg)) {
                     // We are inferring from a spread expression in the last argument position, i.e. both the parameter
                     // and the argument are ...x forms.
-                    return arg.kind === 215 /* SyntheticExpression */ ?
+                    return arg.kind === 216 /* SyntheticExpression */ ?
                         createArrayType(arg.type) :
                         getArrayifiedType(checkExpressionWithContextualType(arg.expression, restType, context, 0 /* Normal */));
                 }
             }
-            var contextualType = getIndexTypeOfType(restType, 1 /* Number */) || anyType;
-            var hasPrimitiveContextualType = maybeTypeOfKind(contextualType, 131068 /* Primitive */ | 4194304 /* Index */);
             var types = [];
             var spreadIndex = -1;
             for (var i = index; i < argCount; i++) {
+                var contextualType = getIndexedAccessType(restType, getLiteralType(i - index));
                 var argType = checkExpressionWithContextualType(args[i], contextualType, context, 0 /* Normal */);
                 if (spreadIndex < 0 && isSpreadArgument(args[i])) {
                     spreadIndex = i - index;
                 }
+                var hasPrimitiveContextualType = maybeTypeOfKind(contextualType, 131068 /* Primitive */ | 4194304 /* Index */);
                 types.push(hasPrimitiveContextualType ? getRegularTypeOfLiteralType(argType) : getWidenedLiteralType(argType));
             }
             return spreadIndex < 0 ?
@@ -49876,20 +51327,26 @@ var ts;
          * @param signature a candidate signature we are trying whether it is a call signature
          * @param relation a relationship to check parameter and argument type
          */
-        function checkApplicableSignatureForJsxOpeningLikeElement(node, signature, relation, checkMode, reportErrors) {
+        function checkApplicableSignatureForJsxOpeningLikeElement(node, signature, relation, checkMode, reportErrors, containingMessageChain, errorOutputContainer) {
             // Stateless function components can have maximum of three arguments: "props", "context", and "updater".
             // However "context" and "updater" are implicit and can't be specify by users. Only the first parameter, props,
             // can be specified by users through attributes property.
             var paramType = getEffectiveFirstArgumentForJsxSignature(signature, node);
-            var attributesType = checkExpressionWithContextualType(node.attributes, paramType, /*contextualMapper*/ undefined, checkMode);
-            return checkTypeRelatedToAndOptionallyElaborate(attributesType, paramType, relation, reportErrors ? node.tagName : undefined, node.attributes);
+            var attributesType = checkExpressionWithContextualType(node.attributes, paramType, /*inferenceContext*/ undefined, checkMode);
+            return checkTypeRelatedToAndOptionallyElaborate(attributesType, paramType, relation, reportErrors ? node.tagName : undefined, node.attributes, 
+            /*headMessage*/ undefined, containingMessageChain, errorOutputContainer);
         }
-        function checkApplicableSignature(node, args, signature, relation, checkMode, reportErrors) {
+        function getSignatureApplicabilityError(node, args, signature, relation, checkMode, reportErrors, containingMessageChain) {
+            var errorOutputContainer = { errors: undefined, skipLogging: true };
             if (ts.isJsxOpeningLikeElement(node)) {
-                return checkApplicableSignatureForJsxOpeningLikeElement(node, signature, relation, checkMode, reportErrors);
+                if (!checkApplicableSignatureForJsxOpeningLikeElement(node, signature, relation, checkMode, reportErrors, containingMessageChain, errorOutputContainer)) {
+                    ts.Debug.assert(!reportErrors || !!errorOutputContainer.errors, "jsx should have errors when reporting errors");
+                    return errorOutputContainer.errors || [];
+                }
+                return undefined;
             }
             var thisType = getThisTypeOfSignature(signature);
-            if (thisType && thisType !== voidType && node.kind !== 192 /* NewExpression */) {
+            if (thisType && thisType !== voidType && node.kind !== 193 /* NewExpression */) {
                 // If the called expression is not of the form `x.f` or `x["f"]`, then sourceType = voidType
                 // If the signature's 'this' type is voidType, then the check is skipped -- anything is compatible.
                 // If the expression is a new expression, then the check is skipped.
@@ -49897,8 +51354,9 @@ var ts;
                 var thisArgumentType = thisArgumentNode ? checkExpression(thisArgumentNode) : voidType;
                 var errorNode = reportErrors ? (thisArgumentNode || node) : undefined;
                 var headMessage_1 = ts.Diagnostics.The_this_context_of_type_0_is_not_assignable_to_method_s_this_of_type_1;
-                if (!checkTypeRelatedTo(thisArgumentType, thisType, relation, errorNode, headMessage_1)) {
-                    return false;
+                if (!checkTypeRelatedTo(thisArgumentType, thisType, relation, errorNode, headMessage_1, containingMessageChain, errorOutputContainer)) {
+                    ts.Debug.assert(!reportErrors || !!errorOutputContainer.errors, "this parameter should have errors when reporting errors");
+                    return errorOutputContainer.errors || [];
                 }
             }
             var headMessage = ts.Diagnostics.Argument_of_type_0_is_not_assignable_to_parameter_of_type_1;
@@ -49906,38 +51364,56 @@ var ts;
             var argCount = restType ? Math.min(getParameterCount(signature) - 1, args.length) : args.length;
             for (var i = 0; i < argCount; i++) {
                 var arg = args[i];
-                if (arg.kind !== 210 /* OmittedExpression */) {
+                if (arg.kind !== 211 /* OmittedExpression */) {
                     var paramType = getTypeAtPosition(signature, i);
-                    var argType = checkExpressionWithContextualType(arg, paramType, /*contextualMapper*/ undefined, checkMode);
+                    var argType = checkExpressionWithContextualType(arg, paramType, /*inferenceContext*/ undefined, checkMode);
                     // If one or more arguments are still excluded (as indicated by CheckMode.SkipContextSensitive),
                     // we obtain the regular type of any object literal arguments because we may not have inferred complete
                     // parameter types yet and therefore excess property checks may yield false positives (see #17041).
                     var checkArgType = checkMode & 4 /* SkipContextSensitive */ ? getRegularTypeOfObjectLiteral(argType) : argType;
-                    if (!checkTypeRelatedToAndOptionallyElaborate(checkArgType, paramType, relation, reportErrors ? arg : undefined, arg, headMessage)) {
-                        return false;
+                    if (!checkTypeRelatedToAndOptionallyElaborate(checkArgType, paramType, relation, reportErrors ? arg : undefined, arg, headMessage, containingMessageChain, errorOutputContainer)) {
+                        ts.Debug.assert(!reportErrors || !!errorOutputContainer.errors, "parameter should have errors when reporting errors");
+                        maybeAddMissingAwaitInfo(arg, checkArgType, paramType);
+                        return errorOutputContainer.errors || [];
                     }
                 }
             }
             if (restType) {
                 var spreadType = getSpreadArgumentType(args, argCount, args.length, restType, /*context*/ undefined);
                 var errorNode = reportErrors ? argCount < args.length ? args[argCount] : node : undefined;
-                return checkTypeRelatedTo(spreadType, restType, relation, errorNode, headMessage);
+                if (!checkTypeRelatedTo(spreadType, restType, relation, errorNode, headMessage, /*containingMessageChain*/ undefined, errorOutputContainer)) {
+                    ts.Debug.assert(!reportErrors || !!errorOutputContainer.errors, "rest parameter should have errors when reporting errors");
+                    maybeAddMissingAwaitInfo(errorNode, spreadType, restType);
+                    return errorOutputContainer.errors || [];
+                }
+            }
+            return undefined;
+            function maybeAddMissingAwaitInfo(errorNode, source, target) {
+                if (errorNode && reportErrors && errorOutputContainer.errors && errorOutputContainer.errors.length) {
+                    // Bail if target is Promise-like---something else is wrong
+                    if (getAwaitedTypeOfPromise(target)) {
+                        return;
+                    }
+                    var awaitedTypeOfSource = getAwaitedTypeOfPromise(source);
+                    if (awaitedTypeOfSource && isTypeRelatedTo(awaitedTypeOfSource, target, relation)) {
+                        ts.addRelatedInfo(errorOutputContainer.errors[0], ts.createDiagnosticForNode(errorNode, ts.Diagnostics.Did_you_forget_to_use_await));
+                    }
+                }
             }
-            return true;
         }
         /**
          * Returns the this argument in calls like x.f(...) and x[f](...). Undefined otherwise.
          */
         function getThisArgumentOfCall(node) {
-            if (node.kind === 191 /* CallExpression */) {
+            if (node.kind === 192 /* CallExpression */) {
                 var callee = ts.skipOuterExpressions(node.expression);
-                if (callee.kind === 189 /* PropertyAccessExpression */ || callee.kind === 190 /* ElementAccessExpression */) {
+                if (callee.kind === 190 /* PropertyAccessExpression */ || callee.kind === 191 /* ElementAccessExpression */) {
                     return callee.expression;
                 }
             }
         }
         function createSyntheticExpression(parent, type, isSpread) {
-            var result = ts.createNode(215 /* SyntheticExpression */, parent.pos, parent.end);
+            var result = ts.createNode(216 /* SyntheticExpression */, parent.pos, parent.end);
             result.parent = parent;
             result.type = type;
             result.isSpread = isSpread || false;
@@ -49947,17 +51423,17 @@ var ts;
          * Returns the effective arguments for an expression that works like a function invocation.
          */
         function getEffectiveCallArguments(node) {
-            if (node.kind === 193 /* TaggedTemplateExpression */) {
+            if (node.kind === 194 /* TaggedTemplateExpression */) {
                 var template = node.template;
-                var args_4 = [createSyntheticExpression(template, getGlobalTemplateStringsArrayType())];
-                if (template.kind === 206 /* TemplateExpression */) {
+                var args_3 = [createSyntheticExpression(template, getGlobalTemplateStringsArrayType())];
+                if (template.kind === 207 /* TemplateExpression */) {
                     ts.forEach(template.templateSpans, function (span) {
-                        args_4.push(span.expression);
+                        args_3.push(span.expression);
                     });
                 }
-                return args_4;
+                return args_3;
             }
-            if (node.kind === 152 /* Decorator */) {
+            if (node.kind === 153 /* Decorator */) {
                 return getEffectiveDecoratorArguments(node);
             }
             if (ts.isJsxOpeningLikeElement(node)) {
@@ -49970,7 +51446,7 @@ var ts;
                 // of the argument is a tuple type, spread the tuple elements into the argument list. We can
                 // call checkExpressionCached because spread expressions never have a contextual type.
                 var spreadArgument_1 = args[length - 1];
-                var type = checkExpressionCached(spreadArgument_1.expression);
+                var type = flowLoopCount ? checkExpression(spreadArgument_1.expression) : checkExpressionCached(spreadArgument_1.expression);
                 if (isTupleType(type)) {
                     var typeArguments = type.typeArguments || ts.emptyArray;
                     var restIndex_2 = type.target.hasRestElement ? typeArguments.length - 1 : -1;
@@ -49987,30 +51463,30 @@ var ts;
             var parent = node.parent;
             var expr = node.expression;
             switch (parent.kind) {
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
                     // For a class decorator, the `target` is the type of the class (e.g. the
                     // "static" or "constructor" side of the class).
                     return [
                         createSyntheticExpression(expr, getTypeOfSymbol(getSymbolOfNode(parent)))
                     ];
-                case 151 /* Parameter */:
+                case 152 /* Parameter */:
                     // A parameter declaration decorator will have three arguments (see
                     // `ParameterDecorator` in core.d.ts).
                     var func = parent.parent;
                     return [
-                        createSyntheticExpression(expr, parent.parent.kind === 157 /* Constructor */ ? getTypeOfSymbol(getSymbolOfNode(func)) : errorType),
+                        createSyntheticExpression(expr, parent.parent.kind === 158 /* Constructor */ ? getTypeOfSymbol(getSymbolOfNode(func)) : errorType),
                         createSyntheticExpression(expr, anyType),
                         createSyntheticExpression(expr, numberType)
                     ];
-                case 154 /* PropertyDeclaration */:
-                case 156 /* MethodDeclaration */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 155 /* PropertyDeclaration */:
+                case 157 /* MethodDeclaration */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     // A method or accessor declaration decorator will have two or three arguments (see
                     // `PropertyDecorator` and `MethodDecorator` in core.d.ts). If we are emitting decorators
                     // for ES3, we will only pass two arguments.
-                    var hasPropDesc = parent.kind !== 154 /* PropertyDeclaration */ && languageVersion !== 0 /* ES3 */;
+                    var hasPropDesc = parent.kind !== 155 /* PropertyDeclaration */ && languageVersion !== 0 /* ES3 */;
                     return [
                         createSyntheticExpression(expr, getParentTypeOfClassElement(parent)),
                         createSyntheticExpression(expr, getClassElementPropertyKeyType(parent)),
@@ -50024,22 +51500,47 @@ var ts;
          */
         function getDecoratorArgumentCount(node, signature) {
             switch (node.parent.kind) {
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
                     return 1;
-                case 154 /* PropertyDeclaration */:
+                case 155 /* PropertyDeclaration */:
                     return 2;
-                case 156 /* MethodDeclaration */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 157 /* MethodDeclaration */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     // For ES3 or decorators with only two parameters we supply only two arguments
                     return languageVersion === 0 /* ES3 */ || signature.parameters.length <= 2 ? 2 : 3;
-                case 151 /* Parameter */:
+                case 152 /* Parameter */:
                     return 3;
                 default:
                     return ts.Debug.fail();
             }
         }
+        function getDiagnosticSpanForCallNode(node, doNotIncludeArguments) {
+            var start;
+            var length;
+            var sourceFile = ts.getSourceFileOfNode(node);
+            if (ts.isPropertyAccessExpression(node.expression)) {
+                var nameSpan = ts.getErrorSpanForNode(sourceFile, node.expression.name);
+                start = nameSpan.start;
+                length = doNotIncludeArguments ? nameSpan.length : node.end - start;
+            }
+            else {
+                var expressionSpan = ts.getErrorSpanForNode(sourceFile, node.expression);
+                start = expressionSpan.start;
+                length = doNotIncludeArguments ? expressionSpan.length : node.end - start;
+            }
+            return { start: start, length: length, sourceFile: sourceFile };
+        }
+        function getDiagnosticForCallNode(node, message, arg0, arg1, arg2, arg3) {
+            if (ts.isCallExpression(node)) {
+                var _a = getDiagnosticSpanForCallNode(node), sourceFile = _a.sourceFile, start = _a.start, length_4 = _a.length;
+                return ts.createFileDiagnostic(sourceFile, start, length_4, message, arg0, arg1, arg2, arg3);
+            }
+            else {
+                return ts.createDiagnosticForNode(node, message, arg0, arg1, arg2, arg3);
+            }
+        }
         function getArgumentArityError(node, signatures, args) {
             var min = Number.POSITIVE_INFINITY;
             var max = Number.NEGATIVE_INFINITY;
@@ -50069,25 +51570,41 @@ var ts;
             if (argCount <= max && hasSpreadArgument) {
                 argCount--;
             }
+            var spanArray;
             var related;
+            var error = hasRestParameter || hasSpreadArgument ? hasRestParameter && hasSpreadArgument ? ts.Diagnostics.Expected_at_least_0_arguments_but_got_1_or_more :
+                hasRestParameter ? ts.Diagnostics.Expected_at_least_0_arguments_but_got_1 :
+                    ts.Diagnostics.Expected_0_arguments_but_got_1_or_more : ts.Diagnostics.Expected_0_arguments_but_got_1;
             if (closestSignature && getMinArgumentCount(closestSignature) > argCount && closestSignature.declaration) {
                 var paramDecl = closestSignature.declaration.parameters[closestSignature.thisParameter ? argCount + 1 : argCount];
                 if (paramDecl) {
                     related = ts.createDiagnosticForNode(paramDecl, ts.isBindingPattern(paramDecl.name) ? ts.Diagnostics.An_argument_matching_this_binding_pattern_was_not_provided : ts.Diagnostics.An_argument_for_0_was_not_provided, !paramDecl.name ? argCount : !ts.isBindingPattern(paramDecl.name) ? ts.idText(getFirstIdentifier(paramDecl.name)) : undefined);
                 }
             }
-            if (hasRestParameter || hasSpreadArgument) {
-                var error_1 = hasRestParameter && hasSpreadArgument ? ts.Diagnostics.Expected_at_least_0_arguments_but_got_1_or_more :
-                    hasRestParameter ? ts.Diagnostics.Expected_at_least_0_arguments_but_got_1 :
-                        ts.Diagnostics.Expected_0_arguments_but_got_1_or_more;
-                var diagnostic_1 = ts.createDiagnosticForNode(node, error_1, paramRange, argCount);
-                return related ? addRelatedInfo(diagnostic_1, related) : diagnostic_1;
-            }
             if (min < argCount && argCount < max) {
-                return ts.createDiagnosticForNode(node, ts.Diagnostics.No_overload_expects_0_arguments_but_overloads_do_exist_that_expect_either_1_or_2_arguments, argCount, belowArgCount, aboveArgCount);
+                return getDiagnosticForCallNode(node, ts.Diagnostics.No_overload_expects_0_arguments_but_overloads_do_exist_that_expect_either_1_or_2_arguments, argCount, belowArgCount, aboveArgCount);
             }
-            var diagnostic = ts.createDiagnosticForNode(node, ts.Diagnostics.Expected_0_arguments_but_got_1, paramRange, argCount);
-            return related ? addRelatedInfo(diagnostic, related) : diagnostic;
+            if (!hasSpreadArgument && argCount < min) {
+                var diagnostic_1 = getDiagnosticForCallNode(node, error, paramRange, argCount);
+                return related ? ts.addRelatedInfo(diagnostic_1, related) : diagnostic_1;
+            }
+            if (hasRestParameter || hasSpreadArgument) {
+                spanArray = ts.createNodeArray(args);
+                if (hasSpreadArgument && argCount) {
+                    var nextArg = ts.elementAt(args, getSpreadArgumentIndex(args) + 1) || undefined;
+                    spanArray = ts.createNodeArray(args.slice(max > argCount && nextArg ? args.indexOf(nextArg) : Math.min(max, args.length - 1)));
+                }
+            }
+            else {
+                spanArray = ts.createNodeArray(args.slice(max));
+            }
+            spanArray.pos = ts.first(spanArray).pos;
+            spanArray.end = ts.last(spanArray).end;
+            if (spanArray.end === spanArray.pos) {
+                spanArray.end++;
+            }
+            var diagnostic = ts.createDiagnosticForNodeArray(ts.getSourceFileOfNode(node), spanArray, error, paramRange, argCount);
+            return related ? ts.addRelatedInfo(diagnostic, related) : diagnostic;
         }
         function getTypeArgumentArityError(node, signatures, typeArguments) {
             var argCount = typeArguments.length;
@@ -50118,15 +51635,15 @@ var ts;
             return ts.createDiagnosticForNodeArray(ts.getSourceFileOfNode(node), typeArguments, ts.Diagnostics.Expected_0_type_arguments_but_got_1, belowArgCount === -Infinity ? aboveArgCount : belowArgCount, argCount);
         }
         function resolveCall(node, signatures, candidatesOutArray, checkMode, fallbackError) {
-            var isTaggedTemplate = node.kind === 193 /* TaggedTemplateExpression */;
-            var isDecorator = node.kind === 152 /* Decorator */;
+            var isTaggedTemplate = node.kind === 194 /* TaggedTemplateExpression */;
+            var isDecorator = node.kind === 153 /* Decorator */;
             var isJsxOpeningOrSelfClosingElement = ts.isJsxOpeningLikeElement(node);
             var reportErrors = !candidatesOutArray;
             var typeArguments;
             if (!isDecorator) {
                 typeArguments = node.typeArguments;
                 // We already perform checking on the type arguments on the class declaration itself.
-                if (isTaggedTemplate || isJsxOpeningOrSelfClosingElement || node.expression.kind !== 98 /* SuperKeyword */) {
+                if (isTaggedTemplate || isJsxOpeningOrSelfClosingElement || node.expression.kind !== 99 /* SuperKeyword */) {
                     ts.forEach(typeArguments, checkSourceElement);
                 }
             }
@@ -50135,7 +51652,7 @@ var ts;
             reorderCandidates(signatures, candidates);
             if (!candidates.length) {
                 if (reportErrors) {
-                    diagnostics.add(ts.createDiagnosticForNode(node, ts.Diagnostics.Call_target_does_not_contain_any_signatures));
+                    diagnostics.add(getDiagnosticForCallNode(node, ts.Diagnostics.Call_target_does_not_contain_any_signatures));
                 }
                 return resolveErrorCall(node);
             }
@@ -50175,13 +51692,13 @@ var ts;
             //     function foo(): void;
             //     foo<number>(0);
             //
-            var candidateForArgumentError;
+            var candidatesForArgumentError;
             var candidateForArgumentArityError;
             var candidateForTypeArgumentError;
             var result;
             // If we are in signature help, a trailing comma indicates that we intend to provide another argument,
             // so we will only accept overloads with arity at least 1 higher than the current number of provided arguments.
-            var signatureHelpTrailingComma = !!(checkMode & 16 /* IsForSignatureHelp */) && node.kind === 191 /* CallExpression */ && node.arguments.hasTrailingComma;
+            var signatureHelpTrailingComma = !!(checkMode & 16 /* IsForSignatureHelp */) && node.kind === 192 /* CallExpression */ && node.arguments.hasTrailingComma;
             // Section 4.12.1:
             // if the candidate list contains one or more signatures for which the type of each argument
             // expression is a subtype of each corresponding parameter type, the return type of the first
@@ -50206,8 +51723,66 @@ var ts;
             // If candidate is undefined, it means that no candidates had a suitable arity. In that case,
             // skip the checkApplicableSignature check.
             if (reportErrors) {
-                if (candidateForArgumentError) {
-                    checkApplicableSignature(node, args, candidateForArgumentError, assignableRelation, 0 /* Normal */, /*reportErrors*/ true);
+                if (candidatesForArgumentError) {
+                    if (candidatesForArgumentError.length === 1 || candidatesForArgumentError.length > 3) {
+                        var last_2 = candidatesForArgumentError[candidatesForArgumentError.length - 1];
+                        var chain_1;
+                        if (candidatesForArgumentError.length > 3) {
+                            chain_1 = ts.chainDiagnosticMessages(chain_1, ts.Diagnostics.The_last_overload_gave_the_following_error);
+                            chain_1 = ts.chainDiagnosticMessages(chain_1, ts.Diagnostics.No_overload_matches_this_call);
+                        }
+                        var diags = getSignatureApplicabilityError(node, args, last_2, assignableRelation, 0 /* Normal */, /*reportErrors*/ true, function () { return chain_1; });
+                        if (diags) {
+                            for (var _i = 0, diags_1 = diags; _i < diags_1.length; _i++) {
+                                var d = diags_1[_i];
+                                if (last_2.declaration && candidatesForArgumentError.length > 3) {
+                                    ts.addRelatedInfo(d, ts.createDiagnosticForNode(last_2.declaration, ts.Diagnostics.The_last_overload_is_declared_here));
+                                }
+                                diagnostics.add(d);
+                            }
+                        }
+                        else {
+                            ts.Debug.fail("No error for last overload signature");
+                        }
+                    }
+                    else {
+                        var allDiagnostics = [];
+                        var max = 0;
+                        var min_3 = Number.MAX_VALUE;
+                        var minIndex = 0;
+                        var i_1 = 0;
+                        var _loop_12 = function (c) {
+                            var chain_2 = function () { return ts.chainDiagnosticMessages(/*details*/ undefined, ts.Diagnostics.Overload_0_of_1_2_gave_the_following_error, i_1 + 1, candidates.length, signatureToString(c)); };
+                            var diags_2 = getSignatureApplicabilityError(node, args, c, assignableRelation, 0 /* Normal */, /*reportErrors*/ true, chain_2);
+                            if (diags_2) {
+                                if (diags_2.length <= min_3) {
+                                    min_3 = diags_2.length;
+                                    minIndex = i_1;
+                                }
+                                max = Math.max(max, diags_2.length);
+                                allDiagnostics.push(diags_2);
+                            }
+                            else {
+                                ts.Debug.fail("No error for 3 or fewer overload signatures");
+                            }
+                            i_1++;
+                        };
+                        for (var _a = 0, candidatesForArgumentError_1 = candidatesForArgumentError; _a < candidatesForArgumentError_1.length; _a++) {
+                            var c = candidatesForArgumentError_1[_a];
+                            _loop_12(c);
+                        }
+                        var diags_3 = max > 1 ? allDiagnostics[minIndex] : ts.flatten(allDiagnostics);
+                        ts.Debug.assert(diags_3.length > 0, "No errors reported for 3 or fewer overload signatures");
+                        var chain = ts.chainDiagnosticMessages(ts.map(diags_3, function (d) { return typeof d.messageText === "string" ? d : d.messageText; }), ts.Diagnostics.No_overload_matches_this_call);
+                        var related = ts.flatMap(diags_3, function (d) { return d.relatedInformation; });
+                        if (ts.every(diags_3, function (d) { return d.start === diags_3[0].start && d.length === diags_3[0].length && d.file === diags_3[0].file; })) {
+                            var _b = diags_3[0], file = _b.file, start = _b.start, length_5 = _b.length;
+                            diagnostics.add({ file: file, start: start, length: length_5, code: chain.code, category: chain.category, messageText: chain, relatedInformation: related });
+                        }
+                        else {
+                            diagnostics.add(ts.createDiagnosticForNodeFromMessageChain(node, chain, related));
+                        }
+                    }
                 }
                 else if (candidateForArgumentArityError) {
                     diagnostics.add(getArgumentArityError(node, [candidateForArgumentArityError], args));
@@ -50224,14 +51799,14 @@ var ts;
                         diagnostics.add(getArgumentArityError(node, signaturesWithCorrectTypeArgumentArity, args));
                     }
                     else if (fallbackError) {
-                        diagnostics.add(ts.createDiagnosticForNode(node, fallbackError));
+                        diagnostics.add(getDiagnosticForCallNode(node, fallbackError));
                     }
                 }
             }
             return produceDiagnostics || !args ? resolveErrorCall(node) : getCandidateForOverloadFailure(node, candidates, args, !!candidatesOutArray);
             function chooseOverload(candidates, relation, signatureHelpTrailingComma) {
                 if (signatureHelpTrailingComma === void 0) { signatureHelpTrailingComma = false; }
-                candidateForArgumentError = undefined;
+                candidatesForArgumentError = undefined;
                 candidateForArgumentArityError = undefined;
                 candidateForTypeArgumentError = undefined;
                 if (isSingleNonGenericCandidate) {
@@ -50239,8 +51814,8 @@ var ts;
                     if (typeArguments || !hasCorrectArity(node, args, candidate, signatureHelpTrailingComma)) {
                         return undefined;
                     }
-                    if (!checkApplicableSignature(node, args, candidate, relation, 0 /* Normal */, /*reportErrors*/ false)) {
-                        candidateForArgumentError = candidate;
+                    if (getSignatureApplicabilityError(node, args, candidate, relation, 0 /* Normal */, /*reportErrors*/ false, /*containingMessageChain*/ undefined)) {
+                        candidatesForArgumentError = [candidate];
                         return undefined;
                     }
                     return candidate;
@@ -50264,7 +51839,7 @@ var ts;
                         else {
                             inferenceContext = createInferenceContext(candidate.typeParameters, candidate, /*flags*/ ts.isInJSFile(node) ? 2 /* AnyDefault */ : 0 /* None */);
                             typeArgumentTypes = inferTypeArguments(node, candidate, args, argCheckMode | 8 /* SkipGenericFunctions */, inferenceContext);
-                            argCheckMode |= inferenceContext.flags & 8 /* SkippedGenericFunction */ ? 8 /* SkipGenericFunctions */ : 0 /* Normal */;
+                            argCheckMode |= inferenceContext.flags & 4 /* SkippedGenericFunction */ ? 8 /* SkipGenericFunctions */ : 0 /* Normal */;
                         }
                         checkCandidate = getSignatureInstantiation(candidate, typeArgumentTypes, ts.isInJSFile(candidate.declaration), inferenceContext && inferenceContext.inferredTypeParameters);
                         // If the original signature has a generic rest type, instantiation may produce a
@@ -50277,11 +51852,9 @@ var ts;
                     else {
                         checkCandidate = candidate;
                     }
-                    if (!checkApplicableSignature(node, args, checkCandidate, relation, argCheckMode, /*reportErrors*/ false)) {
+                    if (getSignatureApplicabilityError(node, args, checkCandidate, relation, argCheckMode, /*reportErrors*/ false, /*containingMessageChain*/ undefined)) {
                         // Give preference to error candidates that have no rest parameters (as they are more specific)
-                        if (!candidateForArgumentError || getEffectiveRestType(candidateForArgumentError) || !getEffectiveRestType(checkCandidate)) {
-                            candidateForArgumentError = checkCandidate;
-                        }
+                        (candidatesForArgumentError || (candidatesForArgumentError = [])).push(checkCandidate);
                         continue;
                     }
                     if (argCheckMode) {
@@ -50299,11 +51872,9 @@ var ts;
                                 continue;
                             }
                         }
-                        if (!checkApplicableSignature(node, args, checkCandidate, relation, argCheckMode, /*reportErrors*/ false)) {
+                        if (getSignatureApplicabilityError(node, args, checkCandidate, relation, argCheckMode, /*reportErrors*/ false, /*containingMessageChain*/ undefined)) {
                             // Give preference to error candidates that have no rest parameters (as they are more specific)
-                            if (!candidateForArgumentError || getEffectiveRestType(candidateForArgumentError) || !getEffectiveRestType(checkCandidate)) {
-                                candidateForArgumentError = checkCandidate;
-                            }
+                            (candidatesForArgumentError || (candidatesForArgumentError = [])).push(checkCandidate);
                             continue;
                         }
                     }
@@ -50332,7 +51903,7 @@ var ts;
             }
             var _a = ts.minAndMax(candidates, getNumNonRestParameters), minArgumentCount = _a.min, maxNonRestParam = _a.max;
             var parameters = [];
-            var _loop_8 = function (i) {
+            var _loop_13 = function (i) {
                 var symbols = ts.mapDefined(candidates, function (_a) {
                     var parameters = _a.parameters, hasRestParameter = _a.hasRestParameter;
                     return hasRestParameter ?
@@ -50343,7 +51914,7 @@ var ts;
                 parameters.push(createCombinedSymbolFromTypes(symbols, ts.mapDefined(candidates, function (candidate) { return tryGetTypeAtPosition(candidate, i); })));
             };
             for (var i = 0; i < maxNonRestParam; i++) {
-                _loop_8(i);
+                _loop_13(i);
             }
             var restParameterSymbols = ts.mapDefined(candidates, function (c) { return c.hasRestParameter ? ts.last(c.parameters) : undefined; });
             var hasRestParameter = restParameterSymbols.length !== 0;
@@ -50421,7 +51992,7 @@ var ts;
             return maxParamsIndex;
         }
         function resolveCallExpression(node, candidatesOutArray, checkMode) {
-            if (node.expression.kind === 98 /* SuperKeyword */) {
+            if (node.expression.kind === 99 /* SuperKeyword */) {
                 var superType = checkSuperExpression(node.expression);
                 if (isTypeAny(superType)) {
                     for (var _i = 0, _a = node.arguments; _i < _a.length; _i++) {
@@ -50482,7 +52053,7 @@ var ts;
                             relatedInformation = ts.createDiagnosticForNode(node.expression, ts.Diagnostics.It_is_highly_likely_that_you_are_missing_a_semicolon);
                         }
                     }
-                    invocationError(node, apparentType, 0 /* Call */, relatedInformation);
+                    invocationError(node.expression, apparentType, 0 /* Call */, relatedInformation);
                 }
                 return resolveErrorCall(node);
             }
@@ -50496,7 +52067,7 @@ var ts;
             // returns a function type, we choose to defer processing. This narrowly permits function composition
             // operators to flow inferences through return types, but otherwise processes calls right away. We
             // use the resolvingSignature singleton to indicate that we deferred processing. This result will be
-            // propagated out and eventually turned into silentNeverType (a type that is assignable to anything and
+            // propagated out and eventually turned into nonInferrableType (a type that is assignable to anything and
             // from which we never make inferences).
             if (checkMode & 8 /* SkipGenericFunctions */ && !node.typeArguments && callSignatures.some(isGenericFunctionReturningFunction)) {
                 skippedGenericFunction(node, checkMode);
@@ -50589,7 +52160,7 @@ var ts;
                 }
                 return signature;
             }
-            invocationError(node, expressionType, 1 /* Construct */);
+            invocationError(node.expression, expressionType, 1 /* Construct */);
             return resolveErrorCall(node);
         }
         function typeHasProtectedAccessibleBase(target, type) {
@@ -50600,13 +52171,12 @@ var ts;
             var firstBase = baseTypes[0];
             if (firstBase.flags & 2097152 /* Intersection */) {
                 var types = firstBase.types;
-                var mixinCount = ts.countWhere(types, isMixinConstructorType);
+                var mixinFlags = findMixins(types);
                 var i = 0;
                 for (var _i = 0, _a = firstBase.types; _i < _a.length; _i++) {
                     var intersectionMember = _a[_i];
-                    i++;
                     // We want to ignore mixin ctors
-                    if (mixinCount === 0 || mixinCount === types.length && i === 0 || !isMixinConstructorType(intersectionMember)) {
+                    if (!mixinFlags[i]) {
                         if (ts.getObjectFlags(intersectionMember) & (1 /* Class */ | 2 /* Interface */)) {
                             if (intersectionMember.symbol === target) {
                                 return true;
@@ -50616,6 +52186,7 @@ var ts;
                             }
                         }
                     }
+                    i++;
                 }
                 return false;
             }
@@ -50655,11 +52226,75 @@ var ts;
             }
             return true;
         }
-        function invocationError(node, apparentType, kind, relatedInformation) {
-            var diagnostic = error(node, (kind === 0 /* Call */ ?
-                ts.Diagnostics.Cannot_invoke_an_expression_whose_type_lacks_a_call_signature_Type_0_has_no_compatible_call_signatures :
-                ts.Diagnostics.Cannot_use_new_with_an_expression_whose_type_lacks_a_call_or_construct_signature), typeToString(apparentType));
-            invocationErrorRecovery(apparentType, kind, relatedInformation ? addRelatedInfo(diagnostic, relatedInformation) : diagnostic);
+        function invocationErrorDetails(apparentType, kind) {
+            var errorInfo;
+            var isCall = kind === 0 /* Call */;
+            var awaitedType = getAwaitedType(apparentType);
+            var maybeMissingAwait = awaitedType && getSignaturesOfType(awaitedType, kind).length > 0;
+            if (apparentType.flags & 1048576 /* Union */) {
+                var types = apparentType.types;
+                var hasSignatures = false;
+                for (var _i = 0, types_15 = types; _i < types_15.length; _i++) {
+                    var constituent = types_15[_i];
+                    var signatures = getSignaturesOfType(constituent, kind);
+                    if (signatures.length !== 0) {
+                        hasSignatures = true;
+                        if (errorInfo) {
+                            // Bail early if we already have an error, no chance of "No constituent of type is callable"
+                            break;
+                        }
+                    }
+                    else {
+                        // Error on the first non callable constituent only
+                        if (!errorInfo) {
+                            errorInfo = ts.chainDiagnosticMessages(errorInfo, isCall ?
+                                ts.Diagnostics.Type_0_has_no_call_signatures :
+                                ts.Diagnostics.Type_0_has_no_construct_signatures, typeToString(constituent));
+                            errorInfo = ts.chainDiagnosticMessages(errorInfo, isCall ?
+                                ts.Diagnostics.Not_all_constituents_of_type_0_are_callable :
+                                ts.Diagnostics.Not_all_constituents_of_type_0_are_constructable, typeToString(apparentType));
+                        }
+                        if (hasSignatures) {
+                            // Bail early if we already found a siganture, no chance of "No constituent of type is callable"
+                            break;
+                        }
+                    }
+                }
+                if (!hasSignatures) {
+                    errorInfo = ts.chainDiagnosticMessages(
+                    /* detials */ undefined, isCall ?
+                        ts.Diagnostics.No_constituent_of_type_0_is_callable :
+                        ts.Diagnostics.No_constituent_of_type_0_is_constructable, typeToString(apparentType));
+                }
+                if (!errorInfo) {
+                    errorInfo = ts.chainDiagnosticMessages(errorInfo, isCall ?
+                        ts.Diagnostics.Each_member_of_the_union_type_0_has_signatures_but_none_of_those_signatures_are_compatible_with_each_other :
+                        ts.Diagnostics.Each_member_of_the_union_type_0_has_construct_signatures_but_none_of_those_signatures_are_compatible_with_each_other, typeToString(apparentType));
+                }
+            }
+            else {
+                errorInfo = ts.chainDiagnosticMessages(errorInfo, isCall ?
+                    ts.Diagnostics.Type_0_has_no_call_signatures :
+                    ts.Diagnostics.Type_0_has_no_construct_signatures, typeToString(apparentType));
+            }
+            return {
+                messageChain: ts.chainDiagnosticMessages(errorInfo, isCall ? ts.Diagnostics.This_expression_is_not_callable : ts.Diagnostics.This_expression_is_not_constructable),
+                relatedMessage: maybeMissingAwait ? ts.Diagnostics.Did_you_forget_to_use_await : undefined,
+            };
+        }
+        function invocationError(errorTarget, apparentType, kind, relatedInformation) {
+            var _a = invocationErrorDetails(apparentType, kind), messageChain = _a.messageChain, relatedInfo = _a.relatedMessage;
+            var diagnostic = ts.createDiagnosticForNodeFromMessageChain(errorTarget, messageChain);
+            if (relatedInfo) {
+                ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(errorTarget, relatedInfo));
+            }
+            if (ts.isCallExpression(errorTarget.parent)) {
+                var _b = getDiagnosticSpanForCallNode(errorTarget.parent, /* doNotIncludeArguments */ true), start = _b.start, length_6 = _b.length;
+                diagnostic.start = start;
+                diagnostic.length = length_6;
+            }
+            diagnostics.add(diagnostic);
+            invocationErrorRecovery(apparentType, kind, relatedInformation ? ts.addRelatedInfo(diagnostic, relatedInformation) : diagnostic);
         }
         function invocationErrorRecovery(apparentType, kind, diagnostic) {
             if (!apparentType.symbol) {
@@ -50672,7 +52307,7 @@ var ts;
                 var sigs = getSignaturesOfType(getTypeOfSymbol(getSymbolLinks(apparentType.symbol).target), kind);
                 if (!sigs || !sigs.length)
                     return;
-                addRelatedInfo(diagnostic, ts.createDiagnosticForNode(importNode, ts.Diagnostics.Type_originates_at_this_import_A_namespace_style_import_cannot_be_called_or_constructed_and_will_cause_a_failure_at_runtime_Consider_using_a_default_import_or_import_require_here_instead));
+                ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(importNode, ts.Diagnostics.Type_originates_at_this_import_A_namespace_style_import_cannot_be_called_or_constructed_and_will_cause_a_failure_at_runtime_Consider_using_a_default_import_or_import_require_here_instead));
             }
         }
         function resolveTaggedTemplateExpression(node, candidatesOutArray, checkMode) {
@@ -50688,7 +52323,7 @@ var ts;
                 return resolveUntypedCall(node);
             }
             if (!callSignatures.length) {
-                invocationError(node, apparentType, 0 /* Call */);
+                invocationError(node.tag, apparentType, 0 /* Call */);
                 return resolveErrorCall(node);
             }
             return resolveCall(node, callSignatures, candidatesOutArray, checkMode);
@@ -50698,16 +52333,16 @@ var ts;
          */
         function getDiagnosticHeadMessageForDecoratorResolution(node) {
             switch (node.parent.kind) {
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_class_decorator_when_called_as_an_expression;
-                case 151 /* Parameter */:
+                case 152 /* Parameter */:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_parameter_decorator_when_called_as_an_expression;
-                case 154 /* PropertyDeclaration */:
+                case 155 /* PropertyDeclaration */:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_property_decorator_when_called_as_an_expression;
-                case 156 /* MethodDeclaration */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 157 /* MethodDeclaration */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_method_decorator_when_called_as_an_expression;
                 default:
                     return ts.Debug.fail();
@@ -50734,9 +52369,12 @@ var ts;
             }
             var headMessage = getDiagnosticHeadMessageForDecoratorResolution(node);
             if (!callSignatures.length) {
-                var errorInfo = ts.chainDiagnosticMessages(/*details*/ undefined, ts.Diagnostics.Cannot_invoke_an_expression_whose_type_lacks_a_call_signature_Type_0_has_no_compatible_call_signatures, typeToString(apparentType));
-                errorInfo = ts.chainDiagnosticMessages(errorInfo, headMessage);
-                var diag = ts.createDiagnosticForNodeFromMessageChain(node, errorInfo);
+                var errorDetails = invocationErrorDetails(apparentType, 0 /* Call */);
+                var messageChain = ts.chainDiagnosticMessages(errorDetails.messageChain, headMessage);
+                var diag = ts.createDiagnosticForNodeFromMessageChain(node.expression, messageChain);
+                if (errorDetails.relatedMessage) {
+                    ts.addRelatedInfo(diag, ts.createDiagnosticForNode(node.expression, errorDetails.relatedMessage));
+                }
                 diagnostics.add(diag);
                 invocationErrorRecovery(apparentType, 0 /* Call */, diag);
                 return resolveErrorCall(node);
@@ -50750,7 +52388,7 @@ var ts;
             // file would probably be preferable.
             var typeSymbol = exports && getSymbol(exports, JsxNames.Element, 67897832 /* Type */);
             var returnNode = typeSymbol && nodeBuilder.symbolToEntityName(typeSymbol, 67897832 /* Type */, node);
-            var declaration = ts.createFunctionTypeNode(/*typeParameters*/ undefined, [ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotdotdot*/ undefined, "props", /*questionMark*/ undefined, nodeBuilder.typeToTypeNode(result, node))], returnNode ? ts.createTypeReferenceNode(returnNode, /*typeArguments*/ undefined) : ts.createKeywordTypeNode(120 /* AnyKeyword */));
+            var declaration = ts.createFunctionTypeNode(/*typeParameters*/ undefined, [ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotdotdot*/ undefined, "props", /*questionMark*/ undefined, nodeBuilder.typeToTypeNode(result, node))], returnNode ? ts.createTypeReferenceNode(returnNode, /*typeArguments*/ undefined) : ts.createKeywordTypeNode(121 /* AnyKeyword */));
             var parameterSymbol = createSymbol(1 /* FunctionScopedVariable */, "props");
             parameterSymbol.type = result;
             return createSignature(declaration, 
@@ -50797,16 +52435,16 @@ var ts;
         }
         function resolveSignature(node, candidatesOutArray, checkMode) {
             switch (node.kind) {
-                case 191 /* CallExpression */:
+                case 192 /* CallExpression */:
                     return resolveCallExpression(node, candidatesOutArray, checkMode);
-                case 192 /* NewExpression */:
+                case 193 /* NewExpression */:
                     return resolveNewExpression(node, candidatesOutArray, checkMode);
-                case 193 /* TaggedTemplateExpression */:
+                case 194 /* TaggedTemplateExpression */:
                     return resolveTaggedTemplateExpression(node, candidatesOutArray, checkMode);
-                case 152 /* Decorator */:
+                case 153 /* Decorator */:
                     return resolveDecorator(node, candidatesOutArray, checkMode);
-                case 262 /* JsxOpeningElement */:
-                case 261 /* JsxSelfClosingElement */:
+                case 263 /* JsxOpeningElement */:
+                case 262 /* JsxSelfClosingElement */:
                     return resolveJsxOpeningLikeElement(node, candidatesOutArray, checkMode);
             }
             throw ts.Debug.assertNever(node, "Branch in 'resolveSignature' should be unreachable.");
@@ -50886,17 +52524,17 @@ var ts;
                     ts.isVariableDeclaration(decl.parent) && getSymbolOfNode(decl.parent));
             var prototype = assignmentSymbol && assignmentSymbol.exports && assignmentSymbol.exports.get("prototype");
             var init = prototype && prototype.valueDeclaration && getAssignedJSPrototype(prototype.valueDeclaration);
-            return init ? checkExpression(init) : undefined;
+            return init ? getWidenedType(checkExpressionCached(init)) : undefined;
         }
         function getAssignedJSPrototype(node) {
             if (!node.parent) {
                 return false;
             }
             var parent = node.parent;
-            while (parent && parent.kind === 189 /* PropertyAccessExpression */) {
+            while (parent && parent.kind === 190 /* PropertyAccessExpression */) {
                 parent = parent.parent;
             }
-            if (parent && ts.isBinaryExpression(parent) && ts.isPrototypeAccess(parent.left) && parent.operatorToken.kind === 59 /* EqualsToken */) {
+            if (parent && ts.isBinaryExpression(parent) && ts.isPrototypeAccess(parent.left) && parent.operatorToken.kind === 60 /* EqualsToken */) {
                 var right = ts.getInitializerOfBinaryExpression(parent);
                 return ts.isObjectLiteralExpression(right) && right;
             }
@@ -50919,18 +52557,18 @@ var ts;
             var signature = getResolvedSignature(node, /*candidatesOutArray*/ undefined, checkMode);
             if (signature === resolvingSignature) {
                 // CheckMode.SkipGenericFunctions is enabled and this is a call to a generic function that
-                // returns a function type. We defer checking and return anyFunctionType.
-                return silentNeverType;
+                // returns a function type. We defer checking and return nonInferrableType.
+                return nonInferrableType;
             }
-            if (node.expression.kind === 98 /* SuperKeyword */) {
+            if (node.expression.kind === 99 /* SuperKeyword */) {
                 return voidType;
             }
-            if (node.kind === 192 /* NewExpression */) {
+            if (node.kind === 193 /* NewExpression */) {
                 var declaration = signature.declaration;
                 if (declaration &&
-                    declaration.kind !== 157 /* Constructor */ &&
-                    declaration.kind !== 161 /* ConstructSignature */ &&
-                    declaration.kind !== 166 /* ConstructorType */ &&
+                    declaration.kind !== 158 /* Constructor */ &&
+                    declaration.kind !== 162 /* ConstructSignature */ &&
+                    declaration.kind !== 167 /* ConstructorType */ &&
                     !ts.isJSDocConstructSignature(declaration) &&
                     !isJSConstructor(declaration)) {
                     // When resolved signature is a call signature (and not a construct signature) the result type is any
@@ -51047,9 +52685,9 @@ var ts;
                 return false;
             }
             var targetDeclarationKind = resolvedRequire.flags & 16 /* Function */
-                ? 239 /* FunctionDeclaration */
+                ? 240 /* FunctionDeclaration */
                 : resolvedRequire.flags & 3 /* Variable */
-                    ? 237 /* VariableDeclaration */
+                    ? 238 /* VariableDeclaration */
                     : 0 /* Unknown */;
             if (targetDeclarationKind !== 0 /* Unknown */) {
                 var decl = ts.getDeclarationOfKind(resolvedRequire, targetDeclarationKind);
@@ -51061,7 +52699,7 @@ var ts;
         function checkTaggedTemplateExpression(node) {
             checkGrammarTypeArguments(node, node.typeArguments);
             if (languageVersion < 2 /* ES2015 */) {
-                checkExternalEmitHelpers(node, 65536 /* MakeTemplateObject */);
+                checkExternalEmitHelpers(node, 131072 /* MakeTemplateObject */);
             }
             return getReturnTypeOfSignature(getResolvedSignature(node));
         }
@@ -51074,18 +52712,28 @@ var ts;
                 case 14 /* NoSubstitutionTemplateLiteral */:
                 case 8 /* NumericLiteral */:
                 case 9 /* BigIntLiteral */:
-                case 102 /* TrueKeyword */:
-                case 87 /* FalseKeyword */:
-                case 187 /* ArrayLiteralExpression */:
-                case 188 /* ObjectLiteralExpression */:
+                case 103 /* TrueKeyword */:
+                case 88 /* FalseKeyword */:
+                case 188 /* ArrayLiteralExpression */:
+                case 189 /* ObjectLiteralExpression */:
                     return true;
-                case 195 /* ParenthesizedExpression */:
+                case 196 /* ParenthesizedExpression */:
                     return isValidConstAssertionArgument(node.expression);
-                case 202 /* PrefixUnaryExpression */:
+                case 203 /* PrefixUnaryExpression */:
                     var op = node.operator;
                     var arg = node.operand;
                     return op === 39 /* MinusToken */ && (arg.kind === 8 /* NumericLiteral */ || arg.kind === 9 /* BigIntLiteral */) ||
                         op === 38 /* PlusToken */ && arg.kind === 8 /* NumericLiteral */;
+                case 190 /* PropertyAccessExpression */:
+                case 191 /* ElementAccessExpression */:
+                    var expr = node.expression;
+                    if (ts.isIdentifier(expr)) {
+                        var symbol = getSymbolAtLocation(expr);
+                        if (symbol && symbol.flags & 2097152 /* Alias */) {
+                            symbol = resolveAlias(symbol);
+                        }
+                        return !!(symbol && (symbol.flags & 384 /* Enum */) && getEnumKind(symbol) === 1 /* Literal */);
+                    }
             }
             return false;
         }
@@ -51093,7 +52741,7 @@ var ts;
             var exprType = checkExpression(expression, checkMode);
             if (ts.isConstTypeReference(type)) {
                 if (!isValidConstAssertionArgument(expression)) {
-                    error(expression, ts.Diagnostics.A_const_assertion_can_only_be_applied_to_a_string_number_boolean_array_or_object_literal);
+                    error(expression, ts.Diagnostics.A_const_assertions_can_only_be_applied_to_references_to_enum_members_or_string_number_boolean_array_or_object_literals);
                 }
                 return getRegularTypeOfLiteralType(exprType);
             }
@@ -51113,10 +52761,10 @@ var ts;
         }
         function checkMetaProperty(node) {
             checkGrammarMetaProperty(node);
-            if (node.keywordToken === 95 /* NewKeyword */) {
+            if (node.keywordToken === 96 /* NewKeyword */) {
                 return checkNewTargetMetaProperty(node);
             }
-            if (node.keywordToken === 92 /* ImportKeyword */) {
+            if (node.keywordToken === 93 /* ImportKeyword */) {
                 return checkImportMetaProperty(node);
             }
             return ts.Debug.assertNever(node.keywordToken);
@@ -51127,7 +52775,7 @@ var ts;
                 error(node, ts.Diagnostics.Meta_property_0_is_only_allowed_in_the_body_of_a_function_declaration_function_expression_or_constructor, "new.target");
                 return errorType;
             }
-            else if (container.kind === 157 /* Constructor */) {
+            else if (container.kind === 158 /* Constructor */) {
                 var symbol = getSymbolOfNode(container.parent);
                 return getTypeOfSymbol(symbol);
             }
@@ -51137,7 +52785,7 @@ var ts;
             }
         }
         function checkImportMetaProperty(node) {
-            if (languageVersion < 7 /* ESNext */ || moduleKind < ts.ModuleKind.ESNext) {
+            if (languageVersion < 99 /* ESNext */ || moduleKind < ts.ModuleKind.ESNext) {
                 error(node, ts.Diagnostics.The_import_meta_meta_property_is_only_allowed_using_ESNext_for_the_target_and_module_compiler_options);
             }
             var file = ts.getSourceFileOfNode(node);
@@ -51178,9 +52826,14 @@ var ts;
                 return getTypeOfParameter(signature.parameters[pos]);
             }
             if (signature.hasRestParameter) {
+                // We want to return the value undefined for an out of bounds parameter position,
+                // so we need to check bounds here before calling getIndexedAccessType (which
+                // otherwise would return the type 'undefined').
                 var restType = getTypeOfSymbol(signature.parameters[paramCount]);
-                var indexType = getLiteralType(pos - paramCount);
-                return getIndexedAccessType(restType, indexType);
+                var index = pos - paramCount;
+                if (!isTupleType(restType) || restType.target.hasRestElement || index < (restType.typeArguments || ts.emptyArray).length) {
+                    return getIndexedAccessType(restType, getLiteralType(index));
+                }
             }
             return undefined;
         }
@@ -51251,14 +52904,14 @@ var ts;
         function getTypeOfFirstParameterOfSignatureWithFallback(signature, fallbackType) {
             return signature.parameters.length > 0 ? getTypeAtPosition(signature, 0) : fallbackType;
         }
-        function inferFromAnnotatedParameters(signature, context, mapper) {
+        function inferFromAnnotatedParameters(signature, context, inferenceContext) {
             var len = signature.parameters.length - (signature.hasRestParameter ? 1 : 0);
             for (var i = 0; i < len; i++) {
                 var declaration = signature.parameters[i].valueDeclaration;
                 if (declaration.type) {
                     var typeNode = ts.getEffectiveTypeAnnotationNode(declaration);
                     if (typeNode) {
-                        inferTypes(mapper.inferences, getTypeFromTypeNode(typeNode), getTypeAtPosition(context, i));
+                        inferTypes(inferenceContext.inferences, getTypeFromTypeNode(typeNode), getTypeAtPosition(context, i));
                     }
                 }
             }
@@ -51266,12 +52919,12 @@ var ts;
             if (restType && restType.flags & 262144 /* TypeParameter */) {
                 // The contextual signature has a generic rest parameter. We first instantiate the contextual
                 // signature (without fixing type parameters) and assign types to contextually typed parameters.
-                var instantiatedContext = instantiateSignature(context, cloneTypeMapper(mapper));
+                var instantiatedContext = instantiateSignature(context, inferenceContext.nonFixingMapper);
                 assignContextualParameterTypes(signature, instantiatedContext);
                 // We then infer from a tuple type representing the parameters that correspond to the contextual
                 // rest parameter.
                 var restPos = getParameterCount(context) - 1;
-                inferTypes(mapper.inferences, getRestTypeAtPosition(signature, restPos), restType);
+                inferTypes(inferenceContext.inferences, getRestTypeAtPosition(signature, restPos), restType);
             }
         }
         function assignContextualParameterTypes(signature, context) {
@@ -51308,7 +52961,7 @@ var ts;
             for (var _i = 0, _a = pattern.elements; _i < _a.length; _i++) {
                 var element = _a[_i];
                 if (!ts.isOmittedExpression(element)) {
-                    if (element.name.kind === 72 /* Identifier */) {
+                    if (element.name.kind === 73 /* Identifier */) {
                         getSymbolLinks(getSymbolOfNode(element)).type = getTypeForBindingElement(element);
                     }
                     else {
@@ -51322,9 +52975,9 @@ var ts;
             if (!links.type) {
                 links.type = contextualType;
                 var decl = parameter.valueDeclaration;
-                if (decl.name.kind !== 72 /* Identifier */) {
+                if (decl.name.kind !== 73 /* Identifier */) {
                     // if inference didn't come up with anything but {}, fall back to the binding pattern if present.
-                    if (links.type === emptyObjectType) {
+                    if (links.type === unknownType) {
                         links.type = getTypeFromBindingPattern(decl.name);
                     }
                     assignBindingElementTypes(decl.name);
@@ -51336,24 +52989,24 @@ var ts;
             var globalPromiseType = getGlobalPromiseType(/*reportErrors*/ true);
             if (globalPromiseType !== emptyGenericType) {
                 // if the promised type is itself a promise, get the underlying type; otherwise, fallback to the promised type
-                promisedType = getAwaitedType(promisedType) || emptyObjectType;
+                promisedType = getAwaitedType(promisedType) || unknownType;
                 return createTypeReference(globalPromiseType, [promisedType]);
             }
-            return emptyObjectType;
+            return unknownType;
         }
         function createPromiseLikeType(promisedType) {
             // creates a `PromiseLike<T>` type where `T` is the promisedType argument
             var globalPromiseLikeType = getGlobalPromiseLikeType(/*reportErrors*/ true);
             if (globalPromiseLikeType !== emptyGenericType) {
                 // if the promised type is itself a promise, get the underlying type; otherwise, fallback to the promised type
-                promisedType = getAwaitedType(promisedType) || emptyObjectType;
+                promisedType = getAwaitedType(promisedType) || unknownType;
                 return createTypeReference(globalPromiseLikeType, [promisedType]);
             }
-            return emptyObjectType;
+            return unknownType;
         }
         function createPromiseReturnType(func, promisedType) {
             var promiseType = createPromiseType(promisedType);
-            if (promiseType === emptyObjectType) {
+            if (promiseType === unknownType) {
                 error(func, ts.isImportCall(func) ?
                     ts.Diagnostics.A_dynamic_import_call_returns_a_Promise_Make_sure_you_have_a_declaration_for_Promise_or_include_ES2015_in_your_lib_option :
                     ts.Diagnostics.An_async_function_or_method_must_return_a_Promise_Make_sure_you_have_a_declaration_for_Promise_or_include_ES2015_in_your_lib_option);
@@ -51371,99 +53024,148 @@ var ts;
                 return errorType;
             }
             var functionFlags = ts.getFunctionFlags(func);
-            var type;
-            if (func.body.kind !== 218 /* Block */) {
-                type = checkExpressionCached(func.body, checkMode && checkMode & ~8 /* SkipGenericFunctions */);
-                if (functionFlags & 2 /* Async */) {
+            var isAsync = (functionFlags & 2 /* Async */) !== 0;
+            var isGenerator = (functionFlags & 1 /* Generator */) !== 0;
+            var returnType;
+            var yieldType;
+            var nextType;
+            var fallbackReturnType = voidType;
+            if (func.body.kind !== 219 /* Block */) { // Async or normal arrow function
+                returnType = checkExpressionCached(func.body, checkMode && checkMode & ~8 /* SkipGenericFunctions */);
+                if (isAsync) {
                     // From within an async function you can return either a non-promise value or a promise. Any
                     // Promise/A+ compatible implementation will always assimilate any foreign promise, so the
                     // return type of the body should be unwrapped to its awaited type, which we will wrap in
                     // the native Promise<T> type later in this function.
-                    type = checkAwaitedType(type, /*errorNode*/ func, ts.Diagnostics.The_return_type_of_an_async_function_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member);
+                    returnType = checkAwaitedType(returnType, /*errorNode*/ func, ts.Diagnostics.The_return_type_of_an_async_function_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member);
                 }
             }
-            else {
-                var types = checkAndAggregateReturnExpressionTypes(func, checkMode);
-                if (functionFlags & 1 /* Generator */) { // Generator or AsyncGenerator function
-                    types = ts.concatenate(checkAndAggregateYieldOperandTypes(func, checkMode), types);
-                    if (!types || types.length === 0) {
-                        var iterableIteratorAny = functionFlags & 2 /* Async */
-                            ? createAsyncIterableIteratorType(anyType) // AsyncGenerator function
-                            : createIterableIteratorType(anyType); // Generator function
-                        if (noImplicitAny) {
-                            error(func.asteriskToken, ts.Diagnostics.Generator_implicitly_has_type_0_because_it_does_not_yield_any_values_Consider_supplying_a_return_type, typeToString(iterableIteratorAny));
-                        }
-                        return iterableIteratorAny;
-                    }
+            else if (isGenerator) { // Generator or AsyncGenerator function
+                var returnTypes = checkAndAggregateReturnExpressionTypes(func, checkMode);
+                if (!returnTypes) {
+                    fallbackReturnType = neverType;
                 }
-                else {
-                    if (!types) {
-                        // For an async function, the return type will not be never, but rather a Promise for never.
-                        return functionFlags & 2 /* Async */
-                            ? createPromiseReturnType(func, neverType) // Async function
-                            : neverType; // Normal function
-                    }
-                    if (types.length === 0) {
-                        // For an async function, the return type will not be void, but rather a Promise for void.
-                        return functionFlags & 2 /* Async */
-                            ? createPromiseReturnType(func, voidType) // Async function
-                            : voidType; // Normal function
-                    }
+                else if (returnTypes.length > 0) {
+                    returnType = getUnionType(returnTypes, 2 /* Subtype */);
+                }
+                var _a = checkAndAggregateYieldOperandTypes(func, checkMode), yieldTypes = _a.yieldTypes, nextTypes = _a.nextTypes;
+                yieldType = ts.some(yieldTypes) ? getUnionType(yieldTypes, 2 /* Subtype */) : undefined;
+                nextType = ts.some(nextTypes) ? getIntersectionType(nextTypes) : undefined;
+            }
+            else { // Async or normal function
+                var types = checkAndAggregateReturnExpressionTypes(func, checkMode);
+                if (!types) {
+                    // For an async function, the return type will not be never, but rather a Promise for never.
+                    return functionFlags & 2 /* Async */
+                        ? createPromiseReturnType(func, neverType) // Async function
+                        : neverType; // Normal function
+                }
+                if (types.length === 0) {
+                    // For an async function, the return type will not be void, but rather a Promise for void.
+                    return functionFlags & 2 /* Async */
+                        ? createPromiseReturnType(func, voidType) // Async function
+                        : voidType; // Normal function
                 }
                 // Return a union of the return expression types.
-                type = getUnionType(types, 2 /* Subtype */);
+                returnType = getUnionType(types, 2 /* Subtype */);
             }
-            var contextualSignature = getContextualSignatureForFunctionLikeDeclaration(func);
-            if (!contextualSignature) {
-                reportErrorsFromWidening(func, type);
-            }
-            if (isUnitType(type)) {
-                var contextualType = !contextualSignature ? undefined :
-                    contextualSignature === getSignatureFromDeclaration(func) ? type :
-                        getReturnTypeOfSignature(contextualSignature);
-                if (contextualType) {
-                    switch (functionFlags & 3 /* AsyncGenerator */) {
-                        case 3 /* AsyncGenerator */:
-                            contextualType = getIteratedTypeOfGenerator(contextualType, /*isAsyncGenerator*/ true);
-                            break;
-                        case 1 /* Generator */:
-                            contextualType = getIteratedTypeOfGenerator(contextualType, /*isAsyncGenerator*/ false);
-                            break;
-                        case 2 /* Async */:
-                            contextualType = getPromisedTypeOfPromise(contextualType);
-                            break;
+            if (returnType || yieldType || nextType) {
+                var contextualSignature = getContextualSignatureForFunctionLikeDeclaration(func);
+                if (!contextualSignature) {
+                    if (yieldType)
+                        reportErrorsFromWidening(func, yieldType, 1 /* GeneratorYield */);
+                    if (returnType)
+                        reportErrorsFromWidening(func, returnType);
+                    if (nextType)
+                        reportErrorsFromWidening(func, nextType);
+                }
+                if (returnType && isUnitType(returnType) ||
+                    yieldType && isUnitType(yieldType) ||
+                    nextType && isUnitType(nextType)) {
+                    var contextualType = !contextualSignature ? undefined :
+                        contextualSignature === getSignatureFromDeclaration(func) ? isGenerator ? undefined : returnType :
+                            instantiateContextualType(getReturnTypeOfSignature(contextualSignature), func);
+                    if (isGenerator) {
+                        yieldType = getWidenedLiteralLikeTypeForContextualIterationTypeIfNeeded(yieldType, contextualType, 0 /* Yield */, isAsync);
+                        returnType = getWidenedLiteralLikeTypeForContextualIterationTypeIfNeeded(returnType, contextualType, 1 /* Return */, isAsync);
+                        nextType = getWidenedLiteralLikeTypeForContextualIterationTypeIfNeeded(nextType, contextualType, 2 /* Next */, isAsync);
+                    }
+                    else {
+                        returnType = getWidenedLiteralLikeTypeForContextualReturnTypeIfNeeded(returnType, contextualType, isAsync);
                     }
                 }
-                type = getWidenedLiteralLikeTypeForContextualType(type, contextualType);
+                if (yieldType)
+                    yieldType = getWidenedType(yieldType);
+                if (returnType)
+                    returnType = getWidenedType(returnType);
+                if (nextType)
+                    nextType = getWidenedType(nextType);
             }
-            var widenedType = getWidenedType(type);
-            switch (functionFlags & 3 /* AsyncGenerator */) {
-                case 3 /* AsyncGenerator */:
-                    return createAsyncIterableIteratorType(widenedType);
-                case 1 /* Generator */:
-                    return createIterableIteratorType(widenedType);
-                case 2 /* Async */:
-                    // From within an async function you can return either a non-promise value or a promise. Any
-                    // Promise/A+ compatible implementation will always assimilate any foreign promise, so the
-                    // return type of the body is awaited type of the body, wrapped in a native Promise<T> type.
-                    return createPromiseType(widenedType);
-                default:
-                    return widenedType;
+            if (isGenerator) {
+                return createGeneratorReturnType(yieldType || neverType, returnType || fallbackReturnType, nextType || unknownType, isAsync);
             }
+            else {
+                // From within an async function you can return either a non-promise value or a promise. Any
+                // Promise/A+ compatible implementation will always assimilate any foreign promise, so the
+                // return type of the body is awaited type of the body, wrapped in a native Promise<T> type.
+                return isAsync
+                    ? createPromiseType(returnType || fallbackReturnType)
+                    : returnType || fallbackReturnType;
+            }
+        }
+        function createGeneratorReturnType(yieldType, returnType, nextType, isAsyncGenerator) {
+            var resolver = isAsyncGenerator ? asyncIterationTypesResolver : syncIterationTypesResolver;
+            var globalGeneratorType = resolver.getGlobalGeneratorType(/*reportErrors*/ false);
+            yieldType = resolver.resolveIterationType(yieldType, /*errorNode*/ undefined) || unknownType;
+            returnType = resolver.resolveIterationType(returnType, /*errorNode*/ undefined) || unknownType;
+            nextType = resolver.resolveIterationType(nextType, /*errorNode*/ undefined) || unknownType;
+            if (globalGeneratorType === emptyGenericType) {
+                // Fall back to the global IterableIterator if returnType is assignable to the expected return iteration
+                // type of IterableIterator, and the expected next iteration type of IterableIterator is assignable to
+                // nextType.
+                var globalType = resolver.getGlobalIterableIteratorType(/*reportErrors*/ false);
+                var iterationTypes = globalType !== emptyGenericType ? getIterationTypesOfGlobalIterableType(globalType, resolver) : undefined;
+                var iterableIteratorReturnType = iterationTypes ? iterationTypes.returnType : anyType;
+                var iterableIteratorNextType = iterationTypes ? iterationTypes.nextType : undefinedType;
+                if (isTypeAssignableTo(returnType, iterableIteratorReturnType) &&
+                    isTypeAssignableTo(iterableIteratorNextType, nextType)) {
+                    if (globalType !== emptyGenericType) {
+                        return createTypeFromGenericGlobalType(globalType, [yieldType]);
+                    }
+                    // The global IterableIterator type doesn't exist, so report an error
+                    resolver.getGlobalIterableIteratorType(/*reportErrors*/ true);
+                    return emptyObjectType;
+                }
+                // The global Generator type doesn't exist, so report an error
+                resolver.getGlobalGeneratorType(/*reportErrors*/ true);
+                return emptyObjectType;
+            }
+            return createTypeFromGenericGlobalType(globalGeneratorType, [yieldType, returnType, nextType]);
         }
         function checkAndAggregateYieldOperandTypes(func, checkMode) {
-            var aggregatedTypes = [];
+            var yieldTypes = [];
+            var nextTypes = [];
             var isAsync = (ts.getFunctionFlags(func) & 2 /* Async */) !== 0;
             ts.forEachYieldExpression(func.body, function (yieldExpression) {
-                ts.pushIfUnique(aggregatedTypes, getYieldedTypeOfYieldExpression(yieldExpression, isAsync, checkMode));
+                var yieldExpressionType = yieldExpression.expression ? checkExpression(yieldExpression.expression, checkMode) : undefinedWideningType;
+                ts.pushIfUnique(yieldTypes, getYieldedTypeOfYieldExpression(yieldExpression, yieldExpressionType, anyType, isAsync));
+                var nextType;
+                if (yieldExpression.asteriskToken) {
+                    var iterationTypes = getIterationTypesOfIterable(yieldExpressionType, isAsync ? 19 /* AsyncYieldStar */ : 17 /* YieldStar */, yieldExpression.expression);
+                    nextType = iterationTypes && iterationTypes.nextType;
+                }
+                else {
+                    nextType = getContextualType(yieldExpression);
+                }
+                if (nextType)
+                    ts.pushIfUnique(nextTypes, nextType);
             });
-            return aggregatedTypes;
+            return { yieldTypes: yieldTypes, nextTypes: nextTypes };
         }
-        function getYieldedTypeOfYieldExpression(node, isAsync, checkMode) {
+        function getYieldedTypeOfYieldExpression(node, expressionType, sentType, isAsync) {
             var errorNode = node.expression || node;
-            var expressionType = node.expression ? checkExpression(node.expression, checkMode) : undefinedWideningType;
             // A `yield*` expression effectively yields everything that its operand yields
-            var yieldedType = node.asteriskToken ? checkIteratedTypeOrElementType(expressionType, errorNode, /*allowStringInput*/ false, isAsync) : expressionType;
+            var yieldedType = node.asteriskToken ? checkIteratedTypeOrElementType(isAsync ? 19 /* AsyncYieldStar */ : 17 /* YieldStar */, expressionType, sentType, errorNode) : expressionType;
             return !isAsync ? yieldedType : getAwaitedType(yieldedType, errorNode, node.asteriskToken
                 ? ts.Diagnostics.Type_of_iterated_elements_of_a_yield_Asterisk_operand_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member
                 : ts.Diagnostics.Type_of_yield_operand_in_an_async_generator_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member);
@@ -51514,7 +53216,7 @@ var ts;
             if (!node.possiblyExhaustive) {
                 return false;
             }
-            if (node.expression.kind === 199 /* TypeOfExpression */) {
+            if (node.expression.kind === 200 /* TypeOfExpression */) {
                 var operandType = getTypeOfExpression(node.expression.expression);
                 // This cast is safe because the switch is possibly exhaustive and does not contain a default case, so there can be no undefined.
                 var witnesses = getSwitchClauseTypeOfWitnesses(node);
@@ -51537,7 +53239,7 @@ var ts;
             if (!(func.flags & 128 /* HasImplicitReturn */)) {
                 return false;
             }
-            if (ts.some(func.body.statements, function (statement) { return statement.kind === 232 /* SwitchStatement */ && isExhaustiveSwitchStatement(statement); })) {
+            if (ts.some(func.body.statements, function (statement) { return statement.kind === 233 /* SwitchStatement */ && isExhaustiveSwitchStatement(statement); })) {
                 return false;
             }
             return true;
@@ -51580,11 +53282,11 @@ var ts;
         }
         function mayReturnNever(func) {
             switch (func.kind) {
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
                     return true;
-                case 156 /* MethodDeclaration */:
-                    return func.parent.kind === 188 /* ObjectLiteralExpression */;
+                case 157 /* MethodDeclaration */:
+                    return func.parent.kind === 189 /* ObjectLiteralExpression */;
                 default:
                     return false;
             }
@@ -51602,30 +53304,32 @@ var ts;
             if (!produceDiagnostics) {
                 return;
             }
+            var functionFlags = ts.getFunctionFlags(func);
+            var type = returnType && getReturnOrPromisedType(returnType, functionFlags);
             // Functions with with an explicitly specified 'void' or 'any' return type don't need any return expressions.
-            if (returnType && maybeTypeOfKind(returnType, 1 /* Any */ | 16384 /* Void */)) {
+            if (type && maybeTypeOfKind(type, 1 /* Any */ | 16384 /* Void */)) {
                 return;
             }
             // If all we have is a function signature, or an arrow function with an expression body, then there is nothing to check.
             // also if HasImplicitReturn flag is not set this means that all codepaths in function body end with return or throw
-            if (func.kind === 155 /* MethodSignature */ || ts.nodeIsMissing(func.body) || func.body.kind !== 218 /* Block */ || !functionHasImplicitReturn(func)) {
+            if (func.kind === 156 /* MethodSignature */ || ts.nodeIsMissing(func.body) || func.body.kind !== 219 /* Block */ || !functionHasImplicitReturn(func)) {
                 return;
             }
             var hasExplicitReturn = func.flags & 256 /* HasExplicitReturn */;
-            if (returnType && returnType.flags & 131072 /* Never */) {
+            if (type && type.flags & 131072 /* Never */) {
                 error(ts.getEffectiveReturnTypeNode(func), ts.Diagnostics.A_function_returning_never_cannot_have_a_reachable_end_point);
             }
-            else if (returnType && !hasExplicitReturn) {
+            else if (type && !hasExplicitReturn) {
                 // minimal check: function has syntactic return type annotation and no explicit return statements in the body
                 // this function does not conform to the specification.
                 // NOTE: having returnType !== undefined is a precondition for entering this branch so func.type will always be present
                 error(ts.getEffectiveReturnTypeNode(func), ts.Diagnostics.A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value);
             }
-            else if (returnType && strictNullChecks && !isTypeAssignableTo(undefinedType, returnType)) {
+            else if (type && strictNullChecks && !isTypeAssignableTo(undefinedType, type)) {
                 error(ts.getEffectiveReturnTypeNode(func), ts.Diagnostics.Function_lacks_ending_return_statement_and_return_type_does_not_include_undefined);
             }
             else if (compilerOptions.noImplicitReturns) {
-                if (!returnType) {
+                if (!type) {
                     // If return type annotation is omitted check if function has any explicit return statements.
                     // If it does not have any - its inferred return type is void - don't do any checks.
                     // Otherwise get inferred return type from function body and report error only if it is not void / anytype
@@ -51641,34 +53345,38 @@ var ts;
             }
         }
         function checkFunctionExpressionOrObjectLiteralMethod(node, checkMode) {
-            ts.Debug.assert(node.kind !== 156 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 157 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
             checkNodeDeferred(node);
             // The identityMapper object is used to indicate that function expressions are wildcards
             if (checkMode && checkMode & 4 /* SkipContextSensitive */ && isContextSensitive(node)) {
                 // Skip parameters, return signature with return type that retains noncontextual parts so inferences can still be drawn in an early stage
                 if (!ts.getEffectiveReturnTypeNode(node) && hasContextSensitiveReturnExpression(node)) {
-                    var links_1 = getNodeLinks(node);
-                    if (links_1.contextFreeType) {
-                        return links_1.contextFreeType;
+                    var links = getNodeLinks(node);
+                    if (links.contextFreeType) {
+                        return links.contextFreeType;
                     }
                     var returnType = getReturnTypeFromBody(node, checkMode);
                     var returnOnlySignature = createSignature(undefined, undefined, undefined, ts.emptyArray, returnType, /*resolvedTypePredicate*/ undefined, 0, /*hasRestParameter*/ false, /*hasLiteralTypes*/ false);
                     var returnOnlyType = createAnonymousType(node.symbol, emptySymbols, [returnOnlySignature], ts.emptyArray, undefined, undefined);
-                    returnOnlyType.objectFlags |= 524288 /* ContainsAnyFunctionType */;
-                    return links_1.contextFreeType = returnOnlyType;
+                    returnOnlyType.objectFlags |= 1048576 /* NonInferrableType */;
+                    return links.contextFreeType = returnOnlyType;
                 }
                 return anyFunctionType;
             }
             // Grammar checking
             var hasGrammarError = checkGrammarFunctionLikeDeclaration(node);
-            if (!hasGrammarError && node.kind === 196 /* FunctionExpression */) {
+            if (!hasGrammarError && node.kind === 197 /* FunctionExpression */) {
                 checkGrammarForGenerator(node);
             }
-            var links = getNodeLinks(node);
             var type = getTypeOfSymbol(getMergedSymbol(node.symbol));
             if (isTypeAny(type)) {
                 return type;
             }
+            contextuallyCheckFunctionExpressionOrObjectLiteralMethod(node, checkMode);
+            return type;
+        }
+        function contextuallyCheckFunctionExpressionOrObjectLiteralMethod(node, checkMode) {
+            var links = getNodeLinks(node);
             // Check if function expression is contextually typed and assign parameter types if so.
             if (!(links.flags & 1024 /* ContextChecked */)) {
                 var contextualSignature = getContextualSignature(node);
@@ -51678,14 +53386,18 @@ var ts;
                 if (!(links.flags & 1024 /* ContextChecked */)) {
                     links.flags |= 1024 /* ContextChecked */;
                     if (contextualSignature) {
+                        var type = getTypeOfSymbol(getMergedSymbol(node.symbol));
+                        if (isTypeAny(type)) {
+                            return;
+                        }
                         var signature = getSignaturesOfType(type, 0 /* Call */)[0];
                         if (isContextSensitive(node)) {
-                            var contextualMapper = getContextualMapper(node);
+                            var inferenceContext = getInferenceContext(node);
                             if (checkMode && checkMode & 2 /* Inferential */) {
-                                inferFromAnnotatedParameters(signature, contextualSignature, contextualMapper);
+                                inferFromAnnotatedParameters(signature, contextualSignature, inferenceContext);
                             }
-                            var instantiatedContextualSignature = contextualMapper === identityMapper ?
-                                contextualSignature : instantiateSignature(contextualSignature, contextualMapper);
+                            var instantiatedContextualSignature = inferenceContext ?
+                                instantiateSignature(contextualSignature, inferenceContext.mapper) : contextualSignature;
                             assignContextualParameterTypes(signature, instantiatedContextualSignature);
                         }
                         if (!getReturnTypeFromAnnotation(node) && !signature.resolvedReturnType) {
@@ -51698,21 +53410,19 @@ var ts;
                     checkSignatureDeclaration(node);
                 }
             }
-            return type;
         }
-        function getReturnOrPromisedType(node, functionFlags) {
-            var type = getReturnTypeFromAnnotation(node);
-            return type && ((functionFlags & 3 /* AsyncGenerator */) === 2 /* Async */) ?
-                getAwaitedType(type) || errorType : type;
+        function getReturnOrPromisedType(type, functionFlags) {
+            var isGenerator = !!(functionFlags & 1 /* Generator */);
+            var isAsync = !!(functionFlags & 2 /* Async */);
+            return type && isGenerator ? getIterationTypeOfGeneratorFunctionReturnType(1 /* Return */, type, isAsync) || errorType :
+                type && isAsync ? getAwaitedType(type) || errorType :
+                    type;
         }
         function checkFunctionExpressionOrObjectLiteralMethodDeferred(node) {
-            ts.Debug.assert(node.kind !== 156 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 157 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
             var functionFlags = ts.getFunctionFlags(node);
-            var returnOrPromisedType = getReturnOrPromisedType(node, functionFlags);
-            if ((functionFlags & 1 /* Generator */) === 0) { // Async function or normal function
-                // return is not necessary in the body of generators
-                checkAllCodePathsInNonVoidFunctionReturnOrThrow(node, returnOrPromisedType);
-            }
+            var returnType = getReturnTypeFromAnnotation(node);
+            checkAllCodePathsInNonVoidFunctionReturnOrThrow(node, returnType);
             if (node.body) {
                 if (!ts.getEffectiveReturnTypeNode(node)) {
                     // There are some checks that are only performed in getReturnTypeFromBody, that may produce errors
@@ -51722,7 +53432,7 @@ var ts;
                     // checkFunctionExpressionBodies). So it must be done now.
                     getReturnTypeOfSignature(getSignatureFromDeclaration(node));
                 }
-                if (node.body.kind === 218 /* Block */) {
+                if (node.body.kind === 219 /* Block */) {
                     checkSourceElement(node.body);
                 }
                 else {
@@ -51732,6 +53442,7 @@ var ts;
                     // check assignability of the awaited type of the expression body against the promised type of
                     // its return type annotation.
                     var exprType = checkExpression(node.body);
+                    var returnOrPromisedType = getReturnOrPromisedType(returnType, functionFlags);
                     if (returnOrPromisedType) {
                         if ((functionFlags & 3 /* AsyncGenerator */) === 2 /* Async */) { // Async function
                             var awaitedType = checkAwaitedType(exprType, node.body, ts.Diagnostics.The_return_type_of_an_async_function_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member);
@@ -51744,9 +53455,11 @@ var ts;
                 }
             }
         }
-        function checkArithmeticOperandType(operand, type, diagnostic) {
+        function checkArithmeticOperandType(operand, type, diagnostic, isAwaitValid) {
+            if (isAwaitValid === void 0) { isAwaitValid = false; }
             if (!isTypeAssignableTo(type, numberOrBigIntType)) {
-                error(operand, diagnostic);
+                var awaitedType = isAwaitValid && getAwaitedTypeOfPromise(type);
+                errorAndMaybeSuggestAwait(operand, !!awaitedType && isTypeAssignableTo(awaitedType, numberOrBigIntType), diagnostic);
                 return false;
             }
             return true;
@@ -51800,11 +53513,11 @@ var ts;
             if (isReadonlySymbol(symbol)) {
                 // Allow assignments to readonly properties within constructors of the same class declaration.
                 if (symbol.flags & 4 /* Property */ &&
-                    (expr.kind === 189 /* PropertyAccessExpression */ || expr.kind === 190 /* ElementAccessExpression */) &&
-                    expr.expression.kind === 100 /* ThisKeyword */) {
+                    (expr.kind === 190 /* PropertyAccessExpression */ || expr.kind === 191 /* ElementAccessExpression */) &&
+                    expr.expression.kind === 101 /* ThisKeyword */) {
                     // Look for if this is the constructor for the class that `symbol` is a property of.
                     var func = ts.getContainingFunction(expr);
-                    if (!(func && func.kind === 157 /* Constructor */)) {
+                    if (!(func && func.kind === 158 /* Constructor */)) {
                         return true;
                     }
                     // If func.parent is a class and symbol is a (readonly) property of that class, or
@@ -51817,13 +53530,13 @@ var ts;
             return false;
         }
         function isReferenceThroughNamespaceImport(expr) {
-            if (expr.kind === 189 /* PropertyAccessExpression */ || expr.kind === 190 /* ElementAccessExpression */) {
+            if (expr.kind === 190 /* PropertyAccessExpression */ || expr.kind === 191 /* ElementAccessExpression */) {
                 var node = ts.skipParentheses(expr.expression);
-                if (node.kind === 72 /* Identifier */) {
+                if (node.kind === 73 /* Identifier */) {
                     var symbol = getNodeLinks(node).resolvedSymbol;
                     if (symbol.flags & 2097152 /* Alias */) {
                         var declaration = getDeclarationOfAliasSymbol(symbol);
-                        return !!declaration && declaration.kind === 251 /* NamespaceImport */;
+                        return !!declaration && declaration.kind === 252 /* NamespaceImport */;
                     }
                 }
             }
@@ -51832,7 +53545,7 @@ var ts;
         function checkReferenceExpression(expr, invalidReferenceMessage) {
             // References are combinations of identifiers, parentheses, and property accesses.
             var node = ts.skipOuterExpressions(expr, 2 /* Assertions */ | 1 /* Parentheses */);
-            if (node.kind !== 72 /* Identifier */ && node.kind !== 189 /* PropertyAccessExpression */ && node.kind !== 190 /* ElementAccessExpression */) {
+            if (node.kind !== 73 /* Identifier */ && node.kind !== 190 /* PropertyAccessExpression */ && node.kind !== 191 /* ElementAccessExpression */) {
                 error(expr, invalidReferenceMessage);
                 return false;
             }
@@ -51841,7 +53554,7 @@ var ts;
         function checkDeleteExpression(node) {
             checkExpression(node.expression);
             var expr = ts.skipParentheses(node.expression);
-            if (expr.kind !== 189 /* PropertyAccessExpression */ && expr.kind !== 190 /* ElementAccessExpression */) {
+            if (expr.kind !== 190 /* PropertyAccessExpression */ && expr.kind !== 191 /* ElementAccessExpression */) {
                 error(expr, ts.Diagnostics.The_operand_of_a_delete_operator_must_be_a_property_reference);
                 return booleanType;
             }
@@ -51864,7 +53577,19 @@ var ts;
             // Grammar checking
             if (produceDiagnostics) {
                 if (!(node.flags & 16384 /* AwaitContext */)) {
-                    grammarErrorOnFirstToken(node, ts.Diagnostics.await_expression_is_only_allowed_within_an_async_function);
+                    // use of 'await' in non-async function
+                    var sourceFile = ts.getSourceFileOfNode(node);
+                    if (!hasParseDiagnostics(sourceFile)) {
+                        var span = ts.getSpanOfTokenAtPosition(sourceFile, node.pos);
+                        var diagnostic = ts.createFileDiagnostic(sourceFile, span.start, span.length, ts.Diagnostics.await_expression_is_only_allowed_within_an_async_function);
+                        var func = ts.getContainingFunction(node);
+                        if (func && func.kind !== 158 /* Constructor */) {
+                            ts.Debug.assert((ts.getFunctionFlags(func) & 2 /* Async */) === 0, "Enclosing function should never be an async function.");
+                            var relatedInfo = ts.createDiagnosticForNode(func, ts.Diagnostics.Did_you_mean_to_mark_this_function_as_async);
+                            ts.addRelatedInfo(diagnostic, relatedInfo);
+                        }
+                        diagnostics.add(diagnostic);
+                    }
                 }
                 if (isInParameterInitializerBeforeContainingFunction(node)) {
                     error(node, ts.Diagnostics.await_expressions_cannot_be_used_in_a_parameter_initializer);
@@ -52036,16 +53761,17 @@ var ts;
             if (strictNullChecks && properties.length === 0) {
                 return checkNonNullType(sourceType, node);
             }
-            for (var _i = 0, properties_6 = properties; _i < properties_6.length; _i++) {
-                var p = properties_6[_i];
-                checkObjectLiteralDestructuringPropertyAssignment(sourceType, p, properties, rightIsThis);
+            for (var i = 0; i < properties.length; i++) {
+                checkObjectLiteralDestructuringPropertyAssignment(node, sourceType, i, properties, rightIsThis);
             }
             return sourceType;
         }
         /** Note: If property cannot be a SpreadAssignment, then allProperties does not need to be provided */
-        function checkObjectLiteralDestructuringPropertyAssignment(objectLiteralType, property, allProperties, rightIsThis) {
+        function checkObjectLiteralDestructuringPropertyAssignment(node, objectLiteralType, propertyIndex, allProperties, rightIsThis) {
             if (rightIsThis === void 0) { rightIsThis = false; }
-            if (property.kind === 275 /* PropertyAssignment */ || property.kind === 276 /* ShorthandPropertyAssignment */) {
+            var properties = node.properties;
+            var property = properties[propertyIndex];
+            if (property.kind === 276 /* PropertyAssignment */ || property.kind === 277 /* ShorthandPropertyAssignment */) {
                 var name = property.name;
                 var exprType = getLiteralTypeFromPropertyName(name);
                 if (isTypeUsableAsPropertyName(exprType)) {
@@ -52058,21 +53784,29 @@ var ts;
                 }
                 var elementType = getIndexedAccessType(objectLiteralType, exprType, name);
                 var type = getFlowTypeOfDestructuring(property, elementType);
-                return checkDestructuringAssignment(property.kind === 276 /* ShorthandPropertyAssignment */ ? property : property.initializer, type);
+                return checkDestructuringAssignment(property.kind === 277 /* ShorthandPropertyAssignment */ ? property : property.initializer, type);
             }
-            else if (property.kind === 277 /* SpreadAssignment */) {
-                if (languageVersion < 7 /* ESNext */) {
-                    checkExternalEmitHelpers(property, 4 /* Rest */);
+            else if (property.kind === 278 /* SpreadAssignment */) {
+                if (propertyIndex < properties.length - 1) {
+                    error(property, ts.Diagnostics.A_rest_element_must_be_last_in_a_destructuring_pattern);
                 }
-                var nonRestNames = [];
-                if (allProperties) {
-                    for (var i = 0; i < allProperties.length - 1; i++) {
-                        nonRestNames.push(allProperties[i].name);
+                else {
+                    if (languageVersion < 99 /* ESNext */) {
+                        checkExternalEmitHelpers(property, 4 /* Rest */);
                     }
+                    var nonRestNames = [];
+                    if (allProperties) {
+                        for (var _i = 0, allProperties_1 = allProperties; _i < allProperties_1.length; _i++) {
+                            var otherProperty = allProperties_1[_i];
+                            if (!ts.isSpreadAssignment(otherProperty)) {
+                                nonRestNames.push(otherProperty.name);
+                            }
+                        }
+                    }
+                    var type = getRestType(objectLiteralType, nonRestNames, objectLiteralType.symbol);
+                    checkGrammarForDisallowedTrailingComma(allProperties, ts.Diagnostics.A_rest_parameter_or_binding_pattern_may_not_have_a_trailing_comma);
+                    return checkDestructuringAssignment(property.expression, type);
                 }
-                var type = getRestType(objectLiteralType, nonRestNames, objectLiteralType.symbol);
-                checkGrammarForDisallowedTrailingComma(allProperties, ts.Diagnostics.A_rest_parameter_or_binding_pattern_may_not_have_a_trailing_comma);
-                return checkDestructuringAssignment(property.expression, type);
             }
             else {
                 error(property, ts.Diagnostics.Property_assignment_expected);
@@ -52086,7 +53820,7 @@ var ts;
             // This elementType will be used if the specific property corresponding to this index is not
             // present (aka the tuple element property). This call also checks that the parentType is in
             // fact an iterable or array (depending on target language).
-            var elementType = checkIteratedTypeOrElementType(sourceType, node, /*allowStringInput*/ false, /*allowAsyncIterables*/ false) || errorType;
+            var elementType = checkIteratedTypeOrElementType(65 /* Destructuring */, sourceType, undefinedType, node) || errorType;
             for (var i = 0; i < elements.length; i++) {
                 checkArrayLiteralDestructuringElementAssignment(node, sourceType, i, elementType, checkMode);
             }
@@ -52095,14 +53829,16 @@ var ts;
         function checkArrayLiteralDestructuringElementAssignment(node, sourceType, elementIndex, elementType, checkMode) {
             var elements = node.elements;
             var element = elements[elementIndex];
-            if (element.kind !== 210 /* OmittedExpression */) {
-                if (element.kind !== 208 /* SpreadElement */) {
+            if (element.kind !== 211 /* OmittedExpression */) {
+                if (element.kind !== 209 /* SpreadElement */) {
                     var indexType = getLiteralType(elementIndex);
                     if (isArrayLikeType(sourceType)) {
                         // We create a synthetic expression so that getIndexedAccessType doesn't get confused
                         // when the element is a SyntaxKind.ElementAccessExpression.
-                        var elementType_2 = getIndexedAccessType(sourceType, indexType, createSyntheticExpression(element, indexType));
-                        var type = getFlowTypeOfDestructuring(element, elementType_2);
+                        var accessFlags = hasDefaultValue(element) ? 8 /* NoTupleBoundsCheck */ : 0;
+                        var elementType_2 = getIndexedAccessTypeOrUndefined(sourceType, indexType, createSyntheticExpression(element, indexType), accessFlags) || errorType;
+                        var assignedType = hasDefaultValue(element) ? getTypeWithFacts(elementType_2, 524288 /* NEUndefined */) : elementType_2;
+                        var type = getFlowTypeOfDestructuring(element, assignedType);
                         return checkDestructuringAssignment(element, type, checkMode);
                     }
                     return checkDestructuringAssignment(element, elementType, checkMode);
@@ -52112,7 +53848,7 @@ var ts;
                 }
                 else {
                     var restExpression = element.expression;
-                    if (restExpression.kind === 204 /* BinaryExpression */ && restExpression.operatorToken.kind === 59 /* EqualsToken */) {
+                    if (restExpression.kind === 205 /* BinaryExpression */ && restExpression.operatorToken.kind === 60 /* EqualsToken */) {
                         error(restExpression.operatorToken, ts.Diagnostics.A_rest_element_cannot_have_an_initializer);
                     }
                     else {
@@ -52128,7 +53864,7 @@ var ts;
         }
         function checkDestructuringAssignment(exprOrAssignment, sourceType, checkMode, rightIsThis) {
             var target;
-            if (exprOrAssignment.kind === 276 /* ShorthandPropertyAssignment */) {
+            if (exprOrAssignment.kind === 277 /* ShorthandPropertyAssignment */) {
                 var prop = exprOrAssignment;
                 if (prop.objectAssignmentInitializer) {
                     // In strict null checking mode, if a default value of a non-undefined type is specified, remove
@@ -52144,21 +53880,21 @@ var ts;
             else {
                 target = exprOrAssignment;
             }
-            if (target.kind === 204 /* BinaryExpression */ && target.operatorToken.kind === 59 /* EqualsToken */) {
+            if (target.kind === 205 /* BinaryExpression */ && target.operatorToken.kind === 60 /* EqualsToken */) {
                 checkBinaryExpression(target, checkMode);
                 target = target.left;
             }
-            if (target.kind === 188 /* ObjectLiteralExpression */) {
+            if (target.kind === 189 /* ObjectLiteralExpression */) {
                 return checkObjectLiteralAssignment(target, sourceType, rightIsThis);
             }
-            if (target.kind === 187 /* ArrayLiteralExpression */) {
+            if (target.kind === 188 /* ArrayLiteralExpression */) {
                 return checkArrayLiteralAssignment(target, sourceType, checkMode);
             }
             return checkReferenceAssignment(target, sourceType, checkMode);
         }
         function checkReferenceAssignment(target, sourceType, checkMode) {
             var targetType = checkExpression(target, checkMode);
-            var error = target.parent.kind === 277 /* SpreadAssignment */ ?
+            var error = target.parent.kind === 278 /* SpreadAssignment */ ?
                 ts.Diagnostics.The_target_of_an_object_rest_assignment_must_be_a_variable_or_a_property_access :
                 ts.Diagnostics.The_left_hand_side_of_an_assignment_expression_must_be_a_variable_or_a_property_access;
             if (checkReferenceExpression(target, error)) {
@@ -52177,39 +53913,39 @@ var ts;
         function isSideEffectFree(node) {
             node = ts.skipParentheses(node);
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                 case 10 /* StringLiteral */:
                 case 13 /* RegularExpressionLiteral */:
-                case 193 /* TaggedTemplateExpression */:
-                case 206 /* TemplateExpression */:
+                case 194 /* TaggedTemplateExpression */:
+                case 207 /* TemplateExpression */:
                 case 14 /* NoSubstitutionTemplateLiteral */:
                 case 8 /* NumericLiteral */:
                 case 9 /* BigIntLiteral */:
-                case 102 /* TrueKeyword */:
-                case 87 /* FalseKeyword */:
-                case 96 /* NullKeyword */:
-                case 141 /* UndefinedKeyword */:
-                case 196 /* FunctionExpression */:
-                case 209 /* ClassExpression */:
-                case 197 /* ArrowFunction */:
-                case 187 /* ArrayLiteralExpression */:
-                case 188 /* ObjectLiteralExpression */:
-                case 199 /* TypeOfExpression */:
-                case 213 /* NonNullExpression */:
-                case 261 /* JsxSelfClosingElement */:
-                case 260 /* JsxElement */:
+                case 103 /* TrueKeyword */:
+                case 88 /* FalseKeyword */:
+                case 97 /* NullKeyword */:
+                case 142 /* UndefinedKeyword */:
+                case 197 /* FunctionExpression */:
+                case 210 /* ClassExpression */:
+                case 198 /* ArrowFunction */:
+                case 188 /* ArrayLiteralExpression */:
+                case 189 /* ObjectLiteralExpression */:
+                case 200 /* TypeOfExpression */:
+                case 214 /* NonNullExpression */:
+                case 262 /* JsxSelfClosingElement */:
+                case 261 /* JsxElement */:
                     return true;
-                case 205 /* ConditionalExpression */:
+                case 206 /* ConditionalExpression */:
                     return isSideEffectFree(node.whenTrue) &&
                         isSideEffectFree(node.whenFalse);
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     if (ts.isAssignmentOperator(node.operatorToken.kind)) {
                         return false;
                     }
                     return isSideEffectFree(node.left) &&
                         isSideEffectFree(node.right);
-                case 202 /* PrefixUnaryExpression */:
-                case 203 /* PostfixUnaryExpression */:
+                case 203 /* PrefixUnaryExpression */:
+                case 204 /* PostfixUnaryExpression */:
                     // Unary operators ~, !, +, and - have no side effects.
                     // The rest do.
                     switch (node.operator) {
@@ -52221,9 +53957,9 @@ var ts;
                     }
                     return false;
                 // Some forms listed here for clarity
-                case 200 /* VoidExpression */: // Explicit opt-out
-                case 194 /* TypeAssertionExpression */: // Not SEF, but can produce useful type warnings
-                case 212 /* AsExpression */: // Not SEF, but can produce useful type warnings
+                case 201 /* VoidExpression */: // Explicit opt-out
+                case 195 /* TypeAssertionExpression */: // Not SEF, but can produce useful type warnings
+                case 213 /* AsExpression */: // Not SEF, but can produce useful type warnings
                 default:
                     return false;
             }
@@ -52239,8 +53975,8 @@ var ts;
         }
         function checkBinaryLikeExpression(left, operatorToken, right, checkMode, errorNode) {
             var operator = operatorToken.kind;
-            if (operator === 59 /* EqualsToken */ && (left.kind === 188 /* ObjectLiteralExpression */ || left.kind === 187 /* ArrayLiteralExpression */)) {
-                return checkDestructuringAssignment(left, checkExpression(right, checkMode), checkMode, right.kind === 100 /* ThisKeyword */);
+            if (operator === 60 /* EqualsToken */ && (left.kind === 189 /* ObjectLiteralExpression */ || left.kind === 188 /* ArrayLiteralExpression */)) {
+                return checkDestructuringAssignment(left, checkExpression(right, checkMode), checkMode, right.kind === 101 /* ThisKeyword */);
             }
             var leftType;
             if (operator === 54 /* AmpersandAmpersandToken */ || operator === 55 /* BarBarToken */) {
@@ -52253,26 +53989,26 @@ var ts;
             switch (operator) {
                 case 40 /* AsteriskToken */:
                 case 41 /* AsteriskAsteriskToken */:
-                case 62 /* AsteriskEqualsToken */:
-                case 63 /* AsteriskAsteriskEqualsToken */:
+                case 63 /* AsteriskEqualsToken */:
+                case 64 /* AsteriskAsteriskEqualsToken */:
                 case 42 /* SlashToken */:
-                case 64 /* SlashEqualsToken */:
+                case 65 /* SlashEqualsToken */:
                 case 43 /* PercentToken */:
-                case 65 /* PercentEqualsToken */:
+                case 66 /* PercentEqualsToken */:
                 case 39 /* MinusToken */:
-                case 61 /* MinusEqualsToken */:
+                case 62 /* MinusEqualsToken */:
                 case 46 /* LessThanLessThanToken */:
-                case 66 /* LessThanLessThanEqualsToken */:
+                case 67 /* LessThanLessThanEqualsToken */:
                 case 47 /* GreaterThanGreaterThanToken */:
-                case 67 /* GreaterThanGreaterThanEqualsToken */:
+                case 68 /* GreaterThanGreaterThanEqualsToken */:
                 case 48 /* GreaterThanGreaterThanGreaterThanToken */:
-                case 68 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
+                case 69 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
                 case 50 /* BarToken */:
-                case 70 /* BarEqualsToken */:
+                case 71 /* BarEqualsToken */:
                 case 51 /* CaretToken */:
-                case 71 /* CaretEqualsToken */:
+                case 72 /* CaretEqualsToken */:
                 case 49 /* AmpersandToken */:
-                case 69 /* AmpersandEqualsToken */:
+                case 70 /* AmpersandEqualsToken */:
                     if (leftType === silentNeverType || rightType === silentNeverType) {
                         return silentNeverType;
                     }
@@ -52289,8 +54025,8 @@ var ts;
                     }
                     else {
                         // otherwise just check each operand separately and report errors as normal
-                        var leftOk = checkArithmeticOperandType(left, leftType, ts.Diagnostics.The_left_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_bigint_or_an_enum_type);
-                        var rightOk = checkArithmeticOperandType(right, rightType, ts.Diagnostics.The_right_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_bigint_or_an_enum_type);
+                        var leftOk = checkArithmeticOperandType(left, leftType, ts.Diagnostics.The_left_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_bigint_or_an_enum_type, /*isAwaitValid*/ true);
+                        var rightOk = checkArithmeticOperandType(right, rightType, ts.Diagnostics.The_right_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_bigint_or_an_enum_type, /*isAwaitValid*/ true);
                         var resultType_1;
                         // If both are any or unknown, allow operation; assume it will resolve to number
                         if ((isTypeAssignableToKind(leftType, 3 /* AnyOrUnknown */) && isTypeAssignableToKind(rightType, 3 /* AnyOrUnknown */)) ||
@@ -52298,17 +54034,18 @@ var ts;
                             !(maybeTypeOfKind(leftType, 2112 /* BigIntLike */) || maybeTypeOfKind(rightType, 2112 /* BigIntLike */))) {
                             resultType_1 = numberType;
                         }
-                        // At least one is assignable to bigint, so both should be only assignable to bigint
+                        // At least one is assignable to bigint, so check that both are
                         else if (isTypeAssignableToKind(leftType, 2112 /* BigIntLike */) && isTypeAssignableToKind(rightType, 2112 /* BigIntLike */)) {
                             switch (operator) {
                                 case 48 /* GreaterThanGreaterThanGreaterThanToken */:
-                                case 68 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
+                                case 69 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
                                     reportOperatorError();
                             }
                             resultType_1 = bigintType;
                         }
+                        // Exactly one of leftType/rightType is assignable to bigint
                         else {
-                            reportOperatorError();
+                            reportOperatorError(function (awaitedLeft, awaitedRight) { return isTypeAssignableToKind(awaitedLeft, 2112 /* BigIntLike */) && isTypeAssignableToKind(awaitedRight, 2112 /* BigIntLike */); });
                             resultType_1 = errorType;
                         }
                         if (leftOk && rightOk) {
@@ -52317,7 +54054,7 @@ var ts;
                         return resultType_1;
                     }
                 case 38 /* PlusToken */:
-                case 60 /* PlusEqualsToken */:
+                case 61 /* PlusEqualsToken */:
                     if (leftType === silentNeverType || rightType === silentNeverType) {
                         return silentNeverType;
                     }
@@ -52349,10 +54086,18 @@ var ts;
                         return resultType;
                     }
                     if (!resultType) {
-                        reportOperatorError();
+                        // Types that have a reasonably good chance of being a valid operand type.
+                        // If both types have an awaited type of one of these, we’ll assume the user
+                        // might be missing an await without doing an exhaustive check that inserting
+                        // await(s) will actually be a completely valid binary expression.
+                        var closeEnoughKind_1 = 296 /* NumberLike */ | 2112 /* BigIntLike */ | 132 /* StringLike */ | 3 /* AnyOrUnknown */;
+                        reportOperatorError(function (awaitedLeft, awaitedRight) {
+                            return isTypeAssignableToKind(awaitedLeft, closeEnoughKind_1) &&
+                                isTypeAssignableToKind(awaitedRight, closeEnoughKind_1);
+                        });
                         return anyType;
                     }
-                    if (operator === 60 /* PlusEqualsToken */) {
+                    if (operator === 61 /* PlusEqualsToken */) {
                         checkAssignmentOperator(resultType);
                     }
                     return resultType;
@@ -52363,29 +54108,20 @@ var ts;
                     if (checkForDisallowedESSymbolOperand(operator)) {
                         leftType = getBaseTypeOfLiteralType(checkNonNullType(leftType, left));
                         rightType = getBaseTypeOfLiteralType(checkNonNullType(rightType, right));
-                        if (!(isTypeComparableTo(leftType, rightType) || isTypeComparableTo(rightType, leftType) ||
-                            (isTypeAssignableTo(leftType, numberOrBigIntType) && isTypeAssignableTo(rightType, numberOrBigIntType)))) {
-                            reportOperatorError();
-                        }
+                        reportOperatorErrorUnless(function (left, right) {
+                            return isTypeComparableTo(left, right) || isTypeComparableTo(right, left) || (isTypeAssignableTo(left, numberOrBigIntType) && isTypeAssignableTo(right, numberOrBigIntType));
+                        });
                     }
                     return booleanType;
                 case 33 /* EqualsEqualsToken */:
                 case 34 /* ExclamationEqualsToken */:
                 case 35 /* EqualsEqualsEqualsToken */:
                 case 36 /* ExclamationEqualsEqualsToken */:
-                    var leftIsLiteral = isLiteralType(leftType);
-                    var rightIsLiteral = isLiteralType(rightType);
-                    if (!leftIsLiteral || !rightIsLiteral) {
-                        leftType = leftIsLiteral ? getBaseTypeOfLiteralType(leftType) : leftType;
-                        rightType = rightIsLiteral ? getBaseTypeOfLiteralType(rightType) : rightType;
-                    }
-                    if (!isTypeEqualityComparableTo(leftType, rightType) && !isTypeEqualityComparableTo(rightType, leftType)) {
-                        reportOperatorError();
-                    }
+                    reportOperatorErrorUnless(function (left, right) { return isTypeEqualityComparableTo(left, right) || isTypeEqualityComparableTo(right, left); });
                     return booleanType;
-                case 94 /* InstanceOfKeyword */:
+                case 95 /* InstanceOfKeyword */:
                     return checkInstanceOfExpression(left, right, leftType, rightType);
-                case 93 /* InKeyword */:
+                case 94 /* InKeyword */:
                     return checkInExpression(left, right, leftType, rightType);
                 case 54 /* AmpersandAmpersandToken */:
                     return getTypeFacts(leftType) & 4194304 /* Truthy */ ?
@@ -52395,7 +54131,7 @@ var ts;
                     return getTypeFacts(leftType) & 8388608 /* Falsy */ ?
                         getUnionType([removeDefinitelyFalsyTypes(leftType), rightType], 2 /* Subtype */) :
                         leftType;
-                case 59 /* EqualsToken */:
+                case 60 /* EqualsToken */:
                     var declKind = ts.isBinaryExpression(left.parent) ? ts.getAssignmentDeclarationKind(left.parent) : 0 /* None */;
                     checkAssignmentDeclaration(declKind, rightType);
                     if (isAssignmentDeclaration(declKind)) {
@@ -52439,7 +54175,7 @@ var ts;
                 }
             }
             function isEvalNode(node) {
-                return node.kind === 72 /* Identifier */ && node.escapedText === "eval";
+                return node.kind === 73 /* Identifier */ && node.escapedText === "eval";
             }
             // Return true if there was no error, false if there was an error.
             function checkForDisallowedESSymbolOperand(operator) {
@@ -52455,13 +54191,13 @@ var ts;
             function getSuggestedBooleanOperator(operator) {
                 switch (operator) {
                     case 50 /* BarToken */:
-                    case 70 /* BarEqualsToken */:
+                    case 71 /* BarEqualsToken */:
                         return 55 /* BarBarToken */;
                     case 51 /* CaretToken */:
-                    case 71 /* CaretEqualsToken */:
+                    case 72 /* CaretEqualsToken */:
                         return 36 /* ExclamationEqualsEqualsToken */;
                     case 49 /* AmpersandToken */:
-                    case 69 /* AmpersandEqualsToken */:
+                    case 70 /* AmpersandEqualsToken */:
                         return 54 /* AmpersandAmpersandToken */;
                     default:
                         return undefined;
@@ -52499,22 +54235,44 @@ var ts;
                         return false;
                 }
             }
-            function reportOperatorError() {
-                var leftStr = typeToString(leftType);
-                var rightStr = typeToString(rightType);
+            /**
+             * Returns true if an error is reported
+             */
+            function reportOperatorErrorUnless(typesAreCompatible) {
+                if (!typesAreCompatible(leftType, rightType)) {
+                    reportOperatorError(typesAreCompatible);
+                    return true;
+                }
+                return false;
+            }
+            function reportOperatorError(awaitedTypesAreCompatible) {
+                var wouldWorkWithAwait = false;
                 var errNode = errorNode || operatorToken;
-                if (!tryGiveBetterPrimaryError(errNode, leftStr, rightStr)) {
-                    error(errNode, ts.Diagnostics.Operator_0_cannot_be_applied_to_types_1_and_2, ts.tokenToString(operatorToken.kind), leftStr, rightStr);
+                var _a = getTypeNamesForErrorDisplay(leftType, rightType), leftStr = _a[0], rightStr = _a[1];
+                if (awaitedTypesAreCompatible) {
+                    var awaitedLeftType = getAwaitedType(leftType);
+                    var awaitedRightType = getAwaitedType(rightType);
+                    wouldWorkWithAwait = !(awaitedLeftType === leftType && awaitedRightType === rightType)
+                        && !!(awaitedLeftType && awaitedRightType)
+                        && awaitedTypesAreCompatible(awaitedLeftType, awaitedRightType);
+                }
+                if (!tryGiveBetterPrimaryError(errNode, wouldWorkWithAwait, leftStr, rightStr)) {
+                    errorAndMaybeSuggestAwait(errNode, wouldWorkWithAwait, ts.Diagnostics.Operator_0_cannot_be_applied_to_types_1_and_2, ts.tokenToString(operatorToken.kind), leftStr, rightStr);
                 }
             }
-            function tryGiveBetterPrimaryError(errNode, leftStr, rightStr) {
+            function tryGiveBetterPrimaryError(errNode, maybeMissingAwait, leftStr, rightStr) {
+                var typeName;
                 switch (operatorToken.kind) {
                     case 35 /* EqualsEqualsEqualsToken */:
                     case 33 /* EqualsEqualsToken */:
-                        return error(errNode, ts.Diagnostics.This_condition_will_always_return_0_since_the_types_1_and_2_have_no_overlap, "false", leftStr, rightStr);
+                        typeName = "false";
+                        break;
                     case 36 /* ExclamationEqualsEqualsToken */:
                     case 34 /* ExclamationEqualsToken */:
-                        return error(errNode, ts.Diagnostics.This_condition_will_always_return_0_since_the_types_1_and_2_have_no_overlap, "true", leftStr, rightStr);
+                        typeName = "true";
+                }
+                if (typeName) {
+                    return errorAndMaybeSuggestAwait(errNode, maybeMissingAwait, ts.Diagnostics.This_condition_will_always_return_0_since_the_types_1_and_2_have_no_overlap, typeName, leftStr, rightStr);
                 }
                 return undefined;
             }
@@ -52552,30 +54310,45 @@ var ts;
                 // If the user's code is syntactically correct, the func should always have a star. After all, we are in a yield context.
                 return anyType;
             }
+            var isAsync = (functionFlags & 2 /* Async */) !== 0;
             if (node.asteriskToken) {
                 // Async generator functions prior to ESNext require the __await, __asyncDelegator,
                 // and __asyncValues helpers
-                if ((functionFlags & 3 /* AsyncGenerator */) === 3 /* AsyncGenerator */ &&
-                    languageVersion < 7 /* ESNext */) {
-                    checkExternalEmitHelpers(node, 26624 /* AsyncDelegatorIncludes */);
+                if (isAsync && languageVersion < 99 /* ESNext */) {
+                    checkExternalEmitHelpers(node, 53248 /* AsyncDelegatorIncludes */);
                 }
                 // Generator functions prior to ES2015 require the __values helper
-                if ((functionFlags & 3 /* AsyncGenerator */) === 1 /* Generator */ &&
-                    languageVersion < 2 /* ES2015 */ && compilerOptions.downlevelIteration) {
+                if (!isAsync && languageVersion < 2 /* ES2015 */ && compilerOptions.downlevelIteration) {
                     checkExternalEmitHelpers(node, 256 /* Values */);
                 }
             }
-            var isAsync = (functionFlags & 2 /* Async */) !== 0;
-            var yieldedType = getYieldedTypeOfYieldExpression(node, isAsync); // TODO: GH#18217
             // There is no point in doing an assignability check if the function
             // has no explicit return type because the return type is directly computed
             // from the yield expressions.
             var returnType = getReturnTypeFromAnnotation(func);
-            if (returnType) {
-                var signatureElementType = getIteratedTypeOfGenerator(returnType, isAsync) || anyType;
-                checkTypeAssignableToAndOptionallyElaborate(yieldedType, signatureElementType, node.expression || node, node.expression);
+            var iterationTypes = returnType && getIterationTypesOfGeneratorFunctionReturnType(returnType, isAsync);
+            var signatureYieldType = iterationTypes && iterationTypes.yieldType || anyType;
+            var signatureNextType = iterationTypes && iterationTypes.nextType || anyType;
+            var resolvedSignatureNextType = isAsync ? getAwaitedType(signatureNextType) || anyType : signatureNextType;
+            var yieldExpressionType = node.expression ? checkExpression(node.expression) : undefinedWideningType;
+            var yieldedType = getYieldedTypeOfYieldExpression(node, yieldExpressionType, resolvedSignatureNextType, isAsync);
+            if (returnType && yieldedType) {
+                checkTypeAssignableToAndOptionallyElaborate(yieldedType, signatureYieldType, node.expression || node, node.expression);
+            }
+            if (node.asteriskToken) {
+                var use = isAsync ? 19 /* AsyncYieldStar */ : 17 /* YieldStar */;
+                return getIterationTypeOfIterable(use, 1 /* Return */, yieldExpressionType, node.expression)
+                    || anyType;
+            }
+            else if (returnType) {
+                return getIterationTypeOfGeneratorFunctionReturnType(2 /* Next */, returnType, isAsync)
+                    || anyType;
+            }
+            var contextualReturnType = getContextualReturnType(func);
+            if (contextualReturnType) {
+                return getIterationTypeOfGeneratorFunctionReturnType(2 /* Next */, contextualReturnType, isAsync)
+                    || anyType;
             }
-            // Both yield and yield* expressions have type 'any'
             return anyType;
         }
         function checkConditionalExpression(node, checkMode) {
@@ -52598,25 +54371,25 @@ var ts;
             return stringType;
         }
         function getContextNode(node) {
-            if (node.kind === 268 /* JsxAttributes */ && !ts.isJsxSelfClosingElement(node.parent)) {
+            if (node.kind === 269 /* JsxAttributes */ && !ts.isJsxSelfClosingElement(node.parent)) {
                 return node.parent.parent; // Needs to be the root JsxElement, so it encompasses the attributes _and_ the children (which are essentially part of the attributes)
             }
             return node;
         }
-        function checkExpressionWithContextualType(node, contextualType, contextualMapper, checkMode) {
+        function checkExpressionWithContextualType(node, contextualType, inferenceContext, checkMode) {
             var context = getContextNode(node);
             var saveContextualType = context.contextualType;
-            var saveContextualMapper = context.contextualMapper;
+            var saveInferenceContext = context.inferenceContext;
             context.contextualType = contextualType;
-            context.contextualMapper = contextualMapper;
-            var type = checkExpression(node, checkMode | 1 /* Contextual */ | (contextualMapper ? 2 /* Inferential */ : 0));
+            context.inferenceContext = inferenceContext;
+            var type = checkExpression(node, checkMode | 1 /* Contextual */ | (inferenceContext ? 2 /* Inferential */ : 0));
             // We strip literal freshness when an appropriate contextual type is present such that contextually typed
             // literals always preserve their literal types (otherwise they might widen during type inference). An alternative
             // here would be to not mark contextually typed literals as fresh in the first place.
             var result = maybeTypeOfKind(type, 2944 /* Literal */) && isLiteralOfContextualType(type, instantiateContextualType(contextualType, node)) ?
                 getRegularTypeOfLiteralType(type) : type;
             context.contextualType = saveContextualType;
-            context.contextualMapper = saveContextualMapper;
+            context.inferenceContext = saveInferenceContext;
             return result;
         }
         function checkExpressionCached(node, checkMode) {
@@ -52637,15 +54410,18 @@ var ts;
         }
         function isTypeAssertion(node) {
             node = ts.skipParentheses(node);
-            return node.kind === 194 /* TypeAssertionExpression */ || node.kind === 212 /* AsExpression */;
+            return node.kind === 195 /* TypeAssertionExpression */ || node.kind === 213 /* AsExpression */;
         }
         function checkDeclarationInitializer(declaration) {
             var initializer = ts.getEffectiveInitializer(declaration);
             var type = getTypeOfExpression(initializer, /*cache*/ true);
+            var padded = ts.isParameter(declaration) && declaration.name.kind === 186 /* ArrayBindingPattern */ &&
+                isTupleType(type) && !type.target.hasRestElement && getTypeReferenceArity(type) < declaration.name.elements.length ?
+                padTupleType(type, declaration.name) : type;
             var widened = ts.getCombinedNodeFlags(declaration) & 2 /* Const */ ||
                 ts.isDeclarationReadonly(declaration) ||
                 isTypeAssertion(initializer) ||
-                isLiteralOfContextualType(type, getContextualType(initializer)) ? type : getWidenedLiteralType(type);
+                isLiteralOfContextualType(padded, getContextualType(initializer)) ? padded : getWidenedLiteralType(padded);
             if (ts.isInJSFile(declaration)) {
                 if (widened.flags & 98304 /* Nullable */) {
                     reportImplicitAny(declaration, anyType);
@@ -52658,6 +54434,21 @@ var ts;
             }
             return widened;
         }
+        function padTupleType(type, pattern) {
+            var patternElements = pattern.elements;
+            var arity = getTypeReferenceArity(type);
+            var elementTypes = arity ? type.typeArguments.slice() : [];
+            for (var i = arity; i < patternElements.length; i++) {
+                var e = patternElements[i];
+                if (i < patternElements.length - 1 || !(e.kind === 187 /* BindingElement */ && e.dotDotDotToken)) {
+                    elementTypes.push(!ts.isOmittedExpression(e) && hasDefaultValue(e) ? getTypeFromBindingElement(e, /*includePatternInType*/ false, /*reportErrors*/ false) : anyType);
+                    if (!ts.isOmittedExpression(e) && !hasDefaultValue(e)) {
+                        reportImplicitAny(e, anyType);
+                    }
+                }
+            }
+            return createTupleType(elementTypes, type.target.minLength, /*hasRestElement*/ false, type.target.readonly);
+        }
         function isLiteralOfContextualType(candidateType, contextualType) {
             if (contextualType) {
                 if (contextualType.flags & 3145728 /* UnionOrIntersection */) {
@@ -52668,7 +54459,7 @@ var ts;
                     // If the contextual type is a type variable constrained to a primitive type, consider
                     // this a literal context for literals of that primitive type. For example, given a
                     // type parameter 'T extends string', infer string literal types for T.
-                    var constraint = getBaseConstraintOfType(contextualType) || emptyObjectType;
+                    var constraint = getBaseConstraintOfType(contextualType) || unknownType;
                     return maybeTypeOfKind(constraint, 4 /* String */) && maybeTypeOfKind(candidateType, 128 /* StringLiteral */) ||
                         maybeTypeOfKind(constraint, 8 /* Number */) && maybeTypeOfKind(candidateType, 256 /* NumberLiteral */) ||
                         maybeTypeOfKind(constraint, 64 /* BigInt */) && maybeTypeOfKind(candidateType, 2048 /* BigIntLiteral */) ||
@@ -52701,7 +54492,7 @@ var ts;
             // Do not use hasDynamicName here, because that returns false for well known symbols.
             // We want to perform checkComputedPropertyName for all computed properties, including
             // well known symbols.
-            if (node.name.kind === 149 /* ComputedPropertyName */) {
+            if (node.name.kind === 150 /* ComputedPropertyName */) {
                 checkComputedPropertyName(node.name);
             }
             return checkExpressionForMutableLocation(node.initializer, checkMode);
@@ -52712,7 +54503,7 @@ var ts;
             // Do not use hasDynamicName here, because that returns false for well known symbols.
             // We want to perform checkComputedPropertyName for all computed properties, including
             // well known symbols.
-            if (node.name.kind === 149 /* ComputedPropertyName */) {
+            if (node.name.kind === 150 /* ComputedPropertyName */) {
                 checkComputedPropertyName(node.name);
             }
             var uninstantiatedType = checkFunctionExpressionOrObjectLiteralMethod(node, checkMode);
@@ -52720,42 +54511,52 @@ var ts;
         }
         function instantiateTypeWithSingleGenericCallSignature(node, type, checkMode) {
             if (checkMode && checkMode & (2 /* Inferential */ | 8 /* SkipGenericFunctions */)) {
-                var signature = getSingleCallSignature(type);
+                var callSignature = getSingleSignature(type, 0 /* Call */, /*allowMembers*/ true);
+                var constructSignature = getSingleSignature(type, 1 /* Construct */, /*allowMembers*/ true);
+                var signature = callSignature || constructSignature;
                 if (signature && signature.typeParameters) {
-                    if (checkMode & 8 /* SkipGenericFunctions */) {
-                        skippedGenericFunction(node, checkMode);
-                        return anyFunctionType;
-                    }
                     var contextualType = getApparentTypeOfContextualType(node);
-                    if (contextualType) {
-                        var contextualSignature = getSingleCallSignature(getNonNullableType(contextualType));
+                    if (contextualType && !isMixinConstructorType(contextualType)) {
+                        var contextualSignature = getSingleSignature(getNonNullableType(contextualType), callSignature ? 0 /* Call */ : 1 /* Construct */, /*allowMembers*/ false);
                         if (contextualSignature && !contextualSignature.typeParameters) {
-                            var context = getContextualMapper(node);
+                            if (checkMode & 8 /* SkipGenericFunctions */) {
+                                skippedGenericFunction(node, checkMode);
+                                return anyFunctionType;
+                            }
+                            var context = getInferenceContext(node);
                             // We have an expression that is an argument of a generic function for which we are performing
                             // type argument inference. The expression is of a function type with a single generic call
                             // signature and a contextual function type with a single non-generic call signature. Now check
                             // if the outer function returns a function type with a single non-generic call signature and
                             // if some of the outer function type parameters have no inferences so far. If so, we can
                             // potentially add inferred type parameters to the outer function return type.
-                            var returnSignature = context.signature && getSingleCallSignature(getReturnTypeOfSignature(context.signature));
+                            var returnType = context.signature && getReturnTypeOfSignature(context.signature);
+                            var returnSignature = returnType && getSingleCallOrConstructSignature(returnType);
                             if (returnSignature && !returnSignature.typeParameters && !ts.every(context.inferences, hasInferenceCandidates)) {
-                                // Instantiate the expression type with its own type parameters as type arguments. This
-                                // ensures that the type parameters are not erased to type any during type inference such
-                                // that they can be inferred as actual types.
+                                // Instantiate the signature with its own type parameters as type arguments, possibly
+                                // renaming the type parameters to ensure they have unique names.
                                 var uniqueTypeParameters = getUniqueTypeParameters(context, signature.typeParameters);
-                                var strippedType = getOrCreateTypeFromSignature(getSignatureInstantiationWithoutFillingInTypeArguments(signature, uniqueTypeParameters));
-                                // Infer from the stripped expression type to the contextual type starting with an empty
-                                // set of inference candidates.
-                                var inferences = ts.map(context.typeParameters, createInferenceInfo);
-                                inferTypes(inferences, strippedType, contextualType);
-                                // If we produced some inference candidates and if the type parameters for which we produced
-                                // candidates do not already have existing inferences, we adopt the new inference candidates and
-                                // add the type parameters of the expression type to the set of inferred type parameters for
-                                // the outer function return type.
-                                if (ts.some(inferences, hasInferenceCandidates) && !hasOverlappingInferences(context.inferences, inferences)) {
-                                    mergeInferences(context.inferences, inferences);
-                                    context.inferredTypeParameters = ts.concatenate(context.inferredTypeParameters, uniqueTypeParameters);
-                                    return strippedType;
+                                var instantiatedSignature = getSignatureInstantiationWithoutFillingInTypeArguments(signature, uniqueTypeParameters);
+                                // Infer from the parameters of the instantiated signature to the parameters of the
+                                // contextual signature starting with an empty set of inference candidates.
+                                var inferences_3 = ts.map(context.inferences, function (info) { return createInferenceInfo(info.typeParameter); });
+                                applyToParameterTypes(instantiatedSignature, contextualSignature, function (source, target) {
+                                    inferTypes(inferences_3, source, target, /*priority*/ 0, /*contravariant*/ true);
+                                });
+                                if (ts.some(inferences_3, hasInferenceCandidates)) {
+                                    // We have inference candidates, indicating that one or more type parameters are referenced
+                                    // in the parameter types of the contextual signature. Now also infer from the return type.
+                                    applyToReturnTypes(instantiatedSignature, contextualSignature, function (source, target) {
+                                        inferTypes(inferences_3, source, target);
+                                    });
+                                    // If the type parameters for which we produced candidates do not have any inferences yet,
+                                    // we adopt the new inference candidates and add the type parameters of the expression type
+                                    // to the set of inferred type parameters for the outer function return type.
+                                    if (!hasOverlappingInferences(context.inferences, inferences_3)) {
+                                        mergeInferences(context.inferences, inferences_3);
+                                        context.inferredTypeParameters = ts.concatenate(context.inferredTypeParameters, uniqueTypeParameters);
+                                        return getOrCreateTypeFromSignature(instantiatedSignature);
+                                    }
                                 }
                             }
                             return getOrCreateTypeFromSignature(instantiateSignatureInContextOf(signature, contextualSignature, context));
@@ -52769,8 +54570,8 @@ var ts;
             if (checkMode & 2 /* Inferential */) {
                 // We have skipped a generic function during inferential typing. Obtain the inference context and
                 // indicate this has occurred such that we know a second pass of inference is be needed.
-                var context = getContextualMapper(node);
-                context.flags |= 8 /* SkippedGenericFunction */;
+                var context = getInferenceContext(node);
+                context.flags |= 4 /* SkippedGenericFunction */;
             }
         }
         function hasInferenceCandidates(info) {
@@ -52845,7 +54646,7 @@ var ts;
             var expr = ts.skipParentheses(node);
             // Optimize for the common case of a call to a function with a single non-generic call
             // signature where we can just fetch the return type without checking the arguments.
-            if (expr.kind === 191 /* CallExpression */ && expr.expression.kind !== 98 /* SuperKeyword */ && !ts.isRequireCall(expr, /*checkArgumentIsStringLiteralLike*/ true) && !isSymbolOrSymbolForCall(expr)) {
+            if (expr.kind === 192 /* CallExpression */ && expr.expression.kind !== 99 /* SuperKeyword */ && !ts.isRequireCall(expr, /*checkArgumentIsStringLiteralLike*/ true) && !isSymbolOrSymbolForCall(expr)) {
                 var funcType = checkNonNullExpression(expr.expression);
                 var signature = getSingleCallSignature(funcType);
                 if (signature && !signature.typeParameters) {
@@ -52878,16 +54679,10 @@ var ts;
             node.contextualType = saveContextualType;
             return type;
         }
-        // Checks an expression and returns its type. The contextualMapper parameter serves two purposes: When
-        // contextualMapper is not undefined and not equal to the identityMapper function object it indicates that the
-        // expression is being inferentially typed (section 4.15.2 in spec) and provides the type mapper to use in
-        // conjunction with the generic contextual type. When contextualMapper is equal to the identityMapper function
-        // object, it serves as an indicator that all contained function and arrow expressions should be considered to
-        // have the wildcard function type; this form of type check is used during overload resolution to exclude
-        // contextually typed function and arrow expressions in the initial phase.
         function checkExpression(node, checkMode, forceTuple) {
             var saveCurrentNode = currentNode;
             currentNode = node;
+            instantiationCount = 0;
             var uninstantiatedType = checkExpressionWorker(node, checkMode, forceTuple);
             var type = instantiateTypeWithSingleGenericCallSignature(node, uninstantiatedType, checkMode);
             if (isConstEnumObjectType(type)) {
@@ -52901,10 +54696,10 @@ var ts;
             // - 'left' in property access
             // - 'object' in indexed access
             // - target in rhs of import statement
-            var ok = (node.parent.kind === 189 /* PropertyAccessExpression */ && node.parent.expression === node) ||
-                (node.parent.kind === 190 /* ElementAccessExpression */ && node.parent.expression === node) ||
-                ((node.kind === 72 /* Identifier */ || node.kind === 148 /* QualifiedName */) && isInRightSideOfImportOrExportAssignment(node) ||
-                    (node.parent.kind === 167 /* TypeQuery */ && node.parent.exprName === node));
+            var ok = (node.parent.kind === 190 /* PropertyAccessExpression */ && node.parent.expression === node) ||
+                (node.parent.kind === 191 /* ElementAccessExpression */ && node.parent.expression === node) ||
+                ((node.kind === 73 /* Identifier */ || node.kind === 149 /* QualifiedName */) && isInRightSideOfImportOrExportAssignment(node) ||
+                    (node.parent.kind === 168 /* TypeQuery */ && node.parent.exprName === node));
             if (!ok) {
                 error(node, ts.Diagnostics.const_enums_can_only_be_used_in_property_or_index_access_expressions_or_the_right_hand_side_of_an_import_declaration_or_export_assignment_or_type_query);
             }
@@ -52925,13 +54720,13 @@ var ts;
         }
         function checkExpressionWorker(node, checkMode, forceTuple) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return checkIdentifier(node);
-                case 100 /* ThisKeyword */:
+                case 101 /* ThisKeyword */:
                     return checkThisExpression(node);
-                case 98 /* SuperKeyword */:
+                case 99 /* SuperKeyword */:
                     return checkSuperExpression(node);
-                case 96 /* NullKeyword */:
+                case 97 /* NullKeyword */:
                     return nullWideningType;
                 case 14 /* NoSubstitutionTemplateLiteral */:
                 case 10 /* StringLiteral */:
@@ -52942,82 +54737,82 @@ var ts;
                 case 9 /* BigIntLiteral */:
                     checkGrammarBigIntLiteral(node);
                     return getFreshTypeOfLiteralType(getBigIntLiteralType(node));
-                case 102 /* TrueKeyword */:
+                case 103 /* TrueKeyword */:
                     return trueType;
-                case 87 /* FalseKeyword */:
+                case 88 /* FalseKeyword */:
                     return falseType;
-                case 206 /* TemplateExpression */:
+                case 207 /* TemplateExpression */:
                     return checkTemplateExpression(node);
                 case 13 /* RegularExpressionLiteral */:
                     return globalRegExpType;
-                case 187 /* ArrayLiteralExpression */:
+                case 188 /* ArrayLiteralExpression */:
                     return checkArrayLiteral(node, checkMode, forceTuple);
-                case 188 /* ObjectLiteralExpression */:
+                case 189 /* ObjectLiteralExpression */:
                     return checkObjectLiteral(node, checkMode);
-                case 189 /* PropertyAccessExpression */:
+                case 190 /* PropertyAccessExpression */:
                     return checkPropertyAccessExpression(node);
-                case 148 /* QualifiedName */:
+                case 149 /* QualifiedName */:
                     return checkQualifiedName(node);
-                case 190 /* ElementAccessExpression */:
+                case 191 /* ElementAccessExpression */:
                     return checkIndexedAccess(node);
-                case 191 /* CallExpression */:
-                    if (node.expression.kind === 92 /* ImportKeyword */) {
+                case 192 /* CallExpression */:
+                    if (node.expression.kind === 93 /* ImportKeyword */) {
                         return checkImportCallExpression(node);
                     }
                 /* falls through */
-                case 192 /* NewExpression */:
+                case 193 /* NewExpression */:
                     return checkCallExpression(node, checkMode);
-                case 193 /* TaggedTemplateExpression */:
+                case 194 /* TaggedTemplateExpression */:
                     return checkTaggedTemplateExpression(node);
-                case 195 /* ParenthesizedExpression */:
+                case 196 /* ParenthesizedExpression */:
                     return checkParenthesizedExpression(node, checkMode);
-                case 209 /* ClassExpression */:
+                case 210 /* ClassExpression */:
                     return checkClassExpression(node);
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
                     return checkFunctionExpressionOrObjectLiteralMethod(node, checkMode);
-                case 199 /* TypeOfExpression */:
+                case 200 /* TypeOfExpression */:
                     return checkTypeOfExpression(node);
-                case 194 /* TypeAssertionExpression */:
-                case 212 /* AsExpression */:
+                case 195 /* TypeAssertionExpression */:
+                case 213 /* AsExpression */:
                     return checkAssertion(node);
-                case 213 /* NonNullExpression */:
+                case 214 /* NonNullExpression */:
                     return checkNonNullAssertion(node);
-                case 214 /* MetaProperty */:
+                case 215 /* MetaProperty */:
                     return checkMetaProperty(node);
-                case 198 /* DeleteExpression */:
+                case 199 /* DeleteExpression */:
                     return checkDeleteExpression(node);
-                case 200 /* VoidExpression */:
+                case 201 /* VoidExpression */:
                     return checkVoidExpression(node);
-                case 201 /* AwaitExpression */:
+                case 202 /* AwaitExpression */:
                     return checkAwaitExpression(node);
-                case 202 /* PrefixUnaryExpression */:
+                case 203 /* PrefixUnaryExpression */:
                     return checkPrefixUnaryExpression(node);
-                case 203 /* PostfixUnaryExpression */:
+                case 204 /* PostfixUnaryExpression */:
                     return checkPostfixUnaryExpression(node);
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return checkBinaryExpression(node, checkMode);
-                case 205 /* ConditionalExpression */:
+                case 206 /* ConditionalExpression */:
                     return checkConditionalExpression(node, checkMode);
-                case 208 /* SpreadElement */:
+                case 209 /* SpreadElement */:
                     return checkSpreadExpression(node, checkMode);
-                case 210 /* OmittedExpression */:
+                case 211 /* OmittedExpression */:
                     return undefinedWideningType;
-                case 207 /* YieldExpression */:
+                case 208 /* YieldExpression */:
                     return checkYieldExpression(node);
-                case 215 /* SyntheticExpression */:
+                case 216 /* SyntheticExpression */:
                     return node.type;
-                case 270 /* JsxExpression */:
+                case 271 /* JsxExpression */:
                     return checkJsxExpression(node, checkMode);
-                case 260 /* JsxElement */:
+                case 261 /* JsxElement */:
                     return checkJsxElement(node, checkMode);
-                case 261 /* JsxSelfClosingElement */:
+                case 262 /* JsxSelfClosingElement */:
                     return checkJsxSelfClosingElement(node, checkMode);
-                case 264 /* JsxFragment */:
+                case 265 /* JsxFragment */:
                     return checkJsxFragment(node);
-                case 268 /* JsxAttributes */:
+                case 269 /* JsxAttributes */:
                     return checkJsxAttributes(node, checkMode);
-                case 262 /* JsxOpeningElement */:
+                case 263 /* JsxOpeningElement */:
                     ts.Debug.fail("Shouldn't ever directly check a JsxOpeningElement");
             }
             return errorType;
@@ -53039,7 +54834,7 @@ var ts;
             var constraintType = getConstraintOfTypeParameter(typeParameter);
             var defaultType = getDefaultFromTypeParameter(typeParameter);
             if (constraintType && defaultType) {
-                checkTypeAssignableTo(defaultType, getTypeWithThisArgument(constraintType, defaultType), node.default, ts.Diagnostics.Type_0_does_not_satisfy_the_constraint_1);
+                checkTypeAssignableTo(defaultType, getTypeWithThisArgument(instantiateType(constraintType, makeUnaryTypeMapper(typeParameter, defaultType)), defaultType), node.default, ts.Diagnostics.Type_0_does_not_satisfy_the_constraint_1);
             }
             if (produceDiagnostics) {
                 checkTypeNameIsReserved(node.name, ts.Diagnostics.Type_parameter_name_cannot_be_0);
@@ -53054,7 +54849,7 @@ var ts;
             checkVariableLikeDeclaration(node);
             var func = ts.getContainingFunction(node);
             if (ts.hasModifier(node, 92 /* ParameterPropertyModifier */)) {
-                if (!(func.kind === 157 /* Constructor */ && ts.nodeIsPresent(func.body))) {
+                if (!(func.kind === 158 /* Constructor */ && ts.nodeIsPresent(func.body))) {
                     error(node, ts.Diagnostics.A_parameter_property_is_only_allowed_in_a_constructor_implementation);
                 }
             }
@@ -53065,10 +54860,10 @@ var ts;
                 if (func.parameters.indexOf(node) !== 0) {
                     error(node, ts.Diagnostics.A_0_parameter_must_be_the_first_parameter, node.name.escapedText);
                 }
-                if (func.kind === 157 /* Constructor */ || func.kind === 161 /* ConstructSignature */ || func.kind === 166 /* ConstructorType */) {
+                if (func.kind === 158 /* Constructor */ || func.kind === 162 /* ConstructSignature */ || func.kind === 167 /* ConstructorType */) {
                     error(node, ts.Diagnostics.A_constructor_cannot_have_a_this_parameter);
                 }
-                if (func.kind === 197 /* ArrowFunction */) {
+                if (func.kind === 198 /* ArrowFunction */) {
                     error(node, ts.Diagnostics.An_arrow_function_cannot_have_a_this_parameter);
                 }
             }
@@ -53085,7 +54880,8 @@ var ts;
                 error(node, ts.Diagnostics.A_type_predicate_is_only_allowed_in_return_type_position_for_functions_and_methods);
                 return;
             }
-            var typePredicate = getTypePredicateOfSignature(getSignatureFromDeclaration(parent));
+            var signature = getSignatureFromDeclaration(parent);
+            var typePredicate = getTypePredicateOfSignature(signature);
             if (!typePredicate) {
                 return;
             }
@@ -53096,12 +54892,12 @@ var ts;
             }
             else {
                 if (typePredicate.parameterIndex >= 0) {
-                    if (parent.parameters[typePredicate.parameterIndex].dotDotDotToken) {
+                    if (signature.hasRestParameter && typePredicate.parameterIndex === signature.parameters.length - 1) {
                         error(parameterName, ts.Diagnostics.A_type_predicate_cannot_reference_a_rest_parameter);
                     }
                     else {
                         var leadingError = function () { return ts.chainDiagnosticMessages(/*details*/ undefined, ts.Diagnostics.A_type_predicate_s_type_must_be_assignable_to_its_parameter_s_type); };
-                        checkTypeAssignableTo(typePredicate.type, getTypeOfNode(parent.parameters[typePredicate.parameterIndex]), node.type, 
+                        checkTypeAssignableTo(typePredicate.type, getTypeOfSymbol(signature.parameters[typePredicate.parameterIndex]), node.type, 
                         /*headMessage*/ undefined, leadingError);
                     }
                 }
@@ -53123,13 +54919,13 @@ var ts;
         }
         function getTypePredicateParent(node) {
             switch (node.parent.kind) {
-                case 197 /* ArrowFunction */:
-                case 160 /* CallSignature */:
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
-                case 165 /* FunctionType */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
+                case 198 /* ArrowFunction */:
+                case 161 /* CallSignature */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 166 /* FunctionType */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
                     var parent = node.parent;
                     if (node === parent.type) {
                         return parent;
@@ -53143,11 +54939,11 @@ var ts;
                     continue;
                 }
                 var name = element.name;
-                if (name.kind === 72 /* Identifier */ && name.escapedText === predicateVariableName) {
+                if (name.kind === 73 /* Identifier */ && name.escapedText === predicateVariableName) {
                     error(predicateVariableNode, ts.Diagnostics.A_type_predicate_cannot_reference_element_0_in_a_binding_pattern, predicateVariableName);
                     return true;
                 }
-                else if (name.kind === 185 /* ArrayBindingPattern */ || name.kind === 184 /* ObjectBindingPattern */) {
+                else if (name.kind === 186 /* ArrayBindingPattern */ || name.kind === 185 /* ObjectBindingPattern */) {
                     if (checkIfTypePredicateVariableIsDeclaredInBindingPattern(name, predicateVariableNode, predicateVariableName)) {
                         return true;
                     }
@@ -53156,20 +54952,20 @@ var ts;
         }
         function checkSignatureDeclaration(node) {
             // Grammar checking
-            if (node.kind === 162 /* IndexSignature */) {
+            if (node.kind === 163 /* IndexSignature */) {
                 checkGrammarIndexSignature(node);
             }
             // TODO (yuisu): Remove this check in else-if when SyntaxKind.Construct is moved and ambient context is handled
-            else if (node.kind === 165 /* FunctionType */ || node.kind === 239 /* FunctionDeclaration */ || node.kind === 166 /* ConstructorType */ ||
-                node.kind === 160 /* CallSignature */ || node.kind === 157 /* Constructor */ ||
-                node.kind === 161 /* ConstructSignature */) {
+            else if (node.kind === 166 /* FunctionType */ || node.kind === 240 /* FunctionDeclaration */ || node.kind === 167 /* ConstructorType */ ||
+                node.kind === 161 /* CallSignature */ || node.kind === 158 /* Constructor */ ||
+                node.kind === 162 /* ConstructSignature */) {
                 checkGrammarFunctionLikeDeclaration(node);
             }
             var functionFlags = ts.getFunctionFlags(node);
             if (!(functionFlags & 4 /* Invalid */)) {
                 // Async generators prior to ESNext require the __await and __asyncGenerator helpers
-                if ((functionFlags & 3 /* AsyncGenerator */) === 3 /* AsyncGenerator */ && languageVersion < 7 /* ESNext */) {
-                    checkExternalEmitHelpers(node, 6144 /* AsyncGeneratorIncludes */);
+                if ((functionFlags & 3 /* AsyncGenerator */) === 3 /* AsyncGenerator */ && languageVersion < 99 /* ESNext */) {
+                    checkExternalEmitHelpers(node, 12288 /* AsyncGeneratorIncludes */);
                 }
                 // Async functions prior to ES2017 require the __awaiter helper
                 if ((functionFlags & 3 /* AsyncGenerator */) === 2 /* Async */ && languageVersion < 4 /* ES2017 */) {
@@ -53192,10 +54988,10 @@ var ts;
                 var returnTypeNode = ts.getEffectiveReturnTypeNode(node);
                 if (noImplicitAny && !returnTypeNode) {
                     switch (node.kind) {
-                        case 161 /* ConstructSignature */:
+                        case 162 /* ConstructSignature */:
                             error(node, ts.Diagnostics.Construct_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type);
                             break;
-                        case 160 /* CallSignature */:
+                        case 161 /* CallSignature */:
                             error(node, ts.Diagnostics.Call_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type);
                             break;
                     }
@@ -53208,24 +55004,24 @@ var ts;
                             error(returnTypeNode, ts.Diagnostics.A_generator_cannot_have_a_void_type_annotation);
                         }
                         else {
-                            var generatorElementType = getIteratedTypeOfGenerator(returnType, (functionFlags_1 & 2 /* Async */) !== 0) || anyType;
-                            var iterableIteratorInstantiation = functionFlags_1 & 2 /* Async */
-                                ? createAsyncIterableIteratorType(generatorElementType) // AsyncGenerator function
-                                : createIterableIteratorType(generatorElementType); // Generator function
-                            // Naively, one could check that IterableIterator<any> is assignable to the return type annotation.
+                            // Naively, one could check that Generator<any, any, any> is assignable to the return type annotation.
                             // However, that would not catch the error in the following case.
                             //
                             //    interface BadGenerator extends Iterable<number>, Iterator<string> { }
                             //    function* g(): BadGenerator { } // Iterable and Iterator have different types!
                             //
-                            checkTypeAssignableTo(iterableIteratorInstantiation, returnType, returnTypeNode);
+                            var generatorYieldType = getIterationTypeOfGeneratorFunctionReturnType(0 /* Yield */, returnType, (functionFlags_1 & 2 /* Async */) !== 0) || anyType;
+                            var generatorReturnType = getIterationTypeOfGeneratorFunctionReturnType(1 /* Return */, returnType, (functionFlags_1 & 2 /* Async */) !== 0) || generatorYieldType;
+                            var generatorNextType = getIterationTypeOfGeneratorFunctionReturnType(2 /* Next */, returnType, (functionFlags_1 & 2 /* Async */) !== 0) || unknownType;
+                            var generatorInstantiation = createGeneratorReturnType(generatorYieldType, generatorReturnType, generatorNextType, !!(functionFlags_1 & 2 /* Async */));
+                            checkTypeAssignableTo(generatorInstantiation, returnType, returnTypeNode);
                         }
                     }
                     else if ((functionFlags_1 & 3 /* AsyncGenerator */) === 2 /* Async */) {
                         checkAsyncFunctionReturnType(node, returnTypeNode);
                     }
                 }
-                if (node.kind !== 162 /* IndexSignature */ && node.kind !== 294 /* JSDocFunctionType */) {
+                if (node.kind !== 163 /* IndexSignature */ && node.kind !== 295 /* JSDocFunctionType */) {
                     registerForUnusedIdentifiersCheck(node);
                 }
             }
@@ -53242,7 +55038,7 @@ var ts;
             var staticNames = ts.createUnderscoreEscapedMap();
             for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                 var member = _a[_i];
-                if (member.kind === 157 /* Constructor */) {
+                if (member.kind === 158 /* Constructor */) {
                     for (var _b = 0, _c = member.parameters; _b < _c.length; _b++) {
                         var param = _c[_b];
                         if (ts.isParameterPropertyDeclaration(param) && !ts.isBindingPattern(param.name)) {
@@ -53257,16 +55053,16 @@ var ts;
                     var memberName = name && ts.getPropertyNameForPropertyNameNode(name);
                     if (name && memberName) {
                         switch (member.kind) {
-                            case 158 /* GetAccessor */:
+                            case 159 /* GetAccessor */:
                                 addName(names, name, memberName, 1 /* Getter */);
                                 break;
-                            case 159 /* SetAccessor */:
+                            case 160 /* SetAccessor */:
                                 addName(names, name, memberName, 2 /* Setter */);
                                 break;
-                            case 154 /* PropertyDeclaration */:
+                            case 155 /* PropertyDeclaration */:
                                 addName(names, name, memberName, 3 /* Property */);
                                 break;
-                            case 156 /* MethodDeclaration */:
+                            case 157 /* MethodDeclaration */:
                                 addName(names, name, memberName, 4 /* Method */);
                                 break;
                         }
@@ -53329,7 +55125,7 @@ var ts;
             var names = ts.createMap();
             for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                 var member = _a[_i];
-                if (member.kind === 153 /* PropertySignature */) {
+                if (member.kind === 154 /* PropertySignature */) {
                     var memberName = void 0;
                     var name = member.name;
                     switch (name.kind) {
@@ -53337,7 +55133,7 @@ var ts;
                         case 8 /* NumericLiteral */:
                             memberName = name.text;
                             break;
-                        case 72 /* Identifier */:
+                        case 73 /* Identifier */:
                             memberName = ts.idText(name);
                             break;
                         default:
@@ -53354,7 +55150,7 @@ var ts;
             }
         }
         function checkTypeForDuplicateIndexSignatures(node) {
-            if (node.kind === 241 /* InterfaceDeclaration */) {
+            if (node.kind === 242 /* InterfaceDeclaration */) {
                 var nodeSymbol = getSymbolOfNode(node);
                 // in case of merging interface declaration it is possible that we'll enter this check procedure several times for every declaration
                 // to prevent this run check only for the first declaration of a given kind
@@ -53374,7 +55170,7 @@ var ts;
                     var declaration = decl;
                     if (declaration.parameters.length === 1 && declaration.parameters[0].type) {
                         switch (declaration.parameters[0].type.kind) {
-                            case 138 /* StringKeyword */:
+                            case 139 /* StringKeyword */:
                                 if (!seenStringIndexer) {
                                     seenStringIndexer = true;
                                 }
@@ -53382,7 +55178,7 @@ var ts;
                                     error(declaration, ts.Diagnostics.Duplicate_string_index_signature);
                                 }
                                 break;
-                            case 135 /* NumberKeyword */:
+                            case 136 /* NumberKeyword */:
                                 if (!seenNumericIndexer) {
                                     seenNumericIndexer = true;
                                 }
@@ -53409,7 +55205,7 @@ var ts;
             checkFunctionOrMethodDeclaration(node);
             // Abstract methods cannot have an implementation.
             // Extra checks are to avoid reporting multiple errors relating to the "abstractness" of the node.
-            if (ts.hasModifier(node, 128 /* Abstract */) && node.kind === 156 /* MethodDeclaration */ && node.body) {
+            if (ts.hasModifier(node, 128 /* Abstract */) && node.kind === 157 /* MethodDeclaration */ && node.body) {
                 error(node, ts.Diagnostics.Method_0_cannot_have_an_implementation_because_it_is_marked_abstract, ts.declarationNameToString(node.name));
             }
         }
@@ -53434,7 +55230,7 @@ var ts;
                 return;
             }
             function isInstancePropertyWithInitializer(n) {
-                return n.kind === 154 /* PropertyDeclaration */ &&
+                return n.kind === 155 /* PropertyDeclaration */ &&
                     !ts.hasModifier(n, 32 /* Static */) &&
                     !!n.initializer;
             }
@@ -53464,7 +55260,7 @@ var ts;
                         var superCallStatement = void 0;
                         for (var _i = 0, statements_2 = statements; _i < statements_2.length; _i++) {
                             var statement = statements_2[_i];
-                            if (statement.kind === 221 /* ExpressionStatement */ && ts.isSuperCall(statement.expression)) {
+                            if (statement.kind === 222 /* ExpressionStatement */ && ts.isSuperCall(statement.expression)) {
                                 superCallStatement = statement;
                                 break;
                             }
@@ -53489,7 +55285,7 @@ var ts;
                     checkGrammarComputedPropertyName(node.name);
                 checkDecorators(node);
                 checkSignatureDeclaration(node);
-                if (node.kind === 158 /* GetAccessor */) {
+                if (node.kind === 159 /* GetAccessor */) {
                     if (!(node.flags & 4194304 /* Ambient */) && ts.nodeIsPresent(node.body) && (node.flags & 128 /* HasImplicitReturn */)) {
                         if (!(node.flags & 256 /* HasExplicitReturn */)) {
                             error(node.name, ts.Diagnostics.A_get_accessor_must_return_a_value);
@@ -53499,13 +55295,13 @@ var ts;
                 // Do not use hasDynamicName here, because that returns false for well known symbols.
                 // We want to perform checkComputedPropertyName for all computed properties, including
                 // well known symbols.
-                if (node.name.kind === 149 /* ComputedPropertyName */) {
+                if (node.name.kind === 150 /* ComputedPropertyName */) {
                     checkComputedPropertyName(node.name);
                 }
                 if (!hasNonBindableDynamicName(node)) {
                     // TypeScript 1.0 spec (April 2014): 8.4.3
                     // Accessors for the same member name must specify the same accessibility.
-                    var otherKind = node.kind === 158 /* GetAccessor */ ? 159 /* SetAccessor */ : 158 /* GetAccessor */;
+                    var otherKind = node.kind === 159 /* GetAccessor */ ? 160 /* SetAccessor */ : 159 /* GetAccessor */;
                     var otherAccessor = ts.getDeclarationOfKind(getSymbolOfNode(node), otherKind);
                     if (otherAccessor) {
                         var nodeFlags = ts.getModifierFlags(node);
@@ -53523,7 +55319,7 @@ var ts;
                     }
                 }
                 var returnType = getTypeOfAccessors(getSymbolOfNode(node));
-                if (node.kind === 158 /* GetAccessor */) {
+                if (node.kind === 159 /* GetAccessor */) {
                     checkAllCodePathsInNonVoidFunctionReturnOrThrow(node, returnType);
                 }
             }
@@ -53571,7 +55367,7 @@ var ts;
         }
         function checkTypeReferenceNode(node) {
             checkGrammarTypeArguments(node, node.typeArguments);
-            if (node.kind === 164 /* TypeReference */ && node.typeName.jsdocDotPos !== undefined && !ts.isInJSFile(node) && !ts.isInJSDoc(node)) {
+            if (node.kind === 165 /* TypeReference */ && node.typeName.jsdocDotPos !== undefined && !ts.isInJSFile(node) && !ts.isInJSDoc(node)) {
                 grammarErrorAtPos(node, node.typeName.jsdocDotPos, 1, ts.Diagnostics.JSDoc_types_can_only_be_used_inside_documentation_comments);
             }
             var type = getTypeFromTypeReference(node);
@@ -53619,7 +55415,7 @@ var ts;
             var seenOptionalElement = false;
             for (var i = 0; i < elementTypes.length; i++) {
                 var e = elementTypes[i];
-                if (e.kind === 172 /* RestType */) {
+                if (e.kind === 173 /* RestType */) {
                     if (i !== elementTypes.length - 1) {
                         grammarErrorOnNode(e, ts.Diagnostics.A_rest_element_must_be_last_in_a_tuple_type);
                         break;
@@ -53628,7 +55424,7 @@ var ts;
                         error(e, ts.Diagnostics.A_rest_element_type_must_be_an_array_type);
                     }
                 }
-                else if (e.kind === 171 /* OptionalType */) {
+                else if (e.kind === 172 /* OptionalType */) {
                     seenOptionalElement = true;
                 }
                 else if (seenOptionalElement) {
@@ -53649,7 +55445,7 @@ var ts;
             var objectType = type.objectType;
             var indexType = type.indexType;
             if (isTypeAssignableTo(indexType, getIndexType(objectType, /*stringsOnly*/ false))) {
-                if (accessNode.kind === 190 /* ElementAccessExpression */ && ts.isAssignmentTarget(accessNode) &&
+                if (accessNode.kind === 191 /* ElementAccessExpression */ && ts.isAssignmentTarget(accessNode) &&
                     ts.getObjectFlags(objectType) & 32 /* Mapped */ && getMappedTypeModifiers(objectType) & 1 /* IncludeReadonly */) {
                     error(accessNode, ts.Diagnostics.Index_signature_in_type_0_only_permits_reading, typeToString(objectType));
                 }
@@ -53657,11 +55453,22 @@ var ts;
             }
             // Check if we're indexing with a numeric type and if either object or index types
             // is a generic type with a constraint that has a numeric index signature.
-            if (getIndexInfoOfType(getApparentType(objectType), 1 /* Number */) && isTypeAssignableToKind(indexType, 296 /* NumberLike */)) {
+            var apparentObjectType = getApparentType(objectType);
+            if (getIndexInfoOfType(apparentObjectType, 1 /* Number */) && isTypeAssignableToKind(indexType, 296 /* NumberLike */)) {
                 return type;
             }
+            if (isGenericObjectType(objectType)) {
+                var propertyName_1 = getPropertyNameFromIndex(indexType, accessNode);
+                if (propertyName_1) {
+                    var propertySymbol = forEachType(apparentObjectType, function (t) { return getPropertyOfType(t, propertyName_1); });
+                    if (propertySymbol && ts.getDeclarationModifierFlagsFromSymbol(propertySymbol) & 24 /* NonPublicAccessibilityModifier */) {
+                        error(accessNode, ts.Diagnostics.Private_or_protected_member_0_cannot_be_accessed_on_a_type_parameter, ts.unescapeLeadingUnderscores(propertyName_1));
+                        return errorType;
+                    }
+                }
+            }
             error(accessNode, ts.Diagnostics.Type_0_cannot_be_used_to_index_type_1, typeToString(indexType), typeToString(objectType));
-            return type;
+            return errorType;
         }
         function checkIndexedAccessType(node) {
             checkSourceElement(node.objectType);
@@ -53689,7 +55496,7 @@ var ts;
             ts.forEachChild(node, checkSourceElement);
         }
         function checkInferType(node) {
-            if (!ts.findAncestor(node, function (n) { return n.parent && n.parent.kind === 175 /* ConditionalType */ && n.parent.extendsType === n; })) {
+            if (!ts.findAncestor(node, function (n) { return n.parent && n.parent.kind === 176 /* ConditionalType */ && n.parent.extendsType === n; })) {
                 grammarErrorOnNode(node, ts.Diagnostics.infer_declarations_are_only_permitted_in_the_extends_clause_of_a_conditional_type);
             }
             checkSourceElement(node.typeParameter);
@@ -53706,9 +55513,9 @@ var ts;
             var flags = ts.getCombinedModifierFlags(n);
             // children of classes (even ambient classes) should not be marked as ambient or export
             // because those flags have no useful semantics there.
-            if (n.parent.kind !== 241 /* InterfaceDeclaration */ &&
-                n.parent.kind !== 240 /* ClassDeclaration */ &&
-                n.parent.kind !== 209 /* ClassExpression */ &&
+            if (n.parent.kind !== 242 /* InterfaceDeclaration */ &&
+                n.parent.kind !== 241 /* ClassDeclaration */ &&
+                n.parent.kind !== 210 /* ClassExpression */ &&
                 n.flags & 4194304 /* Ambient */) {
                 if (!(flags & 2 /* Ambient */) && !(ts.isModuleBlock(n.parent) && ts.isModuleDeclaration(n.parent.parent) && ts.isGlobalScopeAugmentation(n.parent.parent))) {
                     // It is nested in an ambient context, which means it is automatically exported
@@ -53799,7 +55606,7 @@ var ts;
                         if (node.name && subsequentName &&
                             (ts.isComputedPropertyName(node.name) && ts.isComputedPropertyName(subsequentName) ||
                                 !ts.isComputedPropertyName(node.name) && !ts.isComputedPropertyName(subsequentName) && ts.getEscapedTextOfIdentifierOrLiteral(node.name) === ts.getEscapedTextOfIdentifierOrLiteral(subsequentName))) {
-                            var reportError = (node.kind === 156 /* MethodDeclaration */ || node.kind === 155 /* MethodSignature */) &&
+                            var reportError = (node.kind === 157 /* MethodDeclaration */ || node.kind === 156 /* MethodSignature */) &&
                                 ts.hasModifier(node, 32 /* Static */) !== ts.hasModifier(subsequentNode, 32 /* Static */);
                             // we can get here in two cases
                             // 1. mixed static and instance class members
@@ -53838,7 +55645,7 @@ var ts;
                 var current = declarations_4[_i];
                 var node = current;
                 var inAmbientContext = node.flags & 4194304 /* Ambient */;
-                var inAmbientContextOrInterface = node.parent.kind === 241 /* InterfaceDeclaration */ || node.parent.kind === 168 /* TypeLiteral */ || inAmbientContext;
+                var inAmbientContextOrInterface = node.parent.kind === 242 /* InterfaceDeclaration */ || node.parent.kind === 169 /* TypeLiteral */ || inAmbientContext;
                 if (inAmbientContextOrInterface) {
                     // check if declarations are consecutive only if they are non-ambient
                     // 1. ambient declarations can be interleaved
@@ -53849,7 +55656,7 @@ var ts;
                     // 2. mixing ambient and non-ambient declarations is a separate error that will be reported - do not want to report an extra one
                     previousDeclaration = undefined;
                 }
-                if (node.kind === 239 /* FunctionDeclaration */ || node.kind === 156 /* MethodDeclaration */ || node.kind === 155 /* MethodSignature */ || node.kind === 157 /* Constructor */) {
+                if (node.kind === 240 /* FunctionDeclaration */ || node.kind === 157 /* MethodDeclaration */ || node.kind === 156 /* MethodSignature */ || node.kind === 158 /* Constructor */) {
                     var currentNodeFlags = getEffectiveDeclarationFlags(node, flagsToCheck);
                     someNodeFlags |= currentNodeFlags;
                     allNodeFlags &= currentNodeFlags;
@@ -53904,7 +55711,7 @@ var ts;
                     for (var _a = 0, signatures_6 = signatures; _a < signatures_6.length; _a++) {
                         var signature = signatures_6[_a];
                         if (!isImplementationCompatibleWithOverload(bodySignature, signature)) {
-                            addRelatedInfo(error(signature.declaration, ts.Diagnostics.This_overload_signature_is_not_compatible_with_its_implementation_signature), ts.createDiagnosticForNode(bodyDeclaration, ts.Diagnostics.The_implementation_signature_is_declared_here));
+                            ts.addRelatedInfo(error(signature.declaration, ts.Diagnostics.This_overload_signature_is_not_compatible_with_its_implementation_signature), ts.createDiagnosticForNode(bodyDeclaration, ts.Diagnostics.The_implementation_signature_is_declared_here));
                             break;
                         }
                     }
@@ -53978,22 +55785,22 @@ var ts;
             function getDeclarationSpaces(decl) {
                 var d = decl;
                 switch (d.kind) {
-                    case 241 /* InterfaceDeclaration */:
-                    case 242 /* TypeAliasDeclaration */:
+                    case 242 /* InterfaceDeclaration */:
+                    case 243 /* TypeAliasDeclaration */:
                     // A jsdoc typedef and callback are, by definition, type aliases
-                    case 309 /* JSDocTypedefTag */:
-                    case 302 /* JSDocCallbackTag */:
+                    case 311 /* JSDocTypedefTag */:
+                    case 304 /* JSDocCallbackTag */:
                         return 2 /* ExportType */;
-                    case 244 /* ModuleDeclaration */:
+                    case 245 /* ModuleDeclaration */:
                         return ts.isAmbientModule(d) || ts.getModuleInstanceState(d) !== 0 /* NonInstantiated */
                             ? 4 /* ExportNamespace */ | 1 /* ExportValue */
                             : 4 /* ExportNamespace */;
-                    case 240 /* ClassDeclaration */:
-                    case 243 /* EnumDeclaration */:
+                    case 241 /* ClassDeclaration */:
+                    case 244 /* EnumDeclaration */:
                         return 2 /* ExportType */ | 1 /* ExportValue */;
-                    case 284 /* SourceFile */:
+                    case 285 /* SourceFile */:
                         return 2 /* ExportType */ | 1 /* ExportValue */ | 4 /* ExportNamespace */;
-                    case 254 /* ExportAssignment */:
+                    case 255 /* ExportAssignment */:
                         // Export assigned entity name expressions act as aliases and should fall through, otherwise they export values
                         if (!ts.isEntityNameExpression(d.expression)) {
                             return 1 /* ExportValue */;
@@ -54001,26 +55808,26 @@ var ts;
                         d = d.expression;
                     /* falls through */
                     // The below options all declare an Alias, which is allowed to merge with other values within the importing module
-                    case 248 /* ImportEqualsDeclaration */:
-                    case 251 /* NamespaceImport */:
-                    case 250 /* ImportClause */:
-                        var result_5 = 0 /* None */;
+                    case 249 /* ImportEqualsDeclaration */:
+                    case 252 /* NamespaceImport */:
+                    case 251 /* ImportClause */:
+                        var result_8 = 0 /* None */;
                         var target = resolveAlias(getSymbolOfNode(d));
-                        ts.forEach(target.declarations, function (d) { result_5 |= getDeclarationSpaces(d); });
-                        return result_5;
-                    case 237 /* VariableDeclaration */:
-                    case 186 /* BindingElement */:
-                    case 239 /* FunctionDeclaration */:
-                    case 253 /* ImportSpecifier */: // https://github.com/Microsoft/TypeScript/pull/7591
+                        ts.forEach(target.declarations, function (d) { result_8 |= getDeclarationSpaces(d); });
+                        return result_8;
+                    case 238 /* VariableDeclaration */:
+                    case 187 /* BindingElement */:
+                    case 240 /* FunctionDeclaration */:
+                    case 254 /* ImportSpecifier */: // https://github.com/Microsoft/TypeScript/pull/7591
                         return 1 /* ExportValue */;
                     default:
-                        return ts.Debug.fail(ts.Debug.showSyntaxKind(d));
+                        return ts.Debug.failBadSyntaxKind(d);
                 }
             }
         }
-        function getAwaitedTypeOfPromise(type, errorNode, diagnosticMessage) {
+        function getAwaitedTypeOfPromise(type, errorNode, diagnosticMessage, arg0) {
             var promisedType = getPromisedTypeOfPromise(type, errorNode);
-            return promisedType && getAwaitedType(promisedType, errorNode, diagnosticMessage);
+            return promisedType && getAwaitedType(promisedType, errorNode, diagnosticMessage, arg0);
         }
         /**
          * Gets the "promised type" of a promise.
@@ -54078,10 +55885,14 @@ var ts;
          * Promise-like type; otherwise, it is the type of the expression. This is used to reflect
          * The runtime behavior of the `await` keyword.
          */
-        function checkAwaitedType(type, errorNode, diagnosticMessage) {
-            return getAwaitedType(type, errorNode, diagnosticMessage) || errorType;
+        function checkAwaitedType(type, errorNode, diagnosticMessage, arg0) {
+            var awaitedType = getAwaitedType(type, errorNode, diagnosticMessage, arg0);
+            if (awaitedType === type && !(type.flags & 3 /* AnyOrUnknown */)) {
+                addErrorOrSuggestion(/*isError*/ false, ts.createDiagnosticForNode(errorNode, ts.Diagnostics.await_has_no_effect_on_the_type_of_this_expression));
+            }
+            return awaitedType || errorType;
         }
-        function getAwaitedType(type, errorNode, diagnosticMessage) {
+        function getAwaitedType(type, errorNode, diagnosticMessage, arg0) {
             var typeAsAwaitable = type;
             if (typeAsAwaitable.awaitedTypeOfType) {
                 return typeAsAwaitable.awaitedTypeOfType;
@@ -54093,7 +55904,7 @@ var ts;
                 var types = void 0;
                 for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
                     var constituentType = _a[_i];
-                    types = ts.append(types, getAwaitedType(constituentType, errorNode, diagnosticMessage));
+                    types = ts.append(types, getAwaitedType(constituentType, errorNode, diagnosticMessage, arg0));
                 }
                 if (!types) {
                     return undefined;
@@ -54143,7 +55954,7 @@ var ts;
                 // Keep track of the type we're about to unwrap to avoid bad recursive promise types.
                 // See the comments above for more information.
                 awaitedTypeStack.push(type.id);
-                var awaitedType = getAwaitedType(promisedType, errorNode, diagnosticMessage);
+                var awaitedType = getAwaitedType(promisedType, errorNode, diagnosticMessage, arg0);
                 awaitedTypeStack.pop();
                 if (!awaitedType) {
                     return undefined;
@@ -54170,7 +55981,7 @@ var ts;
                 if (errorNode) {
                     if (!diagnosticMessage)
                         return ts.Debug.fail();
-                    error(errorNode, diagnosticMessage);
+                    error(errorNode, diagnosticMessage, arg0);
                 }
                 return undefined;
             }
@@ -54240,7 +56051,7 @@ var ts;
                 var promiseConstructorSymbol = resolveEntityName(promiseConstructorName, 67220415 /* Value */, /*ignoreErrors*/ true);
                 var promiseConstructorType = promiseConstructorSymbol ? getTypeOfSymbol(promiseConstructorSymbol) : errorType;
                 if (promiseConstructorType === errorType) {
-                    if (promiseConstructorName.kind === 72 /* Identifier */ && promiseConstructorName.escapedText === "Promise" && getTargetType(returnType) === getGlobalPromiseType(/*reportErrors*/ false)) {
+                    if (promiseConstructorName.kind === 73 /* Identifier */ && promiseConstructorName.escapedText === "Promise" && getTargetType(returnType) === getGlobalPromiseType(/*reportErrors*/ false)) {
                         error(returnTypeNode, ts.Diagnostics.An_async_function_or_method_in_ES5_SlashES3_requires_the_Promise_constructor_Make_sure_you_have_a_declaration_for_the_Promise_constructor_or_include_ES2015_in_your_lib_option);
                     }
                     else {
@@ -54279,24 +56090,24 @@ var ts;
             var headMessage = getDiagnosticHeadMessageForDecoratorResolution(node);
             var errorInfo;
             switch (node.parent.kind) {
-                case 240 /* ClassDeclaration */:
+                case 241 /* ClassDeclaration */:
                     var classSymbol = getSymbolOfNode(node.parent);
                     var classConstructorType = getTypeOfSymbol(classSymbol);
                     expectedReturnType = getUnionType([classConstructorType, voidType]);
                     break;
-                case 151 /* Parameter */:
+                case 152 /* Parameter */:
                     expectedReturnType = voidType;
                     errorInfo = ts.chainDiagnosticMessages(
                     /*details*/ undefined, ts.Diagnostics.The_return_type_of_a_parameter_decorator_function_must_be_either_void_or_any);
                     break;
-                case 154 /* PropertyDeclaration */:
+                case 155 /* PropertyDeclaration */:
                     expectedReturnType = voidType;
                     errorInfo = ts.chainDiagnosticMessages(
                     /*details*/ undefined, ts.Diagnostics.The_return_type_of_a_property_decorator_function_must_be_either_void_or_any);
                     break;
-                case 156 /* MethodDeclaration */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 157 /* MethodDeclaration */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     var methodType = getTypeOfNode(node.parent);
                     var descriptorType = createTypedPropertyDescriptorType(methodType);
                     expectedReturnType = getUnionType([descriptorType, voidType]);
@@ -54317,7 +56128,7 @@ var ts;
             if (!typeName)
                 return;
             var rootName = getFirstIdentifier(typeName);
-            var meaning = (typeName.kind === 72 /* Identifier */ ? 67897832 /* Type */ : 1920 /* Namespace */) | 2097152 /* Alias */;
+            var meaning = (typeName.kind === 73 /* Identifier */ ? 67897832 /* Type */ : 1920 /* Namespace */) | 2097152 /* Alias */;
             var rootSymbol = resolveName(rootName, rootName.escapedText, meaning, /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined, /*isRefernce*/ true);
             if (rootSymbol
                 && rootSymbol.flags & 2097152 /* Alias */
@@ -54342,14 +56153,14 @@ var ts;
         function getEntityNameForDecoratorMetadata(node) {
             if (node) {
                 switch (node.kind) {
-                    case 174 /* IntersectionType */:
-                    case 173 /* UnionType */:
+                    case 175 /* IntersectionType */:
+                    case 174 /* UnionType */:
                         return getEntityNameForDecoratorMetadataFromTypeList(node.types);
-                    case 175 /* ConditionalType */:
+                    case 176 /* ConditionalType */:
                         return getEntityNameForDecoratorMetadataFromTypeList([node.trueType, node.falseType]);
-                    case 177 /* ParenthesizedType */:
+                    case 178 /* ParenthesizedType */:
                         return getEntityNameForDecoratorMetadata(node.type);
-                    case 164 /* TypeReference */:
+                    case 165 /* TypeReference */:
                         return node.typeName;
                 }
             }
@@ -54358,13 +56169,13 @@ var ts;
             var commonEntityName;
             for (var _i = 0, types_17 = types; _i < types_17.length; _i++) {
                 var typeNode = types_17[_i];
-                while (typeNode.kind === 177 /* ParenthesizedType */) {
+                while (typeNode.kind === 178 /* ParenthesizedType */) {
                     typeNode = typeNode.type; // Skip parens if need be
                 }
-                if (typeNode.kind === 132 /* NeverKeyword */) {
+                if (typeNode.kind === 133 /* NeverKeyword */) {
                     continue; // Always elide `never` from the union/intersection if possible
                 }
-                if (!strictNullChecks && (typeNode.kind === 96 /* NullKeyword */ || typeNode.kind === 141 /* UndefinedKeyword */)) {
+                if (!strictNullChecks && (typeNode.kind === 97 /* NullKeyword */ || typeNode.kind === 142 /* UndefinedKeyword */)) {
                     continue; // Elide null and undefined from unions for metadata, just like what we did prior to the implementation of strict null checks
                 }
                 var individualEntityName = getEntityNameForDecoratorMetadata(typeNode);
@@ -54406,18 +56217,18 @@ var ts;
                 return;
             }
             if (!compilerOptions.experimentalDecorators) {
-                error(node, ts.Diagnostics.Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_to_remove_this_warning);
+                error(node, ts.Diagnostics.Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_in_your_tsconfig_or_jsconfig_to_remove_this_warning);
             }
             var firstDecorator = node.decorators[0];
             checkExternalEmitHelpers(firstDecorator, 8 /* Decorate */);
-            if (node.kind === 151 /* Parameter */) {
+            if (node.kind === 152 /* Parameter */) {
                 checkExternalEmitHelpers(firstDecorator, 32 /* Param */);
             }
             if (compilerOptions.emitDecoratorMetadata) {
                 checkExternalEmitHelpers(firstDecorator, 16 /* Metadata */);
                 // we only need to perform these checks if we are emitting serialized type metadata for the target of a decorator.
                 switch (node.kind) {
-                    case 240 /* ClassDeclaration */:
+                    case 241 /* ClassDeclaration */:
                         var constructor = ts.getFirstConstructorWithBody(node);
                         if (constructor) {
                             for (var _i = 0, _a = constructor.parameters; _i < _a.length; _i++) {
@@ -54426,23 +56237,23 @@ var ts;
                             }
                         }
                         break;
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
-                        var otherKind = node.kind === 158 /* GetAccessor */ ? 159 /* SetAccessor */ : 158 /* GetAccessor */;
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
+                        var otherKind = node.kind === 159 /* GetAccessor */ ? 160 /* SetAccessor */ : 159 /* GetAccessor */;
                         var otherAccessor = ts.getDeclarationOfKind(getSymbolOfNode(node), otherKind);
                         markDecoratorMedataDataTypeNodeAsReferenced(getAnnotatedAccessorTypeNode(node) || otherAccessor && getAnnotatedAccessorTypeNode(otherAccessor));
                         break;
-                    case 156 /* MethodDeclaration */:
+                    case 157 /* MethodDeclaration */:
                         for (var _b = 0, _c = node.parameters; _b < _c.length; _b++) {
                             var parameter = _c[_b];
                             markDecoratorMedataDataTypeNodeAsReferenced(getParameterTypeNodeForDecoratorCheck(parameter));
                         }
                         markDecoratorMedataDataTypeNodeAsReferenced(ts.getEffectiveReturnTypeNode(node));
                         break;
-                    case 154 /* PropertyDeclaration */:
+                    case 155 /* PropertyDeclaration */:
                         markDecoratorMedataDataTypeNodeAsReferenced(ts.getEffectiveTypeAnnotationNode(node));
                         break;
-                    case 151 /* Parameter */:
+                    case 152 /* Parameter */:
                         markDecoratorMedataDataTypeNodeAsReferenced(getParameterTypeNodeForDecoratorCheck(node));
                         var containingSignature = node.parent;
                         for (var _d = 0, _e = containingSignature.parameters; _d < _e.length; _d++) {
@@ -54505,7 +56316,7 @@ var ts;
                     else if (ts.findLast(ts.getJSDocTags(decl), ts.isJSDocParameterTag) === node &&
                         node.typeExpression && node.typeExpression.type &&
                         !isArrayType(getTypeFromTypeNode(node.typeExpression.type))) {
-                        error(node.name, ts.Diagnostics.JSDoc_param_tag_has_name_0_but_there_is_no_parameter_with_that_name_It_would_match_arguments_if_it_had_an_array_type, ts.idText(node.name.kind === 148 /* QualifiedName */ ? node.name.right : node.name));
+                        error(node.name, ts.Diagnostics.JSDoc_param_tag_has_name_0_but_there_is_no_parameter_with_that_name_It_would_match_arguments_if_it_had_an_array_type, ts.idText(node.name.kind === 149 /* QualifiedName */ ? node.name.right : node.name));
                     }
                 }
             }
@@ -54538,9 +56349,9 @@ var ts;
         }
         function getIdentifierFromEntityNameExpression(node) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return node;
-                case 189 /* PropertyAccessExpression */:
+                case 190 /* PropertyAccessExpression */:
                     return node.name;
                 default:
                     return undefined;
@@ -54553,7 +56364,7 @@ var ts;
             // Do not use hasDynamicName here, because that returns false for well known symbols.
             // We want to perform checkComputedPropertyName for all computed properties, including
             // well known symbols.
-            if (node.name && node.name.kind === 149 /* ComputedPropertyName */) {
+            if (node.name && node.name.kind === 150 /* ComputedPropertyName */) {
                 // This check will account for methods in class/interface declarations,
                 // as well as accessors in classes/object literals
                 checkComputedPropertyName(node.name);
@@ -54582,12 +56393,9 @@ var ts;
                     }
                 }
             }
-            var body = node.kind === 155 /* MethodSignature */ ? undefined : node.body;
+            var body = node.kind === 156 /* MethodSignature */ ? undefined : node.body;
             checkSourceElement(body);
-            if ((functionFlags & 1 /* Generator */) === 0) { // Async function or normal function
-                var returnOrPromisedType = getReturnOrPromisedType(node, functionFlags);
-                checkAllCodePathsInNonVoidFunctionReturnOrThrow(node, returnOrPromisedType);
-            }
+            checkAllCodePathsInNonVoidFunctionReturnOrThrow(node, getReturnTypeFromAnnotation(node));
             if (produceDiagnostics && !ts.getEffectiveReturnTypeNode(node)) {
                 // Report an implicit any error if there is no body, no explicit return type, and node is not a private method
                 // in an ambient context
@@ -54627,42 +56435,42 @@ var ts;
             for (var _i = 0, potentiallyUnusedIdentifiers_1 = potentiallyUnusedIdentifiers; _i < potentiallyUnusedIdentifiers_1.length; _i++) {
                 var node = potentiallyUnusedIdentifiers_1[_i];
                 switch (node.kind) {
-                    case 240 /* ClassDeclaration */:
-                    case 209 /* ClassExpression */:
+                    case 241 /* ClassDeclaration */:
+                    case 210 /* ClassExpression */:
                         checkUnusedClassMembers(node, addDiagnostic);
                         checkUnusedTypeParameters(node, addDiagnostic);
                         break;
-                    case 284 /* SourceFile */:
-                    case 244 /* ModuleDeclaration */:
-                    case 218 /* Block */:
-                    case 246 /* CaseBlock */:
-                    case 225 /* ForStatement */:
-                    case 226 /* ForInStatement */:
-                    case 227 /* ForOfStatement */:
+                    case 285 /* SourceFile */:
+                    case 245 /* ModuleDeclaration */:
+                    case 219 /* Block */:
+                    case 247 /* CaseBlock */:
+                    case 226 /* ForStatement */:
+                    case 227 /* ForInStatement */:
+                    case 228 /* ForOfStatement */:
                         checkUnusedLocalsAndParameters(node, addDiagnostic);
                         break;
-                    case 157 /* Constructor */:
-                    case 196 /* FunctionExpression */:
-                    case 239 /* FunctionDeclaration */:
-                    case 197 /* ArrowFunction */:
-                    case 156 /* MethodDeclaration */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
+                    case 158 /* Constructor */:
+                    case 197 /* FunctionExpression */:
+                    case 240 /* FunctionDeclaration */:
+                    case 198 /* ArrowFunction */:
+                    case 157 /* MethodDeclaration */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
                         if (node.body) { // Don't report unused parameters in overloads
                             checkUnusedLocalsAndParameters(node, addDiagnostic);
                         }
                         checkUnusedTypeParameters(node, addDiagnostic);
                         break;
-                    case 155 /* MethodSignature */:
-                    case 160 /* CallSignature */:
-                    case 161 /* ConstructSignature */:
-                    case 165 /* FunctionType */:
-                    case 166 /* ConstructorType */:
-                    case 242 /* TypeAliasDeclaration */:
-                    case 241 /* InterfaceDeclaration */:
+                    case 156 /* MethodSignature */:
+                    case 161 /* CallSignature */:
+                    case 162 /* ConstructSignature */:
+                    case 166 /* FunctionType */:
+                    case 167 /* ConstructorType */:
+                    case 243 /* TypeAliasDeclaration */:
+                    case 242 /* InterfaceDeclaration */:
                         checkUnusedTypeParameters(node, addDiagnostic);
                         break;
-                    case 176 /* InferType */:
+                    case 177 /* InferType */:
                         checkUnusedInferTypeParameter(node, addDiagnostic);
                         break;
                     default:
@@ -54682,11 +56490,11 @@ var ts;
             for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                 var member = _a[_i];
                 switch (member.kind) {
-                    case 156 /* MethodDeclaration */:
-                    case 154 /* PropertyDeclaration */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
-                        if (member.kind === 159 /* SetAccessor */ && member.symbol.flags & 32768 /* GetAccessor */) {
+                    case 157 /* MethodDeclaration */:
+                    case 155 /* PropertyDeclaration */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
+                        if (member.kind === 160 /* SetAccessor */ && member.symbol.flags & 32768 /* GetAccessor */) {
                             // Already would have reported an error on the getter.
                             break;
                         }
@@ -54695,7 +56503,7 @@ var ts;
                             addDiagnostic(member, 0 /* Local */, ts.createDiagnosticForNode(member.name, ts.Diagnostics._0_is_declared_but_its_value_is_never_read, symbolToString(symbol)));
                         }
                         break;
-                    case 157 /* Constructor */:
+                    case 158 /* Constructor */:
                         for (var _b = 0, _c = member.parameters; _b < _c.length; _b++) {
                             var parameter = _c[_b];
                             if (!parameter.symbol.isReferenced && ts.hasModifier(parameter, 8 /* Private */)) {
@@ -54703,8 +56511,8 @@ var ts;
                             }
                         }
                         break;
-                    case 162 /* IndexSignature */:
-                    case 217 /* SemicolonClassElement */:
+                    case 163 /* IndexSignature */:
+                    case 218 /* SemicolonClassElement */:
                         // Can't be private
                         break;
                     default:
@@ -54731,7 +56539,7 @@ var ts;
                     continue;
                 var name = ts.idText(typeParameter.name);
                 var parent = typeParameter.parent;
-                if (parent.kind !== 176 /* InferType */ && parent.typeParameters.every(isTypeParameterUnused)) {
+                if (parent.kind !== 177 /* InferType */ && parent.typeParameters.every(isTypeParameterUnused)) {
                     if (seenParentsWithEveryUnused.tryAdd(parent)) {
                         var range = ts.isJSDocTemplateTag(parent)
                             // Whole @template tag
@@ -54816,7 +56624,7 @@ var ts;
                 var importDecl = importClause.parent;
                 var nDeclarations = (importClause.name ? 1 : 0) +
                     (importClause.namedBindings ?
-                        (importClause.namedBindings.kind === 251 /* NamespaceImport */ ? 1 : importClause.namedBindings.elements.length)
+                        (importClause.namedBindings.kind === 252 /* NamespaceImport */ ? 1 : importClause.namedBindings.elements.length)
                         : 0);
                 if (nDeclarations === unuseds.length) {
                     addDiagnostic(importDecl, 0 /* Local */, unuseds.length === 1
@@ -54834,7 +56642,7 @@ var ts;
                 var bindingPattern = _a[0], bindingElements = _a[1];
                 var kind = tryGetRootParameterDeclaration(bindingPattern.parent) ? 1 /* Parameter */ : 0 /* Local */;
                 if (bindingPattern.elements.length === bindingElements.length) {
-                    if (bindingElements.length === 1 && bindingPattern.parent.kind === 237 /* VariableDeclaration */ && bindingPattern.parent.parent.kind === 238 /* VariableDeclarationList */) {
+                    if (bindingElements.length === 1 && bindingPattern.parent.kind === 238 /* VariableDeclaration */ && bindingPattern.parent.parent.kind === 239 /* VariableDeclarationList */) {
                         addToGroup(unusedVariables, bindingPattern.parent.parent, bindingPattern.parent, getNodeId);
                     }
                     else {
@@ -54855,7 +56663,7 @@ var ts;
                 if (declarationList.declarations.length === declarations.length) {
                     addDiagnostic(declarationList, 0 /* Local */, declarations.length === 1
                         ? ts.createDiagnosticForNode(ts.first(declarations).name, ts.Diagnostics._0_is_declared_but_its_value_is_never_read, bindingNameText(ts.first(declarations).name))
-                        : ts.createDiagnosticForNode(declarationList.parent.kind === 219 /* VariableStatement */ ? declarationList.parent : declarationList, ts.Diagnostics.All_variables_are_unused));
+                        : ts.createDiagnosticForNode(declarationList.parent.kind === 220 /* VariableStatement */ ? declarationList.parent : declarationList, ts.Diagnostics.All_variables_are_unused));
                 }
                 else {
                     for (var _i = 0, declarations_5 = declarations; _i < declarations_5.length; _i++) {
@@ -54867,24 +56675,24 @@ var ts;
         }
         function bindingNameText(name) {
             switch (name.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return ts.idText(name);
-                case 185 /* ArrayBindingPattern */:
-                case 184 /* ObjectBindingPattern */:
+                case 186 /* ArrayBindingPattern */:
+                case 185 /* ObjectBindingPattern */:
                     return bindingNameText(ts.cast(ts.first(name.elements), ts.isBindingElement).name);
                 default:
                     return ts.Debug.assertNever(name);
             }
         }
         function isImportedDeclaration(node) {
-            return node.kind === 250 /* ImportClause */ || node.kind === 253 /* ImportSpecifier */ || node.kind === 251 /* NamespaceImport */;
+            return node.kind === 251 /* ImportClause */ || node.kind === 254 /* ImportSpecifier */ || node.kind === 252 /* NamespaceImport */;
         }
         function importClauseFromImported(decl) {
-            return decl.kind === 250 /* ImportClause */ ? decl : decl.kind === 251 /* NamespaceImport */ ? decl.parent : decl.parent.parent;
+            return decl.kind === 251 /* ImportClause */ ? decl : decl.kind === 252 /* NamespaceImport */ ? decl.parent : decl.parent.parent;
         }
         function checkBlock(node) {
             // Grammar checking for SyntaxKind.Block
-            if (node.kind === 218 /* Block */) {
+            if (node.kind === 219 /* Block */) {
                 checkGrammarStatementInAmbientContext(node);
             }
             if (ts.isFunctionOrModuleBlock(node)) {
@@ -54914,12 +56722,12 @@ var ts;
             if (!(identifier && identifier.escapedText === name)) {
                 return false;
             }
-            if (node.kind === 154 /* PropertyDeclaration */ ||
-                node.kind === 153 /* PropertySignature */ ||
-                node.kind === 156 /* MethodDeclaration */ ||
-                node.kind === 155 /* MethodSignature */ ||
-                node.kind === 158 /* GetAccessor */ ||
-                node.kind === 159 /* SetAccessor */) {
+            if (node.kind === 155 /* PropertyDeclaration */ ||
+                node.kind === 154 /* PropertySignature */ ||
+                node.kind === 157 /* MethodDeclaration */ ||
+                node.kind === 156 /* MethodSignature */ ||
+                node.kind === 159 /* GetAccessor */ ||
+                node.kind === 160 /* SetAccessor */) {
                 // it is ok to have member named '_super' or '_this' - member access is always qualified
                 return false;
             }
@@ -54928,7 +56736,7 @@ var ts;
                 return false;
             }
             var root = ts.getRootDeclaration(node);
-            if (root.kind === 151 /* Parameter */ && ts.nodeIsMissing(root.parent.body)) {
+            if (root.kind === 152 /* Parameter */ && ts.nodeIsMissing(root.parent.body)) {
                 // just an overload - no codegen impact
                 return false;
             }
@@ -54938,7 +56746,7 @@ var ts;
         function checkIfThisIsCapturedInEnclosingScope(node) {
             ts.findAncestor(node, function (current) {
                 if (getNodeCheckFlags(current) & 4 /* CaptureThis */) {
-                    var isDeclaration_1 = node.kind !== 72 /* Identifier */;
+                    var isDeclaration_1 = node.kind !== 73 /* Identifier */;
                     if (isDeclaration_1) {
                         error(ts.getNameOfDeclaration(node), ts.Diagnostics.Duplicate_identifier_this_Compiler_uses_variable_declaration_this_to_capture_this_reference);
                     }
@@ -54953,7 +56761,7 @@ var ts;
         function checkIfNewTargetIsCapturedInEnclosingScope(node) {
             ts.findAncestor(node, function (current) {
                 if (getNodeCheckFlags(current) & 8 /* CaptureNewTarget */) {
-                    var isDeclaration_2 = node.kind !== 72 /* Identifier */;
+                    var isDeclaration_2 = node.kind !== 73 /* Identifier */;
                     if (isDeclaration_2) {
                         error(ts.getNameOfDeclaration(node), ts.Diagnostics.Duplicate_identifier_newTarget_Compiler_uses_variable_declaration_newTarget_to_capture_new_target_meta_property_reference);
                     }
@@ -54979,7 +56787,7 @@ var ts;
             }
             // In case of variable declaration, node.parent is variable statement so look at the variable statement's parent
             var parent = getDeclarationContainer(node);
-            if (parent.kind === 284 /* SourceFile */ && ts.isExternalOrCommonJsModule(parent)) {
+            if (parent.kind === 285 /* SourceFile */ && ts.isExternalOrCommonJsModule(parent)) {
                 // If the declaration happens to be in external module, report error that require and exports are reserved keywords
                 error(name, ts.Diagnostics.Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module, ts.declarationNameToString(name), ts.declarationNameToString(name));
             }
@@ -54994,7 +56802,7 @@ var ts;
             }
             // In case of variable declaration, node.parent is variable statement so look at the variable statement's parent
             var parent = getDeclarationContainer(node);
-            if (parent.kind === 284 /* SourceFile */ && ts.isExternalOrCommonJsModule(parent) && parent.flags & 1024 /* HasAsyncFunctions */) {
+            if (parent.kind === 285 /* SourceFile */ && ts.isExternalOrCommonJsModule(parent) && parent.flags & 1024 /* HasAsyncFunctions */) {
                 // If the declaration happens to be in external module, report error that Promise is a reserved identifier.
                 error(name, ts.Diagnostics.Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module_containing_async_functions, ts.declarationNameToString(name), ts.declarationNameToString(name));
             }
@@ -55029,7 +56837,7 @@ var ts;
             // skip variable declarations that don't have initializers
             // NOTE: in ES6 spec initializer is required in variable declarations where name is binding pattern
             // so we'll always treat binding elements as initialized
-            if (node.kind === 237 /* VariableDeclaration */ && !node.initializer) {
+            if (node.kind === 238 /* VariableDeclaration */ && !node.initializer) {
                 return;
             }
             var symbol = getSymbolOfNode(node);
@@ -55041,17 +56849,17 @@ var ts;
                     localDeclarationSymbol !== symbol &&
                     localDeclarationSymbol.flags & 2 /* BlockScopedVariable */) {
                     if (getDeclarationNodeFlagsFromSymbol(localDeclarationSymbol) & 3 /* BlockScoped */) {
-                        var varDeclList = ts.getAncestor(localDeclarationSymbol.valueDeclaration, 238 /* VariableDeclarationList */);
-                        var container = varDeclList.parent.kind === 219 /* VariableStatement */ && varDeclList.parent.parent
+                        var varDeclList = ts.getAncestor(localDeclarationSymbol.valueDeclaration, 239 /* VariableDeclarationList */);
+                        var container = varDeclList.parent.kind === 220 /* VariableStatement */ && varDeclList.parent.parent
                             ? varDeclList.parent.parent
                             : undefined;
                         // names of block-scoped and function scoped variables can collide only
                         // if block scoped variable is defined in the function\module\source file scope (because of variable hoisting)
                         var namesShareScope = container &&
-                            (container.kind === 218 /* Block */ && ts.isFunctionLike(container.parent) ||
-                                container.kind === 245 /* ModuleBlock */ ||
-                                container.kind === 244 /* ModuleDeclaration */ ||
-                                container.kind === 284 /* SourceFile */);
+                            (container.kind === 219 /* Block */ && ts.isFunctionLike(container.parent) ||
+                                container.kind === 246 /* ModuleBlock */ ||
+                                container.kind === 245 /* ModuleDeclaration */ ||
+                                container.kind === 285 /* SourceFile */);
                         // here we know that function scoped variable is shadowed by block scoped one
                         // if they are defined in the same scope - binder has already reported redeclaration error
                         // otherwise if variable has an initializer - show error that initialization will fail
@@ -55064,69 +56872,6 @@ var ts;
                 }
             }
         }
-        // Check that a parameter initializer contains no references to parameters declared to the right of itself
-        function checkParameterInitializer(node) {
-            if (ts.getRootDeclaration(node).kind !== 151 /* Parameter */) {
-                return;
-            }
-            var func = ts.getContainingFunction(node);
-            visit(node.initializer);
-            function visit(n) {
-                if (ts.isTypeNode(n) || ts.isDeclarationName(n)) {
-                    // do not dive in types
-                    // skip declaration names (i.e. in object literal expressions)
-                    return;
-                }
-                if (n.kind === 189 /* PropertyAccessExpression */) {
-                    // skip property names in property access expression
-                    return visit(n.expression);
-                }
-                else if (n.kind === 72 /* Identifier */) {
-                    // check FunctionLikeDeclaration.locals (stores parameters\function local variable)
-                    // if it contains entry with a specified name
-                    var symbol = resolveName(n, n.escapedText, 67220415 /* Value */ | 2097152 /* Alias */, /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined, /*isUse*/ false);
-                    if (!symbol || symbol === unknownSymbol || !symbol.valueDeclaration) {
-                        return;
-                    }
-                    if (symbol.valueDeclaration === node) {
-                        error(n, ts.Diagnostics.Parameter_0_cannot_be_referenced_in_its_initializer, ts.declarationNameToString(node.name));
-                        return;
-                    }
-                    // locals map for function contain both parameters and function locals
-                    // so we need to do a bit of extra work to check if reference is legal
-                    var enclosingContainer = ts.getEnclosingBlockScopeContainer(symbol.valueDeclaration);
-                    if (enclosingContainer === func) {
-                        if (symbol.valueDeclaration.kind === 151 /* Parameter */ ||
-                            symbol.valueDeclaration.kind === 186 /* BindingElement */) {
-                            // it is ok to reference parameter in initializer if either
-                            // - parameter is located strictly on the left of current parameter declaration
-                            if (symbol.valueDeclaration.pos < node.pos) {
-                                return;
-                            }
-                            // - parameter is wrapped in function-like entity
-                            if (ts.findAncestor(n, function (current) {
-                                if (current === node.initializer) {
-                                    return "quit";
-                                }
-                                return ts.isFunctionLike(current.parent) ||
-                                    // computed property names/initializers in instance property declaration of class like entities
-                                    // are executed in constructor and thus deferred
-                                    (current.parent.kind === 154 /* PropertyDeclaration */ &&
-                                        !(ts.hasModifier(current.parent, 32 /* Static */)) &&
-                                        ts.isClassLike(current.parent.parent));
-                            })) {
-                                return;
-                            }
-                            // fall through to report error
-                        }
-                        error(n, ts.Diagnostics.Initializer_of_parameter_0_cannot_reference_identifier_1_declared_after_it, ts.declarationNameToString(node.name), ts.declarationNameToString(n));
-                    }
-                }
-                else {
-                    return ts.forEachChild(n, visit);
-                }
-            }
-        }
         function convertAutoToAny(type) {
             return type === autoType ? anyType : type === autoArrayType ? anyArrayType : type;
         }
@@ -55144,18 +56889,18 @@ var ts;
             // Do not use hasDynamicName here, because that returns false for well known symbols.
             // We want to perform checkComputedPropertyName for all computed properties, including
             // well known symbols.
-            if (node.name.kind === 149 /* ComputedPropertyName */) {
+            if (node.name.kind === 150 /* ComputedPropertyName */) {
                 checkComputedPropertyName(node.name);
                 if (node.initializer) {
                     checkExpressionCached(node.initializer);
                 }
             }
-            if (node.kind === 186 /* BindingElement */) {
-                if (node.parent.kind === 184 /* ObjectBindingPattern */ && languageVersion < 7 /* ESNext */) {
+            if (node.kind === 187 /* BindingElement */) {
+                if (node.parent.kind === 185 /* ObjectBindingPattern */ && languageVersion < 99 /* ESNext */) {
                     checkExternalEmitHelpers(node, 4 /* Rest */);
                 }
                 // check computed properties inside property names of binding elements
-                if (node.propertyName && node.propertyName.kind === 149 /* ComputedPropertyName */) {
+                if (node.propertyName && node.propertyName.kind === 150 /* ComputedPropertyName */) {
                     checkComputedPropertyName(node.propertyName);
                 }
                 // check private/protected variable access
@@ -55169,35 +56914,48 @@ var ts;
                         var property = getPropertyOfType(parentType, nameText);
                         if (property) {
                             markPropertyAsReferenced(property, /*nodeForCheckWriteOnly*/ undefined, /*isThisAccess*/ false); // A destructuring is never a write-only reference.
-                            checkPropertyAccessibility(parent, !!parent.initializer && parent.initializer.kind === 98 /* SuperKeyword */, parentType, property);
+                            checkPropertyAccessibility(parent, !!parent.initializer && parent.initializer.kind === 99 /* SuperKeyword */, parentType, property);
                         }
                     }
                 }
             }
             // For a binding pattern, check contained binding elements
             if (ts.isBindingPattern(node.name)) {
-                if (node.name.kind === 185 /* ArrayBindingPattern */ && languageVersion < 2 /* ES2015 */ && compilerOptions.downlevelIteration) {
+                if (node.name.kind === 186 /* ArrayBindingPattern */ && languageVersion < 2 /* ES2015 */ && compilerOptions.downlevelIteration) {
                     checkExternalEmitHelpers(node, 512 /* Read */);
                 }
                 ts.forEach(node.name.elements, checkSourceElement);
             }
             // For a parameter declaration with an initializer, error and exit if the containing function doesn't have a body
-            if (node.initializer && ts.getRootDeclaration(node).kind === 151 /* Parameter */ && ts.nodeIsMissing(ts.getContainingFunction(node).body)) {
+            if (node.initializer && ts.getRootDeclaration(node).kind === 152 /* Parameter */ && ts.nodeIsMissing(ts.getContainingFunction(node).body)) {
                 error(node, ts.Diagnostics.A_parameter_initializer_is_only_allowed_in_a_function_or_constructor_implementation);
                 return;
             }
             // For a binding pattern, validate the initializer and exit
             if (ts.isBindingPattern(node.name)) {
-                // Don't validate for-in initializer as it is already an error
-                if (node.initializer && node.parent.parent.kind !== 226 /* ForInStatement */) {
-                    var initializerType = checkExpressionCached(node.initializer);
-                    if (strictNullChecks && node.name.elements.length === 0) {
-                        checkNonNullType(initializerType, node);
+                var needCheckInitializer = node.initializer && node.parent.parent.kind !== 227 /* ForInStatement */;
+                var needCheckWidenedType = node.name.elements.length === 0;
+                if (needCheckInitializer || needCheckWidenedType) {
+                    // Don't validate for-in initializer as it is already an error
+                    var widenedType = getWidenedTypeForVariableLikeDeclaration(node);
+                    if (needCheckInitializer) {
+                        var initializerType = checkExpressionCached(node.initializer);
+                        if (strictNullChecks && needCheckWidenedType) {
+                            checkNonNullNonVoidType(initializerType, node);
+                        }
+                        else {
+                            checkTypeAssignableToAndOptionallyElaborate(initializerType, getWidenedTypeForVariableLikeDeclaration(node), node, node.initializer);
+                        }
                     }
-                    else {
-                        checkTypeAssignableToAndOptionallyElaborate(initializerType, getWidenedTypeForVariableLikeDeclaration(node), node, node.initializer);
+                    // check the binding pattern with empty elements
+                    if (needCheckWidenedType) {
+                        if (ts.isArrayBindingPattern(node.name)) {
+                            checkIteratedTypeOrElementType(65 /* Destructuring */, widenedType, undefinedType, node);
+                        }
+                        else if (strictNullChecks) {
+                            checkNonNullNonVoidType(widenedType, node);
+                        }
                     }
-                    checkParameterInitializer(node);
                 }
                 return;
             }
@@ -55212,9 +56970,8 @@ var ts;
                         ts.isObjectLiteralExpression(initializer) &&
                         (initializer.properties.length === 0 || ts.isPrototypeAccess(node.name)) &&
                         ts.hasEntries(symbol.exports);
-                    if (!isJSObjectLiteralInitializer && node.parent.parent.kind !== 226 /* ForInStatement */) {
+                    if (!isJSObjectLiteralInitializer && node.parent.parent.kind !== 227 /* ForInStatement */) {
                         checkTypeAssignableToAndOptionallyElaborate(checkExpressionCached(initializer), type, node, initializer, /*headMessage*/ undefined);
-                        checkParameterInitializer(node);
                     }
                 }
                 if (symbol.declarations.length > 1) {
@@ -55230,7 +56987,7 @@ var ts;
                 if (type !== errorType && declarationType !== errorType &&
                     !isTypeIdenticalTo(type, declarationType) &&
                     !(symbol.flags & 67108864 /* Assignment */)) {
-                    errorNextVariableOrPropertyDeclarationMustHaveSameType(type, node, declarationType);
+                    errorNextVariableOrPropertyDeclarationMustHaveSameType(symbol.valueDeclaration, type, node, declarationType);
                 }
                 if (node.initializer) {
                     checkTypeAssignableToAndOptionallyElaborate(checkExpressionCached(node.initializer), declarationType, node, node.initializer, /*headMessage*/ undefined);
@@ -55239,26 +56996,30 @@ var ts;
                     error(node.name, ts.Diagnostics.All_declarations_of_0_must_have_identical_modifiers, ts.declarationNameToString(node.name));
                 }
             }
-            if (node.kind !== 154 /* PropertyDeclaration */ && node.kind !== 153 /* PropertySignature */) {
+            if (node.kind !== 155 /* PropertyDeclaration */ && node.kind !== 154 /* PropertySignature */) {
                 // We know we don't have a binding pattern or computed name here
                 checkExportsOnMergedDeclarations(node);
-                if (node.kind === 237 /* VariableDeclaration */ || node.kind === 186 /* BindingElement */) {
+                if (node.kind === 238 /* VariableDeclaration */ || node.kind === 187 /* BindingElement */) {
                     checkVarDeclaredNamesNotShadowed(node);
                 }
                 checkCollisionWithRequireExportsInGeneratedCode(node, node.name);
                 checkCollisionWithGlobalPromiseInGeneratedCode(node, node.name);
             }
         }
-        function errorNextVariableOrPropertyDeclarationMustHaveSameType(firstType, nextDeclaration, nextType) {
+        function errorNextVariableOrPropertyDeclarationMustHaveSameType(firstDeclaration, firstType, nextDeclaration, nextType) {
             var nextDeclarationName = ts.getNameOfDeclaration(nextDeclaration);
-            var message = nextDeclaration.kind === 154 /* PropertyDeclaration */ || nextDeclaration.kind === 153 /* PropertySignature */
+            var message = nextDeclaration.kind === 155 /* PropertyDeclaration */ || nextDeclaration.kind === 154 /* PropertySignature */
                 ? ts.Diagnostics.Subsequent_property_declarations_must_have_the_same_type_Property_0_must_be_of_type_1_but_here_has_type_2
                 : ts.Diagnostics.Subsequent_variable_declarations_must_have_the_same_type_Variable_0_must_be_of_type_1_but_here_has_type_2;
-            error(nextDeclarationName, message, ts.declarationNameToString(nextDeclarationName), typeToString(firstType), typeToString(nextType));
+            var declName = ts.declarationNameToString(nextDeclarationName);
+            var err = error(nextDeclarationName, message, declName, typeToString(firstType), typeToString(nextType));
+            if (firstDeclaration) {
+                ts.addRelatedInfo(err, ts.createDiagnosticForNode(firstDeclaration, ts.Diagnostics._0_was_also_declared_here, declName));
+            }
         }
         function areDeclarationFlagsIdentical(left, right) {
-            if ((left.kind === 151 /* Parameter */ && right.kind === 237 /* VariableDeclaration */) ||
-                (left.kind === 237 /* VariableDeclaration */ && right.kind === 151 /* Parameter */)) {
+            if ((left.kind === 152 /* Parameter */ && right.kind === 238 /* VariableDeclaration */) ||
+                (left.kind === 238 /* VariableDeclaration */ && right.kind === 152 /* Parameter */)) {
                 // Differences in optionality between parameters and variables are allowed.
                 return true;
             }
@@ -55297,7 +57058,7 @@ var ts;
             checkGrammarStatementInAmbientContext(node);
             checkTruthinessExpression(node.expression);
             checkSourceElement(node.thenStatement);
-            if (node.thenStatement.kind === 220 /* EmptyStatement */) {
+            if (node.thenStatement.kind === 221 /* EmptyStatement */) {
                 error(node.thenStatement, ts.Diagnostics.The_body_of_an_if_statement_cannot_be_the_empty_statement);
             }
             checkSourceElement(node.elseStatement);
@@ -55324,12 +57085,12 @@ var ts;
         function checkForStatement(node) {
             // Grammar checking
             if (!checkGrammarStatementInAmbientContext(node)) {
-                if (node.initializer && node.initializer.kind === 238 /* VariableDeclarationList */) {
+                if (node.initializer && node.initializer.kind === 239 /* VariableDeclarationList */) {
                     checkGrammarVariableDeclarationList(node.initializer);
                 }
             }
             if (node.initializer) {
-                if (node.initializer.kind === 238 /* VariableDeclarationList */) {
+                if (node.initializer.kind === 239 /* VariableDeclarationList */) {
                     ts.forEach(node.initializer.declarations, checkVariableDeclaration);
                 }
                 else {
@@ -55349,9 +57110,9 @@ var ts;
             checkGrammarForInOrForOfStatement(node);
             if (node.awaitModifier) {
                 var functionFlags = ts.getFunctionFlags(ts.getContainingFunction(node));
-                if ((functionFlags & (4 /* Invalid */ | 2 /* Async */)) === 2 /* Async */ && languageVersion < 7 /* ESNext */) {
+                if ((functionFlags & (4 /* Invalid */ | 2 /* Async */)) === 2 /* Async */ && languageVersion < 99 /* ESNext */) {
                     // for..await..of in an async function or async generator function prior to ESNext requires the __asyncValues helper
-                    checkExternalEmitHelpers(node, 16384 /* ForAwaitOfIncludes */);
+                    checkExternalEmitHelpers(node, 32768 /* ForAwaitOfIncludes */);
                 }
             }
             else if (compilerOptions.downlevelIteration && languageVersion < 2 /* ES2015 */) {
@@ -55363,14 +57124,14 @@ var ts;
             // via checkRightHandSideOfForOf.
             // If the LHS is an expression, check the LHS, as a destructuring assignment or as a reference.
             // Then check that the RHS is assignable to it.
-            if (node.initializer.kind === 238 /* VariableDeclarationList */) {
+            if (node.initializer.kind === 239 /* VariableDeclarationList */) {
                 checkForInOrForOfVariableDeclaration(node);
             }
             else {
                 var varExpr = node.initializer;
                 var iteratedType = checkRightHandSideOfForOf(node.expression, node.awaitModifier);
                 // There may be a destructuring assignment on the left side
-                if (varExpr.kind === 187 /* ArrayLiteralExpression */ || varExpr.kind === 188 /* ObjectLiteralExpression */) {
+                if (varExpr.kind === 188 /* ArrayLiteralExpression */ || varExpr.kind === 189 /* ObjectLiteralExpression */) {
                     // iteratedType may be undefined. In this case, we still want to check the structure of
                     // varExpr, in particular making sure it's a valid LeftHandSideExpression. But we'd like
                     // to short circuit the type relation checking as much as possible, so we pass the unknownType.
@@ -55402,7 +57163,7 @@ var ts;
             // for (let VarDecl in Expr) Statement
             //   VarDecl must be a variable declaration without a type annotation that declares a variable of type Any,
             //   and Expr must be an expression of type Any, an object type, or a type parameter type.
-            if (node.initializer.kind === 238 /* VariableDeclarationList */) {
+            if (node.initializer.kind === 239 /* VariableDeclarationList */) {
                 var variable = node.initializer.declarations[0];
                 if (variable && ts.isBindingPattern(variable.name)) {
                     error(variable.name, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern);
@@ -55416,7 +57177,7 @@ var ts;
                 //   and Expr must be an expression of type Any, an object type, or a type parameter type.
                 var varExpr = node.initializer;
                 var leftType = checkExpression(varExpr);
-                if (varExpr.kind === 187 /* ArrayLiteralExpression */ || varExpr.kind === 188 /* ObjectLiteralExpression */) {
+                if (varExpr.kind === 188 /* ArrayLiteralExpression */ || varExpr.kind === 189 /* ObjectLiteralExpression */) {
                     error(varExpr, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern);
                 }
                 else if (!isTypeAssignableTo(getIndexTypeOrString(rightType), leftType)) {
@@ -55447,20 +57208,22 @@ var ts;
         }
         function checkRightHandSideOfForOf(rhsExpression, awaitModifier) {
             var expressionType = checkNonNullExpression(rhsExpression);
-            return checkIteratedTypeOrElementType(expressionType, rhsExpression, /*allowStringInput*/ true, awaitModifier !== undefined);
+            var use = awaitModifier ? 15 /* ForAwaitOf */ : 13 /* ForOf */;
+            return checkIteratedTypeOrElementType(use, expressionType, undefinedType, rhsExpression);
         }
-        function checkIteratedTypeOrElementType(inputType, errorNode, allowStringInput, allowAsyncIterables) {
+        function checkIteratedTypeOrElementType(use, inputType, sentType, errorNode) {
             if (isTypeAny(inputType)) {
                 return inputType;
             }
-            return getIteratedTypeOrElementType(inputType, errorNode, allowStringInput, allowAsyncIterables, /*checkAssignability*/ true) || anyType;
+            return getIteratedTypeOrElementType(use, inputType, sentType, errorNode, /*checkAssignability*/ true) || anyType;
         }
         /**
          * When consuming an iterable type in a for..of, spread, or iterator destructuring assignment
          * we want to get the iterated type of an iterable for ES2015 or later, or the iterated type
          * of a iterable (if defined globally) or element type of an array like for ES2015 or earlier.
          */
-        function getIteratedTypeOrElementType(inputType, errorNode, allowStringInput, allowAsyncIterables, checkAssignability) {
+        function getIteratedTypeOrElementType(use, inputType, sentType, errorNode, checkAssignability) {
+            var allowAsyncIterables = (use & 2 /* AllowsAsyncIterablesFlag */) !== 0;
             if (inputType === neverType) {
                 reportTypeNotIterableError(errorNode, inputType, allowAsyncIterables); // TODO: GH#18217
                 return undefined;
@@ -55472,9 +57235,21 @@ var ts;
             // downlevelIteration is requested.
             if (uplevelIteration || downlevelIteration || allowAsyncIterables) {
                 // We only report errors for an invalid iterable type in ES2015 or higher.
-                var iteratedType = getIteratedTypeOfIterable(inputType, uplevelIteration ? errorNode : undefined, allowAsyncIterables, /*allowSyncIterables*/ true, checkAssignability);
-                if (iteratedType || uplevelIteration) {
-                    return iteratedType;
+                var iterationTypes = getIterationTypesOfIterable(inputType, use, uplevelIteration ? errorNode : undefined);
+                if (checkAssignability) {
+                    if (iterationTypes) {
+                        var diagnostic = use & 8 /* ForOfFlag */ ? ts.Diagnostics.Cannot_iterate_value_because_the_next_method_of_its_iterator_expects_type_1_but_for_of_will_always_send_0 :
+                            use & 32 /* SpreadFlag */ ? ts.Diagnostics.Cannot_iterate_value_because_the_next_method_of_its_iterator_expects_type_1_but_array_spread_will_always_send_0 :
+                                use & 64 /* DestructuringFlag */ ? ts.Diagnostics.Cannot_iterate_value_because_the_next_method_of_its_iterator_expects_type_1_but_array_destructuring_will_always_send_0 :
+                                    use & 16 /* YieldStarFlag */ ? ts.Diagnostics.Cannot_delegate_iteration_to_value_because_the_next_method_of_its_iterator_expects_type_1_but_the_containing_generator_will_always_send_0 :
+                                        undefined;
+                        if (diagnostic) {
+                            checkTypeAssignableTo(sentType, iterationTypes.nextType, errorNode, diagnostic);
+                        }
+                    }
+                }
+                if (iterationTypes || uplevelIteration) {
+                    return iterationTypes && iterationTypes.yieldType;
                 }
             }
             var arrayType = inputType;
@@ -55483,7 +57258,7 @@ var ts;
             // If strings are permitted, remove any string-like constituents from the array type.
             // This allows us to find other non-string element types from an array unioned with
             // a string.
-            if (allowStringInput) {
+            if (use & 4 /* AllowsStringInputFlag */) {
                 if (arrayType.flags & 1048576 /* Union */) {
                     // After we remove all types that are StringLike, we will know if there was a string constituent
                     // based on whether the result of filter is a new array.
@@ -55518,19 +57293,19 @@ var ts;
                     // want to say that number is not an array type. But if the input was just
                     // number and string input is allowed, we want to say that number is not an
                     // array type or a string type.
-                    var isIterable = !!getIteratedTypeOfIterable(inputType, /* errorNode */ undefined, allowAsyncIterables, /*allowSyncIterables*/ true, checkAssignability);
-                    var diagnostic = !allowStringInput || hasStringConstituent
+                    var yieldType = getIterationTypeOfIterable(use, 0 /* Yield */, inputType, /*errorNode*/ undefined);
+                    var _a = !(use & 4 /* AllowsStringInputFlag */) || hasStringConstituent
                         ? downlevelIteration
-                            ? ts.Diagnostics.Type_0_is_not_an_array_type_or_does_not_have_a_Symbol_iterator_method_that_returns_an_iterator
-                            : isIterable
-                                ? ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type_Use_compiler_option_downlevelIteration_to_allow_iterating_of_iterators
-                                : ts.Diagnostics.Type_0_is_not_an_array_type
+                            ? [ts.Diagnostics.Type_0_is_not_an_array_type_or_does_not_have_a_Symbol_iterator_method_that_returns_an_iterator, true]
+                            : yieldType
+                                ? [ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type_Use_compiler_option_downlevelIteration_to_allow_iterating_of_iterators, false]
+                                : [ts.Diagnostics.Type_0_is_not_an_array_type, true]
                         : downlevelIteration
-                            ? ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type_or_does_not_have_a_Symbol_iterator_method_that_returns_an_iterator
-                            : isIterable
-                                ? ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type_Use_compiler_option_downlevelIteration_to_allow_iterating_of_iterators
-                                : ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type;
-                    error(errorNode, diagnostic, typeToString(arrayType));
+                            ? [ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type_or_does_not_have_a_Symbol_iterator_method_that_returns_an_iterator, true]
+                            : yieldType
+                                ? [ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type_Use_compiler_option_downlevelIteration_to_allow_iterating_of_iterators, false]
+                                : [ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type, true], defaultDiagnostic = _a[0], maybeMissingAwait = _a[1];
+                    errorAndMaybeSuggestAwait(errorNode, maybeMissingAwait && !!getAwaitedTypeOfPromise(arrayType), defaultDiagnostic, typeToString(arrayType));
                 }
                 return hasStringConstituent ? stringType : undefined;
             }
@@ -55545,33 +57320,78 @@ var ts;
             return arrayElementType;
         }
         /**
-         * We want to treat type as an iterable, and get the type it is an iterable of. The iterable
-         * must have the following structure (annotated with the names of the variables below):
+         * Gets the requested "iteration type" from an `Iterable`-like or `AsyncIterable`-like type.
+         */
+        function getIterationTypeOfIterable(use, typeKind, inputType, errorNode) {
+            if (isTypeAny(inputType)) {
+                return undefined;
+            }
+            var iterationTypes = getIterationTypesOfIterable(inputType, use, errorNode);
+            return iterationTypes && iterationTypes[getIterationTypesKeyFromIterationTypeKind(typeKind)];
+        }
+        function createIterationTypes(yieldType, returnType, nextType) {
+            // `yieldType` and `returnType` are defaulted to `neverType` they each will be combined
+            // via `getUnionType` when merging iteration types. `nextType` is defined as `unknownType`
+            // as it is combined via `getIntersectionType` when merging iteration types.
+            if (yieldType === void 0) { yieldType = neverType; }
+            if (returnType === void 0) { returnType = neverType; }
+            if (nextType === void 0) { nextType = unknownType; }
+            // Use the cache only for intrinsic types to keep it small as they are likely to be
+            // more frequently created (i.e. `Iterator<number, void, unknown>`). Iteration types
+            // are also cached on the type they are requested for, so we shouldn't need to maintain
+            // the cache for less-frequently used types.
+            if (yieldType.flags & 67359327 /* Intrinsic */ &&
+                returnType.flags & (1 /* Any */ | 131072 /* Never */ | 2 /* Unknown */ | 16384 /* Void */ | 32768 /* Undefined */) &&
+                nextType.flags & (1 /* Any */ | 131072 /* Never */ | 2 /* Unknown */ | 16384 /* Void */ | 32768 /* Undefined */)) {
+                var id = getTypeListId([yieldType, returnType, nextType]);
+                var iterationTypes = iterationTypesCache.get(id);
+                if (!iterationTypes) {
+                    iterationTypes = { yieldType: yieldType, returnType: returnType, nextType: nextType };
+                    iterationTypesCache.set(id, iterationTypes);
+                }
+                return iterationTypes;
+            }
+            return { yieldType: yieldType, returnType: returnType, nextType: nextType };
+        }
+        /**
+         * Combines multiple `IterationTypes` records.
          *
-         *     { // iterable
-         *         [Symbol.iterator]: { // iteratorMethod
-         *             (): Iterator<T>
-         *         }
-         *     }
+         * If `array` is empty or all elements are missing or are references to `noIterationTypes`,
+         * then `noIterationTypes` is returned. Otherwise, an `IterationTypes` record is returned
+         * for the combined iteration types.
+         */
+        function combineIterationTypes(array) {
+            var yieldTypes;
+            var returnTypes;
+            var nextTypes;
+            for (var _i = 0, array_10 = array; _i < array_10.length; _i++) {
+                var iterationTypes = array_10[_i];
+                if (iterationTypes === undefined || iterationTypes === noIterationTypes) {
+                    continue;
+                }
+                if (iterationTypes === anyIterationTypes) {
+                    return anyIterationTypes;
+                }
+                yieldTypes = ts.append(yieldTypes, iterationTypes.yieldType);
+                returnTypes = ts.append(returnTypes, iterationTypes.returnType);
+                nextTypes = ts.append(nextTypes, iterationTypes.nextType);
+            }
+            if (yieldTypes || returnTypes || nextTypes) {
+                return createIterationTypes(yieldTypes && getUnionType(yieldTypes), returnTypes && getUnionType(returnTypes), nextTypes && getIntersectionType(nextTypes));
+            }
+            return noIterationTypes;
+        }
+        /**
+         * Gets the *yield*, *return*, and *next* types from an `Iterable`-like or `AsyncIterable`-like type.
          *
-         * For an async iterable, we expect the following structure:
-         *
-         *     { // iterable
-         *         [Symbol.asyncIterator]: { // iteratorMethod
-         *             (): AsyncIterator<T>
-         *         }
-         *     }
-         *
-         * T is the type we are after. At every level that involves analyzing return types
-         * of signatures, we union the return types of all the signatures.
+         * At every level that involves analyzing return types of signatures, we union the return types of all the signatures.
          *
          * Another thing to note is that at any step of this process, we could run into a dead end,
          * meaning either the property is missing, or we run into the anyType. If either of these things
-         * happens, we return undefined to signal that we could not find the iterated type. If a property
-         * is missing, and the previous step did not result in 'any', then we also give an error if the
+         * happens, we return `undefined` to signal that we could not find the iteration type. If a property
+         * is missing, and the previous step did not result in `any`, then we also give an error if the
          * caller requested it. Then the caller can decide what to do in the case where there is no iterated
-         * type. This is different from returning anyType, because that would signify that we have matched the
-         * whole pattern and that T (above) is 'any'.
+         * type.
          *
          * For a **for-of** statement, `yield*` (in a normal generator), spread, array
          * destructuring, or normal generator we will only ever look for a `[Symbol.iterator]()`
@@ -55582,164 +57402,412 @@ var ts;
          * For a **for-await-of** statement or a `yield*` in an async generator we will look for
          * the `[Symbol.asyncIterator]()` method first, and then the `[Symbol.iterator]()` method.
          */
-        function getIteratedTypeOfIterable(type, errorNode, allowAsyncIterables, allowSyncIterables, checkAssignability) {
+        function getIterationTypesOfIterable(type, use, errorNode) {
             if (isTypeAny(type)) {
-                return undefined;
+                return anyIterationTypes;
             }
-            return mapType(type, getIteratedType);
-            function getIteratedType(type) {
-                var typeAsIterable = type;
-                if (allowAsyncIterables) {
-                    if (typeAsIterable.iteratedTypeOfAsyncIterable) {
-                        return typeAsIterable.iteratedTypeOfAsyncIterable;
+            if (!(type.flags & 1048576 /* Union */)) {
+                var iterationTypes_1 = getIterationTypesOfIterableWorker(type, use, errorNode);
+                if (iterationTypes_1 === noIterationTypes) {
+                    if (errorNode) {
+                        reportTypeNotIterableError(errorNode, type, !!(use & 2 /* AllowsAsyncIterablesFlag */));
                     }
-                    // As an optimization, if the type is an instantiation of the global `AsyncIterable<T>`
-                    // or the global `AsyncIterableIterator<T>` then just grab its type argument.
-                    if (isReferenceToType(type, getGlobalAsyncIterableType(/*reportErrors*/ false)) ||
-                        isReferenceToType(type, getGlobalAsyncIterableIteratorType(/*reportErrors*/ false))) {
-                        return typeAsIterable.iteratedTypeOfAsyncIterable = type.typeArguments[0];
-                    }
-                }
-                if (allowSyncIterables) {
-                    if (typeAsIterable.iteratedTypeOfIterable) {
-                        return allowAsyncIterables
-                            ? typeAsIterable.iteratedTypeOfAsyncIterable = getAwaitedType(typeAsIterable.iteratedTypeOfIterable)
-                            : typeAsIterable.iteratedTypeOfIterable;
-                    }
-                    // As an optimization, if the type is an instantiation of the global `Iterable<T>` or
-                    // `IterableIterator<T>` then just grab its type argument.
-                    if (isReferenceToType(type, getGlobalIterableType(/*reportErrors*/ false)) ||
-                        isReferenceToType(type, getGlobalIterableIteratorType(/*reportErrors*/ false))) {
-                        return allowAsyncIterables
-                            ? typeAsIterable.iteratedTypeOfAsyncIterable = getAwaitedType(type.typeArguments[0])
-                            : typeAsIterable.iteratedTypeOfIterable = type.typeArguments[0];
-                    }
-                }
-                var asyncMethodType = allowAsyncIterables && getTypeOfPropertyOfType(type, ts.getPropertyNameForKnownSymbolName("asyncIterator"));
-                var methodType = asyncMethodType || (allowSyncIterables ? getTypeOfPropertyOfType(type, ts.getPropertyNameForKnownSymbolName("iterator")) : undefined);
-                if (isTypeAny(methodType)) {
                     return undefined;
                 }
-                var signatures = methodType ? getSignaturesOfType(methodType, 0 /* Call */) : undefined;
-                if (!ts.some(signatures)) {
+                return iterationTypes_1;
+            }
+            var cacheKey = use & 2 /* AllowsAsyncIterablesFlag */ ? "iterationTypesOfAsyncIterable" : "iterationTypesOfIterable";
+            var cachedTypes = type[cacheKey];
+            if (cachedTypes)
+                return cachedTypes === noIterationTypes ? undefined : cachedTypes;
+            var allIterationTypes;
+            for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
+                var constituent = _a[_i];
+                var iterationTypes_2 = getIterationTypesOfIterableWorker(constituent, use, errorNode);
+                if (iterationTypes_2 === noIterationTypes) {
                     if (errorNode) {
-                        // only report on the first error
-                        reportTypeNotIterableError(errorNode, type, allowAsyncIterables);
+                        reportTypeNotIterableError(errorNode, type, !!(use & 2 /* AllowsAsyncIterablesFlag */));
                         errorNode = undefined;
                     }
-                    return undefined;
                 }
-                var returnType = getUnionType(ts.map(signatures, getReturnTypeOfSignature), 2 /* Subtype */);
-                var iteratedType = getIteratedTypeOfIterator(returnType, errorNode, /*isAsyncIterator*/ !!asyncMethodType);
-                if (checkAssignability && errorNode && iteratedType) {
-                    // If `checkAssignability` was specified, we were called from
-                    // `checkIteratedTypeOrElementType`. As such, we need to validate that
-                    // the type passed in is actually an Iterable.
-                    checkTypeAssignableTo(type, asyncMethodType
-                        ? createAsyncIterableType(iteratedType)
-                        : createIterableType(iteratedType), errorNode);
-                }
-                if (iteratedType) {
-                    return allowAsyncIterables
-                        ? typeAsIterable.iteratedTypeOfAsyncIterable = asyncMethodType ? iteratedType : getAwaitedType(iteratedType)
-                        : typeAsIterable.iteratedTypeOfIterable = iteratedType;
+                else {
+                    allIterationTypes = ts.append(allIterationTypes, iterationTypes_2);
                 }
             }
+            var iterationTypes = allIterationTypes ? combineIterationTypes(allIterationTypes) : noIterationTypes;
+            type[cacheKey] = iterationTypes;
+            return iterationTypes === noIterationTypes ? undefined : iterationTypes;
+        }
+        function getAsyncFromSyncIterationTypes(iterationTypes, errorNode) {
+            if (iterationTypes === noIterationTypes)
+                return noIterationTypes;
+            if (iterationTypes === anyIterationTypes)
+                return anyIterationTypes;
+            var yieldType = iterationTypes.yieldType, returnType = iterationTypes.returnType, nextType = iterationTypes.nextType;
+            return createIterationTypes(getAwaitedType(yieldType, errorNode) || anyType, getAwaitedType(returnType, errorNode) || anyType, nextType);
+        }
+        /**
+         * Gets the *yield*, *return*, and *next* types from a non-union type.
+         *
+         * If we are unable to find the *yield*, *return*, and *next* types, `noIterationTypes` is
+         * returned to indicate to the caller that it should report an error. Otherwise, an
+         * `IterationTypes` record is returned.
+         *
+         * NOTE: You probably don't want to call this directly and should be calling
+         * `getIterationTypesOfIterable` instead.
+         */
+        function getIterationTypesOfIterableWorker(type, use, errorNode) {
+            if (isTypeAny(type)) {
+                return anyIterationTypes;
+            }
+            if (use & 2 /* AllowsAsyncIterablesFlag */) {
+                var iterationTypes = getIterationTypesOfIterableCached(type, asyncIterationTypesResolver) ||
+                    getIterationTypesOfIterableFast(type, asyncIterationTypesResolver);
+                if (iterationTypes) {
+                    return iterationTypes;
+                }
+            }
+            if (use & 1 /* AllowsSyncIterablesFlag */) {
+                var iterationTypes = getIterationTypesOfIterableCached(type, syncIterationTypesResolver) ||
+                    getIterationTypesOfIterableFast(type, syncIterationTypesResolver);
+                if (iterationTypes) {
+                    if (use & 2 /* AllowsAsyncIterablesFlag */) {
+                        // for a sync iterable in an async context, only use the cached types if they are valid.
+                        if (iterationTypes !== noIterationTypes) {
+                            return type.iterationTypesOfAsyncIterable = getAsyncFromSyncIterationTypes(iterationTypes, errorNode);
+                        }
+                    }
+                    else {
+                        return iterationTypes;
+                    }
+                }
+            }
+            if (use & 2 /* AllowsAsyncIterablesFlag */) {
+                var iterationTypes = getIterationTypesOfIterableSlow(type, asyncIterationTypesResolver, errorNode);
+                if (iterationTypes !== noIterationTypes) {
+                    return iterationTypes;
+                }
+            }
+            if (use & 1 /* AllowsSyncIterablesFlag */) {
+                var iterationTypes = getIterationTypesOfIterableSlow(type, syncIterationTypesResolver, errorNode);
+                if (iterationTypes !== noIterationTypes) {
+                    if (use & 2 /* AllowsAsyncIterablesFlag */) {
+                        return type.iterationTypesOfAsyncIterable = iterationTypes
+                            ? getAsyncFromSyncIterationTypes(iterationTypes, errorNode)
+                            : noIterationTypes;
+                    }
+                    else {
+                        return iterationTypes;
+                    }
+                }
+            }
+            return noIterationTypes;
+        }
+        /**
+         * Gets the *yield*, *return*, and *next* types of an `Iterable`-like or
+         * `AsyncIterable`-like type from the cache.
+         *
+         * NOTE: You probably don't want to call this directly and should be calling
+         * `getIterationTypesOfIterable` instead.
+         */
+        function getIterationTypesOfIterableCached(type, resolver) {
+            return type[resolver.iterableCacheKey];
+        }
+        function getIterationTypesOfGlobalIterableType(globalType, resolver) {
+            var globalIterationTypes = getIterationTypesOfIterableCached(globalType, resolver) ||
+                getIterationTypesOfIterableSlow(globalType, resolver, /*errorNode*/ undefined);
+            return globalIterationTypes === noIterationTypes ? defaultIterationTypes : globalIterationTypes;
+        }
+        /**
+         * Gets the *yield*, *return*, and *next* types of an `Iterable`-like or `AsyncIterable`-like
+         * type from from common heuristics.
+         *
+         * If we previously analyzed this type and found no iteration types, `noIterationTypes` is
+         * returned. If we found iteration types, an `IterationTypes` record is returned.
+         * Otherwise, we return `undefined` to indicate to the caller it should perform a more
+         * exhaustive analysis.
+         *
+         * NOTE: You probably don't want to call this directly and should be calling
+         * `getIterationTypesOfIterable` instead.
+         */
+        function getIterationTypesOfIterableFast(type, resolver) {
+            // As an optimization, if the type is an instantiation of one of the following global types, then
+            // just grab its related type argument:
+            // - `Iterable<T>` or `AsyncIterable<T>`
+            // - `IterableIterator<T>` or `AsyncIterableIterator<T>`
+            var globalType;
+            if (isReferenceToType(type, globalType = resolver.getGlobalIterableType(/*reportErrors*/ false)) ||
+                isReferenceToType(type, globalType = resolver.getGlobalIterableIteratorType(/*reportErrors*/ false))) {
+                var yieldType = type.typeArguments[0];
+                // The "return" and "next" types of `Iterable` and `IterableIterator` are defined by the
+                // iteration types of their `[Symbol.iterator]()` method. The same is true for their async cousins.
+                // While we define these as `any` and `undefined` in our libs by default, a custom lib *could* use
+                // different definitions.
+                var _a = getIterationTypesOfGlobalIterableType(globalType, resolver), returnType = _a.returnType, nextType = _a.nextType;
+                return type[resolver.iterableCacheKey] = createIterationTypes(yieldType, returnType, nextType);
+            }
+            // As an optimization, if the type is an instantiation of the following global type, then
+            // just grab its related type arguments:
+            // - `Generator<T, TReturn, TNext>` or `AsyncGenerator<T, TReturn, TNext>`
+            if (isReferenceToType(type, resolver.getGlobalGeneratorType(/*reportErrors*/ false))) {
+                var _b = type.typeArguments, yieldType = _b[0], returnType = _b[1], nextType = _b[2];
+                return type[resolver.iterableCacheKey] = createIterationTypes(yieldType, returnType, nextType);
+            }
+        }
+        /**
+         * Gets the *yield*, *return*, and *next* types of an `Iterable`-like or `AsyncIterable`-like
+         * type from its members.
+         *
+         * If we successfully found the *yield*, *return*, and *next* types, an `IterationTypes`
+         * record is returned. Otherwise, `noIterationTypes` is returned.
+         *
+         * NOTE: You probably don't want to call this directly and should be calling
+         * `getIterationTypesOfIterable` instead.
+         */
+        function getIterationTypesOfIterableSlow(type, resolver, errorNode) {
+            var method = getPropertyOfType(type, ts.getPropertyNameForKnownSymbolName(resolver.iteratorSymbolName));
+            var methodType = method && !(method.flags & 16777216 /* Optional */) ? getTypeOfSymbol(method) : undefined;
+            if (isTypeAny(methodType)) {
+                return type[resolver.iterableCacheKey] = anyIterationTypes;
+            }
+            var signatures = methodType ? getSignaturesOfType(methodType, 0 /* Call */) : undefined;
+            if (!ts.some(signatures)) {
+                return type[resolver.iterableCacheKey] = noIterationTypes;
+            }
+            var iteratorType = getUnionType(ts.map(signatures, getReturnTypeOfSignature), 2 /* Subtype */);
+            var iterationTypes = getIterationTypesOfIterator(iteratorType, resolver, errorNode) || noIterationTypes;
+            return type[resolver.iterableCacheKey] = iterationTypes;
         }
         function reportTypeNotIterableError(errorNode, type, allowAsyncIterables) {
-            error(errorNode, allowAsyncIterables
+            var message = allowAsyncIterables
                 ? ts.Diagnostics.Type_0_must_have_a_Symbol_asyncIterator_method_that_returns_an_async_iterator
-                : ts.Diagnostics.Type_0_must_have_a_Symbol_iterator_method_that_returns_an_iterator, typeToString(type));
+                : ts.Diagnostics.Type_0_must_have_a_Symbol_iterator_method_that_returns_an_iterator;
+            errorAndMaybeSuggestAwait(errorNode, !!getAwaitedTypeOfPromise(type), message, typeToString(type));
         }
         /**
-         * This function has very similar logic as getIteratedTypeOfIterable, except that it operates on
-         * Iterators instead of Iterables. Here is the structure:
+         * Gets the *yield*, *return*, and *next* types from an `Iterator`-like or `AsyncIterator`-like type.
          *
-         *  { // iterator
-         *      next: { // nextMethod
-         *          (): { // nextResult
-         *              value: T // nextValue
-         *          }
-         *      }
-         *  }
-         *
-         * For an async iterator, we expect the following structure:
-         *
-         *  { // iterator
-         *      next: { // nextMethod
-         *          (): PromiseLike<{ // nextResult
-         *              value: T // nextValue
-         *          }>
-         *      }
-         *  }
+         * If we successfully found the *yield*, *return*, and *next* types, an `IterationTypes`
+         * record is returned. Otherwise, `undefined` is returned.
          */
-        function getIteratedTypeOfIterator(type, errorNode, isAsyncIterator) {
+        function getIterationTypesOfIterator(type, resolver, errorNode) {
             if (isTypeAny(type)) {
-                return undefined;
+                return anyIterationTypes;
             }
-            var typeAsIterator = type;
-            if (isAsyncIterator ? typeAsIterator.iteratedTypeOfAsyncIterator : typeAsIterator.iteratedTypeOfIterator) {
-                return isAsyncIterator ? typeAsIterator.iteratedTypeOfAsyncIterator : typeAsIterator.iteratedTypeOfIterator;
-            }
-            // As an optimization, if the type is an instantiation of the global `Iterator<T>` (for
-            // a non-async iterator) or the global `AsyncIterator<T>` (for an async-iterator) then
-            // just grab its type argument.
-            var getIteratorType = isAsyncIterator ? getGlobalAsyncIteratorType : getGlobalIteratorType;
-            if (isReferenceToType(type, getIteratorType(/*reportErrors*/ false))) {
-                return isAsyncIterator
-                    ? typeAsIterator.iteratedTypeOfAsyncIterator = type.typeArguments[0]
-                    : typeAsIterator.iteratedTypeOfIterator = type.typeArguments[0];
-            }
-            // Both async and non-async iterators must have a `next` method.
-            var nextMethod = getTypeOfPropertyOfType(type, "next");
-            if (isTypeAny(nextMethod)) {
-                return undefined;
-            }
-            var nextMethodSignatures = nextMethod ? getSignaturesOfType(nextMethod, 0 /* Call */) : ts.emptyArray;
-            if (nextMethodSignatures.length === 0) {
-                if (errorNode) {
-                    error(errorNode, isAsyncIterator
-                        ? ts.Diagnostics.An_async_iterator_must_have_a_next_method
-                        : ts.Diagnostics.An_iterator_must_have_a_next_method);
-                }
-                return undefined;
-            }
-            var nextResult = getUnionType(ts.map(nextMethodSignatures, getReturnTypeOfSignature), 2 /* Subtype */);
-            if (isTypeAny(nextResult)) {
-                return undefined;
-            }
-            // For an async iterator, we must get the awaited type of the return type.
-            if (isAsyncIterator) {
-                nextResult = getAwaitedTypeOfPromise(nextResult, errorNode, ts.Diagnostics.The_type_returned_by_the_next_method_of_an_async_iterator_must_be_a_promise_for_a_type_with_a_value_property);
-                if (isTypeAny(nextResult)) {
-                    return undefined;
-                }
-            }
-            var nextValue = nextResult && getTypeOfPropertyOfType(nextResult, "value");
-            if (!nextValue) {
-                if (errorNode) {
-                    error(errorNode, isAsyncIterator
-                        ? ts.Diagnostics.The_type_returned_by_the_next_method_of_an_async_iterator_must_be_a_promise_for_a_type_with_a_value_property
-                        : ts.Diagnostics.The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property);
-                }
-                return undefined;
-            }
-            return isAsyncIterator
-                ? typeAsIterator.iteratedTypeOfAsyncIterator = nextValue
-                : typeAsIterator.iteratedTypeOfIterator = nextValue;
+            var iterationTypes = getIterationTypesOfIteratorCached(type, resolver) ||
+                getIterationTypesOfIteratorFast(type, resolver) ||
+                getIterationTypesOfIteratorSlow(type, resolver, errorNode);
+            return iterationTypes === noIterationTypes ? undefined : iterationTypes;
         }
         /**
-         * A generator may have a return type of `Iterator<T>`, `Iterable<T>`, or
-         * `IterableIterator<T>`. An async generator may have a return type of `AsyncIterator<T>`,
-         * `AsyncIterable<T>`, or `AsyncIterableIterator<T>`. This function can be used to extract
-         * the iterated type from this return type for contextual typing and verifying signatures.
+         * Gets the iteration types of an `Iterator`-like or `AsyncIterator`-like type from the
+         * cache.
+         *
+         * NOTE: You probably don't want to call this directly and should be calling
+         * `getIterationTypesOfIterator` instead.
          */
-        function getIteratedTypeOfGenerator(returnType, isAsyncGenerator) {
+        function getIterationTypesOfIteratorCached(type, resolver) {
+            return type[resolver.iteratorCacheKey];
+        }
+        /**
+         * Gets the iteration types of an `Iterator`-like or `AsyncIterator`-like type from the
+         * cache or from common heuristics.
+         *
+         * If we previously analyzed this type and found no iteration types, `noIterationTypes` is
+         * returned. If we found iteration types, an `IterationTypes` record is returned.
+         * Otherwise, we return `undefined` to indicate to the caller it should perform a more
+         * exhaustive analysis.
+         *
+         * NOTE: You probably don't want to call this directly and should be calling
+         * `getIterationTypesOfIterator` instead.
+         */
+        function getIterationTypesOfIteratorFast(type, resolver) {
+            // As an optimization, if the type is an instantiation of one of the following global types,
+            // then just grab its related type argument:
+            // - `IterableIterator<T>` or `AsyncIterableIterator<T>`
+            // - `Iterator<T, TReturn, TNext>` or `AsyncIterator<T, TReturn, TNext>`
+            // - `Generator<T, TReturn, TNext>` or `AsyncGenerator<T, TReturn, TNext>`
+            var globalType = resolver.getGlobalIterableIteratorType(/*reportErrors*/ false);
+            if (isReferenceToType(type, globalType)) {
+                var yieldType = type.typeArguments[0];
+                // The "return" and "next" types of `IterableIterator` and `AsyncIterableIterator` are defined by the
+                // iteration types of their `next`, `return`, and `throw` methods. While we define these as `any`
+                // and `undefined` in our libs by default, a custom lib *could* use different definitions.
+                var globalIterationTypes = getIterationTypesOfIteratorCached(globalType, resolver) ||
+                    getIterationTypesOfIteratorSlow(globalType, resolver, /*errorNode*/ undefined);
+                var _a = globalIterationTypes === noIterationTypes ? defaultIterationTypes : globalIterationTypes, returnType = _a.returnType, nextType = _a.nextType;
+                return type[resolver.iteratorCacheKey] = createIterationTypes(yieldType, returnType, nextType);
+            }
+            if (isReferenceToType(type, resolver.getGlobalIteratorType(/*reportErrors*/ false)) ||
+                isReferenceToType(type, resolver.getGlobalGeneratorType(/*reportErrors*/ false))) {
+                var _b = type.typeArguments, yieldType = _b[0], returnType = _b[1], nextType = _b[2];
+                return type[resolver.iteratorCacheKey] = createIterationTypes(yieldType, returnType, nextType);
+            }
+        }
+        function isIteratorResult(type, kind) {
+            // From https://tc39.github.io/ecma262/#sec-iteratorresult-interface:
+            // > [done] is the result status of an iterator `next` method call. If the end of the iterator was reached `done` is `true`.
+            // > If the end was not reached `done` is `false` and a value is available.
+            // > If a `done` property (either own or inherited) does not exist, it is consider to have the value `false`.
+            var doneType = getTypeOfPropertyOfType(type, "done") || falseType;
+            return isTypeAssignableTo(kind === 0 /* Yield */ ? falseType : trueType, doneType);
+        }
+        function isYieldIteratorResult(type) {
+            return isIteratorResult(type, 0 /* Yield */);
+        }
+        function isReturnIteratorResult(type) {
+            return isIteratorResult(type, 1 /* Return */);
+        }
+        /**
+         * Gets the *yield* and *return* types of an `IteratorResult`-like type.
+         *
+         * If we are unable to determine a *yield* or a *return* type, `noIterationTypes` is
+         * returned to indicate to the caller that it should handle the error. Otherwise, an
+         * `IterationTypes` record is returned.
+         */
+        function getIterationTypesOfIteratorResult(type) {
+            if (isTypeAny(type)) {
+                return anyIterationTypes;
+            }
+            var cachedTypes = type.iterationTypesOfIteratorResult;
+            if (cachedTypes) {
+                return cachedTypes;
+            }
+            // As an optimization, if the type is an instantiation of one of the global `IteratorYieldResult<T>`
+            // or `IteratorReturnResult<TReturn>` types, then just grab its type argument.
+            if (isReferenceToType(type, getGlobalIteratorYieldResultType(/*reportErrors*/ false))) {
+                var yieldType_1 = type.typeArguments[0];
+                return type.iterationTypesOfIteratorResult = createIterationTypes(yieldType_1, /*returnType*/ undefined, /*nextType*/ undefined);
+            }
+            if (isReferenceToType(type, getGlobalIteratorReturnResultType(/*reportErrors*/ false))) {
+                var returnType_1 = type.typeArguments[0];
+                return type.iterationTypesOfIteratorResult = createIterationTypes(/*yieldType*/ undefined, returnType_1, /*nextType*/ undefined);
+            }
+            // Choose any constituents that can produce the requested iteration type.
+            var yieldIteratorResult = filterType(type, isYieldIteratorResult);
+            var yieldType = yieldIteratorResult !== neverType ? getTypeOfPropertyOfType(yieldIteratorResult, "value") : undefined;
+            var returnIteratorResult = filterType(type, isReturnIteratorResult);
+            var returnType = returnIteratorResult !== neverType ? getTypeOfPropertyOfType(returnIteratorResult, "value") : undefined;
+            if (!yieldType && !returnType) {
+                return type.iterationTypesOfIteratorResult = noIterationTypes;
+            }
+            // From https://tc39.github.io/ecma262/#sec-iteratorresult-interface
+            // > ... If the iterator does not have a return value, `value` is `undefined`. In that case, the
+            // > `value` property may be absent from the conforming object if it does not inherit an explicit
+            // > `value` property.
+            return type.iterationTypesOfIteratorResult = createIterationTypes(yieldType, returnType || voidType, /*nextType*/ undefined);
+        }
+        /**
+         * Gets the *yield*, *return*, and *next* types of a the `next()`, `return()`, or
+         * `throw()` method of an `Iterator`-like or `AsyncIterator`-like type.
+         *
+         * If we successfully found the *yield*, *return*, and *next* types, an `IterationTypes`
+         * record is returned. Otherwise, we return `undefined`.
+         */
+        function getIterationTypesOfMethod(type, resolver, methodName, errorNode) {
+            var method = getPropertyOfType(type, methodName);
+            // Ignore 'return' or 'throw' if they are missing.
+            if (!method && methodName !== "next") {
+                return undefined;
+            }
+            var methodType = method && !(methodName === "next" && (method.flags & 16777216 /* Optional */))
+                ? methodName === "next" ? getTypeOfSymbol(method) : getTypeWithFacts(getTypeOfSymbol(method), 2097152 /* NEUndefinedOrNull */)
+                : undefined;
+            if (isTypeAny(methodType)) {
+                // `return()` and `throw()` don't provide a *next* type.
+                return methodName === "next" ? anyIterationTypes : anyIterationTypesExceptNext;
+            }
+            // Both async and non-async iterators *must* have a `next` method.
+            var methodSignatures = methodType ? getSignaturesOfType(methodType, 0 /* Call */) : ts.emptyArray;
+            if (methodSignatures.length === 0) {
+                if (errorNode) {
+                    var diagnostic = methodName === "next"
+                        ? resolver.mustHaveANextMethodDiagnostic
+                        : resolver.mustBeAMethodDiagnostic;
+                    error(errorNode, diagnostic, methodName);
+                }
+                return methodName === "next" ? anyIterationTypes : undefined;
+            }
+            // Extract the first parameter and return type of each signature.
+            var methodParameterTypes;
+            var methodReturnTypes;
+            for (var _i = 0, methodSignatures_1 = methodSignatures; _i < methodSignatures_1.length; _i++) {
+                var signature = methodSignatures_1[_i];
+                if (methodName !== "throw" && ts.some(signature.parameters)) {
+                    methodParameterTypes = ts.append(methodParameterTypes, getTypeAtPosition(signature, 0));
+                }
+                methodReturnTypes = ts.append(methodReturnTypes, getReturnTypeOfSignature(signature));
+            }
+            // Resolve the *next* or *return* type from the first parameter of a `next()` or
+            // `return()` method, respectively.
+            var returnTypes;
+            var nextType;
+            if (methodName !== "throw") {
+                var methodParameterType = methodParameterTypes ? getUnionType(methodParameterTypes) : unknownType;
+                var resolvedMethodParameterType = resolver.resolveIterationType(methodParameterType, errorNode) || anyType;
+                if (methodName === "next") {
+                    nextType = resolvedMethodParameterType;
+                }
+                else if (methodName === "return") {
+                    returnTypes = ts.append(returnTypes, resolvedMethodParameterType);
+                }
+            }
+            // Resolve the *yield* and *return* types from the return type of the method (i.e. `IteratorResult`)
+            var yieldType;
+            var methodReturnType = methodReturnTypes ? getUnionType(methodReturnTypes, 2 /* Subtype */) : neverType;
+            var resolvedMethodReturnType = resolver.resolveIterationType(methodReturnType, errorNode) || anyType;
+            var iterationTypes = getIterationTypesOfIteratorResult(resolvedMethodReturnType);
+            if (iterationTypes === noIterationTypes) {
+                if (errorNode) {
+                    error(errorNode, resolver.mustHaveAValueDiagnostic, methodName);
+                }
+                yieldType = anyType;
+                returnTypes = ts.append(returnTypes, anyType);
+            }
+            else {
+                yieldType = iterationTypes.yieldType;
+                returnTypes = ts.append(returnTypes, iterationTypes.returnType);
+            }
+            return createIterationTypes(yieldType, getUnionType(returnTypes), nextType);
+        }
+        /**
+         * Gets the *yield*, *return*, and *next* types of an `Iterator`-like or `AsyncIterator`-like
+         * type from its members.
+         *
+         * If we successfully found the *yield*, *return*, and *next* types, an `IterationTypes`
+         * record is returned. Otherwise, `noIterationTypes` is returned.
+         *
+         * NOTE: You probably don't want to call this directly and should be calling
+         * `getIterationTypesOfIterator` instead.
+         */
+        function getIterationTypesOfIteratorSlow(type, resolver, errorNode) {
+            var iterationTypes = combineIterationTypes([
+                getIterationTypesOfMethod(type, resolver, "next", errorNode),
+                getIterationTypesOfMethod(type, resolver, "return", errorNode),
+                getIterationTypesOfMethod(type, resolver, "throw", errorNode),
+            ]);
+            return type[resolver.iteratorCacheKey] = iterationTypes;
+        }
+        /**
+         * Gets the requested "iteration type" from a type that is either `Iterable`-like, `Iterator`-like,
+         * `IterableIterator`-like, or `Generator`-like (for a non-async generator); or `AsyncIterable`-like,
+         * `AsyncIterator`-like, `AsyncIterableIterator`-like, or `AsyncGenerator`-like (for an async generator).
+         */
+        function getIterationTypeOfGeneratorFunctionReturnType(kind, returnType, isAsyncGenerator) {
             if (isTypeAny(returnType)) {
                 return undefined;
             }
-            return getIteratedTypeOfIterable(returnType, /*errorNode*/ undefined, /*allowAsyncIterables*/ isAsyncGenerator, /*allowSyncIterables*/ !isAsyncGenerator, /*checkAssignability*/ false)
-                || getIteratedTypeOfIterator(returnType, /*errorNode*/ undefined, isAsyncGenerator);
+            var iterationTypes = getIterationTypesOfGeneratorFunctionReturnType(returnType, isAsyncGenerator);
+            return iterationTypes && iterationTypes[getIterationTypesKeyFromIterationTypeKind(kind)];
+        }
+        function getIterationTypesOfGeneratorFunctionReturnType(type, isAsyncGenerator) {
+            if (isTypeAny(type)) {
+                return anyIterationTypes;
+            }
+            var use = isAsyncGenerator ? 2 /* AsyncGeneratorReturnType */ : 1 /* GeneratorReturnType */;
+            var resolver = isAsyncGenerator ? asyncIterationTypesResolver : syncIterationTypesResolver;
+            return getIterationTypesOfIterable(type, use, /*errorNode*/ undefined) ||
+                getIterationTypesOfIterator(type, resolver, /*errorNode*/ undefined);
         }
         function checkBreakOrContinueStatement(node) {
             // Grammar checking
@@ -55747,10 +57815,15 @@ var ts;
                 checkGrammarBreakOrContinueStatement(node);
             // TODO: Check that target label is valid
         }
+        function unwrapReturnType(returnType, functionFlags) {
+            var isGenerator = !!(functionFlags & 1 /* Generator */);
+            var isAsync = !!(functionFlags & 2 /* Async */);
+            return isGenerator ? getIterationTypeOfGeneratorFunctionReturnType(1 /* Return */, returnType, isAsync) || errorType :
+                isAsync ? getPromisedTypeOfPromise(returnType) || errorType :
+                    returnType;
+        }
         function isUnwrappedReturnTypeVoidOrAny(func, returnType) {
-            var unwrappedReturnType = (ts.getFunctionFlags(func) & 3 /* AsyncGenerator */) === 2 /* Async */
-                ? getPromisedTypeOfPromise(returnType) // Async function
-                : returnType; // AsyncGenerator function, Generator function, or normal function
+            var unwrappedReturnType = unwrapReturnType(returnType, ts.getFunctionFlags(func));
             return !!unwrappedReturnType && maybeTypeOfKind(unwrappedReturnType, 16384 /* Void */ | 3 /* AnyOrUnknown */);
         }
         function checkReturnStatement(node) {
@@ -55766,43 +57839,32 @@ var ts;
             var signature = getSignatureFromDeclaration(func);
             var returnType = getReturnTypeOfSignature(signature);
             var functionFlags = ts.getFunctionFlags(func);
-            var isGenerator = functionFlags & 1 /* Generator */;
             if (strictNullChecks || node.expression || returnType.flags & 131072 /* Never */) {
                 var exprType = node.expression ? checkExpressionCached(node.expression) : undefinedType;
-                if (isGenerator) { // AsyncGenerator function or Generator function
-                    // A generator does not need its return expressions checked against its return type.
-                    // Instead, the yield expressions are checked against the element type.
-                    // TODO: Check return types of generators when return type tracking is added
-                    // for generators.
-                    return;
-                }
-                else if (func.kind === 159 /* SetAccessor */) {
+                if (func.kind === 160 /* SetAccessor */) {
                     if (node.expression) {
                         error(node, ts.Diagnostics.Setters_cannot_return_a_value);
                     }
                 }
-                else if (func.kind === 157 /* Constructor */) {
+                else if (func.kind === 158 /* Constructor */) {
                     if (node.expression && !checkTypeAssignableToAndOptionallyElaborate(exprType, returnType, node, node.expression)) {
                         error(node, ts.Diagnostics.Return_type_of_constructor_signature_must_be_assignable_to_the_instance_type_of_the_class);
                     }
                 }
                 else if (getReturnTypeFromAnnotation(func)) {
-                    if (functionFlags & 2 /* Async */) { // Async function
-                        var promisedType = getPromisedTypeOfPromise(returnType);
-                        var awaitedType = checkAwaitedType(exprType, node, ts.Diagnostics.The_return_type_of_an_async_function_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member);
-                        if (promisedType) {
-                            // If the function has a return type, but promisedType is
-                            // undefined, an error will be reported in checkAsyncFunctionReturnType
-                            // so we don't need to report one here.
-                            checkTypeAssignableTo(awaitedType, promisedType, node);
-                        }
-                    }
-                    else {
-                        checkTypeAssignableToAndOptionallyElaborate(exprType, returnType, node, node.expression);
+                    var unwrappedReturnType = unwrapReturnType(returnType, functionFlags);
+                    var unwrappedExprType = functionFlags & 2 /* Async */
+                        ? checkAwaitedType(exprType, node, ts.Diagnostics.The_return_type_of_an_async_function_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member)
+                        : exprType;
+                    if (unwrappedReturnType) {
+                        // If the function has a return type, but promisedType is
+                        // undefined, an error will be reported in checkAsyncFunctionReturnType
+                        // so we don't need to report one here.
+                        checkTypeAssignableToAndOptionallyElaborate(unwrappedExprType, unwrappedReturnType, node, node.expression);
                     }
                 }
             }
-            else if (func.kind !== 157 /* Constructor */ && compilerOptions.noImplicitReturns && !isUnwrappedReturnTypeVoidOrAny(func, returnType) && !isGenerator) {
+            else if (func.kind !== 158 /* Constructor */ && compilerOptions.noImplicitReturns && !isUnwrappedReturnTypeVoidOrAny(func, returnType)) {
                 // The function has a return type, but the return statement doesn't have an expression.
                 error(node, ts.Diagnostics.Not_all_code_paths_return_a_value);
             }
@@ -55831,7 +57893,7 @@ var ts;
             var expressionIsLiteral = isLiteralType(expressionType);
             ts.forEach(node.caseBlock.clauses, function (clause) {
                 // Grammar check for duplicate default clauses, skip if we already report duplicate default clause
-                if (clause.kind === 272 /* DefaultClause */ && !hasDuplicateDefaultClause) {
+                if (clause.kind === 273 /* DefaultClause */ && !hasDuplicateDefaultClause) {
                     if (firstDefaultClause === undefined) {
                         firstDefaultClause = clause;
                     }
@@ -55843,7 +57905,7 @@ var ts;
                         hasDuplicateDefaultClause = true;
                     }
                 }
-                if (produceDiagnostics && clause.kind === 271 /* CaseClause */) {
+                if (produceDiagnostics && clause.kind === 272 /* CaseClause */) {
                     // TypeScript 1.0 spec (April 2014): 5.9
                     // In a 'switch' statement, each 'case' expression must be of a type that is comparable
                     // to or from the type of the 'switch' expression.
@@ -55872,7 +57934,7 @@ var ts;
                     if (ts.isFunctionLike(current)) {
                         return "quit";
                     }
-                    if (current.kind === 233 /* LabeledStatement */ && current.label.escapedText === node.label.escapedText) {
+                    if (current.kind === 234 /* LabeledStatement */ && current.label.escapedText === node.label.escapedText) {
                         grammarErrorOnNode(node.label, ts.Diagnostics.Duplicate_label_0, ts.getTextOfNode(node.label));
                         return true;
                     }
@@ -55979,8 +58041,8 @@ var ts;
                 // this allows us to rule out cases when both property and indexer are inherited from the base class
                 var errorNode;
                 if (propDeclaration && name &&
-                    (propDeclaration.kind === 204 /* BinaryExpression */ ||
-                        name.kind === 149 /* ComputedPropertyName */ ||
+                    (propDeclaration.kind === 205 /* BinaryExpression */ ||
+                        name.kind === 150 /* ComputedPropertyName */ ||
                         prop.parent === containingType.symbol)) {
                     errorNode = propDeclaration;
                 }
@@ -56057,7 +58119,7 @@ var ts;
         function checkTypeParametersNotReferenced(root, typeParameters, index) {
             visit(root);
             function visit(node) {
-                if (node.kind === 164 /* TypeReference */) {
+                if (node.kind === 165 /* TypeReference */) {
                     var type = getTypeFromTypeReference(node);
                     if (type.flags & 262144 /* TypeParameter */) {
                         for (var i = index; i < typeParameters.length; i++) {
@@ -56179,6 +58241,11 @@ var ts;
                 if (languageVersion < 2 /* ES2015 */) {
                     checkExternalEmitHelpers(baseTypeNode.parent, 1 /* Extends */);
                 }
+                // check both @extends and extends if both are specified.
+                var extendsNode = ts.getClassExtendsHeritageElement(node);
+                if (extendsNode && extendsNode !== baseTypeNode) {
+                    checkExpression(extendsNode.expression);
+                }
                 var baseTypes = getBaseTypes(type);
                 if (baseTypes.length && produceDiagnostics) {
                     var baseType_1 = baseTypes[0];
@@ -56186,10 +58253,6 @@ var ts;
                     var staticBaseType = getApparentType(baseConstructorType);
                     checkBaseTypeAccessibility(staticBaseType, baseTypeNode);
                     checkSourceElement(baseTypeNode.expression);
-                    var extendsNode = ts.getClassExtendsHeritageElement(node);
-                    if (extendsNode && extendsNode !== baseTypeNode) {
-                        checkExpression(extendsNode.expression);
-                    }
                     if (ts.some(baseTypeNode.typeArguments)) {
                         ts.forEach(baseTypeNode.typeArguments, checkSourceElement);
                         for (var _i = 0, _a = getConstructorsForTypeArguments(staticBaseType, baseTypeNode.typeArguments, baseTypeNode); _i < _a.length; _i++) {
@@ -56260,7 +58323,7 @@ var ts;
         function issueMemberSpecificError(node, typeWithThis, baseWithThis, broadDiag) {
             // iterate over all implemented properties and issue errors on each one which isn't compatible, rather than the class as a whole, if possible
             var issuedMemberError = false;
-            var _loop_9 = function (member) {
+            var _loop_14 = function (member) {
                 if (ts.hasStaticModifier(member)) {
                     return "continue";
                 }
@@ -56279,7 +58342,7 @@ var ts;
             };
             for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                 var member = _a[_i];
-                _loop_9(member);
+                _loop_14(member);
             }
             if (!issuedMemberError) {
                 // check again with diagnostics to generate a less-specific error
@@ -56305,7 +58368,7 @@ var ts;
         }
         function getClassOrInterfaceDeclarationsOfSymbol(symbol) {
             return ts.filter(symbol.declarations, function (d) {
-                return d.kind === 240 /* ClassDeclaration */ || d.kind === 241 /* InterfaceDeclaration */;
+                return d.kind === 241 /* ClassDeclaration */ || d.kind === 242 /* InterfaceDeclaration */;
             });
         }
         function checkKindsOfPropertyMemberOverrides(type, baseType) {
@@ -56344,7 +58407,7 @@ var ts;
                         // If there is no declaration for the derived class (as in the case of class expressions),
                         // then the class cannot be declared abstract.
                         if (baseDeclarationFlags & 128 /* Abstract */ && (!derivedClassDecl || !ts.hasModifier(derivedClassDecl, 128 /* Abstract */))) {
-                            if (derivedClassDecl.kind === 209 /* ClassExpression */) {
+                            if (derivedClassDecl.kind === 210 /* ClassExpression */) {
                                 error(derivedClassDecl, ts.Diagnostics.Non_abstract_class_expression_does_not_implement_inherited_abstract_member_0_from_class_1, symbolToString(baseProperty), typeToString(baseType));
                             }
                             else {
@@ -56394,8 +58457,8 @@ var ts;
             for (var _i = 0, baseTypes_2 = baseTypes; _i < baseTypes_2.length; _i++) {
                 var base = baseTypes_2[_i];
                 var properties = getPropertiesOfType(getTypeWithThisArgument(base, type.thisType));
-                for (var _a = 0, properties_7 = properties; _a < properties_7.length; _a++) {
-                    var prop = properties_7[_a];
+                for (var _a = 0, properties_4 = properties; _a < properties_4.length; _a++) {
+                    var prop = properties_4[_a];
                     var existing = seen.get(prop.escapedName);
                     if (!existing) {
                         seen.set(prop.escapedName, { prop: prop, containingType: base });
@@ -56436,7 +58499,7 @@ var ts;
             }
         }
         function isInstancePropertyWithoutInitializer(node) {
-            return node.kind === 154 /* PropertyDeclaration */ &&
+            return node.kind === 155 /* PropertyDeclaration */ &&
                 !ts.hasModifier(node, 32 /* Static */ | 128 /* Abstract */) &&
                 !node.exclamationToken &&
                 !node.initializer;
@@ -56460,7 +58523,7 @@ var ts;
                 var symbol = getSymbolOfNode(node);
                 checkTypeParameterListsIdentical(symbol);
                 // Only check this symbol once
-                var firstInterfaceDecl = ts.getDeclarationOfKind(symbol, 241 /* InterfaceDeclaration */);
+                var firstInterfaceDecl = ts.getDeclarationOfKind(symbol, 242 /* InterfaceDeclaration */);
                 if (node === firstInterfaceDecl) {
                     var type = getDeclaredTypeOfSymbol(symbol);
                     var typeWithThis = getTypeWithThisArgument(type);
@@ -56521,9 +58584,9 @@ var ts;
             if (member.initializer) {
                 return computeConstantValue(member);
             }
-            // In ambient enum declarations that specify no const modifier, enum member declarations that omit
-            // a value are considered computed members (as opposed to having auto-incremented values).
-            if (member.parent.flags & 4194304 /* Ambient */ && !ts.isEnumConst(member.parent)) {
+            // In ambient non-const numeric enum declarations, enum members without initializers are
+            // considered computed members (as opposed to having auto-incremented values).
+            if (member.parent.flags & 4194304 /* Ambient */ && !ts.isEnumConst(member.parent) && getEnumKind(getSymbolOfNode(member.parent)) === 0 /* Numeric */) {
                 return undefined;
             }
             // If the member declaration specifies no value, the member is considered a constant enum member.
@@ -56565,7 +58628,7 @@ var ts;
             return value;
             function evaluate(expr) {
                 switch (expr.kind) {
-                    case 202 /* PrefixUnaryExpression */:
+                    case 203 /* PrefixUnaryExpression */:
                         var value_2 = evaluate(expr.operand);
                         if (typeof value_2 === "number") {
                             switch (expr.operator) {
@@ -56575,7 +58638,7 @@ var ts;
                             }
                         }
                         break;
-                    case 204 /* BinaryExpression */:
+                    case 205 /* BinaryExpression */:
                         var left = evaluate(expr.left);
                         var right = evaluate(expr.right);
                         if (typeof left === "number" && typeof right === "number") {
@@ -56603,22 +58666,22 @@ var ts;
                     case 8 /* NumericLiteral */:
                         checkGrammarNumericLiteral(expr);
                         return +expr.text;
-                    case 195 /* ParenthesizedExpression */:
+                    case 196 /* ParenthesizedExpression */:
                         return evaluate(expr.expression);
-                    case 72 /* Identifier */:
+                    case 73 /* Identifier */:
                         var identifier = expr;
                         if (isInfinityOrNaNString(identifier.escapedText)) {
                             return +(identifier.escapedText);
                         }
                         return ts.nodeIsMissing(expr) ? 0 : evaluateEnumMember(expr, getSymbolOfNode(member.parent), identifier.escapedText);
-                    case 190 /* ElementAccessExpression */:
-                    case 189 /* PropertyAccessExpression */:
+                    case 191 /* ElementAccessExpression */:
+                    case 190 /* PropertyAccessExpression */:
                         var ex = expr;
                         if (isConstantMemberAccess(ex)) {
                             var type = getTypeOfExpression(ex.expression);
                             if (type.symbol && type.symbol.flags & 384 /* Enum */) {
                                 var name = void 0;
-                                if (ex.kind === 189 /* PropertyAccessExpression */) {
+                                if (ex.kind === 190 /* PropertyAccessExpression */) {
                                     name = ex.name.escapedText;
                                 }
                                 else {
@@ -56649,9 +58712,9 @@ var ts;
             }
         }
         function isConstantMemberAccess(node) {
-            return node.kind === 72 /* Identifier */ ||
-                node.kind === 189 /* PropertyAccessExpression */ && isConstantMemberAccess(node.expression) ||
-                node.kind === 190 /* ElementAccessExpression */ && isConstantMemberAccess(node.expression) &&
+            return node.kind === 73 /* Identifier */ ||
+                node.kind === 190 /* PropertyAccessExpression */ && isConstantMemberAccess(node.expression) ||
+                node.kind === 191 /* ElementAccessExpression */ && isConstantMemberAccess(node.expression) &&
                     node.argumentExpression.kind === 10 /* StringLiteral */;
         }
         function checkEnumDeclaration(node) {
@@ -56686,7 +58749,7 @@ var ts;
                 var seenEnumMissingInitialInitializer_1 = false;
                 ts.forEach(enumSymbol.declarations, function (declaration) {
                     // return true if we hit a violation of the rule, false otherwise
-                    if (declaration.kind !== 243 /* EnumDeclaration */) {
+                    if (declaration.kind !== 244 /* EnumDeclaration */) {
                         return false;
                     }
                     var enumDeclaration = declaration;
@@ -56709,8 +58772,8 @@ var ts;
             var declarations = symbol.declarations;
             for (var _i = 0, declarations_8 = declarations; _i < declarations_8.length; _i++) {
                 var declaration = declarations_8[_i];
-                if ((declaration.kind === 240 /* ClassDeclaration */ ||
-                    (declaration.kind === 239 /* FunctionDeclaration */ && ts.nodeIsPresent(declaration.body))) &&
+                if ((declaration.kind === 241 /* ClassDeclaration */ ||
+                    (declaration.kind === 240 /* FunctionDeclaration */ && ts.nodeIsPresent(declaration.body))) &&
                     !(declaration.flags & 4194304 /* Ambient */)) {
                     return declaration;
                 }
@@ -56759,8 +58822,8 @@ var ts;
                 var symbol = getSymbolOfNode(node);
                 // The following checks only apply on a non-ambient instantiated module declaration.
                 if (symbol.flags & 512 /* ValueModule */
-                    && symbol.declarations.length > 1
                     && !inAmbientContext
+                    && symbol.declarations.length > 1
                     && isInstantiatedModule(node, !!compilerOptions.preserveConstEnums || !!compilerOptions.isolatedModules)) {
                     var firstNonAmbientClassOrFunc = getFirstNonAmbientClassOrFunctionDeclaration(symbol);
                     if (firstNonAmbientClassOrFunc) {
@@ -56773,7 +58836,7 @@ var ts;
                     }
                     // if the module merges with a class declaration in the same lexical scope,
                     // we need to track this to ensure the correct emit.
-                    var mergedClass = ts.getDeclarationOfKind(symbol, 240 /* ClassDeclaration */);
+                    var mergedClass = ts.getDeclarationOfKind(symbol, 241 /* ClassDeclaration */);
                     if (mergedClass &&
                         inSameLexicalScope(node, mergedClass)) {
                         getNodeLinks(node).flags |= 32768 /* LexicalModuleMergesWithClass */;
@@ -56823,23 +58886,23 @@ var ts;
         }
         function checkModuleAugmentationElement(node, isGlobalAugmentation) {
             switch (node.kind) {
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     // error each individual name in variable statement instead of marking the entire variable statement
                     for (var _i = 0, _a = node.declarationList.declarations; _i < _a.length; _i++) {
                         var decl = _a[_i];
                         checkModuleAugmentationElement(decl, isGlobalAugmentation);
                     }
                     break;
-                case 254 /* ExportAssignment */:
-                case 255 /* ExportDeclaration */:
+                case 255 /* ExportAssignment */:
+                case 256 /* ExportDeclaration */:
                     grammarErrorOnFirstToken(node, ts.Diagnostics.Exports_and_export_assignments_are_not_permitted_in_module_augmentations);
                     break;
-                case 248 /* ImportEqualsDeclaration */:
-                case 249 /* ImportDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
+                case 250 /* ImportDeclaration */:
                     grammarErrorOnFirstToken(node, ts.Diagnostics.Imports_are_not_permitted_in_module_augmentations_Consider_moving_them_to_the_enclosing_external_module);
                     break;
-                case 186 /* BindingElement */:
-                case 237 /* VariableDeclaration */:
+                case 187 /* BindingElement */:
+                case 238 /* VariableDeclaration */:
                     var name = node.name;
                     if (ts.isBindingPattern(name)) {
                         for (var _b = 0, _c = name.elements; _b < _c.length; _b++) {
@@ -56850,12 +58913,12 @@ var ts;
                         break;
                     }
                 // falls through
-                case 240 /* ClassDeclaration */:
-                case 243 /* EnumDeclaration */:
-                case 239 /* FunctionDeclaration */:
-                case 241 /* InterfaceDeclaration */:
-                case 244 /* ModuleDeclaration */:
-                case 242 /* TypeAliasDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 240 /* FunctionDeclaration */:
+                case 242 /* InterfaceDeclaration */:
+                case 245 /* ModuleDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
                     if (isGlobalAugmentation) {
                         return;
                     }
@@ -56876,17 +58939,17 @@ var ts;
         }
         function getFirstIdentifier(node) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return node;
-                case 148 /* QualifiedName */:
+                case 149 /* QualifiedName */:
                     do {
                         node = node.left;
-                    } while (node.kind !== 72 /* Identifier */);
+                    } while (node.kind !== 73 /* Identifier */);
                     return node;
-                case 189 /* PropertyAccessExpression */:
+                case 190 /* PropertyAccessExpression */:
                     do {
                         node = node.expression;
-                    } while (node.kind !== 72 /* Identifier */);
+                    } while (node.kind !== 73 /* Identifier */);
                     return node;
             }
         }
@@ -56900,9 +58963,9 @@ var ts;
                 error(moduleName, ts.Diagnostics.String_literal_expected);
                 return false;
             }
-            var inAmbientExternalModule = node.parent.kind === 245 /* ModuleBlock */ && ts.isAmbientModule(node.parent.parent);
-            if (node.parent.kind !== 284 /* SourceFile */ && !inAmbientExternalModule) {
-                error(moduleName, node.kind === 255 /* ExportDeclaration */ ?
+            var inAmbientExternalModule = node.parent.kind === 246 /* ModuleBlock */ && ts.isAmbientModule(node.parent.parent);
+            if (node.parent.kind !== 285 /* SourceFile */ && !inAmbientExternalModule) {
+                error(moduleName, node.kind === 256 /* ExportDeclaration */ ?
                     ts.Diagnostics.Export_declarations_are_not_permitted_in_a_namespace :
                     ts.Diagnostics.Import_declarations_in_a_namespace_cannot_reference_a_module);
                 return false;
@@ -56935,14 +58998,14 @@ var ts;
                     (symbol.flags & 67897832 /* Type */ ? 67897832 /* Type */ : 0) |
                     (symbol.flags & 1920 /* Namespace */ ? 1920 /* Namespace */ : 0);
                 if (target.flags & excludedMeanings) {
-                    var message = node.kind === 257 /* ExportSpecifier */ ?
+                    var message = node.kind === 258 /* ExportSpecifier */ ?
                         ts.Diagnostics.Export_declaration_conflicts_with_exported_declaration_of_0 :
                         ts.Diagnostics.Import_declaration_conflicts_with_local_declaration_of_0;
                     error(node, message, symbolToString(symbol));
                 }
                 // Don't allow to re-export something with no value side when `--isolatedModules` is set.
                 if (compilerOptions.isolatedModules
-                    && node.kind === 257 /* ExportSpecifier */
+                    && node.kind === 258 /* ExportSpecifier */
                     && !(target.flags & 67220415 /* Value */)
                     && !(node.flags & 4194304 /* Ambient */)) {
                     error(node, ts.Diagnostics.Cannot_re_export_a_type_when_the_isolatedModules_flag_is_provided);
@@ -56969,7 +59032,7 @@ var ts;
                         checkImportBinding(importClause);
                     }
                     if (importClause.namedBindings) {
-                        if (importClause.namedBindings.kind === 251 /* NamespaceImport */) {
+                        if (importClause.namedBindings.kind === 252 /* NamespaceImport */) {
                             checkImportBinding(importClause.namedBindings);
                         }
                         else {
@@ -56993,7 +59056,7 @@ var ts;
                 if (ts.hasModifier(node, 1 /* Export */)) {
                     markExportAsReferenced(node);
                 }
-                if (node.moduleReference.kind !== 259 /* ExternalModuleReference */) {
+                if (node.moduleReference.kind !== 260 /* ExternalModuleReference */) {
                     var target = resolveAlias(getSymbolOfNode(node));
                     if (target !== unknownSymbol) {
                         if (target.flags & 67220415 /* Value */) {
@@ -57029,10 +59092,10 @@ var ts;
                     // export { x, y }
                     // export { x, y } from "foo"
                     ts.forEach(node.exportClause.elements, checkExportSpecifier);
-                    var inAmbientExternalModule = node.parent.kind === 245 /* ModuleBlock */ && ts.isAmbientModule(node.parent.parent);
-                    var inAmbientNamespaceDeclaration = !inAmbientExternalModule && node.parent.kind === 245 /* ModuleBlock */ &&
+                    var inAmbientExternalModule = node.parent.kind === 246 /* ModuleBlock */ && ts.isAmbientModule(node.parent.parent);
+                    var inAmbientNamespaceDeclaration = !inAmbientExternalModule && node.parent.kind === 246 /* ModuleBlock */ &&
                         !node.moduleSpecifier && node.flags & 4194304 /* Ambient */;
-                    if (node.parent.kind !== 284 /* SourceFile */ && !inAmbientExternalModule && !inAmbientNamespaceDeclaration) {
+                    if (node.parent.kind !== 285 /* SourceFile */ && !inAmbientExternalModule && !inAmbientNamespaceDeclaration) {
                         error(node, ts.Diagnostics.Export_declarations_are_not_permitted_in_a_namespace);
                     }
                 }
@@ -57043,13 +59106,13 @@ var ts;
                         error(node.moduleSpecifier, ts.Diagnostics.Module_0_uses_export_and_cannot_be_used_with_export_Asterisk, symbolToString(moduleSymbol));
                     }
                     if (moduleKind !== ts.ModuleKind.System && moduleKind !== ts.ModuleKind.ES2015 && moduleKind !== ts.ModuleKind.ESNext) {
-                        checkExternalEmitHelpers(node, 32768 /* ExportStar */);
+                        checkExternalEmitHelpers(node, 65536 /* ExportStar */);
                     }
                 }
             }
         }
         function checkGrammarModuleElementContext(node, errorMessage) {
-            var isInAppropriateContext = node.parent.kind === 284 /* SourceFile */ || node.parent.kind === 245 /* ModuleBlock */ || node.parent.kind === 244 /* ModuleDeclaration */;
+            var isInAppropriateContext = node.parent.kind === 285 /* SourceFile */ || node.parent.kind === 246 /* ModuleBlock */ || node.parent.kind === 245 /* ModuleDeclaration */;
             if (!isInAppropriateContext) {
                 grammarErrorOnFirstToken(node, errorMessage);
             }
@@ -57078,8 +59141,8 @@ var ts;
                 // If we hit an export assignment in an illegal context, just bail out to avoid cascading errors.
                 return;
             }
-            var container = node.parent.kind === 284 /* SourceFile */ ? node.parent : node.parent.parent;
-            if (container.kind === 244 /* ModuleDeclaration */ && !ts.isAmbientModule(container)) {
+            var container = node.parent.kind === 285 /* SourceFile */ ? node.parent : node.parent.parent;
+            if (container.kind === 245 /* ModuleDeclaration */ && !ts.isAmbientModule(container)) {
                 if (node.isExportEquals) {
                     error(node, ts.Diagnostics.An_export_assignment_cannot_be_used_in_a_namespace);
                 }
@@ -57092,7 +59155,7 @@ var ts;
             if (!checkGrammarDecoratorsAndModifiers(node) && ts.hasModifiers(node)) {
                 grammarErrorOnFirstToken(node, ts.Diagnostics.An_export_assignment_cannot_have_modifiers);
             }
-            if (node.expression.kind === 72 /* Identifier */) {
+            if (node.expression.kind === 73 /* Identifier */) {
                 markExportAsReferenced(node);
                 if (ts.getEmitDeclarations(compilerOptions)) {
                     collectLinkedAliases(node.expression, /*setVisibility*/ true);
@@ -57167,13 +59230,14 @@ var ts;
             return !ts.isAccessor(declaration);
         }
         function isNotOverload(declaration) {
-            return (declaration.kind !== 239 /* FunctionDeclaration */ && declaration.kind !== 156 /* MethodDeclaration */) ||
+            return (declaration.kind !== 240 /* FunctionDeclaration */ && declaration.kind !== 157 /* MethodDeclaration */) ||
                 !!declaration.body;
         }
         function checkSourceElement(node) {
             if (node) {
                 var saveCurrentNode = currentNode;
                 currentNode = node;
+                instantiationCount = 0;
                 checkSourceElementWorker(node);
                 currentNode = saveCurrentNode;
             }
@@ -57190,158 +59254,158 @@ var ts;
                 // Only bother checking on a few construct kinds.  We don't want to be excessively
                 // hitting the cancellation token on every node we check.
                 switch (kind) {
-                    case 244 /* ModuleDeclaration */:
-                    case 240 /* ClassDeclaration */:
-                    case 241 /* InterfaceDeclaration */:
-                    case 239 /* FunctionDeclaration */:
+                    case 245 /* ModuleDeclaration */:
+                    case 241 /* ClassDeclaration */:
+                    case 242 /* InterfaceDeclaration */:
+                    case 240 /* FunctionDeclaration */:
                         cancellationToken.throwIfCancellationRequested();
                 }
             }
             switch (kind) {
-                case 150 /* TypeParameter */:
+                case 151 /* TypeParameter */:
                     return checkTypeParameter(node);
-                case 151 /* Parameter */:
+                case 152 /* Parameter */:
                     return checkParameter(node);
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
                     return checkPropertyDeclaration(node);
-                case 165 /* FunctionType */:
-                case 166 /* ConstructorType */:
-                case 160 /* CallSignature */:
-                case 161 /* ConstructSignature */:
-                case 162 /* IndexSignature */:
+                case 166 /* FunctionType */:
+                case 167 /* ConstructorType */:
+                case 161 /* CallSignature */:
+                case 162 /* ConstructSignature */:
+                case 163 /* IndexSignature */:
                     return checkSignatureDeclaration(node);
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
                     return checkMethodDeclaration(node);
-                case 157 /* Constructor */:
+                case 158 /* Constructor */:
                     return checkConstructorDeclaration(node);
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     return checkAccessorDeclaration(node);
-                case 164 /* TypeReference */:
+                case 165 /* TypeReference */:
                     return checkTypeReferenceNode(node);
-                case 163 /* TypePredicate */:
+                case 164 /* TypePredicate */:
                     return checkTypePredicate(node);
-                case 167 /* TypeQuery */:
+                case 168 /* TypeQuery */:
                     return checkTypeQuery(node);
-                case 168 /* TypeLiteral */:
+                case 169 /* TypeLiteral */:
                     return checkTypeLiteral(node);
-                case 169 /* ArrayType */:
+                case 170 /* ArrayType */:
                     return checkArrayType(node);
-                case 170 /* TupleType */:
+                case 171 /* TupleType */:
                     return checkTupleType(node);
-                case 173 /* UnionType */:
-                case 174 /* IntersectionType */:
+                case 174 /* UnionType */:
+                case 175 /* IntersectionType */:
                     return checkUnionOrIntersectionType(node);
-                case 177 /* ParenthesizedType */:
-                case 171 /* OptionalType */:
-                case 172 /* RestType */:
+                case 178 /* ParenthesizedType */:
+                case 172 /* OptionalType */:
+                case 173 /* RestType */:
                     return checkSourceElement(node.type);
-                case 178 /* ThisType */:
+                case 179 /* ThisType */:
                     return checkThisType(node);
-                case 179 /* TypeOperator */:
+                case 180 /* TypeOperator */:
                     return checkTypeOperator(node);
-                case 175 /* ConditionalType */:
+                case 176 /* ConditionalType */:
                     return checkConditionalType(node);
-                case 176 /* InferType */:
+                case 177 /* InferType */:
                     return checkInferType(node);
-                case 183 /* ImportType */:
+                case 184 /* ImportType */:
                     return checkImportType(node);
-                case 300 /* JSDocAugmentsTag */:
+                case 301 /* JSDocAugmentsTag */:
                     return checkJSDocAugmentsTag(node);
-                case 309 /* JSDocTypedefTag */:
-                case 302 /* JSDocCallbackTag */:
+                case 311 /* JSDocTypedefTag */:
+                case 304 /* JSDocCallbackTag */:
                     return checkJSDocTypeAliasTag(node);
-                case 308 /* JSDocTemplateTag */:
+                case 310 /* JSDocTemplateTag */:
                     return checkJSDocTemplateTag(node);
-                case 307 /* JSDocTypeTag */:
+                case 309 /* JSDocTypeTag */:
                     return checkJSDocTypeTag(node);
-                case 304 /* JSDocParameterTag */:
+                case 306 /* JSDocParameterTag */:
                     return checkJSDocParameterTag(node);
-                case 294 /* JSDocFunctionType */:
+                case 295 /* JSDocFunctionType */:
                     checkJSDocFunctionType(node);
                 // falls through
-                case 292 /* JSDocNonNullableType */:
-                case 291 /* JSDocNullableType */:
-                case 289 /* JSDocAllType */:
-                case 290 /* JSDocUnknownType */:
-                case 297 /* JSDocTypeLiteral */:
+                case 293 /* JSDocNonNullableType */:
+                case 292 /* JSDocNullableType */:
+                case 290 /* JSDocAllType */:
+                case 291 /* JSDocUnknownType */:
+                case 298 /* JSDocTypeLiteral */:
                     checkJSDocTypeIsInJsFile(node);
                     ts.forEachChild(node, checkSourceElement);
                     return;
-                case 295 /* JSDocVariadicType */:
+                case 296 /* JSDocVariadicType */:
                     checkJSDocVariadicType(node);
                     return;
-                case 288 /* JSDocTypeExpression */:
+                case 289 /* JSDocTypeExpression */:
                     return checkSourceElement(node.type);
-                case 180 /* IndexedAccessType */:
+                case 181 /* IndexedAccessType */:
                     return checkIndexedAccessType(node);
-                case 181 /* MappedType */:
+                case 182 /* MappedType */:
                     return checkMappedType(node);
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     return checkFunctionDeclaration(node);
-                case 218 /* Block */:
-                case 245 /* ModuleBlock */:
+                case 219 /* Block */:
+                case 246 /* ModuleBlock */:
                     return checkBlock(node);
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     return checkVariableStatement(node);
-                case 221 /* ExpressionStatement */:
+                case 222 /* ExpressionStatement */:
                     return checkExpressionStatement(node);
-                case 222 /* IfStatement */:
+                case 223 /* IfStatement */:
                     return checkIfStatement(node);
-                case 223 /* DoStatement */:
+                case 224 /* DoStatement */:
                     return checkDoStatement(node);
-                case 224 /* WhileStatement */:
+                case 225 /* WhileStatement */:
                     return checkWhileStatement(node);
-                case 225 /* ForStatement */:
+                case 226 /* ForStatement */:
                     return checkForStatement(node);
-                case 226 /* ForInStatement */:
+                case 227 /* ForInStatement */:
                     return checkForInStatement(node);
-                case 227 /* ForOfStatement */:
+                case 228 /* ForOfStatement */:
                     return checkForOfStatement(node);
-                case 228 /* ContinueStatement */:
-                case 229 /* BreakStatement */:
+                case 229 /* ContinueStatement */:
+                case 230 /* BreakStatement */:
                     return checkBreakOrContinueStatement(node);
-                case 230 /* ReturnStatement */:
+                case 231 /* ReturnStatement */:
                     return checkReturnStatement(node);
-                case 231 /* WithStatement */:
+                case 232 /* WithStatement */:
                     return checkWithStatement(node);
-                case 232 /* SwitchStatement */:
+                case 233 /* SwitchStatement */:
                     return checkSwitchStatement(node);
-                case 233 /* LabeledStatement */:
+                case 234 /* LabeledStatement */:
                     return checkLabeledStatement(node);
-                case 234 /* ThrowStatement */:
+                case 235 /* ThrowStatement */:
                     return checkThrowStatement(node);
-                case 235 /* TryStatement */:
+                case 236 /* TryStatement */:
                     return checkTryStatement(node);
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     return checkVariableDeclaration(node);
-                case 186 /* BindingElement */:
+                case 187 /* BindingElement */:
                     return checkBindingElement(node);
-                case 240 /* ClassDeclaration */:
+                case 241 /* ClassDeclaration */:
                     return checkClassDeclaration(node);
-                case 241 /* InterfaceDeclaration */:
+                case 242 /* InterfaceDeclaration */:
                     return checkInterfaceDeclaration(node);
-                case 242 /* TypeAliasDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
                     return checkTypeAliasDeclaration(node);
-                case 243 /* EnumDeclaration */:
+                case 244 /* EnumDeclaration */:
                     return checkEnumDeclaration(node);
-                case 244 /* ModuleDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     return checkModuleDeclaration(node);
-                case 249 /* ImportDeclaration */:
+                case 250 /* ImportDeclaration */:
                     return checkImportDeclaration(node);
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return checkImportEqualsDeclaration(node);
-                case 255 /* ExportDeclaration */:
+                case 256 /* ExportDeclaration */:
                     return checkExportDeclaration(node);
-                case 254 /* ExportAssignment */:
+                case 255 /* ExportAssignment */:
                     return checkExportAssignment(node);
-                case 220 /* EmptyStatement */:
-                case 236 /* DebuggerStatement */:
+                case 221 /* EmptyStatement */:
+                case 237 /* DebuggerStatement */:
                     checkGrammarStatementInAmbientContext(node);
                     return;
-                case 258 /* MissingDeclaration */:
+                case 259 /* MissingDeclaration */:
                     return checkMissingDeclaration(node);
             }
         }
@@ -57434,24 +59498,25 @@ var ts;
         function checkDeferredNode(node) {
             var saveCurrentNode = currentNode;
             currentNode = node;
+            instantiationCount = 0;
             switch (node.kind) {
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
                     checkFunctionExpressionOrObjectLiteralMethodDeferred(node);
                     break;
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     checkAccessorDeclaration(node);
                     break;
-                case 209 /* ClassExpression */:
+                case 210 /* ClassExpression */:
                     checkClassExpressionDeferred(node);
                     break;
-                case 261 /* JsxSelfClosingElement */:
+                case 262 /* JsxSelfClosingElement */:
                     checkJsxSelfClosingElementDeferred(node);
                     break;
-                case 260 /* JsxElement */:
+                case 261 /* JsxElement */:
                     checkJsxElementDeferred(node);
                     break;
             }
@@ -57581,17 +59646,17 @@ var ts;
                         copySymbols(location.locals, meaning);
                     }
                     switch (location.kind) {
-                        case 284 /* SourceFile */:
+                        case 285 /* SourceFile */:
                             if (!ts.isExternalOrCommonJsModule(location))
                                 break;
                         // falls through
-                        case 244 /* ModuleDeclaration */:
+                        case 245 /* ModuleDeclaration */:
                             copySymbols(getSymbolOfNode(location).exports, meaning & 2623475 /* ModuleMember */);
                             break;
-                        case 243 /* EnumDeclaration */:
+                        case 244 /* EnumDeclaration */:
                             copySymbols(getSymbolOfNode(location).exports, meaning & 8 /* EnumMember */);
                             break;
-                        case 209 /* ClassExpression */:
+                        case 210 /* ClassExpression */:
                             var className = location.name;
                             if (className) {
                                 copySymbol(location.symbol, meaning);
@@ -57599,8 +59664,8 @@ var ts;
                         // falls through
                         // this fall-through is necessary because we would like to handle
                         // type parameter inside class expression similar to how we handle it in classDeclaration and interface Declaration
-                        case 240 /* ClassDeclaration */:
-                        case 241 /* InterfaceDeclaration */:
+                        case 241 /* ClassDeclaration */:
+                        case 242 /* InterfaceDeclaration */:
                             // If we didn't come from static member of class or interface,
                             // add the type parameters into the symbol table
                             // (type parameters of classDeclaration/classExpression and interface are in member property of the symbol.
@@ -57609,7 +59674,7 @@ var ts;
                                 copySymbols(getMembersOfSymbol(getSymbolOfNode(location)), meaning & 67897832 /* Type */);
                             }
                             break;
-                        case 196 /* FunctionExpression */:
+                        case 197 /* FunctionExpression */:
                             var funcName = location.name;
                             if (funcName) {
                                 copySymbol(location.symbol, meaning);
@@ -57651,17 +59716,17 @@ var ts;
             }
         }
         function isTypeDeclarationName(name) {
-            return name.kind === 72 /* Identifier */ &&
+            return name.kind === 73 /* Identifier */ &&
                 isTypeDeclaration(name.parent) &&
                 name.parent.name === name;
         }
         function isTypeDeclaration(node) {
             switch (node.kind) {
-                case 150 /* TypeParameter */:
-                case 240 /* ClassDeclaration */:
-                case 241 /* InterfaceDeclaration */:
-                case 242 /* TypeAliasDeclaration */:
-                case 243 /* EnumDeclaration */:
+                case 151 /* TypeParameter */:
+                case 241 /* ClassDeclaration */:
+                case 242 /* InterfaceDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
+                case 244 /* EnumDeclaration */:
                     return true;
                 default:
                     return false;
@@ -57669,16 +59734,16 @@ var ts;
         }
         // True if the given identifier is part of a type reference
         function isTypeReferenceIdentifier(node) {
-            while (node.parent.kind === 148 /* QualifiedName */) {
+            while (node.parent.kind === 149 /* QualifiedName */) {
                 node = node.parent;
             }
-            return node.parent.kind === 164 /* TypeReference */;
+            return node.parent.kind === 165 /* TypeReference */;
         }
         function isHeritageClauseElementIdentifier(node) {
-            while (node.parent.kind === 189 /* PropertyAccessExpression */) {
+            while (node.parent.kind === 190 /* PropertyAccessExpression */) {
                 node = node.parent;
             }
-            return node.parent.kind === 211 /* ExpressionWithTypeArguments */;
+            return node.parent.kind === 212 /* ExpressionWithTypeArguments */;
         }
         function forEachEnclosingClass(node, callback) {
             var result;
@@ -57706,13 +59771,13 @@ var ts;
             return !!forEachEnclosingClass(node, function (n) { return n === classDeclaration; });
         }
         function getLeftSideOfImportEqualsOrExportAssignment(nodeOnRightSide) {
-            while (nodeOnRightSide.parent.kind === 148 /* QualifiedName */) {
+            while (nodeOnRightSide.parent.kind === 149 /* QualifiedName */) {
                 nodeOnRightSide = nodeOnRightSide.parent;
             }
-            if (nodeOnRightSide.parent.kind === 248 /* ImportEqualsDeclaration */) {
+            if (nodeOnRightSide.parent.kind === 249 /* ImportEqualsDeclaration */) {
                 return nodeOnRightSide.parent.moduleReference === nodeOnRightSide ? nodeOnRightSide.parent : undefined;
             }
-            if (nodeOnRightSide.parent.kind === 254 /* ExportAssignment */) {
+            if (nodeOnRightSide.parent.kind === 255 /* ExportAssignment */) {
                 return nodeOnRightSide.parent.expression === nodeOnRightSide ? nodeOnRightSide.parent : undefined;
             }
             return undefined;
@@ -57738,7 +59803,7 @@ var ts;
                 node = parent;
                 parent = parent.parent;
             }
-            if (parent && parent.kind === 183 /* ImportType */ && parent.qualifier === node) {
+            if (parent && parent.kind === 184 /* ImportType */ && parent.qualifier === node) {
                 return parent;
             }
             return undefined;
@@ -57748,7 +59813,7 @@ var ts;
                 return getSymbolOfNode(entityName.parent);
             }
             if (ts.isInJSFile(entityName) &&
-                entityName.parent.kind === 189 /* PropertyAccessExpression */ &&
+                entityName.parent.kind === 190 /* PropertyAccessExpression */ &&
                 entityName.parent === entityName.parent.parent.left) {
                 // Check if this is a special property assignment
                 var specialPropertyAssignmentSymbol = getSpecialPropertyAssignmentSymbolFromEntityName(entityName);
@@ -57756,7 +59821,7 @@ var ts;
                     return specialPropertyAssignmentSymbol;
                 }
             }
-            if (entityName.parent.kind === 254 /* ExportAssignment */ && ts.isEntityNameExpression(entityName)) {
+            if (entityName.parent.kind === 255 /* ExportAssignment */ && ts.isEntityNameExpression(entityName)) {
                 // Even an entity name expression that doesn't resolve as an entityname may still typecheck as a property access expression
                 var success = resolveEntityName(entityName, 
                 /*all meanings*/ 67220415 /* Value */ | 67897832 /* Type */ | 1920 /* Namespace */ | 2097152 /* Alias */, /*ignoreErrors*/ true);
@@ -57766,7 +59831,7 @@ var ts;
             }
             else if (!ts.isPropertyAccessExpression(entityName) && isInRightSideOfImportOrExportAssignment(entityName)) {
                 // Since we already checked for ExportAssignment, this really could only be an Import
-                var importEqualsDeclaration = ts.getAncestor(entityName, 248 /* ImportEqualsDeclaration */);
+                var importEqualsDeclaration = ts.getAncestor(entityName, 249 /* ImportEqualsDeclaration */);
                 ts.Debug.assert(importEqualsDeclaration !== undefined);
                 return getSymbolOfPartOfRightHandSideOfImportEquals(entityName, /*dontResolveAlias*/ true);
             }
@@ -57784,7 +59849,7 @@ var ts;
             if (isHeritageClauseElementIdentifier(entityName)) {
                 var meaning = 0 /* None */;
                 // In an interface or class, we're definitely interested in a type.
-                if (entityName.parent.kind === 211 /* ExpressionWithTypeArguments */) {
+                if (entityName.parent.kind === 212 /* ExpressionWithTypeArguments */) {
                     meaning = 67897832 /* Type */;
                     // In a class 'extends' clause we are also looking for a value.
                     if (ts.isExpressionWithTypeArgumentsInClassExtendsClause(entityName.parent)) {
@@ -57800,10 +59865,10 @@ var ts;
                     return entityNameSymbol;
                 }
             }
-            if (entityName.parent.kind === 304 /* JSDocParameterTag */) {
+            if (entityName.parent.kind === 306 /* JSDocParameterTag */) {
                 return ts.getParameterSymbolFromJSDoc(entityName.parent);
             }
-            if (entityName.parent.kind === 150 /* TypeParameter */ && entityName.parent.parent.kind === 308 /* JSDocTemplateTag */) {
+            if (entityName.parent.kind === 151 /* TypeParameter */ && entityName.parent.parent.kind === 310 /* JSDocTemplateTag */) {
                 ts.Debug.assert(!ts.isInJSFile(entityName)); // Otherwise `isDeclarationName` would have been true.
                 var typeParameter = ts.getTypeParameterFromJsDoc(entityName.parent);
                 return typeParameter && typeParameter.symbol;
@@ -57813,19 +59878,19 @@ var ts;
                     // Missing entity name.
                     return undefined;
                 }
-                if (entityName.kind === 72 /* Identifier */) {
+                if (entityName.kind === 73 /* Identifier */) {
                     if (ts.isJSXTagName(entityName) && isJsxIntrinsicIdentifier(entityName)) {
                         var symbol = getIntrinsicTagSymbol(entityName.parent);
                         return symbol === unknownSymbol ? undefined : symbol;
                     }
                     return resolveEntityName(entityName, 67220415 /* Value */, /*ignoreErrors*/ false, /*dontResolveAlias*/ true);
                 }
-                else if (entityName.kind === 189 /* PropertyAccessExpression */ || entityName.kind === 148 /* QualifiedName */) {
+                else if (entityName.kind === 190 /* PropertyAccessExpression */ || entityName.kind === 149 /* QualifiedName */) {
                     var links = getNodeLinks(entityName);
                     if (links.resolvedSymbol) {
                         return links.resolvedSymbol;
                     }
-                    if (entityName.kind === 189 /* PropertyAccessExpression */) {
+                    if (entityName.kind === 190 /* PropertyAccessExpression */) {
                         checkPropertyAccessExpression(entityName);
                     }
                     else {
@@ -57835,17 +59900,17 @@ var ts;
                 }
             }
             else if (isTypeReferenceIdentifier(entityName)) {
-                var meaning = entityName.parent.kind === 164 /* TypeReference */ ? 67897832 /* Type */ : 1920 /* Namespace */;
+                var meaning = entityName.parent.kind === 165 /* TypeReference */ ? 67897832 /* Type */ : 1920 /* Namespace */;
                 return resolveEntityName(entityName, meaning, /*ignoreErrors*/ false, /*dontResolveAlias*/ true);
             }
-            if (entityName.parent.kind === 163 /* TypePredicate */) {
+            if (entityName.parent.kind === 164 /* TypePredicate */) {
                 return resolveEntityName(entityName, /*meaning*/ 1 /* FunctionScopedVariable */);
             }
             // Do we want to return undefined here?
             return undefined;
         }
         function getSymbolAtLocation(node) {
-            if (node.kind === 284 /* SourceFile */) {
+            if (node.kind === 285 /* SourceFile */) {
                 return ts.isExternalModule(node) ? getMergedSymbol(node.symbol) : undefined;
             }
             var parent = node.parent;
@@ -57864,12 +59929,12 @@ var ts;
             else if (ts.isLiteralComputedPropertyDeclarationName(node)) {
                 return getSymbolOfNode(parent.parent);
             }
-            if (node.kind === 72 /* Identifier */) {
+            if (node.kind === 73 /* Identifier */) {
                 if (isInRightSideOfImportOrExportAssignment(node)) {
                     return getSymbolOfEntityNameOrPropertyAccessExpression(node);
                 }
-                else if (parent.kind === 186 /* BindingElement */ &&
-                    grandParent.kind === 184 /* ObjectBindingPattern */ &&
+                else if (parent.kind === 187 /* BindingElement */ &&
+                    grandParent.kind === 185 /* ObjectBindingPattern */ &&
                     node === parent.propertyName) {
                     var typeOfPattern = getTypeOfNode(grandParent);
                     var propertyDeclaration = getPropertyOfType(typeOfPattern, node.escapedText);
@@ -57879,11 +59944,11 @@ var ts;
                 }
             }
             switch (node.kind) {
-                case 72 /* Identifier */:
-                case 189 /* PropertyAccessExpression */:
-                case 148 /* QualifiedName */:
+                case 73 /* Identifier */:
+                case 190 /* PropertyAccessExpression */:
+                case 149 /* QualifiedName */:
                     return getSymbolOfEntityNameOrPropertyAccessExpression(node);
-                case 100 /* ThisKeyword */:
+                case 101 /* ThisKeyword */:
                     var container = ts.getThisContainer(node, /*includeArrowFunctions*/ false);
                     if (ts.isFunctionLike(container)) {
                         var sig = getSignatureFromDeclaration(container);
@@ -57895,14 +59960,14 @@ var ts;
                         return checkExpression(node).symbol;
                     }
                 // falls through
-                case 178 /* ThisType */:
+                case 179 /* ThisType */:
                     return getTypeFromThisTypeNode(node).symbol;
-                case 98 /* SuperKeyword */:
+                case 99 /* SuperKeyword */:
                     return checkExpression(node).symbol;
-                case 124 /* ConstructorKeyword */:
+                case 125 /* ConstructorKeyword */:
                     // constructor keyword for an overload, should take us to the definition if it exist
                     var constructorDeclaration = node.parent;
-                    if (constructorDeclaration && constructorDeclaration.kind === 157 /* Constructor */) {
+                    if (constructorDeclaration && constructorDeclaration.kind === 158 /* Constructor */) {
                         return constructorDeclaration.parent.symbol;
                     }
                     return undefined;
@@ -57913,7 +59978,7 @@ var ts;
                     // 3). Dynamic import call or require in javascript
                     // 4). type A = import("./f/*gotToDefinitionHere*/oo")
                     if ((ts.isExternalModuleImportEqualsDeclaration(node.parent.parent) && ts.getExternalModuleImportEqualsDeclarationExpression(node.parent.parent) === node) ||
-                        ((node.parent.kind === 249 /* ImportDeclaration */ || node.parent.kind === 255 /* ExportDeclaration */) && node.parent.moduleSpecifier === node) ||
+                        ((node.parent.kind === 250 /* ImportDeclaration */ || node.parent.kind === 256 /* ExportDeclaration */) && node.parent.moduleSpecifier === node) ||
                         ((ts.isInJSFile(node) && ts.isRequireCall(node.parent, /*checkArgumentIsStringLiteralLike*/ false)) || ts.isImportCall(node.parent)) ||
                         (ts.isLiteralTypeNode(node.parent) && ts.isLiteralImportTypeNode(node.parent.parent) && node.parent.parent.argument === node.parent)) {
                         return resolveExternalModuleName(node, node);
@@ -57930,21 +59995,21 @@ var ts;
                             ? getTypeFromTypeNode(grandParent.objectType)
                             : undefined;
                     return objectType && getPropertyOfType(objectType, ts.escapeLeadingUnderscores(node.text));
-                case 80 /* DefaultKeyword */:
-                case 90 /* FunctionKeyword */:
+                case 81 /* DefaultKeyword */:
+                case 91 /* FunctionKeyword */:
                 case 37 /* EqualsGreaterThanToken */:
-                case 76 /* ClassKeyword */:
+                case 77 /* ClassKeyword */:
                     return getSymbolOfNode(node.parent);
-                case 183 /* ImportType */:
+                case 184 /* ImportType */:
                     return ts.isLiteralImportTypeNode(node) ? getSymbolAtLocation(node.argument.literal) : undefined;
-                case 85 /* ExportKeyword */:
+                case 86 /* ExportKeyword */:
                     return ts.isExportAssignment(node.parent) ? ts.Debug.assertDefined(node.parent.symbol) : undefined;
                 default:
                     return undefined;
             }
         }
         function getShorthandAssignmentValueSymbol(location) {
-            if (location && location.kind === 276 /* ShorthandPropertyAssignment */) {
+            if (location && location.kind === 277 /* ShorthandPropertyAssignment */) {
                 return resolveEntityName(location.name, 67220415 /* Value */ | 2097152 /* Alias */);
             }
             return undefined;
@@ -58011,33 +60076,35 @@ var ts;
         //     }
         // [ a ] from
         //     [a] = [ some array ...]
-        function getTypeOfArrayLiteralOrObjectLiteralDestructuringAssignment(expr) {
-            ts.Debug.assert(expr.kind === 188 /* ObjectLiteralExpression */ || expr.kind === 187 /* ArrayLiteralExpression */);
+        function getTypeOfAssignmentPattern(expr) {
+            ts.Debug.assert(expr.kind === 189 /* ObjectLiteralExpression */ || expr.kind === 188 /* ArrayLiteralExpression */);
             // If this is from "for of"
             //     for ( { a } of elems) {
             //     }
-            if (expr.parent.kind === 227 /* ForOfStatement */) {
+            if (expr.parent.kind === 228 /* ForOfStatement */) {
                 var iteratedType = checkRightHandSideOfForOf(expr.parent.expression, expr.parent.awaitModifier);
                 return checkDestructuringAssignment(expr, iteratedType || errorType);
             }
             // If this is from "for" initializer
             //     for ({a } = elems[0];.....) { }
-            if (expr.parent.kind === 204 /* BinaryExpression */) {
+            if (expr.parent.kind === 205 /* BinaryExpression */) {
                 var iteratedType = getTypeOfExpression(expr.parent.right);
                 return checkDestructuringAssignment(expr, iteratedType || errorType);
             }
             // If this is from nested object binding pattern
             //     for ({ skills: { primary, secondary } } = multiRobot, i = 0; i < 1; i++) {
-            if (expr.parent.kind === 275 /* PropertyAssignment */) {
-                var typeOfParentObjectLiteral = getTypeOfArrayLiteralOrObjectLiteralDestructuringAssignment(expr.parent.parent);
-                return checkObjectLiteralDestructuringPropertyAssignment(typeOfParentObjectLiteral || errorType, expr.parent); // TODO: GH#18217
+            if (expr.parent.kind === 276 /* PropertyAssignment */) {
+                var node_3 = ts.cast(expr.parent.parent, ts.isObjectLiteralExpression);
+                var typeOfParentObjectLiteral = getTypeOfAssignmentPattern(node_3) || errorType;
+                var propertyIndex = ts.indexOfNode(node_3.properties, expr.parent);
+                return checkObjectLiteralDestructuringPropertyAssignment(node_3, typeOfParentObjectLiteral, propertyIndex);
             }
             // Array literal assignment - array destructuring pattern
-            ts.Debug.assert(expr.parent.kind === 187 /* ArrayLiteralExpression */);
+            var node = ts.cast(expr.parent, ts.isArrayLiteralExpression);
             //    [{ property1: p1, property2 }] = elems;
-            var typeOfArrayLiteral = getTypeOfArrayLiteralOrObjectLiteralDestructuringAssignment(expr.parent);
-            var elementType = checkIteratedTypeOrElementType(typeOfArrayLiteral || errorType, expr.parent, /*allowStringInput*/ false, /*allowAsyncIterables*/ false) || errorType;
-            return checkArrayLiteralDestructuringElementAssignment(expr.parent, typeOfArrayLiteral, expr.parent.elements.indexOf(expr), elementType || errorType); // TODO: GH#18217
+            var typeOfArrayLiteral = getTypeOfAssignmentPattern(node) || errorType;
+            var elementType = checkIteratedTypeOrElementType(65 /* Destructuring */, typeOfArrayLiteral, undefinedType, expr.parent) || errorType;
+            return checkArrayLiteralDestructuringElementAssignment(node, typeOfArrayLiteral, node.elements.indexOf(expr), elementType);
         }
         // Gets the property symbol corresponding to the property in destructuring assignment
         // 'property1' from
@@ -58047,7 +60114,7 @@ var ts;
         //     [a] = [ property1, property2 ]
         function getPropertySymbolOfDestructuringAssignment(location) {
             // Get the type of the object or array literal and then look for property of given name in the type
-            var typeOfObjectLiteral = getTypeOfArrayLiteralOrObjectLiteralDestructuringAssignment(location.parent.parent);
+            var typeOfObjectLiteral = getTypeOfAssignmentPattern(ts.cast(location.parent.parent, ts.isAssignmentPattern));
             return typeOfObjectLiteral && getPropertyOfType(typeOfObjectLiteral, location.escapedText);
         }
         function getRegularTypeOfExpression(expr) {
@@ -58069,12 +60136,12 @@ var ts;
         function getClassElementPropertyKeyType(element) {
             var name = element.name;
             switch (name.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return getLiteralType(ts.idText(name));
                 case 8 /* NumericLiteral */:
                 case 10 /* StringLiteral */:
                     return getLiteralType(name.text);
-                case 149 /* ComputedPropertyName */:
+                case 150 /* ComputedPropertyName */:
                     var nameType = checkComputedPropertyName(name);
                     return isTypeAssignableToKind(nameType, 12288 /* ESSymbolLike */) ? nameType : stringType;
                 default:
@@ -58131,7 +60198,7 @@ var ts;
             if (!ts.isGeneratedIdentifier(nodeIn)) {
                 var node = ts.getParseTreeNode(nodeIn, ts.isIdentifier);
                 if (node) {
-                    var isPropertyName_1 = node.parent.kind === 189 /* PropertyAccessExpression */ && node.parent.name === node;
+                    var isPropertyName_1 = node.parent.kind === 190 /* PropertyAccessExpression */ && node.parent.name === node;
                     return !isPropertyName_1 && getReferencedValueSymbol(node) === argumentsSymbol;
                 }
             }
@@ -58187,7 +60254,7 @@ var ts;
                     }
                     var parentSymbol_1 = getParentOfSymbol(symbol);
                     if (parentSymbol_1) {
-                        if (parentSymbol_1.flags & 512 /* ValueModule */ && parentSymbol_1.valueDeclaration.kind === 284 /* SourceFile */) {
+                        if (parentSymbol_1.flags & 512 /* ValueModule */ && parentSymbol_1.valueDeclaration.kind === 285 /* SourceFile */) {
                             var symbolFile = parentSymbol_1.valueDeclaration;
                             var referenceFile = ts.getSourceFileOfNode(node);
                             // If `node` accesses an export and that export isn't in the same file, then symbol is a namespace export, so return undefined.
@@ -58213,12 +60280,16 @@ var ts;
             }
             return undefined;
         }
+        function isSymbolOfDestructuredElementOfCatchBinding(symbol) {
+            return ts.isBindingElement(symbol.valueDeclaration)
+                && ts.walkUpBindingElementsAndPatterns(symbol.valueDeclaration).parent.kind === 275 /* CatchClause */;
+        }
         function isSymbolOfDeclarationWithCollidingName(symbol) {
-            if (symbol.flags & 418 /* BlockScoped */) {
+            if (symbol.flags & 418 /* BlockScoped */ && !ts.isSourceFile(symbol.valueDeclaration)) {
                 var links = getSymbolLinks(symbol);
                 if (links.isDeclarationWithCollidingName === undefined) {
                     var container = ts.getEnclosingBlockScopeContainer(symbol.valueDeclaration);
-                    if (ts.isStatementWithLocals(container)) {
+                    if (ts.isStatementWithLocals(container) || isSymbolOfDestructuredElementOfCatchBinding(symbol)) {
                         var nodeLinks_1 = getNodeLinks(symbol.valueDeclaration);
                         if (resolveName(container.parent, symbol.escapedName, 67220415 /* Value */, /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined, /*isUse*/ false)) {
                             // redeclaration - always should be renamed
@@ -58242,7 +60313,7 @@ var ts;
                             //       they will not collide with anything
                             var isDeclaredInLoop = nodeLinks_1.flags & 524288 /* BlockScopedBindingInLoop */;
                             var inLoopInitializer = ts.isIterationStatement(container, /*lookInLabeledStatements*/ false);
-                            var inLoopBodyBlock = container.kind === 218 /* Block */ && ts.isIterationStatement(container.parent, /*lookInLabeledStatements*/ false);
+                            var inLoopBodyBlock = container.kind === 219 /* Block */ && ts.isIterationStatement(container.parent, /*lookInLabeledStatements*/ false);
                             links.isDeclarationWithCollidingName = !ts.isBlockScopedContainerTopLevel(container) && (!isDeclaredInLoop || (!inLoopInitializer && !inLoopBodyBlock));
                         }
                         else {
@@ -58283,18 +60354,18 @@ var ts;
         }
         function isValueAliasDeclaration(node) {
             switch (node.kind) {
-                case 248 /* ImportEqualsDeclaration */:
-                case 250 /* ImportClause */:
-                case 251 /* NamespaceImport */:
-                case 253 /* ImportSpecifier */:
-                case 257 /* ExportSpecifier */:
+                case 249 /* ImportEqualsDeclaration */:
+                case 251 /* ImportClause */:
+                case 252 /* NamespaceImport */:
+                case 254 /* ImportSpecifier */:
+                case 258 /* ExportSpecifier */:
                     return isAliasResolvedToValue(getSymbolOfNode(node) || unknownSymbol);
-                case 255 /* ExportDeclaration */:
+                case 256 /* ExportDeclaration */:
                     var exportClause = node.exportClause;
                     return !!exportClause && ts.some(exportClause.elements, isValueAliasDeclaration);
-                case 254 /* ExportAssignment */:
+                case 255 /* ExportAssignment */:
                     return node.expression
-                        && node.expression.kind === 72 /* Identifier */
+                        && node.expression.kind === 73 /* Identifier */
                         ? isAliasResolvedToValue(getSymbolOfNode(node) || unknownSymbol)
                         : true;
             }
@@ -58302,7 +60373,7 @@ var ts;
         }
         function isTopLevelValueImportEqualsWithEntityName(nodeIn) {
             var node = ts.getParseTreeNode(nodeIn, ts.isImportEqualsDeclaration);
-            if (node === undefined || node.parent.kind !== 284 /* SourceFile */ || !ts.isInternalModuleImportEqualsDeclaration(node)) {
+            if (node === undefined || node.parent.kind !== 285 /* SourceFile */ || !ts.isInternalModuleImportEqualsDeclaration(node)) {
                 // parent is not source file or it is not reference to internal module
                 return false;
             }
@@ -58403,15 +60474,15 @@ var ts;
         }
         function canHaveConstantValue(node) {
             switch (node.kind) {
-                case 278 /* EnumMember */:
-                case 189 /* PropertyAccessExpression */:
-                case 190 /* ElementAccessExpression */:
+                case 279 /* EnumMember */:
+                case 190 /* PropertyAccessExpression */:
+                case 191 /* ElementAccessExpression */:
                     return true;
             }
             return false;
         }
         function getConstantValue(node) {
-            if (node.kind === 278 /* EnumMember */) {
+            if (node.kind === 279 /* EnumMember */) {
                 return getEnumMemberValue(node);
             }
             var symbol = getNodeLinks(node).resolvedSymbol;
@@ -58496,7 +60567,7 @@ var ts;
         function createTypeOfDeclaration(declarationIn, enclosingDeclaration, flags, tracker, addUndefined) {
             var declaration = ts.getParseTreeNode(declarationIn, ts.isVariableLikeOrAccessor);
             if (!declaration) {
-                return ts.createToken(120 /* AnyKeyword */);
+                return ts.createToken(121 /* AnyKeyword */);
             }
             // Get type of the symbol if this is the valid symbol otherwise get type at location
             var symbol = getSymbolOfNode(declaration);
@@ -58515,7 +60586,7 @@ var ts;
         function createReturnTypeOfSignatureDeclaration(signatureDeclarationIn, enclosingDeclaration, flags, tracker) {
             var signatureDeclaration = ts.getParseTreeNode(signatureDeclarationIn, ts.isFunctionLike);
             if (!signatureDeclaration) {
-                return ts.createToken(120 /* AnyKeyword */);
+                return ts.createToken(121 /* AnyKeyword */);
             }
             var signature = getSignatureFromDeclaration(signatureDeclaration);
             return nodeBuilder.typeToTypeNode(getReturnTypeOfSignature(signature), enclosingDeclaration, flags | 1024 /* MultilineObjectLiterals */, tracker);
@@ -58523,7 +60594,7 @@ var ts;
         function createTypeOfExpression(exprIn, enclosingDeclaration, flags, tracker) {
             var expr = ts.getParseTreeNode(exprIn, ts.isExpression);
             if (!expr) {
-                return ts.createToken(120 /* AnyKeyword */);
+                return ts.createToken(121 /* AnyKeyword */);
             }
             var type = getWidenedType(getRegularTypeOfExpression(expr));
             return nodeBuilder.typeToTypeNode(type, enclosingDeclaration, flags | 1024 /* MultilineObjectLiterals */, tracker);
@@ -58642,17 +60713,17 @@ var ts;
                 isLateBound: function (nodeIn) {
                     var node = ts.getParseTreeNode(nodeIn, ts.isDeclaration);
                     var symbol = node && getSymbolOfNode(node);
-                    return !!(symbol && ts.getCheckFlags(symbol) & 2048 /* Late */);
+                    return !!(symbol && ts.getCheckFlags(symbol) & 4096 /* Late */);
                 },
                 getJsxFactoryEntity: function (location) { return location ? (getJsxNamespace(location), (ts.getSourceFileOfNode(location).localJsxFactory || _jsxFactoryEntity)) : _jsxFactoryEntity; },
                 getAllAccessorDeclarations: function (accessor) {
                     accessor = ts.getParseTreeNode(accessor, ts.isGetOrSetAccessorDeclaration); // TODO: GH#18217
-                    var otherKind = accessor.kind === 159 /* SetAccessor */ ? 158 /* GetAccessor */ : 159 /* SetAccessor */;
+                    var otherKind = accessor.kind === 160 /* SetAccessor */ ? 159 /* GetAccessor */ : 160 /* SetAccessor */;
                     var otherAccessor = ts.getDeclarationOfKind(getSymbolOfNode(accessor), otherKind);
                     var firstAccessor = otherAccessor && (otherAccessor.pos < accessor.pos) ? otherAccessor : accessor;
                     var secondAccessor = otherAccessor && (otherAccessor.pos < accessor.pos) ? accessor : otherAccessor;
-                    var setAccessor = accessor.kind === 159 /* SetAccessor */ ? accessor : otherAccessor;
-                    var getAccessor = accessor.kind === 158 /* GetAccessor */ ? accessor : otherAccessor;
+                    var setAccessor = accessor.kind === 160 /* SetAccessor */ ? accessor : otherAccessor;
+                    var getAccessor = accessor.kind === 159 /* GetAccessor */ ? accessor : otherAccessor;
                     return {
                         firstAccessor: firstAccessor,
                         secondAccessor: secondAccessor,
@@ -58668,7 +60739,7 @@ var ts;
                 }
             };
             function isInHeritageClause(node) {
-                return node.parent && node.parent.kind === 211 /* ExpressionWithTypeArguments */ && node.parent.parent && node.parent.parent.kind === 273 /* HeritageClause */;
+                return node.parent && node.parent.kind === 212 /* ExpressionWithTypeArguments */ && node.parent.parent && node.parent.parent.kind === 274 /* HeritageClause */;
             }
             // defined here to avoid outer scope pollution
             function getTypeReferenceDirectivesForEntityName(node) {
@@ -58680,7 +60751,7 @@ var ts;
                 // qualified names can only be used as types\namespaces
                 // identifiers are treated as values only if they appear in type queries
                 var meaning = 67897832 /* Type */ | 1920 /* Namespace */;
-                if ((node.kind === 72 /* Identifier */ && isInTypeQuery(node)) || (node.kind === 189 /* PropertyAccessExpression */ && !isInHeritageClause(node))) {
+                if ((node.kind === 73 /* Identifier */ && isInTypeQuery(node)) || (node.kind === 190 /* PropertyAccessExpression */ && !isInHeritageClause(node))) {
                     meaning = 67220415 /* Value */ | 1048576 /* ExportValue */;
                 }
                 var symbol = resolveEntityName(node, meaning, /*ignoreErrors*/ true);
@@ -58731,7 +60802,7 @@ var ts;
                         break;
                     }
                 }
-                if (current.valueDeclaration && current.valueDeclaration.kind === 284 /* SourceFile */ && current.flags & 512 /* ValueModule */) {
+                if (current.valueDeclaration && current.valueDeclaration.kind === 285 /* SourceFile */ && current.flags & 512 /* ValueModule */) {
                     return false;
                 }
                 // check that at least one declaration of top level symbol originates from type declaration file
@@ -58759,12 +60830,12 @@ var ts;
             }
         }
         function getExternalModuleFileFromDeclaration(declaration) {
-            var specifier = declaration.kind === 244 /* ModuleDeclaration */ ? ts.tryCast(declaration.name, ts.isStringLiteral) : ts.getExternalModuleName(declaration);
+            var specifier = declaration.kind === 245 /* ModuleDeclaration */ ? ts.tryCast(declaration.name, ts.isStringLiteral) : ts.getExternalModuleName(declaration);
             var moduleSymbol = resolveExternalModuleNameWorker(specifier, specifier, /*moduleNotFoundError*/ undefined); // TODO: GH#18217
             if (!moduleSymbol) {
                 return undefined;
             }
-            return ts.getDeclarationOfKind(moduleSymbol, 284 /* SourceFile */);
+            return ts.getDeclarationOfKind(moduleSymbol, 285 /* SourceFile */);
         }
         function initializeTypeChecker() {
             // Bind all source files and propagate errors
@@ -58781,6 +60852,15 @@ var ts;
                     continue;
                 }
                 if (!ts.isExternalOrCommonJsModule(file)) {
+                    // It is an error for a non-external-module (i.e. script) to declare its own `globalThis`.
+                    // We can't use `builtinGlobals` for this due to synthetic expando-namespace generation in JS files.
+                    var fileGlobalThisSymbol = file.locals.get("globalThis");
+                    if (fileGlobalThisSymbol) {
+                        for (var _d = 0, _e = fileGlobalThisSymbol.declarations; _d < _e.length; _d++) {
+                            var declaration = _e[_d];
+                            diagnostics.add(ts.createDiagnosticForNode(declaration, ts.Diagnostics.Declaration_name_conflicts_with_built_in_global_identifier_0, "globalThis"));
+                        }
+                    }
                     mergeSymbolTable(globals, file.locals);
                 }
                 if (file.jsGlobalAugmentations) {
@@ -58811,10 +60891,10 @@ var ts;
             if (augmentations) {
                 // merge _global_ module augmentations.
                 // this needs to be done after global symbol table is initialized to make sure that all ambient modules are indexed
-                for (var _d = 0, augmentations_1 = augmentations; _d < augmentations_1.length; _d++) {
-                    var list = augmentations_1[_d];
-                    for (var _e = 0, list_1 = list; _e < list_1.length; _e++) {
-                        var augmentation = list_1[_e];
+                for (var _f = 0, augmentations_1 = augmentations; _f < augmentations_1.length; _f++) {
+                    var list = augmentations_1[_f];
+                    for (var _g = 0, list_1 = list; _g < list_1.length; _g++) {
+                        var augmentation = list_1[_g];
                         if (!ts.isGlobalScopeAugmentation(augmentation.parent))
                             continue;
                         mergeModuleAugmentation(augmentation);
@@ -58826,6 +60906,7 @@ var ts;
             getSymbolLinks(undefinedSymbol).type = undefinedWideningType;
             getSymbolLinks(argumentsSymbol).type = getGlobalType("IArguments", /*arity*/ 0, /*reportErrors*/ true);
             getSymbolLinks(unknownSymbol).type = errorType;
+            getSymbolLinks(globalThisSymbol).type = createObjectType(16 /* Anonymous */, globalThisSymbol);
             // Initialize special types
             globalArrayType = getGlobalType("Array", /*arity*/ 1, /*reportErrors*/ true);
             globalObjectType = getGlobalType("Object", /*arity*/ 0, /*reportErrors*/ true);
@@ -58842,16 +60923,16 @@ var ts;
                 // autoArrayType is used as a marker, so even if global Array type is not defined, it needs to be a unique type
                 autoArrayType = createAnonymousType(undefined, emptySymbols, ts.emptyArray, ts.emptyArray, undefined, undefined);
             }
-            globalReadonlyArrayType = getGlobalTypeOrUndefined("ReadonlyArray", /*arity*/ 1);
+            globalReadonlyArrayType = getGlobalTypeOrUndefined("ReadonlyArray", /*arity*/ 1) || globalArrayType;
             anyReadonlyArrayType = globalReadonlyArrayType ? createTypeFromGenericGlobalType(globalReadonlyArrayType, [anyType]) : anyArrayType;
             globalThisType = getGlobalTypeOrUndefined("ThisType", /*arity*/ 1);
             if (augmentations) {
                 // merge _nonglobal_ module augmentations.
                 // this needs to be done after global symbol table is initialized to make sure that all ambient modules are indexed
-                for (var _f = 0, augmentations_2 = augmentations; _f < augmentations_2.length; _f++) {
-                    var list = augmentations_2[_f];
-                    for (var _g = 0, list_2 = list; _g < list_2.length; _g++) {
-                        var augmentation = list_2[_g];
+                for (var _h = 0, augmentations_2 = augmentations; _h < augmentations_2.length; _h++) {
+                    var list = augmentations_2[_h];
+                    for (var _j = 0, list_2 = list; _j < list_2.length; _j++) {
+                        var augmentation = list_2[_j];
                         if (ts.isGlobalScopeAugmentation(augmentation.parent))
                             continue;
                         mergeModuleAugmentation(augmentation);
@@ -58878,8 +60959,8 @@ var ts;
                 else {
                     // Otherwise issue top-level error since the files appear very identical in terms of what they contain
                     var list = ts.arrayFrom(conflictingSymbols.keys()).join(", ");
-                    diagnostics.add(addRelatedInfo(ts.createDiagnosticForNode(firstFile, ts.Diagnostics.Definitions_of_the_following_identifiers_conflict_with_those_in_another_file_Colon_0, list), ts.createDiagnosticForNode(secondFile, ts.Diagnostics.Conflicts_are_in_this_file)));
-                    diagnostics.add(addRelatedInfo(ts.createDiagnosticForNode(secondFile, ts.Diagnostics.Definitions_of_the_following_identifiers_conflict_with_those_in_another_file_Colon_0, list), ts.createDiagnosticForNode(firstFile, ts.Diagnostics.Conflicts_are_in_this_file)));
+                    diagnostics.add(ts.addRelatedInfo(ts.createDiagnosticForNode(firstFile, ts.Diagnostics.Definitions_of_the_following_identifiers_conflict_with_those_in_another_file_Colon_0, list), ts.createDiagnosticForNode(secondFile, ts.Diagnostics.Conflicts_are_in_this_file)));
+                    diagnostics.add(ts.addRelatedInfo(ts.createDiagnosticForNode(secondFile, ts.Diagnostics.Definitions_of_the_following_identifiers_conflict_with_those_in_another_file_Colon_0, list), ts.createDiagnosticForNode(firstFile, ts.Diagnostics.Conflicts_are_in_this_file)));
                 }
             });
             amalgamatedDuplicates = undefined;
@@ -58891,7 +60972,7 @@ var ts;
                     var helpersModule = resolveHelpersModule(sourceFile, location);
                     if (helpersModule !== unknownSymbol) {
                         var uncheckedHelpers = helpers & ~requestedExternalEmitHelpers;
-                        for (var helper = 1 /* FirstEmitHelper */; helper <= 65536 /* LastEmitHelper */; helper <<= 1) {
+                        for (var helper = 1 /* FirstEmitHelper */; helper <= 131072 /* LastEmitHelper */; helper <<= 1) {
                             if (uncheckedHelpers & helper) {
                                 var name = getHelperName(helper);
                                 var symbol = getSymbol(helpersModule.exports, ts.escapeLeadingUnderscores(name), 67220415 /* Value */);
@@ -58918,12 +60999,13 @@ var ts;
                 case 256 /* Values */: return "__values";
                 case 512 /* Read */: return "__read";
                 case 1024 /* Spread */: return "__spread";
-                case 2048 /* Await */: return "__await";
-                case 4096 /* AsyncGenerator */: return "__asyncGenerator";
-                case 8192 /* AsyncDelegator */: return "__asyncDelegator";
-                case 16384 /* AsyncValues */: return "__asyncValues";
-                case 32768 /* ExportStar */: return "__exportStar";
-                case 65536 /* MakeTemplateObject */: return "__makeTemplateObject";
+                case 2048 /* SpreadArrays */: return "__spreadArrays";
+                case 4096 /* Await */: return "__await";
+                case 8192 /* AsyncGenerator */: return "__asyncGenerator";
+                case 16384 /* AsyncDelegator */: return "__asyncDelegator";
+                case 32768 /* AsyncValues */: return "__asyncValues";
+                case 65536 /* ExportStar */: return "__exportStar";
+                case 131072 /* MakeTemplateObject */: return "__makeTemplateObject";
                 default: return ts.Debug.fail("Unrecognized helper");
             }
         }
@@ -58942,14 +61024,14 @@ var ts;
                 return false;
             }
             if (!ts.nodeCanBeDecorated(node, node.parent, node.parent.parent)) {
-                if (node.kind === 156 /* MethodDeclaration */ && !ts.nodeIsPresent(node.body)) {
+                if (node.kind === 157 /* MethodDeclaration */ && !ts.nodeIsPresent(node.body)) {
                     return grammarErrorOnFirstToken(node, ts.Diagnostics.A_decorator_can_only_decorate_a_method_implementation_not_an_overload);
                 }
                 else {
                     return grammarErrorOnFirstToken(node, ts.Diagnostics.Decorators_are_not_valid_here);
                 }
             }
-            else if (node.kind === 158 /* GetAccessor */ || node.kind === 159 /* SetAccessor */) {
+            else if (node.kind === 159 /* GetAccessor */ || node.kind === 160 /* SetAccessor */) {
                 var accessors = ts.getAllAccessorDeclarations(node.parent.members, node);
                 if (accessors.firstAccessor.decorators && node === accessors.secondAccessor) {
                     return grammarErrorOnFirstToken(node, ts.Diagnostics.Decorators_cannot_be_applied_to_multiple_get_Slashset_accessors_of_the_same_name);
@@ -58966,23 +61048,23 @@ var ts;
             var flags = 0 /* None */;
             for (var _i = 0, _a = node.modifiers; _i < _a.length; _i++) {
                 var modifier = _a[_i];
-                if (modifier.kind !== 133 /* ReadonlyKeyword */) {
-                    if (node.kind === 153 /* PropertySignature */ || node.kind === 155 /* MethodSignature */) {
+                if (modifier.kind !== 134 /* ReadonlyKeyword */) {
+                    if (node.kind === 154 /* PropertySignature */ || node.kind === 156 /* MethodSignature */) {
                         return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_type_member, ts.tokenToString(modifier.kind));
                     }
-                    if (node.kind === 162 /* IndexSignature */) {
+                    if (node.kind === 163 /* IndexSignature */) {
                         return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_an_index_signature, ts.tokenToString(modifier.kind));
                     }
                 }
                 switch (modifier.kind) {
-                    case 77 /* ConstKeyword */:
-                        if (node.kind !== 243 /* EnumDeclaration */) {
-                            return grammarErrorOnNode(node, ts.Diagnostics.A_class_member_cannot_have_the_0_keyword, ts.tokenToString(77 /* ConstKeyword */));
+                    case 78 /* ConstKeyword */:
+                        if (node.kind !== 244 /* EnumDeclaration */) {
+                            return grammarErrorOnNode(node, ts.Diagnostics.A_class_member_cannot_have_the_0_keyword, ts.tokenToString(78 /* ConstKeyword */));
                         }
                         break;
-                    case 115 /* PublicKeyword */:
-                    case 114 /* ProtectedKeyword */:
-                    case 113 /* PrivateKeyword */:
+                    case 116 /* PublicKeyword */:
+                    case 115 /* ProtectedKeyword */:
+                    case 114 /* PrivateKeyword */:
                         var text = visibilityToString(ts.modifierToFlag(modifier.kind));
                         if (flags & 28 /* AccessibilityModifier */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics.Accessibility_modifier_already_seen);
@@ -58996,11 +61078,11 @@ var ts;
                         else if (flags & 256 /* Async */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, text, "async");
                         }
-                        else if (node.parent.kind === 245 /* ModuleBlock */ || node.parent.kind === 284 /* SourceFile */) {
+                        else if (node.parent.kind === 246 /* ModuleBlock */ || node.parent.kind === 285 /* SourceFile */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_module_or_namespace_element, text);
                         }
                         else if (flags & 128 /* Abstract */) {
-                            if (modifier.kind === 113 /* PrivateKeyword */) {
+                            if (modifier.kind === 114 /* PrivateKeyword */) {
                                 return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_with_1_modifier, text, "abstract");
                             }
                             else {
@@ -59009,7 +61091,7 @@ var ts;
                         }
                         flags |= ts.modifierToFlag(modifier.kind);
                         break;
-                    case 116 /* StaticKeyword */:
+                    case 117 /* StaticKeyword */:
                         if (flags & 32 /* Static */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "static");
                         }
@@ -59019,10 +61101,10 @@ var ts;
                         else if (flags & 256 /* Async */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, "static", "async");
                         }
-                        else if (node.parent.kind === 245 /* ModuleBlock */ || node.parent.kind === 284 /* SourceFile */) {
+                        else if (node.parent.kind === 246 /* ModuleBlock */ || node.parent.kind === 285 /* SourceFile */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_module_or_namespace_element, "static");
                         }
-                        else if (node.kind === 151 /* Parameter */) {
+                        else if (node.kind === 152 /* Parameter */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "static");
                         }
                         else if (flags & 128 /* Abstract */) {
@@ -59031,18 +61113,18 @@ var ts;
                         flags |= 32 /* Static */;
                         lastStatic = modifier;
                         break;
-                    case 133 /* ReadonlyKeyword */:
+                    case 134 /* ReadonlyKeyword */:
                         if (flags & 64 /* Readonly */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "readonly");
                         }
-                        else if (node.kind !== 154 /* PropertyDeclaration */ && node.kind !== 153 /* PropertySignature */ && node.kind !== 162 /* IndexSignature */ && node.kind !== 151 /* Parameter */) {
+                        else if (node.kind !== 155 /* PropertyDeclaration */ && node.kind !== 154 /* PropertySignature */ && node.kind !== 163 /* IndexSignature */ && node.kind !== 152 /* Parameter */) {
                             // If node.kind === SyntaxKind.Parameter, checkParameter report an error if it's not a parameter property.
                             return grammarErrorOnNode(modifier, ts.Diagnostics.readonly_modifier_can_only_appear_on_a_property_declaration_or_index_signature);
                         }
                         flags |= 64 /* Readonly */;
                         lastReadonly = modifier;
                         break;
-                    case 85 /* ExportKeyword */:
+                    case 86 /* ExportKeyword */:
                         if (flags & 1 /* Export */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "export");
                         }
@@ -59055,52 +61137,52 @@ var ts;
                         else if (flags & 256 /* Async */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, "export", "async");
                         }
-                        else if (node.parent.kind === 240 /* ClassDeclaration */) {
+                        else if (node.parent.kind === 241 /* ClassDeclaration */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_class_element, "export");
                         }
-                        else if (node.kind === 151 /* Parameter */) {
+                        else if (node.kind === 152 /* Parameter */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "export");
                         }
                         flags |= 1 /* Export */;
                         break;
-                    case 80 /* DefaultKeyword */:
-                        var container = node.parent.kind === 284 /* SourceFile */ ? node.parent : node.parent.parent;
-                        if (container.kind === 244 /* ModuleDeclaration */ && !ts.isAmbientModule(container)) {
+                    case 81 /* DefaultKeyword */:
+                        var container = node.parent.kind === 285 /* SourceFile */ ? node.parent : node.parent.parent;
+                        if (container.kind === 245 /* ModuleDeclaration */ && !ts.isAmbientModule(container)) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics.A_default_export_can_only_be_used_in_an_ECMAScript_style_module);
                         }
                         flags |= 512 /* Default */;
                         break;
-                    case 125 /* DeclareKeyword */:
+                    case 126 /* DeclareKeyword */:
                         if (flags & 2 /* Ambient */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "declare");
                         }
                         else if (flags & 256 /* Async */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_in_an_ambient_context, "async");
                         }
-                        else if (node.parent.kind === 240 /* ClassDeclaration */) {
+                        else if (node.parent.kind === 241 /* ClassDeclaration */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_class_element, "declare");
                         }
-                        else if (node.kind === 151 /* Parameter */) {
+                        else if (node.kind === 152 /* Parameter */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "declare");
                         }
-                        else if ((node.parent.flags & 4194304 /* Ambient */) && node.parent.kind === 245 /* ModuleBlock */) {
+                        else if ((node.parent.flags & 4194304 /* Ambient */) && node.parent.kind === 246 /* ModuleBlock */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics.A_declare_modifier_cannot_be_used_in_an_already_ambient_context);
                         }
                         flags |= 2 /* Ambient */;
                         lastDeclare = modifier;
                         break;
-                    case 118 /* AbstractKeyword */:
+                    case 119 /* AbstractKeyword */:
                         if (flags & 128 /* Abstract */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "abstract");
                         }
-                        if (node.kind !== 240 /* ClassDeclaration */) {
-                            if (node.kind !== 156 /* MethodDeclaration */ &&
-                                node.kind !== 154 /* PropertyDeclaration */ &&
-                                node.kind !== 158 /* GetAccessor */ &&
-                                node.kind !== 159 /* SetAccessor */) {
+                        if (node.kind !== 241 /* ClassDeclaration */) {
+                            if (node.kind !== 157 /* MethodDeclaration */ &&
+                                node.kind !== 155 /* PropertyDeclaration */ &&
+                                node.kind !== 159 /* GetAccessor */ &&
+                                node.kind !== 160 /* SetAccessor */) {
                                 return grammarErrorOnNode(modifier, ts.Diagnostics.abstract_modifier_can_only_appear_on_a_class_method_or_property_declaration);
                             }
-                            if (!(node.parent.kind === 240 /* ClassDeclaration */ && ts.hasModifier(node.parent, 128 /* Abstract */))) {
+                            if (!(node.parent.kind === 241 /* ClassDeclaration */ && ts.hasModifier(node.parent, 128 /* Abstract */))) {
                                 return grammarErrorOnNode(modifier, ts.Diagnostics.Abstract_methods_can_only_appear_within_an_abstract_class);
                             }
                             if (flags & 32 /* Static */) {
@@ -59112,14 +61194,14 @@ var ts;
                         }
                         flags |= 128 /* Abstract */;
                         break;
-                    case 121 /* AsyncKeyword */:
+                    case 122 /* AsyncKeyword */:
                         if (flags & 256 /* Async */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "async");
                         }
                         else if (flags & 2 /* Ambient */ || node.parent.flags & 4194304 /* Ambient */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_in_an_ambient_context, "async");
                         }
-                        else if (node.kind === 151 /* Parameter */) {
+                        else if (node.kind === 152 /* Parameter */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "async");
                         }
                         flags |= 256 /* Async */;
@@ -59127,7 +61209,7 @@ var ts;
                         break;
                 }
             }
-            if (node.kind === 157 /* Constructor */) {
+            if (node.kind === 158 /* Constructor */) {
                 if (flags & 32 /* Static */) {
                     return grammarErrorOnNode(lastStatic, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "static");
                 }
@@ -59142,13 +61224,13 @@ var ts;
                 }
                 return false;
             }
-            else if ((node.kind === 249 /* ImportDeclaration */ || node.kind === 248 /* ImportEqualsDeclaration */) && flags & 2 /* Ambient */) {
+            else if ((node.kind === 250 /* ImportDeclaration */ || node.kind === 249 /* ImportEqualsDeclaration */) && flags & 2 /* Ambient */) {
                 return grammarErrorOnNode(lastDeclare, ts.Diagnostics.A_0_modifier_cannot_be_used_with_an_import_declaration, "declare");
             }
-            else if (node.kind === 151 /* Parameter */ && (flags & 92 /* ParameterPropertyModifier */) && ts.isBindingPattern(node.name)) {
+            else if (node.kind === 152 /* Parameter */ && (flags & 92 /* ParameterPropertyModifier */) && ts.isBindingPattern(node.name)) {
                 return grammarErrorOnNode(node, ts.Diagnostics.A_parameter_property_may_not_be_declared_using_a_binding_pattern);
             }
-            else if (node.kind === 151 /* Parameter */ && (flags & 92 /* ParameterPropertyModifier */) && node.dotDotDotToken) {
+            else if (node.kind === 152 /* Parameter */ && (flags & 92 /* ParameterPropertyModifier */) && node.dotDotDotToken) {
                 return grammarErrorOnNode(node, ts.Diagnostics.A_parameter_property_cannot_be_declared_using_a_rest_parameter);
             }
             if (flags & 256 /* Async */) {
@@ -59169,38 +61251,38 @@ var ts;
         }
         function shouldReportBadModifier(node) {
             switch (node.kind) {
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
-                case 157 /* Constructor */:
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
-                case 162 /* IndexSignature */:
-                case 244 /* ModuleDeclaration */:
-                case 249 /* ImportDeclaration */:
-                case 248 /* ImportEqualsDeclaration */:
-                case 255 /* ExportDeclaration */:
-                case 254 /* ExportAssignment */:
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
-                case 151 /* Parameter */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
+                case 158 /* Constructor */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
+                case 163 /* IndexSignature */:
+                case 245 /* ModuleDeclaration */:
+                case 250 /* ImportDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
+                case 256 /* ExportDeclaration */:
+                case 255 /* ExportAssignment */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
+                case 152 /* Parameter */:
                     return false;
                 default:
-                    if (node.parent.kind === 245 /* ModuleBlock */ || node.parent.kind === 284 /* SourceFile */) {
+                    if (node.parent.kind === 246 /* ModuleBlock */ || node.parent.kind === 285 /* SourceFile */) {
                         return false;
                     }
                     switch (node.kind) {
-                        case 239 /* FunctionDeclaration */:
-                            return nodeHasAnyModifiersExcept(node, 121 /* AsyncKeyword */);
-                        case 240 /* ClassDeclaration */:
-                            return nodeHasAnyModifiersExcept(node, 118 /* AbstractKeyword */);
-                        case 241 /* InterfaceDeclaration */:
-                        case 219 /* VariableStatement */:
-                        case 242 /* TypeAliasDeclaration */:
+                        case 240 /* FunctionDeclaration */:
+                            return nodeHasAnyModifiersExcept(node, 122 /* AsyncKeyword */);
+                        case 241 /* ClassDeclaration */:
+                            return nodeHasAnyModifiersExcept(node, 119 /* AbstractKeyword */);
+                        case 242 /* InterfaceDeclaration */:
+                        case 220 /* VariableStatement */:
+                        case 243 /* TypeAliasDeclaration */:
                             return true;
-                        case 243 /* EnumDeclaration */:
-                            return nodeHasAnyModifiersExcept(node, 77 /* ConstKeyword */);
+                        case 244 /* EnumDeclaration */:
+                            return nodeHasAnyModifiersExcept(node, 78 /* ConstKeyword */);
                         default:
                             ts.Debug.fail();
                             return false;
@@ -59212,10 +61294,10 @@ var ts;
         }
         function checkGrammarAsyncModifier(node, asyncModifier) {
             switch (node.kind) {
-                case 156 /* MethodDeclaration */:
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
+                case 157 /* MethodDeclaration */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
                     return false;
             }
             return grammarErrorOnNode(asyncModifier, ts.Diagnostics._0_modifier_cannot_be_used_here, "async");
@@ -59275,10 +61357,10 @@ var ts;
                     var nonSimpleParameters = getNonSimpleParameters(node.parameters);
                     if (ts.length(nonSimpleParameters)) {
                         ts.forEach(nonSimpleParameters, function (parameter) {
-                            addRelatedInfo(error(parameter, ts.Diagnostics.This_parameter_is_not_allowed_with_use_strict_directive), ts.createDiagnosticForNode(useStrictDirective_1, ts.Diagnostics.use_strict_directive_used_here));
+                            ts.addRelatedInfo(error(parameter, ts.Diagnostics.This_parameter_is_not_allowed_with_use_strict_directive), ts.createDiagnosticForNode(useStrictDirective_1, ts.Diagnostics.use_strict_directive_used_here));
                         });
                         var diagnostics_1 = nonSimpleParameters.map(function (parameter, index) { return (index === 0 ? ts.createDiagnosticForNode(parameter, ts.Diagnostics.Non_simple_parameter_declared_here) : ts.createDiagnosticForNode(parameter, ts.Diagnostics.and_here)); });
-                        addRelatedInfo.apply(void 0, [error(useStrictDirective_1, ts.Diagnostics.use_strict_directive_cannot_be_used_with_non_simple_parameter_list)].concat(diagnostics_1));
+                        ts.addRelatedInfo.apply(void 0, [error(useStrictDirective_1, ts.Diagnostics.use_strict_directive_cannot_be_used_with_non_simple_parameter_list)].concat(diagnostics_1));
                         return true;
                     }
                 }
@@ -59330,10 +61412,10 @@ var ts;
             if (!parameter.type) {
                 return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_must_have_a_type_annotation);
             }
-            if (parameter.type.kind !== 138 /* StringKeyword */ && parameter.type.kind !== 135 /* NumberKeyword */) {
+            if (parameter.type.kind !== 139 /* StringKeyword */ && parameter.type.kind !== 136 /* NumberKeyword */) {
                 var type = getTypeFromTypeNode(parameter.type);
                 if (type.flags & 4 /* String */ || type.flags & 8 /* Number */) {
-                    return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_type_cannot_be_a_type_alias_Consider_writing_0_Colon_1_Colon_2_instead, ts.getTextOfNode(parameter.name), typeToString(type), typeToString(getTypeFromTypeNode(node.type)));
+                    return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_type_cannot_be_a_type_alias_Consider_writing_0_Colon_1_Colon_2_instead, ts.getTextOfNode(parameter.name), typeToString(type), typeToString(node.type ? getTypeFromTypeNode(node.type) : anyType));
                 }
                 if (type.flags & 1048576 /* Union */ && allTypesAssignableToKind(type, 128 /* StringLiteral */, /*strict*/ true)) {
                     return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_type_cannot_be_a_union_type_Consider_using_a_mapped_object_type_instead);
@@ -59364,9 +61446,9 @@ var ts;
         }
         function checkGrammarForOmittedArgument(args) {
             if (args) {
-                for (var _i = 0, args_5 = args; _i < args_5.length; _i++) {
-                    var arg = args_5[_i];
-                    if (arg.kind === 210 /* OmittedExpression */) {
+                for (var _i = 0, args_4 = args; _i < args_4.length; _i++) {
+                    var arg = args_4[_i];
+                    if (arg.kind === 211 /* OmittedExpression */) {
                         return grammarErrorAtPos(arg, arg.pos, 0, ts.Diagnostics.Argument_expression_expected);
                     }
                 }
@@ -59396,7 +61478,7 @@ var ts;
             if (!checkGrammarDecoratorsAndModifiers(node) && node.heritageClauses) {
                 for (var _i = 0, _a = node.heritageClauses; _i < _a.length; _i++) {
                     var heritageClause = _a[_i];
-                    if (heritageClause.token === 86 /* ExtendsKeyword */) {
+                    if (heritageClause.token === 87 /* ExtendsKeyword */) {
                         if (seenExtendsClause) {
                             return grammarErrorOnFirstToken(heritageClause, ts.Diagnostics.extends_clause_already_seen);
                         }
@@ -59409,7 +61491,7 @@ var ts;
                         seenExtendsClause = true;
                     }
                     else {
-                        ts.Debug.assert(heritageClause.token === 109 /* ImplementsKeyword */);
+                        ts.Debug.assert(heritageClause.token === 110 /* ImplementsKeyword */);
                         if (seenImplementsClause) {
                             return grammarErrorOnFirstToken(heritageClause, ts.Diagnostics.implements_clause_already_seen);
                         }
@@ -59425,14 +61507,14 @@ var ts;
             if (node.heritageClauses) {
                 for (var _i = 0, _a = node.heritageClauses; _i < _a.length; _i++) {
                     var heritageClause = _a[_i];
-                    if (heritageClause.token === 86 /* ExtendsKeyword */) {
+                    if (heritageClause.token === 87 /* ExtendsKeyword */) {
                         if (seenExtendsClause) {
                             return grammarErrorOnFirstToken(heritageClause, ts.Diagnostics.extends_clause_already_seen);
                         }
                         seenExtendsClause = true;
                     }
                     else {
-                        ts.Debug.assert(heritageClause.token === 109 /* ImplementsKeyword */);
+                        ts.Debug.assert(heritageClause.token === 110 /* ImplementsKeyword */);
                         return grammarErrorOnFirstToken(heritageClause, ts.Diagnostics.Interface_declaration_cannot_have_implements_clause);
                     }
                     // Grammar checking heritageClause inside class declaration
@@ -59443,20 +61525,20 @@ var ts;
         }
         function checkGrammarComputedPropertyName(node) {
             // If node is not a computedPropertyName, just skip the grammar checking
-            if (node.kind !== 149 /* ComputedPropertyName */) {
+            if (node.kind !== 150 /* ComputedPropertyName */) {
                 return false;
             }
             var computedPropertyName = node;
-            if (computedPropertyName.expression.kind === 204 /* BinaryExpression */ && computedPropertyName.expression.operatorToken.kind === 27 /* CommaToken */) {
+            if (computedPropertyName.expression.kind === 205 /* BinaryExpression */ && computedPropertyName.expression.operatorToken.kind === 27 /* CommaToken */) {
                 return grammarErrorOnNode(computedPropertyName.expression, ts.Diagnostics.A_comma_expression_is_not_allowed_in_a_computed_property_name);
             }
             return false;
         }
         function checkGrammarForGenerator(node) {
             if (node.asteriskToken) {
-                ts.Debug.assert(node.kind === 239 /* FunctionDeclaration */ ||
-                    node.kind === 196 /* FunctionExpression */ ||
-                    node.kind === 156 /* MethodDeclaration */);
+                ts.Debug.assert(node.kind === 240 /* FunctionDeclaration */ ||
+                    node.kind === 197 /* FunctionExpression */ ||
+                    node.kind === 157 /* MethodDeclaration */);
                 if (node.flags & 4194304 /* Ambient */) {
                     return grammarErrorOnNode(node.asteriskToken, ts.Diagnostics.Generators_are_not_allowed_in_an_ambient_context);
                 }
@@ -59482,15 +61564,22 @@ var ts;
             var seen = ts.createUnderscoreEscapedMap();
             for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
                 var prop = _a[_i];
-                if (prop.kind === 277 /* SpreadAssignment */) {
+                if (prop.kind === 278 /* SpreadAssignment */) {
+                    if (inDestructuring) {
+                        // a rest property cannot be destructured any further
+                        var expression = ts.skipParentheses(prop.expression);
+                        if (ts.isArrayLiteralExpression(expression) || ts.isObjectLiteralExpression(expression)) {
+                            return grammarErrorOnNode(prop.expression, ts.Diagnostics.A_rest_element_cannot_contain_a_binding_pattern);
+                        }
+                    }
                     continue;
                 }
                 var name = prop.name;
-                if (name.kind === 149 /* ComputedPropertyName */) {
+                if (name.kind === 150 /* ComputedPropertyName */) {
                     // If the name is not a ComputedPropertyName, the grammar checking will skip it
                     checkGrammarComputedPropertyName(name);
                 }
-                if (prop.kind === 276 /* ShorthandPropertyAssignment */ && !inDestructuring && prop.objectAssignmentInitializer) {
+                if (prop.kind === 277 /* ShorthandPropertyAssignment */ && !inDestructuring && prop.objectAssignmentInitializer) {
                     // having objectAssignmentInitializer is only valid in ObjectAssignmentPattern
                     // outside of destructuring it is a syntax error
                     return grammarErrorOnNode(prop.equalsToken, ts.Diagnostics.can_only_be_used_in_an_object_literal_property_inside_a_destructuring_assignment);
@@ -59499,7 +61588,7 @@ var ts;
                 if (prop.modifiers) {
                     for (var _b = 0, _c = prop.modifiers; _b < _c.length; _b++) { // TODO: GH#19955
                         var mod = _c[_b];
-                        if (mod.kind !== 121 /* AsyncKeyword */ || prop.kind !== 156 /* MethodDeclaration */) {
+                        if (mod.kind !== 122 /* AsyncKeyword */ || prop.kind !== 157 /* MethodDeclaration */) {
                             grammarErrorOnNode(mod, ts.Diagnostics._0_modifier_cannot_be_used_here, ts.getTextOfNode(mod));
                         }
                     }
@@ -59514,23 +61603,23 @@ var ts;
                 // and either both previous and propId.descriptor have[[Get]] fields or both previous and propId.descriptor have[[Set]] fields
                 var currentKind = void 0;
                 switch (prop.kind) {
-                    case 276 /* ShorthandPropertyAssignment */:
+                    case 277 /* ShorthandPropertyAssignment */:
                         checkGrammarForInvalidExclamationToken(prop.exclamationToken, ts.Diagnostics.A_definite_assignment_assertion_is_not_permitted_in_this_context);
                     /* tslint:disable:no-switch-case-fall-through */
-                    case 275 /* PropertyAssignment */:
+                    case 276 /* PropertyAssignment */:
                         // Grammar checking for computedPropertyName and shorthandPropertyAssignment
                         checkGrammarForInvalidQuestionMark(prop.questionToken, ts.Diagnostics.An_object_member_cannot_be_declared_optional);
                         if (name.kind === 8 /* NumericLiteral */) {
                             checkGrammarNumericLiteral(name);
                         }
                     // falls through
-                    case 156 /* MethodDeclaration */:
+                    case 157 /* MethodDeclaration */:
                         currentKind = 1 /* Property */;
                         break;
-                    case 158 /* GetAccessor */:
+                    case 159 /* GetAccessor */:
                         currentKind = 2 /* GetAccessor */;
                         break;
-                    case 159 /* SetAccessor */:
+                    case 160 /* SetAccessor */:
                         currentKind = 4 /* SetAccessor */;
                         break;
                     default:
@@ -59567,7 +61656,7 @@ var ts;
             var seen = ts.createUnderscoreEscapedMap();
             for (var _i = 0, _a = node.attributes.properties; _i < _a.length; _i++) {
                 var attr = _a[_i];
-                if (attr.kind === 269 /* JsxSpreadAttribute */) {
+                if (attr.kind === 270 /* JsxSpreadAttribute */) {
                     continue;
                 }
                 var name = attr.name, initializer = attr.initializer;
@@ -59577,21 +61666,39 @@ var ts;
                 else {
                     return grammarErrorOnNode(name, ts.Diagnostics.JSX_elements_cannot_have_multiple_attributes_with_the_same_name);
                 }
-                if (initializer && initializer.kind === 270 /* JsxExpression */ && !initializer.expression) {
+                if (initializer && initializer.kind === 271 /* JsxExpression */ && !initializer.expression) {
                     return grammarErrorOnNode(initializer, ts.Diagnostics.JSX_attributes_must_only_be_assigned_a_non_empty_expression);
                 }
             }
         }
+        function checkGrammarJsxExpression(node) {
+            if (node.expression && ts.isCommaSequence(node.expression)) {
+                return grammarErrorOnNode(node.expression, ts.Diagnostics.JSX_expressions_may_not_use_the_comma_operator_Did_you_mean_to_write_an_array);
+            }
+        }
         function checkGrammarForInOrForOfStatement(forInOrOfStatement) {
             if (checkGrammarStatementInAmbientContext(forInOrOfStatement)) {
                 return true;
             }
-            if (forInOrOfStatement.kind === 227 /* ForOfStatement */ && forInOrOfStatement.awaitModifier) {
+            if (forInOrOfStatement.kind === 228 /* ForOfStatement */ && forInOrOfStatement.awaitModifier) {
                 if ((forInOrOfStatement.flags & 16384 /* AwaitContext */) === 0 /* None */) {
-                    return grammarErrorOnNode(forInOrOfStatement.awaitModifier, ts.Diagnostics.A_for_await_of_statement_is_only_allowed_within_an_async_function_or_async_generator);
+                    // use of 'for-await-of' in non-async function
+                    var sourceFile = ts.getSourceFileOfNode(forInOrOfStatement);
+                    if (!hasParseDiagnostics(sourceFile)) {
+                        var diagnostic = ts.createDiagnosticForNode(forInOrOfStatement.awaitModifier, ts.Diagnostics.A_for_await_of_statement_is_only_allowed_within_an_async_function_or_async_generator);
+                        var func = ts.getContainingFunction(forInOrOfStatement);
+                        if (func && func.kind !== 158 /* Constructor */) {
+                            ts.Debug.assert((ts.getFunctionFlags(func) & 2 /* Async */) === 0, "Enclosing function should never be an async function.");
+                            var relatedInfo = ts.createDiagnosticForNode(func, ts.Diagnostics.Did_you_mean_to_mark_this_function_as_async);
+                            ts.addRelatedInfo(diagnostic, relatedInfo);
+                        }
+                        diagnostics.add(diagnostic);
+                        return true;
+                    }
+                    return false;
                 }
             }
-            if (forInOrOfStatement.initializer.kind === 238 /* VariableDeclarationList */) {
+            if (forInOrOfStatement.initializer.kind === 239 /* VariableDeclarationList */) {
                 var variableList = forInOrOfStatement.initializer;
                 if (!checkGrammarVariableDeclarationList(variableList)) {
                     var declarations = variableList.declarations;
@@ -59606,20 +61713,20 @@ var ts;
                         return false;
                     }
                     if (declarations.length > 1) {
-                        var diagnostic = forInOrOfStatement.kind === 226 /* ForInStatement */
+                        var diagnostic = forInOrOfStatement.kind === 227 /* ForInStatement */
                             ? ts.Diagnostics.Only_a_single_variable_declaration_is_allowed_in_a_for_in_statement
                             : ts.Diagnostics.Only_a_single_variable_declaration_is_allowed_in_a_for_of_statement;
                         return grammarErrorOnFirstToken(variableList.declarations[1], diagnostic);
                     }
                     var firstDeclaration = declarations[0];
                     if (firstDeclaration.initializer) {
-                        var diagnostic = forInOrOfStatement.kind === 226 /* ForInStatement */
+                        var diagnostic = forInOrOfStatement.kind === 227 /* ForInStatement */
                             ? ts.Diagnostics.The_variable_declaration_of_a_for_in_statement_cannot_have_an_initializer
                             : ts.Diagnostics.The_variable_declaration_of_a_for_of_statement_cannot_have_an_initializer;
                         return grammarErrorOnNode(firstDeclaration.name, diagnostic);
                     }
                     if (firstDeclaration.type) {
-                        var diagnostic = forInOrOfStatement.kind === 226 /* ForInStatement */
+                        var diagnostic = forInOrOfStatement.kind === 227 /* ForInStatement */
                             ? ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_use_a_type_annotation
                             : ts.Diagnostics.The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation;
                         return grammarErrorOnNode(firstDeclaration, diagnostic);
@@ -59646,11 +61753,11 @@ var ts;
                 return grammarErrorOnNode(accessor.name, ts.Diagnostics.An_accessor_cannot_have_type_parameters);
             }
             else if (!doesAccessorHaveCorrectParameterCount(accessor)) {
-                return grammarErrorOnNode(accessor.name, kind === 158 /* GetAccessor */ ?
+                return grammarErrorOnNode(accessor.name, kind === 159 /* GetAccessor */ ?
                     ts.Diagnostics.A_get_accessor_cannot_have_parameters :
                     ts.Diagnostics.A_set_accessor_must_have_exactly_one_parameter);
             }
-            else if (kind === 159 /* SetAccessor */) {
+            else if (kind === 160 /* SetAccessor */) {
                 if (accessor.type) {
                     return grammarErrorOnNode(accessor.name, ts.Diagnostics.A_set_accessor_cannot_have_a_return_type_annotation);
                 }
@@ -59674,23 +61781,23 @@ var ts;
          * A set accessor has one parameter or a `this` parameter and one more parameter.
          */
         function doesAccessorHaveCorrectParameterCount(accessor) {
-            return getAccessorThisParameter(accessor) || accessor.parameters.length === (accessor.kind === 158 /* GetAccessor */ ? 0 : 1);
+            return getAccessorThisParameter(accessor) || accessor.parameters.length === (accessor.kind === 159 /* GetAccessor */ ? 0 : 1);
         }
         function getAccessorThisParameter(accessor) {
-            if (accessor.parameters.length === (accessor.kind === 158 /* GetAccessor */ ? 1 : 2)) {
+            if (accessor.parameters.length === (accessor.kind === 159 /* GetAccessor */ ? 1 : 2)) {
                 return ts.getThisParameter(accessor);
             }
         }
         function checkGrammarTypeOperatorNode(node) {
-            if (node.operator === 142 /* UniqueKeyword */) {
-                if (node.type.kind !== 139 /* SymbolKeyword */) {
-                    return grammarErrorOnNode(node.type, ts.Diagnostics._0_expected, ts.tokenToString(139 /* SymbolKeyword */));
+            if (node.operator === 143 /* UniqueKeyword */) {
+                if (node.type.kind !== 140 /* SymbolKeyword */) {
+                    return grammarErrorOnNode(node.type, ts.Diagnostics._0_expected, ts.tokenToString(140 /* SymbolKeyword */));
                 }
                 var parent = ts.walkUpParenthesizedTypes(node.parent);
                 switch (parent.kind) {
-                    case 237 /* VariableDeclaration */:
+                    case 238 /* VariableDeclaration */:
                         var decl = parent;
-                        if (decl.name.kind !== 72 /* Identifier */) {
+                        if (decl.name.kind !== 73 /* Identifier */) {
                             return grammarErrorOnNode(node, ts.Diagnostics.unique_symbol_types_may_not_be_used_on_a_variable_declaration_with_a_binding_name);
                         }
                         if (!ts.isVariableDeclarationInVariableStatement(decl)) {
@@ -59700,13 +61807,13 @@ var ts;
                             return grammarErrorOnNode(parent.name, ts.Diagnostics.A_variable_whose_type_is_a_unique_symbol_type_must_be_const);
                         }
                         break;
-                    case 154 /* PropertyDeclaration */:
+                    case 155 /* PropertyDeclaration */:
                         if (!ts.hasModifier(parent, 32 /* Static */) ||
                             !ts.hasModifier(parent, 64 /* Readonly */)) {
                             return grammarErrorOnNode(parent.name, ts.Diagnostics.A_property_of_a_class_whose_type_is_a_unique_symbol_type_must_be_both_static_and_readonly);
                         }
                         break;
-                    case 153 /* PropertySignature */:
+                    case 154 /* PropertySignature */:
                         if (!ts.hasModifier(parent, 64 /* Readonly */)) {
                             return grammarErrorOnNode(parent.name, ts.Diagnostics.A_property_of_an_interface_or_type_literal_whose_type_is_a_unique_symbol_type_must_be_readonly);
                         }
@@ -59715,9 +61822,9 @@ var ts;
                         return grammarErrorOnNode(node, ts.Diagnostics.unique_symbol_types_are_not_allowed_here);
                 }
             }
-            else if (node.operator === 133 /* ReadonlyKeyword */) {
-                if (node.type.kind !== 169 /* ArrayType */ && node.type.kind !== 170 /* TupleType */) {
-                    return grammarErrorOnFirstToken(node, ts.Diagnostics.readonly_type_modifier_is_only_permitted_on_array_and_tuple_literal_types, ts.tokenToString(139 /* SymbolKeyword */));
+            else if (node.operator === 134 /* ReadonlyKeyword */) {
+                if (node.type.kind !== 170 /* ArrayType */ && node.type.kind !== 171 /* TupleType */) {
+                    return grammarErrorOnFirstToken(node, ts.Diagnostics.readonly_type_modifier_is_only_permitted_on_array_and_tuple_literal_types, ts.tokenToString(140 /* SymbolKeyword */));
                 }
             }
         }
@@ -59730,10 +61837,10 @@ var ts;
             if (checkGrammarFunctionLikeDeclaration(node)) {
                 return true;
             }
-            if (node.kind === 156 /* MethodDeclaration */) {
-                if (node.parent.kind === 188 /* ObjectLiteralExpression */) {
+            if (node.kind === 157 /* MethodDeclaration */) {
+                if (node.parent.kind === 189 /* ObjectLiteralExpression */) {
                     // We only disallow modifier on a method declaration if it is a property of object-literal-expression
-                    if (node.modifiers && !(node.modifiers.length === 1 && ts.first(node.modifiers).kind === 121 /* AsyncKeyword */)) {
+                    if (node.modifiers && !(node.modifiers.length === 1 && ts.first(node.modifiers).kind === 122 /* AsyncKeyword */)) {
                         return grammarErrorOnFirstToken(node, ts.Diagnostics.Modifiers_cannot_appear_here);
                     }
                     else if (checkGrammarForInvalidQuestionMark(node.questionToken, ts.Diagnostics.An_object_member_cannot_be_declared_optional)) {
@@ -59759,14 +61866,14 @@ var ts;
                 if (node.flags & 4194304 /* Ambient */) {
                     return checkGrammarForInvalidDynamicName(node.name, ts.Diagnostics.A_computed_property_name_in_an_ambient_context_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type);
                 }
-                else if (node.kind === 156 /* MethodDeclaration */ && !node.body) {
+                else if (node.kind === 157 /* MethodDeclaration */ && !node.body) {
                     return checkGrammarForInvalidDynamicName(node.name, ts.Diagnostics.A_computed_property_name_in_a_method_overload_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type);
                 }
             }
-            else if (node.parent.kind === 241 /* InterfaceDeclaration */) {
+            else if (node.parent.kind === 242 /* InterfaceDeclaration */) {
                 return checkGrammarForInvalidDynamicName(node.name, ts.Diagnostics.A_computed_property_name_in_an_interface_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type);
             }
-            else if (node.parent.kind === 168 /* TypeLiteral */) {
+            else if (node.parent.kind === 169 /* TypeLiteral */) {
                 return checkGrammarForInvalidDynamicName(node.name, ts.Diagnostics.A_computed_property_name_in_a_type_literal_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type);
             }
         }
@@ -59777,11 +61884,11 @@ var ts;
                     return grammarErrorOnNode(node, ts.Diagnostics.Jump_target_cannot_cross_function_boundary);
                 }
                 switch (current.kind) {
-                    case 233 /* LabeledStatement */:
+                    case 234 /* LabeledStatement */:
                         if (node.label && current.label.escapedText === node.label.escapedText) {
                             // found matching label - verify that label usage is correct
                             // continue can only target labels that are on iteration statements
-                            var isMisplacedContinueLabel = node.kind === 228 /* ContinueStatement */
+                            var isMisplacedContinueLabel = node.kind === 229 /* ContinueStatement */
                                 && !ts.isIterationStatement(current.statement, /*lookInLabeledStatement*/ true);
                             if (isMisplacedContinueLabel) {
                                 return grammarErrorOnNode(node, ts.Diagnostics.A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement);
@@ -59789,8 +61896,8 @@ var ts;
                             return false;
                         }
                         break;
-                    case 232 /* SwitchStatement */:
-                        if (node.kind === 229 /* BreakStatement */ && !node.label) {
+                    case 233 /* SwitchStatement */:
+                        if (node.kind === 230 /* BreakStatement */ && !node.label) {
                             // unlabeled break within switch statement - ok
                             return false;
                         }
@@ -59805,13 +61912,13 @@ var ts;
                 current = current.parent;
             }
             if (node.label) {
-                var message = node.kind === 229 /* BreakStatement */
+                var message = node.kind === 230 /* BreakStatement */
                     ? ts.Diagnostics.A_break_statement_can_only_jump_to_a_label_of_an_enclosing_statement
                     : ts.Diagnostics.A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement;
                 return grammarErrorOnNode(node, message);
             }
             else {
-                var message = node.kind === 229 /* BreakStatement */
+                var message = node.kind === 230 /* BreakStatement */
                     ? ts.Diagnostics.A_break_statement_can_only_be_used_within_an_enclosing_iteration_or_switch_statement
                     : ts.Diagnostics.A_continue_statement_can_only_be_used_within_an_enclosing_iteration_statement;
                 return grammarErrorOnNode(node, message);
@@ -59835,12 +61942,12 @@ var ts;
         }
         function isStringOrNumberLiteralExpression(expr) {
             return expr.kind === 10 /* StringLiteral */ || expr.kind === 8 /* NumericLiteral */ ||
-                expr.kind === 202 /* PrefixUnaryExpression */ && expr.operator === 39 /* MinusToken */ &&
+                expr.kind === 203 /* PrefixUnaryExpression */ && expr.operator === 39 /* MinusToken */ &&
                     expr.operand.kind === 8 /* NumericLiteral */;
         }
         function isBigIntLiteralExpression(expr) {
             return expr.kind === 9 /* BigIntLiteral */ ||
-                expr.kind === 202 /* PrefixUnaryExpression */ && expr.operator === 39 /* MinusToken */ &&
+                expr.kind === 203 /* PrefixUnaryExpression */ && expr.operator === 39 /* MinusToken */ &&
                     expr.operand.kind === 9 /* BigIntLiteral */;
         }
         function isSimpleLiteralEnumReference(expr) {
@@ -59853,7 +61960,7 @@ var ts;
             if (initializer) {
                 var isInvalidInitializer = !(isStringOrNumberLiteralExpression(initializer) ||
                     isSimpleLiteralEnumReference(initializer) ||
-                    initializer.kind === 102 /* TrueKeyword */ || initializer.kind === 87 /* FalseKeyword */ ||
+                    initializer.kind === 103 /* TrueKeyword */ || initializer.kind === 88 /* FalseKeyword */ ||
                     isBigIntLiteralExpression(initializer));
                 var isConstOrReadonly = ts.isDeclarationReadonly(node) || ts.isVariableDeclaration(node) && ts.isVarConst(node);
                 if (isConstOrReadonly && !node.type) {
@@ -59870,7 +61977,7 @@ var ts;
             }
         }
         function checkGrammarVariableDeclaration(node) {
-            if (node.parent.parent.kind !== 226 /* ForInStatement */ && node.parent.parent.kind !== 227 /* ForOfStatement */) {
+            if (node.parent.parent.kind !== 227 /* ForInStatement */ && node.parent.parent.kind !== 228 /* ForOfStatement */) {
                 if (node.flags & 4194304 /* Ambient */) {
                     checkAmbientInitializer(node);
                 }
@@ -59883,8 +61990,8 @@ var ts;
                     }
                 }
             }
-            if (node.exclamationToken && (node.parent.parent.kind !== 219 /* VariableStatement */ || !node.type || node.initializer || node.flags & 4194304 /* Ambient */)) {
-                return grammarErrorOnNode(node.exclamationToken, ts.Diagnostics.A_definite_assignment_assertion_is_not_permitted_in_this_context);
+            if (node.exclamationToken && (node.parent.parent.kind !== 220 /* VariableStatement */ || !node.type || node.initializer || node.flags & 4194304 /* Ambient */)) {
+                return grammarErrorOnNode(node.exclamationToken, ts.Diagnostics.Definite_assignment_assertions_can_only_be_used_along_with_a_type_annotation);
             }
             if (compilerOptions.module !== ts.ModuleKind.ES2015 && compilerOptions.module !== ts.ModuleKind.ESNext && compilerOptions.module !== ts.ModuleKind.System && !compilerOptions.noEmit &&
                 !(node.parent.parent.flags & 4194304 /* Ambient */) && ts.hasModifier(node.parent.parent, 1 /* Export */)) {
@@ -59900,7 +62007,7 @@ var ts;
             return checkLetConstNames && checkGrammarNameInLetOrConstDeclarations(node.name);
         }
         function checkESModuleMarker(name) {
-            if (name.kind === 72 /* Identifier */) {
+            if (name.kind === 73 /* Identifier */) {
                 if (ts.idText(name) === "__esModule") {
                     return grammarErrorOnNode(name, ts.Diagnostics.Identifier_expected_esModule_is_reserved_as_an_exported_marker_when_transforming_ECMAScript_modules);
                 }
@@ -59917,8 +62024,8 @@ var ts;
             return false;
         }
         function checkGrammarNameInLetOrConstDeclarations(name) {
-            if (name.kind === 72 /* Identifier */) {
-                if (name.originalKeywordKind === 111 /* LetKeyword */) {
+            if (name.kind === 73 /* Identifier */) {
+                if (name.originalKeywordKind === 112 /* LetKeyword */) {
                     return grammarErrorOnNode(name, ts.Diagnostics.let_is_not_allowed_to_be_used_as_a_name_in_let_or_const_declarations);
                 }
             }
@@ -59945,15 +62052,15 @@ var ts;
         }
         function allowLetAndConstDeclarations(parent) {
             switch (parent.kind) {
-                case 222 /* IfStatement */:
-                case 223 /* DoStatement */:
-                case 224 /* WhileStatement */:
-                case 231 /* WithStatement */:
-                case 225 /* ForStatement */:
-                case 226 /* ForInStatement */:
-                case 227 /* ForOfStatement */:
+                case 223 /* IfStatement */:
+                case 224 /* DoStatement */:
+                case 225 /* WhileStatement */:
+                case 232 /* WithStatement */:
+                case 226 /* ForStatement */:
+                case 227 /* ForInStatement */:
+                case 228 /* ForOfStatement */:
                     return false;
-                case 233 /* LabeledStatement */:
+                case 234 /* LabeledStatement */:
                     return allowLetAndConstDeclarations(parent.parent);
             }
             return true;
@@ -59971,12 +62078,12 @@ var ts;
         function checkGrammarMetaProperty(node) {
             var escapedText = node.name.escapedText;
             switch (node.keywordToken) {
-                case 95 /* NewKeyword */:
+                case 96 /* NewKeyword */:
                     if (escapedText !== "target") {
                         return grammarErrorOnNode(node.name, ts.Diagnostics._0_is_not_a_valid_meta_property_for_keyword_1_Did_you_mean_2, node.name.escapedText, ts.tokenToString(node.keywordToken), "target");
                     }
                     break;
-                case 92 /* ImportKeyword */:
+                case 93 /* ImportKeyword */:
                     if (escapedText !== "meta") {
                         return grammarErrorOnNode(node.name, ts.Diagnostics._0_is_not_a_valid_meta_property_for_keyword_1_Did_you_mean_2, node.name.escapedText, ts.tokenToString(node.keywordToken), "meta");
                     }
@@ -60027,11 +62134,14 @@ var ts;
         }
         function checkGrammarProperty(node) {
             if (ts.isClassLike(node.parent)) {
+                if (ts.isStringLiteral(node.name) && node.name.text === "constructor") {
+                    return grammarErrorOnNode(node.name, ts.Diagnostics.Classes_may_not_have_a_field_named_constructor);
+                }
                 if (checkGrammarForInvalidDynamicName(node.name, ts.Diagnostics.A_computed_property_name_in_a_class_property_declaration_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type)) {
                     return true;
                 }
             }
-            else if (node.parent.kind === 241 /* InterfaceDeclaration */) {
+            else if (node.parent.kind === 242 /* InterfaceDeclaration */) {
                 if (checkGrammarForInvalidDynamicName(node.name, ts.Diagnostics.A_computed_property_name_in_an_interface_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type)) {
                     return true;
                 }
@@ -60039,7 +62149,7 @@ var ts;
                     return grammarErrorOnNode(node.initializer, ts.Diagnostics.An_interface_property_cannot_have_an_initializer);
                 }
             }
-            else if (node.parent.kind === 168 /* TypeLiteral */) {
+            else if (node.parent.kind === 169 /* TypeLiteral */) {
                 if (checkGrammarForInvalidDynamicName(node.name, ts.Diagnostics.A_computed_property_name_in_a_type_literal_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type)) {
                     return true;
                 }
@@ -60068,22 +62178,22 @@ var ts;
             //     export_opt   AmbientDeclaration
             //
             // TODO: The spec needs to be amended to reflect this grammar.
-            if (node.kind === 241 /* InterfaceDeclaration */ ||
-                node.kind === 242 /* TypeAliasDeclaration */ ||
-                node.kind === 249 /* ImportDeclaration */ ||
-                node.kind === 248 /* ImportEqualsDeclaration */ ||
-                node.kind === 255 /* ExportDeclaration */ ||
-                node.kind === 254 /* ExportAssignment */ ||
-                node.kind === 247 /* NamespaceExportDeclaration */ ||
+            if (node.kind === 242 /* InterfaceDeclaration */ ||
+                node.kind === 243 /* TypeAliasDeclaration */ ||
+                node.kind === 250 /* ImportDeclaration */ ||
+                node.kind === 249 /* ImportEqualsDeclaration */ ||
+                node.kind === 256 /* ExportDeclaration */ ||
+                node.kind === 255 /* ExportAssignment */ ||
+                node.kind === 248 /* NamespaceExportDeclaration */ ||
                 ts.hasModifier(node, 2 /* Ambient */ | 1 /* Export */ | 512 /* Default */)) {
                 return false;
             }
-            return grammarErrorOnFirstToken(node, ts.Diagnostics.A_declare_modifier_is_required_for_a_top_level_declaration_in_a_d_ts_file);
+            return grammarErrorOnFirstToken(node, ts.Diagnostics.Top_level_declarations_in_d_ts_files_must_start_with_either_a_declare_or_export_modifier);
         }
         function checkGrammarTopLevelElementsForRequiredDeclareModifier(file) {
             for (var _i = 0, _a = file.statements; _i < _a.length; _i++) {
                 var decl = _a[_i];
-                if (ts.isDeclaration(decl) || decl.kind === 219 /* VariableStatement */) {
+                if (ts.isDeclaration(decl) || decl.kind === 220 /* VariableStatement */) {
                     if (checkGrammarTopLevelElementForRequiredDeclareModifier(decl)) {
                         return true;
                     }
@@ -60110,11 +62220,11 @@ var ts;
                 // to prevent noisiness.  So use a bit on the block to indicate if
                 // this has already been reported, and don't report if it has.
                 //
-                if (node.parent.kind === 218 /* Block */ || node.parent.kind === 245 /* ModuleBlock */ || node.parent.kind === 284 /* SourceFile */) {
-                    var links_2 = getNodeLinks(node.parent);
+                if (node.parent.kind === 219 /* Block */ || node.parent.kind === 246 /* ModuleBlock */ || node.parent.kind === 285 /* SourceFile */) {
+                    var links_1 = getNodeLinks(node.parent);
                     // Check if the containing block ever report this error
-                    if (!links_2.hasReportedStatementInAmbientContext) {
-                        return links_2.hasReportedStatementInAmbientContext = grammarErrorOnFirstToken(node, ts.Diagnostics.Statements_are_not_allowed_in_ambient_contexts);
+                    if (!links_1.hasReportedStatementInAmbientContext) {
+                        return links_1.hasReportedStatementInAmbientContext = grammarErrorOnFirstToken(node, ts.Diagnostics.Statements_are_not_allowed_in_ambient_contexts);
                     }
                 }
                 else {
@@ -60132,10 +62242,10 @@ var ts;
                 if (languageVersion >= 1 /* ES5 */) {
                     diagnosticMessage = ts.Diagnostics.Octal_literals_are_not_available_when_targeting_ECMAScript_5_and_higher_Use_the_syntax_0;
                 }
-                else if (ts.isChildOfNodeWithKind(node, 182 /* LiteralType */)) {
+                else if (ts.isChildOfNodeWithKind(node, 183 /* LiteralType */)) {
                     diagnosticMessage = ts.Diagnostics.Octal_literal_types_must_use_ES2015_syntax_Use_the_syntax_0;
                 }
-                else if (ts.isChildOfNodeWithKind(node, 278 /* EnumMember */)) {
+                else if (ts.isChildOfNodeWithKind(node, 279 /* EnumMember */)) {
                     diagnosticMessage = ts.Diagnostics.Octal_literals_are_not_allowed_in_enums_members_initializer_Use_the_syntax_0;
                 }
                 if (diagnosticMessage) {
@@ -60150,7 +62260,7 @@ var ts;
             var literalType = ts.isLiteralTypeNode(node.parent) ||
                 ts.isPrefixUnaryExpression(node.parent) && ts.isLiteralTypeNode(node.parent.parent);
             if (!literalType) {
-                if (languageVersion < 7 /* ESNext */) {
+                if (languageVersion < 99 /* ESNext */) {
                     if (grammarErrorOnNode(node, ts.Diagnostics.BigInt_literals_are_not_available_when_targeting_lower_than_ESNext)) {
                         return true;
                     }
@@ -60203,8 +62313,8 @@ var ts;
     /** Like 'isDeclarationName', but returns true for LHS of `import { x as y }` or `export { x as y }`. */
     function isDeclarationNameOrImportPropertyName(name) {
         switch (name.parent.kind) {
-            case 253 /* ImportSpecifier */:
-            case 257 /* ExportSpecifier */:
+            case 254 /* ImportSpecifier */:
+            case 258 /* ExportSpecifier */:
                 return ts.isIdentifier(name);
             default:
                 return ts.isDeclarationName(name);
@@ -60212,14 +62322,14 @@ var ts;
     }
     function isSomeImportDeclaration(decl) {
         switch (decl.kind) {
-            case 250 /* ImportClause */: // For default import
-            case 248 /* ImportEqualsDeclaration */:
-            case 251 /* NamespaceImport */:
-            case 253 /* ImportSpecifier */: // For rename import `x as y`
+            case 251 /* ImportClause */: // For default import
+            case 249 /* ImportEqualsDeclaration */:
+            case 252 /* NamespaceImport */:
+            case 254 /* ImportSpecifier */: // For rename import `x as y`
                 return true;
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 // For regular import, `decl` is an Identifier under the ImportSpecifier.
-                return decl.parent.kind === 253 /* ImportSpecifier */;
+                return decl.parent.kind === 254 /* ImportSpecifier */;
             default:
                 return false;
         }
@@ -60238,6 +62348,13 @@ var ts;
         JsxNames.LibraryManagedAttributes = "LibraryManagedAttributes";
         // tslint:enable variable-name
     })(JsxNames || (JsxNames = {}));
+    function getIterationTypesKeyFromIterationTypeKind(typeKind) {
+        switch (typeKind) {
+            case 0 /* Yield */: return "yieldType";
+            case 1 /* Return */: return "returnType";
+            case 2 /* Next */: return "nextType";
+        }
+    }
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
@@ -60347,7 +62464,7 @@ var ts;
         return node;
     }
     function createIdentifier(text, typeArguments) {
-        var node = createSynthesizedNode(72 /* Identifier */);
+        var node = createSynthesizedNode(73 /* Identifier */);
         node.escapedText = ts.escapeLeadingUnderscores(text);
         node.originalKeywordKind = text ? ts.stringToToken(text) : 0 /* Unknown */;
         node.autoGenerateFlags = 0 /* None */;
@@ -60428,23 +62545,23 @@ var ts;
     ts.createToken = createToken;
     // Reserved words
     function createSuper() {
-        return createSynthesizedNode(98 /* SuperKeyword */);
+        return createSynthesizedNode(99 /* SuperKeyword */);
     }
     ts.createSuper = createSuper;
     function createThis() {
-        return createSynthesizedNode(100 /* ThisKeyword */);
+        return createSynthesizedNode(101 /* ThisKeyword */);
     }
     ts.createThis = createThis;
     function createNull() {
-        return createSynthesizedNode(96 /* NullKeyword */);
+        return createSynthesizedNode(97 /* NullKeyword */);
     }
     ts.createNull = createNull;
     function createTrue() {
-        return createSynthesizedNode(102 /* TrueKeyword */);
+        return createSynthesizedNode(103 /* TrueKeyword */);
     }
     ts.createTrue = createTrue;
     function createFalse() {
-        return createSynthesizedNode(87 /* FalseKeyword */);
+        return createSynthesizedNode(88 /* FalseKeyword */);
     }
     ts.createFalse = createFalse;
     // Modifiers
@@ -60455,44 +62572,44 @@ var ts;
     function createModifiersFromModifierFlags(flags) {
         var result = [];
         if (flags & 1 /* Export */) {
-            result.push(createModifier(85 /* ExportKeyword */));
+            result.push(createModifier(86 /* ExportKeyword */));
         }
         if (flags & 2 /* Ambient */) {
-            result.push(createModifier(125 /* DeclareKeyword */));
+            result.push(createModifier(126 /* DeclareKeyword */));
         }
         if (flags & 512 /* Default */) {
-            result.push(createModifier(80 /* DefaultKeyword */));
+            result.push(createModifier(81 /* DefaultKeyword */));
         }
         if (flags & 2048 /* Const */) {
-            result.push(createModifier(77 /* ConstKeyword */));
+            result.push(createModifier(78 /* ConstKeyword */));
         }
         if (flags & 4 /* Public */) {
-            result.push(createModifier(115 /* PublicKeyword */));
+            result.push(createModifier(116 /* PublicKeyword */));
         }
         if (flags & 8 /* Private */) {
-            result.push(createModifier(113 /* PrivateKeyword */));
+            result.push(createModifier(114 /* PrivateKeyword */));
         }
         if (flags & 16 /* Protected */) {
-            result.push(createModifier(114 /* ProtectedKeyword */));
+            result.push(createModifier(115 /* ProtectedKeyword */));
         }
         if (flags & 128 /* Abstract */) {
-            result.push(createModifier(118 /* AbstractKeyword */));
+            result.push(createModifier(119 /* AbstractKeyword */));
         }
         if (flags & 32 /* Static */) {
-            result.push(createModifier(116 /* StaticKeyword */));
+            result.push(createModifier(117 /* StaticKeyword */));
         }
         if (flags & 64 /* Readonly */) {
-            result.push(createModifier(133 /* ReadonlyKeyword */));
+            result.push(createModifier(134 /* ReadonlyKeyword */));
         }
         if (flags & 256 /* Async */) {
-            result.push(createModifier(121 /* AsyncKeyword */));
+            result.push(createModifier(122 /* AsyncKeyword */));
         }
         return result;
     }
     ts.createModifiersFromModifierFlags = createModifiersFromModifierFlags;
     // Names
     function createQualifiedName(left, right) {
-        var node = createSynthesizedNode(148 /* QualifiedName */);
+        var node = createSynthesizedNode(149 /* QualifiedName */);
         node.left = left;
         node.right = asName(right);
         return node;
@@ -60511,7 +62628,7 @@ var ts;
             : expression;
     }
     function createComputedPropertyName(expression) {
-        var node = createSynthesizedNode(149 /* ComputedPropertyName */);
+        var node = createSynthesizedNode(150 /* ComputedPropertyName */);
         node.expression = parenthesizeForComputedName(expression);
         return node;
     }
@@ -60524,7 +62641,7 @@ var ts;
     ts.updateComputedPropertyName = updateComputedPropertyName;
     // Signature elements
     function createTypeParameterDeclaration(name, constraint, defaultType) {
-        var node = createSynthesizedNode(150 /* TypeParameter */);
+        var node = createSynthesizedNode(151 /* TypeParameter */);
         node.name = asName(name);
         node.constraint = constraint;
         node.default = defaultType;
@@ -60540,7 +62657,7 @@ var ts;
     }
     ts.updateTypeParameterDeclaration = updateTypeParameterDeclaration;
     function createParameter(decorators, modifiers, dotDotDotToken, name, questionToken, type, initializer) {
-        var node = createSynthesizedNode(151 /* Parameter */);
+        var node = createSynthesizedNode(152 /* Parameter */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.dotDotDotToken = dotDotDotToken;
@@ -60564,7 +62681,7 @@ var ts;
     }
     ts.updateParameter = updateParameter;
     function createDecorator(expression) {
-        var node = createSynthesizedNode(152 /* Decorator */);
+        var node = createSynthesizedNode(153 /* Decorator */);
         node.expression = ts.parenthesizeForAccess(expression);
         return node;
     }
@@ -60577,7 +62694,7 @@ var ts;
     ts.updateDecorator = updateDecorator;
     // Type Elements
     function createPropertySignature(modifiers, name, questionToken, type, initializer) {
-        var node = createSynthesizedNode(153 /* PropertySignature */);
+        var node = createSynthesizedNode(154 /* PropertySignature */);
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
         node.questionToken = questionToken;
@@ -60597,7 +62714,7 @@ var ts;
     }
     ts.updatePropertySignature = updatePropertySignature;
     function createProperty(decorators, modifiers, name, questionOrExclamationToken, type, initializer) {
-        var node = createSynthesizedNode(154 /* PropertyDeclaration */);
+        var node = createSynthesizedNode(155 /* PropertyDeclaration */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
@@ -60621,7 +62738,7 @@ var ts;
     }
     ts.updateProperty = updateProperty;
     function createMethodSignature(typeParameters, parameters, type, name, questionToken) {
-        var node = createSignatureDeclaration(155 /* MethodSignature */, typeParameters, parameters, type);
+        var node = createSignatureDeclaration(156 /* MethodSignature */, typeParameters, parameters, type);
         node.name = asName(name);
         node.questionToken = questionToken;
         return node;
@@ -60638,7 +62755,7 @@ var ts;
     }
     ts.updateMethodSignature = updateMethodSignature;
     function createMethod(decorators, modifiers, asteriskToken, name, questionToken, typeParameters, parameters, type, body) {
-        var node = createSynthesizedNode(156 /* MethodDeclaration */);
+        var node = createSynthesizedNode(157 /* MethodDeclaration */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.asteriskToken = asteriskToken;
@@ -60666,7 +62783,7 @@ var ts;
     }
     ts.updateMethod = updateMethod;
     function createConstructor(decorators, modifiers, parameters, body) {
-        var node = createSynthesizedNode(157 /* Constructor */);
+        var node = createSynthesizedNode(158 /* Constructor */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.typeParameters = undefined;
@@ -60686,7 +62803,7 @@ var ts;
     }
     ts.updateConstructor = updateConstructor;
     function createGetAccessor(decorators, modifiers, name, parameters, type, body) {
-        var node = createSynthesizedNode(158 /* GetAccessor */);
+        var node = createSynthesizedNode(159 /* GetAccessor */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
@@ -60709,7 +62826,7 @@ var ts;
     }
     ts.updateGetAccessor = updateGetAccessor;
     function createSetAccessor(decorators, modifiers, name, parameters, body) {
-        var node = createSynthesizedNode(159 /* SetAccessor */);
+        var node = createSynthesizedNode(160 /* SetAccessor */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
@@ -60730,7 +62847,7 @@ var ts;
     }
     ts.updateSetAccessor = updateSetAccessor;
     function createCallSignature(typeParameters, parameters, type) {
-        return createSignatureDeclaration(160 /* CallSignature */, typeParameters, parameters, type);
+        return createSignatureDeclaration(161 /* CallSignature */, typeParameters, parameters, type);
     }
     ts.createCallSignature = createCallSignature;
     function updateCallSignature(node, typeParameters, parameters, type) {
@@ -60738,7 +62855,7 @@ var ts;
     }
     ts.updateCallSignature = updateCallSignature;
     function createConstructSignature(typeParameters, parameters, type) {
-        return createSignatureDeclaration(161 /* ConstructSignature */, typeParameters, parameters, type);
+        return createSignatureDeclaration(162 /* ConstructSignature */, typeParameters, parameters, type);
     }
     ts.createConstructSignature = createConstructSignature;
     function updateConstructSignature(node, typeParameters, parameters, type) {
@@ -60746,7 +62863,7 @@ var ts;
     }
     ts.updateConstructSignature = updateConstructSignature;
     function createIndexSignature(decorators, modifiers, parameters, type) {
-        var node = createSynthesizedNode(162 /* IndexSignature */);
+        var node = createSynthesizedNode(163 /* IndexSignature */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.parameters = createNodeArray(parameters);
@@ -60786,7 +62903,7 @@ var ts;
     }
     ts.createKeywordTypeNode = createKeywordTypeNode;
     function createTypePredicateNode(parameterName, type) {
-        var node = createSynthesizedNode(163 /* TypePredicate */);
+        var node = createSynthesizedNode(164 /* TypePredicate */);
         node.parameterName = asName(parameterName);
         node.type = type;
         return node;
@@ -60800,7 +62917,7 @@ var ts;
     }
     ts.updateTypePredicateNode = updateTypePredicateNode;
     function createTypeReferenceNode(typeName, typeArguments) {
-        var node = createSynthesizedNode(164 /* TypeReference */);
+        var node = createSynthesizedNode(165 /* TypeReference */);
         node.typeName = asName(typeName);
         node.typeArguments = typeArguments && ts.parenthesizeTypeParameters(typeArguments);
         return node;
@@ -60814,7 +62931,7 @@ var ts;
     }
     ts.updateTypeReferenceNode = updateTypeReferenceNode;
     function createFunctionTypeNode(typeParameters, parameters, type) {
-        return createSignatureDeclaration(165 /* FunctionType */, typeParameters, parameters, type);
+        return createSignatureDeclaration(166 /* FunctionType */, typeParameters, parameters, type);
     }
     ts.createFunctionTypeNode = createFunctionTypeNode;
     function updateFunctionTypeNode(node, typeParameters, parameters, type) {
@@ -60822,7 +62939,7 @@ var ts;
     }
     ts.updateFunctionTypeNode = updateFunctionTypeNode;
     function createConstructorTypeNode(typeParameters, parameters, type) {
-        return createSignatureDeclaration(166 /* ConstructorType */, typeParameters, parameters, type);
+        return createSignatureDeclaration(167 /* ConstructorType */, typeParameters, parameters, type);
     }
     ts.createConstructorTypeNode = createConstructorTypeNode;
     function updateConstructorTypeNode(node, typeParameters, parameters, type) {
@@ -60830,7 +62947,7 @@ var ts;
     }
     ts.updateConstructorTypeNode = updateConstructorTypeNode;
     function createTypeQueryNode(exprName) {
-        var node = createSynthesizedNode(167 /* TypeQuery */);
+        var node = createSynthesizedNode(168 /* TypeQuery */);
         node.exprName = exprName;
         return node;
     }
@@ -60842,7 +62959,7 @@ var ts;
     }
     ts.updateTypeQueryNode = updateTypeQueryNode;
     function createTypeLiteralNode(members) {
-        var node = createSynthesizedNode(168 /* TypeLiteral */);
+        var node = createSynthesizedNode(169 /* TypeLiteral */);
         node.members = createNodeArray(members);
         return node;
     }
@@ -60854,7 +62971,7 @@ var ts;
     }
     ts.updateTypeLiteralNode = updateTypeLiteralNode;
     function createArrayTypeNode(elementType) {
-        var node = createSynthesizedNode(169 /* ArrayType */);
+        var node = createSynthesizedNode(170 /* ArrayType */);
         node.elementType = ts.parenthesizeArrayTypeMember(elementType);
         return node;
     }
@@ -60866,7 +62983,7 @@ var ts;
     }
     ts.updateArrayTypeNode = updateArrayTypeNode;
     function createTupleTypeNode(elementTypes) {
-        var node = createSynthesizedNode(170 /* TupleType */);
+        var node = createSynthesizedNode(171 /* TupleType */);
         node.elementTypes = createNodeArray(elementTypes);
         return node;
     }
@@ -60878,7 +62995,7 @@ var ts;
     }
     ts.updateTupleTypeNode = updateTupleTypeNode;
     function createOptionalTypeNode(type) {
-        var node = createSynthesizedNode(171 /* OptionalType */);
+        var node = createSynthesizedNode(172 /* OptionalType */);
         node.type = ts.parenthesizeArrayTypeMember(type);
         return node;
     }
@@ -60890,7 +63007,7 @@ var ts;
     }
     ts.updateOptionalTypeNode = updateOptionalTypeNode;
     function createRestTypeNode(type) {
-        var node = createSynthesizedNode(172 /* RestType */);
+        var node = createSynthesizedNode(173 /* RestType */);
         node.type = type;
         return node;
     }
@@ -60902,7 +63019,7 @@ var ts;
     }
     ts.updateRestTypeNode = updateRestTypeNode;
     function createUnionTypeNode(types) {
-        return createUnionOrIntersectionTypeNode(173 /* UnionType */, types);
+        return createUnionOrIntersectionTypeNode(174 /* UnionType */, types);
     }
     ts.createUnionTypeNode = createUnionTypeNode;
     function updateUnionTypeNode(node, types) {
@@ -60910,7 +63027,7 @@ var ts;
     }
     ts.updateUnionTypeNode = updateUnionTypeNode;
     function createIntersectionTypeNode(types) {
-        return createUnionOrIntersectionTypeNode(174 /* IntersectionType */, types);
+        return createUnionOrIntersectionTypeNode(175 /* IntersectionType */, types);
     }
     ts.createIntersectionTypeNode = createIntersectionTypeNode;
     function updateIntersectionTypeNode(node, types) {
@@ -60929,7 +63046,7 @@ var ts;
             : node;
     }
     function createConditionalTypeNode(checkType, extendsType, trueType, falseType) {
-        var node = createSynthesizedNode(175 /* ConditionalType */);
+        var node = createSynthesizedNode(176 /* ConditionalType */);
         node.checkType = ts.parenthesizeConditionalTypeMember(checkType);
         node.extendsType = ts.parenthesizeConditionalTypeMember(extendsType);
         node.trueType = trueType;
@@ -60947,7 +63064,7 @@ var ts;
     }
     ts.updateConditionalTypeNode = updateConditionalTypeNode;
     function createInferTypeNode(typeParameter) {
-        var node = createSynthesizedNode(176 /* InferType */);
+        var node = createSynthesizedNode(177 /* InferType */);
         node.typeParameter = typeParameter;
         return node;
     }
@@ -60959,10 +63076,10 @@ var ts;
     }
     ts.updateInferTypeNode = updateInferTypeNode;
     function createImportTypeNode(argument, qualifier, typeArguments, isTypeOf) {
-        var node = createSynthesizedNode(183 /* ImportType */);
+        var node = createSynthesizedNode(184 /* ImportType */);
         node.argument = argument;
         node.qualifier = qualifier;
-        node.typeArguments = asNodeArray(typeArguments);
+        node.typeArguments = ts.parenthesizeTypeParameters(typeArguments);
         node.isTypeOf = isTypeOf;
         return node;
     }
@@ -60977,7 +63094,7 @@ var ts;
     }
     ts.updateImportTypeNode = updateImportTypeNode;
     function createParenthesizedType(type) {
-        var node = createSynthesizedNode(177 /* ParenthesizedType */);
+        var node = createSynthesizedNode(178 /* ParenthesizedType */);
         node.type = type;
         return node;
     }
@@ -60989,12 +63106,12 @@ var ts;
     }
     ts.updateParenthesizedType = updateParenthesizedType;
     function createThisTypeNode() {
-        return createSynthesizedNode(178 /* ThisType */);
+        return createSynthesizedNode(179 /* ThisType */);
     }
     ts.createThisTypeNode = createThisTypeNode;
     function createTypeOperatorNode(operatorOrType, type) {
-        var node = createSynthesizedNode(179 /* TypeOperator */);
-        node.operator = typeof operatorOrType === "number" ? operatorOrType : 129 /* KeyOfKeyword */;
+        var node = createSynthesizedNode(180 /* TypeOperator */);
+        node.operator = typeof operatorOrType === "number" ? operatorOrType : 130 /* KeyOfKeyword */;
         node.type = ts.parenthesizeElementTypeMember(typeof operatorOrType === "number" ? type : operatorOrType);
         return node;
     }
@@ -61004,7 +63121,7 @@ var ts;
     }
     ts.updateTypeOperatorNode = updateTypeOperatorNode;
     function createIndexedAccessTypeNode(objectType, indexType) {
-        var node = createSynthesizedNode(180 /* IndexedAccessType */);
+        var node = createSynthesizedNode(181 /* IndexedAccessType */);
         node.objectType = ts.parenthesizeElementTypeMember(objectType);
         node.indexType = indexType;
         return node;
@@ -61018,7 +63135,7 @@ var ts;
     }
     ts.updateIndexedAccessTypeNode = updateIndexedAccessTypeNode;
     function createMappedTypeNode(readonlyToken, typeParameter, questionToken, type) {
-        var node = createSynthesizedNode(181 /* MappedType */);
+        var node = createSynthesizedNode(182 /* MappedType */);
         node.readonlyToken = readonlyToken;
         node.typeParameter = typeParameter;
         node.questionToken = questionToken;
@@ -61036,7 +63153,7 @@ var ts;
     }
     ts.updateMappedTypeNode = updateMappedTypeNode;
     function createLiteralTypeNode(literal) {
-        var node = createSynthesizedNode(182 /* LiteralType */);
+        var node = createSynthesizedNode(183 /* LiteralType */);
         node.literal = literal;
         return node;
     }
@@ -61049,7 +63166,7 @@ var ts;
     ts.updateLiteralTypeNode = updateLiteralTypeNode;
     // Binding Patterns
     function createObjectBindingPattern(elements) {
-        var node = createSynthesizedNode(184 /* ObjectBindingPattern */);
+        var node = createSynthesizedNode(185 /* ObjectBindingPattern */);
         node.elements = createNodeArray(elements);
         return node;
     }
@@ -61061,7 +63178,7 @@ var ts;
     }
     ts.updateObjectBindingPattern = updateObjectBindingPattern;
     function createArrayBindingPattern(elements) {
-        var node = createSynthesizedNode(185 /* ArrayBindingPattern */);
+        var node = createSynthesizedNode(186 /* ArrayBindingPattern */);
         node.elements = createNodeArray(elements);
         return node;
     }
@@ -61073,7 +63190,7 @@ var ts;
     }
     ts.updateArrayBindingPattern = updateArrayBindingPattern;
     function createBindingElement(dotDotDotToken, propertyName, name, initializer) {
-        var node = createSynthesizedNode(186 /* BindingElement */);
+        var node = createSynthesizedNode(187 /* BindingElement */);
         node.dotDotDotToken = dotDotDotToken;
         node.propertyName = asName(propertyName);
         node.name = asName(name);
@@ -61092,7 +63209,7 @@ var ts;
     ts.updateBindingElement = updateBindingElement;
     // Expression
     function createArrayLiteral(elements, multiLine) {
-        var node = createSynthesizedNode(187 /* ArrayLiteralExpression */);
+        var node = createSynthesizedNode(188 /* ArrayLiteralExpression */);
         node.elements = ts.parenthesizeListElements(createNodeArray(elements));
         if (multiLine)
             node.multiLine = true;
@@ -61106,7 +63223,7 @@ var ts;
     }
     ts.updateArrayLiteral = updateArrayLiteral;
     function createObjectLiteral(properties, multiLine) {
-        var node = createSynthesizedNode(188 /* ObjectLiteralExpression */);
+        var node = createSynthesizedNode(189 /* ObjectLiteralExpression */);
         node.properties = createNodeArray(properties);
         if (multiLine)
             node.multiLine = true;
@@ -61120,9 +63237,9 @@ var ts;
     }
     ts.updateObjectLiteral = updateObjectLiteral;
     function createPropertyAccess(expression, name) {
-        var node = createSynthesizedNode(189 /* PropertyAccessExpression */);
+        var node = createSynthesizedNode(190 /* PropertyAccessExpression */);
         node.expression = ts.parenthesizeForAccess(expression);
-        node.name = asName(name); // TODO: GH#18217
+        node.name = asName(name);
         setEmitFlags(node, 131072 /* NoIndentation */);
         return node;
     }
@@ -61137,7 +63254,7 @@ var ts;
     }
     ts.updatePropertyAccess = updatePropertyAccess;
     function createElementAccess(expression, index) {
-        var node = createSynthesizedNode(190 /* ElementAccessExpression */);
+        var node = createSynthesizedNode(191 /* ElementAccessExpression */);
         node.expression = ts.parenthesizeForAccess(expression);
         node.argumentExpression = asExpression(index);
         return node;
@@ -61151,7 +63268,7 @@ var ts;
     }
     ts.updateElementAccess = updateElementAccess;
     function createCall(expression, typeArguments, argumentsArray) {
-        var node = createSynthesizedNode(191 /* CallExpression */);
+        var node = createSynthesizedNode(192 /* CallExpression */);
         node.expression = ts.parenthesizeForAccess(expression);
         node.typeArguments = asNodeArray(typeArguments);
         node.arguments = ts.parenthesizeListElements(createNodeArray(argumentsArray));
@@ -61167,7 +63284,7 @@ var ts;
     }
     ts.updateCall = updateCall;
     function createNew(expression, typeArguments, argumentsArray) {
-        var node = createSynthesizedNode(192 /* NewExpression */);
+        var node = createSynthesizedNode(193 /* NewExpression */);
         node.expression = ts.parenthesizeForNew(expression);
         node.typeArguments = asNodeArray(typeArguments);
         node.arguments = argumentsArray ? ts.parenthesizeListElements(createNodeArray(argumentsArray)) : undefined;
@@ -61183,7 +63300,7 @@ var ts;
     }
     ts.updateNew = updateNew;
     function createTaggedTemplate(tag, typeArgumentsOrTemplate, template) {
-        var node = createSynthesizedNode(193 /* TaggedTemplateExpression */);
+        var node = createSynthesizedNode(194 /* TaggedTemplateExpression */);
         node.tag = ts.parenthesizeForAccess(tag);
         if (template) {
             node.typeArguments = asNodeArray(typeArgumentsOrTemplate);
@@ -61206,7 +63323,7 @@ var ts;
     }
     ts.updateTaggedTemplate = updateTaggedTemplate;
     function createTypeAssertion(type, expression) {
-        var node = createSynthesizedNode(194 /* TypeAssertionExpression */);
+        var node = createSynthesizedNode(195 /* TypeAssertionExpression */);
         node.type = type;
         node.expression = ts.parenthesizePrefixOperand(expression);
         return node;
@@ -61220,7 +63337,7 @@ var ts;
     }
     ts.updateTypeAssertion = updateTypeAssertion;
     function createParen(expression) {
-        var node = createSynthesizedNode(195 /* ParenthesizedExpression */);
+        var node = createSynthesizedNode(196 /* ParenthesizedExpression */);
         node.expression = expression;
         return node;
     }
@@ -61232,7 +63349,7 @@ var ts;
     }
     ts.updateParen = updateParen;
     function createFunctionExpression(modifiers, asteriskToken, name, typeParameters, parameters, type, body) {
-        var node = createSynthesizedNode(196 /* FunctionExpression */);
+        var node = createSynthesizedNode(197 /* FunctionExpression */);
         node.modifiers = asNodeArray(modifiers);
         node.asteriskToken = asteriskToken;
         node.name = asName(name);
@@ -61256,7 +63373,7 @@ var ts;
     }
     ts.updateFunctionExpression = updateFunctionExpression;
     function createArrowFunction(modifiers, typeParameters, parameters, type, equalsGreaterThanToken, body) {
-        var node = createSynthesizedNode(197 /* ArrowFunction */);
+        var node = createSynthesizedNode(198 /* ArrowFunction */);
         node.modifiers = asNodeArray(modifiers);
         node.typeParameters = asNodeArray(typeParameters);
         node.parameters = createNodeArray(parameters);
@@ -61278,7 +63395,7 @@ var ts;
     }
     ts.updateArrowFunction = updateArrowFunction;
     function createDelete(expression) {
-        var node = createSynthesizedNode(198 /* DeleteExpression */);
+        var node = createSynthesizedNode(199 /* DeleteExpression */);
         node.expression = ts.parenthesizePrefixOperand(expression);
         return node;
     }
@@ -61290,7 +63407,7 @@ var ts;
     }
     ts.updateDelete = updateDelete;
     function createTypeOf(expression) {
-        var node = createSynthesizedNode(199 /* TypeOfExpression */);
+        var node = createSynthesizedNode(200 /* TypeOfExpression */);
         node.expression = ts.parenthesizePrefixOperand(expression);
         return node;
     }
@@ -61302,7 +63419,7 @@ var ts;
     }
     ts.updateTypeOf = updateTypeOf;
     function createVoid(expression) {
-        var node = createSynthesizedNode(200 /* VoidExpression */);
+        var node = createSynthesizedNode(201 /* VoidExpression */);
         node.expression = ts.parenthesizePrefixOperand(expression);
         return node;
     }
@@ -61314,7 +63431,7 @@ var ts;
     }
     ts.updateVoid = updateVoid;
     function createAwait(expression) {
-        var node = createSynthesizedNode(201 /* AwaitExpression */);
+        var node = createSynthesizedNode(202 /* AwaitExpression */);
         node.expression = ts.parenthesizePrefixOperand(expression);
         return node;
     }
@@ -61326,7 +63443,7 @@ var ts;
     }
     ts.updateAwait = updateAwait;
     function createPrefix(operator, operand) {
-        var node = createSynthesizedNode(202 /* PrefixUnaryExpression */);
+        var node = createSynthesizedNode(203 /* PrefixUnaryExpression */);
         node.operator = operator;
         node.operand = ts.parenthesizePrefixOperand(operand);
         return node;
@@ -61339,7 +63456,7 @@ var ts;
     }
     ts.updatePrefix = updatePrefix;
     function createPostfix(operand, operator) {
-        var node = createSynthesizedNode(203 /* PostfixUnaryExpression */);
+        var node = createSynthesizedNode(204 /* PostfixUnaryExpression */);
         node.operand = ts.parenthesizePostfixOperand(operand);
         node.operator = operator;
         return node;
@@ -61352,7 +63469,7 @@ var ts;
     }
     ts.updatePostfix = updatePostfix;
     function createBinary(left, operator, right) {
-        var node = createSynthesizedNode(204 /* BinaryExpression */);
+        var node = createSynthesizedNode(205 /* BinaryExpression */);
         var operatorToken = asToken(operator);
         var operatorKind = operatorToken.kind;
         node.left = ts.parenthesizeBinaryOperand(operatorKind, left, /*isLeftSideOfBinary*/ true, /*leftOperand*/ undefined);
@@ -61369,7 +63486,7 @@ var ts;
     }
     ts.updateBinary = updateBinary;
     function createConditional(condition, questionTokenOrWhenTrue, whenTrueOrWhenFalse, colonToken, whenFalse) {
-        var node = createSynthesizedNode(205 /* ConditionalExpression */);
+        var node = createSynthesizedNode(206 /* ConditionalExpression */);
         node.condition = ts.parenthesizeForConditionalHead(condition);
         node.questionToken = whenFalse ? questionTokenOrWhenTrue : createToken(56 /* QuestionToken */);
         node.whenTrue = ts.parenthesizeSubexpressionOfConditionalExpression(whenFalse ? whenTrueOrWhenFalse : questionTokenOrWhenTrue);
@@ -61389,7 +63506,7 @@ var ts;
     }
     ts.updateConditional = updateConditional;
     function createTemplateExpression(head, templateSpans) {
-        var node = createSynthesizedNode(206 /* TemplateExpression */);
+        var node = createSynthesizedNode(207 /* TemplateExpression */);
         node.head = head;
         node.templateSpans = createNodeArray(templateSpans);
         return node;
@@ -61427,7 +63544,7 @@ var ts;
     }
     ts.createNoSubstitutionTemplateLiteral = createNoSubstitutionTemplateLiteral;
     function createYield(asteriskTokenOrExpression, expression) {
-        var node = createSynthesizedNode(207 /* YieldExpression */);
+        var node = createSynthesizedNode(208 /* YieldExpression */);
         node.asteriskToken = asteriskTokenOrExpression && asteriskTokenOrExpression.kind === 40 /* AsteriskToken */ ? asteriskTokenOrExpression : undefined;
         node.expression = asteriskTokenOrExpression && asteriskTokenOrExpression.kind !== 40 /* AsteriskToken */ ? asteriskTokenOrExpression : expression;
         return node;
@@ -61441,7 +63558,7 @@ var ts;
     }
     ts.updateYield = updateYield;
     function createSpread(expression) {
-        var node = createSynthesizedNode(208 /* SpreadElement */);
+        var node = createSynthesizedNode(209 /* SpreadElement */);
         node.expression = ts.parenthesizeExpressionForList(expression);
         return node;
     }
@@ -61453,7 +63570,7 @@ var ts;
     }
     ts.updateSpread = updateSpread;
     function createClassExpression(modifiers, name, typeParameters, heritageClauses, members) {
-        var node = createSynthesizedNode(209 /* ClassExpression */);
+        var node = createSynthesizedNode(210 /* ClassExpression */);
         node.decorators = undefined;
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
@@ -61474,11 +63591,11 @@ var ts;
     }
     ts.updateClassExpression = updateClassExpression;
     function createOmittedExpression() {
-        return createSynthesizedNode(210 /* OmittedExpression */);
+        return createSynthesizedNode(211 /* OmittedExpression */);
     }
     ts.createOmittedExpression = createOmittedExpression;
     function createExpressionWithTypeArguments(typeArguments, expression) {
-        var node = createSynthesizedNode(211 /* ExpressionWithTypeArguments */);
+        var node = createSynthesizedNode(212 /* ExpressionWithTypeArguments */);
         node.expression = ts.parenthesizeForAccess(expression);
         node.typeArguments = asNodeArray(typeArguments);
         return node;
@@ -61492,7 +63609,7 @@ var ts;
     }
     ts.updateExpressionWithTypeArguments = updateExpressionWithTypeArguments;
     function createAsExpression(expression, type) {
-        var node = createSynthesizedNode(212 /* AsExpression */);
+        var node = createSynthesizedNode(213 /* AsExpression */);
         node.expression = expression;
         node.type = type;
         return node;
@@ -61506,7 +63623,7 @@ var ts;
     }
     ts.updateAsExpression = updateAsExpression;
     function createNonNullExpression(expression) {
-        var node = createSynthesizedNode(213 /* NonNullExpression */);
+        var node = createSynthesizedNode(214 /* NonNullExpression */);
         node.expression = ts.parenthesizeForAccess(expression);
         return node;
     }
@@ -61518,7 +63635,7 @@ var ts;
     }
     ts.updateNonNullExpression = updateNonNullExpression;
     function createMetaProperty(keywordToken, name) {
-        var node = createSynthesizedNode(214 /* MetaProperty */);
+        var node = createSynthesizedNode(215 /* MetaProperty */);
         node.keywordToken = keywordToken;
         node.name = name;
         return node;
@@ -61532,7 +63649,7 @@ var ts;
     ts.updateMetaProperty = updateMetaProperty;
     // Misc
     function createTemplateSpan(expression, literal) {
-        var node = createSynthesizedNode(216 /* TemplateSpan */);
+        var node = createSynthesizedNode(217 /* TemplateSpan */);
         node.expression = expression;
         node.literal = literal;
         return node;
@@ -61546,12 +63663,12 @@ var ts;
     }
     ts.updateTemplateSpan = updateTemplateSpan;
     function createSemicolonClassElement() {
-        return createSynthesizedNode(217 /* SemicolonClassElement */);
+        return createSynthesizedNode(218 /* SemicolonClassElement */);
     }
     ts.createSemicolonClassElement = createSemicolonClassElement;
     // Element
     function createBlock(statements, multiLine) {
-        var block = createSynthesizedNode(218 /* Block */);
+        var block = createSynthesizedNode(219 /* Block */);
         block.statements = createNodeArray(statements);
         if (multiLine)
             block.multiLine = multiLine;
@@ -61565,7 +63682,7 @@ var ts;
     }
     ts.updateBlock = updateBlock;
     function createVariableStatement(modifiers, declarationList) {
-        var node = createSynthesizedNode(219 /* VariableStatement */);
+        var node = createSynthesizedNode(220 /* VariableStatement */);
         node.decorators = undefined;
         node.modifiers = asNodeArray(modifiers);
         node.declarationList = ts.isArray(declarationList) ? createVariableDeclarationList(declarationList) : declarationList;
@@ -61580,11 +63697,11 @@ var ts;
     }
     ts.updateVariableStatement = updateVariableStatement;
     function createEmptyStatement() {
-        return createSynthesizedNode(220 /* EmptyStatement */);
+        return createSynthesizedNode(221 /* EmptyStatement */);
     }
     ts.createEmptyStatement = createEmptyStatement;
     function createExpressionStatement(expression) {
-        var node = createSynthesizedNode(221 /* ExpressionStatement */);
+        var node = createSynthesizedNode(222 /* ExpressionStatement */);
         node.expression = ts.parenthesizeExpressionForExpressionStatement(expression);
         return node;
     }
@@ -61600,10 +63717,10 @@ var ts;
     /** @deprecated Use `updateExpressionStatement` instead.  */
     ts.updateStatement = updateExpressionStatement;
     function createIf(expression, thenStatement, elseStatement) {
-        var node = createSynthesizedNode(222 /* IfStatement */);
+        var node = createSynthesizedNode(223 /* IfStatement */);
         node.expression = expression;
-        node.thenStatement = thenStatement;
-        node.elseStatement = elseStatement;
+        node.thenStatement = asEmbeddedStatement(thenStatement);
+        node.elseStatement = asEmbeddedStatement(elseStatement);
         return node;
     }
     ts.createIf = createIf;
@@ -61616,8 +63733,8 @@ var ts;
     }
     ts.updateIf = updateIf;
     function createDo(statement, expression) {
-        var node = createSynthesizedNode(223 /* DoStatement */);
-        node.statement = statement;
+        var node = createSynthesizedNode(224 /* DoStatement */);
+        node.statement = asEmbeddedStatement(statement);
         node.expression = expression;
         return node;
     }
@@ -61630,9 +63747,9 @@ var ts;
     }
     ts.updateDo = updateDo;
     function createWhile(expression, statement) {
-        var node = createSynthesizedNode(224 /* WhileStatement */);
+        var node = createSynthesizedNode(225 /* WhileStatement */);
         node.expression = expression;
-        node.statement = statement;
+        node.statement = asEmbeddedStatement(statement);
         return node;
     }
     ts.createWhile = createWhile;
@@ -61644,11 +63761,11 @@ var ts;
     }
     ts.updateWhile = updateWhile;
     function createFor(initializer, condition, incrementor, statement) {
-        var node = createSynthesizedNode(225 /* ForStatement */);
+        var node = createSynthesizedNode(226 /* ForStatement */);
         node.initializer = initializer;
         node.condition = condition;
         node.incrementor = incrementor;
-        node.statement = statement;
+        node.statement = asEmbeddedStatement(statement);
         return node;
     }
     ts.createFor = createFor;
@@ -61662,10 +63779,10 @@ var ts;
     }
     ts.updateFor = updateFor;
     function createForIn(initializer, expression, statement) {
-        var node = createSynthesizedNode(226 /* ForInStatement */);
+        var node = createSynthesizedNode(227 /* ForInStatement */);
         node.initializer = initializer;
         node.expression = expression;
-        node.statement = statement;
+        node.statement = asEmbeddedStatement(statement);
         return node;
     }
     ts.createForIn = createForIn;
@@ -61678,11 +63795,11 @@ var ts;
     }
     ts.updateForIn = updateForIn;
     function createForOf(awaitModifier, initializer, expression, statement) {
-        var node = createSynthesizedNode(227 /* ForOfStatement */);
+        var node = createSynthesizedNode(228 /* ForOfStatement */);
         node.awaitModifier = awaitModifier;
         node.initializer = initializer;
         node.expression = expression;
-        node.statement = statement;
+        node.statement = asEmbeddedStatement(statement);
         return node;
     }
     ts.createForOf = createForOf;
@@ -61696,7 +63813,7 @@ var ts;
     }
     ts.updateForOf = updateForOf;
     function createContinue(label) {
-        var node = createSynthesizedNode(228 /* ContinueStatement */);
+        var node = createSynthesizedNode(229 /* ContinueStatement */);
         node.label = asName(label);
         return node;
     }
@@ -61708,7 +63825,7 @@ var ts;
     }
     ts.updateContinue = updateContinue;
     function createBreak(label) {
-        var node = createSynthesizedNode(229 /* BreakStatement */);
+        var node = createSynthesizedNode(230 /* BreakStatement */);
         node.label = asName(label);
         return node;
     }
@@ -61720,7 +63837,7 @@ var ts;
     }
     ts.updateBreak = updateBreak;
     function createReturn(expression) {
-        var node = createSynthesizedNode(230 /* ReturnStatement */);
+        var node = createSynthesizedNode(231 /* ReturnStatement */);
         node.expression = expression;
         return node;
     }
@@ -61732,9 +63849,9 @@ var ts;
     }
     ts.updateReturn = updateReturn;
     function createWith(expression, statement) {
-        var node = createSynthesizedNode(231 /* WithStatement */);
+        var node = createSynthesizedNode(232 /* WithStatement */);
         node.expression = expression;
-        node.statement = statement;
+        node.statement = asEmbeddedStatement(statement);
         return node;
     }
     ts.createWith = createWith;
@@ -61746,7 +63863,7 @@ var ts;
     }
     ts.updateWith = updateWith;
     function createSwitch(expression, caseBlock) {
-        var node = createSynthesizedNode(232 /* SwitchStatement */);
+        var node = createSynthesizedNode(233 /* SwitchStatement */);
         node.expression = ts.parenthesizeExpressionForList(expression);
         node.caseBlock = caseBlock;
         return node;
@@ -61760,9 +63877,9 @@ var ts;
     }
     ts.updateSwitch = updateSwitch;
     function createLabel(label, statement) {
-        var node = createSynthesizedNode(233 /* LabeledStatement */);
+        var node = createSynthesizedNode(234 /* LabeledStatement */);
         node.label = asName(label);
-        node.statement = statement;
+        node.statement = asEmbeddedStatement(statement);
         return node;
     }
     ts.createLabel = createLabel;
@@ -61774,7 +63891,7 @@ var ts;
     }
     ts.updateLabel = updateLabel;
     function createThrow(expression) {
-        var node = createSynthesizedNode(234 /* ThrowStatement */);
+        var node = createSynthesizedNode(235 /* ThrowStatement */);
         node.expression = expression;
         return node;
     }
@@ -61786,7 +63903,7 @@ var ts;
     }
     ts.updateThrow = updateThrow;
     function createTry(tryBlock, catchClause, finallyBlock) {
-        var node = createSynthesizedNode(235 /* TryStatement */);
+        var node = createSynthesizedNode(236 /* TryStatement */);
         node.tryBlock = tryBlock;
         node.catchClause = catchClause;
         node.finallyBlock = finallyBlock;
@@ -61802,11 +63919,11 @@ var ts;
     }
     ts.updateTry = updateTry;
     function createDebuggerStatement() {
-        return createSynthesizedNode(236 /* DebuggerStatement */);
+        return createSynthesizedNode(237 /* DebuggerStatement */);
     }
     ts.createDebuggerStatement = createDebuggerStatement;
     function createVariableDeclaration(name, type, initializer) {
-        var node = createSynthesizedNode(237 /* VariableDeclaration */);
+        var node = createSynthesizedNode(238 /* VariableDeclaration */);
         node.name = asName(name);
         node.type = type;
         node.initializer = initializer !== undefined ? ts.parenthesizeExpressionForList(initializer) : undefined;
@@ -61823,7 +63940,7 @@ var ts;
     ts.updateVariableDeclaration = updateVariableDeclaration;
     function createVariableDeclarationList(declarations, flags) {
         if (flags === void 0) { flags = 0 /* None */; }
-        var node = createSynthesizedNode(238 /* VariableDeclarationList */);
+        var node = createSynthesizedNode(239 /* VariableDeclarationList */);
         node.flags |= flags & 3 /* BlockScoped */;
         node.declarations = createNodeArray(declarations);
         return node;
@@ -61836,7 +63953,7 @@ var ts;
     }
     ts.updateVariableDeclarationList = updateVariableDeclarationList;
     function createFunctionDeclaration(decorators, modifiers, asteriskToken, name, typeParameters, parameters, type, body) {
-        var node = createSynthesizedNode(239 /* FunctionDeclaration */);
+        var node = createSynthesizedNode(240 /* FunctionDeclaration */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.asteriskToken = asteriskToken;
@@ -61862,7 +63979,7 @@ var ts;
     }
     ts.updateFunctionDeclaration = updateFunctionDeclaration;
     function createClassDeclaration(decorators, modifiers, name, typeParameters, heritageClauses, members) {
-        var node = createSynthesizedNode(240 /* ClassDeclaration */);
+        var node = createSynthesizedNode(241 /* ClassDeclaration */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
@@ -61884,7 +64001,7 @@ var ts;
     }
     ts.updateClassDeclaration = updateClassDeclaration;
     function createInterfaceDeclaration(decorators, modifiers, name, typeParameters, heritageClauses, members) {
-        var node = createSynthesizedNode(241 /* InterfaceDeclaration */);
+        var node = createSynthesizedNode(242 /* InterfaceDeclaration */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
@@ -61906,7 +64023,7 @@ var ts;
     }
     ts.updateInterfaceDeclaration = updateInterfaceDeclaration;
     function createTypeAliasDeclaration(decorators, modifiers, name, typeParameters, type) {
-        var node = createSynthesizedNode(242 /* TypeAliasDeclaration */);
+        var node = createSynthesizedNode(243 /* TypeAliasDeclaration */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
@@ -61926,7 +64043,7 @@ var ts;
     }
     ts.updateTypeAliasDeclaration = updateTypeAliasDeclaration;
     function createEnumDeclaration(decorators, modifiers, name, members) {
-        var node = createSynthesizedNode(243 /* EnumDeclaration */);
+        var node = createSynthesizedNode(244 /* EnumDeclaration */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
@@ -61945,7 +64062,7 @@ var ts;
     ts.updateEnumDeclaration = updateEnumDeclaration;
     function createModuleDeclaration(decorators, modifiers, name, body, flags) {
         if (flags === void 0) { flags = 0 /* None */; }
-        var node = createSynthesizedNode(244 /* ModuleDeclaration */);
+        var node = createSynthesizedNode(245 /* ModuleDeclaration */);
         node.flags |= flags & (16 /* Namespace */ | 4 /* NestedNamespace */ | 512 /* GlobalAugmentation */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
@@ -61964,7 +64081,7 @@ var ts;
     }
     ts.updateModuleDeclaration = updateModuleDeclaration;
     function createModuleBlock(statements) {
-        var node = createSynthesizedNode(245 /* ModuleBlock */);
+        var node = createSynthesizedNode(246 /* ModuleBlock */);
         node.statements = createNodeArray(statements);
         return node;
     }
@@ -61976,7 +64093,7 @@ var ts;
     }
     ts.updateModuleBlock = updateModuleBlock;
     function createCaseBlock(clauses) {
-        var node = createSynthesizedNode(246 /* CaseBlock */);
+        var node = createSynthesizedNode(247 /* CaseBlock */);
         node.clauses = createNodeArray(clauses);
         return node;
     }
@@ -61988,7 +64105,7 @@ var ts;
     }
     ts.updateCaseBlock = updateCaseBlock;
     function createNamespaceExportDeclaration(name) {
-        var node = createSynthesizedNode(247 /* NamespaceExportDeclaration */);
+        var node = createSynthesizedNode(248 /* NamespaceExportDeclaration */);
         node.name = asName(name);
         return node;
     }
@@ -62000,7 +64117,7 @@ var ts;
     }
     ts.updateNamespaceExportDeclaration = updateNamespaceExportDeclaration;
     function createImportEqualsDeclaration(decorators, modifiers, name, moduleReference) {
-        var node = createSynthesizedNode(248 /* ImportEqualsDeclaration */);
+        var node = createSynthesizedNode(249 /* ImportEqualsDeclaration */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
@@ -62018,7 +64135,7 @@ var ts;
     }
     ts.updateImportEqualsDeclaration = updateImportEqualsDeclaration;
     function createImportDeclaration(decorators, modifiers, importClause, moduleSpecifier) {
-        var node = createSynthesizedNode(249 /* ImportDeclaration */);
+        var node = createSynthesizedNode(250 /* ImportDeclaration */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.importClause = importClause;
@@ -62036,7 +64153,7 @@ var ts;
     }
     ts.updateImportDeclaration = updateImportDeclaration;
     function createImportClause(name, namedBindings) {
-        var node = createSynthesizedNode(250 /* ImportClause */);
+        var node = createSynthesizedNode(251 /* ImportClause */);
         node.name = name;
         node.namedBindings = namedBindings;
         return node;
@@ -62050,7 +64167,7 @@ var ts;
     }
     ts.updateImportClause = updateImportClause;
     function createNamespaceImport(name) {
-        var node = createSynthesizedNode(251 /* NamespaceImport */);
+        var node = createSynthesizedNode(252 /* NamespaceImport */);
         node.name = name;
         return node;
     }
@@ -62062,7 +64179,7 @@ var ts;
     }
     ts.updateNamespaceImport = updateNamespaceImport;
     function createNamedImports(elements) {
-        var node = createSynthesizedNode(252 /* NamedImports */);
+        var node = createSynthesizedNode(253 /* NamedImports */);
         node.elements = createNodeArray(elements);
         return node;
     }
@@ -62074,7 +64191,7 @@ var ts;
     }
     ts.updateNamedImports = updateNamedImports;
     function createImportSpecifier(propertyName, name) {
-        var node = createSynthesizedNode(253 /* ImportSpecifier */);
+        var node = createSynthesizedNode(254 /* ImportSpecifier */);
         node.propertyName = propertyName;
         node.name = name;
         return node;
@@ -62088,11 +64205,11 @@ var ts;
     }
     ts.updateImportSpecifier = updateImportSpecifier;
     function createExportAssignment(decorators, modifiers, isExportEquals, expression) {
-        var node = createSynthesizedNode(254 /* ExportAssignment */);
+        var node = createSynthesizedNode(255 /* ExportAssignment */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.isExportEquals = isExportEquals;
-        node.expression = isExportEquals ? ts.parenthesizeBinaryOperand(59 /* EqualsToken */, expression, /*isLeftSideOfBinary*/ false, /*leftOperand*/ undefined) : ts.parenthesizeDefaultExpression(expression);
+        node.expression = isExportEquals ? ts.parenthesizeBinaryOperand(60 /* EqualsToken */, expression, /*isLeftSideOfBinary*/ false, /*leftOperand*/ undefined) : ts.parenthesizeDefaultExpression(expression);
         return node;
     }
     ts.createExportAssignment = createExportAssignment;
@@ -62105,7 +64222,7 @@ var ts;
     }
     ts.updateExportAssignment = updateExportAssignment;
     function createExportDeclaration(decorators, modifiers, exportClause, moduleSpecifier) {
-        var node = createSynthesizedNode(255 /* ExportDeclaration */);
+        var node = createSynthesizedNode(256 /* ExportDeclaration */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.exportClause = exportClause;
@@ -62123,7 +64240,7 @@ var ts;
     }
     ts.updateExportDeclaration = updateExportDeclaration;
     function createNamedExports(elements) {
-        var node = createSynthesizedNode(256 /* NamedExports */);
+        var node = createSynthesizedNode(257 /* NamedExports */);
         node.elements = createNodeArray(elements);
         return node;
     }
@@ -62135,7 +64252,7 @@ var ts;
     }
     ts.updateNamedExports = updateNamedExports;
     function createExportSpecifier(propertyName, name) {
-        var node = createSynthesizedNode(257 /* ExportSpecifier */);
+        var node = createSynthesizedNode(258 /* ExportSpecifier */);
         node.propertyName = asName(propertyName);
         node.name = asName(name);
         return node;
@@ -62150,7 +64267,7 @@ var ts;
     ts.updateExportSpecifier = updateExportSpecifier;
     // Module references
     function createExternalModuleReference(expression) {
-        var node = createSynthesizedNode(259 /* ExternalModuleReference */);
+        var node = createSynthesizedNode(260 /* ExternalModuleReference */);
         node.expression = expression;
         return node;
     }
@@ -62164,14 +64281,14 @@ var ts;
     // JSDoc
     /* @internal */
     function createJSDocTypeExpression(type) {
-        var node = createSynthesizedNode(288 /* JSDocTypeExpression */);
+        var node = createSynthesizedNode(289 /* JSDocTypeExpression */);
         node.type = type;
         return node;
     }
     ts.createJSDocTypeExpression = createJSDocTypeExpression;
     /* @internal */
     function createJSDocTypeTag(typeExpression, comment) {
-        var tag = createJSDocTag(307 /* JSDocTypeTag */, "type");
+        var tag = createJSDocTag(309 /* JSDocTypeTag */, "type");
         tag.typeExpression = typeExpression;
         tag.comment = comment;
         return tag;
@@ -62179,15 +64296,22 @@ var ts;
     ts.createJSDocTypeTag = createJSDocTypeTag;
     /* @internal */
     function createJSDocReturnTag(typeExpression, comment) {
-        var tag = createJSDocTag(305 /* JSDocReturnTag */, "returns");
+        var tag = createJSDocTag(307 /* JSDocReturnTag */, "returns");
         tag.typeExpression = typeExpression;
         tag.comment = comment;
         return tag;
     }
     ts.createJSDocReturnTag = createJSDocReturnTag;
+    /** @internal */
+    function createJSDocThisTag(typeExpression) {
+        var tag = createJSDocTag(308 /* JSDocThisTag */, "this");
+        tag.typeExpression = typeExpression;
+        return tag;
+    }
+    ts.createJSDocThisTag = createJSDocThisTag;
     /* @internal */
     function createJSDocParamTag(name, isBracketed, typeExpression, comment) {
-        var tag = createJSDocTag(304 /* JSDocParameterTag */, "param");
+        var tag = createJSDocTag(306 /* JSDocParameterTag */, "param");
         tag.typeExpression = typeExpression;
         tag.name = name;
         tag.isBracketed = isBracketed;
@@ -62197,7 +64321,7 @@ var ts;
     ts.createJSDocParamTag = createJSDocParamTag;
     /* @internal */
     function createJSDocComment(comment, tags) {
-        var node = createSynthesizedNode(296 /* JSDocComment */);
+        var node = createSynthesizedNode(297 /* JSDocComment */);
         node.comment = comment;
         node.tags = tags;
         return node;
@@ -62211,7 +64335,7 @@ var ts;
     }
     // JSX
     function createJsxElement(openingElement, children, closingElement) {
-        var node = createSynthesizedNode(260 /* JsxElement */);
+        var node = createSynthesizedNode(261 /* JsxElement */);
         node.openingElement = openingElement;
         node.children = createNodeArray(children);
         node.closingElement = closingElement;
@@ -62227,7 +64351,7 @@ var ts;
     }
     ts.updateJsxElement = updateJsxElement;
     function createJsxSelfClosingElement(tagName, typeArguments, attributes) {
-        var node = createSynthesizedNode(261 /* JsxSelfClosingElement */);
+        var node = createSynthesizedNode(262 /* JsxSelfClosingElement */);
         node.tagName = tagName;
         node.typeArguments = asNodeArray(typeArguments);
         node.attributes = attributes;
@@ -62243,7 +64367,7 @@ var ts;
     }
     ts.updateJsxSelfClosingElement = updateJsxSelfClosingElement;
     function createJsxOpeningElement(tagName, typeArguments, attributes) {
-        var node = createSynthesizedNode(262 /* JsxOpeningElement */);
+        var node = createSynthesizedNode(263 /* JsxOpeningElement */);
         node.tagName = tagName;
         node.typeArguments = asNodeArray(typeArguments);
         node.attributes = attributes;
@@ -62259,7 +64383,7 @@ var ts;
     }
     ts.updateJsxOpeningElement = updateJsxOpeningElement;
     function createJsxClosingElement(tagName) {
-        var node = createSynthesizedNode(263 /* JsxClosingElement */);
+        var node = createSynthesizedNode(264 /* JsxClosingElement */);
         node.tagName = tagName;
         return node;
     }
@@ -62271,13 +64395,35 @@ var ts;
     }
     ts.updateJsxClosingElement = updateJsxClosingElement;
     function createJsxFragment(openingFragment, children, closingFragment) {
-        var node = createSynthesizedNode(264 /* JsxFragment */);
+        var node = createSynthesizedNode(265 /* JsxFragment */);
         node.openingFragment = openingFragment;
         node.children = createNodeArray(children);
         node.closingFragment = closingFragment;
         return node;
     }
     ts.createJsxFragment = createJsxFragment;
+    function createJsxText(text, containsOnlyTriviaWhiteSpaces) {
+        var node = createSynthesizedNode(11 /* JsxText */);
+        node.text = text;
+        node.containsOnlyTriviaWhiteSpaces = !!containsOnlyTriviaWhiteSpaces;
+        return node;
+    }
+    ts.createJsxText = createJsxText;
+    function updateJsxText(node, text, containsOnlyTriviaWhiteSpaces) {
+        return node.text !== text
+            || node.containsOnlyTriviaWhiteSpaces !== containsOnlyTriviaWhiteSpaces
+            ? updateNode(createJsxText(text, containsOnlyTriviaWhiteSpaces), node)
+            : node;
+    }
+    ts.updateJsxText = updateJsxText;
+    function createJsxOpeningFragment() {
+        return createSynthesizedNode(266 /* JsxOpeningFragment */);
+    }
+    ts.createJsxOpeningFragment = createJsxOpeningFragment;
+    function createJsxJsxClosingFragment() {
+        return createSynthesizedNode(267 /* JsxClosingFragment */);
+    }
+    ts.createJsxJsxClosingFragment = createJsxJsxClosingFragment;
     function updateJsxFragment(node, openingFragment, children, closingFragment) {
         return node.openingFragment !== openingFragment
             || node.children !== children
@@ -62287,7 +64433,7 @@ var ts;
     }
     ts.updateJsxFragment = updateJsxFragment;
     function createJsxAttribute(name, initializer) {
-        var node = createSynthesizedNode(267 /* JsxAttribute */);
+        var node = createSynthesizedNode(268 /* JsxAttribute */);
         node.name = name;
         node.initializer = initializer;
         return node;
@@ -62301,7 +64447,7 @@ var ts;
     }
     ts.updateJsxAttribute = updateJsxAttribute;
     function createJsxAttributes(properties) {
-        var node = createSynthesizedNode(268 /* JsxAttributes */);
+        var node = createSynthesizedNode(269 /* JsxAttributes */);
         node.properties = createNodeArray(properties);
         return node;
     }
@@ -62313,7 +64459,7 @@ var ts;
     }
     ts.updateJsxAttributes = updateJsxAttributes;
     function createJsxSpreadAttribute(expression) {
-        var node = createSynthesizedNode(269 /* JsxSpreadAttribute */);
+        var node = createSynthesizedNode(270 /* JsxSpreadAttribute */);
         node.expression = expression;
         return node;
     }
@@ -62325,7 +64471,7 @@ var ts;
     }
     ts.updateJsxSpreadAttribute = updateJsxSpreadAttribute;
     function createJsxExpression(dotDotDotToken, expression) {
-        var node = createSynthesizedNode(270 /* JsxExpression */);
+        var node = createSynthesizedNode(271 /* JsxExpression */);
         node.dotDotDotToken = dotDotDotToken;
         node.expression = expression;
         return node;
@@ -62339,7 +64485,7 @@ var ts;
     ts.updateJsxExpression = updateJsxExpression;
     // Clauses
     function createCaseClause(expression, statements) {
-        var node = createSynthesizedNode(271 /* CaseClause */);
+        var node = createSynthesizedNode(272 /* CaseClause */);
         node.expression = ts.parenthesizeExpressionForList(expression);
         node.statements = createNodeArray(statements);
         return node;
@@ -62353,7 +64499,7 @@ var ts;
     }
     ts.updateCaseClause = updateCaseClause;
     function createDefaultClause(statements) {
-        var node = createSynthesizedNode(272 /* DefaultClause */);
+        var node = createSynthesizedNode(273 /* DefaultClause */);
         node.statements = createNodeArray(statements);
         return node;
     }
@@ -62365,7 +64511,7 @@ var ts;
     }
     ts.updateDefaultClause = updateDefaultClause;
     function createHeritageClause(token, types) {
-        var node = createSynthesizedNode(273 /* HeritageClause */);
+        var node = createSynthesizedNode(274 /* HeritageClause */);
         node.token = token;
         node.types = createNodeArray(types);
         return node;
@@ -62378,7 +64524,7 @@ var ts;
     }
     ts.updateHeritageClause = updateHeritageClause;
     function createCatchClause(variableDeclaration, block) {
-        var node = createSynthesizedNode(274 /* CatchClause */);
+        var node = createSynthesizedNode(275 /* CatchClause */);
         node.variableDeclaration = ts.isString(variableDeclaration) ? createVariableDeclaration(variableDeclaration) : variableDeclaration;
         node.block = block;
         return node;
@@ -62393,7 +64539,7 @@ var ts;
     ts.updateCatchClause = updateCatchClause;
     // Property assignments
     function createPropertyAssignment(name, initializer) {
-        var node = createSynthesizedNode(275 /* PropertyAssignment */);
+        var node = createSynthesizedNode(276 /* PropertyAssignment */);
         node.name = asName(name);
         node.questionToken = undefined;
         node.initializer = ts.parenthesizeExpressionForList(initializer);
@@ -62408,7 +64554,7 @@ var ts;
     }
     ts.updatePropertyAssignment = updatePropertyAssignment;
     function createShorthandPropertyAssignment(name, objectAssignmentInitializer) {
-        var node = createSynthesizedNode(276 /* ShorthandPropertyAssignment */);
+        var node = createSynthesizedNode(277 /* ShorthandPropertyAssignment */);
         node.name = asName(name);
         node.objectAssignmentInitializer = objectAssignmentInitializer !== undefined ? ts.parenthesizeExpressionForList(objectAssignmentInitializer) : undefined;
         return node;
@@ -62422,8 +64568,8 @@ var ts;
     }
     ts.updateShorthandPropertyAssignment = updateShorthandPropertyAssignment;
     function createSpreadAssignment(expression) {
-        var node = createSynthesizedNode(277 /* SpreadAssignment */);
-        node.expression = expression !== undefined ? ts.parenthesizeExpressionForList(expression) : undefined; // TODO: GH#18217
+        var node = createSynthesizedNode(278 /* SpreadAssignment */);
+        node.expression = ts.parenthesizeExpressionForList(expression);
         return node;
     }
     ts.createSpreadAssignment = createSpreadAssignment;
@@ -62435,7 +64581,7 @@ var ts;
     ts.updateSpreadAssignment = updateSpreadAssignment;
     // Enum
     function createEnumMember(name, initializer) {
-        var node = createSynthesizedNode(278 /* EnumMember */);
+        var node = createSynthesizedNode(279 /* EnumMember */);
         node.name = asName(name);
         node.initializer = initializer && ts.parenthesizeExpressionForList(initializer);
         return node;
@@ -62456,7 +64602,7 @@ var ts;
             (typeReferences !== undefined && node.typeReferenceDirectives !== typeReferences) ||
             (libReferences !== undefined && node.libReferenceDirectives !== libReferences) ||
             (hasNoDefaultLib !== undefined && node.hasNoDefaultLib !== hasNoDefaultLib)) {
-            var updated = createSynthesizedNode(284 /* SourceFile */);
+            var updated = createSynthesizedNode(285 /* SourceFile */);
             updated.flags |= node.flags;
             updated.statements = createNodeArray(statements);
             updated.endOfFileToken = node.endOfFileToken;
@@ -62540,7 +64686,7 @@ var ts;
      * @param original The original statement.
      */
     function createNotEmittedStatement(original) {
-        var node = createSynthesizedNode(312 /* NotEmittedStatement */);
+        var node = createSynthesizedNode(314 /* NotEmittedStatement */);
         node.original = original;
         setTextRange(node, original);
         return node;
@@ -62552,7 +64698,7 @@ var ts;
      */
     /* @internal */
     function createEndOfDeclarationMarker(original) {
-        var node = createSynthesizedNode(316 /* EndOfDeclarationMarker */);
+        var node = createSynthesizedNode(318 /* EndOfDeclarationMarker */);
         node.emitNode = {};
         node.original = original;
         return node;
@@ -62564,7 +64710,7 @@ var ts;
      */
     /* @internal */
     function createMergeDeclarationMarker(original) {
-        var node = createSynthesizedNode(315 /* MergeDeclarationMarker */);
+        var node = createSynthesizedNode(317 /* MergeDeclarationMarker */);
         node.emitNode = {};
         node.original = original;
         return node;
@@ -62579,7 +64725,7 @@ var ts;
      * @param location The location for the expression. Defaults to the positions from "original" if provided.
      */
     function createPartiallyEmittedExpression(expression, original) {
-        var node = createSynthesizedNode(313 /* PartiallyEmittedExpression */);
+        var node = createSynthesizedNode(315 /* PartiallyEmittedExpression */);
         node.expression = expression;
         node.original = original;
         setTextRange(node, original);
@@ -62595,7 +64741,7 @@ var ts;
     ts.updatePartiallyEmittedExpression = updatePartiallyEmittedExpression;
     function flattenCommaElements(node) {
         if (ts.nodeIsSynthesized(node) && !ts.isParseTreeNode(node) && !node.original && !node.emitNode && !node.id) {
-            if (node.kind === 314 /* CommaListExpression */) {
+            if (node.kind === 316 /* CommaListExpression */) {
                 return node.elements;
             }
             if (ts.isBinaryExpression(node) && node.operatorToken.kind === 27 /* CommaToken */) {
@@ -62605,7 +64751,7 @@ var ts;
         return node;
     }
     function createCommaList(elements) {
-        var node = createSynthesizedNode(314 /* CommaListExpression */);
+        var node = createSynthesizedNode(316 /* CommaListExpression */);
         node.elements = createNodeArray(ts.sameFlatMap(elements, flattenCommaElements));
         return node;
     }
@@ -62618,7 +64764,7 @@ var ts;
     ts.updateCommaList = updateCommaList;
     function createBundle(sourceFiles, prepends) {
         if (prepends === void 0) { prepends = ts.emptyArray; }
-        var node = ts.createNode(285 /* Bundle */);
+        var node = ts.createNode(286 /* Bundle */);
         node.prepends = prepends;
         node.sourceFiles = sourceFiles;
         return node;
@@ -62630,6 +64776,7 @@ var ts;
             ts.valuesHelper,
             ts.readHelper,
             ts.spreadHelper,
+            ts.spreadArraysHelper,
             ts.restHelper,
             ts.decorateHelper,
             ts.metadataHelper,
@@ -62648,7 +64795,7 @@ var ts;
         ], function (helper) { return helper.name; }));
     }
     function createUnparsedSource() {
-        var node = ts.createNode(286 /* UnparsedSource */);
+        var node = ts.createNode(287 /* UnparsedSource */);
         node.prologues = ts.emptyArray;
         node.referencedFiles = ts.emptyArray;
         node.libReferenceDirectives = ts.emptyArray;
@@ -62780,10 +64927,10 @@ var ts;
     }
     function mapBundleFileSectionKindToSyntaxKind(kind) {
         switch (kind) {
-            case "prologue" /* Prologue */: return 279 /* UnparsedPrologue */;
-            case "prepend" /* Prepend */: return 280 /* UnparsedPrepend */;
-            case "internal" /* Internal */: return 282 /* UnparsedInternalText */;
-            case "text" /* Text */: return 281 /* UnparsedText */;
+            case "prologue" /* Prologue */: return 280 /* UnparsedPrologue */;
+            case "prepend" /* Prepend */: return 281 /* UnparsedPrepend */;
+            case "internal" /* Internal */: return 283 /* UnparsedInternalText */;
+            case "text" /* Text */: return 282 /* UnparsedText */;
             case "emitHelpers" /* EmitHelpers */:
             case "no-default-lib" /* NoDefaultLib */:
             case "reference" /* Reference */:
@@ -62801,14 +64948,14 @@ var ts;
         return node;
     }
     function createUnparsedSyntheticReference(section, parent) {
-        var node = ts.createNode(283 /* UnparsedSyntheticReference */, section.pos, section.end);
+        var node = ts.createNode(284 /* UnparsedSyntheticReference */, section.pos, section.end);
         node.parent = parent;
         node.data = section.data;
         node.section = section;
         return node;
     }
     function createInputFiles(javascriptTextOrReadFileText, declarationTextOrJavascriptPath, javascriptMapPath, javascriptMapTextOrDeclarationPath, declarationMapPath, declarationMapTextOrBuildInfoPath, javascriptPath, declarationPath, buildInfoPath, buildInfo, oldFileOfCurrentEmit) {
-        var node = ts.createNode(287 /* InputFiles */);
+        var node = ts.createNode(288 /* InputFiles */);
         if (!ts.isString(javascriptTextOrReadFileText)) {
             var cache_1 = ts.createMap();
             var textGetter_1 = function (path) {
@@ -62902,7 +65049,7 @@ var ts;
     }
     ts.createLessThan = createLessThan;
     function createAssignment(left, right) {
-        return createBinary(left, 59 /* EqualsToken */, right);
+        return createBinary(left, 60 /* EqualsToken */, right);
     }
     ts.createAssignment = createAssignment;
     function createStrictEquality(left, right) {
@@ -62962,6 +65109,9 @@ var ts;
     function asToken(value) {
         return typeof value === "number" ? createToken(value) : value;
     }
+    function asEmbeddedStatement(statement) {
+        return statement && ts.isNotEmittedStatement(statement) ? setTextRange(setOriginalNode(createEmptyStatement(), statement), statement) : statement;
+    }
     /**
      * Clears any EmitNode entries from parse-tree nodes.
      * @param sourceFile A source file.
@@ -62995,7 +65145,7 @@ var ts;
                 // To avoid holding onto transformation artifacts, we keep track of any
                 // parse tree node we are annotating. This allows us to clean them up after
                 // all transformations have completed.
-                if (node.kind === 284 /* SourceFile */) {
+                if (node.kind === 285 /* SourceFile */) {
                     return node.emitNode = { annotatedNodes: [node] };
                 }
                 var sourceFile = ts.getSourceFileOfNode(ts.getParseTreeNode(ts.getSourceFileOfNode(node)));
@@ -63006,6 +65156,18 @@ var ts;
         return node.emitNode;
     }
     ts.getOrCreateEmitNode = getOrCreateEmitNode;
+    /**
+     * Sets `EmitFlags.NoComments` on a node and removes any leading and trailing synthetic comments.
+     * @internal
+     */
+    function removeAllComments(node) {
+        var emitNode = getOrCreateEmitNode(node);
+        emitNode.flags |= 1536 /* NoComments */;
+        emitNode.leadingComments = undefined;
+        emitNode.trailingComments = undefined;
+        return node;
+    }
+    ts.removeAllComments = removeAllComments;
     function setTextRange(range, location) {
         if (location) {
             range.pos = location.pos;
@@ -63296,7 +65458,7 @@ var ts;
     ts.nullTransformationContext = {
         enableEmitNotification: ts.noop,
         enableSubstitution: ts.noop,
-        endLexicalEnvironment: function () { return undefined; },
+        endLexicalEnvironment: ts.returnUndefined,
         getCompilerOptions: ts.notImplemented,
         getEmitHost: ts.notImplemented,
         getEmitResolver: ts.notImplemented,
@@ -63477,6 +65639,17 @@ var ts;
         /*typeArguments*/ undefined, argumentList), location);
     }
     ts.createSpreadHelper = createSpreadHelper;
+    ts.spreadArraysHelper = {
+        name: "typescript:spreadArrays",
+        scoped: false,
+        text: "\n            var __spreadArrays = (this && this.__spreadArrays) || function () {\n                for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;\n                for (var r = Array(s), k = 0, i = 0; i < il; i++)\n                    for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)\n                        r[k] = a[j];\n                return r;\n            };"
+    };
+    function createSpreadArraysHelper(context, argumentList, location) {
+        context.requestEmitHelper(ts.spreadArraysHelper);
+        return ts.setTextRange(ts.createCall(getHelperName("__spreadArrays"), 
+        /*typeArguments*/ undefined, argumentList), location);
+    }
+    ts.createSpreadArraysHelper = createSpreadArraysHelper;
     // Utilities
     function createForOfBindingStatement(node, boundValue) {
         if (ts.isVariableDeclarationList(node)) {
@@ -63506,7 +65679,7 @@ var ts;
         if (!outermostLabeledStatement) {
             return node;
         }
-        var updated = ts.updateLabel(outermostLabeledStatement, outermostLabeledStatement.label, outermostLabeledStatement.statement.kind === 233 /* LabeledStatement */
+        var updated = ts.updateLabel(outermostLabeledStatement, outermostLabeledStatement.label, outermostLabeledStatement.statement.kind === 234 /* LabeledStatement */
             ? restoreEnclosingLabel(node, outermostLabeledStatement.statement)
             : node);
         if (afterRestoreLabelCallback) {
@@ -63518,20 +65691,20 @@ var ts;
     function shouldBeCapturedInTempVariable(node, cacheIdentifiers) {
         var target = ts.skipParentheses(node);
         switch (target.kind) {
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 return cacheIdentifiers;
-            case 100 /* ThisKeyword */:
+            case 101 /* ThisKeyword */:
             case 8 /* NumericLiteral */:
             case 9 /* BigIntLiteral */:
             case 10 /* StringLiteral */:
                 return false;
-            case 187 /* ArrayLiteralExpression */:
+            case 188 /* ArrayLiteralExpression */:
                 var elements = target.elements;
                 if (elements.length === 0) {
                     return false;
                 }
                 return true;
-            case 188 /* ObjectLiteralExpression */:
+            case 189 /* ObjectLiteralExpression */:
                 return target.properties.length > 0;
             default:
                 return true;
@@ -63546,7 +65719,7 @@ var ts;
             thisArg = ts.createThis();
             target = callee;
         }
-        else if (callee.kind === 98 /* SuperKeyword */) {
+        else if (callee.kind === 99 /* SuperKeyword */) {
             thisArg = ts.createThis();
             target = languageVersion < 2 /* ES2015 */
                 ? ts.setTextRange(ts.createIdentifier("_super"), callee)
@@ -63558,7 +65731,7 @@ var ts;
         }
         else {
             switch (callee.kind) {
-                case 189 /* PropertyAccessExpression */: {
+                case 190 /* PropertyAccessExpression */: {
                     if (shouldBeCapturedInTempVariable(callee.expression, cacheIdentifiers)) {
                         // for `a.b()` target is `(_a = a).b` and thisArg is `_a`
                         thisArg = ts.createTempVariable(recordTempVariable);
@@ -63571,7 +65744,7 @@ var ts;
                     }
                     break;
                 }
-                case 190 /* ElementAccessExpression */: {
+                case 191 /* ElementAccessExpression */: {
                     if (shouldBeCapturedInTempVariable(callee.expression, cacheIdentifiers)) {
                         // for `a[b]()` target is `(_a = a)[b]` and thisArg is `_a`
                         thisArg = ts.createTempVariable(recordTempVariable);
@@ -63628,14 +65801,14 @@ var ts;
     ts.createExpressionForPropertyName = createExpressionForPropertyName;
     function createExpressionForObjectLiteralElementLike(node, property, receiver) {
         switch (property.kind) {
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
                 return createExpressionForAccessorDeclaration(node.properties, property, receiver, !!node.multiLine);
-            case 275 /* PropertyAssignment */:
+            case 276 /* PropertyAssignment */:
                 return createExpressionForPropertyAssignment(property, receiver);
-            case 276 /* ShorthandPropertyAssignment */:
+            case 277 /* ShorthandPropertyAssignment */:
                 return createExpressionForShorthandPropertyAssignment(property, receiver);
-            case 156 /* MethodDeclaration */:
+            case 157 /* MethodDeclaration */:
                 return createExpressionForMethodDeclaration(property, receiver);
         }
     }
@@ -63643,7 +65816,7 @@ var ts;
     function createExpressionForAccessorDeclaration(properties, property, receiver, multiLine) {
         var _a = ts.getAllAccessorDeclarations(properties, property), firstAccessor = _a.firstAccessor, getAccessor = _a.getAccessor, setAccessor = _a.setAccessor;
         if (property === firstAccessor) {
-            var properties_8 = [];
+            var properties_5 = [];
             if (getAccessor) {
                 var getterFunction = ts.createFunctionExpression(getAccessor.modifiers, 
                 /*asteriskToken*/ undefined, 
@@ -63654,7 +65827,7 @@ var ts;
                 ts.setTextRange(getterFunction, getAccessor);
                 ts.setOriginalNode(getterFunction, getAccessor);
                 var getter = ts.createPropertyAssignment("get", getterFunction);
-                properties_8.push(getter);
+                properties_5.push(getter);
             }
             if (setAccessor) {
                 var setterFunction = ts.createFunctionExpression(setAccessor.modifiers, 
@@ -63666,15 +65839,15 @@ var ts;
                 ts.setTextRange(setterFunction, setAccessor);
                 ts.setOriginalNode(setterFunction, setAccessor);
                 var setter = ts.createPropertyAssignment("set", setterFunction);
-                properties_8.push(setter);
+                properties_5.push(setter);
             }
-            properties_8.push(ts.createPropertyAssignment("enumerable", ts.createTrue()));
-            properties_8.push(ts.createPropertyAssignment("configurable", ts.createTrue()));
+            properties_5.push(ts.createPropertyAssignment("enumerable", ts.createTrue()));
+            properties_5.push(ts.createPropertyAssignment("configurable", ts.createTrue()));
             var expression = ts.setTextRange(ts.createCall(ts.createPropertyAccess(ts.createIdentifier("Object"), "defineProperty"), 
             /*typeArguments*/ undefined, [
                 receiver,
                 createExpressionForPropertyName(property.name),
-                ts.createObjectLiteral(properties_8, multiLine)
+                ts.createObjectLiteral(properties_5, multiLine)
             ]), 
             /*location*/ firstAccessor);
             return ts.aggregateTransformFlags(expression);
@@ -63961,7 +66134,7 @@ var ts;
     function parenthesizeBinaryOperand(binaryOperator, operand, isLeftSideOfBinary, leftOperand) {
         var skipped = ts.skipPartiallyEmittedExpressions(operand);
         // If the resulting expression is already parenthesized, we do not need to do any further processing.
-        if (skipped.kind === 195 /* ParenthesizedExpression */) {
+        if (skipped.kind === 196 /* ParenthesizedExpression */) {
             return operand;
         }
         return binaryOperandNeedsParentheses(binaryOperator, operand, isLeftSideOfBinary, leftOperand)
@@ -63995,10 +66168,10 @@ var ts;
         //
         // If `a ** d` is on the left of operator `**`, we need to parenthesize to preserve
         // the intended order of operations: `(a ** b) ** c`
-        var binaryOperatorPrecedence = ts.getOperatorPrecedence(204 /* BinaryExpression */, binaryOperator);
-        var binaryOperatorAssociativity = ts.getOperatorAssociativity(204 /* BinaryExpression */, binaryOperator);
+        var binaryOperatorPrecedence = ts.getOperatorPrecedence(205 /* BinaryExpression */, binaryOperator);
+        var binaryOperatorAssociativity = ts.getOperatorAssociativity(205 /* BinaryExpression */, binaryOperator);
         var emittedOperand = ts.skipPartiallyEmittedExpressions(operand);
-        if (!isLeftSideOfBinary && operand.kind === 197 /* ArrowFunction */ && binaryOperatorPrecedence > 4) {
+        if (!isLeftSideOfBinary && operand.kind === 198 /* ArrowFunction */ && binaryOperatorPrecedence > 4) {
             // We need to parenthesize arrow functions on the right side to avoid it being
             // parsed as parenthesized expression: `a && (() => {})`
             return true;
@@ -64010,7 +66183,7 @@ var ts;
                 // and is a yield expression, then we do not need parentheses.
                 if (!isLeftSideOfBinary
                     && binaryOperatorAssociativity === 1 /* Right */
-                    && operand.kind === 207 /* YieldExpression */) {
+                    && operand.kind === 208 /* YieldExpression */) {
                     return false;
                 }
                 return true;
@@ -64098,7 +66271,7 @@ var ts;
         if (ts.isLiteralKind(node.kind)) {
             return node.kind;
         }
-        if (node.kind === 204 /* BinaryExpression */ && node.operatorToken.kind === 38 /* PlusToken */) {
+        if (node.kind === 205 /* BinaryExpression */ && node.operatorToken.kind === 38 /* PlusToken */) {
             if (node.cachedLiteralKind !== undefined) {
                 return node.cachedLiteralKind;
             }
@@ -64113,7 +66286,7 @@ var ts;
         return 0 /* Unknown */;
     }
     function parenthesizeForConditionalHead(condition) {
-        var conditionalPrecedence = ts.getOperatorPrecedence(205 /* ConditionalExpression */, 56 /* QuestionToken */);
+        var conditionalPrecedence = ts.getOperatorPrecedence(206 /* ConditionalExpression */, 56 /* QuestionToken */);
         var emittedCondition = ts.skipPartiallyEmittedExpressions(condition);
         var conditionPrecedence = ts.getExpressionPrecedence(emittedCondition);
         if (ts.compareValues(conditionPrecedence, conditionalPrecedence) === -1 /* LessThan */) {
@@ -64148,8 +66321,8 @@ var ts;
         var needsParens = isCommaSequence(check);
         if (!needsParens) {
             switch (getLeftmostExpression(check, /*stopAtCallExpression*/ false).kind) {
-                case 209 /* ClassExpression */:
-                case 196 /* FunctionExpression */:
+                case 210 /* ClassExpression */:
+                case 197 /* FunctionExpression */:
                     needsParens = true;
             }
         }
@@ -64165,9 +66338,9 @@ var ts;
     function parenthesizeForNew(expression) {
         var leftmostExpr = getLeftmostExpression(expression, /*stopAtCallExpressions*/ true);
         switch (leftmostExpr.kind) {
-            case 191 /* CallExpression */:
+            case 192 /* CallExpression */:
                 return ts.createParen(expression);
-            case 192 /* NewExpression */:
+            case 193 /* NewExpression */:
                 return !leftmostExpr.arguments
                     ? ts.createParen(expression)
                     : expression;
@@ -64190,7 +66363,7 @@ var ts;
         //
         var emittedExpression = ts.skipPartiallyEmittedExpressions(expression);
         if (ts.isLeftHandSideExpression(emittedExpression)
-            && (emittedExpression.kind !== 192 /* NewExpression */ || emittedExpression.arguments)) {
+            && (emittedExpression.kind !== 193 /* NewExpression */ || emittedExpression.arguments)) {
             return expression;
         }
         return ts.setTextRange(ts.createParen(expression), expression);
@@ -64228,7 +66401,7 @@ var ts;
     function parenthesizeExpressionForList(expression) {
         var emittedExpression = ts.skipPartiallyEmittedExpressions(expression);
         var expressionPrecedence = ts.getExpressionPrecedence(emittedExpression);
-        var commaPrecedence = ts.getOperatorPrecedence(204 /* BinaryExpression */, 27 /* CommaToken */);
+        var commaPrecedence = ts.getOperatorPrecedence(205 /* BinaryExpression */, 27 /* CommaToken */);
         return expressionPrecedence > commaPrecedence
             ? expression
             : ts.setTextRange(ts.createParen(expression), expression);
@@ -64239,29 +66412,29 @@ var ts;
         if (ts.isCallExpression(emittedExpression)) {
             var callee = emittedExpression.expression;
             var kind = ts.skipPartiallyEmittedExpressions(callee).kind;
-            if (kind === 196 /* FunctionExpression */ || kind === 197 /* ArrowFunction */) {
+            if (kind === 197 /* FunctionExpression */ || kind === 198 /* ArrowFunction */) {
                 var mutableCall = ts.getMutableClone(emittedExpression);
                 mutableCall.expression = ts.setTextRange(ts.createParen(callee), callee);
                 return recreateOuterExpressions(expression, mutableCall, 4 /* PartiallyEmittedExpressions */);
             }
         }
         var leftmostExpressionKind = getLeftmostExpression(emittedExpression, /*stopAtCallExpressions*/ false).kind;
-        if (leftmostExpressionKind === 188 /* ObjectLiteralExpression */ || leftmostExpressionKind === 196 /* FunctionExpression */) {
+        if (leftmostExpressionKind === 189 /* ObjectLiteralExpression */ || leftmostExpressionKind === 197 /* FunctionExpression */) {
             return ts.setTextRange(ts.createParen(expression), expression);
         }
         return expression;
     }
     ts.parenthesizeExpressionForExpressionStatement = parenthesizeExpressionForExpressionStatement;
     function parenthesizeConditionalTypeMember(member) {
-        return member.kind === 175 /* ConditionalType */ ? ts.createParenthesizedType(member) : member;
+        return member.kind === 176 /* ConditionalType */ ? ts.createParenthesizedType(member) : member;
     }
     ts.parenthesizeConditionalTypeMember = parenthesizeConditionalTypeMember;
     function parenthesizeElementTypeMember(member) {
         switch (member.kind) {
-            case 173 /* UnionType */:
-            case 174 /* IntersectionType */:
-            case 165 /* FunctionType */:
-            case 166 /* ConstructorType */:
+            case 174 /* UnionType */:
+            case 175 /* IntersectionType */:
+            case 166 /* FunctionType */:
+            case 167 /* ConstructorType */:
                 return ts.createParenthesizedType(member);
         }
         return parenthesizeConditionalTypeMember(member);
@@ -64269,9 +66442,9 @@ var ts;
     ts.parenthesizeElementTypeMember = parenthesizeElementTypeMember;
     function parenthesizeArrayTypeMember(member) {
         switch (member.kind) {
-            case 167 /* TypeQuery */:
-            case 179 /* TypeOperator */:
-            case 176 /* InferType */:
+            case 168 /* TypeQuery */:
+            case 180 /* TypeOperator */:
+            case 177 /* InferType */:
                 return ts.createParenthesizedType(member);
         }
         return parenthesizeElementTypeMember(member);
@@ -64297,44 +66470,45 @@ var ts;
     function getLeftmostExpression(node, stopAtCallExpressions) {
         while (true) {
             switch (node.kind) {
-                case 203 /* PostfixUnaryExpression */:
+                case 204 /* PostfixUnaryExpression */:
                     node = node.operand;
                     continue;
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     node = node.left;
                     continue;
-                case 205 /* ConditionalExpression */:
+                case 206 /* ConditionalExpression */:
                     node = node.condition;
                     continue;
-                case 193 /* TaggedTemplateExpression */:
+                case 194 /* TaggedTemplateExpression */:
                     node = node.tag;
                     continue;
-                case 191 /* CallExpression */:
+                case 192 /* CallExpression */:
                     if (stopAtCallExpressions) {
                         return node;
                     }
                 // falls through
-                case 212 /* AsExpression */:
-                case 190 /* ElementAccessExpression */:
-                case 189 /* PropertyAccessExpression */:
-                case 213 /* NonNullExpression */:
-                case 313 /* PartiallyEmittedExpression */:
+                case 213 /* AsExpression */:
+                case 191 /* ElementAccessExpression */:
+                case 190 /* PropertyAccessExpression */:
+                case 214 /* NonNullExpression */:
+                case 315 /* PartiallyEmittedExpression */:
                     node = node.expression;
                     continue;
             }
             return node;
         }
     }
+    ts.getLeftmostExpression = getLeftmostExpression;
     function parenthesizeConciseBody(body) {
-        if (!ts.isBlock(body) && (isCommaSequence(body) || getLeftmostExpression(body, /*stopAtCallExpressions*/ false).kind === 188 /* ObjectLiteralExpression */)) {
+        if (!ts.isBlock(body) && (isCommaSequence(body) || getLeftmostExpression(body, /*stopAtCallExpressions*/ false).kind === 189 /* ObjectLiteralExpression */)) {
             return ts.setTextRange(ts.createParen(body), body);
         }
         return body;
     }
     ts.parenthesizeConciseBody = parenthesizeConciseBody;
     function isCommaSequence(node) {
-        return node.kind === 204 /* BinaryExpression */ && node.operatorToken.kind === 27 /* CommaToken */ ||
-            node.kind === 314 /* CommaListExpression */;
+        return node.kind === 205 /* BinaryExpression */ && node.operatorToken.kind === 27 /* CommaToken */ ||
+            node.kind === 316 /* CommaListExpression */;
     }
     ts.isCommaSequence = isCommaSequence;
     var OuterExpressionKinds;
@@ -64347,13 +66521,13 @@ var ts;
     function isOuterExpression(node, kinds) {
         if (kinds === void 0) { kinds = 7 /* All */; }
         switch (node.kind) {
-            case 195 /* ParenthesizedExpression */:
+            case 196 /* ParenthesizedExpression */:
                 return (kinds & 1 /* Parentheses */) !== 0;
-            case 194 /* TypeAssertionExpression */:
-            case 212 /* AsExpression */:
-            case 213 /* NonNullExpression */:
+            case 195 /* TypeAssertionExpression */:
+            case 213 /* AsExpression */:
+            case 214 /* NonNullExpression */:
                 return (kinds & 2 /* Assertions */) !== 0;
-            case 313 /* PartiallyEmittedExpression */:
+            case 315 /* PartiallyEmittedExpression */:
                 return (kinds & 4 /* PartiallyEmittedExpressions */) !== 0;
         }
         return false;
@@ -64378,7 +66552,7 @@ var ts;
     }
     ts.skipOuterExpressions = skipOuterExpressions;
     function skipAssertions(node) {
-        while (ts.isAssertionExpression(node) || node.kind === 213 /* NonNullExpression */) {
+        while (ts.isAssertionExpression(node) || node.kind === 214 /* NonNullExpression */) {
             node = node.expression;
         }
         return node;
@@ -64386,11 +66560,11 @@ var ts;
     ts.skipAssertions = skipAssertions;
     function updateOuterExpression(outerExpression, expression) {
         switch (outerExpression.kind) {
-            case 195 /* ParenthesizedExpression */: return ts.updateParen(outerExpression, expression);
-            case 194 /* TypeAssertionExpression */: return ts.updateTypeAssertion(outerExpression, outerExpression.type, expression);
-            case 212 /* AsExpression */: return ts.updateAsExpression(outerExpression, expression, outerExpression.type);
-            case 213 /* NonNullExpression */: return ts.updateNonNullExpression(outerExpression, expression);
-            case 313 /* PartiallyEmittedExpression */: return ts.updatePartiallyEmittedExpression(outerExpression, expression);
+            case 196 /* ParenthesizedExpression */: return ts.updateParen(outerExpression, expression);
+            case 195 /* TypeAssertionExpression */: return ts.updateTypeAssertion(outerExpression, outerExpression.type, expression);
+            case 213 /* AsExpression */: return ts.updateAsExpression(outerExpression, expression, outerExpression.type);
+            case 214 /* NonNullExpression */: return ts.updateNonNullExpression(outerExpression, expression);
+            case 315 /* PartiallyEmittedExpression */: return ts.updatePartiallyEmittedExpression(outerExpression, expression);
         }
     }
     /**
@@ -64408,7 +66582,7 @@ var ts;
      * the containing expression is created/updated.
      */
     function isIgnorableParen(node) {
-        return node.kind === 195 /* ParenthesizedExpression */
+        return node.kind === 196 /* ParenthesizedExpression */
             && ts.nodeIsSynthesized(node)
             && ts.nodeIsSynthesized(ts.getSourceMapRange(node))
             && ts.nodeIsSynthesized(ts.getCommentRange(node))
@@ -64473,10 +66647,10 @@ var ts;
             var name = namespaceDeclaration.name;
             return ts.isGeneratedIdentifier(name) ? name : ts.createIdentifier(ts.getSourceTextOfNodeFromSourceFile(sourceFile, name) || ts.idText(name));
         }
-        if (node.kind === 249 /* ImportDeclaration */ && node.importClause) {
+        if (node.kind === 250 /* ImportDeclaration */ && node.importClause) {
             return ts.getGeneratedNameForNode(node);
         }
-        if (node.kind === 255 /* ExportDeclaration */ && node.moduleSpecifier) {
+        if (node.kind === 256 /* ExportDeclaration */ && node.moduleSpecifier) {
             return ts.getGeneratedNameForNode(node);
         }
         return undefined;
@@ -64595,7 +66769,7 @@ var ts;
         }
         if (ts.isObjectLiteralElementLike(bindingElement)) {
             switch (bindingElement.kind) {
-                case 275 /* PropertyAssignment */:
+                case 276 /* PropertyAssignment */:
                     // `b` in `({ a: b } = ...)`
                     // `b` in `({ a: b = 1 } = ...)`
                     // `{b}` in `({ a: {b} } = ...)`
@@ -64607,11 +66781,11 @@ var ts;
                     // `b[0]` in `({ a: b[0] } = ...)`
                     // `b[0]` in `({ a: b[0] = 1 } = ...)`
                     return getTargetOfBindingOrAssignmentElement(bindingElement.initializer);
-                case 276 /* ShorthandPropertyAssignment */:
+                case 277 /* ShorthandPropertyAssignment */:
                     // `a` in `({ a } = ...)`
                     // `a` in `({ a = 1 } = ...)`
                     return bindingElement.name;
-                case 277 /* SpreadAssignment */:
+                case 278 /* SpreadAssignment */:
                     // `a` in `({ ...a } = ...)`
                     return getTargetOfBindingOrAssignmentElement(bindingElement.expression);
             }
@@ -64643,12 +66817,12 @@ var ts;
      */
     function getRestIndicatorOfBindingOrAssignmentElement(bindingElement) {
         switch (bindingElement.kind) {
-            case 151 /* Parameter */:
-            case 186 /* BindingElement */:
+            case 152 /* Parameter */:
+            case 187 /* BindingElement */:
                 // `...` in `let [...a] = ...`
                 return bindingElement.dotDotDotToken;
-            case 208 /* SpreadElement */:
-            case 277 /* SpreadAssignment */:
+            case 209 /* SpreadElement */:
+            case 278 /* SpreadAssignment */:
                 // `...` in `[...a] = ...`
                 return bindingElement;
         }
@@ -64660,7 +66834,7 @@ var ts;
      */
     function getPropertyNameOfBindingOrAssignmentElement(bindingElement) {
         switch (bindingElement.kind) {
-            case 186 /* BindingElement */:
+            case 187 /* BindingElement */:
                 // `a` in `let { a: b } = ...`
                 // `[a]` in `let { [a]: b } = ...`
                 // `"a"` in `let { "a": b } = ...`
@@ -64672,7 +66846,7 @@ var ts;
                         : propertyName;
                 }
                 break;
-            case 275 /* PropertyAssignment */:
+            case 276 /* PropertyAssignment */:
                 // `a` in `({ a: b } = ...)`
                 // `[a]` in `({ [a]: b } = ...)`
                 // `"a"` in `({ "a": b } = ...)`
@@ -64684,7 +66858,7 @@ var ts;
                         : propertyName;
                 }
                 break;
-            case 277 /* SpreadAssignment */:
+            case 278 /* SpreadAssignment */:
                 // `a` in `({ ...a } = ...)`
                 return bindingElement.name;
         }
@@ -64707,13 +66881,13 @@ var ts;
      */
     function getElementsOfBindingOrAssignmentPattern(name) {
         switch (name.kind) {
-            case 184 /* ObjectBindingPattern */:
-            case 185 /* ArrayBindingPattern */:
-            case 187 /* ArrayLiteralExpression */:
+            case 185 /* ObjectBindingPattern */:
+            case 186 /* ArrayBindingPattern */:
+            case 188 /* ArrayLiteralExpression */:
                 // `a` in `{a}`
                 // `a` in `[a]`
                 return name.elements;
-            case 188 /* ObjectLiteralExpression */:
+            case 189 /* ObjectLiteralExpression */:
                 // `a` in `{a}`
                 return name.properties;
         }
@@ -64753,11 +66927,11 @@ var ts;
     ts.convertToObjectAssignmentElement = convertToObjectAssignmentElement;
     function convertToAssignmentPattern(node) {
         switch (node.kind) {
-            case 185 /* ArrayBindingPattern */:
-            case 187 /* ArrayLiteralExpression */:
+            case 186 /* ArrayBindingPattern */:
+            case 188 /* ArrayLiteralExpression */:
                 return convertToArrayAssignmentPattern(node);
-            case 184 /* ObjectBindingPattern */:
-            case 188 /* ObjectLiteralExpression */:
+            case 185 /* ObjectBindingPattern */:
+            case 189 /* ObjectLiteralExpression */:
                 return convertToObjectAssignmentPattern(node);
         }
     }
@@ -64918,276 +67092,278 @@ var ts;
         }
         var kind = node.kind;
         // No need to visit nodes with no children.
-        if ((kind > 0 /* FirstToken */ && kind <= 147 /* LastToken */) || kind === 178 /* ThisType */) {
+        if ((kind > 0 /* FirstToken */ && kind <= 148 /* LastToken */) || kind === 179 /* ThisType */) {
             return node;
         }
         switch (kind) {
             // Names
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 return ts.updateIdentifier(node, nodesVisitor(node.typeArguments, visitor, isTypeNodeOrTypeParameterDeclaration));
-            case 148 /* QualifiedName */:
+            case 149 /* QualifiedName */:
                 return ts.updateQualifiedName(node, visitNode(node.left, visitor, ts.isEntityName), visitNode(node.right, visitor, ts.isIdentifier));
-            case 149 /* ComputedPropertyName */:
+            case 150 /* ComputedPropertyName */:
                 return ts.updateComputedPropertyName(node, visitNode(node.expression, visitor, ts.isExpression));
             // Signature elements
-            case 150 /* TypeParameter */:
+            case 151 /* TypeParameter */:
                 return ts.updateTypeParameterDeclaration(node, visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.constraint, visitor, ts.isTypeNode), visitNode(node.default, visitor, ts.isTypeNode));
-            case 151 /* Parameter */:
+            case 152 /* Parameter */:
                 return ts.updateParameter(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.dotDotDotToken, tokenVisitor, ts.isToken), visitNode(node.name, visitor, ts.isBindingName), visitNode(node.questionToken, tokenVisitor, ts.isToken), visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.initializer, visitor, ts.isExpression));
-            case 152 /* Decorator */:
+            case 153 /* Decorator */:
                 return ts.updateDecorator(node, visitNode(node.expression, visitor, ts.isExpression));
             // Type elements
-            case 153 /* PropertySignature */:
+            case 154 /* PropertySignature */:
                 return ts.updatePropertySignature(node, nodesVisitor(node.modifiers, visitor, ts.isToken), visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.questionToken, tokenVisitor, ts.isToken), visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.initializer, visitor, ts.isExpression));
-            case 154 /* PropertyDeclaration */:
-                return ts.updateProperty(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.questionToken, tokenVisitor, ts.isToken), visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.initializer, visitor, ts.isExpression));
-            case 155 /* MethodSignature */:
+            case 155 /* PropertyDeclaration */:
+                return ts.updateProperty(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), 
+                // QuestionToken and ExclamationToken is uniqued in Property Declaration and the signature of 'updateProperty' is that too
+                visitNode(node.questionToken || node.exclamationToken, tokenVisitor, ts.isToken), visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.initializer, visitor, ts.isExpression));
+            case 156 /* MethodSignature */:
                 return ts.updateMethodSignature(node, nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.questionToken, tokenVisitor, ts.isToken));
-            case 156 /* MethodDeclaration */:
+            case 157 /* MethodDeclaration */:
                 return ts.updateMethod(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.asteriskToken, tokenVisitor, ts.isToken), visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.questionToken, tokenVisitor, ts.isToken), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitNode(node.type, visitor, ts.isTypeNode), visitFunctionBody(node.body, visitor, context));
-            case 157 /* Constructor */:
+            case 158 /* Constructor */:
                 return ts.updateConstructor(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitFunctionBody(node.body, visitor, context));
-            case 158 /* GetAccessor */:
+            case 159 /* GetAccessor */:
                 return ts.updateGetAccessor(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitNode(node.type, visitor, ts.isTypeNode), visitFunctionBody(node.body, visitor, context));
-            case 159 /* SetAccessor */:
+            case 160 /* SetAccessor */:
                 return ts.updateSetAccessor(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitFunctionBody(node.body, visitor, context));
-            case 160 /* CallSignature */:
+            case 161 /* CallSignature */:
                 return ts.updateCallSignature(node, nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode));
-            case 161 /* ConstructSignature */:
+            case 162 /* ConstructSignature */:
                 return ts.updateConstructSignature(node, nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode));
-            case 162 /* IndexSignature */:
+            case 163 /* IndexSignature */:
                 return ts.updateIndexSignature(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode));
             // Types
-            case 163 /* TypePredicate */:
+            case 164 /* TypePredicate */:
                 return ts.updateTypePredicateNode(node, visitNode(node.parameterName, visitor), visitNode(node.type, visitor, ts.isTypeNode));
-            case 164 /* TypeReference */:
+            case 165 /* TypeReference */:
                 return ts.updateTypeReferenceNode(node, visitNode(node.typeName, visitor, ts.isEntityName), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode));
-            case 165 /* FunctionType */:
+            case 166 /* FunctionType */:
                 return ts.updateFunctionTypeNode(node, nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode));
-            case 166 /* ConstructorType */:
+            case 167 /* ConstructorType */:
                 return ts.updateConstructorTypeNode(node, nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode));
-            case 167 /* TypeQuery */:
+            case 168 /* TypeQuery */:
                 return ts.updateTypeQueryNode(node, visitNode(node.exprName, visitor, ts.isEntityName));
-            case 168 /* TypeLiteral */:
+            case 169 /* TypeLiteral */:
                 return ts.updateTypeLiteralNode(node, nodesVisitor(node.members, visitor, ts.isTypeElement));
-            case 169 /* ArrayType */:
+            case 170 /* ArrayType */:
                 return ts.updateArrayTypeNode(node, visitNode(node.elementType, visitor, ts.isTypeNode));
-            case 170 /* TupleType */:
+            case 171 /* TupleType */:
                 return ts.updateTupleTypeNode(node, nodesVisitor(node.elementTypes, visitor, ts.isTypeNode));
-            case 171 /* OptionalType */:
+            case 172 /* OptionalType */:
                 return ts.updateOptionalTypeNode(node, visitNode(node.type, visitor, ts.isTypeNode));
-            case 172 /* RestType */:
+            case 173 /* RestType */:
                 return ts.updateRestTypeNode(node, visitNode(node.type, visitor, ts.isTypeNode));
-            case 173 /* UnionType */:
+            case 174 /* UnionType */:
                 return ts.updateUnionTypeNode(node, nodesVisitor(node.types, visitor, ts.isTypeNode));
-            case 174 /* IntersectionType */:
+            case 175 /* IntersectionType */:
                 return ts.updateIntersectionTypeNode(node, nodesVisitor(node.types, visitor, ts.isTypeNode));
-            case 175 /* ConditionalType */:
+            case 176 /* ConditionalType */:
                 return ts.updateConditionalTypeNode(node, visitNode(node.checkType, visitor, ts.isTypeNode), visitNode(node.extendsType, visitor, ts.isTypeNode), visitNode(node.trueType, visitor, ts.isTypeNode), visitNode(node.falseType, visitor, ts.isTypeNode));
-            case 176 /* InferType */:
+            case 177 /* InferType */:
                 return ts.updateInferTypeNode(node, visitNode(node.typeParameter, visitor, ts.isTypeParameterDeclaration));
-            case 183 /* ImportType */:
+            case 184 /* ImportType */:
                 return ts.updateImportTypeNode(node, visitNode(node.argument, visitor, ts.isTypeNode), visitNode(node.qualifier, visitor, ts.isEntityName), visitNodes(node.typeArguments, visitor, ts.isTypeNode), node.isTypeOf);
-            case 177 /* ParenthesizedType */:
+            case 178 /* ParenthesizedType */:
                 return ts.updateParenthesizedType(node, visitNode(node.type, visitor, ts.isTypeNode));
-            case 179 /* TypeOperator */:
+            case 180 /* TypeOperator */:
                 return ts.updateTypeOperatorNode(node, visitNode(node.type, visitor, ts.isTypeNode));
-            case 180 /* IndexedAccessType */:
+            case 181 /* IndexedAccessType */:
                 return ts.updateIndexedAccessTypeNode(node, visitNode(node.objectType, visitor, ts.isTypeNode), visitNode(node.indexType, visitor, ts.isTypeNode));
-            case 181 /* MappedType */:
+            case 182 /* MappedType */:
                 return ts.updateMappedTypeNode(node, visitNode(node.readonlyToken, tokenVisitor, ts.isToken), visitNode(node.typeParameter, visitor, ts.isTypeParameterDeclaration), visitNode(node.questionToken, tokenVisitor, ts.isToken), visitNode(node.type, visitor, ts.isTypeNode));
-            case 182 /* LiteralType */:
+            case 183 /* LiteralType */:
                 return ts.updateLiteralTypeNode(node, visitNode(node.literal, visitor, ts.isExpression));
             // Binding patterns
-            case 184 /* ObjectBindingPattern */:
+            case 185 /* ObjectBindingPattern */:
                 return ts.updateObjectBindingPattern(node, nodesVisitor(node.elements, visitor, ts.isBindingElement));
-            case 185 /* ArrayBindingPattern */:
+            case 186 /* ArrayBindingPattern */:
                 return ts.updateArrayBindingPattern(node, nodesVisitor(node.elements, visitor, ts.isArrayBindingElement));
-            case 186 /* BindingElement */:
+            case 187 /* BindingElement */:
                 return ts.updateBindingElement(node, visitNode(node.dotDotDotToken, tokenVisitor, ts.isToken), visitNode(node.propertyName, visitor, ts.isPropertyName), visitNode(node.name, visitor, ts.isBindingName), visitNode(node.initializer, visitor, ts.isExpression));
             // Expression
-            case 187 /* ArrayLiteralExpression */:
+            case 188 /* ArrayLiteralExpression */:
                 return ts.updateArrayLiteral(node, nodesVisitor(node.elements, visitor, ts.isExpression));
-            case 188 /* ObjectLiteralExpression */:
+            case 189 /* ObjectLiteralExpression */:
                 return ts.updateObjectLiteral(node, nodesVisitor(node.properties, visitor, ts.isObjectLiteralElementLike));
-            case 189 /* PropertyAccessExpression */:
+            case 190 /* PropertyAccessExpression */:
                 return ts.updatePropertyAccess(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.name, visitor, ts.isIdentifier));
-            case 190 /* ElementAccessExpression */:
+            case 191 /* ElementAccessExpression */:
                 return ts.updateElementAccess(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.argumentExpression, visitor, ts.isExpression));
-            case 191 /* CallExpression */:
+            case 192 /* CallExpression */:
                 return ts.updateCall(node, visitNode(node.expression, visitor, ts.isExpression), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode), nodesVisitor(node.arguments, visitor, ts.isExpression));
-            case 192 /* NewExpression */:
+            case 193 /* NewExpression */:
                 return ts.updateNew(node, visitNode(node.expression, visitor, ts.isExpression), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode), nodesVisitor(node.arguments, visitor, ts.isExpression));
-            case 193 /* TaggedTemplateExpression */:
+            case 194 /* TaggedTemplateExpression */:
                 return ts.updateTaggedTemplate(node, visitNode(node.tag, visitor, ts.isExpression), visitNodes(node.typeArguments, visitor, ts.isExpression), visitNode(node.template, visitor, ts.isTemplateLiteral));
-            case 194 /* TypeAssertionExpression */:
+            case 195 /* TypeAssertionExpression */:
                 return ts.updateTypeAssertion(node, visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.expression, visitor, ts.isExpression));
-            case 195 /* ParenthesizedExpression */:
+            case 196 /* ParenthesizedExpression */:
                 return ts.updateParen(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 196 /* FunctionExpression */:
+            case 197 /* FunctionExpression */:
                 return ts.updateFunctionExpression(node, nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.asteriskToken, tokenVisitor, ts.isToken), visitNode(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitNode(node.type, visitor, ts.isTypeNode), visitFunctionBody(node.body, visitor, context));
-            case 197 /* ArrowFunction */:
+            case 198 /* ArrowFunction */:
                 return ts.updateArrowFunction(node, nodesVisitor(node.modifiers, visitor, ts.isModifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.equalsGreaterThanToken, visitor, ts.isToken), visitFunctionBody(node.body, visitor, context));
-            case 198 /* DeleteExpression */:
+            case 199 /* DeleteExpression */:
                 return ts.updateDelete(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 199 /* TypeOfExpression */:
+            case 200 /* TypeOfExpression */:
                 return ts.updateTypeOf(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 200 /* VoidExpression */:
+            case 201 /* VoidExpression */:
                 return ts.updateVoid(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 201 /* AwaitExpression */:
+            case 202 /* AwaitExpression */:
                 return ts.updateAwait(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 202 /* PrefixUnaryExpression */:
+            case 203 /* PrefixUnaryExpression */:
                 return ts.updatePrefix(node, visitNode(node.operand, visitor, ts.isExpression));
-            case 203 /* PostfixUnaryExpression */:
+            case 204 /* PostfixUnaryExpression */:
                 return ts.updatePostfix(node, visitNode(node.operand, visitor, ts.isExpression));
-            case 204 /* BinaryExpression */:
+            case 205 /* BinaryExpression */:
                 return ts.updateBinary(node, visitNode(node.left, visitor, ts.isExpression), visitNode(node.right, visitor, ts.isExpression), visitNode(node.operatorToken, visitor, ts.isToken));
-            case 205 /* ConditionalExpression */:
+            case 206 /* ConditionalExpression */:
                 return ts.updateConditional(node, visitNode(node.condition, visitor, ts.isExpression), visitNode(node.questionToken, visitor, ts.isToken), visitNode(node.whenTrue, visitor, ts.isExpression), visitNode(node.colonToken, visitor, ts.isToken), visitNode(node.whenFalse, visitor, ts.isExpression));
-            case 206 /* TemplateExpression */:
+            case 207 /* TemplateExpression */:
                 return ts.updateTemplateExpression(node, visitNode(node.head, visitor, ts.isTemplateHead), nodesVisitor(node.templateSpans, visitor, ts.isTemplateSpan));
-            case 207 /* YieldExpression */:
+            case 208 /* YieldExpression */:
                 return ts.updateYield(node, visitNode(node.asteriskToken, tokenVisitor, ts.isToken), visitNode(node.expression, visitor, ts.isExpression));
-            case 208 /* SpreadElement */:
+            case 209 /* SpreadElement */:
                 return ts.updateSpread(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 209 /* ClassExpression */:
+            case 210 /* ClassExpression */:
                 return ts.updateClassExpression(node, nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.heritageClauses, visitor, ts.isHeritageClause), nodesVisitor(node.members, visitor, ts.isClassElement));
-            case 211 /* ExpressionWithTypeArguments */:
+            case 212 /* ExpressionWithTypeArguments */:
                 return ts.updateExpressionWithTypeArguments(node, nodesVisitor(node.typeArguments, visitor, ts.isTypeNode), visitNode(node.expression, visitor, ts.isExpression));
-            case 212 /* AsExpression */:
+            case 213 /* AsExpression */:
                 return ts.updateAsExpression(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.type, visitor, ts.isTypeNode));
-            case 213 /* NonNullExpression */:
+            case 214 /* NonNullExpression */:
                 return ts.updateNonNullExpression(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 214 /* MetaProperty */:
+            case 215 /* MetaProperty */:
                 return ts.updateMetaProperty(node, visitNode(node.name, visitor, ts.isIdentifier));
             // Misc
-            case 216 /* TemplateSpan */:
+            case 217 /* TemplateSpan */:
                 return ts.updateTemplateSpan(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.literal, visitor, ts.isTemplateMiddleOrTemplateTail));
             // Element
-            case 218 /* Block */:
+            case 219 /* Block */:
                 return ts.updateBlock(node, nodesVisitor(node.statements, visitor, ts.isStatement));
-            case 219 /* VariableStatement */:
+            case 220 /* VariableStatement */:
                 return ts.updateVariableStatement(node, nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.declarationList, visitor, ts.isVariableDeclarationList));
-            case 221 /* ExpressionStatement */:
+            case 222 /* ExpressionStatement */:
                 return ts.updateExpressionStatement(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 222 /* IfStatement */:
+            case 223 /* IfStatement */:
                 return ts.updateIf(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.thenStatement, visitor, ts.isStatement, ts.liftToBlock), visitNode(node.elseStatement, visitor, ts.isStatement, ts.liftToBlock));
-            case 223 /* DoStatement */:
+            case 224 /* DoStatement */:
                 return ts.updateDo(node, visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock), visitNode(node.expression, visitor, ts.isExpression));
-            case 224 /* WhileStatement */:
+            case 225 /* WhileStatement */:
                 return ts.updateWhile(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock));
-            case 225 /* ForStatement */:
+            case 226 /* ForStatement */:
                 return ts.updateFor(node, visitNode(node.initializer, visitor, ts.isForInitializer), visitNode(node.condition, visitor, ts.isExpression), visitNode(node.incrementor, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock));
-            case 226 /* ForInStatement */:
+            case 227 /* ForInStatement */:
                 return ts.updateForIn(node, visitNode(node.initializer, visitor, ts.isForInitializer), visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock));
-            case 227 /* ForOfStatement */:
+            case 228 /* ForOfStatement */:
                 return ts.updateForOf(node, visitNode(node.awaitModifier, visitor, ts.isToken), visitNode(node.initializer, visitor, ts.isForInitializer), visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock));
-            case 228 /* ContinueStatement */:
+            case 229 /* ContinueStatement */:
                 return ts.updateContinue(node, visitNode(node.label, visitor, ts.isIdentifier));
-            case 229 /* BreakStatement */:
+            case 230 /* BreakStatement */:
                 return ts.updateBreak(node, visitNode(node.label, visitor, ts.isIdentifier));
-            case 230 /* ReturnStatement */:
+            case 231 /* ReturnStatement */:
                 return ts.updateReturn(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 231 /* WithStatement */:
+            case 232 /* WithStatement */:
                 return ts.updateWith(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock));
-            case 232 /* SwitchStatement */:
+            case 233 /* SwitchStatement */:
                 return ts.updateSwitch(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.caseBlock, visitor, ts.isCaseBlock));
-            case 233 /* LabeledStatement */:
+            case 234 /* LabeledStatement */:
                 return ts.updateLabel(node, visitNode(node.label, visitor, ts.isIdentifier), visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock));
-            case 234 /* ThrowStatement */:
+            case 235 /* ThrowStatement */:
                 return ts.updateThrow(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 235 /* TryStatement */:
+            case 236 /* TryStatement */:
                 return ts.updateTry(node, visitNode(node.tryBlock, visitor, ts.isBlock), visitNode(node.catchClause, visitor, ts.isCatchClause), visitNode(node.finallyBlock, visitor, ts.isBlock));
-            case 237 /* VariableDeclaration */:
+            case 238 /* VariableDeclaration */:
                 return ts.updateVariableDeclaration(node, visitNode(node.name, visitor, ts.isBindingName), visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.initializer, visitor, ts.isExpression));
-            case 238 /* VariableDeclarationList */:
+            case 239 /* VariableDeclarationList */:
                 return ts.updateVariableDeclarationList(node, nodesVisitor(node.declarations, visitor, ts.isVariableDeclaration));
-            case 239 /* FunctionDeclaration */:
+            case 240 /* FunctionDeclaration */:
                 return ts.updateFunctionDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.asteriskToken, tokenVisitor, ts.isToken), visitNode(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitNode(node.type, visitor, ts.isTypeNode), visitFunctionBody(node.body, visitor, context));
-            case 240 /* ClassDeclaration */:
+            case 241 /* ClassDeclaration */:
                 return ts.updateClassDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.heritageClauses, visitor, ts.isHeritageClause), nodesVisitor(node.members, visitor, ts.isClassElement));
-            case 241 /* InterfaceDeclaration */:
+            case 242 /* InterfaceDeclaration */:
                 return ts.updateInterfaceDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.heritageClauses, visitor, ts.isHeritageClause), nodesVisitor(node.members, visitor, ts.isTypeElement));
-            case 242 /* TypeAliasDeclaration */:
+            case 243 /* TypeAliasDeclaration */:
                 return ts.updateTypeAliasDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode));
-            case 243 /* EnumDeclaration */:
+            case 244 /* EnumDeclaration */:
                 return ts.updateEnumDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier), nodesVisitor(node.members, visitor, ts.isEnumMember));
-            case 244 /* ModuleDeclaration */:
+            case 245 /* ModuleDeclaration */:
                 return ts.updateModuleDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.body, visitor, ts.isModuleBody));
-            case 245 /* ModuleBlock */:
+            case 246 /* ModuleBlock */:
                 return ts.updateModuleBlock(node, nodesVisitor(node.statements, visitor, ts.isStatement));
-            case 246 /* CaseBlock */:
+            case 247 /* CaseBlock */:
                 return ts.updateCaseBlock(node, nodesVisitor(node.clauses, visitor, ts.isCaseOrDefaultClause));
-            case 247 /* NamespaceExportDeclaration */:
+            case 248 /* NamespaceExportDeclaration */:
                 return ts.updateNamespaceExportDeclaration(node, visitNode(node.name, visitor, ts.isIdentifier));
-            case 248 /* ImportEqualsDeclaration */:
+            case 249 /* ImportEqualsDeclaration */:
                 return ts.updateImportEqualsDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.moduleReference, visitor, ts.isModuleReference));
-            case 249 /* ImportDeclaration */:
+            case 250 /* ImportDeclaration */:
                 return ts.updateImportDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.importClause, visitor, ts.isImportClause), visitNode(node.moduleSpecifier, visitor, ts.isExpression));
-            case 250 /* ImportClause */:
+            case 251 /* ImportClause */:
                 return ts.updateImportClause(node, visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.namedBindings, visitor, ts.isNamedImportBindings));
-            case 251 /* NamespaceImport */:
+            case 252 /* NamespaceImport */:
                 return ts.updateNamespaceImport(node, visitNode(node.name, visitor, ts.isIdentifier));
-            case 252 /* NamedImports */:
+            case 253 /* NamedImports */:
                 return ts.updateNamedImports(node, nodesVisitor(node.elements, visitor, ts.isImportSpecifier));
-            case 253 /* ImportSpecifier */:
+            case 254 /* ImportSpecifier */:
                 return ts.updateImportSpecifier(node, visitNode(node.propertyName, visitor, ts.isIdentifier), visitNode(node.name, visitor, ts.isIdentifier));
-            case 254 /* ExportAssignment */:
+            case 255 /* ExportAssignment */:
                 return ts.updateExportAssignment(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.expression, visitor, ts.isExpression));
-            case 255 /* ExportDeclaration */:
+            case 256 /* ExportDeclaration */:
                 return ts.updateExportDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.exportClause, visitor, ts.isNamedExports), visitNode(node.moduleSpecifier, visitor, ts.isExpression));
-            case 256 /* NamedExports */:
+            case 257 /* NamedExports */:
                 return ts.updateNamedExports(node, nodesVisitor(node.elements, visitor, ts.isExportSpecifier));
-            case 257 /* ExportSpecifier */:
+            case 258 /* ExportSpecifier */:
                 return ts.updateExportSpecifier(node, visitNode(node.propertyName, visitor, ts.isIdentifier), visitNode(node.name, visitor, ts.isIdentifier));
             // Module references
-            case 259 /* ExternalModuleReference */:
+            case 260 /* ExternalModuleReference */:
                 return ts.updateExternalModuleReference(node, visitNode(node.expression, visitor, ts.isExpression));
             // JSX
-            case 260 /* JsxElement */:
+            case 261 /* JsxElement */:
                 return ts.updateJsxElement(node, visitNode(node.openingElement, visitor, ts.isJsxOpeningElement), nodesVisitor(node.children, visitor, ts.isJsxChild), visitNode(node.closingElement, visitor, ts.isJsxClosingElement));
-            case 261 /* JsxSelfClosingElement */:
+            case 262 /* JsxSelfClosingElement */:
                 return ts.updateJsxSelfClosingElement(node, visitNode(node.tagName, visitor, ts.isJsxTagNameExpression), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode), visitNode(node.attributes, visitor, ts.isJsxAttributes));
-            case 262 /* JsxOpeningElement */:
+            case 263 /* JsxOpeningElement */:
                 return ts.updateJsxOpeningElement(node, visitNode(node.tagName, visitor, ts.isJsxTagNameExpression), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode), visitNode(node.attributes, visitor, ts.isJsxAttributes));
-            case 263 /* JsxClosingElement */:
+            case 264 /* JsxClosingElement */:
                 return ts.updateJsxClosingElement(node, visitNode(node.tagName, visitor, ts.isJsxTagNameExpression));
-            case 264 /* JsxFragment */:
+            case 265 /* JsxFragment */:
                 return ts.updateJsxFragment(node, visitNode(node.openingFragment, visitor, ts.isJsxOpeningFragment), nodesVisitor(node.children, visitor, ts.isJsxChild), visitNode(node.closingFragment, visitor, ts.isJsxClosingFragment));
-            case 267 /* JsxAttribute */:
+            case 268 /* JsxAttribute */:
                 return ts.updateJsxAttribute(node, visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.initializer, visitor, ts.isStringLiteralOrJsxExpression));
-            case 268 /* JsxAttributes */:
+            case 269 /* JsxAttributes */:
                 return ts.updateJsxAttributes(node, nodesVisitor(node.properties, visitor, ts.isJsxAttributeLike));
-            case 269 /* JsxSpreadAttribute */:
+            case 270 /* JsxSpreadAttribute */:
                 return ts.updateJsxSpreadAttribute(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 270 /* JsxExpression */:
+            case 271 /* JsxExpression */:
                 return ts.updateJsxExpression(node, visitNode(node.expression, visitor, ts.isExpression));
             // Clauses
-            case 271 /* CaseClause */:
+            case 272 /* CaseClause */:
                 return ts.updateCaseClause(node, visitNode(node.expression, visitor, ts.isExpression), nodesVisitor(node.statements, visitor, ts.isStatement));
-            case 272 /* DefaultClause */:
+            case 273 /* DefaultClause */:
                 return ts.updateDefaultClause(node, nodesVisitor(node.statements, visitor, ts.isStatement));
-            case 273 /* HeritageClause */:
+            case 274 /* HeritageClause */:
                 return ts.updateHeritageClause(node, nodesVisitor(node.types, visitor, ts.isExpressionWithTypeArguments));
-            case 274 /* CatchClause */:
+            case 275 /* CatchClause */:
                 return ts.updateCatchClause(node, visitNode(node.variableDeclaration, visitor, ts.isVariableDeclaration), visitNode(node.block, visitor, ts.isBlock));
             // Property assignments
-            case 275 /* PropertyAssignment */:
+            case 276 /* PropertyAssignment */:
                 return ts.updatePropertyAssignment(node, visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.initializer, visitor, ts.isExpression));
-            case 276 /* ShorthandPropertyAssignment */:
+            case 277 /* ShorthandPropertyAssignment */:
                 return ts.updateShorthandPropertyAssignment(node, visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.objectAssignmentInitializer, visitor, ts.isExpression));
-            case 277 /* SpreadAssignment */:
+            case 278 /* SpreadAssignment */:
                 return ts.updateSpreadAssignment(node, visitNode(node.expression, visitor, ts.isExpression));
             // Enum
-            case 278 /* EnumMember */:
+            case 279 /* EnumMember */:
                 return ts.updateEnumMember(node, visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.initializer, visitor, ts.isExpression));
             // Top-level nodes
-            case 284 /* SourceFile */:
+            case 285 /* SourceFile */:
                 return ts.updateSourceFileNode(node, visitLexicalEnvironment(node.statements, visitor, context));
             // Transformation nodes
-            case 313 /* PartiallyEmittedExpression */:
+            case 315 /* PartiallyEmittedExpression */:
                 return ts.updatePartiallyEmittedExpression(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 314 /* CommaListExpression */:
+            case 316 /* CommaListExpression */:
                 return ts.updateCommaList(node, nodesVisitor(node.elements, visitor, ts.isExpression));
             default:
                 // No need to visit nodes with no children.
@@ -65229,58 +67405,58 @@ var ts;
         var cbNodes = cbNodeArray || cbNode;
         var kind = node.kind;
         // No need to visit nodes with no children.
-        if ((kind > 0 /* FirstToken */ && kind <= 147 /* LastToken */)) {
+        if ((kind > 0 /* FirstToken */ && kind <= 148 /* LastToken */)) {
             return initial;
         }
         // We do not yet support types.
-        if ((kind >= 163 /* TypePredicate */ && kind <= 182 /* LiteralType */)) {
+        if ((kind >= 164 /* TypePredicate */ && kind <= 183 /* LiteralType */)) {
             return initial;
         }
         var result = initial;
         switch (node.kind) {
             // Leaf nodes
-            case 217 /* SemicolonClassElement */:
-            case 220 /* EmptyStatement */:
-            case 210 /* OmittedExpression */:
-            case 236 /* DebuggerStatement */:
-            case 312 /* NotEmittedStatement */:
+            case 218 /* SemicolonClassElement */:
+            case 221 /* EmptyStatement */:
+            case 211 /* OmittedExpression */:
+            case 237 /* DebuggerStatement */:
+            case 314 /* NotEmittedStatement */:
                 // No need to visit nodes with no children.
                 break;
             // Names
-            case 148 /* QualifiedName */:
+            case 149 /* QualifiedName */:
                 result = reduceNode(node.left, cbNode, result);
                 result = reduceNode(node.right, cbNode, result);
                 break;
-            case 149 /* ComputedPropertyName */:
+            case 150 /* ComputedPropertyName */:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
             // Signature elements
-            case 151 /* Parameter */:
+            case 152 /* Parameter */:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.type, cbNode, result);
                 result = reduceNode(node.initializer, cbNode, result);
                 break;
-            case 152 /* Decorator */:
+            case 153 /* Decorator */:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
             // Type member
-            case 153 /* PropertySignature */:
+            case 154 /* PropertySignature */:
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.questionToken, cbNode, result);
                 result = reduceNode(node.type, cbNode, result);
                 result = reduceNode(node.initializer, cbNode, result);
                 break;
-            case 154 /* PropertyDeclaration */:
+            case 155 /* PropertyDeclaration */:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.type, cbNode, result);
                 result = reduceNode(node.initializer, cbNode, result);
                 break;
-            case 156 /* MethodDeclaration */:
+            case 157 /* MethodDeclaration */:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
@@ -65289,12 +67465,12 @@ var ts;
                 result = reduceNode(node.type, cbNode, result);
                 result = reduceNode(node.body, cbNode, result);
                 break;
-            case 157 /* Constructor */:
+            case 158 /* Constructor */:
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNodes(node.parameters, cbNodes, result);
                 result = reduceNode(node.body, cbNode, result);
                 break;
-            case 158 /* GetAccessor */:
+            case 159 /* GetAccessor */:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
@@ -65302,7 +67478,7 @@ var ts;
                 result = reduceNode(node.type, cbNode, result);
                 result = reduceNode(node.body, cbNode, result);
                 break;
-            case 159 /* SetAccessor */:
+            case 160 /* SetAccessor */:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
@@ -65310,50 +67486,50 @@ var ts;
                 result = reduceNode(node.body, cbNode, result);
                 break;
             // Binding patterns
-            case 184 /* ObjectBindingPattern */:
-            case 185 /* ArrayBindingPattern */:
+            case 185 /* ObjectBindingPattern */:
+            case 186 /* ArrayBindingPattern */:
                 result = reduceNodes(node.elements, cbNodes, result);
                 break;
-            case 186 /* BindingElement */:
+            case 187 /* BindingElement */:
                 result = reduceNode(node.propertyName, cbNode, result);
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.initializer, cbNode, result);
                 break;
             // Expression
-            case 187 /* ArrayLiteralExpression */:
+            case 188 /* ArrayLiteralExpression */:
                 result = reduceNodes(node.elements, cbNodes, result);
                 break;
-            case 188 /* ObjectLiteralExpression */:
+            case 189 /* ObjectLiteralExpression */:
                 result = reduceNodes(node.properties, cbNodes, result);
                 break;
-            case 189 /* PropertyAccessExpression */:
+            case 190 /* PropertyAccessExpression */:
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNode(node.name, cbNode, result);
                 break;
-            case 190 /* ElementAccessExpression */:
+            case 191 /* ElementAccessExpression */:
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNode(node.argumentExpression, cbNode, result);
                 break;
-            case 191 /* CallExpression */:
+            case 192 /* CallExpression */:
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNodes(node.typeArguments, cbNodes, result);
                 result = reduceNodes(node.arguments, cbNodes, result);
                 break;
-            case 192 /* NewExpression */:
+            case 193 /* NewExpression */:
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNodes(node.typeArguments, cbNodes, result);
                 result = reduceNodes(node.arguments, cbNodes, result);
                 break;
-            case 193 /* TaggedTemplateExpression */:
+            case 194 /* TaggedTemplateExpression */:
                 result = reduceNode(node.tag, cbNode, result);
                 result = reduceNodes(node.typeArguments, cbNodes, result);
                 result = reduceNode(node.template, cbNode, result);
                 break;
-            case 194 /* TypeAssertionExpression */:
+            case 195 /* TypeAssertionExpression */:
                 result = reduceNode(node.type, cbNode, result);
                 result = reduceNode(node.expression, cbNode, result);
                 break;
-            case 196 /* FunctionExpression */:
+            case 197 /* FunctionExpression */:
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNodes(node.typeParameters, cbNodes, result);
@@ -65361,123 +67537,123 @@ var ts;
                 result = reduceNode(node.type, cbNode, result);
                 result = reduceNode(node.body, cbNode, result);
                 break;
-            case 197 /* ArrowFunction */:
+            case 198 /* ArrowFunction */:
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNodes(node.typeParameters, cbNodes, result);
                 result = reduceNodes(node.parameters, cbNodes, result);
                 result = reduceNode(node.type, cbNode, result);
                 result = reduceNode(node.body, cbNode, result);
                 break;
-            case 195 /* ParenthesizedExpression */:
-            case 198 /* DeleteExpression */:
-            case 199 /* TypeOfExpression */:
-            case 200 /* VoidExpression */:
-            case 201 /* AwaitExpression */:
-            case 207 /* YieldExpression */:
-            case 208 /* SpreadElement */:
-            case 213 /* NonNullExpression */:
+            case 196 /* ParenthesizedExpression */:
+            case 199 /* DeleteExpression */:
+            case 200 /* TypeOfExpression */:
+            case 201 /* VoidExpression */:
+            case 202 /* AwaitExpression */:
+            case 208 /* YieldExpression */:
+            case 209 /* SpreadElement */:
+            case 214 /* NonNullExpression */:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
-            case 202 /* PrefixUnaryExpression */:
-            case 203 /* PostfixUnaryExpression */:
+            case 203 /* PrefixUnaryExpression */:
+            case 204 /* PostfixUnaryExpression */:
                 result = reduceNode(node.operand, cbNode, result);
                 break;
-            case 204 /* BinaryExpression */:
+            case 205 /* BinaryExpression */:
                 result = reduceNode(node.left, cbNode, result);
                 result = reduceNode(node.right, cbNode, result);
                 break;
-            case 205 /* ConditionalExpression */:
+            case 206 /* ConditionalExpression */:
                 result = reduceNode(node.condition, cbNode, result);
                 result = reduceNode(node.whenTrue, cbNode, result);
                 result = reduceNode(node.whenFalse, cbNode, result);
                 break;
-            case 206 /* TemplateExpression */:
+            case 207 /* TemplateExpression */:
                 result = reduceNode(node.head, cbNode, result);
                 result = reduceNodes(node.templateSpans, cbNodes, result);
                 break;
-            case 209 /* ClassExpression */:
+            case 210 /* ClassExpression */:
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNodes(node.typeParameters, cbNodes, result);
                 result = reduceNodes(node.heritageClauses, cbNodes, result);
                 result = reduceNodes(node.members, cbNodes, result);
                 break;
-            case 211 /* ExpressionWithTypeArguments */:
+            case 212 /* ExpressionWithTypeArguments */:
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNodes(node.typeArguments, cbNodes, result);
                 break;
-            case 212 /* AsExpression */:
+            case 213 /* AsExpression */:
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNode(node.type, cbNode, result);
                 break;
             // Misc
-            case 216 /* TemplateSpan */:
+            case 217 /* TemplateSpan */:
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNode(node.literal, cbNode, result);
                 break;
             // Element
-            case 218 /* Block */:
+            case 219 /* Block */:
                 result = reduceNodes(node.statements, cbNodes, result);
                 break;
-            case 219 /* VariableStatement */:
+            case 220 /* VariableStatement */:
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.declarationList, cbNode, result);
                 break;
-            case 221 /* ExpressionStatement */:
+            case 222 /* ExpressionStatement */:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
-            case 222 /* IfStatement */:
+            case 223 /* IfStatement */:
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNode(node.thenStatement, cbNode, result);
                 result = reduceNode(node.elseStatement, cbNode, result);
                 break;
-            case 223 /* DoStatement */:
+            case 224 /* DoStatement */:
                 result = reduceNode(node.statement, cbNode, result);
                 result = reduceNode(node.expression, cbNode, result);
                 break;
-            case 224 /* WhileStatement */:
-            case 231 /* WithStatement */:
+            case 225 /* WhileStatement */:
+            case 232 /* WithStatement */:
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNode(node.statement, cbNode, result);
                 break;
-            case 225 /* ForStatement */:
+            case 226 /* ForStatement */:
                 result = reduceNode(node.initializer, cbNode, result);
                 result = reduceNode(node.condition, cbNode, result);
                 result = reduceNode(node.incrementor, cbNode, result);
                 result = reduceNode(node.statement, cbNode, result);
                 break;
-            case 226 /* ForInStatement */:
-            case 227 /* ForOfStatement */:
+            case 227 /* ForInStatement */:
+            case 228 /* ForOfStatement */:
                 result = reduceNode(node.initializer, cbNode, result);
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNode(node.statement, cbNode, result);
                 break;
-            case 230 /* ReturnStatement */:
-            case 234 /* ThrowStatement */:
+            case 231 /* ReturnStatement */:
+            case 235 /* ThrowStatement */:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
-            case 232 /* SwitchStatement */:
+            case 233 /* SwitchStatement */:
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNode(node.caseBlock, cbNode, result);
                 break;
-            case 233 /* LabeledStatement */:
+            case 234 /* LabeledStatement */:
                 result = reduceNode(node.label, cbNode, result);
                 result = reduceNode(node.statement, cbNode, result);
                 break;
-            case 235 /* TryStatement */:
+            case 236 /* TryStatement */:
                 result = reduceNode(node.tryBlock, cbNode, result);
                 result = reduceNode(node.catchClause, cbNode, result);
                 result = reduceNode(node.finallyBlock, cbNode, result);
                 break;
-            case 237 /* VariableDeclaration */:
+            case 238 /* VariableDeclaration */:
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.type, cbNode, result);
                 result = reduceNode(node.initializer, cbNode, result);
                 break;
-            case 238 /* VariableDeclarationList */:
+            case 239 /* VariableDeclarationList */:
                 result = reduceNodes(node.declarations, cbNodes, result);
                 break;
-            case 239 /* FunctionDeclaration */:
+            case 240 /* FunctionDeclaration */:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
@@ -65486,7 +67662,7 @@ var ts;
                 result = reduceNode(node.type, cbNode, result);
                 result = reduceNode(node.body, cbNode, result);
                 break;
-            case 240 /* ClassDeclaration */:
+            case 241 /* ClassDeclaration */:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
@@ -65494,140 +67670,140 @@ var ts;
                 result = reduceNodes(node.heritageClauses, cbNodes, result);
                 result = reduceNodes(node.members, cbNodes, result);
                 break;
-            case 243 /* EnumDeclaration */:
+            case 244 /* EnumDeclaration */:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNodes(node.members, cbNodes, result);
                 break;
-            case 244 /* ModuleDeclaration */:
+            case 245 /* ModuleDeclaration */:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.body, cbNode, result);
                 break;
-            case 245 /* ModuleBlock */:
+            case 246 /* ModuleBlock */:
                 result = reduceNodes(node.statements, cbNodes, result);
                 break;
-            case 246 /* CaseBlock */:
+            case 247 /* CaseBlock */:
                 result = reduceNodes(node.clauses, cbNodes, result);
                 break;
-            case 248 /* ImportEqualsDeclaration */:
+            case 249 /* ImportEqualsDeclaration */:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.moduleReference, cbNode, result);
                 break;
-            case 249 /* ImportDeclaration */:
+            case 250 /* ImportDeclaration */:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.importClause, cbNode, result);
                 result = reduceNode(node.moduleSpecifier, cbNode, result);
                 break;
-            case 250 /* ImportClause */:
+            case 251 /* ImportClause */:
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.namedBindings, cbNode, result);
                 break;
-            case 251 /* NamespaceImport */:
+            case 252 /* NamespaceImport */:
                 result = reduceNode(node.name, cbNode, result);
                 break;
-            case 252 /* NamedImports */:
-            case 256 /* NamedExports */:
+            case 253 /* NamedImports */:
+            case 257 /* NamedExports */:
                 result = reduceNodes(node.elements, cbNodes, result);
                 break;
-            case 253 /* ImportSpecifier */:
-            case 257 /* ExportSpecifier */:
+            case 254 /* ImportSpecifier */:
+            case 258 /* ExportSpecifier */:
                 result = reduceNode(node.propertyName, cbNode, result);
                 result = reduceNode(node.name, cbNode, result);
                 break;
-            case 254 /* ExportAssignment */:
+            case 255 /* ExportAssignment */:
                 result = ts.reduceLeft(node.decorators, cbNode, result);
                 result = ts.reduceLeft(node.modifiers, cbNode, result);
                 result = reduceNode(node.expression, cbNode, result);
                 break;
-            case 255 /* ExportDeclaration */:
+            case 256 /* ExportDeclaration */:
                 result = ts.reduceLeft(node.decorators, cbNode, result);
                 result = ts.reduceLeft(node.modifiers, cbNode, result);
                 result = reduceNode(node.exportClause, cbNode, result);
                 result = reduceNode(node.moduleSpecifier, cbNode, result);
                 break;
             // Module references
-            case 259 /* ExternalModuleReference */:
+            case 260 /* ExternalModuleReference */:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
             // JSX
-            case 260 /* JsxElement */:
+            case 261 /* JsxElement */:
                 result = reduceNode(node.openingElement, cbNode, result);
                 result = ts.reduceLeft(node.children, cbNode, result);
                 result = reduceNode(node.closingElement, cbNode, result);
                 break;
-            case 264 /* JsxFragment */:
+            case 265 /* JsxFragment */:
                 result = reduceNode(node.openingFragment, cbNode, result);
                 result = ts.reduceLeft(node.children, cbNode, result);
                 result = reduceNode(node.closingFragment, cbNode, result);
                 break;
-            case 261 /* JsxSelfClosingElement */:
-            case 262 /* JsxOpeningElement */:
+            case 262 /* JsxSelfClosingElement */:
+            case 263 /* JsxOpeningElement */:
                 result = reduceNode(node.tagName, cbNode, result);
                 result = reduceNodes(node.typeArguments, cbNode, result);
                 result = reduceNode(node.attributes, cbNode, result);
                 break;
-            case 268 /* JsxAttributes */:
+            case 269 /* JsxAttributes */:
                 result = reduceNodes(node.properties, cbNodes, result);
                 break;
-            case 263 /* JsxClosingElement */:
+            case 264 /* JsxClosingElement */:
                 result = reduceNode(node.tagName, cbNode, result);
                 break;
-            case 267 /* JsxAttribute */:
+            case 268 /* JsxAttribute */:
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.initializer, cbNode, result);
                 break;
-            case 269 /* JsxSpreadAttribute */:
+            case 270 /* JsxSpreadAttribute */:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
-            case 270 /* JsxExpression */:
+            case 271 /* JsxExpression */:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
             // Clauses
-            case 271 /* CaseClause */:
+            case 272 /* CaseClause */:
                 result = reduceNode(node.expression, cbNode, result);
             // falls through
-            case 272 /* DefaultClause */:
+            case 273 /* DefaultClause */:
                 result = reduceNodes(node.statements, cbNodes, result);
                 break;
-            case 273 /* HeritageClause */:
+            case 274 /* HeritageClause */:
                 result = reduceNodes(node.types, cbNodes, result);
                 break;
-            case 274 /* CatchClause */:
+            case 275 /* CatchClause */:
                 result = reduceNode(node.variableDeclaration, cbNode, result);
                 result = reduceNode(node.block, cbNode, result);
                 break;
             // Property assignments
-            case 275 /* PropertyAssignment */:
+            case 276 /* PropertyAssignment */:
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.initializer, cbNode, result);
                 break;
-            case 276 /* ShorthandPropertyAssignment */:
+            case 277 /* ShorthandPropertyAssignment */:
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.objectAssignmentInitializer, cbNode, result);
                 break;
-            case 277 /* SpreadAssignment */:
+            case 278 /* SpreadAssignment */:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
             // Enum
-            case 278 /* EnumMember */:
+            case 279 /* EnumMember */:
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.initializer, cbNode, result);
                 break;
             // Top-level nodes
-            case 284 /* SourceFile */:
+            case 285 /* SourceFile */:
                 result = reduceNodes(node.statements, cbNodes, result);
                 break;
             // Transformation nodes
-            case 313 /* PartiallyEmittedExpression */:
+            case 315 /* PartiallyEmittedExpression */:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
-            case 314 /* CommaListExpression */:
+            case 316 /* CommaListExpression */:
                 result = reduceNodes(node.elements, cbNodes, result);
                 break;
             default:
@@ -65651,7 +67827,7 @@ var ts;
      * @param nodes The NodeArray.
      */
     function liftToBlock(nodes) {
-        Debug.assert(ts.every(nodes, ts.isStatement), "Cannot lift nodes to a Block.");
+        ts.Debug.assert(ts.every(nodes, ts.isStatement), "Cannot lift nodes to a Block.");
         return ts.singleOrUndefined(nodes) || ts.createBlock(nodes);
     }
     ts.liftToBlock = liftToBlock;
@@ -65700,7 +67876,7 @@ var ts;
     function aggregateTransformFlagsForSubtree(node) {
         // We do not transform ambient declarations or types, so there is no need to
         // recursively aggregate transform flags.
-        if (ts.hasModifier(node, 2 /* Ambient */) || (ts.isTypeNode(node) && node.kind !== 211 /* ExpressionWithTypeArguments */)) {
+        if (ts.hasModifier(node, 2 /* Ambient */) || (ts.isTypeNode(node) && node.kind !== 212 /* ExpressionWithTypeArguments */)) {
             return 0 /* None */;
         }
         // Aggregate the transform flags of each child.
@@ -65716,73 +67892,6 @@ var ts;
     function aggregateTransformFlagsForChildNodes(transformFlags, nodes) {
         return transformFlags | aggregateTransformFlagsForNodeArray(nodes);
     }
-    var Debug;
-    (function (Debug) {
-        var isDebugInfoEnabled = false;
-        function failBadSyntaxKind(node, message) {
-            return Debug.fail((message || "Unexpected node.") + "\r\nNode " + ts.formatSyntaxKind(node.kind) + " was unexpected.", failBadSyntaxKind);
-        }
-        Debug.failBadSyntaxKind = failBadSyntaxKind;
-        Debug.assertEachNode = Debug.shouldAssert(1 /* Normal */)
-            ? function (nodes, test, message) { return Debug.assert(test === undefined || ts.every(nodes, test), message || "Unexpected node.", function () { return "Node array did not pass test '" + Debug.getFunctionName(test) + "'."; }, Debug.assertEachNode); }
-            : ts.noop;
-        Debug.assertNode = Debug.shouldAssert(1 /* Normal */)
-            ? function (node, test, message) { return Debug.assert(test === undefined || test(node), message || "Unexpected node.", function () { return "Node " + ts.formatSyntaxKind(node.kind) + " did not pass test '" + Debug.getFunctionName(test) + "'."; }, Debug.assertNode); }
-            : ts.noop;
-        Debug.assertOptionalNode = Debug.shouldAssert(1 /* Normal */)
-            ? function (node, test, message) { return Debug.assert(test === undefined || node === undefined || test(node), message || "Unexpected node.", function () { return "Node " + ts.formatSyntaxKind(node.kind) + " did not pass test '" + Debug.getFunctionName(test) + "'."; }, Debug.assertOptionalNode); }
-            : ts.noop;
-        Debug.assertOptionalToken = Debug.shouldAssert(1 /* Normal */)
-            ? function (node, kind, message) { return Debug.assert(kind === undefined || node === undefined || node.kind === kind, message || "Unexpected node.", function () { return "Node " + ts.formatSyntaxKind(node.kind) + " was not a '" + ts.formatSyntaxKind(kind) + "' token."; }, Debug.assertOptionalToken); }
-            : ts.noop;
-        Debug.assertMissingNode = Debug.shouldAssert(1 /* Normal */)
-            ? function (node, message) { return Debug.assert(node === undefined, message || "Unexpected node.", function () { return "Node " + ts.formatSyntaxKind(node.kind) + " was unexpected'."; }, Debug.assertMissingNode); }
-            : ts.noop;
-        /**
-         * Injects debug information into frequently used types.
-         */
-        function enableDebugInfo() {
-            if (isDebugInfoEnabled)
-                return;
-            // Add additional properties in debug mode to assist with debugging.
-            Object.defineProperties(ts.objectAllocator.getSymbolConstructor().prototype, {
-                __debugFlags: { get: function () { return ts.formatSymbolFlags(this.flags); } }
-            });
-            Object.defineProperties(ts.objectAllocator.getTypeConstructor().prototype, {
-                __debugFlags: { get: function () { return ts.formatTypeFlags(this.flags); } },
-                __debugObjectFlags: { get: function () { return this.flags & 524288 /* Object */ ? ts.formatObjectFlags(this.objectFlags) : ""; } },
-                __debugTypeToString: { value: function () { return this.checker.typeToString(this); } },
-            });
-            var nodeConstructors = [
-                ts.objectAllocator.getNodeConstructor(),
-                ts.objectAllocator.getIdentifierConstructor(),
-                ts.objectAllocator.getTokenConstructor(),
-                ts.objectAllocator.getSourceFileConstructor()
-            ];
-            for (var _i = 0, nodeConstructors_1 = nodeConstructors; _i < nodeConstructors_1.length; _i++) {
-                var ctor = nodeConstructors_1[_i];
-                if (!ctor.prototype.hasOwnProperty("__debugKind")) {
-                    Object.defineProperties(ctor.prototype, {
-                        __debugKind: { get: function () { return ts.formatSyntaxKind(this.kind); } },
-                        __debugModifierFlags: { get: function () { return ts.formatModifierFlags(ts.getModifierFlagsNoCache(this)); } },
-                        __debugTransformFlags: { get: function () { return ts.formatTransformFlags(this.transformFlags); } },
-                        __debugEmitFlags: { get: function () { return ts.formatEmitFlags(ts.getEmitFlags(this)); } },
-                        __debugGetText: {
-                            value: function (includeTrivia) {
-                                if (ts.nodeIsSynthesized(this))
-                                    return "";
-                                var parseNode = ts.getParseTreeNode(this);
-                                var sourceFile = parseNode && ts.getSourceFileOfNode(parseNode);
-                                return sourceFile ? ts.getSourceTextOfNodeFromSourceFile(sourceFile, parseNode, includeTrivia) : "";
-                            }
-                        }
-                    });
-                }
-            }
-            isDebugInfoEnabled = true;
-        }
-        Debug.enableDebugInfo = enableDebugInfo;
-    })(Debug = ts.Debug || (ts.Debug = {}));
 })(ts || (ts = {}));
 /* @internal */
 var ts;
@@ -65909,7 +68018,6 @@ var ts;
             exit();
         }
         function appendSourceMap(generatedLine, generatedCharacter, map, sourceMapPath, start, end) {
-            var _a;
             ts.Debug.assert(generatedLine >= pendingGeneratedLine, "generatedLine cannot backtrack");
             ts.Debug.assert(generatedCharacter >= 0, "generatedCharacter cannot be negative");
             enter();
@@ -65917,7 +68025,8 @@ var ts;
             var sourceIndexToNewSourceIndexMap = [];
             var nameIndexToNewNameIndexMap;
             var mappingIterator = decodeMappings(map.mappings);
-            for (var _b = mappingIterator.next(), raw = _b.value, done = _b.done; !done; _a = mappingIterator.next(), raw = _a.value, done = _a.done, _a) {
+            for (var iterResult = mappingIterator.next(); !iterResult.done; iterResult = mappingIterator.next()) {
+                var raw = iterResult.value;
                 if (end && (raw.generatedLine > end.line ||
                     (raw.generatedLine === end.line && raw.generatedCharacter > end.character))) {
                     break;
@@ -66440,7 +68549,7 @@ var ts;
     function chainBundle(transformSourceFile) {
         return transformSourceFileOrBundle;
         function transformSourceFileOrBundle(node) {
-            return node.kind === 284 /* SourceFile */ ? transformSourceFile(node) : transformBundle(node);
+            return node.kind === 285 /* SourceFile */ ? transformSourceFile(node) : transformBundle(node);
         }
         function transformBundle(node) {
             return ts.createBundle(ts.map(node.sourceFiles, transformSourceFile), node.prepends);
@@ -66486,7 +68595,7 @@ var ts;
         for (var _i = 0, _a = sourceFile.statements; _i < _a.length; _i++) {
             var node = _a[_i];
             switch (node.kind) {
-                case 249 /* ImportDeclaration */:
+                case 250 /* ImportDeclaration */:
                     // import "mod"
                     // import x from "mod"
                     // import * as x from "mod"
@@ -66494,13 +68603,13 @@ var ts;
                     externalImports.push(node);
                     hasImportStarOrImportDefault = hasImportStarOrImportDefault || getImportNeedsImportStarHelper(node) || getImportNeedsImportDefaultHelper(node);
                     break;
-                case 248 /* ImportEqualsDeclaration */:
-                    if (node.moduleReference.kind === 259 /* ExternalModuleReference */) {
+                case 249 /* ImportEqualsDeclaration */:
+                    if (node.moduleReference.kind === 260 /* ExternalModuleReference */) {
                         // import x = require("mod")
                         externalImports.push(node);
                     }
                     break;
-                case 255 /* ExportDeclaration */:
+                case 256 /* ExportDeclaration */:
                     if (node.moduleSpecifier) {
                         if (!node.exportClause) {
                             // export * from "mod"
@@ -66530,13 +68639,13 @@ var ts;
                         }
                     }
                     break;
-                case 254 /* ExportAssignment */:
+                case 255 /* ExportAssignment */:
                     if (node.isExportEquals && !exportEquals) {
                         // export = x
                         exportEquals = node;
                     }
                     break;
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     if (ts.hasModifier(node, 1 /* Export */)) {
                         for (var _d = 0, _e = node.declarationList.declarations; _d < _e.length; _d++) {
                             var decl = _e[_d];
@@ -66544,7 +68653,7 @@ var ts;
                         }
                     }
                     break;
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     if (ts.hasModifier(node, 1 /* Export */)) {
                         if (ts.hasModifier(node, 512 /* Default */)) {
                             // export default function() { }
@@ -66564,7 +68673,7 @@ var ts;
                         }
                     }
                     break;
-                case 240 /* ClassDeclaration */:
+                case 241 /* ClassDeclaration */:
                     if (ts.hasModifier(node, 1 /* Export */)) {
                         if (ts.hasModifier(node, 512 /* Default */)) {
                             // export default class { }
@@ -66638,6 +68747,43 @@ var ts;
             ts.isIdentifier(expression);
     }
     ts.isSimpleCopiableExpression = isSimpleCopiableExpression;
+    /**
+     * A simple inlinable expression is an expression which can be copied into multiple locations
+     * without risk of repeating any sideeffects and whose value could not possibly change between
+     * any such locations
+     */
+    function isSimpleInlineableExpression(expression) {
+        return !ts.isIdentifier(expression) && isSimpleCopiableExpression(expression) ||
+            ts.isWellKnownSymbolSyntactically(expression);
+    }
+    ts.isSimpleInlineableExpression = isSimpleInlineableExpression;
+    /**
+     * Adds super call and preceding prologue directives into the list of statements.
+     *
+     * @param ctor The constructor node.
+     * @param result The list of statements.
+     * @param visitor The visitor to apply to each node added to the result array.
+     * @returns index of the statement that follows super call
+     */
+    function addPrologueDirectivesAndInitialSuperCall(ctor, result, visitor) {
+        if (ctor.body) {
+            var statements = ctor.body.statements;
+            // add prologue directives to the list (if any)
+            var index = ts.addPrologue(result, statements, /*ensureUseStrict*/ false, visitor);
+            if (index === statements.length) {
+                // list contains nothing but prologue directives (or empty) - exit
+                return index;
+            }
+            var statement = statements[index];
+            if (statement.kind === 222 /* ExpressionStatement */ && ts.isSuperCall(statement.expression)) {
+                result.push(ts.visitNode(statement, visitor, ts.isStatement));
+                return index + 1;
+            }
+            return index;
+        }
+        return 0;
+    }
+    ts.addPrologueDirectivesAndInitialSuperCall = addPrologueDirectivesAndInitialSuperCall;
     /**
      * @param input Template string input strings
      * @param args Names which need to be made file-level unique
@@ -66658,6 +68804,45 @@ var ts;
         };
     }
     ts.helperString = helperString;
+    /**
+     * Gets all property declarations with initializers on either the static or instance side of a class.
+     *
+     * @param node The class node.
+     * @param isStatic A value indicating whether to get properties from the static or instance side of the class.
+     */
+    function getInitializedProperties(node, isStatic) {
+        return ts.filter(node.members, isStatic ? isStaticInitializedProperty : isInstanceInitializedProperty);
+    }
+    ts.getInitializedProperties = getInitializedProperties;
+    /**
+     * Gets a value indicating whether a class element is a static property declaration with an initializer.
+     *
+     * @param member The class element node.
+     */
+    function isStaticInitializedProperty(member) {
+        return isInitializedProperty(member) && ts.hasStaticModifier(member);
+    }
+    ts.isStaticInitializedProperty = isStaticInitializedProperty;
+    /**
+     * Gets a value indicating whether a class element is an instance property declaration with an initializer.
+     *
+     * @param member The class element node.
+     */
+    function isInstanceInitializedProperty(member) {
+        return isInitializedProperty(member) && !ts.hasStaticModifier(member);
+    }
+    ts.isInstanceInitializedProperty = isInstanceInitializedProperty;
+    /**
+     * Gets a value indicating whether a class element is either a static or an instance property declaration with an initializer.
+     *
+     * @param member The class element node.
+     * @param isStatic A value indicating whether the member should be a static or instance member.
+     */
+    function isInitializedProperty(member) {
+        return member.kind === 155 /* PropertyDeclaration */
+            && member.initializer !== undefined;
+    }
+    ts.isInitializedProperty = isInitializedProperty;
 })(ts || (ts = {}));
 /*@internal*/
 var ts;
@@ -67104,7 +69289,7 @@ var ts;
     ts.restHelper = {
         name: "typescript:rest",
         scoped: false,
-        text: "\n            var __rest = (this && this.__rest) || function (s, e) {\n                var t = {};\n                for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)\n                    t[p] = s[p];\n                if (s != null && typeof Object.getOwnPropertySymbols === \"function\")\n                    for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)\n                        t[p[i]] = s[p[i]];\n                return t;\n            };"
+        text: "\n            var __rest = (this && this.__rest) || function (s, e) {\n                var t = {};\n                for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)\n                    t[p] = s[p];\n                if (s != null && typeof Object.getOwnPropertySymbols === \"function\")\n                    for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {\n                        if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))\n                            t[p[i]] = s[p[i]];\n                    }\n                return t;\n            };"
     };
     /** Given value: o, propName: p, pattern: { a, b, ...p } from the original statement
      * `{ a, b, ...p } = o`, create `p = __rest(o, ["a", "b"]);`
@@ -67180,8 +69365,8 @@ var ts;
         context.onEmitNode = onEmitNode;
         context.onSubstituteNode = onSubstituteNode;
         // Enable substitution for property/element access to emit const enum values.
-        context.enableSubstitution(189 /* PropertyAccessExpression */);
-        context.enableSubstitution(190 /* ElementAccessExpression */);
+        context.enableSubstitution(190 /* PropertyAccessExpression */);
+        context.enableSubstitution(191 /* ElementAccessExpression */);
         // These variables contain state that changes as we descend into the tree.
         var currentSourceFile;
         var currentNamespace;
@@ -67189,6 +69374,7 @@ var ts;
         var currentLexicalScope;
         var currentNameScope;
         var currentScopeFirstDeclarationsOfName;
+        var currentClassHasParameterProperties;
         /**
          * Keeps track of whether expression substitution has been enabled for specific edge cases.
          * They are persisted between each SourceFile transformation and should not be reset.
@@ -67204,21 +69390,16 @@ var ts;
          * just-in-time substitution while printing an expression identifier.
          */
         var applicableSubstitutions;
-        /**
-         * Tracks what computed name expressions originating from elided names must be inlined
-         * at the next execution site, in document order
-         */
-        var pendingExpressions;
         return transformSourceFileOrBundle;
         function transformSourceFileOrBundle(node) {
-            if (node.kind === 285 /* Bundle */) {
+            if (node.kind === 286 /* Bundle */) {
                 return transformBundle(node);
             }
             return transformSourceFile(node);
         }
         function transformBundle(node) {
             return ts.createBundle(node.sourceFiles.map(transformSourceFile), ts.mapDefined(node.prepends, function (prepend) {
-                if (prepend.kind === 287 /* InputFiles */) {
+                if (prepend.kind === 288 /* InputFiles */) {
                     return ts.createUnparsedSourceFile(prepend, "js");
                 }
                 return prepend;
@@ -67249,6 +69430,7 @@ var ts;
             var savedCurrentScope = currentLexicalScope;
             var savedCurrentNameScope = currentNameScope;
             var savedCurrentScopeFirstDeclarationsOfName = currentScopeFirstDeclarationsOfName;
+            var savedCurrentClassHasParameterProperties = currentClassHasParameterProperties;
             // Handle state changes before visiting a node.
             onBeforeVisitNode(node);
             var visited = f(node);
@@ -67258,6 +69440,7 @@ var ts;
             }
             currentLexicalScope = savedCurrentScope;
             currentNameScope = savedCurrentNameScope;
+            currentClassHasParameterProperties = savedCurrentClassHasParameterProperties;
             return visited;
         }
         /**
@@ -67267,16 +69450,16 @@ var ts;
          */
         function onBeforeVisitNode(node) {
             switch (node.kind) {
-                case 284 /* SourceFile */:
-                case 246 /* CaseBlock */:
-                case 245 /* ModuleBlock */:
-                case 218 /* Block */:
+                case 285 /* SourceFile */:
+                case 247 /* CaseBlock */:
+                case 246 /* ModuleBlock */:
+                case 219 /* Block */:
                     currentLexicalScope = node;
                     currentNameScope = undefined;
                     currentScopeFirstDeclarationsOfName = undefined;
                     break;
-                case 240 /* ClassDeclaration */:
-                case 239 /* FunctionDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     if (ts.hasModifier(node, 2 /* Ambient */)) {
                         break;
                     }
@@ -67288,7 +69471,7 @@ var ts;
                         // These nodes should always have names unless they are default-exports;
                         // however, class declaration parsing allows for undefined names, so syntactically invalid
                         // programs may also have an undefined name.
-                        ts.Debug.assert(node.kind === 240 /* ClassDeclaration */ || ts.hasModifier(node, 512 /* Default */));
+                        ts.Debug.assert(node.kind === 241 /* ClassDeclaration */ || ts.hasModifier(node, 512 /* Default */));
                     }
                     if (ts.isClassDeclaration(node)) {
                         // XXX: should probably also cover interfaces and type aliases that can have type variables?
@@ -67331,10 +69514,10 @@ var ts;
          */
         function sourceElementVisitorWorker(node) {
             switch (node.kind) {
-                case 249 /* ImportDeclaration */:
-                case 248 /* ImportEqualsDeclaration */:
-                case 254 /* ExportAssignment */:
-                case 255 /* ExportDeclaration */:
+                case 250 /* ImportDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
+                case 255 /* ExportAssignment */:
+                case 256 /* ExportDeclaration */:
                     return visitEllidableStatement(node);
                 default:
                     return visitorWorker(node);
@@ -67355,13 +69538,13 @@ var ts;
                 return node;
             }
             switch (node.kind) {
-                case 249 /* ImportDeclaration */:
+                case 250 /* ImportDeclaration */:
                     return visitImportDeclaration(node);
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return visitImportEqualsDeclaration(node);
-                case 254 /* ExportAssignment */:
+                case 255 /* ExportAssignment */:
                     return visitExportAssignment(node);
-                case 255 /* ExportDeclaration */:
+                case 256 /* ExportDeclaration */:
                     return visitExportDeclaration(node);
                 default:
                     ts.Debug.fail("Unhandled ellided statement");
@@ -67381,11 +69564,11 @@ var ts;
          * @param node The node to visit.
          */
         function namespaceElementVisitorWorker(node) {
-            if (node.kind === 255 /* ExportDeclaration */ ||
-                node.kind === 249 /* ImportDeclaration */ ||
-                node.kind === 250 /* ImportClause */ ||
-                (node.kind === 248 /* ImportEqualsDeclaration */ &&
-                    node.moduleReference.kind === 259 /* ExternalModuleReference */)) {
+            if (node.kind === 256 /* ExportDeclaration */ ||
+                node.kind === 250 /* ImportDeclaration */ ||
+                node.kind === 251 /* ImportClause */ ||
+                (node.kind === 249 /* ImportEqualsDeclaration */ &&
+                    node.moduleReference.kind === 260 /* ExternalModuleReference */)) {
                 // do not emit ES6 imports and exports since they are illegal inside a namespace
                 return undefined;
             }
@@ -67409,19 +69592,19 @@ var ts;
          */
         function classElementVisitorWorker(node) {
             switch (node.kind) {
-                case 157 /* Constructor */:
-                    // TypeScript constructors are transformed in `visitClassDeclaration`.
-                    // We elide them here as `visitorWorker` checks transform flags, which could
-                    // erronously include an ES6 constructor without TypeScript syntax.
-                    return undefined;
-                case 154 /* PropertyDeclaration */:
-                case 162 /* IndexSignature */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
-                case 156 /* MethodDeclaration */:
+                case 158 /* Constructor */:
+                    return visitConstructor(node);
+                case 155 /* PropertyDeclaration */:
+                    // Property declarations are not TypeScript syntax, but they must be visited
+                    // for the decorator transformation.
+                    return visitPropertyDeclaration(node);
+                case 163 /* IndexSignature */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
+                case 157 /* MethodDeclaration */:
                     // Fallback to the default visit behavior.
                     return visitorWorker(node);
-                case 217 /* SemicolonClassElement */:
+                case 218 /* SemicolonClassElement */:
                     return node;
                 default:
                     return ts.Debug.failBadSyntaxKind(node);
@@ -67431,7 +69614,7 @@ var ts;
             if (ts.modifierToFlag(node.kind) & 2270 /* TypeScriptModifier */) {
                 return undefined;
             }
-            else if (currentNamespace && node.kind === 85 /* ExportKeyword */) {
+            else if (currentNamespace && node.kind === 86 /* ExportKeyword */) {
                 return undefined;
             }
             return node;
@@ -67448,117 +69631,115 @@ var ts;
                 return ts.createNotEmittedStatement(node);
             }
             switch (node.kind) {
-                case 85 /* ExportKeyword */:
-                case 80 /* DefaultKeyword */:
+                case 86 /* ExportKeyword */:
+                case 81 /* DefaultKeyword */:
                     // ES6 export and default modifiers are elided when inside a namespace.
                     return currentNamespace ? undefined : node;
-                case 115 /* PublicKeyword */:
-                case 113 /* PrivateKeyword */:
-                case 114 /* ProtectedKeyword */:
-                case 118 /* AbstractKeyword */:
-                case 77 /* ConstKeyword */:
-                case 125 /* DeclareKeyword */:
-                case 133 /* ReadonlyKeyword */:
+                case 116 /* PublicKeyword */:
+                case 114 /* PrivateKeyword */:
+                case 115 /* ProtectedKeyword */:
+                case 119 /* AbstractKeyword */:
+                case 78 /* ConstKeyword */:
+                case 126 /* DeclareKeyword */:
+                case 134 /* ReadonlyKeyword */:
                 // TypeScript accessibility and readonly modifiers are elided.
-                case 169 /* ArrayType */:
-                case 170 /* TupleType */:
-                case 171 /* OptionalType */:
-                case 172 /* RestType */:
-                case 168 /* TypeLiteral */:
-                case 163 /* TypePredicate */:
-                case 150 /* TypeParameter */:
-                case 120 /* AnyKeyword */:
-                case 143 /* UnknownKeyword */:
-                case 123 /* BooleanKeyword */:
-                case 138 /* StringKeyword */:
-                case 135 /* NumberKeyword */:
-                case 132 /* NeverKeyword */:
-                case 106 /* VoidKeyword */:
-                case 139 /* SymbolKeyword */:
-                case 166 /* ConstructorType */:
-                case 165 /* FunctionType */:
-                case 167 /* TypeQuery */:
-                case 164 /* TypeReference */:
-                case 173 /* UnionType */:
-                case 174 /* IntersectionType */:
-                case 175 /* ConditionalType */:
-                case 177 /* ParenthesizedType */:
-                case 178 /* ThisType */:
-                case 179 /* TypeOperator */:
-                case 180 /* IndexedAccessType */:
-                case 181 /* MappedType */:
-                case 182 /* LiteralType */:
+                case 170 /* ArrayType */:
+                case 171 /* TupleType */:
+                case 172 /* OptionalType */:
+                case 173 /* RestType */:
+                case 169 /* TypeLiteral */:
+                case 164 /* TypePredicate */:
+                case 151 /* TypeParameter */:
+                case 121 /* AnyKeyword */:
+                case 144 /* UnknownKeyword */:
+                case 124 /* BooleanKeyword */:
+                case 139 /* StringKeyword */:
+                case 136 /* NumberKeyword */:
+                case 133 /* NeverKeyword */:
+                case 107 /* VoidKeyword */:
+                case 140 /* SymbolKeyword */:
+                case 167 /* ConstructorType */:
+                case 166 /* FunctionType */:
+                case 168 /* TypeQuery */:
+                case 165 /* TypeReference */:
+                case 174 /* UnionType */:
+                case 175 /* IntersectionType */:
+                case 176 /* ConditionalType */:
+                case 178 /* ParenthesizedType */:
+                case 179 /* ThisType */:
+                case 180 /* TypeOperator */:
+                case 181 /* IndexedAccessType */:
+                case 182 /* MappedType */:
+                case 183 /* LiteralType */:
                 // TypeScript type nodes are elided.
-                case 162 /* IndexSignature */:
+                case 163 /* IndexSignature */:
                 // TypeScript index signatures are elided.
-                case 152 /* Decorator */:
+                case 153 /* Decorator */:
                 // TypeScript decorators are elided. They will be emitted as part of visitClassDeclaration.
-                case 242 /* TypeAliasDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
                     // TypeScript type-only declarations are elided.
                     return undefined;
-                case 154 /* PropertyDeclaration */:
+                case 155 /* PropertyDeclaration */:
                     // TypeScript property declarations are elided. However their names are still visited, and can potentially be retained if they could have sideeffects
                     return visitPropertyDeclaration(node);
-                case 247 /* NamespaceExportDeclaration */:
+                case 248 /* NamespaceExportDeclaration */:
                     // TypeScript namespace export declarations are elided.
                     return undefined;
-                case 157 /* Constructor */:
+                case 158 /* Constructor */:
                     return visitConstructor(node);
-                case 241 /* InterfaceDeclaration */:
+                case 242 /* InterfaceDeclaration */:
                     // TypeScript interfaces are elided, but some comments may be preserved.
                     // See the implementation of `getLeadingComments` in comments.ts for more details.
                     return ts.createNotEmittedStatement(node);
-                case 240 /* ClassDeclaration */:
+                case 241 /* ClassDeclaration */:
                     // This may be a class declaration with TypeScript syntax extensions.
                     //
                     // TypeScript class syntax extensions include:
                     // - decorators
                     // - optional `implements` heritage clause
                     // - parameter property assignments in the constructor
-                    // - property declarations
                     // - index signatures
                     // - method overload signatures
                     return visitClassDeclaration(node);
-                case 209 /* ClassExpression */:
+                case 210 /* ClassExpression */:
                     // This may be a class expression with TypeScript syntax extensions.
                     //
                     // TypeScript class syntax extensions include:
                     // - decorators
                     // - optional `implements` heritage clause
                     // - parameter property assignments in the constructor
-                    // - property declarations
                     // - index signatures
                     // - method overload signatures
                     return visitClassExpression(node);
-                case 273 /* HeritageClause */:
+                case 274 /* HeritageClause */:
                     // This may be a heritage clause with TypeScript syntax extensions.
                     //
                     // TypeScript heritage clause extensions include:
                     // - `implements` clause
                     return visitHeritageClause(node);
-                case 211 /* ExpressionWithTypeArguments */:
+                case 212 /* ExpressionWithTypeArguments */:
                     // TypeScript supports type arguments on an expression in an `extends` heritage clause.
                     return visitExpressionWithTypeArguments(node);
-                case 156 /* MethodDeclaration */:
+                case 157 /* MethodDeclaration */:
                     // TypeScript method declarations may have decorators, modifiers
                     // or type annotations.
                     return visitMethodDeclaration(node);
-                case 158 /* GetAccessor */:
+                case 159 /* GetAccessor */:
                     // Get Accessors can have TypeScript modifiers, decorators, and type annotations.
                     return visitGetAccessor(node);
-                case 159 /* SetAccessor */:
+                case 160 /* SetAccessor */:
                     // Set Accessors can have TypeScript modifiers and type annotations.
                     return visitSetAccessor(node);
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     // Typescript function declarations can have modifiers, decorators, and type annotations.
                     return visitFunctionDeclaration(node);
-                case 196 /* FunctionExpression */:
+                case 197 /* FunctionExpression */:
                     // TypeScript function expressions can have modifiers and type annotations.
                     return visitFunctionExpression(node);
-                case 197 /* ArrowFunction */:
+                case 198 /* ArrowFunction */:
                     // TypeScript arrow functions can have modifiers and type annotations.
                     return visitArrowFunction(node);
-                case 151 /* Parameter */:
+                case 152 /* Parameter */:
                     // This may be a parameter declaration with TypeScript syntax extensions.
                     //
                     // TypeScript parameter declaration syntax extensions include:
@@ -67568,35 +69749,35 @@ var ts;
                     // - type annotations
                     // - this parameters
                     return visitParameter(node);
-                case 195 /* ParenthesizedExpression */:
+                case 196 /* ParenthesizedExpression */:
                     // ParenthesizedExpressions are TypeScript if their expression is a
                     // TypeAssertion or AsExpression
                     return visitParenthesizedExpression(node);
-                case 194 /* TypeAssertionExpression */:
-                case 212 /* AsExpression */:
+                case 195 /* TypeAssertionExpression */:
+                case 213 /* AsExpression */:
                     // TypeScript type assertions are removed, but their subtrees are preserved.
                     return visitAssertionExpression(node);
-                case 191 /* CallExpression */:
+                case 192 /* CallExpression */:
                     return visitCallExpression(node);
-                case 192 /* NewExpression */:
+                case 193 /* NewExpression */:
                     return visitNewExpression(node);
-                case 193 /* TaggedTemplateExpression */:
+                case 194 /* TaggedTemplateExpression */:
                     return visitTaggedTemplateExpression(node);
-                case 213 /* NonNullExpression */:
+                case 214 /* NonNullExpression */:
                     // TypeScript non-null expressions are removed, but their subtrees are preserved.
                     return visitNonNullExpression(node);
-                case 243 /* EnumDeclaration */:
+                case 244 /* EnumDeclaration */:
                     // TypeScript enum declarations do not exist in ES6 and must be rewritten.
                     return visitEnumDeclaration(node);
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     // TypeScript namespace exports for variable statements must be transformed.
                     return visitVariableStatement(node);
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     return visitVariableDeclaration(node);
-                case 244 /* ModuleDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     // TypeScript namespace declarations must be transformed.
                     return visitModuleDeclaration(node);
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     // TypeScript namespace or external module import.
                     return visitImportEqualsDeclaration(node);
                 default:
@@ -67634,7 +69815,7 @@ var ts;
             if (ts.some(staticProperties))
                 facts |= 1 /* HasStaticInitializedProperties */;
             var extendsClauseElement = ts.getEffectiveBaseTypeNode(node);
-            if (extendsClauseElement && ts.skipOuterExpressions(extendsClauseElement.expression).kind !== 96 /* NullKeyword */)
+            if (extendsClauseElement && ts.skipOuterExpressions(extendsClauseElement.expression).kind !== 97 /* NullKeyword */)
                 facts |= 64 /* IsDerivedClass */;
             if (shouldEmitDecorateCallForClass(node))
                 facts |= 2 /* HasConstructorDecorators */;
@@ -67663,31 +69844,16 @@ var ts;
             if (!isClassLikeDeclarationWithTypeScriptSyntax(node) && !(currentNamespace && ts.hasModifier(node, 1 /* Export */))) {
                 return ts.visitEachChild(node, visitor, context);
             }
-            var savedPendingExpressions = pendingExpressions;
-            pendingExpressions = undefined;
-            var staticProperties = getInitializedProperties(node, /*isStatic*/ true);
+            var staticProperties = ts.getInitializedProperties(node, /*isStatic*/ true);
             var facts = getClassFacts(node, staticProperties);
             if (facts & 128 /* UseImmediatelyInvokedFunctionExpression */) {
                 context.startLexicalEnvironment();
             }
             var name = node.name || (facts & 5 /* NeedsName */ ? ts.getGeneratedNameForNode(node) : undefined);
             var classStatement = facts & 2 /* HasConstructorDecorators */
-                ? createClassDeclarationHeadWithDecorators(node, name, facts)
+                ? createClassDeclarationHeadWithDecorators(node, name)
                 : createClassDeclarationHeadWithoutDecorators(node, name, facts);
             var statements = [classStatement];
-            // Write any pending expressions from elided or moved computed property names
-            if (ts.some(pendingExpressions)) {
-                statements.push(ts.createExpressionStatement(ts.inlineExpressions(pendingExpressions)));
-            }
-            pendingExpressions = savedPendingExpressions;
-            // Emit static property assignment. Because classDeclaration is lexically evaluated,
-            // it is safe to emit static property assignment after classDeclaration
-            // From ES6 specification:
-            //      HasLexicalDeclaration (N) : Determines if the argument identifier has a binding in this environment record that was created using
-            //                                  a lexical declaration such as a LexicalDeclaration or a ClassDeclaration.
-            if (facts & 1 /* HasStaticInitializedProperties */) {
-                addInitializedPropertyStatements(statements, staticProperties, facts & 128 /* UseImmediatelyInvokedFunctionExpression */ ? ts.getInternalName(node) : ts.getLocalName(node));
-            }
             // Write any decorators of the node.
             addClassElementDecorationStatements(statements, node, /*isStatic*/ false);
             addClassElementDecorationStatements(statements, node, /*isStatic*/ true);
@@ -67767,13 +69933,14 @@ var ts;
                 : undefined;
             var classDeclaration = ts.createClassDeclaration(
             /*decorators*/ undefined, modifiers, name, 
-            /*typeParameters*/ undefined, ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), transformClassMembers(node, (facts & 64 /* IsDerivedClass */) !== 0));
+            /*typeParameters*/ undefined, ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), transformClassMembers(node));
             // To better align with the old emitter, we should not emit a trailing source map
             // entry if the class has static properties.
             var emitFlags = ts.getEmitFlags(node);
             if (facts & 1 /* HasStaticInitializedProperties */) {
                 emitFlags |= 32 /* NoTrailingSourceMap */;
             }
+            ts.aggregateTransformFlags(classDeclaration);
             ts.setTextRange(classDeclaration, node);
             ts.setOriginalNode(classDeclaration, node);
             ts.setEmitFlags(classDeclaration, emitFlags);
@@ -67783,7 +69950,7 @@ var ts;
          * Transforms a decorated class declaration and appends the resulting statements. If
          * the class requires an alias to avoid issues with double-binding, the alias is returned.
          */
-        function createClassDeclarationHeadWithDecorators(node, name, facts) {
+        function createClassDeclarationHeadWithDecorators(node, name) {
             // When we emit an ES6 class that has a class decorator, we must tailor the
             // emit to certain specific cases.
             //
@@ -67876,8 +70043,9 @@ var ts;
             //      ${members}
             //  }
             var heritageClauses = ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause);
-            var members = transformClassMembers(node, (facts & 64 /* IsDerivedClass */) !== 0);
+            var members = transformClassMembers(node);
             var classExpression = ts.createClassExpression(/*modifiers*/ undefined, name, /*typeParameters*/ undefined, heritageClauses, members);
+            ts.aggregateTransformFlags(classExpression);
             ts.setOriginalNode(classExpression, node);
             ts.setTextRange(classExpression, location);
             //  let ${name} = ${classExpression} where name is either declaredName if the class doesn't contain self-reference
@@ -67896,311 +70064,40 @@ var ts;
             if (!isClassLikeDeclarationWithTypeScriptSyntax(node)) {
                 return ts.visitEachChild(node, visitor, context);
             }
-            var savedPendingExpressions = pendingExpressions;
-            pendingExpressions = undefined;
-            var staticProperties = getInitializedProperties(node, /*isStatic*/ true);
-            var heritageClauses = ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause);
-            var members = transformClassMembers(node, ts.some(heritageClauses, function (c) { return c.token === 86 /* ExtendsKeyword */; }));
             var classExpression = ts.createClassExpression(
             /*modifiers*/ undefined, node.name, 
-            /*typeParameters*/ undefined, heritageClauses, members);
+            /*typeParameters*/ undefined, ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), transformClassMembers(node));
+            ts.aggregateTransformFlags(classExpression);
             ts.setOriginalNode(classExpression, node);
             ts.setTextRange(classExpression, node);
-            if (ts.some(staticProperties) || ts.some(pendingExpressions)) {
-                var expressions = [];
-                var isClassWithConstructorReference = resolver.getNodeCheckFlags(node) & 16777216 /* ClassWithConstructorReference */;
-                var temp = ts.createTempVariable(hoistVariableDeclaration, !!isClassWithConstructorReference);
-                if (isClassWithConstructorReference) {
-                    // record an alias as the class name is not in scope for statics.
-                    enableSubstitutionForClassAliases();
-                    var alias = ts.getSynthesizedClone(temp);
-                    alias.autoGenerateFlags &= ~8 /* ReservedInNestedScopes */;
-                    classAliases[ts.getOriginalNodeId(node)] = alias;
-                }
-                // To preserve the behavior of the old emitter, we explicitly indent
-                // the body of a class with static initializers.
-                ts.setEmitFlags(classExpression, 65536 /* Indented */ | ts.getEmitFlags(classExpression));
-                expressions.push(ts.startOnNewLine(ts.createAssignment(temp, classExpression)));
-                // Add any pending expressions leftover from elided or relocated computed property names
-                ts.addRange(expressions, ts.map(pendingExpressions, ts.startOnNewLine));
-                pendingExpressions = savedPendingExpressions;
-                ts.addRange(expressions, generateInitializedPropertyExpressions(staticProperties, temp));
-                expressions.push(ts.startOnNewLine(temp));
-                return ts.inlineExpressions(expressions);
-            }
-            pendingExpressions = savedPendingExpressions;
             return classExpression;
         }
         /**
          * Transforms the members of a class.
          *
          * @param node The current class.
-         * @param isDerivedClass A value indicating whether the class has an extends clause that does not extend 'null'.
          */
-        function transformClassMembers(node, isDerivedClass) {
+        function transformClassMembers(node) {
             var members = [];
-            var constructor = transformConstructor(node, isDerivedClass);
-            if (constructor) {
-                members.push(constructor);
+            var constructor = ts.getFirstConstructorWithBody(node);
+            var parametersWithPropertyAssignments = constructor &&
+                ts.filter(constructor.parameters, ts.isParameterPropertyDeclaration);
+            if (parametersWithPropertyAssignments) {
+                for (var _i = 0, parametersWithPropertyAssignments_1 = parametersWithPropertyAssignments; _i < parametersWithPropertyAssignments_1.length; _i++) {
+                    var parameter = parametersWithPropertyAssignments_1[_i];
+                    if (ts.isIdentifier(parameter.name)) {
+                        members.push(ts.aggregateTransformFlags(ts.createProperty(
+                        /*decorators*/ undefined, 
+                        /*modifiers*/ undefined, parameter.name, 
+                        /*questionOrExclamationToken*/ undefined, 
+                        /*type*/ undefined, 
+                        /*initializer*/ undefined)));
+                    }
+                }
             }
             ts.addRange(members, ts.visitNodes(node.members, classElementVisitor, ts.isClassElement));
             return ts.setTextRange(ts.createNodeArray(members), /*location*/ node.members);
         }
-        /**
-         * Transforms (or creates) a constructor for a class.
-         *
-         * @param node The current class.
-         * @param isDerivedClass A value indicating whether the class has an extends clause that does not extend 'null'.
-         */
-        function transformConstructor(node, isDerivedClass) {
-            // Check if we have property assignment inside class declaration.
-            // If there is a property assignment, we need to emit constructor whether users define it or not
-            // If there is no property assignment, we can omit constructor if users do not define it
-            var constructor = ts.getFirstConstructorWithBody(node);
-            var hasInstancePropertyWithInitializer = ts.forEach(node.members, isInstanceInitializedProperty);
-            var hasParameterPropertyAssignments = constructor &&
-                constructor.transformFlags & 1024 /* ContainsTypeScriptClassSyntax */ &&
-                ts.forEach(constructor.parameters, isParameterWithPropertyAssignment);
-            // If the class does not contain nodes that require a synthesized constructor,
-            // accept the current constructor if it exists.
-            if (!hasInstancePropertyWithInitializer && !hasParameterPropertyAssignments) {
-                return ts.visitEachChild(constructor, visitor, context);
-            }
-            var parameters = transformConstructorParameters(constructor);
-            var body = transformConstructorBody(node, constructor, isDerivedClass);
-            //  constructor(${parameters}) {
-            //      ${body}
-            //  }
-            return ts.startOnNewLine(ts.setOriginalNode(ts.setTextRange(ts.createConstructor(
-            /*decorators*/ undefined, 
-            /*modifiers*/ undefined, parameters, body), constructor || node), constructor));
-        }
-        /**
-         * Transforms (or creates) the parameters for the constructor of a class with
-         * parameter property assignments or instance property initializers.
-         *
-         * @param constructor The constructor declaration.
-         */
-        function transformConstructorParameters(constructor) {
-            // The ES2015 spec specifies in 14.5.14. Runtime Semantics: ClassDefinitionEvaluation:
-            // If constructor is empty, then
-            //     If ClassHeritag_eopt is present and protoParent is not null, then
-            //          Let constructor be the result of parsing the source text
-            //              constructor(...args) { super (...args);}
-            //          using the syntactic grammar with the goal symbol MethodDefinition[~Yield].
-            //      Else,
-            //           Let constructor be the result of parsing the source text
-            //               constructor( ){ }
-            //           using the syntactic grammar with the goal symbol MethodDefinition[~Yield].
-            //
-            // While we could emit the '...args' rest parameter, certain later tools in the pipeline might
-            // downlevel the '...args' portion less efficiently by naively copying the contents of 'arguments' to an array.
-            // Instead, we'll avoid using a rest parameter and spread into the super call as
-            // 'super(...arguments)' instead of 'super(...args)', as you can see in "transformConstructorBody".
-            return ts.visitParameterList(constructor && constructor.parameters, visitor, context)
-                || [];
-        }
-        /**
-         * Transforms (or creates) a constructor body for a class with parameter property
-         * assignments or instance property initializers.
-         *
-         * @param node The current class.
-         * @param constructor The current class constructor.
-         * @param isDerivedClass A value indicating whether the class has an extends clause that does not extend 'null'.
-         */
-        function transformConstructorBody(node, constructor, isDerivedClass) {
-            var statements = [];
-            var indexOfFirstStatement = 0;
-            resumeLexicalEnvironment();
-            if (constructor) {
-                indexOfFirstStatement = addPrologueDirectivesAndInitialSuperCall(constructor, statements);
-                // Add parameters with property assignments. Transforms this:
-                //
-                //  constructor (public x, public y) {
-                //  }
-                //
-                // Into this:
-                //
-                //  constructor (x, y) {
-                //      this.x = x;
-                //      this.y = y;
-                //  }
-                //
-                var propertyAssignments = getParametersWithPropertyAssignments(constructor);
-                ts.addRange(statements, ts.map(propertyAssignments, transformParameterWithPropertyAssignment));
-            }
-            else if (isDerivedClass) {
-                // Add a synthetic `super` call:
-                //
-                //  super(...arguments);
-                //
-                statements.push(ts.createExpressionStatement(ts.createCall(ts.createSuper(), 
-                /*typeArguments*/ undefined, [ts.createSpread(ts.createIdentifier("arguments"))])));
-            }
-            // Add the property initializers. Transforms this:
-            //
-            //  public x = 1;
-            //
-            // Into this:
-            //
-            //  constructor() {
-            //      this.x = 1;
-            //  }
-            //
-            var properties = getInitializedProperties(node, /*isStatic*/ false);
-            addInitializedPropertyStatements(statements, properties, ts.createThis());
-            if (constructor) {
-                // The class already had a constructor, so we should add the existing statements, skipping the initial super call.
-                ts.addRange(statements, ts.visitNodes(constructor.body.statements, visitor, ts.isStatement, indexOfFirstStatement));
-            }
-            // End the lexical environment.
-            statements = ts.mergeLexicalEnvironment(statements, endLexicalEnvironment());
-            return ts.setTextRange(ts.createBlock(ts.setTextRange(ts.createNodeArray(statements), 
-            /*location*/ constructor ? constructor.body.statements : node.members), 
-            /*multiLine*/ true), 
-            /*location*/ constructor ? constructor.body : undefined);
-        }
-        /**
-         * Adds super call and preceding prologue directives into the list of statements.
-         *
-         * @param ctor The constructor node.
-         * @returns index of the statement that follows super call
-         */
-        function addPrologueDirectivesAndInitialSuperCall(ctor, result) {
-            if (ctor.body) {
-                var statements = ctor.body.statements;
-                // add prologue directives to the list (if any)
-                var index = ts.addPrologue(result, statements, /*ensureUseStrict*/ false, visitor);
-                if (index === statements.length) {
-                    // list contains nothing but prologue directives (or empty) - exit
-                    return index;
-                }
-                var statement = statements[index];
-                if (statement.kind === 221 /* ExpressionStatement */ && ts.isSuperCall(statement.expression)) {
-                    result.push(ts.visitNode(statement, visitor, ts.isStatement));
-                    return index + 1;
-                }
-                return index;
-            }
-            return 0;
-        }
-        /**
-         * Gets all parameters of a constructor that should be transformed into property assignments.
-         *
-         * @param node The constructor node.
-         */
-        function getParametersWithPropertyAssignments(node) {
-            return ts.filter(node.parameters, isParameterWithPropertyAssignment);
-        }
-        /**
-         * Determines whether a parameter should be transformed into a property assignment.
-         *
-         * @param parameter The parameter node.
-         */
-        function isParameterWithPropertyAssignment(parameter) {
-            return ts.hasModifier(parameter, 92 /* ParameterPropertyModifier */)
-                && ts.isIdentifier(parameter.name);
-        }
-        /**
-         * Transforms a parameter into a property assignment statement.
-         *
-         * @param node The parameter declaration.
-         */
-        function transformParameterWithPropertyAssignment(node) {
-            ts.Debug.assert(ts.isIdentifier(node.name));
-            var name = node.name;
-            var propertyName = ts.getMutableClone(name);
-            ts.setEmitFlags(propertyName, 1536 /* NoComments */ | 48 /* NoSourceMap */);
-            var localName = ts.getMutableClone(name);
-            ts.setEmitFlags(localName, 1536 /* NoComments */);
-            return ts.startOnNewLine(ts.setEmitFlags(ts.setTextRange(ts.createExpressionStatement(ts.createAssignment(ts.setTextRange(ts.createPropertyAccess(ts.createThis(), propertyName), node.name), localName)), ts.moveRangePos(node, -1)), 1536 /* NoComments */));
-        }
-        /**
-         * Gets all property declarations with initializers on either the static or instance side of a class.
-         *
-         * @param node The class node.
-         * @param isStatic A value indicating whether to get properties from the static or instance side of the class.
-         */
-        function getInitializedProperties(node, isStatic) {
-            return ts.filter(node.members, isStatic ? isStaticInitializedProperty : isInstanceInitializedProperty);
-        }
-        /**
-         * Gets a value indicating whether a class element is a static property declaration with an initializer.
-         *
-         * @param member The class element node.
-         */
-        function isStaticInitializedProperty(member) {
-            return isInitializedProperty(member, /*isStatic*/ true);
-        }
-        /**
-         * Gets a value indicating whether a class element is an instance property declaration with an initializer.
-         *
-         * @param member The class element node.
-         */
-        function isInstanceInitializedProperty(member) {
-            return isInitializedProperty(member, /*isStatic*/ false);
-        }
-        /**
-         * Gets a value indicating whether a class element is either a static or an instance property declaration with an initializer.
-         *
-         * @param member The class element node.
-         * @param isStatic A value indicating whether the member should be a static or instance member.
-         */
-        function isInitializedProperty(member, isStatic) {
-            return member.kind === 154 /* PropertyDeclaration */
-                && isStatic === ts.hasModifier(member, 32 /* Static */)
-                && member.initializer !== undefined;
-        }
-        /**
-         * Generates assignment statements for property initializers.
-         *
-         * @param properties An array of property declarations to transform.
-         * @param receiver The receiver on which each property should be assigned.
-         */
-        function addInitializedPropertyStatements(statements, properties, receiver) {
-            for (var _i = 0, properties_9 = properties; _i < properties_9.length; _i++) {
-                var property = properties_9[_i];
-                var statement = ts.createExpressionStatement(transformInitializedProperty(property, receiver));
-                ts.setSourceMapRange(statement, ts.moveRangePastModifiers(property));
-                ts.setCommentRange(statement, property);
-                ts.setOriginalNode(statement, property);
-                statements.push(statement);
-            }
-        }
-        /**
-         * Generates assignment expressions for property initializers.
-         *
-         * @param properties An array of property declarations to transform.
-         * @param receiver The receiver on which each property should be assigned.
-         */
-        function generateInitializedPropertyExpressions(properties, receiver) {
-            var expressions = [];
-            for (var _i = 0, properties_10 = properties; _i < properties_10.length; _i++) {
-                var property = properties_10[_i];
-                var expression = transformInitializedProperty(property, receiver);
-                ts.startOnNewLine(expression);
-                ts.setSourceMapRange(expression, ts.moveRangePastModifiers(property));
-                ts.setCommentRange(expression, property);
-                ts.setOriginalNode(expression, property);
-                expressions.push(expression);
-            }
-            return expressions;
-        }
-        /**
-         * Transforms a property initializer into an assignment statement.
-         *
-         * @param property The property declaration.
-         * @param receiver The object receiving the property assignment.
-         */
-        function transformInitializedProperty(property, receiver) {
-            // We generate a name here in order to reuse the value cached by the relocated computed name expression (which uses the same generated name)
-            var propertyName = ts.isComputedPropertyName(property.name) && !isSimpleInlineableExpression(property.name.expression)
-                ? ts.updateComputedPropertyName(property.name, ts.getGeneratedNameForNode(property.name))
-                : property.name;
-            var initializer = ts.visitNode(property.initializer, visitor, ts.isExpression);
-            var memberAccess = ts.createMemberAccessForPropertyName(receiver, propertyName, /*location*/ propertyName);
-            return ts.createAssignment(memberAccess, initializer);
-        }
         /**
          * Gets either the static or instance members of a class that are decorated, or have
          * parameters that are decorated.
@@ -68250,11 +70147,14 @@ var ts;
             var decorators;
             if (node) {
                 var parameters = node.parameters;
-                for (var i = 0; i < parameters.length; i++) {
-                    var parameter = parameters[i];
+                var firstParameterIsThis = parameters.length > 0 && ts.parameterIsThisKeyword(parameters[0]);
+                var firstParameterOffset = firstParameterIsThis ? 1 : 0;
+                var numParameters = firstParameterIsThis ? parameters.length - 1 : parameters.length;
+                for (var i = 0; i < numParameters; i++) {
+                    var parameter = parameters[i + firstParameterOffset];
                     if (decorators || parameter.decorators) {
                         if (!decorators) {
-                            decorators = new Array(parameters.length);
+                            decorators = new Array(numParameters);
                         }
                         decorators[i] = parameter.decorators;
                     }
@@ -68287,12 +70187,12 @@ var ts;
          */
         function getAllDecoratorsOfClassElement(node, member) {
             switch (member.kind) {
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     return getAllDecoratorsOfAccessors(node, member);
-                case 156 /* MethodDeclaration */:
+                case 157 /* MethodDeclaration */:
                     return getAllDecoratorsOfMethod(member);
-                case 154 /* PropertyDeclaration */:
+                case 155 /* PropertyDeclaration */:
                     return getAllDecoratorsOfProperty(member);
                 default:
                     return undefined;
@@ -68445,7 +70345,7 @@ var ts;
             var prefix = getClassMemberPrefix(node, member);
             var memberName = getExpressionForPropertyName(member, /*generateNameForComputedPropertyName*/ true);
             var descriptor = languageVersion > 0 /* ES3 */
-                ? member.kind === 154 /* PropertyDeclaration */
+                ? member.kind === 155 /* PropertyDeclaration */
                     // We emit `void 0` here to indicate to `__decorate` that it can invoke `Object.defineProperty` directly, but that it
                     // should not invoke `Object.getOwnPropertyDescriptor`.
                     ? ts.createVoidZero()
@@ -68568,10 +70468,10 @@ var ts;
          */
         function shouldAddTypeMetadata(node) {
             var kind = node.kind;
-            return kind === 156 /* MethodDeclaration */
-                || kind === 158 /* GetAccessor */
-                || kind === 159 /* SetAccessor */
-                || kind === 154 /* PropertyDeclaration */;
+            return kind === 157 /* MethodDeclaration */
+                || kind === 159 /* GetAccessor */
+                || kind === 160 /* SetAccessor */
+                || kind === 155 /* PropertyDeclaration */;
         }
         /**
          * Determines whether to emit the "design:returntype" metadata based on the node's kind.
@@ -68581,7 +70481,7 @@ var ts;
          * @param node The node to test.
          */
         function shouldAddReturnTypeMetadata(node) {
-            return node.kind === 156 /* MethodDeclaration */;
+            return node.kind === 157 /* MethodDeclaration */;
         }
         /**
          * Determines whether to emit the "design:paramtypes" metadata based on the node's kind.
@@ -68592,12 +70492,12 @@ var ts;
          */
         function shouldAddParamTypesMetadata(node) {
             switch (node.kind) {
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
                     return ts.getFirstConstructorWithBody(node) !== undefined;
-                case 156 /* MethodDeclaration */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 157 /* MethodDeclaration */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     return true;
             }
             return false;
@@ -68614,15 +70514,15 @@ var ts;
          */
         function serializeTypeOfNode(node) {
             switch (node.kind) {
-                case 154 /* PropertyDeclaration */:
-                case 151 /* Parameter */:
+                case 155 /* PropertyDeclaration */:
+                case 152 /* Parameter */:
                     return serializeTypeNode(node.type);
-                case 159 /* SetAccessor */:
-                case 158 /* GetAccessor */:
+                case 160 /* SetAccessor */:
+                case 159 /* GetAccessor */:
                     return serializeTypeNode(getAccessorTypeNode(node));
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
-                case 156 /* MethodDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
+                case 157 /* MethodDeclaration */:
                     return ts.createIdentifier("Function");
                 default:
                     return ts.createVoidZero();
@@ -68659,7 +70559,7 @@ var ts;
             return ts.createArrayLiteral(expressions);
         }
         function getParametersOfDecoratedDeclaration(node, container) {
-            if (container && node.kind === 158 /* GetAccessor */) {
+            if (container && node.kind === 159 /* GetAccessor */) {
                 var setAccessor = ts.getAllAccessorDeclarations(container.members, node).setAccessor;
                 if (setAccessor) {
                     return setAccessor.parameters;
@@ -68704,69 +70604,69 @@ var ts;
                 return ts.createIdentifier("Object");
             }
             switch (node.kind) {
-                case 106 /* VoidKeyword */:
-                case 141 /* UndefinedKeyword */:
-                case 96 /* NullKeyword */:
-                case 132 /* NeverKeyword */:
+                case 107 /* VoidKeyword */:
+                case 142 /* UndefinedKeyword */:
+                case 97 /* NullKeyword */:
+                case 133 /* NeverKeyword */:
                     return ts.createVoidZero();
-                case 177 /* ParenthesizedType */:
+                case 178 /* ParenthesizedType */:
                     return serializeTypeNode(node.type);
-                case 165 /* FunctionType */:
-                case 166 /* ConstructorType */:
+                case 166 /* FunctionType */:
+                case 167 /* ConstructorType */:
                     return ts.createIdentifier("Function");
-                case 169 /* ArrayType */:
-                case 170 /* TupleType */:
+                case 170 /* ArrayType */:
+                case 171 /* TupleType */:
                     return ts.createIdentifier("Array");
-                case 163 /* TypePredicate */:
-                case 123 /* BooleanKeyword */:
+                case 164 /* TypePredicate */:
+                case 124 /* BooleanKeyword */:
                     return ts.createIdentifier("Boolean");
-                case 138 /* StringKeyword */:
+                case 139 /* StringKeyword */:
                     return ts.createIdentifier("String");
-                case 136 /* ObjectKeyword */:
+                case 137 /* ObjectKeyword */:
                     return ts.createIdentifier("Object");
-                case 182 /* LiteralType */:
+                case 183 /* LiteralType */:
                     switch (node.literal.kind) {
                         case 10 /* StringLiteral */:
                             return ts.createIdentifier("String");
-                        case 202 /* PrefixUnaryExpression */:
+                        case 203 /* PrefixUnaryExpression */:
                         case 8 /* NumericLiteral */:
                             return ts.createIdentifier("Number");
                         case 9 /* BigIntLiteral */:
                             return getGlobalBigIntNameWithFallback();
-                        case 102 /* TrueKeyword */:
-                        case 87 /* FalseKeyword */:
+                        case 103 /* TrueKeyword */:
+                        case 88 /* FalseKeyword */:
                             return ts.createIdentifier("Boolean");
                         default:
                             return ts.Debug.failBadSyntaxKind(node.literal);
                     }
-                case 135 /* NumberKeyword */:
+                case 136 /* NumberKeyword */:
                     return ts.createIdentifier("Number");
-                case 146 /* BigIntKeyword */:
+                case 147 /* BigIntKeyword */:
                     return getGlobalBigIntNameWithFallback();
-                case 139 /* SymbolKeyword */:
+                case 140 /* SymbolKeyword */:
                     return languageVersion < 2 /* ES2015 */
                         ? getGlobalSymbolNameWithFallback()
                         : ts.createIdentifier("Symbol");
-                case 164 /* TypeReference */:
+                case 165 /* TypeReference */:
                     return serializeTypeReferenceNode(node);
-                case 174 /* IntersectionType */:
-                case 173 /* UnionType */:
+                case 175 /* IntersectionType */:
+                case 174 /* UnionType */:
                     return serializeTypeList(node.types);
-                case 175 /* ConditionalType */:
+                case 176 /* ConditionalType */:
                     return serializeTypeList([node.trueType, node.falseType]);
-                case 179 /* TypeOperator */:
-                    if (node.operator === 133 /* ReadonlyKeyword */) {
+                case 180 /* TypeOperator */:
+                    if (node.operator === 134 /* ReadonlyKeyword */) {
                         return serializeTypeNode(node.type);
                     }
                     break;
-                case 167 /* TypeQuery */:
-                case 180 /* IndexedAccessType */:
-                case 181 /* MappedType */:
-                case 168 /* TypeLiteral */:
-                case 120 /* AnyKeyword */:
-                case 143 /* UnknownKeyword */:
-                case 178 /* ThisType */:
-                case 183 /* ImportType */:
+                case 168 /* TypeQuery */:
+                case 181 /* IndexedAccessType */:
+                case 182 /* MappedType */:
+                case 169 /* TypeLiteral */:
+                case 121 /* AnyKeyword */:
+                case 144 /* UnknownKeyword */:
+                case 179 /* ThisType */:
+                case 184 /* ImportType */:
                     break;
                 default:
                     return ts.Debug.failBadSyntaxKind(node);
@@ -68779,13 +70679,13 @@ var ts;
             var serializedUnion;
             for (var _i = 0, types_18 = types; _i < types_18.length; _i++) {
                 var typeNode = types_18[_i];
-                while (typeNode.kind === 177 /* ParenthesizedType */) {
+                while (typeNode.kind === 178 /* ParenthesizedType */) {
                     typeNode = typeNode.type; // Skip parens if need be
                 }
-                if (typeNode.kind === 132 /* NeverKeyword */) {
+                if (typeNode.kind === 133 /* NeverKeyword */) {
                     continue; // Always elide `never` from the union/intersection if possible
                 }
-                if (!strictNullChecks && (typeNode.kind === 96 /* NullKeyword */ || typeNode.kind === 141 /* UndefinedKeyword */)) {
+                if (!strictNullChecks && (typeNode.kind === 97 /* NullKeyword */ || typeNode.kind === 142 /* UndefinedKeyword */)) {
                     continue; // Elide null and undefined from unions for metadata, just like what we did prior to the implementation of strict null checks
                 }
                 var serializedIndividual = serializeTypeNode(typeNode);
@@ -68865,12 +70765,12 @@ var ts;
          * @param node The entity name to serialize.
          */
         function serializeEntityNameAsExpressionFallback(node) {
-            if (node.kind === 72 /* Identifier */) {
+            if (node.kind === 73 /* Identifier */) {
                 // A -> typeof A !== undefined && A
                 var copied = serializeEntityNameAsExpression(node);
                 return createCheckedValue(copied, copied);
             }
-            if (node.left.kind === 72 /* Identifier */) {
+            if (node.left.kind === 73 /* Identifier */) {
                 // A.B -> typeof A !== undefined && A.B
                 return createCheckedValue(serializeEntityNameAsExpression(node.left), serializeEntityNameAsExpression(node));
             }
@@ -68886,7 +70786,7 @@ var ts;
          */
         function serializeEntityNameAsExpression(node) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     // Create a clone of the name with a new parent, and treat it as if it were
                     // a source tree node for the purposes of the checker.
                     var name = ts.getMutableClone(node);
@@ -68894,7 +70794,7 @@ var ts;
                     name.original = undefined;
                     name.parent = ts.getParseTreeNode(currentLexicalScope); // ensure the parent is set to a parse tree node.
                     return name;
-                case 148 /* QualifiedName */:
+                case 149 /* QualifiedName */:
                     return serializeQualifiedNameAsExpression(node);
             }
         }
@@ -68920,19 +70820,10 @@ var ts;
          * available.
          */
         function getGlobalBigIntNameWithFallback() {
-            return languageVersion < 7 /* ESNext */
+            return languageVersion < 99 /* ESNext */
                 ? ts.createConditional(ts.createTypeCheck(ts.createIdentifier("BigInt"), "function"), ts.createIdentifier("BigInt"), ts.createIdentifier("Object"))
                 : ts.createIdentifier("BigInt");
         }
-        /**
-         * A simple inlinable expression is an expression which can be copied into multiple locations
-         * without risk of repeating any sideeffects and whose value could not possibly change between
-         * any such locations
-         */
-        function isSimpleInlineableExpression(expression) {
-            return !ts.isIdentifier(expression) && ts.isSimpleCopiableExpression(expression) ||
-                ts.isWellKnownSymbolSyntactically(expression);
-        }
         /**
          * Gets an expression that represents a property name. For a computed property, a
          * name is generated for the node.
@@ -68942,7 +70833,7 @@ var ts;
         function getExpressionForPropertyName(member, generateNameForComputedPropertyName) {
             var name = member.name;
             if (ts.isComputedPropertyName(name)) {
-                return generateNameForComputedPropertyName && !isSimpleInlineableExpression(name.expression)
+                return generateNameForComputedPropertyName && !ts.isSimpleInlineableExpression(name.expression)
                     ? ts.getGeneratedNameForNode(name)
                     : name.expression;
             }
@@ -68953,25 +70844,6 @@ var ts;
                 return ts.getSynthesizedClone(name);
             }
         }
-        /**
-         * If the name is a computed property, this function transforms it, then either returns an expression which caches the
-         * value of the result or the expression itself if the value is either unused or safe to inline into multiple locations
-         * @param shouldHoist Does the expression need to be reused? (ie, for an initializer or a decorator)
-         * @param omitSimple Should expressions with no observable side-effects be elided? (ie, the expression is not hoisted for a decorator or initializer and is a literal)
-         */
-        function getPropertyNameExpressionIfNeeded(name, shouldHoist, omitSimple) {
-            if (ts.isComputedPropertyName(name)) {
-                var expression = ts.visitNode(name.expression, visitor, ts.isExpression);
-                var innerExpression = ts.skipPartiallyEmittedExpressions(expression);
-                var inlinable = isSimpleInlineableExpression(innerExpression);
-                if (!inlinable && shouldHoist) {
-                    var generatedName = ts.getGeneratedNameForNode(name);
-                    hoistVariableDeclaration(generatedName);
-                    return ts.createAssignment(generatedName, expression);
-                }
-                return (omitSimple && (inlinable || ts.isIdentifier(innerExpression))) ? undefined : expression;
-            }
-        }
         /**
          * Visits the property name of a class element, for use when emitting property
          * initializers. For a computed property on a node with decorators, a temporary
@@ -68981,18 +70853,20 @@ var ts;
          */
         function visitPropertyNameOfClassElement(member) {
             var name = member.name;
-            var expr = getPropertyNameExpressionIfNeeded(name, ts.some(member.decorators), /*omitSimple*/ false);
-            if (expr) { // expr only exists if `name` is a computed property name
-                // Inline any pending expressions from previous elided or relocated computed property name expressions in order to preserve execution order
-                if (ts.some(pendingExpressions)) {
-                    expr = ts.inlineExpressions(pendingExpressions.concat([expr]));
-                    pendingExpressions.length = 0;
+            // Computed property names need to be transformed into a hoisted variable when they are used more than once.
+            // The names are used more than once when:
+            //   - the property is non-static and its initializer is moved to the constructor (when there are parameter property assignments).
+            //   - the property has a decorator.
+            if (ts.isComputedPropertyName(name) && ((!ts.hasStaticModifier(member) && currentClassHasParameterProperties) || ts.some(member.decorators))) {
+                var expression = ts.visitNode(name.expression, visitor, ts.isExpression);
+                var innerExpression = ts.skipPartiallyEmittedExpressions(expression);
+                if (!ts.isSimpleInlineableExpression(innerExpression)) {
+                    var generatedName = ts.getGeneratedNameForNode(name);
+                    hoistVariableDeclaration(generatedName);
+                    return ts.updateComputedPropertyName(name, ts.createAssignment(generatedName, expression));
                 }
-                return ts.updateComputedPropertyName(name, expr);
-            }
-            else {
-                return name;
             }
+            return ts.visitNode(name, visitor, ts.isPropertyName);
         }
         /**
          * Transforms a HeritageClause with TypeScript syntax.
@@ -69004,7 +70878,7 @@ var ts;
          * @param node The HeritageClause to transform.
          */
         function visitHeritageClause(node) {
-            if (node.token === 109 /* ImplementsKeyword */) {
+            if (node.token === 110 /* ImplementsKeyword */) {
                 // implements clauses are elided
                 return undefined;
             }
@@ -69032,17 +70906,73 @@ var ts;
             return !ts.nodeIsMissing(node.body);
         }
         function visitPropertyDeclaration(node) {
-            var expr = getPropertyNameExpressionIfNeeded(node.name, ts.some(node.decorators) || !!node.initializer, /*omitSimple*/ true);
-            if (expr && !isSimpleInlineableExpression(expr)) {
-                (pendingExpressions || (pendingExpressions = [])).push(expr);
+            var updated = ts.updateProperty(node, 
+            /*decorators*/ undefined, ts.visitNodes(node.modifiers, visitor, ts.isModifier), visitPropertyNameOfClassElement(node), 
+            /*questionOrExclamationToken*/ undefined, 
+            /*type*/ undefined, ts.visitNode(node.initializer, visitor));
+            if (updated !== node) {
+                // While we emit the source map for the node after skipping decorators and modifiers,
+                // we need to emit the comments for the original range.
+                ts.setCommentRange(updated, node);
+                ts.setSourceMapRange(updated, ts.moveRangePastDecorators(node));
             }
-            return undefined;
+            return updated;
         }
         function visitConstructor(node) {
             if (!shouldEmitFunctionLikeDeclaration(node)) {
                 return undefined;
             }
-            return ts.updateConstructor(node, ts.visitNodes(node.decorators, visitor, ts.isDecorator), ts.visitNodes(node.modifiers, visitor, ts.isModifier), ts.visitParameterList(node.parameters, visitor, context), ts.visitFunctionBody(node.body, visitor, context));
+            return ts.updateConstructor(node, 
+            /*decorators*/ undefined, 
+            /*modifiers*/ undefined, ts.visitParameterList(node.parameters, visitor, context), transformConstructorBody(node.body, node));
+        }
+        function transformConstructorBody(body, constructor) {
+            var parametersWithPropertyAssignments = constructor &&
+                ts.filter(constructor.parameters, ts.isParameterPropertyDeclaration);
+            if (!ts.some(parametersWithPropertyAssignments)) {
+                return ts.visitFunctionBody(body, visitor, context);
+            }
+            var statements = [];
+            var indexOfFirstStatement = 0;
+            resumeLexicalEnvironment();
+            indexOfFirstStatement = ts.addPrologueDirectivesAndInitialSuperCall(constructor, statements, visitor);
+            // Add parameters with property assignments. Transforms this:
+            //
+            //  constructor (public x, public y) {
+            //  }
+            //
+            // Into this:
+            //
+            //  constructor (x, y) {
+            //      this.x = x;
+            //      this.y = y;
+            //  }
+            //
+            ts.addRange(statements, ts.map(parametersWithPropertyAssignments, transformParameterWithPropertyAssignment));
+            // Add the existing statements, skipping the initial super call.
+            ts.addRange(statements, ts.visitNodes(body.statements, visitor, ts.isStatement, indexOfFirstStatement));
+            // End the lexical environment.
+            statements = ts.mergeLexicalEnvironment(statements, endLexicalEnvironment());
+            var block = ts.createBlock(ts.setTextRange(ts.createNodeArray(statements), body.statements), /*multiLine*/ true);
+            ts.setTextRange(block, /*location*/ body);
+            ts.setOriginalNode(block, body);
+            return block;
+        }
+        /**
+         * Transforms a parameter into a property assignment statement.
+         *
+         * @param node The parameter declaration.
+         */
+        function transformParameterWithPropertyAssignment(node) {
+            var name = node.name;
+            if (!ts.isIdentifier(name)) {
+                return undefined;
+            }
+            var propertyName = ts.getMutableClone(name);
+            ts.setEmitFlags(propertyName, 1536 /* NoComments */ | 48 /* NoSourceMap */);
+            var localName = ts.getMutableClone(name);
+            ts.setEmitFlags(localName, 1536 /* NoComments */);
+            return ts.startOnNewLine(ts.removeAllComments(ts.setTextRange(ts.setOriginalNode(ts.createExpressionStatement(ts.createAssignment(ts.setTextRange(ts.createPropertyAccess(ts.createThis(), propertyName), node.name), localName)), node), ts.moveRangePos(node, -1))));
         }
         function visitMethodDeclaration(node) {
             if (!shouldEmitFunctionLikeDeclaration(node)) {
@@ -69243,7 +71173,7 @@ var ts;
          */
         function visitEnumDeclaration(node) {
             if (!shouldEmitEnumDeclaration(node)) {
-                return undefined;
+                return ts.createNotEmittedStatement(node);
             }
             var statements = [];
             // We request to be advised when the printer is about to print this node. This allows
@@ -69411,12 +71341,12 @@ var ts;
             // enums in any other scope are emitted as a `let` declaration.
             var statement = ts.createVariableStatement(ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), ts.createVariableDeclarationList([
                 ts.createVariableDeclaration(ts.getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true))
-            ], currentLexicalScope.kind === 284 /* SourceFile */ ? 0 /* None */ : 1 /* Let */));
+            ], currentLexicalScope.kind === 285 /* SourceFile */ ? 0 /* None */ : 1 /* Let */));
             ts.setOriginalNode(statement, node);
             recordEmittedDeclarationInScope(node);
             if (isFirstEmittedDeclarationInScope(node)) {
                 // Adjust the source map emit to match the old emitter.
-                if (node.kind === 243 /* EnumDeclaration */) {
+                if (node.kind === 244 /* EnumDeclaration */) {
                     ts.setSourceMapRange(statement.declarationList, node);
                 }
                 else {
@@ -69541,7 +71471,7 @@ var ts;
             var statementsLocation;
             var blockLocation;
             var body = node.body;
-            if (body.kind === 245 /* ModuleBlock */) {
+            if (body.kind === 246 /* ModuleBlock */) {
                 saveStateAndInvoke(body, function (body) { return ts.addRange(statements, ts.visitNodes(body.statements, namespaceElementVisitor, ts.isStatement)); });
                 statementsLocation = body.statements;
                 blockLocation = body;
@@ -69587,13 +71517,13 @@ var ts;
             //     })(hi = hello.hi || (hello.hi = {}));
             // })(hello || (hello = {}));
             // We only want to emit comment on the namespace which contains block body itself, not the containing namespaces.
-            if (body.kind !== 245 /* ModuleBlock */) {
+            if (body.kind !== 246 /* ModuleBlock */) {
                 ts.setEmitFlags(block, ts.getEmitFlags(block) | 1536 /* NoComments */);
             }
             return block;
         }
         function getInnerMostModuleDeclarationFromDottedModule(moduleDeclaration) {
-            if (moduleDeclaration.body.kind === 244 /* ModuleDeclaration */) {
+            if (moduleDeclaration.body.kind === 245 /* ModuleDeclaration */) {
                 var recursiveInnerModule = getInnerMostModuleDeclarationFromDottedModule(moduleDeclaration.body);
                 return recursiveInnerModule || moduleDeclaration.body;
             }
@@ -69634,7 +71564,7 @@ var ts;
          * @param node The named import bindings node.
          */
         function visitNamedImportBindings(node) {
-            if (node.kind === 251 /* NamespaceImport */) {
+            if (node.kind === 252 /* NamespaceImport */) {
                 // Elide a namespace import if it is not referenced.
                 return resolver.isReferencedAliasDeclaration(node) ? node : undefined;
             }
@@ -69847,7 +71777,7 @@ var ts;
         function enableSubstitutionForNonQualifiedEnumMembers() {
             if ((enabledSubstitutions & 8 /* NonQualifiedEnumMembers */) === 0) {
                 enabledSubstitutions |= 8 /* NonQualifiedEnumMembers */;
-                context.enableSubstitution(72 /* Identifier */);
+                context.enableSubstitution(73 /* Identifier */);
             }
         }
         function enableSubstitutionForClassAliases() {
@@ -69855,7 +71785,7 @@ var ts;
                 enabledSubstitutions |= 1 /* ClassAliases */;
                 // We need to enable substitutions for identifiers. This allows us to
                 // substitute class names inside of a class declaration.
-                context.enableSubstitution(72 /* Identifier */);
+                context.enableSubstitution(73 /* Identifier */);
                 // Keep track of class aliases.
                 classAliases = [];
             }
@@ -69865,17 +71795,17 @@ var ts;
                 enabledSubstitutions |= 2 /* NamespaceExports */;
                 // We need to enable substitutions for identifiers and shorthand property assignments. This allows us to
                 // substitute the names of exported members of a namespace.
-                context.enableSubstitution(72 /* Identifier */);
-                context.enableSubstitution(276 /* ShorthandPropertyAssignment */);
+                context.enableSubstitution(73 /* Identifier */);
+                context.enableSubstitution(277 /* ShorthandPropertyAssignment */);
                 // We need to be notified when entering and exiting namespaces.
-                context.enableEmitNotification(244 /* ModuleDeclaration */);
+                context.enableEmitNotification(245 /* ModuleDeclaration */);
             }
         }
         function isTransformedModuleDeclaration(node) {
-            return ts.getOriginalNode(node).kind === 244 /* ModuleDeclaration */;
+            return ts.getOriginalNode(node).kind === 245 /* ModuleDeclaration */;
         }
         function isTransformedEnumDeclaration(node) {
-            return ts.getOriginalNode(node).kind === 243 /* EnumDeclaration */;
+            return ts.getOriginalNode(node).kind === 244 /* EnumDeclaration */;
         }
         /**
          * Hook for node emit.
@@ -69934,11 +71864,11 @@ var ts;
         }
         function substituteExpression(node) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return substituteExpressionIdentifier(node);
-                case 189 /* PropertyAccessExpression */:
+                case 190 /* PropertyAccessExpression */:
                     return substitutePropertyAccessExpression(node);
-                case 190 /* ElementAccessExpression */:
+                case 191 /* ElementAccessExpression */:
                     return substituteElementAccessExpression(node);
             }
             return node;
@@ -69976,9 +71906,9 @@ var ts;
                 // If we are nested within a namespace declaration, we may need to qualifiy
                 // an identifier that is exported from a merged namespace.
                 var container = resolver.getReferencedExportContainer(node, /*prefixLocals*/ false);
-                if (container && container.kind !== 284 /* SourceFile */) {
-                    var substitute = (applicableSubstitutions & 2 /* NamespaceExports */ && container.kind === 244 /* ModuleDeclaration */) ||
-                        (applicableSubstitutions & 8 /* NonQualifiedEnumMembers */ && container.kind === 243 /* EnumDeclaration */);
+                if (container && container.kind !== 285 /* SourceFile */) {
+                    var substitute = (applicableSubstitutions & 2 /* NamespaceExports */ && container.kind === 245 /* ModuleDeclaration */) ||
+                        (applicableSubstitutions & 8 /* NonQualifiedEnumMembers */ && container.kind === 244 /* EnumDeclaration */);
                     if (substitute) {
                         return ts.setTextRange(ts.createPropertyAccess(ts.getGeneratedNameForNode(container), node), 
                         /*location*/ node);
@@ -70068,6 +71998,413 @@ var ts;
 })(ts || (ts = {}));
 /*@internal*/
 var ts;
+(function (ts) {
+    var ClassPropertySubstitutionFlags;
+    (function (ClassPropertySubstitutionFlags) {
+        /**
+         * Enables substitutions for class expressions with static fields
+         * which have initializers that reference the class name.
+         */
+        ClassPropertySubstitutionFlags[ClassPropertySubstitutionFlags["ClassAliases"] = 1] = "ClassAliases";
+    })(ClassPropertySubstitutionFlags || (ClassPropertySubstitutionFlags = {}));
+    /**
+     * Transforms ECMAScript Class Syntax.
+     * TypeScript parameter property syntax is transformed in the TypeScript transformer.
+     * For now, this transforms public field declarations using TypeScript class semantics
+     * (where the declarations get elided and initializers are transformed as assignments in the constructor).
+     * Eventually, this transform will change to the ECMAScript semantics (with Object.defineProperty).
+     */
+    function transformClassFields(context) {
+        var hoistVariableDeclaration = context.hoistVariableDeclaration, endLexicalEnvironment = context.endLexicalEnvironment, resumeLexicalEnvironment = context.resumeLexicalEnvironment;
+        var resolver = context.getEmitResolver();
+        var previousOnSubstituteNode = context.onSubstituteNode;
+        context.onSubstituteNode = onSubstituteNode;
+        var enabledSubstitutions;
+        var classAliases;
+        /**
+         * Tracks what computed name expressions originating from elided names must be inlined
+         * at the next execution site, in document order
+         */
+        var pendingExpressions;
+        /**
+         * Tracks what computed name expression statements and static property initializers must be
+         * emitted at the next execution site, in document order (for decorated classes).
+         */
+        var pendingStatements;
+        return ts.chainBundle(transformSourceFile);
+        function transformSourceFile(node) {
+            if (node.isDeclarationFile) {
+                return node;
+            }
+            var visited = ts.visitEachChild(node, visitor, context);
+            ts.addEmitHelpers(visited, context.readEmitHelpers());
+            return visited;
+        }
+        function visitor(node) {
+            if (!(node.transformFlags & 1048576 /* ContainsClassFields */))
+                return node;
+            switch (node.kind) {
+                case 210 /* ClassExpression */:
+                    return visitClassExpression(node);
+                case 241 /* ClassDeclaration */:
+                    return visitClassDeclaration(node);
+                case 220 /* VariableStatement */:
+                    return visitVariableStatement(node);
+            }
+            return ts.visitEachChild(node, visitor, context);
+        }
+        /**
+         * Visits the members of a class that has fields.
+         *
+         * @param node The node to visit.
+         */
+        function classElementVisitor(node) {
+            switch (node.kind) {
+                case 158 /* Constructor */:
+                    // Constructors for classes using class fields are transformed in
+                    // `visitClassDeclaration` or `visitClassExpression`.
+                    return undefined;
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
+                case 157 /* MethodDeclaration */:
+                    // Visit the name of the member (if it's a computed property name).
+                    return ts.visitEachChild(node, classElementVisitor, context);
+                case 155 /* PropertyDeclaration */:
+                    return visitPropertyDeclaration(node);
+                case 150 /* ComputedPropertyName */:
+                    return visitComputedPropertyName(node);
+                case 218 /* SemicolonClassElement */:
+                    return node;
+                default:
+                    return visitor(node);
+            }
+        }
+        function visitVariableStatement(node) {
+            var savedPendingStatements = pendingStatements;
+            pendingStatements = [];
+            var visitedNode = ts.visitEachChild(node, visitor, context);
+            var statement = ts.some(pendingStatements) ? [visitedNode].concat(pendingStatements) :
+                visitedNode;
+            pendingStatements = savedPendingStatements;
+            return statement;
+        }
+        function visitComputedPropertyName(name) {
+            var node = ts.visitEachChild(name, visitor, context);
+            if (ts.some(pendingExpressions)) {
+                var expressions = pendingExpressions;
+                expressions.push(name.expression);
+                pendingExpressions = [];
+                node = ts.updateComputedPropertyName(node, ts.inlineExpressions(expressions));
+            }
+            return node;
+        }
+        function visitPropertyDeclaration(node) {
+            ts.Debug.assert(!ts.some(node.decorators));
+            // Create a temporary variable to store a computed property name (if necessary).
+            // If it's not inlineable, then we emit an expression after the class which assigns
+            // the property name to the temporary variable.
+            var expr = getPropertyNameExpressionIfNeeded(node.name, !!node.initializer);
+            if (expr && !ts.isSimpleInlineableExpression(expr)) {
+                (pendingExpressions || (pendingExpressions = [])).push(expr);
+            }
+            return undefined;
+        }
+        function visitClassDeclaration(node) {
+            if (!ts.forEach(node.members, ts.isPropertyDeclaration)) {
+                return ts.visitEachChild(node, visitor, context);
+            }
+            var savedPendingExpressions = pendingExpressions;
+            pendingExpressions = undefined;
+            var extendsClauseElement = ts.getEffectiveBaseTypeNode(node);
+            var isDerivedClass = !!(extendsClauseElement && ts.skipOuterExpressions(extendsClauseElement.expression).kind !== 97 /* NullKeyword */);
+            var statements = [
+                ts.updateClassDeclaration(node, 
+                /*decorators*/ undefined, node.modifiers, node.name, 
+                /*typeParameters*/ undefined, ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), transformClassMembers(node, isDerivedClass))
+            ];
+            // Write any pending expressions from elided or moved computed property names
+            if (ts.some(pendingExpressions)) {
+                statements.push(ts.createExpressionStatement(ts.inlineExpressions(pendingExpressions)));
+            }
+            pendingExpressions = savedPendingExpressions;
+            // Emit static property assignment. Because classDeclaration is lexically evaluated,
+            // it is safe to emit static property assignment after classDeclaration
+            // From ES6 specification:
+            //      HasLexicalDeclaration (N) : Determines if the argument identifier has a binding in this environment record that was created using
+            //                                  a lexical declaration such as a LexicalDeclaration or a ClassDeclaration.
+            var staticProperties = ts.getInitializedProperties(node, /*isStatic*/ true);
+            if (ts.some(staticProperties)) {
+                addInitializedPropertyStatements(statements, staticProperties, ts.getInternalName(node));
+            }
+            return statements;
+        }
+        function visitClassExpression(node) {
+            if (!ts.forEach(node.members, ts.isPropertyDeclaration)) {
+                return ts.visitEachChild(node, visitor, context);
+            }
+            var savedPendingExpressions = pendingExpressions;
+            pendingExpressions = undefined;
+            // If this class expression is a transformation of a decorated class declaration,
+            // then we want to output the pendingExpressions as statements, not as inlined
+            // expressions with the class statement.
+            //
+            // In this case, we use pendingStatements to produce the same output as the
+            // class declaration transformation. The VariableStatement visitor will insert
+            // these statements after the class expression variable statement.
+            var isDecoratedClassDeclaration = ts.isClassDeclaration(ts.getOriginalNode(node));
+            var staticProperties = ts.getInitializedProperties(node, /*isStatic*/ true);
+            var extendsClauseElement = ts.getEffectiveBaseTypeNode(node);
+            var isDerivedClass = !!(extendsClauseElement && ts.skipOuterExpressions(extendsClauseElement.expression).kind !== 97 /* NullKeyword */);
+            var classExpression = ts.updateClassExpression(node, node.modifiers, node.name, 
+            /*typeParameters*/ undefined, ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), transformClassMembers(node, isDerivedClass));
+            if (ts.some(staticProperties) || ts.some(pendingExpressions)) {
+                if (isDecoratedClassDeclaration) {
+                    ts.Debug.assertDefined(pendingStatements, "Decorated classes transformed by TypeScript are expected to be within a variable declaration.");
+                    // Write any pending expressions from elided or moved computed property names
+                    if (pendingStatements && pendingExpressions && ts.some(pendingExpressions)) {
+                        pendingStatements.push(ts.createExpressionStatement(ts.inlineExpressions(pendingExpressions)));
+                    }
+                    pendingExpressions = savedPendingExpressions;
+                    if (pendingStatements && ts.some(staticProperties)) {
+                        addInitializedPropertyStatements(pendingStatements, staticProperties, ts.getInternalName(node));
+                    }
+                    return classExpression;
+                }
+                else {
+                    var expressions = [];
+                    var isClassWithConstructorReference = resolver.getNodeCheckFlags(node) & 16777216 /* ClassWithConstructorReference */;
+                    var temp = ts.createTempVariable(hoistVariableDeclaration, !!isClassWithConstructorReference);
+                    if (isClassWithConstructorReference) {
+                        // record an alias as the class name is not in scope for statics.
+                        enableSubstitutionForClassAliases();
+                        var alias = ts.getSynthesizedClone(temp);
+                        alias.autoGenerateFlags &= ~8 /* ReservedInNestedScopes */;
+                        classAliases[ts.getOriginalNodeId(node)] = alias;
+                    }
+                    // To preserve the behavior of the old emitter, we explicitly indent
+                    // the body of a class with static initializers.
+                    ts.setEmitFlags(classExpression, 65536 /* Indented */ | ts.getEmitFlags(classExpression));
+                    expressions.push(ts.startOnNewLine(ts.createAssignment(temp, classExpression)));
+                    // Add any pending expressions leftover from elided or relocated computed property names
+                    ts.addRange(expressions, ts.map(pendingExpressions, ts.startOnNewLine));
+                    ts.addRange(expressions, generateInitializedPropertyExpressions(staticProperties, temp));
+                    expressions.push(ts.startOnNewLine(temp));
+                    pendingExpressions = savedPendingExpressions;
+                    return ts.inlineExpressions(expressions);
+                }
+            }
+            pendingExpressions = savedPendingExpressions;
+            return classExpression;
+        }
+        function transformClassMembers(node, isDerivedClass) {
+            var members = [];
+            var constructor = transformConstructor(node, isDerivedClass);
+            if (constructor) {
+                members.push(constructor);
+            }
+            ts.addRange(members, ts.visitNodes(node.members, classElementVisitor, ts.isClassElement));
+            return ts.setTextRange(ts.createNodeArray(members), /*location*/ node.members);
+        }
+        function transformConstructor(node, isDerivedClass) {
+            var constructor = ts.visitNode(ts.getFirstConstructorWithBody(node), visitor, ts.isConstructorDeclaration);
+            var containsPropertyInitializer = ts.forEach(node.members, ts.isInitializedProperty);
+            if (!containsPropertyInitializer) {
+                return constructor;
+            }
+            var parameters = ts.visitParameterList(constructor ? constructor.parameters : undefined, visitor, context);
+            var body = transformConstructorBody(node, constructor, isDerivedClass);
+            if (!body) {
+                return undefined;
+            }
+            return ts.startOnNewLine(ts.setOriginalNode(ts.setTextRange(ts.createConstructor(
+            /*decorators*/ undefined, 
+            /*modifiers*/ undefined, parameters, body), constructor || node), constructor));
+        }
+        function transformConstructorBody(node, constructor, isDerivedClass) {
+            var properties = ts.getInitializedProperties(node, /*isStatic*/ false);
+            // Only generate synthetic constructor when there are property initializers to move.
+            if (!constructor && !ts.some(properties)) {
+                return ts.visitFunctionBody(/*node*/ undefined, visitor, context);
+            }
+            resumeLexicalEnvironment();
+            var indexOfFirstStatement = 0;
+            var statements = [];
+            if (!constructor && isDerivedClass) {
+                // Add a synthetic `super` call:
+                //
+                //  super(...arguments);
+                //
+                statements.push(ts.createExpressionStatement(ts.createCall(ts.createSuper(), 
+                /*typeArguments*/ undefined, [ts.createSpread(ts.createIdentifier("arguments"))])));
+            }
+            if (constructor) {
+                indexOfFirstStatement = ts.addPrologueDirectivesAndInitialSuperCall(constructor, statements, visitor);
+            }
+            // Add the property initializers. Transforms this:
+            //
+            //  public x = 1;
+            //
+            // Into this:
+            //
+            //  constructor() {
+            //      this.x = 1;
+            //  }
+            //
+            if (constructor && constructor.body) {
+                var parameterPropertyDeclarationCount = 0;
+                for (var i = indexOfFirstStatement; i < constructor.body.statements.length; i++) {
+                    if (ts.isParameterPropertyDeclaration(ts.getOriginalNode(constructor.body.statements[i]))) {
+                        parameterPropertyDeclarationCount++;
+                    }
+                    else {
+                        break;
+                    }
+                }
+                if (parameterPropertyDeclarationCount > 0) {
+                    ts.addRange(statements, ts.visitNodes(constructor.body.statements, visitor, ts.isStatement, indexOfFirstStatement, parameterPropertyDeclarationCount));
+                    indexOfFirstStatement += parameterPropertyDeclarationCount;
+                }
+            }
+            addInitializedPropertyStatements(statements, properties, ts.createThis());
+            // Add existing statements, skipping the initial super call.
+            if (constructor) {
+                ts.addRange(statements, ts.visitNodes(constructor.body.statements, visitor, ts.isStatement, indexOfFirstStatement));
+            }
+            statements = ts.mergeLexicalEnvironment(statements, endLexicalEnvironment());
+            return ts.setTextRange(ts.createBlock(ts.setTextRange(ts.createNodeArray(statements), 
+            /*location*/ constructor ? constructor.body.statements : node.members), 
+            /*multiLine*/ true), 
+            /*location*/ constructor ? constructor.body : undefined);
+        }
+        /**
+         * Generates assignment statements for property initializers.
+         *
+         * @param properties An array of property declarations to transform.
+         * @param receiver The receiver on which each property should be assigned.
+         */
+        function addInitializedPropertyStatements(statements, properties, receiver) {
+            for (var _i = 0, properties_6 = properties; _i < properties_6.length; _i++) {
+                var property = properties_6[_i];
+                var statement = ts.createExpressionStatement(transformInitializedProperty(property, receiver));
+                ts.setSourceMapRange(statement, ts.moveRangePastModifiers(property));
+                ts.setCommentRange(statement, property);
+                ts.setOriginalNode(statement, property);
+                statements.push(statement);
+            }
+        }
+        /**
+         * Generates assignment expressions for property initializers.
+         *
+         * @param properties An array of property declarations to transform.
+         * @param receiver The receiver on which each property should be assigned.
+         */
+        function generateInitializedPropertyExpressions(properties, receiver) {
+            var expressions = [];
+            for (var _i = 0, properties_7 = properties; _i < properties_7.length; _i++) {
+                var property = properties_7[_i];
+                var expression = transformInitializedProperty(property, receiver);
+                ts.startOnNewLine(expression);
+                ts.setSourceMapRange(expression, ts.moveRangePastModifiers(property));
+                ts.setCommentRange(expression, property);
+                ts.setOriginalNode(expression, property);
+                expressions.push(expression);
+            }
+            return expressions;
+        }
+        /**
+         * Transforms a property initializer into an assignment statement.
+         *
+         * @param property The property declaration.
+         * @param receiver The object receiving the property assignment.
+         */
+        function transformInitializedProperty(property, receiver) {
+            // We generate a name here in order to reuse the value cached by the relocated computed name expression (which uses the same generated name)
+            var propertyName = ts.isComputedPropertyName(property.name) && !ts.isSimpleInlineableExpression(property.name.expression)
+                ? ts.updateComputedPropertyName(property.name, ts.getGeneratedNameForNode(property.name))
+                : property.name;
+            var initializer = ts.visitNode(property.initializer, visitor, ts.isExpression);
+            var memberAccess = ts.createMemberAccessForPropertyName(receiver, propertyName, /*location*/ propertyName);
+            return ts.createAssignment(memberAccess, initializer);
+        }
+        function enableSubstitutionForClassAliases() {
+            if ((enabledSubstitutions & 1 /* ClassAliases */) === 0) {
+                enabledSubstitutions |= 1 /* ClassAliases */;
+                // We need to enable substitutions for identifiers. This allows us to
+                // substitute class names inside of a class declaration.
+                context.enableSubstitution(73 /* Identifier */);
+                // Keep track of class aliases.
+                classAliases = [];
+            }
+        }
+        /**
+         * Hooks node substitutions.
+         *
+         * @param hint The context for the emitter.
+         * @param node The node to substitute.
+         */
+        function onSubstituteNode(hint, node) {
+            node = previousOnSubstituteNode(hint, node);
+            if (hint === 1 /* Expression */) {
+                return substituteExpression(node);
+            }
+            return node;
+        }
+        function substituteExpression(node) {
+            switch (node.kind) {
+                case 73 /* Identifier */:
+                    return substituteExpressionIdentifier(node);
+            }
+            return node;
+        }
+        function substituteExpressionIdentifier(node) {
+            return trySubstituteClassAlias(node) || node;
+        }
+        function trySubstituteClassAlias(node) {
+            if (enabledSubstitutions & 1 /* ClassAliases */) {
+                if (resolver.getNodeCheckFlags(node) & 33554432 /* ConstructorReferenceInClass */) {
+                    // Due to the emit for class decorators, any reference to the class from inside of the class body
+                    // must instead be rewritten to point to a temporary variable to avoid issues with the double-bind
+                    // behavior of class names in ES6.
+                    // Also, when emitting statics for class expressions, we must substitute a class alias for
+                    // constructor references in static property initializers.
+                    var declaration = resolver.getReferencedValueDeclaration(node);
+                    if (declaration) {
+                        var classAlias = classAliases[declaration.id]; // TODO: GH#18217
+                        if (classAlias) {
+                            var clone_2 = ts.getSynthesizedClone(classAlias);
+                            ts.setSourceMapRange(clone_2, node);
+                            ts.setCommentRange(clone_2, node);
+                            return clone_2;
+                        }
+                    }
+                }
+            }
+            return undefined;
+        }
+        /**
+         * If the name is a computed property, this function transforms it, then either returns an expression which caches the
+         * value of the result or the expression itself if the value is either unused or safe to inline into multiple locations
+         * @param shouldHoist Does the expression need to be reused? (ie, for an initializer or a decorator)
+         */
+        function getPropertyNameExpressionIfNeeded(name, shouldHoist) {
+            if (ts.isComputedPropertyName(name)) {
+                var expression = ts.visitNode(name.expression, visitor, ts.isExpression);
+                var innerExpression = ts.skipPartiallyEmittedExpressions(expression);
+                var inlinable = ts.isSimpleInlineableExpression(innerExpression);
+                var alreadyTransformed = ts.isAssignmentExpression(innerExpression) && ts.isGeneratedIdentifier(innerExpression.left);
+                if (!alreadyTransformed && !inlinable && shouldHoist) {
+                    var generatedName = ts.getGeneratedNameForNode(name);
+                    hoistVariableDeclaration(generatedName);
+                    return ts.createAssignment(generatedName, expression);
+                }
+                return (inlinable || ts.isIdentifier(innerExpression)) ? undefined : expression;
+            }
+        }
+    }
+    ts.transformClassFields = transformClassFields;
+})(ts || (ts = {}));
+/*@internal*/
+var ts;
 (function (ts) {
     var ES2017SubstitutionFlags;
     (function (ES2017SubstitutionFlags) {
@@ -70118,26 +72455,26 @@ var ts;
                 return node;
             }
             switch (node.kind) {
-                case 121 /* AsyncKeyword */:
+                case 122 /* AsyncKeyword */:
                     // ES2017 async modifier should be elided for targets < ES2017
                     return undefined;
-                case 201 /* AwaitExpression */:
+                case 202 /* AwaitExpression */:
                     return visitAwaitExpression(node);
-                case 156 /* MethodDeclaration */:
+                case 157 /* MethodDeclaration */:
                     return visitMethodDeclaration(node);
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     return visitFunctionDeclaration(node);
-                case 196 /* FunctionExpression */:
+                case 197 /* FunctionExpression */:
                     return visitFunctionExpression(node);
-                case 197 /* ArrowFunction */:
+                case 198 /* ArrowFunction */:
                     return visitArrowFunction(node);
-                case 189 /* PropertyAccessExpression */:
-                    if (capturedSuperProperties && ts.isPropertyAccessExpression(node) && node.expression.kind === 98 /* SuperKeyword */) {
+                case 190 /* PropertyAccessExpression */:
+                    if (capturedSuperProperties && ts.isPropertyAccessExpression(node) && node.expression.kind === 99 /* SuperKeyword */) {
                         capturedSuperProperties.set(node.name.escapedText, true);
                     }
                     return ts.visitEachChild(node, visitor, context);
-                case 190 /* ElementAccessExpression */:
-                    if (capturedSuperProperties && node.expression.kind === 98 /* SuperKeyword */) {
+                case 191 /* ElementAccessExpression */:
+                    if (capturedSuperProperties && node.expression.kind === 99 /* SuperKeyword */) {
                         hasSuperElementAccess = true;
                     }
                     return ts.visitEachChild(node, visitor, context);
@@ -70148,27 +72485,27 @@ var ts;
         function asyncBodyVisitor(node) {
             if (ts.isNodeWithPossibleHoistedDeclaration(node)) {
                 switch (node.kind) {
-                    case 219 /* VariableStatement */:
+                    case 220 /* VariableStatement */:
                         return visitVariableStatementInAsyncBody(node);
-                    case 225 /* ForStatement */:
+                    case 226 /* ForStatement */:
                         return visitForStatementInAsyncBody(node);
-                    case 226 /* ForInStatement */:
+                    case 227 /* ForInStatement */:
                         return visitForInStatementInAsyncBody(node);
-                    case 227 /* ForOfStatement */:
+                    case 228 /* ForOfStatement */:
                         return visitForOfStatementInAsyncBody(node);
-                    case 274 /* CatchClause */:
+                    case 275 /* CatchClause */:
                         return visitCatchClauseInAsyncBody(node);
-                    case 218 /* Block */:
-                    case 232 /* SwitchStatement */:
-                    case 246 /* CaseBlock */:
-                    case 271 /* CaseClause */:
-                    case 272 /* DefaultClause */:
-                    case 235 /* TryStatement */:
-                    case 223 /* DoStatement */:
-                    case 224 /* WhileStatement */:
-                    case 222 /* IfStatement */:
-                    case 231 /* WithStatement */:
-                    case 233 /* LabeledStatement */:
+                    case 219 /* Block */:
+                    case 233 /* SwitchStatement */:
+                    case 247 /* CaseBlock */:
+                    case 272 /* CaseClause */:
+                    case 273 /* DefaultClause */:
+                    case 236 /* TryStatement */:
+                    case 224 /* DoStatement */:
+                    case 225 /* WhileStatement */:
+                    case 223 /* IfStatement */:
+                    case 232 /* WithStatement */:
+                    case 234 /* LabeledStatement */:
                         return ts.visitEachChild(node, asyncBodyVisitor, context);
                     default:
                         return ts.Debug.assertNever(node, "Unhandled node.");
@@ -70369,7 +72706,7 @@ var ts;
             var original = ts.getOriginalNode(node, ts.isFunctionLike);
             var nodeType = original.type;
             var promiseConstructor = languageVersion < 2 /* ES2015 */ ? getPromiseConstructor(nodeType) : undefined;
-            var isArrowFunction = node.kind === 197 /* ArrowFunction */;
+            var isArrowFunction = node.kind === 198 /* ArrowFunction */;
             var hasLexicalArguments = (resolver.getNodeCheckFlags(node) & 8192 /* CaptureArguments */) !== 0;
             // An async function is emit as an outer function that calls an inner
             // generator function. To preserve lexical bindings, we pass the current
@@ -70384,8 +72721,10 @@ var ts;
             }
             var savedCapturedSuperProperties = capturedSuperProperties;
             var savedHasSuperElementAccess = hasSuperElementAccess;
-            capturedSuperProperties = ts.createUnderscoreEscapedMap();
-            hasSuperElementAccess = false;
+            if (!isArrowFunction) {
+                capturedSuperProperties = ts.createUnderscoreEscapedMap();
+                hasSuperElementAccess = false;
+            }
             var result;
             if (!isArrowFunction) {
                 var statements = [];
@@ -70397,9 +72736,11 @@ var ts;
                 var emitSuperHelpers = languageVersion >= 2 /* ES2015 */ && resolver.getNodeCheckFlags(node) & (4096 /* AsyncMethodWithSuperBinding */ | 2048 /* AsyncMethodWithSuper */);
                 if (emitSuperHelpers) {
                     enableSubstitutionForAsyncMethodsWithSuper();
-                    var variableStatement = createSuperAccessVariableStatement(resolver, node, capturedSuperProperties);
-                    substitutedSuperAccessors[ts.getNodeId(variableStatement)] = true;
-                    ts.insertStatementsAfterStandardPrologue(statements, [variableStatement]);
+                    if (ts.hasEntries(capturedSuperProperties)) {
+                        var variableStatement = createSuperAccessVariableStatement(resolver, node, capturedSuperProperties);
+                        substitutedSuperAccessors[ts.getNodeId(variableStatement)] = true;
+                        ts.insertStatementsAfterStandardPrologue(statements, [variableStatement]);
+                    }
                 }
                 var block = ts.createBlock(statements, /*multiLine*/ true);
                 ts.setTextRange(block, node.body);
@@ -70426,8 +72767,10 @@ var ts;
                 }
             }
             enclosingFunctionParameterNames = savedEnclosingFunctionParameterNames;
-            capturedSuperProperties = savedCapturedSuperProperties;
-            hasSuperElementAccess = savedHasSuperElementAccess;
+            if (!isArrowFunction) {
+                capturedSuperProperties = savedCapturedSuperProperties;
+                hasSuperElementAccess = savedHasSuperElementAccess;
+            }
             return result;
         }
         function transformAsyncFunctionBodyWorker(body, start) {
@@ -70454,17 +72797,17 @@ var ts;
                 enabledSubstitutions |= 1 /* AsyncMethodsWithSuper */;
                 // We need to enable substitutions for call, property access, and element access
                 // if we need to rewrite super calls.
-                context.enableSubstitution(191 /* CallExpression */);
-                context.enableSubstitution(189 /* PropertyAccessExpression */);
-                context.enableSubstitution(190 /* ElementAccessExpression */);
+                context.enableSubstitution(192 /* CallExpression */);
+                context.enableSubstitution(190 /* PropertyAccessExpression */);
+                context.enableSubstitution(191 /* ElementAccessExpression */);
                 // We need to be notified when entering and exiting declarations that bind super.
-                context.enableEmitNotification(240 /* ClassDeclaration */);
-                context.enableEmitNotification(156 /* MethodDeclaration */);
-                context.enableEmitNotification(158 /* GetAccessor */);
-                context.enableEmitNotification(159 /* SetAccessor */);
-                context.enableEmitNotification(157 /* Constructor */);
+                context.enableEmitNotification(241 /* ClassDeclaration */);
+                context.enableEmitNotification(157 /* MethodDeclaration */);
+                context.enableEmitNotification(159 /* GetAccessor */);
+                context.enableEmitNotification(160 /* SetAccessor */);
+                context.enableEmitNotification(158 /* Constructor */);
                 // We need to be notified when entering the generated accessor arrow functions.
-                context.enableEmitNotification(219 /* VariableStatement */);
+                context.enableEmitNotification(220 /* VariableStatement */);
             }
         }
         /**
@@ -70512,23 +72855,23 @@ var ts;
         }
         function substituteExpression(node) {
             switch (node.kind) {
-                case 189 /* PropertyAccessExpression */:
+                case 190 /* PropertyAccessExpression */:
                     return substitutePropertyAccessExpression(node);
-                case 190 /* ElementAccessExpression */:
+                case 191 /* ElementAccessExpression */:
                     return substituteElementAccessExpression(node);
-                case 191 /* CallExpression */:
+                case 192 /* CallExpression */:
                     return substituteCallExpression(node);
             }
             return node;
         }
         function substitutePropertyAccessExpression(node) {
-            if (node.expression.kind === 98 /* SuperKeyword */) {
+            if (node.expression.kind === 99 /* SuperKeyword */) {
                 return ts.setTextRange(ts.createPropertyAccess(ts.createFileLevelUniqueName("_super"), node.name), node);
             }
             return node;
         }
         function substituteElementAccessExpression(node) {
-            if (node.expression.kind === 98 /* SuperKeyword */) {
+            if (node.expression.kind === 99 /* SuperKeyword */) {
                 return createSuperElementAccessInAsyncMethod(node.argumentExpression, node);
             }
             return node;
@@ -70548,11 +72891,11 @@ var ts;
         }
         function isSuperContainer(node) {
             var kind = node.kind;
-            return kind === 240 /* ClassDeclaration */
-                || kind === 157 /* Constructor */
-                || kind === 156 /* MethodDeclaration */
-                || kind === 158 /* GetAccessor */
-                || kind === 159 /* SetAccessor */;
+            return kind === 241 /* ClassDeclaration */
+                || kind === 158 /* Constructor */
+                || kind === 157 /* MethodDeclaration */
+                || kind === 159 /* GetAccessor */
+                || kind === 160 /* SetAccessor */;
         }
         function createSuperElementAccessInAsyncMethod(argumentExpression, location) {
             if (enclosingSuperContainerFlags & 4096 /* AsyncMethodWithSuperBinding */) {
@@ -70580,7 +72923,7 @@ var ts;
             /* typeParameters */ undefined, 
             /* parameters */ [], 
             /* type */ undefined, 
-            /* equalsGreaterThanToken */ undefined, ts.createPropertyAccess(ts.createSuper(), name))));
+            /* equalsGreaterThanToken */ undefined, ts.setEmitFlags(ts.createPropertyAccess(ts.setEmitFlags(ts.createSuper(), 4 /* NoSubstitution */), name), 4 /* NoSubstitution */))));
             if (hasBinding) {
                 getterAndSetter.push(ts.createPropertyAssignment("set", ts.createArrowFunction(
                 /* modifiers */ undefined, 
@@ -70595,7 +72938,7 @@ var ts;
                     /* initializer */ undefined)
                 ], 
                 /* type */ undefined, 
-                /* equalsGreaterThanToken */ undefined, ts.createAssignment(ts.createPropertyAccess(ts.createSuper(), name), ts.createIdentifier("v")))));
+                /* equalsGreaterThanToken */ undefined, ts.createAssignment(ts.setEmitFlags(ts.createPropertyAccess(ts.setEmitFlags(ts.createSuper(), 4 /* NoSubstitution */), name), 4 /* NoSubstitution */), ts.createIdentifier("v")))));
             }
             accessors.push(ts.createPropertyAssignment(name, ts.createObjectLiteral(getterAndSetter)));
         });
@@ -70614,7 +72957,7 @@ var ts;
         name: "typescript:awaiter",
         scoped: false,
         priority: 5,
-        text: "\n            var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {\n                return new (P || (P = Promise))(function (resolve, reject) {\n                    function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }\n                    function rejected(value) { try { step(generator[\"throw\"](value)); } catch (e) { reject(e); } }\n                    function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }\n                    step((generator = generator.apply(thisArg, _arguments || [])).next());\n                });\n            };"
+        text: "\n            var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {\n                function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }\n                return new (P || (P = Promise))(function (resolve, reject) {\n                    function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }\n                    function rejected(value) { try { step(generator[\"throw\"](value)); } catch (e) { reject(e); } }\n                    function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }\n                    step((generator = generator.apply(thisArg, _arguments || [])).next());\n                });\n            };"
     };
     function createAwaiterHelper(context, hasLexicalArguments, promiseConstructor, body) {
         context.requestEmitHelper(ts.awaiterHelper);
@@ -70687,7 +73030,7 @@ var ts;
             return visitorWorker(node, /*noDestructuringValue*/ true);
         }
         function visitorNoAsyncModifier(node) {
-            if (node.kind === 121 /* AsyncKeyword */) {
+            if (node.kind === 122 /* AsyncKeyword */) {
                 return undefined;
             }
             return node;
@@ -70697,53 +73040,55 @@ var ts;
                 return node;
             }
             switch (node.kind) {
-                case 201 /* AwaitExpression */:
+                case 202 /* AwaitExpression */:
                     return visitAwaitExpression(node);
-                case 207 /* YieldExpression */:
+                case 208 /* YieldExpression */:
                     return visitYieldExpression(node);
-                case 230 /* ReturnStatement */:
+                case 231 /* ReturnStatement */:
                     return visitReturnStatement(node);
-                case 233 /* LabeledStatement */:
+                case 234 /* LabeledStatement */:
                     return visitLabeledStatement(node);
-                case 188 /* ObjectLiteralExpression */:
+                case 189 /* ObjectLiteralExpression */:
                     return visitObjectLiteralExpression(node);
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return visitBinaryExpression(node, noDestructuringValue);
-                case 237 /* VariableDeclaration */:
+                case 275 /* CatchClause */:
+                    return visitCatchClause(node);
+                case 238 /* VariableDeclaration */:
                     return visitVariableDeclaration(node);
-                case 227 /* ForOfStatement */:
+                case 228 /* ForOfStatement */:
                     return visitForOfStatement(node, /*outermostLabeledStatement*/ undefined);
-                case 225 /* ForStatement */:
+                case 226 /* ForStatement */:
                     return visitForStatement(node);
-                case 200 /* VoidExpression */:
+                case 201 /* VoidExpression */:
                     return visitVoidExpression(node);
-                case 157 /* Constructor */:
+                case 158 /* Constructor */:
                     return visitConstructorDeclaration(node);
-                case 156 /* MethodDeclaration */:
+                case 157 /* MethodDeclaration */:
                     return visitMethodDeclaration(node);
-                case 158 /* GetAccessor */:
+                case 159 /* GetAccessor */:
                     return visitGetAccessorDeclaration(node);
-                case 159 /* SetAccessor */:
+                case 160 /* SetAccessor */:
                     return visitSetAccessorDeclaration(node);
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     return visitFunctionDeclaration(node);
-                case 196 /* FunctionExpression */:
+                case 197 /* FunctionExpression */:
                     return visitFunctionExpression(node);
-                case 197 /* ArrowFunction */:
+                case 198 /* ArrowFunction */:
                     return visitArrowFunction(node);
-                case 151 /* Parameter */:
+                case 152 /* Parameter */:
                     return visitParameter(node);
-                case 221 /* ExpressionStatement */:
+                case 222 /* ExpressionStatement */:
                     return visitExpressionStatement(node);
-                case 195 /* ParenthesizedExpression */:
+                case 196 /* ParenthesizedExpression */:
                     return visitParenthesizedExpression(node, noDestructuringValue);
-                case 189 /* PropertyAccessExpression */:
-                    if (capturedSuperProperties && ts.isPropertyAccessExpression(node) && node.expression.kind === 98 /* SuperKeyword */) {
+                case 190 /* PropertyAccessExpression */:
+                    if (capturedSuperProperties && ts.isPropertyAccessExpression(node) && node.expression.kind === 99 /* SuperKeyword */) {
                         capturedSuperProperties.set(node.name.escapedText, true);
                     }
                     return ts.visitEachChild(node, visitor, context);
-                case 190 /* ElementAccessExpression */:
-                    if (capturedSuperProperties && node.expression.kind === 98 /* SuperKeyword */) {
+                case 191 /* ElementAccessExpression */:
+                    if (capturedSuperProperties && node.expression.kind === 99 /* SuperKeyword */) {
                         hasSuperElementAccess = true;
                     }
                     return ts.visitEachChild(node, visitor, context);
@@ -70779,7 +73124,7 @@ var ts;
         function visitLabeledStatement(node) {
             if (enclosingFunctionFlags & 2 /* Async */) {
                 var statement = ts.unwrapInnermostStatementOfLabel(node);
-                if (statement.kind === 227 /* ForOfStatement */ && statement.awaitModifier) {
+                if (statement.kind === 228 /* ForOfStatement */ && statement.awaitModifier) {
                     return visitForOfStatement(statement, node);
                 }
                 return ts.restoreEnclosingLabel(ts.visitEachChild(statement, visitor, context), node);
@@ -70791,7 +73136,7 @@ var ts;
             var objects = [];
             for (var _i = 0, elements_4 = elements; _i < elements_4.length; _i++) {
                 var e = elements_4[_i];
-                if (e.kind === 277 /* SpreadAssignment */) {
+                if (e.kind === 278 /* SpreadAssignment */) {
                     if (chunkObject) {
                         objects.push(ts.createObjectLiteral(chunkObject));
                         chunkObject = undefined;
@@ -70800,7 +73145,7 @@ var ts;
                     objects.push(ts.visitNode(target, visitor, ts.isExpression));
                 }
                 else {
-                    chunkObject = ts.append(chunkObject, e.kind === 275 /* PropertyAssignment */
+                    chunkObject = ts.append(chunkObject, e.kind === 276 /* PropertyAssignment */
                         ? ts.createPropertyAssignment(e.name, ts.visitNode(e.initializer, visitor, ts.isExpression))
                         : ts.visitNode(e, visitor, ts.isObjectLiteralElementLike));
                 }
@@ -70814,14 +73159,39 @@ var ts;
             if (node.transformFlags & 8192 /* ContainsObjectRestOrSpread */) {
                 // spread elements emit like so:
                 // non-spread elements are chunked together into object literals, and then all are passed to __assign:
-                //     { a, ...o, b } => __assign({a}, o, {b});
+                //     { a, ...o, b } => __assign(__assign({a}, o), {b});
                 // If the first element is a spread element, then the first argument to __assign is {}:
-                //     { ...o, a, b, ...o2 } => __assign({}, o, {a, b}, o2)
+                //     { ...o, a, b, ...o2 } => __assign(__assign(__assign({}, o), {a, b}), o2)
+                //
+                // We cannot call __assign with more than two elements, since any element could cause side effects. For
+                // example:
+                //      var k = { a: 1, b: 2 };
+                //      var o = { a: 3, ...k, b: k.a++ };
+                //      // expected: { a: 1, b: 1 }
+                // If we translate the above to `__assign({ a: 3 }, k, { b: k.a++ })`, the `k.a++` will evaluate before
+                // `k` is spread and we end up with `{ a: 2, b: 1 }`.
+                //
+                // This also occurs for spread elements, not just property assignments:
+                //      var k = { a: 1, get b() { l = { z: 9 }; return 2; } };
+                //      var l = { c: 3 };
+                //      var o = { ...k, ...l };
+                //      // expected: { a: 1, b: 2, z: 9 }
+                // If we translate the above to `__assign({}, k, l)`, the `l` will evaluate before `k` is spread and we
+                // end up with `{ a: 1, b: 2, c: 3 }`
                 var objects = chunkObjectLiteralElements(node.properties);
-                if (objects.length && objects[0].kind !== 188 /* ObjectLiteralExpression */) {
+                if (objects.length && objects[0].kind !== 189 /* ObjectLiteralExpression */) {
                     objects.unshift(ts.createObjectLiteral());
                 }
-                return createAssignHelper(context, objects);
+                var expression = objects[0];
+                if (objects.length > 1) {
+                    for (var i = 1; i < objects.length; i++) {
+                        expression = createAssignHelper(context, [expression, objects[i]]);
+                    }
+                    return expression;
+                }
+                else {
+                    return createAssignHelper(context, objects);
+                }
             }
             return ts.visitEachChild(node, visitor, context);
         }
@@ -70845,6 +73215,23 @@ var ts;
             }
             return ts.visitEachChild(node, visitor, context);
         }
+        function visitCatchClause(node) {
+            if (node.variableDeclaration &&
+                ts.isBindingPattern(node.variableDeclaration.name) &&
+                node.variableDeclaration.name.transformFlags & 8192 /* ContainsObjectRestOrSpread */) {
+                var name = ts.getGeneratedNameForNode(node.variableDeclaration.name);
+                var updatedDecl = ts.updateVariableDeclaration(node.variableDeclaration, node.variableDeclaration.name, /*type*/ undefined, name);
+                var visitedBindings = ts.flattenDestructuringBinding(updatedDecl, visitor, context, 1 /* ObjectRest */);
+                var block = ts.visitNode(node.block, visitor, ts.isBlock);
+                if (ts.some(visitedBindings)) {
+                    block = ts.updateBlock(block, [
+                        ts.createVariableStatement(/*modifiers*/ undefined, visitedBindings)
+                    ].concat(block.statements));
+                }
+                return ts.updateCatchClause(node, ts.updateVariableDeclaration(node.variableDeclaration, name, /*type*/ undefined, /*initializer*/ undefined), block);
+            }
+            return ts.visitEachChild(node, visitor, context);
+        }
         /**
          * Visits a VariableDeclaration node with a binding pattern.
          *
@@ -71137,17 +73524,17 @@ var ts;
                 enabledSubstitutions |= 1 /* AsyncMethodsWithSuper */;
                 // We need to enable substitutions for call, property access, and element access
                 // if we need to rewrite super calls.
-                context.enableSubstitution(191 /* CallExpression */);
-                context.enableSubstitution(189 /* PropertyAccessExpression */);
-                context.enableSubstitution(190 /* ElementAccessExpression */);
+                context.enableSubstitution(192 /* CallExpression */);
+                context.enableSubstitution(190 /* PropertyAccessExpression */);
+                context.enableSubstitution(191 /* ElementAccessExpression */);
                 // We need to be notified when entering and exiting declarations that bind super.
-                context.enableEmitNotification(240 /* ClassDeclaration */);
-                context.enableEmitNotification(156 /* MethodDeclaration */);
-                context.enableEmitNotification(158 /* GetAccessor */);
-                context.enableEmitNotification(159 /* SetAccessor */);
-                context.enableEmitNotification(157 /* Constructor */);
+                context.enableEmitNotification(241 /* ClassDeclaration */);
+                context.enableEmitNotification(157 /* MethodDeclaration */);
+                context.enableEmitNotification(159 /* GetAccessor */);
+                context.enableEmitNotification(160 /* SetAccessor */);
+                context.enableEmitNotification(158 /* Constructor */);
                 // We need to be notified when entering the generated accessor arrow functions.
-                context.enableEmitNotification(219 /* VariableStatement */);
+                context.enableEmitNotification(220 /* VariableStatement */);
             }
         }
         /**
@@ -71195,23 +73582,23 @@ var ts;
         }
         function substituteExpression(node) {
             switch (node.kind) {
-                case 189 /* PropertyAccessExpression */:
+                case 190 /* PropertyAccessExpression */:
                     return substitutePropertyAccessExpression(node);
-                case 190 /* ElementAccessExpression */:
+                case 191 /* ElementAccessExpression */:
                     return substituteElementAccessExpression(node);
-                case 191 /* CallExpression */:
+                case 192 /* CallExpression */:
                     return substituteCallExpression(node);
             }
             return node;
         }
         function substitutePropertyAccessExpression(node) {
-            if (node.expression.kind === 98 /* SuperKeyword */) {
+            if (node.expression.kind === 99 /* SuperKeyword */) {
                 return ts.setTextRange(ts.createPropertyAccess(ts.createFileLevelUniqueName("_super"), node.name), node);
             }
             return node;
         }
         function substituteElementAccessExpression(node) {
-            if (node.expression.kind === 98 /* SuperKeyword */) {
+            if (node.expression.kind === 99 /* SuperKeyword */) {
                 return createSuperElementAccessInAsyncMethod(node.argumentExpression, node);
             }
             return node;
@@ -71231,11 +73618,11 @@ var ts;
         }
         function isSuperContainer(node) {
             var kind = node.kind;
-            return kind === 240 /* ClassDeclaration */
-                || kind === 157 /* Constructor */
-                || kind === 156 /* MethodDeclaration */
-                || kind === 158 /* GetAccessor */
-                || kind === 159 /* SetAccessor */;
+            return kind === 241 /* ClassDeclaration */
+                || kind === 158 /* Constructor */
+                || kind === 157 /* MethodDeclaration */
+                || kind === 159 /* GetAccessor */
+                || kind === 160 /* SetAccessor */;
         }
         function createSuperElementAccessInAsyncMethod(argumentExpression, location) {
             if (enclosingSuperContainerFlags & 4096 /* AsyncMethodWithSuperBinding */) {
@@ -71329,7 +73716,7 @@ var ts;
                 return node;
             }
             switch (node.kind) {
-                case 274 /* CatchClause */:
+                case 275 /* CatchClause */:
                     return visitCatchClause(node);
                 default:
                     return ts.visitEachChild(node, visitor, context);
@@ -71398,13 +73785,13 @@ var ts;
         }
         function visitorWorker(node) {
             switch (node.kind) {
-                case 260 /* JsxElement */:
+                case 261 /* JsxElement */:
                     return visitJsxElement(node, /*isChild*/ false);
-                case 261 /* JsxSelfClosingElement */:
+                case 262 /* JsxSelfClosingElement */:
                     return visitJsxSelfClosingElement(node, /*isChild*/ false);
-                case 264 /* JsxFragment */:
+                case 265 /* JsxFragment */:
                     return visitJsxFragment(node, /*isChild*/ false);
-                case 270 /* JsxExpression */:
+                case 271 /* JsxExpression */:
                     return visitJsxExpression(node);
                 default:
                     return ts.visitEachChild(node, visitor, context);
@@ -71414,13 +73801,13 @@ var ts;
             switch (node.kind) {
                 case 11 /* JsxText */:
                     return visitJsxText(node);
-                case 270 /* JsxExpression */:
+                case 271 /* JsxExpression */:
                     return visitJsxExpression(node);
-                case 260 /* JsxElement */:
+                case 261 /* JsxElement */:
                     return visitJsxElement(node, /*isChild*/ true);
-                case 261 /* JsxSelfClosingElement */:
+                case 262 /* JsxSelfClosingElement */:
                     return visitJsxSelfClosingElement(node, /*isChild*/ true);
-                case 264 /* JsxFragment */:
+                case 265 /* JsxFragment */:
                     return visitJsxFragment(node, /*isChild*/ true);
                 default:
                     return ts.Debug.failBadSyntaxKind(node);
@@ -71495,7 +73882,7 @@ var ts;
                 literal.singleQuote = node.singleQuote !== undefined ? node.singleQuote : !ts.isStringDoubleQuoted(node, currentSourceFile);
                 return ts.setTextRange(literal, node);
             }
-            else if (node.kind === 270 /* JsxExpression */) {
+            else if (node.kind === 271 /* JsxExpression */) {
                 if (node.expression === undefined) {
                     return ts.createTrue();
                 }
@@ -71506,7 +73893,7 @@ var ts;
             }
         }
         function visitJsxText(node) {
-            var fixed = fixupWhitespaceAndDecodeEntities(ts.getTextOfNode(node, /*includeTrivia*/ true));
+            var fixed = fixupWhitespaceAndDecodeEntities(node.text);
             return fixed === undefined ? undefined : ts.createLiteral(fixed);
         }
         /**
@@ -71589,7 +73976,7 @@ var ts;
             return decoded === text ? undefined : decoded;
         }
         function getTagName(node) {
-            if (node.kind === 260 /* JsxElement */) {
+            if (node.kind === 261 /* JsxElement */) {
                 return getTagName(node.openingElement);
             }
             else {
@@ -71895,7 +74282,7 @@ var ts;
                 return node;
             }
             switch (node.kind) {
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return visitBinaryExpression(node);
                 default:
                     return ts.visitEachChild(node, visitor, context);
@@ -71903,7 +74290,7 @@ var ts;
         }
         function visitBinaryExpression(node) {
             switch (node.operatorToken.kind) {
-                case 63 /* AsteriskAsteriskEqualsToken */:
+                case 64 /* AsteriskAsteriskEqualsToken */:
                     return visitExponentiationAssignmentExpression(node);
                 case 41 /* AsteriskAsteriskToken */:
                     return visitExponentiationExpression(node);
@@ -71988,62 +74375,63 @@ var ts;
         HierarchyFacts[HierarchyFacts["Block"] = 128] = "Block";
         HierarchyFacts[HierarchyFacts["IterationStatement"] = 256] = "IterationStatement";
         HierarchyFacts[HierarchyFacts["IterationStatementBlock"] = 512] = "IterationStatementBlock";
-        HierarchyFacts[HierarchyFacts["ForStatement"] = 1024] = "ForStatement";
-        HierarchyFacts[HierarchyFacts["ForInOrForOfStatement"] = 2048] = "ForInOrForOfStatement";
-        HierarchyFacts[HierarchyFacts["ConstructorWithCapturedSuper"] = 4096] = "ConstructorWithCapturedSuper";
+        HierarchyFacts[HierarchyFacts["IterationContainer"] = 1024] = "IterationContainer";
+        HierarchyFacts[HierarchyFacts["ForStatement"] = 2048] = "ForStatement";
+        HierarchyFacts[HierarchyFacts["ForInOrForOfStatement"] = 4096] = "ForInOrForOfStatement";
+        HierarchyFacts[HierarchyFacts["ConstructorWithCapturedSuper"] = 8192] = "ConstructorWithCapturedSuper";
         // NOTE: do not add more ancestor flags without also updating AncestorFactsMask below.
         // NOTE: when adding a new ancestor flag, be sure to update the subtree flags below.
         //
         // Ancestor masks
         //
-        HierarchyFacts[HierarchyFacts["AncestorFactsMask"] = 8191] = "AncestorFactsMask";
+        HierarchyFacts[HierarchyFacts["AncestorFactsMask"] = 16383] = "AncestorFactsMask";
         // We are always in *some* kind of block scope, but only specific block-scope containers are
         // top-level or Blocks.
         HierarchyFacts[HierarchyFacts["BlockScopeIncludes"] = 0] = "BlockScopeIncludes";
-        HierarchyFacts[HierarchyFacts["BlockScopeExcludes"] = 4032] = "BlockScopeExcludes";
+        HierarchyFacts[HierarchyFacts["BlockScopeExcludes"] = 7104] = "BlockScopeExcludes";
         // A source file is a top-level block scope.
         HierarchyFacts[HierarchyFacts["SourceFileIncludes"] = 64] = "SourceFileIncludes";
-        HierarchyFacts[HierarchyFacts["SourceFileExcludes"] = 3968] = "SourceFileExcludes";
+        HierarchyFacts[HierarchyFacts["SourceFileExcludes"] = 8064] = "SourceFileExcludes";
         // Functions, methods, and accessors are both new lexical scopes and new block scopes.
         HierarchyFacts[HierarchyFacts["FunctionIncludes"] = 65] = "FunctionIncludes";
-        HierarchyFacts[HierarchyFacts["FunctionExcludes"] = 8094] = "FunctionExcludes";
+        HierarchyFacts[HierarchyFacts["FunctionExcludes"] = 16286] = "FunctionExcludes";
         HierarchyFacts[HierarchyFacts["AsyncFunctionBodyIncludes"] = 69] = "AsyncFunctionBodyIncludes";
-        HierarchyFacts[HierarchyFacts["AsyncFunctionBodyExcludes"] = 8086] = "AsyncFunctionBodyExcludes";
+        HierarchyFacts[HierarchyFacts["AsyncFunctionBodyExcludes"] = 16278] = "AsyncFunctionBodyExcludes";
         // Arrow functions are lexically scoped to their container, but are new block scopes.
         HierarchyFacts[HierarchyFacts["ArrowFunctionIncludes"] = 66] = "ArrowFunctionIncludes";
-        HierarchyFacts[HierarchyFacts["ArrowFunctionExcludes"] = 8064] = "ArrowFunctionExcludes";
+        HierarchyFacts[HierarchyFacts["ArrowFunctionExcludes"] = 15232] = "ArrowFunctionExcludes";
         // Constructors are both new lexical scopes and new block scopes. Constructors are also
         // always considered non-static members of a class.
         HierarchyFacts[HierarchyFacts["ConstructorIncludes"] = 73] = "ConstructorIncludes";
-        HierarchyFacts[HierarchyFacts["ConstructorExcludes"] = 8086] = "ConstructorExcludes";
+        HierarchyFacts[HierarchyFacts["ConstructorExcludes"] = 16278] = "ConstructorExcludes";
         // 'do' and 'while' statements are not block scopes. We track that the subtree is contained
         // within an IterationStatement to indicate whether the embedded statement is an
         // IterationStatementBlock.
-        HierarchyFacts[HierarchyFacts["DoOrWhileStatementIncludes"] = 256] = "DoOrWhileStatementIncludes";
+        HierarchyFacts[HierarchyFacts["DoOrWhileStatementIncludes"] = 1280] = "DoOrWhileStatementIncludes";
         HierarchyFacts[HierarchyFacts["DoOrWhileStatementExcludes"] = 0] = "DoOrWhileStatementExcludes";
         // 'for' statements are new block scopes and have special handling for 'let' declarations.
-        HierarchyFacts[HierarchyFacts["ForStatementIncludes"] = 1280] = "ForStatementIncludes";
-        HierarchyFacts[HierarchyFacts["ForStatementExcludes"] = 3008] = "ForStatementExcludes";
+        HierarchyFacts[HierarchyFacts["ForStatementIncludes"] = 3328] = "ForStatementIncludes";
+        HierarchyFacts[HierarchyFacts["ForStatementExcludes"] = 5056] = "ForStatementExcludes";
         // 'for-in' and 'for-of' statements are new block scopes and have special handling for
         // 'let' declarations.
-        HierarchyFacts[HierarchyFacts["ForInOrForOfStatementIncludes"] = 2304] = "ForInOrForOfStatementIncludes";
-        HierarchyFacts[HierarchyFacts["ForInOrForOfStatementExcludes"] = 1984] = "ForInOrForOfStatementExcludes";
+        HierarchyFacts[HierarchyFacts["ForInOrForOfStatementIncludes"] = 5376] = "ForInOrForOfStatementIncludes";
+        HierarchyFacts[HierarchyFacts["ForInOrForOfStatementExcludes"] = 3008] = "ForInOrForOfStatementExcludes";
         // Blocks (other than function bodies) are new block scopes.
         HierarchyFacts[HierarchyFacts["BlockIncludes"] = 128] = "BlockIncludes";
-        HierarchyFacts[HierarchyFacts["BlockExcludes"] = 3904] = "BlockExcludes";
+        HierarchyFacts[HierarchyFacts["BlockExcludes"] = 6976] = "BlockExcludes";
         HierarchyFacts[HierarchyFacts["IterationStatementBlockIncludes"] = 512] = "IterationStatementBlockIncludes";
-        HierarchyFacts[HierarchyFacts["IterationStatementBlockExcludes"] = 4032] = "IterationStatementBlockExcludes";
+        HierarchyFacts[HierarchyFacts["IterationStatementBlockExcludes"] = 7104] = "IterationStatementBlockExcludes";
         //
         // Subtree facts
         //
-        HierarchyFacts[HierarchyFacts["NewTarget"] = 8192] = "NewTarget";
-        HierarchyFacts[HierarchyFacts["CapturedLexicalThis"] = 16384] = "CapturedLexicalThis";
+        HierarchyFacts[HierarchyFacts["NewTarget"] = 16384] = "NewTarget";
+        HierarchyFacts[HierarchyFacts["CapturedLexicalThis"] = 32768] = "CapturedLexicalThis";
         //
         // Subtree masks
         //
-        HierarchyFacts[HierarchyFacts["SubtreeFactsMask"] = -8192] = "SubtreeFactsMask";
+        HierarchyFacts[HierarchyFacts["SubtreeFactsMask"] = -16384] = "SubtreeFactsMask";
         HierarchyFacts[HierarchyFacts["ArrowFunctionSubtreeExcludes"] = 0] = "ArrowFunctionSubtreeExcludes";
-        HierarchyFacts[HierarchyFacts["FunctionSubtreeExcludes"] = 24576] = "FunctionSubtreeExcludes";
+        HierarchyFacts[HierarchyFacts["FunctionSubtreeExcludes"] = 49152] = "FunctionSubtreeExcludes";
     })(HierarchyFacts || (HierarchyFacts = {}));
     function transformES2015(context) {
         var startLexicalEnvironment = context.startLexicalEnvironment, resumeLexicalEnvironment = context.resumeLexicalEnvironment, endLexicalEnvironment = context.endLexicalEnvironment, hoistVariableDeclaration = context.hoistVariableDeclaration;
@@ -72092,7 +74480,7 @@ var ts;
          */
         function enterSubtree(excludeFacts, includeFacts) {
             var ancestorFacts = hierarchyFacts;
-            hierarchyFacts = (hierarchyFacts & ~excludeFacts | includeFacts) & 8191 /* AncestorFactsMask */;
+            hierarchyFacts = (hierarchyFacts & ~excludeFacts | includeFacts) & 16383 /* AncestorFactsMask */;
             return ancestorFacts;
         }
         /**
@@ -72103,17 +74491,17 @@ var ts;
          * @param includeFacts The new `HierarchyFacts` of the subtree that should be propagated.
          */
         function exitSubtree(ancestorFacts, excludeFacts, includeFacts) {
-            hierarchyFacts = (hierarchyFacts & ~excludeFacts | includeFacts) & -8192 /* SubtreeFactsMask */ | ancestorFacts;
+            hierarchyFacts = (hierarchyFacts & ~excludeFacts | includeFacts) & -16384 /* SubtreeFactsMask */ | ancestorFacts;
         }
         function isReturnVoidStatementInConstructorWithCapturedSuper(node) {
-            return (hierarchyFacts & 4096 /* ConstructorWithCapturedSuper */) !== 0
-                && node.kind === 230 /* ReturnStatement */
+            return (hierarchyFacts & 8192 /* ConstructorWithCapturedSuper */) !== 0
+                && node.kind === 231 /* ReturnStatement */
                 && !node.expression;
         }
         function shouldVisitNode(node) {
             return (node.transformFlags & 128 /* ContainsES2015 */) !== 0
                 || convertedLoopState !== undefined
-                || (hierarchyFacts & 4096 /* ConstructorWithCapturedSuper */ && (ts.isStatement(node) || (node.kind === 218 /* Block */)))
+                || (hierarchyFacts & 8192 /* ConstructorWithCapturedSuper */ && (ts.isStatement(node) || (node.kind === 219 /* Block */)))
                 || (ts.isIterationStatement(node, /*lookInLabeledStatements*/ false) && shouldConvertIterationStatement(node))
                 || (ts.getEmitFlags(node) & 33554432 /* TypeScriptClassWrapper */) !== 0;
         }
@@ -72126,72 +74514,72 @@ var ts;
             }
         }
         function callExpressionVisitor(node) {
-            if (node.kind === 98 /* SuperKeyword */) {
+            if (node.kind === 99 /* SuperKeyword */) {
                 return visitSuperKeyword(/*isExpressionOfCall*/ true);
             }
             return visitor(node);
         }
         function visitJavaScript(node) {
             switch (node.kind) {
-                case 116 /* StaticKeyword */:
+                case 117 /* StaticKeyword */:
                     return undefined; // elide static keyword
-                case 240 /* ClassDeclaration */:
+                case 241 /* ClassDeclaration */:
                     return visitClassDeclaration(node);
-                case 209 /* ClassExpression */:
+                case 210 /* ClassExpression */:
                     return visitClassExpression(node);
-                case 151 /* Parameter */:
+                case 152 /* Parameter */:
                     return visitParameter(node);
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     return visitFunctionDeclaration(node);
-                case 197 /* ArrowFunction */:
+                case 198 /* ArrowFunction */:
                     return visitArrowFunction(node);
-                case 196 /* FunctionExpression */:
+                case 197 /* FunctionExpression */:
                     return visitFunctionExpression(node);
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     return visitVariableDeclaration(node);
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return visitIdentifier(node);
-                case 238 /* VariableDeclarationList */:
+                case 239 /* VariableDeclarationList */:
                     return visitVariableDeclarationList(node);
-                case 232 /* SwitchStatement */:
+                case 233 /* SwitchStatement */:
                     return visitSwitchStatement(node);
-                case 246 /* CaseBlock */:
+                case 247 /* CaseBlock */:
                     return visitCaseBlock(node);
-                case 218 /* Block */:
+                case 219 /* Block */:
                     return visitBlock(node, /*isFunctionBody*/ false);
-                case 229 /* BreakStatement */:
-                case 228 /* ContinueStatement */:
+                case 230 /* BreakStatement */:
+                case 229 /* ContinueStatement */:
                     return visitBreakOrContinueStatement(node);
-                case 233 /* LabeledStatement */:
+                case 234 /* LabeledStatement */:
                     return visitLabeledStatement(node);
-                case 223 /* DoStatement */:
-                case 224 /* WhileStatement */:
+                case 224 /* DoStatement */:
+                case 225 /* WhileStatement */:
                     return visitDoOrWhileStatement(node, /*outermostLabeledStatement*/ undefined);
-                case 225 /* ForStatement */:
+                case 226 /* ForStatement */:
                     return visitForStatement(node, /*outermostLabeledStatement*/ undefined);
-                case 226 /* ForInStatement */:
+                case 227 /* ForInStatement */:
                     return visitForInStatement(node, /*outermostLabeledStatement*/ undefined);
-                case 227 /* ForOfStatement */:
+                case 228 /* ForOfStatement */:
                     return visitForOfStatement(node, /*outermostLabeledStatement*/ undefined);
-                case 221 /* ExpressionStatement */:
+                case 222 /* ExpressionStatement */:
                     return visitExpressionStatement(node);
-                case 188 /* ObjectLiteralExpression */:
+                case 189 /* ObjectLiteralExpression */:
                     return visitObjectLiteralExpression(node);
-                case 274 /* CatchClause */:
+                case 275 /* CatchClause */:
                     return visitCatchClause(node);
-                case 276 /* ShorthandPropertyAssignment */:
+                case 277 /* ShorthandPropertyAssignment */:
                     return visitShorthandPropertyAssignment(node);
-                case 149 /* ComputedPropertyName */:
+                case 150 /* ComputedPropertyName */:
                     return visitComputedPropertyName(node);
-                case 187 /* ArrayLiteralExpression */:
+                case 188 /* ArrayLiteralExpression */:
                     return visitArrayLiteralExpression(node);
-                case 191 /* CallExpression */:
+                case 192 /* CallExpression */:
                     return visitCallExpression(node);
-                case 192 /* NewExpression */:
+                case 193 /* NewExpression */:
                     return visitNewExpression(node);
-                case 195 /* ParenthesizedExpression */:
+                case 196 /* ParenthesizedExpression */:
                     return visitParenthesizedExpression(node, /*needsDestructuringValue*/ true);
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return visitBinaryExpression(node, /*needsDestructuringValue*/ true);
                 case 14 /* NoSubstitutionTemplateLiteral */:
                 case 15 /* TemplateHead */:
@@ -72202,35 +74590,35 @@ var ts;
                     return visitStringLiteral(node);
                 case 8 /* NumericLiteral */:
                     return visitNumericLiteral(node);
-                case 193 /* TaggedTemplateExpression */:
+                case 194 /* TaggedTemplateExpression */:
                     return visitTaggedTemplateExpression(node);
-                case 206 /* TemplateExpression */:
+                case 207 /* TemplateExpression */:
                     return visitTemplateExpression(node);
-                case 207 /* YieldExpression */:
+                case 208 /* YieldExpression */:
                     return visitYieldExpression(node);
-                case 208 /* SpreadElement */:
+                case 209 /* SpreadElement */:
                     return visitSpreadElement(node);
-                case 98 /* SuperKeyword */:
+                case 99 /* SuperKeyword */:
                     return visitSuperKeyword(/*isExpressionOfCall*/ false);
-                case 100 /* ThisKeyword */:
+                case 101 /* ThisKeyword */:
                     return visitThisKeyword(node);
-                case 214 /* MetaProperty */:
+                case 215 /* MetaProperty */:
                     return visitMetaProperty(node);
-                case 156 /* MethodDeclaration */:
+                case 157 /* MethodDeclaration */:
                     return visitMethodDeclaration(node);
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     return visitAccessorDeclaration(node);
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     return visitVariableStatement(node);
-                case 230 /* ReturnStatement */:
+                case 231 /* ReturnStatement */:
                     return visitReturnStatement(node);
                 default:
                     return ts.visitEachChild(node, visitor, context);
             }
         }
         function visitSourceFile(node) {
-            var ancestorFacts = enterSubtree(3968 /* SourceFileExcludes */, 64 /* SourceFileIncludes */);
+            var ancestorFacts = enterSubtree(8064 /* SourceFileExcludes */, 64 /* SourceFileIncludes */);
             var prologue = [];
             var statements = [];
             startLexicalEnvironment();
@@ -72257,7 +74645,7 @@ var ts;
             return ts.visitEachChild(node, visitor, context);
         }
         function visitCaseBlock(node) {
-            var ancestorFacts = enterSubtree(4032 /* BlockScopeExcludes */, 0 /* BlockScopeIncludes */);
+            var ancestorFacts = enterSubtree(7104 /* BlockScopeExcludes */, 0 /* BlockScopeIncludes */);
             var updated = ts.visitEachChild(node, visitor, context);
             exitSubtree(ancestorFacts, 0 /* None */, 0 /* None */);
             return updated;
@@ -72284,7 +74672,7 @@ var ts;
         }
         function visitThisKeyword(node) {
             if (hierarchyFacts & 2 /* ArrowFunction */) {
-                hierarchyFacts |= 16384 /* CapturedLexicalThis */;
+                hierarchyFacts |= 32768 /* CapturedLexicalThis */;
             }
             if (convertedLoopState) {
                 if (hierarchyFacts & 2 /* ArrowFunction */) {
@@ -72314,14 +74702,14 @@ var ts;
                 // it is possible if either
                 //   - break/continue is labeled and label is located inside the converted loop
                 //   - break/continue is non-labeled and located in non-converted loop/switch statement
-                var jump = node.kind === 229 /* BreakStatement */ ? 2 /* Break */ : 4 /* Continue */;
+                var jump = node.kind === 230 /* BreakStatement */ ? 2 /* Break */ : 4 /* Continue */;
                 var canUseBreakOrContinue = (node.label && convertedLoopState.labels && convertedLoopState.labels.get(ts.idText(node.label))) ||
                     (!node.label && (convertedLoopState.allowedNonLabeledJumps & jump));
                 if (!canUseBreakOrContinue) {
                     var labelMarker = void 0;
                     var label = node.label;
                     if (!label) {
-                        if (node.kind === 229 /* BreakStatement */) {
+                        if (node.kind === 230 /* BreakStatement */) {
                             convertedLoopState.nonLocalJumps |= 2 /* Break */;
                             labelMarker = "break";
                         }
@@ -72332,7 +74720,7 @@ var ts;
                         }
                     }
                     else {
-                        if (node.kind === 229 /* BreakStatement */) {
+                        if (node.kind === 230 /* BreakStatement */) {
                             labelMarker = "break-" + label.escapedText;
                             setLabeledJump(convertedLoopState, /*isBreak*/ true, ts.idText(label), labelMarker);
                         }
@@ -72527,7 +74915,7 @@ var ts;
         function addConstructor(statements, node, extendsClauseElement) {
             var savedConvertedLoopState = convertedLoopState;
             convertedLoopState = undefined;
-            var ancestorFacts = enterSubtree(8086 /* ConstructorExcludes */, 73 /* ConstructorIncludes */);
+            var ancestorFacts = enterSubtree(16278 /* ConstructorExcludes */, 73 /* ConstructorIncludes */);
             var constructor = ts.getFirstConstructorWithBody(node);
             var hasSynthesizedSuper = hasSynthesizedDefaultSuperCall(constructor, extendsClauseElement !== undefined);
             var constructorFunction = ts.createFunctionDeclaration(
@@ -72541,7 +74929,7 @@ var ts;
                 ts.setEmitFlags(constructorFunction, 8 /* CapturesThis */);
             }
             statements.push(constructorFunction);
-            exitSubtree(ancestorFacts, 24576 /* FunctionSubtreeExcludes */, 0 /* None */);
+            exitSubtree(ancestorFacts, 49152 /* FunctionSubtreeExcludes */, 0 /* None */);
             convertedLoopState = savedConvertedLoopState;
         }
         /**
@@ -72590,7 +74978,7 @@ var ts;
         function transformConstructorBody(constructor, node, extendsClauseElement, hasSynthesizedSuper) {
             // determine whether the class is known syntactically to be a derived class (e.g. a
             // class that extends a value that is not syntactically known to be `null`).
-            var isDerivedClass = !!extendsClauseElement && ts.skipOuterExpressions(extendsClauseElement.expression).kind !== 96 /* NullKeyword */;
+            var isDerivedClass = !!extendsClauseElement && ts.skipOuterExpressions(extendsClauseElement.expression).kind !== 97 /* NullKeyword */;
             // When the subclass does not have a constructor, we synthesize a *default* constructor using the following
             // representation:
             //
@@ -72634,7 +75022,7 @@ var ts;
                 }
             }
             if (superCallExpression) {
-                hierarchyFacts |= 4096 /* ConstructorWithCapturedSuper */;
+                hierarchyFacts |= 8192 /* ConstructorWithCapturedSuper */;
                 statementOffset++; // skip this statement, we will add it after visiting the rest of the body.
             }
             // visit the remaining statements
@@ -72728,11 +75116,11 @@ var ts;
          */
         function isSufficientlyCoveredByReturnStatements(statement) {
             // A return statement is considered covered.
-            if (statement.kind === 230 /* ReturnStatement */) {
+            if (statement.kind === 231 /* ReturnStatement */) {
                 return true;
             }
             // An if-statement with two covered branches is covered.
-            else if (statement.kind === 222 /* IfStatement */) {
+            else if (statement.kind === 223 /* IfStatement */) {
                 var ifStatement = statement;
                 if (ifStatement.elseStatement) {
                     return isSufficientlyCoveredByReturnStatements(ifStatement.thenStatement) &&
@@ -72740,7 +75128,7 @@ var ts;
                 }
             }
             // A block is covered if it has a last statement which is covered.
-            else if (statement.kind === 218 /* Block */) {
+            else if (statement.kind === 219 /* Block */) {
                 var lastStatement = ts.lastOrUndefined(statement.statements);
                 if (lastStatement && isSufficientlyCoveredByReturnStatements(lastStatement)) {
                     return true;
@@ -72895,10 +75283,10 @@ var ts;
                 return false;
             }
             // `declarationName` is the name of the local declaration for the parameter.
-            var declarationName = parameter.name.kind === 72 /* Identifier */ ? ts.getMutableClone(parameter.name) : ts.createTempVariable(/*recordTempVariable*/ undefined);
+            var declarationName = parameter.name.kind === 73 /* Identifier */ ? ts.getMutableClone(parameter.name) : ts.createTempVariable(/*recordTempVariable*/ undefined);
             ts.setEmitFlags(declarationName, 48 /* NoSourceMap */);
             // `expressionName` is the name of the parameter used in expressions.
-            var expressionName = parameter.name.kind === 72 /* Identifier */ ? ts.getSynthesizedClone(parameter.name) : declarationName;
+            var expressionName = parameter.name.kind === 73 /* Identifier */ ? ts.getSynthesizedClone(parameter.name) : declarationName;
             var restIndex = node.parameters.length - 1;
             var temp = ts.createLoopVariable();
             // var param = [];
@@ -72922,7 +75310,7 @@ var ts;
             ts.setEmitFlags(forStatement, 1048576 /* CustomPrologue */);
             ts.startOnNewLine(forStatement);
             prologueStatements.push(forStatement);
-            if (parameter.name.kind !== 72 /* Identifier */) {
+            if (parameter.name.kind !== 73 /* Identifier */) {
                 // do the actual destructuring of the rest parameter if necessary
                 prologueStatements.push(ts.setEmitFlags(ts.setTextRange(ts.createVariableStatement(
                 /*modifiers*/ undefined, ts.createVariableDeclarationList(ts.flattenDestructuringBinding(parameter, visitor, context, 0 /* All */, expressionName))), parameter), 1048576 /* CustomPrologue */));
@@ -72938,7 +75326,7 @@ var ts;
          * @param node A node.
          */
         function insertCaptureThisForNodeIfNeeded(statements, node) {
-            if (hierarchyFacts & 16384 /* CapturedLexicalThis */ && node.kind !== 197 /* ArrowFunction */) {
+            if (hierarchyFacts & 32768 /* CapturedLexicalThis */ && node.kind !== 198 /* ArrowFunction */) {
                 insertCaptureThisForNode(statements, node, ts.createThis());
                 return true;
             }
@@ -72956,28 +75344,28 @@ var ts;
             ts.insertStatementAfterCustomPrologue(statements, captureThisStatement);
         }
         function insertCaptureNewTargetIfNeeded(statements, node, copyOnWrite) {
-            if (hierarchyFacts & 8192 /* NewTarget */) {
+            if (hierarchyFacts & 16384 /* NewTarget */) {
                 var newTarget = void 0;
                 switch (node.kind) {
-                    case 197 /* ArrowFunction */:
+                    case 198 /* ArrowFunction */:
                         return statements;
-                    case 156 /* MethodDeclaration */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
+                    case 157 /* MethodDeclaration */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
                         // Methods and accessors cannot be constructors, so 'new.target' will
                         // always return 'undefined'.
                         newTarget = ts.createVoidZero();
                         break;
-                    case 157 /* Constructor */:
+                    case 158 /* Constructor */:
                         // Class constructors can only be called with `new`, so `this.constructor`
                         // should be relatively safe to use.
                         newTarget = ts.createPropertyAccess(ts.setEmitFlags(ts.createThis(), 4 /* NoSubstitution */), "constructor");
                         break;
-                    case 239 /* FunctionDeclaration */:
-                    case 196 /* FunctionExpression */:
+                    case 240 /* FunctionDeclaration */:
+                    case 197 /* FunctionExpression */:
                         // Functions can be called or constructed, and may have a `this` due to
                         // being a member or when calling an imported function via `other_1.f()`.
-                        newTarget = ts.createConditional(ts.createLogicalAnd(ts.setEmitFlags(ts.createThis(), 4 /* NoSubstitution */), ts.createBinary(ts.setEmitFlags(ts.createThis(), 4 /* NoSubstitution */), 94 /* InstanceOfKeyword */, ts.getLocalName(node))), ts.createPropertyAccess(ts.setEmitFlags(ts.createThis(), 4 /* NoSubstitution */), "constructor"), ts.createVoidZero());
+                        newTarget = ts.createConditional(ts.createLogicalAnd(ts.setEmitFlags(ts.createThis(), 4 /* NoSubstitution */), ts.createBinary(ts.setEmitFlags(ts.createThis(), 4 /* NoSubstitution */), 95 /* InstanceOfKeyword */, ts.getLocalName(node))), ts.createPropertyAccess(ts.setEmitFlags(ts.createThis(), 4 /* NoSubstitution */), "constructor"), ts.createVoidZero());
                         break;
                     default:
                         return ts.Debug.failBadSyntaxKind(node);
@@ -73006,24 +75394,24 @@ var ts;
             for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                 var member = _a[_i];
                 switch (member.kind) {
-                    case 217 /* SemicolonClassElement */:
+                    case 218 /* SemicolonClassElement */:
                         statements.push(transformSemicolonClassElementToStatement(member));
                         break;
-                    case 156 /* MethodDeclaration */:
+                    case 157 /* MethodDeclaration */:
                         statements.push(transformClassMethodDeclarationToStatement(getClassMemberPrefix(node, member), member, node));
                         break;
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
                         var accessors = ts.getAllAccessorDeclarations(node.members, member);
                         if (member === accessors.firstAccessor) {
                             statements.push(transformAccessorsToStatement(getClassMemberPrefix(node, member), accessors, node));
                         }
                         break;
-                    case 157 /* Constructor */:
+                    case 158 /* Constructor */:
                         // Constructors are handled in visitClassExpression/visitClassDeclaration
                         break;
                     default:
-                        ts.Debug.failBadSyntaxKind(node);
+                        ts.Debug.failBadSyntaxKind(member, currentSourceFile && currentSourceFile.fileName);
                         break;
                 }
             }
@@ -73086,7 +75474,7 @@ var ts;
             // arguments are both mapped contiguously to the accessor name.
             var target = ts.getMutableClone(receiver);
             ts.setEmitFlags(target, 1536 /* NoComments */ | 32 /* NoTrailingSourceMap */);
-            ts.setSourceMapRange(target, firstAccessor.name); // TODO: GH#18217
+            ts.setSourceMapRange(target, firstAccessor.name);
             var propertyName = ts.createExpressionForPropertyName(ts.visitNode(firstAccessor.name, visitor, ts.isPropertyName));
             ts.setEmitFlags(propertyName, 1536 /* NoComments */ | 16 /* NoLeadingSourceMap */);
             ts.setSourceMapRange(propertyName, firstAccessor.name);
@@ -73126,11 +75514,11 @@ var ts;
          */
         function visitArrowFunction(node) {
             if (node.transformFlags & 2048 /* ContainsLexicalThis */) {
-                hierarchyFacts |= 16384 /* CapturedLexicalThis */;
+                hierarchyFacts |= 32768 /* CapturedLexicalThis */;
             }
             var savedConvertedLoopState = convertedLoopState;
             convertedLoopState = undefined;
-            var ancestorFacts = enterSubtree(8064 /* ArrowFunctionExcludes */, 66 /* ArrowFunctionIncludes */);
+            var ancestorFacts = enterSubtree(15232 /* ArrowFunctionExcludes */, 66 /* ArrowFunctionIncludes */);
             var func = ts.createFunctionExpression(
             /*modifiers*/ undefined, 
             /*asteriskToken*/ undefined, 
@@ -73140,7 +75528,7 @@ var ts;
             ts.setTextRange(func, node);
             ts.setOriginalNode(func, node);
             ts.setEmitFlags(func, 8 /* CapturesThis */);
-            if (hierarchyFacts & 16384 /* CapturedLexicalThis */) {
+            if (hierarchyFacts & 32768 /* CapturedLexicalThis */) {
                 enableSubstitutionsForCapturedThis();
             }
             // If an arrow function contains
@@ -73155,16 +75543,16 @@ var ts;
          */
         function visitFunctionExpression(node) {
             var ancestorFacts = ts.getEmitFlags(node) & 262144 /* AsyncFunctionBody */
-                ? enterSubtree(8086 /* AsyncFunctionBodyExcludes */, 69 /* AsyncFunctionBodyIncludes */)
-                : enterSubtree(8094 /* FunctionExcludes */, 65 /* FunctionIncludes */);
+                ? enterSubtree(16278 /* AsyncFunctionBodyExcludes */, 69 /* AsyncFunctionBodyIncludes */)
+                : enterSubtree(16286 /* FunctionExcludes */, 65 /* FunctionIncludes */);
             var savedConvertedLoopState = convertedLoopState;
             convertedLoopState = undefined;
             var parameters = ts.visitParameterList(node.parameters, visitor, context);
             var body = transformFunctionBody(node);
-            var name = hierarchyFacts & 8192 /* NewTarget */
+            var name = hierarchyFacts & 16384 /* NewTarget */
                 ? ts.getLocalName(node)
                 : node.name;
-            exitSubtree(ancestorFacts, 24576 /* FunctionSubtreeExcludes */, 0 /* None */);
+            exitSubtree(ancestorFacts, 49152 /* FunctionSubtreeExcludes */, 0 /* None */);
             convertedLoopState = savedConvertedLoopState;
             return ts.updateFunctionExpression(node, 
             /*modifiers*/ undefined, node.asteriskToken, name, 
@@ -73179,13 +75567,13 @@ var ts;
         function visitFunctionDeclaration(node) {
             var savedConvertedLoopState = convertedLoopState;
             convertedLoopState = undefined;
-            var ancestorFacts = enterSubtree(8094 /* FunctionExcludes */, 65 /* FunctionIncludes */);
+            var ancestorFacts = enterSubtree(16286 /* FunctionExcludes */, 65 /* FunctionIncludes */);
             var parameters = ts.visitParameterList(node.parameters, visitor, context);
             var body = transformFunctionBody(node);
-            var name = hierarchyFacts & 8192 /* NewTarget */
+            var name = hierarchyFacts & 16384 /* NewTarget */
                 ? ts.getLocalName(node)
                 : node.name;
-            exitSubtree(ancestorFacts, 24576 /* FunctionSubtreeExcludes */, 0 /* None */);
+            exitSubtree(ancestorFacts, 49152 /* FunctionSubtreeExcludes */, 0 /* None */);
             convertedLoopState = savedConvertedLoopState;
             return ts.updateFunctionDeclaration(node, 
             /*decorators*/ undefined, ts.visitNodes(node.modifiers, visitor, ts.isModifier), node.asteriskToken, name, 
@@ -73203,14 +75591,14 @@ var ts;
             var savedConvertedLoopState = convertedLoopState;
             convertedLoopState = undefined;
             var ancestorFacts = container && ts.isClassLike(container) && !ts.hasModifier(node, 32 /* Static */)
-                ? enterSubtree(8094 /* FunctionExcludes */, 65 /* FunctionIncludes */ | 8 /* NonStaticClassElement */)
-                : enterSubtree(8094 /* FunctionExcludes */, 65 /* FunctionIncludes */);
+                ? enterSubtree(16286 /* FunctionExcludes */, 65 /* FunctionIncludes */ | 8 /* NonStaticClassElement */)
+                : enterSubtree(16286 /* FunctionExcludes */, 65 /* FunctionIncludes */);
             var parameters = ts.visitParameterList(node.parameters, visitor, context);
             var body = transformFunctionBody(node);
-            if (hierarchyFacts & 8192 /* NewTarget */ && !name && (node.kind === 239 /* FunctionDeclaration */ || node.kind === 196 /* FunctionExpression */)) {
+            if (hierarchyFacts & 16384 /* NewTarget */ && !name && (node.kind === 240 /* FunctionDeclaration */ || node.kind === 197 /* FunctionExpression */)) {
                 name = ts.getGeneratedNameForNode(node);
             }
-            exitSubtree(ancestorFacts, 24576 /* FunctionSubtreeExcludes */, 0 /* None */);
+            exitSubtree(ancestorFacts, 49152 /* FunctionSubtreeExcludes */, 0 /* None */);
             convertedLoopState = savedConvertedLoopState;
             return ts.setOriginalNode(ts.setTextRange(ts.createFunctionExpression(
             /*modifiers*/ undefined, node.asteriskToken, name, 
@@ -73251,7 +75639,7 @@ var ts;
                 }
             }
             else {
-                ts.Debug.assert(node.kind === 197 /* ArrowFunction */);
+                ts.Debug.assert(node.kind === 198 /* ArrowFunction */);
                 // To align with the old emitter, we use a synthetic end position on the location
                 // for the statement list we synthesize when we down-level an arrow function with
                 // an expression function body. This prevents both comments and source maps from
@@ -73305,8 +75693,8 @@ var ts;
                 return ts.visitEachChild(node, visitor, context);
             }
             var ancestorFacts = hierarchyFacts & 256 /* IterationStatement */
-                ? enterSubtree(4032 /* IterationStatementBlockExcludes */, 512 /* IterationStatementBlockIncludes */)
-                : enterSubtree(3904 /* BlockExcludes */, 128 /* BlockIncludes */);
+                ? enterSubtree(7104 /* IterationStatementBlockExcludes */, 512 /* IterationStatementBlockIncludes */)
+                : enterSubtree(6976 /* BlockExcludes */, 128 /* BlockIncludes */);
             var updated = ts.visitEachChild(node, visitor, context);
             exitSubtree(ancestorFacts, 0 /* None */, 0 /* None */);
             return updated;
@@ -73319,9 +75707,9 @@ var ts;
         function visitExpressionStatement(node) {
             // If we are here it is most likely because our expression is a destructuring assignment.
             switch (node.expression.kind) {
-                case 195 /* ParenthesizedExpression */:
+                case 196 /* ParenthesizedExpression */:
                     return ts.updateExpressionStatement(node, visitParenthesizedExpression(node.expression, /*needsDestructuringValue*/ false));
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return ts.updateExpressionStatement(node, visitBinaryExpression(node.expression, /*needsDestructuringValue*/ false));
             }
             return ts.visitEachChild(node, visitor, context);
@@ -73340,9 +75728,9 @@ var ts;
                 // expression. If we are in a state where we do not need the destructuring value,
                 // we pass that information along to the children that care about it.
                 switch (node.expression.kind) {
-                    case 195 /* ParenthesizedExpression */:
+                    case 196 /* ParenthesizedExpression */:
                         return ts.updateParen(node, visitParenthesizedExpression(node.expression, /*needsDestructuringValue*/ false));
-                    case 204 /* BinaryExpression */:
+                    case 205 /* BinaryExpression */:
                         return ts.updateParen(node, visitBinaryExpression(node.expression, /*needsDestructuringValue*/ false));
                 }
             }
@@ -73377,7 +75765,7 @@ var ts;
                             assignment = ts.flattenDestructuringAssignment(decl, visitor, context, 0 /* All */);
                         }
                         else {
-                            assignment = ts.createBinary(decl.name, 59 /* EqualsToken */, ts.visitNode(decl.initializer, visitor, ts.isExpression));
+                            assignment = ts.createBinary(decl.name, 60 /* EqualsToken */, ts.visitNode(decl.initializer, visitor, ts.isExpression));
                             ts.setTextRange(assignment, decl);
                         }
                         assignments = ts.append(assignments, assignment);
@@ -73489,11 +75877,11 @@ var ts;
                     && isDeclaredInLoop
                     && (hierarchyFacts & 512 /* IterationStatementBlock */) !== 0);
             var emitExplicitInitializer = !emittedAsTopLevel
-                && (hierarchyFacts & 2048 /* ForInOrForOfStatement */) === 0
+                && (hierarchyFacts & 4096 /* ForInOrForOfStatement */) === 0
                 && (!resolver.isDeclarationWithCollidingName(node)
                     || (isDeclaredInLoop
                         && !isCapturedInFunction
-                        && (hierarchyFacts & (1024 /* ForStatement */ | 2048 /* ForInOrForOfStatement */)) === 0));
+                        && (hierarchyFacts & (2048 /* ForStatement */ | 4096 /* ForInOrForOfStatement */)) === 0));
             return emitExplicitInitializer;
         }
         /**
@@ -73510,9 +75898,9 @@ var ts;
                 return visitVariableDeclaration(node);
             }
             if (!node.initializer && shouldEmitExplicitInitializerForLetDeclaration(node)) {
-                var clone_2 = ts.getMutableClone(node);
-                clone_2.initializer = ts.createVoidZero();
-                return clone_2;
+                var clone_3 = ts.getMutableClone(node);
+                clone_3.initializer = ts.createVoidZero();
+                return clone_3;
             }
             return ts.visitEachChild(node, visitor, context);
         }
@@ -73551,34 +75939,34 @@ var ts;
         }
         function visitIterationStatement(node, outermostLabeledStatement) {
             switch (node.kind) {
-                case 223 /* DoStatement */:
-                case 224 /* WhileStatement */:
+                case 224 /* DoStatement */:
+                case 225 /* WhileStatement */:
                     return visitDoOrWhileStatement(node, outermostLabeledStatement);
-                case 225 /* ForStatement */:
+                case 226 /* ForStatement */:
                     return visitForStatement(node, outermostLabeledStatement);
-                case 226 /* ForInStatement */:
+                case 227 /* ForInStatement */:
                     return visitForInStatement(node, outermostLabeledStatement);
-                case 227 /* ForOfStatement */:
+                case 228 /* ForOfStatement */:
                     return visitForOfStatement(node, outermostLabeledStatement);
             }
         }
         function visitIterationStatementWithFacts(excludeFacts, includeFacts, node, outermostLabeledStatement, convert) {
             var ancestorFacts = enterSubtree(excludeFacts, includeFacts);
-            var updated = convertIterationStatementBodyIfNecessary(node, outermostLabeledStatement, convert);
+            var updated = convertIterationStatementBodyIfNecessary(node, outermostLabeledStatement, ancestorFacts, convert);
             exitSubtree(ancestorFacts, 0 /* None */, 0 /* None */);
             return updated;
         }
         function visitDoOrWhileStatement(node, outermostLabeledStatement) {
-            return visitIterationStatementWithFacts(0 /* DoOrWhileStatementExcludes */, 256 /* DoOrWhileStatementIncludes */, node, outermostLabeledStatement);
+            return visitIterationStatementWithFacts(0 /* DoOrWhileStatementExcludes */, 1280 /* DoOrWhileStatementIncludes */, node, outermostLabeledStatement);
         }
         function visitForStatement(node, outermostLabeledStatement) {
-            return visitIterationStatementWithFacts(3008 /* ForStatementExcludes */, 1280 /* ForStatementIncludes */, node, outermostLabeledStatement);
+            return visitIterationStatementWithFacts(5056 /* ForStatementExcludes */, 3328 /* ForStatementIncludes */, node, outermostLabeledStatement);
         }
         function visitForInStatement(node, outermostLabeledStatement) {
-            return visitIterationStatementWithFacts(1984 /* ForInOrForOfStatementExcludes */, 2304 /* ForInOrForOfStatementIncludes */, node, outermostLabeledStatement);
+            return visitIterationStatementWithFacts(3008 /* ForInOrForOfStatementExcludes */, 5376 /* ForInOrForOfStatementIncludes */, node, outermostLabeledStatement);
         }
         function visitForOfStatement(node, outermostLabeledStatement) {
-            return visitIterationStatementWithFacts(1984 /* ForInOrForOfStatementExcludes */, 2304 /* ForInOrForOfStatementIncludes */, node, outermostLabeledStatement, compilerOptions.downlevelIteration ? convertForOfStatementForIterable : convertForOfStatementForArray);
+            return visitIterationStatementWithFacts(3008 /* ForInOrForOfStatementExcludes */, 5376 /* ForInOrForOfStatementIncludes */, node, outermostLabeledStatement, compilerOptions.downlevelIteration ? convertForOfStatementForIterable : convertForOfStatementForArray);
         }
         function convertForOfStatementHead(node, boundValue, convertedLoopBodyStatements) {
             var statements = [];
@@ -73686,7 +76074,7 @@ var ts;
             ts.setTextRange(forStatement, node);
             return ts.restoreEnclosingLabel(forStatement, outermostLabeledStatement, convertedLoopState && resetLabel);
         }
-        function convertForOfStatementForIterable(node, outermostLabeledStatement, convertedLoopBodyStatements) {
+        function convertForOfStatementForIterable(node, outermostLabeledStatement, convertedLoopBodyStatements, ancestorFacts) {
             var expression = ts.visitNode(node.expression, visitor, ts.isExpression);
             var iterator = ts.isIdentifier(expression) ? ts.getGeneratedNameForNode(expression) : ts.createTempVariable(/*recordTempVariable*/ undefined);
             var result = ts.isIdentifier(expression) ? ts.getGeneratedNameForNode(iterator) : ts.createTempVariable(/*recordTempVariable*/ undefined);
@@ -73697,9 +76085,13 @@ var ts;
             var next = ts.createCall(ts.createPropertyAccess(iterator, "next"), /*typeArguments*/ undefined, []);
             hoistVariableDeclaration(errorRecord);
             hoistVariableDeclaration(returnMethod);
+            // if we are enclosed in an outer loop ensure we reset 'errorRecord' per each iteration
+            var initializer = ancestorFacts & 1024 /* IterationContainer */
+                ? ts.inlineExpressions([ts.createAssignment(errorRecord, ts.createVoidZero()), values])
+                : values;
             var forStatement = ts.setEmitFlags(ts.setTextRange(ts.createFor(
             /*initializer*/ ts.setEmitFlags(ts.setTextRange(ts.createVariableDeclarationList([
-                ts.setTextRange(ts.createVariableDeclaration(iterator, /*type*/ undefined, values), node.expression),
+                ts.setTextRange(ts.createVariableDeclaration(iterator, /*type*/ undefined, initializer), node.expression),
                 ts.createVariableDeclaration(result, /*type*/ undefined, next)
             ]), node.expression), 2097152 /* NoHoisting */), 
             /*condition*/ ts.createLogicalNot(ts.createPropertyAccess(result, "done")), 
@@ -73742,7 +76134,7 @@ var ts;
                     && i < numInitialPropertiesWithoutYield) {
                     numInitialPropertiesWithoutYield = i;
                 }
-                if (property.name.kind === 149 /* ComputedPropertyName */) {
+                if (property.name.kind === 150 /* ComputedPropertyName */) {
                     numInitialProperties = i;
                     break;
                 }
@@ -73797,7 +76189,7 @@ var ts;
             }
             visit(node.name);
             function visit(node) {
-                if (node.kind === 72 /* Identifier */) {
+                if (node.kind === 73 /* Identifier */) {
                     state.hoistedLocalVariables.push(node);
                 }
                 else {
@@ -73810,7 +76202,7 @@ var ts;
                 }
             }
         }
-        function convertIterationStatementBodyIfNecessary(node, outermostLabeledStatement, convert) {
+        function convertIterationStatementBodyIfNecessary(node, outermostLabeledStatement, ancestorFacts, convert) {
             if (!shouldConvertIterationStatement(node)) {
                 var saveAllowedNonLabeledJumps = void 0;
                 if (convertedLoopState) {
@@ -73820,7 +76212,7 @@ var ts;
                     convertedLoopState.allowedNonLabeledJumps = 2 /* Break */ | 4 /* Continue */;
                 }
                 var result = convert
-                    ? convert(node, outermostLabeledStatement, /*convertedLoopBodyStatements*/ undefined)
+                    ? convert(node, outermostLabeledStatement, /*convertedLoopBodyStatements*/ undefined, ancestorFacts)
                     : ts.restoreEnclosingLabel(ts.visitEachChild(node, visitor, context), outermostLabeledStatement, convertedLoopState && resetLabel);
                 if (convertedLoopState) {
                     convertedLoopState.allowedNonLabeledJumps = saveAllowedNonLabeledJumps;
@@ -73845,29 +76237,29 @@ var ts;
             var loop;
             if (bodyFunction) {
                 if (convert) {
-                    loop = convert(node, outermostLabeledStatement, bodyFunction.part);
+                    loop = convert(node, outermostLabeledStatement, bodyFunction.part, ancestorFacts);
                 }
                 else {
-                    var clone_3 = convertIterationStatementCore(node, initializerFunction, ts.createBlock(bodyFunction.part, /*multiLine*/ true));
-                    ts.aggregateTransformFlags(clone_3);
-                    loop = ts.restoreEnclosingLabel(clone_3, outermostLabeledStatement, convertedLoopState && resetLabel);
+                    var clone_4 = convertIterationStatementCore(node, initializerFunction, ts.createBlock(bodyFunction.part, /*multiLine*/ true));
+                    ts.aggregateTransformFlags(clone_4);
+                    loop = ts.restoreEnclosingLabel(clone_4, outermostLabeledStatement, convertedLoopState && resetLabel);
                 }
             }
             else {
-                var clone_4 = convertIterationStatementCore(node, initializerFunction, ts.visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock));
-                ts.aggregateTransformFlags(clone_4);
-                loop = ts.restoreEnclosingLabel(clone_4, outermostLabeledStatement, convertedLoopState && resetLabel);
+                var clone_5 = convertIterationStatementCore(node, initializerFunction, ts.visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock));
+                ts.aggregateTransformFlags(clone_5);
+                loop = ts.restoreEnclosingLabel(clone_5, outermostLabeledStatement, convertedLoopState && resetLabel);
             }
             statements.push(loop);
             return statements;
         }
         function convertIterationStatementCore(node, initializerFunction, convertedLoopBody) {
             switch (node.kind) {
-                case 225 /* ForStatement */: return convertForStatement(node, initializerFunction, convertedLoopBody);
-                case 226 /* ForInStatement */: return convertForInStatement(node, convertedLoopBody);
-                case 227 /* ForOfStatement */: return convertForOfStatement(node, convertedLoopBody);
-                case 223 /* DoStatement */: return convertDoStatement(node, convertedLoopBody);
-                case 224 /* WhileStatement */: return convertWhileStatement(node, convertedLoopBody);
+                case 226 /* ForStatement */: return convertForStatement(node, initializerFunction, convertedLoopBody);
+                case 227 /* ForInStatement */: return convertForInStatement(node, convertedLoopBody);
+                case 228 /* ForOfStatement */: return convertForOfStatement(node, convertedLoopBody);
+                case 224 /* DoStatement */: return convertDoStatement(node, convertedLoopBody);
+                case 225 /* WhileStatement */: return convertWhileStatement(node, convertedLoopBody);
                 default: return ts.Debug.failBadSyntaxKind(node, "IterationStatement expected");
             }
         }
@@ -73892,11 +76284,11 @@ var ts;
         function createConvertedLoopState(node) {
             var loopInitializer;
             switch (node.kind) {
-                case 225 /* ForStatement */:
-                case 226 /* ForInStatement */:
-                case 227 /* ForOfStatement */:
+                case 226 /* ForStatement */:
+                case 227 /* ForInStatement */:
+                case 228 /* ForOfStatement */:
                     var initializer = node.initializer;
-                    if (initializer && initializer.kind === 238 /* VariableDeclarationList */) {
+                    if (initializer && initializer.kind === 239 /* VariableDeclarationList */) {
                         loopInitializer = initializer;
                     }
                     break;
@@ -74158,7 +76550,7 @@ var ts;
         function copyOutParameter(outParam, copyDirection) {
             var source = copyDirection === 0 /* ToOriginal */ ? outParam.outParamName : outParam.originalName;
             var target = copyDirection === 0 /* ToOriginal */ ? outParam.originalName : outParam.outParamName;
-            return ts.createBinary(target, 59 /* EqualsToken */, source);
+            return ts.createBinary(target, 60 /* EqualsToken */, source);
         }
         function copyOutParameters(outParams, partFlags, copyDirection, statements) {
             for (var _i = 0, outParams_1 = outParams; _i < outParams_1.length; _i++) {
@@ -74295,20 +76687,20 @@ var ts;
             for (var i = start; i < numProperties; i++) {
                 var property = properties[i];
                 switch (property.kind) {
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
                         var accessors = ts.getAllAccessorDeclarations(node.properties, property);
                         if (property === accessors.firstAccessor) {
                             expressions.push(transformAccessorsToExpression(receiver, accessors, node, !!node.multiLine));
                         }
                         break;
-                    case 156 /* MethodDeclaration */:
+                    case 157 /* MethodDeclaration */:
                         expressions.push(transformObjectLiteralMethodDeclarationToExpression(property, receiver, node, node.multiLine));
                         break;
-                    case 275 /* PropertyAssignment */:
+                    case 276 /* PropertyAssignment */:
                         expressions.push(transformPropertyAssignmentToExpression(property, receiver, node.multiLine));
                         break;
-                    case 276 /* ShorthandPropertyAssignment */:
+                    case 277 /* ShorthandPropertyAssignment */:
                         expressions.push(transformShorthandPropertyAssignmentToExpression(property, receiver, node.multiLine));
                         break;
                     default:
@@ -74363,7 +76755,7 @@ var ts;
             return expression;
         }
         function visitCatchClause(node) {
-            var ancestorFacts = enterSubtree(4032 /* BlockScopeExcludes */, 0 /* BlockScopeIncludes */);
+            var ancestorFacts = enterSubtree(7104 /* BlockScopeExcludes */, 0 /* BlockScopeIncludes */);
             var updated;
             ts.Debug.assert(!!node.variableDeclaration, "Catch clause variable should always be present when downleveling ES2015.");
             if (ts.isBindingPattern(node.variableDeclaration.name)) {
@@ -74411,17 +76803,17 @@ var ts;
             ts.Debug.assert(!ts.isComputedPropertyName(node.name));
             var savedConvertedLoopState = convertedLoopState;
             convertedLoopState = undefined;
-            var ancestorFacts = enterSubtree(8094 /* FunctionExcludes */, 65 /* FunctionIncludes */);
+            var ancestorFacts = enterSubtree(16286 /* FunctionExcludes */, 65 /* FunctionIncludes */);
             var updated;
             var parameters = ts.visitParameterList(node.parameters, visitor, context);
             var body = transformFunctionBody(node);
-            if (node.kind === 158 /* GetAccessor */) {
+            if (node.kind === 159 /* GetAccessor */) {
                 updated = ts.updateGetAccessor(node, node.decorators, node.modifiers, node.name, parameters, node.type, body);
             }
             else {
                 updated = ts.updateSetAccessor(node, node.decorators, node.modifiers, node.name, parameters, body);
             }
-            exitSubtree(ancestorFacts, 24576 /* FunctionSubtreeExcludes */, 0 /* None */);
+            exitSubtree(ancestorFacts, 49152 /* FunctionSubtreeExcludes */, 0 /* None */);
             convertedLoopState = savedConvertedLoopState;
             return updated;
         }
@@ -74468,7 +76860,7 @@ var ts;
                 return visitTypeScriptClassWrapper(node);
             }
             var expression = ts.skipOuterExpressions(node.expression);
-            if (expression.kind === 98 /* SuperKeyword */ ||
+            if (expression.kind === 99 /* SuperKeyword */ ||
                 ts.isSuperProperty(expression) ||
                 ts.some(node.arguments, ts.isSpreadElement)) {
                 return visitCallExpressionWithPotentialCapturedThisAssignment(node, /*assignToCapturedThis*/ true);
@@ -74592,10 +76984,10 @@ var ts;
             // We are here either because SuperKeyword was used somewhere in the expression, or
             // because we contain a SpreadElementExpression.
             if (node.transformFlags & 4096 /* ContainsRestOrSpread */ ||
-                node.expression.kind === 98 /* SuperKeyword */ ||
+                node.expression.kind === 99 /* SuperKeyword */ ||
                 ts.isSuperProperty(ts.skipOuterExpressions(node.expression))) {
                 var _a = ts.createCallBinding(node.expression, hoistVariableDeclaration), target = _a.target, thisArg = _a.thisArg;
-                if (node.expression.kind === 98 /* SuperKeyword */) {
+                if (node.expression.kind === 99 /* SuperKeyword */) {
                     ts.setEmitFlags(thisArg, 4 /* NoSubstitution */);
                 }
                 var resultingCall = void 0;
@@ -74613,7 +77005,7 @@ var ts;
                     //      _super.apply(this, a.concat([b]))
                     //      _super.m.apply(this, a.concat([b]))
                     //      _super.prototype.m.apply(this, a.concat([b]))
-                    resultingCall = ts.createFunctionApply(ts.visitNode(target, callExpressionVisitor, ts.isExpression), node.expression.kind === 98 /* SuperKeyword */ ? thisArg : ts.visitNode(thisArg, visitor, ts.isExpression), transformAndSpreadElements(node.arguments, /*needsUniqueCopy*/ false, /*multiLine*/ false, /*hasTrailingComma*/ false));
+                    resultingCall = ts.createFunctionApply(ts.visitNode(target, callExpressionVisitor, ts.isExpression), node.expression.kind === 99 /* SuperKeyword */ ? thisArg : ts.visitNode(thisArg, visitor, ts.isExpression), transformAndSpreadElements(node.arguments, /*needsUniqueCopy*/ false, /*multiLine*/ false, /*hasTrailingComma*/ false));
                 }
                 else {
                     // [source]
@@ -74625,10 +77017,10 @@ var ts;
                     //      _super.call(this, a)
                     //      _super.m.call(this, a)
                     //      _super.prototype.m.call(this, a)
-                    resultingCall = ts.createFunctionCall(ts.visitNode(target, callExpressionVisitor, ts.isExpression), node.expression.kind === 98 /* SuperKeyword */ ? thisArg : ts.visitNode(thisArg, visitor, ts.isExpression), ts.visitNodes(node.arguments, visitor, ts.isExpression), 
+                    resultingCall = ts.createFunctionCall(ts.visitNode(target, callExpressionVisitor, ts.isExpression), node.expression.kind === 99 /* SuperKeyword */ ? thisArg : ts.visitNode(thisArg, visitor, ts.isExpression), ts.visitNodes(node.arguments, visitor, ts.isExpression), 
                     /*location*/ node);
                 }
-                if (node.expression.kind === 98 /* SuperKeyword */) {
+                if (node.expression.kind === 99 /* SuperKeyword */) {
                     var initializer = ts.createLogicalOr(resultingCall, createActualThis());
                     resultingCall = assignToCapturedThis
                         ? ts.createAssignment(ts.createFileLevelUniqueName("_this"), initializer)
@@ -74668,8 +77060,11 @@ var ts;
             // [source]
             //      [a, ...b, c]
             //
+            // [output (downlevelIteration)]
+            //      __spread([a], b, [c])
+            //
             // [output]
-            //      [a].concat(b, [c])
+            //      __spreadArrays([a], b, [c])
             // Map spans of spread expressions into their expressions and spans of other
             // expressions into an array literal.
             var numElements = elements.length;
@@ -74679,10 +77074,7 @@ var ts;
             if (compilerOptions.downlevelIteration) {
                 if (segments.length === 1) {
                     var firstSegment = segments[0];
-                    if (ts.isCallExpression(firstSegment)
-                        && ts.isIdentifier(firstSegment.expression)
-                        && (ts.getEmitFlags(firstSegment.expression) & 4096 /* HelperName */)
-                        && firstSegment.expression.escapedText === "___spread") {
+                    if (isCallToHelper(firstSegment, "___spread")) {
                         return segments[0];
                     }
                 }
@@ -74690,15 +77082,28 @@ var ts;
             }
             else {
                 if (segments.length === 1) {
-                    var firstElement = elements[0];
-                    return needsUniqueCopy && ts.isSpreadElement(firstElement) && firstElement.expression.kind !== 187 /* ArrayLiteralExpression */
-                        ? ts.createArraySlice(segments[0])
-                        : segments[0];
+                    var firstSegment = segments[0];
+                    if (!needsUniqueCopy
+                        || isPackedArrayLiteral(firstSegment)
+                        || isCallToHelper(firstSegment, "___spreadArrays")) {
+                        return segments[0];
+                    }
                 }
-                // Rewrite using the pattern <segment0>.concat(<segment1>, <segment2>, ...)
-                return ts.createArrayConcat(segments.shift(), segments);
+                return ts.createSpreadArraysHelper(context, segments);
             }
         }
+        function isPackedElement(node) {
+            return !ts.isOmittedExpression(node);
+        }
+        function isPackedArrayLiteral(node) {
+            return ts.isArrayLiteralExpression(node) && ts.every(node.elements, isPackedElement);
+        }
+        function isCallToHelper(firstSegment, helperName) {
+            return ts.isCallExpression(firstSegment)
+                && ts.isIdentifier(firstSegment.expression)
+                && (ts.getEmitFlags(firstSegment.expression) & 4096 /* HelperName */)
+                && firstSegment.expression.escapedText === helperName;
+        }
         function partitionSpread(node) {
             return ts.isSpreadElement(node)
                 ? visitSpanOfSpreads
@@ -74906,8 +77311,8 @@ var ts;
                 : ts.createFileLevelUniqueName("_super");
         }
         function visitMetaProperty(node) {
-            if (node.keywordToken === 95 /* NewKeyword */ && node.name.escapedText === "target") {
-                hierarchyFacts |= 8192 /* NewTarget */;
+            if (node.keywordToken === 96 /* NewKeyword */ && node.name.escapedText === "target") {
+                hierarchyFacts |= 16384 /* NewTarget */;
                 return ts.createFileLevelUniqueName("_newTarget");
             }
             return node;
@@ -74922,7 +77327,7 @@ var ts;
         function onEmitNode(hint, node, emitCallback) {
             if (enabledSubstitutions & 1 /* CapturedThis */ && ts.isFunctionLike(node)) {
                 // If we are tracking a captured `this`, keep track of the enclosing function.
-                var ancestorFacts = enterSubtree(8094 /* FunctionExcludes */, ts.getEmitFlags(node) & 8 /* CapturesThis */
+                var ancestorFacts = enterSubtree(16286 /* FunctionExcludes */, ts.getEmitFlags(node) & 8 /* CapturesThis */
                     ? 65 /* FunctionIncludes */ | 16 /* CapturesThis */
                     : 65 /* FunctionIncludes */);
                 previousOnEmitNode(hint, node, emitCallback);
@@ -74938,7 +77343,7 @@ var ts;
         function enableSubstitutionsForBlockScopedBindings() {
             if ((enabledSubstitutions & 2 /* BlockScopedBindings */) === 0) {
                 enabledSubstitutions |= 2 /* BlockScopedBindings */;
-                context.enableSubstitution(72 /* Identifier */);
+                context.enableSubstitution(73 /* Identifier */);
             }
         }
         /**
@@ -74948,14 +77353,14 @@ var ts;
         function enableSubstitutionsForCapturedThis() {
             if ((enabledSubstitutions & 1 /* CapturedThis */) === 0) {
                 enabledSubstitutions |= 1 /* CapturedThis */;
-                context.enableSubstitution(100 /* ThisKeyword */);
-                context.enableEmitNotification(157 /* Constructor */);
-                context.enableEmitNotification(156 /* MethodDeclaration */);
-                context.enableEmitNotification(158 /* GetAccessor */);
-                context.enableEmitNotification(159 /* SetAccessor */);
-                context.enableEmitNotification(197 /* ArrowFunction */);
-                context.enableEmitNotification(196 /* FunctionExpression */);
-                context.enableEmitNotification(239 /* FunctionDeclaration */);
+                context.enableSubstitution(101 /* ThisKeyword */);
+                context.enableEmitNotification(158 /* Constructor */);
+                context.enableEmitNotification(157 /* MethodDeclaration */);
+                context.enableEmitNotification(159 /* GetAccessor */);
+                context.enableEmitNotification(160 /* SetAccessor */);
+                context.enableEmitNotification(198 /* ArrowFunction */);
+                context.enableEmitNotification(197 /* FunctionExpression */);
+                context.enableEmitNotification(240 /* FunctionDeclaration */);
             }
         }
         /**
@@ -74996,10 +77401,10 @@ var ts;
          */
         function isNameOfDeclarationWithCollidingName(node) {
             switch (node.parent.kind) {
-                case 186 /* BindingElement */:
-                case 240 /* ClassDeclaration */:
-                case 243 /* EnumDeclaration */:
-                case 237 /* VariableDeclaration */:
+                case 187 /* BindingElement */:
+                case 241 /* ClassDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 238 /* VariableDeclaration */:
                     return node.parent.name === node
                         && resolver.isDeclarationWithCollidingName(node.parent);
             }
@@ -75012,9 +77417,9 @@ var ts;
          */
         function substituteExpression(node) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return substituteExpressionIdentifier(node);
-                case 100 /* ThisKeyword */:
+                case 101 /* ThisKeyword */:
                     return substituteThisKeyword(node);
             }
             return node;
@@ -75081,19 +77486,19 @@ var ts;
                 return false;
             }
             var statement = ts.firstOrUndefined(constructor.body.statements);
-            if (!statement || !ts.nodeIsSynthesized(statement) || statement.kind !== 221 /* ExpressionStatement */) {
+            if (!statement || !ts.nodeIsSynthesized(statement) || statement.kind !== 222 /* ExpressionStatement */) {
                 return false;
             }
             var statementExpression = statement.expression;
-            if (!ts.nodeIsSynthesized(statementExpression) || statementExpression.kind !== 191 /* CallExpression */) {
+            if (!ts.nodeIsSynthesized(statementExpression) || statementExpression.kind !== 192 /* CallExpression */) {
                 return false;
             }
             var callTarget = statementExpression.expression;
-            if (!ts.nodeIsSynthesized(callTarget) || callTarget.kind !== 98 /* SuperKeyword */) {
+            if (!ts.nodeIsSynthesized(callTarget) || callTarget.kind !== 99 /* SuperKeyword */) {
                 return false;
             }
             var callArgument = ts.singleOrUndefined(statementExpression.arguments);
-            if (!callArgument || !ts.nodeIsSynthesized(callArgument) || callArgument.kind !== 208 /* SpreadElement */) {
+            if (!callArgument || !ts.nodeIsSynthesized(callArgument) || callArgument.kind !== 209 /* SpreadElement */) {
                 return false;
             }
             var expression = callArgument.expression;
@@ -75146,15 +77551,15 @@ var ts;
         if (compilerOptions.jsx === 1 /* Preserve */ || compilerOptions.jsx === 3 /* ReactNative */) {
             previousOnEmitNode = context.onEmitNode;
             context.onEmitNode = onEmitNode;
-            context.enableEmitNotification(262 /* JsxOpeningElement */);
-            context.enableEmitNotification(263 /* JsxClosingElement */);
-            context.enableEmitNotification(261 /* JsxSelfClosingElement */);
+            context.enableEmitNotification(263 /* JsxOpeningElement */);
+            context.enableEmitNotification(264 /* JsxClosingElement */);
+            context.enableEmitNotification(262 /* JsxSelfClosingElement */);
             noSubstitution = [];
         }
         var previousOnSubstituteNode = context.onSubstituteNode;
         context.onSubstituteNode = onSubstituteNode;
-        context.enableSubstitution(189 /* PropertyAccessExpression */);
-        context.enableSubstitution(275 /* PropertyAssignment */);
+        context.enableSubstitution(190 /* PropertyAccessExpression */);
+        context.enableSubstitution(276 /* PropertyAssignment */);
         return ts.chainBundle(transformSourceFile);
         /**
          * Transforms an ES5 source file to ES3.
@@ -75173,9 +77578,9 @@ var ts;
          */
         function onEmitNode(hint, node, emitCallback) {
             switch (node.kind) {
-                case 262 /* JsxOpeningElement */:
-                case 263 /* JsxClosingElement */:
-                case 261 /* JsxSelfClosingElement */:
+                case 263 /* JsxOpeningElement */:
+                case 264 /* JsxClosingElement */:
+                case 262 /* JsxSelfClosingElement */:
                     var tagName = node.tagName;
                     noSubstitution[ts.getOriginalNodeId(tagName)] = true;
                     break;
@@ -75232,7 +77637,7 @@ var ts;
          */
         function trySubstituteReservedName(name) {
             var token = name.originalKeywordKind || (ts.nodeIsSynthesized(name) ? ts.stringToToken(ts.idText(name)) : undefined);
-            if (token !== undefined && token >= 73 /* FirstReservedWord */ && token <= 108 /* LastReservedWord */) {
+            if (token !== undefined && token >= 74 /* FirstReservedWord */ && token <= 109 /* LastReservedWord */) {
                 return ts.setTextRange(ts.createLiteral(name), name);
             }
             return undefined;
@@ -75507,13 +77912,13 @@ var ts;
          */
         function visitJavaScriptInStatementContainingYield(node) {
             switch (node.kind) {
-                case 223 /* DoStatement */:
+                case 224 /* DoStatement */:
                     return visitDoStatement(node);
-                case 224 /* WhileStatement */:
+                case 225 /* WhileStatement */:
                     return visitWhileStatement(node);
-                case 232 /* SwitchStatement */:
+                case 233 /* SwitchStatement */:
                     return visitSwitchStatement(node);
-                case 233 /* LabeledStatement */:
+                case 234 /* LabeledStatement */:
                     return visitLabeledStatement(node);
                 default:
                     return visitJavaScriptInGeneratorFunctionBody(node);
@@ -75526,24 +77931,24 @@ var ts;
          */
         function visitJavaScriptInGeneratorFunctionBody(node) {
             switch (node.kind) {
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     return visitFunctionDeclaration(node);
-                case 196 /* FunctionExpression */:
+                case 197 /* FunctionExpression */:
                     return visitFunctionExpression(node);
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     return visitAccessorDeclaration(node);
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     return visitVariableStatement(node);
-                case 225 /* ForStatement */:
+                case 226 /* ForStatement */:
                     return visitForStatement(node);
-                case 226 /* ForInStatement */:
+                case 227 /* ForInStatement */:
                     return visitForInStatement(node);
-                case 229 /* BreakStatement */:
+                case 230 /* BreakStatement */:
                     return visitBreakStatement(node);
-                case 228 /* ContinueStatement */:
+                case 229 /* ContinueStatement */:
                     return visitContinueStatement(node);
-                case 230 /* ReturnStatement */:
+                case 231 /* ReturnStatement */:
                     return visitReturnStatement(node);
                 default:
                     if (node.transformFlags & 131072 /* ContainsYield */) {
@@ -75564,21 +77969,21 @@ var ts;
          */
         function visitJavaScriptContainingYield(node) {
             switch (node.kind) {
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return visitBinaryExpression(node);
-                case 205 /* ConditionalExpression */:
+                case 206 /* ConditionalExpression */:
                     return visitConditionalExpression(node);
-                case 207 /* YieldExpression */:
+                case 208 /* YieldExpression */:
                     return visitYieldExpression(node);
-                case 187 /* ArrayLiteralExpression */:
+                case 188 /* ArrayLiteralExpression */:
                     return visitArrayLiteralExpression(node);
-                case 188 /* ObjectLiteralExpression */:
+                case 189 /* ObjectLiteralExpression */:
                     return visitObjectLiteralExpression(node);
-                case 190 /* ElementAccessExpression */:
+                case 191 /* ElementAccessExpression */:
                     return visitElementAccessExpression(node);
-                case 191 /* CallExpression */:
+                case 192 /* CallExpression */:
                     return visitCallExpression(node);
-                case 192 /* NewExpression */:
+                case 193 /* NewExpression */:
                     return visitNewExpression(node);
                 default:
                     return ts.visitEachChild(node, visitor, context);
@@ -75591,9 +77996,9 @@ var ts;
          */
         function visitGenerator(node) {
             switch (node.kind) {
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     return visitFunctionDeclaration(node);
-                case 196 /* FunctionExpression */:
+                case 197 /* FunctionExpression */:
                     return visitFunctionExpression(node);
                 default:
                     return ts.Debug.failBadSyntaxKind(node);
@@ -75792,23 +78197,23 @@ var ts;
             }
         }
         function isCompoundAssignment(kind) {
-            return kind >= 60 /* FirstCompoundAssignment */
-                && kind <= 71 /* LastCompoundAssignment */;
+            return kind >= 61 /* FirstCompoundAssignment */
+                && kind <= 72 /* LastCompoundAssignment */;
         }
         function getOperatorForCompoundAssignment(kind) {
             switch (kind) {
-                case 60 /* PlusEqualsToken */: return 38 /* PlusToken */;
-                case 61 /* MinusEqualsToken */: return 39 /* MinusToken */;
-                case 62 /* AsteriskEqualsToken */: return 40 /* AsteriskToken */;
-                case 63 /* AsteriskAsteriskEqualsToken */: return 41 /* AsteriskAsteriskToken */;
-                case 64 /* SlashEqualsToken */: return 42 /* SlashToken */;
-                case 65 /* PercentEqualsToken */: return 43 /* PercentToken */;
-                case 66 /* LessThanLessThanEqualsToken */: return 46 /* LessThanLessThanToken */;
-                case 67 /* GreaterThanGreaterThanEqualsToken */: return 47 /* GreaterThanGreaterThanToken */;
-                case 68 /* GreaterThanGreaterThanGreaterThanEqualsToken */: return 48 /* GreaterThanGreaterThanGreaterThanToken */;
-                case 69 /* AmpersandEqualsToken */: return 49 /* AmpersandToken */;
-                case 70 /* BarEqualsToken */: return 50 /* BarToken */;
-                case 71 /* CaretEqualsToken */: return 51 /* CaretToken */;
+                case 61 /* PlusEqualsToken */: return 38 /* PlusToken */;
+                case 62 /* MinusEqualsToken */: return 39 /* MinusToken */;
+                case 63 /* AsteriskEqualsToken */: return 40 /* AsteriskToken */;
+                case 64 /* AsteriskAsteriskEqualsToken */: return 41 /* AsteriskAsteriskToken */;
+                case 65 /* SlashEqualsToken */: return 42 /* SlashToken */;
+                case 66 /* PercentEqualsToken */: return 43 /* PercentToken */;
+                case 67 /* LessThanLessThanEqualsToken */: return 46 /* LessThanLessThanToken */;
+                case 68 /* GreaterThanGreaterThanEqualsToken */: return 47 /* GreaterThanGreaterThanToken */;
+                case 69 /* GreaterThanGreaterThanGreaterThanEqualsToken */: return 48 /* GreaterThanGreaterThanGreaterThanToken */;
+                case 70 /* AmpersandEqualsToken */: return 49 /* AmpersandToken */;
+                case 71 /* BarEqualsToken */: return 50 /* BarToken */;
+                case 72 /* CaretEqualsToken */: return 51 /* CaretToken */;
             }
         }
         /**
@@ -75821,7 +78226,7 @@ var ts;
             if (containsYield(right)) {
                 var target = void 0;
                 switch (left.kind) {
-                    case 189 /* PropertyAccessExpression */:
+                    case 190 /* PropertyAccessExpression */:
                         // [source]
                         //      a.b = yield;
                         //
@@ -75833,7 +78238,7 @@ var ts;
                         //      _a.b = %sent%;
                         target = ts.updatePropertyAccess(left, cacheExpression(ts.visitNode(left.expression, visitor, ts.isLeftHandSideExpression)), left.name);
                         break;
-                    case 190 /* ElementAccessExpression */:
+                    case 191 /* ElementAccessExpression */:
                         // [source]
                         //      a[b] = yield;
                         //
@@ -75876,10 +78281,10 @@ var ts;
                 //      _a = a();
                 //  .yield resumeLabel
                 //      _a + %sent% + c()
-                var clone_5 = ts.getMutableClone(node);
-                clone_5.left = cacheExpression(ts.visitNode(node.left, visitor, ts.isExpression));
-                clone_5.right = ts.visitNode(node.right, visitor, ts.isExpression);
-                return clone_5;
+                var clone_6 = ts.getMutableClone(node);
+                clone_6.left = cacheExpression(ts.visitNode(node.left, visitor, ts.isExpression));
+                clone_6.right = ts.visitNode(node.right, visitor, ts.isExpression);
+                return clone_6;
             }
             return ts.visitEachChild(node, visitor, context);
         }
@@ -76140,10 +78545,10 @@ var ts;
                 //  .yield resumeLabel
                 //  .mark resumeLabel
                 //      a = _a[%sent%]
-                var clone_6 = ts.getMutableClone(node);
-                clone_6.expression = cacheExpression(ts.visitNode(node.expression, visitor, ts.isLeftHandSideExpression));
-                clone_6.argumentExpression = ts.visitNode(node.argumentExpression, visitor, ts.isExpression);
-                return clone_6;
+                var clone_7 = ts.getMutableClone(node);
+                clone_7.expression = cacheExpression(ts.visitNode(node.expression, visitor, ts.isLeftHandSideExpression));
+                clone_7.argumentExpression = ts.visitNode(node.argumentExpression, visitor, ts.isExpression);
+                return clone_7;
             }
             return ts.visitEachChild(node, visitor, context);
         }
@@ -76209,35 +78614,35 @@ var ts;
         }
         function transformAndEmitStatementWorker(node) {
             switch (node.kind) {
-                case 218 /* Block */:
+                case 219 /* Block */:
                     return transformAndEmitBlock(node);
-                case 221 /* ExpressionStatement */:
+                case 222 /* ExpressionStatement */:
                     return transformAndEmitExpressionStatement(node);
-                case 222 /* IfStatement */:
+                case 223 /* IfStatement */:
                     return transformAndEmitIfStatement(node);
-                case 223 /* DoStatement */:
+                case 224 /* DoStatement */:
                     return transformAndEmitDoStatement(node);
-                case 224 /* WhileStatement */:
+                case 225 /* WhileStatement */:
                     return transformAndEmitWhileStatement(node);
-                case 225 /* ForStatement */:
+                case 226 /* ForStatement */:
                     return transformAndEmitForStatement(node);
-                case 226 /* ForInStatement */:
+                case 227 /* ForInStatement */:
                     return transformAndEmitForInStatement(node);
-                case 228 /* ContinueStatement */:
+                case 229 /* ContinueStatement */:
                     return transformAndEmitContinueStatement(node);
-                case 229 /* BreakStatement */:
+                case 230 /* BreakStatement */:
                     return transformAndEmitBreakStatement(node);
-                case 230 /* ReturnStatement */:
+                case 231 /* ReturnStatement */:
                     return transformAndEmitReturnStatement(node);
-                case 231 /* WithStatement */:
+                case 232 /* WithStatement */:
                     return transformAndEmitWithStatement(node);
-                case 232 /* SwitchStatement */:
+                case 233 /* SwitchStatement */:
                     return transformAndEmitSwitchStatement(node);
-                case 233 /* LabeledStatement */:
+                case 234 /* LabeledStatement */:
                     return transformAndEmitLabeledStatement(node);
-                case 234 /* ThrowStatement */:
+                case 235 /* ThrowStatement */:
                     return transformAndEmitThrowStatement(node);
-                case 235 /* TryStatement */:
+                case 236 /* TryStatement */:
                     return transformAndEmitTryStatement(node);
                 default:
                     return emitStatement(ts.visitNode(node, visitor, ts.isStatement));
@@ -76667,7 +79072,7 @@ var ts;
                 for (var i = 0; i < numClauses; i++) {
                     var clause = caseBlock.clauses[i];
                     clauseLabels.push(defineLabel());
-                    if (clause.kind === 272 /* DefaultClause */ && defaultClauseIndex === -1) {
+                    if (clause.kind === 273 /* DefaultClause */ && defaultClauseIndex === -1) {
                         defaultClauseIndex = i;
                     }
                 }
@@ -76680,7 +79085,7 @@ var ts;
                     var defaultClausesSkipped = 0;
                     for (var i = clausesWritten; i < numClauses; i++) {
                         var clause = caseBlock.clauses[i];
-                        if (clause.kind === 271 /* CaseClause */) {
+                        if (clause.kind === 272 /* CaseClause */) {
                             if (containsYield(clause.expression) && pendingClauses.length > 0) {
                                 break;
                             }
@@ -76842,10 +79247,10 @@ var ts;
                     if (declaration) {
                         var name = renamedCatchVariableDeclarations[ts.getOriginalNodeId(declaration)];
                         if (name) {
-                            var clone_7 = ts.getMutableClone(name);
-                            ts.setSourceMapRange(clone_7, node);
-                            ts.setCommentRange(clone_7, node);
-                            return clone_7;
+                            var clone_8 = ts.getMutableClone(name);
+                            ts.setSourceMapRange(clone_8, node);
+                            ts.setCommentRange(clone_8, node);
+                            return clone_8;
                         }
                     }
                 }
@@ -76992,7 +79397,7 @@ var ts;
                 if (!renamedCatchVariables) {
                     renamedCatchVariables = ts.createMap();
                     renamedCatchVariableDeclarations = [];
-                    context.enableSubstitution(72 /* Identifier */);
+                    context.enableSubstitution(73 /* Identifier */);
                 }
                 renamedCatchVariables.set(text, true);
                 renamedCatchVariableDeclarations[ts.getOriginalNodeId(variable)] = name;
@@ -77908,12 +80313,12 @@ var ts;
         var previousOnEmitNode = context.onEmitNode;
         context.onSubstituteNode = onSubstituteNode;
         context.onEmitNode = onEmitNode;
-        context.enableSubstitution(72 /* Identifier */); // Substitutes expression identifiers with imported/exported symbols.
-        context.enableSubstitution(204 /* BinaryExpression */); // Substitutes assignments to exported symbols.
-        context.enableSubstitution(202 /* PrefixUnaryExpression */); // Substitutes updates to exported symbols.
-        context.enableSubstitution(203 /* PostfixUnaryExpression */); // Substitutes updates to exported symbols.
-        context.enableSubstitution(276 /* ShorthandPropertyAssignment */); // Substitutes shorthand property assignments for imported/exported symbols.
-        context.enableEmitNotification(284 /* SourceFile */); // Restore state when substituting nodes in a file.
+        context.enableSubstitution(73 /* Identifier */); // Substitutes expression identifiers with imported/exported symbols.
+        context.enableSubstitution(205 /* BinaryExpression */); // Substitutes assignments to exported symbols.
+        context.enableSubstitution(203 /* PrefixUnaryExpression */); // Substitutes updates to exported symbols.
+        context.enableSubstitution(204 /* PostfixUnaryExpression */); // Substitutes updates to exported symbols.
+        context.enableSubstitution(277 /* ShorthandPropertyAssignment */); // Substitutes shorthand property assignments for imported/exported symbols.
+        context.enableEmitNotification(285 /* SourceFile */); // Restore state when substituting nodes in a file.
         var moduleInfoMap = []; // The ExternalModuleInfo for each file.
         var deferredExports = []; // Exports to defer until an EndOfDeclarationMarker is found.
         var currentSourceFile; // The current file.
@@ -78241,23 +80646,23 @@ var ts;
          */
         function sourceElementVisitor(node) {
             switch (node.kind) {
-                case 249 /* ImportDeclaration */:
+                case 250 /* ImportDeclaration */:
                     return visitImportDeclaration(node);
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return visitImportEqualsDeclaration(node);
-                case 255 /* ExportDeclaration */:
+                case 256 /* ExportDeclaration */:
                     return visitExportDeclaration(node);
-                case 254 /* ExportAssignment */:
+                case 255 /* ExportAssignment */:
                     return visitExportAssignment(node);
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     return visitVariableStatement(node);
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     return visitFunctionDeclaration(node);
-                case 240 /* ClassDeclaration */:
+                case 241 /* ClassDeclaration */:
                     return visitClassDeclaration(node);
-                case 315 /* MergeDeclarationMarker */:
+                case 317 /* MergeDeclarationMarker */:
                     return visitMergeDeclarationMarker(node);
-                case 316 /* EndOfDeclarationMarker */:
+                case 318 /* EndOfDeclarationMarker */:
                     return visitEndOfDeclarationMarker(node);
                 default:
                     return ts.visitEachChild(node, moduleExpressionElementVisitor, context);
@@ -78284,24 +80689,24 @@ var ts;
                 for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
                     var elem = _a[_i];
                     switch (elem.kind) {
-                        case 275 /* PropertyAssignment */:
+                        case 276 /* PropertyAssignment */:
                             if (destructuringNeedsFlattening(elem.initializer)) {
                                 return true;
                             }
                             break;
-                        case 276 /* ShorthandPropertyAssignment */:
+                        case 277 /* ShorthandPropertyAssignment */:
                             if (destructuringNeedsFlattening(elem.name)) {
                                 return true;
                             }
                             break;
-                        case 277 /* SpreadAssignment */:
+                        case 278 /* SpreadAssignment */:
                             if (destructuringNeedsFlattening(elem.expression)) {
                                 return true;
                             }
                             break;
-                        case 156 /* MethodDeclaration */:
-                        case 158 /* GetAccessor */:
-                        case 159 /* SetAccessor */:
+                        case 157 /* MethodDeclaration */:
+                        case 159 /* GetAccessor */:
+                        case 160 /* SetAccessor */:
                             return false;
                         default: ts.Debug.assertNever(elem, "Unhandled object member kind");
                     }
@@ -78779,7 +81184,7 @@ var ts;
             //
             // To balance the declaration, add the exports of the elided variable
             // statement.
-            if (hasAssociatedEndOfDeclarationMarker(node) && node.original.kind === 219 /* VariableStatement */) {
+            if (hasAssociatedEndOfDeclarationMarker(node) && node.original.kind === 220 /* VariableStatement */) {
                 var id = ts.getOriginalNodeId(node);
                 deferredExports[id] = appendExportsOfVariableStatement(deferredExports[id], node.original);
             }
@@ -78834,10 +81239,10 @@ var ts;
             var namedBindings = importClause.namedBindings;
             if (namedBindings) {
                 switch (namedBindings.kind) {
-                    case 251 /* NamespaceImport */:
+                    case 252 /* NamespaceImport */:
                         statements = appendExportsOfDeclaration(statements, namedBindings);
                         break;
-                    case 252 /* NamedImports */:
+                    case 253 /* NamedImports */:
                         for (var _i = 0, _a = namedBindings.elements; _i < _a.length; _i++) {
                             var importBinding = _a[_i];
                             statements = appendExportsOfDeclaration(statements, importBinding);
@@ -79019,8 +81424,8 @@ var ts;
         function modifierVisitor(node) {
             // Elide module-specific modifiers.
             switch (node.kind) {
-                case 85 /* ExportKeyword */:
-                case 80 /* DefaultKeyword */:
+                case 86 /* ExportKeyword */:
+                case 81 /* DefaultKeyword */:
                     return undefined;
             }
             return node;
@@ -79036,7 +81441,7 @@ var ts;
          * @param emit A callback used to emit the node in the printer.
          */
         function onEmitNode(hint, node, emitCallback) {
-            if (node.kind === 284 /* SourceFile */) {
+            if (node.kind === 285 /* SourceFile */) {
                 currentSourceFile = node;
                 currentModuleInfo = moduleInfoMap[ts.getOriginalNodeId(currentSourceFile)];
                 noSubstitution = [];
@@ -79098,12 +81503,12 @@ var ts;
          */
         function substituteExpression(node) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return substituteExpressionIdentifier(node);
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return substituteBinaryExpression(node);
-                case 203 /* PostfixUnaryExpression */:
-                case 202 /* PrefixUnaryExpression */:
+                case 204 /* PostfixUnaryExpression */:
+                case 203 /* PrefixUnaryExpression */:
                     return substituteUnaryExpression(node);
             }
             return node;
@@ -79124,7 +81529,7 @@ var ts;
             }
             if (!ts.isGeneratedIdentifier(node) && !ts.isLocalName(node)) {
                 var exportContainer = resolver.getReferencedExportContainer(node, ts.isExportName(node));
-                if (exportContainer && exportContainer.kind === 284 /* SourceFile */) {
+                if (exportContainer && exportContainer.kind === 285 /* SourceFile */) {
                     return ts.setTextRange(ts.createPropertyAccess(ts.createIdentifier("exports"), ts.getSynthesizedClone(node)), 
                     /*location*/ node);
                 }
@@ -79199,8 +81604,8 @@ var ts;
                 && !ts.isDeclarationNameOfEnumOrNamespace(node.operand)) {
                 var exportedNames = getExports(node.operand);
                 if (exportedNames) {
-                    var expression = node.kind === 203 /* PostfixUnaryExpression */
-                        ? ts.setTextRange(ts.createBinary(node.operand, ts.createToken(node.operator === 44 /* PlusPlusToken */ ? 60 /* PlusEqualsToken */ : 61 /* MinusEqualsToken */), ts.createLiteral(1)), 
+                    var expression = node.kind === 204 /* PostfixUnaryExpression */
+                        ? ts.setTextRange(ts.createBinary(node.operand, ts.createToken(node.operator === 44 /* PlusPlusToken */ ? 61 /* PlusEqualsToken */ : 62 /* MinusEqualsToken */), ts.createLiteral(1)), 
                         /*location*/ node)
                         : node;
                     for (var _i = 0, exportedNames_3 = exportedNames; _i < exportedNames_3.length; _i++) {
@@ -79274,12 +81679,12 @@ var ts;
         var previousOnEmitNode = context.onEmitNode;
         context.onSubstituteNode = onSubstituteNode;
         context.onEmitNode = onEmitNode;
-        context.enableSubstitution(72 /* Identifier */); // Substitutes expression identifiers for imported symbols.
-        context.enableSubstitution(276 /* ShorthandPropertyAssignment */); // Substitutes expression identifiers for imported symbols
-        context.enableSubstitution(204 /* BinaryExpression */); // Substitutes assignments to exported symbols.
-        context.enableSubstitution(202 /* PrefixUnaryExpression */); // Substitutes updates to exported symbols.
-        context.enableSubstitution(203 /* PostfixUnaryExpression */); // Substitutes updates to exported symbols.
-        context.enableEmitNotification(284 /* SourceFile */); // Restore state when substituting nodes in a file.
+        context.enableSubstitution(73 /* Identifier */); // Substitutes expression identifiers for imported symbols.
+        context.enableSubstitution(277 /* ShorthandPropertyAssignment */); // Substitutes expression identifiers for imported symbols
+        context.enableSubstitution(205 /* BinaryExpression */); // Substitutes assignments to exported symbols.
+        context.enableSubstitution(203 /* PrefixUnaryExpression */); // Substitutes updates to exported symbols.
+        context.enableSubstitution(204 /* PostfixUnaryExpression */); // Substitutes updates to exported symbols.
+        context.enableEmitNotification(285 /* SourceFile */); // Restore state when substituting nodes in a file.
         var moduleInfoMap = []; // The ExternalModuleInfo for each file.
         var deferredExports = []; // Exports to defer until an EndOfDeclarationMarker is found.
         var exportFunctionsMap = []; // The export function associated with a source file.
@@ -79500,7 +81905,7 @@ var ts;
                 var hasExportDeclarationWithExportClause = false;
                 for (var _i = 0, _a = moduleInfo.externalImports; _i < _a.length; _i++) {
                     var externalImport = _a[_i];
-                    if (externalImport.kind === 255 /* ExportDeclaration */ && externalImport.exportClause) {
+                    if (externalImport.kind === 256 /* ExportDeclaration */ && externalImport.exportClause) {
                         hasExportDeclarationWithExportClause = true;
                         break;
                     }
@@ -79525,7 +81930,7 @@ var ts;
             }
             for (var _d = 0, _e = moduleInfo.externalImports; _d < _e.length; _d++) {
                 var externalImport = _e[_d];
-                if (externalImport.kind !== 255 /* ExportDeclaration */) {
+                if (externalImport.kind !== 256 /* ExportDeclaration */) {
                     continue;
                 }
                 if (!externalImport.exportClause) {
@@ -79603,19 +82008,19 @@ var ts;
                     var entry = _b[_a];
                     var importVariableName = ts.getLocalNameForExternalImport(entry, currentSourceFile); // TODO: GH#18217
                     switch (entry.kind) {
-                        case 249 /* ImportDeclaration */:
+                        case 250 /* ImportDeclaration */:
                             if (!entry.importClause) {
                                 // 'import "..."' case
                                 // module is imported only for side-effects, no emit required
                                 break;
                             }
                         // falls through
-                        case 248 /* ImportEqualsDeclaration */:
+                        case 249 /* ImportEqualsDeclaration */:
                             ts.Debug.assert(importVariableName !== undefined);
                             // save import into the local
                             statements.push(ts.createExpressionStatement(ts.createAssignment(importVariableName, parameterName)));
                             break;
-                        case 255 /* ExportDeclaration */:
+                        case 256 /* ExportDeclaration */:
                             ts.Debug.assert(importVariableName !== undefined);
                             if (entry.exportClause) {
                                 //  export {a, b as c} from 'foo'
@@ -79665,15 +82070,15 @@ var ts;
          */
         function sourceElementVisitor(node) {
             switch (node.kind) {
-                case 249 /* ImportDeclaration */:
+                case 250 /* ImportDeclaration */:
                     return visitImportDeclaration(node);
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return visitImportEqualsDeclaration(node);
-                case 255 /* ExportDeclaration */:
+                case 256 /* ExportDeclaration */:
                     // ExportDeclarations are elided as they are handled via
                     // `appendExportsOfDeclaration`.
                     return undefined;
-                case 254 /* ExportAssignment */:
+                case 255 /* ExportAssignment */:
                     return visitExportAssignment(node);
                 default:
                     return nestedElementVisitor(node);
@@ -79849,7 +82254,7 @@ var ts;
         function shouldHoistVariableDeclarationList(node) {
             // hoist only non-block scoped declarations or block scoped declarations parented by source file
             return (ts.getEmitFlags(node) & 2097152 /* NoHoisting */) === 0
-                && (enclosingBlockScopedContainer.kind === 284 /* SourceFile */
+                && (enclosingBlockScopedContainer.kind === 285 /* SourceFile */
                     || (ts.getOriginalNode(node).flags & 3 /* BlockScoped */) === 0);
         }
         /**
@@ -79913,7 +82318,7 @@ var ts;
             //
             // To balance the declaration, we defer the exports of the elided variable
             // statement until we visit this declaration's `EndOfDeclarationMarker`.
-            if (hasAssociatedEndOfDeclarationMarker(node) && node.original.kind === 219 /* VariableStatement */) {
+            if (hasAssociatedEndOfDeclarationMarker(node) && node.original.kind === 220 /* VariableStatement */) {
                 var id = ts.getOriginalNodeId(node);
                 var isExportedDeclaration = ts.hasModifier(node.original, 1 /* Export */);
                 deferredExports[id] = appendExportsOfVariableStatement(deferredExports[id], node.original, isExportedDeclaration);
@@ -79975,10 +82380,10 @@ var ts;
             var namedBindings = importClause.namedBindings;
             if (namedBindings) {
                 switch (namedBindings.kind) {
-                    case 251 /* NamespaceImport */:
+                    case 252 /* NamespaceImport */:
                         statements = appendExportsOfDeclaration(statements, namedBindings);
                         break;
-                    case 252 /* NamedImports */:
+                    case 253 /* NamedImports */:
                         for (var _i = 0, _a = namedBindings.elements; _i < _a.length; _i++) {
                             var importBinding = _a[_i];
                             statements = appendExportsOfDeclaration(statements, importBinding);
@@ -80158,43 +82563,43 @@ var ts;
          */
         function nestedElementVisitor(node) {
             switch (node.kind) {
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     return visitVariableStatement(node);
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     return visitFunctionDeclaration(node);
-                case 240 /* ClassDeclaration */:
+                case 241 /* ClassDeclaration */:
                     return visitClassDeclaration(node);
-                case 225 /* ForStatement */:
+                case 226 /* ForStatement */:
                     return visitForStatement(node);
-                case 226 /* ForInStatement */:
+                case 227 /* ForInStatement */:
                     return visitForInStatement(node);
-                case 227 /* ForOfStatement */:
+                case 228 /* ForOfStatement */:
                     return visitForOfStatement(node);
-                case 223 /* DoStatement */:
+                case 224 /* DoStatement */:
                     return visitDoStatement(node);
-                case 224 /* WhileStatement */:
+                case 225 /* WhileStatement */:
                     return visitWhileStatement(node);
-                case 233 /* LabeledStatement */:
+                case 234 /* LabeledStatement */:
                     return visitLabeledStatement(node);
-                case 231 /* WithStatement */:
+                case 232 /* WithStatement */:
                     return visitWithStatement(node);
-                case 232 /* SwitchStatement */:
+                case 233 /* SwitchStatement */:
                     return visitSwitchStatement(node);
-                case 246 /* CaseBlock */:
+                case 247 /* CaseBlock */:
                     return visitCaseBlock(node);
-                case 271 /* CaseClause */:
+                case 272 /* CaseClause */:
                     return visitCaseClause(node);
-                case 272 /* DefaultClause */:
+                case 273 /* DefaultClause */:
                     return visitDefaultClause(node);
-                case 235 /* TryStatement */:
+                case 236 /* TryStatement */:
                     return visitTryStatement(node);
-                case 274 /* CatchClause */:
+                case 275 /* CatchClause */:
                     return visitCatchClause(node);
-                case 218 /* Block */:
+                case 219 /* Block */:
                     return visitBlock(node);
-                case 315 /* MergeDeclarationMarker */:
+                case 317 /* MergeDeclarationMarker */:
                     return visitMergeDeclarationMarker(node);
-                case 316 /* EndOfDeclarationMarker */:
+                case 318 /* EndOfDeclarationMarker */:
                     return visitEndOfDeclarationMarker(node);
                 default:
                     return destructuringAndImportCallVisitor(node);
@@ -80441,7 +82846,7 @@ var ts;
             }
             else if (ts.isIdentifier(node)) {
                 var container = resolver.getReferencedExportContainer(node);
-                return container !== undefined && container.kind === 284 /* SourceFile */;
+                return container !== undefined && container.kind === 285 /* SourceFile */;
             }
             else {
                 return false;
@@ -80457,8 +82862,8 @@ var ts;
          */
         function modifierVisitor(node) {
             switch (node.kind) {
-                case 85 /* ExportKeyword */:
-                case 80 /* DefaultKeyword */:
+                case 86 /* ExportKeyword */:
+                case 81 /* DefaultKeyword */:
                     return undefined;
             }
             return node;
@@ -80474,7 +82879,7 @@ var ts;
          * @param emitCallback A callback used to emit the node in the printer.
          */
         function onEmitNode(hint, node, emitCallback) {
-            if (node.kind === 284 /* SourceFile */) {
+            if (node.kind === 285 /* SourceFile */) {
                 var id = ts.getOriginalNodeId(node);
                 currentSourceFile = node;
                 moduleInfo = moduleInfoMap[id];
@@ -80522,7 +82927,7 @@ var ts;
          */
         function substituteUnspecified(node) {
             switch (node.kind) {
-                case 276 /* ShorthandPropertyAssignment */:
+                case 277 /* ShorthandPropertyAssignment */:
                     return substituteShorthandPropertyAssignment(node);
             }
             return node;
@@ -80556,12 +82961,12 @@ var ts;
          */
         function substituteExpression(node) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return substituteExpressionIdentifier(node);
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return substituteBinaryExpression(node);
-                case 202 /* PrefixUnaryExpression */:
-                case 203 /* PostfixUnaryExpression */:
+                case 203 /* PrefixUnaryExpression */:
+                case 204 /* PostfixUnaryExpression */:
                     return substituteUnaryExpression(node);
             }
             return node;
@@ -80654,14 +83059,14 @@ var ts;
                 && !ts.isDeclarationNameOfEnumOrNamespace(node.operand)) {
                 var exportedNames = getExports(node.operand);
                 if (exportedNames) {
-                    var expression = node.kind === 203 /* PostfixUnaryExpression */
+                    var expression = node.kind === 204 /* PostfixUnaryExpression */
                         ? ts.setTextRange(ts.createPrefix(node.operator, node.operand), node)
                         : node;
                     for (var _i = 0, exportedNames_5 = exportedNames; _i < exportedNames_5.length; _i++) {
                         var exportName = exportedNames_5[_i];
                         expression = createExportExpression(exportName, preventSubstitution(expression));
                     }
-                    if (node.kind === 203 /* PostfixUnaryExpression */) {
+                    if (node.kind === 204 /* PostfixUnaryExpression */) {
                         expression = node.operator === 44 /* PlusPlusToken */
                             ? ts.createSubtract(preventSubstitution(expression), ts.createLiteral(1))
                             : ts.createAdd(preventSubstitution(expression), ts.createLiteral(1));
@@ -80683,7 +83088,7 @@ var ts;
                     || resolver.getReferencedValueDeclaration(name);
                 if (valueDeclaration) {
                     var exportContainer = resolver.getReferencedExportContainer(name, /*prefixLocals*/ false);
-                    if (exportContainer && exportContainer.kind === 284 /* SourceFile */) {
+                    if (exportContainer && exportContainer.kind === 285 /* SourceFile */) {
                         exportedNames = ts.append(exportedNames, ts.getDeclarationName(valueDeclaration));
                     }
                     exportedNames = ts.addRange(exportedNames, moduleInfo && moduleInfo.exportedBindings[ts.getOriginalNodeId(valueDeclaration)]);
@@ -80722,8 +83127,8 @@ var ts;
         var previousOnSubstituteNode = context.onSubstituteNode;
         context.onEmitNode = onEmitNode;
         context.onSubstituteNode = onSubstituteNode;
-        context.enableEmitNotification(284 /* SourceFile */);
-        context.enableSubstitution(72 /* Identifier */);
+        context.enableEmitNotification(285 /* SourceFile */);
+        context.enableSubstitution(73 /* Identifier */);
         var currentSourceFile;
         return ts.chainBundle(transformSourceFile);
         function transformSourceFile(node) {
@@ -80751,10 +83156,10 @@ var ts;
         }
         function visitor(node) {
             switch (node.kind) {
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     // Elide `import=` as it is not legal with --module ES6
                     return undefined;
-                case 254 /* ExportAssignment */:
+                case 255 /* ExportAssignment */:
                     return visitExportAssignment(node);
             }
             return node;
@@ -80862,7 +83267,7 @@ var ts;
                         ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 :
                     ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_private_name_1;
             }
-            else if (node.parent.kind === 240 /* ClassDeclaration */) {
+            else if (node.parent.kind === 241 /* ClassDeclaration */) {
                 return symbolAccessibilityResult.errorModuleName ?
                     symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                         ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
@@ -80891,7 +83296,7 @@ var ts;
                         ts.Diagnostics.Public_static_method_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 :
                     ts.Diagnostics.Public_static_method_0_of_exported_class_has_or_is_using_private_name_1;
             }
-            else if (node.parent.kind === 240 /* ClassDeclaration */) {
+            else if (node.parent.kind === 241 /* ClassDeclaration */) {
                 return symbolAccessibilityResult.errorModuleName ?
                     symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                         ts.Diagnostics.Public_method_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
@@ -80938,7 +83343,7 @@ var ts;
             return ts.Debug.assertNever(node, "Attempted to set a declaration diagnostic context for unhandled node kind: " + ts.SyntaxKind[node.kind]);
         }
         function getVariableDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult) {
-            if (node.kind === 237 /* VariableDeclaration */ || node.kind === 186 /* BindingElement */) {
+            if (node.kind === 238 /* VariableDeclaration */ || node.kind === 187 /* BindingElement */) {
                 return symbolAccessibilityResult.errorModuleName ?
                     symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                         ts.Diagnostics.Exported_variable_0_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
@@ -80947,8 +83352,8 @@ var ts;
             }
             // This check is to ensure we don't report error on constructor parameter property as that error would be reported during parameter emit
             // The only exception here is if the constructor was marked as private. we are not emitting the constructor parameters at all.
-            else if (node.kind === 154 /* PropertyDeclaration */ || node.kind === 189 /* PropertyAccessExpression */ || node.kind === 153 /* PropertySignature */ ||
-                (node.kind === 151 /* Parameter */ && ts.hasModifier(node.parent, 8 /* Private */))) {
+            else if (node.kind === 155 /* PropertyDeclaration */ || node.kind === 190 /* PropertyAccessExpression */ || node.kind === 154 /* PropertySignature */ ||
+                (node.kind === 152 /* Parameter */ && ts.hasModifier(node.parent, 8 /* Private */))) {
                 // TODO(jfreeman): Deal with computed properties in error reporting.
                 if (ts.hasModifier(node, 32 /* Static */)) {
                     return symbolAccessibilityResult.errorModuleName ?
@@ -80957,7 +83362,7 @@ var ts;
                             ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 :
                         ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_private_name_1;
                 }
-                else if (node.parent.kind === 240 /* ClassDeclaration */ || node.kind === 151 /* Parameter */) {
+                else if (node.parent.kind === 241 /* ClassDeclaration */ || node.kind === 152 /* Parameter */) {
                     return symbolAccessibilityResult.errorModuleName ?
                         symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                             ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
@@ -80982,7 +83387,7 @@ var ts;
         }
         function getAccessorDeclarationTypeVisibilityError(symbolAccessibilityResult) {
             var diagnosticMessage;
-            if (node.kind === 159 /* SetAccessor */) {
+            if (node.kind === 160 /* SetAccessor */) {
                 // Getters can infer the return type from the returned expression, but setters cannot, so the
                 // "_from_external_module_1_but_cannot_be_named" case cannot occur.
                 if (ts.hasModifier(node, 32 /* Static */)) {
@@ -81021,26 +83426,26 @@ var ts;
         function getReturnTypeVisibilityError(symbolAccessibilityResult) {
             var diagnosticMessage;
             switch (node.kind) {
-                case 161 /* ConstructSignature */:
+                case 162 /* ConstructSignature */:
                     // Interfaces cannot have return types that cannot be named
                     diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                         ts.Diagnostics.Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 :
                         ts.Diagnostics.Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_0;
                     break;
-                case 160 /* CallSignature */:
+                case 161 /* CallSignature */:
                     // Interfaces cannot have return types that cannot be named
                     diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                         ts.Diagnostics.Return_type_of_call_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 :
                         ts.Diagnostics.Return_type_of_call_signature_from_exported_interface_has_or_is_using_private_name_0;
                     break;
-                case 162 /* IndexSignature */:
+                case 163 /* IndexSignature */:
                     // Interfaces cannot have return types that cannot be named
                     diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                         ts.Diagnostics.Return_type_of_index_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 :
                         ts.Diagnostics.Return_type_of_index_signature_from_exported_interface_has_or_is_using_private_name_0;
                     break;
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
                     if (ts.hasModifier(node, 32 /* Static */)) {
                         diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                             symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
@@ -81048,7 +83453,7 @@ var ts;
                                 ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_private_module_1 :
                             ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_private_name_0;
                     }
-                    else if (node.parent.kind === 240 /* ClassDeclaration */) {
+                    else if (node.parent.kind === 241 /* ClassDeclaration */) {
                         diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                             symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                                 ts.Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named :
@@ -81062,7 +83467,7 @@ var ts;
                             ts.Diagnostics.Return_type_of_method_from_exported_interface_has_or_is_using_private_name_0;
                     }
                     break;
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                         symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                             ts.Diagnostics.Return_type_of_exported_function_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named :
@@ -81087,30 +83492,30 @@ var ts;
         }
         function getParameterDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult) {
             switch (node.parent.kind) {
-                case 157 /* Constructor */:
+                case 158 /* Constructor */:
                     return symbolAccessibilityResult.errorModuleName ?
                         symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                             ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
                             ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
                         ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_private_name_1;
-                case 161 /* ConstructSignature */:
-                case 166 /* ConstructorType */:
+                case 162 /* ConstructSignature */:
+                case 167 /* ConstructorType */:
                     // Interfaces cannot have parameter types that cannot be named
                     return symbolAccessibilityResult.errorModuleName ?
                         ts.Diagnostics.Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 :
                         ts.Diagnostics.Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1;
-                case 160 /* CallSignature */:
+                case 161 /* CallSignature */:
                     // Interfaces cannot have parameter types that cannot be named
                     return symbolAccessibilityResult.errorModuleName ?
                         ts.Diagnostics.Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 :
                         ts.Diagnostics.Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1;
-                case 162 /* IndexSignature */:
+                case 163 /* IndexSignature */:
                     // Interfaces cannot have parameter types that cannot be named
                     return symbolAccessibilityResult.errorModuleName ?
                         ts.Diagnostics.Parameter_0_of_index_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 :
                         ts.Diagnostics.Parameter_0_of_index_signature_from_exported_interface_has_or_is_using_private_name_1;
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
                     if (ts.hasModifier(node.parent, 32 /* Static */)) {
                         return symbolAccessibilityResult.errorModuleName ?
                             symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
@@ -81118,7 +83523,7 @@ var ts;
                                 ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
                             ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1;
                     }
-                    else if (node.parent.parent.kind === 240 /* ClassDeclaration */) {
+                    else if (node.parent.parent.kind === 241 /* ClassDeclaration */) {
                         return symbolAccessibilityResult.errorModuleName ?
                             symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                                 ts.Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
@@ -81131,8 +83536,8 @@ var ts;
                             ts.Diagnostics.Parameter_0_of_method_from_exported_interface_has_or_is_using_name_1_from_private_module_2 :
                             ts.Diagnostics.Parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1;
                     }
-                case 239 /* FunctionDeclaration */:
-                case 165 /* FunctionType */:
+                case 240 /* FunctionDeclaration */:
+                case 166 /* FunctionType */:
                     return symbolAccessibilityResult.errorModuleName ?
                         symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                             ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
@@ -81146,39 +83551,39 @@ var ts;
             // Type parameter constraints are named by user so we should always be able to name it
             var diagnosticMessage;
             switch (node.parent.kind) {
-                case 240 /* ClassDeclaration */:
+                case 241 /* ClassDeclaration */:
                     diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_class_has_or_is_using_private_name_1;
                     break;
-                case 241 /* InterfaceDeclaration */:
+                case 242 /* InterfaceDeclaration */:
                     diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1;
                     break;
-                case 181 /* MappedType */:
+                case 182 /* MappedType */:
                     diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_mapped_object_type_is_using_private_name_1;
                     break;
-                case 166 /* ConstructorType */:
-                case 161 /* ConstructSignature */:
+                case 167 /* ConstructorType */:
+                case 162 /* ConstructSignature */:
                     diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1;
                     break;
-                case 160 /* CallSignature */:
+                case 161 /* CallSignature */:
                     diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1;
                     break;
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
                     if (ts.hasModifier(node.parent, 32 /* Static */)) {
                         diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1;
                     }
-                    else if (node.parent.parent.kind === 240 /* ClassDeclaration */) {
+                    else if (node.parent.parent.kind === 241 /* ClassDeclaration */) {
                         diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1;
                     }
                     else {
                         diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1;
                     }
                     break;
-                case 165 /* FunctionType */:
-                case 239 /* FunctionDeclaration */:
+                case 166 /* FunctionType */:
+                case 240 /* FunctionDeclaration */:
                     diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_function_has_or_is_using_private_name_1;
                     break;
-                case 242 /* TypeAliasDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
                     diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_type_alias_has_or_is_using_private_name_1;
                     break;
                 default:
@@ -81193,9 +83598,9 @@ var ts;
         function getHeritageClauseVisibilityError() {
             var diagnosticMessage;
             // Heritage clause is written by user so it can always be named
-            if (node.parent.parent.kind === 240 /* ClassDeclaration */) {
+            if (node.parent.parent.kind === 241 /* ClassDeclaration */) {
                 // Class or Interface implemented/extended is inaccessible
-                diagnosticMessage = ts.isHeritageClause(node.parent) && node.parent.token === 109 /* ImplementsKeyword */ ?
+                diagnosticMessage = ts.isHeritageClause(node.parent) && node.parent.token === 110 /* ImplementsKeyword */ ?
                     ts.Diagnostics.Implements_clause_of_exported_class_0_has_or_is_using_private_name_1 :
                     ts.Diagnostics.extends_clause_of_exported_class_0_has_or_is_using_private_name_1;
             }
@@ -81238,12 +83643,28 @@ var ts;
         return result.diagnostics;
     }
     ts.getDeclarationDiagnostics = getDeclarationDiagnostics;
+    function hasInternalAnnotation(range, currentSourceFile) {
+        var comment = currentSourceFile.text.substring(range.pos, range.end);
+        return ts.stringContains(comment, "@internal");
+    }
     function isInternalDeclaration(node, currentSourceFile) {
         var parseTreeNode = ts.getParseTreeNode(node);
+        if (parseTreeNode && parseTreeNode.kind === 152 /* Parameter */) {
+            var paramIdx = parseTreeNode.parent.parameters.indexOf(parseTreeNode);
+            var previousSibling = paramIdx > 0 ? parseTreeNode.parent.parameters[paramIdx - 1] : undefined;
+            var text = currentSourceFile.text;
+            var commentRanges = previousSibling
+                ? ts.concatenate(
+                // to handle
+                // ... parameters, /* @internal */
+                // public param: string
+                ts.getTrailingCommentRanges(text, ts.skipTrivia(text, previousSibling.end + 1, /* stopAfterLineBreak */ false, /* stopAtComments */ true)), ts.getLeadingCommentRanges(text, node.pos))
+                : ts.getTrailingCommentRanges(text, ts.skipTrivia(text, node.pos, /* stopAfterLineBreak */ false, /* stopAtComments */ true));
+            return commentRanges && commentRanges.length && hasInternalAnnotation(ts.last(commentRanges), currentSourceFile);
+        }
         var leadingCommentRanges = parseTreeNode && ts.getLeadingCommentRangesOfNode(parseTreeNode, currentSourceFile);
         return !!ts.forEach(leadingCommentRanges, function (range) {
-            var comment = currentSourceFile.text.substring(range.pos, range.end);
-            return ts.stringContains(comment, "@internal");
+            return hasInternalAnnotation(range, currentSourceFile);
         });
     }
     ts.isInternalDeclaration = isInternalDeclaration;
@@ -81374,11 +83795,14 @@ var ts;
                 context.addDiagnostic(ts.createDiagnosticForNode(errorNameNode, ts.Diagnostics.The_inferred_type_of_0_cannot_be_named_without_a_reference_to_1_This_is_likely_not_portable_A_type_annotation_is_necessary, ts.declarationNameToString(errorNameNode), specifier));
             }
         }
+        function createEmptyExports() {
+            return ts.createExportDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, ts.createNamedExports([]), /*moduleSpecifier*/ undefined);
+        }
         function transformRoot(node) {
-            if (node.kind === 284 /* SourceFile */ && (node.isDeclarationFile || ts.isSourceFileJS(node))) {
+            if (node.kind === 285 /* SourceFile */ && (node.isDeclarationFile || ts.isSourceFileJS(node))) {
                 return node;
             }
-            if (node.kind === 285 /* Bundle */) {
+            if (node.kind === 286 /* Bundle */) {
                 isBundledEmit = true;
                 refs = ts.createMap();
                 libs = ts.createMap();
@@ -81401,14 +83825,14 @@ var ts;
                         resultHasExternalModuleIndicator = false; // unused in external module bundle emit (all external modules are within module blocks, therefore are known to be modules)
                         needsDeclare = false;
                         var statements_4 = ts.visitNodes(sourceFile.statements, visitDeclarationStatements);
-                        var newFile = ts.updateSourceFileNode(sourceFile, [ts.createModuleDeclaration([], [ts.createModifier(125 /* DeclareKeyword */)], ts.createLiteral(ts.getResolvedExternalModuleName(context.getEmitHost(), sourceFile)), ts.createModuleBlock(ts.setTextRange(ts.createNodeArray(transformAndReplaceLatePaintedStatements(statements_4)), sourceFile.statements)))], /*isDeclarationFile*/ true, /*referencedFiles*/ [], /*typeReferences*/ [], /*hasNoDefaultLib*/ false, /*libReferences*/ []);
+                        var newFile = ts.updateSourceFileNode(sourceFile, [ts.createModuleDeclaration([], [ts.createModifier(126 /* DeclareKeyword */)], ts.createLiteral(ts.getResolvedExternalModuleName(context.getEmitHost(), sourceFile)), ts.createModuleBlock(ts.setTextRange(ts.createNodeArray(transformAndReplaceLatePaintedStatements(statements_4)), sourceFile.statements)))], /*isDeclarationFile*/ true, /*referencedFiles*/ [], /*typeReferences*/ [], /*hasNoDefaultLib*/ false, /*libReferences*/ []);
                         return newFile;
                     }
                     needsDeclare = true;
                     var updated = ts.visitNodes(sourceFile.statements, visitDeclarationStatements);
                     return ts.updateSourceFileNode(sourceFile, transformAndReplaceLatePaintedStatements(updated), /*isDeclarationFile*/ true, /*referencedFiles*/ [], /*typeReferences*/ [], /*hasNoDefaultLib*/ false, /*libReferences*/ []);
                 }), ts.mapDefined(node.prepends, function (prepend) {
-                    if (prepend.kind === 287 /* InputFiles */) {
+                    if (prepend.kind === 288 /* InputFiles */) {
                         var sourceFile = ts.createUnparsedSourceFile(prepend, "dts", stripInternal);
                         hasNoDefaultLib_1 = hasNoDefaultLib_1 || !!sourceFile.hasNoDefaultLib;
                         collectReferences(sourceFile, refs);
@@ -81450,7 +83874,7 @@ var ts;
             refs.forEach(referenceVisitor);
             var emittedImports = ts.filter(combinedStatements, ts.isAnyImportSyntax);
             if (ts.isExternalModule(node) && (!resultHasExternalModuleIndicator || (needsScopeFixMarker && !resultHasScopeMarker))) {
-                combinedStatements = ts.setTextRange(ts.createNodeArray(combinedStatements.concat([ts.createExportDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, ts.createNamedExports([]), /*moduleSpecifier*/ undefined)])), combinedStatements);
+                combinedStatements = ts.setTextRange(ts.createNodeArray(combinedStatements.concat([createEmptyExports()])), combinedStatements);
             }
             var updated = ts.updateSourceFileNode(node, combinedStatements, /*isDeclarationFile*/ true, references, getFileReferencesForUsedTypeReferences(), node.hasNoDefaultLib, getLibReferences());
             updated.exportedModulesFromDeclarationEmit = exportedModulesFromDeclarationEmit;
@@ -81511,7 +83935,7 @@ var ts;
             if (noResolve || (!ts.isUnparsedSource(sourceFile) && ts.isSourceFileJS(sourceFile)))
                 return ret;
             ts.forEach(sourceFile.referencedFiles, function (f) {
-                var elem = ts.tryResolveScriptReference(host, sourceFile, f);
+                var elem = host.getSourceFileFromReference(sourceFile, f);
                 if (elem) {
                     ret.set("" + ts.getOriginalNodeId(elem), elem);
                 }
@@ -81528,11 +83952,11 @@ var ts;
             return ret;
         }
         function filterBindingPatternInitializers(name) {
-            if (name.kind === 72 /* Identifier */) {
+            if (name.kind === 73 /* Identifier */) {
                 return name;
             }
             else {
-                if (name.kind === 185 /* ArrayBindingPattern */) {
+                if (name.kind === 186 /* ArrayBindingPattern */) {
                     return ts.updateArrayBindingPattern(name, ts.visitNodes(name.elements, visitBindingElement));
                 }
                 else {
@@ -81540,7 +83964,7 @@ var ts;
                 }
             }
             function visitBindingElement(elem) {
-                if (elem.kind === 210 /* OmittedExpression */) {
+                if (elem.kind === 211 /* OmittedExpression */) {
                     return elem;
                 }
                 return ts.updateBindingElement(elem, elem.dotDotDotToken, elem.propertyName, filterBindingPatternInitializers(elem.name), shouldPrintWithInitializer(elem) ? elem.initializer : undefined);
@@ -81578,19 +84002,19 @@ var ts;
                 // Literal const declarations will have an initializer ensured rather than a type
                 return;
             }
-            var shouldUseResolverType = node.kind === 151 /* Parameter */ &&
+            var shouldUseResolverType = node.kind === 152 /* Parameter */ &&
                 (resolver.isRequiredInitializedParameter(node) ||
                     resolver.isOptionalUninitializedParameterProperty(node));
             if (type && !shouldUseResolverType) {
                 return ts.visitNode(type, visitDeclarationSubtree);
             }
             if (!ts.getParseTreeNode(node)) {
-                return type ? ts.visitNode(type, visitDeclarationSubtree) : ts.createKeywordTypeNode(120 /* AnyKeyword */);
+                return type ? ts.visitNode(type, visitDeclarationSubtree) : ts.createKeywordTypeNode(121 /* AnyKeyword */);
             }
-            if (node.kind === 159 /* SetAccessor */) {
+            if (node.kind === 160 /* SetAccessor */) {
                 // Set accessors with no associated type node (from it's param or get accessor return) are `any` since they are never contextually typed right now
                 // (The inferred type here will be void, but the old declaration emitter printed `any`, so this replicates that)
-                return ts.createKeywordTypeNode(120 /* AnyKeyword */);
+                return ts.createKeywordTypeNode(121 /* AnyKeyword */);
             }
             errorNameNode = node.name;
             var oldDiag;
@@ -81598,12 +84022,12 @@ var ts;
                 oldDiag = getSymbolAccessibilityDiagnostic;
                 getSymbolAccessibilityDiagnostic = ts.createGetSymbolAccessibilityDiagnosticForNode(node);
             }
-            if (node.kind === 237 /* VariableDeclaration */ || node.kind === 186 /* BindingElement */) {
+            if (node.kind === 238 /* VariableDeclaration */ || node.kind === 187 /* BindingElement */) {
                 return cleanup(resolver.createTypeOfDeclaration(node, enclosingDeclaration, declarationEmitNodeBuilderFlags, symbolTracker));
             }
-            if (node.kind === 151 /* Parameter */
-                || node.kind === 154 /* PropertyDeclaration */
-                || node.kind === 153 /* PropertySignature */) {
+            if (node.kind === 152 /* Parameter */
+                || node.kind === 155 /* PropertyDeclaration */
+                || node.kind === 154 /* PropertySignature */) {
                 if (!node.initializer)
                     return cleanup(resolver.createTypeOfDeclaration(node, enclosingDeclaration, declarationEmitNodeBuilderFlags, symbolTracker, shouldUseResolverType));
                 return cleanup(resolver.createTypeOfDeclaration(node, enclosingDeclaration, declarationEmitNodeBuilderFlags, symbolTracker, shouldUseResolverType) || resolver.createTypeOfExpression(node.initializer, enclosingDeclaration, declarationEmitNodeBuilderFlags, symbolTracker));
@@ -81614,26 +84038,26 @@ var ts;
                 if (!suppressNewDiagnosticContexts) {
                     getSymbolAccessibilityDiagnostic = oldDiag;
                 }
-                return returnValue || ts.createKeywordTypeNode(120 /* AnyKeyword */);
+                return returnValue || ts.createKeywordTypeNode(121 /* AnyKeyword */);
             }
         }
         function isDeclarationAndNotVisible(node) {
             node = ts.getParseTreeNode(node);
             switch (node.kind) {
-                case 239 /* FunctionDeclaration */:
-                case 244 /* ModuleDeclaration */:
-                case 241 /* InterfaceDeclaration */:
-                case 240 /* ClassDeclaration */:
-                case 242 /* TypeAliasDeclaration */:
-                case 243 /* EnumDeclaration */:
+                case 240 /* FunctionDeclaration */:
+                case 245 /* ModuleDeclaration */:
+                case 242 /* InterfaceDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
+                case 244 /* EnumDeclaration */:
                     return !resolver.isDeclarationVisible(node);
                 // The following should be doing their own visibility checks based on filtering their members
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     return !getBindingNameVisible(node);
-                case 248 /* ImportEqualsDeclaration */:
-                case 249 /* ImportDeclaration */:
-                case 255 /* ExportDeclaration */:
-                case 254 /* ExportAssignment */:
+                case 249 /* ImportEqualsDeclaration */:
+                case 250 /* ImportDeclaration */:
+                case 256 /* ExportDeclaration */:
+                case 255 /* ExportAssignment */:
                     return false;
             }
             return false;
@@ -81687,7 +84111,7 @@ var ts;
         function rewriteModuleSpecifier(parent, input) {
             if (!input)
                 return undefined; // TODO: GH#18217
-            resultHasExternalModuleIndicator = resultHasExternalModuleIndicator || (parent.kind !== 244 /* ModuleDeclaration */ && parent.kind !== 183 /* ImportType */);
+            resultHasExternalModuleIndicator = resultHasExternalModuleIndicator || (parent.kind !== 245 /* ModuleDeclaration */ && parent.kind !== 184 /* ImportType */);
             if (ts.isStringLiteralLike(input)) {
                 if (isBundledEmit) {
                     var newName = ts.getExternalModuleNameFromDeclaration(context.getEmitHost(), resolver, parent);
@@ -81707,7 +84131,7 @@ var ts;
         function transformImportEqualsDeclaration(decl) {
             if (!resolver.isDeclarationVisible(decl))
                 return;
-            if (decl.moduleReference.kind === 259 /* ExternalModuleReference */) {
+            if (decl.moduleReference.kind === 260 /* ExternalModuleReference */) {
                 // Rewrite external module names if necessary
                 var specifier = ts.getExternalModuleImportEqualsDeclarationExpression(decl);
                 return ts.updateImportEqualsDeclaration(decl, 
@@ -81734,7 +84158,7 @@ var ts;
                 return visibleDefaultBinding && ts.updateImportDeclaration(decl, /*decorators*/ undefined, decl.modifiers, ts.updateImportClause(decl.importClause, visibleDefaultBinding, 
                 /*namedBindings*/ undefined), rewriteModuleSpecifier(decl, decl.moduleSpecifier));
             }
-            if (decl.importClause.namedBindings.kind === 251 /* NamespaceImport */) {
+            if (decl.importClause.namedBindings.kind === 252 /* NamespaceImport */) {
                 // Namespace import (optionally with visible default)
                 var namedBindings = resolver.isDeclarationVisible(decl.importClause.namedBindings) ? decl.importClause.namedBindings : /*namedBindings*/ undefined;
                 return visibleDefaultBinding || namedBindings ? ts.updateImportDeclaration(decl, /*decorators*/ undefined, decl.modifiers, ts.updateImportClause(decl.importClause, visibleDefaultBinding, namedBindings), rewriteModuleSpecifier(decl, decl.moduleSpecifier)) : undefined;
@@ -81769,7 +84193,7 @@ var ts;
                 }
                 var priorNeedsDeclare = needsDeclare;
                 needsDeclare = i.parent && ts.isSourceFile(i.parent) && !(ts.isExternalModule(i.parent) && isBundledEmit);
-                var result = transformTopLevelDeclaration(i, /*privateDeclaration*/ true);
+                var result = transformTopLevelDeclaration(i);
                 needsDeclare = priorNeedsDeclare;
                 lateStatementReplacementMap.set("" + ts.getOriginalNodeId(i), result);
             }
@@ -81782,12 +84206,12 @@ var ts;
                     if (lateStatementReplacementMap.has(key)) {
                         var result = lateStatementReplacementMap.get(key);
                         lateStatementReplacementMap.delete(key);
-                        if (result && ts.isSourceFile(statement.parent)) {
+                        if (result) {
                             if (ts.isArray(result) ? ts.some(result, needsScopeMarker) : needsScopeMarker(result)) {
                                 // Top-level declarations in .d.ts files are always considered exported even without a modifier unless there's an export assignment or specifier
                                 needsScopeFixMarker = true;
                             }
-                            if (ts.isArray(result) ? ts.some(result, isExternalModuleIndicator) : isExternalModuleIndicator(result)) {
+                            if (ts.isSourceFile(statement.parent) && (ts.isArray(result) ? ts.some(result, isExternalModuleIndicator) : isExternalModuleIndicator(result))) {
                                 resultHasExternalModuleIndicator = true;
                             }
                         }
@@ -81842,68 +84266,68 @@ var ts;
                 checkEntityNameVisibility(input.exprName, enclosingDeclaration);
             }
             var oldWithinObjectLiteralType = suppressNewDiagnosticContexts;
-            var shouldEnterSuppressNewDiagnosticsContextContext = ((input.kind === 168 /* TypeLiteral */ || input.kind === 181 /* MappedType */) && input.parent.kind !== 242 /* TypeAliasDeclaration */);
+            var shouldEnterSuppressNewDiagnosticsContextContext = ((input.kind === 169 /* TypeLiteral */ || input.kind === 182 /* MappedType */) && input.parent.kind !== 243 /* TypeAliasDeclaration */);
             if (shouldEnterSuppressNewDiagnosticsContextContext) {
                 // We stop making new diagnostic contexts within object literal types. Unless it's an object type on the RHS of a type alias declaration. Then we do.
                 suppressNewDiagnosticContexts = true;
             }
             if (isProcessedComponent(input)) {
                 switch (input.kind) {
-                    case 211 /* ExpressionWithTypeArguments */: {
+                    case 212 /* ExpressionWithTypeArguments */: {
                         if ((ts.isEntityName(input.expression) || ts.isEntityNameExpression(input.expression))) {
                             checkEntityNameVisibility(input.expression, enclosingDeclaration);
                         }
                         var node = ts.visitEachChild(input, visitDeclarationSubtree, context);
                         return cleanup(ts.updateExpressionWithTypeArguments(node, ts.parenthesizeTypeParameters(node.typeArguments), node.expression));
                     }
-                    case 164 /* TypeReference */: {
+                    case 165 /* TypeReference */: {
                         checkEntityNameVisibility(input.typeName, enclosingDeclaration);
                         var node = ts.visitEachChild(input, visitDeclarationSubtree, context);
                         return cleanup(ts.updateTypeReferenceNode(node, node.typeName, ts.parenthesizeTypeParameters(node.typeArguments)));
                     }
-                    case 161 /* ConstructSignature */:
+                    case 162 /* ConstructSignature */:
                         return cleanup(ts.updateConstructSignature(input, ensureTypeParams(input, input.typeParameters), updateParamsList(input, input.parameters), ensureType(input, input.type)));
-                    case 157 /* Constructor */: {
+                    case 158 /* Constructor */: {
                         var isPrivate = ts.hasModifier(input, 8 /* Private */);
                         // A constructor declaration may not have a type annotation
-                        var ctor = ts.createSignatureDeclaration(157 /* Constructor */, isPrivate ? undefined : ensureTypeParams(input, input.typeParameters), 
+                        var ctor = ts.createSignatureDeclaration(158 /* Constructor */, isPrivate ? undefined : ensureTypeParams(input, input.typeParameters), 
                         // TODO: GH#18217
                         isPrivate ? undefined : updateParamsList(input, input.parameters, 0 /* None */), 
                         /*type*/ undefined);
                         ctor.modifiers = ts.createNodeArray(ensureModifiers(input));
                         return cleanup(ctor);
                     }
-                    case 156 /* MethodDeclaration */: {
-                        var sig = ts.createSignatureDeclaration(155 /* MethodSignature */, ensureTypeParams(input, input.typeParameters), updateParamsList(input, input.parameters), ensureType(input, input.type));
+                    case 157 /* MethodDeclaration */: {
+                        var sig = ts.createSignatureDeclaration(156 /* MethodSignature */, ensureTypeParams(input, input.typeParameters), updateParamsList(input, input.parameters), ensureType(input, input.type));
                         sig.name = input.name;
                         sig.modifiers = ts.createNodeArray(ensureModifiers(input));
                         sig.questionToken = input.questionToken;
                         return cleanup(sig);
                     }
-                    case 158 /* GetAccessor */: {
+                    case 159 /* GetAccessor */: {
                         var newNode = ensureAccessor(input);
                         return cleanup(newNode);
                     }
-                    case 159 /* SetAccessor */: {
+                    case 160 /* SetAccessor */: {
                         var newNode = ensureAccessor(input);
                         return cleanup(newNode);
                     }
-                    case 154 /* PropertyDeclaration */:
+                    case 155 /* PropertyDeclaration */:
                         return cleanup(ts.updateProperty(input, 
                         /*decorators*/ undefined, ensureModifiers(input), input.name, input.questionToken, !ts.hasModifier(input, 8 /* Private */) ? ensureType(input, input.type) : undefined, ensureNoInitializer(input)));
-                    case 153 /* PropertySignature */:
+                    case 154 /* PropertySignature */:
                         return cleanup(ts.updatePropertySignature(input, ensureModifiers(input), input.name, input.questionToken, !ts.hasModifier(input, 8 /* Private */) ? ensureType(input, input.type) : undefined, ensureNoInitializer(input)));
-                    case 155 /* MethodSignature */: {
+                    case 156 /* MethodSignature */: {
                         return cleanup(ts.updateMethodSignature(input, ensureTypeParams(input, input.typeParameters), updateParamsList(input, input.parameters), ensureType(input, input.type), input.name, input.questionToken));
                     }
-                    case 160 /* CallSignature */: {
+                    case 161 /* CallSignature */: {
                         return cleanup(ts.updateCallSignature(input, ensureTypeParams(input, input.typeParameters), updateParamsList(input, input.parameters), ensureType(input, input.type)));
                     }
-                    case 162 /* IndexSignature */: {
+                    case 163 /* IndexSignature */: {
                         return cleanup(ts.updateIndexSignature(input, 
-                        /*decorators*/ undefined, ensureModifiers(input), updateParamsList(input, input.parameters), ts.visitNode(input.type, visitDeclarationSubtree) || ts.createKeywordTypeNode(120 /* AnyKeyword */)));
+                        /*decorators*/ undefined, ensureModifiers(input), updateParamsList(input, input.parameters), ts.visitNode(input.type, visitDeclarationSubtree) || ts.createKeywordTypeNode(121 /* AnyKeyword */)));
                     }
-                    case 237 /* VariableDeclaration */: {
+                    case 238 /* VariableDeclaration */: {
                         if (ts.isBindingPattern(input.name)) {
                             return recreateBindingPattern(input.name);
                         }
@@ -81911,13 +84335,13 @@ var ts;
                         suppressNewDiagnosticContexts = true; // Variable declaration types also suppress new diagnostic contexts, provided the contexts wouldn't be made for binding pattern types
                         return cleanup(ts.updateVariableDeclaration(input, input.name, ensureType(input, input.type), ensureNoInitializer(input)));
                     }
-                    case 150 /* TypeParameter */: {
+                    case 151 /* TypeParameter */: {
                         if (isPrivateMethodTypeParameter(input) && (input.default || input.constraint)) {
                             return cleanup(ts.updateTypeParameterDeclaration(input, input.name, /*constraint*/ undefined, /*defaultType*/ undefined));
                         }
                         return cleanup(ts.visitEachChild(input, visitDeclarationSubtree, context));
                     }
-                    case 175 /* ConditionalType */: {
+                    case 176 /* ConditionalType */: {
                         // We have to process conditional types in a special way because for visibility purposes we need to push a new enclosingDeclaration
                         // just for the `infer` types in the true branch. It's an implicit declaration scope that only applies to _part_ of the type.
                         var checkType = ts.visitNode(input.checkType, visitDeclarationSubtree);
@@ -81929,13 +84353,13 @@ var ts;
                         var falseType = ts.visitNode(input.falseType, visitDeclarationSubtree);
                         return cleanup(ts.updateConditionalTypeNode(input, checkType, extendsType, trueType, falseType));
                     }
-                    case 165 /* FunctionType */: {
+                    case 166 /* FunctionType */: {
                         return cleanup(ts.updateFunctionTypeNode(input, ts.visitNodes(input.typeParameters, visitDeclarationSubtree), updateParamsList(input, input.parameters), ts.visitNode(input.type, visitDeclarationSubtree)));
                     }
-                    case 166 /* ConstructorType */: {
+                    case 167 /* ConstructorType */: {
                         return cleanup(ts.updateConstructorTypeNode(input, ts.visitNodes(input.typeParameters, visitDeclarationSubtree), updateParamsList(input, input.parameters), ts.visitNode(input.type, visitDeclarationSubtree)));
                     }
-                    case 183 /* ImportType */: {
+                    case 184 /* ImportType */: {
                         if (!ts.isLiteralImportTypeNode(input))
                             return cleanup(input);
                         return cleanup(ts.updateImportTypeNode(input, ts.updateLiteralTypeNode(input.argument, rewriteModuleSpecifier(input, input.argument.literal)), input.qualifier, ts.visitNodes(input.typeArguments, visitDeclarationSubtree, ts.isTypeNode), input.isTypeOf));
@@ -81964,7 +84388,7 @@ var ts;
             }
         }
         function isPrivateMethodTypeParameter(node) {
-            return node.parent.kind === 156 /* MethodDeclaration */ && ts.hasModifier(node.parent, 8 /* Private */);
+            return node.parent.kind === 157 /* MethodDeclaration */ && ts.hasModifier(node.parent, 8 /* Private */);
         }
         function visitDeclarationStatements(input) {
             if (!isPreservedDeclarationStatement(input)) {
@@ -81974,22 +84398,22 @@ var ts;
             if (shouldStripInternal(input))
                 return;
             switch (input.kind) {
-                case 255 /* ExportDeclaration */: {
+                case 256 /* ExportDeclaration */: {
                     if (ts.isSourceFile(input.parent)) {
                         resultHasExternalModuleIndicator = true;
-                        resultHasScopeMarker = true;
                     }
+                    resultHasScopeMarker = true;
                     // Always visible if the parent node isn't dropped for being not visible
                     // Rewrite external module names if necessary
                     return ts.updateExportDeclaration(input, /*decorators*/ undefined, input.modifiers, input.exportClause, rewriteModuleSpecifier(input, input.moduleSpecifier));
                 }
-                case 254 /* ExportAssignment */: {
+                case 255 /* ExportAssignment */: {
                     // Always visible if the parent node isn't dropped for being not visible
                     if (ts.isSourceFile(input.parent)) {
                         resultHasExternalModuleIndicator = true;
-                        resultHasScopeMarker = true;
                     }
-                    if (input.expression.kind === 72 /* Identifier */) {
+                    resultHasScopeMarker = true;
+                    if (input.expression.kind === 73 /* Identifier */) {
                         return input;
                     }
                     else {
@@ -81999,7 +84423,7 @@ var ts;
                             errorNode: input
                         }); };
                         var varDecl = ts.createVariableDeclaration(newId, resolver.createTypeOfExpression(input.expression, input, declarationEmitNodeBuilderFlags, symbolTracker), /*initializer*/ undefined);
-                        var statement = ts.createVariableStatement(needsDeclare ? [ts.createModifier(125 /* DeclareKeyword */)] : [], ts.createVariableDeclarationList([varDecl], 2 /* Const */));
+                        var statement = ts.createVariableStatement(needsDeclare ? [ts.createModifier(126 /* DeclareKeyword */)] : [], ts.createVariableDeclarationList([varDecl], 2 /* Const */));
                         return [statement, ts.updateExportAssignment(input, input.decorators, input.modifiers, newId)];
                     }
                 }
@@ -82009,14 +84433,25 @@ var ts;
             lateStatementReplacementMap.set("" + ts.getOriginalNodeId(input), result);
             return input;
         }
-        function transformTopLevelDeclaration(input, isPrivate) {
+        function stripExportModifiers(statement) {
+            if (ts.isImportEqualsDeclaration(statement) || ts.hasModifier(statement, 512 /* Default */)) {
+                // `export import` statements should remain as-is, as imports are _not_ implicitly exported in an ambient namespace
+                // Likewise, `export default` classes and the like and just be `default`, so we preserve their `export` modifiers, too
+                return statement;
+            }
+            var clone = ts.getMutableClone(statement);
+            var modifiers = ts.createModifiersFromModifierFlags(ts.getModifierFlags(statement) & (3071 /* All */ ^ 1 /* Export */));
+            clone.modifiers = modifiers.length ? ts.createNodeArray(modifiers) : undefined;
+            return clone;
+        }
+        function transformTopLevelDeclaration(input) {
             if (shouldStripInternal(input))
                 return;
             switch (input.kind) {
-                case 248 /* ImportEqualsDeclaration */: {
+                case 249 /* ImportEqualsDeclaration */: {
                     return transformImportEqualsDeclaration(input);
                 }
-                case 249 /* ImportDeclaration */: {
+                case 250 /* ImportDeclaration */: {
                     return transformImportDeclaration(input);
                 }
             }
@@ -82037,51 +84472,97 @@ var ts;
             }
             var previousNeedsDeclare = needsDeclare;
             switch (input.kind) {
-                case 242 /* TypeAliasDeclaration */: // Type aliases get `declare`d if need be (for legacy support), but that's all
+                case 243 /* TypeAliasDeclaration */: // Type aliases get `declare`d if need be (for legacy support), but that's all
                     return cleanup(ts.updateTypeAliasDeclaration(input, 
-                    /*decorators*/ undefined, ensureModifiers(input, isPrivate), input.name, ts.visitNodes(input.typeParameters, visitDeclarationSubtree, ts.isTypeParameterDeclaration), ts.visitNode(input.type, visitDeclarationSubtree, ts.isTypeNode)));
-                case 241 /* InterfaceDeclaration */: {
+                    /*decorators*/ undefined, ensureModifiers(input), input.name, ts.visitNodes(input.typeParameters, visitDeclarationSubtree, ts.isTypeParameterDeclaration), ts.visitNode(input.type, visitDeclarationSubtree, ts.isTypeNode)));
+                case 242 /* InterfaceDeclaration */: {
                     return cleanup(ts.updateInterfaceDeclaration(input, 
-                    /*decorators*/ undefined, ensureModifiers(input, isPrivate), input.name, ensureTypeParams(input, input.typeParameters), transformHeritageClauses(input.heritageClauses), ts.visitNodes(input.members, visitDeclarationSubtree)));
+                    /*decorators*/ undefined, ensureModifiers(input), input.name, ensureTypeParams(input, input.typeParameters), transformHeritageClauses(input.heritageClauses), ts.visitNodes(input.members, visitDeclarationSubtree)));
                 }
-                case 239 /* FunctionDeclaration */: {
+                case 240 /* FunctionDeclaration */: {
                     // Generators lose their generator-ness, excepting their return type
                     var clean = cleanup(ts.updateFunctionDeclaration(input, 
-                    /*decorators*/ undefined, ensureModifiers(input, isPrivate), 
+                    /*decorators*/ undefined, ensureModifiers(input), 
                     /*asteriskToken*/ undefined, input.name, ensureTypeParams(input, input.typeParameters), updateParamsList(input, input.parameters), ensureType(input, input.type), 
                     /*body*/ undefined));
                     if (clean && resolver.isExpandoFunctionDeclaration(input)) {
-                        var declarations = ts.mapDefined(resolver.getPropertiesOfContainerFunction(input), function (p) {
+                        var props = resolver.getPropertiesOfContainerFunction(input);
+                        var fakespace_1 = ts.createModuleDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, clean.name || ts.createIdentifier("_default"), ts.createModuleBlock([]), 16 /* Namespace */);
+                        fakespace_1.flags ^= 8 /* Synthesized */; // unset synthesized so it is usable as an enclosing declaration
+                        fakespace_1.parent = enclosingDeclaration;
+                        fakespace_1.locals = ts.createSymbolTable(props);
+                        fakespace_1.symbol = props[0].parent;
+                        var declarations = ts.mapDefined(props, function (p) {
                             if (!ts.isPropertyAccessExpression(p.valueDeclaration)) {
                                 return undefined;
                             }
                             getSymbolAccessibilityDiagnostic = ts.createGetSymbolAccessibilityDiagnosticForNode(p.valueDeclaration);
-                            var type = resolver.createTypeOfDeclaration(p.valueDeclaration, enclosingDeclaration, declarationEmitNodeBuilderFlags, symbolTracker);
+                            var type = resolver.createTypeOfDeclaration(p.valueDeclaration, fakespace_1, declarationEmitNodeBuilderFlags, symbolTracker);
                             getSymbolAccessibilityDiagnostic = oldDiag;
                             var varDecl = ts.createVariableDeclaration(ts.unescapeLeadingUnderscores(p.escapedName), type, /*initializer*/ undefined);
                             return ts.createVariableStatement(/*modifiers*/ undefined, ts.createVariableDeclarationList([varDecl]));
                         });
-                        var namespaceDecl = ts.createModuleDeclaration(/*decorators*/ undefined, ensureModifiers(input, isPrivate), input.name, ts.createModuleBlock(declarations), 16 /* Namespace */);
-                        return [clean, namespaceDecl];
+                        var namespaceDecl = ts.createModuleDeclaration(/*decorators*/ undefined, ensureModifiers(input), input.name, ts.createModuleBlock(declarations), 16 /* Namespace */);
+                        if (!ts.hasModifier(clean, 512 /* Default */)) {
+                            return [clean, namespaceDecl];
+                        }
+                        var modifiers = ts.createModifiersFromModifierFlags((ts.getModifierFlags(clean) & ~513 /* ExportDefault */) | 2 /* Ambient */);
+                        var cleanDeclaration = ts.updateFunctionDeclaration(clean, 
+                        /*decorators*/ undefined, modifiers, 
+                        /*asteriskToken*/ undefined, clean.name, clean.typeParameters, clean.parameters, clean.type, 
+                        /*body*/ undefined);
+                        var namespaceDeclaration = ts.updateModuleDeclaration(namespaceDecl, 
+                        /*decorators*/ undefined, modifiers, namespaceDecl.name, namespaceDecl.body);
+                        var exportDefaultDeclaration = ts.createExportAssignment(
+                        /*decorators*/ undefined, 
+                        /*modifiers*/ undefined, 
+                        /*isExportEquals*/ false, namespaceDecl.name);
+                        if (ts.isSourceFile(input.parent)) {
+                            resultHasExternalModuleIndicator = true;
+                        }
+                        resultHasScopeMarker = true;
+                        return [cleanDeclaration, namespaceDeclaration, exportDefaultDeclaration];
                     }
                     else {
                         return clean;
                     }
                 }
-                case 244 /* ModuleDeclaration */: {
+                case 245 /* ModuleDeclaration */: {
                     needsDeclare = false;
                     var inner = input.body;
-                    if (inner && inner.kind === 245 /* ModuleBlock */) {
+                    if (inner && inner.kind === 246 /* ModuleBlock */) {
+                        var oldNeedsScopeFix = needsScopeFixMarker;
+                        var oldHasScopeFix = resultHasScopeMarker;
+                        resultHasScopeMarker = false;
+                        needsScopeFixMarker = false;
                         var statements = ts.visitNodes(inner.statements, visitDeclarationStatements);
-                        var body = ts.updateModuleBlock(inner, transformAndReplaceLatePaintedStatements(statements));
+                        var lateStatements = transformAndReplaceLatePaintedStatements(statements);
+                        if (input.flags & 4194304 /* Ambient */) {
+                            needsScopeFixMarker = false; // If it was `declare`'d everything is implicitly exported already, ignore late printed "privates"
+                        }
+                        // With the final list of statements, there are 3 possibilities:
+                        // 1. There's an export assignment or export declaration in the namespace - do nothing
+                        // 2. Everything is exported and there are no export assignments or export declarations - strip all export modifiers
+                        // 3. Some things are exported, some are not, and there's no marker - add an empty marker
+                        if (!ts.isGlobalScopeAugmentation(input) && !hasScopeMarker(lateStatements) && !resultHasScopeMarker) {
+                            if (needsScopeFixMarker) {
+                                lateStatements = ts.createNodeArray(lateStatements.concat([createEmptyExports()]));
+                            }
+                            else {
+                                lateStatements = ts.visitNodes(lateStatements, stripExportModifiers);
+                            }
+                        }
+                        var body = ts.updateModuleBlock(inner, lateStatements);
                         needsDeclare = previousNeedsDeclare;
-                        var mods = ensureModifiers(input, isPrivate);
+                        needsScopeFixMarker = oldNeedsScopeFix;
+                        resultHasScopeMarker = oldHasScopeFix;
+                        var mods = ensureModifiers(input);
                         return cleanup(ts.updateModuleDeclaration(input, 
                         /*decorators*/ undefined, mods, ts.isExternalModuleAugmentation(input) ? rewriteModuleSpecifier(input, input.name) : input.name, body));
                     }
                     else {
                         needsDeclare = previousNeedsDeclare;
-                        var mods = ensureModifiers(input, isPrivate);
+                        var mods = ensureModifiers(input);
                         needsDeclare = false;
                         ts.visitNode(inner, visitDeclarationStatements);
                         // eagerly transform nested namespaces (the nesting doesn't need any elision or painting done)
@@ -82092,18 +84573,18 @@ var ts;
                         /*decorators*/ undefined, mods, input.name, body));
                     }
                 }
-                case 240 /* ClassDeclaration */: {
-                    var modifiers = ts.createNodeArray(ensureModifiers(input, isPrivate));
+                case 241 /* ClassDeclaration */: {
+                    var modifiers = ts.createNodeArray(ensureModifiers(input));
                     var typeParameters = ensureTypeParams(input, input.typeParameters);
                     var ctor = ts.getFirstConstructorWithBody(input);
                     var parameterProperties = void 0;
                     if (ctor) {
                         var oldDiag_1 = getSymbolAccessibilityDiagnostic;
                         parameterProperties = ts.compact(ts.flatMap(ctor.parameters, function (param) {
-                            if (!ts.hasModifier(param, 92 /* ParameterPropertyModifier */))
+                            if (!ts.hasModifier(param, 92 /* ParameterPropertyModifier */) || shouldStripInternal(param))
                                 return;
                             getSymbolAccessibilityDiagnostic = ts.createGetSymbolAccessibilityDiagnosticForNode(param);
-                            if (param.name.kind === 72 /* Identifier */) {
+                            if (param.name.kind === 73 /* Identifier */) {
                                 return preserveJsDoc(ts.createProperty(
                                 /*decorators*/ undefined, ensureModifiers(param), param.name, param.questionToken, ensureType(param, param.type), ensureNoInitializer(param)), param);
                             }
@@ -82133,7 +84614,7 @@ var ts;
                     }
                     var members = ts.createNodeArray(ts.concatenate(parameterProperties, ts.visitNodes(input.members, visitDeclarationSubtree)));
                     var extendsClause_1 = ts.getEffectiveBaseTypeNode(input);
-                    if (extendsClause_1 && !ts.isEntityNameExpression(extendsClause_1.expression) && extendsClause_1.expression.kind !== 96 /* NullKeyword */) {
+                    if (extendsClause_1 && !ts.isEntityNameExpression(extendsClause_1.expression) && extendsClause_1.expression.kind !== 97 /* NullKeyword */) {
                         // We must add a temporary declaration for the extends clause expression
                         var oldId = input.name ? ts.unescapeLeadingUnderscores(input.name.escapedText) : "default";
                         var newId_1 = ts.createOptimisticUniqueName(oldId + "_base");
@@ -82143,16 +84624,16 @@ var ts;
                             typeName: input.name
                         }); };
                         var varDecl = ts.createVariableDeclaration(newId_1, resolver.createTypeOfExpression(extendsClause_1.expression, input, declarationEmitNodeBuilderFlags, symbolTracker), /*initializer*/ undefined);
-                        var statement = ts.createVariableStatement(needsDeclare ? [ts.createModifier(125 /* DeclareKeyword */)] : [], ts.createVariableDeclarationList([varDecl], 2 /* Const */));
+                        var statement = ts.createVariableStatement(needsDeclare ? [ts.createModifier(126 /* DeclareKeyword */)] : [], ts.createVariableDeclarationList([varDecl], 2 /* Const */));
                         var heritageClauses = ts.createNodeArray(ts.map(input.heritageClauses, function (clause) {
-                            if (clause.token === 86 /* ExtendsKeyword */) {
+                            if (clause.token === 87 /* ExtendsKeyword */) {
                                 var oldDiag_2 = getSymbolAccessibilityDiagnostic;
                                 getSymbolAccessibilityDiagnostic = ts.createGetSymbolAccessibilityDiagnosticForNode(clause.types[0]);
                                 var newClause = ts.updateHeritageClause(clause, ts.map(clause.types, function (t) { return ts.updateExpressionWithTypeArguments(t, ts.visitNodes(t.typeArguments, visitDeclarationSubtree), newId_1); }));
                                 getSymbolAccessibilityDiagnostic = oldDiag_2;
                                 return newClause;
                             }
-                            return ts.updateHeritageClause(clause, ts.visitNodes(ts.createNodeArray(ts.filter(clause.types, function (t) { return ts.isEntityNameExpression(t.expression) || t.expression.kind === 96 /* NullKeyword */; })), visitDeclarationSubtree));
+                            return ts.updateHeritageClause(clause, ts.visitNodes(ts.createNodeArray(ts.filter(clause.types, function (t) { return ts.isEntityNameExpression(t.expression) || t.expression.kind === 97 /* NullKeyword */; })), visitDeclarationSubtree));
                         }));
                         return [statement, cleanup(ts.updateClassDeclaration(input, 
                             /*decorators*/ undefined, modifiers, input.name, typeParameters, heritageClauses, members))]; // TODO: GH#18217
@@ -82163,11 +84644,11 @@ var ts;
                         /*decorators*/ undefined, modifiers, input.name, typeParameters, heritageClauses, members));
                     }
                 }
-                case 219 /* VariableStatement */: {
-                    return cleanup(transformVariableStatement(input, isPrivate));
+                case 220 /* VariableStatement */: {
+                    return cleanup(transformVariableStatement(input));
                 }
-                case 243 /* EnumDeclaration */: {
-                    return cleanup(ts.updateEnumDeclaration(input, /*decorators*/ undefined, ts.createNodeArray(ensureModifiers(input, isPrivate)), input.name, ts.createNodeArray(ts.mapDefined(input.members, function (m) {
+                case 244 /* EnumDeclaration */: {
+                    return cleanup(ts.updateEnumDeclaration(input, /*decorators*/ undefined, ts.createNodeArray(ensureModifiers(input)), input.name, ts.createNodeArray(ts.mapDefined(input.members, function (m) {
                         if (shouldStripInternal(m))
                             return;
                         // Rewrite enum values to their constants, if available
@@ -82185,7 +84666,7 @@ var ts;
                 if (canProdiceDiagnostic) {
                     getSymbolAccessibilityDiagnostic = oldDiag;
                 }
-                if (input.kind === 244 /* ModuleDeclaration */) {
+                if (input.kind === 245 /* ModuleDeclaration */) {
                     needsDeclare = previousNeedsDeclare;
                 }
                 if (node === input) {
@@ -82194,19 +84675,19 @@ var ts;
                 return node && ts.setOriginalNode(preserveJsDoc(node, input), input);
             }
         }
-        function transformVariableStatement(input, privateDeclaration) {
+        function transformVariableStatement(input) {
             if (!ts.forEach(input.declarationList.declarations, getBindingNameVisible))
                 return;
             var nodes = ts.visitNodes(input.declarationList.declarations, visitDeclarationSubtree);
             if (!ts.length(nodes))
                 return;
-            return ts.updateVariableStatement(input, ts.createNodeArray(ensureModifiers(input, privateDeclaration)), ts.updateVariableDeclarationList(input.declarationList, nodes));
+            return ts.updateVariableStatement(input, ts.createNodeArray(ensureModifiers(input)), ts.updateVariableDeclarationList(input.declarationList, nodes));
         }
         function recreateBindingPattern(d) {
             return ts.flatten(ts.mapDefined(d.elements, function (e) { return recreateBindingElement(e); }));
         }
         function recreateBindingElement(e) {
-            if (e.kind === 210 /* OmittedExpression */) {
+            if (e.kind === 211 /* OmittedExpression */) {
                 return;
             }
             if (e.name) {
@@ -82242,26 +84723,23 @@ var ts;
         function isScopeMarker(node) {
             return ts.isExportAssignment(node) || ts.isExportDeclaration(node);
         }
-        function hasScopeMarker(node) {
-            if (ts.isModuleBlock(node)) {
-                return ts.some(node.statements, isScopeMarker);
-            }
-            return false;
+        function hasScopeMarker(statements) {
+            return ts.some(statements, isScopeMarker);
         }
-        function ensureModifiers(node, privateDeclaration) {
+        function ensureModifiers(node) {
             var currentFlags = ts.getModifierFlags(node);
-            var newFlags = ensureModifierFlags(node, privateDeclaration);
+            var newFlags = ensureModifierFlags(node);
             if (currentFlags === newFlags) {
                 return node.modifiers;
             }
             return ts.createModifiersFromModifierFlags(newFlags);
         }
-        function ensureModifierFlags(node, privateDeclaration) {
+        function ensureModifierFlags(node) {
             var mask = 3071 /* All */ ^ (4 /* Public */ | 256 /* Async */); // No async modifiers in declaration files
             var additions = (needsDeclare && !isAlwaysType(node)) ? 2 /* Ambient */ : 0 /* None */;
-            var parentIsFile = node.parent.kind === 284 /* SourceFile */;
+            var parentIsFile = node.parent.kind === 285 /* SourceFile */;
             if (!parentIsFile || (isBundledEmit && parentIsFile && ts.isExternalModule(node.parent))) {
-                mask ^= ((privateDeclaration || (isBundledEmit && parentIsFile) || hasScopeMarker(node.parent) ? 0 : 1 /* Export */) | 2 /* Ambient */);
+                mask ^= 2 /* Ambient */;
                 additions = 0 /* None */;
             }
             return maskModifierFlags(node, mask, additions);
@@ -82280,7 +84758,7 @@ var ts;
             var prop = ts.createProperty(/*decorators*/ undefined, maskModifiers(node, /*mask*/ undefined, (!accessors.setAccessor) ? 64 /* Readonly */ : 0 /* None */), node.name, node.questionToken, ensureType(node, accessorType), /*initializer*/ undefined);
             var leadingsSyntheticCommentRanges = accessors.secondAccessor && ts.getLeadingCommentRangesOfNode(accessors.secondAccessor, currentSourceFile);
             if (leadingsSyntheticCommentRanges) {
-                var _loop_10 = function (range) {
+                var _loop_15 = function (range) {
                     if (range.kind === 3 /* MultiLineCommentTrivia */) {
                         var text = currentSourceFile.text.slice(range.pos + 2, range.end - 2);
                         var lines = text.split(/\r\n?|\n/g);
@@ -82294,20 +84772,20 @@ var ts;
                 };
                 for (var _i = 0, leadingsSyntheticCommentRanges_1 = leadingsSyntheticCommentRanges; _i < leadingsSyntheticCommentRanges_1.length; _i++) {
                     var range = leadingsSyntheticCommentRanges_1[_i];
-                    _loop_10(range);
+                    _loop_15(range);
                 }
             }
             return prop;
         }
         function transformHeritageClauses(nodes) {
             return ts.createNodeArray(ts.filter(ts.map(nodes, function (clause) { return ts.updateHeritageClause(clause, ts.visitNodes(ts.createNodeArray(ts.filter(clause.types, function (t) {
-                return ts.isEntityNameExpression(t.expression) || (clause.token === 86 /* ExtendsKeyword */ && t.expression.kind === 96 /* NullKeyword */);
+                return ts.isEntityNameExpression(t.expression) || (clause.token === 87 /* ExtendsKeyword */ && t.expression.kind === 97 /* NullKeyword */);
             })), visitDeclarationSubtree)); }), function (clause) { return clause.types && !!clause.types.length; }));
         }
     }
     ts.transformDeclarations = transformDeclarations;
     function isAlwaysType(node) {
-        if (node.kind === 241 /* InterfaceDeclaration */) {
+        if (node.kind === 242 /* InterfaceDeclaration */) {
             return true;
         }
         return false;
@@ -82332,7 +84810,7 @@ var ts;
     }
     function getTypeAnnotationFromAccessor(accessor) {
         if (accessor) {
-            return accessor.kind === 158 /* GetAccessor */
+            return accessor.kind === 159 /* GetAccessor */
                 ? accessor.type // Getter - return type
                 : accessor.parameters.length > 0
                     ? accessor.parameters[0].type // Setter parameter type
@@ -82341,52 +84819,52 @@ var ts;
     }
     function canHaveLiteralInitializer(node) {
         switch (node.kind) {
-            case 154 /* PropertyDeclaration */:
-            case 153 /* PropertySignature */:
+            case 155 /* PropertyDeclaration */:
+            case 154 /* PropertySignature */:
                 return !ts.hasModifier(node, 8 /* Private */);
-            case 151 /* Parameter */:
-            case 237 /* VariableDeclaration */:
+            case 152 /* Parameter */:
+            case 238 /* VariableDeclaration */:
                 return true;
         }
         return false;
     }
     function isPreservedDeclarationStatement(node) {
         switch (node.kind) {
-            case 239 /* FunctionDeclaration */:
-            case 244 /* ModuleDeclaration */:
-            case 248 /* ImportEqualsDeclaration */:
-            case 241 /* InterfaceDeclaration */:
-            case 240 /* ClassDeclaration */:
-            case 242 /* TypeAliasDeclaration */:
-            case 243 /* EnumDeclaration */:
-            case 219 /* VariableStatement */:
-            case 249 /* ImportDeclaration */:
-            case 255 /* ExportDeclaration */:
-            case 254 /* ExportAssignment */:
+            case 240 /* FunctionDeclaration */:
+            case 245 /* ModuleDeclaration */:
+            case 249 /* ImportEqualsDeclaration */:
+            case 242 /* InterfaceDeclaration */:
+            case 241 /* ClassDeclaration */:
+            case 243 /* TypeAliasDeclaration */:
+            case 244 /* EnumDeclaration */:
+            case 220 /* VariableStatement */:
+            case 250 /* ImportDeclaration */:
+            case 256 /* ExportDeclaration */:
+            case 255 /* ExportAssignment */:
                 return true;
         }
         return false;
     }
     function isProcessedComponent(node) {
         switch (node.kind) {
-            case 161 /* ConstructSignature */:
-            case 157 /* Constructor */:
-            case 156 /* MethodDeclaration */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
-            case 154 /* PropertyDeclaration */:
-            case 153 /* PropertySignature */:
-            case 155 /* MethodSignature */:
-            case 160 /* CallSignature */:
-            case 162 /* IndexSignature */:
-            case 237 /* VariableDeclaration */:
-            case 150 /* TypeParameter */:
-            case 211 /* ExpressionWithTypeArguments */:
-            case 164 /* TypeReference */:
-            case 175 /* ConditionalType */:
-            case 165 /* FunctionType */:
-            case 166 /* ConstructorType */:
-            case 183 /* ImportType */:
+            case 162 /* ConstructSignature */:
+            case 158 /* Constructor */:
+            case 157 /* MethodDeclaration */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
+            case 155 /* PropertyDeclaration */:
+            case 154 /* PropertySignature */:
+            case 156 /* MethodSignature */:
+            case 161 /* CallSignature */:
+            case 163 /* IndexSignature */:
+            case 238 /* VariableDeclaration */:
+            case 151 /* TypeParameter */:
+            case 212 /* ExpressionWithTypeArguments */:
+            case 165 /* TypeReference */:
+            case 176 /* ConditionalType */:
+            case 166 /* FunctionType */:
+            case 167 /* ConstructorType */:
+            case 184 /* ImportType */:
                 return true;
         }
         return false;
@@ -82418,17 +84896,28 @@ var ts;
         SyntaxKindFeatureFlags[SyntaxKindFeatureFlags["Substitution"] = 1] = "Substitution";
         SyntaxKindFeatureFlags[SyntaxKindFeatureFlags["EmitNotifications"] = 2] = "EmitNotifications";
     })(SyntaxKindFeatureFlags || (SyntaxKindFeatureFlags = {}));
-    function getTransformers(compilerOptions, customTransformers) {
+    ts.noTransformers = { scriptTransformers: ts.emptyArray, declarationTransformers: ts.emptyArray };
+    function getTransformers(compilerOptions, customTransformers, emitOnlyDtsFiles) {
+        return {
+            scriptTransformers: getScriptTransformers(compilerOptions, customTransformers, emitOnlyDtsFiles),
+            declarationTransformers: getDeclarationTransformers(customTransformers),
+        };
+    }
+    ts.getTransformers = getTransformers;
+    function getScriptTransformers(compilerOptions, customTransformers, emitOnlyDtsFiles) {
+        if (emitOnlyDtsFiles)
+            return ts.emptyArray;
         var jsx = compilerOptions.jsx;
         var languageVersion = ts.getEmitScriptTarget(compilerOptions);
         var moduleKind = ts.getEmitModuleKind(compilerOptions);
         var transformers = [];
-        ts.addRange(transformers, customTransformers && customTransformers.before);
+        ts.addRange(transformers, customTransformers && ts.map(customTransformers.before, wrapScriptTransformerFactory));
         transformers.push(ts.transformTypeScript);
+        transformers.push(ts.transformClassFields);
         if (jsx === 2 /* React */) {
             transformers.push(ts.transformJsx);
         }
-        if (languageVersion < 7 /* ESNext */) {
+        if (languageVersion < 99 /* ESNext */) {
             transformers.push(ts.transformESNext);
         }
         if (languageVersion < 6 /* ES2019 */) {
@@ -82453,10 +84942,38 @@ var ts;
         if (languageVersion < 1 /* ES5 */) {
             transformers.push(ts.transformES5);
         }
-        ts.addRange(transformers, customTransformers && customTransformers.after);
+        ts.addRange(transformers, customTransformers && ts.map(customTransformers.after, wrapScriptTransformerFactory));
         return transformers;
     }
-    ts.getTransformers = getTransformers;
+    function getDeclarationTransformers(customTransformers) {
+        var transformers = [];
+        transformers.push(ts.transformDeclarations);
+        ts.addRange(transformers, customTransformers && ts.map(customTransformers.afterDeclarations, wrapDeclarationTransformerFactory));
+        return transformers;
+    }
+    /**
+     * Wrap a custom script or declaration transformer object in a `Transformer` callback with fallback support for transforming bundles.
+     */
+    function wrapCustomTransformer(transformer) {
+        return function (node) { return ts.isBundle(node) ? transformer.transformBundle(node) : transformer.transformSourceFile(node); };
+    }
+    /**
+     * Wrap a transformer factory that may return a custom script or declaration transformer object.
+     */
+    function wrapCustomTransformerFactory(transformer, handleDefault) {
+        return function (context) {
+            var customTransformer = transformer(context);
+            return typeof customTransformer === "function"
+                ? handleDefault(customTransformer)
+                : wrapCustomTransformer(customTransformer);
+        };
+    }
+    function wrapScriptTransformerFactory(transformer) {
+        return wrapCustomTransformerFactory(transformer, ts.chainBundle);
+    }
+    function wrapDeclarationTransformerFactory(transformer) {
+        return wrapCustomTransformerFactory(transformer, ts.identity);
+    }
     function noEmitSubstitution(_hint, node) {
         return node;
     }
@@ -82476,7 +84993,7 @@ var ts;
      * @param allowDtsFiles A value indicating whether to allow the transformation of .d.ts files.
      */
     function transformNodes(resolver, host, options, nodes, transformers, allowDtsFiles) {
-        var enabledSyntaxKindFeatures = new Array(317 /* Count */);
+        var enabledSyntaxKindFeatures = new Array(319 /* Count */);
         var lexicalEnvironmentVariableDeclarations;
         var lexicalEnvironmentFunctionDeclarations;
         var lexicalEnvironmentVariableDeclarationsStack = [];
@@ -82529,7 +85046,14 @@ var ts;
         }
         ts.performance.mark("beforeTransform");
         // Chain together and initialize each transformer.
-        var transformation = ts.chain.apply(void 0, transformers)(context);
+        var transformersWithContext = transformers.map(function (t) { return t(context); });
+        var transformation = function (node) {
+            for (var _i = 0, transformersWithContext_1 = transformersWithContext; _i < transformersWithContext_1.length; _i++) {
+                var transform = transformersWithContext_1[_i];
+                node = transform(node);
+            }
+            return node;
+        };
         // prevent modification of transformation hooks.
         state = 1 /* Initialized */;
         // Transform each node.
@@ -82681,6 +85205,7 @@ var ts;
                 if (lexicalEnvironmentVariableDeclarations) {
                     var statement = ts.createVariableStatement(
                     /*modifiers*/ undefined, ts.createVariableDeclarationList(lexicalEnvironmentVariableDeclarations));
+                    ts.setEmitFlags(statement, 1048576 /* CustomPrologue */);
                     if (!statements) {
                         statements = [statement];
                     }
@@ -82788,7 +85313,7 @@ var ts;
     /*@internal*/
     function getOutputPathForBuildInfo(options) {
         var configFile = options.configFilePath;
-        if (!configFile || !ts.isIncrementalCompilation(options))
+        if (!ts.isIncrementalCompilation(options))
             return undefined;
         if (options.tsBuildInfoFile)
             return options.tsBuildInfoFile;
@@ -82798,6 +85323,8 @@ var ts;
             buildInfoExtensionLess = ts.removeFileExtension(outPath);
         }
         else {
+            if (!configFile)
+                return undefined;
             var configFileExtensionLess = ts.removeFileExtension(configFile);
             buildInfoExtensionLess = options.outDir ?
                 options.rootDir ?
@@ -82822,7 +85349,7 @@ var ts;
     /*@internal*/
     function getOutputPathsFor(sourceFile, host, forceDtsPaths) {
         var options = host.getCompilerOptions();
-        if (sourceFile.kind === 285 /* Bundle */) {
+        if (sourceFile.kind === 286 /* Bundle */) {
             return getOutputPathsForBundle(options, forceDtsPaths);
         }
         else {
@@ -82865,16 +85392,99 @@ var ts;
         return ".js" /* Js */;
     }
     ts.getOutputExtension = getOutputExtension;
+    function rootDirOfOptions(configFile) {
+        return configFile.options.rootDir || ts.getDirectoryPath(ts.Debug.assertDefined(configFile.options.configFilePath));
+    }
+    function getOutputPathWithoutChangingExt(inputFileName, configFile, ignoreCase, outputDir) {
+        return outputDir ?
+            ts.resolvePath(outputDir, ts.getRelativePathFromDirectory(rootDirOfOptions(configFile), inputFileName, ignoreCase)) :
+            inputFileName;
+    }
+    /* @internal */
+    function getOutputDeclarationFileName(inputFileName, configFile, ignoreCase) {
+        ts.Debug.assert(!ts.fileExtensionIs(inputFileName, ".d.ts" /* Dts */) && ts.hasTSFileExtension(inputFileName));
+        return ts.changeExtension(getOutputPathWithoutChangingExt(inputFileName, configFile, ignoreCase, configFile.options.declarationDir || configFile.options.outDir), ".d.ts" /* Dts */);
+    }
+    ts.getOutputDeclarationFileName = getOutputDeclarationFileName;
+    function getOutputJSFileName(inputFileName, configFile, ignoreCase) {
+        var isJsonFile = ts.fileExtensionIs(inputFileName, ".json" /* Json */);
+        var outputFileName = ts.changeExtension(getOutputPathWithoutChangingExt(inputFileName, configFile, ignoreCase, configFile.options.outDir), isJsonFile ?
+            ".json" /* Json */ :
+            ts.fileExtensionIs(inputFileName, ".tsx" /* Tsx */) && configFile.options.jsx === 1 /* Preserve */ ?
+                ".jsx" /* Jsx */ :
+                ".js" /* Js */);
+        return !isJsonFile || ts.comparePaths(inputFileName, outputFileName, ts.Debug.assertDefined(configFile.options.configFilePath), ignoreCase) !== 0 /* EqualTo */ ?
+            outputFileName :
+            undefined;
+    }
+    /*@internal*/
+    function getAllProjectOutputs(configFile, ignoreCase) {
+        var outputs;
+        var addOutput = function (path) { return path && (outputs || (outputs = [])).push(path); };
+        if (configFile.options.outFile || configFile.options.out) {
+            var _a = getOutputPathsForBundle(configFile.options, /*forceDtsPaths*/ false), jsFilePath = _a.jsFilePath, sourceMapFilePath = _a.sourceMapFilePath, declarationFilePath = _a.declarationFilePath, declarationMapPath = _a.declarationMapPath, buildInfoPath = _a.buildInfoPath;
+            addOutput(jsFilePath);
+            addOutput(sourceMapFilePath);
+            addOutput(declarationFilePath);
+            addOutput(declarationMapPath);
+            addOutput(buildInfoPath);
+        }
+        else {
+            for (var _b = 0, _c = configFile.fileNames; _b < _c.length; _b++) {
+                var inputFileName = _c[_b];
+                if (ts.fileExtensionIs(inputFileName, ".d.ts" /* Dts */))
+                    continue;
+                var js = getOutputJSFileName(inputFileName, configFile, ignoreCase);
+                addOutput(js);
+                if (ts.fileExtensionIs(inputFileName, ".json" /* Json */))
+                    continue;
+                if (configFile.options.sourceMap) {
+                    addOutput(js + ".map");
+                }
+                if (ts.getEmitDeclarations(configFile.options) && ts.hasTSFileExtension(inputFileName)) {
+                    var dts = getOutputDeclarationFileName(inputFileName, configFile, ignoreCase);
+                    addOutput(dts);
+                    if (configFile.options.declarationMap) {
+                        addOutput(dts + ".map");
+                    }
+                }
+            }
+            addOutput(getOutputPathForBuildInfo(configFile.options));
+        }
+        return outputs || ts.emptyArray;
+    }
+    ts.getAllProjectOutputs = getAllProjectOutputs;
+    /*@internal*/
+    function getFirstProjectOutput(configFile, ignoreCase) {
+        if (configFile.options.outFile || configFile.options.out) {
+            var jsFilePath = getOutputPathsForBundle(configFile.options, /*forceDtsPaths*/ false).jsFilePath;
+            return ts.Debug.assertDefined(jsFilePath, "project " + configFile.options.configFilePath + " expected to have at least one output");
+        }
+        for (var _a = 0, _b = configFile.fileNames; _a < _b.length; _a++) {
+            var inputFileName = _b[_a];
+            if (ts.fileExtensionIs(inputFileName, ".d.ts" /* Dts */))
+                continue;
+            var jsFilePath = getOutputJSFileName(inputFileName, configFile, ignoreCase);
+            if (jsFilePath)
+                return jsFilePath;
+        }
+        var buildInfoPath = getOutputPathForBuildInfo(configFile.options);
+        if (buildInfoPath)
+            return buildInfoPath;
+        return ts.Debug.fail("project " + configFile.options.configFilePath + " expected to have at least one output");
+    }
+    ts.getFirstProjectOutput = getFirstProjectOutput;
     /*@internal*/
     // targetSourceFile is when users only want one file in entire project to be emitted. This is used in compileOnSave feature
-    function emitFiles(resolver, host, targetSourceFile, emitOnlyDtsFiles, transformers, declarationTransformers, onlyBuildInfo) {
+    function emitFiles(resolver, host, targetSourceFile, _a, emitOnlyDtsFiles, onlyBuildInfo) {
+        var scriptTransformers = _a.scriptTransformers, declarationTransformers = _a.declarationTransformers;
         var compilerOptions = host.getCompilerOptions();
         var sourceMapDataList = (compilerOptions.sourceMap || compilerOptions.inlineSourceMap || ts.getAreDeclarationMapsEnabled(compilerOptions)) ? [] : undefined;
         var emittedFilesList = compilerOptions.listEmittedFiles ? [] : undefined;
         var emitterDiagnostics = ts.createDiagnosticCollection();
         var newLine = ts.getNewLineCharacter(compilerOptions, function () { return host.getNewLine(); });
         var writer = ts.createTextWriter(newLine);
-        var _a = ts.performance.createTimer("printTime", "beforePrint", "afterPrint"), enter = _a.enter, exit = _a.exit;
+        var _b = ts.performance.createTimer("printTime", "beforePrint", "afterPrint"), enter = _b.enter, exit = _b.exit;
         var bundleBuildInfo;
         var emitSkipped = false;
         var exportedModulesFromDeclarationEmit;
@@ -82891,14 +85501,16 @@ var ts;
         };
         function emitSourceFileOrBundle(_a, sourceFileOrBundle) {
             var jsFilePath = _a.jsFilePath, sourceMapFilePath = _a.sourceMapFilePath, declarationFilePath = _a.declarationFilePath, declarationMapPath = _a.declarationMapPath, buildInfoPath = _a.buildInfoPath;
+            var buildInfoDirectory;
             if (buildInfoPath && sourceFileOrBundle && ts.isBundle(sourceFileOrBundle)) {
+                buildInfoDirectory = ts.getDirectoryPath(ts.getNormalizedAbsolutePath(buildInfoPath, host.getCurrentDirectory()));
                 bundleBuildInfo = {
-                    commonSourceDirectory: host.getCommonSourceDirectory(),
-                    sourceFiles: sourceFileOrBundle.sourceFiles.map(function (file) { return file.fileName; })
+                    commonSourceDirectory: relativeToBuildInfo(host.getCommonSourceDirectory()),
+                    sourceFiles: sourceFileOrBundle.sourceFiles.map(function (file) { return relativeToBuildInfo(ts.getNormalizedAbsolutePath(file.fileName, host.getCurrentDirectory())); })
                 };
             }
-            emitJsFileOrBundle(sourceFileOrBundle, jsFilePath, sourceMapFilePath);
-            emitDeclarationFileOrBundle(sourceFileOrBundle, declarationFilePath, declarationMapPath);
+            emitJsFileOrBundle(sourceFileOrBundle, jsFilePath, sourceMapFilePath, relativeToBuildInfo);
+            emitDeclarationFileOrBundle(sourceFileOrBundle, declarationFilePath, declarationMapPath, relativeToBuildInfo);
             emitBuildInfo(bundleBuildInfo, buildInfoPath);
             if (!emitSkipped && emittedFilesList) {
                 if (!emitOnlyDtsFiles) {
@@ -82919,21 +85531,22 @@ var ts;
                     emittedFilesList.push(declarationMapPath);
                 }
             }
+            function relativeToBuildInfo(path) {
+                return ts.ensurePathIsNonModuleName(ts.getRelativePathFromDirectory(buildInfoDirectory, path, host.getCanonicalFileName));
+            }
         }
         function emitBuildInfo(bundle, buildInfoPath) {
             // Write build information if applicable
             if (!buildInfoPath || targetSourceFile || emitSkipped)
                 return;
             var program = host.getProgramBuildInfo();
-            if (!bundle && !program)
-                return;
             if (host.isEmitBlocked(buildInfoPath) || compilerOptions.noEmit) {
                 emitSkipped = true;
                 return;
             }
             ts.writeFile(host, emitterDiagnostics, buildInfoPath, getBuildInfoText({ bundle: bundle, program: program, version: ts.version }), /*writeByteOrderMark*/ false);
         }
-        function emitJsFileOrBundle(sourceFileOrBundle, jsFilePath, sourceMapFilePath) {
+        function emitJsFileOrBundle(sourceFileOrBundle, jsFilePath, sourceMapFilePath, relativeToBuildInfo) {
             if (!sourceFileOrBundle || emitOnlyDtsFiles || !jsFilePath) {
                 return;
             }
@@ -82943,7 +85556,7 @@ var ts;
                 return;
             }
             // Transform the source files
-            var transform = ts.transformNodes(resolver, host, compilerOptions, [sourceFileOrBundle], transformers, /*allowDtsFiles*/ false);
+            var transform = ts.transformNodes(resolver, host, compilerOptions, [sourceFileOrBundle], scriptTransformers, /*allowDtsFiles*/ false);
             var printerOptions = {
                 removeComments: compilerOptions.removeComments,
                 newLine: compilerOptions.newLine,
@@ -82954,7 +85567,8 @@ var ts;
                 inlineSourceMap: compilerOptions.inlineSourceMap,
                 inlineSources: compilerOptions.inlineSources,
                 extendedDiagnostics: compilerOptions.extendedDiagnostics,
-                writeBundleFileInfo: !!bundleBuildInfo
+                writeBundleFileInfo: !!bundleBuildInfo,
+                relativeToBuildInfo: relativeToBuildInfo
             };
             // Create a printer to print the nodes
             var printer = createPrinter(printerOptions, {
@@ -82971,7 +85585,7 @@ var ts;
             if (bundleBuildInfo)
                 bundleBuildInfo.js = printer.bundleFileInfo;
         }
-        function emitDeclarationFileOrBundle(sourceFileOrBundle, declarationFilePath, declarationMapPath) {
+        function emitDeclarationFileOrBundle(sourceFileOrBundle, declarationFilePath, declarationMapPath, relativeToBuildInfo) {
             if (!sourceFileOrBundle || !(declarationFilePath && !ts.isInJSFile(sourceFileOrBundle))) {
                 return;
             }
@@ -82984,7 +85598,7 @@ var ts;
                 // Do that here when emitting only dts files
                 nonJsFiles.forEach(collectLinkedAliases);
             }
-            var declarationTransform = ts.transformNodes(resolver, host, compilerOptions, inputListOrBundle, ts.concatenate([ts.transformDeclarations], declarationTransformers), /*allowDtsFiles*/ false);
+            var declarationTransform = ts.transformNodes(resolver, host, compilerOptions, inputListOrBundle, declarationTransformers, /*allowDtsFiles*/ false);
             if (ts.length(declarationTransform.diagnostics)) {
                 for (var _a = 0, _b = declarationTransform.diagnostics; _a < _b.length; _a++) {
                     var diagnostic = _b[_a];
@@ -83002,7 +85616,8 @@ var ts;
                 extendedDiagnostics: compilerOptions.extendedDiagnostics,
                 onlyPrintJsDocStyle: true,
                 writeBundleFileInfo: !!bundleBuildInfo,
-                recordInternalSection: !!bundleBuildInfo
+                recordInternalSection: !!bundleBuildInfo,
+                relativeToBuildInfo: relativeToBuildInfo
             };
             var declarationPrinter = createPrinter(printerOptions, {
                 // resolver hooks
@@ -83021,8 +85636,12 @@ var ts;
                     mapRoot: compilerOptions.mapRoot,
                     extendedDiagnostics: compilerOptions.extendedDiagnostics,
                 });
-                if (emitOnlyDtsFiles && declarationTransform.transformed[0].kind === 284 /* SourceFile */) {
-                    var sourceFile = declarationTransform.transformed[0];
+                if (emitOnlyDtsFiles && declarationTransform.transformed[0].kind === 285 /* SourceFile */) {
+                    // Improved narrowing in master/3.6 makes this cast unnecessary, triggering a lint rule.
+                    // But at the same time, the LKG (3.5) necessitates it because it doesn’t narrow.
+                    // Once the LKG is updated to 3.6, this comment, the cast to `SourceFile`, and the
+                    // tslint directive can be all be removed.
+                    var sourceFile = declarationTransform.transformed[0]; // tslint:disable-line
                     exportedModulesFromDeclarationEmit = sourceFile.exportedModulesFromDeclarationEmit;
                 }
             }
@@ -83032,7 +85651,7 @@ var ts;
         }
         function collectLinkedAliases(node) {
             if (ts.isExportAssignment(node)) {
-                if (node.expression.kind === 72 /* Identifier */) {
+                if (node.expression.kind === 73 /* Identifier */) {
                     resolver.collectLinkedAliases(node.expression, /*setVisibility*/ true);
                 }
                 return;
@@ -83044,8 +85663,8 @@ var ts;
             ts.forEachChild(node, collectLinkedAliases);
         }
         function printSourceFileOrBundle(jsFilePath, sourceMapFilePath, sourceFileOrBundle, printer, mapOptions) {
-            var bundle = sourceFileOrBundle.kind === 285 /* Bundle */ ? sourceFileOrBundle : undefined;
-            var sourceFile = sourceFileOrBundle.kind === 284 /* SourceFile */ ? sourceFileOrBundle : undefined;
+            var bundle = sourceFileOrBundle.kind === 286 /* Bundle */ ? sourceFileOrBundle : undefined;
+            var sourceFile = sourceFileOrBundle.kind === 285 /* SourceFile */ ? sourceFileOrBundle : undefined;
             var sourceFiles = bundle ? bundle.sourceFiles : [sourceFile];
             var sourceMapGenerator;
             if (shouldEmitSourceMaps(mapOptions, sourceFileOrBundle)) {
@@ -83086,7 +85705,7 @@ var ts;
         }
         function shouldEmitSourceMaps(mapOptions, sourceFileOrBundle) {
             return (mapOptions.sourceMap || mapOptions.inlineSourceMap)
-                && (sourceFileOrBundle.kind !== 284 /* SourceFile */ || !ts.fileExtensionIs(sourceFileOrBundle.fileName, ".json" /* Json */));
+                && (sourceFileOrBundle.kind !== 285 /* SourceFile */ || !ts.fileExtensionIs(sourceFileOrBundle.fileName, ".json" /* Json */));
         }
         function getSourceRoot(mapOptions) {
             // Normalize source root and make sure it has trailing "/" so that it can be used to combine paths with the
@@ -83194,10 +85813,10 @@ var ts;
         getSymbolOfExternalModuleSpecifier: ts.notImplemented,
         isBindingCapturedByNode: ts.notImplemented,
     };
-    function createSourceFilesFromBundleBuildInfo(bundle) {
+    function createSourceFilesFromBundleBuildInfo(bundle, buildInfoDirectory, host) {
         var sourceFiles = bundle.sourceFiles.map(function (fileName) {
-            var sourceFile = ts.createNode(284 /* SourceFile */, 0, 0);
-            sourceFile.fileName = fileName;
+            var sourceFile = ts.createNode(285 /* SourceFile */, 0, 0);
+            sourceFile.fileName = ts.getRelativePathFromDirectory(host.getCurrentDirectory(), ts.getNormalizedAbsolutePath(fileName, buildInfoDirectory), !host.useCaseSensitiveFileNames());
             sourceFile.text = "";
             sourceFile.statements = ts.createNodeArray();
             return sourceFile;
@@ -83208,7 +85827,7 @@ var ts;
             sourceFile.text = prologueInfo.text;
             sourceFile.end = prologueInfo.text.length;
             sourceFile.statements = ts.createNodeArray(prologueInfo.directives.map(function (directive) {
-                var statement = ts.createNode(221 /* ExpressionStatement */, directive.pos, directive.end);
+                var statement = ts.createNode(222 /* ExpressionStatement */, directive.pos, directive.end);
                 statement.expression = ts.createNode(10 /* StringLiteral */, directive.expression.pos, directive.expression.end);
                 statement.expression.text = directive.expression.text;
                 return statement;
@@ -83217,7 +85836,7 @@ var ts;
         return sourceFiles;
     }
     /*@internal*/
-    function emitUsingBuildInfo(config, host, getCommandLine) {
+    function emitUsingBuildInfo(config, host, getCommandLine, customTransformers) {
         var _a = getOutputPathsForBundle(config.options, /*forceDtsPaths*/ false), buildInfoPath = _a.buildInfoPath, jsFilePath = _a.jsFilePath, sourceMapFilePath = _a.sourceMapFilePath, declarationFilePath = _a.declarationFilePath, declarationMapPath = _a.declarationMapPath;
         var buildInfoText = host.readFile(ts.Debug.assertDefined(buildInfoPath));
         if (!buildInfoText)
@@ -83240,23 +85859,25 @@ var ts;
         var buildInfo = getBuildInfo(buildInfoText);
         if (!buildInfo.bundle || !buildInfo.bundle.js || (declarationText && !buildInfo.bundle.dts))
             return buildInfoPath;
+        var buildInfoDirectory = ts.getDirectoryPath(ts.getNormalizedAbsolutePath(buildInfoPath, host.getCurrentDirectory()));
         var ownPrependInput = ts.createInputFiles(jsFileText, declarationText, sourceMapFilePath, sourceMapText, declarationMapPath, declarationMapText, jsFilePath, declarationFilePath, buildInfoPath, buildInfo, 
         /*onlyOwnText*/ true);
         var outputFiles = [];
         var prependNodes = ts.createPrependNodes(config.projectReferences, getCommandLine, function (f) { return host.readFile(f); });
-        var sourceFilesForJsEmit = createSourceFilesFromBundleBuildInfo(buildInfo.bundle);
+        var sourceFilesForJsEmit = createSourceFilesFromBundleBuildInfo(buildInfo.bundle, buildInfoDirectory, host);
         var emitHost = {
             getPrependNodes: ts.memoize(function () { return prependNodes.concat([ownPrependInput]); }),
             getCanonicalFileName: host.getCanonicalFileName,
-            getCommonSourceDirectory: function () { return buildInfo.bundle.commonSourceDirectory; },
+            getCommonSourceDirectory: function () { return ts.getNormalizedAbsolutePath(buildInfo.bundle.commonSourceDirectory, buildInfoDirectory); },
             getCompilerOptions: function () { return config.options; },
             getCurrentDirectory: function () { return host.getCurrentDirectory(); },
             getNewLine: function () { return host.getNewLine(); },
-            getSourceFile: function () { return undefined; },
-            getSourceFileByPath: function () { return undefined; },
+            getSourceFile: ts.returnUndefined,
+            getSourceFileByPath: ts.returnUndefined,
             getSourceFiles: function () { return sourceFilesForJsEmit; },
             getLibFileFromReference: ts.notImplemented,
             isSourceFileFromExternalLibrary: ts.returnFalse,
+            getResolvedProjectReferenceToRedirect: ts.returnUndefined,
             writeFile: function (name, text, writeByteOrderMark) {
                 switch (name) {
                     case jsFilePath:
@@ -83297,9 +85918,11 @@ var ts;
             fileExists: function (f) { return host.fileExists(f); },
             directoryExists: host.directoryExists && (function (f) { return host.directoryExists(f); }),
             useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); },
-            getProgramBuildInfo: function () { return undefined; }
+            getProgramBuildInfo: ts.returnUndefined,
+            getSourceFileFromReference: ts.returnUndefined,
         };
-        emitFiles(ts.notImplementedResolver, emitHost, /*targetSourceFile*/ undefined, /*emitOnlyDtsFiles*/ false, ts.getTransformers(config.options));
+        emitFiles(ts.notImplementedResolver, emitHost, 
+        /*targetSourceFile*/ undefined, ts.getTransformers(config.options, customTransformers));
         return outputFiles;
     }
     ts.emitUsingBuildInfo = emitUsingBuildInfo;
@@ -83332,6 +85955,7 @@ var ts;
         var write = writeBase;
         var isOwnFileEmit;
         var bundleFileInfo = printerOptions.writeBundleFileInfo ? { sections: [] } : undefined;
+        var relativeToBuildInfo = bundleFileInfo ? ts.Debug.assertDefined(printerOptions.relativeToBuildInfo) : undefined;
         var recordInternalSection = printerOptions.recordInternalSection;
         var sourceFileTextPos = 0;
         var sourceFileTextKind = "text" /* Text */;
@@ -83376,9 +86000,9 @@ var ts;
                     break;
             }
             switch (node.kind) {
-                case 284 /* SourceFile */: return printFile(node);
-                case 285 /* Bundle */: return printBundle(node);
-                case 286 /* UnparsedSource */: return printUnparsedSource(node);
+                case 285 /* SourceFile */: return printFile(node);
+                case 286 /* Bundle */: return printBundle(node);
+                case 287 /* UnparsedSource */: return printUnparsedSource(node);
             }
             writeNode(hint, node, sourceFile, beginPrint());
             return endPrint();
@@ -83481,7 +86105,13 @@ var ts;
                         (_a = bundleFileInfo.sections).push.apply(_a, newSections);
                     else {
                         newSections.forEach(function (section) { return ts.Debug.assert(ts.isBundleFileTextLike(section)); });
-                        bundleFileInfo.sections.push({ pos: pos, end: writer.getTextPos(), kind: "prepend" /* Prepend */, data: prepend.fileName, texts: newSections });
+                        bundleFileInfo.sections.push({
+                            pos: pos,
+                            end: writer.getTextPos(),
+                            kind: "prepend" /* Prepend */,
+                            data: relativeToBuildInfo(prepend.fileName),
+                            texts: newSections
+                        });
                     }
                 }
             }
@@ -83608,12 +86238,12 @@ var ts;
                     }
                 // falls through
                 case 2 /* Comments */:
-                    if (!commentsDisabled && node.kind !== 284 /* SourceFile */) {
+                    if (!commentsDisabled && node.kind !== 285 /* SourceFile */) {
                         return pipelineEmitWithComments;
                     }
                 // falls through
                 case 3 /* SourceMaps */:
-                    if (!sourceMapsDisabled && node.kind !== 284 /* SourceFile */ && !ts.isInJsonFile(node)) {
+                    if (!sourceMapsDisabled && node.kind !== 285 /* SourceFile */ && !ts.isInJsonFile(node)) {
                         return pipelineEmitWithSourceMap;
                     }
                 // falls through
@@ -83650,272 +86280,272 @@ var ts;
                     case 16 /* TemplateMiddle */:
                     case 17 /* TemplateTail */:
                         return emitLiteral(node);
-                    case 286 /* UnparsedSource */:
-                    case 280 /* UnparsedPrepend */:
+                    case 287 /* UnparsedSource */:
+                    case 281 /* UnparsedPrepend */:
                         return emitUnparsedSourceOrPrepend(node);
-                    case 279 /* UnparsedPrologue */:
+                    case 280 /* UnparsedPrologue */:
                         return writeUnparsedNode(node);
-                    case 281 /* UnparsedText */:
-                    case 282 /* UnparsedInternalText */:
+                    case 282 /* UnparsedText */:
+                    case 283 /* UnparsedInternalText */:
                         return emitUnparsedTextLike(node);
-                    case 283 /* UnparsedSyntheticReference */:
+                    case 284 /* UnparsedSyntheticReference */:
                         return emitUnparsedSyntheticReference(node);
                     // Identifiers
-                    case 72 /* Identifier */:
+                    case 73 /* Identifier */:
                         return emitIdentifier(node);
                     // Parse tree nodes
                     // Names
-                    case 148 /* QualifiedName */:
+                    case 149 /* QualifiedName */:
                         return emitQualifiedName(node);
-                    case 149 /* ComputedPropertyName */:
+                    case 150 /* ComputedPropertyName */:
                         return emitComputedPropertyName(node);
                     // Signature elements
-                    case 150 /* TypeParameter */:
+                    case 151 /* TypeParameter */:
                         return emitTypeParameter(node);
-                    case 151 /* Parameter */:
+                    case 152 /* Parameter */:
                         return emitParameter(node);
-                    case 152 /* Decorator */:
+                    case 153 /* Decorator */:
                         return emitDecorator(node);
                     // Type members
-                    case 153 /* PropertySignature */:
+                    case 154 /* PropertySignature */:
                         return emitPropertySignature(node);
-                    case 154 /* PropertyDeclaration */:
+                    case 155 /* PropertyDeclaration */:
                         return emitPropertyDeclaration(node);
-                    case 155 /* MethodSignature */:
+                    case 156 /* MethodSignature */:
                         return emitMethodSignature(node);
-                    case 156 /* MethodDeclaration */:
+                    case 157 /* MethodDeclaration */:
                         return emitMethodDeclaration(node);
-                    case 157 /* Constructor */:
+                    case 158 /* Constructor */:
                         return emitConstructor(node);
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
                         return emitAccessorDeclaration(node);
-                    case 160 /* CallSignature */:
+                    case 161 /* CallSignature */:
                         return emitCallSignature(node);
-                    case 161 /* ConstructSignature */:
+                    case 162 /* ConstructSignature */:
                         return emitConstructSignature(node);
-                    case 162 /* IndexSignature */:
+                    case 163 /* IndexSignature */:
                         return emitIndexSignature(node);
                     // Types
-                    case 163 /* TypePredicate */:
+                    case 164 /* TypePredicate */:
                         return emitTypePredicate(node);
-                    case 164 /* TypeReference */:
+                    case 165 /* TypeReference */:
                         return emitTypeReference(node);
-                    case 165 /* FunctionType */:
+                    case 166 /* FunctionType */:
                         return emitFunctionType(node);
-                    case 294 /* JSDocFunctionType */:
+                    case 295 /* JSDocFunctionType */:
                         return emitJSDocFunctionType(node);
-                    case 166 /* ConstructorType */:
+                    case 167 /* ConstructorType */:
                         return emitConstructorType(node);
-                    case 167 /* TypeQuery */:
+                    case 168 /* TypeQuery */:
                         return emitTypeQuery(node);
-                    case 168 /* TypeLiteral */:
+                    case 169 /* TypeLiteral */:
                         return emitTypeLiteral(node);
-                    case 169 /* ArrayType */:
+                    case 170 /* ArrayType */:
                         return emitArrayType(node);
-                    case 170 /* TupleType */:
+                    case 171 /* TupleType */:
                         return emitTupleType(node);
-                    case 171 /* OptionalType */:
+                    case 172 /* OptionalType */:
                         return emitOptionalType(node);
-                    case 173 /* UnionType */:
+                    case 174 /* UnionType */:
                         return emitUnionType(node);
-                    case 174 /* IntersectionType */:
+                    case 175 /* IntersectionType */:
                         return emitIntersectionType(node);
-                    case 175 /* ConditionalType */:
+                    case 176 /* ConditionalType */:
                         return emitConditionalType(node);
-                    case 176 /* InferType */:
+                    case 177 /* InferType */:
                         return emitInferType(node);
-                    case 177 /* ParenthesizedType */:
+                    case 178 /* ParenthesizedType */:
                         return emitParenthesizedType(node);
-                    case 211 /* ExpressionWithTypeArguments */:
+                    case 212 /* ExpressionWithTypeArguments */:
                         return emitExpressionWithTypeArguments(node);
-                    case 178 /* ThisType */:
+                    case 179 /* ThisType */:
                         return emitThisType();
-                    case 179 /* TypeOperator */:
+                    case 180 /* TypeOperator */:
                         return emitTypeOperator(node);
-                    case 180 /* IndexedAccessType */:
+                    case 181 /* IndexedAccessType */:
                         return emitIndexedAccessType(node);
-                    case 181 /* MappedType */:
+                    case 182 /* MappedType */:
                         return emitMappedType(node);
-                    case 182 /* LiteralType */:
+                    case 183 /* LiteralType */:
                         return emitLiteralType(node);
-                    case 183 /* ImportType */:
+                    case 184 /* ImportType */:
                         return emitImportTypeNode(node);
-                    case 289 /* JSDocAllType */:
+                    case 290 /* JSDocAllType */:
                         writePunctuation("*");
                         return;
-                    case 290 /* JSDocUnknownType */:
+                    case 291 /* JSDocUnknownType */:
                         writePunctuation("?");
                         return;
-                    case 291 /* JSDocNullableType */:
+                    case 292 /* JSDocNullableType */:
                         return emitJSDocNullableType(node);
-                    case 292 /* JSDocNonNullableType */:
+                    case 293 /* JSDocNonNullableType */:
                         return emitJSDocNonNullableType(node);
-                    case 293 /* JSDocOptionalType */:
+                    case 294 /* JSDocOptionalType */:
                         return emitJSDocOptionalType(node);
-                    case 172 /* RestType */:
-                    case 295 /* JSDocVariadicType */:
+                    case 173 /* RestType */:
+                    case 296 /* JSDocVariadicType */:
                         return emitRestOrJSDocVariadicType(node);
                     // Binding patterns
-                    case 184 /* ObjectBindingPattern */:
+                    case 185 /* ObjectBindingPattern */:
                         return emitObjectBindingPattern(node);
-                    case 185 /* ArrayBindingPattern */:
+                    case 186 /* ArrayBindingPattern */:
                         return emitArrayBindingPattern(node);
-                    case 186 /* BindingElement */:
+                    case 187 /* BindingElement */:
                         return emitBindingElement(node);
                     // Misc
-                    case 216 /* TemplateSpan */:
+                    case 217 /* TemplateSpan */:
                         return emitTemplateSpan(node);
-                    case 217 /* SemicolonClassElement */:
+                    case 218 /* SemicolonClassElement */:
                         return emitSemicolonClassElement();
                     // Statements
-                    case 218 /* Block */:
+                    case 219 /* Block */:
                         return emitBlock(node);
-                    case 219 /* VariableStatement */:
+                    case 220 /* VariableStatement */:
                         return emitVariableStatement(node);
-                    case 220 /* EmptyStatement */:
+                    case 221 /* EmptyStatement */:
                         return emitEmptyStatement(/*isEmbeddedStatement*/ false);
-                    case 221 /* ExpressionStatement */:
+                    case 222 /* ExpressionStatement */:
                         return emitExpressionStatement(node);
-                    case 222 /* IfStatement */:
+                    case 223 /* IfStatement */:
                         return emitIfStatement(node);
-                    case 223 /* DoStatement */:
+                    case 224 /* DoStatement */:
                         return emitDoStatement(node);
-                    case 224 /* WhileStatement */:
+                    case 225 /* WhileStatement */:
                         return emitWhileStatement(node);
-                    case 225 /* ForStatement */:
+                    case 226 /* ForStatement */:
                         return emitForStatement(node);
-                    case 226 /* ForInStatement */:
+                    case 227 /* ForInStatement */:
                         return emitForInStatement(node);
-                    case 227 /* ForOfStatement */:
+                    case 228 /* ForOfStatement */:
                         return emitForOfStatement(node);
-                    case 228 /* ContinueStatement */:
+                    case 229 /* ContinueStatement */:
                         return emitContinueStatement(node);
-                    case 229 /* BreakStatement */:
+                    case 230 /* BreakStatement */:
                         return emitBreakStatement(node);
-                    case 230 /* ReturnStatement */:
+                    case 231 /* ReturnStatement */:
                         return emitReturnStatement(node);
-                    case 231 /* WithStatement */:
+                    case 232 /* WithStatement */:
                         return emitWithStatement(node);
-                    case 232 /* SwitchStatement */:
+                    case 233 /* SwitchStatement */:
                         return emitSwitchStatement(node);
-                    case 233 /* LabeledStatement */:
+                    case 234 /* LabeledStatement */:
                         return emitLabeledStatement(node);
-                    case 234 /* ThrowStatement */:
+                    case 235 /* ThrowStatement */:
                         return emitThrowStatement(node);
-                    case 235 /* TryStatement */:
+                    case 236 /* TryStatement */:
                         return emitTryStatement(node);
-                    case 236 /* DebuggerStatement */:
+                    case 237 /* DebuggerStatement */:
                         return emitDebuggerStatement(node);
                     // Declarations
-                    case 237 /* VariableDeclaration */:
+                    case 238 /* VariableDeclaration */:
                         return emitVariableDeclaration(node);
-                    case 238 /* VariableDeclarationList */:
+                    case 239 /* VariableDeclarationList */:
                         return emitVariableDeclarationList(node);
-                    case 239 /* FunctionDeclaration */:
+                    case 240 /* FunctionDeclaration */:
                         return emitFunctionDeclaration(node);
-                    case 240 /* ClassDeclaration */:
+                    case 241 /* ClassDeclaration */:
                         return emitClassDeclaration(node);
-                    case 241 /* InterfaceDeclaration */:
+                    case 242 /* InterfaceDeclaration */:
                         return emitInterfaceDeclaration(node);
-                    case 242 /* TypeAliasDeclaration */:
+                    case 243 /* TypeAliasDeclaration */:
                         return emitTypeAliasDeclaration(node);
-                    case 243 /* EnumDeclaration */:
+                    case 244 /* EnumDeclaration */:
                         return emitEnumDeclaration(node);
-                    case 244 /* ModuleDeclaration */:
+                    case 245 /* ModuleDeclaration */:
                         return emitModuleDeclaration(node);
-                    case 245 /* ModuleBlock */:
+                    case 246 /* ModuleBlock */:
                         return emitModuleBlock(node);
-                    case 246 /* CaseBlock */:
+                    case 247 /* CaseBlock */:
                         return emitCaseBlock(node);
-                    case 247 /* NamespaceExportDeclaration */:
+                    case 248 /* NamespaceExportDeclaration */:
                         return emitNamespaceExportDeclaration(node);
-                    case 248 /* ImportEqualsDeclaration */:
+                    case 249 /* ImportEqualsDeclaration */:
                         return emitImportEqualsDeclaration(node);
-                    case 249 /* ImportDeclaration */:
+                    case 250 /* ImportDeclaration */:
                         return emitImportDeclaration(node);
-                    case 250 /* ImportClause */:
+                    case 251 /* ImportClause */:
                         return emitImportClause(node);
-                    case 251 /* NamespaceImport */:
+                    case 252 /* NamespaceImport */:
                         return emitNamespaceImport(node);
-                    case 252 /* NamedImports */:
+                    case 253 /* NamedImports */:
                         return emitNamedImports(node);
-                    case 253 /* ImportSpecifier */:
+                    case 254 /* ImportSpecifier */:
                         return emitImportSpecifier(node);
-                    case 254 /* ExportAssignment */:
+                    case 255 /* ExportAssignment */:
                         return emitExportAssignment(node);
-                    case 255 /* ExportDeclaration */:
+                    case 256 /* ExportDeclaration */:
                         return emitExportDeclaration(node);
-                    case 256 /* NamedExports */:
+                    case 257 /* NamedExports */:
                         return emitNamedExports(node);
-                    case 257 /* ExportSpecifier */:
+                    case 258 /* ExportSpecifier */:
                         return emitExportSpecifier(node);
-                    case 258 /* MissingDeclaration */:
+                    case 259 /* MissingDeclaration */:
                         return;
                     // Module references
-                    case 259 /* ExternalModuleReference */:
+                    case 260 /* ExternalModuleReference */:
                         return emitExternalModuleReference(node);
                     // JSX (non-expression)
                     case 11 /* JsxText */:
                         return emitJsxText(node);
-                    case 262 /* JsxOpeningElement */:
-                    case 265 /* JsxOpeningFragment */:
+                    case 263 /* JsxOpeningElement */:
+                    case 266 /* JsxOpeningFragment */:
                         return emitJsxOpeningElementOrFragment(node);
-                    case 263 /* JsxClosingElement */:
-                    case 266 /* JsxClosingFragment */:
+                    case 264 /* JsxClosingElement */:
+                    case 267 /* JsxClosingFragment */:
                         return emitJsxClosingElementOrFragment(node);
-                    case 267 /* JsxAttribute */:
+                    case 268 /* JsxAttribute */:
                         return emitJsxAttribute(node);
-                    case 268 /* JsxAttributes */:
+                    case 269 /* JsxAttributes */:
                         return emitJsxAttributes(node);
-                    case 269 /* JsxSpreadAttribute */:
+                    case 270 /* JsxSpreadAttribute */:
                         return emitJsxSpreadAttribute(node);
-                    case 270 /* JsxExpression */:
+                    case 271 /* JsxExpression */:
                         return emitJsxExpression(node);
                     // Clauses
-                    case 271 /* CaseClause */:
+                    case 272 /* CaseClause */:
                         return emitCaseClause(node);
-                    case 272 /* DefaultClause */:
+                    case 273 /* DefaultClause */:
                         return emitDefaultClause(node);
-                    case 273 /* HeritageClause */:
+                    case 274 /* HeritageClause */:
                         return emitHeritageClause(node);
-                    case 274 /* CatchClause */:
+                    case 275 /* CatchClause */:
                         return emitCatchClause(node);
                     // Property assignments
-                    case 275 /* PropertyAssignment */:
+                    case 276 /* PropertyAssignment */:
                         return emitPropertyAssignment(node);
-                    case 276 /* ShorthandPropertyAssignment */:
+                    case 277 /* ShorthandPropertyAssignment */:
                         return emitShorthandPropertyAssignment(node);
-                    case 277 /* SpreadAssignment */:
+                    case 278 /* SpreadAssignment */:
                         return emitSpreadAssignment(node);
                     // Enum
-                    case 278 /* EnumMember */:
+                    case 279 /* EnumMember */:
                         return emitEnumMember(node);
                     // JSDoc nodes (only used in codefixes currently)
-                    case 304 /* JSDocParameterTag */:
-                    case 310 /* JSDocPropertyTag */:
+                    case 306 /* JSDocParameterTag */:
+                    case 312 /* JSDocPropertyTag */:
                         return emitJSDocPropertyLikeTag(node);
-                    case 305 /* JSDocReturnTag */:
-                    case 307 /* JSDocTypeTag */:
-                    case 306 /* JSDocThisTag */:
-                    case 303 /* JSDocEnumTag */:
+                    case 307 /* JSDocReturnTag */:
+                    case 309 /* JSDocTypeTag */:
+                    case 308 /* JSDocThisTag */:
+                    case 305 /* JSDocEnumTag */:
                         return emitJSDocSimpleTypedTag(node);
-                    case 300 /* JSDocAugmentsTag */:
+                    case 301 /* JSDocAugmentsTag */:
                         return emitJSDocAugmentsTag(node);
-                    case 308 /* JSDocTemplateTag */:
+                    case 310 /* JSDocTemplateTag */:
                         return emitJSDocTemplateTag(node);
-                    case 309 /* JSDocTypedefTag */:
+                    case 311 /* JSDocTypedefTag */:
                         return emitJSDocTypedefTag(node);
-                    case 302 /* JSDocCallbackTag */:
+                    case 304 /* JSDocCallbackTag */:
                         return emitJSDocCallbackTag(node);
-                    case 298 /* JSDocSignature */:
+                    case 299 /* JSDocSignature */:
                         return emitJSDocSignature(node);
-                    case 297 /* JSDocTypeLiteral */:
+                    case 298 /* JSDocTypeLiteral */:
                         return emitJSDocTypeLiteral(node);
-                    case 301 /* JSDocClassTag */:
-                    case 299 /* JSDocTag */:
+                    case 303 /* JSDocClassTag */:
+                    case 300 /* JSDocTag */:
                         return emitJSDocSimpleTag(node);
-                    case 296 /* JSDocComment */:
+                    case 297 /* JSDocComment */:
                         return emitJSDoc(node);
                     // Transformation nodes (ignored)
                 }
@@ -83940,83 +86570,83 @@ var ts;
                     case 14 /* NoSubstitutionTemplateLiteral */:
                         return emitLiteral(node);
                     // Identifiers
-                    case 72 /* Identifier */:
+                    case 73 /* Identifier */:
                         return emitIdentifier(node);
                     // Reserved words
-                    case 87 /* FalseKeyword */:
-                    case 96 /* NullKeyword */:
-                    case 98 /* SuperKeyword */:
-                    case 102 /* TrueKeyword */:
-                    case 100 /* ThisKeyword */:
-                    case 92 /* ImportKeyword */:
+                    case 88 /* FalseKeyword */:
+                    case 97 /* NullKeyword */:
+                    case 99 /* SuperKeyword */:
+                    case 103 /* TrueKeyword */:
+                    case 101 /* ThisKeyword */:
+                    case 93 /* ImportKeyword */:
                         writeTokenNode(node, writeKeyword);
                         return;
                     // Expressions
-                    case 187 /* ArrayLiteralExpression */:
+                    case 188 /* ArrayLiteralExpression */:
                         return emitArrayLiteralExpression(node);
-                    case 188 /* ObjectLiteralExpression */:
+                    case 189 /* ObjectLiteralExpression */:
                         return emitObjectLiteralExpression(node);
-                    case 189 /* PropertyAccessExpression */:
+                    case 190 /* PropertyAccessExpression */:
                         return emitPropertyAccessExpression(node);
-                    case 190 /* ElementAccessExpression */:
+                    case 191 /* ElementAccessExpression */:
                         return emitElementAccessExpression(node);
-                    case 191 /* CallExpression */:
+                    case 192 /* CallExpression */:
                         return emitCallExpression(node);
-                    case 192 /* NewExpression */:
+                    case 193 /* NewExpression */:
                         return emitNewExpression(node);
-                    case 193 /* TaggedTemplateExpression */:
+                    case 194 /* TaggedTemplateExpression */:
                         return emitTaggedTemplateExpression(node);
-                    case 194 /* TypeAssertionExpression */:
+                    case 195 /* TypeAssertionExpression */:
                         return emitTypeAssertionExpression(node);
-                    case 195 /* ParenthesizedExpression */:
+                    case 196 /* ParenthesizedExpression */:
                         return emitParenthesizedExpression(node);
-                    case 196 /* FunctionExpression */:
+                    case 197 /* FunctionExpression */:
                         return emitFunctionExpression(node);
-                    case 197 /* ArrowFunction */:
+                    case 198 /* ArrowFunction */:
                         return emitArrowFunction(node);
-                    case 198 /* DeleteExpression */:
+                    case 199 /* DeleteExpression */:
                         return emitDeleteExpression(node);
-                    case 199 /* TypeOfExpression */:
+                    case 200 /* TypeOfExpression */:
                         return emitTypeOfExpression(node);
-                    case 200 /* VoidExpression */:
+                    case 201 /* VoidExpression */:
                         return emitVoidExpression(node);
-                    case 201 /* AwaitExpression */:
+                    case 202 /* AwaitExpression */:
                         return emitAwaitExpression(node);
-                    case 202 /* PrefixUnaryExpression */:
+                    case 203 /* PrefixUnaryExpression */:
                         return emitPrefixUnaryExpression(node);
-                    case 203 /* PostfixUnaryExpression */:
+                    case 204 /* PostfixUnaryExpression */:
                         return emitPostfixUnaryExpression(node);
-                    case 204 /* BinaryExpression */:
+                    case 205 /* BinaryExpression */:
                         return emitBinaryExpression(node);
-                    case 205 /* ConditionalExpression */:
+                    case 206 /* ConditionalExpression */:
                         return emitConditionalExpression(node);
-                    case 206 /* TemplateExpression */:
+                    case 207 /* TemplateExpression */:
                         return emitTemplateExpression(node);
-                    case 207 /* YieldExpression */:
+                    case 208 /* YieldExpression */:
                         return emitYieldExpression(node);
-                    case 208 /* SpreadElement */:
+                    case 209 /* SpreadElement */:
                         return emitSpreadExpression(node);
-                    case 209 /* ClassExpression */:
+                    case 210 /* ClassExpression */:
                         return emitClassExpression(node);
-                    case 210 /* OmittedExpression */:
+                    case 211 /* OmittedExpression */:
                         return;
-                    case 212 /* AsExpression */:
+                    case 213 /* AsExpression */:
                         return emitAsExpression(node);
-                    case 213 /* NonNullExpression */:
+                    case 214 /* NonNullExpression */:
                         return emitNonNullExpression(node);
-                    case 214 /* MetaProperty */:
+                    case 215 /* MetaProperty */:
                         return emitMetaProperty(node);
                     // JSX
-                    case 260 /* JsxElement */:
+                    case 261 /* JsxElement */:
                         return emitJsxElement(node);
-                    case 261 /* JsxSelfClosingElement */:
+                    case 262 /* JsxSelfClosingElement */:
                         return emitJsxSelfClosingElement(node);
-                    case 264 /* JsxFragment */:
+                    case 265 /* JsxFragment */:
                         return emitJsxFragment(node);
                     // Transformation nodes
-                    case 313 /* PartiallyEmittedExpression */:
+                    case 315 /* PartiallyEmittedExpression */:
                         return emitPartiallyEmittedExpression(node);
-                    case 314 /* CommaListExpression */:
+                    case 316 /* CommaListExpression */:
                         return emitCommaList(node);
                 }
             }
@@ -84056,7 +86686,7 @@ var ts;
         }
         function emitHelpers(node) {
             var helpersEmitted = false;
-            var bundle = node.kind === 285 /* Bundle */ ? node : undefined;
+            var bundle = node.kind === 286 /* Bundle */ ? node : undefined;
             if (bundle && moduleKind === ts.ModuleKind.None) {
                 return;
             }
@@ -84156,7 +86786,7 @@ var ts;
             var pos = getTextPosWithWriteLine();
             writeUnparsedNode(unparsed);
             if (bundleFileInfo) {
-                updateOrPushBundleFileTextLike(pos, writer.getTextPos(), unparsed.kind === 281 /* UnparsedText */ ?
+                updateOrPushBundleFileTextLike(pos, writer.getTextPos(), unparsed.kind === 282 /* UnparsedText */ ?
                     "text" /* Text */ :
                     "internal" /* Internal */);
             }
@@ -84189,7 +86819,7 @@ var ts;
             emit(node.right);
         }
         function emitEntityName(node) {
-            if (node.kind === 72 /* Identifier */) {
+            if (node.kind === 73 /* Identifier */) {
                 emitExpression(node);
             }
             else {
@@ -84225,7 +86855,7 @@ var ts;
             emit(node.dotDotDotToken);
             emitNodeWithWriter(node.name, writeParameter);
             emit(node.questionToken);
-            if (node.parent && node.parent.kind === 294 /* JSDocFunctionType */ && !node.name) {
+            if (node.parent && node.parent.kind === 295 /* JSDocFunctionType */ && !node.name) {
                 emit(node.type);
             }
             else {
@@ -84287,7 +86917,7 @@ var ts;
         function emitAccessorDeclaration(node) {
             emitDecorators(node, node.decorators);
             emitModifiers(node, node.modifiers);
-            writeKeyword(node.kind === 158 /* GetAccessor */ ? "get" : "set");
+            writeKeyword(node.kind === 159 /* GetAccessor */ ? "get" : "set");
             writeSpace();
             emit(node.name);
             emitSignatureAndBody(node, emitSignatureHead);
@@ -84464,7 +87094,7 @@ var ts;
             }
             if (node.readonlyToken) {
                 emit(node.readonlyToken);
-                if (node.readonlyToken.kind !== 133 /* ReadonlyKeyword */) {
+                if (node.readonlyToken.kind !== 134 /* ReadonlyKeyword */) {
                     writeKeyword("readonly");
                 }
                 writeSpace();
@@ -84614,7 +87244,7 @@ var ts;
             emitExpressionList(node, node.arguments, 2576 /* CallExpressionArguments */);
         }
         function emitNewExpression(node) {
-            emitTokenWithComment(95 /* NewKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(96 /* NewKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emitExpression(node.expression);
             emitTypeArguments(node, node.typeArguments);
@@ -84654,22 +87284,22 @@ var ts;
             emit(node.equalsGreaterThanToken);
         }
         function emitDeleteExpression(node) {
-            emitTokenWithComment(81 /* DeleteKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(82 /* DeleteKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emitExpression(node.expression);
         }
         function emitTypeOfExpression(node) {
-            emitTokenWithComment(104 /* TypeOfKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(105 /* TypeOfKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emitExpression(node.expression);
         }
         function emitVoidExpression(node) {
-            emitTokenWithComment(106 /* VoidKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(107 /* VoidKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emitExpression(node.expression);
         }
         function emitAwaitExpression(node) {
-            emitTokenWithComment(122 /* AwaitKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(123 /* AwaitKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emitExpression(node.expression);
         }
@@ -84694,7 +87324,7 @@ var ts;
             // expression a prefix increment whose operand is a plus expression - (++(+x))
             // The same is true of minus of course.
             var operand = node.operand;
-            return operand.kind === 202 /* PrefixUnaryExpression */
+            return operand.kind === 203 /* PrefixUnaryExpression */
                 && ((node.operator === 38 /* PlusToken */ && (operand.operator === 38 /* PlusToken */ || operand.operator === 44 /* PlusPlusToken */))
                     || (node.operator === 39 /* MinusToken */ && (operand.operator === 39 /* MinusToken */ || operand.operator === 45 /* MinusMinusToken */)));
         }
@@ -84709,7 +87339,7 @@ var ts;
             emitExpression(node.left);
             increaseIndentIf(indentBeforeOperator, isCommaOperator);
             emitLeadingCommentsOfPosition(node.operatorToken.pos);
-            writeTokenNode(node.operatorToken, node.operatorToken.kind === 93 /* InKeyword */ ? writeKeyword : writeOperator);
+            writeTokenNode(node.operatorToken, node.operatorToken.kind === 94 /* InKeyword */ ? writeKeyword : writeOperator);
             emitTrailingCommentsOfPosition(node.operatorToken.end, /*prefixSpace*/ true); // Binary operators should have a space before the comment starts
             increaseIndentIf(indentAfterOperator, /*writeSpaceIfNotIndenting*/ true);
             emitExpression(node.right);
@@ -84737,7 +87367,7 @@ var ts;
             emitList(node, node.templateSpans, 262144 /* TemplateExpressionSpans */);
         }
         function emitYieldExpression(node) {
-            emitTokenWithComment(117 /* YieldKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(118 /* YieldKeyword */, node.pos, writeKeyword, node);
             emit(node.asteriskToken);
             emitExpressionWithLeadingSpace(node.expression);
         }
@@ -84814,7 +87444,7 @@ var ts;
             }
         }
         function emitIfStatement(node) {
-            var openParenPos = emitTokenWithComment(91 /* IfKeyword */, node.pos, writeKeyword, node);
+            var openParenPos = emitTokenWithComment(92 /* IfKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emitTokenWithComment(20 /* OpenParenToken */, openParenPos, writePunctuation, node);
             emitExpression(node.expression);
@@ -84822,8 +87452,8 @@ var ts;
             emitEmbeddedStatement(node, node.thenStatement);
             if (node.elseStatement) {
                 writeLineOrSpace(node);
-                emitTokenWithComment(83 /* ElseKeyword */, node.thenStatement.end, writeKeyword, node);
-                if (node.elseStatement.kind === 222 /* IfStatement */) {
+                emitTokenWithComment(84 /* ElseKeyword */, node.thenStatement.end, writeKeyword, node);
+                if (node.elseStatement.kind === 223 /* IfStatement */) {
                     writeSpace();
                     emit(node.elseStatement);
                 }
@@ -84833,14 +87463,14 @@ var ts;
             }
         }
         function emitWhileClause(node, startPos) {
-            var openParenPos = emitTokenWithComment(107 /* WhileKeyword */, startPos, writeKeyword, node);
+            var openParenPos = emitTokenWithComment(108 /* WhileKeyword */, startPos, writeKeyword, node);
             writeSpace();
             emitTokenWithComment(20 /* OpenParenToken */, openParenPos, writePunctuation, node);
             emitExpression(node.expression);
             emitTokenWithComment(21 /* CloseParenToken */, node.expression.end, writePunctuation, node);
         }
         function emitDoStatement(node) {
-            emitTokenWithComment(82 /* DoKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(83 /* DoKeyword */, node.pos, writeKeyword, node);
             emitEmbeddedStatement(node, node.statement);
             if (ts.isBlock(node.statement)) {
                 writeSpace();
@@ -84856,7 +87486,7 @@ var ts;
             emitEmbeddedStatement(node, node.statement);
         }
         function emitForStatement(node) {
-            var openParenPos = emitTokenWithComment(89 /* ForKeyword */, node.pos, writeKeyword, node);
+            var openParenPos = emitTokenWithComment(90 /* ForKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             var pos = emitTokenWithComment(20 /* OpenParenToken */, openParenPos, writePunctuation, /*contextNode*/ node);
             emitForBinding(node.initializer);
@@ -84868,25 +87498,25 @@ var ts;
             emitEmbeddedStatement(node, node.statement);
         }
         function emitForInStatement(node) {
-            var openParenPos = emitTokenWithComment(89 /* ForKeyword */, node.pos, writeKeyword, node);
+            var openParenPos = emitTokenWithComment(90 /* ForKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emitTokenWithComment(20 /* OpenParenToken */, openParenPos, writePunctuation, node);
             emitForBinding(node.initializer);
             writeSpace();
-            emitTokenWithComment(93 /* InKeyword */, node.initializer.end, writeKeyword, node);
+            emitTokenWithComment(94 /* InKeyword */, node.initializer.end, writeKeyword, node);
             writeSpace();
             emitExpression(node.expression);
             emitTokenWithComment(21 /* CloseParenToken */, node.expression.end, writePunctuation, node);
             emitEmbeddedStatement(node, node.statement);
         }
         function emitForOfStatement(node) {
-            var openParenPos = emitTokenWithComment(89 /* ForKeyword */, node.pos, writeKeyword, node);
+            var openParenPos = emitTokenWithComment(90 /* ForKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emitWithTrailingSpace(node.awaitModifier);
             emitTokenWithComment(20 /* OpenParenToken */, openParenPos, writePunctuation, node);
             emitForBinding(node.initializer);
             writeSpace();
-            emitTokenWithComment(147 /* OfKeyword */, node.initializer.end, writeKeyword, node);
+            emitTokenWithComment(148 /* OfKeyword */, node.initializer.end, writeKeyword, node);
             writeSpace();
             emitExpression(node.expression);
             emitTokenWithComment(21 /* CloseParenToken */, node.expression.end, writePunctuation, node);
@@ -84894,7 +87524,7 @@ var ts;
         }
         function emitForBinding(node) {
             if (node !== undefined) {
-                if (node.kind === 238 /* VariableDeclarationList */) {
+                if (node.kind === 239 /* VariableDeclarationList */) {
                     emit(node);
                 }
                 else {
@@ -84903,12 +87533,12 @@ var ts;
             }
         }
         function emitContinueStatement(node) {
-            emitTokenWithComment(78 /* ContinueKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(79 /* ContinueKeyword */, node.pos, writeKeyword, node);
             emitWithLeadingSpace(node.label);
             writeTrailingSemicolon();
         }
         function emitBreakStatement(node) {
-            emitTokenWithComment(73 /* BreakKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(74 /* BreakKeyword */, node.pos, writeKeyword, node);
             emitWithLeadingSpace(node.label);
             writeTrailingSemicolon();
         }
@@ -84936,12 +87566,12 @@ var ts;
             return pos;
         }
         function emitReturnStatement(node) {
-            emitTokenWithComment(97 /* ReturnKeyword */, node.pos, writeKeyword, /*contextNode*/ node);
+            emitTokenWithComment(98 /* ReturnKeyword */, node.pos, writeKeyword, /*contextNode*/ node);
             emitExpressionWithLeadingSpace(node.expression);
             writeTrailingSemicolon();
         }
         function emitWithStatement(node) {
-            var openParenPos = emitTokenWithComment(108 /* WithKeyword */, node.pos, writeKeyword, node);
+            var openParenPos = emitTokenWithComment(109 /* WithKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emitTokenWithComment(20 /* OpenParenToken */, openParenPos, writePunctuation, node);
             emitExpression(node.expression);
@@ -84949,7 +87579,7 @@ var ts;
             emitEmbeddedStatement(node, node.statement);
         }
         function emitSwitchStatement(node) {
-            var openParenPos = emitTokenWithComment(99 /* SwitchKeyword */, node.pos, writeKeyword, node);
+            var openParenPos = emitTokenWithComment(100 /* SwitchKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emitTokenWithComment(20 /* OpenParenToken */, openParenPos, writePunctuation, node);
             emitExpression(node.expression);
@@ -84964,12 +87594,12 @@ var ts;
             emit(node.statement);
         }
         function emitThrowStatement(node) {
-            emitTokenWithComment(101 /* ThrowKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(102 /* ThrowKeyword */, node.pos, writeKeyword, node);
             emitExpressionWithLeadingSpace(node.expression);
             writeTrailingSemicolon();
         }
         function emitTryStatement(node) {
-            emitTokenWithComment(103 /* TryKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(104 /* TryKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emit(node.tryBlock);
             if (node.catchClause) {
@@ -84978,13 +87608,13 @@ var ts;
             }
             if (node.finallyBlock) {
                 writeLineOrSpace(node);
-                emitTokenWithComment(88 /* FinallyKeyword */, (node.catchClause || node.tryBlock).end, writeKeyword, node);
+                emitTokenWithComment(89 /* FinallyKeyword */, (node.catchClause || node.tryBlock).end, writeKeyword, node);
                 writeSpace();
                 emit(node.finallyBlock);
             }
         }
         function emitDebuggerStatement(node) {
-            writeToken(79 /* DebuggerKeyword */, node.pos, writeKeyword);
+            writeToken(80 /* DebuggerKeyword */, node.pos, writeKeyword);
             writeTrailingSemicolon();
         }
         //
@@ -85189,7 +87819,7 @@ var ts;
             var body = node.body;
             if (!body)
                 return writeTrailingSemicolon();
-            while (body.kind === 244 /* ModuleDeclaration */) {
+            while (body.kind === 245 /* ModuleDeclaration */) {
                 writePunctuation(".");
                 emit(body.name);
                 body = body.body;
@@ -85210,17 +87840,17 @@ var ts;
         }
         function emitImportEqualsDeclaration(node) {
             emitModifiers(node, node.modifiers);
-            emitTokenWithComment(92 /* ImportKeyword */, node.modifiers ? node.modifiers.end : node.pos, writeKeyword, node);
+            emitTokenWithComment(93 /* ImportKeyword */, node.modifiers ? node.modifiers.end : node.pos, writeKeyword, node);
             writeSpace();
             emit(node.name);
             writeSpace();
-            emitTokenWithComment(59 /* EqualsToken */, node.name.end, writePunctuation, node);
+            emitTokenWithComment(60 /* EqualsToken */, node.name.end, writePunctuation, node);
             writeSpace();
             emitModuleReference(node.moduleReference);
             writeTrailingSemicolon();
         }
         function emitModuleReference(node) {
-            if (node.kind === 72 /* Identifier */) {
+            if (node.kind === 73 /* Identifier */) {
                 emitExpression(node);
             }
             else {
@@ -85229,12 +87859,12 @@ var ts;
         }
         function emitImportDeclaration(node) {
             emitModifiers(node, node.modifiers);
-            emitTokenWithComment(92 /* ImportKeyword */, node.modifiers ? node.modifiers.end : node.pos, writeKeyword, node);
+            emitTokenWithComment(93 /* ImportKeyword */, node.modifiers ? node.modifiers.end : node.pos, writeKeyword, node);
             writeSpace();
             if (node.importClause) {
                 emit(node.importClause);
                 writeSpace();
-                emitTokenWithComment(144 /* FromKeyword */, node.importClause.end, writeKeyword, node);
+                emitTokenWithComment(145 /* FromKeyword */, node.importClause.end, writeKeyword, node);
                 writeSpace();
             }
             emitExpression(node.moduleSpecifier);
@@ -85251,7 +87881,7 @@ var ts;
         function emitNamespaceImport(node) {
             var asPos = emitTokenWithComment(40 /* AsteriskToken */, node.pos, writePunctuation, node);
             writeSpace();
-            emitTokenWithComment(119 /* AsKeyword */, asPos, writeKeyword, node);
+            emitTokenWithComment(120 /* AsKeyword */, asPos, writeKeyword, node);
             writeSpace();
             emit(node.name);
         }
@@ -85262,20 +87892,20 @@ var ts;
             emitImportOrExportSpecifier(node);
         }
         function emitExportAssignment(node) {
-            var nextPos = emitTokenWithComment(85 /* ExportKeyword */, node.pos, writeKeyword, node);
+            var nextPos = emitTokenWithComment(86 /* ExportKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             if (node.isExportEquals) {
-                emitTokenWithComment(59 /* EqualsToken */, nextPos, writeOperator, node);
+                emitTokenWithComment(60 /* EqualsToken */, nextPos, writeOperator, node);
             }
             else {
-                emitTokenWithComment(80 /* DefaultKeyword */, nextPos, writeKeyword, node);
+                emitTokenWithComment(81 /* DefaultKeyword */, nextPos, writeKeyword, node);
             }
             writeSpace();
             emitExpression(node.expression);
             writeTrailingSemicolon();
         }
         function emitExportDeclaration(node) {
-            var nextPos = emitTokenWithComment(85 /* ExportKeyword */, node.pos, writeKeyword, node);
+            var nextPos = emitTokenWithComment(86 /* ExportKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             if (node.exportClause) {
                 emit(node.exportClause);
@@ -85286,18 +87916,18 @@ var ts;
             if (node.moduleSpecifier) {
                 writeSpace();
                 var fromPos = node.exportClause ? node.exportClause.end : nextPos;
-                emitTokenWithComment(144 /* FromKeyword */, fromPos, writeKeyword, node);
+                emitTokenWithComment(145 /* FromKeyword */, fromPos, writeKeyword, node);
                 writeSpace();
                 emitExpression(node.moduleSpecifier);
             }
             writeTrailingSemicolon();
         }
         function emitNamespaceExportDeclaration(node) {
-            var nextPos = emitTokenWithComment(85 /* ExportKeyword */, node.pos, writeKeyword, node);
+            var nextPos = emitTokenWithComment(86 /* ExportKeyword */, node.pos, writeKeyword, node);
             writeSpace();
-            nextPos = emitTokenWithComment(119 /* AsKeyword */, nextPos, writeKeyword, node);
+            nextPos = emitTokenWithComment(120 /* AsKeyword */, nextPos, writeKeyword, node);
             writeSpace();
-            nextPos = emitTokenWithComment(131 /* NamespaceKeyword */, nextPos, writeKeyword, node);
+            nextPos = emitTokenWithComment(132 /* NamespaceKeyword */, nextPos, writeKeyword, node);
             writeSpace();
             emit(node.name);
             writeTrailingSemicolon();
@@ -85317,7 +87947,7 @@ var ts;
             if (node.propertyName) {
                 emit(node.propertyName);
                 writeSpace();
-                emitTokenWithComment(119 /* AsKeyword */, node.propertyName.end, writeKeyword, node);
+                emitTokenWithComment(120 /* AsKeyword */, node.propertyName.end, writeKeyword, node);
                 writeSpace();
             }
             emit(node.name);
@@ -85365,7 +87995,7 @@ var ts;
             writePunctuation(">");
         }
         function emitJsxText(node) {
-            writer.writeLiteral(getTextOfNode(node, /*includeTrivia*/ true));
+            writer.writeLiteral(node.text);
         }
         function emitJsxClosingElementOrFragment(node) {
             writePunctuation("</");
@@ -85395,7 +88025,7 @@ var ts;
             }
         }
         function emitJsxTagName(node) {
-            if (node.kind === 72 /* Identifier */) {
+            if (node.kind === 73 /* Identifier */) {
                 emitExpression(node);
             }
             else {
@@ -85406,13 +88036,13 @@ var ts;
         // Clauses
         //
         function emitCaseClause(node) {
-            emitTokenWithComment(74 /* CaseKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(75 /* CaseKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emitExpression(node.expression);
             emitCaseOrDefaultClauseRest(node, node.statements, node.expression.end);
         }
         function emitDefaultClause(node) {
-            var pos = emitTokenWithComment(80 /* DefaultKeyword */, node.pos, writeKeyword, node);
+            var pos = emitTokenWithComment(81 /* DefaultKeyword */, node.pos, writeKeyword, node);
             emitCaseOrDefaultClauseRest(node, node.statements, pos);
         }
         function emitCaseOrDefaultClauseRest(parentNode, statements, colonPos) {
@@ -85440,7 +88070,7 @@ var ts;
             emitList(node, node.types, 528 /* HeritageClauseTypes */);
         }
         function emitCatchClause(node) {
-            var openParenPos = emitTokenWithComment(75 /* CatchKeyword */, node.pos, writeKeyword, node);
+            var openParenPos = emitTokenWithComment(76 /* CatchKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             if (node.variableDeclaration) {
                 emitTokenWithComment(20 /* OpenParenToken */, openParenPos, writePunctuation, node);
@@ -85510,7 +88140,7 @@ var ts;
                 }
             }
             if (node.tags) {
-                if (node.tags.length === 1 && node.tags[0].kind === 307 /* JSDocTypeTag */ && !node.comment) {
+                if (node.tags.length === 1 && node.tags[0].kind === 309 /* JSDocTypeTag */ && !node.comment) {
                     writeSpace();
                     emit(node.tags[0]);
                 }
@@ -85544,7 +88174,7 @@ var ts;
         function emitJSDocTypedefTag(tag) {
             emitJSDocTagName(tag.tagName);
             if (tag.typeExpression) {
-                if (tag.typeExpression.kind === 288 /* JSDocTypeExpression */) {
+                if (tag.typeExpression.kind === 289 /* JSDocTypeExpression */) {
                     emitJSDocTypeExpression(tag.typeExpression);
                 }
                 else {
@@ -85563,7 +88193,7 @@ var ts;
                 emit(tag.fullName);
             }
             emitJSDocComment(tag.comment);
-            if (tag.typeExpression && tag.typeExpression.kind === 297 /* JSDocTypeLiteral */) {
+            if (tag.typeExpression && tag.typeExpression.kind === 298 /* JSDocTypeLiteral */) {
                 emitJSDocTypeLiteral(tag.typeExpression);
             }
         }
@@ -85878,7 +88508,7 @@ var ts;
         function emitInitializer(node, equalCommentStartPos, container) {
             if (node) {
                 writeSpace();
-                emitTokenWithComment(59 /* EqualsToken */, equalCommentStartPos, writeOperator, container);
+                emitTokenWithComment(60 /* EqualsToken */, equalCommentStartPos, writeOperator, container);
                 writeSpace();
                 emitExpression(node);
             }
@@ -86341,7 +88971,7 @@ var ts;
                 && ts.rangeEndIsOnSameLineAsRangeStart(block, block, currentSourceFile);
         }
         function skipSynthesizedParentheses(node) {
-            while (node.kind === 195 /* ParenthesizedExpression */ && ts.nodeIsSynthesized(node)) {
+            while (node.kind === 196 /* ParenthesizedExpression */ && ts.nodeIsSynthesized(node)) {
                 node = node.expression;
             }
             return node;
@@ -86406,81 +89036,81 @@ var ts;
             if (!node)
                 return;
             switch (node.kind) {
-                case 218 /* Block */:
+                case 219 /* Block */:
                     ts.forEach(node.statements, generateNames);
                     break;
-                case 233 /* LabeledStatement */:
-                case 231 /* WithStatement */:
-                case 223 /* DoStatement */:
-                case 224 /* WhileStatement */:
+                case 234 /* LabeledStatement */:
+                case 232 /* WithStatement */:
+                case 224 /* DoStatement */:
+                case 225 /* WhileStatement */:
                     generateNames(node.statement);
                     break;
-                case 222 /* IfStatement */:
+                case 223 /* IfStatement */:
                     generateNames(node.thenStatement);
                     generateNames(node.elseStatement);
                     break;
-                case 225 /* ForStatement */:
-                case 227 /* ForOfStatement */:
-                case 226 /* ForInStatement */:
+                case 226 /* ForStatement */:
+                case 228 /* ForOfStatement */:
+                case 227 /* ForInStatement */:
                     generateNames(node.initializer);
                     generateNames(node.statement);
                     break;
-                case 232 /* SwitchStatement */:
+                case 233 /* SwitchStatement */:
                     generateNames(node.caseBlock);
                     break;
-                case 246 /* CaseBlock */:
+                case 247 /* CaseBlock */:
                     ts.forEach(node.clauses, generateNames);
                     break;
-                case 271 /* CaseClause */:
-                case 272 /* DefaultClause */:
+                case 272 /* CaseClause */:
+                case 273 /* DefaultClause */:
                     ts.forEach(node.statements, generateNames);
                     break;
-                case 235 /* TryStatement */:
+                case 236 /* TryStatement */:
                     generateNames(node.tryBlock);
                     generateNames(node.catchClause);
                     generateNames(node.finallyBlock);
                     break;
-                case 274 /* CatchClause */:
+                case 275 /* CatchClause */:
                     generateNames(node.variableDeclaration);
                     generateNames(node.block);
                     break;
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     generateNames(node.declarationList);
                     break;
-                case 238 /* VariableDeclarationList */:
+                case 239 /* VariableDeclarationList */:
                     ts.forEach(node.declarations, generateNames);
                     break;
-                case 237 /* VariableDeclaration */:
-                case 151 /* Parameter */:
-                case 186 /* BindingElement */:
-                case 240 /* ClassDeclaration */:
+                case 238 /* VariableDeclaration */:
+                case 152 /* Parameter */:
+                case 187 /* BindingElement */:
+                case 241 /* ClassDeclaration */:
                     generateNameIfNeeded(node.name);
                     break;
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     generateNameIfNeeded(node.name);
                     if (ts.getEmitFlags(node) & 524288 /* ReuseTempVariableScope */) {
                         ts.forEach(node.parameters, generateNames);
                         generateNames(node.body);
                     }
                     break;
-                case 184 /* ObjectBindingPattern */:
-                case 185 /* ArrayBindingPattern */:
+                case 185 /* ObjectBindingPattern */:
+                case 186 /* ArrayBindingPattern */:
                     ts.forEach(node.elements, generateNames);
                     break;
-                case 249 /* ImportDeclaration */:
+                case 250 /* ImportDeclaration */:
                     generateNames(node.importClause);
                     break;
-                case 250 /* ImportClause */:
+                case 251 /* ImportClause */:
                     generateNameIfNeeded(node.name);
                     generateNames(node.namedBindings);
                     break;
-                case 251 /* NamespaceImport */:
+                case 252 /* NamespaceImport */:
                     generateNameIfNeeded(node.name);
                     break;
-                case 252 /* NamedImports */:
+                case 253 /* NamedImports */:
                     ts.forEach(node.elements, generateNames);
                     break;
-                case 253 /* ImportSpecifier */:
+                case 254 /* ImportSpecifier */:
                     generateNameIfNeeded(node.propertyName || node.name);
                     break;
             }
@@ -86489,12 +89119,12 @@ var ts;
             if (!node)
                 return;
             switch (node.kind) {
-                case 275 /* PropertyAssignment */:
-                case 276 /* ShorthandPropertyAssignment */:
-                case 154 /* PropertyDeclaration */:
-                case 156 /* MethodDeclaration */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 276 /* PropertyAssignment */:
+                case 277 /* ShorthandPropertyAssignment */:
+                case 155 /* PropertyDeclaration */:
+                case 157 /* MethodDeclaration */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     generateNameIfNeeded(node.name);
                     break;
             }
@@ -86674,24 +89304,26 @@ var ts;
          */
         function generateNameForNode(node, flags) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return makeUniqueName(getTextOfNode(node), isUniqueName, !!(flags & 16 /* Optimistic */), !!(flags & 8 /* ReservedInNestedScopes */));
-                case 244 /* ModuleDeclaration */:
-                case 243 /* EnumDeclaration */:
+                case 245 /* ModuleDeclaration */:
+                case 244 /* EnumDeclaration */:
                     return generateNameForModuleOrEnum(node);
-                case 249 /* ImportDeclaration */:
-                case 255 /* ExportDeclaration */:
+                case 250 /* ImportDeclaration */:
+                case 256 /* ExportDeclaration */:
                     return generateNameForImportOrExportDeclaration(node);
-                case 239 /* FunctionDeclaration */:
-                case 240 /* ClassDeclaration */:
-                case 254 /* ExportAssignment */:
+                case 240 /* FunctionDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 255 /* ExportAssignment */:
                     return generateNameForExportDefault();
-                case 209 /* ClassExpression */:
+                case 210 /* ClassExpression */:
                     return generateNameForClassExpression();
-                case 156 /* MethodDeclaration */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 157 /* MethodDeclaration */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     return generateNameForMethodOrAccessor(node);
+                case 150 /* ComputedPropertyName */:
+                    return makeTempVariableName(0 /* Auto */, /*reserveInNestedScopes*/ true);
                 default:
                     return makeTempVariableName(0 /* Auto */);
             }
@@ -86737,7 +89369,7 @@ var ts;
             hasWrittenComment = false;
             var emitFlags = ts.getEmitFlags(node);
             var _a = ts.getCommentRange(node), pos = _a.pos, end = _a.end;
-            var isEmittedNode = node.kind !== 312 /* NotEmittedStatement */;
+            var isEmittedNode = node.kind !== 314 /* NotEmittedStatement */;
             // We have to explicitly check that the node is JsxText because if the compilerOptions.jsx is "preserve" we will not do any transformation.
             // It is expensive to walk entire tree just to set one kind of node to have no comments.
             var skipLeadingComments = pos < 0 || (emitFlags & 512 /* NoLeadingComments */) !== 0 || node.kind === 11 /* JsxText */;
@@ -86761,7 +89393,7 @@ var ts;
                     containerEnd = end;
                     // To avoid invalid comment emit in a down-level binding pattern, we
                     // keep track of the last declaration list container's end
-                    if (node.kind === 238 /* VariableDeclarationList */) {
+                    if (node.kind === 239 /* VariableDeclarationList */) {
                         declarationListContainerEnd = end;
                     }
                 }
@@ -87018,7 +89650,7 @@ var ts;
             else {
                 var _a = ts.getSourceMapRange(node), pos = _a.pos, end = _a.end, _b = _a.source, source = _b === void 0 ? sourceMapSource : _b;
                 var emitFlags = ts.getEmitFlags(node);
-                if (node.kind !== 312 /* NotEmittedStatement */
+                if (node.kind !== 314 /* NotEmittedStatement */
                     && (emitFlags & 16 /* NoLeadingSourceMap */) === 0
                     && pos >= 0) {
                     emitSourcePos(source, skipSourceTrivia(source, pos));
@@ -87031,7 +89663,7 @@ var ts;
                 else {
                     pipelinePhase(hint, node);
                 }
-                if (node.kind !== 312 /* NotEmittedStatement */
+                if (node.kind !== 314 /* NotEmittedStatement */
                     && (emitFlags & 32 /* NoTrailingSourceMap */) === 0
                     && end >= 0) {
                     emitSourcePos(source, end);
@@ -87159,7 +89791,8 @@ var ts;
             writeFile: host.writeFile && writeFile,
             addOrDeleteFileOrDirectory: addOrDeleteFileOrDirectory,
             addOrDeleteFile: addOrDeleteFile,
-            clearCache: clearCache
+            clearCache: clearCache,
+            realpath: host.realpath && realpath
         };
         function toPath(fileName) {
             return ts.toPath(fileName, currentDirectory, getCanonicalFileName);
@@ -87256,7 +89889,7 @@ var ts;
             var rootDirPath = toPath(rootDir);
             var result = tryReadDirectory(rootDir, rootDirPath);
             if (result) {
-                return ts.matchFiles(rootDir, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory, depth, getFileSystemEntries);
+                return ts.matchFiles(rootDir, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory, depth, getFileSystemEntries, realpath);
             }
             return host.readDirectory(rootDir, extensions, excludes, includes, depth);
             function getFileSystemEntries(dir) {
@@ -87267,6 +89900,9 @@ var ts;
                 return tryReadDirectory(dir, path) || ts.emptyFileSystemEntries;
             }
         }
+        function realpath(s) {
+            return host.realpath ? host.realpath(s) : s;
+        }
         function addOrDeleteFileOrDirectory(fileOrDirectory, fileOrDirectoryPath) {
             var existingResult = getCachedFileSystemEntries(fileOrDirectoryPath);
             if (existingResult) {
@@ -87537,11 +90173,7 @@ var ts;
     function createCompilerHostWorker(options, setParentNodes, system) {
         if (system === void 0) { system = ts.sys; }
         var existingDirectories = ts.createMap();
-        function getCanonicalFileName(fileName) {
-            // if underlying system can distinguish between two files whose names differs only in cases then file name already in canonical form.
-            // otherwise use toLowerCase as a canonical form.
-            return system.useCaseSensitiveFileNames ? fileName : fileName.toLowerCase();
-        }
+        var getCanonicalFileName = ts.createGetCanonicalFileName(system.useCaseSensitiveFileNames);
         function getSourceFile(fileName, languageVersion, onError) {
             var text;
             try {
@@ -87646,7 +90278,8 @@ var ts;
             getDirectories: function (path) { return system.getDirectories(path); },
             realpath: realpath,
             readDirectory: function (path, extensions, include, exclude, depth) { return system.readDirectory(path, extensions, include, exclude, depth); },
-            createDirectory: function (d) { return system.createDirectory(d); }
+            createDirectory: function (d) { return system.createDirectory(d); },
+            createHash: ts.maybeBind(system, system.createHash)
         };
         return compilerHost;
     }
@@ -87893,11 +90526,11 @@ var ts;
                 if (diagnostic.relatedInformation) {
                     output += host.getNewLine();
                     for (var _a = 0, _b = diagnostic.relatedInformation; _a < _b.length; _a++) {
-                        var _c = _b[_a], file = _c.file, start = _c.start, length_4 = _c.length, messageText = _c.messageText;
+                        var _c = _b[_a], file = _c.file, start = _c.start, length_7 = _c.length, messageText = _c.messageText;
                         if (file) {
                             output += host.getNewLine();
                             output += halfIndent + formatLocation(file, start, host); // TODO: GH#18217
-                            output += formatCodeSpan(file, start, length_4, indent, ForegroundColorEscapeSequences.Cyan, host); // TODO: GH#18217
+                            output += formatCodeSpan(file, start, length_7, indent, ForegroundColorEscapeSequences.Cyan, host); // TODO: GH#18217
                         }
                         output += host.getNewLine();
                         output += indent + flattenDiagnosticMessageText(messageText, host.getNewLine());
@@ -87909,29 +90542,33 @@ var ts;
         return output;
     }
     ts.formatDiagnosticsWithColorAndContext = formatDiagnosticsWithColorAndContext;
-    function flattenDiagnosticMessageText(messageText, newLine) {
-        if (ts.isString(messageText)) {
-            return messageText;
+    function flattenDiagnosticMessageText(diag, newLine, indent) {
+        if (indent === void 0) { indent = 0; }
+        if (ts.isString(diag)) {
+            return diag;
         }
-        else {
-            var diagnosticChain = messageText;
-            var result = "";
-            var indent_1 = 0;
-            while (diagnosticChain) {
-                if (indent_1) {
-                    result += newLine;
-                    for (var i = 0; i < indent_1; i++) {
-                        result += "  ";
-                    }
-                }
-                result += diagnosticChain.messageText;
-                indent_1++;
-                diagnosticChain = diagnosticChain.next;
+        else if (diag === undefined) {
+            return "";
+        }
+        var result = "";
+        if (indent) {
+            result += newLine;
+            for (var i = 0; i < indent; i++) {
+                result += "  ";
             }
-            return result;
         }
+        result += diag.messageText;
+        indent++;
+        if (diag.next) {
+            for (var _i = 0, _a = diag.next; _i < _a.length; _i++) {
+                var kid = _a[_i];
+                result += flattenDiagnosticMessageText(kid, newLine, indent);
+            }
+        }
+        return result;
     }
     ts.flattenDiagnosticMessageText = flattenDiagnosticMessageText;
+    /* @internal */
     function loadWithLocalCache(names, containingFile, redirectedReference, loader) {
         if (names.length === 0) {
             return [];
@@ -87951,6 +90588,7 @@ var ts;
         }
         return resolutions;
     }
+    ts.loadWithLocalCache = loadWithLocalCache;
     /**
      * Determines if program structure is upto date or needs to be recreated
      */
@@ -88110,7 +90748,7 @@ var ts;
             }); };
         }
         else {
-            moduleResolutionCache = ts.createModuleResolutionCache(currentDirectory, function (x) { return host.getCanonicalFileName(x); });
+            moduleResolutionCache = ts.createModuleResolutionCache(currentDirectory, function (x) { return host.getCanonicalFileName(x); }, options);
             var loader_1 = function (moduleName, containingFile, redirectedReference) { return ts.resolveModuleName(moduleName, containingFile, options, host, moduleResolutionCache, redirectedReference).resolvedModule; }; // TODO: GH#18217
             resolveModuleNamesWorker = function (moduleNames, containingFile, _reusedNames, redirectedReference) { return loadWithLocalCache(ts.Debug.assertEachDefined(moduleNames), containingFile, redirectedReference, loader_1); };
         }
@@ -88157,11 +90795,18 @@ var ts;
                 if (rootNames.length) {
                     for (var _i = 0, resolvedProjectReferences_1 = resolvedProjectReferences; _i < resolvedProjectReferences_1.length; _i++) {
                         var parsedRef = resolvedProjectReferences_1[_i];
-                        if (parsedRef) {
-                            var out = parsedRef.commandLine.options.outFile || parsedRef.commandLine.options.out;
-                            if (out) {
-                                var dtsOutfile = ts.changeExtension(out, ".d.ts");
-                                processSourceFile(dtsOutfile, /*isDefaultLib*/ false, /*ignoreNoDefaultLib*/ false, /*packageId*/ undefined);
+                        if (!parsedRef)
+                            continue;
+                        var out = parsedRef.commandLine.options.outFile || parsedRef.commandLine.options.out;
+                        if (out) {
+                            processSourceFile(ts.changeExtension(out, ".d.ts"), /*isDefaultLib*/ false, /*ignoreNoDefaultLib*/ false, /*packageId*/ undefined);
+                        }
+                        else if (ts.getEmitModuleKind(parsedRef.commandLine.options) === ts.ModuleKind.None) {
+                            for (var _a = 0, _b = parsedRef.commandLine.fileNames; _a < _b.length; _a++) {
+                                var fileName = _b[_a];
+                                if (!ts.fileExtensionIs(fileName, ".d.ts" /* Dts */) && ts.hasTSFileExtension(fileName)) {
+                                    processSourceFile(ts.getOutputDeclarationFileName(fileName, parsedRef.commandLine, !host.useCaseSensitiveFileNames()), /*isDefaultLib*/ false, /*ignoreNoDefaultLib*/ false, /*packageId*/ undefined);
+                                }
                             }
                         }
                     }
@@ -88209,8 +90854,8 @@ var ts;
         // not part of the new program.
         if (oldProgram && host.onReleaseOldSourceFile) {
             var oldSourceFiles = oldProgram.getSourceFiles();
-            for (var _a = 0, oldSourceFiles_1 = oldSourceFiles; _a < oldSourceFiles_1.length; _a++) {
-                var oldSourceFile = oldSourceFiles_1[_a];
+            for (var _c = 0, oldSourceFiles_1 = oldSourceFiles; _c < oldSourceFiles_1.length; _c++) {
+                var oldSourceFile = oldSourceFiles_1[_c];
                 var newFile = getSourceFileByPath(oldSourceFile.resolvedPath);
                 if (shouldCreateNewSourceFile || !newFile ||
                     // old file wasnt redirect but new file is
@@ -88249,6 +90894,7 @@ var ts;
             getIdentifierCount: function () { return getDiagnosticsProducingTypeChecker().getIdentifierCount(); },
             getSymbolCount: function () { return getDiagnosticsProducingTypeChecker().getSymbolCount(); },
             getTypeCount: function () { return getDiagnosticsProducingTypeChecker().getTypeCount(); },
+            getRelationCacheSizes: function () { return getDiagnosticsProducingTypeChecker().getRelationCacheSizes(); },
             getFileProcessingDiagnostics: function () { return fileProcessingDiagnostics; },
             getResolvedTypeReferenceDirectives: function () { return resolvedTypeReferenceDirectives; },
             isSourceFileFromExternalLibrary: isSourceFileFromExternalLibrary,
@@ -88296,7 +90942,7 @@ var ts;
         }
         function getCommonSourceDirectory() {
             if (commonSourceDirectory === undefined) {
-                var emittedFiles = ts.filter(files, function (file) { return ts.sourceFileMayBeEmitted(file, options, isSourceFileFromExternalLibrary); });
+                var emittedFiles = ts.filter(files, function (file) { return ts.sourceFileMayBeEmitted(file, options, isSourceFileFromExternalLibrary, getResolvedProjectReferenceToRedirect); });
                 if (options.rootDir && checkSourceFilesBelongToPath(emittedFiles, options.rootDir)) {
                     // If a rootDir is specified use it as the commonSourceDirectory
                     commonSourceDirectory = ts.getNormalizedAbsolutePath(options.rootDir, currentDirectory);
@@ -88346,13 +90992,13 @@ var ts;
                 // which per above occurred during the current program creation.
                 // Since we assume the filesystem does not change during program creation,
                 // it is safe to reuse resolutions from the earlier call.
-                var result_6 = [];
+                var result_9 = [];
                 for (var _i = 0, moduleNames_1 = moduleNames; _i < moduleNames_1.length; _i++) {
                     var moduleName = moduleNames_1[_i];
                     var resolvedModule = file.resolvedModules.get(moduleName);
-                    result_6.push(resolvedModule);
+                    result_9.push(resolvedModule);
                 }
-                return result_6;
+                return result_9;
             }
             // At this point, we know at least one of the following hold:
             // - file has local declarations for ambient modules
@@ -88439,7 +91085,7 @@ var ts;
             function moduleNameResolvesToAmbientModuleInNonModifiedFile(moduleName) {
                 var resolutionToFile = ts.getResolvedModule(oldSourceFile, moduleName);
                 var resolvedFile = resolutionToFile && oldProgram.getSourceFile(resolutionToFile.resolvedFileName);
-                if (resolutionToFile && resolvedFile && !resolvedFile.externalModuleIndicator) {
+                if (resolutionToFile && resolvedFile) {
                     // In the old program, we resolved to an ambient module that was in the same
                     //   place as we expected to find an actual module file.
                     // We actually need to return 'false' here even though this seems like a 'true' case
@@ -88668,7 +91314,7 @@ var ts;
                 var filePath = newSourceFile.path;
                 addFileToFilesByName(newSourceFile, filePath, newSourceFile.resolvedPath);
                 // Set the file as found during node modules search if it was found that way in old progra,
-                if (oldProgram.isSourceFileFromExternalLibrary(oldProgram.getSourceFileByPath(filePath))) {
+                if (oldProgram.isSourceFileFromExternalLibrary(oldProgram.getSourceFileByPath(newSourceFile.resolvedPath))) {
                     sourceFilesFoundSearchingNodeModules.set(filePath, true);
                 }
             }
@@ -88685,7 +91331,8 @@ var ts;
         }
         function getEmitHost(writeFileCallback) {
             return __assign({ getPrependNodes: getPrependNodes,
-                getCanonicalFileName: getCanonicalFileName, getCommonSourceDirectory: program.getCommonSourceDirectory, getCompilerOptions: program.getCompilerOptions, getCurrentDirectory: function () { return currentDirectory; }, getNewLine: function () { return host.getNewLine(); }, getSourceFile: program.getSourceFile, getSourceFileByPath: program.getSourceFileByPath, getSourceFiles: program.getSourceFiles, getLibFileFromReference: program.getLibFileFromReference, isSourceFileFromExternalLibrary: isSourceFileFromExternalLibrary, writeFile: writeFileCallback || (function (fileName, data, writeByteOrderMark, onError, sourceFiles) { return host.writeFile(fileName, data, writeByteOrderMark, onError, sourceFiles); }), isEmitBlocked: isEmitBlocked, readFile: function (f) { return host.readFile(f); }, fileExists: function (f) {
+                getCanonicalFileName: getCanonicalFileName, getCommonSourceDirectory: program.getCommonSourceDirectory, getCompilerOptions: program.getCompilerOptions, getCurrentDirectory: function () { return currentDirectory; }, getNewLine: function () { return host.getNewLine(); }, getSourceFile: program.getSourceFile, getSourceFileByPath: program.getSourceFileByPath, getSourceFiles: program.getSourceFiles, getLibFileFromReference: program.getLibFileFromReference, isSourceFileFromExternalLibrary: isSourceFileFromExternalLibrary,
+                getResolvedProjectReferenceToRedirect: getResolvedProjectReferenceToRedirect, writeFile: writeFileCallback || (function (fileName, data, writeByteOrderMark, onError, sourceFiles) { return host.writeFile(fileName, data, writeByteOrderMark, onError, sourceFiles); }), isEmitBlocked: isEmitBlocked, readFile: function (f) { return host.readFile(f); }, fileExists: function (f) {
                     // Use local caches
                     var path = toPath(f);
                     if (getSourceFileByPath(path))
@@ -88694,16 +91341,15 @@ var ts;
                         return false;
                     // Before falling back to the host
                     return host.fileExists(f);
-                } }, (host.directoryExists ? { directoryExists: function (f) { return host.directoryExists(f); } } : {}), { useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); }, getProgramBuildInfo: function () { return program.getProgramBuildInfo && program.getProgramBuildInfo(); } });
+                } }, (host.directoryExists ? { directoryExists: function (f) { return host.directoryExists(f); } } : {}), { useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); }, getProgramBuildInfo: function () { return program.getProgramBuildInfo && program.getProgramBuildInfo(); }, getSourceFileFromReference: function (file, ref) { return program.getSourceFileFromReference(file, ref); } });
         }
         function emitBuildInfo(writeFileCallback) {
             ts.Debug.assert(!options.out && !options.outFile);
             ts.performance.mark("beforeEmit");
             var emitResult = ts.emitFiles(ts.notImplementedResolver, getEmitHost(writeFileCallback), 
             /*targetSourceFile*/ undefined, 
+            /*transformers*/ ts.noTransformers, 
             /*emitOnlyDtsFiles*/ false, 
-            /*transformers*/ undefined, 
-            /*declaraitonTransformers*/ undefined, 
             /*onlyBuildInfo*/ true);
             ts.performance.mark("afterEmit");
             ts.performance.measure("Emit", "beforeEmit", "afterEmit");
@@ -88791,8 +91437,7 @@ var ts;
             // checked is to not pass the file to getEmitResolver.
             var emitResolver = getDiagnosticsProducingTypeChecker().getEmitResolver((options.outFile || options.out) ? undefined : sourceFile, cancellationToken);
             ts.performance.mark("beforeEmit");
-            var transformers = emitOnlyDtsFiles ? [] : ts.getTransformers(options, customTransformers);
-            var emitResult = ts.emitFiles(emitResolver, getEmitHost(writeFileCallback), sourceFile, emitOnlyDtsFiles, transformers, customTransformers && customTransformers.afterDeclarations);
+            var emitResult = ts.emitFiles(emitResolver, getEmitHost(writeFileCallback), sourceFile, ts.getTransformers(options, customTransformers, emitOnlyDtsFiles), emitOnlyDtsFiles);
             ts.performance.mark("afterEmit");
             ts.performance.measure("Emit", "beforeEmit", "afterEmit");
             return emitResult;
@@ -88884,8 +91529,8 @@ var ts;
                 for (var _i = 0, _a = [bindDiagnostics, checkDiagnostics, fileProcessingDiagnosticsInFile, programDiagnosticsInFile, isCheckJs ? sourceFile.jsDocDiagnostics : undefined]; _i < _a.length; _i++) {
                     var diags = _a[_i];
                     if (diags) {
-                        for (var _b = 0, diags_1 = diags; _b < diags_1.length; _b++) {
-                            var diag = diags_1[_b];
+                        for (var _b = 0, diags_4 = diags; _b < diags_4.length; _b++) {
+                            var diag = diags_4[_b];
                             if (shouldReportDiagnostic(diag)) {
                                 diagnostics = ts.append(diagnostics, diag);
                             }
@@ -88934,22 +91579,22 @@ var ts;
                     // Return directly from the case if the given node doesnt want to visit each child
                     // Otherwise break to visit each child
                     switch (parent.kind) {
-                        case 151 /* Parameter */:
-                        case 154 /* PropertyDeclaration */:
+                        case 152 /* Parameter */:
+                        case 155 /* PropertyDeclaration */:
                             if (parent.questionToken === node) {
                                 diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics._0_can_only_be_used_in_a_ts_file, "?"));
                                 return;
                             }
                         // falls through
-                        case 156 /* MethodDeclaration */:
-                        case 155 /* MethodSignature */:
-                        case 157 /* Constructor */:
-                        case 158 /* GetAccessor */:
-                        case 159 /* SetAccessor */:
-                        case 196 /* FunctionExpression */:
-                        case 239 /* FunctionDeclaration */:
-                        case 197 /* ArrowFunction */:
-                        case 237 /* VariableDeclaration */:
+                        case 157 /* MethodDeclaration */:
+                        case 156 /* MethodSignature */:
+                        case 158 /* Constructor */:
+                        case 159 /* GetAccessor */:
+                        case 160 /* SetAccessor */:
+                        case 197 /* FunctionExpression */:
+                        case 240 /* FunctionDeclaration */:
+                        case 198 /* ArrowFunction */:
+                        case 238 /* VariableDeclaration */:
                             // type annotation
                             if (parent.type === node) {
                                 diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.types_can_only_be_used_in_a_ts_file));
@@ -88957,41 +91602,41 @@ var ts;
                             }
                     }
                     switch (node.kind) {
-                        case 248 /* ImportEqualsDeclaration */:
+                        case 249 /* ImportEqualsDeclaration */:
                             diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.import_can_only_be_used_in_a_ts_file));
                             return;
-                        case 254 /* ExportAssignment */:
+                        case 255 /* ExportAssignment */:
                             if (node.isExportEquals) {
                                 diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.export_can_only_be_used_in_a_ts_file));
                                 return;
                             }
                             break;
-                        case 273 /* HeritageClause */:
+                        case 274 /* HeritageClause */:
                             var heritageClause = node;
-                            if (heritageClause.token === 109 /* ImplementsKeyword */) {
+                            if (heritageClause.token === 110 /* ImplementsKeyword */) {
                                 diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.implements_clauses_can_only_be_used_in_a_ts_file));
                                 return;
                             }
                             break;
-                        case 241 /* InterfaceDeclaration */:
+                        case 242 /* InterfaceDeclaration */:
                             diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.interface_declarations_can_only_be_used_in_a_ts_file));
                             return;
-                        case 244 /* ModuleDeclaration */:
+                        case 245 /* ModuleDeclaration */:
                             diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.module_declarations_can_only_be_used_in_a_ts_file));
                             return;
-                        case 242 /* TypeAliasDeclaration */:
+                        case 243 /* TypeAliasDeclaration */:
                             diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.type_aliases_can_only_be_used_in_a_ts_file));
                             return;
-                        case 243 /* EnumDeclaration */:
+                        case 244 /* EnumDeclaration */:
                             diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.enum_declarations_can_only_be_used_in_a_ts_file));
                             return;
-                        case 213 /* NonNullExpression */:
+                        case 214 /* NonNullExpression */:
                             diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.non_null_assertions_can_only_be_used_in_a_ts_file));
                             return;
-                        case 212 /* AsExpression */:
+                        case 213 /* AsExpression */:
                             diagnostics.push(createDiagnosticForNode(node.type, ts.Diagnostics.type_assertion_expressions_can_only_be_used_in_a_ts_file));
                             return;
-                        case 194 /* TypeAssertionExpression */:
+                        case 195 /* TypeAssertionExpression */:
                             ts.Debug.fail(); // Won't parse these in a JS file anyway, as they are interpreted as JSX.
                     }
                     var prevParent = parent;
@@ -89001,54 +91646,54 @@ var ts;
                 }
                 function walkArray(nodes) {
                     if (parent.decorators === nodes && !options.experimentalDecorators) {
-                        diagnostics.push(createDiagnosticForNode(parent, ts.Diagnostics.Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_to_remove_this_warning));
+                        diagnostics.push(createDiagnosticForNode(parent, ts.Diagnostics.Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_in_your_tsconfig_or_jsconfig_to_remove_this_warning));
                     }
                     switch (parent.kind) {
-                        case 240 /* ClassDeclaration */:
-                        case 156 /* MethodDeclaration */:
-                        case 155 /* MethodSignature */:
-                        case 157 /* Constructor */:
-                        case 158 /* GetAccessor */:
-                        case 159 /* SetAccessor */:
-                        case 196 /* FunctionExpression */:
-                        case 239 /* FunctionDeclaration */:
-                        case 197 /* ArrowFunction */:
+                        case 241 /* ClassDeclaration */:
+                        case 157 /* MethodDeclaration */:
+                        case 156 /* MethodSignature */:
+                        case 158 /* Constructor */:
+                        case 159 /* GetAccessor */:
+                        case 160 /* SetAccessor */:
+                        case 197 /* FunctionExpression */:
+                        case 240 /* FunctionDeclaration */:
+                        case 198 /* ArrowFunction */:
                             // Check type parameters
                             if (nodes === parent.typeParameters) {
                                 diagnostics.push(createDiagnosticForNodeArray(nodes, ts.Diagnostics.type_parameter_declarations_can_only_be_used_in_a_ts_file));
                                 return;
                             }
                         // falls through
-                        case 219 /* VariableStatement */:
+                        case 220 /* VariableStatement */:
                             // Check modifiers
                             if (nodes === parent.modifiers) {
-                                return checkModifiers(nodes, parent.kind === 219 /* VariableStatement */);
+                                return checkModifiers(nodes, parent.kind === 220 /* VariableStatement */);
                             }
                             break;
-                        case 154 /* PropertyDeclaration */:
+                        case 155 /* PropertyDeclaration */:
                             // Check modifiers of property declaration
                             if (nodes === parent.modifiers) {
                                 for (var _i = 0, _a = nodes; _i < _a.length; _i++) {
                                     var modifier = _a[_i];
-                                    if (modifier.kind !== 116 /* StaticKeyword */) {
+                                    if (modifier.kind !== 117 /* StaticKeyword */) {
                                         diagnostics.push(createDiagnosticForNode(modifier, ts.Diagnostics._0_can_only_be_used_in_a_ts_file, ts.tokenToString(modifier.kind)));
                                     }
                                 }
                                 return;
                             }
                             break;
-                        case 151 /* Parameter */:
+                        case 152 /* Parameter */:
                             // Check modifiers of parameter declaration
                             if (nodes === parent.modifiers) {
                                 diagnostics.push(createDiagnosticForNodeArray(nodes, ts.Diagnostics.parameter_modifiers_can_only_be_used_in_a_ts_file));
                                 return;
                             }
                             break;
-                        case 191 /* CallExpression */:
-                        case 192 /* NewExpression */:
-                        case 211 /* ExpressionWithTypeArguments */:
-                        case 261 /* JsxSelfClosingElement */:
-                        case 262 /* JsxOpeningElement */:
+                        case 192 /* CallExpression */:
+                        case 193 /* NewExpression */:
+                        case 212 /* ExpressionWithTypeArguments */:
+                        case 262 /* JsxSelfClosingElement */:
+                        case 263 /* JsxOpeningElement */:
                             // Check type arguments
                             if (nodes === parent.typeArguments) {
                                 diagnostics.push(createDiagnosticForNodeArray(nodes, ts.Diagnostics.type_arguments_can_only_be_used_in_a_ts_file));
@@ -89065,24 +91710,24 @@ var ts;
                     for (var _i = 0, modifiers_1 = modifiers; _i < modifiers_1.length; _i++) {
                         var modifier = modifiers_1[_i];
                         switch (modifier.kind) {
-                            case 77 /* ConstKeyword */:
+                            case 78 /* ConstKeyword */:
                                 if (isConstValid) {
                                     continue;
                                 }
                             // to report error,
                             // falls through
-                            case 115 /* PublicKeyword */:
-                            case 113 /* PrivateKeyword */:
-                            case 114 /* ProtectedKeyword */:
-                            case 133 /* ReadonlyKeyword */:
-                            case 125 /* DeclareKeyword */:
-                            case 118 /* AbstractKeyword */:
+                            case 116 /* PublicKeyword */:
+                            case 114 /* PrivateKeyword */:
+                            case 115 /* ProtectedKeyword */:
+                            case 134 /* ReadonlyKeyword */:
+                            case 126 /* DeclareKeyword */:
+                            case 119 /* AbstractKeyword */:
                                 diagnostics.push(createDiagnosticForNode(modifier, ts.Diagnostics._0_can_only_be_used_in_a_ts_file, ts.tokenToString(modifier.kind)));
                                 break;
                             // These are all legal modifiers.
-                            case 116 /* StaticKeyword */:
-                            case 85 /* ExportKeyword */:
-                            case 80 /* DefaultKeyword */:
+                            case 117 /* StaticKeyword */:
+                            case 86 /* ExportKeyword */:
+                            case 81 /* DefaultKeyword */:
                         }
                     }
                 }
@@ -89157,8 +91802,8 @@ var ts;
             return a.fileName === b.fileName;
         }
         function moduleNameIsEqualTo(a, b) {
-            return a.kind === 72 /* Identifier */
-                ? b.kind === 72 /* Identifier */ && a.escapedText === b.escapedText
+            return a.kind === 73 /* Identifier */
+                ? b.kind === 73 /* Identifier */ && a.escapedText === b.escapedText
                 : b.kind === 10 /* StringLiteral */ && a.text === b.text;
         }
         function collectExternalModuleReferences(file) {
@@ -89373,7 +92018,10 @@ var ts;
                     if (isRedirect) {
                         inputName = getProjectReferenceRedirect(fileName) || fileName;
                     }
-                    if (ts.getNormalizedAbsolutePath(checkedName, currentDirectory) !== ts.getNormalizedAbsolutePath(inputName, currentDirectory)) {
+                    // Check if it differs only in drive letters its ok to ignore that error:
+                    var checkedAbsolutePath = ts.getNormalizedAbsolutePathWithoutRoot(checkedName, currentDirectory);
+                    var inputAbsolutePath = ts.getNormalizedAbsolutePathWithoutRoot(inputName, currentDirectory);
+                    if (checkedAbsolutePath !== inputAbsolutePath) {
                         reportFileNamesDifferOnlyInCasingError(inputName, checkedName, refFile, refPos, refEnd);
                     }
                 }
@@ -89402,9 +92050,13 @@ var ts;
             }
             var redirectedPath;
             if (refFile) {
-                var redirect = getProjectReferenceRedirect(fileName);
-                if (redirect) {
-                    (refFile.redirectedReferences || (refFile.redirectedReferences = [])).push(fileName);
+                var redirectProject = getProjectReferenceRedirectProject(fileName);
+                if (redirectProject) {
+                    if (redirectProject.commandLine.options.outFile || redirectProject.commandLine.options.out) {
+                        // Shouldnt create many to 1 mapping file in --out scenario
+                        return undefined;
+                    }
+                    var redirect = getProjectReferenceOutputName(redirectProject, fileName);
                     fileName = redirect;
                     // Once we start redirecting to a file, we can potentially come back to it
                     // via a back-reference from another file in the .d.ts folder. If that happens we'll
@@ -89488,20 +92140,23 @@ var ts;
             }
         }
         function getProjectReferenceRedirect(fileName) {
+            var referencedProject = getProjectReferenceRedirectProject(fileName);
+            return referencedProject && getProjectReferenceOutputName(referencedProject, fileName);
+        }
+        function getProjectReferenceRedirectProject(fileName) {
             // Ignore dts or any of the non ts files
             if (!resolvedProjectReferences || !resolvedProjectReferences.length || ts.fileExtensionIs(fileName, ".d.ts" /* Dts */) || !ts.fileExtensionIsOneOf(fileName, ts.supportedTSExtensions)) {
                 return undefined;
             }
             // If this file is produced by a referenced project, we need to rewrite it to
             // look in the output folder of the referenced project rather than the input
-            var referencedProject = getResolvedProjectReferenceToRedirect(fileName);
-            if (!referencedProject) {
-                return undefined;
-            }
+            return getResolvedProjectReferenceToRedirect(fileName);
+        }
+        function getProjectReferenceOutputName(referencedProject, fileName) {
             var out = referencedProject.commandLine.options.outFile || referencedProject.commandLine.options.out;
             return out ?
                 ts.changeExtension(out, ".d.ts" /* Dts */) :
-                ts.getOutputDeclarationFileName(fileName, referencedProject.commandLine);
+                ts.getOutputDeclarationFileName(fileName, referencedProject.commandLine, !host.useCaseSensitiveFileNames());
         }
         /**
          * Get the referenced project if the file is input file from that reference project
@@ -89742,18 +92397,33 @@ var ts;
             if (fromCache !== undefined) {
                 return fromCache || undefined;
             }
-            // An absolute path pointing to the containing directory of the config file
-            var basePath = ts.getNormalizedAbsolutePath(ts.getDirectoryPath(refPath), host.getCurrentDirectory());
-            var sourceFile = host.getSourceFile(refPath, 100 /* JSON */);
-            addFileToFilesByName(sourceFile, sourceFilePath, /*redirectedPath*/ undefined);
-            if (sourceFile === undefined) {
-                projectReferenceRedirects.set(sourceFilePath, false);
-                return undefined;
+            var commandLine;
+            var sourceFile;
+            if (host.getParsedCommandLine) {
+                commandLine = host.getParsedCommandLine(refPath);
+                if (!commandLine) {
+                    addFileToFilesByName(/*sourceFile*/ undefined, sourceFilePath, /*redirectedPath*/ undefined);
+                    projectReferenceRedirects.set(sourceFilePath, false);
+                    return undefined;
+                }
+                sourceFile = ts.Debug.assertDefined(commandLine.options.configFile);
+                ts.Debug.assert(!sourceFile.path || sourceFile.path === sourceFilePath);
+                addFileToFilesByName(sourceFile, sourceFilePath, /*redirectedPath*/ undefined);
+            }
+            else {
+                // An absolute path pointing to the containing directory of the config file
+                var basePath = ts.getNormalizedAbsolutePath(ts.getDirectoryPath(refPath), host.getCurrentDirectory());
+                sourceFile = host.getSourceFile(refPath, 100 /* JSON */);
+                addFileToFilesByName(sourceFile, sourceFilePath, /*redirectedPath*/ undefined);
+                if (sourceFile === undefined) {
+                    projectReferenceRedirects.set(sourceFilePath, false);
+                    return undefined;
+                }
+                commandLine = ts.parseJsonSourceFileConfigFileContent(sourceFile, configParsingHost, basePath, /*existingOptions*/ undefined, refPath);
             }
             sourceFile.path = sourceFilePath;
             sourceFile.resolvedPath = sourceFilePath;
             sourceFile.originalFileName = refPath;
-            var commandLine = ts.parseJsonSourceFileConfigFileContent(sourceFile, configParsingHost, basePath, /*existingOptions*/ undefined, refPath);
             var resolvedRef = { commandLine: commandLine, sourceFile: sourceFile };
             projectReferenceRedirects.set(sourceFilePath, resolvedRef);
             if (commandLine.projectReferences) {
@@ -89769,9 +92439,6 @@ var ts;
                 if (ts.getEmitDeclarations(options)) {
                     createDiagnosticForOptionName(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, getEmitDeclarationOptionName(options), "isolatedModules");
                 }
-                if (options.noEmitOnError) {
-                    createDiagnosticForOptionName(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "noEmitOnError", "isolatedModules");
-                }
                 if (options.out) {
                     createDiagnosticForOptionName(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "out", "isolatedModules");
                 }
@@ -89803,17 +92470,20 @@ var ts;
                     createDiagnosticForOptionName(ts.Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1_or_option_2, "tsBuildInfoFile", "incremental", "composite");
                 }
             }
+            else if (options.incremental && !options.outFile && !options.out && !options.configFilePath) {
+                programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_incremental_can_only_be_specified_using_tsconfig_emitting_to_single_file_or_when_option_tsBuildInfoFile_is_specified));
+            }
             verifyProjectReferences();
             // List of collected files is complete; validate exhautiveness if this is a project with a file list
             if (options.composite) {
-                var sourceFiles = files.filter(function (f) { return !f.isDeclarationFile; });
-                if (rootNames.length < sourceFiles.length) {
-                    var normalizedRootNames = rootNames.map(function (r) { return ts.normalizePath(r).toLowerCase(); });
-                    for (var _i = 0, _a = sourceFiles.map(function (f) { return ts.normalizePath(f.path).toLowerCase(); }); _i < _a.length; _i++) {
-                        var file = _a[_i];
-                        if (normalizedRootNames.indexOf(file) === -1) {
-                            programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.File_0_is_not_in_project_file_list_Projects_must_list_all_files_or_use_an_include_pattern, file));
-                        }
+                var rootPaths = rootNames.map(toPath);
+                for (var _i = 0, files_3 = files; _i < files_3.length; _i++) {
+                    var file = files_3[_i];
+                    // Ignore file that is not emitted
+                    if (!ts.sourceFileMayBeEmitted(file, options, isSourceFileFromExternalLibrary, getResolvedProjectReferenceToRedirect))
+                        continue;
+                    if (rootPaths.indexOf(file.path) === -1) {
+                        programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.File_0_is_not_listed_within_the_file_list_of_project_1_Projects_must_list_all_files_or_use_an_include_pattern, file.fileName, options.configFilePath || ""));
                     }
                 }
             }
@@ -89887,10 +92557,10 @@ var ts;
                 if (options.module === ts.ModuleKind.None && languageVersion < 2 /* ES2015 */) {
                     createDiagnosticForOptionName(ts.Diagnostics.Option_isolatedModules_can_only_be_used_when_either_option_module_is_provided_or_option_target_is_ES2015_or_higher, "isolatedModules", "target");
                 }
-                var firstNonExternalModuleSourceFile = ts.find(files, function (f) { return !ts.isExternalModule(f) && !f.isDeclarationFile && f.scriptKind !== 6 /* JSON */; });
+                var firstNonExternalModuleSourceFile = ts.find(files, function (f) { return !ts.isExternalModule(f) && !ts.isSourceFileJS(f) && !f.isDeclarationFile && f.scriptKind !== 6 /* JSON */; });
                 if (firstNonExternalModuleSourceFile) {
                     var span = ts.getErrorSpanForNode(firstNonExternalModuleSourceFile, firstNonExternalModuleSourceFile);
-                    programDiagnostics.add(ts.createFileDiagnostic(firstNonExternalModuleSourceFile, span.start, span.length, ts.Diagnostics.Cannot_compile_namespaces_when_the_isolatedModules_flag_is_provided));
+                    programDiagnostics.add(ts.createFileDiagnostic(firstNonExternalModuleSourceFile, span.start, span.length, ts.Diagnostics.All_files_must_be_modules_when_the_isolatedModules_flag_is_provided));
                 }
             }
             else if (firstNonAmbientExternalModuleSourceFile && languageVersion < 2 /* ES2015 */ && options.module === ts.ModuleKind.None) {
@@ -89975,13 +92645,13 @@ var ts;
                     var emitFilePath = toPath(emitFileName);
                     // Report error if the output overwrites input file
                     if (filesByName.has(emitFilePath)) {
-                        var chain_2;
+                        var chain = void 0;
                         if (!options.configFilePath) {
                             // The program is from either an inferred project or an external project
-                            chain_2 = ts.chainDiagnosticMessages(/*details*/ undefined, ts.Diagnostics.Adding_a_tsconfig_json_file_will_help_organize_projects_that_contain_both_TypeScript_and_JavaScript_files_Learn_more_at_https_Colon_Slash_Slashaka_ms_Slashtsconfig);
+                            chain = ts.chainDiagnosticMessages(/*details*/ undefined, ts.Diagnostics.Adding_a_tsconfig_json_file_will_help_organize_projects_that_contain_both_TypeScript_and_JavaScript_files_Learn_more_at_https_Colon_Slash_Slashaka_ms_Slashtsconfig);
                         }
-                        chain_2 = ts.chainDiagnosticMessages(chain_2, ts.Diagnostics.Cannot_write_file_0_because_it_would_overwrite_input_file, emitFileName);
-                        blockEmittingOfFile(emitFileName, ts.createCompilerDiagnosticFromMessageChain(chain_2));
+                        chain = ts.chainDiagnosticMessages(chain, ts.Diagnostics.Cannot_write_file_0_because_it_would_overwrite_input_file, emitFileName);
+                        blockEmittingOfFile(emitFileName, ts.createCompilerDiagnosticFromMessageChain(chain));
                     }
                     var emitFileKey = !host.useCaseSensitiveFileNames() ? emitFilePath.toLocaleLowerCase() : emitFilePath;
                     // Report error if multiple files write into same file
@@ -90171,7 +92841,7 @@ var ts;
             readFile: function (f) { return directoryStructureHost.readFile(f); },
             useCaseSensitiveFileNames: host.useCaseSensitiveFileNames(),
             getCurrentDirectory: function () { return host.getCurrentDirectory(); },
-            onUnRecoverableConfigFileDiagnostic: host.onUnRecoverableConfigFileDiagnostic || (function () { return undefined; }),
+            onUnRecoverableConfigFileDiagnostic: host.onUnRecoverableConfigFileDiagnostic || ts.returnUndefined,
             trace: host.trace ? function (s) { return host.trace(s); } : undefined
         };
     }
@@ -90393,7 +93063,7 @@ var ts;
             // Create the reference map, and set the file infos
             for (var _i = 0, _a = newProgram.getSourceFiles(); _i < _a.length; _i++) {
                 var sourceFile = _a[_i];
-                var version_1 = sourceFile.version;
+                var version_1 = ts.Debug.assertDefined(sourceFile.version, "Program intended to be used with Builder should have source files with versions set");
                 var oldInfo = useOldState ? oldState.fileInfos.get(sourceFile.path) : undefined;
                 if (referencedMap) {
                     var newReferences = getReferencedFiles(newProgram, sourceFile, getCanonicalFileName);
@@ -90516,6 +93186,7 @@ var ts;
             cacheToUpdateSignature.set(sourceFile.path, latestSignature);
             return !prevSignature || latestSignature !== prevSignature;
         }
+        BuilderState.updateShapeSignature = updateShapeSignature;
         /**
          * Coverts the declaration emit result into exported modules map
          */
@@ -90558,7 +93229,6 @@ var ts;
          * Get all the dependencies of the sourceFile
          */
         function getAllDependencies(state, programOfThisState, sourceFile) {
-            var _a;
             var compilerOptions = programOfThisState.getCompilerOptions();
             // With --out or --outFile all outputs go into single file, all files depend on each other
             if (compilerOptions.outFile || compilerOptions.out) {
@@ -90578,8 +93248,8 @@ var ts;
                     var references = state.referencedMap.get(path);
                     if (references) {
                         var iterator = references.keys();
-                        for (var _b = iterator.next(), value = _b.value, done = _b.done; !done; _a = iterator.next(), value = _a.value, done = _a.done, _a) {
-                            queue.push(value);
+                        for (var iterResult = iterator.next(); !iterResult.done; iterResult = iterator.next()) {
+                            queue.push(iterResult.value);
                         }
                     }
                 }
@@ -90785,7 +93455,7 @@ var ts;
                 // Unchanged file copy diagnostics
                 var diagnostics = oldState.semanticDiagnosticsPerFile.get(sourceFilePath);
                 if (diagnostics) {
-                    state.semanticDiagnosticsPerFile.set(sourceFilePath, oldState.hasReusableDiagnostic ? convertToDiagnostics(diagnostics, newProgram) : diagnostics);
+                    state.semanticDiagnosticsPerFile.set(sourceFilePath, oldState.hasReusableDiagnostic ? convertToDiagnostics(diagnostics, newProgram, getCanonicalFileName) : diagnostics);
                     if (!state.semanticDiagnosticsFromOldState) {
                         state.semanticDiagnosticsFromOldState = ts.createMap();
                     }
@@ -90793,44 +93463,37 @@ var ts;
                 }
             }
         });
-        if (oldCompilerOptions &&
-            (oldCompilerOptions.outDir !== compilerOptions.outDir ||
-                oldCompilerOptions.declarationDir !== compilerOptions.declarationDir ||
-                (oldCompilerOptions.outFile || oldCompilerOptions.out) !== (compilerOptions.outFile || compilerOptions.out))) {
+        if (oldCompilerOptions && ts.compilerOptionsAffectEmit(compilerOptions, oldCompilerOptions)) {
             // Add all files to affectedFilesPendingEmit since emit changed
-            state.affectedFilesPendingEmit = ts.concatenate(state.affectedFilesPendingEmit, newProgram.getSourceFiles().map(function (f) { return f.path; }));
-            if (state.affectedFilesPendingEmitIndex === undefined) {
-                state.affectedFilesPendingEmitIndex = 0;
-            }
+            addToAffectedFilesPendingEmit(state, newProgram.getSourceFiles().map(function (f) { return f.path; }));
             ts.Debug.assert(state.seenAffectedFiles === undefined);
             state.seenAffectedFiles = ts.createMap();
         }
         return state;
     }
-    function convertToDiagnostics(diagnostics, newProgram) {
+    function convertToDiagnostics(diagnostics, newProgram, getCanonicalFileName) {
         if (!diagnostics.length)
             return ts.emptyArray;
+        var buildInfoDirectory = ts.getDirectoryPath(ts.getNormalizedAbsolutePath(ts.getOutputPathForBuildInfo(newProgram.getCompilerOptions()), newProgram.getCurrentDirectory()));
         return diagnostics.map(function (diagnostic) {
-            var result = convertToDiagnosticRelatedInformation(diagnostic, newProgram);
+            var result = convertToDiagnosticRelatedInformation(diagnostic, newProgram, toPath);
             result.reportsUnnecessary = diagnostic.reportsUnnecessary;
             result.source = diagnostic.source;
             var relatedInformation = diagnostic.relatedInformation;
             result.relatedInformation = relatedInformation ?
                 relatedInformation.length ?
-                    relatedInformation.map(function (r) { return convertToDiagnosticRelatedInformation(r, newProgram); }) :
+                    relatedInformation.map(function (r) { return convertToDiagnosticRelatedInformation(r, newProgram, toPath); }) :
                     ts.emptyArray :
                 undefined;
             return result;
         });
+        function toPath(path) {
+            return ts.toPath(path, buildInfoDirectory, getCanonicalFileName);
+        }
     }
-    function convertToDiagnosticRelatedInformation(diagnostic, newProgram) {
-        var file = diagnostic.file, messageText = diagnostic.messageText;
-        return __assign({}, diagnostic, { file: file && newProgram.getSourceFileByPath(file), messageText: messageText === undefined || ts.isString(messageText) ?
-                messageText :
-                convertToDiagnosticMessageChain(messageText, newProgram) });
-    }
-    function convertToDiagnosticMessageChain(diagnostic, newProgram) {
-        return __assign({}, diagnostic, { next: diagnostic.next && convertToDiagnosticMessageChain(diagnostic.next, newProgram) });
+    function convertToDiagnosticRelatedInformation(diagnostic, newProgram, toPath) {
+        var file = diagnostic.file;
+        return __assign({}, diagnostic, { file: file ? newProgram.getSourceFileByPath(toPath(file)) : undefined });
     }
     /**
      * Releases program and other related not needed properties
@@ -90885,7 +93548,7 @@ var ts;
                     if (!seenAffectedFiles.has(affectedFile.path)) {
                         // Set the next affected file as seen and remove the cached semantic diagnostics
                         state.affectedFilesIndex = affectedFilesIndex;
-                        cleanSemanticDiagnosticsOfAffectedFile(state, affectedFile);
+                        handleDtsMayChangeOfAffectedFile(state, affectedFile, cancellationToken, computeHash);
                         return affectedFile;
                     }
                     seenAffectedFiles.set(affectedFile.path, true);
@@ -90946,94 +93609,49 @@ var ts;
         return undefined;
     }
     /**
-     * Remove the semantic diagnostics cached from old state for affected File and the files that are referencing modules that export entities from affected file
+     *  Handles semantic diagnostics and dts emit for affectedFile and files, that are referencing modules that export entities from affected file
+     *  This is because even though js emit doesnt change, dts emit / type used can change resulting in need for dts emit and js change
      */
-    function cleanSemanticDiagnosticsOfAffectedFile(state, affectedFile) {
-        if (removeSemanticDiagnosticsOf(state, affectedFile.path)) {
-            // If there are no more diagnostics from old cache, done
+    function handleDtsMayChangeOfAffectedFile(state, affectedFile, cancellationToken, computeHash) {
+        removeSemanticDiagnosticsOf(state, affectedFile.path);
+        // If affected files is everything except default library, then nothing more to do
+        if (state.allFilesExcludingDefaultLibraryFile === state.affectedFiles) {
+            if (!state.cleanedDiagnosticsOfLibFiles) {
+                state.cleanedDiagnosticsOfLibFiles = true;
+                var program_1 = ts.Debug.assertDefined(state.program);
+                var options_2 = program_1.getCompilerOptions();
+                ts.forEach(program_1.getSourceFiles(), function (f) {
+                    return program_1.isSourceFileDefaultLibrary(f) &&
+                        !ts.skipTypeChecking(f, options_2) &&
+                        removeSemanticDiagnosticsOf(state, f.path);
+                });
+            }
             return;
         }
-        // Clean lib file diagnostics if its all files excluding default files to emit
-        if (state.allFilesExcludingDefaultLibraryFile === state.affectedFiles && !state.cleanedDiagnosticsOfLibFiles) {
-            state.cleanedDiagnosticsOfLibFiles = true;
-            var program_1 = ts.Debug.assertDefined(state.program);
-            var options_2 = program_1.getCompilerOptions();
-            if (ts.forEach(program_1.getSourceFiles(), function (f) {
-                return program_1.isSourceFileDefaultLibrary(f) &&
-                    !ts.skipTypeChecking(f, options_2) &&
-                    removeSemanticDiagnosticsOf(state, f.path);
-            })) {
-                return;
+        forEachReferencingModulesOfExportOfAffectedFile(state, affectedFile, function (state, path) { return handleDtsMayChangeOf(state, path, cancellationToken, computeHash); });
+    }
+    /**
+     * Handle the dts may change, so they need to be added to pending emit if dts emit is enabled,
+     * Also we need to make sure signature is updated for these files
+     */
+    function handleDtsMayChangeOf(state, path, cancellationToken, computeHash) {
+        removeSemanticDiagnosticsOf(state, path);
+        if (!state.changedFilesSet.has(path)) {
+            var program = ts.Debug.assertDefined(state.program);
+            var sourceFile = program.getSourceFileByPath(path);
+            if (sourceFile) {
+                // Even though the js emit doesnt change and we are already handling dts emit and semantic diagnostics
+                // we need to update the signature to reflect correctness of the signature(which is output d.ts emit) of this file
+                // This ensures that we dont later during incremental builds considering wrong signature.
+                // Eg where this also is needed to ensure that .tsbuildinfo generated by incremental build should be same as if it was first fresh build
+                ts.BuilderState.updateShapeSignature(state, program, sourceFile, ts.Debug.assertDefined(state.currentAffectedFilesSignatures), cancellationToken, computeHash, state.currentAffectedFilesExportedModulesMap);
+                // If not dts emit, nothing more to do
+                if (ts.getEmitDeclarations(state.compilerOptions)) {
+                    addToAffectedFilesPendingEmit(state, [path]);
+                }
             }
         }
-        // If there was change in signature for the changed file,
-        // then delete the semantic diagnostics for files that are affected by using exports of this module
-        if (!state.exportedModulesMap || state.affectedFiles.length === 1 || !state.changedFilesSet.has(affectedFile.path)) {
-            return;
-        }
-        ts.Debug.assert(!!state.currentAffectedFilesExportedModulesMap);
-        var seenFileAndExportsOfFile = ts.createMap();
-        // Go through exported modules from cache first
-        // If exported modules has path, all files referencing file exported from are affected
-        if (ts.forEachEntry(state.currentAffectedFilesExportedModulesMap, function (exportedModules, exportedFromPath) {
-            return exportedModules &&
-                exportedModules.has(affectedFile.path) &&
-                removeSemanticDiagnosticsOfFilesReferencingPath(state, exportedFromPath, seenFileAndExportsOfFile);
-        })) {
-            return;
-        }
-        // If exported from path is not from cache and exported modules has path, all files referencing file exported from are affected
-        ts.forEachEntry(state.exportedModulesMap, function (exportedModules, exportedFromPath) {
-            return !state.currentAffectedFilesExportedModulesMap.has(exportedFromPath) && // If we already iterated this through cache, ignore it
-                exportedModules.has(affectedFile.path) &&
-                removeSemanticDiagnosticsOfFilesReferencingPath(state, exportedFromPath, seenFileAndExportsOfFile);
-        });
-    }
-    /**
-     * removes the semantic diagnostics of files referencing referencedPath and
-     * returns true if there are no more semantic diagnostics from old state
-     */
-    function removeSemanticDiagnosticsOfFilesReferencingPath(state, referencedPath, seenFileAndExportsOfFile) {
-        return ts.forEachEntry(state.referencedMap, function (referencesInFile, filePath) {
-            return referencesInFile.has(referencedPath) && removeSemanticDiagnosticsOfFileAndExportsOfFile(state, filePath, seenFileAndExportsOfFile);
-        });
-    }
-    /**
-     * Removes semantic diagnostics of file and anything that exports this file
-     */
-    function removeSemanticDiagnosticsOfFileAndExportsOfFile(state, filePath, seenFileAndExportsOfFile) {
-        if (!ts.addToSeen(seenFileAndExportsOfFile, filePath)) {
-            return false;
-        }
-        if (removeSemanticDiagnosticsOf(state, filePath)) {
-            // If there are no more diagnostics from old cache, done
-            return true;
-        }
-        ts.Debug.assert(!!state.currentAffectedFilesExportedModulesMap);
-        // Go through exported modules from cache first
-        // If exported modules has path, all files referencing file exported from are affected
-        if (ts.forEachEntry(state.currentAffectedFilesExportedModulesMap, function (exportedModules, exportedFromPath) {
-            return exportedModules &&
-                exportedModules.has(filePath) &&
-                removeSemanticDiagnosticsOfFileAndExportsOfFile(state, exportedFromPath, seenFileAndExportsOfFile);
-        })) {
-            return true;
-        }
-        // If exported from path is not from cache and exported modules has path, all files referencing file exported from are affected
-        if (ts.forEachEntry(state.exportedModulesMap, function (exportedModules, exportedFromPath) {
-            return !state.currentAffectedFilesExportedModulesMap.has(exportedFromPath) && // If we already iterated this through cache, ignore it
-                exportedModules.has(filePath) &&
-                removeSemanticDiagnosticsOfFileAndExportsOfFile(state, exportedFromPath, seenFileAndExportsOfFile);
-        })) {
-            return true;
-        }
-        // Remove diagnostics of files that import this file (without going to exports of referencing files)
-        return !!ts.forEachEntry(state.referencedMap, function (referencesInFile, referencingFilePath) {
-            return referencesInFile.has(filePath) &&
-                !seenFileAndExportsOfFile.has(referencingFilePath) && // Not already removed diagnostic file
-                removeSemanticDiagnosticsOf(state, referencingFilePath);
-        } // Dont add to seen since this is not yet done with the export removal
-        );
+        return false;
     }
     /**
      * Removes semantic diagnostics for path and
@@ -91047,6 +93665,78 @@ var ts;
         state.semanticDiagnosticsPerFile.delete(path);
         return !state.semanticDiagnosticsFromOldState.size;
     }
+    /**
+     * Iterate on referencing modules that export entities from affected file
+     */
+    function forEachReferencingModulesOfExportOfAffectedFile(state, affectedFile, fn) {
+        // If there was change in signature (dts output) for the changed file,
+        // then only we need to handle pending file emit
+        if (!state.exportedModulesMap || state.affectedFiles.length === 1 || !state.changedFilesSet.has(affectedFile.path)) {
+            return;
+        }
+        ts.Debug.assert(!!state.currentAffectedFilesExportedModulesMap);
+        var seenFileAndExportsOfFile = ts.createMap();
+        // Go through exported modules from cache first
+        // If exported modules has path, all files referencing file exported from are affected
+        if (ts.forEachEntry(state.currentAffectedFilesExportedModulesMap, function (exportedModules, exportedFromPath) {
+            return exportedModules &&
+                exportedModules.has(affectedFile.path) &&
+                forEachFilesReferencingPath(state, exportedFromPath, seenFileAndExportsOfFile, fn);
+        })) {
+            return;
+        }
+        // If exported from path is not from cache and exported modules has path, all files referencing file exported from are affected
+        ts.forEachEntry(state.exportedModulesMap, function (exportedModules, exportedFromPath) {
+            return !state.currentAffectedFilesExportedModulesMap.has(exportedFromPath) && // If we already iterated this through cache, ignore it
+                exportedModules.has(affectedFile.path) &&
+                forEachFilesReferencingPath(state, exportedFromPath, seenFileAndExportsOfFile, fn);
+        });
+    }
+    /**
+     * Iterate on files referencing referencedPath
+     */
+    function forEachFilesReferencingPath(state, referencedPath, seenFileAndExportsOfFile, fn) {
+        return ts.forEachEntry(state.referencedMap, function (referencesInFile, filePath) {
+            return referencesInFile.has(referencedPath) && forEachFileAndExportsOfFile(state, filePath, seenFileAndExportsOfFile, fn);
+        });
+    }
+    /**
+     * fn on file and iterate on anything that exports this file
+     */
+    function forEachFileAndExportsOfFile(state, filePath, seenFileAndExportsOfFile, fn) {
+        if (!ts.addToSeen(seenFileAndExportsOfFile, filePath)) {
+            return false;
+        }
+        if (fn(state, filePath)) {
+            // If there are no more diagnostics from old cache, done
+            return true;
+        }
+        ts.Debug.assert(!!state.currentAffectedFilesExportedModulesMap);
+        // Go through exported modules from cache first
+        // If exported modules has path, all files referencing file exported from are affected
+        if (ts.forEachEntry(state.currentAffectedFilesExportedModulesMap, function (exportedModules, exportedFromPath) {
+            return exportedModules &&
+                exportedModules.has(filePath) &&
+                forEachFileAndExportsOfFile(state, exportedFromPath, seenFileAndExportsOfFile, fn);
+        })) {
+            return true;
+        }
+        // If exported from path is not from cache and exported modules has path, all files referencing file exported from are affected
+        if (ts.forEachEntry(state.exportedModulesMap, function (exportedModules, exportedFromPath) {
+            return !state.currentAffectedFilesExportedModulesMap.has(exportedFromPath) && // If we already iterated this through cache, ignore it
+                exportedModules.has(filePath) &&
+                forEachFileAndExportsOfFile(state, exportedFromPath, seenFileAndExportsOfFile, fn);
+        })) {
+            return true;
+        }
+        // Remove diagnostics of files that import this file (without going to exports of referencing files)
+        return !!ts.forEachEntry(state.referencedMap, function (referencesInFile, referencingFilePath) {
+            return referencesInFile.has(filePath) &&
+                !seenFileAndExportsOfFile.has(referencingFilePath) && // Not already removed diagnostic file
+                fn(state, referencingFilePath);
+        } // Dont add to seen since this is not yet done with the export removal
+        );
+    }
     /**
      * This is called after completing operation on the next affected file.
      * The operations here are postponed to ensure that cancellation during the iteration is handled correctly
@@ -91099,19 +93789,24 @@ var ts;
     /**
      * Gets the program information to be emitted in buildInfo so that we can use it to create new program
      */
-    function getProgramBuildInfo(state) {
+    function getProgramBuildInfo(state, getCanonicalFileName) {
         if (state.compilerOptions.outFile || state.compilerOptions.out)
             return undefined;
+        var currentDirectory = ts.Debug.assertDefined(state.program).getCurrentDirectory();
+        var buildInfoDirectory = ts.getDirectoryPath(ts.getNormalizedAbsolutePath(ts.getOutputPathForBuildInfo(state.compilerOptions), currentDirectory));
         var fileInfos = {};
         state.fileInfos.forEach(function (value, key) {
             var signature = state.currentAffectedFilesSignatures && state.currentAffectedFilesSignatures.get(key);
-            fileInfos[key] = signature === undefined ? value : { version: value.version, signature: signature };
+            fileInfos[relativeToBuildInfo(key)] = signature === undefined ? value : { version: value.version, signature: signature };
         });
-        var result = { fileInfos: fileInfos, options: state.compilerOptions };
+        var result = {
+            fileInfos: fileInfos,
+            options: convertToReusableCompilerOptions(state.compilerOptions, relativeToBuildInfoEnsuringAbsolutePath)
+        };
         if (state.referencedMap) {
             var referencedMap_1 = {};
             state.referencedMap.forEach(function (value, key) {
-                referencedMap_1[key] = ts.arrayFrom(value.keys());
+                referencedMap_1[relativeToBuildInfo(key)] = ts.arrayFrom(value.keys(), relativeToBuildInfo);
             });
             result.referencedMap = referencedMap_1;
         }
@@ -91121,10 +93816,10 @@ var ts;
                 var newValue = state.currentAffectedFilesExportedModulesMap && state.currentAffectedFilesExportedModulesMap.get(key);
                 // Not in temporary cache, use existing value
                 if (newValue === undefined)
-                    exportedModulesMap_1[key] = ts.arrayFrom(value.keys());
+                    exportedModulesMap_1[relativeToBuildInfo(key)] = ts.arrayFrom(value.keys(), relativeToBuildInfo);
                 // Value in cache and has updated value map, use that
                 else if (newValue)
-                    exportedModulesMap_1[key] = ts.arrayFrom(newValue.keys());
+                    exportedModulesMap_1[relativeToBuildInfo(key)] = ts.arrayFrom(newValue.keys(), relativeToBuildInfo);
             });
             result.exportedModulesMap = exportedModulesMap_1;
         }
@@ -91133,39 +93828,67 @@ var ts;
             // Currently not recording actual errors since those mean no emit for tsc --build
             state.semanticDiagnosticsPerFile.forEach(function (value, key) { return semanticDiagnosticsPerFile_1.push(value.length ?
                 [
-                    key,
+                    relativeToBuildInfo(key),
                     state.hasReusableDiagnostic ?
                         value :
-                        convertToReusableDiagnostics(value)
+                        convertToReusableDiagnostics(value, relativeToBuildInfo)
                 ] :
-                key); });
+                relativeToBuildInfo(key)); });
             result.semanticDiagnosticsPerFile = semanticDiagnosticsPerFile_1;
         }
         return result;
+        function relativeToBuildInfoEnsuringAbsolutePath(path) {
+            return relativeToBuildInfo(ts.getNormalizedAbsolutePath(path, currentDirectory));
+        }
+        function relativeToBuildInfo(path) {
+            return ts.ensurePathIsNonModuleName(ts.getRelativePathFromDirectory(buildInfoDirectory, path, getCanonicalFileName));
+        }
     }
-    function convertToReusableDiagnostics(diagnostics) {
+    function convertToReusableCompilerOptions(options, relativeToBuildInfo) {
+        var result = {};
+        var optionsNameMap = ts.getOptionNameMap().optionNameMap;
+        for (var name in options) {
+            if (ts.hasProperty(options, name)) {
+                result[name] = convertToReusableCompilerOptionValue(optionsNameMap.get(name.toLowerCase()), options[name], relativeToBuildInfo);
+            }
+        }
+        if (result.configFilePath) {
+            result.configFilePath = relativeToBuildInfo(result.configFilePath);
+        }
+        return result;
+    }
+    function convertToReusableCompilerOptionValue(option, value, relativeToBuildInfo) {
+        if (option) {
+            if (option.type === "list") {
+                var values = value;
+                if (option.element.isFilePath && values.length) {
+                    return values.map(relativeToBuildInfo);
+                }
+            }
+            else if (option.isFilePath) {
+                return relativeToBuildInfo(value);
+            }
+        }
+        return value;
+    }
+    function convertToReusableDiagnostics(diagnostics, relativeToBuildInfo) {
         ts.Debug.assert(!!diagnostics.length);
         return diagnostics.map(function (diagnostic) {
-            var result = convertToReusableDiagnosticRelatedInformation(diagnostic);
+            var result = convertToReusableDiagnosticRelatedInformation(diagnostic, relativeToBuildInfo);
             result.reportsUnnecessary = diagnostic.reportsUnnecessary;
             result.source = diagnostic.source;
             var relatedInformation = diagnostic.relatedInformation;
             result.relatedInformation = relatedInformation ?
                 relatedInformation.length ?
-                    relatedInformation.map(function (r) { return convertToReusableDiagnosticRelatedInformation(r); }) :
+                    relatedInformation.map(function (r) { return convertToReusableDiagnosticRelatedInformation(r, relativeToBuildInfo); }) :
                     ts.emptyArray :
                 undefined;
             return result;
         });
     }
-    function convertToReusableDiagnosticRelatedInformation(diagnostic) {
-        var file = diagnostic.file, messageText = diagnostic.messageText;
-        return __assign({}, diagnostic, { file: file && file.path, messageText: messageText === undefined || ts.isString(messageText) ?
-                messageText :
-                convertToReusableDiagnosticMessageChain(messageText) });
-    }
-    function convertToReusableDiagnosticMessageChain(diagnostic) {
-        return __assign({}, diagnostic, { next: diagnostic.next && convertToReusableDiagnosticMessageChain(diagnostic.next) });
+    function convertToReusableDiagnosticRelatedInformation(diagnostic, relativeToBuildInfo) {
+        var file = diagnostic.file;
+        return __assign({}, diagnostic, { file: file ? relativeToBuildInfo(file.path) : undefined });
     }
     var BuilderProgramKind;
     (function (BuilderProgramKind) {
@@ -91223,7 +93946,7 @@ var ts;
         var computeHash = host.createHash || ts.generateDjb2Hash;
         var state = createBuilderProgramState(newProgram, getCanonicalFileName, oldState);
         var backupState;
-        newProgram.getProgramBuildInfo = function () { return getProgramBuildInfo(state); };
+        newProgram.getProgramBuildInfo = function () { return getProgramBuildInfo(state, getCanonicalFileName); };
         // To ensure that we arent storing any references to old program or new program without state
         newProgram = undefined; // TODO: GH#18217
         oldProgram = undefined;
@@ -91249,6 +93972,7 @@ var ts;
             result.getSemanticDiagnosticsOfNextAffectedFile = getSemanticDiagnosticsOfNextAffectedFile;
         }
         else if (kind === BuilderProgramKind.EmitAndSemanticDiagnosticsBuilderProgram) {
+            result.getSemanticDiagnosticsOfNextAffectedFile = getSemanticDiagnosticsOfNextAffectedFile;
             result.emitNextAffectedFile = emitNextAffectedFile;
         }
         else {
@@ -91274,7 +93998,7 @@ var ts;
                         return toAffectedFileResult(state, 
                         // When whole program is affected, do emit only once (eg when --out or --outFile is specified)
                         // Otherwise just affected file
-                        affected_1.emitBuildInfo(writeFile || host.writeFile, cancellationToken), affected_1, 
+                        affected_1.emitBuildInfo(writeFile || ts.maybeBind(host, host.writeFile), cancellationToken), affected_1, 
                         /*isPendingEmitFile*/ false, 
                         /*isBuildInfoEmit*/ true);
                     }
@@ -91290,14 +94014,10 @@ var ts;
                     affected = program;
                 }
             }
-            // Mark seen emitted files if there are pending files to be emitted
-            if (state.affectedFilesPendingEmit && state.program !== affected) {
-                (state.seenEmittedFiles || (state.seenEmittedFiles = ts.createMap())).set(affected.path, true);
-            }
             return toAffectedFileResult(state, 
             // When whole program is affected, do emit only once (eg when --out or --outFile is specified)
             // Otherwise just affected file
-            ts.Debug.assertDefined(state.program).emit(affected === state.program ? undefined : affected, writeFile || host.writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers), affected, isPendingEmitFile);
+            ts.Debug.assertDefined(state.program).emit(affected === state.program ? undefined : affected, writeFile || ts.maybeBind(host, host.writeFile), cancellationToken, emitOnlyDtsFiles, customTransformers), affected, isPendingEmitFile);
         }
         /**
          * Emits the JavaScript and declaration files.
@@ -91334,7 +94054,7 @@ var ts;
                     };
                 }
             }
-            return ts.Debug.assertDefined(state.program).emit(targetSourceFile, writeFile || host.writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers);
+            return ts.Debug.assertDefined(state.program).emit(targetSourceFile, writeFile || ts.maybeBind(host, host.writeFile), cancellationToken, emitOnlyDtsFiles, customTransformers);
         }
         /**
          * Return the semantic diagnostics for the next affected file or undefined if iteration is complete
@@ -91351,6 +94071,10 @@ var ts;
                     // When whole program is affected, get all semantic diagnostics (eg when --out or --outFile is specified)
                     return toAffectedFileResult(state, state.program.getSemanticDiagnostics(/*targetSourceFile*/ undefined, cancellationToken), affected);
                 }
+                // Add file to affected file pending emit to handle for later emit time
+                if (kind === BuilderProgramKind.EmitAndSemanticDiagnosticsBuilderProgram) {
+                    addToAffectedFilesPendingEmit(state, [affected.path]);
+                }
                 // Get diagnostics for the affected file if its not ignored
                 if (ignoreSourceFile && ignoreSourceFile(affected)) {
                     // Get next affected file
@@ -91381,35 +94105,29 @@ var ts;
             }
             // When semantic builder asks for diagnostics of the whole program,
             // ensure that all the affected files are handled
-            var affected;
-            var affectedFilesPendingEmit;
-            while (affected = getNextAffectedFile(state, cancellationToken, computeHash)) {
-                if (affected !== state.program && kind === BuilderProgramKind.EmitAndSemanticDiagnosticsBuilderProgram) {
-                    (affectedFilesPendingEmit || (affectedFilesPendingEmit = [])).push(affected.path);
-                }
-                doneWithAffectedFile(state, affected);
-            }
-            // In case of emit builder, cache the files to be emitted
-            if (affectedFilesPendingEmit) {
-                state.affectedFilesPendingEmit = ts.concatenate(state.affectedFilesPendingEmit, affectedFilesPendingEmit);
-                // affectedFilesPendingEmitIndex === undefined
-                // - means the emit state.affectedFilesPendingEmit was undefined before adding current affected files
-                //   so start from 0 as array would be affectedFilesPendingEmit
-                // else, continue to iterate from existing index, the current set is appended to existing files
-                if (state.affectedFilesPendingEmitIndex === undefined) {
-                    state.affectedFilesPendingEmitIndex = 0;
-                }
+            // tslint:disable-next-line no-empty
+            while (getSemanticDiagnosticsOfNextAffectedFile(cancellationToken)) {
             }
             var diagnostics;
             for (var _i = 0, _a = ts.Debug.assertDefined(state.program).getSourceFiles(); _i < _a.length; _i++) {
-                var sourceFile_2 = _a[_i];
-                diagnostics = ts.addRange(diagnostics, getSemanticDiagnosticsOfFile(state, sourceFile_2, cancellationToken));
+                var sourceFile_1 = _a[_i];
+                diagnostics = ts.addRange(diagnostics, getSemanticDiagnosticsOfFile(state, sourceFile_1, cancellationToken));
             }
             return diagnostics || ts.emptyArray;
         }
     }
     ts.createBuilderProgram = createBuilderProgram;
-    function getMapOfReferencedSet(mapLike) {
+    function addToAffectedFilesPendingEmit(state, affectedFilesPendingEmit) {
+        state.affectedFilesPendingEmit = ts.concatenate(state.affectedFilesPendingEmit, affectedFilesPendingEmit);
+        // affectedFilesPendingEmitIndex === undefined
+        // - means the emit state.affectedFilesPendingEmit was undefined before adding current affected files
+        //   so start from 0 as array would be affectedFilesPendingEmit
+        // else, continue to iterate from existing index, the current set is appended to existing files
+        if (state.affectedFilesPendingEmitIndex === undefined) {
+            state.affectedFilesPendingEmitIndex = 0;
+        }
+    }
+    function getMapOfReferencedSet(mapLike, toPath) {
         if (!mapLike)
             return undefined;
         var map = ts.createMap();
@@ -91417,18 +94135,25 @@ var ts;
         // template is undefined, and instead will just exit the loop.
         for (var key in mapLike) {
             if (ts.hasProperty(mapLike, key)) {
-                map.set(key, ts.arrayToSet(mapLike[key]));
+                map.set(toPath(key), ts.arrayToSet(mapLike[key], toPath));
             }
         }
         return map;
     }
-    function createBuildProgramUsingProgramBuildInfo(program) {
-        var fileInfos = ts.createMapFromTemplate(program.fileInfos);
+    function createBuildProgramUsingProgramBuildInfo(program, buildInfoPath, host) {
+        var buildInfoDirectory = ts.getDirectoryPath(ts.getNormalizedAbsolutePath(buildInfoPath, host.getCurrentDirectory()));
+        var getCanonicalFileName = ts.createGetCanonicalFileName(host.useCaseSensitiveFileNames());
+        var fileInfos = ts.createMap();
+        for (var key in program.fileInfos) {
+            if (ts.hasProperty(program.fileInfos, key)) {
+                fileInfos.set(toPath(key), program.fileInfos[key]);
+            }
+        }
         var state = {
             fileInfos: fileInfos,
-            compilerOptions: program.options,
-            referencedMap: getMapOfReferencedSet(program.referencedMap),
-            exportedModulesMap: getMapOfReferencedSet(program.exportedModulesMap),
+            compilerOptions: convertFromReusableCompilerOptions(program.options, toAbsolutePath),
+            referencedMap: getMapOfReferencedSet(program.referencedMap, toPath),
+            exportedModulesMap: getMapOfReferencedSet(program.exportedModulesMap, toPath),
             semanticDiagnosticsPerFile: program.semanticDiagnosticsPerFile && ts.arrayToMap(program.semanticDiagnosticsPerFile, function (value) { return ts.isString(value) ? value : value[0]; }, function (value) { return ts.isString(value) ? ts.emptyArray : value[1]; }),
             hasReusableDiagnostic: true
         };
@@ -91437,7 +94162,7 @@ var ts;
             backupState: ts.noop,
             restoreState: ts.noop,
             getProgram: ts.notImplemented,
-            getProgramOrUndefined: function () { return undefined; },
+            getProgramOrUndefined: ts.returnUndefined,
             releaseProgram: ts.noop,
             getCompilerOptions: function () { return state.compilerOptions; },
             getSourceFile: ts.notImplemented,
@@ -91454,8 +94179,41 @@ var ts;
             emitNextAffectedFile: ts.notImplemented,
             getSemanticDiagnosticsOfNextAffectedFile: ts.notImplemented,
         };
+        function toPath(path) {
+            return ts.toPath(path, buildInfoDirectory, getCanonicalFileName);
+        }
+        function toAbsolutePath(path) {
+            return ts.getNormalizedAbsolutePath(path, buildInfoDirectory);
+        }
     }
     ts.createBuildProgramUsingProgramBuildInfo = createBuildProgramUsingProgramBuildInfo;
+    function convertFromReusableCompilerOptions(options, toAbsolutePath) {
+        var result = {};
+        var optionsNameMap = ts.getOptionNameMap().optionNameMap;
+        for (var name in options) {
+            if (ts.hasProperty(options, name)) {
+                result[name] = convertFromReusableCompilerOptionValue(optionsNameMap.get(name.toLowerCase()), options[name], toAbsolutePath);
+            }
+        }
+        if (result.configFilePath) {
+            result.configFilePath = toAbsolutePath(result.configFilePath);
+        }
+        return result;
+    }
+    function convertFromReusableCompilerOptionValue(option, value, toAbsolutePath) {
+        if (option) {
+            if (option.type === "list") {
+                var values = value;
+                if (option.element.isFilePath && values.length) {
+                    return values.map(toAbsolutePath);
+                }
+            }
+            else if (option.isFilePath) {
+                return toAbsolutePath(value);
+            }
+        }
+        return value;
+    }
     function createRedirectedBuilderProgram(state, configFileParsingDiagnostics) {
         return {
             getState: ts.notImplemented,
@@ -91505,6 +94263,38 @@ var ts;
         return ts.some(ts.ignoredPaths, function (searchPath) { return ts.stringContains(path, searchPath); });
     }
     ts.isPathIgnored = isPathIgnored;
+    /**
+     * Filter out paths like
+     * "/", "/user", "/user/username", "/user/username/folderAtRoot",
+     * "c:/", "c:/users", "c:/users/username", "c:/users/username/folderAtRoot", "c:/folderAtRoot"
+     * @param dirPath
+     */
+    function canWatchDirectory(dirPath) {
+        var rootLength = ts.getRootLength(dirPath);
+        if (dirPath.length === rootLength) {
+            // Ignore "/", "c:/"
+            return false;
+        }
+        var nextDirectorySeparator = dirPath.indexOf(ts.directorySeparator, rootLength);
+        if (nextDirectorySeparator === -1) {
+            // ignore "/user", "c:/users" or "c:/folderAtRoot"
+            return false;
+        }
+        if (dirPath.charCodeAt(0) !== 47 /* slash */ &&
+            dirPath.substr(rootLength, nextDirectorySeparator).search(/users/i) === -1) {
+            // Paths like c:/folderAtRoot/subFolder are allowed
+            return true;
+        }
+        for (var searchIndex = nextDirectorySeparator + 1, searchLevels = 2; searchLevels > 0; searchLevels--) {
+            searchIndex = dirPath.indexOf(ts.directorySeparator, searchIndex) + 1;
+            if (searchIndex === 0) {
+                // Folder isnt at expected minimun levels
+                return false;
+            }
+        }
+        return true;
+    }
+    ts.canWatchDirectory = canWatchDirectory;
     ts.maxNumberOfFilesToIterateForInvalidation = 256;
     function createResolutionCache(resolutionHost, rootDirForResolution, logChangesWhenResolvingModule) {
         var filesWithChangedSetOfUnresolvedImports;
@@ -91635,7 +94425,7 @@ var ts;
             if (globalCache !== undefined && !ts.isExternalModuleNameRelative(moduleName) && !(primaryResult.resolvedModule && ts.extensionIsTS(primaryResult.resolvedModule.extension))) {
                 // create different collection of failed lookup locations for second pass
                 // if it will fail and we've already found something during the first pass - we don't want to pollute its results
-                var _a = ts.loadModuleFromGlobalCache(moduleName, resolutionHost.projectName, compilerOptions, host, globalCache), resolvedModule = _a.resolvedModule, failedLookupLocations = _a.failedLookupLocations;
+                var _a = ts.loadModuleFromGlobalCache(ts.Debug.assertDefined(resolutionHost.globalCacheResolutionModuleName)(moduleName), resolutionHost.projectName, compilerOptions, host, globalCache), resolvedModule = _a.resolvedModule, failedLookupLocations = _a.failedLookupLocations;
                 if (resolvedModule) {
                     return { resolvedModule: resolvedModule, failedLookupLocations: ts.addRange(primaryResult.failedLookupLocations, failedLookupLocations) };
                 }
@@ -91740,37 +94530,6 @@ var ts;
         function isNodeModulesAtTypesDirectory(dirPath) {
             return ts.endsWith(dirPath, "/node_modules/@types");
         }
-        /**
-         * Filter out paths like
-         * "/", "/user", "/user/username", "/user/username/folderAtRoot",
-         * "c:/", "c:/users", "c:/users/username", "c:/users/username/folderAtRoot", "c:/folderAtRoot"
-         * @param dirPath
-         */
-        function canWatchDirectory(dirPath) {
-            var rootLength = ts.getRootLength(dirPath);
-            if (dirPath.length === rootLength) {
-                // Ignore "/", "c:/"
-                return false;
-            }
-            var nextDirectorySeparator = dirPath.indexOf(ts.directorySeparator, rootLength);
-            if (nextDirectorySeparator === -1) {
-                // ignore "/user", "c:/users" or "c:/folderAtRoot"
-                return false;
-            }
-            if (dirPath.charCodeAt(0) !== 47 /* slash */ &&
-                dirPath.substr(rootLength, nextDirectorySeparator).search(/users/i) === -1) {
-                // Paths like c:/folderAtRoot/subFolder are allowed
-                return true;
-            }
-            for (var searchIndex = nextDirectorySeparator + 1, searchLevels = 2; searchLevels > 0; searchLevels--) {
-                searchIndex = dirPath.indexOf(ts.directorySeparator, searchIndex) + 1;
-                if (searchIndex === 0) {
-                    // Folder isnt at expected minimun levels
-                    return false;
-                }
-            }
-            return true;
-        }
         function getDirectoryToWatchFailedLookupLocation(failedLookupLocation, failedLookupLocationPath) {
             if (isInDirectoryPath(rootPath, failedLookupLocationPath)) {
                 // Ensure failed look up is normalized path
@@ -92028,6 +94787,10 @@ var ts;
                 // If something to do with folder/file starting with "." in node_modules folder, skip it
                 if (isPathIgnored(fileOrDirectoryPath))
                     return false;
+                // prevent saving an open file from over-eagerly triggering invalidation
+                if (resolutionHost.fileIsOpen(fileOrDirectoryPath)) {
+                    return false;
+                }
                 // Some file or directory in the watching directory is created
                 // Return early if it does not have any of the watching extension or not the custom failed lookup path
                 var dirOfFileOrDirectory = ts.getDirectoryPath(fileOrDirectoryPath);
@@ -92270,11 +95033,11 @@ var ts;
         }
         function discoverProbableSymlinks(files, getCanonicalFileName, cwd) {
             var result = ts.createMap();
-            var symlinks = ts.mapDefined(files, function (sf) {
-                return sf.resolvedModules && ts.firstDefinedIterator(sf.resolvedModules.values(), function (res) {
+            var symlinks = ts.flatten(ts.mapDefined(files, function (sf) {
+                return sf.resolvedModules && ts.compact(ts.arrayFrom(ts.mapIterator(sf.resolvedModules.values(), function (res) {
                     return res && res.originalPath && res.resolvedFileName !== res.originalPath ? [res.resolvedFileName, res.originalPath] : undefined;
-                });
-            });
+                })));
+            }));
             for (var _i = 0, symlinks_1 = symlinks; _i < symlinks_1.length; _i++) {
                 var _a = symlinks_1[_i], resolvedPath = _a[0], originalPath = _a[1];
                 var _b = guessDirectorySymlink(resolvedPath, originalPath, cwd, getCanonicalFileName), commonResolved = _b[0], commonOriginal = _b[1];
@@ -92617,25 +95380,34 @@ var ts;
         return "" + newLine + ts.flattenDiagnosticMessageText(d.messageText, newLine) + newLine + newLine;
     }
     ts.getErrorSummaryText = getErrorSummaryText;
+    function listFiles(program, writeFileName) {
+        if (program.getCompilerOptions().listFiles) {
+            ts.forEach(program.getSourceFiles(), function (file) {
+                writeFileName(file.fileName);
+            });
+        }
+    }
+    ts.listFiles = listFiles;
     /**
      * Helper that emit files, report diagnostics and lists emitted and/or source files depending on compiler options
      */
-    function emitFilesAndReportErrors(program, reportDiagnostic, writeFileName, reportSummary, writeFile) {
+    function emitFilesAndReportErrors(program, reportDiagnostic, writeFileName, reportSummary, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers) {
         // First get and report any syntactic errors.
         var diagnostics = program.getConfigFileParsingDiagnostics().slice();
         var configFileParsingDiagnosticsLength = diagnostics.length;
-        ts.addRange(diagnostics, program.getSyntacticDiagnostics());
+        ts.addRange(diagnostics, program.getSyntacticDiagnostics(/*sourceFile*/ undefined, cancellationToken));
         // If we didn't have any syntactic errors, then also try getting the global and
         // semantic errors.
         if (diagnostics.length === configFileParsingDiagnosticsLength) {
-            ts.addRange(diagnostics, program.getOptionsDiagnostics());
-            ts.addRange(diagnostics, program.getGlobalDiagnostics());
+            ts.addRange(diagnostics, program.getOptionsDiagnostics(cancellationToken));
+            ts.addRange(diagnostics, program.getGlobalDiagnostics(cancellationToken));
             if (diagnostics.length === configFileParsingDiagnosticsLength) {
-                ts.addRange(diagnostics, program.getSemanticDiagnostics());
+                ts.addRange(diagnostics, program.getSemanticDiagnostics(/*sourceFile*/ undefined, cancellationToken));
             }
         }
         // Emit and report any errors we ran into.
-        var _a = program.emit(/*targetSourceFile*/ undefined, writeFile), emittedFiles = _a.emittedFiles, emitSkipped = _a.emitSkipped, emitDiagnostics = _a.diagnostics;
+        var emitResult = program.emit(/*targetSourceFile*/ undefined, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers);
+        var emittedFiles = emitResult.emittedFiles, emitDiagnostics = emitResult.diagnostics;
         ts.addRange(diagnostics, emitDiagnostics);
         ts.sortAndDeduplicateDiagnostics(diagnostics).forEach(reportDiagnostic);
         if (writeFileName) {
@@ -92644,16 +95416,20 @@ var ts;
                 var filepath = ts.getNormalizedAbsolutePath(file, currentDir_1);
                 writeFileName("TSFILE: " + filepath);
             });
-            if (program.getCompilerOptions().listFiles) {
-                ts.forEach(program.getSourceFiles(), function (file) {
-                    writeFileName(file.fileName);
-                });
-            }
+            listFiles(program, writeFileName);
         }
         if (reportSummary) {
             reportSummary(getErrorCountForSummary(diagnostics));
         }
-        if (emitSkipped && diagnostics.length > 0) {
+        return {
+            emitResult: emitResult,
+            diagnostics: diagnostics,
+        };
+    }
+    ts.emitFilesAndReportErrors = emitFilesAndReportErrors;
+    function emitFilesAndReportErrorsAndGetExitStatus(program, reportDiagnostic, writeFileName, reportSummary, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers) {
+        var _a = emitFilesAndReportErrors(program, reportDiagnostic, writeFileName, reportSummary, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers), emitResult = _a.emitResult, diagnostics = _a.diagnostics;
+        if (emitResult.emitSkipped && diagnostics.length > 0) {
             // If the emitter didn't emit anything, then pass that value along.
             return ts.ExitStatus.DiagnosticsPresent_OutputsSkipped;
         }
@@ -92664,15 +95440,15 @@ var ts;
         }
         return ts.ExitStatus.Success;
     }
-    ts.emitFilesAndReportErrors = emitFilesAndReportErrors;
-    var noopFileWatcher = { close: ts.noop };
+    ts.emitFilesAndReportErrorsAndGetExitStatus = emitFilesAndReportErrorsAndGetExitStatus;
+    ts.noopFileWatcher = { close: ts.noop };
     function createWatchHost(system, reportWatchStatus) {
         if (system === void 0) { system = ts.sys; }
         var onWatchStatusChange = reportWatchStatus || createWatchStatusReporter(system);
         return {
             onWatchStatusChange: onWatchStatusChange,
-            watchFile: ts.maybeBind(system, system.watchFile) || (function () { return noopFileWatcher; }),
-            watchDirectory: ts.maybeBind(system, system.watchDirectory) || (function () { return noopFileWatcher; }),
+            watchFile: ts.maybeBind(system, system.watchFile) || (function () { return ts.noopFileWatcher; }),
+            watchDirectory: ts.maybeBind(system, system.watchDirectory) || (function () { return ts.noopFileWatcher; }),
             setTimeout: ts.maybeBind(system, system.setTimeout) || ts.noop,
             clearTimeout: ts.maybeBind(system, system.clearTimeout) || ts.noop
         };
@@ -92757,7 +95533,7 @@ var ts;
         }
     }
     ts.createCompilerHostFromProgramHost = createCompilerHostFromProgramHost;
-    function setCreateSourceFileAsHashVersioned(compilerHost, host) {
+    function setGetSourceFileAsHashVersioned(compilerHost, host) {
         var originalGetSourceFile = compilerHost.getSourceFile;
         var computeHash = host.createHash || ts.generateDjb2Hash;
         compilerHost.getSourceFile = function () {
@@ -92772,7 +95548,7 @@ var ts;
             return result;
         };
     }
-    ts.setCreateSourceFileAsHashVersioned = setCreateSourceFileAsHashVersioned;
+    ts.setGetSourceFileAsHashVersioned = setGetSourceFileAsHashVersioned;
     /**
      * Creates the watch compiler host that can be extended with config file or root file names and options host
      */
@@ -92847,13 +95623,25 @@ var ts;
         return host;
     }
     ts.createWatchCompilerHostOfFilesAndCompilerOptions = createWatchCompilerHostOfFilesAndCompilerOptions;
-    function readBuilderProgram(compilerOptions, readFile) {
+    function performIncrementalCompilation(input) {
+        var system = input.system || ts.sys;
+        var host = input.host || (input.host = ts.createIncrementalCompilerHost(input.options, system));
+        var builderProgram = ts.createIncrementalProgram(input);
+        var exitStatus = emitFilesAndReportErrorsAndGetExitStatus(builderProgram, input.reportDiagnostic || createDiagnosticReporter(system), function (s) { return host.trace && host.trace(s); }, input.reportErrorSummary || input.options.pretty ? function (errorCount) { return system.write(getErrorSummaryText(errorCount, system.newLine)); } : undefined);
+        if (input.afterProgramEmitAndDiagnostics)
+            input.afterProgramEmitAndDiagnostics(builderProgram);
+        return exitStatus;
+    }
+    ts.performIncrementalCompilation = performIncrementalCompilation;
+})(ts || (ts = {}));
+(function (ts) {
+    function readBuilderProgram(compilerOptions, host) {
         if (compilerOptions.out || compilerOptions.outFile)
             return undefined;
         var buildInfoPath = ts.getOutputPathForBuildInfo(compilerOptions);
         if (!buildInfoPath)
             return undefined;
-        var content = readFile(buildInfoPath);
+        var content = host.readFile(buildInfoPath);
         if (!content)
             return undefined;
         var buildInfo = ts.getBuildInfo(content);
@@ -92861,11 +95649,26 @@ var ts;
             return undefined;
         if (!buildInfo.program)
             return undefined;
-        return ts.createBuildProgramUsingProgramBuildInfo(buildInfo.program);
+        return ts.createBuildProgramUsingProgramBuildInfo(buildInfo.program, buildInfoPath, host);
     }
     ts.readBuilderProgram = readBuilderProgram;
-})(ts || (ts = {}));
-(function (ts) {
+    function createIncrementalCompilerHost(options, system) {
+        if (system === void 0) { system = ts.sys; }
+        var host = ts.createCompilerHostWorker(options, /*setParentNodes*/ undefined, system);
+        host.createHash = ts.maybeBind(system, system.createHash);
+        ts.setGetSourceFileAsHashVersioned(host, system);
+        ts.changeCompilerHostLikeToUseCache(host, function (fileName) { return ts.toPath(fileName, host.getCurrentDirectory(), host.getCanonicalFileName); });
+        return host;
+    }
+    ts.createIncrementalCompilerHost = createIncrementalCompilerHost;
+    function createIncrementalProgram(_a) {
+        var rootNames = _a.rootNames, options = _a.options, configFileParsingDiagnostics = _a.configFileParsingDiagnostics, projectReferences = _a.projectReferences, host = _a.host, createProgram = _a.createProgram;
+        host = host || createIncrementalCompilerHost(options);
+        createProgram = createProgram || ts.createEmitAndSemanticDiagnosticsBuilderProgram;
+        var oldProgram = readBuilderProgram(options, host);
+        return createProgram(rootNames, options, host, oldProgram, configFileParsingDiagnostics, projectReferences);
+    }
+    ts.createIncrementalProgram = createIncrementalProgram;
     function createWatchCompilerHost(rootFilesOrConfigFileName, options, system, createProgram, reportDiagnostic, reportWatchStatus, projectReferences) {
         if (ts.isArray(rootFilesOrConfigFileName)) {
             return ts.createWatchCompilerHostOfFilesAndCompilerOptions(rootFilesOrConfigFileName, options, system, createProgram, reportDiagnostic, reportWatchStatus, projectReferences); // TODO: GH#18217
@@ -92920,7 +95723,7 @@ var ts;
             configFileWatcher = watchFile(host, configFileName, scheduleProgramReload, ts.PollingInterval.High, "Config file" /* ConfigFile */);
         }
         var compilerHost = ts.createCompilerHostFromProgramHost(host, function () { return compilerOptions; }, directoryStructureHost);
-        ts.setCreateSourceFileAsHashVersioned(compilerHost, host);
+        ts.setGetSourceFileAsHashVersioned(compilerHost, host);
         // Members for CompilerHost
         var getNewSourceFile = compilerHost.getSourceFile;
         compilerHost.getSourceFile = function (fileName) {
@@ -92945,6 +95748,7 @@ var ts;
             hasChangedAutomaticTypeDirectiveNames = true;
             scheduleProgramUpdate();
         };
+        compilerHost.fileIsOpen = ts.returnFalse;
         compilerHost.maxNumberOfFilesToIterateForInvalidation = host.maxNumberOfFilesToIterateForInvalidation;
         compilerHost.getCurrentProgram = getCurrentProgram;
         compilerHost.writeLog = writeLog;
@@ -92961,7 +95765,7 @@ var ts;
             (function (typeDirectiveNames, containingFile, redirectedReference) { return host.resolveTypeReferenceDirectives(typeDirectiveNames, containingFile, redirectedReference); }) :
             (function (typeDirectiveNames, containingFile, redirectedReference) { return resolutionCache.resolveTypeReferenceDirectives(typeDirectiveNames, containingFile, redirectedReference); });
         var userProvidedResolution = !!host.resolveModuleNames || !!host.resolveTypeReferenceDirectives;
-        builderProgram = ts.readBuilderProgram(compilerOptions, function (path) { return compilerHost.readFile(path); });
+        builderProgram = readBuilderProgram(compilerOptions, compilerHost);
         synchronizeProgram();
         // Update the wild card directory watch
         watchConfigFileWildCardDirectories();
@@ -93292,31 +96096,9 @@ var ts;
     }
     ts.createWatchProgram = createWatchProgram;
 })(ts || (ts = {}));
-// Currently we do not want to expose API for build, we should work out the API, and then expose it just like we did for builder/watch
 /*@internal*/
 var ts;
 (function (ts) {
-    var minimumDate = new Date(-8640000000000000);
-    var maximumDate = new Date(8640000000000000);
-    var BuildResultFlags;
-    (function (BuildResultFlags) {
-        BuildResultFlags[BuildResultFlags["None"] = 0] = "None";
-        /**
-         * No errors of any kind occurred during build
-         */
-        BuildResultFlags[BuildResultFlags["Success"] = 1] = "Success";
-        /**
-         * None of the .d.ts files emitted by this build were
-         * different from the existing files on disk
-         */
-        BuildResultFlags[BuildResultFlags["DeclarationOutputUnchanged"] = 2] = "DeclarationOutputUnchanged";
-        BuildResultFlags[BuildResultFlags["ConfigFileErrors"] = 4] = "ConfigFileErrors";
-        BuildResultFlags[BuildResultFlags["SyntaxErrors"] = 8] = "SyntaxErrors";
-        BuildResultFlags[BuildResultFlags["TypeErrors"] = 16] = "TypeErrors";
-        BuildResultFlags[BuildResultFlags["DeclarationEmitErrors"] = 32] = "DeclarationEmitErrors";
-        BuildResultFlags[BuildResultFlags["EmitErrors"] = 64] = "EmitErrors";
-        BuildResultFlags[BuildResultFlags["AnyErrors"] = 124] = "AnyErrors";
-    })(BuildResultFlags || (BuildResultFlags = {}));
     var UpToDateStatusType;
     (function (UpToDateStatusType) {
         UpToDateStatusType[UpToDateStatusType["Unbuildable"] = 0] = "Unbuildable";
@@ -93345,101 +96127,51 @@ var ts;
          */
         UpToDateStatusType[UpToDateStatusType["ContainerOnly"] = 11] = "ContainerOnly";
     })(UpToDateStatusType = ts.UpToDateStatusType || (ts.UpToDateStatusType = {}));
-    function createFileMap(toPath) {
-        // tslint:disable-next-line:no-null-keyword
-        var lookup = ts.createMap();
-        return {
-            setValue: setValue,
-            getValue: getValue,
-            removeKey: removeKey,
-            forEach: forEach,
-            hasKey: hasKey,
-            getSize: getSize,
-            clear: clear
-        };
-        function forEach(action) {
-            lookup.forEach(action);
-        }
-        function hasKey(fileName) {
-            return lookup.has(toPath(fileName));
-        }
-        function removeKey(fileName) {
-            lookup.delete(toPath(fileName));
-        }
-        function setValue(fileName, value) {
-            lookup.set(toPath(fileName), value);
-        }
-        function getValue(fileName) {
-            return lookup.get(toPath(fileName));
-        }
-        function getSize() {
-            return lookup.size;
-        }
-        function clear() {
-            lookup.clear();
+    function resolveConfigFileProjectName(project) {
+        if (ts.fileExtensionIs(project, ".json" /* Json */)) {
+            return project;
         }
+        return ts.combinePaths(project, "tsconfig.json");
+    }
+    ts.resolveConfigFileProjectName = resolveConfigFileProjectName;
+})(ts || (ts = {}));
+(function (ts) {
+    var minimumDate = new Date(-8640000000000000);
+    var maximumDate = new Date(8640000000000000);
+    var BuildResultFlags;
+    (function (BuildResultFlags) {
+        BuildResultFlags[BuildResultFlags["None"] = 0] = "None";
+        /**
+         * No errors of any kind occurred during build
+         */
+        BuildResultFlags[BuildResultFlags["Success"] = 1] = "Success";
+        /**
+         * None of the .d.ts files emitted by this build were
+         * different from the existing files on disk
+         */
+        BuildResultFlags[BuildResultFlags["DeclarationOutputUnchanged"] = 2] = "DeclarationOutputUnchanged";
+        BuildResultFlags[BuildResultFlags["ConfigFileErrors"] = 4] = "ConfigFileErrors";
+        BuildResultFlags[BuildResultFlags["SyntaxErrors"] = 8] = "SyntaxErrors";
+        BuildResultFlags[BuildResultFlags["TypeErrors"] = 16] = "TypeErrors";
+        BuildResultFlags[BuildResultFlags["DeclarationEmitErrors"] = 32] = "DeclarationEmitErrors";
+        BuildResultFlags[BuildResultFlags["EmitErrors"] = 64] = "EmitErrors";
+        BuildResultFlags[BuildResultFlags["AnyErrors"] = 124] = "AnyErrors";
+    })(BuildResultFlags || (BuildResultFlags = {}));
+    function createConfigFileMap() {
+        return ts.createMap();
     }
     function getOrCreateValueFromConfigFileMap(configFileMap, resolved, createT) {
-        var existingValue = configFileMap.getValue(resolved);
+        var existingValue = configFileMap.get(resolved);
         var newValue;
         if (!existingValue) {
             newValue = createT();
-            configFileMap.setValue(resolved, newValue);
+            configFileMap.set(resolved, newValue);
         }
         return existingValue || newValue;
     }
     function getOrCreateValueMapFromConfigFileMap(configFileMap, resolved) {
         return getOrCreateValueFromConfigFileMap(configFileMap, resolved, ts.createMap);
     }
-    function getOutputDeclarationFileName(inputFileName, configFile) {
-        var relativePath = ts.getRelativePathFromDirectory(rootDirOfOptions(configFile.options, configFile.options.configFilePath), inputFileName, /*ignoreCase*/ true);
-        var outputPath = ts.resolvePath(configFile.options.declarationDir || configFile.options.outDir || ts.getDirectoryPath(configFile.options.configFilePath), relativePath);
-        return ts.changeExtension(outputPath, ".d.ts" /* Dts */);
-    }
-    ts.getOutputDeclarationFileName = getOutputDeclarationFileName;
-    function getOutputJSFileName(inputFileName, configFile) {
-        var relativePath = ts.getRelativePathFromDirectory(rootDirOfOptions(configFile.options, configFile.options.configFilePath), inputFileName, /*ignoreCase*/ true);
-        var outputPath = ts.resolvePath(configFile.options.outDir || ts.getDirectoryPath(configFile.options.configFilePath), relativePath);
-        var newExtension = ts.fileExtensionIs(inputFileName, ".json" /* Json */) ? ".json" /* Json */ :
-            ts.fileExtensionIs(inputFileName, ".tsx" /* Tsx */) && configFile.options.jsx === 1 /* Preserve */ ? ".jsx" /* Jsx */ : ".js" /* Js */;
-        return ts.changeExtension(outputPath, newExtension);
-    }
-    function getOutputFileNames(inputFileName, configFile) {
-        // outFile is handled elsewhere; .d.ts files don't generate outputs
-        if (configFile.options.outFile || configFile.options.out || ts.fileExtensionIs(inputFileName, ".d.ts" /* Dts */)) {
-            return ts.emptyArray;
-        }
-        var outputs = [];
-        var js = getOutputJSFileName(inputFileName, configFile);
-        outputs.push(js);
-        if (configFile.options.sourceMap) {
-            outputs.push(js + ".map");
-        }
-        if (ts.getEmitDeclarations(configFile.options) && !ts.fileExtensionIs(inputFileName, ".json" /* Json */)) {
-            var dts = getOutputDeclarationFileName(inputFileName, configFile);
-            outputs.push(dts);
-            if (configFile.options.declarationMap) {
-                outputs.push(dts + ".map");
-            }
-        }
-        return outputs;
-    }
-    function getOutFileOutputs(project, ignoreBuildInfo) {
-        ts.Debug.assert(!!project.options.outFile || !!project.options.out, "outFile must be set");
-        var _a = ts.getOutputPathsForBundle(project.options, /*forceDtsPaths*/ false), jsFilePath = _a.jsFilePath, sourceMapFilePath = _a.sourceMapFilePath, declarationFilePath = _a.declarationFilePath, declarationMapPath = _a.declarationMapPath, buildInfoPath = _a.buildInfoPath;
-        var outputs = [];
-        var addOutput = function (path) { return path && (outputs || (outputs = [])).push(path); };
-        addOutput(jsFilePath);
-        addOutput(sourceMapFilePath);
-        addOutput(declarationFilePath);
-        addOutput(declarationMapPath);
-        if (!ignoreBuildInfo)
-            addOutput(buildInfoPath);
-        return outputs || ts.emptyArray;
-    }
-    function rootDirOfOptions(opts, configFileName) {
-        return opts.rootDir || ts.getDirectoryPath(configFileName);
-    }
     function newer(date1, date2) {
         return date2 > date1 ? date2 : date1;
     }
@@ -93459,7 +96191,7 @@ var ts;
     ts.createBuilderStatusReporter = createBuilderStatusReporter;
     function createSolutionBuilderHostBase(system, createProgram, reportDiagnostic, reportSolutionBuilderStatus) {
         var host = ts.createProgramHost(system, createProgram);
-        host.getModifiedTime = system.getModifiedTime ? function (path) { return system.getModifiedTime(path); } : function () { return undefined; };
+        host.getModifiedTime = system.getModifiedTime ? function (path) { return system.getModifiedTime(path); } : ts.returnUndefined;
         host.setModifiedTime = system.setModifiedTime ? function (path, date) { return system.setModifiedTime(path, date); } : ts.noop;
         host.deleteFile = system.deleteFile ? function (path) { return system.deleteFile(path); } : ts.noop;
         host.reportDiagnostic = reportDiagnostic || ts.createDiagnosticReporter(system);
@@ -93484,644 +96216,459 @@ var ts;
     function getCompilerOptionsOfBuildOptions(buildOptions) {
         var result = {};
         ts.commonOptionsWithBuild.forEach(function (option) {
-            result[option.name] = buildOptions[option.name];
+            if (ts.hasProperty(buildOptions, option.name))
+                result[option.name] = buildOptions[option.name];
         });
         return result;
     }
     function createSolutionBuilder(host, rootNames, defaultOptions) {
-        var hostWithWatch = host;
+        return createSolutionBuilderWorker(/*watch*/ false, host, rootNames, defaultOptions);
+    }
+    ts.createSolutionBuilder = createSolutionBuilder;
+    function createSolutionBuilderWithWatch(host, rootNames, defaultOptions) {
+        return createSolutionBuilderWorker(/*watch*/ true, host, rootNames, defaultOptions);
+    }
+    ts.createSolutionBuilderWithWatch = createSolutionBuilderWithWatch;
+    function createSolutionBuilderState(watch, hostOrHostWithWatch, rootNames, options) {
+        var host = hostOrHostWithWatch;
+        var hostWithWatch = hostOrHostWithWatch;
         var currentDirectory = host.getCurrentDirectory();
         var getCanonicalFileName = ts.createGetCanonicalFileName(host.useCaseSensitiveFileNames());
-        var parseConfigFileHost = ts.parseConfigHostFromCompilerHostLike(host);
         // State of the solution
-        var options = defaultOptions;
         var baseCompilerOptions = getCompilerOptionsOfBuildOptions(options);
-        var configFileCache = createFileMap(toPath);
-        /** Map from output file name to its pre-build timestamp */
-        var unchangedOutputs = createFileMap(toPath);
-        /** Map from config file name to up-to-date status */
-        var projectStatus = createFileMap(toPath);
-        var missingRoots = ts.createMap();
-        var globalDependencyGraph;
-        var writeFileName = function (s) { return host.trace && host.trace(s); };
-        var readFileWithCache = function (f) { return host.readFile(f); };
-        var projectCompilerOptions = baseCompilerOptions;
-        var compilerHost = ts.createCompilerHostFromProgramHost(host, function () { return projectCompilerOptions; });
-        ts.setCreateSourceFileAsHashVersioned(compilerHost, host);
-        var buildInfoChecked = createFileMap(toPath);
-        // Watch state
-        var builderPrograms = createFileMap(toPath);
-        var diagnostics = createFileMap(toPath);
-        var projectPendingBuild = createFileMap(toPath);
-        var projectErrorsReported = createFileMap(toPath);
-        var invalidatedProjectQueue = [];
-        var nextProjectToBuild = 0;
-        var timerToBuildInvalidatedProject;
-        var reportFileChangeDetected = false;
-        var _a = ts.createWatchFactory(host, options), watchFile = _a.watchFile, watchFilePath = _a.watchFilePath, watchDirectory = _a.watchDirectory, writeLog = _a.writeLog;
-        // Watches for the solution
-        var allWatchedWildcardDirectories = createFileMap(toPath);
-        var allWatchedInputFiles = createFileMap(toPath);
-        var allWatchedConfigFiles = createFileMap(toPath);
-        return {
-            buildAllProjects: buildAllProjects,
-            getUpToDateStatusOfFile: getUpToDateStatusOfFile,
-            cleanAllProjects: cleanAllProjects,
-            resetBuildContext: resetBuildContext,
-            getBuildGraph: getBuildGraph,
-            invalidateProject: invalidateProject,
-            buildInvalidatedProject: buildInvalidatedProject,
-            resolveProjectName: resolveProjectName,
-            startWatching: startWatching
+        var compilerHost = ts.createCompilerHostFromProgramHost(host, function () { return state.projectCompilerOptions; });
+        ts.setGetSourceFileAsHashVersioned(compilerHost, host);
+        compilerHost.getParsedCommandLine = function (fileName) { return parseConfigFile(state, fileName, toResolvedConfigFilePath(state, fileName)); };
+        compilerHost.resolveModuleNames = ts.maybeBind(host, host.resolveModuleNames);
+        compilerHost.resolveTypeReferenceDirectives = ts.maybeBind(host, host.resolveTypeReferenceDirectives);
+        var moduleResolutionCache = !compilerHost.resolveModuleNames ? ts.createModuleResolutionCache(currentDirectory, getCanonicalFileName) : undefined;
+        if (!compilerHost.resolveModuleNames) {
+            var loader_3 = function (moduleName, containingFile, redirectedReference) { return ts.resolveModuleName(moduleName, containingFile, state.projectCompilerOptions, compilerHost, moduleResolutionCache, redirectedReference).resolvedModule; };
+            compilerHost.resolveModuleNames = function (moduleNames, containingFile, _reusedNames, redirectedReference) {
+                return ts.loadWithLocalCache(ts.Debug.assertEachDefined(moduleNames), containingFile, redirectedReference, loader_3);
+            };
+        }
+        var _a = ts.createWatchFactory(hostWithWatch, options), watchFile = _a.watchFile, watchFilePath = _a.watchFilePath, watchDirectory = _a.watchDirectory, writeLog = _a.writeLog;
+        var state = {
+            host: host,
+            hostWithWatch: hostWithWatch,
+            currentDirectory: currentDirectory,
+            getCanonicalFileName: getCanonicalFileName,
+            parseConfigFileHost: ts.parseConfigHostFromCompilerHostLike(host),
+            writeFileName: host.trace ? function (s) { return host.trace(s); } : undefined,
+            // State of solution
+            options: options,
+            baseCompilerOptions: baseCompilerOptions,
+            rootNames: rootNames,
+            resolvedConfigFilePaths: ts.createMap(),
+            configFileCache: createConfigFileMap(),
+            projectStatus: createConfigFileMap(),
+            buildInfoChecked: createConfigFileMap(),
+            extendedConfigCache: ts.createMap(),
+            builderPrograms: createConfigFileMap(),
+            diagnostics: createConfigFileMap(),
+            projectPendingBuild: createConfigFileMap(),
+            projectErrorsReported: createConfigFileMap(),
+            compilerHost: compilerHost,
+            moduleResolutionCache: moduleResolutionCache,
+            // Mutable state
+            buildOrder: undefined,
+            readFileWithCache: function (f) { return host.readFile(f); },
+            projectCompilerOptions: baseCompilerOptions,
+            cache: undefined,
+            allProjectBuildPending: true,
+            needsSummary: true,
+            watchAllProjectsPending: watch,
+            currentInvalidatedProject: undefined,
+            // Watch state
+            watch: watch,
+            allWatchedWildcardDirectories: createConfigFileMap(),
+            allWatchedInputFiles: createConfigFileMap(),
+            allWatchedConfigFiles: createConfigFileMap(),
+            timerToBuildInvalidatedProject: undefined,
+            reportFileChangeDetected: false,
+            watchFile: watchFile,
+            watchFilePath: watchFilePath,
+            watchDirectory: watchDirectory,
+            writeLog: writeLog,
         };
-        function toPath(fileName) {
-            return ts.toPath(fileName, currentDirectory, getCanonicalFileName);
+        return state;
+    }
+    function toPath(state, fileName) {
+        return ts.toPath(fileName, state.currentDirectory, state.getCanonicalFileName);
+    }
+    function toResolvedConfigFilePath(state, fileName) {
+        var resolvedConfigFilePaths = state.resolvedConfigFilePaths;
+        var path = resolvedConfigFilePaths.get(fileName);
+        if (path !== undefined)
+            return path;
+        var resolvedPath = toPath(state, fileName);
+        resolvedConfigFilePaths.set(fileName, resolvedPath);
+        return resolvedPath;
+    }
+    function isParsedCommandLine(entry) {
+        return !!entry.options;
+    }
+    function parseConfigFile(state, configFileName, configFilePath) {
+        var configFileCache = state.configFileCache;
+        var value = configFileCache.get(configFilePath);
+        if (value) {
+            return isParsedCommandLine(value) ? value : undefined;
         }
-        function resetBuildContext(opts) {
-            if (opts === void 0) { opts = defaultOptions; }
-            options = opts;
-            baseCompilerOptions = getCompilerOptionsOfBuildOptions(options);
-            configFileCache.clear();
-            unchangedOutputs.clear();
-            projectStatus.clear();
-            missingRoots.clear();
-            globalDependencyGraph = undefined;
-            buildInfoChecked.clear();
-            diagnostics.clear();
-            projectPendingBuild.clear();
-            projectErrorsReported.clear();
-            invalidatedProjectQueue.length = 0;
-            nextProjectToBuild = 0;
-            if (timerToBuildInvalidatedProject) {
-                clearTimeout(timerToBuildInvalidatedProject);
-                timerToBuildInvalidatedProject = undefined;
-            }
-            reportFileChangeDetected = false;
-            ts.clearMap(allWatchedWildcardDirectories, function (wildCardWatches) { return ts.clearMap(wildCardWatches, ts.closeFileWatcherOf); });
-            ts.clearMap(allWatchedInputFiles, function (inputFileWatches) { return ts.clearMap(inputFileWatches, ts.closeFileWatcher); });
-            ts.clearMap(allWatchedConfigFiles, ts.closeFileWatcher);
-            builderPrograms.clear();
+        var diagnostic;
+        var parseConfigFileHost = state.parseConfigFileHost, baseCompilerOptions = state.baseCompilerOptions, extendedConfigCache = state.extendedConfigCache, host = state.host;
+        var parsed;
+        if (host.getParsedCommandLine) {
+            parsed = host.getParsedCommandLine(configFileName);
+            if (!parsed)
+                diagnostic = ts.createCompilerDiagnostic(ts.Diagnostics.File_0_not_found, configFileName);
         }
-        function isParsedCommandLine(entry) {
-            return !!entry.options;
-        }
-        function parseConfigFile(configFilePath) {
-            var value = configFileCache.getValue(configFilePath);
-            if (value) {
-                return isParsedCommandLine(value) ? value : undefined;
-            }
-            var diagnostic;
+        else {
             parseConfigFileHost.onUnRecoverableConfigFileDiagnostic = function (d) { return diagnostic = d; };
-            var parsed = ts.getParsedCommandLineOfConfigFile(configFilePath, baseCompilerOptions, parseConfigFileHost);
+            parsed = ts.getParsedCommandLineOfConfigFile(configFileName, baseCompilerOptions, parseConfigFileHost, extendedConfigCache);
             parseConfigFileHost.onUnRecoverableConfigFileDiagnostic = ts.noop;
-            configFileCache.setValue(configFilePath, parsed || diagnostic);
-            return parsed;
         }
-        function reportStatus(message) {
+        configFileCache.set(configFilePath, parsed || diagnostic);
+        return parsed;
+    }
+    function resolveProjectName(state, name) {
+        return ts.resolveConfigFileProjectName(ts.resolvePath(state.currentDirectory, name));
+    }
+    function createBuildOrder(state, roots) {
+        var temporaryMarks = ts.createMap();
+        var permanentMarks = ts.createMap();
+        var circularityReportStack = [];
+        var buildOrder;
+        for (var _i = 0, roots_1 = roots; _i < roots_1.length; _i++) {
+            var root = roots_1[_i];
+            visit(root);
+        }
+        return buildOrder || ts.emptyArray;
+        function visit(configFileName, inCircularContext) {
+            var projPath = toResolvedConfigFilePath(state, configFileName);
+            // Already visited
+            if (permanentMarks.has(projPath))
+                return;
+            // Circular
+            if (temporaryMarks.has(projPath)) {
+                if (!inCircularContext) {
+                    // TODO:: Do we report this as error?
+                    reportStatus(state, ts.Diagnostics.Project_references_may_not_form_a_circular_graph_Cycle_detected_Colon_0, circularityReportStack.join("\r\n"));
+                }
+                return;
+            }
+            temporaryMarks.set(projPath, true);
+            circularityReportStack.push(configFileName);
+            var parsed = parseConfigFile(state, configFileName, projPath);
+            if (parsed && parsed.projectReferences) {
+                for (var _i = 0, _a = parsed.projectReferences; _i < _a.length; _i++) {
+                    var ref = _a[_i];
+                    var resolvedRefPath = resolveProjectName(state, ref.path);
+                    visit(resolvedRefPath, inCircularContext || ref.circular);
+                }
+            }
+            circularityReportStack.pop();
+            permanentMarks.set(projPath, true);
+            (buildOrder || (buildOrder = [])).push(configFileName);
+        }
+    }
+    function getBuildOrder(state) {
+        return state.buildOrder ||
+            (state.buildOrder = createBuildOrder(state, state.rootNames.map(function (f) { return resolveProjectName(state, f); })));
+    }
+    function getBuildOrderFor(state, project, onlyReferences) {
+        var resolvedProject = project && resolveProjectName(state, project);
+        var buildOrderFromState = getBuildOrder(state);
+        if (resolvedProject) {
+            var projectPath_1 = toResolvedConfigFilePath(state, resolvedProject);
+            var projectIndex = ts.findIndex(buildOrderFromState, function (configFileName) { return toResolvedConfigFilePath(state, configFileName) === projectPath_1; });
+            if (projectIndex === -1)
+                return undefined;
+        }
+        var buildOrder = resolvedProject ? createBuildOrder(state, [resolvedProject]) : buildOrderFromState;
+        ts.Debug.assert(!onlyReferences || resolvedProject !== undefined);
+        ts.Debug.assert(!onlyReferences || buildOrder[buildOrder.length - 1] === resolvedProject);
+        return onlyReferences ? buildOrder.slice(0, buildOrder.length - 1) : buildOrder;
+    }
+    function enableCache(state) {
+        if (state.cache) {
+            disableCache(state);
+        }
+        var compilerHost = state.compilerHost, host = state.host;
+        var originalReadFileWithCache = state.readFileWithCache;
+        var originalGetSourceFile = compilerHost.getSourceFile;
+        var _a = ts.changeCompilerHostLikeToUseCache(host, function (fileName) { return toPath(state, fileName); }, function () {
             var args = [];
-            for (var _i = 1; _i < arguments.length; _i++) {
-                args[_i - 1] = arguments[_i];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                args[_i] = arguments[_i];
             }
-            host.reportSolutionBuilderStatus(ts.createCompilerDiagnostic.apply(void 0, [message].concat(args)));
+            return originalGetSourceFile.call.apply(originalGetSourceFile, [compilerHost].concat(args));
+        }), originalReadFile = _a.originalReadFile, originalFileExists = _a.originalFileExists, originalDirectoryExists = _a.originalDirectoryExists, originalCreateDirectory = _a.originalCreateDirectory, originalWriteFile = _a.originalWriteFile, getSourceFileWithCache = _a.getSourceFileWithCache, readFileWithCache = _a.readFileWithCache;
+        state.readFileWithCache = readFileWithCache;
+        compilerHost.getSourceFile = getSourceFileWithCache;
+        state.cache = {
+            originalReadFile: originalReadFile,
+            originalFileExists: originalFileExists,
+            originalDirectoryExists: originalDirectoryExists,
+            originalCreateDirectory: originalCreateDirectory,
+            originalWriteFile: originalWriteFile,
+            originalReadFileWithCache: originalReadFileWithCache,
+            originalGetSourceFile: originalGetSourceFile,
+        };
+    }
+    function disableCache(state) {
+        if (!state.cache)
+            return;
+        var cache = state.cache, host = state.host, compilerHost = state.compilerHost, extendedConfigCache = state.extendedConfigCache, moduleResolutionCache = state.moduleResolutionCache;
+        host.readFile = cache.originalReadFile;
+        host.fileExists = cache.originalFileExists;
+        host.directoryExists = cache.originalDirectoryExists;
+        host.createDirectory = cache.originalCreateDirectory;
+        host.writeFile = cache.originalWriteFile;
+        compilerHost.getSourceFile = cache.originalGetSourceFile;
+        state.readFileWithCache = cache.originalReadFileWithCache;
+        extendedConfigCache.clear();
+        if (moduleResolutionCache) {
+            moduleResolutionCache.directoryToModuleNameMap.clear();
+            moduleResolutionCache.moduleNameToDirectoryMap.clear();
         }
-        function reportWatchStatus(message) {
-            var args = [];
-            for (var _i = 1; _i < arguments.length; _i++) {
-                args[_i - 1] = arguments[_i];
-            }
-            if (hostWithWatch.onWatchStatusChange) {
-                hostWithWatch.onWatchStatusChange(ts.createCompilerDiagnostic.apply(void 0, [message].concat(args)), host.getNewLine(), baseCompilerOptions);
-            }
+        state.cache = undefined;
+    }
+    function clearProjectStatus(state, resolved) {
+        state.projectStatus.delete(resolved);
+        state.diagnostics.delete(resolved);
+    }
+    function addProjToQueue(_a, proj, reloadLevel) {
+        var projectPendingBuild = _a.projectPendingBuild;
+        var value = projectPendingBuild.get(proj);
+        if (value === undefined) {
+            projectPendingBuild.set(proj, reloadLevel);
         }
-        function startWatching() {
-            var graph = getGlobalDependencyGraph();
-            for (var _i = 0, _a = graph.buildQueue; _i < _a.length; _i++) {
-                var resolved = _a[_i];
-                // Watch this file
-                watchConfigFile(resolved);
-                var cfg = parseConfigFile(resolved);
-                if (cfg) {
-                    // Update watchers for wildcard directories
-                    watchWildCardDirectories(resolved, cfg);
-                    // Watch input files
-                    watchInputFiles(resolved, cfg);
+        else if (value < reloadLevel) {
+            projectPendingBuild.set(proj, reloadLevel);
+        }
+    }
+    function setupInitialBuild(state, cancellationToken) {
+        // Set initial build if not already built
+        if (!state.allProjectBuildPending)
+            return;
+        state.allProjectBuildPending = false;
+        if (state.options.watch) {
+            reportWatchStatus(state, ts.Diagnostics.Starting_compilation_in_watch_mode);
+        }
+        enableCache(state);
+        var buildOrder = getBuildOrder(state);
+        buildOrder.forEach(function (configFileName) {
+            return state.projectPendingBuild.set(toResolvedConfigFilePath(state, configFileName), ts.ConfigFileProgramReloadLevel.None);
+        });
+        if (cancellationToken) {
+            cancellationToken.throwIfCancellationRequested();
+        }
+    }
+    var InvalidatedProjectKind;
+    (function (InvalidatedProjectKind) {
+        InvalidatedProjectKind[InvalidatedProjectKind["Build"] = 0] = "Build";
+        InvalidatedProjectKind[InvalidatedProjectKind["UpdateBundle"] = 1] = "UpdateBundle";
+        InvalidatedProjectKind[InvalidatedProjectKind["UpdateOutputFileStamps"] = 2] = "UpdateOutputFileStamps";
+    })(InvalidatedProjectKind = ts.InvalidatedProjectKind || (ts.InvalidatedProjectKind = {}));
+    function doneInvalidatedProject(state, projectPath) {
+        state.projectPendingBuild.delete(projectPath);
+        state.currentInvalidatedProject = undefined;
+        return state.diagnostics.has(projectPath) ?
+            ts.ExitStatus.DiagnosticsPresent_OutputsSkipped :
+            ts.ExitStatus.Success;
+    }
+    function createUpdateOutputFileStampsProject(state, project, projectPath, config, buildOrder) {
+        var updateOutputFileStampsPending = true;
+        return {
+            kind: InvalidatedProjectKind.UpdateOutputFileStamps,
+            project: project,
+            projectPath: projectPath,
+            buildOrder: buildOrder,
+            getCompilerOptions: function () { return config.options; },
+            getCurrentDirectory: function () { return state.currentDirectory; },
+            updateOutputFileStatmps: function () {
+                updateOutputTimestamps(state, config, projectPath);
+                updateOutputFileStampsPending = false;
+            },
+            done: function () {
+                if (updateOutputFileStampsPending) {
+                    updateOutputTimestamps(state, config, projectPath);
                 }
+                return doneInvalidatedProject(state, projectPath);
             }
-        }
-        function watchConfigFile(resolved) {
-            if (options.watch && !allWatchedConfigFiles.hasKey(resolved)) {
-                allWatchedConfigFiles.setValue(resolved, watchFile(hostWithWatch, resolved, function () {
-                    invalidateProjectAndScheduleBuilds(resolved, ts.ConfigFileProgramReloadLevel.Full);
-                }, ts.PollingInterval.High, "Config file" /* ConfigFile */, resolved));
-            }
-        }
-        function watchWildCardDirectories(resolved, parsed) {
-            if (!options.watch)
-                return;
-            ts.updateWatchingWildcardDirectories(getOrCreateValueMapFromConfigFileMap(allWatchedWildcardDirectories, resolved), ts.createMapFromTemplate(parsed.configFileSpecs.wildcardDirectories), function (dir, flags) {
-                return watchDirectory(hostWithWatch, dir, function (fileOrDirectory) {
-                    var fileOrDirectoryPath = toPath(fileOrDirectory);
-                    if (fileOrDirectoryPath !== toPath(dir) && ts.hasExtension(fileOrDirectoryPath) && !ts.isSupportedSourceFileName(fileOrDirectory, parsed.options)) {
-                        writeLog("Project: " + resolved + " Detected file add/remove of non supported extension: " + fileOrDirectory);
-                        return;
+        };
+    }
+    function createBuildOrUpdateInvalidedProject(kind, state, project, projectPath, projectIndex, config, buildOrder) {
+        var Step;
+        (function (Step) {
+            Step[Step["CreateProgram"] = 0] = "CreateProgram";
+            Step[Step["SyntaxDiagnostics"] = 1] = "SyntaxDiagnostics";
+            Step[Step["SemanticDiagnostics"] = 2] = "SemanticDiagnostics";
+            Step[Step["Emit"] = 3] = "Emit";
+            Step[Step["EmitBundle"] = 4] = "EmitBundle";
+            Step[Step["BuildInvalidatedProjectOfBundle"] = 5] = "BuildInvalidatedProjectOfBundle";
+            Step[Step["QueueReferencingProjects"] = 6] = "QueueReferencingProjects";
+            Step[Step["Done"] = 7] = "Done";
+        })(Step || (Step = {}));
+        var step = kind === InvalidatedProjectKind.Build ? Step.CreateProgram : Step.EmitBundle;
+        var program;
+        var buildResult;
+        var invalidatedProjectOfBundle;
+        return kind === InvalidatedProjectKind.Build ?
+            {
+                kind: kind,
+                project: project,
+                projectPath: projectPath,
+                buildOrder: buildOrder,
+                getCompilerOptions: function () { return config.options; },
+                getCurrentDirectory: function () { return state.currentDirectory; },
+                getBuilderProgram: function () { return withProgramOrUndefined(ts.identity); },
+                getProgram: function () {
+                    return withProgramOrUndefined(function (program) { return program.getProgramOrUndefined(); });
+                },
+                getSourceFile: function (fileName) {
+                    return withProgramOrUndefined(function (program) { return program.getSourceFile(fileName); });
+                },
+                getSourceFiles: function () {
+                    return withProgramOrEmptyArray(function (program) { return program.getSourceFiles(); });
+                },
+                getOptionsDiagnostics: function (cancellationToken) {
+                    return withProgramOrEmptyArray(function (program) { return program.getOptionsDiagnostics(cancellationToken); });
+                },
+                getGlobalDiagnostics: function (cancellationToken) {
+                    return withProgramOrEmptyArray(function (program) { return program.getGlobalDiagnostics(cancellationToken); });
+                },
+                getConfigFileParsingDiagnostics: function () {
+                    return withProgramOrEmptyArray(function (program) { return program.getConfigFileParsingDiagnostics(); });
+                },
+                getSyntacticDiagnostics: function (sourceFile, cancellationToken) {
+                    return withProgramOrEmptyArray(function (program) { return program.getSyntacticDiagnostics(sourceFile, cancellationToken); });
+                },
+                getAllDependencies: function (sourceFile) {
+                    return withProgramOrEmptyArray(function (program) { return program.getAllDependencies(sourceFile); });
+                },
+                getSemanticDiagnostics: function (sourceFile, cancellationToken) {
+                    return withProgramOrEmptyArray(function (program) { return program.getSemanticDiagnostics(sourceFile, cancellationToken); });
+                },
+                getSemanticDiagnosticsOfNextAffectedFile: function (cancellationToken, ignoreSourceFile) {
+                    return withProgramOrUndefined(function (program) {
+                        return (program.getSemanticDiagnosticsOfNextAffectedFile) &&
+                            program.getSemanticDiagnosticsOfNextAffectedFile(cancellationToken, ignoreSourceFile);
+                    });
+                },
+                emit: function (targetSourceFile, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers) {
+                    if (targetSourceFile || emitOnlyDtsFiles) {
+                        return withProgramOrUndefined(function (program) { return program.emit(targetSourceFile, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers); });
                     }
-                    if (isOutputFile(fileOrDirectory, parsed)) {
-                        writeLog(fileOrDirectory + " is output file");
-                        return;
-                    }
-                    invalidateProjectAndScheduleBuilds(resolved, ts.ConfigFileProgramReloadLevel.Partial);
-                }, flags, "Wild card directory" /* WildcardDirectory */, resolved);
-            });
-        }
-        function watchInputFiles(resolved, parsed) {
-            if (!options.watch)
-                return;
-            ts.mutateMap(getOrCreateValueMapFromConfigFileMap(allWatchedInputFiles, resolved), ts.arrayToMap(parsed.fileNames, toPath), {
-                createNewValue: function (path, input) { return watchFilePath(hostWithWatch, input, function () { return invalidateProjectAndScheduleBuilds(resolved, ts.ConfigFileProgramReloadLevel.None); }, ts.PollingInterval.Low, path, "Source file" /* SourceFile */, resolved); },
-                onDeleteValue: ts.closeFileWatcher,
-            });
-        }
-        function isOutputFile(fileName, configFile) {
-            if (configFile.options.noEmit)
-                return false;
-            // ts or tsx files are not output
-            if (!ts.fileExtensionIs(fileName, ".d.ts" /* Dts */) &&
-                (ts.fileExtensionIs(fileName, ".ts" /* Ts */) || ts.fileExtensionIs(fileName, ".tsx" /* Tsx */))) {
-                return false;
-            }
-            // If options have --outFile or --out, check if its that
-            var out = configFile.options.outFile || configFile.options.out;
-            if (out && (isSameFile(fileName, out) || isSameFile(fileName, ts.removeFileExtension(out) + ".d.ts" /* Dts */))) {
-                return true;
-            }
-            // If declarationDir is specified, return if its a file in that directory
-            if (configFile.options.declarationDir && ts.containsPath(configFile.options.declarationDir, fileName, currentDirectory, !host.useCaseSensitiveFileNames())) {
-                return true;
-            }
-            // If --outDir, check if file is in that directory
-            if (configFile.options.outDir && ts.containsPath(configFile.options.outDir, fileName, currentDirectory, !host.useCaseSensitiveFileNames())) {
-                return true;
-            }
-            return !ts.forEach(configFile.fileNames, function (inputFile) { return isSameFile(fileName, inputFile); });
-        }
-        function isSameFile(file1, file2) {
-            return ts.comparePaths(file1, file2, currentDirectory, !host.useCaseSensitiveFileNames()) === 0 /* EqualTo */;
-        }
-        function invalidateProjectAndScheduleBuilds(resolved, reloadLevel) {
-            reportFileChangeDetected = true;
-            invalidateResolvedProject(resolved, reloadLevel);
-            scheduleBuildInvalidatedProject();
-        }
-        function getUpToDateStatusOfFile(configFileName) {
-            return getUpToDateStatus(parseConfigFile(configFileName));
-        }
-        function getBuildGraph(configFileNames) {
-            return createDependencyGraph(resolveProjectNames(configFileNames));
-        }
-        function getGlobalDependencyGraph() {
-            return globalDependencyGraph || (globalDependencyGraph = getBuildGraph(rootNames));
-        }
-        function getUpToDateStatus(project) {
-            if (project === undefined) {
-                return { type: UpToDateStatusType.Unbuildable, reason: "File deleted mid-build" };
-            }
-            var prior = projectStatus.getValue(project.options.configFilePath);
-            if (prior !== undefined) {
-                return prior;
-            }
-            var actual = getUpToDateStatusWorker(project);
-            projectStatus.setValue(project.options.configFilePath, actual);
-            return actual;
-        }
-        function getUpToDateStatusWorker(project) {
-            var newestInputFileName = undefined;
-            var newestInputFileTime = minimumDate;
-            // Get timestamps of input files
-            for (var _i = 0, _a = project.fileNames; _i < _a.length; _i++) {
-                var inputFile = _a[_i];
-                if (!host.fileExists(inputFile)) {
-                    return {
-                        type: UpToDateStatusType.Unbuildable,
-                        reason: inputFile + " does not exist"
-                    };
-                }
-                var inputTime = host.getModifiedTime(inputFile) || ts.missingFileModifiedTime;
-                if (inputTime > newestInputFileTime) {
-                    newestInputFileName = inputFile;
-                    newestInputFileTime = inputTime;
-                }
-            }
-            // Collect the expected outputs of this project
-            var outputs = getAllProjectOutputs(project);
-            if (outputs.length === 0) {
-                return {
-                    type: UpToDateStatusType.ContainerOnly
-                };
-            }
-            // Now see if all outputs are newer than the newest input
-            var oldestOutputFileName = "(none)";
-            var oldestOutputFileTime = maximumDate;
-            var newestOutputFileName = "(none)";
-            var newestOutputFileTime = minimumDate;
-            var missingOutputFileName;
-            var newestDeclarationFileContentChangedTime = minimumDate;
-            var isOutOfDateWithInputs = false;
-            for (var _b = 0, outputs_1 = outputs; _b < outputs_1.length; _b++) {
-                var output = outputs_1[_b];
-                // Output is missing; can stop checking
-                // Don't immediately return because we can still be upstream-blocked, which is a higher-priority status
-                if (!host.fileExists(output)) {
-                    missingOutputFileName = output;
-                    break;
-                }
-                var outputTime = host.getModifiedTime(output) || ts.missingFileModifiedTime;
-                if (outputTime < oldestOutputFileTime) {
-                    oldestOutputFileTime = outputTime;
-                    oldestOutputFileName = output;
-                }
-                // If an output is older than the newest input, we can stop checking
-                // Don't immediately return because we can still be upstream-blocked, which is a higher-priority status
-                if (outputTime < newestInputFileTime) {
-                    isOutOfDateWithInputs = true;
-                    break;
-                }
-                if (outputTime > newestOutputFileTime) {
-                    newestOutputFileTime = outputTime;
-                    newestOutputFileName = output;
-                }
-                // Keep track of when the most recent time a .d.ts file was changed.
-                // In addition to file timestamps, we also keep track of when a .d.ts file
-                // had its file touched but not had its contents changed - this allows us
-                // to skip a downstream typecheck
-                if (isDeclarationFile(output)) {
-                    var unchangedTime = unchangedOutputs.getValue(output);
-                    if (unchangedTime !== undefined) {
-                        newestDeclarationFileContentChangedTime = newer(unchangedTime, newestDeclarationFileContentChangedTime);
-                    }
-                    else {
-                        var outputModifiedTime = host.getModifiedTime(output) || ts.missingFileModifiedTime;
-                        newestDeclarationFileContentChangedTime = newer(newestDeclarationFileContentChangedTime, outputModifiedTime);
-                    }
-                }
-            }
-            var pseudoUpToDate = false;
-            var usesPrepend = false;
-            var upstreamChangedProject;
-            if (project.projectReferences) {
-                projectStatus.setValue(project.options.configFilePath, { type: UpToDateStatusType.ComputingUpstream });
-                for (var _c = 0, _d = project.projectReferences; _c < _d.length; _c++) {
-                    var ref = _d[_c];
-                    usesPrepend = usesPrepend || !!(ref.prepend);
-                    var resolvedRef = ts.resolveProjectReferencePath(ref);
-                    var refStatus = getUpToDateStatus(parseConfigFile(resolvedRef));
-                    // Its a circular reference ignore the status of this project
-                    if (refStatus.type === UpToDateStatusType.ComputingUpstream) {
-                        continue;
-                    }
-                    // An upstream project is blocked
-                    if (refStatus.type === UpToDateStatusType.Unbuildable) {
-                        return {
-                            type: UpToDateStatusType.UpstreamBlocked,
-                            upstreamProjectName: ref.path
-                        };
-                    }
-                    // If the upstream project is out of date, then so are we (someone shouldn't have asked, though?)
-                    if (refStatus.type !== UpToDateStatusType.UpToDate) {
-                        return {
-                            type: UpToDateStatusType.UpstreamOutOfDate,
-                            upstreamProjectName: ref.path
-                        };
-                    }
-                    // Check oldest output file name only if there is no missing output file name
-                    if (!missingOutputFileName) {
-                        // If the upstream project's newest file is older than our oldest output, we
-                        // can't be out of date because of it
-                        if (refStatus.newestInputFileTime && refStatus.newestInputFileTime <= oldestOutputFileTime) {
-                            continue;
-                        }
-                        // If the upstream project has only change .d.ts files, and we've built
-                        // *after* those files, then we're "psuedo up to date" and eligible for a fast rebuild
-                        if (refStatus.newestDeclarationFileContentChangedTime && refStatus.newestDeclarationFileContentChangedTime <= oldestOutputFileTime) {
-                            pseudoUpToDate = true;
-                            upstreamChangedProject = ref.path;
-                            continue;
-                        }
-                        // We have an output older than an upstream output - we are out of date
-                        ts.Debug.assert(oldestOutputFileName !== undefined, "Should have an oldest output filename here");
-                        return {
-                            type: UpToDateStatusType.OutOfDateWithUpstream,
-                            outOfDateOutputFileName: oldestOutputFileName,
-                            newerProjectName: ref.path
-                        };
-                    }
-                }
-            }
-            if (missingOutputFileName !== undefined) {
-                return {
-                    type: UpToDateStatusType.OutputMissing,
-                    missingOutputFileName: missingOutputFileName
-                };
-            }
-            if (isOutOfDateWithInputs) {
-                return {
-                    type: UpToDateStatusType.OutOfDateWithSelf,
-                    outOfDateOutputFileName: oldestOutputFileName,
-                    newerInputFileName: newestInputFileName
-                };
-            }
-            if (!buildInfoChecked.hasKey(project.options.configFilePath)) {
-                buildInfoChecked.setValue(project.options.configFilePath, true);
-                var buildInfoPath = ts.getOutputPathForBuildInfo(project.options);
-                if (buildInfoPath) {
-                    var value = readFileWithCache(buildInfoPath);
-                    var buildInfo = value && ts.getBuildInfo(value);
-                    if (buildInfo && buildInfo.version !== ts.version) {
-                        return {
-                            type: UpToDateStatusType.TsVersionOutputOfDate,
-                            version: buildInfo.version
-                        };
-                    }
-                }
-            }
-            if (usesPrepend && pseudoUpToDate) {
-                return {
-                    type: UpToDateStatusType.OutOfDateWithPrepend,
-                    outOfDateOutputFileName: oldestOutputFileName,
-                    newerProjectName: upstreamChangedProject
-                };
-            }
-            // Up to date
-            return {
-                type: pseudoUpToDate ? UpToDateStatusType.UpToDateWithUpstreamTypes : UpToDateStatusType.UpToDate,
-                newestDeclarationFileContentChangedTime: newestDeclarationFileContentChangedTime,
-                newestInputFileTime: newestInputFileTime,
-                newestOutputFileTime: newestOutputFileTime,
-                newestInputFileName: newestInputFileName,
-                newestOutputFileName: newestOutputFileName,
-                oldestOutputFileName: oldestOutputFileName
+                    executeSteps(Step.SemanticDiagnostics, cancellationToken);
+                    if (step !== Step.Emit)
+                        return undefined;
+                    return emit(writeFile, cancellationToken, customTransformers);
+                },
+                done: done
+            } :
+            {
+                kind: kind,
+                project: project,
+                projectPath: projectPath,
+                buildOrder: buildOrder,
+                getCompilerOptions: function () { return config.options; },
+                getCurrentDirectory: function () { return state.currentDirectory; },
+                emit: function (writeFile, customTransformers) {
+                    if (step !== Step.EmitBundle)
+                        return invalidatedProjectOfBundle;
+                    return emitBundle(writeFile, customTransformers);
+                },
+                done: done,
             };
+        function done(cancellationToken, writeFile, customTransformers) {
+            executeSteps(Step.Done, cancellationToken, writeFile, customTransformers);
+            return doneInvalidatedProject(state, projectPath);
         }
-        function invalidateProject(configFileName, reloadLevel) {
-            invalidateResolvedProject(resolveProjectName(configFileName), reloadLevel);
+        function withProgramOrUndefined(action) {
+            executeSteps(Step.CreateProgram);
+            return program && action(program);
         }
-        function invalidateResolvedProject(resolved, reloadLevel) {
-            if (reloadLevel === ts.ConfigFileProgramReloadLevel.Full) {
-                configFileCache.removeKey(resolved);
-                globalDependencyGraph = undefined;
-            }
-            projectStatus.removeKey(resolved);
-            diagnostics.removeKey(resolved);
-            addProjToQueue(resolved, reloadLevel);
+        function withProgramOrEmptyArray(action) {
+            return withProgramOrUndefined(action) || ts.emptyArray;
         }
-        /**
-         * return true if new addition
-         */
-        function addProjToQueue(proj, reloadLevel) {
-            var value = projectPendingBuild.getValue(proj);
-            if (value === undefined) {
-                projectPendingBuild.setValue(proj, reloadLevel || ts.ConfigFileProgramReloadLevel.None);
-                invalidatedProjectQueue.push(proj);
-            }
-            else if (value < (reloadLevel || ts.ConfigFileProgramReloadLevel.None)) {
-                projectPendingBuild.setValue(proj, reloadLevel || ts.ConfigFileProgramReloadLevel.None);
-            }
-        }
-        function getNextInvalidatedProject() {
-            if (nextProjectToBuild < invalidatedProjectQueue.length) {
-                var project = invalidatedProjectQueue[nextProjectToBuild];
-                nextProjectToBuild++;
-                var reloadLevel = projectPendingBuild.getValue(project);
-                projectPendingBuild.removeKey(project);
-                if (!projectPendingBuild.getSize()) {
-                    invalidatedProjectQueue.length = 0;
-                    nextProjectToBuild = 0;
-                }
-                return { project: project, reloadLevel: reloadLevel };
-            }
-        }
-        function hasPendingInvalidatedProjects() {
-            return !!projectPendingBuild.getSize();
-        }
-        function scheduleBuildInvalidatedProject() {
-            if (!hostWithWatch.setTimeout || !hostWithWatch.clearTimeout) {
+        function createProgram() {
+            ts.Debug.assert(program === undefined);
+            if (state.options.dry) {
+                reportStatus(state, ts.Diagnostics.A_non_dry_build_would_build_project_0, project);
+                buildResult = BuildResultFlags.Success;
+                step = Step.QueueReferencingProjects;
                 return;
             }
-            if (timerToBuildInvalidatedProject) {
-                hostWithWatch.clearTimeout(timerToBuildInvalidatedProject);
-            }
-            timerToBuildInvalidatedProject = hostWithWatch.setTimeout(buildInvalidatedProject, 250);
-        }
-        function buildInvalidatedProject() {
-            timerToBuildInvalidatedProject = undefined;
-            if (reportFileChangeDetected) {
-                reportFileChangeDetected = false;
-                projectErrorsReported.clear();
-                reportWatchStatus(ts.Diagnostics.File_change_detected_Starting_incremental_compilation);
-            }
-            var buildProject = getNextInvalidatedProject();
-            if (buildProject) {
-                buildSingleInvalidatedProject(buildProject.project, buildProject.reloadLevel);
-                if (hasPendingInvalidatedProjects()) {
-                    if (options.watch && !timerToBuildInvalidatedProject) {
-                        scheduleBuildInvalidatedProject();
-                    }
-                }
-                else {
-                    reportErrorSummary();
-                }
-            }
-        }
-        function reportErrorSummary() {
-            if (options.watch || host.reportErrorSummary) {
-                // Report errors from the other projects
-                getGlobalDependencyGraph().buildQueue.forEach(function (project) {
-                    if (!projectErrorsReported.hasKey(project)) {
-                        reportErrors(diagnostics.getValue(project) || ts.emptyArray);
-                    }
-                });
-                var totalErrors_1 = 0;
-                diagnostics.forEach(function (singleProjectErrors) { return totalErrors_1 += ts.getErrorCountForSummary(singleProjectErrors); });
-                if (options.watch) {
-                    reportWatchStatus(ts.getWatchErrorSummaryDiagnosticMessage(totalErrors_1), totalErrors_1);
-                }
-                else {
-                    host.reportErrorSummary(totalErrors_1);
-                }
-            }
-        }
-        function buildSingleInvalidatedProject(resolved, reloadLevel) {
-            var proj = parseConfigFile(resolved);
-            if (!proj) {
-                reportParseConfigFileDiagnostic(resolved);
-                return;
-            }
-            if (reloadLevel === ts.ConfigFileProgramReloadLevel.Full) {
-                watchConfigFile(resolved);
-                watchWildCardDirectories(resolved, proj);
-                watchInputFiles(resolved, proj);
-            }
-            else if (reloadLevel === ts.ConfigFileProgramReloadLevel.Partial) {
-                // Update file names
-                var result = ts.getFileNamesFromConfigSpecs(proj.configFileSpecs, ts.getDirectoryPath(resolved), proj.options, parseConfigFileHost);
-                ts.updateErrorForNoInputFiles(result, resolved, proj.configFileSpecs, proj.errors, ts.canJsonReportNoInutFiles(proj.raw));
-                proj.fileNames = result.fileNames;
-                watchInputFiles(resolved, proj);
-            }
-            var status = getUpToDateStatus(proj);
-            verboseReportProjectStatus(resolved, status);
-            if (status.type === UpToDateStatusType.UpstreamBlocked) {
-                if (options.verbose)
-                    reportStatus(ts.Diagnostics.Skipping_build_of_project_0_because_its_dependency_1_has_errors, resolved, status.upstreamProjectName);
-                return;
-            }
-            if (status.type === UpToDateStatusType.UpToDateWithUpstreamTypes) {
-                // Fake that files have been built by updating output file stamps
-                updateOutputTimestamps(proj);
-                return;
-            }
-            var buildResult = status.type === UpToDateStatusType.OutOfDateWithPrepend ?
-                updateBundle(resolved) : // Fake that files have been built by manipulating prepend and existing output
-                buildSingleProject(resolved); // Actual build
-            if (buildResult & BuildResultFlags.AnyErrors)
-                return;
-            var _a = getGlobalDependencyGraph(), referencingProjectsMap = _a.referencingProjectsMap, buildQueue = _a.buildQueue;
-            var referencingProjects = referencingProjectsMap.getValue(resolved);
-            if (!referencingProjects)
-                return;
-            // Always use build order to queue projects
-            for (var index = buildQueue.indexOf(resolved) + 1; index < buildQueue.length; index++) {
-                var project = buildQueue[index];
-                var prepend = referencingProjects.getValue(project);
-                if (prepend !== undefined) {
-                    // If the project is referenced with prepend, always build downstream projects,
-                    // If declaration output is changed, build the project
-                    // otherwise mark the project UpToDateWithUpstreamTypes so it updates output time stamps
-                    var status_1 = projectStatus.getValue(project);
-                    if (!(buildResult & BuildResultFlags.DeclarationOutputUnchanged)) {
-                        if (status_1 && (status_1.type === UpToDateStatusType.UpToDate || status_1.type === UpToDateStatusType.UpToDateWithUpstreamTypes || status_1.type === UpToDateStatusType.OutOfDateWithPrepend)) {
-                            projectStatus.setValue(project, {
-                                type: UpToDateStatusType.OutOfDateWithUpstream,
-                                outOfDateOutputFileName: status_1.type === UpToDateStatusType.OutOfDateWithPrepend ? status_1.outOfDateOutputFileName : status_1.oldestOutputFileName,
-                                newerProjectName: resolved
-                            });
-                        }
-                    }
-                    else if (status_1 && status_1.type === UpToDateStatusType.UpToDate) {
-                        if (prepend) {
-                            projectStatus.setValue(project, {
-                                type: UpToDateStatusType.OutOfDateWithPrepend,
-                                outOfDateOutputFileName: status_1.oldestOutputFileName,
-                                newerProjectName: resolved
-                            });
-                        }
-                        else {
-                            status_1.type = UpToDateStatusType.UpToDateWithUpstreamTypes;
-                        }
-                    }
-                    addProjToQueue(project);
-                }
-            }
-        }
-        function createDependencyGraph(roots) {
-            var temporaryMarks = createFileMap(toPath);
-            var permanentMarks = createFileMap(toPath);
-            var circularityReportStack = [];
-            var buildOrder = [];
-            var referencingProjectsMap = createFileMap(toPath);
-            for (var _i = 0, roots_1 = roots; _i < roots_1.length; _i++) {
-                var root = roots_1[_i];
-                visit(root);
-            }
-            return {
-                buildQueue: buildOrder,
-                referencingProjectsMap: referencingProjectsMap
-            };
-            function visit(projPath, inCircularContext) {
-                // Already visited
-                if (permanentMarks.hasKey(projPath))
-                    return;
-                // Circular
-                if (temporaryMarks.hasKey(projPath)) {
-                    if (!inCircularContext) {
-                        // TODO:: Do we report this as error?
-                        reportStatus(ts.Diagnostics.Project_references_may_not_form_a_circular_graph_Cycle_detected_Colon_0, circularityReportStack.join("\r\n"));
-                    }
-                    return;
-                }
-                temporaryMarks.setValue(projPath, true);
-                circularityReportStack.push(projPath);
-                var parsed = parseConfigFile(projPath);
-                if (parsed && parsed.projectReferences) {
-                    for (var _i = 0, _a = parsed.projectReferences; _i < _a.length; _i++) {
-                        var ref = _a[_i];
-                        var resolvedRefPath = resolveProjectName(ref.path);
-                        visit(resolvedRefPath, inCircularContext || ref.circular);
-                        // Get projects referencing resolvedRefPath and add projPath to it
-                        var referencingProjects = getOrCreateValueFromConfigFileMap(referencingProjectsMap, resolvedRefPath, function () { return createFileMap(toPath); });
-                        referencingProjects.setValue(projPath, !!ref.prepend);
-                    }
-                }
-                circularityReportStack.pop();
-                permanentMarks.setValue(projPath, true);
-                buildOrder.push(projPath);
-            }
-        }
-        function buildSingleProject(proj) {
-            if (options.dry) {
-                reportStatus(ts.Diagnostics.A_non_dry_build_would_build_project_0, proj);
-                return BuildResultFlags.Success;
-            }
-            if (options.verbose)
-                reportStatus(ts.Diagnostics.Building_project_0, proj);
-            var resultFlags = BuildResultFlags.DeclarationOutputUnchanged;
-            var configFile = parseConfigFile(proj);
-            if (!configFile) {
-                // Failed to read the config file
-                resultFlags |= BuildResultFlags.ConfigFileErrors;
-                reportParseConfigFileDiagnostic(proj);
-                projectStatus.setValue(proj, { type: UpToDateStatusType.Unbuildable, reason: "Config file errors" });
-                return resultFlags;
-            }
-            if (configFile.fileNames.length === 0) {
-                reportAndStoreErrors(proj, configFile.errors);
+            if (state.options.verbose)
+                reportStatus(state, ts.Diagnostics.Building_project_0, project);
+            if (config.fileNames.length === 0) {
+                reportAndStoreErrors(state, projectPath, config.errors);
                 // Nothing to build - must be a solution file, basically
-                return BuildResultFlags.None;
+                buildResult = BuildResultFlags.None;
+                step = Step.QueueReferencingProjects;
+                return;
             }
-            // TODO: handle resolve module name to cache result in project reference redirect
-            projectCompilerOptions = configFile.options;
-            var program = host.createProgram(configFile.fileNames, configFile.options, compilerHost, getOldProgram(proj, configFile), configFile.errors, configFile.projectReferences);
-            // Don't emit anything in the presence of syntactic errors or options diagnostics
-            var syntaxDiagnostics = program.getConfigFileParsingDiagnostics().concat(program.getOptionsDiagnostics(), program.getGlobalDiagnostics(), program.getSyntacticDiagnostics());
-            if (syntaxDiagnostics.length) {
-                return buildErrors(syntaxDiagnostics, BuildResultFlags.SyntaxErrors, "Syntactic");
+            var host = state.host, compilerHost = state.compilerHost;
+            state.projectCompilerOptions = config.options;
+            // Update module resolution cache if needed
+            updateModuleResolutionCache(state, project, config);
+            // Create program
+            program = host.createProgram(config.fileNames, config.options, compilerHost, getOldProgram(state, projectPath, config), config.errors, config.projectReferences);
+            step++;
+        }
+        function handleDiagnostics(diagnostics, errorFlags, errorType) {
+            if (diagnostics.length) {
+                buildResult = buildErrors(state, projectPath, program, diagnostics, errorFlags, errorType);
+                step = Step.QueueReferencingProjects;
             }
-            // Same as above but now for semantic diagnostics
-            var semanticDiagnostics = program.getSemanticDiagnostics();
-            if (semanticDiagnostics.length) {
-                return buildErrors(semanticDiagnostics, BuildResultFlags.TypeErrors, "Semantic");
+            else {
+                step++;
             }
+        }
+        function getSyntaxDiagnostics(cancellationToken) {
+            ts.Debug.assertDefined(program);
+            handleDiagnostics(program.getConfigFileParsingDiagnostics().concat(program.getOptionsDiagnostics(cancellationToken), program.getGlobalDiagnostics(cancellationToken), program.getSyntacticDiagnostics(/*sourceFile*/ undefined, cancellationToken)), BuildResultFlags.SyntaxErrors, "Syntactic");
+        }
+        function getSemanticDiagnostics(cancellationToken) {
+            handleDiagnostics(ts.Debug.assertDefined(program).getSemanticDiagnostics(/*sourceFile*/ undefined, cancellationToken), BuildResultFlags.TypeErrors, "Semantic");
+        }
+        function emit(writeFileCallback, cancellationToken, customTransformers) {
+            ts.Debug.assertDefined(program);
+            ts.Debug.assert(step === Step.Emit);
             // Before emitting lets backup state, so we can revert it back if there are declaration errors to handle emit and declaration errors correctly
             program.backupState();
-            var newestDeclarationFileContentChangedTime = minimumDate;
-            var anyDtsChanged = false;
             var declDiagnostics;
             var reportDeclarationDiagnostics = function (d) { return (declDiagnostics || (declDiagnostics = [])).push(d); };
             var outputFiles = [];
-            ts.emitFilesAndReportErrors(program, reportDeclarationDiagnostics, writeFileName, /*reportSummary*/ undefined, function (name, text, writeByteOrderMark) { return outputFiles.push({ name: name, text: text, writeByteOrderMark: writeByteOrderMark }); });
+            var emitResult = ts.emitFilesAndReportErrors(program, reportDeclarationDiagnostics, 
+            /*writeFileName*/ undefined, 
+            /*reportSummary*/ undefined, function (name, text, writeByteOrderMark) { return outputFiles.push({ name: name, text: text, writeByteOrderMark: writeByteOrderMark }); }, cancellationToken, 
+            /*emitOnlyDts*/ false, customTransformers).emitResult;
             // Don't emit .d.ts if there are decl file errors
             if (declDiagnostics) {
                 program.restoreState();
-                return buildErrors(declDiagnostics, BuildResultFlags.DeclarationEmitErrors, "Declaration file");
+                buildResult = buildErrors(state, projectPath, program, declDiagnostics, BuildResultFlags.DeclarationEmitErrors, "Declaration file");
+                step = Step.QueueReferencingProjects;
+                return {
+                    emitSkipped: true,
+                    diagnostics: emitResult.diagnostics
+                };
             }
             // Actual Emit
+            var host = state.host, compilerHost = state.compilerHost;
+            var resultFlags = BuildResultFlags.DeclarationOutputUnchanged;
+            var newestDeclarationFileContentChangedTime = minimumDate;
+            var anyDtsChanged = false;
             var emitterDiagnostics = ts.createDiagnosticCollection();
-            var emittedOutputs = createFileMap(toPath);
+            var emittedOutputs = ts.createMap();
             outputFiles.forEach(function (_a) {
                 var name = _a.name, text = _a.text, writeByteOrderMark = _a.writeByteOrderMark;
                 var priorChangeTime;
                 if (!anyDtsChanged && isDeclarationFile(name)) {
                     // Check for unchanged .d.ts files
-                    if (host.fileExists(name) && readFileWithCache(name) === text) {
+                    if (host.fileExists(name) && state.readFileWithCache(name) === text) {
                         priorChangeTime = host.getModifiedTime(name);
                     }
                     else {
@@ -94129,481 +96676,872 @@ var ts;
                         anyDtsChanged = true;
                     }
                 }
-                emittedOutputs.setValue(name, true);
-                ts.writeFile(compilerHost, emitterDiagnostics, name, text, writeByteOrderMark);
+                emittedOutputs.set(toPath(state, name), name);
+                ts.writeFile(writeFileCallback ? { writeFile: writeFileCallback } : compilerHost, emitterDiagnostics, name, text, writeByteOrderMark);
                 if (priorChangeTime !== undefined) {
                     newestDeclarationFileContentChangedTime = newer(priorChangeTime, newestDeclarationFileContentChangedTime);
-                    unchangedOutputs.setValue(name, priorChangeTime);
                 }
             });
+            finishEmit(emitterDiagnostics, emittedOutputs, newestDeclarationFileContentChangedTime, 
+            /*newestDeclarationFileContentChangedTimeIsMaximumDate*/ anyDtsChanged, outputFiles.length ? outputFiles[0].name : ts.getFirstProjectOutput(config, !host.useCaseSensitiveFileNames()), resultFlags);
+            return emitResult;
+        }
+        function finishEmit(emitterDiagnostics, emittedOutputs, priorNewestUpdateTime, newestDeclarationFileContentChangedTimeIsMaximumDate, oldestOutputFileName, resultFlags) {
             var emitDiagnostics = emitterDiagnostics.getDiagnostics();
             if (emitDiagnostics.length) {
-                return buildErrors(emitDiagnostics, BuildResultFlags.EmitErrors, "Emit");
+                buildResult = buildErrors(state, projectPath, program, emitDiagnostics, BuildResultFlags.EmitErrors, "Emit");
+                step = Step.QueueReferencingProjects;
+                return emitDiagnostics;
+            }
+            if (state.writeFileName) {
+                emittedOutputs.forEach(function (name) { return listEmittedFile(state, config, name); });
+                if (program)
+                    ts.listFiles(program, state.writeFileName);
             }
             // Update time stamps for rest of the outputs
-            newestDeclarationFileContentChangedTime = updateOutputTimestampsWorker(configFile, newestDeclarationFileContentChangedTime, ts.Diagnostics.Updating_unchanged_output_timestamps_of_project_0, emittedOutputs);
-            var status = {
-                type: UpToDateStatusType.UpToDate,
-                newestDeclarationFileContentChangedTime: anyDtsChanged ? maximumDate : newestDeclarationFileContentChangedTime,
-                oldestOutputFileName: outputFiles.length ? outputFiles[0].name : getFirstProjectOutput(configFile)
-            };
-            diagnostics.removeKey(proj);
-            projectStatus.setValue(proj, status);
-            afterProgramCreate(proj, program);
-            projectCompilerOptions = baseCompilerOptions;
-            return resultFlags;
-            function buildErrors(diagnostics, errorFlags, errorType) {
-                resultFlags |= errorFlags;
-                reportAndStoreErrors(proj, diagnostics);
-                projectStatus.setValue(proj, { type: UpToDateStatusType.Unbuildable, reason: errorType + " errors" });
-                afterProgramCreate(proj, program);
-                projectCompilerOptions = baseCompilerOptions;
-                return resultFlags;
-            }
+            var newestDeclarationFileContentChangedTime = updateOutputTimestampsWorker(state, config, priorNewestUpdateTime, ts.Diagnostics.Updating_unchanged_output_timestamps_of_project_0, emittedOutputs);
+            state.diagnostics.delete(projectPath);
+            state.projectStatus.set(projectPath, {
+                type: ts.UpToDateStatusType.UpToDate,
+                newestDeclarationFileContentChangedTime: newestDeclarationFileContentChangedTimeIsMaximumDate ?
+                    maximumDate :
+                    newestDeclarationFileContentChangedTime,
+                oldestOutputFileName: oldestOutputFileName
+            });
+            if (program)
+                afterProgramCreate(state, projectPath, program);
+            state.projectCompilerOptions = state.baseCompilerOptions;
+            step = Step.QueueReferencingProjects;
+            buildResult = resultFlags;
+            return emitDiagnostics;
         }
-        function afterProgramCreate(proj, program) {
-            if (host.afterProgramEmitAndDiagnostics) {
-                host.afterProgramEmitAndDiagnostics(program);
+        function emitBundle(writeFileCallback, customTransformers) {
+            ts.Debug.assert(kind === InvalidatedProjectKind.UpdateBundle);
+            if (state.options.dry) {
+                reportStatus(state, ts.Diagnostics.A_non_dry_build_would_update_output_of_project_0, project);
+                buildResult = BuildResultFlags.Success;
+                step = Step.QueueReferencingProjects;
+                return undefined;
             }
-            if (options.watch) {
-                program.releaseProgram();
-                builderPrograms.setValue(proj, program);
-            }
-        }
-        function getOldProgram(proj, parsed) {
-            var value = builderPrograms.getValue(proj);
-            if (value)
-                return value;
-            return ts.readBuilderProgram(parsed.options, readFileWithCache);
-        }
-        function updateBundle(proj) {
-            if (options.dry) {
-                reportStatus(ts.Diagnostics.A_non_dry_build_would_update_output_of_project_0, proj);
-                return BuildResultFlags.Success;
-            }
-            if (options.verbose)
-                reportStatus(ts.Diagnostics.Updating_output_of_project_0, proj);
+            if (state.options.verbose)
+                reportStatus(state, ts.Diagnostics.Updating_output_of_project_0, project);
             // Update js, and source map
-            var config = ts.Debug.assertDefined(parseConfigFile(proj));
-            projectCompilerOptions = config.options;
-            var outputFiles = ts.emitUsingBuildInfo(config, compilerHost, function (ref) { return parseConfigFile(resolveProjectName(ref.path)); });
+            var compilerHost = state.compilerHost;
+            state.projectCompilerOptions = config.options;
+            var outputFiles = ts.emitUsingBuildInfo(config, compilerHost, function (ref) {
+                var refName = resolveProjectName(state, ref.path);
+                return parseConfigFile(state, refName, toResolvedConfigFilePath(state, refName));
+            }, customTransformers);
             if (ts.isString(outputFiles)) {
-                reportStatus(ts.Diagnostics.Cannot_update_output_of_project_0_because_there_was_error_reading_file_1, proj, relName(outputFiles));
-                return buildSingleProject(proj);
+                reportStatus(state, ts.Diagnostics.Cannot_update_output_of_project_0_because_there_was_error_reading_file_1, project, relName(state, outputFiles));
+                step = Step.BuildInvalidatedProjectOfBundle;
+                return invalidatedProjectOfBundle = createBuildOrUpdateInvalidedProject(InvalidatedProjectKind.Build, state, project, projectPath, projectIndex, config, buildOrder);
             }
             // Actual Emit
             ts.Debug.assert(!!outputFiles.length);
             var emitterDiagnostics = ts.createDiagnosticCollection();
-            var emittedOutputs = createFileMap(toPath);
+            var emittedOutputs = ts.createMap();
             outputFiles.forEach(function (_a) {
                 var name = _a.name, text = _a.text, writeByteOrderMark = _a.writeByteOrderMark;
-                emittedOutputs.setValue(name, true);
-                ts.writeFile(compilerHost, emitterDiagnostics, name, text, writeByteOrderMark);
+                emittedOutputs.set(toPath(state, name), name);
+                ts.writeFile(writeFileCallback ? { writeFile: writeFileCallback } : compilerHost, emitterDiagnostics, name, text, writeByteOrderMark);
             });
-            var emitDiagnostics = emitterDiagnostics.getDiagnostics();
-            if (emitDiagnostics.length) {
-                reportAndStoreErrors(proj, emitDiagnostics);
-                projectStatus.setValue(proj, { type: UpToDateStatusType.Unbuildable, reason: "Emit errors" });
-                projectCompilerOptions = baseCompilerOptions;
-                return BuildResultFlags.DeclarationOutputUnchanged | BuildResultFlags.EmitErrors;
-            }
-            // Update timestamps for dts
-            var newestDeclarationFileContentChangedTime = updateOutputTimestampsWorker(config, minimumDate, ts.Diagnostics.Updating_unchanged_output_timestamps_of_project_0, emittedOutputs);
-            var status = {
-                type: UpToDateStatusType.UpToDate,
-                newestDeclarationFileContentChangedTime: newestDeclarationFileContentChangedTime,
-                oldestOutputFileName: outputFiles[0].name
-            };
-            diagnostics.removeKey(proj);
-            projectStatus.setValue(proj, status);
-            projectCompilerOptions = baseCompilerOptions;
-            return BuildResultFlags.DeclarationOutputUnchanged;
+            var emitDiagnostics = finishEmit(emitterDiagnostics, emittedOutputs, minimumDate, 
+            /*newestDeclarationFileContentChangedTimeIsMaximumDate*/ false, outputFiles[0].name, BuildResultFlags.DeclarationOutputUnchanged);
+            return { emitSkipped: false, diagnostics: emitDiagnostics };
         }
-        function updateOutputTimestamps(proj) {
-            if (options.dry) {
-                return reportStatus(ts.Diagnostics.A_non_dry_build_would_update_timestamps_for_output_of_project_0, proj.options.configFilePath);
-            }
-            var priorNewestUpdateTime = updateOutputTimestampsWorker(proj, minimumDate, ts.Diagnostics.Updating_output_timestamps_of_project_0);
-            projectStatus.setValue(proj.options.configFilePath, { type: UpToDateStatusType.UpToDate, newestDeclarationFileContentChangedTime: priorNewestUpdateTime });
-        }
-        function updateOutputTimestampsWorker(proj, priorNewestUpdateTime, verboseMessage, skipOutputs) {
-            var outputs = getAllProjectOutputs(proj);
-            if (!skipOutputs || outputs.length !== skipOutputs.getSize()) {
-                if (options.verbose) {
-                    reportStatus(verboseMessage, proj.options.configFilePath);
-                }
-                var now = host.now ? host.now() : new Date();
-                for (var _i = 0, outputs_2 = outputs; _i < outputs_2.length; _i++) {
-                    var file = outputs_2[_i];
-                    if (skipOutputs && skipOutputs.hasKey(file)) {
-                        continue;
-                    }
-                    if (isDeclarationFile(file)) {
-                        priorNewestUpdateTime = newer(priorNewestUpdateTime, host.getModifiedTime(file) || ts.missingFileModifiedTime);
-                    }
-                    host.setModifiedTime(file, now);
-                    if (proj.options.listEmittedFiles) {
-                        writeFileName("TSFILE: " + file);
-                    }
+        function executeSteps(till, cancellationToken, writeFile, customTransformers) {
+            while (step <= till && step < Step.Done) {
+                var currentStep = step;
+                switch (step) {
+                    case Step.CreateProgram:
+                        createProgram();
+                        break;
+                    case Step.SyntaxDiagnostics:
+                        getSyntaxDiagnostics(cancellationToken);
+                        break;
+                    case Step.SemanticDiagnostics:
+                        getSemanticDiagnostics(cancellationToken);
+                        break;
+                    case Step.Emit:
+                        emit(writeFile, cancellationToken, customTransformers);
+                        break;
+                    case Step.EmitBundle:
+                        emitBundle(writeFile, customTransformers);
+                        break;
+                    case Step.BuildInvalidatedProjectOfBundle:
+                        ts.Debug.assertDefined(invalidatedProjectOfBundle).done(cancellationToken);
+                        step = Step.Done;
+                        break;
+                    case Step.QueueReferencingProjects:
+                        queueReferencingProjects(state, project, projectPath, projectIndex, config, buildOrder, ts.Debug.assertDefined(buildResult));
+                        step++;
+                        break;
+                    // Should never be done
+                    case Step.Done:
+                    default:
+                        ts.assertType(step);
                 }
+                ts.Debug.assert(step > currentStep);
             }
-            return priorNewestUpdateTime;
         }
-        function getFilesToClean() {
-            // Get the same graph for cleaning we'd use for building
-            var graph = getGlobalDependencyGraph();
-            var filesToDelete = [];
-            for (var _i = 0, _a = graph.buildQueue; _i < _a.length; _i++) {
-                var proj = _a[_i];
-                var parsed = parseConfigFile(proj);
-                if (parsed === undefined) {
-                    // File has gone missing; fine to ignore here
-                    reportParseConfigFileDiagnostic(proj);
-                    continue;
-                }
-                var outputs = getAllProjectOutputs(parsed);
-                for (var _b = 0, outputs_3 = outputs; _b < outputs_3.length; _b++) {
-                    var output = outputs_3[_b];
-                    if (host.fileExists(output)) {
-                        filesToDelete.push(output);
-                    }
-                }
+    }
+    function needsBuild(_a, status, config) {
+        var options = _a.options;
+        if (status.type !== ts.UpToDateStatusType.OutOfDateWithPrepend || options.force)
+            return true;
+        return config.fileNames.length === 0 ||
+            !!config.errors.length ||
+            !ts.isIncrementalCompilation(config.options);
+    }
+    function getNextInvalidatedProject(state, buildOrder, reportQueue) {
+        if (!state.projectPendingBuild.size)
+            return undefined;
+        if (state.currentInvalidatedProject) {
+            // Only if same buildOrder the currentInvalidated project can be sent again
+            return ts.arrayIsEqualTo(state.currentInvalidatedProject.buildOrder, buildOrder) ?
+                state.currentInvalidatedProject :
+                undefined;
+        }
+        var options = state.options, projectPendingBuild = state.projectPendingBuild;
+        for (var projectIndex = 0; projectIndex < buildOrder.length; projectIndex++) {
+            var project = buildOrder[projectIndex];
+            var projectPath = toResolvedConfigFilePath(state, project);
+            var reloadLevel = state.projectPendingBuild.get(projectPath);
+            if (reloadLevel === undefined)
+                continue;
+            if (reportQueue) {
+                reportQueue = false;
+                reportBuildQueue(state, buildOrder);
             }
-            return filesToDelete;
-        }
-        function cleanAllProjects() {
-            var filesToDelete = getFilesToClean();
-            if (options.dry) {
-                reportStatus(ts.Diagnostics.A_non_dry_build_would_delete_the_following_files_Colon_0, filesToDelete.map(function (f) { return "\r\n * " + f; }).join(""));
-                return ts.ExitStatus.Success;
+            var config = parseConfigFile(state, project, projectPath);
+            if (!config) {
+                reportParseConfigFileDiagnostic(state, projectPath);
+                projectPendingBuild.delete(projectPath);
+                continue;
             }
-            for (var _i = 0, filesToDelete_1 = filesToDelete; _i < filesToDelete_1.length; _i++) {
-                var output = filesToDelete_1[_i];
-                host.deleteFile(output);
+            if (reloadLevel === ts.ConfigFileProgramReloadLevel.Full) {
+                watchConfigFile(state, project, projectPath);
+                watchWildCardDirectories(state, project, projectPath, config);
+                watchInputFiles(state, project, projectPath, config);
             }
-            return ts.ExitStatus.Success;
-        }
-        function resolveProjectName(name) {
-            return resolveConfigFileProjectName(ts.resolvePath(host.getCurrentDirectory(), name));
-        }
-        function resolveProjectNames(configFileNames) {
-            return configFileNames.map(resolveProjectName);
-        }
-        function buildAllProjects() {
-            if (options.watch) {
-                reportWatchStatus(ts.Diagnostics.Starting_compilation_in_watch_mode);
+            else if (reloadLevel === ts.ConfigFileProgramReloadLevel.Partial) {
+                // Update file names
+                var result = ts.getFileNamesFromConfigSpecs(config.configFileSpecs, ts.getDirectoryPath(project), config.options, state.parseConfigFileHost);
+                ts.updateErrorForNoInputFiles(result, project, config.configFileSpecs, config.errors, ts.canJsonReportNoInutFiles(config.raw));
+                config.fileNames = result.fileNames;
+                watchInputFiles(state, project, projectPath, config);
             }
-            // TODO:: In watch mode as well to use caches for incremental build once we can invalidate caches correctly and have right api
-            // Override readFile for json files and output .d.ts to cache the text
-            var savedReadFileWithCache = readFileWithCache;
-            var savedGetSourceFile = compilerHost.getSourceFile;
-            var _a = ts.changeCompilerHostLikeToUseCache(host, toPath, function () {
-                var args = [];
-                for (var _i = 0; _i < arguments.length; _i++) {
-                    args[_i] = arguments[_i];
-                }
-                return savedGetSourceFile.call.apply(savedGetSourceFile, [compilerHost].concat(args));
-            }), originalReadFile = _a.originalReadFile, originalFileExists = _a.originalFileExists, originalDirectoryExists = _a.originalDirectoryExists, originalCreateDirectory = _a.originalCreateDirectory, originalWriteFile = _a.originalWriteFile, getSourceFileWithCache = _a.getSourceFileWithCache, newReadFileWithCache = _a.readFileWithCache;
-            readFileWithCache = newReadFileWithCache;
-            compilerHost.getSourceFile = getSourceFileWithCache;
-            var graph = getGlobalDependencyGraph();
-            reportBuildQueue(graph);
-            var anyFailed = false;
-            for (var _i = 0, _b = graph.buildQueue; _i < _b.length; _i++) {
-                var next = _b[_i];
-                var proj = parseConfigFile(next);
-                if (proj === undefined) {
-                    reportParseConfigFileDiagnostic(next);
-                    anyFailed = true;
-                    break;
-                }
-                // report errors early when using continue or break statements
-                var errors = proj.errors;
-                var status = getUpToDateStatus(proj);
-                verboseReportProjectStatus(next, status);
-                var projName = proj.options.configFilePath;
-                if (status.type === UpToDateStatusType.UpToDate && !options.force) {
-                    reportAndStoreErrors(next, errors);
+            var status = getUpToDateStatus(state, config, projectPath);
+            verboseReportProjectStatus(state, project, status);
+            if (!options.force) {
+                if (status.type === ts.UpToDateStatusType.UpToDate) {
+                    reportAndStoreErrors(state, projectPath, config.errors);
+                    projectPendingBuild.delete(projectPath);
                     // Up to date, skip
-                    if (defaultOptions.dry) {
+                    if (options.dry) {
                         // In a dry build, inform the user of this fact
-                        reportStatus(ts.Diagnostics.Project_0_is_up_to_date, projName);
+                        reportStatus(state, ts.Diagnostics.Project_0_is_up_to_date, project);
                     }
                     continue;
                 }
-                if (status.type === UpToDateStatusType.UpToDateWithUpstreamTypes && !options.force) {
-                    reportAndStoreErrors(next, errors);
-                    // Fake build
-                    updateOutputTimestamps(proj);
-                    continue;
+                if (status.type === ts.UpToDateStatusType.UpToDateWithUpstreamTypes) {
+                    reportAndStoreErrors(state, projectPath, config.errors);
+                    return createUpdateOutputFileStampsProject(state, project, projectPath, config, buildOrder);
                 }
-                if (status.type === UpToDateStatusType.UpstreamBlocked) {
-                    reportAndStoreErrors(next, errors);
-                    if (options.verbose)
-                        reportStatus(ts.Diagnostics.Skipping_build_of_project_0_because_its_dependency_1_has_errors, projName, status.upstreamProjectName);
-                    continue;
-                }
-                if (status.type === UpToDateStatusType.ContainerOnly) {
-                    reportAndStoreErrors(next, errors);
-                    // Do nothing
-                    continue;
-                }
-                var buildResult = status.type === UpToDateStatusType.OutOfDateWithPrepend && !options.force ?
-                    updateBundle(next) : // Fake that files have been built by manipulating prepend and existing output
-                    buildSingleProject(next); // Actual build
-                anyFailed = anyFailed || !!(buildResult & BuildResultFlags.AnyErrors);
             }
-            reportErrorSummary();
-            host.readFile = originalReadFile;
-            host.fileExists = originalFileExists;
-            host.directoryExists = originalDirectoryExists;
-            host.createDirectory = originalCreateDirectory;
-            host.writeFile = originalWriteFile;
-            compilerHost.getSourceFile = savedGetSourceFile;
-            readFileWithCache = savedReadFileWithCache;
-            return anyFailed ? ts.ExitStatus.DiagnosticsPresent_OutputsSkipped : ts.ExitStatus.Success;
-        }
-        function reportParseConfigFileDiagnostic(proj) {
-            reportAndStoreErrors(proj, [configFileCache.getValue(proj)]);
-        }
-        function reportAndStoreErrors(proj, errors) {
-            reportErrors(errors);
-            projectErrorsReported.setValue(proj, true);
-            diagnostics.setValue(proj, errors);
-        }
-        function reportErrors(errors) {
-            errors.forEach(function (err) { return host.reportDiagnostic(err); });
-        }
-        /**
-         * Report the build ordering inferred from the current project graph if we're in verbose mode
-         */
-        function reportBuildQueue(graph) {
-            if (options.verbose) {
-                reportStatus(ts.Diagnostics.Projects_in_this_build_Colon_0, graph.buildQueue.map(function (s) { return "\r\n    * " + relName(s); }).join(""));
+            if (status.type === ts.UpToDateStatusType.UpstreamBlocked) {
+                reportAndStoreErrors(state, projectPath, config.errors);
+                projectPendingBuild.delete(projectPath);
+                if (options.verbose)
+                    reportStatus(state, ts.Diagnostics.Skipping_build_of_project_0_because_its_dependency_1_has_errors, project, status.upstreamProjectName);
+                continue;
             }
+            if (status.type === ts.UpToDateStatusType.ContainerOnly) {
+                reportAndStoreErrors(state, projectPath, config.errors);
+                projectPendingBuild.delete(projectPath);
+                // Do nothing
+                continue;
+            }
+            return createBuildOrUpdateInvalidedProject(needsBuild(state, status, config) ?
+                InvalidatedProjectKind.Build :
+                InvalidatedProjectKind.UpdateBundle, state, project, projectPath, projectIndex, config, buildOrder);
         }
-        function relName(path) {
-            return ts.convertToRelativePath(path, host.getCurrentDirectory(), function (f) { return compilerHost.getCanonicalFileName(f); });
-        }
-        /**
-         * Report the up-to-date status of a project if we're in verbose mode
-         */
-        function verboseReportProjectStatus(configFileName, status) {
-            if (!options.verbose)
-                return;
-            return formatUpToDateStatus(configFileName, status, relName, reportStatus);
+        return undefined;
+    }
+    function listEmittedFile(_a, proj, file) {
+        var writeFileName = _a.writeFileName;
+        if (writeFileName && proj.options.listEmittedFiles) {
+            writeFileName("TSFILE: " + file);
         }
     }
-    ts.createSolutionBuilder = createSolutionBuilder;
-    function resolveConfigFileProjectName(project) {
-        if (ts.fileExtensionIs(project, ".json" /* Json */)) {
-            return project;
-        }
-        return ts.combinePaths(project, "tsconfig.json");
+    function getOldProgram(_a, proj, parsed) {
+        var options = _a.options, builderPrograms = _a.builderPrograms, compilerHost = _a.compilerHost;
+        if (options.force)
+            return undefined;
+        var value = builderPrograms.get(proj);
+        if (value)
+            return value;
+        return ts.readBuilderProgram(parsed.options, compilerHost);
     }
-    ts.resolveConfigFileProjectName = resolveConfigFileProjectName;
-    function getAllProjectOutputs(project) {
-        if (project.options.outFile || project.options.out) {
-            return getOutFileOutputs(project);
+    function afterProgramCreate(_a, proj, program) {
+        var host = _a.host, watch = _a.watch, builderPrograms = _a.builderPrograms;
+        if (host.afterProgramEmitAndDiagnostics) {
+            host.afterProgramEmitAndDiagnostics(program);
+        }
+        if (watch) {
+            program.releaseProgram();
+            builderPrograms.set(proj, program);
+        }
+    }
+    function buildErrors(state, resolvedPath, program, diagnostics, errorFlags, errorType) {
+        reportAndStoreErrors(state, resolvedPath, diagnostics);
+        // List files if any other build error using program (emit errors already report files)
+        if (program && state.writeFileName)
+            ts.listFiles(program, state.writeFileName);
+        state.projectStatus.set(resolvedPath, { type: ts.UpToDateStatusType.Unbuildable, reason: errorType + " errors" });
+        if (program)
+            afterProgramCreate(state, resolvedPath, program);
+        state.projectCompilerOptions = state.baseCompilerOptions;
+        return errorFlags;
+    }
+    function updateModuleResolutionCache(state, proj, config) {
+        if (!state.moduleResolutionCache)
+            return;
+        // Update module resolution cache if needed
+        var moduleResolutionCache = state.moduleResolutionCache;
+        var projPath = toPath(state, proj);
+        if (moduleResolutionCache.directoryToModuleNameMap.redirectsMap.size === 0) {
+            // The own map will be for projectCompilerOptions
+            ts.Debug.assert(moduleResolutionCache.moduleNameToDirectoryMap.redirectsMap.size === 0);
+            moduleResolutionCache.directoryToModuleNameMap.redirectsMap.set(projPath, moduleResolutionCache.directoryToModuleNameMap.ownMap);
+            moduleResolutionCache.moduleNameToDirectoryMap.redirectsMap.set(projPath, moduleResolutionCache.moduleNameToDirectoryMap.ownMap);
         }
         else {
-            var outputs = [];
-            for (var _i = 0, _a = project.fileNames; _i < _a.length; _i++) {
-                var inputFile = _a[_i];
-                outputs.push.apply(outputs, getOutputFileNames(inputFile, project));
-            }
-            var buildInfoPath = ts.getOutputPathForBuildInfo(project.options);
-            if (buildInfoPath)
-                outputs.push(buildInfoPath);
-            return outputs;
+            // Set correct own map
+            ts.Debug.assert(moduleResolutionCache.moduleNameToDirectoryMap.redirectsMap.size > 0);
+            var ref = {
+                sourceFile: config.options.configFile,
+                commandLine: config
+            };
+            moduleResolutionCache.directoryToModuleNameMap.setOwnMap(moduleResolutionCache.directoryToModuleNameMap.getOrCreateMapOfCacheRedirects(ref));
+            moduleResolutionCache.moduleNameToDirectoryMap.setOwnMap(moduleResolutionCache.moduleNameToDirectoryMap.getOrCreateMapOfCacheRedirects(ref));
+        }
+        moduleResolutionCache.directoryToModuleNameMap.setOwnOptions(config.options);
+        moduleResolutionCache.moduleNameToDirectoryMap.setOwnOptions(config.options);
+    }
+    function checkConfigFileUpToDateStatus(state, configFile, oldestOutputFileTime, oldestOutputFileName) {
+        // Check tsconfig time
+        var tsconfigTime = state.host.getModifiedTime(configFile) || ts.missingFileModifiedTime;
+        if (oldestOutputFileTime < tsconfigTime) {
+            return {
+                type: ts.UpToDateStatusType.OutOfDateWithSelf,
+                outOfDateOutputFileName: oldestOutputFileName,
+                newerInputFileName: configFile
+            };
         }
     }
-    ts.getAllProjectOutputs = getAllProjectOutputs;
-    function getFirstProjectOutput(project) {
-        if (project.options.outFile || project.options.out) {
-            return ts.first(getOutFileOutputs(project));
-        }
+    function getUpToDateStatusWorker(state, project, resolvedPath) {
+        var newestInputFileName = undefined;
+        var newestInputFileTime = minimumDate;
+        var host = state.host;
+        // Get timestamps of input files
         for (var _i = 0, _a = project.fileNames; _i < _a.length; _i++) {
             var inputFile = _a[_i];
-            var outputs = getOutputFileNames(inputFile, project);
-            if (outputs.length) {
-                return ts.first(outputs);
+            if (!host.fileExists(inputFile)) {
+                return {
+                    type: ts.UpToDateStatusType.Unbuildable,
+                    reason: inputFile + " does not exist"
+                };
+            }
+            var inputTime = host.getModifiedTime(inputFile) || ts.missingFileModifiedTime;
+            if (inputTime > newestInputFileTime) {
+                newestInputFileName = inputFile;
+                newestInputFileTime = inputTime;
             }
         }
-        return ts.Debug.fail("project " + project.options.configFilePath + " expected to have at least one output");
+        // Container if no files are specified in the project
+        if (!project.fileNames.length && !ts.canJsonReportNoInutFiles(project.raw)) {
+            return {
+                type: ts.UpToDateStatusType.ContainerOnly
+            };
+        }
+        // Collect the expected outputs of this project
+        var outputs = ts.getAllProjectOutputs(project, !host.useCaseSensitiveFileNames());
+        // Now see if all outputs are newer than the newest input
+        var oldestOutputFileName = "(none)";
+        var oldestOutputFileTime = maximumDate;
+        var newestOutputFileName = "(none)";
+        var newestOutputFileTime = minimumDate;
+        var missingOutputFileName;
+        var newestDeclarationFileContentChangedTime = minimumDate;
+        var isOutOfDateWithInputs = false;
+        for (var _b = 0, outputs_1 = outputs; _b < outputs_1.length; _b++) {
+            var output = outputs_1[_b];
+            // Output is missing; can stop checking
+            // Don't immediately return because we can still be upstream-blocked, which is a higher-priority status
+            if (!host.fileExists(output)) {
+                missingOutputFileName = output;
+                break;
+            }
+            var outputTime = host.getModifiedTime(output) || ts.missingFileModifiedTime;
+            if (outputTime < oldestOutputFileTime) {
+                oldestOutputFileTime = outputTime;
+                oldestOutputFileName = output;
+            }
+            // If an output is older than the newest input, we can stop checking
+            // Don't immediately return because we can still be upstream-blocked, which is a higher-priority status
+            if (outputTime < newestInputFileTime) {
+                isOutOfDateWithInputs = true;
+                break;
+            }
+            if (outputTime > newestOutputFileTime) {
+                newestOutputFileTime = outputTime;
+                newestOutputFileName = output;
+            }
+            // Keep track of when the most recent time a .d.ts file was changed.
+            // In addition to file timestamps, we also keep track of when a .d.ts file
+            // had its file touched but not had its contents changed - this allows us
+            // to skip a downstream typecheck
+            if (isDeclarationFile(output)) {
+                var outputModifiedTime = host.getModifiedTime(output) || ts.missingFileModifiedTime;
+                newestDeclarationFileContentChangedTime = newer(newestDeclarationFileContentChangedTime, outputModifiedTime);
+            }
+        }
+        var pseudoUpToDate = false;
+        var usesPrepend = false;
+        var upstreamChangedProject;
+        if (project.projectReferences) {
+            state.projectStatus.set(resolvedPath, { type: ts.UpToDateStatusType.ComputingUpstream });
+            for (var _c = 0, _d = project.projectReferences; _c < _d.length; _c++) {
+                var ref = _d[_c];
+                usesPrepend = usesPrepend || !!(ref.prepend);
+                var resolvedRef = ts.resolveProjectReferencePath(ref);
+                var resolvedRefPath = toResolvedConfigFilePath(state, resolvedRef);
+                var refStatus = getUpToDateStatus(state, parseConfigFile(state, resolvedRef, resolvedRefPath), resolvedRefPath);
+                // Its a circular reference ignore the status of this project
+                if (refStatus.type === ts.UpToDateStatusType.ComputingUpstream ||
+                    refStatus.type === ts.UpToDateStatusType.ContainerOnly) { // Container only ignore this project
+                    continue;
+                }
+                // An upstream project is blocked
+                if (refStatus.type === ts.UpToDateStatusType.Unbuildable) {
+                    return {
+                        type: ts.UpToDateStatusType.UpstreamBlocked,
+                        upstreamProjectName: ref.path
+                    };
+                }
+                // If the upstream project is out of date, then so are we (someone shouldn't have asked, though?)
+                if (refStatus.type !== ts.UpToDateStatusType.UpToDate) {
+                    return {
+                        type: ts.UpToDateStatusType.UpstreamOutOfDate,
+                        upstreamProjectName: ref.path
+                    };
+                }
+                // Check oldest output file name only if there is no missing output file name
+                if (!missingOutputFileName) {
+                    // If the upstream project's newest file is older than our oldest output, we
+                    // can't be out of date because of it
+                    if (refStatus.newestInputFileTime && refStatus.newestInputFileTime <= oldestOutputFileTime) {
+                        continue;
+                    }
+                    // If the upstream project has only change .d.ts files, and we've built
+                    // *after* those files, then we're "psuedo up to date" and eligible for a fast rebuild
+                    if (refStatus.newestDeclarationFileContentChangedTime && refStatus.newestDeclarationFileContentChangedTime <= oldestOutputFileTime) {
+                        pseudoUpToDate = true;
+                        upstreamChangedProject = ref.path;
+                        continue;
+                    }
+                    // We have an output older than an upstream output - we are out of date
+                    ts.Debug.assert(oldestOutputFileName !== undefined, "Should have an oldest output filename here");
+                    return {
+                        type: ts.UpToDateStatusType.OutOfDateWithUpstream,
+                        outOfDateOutputFileName: oldestOutputFileName,
+                        newerProjectName: ref.path
+                    };
+                }
+            }
+        }
+        if (missingOutputFileName !== undefined) {
+            return {
+                type: ts.UpToDateStatusType.OutputMissing,
+                missingOutputFileName: missingOutputFileName
+            };
+        }
+        if (isOutOfDateWithInputs) {
+            return {
+                type: ts.UpToDateStatusType.OutOfDateWithSelf,
+                outOfDateOutputFileName: oldestOutputFileName,
+                newerInputFileName: newestInputFileName
+            };
+        }
+        else {
+            // Check tsconfig time
+            var configStatus = checkConfigFileUpToDateStatus(state, project.options.configFilePath, oldestOutputFileTime, oldestOutputFileName);
+            if (configStatus)
+                return configStatus;
+            // Check extended config time
+            var extendedConfigStatus = ts.forEach(project.options.configFile.extendedSourceFiles || ts.emptyArray, function (configFile) { return checkConfigFileUpToDateStatus(state, configFile, oldestOutputFileTime, oldestOutputFileName); });
+            if (extendedConfigStatus)
+                return extendedConfigStatus;
+        }
+        if (!state.buildInfoChecked.has(resolvedPath)) {
+            state.buildInfoChecked.set(resolvedPath, true);
+            var buildInfoPath = ts.getOutputPathForBuildInfo(project.options);
+            if (buildInfoPath) {
+                var value = state.readFileWithCache(buildInfoPath);
+                var buildInfo = value && ts.getBuildInfo(value);
+                if (buildInfo && (buildInfo.bundle || buildInfo.program) && buildInfo.version !== ts.version) {
+                    return {
+                        type: ts.UpToDateStatusType.TsVersionOutputOfDate,
+                        version: buildInfo.version
+                    };
+                }
+            }
+        }
+        if (usesPrepend && pseudoUpToDate) {
+            return {
+                type: ts.UpToDateStatusType.OutOfDateWithPrepend,
+                outOfDateOutputFileName: oldestOutputFileName,
+                newerProjectName: upstreamChangedProject
+            };
+        }
+        // Up to date
+        return {
+            type: pseudoUpToDate ? ts.UpToDateStatusType.UpToDateWithUpstreamTypes : ts.UpToDateStatusType.UpToDate,
+            newestDeclarationFileContentChangedTime: newestDeclarationFileContentChangedTime,
+            newestInputFileTime: newestInputFileTime,
+            newestOutputFileTime: newestOutputFileTime,
+            newestInputFileName: newestInputFileName,
+            newestOutputFileName: newestOutputFileName,
+            oldestOutputFileName: oldestOutputFileName
+        };
     }
-    function formatUpToDateStatus(configFileName, status, relName, formatMessage) {
+    function getUpToDateStatus(state, project, resolvedPath) {
+        if (project === undefined) {
+            return { type: ts.UpToDateStatusType.Unbuildable, reason: "File deleted mid-build" };
+        }
+        var prior = state.projectStatus.get(resolvedPath);
+        if (prior !== undefined) {
+            return prior;
+        }
+        var actual = getUpToDateStatusWorker(state, project, resolvedPath);
+        state.projectStatus.set(resolvedPath, actual);
+        return actual;
+    }
+    function updateOutputTimestampsWorker(state, proj, priorNewestUpdateTime, verboseMessage, skipOutputs) {
+        var host = state.host;
+        var outputs = ts.getAllProjectOutputs(proj, !host.useCaseSensitiveFileNames());
+        if (!skipOutputs || outputs.length !== skipOutputs.size) {
+            var reportVerbose = !!state.options.verbose;
+            var now = host.now ? host.now() : new Date();
+            for (var _i = 0, outputs_2 = outputs; _i < outputs_2.length; _i++) {
+                var file = outputs_2[_i];
+                if (skipOutputs && skipOutputs.has(toPath(state, file))) {
+                    continue;
+                }
+                if (reportVerbose) {
+                    reportVerbose = false;
+                    reportStatus(state, verboseMessage, proj.options.configFilePath);
+                }
+                if (isDeclarationFile(file)) {
+                    priorNewestUpdateTime = newer(priorNewestUpdateTime, host.getModifiedTime(file) || ts.missingFileModifiedTime);
+                }
+                host.setModifiedTime(file, now);
+                listEmittedFile(state, proj, file);
+            }
+        }
+        return priorNewestUpdateTime;
+    }
+    function updateOutputTimestamps(state, proj, resolvedPath) {
+        if (state.options.dry) {
+            return reportStatus(state, ts.Diagnostics.A_non_dry_build_would_update_timestamps_for_output_of_project_0, proj.options.configFilePath);
+        }
+        var priorNewestUpdateTime = updateOutputTimestampsWorker(state, proj, minimumDate, ts.Diagnostics.Updating_output_timestamps_of_project_0);
+        state.projectStatus.set(resolvedPath, {
+            type: ts.UpToDateStatusType.UpToDate,
+            newestDeclarationFileContentChangedTime: priorNewestUpdateTime,
+            oldestOutputFileName: ts.getFirstProjectOutput(proj, !state.host.useCaseSensitiveFileNames())
+        });
+    }
+    function queueReferencingProjects(state, project, projectPath, projectIndex, config, buildOrder, buildResult) {
+        // Queue only if there are no errors
+        if (buildResult & BuildResultFlags.AnyErrors)
+            return;
+        // Only composite projects can be referenced by other projects
+        if (!config.options.composite)
+            return;
+        // Always use build order to queue projects
+        for (var index = projectIndex + 1; index < buildOrder.length; index++) {
+            var nextProject = buildOrder[index];
+            var nextProjectPath = toResolvedConfigFilePath(state, nextProject);
+            if (state.projectPendingBuild.has(nextProjectPath))
+                continue;
+            var nextProjectConfig = parseConfigFile(state, nextProject, nextProjectPath);
+            if (!nextProjectConfig || !nextProjectConfig.projectReferences)
+                continue;
+            for (var _i = 0, _a = nextProjectConfig.projectReferences; _i < _a.length; _i++) {
+                var ref = _a[_i];
+                var resolvedRefPath = resolveProjectName(state, ref.path);
+                if (toResolvedConfigFilePath(state, resolvedRefPath) !== projectPath)
+                    continue;
+                // If the project is referenced with prepend, always build downstream projects,
+                // If declaration output is changed, build the project
+                // otherwise mark the project UpToDateWithUpstreamTypes so it updates output time stamps
+                var status = state.projectStatus.get(nextProjectPath);
+                if (status) {
+                    switch (status.type) {
+                        case ts.UpToDateStatusType.UpToDate:
+                            if (buildResult & BuildResultFlags.DeclarationOutputUnchanged) {
+                                if (ref.prepend) {
+                                    state.projectStatus.set(nextProjectPath, {
+                                        type: ts.UpToDateStatusType.OutOfDateWithPrepend,
+                                        outOfDateOutputFileName: status.oldestOutputFileName,
+                                        newerProjectName: project
+                                    });
+                                }
+                                else {
+                                    status.type = ts.UpToDateStatusType.UpToDateWithUpstreamTypes;
+                                }
+                                break;
+                            }
+                        // falls through
+                        case ts.UpToDateStatusType.UpToDateWithUpstreamTypes:
+                        case ts.UpToDateStatusType.OutOfDateWithPrepend:
+                            if (!(buildResult & BuildResultFlags.DeclarationOutputUnchanged)) {
+                                state.projectStatus.set(nextProjectPath, {
+                                    type: ts.UpToDateStatusType.OutOfDateWithUpstream,
+                                    outOfDateOutputFileName: status.type === ts.UpToDateStatusType.OutOfDateWithPrepend ? status.outOfDateOutputFileName : status.oldestOutputFileName,
+                                    newerProjectName: project
+                                });
+                            }
+                            break;
+                        case ts.UpToDateStatusType.UpstreamBlocked:
+                            if (toResolvedConfigFilePath(state, resolveProjectName(state, status.upstreamProjectName)) === projectPath) {
+                                clearProjectStatus(state, nextProjectPath);
+                            }
+                            break;
+                    }
+                }
+                addProjToQueue(state, nextProjectPath, ts.ConfigFileProgramReloadLevel.None);
+                break;
+            }
+        }
+    }
+    function build(state, project, cancellationToken, onlyReferences) {
+        var buildOrder = getBuildOrderFor(state, project, onlyReferences);
+        if (!buildOrder)
+            return ts.ExitStatus.InvalidProject_OutputsSkipped;
+        setupInitialBuild(state, cancellationToken);
+        var reportQueue = true;
+        var successfulProjects = 0;
+        var errorProjects = 0;
+        while (true) {
+            var invalidatedProject = getNextInvalidatedProject(state, buildOrder, reportQueue);
+            if (!invalidatedProject)
+                break;
+            reportQueue = false;
+            invalidatedProject.done(cancellationToken);
+            if (state.diagnostics.has(invalidatedProject.projectPath)) {
+                errorProjects++;
+            }
+            else {
+                successfulProjects++;
+            }
+        }
+        disableCache(state);
+        reportErrorSummary(state, buildOrder);
+        startWatching(state, buildOrder);
+        return errorProjects ?
+            successfulProjects ?
+                ts.ExitStatus.DiagnosticsPresent_OutputsGenerated :
+                ts.ExitStatus.DiagnosticsPresent_OutputsSkipped :
+            ts.ExitStatus.Success;
+    }
+    function clean(state, project, onlyReferences) {
+        var buildOrder = getBuildOrderFor(state, project, onlyReferences);
+        if (!buildOrder)
+            return ts.ExitStatus.InvalidProject_OutputsSkipped;
+        var options = state.options, host = state.host;
+        var filesToDelete = options.dry ? [] : undefined;
+        for (var _i = 0, buildOrder_1 = buildOrder; _i < buildOrder_1.length; _i++) {
+            var proj = buildOrder_1[_i];
+            var resolvedPath = toResolvedConfigFilePath(state, proj);
+            var parsed = parseConfigFile(state, proj, resolvedPath);
+            if (parsed === undefined) {
+                // File has gone missing; fine to ignore here
+                reportParseConfigFileDiagnostic(state, resolvedPath);
+                continue;
+            }
+            var outputs = ts.getAllProjectOutputs(parsed, !host.useCaseSensitiveFileNames());
+            for (var _a = 0, outputs_3 = outputs; _a < outputs_3.length; _a++) {
+                var output = outputs_3[_a];
+                if (host.fileExists(output)) {
+                    if (filesToDelete) {
+                        filesToDelete.push(output);
+                    }
+                    else {
+                        host.deleteFile(output);
+                        invalidateProject(state, resolvedPath, ts.ConfigFileProgramReloadLevel.None);
+                    }
+                }
+            }
+        }
+        if (filesToDelete) {
+            reportStatus(state, ts.Diagnostics.A_non_dry_build_would_delete_the_following_files_Colon_0, filesToDelete.map(function (f) { return "\r\n * " + f; }).join(""));
+        }
+        return ts.ExitStatus.Success;
+    }
+    function invalidateProject(state, resolved, reloadLevel) {
+        // If host implements getParsedCommandLine, we cant get list of files from parseConfigFileHost
+        if (state.host.getParsedCommandLine && reloadLevel === ts.ConfigFileProgramReloadLevel.Partial) {
+            reloadLevel = ts.ConfigFileProgramReloadLevel.Full;
+        }
+        if (reloadLevel === ts.ConfigFileProgramReloadLevel.Full) {
+            state.configFileCache.delete(resolved);
+            state.buildOrder = undefined;
+        }
+        state.needsSummary = true;
+        clearProjectStatus(state, resolved);
+        addProjToQueue(state, resolved, reloadLevel);
+        enableCache(state);
+    }
+    function invalidateProjectAndScheduleBuilds(state, resolvedPath, reloadLevel) {
+        state.reportFileChangeDetected = true;
+        invalidateProject(state, resolvedPath, reloadLevel);
+        scheduleBuildInvalidatedProject(state);
+    }
+    function scheduleBuildInvalidatedProject(state) {
+        var hostWithWatch = state.hostWithWatch;
+        if (!hostWithWatch.setTimeout || !hostWithWatch.clearTimeout) {
+            return;
+        }
+        if (state.timerToBuildInvalidatedProject) {
+            hostWithWatch.clearTimeout(state.timerToBuildInvalidatedProject);
+        }
+        state.timerToBuildInvalidatedProject = hostWithWatch.setTimeout(buildNextInvalidatedProject, 250, state);
+    }
+    function buildNextInvalidatedProject(state) {
+        state.timerToBuildInvalidatedProject = undefined;
+        if (state.reportFileChangeDetected) {
+            state.reportFileChangeDetected = false;
+            state.projectErrorsReported.clear();
+            reportWatchStatus(state, ts.Diagnostics.File_change_detected_Starting_incremental_compilation);
+        }
+        var buildOrder = getBuildOrder(state);
+        var invalidatedProject = getNextInvalidatedProject(state, buildOrder, /*reportQueue*/ false);
+        if (invalidatedProject) {
+            invalidatedProject.done();
+            if (state.projectPendingBuild.size) {
+                // Schedule next project for build
+                if (state.watch && !state.timerToBuildInvalidatedProject) {
+                    scheduleBuildInvalidatedProject(state);
+                }
+                return;
+            }
+        }
+        disableCache(state);
+        reportErrorSummary(state, buildOrder);
+    }
+    function watchConfigFile(state, resolved, resolvedPath) {
+        if (!state.watch || state.allWatchedConfigFiles.has(resolvedPath))
+            return;
+        state.allWatchedConfigFiles.set(resolvedPath, state.watchFile(state.hostWithWatch, resolved, function () {
+            invalidateProjectAndScheduleBuilds(state, resolvedPath, ts.ConfigFileProgramReloadLevel.Full);
+        }, ts.PollingInterval.High, "Config file" /* ConfigFile */, resolved));
+    }
+    function isSameFile(state, file1, file2) {
+        return ts.comparePaths(file1, file2, state.currentDirectory, !state.host.useCaseSensitiveFileNames()) === 0 /* EqualTo */;
+    }
+    function isOutputFile(state, fileName, configFile) {
+        if (configFile.options.noEmit)
+            return false;
+        // ts or tsx files are not output
+        if (!ts.fileExtensionIs(fileName, ".d.ts" /* Dts */) &&
+            (ts.fileExtensionIs(fileName, ".ts" /* Ts */) || ts.fileExtensionIs(fileName, ".tsx" /* Tsx */))) {
+            return false;
+        }
+        // If options have --outFile or --out, check if its that
+        var out = configFile.options.outFile || configFile.options.out;
+        if (out && (isSameFile(state, fileName, out) || isSameFile(state, fileName, ts.removeFileExtension(out) + ".d.ts" /* Dts */))) {
+            return true;
+        }
+        // If declarationDir is specified, return if its a file in that directory
+        if (configFile.options.declarationDir && ts.containsPath(configFile.options.declarationDir, fileName, state.currentDirectory, !state.host.useCaseSensitiveFileNames())) {
+            return true;
+        }
+        // If --outDir, check if file is in that directory
+        if (configFile.options.outDir && ts.containsPath(configFile.options.outDir, fileName, state.currentDirectory, !state.host.useCaseSensitiveFileNames())) {
+            return true;
+        }
+        return !ts.forEach(configFile.fileNames, function (inputFile) { return isSameFile(state, fileName, inputFile); });
+    }
+    function watchWildCardDirectories(state, resolved, resolvedPath, parsed) {
+        if (!state.watch)
+            return;
+        ts.updateWatchingWildcardDirectories(getOrCreateValueMapFromConfigFileMap(state.allWatchedWildcardDirectories, resolvedPath), ts.createMapFromTemplate(parsed.configFileSpecs.wildcardDirectories), function (dir, flags) { return state.watchDirectory(state.hostWithWatch, dir, function (fileOrDirectory) {
+            var fileOrDirectoryPath = toPath(state, fileOrDirectory);
+            if (fileOrDirectoryPath !== toPath(state, dir) && ts.hasExtension(fileOrDirectoryPath) && !ts.isSupportedSourceFileName(fileOrDirectory, parsed.options)) {
+                state.writeLog("Project: " + resolved + " Detected file add/remove of non supported extension: " + fileOrDirectory);
+                return;
+            }
+            if (isOutputFile(state, fileOrDirectory, parsed)) {
+                state.writeLog(fileOrDirectory + " is output file");
+                return;
+            }
+            invalidateProjectAndScheduleBuilds(state, resolvedPath, ts.ConfigFileProgramReloadLevel.Partial);
+        }, flags, "Wild card directory" /* WildcardDirectory */, resolved); });
+    }
+    function watchInputFiles(state, resolved, resolvedPath, parsed) {
+        if (!state.watch)
+            return;
+        ts.mutateMap(getOrCreateValueMapFromConfigFileMap(state.allWatchedInputFiles, resolvedPath), ts.arrayToMap(parsed.fileNames, function (fileName) { return toPath(state, fileName); }), {
+            createNewValue: function (path, input) { return state.watchFilePath(state.hostWithWatch, input, function () { return invalidateProjectAndScheduleBuilds(state, resolvedPath, ts.ConfigFileProgramReloadLevel.None); }, ts.PollingInterval.Low, path, "Source file" /* SourceFile */, resolved); },
+            onDeleteValue: ts.closeFileWatcher,
+        });
+    }
+    function startWatching(state, buildOrder) {
+        if (!state.watchAllProjectsPending)
+            return;
+        state.watchAllProjectsPending = false;
+        for (var _i = 0, buildOrder_2 = buildOrder; _i < buildOrder_2.length; _i++) {
+            var resolved = buildOrder_2[_i];
+            var resolvedPath = toResolvedConfigFilePath(state, resolved);
+            // Watch this file
+            watchConfigFile(state, resolved, resolvedPath);
+            var cfg = parseConfigFile(state, resolved, resolvedPath);
+            if (cfg) {
+                // Update watchers for wildcard directories
+                watchWildCardDirectories(state, resolved, resolvedPath, cfg);
+                // Watch input files
+                watchInputFiles(state, resolved, resolvedPath, cfg);
+            }
+        }
+    }
+    function createSolutionBuilderWorker(watch, hostOrHostWithWatch, rootNames, options) {
+        var state = createSolutionBuilderState(watch, hostOrHostWithWatch, rootNames, options);
+        return {
+            build: function (project, cancellationToken) { return build(state, project, cancellationToken); },
+            clean: function (project) { return clean(state, project); },
+            buildReferences: function (project, cancellationToken) { return build(state, project, cancellationToken, /*onlyReferences*/ true); },
+            cleanReferences: function (project) { return clean(state, project, /*onlyReferences*/ true); },
+            getNextInvalidatedProject: function (cancellationToken) {
+                setupInitialBuild(state, cancellationToken);
+                return getNextInvalidatedProject(state, getBuildOrder(state), /*reportQueue*/ false);
+            },
+            getBuildOrder: function () { return getBuildOrder(state); },
+            getUpToDateStatusOfProject: function (project) {
+                var configFileName = resolveProjectName(state, project);
+                var configFilePath = toResolvedConfigFilePath(state, configFileName);
+                return getUpToDateStatus(state, parseConfigFile(state, configFileName, configFilePath), configFilePath);
+            },
+            invalidateProject: function (configFilePath, reloadLevel) { return invalidateProject(state, configFilePath, reloadLevel || ts.ConfigFileProgramReloadLevel.None); },
+            buildNextInvalidatedProject: function () { return buildNextInvalidatedProject(state); },
+        };
+    }
+    function relName(state, path) {
+        return ts.convertToRelativePath(path, state.currentDirectory, function (f) { return state.getCanonicalFileName(f); });
+    }
+    function reportStatus(state, message) {
+        var args = [];
+        for (var _i = 2; _i < arguments.length; _i++) {
+            args[_i - 2] = arguments[_i];
+        }
+        state.host.reportSolutionBuilderStatus(ts.createCompilerDiagnostic.apply(void 0, [message].concat(args)));
+    }
+    function reportWatchStatus(state, message) {
+        var args = [];
+        for (var _i = 2; _i < arguments.length; _i++) {
+            args[_i - 2] = arguments[_i];
+        }
+        if (state.hostWithWatch.onWatchStatusChange) {
+            state.hostWithWatch.onWatchStatusChange(ts.createCompilerDiagnostic.apply(void 0, [message].concat(args)), state.host.getNewLine(), state.baseCompilerOptions);
+        }
+    }
+    function reportErrors(_a, errors) {
+        var host = _a.host;
+        errors.forEach(function (err) { return host.reportDiagnostic(err); });
+    }
+    function reportAndStoreErrors(state, proj, errors) {
+        reportErrors(state, errors);
+        state.projectErrorsReported.set(proj, true);
+        if (errors.length) {
+            state.diagnostics.set(proj, errors);
+        }
+    }
+    function reportParseConfigFileDiagnostic(state, proj) {
+        reportAndStoreErrors(state, proj, [state.configFileCache.get(proj)]);
+    }
+    function reportErrorSummary(state, buildOrder) {
+        if (!state.needsSummary || (!state.watch && !state.host.reportErrorSummary))
+            return;
+        state.needsSummary = false;
+        var diagnostics = state.diagnostics;
+        // Report errors from the other projects
+        buildOrder.forEach(function (project) {
+            var projectPath = toResolvedConfigFilePath(state, project);
+            if (!state.projectErrorsReported.has(projectPath)) {
+                reportErrors(state, diagnostics.get(projectPath) || ts.emptyArray);
+            }
+        });
+        var totalErrors = 0;
+        diagnostics.forEach(function (singleProjectErrors) { return totalErrors += ts.getErrorCountForSummary(singleProjectErrors); });
+        if (state.watch) {
+            reportWatchStatus(state, ts.getWatchErrorSummaryDiagnosticMessage(totalErrors), totalErrors);
+        }
+        else {
+            state.host.reportErrorSummary(totalErrors);
+        }
+    }
+    /**
+     * Report the build ordering inferred from the current project graph if we're in verbose mode
+     */
+    function reportBuildQueue(state, buildQueue) {
+        if (state.options.verbose) {
+            reportStatus(state, ts.Diagnostics.Projects_in_this_build_Colon_0, buildQueue.map(function (s) { return "\r\n    * " + relName(state, s); }).join(""));
+        }
+    }
+    function reportUpToDateStatus(state, configFileName, status) {
         switch (status.type) {
-            case UpToDateStatusType.OutOfDateWithSelf:
-                return formatMessage(ts.Diagnostics.Project_0_is_out_of_date_because_oldest_output_1_is_older_than_newest_input_2, relName(configFileName), relName(status.outOfDateOutputFileName), relName(status.newerInputFileName));
-            case UpToDateStatusType.OutOfDateWithUpstream:
-                return formatMessage(ts.Diagnostics.Project_0_is_out_of_date_because_oldest_output_1_is_older_than_newest_input_2, relName(configFileName), relName(status.outOfDateOutputFileName), relName(status.newerProjectName));
-            case UpToDateStatusType.OutputMissing:
-                return formatMessage(ts.Diagnostics.Project_0_is_out_of_date_because_output_file_1_does_not_exist, relName(configFileName), relName(status.missingOutputFileName));
-            case UpToDateStatusType.UpToDate:
+            case ts.UpToDateStatusType.OutOfDateWithSelf:
+                return reportStatus(state, ts.Diagnostics.Project_0_is_out_of_date_because_oldest_output_1_is_older_than_newest_input_2, relName(state, configFileName), relName(state, status.outOfDateOutputFileName), relName(state, status.newerInputFileName));
+            case ts.UpToDateStatusType.OutOfDateWithUpstream:
+                return reportStatus(state, ts.Diagnostics.Project_0_is_out_of_date_because_oldest_output_1_is_older_than_newest_input_2, relName(state, configFileName), relName(state, status.outOfDateOutputFileName), relName(state, status.newerProjectName));
+            case ts.UpToDateStatusType.OutputMissing:
+                return reportStatus(state, ts.Diagnostics.Project_0_is_out_of_date_because_output_file_1_does_not_exist, relName(state, configFileName), relName(state, status.missingOutputFileName));
+            case ts.UpToDateStatusType.UpToDate:
                 if (status.newestInputFileTime !== undefined) {
-                    return formatMessage(ts.Diagnostics.Project_0_is_up_to_date_because_newest_input_1_is_older_than_oldest_output_2, relName(configFileName), relName(status.newestInputFileName || ""), relName(status.oldestOutputFileName || ""));
+                    return reportStatus(state, ts.Diagnostics.Project_0_is_up_to_date_because_newest_input_1_is_older_than_oldest_output_2, relName(state, configFileName), relName(state, status.newestInputFileName || ""), relName(state, status.oldestOutputFileName || ""));
                 }
                 // Don't report anything for "up to date because it was already built" -- too verbose
                 break;
-            case UpToDateStatusType.OutOfDateWithPrepend:
-                return formatMessage(ts.Diagnostics.Project_0_is_out_of_date_because_output_of_its_dependency_1_has_changed, relName(configFileName), relName(status.newerProjectName));
-            case UpToDateStatusType.UpToDateWithUpstreamTypes:
-                return formatMessage(ts.Diagnostics.Project_0_is_up_to_date_with_d_ts_files_from_its_dependencies, relName(configFileName));
-            case UpToDateStatusType.UpstreamOutOfDate:
-                return formatMessage(ts.Diagnostics.Project_0_is_out_of_date_because_its_dependency_1_is_out_of_date, relName(configFileName), relName(status.upstreamProjectName));
-            case UpToDateStatusType.UpstreamBlocked:
-                return formatMessage(ts.Diagnostics.Project_0_can_t_be_built_because_its_dependency_1_has_errors, relName(configFileName), relName(status.upstreamProjectName));
-            case UpToDateStatusType.Unbuildable:
-                return formatMessage(ts.Diagnostics.Failed_to_parse_file_0_Colon_1, relName(configFileName), status.reason);
-            case UpToDateStatusType.TsVersionOutputOfDate:
-                return formatMessage(ts.Diagnostics.Project_0_is_out_of_date_because_output_for_it_was_generated_with_version_1_that_differs_with_current_version_2, relName(configFileName), status.version, ts.version);
-            case UpToDateStatusType.ContainerOnly:
+            case ts.UpToDateStatusType.OutOfDateWithPrepend:
+                return reportStatus(state, ts.Diagnostics.Project_0_is_out_of_date_because_output_of_its_dependency_1_has_changed, relName(state, configFileName), relName(state, status.newerProjectName));
+            case ts.UpToDateStatusType.UpToDateWithUpstreamTypes:
+                return reportStatus(state, ts.Diagnostics.Project_0_is_up_to_date_with_d_ts_files_from_its_dependencies, relName(state, configFileName));
+            case ts.UpToDateStatusType.UpstreamOutOfDate:
+                return reportStatus(state, ts.Diagnostics.Project_0_is_out_of_date_because_its_dependency_1_is_out_of_date, relName(state, configFileName), relName(state, status.upstreamProjectName));
+            case ts.UpToDateStatusType.UpstreamBlocked:
+                return reportStatus(state, ts.Diagnostics.Project_0_can_t_be_built_because_its_dependency_1_has_errors, relName(state, configFileName), relName(state, status.upstreamProjectName));
+            case ts.UpToDateStatusType.Unbuildable:
+                return reportStatus(state, ts.Diagnostics.Failed_to_parse_file_0_Colon_1, relName(state, configFileName), status.reason);
+            case ts.UpToDateStatusType.TsVersionOutputOfDate:
+                return reportStatus(state, ts.Diagnostics.Project_0_is_out_of_date_because_output_for_it_was_generated_with_version_1_that_differs_with_current_version_2, relName(state, configFileName), status.version, ts.version);
+            case ts.UpToDateStatusType.ContainerOnly:
             // Don't report status on "solution" projects
-            case UpToDateStatusType.ComputingUpstream:
+            case ts.UpToDateStatusType.ComputingUpstream:
                 // Should never leak from getUptoDateStatusWorker
                 break;
             default:
                 ts.assertType(status);
         }
     }
-    ts.formatUpToDateStatus = formatUpToDateStatus;
-})(ts || (ts = {}));
-/* @internal */
-var ts;
-(function (ts) {
-    var ValueKind;
-    (function (ValueKind) {
-        ValueKind[ValueKind["Const"] = 0] = "Const";
-        ValueKind[ValueKind["Array"] = 1] = "Array";
-        ValueKind[ValueKind["FunctionOrClass"] = 2] = "FunctionOrClass";
-        ValueKind[ValueKind["Object"] = 3] = "Object";
-    })(ValueKind = ts.ValueKind || (ts.ValueKind = {}));
-    function inspectModule(fileNameToRequire) {
-        return inspectValue(ts.removeFileExtension(ts.getBaseFileName(fileNameToRequire)), tryRequire(fileNameToRequire));
-    }
-    ts.inspectModule = inspectModule;
-    function inspectValue(name, value) {
-        return getValueInfo(name, value, getRecurser());
-    }
-    ts.inspectValue = inspectValue;
-    function getRecurser() {
-        var seen = [];
-        var nameStack = [];
-        return function (obj, name, cbOk, cbFail) {
-            if (seen.indexOf(obj) !== -1 || nameStack.length > 4) {
-                return cbFail(seen.indexOf(obj) !== -1, nameStack);
-            }
-            seen.push(obj);
-            nameStack.push(name);
-            var res = cbOk();
-            nameStack.pop();
-            seen.pop();
-            return res;
-        };
-    }
-    function getValueInfo(name, value, recurser) {
-        return recurser(value, name, function () {
-            if (typeof value === "function")
-                return getFunctionOrClassInfo(value, name, recurser);
-            if (typeof value === "object") {
-                var builtin = getBuiltinType(name, value, recurser);
-                if (builtin !== undefined)
-                    return builtin;
-                var entries = getEntriesOfObject(value);
-                var hasNontrivialPrototype = Object.getPrototypeOf(value) !== Object.prototype;
-                var members = ts.flatMap(entries, function (_a) {
-                    var key = _a.key, value = _a.value;
-                    return getValueInfo(key, value, recurser);
-                });
-                return { kind: 3 /* Object */, name: name, hasNontrivialPrototype: hasNontrivialPrototype, members: members };
-            }
-            return { kind: 0 /* Const */, name: name, typeName: isNullOrUndefined(value) ? "any" : typeof value };
-        }, function (isCircularReference, keyStack) { return anyValue(name, " " + (isCircularReference ? "Circular reference" : "Too-deep object hierarchy") + " from " + keyStack.join(".")); });
-    }
-    function getFunctionOrClassInfo(fn, name, recurser) {
-        var prototypeMembers = getPrototypeMembers(fn, recurser);
-        var namespaceMembers = ts.flatMap(getEntriesOfObject(fn), function (_a) {
-            var key = _a.key, value = _a.value;
-            return getValueInfo(key, value, recurser);
-        });
-        var toString = ts.cast(Function.prototype.toString.call(fn), ts.isString);
-        var source = ts.stringContains(toString, "{ [native code] }") ? getFunctionLength(fn) : toString;
-        return { kind: 2 /* FunctionOrClass */, name: name, source: source, namespaceMembers: namespaceMembers, prototypeMembers: prototypeMembers };
-    }
-    var builtins = ts.memoize(function () {
-        var map = ts.createMap();
-        for (var _i = 0, _a = getEntriesOfObject(global); _i < _a.length; _i++) {
-            var _b = _a[_i], key = _b.key, value = _b.value;
-            if (typeof value === "function" && typeof value.prototype === "object" && value !== Object) {
-                map.set(key, value);
-            }
-        }
-        return map;
-    });
-    function getBuiltinType(name, value, recurser) {
-        return ts.isArray(value)
-            ? { name: name, kind: 1 /* Array */, inner: value.length && getValueInfo("element", ts.first(value), recurser) || anyValue(name) }
-            : ts.forEachEntry(builtins(), function (builtin, builtinName) {
-                return value instanceof builtin ? { kind: 0 /* Const */, name: name, typeName: builtinName } : undefined;
-            });
-    }
-    function getPrototypeMembers(fn, recurser) {
-        var prototype = fn.prototype;
-        // tslint:disable-next-line no-unnecessary-type-assertion (TODO: update LKG and it will really be unnecessary)
-        return typeof prototype !== "object" || prototype === null ? ts.emptyArray : ts.mapDefined(getEntriesOfObject(prototype), function (_a) {
-            var key = _a.key, value = _a.value;
-            return key === "constructor" ? undefined : getValueInfo(key, value, recurser);
-        });
-    }
-    var ignoredProperties = ["arguments", "caller", "constructor", "eval", "super_"];
-    var reservedFunctionProperties = Object.getOwnPropertyNames(ts.noop);
-    function getEntriesOfObject(obj) {
-        var seen = ts.createMap();
-        var entries = [];
-        var chain = obj;
-        while (!isNullOrUndefined(chain) && chain !== Object.prototype && chain !== Function.prototype) {
-            for (var _i = 0, _a = Object.getOwnPropertyNames(chain); _i < _a.length; _i++) {
-                var key = _a[_i];
-                if (!isJsPrivate(key) &&
-                    ignoredProperties.indexOf(key) === -1 &&
-                    (typeof obj !== "function" || reservedFunctionProperties.indexOf(key) === -1) &&
-                    // Don't add property from a higher prototype if it already exists in a lower one
-                    ts.addToSeen(seen, key)) {
-                    var value = safeGetPropertyOfObject(chain, key);
-                    // Don't repeat "toString" that matches signature from Object.prototype
-                    if (!(key === "toString" && typeof value === "function" && value.length === 0)) {
-                        entries.push({ key: key, value: value });
-                    }
-                }
-            }
-            chain = Object.getPrototypeOf(chain);
-        }
-        return entries.sort(function (e1, e2) { return ts.compareStringsCaseSensitive(e1.key, e2.key); });
-    }
-    function getFunctionLength(fn) {
-        return ts.tryCast(safeGetPropertyOfObject(fn, "length"), ts.isNumber) || 0;
-    }
-    function safeGetPropertyOfObject(obj, key) {
-        var desc = Object.getOwnPropertyDescriptor(obj, key);
-        return desc && desc.value;
-    }
-    function isNullOrUndefined(value) {
-        return value == null; // tslint:disable-line
-    }
-    function anyValue(name, comment) {
-        return { kind: 0 /* Const */, name: name, typeName: "any", comment: comment };
-    }
-    function isJsPrivate(name) {
-        return ts.startsWith(name, "_");
-    }
-    ts.isJsPrivate = isJsPrivate;
-    function tryRequire(fileNameToRequire) {
-        try {
-            return require(fileNameToRequire);
-        }
-        catch (_a) {
-            return undefined;
+    /**
+     * Report the up-to-date status of a project if we're in verbose mode
+     */
+    function verboseReportProjectStatus(state, configFileName, status) {
+        if (state.options.verbose) {
+            reportUpToDateStatus(state, configFileName, status);
         }
     }
 })(ts || (ts = {}));
@@ -94889,7 +97827,7 @@ var ts;
 /* @internal */
 var ts;
 (function (ts) {
-    ts.scanner = ts.createScanner(7 /* Latest */, /*skipTrivia*/ true);
+    ts.scanner = ts.createScanner(99 /* Latest */, /*skipTrivia*/ true);
     var SemanticMeaning;
     (function (SemanticMeaning) {
         SemanticMeaning[SemanticMeaning["None"] = 0] = "None";
@@ -94900,37 +97838,37 @@ var ts;
     })(SemanticMeaning = ts.SemanticMeaning || (ts.SemanticMeaning = {}));
     function getMeaningFromDeclaration(node) {
         switch (node.kind) {
-            case 237 /* VariableDeclaration */:
+            case 238 /* VariableDeclaration */:
                 return ts.isInJSFile(node) && ts.getJSDocEnumTag(node) ? 7 /* All */ : 1 /* Value */;
-            case 151 /* Parameter */:
-            case 186 /* BindingElement */:
-            case 154 /* PropertyDeclaration */:
-            case 153 /* PropertySignature */:
-            case 275 /* PropertyAssignment */:
-            case 276 /* ShorthandPropertyAssignment */:
-            case 156 /* MethodDeclaration */:
-            case 155 /* MethodSignature */:
-            case 157 /* Constructor */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
-            case 239 /* FunctionDeclaration */:
-            case 196 /* FunctionExpression */:
-            case 197 /* ArrowFunction */:
-            case 274 /* CatchClause */:
-            case 267 /* JsxAttribute */:
+            case 152 /* Parameter */:
+            case 187 /* BindingElement */:
+            case 155 /* PropertyDeclaration */:
+            case 154 /* PropertySignature */:
+            case 276 /* PropertyAssignment */:
+            case 277 /* ShorthandPropertyAssignment */:
+            case 157 /* MethodDeclaration */:
+            case 156 /* MethodSignature */:
+            case 158 /* Constructor */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
+            case 240 /* FunctionDeclaration */:
+            case 197 /* FunctionExpression */:
+            case 198 /* ArrowFunction */:
+            case 275 /* CatchClause */:
+            case 268 /* JsxAttribute */:
                 return 1 /* Value */;
-            case 150 /* TypeParameter */:
-            case 241 /* InterfaceDeclaration */:
-            case 242 /* TypeAliasDeclaration */:
-            case 168 /* TypeLiteral */:
+            case 151 /* TypeParameter */:
+            case 242 /* InterfaceDeclaration */:
+            case 243 /* TypeAliasDeclaration */:
+            case 169 /* TypeLiteral */:
                 return 2 /* Type */;
-            case 309 /* JSDocTypedefTag */:
+            case 311 /* JSDocTypedefTag */:
                 // If it has no name node, it shares the name with the value declaration below it.
                 return node.name === undefined ? 1 /* Value */ | 2 /* Type */ : 2 /* Type */;
-            case 278 /* EnumMember */:
-            case 240 /* ClassDeclaration */:
+            case 279 /* EnumMember */:
+            case 241 /* ClassDeclaration */:
                 return 1 /* Value */ | 2 /* Type */;
-            case 244 /* ModuleDeclaration */:
+            case 245 /* ModuleDeclaration */:
                 if (ts.isAmbientModule(node)) {
                     return 4 /* Namespace */ | 1 /* Value */;
                 }
@@ -94940,26 +97878,26 @@ var ts;
                 else {
                     return 4 /* Namespace */;
                 }
-            case 243 /* EnumDeclaration */:
-            case 252 /* NamedImports */:
-            case 253 /* ImportSpecifier */:
-            case 248 /* ImportEqualsDeclaration */:
-            case 249 /* ImportDeclaration */:
-            case 254 /* ExportAssignment */:
-            case 255 /* ExportDeclaration */:
+            case 244 /* EnumDeclaration */:
+            case 253 /* NamedImports */:
+            case 254 /* ImportSpecifier */:
+            case 249 /* ImportEqualsDeclaration */:
+            case 250 /* ImportDeclaration */:
+            case 255 /* ExportAssignment */:
+            case 256 /* ExportDeclaration */:
                 return 7 /* All */;
             // An external module can be a Value
-            case 284 /* SourceFile */:
+            case 285 /* SourceFile */:
                 return 4 /* Namespace */ | 1 /* Value */;
         }
         return 7 /* All */;
     }
     ts.getMeaningFromDeclaration = getMeaningFromDeclaration;
     function getMeaningFromLocation(node) {
-        if (node.kind === 284 /* SourceFile */) {
+        if (node.kind === 285 /* SourceFile */) {
             return 1 /* Value */;
         }
-        else if (node.parent.kind === 254 /* ExportAssignment */ || node.parent.kind === 259 /* ExternalModuleReference */) {
+        else if (node.parent.kind === 255 /* ExportAssignment */ || node.parent.kind === 260 /* ExternalModuleReference */) {
             return 7 /* All */;
         }
         else if (isInRightSideOfInternalImportEqualsDeclaration(node)) {
@@ -94991,11 +97929,11 @@ var ts;
         //     import a = |b|; // Namespace
         //     import a = |b.c|; // Value, type, namespace
         //     import a = |b.c|.d; // Namespace
-        var name = node.kind === 148 /* QualifiedName */ ? node : ts.isQualifiedName(node.parent) && node.parent.right === node ? node.parent : undefined;
-        return name && name.parent.kind === 248 /* ImportEqualsDeclaration */ ? 7 /* All */ : 4 /* Namespace */;
+        var name = node.kind === 149 /* QualifiedName */ ? node : ts.isQualifiedName(node.parent) && node.parent.right === node ? node.parent : undefined;
+        return name && name.parent.kind === 249 /* ImportEqualsDeclaration */ ? 7 /* All */ : 4 /* Namespace */;
     }
     function isInRightSideOfInternalImportEqualsDeclaration(node) {
-        while (node.parent.kind === 148 /* QualifiedName */) {
+        while (node.parent.kind === 149 /* QualifiedName */) {
             node = node.parent;
         }
         return ts.isInternalModuleImportEqualsDeclaration(node.parent) && node.parent.moduleReference === node;
@@ -95007,27 +97945,27 @@ var ts;
     function isQualifiedNameNamespaceReference(node) {
         var root = node;
         var isLastClause = true;
-        if (root.parent.kind === 148 /* QualifiedName */) {
-            while (root.parent && root.parent.kind === 148 /* QualifiedName */) {
+        if (root.parent.kind === 149 /* QualifiedName */) {
+            while (root.parent && root.parent.kind === 149 /* QualifiedName */) {
                 root = root.parent;
             }
             isLastClause = root.right === node;
         }
-        return root.parent.kind === 164 /* TypeReference */ && !isLastClause;
+        return root.parent.kind === 165 /* TypeReference */ && !isLastClause;
     }
     function isPropertyAccessNamespaceReference(node) {
         var root = node;
         var isLastClause = true;
-        if (root.parent.kind === 189 /* PropertyAccessExpression */) {
-            while (root.parent && root.parent.kind === 189 /* PropertyAccessExpression */) {
+        if (root.parent.kind === 190 /* PropertyAccessExpression */) {
+            while (root.parent && root.parent.kind === 190 /* PropertyAccessExpression */) {
                 root = root.parent;
             }
             isLastClause = root.name === node;
         }
-        if (!isLastClause && root.parent.kind === 211 /* ExpressionWithTypeArguments */ && root.parent.parent.kind === 273 /* HeritageClause */) {
+        if (!isLastClause && root.parent.kind === 212 /* ExpressionWithTypeArguments */ && root.parent.parent.kind === 274 /* HeritageClause */) {
             var decl = root.parent.parent.parent;
-            return (decl.kind === 240 /* ClassDeclaration */ && root.parent.parent.token === 109 /* ImplementsKeyword */) ||
-                (decl.kind === 241 /* InterfaceDeclaration */ && root.parent.parent.token === 86 /* ExtendsKeyword */);
+            return (decl.kind === 241 /* ClassDeclaration */ && root.parent.parent.token === 110 /* ImplementsKeyword */) ||
+                (decl.kind === 242 /* InterfaceDeclaration */ && root.parent.parent.token === 87 /* ExtendsKeyword */);
         }
         return false;
     }
@@ -95036,17 +97974,17 @@ var ts;
             node = node.parent;
         }
         switch (node.kind) {
-            case 100 /* ThisKeyword */:
+            case 101 /* ThisKeyword */:
                 return !ts.isExpressionNode(node);
-            case 178 /* ThisType */:
+            case 179 /* ThisType */:
                 return true;
         }
         switch (node.parent.kind) {
-            case 164 /* TypeReference */:
+            case 165 /* TypeReference */:
                 return true;
-            case 183 /* ImportType */:
+            case 184 /* ImportType */:
                 return !node.parent.isTypeOf;
-            case 211 /* ExpressionWithTypeArguments */:
+            case 212 /* ExpressionWithTypeArguments */:
                 return !ts.isExpressionWithTypeArgumentsInClassExtendsClause(node.parent);
         }
         return false;
@@ -95073,7 +98011,7 @@ var ts;
     ts.climbPastPropertyAccess = climbPastPropertyAccess;
     function getTargetLabel(referenceNode, labelName) {
         while (referenceNode) {
-            if (referenceNode.kind === 233 /* LabeledStatement */ && referenceNode.label.escapedText === labelName) {
+            if (referenceNode.kind === 234 /* LabeledStatement */ && referenceNode.label.escapedText === labelName) {
                 return referenceNode.label;
             }
             referenceNode = referenceNode.parent;
@@ -95089,11 +98027,11 @@ var ts;
     }
     ts.hasPropertyAccessExpressionWithName = hasPropertyAccessExpressionWithName;
     function isJumpStatementTarget(node) {
-        return node.kind === 72 /* Identifier */ && ts.isBreakOrContinueStatement(node.parent) && node.parent.label === node;
+        return node.kind === 73 /* Identifier */ && ts.isBreakOrContinueStatement(node.parent) && node.parent.label === node;
     }
     ts.isJumpStatementTarget = isJumpStatementTarget;
     function isLabelOfLabeledStatement(node) {
-        return node.kind === 72 /* Identifier */ && ts.isLabeledStatement(node.parent) && node.parent.label === node;
+        return node.kind === 73 /* Identifier */ && ts.isLabeledStatement(node.parent) && node.parent.label === node;
     }
     ts.isLabelOfLabeledStatement = isLabelOfLabeledStatement;
     function isLabelName(node) {
@@ -95105,40 +98043,40 @@ var ts;
     }
     ts.isTagName = isTagName;
     function isRightSideOfQualifiedName(node) {
-        return node.parent.kind === 148 /* QualifiedName */ && node.parent.right === node;
+        return node.parent.kind === 149 /* QualifiedName */ && node.parent.right === node;
     }
     ts.isRightSideOfQualifiedName = isRightSideOfQualifiedName;
     function isRightSideOfPropertyAccess(node) {
-        return node && node.parent && node.parent.kind === 189 /* PropertyAccessExpression */ && node.parent.name === node;
+        return node && node.parent && node.parent.kind === 190 /* PropertyAccessExpression */ && node.parent.name === node;
     }
     ts.isRightSideOfPropertyAccess = isRightSideOfPropertyAccess;
     function isNameOfModuleDeclaration(node) {
-        return node.parent.kind === 244 /* ModuleDeclaration */ && node.parent.name === node;
+        return node.parent.kind === 245 /* ModuleDeclaration */ && node.parent.name === node;
     }
     ts.isNameOfModuleDeclaration = isNameOfModuleDeclaration;
     function isNameOfFunctionDeclaration(node) {
-        return node.kind === 72 /* Identifier */ &&
+        return node.kind === 73 /* Identifier */ &&
             ts.isFunctionLike(node.parent) && node.parent.name === node;
     }
     ts.isNameOfFunctionDeclaration = isNameOfFunctionDeclaration;
     function isLiteralNameOfPropertyDeclarationOrIndexAccess(node) {
         switch (node.parent.kind) {
-            case 154 /* PropertyDeclaration */:
-            case 153 /* PropertySignature */:
-            case 275 /* PropertyAssignment */:
-            case 278 /* EnumMember */:
-            case 156 /* MethodDeclaration */:
-            case 155 /* MethodSignature */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
-            case 244 /* ModuleDeclaration */:
+            case 155 /* PropertyDeclaration */:
+            case 154 /* PropertySignature */:
+            case 276 /* PropertyAssignment */:
+            case 279 /* EnumMember */:
+            case 157 /* MethodDeclaration */:
+            case 156 /* MethodSignature */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
+            case 245 /* ModuleDeclaration */:
                 return ts.getNameOfDeclaration(node.parent) === node;
-            case 190 /* ElementAccessExpression */:
+            case 191 /* ElementAccessExpression */:
                 return node.parent.argumentExpression === node;
-            case 149 /* ComputedPropertyName */:
+            case 150 /* ComputedPropertyName */:
                 return true;
-            case 182 /* LiteralType */:
-                return node.parent.parent.kind === 180 /* IndexedAccessType */;
+            case 183 /* LiteralType */:
+                return node.parent.parent.kind === 181 /* IndexedAccessType */;
             default:
                 return false;
         }
@@ -95162,17 +98100,17 @@ var ts;
                 return undefined;
             }
             switch (node.kind) {
-                case 284 /* SourceFile */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
-                case 240 /* ClassDeclaration */:
-                case 241 /* InterfaceDeclaration */:
-                case 243 /* EnumDeclaration */:
-                case 244 /* ModuleDeclaration */:
+                case 285 /* SourceFile */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
+                case 241 /* ClassDeclaration */:
+                case 242 /* InterfaceDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     return node;
             }
         }
@@ -95180,48 +98118,48 @@ var ts;
     ts.getContainerNode = getContainerNode;
     function getNodeKind(node) {
         switch (node.kind) {
-            case 284 /* SourceFile */:
+            case 285 /* SourceFile */:
                 return ts.isExternalModule(node) ? "module" /* moduleElement */ : "script" /* scriptElement */;
-            case 244 /* ModuleDeclaration */:
+            case 245 /* ModuleDeclaration */:
                 return "module" /* moduleElement */;
-            case 240 /* ClassDeclaration */:
-            case 209 /* ClassExpression */:
+            case 241 /* ClassDeclaration */:
+            case 210 /* ClassExpression */:
                 return "class" /* classElement */;
-            case 241 /* InterfaceDeclaration */: return "interface" /* interfaceElement */;
-            case 242 /* TypeAliasDeclaration */:
-            case 302 /* JSDocCallbackTag */:
-            case 309 /* JSDocTypedefTag */:
+            case 242 /* InterfaceDeclaration */: return "interface" /* interfaceElement */;
+            case 243 /* TypeAliasDeclaration */:
+            case 304 /* JSDocCallbackTag */:
+            case 311 /* JSDocTypedefTag */:
                 return "type" /* typeElement */;
-            case 243 /* EnumDeclaration */: return "enum" /* enumElement */;
-            case 237 /* VariableDeclaration */:
+            case 244 /* EnumDeclaration */: return "enum" /* enumElement */;
+            case 238 /* VariableDeclaration */:
                 return getKindOfVariableDeclaration(node);
-            case 186 /* BindingElement */:
+            case 187 /* BindingElement */:
                 return getKindOfVariableDeclaration(ts.getRootDeclaration(node));
-            case 197 /* ArrowFunction */:
-            case 239 /* FunctionDeclaration */:
-            case 196 /* FunctionExpression */:
+            case 198 /* ArrowFunction */:
+            case 240 /* FunctionDeclaration */:
+            case 197 /* FunctionExpression */:
                 return "function" /* functionElement */;
-            case 158 /* GetAccessor */: return "getter" /* memberGetAccessorElement */;
-            case 159 /* SetAccessor */: return "setter" /* memberSetAccessorElement */;
-            case 156 /* MethodDeclaration */:
-            case 155 /* MethodSignature */:
+            case 159 /* GetAccessor */: return "getter" /* memberGetAccessorElement */;
+            case 160 /* SetAccessor */: return "setter" /* memberSetAccessorElement */;
+            case 157 /* MethodDeclaration */:
+            case 156 /* MethodSignature */:
                 return "method" /* memberFunctionElement */;
-            case 154 /* PropertyDeclaration */:
-            case 153 /* PropertySignature */:
+            case 155 /* PropertyDeclaration */:
+            case 154 /* PropertySignature */:
                 return "property" /* memberVariableElement */;
-            case 162 /* IndexSignature */: return "index" /* indexSignatureElement */;
-            case 161 /* ConstructSignature */: return "construct" /* constructSignatureElement */;
-            case 160 /* CallSignature */: return "call" /* callSignatureElement */;
-            case 157 /* Constructor */: return "constructor" /* constructorImplementationElement */;
-            case 150 /* TypeParameter */: return "type parameter" /* typeParameterElement */;
-            case 278 /* EnumMember */: return "enum member" /* enumMemberElement */;
-            case 151 /* Parameter */: return ts.hasModifier(node, 92 /* ParameterPropertyModifier */) ? "property" /* memberVariableElement */ : "parameter" /* parameterElement */;
-            case 248 /* ImportEqualsDeclaration */:
-            case 253 /* ImportSpecifier */:
-            case 257 /* ExportSpecifier */:
-            case 251 /* NamespaceImport */:
+            case 163 /* IndexSignature */: return "index" /* indexSignatureElement */;
+            case 162 /* ConstructSignature */: return "construct" /* constructSignatureElement */;
+            case 161 /* CallSignature */: return "call" /* callSignatureElement */;
+            case 158 /* Constructor */: return "constructor" /* constructorImplementationElement */;
+            case 151 /* TypeParameter */: return "type parameter" /* typeParameterElement */;
+            case 279 /* EnumMember */: return "enum member" /* enumMemberElement */;
+            case 152 /* Parameter */: return ts.hasModifier(node, 92 /* ParameterPropertyModifier */) ? "property" /* memberVariableElement */ : "parameter" /* parameterElement */;
+            case 249 /* ImportEqualsDeclaration */:
+            case 254 /* ImportSpecifier */:
+            case 258 /* ExportSpecifier */:
+            case 252 /* NamespaceImport */:
                 return "alias" /* alias */;
-            case 204 /* BinaryExpression */:
+            case 205 /* BinaryExpression */:
                 var kind = ts.getAssignmentDeclarationKind(node);
                 var right = node.right;
                 switch (kind) {
@@ -95248,7 +98186,7 @@ var ts;
                         return "" /* unknown */;
                     }
                 }
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 return ts.isImportClause(node.parent) ? "alias" /* alias */ : "" /* unknown */;
             default:
                 return "" /* unknown */;
@@ -95264,12 +98202,12 @@ var ts;
     ts.getNodeKind = getNodeKind;
     function isThis(node) {
         switch (node.kind) {
-            case 100 /* ThisKeyword */:
+            case 101 /* ThisKeyword */:
                 // case SyntaxKind.ThisType: TODO: GH#9267
                 return true;
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 // 'this' as a parameter
-                return ts.identifierIsThisKeyword(node) && node.parent.kind === 151 /* Parameter */;
+                return ts.identifierIsThisKeyword(node) && node.parent.kind === 152 /* Parameter */;
             default:
                 return false;
         }
@@ -95334,42 +98272,42 @@ var ts;
             return false;
         }
         switch (n.kind) {
-            case 240 /* ClassDeclaration */:
-            case 241 /* InterfaceDeclaration */:
-            case 243 /* EnumDeclaration */:
-            case 188 /* ObjectLiteralExpression */:
-            case 184 /* ObjectBindingPattern */:
-            case 168 /* TypeLiteral */:
-            case 218 /* Block */:
-            case 245 /* ModuleBlock */:
-            case 246 /* CaseBlock */:
-            case 252 /* NamedImports */:
-            case 256 /* NamedExports */:
+            case 241 /* ClassDeclaration */:
+            case 242 /* InterfaceDeclaration */:
+            case 244 /* EnumDeclaration */:
+            case 189 /* ObjectLiteralExpression */:
+            case 185 /* ObjectBindingPattern */:
+            case 169 /* TypeLiteral */:
+            case 219 /* Block */:
+            case 246 /* ModuleBlock */:
+            case 247 /* CaseBlock */:
+            case 253 /* NamedImports */:
+            case 257 /* NamedExports */:
                 return nodeEndsWith(n, 19 /* CloseBraceToken */, sourceFile);
-            case 274 /* CatchClause */:
+            case 275 /* CatchClause */:
                 return isCompletedNode(n.block, sourceFile);
-            case 192 /* NewExpression */:
+            case 193 /* NewExpression */:
                 if (!n.arguments) {
                     return true;
                 }
             // falls through
-            case 191 /* CallExpression */:
-            case 195 /* ParenthesizedExpression */:
-            case 177 /* ParenthesizedType */:
+            case 192 /* CallExpression */:
+            case 196 /* ParenthesizedExpression */:
+            case 178 /* ParenthesizedType */:
                 return nodeEndsWith(n, 21 /* CloseParenToken */, sourceFile);
-            case 165 /* FunctionType */:
-            case 166 /* ConstructorType */:
+            case 166 /* FunctionType */:
+            case 167 /* ConstructorType */:
                 return isCompletedNode(n.type, sourceFile);
-            case 157 /* Constructor */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
-            case 239 /* FunctionDeclaration */:
-            case 196 /* FunctionExpression */:
-            case 156 /* MethodDeclaration */:
-            case 155 /* MethodSignature */:
-            case 161 /* ConstructSignature */:
-            case 160 /* CallSignature */:
-            case 197 /* ArrowFunction */:
+            case 158 /* Constructor */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
+            case 240 /* FunctionDeclaration */:
+            case 197 /* FunctionExpression */:
+            case 157 /* MethodDeclaration */:
+            case 156 /* MethodSignature */:
+            case 162 /* ConstructSignature */:
+            case 161 /* CallSignature */:
+            case 198 /* ArrowFunction */:
                 if (n.body) {
                     return isCompletedNode(n.body, sourceFile);
                 }
@@ -95379,65 +98317,65 @@ var ts;
                 // Even though type parameters can be unclosed, we can get away with
                 // having at least a closing paren.
                 return hasChildOfKind(n, 21 /* CloseParenToken */, sourceFile);
-            case 244 /* ModuleDeclaration */:
+            case 245 /* ModuleDeclaration */:
                 return !!n.body && isCompletedNode(n.body, sourceFile);
-            case 222 /* IfStatement */:
+            case 223 /* IfStatement */:
                 if (n.elseStatement) {
                     return isCompletedNode(n.elseStatement, sourceFile);
                 }
                 return isCompletedNode(n.thenStatement, sourceFile);
-            case 221 /* ExpressionStatement */:
+            case 222 /* ExpressionStatement */:
                 return isCompletedNode(n.expression, sourceFile) ||
                     hasChildOfKind(n, 26 /* SemicolonToken */, sourceFile);
-            case 187 /* ArrayLiteralExpression */:
-            case 185 /* ArrayBindingPattern */:
-            case 190 /* ElementAccessExpression */:
-            case 149 /* ComputedPropertyName */:
-            case 170 /* TupleType */:
+            case 188 /* ArrayLiteralExpression */:
+            case 186 /* ArrayBindingPattern */:
+            case 191 /* ElementAccessExpression */:
+            case 150 /* ComputedPropertyName */:
+            case 171 /* TupleType */:
                 return nodeEndsWith(n, 23 /* CloseBracketToken */, sourceFile);
-            case 162 /* IndexSignature */:
+            case 163 /* IndexSignature */:
                 if (n.type) {
                     return isCompletedNode(n.type, sourceFile);
                 }
                 return hasChildOfKind(n, 23 /* CloseBracketToken */, sourceFile);
-            case 271 /* CaseClause */:
-            case 272 /* DefaultClause */:
+            case 272 /* CaseClause */:
+            case 273 /* DefaultClause */:
                 // there is no such thing as terminator token for CaseClause/DefaultClause so for simplicity always consider them non-completed
                 return false;
-            case 225 /* ForStatement */:
-            case 226 /* ForInStatement */:
-            case 227 /* ForOfStatement */:
-            case 224 /* WhileStatement */:
+            case 226 /* ForStatement */:
+            case 227 /* ForInStatement */:
+            case 228 /* ForOfStatement */:
+            case 225 /* WhileStatement */:
                 return isCompletedNode(n.statement, sourceFile);
-            case 223 /* DoStatement */:
+            case 224 /* DoStatement */:
                 // rough approximation: if DoStatement has While keyword - then if node is completed is checking the presence of ')';
-                return hasChildOfKind(n, 107 /* WhileKeyword */, sourceFile)
+                return hasChildOfKind(n, 108 /* WhileKeyword */, sourceFile)
                     ? nodeEndsWith(n, 21 /* CloseParenToken */, sourceFile)
                     : isCompletedNode(n.statement, sourceFile);
-            case 167 /* TypeQuery */:
+            case 168 /* TypeQuery */:
                 return isCompletedNode(n.exprName, sourceFile);
-            case 199 /* TypeOfExpression */:
-            case 198 /* DeleteExpression */:
-            case 200 /* VoidExpression */:
-            case 207 /* YieldExpression */:
-            case 208 /* SpreadElement */:
+            case 200 /* TypeOfExpression */:
+            case 199 /* DeleteExpression */:
+            case 201 /* VoidExpression */:
+            case 208 /* YieldExpression */:
+            case 209 /* SpreadElement */:
                 var unaryWordExpression = n;
                 return isCompletedNode(unaryWordExpression.expression, sourceFile);
-            case 193 /* TaggedTemplateExpression */:
+            case 194 /* TaggedTemplateExpression */:
                 return isCompletedNode(n.template, sourceFile);
-            case 206 /* TemplateExpression */:
+            case 207 /* TemplateExpression */:
                 var lastSpan = ts.lastOrUndefined(n.templateSpans);
                 return isCompletedNode(lastSpan, sourceFile);
-            case 216 /* TemplateSpan */:
+            case 217 /* TemplateSpan */:
                 return ts.nodeIsPresent(n.literal);
-            case 255 /* ExportDeclaration */:
-            case 249 /* ImportDeclaration */:
+            case 256 /* ExportDeclaration */:
+            case 250 /* ImportDeclaration */:
                 return ts.nodeIsPresent(n.moduleSpecifier);
-            case 202 /* PrefixUnaryExpression */:
+            case 203 /* PrefixUnaryExpression */:
                 return isCompletedNode(n.operand, sourceFile);
-            case 204 /* BinaryExpression */:
+            case 205 /* BinaryExpression */:
                 return isCompletedNode(n.right, sourceFile);
-            case 205 /* ConditionalExpression */:
+            case 206 /* ConditionalExpression */:
                 return isCompletedNode(n.whenFalse, sourceFile);
             default:
                 return true;
@@ -95616,7 +98554,7 @@ var ts;
                     }
                 }
             }
-            ts.Debug.assert(startNode !== undefined || n.kind === 284 /* SourceFile */ || n.kind === 1 /* EndOfFileToken */ || ts.isJSDocCommentContainingNode(n));
+            ts.Debug.assert(startNode !== undefined || n.kind === 285 /* SourceFile */ || n.kind === 1 /* EndOfFileToken */ || ts.isJSDocCommentContainingNode(n));
             // Here we know that none of child token nodes embrace the position,
             // the only known case is when position is at the end of the file.
             // Try to find the rightmost token in the file without filtering.
@@ -95686,24 +98624,24 @@ var ts;
             return true;
         }
         // <div> { | </div> or <div a={| </div>
-        if (token.kind === 28 /* LessThanToken */ && token.parent.kind === 270 /* JsxExpression */) {
+        if (token.kind === 28 /* LessThanToken */ && token.parent.kind === 271 /* JsxExpression */) {
             return true;
         }
         // <div> {
         // |
         // } < /div>
-        if (token && token.kind === 19 /* CloseBraceToken */ && token.parent.kind === 270 /* JsxExpression */) {
+        if (token && token.kind === 19 /* CloseBraceToken */ && token.parent.kind === 271 /* JsxExpression */) {
             return true;
         }
         // <div>|</div>
-        if (token.kind === 28 /* LessThanToken */ && token.parent.kind === 263 /* JsxClosingElement */) {
+        if (token.kind === 28 /* LessThanToken */ && token.parent.kind === 264 /* JsxClosingElement */) {
             return true;
         }
         return false;
     }
     ts.isInsideJsxElementOrAttribute = isInsideJsxElementOrAttribute;
     function isWhiteSpaceOnlyJsxText(node) {
-        return ts.isJsxText(node) && node.containsOnlyWhiteSpaces;
+        return ts.isJsxText(node) && node.containsOnlyTriviaWhiteSpaces;
     }
     function isInTemplateString(sourceFile, position) {
         var token = getTokenAtPosition(sourceFile, position);
@@ -95815,15 +98753,15 @@ var ts;
                     nTypeArguments++;
                     break;
                 case 37 /* EqualsGreaterThanToken */:
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                 case 10 /* StringLiteral */:
                 case 8 /* NumericLiteral */:
                 case 9 /* BigIntLiteral */:
-                case 102 /* TrueKeyword */:
-                case 87 /* FalseKeyword */:
-                case 104 /* TypeOfKeyword */:
-                case 86 /* ExtendsKeyword */:
-                case 129 /* KeyOfKeyword */:
+                case 103 /* TrueKeyword */:
+                case 88 /* FalseKeyword */:
+                case 105 /* TypeOfKeyword */:
+                case 87 /* ExtendsKeyword */:
+                case 130 /* KeyOfKeyword */:
                 case 24 /* DotToken */:
                 case 50 /* BarToken */:
                 case 56 /* QuestionToken */:
@@ -95882,10 +98820,10 @@ var ts;
     }
     ts.getNodeModifiers = getNodeModifiers;
     function getTypeArgumentOrTypeParameterList(node) {
-        if (node.kind === 164 /* TypeReference */ || node.kind === 191 /* CallExpression */) {
+        if (node.kind === 165 /* TypeReference */ || node.kind === 192 /* CallExpression */) {
             return node.typeArguments;
         }
-        if (ts.isFunctionLike(node) || node.kind === 240 /* ClassDeclaration */ || node.kind === 241 /* InterfaceDeclaration */) {
+        if (ts.isFunctionLike(node) || node.kind === 241 /* ClassDeclaration */ || node.kind === 242 /* InterfaceDeclaration */) {
             return node.typeParameters;
         }
         return undefined;
@@ -95905,7 +98843,7 @@ var ts;
     }
     ts.isStringOrRegularExpressionOrTemplateLiteral = isStringOrRegularExpressionOrTemplateLiteral;
     function isPunctuation(kind) {
-        return 18 /* FirstPunctuation */ <= kind && kind <= 71 /* LastPunctuation */;
+        return 18 /* FirstPunctuation */ <= kind && kind <= 72 /* LastPunctuation */;
     }
     ts.isPunctuation = isPunctuation;
     function isInsideTemplateLiteral(node, position, sourceFile) {
@@ -95915,9 +98853,9 @@ var ts;
     ts.isInsideTemplateLiteral = isInsideTemplateLiteral;
     function isAccessibilityModifier(kind) {
         switch (kind) {
-            case 115 /* PublicKeyword */:
-            case 113 /* PrivateKeyword */:
-            case 114 /* ProtectedKeyword */:
+            case 116 /* PublicKeyword */:
+            case 114 /* PrivateKeyword */:
+            case 115 /* ProtectedKeyword */:
                 return true;
         }
         return false;
@@ -95930,18 +98868,18 @@ var ts;
     }
     ts.cloneCompilerOptions = cloneCompilerOptions;
     function isArrayLiteralOrObjectLiteralDestructuringPattern(node) {
-        if (node.kind === 187 /* ArrayLiteralExpression */ ||
-            node.kind === 188 /* ObjectLiteralExpression */) {
+        if (node.kind === 188 /* ArrayLiteralExpression */ ||
+            node.kind === 189 /* ObjectLiteralExpression */) {
             // [a,b,c] from:
             // [a, b, c] = someExpression;
-            if (node.parent.kind === 204 /* BinaryExpression */ &&
+            if (node.parent.kind === 205 /* BinaryExpression */ &&
                 node.parent.left === node &&
-                node.parent.operatorToken.kind === 59 /* EqualsToken */) {
+                node.parent.operatorToken.kind === 60 /* EqualsToken */) {
                 return true;
             }
             // [a, b, c] from:
             // for([a, b, c] of expression)
-            if (node.parent.kind === 227 /* ForOfStatement */ &&
+            if (node.parent.kind === 228 /* ForOfStatement */ &&
                 node.parent.initializer === node) {
                 return true;
             }
@@ -95949,7 +98887,7 @@ var ts;
             // [x, [a, b, c] ] = someExpression
             // or
             // {x, a: {a, b, c} } = someExpression
-            if (isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent.kind === 275 /* PropertyAssignment */ ? node.parent.parent : node.parent)) {
+            if (isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent.kind === 276 /* PropertyAssignment */ ? node.parent.parent : node.parent)) {
                 return true;
             }
         }
@@ -95968,8 +98906,8 @@ var ts;
         var range = isInComment(sourceFile, position, /*tokenAtPosition*/ undefined);
         return !!range && shouldBeReference === tripleSlashDirectivePrefixRegex.test(sourceFile.text.substring(range.pos, range.end));
     }
-    function createTextSpanFromNode(node, sourceFile) {
-        return ts.createTextSpanFromBounds(node.getStart(sourceFile), node.getEnd());
+    function createTextSpanFromNode(node, sourceFile, endNode) {
+        return ts.createTextSpanFromBounds(node.getStart(sourceFile), (endNode || node).getEnd());
     }
     ts.createTextSpanFromNode = createTextSpanFromNode;
     function createTextRangeFromNode(node, sourceFile) {
@@ -95993,22 +98931,23 @@ var ts;
     }
     ts.createTextChange = createTextChange;
     ts.typeKeywords = [
-        120 /* AnyKeyword */,
-        146 /* BigIntKeyword */,
-        123 /* BooleanKeyword */,
-        87 /* FalseKeyword */,
-        129 /* KeyOfKeyword */,
-        132 /* NeverKeyword */,
-        96 /* NullKeyword */,
-        135 /* NumberKeyword */,
-        136 /* ObjectKeyword */,
-        138 /* StringKeyword */,
-        139 /* SymbolKeyword */,
-        102 /* TrueKeyword */,
-        106 /* VoidKeyword */,
-        141 /* UndefinedKeyword */,
-        142 /* UniqueKeyword */,
-        143 /* UnknownKeyword */,
+        121 /* AnyKeyword */,
+        147 /* BigIntKeyword */,
+        124 /* BooleanKeyword */,
+        88 /* FalseKeyword */,
+        130 /* KeyOfKeyword */,
+        133 /* NeverKeyword */,
+        97 /* NullKeyword */,
+        136 /* NumberKeyword */,
+        137 /* ObjectKeyword */,
+        134 /* ReadonlyKeyword */,
+        139 /* StringKeyword */,
+        140 /* SymbolKeyword */,
+        103 /* TrueKeyword */,
+        107 /* VoidKeyword */,
+        142 /* UndefinedKeyword */,
+        143 /* UniqueKeyword */,
+        144 /* UnknownKeyword */,
     ];
     function isTypeKeyword(kind) {
         return ts.contains(ts.typeKeywords, kind);
@@ -96044,7 +98983,7 @@ var ts;
     }
     ts.skipConstraint = skipConstraint;
     function getNameFromPropertyName(name) {
-        return name.kind === 149 /* ComputedPropertyName */
+        return name.kind === 150 /* ComputedPropertyName */
             // treat computed property names where expression is string/numeric literal as just string/numeric literal
             ? ts.isStringOrNumericLiteralLike(name.expression) ? name.expression.text : undefined
             : ts.getTextOfIdentifierOrLiteral(name);
@@ -96120,7 +99059,7 @@ var ts;
         }
         return ts.firstDefined(symbol.declarations, function (decl) {
             var name = ts.getNameOfDeclaration(decl);
-            return name && name.kind === 72 /* Identifier */ ? name.escapedText : undefined;
+            return name && name.kind === 73 /* Identifier */ ? name.escapedText : undefined;
         });
     }
     ts.symbolEscapedNameNoDefault = symbolEscapedNameNoDefault;
@@ -96209,7 +99148,7 @@ var ts;
 /* @internal */
 (function (ts) {
     function isFirstDeclarationOfSymbolParameter(symbol) {
-        return symbol.declarations && symbol.declarations.length > 0 && symbol.declarations[0].kind === 151 /* Parameter */;
+        return symbol.declarations && symbol.declarations.length > 0 && symbol.declarations[0].kind === 152 /* Parameter */;
     }
     ts.isFirstDeclarationOfSymbolParameter = isFirstDeclarationOfSymbolParameter;
     var displayPartWriter = getDisplayPartWriter();
@@ -96431,23 +99370,6 @@ var ts;
         return !!location.parent && ts.isImportOrExportSpecifier(location.parent) && location.parent.propertyName === location;
     }
     ts.isImportOrExportSpecifierName = isImportOrExportSpecifierName;
-    /**
-     * Strip off existed single quotes or double quotes from a given string
-     *
-     * @return non-quoted string
-     */
-    function stripQuotes(name) {
-        var length = name.length;
-        if (length >= 2 && name.charCodeAt(0) === name.charCodeAt(length - 1) && startsWithQuote(name)) {
-            return name.substring(1, length - 1);
-        }
-        return name;
-    }
-    ts.stripQuotes = stripQuotes;
-    function startsWithQuote(name) {
-        return ts.isSingleOrDoubleQuote(name.charCodeAt(0));
-    }
-    ts.startsWithQuote = startsWithQuote;
     function scriptKindIs(fileName, host) {
         var scriptKinds = [];
         for (var _i = 2; _i < arguments.length; _i++) {
@@ -96463,10 +99385,15 @@ var ts;
         return ts.ensureScriptKind(fileName, host && host.getScriptKind && host.getScriptKind(fileName));
     }
     ts.getScriptKind = getScriptKind;
-    function getSymbolTarget(symbol) {
+    function getSymbolTarget(symbol, checker) {
         var next = symbol;
-        while (isTransientSymbol(next) && next.target) {
-            next = next.target;
+        while (isAliasSymbol(next) || (isTransientSymbol(next) && next.target)) {
+            if (isTransientSymbol(next) && next.target) {
+                next = next.target;
+            }
+            else {
+                next = ts.skipAlias(next, checker);
+            }
         }
         return next;
     }
@@ -96474,6 +99401,9 @@ var ts;
     function isTransientSymbol(symbol) {
         return (symbol.flags & 33554432 /* Transient */) !== 0;
     }
+    function isAliasSymbol(symbol) {
+        return (symbol.flags & 2097152 /* Alias */) !== 0;
+    }
     function getUniqueSymbolId(symbol, checker) {
         return ts.getSymbolId(ts.skipAlias(symbol, checker));
     }
@@ -96509,7 +99439,14 @@ var ts;
     function getSynthesizedDeepCloneWithRenames(node, includeTrivia, renameMap, checker, callback) {
         if (includeTrivia === void 0) { includeTrivia = true; }
         var clone;
-        if (ts.isIdentifier(node) && renameMap && checker) {
+        if (renameMap && checker && ts.isBindingElement(node) && ts.isIdentifier(node.name) && ts.isObjectBindingPattern(node.parent)) {
+            var symbol = checker.getSymbolAtLocation(node.name);
+            var renameInfo = symbol && renameMap.get(String(ts.getSymbolId(symbol)));
+            if (renameInfo && renameInfo.text !== (node.name || node.propertyName).getText()) {
+                clone = ts.createBindingElement(node.dotDotDotToken, node.propertyName || node.name, renameInfo, node.initializer);
+            }
+        }
+        else if (renameMap && checker && ts.isIdentifier(node)) {
             var symbol = checker.getSymbolAtLocation(node);
             var renameInfo = symbol && renameMap.get(String(ts.getSymbolId(symbol)));
             if (renameInfo) {
@@ -96673,15 +99610,15 @@ var ts;
     function getContextualTypeFromParent(node, checker) {
         var parent = node.parent;
         switch (parent.kind) {
-            case 192 /* NewExpression */:
+            case 193 /* NewExpression */:
                 return checker.getContextualType(parent);
-            case 204 /* BinaryExpression */: {
+            case 205 /* BinaryExpression */: {
                 var _a = parent, left = _a.left, operatorToken = _a.operatorToken, right = _a.right;
                 return isEqualityOperatorKind(operatorToken.kind)
                     ? checker.getTypeAtLocation(node === right ? left : right)
                     : checker.getContextualType(node);
             }
-            case 271 /* CaseClause */:
+            case 272 /* CaseClause */:
                 return parent.expression === node ? getSwitchedType(parent, checker) : undefined;
             default:
                 return checker.getContextualType(node);
@@ -96701,7 +99638,7 @@ var ts;
             case "double":
                 return quoted;
             case "single":
-                return "'" + stripQuotes(quoted).replace("'", "\\'").replace('\\"', '"') + "'";
+                return "'" + ts.stripQuotes(quoted).replace("'", "\\'").replace('\\"', '"') + "'";
             default:
                 return ts.Debug.assertNever(quotePreference);
         }
@@ -96723,8 +99660,8 @@ var ts;
         switch (node.kind) {
             case 10 /* StringLiteral */:
             case 14 /* NoSubstitutionTemplateLiteral */:
-            case 206 /* TemplateExpression */:
-            case 193 /* TaggedTemplateExpression */:
+            case 207 /* TemplateExpression */:
+            case 194 /* TaggedTemplateExpression */:
                 return true;
             default:
                 return false;
@@ -96763,11 +99700,55 @@ var ts;
         return typeIsAccessible ? res : undefined;
     }
     ts.getTypeNodeIfAccessible = getTypeNodeIfAccessible;
+    function syntaxUsuallyHasTrailingSemicolon(kind) {
+        return kind === 220 /* VariableStatement */
+            || kind === 222 /* ExpressionStatement */
+            || kind === 224 /* DoStatement */
+            || kind === 229 /* ContinueStatement */
+            || kind === 230 /* BreakStatement */
+            || kind === 231 /* ReturnStatement */
+            || kind === 235 /* ThrowStatement */
+            || kind === 237 /* DebuggerStatement */
+            || kind === 155 /* PropertyDeclaration */
+            || kind === 243 /* TypeAliasDeclaration */
+            || kind === 250 /* ImportDeclaration */
+            || kind === 249 /* ImportEqualsDeclaration */
+            || kind === 256 /* ExportDeclaration */;
+    }
+    ts.syntaxUsuallyHasTrailingSemicolon = syntaxUsuallyHasTrailingSemicolon;
+    function probablyUsesSemicolons(sourceFile) {
+        var withSemicolon = 0;
+        var withoutSemicolon = 0;
+        var nStatementsToObserve = 5;
+        ts.forEachChild(sourceFile, function visit(node) {
+            if (syntaxUsuallyHasTrailingSemicolon(node.kind)) {
+                var lastToken = node.getLastToken(sourceFile);
+                if (lastToken && lastToken.kind === 26 /* SemicolonToken */) {
+                    withSemicolon++;
+                }
+                else {
+                    withoutSemicolon++;
+                }
+            }
+            if (withSemicolon + withoutSemicolon >= nStatementsToObserve) {
+                return true;
+            }
+            return ts.forEachChild(node, visit);
+        });
+        // One statement missing a semicolon isn’t sufficient evidence to say the user
+        // doesn’t want semicolons, because they may not even be done writing that statement.
+        if (withSemicolon === 0 && withoutSemicolon <= 1) {
+            return true;
+        }
+        // If even 2/5 places have a semicolon, the user probably wants semicolons
+        return withSemicolon / withoutSemicolon > 1 / nStatementsToObserve;
+    }
+    ts.probablyUsesSemicolons = probablyUsesSemicolons;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
     function createClassifier() {
-        var scanner = ts.createScanner(7 /* Latest */, /*skipTrivia*/ false);
+        var scanner = ts.createScanner(99 /* Latest */, /*skipTrivia*/ false);
         function getClassificationsForLine(text, lexState, syntacticClassifierAbsent) {
             return convertClassificationsToResult(getEncodedLexicalClassifications(text, lexState, syntacticClassifierAbsent), text);
         }
@@ -96844,13 +99825,13 @@ var ts;
             function handleToken() {
                 switch (token) {
                     case 42 /* SlashToken */:
-                    case 64 /* SlashEqualsToken */:
+                    case 65 /* SlashEqualsToken */:
                         if (!noRegexTable[lastNonTriviaToken] && scanner.reScanSlashToken() === 13 /* RegularExpressionLiteral */) {
                             token = 13 /* RegularExpressionLiteral */;
                         }
                         break;
                     case 28 /* LessThanToken */:
-                        if (lastNonTriviaToken === 72 /* Identifier */) {
+                        if (lastNonTriviaToken === 73 /* Identifier */) {
                             // Could be the start of something generic.  Keep track of that by bumping
                             // up the current count of generic contexts we may be in.
                             angleBracketStack++;
@@ -96863,16 +99844,16 @@ var ts;
                             angleBracketStack--;
                         }
                         break;
-                    case 120 /* AnyKeyword */:
-                    case 138 /* StringKeyword */:
-                    case 135 /* NumberKeyword */:
-                    case 123 /* BooleanKeyword */:
-                    case 139 /* SymbolKeyword */:
+                    case 121 /* AnyKeyword */:
+                    case 139 /* StringKeyword */:
+                    case 136 /* NumberKeyword */:
+                    case 124 /* BooleanKeyword */:
+                    case 140 /* SymbolKeyword */:
                         if (angleBracketStack > 0 && !syntacticClassifierAbsent) {
                             // If it looks like we're could be in something generic, don't classify this
                             // as a keyword.  We may just get overwritten by the syntactic classifier,
                             // causing a noisy experience for the user.
-                            token = 72 /* Identifier */;
+                            token = 73 /* Identifier */;
                         }
                         break;
                     case 15 /* TemplateHead */:
@@ -96911,14 +99892,14 @@ var ts;
                             break;
                         }
                         if (lastNonTriviaToken === 24 /* DotToken */) {
-                            token = 72 /* Identifier */;
+                            token = 73 /* Identifier */;
                         }
                         else if (ts.isKeyword(lastNonTriviaToken) && ts.isKeyword(token) && !canFollow(lastNonTriviaToken, token)) {
                             // We have two keywords in a row.  Only treat the second as a keyword if
                             // it's a sequence that could legally occur in the language.  Otherwise
                             // treat it as an identifier.  This way, if someone writes "private var"
                             // we recognize that 'var' is actually an identifier here.
-                            token = 72 /* Identifier */;
+                            token = 73 /* Identifier */;
                         }
                 }
             }
@@ -96932,19 +99913,19 @@ var ts;
     /// we have a series of divide operator. this list allows us to be more accurate by ruling out
     /// locations where a regexp cannot exist.
     var noRegexTable = ts.arrayToNumericMap([
-        72 /* Identifier */,
+        73 /* Identifier */,
         10 /* StringLiteral */,
         8 /* NumericLiteral */,
         9 /* BigIntLiteral */,
         13 /* RegularExpressionLiteral */,
-        100 /* ThisKeyword */,
+        101 /* ThisKeyword */,
         44 /* PlusPlusToken */,
         45 /* MinusMinusToken */,
         21 /* CloseParenToken */,
         23 /* CloseBracketToken */,
         19 /* CloseBraceToken */,
-        102 /* TrueKeyword */,
-        87 /* FalseKeyword */,
+        103 /* TrueKeyword */,
+        88 /* FalseKeyword */,
     ], function (token) { return token; }, function () { return true; });
     function getNewEndOfLineState(scanner, token, lastOnTemplateStack) {
         switch (token) {
@@ -97056,10 +100037,10 @@ var ts;
             return true;
         }
         switch (keyword2) {
-            case 126 /* GetKeyword */:
-            case 137 /* SetKeyword */:
-            case 124 /* ConstructorKeyword */:
-            case 116 /* StaticKeyword */:
+            case 127 /* GetKeyword */:
+            case 138 /* SetKeyword */:
+            case 125 /* ConstructorKeyword */:
+            case 117 /* StaticKeyword */:
                 return true; // Allow things like "public get", "public constructor" and "public static".
             default:
                 return false; // Any other keyword following "public" is actually an identifier, not a real keyword.
@@ -97104,9 +100085,9 @@ var ts;
             case 30 /* GreaterThanToken */:
             case 31 /* LessThanEqualsToken */:
             case 32 /* GreaterThanEqualsToken */:
-            case 94 /* InstanceOfKeyword */:
-            case 93 /* InKeyword */:
-            case 119 /* AsKeyword */:
+            case 95 /* InstanceOfKeyword */:
+            case 94 /* InKeyword */:
+            case 120 /* AsKeyword */:
             case 33 /* EqualsEqualsToken */:
             case 34 /* ExclamationEqualsToken */:
             case 35 /* EqualsEqualsEqualsToken */:
@@ -97116,18 +100097,18 @@ var ts;
             case 50 /* BarToken */:
             case 54 /* AmpersandAmpersandToken */:
             case 55 /* BarBarToken */:
-            case 70 /* BarEqualsToken */:
-            case 69 /* AmpersandEqualsToken */:
-            case 71 /* CaretEqualsToken */:
-            case 66 /* LessThanLessThanEqualsToken */:
-            case 67 /* GreaterThanGreaterThanEqualsToken */:
-            case 68 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
-            case 60 /* PlusEqualsToken */:
-            case 61 /* MinusEqualsToken */:
-            case 62 /* AsteriskEqualsToken */:
-            case 64 /* SlashEqualsToken */:
-            case 65 /* PercentEqualsToken */:
-            case 59 /* EqualsToken */:
+            case 71 /* BarEqualsToken */:
+            case 70 /* AmpersandEqualsToken */:
+            case 72 /* CaretEqualsToken */:
+            case 67 /* LessThanLessThanEqualsToken */:
+            case 68 /* GreaterThanGreaterThanEqualsToken */:
+            case 69 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
+            case 61 /* PlusEqualsToken */:
+            case 62 /* MinusEqualsToken */:
+            case 63 /* AsteriskEqualsToken */:
+            case 65 /* SlashEqualsToken */:
+            case 66 /* PercentEqualsToken */:
+            case 60 /* EqualsToken */:
             case 27 /* CommaToken */:
                 return true;
             default:
@@ -97154,7 +100135,7 @@ var ts;
         else if (isBinaryExpressionOperatorToken(token) || isPrefixUnaryExpressionOperatorToken(token)) {
             return 5 /* operator */;
         }
-        else if (token >= 18 /* FirstPunctuation */ && token <= 71 /* LastPunctuation */) {
+        else if (token >= 18 /* FirstPunctuation */ && token <= 72 /* LastPunctuation */) {
             return 10 /* punctuation */;
         }
         switch (token) {
@@ -97173,7 +100154,7 @@ var ts;
             case 5 /* WhitespaceTrivia */:
             case 4 /* NewLineTrivia */:
                 return 8 /* whiteSpace */;
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
             default:
                 if (ts.isTemplateLiteralKind(token)) {
                     return 6 /* stringLiteral */;
@@ -97198,10 +100179,10 @@ var ts;
         // That means we're calling back into the host around every 1.2k of the file we process.
         // Lib.d.ts has similar numbers.
         switch (kind) {
-            case 244 /* ModuleDeclaration */:
-            case 240 /* ClassDeclaration */:
-            case 241 /* InterfaceDeclaration */:
-            case 239 /* FunctionDeclaration */:
+            case 245 /* ModuleDeclaration */:
+            case 241 /* ClassDeclaration */:
+            case 242 /* InterfaceDeclaration */:
+            case 240 /* FunctionDeclaration */:
                 cancellationToken.throwIfCancellationRequested();
         }
     }
@@ -97321,8 +100302,8 @@ var ts;
         var spanStart = span.start;
         var spanLength = span.length;
         // Make a scanner we can get trivia from.
-        var triviaScanner = ts.createScanner(7 /* Latest */, /*skipTrivia*/ false, sourceFile.languageVariant, sourceFile.text);
-        var mergeConflictScanner = ts.createScanner(7 /* Latest */, /*skipTrivia*/ false, sourceFile.languageVariant, sourceFile.text);
+        var triviaScanner = ts.createScanner(99 /* Latest */, /*skipTrivia*/ false, sourceFile.languageVariant, sourceFile.text);
+        var mergeConflictScanner = ts.createScanner(99 /* Latest */, /*skipTrivia*/ false, sourceFile.languageVariant, sourceFile.text);
         var result = [];
         processElement(sourceFile);
         return { spans: result, endOfLineState: 0 /* None */ };
@@ -97414,18 +100395,18 @@ var ts;
                     pushClassification(tag.tagName.pos, tag.tagName.end - tag.tagName.pos, 18 /* docCommentTagName */); // e.g. "param"
                     pos = tag.tagName.end;
                     switch (tag.kind) {
-                        case 304 /* JSDocParameterTag */:
+                        case 306 /* JSDocParameterTag */:
                             processJSDocParameterTag(tag);
                             break;
-                        case 308 /* JSDocTemplateTag */:
+                        case 310 /* JSDocTemplateTag */:
                             processJSDocTemplateTag(tag);
                             pos = tag.end;
                             break;
-                        case 307 /* JSDocTypeTag */:
+                        case 309 /* JSDocTypeTag */:
                             processElement(tag.typeExpression);
                             pos = tag.end;
                             break;
-                        case 305 /* JSDocReturnTag */:
+                        case 307 /* JSDocReturnTag */:
                             processElement(tag.typeExpression);
                             pos = tag.end;
                             break;
@@ -97512,22 +100493,22 @@ var ts;
         }
         function tryClassifyJsxElementName(token) {
             switch (token.parent && token.parent.kind) {
-                case 262 /* JsxOpeningElement */:
+                case 263 /* JsxOpeningElement */:
                     if (token.parent.tagName === token) {
                         return 19 /* jsxOpenTagName */;
                     }
                     break;
-                case 263 /* JsxClosingElement */:
+                case 264 /* JsxClosingElement */:
                     if (token.parent.tagName === token) {
                         return 20 /* jsxCloseTagName */;
                     }
                     break;
-                case 261 /* JsxSelfClosingElement */:
+                case 262 /* JsxSelfClosingElement */:
                     if (token.parent.tagName === token) {
                         return 21 /* jsxSelfClosingTagName */;
                     }
                     break;
-                case 267 /* JsxAttribute */:
+                case 268 /* JsxAttribute */:
                     if (token.parent.name === token) {
                         return 22 /* jsxAttribute */;
                     }
@@ -97554,19 +100535,19 @@ var ts;
             if (ts.isPunctuation(tokenKind)) {
                 if (token) {
                     var parent = token.parent;
-                    if (tokenKind === 59 /* EqualsToken */) {
+                    if (tokenKind === 60 /* EqualsToken */) {
                         // the '=' in a variable declaration is special cased here.
-                        if (parent.kind === 237 /* VariableDeclaration */ ||
-                            parent.kind === 154 /* PropertyDeclaration */ ||
-                            parent.kind === 151 /* Parameter */ ||
-                            parent.kind === 267 /* JsxAttribute */) {
+                        if (parent.kind === 238 /* VariableDeclaration */ ||
+                            parent.kind === 155 /* PropertyDeclaration */ ||
+                            parent.kind === 152 /* Parameter */ ||
+                            parent.kind === 268 /* JsxAttribute */) {
                             return 5 /* operator */;
                         }
                     }
-                    if (parent.kind === 204 /* BinaryExpression */ ||
-                        parent.kind === 202 /* PrefixUnaryExpression */ ||
-                        parent.kind === 203 /* PostfixUnaryExpression */ ||
-                        parent.kind === 205 /* ConditionalExpression */) {
+                    if (parent.kind === 205 /* BinaryExpression */ ||
+                        parent.kind === 203 /* PrefixUnaryExpression */ ||
+                        parent.kind === 204 /* PostfixUnaryExpression */ ||
+                        parent.kind === 206 /* ConditionalExpression */) {
                         return 5 /* operator */;
                     }
                 }
@@ -97580,7 +100561,7 @@ var ts;
             }
             else if (tokenKind === 10 /* StringLiteral */) {
                 // TODO: GH#18217
-                return token.parent.kind === 267 /* JsxAttribute */ ? 24 /* jsxAttributeStringLiteralValue */ : 6 /* stringLiteral */;
+                return token.parent.kind === 268 /* JsxAttribute */ ? 24 /* jsxAttributeStringLiteralValue */ : 6 /* stringLiteral */;
             }
             else if (tokenKind === 13 /* RegularExpressionLiteral */) {
                 // TODO: we should get another classification type for these literals.
@@ -97593,35 +100574,35 @@ var ts;
             else if (tokenKind === 11 /* JsxText */) {
                 return 23 /* jsxText */;
             }
-            else if (tokenKind === 72 /* Identifier */) {
+            else if (tokenKind === 73 /* Identifier */) {
                 if (token) {
                     switch (token.parent.kind) {
-                        case 240 /* ClassDeclaration */:
+                        case 241 /* ClassDeclaration */:
                             if (token.parent.name === token) {
                                 return 11 /* className */;
                             }
                             return;
-                        case 150 /* TypeParameter */:
+                        case 151 /* TypeParameter */:
                             if (token.parent.name === token) {
                                 return 15 /* typeParameterName */;
                             }
                             return;
-                        case 241 /* InterfaceDeclaration */:
+                        case 242 /* InterfaceDeclaration */:
                             if (token.parent.name === token) {
                                 return 13 /* interfaceName */;
                             }
                             return;
-                        case 243 /* EnumDeclaration */:
+                        case 244 /* EnumDeclaration */:
                             if (token.parent.name === token) {
                                 return 12 /* enumName */;
                             }
                             return;
-                        case 244 /* ModuleDeclaration */:
+                        case 245 /* ModuleDeclaration */:
                             if (token.parent.name === token) {
                                 return 14 /* moduleName */;
                             }
                             return;
-                        case 151 /* Parameter */:
+                        case 152 /* Parameter */:
                             if (token.parent.name === token) {
                                 return ts.isThisIdentifier(token) ? 3 /* keyword */ : 17 /* parameterName */;
                             }
@@ -97678,7 +100659,7 @@ var ts;
                         return convertPathCompletions(completion.paths);
                     case 1 /* Properties */: {
                         var entries = [];
-                        Completions.getCompletionEntriesFromSymbols(completion.symbols, entries, sourceFile, sourceFile, checker, 7 /* ESNext */, log, 4 /* String */, preferences); // Target will not be used, so arbitrary
+                        Completions.getCompletionEntriesFromSymbols(completion.symbols, entries, sourceFile, sourceFile, checker, 99 /* ESNext */, log, 4 /* String */, preferences); // Target will not be used, so arbitrary
                         return { isGlobalCompletion: false, isMemberCompletion: true, isNewIdentifierLocation: completion.hasIndexSignature, entries: entries };
                     }
                     case 2 /* Types */: {
@@ -97717,7 +100698,7 @@ var ts;
                 var isNewIdentifierLocation = true; // The user may type in a path that doesn't yet exist, creating a "new identifier" with respect to the collection of identifiers the server is aware of.
                 var entries = pathCompletions.map(function (_a) {
                     var name = _a.name, kind = _a.kind, span = _a.span, extension = _a.extension;
-                    return ({ name: name, kind: kind, kindModifiers: kindModifiersFromExtension(extension), sortText: "0", replacementSpan: span });
+                    return ({ name: name, kind: kind, kindModifiers: kindModifiersFromExtension(extension), sortText: Completions.SortText.LocationPriority, replacementSpan: span });
                 });
                 return { isGlobalCompletion: isGlobalCompletion, isMemberCompletion: false, isNewIdentifierLocation: isNewIdentifierLocation, entries: entries };
             }
@@ -97744,11 +100725,11 @@ var ts;
             function getStringLiteralCompletionEntries(sourceFile, node, position, typeChecker, compilerOptions, host) {
                 var parent = node.parent;
                 switch (parent.kind) {
-                    case 182 /* LiteralType */:
+                    case 183 /* LiteralType */:
                         switch (parent.parent.kind) {
-                            case 164 /* TypeReference */:
+                            case 165 /* TypeReference */:
                                 return { kind: 2 /* Types */, types: getStringLiteralTypes(typeChecker.getTypeArgumentConstraint(parent)), isNewIdentifier: false };
-                            case 180 /* IndexedAccessType */:
+                            case 181 /* IndexedAccessType */:
                                 // Get all apparent property names
                                 // i.e. interface Foo {
                                 //          foo: string;
@@ -97756,9 +100737,9 @@ var ts;
                                 //      }
                                 //      let x: Foo["/*completion position*/"]
                                 return stringLiteralCompletionsFromProperties(typeChecker.getTypeFromTypeNode(parent.parent.objectType));
-                            case 183 /* ImportType */:
+                            case 184 /* ImportType */:
                                 return { kind: 0 /* Paths */, paths: getStringLiteralCompletionsFromModuleNames(sourceFile, node, compilerOptions, host, typeChecker) };
-                            case 173 /* UnionType */: {
+                            case 174 /* UnionType */: {
                                 if (!ts.isTypeReferenceNode(parent.parent.parent))
                                     return undefined;
                                 var alreadyUsedTypes_1 = getAlreadyUsedTypesInStringLiteralUnion(parent.parent, parent);
@@ -97768,7 +100749,7 @@ var ts;
                             default:
                                 return undefined;
                         }
-                    case 275 /* PropertyAssignment */:
+                    case 276 /* PropertyAssignment */:
                         if (ts.isObjectLiteralExpression(parent.parent) && parent.name === node) {
                             // Get quoted name of properties of the object literal expression
                             // i.e. interface ConfigFiles {
@@ -97785,7 +100766,7 @@ var ts;
                             return stringLiteralCompletionsFromProperties(typeChecker.getContextualType(parent.parent));
                         }
                         return fromContextualType();
-                    case 190 /* ElementAccessExpression */: {
+                    case 191 /* ElementAccessExpression */: {
                         var _a = parent, expression = _a.expression, argumentExpression = _a.argumentExpression;
                         if (node === argumentExpression) {
                             // Get all names of properties on the expression
@@ -97798,8 +100779,8 @@ var ts;
                         }
                         return undefined;
                     }
-                    case 191 /* CallExpression */:
-                    case 192 /* NewExpression */:
+                    case 192 /* CallExpression */:
+                    case 193 /* NewExpression */:
                         if (!ts.isRequireCall(parent, /*checkArgumentIsStringLiteralLike*/ false) && !ts.isImportCall(parent)) {
                             var argumentInfo = ts.SignatureHelp.getArgumentInfoForCompletions(node, position, sourceFile);
                             // Get string literal completions from specialized signatures of the target
@@ -97808,9 +100789,9 @@ var ts;
                             return argumentInfo ? getStringLiteralCompletionsFromSignature(argumentInfo, typeChecker) : fromContextualType();
                         }
                     // falls through (is `require("")` or `import("")`)
-                    case 249 /* ImportDeclaration */:
-                    case 255 /* ExportDeclaration */:
-                    case 259 /* ExternalModuleReference */:
+                    case 250 /* ImportDeclaration */:
+                    case 256 /* ExportDeclaration */:
+                    case 260 /* ExternalModuleReference */:
                         // Get all known external module names or complete a path to a module
                         // i.e. import * as ns from "/*completion position*/";
                         //      var y = import("/*completion position*/");
@@ -98257,7 +101238,7 @@ var ts;
                 var offset = index !== -1 ? index + 1 : 0;
                 // If the range is an identifier, span is unnecessary.
                 var length = text.length - offset;
-                return length === 0 || ts.isIdentifierText(text.substr(offset, length), 7 /* ESNext */) ? undefined : ts.createTextSpan(textStart + offset, length);
+                return length === 0 || ts.isIdentifierText(text.substr(offset, length), 99 /* ESNext */) ? undefined : ts.createTextSpan(textStart + offset, length);
             }
             // Returns true if the path is explicitly relative to the script (i.e. relative to . or ..)
             function isPathRelativeToScript(path) {
@@ -98320,6 +101301,14 @@ var ts;
 (function (ts) {
     var Completions;
     (function (Completions) {
+        var SortText;
+        (function (SortText) {
+            SortText["LocationPriority"] = "0";
+            SortText["SuggestedClassMembers"] = "1";
+            SortText["GlobalsOrKeywords"] = "2";
+            SortText["AutoImportSuggestions"] = "3";
+            SortText["JavascriptIdentifiers"] = "4";
+        })(SortText = Completions.SortText || (Completions.SortText = {}));
         var SymbolOriginInfoKind;
         (function (SymbolOriginInfoKind) {
             SymbolOriginInfoKind[SymbolOriginInfoKind["ThisType"] = 0] = "ThisType";
@@ -98341,7 +101330,9 @@ var ts;
             KeywordCompletionFilters[KeywordCompletionFilters["InterfaceElementKeywords"] = 3] = "InterfaceElementKeywords";
             KeywordCompletionFilters[KeywordCompletionFilters["ConstructorParameterKeywords"] = 4] = "ConstructorParameterKeywords";
             KeywordCompletionFilters[KeywordCompletionFilters["FunctionLikeBodyKeywords"] = 5] = "FunctionLikeBodyKeywords";
-            KeywordCompletionFilters[KeywordCompletionFilters["TypeKeywords"] = 6] = "TypeKeywords";
+            KeywordCompletionFilters[KeywordCompletionFilters["TypeAssertionKeywords"] = 6] = "TypeAssertionKeywords";
+            KeywordCompletionFilters[KeywordCompletionFilters["TypeKeywords"] = 7] = "TypeKeywords";
+            KeywordCompletionFilters[KeywordCompletionFilters["Last"] = 7] = "Last";
         })(KeywordCompletionFilters || (KeywordCompletionFilters = {}));
         var GlobalsSearch;
         (function (GlobalsSearch) {
@@ -98353,14 +101344,15 @@ var ts;
             var typeChecker = program.getTypeChecker();
             var compilerOptions = program.getCompilerOptions();
             var contextToken = ts.findPrecedingToken(position, sourceFile);
-            if (triggerCharacter && !isValidTrigger(sourceFile, triggerCharacter, contextToken, position))
+            if (triggerCharacter && !ts.isInString(sourceFile, position, contextToken) && !isValidTrigger(sourceFile, triggerCharacter, contextToken, position)) {
                 return undefined;
+            }
             var stringCompletions = Completions.StringCompletions.getStringLiteralCompletions(sourceFile, position, contextToken, typeChecker, compilerOptions, host, log, preferences);
             if (stringCompletions) {
                 return stringCompletions;
             }
             if (contextToken && ts.isBreakOrContinueStatement(contextToken.parent)
-                && (contextToken.kind === 73 /* BreakKeyword */ || contextToken.kind === 78 /* ContinueKeyword */ || contextToken.kind === 72 /* Identifier */)) {
+                && (contextToken.kind === 74 /* BreakKeyword */ || contextToken.kind === 79 /* ContinueKeyword */ || contextToken.kind === 73 /* Identifier */)) {
                 return getLabelCompletionAtPosition(contextToken.parent);
             }
             var completionData = getCompletionData(program, log, sourceFile, isUncheckedFile(sourceFile, compilerOptions), position, preferences, /*detailsEntryId*/ undefined);
@@ -98387,7 +101379,7 @@ var ts;
             return { isGlobalCompletion: false, isMemberCompletion: false, isNewIdentifierLocation: false, entries: entries };
         }
         function completionInfoFromData(sourceFile, typeChecker, compilerOptions, log, completionData, preferences) {
-            var symbols = completionData.symbols, completionKind = completionData.completionKind, isInSnippetScope = completionData.isInSnippetScope, isNewIdentifierLocation = completionData.isNewIdentifierLocation, location = completionData.location, propertyAccessToConvert = completionData.propertyAccessToConvert, keywordFilters = completionData.keywordFilters, literals = completionData.literals, symbolToOriginInfoMap = completionData.symbolToOriginInfoMap, recommendedCompletion = completionData.recommendedCompletion, isJsxInitializer = completionData.isJsxInitializer;
+            var symbols = completionData.symbols, completionKind = completionData.completionKind, isInSnippetScope = completionData.isInSnippetScope, isNewIdentifierLocation = completionData.isNewIdentifierLocation, location = completionData.location, propertyAccessToConvert = completionData.propertyAccessToConvert, keywordFilters = completionData.keywordFilters, literals = completionData.literals, symbolToOriginInfoMap = completionData.symbolToOriginInfoMap, recommendedCompletion = completionData.recommendedCompletion, isJsxInitializer = completionData.isJsxInitializer, insideJsDocTagTypeExpression = completionData.insideJsDocTagTypeExpression, symbolToSortTextMap = completionData.symbolToSortTextMap;
             if (location && location.parent && ts.isJsxClosingElement(location.parent)) {
                 // In the TypeScript JSX element, if such element is not defined. When users query for completion at closing tag,
                 // instead of simply giving unknown value, the completion will return the tag-name of an associated opening-element.
@@ -98401,24 +101393,24 @@ var ts;
                     name: tagName.getFullText(sourceFile) + (hasClosingAngleBracket ? "" : ">"),
                     kind: "class" /* classElement */,
                     kindModifiers: undefined,
-                    sortText: "0",
+                    sortText: SortText.LocationPriority,
                 };
                 return { isGlobalCompletion: false, isMemberCompletion: true, isNewIdentifierLocation: false, entries: [entry] };
             }
             var entries = [];
             if (isUncheckedFile(sourceFile, compilerOptions)) {
-                var uniqueNames = getCompletionEntriesFromSymbols(symbols, entries, location, sourceFile, typeChecker, compilerOptions.target, log, completionKind, preferences, propertyAccessToConvert, isJsxInitializer, recommendedCompletion, symbolToOriginInfoMap);
+                var uniqueNames = getCompletionEntriesFromSymbols(symbols, entries, location, sourceFile, typeChecker, compilerOptions.target, log, completionKind, preferences, propertyAccessToConvert, isJsxInitializer, recommendedCompletion, symbolToOriginInfoMap, symbolToSortTextMap);
                 getJSCompletionEntries(sourceFile, location.pos, uniqueNames, compilerOptions.target, entries); // TODO: GH#18217
             }
             else {
                 if (!isNewIdentifierLocation && (!symbols || symbols.length === 0) && keywordFilters === 0 /* None */) {
                     return undefined;
                 }
-                getCompletionEntriesFromSymbols(symbols, entries, location, sourceFile, typeChecker, compilerOptions.target, log, completionKind, preferences, propertyAccessToConvert, isJsxInitializer, recommendedCompletion, symbolToOriginInfoMap);
+                getCompletionEntriesFromSymbols(symbols, entries, location, sourceFile, typeChecker, compilerOptions.target, log, completionKind, preferences, propertyAccessToConvert, isJsxInitializer, recommendedCompletion, symbolToOriginInfoMap, symbolToSortTextMap);
             }
             if (keywordFilters !== 0 /* None */) {
                 var entryNames = ts.arrayToSet(entries, function (e) { return e.name; });
-                for (var _i = 0, _a = getKeywordCompletions(keywordFilters); _i < _a.length; _i++) {
+                for (var _i = 0, _a = getKeywordCompletions(keywordFilters, !insideJsDocTagTypeExpression && ts.isSourceFileJS(sourceFile)); _i < _a.length; _i++) {
                     var keywordEntry = _a[_i];
                     if (!entryNames.has(keywordEntry.name)) {
                         entries.push(keywordEntry);
@@ -98456,7 +101448,7 @@ var ts;
                         name: realName,
                         kind: "warning" /* warning */,
                         kindModifiers: "",
-                        sortText: "1"
+                        sortText: SortText.JavascriptIdentifiers
                     });
                 }
             });
@@ -98465,14 +101457,9 @@ var ts;
             return typeof literal === "object" ? ts.pseudoBigIntToString(literal) + "n" : JSON.stringify(literal);
         };
         function createCompletionEntryForLiteral(literal) {
-            return { name: completionNameForLiteral(literal), kind: "string" /* string */, kindModifiers: "" /* none */, sortText: "0" };
+            return { name: completionNameForLiteral(literal), kind: "string" /* string */, kindModifiers: "" /* none */, sortText: SortText.LocationPriority };
         }
-        function createCompletionEntry(symbol, location, sourceFile, typeChecker, target, kind, origin, recommendedCompletion, propertyAccessToConvert, isJsxInitializer, preferences) {
-            var info = getCompletionEntryDisplayNameForSymbol(symbol, target, origin, kind);
-            if (!info) {
-                return undefined;
-            }
-            var name = info.name, needsConvertPropertyAccess = info.needsConvertPropertyAccess;
+        function createCompletionEntry(symbol, sortText, location, sourceFile, typeChecker, name, needsConvertPropertyAccess, origin, recommendedCompletion, propertyAccessToConvert, isJsxInitializer, preferences) {
             var insertText;
             var replacementSpan;
             if (origin && origin.kind === 0 /* ThisType */) {
@@ -98509,7 +101496,7 @@ var ts;
                 name: name,
                 kind: ts.SymbolDisplay.getSymbolKind(typeChecker, symbol, location),
                 kindModifiers: ts.SymbolDisplay.getSymbolModifiers(symbol),
-                sortText: "0",
+                sortText: sortText,
                 source: getSourceFromOrigin(origin),
                 hasAction: trueOrUndefined(!!origin && originIsExport(origin)),
                 isRecommended: trueOrUndefined(isRecommendedCompletionMatch(symbol, recommendedCompletion, typeChecker)),
@@ -98527,7 +101514,7 @@ var ts;
         function getSourceFromOrigin(origin) {
             return origin && originIsExport(origin) ? ts.stripQuotes(origin.moduleSymbol.name) : undefined;
         }
-        function getCompletionEntriesFromSymbols(symbols, entries, location, sourceFile, typeChecker, target, log, kind, preferences, propertyAccessToConvert, isJsxInitializer, recommendedCompletion, symbolToOriginInfoMap) {
+        function getCompletionEntriesFromSymbols(symbols, entries, location, sourceFile, typeChecker, target, log, kind, preferences, propertyAccessToConvert, isJsxInitializer, recommendedCompletion, symbolToOriginInfoMap, symbolToSortTextMap) {
             var start = ts.timestamp();
             // Tracks unique names.
             // We don't set this for global variables or completions from external module exports, because we can have multiple of those.
@@ -98537,14 +101524,18 @@ var ts;
             for (var _i = 0, symbols_1 = symbols; _i < symbols_1.length; _i++) {
                 var symbol = symbols_1[_i];
                 var origin = symbolToOriginInfoMap ? symbolToOriginInfoMap[ts.getSymbolId(symbol)] : undefined;
-                var entry = createCompletionEntry(symbol, location, sourceFile, typeChecker, target, kind, origin, recommendedCompletion, propertyAccessToConvert, isJsxInitializer, preferences);
-                if (!entry) {
+                var info = getCompletionEntryDisplayNameForSymbol(symbol, target, origin, kind);
+                if (!info) {
                     continue;
                 }
-                var name = entry.name;
+                var name = info.name, needsConvertPropertyAccess = info.needsConvertPropertyAccess;
                 if (uniques.has(name)) {
                     continue;
                 }
+                var entry = createCompletionEntry(symbol, symbolToSortTextMap && symbolToSortTextMap[ts.getSymbolId(symbol)] || SortText.LocationPriority, location, sourceFile, typeChecker, name, needsConvertPropertyAccess, origin, recommendedCompletion, propertyAccessToConvert, isJsxInitializer, preferences);
+                if (!entry) {
+                    continue;
+                }
                 // Latter case tests whether this is a global variable.
                 if (!origin && !(symbol.parent === undefined && !ts.some(symbol.declarations, function (d) { return d.getSourceFile() === location.getSourceFile(); }))) { // TODO: GH#18217
                     uniques.set(name, true);
@@ -98577,7 +101568,7 @@ var ts;
                             name: name,
                             kindModifiers: "" /* none */,
                             kind: "label" /* label */,
-                            sortText: "0"
+                            sortText: SortText.LocationPriority
                         });
                     }
                 }
@@ -98717,25 +101708,25 @@ var ts;
         function getContextualType(previousToken, position, sourceFile, checker) {
             var parent = previousToken.parent;
             switch (previousToken.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return ts.getContextualTypeFromParent(previousToken, checker);
-                case 59 /* EqualsToken */:
+                case 60 /* EqualsToken */:
                     switch (parent.kind) {
-                        case 237 /* VariableDeclaration */:
+                        case 238 /* VariableDeclaration */:
                             return checker.getContextualType(parent.initializer); // TODO: GH#18217
-                        case 204 /* BinaryExpression */:
+                        case 205 /* BinaryExpression */:
                             return checker.getTypeAtLocation(parent.left);
-                        case 267 /* JsxAttribute */:
+                        case 268 /* JsxAttribute */:
                             return checker.getContextualTypeForJsxAttribute(parent);
                         default:
                             return undefined;
                     }
-                case 95 /* NewKeyword */:
+                case 96 /* NewKeyword */:
                     return checker.getContextualType(parent);
-                case 74 /* CaseKeyword */:
+                case 75 /* CaseKeyword */:
                     return ts.getSwitchedType(ts.cast(parent, ts.isCaseClause), checker);
                 case 18 /* OpenBraceToken */:
-                    return ts.isJsxExpression(parent) && parent.parent.kind !== 260 /* JsxElement */ ? checker.getContextualTypeForJsxAttribute(parent.parent) : undefined;
+                    return ts.isJsxExpression(parent) && parent.parent.kind !== 261 /* JsxElement */ ? checker.getContextualTypeForJsxAttribute(parent.parent) : undefined;
                 default:
                     var argInfo = ts.SignatureHelp.getArgumentInfoForCompletions(previousToken, position, sourceFile);
                     return argInfo
@@ -98754,7 +101745,7 @@ var ts;
             return symbol.parent && (isModuleSymbol(symbol.parent) ? symbol : getFirstSymbolInChain(symbol.parent, enclosingDeclaration, checker));
         }
         function isModuleSymbol(symbol) {
-            return symbol.declarations.some(function (d) { return d.kind === 284 /* SourceFile */; });
+            return symbol.declarations.some(function (d) { return d.kind === 285 /* SourceFile */; });
         }
         function getCompletionData(program, log, sourceFile, isUncheckedFile, position, preferences, detailsEntryId) {
             var typeChecker = program.getTypeChecker();
@@ -98805,11 +101796,11 @@ var ts;
                     if (tag.tagName.pos <= position && position <= tag.tagName.end) {
                         return { kind: 1 /* JsDocTagName */ };
                     }
-                    if (isTagWithTypeExpression(tag) && tag.typeExpression && tag.typeExpression.kind === 288 /* JSDocTypeExpression */) {
+                    if (isTagWithTypeExpression(tag) && tag.typeExpression && tag.typeExpression.kind === 289 /* JSDocTypeExpression */) {
                         currentToken = ts.getTokenAtPosition(sourceFile, position);
                         if (!currentToken ||
                             (!ts.isDeclarationName(currentToken) &&
-                                (currentToken.parent.kind !== 310 /* JSDocPropertyTag */ ||
+                                (currentToken.parent.kind !== 312 /* JSDocPropertyTag */ ||
                                     currentToken.parent.name !== currentToken))) {
                             // Use as type location if inside tag's type expression
                             insideJsDocTagTypeExpression = isCurrentlyEditingNode(tag.typeExpression);
@@ -98859,18 +101850,26 @@ var ts;
                 if (contextToken.kind === 24 /* DotToken */) {
                     isRightOfDot = true;
                     switch (parent.kind) {
-                        case 189 /* PropertyAccessExpression */:
+                        case 190 /* PropertyAccessExpression */:
                             propertyAccessToConvert = parent;
                             node = propertyAccessToConvert.expression;
+                            if (node.end === contextToken.pos &&
+                                ts.isCallExpression(node) &&
+                                node.getChildCount(sourceFile) &&
+                                ts.last(node.getChildren(sourceFile)).kind !== 21 /* CloseParenToken */) {
+                                // This is likely dot from incorrectly parsed call expression and user is starting to write spread
+                                // eg: Math.min(./**/)
+                                return undefined;
+                            }
                             break;
-                        case 148 /* QualifiedName */:
+                        case 149 /* QualifiedName */:
                             node = parent.left;
                             break;
-                        case 244 /* ModuleDeclaration */:
+                        case 245 /* ModuleDeclaration */:
                             node = parent.name;
                             break;
-                        case 183 /* ImportType */:
-                        case 214 /* MetaProperty */:
+                        case 184 /* ImportType */:
+                        case 215 /* MetaProperty */:
                             node = parent;
                             break;
                         default:
@@ -98883,7 +101882,7 @@ var ts;
                     // <UI.Test /* completion position */ />
                     // If the tagname is a property access expression, we will then walk up to the top most of property access expression.
                     // Then, try to get a JSX container and its associated attributes type.
-                    if (parent && parent.kind === 189 /* PropertyAccessExpression */) {
+                    if (parent && parent.kind === 190 /* PropertyAccessExpression */) {
                         contextToken = parent;
                         parent = parent.parent;
                     }
@@ -98891,48 +101890,48 @@ var ts;
                     if (currentToken.parent === location) {
                         switch (currentToken.kind) {
                             case 30 /* GreaterThanToken */:
-                                if (currentToken.parent.kind === 260 /* JsxElement */ || currentToken.parent.kind === 262 /* JsxOpeningElement */) {
+                                if (currentToken.parent.kind === 261 /* JsxElement */ || currentToken.parent.kind === 263 /* JsxOpeningElement */) {
                                     location = currentToken;
                                 }
                                 break;
                             case 42 /* SlashToken */:
-                                if (currentToken.parent.kind === 261 /* JsxSelfClosingElement */) {
+                                if (currentToken.parent.kind === 262 /* JsxSelfClosingElement */) {
                                     location = currentToken;
                                 }
                                 break;
                         }
                     }
                     switch (parent.kind) {
-                        case 263 /* JsxClosingElement */:
+                        case 264 /* JsxClosingElement */:
                             if (contextToken.kind === 42 /* SlashToken */) {
                                 isStartingCloseTag = true;
                                 location = contextToken;
                             }
                             break;
-                        case 204 /* BinaryExpression */:
+                        case 205 /* BinaryExpression */:
                             if (!binaryExpressionMayBeOpenTag(parent)) {
                                 break;
                             }
                         // falls through
-                        case 261 /* JsxSelfClosingElement */:
-                        case 260 /* JsxElement */:
-                        case 262 /* JsxOpeningElement */:
+                        case 262 /* JsxSelfClosingElement */:
+                        case 261 /* JsxElement */:
+                        case 263 /* JsxOpeningElement */:
                             if (contextToken.kind === 28 /* LessThanToken */) {
                                 isRightOfOpenTag = true;
                                 location = contextToken;
                             }
                             break;
-                        case 267 /* JsxAttribute */:
+                        case 268 /* JsxAttribute */:
                             switch (previousToken.kind) {
-                                case 59 /* EqualsToken */:
+                                case 60 /* EqualsToken */:
                                     isJsxInitializer = true;
                                     break;
-                                case 72 /* Identifier */:
+                                case 73 /* Identifier */:
                                     // For `<div x=[|f/**/|]`, `parent` will be `x` and `previousToken.parent` will be `f` (which is its own JsxAttribute)
                                     // Note for `<div someBool f>` we don't want to treat this as a jsx inializer, instead it's the attribute name.
                                     if (parent !== previousToken.parent &&
                                         !parent.initializer &&
-                                        ts.findChildOfKind(parent, 59 /* EqualsToken */, sourceFile)) {
+                                        ts.findChildOfKind(parent, 60 /* EqualsToken */, sourceFile)) {
                                         isJsxInitializer = previousToken;
                                     }
                             }
@@ -98946,6 +101945,7 @@ var ts;
             var keywordFilters = 0 /* None */;
             var symbols = [];
             var symbolToOriginInfoMap = [];
+            var symbolToSortTextMap = [];
             if (isRightOfDot) {
                 getTypeScriptMemberSymbols();
             }
@@ -98977,14 +101977,30 @@ var ts;
             var contextualType = previousToken && getContextualType(previousToken, position, sourceFile, typeChecker);
             var literals = ts.mapDefined(contextualType && (contextualType.isUnion() ? contextualType.types : [contextualType]), function (t) { return t.isLiteral() ? t.value : undefined; });
             var recommendedCompletion = previousToken && contextualType && getRecommendedCompletion(previousToken, contextualType, typeChecker);
-            return { kind: 0 /* Data */, symbols: symbols, completionKind: completionKind, isInSnippetScope: isInSnippetScope, propertyAccessToConvert: propertyAccessToConvert, isNewIdentifierLocation: isNewIdentifierLocation, location: location, keywordFilters: keywordFilters, literals: literals, symbolToOriginInfoMap: symbolToOriginInfoMap, recommendedCompletion: recommendedCompletion, previousToken: previousToken, isJsxInitializer: isJsxInitializer };
+            return {
+                kind: 0 /* Data */,
+                symbols: symbols,
+                completionKind: completionKind,
+                isInSnippetScope: isInSnippetScope,
+                propertyAccessToConvert: propertyAccessToConvert,
+                isNewIdentifierLocation: isNewIdentifierLocation,
+                location: location,
+                keywordFilters: keywordFilters,
+                literals: literals,
+                symbolToOriginInfoMap: symbolToOriginInfoMap,
+                recommendedCompletion: recommendedCompletion,
+                previousToken: previousToken,
+                isJsxInitializer: isJsxInitializer,
+                insideJsDocTagTypeExpression: insideJsDocTagTypeExpression,
+                symbolToSortTextMap: symbolToSortTextMap
+            };
             function isTagWithTypeExpression(tag) {
                 switch (tag.kind) {
-                    case 304 /* JSDocParameterTag */:
-                    case 310 /* JSDocPropertyTag */:
-                    case 305 /* JSDocReturnTag */:
-                    case 307 /* JSDocTypeTag */:
-                    case 309 /* JSDocTypedefTag */:
+                    case 306 /* JSDocParameterTag */:
+                    case 312 /* JSDocPropertyTag */:
+                    case 307 /* JSDocReturnTag */:
+                    case 309 /* JSDocTypeTag */:
+                    case 311 /* JSDocTypedefTag */:
                         return true;
                     default:
                         return false;
@@ -98993,11 +102009,13 @@ var ts;
             function getTypeScriptMemberSymbols() {
                 // Right of dot member completion list
                 completionKind = 2 /* PropertyAccess */;
-                // Since this is qualified name check its a type node location
+                // Since this is qualified name check it's a type node location
                 var isImportType = ts.isLiteralImportTypeNode(node);
-                var isTypeLocation = insideJsDocTagTypeExpression || (isImportType && !node.isTypeOf) || ts.isPartOfTypeNode(node.parent);
+                var isTypeLocation = insideJsDocTagTypeExpression
+                    || (isImportType && !node.isTypeOf)
+                    || ts.isPartOfTypeNode(node.parent)
+                    || ts.isPossiblyTypeArgumentPosition(contextToken, sourceFile, typeChecker);
                 var isRhsOfImportDeclaration = ts.isInRightSideOfInternalImportEqualsDeclaration(node);
-                var allowTypeOrValue = isRhsOfImportDeclaration || (!isTypeLocation && ts.isPossiblyTypeArgumentPosition(contextToken, sourceFile, typeChecker));
                 if (ts.isEntityName(node) || isImportType) {
                     var isNamespaceName = ts.isModuleDeclaration(node.parent);
                     if (isNamespaceName)
@@ -99013,7 +102031,7 @@ var ts;
                             var isValidAccess = isNamespaceName
                                 // At `namespace N.M/**/`, if this is the only declaration of `M`, don't include `M` as a completion.
                                 ? function (symbol) { return !!(symbol.flags & 1920 /* Namespace */) && !symbol.declarations.every(function (d) { return d.parent === node.parent; }); }
-                                : allowTypeOrValue ?
+                                : isRhsOfImportDeclaration ?
                                     // Any kind is allowed when dotting off namespace in internal import equals declaration
                                     function (symbol) { return isValidTypeAccess_1(symbol) || isValidValueAccess_1(symbol); } :
                                     isTypeLocation ? isValidTypeAccess_1 : isValidValueAccess_1;
@@ -99024,15 +102042,17 @@ var ts;
                                 }
                             }
                             // If the module is merged with a value, we must get the type of the class and add its propertes (for inherited static methods).
-                            if (!isTypeLocation && symbol.declarations.some(function (d) { return d.kind !== 284 /* SourceFile */ && d.kind !== 244 /* ModuleDeclaration */ && d.kind !== 243 /* EnumDeclaration */; })) {
+                            if (!isTypeLocation &&
+                                symbol.declarations &&
+                                symbol.declarations.some(function (d) { return d.kind !== 285 /* SourceFile */ && d.kind !== 245 /* ModuleDeclaration */ && d.kind !== 244 /* EnumDeclaration */; })) {
                                 addTypeProperties(typeChecker.getTypeOfSymbolAtLocation(symbol, node));
                             }
                             return;
                         }
                     }
                 }
-                if (ts.isMetaProperty(node) && (node.keywordToken === 95 /* NewKeyword */ || node.keywordToken === 92 /* ImportKeyword */)) {
-                    var completion = (node.keywordToken === 95 /* NewKeyword */) ? "target" : "meta";
+                if (ts.isMetaProperty(node) && (node.keywordToken === 96 /* NewKeyword */ || node.keywordToken === 93 /* ImportKeyword */)) {
+                    var completion = (node.keywordToken === 96 /* NewKeyword */) ? "target" : "meta";
                     symbols.push(typeChecker.createSymbol(4 /* Property */, ts.escapeLeadingUnderscores(completion)));
                     return;
                 }
@@ -99053,7 +102073,7 @@ var ts;
                 else {
                     for (var _i = 0, _a = type.getApparentProperties(); _i < _a.length; _i++) {
                         var symbol = _a[_i];
-                        if (typeChecker.isValidPropertyAccessForCompletions(node.kind === 183 /* ImportType */ ? node : node.parent, type, symbol)) {
+                        if (typeChecker.isValidPropertyAccessForCompletions(node.kind === 184 /* ImportType */ ? node : node.parent, type, symbol)) {
                             addPropertySymbol(symbol);
                         }
                     }
@@ -99075,6 +102095,9 @@ var ts;
                         symbolToOriginInfoMap[ts.getSymbolId(firstAccessibleSymbol)] =
                             !moduleSymbol || !ts.isExternalModuleSymbol(moduleSymbol) ? { kind: 1 /* SymbolMemberNoExport */ } : { kind: 2 /* SymbolMemberExport */, moduleSymbol: moduleSymbol, isDefaultExport: false };
                     }
+                    else if (preferences.includeCompletionsWithInsertText) {
+                        symbols.push(symbol);
+                    }
                 }
                 else {
                     symbols.push(symbol);
@@ -99156,14 +102179,22 @@ var ts;
                 var isTypeOnly = isTypeOnlyCompletion();
                 var symbolMeanings = (isTypeOnly ? 0 /* None */ : 67220415 /* Value */) | 67897832 /* Type */ | 1920 /* Namespace */ | 2097152 /* Alias */;
                 symbols = ts.Debug.assertEachDefined(typeChecker.getSymbolsInScope(scopeNode, symbolMeanings), "getSymbolsInScope() should all be defined");
+                for (var _i = 0, symbols_2 = symbols; _i < symbols_2.length; _i++) {
+                    var symbol = symbols_2[_i];
+                    if (!typeChecker.isArgumentsSymbol(symbol) &&
+                        !ts.some(symbol.declarations, function (d) { return d.getSourceFile() === sourceFile; })) {
+                        symbolToSortTextMap[ts.getSymbolId(symbol)] = SortText.GlobalsOrKeywords;
+                    }
+                }
                 // Need to insert 'this.' before properties of `this` type, so only do that if `includeInsertTextCompletions`
-                if (preferences.includeCompletionsWithInsertText && scopeNode.kind !== 284 /* SourceFile */) {
+                if (preferences.includeCompletionsWithInsertText && scopeNode.kind !== 285 /* SourceFile */) {
                     var thisType = typeChecker.tryGetThisTypeAt(scopeNode, /*includeGlobalThis*/ false);
                     if (thisType) {
-                        for (var _i = 0, _a = getPropertiesForCompletion(thisType, typeChecker); _i < _a.length; _i++) {
-                            var symbol = _a[_i];
+                        for (var _a = 0, _b = getPropertiesForCompletion(thisType, typeChecker); _a < _b.length; _a++) {
+                            var symbol = _b[_a];
                             symbolToOriginInfoMap[ts.getSymbolId(symbol)] = { kind: 0 /* ThisType */ };
                             symbols.push(symbol);
+                            symbolToSortTextMap[ts.getSymbolId(symbol)] = SortText.SuggestedClassMembers;
                         }
                     }
                 }
@@ -99190,10 +102221,10 @@ var ts;
             }
             function isSnippetScope(scopeNode) {
                 switch (scopeNode.kind) {
-                    case 284 /* SourceFile */:
-                    case 206 /* TemplateExpression */:
-                    case 270 /* JsxExpression */:
-                    case 218 /* Block */:
+                    case 285 /* SourceFile */:
+                    case 207 /* TemplateExpression */:
+                    case 271 /* JsxExpression */:
+                    case 219 /* Block */:
                         return true;
                     default:
                         return ts.isStatement(scopeNode);
@@ -99201,9 +102232,11 @@ var ts;
             }
             function filterGlobalCompletion(symbols) {
                 var isTypeOnly = isTypeOnlyCompletion();
-                var allowTypes = isTypeOnly || !isContextTokenValueLocation(contextToken) && ts.isPossiblyTypeArgumentPosition(contextToken, sourceFile, typeChecker);
-                if (isTypeOnly)
-                    keywordFilters = 6 /* TypeKeywords */;
+                if (isTypeOnly) {
+                    keywordFilters = isTypeAssertion()
+                        ? 6 /* TypeAssertionKeywords */
+                        : 7 /* TypeKeywords */;
+                }
                 ts.filterMutate(symbols, function (symbol) {
                     if (!ts.isSourceFile(location)) {
                         // export = /**/ here we want to get all meanings, so any symbol is ok
@@ -99215,40 +102248,49 @@ var ts;
                         if (ts.isInRightSideOfInternalImportEqualsDeclaration(location)) {
                             return !!(symbol.flags & 1920 /* Namespace */);
                         }
-                        if (allowTypes) {
-                            // Its a type, but you can reach it by namespace.type as well
-                            var symbolAllowedAsType = symbolCanBeReferencedAtTypeLocation(symbol);
-                            if (symbolAllowedAsType || isTypeOnly) {
-                                return symbolAllowedAsType;
-                            }
+                        if (isTypeOnly) {
+                            // It's a type, but you can reach it by namespace.type as well
+                            return symbolCanBeReferencedAtTypeLocation(symbol);
                         }
                     }
                     // expressions are value space (which includes the value namespaces)
                     return !!(ts.getCombinedLocalAndExportSymbolFlags(symbol) & 67220415 /* Value */);
                 });
             }
+            function isTypeAssertion() {
+                return ts.isAssertionExpression(contextToken.parent);
+            }
             function isTypeOnlyCompletion() {
-                return insideJsDocTagTypeExpression || !isContextTokenValueLocation(contextToken) && (ts.isPartOfTypeNode(location) || isContextTokenTypeLocation(contextToken));
+                return insideJsDocTagTypeExpression
+                    || !isContextTokenValueLocation(contextToken) &&
+                        (ts.isPossiblyTypeArgumentPosition(contextToken, sourceFile, typeChecker)
+                            || ts.isPartOfTypeNode(location)
+                            || isContextTokenTypeLocation(contextToken));
             }
             function isContextTokenValueLocation(contextToken) {
                 return contextToken &&
-                    contextToken.kind === 104 /* TypeOfKeyword */ &&
-                    (contextToken.parent.kind === 167 /* TypeQuery */ || ts.isTypeOfExpression(contextToken.parent));
+                    contextToken.kind === 105 /* TypeOfKeyword */ &&
+                    (contextToken.parent.kind === 168 /* TypeQuery */ || ts.isTypeOfExpression(contextToken.parent));
             }
             function isContextTokenTypeLocation(contextToken) {
                 if (contextToken) {
                     var parentKind = contextToken.parent.kind;
                     switch (contextToken.kind) {
                         case 57 /* ColonToken */:
-                            return parentKind === 154 /* PropertyDeclaration */ ||
-                                parentKind === 153 /* PropertySignature */ ||
-                                parentKind === 151 /* Parameter */ ||
-                                parentKind === 237 /* VariableDeclaration */ ||
+                            return parentKind === 155 /* PropertyDeclaration */ ||
+                                parentKind === 154 /* PropertySignature */ ||
+                                parentKind === 152 /* Parameter */ ||
+                                parentKind === 238 /* VariableDeclaration */ ||
                                 ts.isFunctionLikeKind(parentKind);
-                        case 59 /* EqualsToken */:
-                            return parentKind === 242 /* TypeAliasDeclaration */;
-                        case 119 /* AsKeyword */:
-                            return parentKind === 212 /* AsExpression */;
+                        case 60 /* EqualsToken */:
+                            return parentKind === 243 /* TypeAliasDeclaration */;
+                        case 120 /* AsKeyword */:
+                            return parentKind === 213 /* AsExpression */;
+                        case 28 /* LessThanToken */:
+                            return parentKind === 165 /* TypeReference */ ||
+                                parentKind === 195 /* TypeAssertionExpression */;
+                        case 87 /* ExtendsKeyword */:
+                            return parentKind === 151 /* TypeParameter */;
                     }
                 }
                 return false;
@@ -99280,6 +102322,7 @@ var ts;
                         // So in `declare namespace foo {} declare module "foo" { export = foo; }`, there will just be the global completion for `foo`.
                         ts.some(resolvedModuleSymbol.declarations, function (d) { return !!d.getSourceFile().externalModuleIndicator; })) {
                         symbols.push(resolvedModuleSymbol);
+                        symbolToSortTextMap[ts.getSymbolId(resolvedModuleSymbol)] = SortText.AutoImportSuggestions;
                         symbolToOriginInfoMap[ts.getSymbolId(resolvedModuleSymbol)] = { kind: 3 /* Export */, moduleSymbol: moduleSymbol, isDefaultExport: false };
                     }
                     for (var _i = 0, _a = typeChecker.getExportsOfModule(moduleSymbol); _i < _a.length; _i++) {
@@ -99304,6 +102347,7 @@ var ts;
                         var origin = { kind: 3 /* Export */, moduleSymbol: moduleSymbol, isDefaultExport: isDefaultExport };
                         if (detailsEntryId || stringContainsCharactersInOrder(getSymbolName(symbol, origin, target).toLowerCase(), tokenTextLowerCase)) {
                             symbols.push(symbol);
+                            symbolToSortTextMap[ts.getSymbolId(symbol)] = SortText.AutoImportSuggestions;
                             symbolToOriginInfoMap[ts.getSymbolId(symbol)] = origin;
                         }
                     }
@@ -99355,11 +102399,11 @@ var ts;
                     return true;
                 }
                 if (contextToken.kind === 30 /* GreaterThanToken */ && contextToken.parent) {
-                    if (contextToken.parent.kind === 262 /* JsxOpeningElement */) {
+                    if (contextToken.parent.kind === 263 /* JsxOpeningElement */) {
                         return true;
                     }
-                    if (contextToken.parent.kind === 263 /* JsxClosingElement */ || contextToken.parent.kind === 261 /* JsxSelfClosingElement */) {
-                        return !!contextToken.parent.parent && contextToken.parent.parent.kind === 260 /* JsxElement */;
+                    if (contextToken.parent.kind === 264 /* JsxClosingElement */ || contextToken.parent.kind === 262 /* JsxSelfClosingElement */) {
+                        return !!contextToken.parent.parent && contextToken.parent.parent.kind === 261 /* JsxElement */;
                     }
                 }
                 return false;
@@ -99370,40 +102414,40 @@ var ts;
                     // Previous token may have been a keyword that was converted to an identifier.
                     switch (keywordForNode(previousToken)) {
                         case 27 /* CommaToken */:
-                            return containingNodeKind === 191 /* CallExpression */ // func( a, |
-                                || containingNodeKind === 157 /* Constructor */ // constructor( a, |   /* public, protected, private keywords are allowed here, so show completion */
-                                || containingNodeKind === 192 /* NewExpression */ // new C(a, |
-                                || containingNodeKind === 187 /* ArrayLiteralExpression */ // [a, |
-                                || containingNodeKind === 204 /* BinaryExpression */ // const x = (a, |
-                                || containingNodeKind === 165 /* FunctionType */; // var x: (s: string, list|
+                            return containingNodeKind === 192 /* CallExpression */ // func( a, |
+                                || containingNodeKind === 158 /* Constructor */ // constructor( a, |   /* public, protected, private keywords are allowed here, so show completion */
+                                || containingNodeKind === 193 /* NewExpression */ // new C(a, |
+                                || containingNodeKind === 188 /* ArrayLiteralExpression */ // [a, |
+                                || containingNodeKind === 205 /* BinaryExpression */ // const x = (a, |
+                                || containingNodeKind === 166 /* FunctionType */; // var x: (s: string, list|
                         case 20 /* OpenParenToken */:
-                            return containingNodeKind === 191 /* CallExpression */ // func( |
-                                || containingNodeKind === 157 /* Constructor */ // constructor( |
-                                || containingNodeKind === 192 /* NewExpression */ // new C(a|
-                                || containingNodeKind === 195 /* ParenthesizedExpression */ // const x = (a|
-                                || containingNodeKind === 177 /* ParenthesizedType */; // function F(pred: (a| /* this can become an arrow function, where 'a' is the argument */
+                            return containingNodeKind === 192 /* CallExpression */ // func( |
+                                || containingNodeKind === 158 /* Constructor */ // constructor( |
+                                || containingNodeKind === 193 /* NewExpression */ // new C(a|
+                                || containingNodeKind === 196 /* ParenthesizedExpression */ // const x = (a|
+                                || containingNodeKind === 178 /* ParenthesizedType */; // function F(pred: (a| /* this can become an arrow function, where 'a' is the argument */
                         case 22 /* OpenBracketToken */:
-                            return containingNodeKind === 187 /* ArrayLiteralExpression */ // [ |
-                                || containingNodeKind === 162 /* IndexSignature */ // [ | : string ]
-                                || containingNodeKind === 149 /* ComputedPropertyName */; // [ |    /* this can become an index signature */
-                        case 130 /* ModuleKeyword */: // module |
-                        case 131 /* NamespaceKeyword */: // namespace |
+                            return containingNodeKind === 188 /* ArrayLiteralExpression */ // [ |
+                                || containingNodeKind === 163 /* IndexSignature */ // [ | : string ]
+                                || containingNodeKind === 150 /* ComputedPropertyName */; // [ |    /* this can become an index signature */
+                        case 131 /* ModuleKeyword */: // module |
+                        case 132 /* NamespaceKeyword */: // namespace |
                             return true;
                         case 24 /* DotToken */:
-                            return containingNodeKind === 244 /* ModuleDeclaration */; // module A.|
+                            return containingNodeKind === 245 /* ModuleDeclaration */; // module A.|
                         case 18 /* OpenBraceToken */:
-                            return containingNodeKind === 240 /* ClassDeclaration */; // class A{ |
-                        case 59 /* EqualsToken */:
-                            return containingNodeKind === 237 /* VariableDeclaration */ // const x = a|
-                                || containingNodeKind === 204 /* BinaryExpression */; // x = a|
+                            return containingNodeKind === 241 /* ClassDeclaration */; // class A{ |
+                        case 60 /* EqualsToken */:
+                            return containingNodeKind === 238 /* VariableDeclaration */ // const x = a|
+                                || containingNodeKind === 205 /* BinaryExpression */; // x = a|
                         case 15 /* TemplateHead */:
-                            return containingNodeKind === 206 /* TemplateExpression */; // `aa ${|
+                            return containingNodeKind === 207 /* TemplateExpression */; // `aa ${|
                         case 16 /* TemplateMiddle */:
-                            return containingNodeKind === 216 /* TemplateSpan */; // `aa ${10} dd ${|
-                        case 115 /* PublicKeyword */:
-                        case 113 /* PrivateKeyword */:
-                        case 114 /* ProtectedKeyword */:
-                            return containingNodeKind === 154 /* PropertyDeclaration */; // class A{ public |
+                            return containingNodeKind === 217 /* TemplateSpan */; // `aa ${10} dd ${|
+                        case 116 /* PublicKeyword */:
+                        case 114 /* PrivateKeyword */:
+                        case 115 /* ProtectedKeyword */:
+                            return containingNodeKind === 155 /* PropertyDeclaration */; // class A{ public |
                     }
                 }
                 return false;
@@ -99430,7 +102474,7 @@ var ts;
                 completionKind = 0 /* ObjectPropertyDeclaration */;
                 var typeMembers;
                 var existingMembers;
-                if (objectLikeContainer.kind === 188 /* ObjectLiteralExpression */) {
+                if (objectLikeContainer.kind === 189 /* ObjectLiteralExpression */) {
                     var typeForObject = typeChecker.getContextualType(objectLikeContainer);
                     if (!typeForObject)
                         return 2 /* Fail */;
@@ -99439,7 +102483,7 @@ var ts;
                     existingMembers = objectLikeContainer.properties;
                 }
                 else {
-                    ts.Debug.assert(objectLikeContainer.kind === 184 /* ObjectBindingPattern */);
+                    ts.Debug.assert(objectLikeContainer.kind === 185 /* ObjectBindingPattern */);
                     // We are *only* completing on properties from the type being destructured.
                     isNewIdentifierLocation = false;
                     var rootDeclaration = ts.getRootDeclaration(objectLikeContainer.parent);
@@ -99450,12 +102494,12 @@ var ts;
                     // through type declaration or inference.
                     // Also proceed if rootDeclaration is a parameter and if its containing function expression/arrow function is contextually typed -
                     // type of parameter will flow in from the contextual type of the function
-                    var canGetType = ts.hasInitializer(rootDeclaration) || ts.hasType(rootDeclaration) || rootDeclaration.parent.parent.kind === 227 /* ForOfStatement */;
-                    if (!canGetType && rootDeclaration.kind === 151 /* Parameter */) {
+                    var canGetType = ts.hasInitializer(rootDeclaration) || ts.hasType(rootDeclaration) || rootDeclaration.parent.parent.kind === 228 /* ForOfStatement */;
+                    if (!canGetType && rootDeclaration.kind === 152 /* Parameter */) {
                         if (ts.isExpression(rootDeclaration.parent)) {
                             canGetType = !!typeChecker.getContextualType(rootDeclaration.parent);
                         }
-                        else if (rootDeclaration.parent.kind === 156 /* MethodDeclaration */ || rootDeclaration.parent.kind === 159 /* SetAccessor */) {
+                        else if (rootDeclaration.parent.kind === 157 /* MethodDeclaration */ || rootDeclaration.parent.kind === 160 /* SetAccessor */) {
                             canGetType = ts.isExpression(rootDeclaration.parent.parent) && !!typeChecker.getContextualType(rootDeclaration.parent.parent);
                         }
                     }
@@ -99497,7 +102541,7 @@ var ts;
                     return 0 /* Continue */;
                 // cursor is in an import clause
                 // try to show exported member for imported module
-                var moduleSpecifier = (namedImportsOrExports.kind === 252 /* NamedImports */ ? namedImportsOrExports.parent.parent : namedImportsOrExports.parent).moduleSpecifier;
+                var moduleSpecifier = (namedImportsOrExports.kind === 253 /* NamedImports */ ? namedImportsOrExports.parent.parent : namedImportsOrExports.parent).moduleSpecifier;
                 var moduleSpecifierSymbol = typeChecker.getSymbolAtLocation(moduleSpecifier); // TODO: GH#18217
                 if (!moduleSpecifierSymbol)
                     return 2 /* Fail */;
@@ -99513,7 +102557,7 @@ var ts;
              * Relevant symbols are stored in the captured 'symbols' variable.
              */
             function tryGetClassLikeCompletionSymbols() {
-                var decl = tryGetObjectTypeDeclarationCompletionContainer(sourceFile, contextToken, location);
+                var decl = tryGetObjectTypeDeclarationCompletionContainer(sourceFile, contextToken, location, position);
                 if (!decl)
                     return 0 /* Continue */;
                 // We're looking up possible property names from parent type.
@@ -99528,7 +102572,7 @@ var ts;
                 var classElement = contextToken.parent;
                 var classElementModifierFlags = ts.isClassElement(classElement) ? ts.getModifierFlags(classElement) : 0 /* None */;
                 // If this is context token is not something we are editing now, consider if this would lead to be modifier
-                if (contextToken.kind === 72 /* Identifier */ && !isCurrentlyEditingNode(contextToken)) {
+                if (contextToken.kind === 73 /* Identifier */ && !isCurrentlyEditingNode(contextToken)) {
                     switch (contextToken.getText()) {
                         case "private":
                             classElementModifierFlags = classElementModifierFlags | 8 /* Private */;
@@ -99565,7 +102609,7 @@ var ts;
                             break;
                         case 40 /* AsteriskToken */:
                             return ts.isMethodDeclaration(parent) ? ts.tryCast(parent.parent, ts.isObjectLiteralExpression) : undefined;
-                        case 72 /* Identifier */:
+                        case 73 /* Identifier */:
                             return contextToken.text === "async" && ts.isShorthandPropertyAssignment(contextToken.parent)
                                 ? contextToken.parent.parent : undefined;
                     }
@@ -99618,12 +102662,12 @@ var ts;
                         case 30 /* GreaterThanToken */: // End of a type argument list
                         case 29 /* LessThanSlashToken */:
                         case 42 /* SlashToken */:
-                        case 72 /* Identifier */:
-                        case 189 /* PropertyAccessExpression */:
-                        case 268 /* JsxAttributes */:
-                        case 267 /* JsxAttribute */:
-                        case 269 /* JsxSpreadAttribute */:
-                            if (parent && (parent.kind === 261 /* JsxSelfClosingElement */ || parent.kind === 262 /* JsxOpeningElement */)) {
+                        case 73 /* Identifier */:
+                        case 190 /* PropertyAccessExpression */:
+                        case 269 /* JsxAttributes */:
+                        case 268 /* JsxAttribute */:
+                        case 270 /* JsxSpreadAttribute */:
+                            if (parent && (parent.kind === 262 /* JsxSelfClosingElement */ || parent.kind === 263 /* JsxOpeningElement */)) {
                                 if (contextToken.kind === 30 /* GreaterThanToken */) {
                                     var precedingToken = ts.findPrecedingToken(contextToken.pos, sourceFile, /*startNode*/ undefined);
                                     if (!parent.typeArguments || (precedingToken && precedingToken.kind === 42 /* SlashToken */))
@@ -99631,7 +102675,7 @@ var ts;
                                 }
                                 return parent;
                             }
-                            else if (parent.kind === 267 /* JsxAttribute */) {
+                            else if (parent.kind === 268 /* JsxAttribute */) {
                                 // Currently we parse JsxOpeningLikeElement as:
                                 //      JsxOpeningLikeElement
                                 //          attributes: JsxAttributes
@@ -99643,7 +102687,7 @@ var ts;
                         // its parent is a JsxExpression, whose parent is a JsxAttribute,
                         // whose parent is a JsxOpeningLikeElement
                         case 10 /* StringLiteral */:
-                            if (parent && ((parent.kind === 267 /* JsxAttribute */) || (parent.kind === 269 /* JsxSpreadAttribute */))) {
+                            if (parent && ((parent.kind === 268 /* JsxAttribute */) || (parent.kind === 270 /* JsxSpreadAttribute */))) {
                                 // Currently we parse JsxOpeningLikeElement as:
                                 //      JsxOpeningLikeElement
                                 //          attributes: JsxAttributes
@@ -99653,8 +102697,8 @@ var ts;
                             break;
                         case 19 /* CloseBraceToken */:
                             if (parent &&
-                                parent.kind === 270 /* JsxExpression */ &&
-                                parent.parent && parent.parent.kind === 267 /* JsxAttribute */) {
+                                parent.kind === 271 /* JsxExpression */ &&
+                                parent.parent && parent.parent.kind === 268 /* JsxAttribute */) {
                                 // Currently we parse JsxOpeningLikeElement as:
                                 //      JsxOpeningLikeElement
                                 //          attributes: JsxAttributes
@@ -99662,7 +102706,7 @@ var ts;
                                 //                  each JsxAttribute can have initializer as JsxExpression
                                 return parent.parent.parent.parent;
                             }
-                            if (parent && parent.kind === 269 /* JsxSpreadAttribute */) {
+                            if (parent && parent.kind === 270 /* JsxSpreadAttribute */) {
                                 // Currently we parse JsxOpeningLikeElement as:
                                 //      JsxOpeningLikeElement
                                 //          attributes: JsxAttributes
@@ -99682,62 +102726,62 @@ var ts;
                 var containingNodeKind = parent.kind;
                 switch (contextToken.kind) {
                     case 27 /* CommaToken */:
-                        return containingNodeKind === 237 /* VariableDeclaration */ ||
-                            containingNodeKind === 238 /* VariableDeclarationList */ ||
-                            containingNodeKind === 219 /* VariableStatement */ ||
-                            containingNodeKind === 243 /* EnumDeclaration */ || // enum a { foo, |
+                        return containingNodeKind === 238 /* VariableDeclaration */ ||
+                            containingNodeKind === 239 /* VariableDeclarationList */ ||
+                            containingNodeKind === 220 /* VariableStatement */ ||
+                            containingNodeKind === 244 /* EnumDeclaration */ || // enum a { foo, |
                             isFunctionLikeButNotConstructor(containingNodeKind) ||
-                            containingNodeKind === 241 /* InterfaceDeclaration */ || // interface A<T, |
-                            containingNodeKind === 185 /* ArrayBindingPattern */ || // var [x, y|
-                            containingNodeKind === 242 /* TypeAliasDeclaration */ || // type Map, K, |
+                            containingNodeKind === 242 /* InterfaceDeclaration */ || // interface A<T, |
+                            containingNodeKind === 186 /* ArrayBindingPattern */ || // var [x, y|
+                            containingNodeKind === 243 /* TypeAliasDeclaration */ || // type Map, K, |
                             // class A<T, |
                             // var C = class D<T, |
                             (ts.isClassLike(parent) &&
                                 !!parent.typeParameters &&
                                 parent.typeParameters.end >= contextToken.pos);
                     case 24 /* DotToken */:
-                        return containingNodeKind === 185 /* ArrayBindingPattern */; // var [.|
+                        return containingNodeKind === 186 /* ArrayBindingPattern */; // var [.|
                     case 57 /* ColonToken */:
-                        return containingNodeKind === 186 /* BindingElement */; // var {x :html|
+                        return containingNodeKind === 187 /* BindingElement */; // var {x :html|
                     case 22 /* OpenBracketToken */:
-                        return containingNodeKind === 185 /* ArrayBindingPattern */; // var [x|
+                        return containingNodeKind === 186 /* ArrayBindingPattern */; // var [x|
                     case 20 /* OpenParenToken */:
-                        return containingNodeKind === 274 /* CatchClause */ ||
+                        return containingNodeKind === 275 /* CatchClause */ ||
                             isFunctionLikeButNotConstructor(containingNodeKind);
                     case 18 /* OpenBraceToken */:
-                        return containingNodeKind === 243 /* EnumDeclaration */; // enum a { |
+                        return containingNodeKind === 244 /* EnumDeclaration */; // enum a { |
                     case 28 /* LessThanToken */:
-                        return containingNodeKind === 240 /* ClassDeclaration */ || // class A< |
-                            containingNodeKind === 209 /* ClassExpression */ || // var C = class D< |
-                            containingNodeKind === 241 /* InterfaceDeclaration */ || // interface A< |
-                            containingNodeKind === 242 /* TypeAliasDeclaration */ || // type List< |
+                        return containingNodeKind === 241 /* ClassDeclaration */ || // class A< |
+                            containingNodeKind === 210 /* ClassExpression */ || // var C = class D< |
+                            containingNodeKind === 242 /* InterfaceDeclaration */ || // interface A< |
+                            containingNodeKind === 243 /* TypeAliasDeclaration */ || // type List< |
                             ts.isFunctionLikeKind(containingNodeKind);
-                    case 116 /* StaticKeyword */:
-                        return containingNodeKind === 154 /* PropertyDeclaration */ && !ts.isClassLike(parent.parent);
+                    case 117 /* StaticKeyword */:
+                        return containingNodeKind === 155 /* PropertyDeclaration */ && !ts.isClassLike(parent.parent);
                     case 25 /* DotDotDotToken */:
-                        return containingNodeKind === 151 /* Parameter */ ||
-                            (!!parent.parent && parent.parent.kind === 185 /* ArrayBindingPattern */); // var [...z|
-                    case 115 /* PublicKeyword */:
-                    case 113 /* PrivateKeyword */:
-                    case 114 /* ProtectedKeyword */:
-                        return containingNodeKind === 151 /* Parameter */ && !ts.isConstructorDeclaration(parent.parent);
-                    case 119 /* AsKeyword */:
-                        return containingNodeKind === 253 /* ImportSpecifier */ ||
-                            containingNodeKind === 257 /* ExportSpecifier */ ||
-                            containingNodeKind === 251 /* NamespaceImport */;
-                    case 126 /* GetKeyword */:
-                    case 137 /* SetKeyword */:
+                        return containingNodeKind === 152 /* Parameter */ ||
+                            (!!parent.parent && parent.parent.kind === 186 /* ArrayBindingPattern */); // var [...z|
+                    case 116 /* PublicKeyword */:
+                    case 114 /* PrivateKeyword */:
+                    case 115 /* ProtectedKeyword */:
+                        return containingNodeKind === 152 /* Parameter */ && !ts.isConstructorDeclaration(parent.parent);
+                    case 120 /* AsKeyword */:
+                        return containingNodeKind === 254 /* ImportSpecifier */ ||
+                            containingNodeKind === 258 /* ExportSpecifier */ ||
+                            containingNodeKind === 252 /* NamespaceImport */;
+                    case 127 /* GetKeyword */:
+                    case 138 /* SetKeyword */:
                         return !isFromObjectTypeDeclaration(contextToken);
-                    case 76 /* ClassKeyword */:
-                    case 84 /* EnumKeyword */:
-                    case 110 /* InterfaceKeyword */:
-                    case 90 /* FunctionKeyword */:
-                    case 105 /* VarKeyword */:
-                    case 92 /* ImportKeyword */:
-                    case 111 /* LetKeyword */:
-                    case 77 /* ConstKeyword */:
-                    case 117 /* YieldKeyword */:
-                    case 140 /* TypeKeyword */: // type htm|
+                    case 77 /* ClassKeyword */:
+                    case 85 /* EnumKeyword */:
+                    case 111 /* InterfaceKeyword */:
+                    case 91 /* FunctionKeyword */:
+                    case 106 /* VarKeyword */:
+                    case 93 /* ImportKeyword */:
+                    case 112 /* LetKeyword */:
+                    case 78 /* ConstKeyword */:
+                    case 118 /* YieldKeyword */:
+                    case 141 /* TypeKeyword */: // type htm|
                         return true;
                     case 40 /* AsteriskToken */:
                         return ts.isFunctionLike(contextToken.parent) && !ts.isMethodDeclaration(contextToken.parent);
@@ -99760,22 +102804,22 @@ var ts;
                 }
                 // Previous token may have been a keyword that was converted to an identifier.
                 switch (keywordForNode(contextToken)) {
-                    case 118 /* AbstractKeyword */:
-                    case 76 /* ClassKeyword */:
-                    case 77 /* ConstKeyword */:
-                    case 125 /* DeclareKeyword */:
-                    case 84 /* EnumKeyword */:
-                    case 90 /* FunctionKeyword */:
-                    case 110 /* InterfaceKeyword */:
-                    case 111 /* LetKeyword */:
-                    case 113 /* PrivateKeyword */:
-                    case 114 /* ProtectedKeyword */:
-                    case 115 /* PublicKeyword */:
-                    case 116 /* StaticKeyword */:
-                    case 105 /* VarKeyword */:
-                    case 117 /* YieldKeyword */:
+                    case 119 /* AbstractKeyword */:
+                    case 77 /* ClassKeyword */:
+                    case 78 /* ConstKeyword */:
+                    case 126 /* DeclareKeyword */:
+                    case 85 /* EnumKeyword */:
+                    case 91 /* FunctionKeyword */:
+                    case 111 /* InterfaceKeyword */:
+                    case 112 /* LetKeyword */:
+                    case 114 /* PrivateKeyword */:
+                    case 115 /* ProtectedKeyword */:
+                    case 116 /* PublicKeyword */:
+                    case 117 /* StaticKeyword */:
+                    case 106 /* VarKeyword */:
+                    case 118 /* YieldKeyword */:
                         return true;
-                    case 121 /* AsyncKeyword */:
+                    case 122 /* AsyncKeyword */:
                         return ts.isPropertyDeclaration(contextToken.parent);
                 }
                 return ts.isDeclarationName(contextToken)
@@ -99785,7 +102829,7 @@ var ts;
                     && !(ts.isClassLike(contextToken.parent) && (contextToken !== previousToken || position > previousToken.end));
             }
             function isFunctionLikeButNotConstructor(kind) {
-                return ts.isFunctionLikeKind(kind) && kind !== 157 /* Constructor */;
+                return ts.isFunctionLikeKind(kind) && kind !== 158 /* Constructor */;
             }
             function isDotOfNumericLiteral(contextToken) {
                 if (contextToken.kind === 8 /* NumericLiteral */) {
@@ -99808,12 +102852,12 @@ var ts;
                 for (var _i = 0, existingMembers_1 = existingMembers; _i < existingMembers_1.length; _i++) {
                     var m = existingMembers_1[_i];
                     // Ignore omitted expressions for missing members
-                    if (m.kind !== 275 /* PropertyAssignment */ &&
-                        m.kind !== 276 /* ShorthandPropertyAssignment */ &&
-                        m.kind !== 186 /* BindingElement */ &&
-                        m.kind !== 156 /* MethodDeclaration */ &&
-                        m.kind !== 158 /* GetAccessor */ &&
-                        m.kind !== 159 /* SetAccessor */) {
+                    if (m.kind !== 276 /* PropertyAssignment */ &&
+                        m.kind !== 277 /* ShorthandPropertyAssignment */ &&
+                        m.kind !== 187 /* BindingElement */ &&
+                        m.kind !== 157 /* MethodDeclaration */ &&
+                        m.kind !== 159 /* GetAccessor */ &&
+                        m.kind !== 160 /* SetAccessor */) {
                         continue;
                     }
                     // If this is the current item we are editing right now, do not filter it out
@@ -99823,7 +102867,7 @@ var ts;
                     var existingName = void 0;
                     if (ts.isBindingElement(m) && m.propertyName) {
                         // include only identifiers in completion list
-                        if (m.propertyName.kind === 72 /* Identifier */) {
+                        if (m.propertyName.kind === 73 /* Identifier */) {
                             existingName = m.propertyName.escapedText;
                         }
                     }
@@ -99848,10 +102892,10 @@ var ts;
                 for (var _i = 0, existingMembers_2 = existingMembers; _i < existingMembers_2.length; _i++) {
                     var m = existingMembers_2[_i];
                     // Ignore omitted expressions for missing members
-                    if (m.kind !== 154 /* PropertyDeclaration */ &&
-                        m.kind !== 156 /* MethodDeclaration */ &&
-                        m.kind !== 158 /* GetAccessor */ &&
-                        m.kind !== 159 /* SetAccessor */) {
+                    if (m.kind !== 155 /* PropertyDeclaration */ &&
+                        m.kind !== 157 /* MethodDeclaration */ &&
+                        m.kind !== 159 /* GetAccessor */ &&
+                        m.kind !== 160 /* SetAccessor */) {
                         continue;
                     }
                     // If this is the current item we are editing right now, do not filter it out
@@ -99891,7 +102935,7 @@ var ts;
                     if (isCurrentlyEditingNode(attr)) {
                         continue;
                     }
-                    if (attr.kind === 267 /* JsxAttribute */) {
+                    if (attr.kind === 268 /* JsxAttribute */) {
                         seenNames.set(attr.name.escapedText, true);
                     }
                 }
@@ -99935,57 +102979,104 @@ var ts;
         var _keywordCompletions = [];
         var allKeywordsCompletions = ts.memoize(function () {
             var res = [];
-            for (var i = 73 /* FirstKeyword */; i <= 147 /* LastKeyword */; i++) {
+            for (var i = 74 /* FirstKeyword */; i <= 148 /* LastKeyword */; i++) {
                 res.push({
                     name: ts.tokenToString(i),
                     kind: "keyword" /* keyword */,
                     kindModifiers: "" /* none */,
-                    sortText: "0"
+                    sortText: SortText.GlobalsOrKeywords
                 });
             }
             return res;
         });
-        function getKeywordCompletions(keywordFilter) {
+        function getKeywordCompletions(keywordFilter, filterOutTsOnlyKeywords) {
+            if (!filterOutTsOnlyKeywords)
+                return getTypescriptKeywordCompletions(keywordFilter);
+            var index = keywordFilter + 7 /* Last */ + 1;
+            return _keywordCompletions[index] ||
+                (_keywordCompletions[index] = getTypescriptKeywordCompletions(keywordFilter)
+                    .filter(function (entry) { return !isTypeScriptOnlyKeyword(ts.stringToToken(entry.name)); }));
+        }
+        function getTypescriptKeywordCompletions(keywordFilter) {
             return _keywordCompletions[keywordFilter] || (_keywordCompletions[keywordFilter] = allKeywordsCompletions().filter(function (entry) {
                 var kind = ts.stringToToken(entry.name);
                 switch (keywordFilter) {
                     case 0 /* None */:
                         return false;
                     case 1 /* All */:
-                        return kind === 121 /* AsyncKeyword */ || 122 /* AwaitKeyword */ || !ts.isContextualKeyword(kind) && !isClassMemberCompletionKeyword(kind) || kind === 125 /* DeclareKeyword */ || kind === 130 /* ModuleKeyword */
-                            || ts.isTypeKeyword(kind) && kind !== 141 /* UndefinedKeyword */;
+                        return isFunctionLikeBodyKeyword(kind)
+                            || kind === 126 /* DeclareKeyword */
+                            || kind === 131 /* ModuleKeyword */
+                            || ts.isTypeKeyword(kind) && kind !== 142 /* UndefinedKeyword */;
+                    case 5 /* FunctionLikeBodyKeywords */:
+                        return isFunctionLikeBodyKeyword(kind);
                     case 2 /* ClassElementKeywords */:
                         return isClassMemberCompletionKeyword(kind);
                     case 3 /* InterfaceElementKeywords */:
                         return isInterfaceOrTypeLiteralCompletionKeyword(kind);
                     case 4 /* ConstructorParameterKeywords */:
                         return ts.isParameterPropertyModifier(kind);
-                    case 5 /* FunctionLikeBodyKeywords */:
-                        return isFunctionLikeBodyKeyword(kind);
-                    case 6 /* TypeKeywords */:
+                    case 6 /* TypeAssertionKeywords */:
+                        return ts.isTypeKeyword(kind) || kind === 78 /* ConstKeyword */;
+                    case 7 /* TypeKeywords */:
                         return ts.isTypeKeyword(kind);
                     default:
                         return ts.Debug.assertNever(keywordFilter);
                 }
             }));
         }
+        function isTypeScriptOnlyKeyword(kind) {
+            switch (kind) {
+                case 119 /* AbstractKeyword */:
+                case 121 /* AnyKeyword */:
+                case 147 /* BigIntKeyword */:
+                case 124 /* BooleanKeyword */:
+                case 126 /* DeclareKeyword */:
+                case 85 /* EnumKeyword */:
+                case 146 /* GlobalKeyword */:
+                case 110 /* ImplementsKeyword */:
+                case 128 /* InferKeyword */:
+                case 111 /* InterfaceKeyword */:
+                case 129 /* IsKeyword */:
+                case 130 /* KeyOfKeyword */:
+                case 131 /* ModuleKeyword */:
+                case 132 /* NamespaceKeyword */:
+                case 133 /* NeverKeyword */:
+                case 136 /* NumberKeyword */:
+                case 137 /* ObjectKeyword */:
+                case 114 /* PrivateKeyword */:
+                case 115 /* ProtectedKeyword */:
+                case 116 /* PublicKeyword */:
+                case 134 /* ReadonlyKeyword */:
+                case 139 /* StringKeyword */:
+                case 140 /* SymbolKeyword */:
+                case 141 /* TypeKeyword */:
+                case 143 /* UniqueKeyword */:
+                case 144 /* UnknownKeyword */:
+                    return true;
+                default:
+                    return false;
+            }
+        }
         function isInterfaceOrTypeLiteralCompletionKeyword(kind) {
-            return kind === 133 /* ReadonlyKeyword */;
+            return kind === 134 /* ReadonlyKeyword */;
         }
         function isClassMemberCompletionKeyword(kind) {
             switch (kind) {
-                case 118 /* AbstractKeyword */:
-                case 124 /* ConstructorKeyword */:
-                case 126 /* GetKeyword */:
-                case 137 /* SetKeyword */:
-                case 121 /* AsyncKeyword */:
+                case 119 /* AbstractKeyword */:
+                case 125 /* ConstructorKeyword */:
+                case 127 /* GetKeyword */:
+                case 138 /* SetKeyword */:
+                case 122 /* AsyncKeyword */:
                     return true;
                 default:
                     return ts.isClassMemberModifier(kind);
             }
         }
         function isFunctionLikeBodyKeyword(kind) {
-            return kind === 121 /* AsyncKeyword */ || kind === 122 /* AwaitKeyword */ || !ts.isContextualKeyword(kind) && !isClassMemberCompletionKeyword(kind);
+            return kind === 122 /* AsyncKeyword */
+                || kind === 123 /* AwaitKeyword */
+                || !ts.isContextualKeyword(kind) && !isClassMemberCompletionKeyword(kind);
         }
         function keywordForNode(node) {
             return ts.isIdentifier(node) ? node.originalKeywordKind || 0 /* Unknown */ : node.kind;
@@ -100019,16 +103110,21 @@ var ts;
          * Returns the immediate owning class declaration of a context token,
          * on the condition that one exists and that the context implies completion should be given.
          */
-        function tryGetObjectTypeDeclarationCompletionContainer(sourceFile, contextToken, location) {
+        function tryGetObjectTypeDeclarationCompletionContainer(sourceFile, contextToken, location, position) {
             // class c { method() { } | method2() { } }
             switch (location.kind) {
-                case 311 /* SyntaxList */:
+                case 313 /* SyntaxList */:
                     return ts.tryCast(location.parent, ts.isObjectTypeDeclaration);
                 case 1 /* EndOfFileToken */:
                     var cls = ts.tryCast(ts.lastOrUndefined(ts.cast(location.parent, ts.isSourceFile).statements), ts.isObjectTypeDeclaration);
                     if (cls && !ts.findChildOfKind(cls, 19 /* CloseBraceToken */, sourceFile)) {
                         return cls;
                     }
+                    break;
+                case 73 /* Identifier */: // class c extends React.Component { a: () => 1\n compon| }
+                    if (isFromObjectTypeDeclaration(location)) {
+                        return ts.findAncestor(location, ts.isObjectTypeDeclaration);
+                    }
             }
             if (!contextToken)
                 return undefined;
@@ -100043,8 +103139,13 @@ var ts;
                 case 27 /* CommaToken */: // class c {getValue(): number, | }
                     return ts.tryCast(contextToken.parent, ts.isObjectTypeDeclaration);
                 default:
-                    if (!isFromObjectTypeDeclaration(contextToken))
+                    if (!isFromObjectTypeDeclaration(contextToken)) {
+                        // class c extends React.Component { a: () => 1\n| }
+                        if (ts.getLineAndCharacterOfPosition(sourceFile, contextToken.getEnd()).line !== ts.getLineAndCharacterOfPosition(sourceFile, position).line && ts.isObjectTypeDeclaration(location)) {
+                            return location;
+                        }
                         return undefined;
+                    }
                     var isValidKeyword = ts.isClassLike(contextToken.parent.parent) ? isClassMemberCompletionKeyword : isInterfaceOrTypeLiteralCompletionKeyword;
                     return (isValidKeyword(contextToken.kind) || contextToken.kind === 40 /* AsteriskToken */ || ts.isIdentifier(contextToken) && isValidKeyword(ts.stringToToken(contextToken.text))) // TODO: GH#18217
                         ? contextToken.parent.parent : undefined;
@@ -100131,40 +103232,40 @@ var ts;
         }
         function getHighlightSpans(node, sourceFile) {
             switch (node.kind) {
-                case 91 /* IfKeyword */:
-                case 83 /* ElseKeyword */:
+                case 92 /* IfKeyword */:
+                case 84 /* ElseKeyword */:
                     return ts.isIfStatement(node.parent) ? getIfElseOccurrences(node.parent, sourceFile) : undefined;
-                case 97 /* ReturnKeyword */:
+                case 98 /* ReturnKeyword */:
                     return useParent(node.parent, ts.isReturnStatement, getReturnOccurrences);
-                case 101 /* ThrowKeyword */:
+                case 102 /* ThrowKeyword */:
                     return useParent(node.parent, ts.isThrowStatement, getThrowOccurrences);
-                case 103 /* TryKeyword */:
-                case 75 /* CatchKeyword */:
-                case 88 /* FinallyKeyword */:
-                    var tryStatement = node.kind === 75 /* CatchKeyword */ ? node.parent.parent : node.parent;
+                case 104 /* TryKeyword */:
+                case 76 /* CatchKeyword */:
+                case 89 /* FinallyKeyword */:
+                    var tryStatement = node.kind === 76 /* CatchKeyword */ ? node.parent.parent : node.parent;
                     return useParent(tryStatement, ts.isTryStatement, getTryCatchFinallyOccurrences);
-                case 99 /* SwitchKeyword */:
+                case 100 /* SwitchKeyword */:
                     return useParent(node.parent, ts.isSwitchStatement, getSwitchCaseDefaultOccurrences);
-                case 74 /* CaseKeyword */:
-                case 80 /* DefaultKeyword */:
+                case 75 /* CaseKeyword */:
+                case 81 /* DefaultKeyword */:
                     return useParent(node.parent.parent.parent, ts.isSwitchStatement, getSwitchCaseDefaultOccurrences);
-                case 73 /* BreakKeyword */:
-                case 78 /* ContinueKeyword */:
+                case 74 /* BreakKeyword */:
+                case 79 /* ContinueKeyword */:
                     return useParent(node.parent, ts.isBreakOrContinueStatement, getBreakOrContinueStatementOccurrences);
-                case 89 /* ForKeyword */:
-                case 107 /* WhileKeyword */:
-                case 82 /* DoKeyword */:
+                case 90 /* ForKeyword */:
+                case 108 /* WhileKeyword */:
+                case 83 /* DoKeyword */:
                     return useParent(node.parent, function (n) { return ts.isIterationStatement(n, /*lookInLabeledStatements*/ true); }, getLoopBreakContinueOccurrences);
-                case 124 /* ConstructorKeyword */:
-                    return getFromAllDeclarations(ts.isConstructorDeclaration, [124 /* ConstructorKeyword */]);
-                case 126 /* GetKeyword */:
-                case 137 /* SetKeyword */:
-                    return getFromAllDeclarations(ts.isAccessor, [126 /* GetKeyword */, 137 /* SetKeyword */]);
-                case 122 /* AwaitKeyword */:
+                case 125 /* ConstructorKeyword */:
+                    return getFromAllDeclarations(ts.isConstructorDeclaration, [125 /* ConstructorKeyword */]);
+                case 127 /* GetKeyword */:
+                case 138 /* SetKeyword */:
+                    return getFromAllDeclarations(ts.isAccessor, [127 /* GetKeyword */, 138 /* SetKeyword */]);
+                case 123 /* AwaitKeyword */:
                     return useParent(node.parent, ts.isAwaitExpression, getAsyncAndAwaitOccurrences);
-                case 121 /* AsyncKeyword */:
+                case 122 /* AsyncKeyword */:
                     return highlightSpans(getAsyncAndAwaitOccurrences(node));
-                case 117 /* YieldKeyword */:
+                case 118 /* YieldKeyword */:
                     return highlightSpans(getYieldOccurrences(node));
                 default:
                     return ts.isModifierKind(node.kind) && (ts.isDeclaration(node.parent) || ts.isVariableStatement(node.parent))
@@ -100207,7 +103308,7 @@ var ts;
             var child = throwStatement;
             while (child.parent) {
                 var parent = child.parent;
-                if (ts.isFunctionBlock(parent) || parent.kind === 284 /* SourceFile */) {
+                if (ts.isFunctionBlock(parent) || parent.kind === 285 /* SourceFile */) {
                     return parent;
                 }
                 // A throw-statement is only owned by a try-statement if the try-statement has
@@ -100239,16 +103340,16 @@ var ts;
         function getBreakOrContinueOwner(statement) {
             return ts.findAncestor(statement, function (node) {
                 switch (node.kind) {
-                    case 232 /* SwitchStatement */:
-                        if (statement.kind === 228 /* ContinueStatement */) {
+                    case 233 /* SwitchStatement */:
+                        if (statement.kind === 229 /* ContinueStatement */) {
                             return false;
                         }
                     // falls through
-                    case 225 /* ForStatement */:
-                    case 226 /* ForInStatement */:
-                    case 227 /* ForOfStatement */:
-                    case 224 /* WhileStatement */:
-                    case 223 /* DoStatement */:
+                    case 226 /* ForStatement */:
+                    case 227 /* ForInStatement */:
+                    case 228 /* ForOfStatement */:
+                    case 225 /* WhileStatement */:
+                    case 224 /* DoStatement */:
                         return !statement.label || isLabeledBy(node, statement.label.escapedText);
                     default:
                         // Don't cross function boundaries.
@@ -100264,11 +103365,11 @@ var ts;
             // Types of node whose children might have modifiers.
             var container = declaration.parent;
             switch (container.kind) {
-                case 245 /* ModuleBlock */:
-                case 284 /* SourceFile */:
-                case 218 /* Block */:
-                case 271 /* CaseClause */:
-                case 272 /* DefaultClause */:
+                case 246 /* ModuleBlock */:
+                case 285 /* SourceFile */:
+                case 219 /* Block */:
+                case 272 /* CaseClause */:
+                case 273 /* DefaultClause */:
                     // Container is either a class declaration or the declaration is a classDeclaration
                     if (modifierFlag & 128 /* Abstract */ && ts.isClassDeclaration(declaration)) {
                         return declaration.members.concat([declaration]);
@@ -100276,12 +103377,12 @@ var ts;
                     else {
                         return container.statements;
                     }
-                case 157 /* Constructor */:
-                case 156 /* MethodDeclaration */:
-                case 239 /* FunctionDeclaration */:
+                case 158 /* Constructor */:
+                case 157 /* MethodDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     return container.parameters.concat((ts.isClassLike(container.parent) ? container.parent.members : []));
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
                     var nodes = container.members;
                     // If we're an accessibility modifier, we're in an instance member and should search
                     // the constructor's parameter list for instance members as well.
@@ -100312,12 +103413,12 @@ var ts;
         }
         function getLoopBreakContinueOccurrences(loopNode) {
             var keywords = [];
-            if (pushKeywordIf(keywords, loopNode.getFirstToken(), 89 /* ForKeyword */, 107 /* WhileKeyword */, 82 /* DoKeyword */)) {
+            if (pushKeywordIf(keywords, loopNode.getFirstToken(), 90 /* ForKeyword */, 108 /* WhileKeyword */, 83 /* DoKeyword */)) {
                 // If we succeeded and got a do-while loop, then start looking for a 'while' keyword.
-                if (loopNode.kind === 223 /* DoStatement */) {
+                if (loopNode.kind === 224 /* DoStatement */) {
                     var loopTokens = loopNode.getChildren();
                     for (var i = loopTokens.length - 1; i >= 0; i--) {
-                        if (pushKeywordIf(keywords, loopTokens[i], 107 /* WhileKeyword */)) {
+                        if (pushKeywordIf(keywords, loopTokens[i], 108 /* WhileKeyword */)) {
                             break;
                         }
                     }
@@ -100325,7 +103426,7 @@ var ts;
             }
             ts.forEach(aggregateAllBreakAndContinueStatements(loopNode.statement), function (statement) {
                 if (ownsBreakOrContinueStatement(loopNode, statement)) {
-                    pushKeywordIf(keywords, statement.getFirstToken(), 73 /* BreakKeyword */, 78 /* ContinueKeyword */);
+                    pushKeywordIf(keywords, statement.getFirstToken(), 74 /* BreakKeyword */, 79 /* ContinueKeyword */);
                 }
             });
             return keywords;
@@ -100334,13 +103435,13 @@ var ts;
             var owner = getBreakOrContinueOwner(breakOrContinueStatement);
             if (owner) {
                 switch (owner.kind) {
-                    case 225 /* ForStatement */:
-                    case 226 /* ForInStatement */:
-                    case 227 /* ForOfStatement */:
-                    case 223 /* DoStatement */:
-                    case 224 /* WhileStatement */:
+                    case 226 /* ForStatement */:
+                    case 227 /* ForInStatement */:
+                    case 228 /* ForOfStatement */:
+                    case 224 /* DoStatement */:
+                    case 225 /* WhileStatement */:
                         return getLoopBreakContinueOccurrences(owner);
-                    case 232 /* SwitchStatement */:
+                    case 233 /* SwitchStatement */:
                         return getSwitchCaseDefaultOccurrences(owner);
                 }
             }
@@ -100348,13 +103449,13 @@ var ts;
         }
         function getSwitchCaseDefaultOccurrences(switchStatement) {
             var keywords = [];
-            pushKeywordIf(keywords, switchStatement.getFirstToken(), 99 /* SwitchKeyword */);
+            pushKeywordIf(keywords, switchStatement.getFirstToken(), 100 /* SwitchKeyword */);
             // Go through each clause in the switch statement, collecting the 'case'/'default' keywords.
             ts.forEach(switchStatement.caseBlock.clauses, function (clause) {
-                pushKeywordIf(keywords, clause.getFirstToken(), 74 /* CaseKeyword */, 80 /* DefaultKeyword */);
+                pushKeywordIf(keywords, clause.getFirstToken(), 75 /* CaseKeyword */, 81 /* DefaultKeyword */);
                 ts.forEach(aggregateAllBreakAndContinueStatements(clause), function (statement) {
                     if (ownsBreakOrContinueStatement(switchStatement, statement)) {
-                        pushKeywordIf(keywords, statement.getFirstToken(), 73 /* BreakKeyword */);
+                        pushKeywordIf(keywords, statement.getFirstToken(), 74 /* BreakKeyword */);
                     }
                 });
             });
@@ -100362,13 +103463,13 @@ var ts;
         }
         function getTryCatchFinallyOccurrences(tryStatement, sourceFile) {
             var keywords = [];
-            pushKeywordIf(keywords, tryStatement.getFirstToken(), 103 /* TryKeyword */);
+            pushKeywordIf(keywords, tryStatement.getFirstToken(), 104 /* TryKeyword */);
             if (tryStatement.catchClause) {
-                pushKeywordIf(keywords, tryStatement.catchClause.getFirstToken(), 75 /* CatchKeyword */);
+                pushKeywordIf(keywords, tryStatement.catchClause.getFirstToken(), 76 /* CatchKeyword */);
             }
             if (tryStatement.finallyBlock) {
-                var finallyKeyword = ts.findChildOfKind(tryStatement, 88 /* FinallyKeyword */, sourceFile);
-                pushKeywordIf(keywords, finallyKeyword, 88 /* FinallyKeyword */);
+                var finallyKeyword = ts.findChildOfKind(tryStatement, 89 /* FinallyKeyword */, sourceFile);
+                pushKeywordIf(keywords, finallyKeyword, 89 /* FinallyKeyword */);
             }
             return keywords;
         }
@@ -100379,13 +103480,13 @@ var ts;
             }
             var keywords = [];
             ts.forEach(aggregateOwnedThrowStatements(owner), function (throwStatement) {
-                keywords.push(ts.findChildOfKind(throwStatement, 101 /* ThrowKeyword */, sourceFile));
+                keywords.push(ts.findChildOfKind(throwStatement, 102 /* ThrowKeyword */, sourceFile));
             });
             // If the "owner" is a function, then we equate 'return' and 'throw' statements in their
             // ability to "jump out" of the function, and include occurrences for both.
             if (ts.isFunctionBlock(owner)) {
                 ts.forEachReturnStatement(owner, function (returnStatement) {
-                    keywords.push(ts.findChildOfKind(returnStatement, 97 /* ReturnKeyword */, sourceFile));
+                    keywords.push(ts.findChildOfKind(returnStatement, 98 /* ReturnKeyword */, sourceFile));
                 });
             }
             return keywords;
@@ -100397,11 +103498,11 @@ var ts;
             }
             var keywords = [];
             ts.forEachReturnStatement(ts.cast(func.body, ts.isBlock), function (returnStatement) {
-                keywords.push(ts.findChildOfKind(returnStatement, 97 /* ReturnKeyword */, sourceFile));
+                keywords.push(ts.findChildOfKind(returnStatement, 98 /* ReturnKeyword */, sourceFile));
             });
             // Include 'throw' statements that do not occur within a try block.
             ts.forEach(aggregateOwnedThrowStatements(func.body), function (throwStatement) {
-                keywords.push(ts.findChildOfKind(throwStatement, 101 /* ThrowKeyword */, sourceFile));
+                keywords.push(ts.findChildOfKind(throwStatement, 102 /* ThrowKeyword */, sourceFile));
             });
             return keywords;
         }
@@ -100413,13 +103514,13 @@ var ts;
             var keywords = [];
             if (func.modifiers) {
                 func.modifiers.forEach(function (modifier) {
-                    pushKeywordIf(keywords, modifier, 121 /* AsyncKeyword */);
+                    pushKeywordIf(keywords, modifier, 122 /* AsyncKeyword */);
                 });
             }
             ts.forEachChild(func, function (child) {
                 traverseWithoutCrossingFunction(child, function (node) {
                     if (ts.isAwaitExpression(node)) {
-                        pushKeywordIf(keywords, node.getFirstToken(), 122 /* AwaitKeyword */);
+                        pushKeywordIf(keywords, node.getFirstToken(), 123 /* AwaitKeyword */);
                     }
                 });
             });
@@ -100434,7 +103535,7 @@ var ts;
             ts.forEachChild(func, function (child) {
                 traverseWithoutCrossingFunction(child, function (node) {
                     if (ts.isYieldExpression(node)) {
-                        pushKeywordIf(keywords, node.getFirstToken(), 117 /* YieldKeyword */);
+                        pushKeywordIf(keywords, node.getFirstToken(), 118 /* YieldKeyword */);
                     }
                 });
             });
@@ -100453,7 +103554,7 @@ var ts;
             // We'd like to highlight else/ifs together if they are only separated by whitespace
             // (i.e. the keywords are separated by no comments, no newlines).
             for (var i = 0; i < keywords.length; i++) {
-                if (keywords[i].kind === 83 /* ElseKeyword */ && i < keywords.length - 1) {
+                if (keywords[i].kind === 84 /* ElseKeyword */ && i < keywords.length - 1) {
                     var elseKeyword = keywords[i];
                     var ifKeyword = keywords[i + 1]; // this *should* always be an 'if' keyword.
                     var shouldCombineElseAndIf = true;
@@ -100488,10 +103589,10 @@ var ts;
             // Now traverse back down through the else branches, aggregating if/else keywords of if-statements.
             while (true) {
                 var children = ifStatement.getChildren(sourceFile);
-                pushKeywordIf(keywords, children[0], 91 /* IfKeyword */);
+                pushKeywordIf(keywords, children[0], 92 /* IfKeyword */);
                 // Generally the 'else' keyword is second-to-last, so we traverse backwards.
                 for (var i = children.length - 1; i >= 0; i--) {
-                    if (pushKeywordIf(keywords, children[i], 83 /* ElseKeyword */)) {
+                    if (pushKeywordIf(keywords, children[i], 84 /* ElseKeyword */)) {
                         break;
                     }
                 }
@@ -100707,12 +103808,12 @@ var ts;
                         if (cancellationToken)
                             cancellationToken.throwIfCancellationRequested();
                         switch (direct.kind) {
-                            case 191 /* CallExpression */:
+                            case 192 /* CallExpression */:
                                 if (!isAvailableThroughGlobal) {
                                     var parent = direct.parent;
-                                    if (exportKind === 2 /* ExportEquals */ && parent.kind === 237 /* VariableDeclaration */) {
+                                    if (exportKind === 2 /* ExportEquals */ && parent.kind === 238 /* VariableDeclaration */) {
                                         var name = parent.name;
-                                        if (name.kind === 72 /* Identifier */) {
+                                        if (name.kind === 73 /* Identifier */) {
                                             directImports.push(name);
                                             break;
                                         }
@@ -100721,22 +103822,22 @@ var ts;
                                     addIndirectUser(direct.getSourceFile());
                                 }
                                 break;
-                            case 72 /* Identifier */: // for 'const x = require("y");
+                            case 73 /* Identifier */: // for 'const x = require("y");
                                 break; // TODO: GH#23879
-                            case 248 /* ImportEqualsDeclaration */:
+                            case 249 /* ImportEqualsDeclaration */:
                                 handleNamespaceImport(direct, direct.name, ts.hasModifier(direct, 1 /* Export */), /*alreadyAddedDirect*/ false);
                                 break;
-                            case 249 /* ImportDeclaration */:
+                            case 250 /* ImportDeclaration */:
                                 directImports.push(direct);
                                 var namedBindings = direct.importClause && direct.importClause.namedBindings;
-                                if (namedBindings && namedBindings.kind === 251 /* NamespaceImport */) {
+                                if (namedBindings && namedBindings.kind === 252 /* NamespaceImport */) {
                                     handleNamespaceImport(direct, namedBindings.name, /*isReExport*/ false, /*alreadyAddedDirect*/ true);
                                 }
                                 else if (!isAvailableThroughGlobal && ts.isDefaultImport(direct)) {
                                     addIndirectUser(getSourceFileLikeForImportDeclaration(direct)); // Add a check for indirect uses to handle synthetic default imports
                                 }
                                 break;
-                            case 255 /* ExportDeclaration */:
+                            case 256 /* ExportDeclaration */:
                                 if (!direct.exportClause) {
                                     // This is `export * from "foo"`, so imports of this module may import the export too.
                                     handleDirectImports(getContainingModuleSymbol(direct, checker));
@@ -100746,11 +103847,11 @@ var ts;
                                     directImports.push(direct);
                                 }
                                 break;
-                            case 183 /* ImportType */:
+                            case 184 /* ImportType */:
                                 directImports.push(direct);
                                 break;
                             default:
-                                ts.Debug.assertNever(direct, "Unexpected import kind: " + ts.Debug.showSyntaxKind(direct));
+                                ts.Debug.failBadSyntaxKind(direct, "Unexpected import kind.");
                         }
                     }
                 }
@@ -100763,7 +103864,7 @@ var ts;
                 }
                 else if (!isAvailableThroughGlobal) {
                     var sourceFileLike = getSourceFileLikeForImportDeclaration(importDeclaration);
-                    ts.Debug.assert(sourceFileLike.kind === 284 /* SourceFile */ || sourceFileLike.kind === 244 /* ModuleDeclaration */);
+                    ts.Debug.assert(sourceFileLike.kind === 285 /* SourceFile */ || sourceFileLike.kind === 245 /* ModuleDeclaration */);
                     if (isReExport || findNamespaceReExports(sourceFileLike, name, checker)) {
                         addIndirectUsers(sourceFileLike);
                     }
@@ -100818,17 +103919,17 @@ var ts;
             }
             return { importSearches: importSearches, singleReferences: singleReferences };
             function handleImport(decl) {
-                if (decl.kind === 248 /* ImportEqualsDeclaration */) {
+                if (decl.kind === 249 /* ImportEqualsDeclaration */) {
                     if (isExternalModuleImportEquals(decl)) {
                         handleNamespaceImportLike(decl.name);
                     }
                     return;
                 }
-                if (decl.kind === 72 /* Identifier */) {
+                if (decl.kind === 73 /* Identifier */) {
                     handleNamespaceImportLike(decl);
                     return;
                 }
-                if (decl.kind === 183 /* ImportType */) {
+                if (decl.kind === 184 /* ImportType */) {
                     if (decl.qualifier) {
                         if (ts.isIdentifier(decl.qualifier) && decl.qualifier.escapedText === ts.symbolName(exportSymbol)) {
                             singleReferences.push(decl.qualifier);
@@ -100843,17 +103944,17 @@ var ts;
                 if (decl.moduleSpecifier.kind !== 10 /* StringLiteral */) {
                     return;
                 }
-                if (decl.kind === 255 /* ExportDeclaration */) {
+                if (decl.kind === 256 /* ExportDeclaration */) {
                     searchForNamedImport(decl.exportClause);
                     return;
                 }
                 var _a = decl.importClause || { name: undefined, namedBindings: undefined }, name = _a.name, namedBindings = _a.namedBindings;
                 if (namedBindings) {
                     switch (namedBindings.kind) {
-                        case 251 /* NamespaceImport */:
+                        case 252 /* NamespaceImport */:
                             handleNamespaceImportLike(namedBindings.name);
                             break;
-                        case 252 /* NamedImports */:
+                        case 253 /* NamedImports */:
                             // 'default' might be accessed as a named import `{ default as foo }`.
                             if (exportKind === 0 /* Named */ || exportKind === 1 /* Default */) {
                                 searchForNamedImport(namedBindings);
@@ -100872,7 +103973,7 @@ var ts;
                 }
             }
             /**
-             * `import x = require("./x") or `import * as x from "./x"`.
+             * `import x = require("./x")` or `import * as x from "./x"`.
              * An `export =` may be imported by this syntax, so it may be a direct import.
              * If it's not a direct import, it will be in `indirectUsers`, so we don't have to do anything here.
              */
@@ -100903,7 +104004,7 @@ var ts;
                         }
                     }
                     else {
-                        var localSymbol = element.kind === 257 /* ExportSpecifier */ && element.propertyName
+                        var localSymbol = element.kind === 258 /* ExportSpecifier */ && element.propertyName
                             ? checker.getExportSpecifierLocalTargetSymbol(element) // For re-exporting under a different name, we want to get the re-exported symbol.
                             : checker.getSymbolAtLocation(name);
                         addSearch(name, localSymbol);
@@ -100932,7 +104033,7 @@ var ts;
             for (var _i = 0, sourceFiles_1 = sourceFiles; _i < sourceFiles_1.length; _i++) {
                 var referencingFile = sourceFiles_1[_i];
                 var searchSourceFile = searchModuleSymbol.valueDeclaration;
-                if (searchSourceFile.kind === 284 /* SourceFile */) {
+                if (searchSourceFile.kind === 285 /* SourceFile */) {
                     for (var _a = 0, _b = referencingFile.referencedFiles; _a < _b.length; _a++) {
                         var ref = _b[_a];
                         if (program.getSourceFileFromReference(referencingFile, ref) === searchSourceFile) {
@@ -100980,7 +104081,7 @@ var ts;
         }
         /** Iterates over all statements at the top level or in module declarations. Returns the first truthy result. */
         function forEachPossibleImportOrExportStatement(sourceFileLike, action) {
-            return ts.forEach(sourceFileLike.kind === 284 /* SourceFile */ ? sourceFileLike.statements : sourceFileLike.body.statements, function (statement) {
+            return ts.forEach(sourceFileLike.kind === 285 /* SourceFile */ ? sourceFileLike.statements : sourceFileLike.body.statements, function (statement) {
                 return action(statement) || (isAmbientModuleDeclaration(statement) && ts.forEach(statement.body && statement.body.statements, action));
             });
         }
@@ -100995,15 +104096,15 @@ var ts;
             else {
                 forEachPossibleImportOrExportStatement(sourceFile, function (statement) {
                     switch (statement.kind) {
-                        case 255 /* ExportDeclaration */:
-                        case 249 /* ImportDeclaration */: {
+                        case 256 /* ExportDeclaration */:
+                        case 250 /* ImportDeclaration */: {
                             var decl = statement;
                             if (decl.moduleSpecifier && ts.isStringLiteral(decl.moduleSpecifier)) {
                                 action(decl, decl.moduleSpecifier);
                             }
                             break;
                         }
-                        case 248 /* ImportEqualsDeclaration */: {
+                        case 249 /* ImportEqualsDeclaration */: {
                             var decl = statement;
                             if (isExternalModuleImportEquals(decl)) {
                                 action(decl, decl.moduleReference.expression);
@@ -101027,7 +104128,7 @@ var ts;
                 var parent = node.parent;
                 var grandParent = parent.parent;
                 if (symbol.exportSymbol) {
-                    if (parent.kind === 189 /* PropertyAccessExpression */) {
+                    if (parent.kind === 190 /* PropertyAccessExpression */) {
                         // When accessing an export of a JS module, there's no alias. The symbol will still be flagged as an export even though we're at the use.
                         // So check that we are at the declaration.
                         return symbol.declarations.some(function (d) { return d === parent; }) && ts.isBinaryExpression(grandParent)
@@ -101093,7 +104194,7 @@ var ts;
                     var sym = useLhsSymbol ? checker.getSymbolAtLocation(ts.cast(node.left, ts.isPropertyAccessExpression).name) : symbol;
                     // Better detection for GH#20803
                     if (sym && !(checker.getMergedSymbol(sym.parent).flags & 1536 /* Module */)) {
-                        ts.Debug.fail("Special property assignment kind does not have a module as its parent. Assignment is " + ts.Debug.showSymbol(sym) + ", parent is " + ts.Debug.showSymbol(sym.parent));
+                        ts.Debug.fail("Special property assignment kind does not have a module as its parent. Assignment is " + ts.Debug.formatSymbol(sym) + ", parent is " + ts.Debug.formatSymbol(sym.parent));
                     }
                     return sym && exportInfo(sym, kind);
                 }
@@ -101149,10 +104250,10 @@ var ts;
         // If a reference is a class expression, the exported node would be its parent.
         // If a reference is a variable declaration, the exported node would be the variable statement.
         function getExportNode(parent, node) {
-            if (parent.kind === 237 /* VariableDeclaration */) {
+            if (parent.kind === 238 /* VariableDeclaration */) {
                 var p = parent;
                 return p.name !== node ? undefined :
-                    p.parent.kind === 274 /* CatchClause */ ? undefined : p.parent.parent.kind === 219 /* VariableStatement */ ? p.parent.parent : undefined;
+                    p.parent.kind === 275 /* CatchClause */ ? undefined : p.parent.parent.kind === 220 /* VariableStatement */ ? p.parent.parent : undefined;
             }
             else {
                 return parent;
@@ -101161,13 +104262,13 @@ var ts;
         function isNodeImport(node) {
             var parent = node.parent;
             switch (parent.kind) {
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return parent.name === node && isExternalModuleImportEquals(parent);
-                case 253 /* ImportSpecifier */:
+                case 254 /* ImportSpecifier */:
                     // For a rename import `{ foo as bar }`, don't search for the imported symbol. Just find local uses of `bar`.
                     return !parent.propertyName;
-                case 250 /* ImportClause */:
-                case 251 /* NamespaceImport */:
+                case 251 /* ImportClause */:
+                case 252 /* NamespaceImport */:
                     ts.Debug.assert(parent.name === node);
                     return true;
                 default:
@@ -101200,21 +104301,21 @@ var ts;
             return checker.getMergedSymbol(getSourceFileLikeForImportDeclaration(importer).symbol);
         }
         function getSourceFileLikeForImportDeclaration(node) {
-            if (node.kind === 191 /* CallExpression */) {
+            if (node.kind === 192 /* CallExpression */) {
                 return node.getSourceFile();
             }
             var parent = node.parent;
-            if (parent.kind === 284 /* SourceFile */) {
+            if (parent.kind === 285 /* SourceFile */) {
                 return parent;
             }
-            ts.Debug.assert(parent.kind === 245 /* ModuleBlock */);
+            ts.Debug.assert(parent.kind === 246 /* ModuleBlock */);
             return ts.cast(parent.parent, isAmbientModuleDeclaration);
         }
         function isAmbientModuleDeclaration(node) {
-            return node.kind === 244 /* ModuleDeclaration */ && node.name.kind === 10 /* StringLiteral */;
+            return node.kind === 245 /* ModuleDeclaration */ && node.name.kind === 10 /* StringLiteral */;
         }
         function isExternalModuleImportEquals(eq) {
-            return eq.moduleReference.kind === 259 /* ExternalModuleReference */ && eq.moduleReference.expression.kind === 10 /* StringLiteral */;
+            return eq.moduleReference.kind === 260 /* ExternalModuleReference */ && eq.moduleReference.expression.kind === 10 /* StringLiteral */;
         }
     })(FindAllReferences = ts.FindAllReferences || (ts.FindAllReferences = {}));
 })(ts || (ts = {}));
@@ -101241,9 +104342,131 @@ var ts;
         })(EntryKind = FindAllReferences.EntryKind || (FindAllReferences.EntryKind = {}));
         function nodeEntry(node, kind) {
             if (kind === void 0) { kind = 1 /* Node */; }
-            return { kind: kind, node: node.name || node };
+            return {
+                kind: kind,
+                node: node.name || node,
+                context: getContextNodeForNodeEntry(node)
+            };
         }
         FindAllReferences.nodeEntry = nodeEntry;
+        function isContextWithStartAndEndNode(node) {
+            return node && node.kind === undefined;
+        }
+        FindAllReferences.isContextWithStartAndEndNode = isContextWithStartAndEndNode;
+        function getContextNodeForNodeEntry(node) {
+            if (ts.isDeclaration(node)) {
+                return getContextNode(node);
+            }
+            if (!node.parent)
+                return undefined;
+            if (!ts.isDeclaration(node.parent) && !ts.isExportAssignment(node.parent)) {
+                // Special property assignment in javascript
+                if (ts.isInJSFile(node)) {
+                    var binaryExpression = ts.isBinaryExpression(node.parent) ?
+                        node.parent :
+                        ts.isPropertyAccessExpression(node.parent) &&
+                            ts.isBinaryExpression(node.parent.parent) &&
+                            node.parent.parent.left === node.parent ?
+                            node.parent.parent :
+                            undefined;
+                    if (binaryExpression && ts.getAssignmentDeclarationKind(binaryExpression) !== 0 /* None */) {
+                        return getContextNode(binaryExpression);
+                    }
+                }
+                // Jsx Tags
+                if (ts.isJsxOpeningElement(node.parent) || ts.isJsxClosingElement(node.parent)) {
+                    return node.parent.parent;
+                }
+                else if (ts.isJsxSelfClosingElement(node.parent) ||
+                    ts.isLabeledStatement(node.parent) ||
+                    ts.isBreakOrContinueStatement(node.parent)) {
+                    return node.parent;
+                }
+                else if (ts.isStringLiteralLike(node)) {
+                    var validImport = ts.tryGetImportFromModuleSpecifier(node);
+                    if (validImport) {
+                        var declOrStatement = ts.findAncestor(validImport, function (node) {
+                            return ts.isDeclaration(node) ||
+                                ts.isStatement(node) ||
+                                ts.isJSDocTag(node);
+                        });
+                        return ts.isDeclaration(declOrStatement) ?
+                            getContextNode(declOrStatement) :
+                            declOrStatement;
+                    }
+                }
+                // Handle computed property name
+                var propertyName = ts.findAncestor(node, ts.isComputedPropertyName);
+                return propertyName ?
+                    getContextNode(propertyName.parent) :
+                    undefined;
+            }
+            if (node.parent.name === node || // node is name of declaration, use parent
+                ts.isConstructorDeclaration(node.parent) ||
+                ts.isExportAssignment(node.parent) ||
+                // Property name of the import export specifier or binding pattern, use parent
+                ((ts.isImportOrExportSpecifier(node.parent) || ts.isBindingElement(node.parent))
+                    && node.parent.propertyName === node) ||
+                // Is default export
+                (node.kind === 81 /* DefaultKeyword */ && ts.hasModifier(node.parent, 513 /* ExportDefault */))) {
+                return getContextNode(node.parent);
+            }
+            return undefined;
+        }
+        function getContextNode(node) {
+            if (!node)
+                return undefined;
+            switch (node.kind) {
+                case 238 /* VariableDeclaration */:
+                    return !ts.isVariableDeclarationList(node.parent) || node.parent.declarations.length !== 1 ?
+                        node :
+                        ts.isVariableStatement(node.parent.parent) ?
+                            node.parent.parent :
+                            ts.isForInOrOfStatement(node.parent.parent) ?
+                                getContextNode(node.parent.parent) :
+                                node.parent;
+                case 187 /* BindingElement */:
+                    return getContextNode(node.parent.parent);
+                case 254 /* ImportSpecifier */:
+                    return node.parent.parent.parent;
+                case 258 /* ExportSpecifier */:
+                case 252 /* NamespaceImport */:
+                    return node.parent.parent;
+                case 251 /* ImportClause */:
+                    return node.parent;
+                case 205 /* BinaryExpression */:
+                    return ts.isExpressionStatement(node.parent) ?
+                        node.parent :
+                        node;
+                case 228 /* ForOfStatement */:
+                case 227 /* ForInStatement */:
+                    return {
+                        start: node.initializer,
+                        end: node.expression
+                    };
+                case 276 /* PropertyAssignment */:
+                case 277 /* ShorthandPropertyAssignment */:
+                    return ts.isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent) ?
+                        getContextNode(ts.findAncestor(node.parent, function (node) {
+                            return ts.isBinaryExpression(node) || ts.isForInOrOfStatement(node);
+                        })) :
+                        node;
+                default:
+                    return node;
+            }
+        }
+        FindAllReferences.getContextNode = getContextNode;
+        function toContextSpan(textSpan, sourceFile, context) {
+            if (!context)
+                return undefined;
+            var contextSpan = isContextWithStartAndEndNode(context) ?
+                getTextSpan(context.start, sourceFile, context.end) :
+                getTextSpan(context, sourceFile);
+            return contextSpan.start !== textSpan.start || contextSpan.length !== textSpan.length ?
+                { contextSpan: contextSpan } :
+                undefined;
+        }
+        FindAllReferences.toContextSpan = toContextSpan;
         function findReferencedSymbols(program, cancellationToken, sourceFiles, sourceFile, position) {
             var node = ts.getTouchingPropertyName(sourceFile, position);
             var referencedSymbols = FindAllReferences.Core.getReferencedSymbolsForNode(position, node, program, sourceFiles, cancellationToken);
@@ -101266,18 +104489,18 @@ var ts;
         }
         FindAllReferences.getImplementationsAtPosition = getImplementationsAtPosition;
         function getImplementationReferenceEntries(program, cancellationToken, sourceFiles, node, position) {
-            if (node.kind === 284 /* SourceFile */) {
+            if (node.kind === 285 /* SourceFile */) {
                 return undefined;
             }
             var checker = program.getTypeChecker();
             // If invoked directly on a shorthand property assignment, then return
             // the declaration of the symbol being assigned (not the symbol being assigned to).
-            if (node.parent.kind === 276 /* ShorthandPropertyAssignment */) {
+            if (node.parent.kind === 277 /* ShorthandPropertyAssignment */) {
                 var result_1 = [];
                 FindAllReferences.Core.getReferenceEntriesForShorthandPropertyAssignment(node, checker, function (node) { return result_1.push(nodeEntry(node)); });
                 return result_1;
             }
-            else if (node.kind === 98 /* SuperKeyword */ || ts.isSuperProperty(node.parent)) {
+            else if (node.kind === 99 /* SuperKeyword */ || ts.isSuperProperty(node.parent)) {
                 // References to and accesses on the super keyword only have one possible implementation, so no
                 // need to "Find all References"
                 var symbol = checker.getSymbolAtLocation(node);
@@ -101308,7 +104531,16 @@ var ts;
                         var symbol = def.symbol;
                         var _a = getDefinitionKindAndDisplayParts(symbol, checker, originalNode), displayParts_1 = _a.displayParts, kind_1 = _a.kind;
                         var name_1 = displayParts_1.map(function (p) { return p.text; }).join("");
-                        return { node: symbol.declarations ? ts.getNameOfDeclaration(ts.first(symbol.declarations)) || ts.first(symbol.declarations) : originalNode, name: name_1, kind: kind_1, displayParts: displayParts_1 };
+                        var declaration = symbol.declarations ? ts.first(symbol.declarations) : undefined;
+                        return {
+                            node: declaration ?
+                                ts.getNameOfDeclaration(declaration) || declaration :
+                                originalNode,
+                            name: name_1,
+                            kind: kind_1,
+                            displayParts: displayParts_1,
+                            context: getContextNode(declaration)
+                        };
                     }
                     case 1 /* Label */: {
                         var node_1 = def.node;
@@ -101333,9 +104565,13 @@ var ts;
                         return ts.Debug.assertNever(def);
                 }
             })();
-            var node = info.node, name = info.name, kind = info.kind, displayParts = info.displayParts;
+            var node = info.node, name = info.name, kind = info.kind, displayParts = info.displayParts, context = info.context;
             var sourceFile = node.getSourceFile();
-            return { containerKind: "" /* unknown */, containerName: "", fileName: sourceFile.fileName, kind: kind, name: name, textSpan: getTextSpan(ts.isComputedPropertyName(node) ? node.expression : node, sourceFile), displayParts: displayParts };
+            var textSpan = getTextSpan(ts.isComputedPropertyName(node) ? node.expression : node, sourceFile);
+            return __assign({ containerKind: "" /* unknown */, containerName: "", fileName: sourceFile.fileName, kind: kind,
+                name: name,
+                textSpan: textSpan,
+                displayParts: displayParts }, toContextSpan(textSpan, sourceFile, context));
         }
         function getDefinitionKindAndDisplayParts(symbol, checker, node) {
             var meaning = FindAllReferences.Core.getIntersectingMeaningFromDeclarations(node, symbol);
@@ -101348,20 +104584,14 @@ var ts;
         }
         FindAllReferences.toRenameLocation = toRenameLocation;
         function toReferenceEntry(entry) {
-            var _a = entryToDocumentSpan(entry), textSpan = _a.textSpan, fileName = _a.fileName;
+            var documentSpan = entryToDocumentSpan(entry);
             if (entry.kind === 0 /* Span */) {
-                return { textSpan: textSpan, fileName: fileName, isWriteAccess: false, isDefinition: false };
+                return __assign({}, documentSpan, { isWriteAccess: false, isDefinition: false });
             }
             var kind = entry.kind, node = entry.node;
-            return {
-                textSpan: textSpan,
-                fileName: fileName,
-                isWriteAccess: isWriteAccessForReference(node),
-                isDefinition: node.kind === 80 /* DefaultKeyword */
+            return __assign({}, documentSpan, { isWriteAccess: isWriteAccessForReference(node), isDefinition: node.kind === 81 /* DefaultKeyword */
                     || !!ts.getDeclarationFromName(node)
-                    || ts.isLiteralComputedPropertyDeclarationName(node),
-                isInString: kind === 2 /* StringLiteral */ ? true : undefined,
-            };
+                    || ts.isLiteralComputedPropertyDeclarationName(node), isInString: kind === 2 /* StringLiteral */ ? true : undefined });
         }
         FindAllReferences.toReferenceEntry = toReferenceEntry;
         function entryToDocumentSpan(entry) {
@@ -101370,7 +104600,8 @@ var ts;
             }
             else {
                 var sourceFile = entry.node.getSourceFile();
-                return { textSpan: getTextSpan(entry.node, sourceFile), fileName: sourceFile.fileName };
+                var textSpan = getTextSpan(entry.node, sourceFile);
+                return __assign({ textSpan: textSpan, fileName: sourceFile.fileName }, toContextSpan(textSpan, sourceFile, entry.context));
             }
         }
         function getPrefixAndSuffixText(entry, originalNode, checker) {
@@ -101399,14 +104630,13 @@ var ts;
             return ts.emptyOptions;
         }
         function toImplementationLocation(entry, checker) {
+            var documentSpan = entryToDocumentSpan(entry);
             if (entry.kind !== 0 /* Span */) {
                 var node = entry.node;
-                var sourceFile = node.getSourceFile();
-                return __assign({ textSpan: getTextSpan(node, sourceFile), fileName: sourceFile.fileName }, implementationKindDisplayParts(node, checker));
+                return __assign({}, documentSpan, implementationKindDisplayParts(node, checker));
             }
             else {
-                var textSpan = entry.textSpan, fileName = entry.fileName;
-                return { textSpan: textSpan, fileName: fileName, kind: "" /* unknown */, displayParts: [] };
+                return __assign({}, documentSpan, { kind: "" /* unknown */, displayParts: [] });
             }
         }
         function implementationKindDisplayParts(node, checker) {
@@ -101414,13 +104644,13 @@ var ts;
             if (symbol) {
                 return getDefinitionKindAndDisplayParts(symbol, checker, node);
             }
-            else if (node.kind === 188 /* ObjectLiteralExpression */) {
+            else if (node.kind === 189 /* ObjectLiteralExpression */) {
                 return {
                     kind: "interface" /* interfaceElement */,
                     displayParts: [ts.punctuationPart(20 /* OpenParenToken */), ts.textPart("object literal"), ts.punctuationPart(21 /* CloseParenToken */)]
                 };
             }
-            else if (node.kind === 209 /* ClassExpression */) {
+            else if (node.kind === 210 /* ClassExpression */) {
                 return {
                     kind: "local class" /* localClassElement */,
                     displayParts: [ts.punctuationPart(20 /* OpenParenToken */), ts.textPart("anonymous local class"), ts.punctuationPart(21 /* CloseParenToken */)]
@@ -101431,25 +104661,26 @@ var ts;
             }
         }
         function toHighlightSpan(entry) {
+            var documentSpan = entryToDocumentSpan(entry);
             if (entry.kind === 0 /* Span */) {
-                var fileName = entry.fileName, textSpan = entry.textSpan;
-                return { fileName: fileName, span: { textSpan: textSpan, kind: "reference" /* reference */ } };
+                return {
+                    fileName: documentSpan.fileName,
+                    span: {
+                        textSpan: documentSpan.textSpan,
+                        kind: "reference" /* reference */
+                    }
+                };
             }
-            var node = entry.node, kind = entry.kind;
-            var sourceFile = node.getSourceFile();
-            var writeAccess = isWriteAccessForReference(node);
-            var span = {
-                textSpan: getTextSpan(node, sourceFile),
-                kind: writeAccess ? "writtenReference" /* writtenReference */ : "reference" /* reference */,
-                isInString: kind === 2 /* StringLiteral */ ? true : undefined,
-            };
-            return { fileName: sourceFile.fileName, span: span };
+            var writeAccess = isWriteAccessForReference(entry.node);
+            var span = __assign({ textSpan: documentSpan.textSpan, kind: writeAccess ? "writtenReference" /* writtenReference */ : "reference" /* reference */, isInString: entry.kind === 2 /* StringLiteral */ ? true : undefined }, documentSpan.contextSpan && { contextSpan: documentSpan.contextSpan });
+            return { fileName: documentSpan.fileName, span: span };
         }
         FindAllReferences.toHighlightSpan = toHighlightSpan;
-        function getTextSpan(node, sourceFile) {
+        function getTextSpan(node, sourceFile, endNode) {
             var start = node.getStart(sourceFile);
-            var end = node.getEnd();
+            var end = (endNode || node).getEnd();
             if (node.kind === 10 /* StringLiteral */) {
+                ts.Debug.assert(endNode === undefined);
                 start += 1;
                 end -= 1;
             }
@@ -101463,7 +104694,7 @@ var ts;
         /** A node is considered a writeAccess iff it is a name of a declaration or a target of an assignment */
         function isWriteAccessForReference(node) {
             var decl = ts.getDeclarationFromName(node);
-            return !!decl && declarationIsWriteAccess(decl) || node.kind === 80 /* DefaultKeyword */ || ts.isWriteAccess(node);
+            return !!decl && declarationIsWriteAccess(decl) || node.kind === 81 /* DefaultKeyword */ || ts.isWriteAccess(node);
         }
         /**
          * True if 'decl' provides a value, as in `function f() {}`;
@@ -101474,46 +104705,46 @@ var ts;
             if (!!(decl.flags & 4194304 /* Ambient */))
                 return true;
             switch (decl.kind) {
-                case 204 /* BinaryExpression */:
-                case 186 /* BindingElement */:
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
-                case 80 /* DefaultKeyword */:
-                case 243 /* EnumDeclaration */:
-                case 278 /* EnumMember */:
-                case 257 /* ExportSpecifier */:
-                case 250 /* ImportClause */: // default import
-                case 248 /* ImportEqualsDeclaration */:
-                case 253 /* ImportSpecifier */:
-                case 241 /* InterfaceDeclaration */:
-                case 302 /* JSDocCallbackTag */:
-                case 309 /* JSDocTypedefTag */:
-                case 267 /* JsxAttribute */:
-                case 244 /* ModuleDeclaration */:
-                case 247 /* NamespaceExportDeclaration */:
-                case 251 /* NamespaceImport */:
-                case 151 /* Parameter */:
-                case 276 /* ShorthandPropertyAssignment */:
-                case 242 /* TypeAliasDeclaration */:
-                case 150 /* TypeParameter */:
+                case 205 /* BinaryExpression */:
+                case 187 /* BindingElement */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
+                case 81 /* DefaultKeyword */:
+                case 244 /* EnumDeclaration */:
+                case 279 /* EnumMember */:
+                case 258 /* ExportSpecifier */:
+                case 251 /* ImportClause */: // default import
+                case 249 /* ImportEqualsDeclaration */:
+                case 254 /* ImportSpecifier */:
+                case 242 /* InterfaceDeclaration */:
+                case 304 /* JSDocCallbackTag */:
+                case 311 /* JSDocTypedefTag */:
+                case 268 /* JsxAttribute */:
+                case 245 /* ModuleDeclaration */:
+                case 248 /* NamespaceExportDeclaration */:
+                case 252 /* NamespaceImport */:
+                case 152 /* Parameter */:
+                case 277 /* ShorthandPropertyAssignment */:
+                case 243 /* TypeAliasDeclaration */:
+                case 151 /* TypeParameter */:
                     return true;
-                case 275 /* PropertyAssignment */:
+                case 276 /* PropertyAssignment */:
                     // In `({ x: y } = 0);`, `x` is not a write access. (Won't call this function for `y`.)
                     return !ts.isArrayLiteralOrObjectLiteralDestructuringPattern(decl.parent);
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
-                case 157 /* Constructor */:
-                case 156 /* MethodDeclaration */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 158 /* Constructor */:
+                case 157 /* MethodDeclaration */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     return !!decl.body;
-                case 237 /* VariableDeclaration */:
-                case 154 /* PropertyDeclaration */:
+                case 238 /* VariableDeclaration */:
+                case 155 /* PropertyDeclaration */:
                     return !!decl.initializer || ts.isCatchClause(decl.parent);
-                case 155 /* MethodSignature */:
-                case 153 /* PropertySignature */:
-                case 310 /* JSDocPropertyTag */:
-                case 304 /* JSDocParameterTag */:
+                case 156 /* MethodSignature */:
+                case 154 /* PropertySignature */:
+                case 312 /* JSDocPropertyTag */:
+                case 306 /* JSDocParameterTag */:
                     return false;
                 default:
                     return ts.Debug.failBadSyntaxKind(decl);
@@ -101673,10 +104904,10 @@ var ts;
                 for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                     var decl = _a[_i];
                     switch (decl.kind) {
-                        case 284 /* SourceFile */:
+                        case 285 /* SourceFile */:
                             // Don't include the source file itself. (This may not be ideal behavior, but awkward to include an entire file as a reference.)
                             break;
-                        case 244 /* ModuleDeclaration */:
+                        case 245 /* ModuleDeclaration */:
                             if (sourceFilesSet.has(decl.getSourceFile().fileName)) {
                                 references.push(FindAllReferences.nodeEntry(decl.name));
                             }
@@ -101696,7 +104927,7 @@ var ts;
                             var node = ts.isBinaryExpression(decl) && ts.isPropertyAccessExpression(decl.left)
                                 ? decl.left.expression
                                 : ts.isExportAssignment(decl)
-                                    ? ts.Debug.assertDefined(ts.findChildOfKind(decl, 85 /* ExportKeyword */, sourceFile))
+                                    ? ts.Debug.assertDefined(ts.findChildOfKind(decl, 86 /* ExportKeyword */, sourceFile))
                                     : ts.getNameOfDeclaration(decl) || decl;
                             references.push(FindAllReferences.nodeEntry(node));
                         }
@@ -101723,7 +104954,7 @@ var ts;
                 if (ts.isThis(node)) {
                     return getReferencesForThisKeyword(node, sourceFiles, cancellationToken);
                 }
-                if (node.kind === 98 /* SuperKeyword */) {
+                if (node.kind === 99 /* SuperKeyword */) {
                     return getReferencesForSuperKeyword(node);
                 }
                 return undefined;
@@ -101740,34 +104971,37 @@ var ts;
                     // When renaming at an export specifier, rename the export and not the thing being exported.
                     getReferencesAtExportSpecifier(exportSpecifier.name, symbol, exportSpecifier, state.createSearch(node, originalSymbol, /*comingFrom*/ undefined), state, /*addReferencesHere*/ true, /*alwaysGetReferences*/ true);
                 }
-                else if (node && node.kind === 80 /* DefaultKeyword */) {
+                else if (node && node.kind === 81 /* DefaultKeyword */) {
                     addReference(node, symbol, state);
                     searchForImportsOfExport(node, symbol, { exportingModuleSymbol: ts.Debug.assertDefined(symbol.parent, "Expected export symbol to have a parent"), exportKind: 1 /* Default */ }, state);
                 }
                 else {
                     var search = state.createSearch(node, symbol, /*comingFrom*/ undefined, { allSearchSymbols: node ? populateSearchSymbolSet(symbol, node, checker, !!options.isForRename, !!options.providePrefixAndSuffixTextForRename, !!options.implementations) : [symbol] });
-                    // Try to get the smallest valid scope that we can limit our search to;
-                    // otherwise we'll need to search globally (i.e. include each file).
-                    var scope = getSymbolScope(symbol);
-                    if (scope) {
-                        getReferencesInContainer(scope, scope.getSourceFile(), search, state, /*addReferencesHere*/ !(ts.isSourceFile(scope) && !ts.contains(sourceFiles, scope)));
-                    }
-                    else {
-                        // Global search
-                        for (var _i = 0, _a = state.sourceFiles; _i < _a.length; _i++) {
-                            var sourceFile = _a[_i];
-                            state.cancellationToken.throwIfCancellationRequested();
-                            searchForName(sourceFile, search, state);
-                        }
-                    }
+                    getReferencesInContainerOrFiles(symbol, state, search);
                 }
                 return result;
             }
+            function getReferencesInContainerOrFiles(symbol, state, search) {
+                // Try to get the smallest valid scope that we can limit our search to;
+                // otherwise we'll need to search globally (i.e. include each file).
+                var scope = getSymbolScope(symbol);
+                if (scope) {
+                    getReferencesInContainer(scope, scope.getSourceFile(), search, state, /*addReferencesHere*/ !(ts.isSourceFile(scope) && !ts.contains(state.sourceFiles, scope)));
+                }
+                else {
+                    // Global search
+                    for (var _i = 0, _a = state.sourceFiles; _i < _a.length; _i++) {
+                        var sourceFile = _a[_i];
+                        state.cancellationToken.throwIfCancellationRequested();
+                        searchForName(sourceFile, search, state);
+                    }
+                }
+            }
             function getSpecialSearchKind(node) {
                 switch (node.kind) {
-                    case 124 /* ConstructorKeyword */:
+                    case 125 /* ConstructorKeyword */:
                         return 1 /* Constructor */;
-                    case 72 /* Identifier */:
+                    case 73 /* Identifier */:
                         if (ts.isClassLike(node.parent)) {
                             ts.Debug.assert(node.parent.name === node);
                             return 2 /* Class */;
@@ -101790,7 +105024,7 @@ var ts;
                         if (symbol.flags & 33554432 /* Transient */)
                             return undefined;
                         // Assertions for GH#21814. We should be handling SourceFile symbols in `getReferencedSymbolsForModule` instead of getting here.
-                        ts.Debug.fail("Unexpected symbol at " + ts.Debug.showSyntaxKind(node) + ": " + ts.Debug.showSymbol(symbol));
+                        ts.Debug.fail("Unexpected symbol at " + ts.Debug.formatSyntaxKind(node.kind) + ": " + ts.Debug.formatSymbol(symbol));
                     }
                     return ts.isTypeLiteralNode(decl.parent) && ts.isUnionTypeNode(decl.parent.parent)
                         ? checker.getPropertyOfType(checker.getTypeFromTypeNode(decl.parent.parent), symbol.name)
@@ -101814,9 +105048,7 @@ var ts;
              * Unlike `Search`, there is only one `State`.
              */
             var State = /** @class */ (function () {
-                function State(sourceFiles, sourceFilesSet, 
-                /** True if we're searching for constructor references. */
-                specialSearchKind, checker, cancellationToken, searchMeaning, options, result) {
+                function State(sourceFiles, sourceFilesSet, specialSearchKind, checker, cancellationToken, searchMeaning, options, result) {
                     this.sourceFiles = sourceFiles;
                     this.sourceFilesSet = sourceFilesSet;
                     this.specialSearchKind = specialSearchKind;
@@ -101897,8 +105129,8 @@ var ts;
                     var sourceId = ts.getNodeId(sourceFile);
                     var seenSymbols = this.sourceFileToSeenSymbols[sourceId] || (this.sourceFileToSeenSymbols[sourceId] = ts.createMap());
                     var anyNewSymbols = false;
-                    for (var _i = 0, symbols_2 = symbols; _i < symbols_2.length; _i++) {
-                        var sym = symbols_2[_i];
+                    for (var _i = 0, symbols_3 = symbols; _i < symbols_3.length; _i++) {
+                        var sym = symbols_3[_i];
                         anyNewSymbols = ts.addToSeen(seenSymbols, ts.getSymbolId(sym)) || anyNewSymbols;
                     }
                     return anyNewSymbols;
@@ -102005,7 +105237,7 @@ var ts;
                 // If this is the symbol of a named function expression or named class expression,
                 // then named references are limited to its own scope.
                 var declarations = symbol.declarations, flags = symbol.flags, parent = symbol.parent, valueDeclaration = symbol.valueDeclaration;
-                if (valueDeclaration && (valueDeclaration.kind === 196 /* FunctionExpression */ || valueDeclaration.kind === 209 /* ClassExpression */)) {
+                if (valueDeclaration && (valueDeclaration.kind === 197 /* FunctionExpression */ || valueDeclaration.kind === 210 /* ClassExpression */)) {
                     return valueDeclaration;
                 }
                 if (!declarations) {
@@ -102015,7 +105247,7 @@ var ts;
                 if (flags & (4 /* Property */ | 8192 /* Method */)) {
                     var privateDeclaration = ts.find(declarations, function (d) { return ts.hasModifier(d, 8 /* Private */); });
                     if (privateDeclaration) {
-                        return ts.getAncestor(privateDeclaration, 240 /* ClassDeclaration */);
+                        return ts.getAncestor(privateDeclaration, 241 /* ClassDeclaration */);
                     }
                     // Else this is a public property and could be accessed from anywhere.
                     return undefined;
@@ -102044,7 +105276,7 @@ var ts;
                         // Different declarations have different containers, bail out
                         return undefined;
                     }
-                    if (!container || container.kind === 284 /* SourceFile */ && !ts.isExternalOrCommonJsModule(container)) {
+                    if (!container || container.kind === 285 /* SourceFile */ && !ts.isExternalOrCommonJsModule(container)) {
                         // This is a global variable and not an external module, any declaration defined
                         // within this scope is visible outside the file
                         return undefined;
@@ -102131,8 +105363,8 @@ var ts;
                     // We found a match.  Make sure it's not part of a larger word (i.e. the char
                     // before and after it have to be a non-identifier char).
                     var endPosition = position + symbolNameLength;
-                    if ((position === 0 || !ts.isIdentifierPart(text.charCodeAt(position - 1), 7 /* Latest */)) &&
-                        (endPosition === sourceLength || !ts.isIdentifierPart(text.charCodeAt(endPosition), 7 /* Latest */))) {
+                    if ((position === 0 || !ts.isIdentifierPart(text.charCodeAt(position - 1), 99 /* Latest */)) &&
+                        (endPosition === sourceLength || !ts.isIdentifierPart(text.charCodeAt(endPosition), 99 /* Latest */))) {
                         // Found a real match.  Keep searching.
                         positions.push(position);
                     }
@@ -102152,7 +105384,7 @@ var ts;
             function isValidReferencePosition(node, searchSymbolName) {
                 // Compare the length so we filter out strict superstrings of the symbol we are looking for
                 switch (node.kind) {
-                    case 72 /* Identifier */:
+                    case 73 /* Identifier */:
                         return node.text.length === searchSymbolName.length;
                     case 10 /* StringLiteral */: {
                         var str = node;
@@ -102161,7 +105393,7 @@ var ts;
                     }
                     case 8 /* NumericLiteral */:
                         return ts.isLiteralNameOfPropertyDeclarationOrIndexAccess(node) && node.text.length === searchSymbolName.length;
-                    case 80 /* DefaultKeyword */:
+                    case 81 /* DefaultKeyword */:
                         return "default".length === searchSymbolName.length;
                     default:
                         return false;
@@ -102225,7 +105457,7 @@ var ts;
                     return;
                 }
                 if (ts.isExportSpecifier(parent)) {
-                    ts.Debug.assert(referenceLocation.kind === 72 /* Identifier */);
+                    ts.Debug.assert(referenceLocation.kind === 73 /* Identifier */);
                     getReferencesAtExportSpecifier(referenceLocation, referenceSymbol, parent, search, state, addReferencesHere);
                     return;
                 }
@@ -102281,7 +105513,9 @@ var ts;
                 }
                 // For `export { foo as bar }`, rename `foo`, but not `bar`.
                 if (!isForRenameWithPrefixAndSuffixText(state.options) || alwaysGetReferences) {
-                    var exportKind = referenceLocation.originalKeywordKind === 80 /* DefaultKeyword */ ? 1 /* Default */ : 0 /* Named */;
+                    var isDefaultExport = referenceLocation.originalKeywordKind === 81 /* DefaultKeyword */
+                        || exportSpecifier.name.originalKeywordKind === 81 /* DefaultKeyword */;
+                    var exportKind = isDefaultExport ? 1 /* Default */ : 0 /* Named */;
                     var exportSymbol = ts.Debug.assertDefined(exportSpecifier.symbol);
                     var exportInfo = ts.Debug.assertDefined(FindAllReferences.getExportInfo(exportSymbol, exportKind, state.checker));
                     searchForImportsOfExport(referenceLocation, exportSymbol, exportInfo, state);
@@ -102359,7 +105593,7 @@ var ts;
                 }
                 var pusher = function () { return state.referenceAdder(search.symbol); };
                 if (ts.isClassLike(referenceLocation.parent)) {
-                    ts.Debug.assert(referenceLocation.kind === 80 /* DefaultKeyword */ || referenceLocation.parent.name === referenceLocation);
+                    ts.Debug.assert(referenceLocation.kind === 81 /* DefaultKeyword */ || referenceLocation.parent.name === referenceLocation);
                     // This is the class declaration containing the constructor.
                     findOwnConstructorReferences(search.symbol, sourceFile, pusher());
                 }
@@ -102368,6 +105602,7 @@ var ts;
                     var classExtending = tryGetClassByExtendingIdentifier(referenceLocation);
                     if (classExtending) {
                         findSuperConstructorAccesses(classExtending, pusher());
+                        findInheritedConstructorReferences(classExtending, state);
                     }
                 }
             }
@@ -102385,7 +105620,7 @@ var ts;
                     }
                     if (member.body) {
                         member.body.forEachChild(function cb(node) {
-                            if (node.kind === 100 /* ThisKeyword */) {
+                            if (node.kind === 101 /* ThisKeyword */) {
                                 addRef(node);
                             }
                             else if (!ts.isFunctionLike(node) && !ts.isClassLike(node)) {
@@ -102400,38 +105635,46 @@ var ts;
              * Reference the constructor and all calls to `new this()`.
              */
             function findOwnConstructorReferences(classSymbol, sourceFile, addNode) {
-                for (var _i = 0, _a = classSymbol.members.get("__constructor" /* Constructor */).declarations; _i < _a.length; _i++) {
-                    var decl = _a[_i];
-                    var ctrKeyword = ts.findChildOfKind(decl, 124 /* ConstructorKeyword */, sourceFile);
-                    ts.Debug.assert(decl.kind === 157 /* Constructor */ && !!ctrKeyword);
-                    addNode(ctrKeyword);
-                }
-                classSymbol.exports.forEach(function (member) {
-                    var decl = member.valueDeclaration;
-                    if (decl && decl.kind === 156 /* MethodDeclaration */) {
-                        var body = decl.body;
-                        if (body) {
-                            forEachDescendantOfKind(body, 100 /* ThisKeyword */, function (thisKeyword) {
-                                if (ts.isNewExpressionTarget(thisKeyword)) {
-                                    addNode(thisKeyword);
-                                }
-                            });
-                        }
+                var constructorSymbol = getClassConstructorSymbol(classSymbol);
+                if (constructorSymbol) {
+                    for (var _i = 0, _a = constructorSymbol.declarations; _i < _a.length; _i++) {
+                        var decl = _a[_i];
+                        var ctrKeyword = ts.findChildOfKind(decl, 125 /* ConstructorKeyword */, sourceFile);
+                        ts.Debug.assert(decl.kind === 158 /* Constructor */ && !!ctrKeyword);
+                        addNode(ctrKeyword);
                     }
-                });
+                }
+                if (classSymbol.exports) {
+                    classSymbol.exports.forEach(function (member) {
+                        var decl = member.valueDeclaration;
+                        if (decl && decl.kind === 157 /* MethodDeclaration */) {
+                            var body = decl.body;
+                            if (body) {
+                                forEachDescendantOfKind(body, 101 /* ThisKeyword */, function (thisKeyword) {
+                                    if (ts.isNewExpressionTarget(thisKeyword)) {
+                                        addNode(thisKeyword);
+                                    }
+                                });
+                            }
+                        }
+                    });
+                }
+            }
+            function getClassConstructorSymbol(classSymbol) {
+                return classSymbol.members && classSymbol.members.get("__constructor" /* Constructor */);
             }
             /** Find references to `super` in the constructor of an extending class.  */
-            function findSuperConstructorAccesses(cls, addNode) {
-                var ctr = cls.symbol.members.get("__constructor" /* Constructor */);
-                if (!ctr) {
+            function findSuperConstructorAccesses(classDeclaration, addNode) {
+                var constructor = getClassConstructorSymbol(classDeclaration.symbol);
+                if (!constructor) {
                     return;
                 }
-                for (var _i = 0, _a = ctr.declarations; _i < _a.length; _i++) {
+                for (var _i = 0, _a = constructor.declarations; _i < _a.length; _i++) {
                     var decl = _a[_i];
-                    ts.Debug.assert(decl.kind === 157 /* Constructor */);
+                    ts.Debug.assert(decl.kind === 158 /* Constructor */);
                     var body = decl.body;
                     if (body) {
-                        forEachDescendantOfKind(body, 98 /* SuperKeyword */, function (node) {
+                        forEachDescendantOfKind(body, 99 /* SuperKeyword */, function (node) {
                             if (ts.isCallExpressionTarget(node)) {
                                 addNode(node);
                             }
@@ -102439,16 +105682,26 @@ var ts;
                     }
                 }
             }
+            function hasOwnConstructor(classDeclaration) {
+                return !!getClassConstructorSymbol(classDeclaration.symbol);
+            }
+            function findInheritedConstructorReferences(classDeclaration, state) {
+                if (hasOwnConstructor(classDeclaration))
+                    return;
+                var classSymbol = classDeclaration.symbol;
+                var search = state.createSearch(/*location*/ undefined, classSymbol, /*comingFrom*/ undefined);
+                getReferencesInContainerOrFiles(classSymbol, state, search);
+            }
             function addImplementationReferences(refNode, addReference, state) {
                 // Check if we found a function/propertyAssignment/method with an implementation or initializer
                 if (ts.isDeclarationName(refNode) && isImplementation(refNode.parent)) {
                     addReference(refNode);
                     return;
                 }
-                if (refNode.kind !== 72 /* Identifier */) {
+                if (refNode.kind !== 73 /* Identifier */) {
                     return;
                 }
-                if (refNode.parent.kind === 276 /* ShorthandPropertyAssignment */) {
+                if (refNode.parent.kind === 277 /* ShorthandPropertyAssignment */) {
                     // Go ahead and dereference the shorthand assignment by going to its definition
                     getReferenceEntriesForShorthandPropertyAssignment(refNode, state.checker, addReference);
                 }
@@ -102468,7 +105721,7 @@ var ts;
                     }
                     else if (ts.isFunctionLike(typeHavingNode) && typeHavingNode.body) {
                         var body = typeHavingNode.body;
-                        if (body.kind === 218 /* Block */) {
+                        if (body.kind === 219 /* Block */) {
                             ts.forEachReturnStatement(body, function (returnStatement) {
                                 if (returnStatement.expression)
                                     addIfImplementation(returnStatement.expression);
@@ -102496,13 +105749,13 @@ var ts;
              */
             function isImplementationExpression(node) {
                 switch (node.kind) {
-                    case 195 /* ParenthesizedExpression */:
+                    case 196 /* ParenthesizedExpression */:
                         return isImplementationExpression(node.expression);
-                    case 197 /* ArrowFunction */:
-                    case 196 /* FunctionExpression */:
-                    case 188 /* ObjectLiteralExpression */:
-                    case 209 /* ClassExpression */:
-                    case 187 /* ArrayLiteralExpression */:
+                    case 198 /* ArrowFunction */:
+                    case 197 /* FunctionExpression */:
+                    case 189 /* ObjectLiteralExpression */:
+                    case 210 /* ClassExpression */:
+                    case 188 /* ArrayLiteralExpression */:
                         return true;
                     default:
                         return false;
@@ -102555,13 +105808,13 @@ var ts;
                 // Whether 'super' occurs in a static context within a class.
                 var staticFlag = 32 /* Static */;
                 switch (searchSpaceNode.kind) {
-                    case 154 /* PropertyDeclaration */:
-                    case 153 /* PropertySignature */:
-                    case 156 /* MethodDeclaration */:
-                    case 155 /* MethodSignature */:
-                    case 157 /* Constructor */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
+                    case 155 /* PropertyDeclaration */:
+                    case 154 /* PropertySignature */:
+                    case 157 /* MethodDeclaration */:
+                    case 156 /* MethodSignature */:
+                    case 158 /* Constructor */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
                         staticFlag &= ts.getModifierFlags(searchSpaceNode);
                         searchSpaceNode = searchSpaceNode.parent; // re-assign to be the owning class
                         break;
@@ -102570,7 +105823,7 @@ var ts;
                 }
                 var sourceFile = searchSpaceNode.getSourceFile();
                 var references = ts.mapDefined(getPossibleSymbolReferenceNodes(sourceFile, "super", searchSpaceNode), function (node) {
-                    if (node.kind !== 98 /* SuperKeyword */) {
+                    if (node.kind !== 99 /* SuperKeyword */) {
                         return;
                     }
                     var container = ts.getSuperContainer(node, /*stopOnFunctions*/ false);
@@ -102582,41 +105835,41 @@ var ts;
                 return [{ definition: { type: 0 /* Symbol */, symbol: searchSpaceNode.symbol }, references: references }];
             }
             function isParameterName(node) {
-                return node.kind === 72 /* Identifier */ && node.parent.kind === 151 /* Parameter */ && node.parent.name === node;
+                return node.kind === 73 /* Identifier */ && node.parent.kind === 152 /* Parameter */ && node.parent.name === node;
             }
             function getReferencesForThisKeyword(thisOrSuperKeyword, sourceFiles, cancellationToken) {
                 var searchSpaceNode = ts.getThisContainer(thisOrSuperKeyword, /* includeArrowFunctions */ false);
                 // Whether 'this' occurs in a static context within a class.
                 var staticFlag = 32 /* Static */;
                 switch (searchSpaceNode.kind) {
-                    case 156 /* MethodDeclaration */:
-                    case 155 /* MethodSignature */:
+                    case 157 /* MethodDeclaration */:
+                    case 156 /* MethodSignature */:
                         if (ts.isObjectLiteralMethod(searchSpaceNode)) {
                             break;
                         }
                     // falls through
-                    case 154 /* PropertyDeclaration */:
-                    case 153 /* PropertySignature */:
-                    case 157 /* Constructor */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
+                    case 155 /* PropertyDeclaration */:
+                    case 154 /* PropertySignature */:
+                    case 158 /* Constructor */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
                         staticFlag &= ts.getModifierFlags(searchSpaceNode);
                         searchSpaceNode = searchSpaceNode.parent; // re-assign to be the owning class
                         break;
-                    case 284 /* SourceFile */:
+                    case 285 /* SourceFile */:
                         if (ts.isExternalModule(searchSpaceNode) || isParameterName(thisOrSuperKeyword)) {
                             return undefined;
                         }
                     // falls through
-                    case 239 /* FunctionDeclaration */:
-                    case 196 /* FunctionExpression */:
+                    case 240 /* FunctionDeclaration */:
+                    case 197 /* FunctionExpression */:
                         break;
                     // Computed properties in classes are not handled here because references to this are illegal,
                     // so there is no point finding references to them.
                     default:
                         return undefined;
                 }
-                var references = ts.flatMap(searchSpaceNode.kind === 284 /* SourceFile */ ? sourceFiles : [searchSpaceNode.getSourceFile()], function (sourceFile) {
+                var references = ts.flatMap(searchSpaceNode.kind === 285 /* SourceFile */ ? sourceFiles : [searchSpaceNode.getSourceFile()], function (sourceFile) {
                     cancellationToken.throwIfCancellationRequested();
                     return getPossibleSymbolReferenceNodes(sourceFile, "this", ts.isSourceFile(searchSpaceNode) ? sourceFile : searchSpaceNode).filter(function (node) {
                         if (!ts.isThis(node)) {
@@ -102624,19 +105877,19 @@ var ts;
                         }
                         var container = ts.getThisContainer(node, /* includeArrowFunctions */ false);
                         switch (searchSpaceNode.kind) {
-                            case 196 /* FunctionExpression */:
-                            case 239 /* FunctionDeclaration */:
+                            case 197 /* FunctionExpression */:
+                            case 240 /* FunctionDeclaration */:
                                 return searchSpaceNode.symbol === container.symbol;
-                            case 156 /* MethodDeclaration */:
-                            case 155 /* MethodSignature */:
+                            case 157 /* MethodDeclaration */:
+                            case 156 /* MethodSignature */:
                                 return ts.isObjectLiteralMethod(searchSpaceNode) && searchSpaceNode.symbol === container.symbol;
-                            case 209 /* ClassExpression */:
-                            case 240 /* ClassDeclaration */:
+                            case 210 /* ClassExpression */:
+                            case 241 /* ClassDeclaration */:
                                 // Make sure the container belongs to the same class
                                 // and has the appropriate static modifier from the original container.
                                 return container.parent && searchSpaceNode.symbol === container.parent.symbol && (ts.getModifierFlags(container) & 32 /* Static */) === staticFlag;
-                            case 284 /* SourceFile */:
-                                return container.kind === 284 /* SourceFile */ && !ts.isExternalModule(container) && !isParameterName(node);
+                            case 285 /* SourceFile */:
+                                return container.kind === 285 /* SourceFile */ && !ts.isExternalModule(container) && !isParameterName(node);
                         }
                     });
                 }).map(function (n) { return FindAllReferences.nodeEntry(n); });
@@ -102755,7 +106008,7 @@ var ts;
                     });
                 }
                 function getPropertySymbolOfObjectBindingPatternWithoutPropertyName(symbol, checker) {
-                    var bindingElement = ts.getDeclarationOfKind(symbol, 186 /* BindingElement */);
+                    var bindingElement = ts.getDeclarationOfKind(symbol, 187 /* BindingElement */);
                     if (bindingElement && ts.isObjectBindingElementWithoutPropertyName(bindingElement)) {
                         return ts.getPropertySymbolFromBindingElement(checker, bindingElement);
                     }
@@ -103114,7 +106367,7 @@ var ts;
                 else {
                     var defs = getDefinitionFromSymbol(typeChecker, symbol, node) || ts.emptyArray;
                     // For a 'super()' call, put the signature first, else put the variable first.
-                    return node.kind === 98 /* SuperKeyword */ ? [sigInfo].concat(defs) : defs.concat([sigInfo]);
+                    return node.kind === 99 /* SuperKeyword */ ? [sigInfo].concat(defs) : defs.concat([sigInfo]);
                 }
             }
             // Because name in short-hand property assignment has two different meanings: property name and property value,
@@ -103122,7 +106375,7 @@ var ts;
             // go to the declaration of the property name (in this case stay at the same position). However, if go-to-definition
             // is performed at the location of property access, we would like to go to definition of the property in the short-hand
             // assignment. This case and others are handled by the following code.
-            if (node.parent.kind === 276 /* ShorthandPropertyAssignment */) {
+            if (node.parent.kind === 277 /* ShorthandPropertyAssignment */) {
                 var shorthandSymbol_1 = typeChecker.getShorthandAssignmentValueSymbol(symbol.valueDeclaration);
                 return shorthandSymbol_1 ? shorthandSymbol_1.declarations.map(function (decl) { return createDefinitionInfo(decl, typeChecker, shorthandSymbol_1, node); }) : [];
             }
@@ -103178,7 +106431,7 @@ var ts;
         function getReferenceAtPosition(sourceFile, position, program) {
             var referencePath = findReferenceInPosition(sourceFile.referencedFiles, position);
             if (referencePath) {
-                var file = ts.tryResolveScriptReference(program, sourceFile, referencePath);
+                var file = program.getSourceFileFromReference(sourceFile, referencePath);
                 return file && { fileName: referencePath.fileName, file: file };
             }
             var typeReferenceDirective = findReferenceInPosition(sourceFile.typeReferenceDirectives, position);
@@ -103275,18 +106528,18 @@ var ts;
         //   (2) when the aliased symbol is originating from an import.
         //
         function shouldSkipAlias(node, declaration) {
-            if (node.kind !== 72 /* Identifier */) {
+            if (node.kind !== 73 /* Identifier */) {
                 return false;
             }
             if (node.parent === declaration) {
                 return true;
             }
             switch (declaration.kind) {
-                case 250 /* ImportClause */:
-                case 248 /* ImportEqualsDeclaration */:
+                case 251 /* ImportClause */:
+                case 249 /* ImportEqualsDeclaration */:
                     return true;
-                case 253 /* ImportSpecifier */:
-                    return declaration.parent.kind === 252 /* NamedImports */;
+                case 254 /* ImportSpecifier */:
+                    return declaration.parent.kind === 253 /* NamedImports */;
                 default:
                     return false;
             }
@@ -103296,7 +106549,7 @@ var ts;
             function getConstructSignatureDefinition() {
                 // Applicable only if we are in a new expression, or we are on a constructor declaration
                 // and in either case the symbol has a construct signature definition, i.e. class
-                if (symbol.flags & 32 /* Class */ && (ts.isNewExpressionTarget(node) || node.kind === 124 /* ConstructorKeyword */)) {
+                if (symbol.flags & 32 /* Class */ && (ts.isNewExpressionTarget(node) || node.kind === 125 /* ConstructorKeyword */)) {
                     var cls = ts.find(symbol.declarations, ts.isClassLike) || ts.Debug.fail("Expected declaration to have at least one class-like declaration");
                     return getSignatureDefinition(cls.members, /*selectConstructors*/ true);
                 }
@@ -103327,14 +106580,9 @@ var ts;
         function createDefinitionInfoFromName(declaration, symbolKind, symbolName, containerName) {
             var name = ts.getNameOfDeclaration(declaration) || declaration;
             var sourceFile = name.getSourceFile();
-            return {
-                fileName: sourceFile.fileName,
-                textSpan: ts.createTextSpanFromNode(name, sourceFile),
-                kind: symbolKind,
-                name: symbolName,
-                containerKind: undefined,
-                containerName: containerName
-            };
+            var textSpan = ts.createTextSpanFromNode(name, sourceFile);
+            return __assign({ fileName: sourceFile.fileName, textSpan: textSpan, kind: symbolKind, name: symbolName, containerKind: undefined, // TODO: GH#18217
+                containerName: containerName }, ts.FindAllReferences.toContextSpan(textSpan, sourceFile, ts.FindAllReferences.getContextNode(declaration)));
         }
         function createDefinitionFromSignatureDeclaration(typeChecker, decl) {
             return createDefinitionInfo(decl, typeChecker, decl.symbol, decl);
@@ -103370,9 +106618,9 @@ var ts;
         }
         function isConstructorLike(node) {
             switch (node.kind) {
-                case 157 /* Constructor */:
-                case 166 /* ConstructorType */:
-                case 161 /* ConstructSignature */:
+                case 158 /* Constructor */:
+                case 167 /* ConstructorType */:
+                case 162 /* ConstructSignature */:
                     return true;
                 default:
                     return false;
@@ -103490,11 +106738,11 @@ var ts;
         JsDoc.getJsDocCommentsFromDeclarations = getJsDocCommentsFromDeclarations;
         function getCommentHavingNodes(declaration) {
             switch (declaration.kind) {
-                case 304 /* JSDocParameterTag */:
-                case 310 /* JSDocPropertyTag */:
+                case 306 /* JSDocParameterTag */:
+                case 312 /* JSDocPropertyTag */:
                     return [declaration];
-                case 302 /* JSDocCallbackTag */:
-                case 309 /* JSDocTypedefTag */:
+                case 304 /* JSDocCallbackTag */:
+                case 311 /* JSDocTypedefTag */:
                     return [declaration, declaration.parent];
                 default:
                     return ts.getJSDocCommentsAndTags(declaration);
@@ -103515,16 +106763,16 @@ var ts;
         function getCommentText(tag) {
             var comment = tag.comment;
             switch (tag.kind) {
-                case 300 /* JSDocAugmentsTag */:
+                case 301 /* JSDocAugmentsTag */:
                     return withNode(tag.class);
-                case 308 /* JSDocTemplateTag */:
+                case 310 /* JSDocTemplateTag */:
                     return withList(tag.typeParameters);
-                case 307 /* JSDocTypeTag */:
+                case 309 /* JSDocTypeTag */:
                     return withNode(tag.typeExpression);
-                case 309 /* JSDocTypedefTag */:
-                case 302 /* JSDocCallbackTag */:
-                case 310 /* JSDocPropertyTag */:
-                case 304 /* JSDocParameterTag */:
+                case 311 /* JSDocTypedefTag */:
+                case 304 /* JSDocCallbackTag */:
+                case 312 /* JSDocPropertyTag */:
+                case 306 /* JSDocParameterTag */:
                     var name = tag.name;
                     return name ? withNode(name) : comment;
                 default:
@@ -103701,7 +106949,7 @@ var ts;
         function parameterDocComments(parameters, isJavaScriptFile, indentationStr, newLine) {
             return parameters.map(function (_a, i) {
                 var name = _a.name, dotDotDotToken = _a.dotDotDotToken;
-                var paramName = name.kind === 72 /* Identifier */ ? name.text : "param" + i;
+                var paramName = name.kind === 73 /* Identifier */ ? name.text : "param" + i;
                 var type = isJavaScriptFile ? (dotDotDotToken ? "{...any} " : "{any} ") : "";
                 return indentationStr + " * @param " + type + paramName + newLine;
             }).join("");
@@ -103711,23 +106959,23 @@ var ts;
         }
         function getCommentOwnerInfoWorker(commentOwner) {
             switch (commentOwner.kind) {
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
-                case 156 /* MethodDeclaration */:
-                case 157 /* Constructor */:
-                case 155 /* MethodSignature */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 157 /* MethodDeclaration */:
+                case 158 /* Constructor */:
+                case 156 /* MethodSignature */:
                     var parameters = commentOwner.parameters;
                     return { commentOwner: commentOwner, parameters: parameters };
-                case 275 /* PropertyAssignment */:
+                case 276 /* PropertyAssignment */:
                     return getCommentOwnerInfoWorker(commentOwner.initializer);
-                case 240 /* ClassDeclaration */:
-                case 241 /* InterfaceDeclaration */:
-                case 153 /* PropertySignature */:
-                case 243 /* EnumDeclaration */:
-                case 278 /* EnumMember */:
-                case 242 /* TypeAliasDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 242 /* InterfaceDeclaration */:
+                case 154 /* PropertySignature */:
+                case 244 /* EnumDeclaration */:
+                case 279 /* EnumMember */:
+                case 243 /* TypeAliasDeclaration */:
                     return { commentOwner: commentOwner };
-                case 219 /* VariableStatement */: {
+                case 220 /* VariableStatement */: {
                     var varStatement = commentOwner;
                     var varDeclarations = varStatement.declarationList.declarations;
                     var parameters_1 = varDeclarations.length === 1 && varDeclarations[0].initializer
@@ -103735,14 +106983,14 @@ var ts;
                         : undefined;
                     return { commentOwner: commentOwner, parameters: parameters_1 };
                 }
-                case 284 /* SourceFile */:
+                case 285 /* SourceFile */:
                     return "quit";
-                case 244 /* ModuleDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     // If in walking up the tree, we hit a a nested namespace declaration,
                     // then we must be somewhere within a dotted namespace name; however we don't
                     // want to give back a JSDoc template for the 'b' or 'c' in 'namespace a.b.c { }'.
-                    return commentOwner.parent.kind === 244 /* ModuleDeclaration */ ? undefined : { commentOwner: commentOwner };
-                case 204 /* BinaryExpression */: {
+                    return commentOwner.parent.kind === 245 /* ModuleDeclaration */ ? undefined : { commentOwner: commentOwner };
+                case 205 /* BinaryExpression */: {
                     var be = commentOwner;
                     if (ts.getAssignmentDeclarationKind(be) === 0 /* None */) {
                         return "quit";
@@ -103761,14 +107009,14 @@ var ts;
          * @returns the parameters of a signature found on the RHS if one exists; otherwise 'emptyArray'.
          */
         function getParametersFromRightHandSideOfAssignment(rightHandSide) {
-            while (rightHandSide.kind === 195 /* ParenthesizedExpression */) {
+            while (rightHandSide.kind === 196 /* ParenthesizedExpression */) {
                 rightHandSide = rightHandSide.expression;
             }
             switch (rightHandSide.kind) {
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
                     return rightHandSide.parameters;
-                case 209 /* ClassExpression */: {
+                case 210 /* ClassExpression */: {
                     var ctr = ts.find(rightHandSide.members, ts.isConstructorDeclaration);
                     return ctr ? ctr.parameters : ts.emptyArray;
                 }
@@ -103830,9 +107078,9 @@ var ts;
         }
         function shouldKeepItem(declaration, checker) {
             switch (declaration.kind) {
-                case 250 /* ImportClause */:
-                case 253 /* ImportSpecifier */:
-                case 248 /* ImportEqualsDeclaration */:
+                case 251 /* ImportClause */:
+                case 254 /* ImportSpecifier */:
+                case 249 /* ImportEqualsDeclaration */:
                     var importer = checker.getSymbolAtLocation(declaration.name); // TODO: GH#18217
                     var imported = checker.getAliasedSymbol(importer);
                     return importer.escapedName !== imported.escapedName;
@@ -103842,7 +107090,7 @@ var ts;
         }
         function tryAddSingleDeclarationName(declaration, containers) {
             var name = ts.getNameOfDeclaration(declaration);
-            return !!name && (pushLiteral(name, containers) || name.kind === 149 /* ComputedPropertyName */ && tryAddComputedPropertyName(name.expression, containers));
+            return !!name && (pushLiteral(name, containers) || name.kind === 150 /* ComputedPropertyName */ && tryAddComputedPropertyName(name.expression, containers));
         }
         // Only added the names of computed properties if they're simple dotted expressions, like:
         //
@@ -103859,7 +107107,7 @@ var ts;
             // First, if we started with a computed property name, then add all but the last
             // portion into the container array.
             var name = ts.getNameOfDeclaration(declaration);
-            if (name && name.kind === 149 /* ComputedPropertyName */ && !tryAddComputedPropertyName(name.expression, containers)) {
+            if (name && name.kind === 150 /* ComputedPropertyName */ && !tryAddComputedPropertyName(name.expression, containers)) {
                 return ts.emptyArray;
             }
             // Don't include the last portion.
@@ -104028,7 +107276,7 @@ var ts;
                 return;
             }
             switch (node.kind) {
-                case 157 /* Constructor */:
+                case 158 /* Constructor */:
                     // Get parameter properties, and treat them as being on the *same* level as the constructor, not under it.
                     var ctr = node;
                     addNodeWithRecursiveChild(ctr, ctr.body);
@@ -104040,21 +107288,21 @@ var ts;
                         }
                     }
                     break;
-                case 156 /* MethodDeclaration */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
-                case 155 /* MethodSignature */:
+                case 157 /* MethodDeclaration */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
+                case 156 /* MethodSignature */:
                     if (!ts.hasDynamicName(node)) {
                         addNodeWithRecursiveChild(node, node.body);
                     }
                     break;
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
                     if (!ts.hasDynamicName(node)) {
                         addLeafNode(node);
                     }
                     break;
-                case 250 /* ImportClause */:
+                case 251 /* ImportClause */:
                     var importClause = node;
                     // Handle default import case e.g.:
                     //    import d from "mod";
@@ -104066,7 +107314,7 @@ var ts;
                     //    import {a, b as B} from "mod";
                     var namedBindings = importClause.namedBindings;
                     if (namedBindings) {
-                        if (namedBindings.kind === 251 /* NamespaceImport */) {
+                        if (namedBindings.kind === 252 /* NamespaceImport */) {
                             addLeafNode(namedBindings);
                         }
                         else {
@@ -104077,8 +107325,8 @@ var ts;
                         }
                     }
                     break;
-                case 186 /* BindingElement */:
-                case 237 /* VariableDeclaration */:
+                case 187 /* BindingElement */:
+                case 238 /* VariableDeclaration */:
                     var _d = node, name = _d.name, initializer = _d.initializer;
                     if (ts.isBindingPattern(name)) {
                         addChildrenRecursively(name);
@@ -104099,12 +107347,12 @@ var ts;
                         addNodeWithRecursiveChild(node, initializer);
                     }
                     break;
-                case 197 /* ArrowFunction */:
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
                     addNodeWithRecursiveChild(node, node.body);
                     break;
-                case 243 /* EnumDeclaration */:
+                case 244 /* EnumDeclaration */:
                     startNode(node);
                     for (var _e = 0, _f = node.members; _e < _f.length; _e++) {
                         var member = _f[_e];
@@ -104114,9 +107362,9 @@ var ts;
                     }
                     endNode();
                     break;
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
-                case 241 /* InterfaceDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
+                case 242 /* InterfaceDeclaration */:
                     startNode(node);
                     for (var _g = 0, _h = node.members; _g < _h.length; _g++) {
                         var member = _h[_g];
@@ -104124,18 +107372,18 @@ var ts;
                     }
                     endNode();
                     break;
-                case 244 /* ModuleDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     addNodeWithRecursiveChild(node, getInteriorModule(node).body);
                     break;
-                case 257 /* ExportSpecifier */:
-                case 248 /* ImportEqualsDeclaration */:
-                case 162 /* IndexSignature */:
-                case 160 /* CallSignature */:
-                case 161 /* ConstructSignature */:
-                case 242 /* TypeAliasDeclaration */:
+                case 258 /* ExportSpecifier */:
+                case 249 /* ImportEqualsDeclaration */:
+                case 163 /* IndexSignature */:
+                case 161 /* CallSignature */:
+                case 162 /* ConstructSignature */:
+                case 243 /* TypeAliasDeclaration */:
                     addLeafNode(node);
                     break;
-                case 204 /* BinaryExpression */: {
+                case 205 /* BinaryExpression */: {
                     var special = ts.getAssignmentDeclarationKind(node);
                     switch (special) {
                         case 1 /* ExportsProperty */:
@@ -104217,12 +107465,12 @@ var ts;
                 return false;
             }
             switch (a.kind) {
-                case 154 /* PropertyDeclaration */:
-                case 156 /* MethodDeclaration */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 155 /* PropertyDeclaration */:
+                case 157 /* MethodDeclaration */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     return ts.hasModifier(a, 32 /* Static */) === ts.hasModifier(b, 32 /* Static */);
-                case 244 /* ModuleDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     return areSameModule(a, b);
                 default:
                     return true;
@@ -104238,7 +107486,7 @@ var ts;
         // Only merge module nodes that have the same chain. Don't merge 'A.B.C' with 'A'!
         function areSameModule(a, b) {
             // TODO: GH#18217
-            return a.body.kind === b.body.kind && (a.body.kind !== 244 /* ModuleDeclaration */ || areSameModule(a.body, b.body));
+            return a.body.kind === b.body.kind && (a.body.kind !== 245 /* ModuleDeclaration */ || areSameModule(a.body, b.body));
         }
         /** Merge source into target. Source should be thrown away after this is called. */
         function merge(target, source) {
@@ -104268,7 +107516,7 @@ var ts;
          * So `new()` can still come before an `aardvark` method.
          */
         function tryGetName(node) {
-            if (node.kind === 244 /* ModuleDeclaration */) {
+            if (node.kind === 245 /* ModuleDeclaration */) {
                 return getModuleName(node);
             }
             var declName = ts.getNameOfDeclaration(node);
@@ -104276,16 +107524,16 @@ var ts;
                 return ts.unescapeLeadingUnderscores(ts.getPropertyNameForPropertyNameNode(declName)); // TODO: GH#18217
             }
             switch (node.kind) {
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
-                case 209 /* ClassExpression */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
+                case 210 /* ClassExpression */:
                     return getFunctionOrClassName(node);
                 default:
                     return undefined;
             }
         }
         function getItemName(node, name) {
-            if (node.kind === 244 /* ModuleDeclaration */) {
+            if (node.kind === 245 /* ModuleDeclaration */) {
                 return getModuleName(node);
             }
             if (name) {
@@ -104295,16 +107543,16 @@ var ts;
                 }
             }
             switch (node.kind) {
-                case 284 /* SourceFile */:
+                case 285 /* SourceFile */:
                     var sourceFile = node;
                     return ts.isExternalModule(sourceFile)
                         ? "\"" + ts.escapeString(ts.getBaseFileName(ts.removeFileExtension(ts.normalizePath(sourceFile.fileName)))) + "\""
                         : "<global>";
-                case 197 /* ArrowFunction */:
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
+                case 198 /* ArrowFunction */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
                     if (ts.getModifierFlags(node) & 512 /* Default */) {
                         return "default";
                     }
@@ -104312,13 +107560,13 @@ var ts;
                     // (eg: "app\n.onactivated"), so we should remove the whitespace for readabiltiy in the
                     // navigation bar.
                     return getFunctionOrClassName(node);
-                case 157 /* Constructor */:
+                case 158 /* Constructor */:
                     return "constructor";
-                case 161 /* ConstructSignature */:
+                case 162 /* ConstructSignature */:
                     return "new()";
-                case 160 /* CallSignature */:
+                case 161 /* CallSignature */:
                     return "()";
-                case 162 /* IndexSignature */:
+                case 163 /* IndexSignature */:
                     return "[]";
                 default:
                     return "<unknown>";
@@ -104342,25 +107590,25 @@ var ts;
             return topLevel;
             function isTopLevel(item) {
                 switch (navigationBarNodeKind(item)) {
-                    case 240 /* ClassDeclaration */:
-                    case 209 /* ClassExpression */:
-                    case 243 /* EnumDeclaration */:
-                    case 241 /* InterfaceDeclaration */:
-                    case 244 /* ModuleDeclaration */:
-                    case 284 /* SourceFile */:
-                    case 242 /* TypeAliasDeclaration */:
-                    case 309 /* JSDocTypedefTag */:
-                    case 302 /* JSDocCallbackTag */:
+                    case 241 /* ClassDeclaration */:
+                    case 210 /* ClassExpression */:
+                    case 244 /* EnumDeclaration */:
+                    case 242 /* InterfaceDeclaration */:
+                    case 245 /* ModuleDeclaration */:
+                    case 285 /* SourceFile */:
+                    case 243 /* TypeAliasDeclaration */:
+                    case 311 /* JSDocTypedefTag */:
+                    case 304 /* JSDocCallbackTag */:
                         return true;
-                    case 157 /* Constructor */:
-                    case 156 /* MethodDeclaration */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
-                    case 237 /* VariableDeclaration */:
+                    case 158 /* Constructor */:
+                    case 157 /* MethodDeclaration */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
+                    case 238 /* VariableDeclaration */:
                         return hasSomeImportantChild(item);
-                    case 197 /* ArrowFunction */:
-                    case 239 /* FunctionDeclaration */:
-                    case 196 /* FunctionExpression */:
+                    case 198 /* ArrowFunction */:
+                    case 240 /* FunctionDeclaration */:
+                    case 197 /* FunctionExpression */:
                         return isTopLevelFunctionDeclaration(item);
                     default:
                         return false;
@@ -104370,10 +107618,10 @@ var ts;
                         return false;
                     }
                     switch (navigationBarNodeKind(item.parent)) {
-                        case 245 /* ModuleBlock */:
-                        case 284 /* SourceFile */:
-                        case 156 /* MethodDeclaration */:
-                        case 157 /* Constructor */:
+                        case 246 /* ModuleBlock */:
+                        case 285 /* SourceFile */:
+                        case 157 /* MethodDeclaration */:
+                        case 158 /* Constructor */:
                             return true;
                         default:
                             return hasSomeImportantChild(item);
@@ -104382,7 +107630,7 @@ var ts;
                 function hasSomeImportantChild(item) {
                     return ts.some(item.children, function (child) {
                         var childKind = navigationBarNodeKind(child);
-                        return childKind !== 237 /* VariableDeclaration */ && childKind !== 186 /* BindingElement */;
+                        return childKind !== 238 /* VariableDeclaration */ && childKind !== 187 /* BindingElement */;
                     });
                 }
             }
@@ -104439,7 +107687,7 @@ var ts;
             // Otherwise, we need to aggregate each identifier to build up the qualified name.
             var result = [];
             result.push(ts.getTextOfIdentifierOrLiteral(moduleDeclaration.name));
-            while (moduleDeclaration.body && moduleDeclaration.body.kind === 244 /* ModuleDeclaration */) {
+            while (moduleDeclaration.body && moduleDeclaration.body.kind === 245 /* ModuleDeclaration */) {
                 moduleDeclaration = moduleDeclaration.body;
                 result.push(ts.getTextOfIdentifierOrLiteral(moduleDeclaration.name));
             }
@@ -104453,13 +107701,13 @@ var ts;
             return decl.body && ts.isModuleDeclaration(decl.body) ? getInteriorModule(decl.body) : decl;
         }
         function isComputedProperty(member) {
-            return !member.name || member.name.kind === 149 /* ComputedPropertyName */;
+            return !member.name || member.name.kind === 150 /* ComputedPropertyName */;
         }
         function getNodeSpan(node) {
-            return node.kind === 284 /* SourceFile */ ? ts.createTextSpanFromRange(node) : ts.createTextSpanFromNode(node, curSourceFile);
+            return node.kind === 285 /* SourceFile */ ? ts.createTextSpanFromRange(node) : ts.createTextSpanFromNode(node, curSourceFile);
         }
         function getModifiers(node) {
-            if (node.parent && node.parent.kind === 237 /* VariableDeclaration */) {
+            if (node.parent && node.parent.kind === 238 /* VariableDeclaration */) {
                 node = node.parent;
             }
             return ts.getNodeModifiers(node);
@@ -104474,7 +107722,7 @@ var ts;
                 return ts.declarationNameToString(parent.name);
             }
             // See if it is of the form "<expr> = function(){...}". If so, use the text from the left-hand side.
-            else if (ts.isBinaryExpression(parent) && parent.operatorToken.kind === 59 /* EqualsToken */) {
+            else if (ts.isBinaryExpression(parent) && parent.operatorToken.kind === 60 /* EqualsToken */) {
                 return nodeText(parent.left).replace(whiteSpaceRegex, "");
             }
             // See if it is a property assignment, and if so use the property name
@@ -104512,9 +107760,9 @@ var ts;
         }
         function isFunctionOrClassExpression(node) {
             switch (node.kind) {
-                case 197 /* ArrowFunction */:
-                case 196 /* FunctionExpression */:
-                case 209 /* ClassExpression */:
+                case 198 /* ArrowFunction */:
+                case 197 /* FunctionExpression */:
+                case 210 /* ClassExpression */:
                     return true;
                 default:
                     return false;
@@ -104596,7 +107844,7 @@ var ts;
             var usedImports = [];
             for (var _i = 0, oldImports_1 = oldImports; _i < oldImports_1.length; _i++) {
                 var importDecl = oldImports_1[_i];
-                var importClause = importDecl.importClause;
+                var importClause = importDecl.importClause, moduleSpecifier = importDecl.moduleSpecifier;
                 if (!importClause) {
                     // Imports without import clauses are assumed to be included for their side effects and are not removed.
                     usedImports.push(importDecl);
@@ -104627,6 +107875,20 @@ var ts;
                 if (name || namedBindings) {
                     usedImports.push(updateImportDeclarationAndClause(importDecl, name, namedBindings));
                 }
+                // If a module is imported to be augmented, it’s used
+                else if (hasModuleDeclarationMatchingSpecifier(sourceFile, moduleSpecifier)) {
+                    // If we’re in a declaration file, it’s safe to remove the import clause from it
+                    if (sourceFile.isDeclarationFile) {
+                        usedImports.push(ts.createImportDeclaration(importDecl.decorators, importDecl.modifiers, 
+                        /*importClause*/ undefined, moduleSpecifier));
+                    }
+                    // If we’re not in a declaration file, we can’t remove the import clause even though
+                    // the imported symbols are unused, because removing them makes it look like the import
+                    // declaration has side effects, which will cause it to be preserved in the JS emit.
+                    else {
+                        usedImports.push(importDecl);
+                    }
+                }
             }
             return usedImports;
             function isDeclarationUsed(identifier) {
@@ -104634,6 +107896,13 @@ var ts;
                 return jsxElementsPresent && (identifier.text === jsxNamespace) || ts.FindAllReferences.Core.isSymbolReferencedInFile(identifier, typeChecker, sourceFile);
             }
         }
+        function hasModuleDeclarationMatchingSpecifier(sourceFile, moduleSpecifier) {
+            var moduleSpecifierText = ts.isStringLiteral(moduleSpecifier) && moduleSpecifier.text;
+            return ts.isString(moduleSpecifierText) && ts.some(sourceFile.moduleAugmentations, function (moduleName) {
+                return ts.isStringLiteral(moduleName)
+                    && moduleName.text === moduleSpecifierText;
+            });
+        }
         function getExternalModuleName(specifier) {
             return specifier !== undefined && ts.isStringLiteralLike(specifier)
                 ? specifier.text
@@ -104841,7 +108110,7 @@ var ts;
                 }
                 var lastImport = current - 1;
                 if (lastImport !== firstImport) {
-                    out.push(createOutliningSpanFromBounds(ts.findChildOfKind(statements[firstImport], 92 /* ImportKeyword */, sourceFile).getStart(sourceFile), statements[lastImport].getEnd(), "imports" /* Imports */));
+                    out.push(createOutliningSpanFromBounds(ts.findChildOfKind(statements[firstImport], 93 /* ImportKeyword */, sourceFile).getStart(sourceFile), statements[lastImport].getEnd(), "imports" /* Imports */));
                 }
             }
             function visitNonImportNode(n) {
@@ -104882,9 +108151,9 @@ var ts;
         function addRegionOutliningSpans(sourceFile, out) {
             var regions = [];
             var lineStarts = sourceFile.getLineStarts();
-            for (var i = 0; i < lineStarts.length; i++) {
-                var currentLineStart = lineStarts[i];
-                var lineEnd = i + 1 === lineStarts.length ? sourceFile.getEnd() : lineStarts[i + 1] - 1;
+            for (var _i = 0, lineStarts_1 = lineStarts; _i < lineStarts_1.length; _i++) {
+                var currentLineStart = lineStarts_1[_i];
+                var lineEnd = sourceFile.getLineEndOfPosition(currentLineStart);
                 var lineText = sourceFile.text.substring(currentLineStart, lineEnd);
                 var result = isRegionDelimiter(lineText);
                 if (!result || ts.isInComment(sourceFile, currentLineStart)) {
@@ -104958,31 +108227,31 @@ var ts;
         }
         function getOutliningSpanForNode(n, sourceFile) {
             switch (n.kind) {
-                case 218 /* Block */:
-                    if (ts.isFunctionBlock(n)) {
-                        return spanForNode(n.parent, /*autoCollapse*/ n.parent.kind !== 197 /* ArrowFunction */);
+                case 219 /* Block */:
+                    if (ts.isFunctionLike(n.parent)) {
+                        return functionSpan(n.parent, n, sourceFile);
                     }
                     // Check if the block is standalone, or 'attached' to some parent statement.
                     // If the latter, we want to collapse the block, but consider its hint span
                     // to be the entire span of the parent.
                     switch (n.parent.kind) {
-                        case 223 /* DoStatement */:
-                        case 226 /* ForInStatement */:
-                        case 227 /* ForOfStatement */:
-                        case 225 /* ForStatement */:
-                        case 222 /* IfStatement */:
-                        case 224 /* WhileStatement */:
-                        case 231 /* WithStatement */:
-                        case 274 /* CatchClause */:
+                        case 224 /* DoStatement */:
+                        case 227 /* ForInStatement */:
+                        case 228 /* ForOfStatement */:
+                        case 226 /* ForStatement */:
+                        case 223 /* IfStatement */:
+                        case 225 /* WhileStatement */:
+                        case 232 /* WithStatement */:
+                        case 275 /* CatchClause */:
                             return spanForNode(n.parent);
-                        case 235 /* TryStatement */:
+                        case 236 /* TryStatement */:
                             // Could be the try-block, or the finally-block.
                             var tryStatement = n.parent;
                             if (tryStatement.tryBlock === n) {
                                 return spanForNode(n.parent);
                             }
                             else if (tryStatement.finallyBlock === n) {
-                                return spanForNode(ts.findChildOfKind(tryStatement, 88 /* FinallyKeyword */, sourceFile));
+                                return spanForNode(ts.findChildOfKind(tryStatement, 89 /* FinallyKeyword */, sourceFile));
                             }
                         // falls through
                         default:
@@ -104990,22 +108259,24 @@ var ts;
                             // the span of the block, independent of any parent span.
                             return createOutliningSpan(ts.createTextSpanFromNode(n, sourceFile), "code" /* Code */);
                     }
-                case 245 /* ModuleBlock */:
+                case 246 /* ModuleBlock */:
                     return spanForNode(n.parent);
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
-                case 241 /* InterfaceDeclaration */:
-                case 243 /* EnumDeclaration */:
-                case 246 /* CaseBlock */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
+                case 242 /* InterfaceDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 247 /* CaseBlock */:
                     return spanForNode(n);
-                case 188 /* ObjectLiteralExpression */:
+                case 189 /* ObjectLiteralExpression */:
                     return spanForObjectOrArrayLiteral(n);
-                case 187 /* ArrayLiteralExpression */:
+                case 188 /* ArrayLiteralExpression */:
                     return spanForObjectOrArrayLiteral(n, 22 /* OpenBracketToken */);
-                case 260 /* JsxElement */:
+                case 261 /* JsxElement */:
                     return spanForJSXElement(n);
-                case 261 /* JsxSelfClosingElement */:
-                case 262 /* JsxOpeningElement */:
+                case 265 /* JsxFragment */:
+                    return spanForJSXFragment(n);
+                case 262 /* JsxSelfClosingElement */:
+                case 263 /* JsxOpeningElement */:
                     return spanForJSXAttributes(n.attributes);
             }
             function spanForJSXElement(node) {
@@ -105014,6 +108285,11 @@ var ts;
                 var bannerText = "<" + tagName + ">...</" + tagName + ">";
                 return createOutliningSpan(textSpan, "code" /* Code */, textSpan, /*autoCollapse*/ false, bannerText);
             }
+            function spanForJSXFragment(node) {
+                var textSpan = ts.createTextSpanFromBounds(node.openingFragment.getStart(sourceFile), node.closingFragment.getEnd());
+                var bannerText = "<>...</>";
+                return createOutliningSpan(textSpan, "code" /* Code */, textSpan, /*autoCollapse*/ false, bannerText);
+            }
             function spanForJSXAttributes(node) {
                 if (node.properties.length === 0) {
                     return undefined;
@@ -105027,20 +108303,29 @@ var ts;
                 // Otherwise, the collapsed section will include the end of the previous line.
                 return spanForNode(node, /*autoCollapse*/ false, /*useFullStart*/ !ts.isArrayLiteralExpression(node.parent) && !ts.isCallExpression(node.parent), open);
             }
-            function spanForNode(hintSpanNode, autoCollapse, useFullStart, open) {
+            function spanForNode(hintSpanNode, autoCollapse, useFullStart, open, close) {
                 if (autoCollapse === void 0) { autoCollapse = false; }
                 if (useFullStart === void 0) { useFullStart = true; }
                 if (open === void 0) { open = 18 /* OpenBraceToken */; }
+                if (close === void 0) { close = open === 18 /* OpenBraceToken */ ? 19 /* CloseBraceToken */ : 23 /* CloseBracketToken */; }
                 var openToken = ts.findChildOfKind(n, open, sourceFile);
-                var close = open === 18 /* OpenBraceToken */ ? 19 /* CloseBraceToken */ : 23 /* CloseBracketToken */;
                 var closeToken = ts.findChildOfKind(n, close, sourceFile);
-                if (!openToken || !closeToken) {
-                    return undefined;
-                }
-                var textSpan = ts.createTextSpanFromBounds(useFullStart ? openToken.getFullStart() : openToken.getStart(sourceFile), closeToken.getEnd());
-                return createOutliningSpan(textSpan, "code" /* Code */, ts.createTextSpanFromNode(hintSpanNode, sourceFile), autoCollapse);
+                return openToken && closeToken && spanBetweenTokens(openToken, closeToken, hintSpanNode, sourceFile, autoCollapse, useFullStart);
             }
         }
+        function functionSpan(node, body, sourceFile) {
+            var openToken = ts.isNodeArrayMultiLine(node.parameters, sourceFile)
+                ? ts.findChildOfKind(node, 20 /* OpenParenToken */, sourceFile)
+                : ts.findChildOfKind(body, 18 /* OpenBraceToken */, sourceFile);
+            var closeToken = ts.findChildOfKind(body, 19 /* CloseBraceToken */, sourceFile);
+            return openToken && closeToken && spanBetweenTokens(openToken, closeToken, node, sourceFile, /*autoCollapse*/ node.kind !== 198 /* ArrowFunction */);
+        }
+        function spanBetweenTokens(openToken, closeToken, hintSpanNode, sourceFile, autoCollapse, useFullStart) {
+            if (autoCollapse === void 0) { autoCollapse = false; }
+            if (useFullStart === void 0) { useFullStart = true; }
+            var textSpan = ts.createTextSpanFromBounds(useFullStart ? openToken.getFullStart() : openToken.getStart(sourceFile), closeToken.getEnd());
+            return createOutliningSpan(textSpan, "code" /* Code */, ts.createTextSpanFromNode(hintSpanNode, sourceFile), autoCollapse);
+        }
         function createOutliningSpan(textSpan, kind, hintSpan, autoCollapse, bannerText) {
             if (hintSpan === void 0) { hintSpan = textSpan; }
             if (autoCollapse === void 0) { autoCollapse = false; }
@@ -105303,7 +108588,7 @@ var ts;
         if (ch >= 65 /* A */ && ch <= 90 /* Z */) {
             return true;
         }
-        if (ch < 127 /* maxAsciiCharacter */ || !ts.isUnicodeIdentifierStart(ch, 7 /* Latest */)) {
+        if (ch < 127 /* maxAsciiCharacter */ || !ts.isUnicodeIdentifierStart(ch, 99 /* Latest */)) {
             return false;
         }
         // TODO: find a way to determine this for any unicode characters in a
@@ -105316,7 +108601,7 @@ var ts;
         if (ch >= 97 /* a */ && ch <= 122 /* z */) {
             return true;
         }
-        if (ch < 127 /* maxAsciiCharacter */ || !ts.isUnicodeIdentifierStart(ch, 7 /* Latest */)) {
+        if (ch < 127 /* maxAsciiCharacter */ || !ts.isUnicodeIdentifierStart(ch, 99 /* Latest */)) {
             return false;
         }
         // TODO: find a way to determine this for any unicode characters in a
@@ -105568,10 +108853,10 @@ var ts;
          */
         function tryConsumeDeclare() {
             var token = ts.scanner.getToken();
-            if (token === 125 /* DeclareKeyword */) {
+            if (token === 126 /* DeclareKeyword */) {
                 // declare module "mod"
                 token = nextToken();
-                if (token === 130 /* ModuleKeyword */) {
+                if (token === 131 /* ModuleKeyword */) {
                     token = nextToken();
                     if (token === 10 /* StringLiteral */) {
                         recordAmbientExternalModule();
@@ -105589,7 +108874,7 @@ var ts;
                 return false;
             }
             var token = ts.scanner.getToken();
-            if (token === 92 /* ImportKeyword */) {
+            if (token === 93 /* ImportKeyword */) {
                 token = nextToken();
                 if (token === 20 /* OpenParenToken */) {
                     token = nextToken();
@@ -105605,9 +108890,9 @@ var ts;
                     return true;
                 }
                 else {
-                    if (token === 72 /* Identifier */ || ts.isKeyword(token)) {
+                    if (token === 73 /* Identifier */ || ts.isKeyword(token)) {
                         token = nextToken();
-                        if (token === 144 /* FromKeyword */) {
+                        if (token === 145 /* FromKeyword */) {
                             token = nextToken();
                             if (token === 10 /* StringLiteral */) {
                                 // import d from "mod";
@@ -105615,7 +108900,7 @@ var ts;
                                 return true;
                             }
                         }
-                        else if (token === 59 /* EqualsToken */) {
+                        else if (token === 60 /* EqualsToken */) {
                             if (tryConsumeRequireCall(/*skipCurrentToken*/ true)) {
                                 return true;
                             }
@@ -105638,7 +108923,7 @@ var ts;
                         }
                         if (token === 19 /* CloseBraceToken */) {
                             token = nextToken();
-                            if (token === 144 /* FromKeyword */) {
+                            if (token === 145 /* FromKeyword */) {
                                 token = nextToken();
                                 if (token === 10 /* StringLiteral */) {
                                     // import {a as A} from "mod";
@@ -105650,11 +108935,11 @@ var ts;
                     }
                     else if (token === 40 /* AsteriskToken */) {
                         token = nextToken();
-                        if (token === 119 /* AsKeyword */) {
+                        if (token === 120 /* AsKeyword */) {
                             token = nextToken();
-                            if (token === 72 /* Identifier */ || ts.isKeyword(token)) {
+                            if (token === 73 /* Identifier */ || ts.isKeyword(token)) {
                                 token = nextToken();
-                                if (token === 144 /* FromKeyword */) {
+                                if (token === 145 /* FromKeyword */) {
                                     token = nextToken();
                                     if (token === 10 /* StringLiteral */) {
                                         // import * as NS from "mod"
@@ -105672,7 +108957,7 @@ var ts;
         }
         function tryConsumeExport() {
             var token = ts.scanner.getToken();
-            if (token === 85 /* ExportKeyword */) {
+            if (token === 86 /* ExportKeyword */) {
                 markAsExternalModuleIfTopLevel();
                 token = nextToken();
                 if (token === 18 /* OpenBraceToken */) {
@@ -105684,7 +108969,7 @@ var ts;
                     }
                     if (token === 19 /* CloseBraceToken */) {
                         token = nextToken();
-                        if (token === 144 /* FromKeyword */) {
+                        if (token === 145 /* FromKeyword */) {
                             token = nextToken();
                             if (token === 10 /* StringLiteral */) {
                                 // export {a as A} from "mod";
@@ -105696,7 +108981,7 @@ var ts;
                 }
                 else if (token === 40 /* AsteriskToken */) {
                     token = nextToken();
-                    if (token === 144 /* FromKeyword */) {
+                    if (token === 145 /* FromKeyword */) {
                         token = nextToken();
                         if (token === 10 /* StringLiteral */) {
                             // export * from "mod"
@@ -105704,11 +108989,11 @@ var ts;
                         }
                     }
                 }
-                else if (token === 92 /* ImportKeyword */) {
+                else if (token === 93 /* ImportKeyword */) {
                     token = nextToken();
-                    if (token === 72 /* Identifier */ || ts.isKeyword(token)) {
+                    if (token === 73 /* Identifier */ || ts.isKeyword(token)) {
                         token = nextToken();
-                        if (token === 59 /* EqualsToken */) {
+                        if (token === 60 /* EqualsToken */) {
                             if (tryConsumeRequireCall(/*skipCurrentToken*/ true)) {
                                 return true;
                             }
@@ -105721,7 +109006,7 @@ var ts;
         }
         function tryConsumeRequireCall(skipCurrentToken) {
             var token = skipCurrentToken ? nextToken() : ts.scanner.getToken();
-            if (token === 134 /* RequireKeyword */) {
+            if (token === 135 /* RequireKeyword */) {
                 token = nextToken();
                 if (token === 20 /* OpenParenToken */) {
                     token = nextToken();
@@ -105736,7 +109021,7 @@ var ts;
         }
         function tryConsumeDefine() {
             var token = ts.scanner.getToken();
-            if (token === 72 /* Identifier */ && ts.scanner.getTokenValue() === "define") {
+            if (token === 73 /* Identifier */ && ts.scanner.getTokenValue() === "define") {
                 token = nextToken();
                 if (token !== 20 /* OpenParenToken */) {
                     return true;
@@ -105870,14 +109155,14 @@ var ts;
                 return getRenameInfoError(ts.Diagnostics.You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library);
             }
             // Cannot rename `default` as in `import { default as foo } from "./someModule";
-            if (ts.isIdentifier(node) && node.originalKeywordKind === 80 /* DefaultKeyword */ && symbol.parent.flags & 1536 /* Module */) {
+            if (ts.isIdentifier(node) && node.originalKeywordKind === 81 /* DefaultKeyword */ && symbol.parent.flags & 1536 /* Module */) {
                 return undefined;
             }
             if (ts.isStringLiteralLike(node) && ts.tryGetImportFromModuleSpecifier(node)) {
                 return options && options.allowRenameOfImportPath ? getRenameInfoForModule(node, sourceFile, symbol) : undefined;
             }
             var kind = ts.SymbolDisplay.getSymbolKind(typeChecker, symbol, node);
-            var specifierName = (ts.isImportOrExportSpecifierName(node) || ts.isStringOrNumericLiteralLike(node) && node.parent.kind === 149 /* ComputedPropertyName */)
+            var specifierName = (ts.isImportOrExportSpecifierName(node) || ts.isStringOrNumericLiteralLike(node) && node.parent.kind === 150 /* ComputedPropertyName */)
                 ? ts.stripQuotes(ts.getTextOfIdentifierOrLiteral(node))
                 : undefined;
             var displayName = specifierName || typeChecker.symbolToString(symbol);
@@ -105933,9 +109218,9 @@ var ts;
         }
         function nodeIsEligibleForRename(node) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                 case 10 /* StringLiteral */:
-                case 100 /* ThisKeyword */:
+                case 101 /* ThisKeyword */:
                     return true;
                 case 8 /* NumericLiteral */:
                     return ts.isLiteralNameOfPropertyDeclarationOrIndexAccess(node);
@@ -105947,6 +109232,284 @@ var ts;
 })(ts || (ts = {}));
 /* @internal */
 var ts;
+(function (ts) {
+    var SmartSelectionRange;
+    (function (SmartSelectionRange) {
+        function getSmartSelectionRange(pos, sourceFile) {
+            var selectionRange = {
+                textSpan: ts.createTextSpanFromBounds(sourceFile.getFullStart(), sourceFile.getEnd())
+            };
+            var parentNode = sourceFile;
+            outer: while (true) {
+                var children = getSelectionChildren(parentNode);
+                if (!children.length)
+                    break;
+                for (var i = 0; i < children.length; i++) {
+                    var prevNode = children[i - 1];
+                    var node = children[i];
+                    var nextNode = children[i + 1];
+                    if (node.getStart(sourceFile) > pos) {
+                        break outer;
+                    }
+                    if (positionShouldSnapToNode(pos, node, nextNode)) {
+                        // 1. Blocks are effectively redundant with SyntaxLists.
+                        // 2. TemplateSpans, along with the SyntaxLists containing them, are a somewhat unintuitive grouping
+                        //    of things that should be considered independently.
+                        // 3. A VariableStatement’s children are just a VaraiableDeclarationList and a semicolon.
+                        // 4. A lone VariableDeclaration in a VaraibleDeclaration feels redundant with the VariableStatement.
+                        //
+                        // Dive in without pushing a selection range.
+                        if (ts.isBlock(node)
+                            || ts.isTemplateSpan(node) || ts.isTemplateHead(node)
+                            || prevNode && ts.isTemplateHead(prevNode)
+                            || ts.isVariableDeclarationList(node) && ts.isVariableStatement(parentNode)
+                            || ts.isSyntaxList(node) && ts.isVariableDeclarationList(parentNode)
+                            || ts.isVariableDeclaration(node) && ts.isSyntaxList(parentNode) && children.length === 1) {
+                            parentNode = node;
+                            break;
+                        }
+                        // Synthesize a stop for '${ ... }' since '${' and '}' actually belong to siblings.
+                        if (ts.isTemplateSpan(parentNode) && nextNode && ts.isTemplateMiddleOrTemplateTail(nextNode)) {
+                            var start_2 = node.getFullStart() - "${".length;
+                            var end_2 = nextNode.getStart() + "}".length;
+                            pushSelectionRange(start_2, end_2);
+                        }
+                        // Blocks with braces, brackets, parens, or JSX tags on separate lines should be
+                        // selected from open to close, including whitespace but not including the braces/etc. themselves.
+                        var isBetweenMultiLineBookends = ts.isSyntaxList(node)
+                            && isListOpener(prevNode)
+                            && isListCloser(nextNode)
+                            && !ts.positionsAreOnSameLine(prevNode.getStart(), nextNode.getStart(), sourceFile);
+                        var jsDocCommentStart = ts.hasJSDocNodes(node) && node.jsDoc[0].getStart();
+                        var start = isBetweenMultiLineBookends ? prevNode.getEnd() : node.getStart();
+                        var end = isBetweenMultiLineBookends ? nextNode.getStart() : node.getEnd();
+                        if (ts.isNumber(jsDocCommentStart)) {
+                            pushSelectionRange(jsDocCommentStart, end);
+                        }
+                        pushSelectionRange(start, end);
+                        // String literals should have a stop both inside and outside their quotes.
+                        if (ts.isStringLiteral(node) || ts.isTemplateLiteral(node)) {
+                            pushSelectionRange(start + 1, end - 1);
+                        }
+                        parentNode = node;
+                        break;
+                    }
+                    // If we made it to the end of the for loop, we’re done.
+                    // In practice, I’ve only seen this happen at the very end
+                    // of a SourceFile.
+                    if (i === children.length - 1) {
+                        break outer;
+                    }
+                }
+            }
+            return selectionRange;
+            function pushSelectionRange(start, end) {
+                // Skip empty ranges
+                if (start !== end) {
+                    var textSpan = ts.createTextSpanFromBounds(start, end);
+                    if (!selectionRange || (
+                    // Skip ranges that are identical to the parent
+                    !ts.textSpansEqual(textSpan, selectionRange.textSpan) &&
+                        // Skip ranges that don’t contain the original position
+                        ts.textSpanIntersectsWithPosition(textSpan, pos))) {
+                        selectionRange = __assign({ textSpan: textSpan }, selectionRange && { parent: selectionRange });
+                    }
+                }
+            }
+        }
+        SmartSelectionRange.getSmartSelectionRange = getSmartSelectionRange;
+        /**
+         * Like `ts.positionBelongsToNode`, except positions immediately after nodes
+         * count too, unless that position belongs to the next node. In effect, makes
+         * selections able to snap to preceding tokens when the cursor is on the tail
+         * end of them with only whitespace ahead.
+         * @param pos The position to check.
+         * @param node The candidate node to snap to.
+         * @param nextNode The next sibling node in the tree.
+         * @param sourceFile The source file containing the nodes.
+         */
+        function positionShouldSnapToNode(pos, node, nextNode) {
+            // Can’t use 'ts.positionBelongsToNode()' here because it cleverly accounts
+            // for missing nodes, which can’t really be considered when deciding what
+            // to select.
+            ts.Debug.assert(node.pos <= pos);
+            if (pos < node.end) {
+                return true;
+            }
+            var nodeEnd = node.getEnd();
+            var nextNodeStart = nextNode && nextNode.getStart();
+            if (nodeEnd === pos) {
+                return pos !== nextNodeStart;
+            }
+            return false;
+        }
+        var isImport = ts.or(ts.isImportDeclaration, ts.isImportEqualsDeclaration);
+        /**
+         * Gets the children of a node to be considered for selection ranging,
+         * transforming them into an artificial tree according to their intuitive
+         * grouping where no grouping actually exists in the parse tree. For example,
+         * top-level imports are grouped into their own SyntaxList so they can be
+         * selected all together, even though in the AST they’re just siblings of each
+         * other as well as of other top-level statements and declarations.
+         */
+        function getSelectionChildren(node) {
+            // Group top-level imports
+            if (ts.isSourceFile(node)) {
+                return groupChildren(node.getChildAt(0).getChildren(), isImport);
+            }
+            // Mapped types _look_ like ObjectTypes with a single member,
+            // but in fact don’t contain a SyntaxList or a node containing
+            // the “key/value” pair like ObjectTypes do, but it seems intuitive
+            // that the selection would snap to those points. The philosophy
+            // of choosing a selection range is not so much about what the
+            // syntax currently _is_ as what the syntax might easily become
+            // if the user is making a selection; e.g., we synthesize a selection
+            // around the “key/value” pair not because there’s a node there, but
+            // because it allows the mapped type to become an object type with a
+            // few keystrokes.
+            if (ts.isMappedTypeNode(node)) {
+                var _a = node.getChildren(), openBraceToken = _a[0], children = _a.slice(1);
+                var closeBraceToken = ts.Debug.assertDefined(children.pop());
+                ts.Debug.assertEqual(openBraceToken.kind, 18 /* OpenBraceToken */);
+                ts.Debug.assertEqual(closeBraceToken.kind, 19 /* CloseBraceToken */);
+                // Group `-/+readonly` and `-/+?`
+                var groupedWithPlusMinusTokens = groupChildren(children, function (child) {
+                    return child === node.readonlyToken || child.kind === 134 /* ReadonlyKeyword */ ||
+                        child === node.questionToken || child.kind === 56 /* QuestionToken */;
+                });
+                // Group type parameter with surrounding brackets
+                var groupedWithBrackets = groupChildren(groupedWithPlusMinusTokens, function (_a) {
+                    var kind = _a.kind;
+                    return kind === 22 /* OpenBracketToken */ ||
+                        kind === 151 /* TypeParameter */ ||
+                        kind === 23 /* CloseBracketToken */;
+                });
+                return [
+                    openBraceToken,
+                    // Pivot on `:`
+                    createSyntaxList(splitChildren(groupedWithBrackets, function (_a) {
+                        var kind = _a.kind;
+                        return kind === 57 /* ColonToken */;
+                    })),
+                    closeBraceToken,
+                ];
+            }
+            // Group modifiers and property name, then pivot on `:`.
+            if (ts.isPropertySignature(node)) {
+                var children = groupChildren(node.getChildren(), function (child) {
+                    return child === node.name || ts.contains(node.modifiers, child);
+                });
+                return splitChildren(children, function (_a) {
+                    var kind = _a.kind;
+                    return kind === 57 /* ColonToken */;
+                });
+            }
+            // Group the parameter name with its `...`, then that group with its `?`, then pivot on `=`.
+            if (ts.isParameter(node)) {
+                var groupedDotDotDotAndName_1 = groupChildren(node.getChildren(), function (child) {
+                    return child === node.dotDotDotToken || child === node.name;
+                });
+                var groupedWithQuestionToken = groupChildren(groupedDotDotDotAndName_1, function (child) {
+                    return child === groupedDotDotDotAndName_1[0] || child === node.questionToken;
+                });
+                return splitChildren(groupedWithQuestionToken, function (_a) {
+                    var kind = _a.kind;
+                    return kind === 60 /* EqualsToken */;
+                });
+            }
+            // Pivot on '='
+            if (ts.isBindingElement(node)) {
+                return splitChildren(node.getChildren(), function (_a) {
+                    var kind = _a.kind;
+                    return kind === 60 /* EqualsToken */;
+                });
+            }
+            return node.getChildren();
+        }
+        /**
+         * Groups sibling nodes together into their own SyntaxList if they
+         * a) are adjacent, AND b) match a predicate function.
+         */
+        function groupChildren(children, groupOn) {
+            var result = [];
+            var group;
+            for (var _i = 0, children_1 = children; _i < children_1.length; _i++) {
+                var child = children_1[_i];
+                if (groupOn(child)) {
+                    group = group || [];
+                    group.push(child);
+                }
+                else {
+                    if (group) {
+                        result.push(createSyntaxList(group));
+                        group = undefined;
+                    }
+                    result.push(child);
+                }
+            }
+            if (group) {
+                result.push(createSyntaxList(group));
+            }
+            return result;
+        }
+        /**
+         * Splits sibling nodes into up to four partitions:
+         * 1) everything left of the first node matched by `pivotOn`,
+         * 2) the first node matched by `pivotOn`,
+         * 3) everything right of the first node matched by `pivotOn`,
+         * 4) a trailing semicolon, if `separateTrailingSemicolon` is enabled.
+         * The left and right groups, if not empty, will each be grouped into their own containing SyntaxList.
+         * @param children The sibling nodes to split.
+         * @param pivotOn The predicate function to match the node to be the pivot. The first node that matches
+         * the predicate will be used; any others that may match will be included into the right-hand group.
+         * @param separateTrailingSemicolon If the last token is a semicolon, it will be returned as a separate
+         * child rather than be included in the right-hand group.
+         */
+        function splitChildren(children, pivotOn, separateTrailingSemicolon) {
+            if (separateTrailingSemicolon === void 0) { separateTrailingSemicolon = true; }
+            if (children.length < 2) {
+                return children;
+            }
+            var splitTokenIndex = ts.findIndex(children, pivotOn);
+            if (splitTokenIndex === -1) {
+                return children;
+            }
+            var leftChildren = children.slice(0, splitTokenIndex);
+            var splitToken = children[splitTokenIndex];
+            var lastToken = ts.last(children);
+            var separateLastToken = separateTrailingSemicolon && lastToken.kind === 26 /* SemicolonToken */;
+            var rightChildren = children.slice(splitTokenIndex + 1, separateLastToken ? children.length - 1 : undefined);
+            var result = ts.compact([
+                leftChildren.length ? createSyntaxList(leftChildren) : undefined,
+                splitToken,
+                rightChildren.length ? createSyntaxList(rightChildren) : undefined,
+            ]);
+            return separateLastToken ? result.concat(lastToken) : result;
+        }
+        function createSyntaxList(children) {
+            ts.Debug.assertGreaterThanOrEqual(children.length, 1);
+            var syntaxList = ts.createNode(313 /* SyntaxList */, children[0].pos, ts.last(children).end);
+            syntaxList._children = children;
+            return syntaxList;
+        }
+        function isListOpener(token) {
+            var kind = token && token.kind;
+            return kind === 18 /* OpenBraceToken */
+                || kind === 22 /* OpenBracketToken */
+                || kind === 20 /* OpenParenToken */
+                || kind === 263 /* JsxOpeningElement */;
+        }
+        function isListCloser(token) {
+            var kind = token && token.kind;
+            return kind === 19 /* CloseBraceToken */
+                || kind === 23 /* CloseBracketToken */
+                || kind === 21 /* CloseParenToken */
+                || kind === 264 /* JsxClosingElement */;
+        }
+    })(SmartSelectionRange = ts.SmartSelectionRange || (ts.SmartSelectionRange = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
 (function (ts) {
     var SignatureHelp;
     (function (SignatureHelp) {
@@ -106058,8 +109621,21 @@ var ts;
             });
         }
         function containsPrecedingToken(startingToken, sourceFile, container) {
-            var precedingToken = ts.Debug.assertDefined(ts.findPrecedingToken(startingToken.getFullStart(), sourceFile, startingToken.parent, /*excludeJsdoc*/ true));
-            return ts.rangeContainsRange(container, precedingToken);
+            var pos = startingToken.getFullStart();
+            // There’s a possibility that `startingToken.parent` contains only `startingToken` and
+            // missing nodes, none of which are valid to be returned by `findPrecedingToken`. In that
+            // case, the preceding token we want is actually higher up the tree—almost definitely the
+            // next parent, but theoretically the situation with missing nodes might be happening on
+            // multiple nested levels.
+            var currentParent = startingToken.parent;
+            while (currentParent) {
+                var precedingToken = ts.findPrecedingToken(pos, sourceFile, currentParent, /*excludeJsdoc*/ true);
+                if (precedingToken) {
+                    return ts.rangeContainsRange(container, precedingToken);
+                }
+                currentParent = currentParent.parent;
+            }
+            return ts.Debug.fail("Could not find preceding token");
         }
         function getArgumentInfoForCompletions(node, position, sourceFile) {
             var info = getImmediatelyContainingArgumentInfo(node, position, sourceFile);
@@ -106133,10 +109709,10 @@ var ts;
                 }
                 return undefined;
             }
-            else if (ts.isTemplateHead(node) && parent.parent.kind === 193 /* TaggedTemplateExpression */) {
+            else if (ts.isTemplateHead(node) && parent.parent.kind === 194 /* TaggedTemplateExpression */) {
                 var templateExpression = parent;
                 var tagExpression = templateExpression.parent;
-                ts.Debug.assert(templateExpression.kind === 206 /* TemplateExpression */);
+                ts.Debug.assert(templateExpression.kind === 207 /* TemplateExpression */);
                 var argumentIndex = ts.isInsideTemplateLiteral(node, position, sourceFile) ? 0 : 1;
                 return getArgumentListInfoForTemplate(tagExpression, argumentIndex, sourceFile);
             }
@@ -106203,17 +109779,17 @@ var ts;
                 return undefined;
             var parent = startingToken.parent;
             switch (parent.kind) {
-                case 195 /* ParenthesizedExpression */:
-                case 156 /* MethodDeclaration */:
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
+                case 196 /* ParenthesizedExpression */:
+                case 157 /* MethodDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
                     var info = getArgumentOrParameterListInfo(startingToken, sourceFile);
                     if (!info)
                         return undefined;
                     var argumentIndex = info.argumentIndex, argumentCount = info.argumentCount, argumentsSpan = info.argumentsSpan;
                     var contextualType = ts.isMethodDeclaration(parent) ? checker.getContextualTypeForObjectLiteralElement(parent) : checker.getContextualType(parent);
                     return contextualType && { contextualType: contextualType, argumentIndex: argumentIndex, argumentCount: argumentCount, argumentsSpan: argumentsSpan };
-                case 204 /* BinaryExpression */: {
+                case 205 /* BinaryExpression */: {
                     var highestBinary = getHighestBinary(parent);
                     var contextualType_1 = checker.getContextualType(highestBinary);
                     var argumentIndex_1 = startingToken.kind === 20 /* OpenParenToken */ ? 0 : countBinaryExpressionParameters(parent) - 1;
@@ -106337,7 +109913,7 @@ var ts;
             //       |       |
             // This is because a Missing node has no width. However, what we actually want is to include trivia
             // leading up to the next token in case the user is about to type in a TemplateMiddle or TemplateTail.
-            if (template.kind === 206 /* TemplateExpression */) {
+            if (template.kind === 207 /* TemplateExpression */) {
                 var lastSpan = ts.last(template.templateSpans);
                 if (lastSpan.literal.getFullWidth() === 0) {
                     applicableSpanEnd = ts.skipTrivia(sourceFile.text, applicableSpanEnd, /*stopAfterLineBreak*/ false);
@@ -106349,7 +109925,7 @@ var ts;
             var _loop_7 = function (n) {
                 // If the node is not a subspan of its parent, this is a big problem.
                 // There have been crashes that might be caused by this violation.
-                ts.Debug.assert(ts.rangeContainsRange(n.parent, n), "Not a subspan", function () { return "Child: " + ts.Debug.showSyntaxKind(n) + ", parent: " + ts.Debug.showSyntaxKind(n.parent); });
+                ts.Debug.assert(ts.rangeContainsRange(n.parent, n), "Not a subspan", function () { return "Child: " + ts.Debug.formatSyntaxKind(n.kind) + ", parent: " + ts.Debug.formatSyntaxKind(n.parent.kind); });
                 var argumentInfo = getImmediatelyContainingArgumentOrContextualParameterInfo(n, position, sourceFile, checker);
                 if (argumentInfo) {
                     return { value: argumentInfo };
@@ -106433,13 +110009,13 @@ var ts;
             var parameters = (typeParameters || ts.emptyArray).map(function (t) { return createSignatureHelpParameterForTypeParameter(t, checker, enclosingDeclaration, sourceFile, printer); });
             var parameterParts = ts.mapToDisplayParts(function (writer) {
                 var thisParameter = candidateSignature.thisParameter ? [checker.symbolToParameterDeclaration(candidateSignature.thisParameter, enclosingDeclaration, signatureHelpNodeBuilderFlags)] : [];
-                var params = ts.createNodeArray(thisParameter.concat(candidateSignature.parameters.map(function (param) { return checker.symbolToParameterDeclaration(param, enclosingDeclaration, signatureHelpNodeBuilderFlags); })));
+                var params = ts.createNodeArray(thisParameter.concat(checker.getExpandedParameters(candidateSignature).map(function (param) { return checker.symbolToParameterDeclaration(param, enclosingDeclaration, signatureHelpNodeBuilderFlags); })));
                 printer.writeList(2576 /* CallExpressionArguments */, params, sourceFile, writer);
             });
             return { isVariadic: false, parameters: parameters, prefix: [ts.punctuationPart(28 /* LessThanToken */)], suffix: [ts.punctuationPart(30 /* GreaterThanToken */)].concat(parameterParts) };
         }
         function itemInfoForParameters(candidateSignature, checker, enclosingDeclaration, sourceFile) {
-            var isVariadic = candidateSignature.hasRestParameter;
+            var isVariadic = checker.hasEffectiveRestParameter(candidateSignature);
             var printer = ts.createPrinter({ removeComments: true });
             var typeParameterParts = ts.mapToDisplayParts(function (writer) {
                 if (candidateSignature.typeParameters && candidateSignature.typeParameters.length) {
@@ -106447,7 +110023,7 @@ var ts;
                     printer.writeList(53776 /* TypeParameters */, args, sourceFile, writer);
                 }
             });
-            var parameters = candidateSignature.parameters.map(function (p) { return createSignatureHelpParameterForParameter(p, checker, enclosingDeclaration, sourceFile, printer); });
+            var parameters = checker.getExpandedParameters(candidateSignature).map(function (p) { return createSignatureHelpParameterForParameter(p, checker, enclosingDeclaration, sourceFile, printer); });
             return { isVariadic: isVariadic, parameters: parameters, prefix: typeParameterParts.concat([ts.punctuationPart(20 /* OpenParenToken */)]), suffix: [ts.punctuationPart(21 /* CloseParenToken */)] };
         }
         function createSignatureHelpParameterForParameter(parameter, checker, enclosingDeclaration, sourceFile, printer) {
@@ -106649,7 +110225,7 @@ var ts;
         function check(node) {
             if (isJsFile) {
                 switch (node.kind) {
-                    case 196 /* FunctionExpression */:
+                    case 197 /* FunctionExpression */:
                         var decl = ts.getDeclarationOfExpando(node);
                         if (decl) {
                             var symbol_1 = decl.symbol;
@@ -106659,7 +110235,7 @@ var ts;
                             }
                         }
                     // falls through if no diagnostic was created
-                    case 239 /* FunctionDeclaration */:
+                    case 240 /* FunctionDeclaration */:
                         var symbol = node.symbol;
                         if (symbol.members && (symbol.members.size > 0)) {
                             diags.push(ts.createDiagnosticForNode(ts.isVariableDeclaration(node.parent) ? node.parent.name : node, ts.Diagnostics.This_constructor_function_may_be_converted_to_a_class_declaration));
@@ -106692,11 +110268,11 @@ var ts;
     function containsTopLevelCommonjs(sourceFile) {
         return sourceFile.statements.some(function (statement) {
             switch (statement.kind) {
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     return statement.declarationList.declarations.some(function (decl) {
                         return !!decl.initializer && ts.isRequireCall(propertyAccessLeftHandSide(decl.initializer), /*checkArgumentIsStringLiteralLike*/ true);
                     });
-                case 221 /* ExpressionStatement */: {
+                case 222 /* ExpressionStatement */: {
                     var expression = statement.expression;
                     if (!ts.isBinaryExpression(expression))
                         return ts.isRequireCall(expression, /*checkArgumentIsStringLiteralLike*/ true);
@@ -106713,12 +110289,12 @@ var ts;
     }
     function importNameForConvertToDefaultImport(node) {
         switch (node.kind) {
-            case 249 /* ImportDeclaration */:
+            case 250 /* ImportDeclaration */:
                 var importClause = node.importClause, moduleSpecifier = node.moduleSpecifier;
-                return importClause && !importClause.name && importClause.namedBindings && importClause.namedBindings.kind === 251 /* NamespaceImport */ && ts.isStringLiteral(moduleSpecifier)
+                return importClause && !importClause.name && importClause.namedBindings && importClause.namedBindings.kind === 252 /* NamespaceImport */ && ts.isStringLiteral(moduleSpecifier)
                     ? importClause.namedBindings.name
                     : undefined;
-            case 248 /* ImportEqualsDeclaration */:
+            case 249 /* ImportEqualsDeclaration */:
                 return node.name;
             default:
                 return undefined;
@@ -106776,13 +110352,13 @@ var ts;
     // should be kept up to date with getTransformationBody in convertToAsyncFunction.ts
     function isFixablePromiseArgument(arg) {
         switch (arg.kind) {
-            case 239 /* FunctionDeclaration */:
-            case 196 /* FunctionExpression */:
-            case 197 /* ArrowFunction */:
+            case 240 /* FunctionDeclaration */:
+            case 197 /* FunctionExpression */:
+            case 198 /* ArrowFunction */:
                 visitedNestedConvertibleFunctions.set(getKeyFromNode(arg), true);
             /* falls through */
-            case 96 /* NullKeyword */:
-            case 72 /* Identifier */: // identifier includes undefined
+            case 97 /* NullKeyword */:
+            case 73 /* Identifier */: // identifier includes undefined
                 return true;
             default:
                 return false;
@@ -106805,7 +110381,7 @@ var ts;
             }
             var flags = ts.getCombinedLocalAndExportSymbolFlags(symbol);
             if (flags & 32 /* Class */) {
-                return ts.getDeclarationOfKind(symbol, 209 /* ClassExpression */) ?
+                return ts.getDeclarationOfKind(symbol, 210 /* ClassExpression */) ?
                     "local class" /* localClassElement */ : "class" /* classElement */;
             }
             if (flags & 384 /* Enum */)
@@ -106842,7 +110418,7 @@ var ts;
             if (typeChecker.isArgumentsSymbol(symbol)) {
                 return "local var" /* localVariableElement */;
             }
-            if (location.kind === 100 /* ThisKeyword */ && ts.isExpression(location)) {
+            if (location.kind === 101 /* ThisKeyword */ && ts.isExpression(location)) {
                 return "parameter" /* parameterElement */;
             }
             var flags = ts.getCombinedLocalAndExportSymbolFlags(symbol);
@@ -106893,11 +110469,11 @@ var ts;
                 // If we requested completions after `x.` at the top-level, we may be at a source file location.
                 switch (location.parent && location.parent.kind) {
                     // If we've typed a character of the attribute name, will be 'JsxAttribute', else will be 'JsxOpeningElement'.
-                    case 262 /* JsxOpeningElement */:
-                    case 260 /* JsxElement */:
-                    case 261 /* JsxSelfClosingElement */:
-                        return location.kind === 72 /* Identifier */ ? "property" /* memberVariableElement */ : "JSX attribute" /* jsxAttribute */;
-                    case 267 /* JsxAttribute */:
+                    case 263 /* JsxOpeningElement */:
+                    case 261 /* JsxElement */:
+                    case 262 /* JsxSelfClosingElement */:
+                        return location.kind === 73 /* Identifier */ ? "property" /* memberVariableElement */ : "JSX attribute" /* jsxAttribute */;
+                    case 268 /* JsxAttribute */:
                         return "JSX attribute" /* jsxAttribute */;
                     default:
                         return "property" /* memberVariableElement */;
@@ -106924,13 +110500,13 @@ var ts;
             var symbolFlags = ts.getCombinedLocalAndExportSymbolFlags(symbol);
             var symbolKind = semanticMeaning & 1 /* Value */ ? getSymbolKindOfConstructorPropertyMethodAccessorFunctionOrVar(typeChecker, symbol, location) : "" /* unknown */;
             var hasAddedSymbolInfo = false;
-            var isThisExpression = location.kind === 100 /* ThisKeyword */ && ts.isInExpressionContext(location);
+            var isThisExpression = location.kind === 101 /* ThisKeyword */ && ts.isInExpressionContext(location);
             var type;
             var printer;
             var documentationFromAlias;
             var tagsFromAlias;
-            if (location.kind === 100 /* ThisKeyword */ && !isThisExpression) {
-                return { displayParts: [ts.keywordPart(100 /* ThisKeyword */)], documentation: [], symbolKind: "primitive type" /* primitiveType */, tags: undefined };
+            if (location.kind === 101 /* ThisKeyword */ && !isThisExpression) {
+                return { displayParts: [ts.keywordPart(101 /* ThisKeyword */)], documentation: [], symbolKind: "primitive type" /* primitiveType */, tags: undefined };
             }
             // Class at constructor site need to be shown as constructor apart from property,method, vars
             if (symbolKind !== "" /* unknown */ || symbolFlags & 32 /* Class */ || symbolFlags & 2097152 /* Alias */) {
@@ -106940,7 +110516,7 @@ var ts;
                 }
                 var signature = void 0;
                 type = isThisExpression ? typeChecker.getTypeAtLocation(location) : typeChecker.getTypeOfSymbolAtLocation(symbol.exportSymbol || symbol, location);
-                if (location.parent && location.parent.kind === 189 /* PropertyAccessExpression */) {
+                if (location.parent && location.parent.kind === 190 /* PropertyAccessExpression */) {
                     var right = location.parent.name;
                     // Either the location is on the right of a property access, or on the left and the right is missing
                     if (right === location || (right && right.getFullWidth() === 0)) {
@@ -106959,9 +110535,8 @@ var ts;
                     callExpressionLike = location.parent;
                 }
                 if (callExpressionLike) {
-                    var candidateSignatures = [];
-                    signature = typeChecker.getResolvedSignature(callExpressionLike, candidateSignatures); // TODO: GH#18217
-                    var useConstructSignatures = callExpressionLike.kind === 192 /* NewExpression */ || (ts.isCallExpression(callExpressionLike) && callExpressionLike.expression.kind === 98 /* SuperKeyword */);
+                    signature = typeChecker.getResolvedSignature(callExpressionLike); // TODO: GH#18217
+                    var useConstructSignatures = callExpressionLike.kind === 193 /* NewExpression */ || (ts.isCallExpression(callExpressionLike) && callExpressionLike.expression.kind === 99 /* SuperKeyword */);
                     var allSignatures = useConstructSignatures ? type.getConstructSignatures() : type.getCallSignatures();
                     if (!ts.contains(allSignatures, signature.target) && !ts.contains(allSignatures, signature)) {
                         // Get the first signature if there is one -- allSignatures may contain
@@ -106979,7 +110554,7 @@ var ts;
                             pushSymbolKind(symbolKind);
                             displayParts.push(ts.spacePart());
                             if (useConstructSignatures) {
-                                displayParts.push(ts.keywordPart(95 /* NewKeyword */));
+                                displayParts.push(ts.keywordPart(96 /* NewKeyword */));
                                 displayParts.push(ts.spacePart());
                             }
                             addFullSymbolName(symbol);
@@ -107003,7 +110578,7 @@ var ts;
                                     displayParts.push(ts.lineBreakPart());
                                 }
                                 if (useConstructSignatures) {
-                                    displayParts.push(ts.keywordPart(95 /* NewKeyword */));
+                                    displayParts.push(ts.keywordPart(96 /* NewKeyword */));
                                     displayParts.push(ts.spacePart());
                                 }
                                 addSignatureDisplayParts(signature, allSignatures, 262144 /* WriteArrowStyleSignature */);
@@ -107016,29 +110591,29 @@ var ts;
                     }
                 }
                 else if ((ts.isNameOfFunctionDeclaration(location) && !(symbolFlags & 98304 /* Accessor */)) || // name of function declaration
-                    (location.kind === 124 /* ConstructorKeyword */ && location.parent.kind === 157 /* Constructor */)) { // At constructor keyword of constructor declaration
+                    (location.kind === 125 /* ConstructorKeyword */ && location.parent.kind === 158 /* Constructor */)) { // At constructor keyword of constructor declaration
                     // get the signature from the declaration and write it
                     var functionDeclaration_1 = location.parent;
                     // Use function declaration to write the signatures only if the symbol corresponding to this declaration
                     var locationIsSymbolDeclaration = ts.find(symbol.declarations, function (declaration) {
-                        return declaration === (location.kind === 124 /* ConstructorKeyword */ ? functionDeclaration_1.parent : functionDeclaration_1);
+                        return declaration === (location.kind === 125 /* ConstructorKeyword */ ? functionDeclaration_1.parent : functionDeclaration_1);
                     });
                     if (locationIsSymbolDeclaration) {
-                        var allSignatures = functionDeclaration_1.kind === 157 /* Constructor */ ? type.getNonNullableType().getConstructSignatures() : type.getNonNullableType().getCallSignatures();
+                        var allSignatures = functionDeclaration_1.kind === 158 /* Constructor */ ? type.getNonNullableType().getConstructSignatures() : type.getNonNullableType().getCallSignatures();
                         if (!typeChecker.isImplementationOfOverload(functionDeclaration_1)) {
                             signature = typeChecker.getSignatureFromDeclaration(functionDeclaration_1); // TODO: GH#18217
                         }
                         else {
                             signature = allSignatures[0];
                         }
-                        if (functionDeclaration_1.kind === 157 /* Constructor */) {
+                        if (functionDeclaration_1.kind === 158 /* Constructor */) {
                             // show (constructor) Type(...) signature
                             symbolKind = "constructor" /* constructorImplementationElement */;
                             addPrefixForAnyFunctionOrVar(type.symbol, symbolKind);
                         }
                         else {
                             // (function/method) symbol(..signature)
-                            addPrefixForAnyFunctionOrVar(functionDeclaration_1.kind === 160 /* CallSignature */ &&
+                            addPrefixForAnyFunctionOrVar(functionDeclaration_1.kind === 161 /* CallSignature */ &&
                                 !(type.symbol.flags & 2048 /* TypeLiteral */ || type.symbol.flags & 4096 /* ObjectLiteral */) ? type.symbol : symbol, symbolKind);
                         }
                         addSignatureDisplayParts(signature, allSignatures);
@@ -107048,7 +110623,7 @@ var ts;
             }
             if (symbolFlags & 32 /* Class */ && !hasAddedSymbolInfo && !isThisExpression) {
                 addAliasPrefixIfNecessary();
-                if (ts.getDeclarationOfKind(symbol, 209 /* ClassExpression */)) {
+                if (ts.getDeclarationOfKind(symbol, 210 /* ClassExpression */)) {
                     // Special case for class expressions because we would like to indicate that
                     // the class name is local to the class body (similar to function expression)
                     //      (local class) class <className>
@@ -107056,7 +110631,7 @@ var ts;
                 }
                 else {
                     // Class declaration has name which is not local.
-                    displayParts.push(ts.keywordPart(76 /* ClassKeyword */));
+                    displayParts.push(ts.keywordPart(77 /* ClassKeyword */));
                 }
                 displayParts.push(ts.spacePart());
                 addFullSymbolName(symbol);
@@ -107064,37 +110639,37 @@ var ts;
             }
             if ((symbolFlags & 64 /* Interface */) && (semanticMeaning & 2 /* Type */)) {
                 prefixNextMeaning();
-                displayParts.push(ts.keywordPart(110 /* InterfaceKeyword */));
+                displayParts.push(ts.keywordPart(111 /* InterfaceKeyword */));
                 displayParts.push(ts.spacePart());
                 addFullSymbolName(symbol);
                 writeTypeParametersOfSymbol(symbol, sourceFile);
             }
             if ((symbolFlags & 524288 /* TypeAlias */) && (semanticMeaning & 2 /* Type */)) {
                 prefixNextMeaning();
-                displayParts.push(ts.keywordPart(140 /* TypeKeyword */));
+                displayParts.push(ts.keywordPart(141 /* TypeKeyword */));
                 displayParts.push(ts.spacePart());
                 addFullSymbolName(symbol);
                 writeTypeParametersOfSymbol(symbol, sourceFile);
                 displayParts.push(ts.spacePart());
-                displayParts.push(ts.operatorPart(59 /* EqualsToken */));
+                displayParts.push(ts.operatorPart(60 /* EqualsToken */));
                 displayParts.push(ts.spacePart());
                 ts.addRange(displayParts, ts.typeToDisplayParts(typeChecker, typeChecker.getDeclaredTypeOfSymbol(symbol), enclosingDeclaration, 8388608 /* InTypeAlias */));
             }
             if (symbolFlags & 384 /* Enum */) {
                 prefixNextMeaning();
                 if (ts.some(symbol.declarations, function (d) { return ts.isEnumDeclaration(d) && ts.isEnumConst(d); })) {
-                    displayParts.push(ts.keywordPart(77 /* ConstKeyword */));
+                    displayParts.push(ts.keywordPart(78 /* ConstKeyword */));
                     displayParts.push(ts.spacePart());
                 }
-                displayParts.push(ts.keywordPart(84 /* EnumKeyword */));
+                displayParts.push(ts.keywordPart(85 /* EnumKeyword */));
                 displayParts.push(ts.spacePart());
                 addFullSymbolName(symbol);
             }
             if (symbolFlags & 1536 /* Module */ && !isThisExpression) {
                 prefixNextMeaning();
-                var declaration = ts.getDeclarationOfKind(symbol, 244 /* ModuleDeclaration */);
-                var isNamespace = declaration && declaration.name && declaration.name.kind === 72 /* Identifier */;
-                displayParts.push(ts.keywordPart(isNamespace ? 131 /* NamespaceKeyword */ : 130 /* ModuleKeyword */));
+                var declaration = ts.getDeclarationOfKind(symbol, 245 /* ModuleDeclaration */);
+                var isNamespace = declaration && declaration.name && declaration.name.kind === 73 /* Identifier */;
+                displayParts.push(ts.keywordPart(isNamespace ? 132 /* NamespaceKeyword */ : 131 /* ModuleKeyword */));
                 displayParts.push(ts.spacePart());
                 addFullSymbolName(symbol);
             }
@@ -107113,7 +110688,7 @@ var ts;
                 }
                 else {
                     // Method/function type parameter
-                    var decl = ts.getDeclarationOfKind(symbol, 150 /* TypeParameter */);
+                    var decl = ts.getDeclarationOfKind(symbol, 151 /* TypeParameter */);
                     if (decl === undefined)
                         return ts.Debug.fail();
                     var declaration = decl.parent;
@@ -107121,21 +110696,21 @@ var ts;
                         if (ts.isFunctionLikeKind(declaration.kind)) {
                             addInPrefix();
                             var signature = typeChecker.getSignatureFromDeclaration(declaration); // TODO: GH#18217
-                            if (declaration.kind === 161 /* ConstructSignature */) {
-                                displayParts.push(ts.keywordPart(95 /* NewKeyword */));
+                            if (declaration.kind === 162 /* ConstructSignature */) {
+                                displayParts.push(ts.keywordPart(96 /* NewKeyword */));
                                 displayParts.push(ts.spacePart());
                             }
-                            else if (declaration.kind !== 160 /* CallSignature */ && declaration.name) {
+                            else if (declaration.kind !== 161 /* CallSignature */ && declaration.name) {
                                 addFullSymbolName(declaration.symbol);
                             }
                             ts.addRange(displayParts, ts.signatureToDisplayParts(typeChecker, signature, sourceFile, 32 /* WriteTypeArgumentsOfSignature */));
                         }
-                        else if (declaration.kind === 242 /* TypeAliasDeclaration */) {
+                        else if (declaration.kind === 243 /* TypeAliasDeclaration */) {
                             // Type alias type parameter
                             // For example
                             //      type list<T> = T[]; // Both T will go through same code path
                             addInPrefix();
-                            displayParts.push(ts.keywordPart(140 /* TypeKeyword */));
+                            displayParts.push(ts.keywordPart(141 /* TypeKeyword */));
                             displayParts.push(ts.spacePart());
                             addFullSymbolName(declaration.symbol);
                             writeTypeParametersOfSymbol(declaration.symbol, sourceFile);
@@ -107147,11 +110722,11 @@ var ts;
                 symbolKind = "enum member" /* enumMemberElement */;
                 addPrefixForAnyFunctionOrVar(symbol, "enum member");
                 var declaration = symbol.declarations[0];
-                if (declaration.kind === 278 /* EnumMember */) {
+                if (declaration.kind === 279 /* EnumMember */) {
                     var constantValue = typeChecker.getConstantValue(declaration);
                     if (constantValue !== undefined) {
                         displayParts.push(ts.spacePart());
-                        displayParts.push(ts.operatorPart(59 /* EqualsToken */));
+                        displayParts.push(ts.operatorPart(60 /* EqualsToken */));
                         displayParts.push(ts.spacePart());
                         displayParts.push(ts.displayPart(ts.getTextOfConstantValue(constantValue), typeof constantValue === "number" ? ts.SymbolDisplayPartKind.numericLiteral : ts.SymbolDisplayPartKind.stringLiteral));
                     }
@@ -107177,32 +110752,32 @@ var ts;
                     }
                 }
                 switch (symbol.declarations[0].kind) {
-                    case 247 /* NamespaceExportDeclaration */:
-                        displayParts.push(ts.keywordPart(85 /* ExportKeyword */));
+                    case 248 /* NamespaceExportDeclaration */:
+                        displayParts.push(ts.keywordPart(86 /* ExportKeyword */));
                         displayParts.push(ts.spacePart());
-                        displayParts.push(ts.keywordPart(131 /* NamespaceKeyword */));
+                        displayParts.push(ts.keywordPart(132 /* NamespaceKeyword */));
                         break;
-                    case 254 /* ExportAssignment */:
-                        displayParts.push(ts.keywordPart(85 /* ExportKeyword */));
+                    case 255 /* ExportAssignment */:
+                        displayParts.push(ts.keywordPart(86 /* ExportKeyword */));
                         displayParts.push(ts.spacePart());
-                        displayParts.push(ts.keywordPart(symbol.declarations[0].isExportEquals ? 59 /* EqualsToken */ : 80 /* DefaultKeyword */));
+                        displayParts.push(ts.keywordPart(symbol.declarations[0].isExportEquals ? 60 /* EqualsToken */ : 81 /* DefaultKeyword */));
                         break;
-                    case 257 /* ExportSpecifier */:
-                        displayParts.push(ts.keywordPart(85 /* ExportKeyword */));
+                    case 258 /* ExportSpecifier */:
+                        displayParts.push(ts.keywordPart(86 /* ExportKeyword */));
                         break;
                     default:
-                        displayParts.push(ts.keywordPart(92 /* ImportKeyword */));
+                        displayParts.push(ts.keywordPart(93 /* ImportKeyword */));
                 }
                 displayParts.push(ts.spacePart());
                 addFullSymbolName(symbol);
                 ts.forEach(symbol.declarations, function (declaration) {
-                    if (declaration.kind === 248 /* ImportEqualsDeclaration */) {
+                    if (declaration.kind === 249 /* ImportEqualsDeclaration */) {
                         var importEqualsDeclaration = declaration;
                         if (ts.isExternalModuleImportEqualsDeclaration(importEqualsDeclaration)) {
                             displayParts.push(ts.spacePart());
-                            displayParts.push(ts.operatorPart(59 /* EqualsToken */));
+                            displayParts.push(ts.operatorPart(60 /* EqualsToken */));
                             displayParts.push(ts.spacePart());
-                            displayParts.push(ts.keywordPart(134 /* RequireKeyword */));
+                            displayParts.push(ts.keywordPart(135 /* RequireKeyword */));
                             displayParts.push(ts.punctuationPart(20 /* OpenParenToken */));
                             displayParts.push(ts.displayPart(ts.getTextOfNode(ts.getExternalModuleImportEqualsDeclarationExpression(importEqualsDeclaration)), ts.SymbolDisplayPartKind.stringLiteral));
                             displayParts.push(ts.punctuationPart(21 /* CloseParenToken */));
@@ -107211,7 +110786,7 @@ var ts;
                             var internalAliasSymbol = typeChecker.getSymbolAtLocation(importEqualsDeclaration.moduleReference);
                             if (internalAliasSymbol) {
                                 displayParts.push(ts.spacePart());
-                                displayParts.push(ts.operatorPart(59 /* EqualsToken */));
+                                displayParts.push(ts.operatorPart(60 /* EqualsToken */));
                                 displayParts.push(ts.spacePart());
                                 addFullSymbolName(internalAliasSymbol, enclosingDeclaration);
                             }
@@ -107225,7 +110800,7 @@ var ts;
                     if (type) {
                         if (isThisExpression) {
                             prefixNextMeaning();
-                            displayParts.push(ts.keywordPart(100 /* ThisKeyword */));
+                            displayParts.push(ts.keywordPart(101 /* ThisKeyword */));
                         }
                         else {
                             addPrefixForAnyFunctionOrVar(symbol, symbolKind);
@@ -107274,10 +110849,10 @@ var ts;
                     // For some special property access expressions like `exports.foo = foo` or `module.exports.foo = foo`
                     // there documentation comments might be attached to the right hand side symbol of their declarations.
                     // The pattern of such special property access is that the parent symbol is the symbol of the file.
-                    if (symbol.parent && ts.forEach(symbol.parent.declarations, function (declaration) { return declaration.kind === 284 /* SourceFile */; })) {
+                    if (symbol.parent && ts.forEach(symbol.parent.declarations, function (declaration) { return declaration.kind === 285 /* SourceFile */; })) {
                         for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                             var declaration = _a[_i];
-                            if (!declaration.parent || declaration.parent.kind !== 204 /* BinaryExpression */) {
+                            if (!declaration.parent || declaration.parent.kind !== 205 /* BinaryExpression */) {
                                 continue;
                             }
                             var rhsSymbol = typeChecker.getSymbolAtLocation(declaration.parent.right);
@@ -107320,7 +110895,7 @@ var ts;
             }
             function addInPrefix() {
                 displayParts.push(ts.spacePart());
-                displayParts.push(ts.keywordPart(93 /* InKeyword */));
+                displayParts.push(ts.keywordPart(94 /* InKeyword */));
                 displayParts.push(ts.spacePart());
             }
             function addFullSymbolName(symbolToDisplay, enclosingDeclaration) {
@@ -107390,16 +110965,16 @@ var ts;
             }
             return ts.forEach(symbol.declarations, function (declaration) {
                 // Function expressions are local
-                if (declaration.kind === 196 /* FunctionExpression */) {
+                if (declaration.kind === 197 /* FunctionExpression */) {
                     return true;
                 }
-                if (declaration.kind !== 237 /* VariableDeclaration */ && declaration.kind !== 239 /* FunctionDeclaration */) {
+                if (declaration.kind !== 238 /* VariableDeclaration */ && declaration.kind !== 240 /* FunctionDeclaration */) {
                     return false;
                 }
                 // If the parent is not sourceFile or module block it is local variable
                 for (var parent = declaration.parent; !ts.isFunctionBlock(parent); parent = parent.parent) {
                     // Reached source file or module block
-                    if (parent.kind === 284 /* SourceFile */ || parent.kind === 245 /* ModuleBlock */) {
+                    if (parent.kind === 285 /* SourceFile */ || parent.kind === 246 /* ModuleBlock */) {
                         return false;
                     }
                 }
@@ -107628,8 +111203,8 @@ var ts;
 (function (ts) {
     var formatting;
     (function (formatting) {
-        var standardScanner = ts.createScanner(7 /* Latest */, /*skipTrivia*/ false, 0 /* Standard */);
-        var jsxScanner = ts.createScanner(7 /* Latest */, /*skipTrivia*/ false, 1 /* JSX */);
+        var standardScanner = ts.createScanner(99 /* Latest */, /*skipTrivia*/ false, 0 /* Standard */);
+        var jsxScanner = ts.createScanner(99 /* Latest */, /*skipTrivia*/ false, 1 /* JSX */);
         var ScanAction;
         (function (ScanAction) {
             ScanAction[ScanAction["Scan"] = 0] = "Scan";
@@ -107693,8 +111268,8 @@ var ts;
             function shouldRescanGreaterThanToken(node) {
                 switch (node.kind) {
                     case 32 /* GreaterThanEqualsToken */:
-                    case 67 /* GreaterThanGreaterThanEqualsToken */:
-                    case 68 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
+                    case 68 /* GreaterThanGreaterThanEqualsToken */:
+                    case 69 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
                     case 48 /* GreaterThanGreaterThanGreaterThanToken */:
                     case 47 /* GreaterThanGreaterThanToken */:
                         return true;
@@ -107704,12 +111279,12 @@ var ts;
             function shouldRescanJsxIdentifier(node) {
                 if (node.parent) {
                     switch (node.parent.kind) {
-                        case 267 /* JsxAttribute */:
-                        case 262 /* JsxOpeningElement */:
-                        case 263 /* JsxClosingElement */:
-                        case 261 /* JsxSelfClosingElement */:
+                        case 268 /* JsxAttribute */:
+                        case 263 /* JsxOpeningElement */:
+                        case 264 /* JsxClosingElement */:
+                        case 262 /* JsxSelfClosingElement */:
                             // May parse an identifier like `module-layout`; that will be scanned as a keyword at first, but we should parse the whole thing to get an identifier.
-                            return ts.isKeyword(node.kind) || node.kind === 72 /* Identifier */;
+                            return ts.isKeyword(node.kind) || node.kind === 73 /* Identifier */;
                     }
                 }
                 return false;
@@ -107725,7 +111300,7 @@ var ts;
                     container.kind === 17 /* TemplateTail */;
             }
             function startsWithSlashToken(t) {
-                return t === 42 /* SlashToken */ || t === 64 /* SlashEqualsToken */;
+                return t === 42 /* SlashToken */ || t === 65 /* SlashEqualsToken */;
             }
             function readTokenInfo(n) {
                 ts.Debug.assert(isOnToken());
@@ -107884,7 +111459,7 @@ var ts;
     (function (formatting) {
         function getAllRules() {
             var allTokens = [];
-            for (var token = 0 /* FirstToken */; token <= 147 /* LastToken */; token++) {
+            for (var token = 0 /* FirstToken */; token <= 148 /* LastToken */; token++) {
                 allTokens.push(token);
             }
             function anyTokenExcept() {
@@ -107896,27 +111471,27 @@ var ts;
             }
             var anyToken = { tokens: allTokens, isSpecific: false };
             var anyTokenIncludingMultilineComments = tokenRangeFrom(allTokens.concat([3 /* MultiLineCommentTrivia */]));
-            var keywords = tokenRangeFromRange(73 /* FirstKeyword */, 147 /* LastKeyword */);
-            var binaryOperators = tokenRangeFromRange(28 /* FirstBinaryOperator */, 71 /* LastBinaryOperator */);
-            var binaryKeywordOperators = [93 /* InKeyword */, 94 /* InstanceOfKeyword */, 147 /* OfKeyword */, 119 /* AsKeyword */, 128 /* IsKeyword */];
+            var keywords = tokenRangeFromRange(74 /* FirstKeyword */, 148 /* LastKeyword */);
+            var binaryOperators = tokenRangeFromRange(28 /* FirstBinaryOperator */, 72 /* LastBinaryOperator */);
+            var binaryKeywordOperators = [94 /* InKeyword */, 95 /* InstanceOfKeyword */, 148 /* OfKeyword */, 120 /* AsKeyword */, 129 /* IsKeyword */];
             var unaryPrefixOperators = [44 /* PlusPlusToken */, 45 /* MinusMinusToken */, 53 /* TildeToken */, 52 /* ExclamationToken */];
             var unaryPrefixExpressions = [
-                8 /* NumericLiteral */, 9 /* BigIntLiteral */, 72 /* Identifier */, 20 /* OpenParenToken */,
-                22 /* OpenBracketToken */, 18 /* OpenBraceToken */, 100 /* ThisKeyword */, 95 /* NewKeyword */
+                8 /* NumericLiteral */, 9 /* BigIntLiteral */, 73 /* Identifier */, 20 /* OpenParenToken */,
+                22 /* OpenBracketToken */, 18 /* OpenBraceToken */, 101 /* ThisKeyword */, 96 /* NewKeyword */
             ];
-            var unaryPreincrementExpressions = [72 /* Identifier */, 20 /* OpenParenToken */, 100 /* ThisKeyword */, 95 /* NewKeyword */];
-            var unaryPostincrementExpressions = [72 /* Identifier */, 21 /* CloseParenToken */, 23 /* CloseBracketToken */, 95 /* NewKeyword */];
-            var unaryPredecrementExpressions = [72 /* Identifier */, 20 /* OpenParenToken */, 100 /* ThisKeyword */, 95 /* NewKeyword */];
-            var unaryPostdecrementExpressions = [72 /* Identifier */, 21 /* CloseParenToken */, 23 /* CloseBracketToken */, 95 /* NewKeyword */];
+            var unaryPreincrementExpressions = [73 /* Identifier */, 20 /* OpenParenToken */, 101 /* ThisKeyword */, 96 /* NewKeyword */];
+            var unaryPostincrementExpressions = [73 /* Identifier */, 21 /* CloseParenToken */, 23 /* CloseBracketToken */, 96 /* NewKeyword */];
+            var unaryPredecrementExpressions = [73 /* Identifier */, 20 /* OpenParenToken */, 101 /* ThisKeyword */, 96 /* NewKeyword */];
+            var unaryPostdecrementExpressions = [73 /* Identifier */, 21 /* CloseParenToken */, 23 /* CloseBracketToken */, 96 /* NewKeyword */];
             var comments = [2 /* SingleLineCommentTrivia */, 3 /* MultiLineCommentTrivia */];
-            var typeNames = [72 /* Identifier */].concat(ts.typeKeywords);
+            var typeNames = [73 /* Identifier */].concat(ts.typeKeywords);
             // Place a space before open brace in a function declaration
             // TypeScript: Function can have return types, which can be made of tons of different token kinds
             var functionOpenBraceLeftTokenRange = anyTokenIncludingMultilineComments;
             // Place a space before open brace in a TypeScript declaration that has braces as children (class, module, enum, etc)
-            var typeScriptOpenBraceLeftTokenRange = tokenRangeFrom([72 /* Identifier */, 3 /* MultiLineCommentTrivia */, 76 /* ClassKeyword */, 85 /* ExportKeyword */, 92 /* ImportKeyword */]);
+            var typeScriptOpenBraceLeftTokenRange = tokenRangeFrom([73 /* Identifier */, 3 /* MultiLineCommentTrivia */, 77 /* ClassKeyword */, 86 /* ExportKeyword */, 93 /* ImportKeyword */]);
             // Place a space before open brace in a control flow construct
-            var controlOpenBraceLeftTokenRange = tokenRangeFrom([21 /* CloseParenToken */, 3 /* MultiLineCommentTrivia */, 82 /* DoKeyword */, 103 /* TryKeyword */, 88 /* FinallyKeyword */, 83 /* ElseKeyword */]);
+            var controlOpenBraceLeftTokenRange = tokenRangeFrom([21 /* CloseParenToken */, 3 /* MultiLineCommentTrivia */, 83 /* DoKeyword */, 104 /* TryKeyword */, 89 /* FinallyKeyword */, 84 /* ElseKeyword */]);
             // These rules are higher in priority than user-configurable
             var highPriorityCommonRules = [
                 // Leave comments alone
@@ -107931,7 +111506,7 @@ var ts;
                 rule("NoSpaceAfterQuestionMark", 56 /* QuestionToken */, anyToken, [isNonJsxSameLineTokenContext], 8 /* Delete */),
                 rule("NoSpaceBeforeDot", anyToken, 24 /* DotToken */, [isNonJsxSameLineTokenContext], 8 /* Delete */),
                 rule("NoSpaceAfterDot", 24 /* DotToken */, anyToken, [isNonJsxSameLineTokenContext], 8 /* Delete */),
-                rule("NoSpaceBetweenImportParenInImportType", 92 /* ImportKeyword */, 20 /* OpenParenToken */, [isNonJsxSameLineTokenContext, isImportTypeContext], 8 /* Delete */),
+                rule("NoSpaceBetweenImportParenInImportType", 93 /* ImportKeyword */, 20 /* OpenParenToken */, [isNonJsxSameLineTokenContext, isImportTypeContext], 8 /* Delete */),
                 // Special handling of unary operators.
                 // Prefix operators generally shouldn't have a space between
                 // them and their target unary expression.
@@ -107958,79 +111533,79 @@ var ts;
                 rule("SpaceAfterCloseBrace", 19 /* CloseBraceToken */, anyTokenExcept(21 /* CloseParenToken */), [isNonJsxSameLineTokenContext, isAfterCodeBlockContext], 2 /* Space */),
                 // Special case for (}, else) and (}, while) since else & while tokens are not part of the tree which makes SpaceAfterCloseBrace rule not applied
                 // Also should not apply to })
-                rule("SpaceBetweenCloseBraceAndElse", 19 /* CloseBraceToken */, 83 /* ElseKeyword */, [isNonJsxSameLineTokenContext], 2 /* Space */),
-                rule("SpaceBetweenCloseBraceAndWhile", 19 /* CloseBraceToken */, 107 /* WhileKeyword */, [isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("SpaceBetweenCloseBraceAndElse", 19 /* CloseBraceToken */, 84 /* ElseKeyword */, [isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("SpaceBetweenCloseBraceAndWhile", 19 /* CloseBraceToken */, 108 /* WhileKeyword */, [isNonJsxSameLineTokenContext], 2 /* Space */),
                 rule("NoSpaceBetweenEmptyBraceBrackets", 18 /* OpenBraceToken */, 19 /* CloseBraceToken */, [isNonJsxSameLineTokenContext, isObjectContext], 8 /* Delete */),
                 // Add a space after control dec context if the next character is an open bracket ex: 'if (false)[a, b] = [1, 2];' -> 'if (false) [a, b] = [1, 2];'
                 rule("SpaceAfterConditionalClosingParen", 21 /* CloseParenToken */, 22 /* OpenBracketToken */, [isControlDeclContext], 2 /* Space */),
-                rule("NoSpaceBetweenFunctionKeywordAndStar", 90 /* FunctionKeyword */, 40 /* AsteriskToken */, [isFunctionDeclarationOrFunctionExpressionContext], 8 /* Delete */),
-                rule("SpaceAfterStarInGeneratorDeclaration", 40 /* AsteriskToken */, [72 /* Identifier */, 20 /* OpenParenToken */], [isFunctionDeclarationOrFunctionExpressionContext], 2 /* Space */),
-                rule("SpaceAfterFunctionInFuncDecl", 90 /* FunctionKeyword */, anyToken, [isFunctionDeclContext], 2 /* Space */),
+                rule("NoSpaceBetweenFunctionKeywordAndStar", 91 /* FunctionKeyword */, 40 /* AsteriskToken */, [isFunctionDeclarationOrFunctionExpressionContext], 8 /* Delete */),
+                rule("SpaceAfterStarInGeneratorDeclaration", 40 /* AsteriskToken */, 73 /* Identifier */, [isFunctionDeclarationOrFunctionExpressionContext], 2 /* Space */),
+                rule("SpaceAfterFunctionInFuncDecl", 91 /* FunctionKeyword */, anyToken, [isFunctionDeclContext], 2 /* Space */),
                 // Insert new line after { and before } in multi-line contexts.
                 rule("NewLineAfterOpenBraceInBlockContext", 18 /* OpenBraceToken */, anyToken, [isMultilineBlockContext], 4 /* NewLine */),
                 // For get/set members, we check for (identifier,identifier) since get/set don't have tokens and they are represented as just an identifier token.
                 // Though, we do extra check on the context to make sure we are dealing with get/set node. Example:
                 //      get x() {}
                 //      set x(val) {}
-                rule("SpaceAfterGetSetInMember", [126 /* GetKeyword */, 137 /* SetKeyword */], 72 /* Identifier */, [isFunctionDeclContext], 2 /* Space */),
-                rule("NoSpaceBetweenYieldKeywordAndStar", 117 /* YieldKeyword */, 40 /* AsteriskToken */, [isNonJsxSameLineTokenContext, isYieldOrYieldStarWithOperand], 8 /* Delete */),
-                rule("SpaceBetweenYieldOrYieldStarAndOperand", [117 /* YieldKeyword */, 40 /* AsteriskToken */], anyToken, [isNonJsxSameLineTokenContext, isYieldOrYieldStarWithOperand], 2 /* Space */),
-                rule("NoSpaceBetweenReturnAndSemicolon", 97 /* ReturnKeyword */, 26 /* SemicolonToken */, [isNonJsxSameLineTokenContext], 8 /* Delete */),
-                rule("SpaceAfterCertainKeywords", [105 /* VarKeyword */, 101 /* ThrowKeyword */, 95 /* NewKeyword */, 81 /* DeleteKeyword */, 97 /* ReturnKeyword */, 104 /* TypeOfKeyword */, 122 /* AwaitKeyword */], anyToken, [isNonJsxSameLineTokenContext], 2 /* Space */),
-                rule("SpaceAfterLetConstInVariableDeclaration", [111 /* LetKeyword */, 77 /* ConstKeyword */], anyToken, [isNonJsxSameLineTokenContext, isStartOfVariableDeclarationList], 2 /* Space */),
+                rule("SpaceAfterGetSetInMember", [127 /* GetKeyword */, 138 /* SetKeyword */], 73 /* Identifier */, [isFunctionDeclContext], 2 /* Space */),
+                rule("NoSpaceBetweenYieldKeywordAndStar", 118 /* YieldKeyword */, 40 /* AsteriskToken */, [isNonJsxSameLineTokenContext, isYieldOrYieldStarWithOperand], 8 /* Delete */),
+                rule("SpaceBetweenYieldOrYieldStarAndOperand", [118 /* YieldKeyword */, 40 /* AsteriskToken */], anyToken, [isNonJsxSameLineTokenContext, isYieldOrYieldStarWithOperand], 2 /* Space */),
+                rule("NoSpaceBetweenReturnAndSemicolon", 98 /* ReturnKeyword */, 26 /* SemicolonToken */, [isNonJsxSameLineTokenContext], 8 /* Delete */),
+                rule("SpaceAfterCertainKeywords", [106 /* VarKeyword */, 102 /* ThrowKeyword */, 96 /* NewKeyword */, 82 /* DeleteKeyword */, 98 /* ReturnKeyword */, 105 /* TypeOfKeyword */, 123 /* AwaitKeyword */], anyToken, [isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("SpaceAfterLetConstInVariableDeclaration", [112 /* LetKeyword */, 78 /* ConstKeyword */], anyToken, [isNonJsxSameLineTokenContext, isStartOfVariableDeclarationList], 2 /* Space */),
                 rule("NoSpaceBeforeOpenParenInFuncCall", anyToken, 20 /* OpenParenToken */, [isNonJsxSameLineTokenContext, isFunctionCallOrNewContext, isPreviousTokenNotComma], 8 /* Delete */),
                 // Special case for binary operators (that are keywords). For these we have to add a space and shouldn't follow any user options.
                 rule("SpaceBeforeBinaryKeywordOperator", anyToken, binaryKeywordOperators, [isNonJsxSameLineTokenContext, isBinaryOpContext], 2 /* Space */),
                 rule("SpaceAfterBinaryKeywordOperator", binaryKeywordOperators, anyToken, [isNonJsxSameLineTokenContext, isBinaryOpContext], 2 /* Space */),
-                rule("SpaceAfterVoidOperator", 106 /* VoidKeyword */, anyToken, [isNonJsxSameLineTokenContext, isVoidOpContext], 2 /* Space */),
+                rule("SpaceAfterVoidOperator", 107 /* VoidKeyword */, anyToken, [isNonJsxSameLineTokenContext, isVoidOpContext], 2 /* Space */),
                 // Async-await
-                rule("SpaceBetweenAsyncAndOpenParen", 121 /* AsyncKeyword */, 20 /* OpenParenToken */, [isArrowFunctionContext, isNonJsxSameLineTokenContext], 2 /* Space */),
-                rule("SpaceBetweenAsyncAndFunctionKeyword", 121 /* AsyncKeyword */, 90 /* FunctionKeyword */, [isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("SpaceBetweenAsyncAndOpenParen", 122 /* AsyncKeyword */, 20 /* OpenParenToken */, [isArrowFunctionContext, isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("SpaceBetweenAsyncAndFunctionKeyword", 122 /* AsyncKeyword */, 91 /* FunctionKeyword */, [isNonJsxSameLineTokenContext], 2 /* Space */),
                 // Template string
-                rule("NoSpaceBetweenTagAndTemplateString", [72 /* Identifier */, 21 /* CloseParenToken */], [14 /* NoSubstitutionTemplateLiteral */, 15 /* TemplateHead */], [isNonJsxSameLineTokenContext], 8 /* Delete */),
+                rule("NoSpaceBetweenTagAndTemplateString", [73 /* Identifier */, 21 /* CloseParenToken */], [14 /* NoSubstitutionTemplateLiteral */, 15 /* TemplateHead */], [isNonJsxSameLineTokenContext], 8 /* Delete */),
                 // JSX opening elements
-                rule("SpaceBeforeJsxAttribute", anyToken, 72 /* Identifier */, [isNextTokenParentJsxAttribute, isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("SpaceBeforeJsxAttribute", anyToken, 73 /* Identifier */, [isNextTokenParentJsxAttribute, isNonJsxSameLineTokenContext], 2 /* Space */),
                 rule("SpaceBeforeSlashInJsxOpeningElement", anyToken, 42 /* SlashToken */, [isJsxSelfClosingElementContext, isNonJsxSameLineTokenContext], 2 /* Space */),
                 rule("NoSpaceBeforeGreaterThanTokenInJsxOpeningElement", 42 /* SlashToken */, 30 /* GreaterThanToken */, [isJsxSelfClosingElementContext, isNonJsxSameLineTokenContext], 8 /* Delete */),
-                rule("NoSpaceBeforeEqualInJsxAttribute", anyToken, 59 /* EqualsToken */, [isJsxAttributeContext, isNonJsxSameLineTokenContext], 8 /* Delete */),
-                rule("NoSpaceAfterEqualInJsxAttribute", 59 /* EqualsToken */, anyToken, [isJsxAttributeContext, isNonJsxSameLineTokenContext], 8 /* Delete */),
+                rule("NoSpaceBeforeEqualInJsxAttribute", anyToken, 60 /* EqualsToken */, [isJsxAttributeContext, isNonJsxSameLineTokenContext], 8 /* Delete */),
+                rule("NoSpaceAfterEqualInJsxAttribute", 60 /* EqualsToken */, anyToken, [isJsxAttributeContext, isNonJsxSameLineTokenContext], 8 /* Delete */),
                 // TypeScript-specific rules
                 // Use of module as a function call. e.g.: import m2 = module("m2");
-                rule("NoSpaceAfterModuleImport", [130 /* ModuleKeyword */, 134 /* RequireKeyword */], 20 /* OpenParenToken */, [isNonJsxSameLineTokenContext], 8 /* Delete */),
+                rule("NoSpaceAfterModuleImport", [131 /* ModuleKeyword */, 135 /* RequireKeyword */], 20 /* OpenParenToken */, [isNonJsxSameLineTokenContext], 8 /* Delete */),
                 // Add a space around certain TypeScript keywords
                 rule("SpaceAfterCertainTypeScriptKeywords", [
-                    118 /* AbstractKeyword */,
-                    76 /* ClassKeyword */,
-                    125 /* DeclareKeyword */,
-                    80 /* DefaultKeyword */,
-                    84 /* EnumKeyword */,
-                    85 /* ExportKeyword */,
-                    86 /* ExtendsKeyword */,
-                    126 /* GetKeyword */,
-                    109 /* ImplementsKeyword */,
-                    92 /* ImportKeyword */,
-                    110 /* InterfaceKeyword */,
-                    130 /* ModuleKeyword */,
-                    131 /* NamespaceKeyword */,
-                    113 /* PrivateKeyword */,
-                    115 /* PublicKeyword */,
-                    114 /* ProtectedKeyword */,
-                    133 /* ReadonlyKeyword */,
-                    137 /* SetKeyword */,
-                    116 /* StaticKeyword */,
-                    140 /* TypeKeyword */,
-                    144 /* FromKeyword */,
-                    129 /* KeyOfKeyword */,
-                    127 /* InferKeyword */,
+                    119 /* AbstractKeyword */,
+                    77 /* ClassKeyword */,
+                    126 /* DeclareKeyword */,
+                    81 /* DefaultKeyword */,
+                    85 /* EnumKeyword */,
+                    86 /* ExportKeyword */,
+                    87 /* ExtendsKeyword */,
+                    127 /* GetKeyword */,
+                    110 /* ImplementsKeyword */,
+                    93 /* ImportKeyword */,
+                    111 /* InterfaceKeyword */,
+                    131 /* ModuleKeyword */,
+                    132 /* NamespaceKeyword */,
+                    114 /* PrivateKeyword */,
+                    116 /* PublicKeyword */,
+                    115 /* ProtectedKeyword */,
+                    134 /* ReadonlyKeyword */,
+                    138 /* SetKeyword */,
+                    117 /* StaticKeyword */,
+                    141 /* TypeKeyword */,
+                    145 /* FromKeyword */,
+                    130 /* KeyOfKeyword */,
+                    128 /* InferKeyword */,
                 ], anyToken, [isNonJsxSameLineTokenContext], 2 /* Space */),
-                rule("SpaceBeforeCertainTypeScriptKeywords", anyToken, [86 /* ExtendsKeyword */, 109 /* ImplementsKeyword */, 144 /* FromKeyword */], [isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("SpaceBeforeCertainTypeScriptKeywords", anyToken, [87 /* ExtendsKeyword */, 110 /* ImplementsKeyword */, 145 /* FromKeyword */], [isNonJsxSameLineTokenContext], 2 /* Space */),
                 // Treat string literals in module names as identifiers, and add a space between the literal and the opening Brace braces, e.g.: module "m2" {
                 rule("SpaceAfterModuleName", 10 /* StringLiteral */, 18 /* OpenBraceToken */, [isModuleDeclContext], 2 /* Space */),
                 // Lambda expressions
                 rule("SpaceBeforeArrow", anyToken, 37 /* EqualsGreaterThanToken */, [isNonJsxSameLineTokenContext], 2 /* Space */),
                 rule("SpaceAfterArrow", 37 /* EqualsGreaterThanToken */, anyToken, [isNonJsxSameLineTokenContext], 2 /* Space */),
                 // Optional parameters and let args
-                rule("NoSpaceAfterEllipsis", 25 /* DotDotDotToken */, 72 /* Identifier */, [isNonJsxSameLineTokenContext], 8 /* Delete */),
+                rule("NoSpaceAfterEllipsis", 25 /* DotDotDotToken */, 73 /* Identifier */, [isNonJsxSameLineTokenContext], 8 /* Delete */),
                 rule("NoSpaceAfterOptionalParameters", 56 /* QuestionToken */, [21 /* CloseParenToken */, 27 /* CommaToken */], [isNonJsxSameLineTokenContext, isNotBinaryOpContext], 8 /* Delete */),
                 // Remove spaces in empty interface literals. e.g.: x: {}
                 rule("NoSpaceBetweenEmptyInterfaceBraceBrackets", 18 /* OpenBraceToken */, 19 /* CloseBraceToken */, [isNonJsxSameLineTokenContext, isObjectTypeContext], 8 /* Delete */),
@@ -108041,37 +111616,38 @@ var ts;
                 rule("NoSpaceBeforeCloseAngularBracket", anyToken, 30 /* GreaterThanToken */, [isNonJsxSameLineTokenContext, isTypeArgumentOrParameterOrAssertionContext], 8 /* Delete */),
                 rule("NoSpaceAfterCloseAngularBracket", 30 /* GreaterThanToken */, [20 /* OpenParenToken */, 22 /* OpenBracketToken */, 30 /* GreaterThanToken */, 27 /* CommaToken */], [isNonJsxSameLineTokenContext, isTypeArgumentOrParameterOrAssertionContext, isNotFunctionDeclContext /*To prevent an interference with the SpaceBeforeOpenParenInFuncDecl rule*/], 8 /* Delete */),
                 // decorators
-                rule("SpaceBeforeAt", [21 /* CloseParenToken */, 72 /* Identifier */], 58 /* AtToken */, [isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("SpaceBeforeAt", [21 /* CloseParenToken */, 73 /* Identifier */], 58 /* AtToken */, [isNonJsxSameLineTokenContext], 2 /* Space */),
                 rule("NoSpaceAfterAt", 58 /* AtToken */, anyToken, [isNonJsxSameLineTokenContext], 8 /* Delete */),
                 // Insert space after @ in decorator
                 rule("SpaceAfterDecorator", anyToken, [
-                    118 /* AbstractKeyword */,
-                    72 /* Identifier */,
-                    85 /* ExportKeyword */,
-                    80 /* DefaultKeyword */,
-                    76 /* ClassKeyword */,
-                    116 /* StaticKeyword */,
-                    115 /* PublicKeyword */,
-                    113 /* PrivateKeyword */,
-                    114 /* ProtectedKeyword */,
-                    126 /* GetKeyword */,
-                    137 /* SetKeyword */,
+                    119 /* AbstractKeyword */,
+                    73 /* Identifier */,
+                    86 /* ExportKeyword */,
+                    81 /* DefaultKeyword */,
+                    77 /* ClassKeyword */,
+                    117 /* StaticKeyword */,
+                    116 /* PublicKeyword */,
+                    114 /* PrivateKeyword */,
+                    115 /* ProtectedKeyword */,
+                    127 /* GetKeyword */,
+                    138 /* SetKeyword */,
                     22 /* OpenBracketToken */,
                     40 /* AsteriskToken */,
                 ], [isEndOfDecoratorContextOnSameLine], 2 /* Space */),
                 rule("NoSpaceBeforeNonNullAssertionOperator", anyToken, 52 /* ExclamationToken */, [isNonJsxSameLineTokenContext, isNonNullAssertionContext], 8 /* Delete */),
-                rule("NoSpaceAfterNewKeywordOnConstructorSignature", 95 /* NewKeyword */, 20 /* OpenParenToken */, [isNonJsxSameLineTokenContext, isConstructorSignatureContext], 8 /* Delete */),
+                rule("NoSpaceAfterNewKeywordOnConstructorSignature", 96 /* NewKeyword */, 20 /* OpenParenToken */, [isNonJsxSameLineTokenContext, isConstructorSignatureContext], 8 /* Delete */),
+                rule("SpaceLessThanAndNonJSXTypeAnnotation", 28 /* LessThanToken */, 28 /* LessThanToken */, [isNonJsxSameLineTokenContext], 2 /* Space */),
             ];
             // These rules are applied after high priority
             var userConfigurableRules = [
                 // Treat constructor as an identifier in a function declaration, and remove spaces between constructor and following left parentheses
-                rule("SpaceAfterConstructor", 124 /* ConstructorKeyword */, 20 /* OpenParenToken */, [isOptionEnabled("insertSpaceAfterConstructor"), isNonJsxSameLineTokenContext], 2 /* Space */),
-                rule("NoSpaceAfterConstructor", 124 /* ConstructorKeyword */, 20 /* OpenParenToken */, [isOptionDisabledOrUndefined("insertSpaceAfterConstructor"), isNonJsxSameLineTokenContext], 8 /* Delete */),
+                rule("SpaceAfterConstructor", 125 /* ConstructorKeyword */, 20 /* OpenParenToken */, [isOptionEnabled("insertSpaceAfterConstructor"), isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("NoSpaceAfterConstructor", 125 /* ConstructorKeyword */, 20 /* OpenParenToken */, [isOptionDisabledOrUndefined("insertSpaceAfterConstructor"), isNonJsxSameLineTokenContext], 8 /* Delete */),
                 rule("SpaceAfterComma", 27 /* CommaToken */, anyToken, [isOptionEnabled("insertSpaceAfterCommaDelimiter"), isNonJsxSameLineTokenContext, isNonJsxElementOrFragmentContext, isNextTokenNotCloseBracket], 2 /* Space */),
                 rule("NoSpaceAfterComma", 27 /* CommaToken */, anyToken, [isOptionDisabledOrUndefined("insertSpaceAfterCommaDelimiter"), isNonJsxSameLineTokenContext, isNonJsxElementOrFragmentContext], 8 /* Delete */),
                 // Insert space after function keyword for anonymous functions
-                rule("SpaceAfterAnonymousFunctionKeyword", 90 /* FunctionKeyword */, 20 /* OpenParenToken */, [isOptionEnabled("insertSpaceAfterFunctionKeywordForAnonymousFunctions"), isFunctionDeclContext], 2 /* Space */),
-                rule("NoSpaceAfterAnonymousFunctionKeyword", 90 /* FunctionKeyword */, 20 /* OpenParenToken */, [isOptionDisabledOrUndefined("insertSpaceAfterFunctionKeywordForAnonymousFunctions"), isFunctionDeclContext], 8 /* Delete */),
+                rule("SpaceAfterAnonymousFunctionKeyword", [91 /* FunctionKeyword */, 40 /* AsteriskToken */], 20 /* OpenParenToken */, [isOptionEnabled("insertSpaceAfterFunctionKeywordForAnonymousFunctions"), isFunctionDeclContext], 2 /* Space */),
+                rule("NoSpaceAfterAnonymousFunctionKeyword", [91 /* FunctionKeyword */, 40 /* AsteriskToken */], 20 /* OpenParenToken */, [isOptionDisabledOrUndefined("insertSpaceAfterFunctionKeywordForAnonymousFunctions"), isFunctionDeclContext], 8 /* Delete */),
                 // Insert space after keywords in control flow statements
                 rule("SpaceAfterKeywordInControl", keywords, 20 /* OpenParenToken */, [isOptionEnabled("insertSpaceAfterKeywordsInControlFlowStatements"), isControlDeclContext], 2 /* Space */),
                 rule("NoSpaceAfterKeywordInControl", keywords, 20 /* OpenParenToken */, [isOptionDisabledOrUndefined("insertSpaceAfterKeywordsInControlFlowStatements"), isControlDeclContext], 8 /* Delete */),
@@ -108135,20 +111711,32 @@ var ts;
                 rule("SpaceBeforeOpenBraceInTypeScriptDeclWithBlock", typeScriptOpenBraceLeftTokenRange, 18 /* OpenBraceToken */, [isOptionDisabledOrUndefinedOrTokensOnSameLine("placeOpenBraceOnNewLineForFunctions"), isTypeScriptDeclWithBlockContext, isNotFormatOnEnter, isSameLineTokenOrBeforeBlockContext], 2 /* Space */, 1 /* CanDeleteNewLines */),
                 rule("NoSpaceBeforeComma", anyToken, 27 /* CommaToken */, [isNonJsxSameLineTokenContext], 8 /* Delete */),
                 // No space before and after indexer `x[]`
-                rule("NoSpaceBeforeOpenBracket", anyTokenExcept(121 /* AsyncKeyword */, 74 /* CaseKeyword */), 22 /* OpenBracketToken */, [isNonJsxSameLineTokenContext], 8 /* Delete */),
+                rule("NoSpaceBeforeOpenBracket", anyTokenExcept(122 /* AsyncKeyword */, 75 /* CaseKeyword */), 22 /* OpenBracketToken */, [isNonJsxSameLineTokenContext], 8 /* Delete */),
                 rule("NoSpaceAfterCloseBracket", 23 /* CloseBracketToken */, anyToken, [isNonJsxSameLineTokenContext, isNotBeforeBlockInFunctionDeclarationContext], 8 /* Delete */),
                 rule("SpaceAfterSemicolon", 26 /* SemicolonToken */, anyToken, [isNonJsxSameLineTokenContext], 2 /* Space */),
                 // Remove extra space between for and await
-                rule("SpaceBetweenForAndAwaitKeyword", 89 /* ForKeyword */, 122 /* AwaitKeyword */, [isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("SpaceBetweenForAndAwaitKeyword", 90 /* ForKeyword */, 123 /* AwaitKeyword */, [isNonJsxSameLineTokenContext], 2 /* Space */),
                 // Add a space between statements. All keywords except (do,else,case) has open/close parens after them.
                 // So, we have a rule to add a space for [),Any], [do,Any], [else,Any], and [case,Any]
-                rule("SpaceBetweenStatements", [21 /* CloseParenToken */, 82 /* DoKeyword */, 83 /* ElseKeyword */, 74 /* CaseKeyword */], anyToken, [isNonJsxSameLineTokenContext, isNonJsxElementOrFragmentContext, isNotForContext], 2 /* Space */),
+                rule("SpaceBetweenStatements", [21 /* CloseParenToken */, 83 /* DoKeyword */, 84 /* ElseKeyword */, 75 /* CaseKeyword */], anyToken, [isNonJsxSameLineTokenContext, isNonJsxElementOrFragmentContext, isNotForContext], 2 /* Space */),
                 // This low-pri rule takes care of "try {" and "finally {" in case the rule SpaceBeforeOpenBraceInControl didn't execute on FormatOnEnter.
-                rule("SpaceAfterTryFinally", [103 /* TryKeyword */, 88 /* FinallyKeyword */], 18 /* OpenBraceToken */, [isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("SpaceAfterTryFinally", [104 /* TryKeyword */, 89 /* FinallyKeyword */], 18 /* OpenBraceToken */, [isNonJsxSameLineTokenContext], 2 /* Space */),
             ];
             return highPriorityCommonRules.concat(userConfigurableRules, lowPriorityCommonRules);
         }
         formatting.getAllRules = getAllRules;
+        /**
+         * A rule takes a two tokens (left/right) and a particular context
+         * for which you're meant to look at them. You then declare what should the
+         * whitespace annotation be between these tokens via the action param.
+         *
+         * @param debugName Name to print
+         * @param left The left side of the comparison
+         * @param right The right side of the comparison
+         * @param context A set of filters to narrow down the space in which this formatter rule applies
+         * @param action a declaration of the expected whitespace
+         * @param flags whether the rule deletes a line or not, defaults to no-op
+         */
         function rule(debugName, left, right, context, action, flags) {
             if (flags === void 0) { flags = 0 /* None */; }
             return { leftTokenRange: toTokenRange(left), rightTokenRange: toTokenRange(right), rule: { debugName: debugName, context: context, action: action, flags: flags } };
@@ -108188,45 +111776,45 @@ var ts;
             return function (context) { return !context.options || !context.options.hasOwnProperty(optionName) || !!context.options[optionName]; };
         }
         function isForContext(context) {
-            return context.contextNode.kind === 225 /* ForStatement */;
+            return context.contextNode.kind === 226 /* ForStatement */;
         }
         function isNotForContext(context) {
             return !isForContext(context);
         }
         function isBinaryOpContext(context) {
             switch (context.contextNode.kind) {
-                case 204 /* BinaryExpression */:
-                case 205 /* ConditionalExpression */:
-                case 175 /* ConditionalType */:
-                case 212 /* AsExpression */:
-                case 257 /* ExportSpecifier */:
-                case 253 /* ImportSpecifier */:
-                case 163 /* TypePredicate */:
-                case 173 /* UnionType */:
-                case 174 /* IntersectionType */:
+                case 205 /* BinaryExpression */:
+                case 206 /* ConditionalExpression */:
+                case 176 /* ConditionalType */:
+                case 213 /* AsExpression */:
+                case 258 /* ExportSpecifier */:
+                case 254 /* ImportSpecifier */:
+                case 164 /* TypePredicate */:
+                case 174 /* UnionType */:
+                case 175 /* IntersectionType */:
                     return true;
                 // equals in binding elements: function foo([[x, y] = [1, 2]])
-                case 186 /* BindingElement */:
+                case 187 /* BindingElement */:
                 // equals in type X = ...
-                case 242 /* TypeAliasDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
                 // equal in import a = module('a');
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                 // equal in let a = 0;
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                 // equal in p = 0;
-                case 151 /* Parameter */:
-                case 278 /* EnumMember */:
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
-                    return context.currentTokenSpan.kind === 59 /* EqualsToken */ || context.nextTokenSpan.kind === 59 /* EqualsToken */;
+                case 152 /* Parameter */:
+                case 279 /* EnumMember */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
+                    return context.currentTokenSpan.kind === 60 /* EqualsToken */ || context.nextTokenSpan.kind === 60 /* EqualsToken */;
                 // "in" keyword in for (let x in []) { }
-                case 226 /* ForInStatement */:
+                case 227 /* ForInStatement */:
                 // "in" keyword in [P in keyof T]: T[P]
-                case 150 /* TypeParameter */:
-                    return context.currentTokenSpan.kind === 93 /* InKeyword */ || context.nextTokenSpan.kind === 93 /* InKeyword */ || context.currentTokenSpan.kind === 59 /* EqualsToken */ || context.nextTokenSpan.kind === 59 /* EqualsToken */;
+                case 151 /* TypeParameter */:
+                    return context.currentTokenSpan.kind === 94 /* InKeyword */ || context.nextTokenSpan.kind === 94 /* InKeyword */ || context.currentTokenSpan.kind === 60 /* EqualsToken */ || context.nextTokenSpan.kind === 60 /* EqualsToken */;
                 // Technically, "of" is not a binary operator, but format it the same way as "in"
-                case 227 /* ForOfStatement */:
-                    return context.currentTokenSpan.kind === 147 /* OfKeyword */ || context.nextTokenSpan.kind === 147 /* OfKeyword */;
+                case 228 /* ForOfStatement */:
+                    return context.currentTokenSpan.kind === 148 /* OfKeyword */ || context.nextTokenSpan.kind === 148 /* OfKeyword */;
             }
             return false;
         }
@@ -108238,22 +111826,22 @@ var ts;
         }
         function isTypeAnnotationContext(context) {
             var contextKind = context.contextNode.kind;
-            return contextKind === 154 /* PropertyDeclaration */ ||
-                contextKind === 153 /* PropertySignature */ ||
-                contextKind === 151 /* Parameter */ ||
-                contextKind === 237 /* VariableDeclaration */ ||
+            return contextKind === 155 /* PropertyDeclaration */ ||
+                contextKind === 154 /* PropertySignature */ ||
+                contextKind === 152 /* Parameter */ ||
+                contextKind === 238 /* VariableDeclaration */ ||
                 ts.isFunctionLikeKind(contextKind);
         }
         function isConditionalOperatorContext(context) {
-            return context.contextNode.kind === 205 /* ConditionalExpression */ ||
-                context.contextNode.kind === 175 /* ConditionalType */;
+            return context.contextNode.kind === 206 /* ConditionalExpression */ ||
+                context.contextNode.kind === 176 /* ConditionalType */;
         }
         function isSameLineTokenOrBeforeBlockContext(context) {
             return context.TokensAreOnSameLine() || isBeforeBlockContext(context);
         }
         function isBraceWrappedContext(context) {
-            return context.contextNode.kind === 184 /* ObjectBindingPattern */ ||
-                context.contextNode.kind === 181 /* MappedType */ ||
+            return context.contextNode.kind === 185 /* ObjectBindingPattern */ ||
+                context.contextNode.kind === 182 /* MappedType */ ||
                 isSingleLineBlockContext(context);
         }
         // This check is done before an open brace in a control construct, a function, or a typescript block declaration
@@ -108279,31 +111867,31 @@ var ts;
                 return true;
             }
             switch (node.kind) {
-                case 218 /* Block */:
-                case 246 /* CaseBlock */:
-                case 188 /* ObjectLiteralExpression */:
-                case 245 /* ModuleBlock */:
+                case 219 /* Block */:
+                case 247 /* CaseBlock */:
+                case 189 /* ObjectLiteralExpression */:
+                case 246 /* ModuleBlock */:
                     return true;
             }
             return false;
         }
         function isFunctionDeclContext(context) {
             switch (context.contextNode.kind) {
-                case 239 /* FunctionDeclaration */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
+                case 240 /* FunctionDeclaration */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
                 // case SyntaxKind.MemberFunctionDeclaration:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                 // case SyntaxKind.MethodSignature:
-                case 160 /* CallSignature */:
-                case 196 /* FunctionExpression */:
-                case 157 /* Constructor */:
-                case 197 /* ArrowFunction */:
+                case 161 /* CallSignature */:
+                case 197 /* FunctionExpression */:
+                case 158 /* Constructor */:
+                case 198 /* ArrowFunction */:
                 // case SyntaxKind.ConstructorDeclaration:
                 // case SyntaxKind.SimpleArrowFunctionExpression:
                 // case SyntaxKind.ParenthesizedArrowFunctionExpression:
-                case 241 /* InterfaceDeclaration */: // This one is not truly a function, but for formatting purposes, it acts just like one
+                case 242 /* InterfaceDeclaration */: // This one is not truly a function, but for formatting purposes, it acts just like one
                     return true;
             }
             return false;
@@ -108312,40 +111900,40 @@ var ts;
             return !isFunctionDeclContext(context);
         }
         function isFunctionDeclarationOrFunctionExpressionContext(context) {
-            return context.contextNode.kind === 239 /* FunctionDeclaration */ || context.contextNode.kind === 196 /* FunctionExpression */;
+            return context.contextNode.kind === 240 /* FunctionDeclaration */ || context.contextNode.kind === 197 /* FunctionExpression */;
         }
         function isTypeScriptDeclWithBlockContext(context) {
             return nodeIsTypeScriptDeclWithBlockContext(context.contextNode);
         }
         function nodeIsTypeScriptDeclWithBlockContext(node) {
             switch (node.kind) {
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
-                case 241 /* InterfaceDeclaration */:
-                case 243 /* EnumDeclaration */:
-                case 168 /* TypeLiteral */:
-                case 244 /* ModuleDeclaration */:
-                case 255 /* ExportDeclaration */:
-                case 256 /* NamedExports */:
-                case 249 /* ImportDeclaration */:
-                case 252 /* NamedImports */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
+                case 242 /* InterfaceDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 169 /* TypeLiteral */:
+                case 245 /* ModuleDeclaration */:
+                case 256 /* ExportDeclaration */:
+                case 257 /* NamedExports */:
+                case 250 /* ImportDeclaration */:
+                case 253 /* NamedImports */:
                     return true;
             }
             return false;
         }
         function isAfterCodeBlockContext(context) {
             switch (context.currentTokenParent.kind) {
-                case 240 /* ClassDeclaration */:
-                case 244 /* ModuleDeclaration */:
-                case 243 /* EnumDeclaration */:
-                case 274 /* CatchClause */:
-                case 245 /* ModuleBlock */:
-                case 232 /* SwitchStatement */:
+                case 241 /* ClassDeclaration */:
+                case 245 /* ModuleDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 275 /* CatchClause */:
+                case 246 /* ModuleBlock */:
+                case 233 /* SwitchStatement */:
                     return true;
-                case 218 /* Block */: {
+                case 219 /* Block */: {
                     var blockParent = context.currentTokenParent.parent;
                     // In a codefix scenario, we can't rely on parents being set. So just always return true.
-                    if (!blockParent || blockParent.kind !== 197 /* ArrowFunction */ && blockParent.kind !== 196 /* FunctionExpression */) {
+                    if (!blockParent || blockParent.kind !== 198 /* ArrowFunction */ && blockParent.kind !== 197 /* FunctionExpression */) {
                         return true;
                     }
                 }
@@ -108354,31 +111942,31 @@ var ts;
         }
         function isControlDeclContext(context) {
             switch (context.contextNode.kind) {
-                case 222 /* IfStatement */:
-                case 232 /* SwitchStatement */:
-                case 225 /* ForStatement */:
-                case 226 /* ForInStatement */:
-                case 227 /* ForOfStatement */:
-                case 224 /* WhileStatement */:
-                case 235 /* TryStatement */:
-                case 223 /* DoStatement */:
-                case 231 /* WithStatement */:
+                case 223 /* IfStatement */:
+                case 233 /* SwitchStatement */:
+                case 226 /* ForStatement */:
+                case 227 /* ForInStatement */:
+                case 228 /* ForOfStatement */:
+                case 225 /* WhileStatement */:
+                case 236 /* TryStatement */:
+                case 224 /* DoStatement */:
+                case 232 /* WithStatement */:
                 // TODO
                 // case SyntaxKind.ElseClause:
-                case 274 /* CatchClause */:
+                case 275 /* CatchClause */:
                     return true;
                 default:
                     return false;
             }
         }
         function isObjectContext(context) {
-            return context.contextNode.kind === 188 /* ObjectLiteralExpression */;
+            return context.contextNode.kind === 189 /* ObjectLiteralExpression */;
         }
         function isFunctionCallContext(context) {
-            return context.contextNode.kind === 191 /* CallExpression */;
+            return context.contextNode.kind === 192 /* CallExpression */;
         }
         function isNewContext(context) {
-            return context.contextNode.kind === 192 /* NewExpression */;
+            return context.contextNode.kind === 193 /* NewExpression */;
         }
         function isFunctionCallOrNewContext(context) {
             return isFunctionCallContext(context) || isNewContext(context);
@@ -108390,28 +111978,28 @@ var ts;
             return context.nextTokenSpan.kind !== 23 /* CloseBracketToken */;
         }
         function isArrowFunctionContext(context) {
-            return context.contextNode.kind === 197 /* ArrowFunction */;
+            return context.contextNode.kind === 198 /* ArrowFunction */;
         }
         function isImportTypeContext(context) {
-            return context.contextNode.kind === 183 /* ImportType */;
+            return context.contextNode.kind === 184 /* ImportType */;
         }
         function isNonJsxSameLineTokenContext(context) {
             return context.TokensAreOnSameLine() && context.contextNode.kind !== 11 /* JsxText */;
         }
         function isNonJsxElementOrFragmentContext(context) {
-            return context.contextNode.kind !== 260 /* JsxElement */ && context.contextNode.kind !== 264 /* JsxFragment */;
+            return context.contextNode.kind !== 261 /* JsxElement */ && context.contextNode.kind !== 265 /* JsxFragment */;
         }
         function isJsxExpressionContext(context) {
-            return context.contextNode.kind === 270 /* JsxExpression */ || context.contextNode.kind === 269 /* JsxSpreadAttribute */;
+            return context.contextNode.kind === 271 /* JsxExpression */ || context.contextNode.kind === 270 /* JsxSpreadAttribute */;
         }
         function isNextTokenParentJsxAttribute(context) {
-            return context.nextTokenParent.kind === 267 /* JsxAttribute */;
+            return context.nextTokenParent.kind === 268 /* JsxAttribute */;
         }
         function isJsxAttributeContext(context) {
-            return context.contextNode.kind === 267 /* JsxAttribute */;
+            return context.contextNode.kind === 268 /* JsxAttribute */;
         }
         function isJsxSelfClosingElementContext(context) {
-            return context.contextNode.kind === 261 /* JsxSelfClosingElement */;
+            return context.contextNode.kind === 262 /* JsxSelfClosingElement */;
         }
         function isNotBeforeBlockInFunctionDeclarationContext(context) {
             return !isFunctionDeclContext(context) && !isBeforeBlockContext(context);
@@ -108426,45 +112014,45 @@ var ts;
             while (ts.isExpressionNode(node)) {
                 node = node.parent;
             }
-            return node.kind === 152 /* Decorator */;
+            return node.kind === 153 /* Decorator */;
         }
         function isStartOfVariableDeclarationList(context) {
-            return context.currentTokenParent.kind === 238 /* VariableDeclarationList */ &&
+            return context.currentTokenParent.kind === 239 /* VariableDeclarationList */ &&
                 context.currentTokenParent.getStart(context.sourceFile) === context.currentTokenSpan.pos;
         }
         function isNotFormatOnEnter(context) {
             return context.formattingRequestKind !== 2 /* FormatOnEnter */;
         }
         function isModuleDeclContext(context) {
-            return context.contextNode.kind === 244 /* ModuleDeclaration */;
+            return context.contextNode.kind === 245 /* ModuleDeclaration */;
         }
         function isObjectTypeContext(context) {
-            return context.contextNode.kind === 168 /* TypeLiteral */; // && context.contextNode.parent.kind !== SyntaxKind.InterfaceDeclaration;
+            return context.contextNode.kind === 169 /* TypeLiteral */; // && context.contextNode.parent.kind !== SyntaxKind.InterfaceDeclaration;
         }
         function isConstructorSignatureContext(context) {
-            return context.contextNode.kind === 161 /* ConstructSignature */;
+            return context.contextNode.kind === 162 /* ConstructSignature */;
         }
         function isTypeArgumentOrParameterOrAssertion(token, parent) {
             if (token.kind !== 28 /* LessThanToken */ && token.kind !== 30 /* GreaterThanToken */) {
                 return false;
             }
             switch (parent.kind) {
-                case 164 /* TypeReference */:
-                case 194 /* TypeAssertionExpression */:
-                case 242 /* TypeAliasDeclaration */:
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
-                case 241 /* InterfaceDeclaration */:
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
-                case 160 /* CallSignature */:
-                case 161 /* ConstructSignature */:
-                case 191 /* CallExpression */:
-                case 192 /* NewExpression */:
-                case 211 /* ExpressionWithTypeArguments */:
+                case 165 /* TypeReference */:
+                case 195 /* TypeAssertionExpression */:
+                case 243 /* TypeAliasDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
+                case 242 /* InterfaceDeclaration */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
+                case 161 /* CallSignature */:
+                case 162 /* ConstructSignature */:
+                case 192 /* CallExpression */:
+                case 193 /* NewExpression */:
+                case 212 /* ExpressionWithTypeArguments */:
                     return true;
                 default:
                     return false;
@@ -108475,16 +112063,16 @@ var ts;
                 isTypeArgumentOrParameterOrAssertion(context.nextTokenSpan, context.nextTokenParent);
         }
         function isTypeAssertionContext(context) {
-            return context.contextNode.kind === 194 /* TypeAssertionExpression */;
+            return context.contextNode.kind === 195 /* TypeAssertionExpression */;
         }
         function isVoidOpContext(context) {
-            return context.currentTokenSpan.kind === 106 /* VoidKeyword */ && context.currentTokenParent.kind === 200 /* VoidExpression */;
+            return context.currentTokenSpan.kind === 107 /* VoidKeyword */ && context.currentTokenParent.kind === 201 /* VoidExpression */;
         }
         function isYieldOrYieldStarWithOperand(context) {
-            return context.contextNode.kind === 207 /* YieldExpression */ && context.contextNode.expression !== undefined;
+            return context.contextNode.kind === 208 /* YieldExpression */ && context.contextNode.expression !== undefined;
         }
         function isNonNullAssertionContext(context) {
-            return context.contextNode.kind === 213 /* NonNullExpression */;
+            return context.contextNode.kind === 214 /* NonNullExpression */;
         }
     })(formatting = ts.formatting || (ts.formatting = {}));
 })(ts || (ts = {}));
@@ -108535,12 +112123,12 @@ var ts;
             return map;
         }
         function getRuleBucketIndex(row, column) {
-            ts.Debug.assert(row <= 147 /* LastKeyword */ && column <= 147 /* LastKeyword */, "Must compute formatting context from tokens");
+            ts.Debug.assert(row <= 148 /* LastKeyword */ && column <= 148 /* LastKeyword */, "Must compute formatting context from tokens");
             return (row * mapRowLength) + column;
         }
         var maskBitSize = 5;
         var mask = 31; // MaskBitSize bits
-        var mapRowLength = 147 /* LastToken */ + 1;
+        var mapRowLength = 148 /* LastToken */ + 1;
         var RulesPosition;
         (function (RulesPosition) {
             RulesPosition[RulesPosition["IgnoreRulesSpecific"] = 0] = "IgnoreRulesSpecific";
@@ -108718,17 +112306,17 @@ var ts;
         // i.e. parent is class declaration with the list of members and node is one of members.
         function isListElement(parent, node) {
             switch (parent.kind) {
-                case 240 /* ClassDeclaration */:
-                case 241 /* InterfaceDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 242 /* InterfaceDeclaration */:
                     return ts.rangeContainsRange(parent.members, node);
-                case 244 /* ModuleDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     var body = parent.body;
-                    return !!body && body.kind === 245 /* ModuleBlock */ && ts.rangeContainsRange(body.statements, node);
-                case 284 /* SourceFile */:
-                case 218 /* Block */:
-                case 245 /* ModuleBlock */:
+                    return !!body && body.kind === 246 /* ModuleBlock */ && ts.rangeContainsRange(body.statements, node);
+                case 285 /* SourceFile */:
+                case 219 /* Block */:
+                case 246 /* ModuleBlock */:
                     return ts.rangeContainsRange(parent.statements, node);
-                case 274 /* CatchClause */:
+                case 275 /* CatchClause */:
                     return ts.rangeContainsRange(parent.block.statements, node);
             }
             return false;
@@ -108937,6 +112525,9 @@ var ts;
                     else if (formatting.SmartIndenter.childStartsOnTheSameLineWithElseInIfStatement(parent, node, startLine, sourceFile)) {
                         return { indentation: parentDynamicIndentation.getIndentation(), delta: delta };
                     }
+                    else if (formatting.SmartIndenter.argumentStartsOnSameLineAsPreviousArgument(parent, node, startLine, sourceFile)) {
+                        return { indentation: parentDynamicIndentation.getIndentation(), delta: delta };
+                    }
                     else {
                         return { indentation: parentDynamicIndentation.getIndentation() + parentDynamicIndentation.getDelta(node), delta: delta };
                     }
@@ -108950,19 +112541,19 @@ var ts;
                     return node.modifiers[0].kind;
                 }
                 switch (node.kind) {
-                    case 240 /* ClassDeclaration */: return 76 /* ClassKeyword */;
-                    case 241 /* InterfaceDeclaration */: return 110 /* InterfaceKeyword */;
-                    case 239 /* FunctionDeclaration */: return 90 /* FunctionKeyword */;
-                    case 243 /* EnumDeclaration */: return 243 /* EnumDeclaration */;
-                    case 158 /* GetAccessor */: return 126 /* GetKeyword */;
-                    case 159 /* SetAccessor */: return 137 /* SetKeyword */;
-                    case 156 /* MethodDeclaration */:
+                    case 241 /* ClassDeclaration */: return 77 /* ClassKeyword */;
+                    case 242 /* InterfaceDeclaration */: return 111 /* InterfaceKeyword */;
+                    case 240 /* FunctionDeclaration */: return 91 /* FunctionKeyword */;
+                    case 244 /* EnumDeclaration */: return 244 /* EnumDeclaration */;
+                    case 159 /* GetAccessor */: return 127 /* GetKeyword */;
+                    case 160 /* SetAccessor */: return 138 /* SetKeyword */;
+                    case 157 /* MethodDeclaration */:
                         if (node.asteriskToken) {
                             return 40 /* AsteriskToken */;
                         }
                     // falls through
-                    case 154 /* PropertyDeclaration */:
-                    case 151 /* Parameter */:
+                    case 155 /* PropertyDeclaration */:
+                    case 152 /* Parameter */:
                         var name = ts.getNameOfDeclaration(node);
                         if (name) {
                             return name.kind;
@@ -109012,22 +112603,22 @@ var ts;
                         case 18 /* OpenBraceToken */:
                         case 19 /* CloseBraceToken */:
                         case 21 /* CloseParenToken */:
-                        case 83 /* ElseKeyword */:
-                        case 107 /* WhileKeyword */:
+                        case 84 /* ElseKeyword */:
+                        case 108 /* WhileKeyword */:
                         case 58 /* AtToken */:
                             return false;
                         case 42 /* SlashToken */:
                         case 30 /* GreaterThanToken */:
                             switch (container.kind) {
-                                case 262 /* JsxOpeningElement */:
-                                case 263 /* JsxClosingElement */:
-                                case 261 /* JsxSelfClosingElement */:
+                                case 263 /* JsxOpeningElement */:
+                                case 264 /* JsxClosingElement */:
+                                case 262 /* JsxSelfClosingElement */:
                                     return false;
                             }
                             break;
                         case 22 /* OpenBracketToken */:
                         case 23 /* CloseBracketToken */:
-                            if (container.kind !== 181 /* MappedType */) {
+                            if (container.kind !== 182 /* MappedType */) {
                                 return false;
                             }
                             break;
@@ -109119,7 +112710,7 @@ var ts;
                         consumeTokenAndAdvanceScanner(tokenInfo, node, parentDynamicIndentation, child);
                         return inheritedIndentation;
                     }
-                    var effectiveParentStartLine = child.kind === 152 /* Decorator */ ? childStartLine : undecoratedParentStartLine;
+                    var effectiveParentStartLine = child.kind === 153 /* Decorator */ ? childStartLine : undecoratedParentStartLine;
                     var childIndentation = computeIndentation(child, childStartLine, childIndentationAmount, node, parentDynamicIndentation, effectiveParentStartLine);
                     processNode(child, childContextNode, childStartLine, undecoratedChildStartLine, childIndentation.indentation, childIndentation.delta);
                     if (child.kind === 11 /* JsxText */) {
@@ -109127,7 +112718,7 @@ var ts;
                         indentMultilineCommentOrJsxText(range, childIndentation.indentation, /*firstLineIsIndented*/ true, /*indentFinalLine*/ false);
                     }
                     childContextNode = node;
-                    if (isFirstListItem && parent.kind === 187 /* ArrayLiteralExpression */ && inheritedIndentation === -1 /* Unknown */) {
+                    if (isFirstListItem && parent.kind === 188 /* ArrayLiteralExpression */ && inheritedIndentation === -1 /* Unknown */) {
                         inheritedIndentation = childIndentation.indentation;
                     }
                     return inheritedIndentation;
@@ -109545,12 +113136,12 @@ var ts;
         formatting.getRangeOfEnclosingComment = getRangeOfEnclosingComment;
         function getOpenTokenForList(node, list) {
             switch (node.kind) {
-                case 157 /* Constructor */:
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
-                case 197 /* ArrowFunction */:
+                case 158 /* Constructor */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
+                case 198 /* ArrowFunction */:
                     if (node.typeParameters === list) {
                         return 28 /* LessThanToken */;
                     }
@@ -109558,8 +113149,8 @@ var ts;
                         return 20 /* OpenParenToken */;
                     }
                     break;
-                case 191 /* CallExpression */:
-                case 192 /* NewExpression */:
+                case 192 /* CallExpression */:
+                case 193 /* NewExpression */:
                     if (node.typeArguments === list) {
                         return 28 /* LessThanToken */;
                     }
@@ -109567,12 +113158,12 @@ var ts;
                         return 20 /* OpenParenToken */;
                     }
                     break;
-                case 164 /* TypeReference */:
+                case 165 /* TypeReference */:
                     if (node.typeArguments === list) {
                         return 28 /* LessThanToken */;
                     }
                     break;
-                case 168 /* TypeLiteral */:
+                case 169 /* TypeLiteral */:
                     return 18 /* OpenBraceToken */;
             }
             return 0 /* Unknown */;
@@ -109689,7 +113280,7 @@ var ts;
                 if (options.indentStyle === ts.IndentStyle.Block) {
                     return getBlockIndent(sourceFile, position, options);
                 }
-                if (precedingToken.kind === 27 /* CommaToken */ && precedingToken.parent.kind !== 204 /* BinaryExpression */) {
+                if (precedingToken.kind === 27 /* CommaToken */ && precedingToken.parent.kind !== 205 /* BinaryExpression */) {
                     // previous token is comma that separates items in list - find the previous item and try to derive indentation from it
                     var actualIndentation = getActualIndentationForListItemBeforeComma(precedingToken, sourceFile, options);
                     if (actualIndentation !== -1 /* Unknown */) {
@@ -109843,7 +113434,7 @@ var ts;
                 // - parent is SourceFile - by default immediate children of SourceFile are not indented except when user indents them manually
                 // - parent and child are not on the same line
                 var useActualIndentation = (ts.isDeclaration(current) || ts.isStatementButNotDeclaration(current)) &&
-                    (parent.kind === 284 /* SourceFile */ || !parentAndChildShareLine);
+                    (parent.kind === 285 /* SourceFile */ || !parentAndChildShareLine);
                 if (!useActualIndentation) {
                     return -1 /* Unknown */;
                 }
@@ -109891,8 +113482,8 @@ var ts;
             }
             SmartIndenter.isArgumentAndStartLineOverlapsExpressionBeingCalled = isArgumentAndStartLineOverlapsExpressionBeingCalled;
             function childStartsOnTheSameLineWithElseInIfStatement(parent, child, childStartLine, sourceFile) {
-                if (parent.kind === 222 /* IfStatement */ && parent.elseStatement === child) {
-                    var elseKeyword = ts.findChildOfKind(parent, 83 /* ElseKeyword */, sourceFile);
+                if (parent.kind === 223 /* IfStatement */ && parent.elseStatement === child) {
+                    var elseKeyword = ts.findChildOfKind(parent, 84 /* ElseKeyword */, sourceFile);
                     ts.Debug.assert(elseKeyword !== undefined);
                     var elseKeywordStartLine = getStartLineAndCharacterForNode(elseKeyword, sourceFile).line;
                     return elseKeywordStartLine === childStartLine;
@@ -109900,6 +113491,23 @@ var ts;
                 return false;
             }
             SmartIndenter.childStartsOnTheSameLineWithElseInIfStatement = childStartsOnTheSameLineWithElseInIfStatement;
+            function argumentStartsOnSameLineAsPreviousArgument(parent, child, childStartLine, sourceFile) {
+                if (ts.isCallOrNewExpression(parent)) {
+                    if (!parent.arguments)
+                        return false;
+                    var currentNode = ts.Debug.assertDefined(ts.find(parent.arguments, function (arg) { return arg.pos === child.pos; }));
+                    var currentIndex = parent.arguments.indexOf(currentNode);
+                    if (currentIndex === 0)
+                        return false; // Can't look at previous node if first
+                    var previousNode = parent.arguments[currentIndex - 1];
+                    var lineOfPreviousNode = ts.getLineAndCharacterOfPosition(sourceFile, previousNode.getEnd()).line;
+                    if (childStartLine === lineOfPreviousNode) {
+                        return true;
+                    }
+                }
+                return false;
+            }
+            SmartIndenter.argumentStartsOnSameLineAsPreviousArgument = argumentStartsOnSameLineAsPreviousArgument;
             function getContainingList(node, sourceFile) {
                 return node.parent && getListByRange(node.getStart(sourceFile), node.getEnd(), node.parent, sourceFile);
             }
@@ -109909,40 +113517,40 @@ var ts;
             }
             function getListByRange(start, end, node, sourceFile) {
                 switch (node.kind) {
-                    case 164 /* TypeReference */:
+                    case 165 /* TypeReference */:
                         return getList(node.typeArguments);
-                    case 188 /* ObjectLiteralExpression */:
+                    case 189 /* ObjectLiteralExpression */:
                         return getList(node.properties);
-                    case 187 /* ArrayLiteralExpression */:
+                    case 188 /* ArrayLiteralExpression */:
                         return getList(node.elements);
-                    case 168 /* TypeLiteral */:
+                    case 169 /* TypeLiteral */:
                         return getList(node.members);
-                    case 239 /* FunctionDeclaration */:
-                    case 196 /* FunctionExpression */:
-                    case 197 /* ArrowFunction */:
-                    case 156 /* MethodDeclaration */:
-                    case 155 /* MethodSignature */:
-                    case 160 /* CallSignature */:
-                    case 157 /* Constructor */:
-                    case 166 /* ConstructorType */:
-                    case 161 /* ConstructSignature */:
+                    case 240 /* FunctionDeclaration */:
+                    case 197 /* FunctionExpression */:
+                    case 198 /* ArrowFunction */:
+                    case 157 /* MethodDeclaration */:
+                    case 156 /* MethodSignature */:
+                    case 161 /* CallSignature */:
+                    case 158 /* Constructor */:
+                    case 167 /* ConstructorType */:
+                    case 162 /* ConstructSignature */:
                         return getList(node.typeParameters) || getList(node.parameters);
-                    case 240 /* ClassDeclaration */:
-                    case 209 /* ClassExpression */:
-                    case 241 /* InterfaceDeclaration */:
-                    case 242 /* TypeAliasDeclaration */:
-                    case 308 /* JSDocTemplateTag */:
+                    case 241 /* ClassDeclaration */:
+                    case 210 /* ClassExpression */:
+                    case 242 /* InterfaceDeclaration */:
+                    case 243 /* TypeAliasDeclaration */:
+                    case 310 /* JSDocTemplateTag */:
                         return getList(node.typeParameters);
-                    case 192 /* NewExpression */:
-                    case 191 /* CallExpression */:
+                    case 193 /* NewExpression */:
+                    case 192 /* CallExpression */:
                         return getList(node.typeArguments) || getList(node.arguments);
-                    case 238 /* VariableDeclarationList */:
+                    case 239 /* VariableDeclarationList */:
                         return getList(node.declarations);
-                    case 252 /* NamedImports */:
-                    case 256 /* NamedExports */:
+                    case 253 /* NamedImports */:
+                    case 257 /* NamedExports */:
                         return getList(node.elements);
-                    case 184 /* ObjectBindingPattern */:
-                    case 185 /* ArrayBindingPattern */:
+                    case 185 /* ObjectBindingPattern */:
+                    case 186 /* ArrayBindingPattern */:
                         return getList(node.elements);
                 }
                 function getList(list) {
@@ -109965,7 +113573,7 @@ var ts;
                 return findColumnForFirstNonWhitespaceCharacterInLine(sourceFile.getLineAndCharacterOfPosition(list.pos), sourceFile, options);
             }
             function getActualIndentationForListItem(node, sourceFile, options, listIndentsChild) {
-                if (node.parent && node.parent.kind === 238 /* VariableDeclarationList */) {
+                if (node.parent && node.parent.kind === 239 /* VariableDeclarationList */) {
                     // VariableDeclarationList has no wrapping tokens
                     return -1 /* Unknown */;
                 }
@@ -110038,83 +113646,83 @@ var ts;
             function nodeWillIndentChild(settings, parent, child, sourceFile, indentByDefault) {
                 var childKind = child ? child.kind : 0 /* Unknown */;
                 switch (parent.kind) {
-                    case 221 /* ExpressionStatement */:
-                    case 240 /* ClassDeclaration */:
-                    case 209 /* ClassExpression */:
-                    case 241 /* InterfaceDeclaration */:
-                    case 243 /* EnumDeclaration */:
-                    case 242 /* TypeAliasDeclaration */:
-                    case 187 /* ArrayLiteralExpression */:
-                    case 218 /* Block */:
-                    case 245 /* ModuleBlock */:
-                    case 188 /* ObjectLiteralExpression */:
-                    case 168 /* TypeLiteral */:
-                    case 181 /* MappedType */:
-                    case 170 /* TupleType */:
-                    case 246 /* CaseBlock */:
-                    case 272 /* DefaultClause */:
-                    case 271 /* CaseClause */:
-                    case 195 /* ParenthesizedExpression */:
-                    case 189 /* PropertyAccessExpression */:
-                    case 191 /* CallExpression */:
-                    case 192 /* NewExpression */:
-                    case 219 /* VariableStatement */:
-                    case 254 /* ExportAssignment */:
-                    case 230 /* ReturnStatement */:
-                    case 205 /* ConditionalExpression */:
-                    case 185 /* ArrayBindingPattern */:
-                    case 184 /* ObjectBindingPattern */:
-                    case 262 /* JsxOpeningElement */:
-                    case 265 /* JsxOpeningFragment */:
-                    case 261 /* JsxSelfClosingElement */:
-                    case 270 /* JsxExpression */:
-                    case 155 /* MethodSignature */:
-                    case 160 /* CallSignature */:
-                    case 161 /* ConstructSignature */:
-                    case 151 /* Parameter */:
-                    case 165 /* FunctionType */:
-                    case 166 /* ConstructorType */:
-                    case 177 /* ParenthesizedType */:
-                    case 193 /* TaggedTemplateExpression */:
-                    case 201 /* AwaitExpression */:
-                    case 256 /* NamedExports */:
-                    case 252 /* NamedImports */:
-                    case 257 /* ExportSpecifier */:
-                    case 253 /* ImportSpecifier */:
-                    case 154 /* PropertyDeclaration */:
+                    case 222 /* ExpressionStatement */:
+                    case 241 /* ClassDeclaration */:
+                    case 210 /* ClassExpression */:
+                    case 242 /* InterfaceDeclaration */:
+                    case 244 /* EnumDeclaration */:
+                    case 243 /* TypeAliasDeclaration */:
+                    case 188 /* ArrayLiteralExpression */:
+                    case 219 /* Block */:
+                    case 246 /* ModuleBlock */:
+                    case 189 /* ObjectLiteralExpression */:
+                    case 169 /* TypeLiteral */:
+                    case 182 /* MappedType */:
+                    case 171 /* TupleType */:
+                    case 247 /* CaseBlock */:
+                    case 273 /* DefaultClause */:
+                    case 272 /* CaseClause */:
+                    case 196 /* ParenthesizedExpression */:
+                    case 190 /* PropertyAccessExpression */:
+                    case 192 /* CallExpression */:
+                    case 193 /* NewExpression */:
+                    case 220 /* VariableStatement */:
+                    case 255 /* ExportAssignment */:
+                    case 231 /* ReturnStatement */:
+                    case 206 /* ConditionalExpression */:
+                    case 186 /* ArrayBindingPattern */:
+                    case 185 /* ObjectBindingPattern */:
+                    case 263 /* JsxOpeningElement */:
+                    case 266 /* JsxOpeningFragment */:
+                    case 262 /* JsxSelfClosingElement */:
+                    case 271 /* JsxExpression */:
+                    case 156 /* MethodSignature */:
+                    case 161 /* CallSignature */:
+                    case 162 /* ConstructSignature */:
+                    case 152 /* Parameter */:
+                    case 166 /* FunctionType */:
+                    case 167 /* ConstructorType */:
+                    case 178 /* ParenthesizedType */:
+                    case 194 /* TaggedTemplateExpression */:
+                    case 202 /* AwaitExpression */:
+                    case 257 /* NamedExports */:
+                    case 253 /* NamedImports */:
+                    case 258 /* ExportSpecifier */:
+                    case 254 /* ImportSpecifier */:
+                    case 155 /* PropertyDeclaration */:
                         return true;
-                    case 237 /* VariableDeclaration */:
-                    case 275 /* PropertyAssignment */:
-                        if (!settings.indentMultiLineObjectLiteralBeginningOnBlankLine && sourceFile && childKind === 188 /* ObjectLiteralExpression */) { // TODO: GH#18217
+                    case 238 /* VariableDeclaration */:
+                    case 276 /* PropertyAssignment */:
+                        if (!settings.indentMultiLineObjectLiteralBeginningOnBlankLine && sourceFile && childKind === 189 /* ObjectLiteralExpression */) { // TODO: GH#18217
                             return rangeIsOnOneLine(sourceFile, child);
                         }
                         return true;
-                    case 223 /* DoStatement */:
-                    case 224 /* WhileStatement */:
-                    case 226 /* ForInStatement */:
-                    case 227 /* ForOfStatement */:
-                    case 225 /* ForStatement */:
-                    case 222 /* IfStatement */:
-                    case 239 /* FunctionDeclaration */:
-                    case 196 /* FunctionExpression */:
-                    case 156 /* MethodDeclaration */:
-                    case 197 /* ArrowFunction */:
-                    case 157 /* Constructor */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
-                        return childKind !== 218 /* Block */;
-                    case 255 /* ExportDeclaration */:
-                        return childKind !== 256 /* NamedExports */;
-                    case 249 /* ImportDeclaration */:
-                        return childKind !== 250 /* ImportClause */ ||
-                            (!!child.namedBindings && child.namedBindings.kind !== 252 /* NamedImports */);
-                    case 260 /* JsxElement */:
-                        return childKind !== 263 /* JsxClosingElement */;
-                    case 264 /* JsxFragment */:
-                        return childKind !== 266 /* JsxClosingFragment */;
-                    case 174 /* IntersectionType */:
-                    case 173 /* UnionType */:
-                        if (childKind === 168 /* TypeLiteral */) {
+                    case 224 /* DoStatement */:
+                    case 225 /* WhileStatement */:
+                    case 227 /* ForInStatement */:
+                    case 228 /* ForOfStatement */:
+                    case 226 /* ForStatement */:
+                    case 223 /* IfStatement */:
+                    case 240 /* FunctionDeclaration */:
+                    case 197 /* FunctionExpression */:
+                    case 157 /* MethodDeclaration */:
+                    case 198 /* ArrowFunction */:
+                    case 158 /* Constructor */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
+                        return childKind !== 219 /* Block */;
+                    case 256 /* ExportDeclaration */:
+                        return childKind !== 257 /* NamedExports */;
+                    case 250 /* ImportDeclaration */:
+                        return childKind !== 251 /* ImportClause */ ||
+                            (!!child.namedBindings && child.namedBindings.kind !== 253 /* NamedImports */);
+                    case 261 /* JsxElement */:
+                        return childKind !== 264 /* JsxClosingElement */;
+                    case 265 /* JsxFragment */:
+                        return childKind !== 267 /* JsxClosingFragment */;
+                    case 175 /* IntersectionType */:
+                    case 174 /* UnionType */:
+                        if (childKind === 169 /* TypeLiteral */) {
                             return false;
                         }
                     // falls through
@@ -110125,11 +113733,11 @@ var ts;
             SmartIndenter.nodeWillIndentChild = nodeWillIndentChild;
             function isControlFlowEndingStatement(kind, parent) {
                 switch (kind) {
-                    case 230 /* ReturnStatement */:
-                    case 234 /* ThrowStatement */:
-                    case 228 /* ContinueStatement */:
-                    case 229 /* BreakStatement */:
-                        return parent.kind !== 218 /* Block */;
+                    case 231 /* ReturnStatement */:
+                    case 235 /* ThrowStatement */:
+                    case 229 /* ContinueStatement */:
+                    case 230 /* BreakStatement */:
+                        return parent.kind !== 219 /* Block */;
                     default:
                         return false;
                 }
@@ -110271,7 +113879,7 @@ var ts;
          * Checks if 'candidate' argument is a legal separator in the list that contains 'node' as an element
          */
         function isSeparator(node, candidate) {
-            return !!candidate && !!node.parent && (candidate.kind === 27 /* CommaToken */ || (candidate.kind === 26 /* SemicolonToken */ && node.parent.kind === 188 /* ObjectLiteralExpression */));
+            return !!candidate && !!node.parent && (candidate.kind === 27 /* CommaToken */ || (candidate.kind === 26 /* SemicolonToken */ && node.parent.kind === 189 /* ObjectLiteralExpression */));
         }
         function spaces(count) {
             var s = "";
@@ -110280,6 +113888,10 @@ var ts;
             }
             return s;
         }
+        function isThisTypeAnnotatable(containingFunction) {
+            return ts.isFunctionExpression(containingFunction) || ts.isFunctionDeclaration(containingFunction);
+        }
+        textChanges_3.isThisTypeAnnotatable = isThisTypeAnnotatable;
         var ChangeTracker = /** @class */ (function () {
             /** Public for tests only. Other callers should use `ChangeTracker.with`. */
             function ChangeTracker(newLineCharacter, formatContext) {
@@ -110432,10 +114044,15 @@ var ts;
                     }
                 }
                 else {
-                    endNode = node.kind !== 237 /* VariableDeclaration */ && node.questionToken ? node.questionToken : node.name;
+                    endNode = node.kind !== 238 /* VariableDeclaration */ && node.questionToken ? node.questionToken : node.name;
                 }
                 this.insertNodeAt(sourceFile, endNode.end, type, { prefix: ": " });
             };
+            ChangeTracker.prototype.tryInsertThisTypeAnnotation = function (sourceFile, node, type) {
+                var start = ts.findChildOfKind(node, 20 /* OpenParenToken */, sourceFile).getStart(sourceFile) + 1;
+                var suffix = node.parameters.length ? ", " : "";
+                this.insertNodeAt(sourceFile, start, type, { prefix: "this: ", suffix: suffix });
+            };
             ChangeTracker.prototype.insertTypeParameters = function (sourceFile, node, typeParameters) {
                 // If no `(`, is an arrow function `x => x`, so use the pos of the first parameter
                 var start = (ts.findChildOfKind(node, 20 /* OpenParenToken */, sourceFile) || ts.first(node.parameters)).getStart(sourceFile);
@@ -110544,18 +114161,18 @@ var ts;
             };
             ChangeTracker.prototype.getInsertNodeAfterOptionsWorker = function (node) {
                 switch (node.kind) {
-                    case 240 /* ClassDeclaration */:
-                    case 244 /* ModuleDeclaration */:
+                    case 241 /* ClassDeclaration */:
+                    case 245 /* ModuleDeclaration */:
                         return { prefix: this.newLineCharacter, suffix: this.newLineCharacter };
-                    case 237 /* VariableDeclaration */:
+                    case 238 /* VariableDeclaration */:
                     case 10 /* StringLiteral */:
-                    case 72 /* Identifier */:
+                    case 73 /* Identifier */:
                         return { prefix: ", " };
-                    case 275 /* PropertyAssignment */:
+                    case 276 /* PropertyAssignment */:
                         return { suffix: "," + this.newLineCharacter };
-                    case 85 /* ExportKeyword */:
+                    case 86 /* ExportKeyword */:
                         return { prefix: " " };
-                    case 151 /* Parameter */:
+                    case 152 /* Parameter */:
                         return {};
                     default:
                         ts.Debug.assert(ts.isStatement(node) || ts.isClassOrTypeElement(node)); // Else we haven't handled this kind of node yet -- add it
@@ -110564,12 +114181,12 @@ var ts;
             };
             ChangeTracker.prototype.insertName = function (sourceFile, node, name) {
                 ts.Debug.assert(!node.name);
-                if (node.kind === 197 /* ArrowFunction */) {
+                if (node.kind === 198 /* ArrowFunction */) {
                     var arrow = ts.findChildOfKind(node, 37 /* EqualsGreaterThanToken */, sourceFile);
                     var lparen = ts.findChildOfKind(node, 20 /* OpenParenToken */, sourceFile);
                     if (lparen) {
                         // `() => {}` --> `function f() {}`
-                        this.insertNodesAt(sourceFile, lparen.getStart(sourceFile), [ts.createToken(90 /* FunctionKeyword */), ts.createIdentifier(name)], { joiner: " " });
+                        this.insertNodesAt(sourceFile, lparen.getStart(sourceFile), [ts.createToken(91 /* FunctionKeyword */), ts.createIdentifier(name)], { joiner: " " });
                         deleteNode(this, sourceFile, arrow);
                     }
                     else {
@@ -110578,14 +114195,14 @@ var ts;
                         // Replacing full range of arrow to get rid of the leading space -- replace ` =>` with `)`
                         this.replaceRange(sourceFile, arrow, ts.createToken(21 /* CloseParenToken */));
                     }
-                    if (node.body.kind !== 218 /* Block */) {
+                    if (node.body.kind !== 219 /* Block */) {
                         // `() => 0` => `function f() { return 0; }`
-                        this.insertNodesAt(sourceFile, node.body.getStart(sourceFile), [ts.createToken(18 /* OpenBraceToken */), ts.createToken(97 /* ReturnKeyword */)], { joiner: " ", suffix: " " });
+                        this.insertNodesAt(sourceFile, node.body.getStart(sourceFile), [ts.createToken(18 /* OpenBraceToken */), ts.createToken(98 /* ReturnKeyword */)], { joiner: " ", suffix: " " });
                         this.insertNodesAt(sourceFile, node.body.end, [ts.createToken(26 /* SemicolonToken */), ts.createToken(19 /* CloseBraceToken */)], { joiner: " " });
                     }
                 }
                 else {
-                    var pos = ts.findChildOfKind(node, node.kind === 196 /* FunctionExpression */ ? 90 /* FunctionKeyword */ : 76 /* ClassKeyword */, sourceFile).end;
+                    var pos = ts.findChildOfKind(node, node.kind === 197 /* FunctionExpression */ ? 91 /* FunctionKeyword */ : 77 /* ClassKeyword */, sourceFile).end;
                     this.insertNodeAt(sourceFile, pos, ts.createIdentifier(name), { prefix: " " });
                 }
             };
@@ -110704,6 +114321,9 @@ var ts;
                     }
                 }
             };
+            ChangeTracker.prototype.parenthesizeExpression = function (sourceFile, expression) {
+                this.replaceRange(sourceFile, ts.rangeOfNode(expression), ts.createParen(expression));
+            };
             ChangeTracker.prototype.finishClassesWithNodesInsertedAtStart = function () {
                 var _this = this;
                 this.classesWithNodesInsertedAtStart.forEach(function (_a) {
@@ -110812,7 +114432,7 @@ var ts;
             function newFileChangesWorker(oldFile, scriptKind, statements, newLineCharacter, formatContext) {
                 // TODO: this emits the file, parses it back, then formats it that -- may be a less roundabout way to do this
                 var nonFormattedText = statements.map(function (s) { return getNonformattedText(s, oldFile, newLineCharacter).text; }).join(newLineCharacter);
-                var sourceFile = ts.createSourceFile("any file name", nonFormattedText, 7 /* ESNext */, /*setParentNodes*/ true, scriptKind);
+                var sourceFile = ts.createSourceFile("any file name", nonFormattedText, 99 /* ESNext */, /*setParentNodes*/ true, scriptKind);
                 var changes = ts.formatting.formatDocument(sourceFile, formatContext);
                 return applyChanges(nonFormattedText, changes) + newLineCharacter;
             }
@@ -110852,9 +114472,10 @@ var ts;
             }
             /** Note: output node may be mutated input node. */
             function getNonformattedText(node, sourceFile, newLineCharacter) {
-                var writer = new Writer(newLineCharacter);
+                var omitTrailingSemicolon = !!sourceFile && !ts.probablyUsesSemicolons(sourceFile);
+                var writer = createWriter(newLineCharacter, omitTrailingSemicolon);
                 var newLine = newLineCharacter === "\n" ? 1 /* LineFeed */ : 0 /* CarriageReturnLineFeed */;
-                ts.createPrinter({ newLine: newLine, neverAsciiEscape: true }, writer).writeNode(4 /* Unspecified */, node, sourceFile, writer);
+                ts.createPrinter({ newLine: newLine, neverAsciiEscape: true, omitTrailingSemicolon: omitTrailingSemicolon }, writer).writeNode(4 /* Unspecified */, node, sourceFile, writer);
                 return { text: writer.getText(), node: assignPositionsToNode(node) };
             }
             changesToText.getNonformattedText = getNonformattedText;
@@ -110889,136 +114510,162 @@ var ts;
             nodeArray.end = getEnd(nodes);
             return nodeArray;
         }
-        var Writer = /** @class */ (function () {
-            function Writer(newLine) {
-                var _this = this;
-                this.lastNonTriviaPosition = 0;
-                this.writer = ts.createTextWriter(newLine);
-                this.onEmitNode = function (hint, node, printCallback) {
-                    if (node) {
-                        setPos(node, _this.lastNonTriviaPosition);
-                    }
-                    printCallback(hint, node);
-                    if (node) {
-                        setEnd(node, _this.lastNonTriviaPosition);
-                    }
-                };
-                this.onBeforeEmitNodeArray = function (nodes) {
-                    if (nodes) {
-                        setPos(nodes, _this.lastNonTriviaPosition);
-                    }
-                };
-                this.onAfterEmitNodeArray = function (nodes) {
-                    if (nodes) {
-                        setEnd(nodes, _this.lastNonTriviaPosition);
-                    }
-                };
-                this.onBeforeEmitToken = function (node) {
-                    if (node) {
-                        setPos(node, _this.lastNonTriviaPosition);
-                    }
-                };
-                this.onAfterEmitToken = function (node) {
-                    if (node) {
-                        setEnd(node, _this.lastNonTriviaPosition);
-                    }
-                };
-            }
-            Writer.prototype.setLastNonTriviaPosition = function (s, force) {
+        function createWriter(newLine, omitTrailingSemicolon) {
+            var lastNonTriviaPosition = 0;
+            var writer = omitTrailingSemicolon ? ts.getTrailingSemicolonOmittingWriter(ts.createTextWriter(newLine)) : ts.createTextWriter(newLine);
+            var onEmitNode = function (hint, node, printCallback) {
+                if (node) {
+                    setPos(node, lastNonTriviaPosition);
+                }
+                printCallback(hint, node);
+                if (node) {
+                    setEnd(node, lastNonTriviaPosition);
+                }
+            };
+            var onBeforeEmitNodeArray = function (nodes) {
+                if (nodes) {
+                    setPos(nodes, lastNonTriviaPosition);
+                }
+            };
+            var onAfterEmitNodeArray = function (nodes) {
+                if (nodes) {
+                    setEnd(nodes, lastNonTriviaPosition);
+                }
+            };
+            var onBeforeEmitToken = function (node) {
+                if (node) {
+                    setPos(node, lastNonTriviaPosition);
+                }
+            };
+            var onAfterEmitToken = function (node) {
+                if (node) {
+                    setEnd(node, lastNonTriviaPosition);
+                }
+            };
+            function setLastNonTriviaPosition(s, force) {
                 if (force || !isTrivia(s)) {
-                    this.lastNonTriviaPosition = this.writer.getTextPos();
+                    lastNonTriviaPosition = writer.getTextPos();
                     var i = 0;
                     while (ts.isWhiteSpaceLike(s.charCodeAt(s.length - i - 1))) {
                         i++;
                     }
                     // trim trailing whitespaces
-                    this.lastNonTriviaPosition -= i;
+                    lastNonTriviaPosition -= i;
                 }
+            }
+            function write(s) {
+                writer.write(s);
+                setLastNonTriviaPosition(s, /*force*/ false);
+            }
+            function writeComment(s) {
+                writer.writeComment(s);
+            }
+            function writeKeyword(s) {
+                writer.writeKeyword(s);
+                setLastNonTriviaPosition(s, /*force*/ false);
+            }
+            function writeOperator(s) {
+                writer.writeOperator(s);
+                setLastNonTriviaPosition(s, /*force*/ false);
+            }
+            function writePunctuation(s) {
+                writer.writePunctuation(s);
+                setLastNonTriviaPosition(s, /*force*/ false);
+            }
+            function writeTrailingSemicolon(s) {
+                writer.writeTrailingSemicolon(s);
+                setLastNonTriviaPosition(s, /*force*/ false);
+            }
+            function writeParameter(s) {
+                writer.writeParameter(s);
+                setLastNonTriviaPosition(s, /*force*/ false);
+            }
+            function writeProperty(s) {
+                writer.writeProperty(s);
+                setLastNonTriviaPosition(s, /*force*/ false);
+            }
+            function writeSpace(s) {
+                writer.writeSpace(s);
+                setLastNonTriviaPosition(s, /*force*/ false);
+            }
+            function writeStringLiteral(s) {
+                writer.writeStringLiteral(s);
+                setLastNonTriviaPosition(s, /*force*/ false);
+            }
+            function writeSymbol(s, sym) {
+                writer.writeSymbol(s, sym);
+                setLastNonTriviaPosition(s, /*force*/ false);
+            }
+            function writeLine() {
+                writer.writeLine();
+            }
+            function increaseIndent() {
+                writer.increaseIndent();
+            }
+            function decreaseIndent() {
+                writer.decreaseIndent();
+            }
+            function getText() {
+                return writer.getText();
+            }
+            function rawWrite(s) {
+                writer.rawWrite(s);
+                setLastNonTriviaPosition(s, /*force*/ false);
+            }
+            function writeLiteral(s) {
+                writer.writeLiteral(s);
+                setLastNonTriviaPosition(s, /*force*/ true);
+            }
+            function getTextPos() {
+                return writer.getTextPos();
+            }
+            function getLine() {
+                return writer.getLine();
+            }
+            function getColumn() {
+                return writer.getColumn();
+            }
+            function getIndent() {
+                return writer.getIndent();
+            }
+            function isAtStartOfLine() {
+                return writer.isAtStartOfLine();
+            }
+            function clear() {
+                writer.clear();
+                lastNonTriviaPosition = 0;
+            }
+            return {
+                onEmitNode: onEmitNode,
+                onBeforeEmitNodeArray: onBeforeEmitNodeArray,
+                onAfterEmitNodeArray: onAfterEmitNodeArray,
+                onBeforeEmitToken: onBeforeEmitToken,
+                onAfterEmitToken: onAfterEmitToken,
+                write: write,
+                writeComment: writeComment,
+                writeKeyword: writeKeyword,
+                writeOperator: writeOperator,
+                writePunctuation: writePunctuation,
+                writeTrailingSemicolon: writeTrailingSemicolon,
+                writeParameter: writeParameter,
+                writeProperty: writeProperty,
+                writeSpace: writeSpace,
+                writeStringLiteral: writeStringLiteral,
+                writeSymbol: writeSymbol,
+                writeLine: writeLine,
+                increaseIndent: increaseIndent,
+                decreaseIndent: decreaseIndent,
+                getText: getText,
+                rawWrite: rawWrite,
+                writeLiteral: writeLiteral,
+                getTextPos: getTextPos,
+                getLine: getLine,
+                getColumn: getColumn,
+                getIndent: getIndent,
+                isAtStartOfLine: isAtStartOfLine,
+                clear: clear
             };
-            Writer.prototype.write = function (s) {
-                this.writer.write(s);
-                this.setLastNonTriviaPosition(s, /*force*/ false);
-            };
-            Writer.prototype.writeComment = function (s) {
-                this.writer.writeComment(s);
-            };
-            Writer.prototype.writeKeyword = function (s) {
-                this.writer.writeKeyword(s);
-                this.setLastNonTriviaPosition(s, /*force*/ false);
-            };
-            Writer.prototype.writeOperator = function (s) {
-                this.writer.writeOperator(s);
-                this.setLastNonTriviaPosition(s, /*force*/ false);
-            };
-            Writer.prototype.writePunctuation = function (s) {
-                this.writer.writePunctuation(s);
-                this.setLastNonTriviaPosition(s, /*force*/ false);
-            };
-            Writer.prototype.writeTrailingSemicolon = function (s) {
-                this.writer.writeTrailingSemicolon(s);
-                this.setLastNonTriviaPosition(s, /*force*/ false);
-            };
-            Writer.prototype.writeParameter = function (s) {
-                this.writer.writeParameter(s);
-                this.setLastNonTriviaPosition(s, /*force*/ false);
-            };
-            Writer.prototype.writeProperty = function (s) {
-                this.writer.writeProperty(s);
-                this.setLastNonTriviaPosition(s, /*force*/ false);
-            };
-            Writer.prototype.writeSpace = function (s) {
-                this.writer.writeSpace(s);
-                this.setLastNonTriviaPosition(s, /*force*/ false);
-            };
-            Writer.prototype.writeStringLiteral = function (s) {
-                this.writer.writeStringLiteral(s);
-                this.setLastNonTriviaPosition(s, /*force*/ false);
-            };
-            Writer.prototype.writeSymbol = function (s, sym) {
-                this.writer.writeSymbol(s, sym);
-                this.setLastNonTriviaPosition(s, /*force*/ false);
-            };
-            Writer.prototype.writeLine = function () {
-                this.writer.writeLine();
-            };
-            Writer.prototype.increaseIndent = function () {
-                this.writer.increaseIndent();
-            };
-            Writer.prototype.decreaseIndent = function () {
-                this.writer.decreaseIndent();
-            };
-            Writer.prototype.getText = function () {
-                return this.writer.getText();
-            };
-            Writer.prototype.rawWrite = function (s) {
-                this.writer.rawWrite(s);
-                this.setLastNonTriviaPosition(s, /*force*/ false);
-            };
-            Writer.prototype.writeLiteral = function (s) {
-                this.writer.writeLiteral(s);
-                this.setLastNonTriviaPosition(s, /*force*/ true);
-            };
-            Writer.prototype.getTextPos = function () {
-                return this.writer.getTextPos();
-            };
-            Writer.prototype.getLine = function () {
-                return this.writer.getLine();
-            };
-            Writer.prototype.getColumn = function () {
-                return this.writer.getColumn();
-            };
-            Writer.prototype.getIndent = function () {
-                return this.writer.getIndent();
-            };
-            Writer.prototype.isAtStartOfLine = function () {
-                return this.writer.isAtStartOfLine();
-            };
-            Writer.prototype.clear = function () {
-                this.writer.clear();
-                this.lastNonTriviaPosition = 0;
-            };
-            return Writer;
-        }());
+        }
         function getInsertionPositionAtSourceFileTop(sourceFile) {
             var lastPrologue;
             for (var _i = 0, _a = sourceFile.statements; _i < _a.length; _i++) {
@@ -111080,14 +114727,14 @@ var ts;
         }
         textChanges_3.isValidLocationToAddComment = isValidLocationToAddComment;
         function needSemicolonBetween(a, b) {
-            return (ts.isPropertySignature(a) || ts.isPropertyDeclaration(a)) && ts.isClassOrTypeElement(b) && b.name.kind === 149 /* ComputedPropertyName */
+            return (ts.isPropertySignature(a) || ts.isPropertyDeclaration(a)) && ts.isClassOrTypeElement(b) && b.name.kind === 150 /* ComputedPropertyName */
                 || ts.isStatementButNotDeclaration(a) && ts.isStatementButNotDeclaration(b); // TODO: only if b would start with a `(` or `[`
         }
         var deleteDeclaration;
         (function (deleteDeclaration_1) {
             function deleteDeclaration(changes, deletedNodesInLists, sourceFile, node) {
                 switch (node.kind) {
-                    case 151 /* Parameter */: {
+                    case 152 /* Parameter */: {
                         var oldFunction = node.parent;
                         if (ts.isArrowFunction(oldFunction) &&
                             oldFunction.parameters.length === 1 &&
@@ -111102,14 +114749,14 @@ var ts;
                         }
                         break;
                     }
-                    case 249 /* ImportDeclaration */:
+                    case 250 /* ImportDeclaration */:
                         deleteNode(changes, sourceFile, node, 
                         // For first import, leave header comment in place
                         node === sourceFile.imports[0].parent ? { leadingTriviaOption: LeadingTriviaOption.Exclude } : undefined);
                         break;
-                    case 186 /* BindingElement */:
+                    case 187 /* BindingElement */:
                         var pattern = node.parent;
-                        var preserveComma = pattern.kind === 185 /* ArrayBindingPattern */ && node !== ts.last(pattern.elements);
+                        var preserveComma = pattern.kind === 186 /* ArrayBindingPattern */ && node !== ts.last(pattern.elements);
                         if (preserveComma) {
                             deleteNode(changes, sourceFile, node);
                         }
@@ -111117,13 +114764,13 @@ var ts;
                             deleteNodeInList(changes, deletedNodesInLists, sourceFile, node);
                         }
                         break;
-                    case 237 /* VariableDeclaration */:
+                    case 238 /* VariableDeclaration */:
                         deleteVariableDeclaration(changes, deletedNodesInLists, sourceFile, node);
                         break;
-                    case 150 /* TypeParameter */:
+                    case 151 /* TypeParameter */:
                         deleteNodeInList(changes, deletedNodesInLists, sourceFile, node);
                         break;
-                    case 253 /* ImportSpecifier */:
+                    case 254 /* ImportSpecifier */:
                         var namedImports = node.parent;
                         if (namedImports.elements.length === 1) {
                             deleteImportBinding(changes, sourceFile, namedImports);
@@ -111132,7 +114779,7 @@ var ts;
                             deleteNodeInList(changes, deletedNodesInLists, sourceFile, node);
                         }
                         break;
-                    case 251 /* NamespaceImport */:
+                    case 252 /* NamespaceImport */:
                         deleteImportBinding(changes, sourceFile, node);
                         break;
                     default:
@@ -111179,13 +114826,13 @@ var ts;
                     // Delete the entire import declaration
                     // |import * as ns from './file'|
                     // |import { a } from './file'|
-                    var importDecl = ts.getAncestor(node, 249 /* ImportDeclaration */);
+                    var importDecl = ts.getAncestor(node, 250 /* ImportDeclaration */);
                     deleteNode(changes, sourceFile, importDecl);
                 }
             }
             function deleteVariableDeclaration(changes, deletedNodesInLists, sourceFile, node) {
                 var parent = node.parent;
-                if (parent.kind === 274 /* CatchClause */) {
+                if (parent.kind === 275 /* CatchClause */) {
                     // TODO: There's currently no unused diagnostic for this, could be a suggestion
                     changes.deleteNodeRange(sourceFile, ts.findChildOfKind(parent, 20 /* OpenParenToken */, sourceFile), ts.findChildOfKind(parent, 21 /* CloseParenToken */, sourceFile));
                     return;
@@ -111196,14 +114843,14 @@ var ts;
                 }
                 var gp = parent.parent;
                 switch (gp.kind) {
-                    case 227 /* ForOfStatement */:
-                    case 226 /* ForInStatement */:
+                    case 228 /* ForOfStatement */:
+                    case 227 /* ForInStatement */:
                         changes.replaceNode(sourceFile, node, ts.createObjectLiteral());
                         break;
-                    case 225 /* ForStatement */:
+                    case 226 /* ForStatement */:
                         deleteNode(changes, sourceFile, parent);
                         break;
-                    case 219 /* VariableStatement */:
+                    case 220 /* VariableStatement */:
                         deleteNode(changes, sourceFile, gp);
                         break;
                     default:
@@ -111366,14 +115013,270 @@ var ts;
             var token = ts.getTokenAtPosition(sourceFile, pos);
             var assertion = ts.Debug.assertDefined(ts.findAncestor(token, function (n) { return ts.isAsExpression(n) || ts.isTypeAssertion(n); }));
             var replacement = ts.isAsExpression(assertion)
-                ? ts.createAsExpression(assertion.expression, ts.createKeywordTypeNode(143 /* UnknownKeyword */))
-                : ts.createTypeAssertion(ts.createKeywordTypeNode(143 /* UnknownKeyword */), assertion.expression);
+                ? ts.createAsExpression(assertion.expression, ts.createKeywordTypeNode(144 /* UnknownKeyword */))
+                : ts.createTypeAssertion(ts.createKeywordTypeNode(144 /* UnknownKeyword */), assertion.expression);
             changeTracker.replaceNode(sourceFile, assertion.expression, replacement);
         }
     })(codefix = ts.codefix || (ts.codefix = {}));
 })(ts || (ts = {}));
 /* @internal */
 var ts;
+(function (ts) {
+    var codefix;
+    (function (codefix) {
+        var fixId = "addMissingAwait";
+        var propertyAccessCode = ts.Diagnostics.Property_0_does_not_exist_on_type_1.code;
+        var callableConstructableErrorCodes = [
+            ts.Diagnostics.This_expression_is_not_callable.code,
+            ts.Diagnostics.This_expression_is_not_constructable.code,
+        ];
+        var errorCodes = [
+            ts.Diagnostics.An_arithmetic_operand_must_be_of_type_any_number_bigint_or_an_enum_type.code,
+            ts.Diagnostics.The_left_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_bigint_or_an_enum_type.code,
+            ts.Diagnostics.The_right_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_bigint_or_an_enum_type.code,
+            ts.Diagnostics.Operator_0_cannot_be_applied_to_type_1.code,
+            ts.Diagnostics.Operator_0_cannot_be_applied_to_types_1_and_2.code,
+            ts.Diagnostics.This_condition_will_always_return_0_since_the_types_1_and_2_have_no_overlap.code,
+            ts.Diagnostics.Type_0_is_not_an_array_type.code,
+            ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type.code,
+            ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type_Use_compiler_option_downlevelIteration_to_allow_iterating_of_iterators.code,
+            ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type_or_does_not_have_a_Symbol_iterator_method_that_returns_an_iterator.code,
+            ts.Diagnostics.Type_0_is_not_an_array_type_or_does_not_have_a_Symbol_iterator_method_that_returns_an_iterator.code,
+            ts.Diagnostics.Type_0_must_have_a_Symbol_iterator_method_that_returns_an_iterator.code,
+            ts.Diagnostics.Type_0_must_have_a_Symbol_asyncIterator_method_that_returns_an_async_iterator.code,
+            ts.Diagnostics.Argument_of_type_0_is_not_assignable_to_parameter_of_type_1.code,
+            propertyAccessCode
+        ].concat(callableConstructableErrorCodes);
+        codefix.registerCodeFix({
+            fixIds: [fixId],
+            errorCodes: errorCodes,
+            getCodeActions: function (context) {
+                var sourceFile = context.sourceFile, errorCode = context.errorCode, span = context.span, cancellationToken = context.cancellationToken, program = context.program;
+                var expression = getAwaitableExpression(sourceFile, errorCode, span, cancellationToken, program);
+                if (!expression) {
+                    return;
+                }
+                var checker = context.program.getTypeChecker();
+                var trackChanges = function (cb) { return ts.textChanges.ChangeTracker.with(context, cb); };
+                return ts.compact([
+                    getDeclarationSiteFix(context, expression, errorCode, checker, trackChanges),
+                    getUseSiteFix(context, expression, errorCode, checker, trackChanges)
+                ]);
+            },
+            getAllCodeActions: function (context) {
+                var sourceFile = context.sourceFile, program = context.program, cancellationToken = context.cancellationToken;
+                var checker = context.program.getTypeChecker();
+                return codefix.codeFixAll(context, errorCodes, function (t, diagnostic) {
+                    var expression = getAwaitableExpression(sourceFile, diagnostic.code, diagnostic, cancellationToken, program);
+                    if (!expression) {
+                        return;
+                    }
+                    var trackChanges = function (cb) { return (cb(t), []); };
+                    return getDeclarationSiteFix(context, expression, diagnostic.code, checker, trackChanges)
+                        || getUseSiteFix(context, expression, diagnostic.code, checker, trackChanges);
+                });
+            },
+        });
+        function getDeclarationSiteFix(context, expression, errorCode, checker, trackChanges) {
+            var sourceFile = context.sourceFile;
+            var awaitableInitializer = findAwaitableInitializer(expression, sourceFile, checker);
+            if (awaitableInitializer) {
+                var initializerChanges = trackChanges(function (t) { return makeChange(t, errorCode, sourceFile, checker, awaitableInitializer); });
+                return codefix.createCodeFixActionNoFixId("addMissingAwaitToInitializer", initializerChanges, [ts.Diagnostics.Add_await_to_initializer_for_0, expression.getText(sourceFile)]);
+            }
+        }
+        function getUseSiteFix(context, expression, errorCode, checker, trackChanges) {
+            var changes = trackChanges(function (t) { return makeChange(t, errorCode, context.sourceFile, checker, expression); });
+            return codefix.createCodeFixAction(fixId, changes, ts.Diagnostics.Add_await, fixId, ts.Diagnostics.Fix_all_expressions_possibly_missing_await);
+        }
+        function isMissingAwaitError(sourceFile, errorCode, span, cancellationToken, program) {
+            var checker = program.getDiagnosticsProducingTypeChecker();
+            var diagnostics = checker.getDiagnostics(sourceFile, cancellationToken);
+            return ts.some(diagnostics, function (_a) {
+                var start = _a.start, length = _a.length, relatedInformation = _a.relatedInformation, code = _a.code;
+                return ts.isNumber(start) && ts.isNumber(length) && ts.textSpansEqual({ start: start, length: length }, span) &&
+                    code === errorCode &&
+                    !!relatedInformation &&
+                    ts.some(relatedInformation, function (related) { return related.code === ts.Diagnostics.Did_you_forget_to_use_await.code; });
+            });
+        }
+        function getAwaitableExpression(sourceFile, errorCode, span, cancellationToken, program) {
+            var token = ts.getTokenAtPosition(sourceFile, span.start);
+            // Checker has already done work to determine that await might be possible, and has attached
+            // related info to the node, so start by finding the expression that exactly matches up
+            // with the diagnostic range.
+            var expression = ts.findAncestor(token, function (node) {
+                if (node.getStart(sourceFile) < span.start || node.getEnd() > ts.textSpanEnd(span)) {
+                    return "quit";
+                }
+                return ts.isExpression(node) && ts.textSpansEqual(span, ts.createTextSpanFromNode(node, sourceFile));
+            });
+            return expression
+                && isMissingAwaitError(sourceFile, errorCode, span, cancellationToken, program)
+                && isInsideAwaitableBody(expression)
+                ? expression
+                : undefined;
+        }
+        function findAwaitableInitializer(expression, sourceFile, checker) {
+            if (!ts.isIdentifier(expression)) {
+                return;
+            }
+            var symbol = checker.getSymbolAtLocation(expression);
+            if (!symbol) {
+                return;
+            }
+            var declaration = ts.tryCast(symbol.valueDeclaration, ts.isVariableDeclaration);
+            var variableName = ts.tryCast(declaration && declaration.name, ts.isIdentifier);
+            var variableStatement = ts.getAncestor(declaration, 220 /* VariableStatement */);
+            if (!declaration || !variableStatement ||
+                declaration.type ||
+                !declaration.initializer ||
+                variableStatement.getSourceFile() !== sourceFile ||
+                ts.hasModifier(variableStatement, 1 /* Export */) ||
+                !variableName ||
+                !isInsideAwaitableBody(declaration.initializer)) {
+                return;
+            }
+            var isUsedElsewhere = ts.FindAllReferences.Core.eachSymbolReferenceInFile(variableName, checker, sourceFile, function (identifier) {
+                return identifier !== expression;
+            });
+            if (isUsedElsewhere) {
+                return;
+            }
+            return declaration.initializer;
+        }
+        function isInsideAwaitableBody(node) {
+            return node.kind & 16384 /* AwaitContext */ || !!ts.findAncestor(node, function (ancestor) {
+                return ancestor.parent && ts.isArrowFunction(ancestor.parent) && ancestor.parent.body === ancestor ||
+                    ts.isBlock(ancestor) && (ancestor.parent.kind === 240 /* FunctionDeclaration */ ||
+                        ancestor.parent.kind === 197 /* FunctionExpression */ ||
+                        ancestor.parent.kind === 198 /* ArrowFunction */ ||
+                        ancestor.parent.kind === 157 /* MethodDeclaration */);
+            });
+        }
+        function makeChange(changeTracker, errorCode, sourceFile, checker, insertionSite) {
+            if (ts.isBinaryExpression(insertionSite)) {
+                var left = insertionSite.left, right = insertionSite.right;
+                var leftType = checker.getTypeAtLocation(left);
+                var rightType = checker.getTypeAtLocation(right);
+                var newLeft = checker.getPromisedTypeOfPromise(leftType) ? ts.createAwait(left) : left;
+                var newRight = checker.getPromisedTypeOfPromise(rightType) ? ts.createAwait(right) : right;
+                changeTracker.replaceNode(sourceFile, left, newLeft);
+                changeTracker.replaceNode(sourceFile, right, newRight);
+            }
+            else if (errorCode === propertyAccessCode && ts.isPropertyAccessExpression(insertionSite.parent)) {
+                changeTracker.replaceNode(sourceFile, insertionSite.parent.expression, ts.createParen(ts.createAwait(insertionSite.parent.expression)));
+            }
+            else if (ts.contains(callableConstructableErrorCodes, errorCode) && ts.isCallOrNewExpression(insertionSite.parent)) {
+                changeTracker.replaceNode(sourceFile, insertionSite, ts.createParen(ts.createAwait(insertionSite)));
+            }
+            else {
+                changeTracker.replaceNode(sourceFile, insertionSite, ts.createAwait(insertionSite));
+            }
+        }
+    })(codefix = ts.codefix || (ts.codefix = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var codefix;
+    (function (codefix) {
+        var fixId = "addMissingConst";
+        var errorCodes = [
+            ts.Diagnostics.Cannot_find_name_0.code,
+            ts.Diagnostics.No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer.code
+        ];
+        codefix.registerCodeFix({
+            errorCodes: errorCodes,
+            getCodeActions: function (context) {
+                var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return makeChange(t, context.sourceFile, context.span.start, context.program); });
+                if (changes.length > 0) {
+                    return [codefix.createCodeFixAction(fixId, changes, ts.Diagnostics.Add_const_to_unresolved_variable, fixId, ts.Diagnostics.Add_const_to_all_unresolved_variables)];
+                }
+            },
+            fixIds: [fixId],
+            getAllCodeActions: function (context) {
+                var fixedNodes = new ts.NodeSet();
+                return codefix.codeFixAll(context, errorCodes, function (changes, diag) { return makeChange(changes, diag.file, diag.start, context.program, fixedNodes); });
+            },
+        });
+        function makeChange(changeTracker, sourceFile, pos, program, fixedNodes) {
+            var token = ts.getTokenAtPosition(sourceFile, pos);
+            var forInitializer = ts.findAncestor(token, function (node) {
+                return ts.isForInOrOfStatement(node.parent) ? node.parent.initializer === node :
+                    isPossiblyPartOfDestructuring(node) ? false : "quit";
+            });
+            if (forInitializer)
+                return applyChange(changeTracker, forInitializer, sourceFile, fixedNodes);
+            var parent = token.parent;
+            if (ts.isBinaryExpression(parent) && ts.isExpressionStatement(parent.parent)) {
+                return applyChange(changeTracker, token, sourceFile, fixedNodes);
+            }
+            if (ts.isArrayLiteralExpression(parent)) {
+                var checker_1 = program.getTypeChecker();
+                if (!ts.every(parent.elements, function (element) { return arrayElementCouldBeVariableDeclaration(element, checker_1); })) {
+                    return;
+                }
+                return applyChange(changeTracker, parent, sourceFile, fixedNodes);
+            }
+            var commaExpression = ts.findAncestor(token, function (node) {
+                return ts.isExpressionStatement(node.parent) ? true :
+                    isPossiblyPartOfCommaSeperatedInitializer(node) ? false : "quit";
+            });
+            if (commaExpression) {
+                var checker = program.getTypeChecker();
+                if (!expressionCouldBeVariableDeclaration(commaExpression, checker)) {
+                    return;
+                }
+                return applyChange(changeTracker, commaExpression, sourceFile, fixedNodes);
+            }
+        }
+        function applyChange(changeTracker, initializer, sourceFile, fixedNodes) {
+            if (!fixedNodes || fixedNodes.tryAdd(initializer)) {
+                changeTracker.insertModifierBefore(sourceFile, 78 /* ConstKeyword */, initializer);
+            }
+        }
+        function isPossiblyPartOfDestructuring(node) {
+            switch (node.kind) {
+                case 73 /* Identifier */:
+                case 188 /* ArrayLiteralExpression */:
+                case 189 /* ObjectLiteralExpression */:
+                case 276 /* PropertyAssignment */:
+                case 277 /* ShorthandPropertyAssignment */:
+                    return true;
+                default:
+                    return false;
+            }
+        }
+        function arrayElementCouldBeVariableDeclaration(expression, checker) {
+            var identifier = ts.isIdentifier(expression) ? expression :
+                ts.isAssignmentExpression(expression, /*excludeCompoundAssignment*/ true) && ts.isIdentifier(expression.left) ? expression.left :
+                    undefined;
+            return !!identifier && !checker.getSymbolAtLocation(identifier);
+        }
+        function isPossiblyPartOfCommaSeperatedInitializer(node) {
+            switch (node.kind) {
+                case 73 /* Identifier */:
+                case 205 /* BinaryExpression */:
+                case 27 /* CommaToken */:
+                    return true;
+                default:
+                    return false;
+            }
+        }
+        function expressionCouldBeVariableDeclaration(expression, checker) {
+            if (!ts.isBinaryExpression(expression)) {
+                return false;
+            }
+            if (expression.operatorToken.kind === 27 /* CommaToken */) {
+                return ts.every([expression.left, expression.right], function (expression) { return expressionCouldBeVariableDeclaration(expression, checker); });
+            }
+            return ts.isIdentifier(expression.left) && !checker.getSymbolAtLocation(expression.left);
+        }
+    })(codefix = ts.codefix || (ts.codefix = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
 (function (ts) {
     var codefix;
     (function (codefix) {
@@ -111416,11 +115319,11 @@ var ts;
         function makeChange(changeTracker, sourceFile, pos) {
             var token = ts.getTokenAtPosition(sourceFile, pos);
             if (!ts.isIdentifier(token)) {
-                return ts.Debug.fail("add-name-to-nameless-parameter operates on identifiers, but got a " + ts.formatSyntaxKind(token.kind));
+                return ts.Debug.fail("add-name-to-nameless-parameter operates on identifiers, but got a " + ts.Debug.formatSyntaxKind(token.kind));
             }
             var param = token.parent;
             if (!ts.isParameter(param)) {
-                return ts.Debug.fail("Tried to add a parameter name to a non-parameter: " + ts.formatSyntaxKind(token.kind));
+                return ts.Debug.fail("Tried to add a parameter name to a non-parameter: " + ts.Debug.formatSyntaxKind(token.kind));
             }
             var i = param.parent.parameters.indexOf(param);
             ts.Debug.assert(!param.type, "Tried to add a parameter name to a parameter that already had one.");
@@ -111502,26 +115405,26 @@ var ts;
         }
         function isDeclarationWithType(node) {
             return ts.isFunctionLikeDeclaration(node) ||
-                node.kind === 237 /* VariableDeclaration */ ||
-                node.kind === 153 /* PropertySignature */ ||
-                node.kind === 154 /* PropertyDeclaration */;
+                node.kind === 238 /* VariableDeclaration */ ||
+                node.kind === 154 /* PropertySignature */ ||
+                node.kind === 155 /* PropertyDeclaration */;
         }
         function transformJSDocType(node) {
             switch (node.kind) {
-                case 289 /* JSDocAllType */:
-                case 290 /* JSDocUnknownType */:
+                case 290 /* JSDocAllType */:
+                case 291 /* JSDocUnknownType */:
                     return ts.createTypeReferenceNode("any", ts.emptyArray);
-                case 293 /* JSDocOptionalType */:
+                case 294 /* JSDocOptionalType */:
                     return transformJSDocOptionalType(node);
-                case 292 /* JSDocNonNullableType */:
+                case 293 /* JSDocNonNullableType */:
                     return transformJSDocType(node.type);
-                case 291 /* JSDocNullableType */:
+                case 292 /* JSDocNullableType */:
                     return transformJSDocNullableType(node);
-                case 295 /* JSDocVariadicType */:
+                case 296 /* JSDocVariadicType */:
                     return transformJSDocVariadicType(node);
-                case 294 /* JSDocFunctionType */:
+                case 295 /* JSDocFunctionType */:
                     return transformJSDocFunctionType(node);
-                case 164 /* TypeReference */:
+                case 165 /* TypeReference */:
                     return transformJSDocTypeReference(node);
                 default:
                     var visited = ts.visitEachChild(node, transformJSDocType, /*context*/ undefined); // TODO: GH#18217
@@ -111543,7 +115446,7 @@ var ts;
         }
         function transformJSDocParameter(node) {
             var index = node.parent.parameters.indexOf(node);
-            var isRest = node.type.kind === 295 /* JSDocVariadicType */ && index === node.parent.parameters.length - 1; // TODO: GH#18217
+            var isRest = node.type.kind === 296 /* JSDocVariadicType */ && index === node.parent.parameters.length - 1; // TODO: GH#18217
             var name = node.name || (isRest ? "rest" : "arg" + index);
             var dotdotdot = isRest ? ts.createToken(25 /* DotDotDotToken */) : node.dotDotDotToken;
             return ts.createParameter(node.decorators, node.modifiers, dotdotdot, name, node.questionToken, ts.visitNode(node.type, transformJSDocType), node.initializer);
@@ -111583,8 +115486,8 @@ var ts;
             var index = ts.createParameter(
             /*decorators*/ undefined, 
             /*modifiers*/ undefined, 
-            /*dotDotDotToken*/ undefined, node.typeArguments[0].kind === 135 /* NumberKeyword */ ? "n" : "s", 
-            /*questionToken*/ undefined, ts.createTypeReferenceNode(node.typeArguments[0].kind === 135 /* NumberKeyword */ ? "number" : "string", []), 
+            /*dotDotDotToken*/ undefined, node.typeArguments[0].kind === 136 /* NumberKeyword */ ? "n" : "s", 
+            /*questionToken*/ undefined, ts.createTypeReferenceNode(node.typeArguments[0].kind === 136 /* NumberKeyword */ ? "number" : "string", []), 
             /*initializer*/ undefined);
             var indexSignature = ts.createTypeLiteralNode([ts.createIndexSignature(/*decorators*/ undefined, /*modifiers*/ undefined, [index], node.typeArguments[1])]);
             ts.setEmitFlags(indexSignature, 1 /* SingleLine */);
@@ -111628,6 +115531,8 @@ var ts;
             ts.Diagnostics.Property_0_implicitly_has_type_any_but_a_better_type_for_its_set_accessor_may_be_inferred_from_usage.code,
             // Property declarations
             ts.Diagnostics.Member_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage.code,
+            // Function expressions and declarations
+            ts.Diagnostics.this_implicitly_has_type_any_because_it_does_not_have_a_type_annotation.code,
         ];
         codefix.registerCodeFix({
             errorCodes: errorCodes,
@@ -111657,6 +115562,8 @@ var ts;
                 case ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type.code:
                 case ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type_but_a_better_type_may_be_inferred_from_usage.code:
                     return ts.Diagnostics.Infer_parameter_types_from_usage;
+                case ts.Diagnostics.this_implicitly_has_type_any_because_it_does_not_have_a_type_annotation.code:
+                    return ts.Diagnostics.Infer_this_type_of_0_from_usage;
                 default:
                     return ts.Diagnostics.Infer_type_of_0_from_usage;
             }
@@ -111684,7 +115591,7 @@ var ts;
             return errorCode;
         }
         function doChange(changes, sourceFile, token, errorCode, program, cancellationToken, markSeen, host) {
-            if (!ts.isParameterPropertyModifier(token.kind) && token.kind !== 72 /* Identifier */ && token.kind !== 25 /* DotDotDotToken */ && token.kind !== 100 /* ThisKeyword */) {
+            if (!ts.isParameterPropertyModifier(token.kind) && token.kind !== 73 /* Identifier */ && token.kind !== 25 /* DotDotDotToken */ && token.kind !== 101 /* ThisKeyword */) {
                 return undefined;
             }
             var parent = token.parent;
@@ -111751,6 +115658,13 @@ var ts;
                         return containingFunction;
                     }
                     return undefined;
+                // Function 'this'
+                case ts.Diagnostics.this_implicitly_has_type_any_because_it_does_not_have_a_type_annotation.code:
+                    if (ts.textChanges.isThisTypeAnnotatable(containingFunction) && markSeen(containingFunction)) {
+                        annotateThis(changes, sourceFile, containingFunction, program, host, cancellationToken);
+                        return containingFunction;
+                    }
+                    return undefined;
                 default:
                     return ts.Debug.fail(String(errorCode));
             }
@@ -111764,7 +115678,8 @@ var ts;
             if (!ts.isIdentifier(parameterDeclaration.name)) {
                 return;
             }
-            var parameterInferences = inferTypeForParametersFromUsage(containingFunction, sourceFile, program, cancellationToken) ||
+            var references = inferFunctionReferencesFromUsage(containingFunction, sourceFile, program, cancellationToken);
+            var parameterInferences = InferFromReference.inferTypeForParametersFromReferences(references, containingFunction, program, cancellationToken) ||
                 containingFunction.parameters.map(function (p) { return ({
                     declaration: p,
                     type: ts.isIdentifier(p.name) ? inferTypeForVariableFromUsage(p.name, program, cancellationToken) : program.getTypeChecker().getAnyType()
@@ -111787,6 +115702,31 @@ var ts;
                     changes.insertNodeAfter(sourceFile, ts.last(containingFunction.parameters), ts.createToken(21 /* CloseParenToken */));
             }
         }
+        function annotateThis(changes, sourceFile, containingFunction, program, host, cancellationToken) {
+            var references = inferFunctionReferencesFromUsage(containingFunction, sourceFile, program, cancellationToken);
+            if (!references) {
+                return;
+            }
+            var thisInference = InferFromReference.inferTypeForThisFromReferences(references, program, cancellationToken);
+            if (!thisInference) {
+                return;
+            }
+            var typeNode = ts.getTypeNodeIfAccessible(thisInference, containingFunction, program, host);
+            if (!typeNode) {
+                return;
+            }
+            if (ts.isInJSFile(containingFunction)) {
+                annotateJSDocThis(changes, sourceFile, containingFunction, typeNode);
+            }
+            else {
+                changes.tryInsertThisTypeAnnotation(sourceFile, containingFunction, typeNode);
+            }
+        }
+        function annotateJSDocThis(changes, sourceFile, containingFunction, typeNode) {
+            addJSDocTags(changes, sourceFile, containingFunction, [
+                ts.createJSDocThisTag(ts.createJSDocTypeExpression(typeNode)),
+            ]);
+        }
         function annotateSetAccessor(changes, sourceFile, setAccessorDeclaration, program, host, cancellationToken) {
             var param = ts.firstOrUndefined(setAccessorDeclaration.parameters);
             if (param && ts.isIdentifier(setAccessorDeclaration.name) && ts.isIdentifier(param.name)) {
@@ -111805,7 +115745,7 @@ var ts;
         function annotate(changes, sourceFile, declaration, type, program, host) {
             var typeNode = ts.getTypeNodeIfAccessible(type, declaration, program, host);
             if (typeNode) {
-                if (ts.isInJSFile(sourceFile) && declaration.kind !== 153 /* PropertySignature */) {
+                if (ts.isInJSFile(sourceFile) && declaration.kind !== 154 /* PropertySignature */) {
                     var parent = ts.isVariableDeclaration(declaration) ? ts.tryCast(declaration.parent.parent, ts.isVariableStatement) : declaration;
                     if (!parent) {
                         return;
@@ -111846,13 +115786,13 @@ var ts;
                 return !!merged;
             }); });
             var tag = ts.createJSDocComment(comments.join("\n"), ts.createNodeArray((oldTags || ts.emptyArray).concat(unmergedNewTags)));
-            var jsDocNode = parent.kind === 197 /* ArrowFunction */ ? getJsDocNodeForArrowFunction(parent) : parent;
+            var jsDocNode = parent.kind === 198 /* ArrowFunction */ ? getJsDocNodeForArrowFunction(parent) : parent;
             jsDocNode.jsDoc = parent.jsDoc;
             jsDocNode.jsDocCache = parent.jsDocCache;
             changes.insertJsdocCommentBefore(sourceFile, jsDocNode, tag);
         }
         function getJsDocNodeForArrowFunction(signature) {
-            if (signature.parent.kind === 154 /* PropertyDeclaration */) {
+            if (signature.parent.kind === 155 /* PropertyDeclaration */) {
                 return signature.parent;
             }
             return signature.parent.parent;
@@ -111862,14 +115802,14 @@ var ts;
                 return undefined;
             }
             switch (oldTag.kind) {
-                case 304 /* JSDocParameterTag */: {
+                case 306 /* JSDocParameterTag */: {
                     var oldParam = oldTag;
                     var newParam = newTag;
                     return ts.isIdentifier(oldParam.name) && ts.isIdentifier(newParam.name) && oldParam.name.escapedText === newParam.name.escapedText
                         ? ts.createJSDocParamTag(newParam.name, newParam.isBracketed, newParam.typeExpression, oldParam.comment)
                         : undefined;
                 }
-                case 305 /* JSDocReturnTag */:
+                case 307 /* JSDocReturnTag */:
                     return ts.createJSDocReturnTag(newTag.typeExpression, oldTag.comment);
             }
         }
@@ -111885,27 +115825,28 @@ var ts;
             var types = InferFromReference.inferTypesFromReferences(references, checker, cancellationToken);
             return InferFromReference.unifyFromContext(types, checker);
         }
-        function inferTypeForParametersFromUsage(containingFunction, sourceFile, program, cancellationToken) {
+        function inferFunctionReferencesFromUsage(containingFunction, sourceFile, program, cancellationToken) {
             var searchToken;
             switch (containingFunction.kind) {
-                case 157 /* Constructor */:
-                    searchToken = ts.findChildOfKind(containingFunction, 124 /* ConstructorKeyword */, sourceFile);
+                case 158 /* Constructor */:
+                    searchToken = ts.findChildOfKind(containingFunction, 125 /* ConstructorKeyword */, sourceFile);
                     break;
-                case 197 /* ArrowFunction */:
-                case 196 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
+                case 197 /* FunctionExpression */:
                     var parent = containingFunction.parent;
                     searchToken = ts.isVariableDeclaration(parent) && ts.isIdentifier(parent.name) ?
                         parent.name :
                         containingFunction.name;
                     break;
-                case 239 /* FunctionDeclaration */:
-                case 156 /* MethodDeclaration */:
+                case 240 /* FunctionDeclaration */:
+                case 157 /* MethodDeclaration */:
                     searchToken = containingFunction.name;
                     break;
             }
-            if (searchToken) {
-                return InferFromReference.inferTypeForParametersFromReferences(getReferences(searchToken, program, cancellationToken), containingFunction, program, cancellationToken);
+            if (!searchToken) {
+                return undefined;
             }
+            return getReferences(searchToken, program, cancellationToken);
         }
         var InferFromReference;
         (function (InferFromReference) {
@@ -111920,13 +115861,10 @@ var ts;
             }
             InferFromReference.inferTypesFromReferences = inferTypesFromReferences;
             function inferTypeForParametersFromReferences(references, declaration, program, cancellationToken) {
+                if (references === undefined || references.length === 0 || !declaration.parameters) {
+                    return undefined;
+                }
                 var checker = program.getTypeChecker();
-                if (references.length === 0) {
-                    return undefined;
-                }
-                if (!declaration.parameters) {
-                    return undefined;
-                }
                 var usageContext = {};
                 for (var _i = 0, references_3 = references; _i < references_3.length; _i++) {
                     var reference = references_3[_i];
@@ -111966,26 +115904,40 @@ var ts;
                 });
             }
             InferFromReference.inferTypeForParametersFromReferences = inferTypeForParametersFromReferences;
+            function inferTypeForThisFromReferences(references, program, cancellationToken) {
+                if (references.length === 0) {
+                    return undefined;
+                }
+                var checker = program.getTypeChecker();
+                var usageContext = {};
+                for (var _i = 0, references_4 = references; _i < references_4.length; _i++) {
+                    var reference = references_4[_i];
+                    cancellationToken.throwIfCancellationRequested();
+                    inferTypeFromContext(reference, checker, usageContext);
+                }
+                return unifyFromContext(usageContext.candidateThisTypes || ts.emptyArray, checker);
+            }
+            InferFromReference.inferTypeForThisFromReferences = inferTypeForThisFromReferences;
             function inferTypeFromContext(node, checker, usageContext) {
                 while (ts.isRightSideOfQualifiedNameOrPropertyAccess(node)) {
                     node = node.parent;
                 }
                 switch (node.parent.kind) {
-                    case 203 /* PostfixUnaryExpression */:
+                    case 204 /* PostfixUnaryExpression */:
                         usageContext.isNumber = true;
                         break;
-                    case 202 /* PrefixUnaryExpression */:
+                    case 203 /* PrefixUnaryExpression */:
                         inferTypeFromPrefixUnaryExpressionContext(node.parent, usageContext);
                         break;
-                    case 204 /* BinaryExpression */:
+                    case 205 /* BinaryExpression */:
                         inferTypeFromBinaryExpressionContext(node, node.parent, checker, usageContext);
                         break;
-                    case 271 /* CaseClause */:
-                    case 272 /* DefaultClause */:
+                    case 272 /* CaseClause */:
+                    case 273 /* DefaultClause */:
                         inferTypeFromSwitchStatementLabelContext(node.parent, checker, usageContext);
                         break;
-                    case 191 /* CallExpression */:
-                    case 192 /* NewExpression */:
+                    case 192 /* CallExpression */:
+                    case 193 /* NewExpression */:
                         if (node.parent.expression === node) {
                             inferTypeFromCallExpressionContext(node.parent, checker, usageContext);
                         }
@@ -111993,13 +115945,20 @@ var ts;
                             inferTypeFromContextualType(node, checker, usageContext);
                         }
                         break;
-                    case 189 /* PropertyAccessExpression */:
+                    case 190 /* PropertyAccessExpression */:
                         inferTypeFromPropertyAccessExpressionContext(node.parent, checker, usageContext);
                         break;
-                    case 190 /* ElementAccessExpression */:
+                    case 191 /* ElementAccessExpression */:
                         inferTypeFromPropertyElementExpressionContext(node.parent, node, checker, usageContext);
                         break;
-                    case 237 /* VariableDeclaration */: {
+                    case 276 /* PropertyAssignment */:
+                    case 277 /* ShorthandPropertyAssignment */:
+                        inferTypeFromPropertyAssignment(node.parent, checker, usageContext);
+                        break;
+                    case 155 /* PropertyDeclaration */:
+                        inferTypeFromPropertyDeclaration(node.parent, checker, usageContext);
+                        break;
+                    case 238 /* VariableDeclaration */: {
                         var _a = node.parent, name = _a.name, initializer = _a.initializer;
                         if (node === name) {
                             if (initializer) { // This can happen for `let x = null;` which still has an implicit-any error.
@@ -112050,17 +116009,17 @@ var ts;
                     case 50 /* BarToken */:
                     case 51 /* CaretToken */:
                     // CompoundAssignmentOperator
-                    case 61 /* MinusEqualsToken */:
-                    case 63 /* AsteriskAsteriskEqualsToken */:
-                    case 62 /* AsteriskEqualsToken */:
-                    case 64 /* SlashEqualsToken */:
-                    case 65 /* PercentEqualsToken */:
-                    case 69 /* AmpersandEqualsToken */:
-                    case 70 /* BarEqualsToken */:
-                    case 71 /* CaretEqualsToken */:
-                    case 66 /* LessThanLessThanEqualsToken */:
-                    case 68 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
-                    case 67 /* GreaterThanGreaterThanEqualsToken */:
+                    case 62 /* MinusEqualsToken */:
+                    case 64 /* AsteriskAsteriskEqualsToken */:
+                    case 63 /* AsteriskEqualsToken */:
+                    case 65 /* SlashEqualsToken */:
+                    case 66 /* PercentEqualsToken */:
+                    case 70 /* AmpersandEqualsToken */:
+                    case 71 /* BarEqualsToken */:
+                    case 72 /* CaretEqualsToken */:
+                    case 67 /* LessThanLessThanEqualsToken */:
+                    case 69 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
+                    case 68 /* GreaterThanGreaterThanEqualsToken */:
                     // AdditiveOperator
                     case 39 /* MinusToken */:
                     // RelationalOperator
@@ -112076,7 +116035,7 @@ var ts;
                             usageContext.isNumber = true;
                         }
                         break;
-                    case 60 /* PlusEqualsToken */:
+                    case 61 /* PlusEqualsToken */:
                     case 38 /* PlusToken */:
                         var otherOperandType = checker.getTypeAtLocation(parent.left === node ? parent.right : parent.left);
                         if (otherOperandType.flags & 1056 /* EnumLike */) {
@@ -112093,14 +116052,14 @@ var ts;
                         }
                         break;
                     //  AssignmentOperators
-                    case 59 /* EqualsToken */:
+                    case 60 /* EqualsToken */:
                     case 33 /* EqualsEqualsToken */:
                     case 35 /* EqualsEqualsEqualsToken */:
                     case 36 /* ExclamationEqualsEqualsToken */:
                     case 34 /* ExclamationEqualsToken */:
                         addCandidateType(usageContext, checker.getTypeAtLocation(parent.left === node ? parent.right : parent.left));
                         break;
-                    case 93 /* InKeyword */:
+                    case 94 /* InKeyword */:
                         if (node === parent.left) {
                             usageContext.isString = true;
                         }
@@ -112108,7 +116067,7 @@ var ts;
                     // LogicalOperator
                     case 55 /* BarBarToken */:
                         if (node === parent.left &&
-                            (node.parent.parent.kind === 237 /* VariableDeclaration */ || ts.isAssignmentExpression(node.parent.parent, /*excludeCompoundAssignment*/ true))) {
+                            (node.parent.parent.kind === 238 /* VariableDeclaration */ || ts.isAssignmentExpression(node.parent.parent, /*excludeCompoundAssignment*/ true))) {
                             // var x = x || {};
                             // TODO: use getFalsyflagsOfType
                             addCandidateType(usageContext, checker.getTypeAtLocation(parent.right));
@@ -112116,7 +116075,7 @@ var ts;
                         break;
                     case 54 /* AmpersandAmpersandToken */:
                     case 27 /* CommaToken */:
-                    case 94 /* InstanceOfKeyword */:
+                    case 95 /* InstanceOfKeyword */:
                         // nothing to infer here
                         break;
                 }
@@ -112136,7 +116095,7 @@ var ts;
                     }
                 }
                 inferTypeFromContext(parent, checker, callContext.returnType);
-                if (parent.kind === 191 /* CallExpression */) {
+                if (parent.kind === 192 /* CallExpression */) {
                     (usageContext.callContexts || (usageContext.callContexts = [])).push(callContext);
                 }
                 else {
@@ -112169,6 +116128,18 @@ var ts;
                     }
                 }
             }
+            function inferTypeFromPropertyAssignment(assignment, checker, usageContext) {
+                var objectLiteral = ts.isShorthandPropertyAssignment(assignment) ?
+                    assignment.parent :
+                    assignment.parent.parent;
+                var nodeWithRealType = ts.isVariableDeclaration(objectLiteral.parent) ?
+                    objectLiteral.parent :
+                    objectLiteral;
+                addCandidateThisType(usageContext, checker.getTypeAtLocation(nodeWithRealType));
+            }
+            function inferTypeFromPropertyDeclaration(declaration, checker, usageContext) {
+                addCandidateThisType(usageContext, checker.getTypeAtLocation(declaration.parent));
+            }
             function removeLowPriorityInferences(inferences, priorities) {
                 var toRemove = [];
                 for (var _i = 0, inferences_1 = inferences; _i < inferences_1.length; _i++) {
@@ -112344,6 +116315,11 @@ var ts;
                     (context.candidateTypes || (context.candidateTypes = [])).push(type);
                 }
             }
+            function addCandidateThisType(context, type) {
+                if (type && !(type.flags & 1 /* Any */) && !(type.flags & 131072 /* Never */)) {
+                    (context.candidateThisTypes || (context.candidateThisTypes = [])).push(type);
+                }
+            }
             function hasCallContext(usageContext) {
                 return !!usageContext && !!usageContext.callContexts;
             }
@@ -112376,12 +116352,12 @@ var ts;
             var precedingNode;
             var newClassDeclaration;
             switch (ctorDeclaration.kind) {
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     precedingNode = ctorDeclaration;
                     changes.delete(sourceFile, ctorDeclaration);
                     newClassDeclaration = createClassFromFunctionDeclaration(ctorDeclaration);
                     break;
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     precedingNode = ctorDeclaration.parent.parent;
                     newClassDeclaration = createClassFromVariableDeclaration(ctorDeclaration);
                     if (ctorDeclaration.parent.declarations.length === 1) {
@@ -112413,7 +116389,7 @@ var ts;
                 // all static members are stored in the "exports" array of symbol
                 if (symbol.exports) {
                     symbol.exports.forEach(function (member) {
-                        var memberElement = createClassElement(member, [ts.createToken(116 /* StaticKeyword */)]);
+                        var memberElement = createClassElement(member, [ts.createToken(117 /* StaticKeyword */)]);
                         if (memberElement) {
                             memberElements.push(memberElement);
                         }
@@ -112436,7 +116412,7 @@ var ts;
                         return;
                     }
                     // delete the entire statement if this expression is the sole expression to take care of the semicolon at the end
-                    var nodeToDelete = assignmentBinaryExpression.parent && assignmentBinaryExpression.parent.kind === 221 /* ExpressionStatement */
+                    var nodeToDelete = assignmentBinaryExpression.parent && assignmentBinaryExpression.parent.kind === 222 /* ExpressionStatement */
                         ? assignmentBinaryExpression.parent : assignmentBinaryExpression;
                     changes.delete(sourceFile, nodeToDelete);
                     if (!assignmentBinaryExpression.right) {
@@ -112444,27 +116420,27 @@ var ts;
                         /*type*/ undefined, /*initializer*/ undefined);
                     }
                     switch (assignmentBinaryExpression.right.kind) {
-                        case 196 /* FunctionExpression */: {
+                        case 197 /* FunctionExpression */: {
                             var functionExpression = assignmentBinaryExpression.right;
-                            var fullModifiers = ts.concatenate(modifiers, getModifierKindFromSource(functionExpression, 121 /* AsyncKeyword */));
+                            var fullModifiers = ts.concatenate(modifiers, getModifierKindFromSource(functionExpression, 122 /* AsyncKeyword */));
                             var method = ts.createMethod(/*decorators*/ undefined, fullModifiers, /*asteriskToken*/ undefined, memberDeclaration.name, /*questionToken*/ undefined, 
                             /*typeParameters*/ undefined, functionExpression.parameters, /*type*/ undefined, functionExpression.body);
                             ts.copyLeadingComments(assignmentBinaryExpression, method, sourceFile);
                             return method;
                         }
-                        case 197 /* ArrowFunction */: {
+                        case 198 /* ArrowFunction */: {
                             var arrowFunction = assignmentBinaryExpression.right;
                             var arrowFunctionBody = arrowFunction.body;
                             var bodyBlock = void 0;
                             // case 1: () => { return [1,2,3] }
-                            if (arrowFunctionBody.kind === 218 /* Block */) {
+                            if (arrowFunctionBody.kind === 219 /* Block */) {
                                 bodyBlock = arrowFunctionBody;
                             }
                             // case 2: () => [1,2,3]
                             else {
                                 bodyBlock = ts.createBlock([ts.createReturn(arrowFunctionBody)]);
                             }
-                            var fullModifiers = ts.concatenate(modifiers, getModifierKindFromSource(arrowFunction, 121 /* AsyncKeyword */));
+                            var fullModifiers = ts.concatenate(modifiers, getModifierKindFromSource(arrowFunction, 122 /* AsyncKeyword */));
                             var method = ts.createMethod(/*decorators*/ undefined, fullModifiers, /*asteriskToken*/ undefined, memberDeclaration.name, /*questionToken*/ undefined, 
                             /*typeParameters*/ undefined, arrowFunction.parameters, /*type*/ undefined, bodyBlock);
                             ts.copyLeadingComments(assignmentBinaryExpression, method, sourceFile);
@@ -112485,17 +116461,17 @@ var ts;
             }
             function createClassFromVariableDeclaration(node) {
                 var initializer = node.initializer;
-                if (!initializer || initializer.kind !== 196 /* FunctionExpression */) {
+                if (!initializer || initializer.kind !== 197 /* FunctionExpression */) {
                     return undefined;
                 }
-                if (node.name.kind !== 72 /* Identifier */) {
+                if (node.name.kind !== 73 /* Identifier */) {
                     return undefined;
                 }
                 var memberElements = createClassElementsFromSymbol(node.symbol);
                 if (initializer.body) {
                     memberElements.unshift(ts.createConstructor(/*decorators*/ undefined, /*modifiers*/ undefined, initializer.parameters, initializer.body));
                 }
-                var modifiers = getModifierKindFromSource(precedingNode, 85 /* ExportKeyword */);
+                var modifiers = getModifierKindFromSource(precedingNode, 86 /* ExportKeyword */);
                 var cls = ts.createClassDeclaration(/*decorators*/ undefined, modifiers, node.name, 
                 /*typeParameters*/ undefined, /*heritageClauses*/ undefined, memberElements);
                 // Don't call copyComments here because we'll already leave them in place
@@ -112506,7 +116482,7 @@ var ts;
                 if (node.body) {
                     memberElements.unshift(ts.createConstructor(/*decorators*/ undefined, /*modifiers*/ undefined, node.parameters, node.body));
                 }
-                var modifiers = getModifierKindFromSource(node, 85 /* ExportKeyword */);
+                var modifiers = getModifierKindFromSource(node, 86 /* ExportKeyword */);
                 var cls = ts.createClassDeclaration(/*decorators*/ undefined, modifiers, node.name, 
                 /*typeParameters*/ undefined, /*heritageClauses*/ undefined, memberElements);
                 // Don't call copyComments here because we'll already leave them in place
@@ -112536,6 +116512,11 @@ var ts;
             fixIds: [fixId],
             getAllCodeActions: function (context) { return codefix.codeFixAll(context, errorCodes, function (changes, err) { return convertToAsyncFunction(changes, err.file, err.start, context.program.getTypeChecker(), context); }); },
         });
+        var SynthBindingNameKind;
+        (function (SynthBindingNameKind) {
+            SynthBindingNameKind[SynthBindingNameKind["Identifier"] = 0] = "Identifier";
+            SynthBindingNameKind[SynthBindingNameKind["BindingPattern"] = 1] = "BindingPattern";
+        })(SynthBindingNameKind || (SynthBindingNameKind = {}));
         function convertToAsyncFunction(changes, sourceFile, position, checker, context) {
             // get the function declaration - returns a promise
             var tokenAtPosition = ts.getTokenAtPosition(sourceFile, position);
@@ -112564,7 +116545,7 @@ var ts;
                 return;
             }
             // add the async keyword
-            changes.insertLastModifierBefore(sourceFile, 121 /* AsyncKeyword */, functionToConvert);
+            changes.insertLastModifierBefore(sourceFile, 122 /* AsyncKeyword */, functionToConvert);
             function startTransformation(node, nodeToReplace) {
                 var newNodes = transformExpression(node, transformer, node);
                 changes.replaceNodeWithNodes(sourceFile, nodeToReplace, newNodes);
@@ -112672,8 +116653,8 @@ var ts;
                         allVarNames.push({ identifier: synthName.identifier, symbol: symbol });
                         addNameToFrequencyMap(collidingSymbolMap, ident.text, symbol);
                     }
-                    // we only care about identifiers that are parameters and declarations (don't care about other uses)
-                    else if (node.parent && (ts.isParameter(node.parent) || ts.isVariableDeclaration(node.parent))) {
+                    // we only care about identifiers that are parameters, declarations, or binding elements (don't care about other uses)
+                    else if (node.parent && (ts.isParameter(node.parent) || ts.isVariableDeclaration(node.parent) || ts.isBindingElement(node.parent))) {
                         var originalName = node.text;
                         var collidingSymbols = collidingSymbolMap.get(originalName);
                         // if the identifier name conflicts with a different identifier that we've already seen
@@ -112687,7 +116668,7 @@ var ts;
                         else {
                             var identifier = ts.getSynthesizedDeepClone(node);
                             identsToRenameMap.set(symbolIdString, identifier);
-                            synthNamesMap.set(symbolIdString, { identifier: identifier, types: [], numberOfAssignmentsOriginal: allVarNames.filter(function (elem) { return elem.identifier.text === node.text; }).length /*, numberOfAssignmentsSynthesized: 0*/ });
+                            synthNamesMap.set(symbolIdString, createSynthIdentifier(identifier, [], allVarNames.filter(function (elem) { return elem.identifier.text === node.text; }).length /*, numberOfAssignmentsSynthesized: 0*/));
                             if ((ts.isParameter(node.parent) && isExpressionOrCallOnTypePromise(node.parent.parent)) || ts.isVariableDeclaration(node.parent)) {
                                 allVarNames.push({ identifier: identifier, symbol: symbol });
                                 addNameToFrequencyMap(collidingSymbolMap, originalName, symbol);
@@ -112735,7 +116716,7 @@ var ts;
             var numVarsSameName = (originalNames.get(name.text) || ts.emptyArray).length;
             var numberOfAssignmentsOriginal = 0;
             var identifier = numVarsSameName === 0 ? name : ts.createIdentifier(name.text + "_" + numVarsSameName);
-            return { identifier: identifier, types: [], numberOfAssignmentsOriginal: numberOfAssignmentsOriginal };
+            return createSynthIdentifier(identifier, [], numberOfAssignmentsOriginal);
         }
         // dispatch function to recursively build the refactoring
         // should be kept up to date with isFixablePromiseHandler in suggestionDiagnostics.ts
@@ -112762,68 +116743,90 @@ var ts;
         }
         function transformCatch(node, transformer, prevArgName) {
             var func = node.arguments[0];
-            var argName = getArgName(func, transformer);
+            var argName = getArgBindingName(func, transformer);
             var shouldReturn = transformer.setOfExpressionsToReturn.get(ts.getNodeId(node).toString());
+            var possibleNameForVarDecl;
             /*
                 If there is another call in the chain after the .catch() we are transforming, we will need to save the result of both paths (try block and catch block)
                 To do this, we will need to synthesize a variable that we were not aware of while we were adding identifiers to the synthNamesMap
                 We will use the prevArgName and then update the synthNamesMap with a new variable name for the next transformation step
             */
             if (prevArgName && !shouldReturn) {
-                prevArgName.numberOfAssignmentsOriginal = 2; // Try block and catch block
-                transformer.synthNamesMap.forEach(function (val, key) {
-                    if (val.identifier.text === prevArgName.identifier.text) {
-                        var newSynthName = createUniqueSynthName(prevArgName);
-                        transformer.synthNamesMap.set(key, newSynthName);
-                    }
-                });
+                if (isSynthIdentifier(prevArgName)) {
+                    possibleNameForVarDecl = prevArgName;
+                    transformer.synthNamesMap.forEach(function (val, key) {
+                        if (val.identifier.text === prevArgName.identifier.text) {
+                            var newSynthName = createUniqueSynthName(prevArgName);
+                            transformer.synthNamesMap.set(key, newSynthName);
+                        }
+                    });
+                }
+                else {
+                    possibleNameForVarDecl = createSynthIdentifier(ts.createOptimisticUniqueName("result"), prevArgName.types);
+                }
+                possibleNameForVarDecl.numberOfAssignmentsOriginal = 2; // Try block and catch block
                 // update the constIdentifiers list
-                if (transformer.constIdentifiers.some(function (elem) { return elem.text === prevArgName.identifier.text; })) {
-                    transformer.constIdentifiers.push(createUniqueSynthName(prevArgName).identifier);
+                if (transformer.constIdentifiers.some(function (elem) { return elem.text === possibleNameForVarDecl.identifier.text; })) {
+                    transformer.constIdentifiers.push(createUniqueSynthName(possibleNameForVarDecl).identifier);
                 }
             }
-            var tryBlock = ts.createBlock(transformExpression(node.expression, transformer, node, prevArgName));
-            var transformationBody = getTransformationBody(func, prevArgName, argName, node, transformer);
-            var catchArg = argName ? argName.identifier.text : "e";
-            var catchClause = ts.createCatchClause(catchArg, ts.createBlock(transformationBody));
+            var tryBlock = ts.createBlock(transformExpression(node.expression, transformer, node, possibleNameForVarDecl));
+            var transformationBody = getTransformationBody(func, possibleNameForVarDecl, argName, node, transformer);
+            var catchArg = argName ? isSynthIdentifier(argName) ? argName.identifier.text : argName.bindingPattern : "e";
+            var catchVariableDeclaration = ts.createVariableDeclaration(catchArg);
+            var catchClause = ts.createCatchClause(catchVariableDeclaration, ts.createBlock(transformationBody));
             /*
                 In order to avoid an implicit any, we will synthesize a type for the declaration using the unions of the types of both paths (try block and catch block)
             */
             var varDeclList;
-            if (prevArgName && !shouldReturn) {
-                var typeArray = prevArgName.types;
+            var varDeclIdentifier;
+            if (possibleNameForVarDecl && !shouldReturn) {
+                varDeclIdentifier = ts.getSynthesizedDeepClone(possibleNameForVarDecl.identifier);
+                var typeArray = possibleNameForVarDecl.types;
                 var unionType = transformer.checker.getUnionType(typeArray, 2 /* Subtype */);
                 var unionTypeNode = transformer.isInJSFile ? undefined : transformer.checker.typeToTypeNode(unionType);
-                var varDecl = [ts.createVariableDeclaration(ts.getSynthesizedDeepClone(prevArgName.identifier), unionTypeNode)];
+                var varDecl = [ts.createVariableDeclaration(varDeclIdentifier, unionTypeNode)];
                 varDeclList = ts.createVariableStatement(/*modifiers*/ undefined, ts.createVariableDeclarationList(varDecl, 1 /* Let */));
             }
             var tryStatement = ts.createTry(tryBlock, catchClause, /*finallyBlock*/ undefined);
-            return varDeclList ? [varDeclList, tryStatement] : [tryStatement];
+            var destructuredResult = prevArgName && varDeclIdentifier && isSynthBindingPattern(prevArgName)
+                && ts.createVariableStatement(/* modifiers */ undefined, ts.createVariableDeclarationList([ts.createVariableDeclaration(ts.getSynthesizedDeepCloneWithRenames(prevArgName.bindingPattern), /* type */ undefined, varDeclIdentifier)], 2 /* Const */));
+            return ts.compact([varDeclList, tryStatement, destructuredResult]);
+        }
+        function getIdentifierTextsFromBindingName(bindingName) {
+            if (ts.isIdentifier(bindingName))
+                return [bindingName.text];
+            return ts.flatMap(bindingName.elements, function (element) {
+                if (ts.isOmittedExpression(element))
+                    return [];
+                return getIdentifierTextsFromBindingName(element.name);
+            });
         }
         function createUniqueSynthName(prevArgName) {
             var renamedPrevArg = ts.createOptimisticUniqueName(prevArgName.identifier.text);
-            var newSynthName = { identifier: renamedPrevArg, types: [], numberOfAssignmentsOriginal: 0 };
-            return newSynthName;
+            return createSynthIdentifier(renamedPrevArg);
         }
         function transformThen(node, transformer, outermostParent, prevArgName) {
             var _a = node.arguments, res = _a[0], rej = _a[1];
             if (!res) {
                 return transformExpression(node.expression, transformer, outermostParent);
             }
-            var argNameRes = getArgName(res, transformer);
+            var argNameRes = getArgBindingName(res, transformer);
             var transformationBody = getTransformationBody(res, prevArgName, argNameRes, node, transformer);
             if (rej) {
-                var argNameRej = getArgName(rej, transformer);
+                var argNameRej = getArgBindingName(rej, transformer);
                 var tryBlock = ts.createBlock(transformExpression(node.expression, transformer, node, argNameRes).concat(transformationBody));
                 var transformationBody2 = getTransformationBody(rej, prevArgName, argNameRej, node, transformer);
-                var catchArg = argNameRej ? argNameRej.identifier.text : "e";
-                var catchClause = ts.createCatchClause(catchArg, ts.createBlock(transformationBody2));
+                var catchArg = argNameRej ? isSynthIdentifier(argNameRej) ? argNameRej.identifier.text : argNameRej.bindingPattern : "e";
+                var catchVariableDeclaration = ts.createVariableDeclaration(catchArg);
+                var catchClause = ts.createCatchClause(catchVariableDeclaration, ts.createBlock(transformationBody2));
                 return [ts.createTry(tryBlock, catchClause, /* finallyBlock */ undefined)];
             }
             return transformExpression(node.expression, transformer, node, argNameRes).concat(transformationBody);
         }
-        function getFlagOfIdentifier(node, constIdentifiers) {
-            var inArr = constIdentifiers.some(function (elem) { return elem.text === node.text; });
+        function getFlagOfBindingName(bindingName, constIdentifiers) {
+            var identifiers = getIdentifierTextsFromBindingName(getNode(bindingName));
+            var inArr = constIdentifiers.some(function (elem) { return ts.contains(identifiers, elem.text); });
             return inArr ? 2 /* Const */ : 1 /* Let */;
         }
         function transformPromiseCall(node, transformer, prevArgName) {
@@ -112839,29 +116842,29 @@ var ts;
             return [ts.createReturn(ts.getSynthesizedDeepClone(node))];
         }
         function createTransformedStatement(prevArgName, rightHandSide, transformer) {
-            if (!prevArgName || prevArgName.identifier.text.length === 0) {
+            if (!prevArgName || isEmpty(prevArgName)) {
                 // if there's no argName to assign to, there still might be side effects
                 return [ts.createStatement(rightHandSide)];
             }
-            if (prevArgName.types.length < prevArgName.numberOfAssignmentsOriginal) {
+            if (isSynthIdentifier(prevArgName) && prevArgName.types.length < prevArgName.numberOfAssignmentsOriginal) {
                 // if the variable has already been declared, we don't need "let" or "const"
                 return [ts.createStatement(ts.createAssignment(ts.getSynthesizedDeepClone(prevArgName.identifier), rightHandSide))];
             }
-            return [ts.createVariableStatement(/*modifiers*/ undefined, (ts.createVariableDeclarationList([ts.createVariableDeclaration(ts.getSynthesizedDeepClone(prevArgName.identifier), /*type*/ undefined, rightHandSide)], getFlagOfIdentifier(prevArgName.identifier, transformer.constIdentifiers))))];
+            return [ts.createVariableStatement(/*modifiers*/ undefined, (ts.createVariableDeclarationList([ts.createVariableDeclaration(ts.getSynthesizedDeepClone(getNode(prevArgName)), /*type*/ undefined, rightHandSide)], getFlagOfBindingName(prevArgName, transformer.constIdentifiers))))];
         }
         // should be kept up to date with isFixablePromiseArgument in suggestionDiagnostics.ts
         function getTransformationBody(func, prevArgName, argName, parent, transformer) {
             var shouldReturn = transformer.setOfExpressionsToReturn.get(ts.getNodeId(parent).toString());
             switch (func.kind) {
-                case 96 /* NullKeyword */:
+                case 97 /* NullKeyword */:
                     // do not produce a transformed statement for a null argument
                     break;
-                case 72 /* Identifier */: // identifier includes undefined
+                case 73 /* Identifier */: // identifier includes undefined
                     if (!argName) {
                         // undefined was argument passed to promise handler
                         break;
                     }
-                    var synthCall = ts.createCall(ts.getSynthesizedDeepClone(func), /*typeArguments*/ undefined, [argName.identifier]);
+                    var synthCall = ts.createCall(ts.getSynthesizedDeepClone(func), /*typeArguments*/ undefined, isSynthIdentifier(argName) ? [argName.identifier] : []);
                     if (shouldReturn) {
                         return [ts.createReturn(synthCall)];
                     }
@@ -112878,8 +116881,8 @@ var ts;
                         prevArgName.types.push(returnType);
                     }
                     return varDeclOrAssignment;
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */: {
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */: {
                     var funcBody = func.body;
                     // Arrow functions with block bodies { } will enter this control flow
                     if (ts.isBlock(funcBody)) {
@@ -112898,7 +116901,7 @@ var ts;
                             }
                         }
                         return shouldReturn ? refactoredStmts.map(function (s) { return ts.getSynthesizedDeepClone(s); }) :
-                            removeReturns(refactoredStmts, prevArgName === undefined ? undefined : prevArgName.identifier, transformer, seenReturnStatement);
+                            removeReturns(refactoredStmts, prevArgName, transformer, seenReturnStatement);
                     }
                     else {
                         var innerRetStmts = ts.isFixablePromiseHandler(funcBody) ? [ts.createReturn(funcBody)] : ts.emptyArray;
@@ -112944,7 +116947,7 @@ var ts;
                             ret.push(ts.createExpressionStatement(possiblyAwaitedExpression));
                         }
                         else {
-                            ret.push(ts.createVariableStatement(/*modifiers*/ undefined, (ts.createVariableDeclarationList([ts.createVariableDeclaration(prevArgName, /*type*/ undefined, possiblyAwaitedExpression)], getFlagOfIdentifier(prevArgName, transformer.constIdentifiers)))));
+                            ret.push(ts.createVariableStatement(/*modifiers*/ undefined, (ts.createVariableDeclarationList([ts.createVariableDeclaration(getNode(prevArgName), /*type*/ undefined, possiblyAwaitedExpression)], getFlagOfBindingName(prevArgName, transformer.constIdentifiers)))));
                         }
                     }
                 }
@@ -112954,7 +116957,7 @@ var ts;
             }
             // if block has no return statement, need to define prevArgName as undefined to prevent undeclared variables
             if (!seenReturnStatement && prevArgName !== undefined) {
-                ret.push(ts.createVariableStatement(/*modifiers*/ undefined, (ts.createVariableDeclarationList([ts.createVariableDeclaration(prevArgName, /*type*/ undefined, ts.createIdentifier("undefined"))], getFlagOfIdentifier(prevArgName, transformer.constIdentifiers)))));
+                ret.push(ts.createVariableStatement(/*modifiers*/ undefined, (ts.createVariableDeclarationList([ts.createVariableDeclaration(getNode(prevArgName), /*type*/ undefined, ts.createIdentifier("undefined"))], getFlagOfBindingName(prevArgName, transformer.constIdentifiers)))));
             }
             return ret;
         }
@@ -112977,32 +116980,42 @@ var ts;
             }
             return innerCbBody;
         }
-        function getArgName(funcNode, transformer) {
+        function getArgBindingName(funcNode, transformer) {
             var numberOfAssignmentsOriginal = 0;
             var types = [];
             var name;
             if (ts.isFunctionLikeDeclaration(funcNode)) {
                 if (funcNode.parameters.length > 0) {
                     var param = funcNode.parameters[0].name;
-                    name = getMapEntryOrDefault(param);
+                    name = getMappedBindingNameOrDefault(param);
                 }
             }
             else if (ts.isIdentifier(funcNode)) {
                 name = getMapEntryOrDefault(funcNode);
             }
             // return undefined argName when arg is null or undefined
-            if (!name || name.identifier.text === "undefined") {
+            if (!name || "identifier" in name && name.identifier.text === "undefined") {
                 return undefined;
             }
             return name;
+            function getMappedBindingNameOrDefault(bindingName) {
+                if (ts.isIdentifier(bindingName))
+                    return getMapEntryOrDefault(bindingName);
+                var elements = ts.flatMap(bindingName.elements, function (element) {
+                    if (ts.isOmittedExpression(element))
+                        return [];
+                    return [getMappedBindingNameOrDefault(element.name)];
+                });
+                return createSynthBindingPattern(bindingName, elements);
+            }
             function getMapEntryOrDefault(identifier) {
                 var originalNode = getOriginalNode(identifier);
                 var symbol = getSymbol(originalNode);
                 if (!symbol) {
-                    return { identifier: identifier, types: types, numberOfAssignmentsOriginal: numberOfAssignmentsOriginal };
+                    return createSynthIdentifier(identifier, types, numberOfAssignmentsOriginal);
                 }
                 var mapEntry = transformer.synthNamesMap.get(ts.getSymbolId(symbol).toString());
-                return mapEntry || { identifier: identifier, types: types, numberOfAssignmentsOriginal: numberOfAssignmentsOriginal };
+                return mapEntry || createSynthIdentifier(identifier, types, numberOfAssignmentsOriginal);
             }
             function getSymbol(node) {
                 return node.symbol ? node.symbol : transformer.checker.getSymbolAtLocation(node);
@@ -113011,6 +117024,34 @@ var ts;
                 return node.original ? node.original : node;
             }
         }
+        function isEmpty(bindingName) {
+            if (!bindingName) {
+                return true;
+            }
+            if (isSynthIdentifier(bindingName)) {
+                return !bindingName.identifier.text;
+            }
+            return ts.every(bindingName.elements, isEmpty);
+        }
+        function getNode(bindingName) {
+            return isSynthIdentifier(bindingName) ? bindingName.identifier : bindingName.bindingPattern;
+        }
+        function createSynthIdentifier(identifier, types, numberOfAssignmentsOriginal) {
+            if (types === void 0) { types = []; }
+            if (numberOfAssignmentsOriginal === void 0) { numberOfAssignmentsOriginal = 0; }
+            return { kind: 0 /* Identifier */, identifier: identifier, types: types, numberOfAssignmentsOriginal: numberOfAssignmentsOriginal };
+        }
+        function createSynthBindingPattern(bindingPattern, elements, types) {
+            if (elements === void 0) { elements = ts.emptyArray; }
+            if (types === void 0) { types = []; }
+            return { kind: 1 /* BindingPattern */, bindingPattern: bindingPattern, elements: elements, types: types };
+        }
+        function isSynthIdentifier(bindingName) {
+            return bindingName.kind === 0 /* Identifier */;
+        }
+        function isSynthBindingPattern(bindingName) {
+            return bindingName.kind === 1 /* BindingPattern */;
+        }
     })(codefix = ts.codefix || (ts.codefix = {}));
 })(ts || (ts = {}));
 /* @internal */
@@ -113044,10 +117085,10 @@ var ts;
                 }
                 var importNode = ts.importFromModuleSpecifier(moduleSpecifier);
                 switch (importNode.kind) {
-                    case 248 /* ImportEqualsDeclaration */:
+                    case 249 /* ImportEqualsDeclaration */:
                         changes.replaceNode(importingFile, importNode, ts.makeImport(importNode.name, /*namedImports*/ undefined, moduleSpecifier, quotePreference));
                         break;
-                    case 191 /* CallExpression */:
+                    case 192 /* CallExpression */:
                         if (ts.isRequireCall(importNode, /*checkArgumentIsStringLiteralLike*/ false)) {
                             changes.replaceNode(importingFile, importNode, ts.createPropertyAccess(ts.getSynthesizedDeepClone(importNode), "default"));
                         }
@@ -113093,29 +117134,29 @@ var ts;
             sourceFile.forEachChild(function recur(node) {
                 if (ts.isPropertyAccessExpression(node) && ts.isExportsOrModuleExportsOrAlias(sourceFile, node.expression)) {
                     var parent = node.parent;
-                    cb(node, ts.isBinaryExpression(parent) && parent.left === node && parent.operatorToken.kind === 59 /* EqualsToken */);
+                    cb(node, ts.isBinaryExpression(parent) && parent.left === node && parent.operatorToken.kind === 60 /* EqualsToken */);
                 }
                 node.forEachChild(recur);
             });
         }
         function convertStatement(sourceFile, statement, checker, changes, identifiers, target, exports, quotePreference) {
             switch (statement.kind) {
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     convertVariableStatement(sourceFile, statement, changes, checker, identifiers, target, quotePreference);
                     return false;
-                case 221 /* ExpressionStatement */: {
+                case 222 /* ExpressionStatement */: {
                     var expression = statement.expression;
                     switch (expression.kind) {
-                        case 191 /* CallExpression */: {
+                        case 192 /* CallExpression */: {
                             if (ts.isRequireCall(expression, /*checkArgumentIsStringLiteralLike*/ true)) {
                                 // For side-effecting require() call, just make a side-effecting import.
                                 changes.replaceNode(sourceFile, statement, ts.makeImport(/*name*/ undefined, /*namedImports*/ undefined, expression.arguments[0], quotePreference));
                             }
                             return false;
                         }
-                        case 204 /* BinaryExpression */: {
+                        case 205 /* BinaryExpression */: {
                             var operatorToken = expression.operatorToken;
-                            return operatorToken.kind === 59 /* EqualsToken */ && convertAssignment(sourceFile, checker, expression, changes, exports);
+                            return operatorToken.kind === 60 /* EqualsToken */ && convertAssignment(sourceFile, checker, expression, changes, exports);
                         }
                     }
                 }
@@ -113155,8 +117196,8 @@ var ts;
         /** Converts `const name = require("moduleSpecifier").propertyName` */
         function convertPropertyAccessImport(name, propertyName, moduleSpecifier, identifiers, quotePreference) {
             switch (name.kind) {
-                case 184 /* ObjectBindingPattern */:
-                case 185 /* ArrayBindingPattern */: {
+                case 185 /* ObjectBindingPattern */:
+                case 186 /* ArrayBindingPattern */: {
                     // `const [a, b] = require("c").d` --> `import { d } from "c"; const [a, b] = d;`
                     var tmp = makeUniqueName(propertyName, identifiers);
                     return [
@@ -113164,7 +117205,7 @@ var ts;
                         makeConst(/*modifiers*/ undefined, name, ts.createIdentifier(tmp)),
                     ];
                 }
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     // `const a = require("b").c` --> `import { c as a } from "./b";
                     return [makeSingleImport(name.text, propertyName, moduleSpecifier, quotePreference)];
                 default:
@@ -113207,16 +117248,16 @@ var ts;
         function tryChangeModuleExportsObject(object) {
             var statements = ts.mapAllOrFail(object.properties, function (prop) {
                 switch (prop.kind) {
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
                     // TODO: Maybe we should handle this? See fourslash test `refactorConvertToEs6Module_export_object_shorthand.ts`.
-                    case 276 /* ShorthandPropertyAssignment */:
-                    case 277 /* SpreadAssignment */:
+                    case 277 /* ShorthandPropertyAssignment */:
+                    case 278 /* SpreadAssignment */:
                         return undefined;
-                    case 275 /* PropertyAssignment */:
+                    case 276 /* PropertyAssignment */:
                         return !ts.isIdentifier(prop.name) ? undefined : convertExportsDotXEquals_replaceNode(prop.name.text, prop.initializer);
-                    case 156 /* MethodDeclaration */:
-                        return !ts.isIdentifier(prop.name) ? undefined : functionExpressionToDeclaration(prop.name.text, [ts.createToken(85 /* ExportKeyword */)], prop);
+                    case 157 /* MethodDeclaration */:
+                        return !ts.isIdentifier(prop.name) ? undefined : functionExpressionToDeclaration(prop.name.text, [ts.createToken(86 /* ExportKeyword */)], prop);
                     default:
                         ts.Debug.assertNever(prop);
                 }
@@ -113265,7 +117306,7 @@ var ts;
             var name = left.name.text;
             if ((ts.isFunctionExpression(right) || ts.isArrowFunction(right) || ts.isClassExpression(right)) && (!right.name || right.name.text === name)) {
                 // `exports.f = function() {}` -> `export function f() {}` -- Replace `exports.f = ` with `export `, and insert the name after `function`.
-                changes.replaceRange(sourceFile, { pos: left.getStart(sourceFile), end: right.getStart(sourceFile) }, ts.createToken(85 /* ExportKeyword */), { suffix: " " });
+                changes.replaceRange(sourceFile, { pos: left.getStart(sourceFile), end: right.getStart(sourceFile) }, ts.createToken(86 /* ExportKeyword */), { suffix: " " });
                 if (!right.name)
                     changes.insertName(sourceFile, right, name);
                 var semi = ts.findChildOfKind(parent, 26 /* SemicolonToken */, sourceFile);
@@ -113274,14 +117315,14 @@ var ts;
             }
             else {
                 // `exports.f = function g() {}` -> `export const f = function g() {}` -- just replace `exports.` with `export const `
-                changes.replaceNodeRangeWithNodes(sourceFile, left.expression, ts.findChildOfKind(left, 24 /* DotToken */, sourceFile), [ts.createToken(85 /* ExportKeyword */), ts.createToken(77 /* ConstKeyword */)], { joiner: " ", suffix: " " });
+                changes.replaceNodeRangeWithNodes(sourceFile, left.expression, ts.findChildOfKind(left, 24 /* DotToken */, sourceFile), [ts.createToken(86 /* ExportKeyword */), ts.createToken(78 /* ConstKeyword */)], { joiner: " ", suffix: " " });
             }
         }
         // TODO: GH#22492 this will cause an error if a change has been made inside the body of the node.
         function convertExportsDotXEquals_replaceNode(name, exported) {
-            var modifiers = [ts.createToken(85 /* ExportKeyword */)];
+            var modifiers = [ts.createToken(86 /* ExportKeyword */)];
             switch (exported.kind) {
-                case 196 /* FunctionExpression */: {
+                case 197 /* FunctionExpression */: {
                     var expressionName = exported.name;
                     if (expressionName && expressionName.text !== name) {
                         // `exports.f = function g() {}` -> `export const f = function g() {}`
@@ -113289,10 +117330,10 @@ var ts;
                     }
                 }
                 // falls through
-                case 197 /* ArrowFunction */:
+                case 198 /* ArrowFunction */:
                     // `exports.f = function() {}` --> `export function f() {}`
                     return functionExpressionToDeclaration(name, modifiers, exported);
-                case 209 /* ClassExpression */:
+                case 210 /* ClassExpression */:
                     // `exports.C = class {}` --> `export class C {}`
                     return classExpressionToDeclaration(name, modifiers, exported);
                 default:
@@ -113310,7 +117351,7 @@ var ts;
          */
         function convertSingleImport(file, name, moduleSpecifier, changes, checker, identifiers, target, quotePreference) {
             switch (name.kind) {
-                case 184 /* ObjectBindingPattern */: {
+                case 185 /* ObjectBindingPattern */: {
                     var importSpecifiers = ts.mapAllOrFail(name.elements, function (e) {
                         return e.dotDotDotToken || e.initializer || e.propertyName && !ts.isIdentifier(e.propertyName) || !ts.isIdentifier(e.name)
                             ? undefined
@@ -113321,7 +117362,7 @@ var ts;
                     }
                 }
                 // falls through -- object destructuring has an interesting pattern and must be a variable declaration
-                case 185 /* ArrayBindingPattern */: {
+                case 186 /* ArrayBindingPattern */: {
                     /*
                     import x from "x";
                     const [a, b, c] = x;
@@ -113332,7 +117373,7 @@ var ts;
                         makeConst(/*modifiers*/ undefined, ts.getSynthesizedDeepClone(name), ts.createIdentifier(tmp)),
                     ];
                 }
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return convertSingleIdentifierImport(file, name, moduleSpecifier, changes, checker, identifiers, quotePreference);
                 default:
                     return ts.Debug.assertNever(name);
@@ -113404,11 +117445,11 @@ var ts;
         function isFreeIdentifier(node) {
             var parent = node.parent;
             switch (parent.kind) {
-                case 189 /* PropertyAccessExpression */:
+                case 190 /* PropertyAccessExpression */:
                     return parent.name !== node;
-                case 186 /* BindingElement */:
+                case 187 /* BindingElement */:
                     return parent.propertyName !== node;
-                case 253 /* ImportSpecifier */:
+                case 254 /* ImportSpecifier */:
                     return parent.propertyName !== node;
                 default:
                     return true;
@@ -113747,21 +117788,21 @@ var ts;
         function tryAddToExistingImport(existingImports) {
             return ts.firstDefined(existingImports, function (_a) {
                 var declaration = _a.declaration, importKind = _a.importKind;
-                if (declaration.kind !== 249 /* ImportDeclaration */)
+                if (declaration.kind !== 250 /* ImportDeclaration */)
                     return undefined;
                 var importClause = declaration.importClause;
                 if (!importClause)
                     return undefined;
                 var name = importClause.name, namedBindings = importClause.namedBindings;
-                return importKind === 1 /* Default */ && !name || importKind === 0 /* Named */ && (!namedBindings || namedBindings.kind === 252 /* NamedImports */)
+                return importKind === 1 /* Default */ && !name || importKind === 0 /* Named */ && (!namedBindings || namedBindings.kind === 253 /* NamedImports */)
                     ? { kind: 2 /* AddToExisting */, importClause: importClause, importKind: importKind }
                     : undefined;
             });
         }
         function getNamespaceImportName(declaration) {
-            if (declaration.kind === 249 /* ImportDeclaration */) {
+            if (declaration.kind === 250 /* ImportDeclaration */) {
                 var namedBindings = declaration.importClause && ts.isImportClause(declaration.importClause) && declaration.importClause.namedBindings;
-                return namedBindings && namedBindings.kind === 251 /* NamespaceImport */ ? namedBindings.name : undefined;
+                return namedBindings && namedBindings.kind === 252 /* NamespaceImport */ ? namedBindings.name : undefined;
             }
             else {
                 return declaration.name;
@@ -113772,7 +117813,7 @@ var ts;
             // Can't use an es6 import for a type in JS.
             return exportedSymbolIsTypeOnly && ts.isSourceFileJS(sourceFile) ? ts.emptyArray : ts.mapDefined(sourceFile.imports, function (moduleSpecifier) {
                 var i = ts.importFromModuleSpecifier(moduleSpecifier);
-                return (i.kind === 249 /* ImportDeclaration */ || i.kind === 248 /* ImportEqualsDeclaration */)
+                return (i.kind === 250 /* ImportDeclaration */ || i.kind === 249 /* ImportEqualsDeclaration */)
                     && checker.getSymbolAtLocation(moduleSpecifier) === moduleSymbol ? { declaration: i, importKind: importKind } : undefined;
             });
         }
@@ -113795,9 +117836,9 @@ var ts;
         }
         function newImportInfoFromExistingSpecifier(_a) {
             var declaration = _a.declaration, importKind = _a.importKind;
-            var expression = declaration.kind === 249 /* ImportDeclaration */
+            var expression = declaration.kind === 250 /* ImportDeclaration */
                 ? declaration.moduleSpecifier
-                : declaration.moduleReference.kind === 259 /* ExternalModuleReference */
+                : declaration.moduleReference.kind === 260 /* ExternalModuleReference */
                     ? declaration.moduleReference.expression
                     : undefined;
             return expression && ts.isStringLiteral(expression) ? { kind: 3 /* AddNew */, moduleSpecifier: expression.text, importKind: importKind } : undefined;
@@ -113919,9 +117960,11 @@ var ts;
                 var aliased = checker.getImmediateAliasedSymbol(defaultExport);
                 return aliased && getDefaultExportInfoWorker(aliased, ts.Debug.assertDefined(aliased.parent), checker, compilerOptions);
             }
-            else {
-                return { symbolForMeaning: defaultExport, name: moduleSymbolToValidIdentifier(moduleSymbol, compilerOptions.target) };
+            if (defaultExport.escapedName !== "default" /* Default */ &&
+                defaultExport.escapedName !== "export=" /* ExportEquals */) {
+                return { symbolForMeaning: defaultExport, name: defaultExport.getName() };
             }
+            return { symbolForMeaning: defaultExport, name: moduleSymbolToValidIdentifier(moduleSymbol, compilerOptions.target) };
         }
         function getNameForExportDefault(symbol) {
             return symbol.declarations && ts.firstDefined(symbol.declarations, function (declaration) {
@@ -114125,12 +118168,12 @@ var ts;
             var checker = context.program.getTypeChecker();
             var suggestion;
             if (ts.isPropertyAccessExpression(node.parent) && node.parent.name === node) {
-                ts.Debug.assert(node.kind === 72 /* Identifier */);
+                ts.Debug.assert(node.kind === 73 /* Identifier */);
                 var containingType = checker.getTypeAtLocation(node.parent.expression);
                 suggestion = checker.getSuggestionForNonexistentProperty(node, containingType);
             }
             else if (ts.isImportSpecifier(node.parent) && node.parent.name === node) {
-                ts.Debug.assert(node.kind === 72 /* Identifier */);
+                ts.Debug.assert(node.kind === 73 /* Identifier */);
                 var importDeclaration = ts.findAncestor(node, ts.isImportDeclaration);
                 var resolvedSourceFile = getResolvedSourceFileFromImportDeclaration(sourceFile, context, importDeclaration);
                 if (resolvedSourceFile && resolvedSourceFile.symbol) {
@@ -114193,7 +118236,7 @@ var ts;
         codefix.registerCodeFix({
             errorCodes: errorCodes,
             getCodeActions: function (context) {
-                var info = getInfo(context.sourceFile, context.span.start, context.program.getTypeChecker());
+                var info = getInfo(context.sourceFile, context.span.start, context.program.getTypeChecker(), context.program);
                 if (!info)
                     return undefined;
                 if (info.kind === 0 /* Enum */) {
@@ -114216,7 +118259,7 @@ var ts;
                 var typeDeclToMembers = new ts.NodeMap();
                 return codefix.createCombinedCodeActions(ts.textChanges.ChangeTracker.with(context, function (changes) {
                     codefix.eachDiagnostic(context, errorCodes, function (diag) {
-                        var info = getInfo(diag.file, diag.start, checker);
+                        var info = getInfo(diag.file, diag.start, checker, context.program);
                         if (!info || !ts.addToSeen(seen, ts.getNodeId(info.parentDeclaration) + "#" + info.token.text)) {
                             return;
                         }
@@ -114284,7 +118327,7 @@ var ts;
             InfoKind[InfoKind["Enum"] = 0] = "Enum";
             InfoKind[InfoKind["ClassOrInterface"] = 1] = "ClassOrInterface";
         })(InfoKind || (InfoKind = {}));
-        function getInfo(tokenSourceFile, tokenPos, checker) {
+        function getInfo(tokenSourceFile, tokenPos, checker, program) {
             // The identifier of the missing property. eg:
             // this.missing = 1;
             //      ^^^^^^^
@@ -114301,7 +118344,7 @@ var ts;
                 return undefined;
             // Prefer to change the class instead of the interface if they are merged
             var classOrInterface = ts.find(symbol.declarations, ts.isClassLike) || ts.find(symbol.declarations, ts.isInterfaceDeclaration);
-            if (classOrInterface) {
+            if (classOrInterface && !program.isSourceFileFromExternalLibrary(classOrInterface.getSourceFile())) {
                 var makeStatic = (leftExpressionType.target || leftExpressionType) !== checker.getDeclaredTypeOfSymbol(symbol);
                 var declSourceFile = classOrInterface.getSourceFile();
                 var inJs = ts.isSourceFileJS(declSourceFile);
@@ -114309,7 +118352,7 @@ var ts;
                 return { kind: 1 /* ClassOrInterface */, token: token, parentDeclaration: classOrInterface, makeStatic: makeStatic, declSourceFile: declSourceFile, inJs: inJs, call: call };
             }
             var enumDeclaration = ts.find(symbol.declarations, ts.isEnumDeclaration);
-            if (enumDeclaration) {
+            if (enumDeclaration && !program.isSourceFileFromExternalLibrary(enumDeclaration.getSourceFile())) {
                 return { kind: 0 /* Enum */, token: token, parentDeclaration: enumDeclaration };
             }
             return undefined;
@@ -114321,7 +118364,7 @@ var ts;
         }
         function addMissingMemberInJs(changeTracker, declSourceFile, classDeclaration, tokenName, makeStatic) {
             if (makeStatic) {
-                if (classDeclaration.kind === 209 /* ClassExpression */) {
+                if (classDeclaration.kind === 210 /* ClassExpression */) {
                     return;
                 }
                 var className = classDeclaration.name.getText();
@@ -114347,7 +118390,7 @@ var ts;
         }
         function getTypeNode(checker, classDeclaration, token) {
             var typeNode;
-            if (token.parent.parent.kind === 204 /* BinaryExpression */) {
+            if (token.parent.parent.kind === 205 /* BinaryExpression */) {
                 var binaryExpression = token.parent.parent;
                 var otherExpression = token.parent === binaryExpression.left ? binaryExpression.right : binaryExpression.left;
                 var widenedType = checker.getWidenedType(checker.getBaseTypeOfLiteralType(checker.getTypeAtLocation(otherExpression)));
@@ -114357,7 +118400,7 @@ var ts;
                 var contextualType = checker.getContextualType(token.parent);
                 typeNode = contextualType ? checker.typeToTypeNode(contextualType) : undefined;
             }
-            return typeNode || ts.createKeywordTypeNode(120 /* AnyKeyword */);
+            return typeNode || ts.createKeywordTypeNode(121 /* AnyKeyword */);
         }
         function createAddPropertyDeclarationAction(context, declSourceFile, classDeclaration, makeStatic, tokenName, typeNode) {
             var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return addPropertyDeclaration(t, declSourceFile, classDeclaration, tokenName, typeNode, makeStatic); });
@@ -114366,7 +118409,7 @@ var ts;
         function addPropertyDeclaration(changeTracker, declSourceFile, classDeclaration, tokenName, typeNode, makeStatic) {
             var property = ts.createProperty(
             /*decorators*/ undefined, 
-            /*modifiers*/ makeStatic ? [ts.createToken(116 /* StaticKeyword */)] : undefined, tokenName, 
+            /*modifiers*/ makeStatic ? [ts.createToken(117 /* StaticKeyword */)] : undefined, tokenName, 
             /*questionToken*/ undefined, typeNode, 
             /*initializer*/ undefined);
             var lastProp = getNodeToInsertPropertyAfter(classDeclaration);
@@ -114390,7 +118433,7 @@ var ts;
         }
         function createAddIndexSignatureAction(context, declSourceFile, classDeclaration, tokenName, typeNode) {
             // Index signatures cannot have the static modifier.
-            var stringTypeNode = ts.createKeywordTypeNode(138 /* StringKeyword */);
+            var stringTypeNode = ts.createKeywordTypeNode(139 /* StringKeyword */);
             var indexingParameter = ts.createParameter(
             /*decorators*/ undefined, 
             /*modifiers*/ undefined, 
@@ -114410,7 +118453,7 @@ var ts;
         }
         function addMethodDeclaration(context, changeTracker, declSourceFile, typeDecl, token, callExpression, makeStatic, inJs, preferences) {
             var methodDeclaration = codefix.createMethodFromCallExpression(context, callExpression, token.text, inJs, makeStatic, preferences, typeDecl);
-            var containingMethodDeclaration = ts.getAncestor(callExpression, 156 /* MethodDeclaration */);
+            var containingMethodDeclaration = ts.getAncestor(callExpression, 157 /* MethodDeclaration */);
             if (containingMethodDeclaration && containingMethodDeclaration.parent === typeDecl) {
                 changeTracker.insertNodeAfter(declSourceFile, containingMethodDeclaration, methodDeclaration);
             }
@@ -114474,7 +118517,6 @@ var ts;
     (function (codefix) {
         var fixName = "fixCannotFindModule";
         var fixIdInstallTypesPackage = "installTypesPackage";
-        var fixIdGenerateTypes = "generateTypes";
         var errorCodeCannotFindModule = ts.Diagnostics.Cannot_find_module_0.code;
         var errorCodes = [
             errorCodeCannotFindModule,
@@ -114489,13 +118531,12 @@ var ts;
                     return undefined;
                 var typesPackageName = getTypesPackageNameToInstall(packageName, host, context.errorCode);
                 return typesPackageName === undefined
-                    ? ts.singleElementArray(tryGetGenerateTypesAction(context, packageName))
+                    ? []
                     : [codefix.createCodeFixAction(fixName, /*changes*/ [], [ts.Diagnostics.Install_0, typesPackageName], fixIdInstallTypesPackage, ts.Diagnostics.Install_all_missing_types_packages, getInstallCommand(sourceFile.fileName, typesPackageName))];
             },
-            fixIds: [fixIdInstallTypesPackage, fixIdGenerateTypes],
+            fixIds: [fixIdInstallTypesPackage],
             getAllCodeActions: function (context) {
-                var savedTypesDir = null; // tslint:disable-line no-null-keyword
-                return codefix.codeFixAll(context, errorCodes, function (changes, diag, commands) {
+                return codefix.codeFixAll(context, errorCodes, function (_changes, diag, commands) {
                     var packageName = tryGetImportedPackageName(diag.file, diag.start);
                     if (packageName === undefined)
                         return undefined;
@@ -114507,96 +118548,12 @@ var ts;
                             }
                             break;
                         }
-                        case fixIdGenerateTypes: {
-                            var typesDir = savedTypesDir !== null ? savedTypesDir : savedTypesDir = getOrCreateTypesDirectory(changes, context);
-                            var command = typesDir === undefined ? undefined : tryGenerateTypes(typesDir, packageName, context);
-                            if (command)
-                                commands.push(command);
-                            break;
-                        }
                         default:
                             ts.Debug.fail("Bad fixId: " + context.fixId);
                     }
                 });
             },
         });
-        function tryGetGenerateTypesAction(context, packageName) {
-            var command;
-            var changes = ts.textChanges.ChangeTracker.with(context, function (t) {
-                var typesDir = getOrCreateTypesDirectory(t, context);
-                command = typesDir === undefined ? undefined : tryGenerateTypes(typesDir, packageName, context);
-            });
-            return command && codefix.createCodeFixAction(fixName, changes, [ts.Diagnostics.Generate_types_for_0, packageName], fixIdGenerateTypes, ts.Diagnostics.Generate_types_for_all_packages_without_types, command);
-        }
-        function tryGenerateTypes(typesDir, packageName, context) {
-            var file = context.sourceFile.fileName;
-            var fileToGenerateTypesFor = ts.tryResolveJSModule(packageName, ts.getDirectoryPath(file), context.host); // TODO: GH#18217
-            if (fileToGenerateTypesFor === undefined)
-                return undefined;
-            var outputFileName = ts.resolvePath(ts.getDirectoryPath(context.program.getCompilerOptions().configFile.fileName), typesDir, packageName + ".d.ts");
-            if (context.host.fileExists(outputFileName))
-                return undefined;
-            return { type: "generate types", file: file, fileToGenerateTypesFor: fileToGenerateTypesFor, outputFileName: outputFileName };
-        }
-        // If no types directory exists yet, adds it to tsconfig.json
-        function getOrCreateTypesDirectory(changes, context) {
-            var configFile = context.program.getCompilerOptions().configFile;
-            if (!configFile)
-                return undefined;
-            var tsconfigObjectLiteral = ts.getTsConfigObjectLiteralExpression(configFile);
-            if (!tsconfigObjectLiteral)
-                return undefined;
-            var compilerOptionsProperty = codefix.findJsonProperty(tsconfigObjectLiteral, "compilerOptions");
-            if (!compilerOptionsProperty) {
-                var newCompilerOptions = ts.createObjectLiteral([makeDefaultBaseUrl(), makeDefaultPaths()]);
-                changes.insertNodeAtObjectStart(configFile, tsconfigObjectLiteral, codefix.createJsonPropertyAssignment("compilerOptions", newCompilerOptions));
-                return defaultTypesDirectoryName;
-            }
-            var compilerOptions = compilerOptionsProperty.initializer;
-            if (!ts.isObjectLiteralExpression(compilerOptions))
-                return defaultTypesDirectoryName;
-            var baseUrl = getOrAddBaseUrl(changes, configFile, compilerOptions);
-            var typesDirectoryFromPathMapping = getOrAddPathMapping(changes, configFile, compilerOptions);
-            return ts.combinePaths(baseUrl, typesDirectoryFromPathMapping);
-        }
-        var defaultBaseUrl = ".";
-        function makeDefaultBaseUrl() {
-            return codefix.createJsonPropertyAssignment("baseUrl", ts.createStringLiteral(defaultBaseUrl));
-        }
-        function getOrAddBaseUrl(changes, tsconfig, compilerOptions) {
-            var baseUrlProp = codefix.findJsonProperty(compilerOptions, "baseUrl");
-            if (baseUrlProp) {
-                return ts.isStringLiteral(baseUrlProp.initializer) ? baseUrlProp.initializer.text : defaultBaseUrl;
-            }
-            else {
-                changes.insertNodeAtObjectStart(tsconfig, compilerOptions, makeDefaultBaseUrl());
-                return defaultBaseUrl;
-            }
-        }
-        var defaultTypesDirectoryName = "types";
-        function makeDefaultPathMapping() {
-            return codefix.createJsonPropertyAssignment("*", ts.createArrayLiteral([ts.createStringLiteral(defaultTypesDirectoryName + "/*")]));
-        }
-        function makeDefaultPaths() {
-            return codefix.createJsonPropertyAssignment("paths", ts.createObjectLiteral([makeDefaultPathMapping()]));
-        }
-        function getOrAddPathMapping(changes, tsconfig, compilerOptions) {
-            var paths = codefix.findJsonProperty(compilerOptions, "paths");
-            if (!paths || !ts.isObjectLiteralExpression(paths.initializer)) {
-                changes.insertNodeAtObjectStart(tsconfig, compilerOptions, makeDefaultPaths());
-                return defaultTypesDirectoryName;
-            }
-            // Look for an existing path mapping. Should look like `"*": "foo/*"`.
-            var existing = ts.firstDefined(paths.initializer.properties, function (prop) {
-                return ts.isPropertyAssignment(prop) && ts.isStringLiteral(prop.name) && prop.name.text === "*" && ts.isArrayLiteralExpression(prop.initializer)
-                    ? ts.firstDefined(prop.initializer.elements, function (value) { return ts.isStringLiteral(value) ? ts.tryRemoveSuffix(value.text, "/*") : undefined; })
-                    : undefined;
-            });
-            if (existing)
-                return existing;
-            changes.insertNodeAtObjectStart(tsconfig, paths.initializer, makeDefaultPathMapping());
-            return defaultTypesDirectoryName;
-        }
         function getInstallCommand(fileName, packageName) {
             return { type: "install package", file: fileName, packageName: packageName };
         }
@@ -114704,7 +118661,7 @@ var ts;
         }
         function getNodes(sourceFile, pos) {
             var token = ts.getTokenAtPosition(sourceFile, pos);
-            if (token.kind !== 100 /* ThisKeyword */)
+            if (token.kind !== 101 /* ThisKeyword */)
                 return undefined;
             var constructor = ts.getContainingFunction(token);
             var superCall = findSuperCall(constructor.body);
@@ -114743,7 +118700,7 @@ var ts;
         });
         function getNode(sourceFile, pos) {
             var token = ts.getTokenAtPosition(sourceFile, pos);
-            ts.Debug.assert(token.kind === 124 /* ConstructorKeyword */);
+            ts.Debug.assert(token.kind === 125 /* ConstructorKeyword */);
             return token.parent;
         }
         function doChange(changes, sourceFile, ctr) {
@@ -114759,7 +118716,7 @@ var ts;
     (function (codefix) {
         var fixId = "enableExperimentalDecorators";
         var errorCodes = [
-            ts.Diagnostics.Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_to_remove_this_warning.code
+            ts.Diagnostics.Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_in_your_tsconfig_or_jsconfig_to_remove_this_warning.code
         ];
         codefix.registerCodeFix({
             errorCodes: errorCodes,
@@ -114768,12 +118725,19 @@ var ts;
                 if (configFile === undefined) {
                     return undefined;
                 }
-                var changes = ts.textChanges.ChangeTracker.with(context, function (changeTracker) { return makeChange(changeTracker, configFile); });
+                var changes = ts.textChanges.ChangeTracker.with(context, function (changeTracker) { return doChange(changeTracker, configFile); });
                 return [codefix.createCodeFixActionNoFixId(fixId, changes, ts.Diagnostics.Enable_the_experimentalDecorators_option_in_your_configuration_file)];
             },
             fixIds: [fixId],
+            getAllCodeActions: function (context) { return codefix.codeFixAll(context, errorCodes, function (changes) {
+                var configFile = context.program.getCompilerOptions().configFile;
+                if (configFile === undefined) {
+                    return undefined;
+                }
+                doChange(changes, configFile);
+            }); },
         });
-        function makeChange(changeTracker, configFile) {
+        function doChange(changeTracker, configFile) {
             codefix.setJsonCompilerOptionValue(changeTracker, configFile, "experimentalDecorators", ts.createTrue());
         }
     })(codefix = ts.codefix || (ts.codefix = {}));
@@ -114807,14 +118771,14 @@ var ts;
             var token = ts.getTokenAtPosition(sourceFile, pos);
             var heritageClauses = ts.getContainingClass(token).heritageClauses;
             var extendsToken = heritageClauses[0].getFirstToken();
-            return extendsToken.kind === 86 /* ExtendsKeyword */ ? { extendsToken: extendsToken, heritageClauses: heritageClauses } : undefined;
+            return extendsToken.kind === 87 /* ExtendsKeyword */ ? { extendsToken: extendsToken, heritageClauses: heritageClauses } : undefined;
         }
         function doChanges(changes, sourceFile, extendsToken, heritageClauses) {
-            changes.replaceNode(sourceFile, extendsToken, ts.createToken(109 /* ImplementsKeyword */));
+            changes.replaceNode(sourceFile, extendsToken, ts.createToken(110 /* ImplementsKeyword */));
             // If there is already an implements clause, replace the implements keyword with a comma.
             if (heritageClauses.length === 2 &&
-                heritageClauses[0].token === 86 /* ExtendsKeyword */ &&
-                heritageClauses[1].token === 109 /* ImplementsKeyword */) {
+                heritageClauses[0].token === 87 /* ExtendsKeyword */ &&
+                heritageClauses[1].token === 110 /* ImplementsKeyword */) {
                 var implementsToken = heritageClauses[1].getFirstToken();
                 var implementsFullStart = implementsToken.getFullStart();
                 changes.replaceRange(sourceFile, { pos: implementsFullStart, end: implementsFullStart }, ts.createToken(27 /* CommaToken */));
@@ -114921,7 +118885,7 @@ var ts;
                     return [createDeleteFix(delVar, ts.Diagnostics.Remove_variable_statement)];
                 }
                 var result = [];
-                if (token.kind === 127 /* InferKeyword */) {
+                if (token.kind === 128 /* InferKeyword */) {
                     var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return changeInferToUnknown(t, sourceFile, token); });
                     var name = ts.cast(token.parent, ts.isInferTypeNode).typeParameter.name.text;
                     result.push(codefix.createCodeFixAction(fixName, changes, [ts.Diagnostics.Replace_infer_0_with_unknown, name], fixIdInfer, ts.Diagnostics.Replace_all_unused_infer_with_unknown));
@@ -114953,7 +118917,7 @@ var ts;
                             tryPrefixDeclaration(changes, diag.code, sourceFile, token);
                             break;
                         case fixIdDelete: {
-                            if (token.kind === 127 /* InferKeyword */)
+                            if (token.kind === 128 /* InferKeyword */)
                                 break; // Can't delete
                             var importDecl = tryGetFullImport(token);
                             if (importDecl) {
@@ -114972,7 +118936,7 @@ var ts;
                             break;
                         }
                         case fixIdInfer:
-                            if (token.kind === 127 /* InferKeyword */) {
+                            if (token.kind === 128 /* InferKeyword */) {
                                 changeInferToUnknown(changes, sourceFile, token);
                             }
                             break;
@@ -114983,7 +118947,7 @@ var ts;
             },
         });
         function changeInferToUnknown(changes, sourceFile, token) {
-            changes.replaceNode(sourceFile, token.parent, ts.createKeywordTypeNode(143 /* UnknownKeyword */));
+            changes.replaceNode(sourceFile, token.parent, ts.createKeywordTypeNode(144 /* UnknownKeyword */));
         }
         function createDeleteFix(changes, diag) {
             return codefix.createCodeFixAction(fixName, changes, diag, fixIdDelete, ts.Diagnostics.Delete_all_unused_declarations);
@@ -114993,13 +118957,13 @@ var ts;
         }
         // Sometimes the diagnostic span is an entire ImportDeclaration, so we should remove the whole thing.
         function tryGetFullImport(token) {
-            return token.kind === 92 /* ImportKeyword */ ? ts.tryCast(token.parent, ts.isImportDeclaration) : undefined;
+            return token.kind === 93 /* ImportKeyword */ ? ts.tryCast(token.parent, ts.isImportDeclaration) : undefined;
         }
         function tryDeleteFullDestructure(token, changes, sourceFile, checker, sourceFiles, isFixAll) {
             if (token.kind !== 18 /* OpenBraceToken */ || !ts.isObjectBindingPattern(token.parent))
                 return false;
             var decl = token.parent.parent;
-            if (decl.kind === 151 /* Parameter */) {
+            if (decl.kind === 152 /* Parameter */) {
                 tryDeleteParameter(changes, sourceFile, decl, checker, sourceFiles, isFixAll);
             }
             else {
@@ -115010,7 +118974,7 @@ var ts;
         function tryDeleteFullVariableStatement(sourceFile, token, changes) {
             var declarationList = ts.tryCast(token.parent, ts.isVariableDeclarationList);
             if (declarationList && declarationList.getChildren(sourceFile)[0] === token) {
-                changes.delete(sourceFile, declarationList.parent.kind === 219 /* VariableStatement */ ? declarationList.parent : declarationList);
+                changes.delete(sourceFile, declarationList.parent.kind === 220 /* VariableStatement */ ? declarationList.parent : declarationList);
                 return true;
             }
             return false;
@@ -115019,7 +118983,7 @@ var ts;
             // Don't offer to prefix a property.
             if (errorCode === ts.Diagnostics.Property_0_is_declared_but_its_value_is_never_read.code)
                 return;
-            if (token.kind === 127 /* InferKeyword */) {
+            if (token.kind === 128 /* InferKeyword */) {
                 token = ts.cast(token.parent, ts.isInferTypeNode).typeParameter.name;
             }
             if (ts.isIdentifier(token) && canPrefix(token)) {
@@ -115028,14 +118992,14 @@ var ts;
         }
         function canPrefix(token) {
             switch (token.parent.kind) {
-                case 151 /* Parameter */:
-                case 150 /* TypeParameter */:
+                case 152 /* Parameter */:
+                case 151 /* TypeParameter */:
                     return true;
-                case 237 /* VariableDeclaration */: {
+                case 238 /* VariableDeclaration */: {
                     var varDecl = token.parent;
                     switch (varDecl.parent.parent.kind) {
-                        case 227 /* ForOfStatement */:
-                        case 226 /* ForInStatement */:
+                        case 228 /* ForOfStatement */:
+                        case 227 /* ForInStatement */:
                             return true;
                     }
                 }
@@ -115082,26 +119046,26 @@ var ts;
         function mayDeleteParameter(p, checker, isFixAll) {
             var parent = p.parent;
             switch (parent.kind) {
-                case 156 /* MethodDeclaration */:
+                case 157 /* MethodDeclaration */:
                     // Don't remove a parameter if this overrides something.
                     var symbol = checker.getSymbolAtLocation(parent.name);
                     if (ts.isMemberSymbolInBaseType(symbol, checker))
                         return false;
                 // falls through
-                case 157 /* Constructor */:
-                case 239 /* FunctionDeclaration */:
+                case 158 /* Constructor */:
+                case 240 /* FunctionDeclaration */:
                     return true;
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */: {
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */: {
                     // Can't remove a non-last parameter in a callback. Can remove a parameter in code-fix-all if future parameters are also unused.
                     var parameters = parent.parameters;
                     var index = parameters.indexOf(p);
                     ts.Debug.assert(index !== -1);
                     return isFixAll
-                        ? parameters.slice(index + 1).every(function (p) { return p.name.kind === 72 /* Identifier */ && !p.symbol.isReferenced; })
+                        ? parameters.slice(index + 1).every(function (p) { return p.name.kind === 73 /* Identifier */ && !p.symbol.isReferenced; })
                         : index === parameters.length - 1;
                 }
-                case 159 /* SetAccessor */:
+                case 160 /* SetAccessor */:
                     // Setter must have a parameter
                     return false;
                 default:
@@ -115141,7 +119105,7 @@ var ts;
             var container = (ts.isBlock(statement.parent) ? statement.parent : statement).parent;
             if (!ts.isBlock(statement.parent) || statement === ts.first(statement.parent.statements)) {
                 switch (container.kind) {
-                    case 222 /* IfStatement */:
+                    case 223 /* IfStatement */:
                         if (container.elseStatement) {
                             if (ts.isBlock(statement.parent)) {
                                 break;
@@ -115152,15 +119116,15 @@ var ts;
                             return;
                         }
                     // falls through
-                    case 224 /* WhileStatement */:
-                    case 225 /* ForStatement */:
+                    case 225 /* WhileStatement */:
+                    case 226 /* ForStatement */:
                         changes.delete(sourceFile, container);
                         return;
                 }
             }
             if (ts.isBlock(statement.parent)) {
-                var end_2 = start + length;
-                var lastStatement = ts.Debug.assertDefined(lastWhere(ts.sliceAfter(statement.parent.statements, statement), function (s) { return s.pos < end_2; }));
+                var end_3 = start + length;
+                var lastStatement = ts.Debug.assertDefined(lastWhere(ts.sliceAfter(statement.parent.statements, statement), function (s) { return s.pos < end_3; }));
                 changes.deleteNodeRange(sourceFile, statement, lastStatement);
             }
             else {
@@ -115226,7 +119190,7 @@ var ts;
                 var typeNode = info.typeNode, type = info.type;
                 var original = typeNode.getText(sourceFile);
                 var actions = [fix(type, fixIdPlain, ts.Diagnostics.Change_all_jsdoc_style_types_to_TypeScript)];
-                if (typeNode.kind === 291 /* JSDocNullableType */) {
+                if (typeNode.kind === 292 /* JSDocNullableType */) {
                     // for nullable types, suggest the flow-compatible `T | null | undefined`
                     // in addition to the jsdoc/closure-compatible `T | null`
                     actions.push(fix(checker.getNullableType(type, 32768 /* Undefined */), fixIdNullable, ts.Diagnostics.Change_all_jsdoc_style_types_to_TypeScript_and_add_undefined_to_nullable_types));
@@ -115246,7 +119210,7 @@ var ts;
                     if (!info)
                         return;
                     var typeNode = info.typeNode, type = info.type;
-                    var fixedType = typeNode.kind === 291 /* JSDocNullableType */ && fixId === fixIdNullable ? checker.getNullableType(type, 32768 /* Undefined */) : type;
+                    var fixedType = typeNode.kind === 292 /* JSDocNullableType */ && fixId === fixIdNullable ? checker.getNullableType(type, 32768 /* Undefined */) : type;
                     doChange(changes, sourceFile, typeNode, fixedType, checker);
                 });
             }
@@ -115263,22 +119227,22 @@ var ts;
             // NOTE: Some locations are not handled yet:
             // MappedTypeNode.typeParameters and SignatureDeclaration.typeParameters, as well as CallExpression.typeArguments
             switch (node.kind) {
-                case 212 /* AsExpression */:
-                case 160 /* CallSignature */:
-                case 161 /* ConstructSignature */:
-                case 239 /* FunctionDeclaration */:
-                case 158 /* GetAccessor */:
-                case 162 /* IndexSignature */:
-                case 181 /* MappedType */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
-                case 151 /* Parameter */:
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
-                case 159 /* SetAccessor */:
-                case 242 /* TypeAliasDeclaration */:
-                case 194 /* TypeAssertionExpression */:
-                case 237 /* VariableDeclaration */:
+                case 213 /* AsExpression */:
+                case 161 /* CallSignature */:
+                case 162 /* ConstructSignature */:
+                case 240 /* FunctionDeclaration */:
+                case 159 /* GetAccessor */:
+                case 163 /* IndexSignature */:
+                case 182 /* MappedType */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
+                case 152 /* Parameter */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
+                case 160 /* SetAccessor */:
+                case 243 /* TypeAliasDeclaration */:
+                case 195 /* TypeAssertionExpression */:
+                case 238 /* VariableDeclaration */:
                     return true;
                 default:
                     return false;
@@ -115332,14 +119296,14 @@ var ts;
             }
             var insertBefore;
             switch (containingFunction.kind) {
-                case 156 /* MethodDeclaration */:
+                case 157 /* MethodDeclaration */:
                     insertBefore = containingFunction.name;
                     break;
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
-                    insertBefore = ts.findChildOfKind(containingFunction, 90 /* FunctionKeyword */, sourceFile);
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
+                    insertBefore = ts.findChildOfKind(containingFunction, 91 /* FunctionKeyword */, sourceFile);
                     break;
-                case 197 /* ArrowFunction */:
+                case 198 /* ArrowFunction */:
                     insertBefore = ts.findChildOfKind(containingFunction, 20 /* OpenParenToken */, sourceFile) || ts.first(containingFunction.parameters);
                     break;
                 default:
@@ -115354,11 +119318,11 @@ var ts;
             var insertBefore = _a.insertBefore, returnType = _a.returnType;
             if (returnType) {
                 var entityName = ts.getEntityNameFromTypeNode(returnType);
-                if (!entityName || entityName.kind !== 72 /* Identifier */ || entityName.text !== "Promise") {
+                if (!entityName || entityName.kind !== 73 /* Identifier */ || entityName.text !== "Promise") {
                     changes.replaceNode(sourceFile, returnType, ts.createTypeReferenceNode("Promise", ts.createNodeArray([returnType])));
                 }
             }
-            changes.insertModifierBefore(sourceFile, 121 /* AsyncKeyword */, insertBefore);
+            changes.insertModifierBefore(sourceFile, 122 /* AsyncKeyword */, insertBefore);
         }
     })(codefix = ts.codefix || (ts.codefix = {}));
 })(ts || (ts = {}));
@@ -115467,17 +119431,17 @@ var ts;
             var type = checker.getWidenedType(checker.getTypeOfSymbolAtLocation(symbol, enclosingDeclaration));
             var optional = !!(symbol.flags & 16777216 /* Optional */);
             switch (declaration.kind) {
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
-                case 153 /* PropertySignature */:
-                case 154 /* PropertyDeclaration */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
+                case 154 /* PropertySignature */:
+                case 155 /* PropertyDeclaration */:
                     var typeNode = checker.typeToTypeNode(type, enclosingDeclaration, /*flags*/ undefined, getNoopSymbolTrackerWithResolver(context));
                     out(ts.createProperty(
                     /*decorators*/ undefined, modifiers, name, optional ? ts.createToken(56 /* QuestionToken */) : undefined, typeNode, 
                     /*initializer*/ undefined));
                     break;
-                case 155 /* MethodSignature */:
-                case 156 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
+                case 157 /* MethodDeclaration */:
                     // The signature for the implementation appears as an entry in `signatures` iff
                     // there is only one signature.
                     // If there are overloads and an implementation signature, it appears as an
@@ -115518,7 +119482,7 @@ var ts;
         }
         function signatureToMethodDeclaration(context, signature, enclosingDeclaration, modifiers, name, optional, body) {
             var program = context.program;
-            var signatureDeclaration = program.getTypeChecker().signatureToSignatureDeclaration(signature, 156 /* MethodDeclaration */, enclosingDeclaration, 1 /* NoTruncation */ | 256 /* SuppressAnyReturnType */, getNoopSymbolTrackerWithResolver(context));
+            var signatureDeclaration = program.getTypeChecker().signatureToSignatureDeclaration(signature, 157 /* MethodDeclaration */, enclosingDeclaration, 1 /* NoTruncation */ | 256 /* SuppressAnyReturnType */, getNoopSymbolTrackerWithResolver(context));
             if (!signatureDeclaration) {
                 return undefined;
             }
@@ -115546,7 +119510,7 @@ var ts;
             var returnType = (inJs || !contextualType) ? undefined : checker.typeToTypeNode(contextualType, contextNode, /*flags*/ undefined, tracker);
             return ts.createMethod(
             /*decorators*/ undefined, 
-            /*modifiers*/ makeStatic ? [ts.createToken(116 /* StaticKeyword */)] : undefined, 
+            /*modifiers*/ makeStatic ? [ts.createToken(117 /* StaticKeyword */)] : undefined, 
             /*asteriskToken*/ ts.isYieldExpression(parent) ? ts.createToken(40 /* AsteriskToken */) : undefined, methodName, 
             /*questionToken*/ undefined, 
             /*typeParameters*/ inJs ? undefined : ts.map(typeArguments, function (_, i) {
@@ -115565,7 +119529,7 @@ var ts;
                 /*dotDotDotToken*/ undefined, 
                 /*name*/ names && names[i] || "arg" + i, 
                 /*questionToken*/ minArgumentCount !== undefined && i >= minArgumentCount ? ts.createToken(56 /* QuestionToken */) : undefined, 
-                /*type*/ inJs ? undefined : types && types[i] || ts.createKeywordTypeNode(120 /* AnyKeyword */), 
+                /*type*/ inJs ? undefined : types && types[i] || ts.createKeywordTypeNode(121 /* AnyKeyword */), 
                 /*initializer*/ undefined);
                 parameters.push(newParameter);
             }
@@ -115593,7 +119557,7 @@ var ts;
             var maxArgsParameterSymbolNames = maxArgsSignature.parameters.map(function (symbol) { return symbol.name; });
             var parameters = createDummyParameters(maxNonRestArgs, maxArgsParameterSymbolNames, /* types */ undefined, minArgumentCount, /*inJs*/ false);
             if (someSigHasRestParameter) {
-                var anyArrayType = ts.createArrayTypeNode(ts.createKeywordTypeNode(120 /* AnyKeyword */));
+                var anyArrayType = ts.createArrayTypeNode(ts.createKeywordTypeNode(121 /* AnyKeyword */));
                 var restParameter = ts.createParameter(
                 /*decorators*/ undefined, 
                 /*modifiers*/ undefined, ts.createToken(25 /* DotDotDotToken */), maxArgsParameterSymbolNames[maxNonRestArgs] || "rest", 
@@ -115619,10 +119583,10 @@ var ts;
         }
         function createVisibilityModifier(flags) {
             if (flags & 4 /* Public */) {
-                return ts.createToken(115 /* PublicKeyword */);
+                return ts.createToken(116 /* PublicKeyword */);
             }
             else if (flags & 16 /* Protected */) {
-                return ts.createToken(114 /* ProtectedKeyword */);
+                return ts.createToken(115 /* ProtectedKeyword */);
             }
             return undefined;
         }
@@ -115687,15 +119651,15 @@ var ts;
         }
         codefix.registerCodeFix({
             errorCodes: [
-                ts.Diagnostics.Cannot_invoke_an_expression_whose_type_lacks_a_call_signature_Type_0_has_no_compatible_call_signatures.code,
-                ts.Diagnostics.Cannot_use_new_with_an_expression_whose_type_lacks_a_call_or_construct_signature.code,
+                ts.Diagnostics.This_expression_is_not_callable.code,
+                ts.Diagnostics.This_expression_is_not_constructable.code,
             ],
             getCodeActions: getActionsForUsageOfInvalidImport
         });
         function getActionsForUsageOfInvalidImport(context) {
             var sourceFile = context.sourceFile;
-            var targetKind = ts.Diagnostics.Cannot_invoke_an_expression_whose_type_lacks_a_call_signature_Type_0_has_no_compatible_call_signatures.code === context.errorCode ? 191 /* CallExpression */ : 192 /* NewExpression */;
-            var node = ts.findAncestor(ts.getTokenAtPosition(sourceFile, context.span.start), function (a) { return a.kind === targetKind && a.getStart() === context.span.start && a.getEnd() === (context.span.start + context.span.length); });
+            var targetKind = ts.Diagnostics.This_expression_is_not_callable.code === context.errorCode ? 192 /* CallExpression */ : 193 /* NewExpression */;
+            var node = ts.findAncestor(ts.getTokenAtPosition(sourceFile, context.span.start), function (a) { return a.kind === targetKind; });
             if (!node) {
                 return [];
             }
@@ -115813,7 +119777,7 @@ var ts;
             return codefix.createCodeFixAction(fixName, changes, [ts.Diagnostics.Add_undefined_type_to_property_0, propertyDeclaration.name.getText()], fixIdAddUndefinedType, ts.Diagnostics.Add_undefined_type_to_all_uninitialized_properties);
         }
         function addUndefinedType(changeTracker, propertyDeclarationSourceFile, propertyDeclaration) {
-            var undefinedTypeNode = ts.createKeywordTypeNode(141 /* UndefinedKeyword */);
+            var undefinedTypeNode = ts.createKeywordTypeNode(142 /* UndefinedKeyword */);
             var type = propertyDeclaration.type; // TODO: GH#18217
             var types = ts.isUnionTypeNode(type) ? type.types.concat(undefinedTypeNode) : [type, undefinedTypeNode];
             changeTracker.replaceNode(propertyDeclarationSourceFile, type, ts.createUnionTypeNode(types));
@@ -115859,235 +119823,6 @@ var ts;
         }
     })(codefix = ts.codefix || (ts.codefix = {}));
 })(ts || (ts = {}));
-var ts;
-(function (ts) {
-    function generateTypesForModule(name, moduleValue, formatSettings) {
-        return generateTypesForModuleOrGlobal(name, moduleValue, formatSettings, 0 /* ExportEquals */);
-    }
-    ts.generateTypesForModule = generateTypesForModule;
-    function generateTypesForGlobal(name, globalValue, formatSettings) {
-        return generateTypesForModuleOrGlobal(name, globalValue, formatSettings, 3 /* Global */);
-    }
-    ts.generateTypesForGlobal = generateTypesForGlobal;
-    function generateTypesForModuleOrGlobal(name, globalValue, formatSettings, outputKind) {
-        return valueInfoToDeclarationFileText(ts.inspectValue(name, globalValue), formatSettings, outputKind);
-    }
-    /* @internal */
-    function valueInfoToDeclarationFileText(valueInfo, formatSettings, outputKind) {
-        if (outputKind === void 0) { outputKind = 0 /* ExportEquals */; }
-        return ts.textChanges.getNewFileText(toStatements(valueInfo, outputKind), 3 /* TS */, formatSettings.newLineCharacter || "\n", ts.formatting.getFormatContext(formatSettings));
-    }
-    ts.valueInfoToDeclarationFileText = valueInfoToDeclarationFileText;
-    /* @internal */
-    var OutputKind;
-    (function (OutputKind) {
-        OutputKind[OutputKind["ExportEquals"] = 0] = "ExportEquals";
-        OutputKind[OutputKind["NamedExport"] = 1] = "NamedExport";
-        OutputKind[OutputKind["NamespaceMember"] = 2] = "NamespaceMember";
-        OutputKind[OutputKind["Global"] = 3] = "Global";
-    })(OutputKind || (OutputKind = {}));
-    function toNamespaceMemberStatements(info) {
-        return toStatements(info, 2 /* NamespaceMember */);
-    }
-    function toStatements(info, kind) {
-        var isDefault = info.name === "default" /* Default */;
-        var name = isDefault ? "_default" : info.name;
-        if (!isValidIdentifier(name) || isDefault && kind !== 1 /* NamedExport */)
-            return ts.emptyArray;
-        var modifiers = isDefault && info.kind === 2 /* FunctionOrClass */ ? [ts.createModifier(85 /* ExportKeyword */), ts.createModifier(80 /* DefaultKeyword */)]
-            : kind === 3 /* Global */ || kind === 0 /* ExportEquals */ ? [ts.createModifier(125 /* DeclareKeyword */)]
-                : kind === 1 /* NamedExport */ ? [ts.createModifier(85 /* ExportKeyword */)]
-                    : undefined;
-        var exportEquals = function () { return kind === 0 /* ExportEquals */ ? [exportEqualsOrDefault(info.name, /*isExportEquals*/ true)] : ts.emptyArray; };
-        var exportDefault = function () { return isDefault ? [exportEqualsOrDefault("_default", /*isExportEquals*/ false)] : ts.emptyArray; };
-        switch (info.kind) {
-            case 2 /* FunctionOrClass */:
-                return exportEquals().concat(functionOrClassToStatements(modifiers, name, info));
-            case 3 /* Object */:
-                var members = info.members, hasNontrivialPrototype = info.hasNontrivialPrototype;
-                if (!hasNontrivialPrototype) {
-                    if (kind === 0 /* ExportEquals */) {
-                        return ts.flatMap(members, function (v) { return toStatements(v, 1 /* NamedExport */); });
-                    }
-                    if (members.some(function (m) { return m.kind === 2 /* FunctionOrClass */; })) {
-                        // If some member is a function, use a namespace so it gets a FunctionDeclaration or ClassDeclaration.
-                        return exportDefault().concat([createNamespace(modifiers, name, ts.flatMap(members, toNamespaceMemberStatements))]);
-                    }
-                }
-            // falls through
-            case 0 /* Const */:
-            case 1 /* Array */: {
-                var comment = info.kind === 0 /* Const */ ? info.comment : undefined;
-                var constVar = ts.createVariableStatement(modifiers, ts.createVariableDeclarationList([ts.createVariableDeclaration(name, toType(info))], 2 /* Const */));
-                return exportEquals().concat(exportDefault(), [addComment(constVar, comment)]);
-            }
-            default:
-                return ts.Debug.assertNever(info);
-        }
-    }
-    function exportEqualsOrDefault(name, isExportEquals) {
-        return ts.createExportAssignment(/*decorators*/ undefined, /*modifiers*/ undefined, isExportEquals, ts.createIdentifier(name));
-    }
-    function functionOrClassToStatements(modifiers, name, _a) {
-        var source = _a.source, prototypeMembers = _a.prototypeMembers, namespaceMembers = _a.namespaceMembers;
-        var fnAst = parseClassOrFunctionBody(source);
-        var _b = fnAst === undefined ? { parameters: ts.emptyArray, returnType: anyType() } : getParametersAndReturnType(fnAst), parameters = _b.parameters, returnType = _b.returnType;
-        var protoOrInstanceMembers = ts.createMap();
-        if (typeof fnAst === "object")
-            getConstructorFunctionInstanceProperties(fnAst, protoOrInstanceMembers);
-        for (var _i = 0, prototypeMembers_1 = prototypeMembers; _i < prototypeMembers_1.length; _i++) {
-            var p = prototypeMembers_1[_i];
-            // ignore non-functions on the prototype
-            if (p.kind === 2 /* FunctionOrClass */) {
-                var m = tryGetMethod(p);
-                if (m) {
-                    protoOrInstanceMembers.set(p.name, m);
-                }
-            }
-        }
-        var classStaticMembers = protoOrInstanceMembers.size !== 0 || fnAst === undefined || typeof fnAst !== "number" && fnAst.kind === 157 /* Constructor */ ? [] : undefined;
-        var namespaceStatements = ts.flatMap(namespaceMembers, function (info) {
-            if (!isValidIdentifier(info.name))
-                return undefined;
-            if (classStaticMembers) {
-                switch (info.kind) {
-                    case 3 /* Object */:
-                        if (info.members.some(function (m) { return m.kind === 2 /* FunctionOrClass */; })) {
-                            break;
-                        }
-                    // falls through
-                    case 1 /* Array */:
-                    case 0 /* Const */:
-                        classStaticMembers.push(addComment(ts.createProperty(/*decorators*/ undefined, [ts.createModifier(116 /* StaticKeyword */)], info.name, /*questionOrExclamationToken*/ undefined, toType(info), /*initializer*/ undefined), info.kind === 0 /* Const */ ? info.comment : undefined));
-                        return undefined;
-                    case 2 /* FunctionOrClass */:
-                        if (!info.namespaceMembers.length) { // Else, can't merge a static method with a namespace. Must make it a function on the namespace.
-                            var sig = tryGetMethod(info, [ts.createModifier(116 /* StaticKeyword */)]);
-                            if (sig) {
-                                classStaticMembers.push(sig);
-                                return undefined;
-                            }
-                        }
-                        break;
-                    default:
-                        ts.Debug.assertNever(info);
-                }
-            }
-            return toStatements(info, 2 /* NamespaceMember */);
-        });
-        var decl = classStaticMembers
-            ? ts.createClassDeclaration(
-            /*decorators*/ undefined, modifiers, name, 
-            /*typeParameters*/ undefined, 
-            /*heritageClauses*/ undefined, classStaticMembers.concat((parameters.length ? [ts.createConstructor(/*decorators*/ undefined, /*modifiers*/ undefined, parameters, /*body*/ undefined)] : ts.emptyArray), ts.arrayFrom(protoOrInstanceMembers.values())))
-            : ts.createFunctionDeclaration(/*decorators*/ undefined, modifiers, /*asteriskToken*/ undefined, name, /*typeParameters*/ undefined, parameters, returnType, /*body*/ undefined);
-        return [decl].concat((namespaceStatements.length === 0 ? ts.emptyArray : [createNamespace(modifiers && modifiers.map(function (m) { return ts.getSynthesizedDeepClone(m); }), name, namespaceStatements)]));
-    }
-    function tryGetMethod(_a, modifiers) {
-        var name = _a.name, source = _a.source;
-        if (!isValidIdentifier(name))
-            return undefined;
-        var fnAst = parseClassOrFunctionBody(source);
-        if (fnAst === undefined || (typeof fnAst !== "number" && fnAst.kind === 157 /* Constructor */))
-            return undefined;
-        var sig = getParametersAndReturnType(fnAst);
-        return sig && ts.createMethod(
-        /*decorators*/ undefined, modifiers, 
-        /*asteriskToken*/ undefined, name, 
-        /*questionToken*/ undefined, 
-        /*typeParameters*/ undefined, sig.parameters, sig.returnType, 
-        /*body*/ undefined);
-    }
-    function toType(info) {
-        switch (info.kind) {
-            case 0 /* Const */:
-                return ts.createTypeReferenceNode(info.typeName, /*typeArguments*/ undefined);
-            case 1 /* Array */:
-                return ts.createArrayTypeNode(toType(info.inner));
-            case 2 /* FunctionOrClass */:
-                return ts.createTypeReferenceNode("Function", /*typeArguments*/ undefined); // Normally we create a FunctionDeclaration, but this can happen for a function in an array.
-            case 3 /* Object */:
-                return ts.createTypeLiteralNode(info.members.map(function (m) { return ts.createPropertySignature(/*modifiers*/ undefined, toPropertyName(m.name), /*questionToken*/ undefined, toType(m), /*initializer*/ undefined); }));
-            default:
-                return ts.Debug.assertNever(info);
-        }
-    }
-    function toPropertyName(name) {
-        return ts.isIdentifierText(name, 7 /* ESNext */) ? ts.createIdentifier(name) : ts.createStringLiteral(name);
-    }
-    // Parses assignments to "this.x" in the constructor into class property declarations
-    function getConstructorFunctionInstanceProperties(fnAst, members) {
-        forEachOwnNodeOfFunction(fnAst, function (node) {
-            if (ts.isAssignmentExpression(node, /*excludeCompoundAssignment*/ true) &&
-                ts.isPropertyAccessExpression(node.left) && node.left.expression.kind === 100 /* ThisKeyword */) {
-                var name_4 = node.left.name.text;
-                if (!ts.isJsPrivate(name_4)) {
-                    ts.getOrUpdate(members, name_4, function () { return ts.createProperty(/*decorators*/ undefined, /*modifiers*/ undefined, name_4, /*questionOrExclamationToken*/ undefined, anyType(), /*initializer*/ undefined); });
-                }
-            }
-        });
-    }
-    function getParametersAndReturnType(fnAst) {
-        if (typeof fnAst === "number") {
-            return { parameters: ts.fill(fnAst, function (i) { return makeParameter("p" + i, anyType()); }), returnType: anyType() };
-        }
-        var usedArguments = false, hasReturn = false;
-        forEachOwnNodeOfFunction(fnAst, function (node) {
-            usedArguments = usedArguments || ts.isIdentifier(node) && node.text === "arguments";
-            hasReturn = hasReturn || ts.isReturnStatement(node) && !!node.expression && node.expression.kind !== 200 /* VoidExpression */;
-        });
-        var parameters = fnAst.parameters.map(function (p) { return makeParameter("" + p.name.getText(), inferParameterType(fnAst, p)); }).concat((usedArguments ? [makeRestParameter()] : ts.emptyArray));
-        return { parameters: parameters, returnType: hasReturn ? anyType() : ts.createKeywordTypeNode(106 /* VoidKeyword */) };
-    }
-    function makeParameter(name, type) {
-        return ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, name, /*questionToken*/ undefined, type);
-    }
-    function makeRestParameter() {
-        return ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, ts.createToken(25 /* DotDotDotToken */), "args", /*questionToken*/ undefined, ts.createArrayTypeNode(anyType()));
-    }
-    /** Returns 'undefined' for class with no declared constructor */
-    function parseClassOrFunctionBody(source) {
-        if (typeof source === "number")
-            return source;
-        var classOrFunction = ts.tryCast(parseExpression(source), function (node) { return ts.isFunctionExpression(node) || ts.isArrowFunction(node) || ts.isClassExpression(node); });
-        return classOrFunction
-            ? ts.isClassExpression(classOrFunction) ? ts.find(classOrFunction.members, ts.isConstructorDeclaration) : classOrFunction
-            // If that didn't parse, it's a method `m() {}`. Parse again inside of an object literal.
-            : ts.cast(ts.first(ts.cast(parseExpression("{ " + source + " }"), ts.isObjectLiteralExpression).properties), ts.isMethodDeclaration);
-    }
-    function parseExpression(expr) {
-        var text = "const _ = " + expr;
-        var srcFile = ts.createSourceFile("test.ts", text, 7 /* Latest */, /*setParentNodes*/ true);
-        return ts.first(ts.cast(ts.first(srcFile.statements), ts.isVariableStatement).declarationList.declarations).initializer;
-    }
-    function inferParameterType(_fn, _param) {
-        // TODO: Inspect function body for clues (see inferFromUsage.ts)
-        return anyType();
-    }
-    // Descends through all nodes in a function, but not in nested functions.
-    function forEachOwnNodeOfFunction(fnAst, cb) {
-        fnAst.body.forEachChild(function recur(node) {
-            cb(node);
-            if (!ts.isFunctionLike(node))
-                node.forEachChild(recur);
-        });
-    }
-    function isValidIdentifier(name) {
-        var keyword = ts.stringToToken(name);
-        return !(keyword && ts.isNonContextualKeyword(keyword)) && ts.isIdentifierText(name, 7 /* ESNext */);
-    }
-    function addComment(node, comment) {
-        if (comment !== undefined)
-            ts.addSyntheticLeadingComment(node, 2 /* SingleLineCommentTrivia */, comment);
-        return node;
-    }
-    function anyType() {
-        return ts.createKeywordTypeNode(120 /* AnyKeyword */);
-    }
-    function createNamespace(modifiers, name, statements) {
-        return ts.createModuleDeclaration(/*decorators*/ undefined, modifiers, ts.createIdentifier(name), ts.createModuleBlock(statements), 16 /* Namespace */);
-    }
-})(ts || (ts = {}));
 /* @internal */
 var ts;
 (function (ts) {
@@ -116184,8 +119919,8 @@ var ts;
         });
         function getImportTypeNode(sourceFile, pos) {
             var token = ts.getTokenAtPosition(sourceFile, pos);
-            ts.Debug.assert(token.kind === 92 /* ImportKeyword */);
-            ts.Debug.assert(token.parent.kind === 183 /* ImportType */);
+            ts.Debug.assert(token.kind === 93 /* ImportKeyword */);
+            ts.Debug.assert(token.parent.kind === 184 /* ImportType */);
             return token.parent;
         }
         function doChange(changes, sourceFile, importType) {
@@ -116237,7 +119972,7 @@ var ts;
             var otherMembers = members.filter(function (member) { return !ts.isIndexSignatureDeclaration(member); });
             var parameter = ts.first(indexSignature.parameters);
             var mappedTypeParameter = ts.createTypeParameterDeclaration(ts.cast(parameter.name, ts.isIdentifier), parameter.type);
-            var mappedIntersectionType = ts.createMappedTypeNode(ts.hasReadonlyModifier(indexSignature) ? ts.createModifier(133 /* ReadonlyKeyword */) : undefined, mappedTypeParameter, indexSignature.questionToken, indexSignature.type);
+            var mappedIntersectionType = ts.createMappedTypeNode(ts.hasReadonlyModifier(indexSignature) ? ts.createModifier(134 /* ReadonlyKeyword */) : undefined, mappedTypeParameter, indexSignature.questionToken, indexSignature.type);
             var intersectionType = ts.createIntersectionTypeNode(ts.getAllSuperTypeNodes(container).concat([
                 mappedIntersectionType
             ], (otherMembers.length ? [ts.createTypeLiteralNode(otherMembers)] : ts.emptyArray)));
@@ -116247,6 +119982,49 @@ var ts;
 })(ts || (ts = {}));
 /* @internal */
 var ts;
+(function (ts) {
+    var codefix;
+    (function (codefix) {
+        var fixId = "removeUnnecessaryAwait";
+        var errorCodes = [
+            ts.Diagnostics.await_has_no_effect_on_the_type_of_this_expression.code,
+        ];
+        codefix.registerCodeFix({
+            errorCodes: errorCodes,
+            getCodeActions: function (context) {
+                var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return makeChange(t, context.sourceFile, context.span); });
+                if (changes.length > 0) {
+                    return [codefix.createCodeFixAction(fixId, changes, ts.Diagnostics.Remove_unnecessary_await, fixId, ts.Diagnostics.Remove_all_unnecessary_uses_of_await)];
+                }
+            },
+            fixIds: [fixId],
+            getAllCodeActions: function (context) {
+                return codefix.codeFixAll(context, errorCodes, function (changes, diag) { return makeChange(changes, diag.file, diag); });
+            },
+        });
+        function makeChange(changeTracker, sourceFile, span) {
+            var awaitKeyword = ts.tryCast(ts.getTokenAtPosition(sourceFile, span.start), function (node) { return node.kind === 123 /* AwaitKeyword */; });
+            var awaitExpression = awaitKeyword && ts.tryCast(awaitKeyword.parent, ts.isAwaitExpression);
+            if (!awaitExpression) {
+                return;
+            }
+            var expressionToReplace = awaitExpression;
+            var hasSurroundingParens = ts.isParenthesizedExpression(awaitExpression.parent);
+            if (hasSurroundingParens) {
+                var leftMostExpression = ts.getLeftmostExpression(awaitExpression.expression, /*stopAtCallExpressions*/ false);
+                if (ts.isIdentifier(leftMostExpression)) {
+                    var precedingToken = ts.findPrecedingToken(awaitExpression.parent.pos, sourceFile);
+                    if (precedingToken && precedingToken.kind !== 96 /* NewKeyword */) {
+                        expressionToReplace = awaitExpression.parent;
+                    }
+                }
+            }
+            changeTracker.replaceNode(sourceFile, expressionToReplace, awaitExpression.expression);
+        }
+    })(codefix = ts.codefix || (ts.codefix = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
 (function (ts) {
     var refactor;
     (function (refactor) {
@@ -116284,16 +120062,16 @@ var ts;
                 return undefined;
             }
             switch (exportNode.kind) {
-                case 239 /* FunctionDeclaration */:
-                case 240 /* ClassDeclaration */:
-                case 241 /* InterfaceDeclaration */:
-                case 243 /* EnumDeclaration */:
-                case 242 /* TypeAliasDeclaration */:
-                case 244 /* ModuleDeclaration */: {
+                case 240 /* FunctionDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 242 /* InterfaceDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
+                case 245 /* ModuleDeclaration */: {
                     var node = exportNode;
                     return node.name && ts.isIdentifier(node.name) ? { exportNode: node, exportName: node.name, wasDefault: wasDefault, exportingModuleSymbol: exportingModuleSymbol } : undefined;
                 }
-                case 219 /* VariableStatement */: {
+                case 220 /* VariableStatement */: {
                     var vs = exportNode;
                     // Must be `export const x = something;`.
                     if (!(vs.declarationList.flags & 2 /* Const */) || vs.declarationList.declarations.length !== 1) {
@@ -116316,17 +120094,17 @@ var ts;
         function changeExport(exportingSourceFile, _a, changes, checker) {
             var wasDefault = _a.wasDefault, exportNode = _a.exportNode, exportName = _a.exportName;
             if (wasDefault) {
-                changes.delete(exportingSourceFile, ts.Debug.assertDefined(ts.findModifier(exportNode, 80 /* DefaultKeyword */)));
+                changes.delete(exportingSourceFile, ts.Debug.assertDefined(ts.findModifier(exportNode, 81 /* DefaultKeyword */)));
             }
             else {
-                var exportKeyword = ts.Debug.assertDefined(ts.findModifier(exportNode, 85 /* ExportKeyword */));
+                var exportKeyword = ts.Debug.assertDefined(ts.findModifier(exportNode, 86 /* ExportKeyword */));
                 switch (exportNode.kind) {
-                    case 239 /* FunctionDeclaration */:
-                    case 240 /* ClassDeclaration */:
-                    case 241 /* InterfaceDeclaration */:
-                        changes.insertNodeAfter(exportingSourceFile, exportKeyword, ts.createToken(80 /* DefaultKeyword */));
+                    case 240 /* FunctionDeclaration */:
+                    case 241 /* ClassDeclaration */:
+                    case 242 /* InterfaceDeclaration */:
+                        changes.insertNodeAfter(exportingSourceFile, exportKeyword, ts.createToken(81 /* DefaultKeyword */));
                         break;
-                    case 219 /* VariableStatement */:
+                    case 220 /* VariableStatement */:
                         // If 'x' isn't used in this file, `export const x = 0;` --> `export default 0;`
                         if (!ts.FindAllReferences.Core.isSymbolReferencedInFile(exportName, checker, exportingSourceFile)) {
                             // We checked in `getInfo` that an initializer exists.
@@ -116334,9 +120112,9 @@ var ts;
                             break;
                         }
                     // falls through
-                    case 243 /* EnumDeclaration */:
-                    case 242 /* TypeAliasDeclaration */:
-                    case 244 /* ModuleDeclaration */:
+                    case 244 /* EnumDeclaration */:
+                    case 243 /* TypeAliasDeclaration */:
+                    case 245 /* ModuleDeclaration */:
                         // `export type T = number;` -> `type T = number; export default T;`
                         changes.deleteModifier(exportingSourceFile, exportKeyword);
                         changes.insertNodeAfter(exportingSourceFile, exportNode, ts.createExportDefault(ts.createIdentifier(exportName.text)));
@@ -116363,18 +120141,18 @@ var ts;
         function changeDefaultToNamedImport(importingSourceFile, ref, changes, exportName) {
             var parent = ref.parent;
             switch (parent.kind) {
-                case 189 /* PropertyAccessExpression */:
+                case 190 /* PropertyAccessExpression */:
                     // `a.default` --> `a.foo`
                     changes.replaceNode(importingSourceFile, ref, ts.createIdentifier(exportName));
                     break;
-                case 253 /* ImportSpecifier */:
-                case 257 /* ExportSpecifier */: {
+                case 254 /* ImportSpecifier */:
+                case 258 /* ExportSpecifier */: {
                     var spec = parent;
                     // `default as foo` --> `foo`, `default as bar` --> `foo as bar`
                     changes.replaceNode(importingSourceFile, spec, makeImportSpecifier(exportName, spec.name.text));
                     break;
                 }
-                case 250 /* ImportClause */: {
+                case 251 /* ImportClause */: {
                     var clause = parent;
                     ts.Debug.assert(clause.name === ref);
                     var spec = makeImportSpecifier(exportName, ref.text);
@@ -116383,7 +120161,7 @@ var ts;
                         // `import foo from "./a";` --> `import { foo } from "./a";`
                         changes.replaceNode(importingSourceFile, ref, ts.createNamedImports([spec]));
                     }
-                    else if (namedBindings.kind === 251 /* NamespaceImport */) {
+                    else if (namedBindings.kind === 252 /* NamespaceImport */) {
                         // `import foo, * as a from "./a";` --> `import * as a from ".a/"; import { foo } from "./a";`
                         changes.deleteRange(importingSourceFile, { pos: ref.getStart(importingSourceFile), end: namedBindings.getStart(importingSourceFile) });
                         var quotePreference = ts.isStringLiteral(clause.parent.moduleSpecifier) ? ts.quotePreferenceFromString(clause.parent.moduleSpecifier, importingSourceFile) : 1 /* Double */;
@@ -116404,11 +120182,11 @@ var ts;
         function changeNamedToDefaultImport(importingSourceFile, ref, changes) {
             var parent = ref.parent;
             switch (parent.kind) {
-                case 189 /* PropertyAccessExpression */:
+                case 190 /* PropertyAccessExpression */:
                     // `a.foo` --> `a.default`
                     changes.replaceNode(importingSourceFile, ref, ts.createIdentifier("default"));
                     break;
-                case 253 /* ImportSpecifier */: {
+                case 254 /* ImportSpecifier */: {
                     // `import { foo } from "./a";` --> `import foo from "./a";`
                     // `import { foo as bar } from "./a";` --> `import bar from "./a";`
                     var defaultImport = ts.createIdentifier(parent.name.text);
@@ -116421,7 +120199,7 @@ var ts;
                     }
                     break;
                 }
-                case 257 /* ExportSpecifier */: {
+                case 258 /* ExportSpecifier */: {
                     // `export { foo } from "./a";` --> `export { default as foo } from "./a";`
                     // `export { foo as bar } from "./a";` --> `export { default as bar } from "./a";`
                     // `export { foo as default } from "./a";` --> `export { default } from "./a";`
@@ -116454,8 +120232,8 @@ var ts;
                 var i = getImportToConvert(context);
                 if (!i)
                     return ts.emptyArray;
-                var description = i.kind === 251 /* NamespaceImport */ ? ts.Diagnostics.Convert_namespace_import_to_named_imports.message : ts.Diagnostics.Convert_named_imports_to_namespace_import.message;
-                var actionName = i.kind === 251 /* NamespaceImport */ ? actionNameNamespaceToNamed : actionNameNamedToNamespace;
+                var description = i.kind === 252 /* NamespaceImport */ ? ts.Diagnostics.Convert_namespace_import_to_named_imports.message : ts.Diagnostics.Convert_named_imports_to_namespace_import.message;
+                var actionName = i.kind === 252 /* NamespaceImport */ ? actionNameNamespaceToNamed : actionNameNamedToNamespace;
                 return [{ name: refactorName, description: description, actions: [{ name: actionName, description: description }] }];
             },
             getEditsForAction: function (context, actionName) {
@@ -116477,7 +120255,7 @@ var ts;
         }
         function doChange(sourceFile, program, changes, toConvert) {
             var checker = program.getTypeChecker();
-            if (toConvert.kind === 251 /* NamespaceImport */) {
+            if (toConvert.kind === 252 /* NamespaceImport */) {
                 doChangeNamespaceToNamed(sourceFile, checker, changes, toConvert, ts.getAllowSyntheticDefaultImports(program.getCompilerOptions()));
             }
             else {
@@ -116529,7 +120307,7 @@ var ts;
         function doChangeNamedToNamespace(sourceFile, checker, changes, toConvert) {
             var importDecl = toConvert.parent.parent;
             var moduleSpecifier = importDecl.moduleSpecifier;
-            var preferredName = moduleSpecifier && ts.isStringLiteral(moduleSpecifier) ? ts.codefix.moduleSpecifierToValidIdentifier(moduleSpecifier.text, 7 /* ESNext */) : "module";
+            var preferredName = moduleSpecifier && ts.isStringLiteral(moduleSpecifier) ? ts.codefix.moduleSpecifierToValidIdentifier(moduleSpecifier.text, 99 /* ESNext */) : "module";
             var namespaceNameConflicts = toConvert.elements.some(function (element) {
                 return ts.FindAllReferences.Core.eachSymbolReferenceInFile(element.name, checker, sourceFile, function (id) {
                     return !!checker.resolveName(preferredName, id, 67108863 /* All */, /*excludeGlobals*/ true);
@@ -116820,20 +120598,20 @@ var ts;
                 function checkForStaticContext(nodeToCheck, containingClass) {
                     var current = nodeToCheck;
                     while (current !== containingClass) {
-                        if (current.kind === 154 /* PropertyDeclaration */) {
+                        if (current.kind === 155 /* PropertyDeclaration */) {
                             if (ts.hasModifier(current, 32 /* Static */)) {
                                 rangeFacts |= RangeFacts.InStaticRegion;
                             }
                             break;
                         }
-                        else if (current.kind === 151 /* Parameter */) {
+                        else if (current.kind === 152 /* Parameter */) {
                             var ctorOrMethod = ts.getContainingFunction(current);
-                            if (ctorOrMethod.kind === 157 /* Constructor */) {
+                            if (ctorOrMethod.kind === 158 /* Constructor */) {
                                 rangeFacts |= RangeFacts.InStaticRegion;
                             }
                             break;
                         }
-                        else if (current.kind === 156 /* MethodDeclaration */) {
+                        else if (current.kind === 157 /* MethodDeclaration */) {
                             if (ts.hasModifier(current, 32 /* Static */)) {
                                 rangeFacts |= RangeFacts.InStaticRegion;
                             }
@@ -116876,7 +120654,7 @@ var ts;
                             return true;
                         }
                         if (ts.isDeclaration(node)) {
-                            var declaringNode = (node.kind === 237 /* VariableDeclaration */) ? node.parent.parent : node;
+                            var declaringNode = (node.kind === 238 /* VariableDeclaration */) ? node.parent.parent : node;
                             if (ts.hasModifier(declaringNode, 1 /* Export */)) {
                                 // TODO: GH#18217 Silly to use `errors ||` since it's definitely not defined (see top of `visit`)
                                 // Also, if we're only pushing one error, just use `let error: Diagnostic | undefined`!
@@ -116888,13 +120666,13 @@ var ts;
                         }
                         // Some things can't be extracted in certain situations
                         switch (node.kind) {
-                            case 249 /* ImportDeclaration */:
+                            case 250 /* ImportDeclaration */:
                                 (errors || (errors = [])).push(ts.createDiagnosticForNode(node, Messages.cannotExtractImport));
                                 return true;
-                            case 98 /* SuperKeyword */:
+                            case 99 /* SuperKeyword */:
                                 // For a super *constructor call*, we have to be extracting the entire class,
                                 // but a super *method call* simply implies a 'this' reference
-                                if (node.parent.kind === 191 /* CallExpression */) {
+                                if (node.parent.kind === 192 /* CallExpression */) {
                                     // Super constructor call
                                     var containingClass_1 = ts.getContainingClass(node); // TODO:GH#18217
                                     if (containingClass_1.pos < span.start || containingClass_1.end >= (span.start + span.length)) {
@@ -116909,8 +120687,8 @@ var ts;
                         }
                         if (ts.isFunctionLikeDeclaration(node) || ts.isClassLike(node)) {
                             switch (node.kind) {
-                                case 239 /* FunctionDeclaration */:
-                                case 240 /* ClassDeclaration */:
+                                case 240 /* FunctionDeclaration */:
+                                case 241 /* ClassDeclaration */:
                                     if (ts.isSourceFile(node.parent) && node.parent.externalModuleIndicator === undefined) {
                                         // You cannot extract global declarations
                                         (errors || (errors = [])).push(ts.createDiagnosticForNode(node, Messages.functionWillNotBeVisibleInTheNewScope));
@@ -116922,20 +120700,20 @@ var ts;
                         }
                         var savedPermittedJumps = permittedJumps;
                         switch (node.kind) {
-                            case 222 /* IfStatement */:
+                            case 223 /* IfStatement */:
                                 permittedJumps = 0 /* None */;
                                 break;
-                            case 235 /* TryStatement */:
+                            case 236 /* TryStatement */:
                                 // forbid all jumps inside try blocks
                                 permittedJumps = 0 /* None */;
                                 break;
-                            case 218 /* Block */:
-                                if (node.parent && node.parent.kind === 235 /* TryStatement */ && node.parent.finallyBlock === node) {
+                            case 219 /* Block */:
+                                if (node.parent && node.parent.kind === 236 /* TryStatement */ && node.parent.finallyBlock === node) {
                                     // allow unconditional returns from finally blocks
                                     permittedJumps = 4 /* Return */;
                                 }
                                 break;
-                            case 271 /* CaseClause */:
+                            case 272 /* CaseClause */:
                                 // allow unlabeled break inside case clauses
                                 permittedJumps |= 1 /* Break */;
                                 break;
@@ -116947,19 +120725,19 @@ var ts;
                                 break;
                         }
                         switch (node.kind) {
-                            case 178 /* ThisType */:
-                            case 100 /* ThisKeyword */:
+                            case 179 /* ThisType */:
+                            case 101 /* ThisKeyword */:
                                 rangeFacts |= RangeFacts.UsesThis;
                                 break;
-                            case 233 /* LabeledStatement */: {
+                            case 234 /* LabeledStatement */: {
                                 var label = node.label;
                                 (seenLabels || (seenLabels = [])).push(label.escapedText);
                                 ts.forEachChild(node, visit);
                                 seenLabels.pop();
                                 break;
                             }
-                            case 229 /* BreakStatement */:
-                            case 228 /* ContinueStatement */: {
+                            case 230 /* BreakStatement */:
+                            case 229 /* ContinueStatement */: {
                                 var label = node.label;
                                 if (label) {
                                     if (!ts.contains(seenLabels, label.escapedText)) {
@@ -116968,20 +120746,20 @@ var ts;
                                     }
                                 }
                                 else {
-                                    if (!(permittedJumps & (node.kind === 229 /* BreakStatement */ ? 1 /* Break */ : 2 /* Continue */))) {
+                                    if (!(permittedJumps & (node.kind === 230 /* BreakStatement */ ? 1 /* Break */ : 2 /* Continue */))) {
                                         // attempt to break or continue in a forbidden context
                                         (errors || (errors = [])).push(ts.createDiagnosticForNode(node, Messages.cannotExtractRangeContainingConditionalBreakOrContinueStatements));
                                     }
                                 }
                                 break;
                             }
-                            case 201 /* AwaitExpression */:
+                            case 202 /* AwaitExpression */:
                                 rangeFacts |= RangeFacts.IsAsyncFunction;
                                 break;
-                            case 207 /* YieldExpression */:
+                            case 208 /* YieldExpression */:
                                 rangeFacts |= RangeFacts.IsGenerator;
                                 break;
-                            case 230 /* ReturnStatement */:
+                            case 231 /* ReturnStatement */:
                                 if (permittedJumps & 4 /* Return */) {
                                     rangeFacts |= RangeFacts.HasReturn;
                                 }
@@ -117035,7 +120813,7 @@ var ts;
                 while (true) {
                     current = current.parent;
                     // A function parameter's initializer is actually in the outer scope, not the function declaration
-                    if (current.kind === 151 /* Parameter */) {
+                    if (current.kind === 152 /* Parameter */) {
                         // Skip all the way to the outer scope of the function that declared this parameter
                         current = ts.findAncestor(current, function (parent) { return ts.isFunctionLikeDeclaration(parent); }).parent;
                     }
@@ -117046,7 +120824,7 @@ var ts;
                     //  * Module/namespace or source file
                     if (isScope(current)) {
                         scopes.push(current);
-                        if (current.kind === 284 /* SourceFile */) {
+                        if (current.kind === 285 /* SourceFile */) {
                             return scopes;
                         }
                     }
@@ -117136,32 +120914,32 @@ var ts;
             }
             function getDescriptionForFunctionLikeDeclaration(scope) {
                 switch (scope.kind) {
-                    case 157 /* Constructor */:
+                    case 158 /* Constructor */:
                         return "constructor";
-                    case 196 /* FunctionExpression */:
-                    case 239 /* FunctionDeclaration */:
+                    case 197 /* FunctionExpression */:
+                    case 240 /* FunctionDeclaration */:
                         return scope.name
                             ? "function '" + scope.name.text + "'"
                             : "anonymous function";
-                    case 197 /* ArrowFunction */:
+                    case 198 /* ArrowFunction */:
                         return "arrow function";
-                    case 156 /* MethodDeclaration */:
+                    case 157 /* MethodDeclaration */:
                         return "method '" + scope.name.getText() + "'";
-                    case 158 /* GetAccessor */:
+                    case 159 /* GetAccessor */:
                         return "'get " + scope.name.getText() + "'";
-                    case 159 /* SetAccessor */:
+                    case 160 /* SetAccessor */:
                         return "'set " + scope.name.getText() + "'";
                     default:
                         throw ts.Debug.assertNever(scope);
                 }
             }
             function getDescriptionForClassLikeDeclaration(scope) {
-                return scope.kind === 240 /* ClassDeclaration */
+                return scope.kind === 241 /* ClassDeclaration */
                     ? scope.name ? "class '" + scope.name.text + "'" : "anonymous class declaration"
                     : scope.name ? "class expression '" + scope.name.text + "'" : "anonymous class expression";
             }
             function getDescriptionForModuleLikeDeclaration(scope) {
-                return scope.kind === 245 /* ModuleBlock */
+                return scope.kind === 246 /* ModuleBlock */
                     ? "namespace '" + scope.parent.name.getText() + "'"
                     : scope.externalModuleIndicator ? 0 /* Module */ : 1 /* Global */;
             }
@@ -117227,12 +121005,12 @@ var ts;
                 var newFunction;
                 if (ts.isClassLike(scope)) {
                     // always create private method in TypeScript files
-                    var modifiers = isJS ? [] : [ts.createToken(113 /* PrivateKeyword */)];
+                    var modifiers = isJS ? [] : [ts.createToken(114 /* PrivateKeyword */)];
                     if (range.facts & RangeFacts.InStaticRegion) {
-                        modifiers.push(ts.createToken(116 /* StaticKeyword */));
+                        modifiers.push(ts.createToken(117 /* StaticKeyword */));
                     }
                     if (range.facts & RangeFacts.IsAsyncFunction) {
-                        modifiers.push(ts.createToken(121 /* AsyncKeyword */));
+                        modifiers.push(ts.createToken(122 /* AsyncKeyword */));
                     }
                     newFunction = ts.createMethod(
                     /*decorators*/ undefined, modifiers.length ? modifiers : undefined, range.facts & RangeFacts.IsGenerator ? ts.createToken(40 /* AsteriskToken */) : undefined, functionName, 
@@ -117240,7 +121018,7 @@ var ts;
                 }
                 else {
                     newFunction = ts.createFunctionDeclaration(
-                    /*decorators*/ undefined, range.facts & RangeFacts.IsAsyncFunction ? [ts.createToken(121 /* AsyncKeyword */)] : undefined, range.facts & RangeFacts.IsGenerator ? ts.createToken(40 /* AsteriskToken */) : undefined, functionName, typeParameters, parameters, returnType, body);
+                    /*decorators*/ undefined, range.facts & RangeFacts.IsAsyncFunction ? [ts.createToken(122 /* AsyncKeyword */)] : undefined, range.facts & RangeFacts.IsGenerator ? ts.createToken(40 /* AsteriskToken */) : undefined, functionName, typeParameters, parameters, returnType, body);
                 }
                 var changeTracker = ts.textChanges.ChangeTracker.fromContext(context);
                 var minInsertionPos = (isReadonlyArray(range.range) ? ts.last(range.range) : range.range).end;
@@ -117381,9 +121159,9 @@ var ts;
                     while (ts.isParenthesizedTypeNode(withoutParens)) {
                         withoutParens = withoutParens.type;
                     }
-                    return ts.isUnionTypeNode(withoutParens) && ts.find(withoutParens.types, function (t) { return t.kind === 141 /* UndefinedKeyword */; })
+                    return ts.isUnionTypeNode(withoutParens) && ts.find(withoutParens.types, function (t) { return t.kind === 142 /* UndefinedKeyword */; })
                         ? clone
-                        : ts.createUnionTypeNode([clone, ts.createKeywordTypeNode(141 /* UndefinedKeyword */)]);
+                        : ts.createUnionTypeNode([clone, ts.createKeywordTypeNode(142 /* UndefinedKeyword */)]);
                 }
             }
             /**
@@ -117406,11 +121184,11 @@ var ts;
                 if (ts.isClassLike(scope)) {
                     ts.Debug.assert(!isJS); // See CannotExtractToJSClass
                     var modifiers = [];
-                    modifiers.push(ts.createToken(113 /* PrivateKeyword */));
+                    modifiers.push(ts.createToken(114 /* PrivateKeyword */));
                     if (rangeFacts & RangeFacts.InStaticRegion) {
-                        modifiers.push(ts.createToken(116 /* StaticKeyword */));
+                        modifiers.push(ts.createToken(117 /* StaticKeyword */));
                     }
-                    modifiers.push(ts.createToken(133 /* ReadonlyKeyword */));
+                    modifiers.push(ts.createToken(134 /* ReadonlyKeyword */));
                     var newVariable = ts.createProperty(
                     /*decorators*/ undefined, modifiers, localNameText, 
                     /*questionToken*/ undefined, variableType, initializer);
@@ -117439,7 +121217,7 @@ var ts;
                         var localReference = ts.createIdentifier(localNameText);
                         changeTracker.replaceNode(context.file, node, localReference);
                     }
-                    else if (node.parent.kind === 221 /* ExpressionStatement */ && scope === ts.findAncestor(node, isScope)) {
+                    else if (node.parent.kind === 222 /* ExpressionStatement */ && scope === ts.findAncestor(node, isScope)) {
                         // If the parent is an expression statement and the target scope is the immediately enclosing one,
                         // replace the statement with the declaration.
                         var newVariableStatement = ts.createVariableStatement(
@@ -117458,7 +121236,7 @@ var ts;
                             changeTracker.insertNodeBefore(context.file, nodeToInsertBefore, newVariableStatement, /*blankLineBetween*/ false);
                         }
                         // Consume
-                        if (node.parent.kind === 221 /* ExpressionStatement */) {
+                        if (node.parent.kind === 222 /* ExpressionStatement */) {
                             // If the parent is an expression statement, delete it.
                             changeTracker.delete(context.file, node.parent);
                         }
@@ -117545,7 +121323,7 @@ var ts;
                     return { body: ts.createBlock(statements, /*multiLine*/ true), returnValueProperty: undefined };
                 }
                 function visitor(node) {
-                    if (!ignoreReturns && node.kind === 230 /* ReturnStatement */ && hasWritesOrVariableDeclarations) {
+                    if (!ignoreReturns && node.kind === 231 /* ReturnStatement */ && hasWritesOrVariableDeclarations) {
                         var assignments = getPropertyAssignmentsForWritesAndVariableDeclarations(exposedVariableDeclarations, writes);
                         if (node.expression) {
                             if (!returnValueProperty) {
@@ -117723,7 +121501,7 @@ var ts;
                     var scope = scopes_1[_i];
                     usagesPerScope.push({ usages: ts.createMap(), typeParameterUsages: ts.createMap(), substitutions: ts.createMap() });
                     substitutionsPerScope.push(ts.createMap());
-                    functionErrorsPerScope.push(ts.isFunctionLikeDeclaration(scope) && scope.kind !== 239 /* FunctionDeclaration */
+                    functionErrorsPerScope.push(ts.isFunctionLikeDeclaration(scope) && scope.kind !== 240 /* FunctionDeclaration */
                         ? [ts.createDiagnosticForNode(scope, Messages.cannotExtractToOtherFunctionLike)]
                         : []);
                     var constantErrors = [];
@@ -118039,30 +121817,30 @@ var ts;
             function isExtractableExpression(node) {
                 var parent = node.parent;
                 switch (parent.kind) {
-                    case 278 /* EnumMember */:
+                    case 279 /* EnumMember */:
                         return false;
                 }
                 switch (node.kind) {
                     case 10 /* StringLiteral */:
-                        return parent.kind !== 249 /* ImportDeclaration */ &&
-                            parent.kind !== 253 /* ImportSpecifier */;
-                    case 208 /* SpreadElement */:
-                    case 184 /* ObjectBindingPattern */:
-                    case 186 /* BindingElement */:
+                        return parent.kind !== 250 /* ImportDeclaration */ &&
+                            parent.kind !== 254 /* ImportSpecifier */;
+                    case 209 /* SpreadElement */:
+                    case 185 /* ObjectBindingPattern */:
+                    case 187 /* BindingElement */:
                         return false;
-                    case 72 /* Identifier */:
-                        return parent.kind !== 186 /* BindingElement */ &&
-                            parent.kind !== 253 /* ImportSpecifier */ &&
-                            parent.kind !== 257 /* ExportSpecifier */;
+                    case 73 /* Identifier */:
+                        return parent.kind !== 187 /* BindingElement */ &&
+                            parent.kind !== 254 /* ImportSpecifier */ &&
+                            parent.kind !== 258 /* ExportSpecifier */;
                 }
                 return true;
             }
             function isBlockLike(node) {
                 switch (node.kind) {
-                    case 218 /* Block */:
-                    case 284 /* SourceFile */:
-                    case 245 /* ModuleBlock */:
-                    case 271 /* CaseClause */:
+                    case 219 /* Block */:
+                    case 285 /* SourceFile */:
+                    case 246 /* ModuleBlock */:
+                    case 272 /* CaseClause */:
                         return true;
                     default:
                         return false;
@@ -118073,6 +121851,136 @@ var ts;
 })(ts || (ts = {}));
 /* @internal */
 var ts;
+(function (ts) {
+    var refactor;
+    (function (refactor) {
+        var refactorName = "Extract type";
+        var extractToTypeAlias = "Extract to type alias";
+        var extractToTypeDef = "Extract to typedef";
+        refactor.registerRefactor(refactorName, {
+            getAvailableActions: function (context) {
+                var info = getRangeToExtract(context);
+                if (!info)
+                    return ts.emptyArray;
+                return [{
+                        name: refactorName,
+                        description: ts.getLocaleSpecificMessage(ts.Diagnostics.Extract_type),
+                        actions: [info.isJS ? {
+                                name: extractToTypeDef, description: ts.getLocaleSpecificMessage(ts.Diagnostics.Extract_to_typedef)
+                            } : {
+                                name: extractToTypeAlias, description: ts.getLocaleSpecificMessage(ts.Diagnostics.Extract_to_type_alias)
+                            }]
+                    }];
+            },
+            getEditsForAction: function (context, actionName) {
+                ts.Debug.assert(actionName === extractToTypeAlias || actionName === extractToTypeDef);
+                var file = context.file;
+                var info = ts.Debug.assertDefined(getRangeToExtract(context));
+                ts.Debug.assert(actionName === extractToTypeAlias && !info.isJS || actionName === extractToTypeDef && info.isJS);
+                var name = ts.getUniqueName("NewType", file);
+                var edits = ts.textChanges.ChangeTracker.with(context, function (changes) { return info.isJS ?
+                    doTypedefChange(changes, file, name, info.firstStatement, info.selection, info.typeParameters) :
+                    doTypeAliasChange(changes, file, name, info.firstStatement, info.selection, info.typeParameters); });
+                var renameFilename = file.fileName;
+                var renameLocation = ts.getRenameLocation(edits, renameFilename, name, /*preferLastLocation*/ false);
+                return { edits: edits, renameFilename: renameFilename, renameLocation: renameLocation };
+            }
+        });
+        function getRangeToExtract(context) {
+            var file = context.file, startPosition = context.startPosition;
+            var isJS = ts.isSourceFileJS(file);
+            var current = ts.getTokenAtPosition(file, startPosition);
+            var range = ts.createTextRangeFromSpan(ts.getRefactorContextSpan(context));
+            var selection = ts.findAncestor(current, (function (node) { return node.parent && rangeContainsSkipTrivia(range, node, file) && !rangeContainsSkipTrivia(range, node.parent, file); }));
+            if (!selection || !ts.isTypeNode(selection))
+                return undefined;
+            var checker = context.program.getTypeChecker();
+            var firstStatement = ts.Debug.assertDefined(isJS ? ts.findAncestor(selection, isStatementAndHasJSDoc) : ts.findAncestor(selection, ts.isStatement));
+            var typeParameters = collectTypeParameters(checker, selection, firstStatement, file);
+            if (!typeParameters)
+                return undefined;
+            return { isJS: isJS, selection: selection, firstStatement: firstStatement, typeParameters: typeParameters };
+        }
+        function isStatementAndHasJSDoc(n) {
+            return ts.isStatement(n) && ts.hasJSDocNodes(n);
+        }
+        function rangeContainsSkipTrivia(r1, node, file) {
+            return ts.rangeContainsStartEnd(r1, ts.skipTrivia(file.text, node.pos), node.end);
+        }
+        function collectTypeParameters(checker, selection, statement, file) {
+            var result = [];
+            return visitor(selection) ? undefined : result;
+            function visitor(node) {
+                if (ts.isTypeReferenceNode(node)) {
+                    if (ts.isIdentifier(node.typeName)) {
+                        var symbol = checker.resolveName(node.typeName.text, node.typeName, 262144 /* TypeParameter */, /* excludeGlobals */ true);
+                        if (symbol) {
+                            var declaration = ts.cast(ts.first(symbol.declarations), ts.isTypeParameterDeclaration);
+                            if (rangeContainsSkipTrivia(statement, declaration, file) && !rangeContainsSkipTrivia(selection, declaration, file)) {
+                                result.push(declaration);
+                            }
+                        }
+                    }
+                }
+                else if (ts.isInferTypeNode(node)) {
+                    var conditionalTypeNode = ts.findAncestor(node, function (n) { return ts.isConditionalTypeNode(n) && rangeContainsSkipTrivia(n.extendsType, node, file); });
+                    if (!conditionalTypeNode || !rangeContainsSkipTrivia(selection, conditionalTypeNode, file)) {
+                        return true;
+                    }
+                }
+                else if ((ts.isTypePredicateNode(node) || ts.isThisTypeNode(node))) {
+                    var functionLikeNode = ts.findAncestor(node.parent, ts.isFunctionLike);
+                    if (functionLikeNode && functionLikeNode.type && rangeContainsSkipTrivia(functionLikeNode.type, node, file) && !rangeContainsSkipTrivia(selection, functionLikeNode, file)) {
+                        return true;
+                    }
+                }
+                else if (ts.isTypeQueryNode(node)) {
+                    if (ts.isIdentifier(node.exprName)) {
+                        var symbol = checker.resolveName(node.exprName.text, node.exprName, 67220415 /* Value */, /* excludeGlobals */ false);
+                        if (symbol && rangeContainsSkipTrivia(statement, symbol.valueDeclaration, file) && !rangeContainsSkipTrivia(selection, symbol.valueDeclaration, file)) {
+                            return true;
+                        }
+                    }
+                    else {
+                        if (ts.isThisIdentifier(node.exprName.left) && !rangeContainsSkipTrivia(selection, node.parent, file)) {
+                            return true;
+                        }
+                    }
+                }
+                return ts.forEachChild(node, visitor);
+            }
+        }
+        function doTypeAliasChange(changes, file, name, firstStatement, selection, typeParameters) {
+            var newTypeNode = ts.createTypeAliasDeclaration(
+            /* decorators */ undefined, 
+            /* modifiers */ undefined, name, typeParameters.map(function (id) { return ts.updateTypeParameterDeclaration(id, id.name, id.constraint, /* defaultType */ undefined); }), selection);
+            changes.insertNodeBefore(file, firstStatement, newTypeNode, /* blankLineBetween */ true);
+            changes.replaceNode(file, selection, ts.createTypeReferenceNode(name, typeParameters.map(function (id) { return ts.createTypeReferenceNode(id.name, /* typeArguments */ undefined); })));
+        }
+        function doTypedefChange(changes, file, name, firstStatement, selection, typeParameters) {
+            var node = ts.createNode(311 /* JSDocTypedefTag */);
+            node.tagName = ts.createIdentifier("typedef"); // TODO: jsdoc factory https://github.com/Microsoft/TypeScript/pull/29539
+            node.fullName = ts.createIdentifier(name);
+            node.name = node.fullName;
+            node.typeExpression = ts.createJSDocTypeExpression(selection);
+            var templates = [];
+            ts.forEach(typeParameters, function (typeParameter) {
+                var constraint = ts.getEffectiveConstraintOfTypeParameter(typeParameter);
+                var template = ts.createNode(310 /* JSDocTemplateTag */);
+                template.tagName = ts.createIdentifier("template");
+                template.constraint = constraint && ts.cast(constraint, ts.isJSDocTypeExpression);
+                var parameter = ts.createNode(151 /* TypeParameter */);
+                parameter.name = typeParameter.name;
+                template.typeParameters = ts.createNodeArray([parameter]);
+                templates.push(template);
+            });
+            changes.insertNodeBefore(file, firstStatement, ts.createJSDocComment(/* comment */ undefined, ts.createNodeArray(ts.concatenate(templates, [node]))), /* blankLineBetween */ true);
+            changes.replaceNode(file, selection, ts.createTypeReferenceNode(name, typeParameters.map(function (id) { return ts.createTypeReferenceNode(id.name, /* typeArguments */ undefined); })));
+        }
+    })(refactor = ts.refactor || (ts.refactor = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
 (function (ts) {
     var refactor;
     (function (refactor) {
@@ -118111,10 +122019,10 @@ var ts;
                 var modifierFlags = ts.getModifierFlags(declaration) & ~64 /* Readonly */;
                 var accessorModifiers = isInClassLike
                     ? !modifierFlags || modifierFlags & 8 /* Private */
-                        ? getModifiers(isJS, isStatic, 115 /* PublicKeyword */)
+                        ? getModifiers(isJS, isStatic, 116 /* PublicKeyword */)
                         : ts.createNodeArray(ts.createModifiersFromModifierFlags(modifierFlags))
                     : undefined;
-                var fieldModifiers = isInClassLike ? getModifiers(isJS, isStatic, 113 /* PrivateKeyword */) : undefined;
+                var fieldModifiers = isInClassLike ? getModifiers(isJS, isStatic, 114 /* PrivateKeyword */) : undefined;
                 updateFieldDeclaration(changeTracker, file, declaration, fieldName, fieldModifiers);
                 var getAccessor = generateGetAccessor(fieldName, accessorName, type, accessorModifiers, isStatic, container);
                 ts.suppressLeadingAndTrailingTrivia(getAccessor);
@@ -118152,7 +122060,7 @@ var ts;
                 return ts.isIdentifier(fieldName) ? ts.createPropertyAccess(leftHead, fieldName) : ts.createElementAccess(leftHead, ts.createLiteral(fieldName));
             }
             function getModifiers(isJS, isStatic, accessModifier) {
-                var modifiers = ts.append(!isJS ? [ts.createToken(accessModifier)] : undefined, isStatic ? ts.createToken(116 /* StaticKeyword */) : undefined);
+                var modifiers = ts.append(!isJS ? [ts.createToken(accessModifier)] : undefined, isStatic ? ts.createToken(117 /* StaticKeyword */) : undefined);
                 return modifiers && ts.createNodeArray(modifiers);
             }
             function startsWithUnderscore(name) {
@@ -118175,7 +122083,7 @@ var ts;
                     isStatic: ts.hasStaticModifier(declaration),
                     isReadonly: ts.hasReadonlyModifier(declaration),
                     type: ts.getTypeAnnotationNode(declaration),
-                    container: declaration.kind === 151 /* Parameter */ ? declaration.parent.parent : declaration.parent,
+                    container: declaration.kind === 152 /* Parameter */ ? declaration.parent.parent : declaration.parent,
                     originalName: declaration.name.text,
                     declaration: declaration,
                     fieldName: fieldName,
@@ -118232,13 +122140,13 @@ var ts;
                     return;
                 constructor.body.forEachChild(function recur(node) {
                     if (ts.isElementAccessExpression(node) &&
-                        node.expression.kind === 100 /* ThisKeyword */ &&
+                        node.expression.kind === 101 /* ThisKeyword */ &&
                         ts.isStringLiteral(node.argumentExpression) &&
                         node.argumentExpression.text === originalName &&
                         ts.isWriteAccess(node)) {
                         changeTracker.replaceNode(file, node.argumentExpression, ts.createStringLiteral(fieldName));
                     }
-                    if (ts.isPropertyAccessExpression(node) && node.expression.kind === 100 /* ThisKeyword */ && node.name.text === originalName && ts.isWriteAccess(node)) {
+                    if (ts.isPropertyAccessExpression(node) && node.expression.kind === 101 /* ThisKeyword */ && node.name.text === originalName && ts.isWriteAccess(node)) {
                         changeTracker.replaceNode(file, node.name, ts.createIdentifier(fieldName));
                     }
                     if (!ts.isFunctionLike(node) && !ts.isClassLike(node)) {
@@ -118320,11 +122228,11 @@ var ts;
         }
         function isPureImport(node) {
             switch (node.kind) {
-                case 249 /* ImportDeclaration */:
+                case 250 /* ImportDeclaration */:
                     return true;
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return !ts.hasModifier(node, 1 /* Export */);
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     return node.declarationList.declarations.every(function (d) { return !!d.initializer && ts.isRequireCall(d.initializer, /*checkArgumentIsStringLiteralLike*/ true); });
                 default:
                     return false;
@@ -118412,19 +122320,19 @@ var ts;
         }
         function getNamespaceLikeImport(node) {
             switch (node.kind) {
-                case 249 /* ImportDeclaration */:
-                    return node.importClause && node.importClause.namedBindings && node.importClause.namedBindings.kind === 251 /* NamespaceImport */ ?
+                case 250 /* ImportDeclaration */:
+                    return node.importClause && node.importClause.namedBindings && node.importClause.namedBindings.kind === 252 /* NamespaceImport */ ?
                         node.importClause.namedBindings.name : undefined;
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return node.name;
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     return ts.tryCast(node.name, ts.isIdentifier);
                 default:
                     return ts.Debug.assertNever(node);
             }
         }
         function updateNamespaceLikeImport(changes, sourceFile, checker, movedSymbols, newModuleName, newModuleSpecifier, oldImportId, oldImportNode) {
-            var preferredNewNamespaceName = ts.codefix.moduleSpecifierToValidIdentifier(newModuleName, 7 /* ESNext */);
+            var preferredNewNamespaceName = ts.codefix.moduleSpecifierToValidIdentifier(newModuleName, 99 /* ESNext */);
             var needUniqueName = false;
             var toChange = [];
             ts.FindAllReferences.Core.eachSymbolReferenceInFile(oldImportId, checker, sourceFile, function (ref) {
@@ -118448,20 +122356,20 @@ var ts;
             var newNamespaceId = ts.createIdentifier(newNamespaceName);
             var newModuleString = ts.createLiteral(newModuleSpecifier);
             switch (node.kind) {
-                case 249 /* ImportDeclaration */:
+                case 250 /* ImportDeclaration */:
                     return ts.createImportDeclaration(
                     /*decorators*/ undefined, /*modifiers*/ undefined, ts.createImportClause(/*name*/ undefined, ts.createNamespaceImport(newNamespaceId)), newModuleString);
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return ts.createImportEqualsDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, newNamespaceId, ts.createExternalModuleReference(newModuleString));
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     return ts.createVariableDeclaration(newNamespaceId, /*type*/ undefined, createRequireCall(newModuleString));
                 default:
                     return ts.Debug.assertNever(node);
             }
         }
         function moduleSpecifierFromImport(i) {
-            return (i.kind === 249 /* ImportDeclaration */ ? i.moduleSpecifier
-                : i.kind === 248 /* ImportEqualsDeclaration */ ? i.moduleReference.expression
+            return (i.kind === 250 /* ImportDeclaration */ ? i.moduleSpecifier
+                : i.kind === 249 /* ImportEqualsDeclaration */ ? i.moduleReference.expression
                     : i.initializer.arguments[0]);
         }
         function forEachImportInStatement(statement, cb) {
@@ -118531,15 +122439,15 @@ var ts;
         }
         function deleteUnusedImports(sourceFile, importDecl, changes, isUnused) {
             switch (importDecl.kind) {
-                case 249 /* ImportDeclaration */:
+                case 250 /* ImportDeclaration */:
                     deleteUnusedImportsInDeclaration(sourceFile, importDecl, changes, isUnused);
                     break;
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     if (isUnused(importDecl.name)) {
                         changes.delete(sourceFile, importDecl);
                     }
                     break;
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     deleteUnusedImportsInVariableDeclaration(sourceFile, importDecl, changes, isUnused);
                     break;
                 default:
@@ -118552,7 +122460,7 @@ var ts;
             var _a = importDecl.importClause, name = _a.name, namedBindings = _a.namedBindings;
             var defaultUnused = !name || isUnused(name);
             var namedBindingsUnused = !namedBindings ||
-                (namedBindings.kind === 251 /* NamespaceImport */ ? isUnused(namedBindings.name) : namedBindings.elements.length !== 0 && namedBindings.elements.every(function (e) { return isUnused(e.name); }));
+                (namedBindings.kind === 252 /* NamespaceImport */ ? isUnused(namedBindings.name) : namedBindings.elements.length !== 0 && namedBindings.elements.every(function (e) { return isUnused(e.name); }));
             if (defaultUnused && namedBindingsUnused) {
                 changes.delete(sourceFile, importDecl);
             }
@@ -118564,7 +122472,7 @@ var ts;
                     if (namedBindingsUnused) {
                         changes.delete(sourceFile, namedBindings);
                     }
-                    else if (namedBindings.kind === 252 /* NamedImports */) {
+                    else if (namedBindings.kind === 253 /* NamedImports */) {
                         for (var _i = 0, _b = namedBindings.elements; _i < _b.length; _i++) {
                             var element = _b[_i];
                             if (isUnused(element.name))
@@ -118577,14 +122485,14 @@ var ts;
         function deleteUnusedImportsInVariableDeclaration(sourceFile, varDecl, changes, isUnused) {
             var name = varDecl.name;
             switch (name.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     if (isUnused(name)) {
                         changes.delete(sourceFile, name);
                     }
                     break;
-                case 185 /* ArrayBindingPattern */:
+                case 186 /* ArrayBindingPattern */:
                     break;
-                case 184 /* ObjectBindingPattern */:
+                case 185 /* ObjectBindingPattern */:
                     if (name.elements.every(function (e) { return ts.isIdentifier(e.name) && isUnused(e.name); })) {
                         changes.delete(sourceFile, ts.isVariableDeclarationList(varDecl.parent) && varDecl.parent.declarations.length === 1 ? varDecl.parent.parent : varDecl);
                     }
@@ -118711,13 +122619,13 @@ var ts;
         // Below should all be utilities
         function isInImport(decl) {
             switch (decl.kind) {
-                case 248 /* ImportEqualsDeclaration */:
-                case 253 /* ImportSpecifier */:
-                case 250 /* ImportClause */:
+                case 249 /* ImportEqualsDeclaration */:
+                case 254 /* ImportSpecifier */:
+                case 251 /* ImportClause */:
                     return true;
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     return isVariableDeclarationInImport(decl);
-                case 186 /* BindingElement */:
+                case 187 /* BindingElement */:
                     return ts.isVariableDeclaration(decl.parent.parent) && isVariableDeclarationInImport(decl.parent.parent);
                 default:
                     return false;
@@ -118729,7 +122637,7 @@ var ts;
         }
         function filterImport(i, moduleSpecifier, keep) {
             switch (i.kind) {
-                case 249 /* ImportDeclaration */: {
+                case 250 /* ImportDeclaration */: {
                     var clause = i.importClause;
                     if (!clause)
                         return undefined;
@@ -118739,9 +122647,9 @@ var ts;
                         ? ts.createImportDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, ts.createImportClause(defaultImport, namedBindings), moduleSpecifier)
                         : undefined;
                 }
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return keep(i.name) ? i : undefined;
-                case 237 /* VariableDeclaration */: {
+                case 238 /* VariableDeclaration */: {
                     var name = filterBindingName(i.name, keep);
                     return name ? makeVariableStatement(name, i.type, createRequireCall(moduleSpecifier), i.parent.flags) : undefined;
                 }
@@ -118750,7 +122658,7 @@ var ts;
             }
         }
         function filterNamedBindings(namedBindings, keep) {
-            if (namedBindings.kind === 251 /* NamespaceImport */) {
+            if (namedBindings.kind === 252 /* NamespaceImport */) {
                 return keep(namedBindings.name) ? namedBindings : undefined;
             }
             else {
@@ -118760,11 +122668,11 @@ var ts;
         }
         function filterBindingName(name, keep) {
             switch (name.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return keep(name) ? name : undefined;
-                case 185 /* ArrayBindingPattern */:
+                case 186 /* ArrayBindingPattern */:
                     return name;
-                case 184 /* ObjectBindingPattern */: {
+                case 185 /* ObjectBindingPattern */: {
                     // We can't handle nested destructurings or property names well here, so just copy them all.
                     var newElements = name.elements.filter(function (prop) { return prop.propertyName || !ts.isIdentifier(prop.name) || keep(prop.name); });
                     return newElements.length ? ts.createObjectBindingPattern(newElements) : undefined;
@@ -118821,13 +122729,13 @@ var ts;
         }
         function isNonVariableTopLevelDeclaration(node) {
             switch (node.kind) {
-                case 239 /* FunctionDeclaration */:
-                case 240 /* ClassDeclaration */:
-                case 244 /* ModuleDeclaration */:
-                case 243 /* EnumDeclaration */:
-                case 242 /* TypeAliasDeclaration */:
-                case 241 /* InterfaceDeclaration */:
-                case 248 /* ImportEqualsDeclaration */:
+                case 240 /* FunctionDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 245 /* ModuleDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
+                case 242 /* InterfaceDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return true;
                 default:
                     return false;
@@ -118835,17 +122743,17 @@ var ts;
         }
         function forEachTopLevelDeclaration(statement, cb) {
             switch (statement.kind) {
-                case 239 /* FunctionDeclaration */:
-                case 240 /* ClassDeclaration */:
-                case 244 /* ModuleDeclaration */:
-                case 243 /* EnumDeclaration */:
-                case 242 /* TypeAliasDeclaration */:
-                case 241 /* InterfaceDeclaration */:
-                case 248 /* ImportEqualsDeclaration */:
+                case 240 /* FunctionDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 245 /* ModuleDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
+                case 242 /* InterfaceDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return cb(statement);
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     return ts.firstDefined(statement.declarationList.declarations, function (decl) { return forEachTopLevelDeclarationInBindingName(decl.name, cb); });
-                case 221 /* ExpressionStatement */: {
+                case 222 /* ExpressionStatement */: {
                     var expression = statement.expression;
                     return ts.isBinaryExpression(expression) && ts.getAssignmentDeclarationKind(expression) === 1 /* ExportsProperty */
                         ? cb(statement)
@@ -118855,10 +122763,10 @@ var ts;
         }
         function forEachTopLevelDeclarationInBindingName(name, cb) {
             switch (name.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return cb(ts.cast(name.parent, function (x) { return ts.isVariableDeclaration(x) || ts.isBindingElement(x); }));
-                case 185 /* ArrayBindingPattern */:
-                case 184 /* ObjectBindingPattern */:
+                case 186 /* ArrayBindingPattern */:
+                case 185 /* ObjectBindingPattern */:
                     return ts.firstDefined(name.elements, function (em) { return ts.isOmittedExpression(em) ? undefined : forEachTopLevelDeclarationInBindingName(em.name, cb); });
                 default:
                     return ts.Debug.assertNever(name);
@@ -118869,9 +122777,9 @@ var ts;
         }
         function getTopLevelDeclarationStatement(d) {
             switch (d.kind) {
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     return d.parent.parent;
-                case 186 /* BindingElement */:
+                case 187 /* BindingElement */:
                     return getTopLevelDeclarationStatement(ts.cast(d.parent.parent, function (p) { return ts.isVariableDeclaration(p) || ts.isBindingElement(p); }));
                 default:
                     return d;
@@ -118902,25 +122810,25 @@ var ts;
             return useEs6Exports ? [addEs6Export(decl)] : addCommonjsExport(decl);
         }
         function addEs6Export(d) {
-            var modifiers = ts.concatenate([ts.createModifier(85 /* ExportKeyword */)], d.modifiers);
+            var modifiers = ts.concatenate([ts.createModifier(86 /* ExportKeyword */)], d.modifiers);
             switch (d.kind) {
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     return ts.updateFunctionDeclaration(d, d.decorators, modifiers, d.asteriskToken, d.name, d.typeParameters, d.parameters, d.type, d.body);
-                case 240 /* ClassDeclaration */:
+                case 241 /* ClassDeclaration */:
                     return ts.updateClassDeclaration(d, d.decorators, modifiers, d.name, d.typeParameters, d.heritageClauses, d.members);
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     return ts.updateVariableStatement(d, modifiers, d.declarationList);
-                case 244 /* ModuleDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     return ts.updateModuleDeclaration(d, d.decorators, modifiers, d.name, d.body);
-                case 243 /* EnumDeclaration */:
+                case 244 /* EnumDeclaration */:
                     return ts.updateEnumDeclaration(d, d.decorators, modifiers, d.name, d.members);
-                case 242 /* TypeAliasDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
                     return ts.updateTypeAliasDeclaration(d, d.decorators, modifiers, d.name, d.typeParameters, d.type);
-                case 241 /* InterfaceDeclaration */:
+                case 242 /* InterfaceDeclaration */:
                     return ts.updateInterfaceDeclaration(d, d.decorators, modifiers, d.name, d.typeParameters, d.heritageClauses, d.members);
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return ts.updateImportEqualsDeclaration(d, d.decorators, modifiers, d.name, d.moduleReference);
-                case 221 /* ExpressionStatement */:
+                case 222 /* ExpressionStatement */:
                     return ts.Debug.fail(); // Shouldn't try to add 'export' keyword to `exports.x = ...`
                 default:
                     return ts.Debug.assertNever(d);
@@ -118931,18 +122839,18 @@ var ts;
         }
         function getNamesToExportInCommonJS(decl) {
             switch (decl.kind) {
-                case 239 /* FunctionDeclaration */:
-                case 240 /* ClassDeclaration */:
+                case 240 /* FunctionDeclaration */:
+                case 241 /* ClassDeclaration */:
                     return [decl.name.text]; // TODO: GH#18217
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     return ts.mapDefined(decl.declarationList.declarations, function (d) { return ts.isIdentifier(d.name) ? d.name.text : undefined; });
-                case 244 /* ModuleDeclaration */:
-                case 243 /* EnumDeclaration */:
-                case 242 /* TypeAliasDeclaration */:
-                case 241 /* InterfaceDeclaration */:
-                case 248 /* ImportEqualsDeclaration */:
+                case 245 /* ModuleDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
+                case 242 /* InterfaceDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return ts.emptyArray;
-                case 221 /* ExpressionStatement */:
+                case 222 /* ExpressionStatement */:
                     return ts.Debug.fail(); // Shouldn't try to add 'export' keyword to `exports.x = ...`
                 default:
                     return ts.Debug.assertNever(decl);
@@ -118950,7 +122858,7 @@ var ts;
         }
         /** Creates `exports.x = x;` */
         function createExportAssignment(name) {
-            return ts.createExpressionStatement(ts.createBinary(ts.createPropertyAccess(ts.createIdentifier("exports"), ts.createIdentifier(name)), 59 /* EqualsToken */, ts.createIdentifier(name)));
+            return ts.createExpressionStatement(ts.createBinary(ts.createPropertyAccess(ts.createIdentifier("exports"), ts.createIdentifier(name)), 60 /* EqualsToken */, ts.createIdentifier(name)));
         }
     })(refactor = ts.refactor || (ts.refactor = {}));
 })(ts || (ts = {}));
@@ -119049,9 +122957,9 @@ var ts;
 (function (ts) {
     var refactor;
     (function (refactor) {
-        var convertToNamedParameters;
-        (function (convertToNamedParameters) {
-            var refactorName = "Convert to named parameters";
+        var convertParamsToDestructuredObject;
+        (function (convertParamsToDestructuredObject) {
+            var refactorName = "Convert parameters to destructured object";
             var minimumParameterLength = 2;
             refactor.registerRefactor(refactorName, { getEditsForAction: getEditsForAction, getAvailableActions: getAvailableActions });
             function getAvailableActions(context) {
@@ -119062,7 +122970,7 @@ var ts;
                 var functionDeclaration = getFunctionDeclarationAtPosition(file, startPosition, context.program.getTypeChecker());
                 if (!functionDeclaration)
                     return ts.emptyArray;
-                var description = ts.getLocaleSpecificMessage(ts.Diagnostics.Convert_to_named_parameters);
+                var description = ts.getLocaleSpecificMessage(ts.Diagnostics.Convert_parameters_to_destructured_object);
                 return [{
                         name: refactorName,
                         description: description,
@@ -119109,15 +123017,15 @@ var ts;
                 var checker = program.getTypeChecker();
                 var references = ts.flatMap(names, /*mapfn*/ function (/*mapfn*/ name) { return ts.FindAllReferences.getReferenceEntriesForNode(-1, name, program, program.getSourceFiles(), cancellationToken); });
                 var groupedReferences = groupReferences(references);
-                if (!ts.every(groupedReferences.declarations, function (decl) { return ts.contains(names, decl); })) {
+                if (!ts.every(groupedReferences.declarations, /*callback*/ function (/*callback*/ decl) { return ts.contains(names, decl); })) {
                     groupedReferences.valid = false;
                 }
                 return groupedReferences;
                 function groupReferences(referenceEntries) {
                     var classReferences = { accessExpressions: [], typeUsages: [] };
                     var groupedReferences = { functionCalls: [], declarations: [], classReferences: classReferences, valid: true };
-                    var functionSymbols = ts.map(functionNames, checker.getSymbolAtLocation);
-                    var classSymbols = ts.map(classNames, checker.getSymbolAtLocation);
+                    var functionSymbols = ts.map(functionNames, getSymbolTargetAtLocation);
+                    var classSymbols = ts.map(classNames, getSymbolTargetAtLocation);
                     var isConstructor = ts.isConstructorDeclaration(functionDeclaration);
                     for (var _i = 0, referenceEntries_1 = referenceEntries; _i < referenceEntries_1.length; _i++) {
                         var entry = referenceEntries_1[_i];
@@ -119125,7 +123033,22 @@ var ts;
                             groupedReferences.valid = false;
                             continue;
                         }
-                        if (ts.contains(functionSymbols, checker.getSymbolAtLocation(entry.node), symbolComparer)) {
+                        /* We compare symbols because in some cases find all references wil return a reference that may or may not be to the refactored function.
+                        Example from the refactorConvertParamsToDestructuredObject_methodCallUnion.ts test:
+                            class A { foo(a: number, b: number) { return a + b; } }
+                            class B { foo(c: number, d: number) { return c + d; } }
+                            declare const ab: A | B;
+                            ab.foo(1, 2);
+                        Find all references will return `ab.foo(1, 2)` as a reference to A's `foo` but we could be calling B's `foo`.
+                        When looking for constructor calls, however, the symbol on the constructor call reference is going to be the corresponding class symbol.
+                        So we need to add a special case for this because when calling a constructor of a class through one of its subclasses,
+                        the symbols are going to be different.
+                        */
+                        if (ts.contains(functionSymbols, getSymbolTargetAtLocation(entry.node)) || ts.isNewExpressionTarget(entry.node)) {
+                            var importOrExportReference = entryToImportOrExport(entry);
+                            if (importOrExportReference) {
+                                continue;
+                            }
                             var decl = entryToDeclaration(entry);
                             if (decl) {
                                 groupedReferences.declarations.push(decl);
@@ -119138,7 +123061,11 @@ var ts;
                             }
                         }
                         // if the refactored function is a constructor, we must also check if the references to its class are valid
-                        if (isConstructor && ts.contains(classSymbols, checker.getSymbolAtLocation(entry.node), symbolComparer)) {
+                        if (isConstructor && ts.contains(classSymbols, getSymbolTargetAtLocation(entry.node))) {
+                            var importOrExportReference = entryToImportOrExport(entry);
+                            if (importOrExportReference) {
+                                continue;
+                            }
                             var decl = entryToDeclaration(entry);
                             if (decl) {
                                 groupedReferences.declarations.push(decl);
@@ -119163,9 +123090,23 @@ var ts;
                     }
                     return groupedReferences;
                 }
+                function getSymbolTargetAtLocation(node) {
+                    var symbol = checker.getSymbolAtLocation(node);
+                    return symbol && ts.getSymbolTarget(symbol, checker);
+                }
             }
-            function symbolComparer(a, b) {
-                return ts.getSymbolTarget(a) === ts.getSymbolTarget(b);
+            function entryToImportOrExport(entry) {
+                var node = entry.node;
+                if (ts.isImportSpecifier(node.parent)
+                    || ts.isImportClause(node.parent)
+                    || ts.isImportEqualsDeclaration(node.parent)
+                    || ts.isNamespaceImport(node.parent)) {
+                    return node;
+                }
+                if (ts.isExportSpecifier(node.parent) || ts.isExportAssignment(node.parent)) {
+                    return node;
+                }
+                return undefined;
             }
             function entryToDeclaration(entry) {
                 if (ts.isDeclaration(entry.node.parent)) {
@@ -119178,37 +123119,31 @@ var ts;
                     var functionReference = entry.node;
                     var parent = functionReference.parent;
                     switch (parent.kind) {
-                        // Function call (foo(...) or super(...))
-                        case 191 /* CallExpression */:
-                            var callExpression = ts.tryCast(parent, ts.isCallExpression);
-                            if (callExpression && callExpression.expression === functionReference) {
-                                return callExpression;
+                        // foo(...) or super(...) or new Foo(...)
+                        case 192 /* CallExpression */:
+                        case 193 /* NewExpression */:
+                            var callOrNewExpression = ts.tryCast(parent, ts.isCallOrNewExpression);
+                            if (callOrNewExpression && callOrNewExpression.expression === functionReference) {
+                                return callOrNewExpression;
                             }
                             break;
-                        // Constructor call (new Foo(...))
-                        case 192 /* NewExpression */:
-                            var newExpression = ts.tryCast(parent, ts.isNewExpression);
-                            if (newExpression && newExpression.expression === functionReference) {
-                                return newExpression;
-                            }
-                            break;
-                        // Method call (x.foo(...))
-                        case 189 /* PropertyAccessExpression */:
+                        // x.foo(...)
+                        case 190 /* PropertyAccessExpression */:
                             var propertyAccessExpression = ts.tryCast(parent, ts.isPropertyAccessExpression);
                             if (propertyAccessExpression && propertyAccessExpression.parent && propertyAccessExpression.name === functionReference) {
-                                var callExpression_1 = ts.tryCast(propertyAccessExpression.parent, ts.isCallExpression);
-                                if (callExpression_1 && callExpression_1.expression === propertyAccessExpression) {
-                                    return callExpression_1;
+                                var callOrNewExpression_1 = ts.tryCast(propertyAccessExpression.parent, ts.isCallOrNewExpression);
+                                if (callOrNewExpression_1 && callOrNewExpression_1.expression === propertyAccessExpression) {
+                                    return callOrNewExpression_1;
                                 }
                             }
                             break;
-                        // Method call (x["foo"](...))
-                        case 190 /* ElementAccessExpression */:
+                        // x["foo"](...)
+                        case 191 /* ElementAccessExpression */:
                             var elementAccessExpression = ts.tryCast(parent, ts.isElementAccessExpression);
                             if (elementAccessExpression && elementAccessExpression.parent && elementAccessExpression.argumentExpression === functionReference) {
-                                var callExpression_2 = ts.tryCast(elementAccessExpression.parent, ts.isCallExpression);
-                                if (callExpression_2 && callExpression_2.expression === elementAccessExpression) {
-                                    return callExpression_2;
+                                var callOrNewExpression_2 = ts.tryCast(elementAccessExpression.parent, ts.isCallOrNewExpression);
+                                if (callOrNewExpression_2 && callOrNewExpression_2.expression === elementAccessExpression) {
+                                    return callOrNewExpression_2;
                                 }
                             }
                             break;
@@ -119222,14 +123157,14 @@ var ts;
                     var parent = reference.parent;
                     switch (parent.kind) {
                         // `C.foo`
-                        case 189 /* PropertyAccessExpression */:
+                        case 190 /* PropertyAccessExpression */:
                             var propertyAccessExpression = ts.tryCast(parent, ts.isPropertyAccessExpression);
                             if (propertyAccessExpression && propertyAccessExpression.expression === reference) {
                                 return propertyAccessExpression;
                             }
                             break;
                         // `C["foo"]`
-                        case 190 /* ElementAccessExpression */:
+                        case 191 /* ElementAccessExpression */:
                             var elementAccessExpression = ts.tryCast(parent, ts.isElementAccessExpression);
                             if (elementAccessExpression && elementAccessExpression.expression === reference) {
                                 return elementAccessExpression;
@@ -119248,7 +123183,10 @@ var ts;
             }
             function getFunctionDeclarationAtPosition(file, startPosition, checker) {
                 var node = ts.getTouchingToken(file, startPosition);
-                var functionDeclaration = ts.getContainingFunction(node);
+                var functionDeclaration = ts.getContainingFunctionDeclaration(node);
+                // don't offer refactor on top-level JSDoc
+                if (isTopLevelJSDoc(node))
+                    return undefined;
                 if (functionDeclaration
                     && isValidFunctionDeclaration(functionDeclaration, checker)
                     && ts.rangeContainsRange(functionDeclaration, node)
@@ -119256,31 +123194,57 @@ var ts;
                     return functionDeclaration;
                 return undefined;
             }
+            function isTopLevelJSDoc(node) {
+                var containingJSDoc = ts.findAncestor(node, ts.isJSDocNode);
+                if (containingJSDoc) {
+                    var containingNonJSDoc = ts.findAncestor(containingJSDoc, function (n) { return !ts.isJSDocNode(n); });
+                    return !!containingNonJSDoc && ts.isFunctionLikeDeclaration(containingNonJSDoc);
+                }
+                return false;
+            }
             function isValidFunctionDeclaration(functionDeclaration, checker) {
-                if (!isValidParameterNodeArray(functionDeclaration.parameters))
+                if (!isValidParameterNodeArray(functionDeclaration.parameters, checker))
                     return false;
                 switch (functionDeclaration.kind) {
-                    case 239 /* FunctionDeclaration */:
-                    case 156 /* MethodDeclaration */:
-                        return !!functionDeclaration.name && !!functionDeclaration.body && !checker.isImplementationOfOverload(functionDeclaration);
-                    case 157 /* Constructor */:
+                    case 240 /* FunctionDeclaration */:
+                        return hasNameOrDefault(functionDeclaration) && isSingleImplementation(functionDeclaration, checker);
+                    case 157 /* MethodDeclaration */:
+                        return isSingleImplementation(functionDeclaration, checker);
+                    case 158 /* Constructor */:
                         if (ts.isClassDeclaration(functionDeclaration.parent)) {
-                            return !!functionDeclaration.body && !!functionDeclaration.parent.name && !checker.isImplementationOfOverload(functionDeclaration);
+                            return hasNameOrDefault(functionDeclaration.parent) && isSingleImplementation(functionDeclaration, checker);
                         }
                         else {
-                            return isValidVariableDeclaration(functionDeclaration.parent.parent) && !!functionDeclaration.body && !checker.isImplementationOfOverload(functionDeclaration);
+                            return isValidVariableDeclaration(functionDeclaration.parent.parent)
+                                && isSingleImplementation(functionDeclaration, checker);
                         }
-                    case 196 /* FunctionExpression */:
-                    case 197 /* ArrowFunction */:
+                    case 197 /* FunctionExpression */:
+                    case 198 /* ArrowFunction */:
                         return isValidVariableDeclaration(functionDeclaration.parent);
                 }
                 return false;
             }
-            function isValidParameterNodeArray(parameters) {
-                return getRefactorableParametersLength(parameters) >= minimumParameterLength && ts.every(parameters, isValidParameterDeclaration);
+            function isSingleImplementation(functionDeclaration, checker) {
+                return !!functionDeclaration.body && !checker.isImplementationOfOverload(functionDeclaration);
             }
-            function isValidParameterDeclaration(paramDeclaration) {
-                return !paramDeclaration.modifiers && !paramDeclaration.decorators && ts.isIdentifier(paramDeclaration.name);
+            function hasNameOrDefault(functionOrClassDeclaration) {
+                if (!functionOrClassDeclaration.name) {
+                    var defaultKeyword = ts.findModifier(functionOrClassDeclaration, 81 /* DefaultKeyword */);
+                    return !!defaultKeyword;
+                }
+                return true;
+            }
+            function isValidParameterNodeArray(parameters, checker) {
+                return getRefactorableParametersLength(parameters) >= minimumParameterLength
+                    && ts.every(parameters, /*callback*/ function (/*callback*/ paramDecl) { return isValidParameterDeclaration(paramDecl, checker); });
+            }
+            function isValidParameterDeclaration(parameterDeclaration, checker) {
+                if (ts.isRestParameter(parameterDeclaration)) {
+                    var type = checker.getTypeAtLocation(parameterDeclaration);
+                    if (!checker.isArrayType(type) && !checker.isTupleType(type))
+                        return false;
+                }
+                return !parameterDeclaration.modifiers && !parameterDeclaration.decorators && ts.isIdentifier(parameterDeclaration.name);
             }
             function isValidVariableDeclaration(node) {
                 return ts.isVariableDeclaration(node) && ts.isVarConst(node) && ts.isIdentifier(node.name) && !node.type; // TODO: GH#30113
@@ -119300,13 +123264,22 @@ var ts;
                 }
                 return parameters;
             }
+            function createPropertyOrShorthandAssignment(name, initializer) {
+                if (ts.isIdentifier(initializer) && ts.getTextOfIdentifierOrLiteral(initializer) === name) {
+                    return ts.createShorthandPropertyAssignment(name);
+                }
+                return ts.createPropertyAssignment(name, initializer);
+            }
             function createNewArgument(functionDeclaration, functionArguments) {
                 var parameters = getRefactorableParameters(functionDeclaration.parameters);
                 var hasRestParameter = ts.isRestParameter(ts.last(parameters));
                 var nonRestArguments = hasRestParameter ? functionArguments.slice(0, parameters.length - 1) : functionArguments;
                 var properties = ts.map(nonRestArguments, function (arg, i) {
-                    var property = ts.createPropertyAssignment(getParameterName(parameters[i]), arg);
-                    ts.suppressLeadingAndTrailingTrivia(property.initializer);
+                    var parameterName = getParameterName(parameters[i]);
+                    var property = createPropertyOrShorthandAssignment(parameterName, arg);
+                    ts.suppressLeadingAndTrailingTrivia(property.name);
+                    if (ts.isPropertyAssignment(property))
+                        ts.suppressLeadingAndTrailingTrivia(property.initializer);
                     copyComments(arg, property);
                     return property;
                 });
@@ -119319,14 +123292,14 @@ var ts;
                 return objectLiteral;
             }
             function createNewParameters(functionDeclaration, program, host) {
+                var checker = program.getTypeChecker();
                 var refactorableParameters = getRefactorableParameters(functionDeclaration.parameters);
                 var bindingElements = ts.map(refactorableParameters, createBindingElementFromParameterDeclaration);
                 var objectParameterName = ts.createObjectBindingPattern(bindingElements);
                 var objectParameterType = createParameterTypeNode(refactorableParameters);
-                var checker = program.getTypeChecker();
                 var objectInitializer;
                 // If every parameter in the original function was optional, add an empty object initializer to the new object parameter
-                if (ts.every(refactorableParameters, checker.isOptionalParameter)) {
+                if (ts.every(refactorableParameters, isOptionalParameter)) {
                     objectInitializer = ts.createObjectLiteral();
                 }
                 var objectParameter = ts.createParameter(
@@ -119350,6 +123323,16 @@ var ts;
                     return ts.createNodeArray([newThisParameter, objectParameter]);
                 }
                 return ts.createNodeArray([objectParameter]);
+                function createBindingElementFromParameterDeclaration(parameterDeclaration) {
+                    var element = ts.createBindingElement(
+                    /*dotDotDotToken*/ undefined, 
+                    /*propertyName*/ undefined, getParameterName(parameterDeclaration), ts.isRestParameter(parameterDeclaration) && isOptionalParameter(parameterDeclaration) ? ts.createArrayLiteral() : parameterDeclaration.initializer);
+                    ts.suppressLeadingAndTrailingTrivia(element);
+                    if (parameterDeclaration.initializer && element.initializer) {
+                        copyComments(parameterDeclaration.initializer, element.initializer);
+                    }
+                    return element;
+                }
                 function createParameterTypeNode(parameters) {
                     var members = ts.map(parameters, createPropertySignatureFromParameterDeclaration);
                     var typeNode = ts.addEmitFlags(ts.createTypeLiteralNode(members), 1 /* SingleLine */);
@@ -119361,7 +123344,7 @@ var ts;
                         parameterType = getTypeNode(parameterDeclaration);
                     }
                     var propertySignature = ts.createPropertySignature(
-                    /*modifiers*/ undefined, getParameterName(parameterDeclaration), parameterDeclaration.initializer || ts.isRestParameter(parameterDeclaration) ? ts.createToken(56 /* QuestionToken */) : parameterDeclaration.questionToken, parameterType, 
+                    /*modifiers*/ undefined, getParameterName(parameterDeclaration), isOptionalParameter(parameterDeclaration) ? ts.createToken(56 /* QuestionToken */) : parameterDeclaration.questionToken, parameterType, 
                     /*initializer*/ undefined);
                     ts.suppressLeadingAndTrailingTrivia(propertySignature);
                     copyComments(parameterDeclaration.name, propertySignature.name);
@@ -119371,20 +123354,16 @@ var ts;
                     return propertySignature;
                 }
                 function getTypeNode(node) {
-                    var checker = program.getTypeChecker();
                     var type = checker.getTypeAtLocation(node);
                     return ts.getTypeNodeIfAccessible(type, node, program, host);
                 }
-            }
-            function createBindingElementFromParameterDeclaration(parameterDeclaration) {
-                var element = ts.createBindingElement(
-                /*dotDotDotToken*/ undefined, 
-                /*propertyName*/ undefined, getParameterName(parameterDeclaration), ts.isRestParameter(parameterDeclaration) ? ts.createArrayLiteral() : parameterDeclaration.initializer);
-                ts.suppressLeadingAndTrailingTrivia(element);
-                if (parameterDeclaration.initializer && element.initializer) {
-                    copyComments(parameterDeclaration.initializer, element.initializer);
+                function isOptionalParameter(parameterDeclaration) {
+                    if (ts.isRestParameter(parameterDeclaration)) {
+                        var type = checker.getTypeAtLocation(parameterDeclaration);
+                        return !checker.isTupleType(type);
+                    }
+                    return checker.isOptionalParameter(parameterDeclaration);
                 }
-                return element;
             }
             function copyComments(sourceNode, targetNode) {
                 var sourceFile = sourceNode.getSourceFile();
@@ -119411,10 +123390,15 @@ var ts;
             }
             function getClassNames(constructorDeclaration) {
                 switch (constructorDeclaration.parent.kind) {
-                    case 240 /* ClassDeclaration */:
+                    case 241 /* ClassDeclaration */:
                         var classDeclaration = constructorDeclaration.parent;
-                        return [classDeclaration.name];
-                    case 209 /* ClassExpression */:
+                        if (classDeclaration.name)
+                            return [classDeclaration.name];
+                        // If the class declaration doesn't have a name, it should have a default modifier.
+                        // We validated this in `isValidFunctionDeclaration` through `hasNameOrDefault`
+                        var defaultModifier = ts.Debug.assertDefined(ts.findModifier(classDeclaration, 81 /* DefaultKeyword */), "Nameless class declaration should be a default export");
+                        return [defaultModifier];
+                    case 210 /* ClassExpression */:
                         var classExpression = constructorDeclaration.parent;
                         var variableDeclaration = constructorDeclaration.parent.parent;
                         var className = classExpression.name;
@@ -119425,19 +123409,25 @@ var ts;
             }
             function getFunctionNames(functionDeclaration) {
                 switch (functionDeclaration.kind) {
-                    case 239 /* FunctionDeclaration */:
-                    case 156 /* MethodDeclaration */:
+                    case 240 /* FunctionDeclaration */:
+                        if (functionDeclaration.name)
+                            return [functionDeclaration.name];
+                        // If the function declaration doesn't have a name, it should have a default modifier.
+                        // We validated this in `isValidFunctionDeclaration` through `hasNameOrDefault`
+                        var defaultModifier = ts.Debug.assertDefined(ts.findModifier(functionDeclaration, 81 /* DefaultKeyword */), "Nameless function declaration should be a default export");
+                        return [defaultModifier];
+                    case 157 /* MethodDeclaration */:
                         return [functionDeclaration.name];
-                    case 157 /* Constructor */:
-                        var ctrKeyword = ts.findChildOfKind(functionDeclaration, 124 /* ConstructorKeyword */, functionDeclaration.getSourceFile());
-                        if (functionDeclaration.parent.kind === 209 /* ClassExpression */) {
+                    case 158 /* Constructor */:
+                        var ctrKeyword = ts.Debug.assertDefined(ts.findChildOfKind(functionDeclaration, 125 /* ConstructorKeyword */, functionDeclaration.getSourceFile()), "Constructor declaration should have constructor keyword");
+                        if (functionDeclaration.parent.kind === 210 /* ClassExpression */) {
                             var variableDeclaration = functionDeclaration.parent.parent;
                             return [variableDeclaration.name, ctrKeyword];
                         }
                         return [ctrKeyword];
-                    case 197 /* ArrowFunction */:
+                    case 198 /* ArrowFunction */:
                         return [functionDeclaration.parent.name];
-                    case 196 /* FunctionExpression */:
+                    case 197 /* FunctionExpression */:
                         if (functionDeclaration.name)
                             return [functionDeclaration.name, functionDeclaration.parent.name];
                         return [functionDeclaration.parent.name];
@@ -119445,7 +123435,7 @@ var ts;
                         return ts.Debug.assertNever(functionDeclaration);
                 }
             }
-        })(convertToNamedParameters = refactor.convertToNamedParameters || (refactor.convertToNamedParameters = {}));
+        })(convertParamsToDestructuredObject = refactor.convertParamsToDestructuredObject || (refactor.convertParamsToDestructuredObject = {}));
     })(refactor = ts.refactor || (ts.refactor = {}));
 })(ts || (ts = {}));
 var ts;
@@ -119454,7 +123444,7 @@ var ts;
     ts.servicesVersion = "0.8";
     function createNode(kind, pos, end, parent) {
         var node = ts.isNodeKind(kind) ? new NodeObject(kind, pos, end) :
-            kind === 72 /* Identifier */ ? new IdentifierObject(72 /* Identifier */, pos, end) :
+            kind === 73 /* Identifier */ ? new IdentifierObject(73 /* Identifier */, pos, end) :
                 new TokenObject(kind, pos, end);
         node.parent = parent;
         node.flags = parent.flags & 12679168 /* ContextFlags */;
@@ -119528,8 +123518,8 @@ var ts;
             if (!children.length) {
                 return undefined;
             }
-            var child = ts.find(children, function (kid) { return kid.kind < 288 /* FirstJSDocNode */ || kid.kind > 310 /* LastJSDocNode */; });
-            return child.kind < 148 /* FirstNode */ ?
+            var child = ts.find(children, function (kid) { return kid.kind < 289 /* FirstJSDocNode */ || kid.kind > 312 /* LastJSDocNode */; });
+            return child.kind < 149 /* FirstNode */ ?
                 child :
                 child.getFirstToken(sourceFile);
         };
@@ -119540,7 +123530,7 @@ var ts;
             if (!child) {
                 return undefined;
             }
-            return child.kind < 148 /* FirstNode */ ? child : child.getLastToken(sourceFile);
+            return child.kind < 149 /* FirstNode */ ? child : child.getLastToken(sourceFile);
         };
         NodeObject.prototype.forEachChild = function (cbNode, cbNodeArray) {
             return ts.forEachChild(this, cbNode, cbNodeArray);
@@ -119586,8 +123576,8 @@ var ts;
             var token = ts.scanner.scan();
             var textPos = ts.scanner.getTextPos();
             if (textPos <= end) {
-                if (token === 72 /* Identifier */) {
-                    ts.Debug.fail("Did not expect " + ts.Debug.showSyntaxKind(parent) + " to have an Identifier in its trivia");
+                if (token === 73 /* Identifier */) {
+                    ts.Debug.fail("Did not expect " + ts.Debug.formatSyntaxKind(parent.kind) + " to have an Identifier in its trivia");
                 }
                 nodes.push(createNode(token, pos, textPos, parent));
             }
@@ -119598,7 +123588,7 @@ var ts;
         }
     }
     function createSyntaxList(nodes, parent) {
-        var list = createNode(311 /* SyntaxList */, nodes.pos, nodes.end, parent);
+        var list = createNode(313 /* SyntaxList */, nodes.pos, nodes.end, parent);
         list._children = [];
         var pos = nodes.pos;
         for (var _i = 0, nodes_1 = nodes; _i < nodes_1.length; _i++) {
@@ -119732,7 +123722,7 @@ var ts;
         });
         return IdentifierObject;
     }(TokenOrIdentifierObject));
-    IdentifierObject.prototype.kind = 72 /* Identifier */;
+    IdentifierObject.prototype.kind = 73 /* Identifier */;
     var TypeObject = /** @class */ (function () {
         function TypeObject(checker, flags) {
             this.checker = checker;
@@ -119933,10 +123923,10 @@ var ts;
             }
             function visit(node) {
                 switch (node.kind) {
-                    case 239 /* FunctionDeclaration */:
-                    case 196 /* FunctionExpression */:
-                    case 156 /* MethodDeclaration */:
-                    case 155 /* MethodSignature */:
+                    case 240 /* FunctionDeclaration */:
+                    case 197 /* FunctionExpression */:
+                    case 157 /* MethodDeclaration */:
+                    case 156 /* MethodSignature */:
                         var functionDeclaration = node;
                         var declarationName = getDeclarationName(functionDeclaration);
                         if (declarationName) {
@@ -119956,31 +123946,31 @@ var ts;
                         }
                         ts.forEachChild(node, visit);
                         break;
-                    case 240 /* ClassDeclaration */:
-                    case 209 /* ClassExpression */:
-                    case 241 /* InterfaceDeclaration */:
-                    case 242 /* TypeAliasDeclaration */:
-                    case 243 /* EnumDeclaration */:
-                    case 244 /* ModuleDeclaration */:
-                    case 248 /* ImportEqualsDeclaration */:
-                    case 257 /* ExportSpecifier */:
-                    case 253 /* ImportSpecifier */:
-                    case 250 /* ImportClause */:
-                    case 251 /* NamespaceImport */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
-                    case 168 /* TypeLiteral */:
+                    case 241 /* ClassDeclaration */:
+                    case 210 /* ClassExpression */:
+                    case 242 /* InterfaceDeclaration */:
+                    case 243 /* TypeAliasDeclaration */:
+                    case 244 /* EnumDeclaration */:
+                    case 245 /* ModuleDeclaration */:
+                    case 249 /* ImportEqualsDeclaration */:
+                    case 258 /* ExportSpecifier */:
+                    case 254 /* ImportSpecifier */:
+                    case 251 /* ImportClause */:
+                    case 252 /* NamespaceImport */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
+                    case 169 /* TypeLiteral */:
                         addDeclaration(node);
                         ts.forEachChild(node, visit);
                         break;
-                    case 151 /* Parameter */:
+                    case 152 /* Parameter */:
                         // Only consider parameter properties
                         if (!ts.hasModifier(node, 92 /* ParameterPropertyModifier */)) {
                             break;
                         }
                     // falls through
-                    case 237 /* VariableDeclaration */:
-                    case 186 /* BindingElement */: {
+                    case 238 /* VariableDeclaration */:
+                    case 187 /* BindingElement */: {
                         var decl = node;
                         if (ts.isBindingPattern(decl.name)) {
                             ts.forEachChild(decl.name, visit);
@@ -119991,19 +123981,19 @@ var ts;
                         }
                     }
                     // falls through
-                    case 278 /* EnumMember */:
-                    case 154 /* PropertyDeclaration */:
-                    case 153 /* PropertySignature */:
+                    case 279 /* EnumMember */:
+                    case 155 /* PropertyDeclaration */:
+                    case 154 /* PropertySignature */:
                         addDeclaration(node);
                         break;
-                    case 255 /* ExportDeclaration */:
+                    case 256 /* ExportDeclaration */:
                         // Handle named exports case e.g.:
                         //    export {a, b as B} from "mod";
                         if (node.exportClause) {
                             ts.forEach(node.exportClause.elements, visit);
                         }
                         break;
-                    case 249 /* ImportDeclaration */:
+                    case 250 /* ImportDeclaration */:
                         var importClause = node.importClause;
                         if (importClause) {
                             // Handle default import case e.g.:
@@ -120015,7 +124005,7 @@ var ts;
                             //    import * as NS from "mod";
                             //    import {a, b as B} from "mod";
                             if (importClause.namedBindings) {
-                                if (importClause.namedBindings.kind === 251 /* NamespaceImport */) {
+                                if (importClause.namedBindings.kind === 252 /* NamespaceImport */) {
                                     addDeclaration(importClause.namedBindings);
                                 }
                                 else {
@@ -120024,7 +124014,7 @@ var ts;
                             }
                         }
                         break;
-                    case 204 /* BinaryExpression */:
+                    case 205 /* BinaryExpression */:
                         if (ts.getAssignmentDeclarationKind(node) !== 0 /* None */) {
                             addDeclaration(node);
                         }
@@ -120193,7 +124183,7 @@ var ts;
             var sourceFile;
             if (this.currentFileName !== fileName) {
                 // This is a new file, just parse it
-                sourceFile = createLanguageServiceSourceFile(fileName, scriptSnapshot, 7 /* Latest */, version, /*setNodeParents*/ true, scriptKind);
+                sourceFile = createLanguageServiceSourceFile(fileName, scriptSnapshot, 99 /* Latest */, version, /*setNodeParents*/ true, scriptKind);
             }
             else if (this.currentFileVersion !== version) {
                 // This is the same file, just a newer version. Incrementally parse the file.
@@ -120317,9 +124307,9 @@ var ts;
     }());
     ts.ThrottledCancellationToken = ThrottledCancellationToken;
     function createLanguageService(host, documentRegistry, syntaxOnly) {
+        var _a;
         if (documentRegistry === void 0) { documentRegistry = ts.createDocumentRegistry(host.useCaseSensitiveFileNames && host.useCaseSensitiveFileNames(), host.getCurrentDirectory()); }
         if (syntaxOnly === void 0) { syntaxOnly = false; }
-        var _a;
         var syntaxTreeCache = new SyntaxTreeCache(host);
         var program;
         var lastProjectVersion;
@@ -120350,7 +124340,7 @@ var ts;
         function getValidSourceFile(fileName) {
             var sourceFile = program.getSourceFile(fileName);
             if (!sourceFile) {
-                throw new Error("Could not find file: '" + fileName + "'.");
+                throw new Error("Could not find sourceFile: '" + fileName + "' in " + (program && JSON.stringify(program.getSourceFiles().map(function (f) { return f.fileName; }))) + ".");
             }
             return sourceFile;
         }
@@ -120597,41 +124587,48 @@ var ts;
                 return undefined;
             }
             var typeChecker = program.getTypeChecker();
-            var symbol = getSymbolAtLocationForQuickInfo(node, typeChecker);
+            var nodeForQuickInfo = getNodeForQuickInfo(node);
+            var symbol = getSymbolAtLocationForQuickInfo(nodeForQuickInfo, typeChecker);
             if (!symbol || typeChecker.isUnknownSymbol(symbol)) {
-                var type_2 = shouldGetType(sourceFile, node, position) ? typeChecker.getTypeAtLocation(node) : undefined;
+                var type_2 = shouldGetType(sourceFile, nodeForQuickInfo, position) ? typeChecker.getTypeAtLocation(nodeForQuickInfo) : undefined;
                 return type_2 && {
                     kind: "" /* unknown */,
                     kindModifiers: "" /* none */,
-                    textSpan: ts.createTextSpanFromNode(node, sourceFile),
-                    displayParts: typeChecker.runWithCancellationToken(cancellationToken, function (typeChecker) { return ts.typeToDisplayParts(typeChecker, type_2, ts.getContainerNode(node)); }),
+                    textSpan: ts.createTextSpanFromNode(nodeForQuickInfo, sourceFile),
+                    displayParts: typeChecker.runWithCancellationToken(cancellationToken, function (typeChecker) { return ts.typeToDisplayParts(typeChecker, type_2, ts.getContainerNode(nodeForQuickInfo)); }),
                     documentation: type_2.symbol ? type_2.symbol.getDocumentationComment(typeChecker) : undefined,
                     tags: type_2.symbol ? type_2.symbol.getJsDocTags() : undefined
                 };
             }
             var _a = typeChecker.runWithCancellationToken(cancellationToken, function (typeChecker) {
-                return ts.SymbolDisplay.getSymbolDisplayPartsDocumentationAndSymbolKind(typeChecker, symbol, sourceFile, ts.getContainerNode(node), node);
+                return ts.SymbolDisplay.getSymbolDisplayPartsDocumentationAndSymbolKind(typeChecker, symbol, sourceFile, ts.getContainerNode(nodeForQuickInfo), nodeForQuickInfo);
             }), symbolKind = _a.symbolKind, displayParts = _a.displayParts, documentation = _a.documentation, tags = _a.tags;
             return {
                 kind: symbolKind,
                 kindModifiers: ts.SymbolDisplay.getSymbolModifiers(symbol),
-                textSpan: ts.createTextSpanFromNode(node, sourceFile),
+                textSpan: ts.createTextSpanFromNode(nodeForQuickInfo, sourceFile),
                 displayParts: displayParts,
                 documentation: documentation,
                 tags: tags,
             };
         }
+        function getNodeForQuickInfo(node) {
+            if (ts.isNewExpression(node.parent) && node.pos === node.parent.pos) {
+                return node.parent.expression;
+            }
+            return node;
+        }
         function shouldGetType(sourceFile, node, position) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return !ts.isLabelName(node) && !ts.isTagName(node);
-                case 189 /* PropertyAccessExpression */:
-                case 148 /* QualifiedName */:
+                case 190 /* PropertyAccessExpression */:
+                case 149 /* QualifiedName */:
                     // Don't return quickInfo if inside the comment in `a/**/.b`
                     return !ts.isInComment(sourceFile, position);
-                case 100 /* ThisKeyword */:
-                case 178 /* ThisType */:
-                case 98 /* SuperKeyword */:
+                case 101 /* ThisKeyword */:
+                case 179 /* ThisType */:
+                case 99 /* SuperKeyword */:
                     return true;
                 default:
                     return false;
@@ -120657,13 +124654,7 @@ var ts;
         }
         /// References and Occurrences
         function getOccurrencesAtPosition(fileName, position) {
-            return ts.flatMap(getDocumentHighlights(fileName, position, [fileName]), function (entry) { return entry.highlightSpans.map(function (highlightSpan) { return ({
-                fileName: entry.fileName,
-                textSpan: highlightSpan.textSpan,
-                isWriteAccess: highlightSpan.kind === "writtenReference" /* writtenReference */,
-                isDefinition: false,
-                isInString: highlightSpan.isInString,
-            }); }); });
+            return ts.flatMap(getDocumentHighlights(fileName, position, [fileName]), function (entry) { return entry.highlightSpans.map(function (highlightSpan) { return (__assign({ fileName: entry.fileName, textSpan: highlightSpan.textSpan, isWriteAccess: highlightSpan.kind === "writtenReference" /* writtenReference */, isDefinition: false }, highlightSpan.isInString && { isInString: true }, highlightSpan.contextSpan && { contextSpan: highlightSpan.contextSpan })); }); });
         }
         function getDocumentHighlights(fileName, position, filesToSearch) {
             var normalizedFileName = ts.normalizePath(fileName);
@@ -120680,7 +124671,8 @@ var ts;
             if (ts.isIdentifier(node) && (ts.isJsxOpeningElement(node.parent) || ts.isJsxClosingElement(node.parent)) && ts.isIntrinsicJsxName(node.escapedText)) {
                 var _a = node.parent.parent, openingElement = _a.openingElement, closingElement = _a.closingElement;
                 return [openingElement, closingElement].map(function (node) {
-                    return ({ fileName: sourceFile.fileName, textSpan: ts.createTextSpanFromNode(node.tagName, sourceFile) });
+                    var textSpan = ts.createTextSpanFromNode(node.tagName, sourceFile);
+                    return __assign({ fileName: sourceFile.fileName, textSpan: textSpan }, ts.FindAllReferences.toContextSpan(textSpan, sourceFile, node.parent));
                 });
             }
             else {
@@ -120738,16 +124730,16 @@ var ts;
                 return undefined;
             }
             switch (node.kind) {
-                case 189 /* PropertyAccessExpression */:
-                case 148 /* QualifiedName */:
+                case 190 /* PropertyAccessExpression */:
+                case 149 /* QualifiedName */:
                 case 10 /* StringLiteral */:
-                case 87 /* FalseKeyword */:
-                case 102 /* TrueKeyword */:
-                case 96 /* NullKeyword */:
-                case 98 /* SuperKeyword */:
-                case 100 /* ThisKeyword */:
-                case 178 /* ThisType */:
-                case 72 /* Identifier */:
+                case 88 /* FalseKeyword */:
+                case 103 /* TrueKeyword */:
+                case 97 /* NullKeyword */:
+                case 99 /* SuperKeyword */:
+                case 101 /* ThisKeyword */:
+                case 179 /* ThisType */:
+                case 73 /* Identifier */:
                     break;
                 // Cant create the text span
                 default:
@@ -120763,7 +124755,7 @@ var ts;
                     // If this is name of a module declarations, check if this is right side of dotted module name
                     // If parent of the module declaration which is parent of this node is module declaration and its body is the module declaration that this node is name of
                     // Then this name is name from dotted module
-                    if (nodeForStartPos.parent.parent.kind === 244 /* ModuleDeclaration */ &&
+                    if (nodeForStartPos.parent.parent.kind === 245 /* ModuleDeclaration */ &&
                         nodeForStartPos.parent.parent.body === nodeForStartPos.parent) {
                         // Use parent module declarations name for start pos
                         nodeForStartPos = nodeForStartPos.parent.parent.name;
@@ -120906,30 +124898,14 @@ var ts;
         }
         function applyCodeActionCommand(fileName, actionOrFormatSettingsOrUndefined) {
             var action = typeof fileName === "string" ? actionOrFormatSettingsOrUndefined : fileName;
-            var formatSettings = typeof fileName !== "string" ? actionOrFormatSettingsOrUndefined : undefined;
-            return ts.isArray(action) ? Promise.all(action.map(function (a) { return applySingleCodeActionCommand(a, formatSettings); })) : applySingleCodeActionCommand(action, formatSettings);
+            return ts.isArray(action) ? Promise.all(action.map(function (a) { return applySingleCodeActionCommand(a); })) : applySingleCodeActionCommand(action);
         }
-        function applySingleCodeActionCommand(action, formatSettings) {
+        function applySingleCodeActionCommand(action) {
             var getPath = function (path) { return ts.toPath(path, currentDirectory, getCanonicalFileName); };
-            switch (action.type) {
-                case "install package":
-                    return host.installPackage
-                        ? host.installPackage({ fileName: getPath(action.file), packageName: action.packageName })
-                        : Promise.reject("Host does not implement `installPackage`");
-                case "generate types": {
-                    var fileToGenerateTypesFor = action.fileToGenerateTypesFor, outputFileName_1 = action.outputFileName;
-                    if (!host.inspectValue)
-                        return Promise.reject("Host does not implement `installPackage`");
-                    var valueInfoPromise = host.inspectValue({ fileNameToRequire: fileToGenerateTypesFor });
-                    return valueInfoPromise.then(function (valueInfo) {
-                        var fullOut = getPath(outputFileName_1);
-                        host.writeFile(fullOut, ts.valueInfoToDeclarationFileText(valueInfo, formatSettings || ts.testFormatSettings)); // TODO: GH#18217
-                        return { successMessage: "Wrote types to '" + fullOut + "'" };
-                    });
-                }
-                default:
-                    return ts.Debug.assertNever(action);
-            }
+            ts.Debug.assertEqual(action.type, "install package");
+            return host.installPackage
+                ? host.installPackage({ fileName: getPath(action.file), packageName: action.packageName })
+                : Promise.reject("Host does not implement `installPackage`");
         }
         function getDocCommentTemplateAtPosition(fileName, position) {
             return ts.JsDoc.getDocCommentTemplateAtPosition(ts.getNewLineOrDefaultFromHost(host), syntaxTreeCache.getCurrentSourceFile(fileName), position);
@@ -121125,6 +125101,9 @@ var ts;
                 preferences: preferences,
             };
         }
+        function getSmartSelectionRange(fileName, position) {
+            return ts.SmartSelectionRange.getSmartSelectionRange(position, syntaxTreeCache.getCurrentSourceFile(fileName));
+        }
         function getApplicableRefactors(fileName, positionOrRange, preferences) {
             if (preferences === void 0) { preferences = ts.emptyOptions; }
             synchronizeHostData();
@@ -121165,6 +125144,7 @@ var ts;
             getBreakpointStatementAtPosition: getBreakpointStatementAtPosition,
             getNavigateToItems: getNavigateToItems,
             getRenameInfo: getRenameInfo,
+            getSmartSelectionRange: getSmartSelectionRange,
             findRenameLocations: findRenameLocations,
             getNavigationBarItems: getNavigationBarItems,
             getNavigationTree: getNavigationTree,
@@ -121227,7 +125207,7 @@ var ts;
      */
     function literalIsName(node) {
         return ts.isDeclarationName(node) ||
-            node.parent.kind === 259 /* ExternalModuleReference */ ||
+            node.parent.kind === 260 /* ExternalModuleReference */ ||
             isArgumentOfElementAccessExpression(node) ||
             ts.isLiteralComputedPropertyDeclarationName(node);
     }
@@ -121244,13 +125224,13 @@ var ts;
         switch (node.kind) {
             case 10 /* StringLiteral */:
             case 8 /* NumericLiteral */:
-                if (node.parent.kind === 149 /* ComputedPropertyName */) {
+                if (node.parent.kind === 150 /* ComputedPropertyName */) {
                     return ts.isObjectLiteralElement(node.parent.parent) ? node.parent.parent : undefined;
                 }
             // falls through
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 return ts.isObjectLiteralElement(node.parent) &&
-                    (node.parent.parent.kind === 188 /* ObjectLiteralExpression */ || node.parent.parent.kind === 268 /* JsxAttributes */) &&
+                    (node.parent.parent.kind === 189 /* ObjectLiteralExpression */ || node.parent.parent.kind === 269 /* JsxAttributes */) &&
                     node.parent.name === node ? node.parent : undefined;
         }
         return undefined;
@@ -121292,7 +125272,7 @@ var ts;
     function isArgumentOfElementAccessExpression(node) {
         return node &&
             node.parent &&
-            node.parent.kind === 190 /* ElementAccessExpression */ &&
+            node.parent.kind === 191 /* ElementAccessExpression */ &&
             node.parent.argumentExpression === node;
     }
     /**
@@ -121372,114 +125352,114 @@ var ts;
                 if (node) {
                     var parent = node.parent;
                     switch (node.kind) {
-                        case 219 /* VariableStatement */:
+                        case 220 /* VariableStatement */:
                             // Span on first variable declaration
                             return spanInVariableDeclaration(node.declarationList.declarations[0]);
-                        case 237 /* VariableDeclaration */:
-                        case 154 /* PropertyDeclaration */:
-                        case 153 /* PropertySignature */:
+                        case 238 /* VariableDeclaration */:
+                        case 155 /* PropertyDeclaration */:
+                        case 154 /* PropertySignature */:
                             return spanInVariableDeclaration(node);
-                        case 151 /* Parameter */:
+                        case 152 /* Parameter */:
                             return spanInParameterDeclaration(node);
-                        case 239 /* FunctionDeclaration */:
-                        case 156 /* MethodDeclaration */:
-                        case 155 /* MethodSignature */:
-                        case 158 /* GetAccessor */:
-                        case 159 /* SetAccessor */:
-                        case 157 /* Constructor */:
-                        case 196 /* FunctionExpression */:
-                        case 197 /* ArrowFunction */:
+                        case 240 /* FunctionDeclaration */:
+                        case 157 /* MethodDeclaration */:
+                        case 156 /* MethodSignature */:
+                        case 159 /* GetAccessor */:
+                        case 160 /* SetAccessor */:
+                        case 158 /* Constructor */:
+                        case 197 /* FunctionExpression */:
+                        case 198 /* ArrowFunction */:
                             return spanInFunctionDeclaration(node);
-                        case 218 /* Block */:
+                        case 219 /* Block */:
                             if (ts.isFunctionBlock(node)) {
                                 return spanInFunctionBlock(node);
                             }
                         // falls through
-                        case 245 /* ModuleBlock */:
+                        case 246 /* ModuleBlock */:
                             return spanInBlock(node);
-                        case 274 /* CatchClause */:
+                        case 275 /* CatchClause */:
                             return spanInBlock(node.block);
-                        case 221 /* ExpressionStatement */:
+                        case 222 /* ExpressionStatement */:
                             // span on the expression
                             return textSpan(node.expression);
-                        case 230 /* ReturnStatement */:
+                        case 231 /* ReturnStatement */:
                             // span on return keyword and expression if present
                             return textSpan(node.getChildAt(0), node.expression);
-                        case 224 /* WhileStatement */:
+                        case 225 /* WhileStatement */:
                             // Span on while(...)
                             return textSpanEndingAtNextToken(node, node.expression);
-                        case 223 /* DoStatement */:
+                        case 224 /* DoStatement */:
                             // span in statement of the do statement
                             return spanInNode(node.statement);
-                        case 236 /* DebuggerStatement */:
+                        case 237 /* DebuggerStatement */:
                             // span on debugger keyword
                             return textSpan(node.getChildAt(0));
-                        case 222 /* IfStatement */:
+                        case 223 /* IfStatement */:
                             // set on if(..) span
                             return textSpanEndingAtNextToken(node, node.expression);
-                        case 233 /* LabeledStatement */:
+                        case 234 /* LabeledStatement */:
                             // span in statement
                             return spanInNode(node.statement);
-                        case 229 /* BreakStatement */:
-                        case 228 /* ContinueStatement */:
+                        case 230 /* BreakStatement */:
+                        case 229 /* ContinueStatement */:
                             // On break or continue keyword and label if present
                             return textSpan(node.getChildAt(0), node.label);
-                        case 225 /* ForStatement */:
+                        case 226 /* ForStatement */:
                             return spanInForStatement(node);
-                        case 226 /* ForInStatement */:
+                        case 227 /* ForInStatement */:
                             // span of for (a in ...)
                             return textSpanEndingAtNextToken(node, node.expression);
-                        case 227 /* ForOfStatement */:
+                        case 228 /* ForOfStatement */:
                             // span in initializer
                             return spanInInitializerOfForLike(node);
-                        case 232 /* SwitchStatement */:
+                        case 233 /* SwitchStatement */:
                             // span on switch(...)
                             return textSpanEndingAtNextToken(node, node.expression);
-                        case 271 /* CaseClause */:
-                        case 272 /* DefaultClause */:
+                        case 272 /* CaseClause */:
+                        case 273 /* DefaultClause */:
                             // span in first statement of the clause
                             return spanInNode(node.statements[0]);
-                        case 235 /* TryStatement */:
+                        case 236 /* TryStatement */:
                             // span in try block
                             return spanInBlock(node.tryBlock);
-                        case 234 /* ThrowStatement */:
+                        case 235 /* ThrowStatement */:
                             // span in throw ...
                             return textSpan(node, node.expression);
-                        case 254 /* ExportAssignment */:
+                        case 255 /* ExportAssignment */:
                             // span on export = id
                             return textSpan(node, node.expression);
-                        case 248 /* ImportEqualsDeclaration */:
+                        case 249 /* ImportEqualsDeclaration */:
                             // import statement without including semicolon
                             return textSpan(node, node.moduleReference);
-                        case 249 /* ImportDeclaration */:
+                        case 250 /* ImportDeclaration */:
                             // import statement without including semicolon
                             return textSpan(node, node.moduleSpecifier);
-                        case 255 /* ExportDeclaration */:
+                        case 256 /* ExportDeclaration */:
                             // import statement without including semicolon
                             return textSpan(node, node.moduleSpecifier);
-                        case 244 /* ModuleDeclaration */:
+                        case 245 /* ModuleDeclaration */:
                             // span on complete module if it is instantiated
                             if (ts.getModuleInstanceState(node) !== 1 /* Instantiated */) {
                                 return undefined;
                             }
                         // falls through
-                        case 240 /* ClassDeclaration */:
-                        case 243 /* EnumDeclaration */:
-                        case 278 /* EnumMember */:
-                        case 186 /* BindingElement */:
+                        case 241 /* ClassDeclaration */:
+                        case 244 /* EnumDeclaration */:
+                        case 279 /* EnumMember */:
+                        case 187 /* BindingElement */:
                             // span on complete node
                             return textSpan(node);
-                        case 231 /* WithStatement */:
+                        case 232 /* WithStatement */:
                             // span in statement
                             return spanInNode(node.statement);
-                        case 152 /* Decorator */:
+                        case 153 /* Decorator */:
                             return spanInNodeArray(parent.decorators);
-                        case 184 /* ObjectBindingPattern */:
-                        case 185 /* ArrayBindingPattern */:
+                        case 185 /* ObjectBindingPattern */:
+                        case 186 /* ArrayBindingPattern */:
                             return spanInBindingPattern(node);
                         // No breakpoint in interface, type alias
-                        case 241 /* InterfaceDeclaration */:
-                        case 242 /* TypeAliasDeclaration */:
+                        case 242 /* InterfaceDeclaration */:
+                        case 243 /* TypeAliasDeclaration */:
                             return undefined;
                         // Tokens:
                         case 26 /* SemicolonToken */:
@@ -121503,13 +125483,13 @@ var ts;
                         case 28 /* LessThanToken */:
                             return spanInGreaterThanOrLessThanToken(node);
                         // Keywords:
-                        case 107 /* WhileKeyword */:
+                        case 108 /* WhileKeyword */:
                             return spanInWhileKeyword(node);
-                        case 83 /* ElseKeyword */:
-                        case 75 /* CatchKeyword */:
-                        case 88 /* FinallyKeyword */:
+                        case 84 /* ElseKeyword */:
+                        case 76 /* CatchKeyword */:
+                        case 89 /* FinallyKeyword */:
                             return spanInNextNode(node);
-                        case 147 /* OfKeyword */:
+                        case 148 /* OfKeyword */:
                             return spanInOfKeyword(node);
                         default:
                             // Destructuring pattern in destructuring assignment
@@ -121521,14 +125501,14 @@ var ts;
                             // Set breakpoint on identifier element of destructuring pattern
                             // `a` or `...c` or `d: x` from
                             // `[a, b, ...c]` or `{ a, b }` or `{ d: x }` from destructuring pattern
-                            if ((node.kind === 72 /* Identifier */ ||
-                                node.kind === 208 /* SpreadElement */ ||
-                                node.kind === 275 /* PropertyAssignment */ ||
-                                node.kind === 276 /* ShorthandPropertyAssignment */) &&
+                            if ((node.kind === 73 /* Identifier */ ||
+                                node.kind === 209 /* SpreadElement */ ||
+                                node.kind === 276 /* PropertyAssignment */ ||
+                                node.kind === 277 /* ShorthandPropertyAssignment */) &&
                                 ts.isArrayLiteralOrObjectLiteralDestructuringPattern(parent)) {
                                 return textSpan(node);
                             }
-                            if (node.kind === 204 /* BinaryExpression */) {
+                            if (node.kind === 205 /* BinaryExpression */) {
                                 var _a = node, left = _a.left, operatorToken = _a.operatorToken;
                                 // Set breakpoint in destructuring pattern if its destructuring assignment
                                 // [a, b, c] or {a, b, c} of
@@ -121537,7 +125517,7 @@ var ts;
                                 if (ts.isArrayLiteralOrObjectLiteralDestructuringPattern(left)) {
                                     return spanInArrayLiteralOrObjectLiteralDestructuringPattern(left);
                                 }
-                                if (operatorToken.kind === 59 /* EqualsToken */ && ts.isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent)) {
+                                if (operatorToken.kind === 60 /* EqualsToken */ && ts.isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent)) {
                                     // Set breakpoint on assignment expression element of destructuring pattern
                                     // a = expression of
                                     // [a = expression, b, c] = someExpression or
@@ -121550,22 +125530,22 @@ var ts;
                             }
                             if (ts.isExpressionNode(node)) {
                                 switch (parent.kind) {
-                                    case 223 /* DoStatement */:
+                                    case 224 /* DoStatement */:
                                         // Set span as if on while keyword
                                         return spanInPreviousNode(node);
-                                    case 152 /* Decorator */:
+                                    case 153 /* Decorator */:
                                         // Set breakpoint on the decorator emit
                                         return spanInNode(node.parent);
-                                    case 225 /* ForStatement */:
-                                    case 227 /* ForOfStatement */:
+                                    case 226 /* ForStatement */:
+                                    case 228 /* ForOfStatement */:
                                         return textSpan(node);
-                                    case 204 /* BinaryExpression */:
+                                    case 205 /* BinaryExpression */:
                                         if (node.parent.operatorToken.kind === 27 /* CommaToken */) {
                                             // If this is a comma expression, the breakpoint is possible in this expression
                                             return textSpan(node);
                                         }
                                         break;
-                                    case 197 /* ArrowFunction */:
+                                    case 198 /* ArrowFunction */:
                                         if (node.parent.body === node) {
                                             // If this is body of arrow function, it is allowed to have the breakpoint
                                             return textSpan(node);
@@ -121574,21 +125554,21 @@ var ts;
                                 }
                             }
                             switch (node.parent.kind) {
-                                case 275 /* PropertyAssignment */:
+                                case 276 /* PropertyAssignment */:
                                     // If this is name of property assignment, set breakpoint in the initializer
                                     if (node.parent.name === node &&
                                         !ts.isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent.parent)) {
                                         return spanInNode(node.parent.initializer);
                                     }
                                     break;
-                                case 194 /* TypeAssertionExpression */:
+                                case 195 /* TypeAssertionExpression */:
                                     // Breakpoint in type assertion goes to its operand
                                     if (node.parent.type === node) {
                                         return spanInNextNode(node.parent.type);
                                     }
                                     break;
-                                case 237 /* VariableDeclaration */:
-                                case 151 /* Parameter */: {
+                                case 238 /* VariableDeclaration */:
+                                case 152 /* Parameter */: {
                                     // initializer of variable/parameter declaration go to previous node
                                     var _b = node.parent, initializer = _b.initializer, type = _b.type;
                                     if (initializer === node || type === node || ts.isAssignmentOperator(node.kind)) {
@@ -121596,7 +125576,7 @@ var ts;
                                     }
                                     break;
                                 }
-                                case 204 /* BinaryExpression */: {
+                                case 205 /* BinaryExpression */: {
                                     var left = node.parent.left;
                                     if (ts.isArrayLiteralOrObjectLiteralDestructuringPattern(left) && node !== left) {
                                         // If initializer of destructuring assignment move to previous token
@@ -121626,7 +125606,7 @@ var ts;
                 }
                 function spanInVariableDeclaration(variableDeclaration) {
                     // If declaration of for in statement, just set the span in parent
-                    if (variableDeclaration.parent.parent.kind === 226 /* ForInStatement */) {
+                    if (variableDeclaration.parent.parent.kind === 227 /* ForInStatement */) {
                         return spanInNode(variableDeclaration.parent.parent);
                     }
                     var parent = variableDeclaration.parent;
@@ -121638,7 +125618,7 @@ var ts;
                     // or its declaration from 'for of'
                     if (variableDeclaration.initializer ||
                         ts.hasModifier(variableDeclaration, 1 /* Export */) ||
-                        parent.parent.kind === 227 /* ForOfStatement */) {
+                        parent.parent.kind === 228 /* ForOfStatement */) {
                         return textSpanFromVariableDeclaration(variableDeclaration);
                     }
                     if (ts.isVariableDeclarationList(variableDeclaration.parent) &&
@@ -121679,7 +125659,7 @@ var ts;
                 }
                 function canFunctionHaveSpanInWholeDeclaration(functionDeclaration) {
                     return ts.hasModifier(functionDeclaration, 1 /* Export */) ||
-                        (functionDeclaration.parent.kind === 240 /* ClassDeclaration */ && functionDeclaration.kind !== 157 /* Constructor */);
+                        (functionDeclaration.parent.kind === 241 /* ClassDeclaration */ && functionDeclaration.kind !== 158 /* Constructor */);
                 }
                 function spanInFunctionDeclaration(functionDeclaration) {
                     // No breakpoints in the function signature
@@ -121702,26 +125682,26 @@ var ts;
                 }
                 function spanInBlock(block) {
                     switch (block.parent.kind) {
-                        case 244 /* ModuleDeclaration */:
+                        case 245 /* ModuleDeclaration */:
                             if (ts.getModuleInstanceState(block.parent) !== 1 /* Instantiated */) {
                                 return undefined;
                             }
                         // falls through
                         // Set on parent if on same line otherwise on first statement
-                        case 224 /* WhileStatement */:
-                        case 222 /* IfStatement */:
-                        case 226 /* ForInStatement */:
+                        case 225 /* WhileStatement */:
+                        case 223 /* IfStatement */:
+                        case 227 /* ForInStatement */:
                             return spanInNodeIfStartsOnSameLine(block.parent, block.statements[0]);
                         // Set span on previous token if it starts on same line otherwise on the first statement of the block
-                        case 225 /* ForStatement */:
-                        case 227 /* ForOfStatement */:
+                        case 226 /* ForStatement */:
+                        case 228 /* ForOfStatement */:
                             return spanInNodeIfStartsOnSameLine(ts.findPrecedingToken(block.pos, sourceFile, block.parent), block.statements[0]);
                     }
                     // Default action is to set on first statement
                     return spanInNode(block.statements[0]);
                 }
                 function spanInInitializerOfForLike(forLikeStatement) {
-                    if (forLikeStatement.initializer.kind === 238 /* VariableDeclarationList */) {
+                    if (forLikeStatement.initializer.kind === 239 /* VariableDeclarationList */) {
                         // Declaration list - set breakpoint in first declaration
                         var variableDeclarationList = forLikeStatement.initializer;
                         if (variableDeclarationList.declarations.length > 0) {
@@ -121746,21 +125726,21 @@ var ts;
                 }
                 function spanInBindingPattern(bindingPattern) {
                     // Set breakpoint in first binding element
-                    var firstBindingElement = ts.forEach(bindingPattern.elements, function (element) { return element.kind !== 210 /* OmittedExpression */ ? element : undefined; });
+                    var firstBindingElement = ts.forEach(bindingPattern.elements, function (element) { return element.kind !== 211 /* OmittedExpression */ ? element : undefined; });
                     if (firstBindingElement) {
                         return spanInNode(firstBindingElement);
                     }
                     // Empty binding pattern of binding element, set breakpoint on binding element
-                    if (bindingPattern.parent.kind === 186 /* BindingElement */) {
+                    if (bindingPattern.parent.kind === 187 /* BindingElement */) {
                         return textSpan(bindingPattern.parent);
                     }
                     // Variable declaration is used as the span
                     return textSpanFromVariableDeclaration(bindingPattern.parent);
                 }
                 function spanInArrayLiteralOrObjectLiteralDestructuringPattern(node) {
-                    ts.Debug.assert(node.kind !== 185 /* ArrayBindingPattern */ && node.kind !== 184 /* ObjectBindingPattern */);
-                    var elements = node.kind === 187 /* ArrayLiteralExpression */ ? node.elements : node.properties;
-                    var firstBindingElement = ts.forEach(elements, function (element) { return element.kind !== 210 /* OmittedExpression */ ? element : undefined; });
+                    ts.Debug.assert(node.kind !== 186 /* ArrayBindingPattern */ && node.kind !== 185 /* ObjectBindingPattern */);
+                    var elements = node.kind === 188 /* ArrayLiteralExpression */ ? node.elements : node.properties;
+                    var firstBindingElement = ts.forEach(elements, function (element) { return element.kind !== 211 /* OmittedExpression */ ? element : undefined; });
                     if (firstBindingElement) {
                         return spanInNode(firstBindingElement);
                     }
@@ -121768,18 +125748,18 @@ var ts;
                     // just nested element in another destructuring assignment
                     // set breakpoint on assignment when parent is destructuring assignment
                     // Otherwise set breakpoint for this element
-                    return textSpan(node.parent.kind === 204 /* BinaryExpression */ ? node.parent : node);
+                    return textSpan(node.parent.kind === 205 /* BinaryExpression */ ? node.parent : node);
                 }
                 // Tokens:
                 function spanInOpenBraceToken(node) {
                     switch (node.parent.kind) {
-                        case 243 /* EnumDeclaration */:
+                        case 244 /* EnumDeclaration */:
                             var enumDeclaration = node.parent;
                             return spanInNodeIfStartsOnSameLine(ts.findPrecedingToken(node.pos, sourceFile, node.parent), enumDeclaration.members.length ? enumDeclaration.members[0] : enumDeclaration.getLastToken(sourceFile));
-                        case 240 /* ClassDeclaration */:
+                        case 241 /* ClassDeclaration */:
                             var classDeclaration = node.parent;
                             return spanInNodeIfStartsOnSameLine(ts.findPrecedingToken(node.pos, sourceFile, node.parent), classDeclaration.members.length ? classDeclaration.members[0] : classDeclaration.getLastToken(sourceFile));
-                        case 246 /* CaseBlock */:
+                        case 247 /* CaseBlock */:
                             return spanInNodeIfStartsOnSameLine(node.parent.parent, node.parent.clauses[0]);
                     }
                     // Default to parent node
@@ -121787,25 +125767,25 @@ var ts;
                 }
                 function spanInCloseBraceToken(node) {
                     switch (node.parent.kind) {
-                        case 245 /* ModuleBlock */:
+                        case 246 /* ModuleBlock */:
                             // If this is not an instantiated module block, no bp span
                             if (ts.getModuleInstanceState(node.parent.parent) !== 1 /* Instantiated */) {
                                 return undefined;
                             }
                         // falls through
-                        case 243 /* EnumDeclaration */:
-                        case 240 /* ClassDeclaration */:
+                        case 244 /* EnumDeclaration */:
+                        case 241 /* ClassDeclaration */:
                             // Span on close brace token
                             return textSpan(node);
-                        case 218 /* Block */:
+                        case 219 /* Block */:
                             if (ts.isFunctionBlock(node.parent)) {
                                 // Span on close brace token
                                 return textSpan(node);
                             }
                         // falls through
-                        case 274 /* CatchClause */:
+                        case 275 /* CatchClause */:
                             return spanInNode(ts.lastOrUndefined(node.parent.statements));
-                        case 246 /* CaseBlock */:
+                        case 247 /* CaseBlock */:
                             // breakpoint in last statement of the last clause
                             var caseBlock = node.parent;
                             var lastClause = ts.lastOrUndefined(caseBlock.clauses);
@@ -121813,7 +125793,7 @@ var ts;
                                 return spanInNode(ts.lastOrUndefined(lastClause.statements));
                             }
                             return undefined;
-                        case 184 /* ObjectBindingPattern */:
+                        case 185 /* ObjectBindingPattern */:
                             // Breakpoint in last binding element or binding pattern if it contains no elements
                             var bindingPattern = node.parent;
                             return spanInNode(ts.lastOrUndefined(bindingPattern.elements) || bindingPattern);
@@ -121829,7 +125809,7 @@ var ts;
                 }
                 function spanInCloseBracketToken(node) {
                     switch (node.parent.kind) {
-                        case 185 /* ArrayBindingPattern */:
+                        case 186 /* ArrayBindingPattern */:
                             // Breakpoint in last binding element or binding pattern if it contains no elements
                             var bindingPattern = node.parent;
                             return textSpan(ts.lastOrUndefined(bindingPattern.elements) || bindingPattern);
@@ -121844,12 +125824,12 @@ var ts;
                     }
                 }
                 function spanInOpenParenToken(node) {
-                    if (node.parent.kind === 223 /* DoStatement */ || // Go to while keyword and do action instead
-                        node.parent.kind === 191 /* CallExpression */ ||
-                        node.parent.kind === 192 /* NewExpression */) {
+                    if (node.parent.kind === 224 /* DoStatement */ || // Go to while keyword and do action instead
+                        node.parent.kind === 192 /* CallExpression */ ||
+                        node.parent.kind === 193 /* NewExpression */) {
                         return spanInPreviousNode(node);
                     }
-                    if (node.parent.kind === 195 /* ParenthesizedExpression */) {
+                    if (node.parent.kind === 196 /* ParenthesizedExpression */) {
                         return spanInNextNode(node);
                     }
                     // Default to parent node
@@ -121858,21 +125838,21 @@ var ts;
                 function spanInCloseParenToken(node) {
                     // Is this close paren token of parameter list, set span in previous token
                     switch (node.parent.kind) {
-                        case 196 /* FunctionExpression */:
-                        case 239 /* FunctionDeclaration */:
-                        case 197 /* ArrowFunction */:
-                        case 156 /* MethodDeclaration */:
-                        case 155 /* MethodSignature */:
-                        case 158 /* GetAccessor */:
-                        case 159 /* SetAccessor */:
-                        case 157 /* Constructor */:
-                        case 224 /* WhileStatement */:
-                        case 223 /* DoStatement */:
-                        case 225 /* ForStatement */:
-                        case 227 /* ForOfStatement */:
-                        case 191 /* CallExpression */:
-                        case 192 /* NewExpression */:
-                        case 195 /* ParenthesizedExpression */:
+                        case 197 /* FunctionExpression */:
+                        case 240 /* FunctionDeclaration */:
+                        case 198 /* ArrowFunction */:
+                        case 157 /* MethodDeclaration */:
+                        case 156 /* MethodSignature */:
+                        case 159 /* GetAccessor */:
+                        case 160 /* SetAccessor */:
+                        case 158 /* Constructor */:
+                        case 225 /* WhileStatement */:
+                        case 224 /* DoStatement */:
+                        case 226 /* ForStatement */:
+                        case 228 /* ForOfStatement */:
+                        case 192 /* CallExpression */:
+                        case 193 /* NewExpression */:
+                        case 196 /* ParenthesizedExpression */:
                             return spanInPreviousNode(node);
                         // Default to parent node
                         default:
@@ -121882,20 +125862,20 @@ var ts;
                 function spanInColonToken(node) {
                     // Is this : specifying return annotation of the function declaration
                     if (ts.isFunctionLike(node.parent) ||
-                        node.parent.kind === 275 /* PropertyAssignment */ ||
-                        node.parent.kind === 151 /* Parameter */) {
+                        node.parent.kind === 276 /* PropertyAssignment */ ||
+                        node.parent.kind === 152 /* Parameter */) {
                         return spanInPreviousNode(node);
                     }
                     return spanInNode(node.parent);
                 }
                 function spanInGreaterThanOrLessThanToken(node) {
-                    if (node.parent.kind === 194 /* TypeAssertionExpression */) {
+                    if (node.parent.kind === 195 /* TypeAssertionExpression */) {
                         return spanInNextNode(node);
                     }
                     return spanInNode(node.parent);
                 }
                 function spanInWhileKeyword(node) {
-                    if (node.parent.kind === 223 /* DoStatement */) {
+                    if (node.parent.kind === 224 /* DoStatement */) {
                         // Set span on while expression
                         return textSpanEndingAtNextToken(node, node.parent.expression);
                     }
@@ -121903,7 +125883,7 @@ var ts;
                     return spanInNode(node.parent);
                 }
                 function spanInOfKeyword(node) {
-                    if (node.parent.kind === 227 /* ForOfStatement */) {
+                    if (node.parent.kind === 228 /* ForOfStatement */) {
                         // Set using next token
                         return spanInNextNode(node);
                     }
@@ -122372,6 +126352,10 @@ var ts;
             var _this = this;
             return this.forwardJSONCall("getRenameInfo('" + fileName + "', " + position + ")", function () { return _this.languageService.getRenameInfo(fileName, position, options); });
         };
+        LanguageServiceShimObject.prototype.getSmartSelectionRange = function (fileName, position) {
+            var _this = this;
+            return this.forwardJSONCall("getSmartSelectionRange('" + fileName + "', " + position + ")", function () { return _this.languageService.getSmartSelectionRange(fileName, position); });
+        };
         LanguageServiceShimObject.prototype.findRenameLocations = function (fileName, position, findInStrings, findInComments, providePrefixAndSuffixTextForRename) {
             var _this = this;
             return this.forwardJSONCall("findRenameLocations('" + fileName + "', " + position + ", " + findInStrings + ", " + findInComments + ", " + providePrefixAndSuffixTextForRename + ")", function () { return _this.languageService.findRenameLocations(fileName, position, findInStrings, findInComments, providePrefixAndSuffixTextForRename); });
@@ -122726,7 +126710,6 @@ var ts;
         server.ActionSet = "action::set";
         server.ActionInvalidate = "action::invalidate";
         server.ActionPackageInstalled = "action::packageInstalled";
-        server.ActionValueInspected = "action::valueInspected";
         server.EventTypesRegistry = "event::typesRegistry";
         server.EventBeginInstallTypes = "event::beginInstallTypes";
         server.EventEndInstallTypes = "event::endInstallTypes";
@@ -122743,6 +126726,11 @@ var ts;
              * typingsInstaller will run the command with `${npmLocation} install ...`.
              */
             Arguments.NpmLocation = "--npmLocation";
+            /**
+             * Flag indicating that the typings installer should try to validate the default npm location.
+             * If the default npm is not found when this flag is enabled, fallback to `npm install`
+             */
+            Arguments.ValidateDefaultNpmLocation = "--validateDefaultNpmLocation";
         })(Arguments = server.Arguments || (server.Arguments = {}));
         function hasArgument(argumentName) {
             return ts.sys.args.indexOf(argumentName) >= 0;
@@ -122812,6 +126800,10 @@ var ts;
             "zlib"
         ];
         JsTyping.nodeCoreModules = ts.arrayToSet(JsTyping.nodeCoreModuleList);
+        function nonRelativeModuleNameForTypingCache(moduleName) {
+            return JsTyping.nodeCoreModules.has(moduleName) ? "node" : moduleName;
+        }
+        JsTyping.nonRelativeModuleNameForTypingCache = nonRelativeModuleNameForTypingCache;
         function loadSafeList(host, safeListPath) {
             var result = ts.readConfigFile(safeListPath, function (path) { return host.readFile(path); });
             return ts.createMapFromTemplate(result.config);
@@ -122867,7 +126859,7 @@ var ts;
             getTypingNamesFromSourceFileNames(fileNames);
             // add typings for unresolved imports
             if (unresolvedImports) {
-                var module_1 = ts.deduplicate(unresolvedImports.map(function (moduleId) { return JsTyping.nodeCoreModules.has(moduleId) ? "node" : moduleId; }), ts.equateStringsCaseSensitive, ts.compareStringsCaseSensitive);
+                var module_1 = ts.deduplicate(unresolvedImports.map(nonRelativeModuleNameForTypingCache), ts.equateStringsCaseSensitive, ts.compareStringsCaseSensitive);
                 addInferredTypings(module_1, "Inferred typings from unresolved imports");
             }
             // Add the cached typing locations for inferred typings that are already installed
@@ -122995,66 +126987,82 @@ var ts;
             }
         }
         JsTyping.discoverTypings = discoverTypings;
-        var PackageNameValidationResult;
-        (function (PackageNameValidationResult) {
-            PackageNameValidationResult[PackageNameValidationResult["Ok"] = 0] = "Ok";
-            PackageNameValidationResult[PackageNameValidationResult["ScopedPackagesNotSupported"] = 1] = "ScopedPackagesNotSupported";
-            PackageNameValidationResult[PackageNameValidationResult["EmptyName"] = 2] = "EmptyName";
-            PackageNameValidationResult[PackageNameValidationResult["NameTooLong"] = 3] = "NameTooLong";
-            PackageNameValidationResult[PackageNameValidationResult["NameStartsWithDot"] = 4] = "NameStartsWithDot";
-            PackageNameValidationResult[PackageNameValidationResult["NameStartsWithUnderscore"] = 5] = "NameStartsWithUnderscore";
-            PackageNameValidationResult[PackageNameValidationResult["NameContainsNonURISafeCharacters"] = 6] = "NameContainsNonURISafeCharacters";
-        })(PackageNameValidationResult = JsTyping.PackageNameValidationResult || (JsTyping.PackageNameValidationResult = {}));
+        var NameValidationResult;
+        (function (NameValidationResult) {
+            NameValidationResult[NameValidationResult["Ok"] = 0] = "Ok";
+            NameValidationResult[NameValidationResult["EmptyName"] = 1] = "EmptyName";
+            NameValidationResult[NameValidationResult["NameTooLong"] = 2] = "NameTooLong";
+            NameValidationResult[NameValidationResult["NameStartsWithDot"] = 3] = "NameStartsWithDot";
+            NameValidationResult[NameValidationResult["NameStartsWithUnderscore"] = 4] = "NameStartsWithUnderscore";
+            NameValidationResult[NameValidationResult["NameContainsNonURISafeCharacters"] = 5] = "NameContainsNonURISafeCharacters";
+        })(NameValidationResult = JsTyping.NameValidationResult || (JsTyping.NameValidationResult = {}));
         var maxPackageNameLength = 214;
         /**
          * Validates package name using rules defined at https://docs.npmjs.com/files/package.json
          */
         function validatePackageName(packageName) {
+            return validatePackageNameWorker(packageName, /*supportScopedPackage*/ true);
+        }
+        JsTyping.validatePackageName = validatePackageName;
+        function validatePackageNameWorker(packageName, supportScopedPackage) {
             if (!packageName) {
-                return 2 /* EmptyName */;
+                return 1 /* EmptyName */;
             }
             if (packageName.length > maxPackageNameLength) {
-                return 3 /* NameTooLong */;
+                return 2 /* NameTooLong */;
             }
             if (packageName.charCodeAt(0) === 46 /* dot */) {
-                return 4 /* NameStartsWithDot */;
+                return 3 /* NameStartsWithDot */;
             }
             if (packageName.charCodeAt(0) === 95 /* _ */) {
-                return 5 /* NameStartsWithUnderscore */;
+                return 4 /* NameStartsWithUnderscore */;
             }
             // check if name is scope package like: starts with @ and has one '/' in the middle
             // scoped packages are not currently supported
-            // TODO: when support will be added we'll need to split and check both scope and package name
-            if (/^@[^/]+\/[^/]+$/.test(packageName)) {
-                return 1 /* ScopedPackagesNotSupported */;
+            if (supportScopedPackage) {
+                var matches = /^@([^/]+)\/([^/]+)$/.exec(packageName);
+                if (matches) {
+                    var scopeResult = validatePackageNameWorker(matches[1], /*supportScopedPackage*/ false);
+                    if (scopeResult !== 0 /* Ok */) {
+                        return { name: matches[1], isScopeName: true, result: scopeResult };
+                    }
+                    var packageResult = validatePackageNameWorker(matches[2], /*supportScopedPackage*/ false);
+                    if (packageResult !== 0 /* Ok */) {
+                        return { name: matches[2], isScopeName: false, result: packageResult };
+                    }
+                    return 0 /* Ok */;
+                }
             }
             if (encodeURIComponent(packageName) !== packageName) {
-                return 6 /* NameContainsNonURISafeCharacters */;
+                return 5 /* NameContainsNonURISafeCharacters */;
             }
             return 0 /* Ok */;
         }
-        JsTyping.validatePackageName = validatePackageName;
         function renderPackageNameValidationFailure(result, typing) {
+            return typeof result === "object" ?
+                renderPackageNameValidationFailureWorker(typing, result.result, result.name, result.isScopeName) :
+                renderPackageNameValidationFailureWorker(typing, result, typing, /*isScopeName*/ false);
+        }
+        JsTyping.renderPackageNameValidationFailure = renderPackageNameValidationFailure;
+        function renderPackageNameValidationFailureWorker(typing, result, name, isScopeName) {
+            var kind = isScopeName ? "Scope" : "Package";
             switch (result) {
-                case 2 /* EmptyName */:
-                    return "Package name '" + typing + "' cannot be empty";
-                case 3 /* NameTooLong */:
-                    return "Package name '" + typing + "' should be less than " + maxPackageNameLength + " characters";
-                case 4 /* NameStartsWithDot */:
-                    return "Package name '" + typing + "' cannot start with '.'";
-                case 5 /* NameStartsWithUnderscore */:
-                    return "Package name '" + typing + "' cannot start with '_'";
-                case 1 /* ScopedPackagesNotSupported */:
-                    return "Package '" + typing + "' is scoped and currently is not supported";
-                case 6 /* NameContainsNonURISafeCharacters */:
-                    return "Package name '" + typing + "' contains non URI safe characters";
+                case 1 /* EmptyName */:
+                    return "'" + typing + "':: " + kind + " name '" + name + "' cannot be empty";
+                case 2 /* NameTooLong */:
+                    return "'" + typing + "':: " + kind + " name '" + name + "' should be less than " + maxPackageNameLength + " characters";
+                case 3 /* NameStartsWithDot */:
+                    return "'" + typing + "':: " + kind + " name '" + name + "' cannot start with '.'";
+                case 4 /* NameStartsWithUnderscore */:
+                    return "'" + typing + "':: " + kind + " name '" + name + "' cannot start with '_'";
+                case 5 /* NameContainsNonURISafeCharacters */:
+                    return "'" + typing + "':: " + kind + " name '" + name + "' contains non URI safe characters";
                 case 0 /* Ok */:
                     return ts.Debug.fail(); // Shouldn't have called this.
                 default:
                     throw ts.Debug.assertNever(result);
             }
         }
-        JsTyping.renderPackageNameValidationFailure = renderPackageNameValidationFailure;
     })(JsTyping = ts.JsTyping || (ts.JsTyping = {}));
 })(ts || (ts = {}));
 var ts;
@@ -123254,6 +127262,8 @@ var ts;
         WatchType["ConfigFileForInferredRoot"] = "Config file for the inferred project root";
         WatchType["NodeModulesForClosedScriptInfo"] = "node_modules for closed script infos in them";
         WatchType["MissingSourceMapFile"] = "Missing source map file";
+        WatchType["NoopConfigFileForInferredRoot"] = "Noop Config file for the inferred project root";
+        WatchType["MissingGeneratedFile"] = "Missing generated file";
     })(WatchType = ts.WatchType || (ts.WatchType = {}));
 })(ts || (ts = {}));
 // tslint:disable no-unnecessary-qualifier
@@ -123357,6 +127367,8 @@ var ts;
                 CommandTypes["ApplyChangedToOpenFiles"] = "applyChangedToOpenFiles";
                 CommandTypes["UpdateOpen"] = "updateOpen";
                 /* @internal */
+                CommandTypes["EncodedSyntacticClassificationsFull"] = "encodedSyntacticClassifications-full";
+                /* @internal */
                 CommandTypes["EncodedSemanticClassificationsFull"] = "encodedSemanticClassifications-full";
                 /* @internal */
                 CommandTypes["Cleanup"] = "cleanup";
@@ -123392,6 +127404,9 @@ var ts;
                 /* @internal */
                 CommandTypes["GetEditsForFileRenameFull"] = "getEditsForFileRename-full";
                 CommandTypes["ConfigurePlugin"] = "configurePlugin";
+                CommandTypes["SelectionRange"] = "selectionRange";
+                /* @internal */
+                CommandTypes["SelectionRangeFull"] = "selectionRange-full";
                 // NOTE: If updating this, be sure to also update `allCommandNames` in `harness/unittests/session.ts`.
             })(CommandTypes = protocol.CommandTypes || (protocol.CommandTypes = {}));
             var IndentStyle;
@@ -123436,6 +127451,9 @@ var ts;
                 ScriptTarget["ES2015"] = "ES2015";
                 ScriptTarget["ES2016"] = "ES2016";
                 ScriptTarget["ES2017"] = "ES2017";
+                ScriptTarget["ES2018"] = "ES2018";
+                ScriptTarget["ES2019"] = "ES2019";
+                ScriptTarget["ES2020"] = "ES2020";
                 ScriptTarget["ESNext"] = "ESNext";
             })(ScriptTarget = protocol.ScriptTarget || (protocol.ScriptTarget = {}));
         })(protocol = server.protocol || (server.protocol = {}));
@@ -123943,7 +127961,6 @@ var ts;
             isKnownTypesPackageName: ts.returnFalse,
             // Should never be called because we never provide a types registry.
             installPackage: ts.notImplemented,
-            inspectValue: ts.notImplemented,
             enqueueInstallTypingsRequest: ts.noop,
             attach: ts.noop,
             onProjectClosed: ts.noop,
@@ -124005,9 +128022,6 @@ var ts;
             TypingsCache.prototype.installPackage = function (options) {
                 return this.installer.installPackage(options);
             };
-            TypingsCache.prototype.inspectValue = function (options) {
-                return this.installer.inspectValue(options);
-            };
             TypingsCache.prototype.enqueueInstallTypingsForProject = function (project, unresolvedImports, forceRefresh) {
                 var typeAcquisition = project.getTypeAcquisition();
                 if (!typeAcquisition || !typeAcquisition.enable) {
@@ -124132,9 +128146,13 @@ var ts;
             return value instanceof server.ScriptInfo;
         }
         server.isScriptInfo = isScriptInfo;
+        function isGeneratedFileWatcher(watch) {
+            return watch.generatedFilePath !== undefined;
+        }
         var Project = /** @class */ (function () {
             /*@internal*/
-            function Project(projectName, projectKind, projectService, documentRegistry, hasExplicitListOfFiles, lastFileExceededProgramSize, compilerOptions, compileOnSaveEnabled, directoryStructureHost, currentDirectory) {
+            function Project(
+            /*@internal*/ projectName, projectKind, projectService, documentRegistry, hasExplicitListOfFiles, lastFileExceededProgramSize, compilerOptions, compileOnSaveEnabled, directoryStructureHost, currentDirectory) {
                 var _this = this;
                 this.projectName = projectName;
                 this.projectKind = projectKind;
@@ -124177,6 +128195,8 @@ var ts;
                 this.hasChangedAutomaticTypeDirectiveNames = false;
                 /*@internal*/
                 this.typingFiles = server.emptyArray;
+                /*@internal*/
+                this.globalCacheResolutionModuleName = ts.JsTyping.nonRelativeModuleNameForTypingCache;
                 this.directoryStructureHost = directoryStructureHost;
                 this.currentDirectory = this.projectService.getNormalizedAbsolutePath(currentDirectory || "");
                 this.getCanonicalFileName = this.projectService.toCanonicalFileName;
@@ -124219,13 +128239,13 @@ var ts;
                 server.updateProjectIfDirty(this);
                 return hasOneOrMoreJsAndNoTsFiles(this);
             };
-            Project.resolveModule = function (moduleName, initialDir, host, log) {
+            Project.resolveModule = function (moduleName, initialDir, host, log, logErrors) {
                 var resolvedPath = ts.normalizeSlashes(host.resolvePath(ts.combinePaths(initialDir, "node_modules")));
                 log("Loading " + moduleName + " from " + initialDir + " (resolved to " + resolvedPath + ")");
                 var result = host.require(resolvedPath, moduleName); // TODO: GH#18217
                 if (result.error) {
                     var err = result.error.stack || result.error.message || JSON.stringify(result.error);
-                    log("Failed to load module '" + moduleName + "': " + err);
+                    (logErrors || log)("Failed to load module '" + moduleName + "' from " + resolvedPath + ": " + err);
                     return undefined;
                 }
                 return result.module;
@@ -124236,10 +128256,6 @@ var ts;
             Project.prototype.installPackage = function (options) {
                 return this.typingsCache.installPackage(__assign({}, options, { projectName: this.projectName, projectRootPath: this.toPath(this.currentDirectory) }));
             };
-            /* @internal */
-            Project.prototype.inspectValue = function (options) {
-                return this.typingsCache.inspectValue(options);
-            };
             Object.defineProperty(Project.prototype, "typingsCache", {
                 get: function () {
                     return this.projectService.typingsCache;
@@ -124378,6 +128394,10 @@ var ts;
                 return this.getTypeAcquisition().enable ? this.projectService.typingsInstaller.globalTypingsCacheLocation : undefined;
             };
             /*@internal*/
+            Project.prototype.fileIsOpen = function (filePath) {
+                return this.projectService.openFiles.has(filePath);
+            };
+            /*@internal*/
             Project.prototype.writeLog = function (s) {
                 this.projectService.logger.info(s);
             };
@@ -124469,6 +128489,7 @@ var ts;
                 this.lastFileExceededProgramSize = lastFileExceededProgramSize;
                 this.builderState = undefined;
                 this.resolutionCache.closeTypeRootsWatch();
+                this.clearGeneratedFileWatch();
                 this.projectService.onUpdateLanguageServiceStateForProject(this, /*languageServiceEnabled*/ false);
             };
             Project.prototype.getProjectName = function () {
@@ -124546,6 +128567,7 @@ var ts;
                     ts.clearMap(this.missingFilesMap, ts.closeFileWatcher);
                     this.missingFilesMap = undefined;
                 }
+                this.clearGeneratedFileWatch();
                 // signal language service to release source files acquired from document registry
                 this.languageService.dispose();
                 this.languageService = undefined;
@@ -124803,6 +128825,32 @@ var ts;
                     ts.updateMissingFilePathsWatch(this.program, this.missingFilesMap || (this.missingFilesMap = ts.createMap()), 
                     // Watch the missing files
                     function (missingFilePath) { return _this.addMissingFileWatcher(missingFilePath); });
+                    if (this.generatedFilesMap) {
+                        var outPath = this.compilerOptions.outFile && this.compilerOptions.out;
+                        if (isGeneratedFileWatcher(this.generatedFilesMap)) {
+                            // --out
+                            if (!outPath || !this.isValidGeneratedFileWatcher(ts.removeFileExtension(outPath) + ".d.ts" /* Dts */, this.generatedFilesMap)) {
+                                this.clearGeneratedFileWatch();
+                            }
+                        }
+                        else {
+                            // MultiFile
+                            if (outPath) {
+                                this.clearGeneratedFileWatch();
+                            }
+                            else {
+                                this.generatedFilesMap.forEach(function (watcher, source) {
+                                    var sourceFile = _this.program.getSourceFileByPath(source);
+                                    if (!sourceFile ||
+                                        sourceFile.resolvedPath !== source ||
+                                        !_this.isValidGeneratedFileWatcher(ts.getDeclarationEmitOutputFilePathWorker(sourceFile.fileName, _this.compilerOptions, _this.currentDirectory, _this.program.getCommonSourceDirectory(), _this.getCanonicalFileName), watcher)) {
+                                        ts.closeFileWatcherOf(watcher);
+                                        _this.generatedFilesMap.delete(source);
+                                    }
+                                });
+                            }
+                        }
+                    }
                     // Watch the type locations that would be added to program as part of automatic type resolutions
                     if (this.languageServiceEnabled) {
                         this.resolutionCache.updateTypeRootsWatch();
@@ -124812,7 +128860,7 @@ var ts;
                 this.externalFiles = this.getExternalFiles();
                 ts.enumerateInsertsAndDeletes(this.externalFiles, oldExternalFiles, ts.getStringComparer(!this.useCaseSensitiveFileNames()), 
                 // Ensure a ScriptInfo is created for new external files. This is performed indirectly
-                // by the LSHost for files in the program when the program is retrieved above but
+                // by the host for files in the program when the program is retrieved above but
                 // the program doesn't contain external files so this must be done explicitly.
                 function (inserted) {
                     var scriptInfo = _this.projectService.getOrCreateScriptInfoNotOpenedByClient(inserted, _this.currentDirectory, _this.directoryStructureHost);
@@ -124820,6 +128868,9 @@ var ts;
                 }, function (removed) { return _this.detachScriptInfoFromProject(removed); });
                 var elapsed = ts.timestamp() - start;
                 this.writeLog("Finishing updateGraphWorker: Project: " + this.getProjectName() + " Version: " + this.getProjectVersion() + " structureChanged: " + hasNewProgram + " Elapsed: " + elapsed + "ms");
+                if (this.program !== oldProgram) {
+                    this.print();
+                }
                 return hasNewProgram;
             };
             Project.prototype.detachScriptInfoFromProject = function (uncheckedFileName, noRemoveResolution) {
@@ -124849,6 +128900,52 @@ var ts;
             Project.prototype.isWatchedMissingFile = function (path) {
                 return !!this.missingFilesMap && this.missingFilesMap.has(path);
             };
+            /* @internal */
+            Project.prototype.addGeneratedFileWatch = function (generatedFile, sourceFile) {
+                if (this.compilerOptions.outFile || this.compilerOptions.out) {
+                    // Single watcher
+                    if (!this.generatedFilesMap) {
+                        this.generatedFilesMap = this.createGeneratedFileWatcher(generatedFile);
+                    }
+                }
+                else {
+                    // Map
+                    var path = this.toPath(sourceFile);
+                    if (this.generatedFilesMap) {
+                        if (isGeneratedFileWatcher(this.generatedFilesMap)) {
+                            ts.Debug.fail(this.projectName + " Expected to not have --out watcher for generated file with options: " + JSON.stringify(this.compilerOptions));
+                            return;
+                        }
+                        if (this.generatedFilesMap.has(path))
+                            return;
+                    }
+                    else {
+                        this.generatedFilesMap = ts.createMap();
+                    }
+                    this.generatedFilesMap.set(path, this.createGeneratedFileWatcher(generatedFile));
+                }
+            };
+            Project.prototype.createGeneratedFileWatcher = function (generatedFile) {
+                var _this = this;
+                return {
+                    generatedFilePath: this.toPath(generatedFile),
+                    watcher: this.projectService.watchFactory.watchFile(this.projectService.host, generatedFile, function () { return _this.projectService.delayUpdateProjectGraphAndEnsureProjectStructureForOpenFiles(_this); }, ts.PollingInterval.High, "Missing generated file" /* MissingGeneratedFile */, this)
+                };
+            };
+            Project.prototype.isValidGeneratedFileWatcher = function (generateFile, watcher) {
+                return this.toPath(generateFile) === watcher.generatedFilePath;
+            };
+            Project.prototype.clearGeneratedFileWatch = function () {
+                if (this.generatedFilesMap) {
+                    if (isGeneratedFileWatcher(this.generatedFilesMap)) {
+                        ts.closeFileWatcherOf(this.generatedFilesMap);
+                    }
+                    else {
+                        ts.clearMap(this.generatedFilesMap, ts.closeFileWatcherOf);
+                    }
+                    this.generatedFilesMap = undefined;
+                }
+            };
             Project.prototype.getScriptInfoForNormalizedPath = function (fileName) {
                 var scriptInfo = this.projectService.getScriptInfoForPath(this.toPath(fileName));
                 if (scriptInfo && !scriptInfo.isAttached(this)) {
@@ -124984,11 +129081,11 @@ var ts;
             Project.prototype.enablePlugin = function (pluginConfigEntry, searchPaths, pluginConfigOverrides) {
                 var _this = this;
                 this.projectService.logger.info("Enabling plugin " + pluginConfigEntry.name + " from candidate paths: " + searchPaths.join(","));
-                var log = function (message) {
-                    _this.projectService.logger.info(message);
-                };
+                var log = function (message) { return _this.projectService.logger.info(message); };
+                var errorLogs;
+                var logError = function (message) { (errorLogs || (errorLogs = [])).push(message); };
                 var resolvedModule = ts.firstDefined(searchPaths, function (searchPath) {
-                    return Project.resolveModule(pluginConfigEntry.name, searchPath, _this.projectService.host, log);
+                    return Project.resolveModule(pluginConfigEntry.name, searchPath, _this.projectService.host, log, logError);
                 });
                 if (resolvedModule) {
                     var configurationOverride = pluginConfigOverrides && pluginConfigOverrides.get(pluginConfigEntry.name);
@@ -125001,6 +129098,7 @@ var ts;
                     this.enableProxy(resolvedModule, pluginConfigEntry);
                 }
                 else {
+                    ts.forEach(errorLogs, log);
                     this.projectService.logger.info("Couldn't find " + pluginConfigEntry.name);
                 }
             };
@@ -125353,12 +129451,13 @@ var ts;
         var ExternalProject = /** @class */ (function (_super) {
             __extends(ExternalProject, _super);
             /*@internal*/
-            function ExternalProject(externalProjectName, projectService, documentRegistry, compilerOptions, lastFileExceededProgramSize, compileOnSaveEnabled, projectFilePath) {
+            function ExternalProject(externalProjectName, projectService, documentRegistry, compilerOptions, lastFileExceededProgramSize, compileOnSaveEnabled, projectFilePath, pluginConfigOverrides) {
                 var _this = _super.call(this, externalProjectName, ProjectKind.External, projectService, documentRegistry, 
                 /*hasExplicitListOfFiles*/ true, lastFileExceededProgramSize, compilerOptions, compileOnSaveEnabled, projectService.host, ts.getDirectoryPath(projectFilePath || ts.normalizeSlashes(externalProjectName))) || this;
                 _this.externalProjectName = externalProjectName;
                 _this.compileOnSaveEnabled = compileOnSaveEnabled;
                 _this.excludedFiles = [];
+                _this.enableGlobalPlugins(_this.getCompilerOptions(), pluginConfigOverrides);
                 return _this;
             }
             ExternalProject.prototype.updateGraph = function () {
@@ -126049,6 +130148,10 @@ var ts;
                 return this.watchFactory.watchDirectory(this.host, directory, function (fileOrDirectory) {
                     var fileOrDirectoryPath = _this.toPath(fileOrDirectory);
                     project.getCachedDirectoryStructureHost().addOrDeleteFileOrDirectory(fileOrDirectory, fileOrDirectoryPath);
+                    // don't trigger callback on open, existing files
+                    if (project.fileIsOpen(fileOrDirectoryPath)) {
+                        return;
+                    }
                     if (ts.isPathIgnored(fileOrDirectoryPath))
                         return;
                     var configFilename = project.getConfigFilePath();
@@ -126116,7 +130219,13 @@ var ts;
                 project.print();
                 project.close();
                 if (ts.Debug.shouldAssert(1 /* Normal */)) {
-                    this.filenameToScriptInfo.forEach(function (info) { return ts.Debug.assert(!info.isAttached(project), "Found script Info still attached to project", function () { return project.projectName + ": ScriptInfos still attached: " + JSON.stringify(ts.mapDefined(ts.arrayFrom(_this.filenameToScriptInfo.values()), function (info) { return info.isAttached(project) ? info : undefined; })); }); });
+                    this.filenameToScriptInfo.forEach(function (info) { return ts.Debug.assert(!info.isAttached(project), "Found script Info still attached to project", function () { return project.projectName + ": ScriptInfos still attached: " + JSON.stringify(ts.arrayFrom(ts.mapDefinedIterator(_this.filenameToScriptInfo.values(), function (info) { return info.isAttached(project) ?
+                        {
+                            fileName: info.fileName,
+                            projects: info.containingProjects.map(function (p) { return p.projectName; }),
+                            hasMixedContent: info.hasMixedContent
+                        } : undefined; })), 
+                    /*replacer*/ undefined, " "); }); });
                 }
                 // Remove the project from pending project updates
                 this.pendingProjectUpdates.delete(project.getProjectName());
@@ -126341,7 +130450,9 @@ var ts;
                 });
                 var watches = [];
                 if (configFileExistenceInfo.configFileWatcherForRootOfInferredProject) {
-                    watches.push("Config file for the inferred project root" /* ConfigFileForInferredRoot */);
+                    watches.push(configFileExistenceInfo.configFileWatcherForRootOfInferredProject === ts.noopFileWatcher ?
+                        "Noop Config file for the inferred project root" /* NoopConfigFileForInferredRoot */ :
+                        "Config file for the inferred project root" /* ConfigFileForInferredRoot */);
                 }
                 if (this.configuredProjects.has(canonicalConfigFilePath)) {
                     watches.push("Config file" /* ConfigFile */);
@@ -126353,7 +130464,10 @@ var ts;
              */
             ProjectService.prototype.createConfigFileWatcherOfConfigFileExistence = function (configFileName, canonicalConfigFilePath, configFileExistenceInfo) {
                 var _this = this;
-                configFileExistenceInfo.configFileWatcherForRootOfInferredProject = this.watchFactory.watchFile(this.host, configFileName, function (_filename, eventKind) { return _this.onConfigFileChangeForOpenScriptInfo(configFileName, eventKind); }, ts.PollingInterval.High, "Config file for the inferred project root" /* ConfigFileForInferredRoot */);
+                configFileExistenceInfo.configFileWatcherForRootOfInferredProject =
+                    ts.canWatchDirectory(ts.getDirectoryPath(canonicalConfigFilePath)) ?
+                        this.watchFactory.watchFile(this.host, configFileName, function (_filename, eventKind) { return _this.onConfigFileChangeForOpenScriptInfo(configFileName, eventKind); }, ts.PollingInterval.High, "Config file for the inferred project root" /* ConfigFileForInferredRoot */) :
+                        ts.noopFileWatcher;
                 this.logConfigFileWatchUpdate(configFileName, canonicalConfigFilePath, configFileExistenceInfo, "Updated the callback" /* UpdatedCallback */);
             };
             /**
@@ -126579,7 +130693,8 @@ var ts;
             ProjectService.prototype.createExternalProject = function (projectFileName, files, options, typeAcquisition, excludedFiles) {
                 var compilerOptions = convertCompilerOptions(options);
                 var project = new server.ExternalProject(projectFileName, this, this.documentRegistry, compilerOptions, 
-                /*lastFileExceededProgramSize*/ this.getFilenameForExceededTotalSizeLimitForNonTsFiles(projectFileName, compilerOptions, files, externalFilePropertyReader), options.compileOnSave === undefined ? true : options.compileOnSave);
+                /*lastFileExceededProgramSize*/ this.getFilenameForExceededTotalSizeLimitForNonTsFiles(projectFileName, compilerOptions, files, externalFilePropertyReader), options.compileOnSave === undefined ? true : options.compileOnSave, 
+                /*projectFilePath*/ undefined, this.currentPluginConfigOverrides);
                 project.excludedFiles = excludedFiles;
                 this.addFilesToNonInferredProject(project, files, externalFilePropertyReader, typeAcquisition);
                 this.externalProjects.push(project);
@@ -127119,8 +131234,13 @@ var ts;
                 var _this = this;
                 // Since declaration info and map file watches arent updating project's directory structure host (which can cache file structure) use host
                 var declarationInfo = this.getOrCreateScriptInfoNotOpenedByClient(generatedFileName, project.currentDirectory, this.host);
-                if (!declarationInfo)
+                if (!declarationInfo) {
+                    if (sourceFileName) {
+                        // Project contains source file and it generates the generated file name
+                        project.addGeneratedFileWatch(generatedFileName, sourceFileName);
+                    }
                     return undefined;
+                }
                 // Try to get from cache
                 declarationInfo.getSnapshot(); // Ensure synchronized
                 if (ts.isString(declarationInfo.sourceMapFilePath)) {
@@ -127653,9 +131773,10 @@ var ts;
                 var assignOrphanScriptInfosToInferredProject = false;
                 if (openFiles) {
                     while (true) {
-                        var _a = openFiles.next(), file = _a.value, done = _a.done;
-                        if (done)
+                        var iterResult = openFiles.next();
+                        if (iterResult.done)
                             break;
+                        var file = iterResult.value;
                         var scriptInfo = this.getScriptInfo(file.fileName);
                         ts.Debug.assert(!scriptInfo || !scriptInfo.isScriptOpen(), "Script should not exist and not be open already");
                         // Create script infos so we have the new content for all the open files before we do any updates to projects
@@ -127665,9 +131786,10 @@ var ts;
                 }
                 if (changedFiles) {
                     while (true) {
-                        var _b = changedFiles.next(), file = _b.value, done = _b.done;
-                        if (done)
+                        var iterResult = changedFiles.next();
+                        if (iterResult.done)
                             break;
+                        var file = iterResult.value;
                         var scriptInfo = this.getScriptInfo(file.fileName);
                         ts.Debug.assert(!!scriptInfo);
                         // Make edits to script infos and marks containing project as dirty
@@ -127698,9 +131820,10 @@ var ts;
             /* @internal */
             ProjectService.prototype.applyChangesToFile = function (scriptInfo, changes) {
                 while (true) {
-                    var _a = changes.next(), change = _a.value, done = _a.done;
-                    if (done)
+                    var iterResult = changes.next();
+                    if (iterResult.done)
                         break;
+                    var change = iterResult.value;
                     scriptInfo.editContent(change.span.start, change.span.start + change.span.length, change.newText);
                 }
             };
@@ -128279,7 +132402,8 @@ var ts;
                 var project = _a.project, location = _a.location;
                 var _loop_8 = function (outputReferencedSymbol) {
                     var mappedDefinitionFile = getMappedLocation(project, documentSpanLocation(outputReferencedSymbol.definition));
-                    var definition = mappedDefinitionFile === undefined ? outputReferencedSymbol.definition : __assign({}, outputReferencedSymbol.definition, { textSpan: ts.createTextSpan(mappedDefinitionFile.pos, outputReferencedSymbol.definition.textSpan.length), fileName: mappedDefinitionFile.fileName });
+                    var definition = mappedDefinitionFile === undefined ?
+                        outputReferencedSymbol.definition : __assign({}, outputReferencedSymbol.definition, { textSpan: ts.createTextSpan(mappedDefinitionFile.pos, outputReferencedSymbol.definition.textSpan.length), fileName: mappedDefinitionFile.fileName, contextSpan: getMappedContextSpan(outputReferencedSymbol.definition, project) });
                     var symbolToAddTo = ts.find(outputs, function (o) { return ts.documentSpansEqual(o.definition, definition); });
                     if (!symbolToAddTo) {
                         symbolToAddTo = { definition: definition, references: [] };
@@ -128380,14 +132504,37 @@ var ts;
             var fileName = _a.fileName, textSpan = _a.textSpan;
             return { fileName: fileName, pos: textSpan.start };
         }
-        function getMappedLocation(location, projectService, project) {
+        function getMappedLocation(location, project) {
             var mapsTo = project.getSourceMapper().tryGetSourcePosition(location);
-            return mapsTo && projectService.fileExists(server.toNormalizedPath(mapsTo.fileName)) ? mapsTo : undefined;
+            return mapsTo && project.projectService.fileExists(server.toNormalizedPath(mapsTo.fileName)) ? mapsTo : undefined;
+        }
+        function getMappedDocumentSpan(documentSpan, project) {
+            var newPosition = getMappedLocation(documentSpanLocation(documentSpan), project);
+            if (!newPosition)
+                return undefined;
+            return {
+                fileName: newPosition.fileName,
+                textSpan: {
+                    start: newPosition.pos,
+                    length: documentSpan.textSpan.length
+                },
+                originalFileName: documentSpan.fileName,
+                originalTextSpan: documentSpan.textSpan,
+                contextSpan: getMappedContextSpan(documentSpan, project),
+                originalContextSpan: documentSpan.contextSpan
+            };
+        }
+        function getMappedContextSpan(documentSpan, project) {
+            var contextSpanStart = documentSpan.contextSpan && getMappedLocation({ fileName: documentSpan.fileName, pos: documentSpan.contextSpan.start }, project);
+            var contextSpanEnd = documentSpan.contextSpan && getMappedLocation({ fileName: documentSpan.fileName, pos: documentSpan.contextSpan.start + documentSpan.contextSpan.length }, project);
+            return contextSpanStart && contextSpanEnd ?
+                { start: contextSpanStart.pos, length: contextSpanEnd.pos - contextSpanStart.pos } :
+                undefined;
         }
         var Session = /** @class */ (function () {
             function Session(opts) {
-                var _a;
                 var _this = this;
+                var _a;
                 this.changeSeq = 0;
                 this.handlers = ts.createMapFromTemplate((_a = {},
                     _a[server.CommandNames.Status] = function () {
@@ -128581,6 +132728,9 @@ var ts;
                     _a[server.CommandNames.CompilerOptionsDiagnosticsFull] = function (request) {
                         return _this.requiredResponse(_this.getCompilerOptionsDiagnostics(request.arguments));
                     },
+                    _a[server.CommandNames.EncodedSyntacticClassificationsFull] = function (request) {
+                        return _this.requiredResponse(_this.getEncodedSyntacticClassifications(request.arguments));
+                    },
                     _a[server.CommandNames.EncodedSemanticClassificationsFull] = function (request) {
                         return _this.requiredResponse(_this.getEncodedSemanticClassifications(request.arguments));
                     },
@@ -128716,8 +132866,15 @@ var ts;
                     },
                     _a[server.CommandNames.ConfigurePlugin] = function (request) {
                         _this.configurePlugin(request.arguments);
+                        _this.doOutput(/*info*/ undefined, server.CommandNames.ConfigurePlugin, request.seq, /*success*/ true);
                         return _this.notRequired();
                     },
+                    _a[server.CommandNames.SelectionRange] = function (request) {
+                        return _this.requiredResponse(_this.getSmartSelectionRange(request.arguments, /*simplifiedResult*/ true));
+                    },
+                    _a[server.CommandNames.SelectionRangeFull] = function (request) {
+                        return _this.requiredResponse(_this.getSmartSelectionRange(request.arguments, /*simplifiedResult*/ false));
+                    },
                     _a));
                 this.host = opts.host;
                 this.cancellationToken = opts.cancellationToken;
@@ -128834,16 +132991,31 @@ var ts;
                         msg += "\n" + server.indent(err.stack);
                     }
                 }
-                if (fileRequest && this.logger.hasLevel(server.LogLevel.verbose)) {
-                    try {
-                        var _a = this.getFileAndProject(fileRequest), file = _a.file, project = _a.project;
-                        var scriptInfo = project.getScriptInfoForNormalizedPath(file);
-                        if (scriptInfo) {
-                            var text = ts.getSnapshotText(scriptInfo.getSnapshot());
-                            msg += "\n\nFile text of " + fileRequest.file + ":" + server.indent(text) + "\n";
+                if (this.logger.hasLevel(server.LogLevel.verbose)) {
+                    if (fileRequest) {
+                        try {
+                            var _a = this.getFileAndProject(fileRequest), file = _a.file, project = _a.project;
+                            var scriptInfo = project.getScriptInfoForNormalizedPath(file);
+                            if (scriptInfo) {
+                                var text = ts.getSnapshotText(scriptInfo.getSnapshot());
+                                msg += "\n\nFile text of " + fileRequest.file + ":" + server.indent(text) + "\n";
+                            }
                         }
+                        catch (_b) { } // tslint:disable-line no-empty
+                    }
+                    if (err.message && err.message.indexOf("Could not find sourceFile:") !== -1) {
+                        msg += "\n\nProjects::\n";
+                        var counter_1 = 0;
+                        var addProjectInfo = function (project) {
+                            msg += "\nProject '" + project.projectName + "' (" + server.ProjectKind[project.projectKind] + ") " + counter_1 + "\n";
+                            msg += project.filesToString(/*writeProjectFileNames*/ true);
+                            msg += "\n-----------------------------------------------\n";
+                            counter_1++;
+                        };
+                        this.projectService.externalProjects.forEach(addProjectInfo);
+                        this.projectService.configuredProjects.forEach(addProjectInfo);
+                        this.projectService.inferredProjects.forEach(addProjectInfo);
                     }
-                    catch (_b) { } // tslint:disable-line no-empty
                 }
                 this.logger.msg(msg, server.Msg.Err);
             };
@@ -128990,6 +133162,10 @@ var ts;
                     this.host.gc();
                 }
             };
+            Session.prototype.getEncodedSyntacticClassifications = function (args) {
+                var _a = this.getFileAndLanguageServiceForSyntacticOperation(args), file = _a.file, languageService = _a.languageService;
+                return languageService.getEncodedSyntacticClassifications(file, args);
+            };
             Session.prototype.getEncodedSemanticClassifications = function (args) {
                 var _a = this.getFileAndProject(args), file = _a.file, project = _a.project;
                 return project.getLanguageService().getEncodedSemanticClassifications(file, args);
@@ -129067,22 +133243,9 @@ var ts;
                 return simplifiedResult ? this.mapDefinitionInfo(definitions, project) : definitions.map(Session.mapToOriginalLocation);
             };
             Session.prototype.mapDefinitionInfoLocations = function (definitions, project) {
-                var _this = this;
                 return definitions.map(function (info) {
-                    var newLoc = getMappedLocation(documentSpanLocation(info), _this.projectService, project);
-                    return !newLoc ? info : {
-                        containerKind: info.containerKind,
-                        containerName: info.containerName,
-                        fileName: newLoc.fileName,
-                        kind: info.kind,
-                        name: info.name,
-                        textSpan: {
-                            start: newLoc.pos,
-                            length: info.textSpan.length
-                        },
-                        originalFileName: info.fileName,
-                        originalTextSpan: info.textSpan,
-                    };
+                    var newDocumentSpan = getMappedDocumentSpan(info, project);
+                    return !newDocumentSpan ? info : __assign({}, newDocumentSpan, { containerKind: info.containerKind, containerName: info.containerName, kind: info.kind, name: info.name });
                 });
             };
             Session.prototype.getDefinitionAndBoundSpan = function (args, simplifiedResult) {
@@ -129101,7 +133264,7 @@ var ts;
                 if (simplifiedResult) {
                     return {
                         definitions: this.mapDefinitionInfo(definitions, project),
-                        textSpan: this.toLocationTextSpan(textSpan, scriptInfo)
+                        textSpan: toProcolTextSpan(textSpan, scriptInfo)
                     };
                 }
                 return {
@@ -129115,7 +133278,7 @@ var ts;
             };
             Session.prototype.mapDefinitionInfo = function (definitions, project) {
                 var _this = this;
-                return definitions.map(function (def) { return _this.toFileSpan(def.fileName, def.textSpan, project); });
+                return definitions.map(function (def) { return _this.toFileSpanWithContext(def.fileName, def.textSpan, def.contextSpan, project); });
             };
             /*
              * When we map a .d.ts location to .ts, Visual Studio gets confused because there's no associated Roslyn Document in
@@ -129127,7 +133290,7 @@ var ts;
             Session.mapToOriginalLocation = function (def) {
                 if (def.originalFileName) {
                     ts.Debug.assert(def.originalTextSpan !== undefined, "originalTextSpan should be present if originalFileName is");
-                    return __assign({}, def, { fileName: def.originalFileName, textSpan: def.originalTextSpan, targetFileName: def.fileName, targetTextSpan: def.textSpan });
+                    return __assign({}, def, { fileName: def.originalFileName, textSpan: def.originalTextSpan, targetFileName: def.fileName, targetTextSpan: def.textSpan, contextSpan: def.originalContextSpan, targetContextSpan: def.contextSpan });
                 }
                 return def;
             };
@@ -129141,6 +133304,12 @@ var ts;
                     end: { line: end.line + 1, offset: end.character + 1 }
                 };
             };
+            Session.prototype.toFileSpanWithContext = function (fileName, textSpan, contextSpan, project) {
+                var fileSpan = this.toFileSpan(fileName, textSpan, project);
+                var context = contextSpan && this.toFileSpan(fileName, contextSpan, project);
+                return context ? __assign({}, fileSpan, { contextStart: context.start, contextEnd: context.end }) :
+                    fileSpan;
+            };
             Session.prototype.getTypeDefinition = function (args) {
                 var _a = this.getFileAndProject(args), file = _a.file, project = _a.project;
                 var position = this.getPositionInFile(args, file);
@@ -129148,20 +133317,9 @@ var ts;
                 return this.mapDefinitionInfo(definitions, project);
             };
             Session.prototype.mapImplementationLocations = function (implementations, project) {
-                var _this = this;
                 return implementations.map(function (info) {
-                    var newLoc = getMappedLocation(documentSpanLocation(info), _this.projectService, project);
-                    return !newLoc ? info : {
-                        fileName: newLoc.fileName,
-                        kind: info.kind,
-                        displayParts: info.displayParts,
-                        textSpan: {
-                            start: newLoc.pos,
-                            length: info.textSpan.length
-                        },
-                        originalFileName: info.fileName,
-                        originalTextSpan: info.textSpan,
-                    };
+                    var newDocumentSpan = getMappedDocumentSpan(info, project);
+                    return !newDocumentSpan ? info : __assign({}, newDocumentSpan, { kind: info.kind, displayParts: info.displayParts });
                 });
             };
             Session.prototype.getImplementation = function (args, simplifiedResult) {
@@ -129169,36 +133327,24 @@ var ts;
                 var _a = this.getFileAndProject(args), file = _a.file, project = _a.project;
                 var position = this.getPositionInFile(args, file);
                 var implementations = this.mapImplementationLocations(project.getLanguageService().getImplementationAtPosition(file, position) || server.emptyArray, project);
-                if (simplifiedResult) {
-                    return implementations.map(function (_a) {
-                        var fileName = _a.fileName, textSpan = _a.textSpan;
-                        return _this.toFileSpan(fileName, textSpan, project);
-                    });
-                }
-                return implementations.map(Session.mapToOriginalLocation);
+                return simplifiedResult ?
+                    implementations.map(function (_a) {
+                        var fileName = _a.fileName, textSpan = _a.textSpan, contextSpan = _a.contextSpan;
+                        return _this.toFileSpanWithContext(fileName, textSpan, contextSpan, project);
+                    }) :
+                    implementations.map(Session.mapToOriginalLocation);
             };
             Session.prototype.getOccurrences = function (args) {
                 var _a = this.getFileAndProject(args), file = _a.file, project = _a.project;
                 var position = this.getPositionInFile(args, file);
                 var occurrences = project.getLanguageService().getOccurrencesAtPosition(file, position);
-                if (!occurrences) {
-                    return server.emptyArray;
-                }
-                return occurrences.map(function (occurrence) {
-                    var fileName = occurrence.fileName, isWriteAccess = occurrence.isWriteAccess, textSpan = occurrence.textSpan, isInString = occurrence.isInString;
-                    var scriptInfo = project.getScriptInfo(fileName);
-                    var result = {
-                        start: scriptInfo.positionToLineOffset(textSpan.start),
-                        end: scriptInfo.positionToLineOffset(ts.textSpanEnd(textSpan)),
-                        file: fileName,
-                        isWriteAccess: isWriteAccess,
-                    };
-                    // no need to serialize the property if it is not true
-                    if (isInString) {
-                        result.isInString = isInString;
-                    }
-                    return result;
-                });
+                return occurrences ?
+                    occurrences.map(function (occurrence) {
+                        var fileName = occurrence.fileName, isWriteAccess = occurrence.isWriteAccess, textSpan = occurrence.textSpan, isInString = occurrence.isInString, contextSpan = occurrence.contextSpan;
+                        var scriptInfo = project.getScriptInfo(fileName);
+                        return __assign({}, toProtocolTextSpanWithContext(textSpan, contextSpan, scriptInfo), { file: fileName, isWriteAccess: isWriteAccess }, (isInString ? { isInString: isInString } : undefined));
+                    }) :
+                    server.emptyArray;
             };
             Session.prototype.getSyntacticDiagnosticsSync = function (args) {
                 var configFile = this.getConfigFileAndProject(args).configFile;
@@ -129234,29 +133380,21 @@ var ts;
                 var _a = this.getFileAndProject(args), file = _a.file, project = _a.project;
                 var position = this.getPositionInFile(args, file);
                 var documentHighlights = project.getLanguageService().getDocumentHighlights(file, position, args.filesToSearch);
-                if (!documentHighlights) {
+                if (!documentHighlights)
                     return server.emptyArray;
-                }
-                if (simplifiedResult) {
-                    return documentHighlights.map(convertToDocumentHighlightsItem);
-                }
-                else {
+                if (!simplifiedResult)
                     return documentHighlights;
-                }
-                function convertToDocumentHighlightsItem(documentHighlights) {
-                    var fileName = documentHighlights.fileName, highlightSpans = documentHighlights.highlightSpans;
+                return documentHighlights.map(function (_a) {
+                    var fileName = _a.fileName, highlightSpans = _a.highlightSpans;
                     var scriptInfo = project.getScriptInfo(fileName);
                     return {
                         file: fileName,
-                        highlightSpans: highlightSpans.map(convertHighlightSpan)
+                        highlightSpans: highlightSpans.map(function (_a) {
+                            var textSpan = _a.textSpan, kind = _a.kind, contextSpan = _a.contextSpan;
+                            return (__assign({}, toProtocolTextSpanWithContext(textSpan, contextSpan, scriptInfo), { kind: kind }));
+                        })
                     };
-                    function convertHighlightSpan(highlightSpan) {
-                        var textSpan = highlightSpan.textSpan, kind = highlightSpan.kind;
-                        var start = scriptInfo.positionToLineOffset(textSpan.start);
-                        var end = scriptInfo.positionToLineOffset(ts.textSpanEnd(textSpan));
-                        return { start: start, end: end, kind: kind };
-                    }
-                }
+                });
             };
             Session.prototype.setCompilerOptionsForInferredProjects = function (args) {
                 this.projectService.setCompilerOptionsForInferredProjects(args.options, args.projectRootPath);
@@ -129333,7 +133471,7 @@ var ts;
             Session.prototype.mapRenameInfo = function (info, scriptInfo) {
                 if (info.canRename) {
                     var canRename = info.canRename, fileToRename = info.fileToRename, displayName = info.displayName, fullDisplayName = info.fullDisplayName, kind = info.kind, kindModifiers = info.kindModifiers, triggerSpan = info.triggerSpan;
-                    return ts.identity({ canRename: canRename, fileToRename: fileToRename, displayName: displayName, fullDisplayName: fullDisplayName, kind: kind, kindModifiers: kindModifiers, triggerSpan: this.toLocationTextSpan(triggerSpan, scriptInfo) });
+                    return ts.identity({ canRename: canRename, fileToRename: fileToRename, displayName: displayName, fullDisplayName: fullDisplayName, kind: kind, kindModifiers: kindModifiers, triggerSpan: toProcolTextSpan(triggerSpan, scriptInfo) });
                 }
                 else {
                     return info;
@@ -129343,12 +133481,12 @@ var ts;
                 var map = ts.createMap();
                 for (var _i = 0, locations_1 = locations; _i < locations_1.length; _i++) {
                     var _a = locations_1[_i];
-                    var fileName = _a.fileName, textSpan = _a.textSpan, _ = _a.originalTextSpan, _1 = _a.originalFileName, prefixSuffixText = __rest(_a, ["fileName", "textSpan", "originalTextSpan", "originalFileName"]);
+                    var fileName = _a.fileName, textSpan = _a.textSpan, contextSpan = _a.contextSpan, _2 = _a.originalContextSpan, _ = _a.originalTextSpan, _1 = _a.originalFileName, prefixSuffixText = __rest(_a, ["fileName", "textSpan", "contextSpan", "originalContextSpan", "originalTextSpan", "originalFileName"]);
                     var group_1 = map.get(fileName);
                     if (!group_1)
                         map.set(fileName, group_1 = { file: fileName, locs: [] });
                     var scriptInfo = ts.Debug.assertDefined(this.projectService.getScriptInfo(fileName));
-                    group_1.locs.push(__assign({}, this.toLocationTextSpan(textSpan, scriptInfo), prefixSuffixText));
+                    group_1.locs.push(__assign({}, toProtocolTextSpanWithContext(textSpan, contextSpan, scriptInfo), prefixSuffixText));
                 }
                 return ts.arrayFrom(map.values());
             };
@@ -129358,30 +133496,28 @@ var ts;
                 var projects = this.getProjects(args);
                 var position = this.getPositionInFile(args, file);
                 var references = combineProjectOutputForReferences(projects, this.getDefaultProject(args), { fileName: args.file, pos: position });
-                if (simplifiedResult) {
-                    var defaultProject = this.getDefaultProject(args);
-                    var scriptInfo = defaultProject.getScriptInfoForNormalizedPath(file);
-                    var nameInfo = defaultProject.getLanguageService().getQuickInfoAtPosition(file, position);
-                    var symbolDisplayString = nameInfo ? ts.displayPartsToString(nameInfo.displayParts) : "";
-                    var nameSpan = nameInfo && nameInfo.textSpan;
-                    var symbolStartOffset = nameSpan ? scriptInfo.positionToLineOffset(nameSpan.start).offset : 0;
-                    var symbolName_1 = nameSpan ? scriptInfo.getSnapshot().getText(nameSpan.start, ts.textSpanEnd(nameSpan)) : "";
-                    var refs = ts.flatMap(references, function (referencedSymbol) {
-                        return referencedSymbol.references.map(function (_a) {
-                            var fileName = _a.fileName, textSpan = _a.textSpan, isWriteAccess = _a.isWriteAccess, isDefinition = _a.isDefinition;
-                            var scriptInfo = ts.Debug.assertDefined(_this.projectService.getScriptInfo(fileName));
-                            var start = scriptInfo.positionToLineOffset(textSpan.start);
-                            var lineSpan = scriptInfo.lineToTextSpan(start.line - 1);
-                            var lineText = scriptInfo.getSnapshot().getText(lineSpan.start, ts.textSpanEnd(lineSpan)).replace(/\r|\n/g, "");
-                            return __assign({}, toFileSpan(fileName, textSpan, scriptInfo), { lineText: lineText, isWriteAccess: isWriteAccess, isDefinition: isDefinition });
-                        });
-                    });
-                    var result = { refs: refs, symbolName: symbolName_1, symbolStartOffset: symbolStartOffset, symbolDisplayString: symbolDisplayString };
-                    return result;
-                }
-                else {
+                if (!simplifiedResult)
                     return references;
-                }
+                var defaultProject = this.getDefaultProject(args);
+                var scriptInfo = defaultProject.getScriptInfoForNormalizedPath(file);
+                var nameInfo = defaultProject.getLanguageService().getQuickInfoAtPosition(file, position);
+                var symbolDisplayString = nameInfo ? ts.displayPartsToString(nameInfo.displayParts) : "";
+                var nameSpan = nameInfo && nameInfo.textSpan;
+                var symbolStartOffset = nameSpan ? scriptInfo.positionToLineOffset(nameSpan.start).offset : 0;
+                var symbolName = nameSpan ? scriptInfo.getSnapshot().getText(nameSpan.start, ts.textSpanEnd(nameSpan)) : "";
+                var refs = ts.flatMap(references, function (referencedSymbol) {
+                    return referencedSymbol.references.map(function (_a) {
+                        var fileName = _a.fileName, textSpan = _a.textSpan, contextSpan = _a.contextSpan, isWriteAccess = _a.isWriteAccess, isDefinition = _a.isDefinition;
+                        var scriptInfo = ts.Debug.assertDefined(_this.projectService.getScriptInfo(fileName));
+                        var span = toProtocolTextSpanWithContext(textSpan, contextSpan, scriptInfo);
+                        var lineSpan = scriptInfo.lineToTextSpan(span.start.line - 1);
+                        var lineText = scriptInfo.getSnapshot().getText(lineSpan.start, ts.textSpanEnd(lineSpan)).replace(/\r|\n/g, "");
+                        return __assign({ file: fileName }, span, { lineText: lineText,
+                            isWriteAccess: isWriteAccess,
+                            isDefinition: isDefinition });
+                    });
+                });
+                return { refs: refs, symbolName: symbolName, symbolStartOffset: symbolStartOffset, symbolDisplayString: symbolDisplayString };
             };
             /**
              * @param fileName is the name of the file to be opened
@@ -129419,14 +133555,13 @@ var ts;
                 return { file: file, project: project };
             };
             Session.prototype.getOutliningSpans = function (args, simplifiedResult) {
-                var _this = this;
                 var _a = this.getFileAndLanguageServiceForSyntacticOperation(args), file = _a.file, languageService = _a.languageService;
                 var spans = languageService.getOutliningSpans(file);
                 if (simplifiedResult) {
                     var scriptInfo_1 = this.projectService.getScriptInfoForNormalizedPath(file);
                     return spans.map(function (s) { return ({
-                        textSpan: _this.toLocationTextSpan(s.textSpan, scriptInfo_1),
-                        hintSpan: _this.toLocationTextSpan(s.hintSpan, scriptInfo_1),
+                        textSpan: toProcolTextSpan(s.textSpan, scriptInfo_1),
+                        hintSpan: toProcolTextSpan(s.hintSpan, scriptInfo_1),
                         bannerText: s.bannerText,
                         autoCollapse: s.autoCollapse,
                         kind: s.kind
@@ -129576,7 +133711,6 @@ var ts;
                 });
             };
             Session.prototype.getCompletions = function (args, kind) {
-                var _this = this;
                 var _a = this.getFileAndProject(args), file = _a.file, project = _a.project;
                 var scriptInfo = this.projectService.getScriptInfoForNormalizedPath(file);
                 var position = this.getPosition(args, scriptInfo);
@@ -129589,7 +133723,7 @@ var ts;
                 var entries = ts.mapDefined(completions.entries, function (entry) {
                     if (completions.isMemberCompletion || ts.startsWith(entry.name.toLowerCase(), prefix.toLowerCase())) {
                         var name = entry.name, kind_1 = entry.kind, kindModifiers = entry.kindModifiers, sortText = entry.sortText, insertText = entry.insertText, replacementSpan = entry.replacementSpan, hasAction = entry.hasAction, source = entry.source, isRecommended = entry.isRecommended;
-                        var convertedSpan = replacementSpan ? _this.toLocationTextSpan(replacementSpan, scriptInfo) : undefined;
+                        var convertedSpan = replacementSpan ? toProcolTextSpan(replacementSpan, scriptInfo) : undefined;
                         // Use `hasAction || undefined` to avoid serializing `false`.
                         return { name: name, kind: kind_1, kindModifiers: kindModifiers, sortText: sortText, insertText: insertText, replacementSpan: convertedSpan, hasAction: hasAction || undefined, source: source, isRecommended: isRecommended };
                     }
@@ -129733,7 +133867,7 @@ var ts;
                     text: item.text,
                     kind: item.kind,
                     kindModifiers: item.kindModifiers,
-                    spans: item.spans.map(function (span) { return _this.toLocationTextSpan(span, scriptInfo); }),
+                    spans: item.spans.map(function (span) { return toProcolTextSpan(span, scriptInfo); }),
                     childItems: _this.mapLocationNavigationBarItems(item.childItems, scriptInfo),
                     indent: item.indent
                 }); });
@@ -129753,17 +133887,11 @@ var ts;
                     text: tree.text,
                     kind: tree.kind,
                     kindModifiers: tree.kindModifiers,
-                    spans: tree.spans.map(function (span) { return _this.toLocationTextSpan(span, scriptInfo); }),
-                    nameSpan: tree.nameSpan && this.toLocationTextSpan(tree.nameSpan, scriptInfo),
+                    spans: tree.spans.map(function (span) { return toProcolTextSpan(span, scriptInfo); }),
+                    nameSpan: tree.nameSpan && toProcolTextSpan(tree.nameSpan, scriptInfo),
                     childItems: ts.map(tree.childItems, function (item) { return _this.toLocationNavigationTree(item, scriptInfo); })
                 };
             };
-            Session.prototype.toLocationTextSpan = function (span, scriptInfo) {
-                return {
-                    start: scriptInfo.positionToLineOffset(span.start),
-                    end: scriptInfo.positionToLineOffset(ts.textSpanEnd(span))
-                };
-            };
             Session.prototype.getNavigationTree = function (args, simplifiedResult) {
                 var _a = this.getFileAndLanguageServiceForSyntacticOperation(args), file = _a.file, languageService = _a.languageService;
                 var tree = languageService.getNavigationTree(file);
@@ -129979,7 +134107,6 @@ var ts;
                 };
             };
             Session.prototype.getBraceMatching = function (args, simplifiedResult) {
-                var _this = this;
                 var _a = this.getFileAndLanguageServiceForSyntacticOperation(args), file = _a.file, languageService = _a.languageService;
                 var scriptInfo = this.projectService.getScriptInfoForNormalizedPath(file);
                 var position = this.getPosition(args, scriptInfo);
@@ -129987,7 +134114,7 @@ var ts;
                 return !spans
                     ? undefined
                     : simplifiedResult
-                        ? spans.map(function (span) { return _this.toLocationTextSpan(span, scriptInfo); })
+                        ? spans.map(function (span) { return toProcolTextSpan(span, scriptInfo); })
                         : spans;
             };
             Session.prototype.getDiagnosticsForProject = function (next, delay, fileName) {
@@ -130039,6 +134166,26 @@ var ts;
             Session.prototype.configurePlugin = function (args) {
                 this.projectService.configurePlugin(args);
             };
+            Session.prototype.getSmartSelectionRange = function (args, simplifiedResult) {
+                var _this = this;
+                var locations = args.locations;
+                var _a = this.getFileAndLanguageServiceForSyntacticOperation(args), file = _a.file, languageService = _a.languageService;
+                var scriptInfo = ts.Debug.assertDefined(this.projectService.getScriptInfo(file));
+                return ts.map(locations, function (location) {
+                    var pos = _this.getPosition(location, scriptInfo);
+                    var selectionRange = languageService.getSmartSelectionRange(file, pos);
+                    return simplifiedResult ? _this.mapSelectionRange(selectionRange, scriptInfo) : selectionRange;
+                });
+            };
+            Session.prototype.mapSelectionRange = function (selectionRange, scriptInfo) {
+                var result = {
+                    textSpan: toProcolTextSpan(selectionRange.textSpan, scriptInfo),
+                };
+                if (selectionRange.parent) {
+                    result.parent = this.mapSelectionRange(selectionRange.parent, scriptInfo);
+                }
+                return result;
+            };
             Session.prototype.getCanonicalFileName = function (fileName) {
                 var name = this.host.useCaseSensitiveFileNames ? fileName : fileName.toLowerCase();
                 return ts.normalizePath(name);
@@ -130144,8 +134291,17 @@ var ts;
             return Session;
         }());
         server.Session = Session;
-        function toFileSpan(fileName, textSpan, scriptInfo) {
-            return { file: fileName, start: scriptInfo.positionToLineOffset(textSpan.start), end: scriptInfo.positionToLineOffset(ts.textSpanEnd(textSpan)) };
+        function toProcolTextSpan(textSpan, scriptInfo) {
+            return {
+                start: scriptInfo.positionToLineOffset(textSpan.start),
+                end: scriptInfo.positionToLineOffset(ts.textSpanEnd(textSpan))
+            };
+        }
+        function toProtocolTextSpanWithContext(span, contextSpan, scriptInfo) {
+            var textSpan = toProcolTextSpan(span, scriptInfo);
+            var contextTextSpan = contextSpan && toProcolTextSpan(contextSpan, scriptInfo);
+            return contextTextSpan ? __assign({}, textSpan, { contextStart: contextTextSpan.start, contextEnd: contextTextSpan.end }) :
+                textSpan;
         }
         function convertTextChangeToCodeEdit(change, scriptInfo) {
             return { start: positionToLineOffset(scriptInfo, change.span.start), end: positionToLineOffset(scriptInfo, ts.textSpanEnd(change.span)), newText: change.newText };
@@ -131082,7 +135238,7 @@ var ts;
             return Logger;
         }());
         var NodeTypingsInstaller = /** @class */ (function () {
-            function NodeTypingsInstaller(telemetryEnabled, logger, host, globalTypingsCacheLocation, typingSafeListLocation, typesMapLocation, npmLocation, event) {
+            function NodeTypingsInstaller(telemetryEnabled, logger, host, globalTypingsCacheLocation, typingSafeListLocation, typesMapLocation, npmLocation, validateDefaultNpmLocation, event) {
                 this.telemetryEnabled = telemetryEnabled;
                 this.logger = logger;
                 this.host = host;
@@ -131090,6 +135246,7 @@ var ts;
                 this.typingSafeListLocation = typingSafeListLocation;
                 this.typesMapLocation = typesMapLocation;
                 this.npmLocation = npmLocation;
+                this.validateDefaultNpmLocation = validateDefaultNpmLocation;
                 this.event = event;
                 this.activeRequestCount = 0;
                 this.requestQueue = [];
@@ -131118,12 +135275,6 @@ var ts;
                     _this.packageInstalledPromise = { resolve: resolve, reject: reject };
                 });
             };
-            NodeTypingsInstaller.prototype.inspectValue = function (options) {
-                var _this = this;
-                this.send({ kind: "inspectValue", options: options });
-                ts.Debug.assert(this.inspectValuePromise === undefined);
-                return new Promise(function (resolve) { _this.inspectValuePromise = { resolve: resolve }; });
-            };
             NodeTypingsInstaller.prototype.attach = function (projectService) {
                 var _this = this;
                 this.projectService = projectService;
@@ -131146,6 +135297,9 @@ var ts;
                 if (this.npmLocation) {
                     args.push(server.Arguments.NpmLocation, this.npmLocation);
                 }
+                if (this.validateDefaultNpmLocation) {
+                    args.push(server.Arguments.ValidateDefaultNpmLocation);
+                }
                 var execArgv = [];
                 for (var _i = 0, _a = process.execArgv; _i < _a.length; _i++) {
                     var arg = _a[_i];
@@ -131222,10 +135376,6 @@ var ts;
                         this.event(response, "setTypings");
                         break;
                     }
-                    case server.ActionValueInspected:
-                        this.inspectValuePromise.resolve(response.result);
-                        this.inspectValuePromise = undefined;
-                        break;
                     case server.EventInitializationFailed: {
                         var body = {
                             message: response.message
@@ -131330,7 +135480,7 @@ var ts;
                 var host = sys;
                 var typingsInstaller = disableAutomaticTypingAcquisition
                     ? undefined
-                    : new NodeTypingsInstaller(telemetryEnabled, logger, host, getGlobalTypingsCacheLocation(), typingSafeListLocation, typesMapLocation, npmLocation, event);
+                    : new NodeTypingsInstaller(telemetryEnabled, logger, host, getGlobalTypingsCacheLocation(), typingSafeListLocation, typesMapLocation, npmLocation, validateDefaultNpmLocation, event);
                 _this = _super.call(this, {
                     host: host,
                     cancellationToken: cancellationToken,
@@ -131725,6 +135875,7 @@ var ts;
         var typingSafeListLocation = server.findArgument(server.Arguments.TypingSafeListLocation); // TODO: GH#18217
         var typesMapLocation = server.findArgument(server.Arguments.TypesMapLocation) || ts.combinePaths(ts.getDirectoryPath(sys.getExecutingFilePath()), "typesMap.json");
         var npmLocation = server.findArgument(server.Arguments.NpmLocation);
+        var validateDefaultNpmLocation = server.hasArgument(server.Arguments.ValidateDefaultNpmLocation);
         function parseStringArray(argName) {
             var arg = server.findArgument(argName);
             if (arg === undefined) {
diff --git a/lib/tsserverlibrary.d.ts b/lib/tsserverlibrary.d.ts
index cb035b63293..c2bad61505b 100644
--- a/lib/tsserverlibrary.d.ts
+++ b/lib/tsserverlibrary.d.ts
@@ -14,7 +14,7 @@ and limitations under the License.
 ***************************************************************************** */
 
 declare namespace ts {
-    const versionMajorMinor = "3.4";
+    const versionMajorMinor = "3.6";
     /** The version of the TypeScript compiler release */
     const version: string;
 }
@@ -53,7 +53,7 @@ declare namespace ts {
     interface Iterator<T> {
         next(): {
             value: T;
-            done: false;
+            done?: false;
         } | {
             value: never;
             done: true;
@@ -72,7 +72,7 @@ declare namespace ts {
         pos: number;
         end: number;
     }
-    type JsDocSyntaxKind = SyntaxKind.EndOfFileToken | SyntaxKind.WhitespaceTrivia | SyntaxKind.AtToken | SyntaxKind.NewLineTrivia | SyntaxKind.AsteriskToken | SyntaxKind.OpenBraceToken | SyntaxKind.CloseBraceToken | SyntaxKind.LessThanToken | SyntaxKind.OpenBracketToken | SyntaxKind.CloseBracketToken | SyntaxKind.EqualsToken | SyntaxKind.CommaToken | SyntaxKind.DotToken | SyntaxKind.Identifier | SyntaxKind.NoSubstitutionTemplateLiteral | SyntaxKind.Unknown | KeywordSyntaxKind;
+    type JSDocSyntaxKind = SyntaxKind.EndOfFileToken | SyntaxKind.WhitespaceTrivia | SyntaxKind.AtToken | SyntaxKind.NewLineTrivia | SyntaxKind.AsteriskToken | SyntaxKind.OpenBraceToken | SyntaxKind.CloseBraceToken | SyntaxKind.LessThanToken | SyntaxKind.GreaterThanToken | SyntaxKind.OpenBracketToken | SyntaxKind.CloseBracketToken | SyntaxKind.EqualsToken | SyntaxKind.CommaToken | SyntaxKind.DotToken | SyntaxKind.Identifier | SyntaxKind.BacktickToken | SyntaxKind.Unknown | KeywordSyntaxKind;
     type KeywordSyntaxKind = SyntaxKind.AbstractKeyword | SyntaxKind.AnyKeyword | SyntaxKind.AsKeyword | SyntaxKind.BigIntKeyword | SyntaxKind.BooleanKeyword | SyntaxKind.BreakKeyword | SyntaxKind.CaseKeyword | SyntaxKind.CatchKeyword | SyntaxKind.ClassKeyword | SyntaxKind.ContinueKeyword | SyntaxKind.ConstKeyword | SyntaxKind.ConstructorKeyword | SyntaxKind.DebuggerKeyword | SyntaxKind.DeclareKeyword | SyntaxKind.DefaultKeyword | SyntaxKind.DeleteKeyword | SyntaxKind.DoKeyword | SyntaxKind.ElseKeyword | SyntaxKind.EnumKeyword | SyntaxKind.ExportKeyword | SyntaxKind.ExtendsKeyword | SyntaxKind.FalseKeyword | SyntaxKind.FinallyKeyword | SyntaxKind.ForKeyword | SyntaxKind.FromKeyword | SyntaxKind.FunctionKeyword | SyntaxKind.GetKeyword | SyntaxKind.IfKeyword | SyntaxKind.ImplementsKeyword | SyntaxKind.ImportKeyword | SyntaxKind.InKeyword | SyntaxKind.InferKeyword | SyntaxKind.InstanceOfKeyword | SyntaxKind.InterfaceKeyword | SyntaxKind.IsKeyword | SyntaxKind.KeyOfKeyword | SyntaxKind.LetKeyword | SyntaxKind.ModuleKeyword | SyntaxKind.NamespaceKeyword | SyntaxKind.NeverKeyword | SyntaxKind.NewKeyword | SyntaxKind.NullKeyword | SyntaxKind.NumberKeyword | SyntaxKind.ObjectKeyword | SyntaxKind.PackageKeyword | SyntaxKind.PrivateKeyword | SyntaxKind.ProtectedKeyword | SyntaxKind.PublicKeyword | SyntaxKind.ReadonlyKeyword | SyntaxKind.RequireKeyword | SyntaxKind.GlobalKeyword | SyntaxKind.ReturnKeyword | SyntaxKind.SetKeyword | SyntaxKind.StaticKeyword | SyntaxKind.StringKeyword | SyntaxKind.SuperKeyword | SyntaxKind.SwitchKeyword | SyntaxKind.SymbolKeyword | SyntaxKind.ThisKeyword | SyntaxKind.ThrowKeyword | SyntaxKind.TrueKeyword | SyntaxKind.TryKeyword | SyntaxKind.TypeKeyword | SyntaxKind.TypeOfKeyword | SyntaxKind.UndefinedKeyword | SyntaxKind.UniqueKeyword | SyntaxKind.UnknownKeyword | SyntaxKind.VarKeyword | SyntaxKind.VoidKeyword | SyntaxKind.WhileKeyword | SyntaxKind.WithKeyword | SyntaxKind.YieldKeyword | SyntaxKind.AsyncKeyword | SyntaxKind.AwaitKeyword | SyntaxKind.OfKeyword;
     type JsxTokenSyntaxKind = SyntaxKind.LessThanSlashToken | SyntaxKind.EndOfFileToken | SyntaxKind.ConflictMarkerTrivia | SyntaxKind.JsxText | SyntaxKind.JsxTextAllWhiteSpaces | SyntaxKind.OpenBraceToken | SyntaxKind.LessThanToken;
     enum SyntaxKind {
@@ -135,281 +135,284 @@ declare namespace ts {
         QuestionToken = 56,
         ColonToken = 57,
         AtToken = 58,
-        EqualsToken = 59,
-        PlusEqualsToken = 60,
-        MinusEqualsToken = 61,
-        AsteriskEqualsToken = 62,
-        AsteriskAsteriskEqualsToken = 63,
-        SlashEqualsToken = 64,
-        PercentEqualsToken = 65,
-        LessThanLessThanEqualsToken = 66,
-        GreaterThanGreaterThanEqualsToken = 67,
-        GreaterThanGreaterThanGreaterThanEqualsToken = 68,
-        AmpersandEqualsToken = 69,
-        BarEqualsToken = 70,
-        CaretEqualsToken = 71,
-        Identifier = 72,
-        BreakKeyword = 73,
-        CaseKeyword = 74,
-        CatchKeyword = 75,
-        ClassKeyword = 76,
-        ConstKeyword = 77,
-        ContinueKeyword = 78,
-        DebuggerKeyword = 79,
-        DefaultKeyword = 80,
-        DeleteKeyword = 81,
-        DoKeyword = 82,
-        ElseKeyword = 83,
-        EnumKeyword = 84,
-        ExportKeyword = 85,
-        ExtendsKeyword = 86,
-        FalseKeyword = 87,
-        FinallyKeyword = 88,
-        ForKeyword = 89,
-        FunctionKeyword = 90,
-        IfKeyword = 91,
-        ImportKeyword = 92,
-        InKeyword = 93,
-        InstanceOfKeyword = 94,
-        NewKeyword = 95,
-        NullKeyword = 96,
-        ReturnKeyword = 97,
-        SuperKeyword = 98,
-        SwitchKeyword = 99,
-        ThisKeyword = 100,
-        ThrowKeyword = 101,
-        TrueKeyword = 102,
-        TryKeyword = 103,
-        TypeOfKeyword = 104,
-        VarKeyword = 105,
-        VoidKeyword = 106,
-        WhileKeyword = 107,
-        WithKeyword = 108,
-        ImplementsKeyword = 109,
-        InterfaceKeyword = 110,
-        LetKeyword = 111,
-        PackageKeyword = 112,
-        PrivateKeyword = 113,
-        ProtectedKeyword = 114,
-        PublicKeyword = 115,
-        StaticKeyword = 116,
-        YieldKeyword = 117,
-        AbstractKeyword = 118,
-        AsKeyword = 119,
-        AnyKeyword = 120,
-        AsyncKeyword = 121,
-        AwaitKeyword = 122,
-        BooleanKeyword = 123,
-        ConstructorKeyword = 124,
-        DeclareKeyword = 125,
-        GetKeyword = 126,
-        InferKeyword = 127,
-        IsKeyword = 128,
-        KeyOfKeyword = 129,
-        ModuleKeyword = 130,
-        NamespaceKeyword = 131,
-        NeverKeyword = 132,
-        ReadonlyKeyword = 133,
-        RequireKeyword = 134,
-        NumberKeyword = 135,
-        ObjectKeyword = 136,
-        SetKeyword = 137,
-        StringKeyword = 138,
-        SymbolKeyword = 139,
-        TypeKeyword = 140,
-        UndefinedKeyword = 141,
-        UniqueKeyword = 142,
-        UnknownKeyword = 143,
-        FromKeyword = 144,
-        GlobalKeyword = 145,
-        BigIntKeyword = 146,
-        OfKeyword = 147,
-        QualifiedName = 148,
-        ComputedPropertyName = 149,
-        TypeParameter = 150,
-        Parameter = 151,
-        Decorator = 152,
-        PropertySignature = 153,
-        PropertyDeclaration = 154,
-        MethodSignature = 155,
-        MethodDeclaration = 156,
-        Constructor = 157,
-        GetAccessor = 158,
-        SetAccessor = 159,
-        CallSignature = 160,
-        ConstructSignature = 161,
-        IndexSignature = 162,
-        TypePredicate = 163,
-        TypeReference = 164,
-        FunctionType = 165,
-        ConstructorType = 166,
-        TypeQuery = 167,
-        TypeLiteral = 168,
-        ArrayType = 169,
-        TupleType = 170,
-        OptionalType = 171,
-        RestType = 172,
-        UnionType = 173,
-        IntersectionType = 174,
-        ConditionalType = 175,
-        InferType = 176,
-        ParenthesizedType = 177,
-        ThisType = 178,
-        TypeOperator = 179,
-        IndexedAccessType = 180,
-        MappedType = 181,
-        LiteralType = 182,
-        ImportType = 183,
-        ObjectBindingPattern = 184,
-        ArrayBindingPattern = 185,
-        BindingElement = 186,
-        ArrayLiteralExpression = 187,
-        ObjectLiteralExpression = 188,
-        PropertyAccessExpression = 189,
-        ElementAccessExpression = 190,
-        CallExpression = 191,
-        NewExpression = 192,
-        TaggedTemplateExpression = 193,
-        TypeAssertionExpression = 194,
-        ParenthesizedExpression = 195,
-        FunctionExpression = 196,
-        ArrowFunction = 197,
-        DeleteExpression = 198,
-        TypeOfExpression = 199,
-        VoidExpression = 200,
-        AwaitExpression = 201,
-        PrefixUnaryExpression = 202,
-        PostfixUnaryExpression = 203,
-        BinaryExpression = 204,
-        ConditionalExpression = 205,
-        TemplateExpression = 206,
-        YieldExpression = 207,
-        SpreadElement = 208,
-        ClassExpression = 209,
-        OmittedExpression = 210,
-        ExpressionWithTypeArguments = 211,
-        AsExpression = 212,
-        NonNullExpression = 213,
-        MetaProperty = 214,
-        SyntheticExpression = 215,
-        TemplateSpan = 216,
-        SemicolonClassElement = 217,
-        Block = 218,
-        VariableStatement = 219,
-        EmptyStatement = 220,
-        ExpressionStatement = 221,
-        IfStatement = 222,
-        DoStatement = 223,
-        WhileStatement = 224,
-        ForStatement = 225,
-        ForInStatement = 226,
-        ForOfStatement = 227,
-        ContinueStatement = 228,
-        BreakStatement = 229,
-        ReturnStatement = 230,
-        WithStatement = 231,
-        SwitchStatement = 232,
-        LabeledStatement = 233,
-        ThrowStatement = 234,
-        TryStatement = 235,
-        DebuggerStatement = 236,
-        VariableDeclaration = 237,
-        VariableDeclarationList = 238,
-        FunctionDeclaration = 239,
-        ClassDeclaration = 240,
-        InterfaceDeclaration = 241,
-        TypeAliasDeclaration = 242,
-        EnumDeclaration = 243,
-        ModuleDeclaration = 244,
-        ModuleBlock = 245,
-        CaseBlock = 246,
-        NamespaceExportDeclaration = 247,
-        ImportEqualsDeclaration = 248,
-        ImportDeclaration = 249,
-        ImportClause = 250,
-        NamespaceImport = 251,
-        NamedImports = 252,
-        ImportSpecifier = 253,
-        ExportAssignment = 254,
-        ExportDeclaration = 255,
-        NamedExports = 256,
-        ExportSpecifier = 257,
-        MissingDeclaration = 258,
-        ExternalModuleReference = 259,
-        JsxElement = 260,
-        JsxSelfClosingElement = 261,
-        JsxOpeningElement = 262,
-        JsxClosingElement = 263,
-        JsxFragment = 264,
-        JsxOpeningFragment = 265,
-        JsxClosingFragment = 266,
-        JsxAttribute = 267,
-        JsxAttributes = 268,
-        JsxSpreadAttribute = 269,
-        JsxExpression = 270,
-        CaseClause = 271,
-        DefaultClause = 272,
-        HeritageClause = 273,
-        CatchClause = 274,
-        PropertyAssignment = 275,
-        ShorthandPropertyAssignment = 276,
-        SpreadAssignment = 277,
-        EnumMember = 278,
-        UnparsedPrologue = 279,
-        UnparsedPrepend = 280,
-        UnparsedText = 281,
-        UnparsedInternalText = 282,
-        UnparsedSyntheticReference = 283,
-        SourceFile = 284,
-        Bundle = 285,
-        UnparsedSource = 286,
-        InputFiles = 287,
-        JSDocTypeExpression = 288,
-        JSDocAllType = 289,
-        JSDocUnknownType = 290,
-        JSDocNullableType = 291,
-        JSDocNonNullableType = 292,
-        JSDocOptionalType = 293,
-        JSDocFunctionType = 294,
-        JSDocVariadicType = 295,
-        JSDocComment = 296,
-        JSDocTypeLiteral = 297,
-        JSDocSignature = 298,
-        JSDocTag = 299,
-        JSDocAugmentsTag = 300,
-        JSDocClassTag = 301,
-        JSDocCallbackTag = 302,
-        JSDocEnumTag = 303,
-        JSDocParameterTag = 304,
-        JSDocReturnTag = 305,
-        JSDocThisTag = 306,
-        JSDocTypeTag = 307,
-        JSDocTemplateTag = 308,
-        JSDocTypedefTag = 309,
-        JSDocPropertyTag = 310,
-        SyntaxList = 311,
-        NotEmittedStatement = 312,
-        PartiallyEmittedExpression = 313,
-        CommaListExpression = 314,
-        MergeDeclarationMarker = 315,
-        EndOfDeclarationMarker = 316,
-        Count = 317,
-        FirstAssignment = 59,
-        LastAssignment = 71,
-        FirstCompoundAssignment = 60,
-        LastCompoundAssignment = 71,
-        FirstReservedWord = 73,
-        LastReservedWord = 108,
-        FirstKeyword = 73,
-        LastKeyword = 147,
-        FirstFutureReservedWord = 109,
-        LastFutureReservedWord = 117,
-        FirstTypeNode = 163,
-        LastTypeNode = 183,
+        /** Only the JSDoc scanner produces BacktickToken. The normal scanner produces NoSubstitutionTemplateLiteral and related kinds. */
+        BacktickToken = 59,
+        EqualsToken = 60,
+        PlusEqualsToken = 61,
+        MinusEqualsToken = 62,
+        AsteriskEqualsToken = 63,
+        AsteriskAsteriskEqualsToken = 64,
+        SlashEqualsToken = 65,
+        PercentEqualsToken = 66,
+        LessThanLessThanEqualsToken = 67,
+        GreaterThanGreaterThanEqualsToken = 68,
+        GreaterThanGreaterThanGreaterThanEqualsToken = 69,
+        AmpersandEqualsToken = 70,
+        BarEqualsToken = 71,
+        CaretEqualsToken = 72,
+        Identifier = 73,
+        BreakKeyword = 74,
+        CaseKeyword = 75,
+        CatchKeyword = 76,
+        ClassKeyword = 77,
+        ConstKeyword = 78,
+        ContinueKeyword = 79,
+        DebuggerKeyword = 80,
+        DefaultKeyword = 81,
+        DeleteKeyword = 82,
+        DoKeyword = 83,
+        ElseKeyword = 84,
+        EnumKeyword = 85,
+        ExportKeyword = 86,
+        ExtendsKeyword = 87,
+        FalseKeyword = 88,
+        FinallyKeyword = 89,
+        ForKeyword = 90,
+        FunctionKeyword = 91,
+        IfKeyword = 92,
+        ImportKeyword = 93,
+        InKeyword = 94,
+        InstanceOfKeyword = 95,
+        NewKeyword = 96,
+        NullKeyword = 97,
+        ReturnKeyword = 98,
+        SuperKeyword = 99,
+        SwitchKeyword = 100,
+        ThisKeyword = 101,
+        ThrowKeyword = 102,
+        TrueKeyword = 103,
+        TryKeyword = 104,
+        TypeOfKeyword = 105,
+        VarKeyword = 106,
+        VoidKeyword = 107,
+        WhileKeyword = 108,
+        WithKeyword = 109,
+        ImplementsKeyword = 110,
+        InterfaceKeyword = 111,
+        LetKeyword = 112,
+        PackageKeyword = 113,
+        PrivateKeyword = 114,
+        ProtectedKeyword = 115,
+        PublicKeyword = 116,
+        StaticKeyword = 117,
+        YieldKeyword = 118,
+        AbstractKeyword = 119,
+        AsKeyword = 120,
+        AnyKeyword = 121,
+        AsyncKeyword = 122,
+        AwaitKeyword = 123,
+        BooleanKeyword = 124,
+        ConstructorKeyword = 125,
+        DeclareKeyword = 126,
+        GetKeyword = 127,
+        InferKeyword = 128,
+        IsKeyword = 129,
+        KeyOfKeyword = 130,
+        ModuleKeyword = 131,
+        NamespaceKeyword = 132,
+        NeverKeyword = 133,
+        ReadonlyKeyword = 134,
+        RequireKeyword = 135,
+        NumberKeyword = 136,
+        ObjectKeyword = 137,
+        SetKeyword = 138,
+        StringKeyword = 139,
+        SymbolKeyword = 140,
+        TypeKeyword = 141,
+        UndefinedKeyword = 142,
+        UniqueKeyword = 143,
+        UnknownKeyword = 144,
+        FromKeyword = 145,
+        GlobalKeyword = 146,
+        BigIntKeyword = 147,
+        OfKeyword = 148,
+        QualifiedName = 149,
+        ComputedPropertyName = 150,
+        TypeParameter = 151,
+        Parameter = 152,
+        Decorator = 153,
+        PropertySignature = 154,
+        PropertyDeclaration = 155,
+        MethodSignature = 156,
+        MethodDeclaration = 157,
+        Constructor = 158,
+        GetAccessor = 159,
+        SetAccessor = 160,
+        CallSignature = 161,
+        ConstructSignature = 162,
+        IndexSignature = 163,
+        TypePredicate = 164,
+        TypeReference = 165,
+        FunctionType = 166,
+        ConstructorType = 167,
+        TypeQuery = 168,
+        TypeLiteral = 169,
+        ArrayType = 170,
+        TupleType = 171,
+        OptionalType = 172,
+        RestType = 173,
+        UnionType = 174,
+        IntersectionType = 175,
+        ConditionalType = 176,
+        InferType = 177,
+        ParenthesizedType = 178,
+        ThisType = 179,
+        TypeOperator = 180,
+        IndexedAccessType = 181,
+        MappedType = 182,
+        LiteralType = 183,
+        ImportType = 184,
+        ObjectBindingPattern = 185,
+        ArrayBindingPattern = 186,
+        BindingElement = 187,
+        ArrayLiteralExpression = 188,
+        ObjectLiteralExpression = 189,
+        PropertyAccessExpression = 190,
+        ElementAccessExpression = 191,
+        CallExpression = 192,
+        NewExpression = 193,
+        TaggedTemplateExpression = 194,
+        TypeAssertionExpression = 195,
+        ParenthesizedExpression = 196,
+        FunctionExpression = 197,
+        ArrowFunction = 198,
+        DeleteExpression = 199,
+        TypeOfExpression = 200,
+        VoidExpression = 201,
+        AwaitExpression = 202,
+        PrefixUnaryExpression = 203,
+        PostfixUnaryExpression = 204,
+        BinaryExpression = 205,
+        ConditionalExpression = 206,
+        TemplateExpression = 207,
+        YieldExpression = 208,
+        SpreadElement = 209,
+        ClassExpression = 210,
+        OmittedExpression = 211,
+        ExpressionWithTypeArguments = 212,
+        AsExpression = 213,
+        NonNullExpression = 214,
+        MetaProperty = 215,
+        SyntheticExpression = 216,
+        TemplateSpan = 217,
+        SemicolonClassElement = 218,
+        Block = 219,
+        VariableStatement = 220,
+        EmptyStatement = 221,
+        ExpressionStatement = 222,
+        IfStatement = 223,
+        DoStatement = 224,
+        WhileStatement = 225,
+        ForStatement = 226,
+        ForInStatement = 227,
+        ForOfStatement = 228,
+        ContinueStatement = 229,
+        BreakStatement = 230,
+        ReturnStatement = 231,
+        WithStatement = 232,
+        SwitchStatement = 233,
+        LabeledStatement = 234,
+        ThrowStatement = 235,
+        TryStatement = 236,
+        DebuggerStatement = 237,
+        VariableDeclaration = 238,
+        VariableDeclarationList = 239,
+        FunctionDeclaration = 240,
+        ClassDeclaration = 241,
+        InterfaceDeclaration = 242,
+        TypeAliasDeclaration = 243,
+        EnumDeclaration = 244,
+        ModuleDeclaration = 245,
+        ModuleBlock = 246,
+        CaseBlock = 247,
+        NamespaceExportDeclaration = 248,
+        ImportEqualsDeclaration = 249,
+        ImportDeclaration = 250,
+        ImportClause = 251,
+        NamespaceImport = 252,
+        NamedImports = 253,
+        ImportSpecifier = 254,
+        ExportAssignment = 255,
+        ExportDeclaration = 256,
+        NamedExports = 257,
+        ExportSpecifier = 258,
+        MissingDeclaration = 259,
+        ExternalModuleReference = 260,
+        JsxElement = 261,
+        JsxSelfClosingElement = 262,
+        JsxOpeningElement = 263,
+        JsxClosingElement = 264,
+        JsxFragment = 265,
+        JsxOpeningFragment = 266,
+        JsxClosingFragment = 267,
+        JsxAttribute = 268,
+        JsxAttributes = 269,
+        JsxSpreadAttribute = 270,
+        JsxExpression = 271,
+        CaseClause = 272,
+        DefaultClause = 273,
+        HeritageClause = 274,
+        CatchClause = 275,
+        PropertyAssignment = 276,
+        ShorthandPropertyAssignment = 277,
+        SpreadAssignment = 278,
+        EnumMember = 279,
+        UnparsedPrologue = 280,
+        UnparsedPrepend = 281,
+        UnparsedText = 282,
+        UnparsedInternalText = 283,
+        UnparsedSyntheticReference = 284,
+        SourceFile = 285,
+        Bundle = 286,
+        UnparsedSource = 287,
+        InputFiles = 288,
+        JSDocTypeExpression = 289,
+        JSDocAllType = 290,
+        JSDocUnknownType = 291,
+        JSDocNullableType = 292,
+        JSDocNonNullableType = 293,
+        JSDocOptionalType = 294,
+        JSDocFunctionType = 295,
+        JSDocVariadicType = 296,
+        JSDocComment = 297,
+        JSDocTypeLiteral = 298,
+        JSDocSignature = 299,
+        JSDocTag = 300,
+        JSDocAugmentsTag = 301,
+        JSDocAuthorTag = 302,
+        JSDocClassTag = 303,
+        JSDocCallbackTag = 304,
+        JSDocEnumTag = 305,
+        JSDocParameterTag = 306,
+        JSDocReturnTag = 307,
+        JSDocThisTag = 308,
+        JSDocTypeTag = 309,
+        JSDocTemplateTag = 310,
+        JSDocTypedefTag = 311,
+        JSDocPropertyTag = 312,
+        SyntaxList = 313,
+        NotEmittedStatement = 314,
+        PartiallyEmittedExpression = 315,
+        CommaListExpression = 316,
+        MergeDeclarationMarker = 317,
+        EndOfDeclarationMarker = 318,
+        Count = 319,
+        FirstAssignment = 60,
+        LastAssignment = 72,
+        FirstCompoundAssignment = 61,
+        LastCompoundAssignment = 72,
+        FirstReservedWord = 74,
+        LastReservedWord = 109,
+        FirstKeyword = 74,
+        LastKeyword = 148,
+        FirstFutureReservedWord = 110,
+        LastFutureReservedWord = 118,
+        FirstTypeNode = 164,
+        LastTypeNode = 184,
         FirstPunctuation = 18,
-        LastPunctuation = 71,
+        LastPunctuation = 72,
         FirstToken = 0,
-        LastToken = 147,
+        LastToken = 148,
         FirstTriviaToken = 2,
         LastTriviaToken = 7,
         FirstLiteralToken = 8,
@@ -417,12 +420,12 @@ declare namespace ts {
         FirstTemplateToken = 14,
         LastTemplateToken = 17,
         FirstBinaryOperator = 28,
-        LastBinaryOperator = 71,
-        FirstNode = 148,
-        FirstJSDocNode = 288,
-        LastJSDocNode = 310,
-        FirstJSDocTagNode = 299,
-        LastJSDocTagNode = 310,
+        LastBinaryOperator = 72,
+        FirstNode = 149,
+        FirstJSDocNode = 289,
+        LastJSDocNode = 312,
+        FirstJSDocTagNode = 300,
+        LastJSDocTagNode = 312,
     }
     enum NodeFlags {
         None = 0,
@@ -1152,6 +1155,7 @@ declare namespace ts {
         expression: JsxTagNameExpression;
     }
     interface JsxAttributes extends ObjectLiteralExpressionBase<JsxAttributeLike> {
+        kind: SyntaxKind.JsxAttributes;
         parent: JsxOpeningLikeElement;
     }
     interface JsxOpeningElement extends Expression {
@@ -1203,9 +1207,9 @@ declare namespace ts {
         dotDotDotToken?: Token<SyntaxKind.DotDotDotToken>;
         expression?: Expression;
     }
-    interface JsxText extends Node {
+    interface JsxText extends LiteralLikeNode {
         kind: SyntaxKind.JsxText;
-        containsOnlyWhiteSpaces: boolean;
+        containsOnlyTriviaWhiteSpaces: boolean;
         parent: JsxElement;
     }
     type JsxChild = JsxText | JsxExpression | JsxElement | JsxSelfClosingElement | JsxFragment;
@@ -1579,6 +1583,9 @@ declare namespace ts {
             expression: Identifier | PropertyAccessEntityNameExpression;
         };
     }
+    interface JSDocAuthorTag extends JSDocTag {
+        kind: SyntaxKind.JSDocAuthorTag;
+    }
     interface JSDocClassTag extends JSDocTag {
         kind: SyntaxKind.JSDocClassTag;
     }
@@ -1601,7 +1608,7 @@ declare namespace ts {
     }
     interface JSDocTypeTag extends JSDocTag {
         kind: SyntaxKind.JSDocTypeTag;
-        typeExpression?: JSDocTypeExpression;
+        typeExpression: JSDocTypeExpression;
     }
     interface JSDocTypedefTag extends JSDocTag, NamedDeclaration {
         parent: JSDoc;
@@ -1877,13 +1884,18 @@ declare namespace ts {
         sourceFile: SourceFile;
         references?: ReadonlyArray<ResolvedProjectReference | undefined>;
     }
+    type CustomTransformerFactory = (context: TransformationContext) => CustomTransformer;
+    interface CustomTransformer {
+        transformSourceFile(node: SourceFile): SourceFile;
+        transformBundle(node: Bundle): Bundle;
+    }
     interface CustomTransformers {
         /** Custom transformers to evaluate before built-in .js transformations. */
-        before?: TransformerFactory<SourceFile>[];
+        before?: (TransformerFactory<SourceFile> | CustomTransformerFactory)[];
         /** Custom transformers to evaluate after built-in .js transformations. */
-        after?: TransformerFactory<SourceFile>[];
+        after?: (TransformerFactory<SourceFile> | CustomTransformerFactory)[];
         /** Custom transformers to evaluate after built-in .d.ts transformations. */
-        afterDeclarations?: TransformerFactory<Bundle | SourceFile>[];
+        afterDeclarations?: (TransformerFactory<Bundle | SourceFile> | CustomTransformerFactory)[];
     }
     interface SourceMapSpan {
         /** Line number in the .js file. */
@@ -1903,7 +1915,8 @@ declare namespace ts {
     enum ExitStatus {
         Success = 0,
         DiagnosticsPresent_OutputsSkipped = 1,
-        DiagnosticsPresent_OutputsGenerated = 2
+        DiagnosticsPresent_OutputsGenerated = 2,
+        InvalidProject_OutputsSkipped = 3
     }
     interface EmitResult {
         emitSkipped: boolean;
@@ -1962,6 +1975,7 @@ declare namespace ts {
          */
         getExportSymbolOfSymbol(symbol: Symbol): Symbol;
         getPropertySymbolOfDestructuringAssignment(location: Identifier): Symbol | undefined;
+        getTypeOfAssignmentPattern(pattern: AssignmentPattern): Type;
         getTypeAtLocation(node: Node): Type;
         getTypeFromTypeNode(node: TypeNode): Type;
         signatureToString(signature: Signature, enclosingDeclaration?: Node, flags?: TypeFormatFlags, kind?: SignatureKind): string;
@@ -2294,6 +2308,7 @@ declare namespace ts {
         MarkerType = 8192,
         JSLiteral = 16384,
         FreshLiteral = 32768,
+        ArrayLiteral = 65536,
         ClassOrInterface = 3,
     }
     interface ObjectType extends Type {
@@ -2359,7 +2374,8 @@ declare namespace ts {
         objectType: Type;
         indexType: Type;
         constraint?: Type;
-        simplified?: Type;
+        simplifiedForReading?: Type;
+        simplifiedForWriting?: Type;
     }
     type TypeVariable = TypeParameter | IndexedAccessType;
     interface IndexType extends InstantiableType {
@@ -2382,8 +2398,8 @@ declare namespace ts {
         root: ConditionalRoot;
         checkType: Type;
         extendsType: Type;
-        resolvedTrueType?: Type;
-        resolvedFalseType?: Type;
+        resolvedTrueType: Type;
+        resolvedFalseType: Type;
     }
     interface SubstitutionType extends InstantiableType {
         typeVariable: TypeVariable;
@@ -2410,12 +2426,13 @@ declare namespace ts {
     enum InferencePriority {
         NakedTypeVariable = 1,
         HomomorphicMappedType = 2,
-        MappedTypeConstraint = 4,
-        ReturnType = 8,
-        LiteralKeyof = 16,
-        NoConstraints = 32,
-        AlwaysStrict = 64,
-        PriorityImpliesCombination = 28
+        PartialHomomorphicMappedType = 4,
+        MappedTypeConstraint = 8,
+        ReturnType = 16,
+        LiteralKeyof = 32,
+        NoConstraints = 64,
+        AlwaysStrict = 128,
+        PriorityImpliesCombination = 56
     }
     /** @deprecated Use FileExtensionInfo instead. */
     type JsFileExtensionInfo = FileExtensionInfo;
@@ -2441,7 +2458,7 @@ declare namespace ts {
         messageText: string;
         category: DiagnosticCategory;
         code: number;
-        next?: DiagnosticMessageChain;
+        next?: DiagnosticMessageChain[];
     }
     interface Diagnostic extends DiagnosticRelatedInformation {
         /** May store more in future. For now, this will simply be `true` to indicate when a diagnostic is an unused-identifier diagnostic. */
@@ -2489,6 +2506,7 @@ declare namespace ts {
     interface CompilerOptions {
         allowJs?: boolean;
         allowSyntheticDefaultImports?: boolean;
+        allowUmdGlobalAccess?: boolean;
         allowUnreachableCode?: boolean;
         allowUnusedLabels?: boolean;
         alwaysStrict?: boolean;
@@ -2582,7 +2600,7 @@ declare namespace ts {
         UMD = 3,
         System = 4,
         ES2015 = 5,
-        ESNext = 6
+        ESNext = 99
     }
     enum JsxEmit {
         None = 0,
@@ -2621,9 +2639,10 @@ declare namespace ts {
         ES2017 = 4,
         ES2018 = 5,
         ES2019 = 6,
-        ESNext = 7,
+        ES2020 = 7,
+        ESNext = 99,
         JSON = 100,
-        Latest = 7
+        Latest = 99
     }
     enum LanguageVariant {
         Standard = 0,
@@ -2756,6 +2775,7 @@ declare namespace ts {
         resolveTypeReferenceDirectives?(typeReferenceDirectiveNames: string[], containingFile: string, redirectedReference?: ResolvedProjectReference): (ResolvedTypeReferenceDirective | undefined)[];
         getEnvironmentVariable?(name: string): string | undefined;
         createHash?(data: string): string;
+        getParsedCommandLine?(fileName: string): ParsedCommandLine | undefined;
     }
     interface SourceMapRange extends TextRange {
         source?: SourceMapSource;
@@ -3159,7 +3179,7 @@ declare namespace ts {
         reScanJsxToken(): JsxTokenSyntaxKind;
         reScanLessThanToken(): SyntaxKind;
         scanJsxToken(): JsxTokenSyntaxKind;
-        scanJSDocToken(): JsDocSyntaxKind;
+        scanJsDocToken(): JSDocSyntaxKind;
         scan(): SyntaxKind;
         getText(): string;
         setText(text: string | undefined, start?: number, length?: number): void;
@@ -3517,6 +3537,7 @@ declare namespace ts {
     function isJSDocFunctionType(node: Node): node is JSDocFunctionType;
     function isJSDocVariadicType(node: Node): node is JSDocVariadicType;
     function isJSDoc(node: Node): node is JSDoc;
+    function isJSDocAuthorTag(node: Node): node is JSDocAuthorTag;
     function isJSDocAugmentsTag(node: Node): node is JSDocAugmentsTag;
     function isJSDocClassTag(node: Node): node is JSDocClassTag;
     function isJSDocEnumTag(node: Node): node is JSDocEnumTag;
@@ -3627,7 +3648,7 @@ declare namespace ts {
     /**
      * Reads the config file, reports errors if any and exits if the config file cannot be found
      */
-    function getParsedCommandLineOfConfigFile(configFileName: string, optionsToExtend: CompilerOptions, host: ParseConfigFileHost): ParsedCommandLine | undefined;
+    function getParsedCommandLineOfConfigFile(configFileName: string, optionsToExtend: CompilerOptions, host: ParseConfigFileHost, extendedConfigCache?: Map<ExtendedConfigCacheEntry>): ParsedCommandLine | undefined;
     /**
      * Read tsconfig.json file
      * @param fileName The path to the config file
@@ -3661,7 +3682,7 @@ declare namespace ts {
      * @param basePath A root directory to resolve relative path entries in the config
      *    file to. e.g. outDir
      */
-    function parseJsonConfigFileContent(json: any, host: ParseConfigHost, basePath: string, existingOptions?: CompilerOptions, configFileName?: string, resolutionStack?: Path[], extraFileExtensions?: ReadonlyArray<FileExtensionInfo>): ParsedCommandLine;
+    function parseJsonConfigFileContent(json: any, host: ParseConfigHost, basePath: string, existingOptions?: CompilerOptions, configFileName?: string, resolutionStack?: Path[], extraFileExtensions?: ReadonlyArray<FileExtensionInfo>, extendedConfigCache?: Map<ExtendedConfigCacheEntry>): ParsedCommandLine;
     /**
      * Parse the contents of a config file (tsconfig.json).
      * @param jsonNode The contents of the config file to parse
@@ -3669,7 +3690,20 @@ declare namespace ts {
      * @param basePath A root directory to resolve relative path entries in the config
      *    file to. e.g. outDir
      */
-    function parseJsonSourceFileConfigFileContent(sourceFile: TsConfigSourceFile, host: ParseConfigHost, basePath: string, existingOptions?: CompilerOptions, configFileName?: string, resolutionStack?: Path[], extraFileExtensions?: ReadonlyArray<FileExtensionInfo>): ParsedCommandLine;
+    function parseJsonSourceFileConfigFileContent(sourceFile: TsConfigSourceFile, host: ParseConfigHost, basePath: string, existingOptions?: CompilerOptions, configFileName?: string, resolutionStack?: Path[], extraFileExtensions?: ReadonlyArray<FileExtensionInfo>, extendedConfigCache?: Map<ExtendedConfigCacheEntry>): ParsedCommandLine;
+    interface ParsedTsconfig {
+        raw: any;
+        options?: CompilerOptions;
+        typeAcquisition?: TypeAcquisition;
+        /**
+         * Note that the case of the config path has not yet been normalized, as no files have been imported into the project yet
+         */
+        extendedConfigPath?: string;
+    }
+    interface ExtendedConfigCacheEntry {
+        extendedResult: TsConfigSourceFile;
+        extendedConfig: ParsedTsconfig | undefined;
+    }
     function convertCompilerOptionsFromJson(jsonOptions: any, basePath: string, configFileName?: string): {
         options: CompilerOptions;
         errors: Diagnostic[];
@@ -3714,7 +3748,7 @@ declare namespace ts {
         get(directory: string): ResolvedModuleWithFailedLookupLocations | undefined;
         set(directory: string, result: ResolvedModuleWithFailedLookupLocations): void;
     }
-    function createModuleResolutionCache(currentDirectory: string, getCanonicalFileName: (s: string) => string): ModuleResolutionCache;
+    function createModuleResolutionCache(currentDirectory: string, getCanonicalFileName: (s: string) => string, options?: CompilerOptions): ModuleResolutionCache;
     function resolveModuleNameFromCache(moduleName: string, containingFile: string, cache: ModuleResolutionCache): ResolvedModuleWithFailedLookupLocations | undefined;
     function resolveModuleName(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost, cache?: ModuleResolutionCache, redirectedReference?: ResolvedProjectReference): ResolvedModuleWithFailedLookupLocations;
     function nodeModuleNameResolver(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost, cache?: ModuleResolutionCache, redirectedReference?: ResolvedProjectReference): ResolvedModuleWithFailedLookupLocations;
@@ -3837,7 +3871,7 @@ declare namespace ts {
     function updateArrayLiteral(node: ArrayLiteralExpression, elements: ReadonlyArray<Expression>): ArrayLiteralExpression;
     function createObjectLiteral(properties?: ReadonlyArray<ObjectLiteralElementLike>, multiLine?: boolean): ObjectLiteralExpression;
     function updateObjectLiteral(node: ObjectLiteralExpression, properties: ReadonlyArray<ObjectLiteralElementLike>): ObjectLiteralExpression;
-    function createPropertyAccess(expression: Expression, name: string | Identifier | undefined): PropertyAccessExpression;
+    function createPropertyAccess(expression: Expression, name: string | Identifier): PropertyAccessExpression;
     function updatePropertyAccess(node: PropertyAccessExpression, expression: Expression, name: Identifier): PropertyAccessExpression;
     function createElementAccess(expression: Expression, index: number | Expression): ElementAccessExpression;
     function updateElementAccess(node: ElementAccessExpression, expression: Expression, argumentExpression: Expression): ElementAccessExpression;
@@ -3992,6 +4026,10 @@ declare namespace ts {
     function createJsxClosingElement(tagName: JsxTagNameExpression): JsxClosingElement;
     function updateJsxClosingElement(node: JsxClosingElement, tagName: JsxTagNameExpression): JsxClosingElement;
     function createJsxFragment(openingFragment: JsxOpeningFragment, children: ReadonlyArray<JsxChild>, closingFragment: JsxClosingFragment): JsxFragment;
+    function createJsxText(text: string, containsOnlyTriviaWhiteSpaces?: boolean): JsxText;
+    function updateJsxText(node: JsxText, text: string, containsOnlyTriviaWhiteSpaces?: boolean): JsxText;
+    function createJsxOpeningFragment(): JsxOpeningFragment;
+    function createJsxJsxClosingFragment(): JsxClosingFragment;
     function updateJsxFragment(node: JsxFragment, openingFragment: JsxOpeningFragment, children: ReadonlyArray<JsxChild>, closingFragment: JsxClosingFragment): JsxFragment;
     function createJsxAttribute(name: Identifier, initializer: StringLiteral | JsxExpression): JsxAttribute;
     function updateJsxAttribute(node: JsxAttribute, name: Identifier, initializer: StringLiteral | JsxExpression): JsxAttribute;
@@ -4048,7 +4086,7 @@ declare namespace ts {
     function createInputFiles(javascriptText: string, declarationText: string): InputFiles;
     function createInputFiles(readFileText: (path: string) => string | undefined, javascriptPath: string, javascriptMapPath: string | undefined, declarationPath: string, declarationMapPath: string | undefined, buildInfoPath: string | undefined): InputFiles;
     function createInputFiles(javascriptText: string, declarationText: string, javascriptMapPath: string | undefined, javascriptMapText: string | undefined, declarationMapPath: string | undefined, declarationMapText: string | undefined): InputFiles;
-    function updateBundle(node: Bundle, sourceFiles: ReadonlyArray<SourceFile>, prepends?: ReadonlyArray<UnparsedSource>): Bundle;
+    function updateBundle(node: Bundle, sourceFiles: ReadonlyArray<SourceFile>, prepends?: ReadonlyArray<UnparsedSource | InputFiles>): Bundle;
     function createImmediatelyInvokedFunctionExpression(statements: ReadonlyArray<Statement>): CallExpression;
     function createImmediatelyInvokedFunctionExpression(statements: ReadonlyArray<Statement>, param: ParameterDeclaration, paramValue: Expression): CallExpression;
     function createImmediatelyInvokedArrowFunction(statements: ReadonlyArray<Statement>): CallExpression;
@@ -4240,7 +4278,7 @@ declare namespace ts {
     function formatDiagnostics(diagnostics: ReadonlyArray<Diagnostic>, host: FormatDiagnosticsHost): string;
     function formatDiagnostic(diagnostic: Diagnostic, host: FormatDiagnosticsHost): string;
     function formatDiagnosticsWithColorAndContext(diagnostics: ReadonlyArray<Diagnostic>, host: FormatDiagnosticsHost): string;
-    function flattenDiagnosticMessageText(messageText: string | DiagnosticMessageChain | undefined, newLine: string): string;
+    function flattenDiagnosticMessageText(diag: string | DiagnosticMessageChain | undefined, newLine: string, indent?: number): string;
     function getConfigFileParsingDiagnostics(configFileParseResult: ParsedCommandLine): ReadonlyArray<Diagnostic>;
     /**
      * Create a new 'Program' instance. A Program is an immutable collection of 'SourceFile's and a 'CompilerOptions'
@@ -4393,7 +4431,7 @@ declare namespace ts {
      * The builder that can handle the changes in program and iterate through changed file to emit the files
      * The semantic diagnostics are cached per file and managed by clearing for the changed/affected files
      */
-    interface EmitAndSemanticDiagnosticsBuilderProgram extends BuilderProgram {
+    interface EmitAndSemanticDiagnosticsBuilderProgram extends SemanticDiagnosticsBuilderProgram {
         /**
          * Emits the next affected file's emit result (EmitResult and sourceFiles emitted) or returns undefined if iteration is complete
          * The first of writeFile if provided, writeFile of BuilderProgramHost if provided, writeFile of compiler host
@@ -4419,6 +4457,22 @@ declare namespace ts {
     function createAbstractBuilder(rootNames: ReadonlyArray<string> | undefined, options: CompilerOptions | undefined, host?: CompilerHost, oldProgram?: BuilderProgram, configFileParsingDiagnostics?: ReadonlyArray<Diagnostic>, projectReferences?: ReadonlyArray<ProjectReference>): BuilderProgram;
 }
 declare namespace ts {
+    interface ReadBuildProgramHost {
+        useCaseSensitiveFileNames(): boolean;
+        getCurrentDirectory(): string;
+        readFile(fileName: string): string | undefined;
+    }
+    function readBuilderProgram(compilerOptions: CompilerOptions, host: ReadBuildProgramHost): EmitAndSemanticDiagnosticsBuilderProgram | undefined;
+    function createIncrementalCompilerHost(options: CompilerOptions, system?: System): CompilerHost;
+    interface IncrementalProgramOptions<T extends BuilderProgram> {
+        rootNames: ReadonlyArray<string>;
+        options: CompilerOptions;
+        configFileParsingDiagnostics?: ReadonlyArray<Diagnostic>;
+        projectReferences?: ReadonlyArray<ProjectReference>;
+        host?: CompilerHost;
+        createProgram?: CreateProgram<T>;
+    }
+    function createIncrementalProgram<T extends BuilderProgram = EmitAndSemanticDiagnosticsBuilderProgram>({ rootNames, options, configFileParsingDiagnostics, projectReferences, host, createProgram }: IncrementalProgramOptions<T>): T;
     type WatchStatusReporter = (diagnostic: Diagnostic, newLine: string, options: CompilerOptions) => void;
     /** Create the program with rootNames and options, if they are undefined, oldProgram and new configFile diagnostics create new program */
     type CreateProgram<T extends BuilderProgram> = (rootNames: ReadonlyArray<string> | undefined, options: CompilerOptions | undefined, host?: CompilerHost, oldProgram?: T, configFileParsingDiagnostics?: ReadonlyArray<Diagnostic>, projectReferences?: ReadonlyArray<ProjectReference> | undefined) => T;
@@ -4505,6 +4559,8 @@ declare namespace ts {
     interface Watch<T> {
         /** Synchronize with host and get updated program */
         getProgram(): T;
+        /** Closes the watch */
+        close(): void;
     }
     /**
      * Creates the watch what generates program using the config file
@@ -4532,17 +4588,101 @@ declare namespace ts {
      */
     function createWatchProgram<T extends BuilderProgram>(host: WatchCompilerHostOfConfigFile<T>): WatchOfConfigFile<T>;
 }
+declare namespace ts {
+    interface BuildOptions {
+        dry?: boolean;
+        force?: boolean;
+        verbose?: boolean;
+        incremental?: boolean;
+        traceResolution?: boolean;
+        [option: string]: CompilerOptionsValue | undefined;
+    }
+    type ReportEmitErrorSummary = (errorCount: number) => void;
+    interface SolutionBuilderHostBase<T extends BuilderProgram> extends ProgramHost<T> {
+        createDirectory?(path: string): void;
+        /**
+         * Should provide create directory and writeFile if done of invalidatedProjects is not invoked with
+         * writeFileCallback
+         */
+        writeFile?(path: string, data: string, writeByteOrderMark?: boolean): void;
+        getModifiedTime(fileName: string): Date | undefined;
+        setModifiedTime(fileName: string, date: Date): void;
+        deleteFile(fileName: string): void;
+        getParsedCommandLine?(fileName: string): ParsedCommandLine | undefined;
+        reportDiagnostic: DiagnosticReporter;
+        reportSolutionBuilderStatus: DiagnosticReporter;
+        afterProgramEmitAndDiagnostics?(program: T): void;
+    }
+    interface SolutionBuilderHost<T extends BuilderProgram> extends SolutionBuilderHostBase<T> {
+        reportErrorSummary?: ReportEmitErrorSummary;
+    }
+    interface SolutionBuilderWithWatchHost<T extends BuilderProgram> extends SolutionBuilderHostBase<T>, WatchHost {
+    }
+    interface SolutionBuilder<T extends BuilderProgram> {
+        build(project?: string, cancellationToken?: CancellationToken): ExitStatus;
+        clean(project?: string): ExitStatus;
+        buildReferences(project: string, cancellationToken?: CancellationToken): ExitStatus;
+        cleanReferences(project?: string): ExitStatus;
+        getNextInvalidatedProject(cancellationToken?: CancellationToken): InvalidatedProject<T> | undefined;
+    }
+    /**
+     * Create a function that reports watch status by writing to the system and handles the formating of the diagnostic
+     */
+    function createBuilderStatusReporter(system: System, pretty?: boolean): DiagnosticReporter;
+    function createSolutionBuilderHost<T extends BuilderProgram = EmitAndSemanticDiagnosticsBuilderProgram>(system?: System, createProgram?: CreateProgram<T>, reportDiagnostic?: DiagnosticReporter, reportSolutionBuilderStatus?: DiagnosticReporter, reportErrorSummary?: ReportEmitErrorSummary): SolutionBuilderHost<T>;
+    function createSolutionBuilderWithWatchHost<T extends BuilderProgram = EmitAndSemanticDiagnosticsBuilderProgram>(system?: System, createProgram?: CreateProgram<T>, reportDiagnostic?: DiagnosticReporter, reportSolutionBuilderStatus?: DiagnosticReporter, reportWatchStatus?: WatchStatusReporter): SolutionBuilderWithWatchHost<T>;
+    function createSolutionBuilder<T extends BuilderProgram>(host: SolutionBuilderHost<T>, rootNames: ReadonlyArray<string>, defaultOptions: BuildOptions): SolutionBuilder<T>;
+    function createSolutionBuilderWithWatch<T extends BuilderProgram>(host: SolutionBuilderWithWatchHost<T>, rootNames: ReadonlyArray<string>, defaultOptions: BuildOptions): SolutionBuilder<T>;
+    enum InvalidatedProjectKind {
+        Build = 0,
+        UpdateBundle = 1,
+        UpdateOutputFileStamps = 2
+    }
+    interface InvalidatedProjectBase {
+        readonly kind: InvalidatedProjectKind;
+        readonly project: ResolvedConfigFileName;
+        /**
+         *  To dispose this project and ensure that all the necessary actions are taken and state is updated accordingly
+         */
+        done(cancellationToken?: CancellationToken, writeFile?: WriteFileCallback, customTransformers?: CustomTransformers): ExitStatus;
+        getCompilerOptions(): CompilerOptions;
+        getCurrentDirectory(): string;
+    }
+    interface UpdateOutputFileStampsProject extends InvalidatedProjectBase {
+        readonly kind: InvalidatedProjectKind.UpdateOutputFileStamps;
+        updateOutputFileStatmps(): void;
+    }
+    interface BuildInvalidedProject<T extends BuilderProgram> extends InvalidatedProjectBase {
+        readonly kind: InvalidatedProjectKind.Build;
+        getBuilderProgram(): T | undefined;
+        getProgram(): Program | undefined;
+        getSourceFile(fileName: string): SourceFile | undefined;
+        getSourceFiles(): ReadonlyArray<SourceFile>;
+        getOptionsDiagnostics(cancellationToken?: CancellationToken): ReadonlyArray<Diagnostic>;
+        getGlobalDiagnostics(cancellationToken?: CancellationToken): ReadonlyArray<Diagnostic>;
+        getConfigFileParsingDiagnostics(): ReadonlyArray<Diagnostic>;
+        getSyntacticDiagnostics(sourceFile?: SourceFile, cancellationToken?: CancellationToken): ReadonlyArray<Diagnostic>;
+        getAllDependencies(sourceFile: SourceFile): ReadonlyArray<string>;
+        getSemanticDiagnostics(sourceFile?: SourceFile, cancellationToken?: CancellationToken): ReadonlyArray<Diagnostic>;
+        getSemanticDiagnosticsOfNextAffectedFile(cancellationToken?: CancellationToken, ignoreSourceFile?: (sourceFile: SourceFile) => boolean): AffectedFileResult<ReadonlyArray<Diagnostic>>;
+        emit(targetSourceFile?: SourceFile, writeFile?: WriteFileCallback, cancellationToken?: CancellationToken, emitOnlyDtsFiles?: boolean, customTransformers?: CustomTransformers): EmitResult | undefined;
+    }
+    interface UpdateBundleProject<T extends BuilderProgram> extends InvalidatedProjectBase {
+        readonly kind: InvalidatedProjectKind.UpdateBundle;
+        emit(writeFile?: WriteFileCallback, customTransformers?: CustomTransformers): EmitResult | BuildInvalidedProject<T> | undefined;
+    }
+    type InvalidatedProject<T extends BuilderProgram> = UpdateOutputFileStampsProject | BuildInvalidedProject<T> | UpdateBundleProject<T>;
+}
 declare namespace ts.server {
     type ActionSet = "action::set";
     type ActionInvalidate = "action::invalidate";
     type ActionPackageInstalled = "action::packageInstalled";
-    type ActionValueInspected = "action::valueInspected";
     type EventTypesRegistry = "event::typesRegistry";
     type EventBeginInstallTypes = "event::beginInstallTypes";
     type EventEndInstallTypes = "event::endInstallTypes";
     type EventInitializationFailed = "event::initializationFailed";
     interface TypingInstallerResponse {
-        readonly kind: ActionSet | ActionInvalidate | EventTypesRegistry | ActionPackageInstalled | ActionValueInspected | EventBeginInstallTypes | EventEndInstallTypes | EventInitializationFailed;
+        readonly kind: ActionSet | ActionInvalidate | EventTypesRegistry | ActionPackageInstalled | EventBeginInstallTypes | EventEndInstallTypes | EventInitializationFailed;
     }
     interface TypingInstallerRequestWithProjectName {
         readonly projectName: string;
@@ -4781,6 +4921,7 @@ declare namespace ts {
         getSignatureHelpItems(fileName: string, position: number, options: SignatureHelpItemsOptions | undefined): SignatureHelpItems | undefined;
         getRenameInfo(fileName: string, position: number, options?: RenameInfoOptions): RenameInfo;
         findRenameLocations(fileName: string, position: number, findInStrings: boolean, findInComments: boolean, providePrefixAndSuffixTextForRename?: boolean): ReadonlyArray<RenameLocation> | undefined;
+        getSmartSelectionRange(fileName: string, position: number): SelectionRange;
         getDefinitionAtPosition(fileName: string, position: number): ReadonlyArray<DefinitionInfo> | undefined;
         getDefinitionAndBoundSpan(fileName: string, position: number): DefinitionInfoAndBoundSpan | undefined;
         getTypeDefinitionAtPosition(fileName: string, position: number): ReadonlyArray<DefinitionInfo> | undefined;
@@ -4975,16 +5116,9 @@ declare namespace ts {
         changes: ReadonlyArray<FileTextChanges>;
         commands?: ReadonlyArray<CodeActionCommand>;
     }
-    type CodeActionCommand = InstallPackageAction | GenerateTypesAction;
+    type CodeActionCommand = InstallPackageAction;
     interface InstallPackageAction {
     }
-    interface GenerateTypesAction extends GenerateTypesOptions {
-    }
-    interface GenerateTypesOptions {
-        readonly file: string;
-        readonly fileToGenerateTypesFor: string;
-        readonly outputFileName: string;
-    }
     /**
      * A set of one or more available refactoring actions, grouped under a parent refactoring.
      */
@@ -5048,6 +5182,12 @@ declare namespace ts {
          */
         originalTextSpan?: TextSpan;
         originalFileName?: string;
+        /**
+         * If DocumentSpan.textSpan is the span for name of the declaration,
+         * then this is the span for relevant declaration
+         */
+        contextSpan?: TextSpan;
+        originalContextSpan?: TextSpan;
     }
     interface RenameLocation extends DocumentSpan {
         readonly prefixText?: string;
@@ -5076,6 +5216,7 @@ declare namespace ts {
         fileName?: string;
         isInString?: true;
         textSpan: TextSpan;
+        contextSpan?: TextSpan;
         kind: HighlightSpanKind;
     }
     interface NavigateToItem {
@@ -5232,6 +5373,10 @@ declare namespace ts {
         displayParts: SymbolDisplayPart[];
         isOptional: boolean;
     }
+    interface SelectionRange {
+        textSpan: TextSpan;
+        parent?: SelectionRange;
+    }
     /**
      * Represents a single signature to show in signature help.
      * The id is used for subsequent calls into the language service to ask questions about the
@@ -5259,7 +5404,7 @@ declare namespace ts {
         argumentCount: number;
     }
     interface CompletionInfo {
-        /** Not true for all glboal completions. This will be true if the enclosing scope matches a few syntax kinds. See `isSnippetScope`. */
+        /** Not true for all global completions. This will be true if the enclosing scope matches a few syntax kinds. See `isSnippetScope`. */
         isGlobalCompletion: boolean;
         isMemberCompletion: boolean;
         /**
@@ -5608,10 +5753,6 @@ declare namespace ts {
     function transpileModule(input: string, transpileOptions: TranspileOptions): TranspileOutput;
     function transpile(input: string, compilerOptions?: CompilerOptions, fileName?: string, diagnostics?: Diagnostic[], moduleName?: string): string;
 }
-declare namespace ts {
-    function generateTypesForModule(name: string, moduleValue: unknown, formatSettings: FormatCodeSettings): string;
-    function generateTypesForGlobal(name: string, globalValue: unknown, formatSettings: FormatCodeSettings): string;
-}
 declare namespace ts {
     /** The version of the language service API */
     const servicesVersion = "0.8";
@@ -5783,7 +5924,8 @@ declare namespace ts.server.protocol {
         GetEditsForRefactor = "getEditsForRefactor",
         OrganizeImports = "organizeImports",
         GetEditsForFileRename = "getEditsForFileRename",
-        ConfigurePlugin = "configurePlugin"
+        ConfigurePlugin = "configurePlugin",
+        SelectionRange = "selectionRange",
     }
     /**
      * A TypeScript Server message
@@ -6286,19 +6428,6 @@ declare namespace ts.server.protocol {
          */
         body?: string[];
     }
-    /**
-     * Arguments for EncodedSemanticClassificationsRequest request.
-     */
-    interface EncodedSemanticClassificationsRequestArgs extends FileRequestArgs {
-        /**
-         * Start position of the span.
-         */
-        start: number;
-        /**
-         * Length of the span.
-         */
-        length: number;
-    }
     /**
      * Arguments in document highlight request; include: filesToSearch, file,
      * line, offset.
@@ -6368,15 +6497,21 @@ declare namespace ts.server.protocol {
          */
         file: string;
     }
+    interface TextSpanWithContext extends TextSpan {
+        contextStart?: Location;
+        contextEnd?: Location;
+    }
+    interface FileSpanWithContext extends FileSpan, TextSpanWithContext {
+    }
     interface DefinitionInfoAndBoundSpan {
-        definitions: ReadonlyArray<FileSpan>;
+        definitions: ReadonlyArray<FileSpanWithContext>;
         textSpan: TextSpan;
     }
     /**
      * Definition response message.  Gives text range for definition.
      */
     interface DefinitionResponse extends Response {
-        body?: FileSpan[];
+        body?: FileSpanWithContext[];
     }
     interface DefinitionInfoAndBoundSpanReponse extends Response {
         body?: DefinitionInfoAndBoundSpan;
@@ -6385,13 +6520,13 @@ declare namespace ts.server.protocol {
      * Definition response message.  Gives text range for definition.
      */
     interface TypeDefinitionResponse extends Response {
-        body?: FileSpan[];
+        body?: FileSpanWithContext[];
     }
     /**
      * Implementation response message.  Gives text range for implementations.
      */
     interface ImplementationResponse extends Response {
-        body?: FileSpan[];
+        body?: FileSpanWithContext[];
     }
     /**
      * Request to get brace completion for a location in the file.
@@ -6428,7 +6563,7 @@ declare namespace ts.server.protocol {
         command: CommandTypes.Occurrences;
     }
     /** @deprecated */
-    interface OccurrencesResponseItem extends FileSpan {
+    interface OccurrencesResponseItem extends FileSpanWithContext {
         /**
          * True if the occurrence is a write location, false otherwise.
          */
@@ -6454,7 +6589,7 @@ declare namespace ts.server.protocol {
     /**
      * Span augmented with extra information that denotes the kind of the highlighting to be used for span.
      */
-    interface HighlightSpan extends TextSpan {
+    interface HighlightSpan extends TextSpanWithContext {
         kind: HighlightSpanKind;
     }
     /**
@@ -6484,7 +6619,7 @@ declare namespace ts.server.protocol {
     interface ReferencesRequest extends FileLocationRequest {
         command: CommandTypes.References;
     }
-    interface ReferencesResponseItem extends FileSpan {
+    interface ReferencesResponseItem extends FileSpanWithContext {
         /** Text of line containing the reference.  Including this
          *  with the response avoids latency of editor loading files
          * to show text of reference line (the server already has
@@ -6599,7 +6734,7 @@ declare namespace ts.server.protocol {
         /** The text spans in this group */
         locs: RenameTextSpan[];
     }
-    interface RenameTextSpan extends TextSpan {
+    interface RenameTextSpan extends TextSpanWithContext {
         readonly prefixText?: string;
         readonly suffixText?: string;
     }
@@ -6744,6 +6879,22 @@ declare namespace ts.server.protocol {
         command: CommandTypes.ConfigurePlugin;
         arguments: ConfigurePluginRequestArguments;
     }
+    interface ConfigurePluginResponse extends Response {
+    }
+    interface SelectionRangeRequest extends FileRequest {
+        command: CommandTypes.SelectionRange;
+        arguments: SelectionRangeRequestArgs;
+    }
+    interface SelectionRangeRequestArgs extends FileRequestArgs {
+        locations: Location[];
+    }
+    interface SelectionRangeResponse extends Response {
+        body?: SelectionRange[];
+    }
+    interface SelectionRange {
+        textSpan: TextSpan;
+        parent?: SelectionRange;
+    }
     /**
      *  Information found in an "open" request.
      */
@@ -8129,6 +8280,9 @@ declare namespace ts.server.protocol {
         ES2015 = "ES2015",
         ES2016 = "ES2016",
         ES2017 = "ES2017",
+        ES2018 = "ES2018",
+        ES2019 = "ES2019",
+        ES2020 = "ES2020",
         ESNext = "ESNext"
     }
 }
@@ -8243,6 +8397,7 @@ declare namespace ts.server {
         private program;
         private externalFiles;
         private missingFilesMap;
+        private generatedFilesMap;
         private plugins;
         private lastFileExceededProgramSize;
         protected languageService: LanguageService;
@@ -8278,7 +8433,7 @@ declare namespace ts.server {
         private readonly cancellationToken;
         isNonTsProject(): boolean;
         isJsOnlyProject(): boolean;
-        static resolveModule(moduleName: string, initialDir: string, host: ServerHost, log: (message: string) => void): {} | undefined;
+        static resolveModule(moduleName: string, initialDir: string, host: ServerHost, log: (message: string) => void, logErrors?: (message: string) => void): {} | undefined;
         isKnownTypesPackageName(name: string): boolean;
         installPackage(options: InstallPackageOptions): Promise<ApplyCodeActionCommandResult>;
         private readonly typingsCache;
@@ -8355,6 +8510,9 @@ declare namespace ts.server {
         private detachScriptInfoFromProject;
         private addMissingFileWatcher;
         private isWatchedMissingFile;
+        private createGeneratedFileWatcher;
+        private isValidGeneratedFileWatcher;
+        private clearGeneratedFileWatch;
         getScriptInfoForNormalizedPath(fileName: NormalizedPath): ScriptInfo | undefined;
         getScriptInfo(uncheckedFileName: string): ScriptInfo | undefined;
         filesToString(writeProjectFileNames: boolean): string;
@@ -8922,6 +9080,7 @@ declare namespace ts.server {
         private updateErrorCheck;
         private cleanProjects;
         private cleanup;
+        private getEncodedSyntacticClassifications;
         private getEncodedSemanticClassifications;
         private getProject;
         private getConfigFileAndProject;
@@ -8937,6 +9096,7 @@ declare namespace ts.server {
         private mapDefinitionInfo;
         private static mapToOriginalLocation;
         private toFileSpan;
+        private toFileSpanWithContext;
         private getTypeDefinition;
         private mapImplementationLocations;
         private getImplementation;
@@ -8994,7 +9154,6 @@ declare namespace ts.server {
         private mapLocationNavigationBarItems;
         private getNavigationBarItems;
         private toLocationNavigationTree;
-        private toLocationTextSpan;
         private getNavigationTree;
         private getNavigateToItems;
         private getFullNavigateToItems;
@@ -9017,6 +9176,8 @@ declare namespace ts.server {
         private getBraceMatching;
         private getDiagnosticsForProject;
         private configurePlugin;
+        private getSmartSelectionRange;
+        private mapSelectionRange;
         getCanonicalFileName(fileName: string): string;
         exit(): void;
         private notRequired;
diff --git a/lib/tsserverlibrary.js b/lib/tsserverlibrary.js
index aa4e3b1a9df..c1f065ea5d2 100644
--- a/lib/tsserverlibrary.js
+++ b/lib/tsserverlibrary.js
@@ -82,7 +82,7 @@ var ts;
 (function (ts) {
     // WARNING: The script `configureNightly.ts` uses a regexp to parse out these values.
     // If changing the text in this section, be sure to test `configureNightly` too.
-    ts.versionMajorMinor = "3.4";
+    ts.versionMajorMinor = "3.6";
     /** The version of the TypeScript compiler release */
     ts.version = ts.versionMajorMinor + ".0-dev";
 })(ts || (ts = {}));
@@ -214,7 +214,7 @@ var ts;
                         entry.nextEntry.previousEntry = previousEntry;
                     }
                     // When the deleted entry was the last one, we need to
-                    // adust the lastEntry reference.
+                    // adjust the lastEntry reference.
                     if (this.lastEntry === entry) {
                         this.lastEntry = previousEntry;
                     }
@@ -263,11 +263,12 @@ var ts;
             class_1.prototype.forEach = function (action) {
                 var iterator = this.entries();
                 while (true) {
-                    var _a = iterator.next(), entry = _a.value, done = _a.done;
-                    if (done) {
+                    var iterResult = iterator.next();
+                    if (iterResult.done) {
                         break;
                     }
-                    action(entry[1], entry[0]);
+                    var _a = iterResult.value, key = _a[0], value = _a[1];
+                    action(value, key);
                 }
             };
             return class_1;
@@ -311,11 +312,11 @@ var ts;
     ts.firstDefined = firstDefined;
     function firstDefinedIterator(iter, callback) {
         while (true) {
-            var _a = iter.next(), value = _a.value, done = _a.done;
-            if (done) {
+            var iterResult = iter.next();
+            if (iterResult.done) {
                 return undefined;
             }
-            var result = callback(value);
+            var result = callback(iterResult.value);
             if (result !== undefined) {
                 return result;
             }
@@ -324,7 +325,7 @@ var ts;
     ts.firstDefinedIterator = firstDefinedIterator;
     function zipWith(arrayA, arrayB, callback) {
         var result = [];
-        Debug.assertEqual(arrayA.length, arrayB.length);
+        ts.Debug.assertEqual(arrayA.length, arrayB.length);
         for (var i = 0; i < arrayA.length; i++) {
             result.push(callback(arrayA[i], arrayB[i], i));
         }
@@ -332,7 +333,7 @@ var ts;
     }
     ts.zipWith = zipWith;
     function zipToIterator(arrayA, arrayB) {
-        Debug.assertEqual(arrayA.length, arrayB.length);
+        ts.Debug.assertEqual(arrayA.length, arrayB.length);
         var i = 0;
         return {
             next: function () {
@@ -346,7 +347,7 @@ var ts;
     }
     ts.zipToIterator = zipToIterator;
     function zipToMap(keys, values) {
-        Debug.assert(keys.length === values.length);
+        ts.Debug.assert(keys.length === values.length);
         var map = createMap();
         for (var i = 0; i < keys.length; ++i) {
             map.set(keys[i], values[i]);
@@ -420,7 +421,7 @@ var ts;
                 return result;
             }
         }
-        return Debug.fail();
+        return ts.Debug.fail();
     }
     ts.findMap = findMap;
     function contains(array, value, equalityComparer) {
@@ -538,19 +539,21 @@ var ts;
         return array;
     }
     ts.sameMap = sameMap;
+    /**
+     * Flattens an array containing a mix of array or non-array elements.
+     *
+     * @param array The array to flatten.
+     */
     function flatten(array) {
-        var result;
-        if (array) {
-            result = [];
-            for (var _i = 0, array_2 = array; _i < array_2.length; _i++) {
-                var v = array_2[_i];
-                if (v) {
-                    if (isArray(v)) {
-                        addRange(result, v);
-                    }
-                    else {
-                        result.push(v);
-                    }
+        var result = [];
+        for (var _i = 0, array_2 = array; _i < array_2.length; _i++) {
+            var v = array_2[_i];
+            if (v) {
+                if (isArray(v)) {
+                    addRange(result, v);
+                }
+                else {
+                    result.push(v);
                 }
             }
         }
@@ -850,7 +853,7 @@ var ts;
                     continue;
                 case -1 /* LessThan */:
                     // If `array` is sorted, `next` should **never** be less than `last`.
-                    return Debug.fail("Array is unsorted.");
+                    return ts.Debug.fail("Array is unsorted.");
             }
             deduplicated.push(last = next);
         }
@@ -917,13 +920,13 @@ var ts;
         loopB: for (var offsetA = 0, offsetB = 0; offsetB < arrayB.length; offsetB++) {
             if (offsetB > 0) {
                 // Ensure `arrayB` is properly sorted.
-                Debug.assertGreaterThanOrEqual(comparer(arrayB[offsetB], arrayB[offsetB - 1]), 0 /* EqualTo */);
+                ts.Debug.assertGreaterThanOrEqual(comparer(arrayB[offsetB], arrayB[offsetB - 1]), 0 /* EqualTo */);
             }
             loopA: for (var startA = offsetA; offsetA < arrayA.length; offsetA++) {
                 if (offsetA > startA) {
                     // Ensure `arrayA` is properly sorted. We only need to perform this check if
                     // `offsetA` has changed since we entered the loop.
-                    Debug.assertGreaterThanOrEqual(comparer(arrayA[offsetA], arrayA[offsetA - 1]), 0 /* EqualTo */);
+                    ts.Debug.assertGreaterThanOrEqual(comparer(arrayA[offsetA], arrayA[offsetA - 1]), 0 /* EqualTo */);
                 }
                 switch (comparer(arrayB[offsetB], arrayA[offsetA])) {
                     case -1 /* LessThan */:
@@ -1093,7 +1096,7 @@ var ts;
     }
     ts.firstOrUndefined = firstOrUndefined;
     function first(array) {
-        Debug.assert(array.length !== 0);
+        ts.Debug.assert(array.length !== 0);
         return array[0];
     }
     ts.first = first;
@@ -1105,7 +1108,7 @@ var ts;
     }
     ts.lastOrUndefined = lastOrUndefined;
     function last(array) {
-        Debug.assert(array.length !== 0);
+        ts.Debug.assert(array.length !== 0);
         return array[array.length - 1];
     }
     ts.last = last;
@@ -1247,10 +1250,9 @@ var ts;
     }
     ts.getOwnValues = getOwnValues;
     function arrayFrom(iterator, map) {
-        var _a;
         var result = [];
-        for (var _b = iterator.next(), value = _b.value, done = _b.done; !done; _a = iterator.next(), value = _a.value, done = _a.done, _a) {
-            result.push(map ? map(value) : value);
+        for (var iterResult = iterator.next(); !iterResult.done; iterResult = iterator.next()) {
+            result.push(map ? map(iterResult.value) : iterResult.value);
         }
         return result;
     }
@@ -1430,7 +1432,7 @@ var ts;
     function cast(value, test) {
         if (value !== undefined && test(value))
             return value;
-        return Debug.fail("Invalid cast. The supplied value " + value + " did not pass the test '" + Debug.getFunctionName(test) + "'.");
+        return ts.Debug.fail("Invalid cast. The supplied value " + value + " did not pass the test '" + ts.Debug.getFunctionName(test) + "'.");
     }
     ts.cast = cast;
     /** Does nothing. */
@@ -1442,6 +1444,9 @@ var ts;
     /** Do nothing and return true */
     function returnTrue() { return true; }
     ts.returnTrue = returnTrue;
+    /** Do nothing and return undefined */
+    function returnUndefined() { return undefined; }
+    ts.returnUndefined = returnUndefined;
     /** Returns its argument. */
     function identity(x) { return x; }
     ts.identity = identity;
@@ -1464,38 +1469,13 @@ var ts;
         };
     }
     ts.memoize = memoize;
-    function chain(a, b, c, d, e) {
+    function compose(a, b, c, d, e) {
         if (e) {
             var args_2 = [];
             for (var i = 0; i < arguments.length; i++) {
                 args_2[i] = arguments[i];
             }
-            return function (t) { return compose.apply(void 0, map(args_2, function (f) { return f(t); })); };
-        }
-        else if (d) {
-            return function (t) { return compose(a(t), b(t), c(t), d(t)); };
-        }
-        else if (c) {
-            return function (t) { return compose(a(t), b(t), c(t)); };
-        }
-        else if (b) {
-            return function (t) { return compose(a(t), b(t)); };
-        }
-        else if (a) {
-            return function (t) { return compose(a(t)); };
-        }
-        else {
-            return function (_) { return function (u) { return u; }; };
-        }
-    }
-    ts.chain = chain;
-    function compose(a, b, c, d, e) {
-        if (e) {
-            var args_3 = [];
-            for (var i = 0; i < arguments.length; i++) {
-                args_3[i] = arguments[i];
-            }
-            return function (t) { return reduceLeft(args_3, function (u, f) { return f(u); }, t); };
+            return function (t) { return reduceLeft(args_2, function (u, f) { return f(u); }, t); };
         }
         else if (d) {
             return function (t) { return d(c(b(a(t)))); };
@@ -1521,92 +1501,6 @@ var ts;
         AssertionLevel[AssertionLevel["Aggressive"] = 2] = "Aggressive";
         AssertionLevel[AssertionLevel["VeryAggressive"] = 3] = "VeryAggressive";
     })(AssertionLevel = ts.AssertionLevel || (ts.AssertionLevel = {}));
-    var Debug;
-    (function (Debug) {
-        Debug.currentAssertionLevel = 0 /* None */;
-        Debug.isDebugging = false;
-        function shouldAssert(level) {
-            return Debug.currentAssertionLevel >= level;
-        }
-        Debug.shouldAssert = shouldAssert;
-        function assert(expression, message, verboseDebugInfo, stackCrawlMark) {
-            if (!expression) {
-                if (verboseDebugInfo) {
-                    message += "\r\nVerbose Debug Information: " + (typeof verboseDebugInfo === "string" ? verboseDebugInfo : verboseDebugInfo());
-                }
-                fail(message ? "False expression: " + message : "False expression.", stackCrawlMark || assert);
-            }
-        }
-        Debug.assert = assert;
-        function assertEqual(a, b, msg, msg2) {
-            if (a !== b) {
-                var message = msg ? msg2 ? msg + " " + msg2 : msg : "";
-                fail("Expected " + a + " === " + b + ". " + message);
-            }
-        }
-        Debug.assertEqual = assertEqual;
-        function assertLessThan(a, b, msg) {
-            if (a >= b) {
-                fail("Expected " + a + " < " + b + ". " + (msg || ""));
-            }
-        }
-        Debug.assertLessThan = assertLessThan;
-        function assertLessThanOrEqual(a, b) {
-            if (a > b) {
-                fail("Expected " + a + " <= " + b);
-            }
-        }
-        Debug.assertLessThanOrEqual = assertLessThanOrEqual;
-        function assertGreaterThanOrEqual(a, b) {
-            if (a < b) {
-                fail("Expected " + a + " >= " + b);
-            }
-        }
-        Debug.assertGreaterThanOrEqual = assertGreaterThanOrEqual;
-        function fail(message, stackCrawlMark) {
-            debugger;
-            var e = new Error(message ? "Debug Failure. " + message : "Debug Failure.");
-            if (Error.captureStackTrace) {
-                Error.captureStackTrace(e, stackCrawlMark || fail);
-            }
-            throw e;
-        }
-        Debug.fail = fail;
-        function assertDefined(value, message) {
-            if (value === undefined || value === null)
-                return fail(message);
-            return value;
-        }
-        Debug.assertDefined = assertDefined;
-        function assertEachDefined(value, message) {
-            for (var _i = 0, value_1 = value; _i < value_1.length; _i++) {
-                var v = value_1[_i];
-                assertDefined(v, message);
-            }
-            return value;
-        }
-        Debug.assertEachDefined = assertEachDefined;
-        function assertNever(member, message, stackCrawlMark) {
-            if (message === void 0) { message = "Illegal value:"; }
-            var detail = typeof member === "object" && "kind" in member && "pos" in member ? "SyntaxKind: " + Debug.showSyntaxKind(member) : JSON.stringify(member);
-            return fail(message + " " + detail, stackCrawlMark || assertNever);
-        }
-        Debug.assertNever = assertNever;
-        function getFunctionName(func) {
-            if (typeof func !== "function") {
-                return "";
-            }
-            else if (func.hasOwnProperty("name")) {
-                return func.name;
-            }
-            else {
-                var text = Function.prototype.toString.call(func);
-                var match = /^function\s+([\w\$]+)\s*\(/.exec(text);
-                return match ? match[1] : "";
-            }
-        }
-        Debug.getFunctionName = getFunctionName;
-    })(Debug = ts.Debug || (ts.Debug = {}));
     function equateValues(a, b) {
         return a === b;
     }
@@ -1863,7 +1757,7 @@ var ts;
                     bestCandidate = candidate;
                 }
                 else {
-                    Debug.assert(distance < bestDistance); // Else `levenshteinWithMax` should return undefined
+                    ts.Debug.assert(distance < bestDistance); // Else `levenshteinWithMax` should return undefined
                     bestDistance = distance;
                     bestCandidate = candidate;
                 }
@@ -2007,7 +1901,7 @@ var ts;
      * E.g.: matchedText(tryParsePattern("foo*baz"), "foobarbaz") === "bar"
      */
     function matchedText(pattern, candidate) {
-        Debug.assert(isPatternMatch(pattern, candidate));
+        ts.Debug.assert(isPatternMatch(pattern, candidate));
         return candidate.substring(pattern.prefix.length, candidate.length - pattern.suffix.length);
     }
     ts.matchedText = matchedText;
@@ -2100,6 +1994,267 @@ var ts;
         return result;
     }
     ts.fill = fill;
+    function cartesianProduct(arrays) {
+        var result = [];
+        cartesianProductWorker(arrays, result, /*outer*/ undefined, 0);
+        return result;
+    }
+    ts.cartesianProduct = cartesianProduct;
+    function cartesianProductWorker(arrays, result, outer, index) {
+        for (var _i = 0, _a = arrays[index]; _i < _a.length; _i++) {
+            var element = _a[_i];
+            var inner = void 0;
+            if (outer) {
+                inner = outer.slice();
+                inner.push(element);
+            }
+            else {
+                inner = [element];
+            }
+            if (index === arrays.length - 1) {
+                result.push(inner);
+            }
+            else {
+                cartesianProductWorker(arrays, result, inner, index + 1);
+            }
+        }
+    }
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var Debug;
+    (function (Debug) {
+        Debug.currentAssertionLevel = 0 /* None */;
+        Debug.isDebugging = false;
+        function shouldAssert(level) {
+            return Debug.currentAssertionLevel >= level;
+        }
+        Debug.shouldAssert = shouldAssert;
+        function assert(expression, message, verboseDebugInfo, stackCrawlMark) {
+            if (!expression) {
+                if (verboseDebugInfo) {
+                    message += "\r\nVerbose Debug Information: " + (typeof verboseDebugInfo === "string" ? verboseDebugInfo : verboseDebugInfo());
+                }
+                fail(message ? "False expression: " + message : "False expression.", stackCrawlMark || assert);
+            }
+        }
+        Debug.assert = assert;
+        function assertEqual(a, b, msg, msg2) {
+            if (a !== b) {
+                var message = msg ? msg2 ? msg + " " + msg2 : msg : "";
+                fail("Expected " + a + " === " + b + ". " + message);
+            }
+        }
+        Debug.assertEqual = assertEqual;
+        function assertLessThan(a, b, msg) {
+            if (a >= b) {
+                fail("Expected " + a + " < " + b + ". " + (msg || ""));
+            }
+        }
+        Debug.assertLessThan = assertLessThan;
+        function assertLessThanOrEqual(a, b) {
+            if (a > b) {
+                fail("Expected " + a + " <= " + b);
+            }
+        }
+        Debug.assertLessThanOrEqual = assertLessThanOrEqual;
+        function assertGreaterThanOrEqual(a, b) {
+            if (a < b) {
+                fail("Expected " + a + " >= " + b);
+            }
+        }
+        Debug.assertGreaterThanOrEqual = assertGreaterThanOrEqual;
+        function fail(message, stackCrawlMark) {
+            debugger;
+            var e = new Error(message ? "Debug Failure. " + message : "Debug Failure.");
+            if (Error.captureStackTrace) {
+                Error.captureStackTrace(e, stackCrawlMark || fail);
+            }
+            throw e;
+        }
+        Debug.fail = fail;
+        function assertDefined(value, message) {
+            if (value === undefined || value === null)
+                return fail(message);
+            return value;
+        }
+        Debug.assertDefined = assertDefined;
+        function assertEachDefined(value, message) {
+            for (var _i = 0, value_1 = value; _i < value_1.length; _i++) {
+                var v = value_1[_i];
+                assertDefined(v, message);
+            }
+            return value;
+        }
+        Debug.assertEachDefined = assertEachDefined;
+        function assertNever(member, message, stackCrawlMark) {
+            if (message === void 0) { message = "Illegal value:"; }
+            var detail = typeof member === "object" && "kind" in member && "pos" in member && formatSyntaxKind ? "SyntaxKind: " + formatSyntaxKind(member.kind) : JSON.stringify(member);
+            return fail(message + " " + detail, stackCrawlMark || assertNever);
+        }
+        Debug.assertNever = assertNever;
+        function getFunctionName(func) {
+            if (typeof func !== "function") {
+                return "";
+            }
+            else if (func.hasOwnProperty("name")) {
+                return func.name;
+            }
+            else {
+                var text = Function.prototype.toString.call(func);
+                var match = /^function\s+([\w\$]+)\s*\(/.exec(text);
+                return match ? match[1] : "";
+            }
+        }
+        Debug.getFunctionName = getFunctionName;
+        function formatSymbol(symbol) {
+            return "{ name: " + ts.unescapeLeadingUnderscores(symbol.escapedName) + "; flags: " + formatSymbolFlags(symbol.flags) + "; declarations: " + ts.map(symbol.declarations, function (node) { return formatSyntaxKind(node.kind); }) + " }";
+        }
+        Debug.formatSymbol = formatSymbol;
+        /**
+         * Formats an enum value as a string for debugging and debug assertions.
+         */
+        function formatEnum(value, enumObject, isFlags) {
+            if (value === void 0) { value = 0; }
+            var members = getEnumMembers(enumObject);
+            if (value === 0) {
+                return members.length > 0 && members[0][0] === 0 ? members[0][1] : "0";
+            }
+            if (isFlags) {
+                var result = "";
+                var remainingFlags = value;
+                for (var i = members.length - 1; i >= 0 && remainingFlags !== 0; i--) {
+                    var _a = members[i], enumValue = _a[0], enumName = _a[1];
+                    if (enumValue !== 0 && (remainingFlags & enumValue) === enumValue) {
+                        remainingFlags &= ~enumValue;
+                        result = "" + enumName + (result ? "|" : "") + result;
+                    }
+                }
+                if (remainingFlags === 0) {
+                    return result;
+                }
+            }
+            else {
+                for (var _i = 0, members_1 = members; _i < members_1.length; _i++) {
+                    var _b = members_1[_i], enumValue = _b[0], enumName = _b[1];
+                    if (enumValue === value) {
+                        return enumName;
+                    }
+                }
+            }
+            return value.toString();
+        }
+        Debug.formatEnum = formatEnum;
+        function getEnumMembers(enumObject) {
+            var result = [];
+            for (var name in enumObject) {
+                var value = enumObject[name];
+                if (typeof value === "number") {
+                    result.push([value, name]);
+                }
+            }
+            return ts.stableSort(result, function (x, y) { return ts.compareValues(x[0], y[0]); });
+        }
+        function formatSyntaxKind(kind) {
+            return formatEnum(kind, ts.SyntaxKind, /*isFlags*/ false);
+        }
+        Debug.formatSyntaxKind = formatSyntaxKind;
+        function formatNodeFlags(flags) {
+            return formatEnum(flags, ts.NodeFlags, /*isFlags*/ true);
+        }
+        Debug.formatNodeFlags = formatNodeFlags;
+        function formatModifierFlags(flags) {
+            return formatEnum(flags, ts.ModifierFlags, /*isFlags*/ true);
+        }
+        Debug.formatModifierFlags = formatModifierFlags;
+        function formatTransformFlags(flags) {
+            return formatEnum(flags, ts.TransformFlags, /*isFlags*/ true);
+        }
+        Debug.formatTransformFlags = formatTransformFlags;
+        function formatEmitFlags(flags) {
+            return formatEnum(flags, ts.EmitFlags, /*isFlags*/ true);
+        }
+        Debug.formatEmitFlags = formatEmitFlags;
+        function formatSymbolFlags(flags) {
+            return formatEnum(flags, ts.SymbolFlags, /*isFlags*/ true);
+        }
+        Debug.formatSymbolFlags = formatSymbolFlags;
+        function formatTypeFlags(flags) {
+            return formatEnum(flags, ts.TypeFlags, /*isFlags*/ true);
+        }
+        Debug.formatTypeFlags = formatTypeFlags;
+        function formatObjectFlags(flags) {
+            return formatEnum(flags, ts.ObjectFlags, /*isFlags*/ true);
+        }
+        Debug.formatObjectFlags = formatObjectFlags;
+        function failBadSyntaxKind(node, message) {
+            return fail((message || "Unexpected node.") + "\r\nNode " + formatSyntaxKind(node.kind) + " was unexpected.", failBadSyntaxKind);
+        }
+        Debug.failBadSyntaxKind = failBadSyntaxKind;
+        Debug.assertEachNode = shouldAssert(1 /* Normal */)
+            ? function (nodes, test, message) { return assert(test === undefined || ts.every(nodes, test), message || "Unexpected node.", function () { return "Node array did not pass test '" + getFunctionName(test) + "'."; }, Debug.assertEachNode); }
+            : ts.noop;
+        Debug.assertNode = shouldAssert(1 /* Normal */)
+            ? function (node, test, message) { return assert(test === undefined || test(node), message || "Unexpected node.", function () { return "Node " + formatSyntaxKind(node.kind) + " did not pass test '" + getFunctionName(test) + "'."; }, Debug.assertNode); }
+            : ts.noop;
+        Debug.assertOptionalNode = shouldAssert(1 /* Normal */)
+            ? function (node, test, message) { return assert(test === undefined || node === undefined || test(node), message || "Unexpected node.", function () { return "Node " + formatSyntaxKind(node.kind) + " did not pass test '" + getFunctionName(test) + "'."; }, Debug.assertOptionalNode); }
+            : ts.noop;
+        Debug.assertOptionalToken = shouldAssert(1 /* Normal */)
+            ? function (node, kind, message) { return assert(kind === undefined || node === undefined || node.kind === kind, message || "Unexpected node.", function () { return "Node " + formatSyntaxKind(node.kind) + " was not a '" + formatSyntaxKind(kind) + "' token."; }, Debug.assertOptionalToken); }
+            : ts.noop;
+        Debug.assertMissingNode = shouldAssert(1 /* Normal */)
+            ? function (node, message) { return assert(node === undefined, message || "Unexpected node.", function () { return "Node " + formatSyntaxKind(node.kind) + " was unexpected'."; }, Debug.assertMissingNode); }
+            : ts.noop;
+        var isDebugInfoEnabled = false;
+        /**
+         * Injects debug information into frequently used types.
+         */
+        function enableDebugInfo() {
+            if (isDebugInfoEnabled)
+                return;
+            // Add additional properties in debug mode to assist with debugging.
+            Object.defineProperties(ts.objectAllocator.getSymbolConstructor().prototype, {
+                __debugFlags: { get: function () { return formatSymbolFlags(this.flags); } }
+            });
+            Object.defineProperties(ts.objectAllocator.getTypeConstructor().prototype, {
+                __debugFlags: { get: function () { return formatTypeFlags(this.flags); } },
+                __debugObjectFlags: { get: function () { return this.flags & 524288 /* Object */ ? formatObjectFlags(this.objectFlags) : ""; } },
+                __debugTypeToString: { value: function () { return this.checker.typeToString(this); } },
+            });
+            var nodeConstructors = [
+                ts.objectAllocator.getNodeConstructor(),
+                ts.objectAllocator.getIdentifierConstructor(),
+                ts.objectAllocator.getTokenConstructor(),
+                ts.objectAllocator.getSourceFileConstructor()
+            ];
+            for (var _i = 0, nodeConstructors_1 = nodeConstructors; _i < nodeConstructors_1.length; _i++) {
+                var ctor = nodeConstructors_1[_i];
+                if (!ctor.prototype.hasOwnProperty("__debugKind")) {
+                    Object.defineProperties(ctor.prototype, {
+                        __debugKind: { get: function () { return formatSyntaxKind(this.kind); } },
+                        __debugNodeFlags: { get: function () { return formatNodeFlags(this.flags); } },
+                        __debugModifierFlags: { get: function () { return formatModifierFlags(ts.getModifierFlagsNoCache(this)); } },
+                        __debugTransformFlags: { get: function () { return formatTransformFlags(this.transformFlags); } },
+                        __debugIsParseTreeNode: { get: function () { return ts.isParseTreeNode(this); } },
+                        __debugEmitFlags: { get: function () { return formatEmitFlags(ts.getEmitFlags(this)); } },
+                        __debugGetText: {
+                            value: function (includeTrivia) {
+                                if (ts.nodeIsSynthesized(this))
+                                    return "";
+                                var parseNode = ts.getParseTreeNode(this);
+                                var sourceFile = parseNode && ts.getSourceFileOfNode(parseNode);
+                                return sourceFile ? ts.getSourceTextOfNodeFromSourceFile(sourceFile, parseNode, includeTrivia) : "";
+                            }
+                        }
+                    });
+                }
+            }
+            isDebugInfoEnabled = true;
+        }
+        Debug.enableDebugInfo = enableDebugInfo;
+    })(Debug = ts.Debug || (ts.Debug = {}));
 })(ts || (ts = {}));
 /*@internal*/
 var ts;
@@ -2652,309 +2807,312 @@ var ts;
         SyntaxKind[SyntaxKind["QuestionToken"] = 56] = "QuestionToken";
         SyntaxKind[SyntaxKind["ColonToken"] = 57] = "ColonToken";
         SyntaxKind[SyntaxKind["AtToken"] = 58] = "AtToken";
+        /** Only the JSDoc scanner produces BacktickToken. The normal scanner produces NoSubstitutionTemplateLiteral and related kinds. */
+        SyntaxKind[SyntaxKind["BacktickToken"] = 59] = "BacktickToken";
         // Assignments
-        SyntaxKind[SyntaxKind["EqualsToken"] = 59] = "EqualsToken";
-        SyntaxKind[SyntaxKind["PlusEqualsToken"] = 60] = "PlusEqualsToken";
-        SyntaxKind[SyntaxKind["MinusEqualsToken"] = 61] = "MinusEqualsToken";
-        SyntaxKind[SyntaxKind["AsteriskEqualsToken"] = 62] = "AsteriskEqualsToken";
-        SyntaxKind[SyntaxKind["AsteriskAsteriskEqualsToken"] = 63] = "AsteriskAsteriskEqualsToken";
-        SyntaxKind[SyntaxKind["SlashEqualsToken"] = 64] = "SlashEqualsToken";
-        SyntaxKind[SyntaxKind["PercentEqualsToken"] = 65] = "PercentEqualsToken";
-        SyntaxKind[SyntaxKind["LessThanLessThanEqualsToken"] = 66] = "LessThanLessThanEqualsToken";
-        SyntaxKind[SyntaxKind["GreaterThanGreaterThanEqualsToken"] = 67] = "GreaterThanGreaterThanEqualsToken";
-        SyntaxKind[SyntaxKind["GreaterThanGreaterThanGreaterThanEqualsToken"] = 68] = "GreaterThanGreaterThanGreaterThanEqualsToken";
-        SyntaxKind[SyntaxKind["AmpersandEqualsToken"] = 69] = "AmpersandEqualsToken";
-        SyntaxKind[SyntaxKind["BarEqualsToken"] = 70] = "BarEqualsToken";
-        SyntaxKind[SyntaxKind["CaretEqualsToken"] = 71] = "CaretEqualsToken";
+        SyntaxKind[SyntaxKind["EqualsToken"] = 60] = "EqualsToken";
+        SyntaxKind[SyntaxKind["PlusEqualsToken"] = 61] = "PlusEqualsToken";
+        SyntaxKind[SyntaxKind["MinusEqualsToken"] = 62] = "MinusEqualsToken";
+        SyntaxKind[SyntaxKind["AsteriskEqualsToken"] = 63] = "AsteriskEqualsToken";
+        SyntaxKind[SyntaxKind["AsteriskAsteriskEqualsToken"] = 64] = "AsteriskAsteriskEqualsToken";
+        SyntaxKind[SyntaxKind["SlashEqualsToken"] = 65] = "SlashEqualsToken";
+        SyntaxKind[SyntaxKind["PercentEqualsToken"] = 66] = "PercentEqualsToken";
+        SyntaxKind[SyntaxKind["LessThanLessThanEqualsToken"] = 67] = "LessThanLessThanEqualsToken";
+        SyntaxKind[SyntaxKind["GreaterThanGreaterThanEqualsToken"] = 68] = "GreaterThanGreaterThanEqualsToken";
+        SyntaxKind[SyntaxKind["GreaterThanGreaterThanGreaterThanEqualsToken"] = 69] = "GreaterThanGreaterThanGreaterThanEqualsToken";
+        SyntaxKind[SyntaxKind["AmpersandEqualsToken"] = 70] = "AmpersandEqualsToken";
+        SyntaxKind[SyntaxKind["BarEqualsToken"] = 71] = "BarEqualsToken";
+        SyntaxKind[SyntaxKind["CaretEqualsToken"] = 72] = "CaretEqualsToken";
         // Identifiers
-        SyntaxKind[SyntaxKind["Identifier"] = 72] = "Identifier";
+        SyntaxKind[SyntaxKind["Identifier"] = 73] = "Identifier";
         // Reserved words
-        SyntaxKind[SyntaxKind["BreakKeyword"] = 73] = "BreakKeyword";
-        SyntaxKind[SyntaxKind["CaseKeyword"] = 74] = "CaseKeyword";
-        SyntaxKind[SyntaxKind["CatchKeyword"] = 75] = "CatchKeyword";
-        SyntaxKind[SyntaxKind["ClassKeyword"] = 76] = "ClassKeyword";
-        SyntaxKind[SyntaxKind["ConstKeyword"] = 77] = "ConstKeyword";
-        SyntaxKind[SyntaxKind["ContinueKeyword"] = 78] = "ContinueKeyword";
-        SyntaxKind[SyntaxKind["DebuggerKeyword"] = 79] = "DebuggerKeyword";
-        SyntaxKind[SyntaxKind["DefaultKeyword"] = 80] = "DefaultKeyword";
-        SyntaxKind[SyntaxKind["DeleteKeyword"] = 81] = "DeleteKeyword";
-        SyntaxKind[SyntaxKind["DoKeyword"] = 82] = "DoKeyword";
-        SyntaxKind[SyntaxKind["ElseKeyword"] = 83] = "ElseKeyword";
-        SyntaxKind[SyntaxKind["EnumKeyword"] = 84] = "EnumKeyword";
-        SyntaxKind[SyntaxKind["ExportKeyword"] = 85] = "ExportKeyword";
-        SyntaxKind[SyntaxKind["ExtendsKeyword"] = 86] = "ExtendsKeyword";
-        SyntaxKind[SyntaxKind["FalseKeyword"] = 87] = "FalseKeyword";
-        SyntaxKind[SyntaxKind["FinallyKeyword"] = 88] = "FinallyKeyword";
-        SyntaxKind[SyntaxKind["ForKeyword"] = 89] = "ForKeyword";
-        SyntaxKind[SyntaxKind["FunctionKeyword"] = 90] = "FunctionKeyword";
-        SyntaxKind[SyntaxKind["IfKeyword"] = 91] = "IfKeyword";
-        SyntaxKind[SyntaxKind["ImportKeyword"] = 92] = "ImportKeyword";
-        SyntaxKind[SyntaxKind["InKeyword"] = 93] = "InKeyword";
-        SyntaxKind[SyntaxKind["InstanceOfKeyword"] = 94] = "InstanceOfKeyword";
-        SyntaxKind[SyntaxKind["NewKeyword"] = 95] = "NewKeyword";
-        SyntaxKind[SyntaxKind["NullKeyword"] = 96] = "NullKeyword";
-        SyntaxKind[SyntaxKind["ReturnKeyword"] = 97] = "ReturnKeyword";
-        SyntaxKind[SyntaxKind["SuperKeyword"] = 98] = "SuperKeyword";
-        SyntaxKind[SyntaxKind["SwitchKeyword"] = 99] = "SwitchKeyword";
-        SyntaxKind[SyntaxKind["ThisKeyword"] = 100] = "ThisKeyword";
-        SyntaxKind[SyntaxKind["ThrowKeyword"] = 101] = "ThrowKeyword";
-        SyntaxKind[SyntaxKind["TrueKeyword"] = 102] = "TrueKeyword";
-        SyntaxKind[SyntaxKind["TryKeyword"] = 103] = "TryKeyword";
-        SyntaxKind[SyntaxKind["TypeOfKeyword"] = 104] = "TypeOfKeyword";
-        SyntaxKind[SyntaxKind["VarKeyword"] = 105] = "VarKeyword";
-        SyntaxKind[SyntaxKind["VoidKeyword"] = 106] = "VoidKeyword";
-        SyntaxKind[SyntaxKind["WhileKeyword"] = 107] = "WhileKeyword";
-        SyntaxKind[SyntaxKind["WithKeyword"] = 108] = "WithKeyword";
+        SyntaxKind[SyntaxKind["BreakKeyword"] = 74] = "BreakKeyword";
+        SyntaxKind[SyntaxKind["CaseKeyword"] = 75] = "CaseKeyword";
+        SyntaxKind[SyntaxKind["CatchKeyword"] = 76] = "CatchKeyword";
+        SyntaxKind[SyntaxKind["ClassKeyword"] = 77] = "ClassKeyword";
+        SyntaxKind[SyntaxKind["ConstKeyword"] = 78] = "ConstKeyword";
+        SyntaxKind[SyntaxKind["ContinueKeyword"] = 79] = "ContinueKeyword";
+        SyntaxKind[SyntaxKind["DebuggerKeyword"] = 80] = "DebuggerKeyword";
+        SyntaxKind[SyntaxKind["DefaultKeyword"] = 81] = "DefaultKeyword";
+        SyntaxKind[SyntaxKind["DeleteKeyword"] = 82] = "DeleteKeyword";
+        SyntaxKind[SyntaxKind["DoKeyword"] = 83] = "DoKeyword";
+        SyntaxKind[SyntaxKind["ElseKeyword"] = 84] = "ElseKeyword";
+        SyntaxKind[SyntaxKind["EnumKeyword"] = 85] = "EnumKeyword";
+        SyntaxKind[SyntaxKind["ExportKeyword"] = 86] = "ExportKeyword";
+        SyntaxKind[SyntaxKind["ExtendsKeyword"] = 87] = "ExtendsKeyword";
+        SyntaxKind[SyntaxKind["FalseKeyword"] = 88] = "FalseKeyword";
+        SyntaxKind[SyntaxKind["FinallyKeyword"] = 89] = "FinallyKeyword";
+        SyntaxKind[SyntaxKind["ForKeyword"] = 90] = "ForKeyword";
+        SyntaxKind[SyntaxKind["FunctionKeyword"] = 91] = "FunctionKeyword";
+        SyntaxKind[SyntaxKind["IfKeyword"] = 92] = "IfKeyword";
+        SyntaxKind[SyntaxKind["ImportKeyword"] = 93] = "ImportKeyword";
+        SyntaxKind[SyntaxKind["InKeyword"] = 94] = "InKeyword";
+        SyntaxKind[SyntaxKind["InstanceOfKeyword"] = 95] = "InstanceOfKeyword";
+        SyntaxKind[SyntaxKind["NewKeyword"] = 96] = "NewKeyword";
+        SyntaxKind[SyntaxKind["NullKeyword"] = 97] = "NullKeyword";
+        SyntaxKind[SyntaxKind["ReturnKeyword"] = 98] = "ReturnKeyword";
+        SyntaxKind[SyntaxKind["SuperKeyword"] = 99] = "SuperKeyword";
+        SyntaxKind[SyntaxKind["SwitchKeyword"] = 100] = "SwitchKeyword";
+        SyntaxKind[SyntaxKind["ThisKeyword"] = 101] = "ThisKeyword";
+        SyntaxKind[SyntaxKind["ThrowKeyword"] = 102] = "ThrowKeyword";
+        SyntaxKind[SyntaxKind["TrueKeyword"] = 103] = "TrueKeyword";
+        SyntaxKind[SyntaxKind["TryKeyword"] = 104] = "TryKeyword";
+        SyntaxKind[SyntaxKind["TypeOfKeyword"] = 105] = "TypeOfKeyword";
+        SyntaxKind[SyntaxKind["VarKeyword"] = 106] = "VarKeyword";
+        SyntaxKind[SyntaxKind["VoidKeyword"] = 107] = "VoidKeyword";
+        SyntaxKind[SyntaxKind["WhileKeyword"] = 108] = "WhileKeyword";
+        SyntaxKind[SyntaxKind["WithKeyword"] = 109] = "WithKeyword";
         // Strict mode reserved words
-        SyntaxKind[SyntaxKind["ImplementsKeyword"] = 109] = "ImplementsKeyword";
-        SyntaxKind[SyntaxKind["InterfaceKeyword"] = 110] = "InterfaceKeyword";
-        SyntaxKind[SyntaxKind["LetKeyword"] = 111] = "LetKeyword";
-        SyntaxKind[SyntaxKind["PackageKeyword"] = 112] = "PackageKeyword";
-        SyntaxKind[SyntaxKind["PrivateKeyword"] = 113] = "PrivateKeyword";
-        SyntaxKind[SyntaxKind["ProtectedKeyword"] = 114] = "ProtectedKeyword";
-        SyntaxKind[SyntaxKind["PublicKeyword"] = 115] = "PublicKeyword";
-        SyntaxKind[SyntaxKind["StaticKeyword"] = 116] = "StaticKeyword";
-        SyntaxKind[SyntaxKind["YieldKeyword"] = 117] = "YieldKeyword";
+        SyntaxKind[SyntaxKind["ImplementsKeyword"] = 110] = "ImplementsKeyword";
+        SyntaxKind[SyntaxKind["InterfaceKeyword"] = 111] = "InterfaceKeyword";
+        SyntaxKind[SyntaxKind["LetKeyword"] = 112] = "LetKeyword";
+        SyntaxKind[SyntaxKind["PackageKeyword"] = 113] = "PackageKeyword";
+        SyntaxKind[SyntaxKind["PrivateKeyword"] = 114] = "PrivateKeyword";
+        SyntaxKind[SyntaxKind["ProtectedKeyword"] = 115] = "ProtectedKeyword";
+        SyntaxKind[SyntaxKind["PublicKeyword"] = 116] = "PublicKeyword";
+        SyntaxKind[SyntaxKind["StaticKeyword"] = 117] = "StaticKeyword";
+        SyntaxKind[SyntaxKind["YieldKeyword"] = 118] = "YieldKeyword";
         // Contextual keywords
-        SyntaxKind[SyntaxKind["AbstractKeyword"] = 118] = "AbstractKeyword";
-        SyntaxKind[SyntaxKind["AsKeyword"] = 119] = "AsKeyword";
-        SyntaxKind[SyntaxKind["AnyKeyword"] = 120] = "AnyKeyword";
-        SyntaxKind[SyntaxKind["AsyncKeyword"] = 121] = "AsyncKeyword";
-        SyntaxKind[SyntaxKind["AwaitKeyword"] = 122] = "AwaitKeyword";
-        SyntaxKind[SyntaxKind["BooleanKeyword"] = 123] = "BooleanKeyword";
-        SyntaxKind[SyntaxKind["ConstructorKeyword"] = 124] = "ConstructorKeyword";
-        SyntaxKind[SyntaxKind["DeclareKeyword"] = 125] = "DeclareKeyword";
-        SyntaxKind[SyntaxKind["GetKeyword"] = 126] = "GetKeyword";
-        SyntaxKind[SyntaxKind["InferKeyword"] = 127] = "InferKeyword";
-        SyntaxKind[SyntaxKind["IsKeyword"] = 128] = "IsKeyword";
-        SyntaxKind[SyntaxKind["KeyOfKeyword"] = 129] = "KeyOfKeyword";
-        SyntaxKind[SyntaxKind["ModuleKeyword"] = 130] = "ModuleKeyword";
-        SyntaxKind[SyntaxKind["NamespaceKeyword"] = 131] = "NamespaceKeyword";
-        SyntaxKind[SyntaxKind["NeverKeyword"] = 132] = "NeverKeyword";
-        SyntaxKind[SyntaxKind["ReadonlyKeyword"] = 133] = "ReadonlyKeyword";
-        SyntaxKind[SyntaxKind["RequireKeyword"] = 134] = "RequireKeyword";
-        SyntaxKind[SyntaxKind["NumberKeyword"] = 135] = "NumberKeyword";
-        SyntaxKind[SyntaxKind["ObjectKeyword"] = 136] = "ObjectKeyword";
-        SyntaxKind[SyntaxKind["SetKeyword"] = 137] = "SetKeyword";
-        SyntaxKind[SyntaxKind["StringKeyword"] = 138] = "StringKeyword";
-        SyntaxKind[SyntaxKind["SymbolKeyword"] = 139] = "SymbolKeyword";
-        SyntaxKind[SyntaxKind["TypeKeyword"] = 140] = "TypeKeyword";
-        SyntaxKind[SyntaxKind["UndefinedKeyword"] = 141] = "UndefinedKeyword";
-        SyntaxKind[SyntaxKind["UniqueKeyword"] = 142] = "UniqueKeyword";
-        SyntaxKind[SyntaxKind["UnknownKeyword"] = 143] = "UnknownKeyword";
-        SyntaxKind[SyntaxKind["FromKeyword"] = 144] = "FromKeyword";
-        SyntaxKind[SyntaxKind["GlobalKeyword"] = 145] = "GlobalKeyword";
-        SyntaxKind[SyntaxKind["BigIntKeyword"] = 146] = "BigIntKeyword";
-        SyntaxKind[SyntaxKind["OfKeyword"] = 147] = "OfKeyword";
+        SyntaxKind[SyntaxKind["AbstractKeyword"] = 119] = "AbstractKeyword";
+        SyntaxKind[SyntaxKind["AsKeyword"] = 120] = "AsKeyword";
+        SyntaxKind[SyntaxKind["AnyKeyword"] = 121] = "AnyKeyword";
+        SyntaxKind[SyntaxKind["AsyncKeyword"] = 122] = "AsyncKeyword";
+        SyntaxKind[SyntaxKind["AwaitKeyword"] = 123] = "AwaitKeyword";
+        SyntaxKind[SyntaxKind["BooleanKeyword"] = 124] = "BooleanKeyword";
+        SyntaxKind[SyntaxKind["ConstructorKeyword"] = 125] = "ConstructorKeyword";
+        SyntaxKind[SyntaxKind["DeclareKeyword"] = 126] = "DeclareKeyword";
+        SyntaxKind[SyntaxKind["GetKeyword"] = 127] = "GetKeyword";
+        SyntaxKind[SyntaxKind["InferKeyword"] = 128] = "InferKeyword";
+        SyntaxKind[SyntaxKind["IsKeyword"] = 129] = "IsKeyword";
+        SyntaxKind[SyntaxKind["KeyOfKeyword"] = 130] = "KeyOfKeyword";
+        SyntaxKind[SyntaxKind["ModuleKeyword"] = 131] = "ModuleKeyword";
+        SyntaxKind[SyntaxKind["NamespaceKeyword"] = 132] = "NamespaceKeyword";
+        SyntaxKind[SyntaxKind["NeverKeyword"] = 133] = "NeverKeyword";
+        SyntaxKind[SyntaxKind["ReadonlyKeyword"] = 134] = "ReadonlyKeyword";
+        SyntaxKind[SyntaxKind["RequireKeyword"] = 135] = "RequireKeyword";
+        SyntaxKind[SyntaxKind["NumberKeyword"] = 136] = "NumberKeyword";
+        SyntaxKind[SyntaxKind["ObjectKeyword"] = 137] = "ObjectKeyword";
+        SyntaxKind[SyntaxKind["SetKeyword"] = 138] = "SetKeyword";
+        SyntaxKind[SyntaxKind["StringKeyword"] = 139] = "StringKeyword";
+        SyntaxKind[SyntaxKind["SymbolKeyword"] = 140] = "SymbolKeyword";
+        SyntaxKind[SyntaxKind["TypeKeyword"] = 141] = "TypeKeyword";
+        SyntaxKind[SyntaxKind["UndefinedKeyword"] = 142] = "UndefinedKeyword";
+        SyntaxKind[SyntaxKind["UniqueKeyword"] = 143] = "UniqueKeyword";
+        SyntaxKind[SyntaxKind["UnknownKeyword"] = 144] = "UnknownKeyword";
+        SyntaxKind[SyntaxKind["FromKeyword"] = 145] = "FromKeyword";
+        SyntaxKind[SyntaxKind["GlobalKeyword"] = 146] = "GlobalKeyword";
+        SyntaxKind[SyntaxKind["BigIntKeyword"] = 147] = "BigIntKeyword";
+        SyntaxKind[SyntaxKind["OfKeyword"] = 148] = "OfKeyword";
         // Parse tree nodes
         // Names
-        SyntaxKind[SyntaxKind["QualifiedName"] = 148] = "QualifiedName";
-        SyntaxKind[SyntaxKind["ComputedPropertyName"] = 149] = "ComputedPropertyName";
+        SyntaxKind[SyntaxKind["QualifiedName"] = 149] = "QualifiedName";
+        SyntaxKind[SyntaxKind["ComputedPropertyName"] = 150] = "ComputedPropertyName";
         // Signature elements
-        SyntaxKind[SyntaxKind["TypeParameter"] = 150] = "TypeParameter";
-        SyntaxKind[SyntaxKind["Parameter"] = 151] = "Parameter";
-        SyntaxKind[SyntaxKind["Decorator"] = 152] = "Decorator";
+        SyntaxKind[SyntaxKind["TypeParameter"] = 151] = "TypeParameter";
+        SyntaxKind[SyntaxKind["Parameter"] = 152] = "Parameter";
+        SyntaxKind[SyntaxKind["Decorator"] = 153] = "Decorator";
         // TypeMember
-        SyntaxKind[SyntaxKind["PropertySignature"] = 153] = "PropertySignature";
-        SyntaxKind[SyntaxKind["PropertyDeclaration"] = 154] = "PropertyDeclaration";
-        SyntaxKind[SyntaxKind["MethodSignature"] = 155] = "MethodSignature";
-        SyntaxKind[SyntaxKind["MethodDeclaration"] = 156] = "MethodDeclaration";
-        SyntaxKind[SyntaxKind["Constructor"] = 157] = "Constructor";
-        SyntaxKind[SyntaxKind["GetAccessor"] = 158] = "GetAccessor";
-        SyntaxKind[SyntaxKind["SetAccessor"] = 159] = "SetAccessor";
-        SyntaxKind[SyntaxKind["CallSignature"] = 160] = "CallSignature";
-        SyntaxKind[SyntaxKind["ConstructSignature"] = 161] = "ConstructSignature";
-        SyntaxKind[SyntaxKind["IndexSignature"] = 162] = "IndexSignature";
+        SyntaxKind[SyntaxKind["PropertySignature"] = 154] = "PropertySignature";
+        SyntaxKind[SyntaxKind["PropertyDeclaration"] = 155] = "PropertyDeclaration";
+        SyntaxKind[SyntaxKind["MethodSignature"] = 156] = "MethodSignature";
+        SyntaxKind[SyntaxKind["MethodDeclaration"] = 157] = "MethodDeclaration";
+        SyntaxKind[SyntaxKind["Constructor"] = 158] = "Constructor";
+        SyntaxKind[SyntaxKind["GetAccessor"] = 159] = "GetAccessor";
+        SyntaxKind[SyntaxKind["SetAccessor"] = 160] = "SetAccessor";
+        SyntaxKind[SyntaxKind["CallSignature"] = 161] = "CallSignature";
+        SyntaxKind[SyntaxKind["ConstructSignature"] = 162] = "ConstructSignature";
+        SyntaxKind[SyntaxKind["IndexSignature"] = 163] = "IndexSignature";
         // Type
-        SyntaxKind[SyntaxKind["TypePredicate"] = 163] = "TypePredicate";
-        SyntaxKind[SyntaxKind["TypeReference"] = 164] = "TypeReference";
-        SyntaxKind[SyntaxKind["FunctionType"] = 165] = "FunctionType";
-        SyntaxKind[SyntaxKind["ConstructorType"] = 166] = "ConstructorType";
-        SyntaxKind[SyntaxKind["TypeQuery"] = 167] = "TypeQuery";
-        SyntaxKind[SyntaxKind["TypeLiteral"] = 168] = "TypeLiteral";
-        SyntaxKind[SyntaxKind["ArrayType"] = 169] = "ArrayType";
-        SyntaxKind[SyntaxKind["TupleType"] = 170] = "TupleType";
-        SyntaxKind[SyntaxKind["OptionalType"] = 171] = "OptionalType";
-        SyntaxKind[SyntaxKind["RestType"] = 172] = "RestType";
-        SyntaxKind[SyntaxKind["UnionType"] = 173] = "UnionType";
-        SyntaxKind[SyntaxKind["IntersectionType"] = 174] = "IntersectionType";
-        SyntaxKind[SyntaxKind["ConditionalType"] = 175] = "ConditionalType";
-        SyntaxKind[SyntaxKind["InferType"] = 176] = "InferType";
-        SyntaxKind[SyntaxKind["ParenthesizedType"] = 177] = "ParenthesizedType";
-        SyntaxKind[SyntaxKind["ThisType"] = 178] = "ThisType";
-        SyntaxKind[SyntaxKind["TypeOperator"] = 179] = "TypeOperator";
-        SyntaxKind[SyntaxKind["IndexedAccessType"] = 180] = "IndexedAccessType";
-        SyntaxKind[SyntaxKind["MappedType"] = 181] = "MappedType";
-        SyntaxKind[SyntaxKind["LiteralType"] = 182] = "LiteralType";
-        SyntaxKind[SyntaxKind["ImportType"] = 183] = "ImportType";
+        SyntaxKind[SyntaxKind["TypePredicate"] = 164] = "TypePredicate";
+        SyntaxKind[SyntaxKind["TypeReference"] = 165] = "TypeReference";
+        SyntaxKind[SyntaxKind["FunctionType"] = 166] = "FunctionType";
+        SyntaxKind[SyntaxKind["ConstructorType"] = 167] = "ConstructorType";
+        SyntaxKind[SyntaxKind["TypeQuery"] = 168] = "TypeQuery";
+        SyntaxKind[SyntaxKind["TypeLiteral"] = 169] = "TypeLiteral";
+        SyntaxKind[SyntaxKind["ArrayType"] = 170] = "ArrayType";
+        SyntaxKind[SyntaxKind["TupleType"] = 171] = "TupleType";
+        SyntaxKind[SyntaxKind["OptionalType"] = 172] = "OptionalType";
+        SyntaxKind[SyntaxKind["RestType"] = 173] = "RestType";
+        SyntaxKind[SyntaxKind["UnionType"] = 174] = "UnionType";
+        SyntaxKind[SyntaxKind["IntersectionType"] = 175] = "IntersectionType";
+        SyntaxKind[SyntaxKind["ConditionalType"] = 176] = "ConditionalType";
+        SyntaxKind[SyntaxKind["InferType"] = 177] = "InferType";
+        SyntaxKind[SyntaxKind["ParenthesizedType"] = 178] = "ParenthesizedType";
+        SyntaxKind[SyntaxKind["ThisType"] = 179] = "ThisType";
+        SyntaxKind[SyntaxKind["TypeOperator"] = 180] = "TypeOperator";
+        SyntaxKind[SyntaxKind["IndexedAccessType"] = 181] = "IndexedAccessType";
+        SyntaxKind[SyntaxKind["MappedType"] = 182] = "MappedType";
+        SyntaxKind[SyntaxKind["LiteralType"] = 183] = "LiteralType";
+        SyntaxKind[SyntaxKind["ImportType"] = 184] = "ImportType";
         // Binding patterns
-        SyntaxKind[SyntaxKind["ObjectBindingPattern"] = 184] = "ObjectBindingPattern";
-        SyntaxKind[SyntaxKind["ArrayBindingPattern"] = 185] = "ArrayBindingPattern";
-        SyntaxKind[SyntaxKind["BindingElement"] = 186] = "BindingElement";
+        SyntaxKind[SyntaxKind["ObjectBindingPattern"] = 185] = "ObjectBindingPattern";
+        SyntaxKind[SyntaxKind["ArrayBindingPattern"] = 186] = "ArrayBindingPattern";
+        SyntaxKind[SyntaxKind["BindingElement"] = 187] = "BindingElement";
         // Expression
-        SyntaxKind[SyntaxKind["ArrayLiteralExpression"] = 187] = "ArrayLiteralExpression";
-        SyntaxKind[SyntaxKind["ObjectLiteralExpression"] = 188] = "ObjectLiteralExpression";
-        SyntaxKind[SyntaxKind["PropertyAccessExpression"] = 189] = "PropertyAccessExpression";
-        SyntaxKind[SyntaxKind["ElementAccessExpression"] = 190] = "ElementAccessExpression";
-        SyntaxKind[SyntaxKind["CallExpression"] = 191] = "CallExpression";
-        SyntaxKind[SyntaxKind["NewExpression"] = 192] = "NewExpression";
-        SyntaxKind[SyntaxKind["TaggedTemplateExpression"] = 193] = "TaggedTemplateExpression";
-        SyntaxKind[SyntaxKind["TypeAssertionExpression"] = 194] = "TypeAssertionExpression";
-        SyntaxKind[SyntaxKind["ParenthesizedExpression"] = 195] = "ParenthesizedExpression";
-        SyntaxKind[SyntaxKind["FunctionExpression"] = 196] = "FunctionExpression";
-        SyntaxKind[SyntaxKind["ArrowFunction"] = 197] = "ArrowFunction";
-        SyntaxKind[SyntaxKind["DeleteExpression"] = 198] = "DeleteExpression";
-        SyntaxKind[SyntaxKind["TypeOfExpression"] = 199] = "TypeOfExpression";
-        SyntaxKind[SyntaxKind["VoidExpression"] = 200] = "VoidExpression";
-        SyntaxKind[SyntaxKind["AwaitExpression"] = 201] = "AwaitExpression";
-        SyntaxKind[SyntaxKind["PrefixUnaryExpression"] = 202] = "PrefixUnaryExpression";
-        SyntaxKind[SyntaxKind["PostfixUnaryExpression"] = 203] = "PostfixUnaryExpression";
-        SyntaxKind[SyntaxKind["BinaryExpression"] = 204] = "BinaryExpression";
-        SyntaxKind[SyntaxKind["ConditionalExpression"] = 205] = "ConditionalExpression";
-        SyntaxKind[SyntaxKind["TemplateExpression"] = 206] = "TemplateExpression";
-        SyntaxKind[SyntaxKind["YieldExpression"] = 207] = "YieldExpression";
-        SyntaxKind[SyntaxKind["SpreadElement"] = 208] = "SpreadElement";
-        SyntaxKind[SyntaxKind["ClassExpression"] = 209] = "ClassExpression";
-        SyntaxKind[SyntaxKind["OmittedExpression"] = 210] = "OmittedExpression";
-        SyntaxKind[SyntaxKind["ExpressionWithTypeArguments"] = 211] = "ExpressionWithTypeArguments";
-        SyntaxKind[SyntaxKind["AsExpression"] = 212] = "AsExpression";
-        SyntaxKind[SyntaxKind["NonNullExpression"] = 213] = "NonNullExpression";
-        SyntaxKind[SyntaxKind["MetaProperty"] = 214] = "MetaProperty";
-        SyntaxKind[SyntaxKind["SyntheticExpression"] = 215] = "SyntheticExpression";
+        SyntaxKind[SyntaxKind["ArrayLiteralExpression"] = 188] = "ArrayLiteralExpression";
+        SyntaxKind[SyntaxKind["ObjectLiteralExpression"] = 189] = "ObjectLiteralExpression";
+        SyntaxKind[SyntaxKind["PropertyAccessExpression"] = 190] = "PropertyAccessExpression";
+        SyntaxKind[SyntaxKind["ElementAccessExpression"] = 191] = "ElementAccessExpression";
+        SyntaxKind[SyntaxKind["CallExpression"] = 192] = "CallExpression";
+        SyntaxKind[SyntaxKind["NewExpression"] = 193] = "NewExpression";
+        SyntaxKind[SyntaxKind["TaggedTemplateExpression"] = 194] = "TaggedTemplateExpression";
+        SyntaxKind[SyntaxKind["TypeAssertionExpression"] = 195] = "TypeAssertionExpression";
+        SyntaxKind[SyntaxKind["ParenthesizedExpression"] = 196] = "ParenthesizedExpression";
+        SyntaxKind[SyntaxKind["FunctionExpression"] = 197] = "FunctionExpression";
+        SyntaxKind[SyntaxKind["ArrowFunction"] = 198] = "ArrowFunction";
+        SyntaxKind[SyntaxKind["DeleteExpression"] = 199] = "DeleteExpression";
+        SyntaxKind[SyntaxKind["TypeOfExpression"] = 200] = "TypeOfExpression";
+        SyntaxKind[SyntaxKind["VoidExpression"] = 201] = "VoidExpression";
+        SyntaxKind[SyntaxKind["AwaitExpression"] = 202] = "AwaitExpression";
+        SyntaxKind[SyntaxKind["PrefixUnaryExpression"] = 203] = "PrefixUnaryExpression";
+        SyntaxKind[SyntaxKind["PostfixUnaryExpression"] = 204] = "PostfixUnaryExpression";
+        SyntaxKind[SyntaxKind["BinaryExpression"] = 205] = "BinaryExpression";
+        SyntaxKind[SyntaxKind["ConditionalExpression"] = 206] = "ConditionalExpression";
+        SyntaxKind[SyntaxKind["TemplateExpression"] = 207] = "TemplateExpression";
+        SyntaxKind[SyntaxKind["YieldExpression"] = 208] = "YieldExpression";
+        SyntaxKind[SyntaxKind["SpreadElement"] = 209] = "SpreadElement";
+        SyntaxKind[SyntaxKind["ClassExpression"] = 210] = "ClassExpression";
+        SyntaxKind[SyntaxKind["OmittedExpression"] = 211] = "OmittedExpression";
+        SyntaxKind[SyntaxKind["ExpressionWithTypeArguments"] = 212] = "ExpressionWithTypeArguments";
+        SyntaxKind[SyntaxKind["AsExpression"] = 213] = "AsExpression";
+        SyntaxKind[SyntaxKind["NonNullExpression"] = 214] = "NonNullExpression";
+        SyntaxKind[SyntaxKind["MetaProperty"] = 215] = "MetaProperty";
+        SyntaxKind[SyntaxKind["SyntheticExpression"] = 216] = "SyntheticExpression";
         // Misc
-        SyntaxKind[SyntaxKind["TemplateSpan"] = 216] = "TemplateSpan";
-        SyntaxKind[SyntaxKind["SemicolonClassElement"] = 217] = "SemicolonClassElement";
+        SyntaxKind[SyntaxKind["TemplateSpan"] = 217] = "TemplateSpan";
+        SyntaxKind[SyntaxKind["SemicolonClassElement"] = 218] = "SemicolonClassElement";
         // Element
-        SyntaxKind[SyntaxKind["Block"] = 218] = "Block";
-        SyntaxKind[SyntaxKind["VariableStatement"] = 219] = "VariableStatement";
-        SyntaxKind[SyntaxKind["EmptyStatement"] = 220] = "EmptyStatement";
-        SyntaxKind[SyntaxKind["ExpressionStatement"] = 221] = "ExpressionStatement";
-        SyntaxKind[SyntaxKind["IfStatement"] = 222] = "IfStatement";
-        SyntaxKind[SyntaxKind["DoStatement"] = 223] = "DoStatement";
-        SyntaxKind[SyntaxKind["WhileStatement"] = 224] = "WhileStatement";
-        SyntaxKind[SyntaxKind["ForStatement"] = 225] = "ForStatement";
-        SyntaxKind[SyntaxKind["ForInStatement"] = 226] = "ForInStatement";
-        SyntaxKind[SyntaxKind["ForOfStatement"] = 227] = "ForOfStatement";
-        SyntaxKind[SyntaxKind["ContinueStatement"] = 228] = "ContinueStatement";
-        SyntaxKind[SyntaxKind["BreakStatement"] = 229] = "BreakStatement";
-        SyntaxKind[SyntaxKind["ReturnStatement"] = 230] = "ReturnStatement";
-        SyntaxKind[SyntaxKind["WithStatement"] = 231] = "WithStatement";
-        SyntaxKind[SyntaxKind["SwitchStatement"] = 232] = "SwitchStatement";
-        SyntaxKind[SyntaxKind["LabeledStatement"] = 233] = "LabeledStatement";
-        SyntaxKind[SyntaxKind["ThrowStatement"] = 234] = "ThrowStatement";
-        SyntaxKind[SyntaxKind["TryStatement"] = 235] = "TryStatement";
-        SyntaxKind[SyntaxKind["DebuggerStatement"] = 236] = "DebuggerStatement";
-        SyntaxKind[SyntaxKind["VariableDeclaration"] = 237] = "VariableDeclaration";
-        SyntaxKind[SyntaxKind["VariableDeclarationList"] = 238] = "VariableDeclarationList";
-        SyntaxKind[SyntaxKind["FunctionDeclaration"] = 239] = "FunctionDeclaration";
-        SyntaxKind[SyntaxKind["ClassDeclaration"] = 240] = "ClassDeclaration";
-        SyntaxKind[SyntaxKind["InterfaceDeclaration"] = 241] = "InterfaceDeclaration";
-        SyntaxKind[SyntaxKind["TypeAliasDeclaration"] = 242] = "TypeAliasDeclaration";
-        SyntaxKind[SyntaxKind["EnumDeclaration"] = 243] = "EnumDeclaration";
-        SyntaxKind[SyntaxKind["ModuleDeclaration"] = 244] = "ModuleDeclaration";
-        SyntaxKind[SyntaxKind["ModuleBlock"] = 245] = "ModuleBlock";
-        SyntaxKind[SyntaxKind["CaseBlock"] = 246] = "CaseBlock";
-        SyntaxKind[SyntaxKind["NamespaceExportDeclaration"] = 247] = "NamespaceExportDeclaration";
-        SyntaxKind[SyntaxKind["ImportEqualsDeclaration"] = 248] = "ImportEqualsDeclaration";
-        SyntaxKind[SyntaxKind["ImportDeclaration"] = 249] = "ImportDeclaration";
-        SyntaxKind[SyntaxKind["ImportClause"] = 250] = "ImportClause";
-        SyntaxKind[SyntaxKind["NamespaceImport"] = 251] = "NamespaceImport";
-        SyntaxKind[SyntaxKind["NamedImports"] = 252] = "NamedImports";
-        SyntaxKind[SyntaxKind["ImportSpecifier"] = 253] = "ImportSpecifier";
-        SyntaxKind[SyntaxKind["ExportAssignment"] = 254] = "ExportAssignment";
-        SyntaxKind[SyntaxKind["ExportDeclaration"] = 255] = "ExportDeclaration";
-        SyntaxKind[SyntaxKind["NamedExports"] = 256] = "NamedExports";
-        SyntaxKind[SyntaxKind["ExportSpecifier"] = 257] = "ExportSpecifier";
-        SyntaxKind[SyntaxKind["MissingDeclaration"] = 258] = "MissingDeclaration";
+        SyntaxKind[SyntaxKind["Block"] = 219] = "Block";
+        SyntaxKind[SyntaxKind["VariableStatement"] = 220] = "VariableStatement";
+        SyntaxKind[SyntaxKind["EmptyStatement"] = 221] = "EmptyStatement";
+        SyntaxKind[SyntaxKind["ExpressionStatement"] = 222] = "ExpressionStatement";
+        SyntaxKind[SyntaxKind["IfStatement"] = 223] = "IfStatement";
+        SyntaxKind[SyntaxKind["DoStatement"] = 224] = "DoStatement";
+        SyntaxKind[SyntaxKind["WhileStatement"] = 225] = "WhileStatement";
+        SyntaxKind[SyntaxKind["ForStatement"] = 226] = "ForStatement";
+        SyntaxKind[SyntaxKind["ForInStatement"] = 227] = "ForInStatement";
+        SyntaxKind[SyntaxKind["ForOfStatement"] = 228] = "ForOfStatement";
+        SyntaxKind[SyntaxKind["ContinueStatement"] = 229] = "ContinueStatement";
+        SyntaxKind[SyntaxKind["BreakStatement"] = 230] = "BreakStatement";
+        SyntaxKind[SyntaxKind["ReturnStatement"] = 231] = "ReturnStatement";
+        SyntaxKind[SyntaxKind["WithStatement"] = 232] = "WithStatement";
+        SyntaxKind[SyntaxKind["SwitchStatement"] = 233] = "SwitchStatement";
+        SyntaxKind[SyntaxKind["LabeledStatement"] = 234] = "LabeledStatement";
+        SyntaxKind[SyntaxKind["ThrowStatement"] = 235] = "ThrowStatement";
+        SyntaxKind[SyntaxKind["TryStatement"] = 236] = "TryStatement";
+        SyntaxKind[SyntaxKind["DebuggerStatement"] = 237] = "DebuggerStatement";
+        SyntaxKind[SyntaxKind["VariableDeclaration"] = 238] = "VariableDeclaration";
+        SyntaxKind[SyntaxKind["VariableDeclarationList"] = 239] = "VariableDeclarationList";
+        SyntaxKind[SyntaxKind["FunctionDeclaration"] = 240] = "FunctionDeclaration";
+        SyntaxKind[SyntaxKind["ClassDeclaration"] = 241] = "ClassDeclaration";
+        SyntaxKind[SyntaxKind["InterfaceDeclaration"] = 242] = "InterfaceDeclaration";
+        SyntaxKind[SyntaxKind["TypeAliasDeclaration"] = 243] = "TypeAliasDeclaration";
+        SyntaxKind[SyntaxKind["EnumDeclaration"] = 244] = "EnumDeclaration";
+        SyntaxKind[SyntaxKind["ModuleDeclaration"] = 245] = "ModuleDeclaration";
+        SyntaxKind[SyntaxKind["ModuleBlock"] = 246] = "ModuleBlock";
+        SyntaxKind[SyntaxKind["CaseBlock"] = 247] = "CaseBlock";
+        SyntaxKind[SyntaxKind["NamespaceExportDeclaration"] = 248] = "NamespaceExportDeclaration";
+        SyntaxKind[SyntaxKind["ImportEqualsDeclaration"] = 249] = "ImportEqualsDeclaration";
+        SyntaxKind[SyntaxKind["ImportDeclaration"] = 250] = "ImportDeclaration";
+        SyntaxKind[SyntaxKind["ImportClause"] = 251] = "ImportClause";
+        SyntaxKind[SyntaxKind["NamespaceImport"] = 252] = "NamespaceImport";
+        SyntaxKind[SyntaxKind["NamedImports"] = 253] = "NamedImports";
+        SyntaxKind[SyntaxKind["ImportSpecifier"] = 254] = "ImportSpecifier";
+        SyntaxKind[SyntaxKind["ExportAssignment"] = 255] = "ExportAssignment";
+        SyntaxKind[SyntaxKind["ExportDeclaration"] = 256] = "ExportDeclaration";
+        SyntaxKind[SyntaxKind["NamedExports"] = 257] = "NamedExports";
+        SyntaxKind[SyntaxKind["ExportSpecifier"] = 258] = "ExportSpecifier";
+        SyntaxKind[SyntaxKind["MissingDeclaration"] = 259] = "MissingDeclaration";
         // Module references
-        SyntaxKind[SyntaxKind["ExternalModuleReference"] = 259] = "ExternalModuleReference";
+        SyntaxKind[SyntaxKind["ExternalModuleReference"] = 260] = "ExternalModuleReference";
         // JSX
-        SyntaxKind[SyntaxKind["JsxElement"] = 260] = "JsxElement";
-        SyntaxKind[SyntaxKind["JsxSelfClosingElement"] = 261] = "JsxSelfClosingElement";
-        SyntaxKind[SyntaxKind["JsxOpeningElement"] = 262] = "JsxOpeningElement";
-        SyntaxKind[SyntaxKind["JsxClosingElement"] = 263] = "JsxClosingElement";
-        SyntaxKind[SyntaxKind["JsxFragment"] = 264] = "JsxFragment";
-        SyntaxKind[SyntaxKind["JsxOpeningFragment"] = 265] = "JsxOpeningFragment";
-        SyntaxKind[SyntaxKind["JsxClosingFragment"] = 266] = "JsxClosingFragment";
-        SyntaxKind[SyntaxKind["JsxAttribute"] = 267] = "JsxAttribute";
-        SyntaxKind[SyntaxKind["JsxAttributes"] = 268] = "JsxAttributes";
-        SyntaxKind[SyntaxKind["JsxSpreadAttribute"] = 269] = "JsxSpreadAttribute";
-        SyntaxKind[SyntaxKind["JsxExpression"] = 270] = "JsxExpression";
+        SyntaxKind[SyntaxKind["JsxElement"] = 261] = "JsxElement";
+        SyntaxKind[SyntaxKind["JsxSelfClosingElement"] = 262] = "JsxSelfClosingElement";
+        SyntaxKind[SyntaxKind["JsxOpeningElement"] = 263] = "JsxOpeningElement";
+        SyntaxKind[SyntaxKind["JsxClosingElement"] = 264] = "JsxClosingElement";
+        SyntaxKind[SyntaxKind["JsxFragment"] = 265] = "JsxFragment";
+        SyntaxKind[SyntaxKind["JsxOpeningFragment"] = 266] = "JsxOpeningFragment";
+        SyntaxKind[SyntaxKind["JsxClosingFragment"] = 267] = "JsxClosingFragment";
+        SyntaxKind[SyntaxKind["JsxAttribute"] = 268] = "JsxAttribute";
+        SyntaxKind[SyntaxKind["JsxAttributes"] = 269] = "JsxAttributes";
+        SyntaxKind[SyntaxKind["JsxSpreadAttribute"] = 270] = "JsxSpreadAttribute";
+        SyntaxKind[SyntaxKind["JsxExpression"] = 271] = "JsxExpression";
         // Clauses
-        SyntaxKind[SyntaxKind["CaseClause"] = 271] = "CaseClause";
-        SyntaxKind[SyntaxKind["DefaultClause"] = 272] = "DefaultClause";
-        SyntaxKind[SyntaxKind["HeritageClause"] = 273] = "HeritageClause";
-        SyntaxKind[SyntaxKind["CatchClause"] = 274] = "CatchClause";
+        SyntaxKind[SyntaxKind["CaseClause"] = 272] = "CaseClause";
+        SyntaxKind[SyntaxKind["DefaultClause"] = 273] = "DefaultClause";
+        SyntaxKind[SyntaxKind["HeritageClause"] = 274] = "HeritageClause";
+        SyntaxKind[SyntaxKind["CatchClause"] = 275] = "CatchClause";
         // Property assignments
-        SyntaxKind[SyntaxKind["PropertyAssignment"] = 275] = "PropertyAssignment";
-        SyntaxKind[SyntaxKind["ShorthandPropertyAssignment"] = 276] = "ShorthandPropertyAssignment";
-        SyntaxKind[SyntaxKind["SpreadAssignment"] = 277] = "SpreadAssignment";
+        SyntaxKind[SyntaxKind["PropertyAssignment"] = 276] = "PropertyAssignment";
+        SyntaxKind[SyntaxKind["ShorthandPropertyAssignment"] = 277] = "ShorthandPropertyAssignment";
+        SyntaxKind[SyntaxKind["SpreadAssignment"] = 278] = "SpreadAssignment";
         // Enum
-        SyntaxKind[SyntaxKind["EnumMember"] = 278] = "EnumMember";
+        SyntaxKind[SyntaxKind["EnumMember"] = 279] = "EnumMember";
         // Unparsed
-        SyntaxKind[SyntaxKind["UnparsedPrologue"] = 279] = "UnparsedPrologue";
-        SyntaxKind[SyntaxKind["UnparsedPrepend"] = 280] = "UnparsedPrepend";
-        SyntaxKind[SyntaxKind["UnparsedText"] = 281] = "UnparsedText";
-        SyntaxKind[SyntaxKind["UnparsedInternalText"] = 282] = "UnparsedInternalText";
-        SyntaxKind[SyntaxKind["UnparsedSyntheticReference"] = 283] = "UnparsedSyntheticReference";
+        SyntaxKind[SyntaxKind["UnparsedPrologue"] = 280] = "UnparsedPrologue";
+        SyntaxKind[SyntaxKind["UnparsedPrepend"] = 281] = "UnparsedPrepend";
+        SyntaxKind[SyntaxKind["UnparsedText"] = 282] = "UnparsedText";
+        SyntaxKind[SyntaxKind["UnparsedInternalText"] = 283] = "UnparsedInternalText";
+        SyntaxKind[SyntaxKind["UnparsedSyntheticReference"] = 284] = "UnparsedSyntheticReference";
         // Top-level nodes
-        SyntaxKind[SyntaxKind["SourceFile"] = 284] = "SourceFile";
-        SyntaxKind[SyntaxKind["Bundle"] = 285] = "Bundle";
-        SyntaxKind[SyntaxKind["UnparsedSource"] = 286] = "UnparsedSource";
-        SyntaxKind[SyntaxKind["InputFiles"] = 287] = "InputFiles";
+        SyntaxKind[SyntaxKind["SourceFile"] = 285] = "SourceFile";
+        SyntaxKind[SyntaxKind["Bundle"] = 286] = "Bundle";
+        SyntaxKind[SyntaxKind["UnparsedSource"] = 287] = "UnparsedSource";
+        SyntaxKind[SyntaxKind["InputFiles"] = 288] = "InputFiles";
         // JSDoc nodes
-        SyntaxKind[SyntaxKind["JSDocTypeExpression"] = 288] = "JSDocTypeExpression";
+        SyntaxKind[SyntaxKind["JSDocTypeExpression"] = 289] = "JSDocTypeExpression";
         // The * type
-        SyntaxKind[SyntaxKind["JSDocAllType"] = 289] = "JSDocAllType";
+        SyntaxKind[SyntaxKind["JSDocAllType"] = 290] = "JSDocAllType";
         // The ? type
-        SyntaxKind[SyntaxKind["JSDocUnknownType"] = 290] = "JSDocUnknownType";
-        SyntaxKind[SyntaxKind["JSDocNullableType"] = 291] = "JSDocNullableType";
-        SyntaxKind[SyntaxKind["JSDocNonNullableType"] = 292] = "JSDocNonNullableType";
-        SyntaxKind[SyntaxKind["JSDocOptionalType"] = 293] = "JSDocOptionalType";
-        SyntaxKind[SyntaxKind["JSDocFunctionType"] = 294] = "JSDocFunctionType";
-        SyntaxKind[SyntaxKind["JSDocVariadicType"] = 295] = "JSDocVariadicType";
-        SyntaxKind[SyntaxKind["JSDocComment"] = 296] = "JSDocComment";
-        SyntaxKind[SyntaxKind["JSDocTypeLiteral"] = 297] = "JSDocTypeLiteral";
-        SyntaxKind[SyntaxKind["JSDocSignature"] = 298] = "JSDocSignature";
-        SyntaxKind[SyntaxKind["JSDocTag"] = 299] = "JSDocTag";
-        SyntaxKind[SyntaxKind["JSDocAugmentsTag"] = 300] = "JSDocAugmentsTag";
-        SyntaxKind[SyntaxKind["JSDocClassTag"] = 301] = "JSDocClassTag";
-        SyntaxKind[SyntaxKind["JSDocCallbackTag"] = 302] = "JSDocCallbackTag";
-        SyntaxKind[SyntaxKind["JSDocEnumTag"] = 303] = "JSDocEnumTag";
-        SyntaxKind[SyntaxKind["JSDocParameterTag"] = 304] = "JSDocParameterTag";
-        SyntaxKind[SyntaxKind["JSDocReturnTag"] = 305] = "JSDocReturnTag";
-        SyntaxKind[SyntaxKind["JSDocThisTag"] = 306] = "JSDocThisTag";
-        SyntaxKind[SyntaxKind["JSDocTypeTag"] = 307] = "JSDocTypeTag";
-        SyntaxKind[SyntaxKind["JSDocTemplateTag"] = 308] = "JSDocTemplateTag";
-        SyntaxKind[SyntaxKind["JSDocTypedefTag"] = 309] = "JSDocTypedefTag";
-        SyntaxKind[SyntaxKind["JSDocPropertyTag"] = 310] = "JSDocPropertyTag";
+        SyntaxKind[SyntaxKind["JSDocUnknownType"] = 291] = "JSDocUnknownType";
+        SyntaxKind[SyntaxKind["JSDocNullableType"] = 292] = "JSDocNullableType";
+        SyntaxKind[SyntaxKind["JSDocNonNullableType"] = 293] = "JSDocNonNullableType";
+        SyntaxKind[SyntaxKind["JSDocOptionalType"] = 294] = "JSDocOptionalType";
+        SyntaxKind[SyntaxKind["JSDocFunctionType"] = 295] = "JSDocFunctionType";
+        SyntaxKind[SyntaxKind["JSDocVariadicType"] = 296] = "JSDocVariadicType";
+        SyntaxKind[SyntaxKind["JSDocComment"] = 297] = "JSDocComment";
+        SyntaxKind[SyntaxKind["JSDocTypeLiteral"] = 298] = "JSDocTypeLiteral";
+        SyntaxKind[SyntaxKind["JSDocSignature"] = 299] = "JSDocSignature";
+        SyntaxKind[SyntaxKind["JSDocTag"] = 300] = "JSDocTag";
+        SyntaxKind[SyntaxKind["JSDocAugmentsTag"] = 301] = "JSDocAugmentsTag";
+        SyntaxKind[SyntaxKind["JSDocAuthorTag"] = 302] = "JSDocAuthorTag";
+        SyntaxKind[SyntaxKind["JSDocClassTag"] = 303] = "JSDocClassTag";
+        SyntaxKind[SyntaxKind["JSDocCallbackTag"] = 304] = "JSDocCallbackTag";
+        SyntaxKind[SyntaxKind["JSDocEnumTag"] = 305] = "JSDocEnumTag";
+        SyntaxKind[SyntaxKind["JSDocParameterTag"] = 306] = "JSDocParameterTag";
+        SyntaxKind[SyntaxKind["JSDocReturnTag"] = 307] = "JSDocReturnTag";
+        SyntaxKind[SyntaxKind["JSDocThisTag"] = 308] = "JSDocThisTag";
+        SyntaxKind[SyntaxKind["JSDocTypeTag"] = 309] = "JSDocTypeTag";
+        SyntaxKind[SyntaxKind["JSDocTemplateTag"] = 310] = "JSDocTemplateTag";
+        SyntaxKind[SyntaxKind["JSDocTypedefTag"] = 311] = "JSDocTypedefTag";
+        SyntaxKind[SyntaxKind["JSDocPropertyTag"] = 312] = "JSDocPropertyTag";
         // Synthesized list
-        SyntaxKind[SyntaxKind["SyntaxList"] = 311] = "SyntaxList";
+        SyntaxKind[SyntaxKind["SyntaxList"] = 313] = "SyntaxList";
         // Transformation nodes
-        SyntaxKind[SyntaxKind["NotEmittedStatement"] = 312] = "NotEmittedStatement";
-        SyntaxKind[SyntaxKind["PartiallyEmittedExpression"] = 313] = "PartiallyEmittedExpression";
-        SyntaxKind[SyntaxKind["CommaListExpression"] = 314] = "CommaListExpression";
-        SyntaxKind[SyntaxKind["MergeDeclarationMarker"] = 315] = "MergeDeclarationMarker";
-        SyntaxKind[SyntaxKind["EndOfDeclarationMarker"] = 316] = "EndOfDeclarationMarker";
+        SyntaxKind[SyntaxKind["NotEmittedStatement"] = 314] = "NotEmittedStatement";
+        SyntaxKind[SyntaxKind["PartiallyEmittedExpression"] = 315] = "PartiallyEmittedExpression";
+        SyntaxKind[SyntaxKind["CommaListExpression"] = 316] = "CommaListExpression";
+        SyntaxKind[SyntaxKind["MergeDeclarationMarker"] = 317] = "MergeDeclarationMarker";
+        SyntaxKind[SyntaxKind["EndOfDeclarationMarker"] = 318] = "EndOfDeclarationMarker";
         // Enum value count
-        SyntaxKind[SyntaxKind["Count"] = 317] = "Count";
+        SyntaxKind[SyntaxKind["Count"] = 319] = "Count";
         // Markers
-        SyntaxKind[SyntaxKind["FirstAssignment"] = 59] = "FirstAssignment";
-        SyntaxKind[SyntaxKind["LastAssignment"] = 71] = "LastAssignment";
-        SyntaxKind[SyntaxKind["FirstCompoundAssignment"] = 60] = "FirstCompoundAssignment";
-        SyntaxKind[SyntaxKind["LastCompoundAssignment"] = 71] = "LastCompoundAssignment";
-        SyntaxKind[SyntaxKind["FirstReservedWord"] = 73] = "FirstReservedWord";
-        SyntaxKind[SyntaxKind["LastReservedWord"] = 108] = "LastReservedWord";
-        SyntaxKind[SyntaxKind["FirstKeyword"] = 73] = "FirstKeyword";
-        SyntaxKind[SyntaxKind["LastKeyword"] = 147] = "LastKeyword";
-        SyntaxKind[SyntaxKind["FirstFutureReservedWord"] = 109] = "FirstFutureReservedWord";
-        SyntaxKind[SyntaxKind["LastFutureReservedWord"] = 117] = "LastFutureReservedWord";
-        SyntaxKind[SyntaxKind["FirstTypeNode"] = 163] = "FirstTypeNode";
-        SyntaxKind[SyntaxKind["LastTypeNode"] = 183] = "LastTypeNode";
+        SyntaxKind[SyntaxKind["FirstAssignment"] = 60] = "FirstAssignment";
+        SyntaxKind[SyntaxKind["LastAssignment"] = 72] = "LastAssignment";
+        SyntaxKind[SyntaxKind["FirstCompoundAssignment"] = 61] = "FirstCompoundAssignment";
+        SyntaxKind[SyntaxKind["LastCompoundAssignment"] = 72] = "LastCompoundAssignment";
+        SyntaxKind[SyntaxKind["FirstReservedWord"] = 74] = "FirstReservedWord";
+        SyntaxKind[SyntaxKind["LastReservedWord"] = 109] = "LastReservedWord";
+        SyntaxKind[SyntaxKind["FirstKeyword"] = 74] = "FirstKeyword";
+        SyntaxKind[SyntaxKind["LastKeyword"] = 148] = "LastKeyword";
+        SyntaxKind[SyntaxKind["FirstFutureReservedWord"] = 110] = "FirstFutureReservedWord";
+        SyntaxKind[SyntaxKind["LastFutureReservedWord"] = 118] = "LastFutureReservedWord";
+        SyntaxKind[SyntaxKind["FirstTypeNode"] = 164] = "FirstTypeNode";
+        SyntaxKind[SyntaxKind["LastTypeNode"] = 184] = "LastTypeNode";
         SyntaxKind[SyntaxKind["FirstPunctuation"] = 18] = "FirstPunctuation";
-        SyntaxKind[SyntaxKind["LastPunctuation"] = 71] = "LastPunctuation";
+        SyntaxKind[SyntaxKind["LastPunctuation"] = 72] = "LastPunctuation";
         SyntaxKind[SyntaxKind["FirstToken"] = 0] = "FirstToken";
-        SyntaxKind[SyntaxKind["LastToken"] = 147] = "LastToken";
+        SyntaxKind[SyntaxKind["LastToken"] = 148] = "LastToken";
         SyntaxKind[SyntaxKind["FirstTriviaToken"] = 2] = "FirstTriviaToken";
         SyntaxKind[SyntaxKind["LastTriviaToken"] = 7] = "LastTriviaToken";
         SyntaxKind[SyntaxKind["FirstLiteralToken"] = 8] = "FirstLiteralToken";
@@ -2962,14 +3120,14 @@ var ts;
         SyntaxKind[SyntaxKind["FirstTemplateToken"] = 14] = "FirstTemplateToken";
         SyntaxKind[SyntaxKind["LastTemplateToken"] = 17] = "LastTemplateToken";
         SyntaxKind[SyntaxKind["FirstBinaryOperator"] = 28] = "FirstBinaryOperator";
-        SyntaxKind[SyntaxKind["LastBinaryOperator"] = 71] = "LastBinaryOperator";
-        SyntaxKind[SyntaxKind["FirstNode"] = 148] = "FirstNode";
-        SyntaxKind[SyntaxKind["FirstJSDocNode"] = 288] = "FirstJSDocNode";
-        SyntaxKind[SyntaxKind["LastJSDocNode"] = 310] = "LastJSDocNode";
-        SyntaxKind[SyntaxKind["FirstJSDocTagNode"] = 299] = "FirstJSDocTagNode";
-        SyntaxKind[SyntaxKind["LastJSDocTagNode"] = 310] = "LastJSDocTagNode";
-        /* @internal */ SyntaxKind[SyntaxKind["FirstContextualKeyword"] = 118] = "FirstContextualKeyword";
-        /* @internal */ SyntaxKind[SyntaxKind["LastContextualKeyword"] = 147] = "LastContextualKeyword";
+        SyntaxKind[SyntaxKind["LastBinaryOperator"] = 72] = "LastBinaryOperator";
+        SyntaxKind[SyntaxKind["FirstNode"] = 149] = "FirstNode";
+        SyntaxKind[SyntaxKind["FirstJSDocNode"] = 289] = "FirstJSDocNode";
+        SyntaxKind[SyntaxKind["LastJSDocNode"] = 312] = "LastJSDocNode";
+        SyntaxKind[SyntaxKind["FirstJSDocTagNode"] = 300] = "FirstJSDocTagNode";
+        SyntaxKind[SyntaxKind["LastJSDocTagNode"] = 312] = "LastJSDocTagNode";
+        /* @internal */ SyntaxKind[SyntaxKind["FirstContextualKeyword"] = 119] = "FirstContextualKeyword";
+        /* @internal */ SyntaxKind[SyntaxKind["LastContextualKeyword"] = 148] = "LastContextualKeyword";
     })(SyntaxKind = ts.SyntaxKind || (ts.SyntaxKind = {}));
     var NodeFlags;
     (function (NodeFlags) {
@@ -3112,6 +3270,8 @@ var ts;
         FlowFlags[FlowFlags["Shared"] = 1024] = "Shared";
         FlowFlags[FlowFlags["PreFinally"] = 2048] = "PreFinally";
         FlowFlags[FlowFlags["AfterFinally"] = 4096] = "AfterFinally";
+        /** @internal */
+        FlowFlags[FlowFlags["Cached"] = 8192] = "Cached";
         FlowFlags[FlowFlags["Label"] = 12] = "Label";
         FlowFlags[FlowFlags["Condition"] = 96] = "Condition";
     })(FlowFlags = ts.FlowFlags || (ts.FlowFlags = {}));
@@ -3139,6 +3299,8 @@ var ts;
         ExitStatus[ExitStatus["DiagnosticsPresent_OutputsSkipped"] = 1] = "DiagnosticsPresent_OutputsSkipped";
         // Diagnostics were produced and outputs were generated in spite of them.
         ExitStatus[ExitStatus["DiagnosticsPresent_OutputsGenerated"] = 2] = "DiagnosticsPresent_OutputsGenerated";
+        // When build skipped because passed in project is invalid
+        ExitStatus[ExitStatus["InvalidProject_OutputsSkipped"] = 3] = "InvalidProject_OutputsSkipped";
     })(ExitStatus = ts.ExitStatus || (ts.ExitStatus = {}));
     /* @internal */
     var UnionReduction;
@@ -3364,19 +3526,22 @@ var ts;
         CheckFlags[CheckFlags["SyntheticProperty"] = 2] = "SyntheticProperty";
         CheckFlags[CheckFlags["SyntheticMethod"] = 4] = "SyntheticMethod";
         CheckFlags[CheckFlags["Readonly"] = 8] = "Readonly";
-        CheckFlags[CheckFlags["Partial"] = 16] = "Partial";
-        CheckFlags[CheckFlags["HasNonUniformType"] = 32] = "HasNonUniformType";
-        CheckFlags[CheckFlags["HasLiteralType"] = 64] = "HasLiteralType";
-        CheckFlags[CheckFlags["ContainsPublic"] = 128] = "ContainsPublic";
-        CheckFlags[CheckFlags["ContainsProtected"] = 256] = "ContainsProtected";
-        CheckFlags[CheckFlags["ContainsPrivate"] = 512] = "ContainsPrivate";
-        CheckFlags[CheckFlags["ContainsStatic"] = 1024] = "ContainsStatic";
-        CheckFlags[CheckFlags["Late"] = 2048] = "Late";
-        CheckFlags[CheckFlags["ReverseMapped"] = 4096] = "ReverseMapped";
-        CheckFlags[CheckFlags["OptionalParameter"] = 8192] = "OptionalParameter";
-        CheckFlags[CheckFlags["RestParameter"] = 16384] = "RestParameter";
+        CheckFlags[CheckFlags["ReadPartial"] = 16] = "ReadPartial";
+        CheckFlags[CheckFlags["WritePartial"] = 32] = "WritePartial";
+        CheckFlags[CheckFlags["HasNonUniformType"] = 64] = "HasNonUniformType";
+        CheckFlags[CheckFlags["HasLiteralType"] = 128] = "HasLiteralType";
+        CheckFlags[CheckFlags["ContainsPublic"] = 256] = "ContainsPublic";
+        CheckFlags[CheckFlags["ContainsProtected"] = 512] = "ContainsProtected";
+        CheckFlags[CheckFlags["ContainsPrivate"] = 1024] = "ContainsPrivate";
+        CheckFlags[CheckFlags["ContainsStatic"] = 2048] = "ContainsStatic";
+        CheckFlags[CheckFlags["Late"] = 4096] = "Late";
+        CheckFlags[CheckFlags["ReverseMapped"] = 8192] = "ReverseMapped";
+        CheckFlags[CheckFlags["OptionalParameter"] = 16384] = "OptionalParameter";
+        CheckFlags[CheckFlags["RestParameter"] = 32768] = "RestParameter";
+        CheckFlags[CheckFlags["DeferredType"] = 65536] = "DeferredType";
         CheckFlags[CheckFlags["Synthetic"] = 6] = "Synthetic";
-        CheckFlags[CheckFlags["Discriminant"] = 96] = "Discriminant";
+        CheckFlags[CheckFlags["Discriminant"] = 192] = "Discriminant";
+        CheckFlags[CheckFlags["Partial"] = 48] = "Partial";
     })(CheckFlags = ts.CheckFlags || (ts.CheckFlags = {}));
     var InternalSymbolName;
     (function (InternalSymbolName) {
@@ -3486,7 +3651,9 @@ var ts;
         TypeFlags[TypeFlags["Instantiable"] = 63176704] = "Instantiable";
         TypeFlags[TypeFlags["StructuredOrInstantiable"] = 66846720] = "StructuredOrInstantiable";
         /* @internal */
-        TypeFlags[TypeFlags["ObjectFlagsType"] = 3768320] = "ObjectFlagsType";
+        TypeFlags[TypeFlags["ObjectFlagsType"] = 3899392] = "ObjectFlagsType";
+        /* @internal */
+        TypeFlags[TypeFlags["Simplifiable"] = 25165824] = "Simplifiable";
         // 'Narrowable' types are types where narrowing actually narrows.
         // This *should* be every type other than null, undefined, void, and never
         TypeFlags[TypeFlags["Narrowable"] = 133970943] = "Narrowable";
@@ -3495,7 +3662,7 @@ var ts;
         TypeFlags[TypeFlags["NotPrimitiveUnion"] = 66994211] = "NotPrimitiveUnion";
         // The following flags are aggregated during union and intersection type construction
         /* @internal */
-        TypeFlags[TypeFlags["IncludesMask"] = 1835007] = "IncludesMask";
+        TypeFlags[TypeFlags["IncludesMask"] = 68943871] = "IncludesMask";
         // The following flags are used for different purposes during union and intersection type construction
         /* @internal */
         TypeFlags[TypeFlags["IncludesStructuredOrInstantiable"] = 262144] = "IncludesStructuredOrInstantiable";
@@ -3527,29 +3694,34 @@ var ts;
         ObjectFlags[ObjectFlags["MarkerType"] = 8192] = "MarkerType";
         ObjectFlags[ObjectFlags["JSLiteral"] = 16384] = "JSLiteral";
         ObjectFlags[ObjectFlags["FreshLiteral"] = 32768] = "FreshLiteral";
+        ObjectFlags[ObjectFlags["ArrayLiteral"] = 65536] = "ArrayLiteral";
         /* @internal */
-        ObjectFlags[ObjectFlags["PrimitiveUnion"] = 65536] = "PrimitiveUnion";
+        ObjectFlags[ObjectFlags["PrimitiveUnion"] = 131072] = "PrimitiveUnion";
         /* @internal */
-        ObjectFlags[ObjectFlags["ContainsWideningType"] = 131072] = "ContainsWideningType";
+        ObjectFlags[ObjectFlags["ContainsWideningType"] = 262144] = "ContainsWideningType";
         /* @internal */
-        ObjectFlags[ObjectFlags["ContainsObjectLiteral"] = 262144] = "ContainsObjectLiteral";
+        ObjectFlags[ObjectFlags["ContainsObjectOrArrayLiteral"] = 524288] = "ContainsObjectOrArrayLiteral";
         /* @internal */
-        ObjectFlags[ObjectFlags["ContainsAnyFunctionType"] = 524288] = "ContainsAnyFunctionType";
+        ObjectFlags[ObjectFlags["NonInferrableType"] = 1048576] = "NonInferrableType";
         ObjectFlags[ObjectFlags["ClassOrInterface"] = 3] = "ClassOrInterface";
         /* @internal */
-        ObjectFlags[ObjectFlags["RequiresWidening"] = 393216] = "RequiresWidening";
+        ObjectFlags[ObjectFlags["RequiresWidening"] = 786432] = "RequiresWidening";
         /* @internal */
-        ObjectFlags[ObjectFlags["PropagatingFlags"] = 917504] = "PropagatingFlags";
+        ObjectFlags[ObjectFlags["PropagatingFlags"] = 1835008] = "PropagatingFlags";
     })(ObjectFlags = ts.ObjectFlags || (ts.ObjectFlags = {}));
     /* @internal */
-    var Variance;
-    (function (Variance) {
-        Variance[Variance["Invariant"] = 0] = "Invariant";
-        Variance[Variance["Covariant"] = 1] = "Covariant";
-        Variance[Variance["Contravariant"] = 2] = "Contravariant";
-        Variance[Variance["Bivariant"] = 3] = "Bivariant";
-        Variance[Variance["Independent"] = 4] = "Independent";
-    })(Variance = ts.Variance || (ts.Variance = {}));
+    var VarianceFlags;
+    (function (VarianceFlags) {
+        VarianceFlags[VarianceFlags["Invariant"] = 0] = "Invariant";
+        VarianceFlags[VarianceFlags["Covariant"] = 1] = "Covariant";
+        VarianceFlags[VarianceFlags["Contravariant"] = 2] = "Contravariant";
+        VarianceFlags[VarianceFlags["Bivariant"] = 3] = "Bivariant";
+        VarianceFlags[VarianceFlags["Independent"] = 4] = "Independent";
+        VarianceFlags[VarianceFlags["VarianceMask"] = 7] = "VarianceMask";
+        VarianceFlags[VarianceFlags["Unmeasurable"] = 8] = "Unmeasurable";
+        VarianceFlags[VarianceFlags["Unreliable"] = 16] = "Unreliable";
+        VarianceFlags[VarianceFlags["AllowsStructuralFallback"] = 24] = "AllowsStructuralFallback";
+    })(VarianceFlags = ts.VarianceFlags || (ts.VarianceFlags = {}));
     /* @internal */
     var JsxReferenceKind;
     (function (JsxReferenceKind) {
@@ -3571,12 +3743,13 @@ var ts;
     (function (InferencePriority) {
         InferencePriority[InferencePriority["NakedTypeVariable"] = 1] = "NakedTypeVariable";
         InferencePriority[InferencePriority["HomomorphicMappedType"] = 2] = "HomomorphicMappedType";
-        InferencePriority[InferencePriority["MappedTypeConstraint"] = 4] = "MappedTypeConstraint";
-        InferencePriority[InferencePriority["ReturnType"] = 8] = "ReturnType";
-        InferencePriority[InferencePriority["LiteralKeyof"] = 16] = "LiteralKeyof";
-        InferencePriority[InferencePriority["NoConstraints"] = 32] = "NoConstraints";
-        InferencePriority[InferencePriority["AlwaysStrict"] = 64] = "AlwaysStrict";
-        InferencePriority[InferencePriority["PriorityImpliesCombination"] = 28] = "PriorityImpliesCombination";
+        InferencePriority[InferencePriority["PartialHomomorphicMappedType"] = 4] = "PartialHomomorphicMappedType";
+        InferencePriority[InferencePriority["MappedTypeConstraint"] = 8] = "MappedTypeConstraint";
+        InferencePriority[InferencePriority["ReturnType"] = 16] = "ReturnType";
+        InferencePriority[InferencePriority["LiteralKeyof"] = 32] = "LiteralKeyof";
+        InferencePriority[InferencePriority["NoConstraints"] = 64] = "NoConstraints";
+        InferencePriority[InferencePriority["AlwaysStrict"] = 128] = "AlwaysStrict";
+        InferencePriority[InferencePriority["PriorityImpliesCombination"] = 56] = "PriorityImpliesCombination";
     })(InferencePriority = ts.InferencePriority || (ts.InferencePriority = {}));
     /* @internal */
     var InferenceFlags;
@@ -3584,8 +3757,7 @@ var ts;
         InferenceFlags[InferenceFlags["None"] = 0] = "None";
         InferenceFlags[InferenceFlags["NoDefault"] = 1] = "NoDefault";
         InferenceFlags[InferenceFlags["AnyDefault"] = 2] = "AnyDefault";
-        InferenceFlags[InferenceFlags["NoFixing"] = 4] = "NoFixing";
-        InferenceFlags[InferenceFlags["SkippedGenericFunction"] = 8] = "SkippedGenericFunction";
+        InferenceFlags[InferenceFlags["SkippedGenericFunction"] = 4] = "SkippedGenericFunction";
     })(InferenceFlags = ts.InferenceFlags || (ts.InferenceFlags = {}));
     /**
      * Ternary values are defined such that
@@ -3656,7 +3828,7 @@ var ts;
         ModuleKind[ModuleKind["UMD"] = 3] = "UMD";
         ModuleKind[ModuleKind["System"] = 4] = "System";
         ModuleKind[ModuleKind["ES2015"] = 5] = "ES2015";
-        ModuleKind[ModuleKind["ESNext"] = 6] = "ESNext";
+        ModuleKind[ModuleKind["ESNext"] = 99] = "ESNext";
     })(ModuleKind = ts.ModuleKind || (ts.ModuleKind = {}));
     var JsxEmit;
     (function (JsxEmit) {
@@ -3694,9 +3866,10 @@ var ts;
         ScriptTarget[ScriptTarget["ES2017"] = 4] = "ES2017";
         ScriptTarget[ScriptTarget["ES2018"] = 5] = "ES2018";
         ScriptTarget[ScriptTarget["ES2019"] = 6] = "ES2019";
-        ScriptTarget[ScriptTarget["ESNext"] = 7] = "ESNext";
+        ScriptTarget[ScriptTarget["ES2020"] = 7] = "ES2020";
+        ScriptTarget[ScriptTarget["ESNext"] = 99] = "ESNext";
         ScriptTarget[ScriptTarget["JSON"] = 100] = "JSON";
-        ScriptTarget[ScriptTarget["Latest"] = 7] = "Latest";
+        ScriptTarget[ScriptTarget["Latest"] = 99] = "Latest";
     })(ScriptTarget = ts.ScriptTarget || (ts.ScriptTarget = {}));
     var LanguageVariant;
     (function (LanguageVariant) {
@@ -3875,6 +4048,7 @@ var ts;
         TransformFlags[TransformFlags["ContainsYield"] = 131072] = "ContainsYield";
         TransformFlags[TransformFlags["ContainsHoistedDeclarationOrCompletion"] = 262144] = "ContainsHoistedDeclarationOrCompletion";
         TransformFlags[TransformFlags["ContainsDynamicImport"] = 524288] = "ContainsDynamicImport";
+        TransformFlags[TransformFlags["ContainsClassFields"] = 1048576] = "ContainsClassFields";
         // Please leave this as 1 << 29.
         // It is the maximum bit we can set before we outgrow the size of a v8 small integer (SMI) on an x86 system.
         // It is a good reminder of how much room we have left
@@ -3969,22 +4143,23 @@ var ts;
         ExternalEmitHelpers[ExternalEmitHelpers["Values"] = 256] = "Values";
         ExternalEmitHelpers[ExternalEmitHelpers["Read"] = 512] = "Read";
         ExternalEmitHelpers[ExternalEmitHelpers["Spread"] = 1024] = "Spread";
-        ExternalEmitHelpers[ExternalEmitHelpers["Await"] = 2048] = "Await";
-        ExternalEmitHelpers[ExternalEmitHelpers["AsyncGenerator"] = 4096] = "AsyncGenerator";
-        ExternalEmitHelpers[ExternalEmitHelpers["AsyncDelegator"] = 8192] = "AsyncDelegator";
-        ExternalEmitHelpers[ExternalEmitHelpers["AsyncValues"] = 16384] = "AsyncValues";
-        ExternalEmitHelpers[ExternalEmitHelpers["ExportStar"] = 32768] = "ExportStar";
-        ExternalEmitHelpers[ExternalEmitHelpers["MakeTemplateObject"] = 65536] = "MakeTemplateObject";
+        ExternalEmitHelpers[ExternalEmitHelpers["SpreadArrays"] = 2048] = "SpreadArrays";
+        ExternalEmitHelpers[ExternalEmitHelpers["Await"] = 4096] = "Await";
+        ExternalEmitHelpers[ExternalEmitHelpers["AsyncGenerator"] = 8192] = "AsyncGenerator";
+        ExternalEmitHelpers[ExternalEmitHelpers["AsyncDelegator"] = 16384] = "AsyncDelegator";
+        ExternalEmitHelpers[ExternalEmitHelpers["AsyncValues"] = 32768] = "AsyncValues";
+        ExternalEmitHelpers[ExternalEmitHelpers["ExportStar"] = 65536] = "ExportStar";
+        ExternalEmitHelpers[ExternalEmitHelpers["MakeTemplateObject"] = 131072] = "MakeTemplateObject";
         ExternalEmitHelpers[ExternalEmitHelpers["FirstEmitHelper"] = 1] = "FirstEmitHelper";
-        ExternalEmitHelpers[ExternalEmitHelpers["LastEmitHelper"] = 65536] = "LastEmitHelper";
+        ExternalEmitHelpers[ExternalEmitHelpers["LastEmitHelper"] = 131072] = "LastEmitHelper";
         // Helpers included by ES2015 for..of
         ExternalEmitHelpers[ExternalEmitHelpers["ForOfIncludes"] = 256] = "ForOfIncludes";
         // Helpers included by ES2017 for..await..of
-        ExternalEmitHelpers[ExternalEmitHelpers["ForAwaitOfIncludes"] = 16384] = "ForAwaitOfIncludes";
+        ExternalEmitHelpers[ExternalEmitHelpers["ForAwaitOfIncludes"] = 32768] = "ForAwaitOfIncludes";
         // Helpers included by ES2017 async generators
-        ExternalEmitHelpers[ExternalEmitHelpers["AsyncGeneratorIncludes"] = 6144] = "AsyncGeneratorIncludes";
+        ExternalEmitHelpers[ExternalEmitHelpers["AsyncGeneratorIncludes"] = 12288] = "AsyncGeneratorIncludes";
         // Helpers included by yield* in ES2017 async generators
-        ExternalEmitHelpers[ExternalEmitHelpers["AsyncDelegatorIncludes"] = 26624] = "AsyncDelegatorIncludes";
+        ExternalEmitHelpers[ExternalEmitHelpers["AsyncDelegatorIncludes"] = 53248] = "AsyncDelegatorIncludes";
         // Helpers included by ES2015 spread
         ExternalEmitHelpers[ExternalEmitHelpers["SpreadIncludes"] = 1536] = "SpreadIncludes";
     })(ExternalEmitHelpers = ts.ExternalEmitHelpers || (ts.ExternalEmitHelpers = {}));
@@ -4109,17 +4284,10 @@ var ts;
         PragmaKindFlags[PragmaKindFlags["All"] = 7] = "All";
         PragmaKindFlags[PragmaKindFlags["Default"] = 7] = "Default";
     })(PragmaKindFlags = ts.PragmaKindFlags || (ts.PragmaKindFlags = {}));
-    /**
-     * This function only exists to cause exact types to be inferred for all the literals within `commentPragmas`
-     */
-    /* @internal */
-    function _contextuallyTypePragmas(args) {
-        return args;
-    }
     // While not strictly a type, this is here because `PragmaMap` needs to be here to be used with `SourceFile`, and we don't
     //  fancy effectively defining it twice, once in value-space and once in type-space
     /* @internal */
-    ts.commentPragmas = _contextuallyTypePragmas({
+    ts.commentPragmas = {
         "reference": {
             args: [
                 { name: "types", optional: true, captureSpan: true },
@@ -4147,7 +4315,7 @@ var ts;
             args: [{ name: "factory" }],
             kind: 4 /* MultiLine */
         },
-    });
+    };
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
@@ -4157,8 +4325,11 @@ var ts;
      */
     /* @internal */
     function generateDjb2Hash(data) {
-        var chars = data.split("").map(function (str) { return str.charCodeAt(0); });
-        return "" + chars.reduce(function (prev, curr) { return ((prev << 5) + prev) + curr; }, 5381);
+        var acc = 5381;
+        for (var i = 0; i < data.length; i++) {
+            acc = ((acc << 5) + acc) + data.charCodeAt(i);
+        }
+        return acc.toString();
     }
     ts.generateDjb2Hash = generateDjb2Hash;
     /**
@@ -4419,7 +4590,7 @@ var ts;
     }
     ts.getFileWatcherEventKind = getFileWatcherEventKind;
     /*@internal*/
-    ts.ignoredPaths = ["/node_modules/.", "/.git"];
+    ts.ignoredPaths = ["/node_modules/.", "/.git", "/.#"];
     /**
      * Watch the directory recursively using host provided method to watch child directories
      * that means if this is recursive watcher, watch the children directories as well
@@ -5005,7 +5176,7 @@ var ts;
                 }
             }
             function readDirectory(path, extensions, excludes, includes, depth) {
-                return ts.matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, process.cwd(), depth, getAccessibleFileSystemEntries);
+                return ts.matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, process.cwd(), depth, getAccessibleFileSystemEntries, realpath);
             }
             function fileSystemEntryExists(path, entryKind) {
                 try {
@@ -5191,7 +5362,7 @@ var ts;
         _0_modifier_cannot_appear_on_a_data_property: diag(1043, ts.DiagnosticCategory.Error, "_0_modifier_cannot_appear_on_a_data_property_1043", "'{0}' modifier cannot appear on a data property."),
         _0_modifier_cannot_appear_on_a_module_or_namespace_element: diag(1044, ts.DiagnosticCategory.Error, "_0_modifier_cannot_appear_on_a_module_or_namespace_element_1044", "'{0}' modifier cannot appear on a module or namespace element."),
         A_0_modifier_cannot_be_used_with_an_interface_declaration: diag(1045, ts.DiagnosticCategory.Error, "A_0_modifier_cannot_be_used_with_an_interface_declaration_1045", "A '{0}' modifier cannot be used with an interface declaration."),
-        A_declare_modifier_is_required_for_a_top_level_declaration_in_a_d_ts_file: diag(1046, ts.DiagnosticCategory.Error, "A_declare_modifier_is_required_for_a_top_level_declaration_in_a_d_ts_file_1046", "A 'declare' modifier is required for a top level declaration in a .d.ts file."),
+        Top_level_declarations_in_d_ts_files_must_start_with_either_a_declare_or_export_modifier: diag(1046, ts.DiagnosticCategory.Error, "Top_level_declarations_in_d_ts_files_must_start_with_either_a_declare_or_export_modifier_1046", "Top-level declarations in .d.ts files must start with either a 'declare' or 'export' modifier."),
         A_rest_parameter_cannot_be_optional: diag(1047, ts.DiagnosticCategory.Error, "A_rest_parameter_cannot_be_optional_1047", "A rest parameter cannot be optional."),
         A_rest_parameter_cannot_have_an_initializer: diag(1048, ts.DiagnosticCategory.Error, "A_rest_parameter_cannot_have_an_initializer_1048", "A rest parameter cannot have an initializer."),
         A_set_accessor_must_have_exactly_one_parameter: diag(1049, ts.DiagnosticCategory.Error, "A_set_accessor_must_have_exactly_one_parameter_1049", "A 'set' accessor must have exactly one parameter."),
@@ -5320,7 +5491,7 @@ var ts;
         Cannot_re_export_a_type_when_the_isolatedModules_flag_is_provided: diag(1205, ts.DiagnosticCategory.Error, "Cannot_re_export_a_type_when_the_isolatedModules_flag_is_provided_1205", "Cannot re-export a type when the '--isolatedModules' flag is provided."),
         Decorators_are_not_valid_here: diag(1206, ts.DiagnosticCategory.Error, "Decorators_are_not_valid_here_1206", "Decorators are not valid here."),
         Decorators_cannot_be_applied_to_multiple_get_Slashset_accessors_of_the_same_name: diag(1207, ts.DiagnosticCategory.Error, "Decorators_cannot_be_applied_to_multiple_get_Slashset_accessors_of_the_same_name_1207", "Decorators cannot be applied to multiple get/set accessors of the same name."),
-        Cannot_compile_namespaces_when_the_isolatedModules_flag_is_provided: diag(1208, ts.DiagnosticCategory.Error, "Cannot_compile_namespaces_when_the_isolatedModules_flag_is_provided_1208", "Cannot compile namespaces when the '--isolatedModules' flag is provided."),
+        All_files_must_be_modules_when_the_isolatedModules_flag_is_provided: diag(1208, ts.DiagnosticCategory.Error, "All_files_must_be_modules_when_the_isolatedModules_flag_is_provided_1208", "All files must be modules when the '--isolatedModules' flag is provided."),
         Invalid_use_of_0_Class_definitions_are_automatically_in_strict_mode: diag(1210, ts.DiagnosticCategory.Error, "Invalid_use_of_0_Class_definitions_are_automatically_in_strict_mode_1210", "Invalid use of '{0}'. Class definitions are automatically in strict mode."),
         A_class_declaration_without_the_default_modifier_must_have_a_name: diag(1211, ts.DiagnosticCategory.Error, "A_class_declaration_without_the_default_modifier_must_have_a_name_1211", "A class declaration without the 'default' modifier must have a name."),
         Identifier_expected_0_is_a_reserved_word_in_strict_mode: diag(1212, ts.DiagnosticCategory.Error, "Identifier_expected_0_is_a_reserved_word_in_strict_mode_1212", "Identifier expected. '{0}' is a reserved word in strict mode."),
@@ -5329,7 +5500,7 @@ var ts;
         Invalid_use_of_0_Modules_are_automatically_in_strict_mode: diag(1215, ts.DiagnosticCategory.Error, "Invalid_use_of_0_Modules_are_automatically_in_strict_mode_1215", "Invalid use of '{0}'. Modules are automatically in strict mode."),
         Identifier_expected_esModule_is_reserved_as_an_exported_marker_when_transforming_ECMAScript_modules: diag(1216, ts.DiagnosticCategory.Error, "Identifier_expected_esModule_is_reserved_as_an_exported_marker_when_transforming_ECMAScript_modules_1216", "Identifier expected. '__esModule' is reserved as an exported marker when transforming ECMAScript modules."),
         Export_assignment_is_not_supported_when_module_flag_is_system: diag(1218, ts.DiagnosticCategory.Error, "Export_assignment_is_not_supported_when_module_flag_is_system_1218", "Export assignment is not supported when '--module' flag is 'system'."),
-        Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_to_remove_this_warning: diag(1219, ts.DiagnosticCategory.Error, "Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_t_1219", "Experimental support for decorators is a feature that is subject to change in a future release. Set the 'experimentalDecorators' option to remove this warning."),
+        Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_in_your_tsconfig_or_jsconfig_to_remove_this_warning: diag(1219, ts.DiagnosticCategory.Error, "Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_t_1219", "Experimental support for decorators is a feature that is subject to change in a future release. Set the 'experimentalDecorators' option in your 'tsconfig' or 'jsconfig' to remove this warning."),
         Generators_are_only_available_when_targeting_ECMAScript_2015_or_higher: diag(1220, ts.DiagnosticCategory.Error, "Generators_are_only_available_when_targeting_ECMAScript_2015_or_higher_1220", "Generators are only available when targeting ECMAScript 2015 or higher."),
         Generators_are_not_allowed_in_an_ambient_context: diag(1221, ts.DiagnosticCategory.Error, "Generators_are_not_allowed_in_an_ambient_context_1221", "Generators are not allowed in an ambient context."),
         An_overload_signature_cannot_be_declared_as_a_generator: diag(1222, ts.DiagnosticCategory.Error, "An_overload_signature_cannot_be_declared_as_a_generator_1222", "An overload signature cannot be declared as a generator."),
@@ -5368,6 +5539,8 @@ var ts;
         A_definite_assignment_assertion_is_not_permitted_in_this_context: diag(1255, ts.DiagnosticCategory.Error, "A_definite_assignment_assertion_is_not_permitted_in_this_context_1255", "A definite assignment assertion '!' is not permitted in this context."),
         A_rest_element_must_be_last_in_a_tuple_type: diag(1256, ts.DiagnosticCategory.Error, "A_rest_element_must_be_last_in_a_tuple_type_1256", "A rest element must be last in a tuple type."),
         A_required_element_cannot_follow_an_optional_element: diag(1257, ts.DiagnosticCategory.Error, "A_required_element_cannot_follow_an_optional_element_1257", "A required element cannot follow an optional element."),
+        Definite_assignment_assertions_can_only_be_used_along_with_a_type_annotation: diag(1258, ts.DiagnosticCategory.Error, "Definite_assignment_assertions_can_only_be_used_along_with_a_type_annotation_1258", "Definite assignment assertions can only be used along with a type annotation."),
+        Module_0_can_only_be_default_imported_using_the_1_flag: diag(1259, ts.DiagnosticCategory.Error, "Module_0_can_only_be_default_imported_using_the_1_flag_1259", "Module '{0}' can only be default-imported using the '{1}' flag"),
         with_statements_are_not_allowed_in_an_async_function_block: diag(1300, ts.DiagnosticCategory.Error, "with_statements_are_not_allowed_in_an_async_function_block_1300", "'with' statements are not allowed in an async function block."),
         await_expression_is_only_allowed_within_an_async_function: diag(1308, ts.DiagnosticCategory.Error, "await_expression_is_only_allowed_within_an_async_function_1308", "'await' expression is only allowed within an async function."),
         can_only_be_used_in_an_object_literal_property_inside_a_destructuring_assignment: diag(1312, ts.DiagnosticCategory.Error, "can_only_be_used_in_an_object_literal_property_inside_a_destructuring_assignment_1312", "'=' can only be used in an object literal property inside a destructuring assignment."),
@@ -5412,7 +5585,8 @@ var ts;
         A_bigint_literal_cannot_use_exponential_notation: diag(1352, ts.DiagnosticCategory.Error, "A_bigint_literal_cannot_use_exponential_notation_1352", "A bigint literal cannot use exponential notation."),
         A_bigint_literal_must_be_an_integer: diag(1353, ts.DiagnosticCategory.Error, "A_bigint_literal_must_be_an_integer_1353", "A bigint literal must be an integer."),
         readonly_type_modifier_is_only_permitted_on_array_and_tuple_literal_types: diag(1354, ts.DiagnosticCategory.Error, "readonly_type_modifier_is_only_permitted_on_array_and_tuple_literal_types_1354", "'readonly' type modifier is only permitted on array and tuple literal types."),
-        A_const_assertion_can_only_be_applied_to_a_string_number_boolean_array_or_object_literal: diag(1355, ts.DiagnosticCategory.Error, "A_const_assertion_can_only_be_applied_to_a_string_number_boolean_array_or_object_literal_1355", "A 'const' assertion can only be applied to a string, number, boolean, array, or object literal."),
+        A_const_assertions_can_only_be_applied_to_references_to_enum_members_or_string_number_boolean_array_or_object_literals: diag(1355, ts.DiagnosticCategory.Error, "A_const_assertions_can_only_be_applied_to_references_to_enum_members_or_string_number_boolean_array__1355", "A 'const' assertions can only be applied to references to enum members, or string, number, boolean, array, or object literals."),
+        Did_you_mean_to_mark_this_function_as_async: diag(1356, ts.DiagnosticCategory.Error, "Did_you_mean_to_mark_this_function_as_async_1356", "Did you mean to mark this function as 'async'?"),
         Duplicate_identifier_0: diag(2300, ts.DiagnosticCategory.Error, "Duplicate_identifier_0_2300", "Duplicate identifier '{0}'."),
         Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor: diag(2301, ts.DiagnosticCategory.Error, "Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor_2301", "Initializer of instance member variable '{0}' cannot reference identifier '{1}' declared in the constructor."),
         Static_members_cannot_reference_class_type_parameters: diag(2302, ts.DiagnosticCategory.Error, "Static_members_cannot_reference_class_type_parameters_2302", "Static members cannot reference class type parameters."),
@@ -5462,9 +5636,9 @@ var ts;
         Call_target_does_not_contain_any_signatures: diag(2346, ts.DiagnosticCategory.Error, "Call_target_does_not_contain_any_signatures_2346", "Call target does not contain any signatures."),
         Untyped_function_calls_may_not_accept_type_arguments: diag(2347, ts.DiagnosticCategory.Error, "Untyped_function_calls_may_not_accept_type_arguments_2347", "Untyped function calls may not accept type arguments."),
         Value_of_type_0_is_not_callable_Did_you_mean_to_include_new: diag(2348, ts.DiagnosticCategory.Error, "Value_of_type_0_is_not_callable_Did_you_mean_to_include_new_2348", "Value of type '{0}' is not callable. Did you mean to include 'new'?"),
-        Cannot_invoke_an_expression_whose_type_lacks_a_call_signature_Type_0_has_no_compatible_call_signatures: diag(2349, ts.DiagnosticCategory.Error, "Cannot_invoke_an_expression_whose_type_lacks_a_call_signature_Type_0_has_no_compatible_call_signatur_2349", "Cannot invoke an expression whose type lacks a call signature. Type '{0}' has no compatible call signatures."),
+        This_expression_is_not_callable: diag(2349, ts.DiagnosticCategory.Error, "This_expression_is_not_callable_2349", "This expression is not callable."),
         Only_a_void_function_can_be_called_with_the_new_keyword: diag(2350, ts.DiagnosticCategory.Error, "Only_a_void_function_can_be_called_with_the_new_keyword_2350", "Only a void function can be called with the 'new' keyword."),
-        Cannot_use_new_with_an_expression_whose_type_lacks_a_call_or_construct_signature: diag(2351, ts.DiagnosticCategory.Error, "Cannot_use_new_with_an_expression_whose_type_lacks_a_call_or_construct_signature_2351", "Cannot use 'new' with an expression whose type lacks a call or construct signature."),
+        This_expression_is_not_constructable: diag(2351, ts.DiagnosticCategory.Error, "This_expression_is_not_constructable_2351", "This expression is not constructable."),
         Conversion_of_type_0_to_type_1_may_be_a_mistake_because_neither_type_sufficiently_overlaps_with_the_other_If_this_was_intentional_convert_the_expression_to_unknown_first: diag(2352, ts.DiagnosticCategory.Error, "Conversion_of_type_0_to_type_1_may_be_a_mistake_because_neither_type_sufficiently_overlaps_with_the__2352", "Conversion of type '{0}' to type '{1}' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first."),
         Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1: diag(2353, ts.DiagnosticCategory.Error, "Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1_2353", "Object literal may only specify known properties, and '{0}' does not exist in type '{1}'."),
         This_syntax_requires_an_imported_helper_but_module_0_cannot_be_found: diag(2354, ts.DiagnosticCategory.Error, "This_syntax_requires_an_imported_helper_but_module_0_cannot_be_found_2354", "This syntax requires an imported helper but module '{0}' cannot be found."),
@@ -5594,7 +5768,7 @@ var ts;
         The_left_hand_side_of_a_for_of_statement_must_be_a_variable_or_a_property_access: diag(2487, ts.DiagnosticCategory.Error, "The_left_hand_side_of_a_for_of_statement_must_be_a_variable_or_a_property_access_2487", "The left-hand side of a 'for...of' statement must be a variable or a property access."),
         Type_0_must_have_a_Symbol_iterator_method_that_returns_an_iterator: diag(2488, ts.DiagnosticCategory.Error, "Type_0_must_have_a_Symbol_iterator_method_that_returns_an_iterator_2488", "Type '{0}' must have a '[Symbol.iterator]()' method that returns an iterator."),
         An_iterator_must_have_a_next_method: diag(2489, ts.DiagnosticCategory.Error, "An_iterator_must_have_a_next_method_2489", "An iterator must have a 'next()' method."),
-        The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property: diag(2490, ts.DiagnosticCategory.Error, "The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property_2490", "The type returned by the 'next()' method of an iterator must have a 'value' property."),
+        The_type_returned_by_the_0_method_of_an_iterator_must_have_a_value_property: diag(2490, ts.DiagnosticCategory.Error, "The_type_returned_by_the_0_method_of_an_iterator_must_have_a_value_property_2490", "The type returned by the '{0}()' method of an iterator must have a 'value' property."),
         The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern: diag(2491, ts.DiagnosticCategory.Error, "The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern_2491", "The left-hand side of a 'for...in' statement cannot be a destructuring pattern."),
         Cannot_redeclare_identifier_0_in_catch_clause: diag(2492, ts.DiagnosticCategory.Error, "Cannot_redeclare_identifier_0_in_catch_clause_2492", "Cannot redeclare identifier '{0}' in catch clause."),
         Tuple_type_0_of_length_1_has_no_element_at_index_2: diag(2493, ts.DiagnosticCategory.Error, "Tuple_type_0_of_length_1_has_no_element_at_index_2_2493", "Tuple type '{0}' of length '{1}' has no element at index '{2}'."),
@@ -5651,7 +5825,7 @@ var ts;
         Expression_resolves_to_variable_declaration_newTarget_that_compiler_uses_to_capture_new_target_meta_property_reference: diag(2544, ts.DiagnosticCategory.Error, "Expression_resolves_to_variable_declaration_newTarget_that_compiler_uses_to_capture_new_target_meta__2544", "Expression resolves to variable declaration '_newTarget' that compiler uses to capture 'new.target' meta-property reference."),
         A_mixin_class_must_have_a_constructor_with_a_single_rest_parameter_of_type_any: diag(2545, ts.DiagnosticCategory.Error, "A_mixin_class_must_have_a_constructor_with_a_single_rest_parameter_of_type_any_2545", "A mixin class must have a constructor with a single rest parameter of type 'any[]'."),
         Property_0_has_conflicting_declarations_and_is_inaccessible_in_type_1: diag(2546, ts.DiagnosticCategory.Error, "Property_0_has_conflicting_declarations_and_is_inaccessible_in_type_1_2546", "Property '{0}' has conflicting declarations and is inaccessible in type '{1}'."),
-        The_type_returned_by_the_next_method_of_an_async_iterator_must_be_a_promise_for_a_type_with_a_value_property: diag(2547, ts.DiagnosticCategory.Error, "The_type_returned_by_the_next_method_of_an_async_iterator_must_be_a_promise_for_a_type_with_a_value__2547", "The type returned by the 'next()' method of an async iterator must be a promise for a type with a 'value' property."),
+        The_type_returned_by_the_0_method_of_an_async_iterator_must_be_a_promise_for_a_type_with_a_value_property: diag(2547, ts.DiagnosticCategory.Error, "The_type_returned_by_the_0_method_of_an_async_iterator_must_be_a_promise_for_a_type_with_a_value_pro_2547", "The type returned by the '{0}()' method of an async iterator must be a promise for a type with a 'value' property."),
         Type_0_is_not_an_array_type_or_does_not_have_a_Symbol_iterator_method_that_returns_an_iterator: diag(2548, ts.DiagnosticCategory.Error, "Type_0_is_not_an_array_type_or_does_not_have_a_Symbol_iterator_method_that_returns_an_iterator_2548", "Type '{0}' is not an array type or does not have a '[Symbol.iterator]()' method that returns an iterator."),
         Type_0_is_not_an_array_type_or_a_string_type_or_does_not_have_a_Symbol_iterator_method_that_returns_an_iterator: diag(2549, ts.DiagnosticCategory.Error, "Type_0_is_not_an_array_type_or_a_string_type_or_does_not_have_a_Symbol_iterator_method_that_returns__2549", "Type '{0}' is not an array type or a string type or does not have a '[Symbol.iterator]()' method that returns an iterator."),
         Property_0_does_not_exist_on_type_1_Did_you_mean_2: diag(2551, ts.DiagnosticCategory.Error, "Property_0_does_not_exist_on_type_1_Did_you_mean_2_2551", "Property '{0}' does not exist on type '{1}'. Did you mean '{2}'?"),
@@ -5672,7 +5846,6 @@ var ts;
         A_rest_element_cannot_have_a_property_name: diag(2566, ts.DiagnosticCategory.Error, "A_rest_element_cannot_have_a_property_name_2566", "A rest element cannot have a property name."),
         Enum_declarations_can_only_merge_with_namespace_or_other_enum_declarations: diag(2567, ts.DiagnosticCategory.Error, "Enum_declarations_can_only_merge_with_namespace_or_other_enum_declarations_2567", "Enum declarations can only merge with namespace or other enum declarations."),
         Type_0_is_not_an_array_type_or_a_string_type_Use_compiler_option_downlevelIteration_to_allow_iterating_of_iterators: diag(2569, ts.DiagnosticCategory.Error, "Type_0_is_not_an_array_type_or_a_string_type_Use_compiler_option_downlevelIteration_to_allow_iterati_2569", "Type '{0}' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators."),
-        Property_0_does_not_exist_on_type_1_Did_you_forget_to_use_await: diag(2570, ts.DiagnosticCategory.Error, "Property_0_does_not_exist_on_type_1_Did_you_forget_to_use_await_2570", "Property '{0}' does not exist on type '{1}'. Did you forget to use 'await'?"),
         Object_is_of_type_unknown: diag(2571, ts.DiagnosticCategory.Error, "Object_is_of_type_unknown_2571", "Object is of type 'unknown'."),
         Rest_signatures_are_incompatible: diag(2572, ts.DiagnosticCategory.Error, "Rest_signatures_are_incompatible_2572", "Rest signatures are incompatible."),
         Property_0_is_incompatible_with_rest_element_type: diag(2573, ts.DiagnosticCategory.Error, "Property_0_is_incompatible_with_rest_element_type_2573", "Property '{0}' is incompatible with rest element type."),
@@ -5694,6 +5867,7 @@ var ts;
         Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_node_Try_npm_i_types_Slashnode_and_then_add_node_to_the_types_field_in_your_tsconfig: diag(2591, ts.DiagnosticCategory.Error, "Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_node_Try_npm_i_types_Slashnode_and_th_2591", "Cannot find name '{0}'. Do you need to install type definitions for node? Try `npm i @types/node` and then add `node` to the types field in your tsconfig."),
         Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_jQuery_Try_npm_i_types_Slashjquery_and_then_add_jquery_to_the_types_field_in_your_tsconfig: diag(2592, ts.DiagnosticCategory.Error, "Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_jQuery_Try_npm_i_types_Slashjquery_an_2592", "Cannot find name '{0}'. Do you need to install type definitions for jQuery? Try `npm i @types/jquery` and then add `jquery` to the types field in your tsconfig."),
         Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_a_test_runner_Try_npm_i_types_Slashjest_or_npm_i_types_Slashmocha_and_then_add_jest_or_mocha_to_the_types_field_in_your_tsconfig: diag(2593, ts.DiagnosticCategory.Error, "Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_a_test_runner_Try_npm_i_types_Slashje_2593", "Cannot find name '{0}'. Do you need to install type definitions for a test runner? Try `npm i @types/jest` or `npm i @types/mocha` and then add `jest` or `mocha` to the types field in your tsconfig."),
+        This_module_is_declared_with_using_export_and_can_only_be_used_with_a_default_import_when_using_the_0_flag: diag(2594, ts.DiagnosticCategory.Error, "This_module_is_declared_with_using_export_and_can_only_be_used_with_a_default_import_when_using_the__2594", "This module is declared with using 'export =', and can only be used with a default import when using the '{0}' flag."),
         JSX_element_attributes_type_0_may_not_be_a_union_type: diag(2600, ts.DiagnosticCategory.Error, "JSX_element_attributes_type_0_may_not_be_a_union_type_2600", "JSX element attributes type '{0}' may not be a union type."),
         The_return_type_of_a_JSX_element_constructor_must_return_an_object_type: diag(2601, ts.DiagnosticCategory.Error, "The_return_type_of_a_JSX_element_constructor_must_return_an_object_type_2601", "The return type of a JSX element constructor must return an object type."),
         JSX_element_implicitly_has_type_any_because_the_global_type_JSX_Element_does_not_exist: diag(2602, ts.DiagnosticCategory.Error, "JSX_element_implicitly_has_type_any_because_the_global_type_JSX_Element_does_not_exist_2602", "JSX element implicitly has type 'any' because the global type 'JSX.Element' does not exist."),
@@ -5804,6 +5978,28 @@ var ts;
         _0_refers_to_a_value_but_is_being_used_as_a_type_here: diag(2749, ts.DiagnosticCategory.Error, "_0_refers_to_a_value_but_is_being_used_as_a_type_here_2749", "'{0}' refers to a value, but is being used as a type here."),
         The_implementation_signature_is_declared_here: diag(2750, ts.DiagnosticCategory.Error, "The_implementation_signature_is_declared_here_2750", "The implementation signature is declared here."),
         Circularity_originates_in_type_at_this_location: diag(2751, ts.DiagnosticCategory.Error, "Circularity_originates_in_type_at_this_location_2751", "Circularity originates in type at this location."),
+        The_first_export_default_is_here: diag(2752, ts.DiagnosticCategory.Error, "The_first_export_default_is_here_2752", "The first export default is here."),
+        Another_export_default_is_here: diag(2753, ts.DiagnosticCategory.Error, "Another_export_default_is_here_2753", "Another export default is here."),
+        super_may_not_use_type_arguments: diag(2754, ts.DiagnosticCategory.Error, "super_may_not_use_type_arguments_2754", "'super' may not use type arguments."),
+        No_constituent_of_type_0_is_callable: diag(2755, ts.DiagnosticCategory.Error, "No_constituent_of_type_0_is_callable_2755", "No constituent of type '{0}' is callable."),
+        Not_all_constituents_of_type_0_are_callable: diag(2756, ts.DiagnosticCategory.Error, "Not_all_constituents_of_type_0_are_callable_2756", "Not all constituents of type '{0}' are callable."),
+        Type_0_has_no_call_signatures: diag(2757, ts.DiagnosticCategory.Error, "Type_0_has_no_call_signatures_2757", "Type '{0}' has no call signatures."),
+        Each_member_of_the_union_type_0_has_signatures_but_none_of_those_signatures_are_compatible_with_each_other: diag(2758, ts.DiagnosticCategory.Error, "Each_member_of_the_union_type_0_has_signatures_but_none_of_those_signatures_are_compatible_with_each_2758", "Each member of the union type '{0}' has signatures, but none of those signatures are compatible with each other."),
+        No_constituent_of_type_0_is_constructable: diag(2759, ts.DiagnosticCategory.Error, "No_constituent_of_type_0_is_constructable_2759", "No constituent of type '{0}' is constructable."),
+        Not_all_constituents_of_type_0_are_constructable: diag(2760, ts.DiagnosticCategory.Error, "Not_all_constituents_of_type_0_are_constructable_2760", "Not all constituents of type '{0}' are constructable."),
+        Type_0_has_no_construct_signatures: diag(2761, ts.DiagnosticCategory.Error, "Type_0_has_no_construct_signatures_2761", "Type '{0}' has no construct signatures."),
+        Each_member_of_the_union_type_0_has_construct_signatures_but_none_of_those_signatures_are_compatible_with_each_other: diag(2762, ts.DiagnosticCategory.Error, "Each_member_of_the_union_type_0_has_construct_signatures_but_none_of_those_signatures_are_compatible_2762", "Each member of the union type '{0}' has construct signatures, but none of those signatures are compatible with each other."),
+        Cannot_iterate_value_because_the_next_method_of_its_iterator_expects_type_1_but_for_of_will_always_send_0: diag(2763, ts.DiagnosticCategory.Error, "Cannot_iterate_value_because_the_next_method_of_its_iterator_expects_type_1_but_for_of_will_always_s_2763", "Cannot iterate value because the 'next' method of its iterator expects type '{1}', but for-of will always send '{0}'."),
+        Cannot_iterate_value_because_the_next_method_of_its_iterator_expects_type_1_but_array_spread_will_always_send_0: diag(2764, ts.DiagnosticCategory.Error, "Cannot_iterate_value_because_the_next_method_of_its_iterator_expects_type_1_but_array_spread_will_al_2764", "Cannot iterate value because the 'next' method of its iterator expects type '{1}', but array spread will always send '{0}'."),
+        Cannot_iterate_value_because_the_next_method_of_its_iterator_expects_type_1_but_array_destructuring_will_always_send_0: diag(2765, ts.DiagnosticCategory.Error, "Cannot_iterate_value_because_the_next_method_of_its_iterator_expects_type_1_but_array_destructuring__2765", "Cannot iterate value because the 'next' method of its iterator expects type '{1}', but array destructuring will always send '{0}'."),
+        Cannot_delegate_iteration_to_value_because_the_next_method_of_its_iterator_expects_type_1_but_the_containing_generator_will_always_send_0: diag(2766, ts.DiagnosticCategory.Error, "Cannot_delegate_iteration_to_value_because_the_next_method_of_its_iterator_expects_type_1_but_the_co_2766", "Cannot delegate iteration to value because the 'next' method of its iterator expects type '{1}', but the containing generator will always send '{0}'."),
+        The_0_property_of_an_iterator_must_be_a_method: diag(2767, ts.DiagnosticCategory.Error, "The_0_property_of_an_iterator_must_be_a_method_2767", "The '{0}' property of an iterator must be a method."),
+        The_0_property_of_an_async_iterator_must_be_a_method: diag(2768, ts.DiagnosticCategory.Error, "The_0_property_of_an_async_iterator_must_be_a_method_2768", "The '{0}' property of an async iterator must be a method."),
+        No_overload_matches_this_call: diag(2769, ts.DiagnosticCategory.Error, "No_overload_matches_this_call_2769", "No overload matches this call."),
+        The_last_overload_gave_the_following_error: diag(2770, ts.DiagnosticCategory.Error, "The_last_overload_gave_the_following_error_2770", "The last overload gave the following error."),
+        The_last_overload_is_declared_here: diag(2771, ts.DiagnosticCategory.Error, "The_last_overload_is_declared_here_2771", "The last overload is declared here."),
+        Overload_0_of_1_2_gave_the_following_error: diag(2772, ts.DiagnosticCategory.Error, "Overload_0_of_1_2_gave_the_following_error_2772", "Overload {0} of {1}, '{2}', gave the following error."),
+        Did_you_forget_to_use_await: diag(2773, ts.DiagnosticCategory.Error, "Did_you_forget_to_use_await_2773", "Did you forget to use 'await'?"),
         Import_declaration_0_is_using_private_name_1: diag(4000, ts.DiagnosticCategory.Error, "Import_declaration_0_is_using_private_name_1_4000", "Import declaration '{0}' is using private name '{1}'."),
         Type_parameter_0_of_exported_class_has_or_is_using_private_name_1: diag(4002, ts.DiagnosticCategory.Error, "Type_parameter_0_of_exported_class_has_or_is_using_private_name_1_4002", "Type parameter '{0}' of exported class has or is using private name '{1}'."),
         Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1: diag(4004, ts.DiagnosticCategory.Error, "Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1_4004", "Type parameter '{0}' of exported interface has or is using private name '{1}'."),
@@ -5888,6 +6084,8 @@ var ts;
         Method_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2: diag(4101, ts.DiagnosticCategory.Error, "Method_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2_4101", "Method '{0}' of exported interface has or is using name '{1}' from private module '{2}'."),
         Method_0_of_exported_interface_has_or_is_using_private_name_1: diag(4102, ts.DiagnosticCategory.Error, "Method_0_of_exported_interface_has_or_is_using_private_name_1_4102", "Method '{0}' of exported interface has or is using private name '{1}'."),
         Type_parameter_0_of_exported_mapped_object_type_is_using_private_name_1: diag(4103, ts.DiagnosticCategory.Error, "Type_parameter_0_of_exported_mapped_object_type_is_using_private_name_1_4103", "Type parameter '{0}' of exported mapped object type is using private name '{1}'."),
+        The_type_0_is_readonly_and_cannot_be_assigned_to_the_mutable_type_1: diag(4104, ts.DiagnosticCategory.Error, "The_type_0_is_readonly_and_cannot_be_assigned_to_the_mutable_type_1_4104", "The type '{0}' is 'readonly' and cannot be assigned to the mutable type '{1}'."),
+        Private_or_protected_member_0_cannot_be_accessed_on_a_type_parameter: diag(4105, ts.DiagnosticCategory.Error, "Private_or_protected_member_0_cannot_be_accessed_on_a_type_parameter_4105", "Private or protected member '{0}' cannot be accessed on a type parameter."),
         The_current_host_does_not_support_the_0_option: diag(5001, ts.DiagnosticCategory.Error, "The_current_host_does_not_support_the_0_option_5001", "The current host does not support the '{0}' option."),
         Cannot_find_the_common_subdirectory_path_for_the_input_files: diag(5009, ts.DiagnosticCategory.Error, "Cannot_find_the_common_subdirectory_path_for_the_input_files_5009", "Cannot find the common subdirectory path for the input files."),
         File_specification_cannot_end_in_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0: diag(5010, ts.DiagnosticCategory.Error, "File_specification_cannot_end_in_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0_5010", "File specification cannot end in a recursive directory wildcard ('**'): '{0}'."),
@@ -5921,6 +6119,8 @@ var ts;
         Option_resolveJsonModule_can_only_be_specified_when_module_code_generation_is_commonjs_amd_es2015_or_esNext: diag(5071, ts.DiagnosticCategory.Error, "Option_resolveJsonModule_can_only_be_specified_when_module_code_generation_is_commonjs_amd_es2015_or_5071", "Option '--resolveJsonModule' can only be specified when module code generation is 'commonjs', 'amd', 'es2015' or 'esNext'."),
         Unknown_build_option_0: diag(5072, ts.DiagnosticCategory.Error, "Unknown_build_option_0_5072", "Unknown build option '{0}'."),
         Build_option_0_requires_a_value_of_type_1: diag(5073, ts.DiagnosticCategory.Error, "Build_option_0_requires_a_value_of_type_1_5073", "Build option '{0}' requires a value of type {1}."),
+        Option_incremental_can_only_be_specified_using_tsconfig_emitting_to_single_file_or_when_option_tsBuildInfoFile_is_specified: diag(5074, ts.DiagnosticCategory.Error, "Option_incremental_can_only_be_specified_using_tsconfig_emitting_to_single_file_or_when_option_tsBui_5074", "Option '--incremental' can only be specified using tsconfig, emitting to single file or when option `--tsBuildInfoFile` is specified."),
+        _0_is_assignable_to_the_constraint_of_type_1_but_1_could_be_instantiated_with_a_different_subtype_of_constraint_2: diag(5075, ts.DiagnosticCategory.Error, "_0_is_assignable_to_the_constraint_of_type_1_but_1_could_be_instantiated_with_a_different_subtype_of_5075", "'{0}' is assignable to the constraint of type '{1}', but '{1}' could be instantiated with a different subtype of constraint '{2}'."),
         Generates_a_sourcemap_for_each_corresponding_d_ts_file: diag(6000, ts.DiagnosticCategory.Message, "Generates_a_sourcemap_for_each_corresponding_d_ts_file_6000", "Generates a sourcemap for each corresponding '.d.ts' file."),
         Concatenate_and_emit_output_to_single_file: diag(6001, ts.DiagnosticCategory.Message, "Concatenate_and_emit_output_to_single_file_6001", "Concatenate and emit output to single file."),
         Generates_corresponding_d_ts_file: diag(6002, ts.DiagnosticCategory.Message, "Generates_corresponding_d_ts_file_6002", "Generates corresponding '.d.ts' file."),
@@ -6097,7 +6297,6 @@ var ts;
         Enable_strict_checking_of_property_initialization_in_classes: diag(6187, ts.DiagnosticCategory.Message, "Enable_strict_checking_of_property_initialization_in_classes_6187", "Enable strict checking of property initialization in classes."),
         Numeric_separators_are_not_allowed_here: diag(6188, ts.DiagnosticCategory.Error, "Numeric_separators_are_not_allowed_here_6188", "Numeric separators are not allowed here."),
         Multiple_consecutive_numeric_separators_are_not_permitted: diag(6189, ts.DiagnosticCategory.Error, "Multiple_consecutive_numeric_separators_are_not_permitted_6189", "Multiple consecutive numeric separators are not permitted."),
-        Found_package_json_at_0_Package_ID_is_1: diag(6190, ts.DiagnosticCategory.Message, "Found_package_json_at_0_Package_ID_is_1_6190", "Found 'package.json' at '{0}'. Package ID is '{1}'."),
         Whether_to_keep_outdated_console_output_in_watch_mode_instead_of_clearing_the_screen: diag(6191, ts.DiagnosticCategory.Message, "Whether_to_keep_outdated_console_output_in_watch_mode_instead_of_clearing_the_screen_6191", "Whether to keep outdated console output in watch mode instead of clearing the screen."),
         All_imports_in_import_declaration_are_unused: diag(6192, ts.DiagnosticCategory.Error, "All_imports_in_import_declaration_are_unused_6192", "All imports in import declaration are unused.", /*reportsUnnecessary*/ true),
         Found_1_error_Watching_for_file_changes: diag(6193, ts.DiagnosticCategory.Message, "Found_1_error_Watching_for_file_changes_6193", "Found 1 error. Watching for file changes."),
@@ -6124,13 +6323,16 @@ var ts;
         Using_compiler_options_of_project_reference_redirect_0: diag(6215, ts.DiagnosticCategory.Message, "Using_compiler_options_of_project_reference_redirect_0_6215", "Using compiler options of project reference redirect '{0}'."),
         Found_1_error: diag(6216, ts.DiagnosticCategory.Message, "Found_1_error_6216", "Found 1 error."),
         Found_0_errors: diag(6217, ts.DiagnosticCategory.Message, "Found_0_errors_6217", "Found {0} errors."),
+        Module_name_0_was_successfully_resolved_to_1_with_Package_ID_2: diag(6218, ts.DiagnosticCategory.Message, "Module_name_0_was_successfully_resolved_to_1_with_Package_ID_2_6218", "======== Module name '{0}' was successfully resolved to '{1}' with Package ID '{2}'. ========"),
+        Type_reference_directive_0_was_successfully_resolved_to_1_with_Package_ID_2_primary_Colon_3: diag(6219, ts.DiagnosticCategory.Message, "Type_reference_directive_0_was_successfully_resolved_to_1_with_Package_ID_2_primary_Colon_3_6219", "======== Type reference directive '{0}' was successfully resolved to '{1}' with Package ID '{2}', primary: {3}. ========"),
+        package_json_had_a_falsy_0_field: diag(6220, ts.DiagnosticCategory.Message, "package_json_had_a_falsy_0_field_6220", "'package.json' had a falsy '{0}' field."),
         Projects_to_reference: diag(6300, ts.DiagnosticCategory.Message, "Projects_to_reference_6300", "Projects to reference"),
         Enable_project_compilation: diag(6302, ts.DiagnosticCategory.Message, "Enable_project_compilation_6302", "Enable project compilation"),
         Project_references_may_not_form_a_circular_graph_Cycle_detected_Colon_0: diag(6202, ts.DiagnosticCategory.Error, "Project_references_may_not_form_a_circular_graph_Cycle_detected_Colon_0_6202", "Project references may not form a circular graph. Cycle detected: {0}"),
         Composite_projects_may_not_disable_declaration_emit: diag(6304, ts.DiagnosticCategory.Error, "Composite_projects_may_not_disable_declaration_emit_6304", "Composite projects may not disable declaration emit."),
         Output_file_0_has_not_been_built_from_source_file_1: diag(6305, ts.DiagnosticCategory.Error, "Output_file_0_has_not_been_built_from_source_file_1_6305", "Output file '{0}' has not been built from source file '{1}'."),
         Referenced_project_0_must_have_setting_composite_Colon_true: diag(6306, ts.DiagnosticCategory.Error, "Referenced_project_0_must_have_setting_composite_Colon_true_6306", "Referenced project '{0}' must have setting \"composite\": true."),
-        File_0_is_not_in_project_file_list_Projects_must_list_all_files_or_use_an_include_pattern: diag(6307, ts.DiagnosticCategory.Error, "File_0_is_not_in_project_file_list_Projects_must_list_all_files_or_use_an_include_pattern_6307", "File '{0}' is not in project file list. Projects must list all files or use an 'include' pattern."),
+        File_0_is_not_listed_within_the_file_list_of_project_1_Projects_must_list_all_files_or_use_an_include_pattern: diag(6307, ts.DiagnosticCategory.Error, "File_0_is_not_listed_within_the_file_list_of_project_1_Projects_must_list_all_files_or_use_an_includ_6307", "File '{0}' is not listed within the file list of project '{1}'. Projects must list all files or use an 'include' pattern."),
         Cannot_prepend_project_0_because_it_does_not_have_outFile_set: diag(6308, ts.DiagnosticCategory.Error, "Cannot_prepend_project_0_because_it_does_not_have_outFile_set_6308", "Cannot prepend project '{0}' because it does not have 'outFile' set"),
         Output_file_0_from_project_1_does_not_exist: diag(6309, ts.DiagnosticCategory.Error, "Output_file_0_from_project_1_does_not_exist_6309", "Output file '{0}' from project '{1}' does not exist"),
         Project_0_is_out_of_date_because_oldest_output_1_is_older_than_newest_input_2: diag(6350, ts.DiagnosticCategory.Message, "Project_0_is_out_of_date_because_oldest_output_1_is_older_than_newest_input_2_6350", "Project '{0}' is out of date because oldest output '{1}' is older than newest input '{2}'"),
@@ -6185,7 +6387,7 @@ var ts;
         _0_implicitly_has_type_any_because_it_does_not_have_a_type_annotation_and_is_referenced_directly_or_indirectly_in_its_own_initializer: diag(7022, ts.DiagnosticCategory.Error, "_0_implicitly_has_type_any_because_it_does_not_have_a_type_annotation_and_is_referenced_directly_or__7022", "'{0}' implicitly has type 'any' because it does not have a type annotation and is referenced directly or indirectly in its own initializer."),
         _0_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions: diag(7023, ts.DiagnosticCategory.Error, "_0_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_reference_7023", "'{0}' implicitly has return type 'any' because it does not have a return type annotation and is referenced directly or indirectly in one of its return expressions."),
         Function_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions: diag(7024, ts.DiagnosticCategory.Error, "Function_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_ref_7024", "Function implicitly has return type 'any' because it does not have a return type annotation and is referenced directly or indirectly in one of its return expressions."),
-        Generator_implicitly_has_type_0_because_it_does_not_yield_any_values_Consider_supplying_a_return_type: diag(7025, ts.DiagnosticCategory.Error, "Generator_implicitly_has_type_0_because_it_does_not_yield_any_values_Consider_supplying_a_return_typ_7025", "Generator implicitly has type '{0}' because it does not yield any values. Consider supplying a return type."),
+        Generator_implicitly_has_yield_type_0_because_it_does_not_yield_any_values_Consider_supplying_a_return_type_annotation: diag(7025, ts.DiagnosticCategory.Error, "Generator_implicitly_has_yield_type_0_because_it_does_not_yield_any_values_Consider_supplying_a_retu_7025", "Generator implicitly has yield type '{0}' because it does not yield any values. Consider supplying a return type annotation."),
         JSX_element_implicitly_has_type_any_because_no_interface_JSX_0_exists: diag(7026, ts.DiagnosticCategory.Error, "JSX_element_implicitly_has_type_any_because_no_interface_JSX_0_exists_7026", "JSX element implicitly has type 'any' because no interface 'JSX.{0}' exists."),
         Unreachable_code_detected: diag(7027, ts.DiagnosticCategory.Error, "Unreachable_code_detected_7027", "Unreachable code detected.", /*reportsUnnecessary*/ true),
         Unused_label: diag(7028, ts.DiagnosticCategory.Error, "Unused_label_7028", "Unused label.", /*reportsUnnecessary*/ true),
@@ -6212,6 +6414,10 @@ var ts;
         Property_0_implicitly_has_type_any_but_a_better_type_for_its_set_accessor_may_be_inferred_from_usage: diag(7049, ts.DiagnosticCategory.Suggestion, "Property_0_implicitly_has_type_any_but_a_better_type_for_its_set_accessor_may_be_inferred_from_usage_7049", "Property '{0}' implicitly has type 'any', but a better type for its set accessor may be inferred from usage."),
         _0_implicitly_has_an_1_return_type_but_a_better_type_may_be_inferred_from_usage: diag(7050, ts.DiagnosticCategory.Suggestion, "_0_implicitly_has_an_1_return_type_but_a_better_type_may_be_inferred_from_usage_7050", "'{0}' implicitly has an '{1}' return type, but a better type may be inferred from usage."),
         Parameter_has_a_name_but_no_type_Did_you_mean_0_Colon_1: diag(7051, ts.DiagnosticCategory.Error, "Parameter_has_a_name_but_no_type_Did_you_mean_0_Colon_1_7051", "Parameter has a name but no type. Did you mean '{0}: {1}'?"),
+        Element_implicitly_has_an_any_type_because_type_0_has_no_index_signature_Did_you_mean_to_call_1: diag(7052, ts.DiagnosticCategory.Error, "Element_implicitly_has_an_any_type_because_type_0_has_no_index_signature_Did_you_mean_to_call_1_7052", "Element implicitly has an 'any' type because type '{0}' has no index signature. Did you mean to call '{1}' ?"),
+        Element_implicitly_has_an_any_type_because_expression_of_type_0_can_t_be_used_to_index_type_1: diag(7053, ts.DiagnosticCategory.Error, "Element_implicitly_has_an_any_type_because_expression_of_type_0_can_t_be_used_to_index_type_1_7053", "Element implicitly has an 'any' type because expression of type '{0}' can't be used to index type '{1}'."),
+        No_index_signature_with_a_parameter_of_type_0_was_found_on_type_1: diag(7054, ts.DiagnosticCategory.Error, "No_index_signature_with_a_parameter_of_type_0_was_found_on_type_1_7054", "No index signature with a parameter of type '{0}' was found on type '{1}'."),
+        _0_which_lacks_return_type_annotation_implicitly_has_an_1_yield_type: diag(7055, ts.DiagnosticCategory.Error, "_0_which_lacks_return_type_annotation_implicitly_has_an_1_yield_type_7055", "'{0}', which lacks return-type annotation, implicitly has an '{1}' yield type."),
         You_cannot_rename_this_element: diag(8000, ts.DiagnosticCategory.Error, "You_cannot_rename_this_element_8000", "You cannot rename this element."),
         You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library: diag(8001, ts.DiagnosticCategory.Error, "You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library_8001", "You cannot rename elements that are defined in the standard TypeScript library."),
         import_can_only_be_used_in_a_ts_file: diag(8002, ts.DiagnosticCategory.Error, "import_can_only_be_used_in_a_ts_file_8002", "'import ... =' can only be used in a .ts file."),
@@ -6275,6 +6481,7 @@ var ts;
         JSDoc_types_may_be_moved_to_TypeScript_types: diag(80004, ts.DiagnosticCategory.Suggestion, "JSDoc_types_may_be_moved_to_TypeScript_types_80004", "JSDoc types may be moved to TypeScript types."),
         require_call_may_be_converted_to_an_import: diag(80005, ts.DiagnosticCategory.Suggestion, "require_call_may_be_converted_to_an_import_80005", "'require' call may be converted to an import."),
         This_may_be_converted_to_an_async_function: diag(80006, ts.DiagnosticCategory.Suggestion, "This_may_be_converted_to_an_async_function_80006", "This may be converted to an async function."),
+        await_has_no_effect_on_the_type_of_this_expression: diag(80007, ts.DiagnosticCategory.Suggestion, "await_has_no_effect_on_the_type_of_this_expression_80007", "'await' has no effect on the type of this expression."),
         Add_missing_super_call: diag(90001, ts.DiagnosticCategory.Message, "Add_missing_super_call_90001", "Add missing 'super()' call"),
         Make_super_call_the_first_statement_in_the_constructor: diag(90002, ts.DiagnosticCategory.Message, "Make_super_call_the_first_statement_in_the_constructor_90002", "Make 'super()' call the first statement in the constructor"),
         Change_extends_to_implements: diag(90003, ts.DiagnosticCategory.Message, "Change_extends_to_implements_90003", "Change 'extends' to 'implements'"),
@@ -6373,15 +6580,28 @@ var ts;
         Add_all_missing_imports: diag(95064, ts.DiagnosticCategory.Message, "Add_all_missing_imports_95064", "Add all missing imports"),
         Convert_to_async_function: diag(95065, ts.DiagnosticCategory.Message, "Convert_to_async_function_95065", "Convert to async function"),
         Convert_all_to_async_functions: diag(95066, ts.DiagnosticCategory.Message, "Convert_all_to_async_functions_95066", "Convert all to async functions"),
-        Generate_types_for_0: diag(95067, ts.DiagnosticCategory.Message, "Generate_types_for_0_95067", "Generate types for '{0}'"),
-        Generate_types_for_all_packages_without_types: diag(95068, ts.DiagnosticCategory.Message, "Generate_types_for_all_packages_without_types_95068", "Generate types for all packages without types"),
         Add_unknown_conversion_for_non_overlapping_types: diag(95069, ts.DiagnosticCategory.Message, "Add_unknown_conversion_for_non_overlapping_types_95069", "Add 'unknown' conversion for non-overlapping types"),
         Add_unknown_to_all_conversions_of_non_overlapping_types: diag(95070, ts.DiagnosticCategory.Message, "Add_unknown_to_all_conversions_of_non_overlapping_types_95070", "Add 'unknown' to all conversions of non-overlapping types"),
         Add_missing_new_operator_to_call: diag(95071, ts.DiagnosticCategory.Message, "Add_missing_new_operator_to_call_95071", "Add missing 'new' operator to call"),
         Add_missing_new_operator_to_all_calls: diag(95072, ts.DiagnosticCategory.Message, "Add_missing_new_operator_to_all_calls_95072", "Add missing 'new' operator to all calls"),
         Add_names_to_all_parameters_without_names: diag(95073, ts.DiagnosticCategory.Message, "Add_names_to_all_parameters_without_names_95073", "Add names to all parameters without names"),
         Enable_the_experimentalDecorators_option_in_your_configuration_file: diag(95074, ts.DiagnosticCategory.Message, "Enable_the_experimentalDecorators_option_in_your_configuration_file_95074", "Enable the 'experimentalDecorators' option in your configuration file"),
-        Convert_to_named_parameters: diag(95075, ts.DiagnosticCategory.Message, "Convert_to_named_parameters_95075", "Convert to named parameters"),
+        Convert_parameters_to_destructured_object: diag(95075, ts.DiagnosticCategory.Message, "Convert_parameters_to_destructured_object_95075", "Convert parameters to destructured object"),
+        Allow_accessing_UMD_globals_from_modules: diag(95076, ts.DiagnosticCategory.Message, "Allow_accessing_UMD_globals_from_modules_95076", "Allow accessing UMD globals from modules."),
+        Extract_type: diag(95077, ts.DiagnosticCategory.Message, "Extract_type_95077", "Extract type"),
+        Extract_to_type_alias: diag(95078, ts.DiagnosticCategory.Message, "Extract_to_type_alias_95078", "Extract to type alias"),
+        Extract_to_typedef: diag(95079, ts.DiagnosticCategory.Message, "Extract_to_typedef_95079", "Extract to typedef"),
+        Infer_this_type_of_0_from_usage: diag(95080, ts.DiagnosticCategory.Message, "Infer_this_type_of_0_from_usage_95080", "Infer 'this' type of '{0}' from usage"),
+        Add_const_to_unresolved_variable: diag(95081, ts.DiagnosticCategory.Message, "Add_const_to_unresolved_variable_95081", "Add 'const' to unresolved variable"),
+        Add_const_to_all_unresolved_variables: diag(95082, ts.DiagnosticCategory.Message, "Add_const_to_all_unresolved_variables_95082", "Add 'const' to all unresolved variables"),
+        Add_await: diag(95083, ts.DiagnosticCategory.Message, "Add_await_95083", "Add 'await'"),
+        Add_await_to_initializer_for_0: diag(95084, ts.DiagnosticCategory.Message, "Add_await_to_initializer_for_0_95084", "Add 'await' to initializer for '{0}'"),
+        Fix_all_expressions_possibly_missing_await: diag(95085, ts.DiagnosticCategory.Message, "Fix_all_expressions_possibly_missing_await_95085", "Fix all expressions possibly missing 'await'"),
+        Remove_unnecessary_await: diag(95086, ts.DiagnosticCategory.Message, "Remove_unnecessary_await_95086", "Remove unnecessary 'await'"),
+        Remove_all_unnecessary_uses_of_await: diag(95087, ts.DiagnosticCategory.Message, "Remove_all_unnecessary_uses_of_await_95087", "Remove all unnecessary uses of 'await'"),
+        No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer: diag(18004, ts.DiagnosticCategory.Error, "No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer_18004", "No value exists in scope for the shorthand property '{0}'. Either declare one or provide an initializer."),
+        Classes_may_not_have_a_field_named_constructor: diag(18006, ts.DiagnosticCategory.Error, "Classes_may_not_have_a_field_named_constructor_18006", "Classes may not have a field named 'constructor'."),
+        JSX_expressions_may_not_use_the_comma_operator_Did_you_mean_to_write_an_array: diag(18007, ts.DiagnosticCategory.Error, "JSX_expressions_may_not_use_the_comma_operator_Did_you_mean_to_write_an_array_18007", "JSX expressions may not use the comma operator. Did you mean to write an array?"),
     };
 })(ts || (ts = {}));
 var ts;
@@ -6389,7 +6609,7 @@ var ts;
     var _a;
     /* @internal */
     function tokenIsIdentifierOrKeyword(token) {
-        return token >= 72 /* Identifier */;
+        return token >= 73 /* Identifier */;
     }
     ts.tokenIsIdentifierOrKeyword = tokenIsIdentifierOrKeyword;
     /* @internal */
@@ -6398,85 +6618,85 @@ var ts;
     }
     ts.tokenIsIdentifierOrKeywordOrGreaterThan = tokenIsIdentifierOrKeywordOrGreaterThan;
     var textToKeywordObj = (_a = {
-            abstract: 118 /* AbstractKeyword */,
-            any: 120 /* AnyKeyword */,
-            as: 119 /* AsKeyword */,
-            bigint: 146 /* BigIntKeyword */,
-            boolean: 123 /* BooleanKeyword */,
-            break: 73 /* BreakKeyword */,
-            case: 74 /* CaseKeyword */,
-            catch: 75 /* CatchKeyword */,
-            class: 76 /* ClassKeyword */,
-            continue: 78 /* ContinueKeyword */,
-            const: 77 /* ConstKeyword */
+            abstract: 119 /* AbstractKeyword */,
+            any: 121 /* AnyKeyword */,
+            as: 120 /* AsKeyword */,
+            bigint: 147 /* BigIntKeyword */,
+            boolean: 124 /* BooleanKeyword */,
+            break: 74 /* BreakKeyword */,
+            case: 75 /* CaseKeyword */,
+            catch: 76 /* CatchKeyword */,
+            class: 77 /* ClassKeyword */,
+            continue: 79 /* ContinueKeyword */,
+            const: 78 /* ConstKeyword */
         },
-        _a["" + "constructor"] = 124 /* ConstructorKeyword */,
-        _a.debugger = 79 /* DebuggerKeyword */,
-        _a.declare = 125 /* DeclareKeyword */,
-        _a.default = 80 /* DefaultKeyword */,
-        _a.delete = 81 /* DeleteKeyword */,
-        _a.do = 82 /* DoKeyword */,
-        _a.else = 83 /* ElseKeyword */,
-        _a.enum = 84 /* EnumKeyword */,
-        _a.export = 85 /* ExportKeyword */,
-        _a.extends = 86 /* ExtendsKeyword */,
-        _a.false = 87 /* FalseKeyword */,
-        _a.finally = 88 /* FinallyKeyword */,
-        _a.for = 89 /* ForKeyword */,
-        _a.from = 144 /* FromKeyword */,
-        _a.function = 90 /* FunctionKeyword */,
-        _a.get = 126 /* GetKeyword */,
-        _a.if = 91 /* IfKeyword */,
-        _a.implements = 109 /* ImplementsKeyword */,
-        _a.import = 92 /* ImportKeyword */,
-        _a.in = 93 /* InKeyword */,
-        _a.infer = 127 /* InferKeyword */,
-        _a.instanceof = 94 /* InstanceOfKeyword */,
-        _a.interface = 110 /* InterfaceKeyword */,
-        _a.is = 128 /* IsKeyword */,
-        _a.keyof = 129 /* KeyOfKeyword */,
-        _a.let = 111 /* LetKeyword */,
-        _a.module = 130 /* ModuleKeyword */,
-        _a.namespace = 131 /* NamespaceKeyword */,
-        _a.never = 132 /* NeverKeyword */,
-        _a.new = 95 /* NewKeyword */,
-        _a.null = 96 /* NullKeyword */,
-        _a.number = 135 /* NumberKeyword */,
-        _a.object = 136 /* ObjectKeyword */,
-        _a.package = 112 /* PackageKeyword */,
-        _a.private = 113 /* PrivateKeyword */,
-        _a.protected = 114 /* ProtectedKeyword */,
-        _a.public = 115 /* PublicKeyword */,
-        _a.readonly = 133 /* ReadonlyKeyword */,
-        _a.require = 134 /* RequireKeyword */,
-        _a.global = 145 /* GlobalKeyword */,
-        _a.return = 97 /* ReturnKeyword */,
-        _a.set = 137 /* SetKeyword */,
-        _a.static = 116 /* StaticKeyword */,
-        _a.string = 138 /* StringKeyword */,
-        _a.super = 98 /* SuperKeyword */,
-        _a.switch = 99 /* SwitchKeyword */,
-        _a.symbol = 139 /* SymbolKeyword */,
-        _a.this = 100 /* ThisKeyword */,
-        _a.throw = 101 /* ThrowKeyword */,
-        _a.true = 102 /* TrueKeyword */,
-        _a.try = 103 /* TryKeyword */,
-        _a.type = 140 /* TypeKeyword */,
-        _a.typeof = 104 /* TypeOfKeyword */,
-        _a.undefined = 141 /* UndefinedKeyword */,
-        _a.unique = 142 /* UniqueKeyword */,
-        _a.unknown = 143 /* UnknownKeyword */,
-        _a.var = 105 /* VarKeyword */,
-        _a.void = 106 /* VoidKeyword */,
-        _a.while = 107 /* WhileKeyword */,
-        _a.with = 108 /* WithKeyword */,
-        _a.yield = 117 /* YieldKeyword */,
-        _a.async = 121 /* AsyncKeyword */,
-        _a.await = 122 /* AwaitKeyword */,
-        _a.of = 147 /* OfKeyword */,
+        _a["" + "constructor"] = 125 /* ConstructorKeyword */,
+        _a.debugger = 80 /* DebuggerKeyword */,
+        _a.declare = 126 /* DeclareKeyword */,
+        _a.default = 81 /* DefaultKeyword */,
+        _a.delete = 82 /* DeleteKeyword */,
+        _a.do = 83 /* DoKeyword */,
+        _a.else = 84 /* ElseKeyword */,
+        _a.enum = 85 /* EnumKeyword */,
+        _a.export = 86 /* ExportKeyword */,
+        _a.extends = 87 /* ExtendsKeyword */,
+        _a.false = 88 /* FalseKeyword */,
+        _a.finally = 89 /* FinallyKeyword */,
+        _a.for = 90 /* ForKeyword */,
+        _a.from = 145 /* FromKeyword */,
+        _a.function = 91 /* FunctionKeyword */,
+        _a.get = 127 /* GetKeyword */,
+        _a.if = 92 /* IfKeyword */,
+        _a.implements = 110 /* ImplementsKeyword */,
+        _a.import = 93 /* ImportKeyword */,
+        _a.in = 94 /* InKeyword */,
+        _a.infer = 128 /* InferKeyword */,
+        _a.instanceof = 95 /* InstanceOfKeyword */,
+        _a.interface = 111 /* InterfaceKeyword */,
+        _a.is = 129 /* IsKeyword */,
+        _a.keyof = 130 /* KeyOfKeyword */,
+        _a.let = 112 /* LetKeyword */,
+        _a.module = 131 /* ModuleKeyword */,
+        _a.namespace = 132 /* NamespaceKeyword */,
+        _a.never = 133 /* NeverKeyword */,
+        _a.new = 96 /* NewKeyword */,
+        _a.null = 97 /* NullKeyword */,
+        _a.number = 136 /* NumberKeyword */,
+        _a.object = 137 /* ObjectKeyword */,
+        _a.package = 113 /* PackageKeyword */,
+        _a.private = 114 /* PrivateKeyword */,
+        _a.protected = 115 /* ProtectedKeyword */,
+        _a.public = 116 /* PublicKeyword */,
+        _a.readonly = 134 /* ReadonlyKeyword */,
+        _a.require = 135 /* RequireKeyword */,
+        _a.global = 146 /* GlobalKeyword */,
+        _a.return = 98 /* ReturnKeyword */,
+        _a.set = 138 /* SetKeyword */,
+        _a.static = 117 /* StaticKeyword */,
+        _a.string = 139 /* StringKeyword */,
+        _a.super = 99 /* SuperKeyword */,
+        _a.switch = 100 /* SwitchKeyword */,
+        _a.symbol = 140 /* SymbolKeyword */,
+        _a.this = 101 /* ThisKeyword */,
+        _a.throw = 102 /* ThrowKeyword */,
+        _a.true = 103 /* TrueKeyword */,
+        _a.try = 104 /* TryKeyword */,
+        _a.type = 141 /* TypeKeyword */,
+        _a.typeof = 105 /* TypeOfKeyword */,
+        _a.undefined = 142 /* UndefinedKeyword */,
+        _a.unique = 143 /* UniqueKeyword */,
+        _a.unknown = 144 /* UnknownKeyword */,
+        _a.var = 106 /* VarKeyword */,
+        _a.void = 107 /* VoidKeyword */,
+        _a.while = 108 /* WhileKeyword */,
+        _a.with = 109 /* WithKeyword */,
+        _a.yield = 118 /* YieldKeyword */,
+        _a.async = 122 /* AsyncKeyword */,
+        _a.await = 123 /* AwaitKeyword */,
+        _a.of = 148 /* OfKeyword */,
         _a);
     var textToKeyword = ts.createMapFromTemplate(textToKeywordObj);
-    var textToToken = ts.createMapFromTemplate(__assign({}, textToKeywordObj, { "{": 18 /* OpenBraceToken */, "}": 19 /* CloseBraceToken */, "(": 20 /* OpenParenToken */, ")": 21 /* CloseParenToken */, "[": 22 /* OpenBracketToken */, "]": 23 /* CloseBracketToken */, ".": 24 /* DotToken */, "...": 25 /* DotDotDotToken */, ";": 26 /* SemicolonToken */, ",": 27 /* CommaToken */, "<": 28 /* LessThanToken */, ">": 30 /* GreaterThanToken */, "<=": 31 /* LessThanEqualsToken */, ">=": 32 /* GreaterThanEqualsToken */, "==": 33 /* EqualsEqualsToken */, "!=": 34 /* ExclamationEqualsToken */, "===": 35 /* EqualsEqualsEqualsToken */, "!==": 36 /* ExclamationEqualsEqualsToken */, "=>": 37 /* EqualsGreaterThanToken */, "+": 38 /* PlusToken */, "-": 39 /* MinusToken */, "**": 41 /* AsteriskAsteriskToken */, "*": 40 /* AsteriskToken */, "/": 42 /* SlashToken */, "%": 43 /* PercentToken */, "++": 44 /* PlusPlusToken */, "--": 45 /* MinusMinusToken */, "<<": 46 /* LessThanLessThanToken */, "</": 29 /* LessThanSlashToken */, ">>": 47 /* GreaterThanGreaterThanToken */, ">>>": 48 /* GreaterThanGreaterThanGreaterThanToken */, "&": 49 /* AmpersandToken */, "|": 50 /* BarToken */, "^": 51 /* CaretToken */, "!": 52 /* ExclamationToken */, "~": 53 /* TildeToken */, "&&": 54 /* AmpersandAmpersandToken */, "||": 55 /* BarBarToken */, "?": 56 /* QuestionToken */, ":": 57 /* ColonToken */, "=": 59 /* EqualsToken */, "+=": 60 /* PlusEqualsToken */, "-=": 61 /* MinusEqualsToken */, "*=": 62 /* AsteriskEqualsToken */, "**=": 63 /* AsteriskAsteriskEqualsToken */, "/=": 64 /* SlashEqualsToken */, "%=": 65 /* PercentEqualsToken */, "<<=": 66 /* LessThanLessThanEqualsToken */, ">>=": 67 /* GreaterThanGreaterThanEqualsToken */, ">>>=": 68 /* GreaterThanGreaterThanGreaterThanEqualsToken */, "&=": 69 /* AmpersandEqualsToken */, "|=": 70 /* BarEqualsToken */, "^=": 71 /* CaretEqualsToken */, "@": 58 /* AtToken */ }));
+    var textToToken = ts.createMapFromTemplate(__assign({}, textToKeywordObj, { "{": 18 /* OpenBraceToken */, "}": 19 /* CloseBraceToken */, "(": 20 /* OpenParenToken */, ")": 21 /* CloseParenToken */, "[": 22 /* OpenBracketToken */, "]": 23 /* CloseBracketToken */, ".": 24 /* DotToken */, "...": 25 /* DotDotDotToken */, ";": 26 /* SemicolonToken */, ",": 27 /* CommaToken */, "<": 28 /* LessThanToken */, ">": 30 /* GreaterThanToken */, "<=": 31 /* LessThanEqualsToken */, ">=": 32 /* GreaterThanEqualsToken */, "==": 33 /* EqualsEqualsToken */, "!=": 34 /* ExclamationEqualsToken */, "===": 35 /* EqualsEqualsEqualsToken */, "!==": 36 /* ExclamationEqualsEqualsToken */, "=>": 37 /* EqualsGreaterThanToken */, "+": 38 /* PlusToken */, "-": 39 /* MinusToken */, "**": 41 /* AsteriskAsteriskToken */, "*": 40 /* AsteriskToken */, "/": 42 /* SlashToken */, "%": 43 /* PercentToken */, "++": 44 /* PlusPlusToken */, "--": 45 /* MinusMinusToken */, "<<": 46 /* LessThanLessThanToken */, "</": 29 /* LessThanSlashToken */, ">>": 47 /* GreaterThanGreaterThanToken */, ">>>": 48 /* GreaterThanGreaterThanGreaterThanToken */, "&": 49 /* AmpersandToken */, "|": 50 /* BarToken */, "^": 51 /* CaretToken */, "!": 52 /* ExclamationToken */, "~": 53 /* TildeToken */, "&&": 54 /* AmpersandAmpersandToken */, "||": 55 /* BarBarToken */, "?": 56 /* QuestionToken */, ":": 57 /* ColonToken */, "=": 60 /* EqualsToken */, "+=": 61 /* PlusEqualsToken */, "-=": 62 /* MinusEqualsToken */, "*=": 63 /* AsteriskEqualsToken */, "**=": 64 /* AsteriskAsteriskEqualsToken */, "/=": 65 /* SlashEqualsToken */, "%=": 66 /* PercentEqualsToken */, "<<=": 67 /* LessThanLessThanEqualsToken */, ">>=": 68 /* GreaterThanGreaterThanEqualsToken */, ">>>=": 69 /* GreaterThanGreaterThanGreaterThanEqualsToken */, "&=": 70 /* AmpersandEqualsToken */, "|=": 71 /* BarEqualsToken */, "^=": 72 /* CaretEqualsToken */, "@": 58 /* AtToken */, "`": 59 /* BacktickToken */ }));
     /*
         As per ECMAScript Language Specification 3th Edition, Section 7.6: Identifiers
         IdentifierStart ::
@@ -7090,8 +7310,8 @@ var ts;
             getTokenValue: function () { return tokenValue; },
             hasExtendedUnicodeEscape: function () { return (tokenFlags & 8 /* ExtendedUnicodeEscape */) !== 0; },
             hasPrecedingLineBreak: function () { return (tokenFlags & 1 /* PrecedingLineBreak */) !== 0; },
-            isIdentifier: function () { return token === 72 /* Identifier */ || token > 108 /* LastReservedWord */; },
-            isReservedWord: function () { return token >= 73 /* FirstReservedWord */ && token <= 108 /* LastReservedWord */; },
+            isIdentifier: function () { return token === 73 /* Identifier */ || token > 109 /* LastReservedWord */; },
+            isReservedWord: function () { return token >= 74 /* FirstReservedWord */ && token <= 109 /* LastReservedWord */; },
             isUnterminated: function () { return (tokenFlags & 4 /* Unterminated */) !== 0; },
             getTokenFlags: function () { return tokenFlags; },
             reScanGreaterToken: reScanGreaterToken,
@@ -7102,7 +7322,7 @@ var ts;
             reScanJsxToken: reScanJsxToken,
             reScanLessThanToken: reScanLessThanToken,
             scanJsxToken: scanJsxToken,
-            scanJSDocToken: scanJSDocToken,
+            scanJsDocToken: scanJsDocToken,
             scan: scan,
             getText: getText,
             setText: setText,
@@ -7542,7 +7762,7 @@ var ts;
                     }
                 }
             }
-            return token = 72 /* Identifier */;
+            return token = 73 /* Identifier */;
         }
         function scanBinaryOrOctalDigits(base) {
             var value = "";
@@ -7691,7 +7911,7 @@ var ts;
                         return token = scanTemplateAndSetTokenValue();
                     case 37 /* percent */:
                         if (text.charCodeAt(pos + 1) === 61 /* equals */) {
-                            return pos += 2, token = 65 /* PercentEqualsToken */;
+                            return pos += 2, token = 66 /* PercentEqualsToken */;
                         }
                         pos++;
                         return token = 43 /* PercentToken */;
@@ -7700,7 +7920,7 @@ var ts;
                             return pos += 2, token = 54 /* AmpersandAmpersandToken */;
                         }
                         if (text.charCodeAt(pos + 1) === 61 /* equals */) {
-                            return pos += 2, token = 69 /* AmpersandEqualsToken */;
+                            return pos += 2, token = 70 /* AmpersandEqualsToken */;
                         }
                         pos++;
                         return token = 49 /* AmpersandToken */;
@@ -7712,11 +7932,11 @@ var ts;
                         return token = 21 /* CloseParenToken */;
                     case 42 /* asterisk */:
                         if (text.charCodeAt(pos + 1) === 61 /* equals */) {
-                            return pos += 2, token = 62 /* AsteriskEqualsToken */;
+                            return pos += 2, token = 63 /* AsteriskEqualsToken */;
                         }
                         if (text.charCodeAt(pos + 1) === 42 /* asterisk */) {
                             if (text.charCodeAt(pos + 2) === 61 /* equals */) {
-                                return pos += 3, token = 63 /* AsteriskAsteriskEqualsToken */;
+                                return pos += 3, token = 64 /* AsteriskAsteriskEqualsToken */;
                             }
                             return pos += 2, token = 41 /* AsteriskAsteriskToken */;
                         }
@@ -7732,7 +7952,7 @@ var ts;
                             return pos += 2, token = 44 /* PlusPlusToken */;
                         }
                         if (text.charCodeAt(pos + 1) === 61 /* equals */) {
-                            return pos += 2, token = 60 /* PlusEqualsToken */;
+                            return pos += 2, token = 61 /* PlusEqualsToken */;
                         }
                         pos++;
                         return token = 38 /* PlusToken */;
@@ -7744,7 +7964,7 @@ var ts;
                             return pos += 2, token = 45 /* MinusMinusToken */;
                         }
                         if (text.charCodeAt(pos + 1) === 61 /* equals */) {
-                            return pos += 2, token = 61 /* MinusEqualsToken */;
+                            return pos += 2, token = 62 /* MinusEqualsToken */;
                         }
                         pos++;
                         return token = 39 /* MinusToken */;
@@ -7808,7 +8028,7 @@ var ts;
                             }
                         }
                         if (text.charCodeAt(pos + 1) === 61 /* equals */) {
-                            return pos += 2, token = 64 /* SlashEqualsToken */;
+                            return pos += 2, token = 65 /* SlashEqualsToken */;
                         }
                         pos++;
                         return token = 42 /* SlashToken */;
@@ -7885,7 +8105,7 @@ var ts;
                         }
                         if (text.charCodeAt(pos + 1) === 60 /* lessThan */) {
                             if (text.charCodeAt(pos + 2) === 61 /* equals */) {
-                                return pos += 3, token = 66 /* LessThanLessThanEqualsToken */;
+                                return pos += 3, token = 67 /* LessThanLessThanEqualsToken */;
                             }
                             return pos += 2, token = 46 /* LessThanLessThanToken */;
                         }
@@ -7919,7 +8139,7 @@ var ts;
                             return pos += 2, token = 37 /* EqualsGreaterThanToken */;
                         }
                         pos++;
-                        return token = 59 /* EqualsToken */;
+                        return token = 60 /* EqualsToken */;
                     case 62 /* greaterThan */:
                         if (isConflictMarkerTrivia(text, pos)) {
                             pos = scanConflictMarkerTrivia(text, pos, error);
@@ -7943,7 +8163,7 @@ var ts;
                         return token = 23 /* CloseBracketToken */;
                     case 94 /* caret */:
                         if (text.charCodeAt(pos + 1) === 61 /* equals */) {
-                            return pos += 2, token = 71 /* CaretEqualsToken */;
+                            return pos += 2, token = 72 /* CaretEqualsToken */;
                         }
                         pos++;
                         return token = 51 /* CaretToken */;
@@ -7964,7 +8184,7 @@ var ts;
                             return pos += 2, token = 55 /* BarBarToken */;
                         }
                         if (text.charCodeAt(pos + 1) === 61 /* equals */) {
-                            return pos += 2, token = 70 /* BarEqualsToken */;
+                            return pos += 2, token = 71 /* BarEqualsToken */;
                         }
                         pos++;
                         return token = 50 /* BarToken */;
@@ -8018,12 +8238,12 @@ var ts;
                 if (text.charCodeAt(pos) === 62 /* greaterThan */) {
                     if (text.charCodeAt(pos + 1) === 62 /* greaterThan */) {
                         if (text.charCodeAt(pos + 2) === 61 /* equals */) {
-                            return pos += 3, token = 68 /* GreaterThanGreaterThanGreaterThanEqualsToken */;
+                            return pos += 3, token = 69 /* GreaterThanGreaterThanGreaterThanEqualsToken */;
                         }
                         return pos += 2, token = 48 /* GreaterThanGreaterThanGreaterThanToken */;
                     }
                     if (text.charCodeAt(pos + 1) === 61 /* equals */) {
-                        return pos += 2, token = 67 /* GreaterThanGreaterThanEqualsToken */;
+                        return pos += 2, token = 68 /* GreaterThanGreaterThanEqualsToken */;
                     }
                     pos++;
                     return token = 47 /* GreaterThanGreaterThanToken */;
@@ -8036,7 +8256,7 @@ var ts;
             return token;
         }
         function reScanSlashToken() {
-            if (token === 42 /* SlashToken */ || token === 64 /* SlashEqualsToken */) {
+            if (token === 42 /* SlashToken */ || token === 65 /* SlashEqualsToken */) {
                 var p = tokenPos + 1;
                 var inEscape = false;
                 var inCharacterClass = false;
@@ -8152,6 +8372,7 @@ var ts;
                 }
                 pos++;
             }
+            tokenValue = text.substring(startPos, pos);
             return firstNonWhitespace === -1 ? 12 /* JsxTextAllWhiteSpaces */ : 11 /* JsxText */;
         }
         // Scans a JSX identifier; these differ from normal identifiers in that
@@ -8184,7 +8405,7 @@ var ts;
                     return scan();
             }
         }
-        function scanJSDocToken() {
+        function scanJsDocToken() {
             startPos = tokenPos = pos;
             tokenFlags = 0;
             if (pos >= end) {
@@ -8219,22 +8440,19 @@ var ts;
                     return token = 23 /* CloseBracketToken */;
                 case 60 /* lessThan */:
                     return token = 28 /* LessThanToken */;
+                case 62 /* greaterThan */:
+                    return token = 30 /* GreaterThanToken */;
                 case 61 /* equals */:
-                    return token = 59 /* EqualsToken */;
+                    return token = 60 /* EqualsToken */;
                 case 44 /* comma */:
                     return token = 27 /* CommaToken */;
                 case 46 /* dot */:
                     return token = 24 /* DotToken */;
                 case 96 /* backtick */:
-                    while (pos < end && text.charCodeAt(pos) !== 96 /* backtick */) {
-                        pos++;
-                    }
-                    tokenValue = text.substring(tokenPos + 1, pos);
-                    pos++;
-                    return token = 14 /* NoSubstitutionTemplateLiteral */;
+                    return token = 59 /* BacktickToken */;
             }
-            if (isIdentifierStart(ch, 7 /* Latest */)) {
-                while (isIdentifierPart(text.charCodeAt(pos), 7 /* Latest */) && pos < end) {
+            if (isIdentifierStart(ch, 99 /* Latest */)) {
+                while (isIdentifierPart(text.charCodeAt(pos), 99 /* Latest */) && pos < end) {
                     pos++;
                 }
                 tokenValue = text.substring(tokenPos, pos);
@@ -8419,11 +8637,16 @@ var ts;
     }
     ts.toPath = toPath;
     function changesAffectModuleResolution(oldOptions, newOptions) {
-        return oldOptions.configFilePath !== newOptions.configFilePath || ts.moduleResolutionOptionDeclarations.some(function (o) {
+        return oldOptions.configFilePath !== newOptions.configFilePath ||
+            optionsHaveModuleResolutionChanges(oldOptions, newOptions);
+    }
+    ts.changesAffectModuleResolution = changesAffectModuleResolution;
+    function optionsHaveModuleResolutionChanges(oldOptions, newOptions) {
+        return ts.moduleResolutionOptionDeclarations.some(function (o) {
             return !ts.isJsonEqual(ts.getCompilerOptionValue(oldOptions, o), ts.getCompilerOptionValue(newOptions, o));
         });
     }
-    ts.changesAffectModuleResolution = changesAffectModuleResolution;
+    ts.optionsHaveModuleResolutionChanges = optionsHaveModuleResolutionChanges;
     function findAncestor(node, callback) {
         while (node) {
             var result = callback(node);
@@ -8452,10 +8675,9 @@ var ts;
     }
     ts.forEachAncestor = forEachAncestor;
     function forEachEntry(map, callback) {
-        var _a;
         var iterator = map.entries();
-        for (var _b = iterator.next(), pair = _b.value, done = _b.done; !done; _a = iterator.next(), pair = _a.value, done = _a.done, _a) {
-            var key = pair[0], value = pair[1];
+        for (var iterResult = iterator.next(); !iterResult.done; iterResult = iterator.next()) {
+            var _a = iterResult.value, key = _a[0], value = _a[1];
             var result = callback(value, key);
             if (result) {
                 return result;
@@ -8465,10 +8687,9 @@ var ts;
     }
     ts.forEachEntry = forEachEntry;
     function forEachKey(map, callback) {
-        var _a;
         var iterator = map.keys();
-        for (var _b = iterator.next(), key = _b.value, done = _b.done; !done; _a = iterator.next(), key = _a.value, done = _a.done, _a) {
-            var result = callback(key);
+        for (var iterResult = iterator.next(); !iterResult.done; iterResult = iterator.next()) {
+            var result = callback(iterResult.value);
             if (result) {
                 return result;
             }
@@ -8592,7 +8813,7 @@ var ts;
         }
     }
     function getSourceFileOfNode(node) {
-        while (node && node.kind !== 284 /* SourceFile */) {
+        while (node && node.kind !== 285 /* SourceFile */) {
             node = node.parent;
         }
         return node;
@@ -8600,11 +8821,11 @@ var ts;
     ts.getSourceFileOfNode = getSourceFileOfNode;
     function isStatementWithLocals(node) {
         switch (node.kind) {
-            case 218 /* Block */:
-            case 246 /* CaseBlock */:
-            case 225 /* ForStatement */:
-            case 226 /* ForInStatement */:
-            case 227 /* ForOfStatement */:
+            case 219 /* Block */:
+            case 247 /* CaseBlock */:
+            case 226 /* ForStatement */:
+            case 227 /* ForInStatement */:
+            case 228 /* ForOfStatement */:
                 return true;
         }
         return false;
@@ -8772,7 +8993,7 @@ var ts;
         // the syntax list itself considers them as normal trivia. Therefore if we simply skip
         // trivia for the list, we may have skipped the JSDocComment as well. So we should process its
         // first child to determine the actual position of its first token.
-        if (node.kind === 311 /* SyntaxList */ && node._children.length > 0) {
+        if (node.kind === 313 /* SyntaxList */ && node._children.length > 0) {
             return getTokenPosOfNode(node._children[0], sourceFile, includeJsDoc);
         }
         return ts.skipTrivia((sourceFile || getSourceFileOfNode(node)).text, node.pos);
@@ -8791,7 +9012,7 @@ var ts;
     }
     ts.getSourceTextOfNodeFromSourceFile = getSourceTextOfNodeFromSourceFile;
     function isJSDocTypeExpressionOrChild(node) {
-        return node.kind === 288 /* JSDocTypeExpression */ || (node.parent && isJSDocTypeExpressionOrChild(node.parent));
+        return node.kind === 289 /* JSDocTypeExpression */ || (node.parent && isJSDocTypeExpressionOrChild(node.parent));
     }
     function getTextOfNodeFromSourceText(sourceText, node, includeTrivia) {
         if (includeTrivia === void 0) { includeTrivia = false; }
@@ -8883,7 +9104,7 @@ var ts;
     ts.isBlockOrCatchScoped = isBlockOrCatchScoped;
     function isCatchClauseVariableDeclarationOrBindingElement(declaration) {
         var node = getRootDeclaration(declaration);
-        return node.kind === 237 /* VariableDeclaration */ && node.parent.kind === 274 /* CatchClause */;
+        return node.kind === 238 /* VariableDeclaration */ && node.parent.kind === 275 /* CatchClause */;
     }
     ts.isCatchClauseVariableDeclarationOrBindingElement = isCatchClauseVariableDeclarationOrBindingElement;
     function isAmbientModule(node) {
@@ -8915,11 +9136,11 @@ var ts;
     ts.isShorthandAmbientModuleSymbol = isShorthandAmbientModuleSymbol;
     function isShorthandAmbientModule(node) {
         // The only kind of module that can be missing a body is a shorthand ambient module.
-        return node && node.kind === 244 /* ModuleDeclaration */ && (!node.body);
+        return node && node.kind === 245 /* ModuleDeclaration */ && (!node.body);
     }
     function isBlockScopedContainerTopLevel(node) {
-        return node.kind === 284 /* SourceFile */ ||
-            node.kind === 244 /* ModuleDeclaration */ ||
+        return node.kind === 285 /* SourceFile */ ||
+            node.kind === 245 /* ModuleDeclaration */ ||
             ts.isFunctionLike(node);
     }
     ts.isBlockScopedContainerTopLevel = isBlockScopedContainerTopLevel;
@@ -8936,9 +9157,9 @@ var ts;
         // - defined in the top level scope and source file is an external module
         // - defined inside ambient module declaration located in the top level scope and source file not an external module
         switch (node.parent.kind) {
-            case 284 /* SourceFile */:
+            case 285 /* SourceFile */:
                 return ts.isExternalModule(node.parent);
-            case 245 /* ModuleBlock */:
+            case 246 /* ModuleBlock */:
                 return isAmbientModule(node.parent.parent) && ts.isSourceFile(node.parent.parent.parent) && !ts.isExternalModule(node.parent.parent.parent);
         }
         return false;
@@ -8954,22 +9175,22 @@ var ts;
     ts.isEffectiveExternalModule = isEffectiveExternalModule;
     function isBlockScope(node, parentNode) {
         switch (node.kind) {
-            case 284 /* SourceFile */:
-            case 246 /* CaseBlock */:
-            case 274 /* CatchClause */:
-            case 244 /* ModuleDeclaration */:
-            case 225 /* ForStatement */:
-            case 226 /* ForInStatement */:
-            case 227 /* ForOfStatement */:
-            case 157 /* Constructor */:
-            case 156 /* MethodDeclaration */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
-            case 239 /* FunctionDeclaration */:
-            case 196 /* FunctionExpression */:
-            case 197 /* ArrowFunction */:
+            case 285 /* SourceFile */:
+            case 247 /* CaseBlock */:
+            case 275 /* CatchClause */:
+            case 245 /* ModuleDeclaration */:
+            case 226 /* ForStatement */:
+            case 227 /* ForInStatement */:
+            case 228 /* ForOfStatement */:
+            case 158 /* Constructor */:
+            case 157 /* MethodDeclaration */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
+            case 240 /* FunctionDeclaration */:
+            case 197 /* FunctionExpression */:
+            case 198 /* ArrowFunction */:
                 return true;
-            case 218 /* Block */:
+            case 219 /* Block */:
                 // function block is not considered block-scope container
                 // see comment in binder.ts: bind(...), case for SyntaxKind.Block
                 return !ts.isFunctionLike(parentNode);
@@ -8979,9 +9200,9 @@ var ts;
     ts.isBlockScope = isBlockScope;
     function isDeclarationWithTypeParameters(node) {
         switch (node.kind) {
-            case 302 /* JSDocCallbackTag */:
-            case 309 /* JSDocTypedefTag */:
-            case 298 /* JSDocSignature */:
+            case 304 /* JSDocCallbackTag */:
+            case 311 /* JSDocTypedefTag */:
+            case 299 /* JSDocSignature */:
                 return true;
             default:
                 ts.assertType(node);
@@ -8991,25 +9212,25 @@ var ts;
     ts.isDeclarationWithTypeParameters = isDeclarationWithTypeParameters;
     function isDeclarationWithTypeParameterChildren(node) {
         switch (node.kind) {
-            case 160 /* CallSignature */:
-            case 161 /* ConstructSignature */:
-            case 155 /* MethodSignature */:
-            case 162 /* IndexSignature */:
-            case 165 /* FunctionType */:
-            case 166 /* ConstructorType */:
-            case 294 /* JSDocFunctionType */:
-            case 240 /* ClassDeclaration */:
-            case 209 /* ClassExpression */:
-            case 241 /* InterfaceDeclaration */:
-            case 242 /* TypeAliasDeclaration */:
-            case 308 /* JSDocTemplateTag */:
-            case 239 /* FunctionDeclaration */:
-            case 156 /* MethodDeclaration */:
-            case 157 /* Constructor */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
-            case 196 /* FunctionExpression */:
-            case 197 /* ArrowFunction */:
+            case 161 /* CallSignature */:
+            case 162 /* ConstructSignature */:
+            case 156 /* MethodSignature */:
+            case 163 /* IndexSignature */:
+            case 166 /* FunctionType */:
+            case 167 /* ConstructorType */:
+            case 295 /* JSDocFunctionType */:
+            case 241 /* ClassDeclaration */:
+            case 210 /* ClassExpression */:
+            case 242 /* InterfaceDeclaration */:
+            case 243 /* TypeAliasDeclaration */:
+            case 310 /* JSDocTemplateTag */:
+            case 240 /* FunctionDeclaration */:
+            case 157 /* MethodDeclaration */:
+            case 158 /* Constructor */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
+            case 197 /* FunctionExpression */:
+            case 198 /* ArrowFunction */:
                 return true;
             default:
                 ts.assertType(node);
@@ -9019,8 +9240,8 @@ var ts;
     ts.isDeclarationWithTypeParameterChildren = isDeclarationWithTypeParameterChildren;
     function isAnyImportSyntax(node) {
         switch (node.kind) {
-            case 249 /* ImportDeclaration */:
-            case 248 /* ImportEqualsDeclaration */:
+            case 250 /* ImportDeclaration */:
+            case 249 /* ImportEqualsDeclaration */:
                 return true;
             default:
                 return false;
@@ -9029,15 +9250,15 @@ var ts;
     ts.isAnyImportSyntax = isAnyImportSyntax;
     function isLateVisibilityPaintedStatement(node) {
         switch (node.kind) {
-            case 249 /* ImportDeclaration */:
-            case 248 /* ImportEqualsDeclaration */:
-            case 219 /* VariableStatement */:
-            case 240 /* ClassDeclaration */:
-            case 239 /* FunctionDeclaration */:
-            case 244 /* ModuleDeclaration */:
-            case 242 /* TypeAliasDeclaration */:
-            case 241 /* InterfaceDeclaration */:
-            case 243 /* EnumDeclaration */:
+            case 250 /* ImportDeclaration */:
+            case 249 /* ImportEqualsDeclaration */:
+            case 220 /* VariableStatement */:
+            case 241 /* ClassDeclaration */:
+            case 240 /* FunctionDeclaration */:
+            case 245 /* ModuleDeclaration */:
+            case 243 /* TypeAliasDeclaration */:
+            case 242 /* InterfaceDeclaration */:
+            case 244 /* EnumDeclaration */:
                 return true;
             default:
                 return false;
@@ -9067,13 +9288,13 @@ var ts;
     ts.getNameFromIndexInfo = getNameFromIndexInfo;
     function getTextOfPropertyName(name) {
         switch (name.kind) {
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 return name.escapedText;
             case 10 /* StringLiteral */:
             case 8 /* NumericLiteral */:
             case 14 /* NoSubstitutionTemplateLiteral */:
                 return ts.escapeLeadingUnderscores(name.text);
-            case 149 /* ComputedPropertyName */:
+            case 150 /* ComputedPropertyName */:
                 if (isStringOrNumericLiteralLike(name.expression))
                     return ts.escapeLeadingUnderscores(name.expression.text);
                 return ts.Debug.fail("Text of property name cannot be read from non-literal-valued ComputedPropertyNames");
@@ -9084,11 +9305,11 @@ var ts;
     ts.getTextOfPropertyName = getTextOfPropertyName;
     function entityNameToString(name) {
         switch (name.kind) {
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 return getFullWidth(name) === 0 ? ts.idText(name) : getTextOfNode(name);
-            case 148 /* QualifiedName */:
+            case 149 /* QualifiedName */:
                 return entityNameToString(name.left) + "." + entityNameToString(name.right);
-            case 189 /* PropertyAccessExpression */:
+            case 190 /* PropertyAccessExpression */:
                 return entityNameToString(name.expression) + "." + entityNameToString(name.name);
             default:
                 throw ts.Debug.assertNever(name);
@@ -9133,7 +9354,7 @@ var ts;
     ts.getSpanOfTokenAtPosition = getSpanOfTokenAtPosition;
     function getErrorSpanForArrowFunction(sourceFile, node) {
         var pos = ts.skipTrivia(sourceFile.text, node.pos);
-        if (node.body && node.body.kind === 218 /* Block */) {
+        if (node.body && node.body.kind === 219 /* Block */) {
             var startLine = ts.getLineAndCharacterOfPosition(sourceFile, node.body.pos).line;
             var endLine = ts.getLineAndCharacterOfPosition(sourceFile, node.body.end).line;
             if (startLine < endLine) {
@@ -9147,7 +9368,7 @@ var ts;
     function getErrorSpanForNode(sourceFile, node) {
         var errorNode = node;
         switch (node.kind) {
-            case 284 /* SourceFile */:
+            case 285 /* SourceFile */:
                 var pos_1 = ts.skipTrivia(sourceFile.text, 0, /*stopAfterLineBreak*/ false);
                 if (pos_1 === sourceFile.text.length) {
                     // file is empty - return span for the beginning of the file
@@ -9156,25 +9377,25 @@ var ts;
                 return getSpanOfTokenAtPosition(sourceFile, pos_1);
             // This list is a work in progress. Add missing node kinds to improve their error
             // spans.
-            case 237 /* VariableDeclaration */:
-            case 186 /* BindingElement */:
-            case 240 /* ClassDeclaration */:
-            case 209 /* ClassExpression */:
-            case 241 /* InterfaceDeclaration */:
-            case 244 /* ModuleDeclaration */:
-            case 243 /* EnumDeclaration */:
-            case 278 /* EnumMember */:
-            case 239 /* FunctionDeclaration */:
-            case 196 /* FunctionExpression */:
-            case 156 /* MethodDeclaration */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
-            case 242 /* TypeAliasDeclaration */:
-            case 154 /* PropertyDeclaration */:
-            case 153 /* PropertySignature */:
+            case 238 /* VariableDeclaration */:
+            case 187 /* BindingElement */:
+            case 241 /* ClassDeclaration */:
+            case 210 /* ClassExpression */:
+            case 242 /* InterfaceDeclaration */:
+            case 245 /* ModuleDeclaration */:
+            case 244 /* EnumDeclaration */:
+            case 279 /* EnumMember */:
+            case 240 /* FunctionDeclaration */:
+            case 197 /* FunctionExpression */:
+            case 157 /* MethodDeclaration */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
+            case 243 /* TypeAliasDeclaration */:
+            case 155 /* PropertyDeclaration */:
+            case 154 /* PropertySignature */:
                 errorNode = node.name;
                 break;
-            case 197 /* ArrowFunction */:
+            case 198 /* ArrowFunction */:
                 return getErrorSpanForArrowFunction(sourceFile, node);
         }
         if (errorNode === undefined) {
@@ -9223,11 +9444,11 @@ var ts;
     }
     ts.isLet = isLet;
     function isSuperCall(n) {
-        return n.kind === 191 /* CallExpression */ && n.expression.kind === 98 /* SuperKeyword */;
+        return n.kind === 192 /* CallExpression */ && n.expression.kind === 99 /* SuperKeyword */;
     }
     ts.isSuperCall = isSuperCall;
     function isImportCall(n) {
-        return n.kind === 191 /* CallExpression */ && n.expression.kind === 92 /* ImportKeyword */;
+        return n.kind === 192 /* CallExpression */ && n.expression.kind === 93 /* ImportKeyword */;
     }
     ts.isImportCall = isImportCall;
     function isLiteralImportTypeNode(n) {
@@ -9235,7 +9456,7 @@ var ts;
     }
     ts.isLiteralImportTypeNode = isLiteralImportTypeNode;
     function isPrologueDirective(node) {
-        return node.kind === 221 /* ExpressionStatement */
+        return node.kind === 222 /* ExpressionStatement */
             && node.expression.kind === 10 /* StringLiteral */;
     }
     ts.isPrologueDirective = isPrologueDirective;
@@ -9244,11 +9465,11 @@ var ts;
     }
     ts.getLeadingCommentRangesOfNode = getLeadingCommentRangesOfNode;
     function getJSDocCommentRanges(node, text) {
-        var commentRanges = (node.kind === 151 /* Parameter */ ||
-            node.kind === 150 /* TypeParameter */ ||
-            node.kind === 196 /* FunctionExpression */ ||
-            node.kind === 197 /* ArrowFunction */ ||
-            node.kind === 195 /* ParenthesizedExpression */) ?
+        var commentRanges = (node.kind === 152 /* Parameter */ ||
+            node.kind === 151 /* TypeParameter */ ||
+            node.kind === 197 /* FunctionExpression */ ||
+            node.kind === 198 /* ArrowFunction */ ||
+            node.kind === 196 /* ParenthesizedExpression */) ?
             ts.concatenate(ts.getTrailingCommentRanges(text, node.pos), ts.getLeadingCommentRanges(text, node.pos)) :
             ts.getLeadingCommentRanges(text, node.pos);
         // True if the comment starts with '/**' but not if it is '/**/'
@@ -9264,48 +9485,48 @@ var ts;
     ts.fullTripleSlashAMDReferencePathRegEx = /^(\/\/\/\s*<amd-dependency\s+path\s*=\s*)('|")(.+?)\2.*?\/>/;
     var defaultLibReferenceRegEx = /^(\/\/\/\s*<reference\s+no-default-lib\s*=\s*)('|")(.+?)\2\s*\/>/;
     function isPartOfTypeNode(node) {
-        if (163 /* FirstTypeNode */ <= node.kind && node.kind <= 183 /* LastTypeNode */) {
+        if (164 /* FirstTypeNode */ <= node.kind && node.kind <= 184 /* LastTypeNode */) {
             return true;
         }
         switch (node.kind) {
-            case 120 /* AnyKeyword */:
-            case 143 /* UnknownKeyword */:
-            case 135 /* NumberKeyword */:
-            case 146 /* BigIntKeyword */:
-            case 138 /* StringKeyword */:
-            case 123 /* BooleanKeyword */:
-            case 139 /* SymbolKeyword */:
-            case 136 /* ObjectKeyword */:
-            case 141 /* UndefinedKeyword */:
-            case 132 /* NeverKeyword */:
+            case 121 /* AnyKeyword */:
+            case 144 /* UnknownKeyword */:
+            case 136 /* NumberKeyword */:
+            case 147 /* BigIntKeyword */:
+            case 139 /* StringKeyword */:
+            case 124 /* BooleanKeyword */:
+            case 140 /* SymbolKeyword */:
+            case 137 /* ObjectKeyword */:
+            case 142 /* UndefinedKeyword */:
+            case 133 /* NeverKeyword */:
                 return true;
-            case 106 /* VoidKeyword */:
-                return node.parent.kind !== 200 /* VoidExpression */;
-            case 211 /* ExpressionWithTypeArguments */:
+            case 107 /* VoidKeyword */:
+                return node.parent.kind !== 201 /* VoidExpression */;
+            case 212 /* ExpressionWithTypeArguments */:
                 return !isExpressionWithTypeArgumentsInClassExtendsClause(node);
-            case 150 /* TypeParameter */:
-                return node.parent.kind === 181 /* MappedType */ || node.parent.kind === 176 /* InferType */;
+            case 151 /* TypeParameter */:
+                return node.parent.kind === 182 /* MappedType */ || node.parent.kind === 177 /* InferType */;
             // Identifiers and qualified names may be type nodes, depending on their context. Climb
             // above them to find the lowest container
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 // If the identifier is the RHS of a qualified name, then it's a type iff its parent is.
-                if (node.parent.kind === 148 /* QualifiedName */ && node.parent.right === node) {
+                if (node.parent.kind === 149 /* QualifiedName */ && node.parent.right === node) {
                     node = node.parent;
                 }
-                else if (node.parent.kind === 189 /* PropertyAccessExpression */ && node.parent.name === node) {
+                else if (node.parent.kind === 190 /* PropertyAccessExpression */ && node.parent.name === node) {
                     node = node.parent;
                 }
                 // At this point, node is either a qualified name or an identifier
-                ts.Debug.assert(node.kind === 72 /* Identifier */ || node.kind === 148 /* QualifiedName */ || node.kind === 189 /* PropertyAccessExpression */, "'node' was expected to be a qualified name, identifier or property access in 'isPartOfTypeNode'.");
+                ts.Debug.assert(node.kind === 73 /* Identifier */ || node.kind === 149 /* QualifiedName */ || node.kind === 190 /* PropertyAccessExpression */, "'node' was expected to be a qualified name, identifier or property access in 'isPartOfTypeNode'.");
             // falls through
-            case 148 /* QualifiedName */:
-            case 189 /* PropertyAccessExpression */:
-            case 100 /* ThisKeyword */: {
+            case 149 /* QualifiedName */:
+            case 190 /* PropertyAccessExpression */:
+            case 101 /* ThisKeyword */: {
                 var parent = node.parent;
-                if (parent.kind === 167 /* TypeQuery */) {
+                if (parent.kind === 168 /* TypeQuery */) {
                     return false;
                 }
-                if (parent.kind === 183 /* ImportType */) {
+                if (parent.kind === 184 /* ImportType */) {
                     return !parent.isTypeOf;
                 }
                 // Do not recursively call isPartOfTypeNode on the parent. In the example:
@@ -9314,40 +9535,40 @@ var ts;
                 //
                 // Calling isPartOfTypeNode would consider the qualified name A.B a type node.
                 // Only C and A.B.C are type nodes.
-                if (163 /* FirstTypeNode */ <= parent.kind && parent.kind <= 183 /* LastTypeNode */) {
+                if (164 /* FirstTypeNode */ <= parent.kind && parent.kind <= 184 /* LastTypeNode */) {
                     return true;
                 }
                 switch (parent.kind) {
-                    case 211 /* ExpressionWithTypeArguments */:
+                    case 212 /* ExpressionWithTypeArguments */:
                         return !isExpressionWithTypeArgumentsInClassExtendsClause(parent);
-                    case 150 /* TypeParameter */:
+                    case 151 /* TypeParameter */:
                         return node === parent.constraint;
-                    case 308 /* JSDocTemplateTag */:
+                    case 310 /* JSDocTemplateTag */:
                         return node === parent.constraint;
-                    case 154 /* PropertyDeclaration */:
-                    case 153 /* PropertySignature */:
-                    case 151 /* Parameter */:
-                    case 237 /* VariableDeclaration */:
+                    case 155 /* PropertyDeclaration */:
+                    case 154 /* PropertySignature */:
+                    case 152 /* Parameter */:
+                    case 238 /* VariableDeclaration */:
                         return node === parent.type;
-                    case 239 /* FunctionDeclaration */:
-                    case 196 /* FunctionExpression */:
-                    case 197 /* ArrowFunction */:
-                    case 157 /* Constructor */:
-                    case 156 /* MethodDeclaration */:
-                    case 155 /* MethodSignature */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
+                    case 240 /* FunctionDeclaration */:
+                    case 197 /* FunctionExpression */:
+                    case 198 /* ArrowFunction */:
+                    case 158 /* Constructor */:
+                    case 157 /* MethodDeclaration */:
+                    case 156 /* MethodSignature */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
                         return node === parent.type;
-                    case 160 /* CallSignature */:
-                    case 161 /* ConstructSignature */:
-                    case 162 /* IndexSignature */:
+                    case 161 /* CallSignature */:
+                    case 162 /* ConstructSignature */:
+                    case 163 /* IndexSignature */:
                         return node === parent.type;
-                    case 194 /* TypeAssertionExpression */:
+                    case 195 /* TypeAssertionExpression */:
                         return node === parent.type;
-                    case 191 /* CallExpression */:
-                    case 192 /* NewExpression */:
+                    case 192 /* CallExpression */:
+                    case 193 /* NewExpression */:
                         return ts.contains(parent.typeArguments, node);
-                    case 193 /* TaggedTemplateExpression */:
+                    case 194 /* TaggedTemplateExpression */:
                         // TODO (drosen): TaggedTemplateExpressions may eventually support type arguments.
                         return false;
                 }
@@ -9372,23 +9593,23 @@ var ts;
         return traverse(body);
         function traverse(node) {
             switch (node.kind) {
-                case 230 /* ReturnStatement */:
+                case 231 /* ReturnStatement */:
                     return visitor(node);
-                case 246 /* CaseBlock */:
-                case 218 /* Block */:
-                case 222 /* IfStatement */:
-                case 223 /* DoStatement */:
-                case 224 /* WhileStatement */:
-                case 225 /* ForStatement */:
-                case 226 /* ForInStatement */:
-                case 227 /* ForOfStatement */:
-                case 231 /* WithStatement */:
-                case 232 /* SwitchStatement */:
-                case 271 /* CaseClause */:
-                case 272 /* DefaultClause */:
-                case 233 /* LabeledStatement */:
-                case 235 /* TryStatement */:
-                case 274 /* CatchClause */:
+                case 247 /* CaseBlock */:
+                case 219 /* Block */:
+                case 223 /* IfStatement */:
+                case 224 /* DoStatement */:
+                case 225 /* WhileStatement */:
+                case 226 /* ForStatement */:
+                case 227 /* ForInStatement */:
+                case 228 /* ForOfStatement */:
+                case 232 /* WithStatement */:
+                case 233 /* SwitchStatement */:
+                case 272 /* CaseClause */:
+                case 273 /* DefaultClause */:
+                case 234 /* LabeledStatement */:
+                case 236 /* TryStatement */:
+                case 275 /* CatchClause */:
                     return ts.forEachChild(node, traverse);
             }
         }
@@ -9398,26 +9619,26 @@ var ts;
         return traverse(body);
         function traverse(node) {
             switch (node.kind) {
-                case 207 /* YieldExpression */:
+                case 208 /* YieldExpression */:
                     visitor(node);
                     var operand = node.expression;
                     if (operand) {
                         traverse(operand);
                     }
                     return;
-                case 243 /* EnumDeclaration */:
-                case 241 /* InterfaceDeclaration */:
-                case 244 /* ModuleDeclaration */:
-                case 242 /* TypeAliasDeclaration */:
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
+                case 244 /* EnumDeclaration */:
+                case 242 /* InterfaceDeclaration */:
+                case 245 /* ModuleDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
                     // These are not allowed inside a generator now, but eventually they may be allowed
                     // as local types. Regardless, any yield statements contained within them should be
                     // skipped in this traversal.
                     return;
                 default:
                     if (ts.isFunctionLike(node)) {
-                        if (node.name && node.name.kind === 149 /* ComputedPropertyName */) {
+                        if (node.name && node.name.kind === 150 /* ComputedPropertyName */) {
                             // Note that we will not include methods/accessors of a class because they would require
                             // first descending into the class. This is by design.
                             traverse(node.name.expression);
@@ -9440,10 +9661,10 @@ var ts;
      * @param node The type node.
      */
     function getRestParameterElementType(node) {
-        if (node && node.kind === 169 /* ArrayType */) {
+        if (node && node.kind === 170 /* ArrayType */) {
             return node.elementType;
         }
-        else if (node && node.kind === 164 /* TypeReference */) {
+        else if (node && node.kind === 165 /* TypeReference */) {
             return ts.singleOrUndefined(node.typeArguments);
         }
         else {
@@ -9453,12 +9674,12 @@ var ts;
     ts.getRestParameterElementType = getRestParameterElementType;
     function getMembersOfDeclaration(node) {
         switch (node.kind) {
-            case 241 /* InterfaceDeclaration */:
-            case 240 /* ClassDeclaration */:
-            case 209 /* ClassExpression */:
-            case 168 /* TypeLiteral */:
+            case 242 /* InterfaceDeclaration */:
+            case 241 /* ClassDeclaration */:
+            case 210 /* ClassExpression */:
+            case 169 /* TypeLiteral */:
                 return node.members;
-            case 188 /* ObjectLiteralExpression */:
+            case 189 /* ObjectLiteralExpression */:
                 return node.properties;
         }
     }
@@ -9466,14 +9687,14 @@ var ts;
     function isVariableLike(node) {
         if (node) {
             switch (node.kind) {
-                case 186 /* BindingElement */:
-                case 278 /* EnumMember */:
-                case 151 /* Parameter */:
-                case 275 /* PropertyAssignment */:
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
-                case 276 /* ShorthandPropertyAssignment */:
-                case 237 /* VariableDeclaration */:
+                case 187 /* BindingElement */:
+                case 279 /* EnumMember */:
+                case 152 /* Parameter */:
+                case 276 /* PropertyAssignment */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
+                case 277 /* ShorthandPropertyAssignment */:
+                case 238 /* VariableDeclaration */:
                     return true;
             }
         }
@@ -9485,8 +9706,8 @@ var ts;
     }
     ts.isVariableLikeOrAccessor = isVariableLikeOrAccessor;
     function isVariableDeclarationInVariableStatement(node) {
-        return node.parent.kind === 238 /* VariableDeclarationList */
-            && node.parent.parent.kind === 219 /* VariableStatement */;
+        return node.parent.kind === 239 /* VariableDeclarationList */
+            && node.parent.parent.kind === 220 /* VariableStatement */;
     }
     ts.isVariableDeclarationInVariableStatement = isVariableDeclarationInVariableStatement;
     function isValidESSymbolDeclaration(node) {
@@ -9497,13 +9718,13 @@ var ts;
     ts.isValidESSymbolDeclaration = isValidESSymbolDeclaration;
     function introducesArgumentsExoticObject(node) {
         switch (node.kind) {
-            case 156 /* MethodDeclaration */:
-            case 155 /* MethodSignature */:
-            case 157 /* Constructor */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
-            case 239 /* FunctionDeclaration */:
-            case 196 /* FunctionExpression */:
+            case 157 /* MethodDeclaration */:
+            case 156 /* MethodSignature */:
+            case 158 /* Constructor */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
+            case 240 /* FunctionDeclaration */:
+            case 197 /* FunctionExpression */:
                 return true;
         }
         return false;
@@ -9514,7 +9735,7 @@ var ts;
             if (beforeUnwrapLabelCallback) {
                 beforeUnwrapLabelCallback(node);
             }
-            if (node.statement.kind !== 233 /* LabeledStatement */) {
+            if (node.statement.kind !== 234 /* LabeledStatement */) {
                 return node.statement;
             }
             node = node.statement;
@@ -9522,17 +9743,17 @@ var ts;
     }
     ts.unwrapInnermostStatementOfLabel = unwrapInnermostStatementOfLabel;
     function isFunctionBlock(node) {
-        return node && node.kind === 218 /* Block */ && ts.isFunctionLike(node.parent);
+        return node && node.kind === 219 /* Block */ && ts.isFunctionLike(node.parent);
     }
     ts.isFunctionBlock = isFunctionBlock;
     function isObjectLiteralMethod(node) {
-        return node && node.kind === 156 /* MethodDeclaration */ && node.parent.kind === 188 /* ObjectLiteralExpression */;
+        return node && node.kind === 157 /* MethodDeclaration */ && node.parent.kind === 189 /* ObjectLiteralExpression */;
     }
     ts.isObjectLiteralMethod = isObjectLiteralMethod;
     function isObjectLiteralOrClassExpressionMethod(node) {
-        return node.kind === 156 /* MethodDeclaration */ &&
-            (node.parent.kind === 188 /* ObjectLiteralExpression */ ||
-                node.parent.kind === 209 /* ClassExpression */);
+        return node.kind === 157 /* MethodDeclaration */ &&
+            (node.parent.kind === 189 /* ObjectLiteralExpression */ ||
+                node.parent.kind === 210 /* ClassExpression */);
     }
     ts.isObjectLiteralOrClassExpressionMethod = isObjectLiteralOrClassExpressionMethod;
     function isIdentifierTypePredicate(predicate) {
@@ -9545,7 +9766,7 @@ var ts;
     ts.isThisTypePredicate = isThisTypePredicate;
     function getPropertyAssignment(objectLiteral, key, key2) {
         return objectLiteral.properties.filter(function (property) {
-            if (property.kind === 275 /* PropertyAssignment */) {
+            if (property.kind === 276 /* PropertyAssignment */) {
                 var propName = getTextOfPropertyName(property.name);
                 return key === propName || (!!key2 && key2 === propName);
             }
@@ -9577,19 +9798,23 @@ var ts;
         return findAncestor(node.parent, ts.isFunctionLike);
     }
     ts.getContainingFunction = getContainingFunction;
+    function getContainingFunctionDeclaration(node) {
+        return findAncestor(node.parent, ts.isFunctionLikeDeclaration);
+    }
+    ts.getContainingFunctionDeclaration = getContainingFunctionDeclaration;
     function getContainingClass(node) {
         return findAncestor(node.parent, ts.isClassLike);
     }
     ts.getContainingClass = getContainingClass;
     function getThisContainer(node, includeArrowFunctions) {
-        ts.Debug.assert(node.kind !== 284 /* SourceFile */);
+        ts.Debug.assert(node.kind !== 285 /* SourceFile */);
         while (true) {
             node = node.parent;
             if (!node) {
                 return ts.Debug.fail(); // If we never pass in a SourceFile, this should be unreachable, since we'll stop when we reach that.
             }
             switch (node.kind) {
-                case 149 /* ComputedPropertyName */:
+                case 150 /* ComputedPropertyName */:
                     // If the grandparent node is an object literal (as opposed to a class),
                     // then the computed property is not a 'this' container.
                     // A computed property name in a class needs to be a this container
@@ -9604,9 +9829,9 @@ var ts;
                     // the *body* of the container.
                     node = node.parent;
                     break;
-                case 152 /* Decorator */:
+                case 153 /* Decorator */:
                     // Decorators are always applied outside of the body of a class or method.
-                    if (node.parent.kind === 151 /* Parameter */ && ts.isClassElement(node.parent.parent)) {
+                    if (node.parent.kind === 152 /* Parameter */ && ts.isClassElement(node.parent.parent)) {
                         // If the decorator's parent is a Parameter, we resolve the this container from
                         // the grandparent class declaration.
                         node = node.parent.parent;
@@ -9617,26 +9842,26 @@ var ts;
                         node = node.parent;
                     }
                     break;
-                case 197 /* ArrowFunction */:
+                case 198 /* ArrowFunction */:
                     if (!includeArrowFunctions) {
                         continue;
                     }
                 // falls through
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
-                case 244 /* ModuleDeclaration */:
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
-                case 157 /* Constructor */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
-                case 160 /* CallSignature */:
-                case 161 /* ConstructSignature */:
-                case 162 /* IndexSignature */:
-                case 243 /* EnumDeclaration */:
-                case 284 /* SourceFile */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 245 /* ModuleDeclaration */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
+                case 158 /* Constructor */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
+                case 161 /* CallSignature */:
+                case 162 /* ConstructSignature */:
+                case 163 /* IndexSignature */:
+                case 244 /* EnumDeclaration */:
+                case 285 /* SourceFile */:
                     return node;
             }
         }
@@ -9646,9 +9871,9 @@ var ts;
         var container = getThisContainer(node, /*includeArrowFunctions*/ false);
         if (container) {
             switch (container.kind) {
-                case 157 /* Constructor */:
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
+                case 158 /* Constructor */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
                     return container;
             }
         }
@@ -9670,27 +9895,27 @@ var ts;
                 return node;
             }
             switch (node.kind) {
-                case 149 /* ComputedPropertyName */:
+                case 150 /* ComputedPropertyName */:
                     node = node.parent;
                     break;
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
                     if (!stopOnFunctions) {
                         continue;
                     }
                 // falls through
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
-                case 157 /* Constructor */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
+                case 158 /* Constructor */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     return node;
-                case 152 /* Decorator */:
+                case 153 /* Decorator */:
                     // Decorators are always applied outside of the body of a class or method.
-                    if (node.parent.kind === 151 /* Parameter */ && ts.isClassElement(node.parent.parent)) {
+                    if (node.parent.kind === 152 /* Parameter */ && ts.isClassElement(node.parent.parent)) {
                         // If the decorator's parent is a Parameter, we resolve the this container from
                         // the grandparent class declaration.
                         node = node.parent.parent;
@@ -9706,21 +9931,21 @@ var ts;
     }
     ts.getSuperContainer = getSuperContainer;
     function getImmediatelyInvokedFunctionExpression(func) {
-        if (func.kind === 196 /* FunctionExpression */ || func.kind === 197 /* ArrowFunction */) {
+        if (func.kind === 197 /* FunctionExpression */ || func.kind === 198 /* ArrowFunction */) {
             var prev = func;
             var parent = func.parent;
-            while (parent.kind === 195 /* ParenthesizedExpression */) {
+            while (parent.kind === 196 /* ParenthesizedExpression */) {
                 prev = parent;
                 parent = parent.parent;
             }
-            if (parent.kind === 191 /* CallExpression */ && parent.expression === prev) {
+            if (parent.kind === 192 /* CallExpression */ && parent.expression === prev) {
                 return parent;
             }
         }
     }
     ts.getImmediatelyInvokedFunctionExpression = getImmediatelyInvokedFunctionExpression;
     function isSuperOrSuperProperty(node) {
-        return node.kind === 98 /* SuperKeyword */
+        return node.kind === 99 /* SuperKeyword */
             || isSuperProperty(node);
     }
     ts.isSuperOrSuperProperty = isSuperOrSuperProperty;
@@ -9729,8 +9954,8 @@ var ts;
      */
     function isSuperProperty(node) {
         var kind = node.kind;
-        return (kind === 189 /* PropertyAccessExpression */ || kind === 190 /* ElementAccessExpression */)
-            && node.expression.kind === 98 /* SuperKeyword */;
+        return (kind === 190 /* PropertyAccessExpression */ || kind === 191 /* ElementAccessExpression */)
+            && node.expression.kind === 99 /* SuperKeyword */;
     }
     ts.isSuperProperty = isSuperProperty;
     /**
@@ -9738,20 +9963,20 @@ var ts;
      */
     function isThisProperty(node) {
         var kind = node.kind;
-        return (kind === 189 /* PropertyAccessExpression */ || kind === 190 /* ElementAccessExpression */)
-            && node.expression.kind === 100 /* ThisKeyword */;
+        return (kind === 190 /* PropertyAccessExpression */ || kind === 191 /* ElementAccessExpression */)
+            && node.expression.kind === 101 /* ThisKeyword */;
     }
     ts.isThisProperty = isThisProperty;
     function getEntityNameFromTypeNode(node) {
         switch (node.kind) {
-            case 164 /* TypeReference */:
+            case 165 /* TypeReference */:
                 return node.typeName;
-            case 211 /* ExpressionWithTypeArguments */:
+            case 212 /* ExpressionWithTypeArguments */:
                 return isEntityNameExpression(node.expression)
                     ? node.expression
                     : undefined;
-            case 72 /* Identifier */:
-            case 148 /* QualifiedName */:
+            case 73 /* Identifier */:
+            case 149 /* QualifiedName */:
                 return node;
         }
         return undefined;
@@ -9759,10 +9984,10 @@ var ts;
     ts.getEntityNameFromTypeNode = getEntityNameFromTypeNode;
     function getInvokedExpression(node) {
         switch (node.kind) {
-            case 193 /* TaggedTemplateExpression */:
+            case 194 /* TaggedTemplateExpression */:
                 return node.tag;
-            case 262 /* JsxOpeningElement */:
-            case 261 /* JsxSelfClosingElement */:
+            case 263 /* JsxOpeningElement */:
+            case 262 /* JsxSelfClosingElement */:
                 return node.tagName;
             default:
                 return node.expression;
@@ -9771,25 +9996,25 @@ var ts;
     ts.getInvokedExpression = getInvokedExpression;
     function nodeCanBeDecorated(node, parent, grandparent) {
         switch (node.kind) {
-            case 240 /* ClassDeclaration */:
+            case 241 /* ClassDeclaration */:
                 // classes are valid targets
                 return true;
-            case 154 /* PropertyDeclaration */:
+            case 155 /* PropertyDeclaration */:
                 // property declarations are valid if their parent is a class declaration.
-                return parent.kind === 240 /* ClassDeclaration */;
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
-            case 156 /* MethodDeclaration */:
+                return parent.kind === 241 /* ClassDeclaration */;
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
+            case 157 /* MethodDeclaration */:
                 // if this method has a body and its parent is a class declaration, this is a valid target.
                 return node.body !== undefined
-                    && parent.kind === 240 /* ClassDeclaration */;
-            case 151 /* Parameter */:
+                    && parent.kind === 241 /* ClassDeclaration */;
+            case 152 /* Parameter */:
                 // if the parameter's parent has a body and its grandparent is a class declaration, this is a valid target;
                 return parent.body !== undefined
-                    && (parent.kind === 157 /* Constructor */
-                        || parent.kind === 156 /* MethodDeclaration */
-                        || parent.kind === 159 /* SetAccessor */)
-                    && grandparent.kind === 240 /* ClassDeclaration */;
+                    && (parent.kind === 158 /* Constructor */
+                        || parent.kind === 157 /* MethodDeclaration */
+                        || parent.kind === 160 /* SetAccessor */)
+                    && grandparent.kind === 241 /* ClassDeclaration */;
         }
         return false;
     }
@@ -9805,10 +10030,10 @@ var ts;
     ts.nodeOrChildIsDecorated = nodeOrChildIsDecorated;
     function childIsDecorated(node, parent) {
         switch (node.kind) {
-            case 240 /* ClassDeclaration */:
+            case 241 /* ClassDeclaration */:
                 return ts.some(node.members, function (m) { return nodeOrChildIsDecorated(m, node, parent); }); // TODO: GH#18217
-            case 156 /* MethodDeclaration */:
-            case 159 /* SetAccessor */:
+            case 157 /* MethodDeclaration */:
+            case 160 /* SetAccessor */:
                 return ts.some(node.parameters, function (p) { return nodeIsDecorated(p, node, parent); }); // TODO: GH#18217
             default:
                 return false;
@@ -9817,9 +10042,9 @@ var ts;
     ts.childIsDecorated = childIsDecorated;
     function isJSXTagName(node) {
         var parent = node.parent;
-        if (parent.kind === 262 /* JsxOpeningElement */ ||
-            parent.kind === 261 /* JsxSelfClosingElement */ ||
-            parent.kind === 263 /* JsxClosingElement */) {
+        if (parent.kind === 263 /* JsxOpeningElement */ ||
+            parent.kind === 262 /* JsxSelfClosingElement */ ||
+            parent.kind === 264 /* JsxClosingElement */) {
             return parent.tagName === node;
         }
         return false;
@@ -9827,57 +10052,57 @@ var ts;
     ts.isJSXTagName = isJSXTagName;
     function isExpressionNode(node) {
         switch (node.kind) {
-            case 98 /* SuperKeyword */:
-            case 96 /* NullKeyword */:
-            case 102 /* TrueKeyword */:
-            case 87 /* FalseKeyword */:
+            case 99 /* SuperKeyword */:
+            case 97 /* NullKeyword */:
+            case 103 /* TrueKeyword */:
+            case 88 /* FalseKeyword */:
             case 13 /* RegularExpressionLiteral */:
-            case 187 /* ArrayLiteralExpression */:
-            case 188 /* ObjectLiteralExpression */:
-            case 189 /* PropertyAccessExpression */:
-            case 190 /* ElementAccessExpression */:
-            case 191 /* CallExpression */:
-            case 192 /* NewExpression */:
-            case 193 /* TaggedTemplateExpression */:
-            case 212 /* AsExpression */:
-            case 194 /* TypeAssertionExpression */:
-            case 213 /* NonNullExpression */:
-            case 195 /* ParenthesizedExpression */:
-            case 196 /* FunctionExpression */:
-            case 209 /* ClassExpression */:
-            case 197 /* ArrowFunction */:
-            case 200 /* VoidExpression */:
-            case 198 /* DeleteExpression */:
-            case 199 /* TypeOfExpression */:
-            case 202 /* PrefixUnaryExpression */:
-            case 203 /* PostfixUnaryExpression */:
-            case 204 /* BinaryExpression */:
-            case 205 /* ConditionalExpression */:
-            case 208 /* SpreadElement */:
-            case 206 /* TemplateExpression */:
+            case 188 /* ArrayLiteralExpression */:
+            case 189 /* ObjectLiteralExpression */:
+            case 190 /* PropertyAccessExpression */:
+            case 191 /* ElementAccessExpression */:
+            case 192 /* CallExpression */:
+            case 193 /* NewExpression */:
+            case 194 /* TaggedTemplateExpression */:
+            case 213 /* AsExpression */:
+            case 195 /* TypeAssertionExpression */:
+            case 214 /* NonNullExpression */:
+            case 196 /* ParenthesizedExpression */:
+            case 197 /* FunctionExpression */:
+            case 210 /* ClassExpression */:
+            case 198 /* ArrowFunction */:
+            case 201 /* VoidExpression */:
+            case 199 /* DeleteExpression */:
+            case 200 /* TypeOfExpression */:
+            case 203 /* PrefixUnaryExpression */:
+            case 204 /* PostfixUnaryExpression */:
+            case 205 /* BinaryExpression */:
+            case 206 /* ConditionalExpression */:
+            case 209 /* SpreadElement */:
+            case 207 /* TemplateExpression */:
             case 14 /* NoSubstitutionTemplateLiteral */:
-            case 210 /* OmittedExpression */:
-            case 260 /* JsxElement */:
-            case 261 /* JsxSelfClosingElement */:
-            case 264 /* JsxFragment */:
-            case 207 /* YieldExpression */:
-            case 201 /* AwaitExpression */:
-            case 214 /* MetaProperty */:
+            case 211 /* OmittedExpression */:
+            case 261 /* JsxElement */:
+            case 262 /* JsxSelfClosingElement */:
+            case 265 /* JsxFragment */:
+            case 208 /* YieldExpression */:
+            case 202 /* AwaitExpression */:
+            case 215 /* MetaProperty */:
                 return true;
-            case 148 /* QualifiedName */:
-                while (node.parent.kind === 148 /* QualifiedName */) {
+            case 149 /* QualifiedName */:
+                while (node.parent.kind === 149 /* QualifiedName */) {
                     node = node.parent;
                 }
-                return node.parent.kind === 167 /* TypeQuery */ || isJSXTagName(node);
-            case 72 /* Identifier */:
-                if (node.parent.kind === 167 /* TypeQuery */ || isJSXTagName(node)) {
+                return node.parent.kind === 168 /* TypeQuery */ || isJSXTagName(node);
+            case 73 /* Identifier */:
+                if (node.parent.kind === 168 /* TypeQuery */ || isJSXTagName(node)) {
                     return true;
                 }
             // falls through
             case 8 /* NumericLiteral */:
             case 9 /* BigIntLiteral */:
             case 10 /* StringLiteral */:
-            case 100 /* ThisKeyword */:
+            case 101 /* ThisKeyword */:
                 return isInExpressionContext(node);
             default:
                 return false;
@@ -9887,49 +10112,49 @@ var ts;
     function isInExpressionContext(node) {
         var parent = node.parent;
         switch (parent.kind) {
-            case 237 /* VariableDeclaration */:
-            case 151 /* Parameter */:
-            case 154 /* PropertyDeclaration */:
-            case 153 /* PropertySignature */:
-            case 278 /* EnumMember */:
-            case 275 /* PropertyAssignment */:
-            case 186 /* BindingElement */:
+            case 238 /* VariableDeclaration */:
+            case 152 /* Parameter */:
+            case 155 /* PropertyDeclaration */:
+            case 154 /* PropertySignature */:
+            case 279 /* EnumMember */:
+            case 276 /* PropertyAssignment */:
+            case 187 /* BindingElement */:
                 return parent.initializer === node;
-            case 221 /* ExpressionStatement */:
-            case 222 /* IfStatement */:
-            case 223 /* DoStatement */:
-            case 224 /* WhileStatement */:
-            case 230 /* ReturnStatement */:
-            case 231 /* WithStatement */:
-            case 232 /* SwitchStatement */:
-            case 271 /* CaseClause */:
-            case 234 /* ThrowStatement */:
+            case 222 /* ExpressionStatement */:
+            case 223 /* IfStatement */:
+            case 224 /* DoStatement */:
+            case 225 /* WhileStatement */:
+            case 231 /* ReturnStatement */:
+            case 232 /* WithStatement */:
+            case 233 /* SwitchStatement */:
+            case 272 /* CaseClause */:
+            case 235 /* ThrowStatement */:
                 return parent.expression === node;
-            case 225 /* ForStatement */:
+            case 226 /* ForStatement */:
                 var forStatement = parent;
-                return (forStatement.initializer === node && forStatement.initializer.kind !== 238 /* VariableDeclarationList */) ||
+                return (forStatement.initializer === node && forStatement.initializer.kind !== 239 /* VariableDeclarationList */) ||
                     forStatement.condition === node ||
                     forStatement.incrementor === node;
-            case 226 /* ForInStatement */:
-            case 227 /* ForOfStatement */:
+            case 227 /* ForInStatement */:
+            case 228 /* ForOfStatement */:
                 var forInStatement = parent;
-                return (forInStatement.initializer === node && forInStatement.initializer.kind !== 238 /* VariableDeclarationList */) ||
+                return (forInStatement.initializer === node && forInStatement.initializer.kind !== 239 /* VariableDeclarationList */) ||
                     forInStatement.expression === node;
-            case 194 /* TypeAssertionExpression */:
-            case 212 /* AsExpression */:
+            case 195 /* TypeAssertionExpression */:
+            case 213 /* AsExpression */:
                 return node === parent.expression;
-            case 216 /* TemplateSpan */:
+            case 217 /* TemplateSpan */:
                 return node === parent.expression;
-            case 149 /* ComputedPropertyName */:
+            case 150 /* ComputedPropertyName */:
                 return node === parent.expression;
-            case 152 /* Decorator */:
-            case 270 /* JsxExpression */:
-            case 269 /* JsxSpreadAttribute */:
-            case 277 /* SpreadAssignment */:
+            case 153 /* Decorator */:
+            case 271 /* JsxExpression */:
+            case 270 /* JsxSpreadAttribute */:
+            case 278 /* SpreadAssignment */:
                 return true;
-            case 211 /* ExpressionWithTypeArguments */:
+            case 212 /* ExpressionWithTypeArguments */:
                 return parent.expression === node && isExpressionWithTypeArgumentsInClassExtendsClause(parent);
-            case 276 /* ShorthandPropertyAssignment */:
+            case 277 /* ShorthandPropertyAssignment */:
                 return parent.objectAssignmentInitializer === node;
             default:
                 return isExpressionNode(parent);
@@ -9937,7 +10162,7 @@ var ts;
     }
     ts.isInExpressionContext = isInExpressionContext;
     function isExternalModuleImportEqualsDeclaration(node) {
-        return node.kind === 248 /* ImportEqualsDeclaration */ && node.moduleReference.kind === 259 /* ExternalModuleReference */;
+        return node.kind === 249 /* ImportEqualsDeclaration */ && node.moduleReference.kind === 260 /* ExternalModuleReference */;
     }
     ts.isExternalModuleImportEqualsDeclaration = isExternalModuleImportEqualsDeclaration;
     function getExternalModuleImportEqualsDeclarationExpression(node) {
@@ -9946,7 +10171,7 @@ var ts;
     }
     ts.getExternalModuleImportEqualsDeclarationExpression = getExternalModuleImportEqualsDeclarationExpression;
     function isInternalModuleImportEqualsDeclaration(node) {
-        return node.kind === 248 /* ImportEqualsDeclaration */ && node.moduleReference.kind !== 259 /* ExternalModuleReference */;
+        return node.kind === 249 /* ImportEqualsDeclaration */ && node.moduleReference.kind !== 260 /* ExternalModuleReference */;
     }
     ts.isInternalModuleImportEqualsDeclaration = isInternalModuleImportEqualsDeclaration;
     function isSourceFileJS(file) {
@@ -9974,15 +10199,15 @@ var ts;
             ts.isIdentifier(node.typeName) &&
             node.typeName.escapedText === "Object" &&
             node.typeArguments && node.typeArguments.length === 2 &&
-            (node.typeArguments[0].kind === 138 /* StringKeyword */ || node.typeArguments[0].kind === 135 /* NumberKeyword */);
+            (node.typeArguments[0].kind === 139 /* StringKeyword */ || node.typeArguments[0].kind === 136 /* NumberKeyword */);
     }
     ts.isJSDocIndexSignature = isJSDocIndexSignature;
     function isRequireCall(callExpression, checkArgumentIsStringLiteralLike) {
-        if (callExpression.kind !== 191 /* CallExpression */) {
+        if (callExpression.kind !== 192 /* CallExpression */) {
             return false;
         }
         var _a = callExpression, expression = _a.expression, args = _a.arguments;
-        if (expression.kind !== 72 /* Identifier */ || expression.escapedText !== "require") {
+        if (expression.kind !== 73 /* Identifier */ || expression.escapedText !== "require") {
             return false;
         }
         if (args.length !== 1) {
@@ -10013,7 +10238,7 @@ var ts;
             name = node.parent.name;
             decl = node.parent;
         }
-        else if (ts.isBinaryExpression(node.parent) && node.parent.operatorToken.kind === 59 /* EqualsToken */ && node.parent.right === node) {
+        else if (ts.isBinaryExpression(node.parent) && node.parent.operatorToken.kind === 60 /* EqualsToken */ && node.parent.right === node) {
             name = node.parent.left;
             decl = name;
         }
@@ -10022,7 +10247,7 @@ var ts;
                 name = node.parent.parent.name;
                 decl = node.parent.parent;
             }
-            else if (ts.isBinaryExpression(node.parent.parent) && node.parent.parent.operatorToken.kind === 59 /* EqualsToken */ && node.parent.parent.right === node.parent) {
+            else if (ts.isBinaryExpression(node.parent.parent) && node.parent.parent.operatorToken.kind === 60 /* EqualsToken */ && node.parent.parent.right === node.parent) {
                 name = node.parent.parent.left;
                 decl = name;
             }
@@ -10064,7 +10289,7 @@ var ts;
      * We treat the right hand side of assignments with container-like initalizers as declarations.
      */
     function getAssignedExpandoInitializer(node) {
-        if (node && node.parent && ts.isBinaryExpression(node.parent) && node.parent.operatorToken.kind === 59 /* EqualsToken */) {
+        if (node && node.parent && ts.isBinaryExpression(node.parent) && node.parent.operatorToken.kind === 60 /* EqualsToken */) {
             var isPrototypeAssignment = isPrototypeAccess(node.parent.left);
             return getExpandoInitializer(node.parent.right, isPrototypeAssignment) ||
                 getDefaultedExpandoInitializer(node.parent.left, node.parent.right, isPrototypeAssignment);
@@ -10090,11 +10315,11 @@ var ts;
     function getExpandoInitializer(initializer, isPrototypeAssignment) {
         if (ts.isCallExpression(initializer)) {
             var e = skipParentheses(initializer.expression);
-            return e.kind === 196 /* FunctionExpression */ || e.kind === 197 /* ArrowFunction */ ? initializer : undefined;
+            return e.kind === 197 /* FunctionExpression */ || e.kind === 198 /* ArrowFunction */ ? initializer : undefined;
         }
-        if (initializer.kind === 196 /* FunctionExpression */ ||
-            initializer.kind === 209 /* ClassExpression */ ||
-            initializer.kind === 197 /* ArrowFunction */) {
+        if (initializer.kind === 197 /* FunctionExpression */ ||
+            initializer.kind === 210 /* ClassExpression */ ||
+            initializer.kind === 198 /* ArrowFunction */) {
             return initializer;
         }
         if (ts.isObjectLiteralExpression(initializer) && (initializer.properties.length === 0 || isPrototypeAssignment)) {
@@ -10118,7 +10343,7 @@ var ts;
     }
     function isDefaultedExpandoInitializer(node) {
         var name = ts.isVariableDeclaration(node.parent) ? node.parent.name :
-            ts.isBinaryExpression(node.parent) && node.parent.operatorToken.kind === 59 /* EqualsToken */ ? node.parent.left :
+            ts.isBinaryExpression(node.parent) && node.parent.operatorToken.kind === 60 /* EqualsToken */ ? node.parent.left :
                 undefined;
         return name && getExpandoInitializer(node.right, isPrototypeAccess(name)) && isEntityNameExpression(name) && isSameEntityName(name, node.left);
     }
@@ -10127,7 +10352,7 @@ var ts;
     function getNameOfExpando(node) {
         if (ts.isBinaryExpression(node.parent)) {
             var parent = (node.parent.operatorToken.kind === 55 /* BarBarToken */ && ts.isBinaryExpression(node.parent.parent)) ? node.parent.parent : node.parent;
-            if (parent.operatorToken.kind === 59 /* EqualsToken */ && ts.isIdentifier(parent.left)) {
+            if (parent.operatorToken.kind === 60 /* EqualsToken */ && ts.isIdentifier(parent.left)) {
                 return parent.left;
             }
         }
@@ -10150,7 +10375,7 @@ var ts;
             return name.escapedText === initializer.escapedText;
         }
         if (ts.isIdentifier(name) && ts.isPropertyAccessExpression(initializer)) {
-            return (initializer.expression.kind === 100 /* ThisKeyword */ ||
+            return (initializer.expression.kind === 101 /* ThisKeyword */ ||
                 ts.isIdentifier(initializer.expression) &&
                     (initializer.expression.escapedText === "window" ||
                         initializer.expression.escapedText === "self" ||
@@ -10208,7 +10433,7 @@ var ts;
             }
             return 7 /* ObjectDefinePropertyValue */;
         }
-        if (expr.operatorToken.kind !== 59 /* EqualsToken */ ||
+        if (expr.operatorToken.kind !== 60 /* EqualsToken */ ||
             !ts.isPropertyAccessExpression(expr.left)) {
             return 0 /* None */;
         }
@@ -10220,7 +10445,7 @@ var ts;
         return getAssignmentDeclarationPropertyAccessKind(lhs);
     }
     function getAssignmentDeclarationPropertyAccessKind(lhs) {
-        if (lhs.expression.kind === 100 /* ThisKeyword */) {
+        if (lhs.expression.kind === 101 /* ThisKeyword */) {
             return 4 /* ThisProperty */;
         }
         else if (isModuleExportsPropertyAccessExpression(lhs)) {
@@ -10262,7 +10487,7 @@ var ts;
     ts.isPrototypePropertyAssignment = isPrototypePropertyAssignment;
     function isSpecialPropertyDeclaration(expr) {
         return isInJSFile(expr) &&
-            expr.parent && expr.parent.kind === 221 /* ExpressionStatement */ &&
+            expr.parent && expr.parent.kind === 222 /* ExpressionStatement */ &&
             !!ts.getJSDocTypeTag(expr.parent);
     }
     ts.isSpecialPropertyDeclaration = isSpecialPropertyDeclaration;
@@ -10271,23 +10496,23 @@ var ts;
             return false;
         }
         var decl = symbol.valueDeclaration;
-        return decl.kind === 239 /* FunctionDeclaration */ || ts.isVariableDeclaration(decl) && decl.initializer && ts.isFunctionLike(decl.initializer);
+        return decl.kind === 240 /* FunctionDeclaration */ || ts.isVariableDeclaration(decl) && decl.initializer && ts.isFunctionLike(decl.initializer);
     }
     ts.isFunctionSymbol = isFunctionSymbol;
     function importFromModuleSpecifier(node) {
-        return tryGetImportFromModuleSpecifier(node) || ts.Debug.fail(ts.Debug.showSyntaxKind(node.parent));
+        return tryGetImportFromModuleSpecifier(node) || ts.Debug.failBadSyntaxKind(node.parent);
     }
     ts.importFromModuleSpecifier = importFromModuleSpecifier;
     function tryGetImportFromModuleSpecifier(node) {
         switch (node.parent.kind) {
-            case 249 /* ImportDeclaration */:
-            case 255 /* ExportDeclaration */:
+            case 250 /* ImportDeclaration */:
+            case 256 /* ExportDeclaration */:
                 return node.parent;
-            case 259 /* ExternalModuleReference */:
+            case 260 /* ExternalModuleReference */:
                 return node.parent.parent;
-            case 191 /* CallExpression */:
+            case 192 /* CallExpression */:
                 return isImportCall(node.parent) || isRequireCall(node.parent, /*checkArg*/ false) ? node.parent : undefined;
-            case 182 /* LiteralType */:
+            case 183 /* LiteralType */:
                 ts.Debug.assert(ts.isStringLiteral(node));
                 return ts.tryCast(node.parent.parent, ts.isImportTypeNode);
             default:
@@ -10297,12 +10522,12 @@ var ts;
     ts.tryGetImportFromModuleSpecifier = tryGetImportFromModuleSpecifier;
     function getExternalModuleName(node) {
         switch (node.kind) {
-            case 249 /* ImportDeclaration */:
-            case 255 /* ExportDeclaration */:
+            case 250 /* ImportDeclaration */:
+            case 256 /* ExportDeclaration */:
                 return node.moduleSpecifier;
-            case 248 /* ImportEqualsDeclaration */:
-                return node.moduleReference.kind === 259 /* ExternalModuleReference */ ? node.moduleReference.expression : undefined;
-            case 183 /* ImportType */:
+            case 249 /* ImportEqualsDeclaration */:
+                return node.moduleReference.kind === 260 /* ExternalModuleReference */ ? node.moduleReference.expression : undefined;
+            case 184 /* ImportType */:
                 return isLiteralImportTypeNode(node) ? node.argument.literal : undefined;
             default:
                 return ts.Debug.assertNever(node);
@@ -10311,11 +10536,11 @@ var ts;
     ts.getExternalModuleName = getExternalModuleName;
     function getNamespaceDeclarationNode(node) {
         switch (node.kind) {
-            case 249 /* ImportDeclaration */:
+            case 250 /* ImportDeclaration */:
                 return node.importClause && ts.tryCast(node.importClause.namedBindings, ts.isNamespaceImport);
-            case 248 /* ImportEqualsDeclaration */:
+            case 249 /* ImportEqualsDeclaration */:
                 return node;
-            case 255 /* ExportDeclaration */:
+            case 256 /* ExportDeclaration */:
                 return undefined;
             default:
                 return ts.Debug.assertNever(node);
@@ -10323,19 +10548,19 @@ var ts;
     }
     ts.getNamespaceDeclarationNode = getNamespaceDeclarationNode;
     function isDefaultImport(node) {
-        return node.kind === 249 /* ImportDeclaration */ && !!node.importClause && !!node.importClause.name;
+        return node.kind === 250 /* ImportDeclaration */ && !!node.importClause && !!node.importClause.name;
     }
     ts.isDefaultImport = isDefaultImport;
     function hasQuestionToken(node) {
         if (node) {
             switch (node.kind) {
-                case 151 /* Parameter */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
-                case 276 /* ShorthandPropertyAssignment */:
-                case 275 /* PropertyAssignment */:
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
+                case 152 /* Parameter */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
+                case 277 /* ShorthandPropertyAssignment */:
+                case 276 /* PropertyAssignment */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
                     return node.questionToken !== undefined;
             }
         }
@@ -10349,7 +10574,7 @@ var ts;
     }
     ts.isJSDocConstructSignature = isJSDocConstructSignature;
     function isJSDocTypeAlias(node) {
-        return node.kind === 309 /* JSDocTypedefTag */ || node.kind === 302 /* JSDocCallbackTag */;
+        return node.kind === 311 /* JSDocTypedefTag */ || node.kind === 304 /* JSDocCallbackTag */;
     }
     ts.isJSDocTypeAlias = isJSDocTypeAlias;
     function isTypeAlias(node) {
@@ -10359,7 +10584,7 @@ var ts;
     function getSourceOfAssignment(node) {
         return ts.isExpressionStatement(node) &&
             node.expression && ts.isBinaryExpression(node.expression) &&
-            node.expression.operatorToken.kind === 59 /* EqualsToken */
+            node.expression.operatorToken.kind === 60 /* EqualsToken */
             ? node.expression.right
             : undefined;
     }
@@ -10374,12 +10599,12 @@ var ts;
     }
     function getSingleInitializerOfVariableStatementOrPropertyDeclaration(node) {
         switch (node.kind) {
-            case 219 /* VariableStatement */:
+            case 220 /* VariableStatement */:
                 var v = getSingleVariableOfVariableStatement(node);
                 return v && v.initializer;
-            case 154 /* PropertyDeclaration */:
+            case 155 /* PropertyDeclaration */:
                 return node.initializer;
-            case 275 /* PropertyAssignment */:
+            case 276 /* PropertyAssignment */:
                 return node.initializer;
         }
     }
@@ -10390,7 +10615,7 @@ var ts;
     function getNestedModuleDeclaration(node) {
         return ts.isModuleDeclaration(node) &&
             node.body &&
-            node.body.kind === 244 /* ModuleDeclaration */
+            node.body.kind === 245 /* ModuleDeclaration */
             ? node.body
             : undefined;
     }
@@ -10398,18 +10623,18 @@ var ts;
         var result;
         // Pull parameter comments from declaring function as well
         if (isVariableLike(hostNode) && ts.hasInitializer(hostNode) && ts.hasJSDocNodes(hostNode.initializer)) {
-            result = ts.addRange(result, hostNode.initializer.jsDoc);
+            result = ts.append(result, ts.last(hostNode.initializer.jsDoc));
         }
         var node = hostNode;
         while (node && node.parent) {
             if (ts.hasJSDocNodes(node)) {
-                result = ts.addRange(result, node.jsDoc);
+                result = ts.append(result, ts.last(node.jsDoc));
             }
-            if (node.kind === 151 /* Parameter */) {
+            if (node.kind === 152 /* Parameter */) {
                 result = ts.addRange(result, ts.getJSDocParameterTags(node));
                 break;
             }
-            if (node.kind === 150 /* TypeParameter */) {
+            if (node.kind === 151 /* TypeParameter */) {
                 result = ts.addRange(result, ts.getJSDocTypeParameterTags(node));
                 break;
             }
@@ -10420,11 +10645,12 @@ var ts;
     ts.getJSDocCommentsAndTags = getJSDocCommentsAndTags;
     function getNextJSDocCommentLocation(node) {
         var parent = node.parent;
-        if (parent.kind === 275 /* PropertyAssignment */ ||
-            parent.kind === 154 /* PropertyDeclaration */ ||
-            parent.kind === 221 /* ExpressionStatement */ && node.kind === 189 /* PropertyAccessExpression */ ||
+        if (parent.kind === 276 /* PropertyAssignment */ ||
+            parent.kind === 255 /* ExportAssignment */ ||
+            parent.kind === 155 /* PropertyDeclaration */ ||
+            parent.kind === 222 /* ExpressionStatement */ && node.kind === 190 /* PropertyAccessExpression */ ||
             getNestedModuleDeclaration(parent) ||
-            ts.isBinaryExpression(node) && node.operatorToken.kind === 59 /* EqualsToken */) {
+            ts.isBinaryExpression(node) && node.operatorToken.kind === 60 /* EqualsToken */) {
             return parent;
         }
         // Try to recognize this pattern when node is initializer of variable declaration and JSDoc comments are on containing variable statement.
@@ -10435,7 +10661,7 @@ var ts;
         // var x = function(name) { return name.length; }
         else if (parent.parent &&
             (getSingleVariableOfVariableStatement(parent.parent) === node ||
-                ts.isBinaryExpression(parent) && parent.operatorToken.kind === 59 /* EqualsToken */)) {
+                ts.isBinaryExpression(parent) && parent.operatorToken.kind === 60 /* EqualsToken */)) {
             return parent.parent;
         }
         else if (parent.parent && parent.parent.parent &&
@@ -10458,7 +10684,7 @@ var ts;
         if (!decl) {
             return undefined;
         }
-        var parameter = ts.find(decl.parameters, function (p) { return p.name.kind === 72 /* Identifier */ && p.name.escapedText === name; });
+        var parameter = ts.find(decl.parameters, function (p) { return p.name.kind === 73 /* Identifier */ && p.name.escapedText === name; });
         return parameter && parameter.symbol;
     }
     ts.getParameterSymbolFromJSDoc = getParameterSymbolFromJSDoc;
@@ -10493,7 +10719,7 @@ var ts;
     ts.hasRestParameter = hasRestParameter;
     function isRestParameter(node) {
         var type = ts.isJSDocParameterTag(node) ? (node.typeExpression && node.typeExpression.type) : node.type;
-        return node.dotDotDotToken !== undefined || !!type && type.kind === 295 /* JSDocVariadicType */;
+        return node.dotDotDotToken !== undefined || !!type && type.kind === 296 /* JSDocVariadicType */;
     }
     ts.isRestParameter = isRestParameter;
     var AssignmentKind;
@@ -10506,31 +10732,31 @@ var ts;
         var parent = node.parent;
         while (true) {
             switch (parent.kind) {
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     var binaryOperator = parent.operatorToken.kind;
                     return isAssignmentOperator(binaryOperator) && parent.left === node ?
-                        binaryOperator === 59 /* EqualsToken */ ? 1 /* Definite */ : 2 /* Compound */ :
+                        binaryOperator === 60 /* EqualsToken */ ? 1 /* Definite */ : 2 /* Compound */ :
                         0 /* None */;
-                case 202 /* PrefixUnaryExpression */:
-                case 203 /* PostfixUnaryExpression */:
+                case 203 /* PrefixUnaryExpression */:
+                case 204 /* PostfixUnaryExpression */:
                     var unaryOperator = parent.operator;
                     return unaryOperator === 44 /* PlusPlusToken */ || unaryOperator === 45 /* MinusMinusToken */ ? 2 /* Compound */ : 0 /* None */;
-                case 226 /* ForInStatement */:
-                case 227 /* ForOfStatement */:
+                case 227 /* ForInStatement */:
+                case 228 /* ForOfStatement */:
                     return parent.initializer === node ? 1 /* Definite */ : 0 /* None */;
-                case 195 /* ParenthesizedExpression */:
-                case 187 /* ArrayLiteralExpression */:
-                case 208 /* SpreadElement */:
-                case 213 /* NonNullExpression */:
+                case 196 /* ParenthesizedExpression */:
+                case 188 /* ArrayLiteralExpression */:
+                case 209 /* SpreadElement */:
+                case 214 /* NonNullExpression */:
                     node = parent;
                     break;
-                case 276 /* ShorthandPropertyAssignment */:
+                case 277 /* ShorthandPropertyAssignment */:
                     if (parent.name !== node) {
                         return 0 /* None */;
                     }
                     node = parent.parent;
                     break;
-                case 275 /* PropertyAssignment */:
+                case 276 /* PropertyAssignment */:
                     if (parent.name === node) {
                         return 0 /* None */;
                     }
@@ -10557,22 +10783,22 @@ var ts;
      */
     function isNodeWithPossibleHoistedDeclaration(node) {
         switch (node.kind) {
-            case 218 /* Block */:
-            case 219 /* VariableStatement */:
-            case 231 /* WithStatement */:
-            case 222 /* IfStatement */:
-            case 232 /* SwitchStatement */:
-            case 246 /* CaseBlock */:
-            case 271 /* CaseClause */:
-            case 272 /* DefaultClause */:
-            case 233 /* LabeledStatement */:
-            case 225 /* ForStatement */:
-            case 226 /* ForInStatement */:
-            case 227 /* ForOfStatement */:
-            case 223 /* DoStatement */:
-            case 224 /* WhileStatement */:
-            case 235 /* TryStatement */:
-            case 274 /* CatchClause */:
+            case 219 /* Block */:
+            case 220 /* VariableStatement */:
+            case 232 /* WithStatement */:
+            case 223 /* IfStatement */:
+            case 233 /* SwitchStatement */:
+            case 247 /* CaseBlock */:
+            case 272 /* CaseClause */:
+            case 273 /* DefaultClause */:
+            case 234 /* LabeledStatement */:
+            case 226 /* ForStatement */:
+            case 227 /* ForInStatement */:
+            case 228 /* ForOfStatement */:
+            case 224 /* DoStatement */:
+            case 225 /* WhileStatement */:
+            case 236 /* TryStatement */:
+            case 275 /* CatchClause */:
                 return true;
         }
         return false;
@@ -10589,33 +10815,33 @@ var ts;
         return node;
     }
     function walkUpParenthesizedTypes(node) {
-        return walkUp(node, 177 /* ParenthesizedType */);
+        return walkUp(node, 178 /* ParenthesizedType */);
     }
     ts.walkUpParenthesizedTypes = walkUpParenthesizedTypes;
     function walkUpParenthesizedExpressions(node) {
-        return walkUp(node, 195 /* ParenthesizedExpression */);
+        return walkUp(node, 196 /* ParenthesizedExpression */);
     }
     ts.walkUpParenthesizedExpressions = walkUpParenthesizedExpressions;
     function skipParentheses(node) {
-        while (node.kind === 195 /* ParenthesizedExpression */) {
+        while (node.kind === 196 /* ParenthesizedExpression */) {
             node = node.expression;
         }
         return node;
     }
     ts.skipParentheses = skipParentheses;
     function skipParenthesesUp(node) {
-        while (node.kind === 195 /* ParenthesizedExpression */) {
+        while (node.kind === 196 /* ParenthesizedExpression */) {
             node = node.parent;
         }
         return node;
     }
     // a node is delete target iff. it is PropertyAccessExpression/ElementAccessExpression with parentheses skipped
     function isDeleteTarget(node) {
-        if (node.kind !== 189 /* PropertyAccessExpression */ && node.kind !== 190 /* ElementAccessExpression */) {
+        if (node.kind !== 190 /* PropertyAccessExpression */ && node.kind !== 191 /* ElementAccessExpression */) {
             return false;
         }
         node = walkUpParenthesizedExpressions(node.parent);
-        return node && node.kind === 198 /* DeleteExpression */;
+        return node && node.kind === 199 /* DeleteExpression */;
     }
     ts.isDeleteTarget = isDeleteTarget;
     function isNodeDescendantOf(node, ancestor) {
@@ -10641,7 +10867,7 @@ var ts;
                 if (ts.isComputedPropertyName(parent))
                     return parent.parent;
             // falls through
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 if (ts.isDeclaration(parent)) {
                     return parent.name === name ? parent : undefined;
                 }
@@ -10665,7 +10891,7 @@ var ts;
     ts.getDeclarationFromName = getDeclarationFromName;
     function isLiteralComputedPropertyDeclarationName(node) {
         return (node.kind === 10 /* StringLiteral */ || node.kind === 8 /* NumericLiteral */) &&
-            node.parent.kind === 149 /* ComputedPropertyName */ &&
+            node.parent.kind === 150 /* ComputedPropertyName */ &&
             ts.isDeclaration(node.parent.parent);
     }
     ts.isLiteralComputedPropertyDeclarationName = isLiteralComputedPropertyDeclarationName;
@@ -10673,32 +10899,32 @@ var ts;
     function isIdentifierName(node) {
         var parent = node.parent;
         switch (parent.kind) {
-            case 154 /* PropertyDeclaration */:
-            case 153 /* PropertySignature */:
-            case 156 /* MethodDeclaration */:
-            case 155 /* MethodSignature */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
-            case 278 /* EnumMember */:
-            case 275 /* PropertyAssignment */:
-            case 189 /* PropertyAccessExpression */:
+            case 155 /* PropertyDeclaration */:
+            case 154 /* PropertySignature */:
+            case 157 /* MethodDeclaration */:
+            case 156 /* MethodSignature */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
+            case 279 /* EnumMember */:
+            case 276 /* PropertyAssignment */:
+            case 190 /* PropertyAccessExpression */:
                 // Name in member declaration or property name in property access
                 return parent.name === node;
-            case 148 /* QualifiedName */:
+            case 149 /* QualifiedName */:
                 // Name on right hand side of dot in a type query or type reference
                 if (parent.right === node) {
-                    while (parent.kind === 148 /* QualifiedName */) {
+                    while (parent.kind === 149 /* QualifiedName */) {
                         parent = parent.parent;
                     }
-                    return parent.kind === 167 /* TypeQuery */ || parent.kind === 164 /* TypeReference */;
+                    return parent.kind === 168 /* TypeQuery */ || parent.kind === 165 /* TypeReference */;
                 }
                 return false;
-            case 186 /* BindingElement */:
-            case 253 /* ImportSpecifier */:
+            case 187 /* BindingElement */:
+            case 254 /* ImportSpecifier */:
                 // Property name in binding element or import specifier
                 return parent.propertyName === node;
-            case 257 /* ExportSpecifier */:
-            case 267 /* JsxAttribute */:
+            case 258 /* ExportSpecifier */:
+            case 268 /* JsxAttribute */:
                 // Any name in an export specifier or JSX Attribute
                 return true;
         }
@@ -10715,13 +10941,13 @@ var ts;
     // export default <EntityNameExpression>
     // module.exports = <EntityNameExpression>
     function isAliasSymbolDeclaration(node) {
-        return node.kind === 248 /* ImportEqualsDeclaration */ ||
-            node.kind === 247 /* NamespaceExportDeclaration */ ||
-            node.kind === 250 /* ImportClause */ && !!node.name ||
-            node.kind === 251 /* NamespaceImport */ ||
-            node.kind === 253 /* ImportSpecifier */ ||
-            node.kind === 257 /* ExportSpecifier */ ||
-            node.kind === 254 /* ExportAssignment */ && exportAssignmentIsAlias(node) ||
+        return node.kind === 249 /* ImportEqualsDeclaration */ ||
+            node.kind === 248 /* NamespaceExportDeclaration */ ||
+            node.kind === 251 /* ImportClause */ && !!node.name ||
+            node.kind === 252 /* NamespaceImport */ ||
+            node.kind === 254 /* ImportSpecifier */ ||
+            node.kind === 258 /* ExportSpecifier */ ||
+            node.kind === 255 /* ExportAssignment */ && exportAssignmentIsAlias(node) ||
             ts.isBinaryExpression(node) && getAssignmentDeclarationKind(node) === 2 /* ModuleExports */ && exportAssignmentIsAlias(node);
     }
     ts.isAliasSymbolDeclaration = isAliasSymbolDeclaration;
@@ -10743,12 +10969,12 @@ var ts;
     }
     ts.getEffectiveBaseTypeNode = getEffectiveBaseTypeNode;
     function getClassExtendsHeritageElement(node) {
-        var heritageClause = getHeritageClause(node.heritageClauses, 86 /* ExtendsKeyword */);
+        var heritageClause = getHeritageClause(node.heritageClauses, 87 /* ExtendsKeyword */);
         return heritageClause && heritageClause.types.length > 0 ? heritageClause.types[0] : undefined;
     }
     ts.getClassExtendsHeritageElement = getClassExtendsHeritageElement;
     function getClassImplementsHeritageClauseElements(node) {
-        var heritageClause = getHeritageClause(node.heritageClauses, 109 /* ImplementsKeyword */);
+        var heritageClause = getHeritageClause(node.heritageClauses, 110 /* ImplementsKeyword */);
         return heritageClause ? heritageClause.types : undefined;
     }
     ts.getClassImplementsHeritageClauseElements = getClassImplementsHeritageClauseElements;
@@ -10760,7 +10986,7 @@ var ts;
     }
     ts.getAllSuperTypeNodes = getAllSuperTypeNodes;
     function getInterfaceBaseTypeNodes(node) {
-        var heritageClause = getHeritageClause(node.heritageClauses, 86 /* ExtendsKeyword */);
+        var heritageClause = getHeritageClause(node.heritageClauses, 87 /* ExtendsKeyword */);
         return heritageClause ? heritageClause.types : undefined;
     }
     ts.getInterfaceBaseTypeNodes = getInterfaceBaseTypeNodes;
@@ -10776,13 +11002,6 @@ var ts;
         return undefined;
     }
     ts.getHeritageClause = getHeritageClause;
-    function tryResolveScriptReference(host, sourceFile, reference) {
-        if (!host.getCompilerOptions().noResolve) {
-            var referenceFileName = ts.isRootedDiskPath(reference.fileName) ? reference.fileName : ts.combinePaths(ts.getDirectoryPath(sourceFile.fileName), reference.fileName);
-            return host.getSourceFile(referenceFileName);
-        }
-    }
-    ts.tryResolveScriptReference = tryResolveScriptReference;
     function getAncestor(node, kind) {
         while (node) {
             if (node.kind === kind) {
@@ -10794,11 +11013,11 @@ var ts;
     }
     ts.getAncestor = getAncestor;
     function isKeyword(token) {
-        return 73 /* FirstKeyword */ <= token && token <= 147 /* LastKeyword */;
+        return 74 /* FirstKeyword */ <= token && token <= 148 /* LastKeyword */;
     }
     ts.isKeyword = isKeyword;
     function isContextualKeyword(token) {
-        return 118 /* FirstContextualKeyword */ <= token && token <= 147 /* LastContextualKeyword */;
+        return 119 /* FirstContextualKeyword */ <= token && token <= 148 /* LastContextualKeyword */;
     }
     ts.isContextualKeyword = isContextualKeyword;
     function isNonContextualKeyword(token) {
@@ -10833,14 +11052,14 @@ var ts;
         }
         var flags = 0 /* Normal */;
         switch (node.kind) {
-            case 239 /* FunctionDeclaration */:
-            case 196 /* FunctionExpression */:
-            case 156 /* MethodDeclaration */:
+            case 240 /* FunctionDeclaration */:
+            case 197 /* FunctionExpression */:
+            case 157 /* MethodDeclaration */:
                 if (node.asteriskToken) {
                     flags |= 1 /* Generator */;
                 }
             // falls through
-            case 197 /* ArrowFunction */:
+            case 198 /* ArrowFunction */:
                 if (hasModifier(node, 256 /* Async */)) {
                     flags |= 2 /* Async */;
                 }
@@ -10854,10 +11073,10 @@ var ts;
     ts.getFunctionFlags = getFunctionFlags;
     function isAsyncFunction(node) {
         switch (node.kind) {
-            case 239 /* FunctionDeclaration */:
-            case 196 /* FunctionExpression */:
-            case 197 /* ArrowFunction */:
-            case 156 /* MethodDeclaration */:
+            case 240 /* FunctionDeclaration */:
+            case 197 /* FunctionExpression */:
+            case 198 /* ArrowFunction */:
+            case 157 /* MethodDeclaration */:
                 return node.body !== undefined
                     && node.asteriskToken === undefined
                     && hasModifier(node, 256 /* Async */);
@@ -10869,11 +11088,19 @@ var ts;
         return ts.isStringLiteralLike(node) || ts.isNumericLiteral(node);
     }
     ts.isStringOrNumericLiteralLike = isStringOrNumericLiteralLike;
+    function isSignedNumericLiteral(node) {
+        return ts.isPrefixUnaryExpression(node) && (node.operator === 38 /* PlusToken */ || node.operator === 39 /* MinusToken */) && ts.isNumericLiteral(node.operand);
+    }
+    ts.isSignedNumericLiteral = isSignedNumericLiteral;
     /**
-     * A declaration has a dynamic name if both of the following are true:
-     *   1. The declaration has a computed property name
-     *   2. The computed name is *not* expressed as Symbol.<name>, where name
-     *      is a property of the Symbol constructor that denotes a built in
+     * A declaration has a dynamic name if all of the following are true:
+     *   1. The declaration has a computed property name.
+     *   2. The computed name is *not* expressed as a StringLiteral.
+     *   3. The computed name is *not* expressed as a NumericLiteral.
+     *   4. The computed name is *not* expressed as a PlusToken or MinusToken
+     *      immediately followed by a NumericLiteral.
+     *   5. The computed name is *not* expressed as `Symbol.<name>`, where `<name>`
+     *      is a property of the Symbol constructor that denotes a built-in
      *      Symbol.
      */
     function hasDynamicName(declaration) {
@@ -10882,8 +11109,9 @@ var ts;
     }
     ts.hasDynamicName = hasDynamicName;
     function isDynamicName(name) {
-        return name.kind === 149 /* ComputedPropertyName */ &&
+        return name.kind === 150 /* ComputedPropertyName */ &&
             !isStringOrNumericLiteralLike(name.expression) &&
+            !isSignedNumericLiteral(name.expression) &&
             !isWellKnownSymbolSyntactically(name.expression);
     }
     ts.isDynamicName = isDynamicName;
@@ -10898,12 +11126,12 @@ var ts;
     ts.isWellKnownSymbolSyntactically = isWellKnownSymbolSyntactically;
     function getPropertyNameForPropertyNameNode(name) {
         switch (name.kind) {
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 return name.escapedText;
             case 10 /* StringLiteral */:
             case 8 /* NumericLiteral */:
                 return ts.escapeLeadingUnderscores(name.text);
-            case 149 /* ComputedPropertyName */:
+            case 150 /* ComputedPropertyName */:
                 var nameExpression = name.expression;
                 if (isWellKnownSymbolSyntactically(nameExpression)) {
                     return getPropertyNameForKnownSymbolName(ts.idText(nameExpression.name));
@@ -10919,7 +11147,7 @@ var ts;
     ts.getPropertyNameForPropertyNameNode = getPropertyNameForPropertyNameNode;
     function isPropertyNameLiteral(node) {
         switch (node.kind) {
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
             case 10 /* StringLiteral */:
             case 14 /* NoSubstitutionTemplateLiteral */:
             case 8 /* NumericLiteral */:
@@ -10930,11 +11158,11 @@ var ts;
     }
     ts.isPropertyNameLiteral = isPropertyNameLiteral;
     function getTextOfIdentifierOrLiteral(node) {
-        return node.kind === 72 /* Identifier */ ? ts.idText(node) : node.text;
+        return node.kind === 73 /* Identifier */ ? ts.idText(node) : node.text;
     }
     ts.getTextOfIdentifierOrLiteral = getTextOfIdentifierOrLiteral;
     function getEscapedTextOfIdentifierOrLiteral(node) {
-        return node.kind === 72 /* Identifier */ ? node.escapedText : ts.escapeLeadingUnderscores(node.text);
+        return node.kind === 73 /* Identifier */ ? node.escapedText : ts.escapeLeadingUnderscores(node.text);
     }
     ts.getEscapedTextOfIdentifierOrLiteral = getEscapedTextOfIdentifierOrLiteral;
     function getPropertyNameForKnownSymbolName(symbolName) {
@@ -10949,7 +11177,7 @@ var ts;
      * Includes the word "Symbol" with unicode escapes
      */
     function isESSymbolIdentifier(node) {
-        return node.kind === 72 /* Identifier */ && node.escapedText === "Symbol";
+        return node.kind === 73 /* Identifier */ && node.escapedText === "Symbol";
     }
     ts.isESSymbolIdentifier = isESSymbolIdentifier;
     function isPushOrUnshiftIdentifier(node) {
@@ -10958,11 +11186,11 @@ var ts;
     ts.isPushOrUnshiftIdentifier = isPushOrUnshiftIdentifier;
     function isParameterDeclaration(node) {
         var root = getRootDeclaration(node);
-        return root.kind === 151 /* Parameter */;
+        return root.kind === 152 /* Parameter */;
     }
     ts.isParameterDeclaration = isParameterDeclaration;
     function getRootDeclaration(node) {
-        while (node.kind === 186 /* BindingElement */) {
+        while (node.kind === 187 /* BindingElement */) {
             node = node.parent.parent;
         }
         return node;
@@ -10970,15 +11198,15 @@ var ts;
     ts.getRootDeclaration = getRootDeclaration;
     function nodeStartsNewLexicalEnvironment(node) {
         var kind = node.kind;
-        return kind === 157 /* Constructor */
-            || kind === 196 /* FunctionExpression */
-            || kind === 239 /* FunctionDeclaration */
-            || kind === 197 /* ArrowFunction */
-            || kind === 156 /* MethodDeclaration */
-            || kind === 158 /* GetAccessor */
-            || kind === 159 /* SetAccessor */
-            || kind === 244 /* ModuleDeclaration */
-            || kind === 284 /* SourceFile */;
+        return kind === 158 /* Constructor */
+            || kind === 197 /* FunctionExpression */
+            || kind === 240 /* FunctionDeclaration */
+            || kind === 198 /* ArrowFunction */
+            || kind === 157 /* MethodDeclaration */
+            || kind === 159 /* GetAccessor */
+            || kind === 160 /* SetAccessor */
+            || kind === 245 /* ModuleDeclaration */
+            || kind === 285 /* SourceFile */;
     }
     ts.nodeStartsNewLexicalEnvironment = nodeStartsNewLexicalEnvironment;
     function nodeIsSynthesized(range) {
@@ -10997,38 +11225,38 @@ var ts;
     })(Associativity = ts.Associativity || (ts.Associativity = {}));
     function getExpressionAssociativity(expression) {
         var operator = getOperator(expression);
-        var hasArguments = expression.kind === 192 /* NewExpression */ && expression.arguments !== undefined;
+        var hasArguments = expression.kind === 193 /* NewExpression */ && expression.arguments !== undefined;
         return getOperatorAssociativity(expression.kind, operator, hasArguments);
     }
     ts.getExpressionAssociativity = getExpressionAssociativity;
     function getOperatorAssociativity(kind, operator, hasArguments) {
         switch (kind) {
-            case 192 /* NewExpression */:
+            case 193 /* NewExpression */:
                 return hasArguments ? 0 /* Left */ : 1 /* Right */;
-            case 202 /* PrefixUnaryExpression */:
-            case 199 /* TypeOfExpression */:
-            case 200 /* VoidExpression */:
-            case 198 /* DeleteExpression */:
-            case 201 /* AwaitExpression */:
-            case 205 /* ConditionalExpression */:
-            case 207 /* YieldExpression */:
+            case 203 /* PrefixUnaryExpression */:
+            case 200 /* TypeOfExpression */:
+            case 201 /* VoidExpression */:
+            case 199 /* DeleteExpression */:
+            case 202 /* AwaitExpression */:
+            case 206 /* ConditionalExpression */:
+            case 208 /* YieldExpression */:
                 return 1 /* Right */;
-            case 204 /* BinaryExpression */:
+            case 205 /* BinaryExpression */:
                 switch (operator) {
                     case 41 /* AsteriskAsteriskToken */:
-                    case 59 /* EqualsToken */:
-                    case 60 /* PlusEqualsToken */:
-                    case 61 /* MinusEqualsToken */:
-                    case 63 /* AsteriskAsteriskEqualsToken */:
-                    case 62 /* AsteriskEqualsToken */:
-                    case 64 /* SlashEqualsToken */:
-                    case 65 /* PercentEqualsToken */:
-                    case 66 /* LessThanLessThanEqualsToken */:
-                    case 67 /* GreaterThanGreaterThanEqualsToken */:
-                    case 68 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
-                    case 69 /* AmpersandEqualsToken */:
-                    case 71 /* CaretEqualsToken */:
-                    case 70 /* BarEqualsToken */:
+                    case 60 /* EqualsToken */:
+                    case 61 /* PlusEqualsToken */:
+                    case 62 /* MinusEqualsToken */:
+                    case 64 /* AsteriskAsteriskEqualsToken */:
+                    case 63 /* AsteriskEqualsToken */:
+                    case 65 /* SlashEqualsToken */:
+                    case 66 /* PercentEqualsToken */:
+                    case 67 /* LessThanLessThanEqualsToken */:
+                    case 68 /* GreaterThanGreaterThanEqualsToken */:
+                    case 69 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
+                    case 70 /* AmpersandEqualsToken */:
+                    case 72 /* CaretEqualsToken */:
+                    case 71 /* BarEqualsToken */:
                         return 1 /* Right */;
                 }
         }
@@ -11037,15 +11265,15 @@ var ts;
     ts.getOperatorAssociativity = getOperatorAssociativity;
     function getExpressionPrecedence(expression) {
         var operator = getOperator(expression);
-        var hasArguments = expression.kind === 192 /* NewExpression */ && expression.arguments !== undefined;
+        var hasArguments = expression.kind === 193 /* NewExpression */ && expression.arguments !== undefined;
         return getOperatorPrecedence(expression.kind, operator, hasArguments);
     }
     ts.getExpressionPrecedence = getExpressionPrecedence;
     function getOperator(expression) {
-        if (expression.kind === 204 /* BinaryExpression */) {
+        if (expression.kind === 205 /* BinaryExpression */) {
             return expression.operatorToken.kind;
         }
-        else if (expression.kind === 202 /* PrefixUnaryExpression */ || expression.kind === 203 /* PostfixUnaryExpression */) {
+        else if (expression.kind === 203 /* PrefixUnaryExpression */ || expression.kind === 204 /* PostfixUnaryExpression */) {
             return expression.operator;
         }
         else {
@@ -11055,73 +11283,73 @@ var ts;
     ts.getOperator = getOperator;
     function getOperatorPrecedence(nodeKind, operatorKind, hasArguments) {
         switch (nodeKind) {
-            case 314 /* CommaListExpression */:
+            case 316 /* CommaListExpression */:
                 return 0;
-            case 208 /* SpreadElement */:
+            case 209 /* SpreadElement */:
                 return 1;
-            case 207 /* YieldExpression */:
+            case 208 /* YieldExpression */:
                 return 2;
-            case 205 /* ConditionalExpression */:
+            case 206 /* ConditionalExpression */:
                 return 4;
-            case 204 /* BinaryExpression */:
+            case 205 /* BinaryExpression */:
                 switch (operatorKind) {
                     case 27 /* CommaToken */:
                         return 0;
-                    case 59 /* EqualsToken */:
-                    case 60 /* PlusEqualsToken */:
-                    case 61 /* MinusEqualsToken */:
-                    case 63 /* AsteriskAsteriskEqualsToken */:
-                    case 62 /* AsteriskEqualsToken */:
-                    case 64 /* SlashEqualsToken */:
-                    case 65 /* PercentEqualsToken */:
-                    case 66 /* LessThanLessThanEqualsToken */:
-                    case 67 /* GreaterThanGreaterThanEqualsToken */:
-                    case 68 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
-                    case 69 /* AmpersandEqualsToken */:
-                    case 71 /* CaretEqualsToken */:
-                    case 70 /* BarEqualsToken */:
+                    case 60 /* EqualsToken */:
+                    case 61 /* PlusEqualsToken */:
+                    case 62 /* MinusEqualsToken */:
+                    case 64 /* AsteriskAsteriskEqualsToken */:
+                    case 63 /* AsteriskEqualsToken */:
+                    case 65 /* SlashEqualsToken */:
+                    case 66 /* PercentEqualsToken */:
+                    case 67 /* LessThanLessThanEqualsToken */:
+                    case 68 /* GreaterThanGreaterThanEqualsToken */:
+                    case 69 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
+                    case 70 /* AmpersandEqualsToken */:
+                    case 72 /* CaretEqualsToken */:
+                    case 71 /* BarEqualsToken */:
                         return 3;
                     default:
                         return getBinaryOperatorPrecedence(operatorKind);
                 }
-            case 202 /* PrefixUnaryExpression */:
-            case 199 /* TypeOfExpression */:
-            case 200 /* VoidExpression */:
-            case 198 /* DeleteExpression */:
-            case 201 /* AwaitExpression */:
+            case 203 /* PrefixUnaryExpression */:
+            case 200 /* TypeOfExpression */:
+            case 201 /* VoidExpression */:
+            case 199 /* DeleteExpression */:
+            case 202 /* AwaitExpression */:
                 return 16;
-            case 203 /* PostfixUnaryExpression */:
+            case 204 /* PostfixUnaryExpression */:
                 return 17;
-            case 191 /* CallExpression */:
+            case 192 /* CallExpression */:
                 return 18;
-            case 192 /* NewExpression */:
+            case 193 /* NewExpression */:
                 return hasArguments ? 19 : 18;
-            case 193 /* TaggedTemplateExpression */:
-            case 189 /* PropertyAccessExpression */:
-            case 190 /* ElementAccessExpression */:
+            case 194 /* TaggedTemplateExpression */:
+            case 190 /* PropertyAccessExpression */:
+            case 191 /* ElementAccessExpression */:
                 return 19;
-            case 100 /* ThisKeyword */:
-            case 98 /* SuperKeyword */:
-            case 72 /* Identifier */:
-            case 96 /* NullKeyword */:
-            case 102 /* TrueKeyword */:
-            case 87 /* FalseKeyword */:
+            case 101 /* ThisKeyword */:
+            case 99 /* SuperKeyword */:
+            case 73 /* Identifier */:
+            case 97 /* NullKeyword */:
+            case 103 /* TrueKeyword */:
+            case 88 /* FalseKeyword */:
             case 8 /* NumericLiteral */:
             case 9 /* BigIntLiteral */:
             case 10 /* StringLiteral */:
-            case 187 /* ArrayLiteralExpression */:
-            case 188 /* ObjectLiteralExpression */:
-            case 196 /* FunctionExpression */:
-            case 197 /* ArrowFunction */:
-            case 209 /* ClassExpression */:
-            case 260 /* JsxElement */:
-            case 261 /* JsxSelfClosingElement */:
-            case 264 /* JsxFragment */:
+            case 188 /* ArrayLiteralExpression */:
+            case 189 /* ObjectLiteralExpression */:
+            case 197 /* FunctionExpression */:
+            case 198 /* ArrowFunction */:
+            case 210 /* ClassExpression */:
+            case 261 /* JsxElement */:
+            case 262 /* JsxSelfClosingElement */:
+            case 265 /* JsxFragment */:
             case 13 /* RegularExpressionLiteral */:
             case 14 /* NoSubstitutionTemplateLiteral */:
-            case 206 /* TemplateExpression */:
-            case 195 /* ParenthesizedExpression */:
-            case 210 /* OmittedExpression */:
+            case 207 /* TemplateExpression */:
+            case 196 /* ParenthesizedExpression */:
+            case 211 /* OmittedExpression */:
                 return 20;
             default:
                 return -1;
@@ -11149,9 +11377,9 @@ var ts;
             case 30 /* GreaterThanToken */:
             case 31 /* LessThanEqualsToken */:
             case 32 /* GreaterThanEqualsToken */:
-            case 94 /* InstanceOfKeyword */:
-            case 93 /* InKeyword */:
-            case 119 /* AsKeyword */:
+            case 95 /* InstanceOfKeyword */:
+            case 94 /* InKeyword */:
+            case 120 /* AsKeyword */:
                 return 11;
             case 46 /* LessThanLessThanToken */:
             case 47 /* GreaterThanGreaterThanToken */:
@@ -11276,6 +11504,23 @@ var ts;
         return s.replace(escapedCharsRegExp, getReplacement);
     }
     ts.escapeString = escapeString;
+    /**
+     * Strip off existed single quotes or double quotes from a given string
+     *
+     * @return non-quoted string
+     */
+    function stripQuotes(name) {
+        var length = name.length;
+        if (length >= 2 && name.charCodeAt(0) === name.charCodeAt(length - 1) && startsWithQuote(name)) {
+            return name.substring(1, length - 1);
+        }
+        return name;
+    }
+    ts.stripQuotes = stripQuotes;
+    function startsWithQuote(name) {
+        return isSingleOrDoubleQuote(name.charCodeAt(0));
+    }
+    ts.startsWithQuote = startsWithQuote;
     function getReplacement(c, offset, input) {
         if (c.charCodeAt(0) === 0 /* nullCharacter */) {
             var lookAhead = input.charCodeAt(offset + c.length);
@@ -11534,23 +11779,27 @@ var ts;
     function getSourceFilesToEmit(host, targetSourceFile) {
         var options = host.getCompilerOptions();
         var isSourceFileFromExternalLibrary = function (file) { return host.isSourceFileFromExternalLibrary(file); };
+        var getResolvedProjectReferenceToRedirect = function (fileName) { return host.getResolvedProjectReferenceToRedirect(fileName); };
         if (options.outFile || options.out) {
             var moduleKind = ts.getEmitModuleKind(options);
             var moduleEmitEnabled_1 = options.emitDeclarationOnly || moduleKind === ts.ModuleKind.AMD || moduleKind === ts.ModuleKind.System;
             // Can emit only sources that are not declaration file and are either non module code or module with --module or --target es6 specified
             return ts.filter(host.getSourceFiles(), function (sourceFile) {
-                return (moduleEmitEnabled_1 || !ts.isExternalModule(sourceFile)) && sourceFileMayBeEmitted(sourceFile, options, isSourceFileFromExternalLibrary);
+                return (moduleEmitEnabled_1 || !ts.isExternalModule(sourceFile)) && sourceFileMayBeEmitted(sourceFile, options, isSourceFileFromExternalLibrary, getResolvedProjectReferenceToRedirect);
             });
         }
         else {
             var sourceFiles = targetSourceFile === undefined ? host.getSourceFiles() : [targetSourceFile];
-            return ts.filter(sourceFiles, function (sourceFile) { return sourceFileMayBeEmitted(sourceFile, options, isSourceFileFromExternalLibrary); });
+            return ts.filter(sourceFiles, function (sourceFile) { return sourceFileMayBeEmitted(sourceFile, options, isSourceFileFromExternalLibrary, getResolvedProjectReferenceToRedirect); });
         }
     }
     ts.getSourceFilesToEmit = getSourceFilesToEmit;
     /** Don't call this for `--outFile`, just for `--outDir` or plain emit. `--outFile` needs additional checks. */
-    function sourceFileMayBeEmitted(sourceFile, options, isSourceFileFromExternalLibrary) {
-        return !(options.noEmitForJsFiles && isSourceFileJS(sourceFile)) && !sourceFile.isDeclarationFile && !isSourceFileFromExternalLibrary(sourceFile);
+    function sourceFileMayBeEmitted(sourceFile, options, isSourceFileFromExternalLibrary, getResolvedProjectReferenceToRedirect) {
+        return !(options.noEmitForJsFiles && isSourceFileJS(sourceFile)) &&
+            !sourceFile.isDeclarationFile &&
+            !isSourceFileFromExternalLibrary(sourceFile) &&
+            !(isJsonSourceFile(sourceFile) && getResolvedProjectReferenceToRedirect(sourceFile.fileName));
     }
     ts.sourceFileMayBeEmitted = sourceFileMayBeEmitted;
     function getSourceFilePathInNewDir(fileName, host, newDirPath) {
@@ -11609,11 +11858,11 @@ var ts;
     }
     ts.parameterIsThisKeyword = parameterIsThisKeyword;
     function isThisIdentifier(node) {
-        return !!node && node.kind === 72 /* Identifier */ && identifierIsThisKeyword(node);
+        return !!node && node.kind === 73 /* Identifier */ && identifierIsThisKeyword(node);
     }
     ts.isThisIdentifier = isThisIdentifier;
     function identifierIsThisKeyword(id) {
-        return id.originalKeywordKind === 100 /* ThisKeyword */;
+        return id.originalKeywordKind === 101 /* ThisKeyword */;
     }
     ts.identifierIsThisKeyword = identifierIsThisKeyword;
     function getAllAccessorDeclarations(declarations, accessor) {
@@ -11624,10 +11873,10 @@ var ts;
         var setAccessor;
         if (hasDynamicName(accessor)) {
             firstAccessor = accessor;
-            if (accessor.kind === 158 /* GetAccessor */) {
+            if (accessor.kind === 159 /* GetAccessor */) {
                 getAccessor = accessor;
             }
-            else if (accessor.kind === 159 /* SetAccessor */) {
+            else if (accessor.kind === 160 /* SetAccessor */) {
                 setAccessor = accessor;
             }
             else {
@@ -11647,10 +11896,10 @@ var ts;
                         else if (!secondAccessor) {
                             secondAccessor = member;
                         }
-                        if (member.kind === 158 /* GetAccessor */ && !getAccessor) {
+                        if (member.kind === 159 /* GetAccessor */ && !getAccessor) {
                             getAccessor = member;
                         }
-                        if (member.kind === 159 /* SetAccessor */ && !setAccessor) {
+                        if (member.kind === 160 /* SetAccessor */ && !setAccessor) {
                             setAccessor = member;
                         }
                     }
@@ -11696,7 +11945,7 @@ var ts;
     ts.getJSDocTypeParameterDeclarations = getJSDocTypeParameterDeclarations;
     /** template tags are only available when a typedef isn't already using them */
     function isNonTypeAliasTemplate(tag) {
-        return ts.isJSDocTemplateTag(tag) && !(tag.parent.kind === 296 /* JSDocComment */ && tag.parent.tags.some(isJSDocTypeAlias));
+        return ts.isJSDocTemplateTag(tag) && !(tag.parent.kind === 297 /* JSDocComment */ && tag.parent.tags.some(isJSDocTypeAlias));
     }
     /**
      * Gets the effective type annotation of the value parameter of a set accessor. If the node
@@ -11936,7 +12185,7 @@ var ts;
                 flags |= modifierToFlag(modifier.kind);
             }
         }
-        if (node.flags & 4 /* NestedNamespace */ || (node.kind === 72 /* Identifier */ && node.isInJSDocNamespace)) {
+        if (node.flags & 4 /* NestedNamespace */ || (node.kind === 73 /* Identifier */ && node.isInJSDocNamespace)) {
             flags |= 1 /* Export */;
         }
         return flags;
@@ -11944,17 +12193,17 @@ var ts;
     ts.getModifierFlagsNoCache = getModifierFlagsNoCache;
     function modifierToFlag(token) {
         switch (token) {
-            case 116 /* StaticKeyword */: return 32 /* Static */;
-            case 115 /* PublicKeyword */: return 4 /* Public */;
-            case 114 /* ProtectedKeyword */: return 16 /* Protected */;
-            case 113 /* PrivateKeyword */: return 8 /* Private */;
-            case 118 /* AbstractKeyword */: return 128 /* Abstract */;
-            case 85 /* ExportKeyword */: return 1 /* Export */;
-            case 125 /* DeclareKeyword */: return 2 /* Ambient */;
-            case 77 /* ConstKeyword */: return 2048 /* Const */;
-            case 80 /* DefaultKeyword */: return 512 /* Default */;
-            case 121 /* AsyncKeyword */: return 256 /* Async */;
-            case 133 /* ReadonlyKeyword */: return 64 /* Readonly */;
+            case 117 /* StaticKeyword */: return 32 /* Static */;
+            case 116 /* PublicKeyword */: return 4 /* Public */;
+            case 115 /* ProtectedKeyword */: return 16 /* Protected */;
+            case 114 /* PrivateKeyword */: return 8 /* Private */;
+            case 119 /* AbstractKeyword */: return 128 /* Abstract */;
+            case 86 /* ExportKeyword */: return 1 /* Export */;
+            case 126 /* DeclareKeyword */: return 2 /* Ambient */;
+            case 78 /* ConstKeyword */: return 2048 /* Const */;
+            case 81 /* DefaultKeyword */: return 512 /* Default */;
+            case 122 /* AsyncKeyword */: return 256 /* Async */;
+            case 134 /* ReadonlyKeyword */: return 64 /* Readonly */;
         }
         return 0 /* None */;
     }
@@ -11966,7 +12215,7 @@ var ts;
     }
     ts.isLogicalOperator = isLogicalOperator;
     function isAssignmentOperator(token) {
-        return token >= 59 /* FirstAssignment */ && token <= 71 /* LastAssignment */;
+        return token >= 60 /* FirstAssignment */ && token <= 72 /* LastAssignment */;
     }
     ts.isAssignmentOperator = isAssignmentOperator;
     /** Get `C` given `N` if `N` is in the position `class C extends N` where `N` is an ExpressionWithTypeArguments. */
@@ -11979,14 +12228,14 @@ var ts;
         return ts.isExpressionWithTypeArguments(node)
             && ts.isHeritageClause(node.parent)
             && ts.isClassLike(node.parent.parent)
-            ? { class: node.parent.parent, isImplements: node.parent.token === 109 /* ImplementsKeyword */ }
+            ? { class: node.parent.parent, isImplements: node.parent.token === 110 /* ImplementsKeyword */ }
             : undefined;
     }
     ts.tryGetClassImplementingOrExtendingExpressionWithTypeArguments = tryGetClassImplementingOrExtendingExpressionWithTypeArguments;
     function isAssignmentExpression(node, excludeCompoundAssignment) {
         return ts.isBinaryExpression(node)
             && (excludeCompoundAssignment
-                ? node.operatorToken.kind === 59 /* EqualsToken */
+                ? node.operatorToken.kind === 60 /* EqualsToken */
                 : isAssignmentOperator(node.operatorToken.kind))
             && ts.isLeftHandSideExpression(node.left);
     }
@@ -11994,8 +12243,8 @@ var ts;
     function isDestructuringAssignment(node) {
         if (isAssignmentExpression(node, /*excludeCompoundAssignment*/ true)) {
             var kind = node.left.kind;
-            return kind === 188 /* ObjectLiteralExpression */
-                || kind === 187 /* ArrayLiteralExpression */;
+            return kind === 189 /* ObjectLiteralExpression */
+                || kind === 188 /* ArrayLiteralExpression */;
         }
         return false;
     }
@@ -12005,29 +12254,39 @@ var ts;
     }
     ts.isExpressionWithTypeArgumentsInClassExtendsClause = isExpressionWithTypeArgumentsInClassExtendsClause;
     function isEntityNameExpression(node) {
-        return node.kind === 72 /* Identifier */ || isPropertyAccessEntityNameExpression(node);
+        return node.kind === 73 /* Identifier */ || isPropertyAccessEntityNameExpression(node);
     }
     ts.isEntityNameExpression = isEntityNameExpression;
     function isPropertyAccessEntityNameExpression(node) {
         return ts.isPropertyAccessExpression(node) && isEntityNameExpression(node.expression);
     }
     ts.isPropertyAccessEntityNameExpression = isPropertyAccessEntityNameExpression;
+    function tryGetPropertyAccessOrIdentifierToString(expr) {
+        if (ts.isPropertyAccessExpression(expr)) {
+            return tryGetPropertyAccessOrIdentifierToString(expr.expression) + "." + expr.name;
+        }
+        if (ts.isIdentifier(expr)) {
+            return ts.unescapeLeadingUnderscores(expr.escapedText);
+        }
+        return undefined;
+    }
+    ts.tryGetPropertyAccessOrIdentifierToString = tryGetPropertyAccessOrIdentifierToString;
     function isPrototypeAccess(node) {
         return ts.isPropertyAccessExpression(node) && node.name.escapedText === "prototype";
     }
     ts.isPrototypeAccess = isPrototypeAccess;
     function isRightSideOfQualifiedNameOrPropertyAccess(node) {
-        return (node.parent.kind === 148 /* QualifiedName */ && node.parent.right === node) ||
-            (node.parent.kind === 189 /* PropertyAccessExpression */ && node.parent.name === node);
+        return (node.parent.kind === 149 /* QualifiedName */ && node.parent.right === node) ||
+            (node.parent.kind === 190 /* PropertyAccessExpression */ && node.parent.name === node);
     }
     ts.isRightSideOfQualifiedNameOrPropertyAccess = isRightSideOfQualifiedNameOrPropertyAccess;
     function isEmptyObjectLiteral(expression) {
-        return expression.kind === 188 /* ObjectLiteralExpression */ &&
+        return expression.kind === 189 /* ObjectLiteralExpression */ &&
             expression.properties.length === 0;
     }
     ts.isEmptyObjectLiteral = isEmptyObjectLiteral;
     function isEmptyArrayLiteral(expression) {
-        return expression.kind === 187 /* ArrayLiteralExpression */ &&
+        return expression.kind === 188 /* ArrayLiteralExpression */ &&
             expression.elements.length === 0;
     }
     ts.isEmptyArrayLiteral = isEmptyArrayLiteral;
@@ -12215,77 +12474,6 @@ var ts;
         return getNewLine ? getNewLine() : ts.sys ? ts.sys.newLine : carriageReturnLineFeed;
     }
     ts.getNewLineCharacter = getNewLineCharacter;
-    /**
-     * Formats an enum value as a string for debugging and debug assertions.
-     */
-    function formatEnum(value, enumObject, isFlags) {
-        if (value === void 0) { value = 0; }
-        var members = getEnumMembers(enumObject);
-        if (value === 0) {
-            return members.length > 0 && members[0][0] === 0 ? members[0][1] : "0";
-        }
-        if (isFlags) {
-            var result = "";
-            var remainingFlags = value;
-            for (var i = members.length - 1; i >= 0 && remainingFlags !== 0; i--) {
-                var _a = members[i], enumValue = _a[0], enumName = _a[1];
-                if (enumValue !== 0 && (remainingFlags & enumValue) === enumValue) {
-                    remainingFlags &= ~enumValue;
-                    result = "" + enumName + (result ? ", " : "") + result;
-                }
-            }
-            if (remainingFlags === 0) {
-                return result;
-            }
-        }
-        else {
-            for (var _i = 0, members_1 = members; _i < members_1.length; _i++) {
-                var _b = members_1[_i], enumValue = _b[0], enumName = _b[1];
-                if (enumValue === value) {
-                    return enumName;
-                }
-            }
-        }
-        return value.toString();
-    }
-    function getEnumMembers(enumObject) {
-        var result = [];
-        for (var name in enumObject) {
-            var value = enumObject[name];
-            if (typeof value === "number") {
-                result.push([value, name]);
-            }
-        }
-        return ts.stableSort(result, function (x, y) { return ts.compareValues(x[0], y[0]); });
-    }
-    function formatSyntaxKind(kind) {
-        return formatEnum(kind, ts.SyntaxKind, /*isFlags*/ false);
-    }
-    ts.formatSyntaxKind = formatSyntaxKind;
-    function formatModifierFlags(flags) {
-        return formatEnum(flags, ts.ModifierFlags, /*isFlags*/ true);
-    }
-    ts.formatModifierFlags = formatModifierFlags;
-    function formatTransformFlags(flags) {
-        return formatEnum(flags, ts.TransformFlags, /*isFlags*/ true);
-    }
-    ts.formatTransformFlags = formatTransformFlags;
-    function formatEmitFlags(flags) {
-        return formatEnum(flags, ts.EmitFlags, /*isFlags*/ true);
-    }
-    ts.formatEmitFlags = formatEmitFlags;
-    function formatSymbolFlags(flags) {
-        return formatEnum(flags, ts.SymbolFlags, /*isFlags*/ true);
-    }
-    ts.formatSymbolFlags = formatSymbolFlags;
-    function formatTypeFlags(flags) {
-        return formatEnum(flags, ts.TypeFlags, /*isFlags*/ true);
-    }
-    ts.formatTypeFlags = formatTypeFlags;
-    function formatObjectFlags(flags) {
-        return formatEnum(flags, ts.ObjectFlags, /*isFlags*/ true);
-    }
-    ts.formatObjectFlags = formatObjectFlags;
     /**
      * Creates a new TextRange from the provided pos and end.
      *
@@ -12375,6 +12563,10 @@ var ts;
         return positionsAreOnSameLine(range1.end, getStartPositionOfRange(range2, sourceFile), sourceFile);
     }
     ts.rangeEndIsOnSameLineAsRangeStart = rangeEndIsOnSameLineAsRangeStart;
+    function isNodeArrayMultiLine(list, sourceFile) {
+        return !positionsAreOnSameLine(list.pos, list.end, sourceFile);
+    }
+    ts.isNodeArrayMultiLine = isNodeArrayMultiLine;
     function positionsAreOnSameLine(pos1, pos2, sourceFile) {
         return pos1 === pos2 ||
             getLineOfLocalPosition(sourceFile, pos1) === getLineOfLocalPosition(sourceFile, pos2);
@@ -12392,8 +12584,8 @@ var ts;
         var parseNode = ts.getParseTreeNode(node);
         if (parseNode) {
             switch (parseNode.parent.kind) {
-                case 243 /* EnumDeclaration */:
-                case 244 /* ModuleDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     return parseNode === parseNode.parent.name;
             }
         }
@@ -12427,10 +12619,10 @@ var ts;
         }
         if (getCheckFlags(s) & 6 /* Synthetic */) {
             var checkFlags = s.checkFlags;
-            var accessModifier = checkFlags & 512 /* ContainsPrivate */ ? 8 /* Private */ :
-                checkFlags & 128 /* ContainsPublic */ ? 4 /* Public */ :
+            var accessModifier = checkFlags & 1024 /* ContainsPrivate */ ? 8 /* Private */ :
+                checkFlags & 256 /* ContainsPublic */ ? 4 /* Public */ :
                     16 /* Protected */;
-            var staticModifier = checkFlags & 1024 /* ContainsStatic */ ? 32 /* Static */ : 0;
+            var staticModifier = checkFlags & 2048 /* ContainsStatic */ ? 32 /* Static */ : 0;
             return accessModifier | staticModifier;
         }
         if (s.flags & 4194304 /* Prototype */) {
@@ -12470,35 +12662,35 @@ var ts;
         if (!parent)
             return 0 /* Read */;
         switch (parent.kind) {
-            case 195 /* ParenthesizedExpression */:
+            case 196 /* ParenthesizedExpression */:
                 return accessKind(parent);
-            case 203 /* PostfixUnaryExpression */:
-            case 202 /* PrefixUnaryExpression */:
+            case 204 /* PostfixUnaryExpression */:
+            case 203 /* PrefixUnaryExpression */:
                 var operator = parent.operator;
                 return operator === 44 /* PlusPlusToken */ || operator === 45 /* MinusMinusToken */ ? writeOrReadWrite() : 0 /* Read */;
-            case 204 /* BinaryExpression */:
+            case 205 /* BinaryExpression */:
                 var _a = parent, left = _a.left, operatorToken = _a.operatorToken;
                 return left === node && isAssignmentOperator(operatorToken.kind) ?
-                    operatorToken.kind === 59 /* EqualsToken */ ? 1 /* Write */ : writeOrReadWrite()
+                    operatorToken.kind === 60 /* EqualsToken */ ? 1 /* Write */ : writeOrReadWrite()
                     : 0 /* Read */;
-            case 189 /* PropertyAccessExpression */:
+            case 190 /* PropertyAccessExpression */:
                 return parent.name !== node ? 0 /* Read */ : accessKind(parent);
-            case 275 /* PropertyAssignment */: {
+            case 276 /* PropertyAssignment */: {
                 var parentAccess = accessKind(parent.parent);
                 // In `({ x: varname }) = { x: 1 }`, the left `x` is a read, the right `x` is a write.
                 return node === parent.name ? reverseAccessKind(parentAccess) : parentAccess;
             }
-            case 276 /* ShorthandPropertyAssignment */:
+            case 277 /* ShorthandPropertyAssignment */:
                 // Assume it's the local variable being accessed, since we don't check public properties for --noUnusedLocals.
                 return node === parent.objectAssignmentInitializer ? 0 /* Read */ : accessKind(parent.parent);
-            case 187 /* ArrayLiteralExpression */:
+            case 188 /* ArrayLiteralExpression */:
                 return accessKind(parent);
             default:
                 return 0 /* Read */;
         }
         function writeOrReadWrite() {
             // If grandparent is not an ExpressionStatement, this is used as an expression in addition to having a side effect.
-            return parent.parent && skipParenthesesUp(parent.parent).kind === 221 /* ExpressionStatement */ ? 1 /* Write */ : 2 /* ReadWrite */;
+            return parent.parent && skipParenthesesUp(parent.parent).kind === 222 /* ExpressionStatement */ ? 1 /* Write */ : 2 /* ReadWrite */;
         }
     }
     function reverseAccessKind(a) {
@@ -12601,7 +12793,7 @@ var ts;
     }
     ts.getClassLikeDeclarationOfSymbol = getClassLikeDeclarationOfSymbol;
     function getObjectFlags(type) {
-        return type.flags & 3768320 /* ObjectFlagsType */ ? type.objectFlags : 0;
+        return type.flags & 3899392 /* ObjectFlagsType */ ? type.objectFlags : 0;
     }
     ts.getObjectFlags = getObjectFlags;
     function typeHasCallOrConstructSignatures(type, checker) {
@@ -12653,32 +12845,32 @@ var ts;
     }
     ts.isObjectTypeDeclaration = isObjectTypeDeclaration;
     function isTypeNodeKind(kind) {
-        return (kind >= 163 /* FirstTypeNode */ && kind <= 183 /* LastTypeNode */)
-            || kind === 120 /* AnyKeyword */
-            || kind === 143 /* UnknownKeyword */
-            || kind === 135 /* NumberKeyword */
-            || kind === 146 /* BigIntKeyword */
-            || kind === 136 /* ObjectKeyword */
-            || kind === 123 /* BooleanKeyword */
-            || kind === 138 /* StringKeyword */
-            || kind === 139 /* SymbolKeyword */
-            || kind === 100 /* ThisKeyword */
-            || kind === 106 /* VoidKeyword */
-            || kind === 141 /* UndefinedKeyword */
-            || kind === 96 /* NullKeyword */
-            || kind === 132 /* NeverKeyword */
-            || kind === 211 /* ExpressionWithTypeArguments */
-            || kind === 289 /* JSDocAllType */
-            || kind === 290 /* JSDocUnknownType */
-            || kind === 291 /* JSDocNullableType */
-            || kind === 292 /* JSDocNonNullableType */
-            || kind === 293 /* JSDocOptionalType */
-            || kind === 294 /* JSDocFunctionType */
-            || kind === 295 /* JSDocVariadicType */;
+        return (kind >= 164 /* FirstTypeNode */ && kind <= 184 /* LastTypeNode */)
+            || kind === 121 /* AnyKeyword */
+            || kind === 144 /* UnknownKeyword */
+            || kind === 136 /* NumberKeyword */
+            || kind === 147 /* BigIntKeyword */
+            || kind === 137 /* ObjectKeyword */
+            || kind === 124 /* BooleanKeyword */
+            || kind === 139 /* StringKeyword */
+            || kind === 140 /* SymbolKeyword */
+            || kind === 101 /* ThisKeyword */
+            || kind === 107 /* VoidKeyword */
+            || kind === 142 /* UndefinedKeyword */
+            || kind === 97 /* NullKeyword */
+            || kind === 133 /* NeverKeyword */
+            || kind === 212 /* ExpressionWithTypeArguments */
+            || kind === 290 /* JSDocAllType */
+            || kind === 291 /* JSDocUnknownType */
+            || kind === 292 /* JSDocNullableType */
+            || kind === 293 /* JSDocNonNullableType */
+            || kind === 294 /* JSDocOptionalType */
+            || kind === 295 /* JSDocFunctionType */
+            || kind === 296 /* JSDocVariadicType */;
     }
     ts.isTypeNodeKind = isTypeNodeKind;
     function isAccessExpression(node) {
-        return node.kind === 189 /* PropertyAccessExpression */ || node.kind === 190 /* ElementAccessExpression */;
+        return node.kind === 190 /* PropertyAccessExpression */ || node.kind === 191 /* ElementAccessExpression */;
     }
     ts.isAccessExpression = isAccessExpression;
     function isBundleFileTextLike(section) {
@@ -12695,8 +12887,10 @@ var ts;
 (function (ts) {
     function getDefaultLibFileName(options) {
         switch (options.target) {
-            case 7 /* ESNext */:
+            case 99 /* ESNext */:
                 return "lib.esnext.full.d.ts";
+            case 7 /* ES2020 */:
+                return "lib.es2020.full.d.ts";
             case 6 /* ES2019 */:
                 return "lib.es2019.full.d.ts";
             case 5 /* ES2018 */:
@@ -12913,9 +13107,9 @@ var ts;
     }
     ts.collapseTextChangeRangesAcrossMultipleVersions = collapseTextChangeRangesAcrossMultipleVersions;
     function getTypeParameterOwner(d) {
-        if (d && d.kind === 150 /* TypeParameter */) {
+        if (d && d.kind === 151 /* TypeParameter */) {
             for (var current = d; current; current = current.parent) {
-                if (ts.isFunctionLike(current) || ts.isClassLike(current) || current.kind === 241 /* InterfaceDeclaration */) {
+                if (ts.isFunctionLike(current) || ts.isClassLike(current) || current.kind === 242 /* InterfaceDeclaration */) {
                     return current;
                 }
             }
@@ -12923,7 +13117,7 @@ var ts;
     }
     ts.getTypeParameterOwner = getTypeParameterOwner;
     function isParameterPropertyDeclaration(node) {
-        return ts.hasModifier(node, 92 /* ParameterPropertyModifier */) && node.parent.kind === 157 /* Constructor */;
+        return ts.hasModifier(node, 92 /* ParameterPropertyModifier */) && node.parent.kind === 158 /* Constructor */;
     }
     ts.isParameterPropertyDeclaration = isParameterPropertyDeclaration;
     function isEmptyBindingPattern(node) {
@@ -12953,14 +13147,14 @@ var ts;
             node = walkUpBindingElementsAndPatterns(node);
         }
         var flags = getFlags(node);
-        if (node.kind === 237 /* VariableDeclaration */) {
+        if (node.kind === 238 /* VariableDeclaration */) {
             node = node.parent;
         }
-        if (node && node.kind === 238 /* VariableDeclarationList */) {
+        if (node && node.kind === 239 /* VariableDeclarationList */) {
             flags |= getFlags(node);
             node = node.parent;
         }
-        if (node && node.kind === 219 /* VariableStatement */) {
+        if (node && node.kind === 220 /* VariableStatement */) {
             flags |= getFlags(node);
         }
         return flags;
@@ -13106,27 +13300,27 @@ var ts;
         }
         // Covers remaining cases (returning undefined if none match).
         switch (hostNode.kind) {
-            case 219 /* VariableStatement */:
+            case 220 /* VariableStatement */:
                 if (hostNode.declarationList && hostNode.declarationList.declarations[0]) {
                     return getDeclarationIdentifier(hostNode.declarationList.declarations[0]);
                 }
                 break;
-            case 221 /* ExpressionStatement */:
+            case 222 /* ExpressionStatement */:
                 var expr = hostNode.expression;
                 switch (expr.kind) {
-                    case 189 /* PropertyAccessExpression */:
+                    case 190 /* PropertyAccessExpression */:
                         return expr.name;
-                    case 190 /* ElementAccessExpression */:
+                    case 191 /* ElementAccessExpression */:
                         var arg = expr.argumentExpression;
                         if (ts.isIdentifier(arg)) {
                             return arg;
                         }
                 }
                 break;
-            case 195 /* ParenthesizedExpression */: {
+            case 196 /* ParenthesizedExpression */: {
                 return getDeclarationIdentifier(hostNode.expression);
             }
-            case 233 /* LabeledStatement */: {
+            case 234 /* LabeledStatement */: {
                 if (ts.isDeclaration(hostNode.statement) || ts.isExpression(hostNode.statement)) {
                     return getDeclarationIdentifier(hostNode.statement);
                 }
@@ -13150,18 +13344,18 @@ var ts;
     /** @internal */
     function getNonAssignedNameOfDeclaration(declaration) {
         switch (declaration.kind) {
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 return declaration;
-            case 310 /* JSDocPropertyTag */:
-            case 304 /* JSDocParameterTag */: {
+            case 312 /* JSDocPropertyTag */:
+            case 306 /* JSDocParameterTag */: {
                 var name = declaration.name;
-                if (name.kind === 148 /* QualifiedName */) {
+                if (name.kind === 149 /* QualifiedName */) {
                     return name.right;
                 }
                 break;
             }
-            case 191 /* CallExpression */:
-            case 204 /* BinaryExpression */: {
+            case 192 /* CallExpression */:
+            case 205 /* BinaryExpression */: {
                 var expr = declaration;
                 switch (ts.getAssignmentDeclarationKind(expr)) {
                     case 1 /* ExportsProperty */:
@@ -13177,9 +13371,9 @@ var ts;
                         return undefined;
                 }
             }
-            case 309 /* JSDocTypedefTag */:
+            case 311 /* JSDocTypedefTag */:
                 return getNameOfJSDocTypedef(declaration);
-            case 254 /* ExportAssignment */: {
+            case 255 /* ExportAssignment */: {
                 var expression = declaration.expression;
                 return ts.isIdentifier(expression) ? expression : undefined;
             }
@@ -13209,6 +13403,9 @@ var ts;
                 return node.parent.left.name;
             }
         }
+        else if (ts.isVariableDeclaration(node.parent) && ts.isIdentifier(node.parent.name)) {
+            return node.parent.name;
+        }
     }
     /**
      * Gets the JSDoc parameter tags for the node if present.
@@ -13381,7 +13578,7 @@ var ts;
             return ts.emptyArray;
         }
         if (ts.isJSDocTypeAlias(node)) {
-            ts.Debug.assert(node.parent.kind === 296 /* JSDocComment */);
+            ts.Debug.assert(node.parent.kind === 297 /* JSDocComment */);
             return ts.flatMap(node.parent.tags, function (tag) { return ts.isJSDocTemplateTag(tag) ? tag.typeParameters : undefined; });
         }
         if (node.typeParameters) {
@@ -13449,198 +13646,198 @@ var ts;
     }
     ts.isTemplateTail = isTemplateTail;
     function isIdentifier(node) {
-        return node.kind === 72 /* Identifier */;
+        return node.kind === 73 /* Identifier */;
     }
     ts.isIdentifier = isIdentifier;
     // Names
     function isQualifiedName(node) {
-        return node.kind === 148 /* QualifiedName */;
+        return node.kind === 149 /* QualifiedName */;
     }
     ts.isQualifiedName = isQualifiedName;
     function isComputedPropertyName(node) {
-        return node.kind === 149 /* ComputedPropertyName */;
+        return node.kind === 150 /* ComputedPropertyName */;
     }
     ts.isComputedPropertyName = isComputedPropertyName;
     // Signature elements
     function isTypeParameterDeclaration(node) {
-        return node.kind === 150 /* TypeParameter */;
+        return node.kind === 151 /* TypeParameter */;
     }
     ts.isTypeParameterDeclaration = isTypeParameterDeclaration;
     function isParameter(node) {
-        return node.kind === 151 /* Parameter */;
+        return node.kind === 152 /* Parameter */;
     }
     ts.isParameter = isParameter;
     function isDecorator(node) {
-        return node.kind === 152 /* Decorator */;
+        return node.kind === 153 /* Decorator */;
     }
     ts.isDecorator = isDecorator;
     // TypeMember
     function isPropertySignature(node) {
-        return node.kind === 153 /* PropertySignature */;
+        return node.kind === 154 /* PropertySignature */;
     }
     ts.isPropertySignature = isPropertySignature;
     function isPropertyDeclaration(node) {
-        return node.kind === 154 /* PropertyDeclaration */;
+        return node.kind === 155 /* PropertyDeclaration */;
     }
     ts.isPropertyDeclaration = isPropertyDeclaration;
     function isMethodSignature(node) {
-        return node.kind === 155 /* MethodSignature */;
+        return node.kind === 156 /* MethodSignature */;
     }
     ts.isMethodSignature = isMethodSignature;
     function isMethodDeclaration(node) {
-        return node.kind === 156 /* MethodDeclaration */;
+        return node.kind === 157 /* MethodDeclaration */;
     }
     ts.isMethodDeclaration = isMethodDeclaration;
     function isConstructorDeclaration(node) {
-        return node.kind === 157 /* Constructor */;
+        return node.kind === 158 /* Constructor */;
     }
     ts.isConstructorDeclaration = isConstructorDeclaration;
     function isGetAccessorDeclaration(node) {
-        return node.kind === 158 /* GetAccessor */;
+        return node.kind === 159 /* GetAccessor */;
     }
     ts.isGetAccessorDeclaration = isGetAccessorDeclaration;
     function isSetAccessorDeclaration(node) {
-        return node.kind === 159 /* SetAccessor */;
+        return node.kind === 160 /* SetAccessor */;
     }
     ts.isSetAccessorDeclaration = isSetAccessorDeclaration;
     function isCallSignatureDeclaration(node) {
-        return node.kind === 160 /* CallSignature */;
+        return node.kind === 161 /* CallSignature */;
     }
     ts.isCallSignatureDeclaration = isCallSignatureDeclaration;
     function isConstructSignatureDeclaration(node) {
-        return node.kind === 161 /* ConstructSignature */;
+        return node.kind === 162 /* ConstructSignature */;
     }
     ts.isConstructSignatureDeclaration = isConstructSignatureDeclaration;
     function isIndexSignatureDeclaration(node) {
-        return node.kind === 162 /* IndexSignature */;
+        return node.kind === 163 /* IndexSignature */;
     }
     ts.isIndexSignatureDeclaration = isIndexSignatureDeclaration;
     /* @internal */
     function isGetOrSetAccessorDeclaration(node) {
-        return node.kind === 159 /* SetAccessor */ || node.kind === 158 /* GetAccessor */;
+        return node.kind === 160 /* SetAccessor */ || node.kind === 159 /* GetAccessor */;
     }
     ts.isGetOrSetAccessorDeclaration = isGetOrSetAccessorDeclaration;
     // Type
     function isTypePredicateNode(node) {
-        return node.kind === 163 /* TypePredicate */;
+        return node.kind === 164 /* TypePredicate */;
     }
     ts.isTypePredicateNode = isTypePredicateNode;
     function isTypeReferenceNode(node) {
-        return node.kind === 164 /* TypeReference */;
+        return node.kind === 165 /* TypeReference */;
     }
     ts.isTypeReferenceNode = isTypeReferenceNode;
     function isFunctionTypeNode(node) {
-        return node.kind === 165 /* FunctionType */;
+        return node.kind === 166 /* FunctionType */;
     }
     ts.isFunctionTypeNode = isFunctionTypeNode;
     function isConstructorTypeNode(node) {
-        return node.kind === 166 /* ConstructorType */;
+        return node.kind === 167 /* ConstructorType */;
     }
     ts.isConstructorTypeNode = isConstructorTypeNode;
     function isTypeQueryNode(node) {
-        return node.kind === 167 /* TypeQuery */;
+        return node.kind === 168 /* TypeQuery */;
     }
     ts.isTypeQueryNode = isTypeQueryNode;
     function isTypeLiteralNode(node) {
-        return node.kind === 168 /* TypeLiteral */;
+        return node.kind === 169 /* TypeLiteral */;
     }
     ts.isTypeLiteralNode = isTypeLiteralNode;
     function isArrayTypeNode(node) {
-        return node.kind === 169 /* ArrayType */;
+        return node.kind === 170 /* ArrayType */;
     }
     ts.isArrayTypeNode = isArrayTypeNode;
     function isTupleTypeNode(node) {
-        return node.kind === 170 /* TupleType */;
+        return node.kind === 171 /* TupleType */;
     }
     ts.isTupleTypeNode = isTupleTypeNode;
     function isUnionTypeNode(node) {
-        return node.kind === 173 /* UnionType */;
+        return node.kind === 174 /* UnionType */;
     }
     ts.isUnionTypeNode = isUnionTypeNode;
     function isIntersectionTypeNode(node) {
-        return node.kind === 174 /* IntersectionType */;
+        return node.kind === 175 /* IntersectionType */;
     }
     ts.isIntersectionTypeNode = isIntersectionTypeNode;
     function isConditionalTypeNode(node) {
-        return node.kind === 175 /* ConditionalType */;
+        return node.kind === 176 /* ConditionalType */;
     }
     ts.isConditionalTypeNode = isConditionalTypeNode;
     function isInferTypeNode(node) {
-        return node.kind === 176 /* InferType */;
+        return node.kind === 177 /* InferType */;
     }
     ts.isInferTypeNode = isInferTypeNode;
     function isParenthesizedTypeNode(node) {
-        return node.kind === 177 /* ParenthesizedType */;
+        return node.kind === 178 /* ParenthesizedType */;
     }
     ts.isParenthesizedTypeNode = isParenthesizedTypeNode;
     function isThisTypeNode(node) {
-        return node.kind === 178 /* ThisType */;
+        return node.kind === 179 /* ThisType */;
     }
     ts.isThisTypeNode = isThisTypeNode;
     function isTypeOperatorNode(node) {
-        return node.kind === 179 /* TypeOperator */;
+        return node.kind === 180 /* TypeOperator */;
     }
     ts.isTypeOperatorNode = isTypeOperatorNode;
     function isIndexedAccessTypeNode(node) {
-        return node.kind === 180 /* IndexedAccessType */;
+        return node.kind === 181 /* IndexedAccessType */;
     }
     ts.isIndexedAccessTypeNode = isIndexedAccessTypeNode;
     function isMappedTypeNode(node) {
-        return node.kind === 181 /* MappedType */;
+        return node.kind === 182 /* MappedType */;
     }
     ts.isMappedTypeNode = isMappedTypeNode;
     function isLiteralTypeNode(node) {
-        return node.kind === 182 /* LiteralType */;
+        return node.kind === 183 /* LiteralType */;
     }
     ts.isLiteralTypeNode = isLiteralTypeNode;
     function isImportTypeNode(node) {
-        return node.kind === 183 /* ImportType */;
+        return node.kind === 184 /* ImportType */;
     }
     ts.isImportTypeNode = isImportTypeNode;
     // Binding patterns
     function isObjectBindingPattern(node) {
-        return node.kind === 184 /* ObjectBindingPattern */;
+        return node.kind === 185 /* ObjectBindingPattern */;
     }
     ts.isObjectBindingPattern = isObjectBindingPattern;
     function isArrayBindingPattern(node) {
-        return node.kind === 185 /* ArrayBindingPattern */;
+        return node.kind === 186 /* ArrayBindingPattern */;
     }
     ts.isArrayBindingPattern = isArrayBindingPattern;
     function isBindingElement(node) {
-        return node.kind === 186 /* BindingElement */;
+        return node.kind === 187 /* BindingElement */;
     }
     ts.isBindingElement = isBindingElement;
     // Expression
     function isArrayLiteralExpression(node) {
-        return node.kind === 187 /* ArrayLiteralExpression */;
+        return node.kind === 188 /* ArrayLiteralExpression */;
     }
     ts.isArrayLiteralExpression = isArrayLiteralExpression;
     function isObjectLiteralExpression(node) {
-        return node.kind === 188 /* ObjectLiteralExpression */;
+        return node.kind === 189 /* ObjectLiteralExpression */;
     }
     ts.isObjectLiteralExpression = isObjectLiteralExpression;
     function isPropertyAccessExpression(node) {
-        return node.kind === 189 /* PropertyAccessExpression */;
+        return node.kind === 190 /* PropertyAccessExpression */;
     }
     ts.isPropertyAccessExpression = isPropertyAccessExpression;
     function isElementAccessExpression(node) {
-        return node.kind === 190 /* ElementAccessExpression */;
+        return node.kind === 191 /* ElementAccessExpression */;
     }
     ts.isElementAccessExpression = isElementAccessExpression;
     function isCallExpression(node) {
-        return node.kind === 191 /* CallExpression */;
+        return node.kind === 192 /* CallExpression */;
     }
     ts.isCallExpression = isCallExpression;
     function isNewExpression(node) {
-        return node.kind === 192 /* NewExpression */;
+        return node.kind === 193 /* NewExpression */;
     }
     ts.isNewExpression = isNewExpression;
     function isTaggedTemplateExpression(node) {
-        return node.kind === 193 /* TaggedTemplateExpression */;
+        return node.kind === 194 /* TaggedTemplateExpression */;
     }
     ts.isTaggedTemplateExpression = isTaggedTemplateExpression;
     function isTypeAssertion(node) {
-        return node.kind === 194 /* TypeAssertionExpression */;
+        return node.kind === 195 /* TypeAssertionExpression */;
     }
     ts.isTypeAssertion = isTypeAssertion;
     function isConstTypeReference(node) {
@@ -13649,376 +13846,376 @@ var ts;
     }
     ts.isConstTypeReference = isConstTypeReference;
     function isParenthesizedExpression(node) {
-        return node.kind === 195 /* ParenthesizedExpression */;
+        return node.kind === 196 /* ParenthesizedExpression */;
     }
     ts.isParenthesizedExpression = isParenthesizedExpression;
     function skipPartiallyEmittedExpressions(node) {
-        while (node.kind === 313 /* PartiallyEmittedExpression */) {
+        while (node.kind === 315 /* PartiallyEmittedExpression */) {
             node = node.expression;
         }
         return node;
     }
     ts.skipPartiallyEmittedExpressions = skipPartiallyEmittedExpressions;
     function isFunctionExpression(node) {
-        return node.kind === 196 /* FunctionExpression */;
+        return node.kind === 197 /* FunctionExpression */;
     }
     ts.isFunctionExpression = isFunctionExpression;
     function isArrowFunction(node) {
-        return node.kind === 197 /* ArrowFunction */;
+        return node.kind === 198 /* ArrowFunction */;
     }
     ts.isArrowFunction = isArrowFunction;
     function isDeleteExpression(node) {
-        return node.kind === 198 /* DeleteExpression */;
+        return node.kind === 199 /* DeleteExpression */;
     }
     ts.isDeleteExpression = isDeleteExpression;
     function isTypeOfExpression(node) {
-        return node.kind === 199 /* TypeOfExpression */;
+        return node.kind === 200 /* TypeOfExpression */;
     }
     ts.isTypeOfExpression = isTypeOfExpression;
     function isVoidExpression(node) {
-        return node.kind === 200 /* VoidExpression */;
+        return node.kind === 201 /* VoidExpression */;
     }
     ts.isVoidExpression = isVoidExpression;
     function isAwaitExpression(node) {
-        return node.kind === 201 /* AwaitExpression */;
+        return node.kind === 202 /* AwaitExpression */;
     }
     ts.isAwaitExpression = isAwaitExpression;
     function isPrefixUnaryExpression(node) {
-        return node.kind === 202 /* PrefixUnaryExpression */;
+        return node.kind === 203 /* PrefixUnaryExpression */;
     }
     ts.isPrefixUnaryExpression = isPrefixUnaryExpression;
     function isPostfixUnaryExpression(node) {
-        return node.kind === 203 /* PostfixUnaryExpression */;
+        return node.kind === 204 /* PostfixUnaryExpression */;
     }
     ts.isPostfixUnaryExpression = isPostfixUnaryExpression;
     function isBinaryExpression(node) {
-        return node.kind === 204 /* BinaryExpression */;
+        return node.kind === 205 /* BinaryExpression */;
     }
     ts.isBinaryExpression = isBinaryExpression;
     function isConditionalExpression(node) {
-        return node.kind === 205 /* ConditionalExpression */;
+        return node.kind === 206 /* ConditionalExpression */;
     }
     ts.isConditionalExpression = isConditionalExpression;
     function isTemplateExpression(node) {
-        return node.kind === 206 /* TemplateExpression */;
+        return node.kind === 207 /* TemplateExpression */;
     }
     ts.isTemplateExpression = isTemplateExpression;
     function isYieldExpression(node) {
-        return node.kind === 207 /* YieldExpression */;
+        return node.kind === 208 /* YieldExpression */;
     }
     ts.isYieldExpression = isYieldExpression;
     function isSpreadElement(node) {
-        return node.kind === 208 /* SpreadElement */;
+        return node.kind === 209 /* SpreadElement */;
     }
     ts.isSpreadElement = isSpreadElement;
     function isClassExpression(node) {
-        return node.kind === 209 /* ClassExpression */;
+        return node.kind === 210 /* ClassExpression */;
     }
     ts.isClassExpression = isClassExpression;
     function isOmittedExpression(node) {
-        return node.kind === 210 /* OmittedExpression */;
+        return node.kind === 211 /* OmittedExpression */;
     }
     ts.isOmittedExpression = isOmittedExpression;
     function isExpressionWithTypeArguments(node) {
-        return node.kind === 211 /* ExpressionWithTypeArguments */;
+        return node.kind === 212 /* ExpressionWithTypeArguments */;
     }
     ts.isExpressionWithTypeArguments = isExpressionWithTypeArguments;
     function isAsExpression(node) {
-        return node.kind === 212 /* AsExpression */;
+        return node.kind === 213 /* AsExpression */;
     }
     ts.isAsExpression = isAsExpression;
     function isNonNullExpression(node) {
-        return node.kind === 213 /* NonNullExpression */;
+        return node.kind === 214 /* NonNullExpression */;
     }
     ts.isNonNullExpression = isNonNullExpression;
     function isMetaProperty(node) {
-        return node.kind === 214 /* MetaProperty */;
+        return node.kind === 215 /* MetaProperty */;
     }
     ts.isMetaProperty = isMetaProperty;
     // Misc
     function isTemplateSpan(node) {
-        return node.kind === 216 /* TemplateSpan */;
+        return node.kind === 217 /* TemplateSpan */;
     }
     ts.isTemplateSpan = isTemplateSpan;
     function isSemicolonClassElement(node) {
-        return node.kind === 217 /* SemicolonClassElement */;
+        return node.kind === 218 /* SemicolonClassElement */;
     }
     ts.isSemicolonClassElement = isSemicolonClassElement;
     // Block
     function isBlock(node) {
-        return node.kind === 218 /* Block */;
+        return node.kind === 219 /* Block */;
     }
     ts.isBlock = isBlock;
     function isVariableStatement(node) {
-        return node.kind === 219 /* VariableStatement */;
+        return node.kind === 220 /* VariableStatement */;
     }
     ts.isVariableStatement = isVariableStatement;
     function isEmptyStatement(node) {
-        return node.kind === 220 /* EmptyStatement */;
+        return node.kind === 221 /* EmptyStatement */;
     }
     ts.isEmptyStatement = isEmptyStatement;
     function isExpressionStatement(node) {
-        return node.kind === 221 /* ExpressionStatement */;
+        return node.kind === 222 /* ExpressionStatement */;
     }
     ts.isExpressionStatement = isExpressionStatement;
     function isIfStatement(node) {
-        return node.kind === 222 /* IfStatement */;
+        return node.kind === 223 /* IfStatement */;
     }
     ts.isIfStatement = isIfStatement;
     function isDoStatement(node) {
-        return node.kind === 223 /* DoStatement */;
+        return node.kind === 224 /* DoStatement */;
     }
     ts.isDoStatement = isDoStatement;
     function isWhileStatement(node) {
-        return node.kind === 224 /* WhileStatement */;
+        return node.kind === 225 /* WhileStatement */;
     }
     ts.isWhileStatement = isWhileStatement;
     function isForStatement(node) {
-        return node.kind === 225 /* ForStatement */;
+        return node.kind === 226 /* ForStatement */;
     }
     ts.isForStatement = isForStatement;
     function isForInStatement(node) {
-        return node.kind === 226 /* ForInStatement */;
+        return node.kind === 227 /* ForInStatement */;
     }
     ts.isForInStatement = isForInStatement;
     function isForOfStatement(node) {
-        return node.kind === 227 /* ForOfStatement */;
+        return node.kind === 228 /* ForOfStatement */;
     }
     ts.isForOfStatement = isForOfStatement;
     function isContinueStatement(node) {
-        return node.kind === 228 /* ContinueStatement */;
+        return node.kind === 229 /* ContinueStatement */;
     }
     ts.isContinueStatement = isContinueStatement;
     function isBreakStatement(node) {
-        return node.kind === 229 /* BreakStatement */;
+        return node.kind === 230 /* BreakStatement */;
     }
     ts.isBreakStatement = isBreakStatement;
     function isBreakOrContinueStatement(node) {
-        return node.kind === 229 /* BreakStatement */ || node.kind === 228 /* ContinueStatement */;
+        return node.kind === 230 /* BreakStatement */ || node.kind === 229 /* ContinueStatement */;
     }
     ts.isBreakOrContinueStatement = isBreakOrContinueStatement;
     function isReturnStatement(node) {
-        return node.kind === 230 /* ReturnStatement */;
+        return node.kind === 231 /* ReturnStatement */;
     }
     ts.isReturnStatement = isReturnStatement;
     function isWithStatement(node) {
-        return node.kind === 231 /* WithStatement */;
+        return node.kind === 232 /* WithStatement */;
     }
     ts.isWithStatement = isWithStatement;
     function isSwitchStatement(node) {
-        return node.kind === 232 /* SwitchStatement */;
+        return node.kind === 233 /* SwitchStatement */;
     }
     ts.isSwitchStatement = isSwitchStatement;
     function isLabeledStatement(node) {
-        return node.kind === 233 /* LabeledStatement */;
+        return node.kind === 234 /* LabeledStatement */;
     }
     ts.isLabeledStatement = isLabeledStatement;
     function isThrowStatement(node) {
-        return node.kind === 234 /* ThrowStatement */;
+        return node.kind === 235 /* ThrowStatement */;
     }
     ts.isThrowStatement = isThrowStatement;
     function isTryStatement(node) {
-        return node.kind === 235 /* TryStatement */;
+        return node.kind === 236 /* TryStatement */;
     }
     ts.isTryStatement = isTryStatement;
     function isDebuggerStatement(node) {
-        return node.kind === 236 /* DebuggerStatement */;
+        return node.kind === 237 /* DebuggerStatement */;
     }
     ts.isDebuggerStatement = isDebuggerStatement;
     function isVariableDeclaration(node) {
-        return node.kind === 237 /* VariableDeclaration */;
+        return node.kind === 238 /* VariableDeclaration */;
     }
     ts.isVariableDeclaration = isVariableDeclaration;
     function isVariableDeclarationList(node) {
-        return node.kind === 238 /* VariableDeclarationList */;
+        return node.kind === 239 /* VariableDeclarationList */;
     }
     ts.isVariableDeclarationList = isVariableDeclarationList;
     function isFunctionDeclaration(node) {
-        return node.kind === 239 /* FunctionDeclaration */;
+        return node.kind === 240 /* FunctionDeclaration */;
     }
     ts.isFunctionDeclaration = isFunctionDeclaration;
     function isClassDeclaration(node) {
-        return node.kind === 240 /* ClassDeclaration */;
+        return node.kind === 241 /* ClassDeclaration */;
     }
     ts.isClassDeclaration = isClassDeclaration;
     function isInterfaceDeclaration(node) {
-        return node.kind === 241 /* InterfaceDeclaration */;
+        return node.kind === 242 /* InterfaceDeclaration */;
     }
     ts.isInterfaceDeclaration = isInterfaceDeclaration;
     function isTypeAliasDeclaration(node) {
-        return node.kind === 242 /* TypeAliasDeclaration */;
+        return node.kind === 243 /* TypeAliasDeclaration */;
     }
     ts.isTypeAliasDeclaration = isTypeAliasDeclaration;
     function isEnumDeclaration(node) {
-        return node.kind === 243 /* EnumDeclaration */;
+        return node.kind === 244 /* EnumDeclaration */;
     }
     ts.isEnumDeclaration = isEnumDeclaration;
     function isModuleDeclaration(node) {
-        return node.kind === 244 /* ModuleDeclaration */;
+        return node.kind === 245 /* ModuleDeclaration */;
     }
     ts.isModuleDeclaration = isModuleDeclaration;
     function isModuleBlock(node) {
-        return node.kind === 245 /* ModuleBlock */;
+        return node.kind === 246 /* ModuleBlock */;
     }
     ts.isModuleBlock = isModuleBlock;
     function isCaseBlock(node) {
-        return node.kind === 246 /* CaseBlock */;
+        return node.kind === 247 /* CaseBlock */;
     }
     ts.isCaseBlock = isCaseBlock;
     function isNamespaceExportDeclaration(node) {
-        return node.kind === 247 /* NamespaceExportDeclaration */;
+        return node.kind === 248 /* NamespaceExportDeclaration */;
     }
     ts.isNamespaceExportDeclaration = isNamespaceExportDeclaration;
     function isImportEqualsDeclaration(node) {
-        return node.kind === 248 /* ImportEqualsDeclaration */;
+        return node.kind === 249 /* ImportEqualsDeclaration */;
     }
     ts.isImportEqualsDeclaration = isImportEqualsDeclaration;
     function isImportDeclaration(node) {
-        return node.kind === 249 /* ImportDeclaration */;
+        return node.kind === 250 /* ImportDeclaration */;
     }
     ts.isImportDeclaration = isImportDeclaration;
     function isImportClause(node) {
-        return node.kind === 250 /* ImportClause */;
+        return node.kind === 251 /* ImportClause */;
     }
     ts.isImportClause = isImportClause;
     function isNamespaceImport(node) {
-        return node.kind === 251 /* NamespaceImport */;
+        return node.kind === 252 /* NamespaceImport */;
     }
     ts.isNamespaceImport = isNamespaceImport;
     function isNamedImports(node) {
-        return node.kind === 252 /* NamedImports */;
+        return node.kind === 253 /* NamedImports */;
     }
     ts.isNamedImports = isNamedImports;
     function isImportSpecifier(node) {
-        return node.kind === 253 /* ImportSpecifier */;
+        return node.kind === 254 /* ImportSpecifier */;
     }
     ts.isImportSpecifier = isImportSpecifier;
     function isExportAssignment(node) {
-        return node.kind === 254 /* ExportAssignment */;
+        return node.kind === 255 /* ExportAssignment */;
     }
     ts.isExportAssignment = isExportAssignment;
     function isExportDeclaration(node) {
-        return node.kind === 255 /* ExportDeclaration */;
+        return node.kind === 256 /* ExportDeclaration */;
     }
     ts.isExportDeclaration = isExportDeclaration;
     function isNamedExports(node) {
-        return node.kind === 256 /* NamedExports */;
+        return node.kind === 257 /* NamedExports */;
     }
     ts.isNamedExports = isNamedExports;
     function isExportSpecifier(node) {
-        return node.kind === 257 /* ExportSpecifier */;
+        return node.kind === 258 /* ExportSpecifier */;
     }
     ts.isExportSpecifier = isExportSpecifier;
     function isMissingDeclaration(node) {
-        return node.kind === 258 /* MissingDeclaration */;
+        return node.kind === 259 /* MissingDeclaration */;
     }
     ts.isMissingDeclaration = isMissingDeclaration;
     // Module References
     function isExternalModuleReference(node) {
-        return node.kind === 259 /* ExternalModuleReference */;
+        return node.kind === 260 /* ExternalModuleReference */;
     }
     ts.isExternalModuleReference = isExternalModuleReference;
     // JSX
     function isJsxElement(node) {
-        return node.kind === 260 /* JsxElement */;
+        return node.kind === 261 /* JsxElement */;
     }
     ts.isJsxElement = isJsxElement;
     function isJsxSelfClosingElement(node) {
-        return node.kind === 261 /* JsxSelfClosingElement */;
+        return node.kind === 262 /* JsxSelfClosingElement */;
     }
     ts.isJsxSelfClosingElement = isJsxSelfClosingElement;
     function isJsxOpeningElement(node) {
-        return node.kind === 262 /* JsxOpeningElement */;
+        return node.kind === 263 /* JsxOpeningElement */;
     }
     ts.isJsxOpeningElement = isJsxOpeningElement;
     function isJsxClosingElement(node) {
-        return node.kind === 263 /* JsxClosingElement */;
+        return node.kind === 264 /* JsxClosingElement */;
     }
     ts.isJsxClosingElement = isJsxClosingElement;
     function isJsxFragment(node) {
-        return node.kind === 264 /* JsxFragment */;
+        return node.kind === 265 /* JsxFragment */;
     }
     ts.isJsxFragment = isJsxFragment;
     function isJsxOpeningFragment(node) {
-        return node.kind === 265 /* JsxOpeningFragment */;
+        return node.kind === 266 /* JsxOpeningFragment */;
     }
     ts.isJsxOpeningFragment = isJsxOpeningFragment;
     function isJsxClosingFragment(node) {
-        return node.kind === 266 /* JsxClosingFragment */;
+        return node.kind === 267 /* JsxClosingFragment */;
     }
     ts.isJsxClosingFragment = isJsxClosingFragment;
     function isJsxAttribute(node) {
-        return node.kind === 267 /* JsxAttribute */;
+        return node.kind === 268 /* JsxAttribute */;
     }
     ts.isJsxAttribute = isJsxAttribute;
     function isJsxAttributes(node) {
-        return node.kind === 268 /* JsxAttributes */;
+        return node.kind === 269 /* JsxAttributes */;
     }
     ts.isJsxAttributes = isJsxAttributes;
     function isJsxSpreadAttribute(node) {
-        return node.kind === 269 /* JsxSpreadAttribute */;
+        return node.kind === 270 /* JsxSpreadAttribute */;
     }
     ts.isJsxSpreadAttribute = isJsxSpreadAttribute;
     function isJsxExpression(node) {
-        return node.kind === 270 /* JsxExpression */;
+        return node.kind === 271 /* JsxExpression */;
     }
     ts.isJsxExpression = isJsxExpression;
     // Clauses
     function isCaseClause(node) {
-        return node.kind === 271 /* CaseClause */;
+        return node.kind === 272 /* CaseClause */;
     }
     ts.isCaseClause = isCaseClause;
     function isDefaultClause(node) {
-        return node.kind === 272 /* DefaultClause */;
+        return node.kind === 273 /* DefaultClause */;
     }
     ts.isDefaultClause = isDefaultClause;
     function isHeritageClause(node) {
-        return node.kind === 273 /* HeritageClause */;
+        return node.kind === 274 /* HeritageClause */;
     }
     ts.isHeritageClause = isHeritageClause;
     function isCatchClause(node) {
-        return node.kind === 274 /* CatchClause */;
+        return node.kind === 275 /* CatchClause */;
     }
     ts.isCatchClause = isCatchClause;
     // Property assignments
     function isPropertyAssignment(node) {
-        return node.kind === 275 /* PropertyAssignment */;
+        return node.kind === 276 /* PropertyAssignment */;
     }
     ts.isPropertyAssignment = isPropertyAssignment;
     function isShorthandPropertyAssignment(node) {
-        return node.kind === 276 /* ShorthandPropertyAssignment */;
+        return node.kind === 277 /* ShorthandPropertyAssignment */;
     }
     ts.isShorthandPropertyAssignment = isShorthandPropertyAssignment;
     function isSpreadAssignment(node) {
-        return node.kind === 277 /* SpreadAssignment */;
+        return node.kind === 278 /* SpreadAssignment */;
     }
     ts.isSpreadAssignment = isSpreadAssignment;
     // Enum
     function isEnumMember(node) {
-        return node.kind === 278 /* EnumMember */;
+        return node.kind === 279 /* EnumMember */;
     }
     ts.isEnumMember = isEnumMember;
     // Top-level nodes
     function isSourceFile(node) {
-        return node.kind === 284 /* SourceFile */;
+        return node.kind === 285 /* SourceFile */;
     }
     ts.isSourceFile = isSourceFile;
     function isBundle(node) {
-        return node.kind === 285 /* Bundle */;
+        return node.kind === 286 /* Bundle */;
     }
     ts.isBundle = isBundle;
     function isUnparsedSource(node) {
-        return node.kind === 286 /* UnparsedSource */;
+        return node.kind === 287 /* UnparsedSource */;
     }
     ts.isUnparsedSource = isUnparsedSource;
     function isUnparsedPrepend(node) {
-        return node.kind === 280 /* UnparsedPrepend */;
+        return node.kind === 281 /* UnparsedPrepend */;
     }
     ts.isUnparsedPrepend = isUnparsedPrepend;
     function isUnparsedTextLike(node) {
         switch (node.kind) {
-            case 281 /* UnparsedText */:
-            case 282 /* UnparsedInternalText */:
+            case 282 /* UnparsedText */:
+            case 283 /* UnparsedInternalText */:
                 return true;
             default:
                 return false;
@@ -14027,101 +14224,105 @@ var ts;
     ts.isUnparsedTextLike = isUnparsedTextLike;
     function isUnparsedNode(node) {
         return isUnparsedTextLike(node) ||
-            node.kind === 279 /* UnparsedPrologue */ ||
-            node.kind === 283 /* UnparsedSyntheticReference */;
+            node.kind === 280 /* UnparsedPrologue */ ||
+            node.kind === 284 /* UnparsedSyntheticReference */;
     }
     ts.isUnparsedNode = isUnparsedNode;
     // JSDoc
     function isJSDocTypeExpression(node) {
-        return node.kind === 288 /* JSDocTypeExpression */;
+        return node.kind === 289 /* JSDocTypeExpression */;
     }
     ts.isJSDocTypeExpression = isJSDocTypeExpression;
     function isJSDocAllType(node) {
-        return node.kind === 289 /* JSDocAllType */;
+        return node.kind === 290 /* JSDocAllType */;
     }
     ts.isJSDocAllType = isJSDocAllType;
     function isJSDocUnknownType(node) {
-        return node.kind === 290 /* JSDocUnknownType */;
+        return node.kind === 291 /* JSDocUnknownType */;
     }
     ts.isJSDocUnknownType = isJSDocUnknownType;
     function isJSDocNullableType(node) {
-        return node.kind === 291 /* JSDocNullableType */;
+        return node.kind === 292 /* JSDocNullableType */;
     }
     ts.isJSDocNullableType = isJSDocNullableType;
     function isJSDocNonNullableType(node) {
-        return node.kind === 292 /* JSDocNonNullableType */;
+        return node.kind === 293 /* JSDocNonNullableType */;
     }
     ts.isJSDocNonNullableType = isJSDocNonNullableType;
     function isJSDocOptionalType(node) {
-        return node.kind === 293 /* JSDocOptionalType */;
+        return node.kind === 294 /* JSDocOptionalType */;
     }
     ts.isJSDocOptionalType = isJSDocOptionalType;
     function isJSDocFunctionType(node) {
-        return node.kind === 294 /* JSDocFunctionType */;
+        return node.kind === 295 /* JSDocFunctionType */;
     }
     ts.isJSDocFunctionType = isJSDocFunctionType;
     function isJSDocVariadicType(node) {
-        return node.kind === 295 /* JSDocVariadicType */;
+        return node.kind === 296 /* JSDocVariadicType */;
     }
     ts.isJSDocVariadicType = isJSDocVariadicType;
     function isJSDoc(node) {
-        return node.kind === 296 /* JSDocComment */;
+        return node.kind === 297 /* JSDocComment */;
     }
     ts.isJSDoc = isJSDoc;
+    function isJSDocAuthorTag(node) {
+        return node.kind === 302 /* JSDocAuthorTag */;
+    }
+    ts.isJSDocAuthorTag = isJSDocAuthorTag;
     function isJSDocAugmentsTag(node) {
-        return node.kind === 300 /* JSDocAugmentsTag */;
+        return node.kind === 301 /* JSDocAugmentsTag */;
     }
     ts.isJSDocAugmentsTag = isJSDocAugmentsTag;
     function isJSDocClassTag(node) {
-        return node.kind === 301 /* JSDocClassTag */;
+        return node.kind === 303 /* JSDocClassTag */;
     }
     ts.isJSDocClassTag = isJSDocClassTag;
     function isJSDocEnumTag(node) {
-        return node.kind === 303 /* JSDocEnumTag */;
+        return node.kind === 305 /* JSDocEnumTag */;
     }
     ts.isJSDocEnumTag = isJSDocEnumTag;
     function isJSDocThisTag(node) {
-        return node.kind === 306 /* JSDocThisTag */;
+        return node.kind === 308 /* JSDocThisTag */;
     }
     ts.isJSDocThisTag = isJSDocThisTag;
     function isJSDocParameterTag(node) {
-        return node.kind === 304 /* JSDocParameterTag */;
+        return node.kind === 306 /* JSDocParameterTag */;
     }
     ts.isJSDocParameterTag = isJSDocParameterTag;
     function isJSDocReturnTag(node) {
-        return node.kind === 305 /* JSDocReturnTag */;
+        return node.kind === 307 /* JSDocReturnTag */;
     }
     ts.isJSDocReturnTag = isJSDocReturnTag;
     function isJSDocTypeTag(node) {
-        return node.kind === 307 /* JSDocTypeTag */;
+        return node.kind === 309 /* JSDocTypeTag */;
     }
     ts.isJSDocTypeTag = isJSDocTypeTag;
     function isJSDocTemplateTag(node) {
-        return node.kind === 308 /* JSDocTemplateTag */;
+        return node.kind === 310 /* JSDocTemplateTag */;
     }
     ts.isJSDocTemplateTag = isJSDocTemplateTag;
     function isJSDocTypedefTag(node) {
-        return node.kind === 309 /* JSDocTypedefTag */;
+        return node.kind === 311 /* JSDocTypedefTag */;
     }
     ts.isJSDocTypedefTag = isJSDocTypedefTag;
     function isJSDocPropertyTag(node) {
-        return node.kind === 310 /* JSDocPropertyTag */;
+        return node.kind === 312 /* JSDocPropertyTag */;
     }
     ts.isJSDocPropertyTag = isJSDocPropertyTag;
     function isJSDocPropertyLikeTag(node) {
-        return node.kind === 310 /* JSDocPropertyTag */ || node.kind === 304 /* JSDocParameterTag */;
+        return node.kind === 312 /* JSDocPropertyTag */ || node.kind === 306 /* JSDocParameterTag */;
     }
     ts.isJSDocPropertyLikeTag = isJSDocPropertyLikeTag;
     function isJSDocTypeLiteral(node) {
-        return node.kind === 297 /* JSDocTypeLiteral */;
+        return node.kind === 298 /* JSDocTypeLiteral */;
     }
     ts.isJSDocTypeLiteral = isJSDocTypeLiteral;
     function isJSDocCallbackTag(node) {
-        return node.kind === 302 /* JSDocCallbackTag */;
+        return node.kind === 304 /* JSDocCallbackTag */;
     }
     ts.isJSDocCallbackTag = isJSDocCallbackTag;
     function isJSDocSignature(node) {
-        return node.kind === 298 /* JSDocSignature */;
+        return node.kind === 299 /* JSDocSignature */;
     }
     ts.isJSDocSignature = isJSDocSignature;
 })(ts || (ts = {}));
@@ -14132,7 +14333,7 @@ var ts;
 (function (ts) {
     /* @internal */
     function isSyntaxList(n) {
-        return n.kind === 311 /* SyntaxList */;
+        return n.kind === 313 /* SyntaxList */;
     }
     ts.isSyntaxList = isSyntaxList;
     /* @internal */
@@ -14142,7 +14343,7 @@ var ts;
     ts.isNode = isNode;
     /* @internal */
     function isNodeKind(kind) {
-        return kind >= 148 /* FirstNode */;
+        return kind >= 149 /* FirstNode */;
     }
     ts.isNodeKind = isNodeKind;
     /**
@@ -14151,7 +14352,7 @@ var ts;
      * Literals are considered tokens, except TemplateLiteral, but does include TemplateHead/Middle/Tail.
      */
     function isToken(n) {
-        return n.kind >= 0 /* FirstToken */ && n.kind <= 147 /* LastToken */;
+        return n.kind >= 0 /* FirstToken */ && n.kind <= 148 /* LastToken */;
     }
     ts.isToken = isToken;
     // Node Arrays
@@ -14204,17 +14405,17 @@ var ts;
     /* @internal */
     function isModifierKind(token) {
         switch (token) {
-            case 118 /* AbstractKeyword */:
-            case 121 /* AsyncKeyword */:
-            case 77 /* ConstKeyword */:
-            case 125 /* DeclareKeyword */:
-            case 80 /* DefaultKeyword */:
-            case 85 /* ExportKeyword */:
-            case 115 /* PublicKeyword */:
-            case 113 /* PrivateKeyword */:
-            case 114 /* ProtectedKeyword */:
-            case 133 /* ReadonlyKeyword */:
-            case 116 /* StaticKeyword */:
+            case 119 /* AbstractKeyword */:
+            case 122 /* AsyncKeyword */:
+            case 78 /* ConstKeyword */:
+            case 126 /* DeclareKeyword */:
+            case 81 /* DefaultKeyword */:
+            case 86 /* ExportKeyword */:
+            case 116 /* PublicKeyword */:
+            case 114 /* PrivateKeyword */:
+            case 115 /* ProtectedKeyword */:
+            case 134 /* ReadonlyKeyword */:
+            case 117 /* StaticKeyword */:
                 return true;
         }
         return false;
@@ -14227,7 +14428,7 @@ var ts;
     ts.isParameterPropertyModifier = isParameterPropertyModifier;
     /* @internal */
     function isClassMemberModifier(idToken) {
-        return isParameterPropertyModifier(idToken) || idToken === 116 /* StaticKeyword */;
+        return isParameterPropertyModifier(idToken) || idToken === 117 /* StaticKeyword */;
     }
     ts.isClassMemberModifier = isClassMemberModifier;
     function isModifier(node) {
@@ -14236,23 +14437,23 @@ var ts;
     ts.isModifier = isModifier;
     function isEntityName(node) {
         var kind = node.kind;
-        return kind === 148 /* QualifiedName */
-            || kind === 72 /* Identifier */;
+        return kind === 149 /* QualifiedName */
+            || kind === 73 /* Identifier */;
     }
     ts.isEntityName = isEntityName;
     function isPropertyName(node) {
         var kind = node.kind;
-        return kind === 72 /* Identifier */
+        return kind === 73 /* Identifier */
             || kind === 10 /* StringLiteral */
             || kind === 8 /* NumericLiteral */
-            || kind === 149 /* ComputedPropertyName */;
+            || kind === 150 /* ComputedPropertyName */;
     }
     ts.isPropertyName = isPropertyName;
     function isBindingName(node) {
         var kind = node.kind;
-        return kind === 72 /* Identifier */
-            || kind === 184 /* ObjectBindingPattern */
-            || kind === 185 /* ArrayBindingPattern */;
+        return kind === 73 /* Identifier */
+            || kind === 185 /* ObjectBindingPattern */
+            || kind === 186 /* ArrayBindingPattern */;
     }
     ts.isBindingName = isBindingName;
     // Functions
@@ -14267,13 +14468,13 @@ var ts;
     ts.isFunctionLikeDeclaration = isFunctionLikeDeclaration;
     function isFunctionLikeDeclarationKind(kind) {
         switch (kind) {
-            case 239 /* FunctionDeclaration */:
-            case 156 /* MethodDeclaration */:
-            case 157 /* Constructor */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
-            case 196 /* FunctionExpression */:
-            case 197 /* ArrowFunction */:
+            case 240 /* FunctionDeclaration */:
+            case 157 /* MethodDeclaration */:
+            case 158 /* Constructor */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
+            case 197 /* FunctionExpression */:
+            case 198 /* ArrowFunction */:
                 return true;
             default:
                 return false;
@@ -14282,14 +14483,14 @@ var ts;
     /* @internal */
     function isFunctionLikeKind(kind) {
         switch (kind) {
-            case 155 /* MethodSignature */:
-            case 160 /* CallSignature */:
-            case 298 /* JSDocSignature */:
-            case 161 /* ConstructSignature */:
-            case 162 /* IndexSignature */:
-            case 165 /* FunctionType */:
-            case 294 /* JSDocFunctionType */:
-            case 166 /* ConstructorType */:
+            case 156 /* MethodSignature */:
+            case 161 /* CallSignature */:
+            case 299 /* JSDocSignature */:
+            case 162 /* ConstructSignature */:
+            case 163 /* IndexSignature */:
+            case 166 /* FunctionType */:
+            case 295 /* JSDocFunctionType */:
+            case 167 /* ConstructorType */:
                 return true;
             default:
                 return isFunctionLikeDeclarationKind(kind);
@@ -14304,29 +14505,29 @@ var ts;
     // Classes
     function isClassElement(node) {
         var kind = node.kind;
-        return kind === 157 /* Constructor */
-            || kind === 154 /* PropertyDeclaration */
-            || kind === 156 /* MethodDeclaration */
-            || kind === 158 /* GetAccessor */
-            || kind === 159 /* SetAccessor */
-            || kind === 162 /* IndexSignature */
-            || kind === 217 /* SemicolonClassElement */;
+        return kind === 158 /* Constructor */
+            || kind === 155 /* PropertyDeclaration */
+            || kind === 157 /* MethodDeclaration */
+            || kind === 159 /* GetAccessor */
+            || kind === 160 /* SetAccessor */
+            || kind === 163 /* IndexSignature */
+            || kind === 218 /* SemicolonClassElement */;
     }
     ts.isClassElement = isClassElement;
     function isClassLike(node) {
-        return node && (node.kind === 240 /* ClassDeclaration */ || node.kind === 209 /* ClassExpression */);
+        return node && (node.kind === 241 /* ClassDeclaration */ || node.kind === 210 /* ClassExpression */);
     }
     ts.isClassLike = isClassLike;
     function isAccessor(node) {
-        return node && (node.kind === 158 /* GetAccessor */ || node.kind === 159 /* SetAccessor */);
+        return node && (node.kind === 159 /* GetAccessor */ || node.kind === 160 /* SetAccessor */);
     }
     ts.isAccessor = isAccessor;
     /* @internal */
     function isMethodOrAccessor(node) {
         switch (node.kind) {
-            case 156 /* MethodDeclaration */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
+            case 157 /* MethodDeclaration */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
                 return true;
             default:
                 return false;
@@ -14336,11 +14537,11 @@ var ts;
     // Type members
     function isTypeElement(node) {
         var kind = node.kind;
-        return kind === 161 /* ConstructSignature */
-            || kind === 160 /* CallSignature */
-            || kind === 153 /* PropertySignature */
-            || kind === 155 /* MethodSignature */
-            || kind === 162 /* IndexSignature */;
+        return kind === 162 /* ConstructSignature */
+            || kind === 161 /* CallSignature */
+            || kind === 154 /* PropertySignature */
+            || kind === 156 /* MethodSignature */
+            || kind === 163 /* IndexSignature */;
     }
     ts.isTypeElement = isTypeElement;
     function isClassOrTypeElement(node) {
@@ -14349,12 +14550,12 @@ var ts;
     ts.isClassOrTypeElement = isClassOrTypeElement;
     function isObjectLiteralElementLike(node) {
         var kind = node.kind;
-        return kind === 275 /* PropertyAssignment */
-            || kind === 276 /* ShorthandPropertyAssignment */
-            || kind === 277 /* SpreadAssignment */
-            || kind === 156 /* MethodDeclaration */
-            || kind === 158 /* GetAccessor */
-            || kind === 159 /* SetAccessor */;
+        return kind === 276 /* PropertyAssignment */
+            || kind === 277 /* ShorthandPropertyAssignment */
+            || kind === 278 /* SpreadAssignment */
+            || kind === 157 /* MethodDeclaration */
+            || kind === 159 /* GetAccessor */
+            || kind === 160 /* SetAccessor */;
     }
     ts.isObjectLiteralElementLike = isObjectLiteralElementLike;
     // Type
@@ -14369,8 +14570,8 @@ var ts;
     ts.isTypeNode = isTypeNode;
     function isFunctionOrConstructorTypeNode(node) {
         switch (node.kind) {
-            case 165 /* FunctionType */:
-            case 166 /* ConstructorType */:
+            case 166 /* FunctionType */:
+            case 167 /* ConstructorType */:
                 return true;
         }
         return false;
@@ -14381,8 +14582,8 @@ var ts;
     function isBindingPattern(node) {
         if (node) {
             var kind = node.kind;
-            return kind === 185 /* ArrayBindingPattern */
-                || kind === 184 /* ObjectBindingPattern */;
+            return kind === 186 /* ArrayBindingPattern */
+                || kind === 185 /* ObjectBindingPattern */;
         }
         return false;
     }
@@ -14390,15 +14591,15 @@ var ts;
     /* @internal */
     function isAssignmentPattern(node) {
         var kind = node.kind;
-        return kind === 187 /* ArrayLiteralExpression */
-            || kind === 188 /* ObjectLiteralExpression */;
+        return kind === 188 /* ArrayLiteralExpression */
+            || kind === 189 /* ObjectLiteralExpression */;
     }
     ts.isAssignmentPattern = isAssignmentPattern;
     /* @internal */
     function isArrayBindingElement(node) {
         var kind = node.kind;
-        return kind === 186 /* BindingElement */
-            || kind === 210 /* OmittedExpression */;
+        return kind === 187 /* BindingElement */
+            || kind === 211 /* OmittedExpression */;
     }
     ts.isArrayBindingElement = isArrayBindingElement;
     /**
@@ -14407,9 +14608,9 @@ var ts;
     /* @internal */
     function isDeclarationBindingElement(bindingElement) {
         switch (bindingElement.kind) {
-            case 237 /* VariableDeclaration */:
-            case 151 /* Parameter */:
-            case 186 /* BindingElement */:
+            case 238 /* VariableDeclaration */:
+            case 152 /* Parameter */:
+            case 187 /* BindingElement */:
                 return true;
         }
         return false;
@@ -14430,8 +14631,8 @@ var ts;
     /* @internal */
     function isObjectBindingOrAssignmentPattern(node) {
         switch (node.kind) {
-            case 184 /* ObjectBindingPattern */:
-            case 188 /* ObjectLiteralExpression */:
+            case 185 /* ObjectBindingPattern */:
+            case 189 /* ObjectLiteralExpression */:
                 return true;
         }
         return false;
@@ -14443,8 +14644,8 @@ var ts;
     /* @internal */
     function isArrayBindingOrAssignmentPattern(node) {
         switch (node.kind) {
-            case 185 /* ArrayBindingPattern */:
-            case 187 /* ArrayLiteralExpression */:
+            case 186 /* ArrayBindingPattern */:
+            case 188 /* ArrayLiteralExpression */:
                 return true;
         }
         return false;
@@ -14453,26 +14654,26 @@ var ts;
     /* @internal */
     function isPropertyAccessOrQualifiedNameOrImportTypeNode(node) {
         var kind = node.kind;
-        return kind === 189 /* PropertyAccessExpression */
-            || kind === 148 /* QualifiedName */
-            || kind === 183 /* ImportType */;
+        return kind === 190 /* PropertyAccessExpression */
+            || kind === 149 /* QualifiedName */
+            || kind === 184 /* ImportType */;
     }
     ts.isPropertyAccessOrQualifiedNameOrImportTypeNode = isPropertyAccessOrQualifiedNameOrImportTypeNode;
     // Expression
     function isPropertyAccessOrQualifiedName(node) {
         var kind = node.kind;
-        return kind === 189 /* PropertyAccessExpression */
-            || kind === 148 /* QualifiedName */;
+        return kind === 190 /* PropertyAccessExpression */
+            || kind === 149 /* QualifiedName */;
     }
     ts.isPropertyAccessOrQualifiedName = isPropertyAccessOrQualifiedName;
     function isCallLikeExpression(node) {
         switch (node.kind) {
-            case 262 /* JsxOpeningElement */:
-            case 261 /* JsxSelfClosingElement */:
-            case 191 /* CallExpression */:
-            case 192 /* NewExpression */:
-            case 193 /* TaggedTemplateExpression */:
-            case 152 /* Decorator */:
+            case 263 /* JsxOpeningElement */:
+            case 262 /* JsxSelfClosingElement */:
+            case 192 /* CallExpression */:
+            case 193 /* NewExpression */:
+            case 194 /* TaggedTemplateExpression */:
+            case 153 /* Decorator */:
                 return true;
             default:
                 return false;
@@ -14480,12 +14681,12 @@ var ts;
     }
     ts.isCallLikeExpression = isCallLikeExpression;
     function isCallOrNewExpression(node) {
-        return node.kind === 191 /* CallExpression */ || node.kind === 192 /* NewExpression */;
+        return node.kind === 192 /* CallExpression */ || node.kind === 193 /* NewExpression */;
     }
     ts.isCallOrNewExpression = isCallOrNewExpression;
     function isTemplateLiteral(node) {
         var kind = node.kind;
-        return kind === 206 /* TemplateExpression */
+        return kind === 207 /* TemplateExpression */
             || kind === 14 /* NoSubstitutionTemplateLiteral */;
     }
     ts.isTemplateLiteral = isTemplateLiteral;
@@ -14496,34 +14697,34 @@ var ts;
     ts.isLeftHandSideExpression = isLeftHandSideExpression;
     function isLeftHandSideExpressionKind(kind) {
         switch (kind) {
-            case 189 /* PropertyAccessExpression */:
-            case 190 /* ElementAccessExpression */:
-            case 192 /* NewExpression */:
-            case 191 /* CallExpression */:
-            case 260 /* JsxElement */:
-            case 261 /* JsxSelfClosingElement */:
-            case 264 /* JsxFragment */:
-            case 193 /* TaggedTemplateExpression */:
-            case 187 /* ArrayLiteralExpression */:
-            case 195 /* ParenthesizedExpression */:
-            case 188 /* ObjectLiteralExpression */:
-            case 209 /* ClassExpression */:
-            case 196 /* FunctionExpression */:
-            case 72 /* Identifier */:
+            case 190 /* PropertyAccessExpression */:
+            case 191 /* ElementAccessExpression */:
+            case 193 /* NewExpression */:
+            case 192 /* CallExpression */:
+            case 261 /* JsxElement */:
+            case 262 /* JsxSelfClosingElement */:
+            case 265 /* JsxFragment */:
+            case 194 /* TaggedTemplateExpression */:
+            case 188 /* ArrayLiteralExpression */:
+            case 196 /* ParenthesizedExpression */:
+            case 189 /* ObjectLiteralExpression */:
+            case 210 /* ClassExpression */:
+            case 197 /* FunctionExpression */:
+            case 73 /* Identifier */:
             case 13 /* RegularExpressionLiteral */:
             case 8 /* NumericLiteral */:
             case 9 /* BigIntLiteral */:
             case 10 /* StringLiteral */:
             case 14 /* NoSubstitutionTemplateLiteral */:
-            case 206 /* TemplateExpression */:
-            case 87 /* FalseKeyword */:
-            case 96 /* NullKeyword */:
-            case 100 /* ThisKeyword */:
-            case 102 /* TrueKeyword */:
-            case 98 /* SuperKeyword */:
-            case 213 /* NonNullExpression */:
-            case 214 /* MetaProperty */:
-            case 92 /* ImportKeyword */: // technically this is only an Expression if it's in a CallExpression
+            case 207 /* TemplateExpression */:
+            case 88 /* FalseKeyword */:
+            case 97 /* NullKeyword */:
+            case 101 /* ThisKeyword */:
+            case 103 /* TrueKeyword */:
+            case 99 /* SuperKeyword */:
+            case 214 /* NonNullExpression */:
+            case 215 /* MetaProperty */:
+            case 93 /* ImportKeyword */: // technically this is only an Expression if it's in a CallExpression
                 return true;
             default:
                 return false;
@@ -14536,13 +14737,13 @@ var ts;
     ts.isUnaryExpression = isUnaryExpression;
     function isUnaryExpressionKind(kind) {
         switch (kind) {
-            case 202 /* PrefixUnaryExpression */:
-            case 203 /* PostfixUnaryExpression */:
-            case 198 /* DeleteExpression */:
-            case 199 /* TypeOfExpression */:
-            case 200 /* VoidExpression */:
-            case 201 /* AwaitExpression */:
-            case 194 /* TypeAssertionExpression */:
+            case 203 /* PrefixUnaryExpression */:
+            case 204 /* PostfixUnaryExpression */:
+            case 199 /* DeleteExpression */:
+            case 200 /* TypeOfExpression */:
+            case 201 /* VoidExpression */:
+            case 202 /* AwaitExpression */:
+            case 195 /* TypeAssertionExpression */:
                 return true;
             default:
                 return isLeftHandSideExpressionKind(kind);
@@ -14551,9 +14752,9 @@ var ts;
     /* @internal */
     function isUnaryExpressionWithWrite(expr) {
         switch (expr.kind) {
-            case 203 /* PostfixUnaryExpression */:
+            case 204 /* PostfixUnaryExpression */:
                 return true;
-            case 202 /* PrefixUnaryExpression */:
+            case 203 /* PrefixUnaryExpression */:
                 return expr.operator === 44 /* PlusPlusToken */ ||
                     expr.operator === 45 /* MinusMinusToken */;
             default:
@@ -14572,15 +14773,15 @@ var ts;
     ts.isExpression = isExpression;
     function isExpressionKind(kind) {
         switch (kind) {
-            case 205 /* ConditionalExpression */:
-            case 207 /* YieldExpression */:
-            case 197 /* ArrowFunction */:
-            case 204 /* BinaryExpression */:
-            case 208 /* SpreadElement */:
-            case 212 /* AsExpression */:
-            case 210 /* OmittedExpression */:
-            case 314 /* CommaListExpression */:
-            case 313 /* PartiallyEmittedExpression */:
+            case 206 /* ConditionalExpression */:
+            case 208 /* YieldExpression */:
+            case 198 /* ArrowFunction */:
+            case 205 /* BinaryExpression */:
+            case 209 /* SpreadElement */:
+            case 213 /* AsExpression */:
+            case 211 /* OmittedExpression */:
+            case 316 /* CommaListExpression */:
+            case 315 /* PartiallyEmittedExpression */:
                 return true;
             default:
                 return isUnaryExpressionKind(kind);
@@ -14588,18 +14789,18 @@ var ts;
     }
     function isAssertionExpression(node) {
         var kind = node.kind;
-        return kind === 194 /* TypeAssertionExpression */
-            || kind === 212 /* AsExpression */;
+        return kind === 195 /* TypeAssertionExpression */
+            || kind === 213 /* AsExpression */;
     }
     ts.isAssertionExpression = isAssertionExpression;
     /* @internal */
     function isPartiallyEmittedExpression(node) {
-        return node.kind === 313 /* PartiallyEmittedExpression */;
+        return node.kind === 315 /* PartiallyEmittedExpression */;
     }
     ts.isPartiallyEmittedExpression = isPartiallyEmittedExpression;
     /* @internal */
     function isNotEmittedStatement(node) {
-        return node.kind === 312 /* NotEmittedStatement */;
+        return node.kind === 314 /* NotEmittedStatement */;
     }
     ts.isNotEmittedStatement = isNotEmittedStatement;
     /* @internal */
@@ -14610,13 +14811,13 @@ var ts;
     ts.isNotEmittedOrPartiallyEmittedNode = isNotEmittedOrPartiallyEmittedNode;
     function isIterationStatement(node, lookInLabeledStatements) {
         switch (node.kind) {
-            case 225 /* ForStatement */:
-            case 226 /* ForInStatement */:
-            case 227 /* ForOfStatement */:
-            case 223 /* DoStatement */:
-            case 224 /* WhileStatement */:
+            case 226 /* ForStatement */:
+            case 227 /* ForInStatement */:
+            case 228 /* ForOfStatement */:
+            case 224 /* DoStatement */:
+            case 225 /* WhileStatement */:
                 return true;
-            case 233 /* LabeledStatement */:
+            case 234 /* LabeledStatement */:
                 return lookInLabeledStatements && isIterationStatement(node.statement, lookInLabeledStatements);
         }
         return false;
@@ -14624,7 +14825,7 @@ var ts;
     ts.isIterationStatement = isIterationStatement;
     /* @internal */
     function isForInOrOfStatement(node) {
-        return node.kind === 226 /* ForInStatement */ || node.kind === 227 /* ForOfStatement */;
+        return node.kind === 227 /* ForInStatement */ || node.kind === 228 /* ForOfStatement */;
     }
     ts.isForInOrOfStatement = isForInOrOfStatement;
     // Element
@@ -14648,113 +14849,113 @@ var ts;
     /* @internal */
     function isModuleBody(node) {
         var kind = node.kind;
-        return kind === 245 /* ModuleBlock */
-            || kind === 244 /* ModuleDeclaration */
-            || kind === 72 /* Identifier */;
+        return kind === 246 /* ModuleBlock */
+            || kind === 245 /* ModuleDeclaration */
+            || kind === 73 /* Identifier */;
     }
     ts.isModuleBody = isModuleBody;
     /* @internal */
     function isNamespaceBody(node) {
         var kind = node.kind;
-        return kind === 245 /* ModuleBlock */
-            || kind === 244 /* ModuleDeclaration */;
+        return kind === 246 /* ModuleBlock */
+            || kind === 245 /* ModuleDeclaration */;
     }
     ts.isNamespaceBody = isNamespaceBody;
     /* @internal */
     function isJSDocNamespaceBody(node) {
         var kind = node.kind;
-        return kind === 72 /* Identifier */
-            || kind === 244 /* ModuleDeclaration */;
+        return kind === 73 /* Identifier */
+            || kind === 245 /* ModuleDeclaration */;
     }
     ts.isJSDocNamespaceBody = isJSDocNamespaceBody;
     /* @internal */
     function isNamedImportBindings(node) {
         var kind = node.kind;
-        return kind === 252 /* NamedImports */
-            || kind === 251 /* NamespaceImport */;
+        return kind === 253 /* NamedImports */
+            || kind === 252 /* NamespaceImport */;
     }
     ts.isNamedImportBindings = isNamedImportBindings;
     /* @internal */
     function isModuleOrEnumDeclaration(node) {
-        return node.kind === 244 /* ModuleDeclaration */ || node.kind === 243 /* EnumDeclaration */;
+        return node.kind === 245 /* ModuleDeclaration */ || node.kind === 244 /* EnumDeclaration */;
     }
     ts.isModuleOrEnumDeclaration = isModuleOrEnumDeclaration;
     function isDeclarationKind(kind) {
-        return kind === 197 /* ArrowFunction */
-            || kind === 186 /* BindingElement */
-            || kind === 240 /* ClassDeclaration */
-            || kind === 209 /* ClassExpression */
-            || kind === 157 /* Constructor */
-            || kind === 243 /* EnumDeclaration */
-            || kind === 278 /* EnumMember */
-            || kind === 257 /* ExportSpecifier */
-            || kind === 239 /* FunctionDeclaration */
-            || kind === 196 /* FunctionExpression */
-            || kind === 158 /* GetAccessor */
-            || kind === 250 /* ImportClause */
-            || kind === 248 /* ImportEqualsDeclaration */
-            || kind === 253 /* ImportSpecifier */
-            || kind === 241 /* InterfaceDeclaration */
-            || kind === 267 /* JsxAttribute */
-            || kind === 156 /* MethodDeclaration */
-            || kind === 155 /* MethodSignature */
-            || kind === 244 /* ModuleDeclaration */
-            || kind === 247 /* NamespaceExportDeclaration */
-            || kind === 251 /* NamespaceImport */
-            || kind === 151 /* Parameter */
-            || kind === 275 /* PropertyAssignment */
-            || kind === 154 /* PropertyDeclaration */
-            || kind === 153 /* PropertySignature */
-            || kind === 159 /* SetAccessor */
-            || kind === 276 /* ShorthandPropertyAssignment */
-            || kind === 242 /* TypeAliasDeclaration */
-            || kind === 150 /* TypeParameter */
-            || kind === 237 /* VariableDeclaration */
-            || kind === 309 /* JSDocTypedefTag */
-            || kind === 302 /* JSDocCallbackTag */
-            || kind === 310 /* JSDocPropertyTag */;
+        return kind === 198 /* ArrowFunction */
+            || kind === 187 /* BindingElement */
+            || kind === 241 /* ClassDeclaration */
+            || kind === 210 /* ClassExpression */
+            || kind === 158 /* Constructor */
+            || kind === 244 /* EnumDeclaration */
+            || kind === 279 /* EnumMember */
+            || kind === 258 /* ExportSpecifier */
+            || kind === 240 /* FunctionDeclaration */
+            || kind === 197 /* FunctionExpression */
+            || kind === 159 /* GetAccessor */
+            || kind === 251 /* ImportClause */
+            || kind === 249 /* ImportEqualsDeclaration */
+            || kind === 254 /* ImportSpecifier */
+            || kind === 242 /* InterfaceDeclaration */
+            || kind === 268 /* JsxAttribute */
+            || kind === 157 /* MethodDeclaration */
+            || kind === 156 /* MethodSignature */
+            || kind === 245 /* ModuleDeclaration */
+            || kind === 248 /* NamespaceExportDeclaration */
+            || kind === 252 /* NamespaceImport */
+            || kind === 152 /* Parameter */
+            || kind === 276 /* PropertyAssignment */
+            || kind === 155 /* PropertyDeclaration */
+            || kind === 154 /* PropertySignature */
+            || kind === 160 /* SetAccessor */
+            || kind === 277 /* ShorthandPropertyAssignment */
+            || kind === 243 /* TypeAliasDeclaration */
+            || kind === 151 /* TypeParameter */
+            || kind === 238 /* VariableDeclaration */
+            || kind === 311 /* JSDocTypedefTag */
+            || kind === 304 /* JSDocCallbackTag */
+            || kind === 312 /* JSDocPropertyTag */;
     }
     function isDeclarationStatementKind(kind) {
-        return kind === 239 /* FunctionDeclaration */
-            || kind === 258 /* MissingDeclaration */
-            || kind === 240 /* ClassDeclaration */
-            || kind === 241 /* InterfaceDeclaration */
-            || kind === 242 /* TypeAliasDeclaration */
-            || kind === 243 /* EnumDeclaration */
-            || kind === 244 /* ModuleDeclaration */
-            || kind === 249 /* ImportDeclaration */
-            || kind === 248 /* ImportEqualsDeclaration */
-            || kind === 255 /* ExportDeclaration */
-            || kind === 254 /* ExportAssignment */
-            || kind === 247 /* NamespaceExportDeclaration */;
+        return kind === 240 /* FunctionDeclaration */
+            || kind === 259 /* MissingDeclaration */
+            || kind === 241 /* ClassDeclaration */
+            || kind === 242 /* InterfaceDeclaration */
+            || kind === 243 /* TypeAliasDeclaration */
+            || kind === 244 /* EnumDeclaration */
+            || kind === 245 /* ModuleDeclaration */
+            || kind === 250 /* ImportDeclaration */
+            || kind === 249 /* ImportEqualsDeclaration */
+            || kind === 256 /* ExportDeclaration */
+            || kind === 255 /* ExportAssignment */
+            || kind === 248 /* NamespaceExportDeclaration */;
     }
     function isStatementKindButNotDeclarationKind(kind) {
-        return kind === 229 /* BreakStatement */
-            || kind === 228 /* ContinueStatement */
-            || kind === 236 /* DebuggerStatement */
-            || kind === 223 /* DoStatement */
-            || kind === 221 /* ExpressionStatement */
-            || kind === 220 /* EmptyStatement */
-            || kind === 226 /* ForInStatement */
-            || kind === 227 /* ForOfStatement */
-            || kind === 225 /* ForStatement */
-            || kind === 222 /* IfStatement */
-            || kind === 233 /* LabeledStatement */
-            || kind === 230 /* ReturnStatement */
-            || kind === 232 /* SwitchStatement */
-            || kind === 234 /* ThrowStatement */
-            || kind === 235 /* TryStatement */
-            || kind === 219 /* VariableStatement */
-            || kind === 224 /* WhileStatement */
-            || kind === 231 /* WithStatement */
-            || kind === 312 /* NotEmittedStatement */
-            || kind === 316 /* EndOfDeclarationMarker */
-            || kind === 315 /* MergeDeclarationMarker */;
+        return kind === 230 /* BreakStatement */
+            || kind === 229 /* ContinueStatement */
+            || kind === 237 /* DebuggerStatement */
+            || kind === 224 /* DoStatement */
+            || kind === 222 /* ExpressionStatement */
+            || kind === 221 /* EmptyStatement */
+            || kind === 227 /* ForInStatement */
+            || kind === 228 /* ForOfStatement */
+            || kind === 226 /* ForStatement */
+            || kind === 223 /* IfStatement */
+            || kind === 234 /* LabeledStatement */
+            || kind === 231 /* ReturnStatement */
+            || kind === 233 /* SwitchStatement */
+            || kind === 235 /* ThrowStatement */
+            || kind === 236 /* TryStatement */
+            || kind === 220 /* VariableStatement */
+            || kind === 225 /* WhileStatement */
+            || kind === 232 /* WithStatement */
+            || kind === 314 /* NotEmittedStatement */
+            || kind === 318 /* EndOfDeclarationMarker */
+            || kind === 317 /* MergeDeclarationMarker */;
     }
     /* @internal */
     function isDeclaration(node) {
-        if (node.kind === 150 /* TypeParameter */) {
-            return (node.parent && node.parent.kind !== 308 /* JSDocTemplateTag */) || ts.isInJSFile(node);
+        if (node.kind === 151 /* TypeParameter */) {
+            return (node.parent && node.parent.kind !== 310 /* JSDocTemplateTag */) || ts.isInJSFile(node);
         }
         return isDeclarationKind(node.kind);
     }
@@ -14781,10 +14982,10 @@ var ts;
     }
     ts.isStatement = isStatement;
     function isBlockStatement(node) {
-        if (node.kind !== 218 /* Block */)
+        if (node.kind !== 219 /* Block */)
             return false;
         if (node.parent !== undefined) {
-            if (node.parent.kind === 235 /* TryStatement */ || node.parent.kind === 274 /* CatchClause */) {
+            if (node.parent.kind === 236 /* TryStatement */ || node.parent.kind === 275 /* CatchClause */) {
                 return false;
             }
         }
@@ -14794,81 +14995,81 @@ var ts;
     /* @internal */
     function isModuleReference(node) {
         var kind = node.kind;
-        return kind === 259 /* ExternalModuleReference */
-            || kind === 148 /* QualifiedName */
-            || kind === 72 /* Identifier */;
+        return kind === 260 /* ExternalModuleReference */
+            || kind === 149 /* QualifiedName */
+            || kind === 73 /* Identifier */;
     }
     ts.isModuleReference = isModuleReference;
     // JSX
     /* @internal */
     function isJsxTagNameExpression(node) {
         var kind = node.kind;
-        return kind === 100 /* ThisKeyword */
-            || kind === 72 /* Identifier */
-            || kind === 189 /* PropertyAccessExpression */;
+        return kind === 101 /* ThisKeyword */
+            || kind === 73 /* Identifier */
+            || kind === 190 /* PropertyAccessExpression */;
     }
     ts.isJsxTagNameExpression = isJsxTagNameExpression;
     /* @internal */
     function isJsxChild(node) {
         var kind = node.kind;
-        return kind === 260 /* JsxElement */
-            || kind === 270 /* JsxExpression */
-            || kind === 261 /* JsxSelfClosingElement */
+        return kind === 261 /* JsxElement */
+            || kind === 271 /* JsxExpression */
+            || kind === 262 /* JsxSelfClosingElement */
             || kind === 11 /* JsxText */
-            || kind === 264 /* JsxFragment */;
+            || kind === 265 /* JsxFragment */;
     }
     ts.isJsxChild = isJsxChild;
     /* @internal */
     function isJsxAttributeLike(node) {
         var kind = node.kind;
-        return kind === 267 /* JsxAttribute */
-            || kind === 269 /* JsxSpreadAttribute */;
+        return kind === 268 /* JsxAttribute */
+            || kind === 270 /* JsxSpreadAttribute */;
     }
     ts.isJsxAttributeLike = isJsxAttributeLike;
     /* @internal */
     function isStringLiteralOrJsxExpression(node) {
         var kind = node.kind;
         return kind === 10 /* StringLiteral */
-            || kind === 270 /* JsxExpression */;
+            || kind === 271 /* JsxExpression */;
     }
     ts.isStringLiteralOrJsxExpression = isStringLiteralOrJsxExpression;
     function isJsxOpeningLikeElement(node) {
         var kind = node.kind;
-        return kind === 262 /* JsxOpeningElement */
-            || kind === 261 /* JsxSelfClosingElement */;
+        return kind === 263 /* JsxOpeningElement */
+            || kind === 262 /* JsxSelfClosingElement */;
     }
     ts.isJsxOpeningLikeElement = isJsxOpeningLikeElement;
     // Clauses
     function isCaseOrDefaultClause(node) {
         var kind = node.kind;
-        return kind === 271 /* CaseClause */
-            || kind === 272 /* DefaultClause */;
+        return kind === 272 /* CaseClause */
+            || kind === 273 /* DefaultClause */;
     }
     ts.isCaseOrDefaultClause = isCaseOrDefaultClause;
     // JSDoc
     /** True if node is of some JSDoc syntax kind. */
     /* @internal */
     function isJSDocNode(node) {
-        return node.kind >= 288 /* FirstJSDocNode */ && node.kind <= 310 /* LastJSDocNode */;
+        return node.kind >= 289 /* FirstJSDocNode */ && node.kind <= 312 /* LastJSDocNode */;
     }
     ts.isJSDocNode = isJSDocNode;
     /** True if node is of a kind that may contain comment text. */
     function isJSDocCommentContainingNode(node) {
-        return node.kind === 296 /* JSDocComment */ || isJSDocTag(node) || ts.isJSDocTypeLiteral(node) || ts.isJSDocSignature(node);
+        return node.kind === 297 /* JSDocComment */ || isJSDocTag(node) || ts.isJSDocTypeLiteral(node) || ts.isJSDocSignature(node);
     }
     ts.isJSDocCommentContainingNode = isJSDocCommentContainingNode;
     // TODO: determine what this does before making it public.
     /* @internal */
     function isJSDocTag(node) {
-        return node.kind >= 299 /* FirstJSDocTagNode */ && node.kind <= 310 /* LastJSDocTagNode */;
+        return node.kind >= 300 /* FirstJSDocTagNode */ && node.kind <= 312 /* LastJSDocTagNode */;
     }
     ts.isJSDocTag = isJSDocTag;
     function isSetAccessor(node) {
-        return node.kind === 159 /* SetAccessor */;
+        return node.kind === 160 /* SetAccessor */;
     }
     ts.isSetAccessor = isSetAccessor;
     function isGetAccessor(node) {
-        return node.kind === 158 /* GetAccessor */;
+        return node.kind === 159 /* GetAccessor */;
     }
     ts.isGetAccessor = isGetAccessor;
     /** True if has jsdoc nodes attached to it. */
@@ -14898,12 +15099,12 @@ var ts;
     }
     ts.hasOnlyExpressionInitializer = hasOnlyExpressionInitializer;
     function isObjectLiteralElement(node) {
-        return node.kind === 267 /* JsxAttribute */ || node.kind === 269 /* JsxSpreadAttribute */ || isObjectLiteralElementLike(node);
+        return node.kind === 268 /* JsxAttribute */ || node.kind === 270 /* JsxSpreadAttribute */ || isObjectLiteralElementLike(node);
     }
     ts.isObjectLiteralElement = isObjectLiteralElement;
     /* @internal */
     function isTypeReferenceType(node) {
-        return node.kind === 164 /* TypeReference */ || node.kind === 211 /* ExpressionWithTypeArguments */;
+        return node.kind === 165 /* TypeReference */ || node.kind === 212 /* ExpressionWithTypeArguments */;
     }
     ts.isTypeReferenceType = isTypeReferenceType;
     var MAX_SMI_X86 = 1073741823;
@@ -14939,7 +15140,7 @@ var ts;
 /* @internal */
 (function (ts) {
     function isNamedImportsOrExports(node) {
-        return node.kind === 252 /* NamedImports */ || node.kind === 256 /* NamedExports */;
+        return node.kind === 253 /* NamedImports */ || node.kind === 257 /* NamedExports */;
     }
     ts.isNamedImportsOrExports = isNamedImportsOrExports;
     function Symbol(flags, name) {
@@ -15059,17 +15260,16 @@ var ts;
             messageText: text,
             category: message.category,
             code: message.code,
-            next: details
+            next: details === undefined || Array.isArray(details) ? details : [details]
         };
     }
     ts.chainDiagnosticMessages = chainDiagnosticMessages;
     function concatenateDiagnosticMessageChains(headChain, tailChain) {
         var lastChain = headChain;
         while (lastChain.next) {
-            lastChain = lastChain.next;
+            lastChain = lastChain.next[0];
         }
-        lastChain.next = tailChain;
-        return headChain;
+        lastChain.next = [tailChain];
     }
     ts.concatenateDiagnosticMessageChains = concatenateDiagnosticMessageChains;
     function getDiagnosticFilePath(diagnostic) {
@@ -15103,25 +15303,42 @@ var ts;
         return d1.relatedInformation ? -1 /* LessThan */ : 1 /* GreaterThan */;
     }
     function compareMessageText(t1, t2) {
-        var text1 = t1;
-        var text2 = t2;
-        while (text1 && text2) {
-            // We still have both chains.
-            var string1 = ts.isString(text1) ? text1 : text1.messageText;
-            var string2 = ts.isString(text2) ? text2 : text2.messageText;
-            var res = ts.compareStringsCaseSensitive(string1, string2);
+        if (typeof t1 === "string" && typeof t2 === "string") {
+            return ts.compareStringsCaseSensitive(t1, t2);
+        }
+        else if (typeof t1 === "string") {
+            return -1 /* LessThan */;
+        }
+        else if (typeof t2 === "string") {
+            return 1 /* GreaterThan */;
+        }
+        var res = ts.compareStringsCaseSensitive(t1.messageText, t2.messageText);
+        if (res) {
+            return res;
+        }
+        if (!t1.next && !t2.next) {
+            return 0 /* EqualTo */;
+        }
+        if (!t1.next) {
+            return -1 /* LessThan */;
+        }
+        if (!t2.next) {
+            return 1 /* GreaterThan */;
+        }
+        var len = Math.min(t1.next.length, t2.next.length);
+        for (var i = 0; i < len; i++) {
+            res = compareMessageText(t1.next[i], t2.next[i]);
             if (res) {
                 return res;
             }
-            text1 = ts.isString(text1) ? undefined : text1.next;
-            text2 = ts.isString(text2) ? undefined : text2.next;
         }
-        if (!text1 && !text2) {
-            // if the chains are done, then these messages are the same.
-            return 0 /* EqualTo */;
+        if (t1.next.length < t2.next.length) {
+            return -1 /* LessThan */;
         }
-        // We still have one chain remaining.  The shorter chain should come first.
-        return text1 ? 1 /* GreaterThan */ : -1 /* LessThan */;
+        else if (t1.next.length > t2.next.length) {
+            return 1 /* GreaterThan */;
+        }
+        return 0 /* EqualTo */;
     }
     function getEmitScriptTarget(compilerOptions) {
         return compilerOptions.target || 0 /* ES3 */;
@@ -15190,6 +15407,11 @@ var ts;
             ts.semanticDiagnosticsOptionDeclarations.some(function (option) { return !ts.isJsonEqual(getCompilerOptionValue(oldOptions, option), getCompilerOptionValue(newOptions, option)); });
     }
     ts.compilerOptionsAffectSemanticDiagnostics = compilerOptionsAffectSemanticDiagnostics;
+    function compilerOptionsAffectEmit(newOptions, oldOptions) {
+        return oldOptions !== newOptions &&
+            ts.affectsEmitOptionDeclarations.some(function (option) { return !ts.isJsonEqual(getCompilerOptionValue(oldOptions, option), getCompilerOptionValue(newOptions, option)); });
+    }
+    ts.compilerOptionsAffectEmit = compilerOptionsAffectEmit;
     function getCompilerOptionValue(options, option) {
         return option.strictFlag ? getStrictOptionValue(options, option.name) : options[option.name];
     }
@@ -15468,6 +15690,15 @@ var ts;
         return root + pathComponents.slice(1).join(ts.directorySeparator);
     }
     ts.getPathFromPathComponents = getPathFromPathComponents;
+    function getNormalizedAbsolutePathWithoutRoot(fileName, currentDirectory) {
+        return getPathWithoutRoot(getNormalizedPathComponents(fileName, currentDirectory));
+    }
+    ts.getNormalizedAbsolutePathWithoutRoot = getNormalizedAbsolutePathWithoutRoot;
+    function getPathWithoutRoot(pathComponents) {
+        if (pathComponents.length === 0)
+            return "";
+        return pathComponents.slice(1).join(ts.directorySeparator);
+    }
 })(ts || (ts = {}));
 /* @internal */
 (function (ts) {
@@ -15498,7 +15729,7 @@ var ts;
     }
     ts.getRelativePathFromFile = getRelativePathFromFile;
     function getRelativePathFromDirectory(fromDirectory, to, getCanonicalFileNameOrIgnoreCase) {
-        Debug.assert((ts.getRootLength(fromDirectory) > 0) === (ts.getRootLength(to) > 0), "Paths must either both be absolute or both be relative");
+        ts.Debug.assert((ts.getRootLength(fromDirectory) > 0) === (ts.getRootLength(to) > 0), "Paths must either both be absolute or both be relative");
         var getCanonicalFileName = typeof getCanonicalFileNameOrIgnoreCase === "function" ? getCanonicalFileNameOrIgnoreCase : ts.identity;
         var ignoreCase = typeof getCanonicalFileNameOrIgnoreCase === "boolean" ? getCanonicalFileNameOrIgnoreCase : false;
         var pathComponents = getPathComponentsRelativeTo(fromDirectory, to, ignoreCase ? ts.equateStringsCaseInsensitive : ts.equateStringsCaseSensitive, getCanonicalFileName);
@@ -15868,7 +16099,7 @@ var ts;
     }
     ts.getRegexFromPattern = getRegexFromPattern;
     /** @param path directory of the tsconfig.json */
-    function matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory, depth, getFileSystemEntries) {
+    function matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory, depth, getFileSystemEntries, realpath) {
         path = ts.normalizePath(path);
         currentDirectory = ts.normalizePath(currentDirectory);
         var patterns = getFileMatcherPatterns(path, excludes, includes, useCaseSensitiveFileNames, currentDirectory);
@@ -15878,12 +16109,18 @@ var ts;
         // Associate an array of results with each include regex. This keeps results in order of the "include" order.
         // If there are no "includes", then just put everything in results[0].
         var results = includeFileRegexes ? includeFileRegexes.map(function () { return []; }) : [[]];
+        var visited = ts.createMap();
+        var toCanonical = ts.createGetCanonicalFileName(useCaseSensitiveFileNames);
         for (var _i = 0, _a = patterns.basePaths; _i < _a.length; _i++) {
             var basePath = _a[_i];
             visitDirectory(basePath, combinePaths(currentDirectory, basePath), depth);
         }
         return ts.flatten(results);
         function visitDirectory(path, absolutePath, depth) {
+            var canonicalPath = toCanonical(realpath(absolutePath));
+            if (visited.has(canonicalPath))
+                return;
+            visited.set(canonicalPath, true);
             var _a = getFileSystemEntries(path), files = _a.files, directories = _a.directories;
             var _loop_1 = function (current) {
                 var name = combinePaths(path, current);
@@ -16136,32 +16373,9 @@ var ts;
         return pathext ? path.slice(0, path.length - pathext.length) + (ts.startsWith(ext, ".") ? ext : "." + ext) : path;
     }
     ts.changeAnyExtension = changeAnyExtension;
-    var Debug;
-    (function (Debug) {
-        function showSymbol(symbol) {
-            var symbolFlags = ts.SymbolFlags;
-            return "{ flags: " + (symbolFlags ? showFlags(symbol.flags, symbolFlags) : symbol.flags) + "; declarations: " + ts.map(symbol.declarations, showSyntaxKind) + " }";
-        }
-        Debug.showSymbol = showSymbol;
-        function showFlags(flags, flagsEnum) {
-            var out = [];
-            for (var pow = 0; pow <= 30; pow++) {
-                var n = 1 << pow;
-                if (flags & n) {
-                    out.push(flagsEnum[n]);
-                }
-            }
-            return out.join("|");
-        }
-        function showSyntaxKind(node) {
-            var syntaxKind = ts.SyntaxKind;
-            return syntaxKind ? syntaxKind[node.kind] : node.kind.toString();
-        }
-        Debug.showSyntaxKind = showSyntaxKind;
-    })(Debug = ts.Debug || (ts.Debug = {}));
     function tryParsePattern(pattern) {
         // This should be verified outside of here and a proper error thrown.
-        Debug.assert(ts.hasZeroOrOneAsteriskCharacter(pattern));
+        ts.Debug.assert(ts.hasZeroOrOneAsteriskCharacter(pattern));
         var indexOfStar = pattern.indexOf("*");
         return indexOfStar === -1 ? undefined : {
             prefix: pattern.substr(0, indexOfStar),
@@ -16190,7 +16404,7 @@ var ts;
      */
     function extensionFromPath(path) {
         var ext = tryGetExtensionFromPath(path);
-        return ext !== undefined ? ext : Debug.fail("File " + path + " has unknown extension.");
+        return ext !== undefined ? ext : ts.Debug.fail("File " + path + " has unknown extension.");
     }
     ts.extensionFromPath = extensionFromPath;
     function isAnySupportedFileExtension(path) {
@@ -16262,12 +16476,25 @@ var ts;
     ts.matchPatternOrExact = matchPatternOrExact;
     function sliceAfter(arr, value) {
         var index = arr.indexOf(value);
-        Debug.assert(index !== -1);
+        ts.Debug.assert(index !== -1);
         return arr.slice(index);
     }
     ts.sliceAfter = sliceAfter;
+    function addRelatedInfo(diagnostic) {
+        var _a;
+        var relatedInformation = [];
+        for (var _i = 1; _i < arguments.length; _i++) {
+            relatedInformation[_i - 1] = arguments[_i];
+        }
+        if (!diagnostic.relatedInformation) {
+            diagnostic.relatedInformation = [];
+        }
+        (_a = diagnostic.relatedInformation).push.apply(_a, relatedInformation);
+        return diagnostic;
+    }
+    ts.addRelatedInfo = addRelatedInfo;
     function minAndMax(arr, getValue) {
-        Debug.assert(arr.length !== 0);
+        ts.Debug.assert(arr.length !== 0);
         var min = getValue(arr[0]);
         var max = min;
         for (var i = 1; i < arr.length; i++) {
@@ -16465,10 +16692,10 @@ var ts;
     var SourceFileConstructor;
     // tslint:enable variable-name
     function createNode(kind, pos, end) {
-        if (kind === 284 /* SourceFile */) {
+        if (kind === 285 /* SourceFile */) {
             return new (SourceFileConstructor || (SourceFileConstructor = ts.objectAllocator.getSourceFileConstructor()))(kind, pos, end);
         }
-        else if (kind === 72 /* Identifier */) {
+        else if (kind === 73 /* Identifier */) {
             return new (IdentifierConstructor || (IdentifierConstructor = ts.objectAllocator.getIdentifierConstructor()))(kind, pos, end);
         }
         else if (!ts.isNodeKind(kind)) {
@@ -16517,19 +16744,19 @@ var ts;
      * that they appear in the source code. The language service depends on this property to locate nodes by position.
      */
     function forEachChild(node, cbNode, cbNodes) {
-        if (!node || node.kind <= 147 /* LastToken */) {
+        if (!node || node.kind <= 148 /* LastToken */) {
             return;
         }
         switch (node.kind) {
-            case 148 /* QualifiedName */:
+            case 149 /* QualifiedName */:
                 return visitNode(cbNode, node.left) ||
                     visitNode(cbNode, node.right);
-            case 150 /* TypeParameter */:
+            case 151 /* TypeParameter */:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.constraint) ||
                     visitNode(cbNode, node.default) ||
                     visitNode(cbNode, node.expression);
-            case 276 /* ShorthandPropertyAssignment */:
+            case 277 /* ShorthandPropertyAssignment */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
@@ -16537,9 +16764,9 @@ var ts;
                     visitNode(cbNode, node.exclamationToken) ||
                     visitNode(cbNode, node.equalsToken) ||
                     visitNode(cbNode, node.objectAssignmentInitializer);
-            case 277 /* SpreadAssignment */:
+            case 278 /* SpreadAssignment */:
                 return visitNode(cbNode, node.expression);
-            case 151 /* Parameter */:
+            case 152 /* Parameter */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.dotDotDotToken) ||
@@ -16547,7 +16774,7 @@ var ts;
                     visitNode(cbNode, node.questionToken) ||
                     visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.initializer);
-            case 154 /* PropertyDeclaration */:
+            case 155 /* PropertyDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
@@ -16555,51 +16782,51 @@ var ts;
                     visitNode(cbNode, node.exclamationToken) ||
                     visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.initializer);
-            case 153 /* PropertySignature */:
+            case 154 /* PropertySignature */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.questionToken) ||
                     visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.initializer);
-            case 275 /* PropertyAssignment */:
+            case 276 /* PropertyAssignment */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.questionToken) ||
                     visitNode(cbNode, node.initializer);
-            case 237 /* VariableDeclaration */:
+            case 238 /* VariableDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.exclamationToken) ||
                     visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.initializer);
-            case 186 /* BindingElement */:
+            case 187 /* BindingElement */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.dotDotDotToken) ||
                     visitNode(cbNode, node.propertyName) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.initializer);
-            case 165 /* FunctionType */:
-            case 166 /* ConstructorType */:
-            case 160 /* CallSignature */:
-            case 161 /* ConstructSignature */:
-            case 162 /* IndexSignature */:
+            case 166 /* FunctionType */:
+            case 167 /* ConstructorType */:
+            case 161 /* CallSignature */:
+            case 162 /* ConstructSignature */:
+            case 163 /* IndexSignature */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNodes(cbNode, cbNodes, node.typeParameters) ||
                     visitNodes(cbNode, cbNodes, node.parameters) ||
                     visitNode(cbNode, node.type);
-            case 156 /* MethodDeclaration */:
-            case 155 /* MethodSignature */:
-            case 157 /* Constructor */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
-            case 196 /* FunctionExpression */:
-            case 239 /* FunctionDeclaration */:
-            case 197 /* ArrowFunction */:
+            case 157 /* MethodDeclaration */:
+            case 156 /* MethodSignature */:
+            case 158 /* Constructor */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
+            case 197 /* FunctionExpression */:
+            case 240 /* FunctionDeclaration */:
+            case 198 /* ArrowFunction */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.asteriskToken) ||
@@ -16611,343 +16838,345 @@ var ts;
                     visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.equalsGreaterThanToken) ||
                     visitNode(cbNode, node.body);
-            case 164 /* TypeReference */:
+            case 165 /* TypeReference */:
                 return visitNode(cbNode, node.typeName) ||
                     visitNodes(cbNode, cbNodes, node.typeArguments);
-            case 163 /* TypePredicate */:
+            case 164 /* TypePredicate */:
                 return visitNode(cbNode, node.parameterName) ||
                     visitNode(cbNode, node.type);
-            case 167 /* TypeQuery */:
+            case 168 /* TypeQuery */:
                 return visitNode(cbNode, node.exprName);
-            case 168 /* TypeLiteral */:
+            case 169 /* TypeLiteral */:
                 return visitNodes(cbNode, cbNodes, node.members);
-            case 169 /* ArrayType */:
+            case 170 /* ArrayType */:
                 return visitNode(cbNode, node.elementType);
-            case 170 /* TupleType */:
+            case 171 /* TupleType */:
                 return visitNodes(cbNode, cbNodes, node.elementTypes);
-            case 173 /* UnionType */:
-            case 174 /* IntersectionType */:
+            case 174 /* UnionType */:
+            case 175 /* IntersectionType */:
                 return visitNodes(cbNode, cbNodes, node.types);
-            case 175 /* ConditionalType */:
+            case 176 /* ConditionalType */:
                 return visitNode(cbNode, node.checkType) ||
                     visitNode(cbNode, node.extendsType) ||
                     visitNode(cbNode, node.trueType) ||
                     visitNode(cbNode, node.falseType);
-            case 176 /* InferType */:
+            case 177 /* InferType */:
                 return visitNode(cbNode, node.typeParameter);
-            case 183 /* ImportType */:
+            case 184 /* ImportType */:
                 return visitNode(cbNode, node.argument) ||
                     visitNode(cbNode, node.qualifier) ||
                     visitNodes(cbNode, cbNodes, node.typeArguments);
-            case 177 /* ParenthesizedType */:
-            case 179 /* TypeOperator */:
+            case 178 /* ParenthesizedType */:
+            case 180 /* TypeOperator */:
                 return visitNode(cbNode, node.type);
-            case 180 /* IndexedAccessType */:
+            case 181 /* IndexedAccessType */:
                 return visitNode(cbNode, node.objectType) ||
                     visitNode(cbNode, node.indexType);
-            case 181 /* MappedType */:
+            case 182 /* MappedType */:
                 return visitNode(cbNode, node.readonlyToken) ||
                     visitNode(cbNode, node.typeParameter) ||
                     visitNode(cbNode, node.questionToken) ||
                     visitNode(cbNode, node.type);
-            case 182 /* LiteralType */:
+            case 183 /* LiteralType */:
                 return visitNode(cbNode, node.literal);
-            case 184 /* ObjectBindingPattern */:
-            case 185 /* ArrayBindingPattern */:
+            case 185 /* ObjectBindingPattern */:
+            case 186 /* ArrayBindingPattern */:
                 return visitNodes(cbNode, cbNodes, node.elements);
-            case 187 /* ArrayLiteralExpression */:
+            case 188 /* ArrayLiteralExpression */:
                 return visitNodes(cbNode, cbNodes, node.elements);
-            case 188 /* ObjectLiteralExpression */:
+            case 189 /* ObjectLiteralExpression */:
                 return visitNodes(cbNode, cbNodes, node.properties);
-            case 189 /* PropertyAccessExpression */:
+            case 190 /* PropertyAccessExpression */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.name);
-            case 190 /* ElementAccessExpression */:
+            case 191 /* ElementAccessExpression */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.argumentExpression);
-            case 191 /* CallExpression */:
-            case 192 /* NewExpression */:
+            case 192 /* CallExpression */:
+            case 193 /* NewExpression */:
                 return visitNode(cbNode, node.expression) ||
                     visitNodes(cbNode, cbNodes, node.typeArguments) ||
                     visitNodes(cbNode, cbNodes, node.arguments);
-            case 193 /* TaggedTemplateExpression */:
+            case 194 /* TaggedTemplateExpression */:
                 return visitNode(cbNode, node.tag) ||
                     visitNodes(cbNode, cbNodes, node.typeArguments) ||
                     visitNode(cbNode, node.template);
-            case 194 /* TypeAssertionExpression */:
+            case 195 /* TypeAssertionExpression */:
                 return visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.expression);
-            case 195 /* ParenthesizedExpression */:
+            case 196 /* ParenthesizedExpression */:
                 return visitNode(cbNode, node.expression);
-            case 198 /* DeleteExpression */:
+            case 199 /* DeleteExpression */:
                 return visitNode(cbNode, node.expression);
-            case 199 /* TypeOfExpression */:
+            case 200 /* TypeOfExpression */:
                 return visitNode(cbNode, node.expression);
-            case 200 /* VoidExpression */:
+            case 201 /* VoidExpression */:
                 return visitNode(cbNode, node.expression);
-            case 202 /* PrefixUnaryExpression */:
+            case 203 /* PrefixUnaryExpression */:
                 return visitNode(cbNode, node.operand);
-            case 207 /* YieldExpression */:
+            case 208 /* YieldExpression */:
                 return visitNode(cbNode, node.asteriskToken) ||
                     visitNode(cbNode, node.expression);
-            case 201 /* AwaitExpression */:
+            case 202 /* AwaitExpression */:
                 return visitNode(cbNode, node.expression);
-            case 203 /* PostfixUnaryExpression */:
+            case 204 /* PostfixUnaryExpression */:
                 return visitNode(cbNode, node.operand);
-            case 204 /* BinaryExpression */:
+            case 205 /* BinaryExpression */:
                 return visitNode(cbNode, node.left) ||
                     visitNode(cbNode, node.operatorToken) ||
                     visitNode(cbNode, node.right);
-            case 212 /* AsExpression */:
+            case 213 /* AsExpression */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.type);
-            case 213 /* NonNullExpression */:
+            case 214 /* NonNullExpression */:
                 return visitNode(cbNode, node.expression);
-            case 214 /* MetaProperty */:
+            case 215 /* MetaProperty */:
                 return visitNode(cbNode, node.name);
-            case 205 /* ConditionalExpression */:
+            case 206 /* ConditionalExpression */:
                 return visitNode(cbNode, node.condition) ||
                     visitNode(cbNode, node.questionToken) ||
                     visitNode(cbNode, node.whenTrue) ||
                     visitNode(cbNode, node.colonToken) ||
                     visitNode(cbNode, node.whenFalse);
-            case 208 /* SpreadElement */:
+            case 209 /* SpreadElement */:
                 return visitNode(cbNode, node.expression);
-            case 218 /* Block */:
-            case 245 /* ModuleBlock */:
+            case 219 /* Block */:
+            case 246 /* ModuleBlock */:
                 return visitNodes(cbNode, cbNodes, node.statements);
-            case 284 /* SourceFile */:
+            case 285 /* SourceFile */:
                 return visitNodes(cbNode, cbNodes, node.statements) ||
                     visitNode(cbNode, node.endOfFileToken);
-            case 219 /* VariableStatement */:
+            case 220 /* VariableStatement */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.declarationList);
-            case 238 /* VariableDeclarationList */:
+            case 239 /* VariableDeclarationList */:
                 return visitNodes(cbNode, cbNodes, node.declarations);
-            case 221 /* ExpressionStatement */:
+            case 222 /* ExpressionStatement */:
                 return visitNode(cbNode, node.expression);
-            case 222 /* IfStatement */:
+            case 223 /* IfStatement */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.thenStatement) ||
                     visitNode(cbNode, node.elseStatement);
-            case 223 /* DoStatement */:
+            case 224 /* DoStatement */:
                 return visitNode(cbNode, node.statement) ||
                     visitNode(cbNode, node.expression);
-            case 224 /* WhileStatement */:
+            case 225 /* WhileStatement */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.statement);
-            case 225 /* ForStatement */:
+            case 226 /* ForStatement */:
                 return visitNode(cbNode, node.initializer) ||
                     visitNode(cbNode, node.condition) ||
                     visitNode(cbNode, node.incrementor) ||
                     visitNode(cbNode, node.statement);
-            case 226 /* ForInStatement */:
+            case 227 /* ForInStatement */:
                 return visitNode(cbNode, node.initializer) ||
                     visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.statement);
-            case 227 /* ForOfStatement */:
+            case 228 /* ForOfStatement */:
                 return visitNode(cbNode, node.awaitModifier) ||
                     visitNode(cbNode, node.initializer) ||
                     visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.statement);
-            case 228 /* ContinueStatement */:
-            case 229 /* BreakStatement */:
+            case 229 /* ContinueStatement */:
+            case 230 /* BreakStatement */:
                 return visitNode(cbNode, node.label);
-            case 230 /* ReturnStatement */:
+            case 231 /* ReturnStatement */:
                 return visitNode(cbNode, node.expression);
-            case 231 /* WithStatement */:
+            case 232 /* WithStatement */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.statement);
-            case 232 /* SwitchStatement */:
+            case 233 /* SwitchStatement */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.caseBlock);
-            case 246 /* CaseBlock */:
+            case 247 /* CaseBlock */:
                 return visitNodes(cbNode, cbNodes, node.clauses);
-            case 271 /* CaseClause */:
+            case 272 /* CaseClause */:
                 return visitNode(cbNode, node.expression) ||
                     visitNodes(cbNode, cbNodes, node.statements);
-            case 272 /* DefaultClause */:
+            case 273 /* DefaultClause */:
                 return visitNodes(cbNode, cbNodes, node.statements);
-            case 233 /* LabeledStatement */:
+            case 234 /* LabeledStatement */:
                 return visitNode(cbNode, node.label) ||
                     visitNode(cbNode, node.statement);
-            case 234 /* ThrowStatement */:
+            case 235 /* ThrowStatement */:
                 return visitNode(cbNode, node.expression);
-            case 235 /* TryStatement */:
+            case 236 /* TryStatement */:
                 return visitNode(cbNode, node.tryBlock) ||
                     visitNode(cbNode, node.catchClause) ||
                     visitNode(cbNode, node.finallyBlock);
-            case 274 /* CatchClause */:
+            case 275 /* CatchClause */:
                 return visitNode(cbNode, node.variableDeclaration) ||
                     visitNode(cbNode, node.block);
-            case 152 /* Decorator */:
+            case 153 /* Decorator */:
                 return visitNode(cbNode, node.expression);
-            case 240 /* ClassDeclaration */:
-            case 209 /* ClassExpression */:
+            case 241 /* ClassDeclaration */:
+            case 210 /* ClassExpression */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNodes(cbNode, cbNodes, node.typeParameters) ||
                     visitNodes(cbNode, cbNodes, node.heritageClauses) ||
                     visitNodes(cbNode, cbNodes, node.members);
-            case 241 /* InterfaceDeclaration */:
+            case 242 /* InterfaceDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNodes(cbNode, cbNodes, node.typeParameters) ||
                     visitNodes(cbNode, cbNodes, node.heritageClauses) ||
                     visitNodes(cbNode, cbNodes, node.members);
-            case 242 /* TypeAliasDeclaration */:
+            case 243 /* TypeAliasDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNodes(cbNode, cbNodes, node.typeParameters) ||
                     visitNode(cbNode, node.type);
-            case 243 /* EnumDeclaration */:
+            case 244 /* EnumDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNodes(cbNode, cbNodes, node.members);
-            case 278 /* EnumMember */:
+            case 279 /* EnumMember */:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.initializer);
-            case 244 /* ModuleDeclaration */:
+            case 245 /* ModuleDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.body);
-            case 248 /* ImportEqualsDeclaration */:
+            case 249 /* ImportEqualsDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.moduleReference);
-            case 249 /* ImportDeclaration */:
+            case 250 /* ImportDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.importClause) ||
                     visitNode(cbNode, node.moduleSpecifier);
-            case 250 /* ImportClause */:
+            case 251 /* ImportClause */:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.namedBindings);
-            case 247 /* NamespaceExportDeclaration */:
+            case 248 /* NamespaceExportDeclaration */:
                 return visitNode(cbNode, node.name);
-            case 251 /* NamespaceImport */:
+            case 252 /* NamespaceImport */:
                 return visitNode(cbNode, node.name);
-            case 252 /* NamedImports */:
-            case 256 /* NamedExports */:
+            case 253 /* NamedImports */:
+            case 257 /* NamedExports */:
                 return visitNodes(cbNode, cbNodes, node.elements);
-            case 255 /* ExportDeclaration */:
+            case 256 /* ExportDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.exportClause) ||
                     visitNode(cbNode, node.moduleSpecifier);
-            case 253 /* ImportSpecifier */:
-            case 257 /* ExportSpecifier */:
+            case 254 /* ImportSpecifier */:
+            case 258 /* ExportSpecifier */:
                 return visitNode(cbNode, node.propertyName) ||
                     visitNode(cbNode, node.name);
-            case 254 /* ExportAssignment */:
+            case 255 /* ExportAssignment */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.expression);
-            case 206 /* TemplateExpression */:
+            case 207 /* TemplateExpression */:
                 return visitNode(cbNode, node.head) || visitNodes(cbNode, cbNodes, node.templateSpans);
-            case 216 /* TemplateSpan */:
+            case 217 /* TemplateSpan */:
                 return visitNode(cbNode, node.expression) || visitNode(cbNode, node.literal);
-            case 149 /* ComputedPropertyName */:
+            case 150 /* ComputedPropertyName */:
                 return visitNode(cbNode, node.expression);
-            case 273 /* HeritageClause */:
+            case 274 /* HeritageClause */:
                 return visitNodes(cbNode, cbNodes, node.types);
-            case 211 /* ExpressionWithTypeArguments */:
+            case 212 /* ExpressionWithTypeArguments */:
                 return visitNode(cbNode, node.expression) ||
                     visitNodes(cbNode, cbNodes, node.typeArguments);
-            case 259 /* ExternalModuleReference */:
+            case 260 /* ExternalModuleReference */:
                 return visitNode(cbNode, node.expression);
-            case 258 /* MissingDeclaration */:
+            case 259 /* MissingDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators);
-            case 314 /* CommaListExpression */:
+            case 316 /* CommaListExpression */:
                 return visitNodes(cbNode, cbNodes, node.elements);
-            case 260 /* JsxElement */:
+            case 261 /* JsxElement */:
                 return visitNode(cbNode, node.openingElement) ||
                     visitNodes(cbNode, cbNodes, node.children) ||
                     visitNode(cbNode, node.closingElement);
-            case 264 /* JsxFragment */:
+            case 265 /* JsxFragment */:
                 return visitNode(cbNode, node.openingFragment) ||
                     visitNodes(cbNode, cbNodes, node.children) ||
                     visitNode(cbNode, node.closingFragment);
-            case 261 /* JsxSelfClosingElement */:
-            case 262 /* JsxOpeningElement */:
+            case 262 /* JsxSelfClosingElement */:
+            case 263 /* JsxOpeningElement */:
                 return visitNode(cbNode, node.tagName) ||
                     visitNodes(cbNode, cbNodes, node.typeArguments) ||
                     visitNode(cbNode, node.attributes);
-            case 268 /* JsxAttributes */:
+            case 269 /* JsxAttributes */:
                 return visitNodes(cbNode, cbNodes, node.properties);
-            case 267 /* JsxAttribute */:
+            case 268 /* JsxAttribute */:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.initializer);
-            case 269 /* JsxSpreadAttribute */:
+            case 270 /* JsxSpreadAttribute */:
                 return visitNode(cbNode, node.expression);
-            case 270 /* JsxExpression */:
+            case 271 /* JsxExpression */:
                 return visitNode(cbNode, node.dotDotDotToken) ||
                     visitNode(cbNode, node.expression);
-            case 263 /* JsxClosingElement */:
+            case 264 /* JsxClosingElement */:
                 return visitNode(cbNode, node.tagName);
-            case 171 /* OptionalType */:
-            case 172 /* RestType */:
-            case 288 /* JSDocTypeExpression */:
-            case 292 /* JSDocNonNullableType */:
-            case 291 /* JSDocNullableType */:
-            case 293 /* JSDocOptionalType */:
-            case 295 /* JSDocVariadicType */:
+            case 172 /* OptionalType */:
+            case 173 /* RestType */:
+            case 289 /* JSDocTypeExpression */:
+            case 293 /* JSDocNonNullableType */:
+            case 292 /* JSDocNullableType */:
+            case 294 /* JSDocOptionalType */:
+            case 296 /* JSDocVariadicType */:
                 return visitNode(cbNode, node.type);
-            case 294 /* JSDocFunctionType */:
+            case 295 /* JSDocFunctionType */:
                 return visitNodes(cbNode, cbNodes, node.parameters) ||
                     visitNode(cbNode, node.type);
-            case 296 /* JSDocComment */:
+            case 297 /* JSDocComment */:
                 return visitNodes(cbNode, cbNodes, node.tags);
-            case 304 /* JSDocParameterTag */:
-            case 310 /* JSDocPropertyTag */:
+            case 306 /* JSDocParameterTag */:
+            case 312 /* JSDocPropertyTag */:
                 return visitNode(cbNode, node.tagName) ||
                     (node.isNameFirst
                         ? visitNode(cbNode, node.name) ||
                             visitNode(cbNode, node.typeExpression)
                         : visitNode(cbNode, node.typeExpression) ||
                             visitNode(cbNode, node.name));
-            case 300 /* JSDocAugmentsTag */:
+            case 302 /* JSDocAuthorTag */:
+                return visitNode(cbNode, node.tagName);
+            case 301 /* JSDocAugmentsTag */:
                 return visitNode(cbNode, node.tagName) ||
                     visitNode(cbNode, node.class);
-            case 308 /* JSDocTemplateTag */:
+            case 310 /* JSDocTemplateTag */:
                 return visitNode(cbNode, node.tagName) ||
                     visitNode(cbNode, node.constraint) ||
                     visitNodes(cbNode, cbNodes, node.typeParameters);
-            case 309 /* JSDocTypedefTag */:
+            case 311 /* JSDocTypedefTag */:
                 return visitNode(cbNode, node.tagName) ||
                     (node.typeExpression &&
-                        node.typeExpression.kind === 288 /* JSDocTypeExpression */
+                        node.typeExpression.kind === 289 /* JSDocTypeExpression */
                         ? visitNode(cbNode, node.typeExpression) ||
                             visitNode(cbNode, node.fullName)
                         : visitNode(cbNode, node.fullName) ||
                             visitNode(cbNode, node.typeExpression));
-            case 302 /* JSDocCallbackTag */:
+            case 304 /* JSDocCallbackTag */:
                 return visitNode(cbNode, node.tagName) ||
                     visitNode(cbNode, node.fullName) ||
                     visitNode(cbNode, node.typeExpression);
-            case 305 /* JSDocReturnTag */:
-            case 307 /* JSDocTypeTag */:
-            case 306 /* JSDocThisTag */:
-            case 303 /* JSDocEnumTag */:
+            case 307 /* JSDocReturnTag */:
+            case 309 /* JSDocTypeTag */:
+            case 308 /* JSDocThisTag */:
+            case 305 /* JSDocEnumTag */:
                 return visitNode(cbNode, node.tagName) ||
                     visitNode(cbNode, node.typeExpression);
-            case 298 /* JSDocSignature */:
+            case 299 /* JSDocSignature */:
                 return ts.forEach(node.typeParameters, cbNode) ||
                     ts.forEach(node.parameters, cbNode) ||
                     visitNode(cbNode, node.type);
-            case 297 /* JSDocTypeLiteral */:
+            case 298 /* JSDocTypeLiteral */:
                 return ts.forEach(node.jsDocPropertyTags, cbNode);
-            case 299 /* JSDocTag */:
-            case 301 /* JSDocClassTag */:
+            case 300 /* JSDocTag */:
+            case 303 /* JSDocClassTag */:
                 return visitNode(cbNode, node.tagName);
-            case 313 /* PartiallyEmittedExpression */:
+            case 315 /* PartiallyEmittedExpression */:
                 return visitNode(cbNode, node.expression);
         }
     }
@@ -17027,7 +17256,7 @@ var ts;
     (function (Parser) {
         // Share a single scanner across all calls to parse a source file.  This helps speed things
         // up by avoiding the cost of creating/compiling scanners over and over again.
-        var scanner = ts.createScanner(7 /* Latest */, /*skipTrivia*/ true);
+        var scanner = ts.createScanner(99 /* Latest */, /*skipTrivia*/ true);
         var disallowInAndDecoratorContext = 2048 /* DisallowInContext */ | 8192 /* DecoratorContext */;
         // capture constructors in 'initializeState' to avoid null checks
         // tslint:disable variable-name
@@ -17165,14 +17394,14 @@ var ts;
                 sourceFile.endOfFileToken = parseTokenNode();
             }
             else {
-                var statement = createNode(221 /* ExpressionStatement */);
+                var statement = createNode(222 /* ExpressionStatement */);
                 switch (token()) {
                     case 22 /* OpenBracketToken */:
                         statement.expression = parseArrayLiteralExpression();
                         break;
-                    case 102 /* TrueKeyword */:
-                    case 87 /* FalseKeyword */:
-                    case 96 /* NullKeyword */:
+                    case 103 /* TrueKeyword */:
+                    case 88 /* FalseKeyword */:
+                    case 97 /* NullKeyword */:
                         statement.expression = parseTokenNode();
                         break;
                     case 39 /* MinusToken */:
@@ -17321,7 +17550,7 @@ var ts;
         function createSourceFile(fileName, languageVersion, scriptKind, isDeclarationFile) {
             // code from createNode is inlined here so createNode won't have to deal with special case of creating source files
             // this is quite rare comparing to other nodes and createNode should be as fast as possible
-            var sourceFile = new SourceFileConstructor(284 /* SourceFile */, /*pos*/ 0, /* end */ sourceText.length);
+            var sourceFile = new SourceFileConstructor(285 /* SourceFile */, /*pos*/ 0, /* end */ sourceText.length);
             nodeCount++;
             sourceFile.text = sourceText;
             sourceFile.bindDiagnostics = [];
@@ -17464,6 +17693,9 @@ var ts;
         function nextToken() {
             return currentToken = scanner.scan();
         }
+        function nextTokenJSDoc() {
+            return currentToken = scanner.scanJsDocToken();
+        }
         function reScanGreaterToken() {
             return currentToken = scanner.reScanGreaterToken();
         }
@@ -17529,20 +17761,20 @@ var ts;
         }
         // Ignore strict mode flag because we will report an error in type checker instead.
         function isIdentifier() {
-            if (token() === 72 /* Identifier */) {
+            if (token() === 73 /* Identifier */) {
                 return true;
             }
             // If we have a 'yield' keyword, and we're in the [yield] context, then 'yield' is
             // considered a keyword and is not an identifier.
-            if (token() === 117 /* YieldKeyword */ && inYieldContext()) {
+            if (token() === 118 /* YieldKeyword */ && inYieldContext()) {
                 return false;
             }
             // If we have a 'await' keyword, and we're in the [Await] context, then 'await' is
             // considered a keyword and is not an identifier.
-            if (token() === 122 /* AwaitKeyword */ && inAwaitContext()) {
+            if (token() === 123 /* AwaitKeyword */ && inAwaitContext()) {
                 return false;
             }
-            return token() > 108 /* LastReservedWord */;
+            return token() > 109 /* LastReservedWord */;
         }
         function parseExpected(kind, diagnosticMessage, shouldAdvance) {
             if (shouldAdvance === void 0) { shouldAdvance = true; }
@@ -17561,6 +17793,14 @@ var ts;
             }
             return false;
         }
+        function parseExpectedJSDoc(kind) {
+            if (token() === kind) {
+                nextTokenJSDoc();
+                return true;
+            }
+            parseErrorAtCurrentToken(ts.Diagnostics._0_expected, ts.tokenToString(kind));
+            return false;
+        }
         function parseOptional(t) {
             if (token() === t) {
                 nextToken();
@@ -17574,15 +17814,30 @@ var ts;
             }
             return undefined;
         }
+        function parseOptionalTokenJSDoc(t) {
+            if (token() === t) {
+                return parseTokenNodeJSDoc();
+            }
+            return undefined;
+        }
         function parseExpectedToken(t, diagnosticMessage, arg0) {
             return parseOptionalToken(t) ||
                 createMissingNode(t, /*reportAtCurrentPosition*/ false, diagnosticMessage || ts.Diagnostics._0_expected, arg0 || ts.tokenToString(t));
         }
+        function parseExpectedTokenJSDoc(t) {
+            return parseOptionalTokenJSDoc(t) ||
+                createMissingNode(t, /*reportAtCurrentPosition*/ false, ts.Diagnostics._0_expected, ts.tokenToString(t));
+        }
         function parseTokenNode() {
             var node = createNode(token());
             nextToken();
             return finishNode(node);
         }
+        function parseTokenNodeJSDoc() {
+            var node = createNode(token());
+            nextTokenJSDoc();
+            return finishNode(node);
+        }
         function canParseSemicolon() {
             // If there's a real semicolon, then we can always parse it out.
             if (token() === 26 /* SemicolonToken */) {
@@ -17607,7 +17862,7 @@ var ts;
             nodeCount++;
             var p = pos >= 0 ? pos : scanner.getStartPos();
             return ts.isNodeKind(kind) || kind === 0 /* Unknown */ ? new NodeConstructor(kind, p, p) :
-                kind === 72 /* Identifier */ ? new IdentifierConstructor(kind, p, p) :
+                kind === 73 /* Identifier */ ? new IdentifierConstructor(kind, p, p) :
                     new TokenConstructor(kind, p, p);
         }
         function createNodeWithJSDoc(kind, pos) {
@@ -17649,7 +17904,7 @@ var ts;
                 parseErrorAtCurrentToken(diagnosticMessage, arg0);
             }
             var result = createNode(kind);
-            if (kind === 72 /* Identifier */) {
+            if (kind === 73 /* Identifier */) {
                 result.escapedText = "";
             }
             else if (ts.isLiteralKind(kind) || ts.isTemplateLiteralKind(kind)) {
@@ -17670,9 +17925,9 @@ var ts;
         function createIdentifier(isIdentifier, diagnosticMessage) {
             identifierCount++;
             if (isIdentifier) {
-                var node = createNode(72 /* Identifier */);
+                var node = createNode(73 /* Identifier */);
                 // Store original token kind if it is not just an Identifier so we can report appropriate error later in type checker
-                if (token() !== 72 /* Identifier */) {
+                if (token() !== 73 /* Identifier */) {
                     node.originalKeywordKind = token();
                 }
                 node.escapedText = ts.escapeLeadingUnderscores(internIdentifier(scanner.getTokenValue()));
@@ -17681,7 +17936,7 @@ var ts;
             }
             // Only for end of file because the error gets reported incorrectly on embedded script tags.
             var reportAtCurrentPosition = token() === 1 /* EndOfFileToken */;
-            return createMissingNode(72 /* Identifier */, reportAtCurrentPosition, diagnosticMessage || ts.Diagnostics.Identifier_expected);
+            return createMissingNode(73 /* Identifier */, reportAtCurrentPosition, diagnosticMessage || ts.Diagnostics.Identifier_expected);
         }
         function parseIdentifier(diagnosticMessage) {
             return createIdentifier(isIdentifier(), diagnosticMessage);
@@ -17712,7 +17967,7 @@ var ts;
             // PropertyName [Yield]:
             //      LiteralPropertyName
             //      ComputedPropertyName[?Yield]
-            var node = createNode(149 /* ComputedPropertyName */);
+            var node = createNode(150 /* ComputedPropertyName */);
             parseExpected(22 /* OpenBracketToken */);
             // We parse any expression (including a comma expression). But the grammar
             // says that only an assignment expression is allowed, so the grammar checker
@@ -17733,20 +17988,20 @@ var ts;
         }
         function nextTokenCanFollowModifier() {
             switch (token()) {
-                case 77 /* ConstKeyword */:
+                case 78 /* ConstKeyword */:
                     // 'const' is only a modifier if followed by 'enum'.
-                    return nextToken() === 84 /* EnumKeyword */;
-                case 85 /* ExportKeyword */:
+                    return nextToken() === 85 /* EnumKeyword */;
+                case 86 /* ExportKeyword */:
                     nextToken();
-                    if (token() === 80 /* DefaultKeyword */) {
+                    if (token() === 81 /* DefaultKeyword */) {
                         return lookAhead(nextTokenCanFollowDefaultKeyword);
                     }
-                    return token() !== 40 /* AsteriskToken */ && token() !== 119 /* AsKeyword */ && token() !== 18 /* OpenBraceToken */ && canFollowModifier();
-                case 80 /* DefaultKeyword */:
+                    return token() !== 40 /* AsteriskToken */ && token() !== 120 /* AsKeyword */ && token() !== 18 /* OpenBraceToken */ && canFollowModifier();
+                case 81 /* DefaultKeyword */:
                     return nextTokenCanFollowDefaultKeyword();
-                case 116 /* StaticKeyword */:
-                case 126 /* GetKeyword */:
-                case 137 /* SetKeyword */:
+                case 117 /* StaticKeyword */:
+                case 127 /* GetKeyword */:
+                case 138 /* SetKeyword */:
                     nextToken();
                     return canFollowModifier();
                 default:
@@ -17765,10 +18020,10 @@ var ts;
         }
         function nextTokenCanFollowDefaultKeyword() {
             nextToken();
-            return token() === 76 /* ClassKeyword */ || token() === 90 /* FunctionKeyword */ ||
-                token() === 110 /* InterfaceKeyword */ ||
-                (token() === 118 /* AbstractKeyword */ && lookAhead(nextTokenIsClassKeywordOnSameLine)) ||
-                (token() === 121 /* AsyncKeyword */ && lookAhead(nextTokenIsFunctionKeywordOnSameLine));
+            return token() === 77 /* ClassKeyword */ || token() === 91 /* FunctionKeyword */ ||
+                token() === 111 /* InterfaceKeyword */ ||
+                (token() === 119 /* AbstractKeyword */ && lookAhead(nextTokenIsClassKeywordOnSameLine)) ||
+                (token() === 122 /* AsyncKeyword */ && lookAhead(nextTokenIsFunctionKeywordOnSameLine));
         }
         // True if positioned at the start of a list element
         function isListElement(parsingContext, inErrorRecovery) {
@@ -17788,7 +18043,7 @@ var ts;
                     // outer module.  We just want to consume and move on.
                     return !(token() === 26 /* SemicolonToken */ && inErrorRecovery) && isStartOfStatement();
                 case 2 /* SwitchClauses */:
-                    return token() === 74 /* CaseKeyword */ || token() === 80 /* DefaultKeyword */;
+                    return token() === 75 /* CaseKeyword */ || token() === 81 /* DefaultKeyword */;
                 case 4 /* TypeMembers */:
                     return lookAhead(isTypeMemberStart);
                 case 5 /* ClassMembers */:
@@ -17874,7 +18129,7 @@ var ts;
                 //      extends {} extends
                 //      extends {} implements
                 var next = nextToken();
-                return next === 27 /* CommaToken */ || next === 18 /* OpenBraceToken */ || next === 86 /* ExtendsKeyword */ || next === 109 /* ImplementsKeyword */;
+                return next === 27 /* CommaToken */ || next === 18 /* OpenBraceToken */ || next === 87 /* ExtendsKeyword */ || next === 110 /* ImplementsKeyword */;
             }
             return true;
         }
@@ -17891,8 +18146,8 @@ var ts;
             return ts.tokenIsIdentifierOrKeywordOrGreaterThan(token());
         }
         function isHeritageClauseExtendsOrImplementsKeyword() {
-            if (token() === 109 /* ImplementsKeyword */ ||
-                token() === 86 /* ExtendsKeyword */) {
+            if (token() === 110 /* ImplementsKeyword */ ||
+                token() === 87 /* ExtendsKeyword */) {
                 return lookAhead(nextTokenIsStartOfExpression);
             }
             return false;
@@ -17922,14 +18177,14 @@ var ts;
                 case 23 /* ImportOrExportSpecifiers */:
                     return token() === 19 /* CloseBraceToken */;
                 case 3 /* SwitchClauseStatements */:
-                    return token() === 19 /* CloseBraceToken */ || token() === 74 /* CaseKeyword */ || token() === 80 /* DefaultKeyword */;
+                    return token() === 19 /* CloseBraceToken */ || token() === 75 /* CaseKeyword */ || token() === 81 /* DefaultKeyword */;
                 case 7 /* HeritageClauseElement */:
-                    return token() === 18 /* OpenBraceToken */ || token() === 86 /* ExtendsKeyword */ || token() === 109 /* ImplementsKeyword */;
+                    return token() === 18 /* OpenBraceToken */ || token() === 87 /* ExtendsKeyword */ || token() === 110 /* ImplementsKeyword */;
                 case 8 /* VariableDeclarations */:
                     return isVariableDeclaratorListTerminator();
                 case 19 /* TypeParameters */:
                     // Tokens other than '>' are here for better error recovery
-                    return token() === 30 /* GreaterThanToken */ || token() === 20 /* OpenParenToken */ || token() === 18 /* OpenBraceToken */ || token() === 86 /* ExtendsKeyword */ || token() === 109 /* ImplementsKeyword */;
+                    return token() === 30 /* GreaterThanToken */ || token() === 20 /* OpenParenToken */ || token() === 18 /* OpenBraceToken */ || token() === 87 /* ExtendsKeyword */ || token() === 110 /* ImplementsKeyword */;
                 case 11 /* ArgumentExpressions */:
                     // Tokens other than ')' are here for better error recovery
                     return token() === 21 /* CloseParenToken */ || token() === 26 /* SemicolonToken */;
@@ -18146,20 +18401,20 @@ var ts;
         function isReusableClassMember(node) {
             if (node) {
                 switch (node.kind) {
-                    case 157 /* Constructor */:
-                    case 162 /* IndexSignature */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
-                    case 154 /* PropertyDeclaration */:
-                    case 217 /* SemicolonClassElement */:
+                    case 158 /* Constructor */:
+                    case 163 /* IndexSignature */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
+                    case 155 /* PropertyDeclaration */:
+                    case 218 /* SemicolonClassElement */:
                         return true;
-                    case 156 /* MethodDeclaration */:
+                    case 157 /* MethodDeclaration */:
                         // Method declarations are not necessarily reusable.  An object-literal
                         // may have a method calls "constructor(...)" and we must reparse that
                         // into an actual .ConstructorDeclaration.
                         var methodDeclaration = node;
-                        var nameIsConstructor = methodDeclaration.name.kind === 72 /* Identifier */ &&
-                            methodDeclaration.name.originalKeywordKind === 124 /* ConstructorKeyword */;
+                        var nameIsConstructor = methodDeclaration.name.kind === 73 /* Identifier */ &&
+                            methodDeclaration.name.originalKeywordKind === 125 /* ConstructorKeyword */;
                         return !nameIsConstructor;
                 }
             }
@@ -18168,8 +18423,8 @@ var ts;
         function isReusableSwitchClause(node) {
             if (node) {
                 switch (node.kind) {
-                    case 271 /* CaseClause */:
-                    case 272 /* DefaultClause */:
+                    case 272 /* CaseClause */:
+                    case 273 /* DefaultClause */:
                         return true;
                 }
             }
@@ -18178,58 +18433,58 @@ var ts;
         function isReusableStatement(node) {
             if (node) {
                 switch (node.kind) {
-                    case 239 /* FunctionDeclaration */:
-                    case 219 /* VariableStatement */:
-                    case 218 /* Block */:
-                    case 222 /* IfStatement */:
-                    case 221 /* ExpressionStatement */:
-                    case 234 /* ThrowStatement */:
-                    case 230 /* ReturnStatement */:
-                    case 232 /* SwitchStatement */:
-                    case 229 /* BreakStatement */:
-                    case 228 /* ContinueStatement */:
-                    case 226 /* ForInStatement */:
-                    case 227 /* ForOfStatement */:
-                    case 225 /* ForStatement */:
-                    case 224 /* WhileStatement */:
-                    case 231 /* WithStatement */:
-                    case 220 /* EmptyStatement */:
-                    case 235 /* TryStatement */:
-                    case 233 /* LabeledStatement */:
-                    case 223 /* DoStatement */:
-                    case 236 /* DebuggerStatement */:
-                    case 249 /* ImportDeclaration */:
-                    case 248 /* ImportEqualsDeclaration */:
-                    case 255 /* ExportDeclaration */:
-                    case 254 /* ExportAssignment */:
-                    case 244 /* ModuleDeclaration */:
-                    case 240 /* ClassDeclaration */:
-                    case 241 /* InterfaceDeclaration */:
-                    case 243 /* EnumDeclaration */:
-                    case 242 /* TypeAliasDeclaration */:
+                    case 240 /* FunctionDeclaration */:
+                    case 220 /* VariableStatement */:
+                    case 219 /* Block */:
+                    case 223 /* IfStatement */:
+                    case 222 /* ExpressionStatement */:
+                    case 235 /* ThrowStatement */:
+                    case 231 /* ReturnStatement */:
+                    case 233 /* SwitchStatement */:
+                    case 230 /* BreakStatement */:
+                    case 229 /* ContinueStatement */:
+                    case 227 /* ForInStatement */:
+                    case 228 /* ForOfStatement */:
+                    case 226 /* ForStatement */:
+                    case 225 /* WhileStatement */:
+                    case 232 /* WithStatement */:
+                    case 221 /* EmptyStatement */:
+                    case 236 /* TryStatement */:
+                    case 234 /* LabeledStatement */:
+                    case 224 /* DoStatement */:
+                    case 237 /* DebuggerStatement */:
+                    case 250 /* ImportDeclaration */:
+                    case 249 /* ImportEqualsDeclaration */:
+                    case 256 /* ExportDeclaration */:
+                    case 255 /* ExportAssignment */:
+                    case 245 /* ModuleDeclaration */:
+                    case 241 /* ClassDeclaration */:
+                    case 242 /* InterfaceDeclaration */:
+                    case 244 /* EnumDeclaration */:
+                    case 243 /* TypeAliasDeclaration */:
                         return true;
                 }
             }
             return false;
         }
         function isReusableEnumMember(node) {
-            return node.kind === 278 /* EnumMember */;
+            return node.kind === 279 /* EnumMember */;
         }
         function isReusableTypeMember(node) {
             if (node) {
                 switch (node.kind) {
-                    case 161 /* ConstructSignature */:
-                    case 155 /* MethodSignature */:
-                    case 162 /* IndexSignature */:
-                    case 153 /* PropertySignature */:
-                    case 160 /* CallSignature */:
+                    case 162 /* ConstructSignature */:
+                    case 156 /* MethodSignature */:
+                    case 163 /* IndexSignature */:
+                    case 154 /* PropertySignature */:
+                    case 161 /* CallSignature */:
                         return true;
                 }
             }
             return false;
         }
         function isReusableVariableDeclaration(node) {
-            if (node.kind !== 237 /* VariableDeclaration */) {
+            if (node.kind !== 238 /* VariableDeclaration */) {
                 return false;
             }
             // Very subtle incremental parsing bug.  Consider the following code:
@@ -18250,7 +18505,7 @@ var ts;
             return variableDeclarator.initializer === undefined;
         }
         function isReusableParameter(node) {
-            if (node.kind !== 151 /* Parameter */) {
+            if (node.kind !== 152 /* Parameter */) {
                 return false;
             }
             // See the comment in isReusableVariableDeclaration for why we do this.
@@ -18386,7 +18641,7 @@ var ts;
             return entity;
         }
         function createQualifiedName(entity, name) {
-            var node = createNode(148 /* QualifiedName */, entity.pos);
+            var node = createNode(149 /* QualifiedName */, entity.pos);
             node.left = entity;
             node.right = name;
             return finishNode(node);
@@ -18417,13 +18672,13 @@ var ts;
                     // Report that we need an identifier.  However, report it right after the dot,
                     // and not on the next token.  This is because the next token might actually
                     // be an identifier and the error would be quite confusing.
-                    return createMissingNode(72 /* Identifier */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Identifier_expected);
+                    return createMissingNode(73 /* Identifier */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Identifier_expected);
                 }
             }
             return allowIdentifierNames ? parseIdentifierName() : parseIdentifier();
         }
         function parseTemplateExpression() {
-            var template = createNode(206 /* TemplateExpression */);
+            var template = createNode(207 /* TemplateExpression */);
             template.head = parseTemplateHead();
             ts.Debug.assert(template.head.kind === 15 /* TemplateHead */, "Template head has wrong token kind");
             var list = [];
@@ -18435,7 +18690,7 @@ var ts;
             return finishNode(template);
         }
         function parseTemplateSpan() {
-            var span = createNode(216 /* TemplateSpan */);
+            var span = createNode(217 /* TemplateSpan */);
             span.expression = allowInAnd(parseExpression);
             var literal;
             if (token() === 19 /* CloseBraceToken */) {
@@ -18485,7 +18740,7 @@ var ts;
         }
         // TYPES
         function parseTypeReference() {
-            var node = createNode(164 /* TypeReference */);
+            var node = createNode(165 /* TypeReference */);
             node.typeName = parseEntityName(/*allowReservedWords*/ true, ts.Diagnostics.Type_expected);
             if (!scanner.hasPrecedingLineBreak() && reScanLessThanToken() === 28 /* LessThanToken */) {
                 node.typeArguments = parseBracketedList(20 /* TypeArguments */, parseType, 28 /* LessThanToken */, 30 /* GreaterThanToken */);
@@ -18495,14 +18750,14 @@ var ts;
         // If true, we should abort parsing an error function.
         function typeHasArrowFunctionBlockingParseError(node) {
             switch (node.kind) {
-                case 164 /* TypeReference */:
+                case 165 /* TypeReference */:
                     return ts.nodeIsMissing(node.typeName);
-                case 165 /* FunctionType */:
-                case 166 /* ConstructorType */: {
+                case 166 /* FunctionType */:
+                case 167 /* ConstructorType */: {
                     var _a = node, parameters = _a.parameters, type = _a.type;
                     return isMissingList(parameters) || typeHasArrowFunctionBlockingParseError(type);
                 }
-                case 177 /* ParenthesizedType */:
+                case 178 /* ParenthesizedType */:
                     return typeHasArrowFunctionBlockingParseError(node.type);
                 default:
                     return false;
@@ -18510,20 +18765,20 @@ var ts;
         }
         function parseThisTypePredicate(lhs) {
             nextToken();
-            var node = createNode(163 /* TypePredicate */, lhs.pos);
+            var node = createNode(164 /* TypePredicate */, lhs.pos);
             node.parameterName = lhs;
             node.type = parseType();
             return finishNode(node);
         }
         function parseThisTypeNode() {
-            var node = createNode(178 /* ThisType */);
+            var node = createNode(179 /* ThisType */);
             nextToken();
             return finishNode(node);
         }
         function parseJSDocAllType(postFixEquals) {
-            var result = createNode(289 /* JSDocAllType */);
+            var result = createNode(290 /* JSDocAllType */);
             if (postFixEquals) {
-                return createPostfixType(293 /* JSDocOptionalType */, result);
+                return createPostfixType(294 /* JSDocOptionalType */, result);
             }
             else {
                 nextToken();
@@ -18531,7 +18786,7 @@ var ts;
             return finishNode(result);
         }
         function parseJSDocNonNullableType() {
-            var result = createNode(292 /* JSDocNonNullableType */);
+            var result = createNode(293 /* JSDocNonNullableType */);
             nextToken();
             result.type = parseNonArrayType();
             return finishNode(result);
@@ -18553,31 +18808,31 @@ var ts;
                 token() === 19 /* CloseBraceToken */ ||
                 token() === 21 /* CloseParenToken */ ||
                 token() === 30 /* GreaterThanToken */ ||
-                token() === 59 /* EqualsToken */ ||
+                token() === 60 /* EqualsToken */ ||
                 token() === 50 /* BarToken */) {
-                var result = createNode(290 /* JSDocUnknownType */, pos);
+                var result = createNode(291 /* JSDocUnknownType */, pos);
                 return finishNode(result);
             }
             else {
-                var result = createNode(291 /* JSDocNullableType */, pos);
+                var result = createNode(292 /* JSDocNullableType */, pos);
                 result.type = parseType();
                 return finishNode(result);
             }
         }
         function parseJSDocFunctionType() {
             if (lookAhead(nextTokenIsOpenParen)) {
-                var result = createNodeWithJSDoc(294 /* JSDocFunctionType */);
+                var result = createNodeWithJSDoc(295 /* JSDocFunctionType */);
                 nextToken();
                 fillSignature(57 /* ColonToken */, 4 /* Type */ | 32 /* JSDoc */, result);
                 return finishNode(result);
             }
-            var node = createNode(164 /* TypeReference */);
+            var node = createNode(165 /* TypeReference */);
             node.typeName = parseIdentifierName();
             return finishNode(node);
         }
         function parseJSDocParameter() {
-            var parameter = createNode(151 /* Parameter */);
-            if (token() === 100 /* ThisKeyword */ || token() === 95 /* NewKeyword */) {
+            var parameter = createNode(152 /* Parameter */);
+            if (token() === 101 /* ThisKeyword */ || token() === 96 /* NewKeyword */) {
                 parameter.name = parseIdentifierName();
                 parseExpected(57 /* ColonToken */);
             }
@@ -18590,25 +18845,25 @@ var ts;
             var type = parseTypeOrTypePredicate();
             scanner.setInJSDocType(false);
             if (dotdotdot) {
-                var variadic = createNode(295 /* JSDocVariadicType */, dotdotdot.pos);
+                var variadic = createNode(296 /* JSDocVariadicType */, dotdotdot.pos);
                 variadic.type = type;
                 type = finishNode(variadic);
             }
-            if (token() === 59 /* EqualsToken */) {
-                return createPostfixType(293 /* JSDocOptionalType */, type);
+            if (token() === 60 /* EqualsToken */) {
+                return createPostfixType(294 /* JSDocOptionalType */, type);
             }
             return type;
         }
         function parseTypeQuery() {
-            var node = createNode(167 /* TypeQuery */);
-            parseExpected(104 /* TypeOfKeyword */);
+            var node = createNode(168 /* TypeQuery */);
+            parseExpected(105 /* TypeOfKeyword */);
             node.exprName = parseEntityName(/*allowReservedWords*/ true);
             return finishNode(node);
         }
         function parseTypeParameter() {
-            var node = createNode(150 /* TypeParameter */);
+            var node = createNode(151 /* TypeParameter */);
             node.name = parseIdentifier();
-            if (parseOptional(86 /* ExtendsKeyword */)) {
+            if (parseOptional(87 /* ExtendsKeyword */)) {
                 // It's not uncommon for people to write improper constraints to a generic.  If the
                 // user writes a constraint that is an expression and not an actual type, then parse
                 // it out as an expression (so we can recover well), but report that a type is needed
@@ -18627,7 +18882,7 @@ var ts;
                     node.expression = parseUnaryExpressionOrHigher();
                 }
             }
-            if (parseOptional(59 /* EqualsToken */)) {
+            if (parseOptional(60 /* EqualsToken */)) {
                 node.default = parseType();
             }
             return finishNode(node);
@@ -18651,8 +18906,8 @@ var ts;
                 isStartOfType(/*inStartOfParameter*/ !isJSDocParameter);
         }
         function parseParameter() {
-            var node = createNodeWithJSDoc(151 /* Parameter */);
-            if (token() === 100 /* ThisKeyword */) {
+            var node = createNodeWithJSDoc(152 /* Parameter */);
+            if (token() === 101 /* ThisKeyword */) {
                 node.name = createIdentifier(/*isIdentifier*/ true);
                 node.type = parseParameterType();
                 return finishNode(node);
@@ -18752,8 +19007,8 @@ var ts;
         }
         function parseSignatureMember(kind) {
             var node = createNodeWithJSDoc(kind);
-            if (kind === 161 /* ConstructSignature */) {
-                parseExpected(95 /* NewKeyword */);
+            if (kind === 162 /* ConstructSignature */) {
+                parseExpected(96 /* NewKeyword */);
             }
             fillSignature(57 /* ColonToken */, 4 /* Type */, node);
             parseTypeMemberSemicolon();
@@ -18813,7 +19068,7 @@ var ts;
             return token() === 57 /* ColonToken */ || token() === 27 /* CommaToken */ || token() === 23 /* CloseBracketToken */;
         }
         function parseIndexSignatureDeclaration(node) {
-            node.kind = 162 /* IndexSignature */;
+            node.kind = 163 /* IndexSignature */;
             node.parameters = parseBracketedList(16 /* Parameters */, parseParameter, 22 /* OpenBracketToken */, 23 /* CloseBracketToken */);
             node.type = parseTypeAnnotation();
             parseTypeMemberSemicolon();
@@ -18823,15 +19078,15 @@ var ts;
             node.name = parsePropertyName();
             node.questionToken = parseOptionalToken(56 /* QuestionToken */);
             if (token() === 20 /* OpenParenToken */ || token() === 28 /* LessThanToken */) {
-                node.kind = 155 /* MethodSignature */;
+                node.kind = 156 /* MethodSignature */;
                 // Method signatures don't exist in expression contexts.  So they have neither
                 // [Yield] nor [Await]
                 fillSignature(57 /* ColonToken */, 4 /* Type */, node);
             }
             else {
-                node.kind = 153 /* PropertySignature */;
+                node.kind = 154 /* PropertySignature */;
                 node.type = parseTypeAnnotation();
-                if (token() === 59 /* EqualsToken */) {
+                if (token() === 60 /* EqualsToken */) {
                     // Although type literal properties cannot not have initializers, we attempt
                     // to parse an initializer so we can report in the checker that an interface
                     // property or type literal property cannot have an initializer.
@@ -18875,10 +19130,10 @@ var ts;
         }
         function parseTypeMember() {
             if (token() === 20 /* OpenParenToken */ || token() === 28 /* LessThanToken */) {
-                return parseSignatureMember(160 /* CallSignature */);
+                return parseSignatureMember(161 /* CallSignature */);
             }
-            if (token() === 95 /* NewKeyword */ && lookAhead(nextTokenIsOpenParenOrLessThan)) {
-                return parseSignatureMember(161 /* ConstructSignature */);
+            if (token() === 96 /* NewKeyword */ && lookAhead(nextTokenIsOpenParenOrLessThan)) {
+                return parseSignatureMember(162 /* ConstructSignature */);
             }
             var node = createNodeWithJSDoc(0 /* Unknown */);
             node.modifiers = parseModifiers();
@@ -18904,7 +19159,7 @@ var ts;
             return false;
         }
         function parseTypeLiteral() {
-            var node = createNode(168 /* TypeLiteral */);
+            var node = createNode(169 /* TypeLiteral */);
             node.members = parseObjectTypeMembers();
             return finishNode(node);
         }
@@ -18922,27 +19177,27 @@ var ts;
         function isStartOfMappedType() {
             nextToken();
             if (token() === 38 /* PlusToken */ || token() === 39 /* MinusToken */) {
-                return nextToken() === 133 /* ReadonlyKeyword */;
+                return nextToken() === 134 /* ReadonlyKeyword */;
             }
-            if (token() === 133 /* ReadonlyKeyword */) {
+            if (token() === 134 /* ReadonlyKeyword */) {
                 nextToken();
             }
-            return token() === 22 /* OpenBracketToken */ && nextTokenIsIdentifier() && nextToken() === 93 /* InKeyword */;
+            return token() === 22 /* OpenBracketToken */ && nextTokenIsIdentifier() && nextToken() === 94 /* InKeyword */;
         }
         function parseMappedTypeParameter() {
-            var node = createNode(150 /* TypeParameter */);
+            var node = createNode(151 /* TypeParameter */);
             node.name = parseIdentifier();
-            parseExpected(93 /* InKeyword */);
+            parseExpected(94 /* InKeyword */);
             node.constraint = parseType();
             return finishNode(node);
         }
         function parseMappedType() {
-            var node = createNode(181 /* MappedType */);
+            var node = createNode(182 /* MappedType */);
             parseExpected(18 /* OpenBraceToken */);
-            if (token() === 133 /* ReadonlyKeyword */ || token() === 38 /* PlusToken */ || token() === 39 /* MinusToken */) {
+            if (token() === 134 /* ReadonlyKeyword */ || token() === 38 /* PlusToken */ || token() === 39 /* MinusToken */) {
                 node.readonlyToken = parseTokenNode();
-                if (node.readonlyToken.kind !== 133 /* ReadonlyKeyword */) {
-                    parseExpectedToken(133 /* ReadonlyKeyword */);
+                if (node.readonlyToken.kind !== 134 /* ReadonlyKeyword */) {
+                    parseExpectedToken(134 /* ReadonlyKeyword */);
                 }
             }
             parseExpected(22 /* OpenBracketToken */);
@@ -18962,23 +19217,23 @@ var ts;
         function parseTupleElementType() {
             var pos = getNodePos();
             if (parseOptional(25 /* DotDotDotToken */)) {
-                var node = createNode(172 /* RestType */, pos);
+                var node = createNode(173 /* RestType */, pos);
                 node.type = parseType();
                 return finishNode(node);
             }
             var type = parseType();
-            if (!(contextFlags & 2097152 /* JSDoc */) && type.kind === 291 /* JSDocNullableType */ && type.pos === type.type.pos) {
-                type.kind = 171 /* OptionalType */;
+            if (!(contextFlags & 2097152 /* JSDoc */) && type.kind === 292 /* JSDocNullableType */ && type.pos === type.type.pos) {
+                type.kind = 172 /* OptionalType */;
             }
             return type;
         }
         function parseTupleType() {
-            var node = createNode(170 /* TupleType */);
+            var node = createNode(171 /* TupleType */);
             node.elementTypes = parseBracketedList(21 /* TupleElementTypes */, parseTupleElementType, 22 /* OpenBracketToken */, 23 /* CloseBracketToken */);
             return finishNode(node);
         }
         function parseParenthesizedType() {
-            var node = createNode(177 /* ParenthesizedType */);
+            var node = createNode(178 /* ParenthesizedType */);
             parseExpected(20 /* OpenParenToken */);
             node.type = parseType();
             parseExpected(21 /* CloseParenToken */);
@@ -18986,7 +19241,7 @@ var ts;
         }
         function parseFunctionOrConstructorType() {
             var pos = getNodePos();
-            var kind = parseOptional(95 /* NewKeyword */) ? 166 /* ConstructorType */ : 165 /* FunctionType */;
+            var kind = parseOptional(96 /* NewKeyword */) ? 167 /* ConstructorType */ : 166 /* FunctionType */;
             var node = createNodeWithJSDoc(kind, pos);
             fillSignature(37 /* EqualsGreaterThanToken */, 4 /* Type */, node);
             return finishNode(node);
@@ -18996,14 +19251,14 @@ var ts;
             return token() === 24 /* DotToken */ ? undefined : node;
         }
         function parseLiteralTypeNode(negative) {
-            var node = createNode(182 /* LiteralType */);
+            var node = createNode(183 /* LiteralType */);
             var unaryMinusExpression;
             if (negative) {
-                unaryMinusExpression = createNode(202 /* PrefixUnaryExpression */);
+                unaryMinusExpression = createNode(203 /* PrefixUnaryExpression */);
                 unaryMinusExpression.operator = 39 /* MinusToken */;
                 nextToken();
             }
-            var expression = token() === 102 /* TrueKeyword */ || token() === 87 /* FalseKeyword */
+            var expression = token() === 103 /* TrueKeyword */ || token() === 88 /* FalseKeyword */
                 ? parseTokenNode()
                 : parseLiteralLikeNode(token());
             if (negative) {
@@ -19016,22 +19271,24 @@ var ts;
         }
         function isStartOfTypeOfImportType() {
             nextToken();
-            return token() === 92 /* ImportKeyword */;
+            return token() === 93 /* ImportKeyword */;
         }
         function parseImportType() {
             sourceFile.flags |= 524288 /* PossiblyContainsDynamicImport */;
-            var node = createNode(183 /* ImportType */);
-            if (parseOptional(104 /* TypeOfKeyword */)) {
+            var node = createNode(184 /* ImportType */);
+            if (parseOptional(105 /* TypeOfKeyword */)) {
                 node.isTypeOf = true;
             }
-            parseExpected(92 /* ImportKeyword */);
+            parseExpected(93 /* ImportKeyword */);
             parseExpected(20 /* OpenParenToken */);
             node.argument = parseType();
             parseExpected(21 /* CloseParenToken */);
             if (parseOptional(24 /* DotToken */)) {
                 node.qualifier = parseEntityName(/*allowReservedWords*/ true, ts.Diagnostics.Type_expected);
             }
-            node.typeArguments = tryParseTypeArguments();
+            if (!scanner.hasPrecedingLineBreak() && reScanLessThanToken() === 28 /* LessThanToken */) {
+                node.typeArguments = parseBracketedList(20 /* TypeArguments */, parseType, 28 /* LessThanToken */, 30 /* GreaterThanToken */);
+            }
             return finishNode(node);
         }
         function nextTokenIsNumericOrBigIntLiteral() {
@@ -19040,25 +19297,25 @@ var ts;
         }
         function parseNonArrayType() {
             switch (token()) {
-                case 120 /* AnyKeyword */:
-                case 143 /* UnknownKeyword */:
-                case 138 /* StringKeyword */:
-                case 135 /* NumberKeyword */:
-                case 146 /* BigIntKeyword */:
-                case 139 /* SymbolKeyword */:
-                case 123 /* BooleanKeyword */:
-                case 141 /* UndefinedKeyword */:
-                case 132 /* NeverKeyword */:
-                case 136 /* ObjectKeyword */:
+                case 121 /* AnyKeyword */:
+                case 144 /* UnknownKeyword */:
+                case 139 /* StringKeyword */:
+                case 136 /* NumberKeyword */:
+                case 147 /* BigIntKeyword */:
+                case 140 /* SymbolKeyword */:
+                case 124 /* BooleanKeyword */:
+                case 142 /* UndefinedKeyword */:
+                case 133 /* NeverKeyword */:
+                case 137 /* ObjectKeyword */:
                     // If these are followed by a dot, then parse these out as a dotted type reference instead.
                     return tryParse(parseKeywordAndNoDot) || parseTypeReference();
                 case 40 /* AsteriskToken */:
                     return parseJSDocAllType(/*postfixEquals*/ false);
-                case 62 /* AsteriskEqualsToken */:
+                case 63 /* AsteriskEqualsToken */:
                     return parseJSDocAllType(/*postfixEquals*/ true);
                 case 56 /* QuestionToken */:
                     return parseJSDocUnknownOrNullableType();
-                case 90 /* FunctionKeyword */:
+                case 91 /* FunctionKeyword */:
                     return parseJSDocFunctionType();
                 case 52 /* ExclamationToken */:
                     return parseJSDocNonNullableType();
@@ -19066,24 +19323,24 @@ var ts;
                 case 10 /* StringLiteral */:
                 case 8 /* NumericLiteral */:
                 case 9 /* BigIntLiteral */:
-                case 102 /* TrueKeyword */:
-                case 87 /* FalseKeyword */:
+                case 103 /* TrueKeyword */:
+                case 88 /* FalseKeyword */:
                     return parseLiteralTypeNode();
                 case 39 /* MinusToken */:
                     return lookAhead(nextTokenIsNumericOrBigIntLiteral) ? parseLiteralTypeNode(/*negative*/ true) : parseTypeReference();
-                case 106 /* VoidKeyword */:
-                case 96 /* NullKeyword */:
+                case 107 /* VoidKeyword */:
+                case 97 /* NullKeyword */:
                     return parseTokenNode();
-                case 100 /* ThisKeyword */: {
+                case 101 /* ThisKeyword */: {
                     var thisKeyword = parseThisTypeNode();
-                    if (token() === 128 /* IsKeyword */ && !scanner.hasPrecedingLineBreak()) {
+                    if (token() === 129 /* IsKeyword */ && !scanner.hasPrecedingLineBreak()) {
                         return parseThisTypePredicate(thisKeyword);
                     }
                     else {
                         return thisKeyword;
                     }
                 }
-                case 104 /* TypeOfKeyword */:
+                case 105 /* TypeOfKeyword */:
                     return lookAhead(isStartOfTypeOfImportType) ? parseImportType() : parseTypeQuery();
                 case 18 /* OpenBraceToken */:
                     return lookAhead(isStartOfMappedType) ? parseMappedType() : parseTypeLiteral();
@@ -19091,7 +19348,7 @@ var ts;
                     return parseTupleType();
                 case 20 /* OpenParenToken */:
                     return parseParenthesizedType();
-                case 92 /* ImportKeyword */:
+                case 93 /* ImportKeyword */:
                     return parseImportType();
                 default:
                     return parseTypeReference();
@@ -19099,41 +19356,41 @@ var ts;
         }
         function isStartOfType(inStartOfParameter) {
             switch (token()) {
-                case 120 /* AnyKeyword */:
-                case 143 /* UnknownKeyword */:
-                case 138 /* StringKeyword */:
-                case 135 /* NumberKeyword */:
-                case 146 /* BigIntKeyword */:
-                case 123 /* BooleanKeyword */:
-                case 133 /* ReadonlyKeyword */:
-                case 139 /* SymbolKeyword */:
-                case 142 /* UniqueKeyword */:
-                case 106 /* VoidKeyword */:
-                case 141 /* UndefinedKeyword */:
-                case 96 /* NullKeyword */:
-                case 100 /* ThisKeyword */:
-                case 104 /* TypeOfKeyword */:
-                case 132 /* NeverKeyword */:
+                case 121 /* AnyKeyword */:
+                case 144 /* UnknownKeyword */:
+                case 139 /* StringKeyword */:
+                case 136 /* NumberKeyword */:
+                case 147 /* BigIntKeyword */:
+                case 124 /* BooleanKeyword */:
+                case 134 /* ReadonlyKeyword */:
+                case 140 /* SymbolKeyword */:
+                case 143 /* UniqueKeyword */:
+                case 107 /* VoidKeyword */:
+                case 142 /* UndefinedKeyword */:
+                case 97 /* NullKeyword */:
+                case 101 /* ThisKeyword */:
+                case 105 /* TypeOfKeyword */:
+                case 133 /* NeverKeyword */:
                 case 18 /* OpenBraceToken */:
                 case 22 /* OpenBracketToken */:
                 case 28 /* LessThanToken */:
                 case 50 /* BarToken */:
                 case 49 /* AmpersandToken */:
-                case 95 /* NewKeyword */:
+                case 96 /* NewKeyword */:
                 case 10 /* StringLiteral */:
                 case 8 /* NumericLiteral */:
                 case 9 /* BigIntLiteral */:
-                case 102 /* TrueKeyword */:
-                case 87 /* FalseKeyword */:
-                case 136 /* ObjectKeyword */:
+                case 103 /* TrueKeyword */:
+                case 88 /* FalseKeyword */:
+                case 137 /* ObjectKeyword */:
                 case 40 /* AsteriskToken */:
                 case 56 /* QuestionToken */:
                 case 52 /* ExclamationToken */:
                 case 25 /* DotDotDotToken */:
-                case 127 /* InferKeyword */:
-                case 92 /* ImportKeyword */:
+                case 128 /* InferKeyword */:
+                case 93 /* ImportKeyword */:
                     return true;
-                case 90 /* FunctionKeyword */:
+                case 91 /* FunctionKeyword */:
                     return !inStartOfParameter;
                 case 39 /* MinusToken */:
                     return !inStartOfParameter && lookAhead(nextTokenIsNumericOrBigIntLiteral);
@@ -19154,26 +19411,26 @@ var ts;
             while (!scanner.hasPrecedingLineBreak()) {
                 switch (token()) {
                     case 52 /* ExclamationToken */:
-                        type = createPostfixType(292 /* JSDocNonNullableType */, type);
+                        type = createPostfixType(293 /* JSDocNonNullableType */, type);
                         break;
                     case 56 /* QuestionToken */:
                         // If not in JSDoc and next token is start of a type we have a conditional type
                         if (!(contextFlags & 2097152 /* JSDoc */) && lookAhead(nextTokenIsStartOfType)) {
                             return type;
                         }
-                        type = createPostfixType(291 /* JSDocNullableType */, type);
+                        type = createPostfixType(292 /* JSDocNullableType */, type);
                         break;
                     case 22 /* OpenBracketToken */:
                         parseExpected(22 /* OpenBracketToken */);
                         if (isStartOfType()) {
-                            var node = createNode(180 /* IndexedAccessType */, type.pos);
+                            var node = createNode(181 /* IndexedAccessType */, type.pos);
                             node.objectType = type;
                             node.indexType = parseType();
                             parseExpected(23 /* CloseBracketToken */);
                             type = finishNode(node);
                         }
                         else {
-                            var node = createNode(169 /* ArrayType */, type.pos);
+                            var node = createNode(170 /* ArrayType */, type.pos);
                             node.elementType = type;
                             parseExpected(23 /* CloseBracketToken */);
                             type = finishNode(node);
@@ -19192,16 +19449,16 @@ var ts;
             return finishNode(postfix);
         }
         function parseTypeOperator(operator) {
-            var node = createNode(179 /* TypeOperator */);
+            var node = createNode(180 /* TypeOperator */);
             parseExpected(operator);
             node.operator = operator;
             node.type = parseTypeOperatorOrHigher();
             return finishNode(node);
         }
         function parseInferType() {
-            var node = createNode(176 /* InferType */);
-            parseExpected(127 /* InferKeyword */);
-            var typeParameter = createNode(150 /* TypeParameter */);
+            var node = createNode(177 /* InferType */);
+            parseExpected(128 /* InferKeyword */);
+            var typeParameter = createNode(151 /* TypeParameter */);
             typeParameter.name = parseIdentifier();
             node.typeParameter = finishNode(typeParameter);
             return finishNode(node);
@@ -19209,34 +19466,35 @@ var ts;
         function parseTypeOperatorOrHigher() {
             var operator = token();
             switch (operator) {
-                case 129 /* KeyOfKeyword */:
-                case 142 /* UniqueKeyword */:
-                case 133 /* ReadonlyKeyword */:
+                case 130 /* KeyOfKeyword */:
+                case 143 /* UniqueKeyword */:
+                case 134 /* ReadonlyKeyword */:
                     return parseTypeOperator(operator);
-                case 127 /* InferKeyword */:
+                case 128 /* InferKeyword */:
                     return parseInferType();
             }
             return parsePostfixTypeOrHigher();
         }
         function parseUnionOrIntersectionType(kind, parseConstituentType, operator) {
-            parseOptional(operator);
+            var start = scanner.getStartPos();
+            var hasLeadingOperator = parseOptional(operator);
             var type = parseConstituentType();
-            if (token() === operator) {
+            if (token() === operator || hasLeadingOperator) {
                 var types = [type];
                 while (parseOptional(operator)) {
                     types.push(parseConstituentType());
                 }
-                var node = createNode(kind, type.pos);
-                node.types = createNodeArray(types, type.pos);
+                var node = createNode(kind, start);
+                node.types = createNodeArray(types, start);
                 type = finishNode(node);
             }
             return type;
         }
         function parseIntersectionTypeOrHigher() {
-            return parseUnionOrIntersectionType(174 /* IntersectionType */, parseTypeOperatorOrHigher, 49 /* AmpersandToken */);
+            return parseUnionOrIntersectionType(175 /* IntersectionType */, parseTypeOperatorOrHigher, 49 /* AmpersandToken */);
         }
         function parseUnionTypeOrHigher() {
-            return parseUnionOrIntersectionType(173 /* UnionType */, parseIntersectionTypeOrHigher, 50 /* BarToken */);
+            return parseUnionOrIntersectionType(174 /* UnionType */, parseIntersectionTypeOrHigher, 50 /* BarToken */);
         }
         function isStartOfFunctionType() {
             if (token() === 28 /* LessThanToken */) {
@@ -19249,7 +19507,7 @@ var ts;
                 // Skip modifiers
                 parseModifiers();
             }
-            if (isIdentifier() || token() === 100 /* ThisKeyword */) {
+            if (isIdentifier() || token() === 101 /* ThisKeyword */) {
                 nextToken();
                 return true;
             }
@@ -19272,7 +19530,7 @@ var ts;
                 // We successfully skipped modifiers (if any) and an identifier or binding pattern,
                 // now see if we have something that indicates a parameter declaration
                 if (token() === 57 /* ColonToken */ || token() === 27 /* CommaToken */ ||
-                    token() === 56 /* QuestionToken */ || token() === 59 /* EqualsToken */) {
+                    token() === 56 /* QuestionToken */ || token() === 60 /* EqualsToken */) {
                     // ( xxx :
                     // ( xxx ,
                     // ( xxx ?
@@ -19293,7 +19551,7 @@ var ts;
             var typePredicateVariable = isIdentifier() && tryParse(parseTypePredicatePrefix);
             var type = parseType();
             if (typePredicateVariable) {
-                var node = createNode(163 /* TypePredicate */, typePredicateVariable.pos);
+                var node = createNode(164 /* TypePredicate */, typePredicateVariable.pos);
                 node.parameterName = typePredicateVariable;
                 node.type = type;
                 return finishNode(node);
@@ -19304,7 +19562,7 @@ var ts;
         }
         function parseTypePredicatePrefix() {
             var id = parseIdentifier();
-            if (token() === 128 /* IsKeyword */ && !scanner.hasPrecedingLineBreak()) {
+            if (token() === 129 /* IsKeyword */ && !scanner.hasPrecedingLineBreak()) {
                 nextToken();
                 return id;
             }
@@ -19315,12 +19573,12 @@ var ts;
             return doOutsideOfContext(20480 /* TypeExcludesFlags */, parseTypeWorker);
         }
         function parseTypeWorker(noConditionalTypes) {
-            if (isStartOfFunctionType() || token() === 95 /* NewKeyword */) {
+            if (isStartOfFunctionType() || token() === 96 /* NewKeyword */) {
                 return parseFunctionOrConstructorType();
             }
             var type = parseUnionTypeOrHigher();
-            if (!noConditionalTypes && !scanner.hasPrecedingLineBreak() && parseOptional(86 /* ExtendsKeyword */)) {
-                var node = createNode(175 /* ConditionalType */, type.pos);
+            if (!noConditionalTypes && !scanner.hasPrecedingLineBreak() && parseOptional(87 /* ExtendsKeyword */)) {
+                var node = createNode(176 /* ConditionalType */, type.pos);
                 node.checkType = type;
                 // The type following 'extends' is not permitted to be another conditional type
                 node.extendsType = parseTypeWorker(/*noConditionalTypes*/ true);
@@ -19338,11 +19596,11 @@ var ts;
         // EXPRESSIONS
         function isStartOfLeftHandSideExpression() {
             switch (token()) {
-                case 100 /* ThisKeyword */:
-                case 98 /* SuperKeyword */:
-                case 96 /* NullKeyword */:
-                case 102 /* TrueKeyword */:
-                case 87 /* FalseKeyword */:
+                case 101 /* ThisKeyword */:
+                case 99 /* SuperKeyword */:
+                case 97 /* NullKeyword */:
+                case 103 /* TrueKeyword */:
+                case 88 /* FalseKeyword */:
                 case 8 /* NumericLiteral */:
                 case 9 /* BigIntLiteral */:
                 case 10 /* StringLiteral */:
@@ -19351,14 +19609,14 @@ var ts;
                 case 20 /* OpenParenToken */:
                 case 22 /* OpenBracketToken */:
                 case 18 /* OpenBraceToken */:
-                case 90 /* FunctionKeyword */:
-                case 76 /* ClassKeyword */:
-                case 95 /* NewKeyword */:
+                case 91 /* FunctionKeyword */:
+                case 77 /* ClassKeyword */:
+                case 96 /* NewKeyword */:
                 case 42 /* SlashToken */:
-                case 64 /* SlashEqualsToken */:
-                case 72 /* Identifier */:
+                case 65 /* SlashEqualsToken */:
+                case 73 /* Identifier */:
                     return true;
-                case 92 /* ImportKeyword */:
+                case 93 /* ImportKeyword */:
                     return lookAhead(nextTokenIsOpenParenOrLessThanOrDot);
                 default:
                     return isIdentifier();
@@ -19373,14 +19631,14 @@ var ts;
                 case 39 /* MinusToken */:
                 case 53 /* TildeToken */:
                 case 52 /* ExclamationToken */:
-                case 81 /* DeleteKeyword */:
-                case 104 /* TypeOfKeyword */:
-                case 106 /* VoidKeyword */:
+                case 82 /* DeleteKeyword */:
+                case 105 /* TypeOfKeyword */:
+                case 107 /* VoidKeyword */:
                 case 44 /* PlusPlusToken */:
                 case 45 /* MinusMinusToken */:
                 case 28 /* LessThanToken */:
-                case 122 /* AwaitKeyword */:
-                case 117 /* YieldKeyword */:
+                case 123 /* AwaitKeyword */:
+                case 118 /* YieldKeyword */:
                     // Yield/await always starts an expression.  Either it is an identifier (in which case
                     // it is definitely an expression).  Or it's a keyword (either because we're in
                     // a generator or async function, or in strict mode (or both)) and it started a yield or await expression.
@@ -19399,8 +19657,8 @@ var ts;
         function isStartOfExpressionStatement() {
             // As per the grammar, none of '{' or 'function' or 'class' can start an expression statement.
             return token() !== 18 /* OpenBraceToken */ &&
-                token() !== 90 /* FunctionKeyword */ &&
-                token() !== 76 /* ClassKeyword */ &&
+                token() !== 91 /* FunctionKeyword */ &&
+                token() !== 77 /* ClassKeyword */ &&
                 token() !== 58 /* AtToken */ &&
                 isStartOfExpression();
         }
@@ -19424,7 +19682,7 @@ var ts;
             return expr;
         }
         function parseInitializer() {
-            return parseOptional(59 /* EqualsToken */) ? parseAssignmentExpressionOrHigher() : undefined;
+            return parseOptional(60 /* EqualsToken */) ? parseAssignmentExpressionOrHigher() : undefined;
         }
         function parseAssignmentExpressionOrHigher() {
             //  AssignmentExpression[in,yield]:
@@ -19469,7 +19727,7 @@ var ts;
             // To avoid a look-ahead, we did not handle the case of an arrow function with a single un-parenthesized
             // parameter ('x => ...') above. We handle it here by checking if the parsed expression was a single
             // identifier and the current token is an arrow.
-            if (expr.kind === 72 /* Identifier */ && token() === 37 /* EqualsGreaterThanToken */) {
+            if (expr.kind === 73 /* Identifier */ && token() === 37 /* EqualsGreaterThanToken */) {
                 return parseSimpleArrowFunctionExpression(expr);
             }
             // Now see if we might be in cases '2' or '3'.
@@ -19485,7 +19743,7 @@ var ts;
             return parseConditionalExpressionRest(expr);
         }
         function isYieldExpression() {
-            if (token() === 117 /* YieldKeyword */) {
+            if (token() === 118 /* YieldKeyword */) {
                 // If we have a 'yield' keyword, and this is a context where yield expressions are
                 // allowed, then definitely parse out a yield expression.
                 if (inYieldContext()) {
@@ -19514,7 +19772,7 @@ var ts;
             return !scanner.hasPrecedingLineBreak() && isIdentifier();
         }
         function parseYieldExpression() {
-            var node = createNode(207 /* YieldExpression */);
+            var node = createNode(208 /* YieldExpression */);
             // YieldExpression[In] :
             //      yield
             //      yield [no LineTerminator here] [Lexical goal InputElementRegExp]AssignmentExpression[?In, Yield]
@@ -19536,13 +19794,13 @@ var ts;
             ts.Debug.assert(token() === 37 /* EqualsGreaterThanToken */, "parseSimpleArrowFunctionExpression should only have been called if we had a =>");
             var node;
             if (asyncModifier) {
-                node = createNode(197 /* ArrowFunction */, asyncModifier.pos);
+                node = createNode(198 /* ArrowFunction */, asyncModifier.pos);
                 node.modifiers = asyncModifier;
             }
             else {
-                node = createNode(197 /* ArrowFunction */, identifier.pos);
+                node = createNode(198 /* ArrowFunction */, identifier.pos);
             }
-            var parameter = createNode(151 /* Parameter */, identifier.pos);
+            var parameter = createNode(152 /* Parameter */, identifier.pos);
             parameter.name = identifier;
             finishNode(parameter);
             node.parameters = createNodeArray([parameter], parameter.pos, parameter.end);
@@ -19582,7 +19840,7 @@ var ts;
         //  Unknown     -> There *might* be a parenthesized arrow function here.
         //                 Speculatively look ahead to be sure, and rollback if not.
         function isParenthesizedArrowFunctionExpression() {
-            if (token() === 20 /* OpenParenToken */ || token() === 28 /* LessThanToken */ || token() === 121 /* AsyncKeyword */) {
+            if (token() === 20 /* OpenParenToken */ || token() === 28 /* LessThanToken */ || token() === 122 /* AsyncKeyword */) {
                 return lookAhead(isParenthesizedArrowFunctionExpressionWorker);
             }
             if (token() === 37 /* EqualsGreaterThanToken */) {
@@ -19595,7 +19853,7 @@ var ts;
             return 0 /* False */;
         }
         function isParenthesizedArrowFunctionExpressionWorker() {
-            if (token() === 121 /* AsyncKeyword */) {
+            if (token() === 122 /* AsyncKeyword */) {
                 nextToken();
                 if (scanner.hasPrecedingLineBreak()) {
                     return 0 /* False */;
@@ -19639,13 +19897,13 @@ var ts;
                 // Check for "(xxx yyy", where xxx is a modifier and yyy is an identifier. This
                 // isn't actually allowed, but we want to treat it as a lambda so we can provide
                 // a good error message.
-                if (ts.isModifierKind(second) && second !== 121 /* AsyncKeyword */ && lookAhead(nextTokenIsIdentifier)) {
+                if (ts.isModifierKind(second) && second !== 122 /* AsyncKeyword */ && lookAhead(nextTokenIsIdentifier)) {
                     return 1 /* True */;
                 }
                 // If we had "(" followed by something that's not an identifier,
                 // then this definitely doesn't look like a lambda.  "this" is not
                 // valid, but we want to parse it and then give a semantic error.
-                if (!isIdentifier() && second !== 100 /* ThisKeyword */) {
+                if (!isIdentifier() && second !== 101 /* ThisKeyword */) {
                     return 0 /* False */;
                 }
                 switch (nextToken()) {
@@ -19656,13 +19914,13 @@ var ts;
                     case 56 /* QuestionToken */:
                         nextToken();
                         // If we have "(a?:" or "(a?," or "(a?=" or "(a?)" then it is definitely a lambda.
-                        if (token() === 57 /* ColonToken */ || token() === 27 /* CommaToken */ || token() === 59 /* EqualsToken */ || token() === 21 /* CloseParenToken */) {
+                        if (token() === 57 /* ColonToken */ || token() === 27 /* CommaToken */ || token() === 60 /* EqualsToken */ || token() === 21 /* CloseParenToken */) {
                             return 1 /* True */;
                         }
                         // Otherwise it is definitely not a lambda.
                         return 0 /* False */;
                     case 27 /* CommaToken */:
-                    case 59 /* EqualsToken */:
+                    case 60 /* EqualsToken */:
                     case 21 /* CloseParenToken */:
                         // If we have "(a," or "(a=" or "(a)" this *could* be an arrow function
                         return 2 /* Unknown */;
@@ -19681,10 +19939,10 @@ var ts;
                 if (sourceFile.languageVariant === 1 /* JSX */) {
                     var isArrowFunctionInJsx = lookAhead(function () {
                         var third = nextToken();
-                        if (third === 86 /* ExtendsKeyword */) {
+                        if (third === 87 /* ExtendsKeyword */) {
                             var fourth = nextToken();
                             switch (fourth) {
-                                case 59 /* EqualsToken */:
+                                case 60 /* EqualsToken */:
                                 case 30 /* GreaterThanToken */:
                                     return false;
                                 default:
@@ -19710,7 +19968,7 @@ var ts;
         }
         function tryParseAsyncSimpleArrowFunctionExpression() {
             // We do a check here so that we won't be doing unnecessarily call to "lookAhead"
-            if (token() === 121 /* AsyncKeyword */) {
+            if (token() === 122 /* AsyncKeyword */) {
                 if (lookAhead(isUnParenthesizedAsyncArrowFunctionWorker) === 1 /* True */) {
                     var asyncModifier = parseModifiersForArrowFunction();
                     var expr = parseBinaryExpressionOrHigher(/*precedence*/ 0);
@@ -19723,7 +19981,7 @@ var ts;
             // AsyncArrowFunctionExpression:
             //      1) async[no LineTerminator here]AsyncArrowBindingIdentifier[?Yield][no LineTerminator here]=>AsyncConciseBody[?In]
             //      2) CoverCallExpressionAndAsyncArrowHead[?Yield, ?Await][no LineTerminator here]=>AsyncConciseBody[?In]
-            if (token() === 121 /* AsyncKeyword */) {
+            if (token() === 122 /* AsyncKeyword */) {
                 nextToken();
                 // If the "async" is followed by "=>" token then it is not a beginning of an async arrow-function
                 // but instead a simple arrow-function which will be parsed inside "parseAssignmentExpressionOrHigher"
@@ -19732,14 +19990,14 @@ var ts;
                 }
                 // Check for un-parenthesized AsyncArrowFunction
                 var expr = parseBinaryExpressionOrHigher(/*precedence*/ 0);
-                if (!scanner.hasPrecedingLineBreak() && expr.kind === 72 /* Identifier */ && token() === 37 /* EqualsGreaterThanToken */) {
+                if (!scanner.hasPrecedingLineBreak() && expr.kind === 73 /* Identifier */ && token() === 37 /* EqualsGreaterThanToken */) {
                     return 1 /* True */;
                 }
             }
             return 0 /* False */;
         }
         function parseParenthesizedArrowFunctionExpressionHead(allowAmbiguity) {
-            var node = createNodeWithJSDoc(197 /* ArrowFunction */);
+            var node = createNodeWithJSDoc(198 /* ArrowFunction */);
             node.modifiers = parseModifiersForArrowFunction();
             var isAsync = ts.hasModifier(node, 256 /* Async */) ? 2 /* Await */ : 0 /* None */;
             // Arrow functions are never generators.
@@ -19758,9 +20016,11 @@ var ts;
             //  - "(x = 10)" is an assignment expression parsed as a signature with a default parameter value.
             //  - "(x,y)" is a comma expression parsed as a signature with two parameters.
             //  - "a ? (b): c" will have "(b):" parsed as a signature with a return type annotation.
+            //  - "a ? (b): function() {}" will too, since function() is a valid JSDoc function type.
             //
             // So we need just a bit of lookahead to ensure that it can only be a signature.
-            if (!allowAmbiguity && token() !== 37 /* EqualsGreaterThanToken */ && token() !== 18 /* OpenBraceToken */) {
+            var hasJSDocFunctionType = node.type && ts.isJSDocFunctionType(node.type);
+            if (!allowAmbiguity && token() !== 37 /* EqualsGreaterThanToken */ && (hasJSDocFunctionType || token() !== 18 /* OpenBraceToken */)) {
                 // Returning undefined here will cause our caller to rewind to where we started from.
                 return undefined;
             }
@@ -19771,8 +20031,8 @@ var ts;
                 return parseFunctionBlock(isAsync ? 2 /* Await */ : 0 /* None */);
             }
             if (token() !== 26 /* SemicolonToken */ &&
-                token() !== 90 /* FunctionKeyword */ &&
-                token() !== 76 /* ClassKeyword */ &&
+                token() !== 91 /* FunctionKeyword */ &&
+                token() !== 77 /* ClassKeyword */ &&
                 isStartOfStatement() &&
                 !isStartOfExpressionStatement()) {
                 // Check if we got a plain statement (i.e. no expression-statements, no function/class expressions/declarations)
@@ -19803,14 +20063,14 @@ var ts;
             }
             // Note: we explicitly 'allowIn' in the whenTrue part of the condition expression, and
             // we do not that for the 'whenFalse' part.
-            var node = createNode(205 /* ConditionalExpression */, leftOperand.pos);
+            var node = createNode(206 /* ConditionalExpression */, leftOperand.pos);
             node.condition = leftOperand;
             node.questionToken = questionToken;
             node.whenTrue = doOutsideOfContext(disallowInAndDecoratorContext, parseAssignmentExpressionOrHigher);
             node.colonToken = parseExpectedToken(57 /* ColonToken */);
             node.whenFalse = ts.nodeIsPresent(node.colonToken)
                 ? parseAssignmentExpressionOrHigher()
-                : createMissingNode(72 /* Identifier */, /*reportAtCurrentPosition*/ false, ts.Diagnostics._0_expected, ts.tokenToString(57 /* ColonToken */));
+                : createMissingNode(73 /* Identifier */, /*reportAtCurrentPosition*/ false, ts.Diagnostics._0_expected, ts.tokenToString(57 /* ColonToken */));
             return finishNode(node);
         }
         function parseBinaryExpressionOrHigher(precedence) {
@@ -19818,7 +20078,7 @@ var ts;
             return parseBinaryExpressionRest(precedence, leftOperand);
         }
         function isInOrOfKeyword(t) {
-            return t === 93 /* InKeyword */ || t === 147 /* OfKeyword */;
+            return t === 94 /* InKeyword */ || t === 148 /* OfKeyword */;
         }
         function parseBinaryExpressionRest(precedence, leftOperand) {
             while (true) {
@@ -19853,10 +20113,10 @@ var ts;
                 if (!consumeCurrentOperator) {
                     break;
                 }
-                if (token() === 93 /* InKeyword */ && inDisallowInContext()) {
+                if (token() === 94 /* InKeyword */ && inDisallowInContext()) {
                     break;
                 }
-                if (token() === 119 /* AsKeyword */) {
+                if (token() === 120 /* AsKeyword */) {
                     // Make sure we *do* perform ASI for constructs like this:
                     //    var x = foo
                     //    as (Bar)
@@ -19877,51 +20137,51 @@ var ts;
             return leftOperand;
         }
         function isBinaryOperator() {
-            if (inDisallowInContext() && token() === 93 /* InKeyword */) {
+            if (inDisallowInContext() && token() === 94 /* InKeyword */) {
                 return false;
             }
             return ts.getBinaryOperatorPrecedence(token()) > 0;
         }
         function makeBinaryExpression(left, operatorToken, right) {
-            var node = createNode(204 /* BinaryExpression */, left.pos);
+            var node = createNode(205 /* BinaryExpression */, left.pos);
             node.left = left;
             node.operatorToken = operatorToken;
             node.right = right;
             return finishNode(node);
         }
         function makeAsExpression(left, right) {
-            var node = createNode(212 /* AsExpression */, left.pos);
+            var node = createNode(213 /* AsExpression */, left.pos);
             node.expression = left;
             node.type = right;
             return finishNode(node);
         }
         function parsePrefixUnaryExpression() {
-            var node = createNode(202 /* PrefixUnaryExpression */);
+            var node = createNode(203 /* PrefixUnaryExpression */);
             node.operator = token();
             nextToken();
             node.operand = parseSimpleUnaryExpression();
             return finishNode(node);
         }
         function parseDeleteExpression() {
-            var node = createNode(198 /* DeleteExpression */);
+            var node = createNode(199 /* DeleteExpression */);
             nextToken();
             node.expression = parseSimpleUnaryExpression();
             return finishNode(node);
         }
         function parseTypeOfExpression() {
-            var node = createNode(199 /* TypeOfExpression */);
+            var node = createNode(200 /* TypeOfExpression */);
             nextToken();
             node.expression = parseSimpleUnaryExpression();
             return finishNode(node);
         }
         function parseVoidExpression() {
-            var node = createNode(200 /* VoidExpression */);
+            var node = createNode(201 /* VoidExpression */);
             nextToken();
             node.expression = parseSimpleUnaryExpression();
             return finishNode(node);
         }
         function isAwaitExpression() {
-            if (token() === 122 /* AwaitKeyword */) {
+            if (token() === 123 /* AwaitKeyword */) {
                 if (inAwaitContext()) {
                     return true;
                 }
@@ -19931,7 +20191,7 @@ var ts;
             return false;
         }
         function parseAwaitExpression() {
-            var node = createNode(201 /* AwaitExpression */);
+            var node = createNode(202 /* AwaitExpression */);
             nextToken();
             node.expression = parseSimpleUnaryExpression();
             return finishNode(node);
@@ -19975,7 +20235,7 @@ var ts;
             if (token() === 41 /* AsteriskAsteriskToken */) {
                 var pos = ts.skipTrivia(sourceText, simpleUnaryExpression.pos);
                 var end = simpleUnaryExpression.end;
-                if (simpleUnaryExpression.kind === 194 /* TypeAssertionExpression */) {
+                if (simpleUnaryExpression.kind === 195 /* TypeAssertionExpression */) {
                     parseErrorAt(pos, end, ts.Diagnostics.A_type_assertion_expression_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Consider_enclosing_the_expression_in_parentheses);
                 }
                 else {
@@ -20005,18 +20265,18 @@ var ts;
                 case 53 /* TildeToken */:
                 case 52 /* ExclamationToken */:
                     return parsePrefixUnaryExpression();
-                case 81 /* DeleteKeyword */:
+                case 82 /* DeleteKeyword */:
                     return parseDeleteExpression();
-                case 104 /* TypeOfKeyword */:
+                case 105 /* TypeOfKeyword */:
                     return parseTypeOfExpression();
-                case 106 /* VoidKeyword */:
+                case 107 /* VoidKeyword */:
                     return parseVoidExpression();
                 case 28 /* LessThanToken */:
                     // This is modified UnaryExpression grammar in TypeScript
                     //  UnaryExpression (modified):
                     //      < type > UnaryExpression
                     return parseTypeAssertion();
-                case 122 /* AwaitKeyword */:
+                case 123 /* AwaitKeyword */:
                     if (isAwaitExpression()) {
                         return parseAwaitExpression();
                     }
@@ -20043,10 +20303,10 @@ var ts;
                 case 39 /* MinusToken */:
                 case 53 /* TildeToken */:
                 case 52 /* ExclamationToken */:
-                case 81 /* DeleteKeyword */:
-                case 104 /* TypeOfKeyword */:
-                case 106 /* VoidKeyword */:
-                case 122 /* AwaitKeyword */:
+                case 82 /* DeleteKeyword */:
+                case 105 /* TypeOfKeyword */:
+                case 107 /* VoidKeyword */:
+                case 123 /* AwaitKeyword */:
                     return false;
                 case 28 /* LessThanToken */:
                     // If we are not in JSX context, we are parsing TypeAssertion which is an UnaryExpression
@@ -20072,7 +20332,7 @@ var ts;
          */
         function parseUpdateExpression() {
             if (token() === 44 /* PlusPlusToken */ || token() === 45 /* MinusMinusToken */) {
-                var node = createNode(202 /* PrefixUnaryExpression */);
+                var node = createNode(203 /* PrefixUnaryExpression */);
                 node.operator = token();
                 nextToken();
                 node.operand = parseLeftHandSideExpressionOrHigher();
@@ -20085,7 +20345,7 @@ var ts;
             var expression = parseLeftHandSideExpressionOrHigher();
             ts.Debug.assert(ts.isLeftHandSideExpression(expression));
             if ((token() === 44 /* PlusPlusToken */ || token() === 45 /* MinusMinusToken */) && !scanner.hasPrecedingLineBreak()) {
-                var node = createNode(203 /* PostfixUnaryExpression */, expression.pos);
+                var node = createNode(204 /* PostfixUnaryExpression */, expression.pos);
                 node.operand = expression;
                 node.operator = token();
                 nextToken();
@@ -20126,7 +20386,7 @@ var ts;
             // 3)we have a MemberExpression which either completes the LeftHandSideExpression,
             // or starts the beginning of the first four CallExpression productions.
             var expression;
-            if (token() === 92 /* ImportKeyword */) {
+            if (token() === 93 /* ImportKeyword */) {
                 if (lookAhead(nextTokenIsOpenParenOrLessThan)) {
                     // We don't want to eagerly consume all import keyword as import call expression so we look ahead to find "("
                     // For example:
@@ -20141,8 +20401,8 @@ var ts;
                     var fullStart = scanner.getStartPos();
                     nextToken(); // advance past the 'import'
                     nextToken(); // advance past the dot
-                    var node = createNode(214 /* MetaProperty */, fullStart);
-                    node.keywordToken = 92 /* ImportKeyword */;
+                    var node = createNode(215 /* MetaProperty */, fullStart);
+                    node.keywordToken = 93 /* ImportKeyword */;
                     node.name = parseIdentifierName();
                     expression = finishNode(node);
                     sourceFile.flags |= 1048576 /* PossiblyContainsImportMeta */;
@@ -20152,7 +20412,7 @@ var ts;
                 }
             }
             else {
-                expression = token() === 98 /* SuperKeyword */ ? parseSuperExpression() : parseMemberExpressionOrHigher();
+                expression = token() === 99 /* SuperKeyword */ ? parseSuperExpression() : parseMemberExpressionOrHigher();
             }
             // Now, we *may* be complete.  However, we might have consumed the start of a
             // CallExpression.  As such, we need to consume the rest of it here to be complete.
@@ -20211,12 +20471,19 @@ var ts;
         }
         function parseSuperExpression() {
             var expression = parseTokenNode();
+            if (token() === 28 /* LessThanToken */) {
+                var startPos = getNodePos();
+                var typeArguments = tryParse(parseTypeArgumentsInExpression);
+                if (typeArguments !== undefined) {
+                    parseErrorAt(startPos, getNodePos(), ts.Diagnostics.super_may_not_use_type_arguments);
+                }
+            }
             if (token() === 20 /* OpenParenToken */ || token() === 24 /* DotToken */ || token() === 22 /* OpenBracketToken */) {
                 return expression;
             }
             // If we have seen "super" it must be followed by '(' or '.'.
             // If it wasn't then just try to parse out a '.' and report an error.
-            var node = createNode(189 /* PropertyAccessExpression */, expression.pos);
+            var node = createNode(190 /* PropertyAccessExpression */, expression.pos);
             node.expression = expression;
             parseExpectedToken(24 /* DotToken */, ts.Diagnostics.super_must_be_followed_by_an_argument_list_or_member_access);
             node.name = parseRightSideOfDot(/*allowIdentifierNames*/ true);
@@ -20225,8 +20492,8 @@ var ts;
         function parseJsxElementOrSelfClosingElementOrFragment(inExpressionContext) {
             var opening = parseJsxOpeningOrSelfClosingElementOrOpeningFragment(inExpressionContext);
             var result;
-            if (opening.kind === 262 /* JsxOpeningElement */) {
-                var node = createNode(260 /* JsxElement */, opening.pos);
+            if (opening.kind === 263 /* JsxOpeningElement */) {
+                var node = createNode(261 /* JsxElement */, opening.pos);
                 node.openingElement = opening;
                 node.children = parseJsxChildren(node.openingElement);
                 node.closingElement = parseJsxClosingElement(inExpressionContext);
@@ -20235,15 +20502,15 @@ var ts;
                 }
                 result = finishNode(node);
             }
-            else if (opening.kind === 265 /* JsxOpeningFragment */) {
-                var node = createNode(264 /* JsxFragment */, opening.pos);
+            else if (opening.kind === 266 /* JsxOpeningFragment */) {
+                var node = createNode(265 /* JsxFragment */, opening.pos);
                 node.openingFragment = opening;
                 node.children = parseJsxChildren(node.openingFragment);
                 node.closingFragment = parseJsxClosingFragment(inExpressionContext);
                 result = finishNode(node);
             }
             else {
-                ts.Debug.assert(opening.kind === 261 /* JsxSelfClosingElement */);
+                ts.Debug.assert(opening.kind === 262 /* JsxSelfClosingElement */);
                 // Nothing else to do for self-closing elements
                 result = opening;
             }
@@ -20258,11 +20525,11 @@ var ts;
                 var invalidElement = tryParse(function () { return parseJsxElementOrSelfClosingElementOrFragment(/*inExpressionContext*/ true); });
                 if (invalidElement) {
                     parseErrorAtCurrentToken(ts.Diagnostics.JSX_expressions_must_have_one_parent_element);
-                    var badNode = createNode(204 /* BinaryExpression */, result.pos);
+                    var badNode = createNode(205 /* BinaryExpression */, result.pos);
                     badNode.end = invalidElement.end;
                     badNode.left = result;
                     badNode.right = invalidElement;
-                    badNode.operatorToken = createMissingNode(27 /* CommaToken */, /*reportAtCurrentPosition*/ false, /*diagnosticMessage*/ undefined); // TODO: GH#18217
+                    badNode.operatorToken = createMissingNode(27 /* CommaToken */, /*reportAtCurrentPosition*/ false);
                     badNode.operatorToken.pos = badNode.operatorToken.end = badNode.right.pos;
                     return badNode;
                 }
@@ -20271,7 +20538,8 @@ var ts;
         }
         function parseJsxText() {
             var node = createNode(11 /* JsxText */);
-            node.containsOnlyWhiteSpaces = currentToken === 12 /* JsxTextAllWhiteSpaces */;
+            node.text = scanner.getTokenValue();
+            node.containsOnlyTriviaWhiteSpaces = currentToken === 12 /* JsxTextAllWhiteSpaces */;
             currentToken = scanner.scanJsxToken();
             return finishNode(node);
         }
@@ -20316,7 +20584,7 @@ var ts;
             return createNodeArray(list, listPos);
         }
         function parseJsxAttributes() {
-            var jsxAttributes = createNode(268 /* JsxAttributes */);
+            var jsxAttributes = createNode(269 /* JsxAttributes */);
             jsxAttributes.properties = parseList(13 /* JsxAttributes */, parseJsxAttribute);
             return finishNode(jsxAttributes);
         }
@@ -20325,7 +20593,7 @@ var ts;
             parseExpected(28 /* LessThanToken */);
             if (token() === 30 /* GreaterThanToken */) {
                 // See below for explanation of scanJsxText
-                var node_1 = createNode(265 /* JsxOpeningFragment */, fullStart);
+                var node_1 = createNode(266 /* JsxOpeningFragment */, fullStart);
                 scanJsxText();
                 return finishNode(node_1);
             }
@@ -20337,7 +20605,7 @@ var ts;
                 // Closing tag, so scan the immediately-following text with the JSX scanning instead
                 // of regular scanning to avoid treating illegal characters (e.g. '#') as immediate
                 // scanning errors
-                node = createNode(262 /* JsxOpeningElement */, fullStart);
+                node = createNode(263 /* JsxOpeningElement */, fullStart);
                 scanJsxText();
             }
             else {
@@ -20349,7 +20617,7 @@ var ts;
                     parseExpected(30 /* GreaterThanToken */, /*diagnostic*/ undefined, /*shouldAdvance*/ false);
                     scanJsxText();
                 }
-                node = createNode(261 /* JsxSelfClosingElement */, fullStart);
+                node = createNode(262 /* JsxSelfClosingElement */, fullStart);
             }
             node.tagName = tagName;
             node.typeArguments = typeArguments;
@@ -20363,10 +20631,10 @@ var ts;
             //      primaryExpression in the form of an identifier and "this" keyword
             // We can't just simply use parseLeftHandSideExpressionOrHigher because then we will start consider class,function etc as a keyword
             // We only want to consider "this" as a primaryExpression
-            var expression = token() === 100 /* ThisKeyword */ ?
+            var expression = token() === 101 /* ThisKeyword */ ?
                 parseTokenNode() : parseIdentifierName();
             while (parseOptional(24 /* DotToken */)) {
-                var propertyAccess = createNode(189 /* PropertyAccessExpression */, expression.pos);
+                var propertyAccess = createNode(190 /* PropertyAccessExpression */, expression.pos);
                 propertyAccess.expression = expression;
                 propertyAccess.name = parseRightSideOfDot(/*allowIdentifierNames*/ true);
                 expression = finishNode(propertyAccess);
@@ -20374,20 +20642,24 @@ var ts;
             return expression;
         }
         function parseJsxExpression(inExpressionContext) {
-            var node = createNode(270 /* JsxExpression */);
+            var node = createNode(271 /* JsxExpression */);
             if (!parseExpected(18 /* OpenBraceToken */)) {
                 return undefined;
             }
             if (token() !== 19 /* CloseBraceToken */) {
                 node.dotDotDotToken = parseOptionalToken(25 /* DotDotDotToken */);
-                node.expression = parseAssignmentExpressionOrHigher();
+                // Only an AssignmentExpression is valid here per the JSX spec,
+                // but we can unambiguously parse a comma sequence and provide
+                // a better error message in grammar checking.
+                node.expression = parseExpression();
             }
             if (inExpressionContext) {
                 parseExpected(19 /* CloseBraceToken */);
             }
             else {
-                parseExpected(19 /* CloseBraceToken */, /*message*/ undefined, /*shouldAdvance*/ false);
-                scanJsxText();
+                if (parseExpected(19 /* CloseBraceToken */, /*message*/ undefined, /*shouldAdvance*/ false)) {
+                    scanJsxText();
+                }
             }
             return finishNode(node);
         }
@@ -20396,9 +20668,9 @@ var ts;
                 return parseJsxSpreadAttribute();
             }
             scanJsxIdentifier();
-            var node = createNode(267 /* JsxAttribute */);
+            var node = createNode(268 /* JsxAttribute */);
             node.name = parseIdentifierName();
-            if (token() === 59 /* EqualsToken */) {
+            if (token() === 60 /* EqualsToken */) {
                 switch (scanJsxAttributeValue()) {
                     case 10 /* StringLiteral */:
                         node.initializer = parseLiteralNode();
@@ -20411,7 +20683,7 @@ var ts;
             return finishNode(node);
         }
         function parseJsxSpreadAttribute() {
-            var node = createNode(269 /* JsxSpreadAttribute */);
+            var node = createNode(270 /* JsxSpreadAttribute */);
             parseExpected(18 /* OpenBraceToken */);
             parseExpected(25 /* DotDotDotToken */);
             node.expression = parseExpression();
@@ -20419,7 +20691,7 @@ var ts;
             return finishNode(node);
         }
         function parseJsxClosingElement(inExpressionContext) {
-            var node = createNode(263 /* JsxClosingElement */);
+            var node = createNode(264 /* JsxClosingElement */);
             parseExpected(29 /* LessThanSlashToken */);
             node.tagName = parseJsxElementName();
             if (inExpressionContext) {
@@ -20432,7 +20704,7 @@ var ts;
             return finishNode(node);
         }
         function parseJsxClosingFragment(inExpressionContext) {
-            var node = createNode(266 /* JsxClosingFragment */);
+            var node = createNode(267 /* JsxClosingFragment */);
             parseExpected(29 /* LessThanSlashToken */);
             if (ts.tokenIsIdentifierOrKeyword(token())) {
                 parseErrorAtRange(parseJsxElementName(), ts.Diagnostics.Expected_corresponding_closing_tag_for_JSX_fragment);
@@ -20447,7 +20719,7 @@ var ts;
             return finishNode(node);
         }
         function parseTypeAssertion() {
-            var node = createNode(194 /* TypeAssertionExpression */);
+            var node = createNode(195 /* TypeAssertionExpression */);
             parseExpected(28 /* LessThanToken */);
             node.type = parseType();
             parseExpected(30 /* GreaterThanToken */);
@@ -20458,7 +20730,7 @@ var ts;
             while (true) {
                 var dotToken = parseOptionalToken(24 /* DotToken */);
                 if (dotToken) {
-                    var propertyAccess = createNode(189 /* PropertyAccessExpression */, expression.pos);
+                    var propertyAccess = createNode(190 /* PropertyAccessExpression */, expression.pos);
                     propertyAccess.expression = expression;
                     propertyAccess.name = parseRightSideOfDot(/*allowIdentifierNames*/ true);
                     expression = finishNode(propertyAccess);
@@ -20466,17 +20738,17 @@ var ts;
                 }
                 if (token() === 52 /* ExclamationToken */ && !scanner.hasPrecedingLineBreak()) {
                     nextToken();
-                    var nonNullExpression = createNode(213 /* NonNullExpression */, expression.pos);
+                    var nonNullExpression = createNode(214 /* NonNullExpression */, expression.pos);
                     nonNullExpression.expression = expression;
                     expression = finishNode(nonNullExpression);
                     continue;
                 }
                 // when in the [Decorator] context, we do not parse ElementAccess as it could be part of a ComputedPropertyName
                 if (!inDecoratorContext() && parseOptional(22 /* OpenBracketToken */)) {
-                    var indexedAccess = createNode(190 /* ElementAccessExpression */, expression.pos);
+                    var indexedAccess = createNode(191 /* ElementAccessExpression */, expression.pos);
                     indexedAccess.expression = expression;
                     if (token() === 23 /* CloseBracketToken */) {
-                        indexedAccess.argumentExpression = createMissingNode(72 /* Identifier */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.An_element_access_expression_should_take_an_argument);
+                        indexedAccess.argumentExpression = createMissingNode(73 /* Identifier */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.An_element_access_expression_should_take_an_argument);
                     }
                     else {
                         var argument = allowInAnd(parseExpression);
@@ -20500,7 +20772,7 @@ var ts;
             return token() === 14 /* NoSubstitutionTemplateLiteral */ || token() === 15 /* TemplateHead */;
         }
         function parseTaggedTemplateRest(tag, typeArguments) {
-            var tagExpression = createNode(193 /* TaggedTemplateExpression */, tag.pos);
+            var tagExpression = createNode(194 /* TaggedTemplateExpression */, tag.pos);
             tagExpression.tag = tag;
             tagExpression.typeArguments = typeArguments;
             tagExpression.template = token() === 14 /* NoSubstitutionTemplateLiteral */
@@ -20525,7 +20797,7 @@ var ts;
                         expression = parseTaggedTemplateRest(expression, typeArguments);
                         continue;
                     }
-                    var callExpr = createNode(191 /* CallExpression */, expression.pos);
+                    var callExpr = createNode(192 /* CallExpression */, expression.pos);
                     callExpr.expression = expression;
                     callExpr.typeArguments = typeArguments;
                     callExpr.arguments = parseArgumentList();
@@ -20533,7 +20805,7 @@ var ts;
                     continue;
                 }
                 else if (token() === 20 /* OpenParenToken */) {
-                    var callExpr = createNode(191 /* CallExpression */, expression.pos);
+                    var callExpr = createNode(192 /* CallExpression */, expression.pos);
                     callExpr.expression = expression;
                     callExpr.arguments = parseArgumentList();
                     expression = finishNode(callExpr);
@@ -20609,11 +20881,11 @@ var ts;
                 case 10 /* StringLiteral */:
                 case 14 /* NoSubstitutionTemplateLiteral */:
                     return parseLiteralNode();
-                case 100 /* ThisKeyword */:
-                case 98 /* SuperKeyword */:
-                case 96 /* NullKeyword */:
-                case 102 /* TrueKeyword */:
-                case 87 /* FalseKeyword */:
+                case 101 /* ThisKeyword */:
+                case 99 /* SuperKeyword */:
+                case 97 /* NullKeyword */:
+                case 103 /* TrueKeyword */:
+                case 88 /* FalseKeyword */:
                     return parseTokenNode();
                 case 20 /* OpenParenToken */:
                     return parseParenthesizedExpression();
@@ -20621,7 +20893,7 @@ var ts;
                     return parseArrayLiteralExpression();
                 case 18 /* OpenBraceToken */:
                     return parseObjectLiteralExpression();
-                case 121 /* AsyncKeyword */:
+                case 122 /* AsyncKeyword */:
                     // Async arrow functions are parsed earlier in parseAssignmentExpressionOrHigher.
                     // If we encounter `async [no LineTerminator here] function` then this is an async
                     // function; otherwise, its an identifier.
@@ -20629,14 +20901,14 @@ var ts;
                         break;
                     }
                     return parseFunctionExpression();
-                case 76 /* ClassKeyword */:
+                case 77 /* ClassKeyword */:
                     return parseClassExpression();
-                case 90 /* FunctionKeyword */:
+                case 91 /* FunctionKeyword */:
                     return parseFunctionExpression();
-                case 95 /* NewKeyword */:
+                case 96 /* NewKeyword */:
                     return parseNewExpressionOrNewDotTarget();
                 case 42 /* SlashToken */:
-                case 64 /* SlashEqualsToken */:
+                case 65 /* SlashEqualsToken */:
                     if (reScanSlashToken() === 13 /* RegularExpressionLiteral */) {
                         return parseLiteralNode();
                     }
@@ -20647,28 +20919,28 @@ var ts;
             return parseIdentifier(ts.Diagnostics.Expression_expected);
         }
         function parseParenthesizedExpression() {
-            var node = createNodeWithJSDoc(195 /* ParenthesizedExpression */);
+            var node = createNodeWithJSDoc(196 /* ParenthesizedExpression */);
             parseExpected(20 /* OpenParenToken */);
             node.expression = allowInAnd(parseExpression);
             parseExpected(21 /* CloseParenToken */);
             return finishNode(node);
         }
         function parseSpreadElement() {
-            var node = createNode(208 /* SpreadElement */);
+            var node = createNode(209 /* SpreadElement */);
             parseExpected(25 /* DotDotDotToken */);
             node.expression = parseAssignmentExpressionOrHigher();
             return finishNode(node);
         }
         function parseArgumentOrArrayLiteralElement() {
             return token() === 25 /* DotDotDotToken */ ? parseSpreadElement() :
-                token() === 27 /* CommaToken */ ? createNode(210 /* OmittedExpression */) :
+                token() === 27 /* CommaToken */ ? createNode(211 /* OmittedExpression */) :
                     parseAssignmentExpressionOrHigher();
         }
         function parseArgumentExpression() {
             return doOutsideOfContext(disallowInAndDecoratorContext, parseArgumentOrArrayLiteralElement);
         }
         function parseArrayLiteralExpression() {
-            var node = createNode(187 /* ArrayLiteralExpression */);
+            var node = createNode(188 /* ArrayLiteralExpression */);
             parseExpected(22 /* OpenBracketToken */);
             if (scanner.hasPrecedingLineBreak()) {
                 node.multiLine = true;
@@ -20680,17 +20952,17 @@ var ts;
         function parseObjectLiteralElement() {
             var node = createNodeWithJSDoc(0 /* Unknown */);
             if (parseOptionalToken(25 /* DotDotDotToken */)) {
-                node.kind = 277 /* SpreadAssignment */;
+                node.kind = 278 /* SpreadAssignment */;
                 node.expression = parseAssignmentExpressionOrHigher();
                 return finishNode(node);
             }
             node.decorators = parseDecorators();
             node.modifiers = parseModifiers();
-            if (parseContextualModifier(126 /* GetKeyword */)) {
-                return parseAccessorDeclaration(node, 158 /* GetAccessor */);
+            if (parseContextualModifier(127 /* GetKeyword */)) {
+                return parseAccessorDeclaration(node, 159 /* GetAccessor */);
             }
-            if (parseContextualModifier(137 /* SetKeyword */)) {
-                return parseAccessorDeclaration(node, 159 /* SetAccessor */);
+            if (parseContextualModifier(138 /* SetKeyword */)) {
+                return parseAccessorDeclaration(node, 160 /* SetAccessor */);
             }
             var asteriskToken = parseOptionalToken(40 /* AsteriskToken */);
             var tokenIsIdentifier = isIdentifier();
@@ -20708,22 +20980,22 @@ var ts;
             // this is necessary because ObjectLiteral productions are also used to cover grammar for ObjectAssignmentPattern
             var isShorthandPropertyAssignment = tokenIsIdentifier && (token() !== 57 /* ColonToken */);
             if (isShorthandPropertyAssignment) {
-                node.kind = 276 /* ShorthandPropertyAssignment */;
-                var equalsToken = parseOptionalToken(59 /* EqualsToken */);
+                node.kind = 277 /* ShorthandPropertyAssignment */;
+                var equalsToken = parseOptionalToken(60 /* EqualsToken */);
                 if (equalsToken) {
                     node.equalsToken = equalsToken;
                     node.objectAssignmentInitializer = allowInAnd(parseAssignmentExpressionOrHigher);
                 }
             }
             else {
-                node.kind = 275 /* PropertyAssignment */;
+                node.kind = 276 /* PropertyAssignment */;
                 parseExpected(57 /* ColonToken */);
                 node.initializer = allowInAnd(parseAssignmentExpressionOrHigher);
             }
             return finishNode(node);
         }
         function parseObjectLiteralExpression() {
-            var node = createNode(188 /* ObjectLiteralExpression */);
+            var node = createNode(189 /* ObjectLiteralExpression */);
             parseExpected(18 /* OpenBraceToken */);
             if (scanner.hasPrecedingLineBreak()) {
                 node.multiLine = true;
@@ -20742,9 +21014,9 @@ var ts;
             if (saveDecoratorContext) {
                 setDecoratorContext(/*val*/ false);
             }
-            var node = createNodeWithJSDoc(196 /* FunctionExpression */);
+            var node = createNodeWithJSDoc(197 /* FunctionExpression */);
             node.modifiers = parseModifiers();
-            parseExpected(90 /* FunctionKeyword */);
+            parseExpected(91 /* FunctionKeyword */);
             node.asteriskToken = parseOptionalToken(40 /* AsteriskToken */);
             var isGenerator = node.asteriskToken ? 1 /* Yield */ : 0 /* None */;
             var isAsync = ts.hasModifier(node, 256 /* Async */) ? 2 /* Await */ : 0 /* None */;
@@ -20765,10 +21037,10 @@ var ts;
         }
         function parseNewExpressionOrNewDotTarget() {
             var fullStart = scanner.getStartPos();
-            parseExpected(95 /* NewKeyword */);
+            parseExpected(96 /* NewKeyword */);
             if (parseOptional(24 /* DotToken */)) {
-                var node_2 = createNode(214 /* MetaProperty */, fullStart);
-                node_2.keywordToken = 95 /* NewKeyword */;
+                var node_2 = createNode(215 /* MetaProperty */, fullStart);
+                node_2.keywordToken = 96 /* NewKeyword */;
                 node_2.name = parseIdentifierName();
                 return finishNode(node_2);
             }
@@ -20784,7 +21056,7 @@ var ts;
                 }
                 break;
             }
-            var node = createNode(192 /* NewExpression */, fullStart);
+            var node = createNode(193 /* NewExpression */, fullStart);
             node.expression = expression;
             node.typeArguments = typeArguments;
             if (node.typeArguments || token() === 20 /* OpenParenToken */) {
@@ -20794,7 +21066,7 @@ var ts;
         }
         // STATEMENTS
         function parseBlock(ignoreMissingOpenBrace, diagnosticMessage) {
-            var node = createNode(218 /* Block */);
+            var node = createNode(219 /* Block */);
             if (parseExpected(18 /* OpenBraceToken */, diagnosticMessage) || ignoreMissingOpenBrace) {
                 if (scanner.hasPrecedingLineBreak()) {
                     node.multiLine = true;
@@ -20827,25 +21099,25 @@ var ts;
             return block;
         }
         function parseEmptyStatement() {
-            var node = createNode(220 /* EmptyStatement */);
+            var node = createNode(221 /* EmptyStatement */);
             parseExpected(26 /* SemicolonToken */);
             return finishNode(node);
         }
         function parseIfStatement() {
-            var node = createNode(222 /* IfStatement */);
-            parseExpected(91 /* IfKeyword */);
+            var node = createNode(223 /* IfStatement */);
+            parseExpected(92 /* IfKeyword */);
             parseExpected(20 /* OpenParenToken */);
             node.expression = allowInAnd(parseExpression);
             parseExpected(21 /* CloseParenToken */);
             node.thenStatement = parseStatement();
-            node.elseStatement = parseOptional(83 /* ElseKeyword */) ? parseStatement() : undefined;
+            node.elseStatement = parseOptional(84 /* ElseKeyword */) ? parseStatement() : undefined;
             return finishNode(node);
         }
         function parseDoStatement() {
-            var node = createNode(223 /* DoStatement */);
-            parseExpected(82 /* DoKeyword */);
+            var node = createNode(224 /* DoStatement */);
+            parseExpected(83 /* DoKeyword */);
             node.statement = parseStatement();
-            parseExpected(107 /* WhileKeyword */);
+            parseExpected(108 /* WhileKeyword */);
             parseExpected(20 /* OpenParenToken */);
             node.expression = allowInAnd(parseExpression);
             parseExpected(21 /* CloseParenToken */);
@@ -20857,8 +21129,8 @@ var ts;
             return finishNode(node);
         }
         function parseWhileStatement() {
-            var node = createNode(224 /* WhileStatement */);
-            parseExpected(107 /* WhileKeyword */);
+            var node = createNode(225 /* WhileStatement */);
+            parseExpected(108 /* WhileKeyword */);
             parseExpected(20 /* OpenParenToken */);
             node.expression = allowInAnd(parseExpression);
             parseExpected(21 /* CloseParenToken */);
@@ -20867,12 +21139,12 @@ var ts;
         }
         function parseForOrForInOrForOfStatement() {
             var pos = getNodePos();
-            parseExpected(89 /* ForKeyword */);
-            var awaitToken = parseOptionalToken(122 /* AwaitKeyword */);
+            parseExpected(90 /* ForKeyword */);
+            var awaitToken = parseOptionalToken(123 /* AwaitKeyword */);
             parseExpected(20 /* OpenParenToken */);
             var initializer;
             if (token() !== 26 /* SemicolonToken */) {
-                if (token() === 105 /* VarKeyword */ || token() === 111 /* LetKeyword */ || token() === 77 /* ConstKeyword */) {
+                if (token() === 106 /* VarKeyword */ || token() === 112 /* LetKeyword */ || token() === 78 /* ConstKeyword */) {
                     initializer = parseVariableDeclarationList(/*inForStatementInitializer*/ true);
                 }
                 else {
@@ -20880,23 +21152,23 @@ var ts;
                 }
             }
             var forOrForInOrForOfStatement;
-            if (awaitToken ? parseExpected(147 /* OfKeyword */) : parseOptional(147 /* OfKeyword */)) {
-                var forOfStatement = createNode(227 /* ForOfStatement */, pos);
+            if (awaitToken ? parseExpected(148 /* OfKeyword */) : parseOptional(148 /* OfKeyword */)) {
+                var forOfStatement = createNode(228 /* ForOfStatement */, pos);
                 forOfStatement.awaitModifier = awaitToken;
                 forOfStatement.initializer = initializer;
                 forOfStatement.expression = allowInAnd(parseAssignmentExpressionOrHigher);
                 parseExpected(21 /* CloseParenToken */);
                 forOrForInOrForOfStatement = forOfStatement;
             }
-            else if (parseOptional(93 /* InKeyword */)) {
-                var forInStatement = createNode(226 /* ForInStatement */, pos);
+            else if (parseOptional(94 /* InKeyword */)) {
+                var forInStatement = createNode(227 /* ForInStatement */, pos);
                 forInStatement.initializer = initializer;
                 forInStatement.expression = allowInAnd(parseExpression);
                 parseExpected(21 /* CloseParenToken */);
                 forOrForInOrForOfStatement = forInStatement;
             }
             else {
-                var forStatement = createNode(225 /* ForStatement */, pos);
+                var forStatement = createNode(226 /* ForStatement */, pos);
                 forStatement.initializer = initializer;
                 parseExpected(26 /* SemicolonToken */);
                 if (token() !== 26 /* SemicolonToken */ && token() !== 21 /* CloseParenToken */) {
@@ -20914,7 +21186,7 @@ var ts;
         }
         function parseBreakOrContinueStatement(kind) {
             var node = createNode(kind);
-            parseExpected(kind === 229 /* BreakStatement */ ? 73 /* BreakKeyword */ : 78 /* ContinueKeyword */);
+            parseExpected(kind === 230 /* BreakStatement */ ? 74 /* BreakKeyword */ : 79 /* ContinueKeyword */);
             if (!canParseSemicolon()) {
                 node.label = parseIdentifier();
             }
@@ -20922,8 +21194,8 @@ var ts;
             return finishNode(node);
         }
         function parseReturnStatement() {
-            var node = createNode(230 /* ReturnStatement */);
-            parseExpected(97 /* ReturnKeyword */);
+            var node = createNode(231 /* ReturnStatement */);
+            parseExpected(98 /* ReturnKeyword */);
             if (!canParseSemicolon()) {
                 node.expression = allowInAnd(parseExpression);
             }
@@ -20931,8 +21203,8 @@ var ts;
             return finishNode(node);
         }
         function parseWithStatement() {
-            var node = createNode(231 /* WithStatement */);
-            parseExpected(108 /* WithKeyword */);
+            var node = createNode(232 /* WithStatement */);
+            parseExpected(109 /* WithKeyword */);
             parseExpected(20 /* OpenParenToken */);
             node.expression = allowInAnd(parseExpression);
             parseExpected(21 /* CloseParenToken */);
@@ -20940,30 +21212,30 @@ var ts;
             return finishNode(node);
         }
         function parseCaseClause() {
-            var node = createNode(271 /* CaseClause */);
-            parseExpected(74 /* CaseKeyword */);
+            var node = createNode(272 /* CaseClause */);
+            parseExpected(75 /* CaseKeyword */);
             node.expression = allowInAnd(parseExpression);
             parseExpected(57 /* ColonToken */);
             node.statements = parseList(3 /* SwitchClauseStatements */, parseStatement);
             return finishNode(node);
         }
         function parseDefaultClause() {
-            var node = createNode(272 /* DefaultClause */);
-            parseExpected(80 /* DefaultKeyword */);
+            var node = createNode(273 /* DefaultClause */);
+            parseExpected(81 /* DefaultKeyword */);
             parseExpected(57 /* ColonToken */);
             node.statements = parseList(3 /* SwitchClauseStatements */, parseStatement);
             return finishNode(node);
         }
         function parseCaseOrDefaultClause() {
-            return token() === 74 /* CaseKeyword */ ? parseCaseClause() : parseDefaultClause();
+            return token() === 75 /* CaseKeyword */ ? parseCaseClause() : parseDefaultClause();
         }
         function parseSwitchStatement() {
-            var node = createNode(232 /* SwitchStatement */);
-            parseExpected(99 /* SwitchKeyword */);
+            var node = createNode(233 /* SwitchStatement */);
+            parseExpected(100 /* SwitchKeyword */);
             parseExpected(20 /* OpenParenToken */);
             node.expression = allowInAnd(parseExpression);
             parseExpected(21 /* CloseParenToken */);
-            var caseBlock = createNode(246 /* CaseBlock */);
+            var caseBlock = createNode(247 /* CaseBlock */);
             parseExpected(18 /* OpenBraceToken */);
             caseBlock.clauses = parseList(2 /* SwitchClauses */, parseCaseOrDefaultClause);
             parseExpected(19 /* CloseBraceToken */);
@@ -20978,29 +21250,29 @@ var ts;
             // directly as that might consume an expression on the following line.
             // We just return 'undefined' in that case.  The actual error will be reported in the
             // grammar walker.
-            var node = createNode(234 /* ThrowStatement */);
-            parseExpected(101 /* ThrowKeyword */);
+            var node = createNode(235 /* ThrowStatement */);
+            parseExpected(102 /* ThrowKeyword */);
             node.expression = scanner.hasPrecedingLineBreak() ? undefined : allowInAnd(parseExpression);
             parseSemicolon();
             return finishNode(node);
         }
         // TODO: Review for error recovery
         function parseTryStatement() {
-            var node = createNode(235 /* TryStatement */);
-            parseExpected(103 /* TryKeyword */);
+            var node = createNode(236 /* TryStatement */);
+            parseExpected(104 /* TryKeyword */);
             node.tryBlock = parseBlock(/*ignoreMissingOpenBrace*/ false);
-            node.catchClause = token() === 75 /* CatchKeyword */ ? parseCatchClause() : undefined;
+            node.catchClause = token() === 76 /* CatchKeyword */ ? parseCatchClause() : undefined;
             // If we don't have a catch clause, then we must have a finally clause.  Try to parse
             // one out no matter what.
-            if (!node.catchClause || token() === 88 /* FinallyKeyword */) {
-                parseExpected(88 /* FinallyKeyword */);
+            if (!node.catchClause || token() === 89 /* FinallyKeyword */) {
+                parseExpected(89 /* FinallyKeyword */);
                 node.finallyBlock = parseBlock(/*ignoreMissingOpenBrace*/ false);
             }
             return finishNode(node);
         }
         function parseCatchClause() {
-            var result = createNode(274 /* CatchClause */);
-            parseExpected(75 /* CatchKeyword */);
+            var result = createNode(275 /* CatchClause */);
+            parseExpected(76 /* CatchKeyword */);
             if (parseOptional(20 /* OpenParenToken */)) {
                 result.variableDeclaration = parseVariableDeclaration();
                 parseExpected(21 /* CloseParenToken */);
@@ -21013,8 +21285,8 @@ var ts;
             return finishNode(result);
         }
         function parseDebuggerStatement() {
-            var node = createNode(236 /* DebuggerStatement */);
-            parseExpected(79 /* DebuggerKeyword */);
+            var node = createNode(237 /* DebuggerStatement */);
+            parseExpected(80 /* DebuggerKeyword */);
             parseSemicolon();
             return finishNode(node);
         }
@@ -21024,13 +21296,13 @@ var ts;
             // a colon.
             var node = createNodeWithJSDoc(0 /* Unknown */);
             var expression = allowInAnd(parseExpression);
-            if (expression.kind === 72 /* Identifier */ && parseOptional(57 /* ColonToken */)) {
-                node.kind = 233 /* LabeledStatement */;
+            if (expression.kind === 73 /* Identifier */ && parseOptional(57 /* ColonToken */)) {
+                node.kind = 234 /* LabeledStatement */;
                 node.label = expression;
                 node.statement = parseStatement();
             }
             else {
-                node.kind = 221 /* ExpressionStatement */;
+                node.kind = 222 /* ExpressionStatement */;
                 node.expression = expression;
                 parseSemicolon();
             }
@@ -21042,11 +21314,11 @@ var ts;
         }
         function nextTokenIsClassKeywordOnSameLine() {
             nextToken();
-            return token() === 76 /* ClassKeyword */ && !scanner.hasPrecedingLineBreak();
+            return token() === 77 /* ClassKeyword */ && !scanner.hasPrecedingLineBreak();
         }
         function nextTokenIsFunctionKeywordOnSameLine() {
             nextToken();
-            return token() === 90 /* FunctionKeyword */ && !scanner.hasPrecedingLineBreak();
+            return token() === 91 /* FunctionKeyword */ && !scanner.hasPrecedingLineBreak();
         }
         function nextTokenIsIdentifierOrKeywordOrLiteralOnSameLine() {
             nextToken();
@@ -21055,12 +21327,12 @@ var ts;
         function isDeclaration() {
             while (true) {
                 switch (token()) {
-                    case 105 /* VarKeyword */:
-                    case 111 /* LetKeyword */:
-                    case 77 /* ConstKeyword */:
-                    case 90 /* FunctionKeyword */:
-                    case 76 /* ClassKeyword */:
-                    case 84 /* EnumKeyword */:
+                    case 106 /* VarKeyword */:
+                    case 112 /* LetKeyword */:
+                    case 78 /* ConstKeyword */:
+                    case 91 /* FunctionKeyword */:
+                    case 77 /* ClassKeyword */:
+                    case 85 /* EnumKeyword */:
                         return true;
                     // 'declare', 'module', 'namespace', 'interface'* and 'type' are all legal JavaScript identifiers;
                     // however, an identifier cannot be followed by another identifier on the same line. This is what we
@@ -21083,41 +21355,41 @@ var ts;
                     //   I {}
                     //
                     // could be legal, it would add complexity for very little gain.
-                    case 110 /* InterfaceKeyword */:
-                    case 140 /* TypeKeyword */:
+                    case 111 /* InterfaceKeyword */:
+                    case 141 /* TypeKeyword */:
                         return nextTokenIsIdentifierOnSameLine();
-                    case 130 /* ModuleKeyword */:
-                    case 131 /* NamespaceKeyword */:
+                    case 131 /* ModuleKeyword */:
+                    case 132 /* NamespaceKeyword */:
                         return nextTokenIsIdentifierOrStringLiteralOnSameLine();
-                    case 118 /* AbstractKeyword */:
-                    case 121 /* AsyncKeyword */:
-                    case 125 /* DeclareKeyword */:
-                    case 113 /* PrivateKeyword */:
-                    case 114 /* ProtectedKeyword */:
-                    case 115 /* PublicKeyword */:
-                    case 133 /* ReadonlyKeyword */:
+                    case 119 /* AbstractKeyword */:
+                    case 122 /* AsyncKeyword */:
+                    case 126 /* DeclareKeyword */:
+                    case 114 /* PrivateKeyword */:
+                    case 115 /* ProtectedKeyword */:
+                    case 116 /* PublicKeyword */:
+                    case 134 /* ReadonlyKeyword */:
                         nextToken();
                         // ASI takes effect for this modifier.
                         if (scanner.hasPrecedingLineBreak()) {
                             return false;
                         }
                         continue;
-                    case 145 /* GlobalKeyword */:
+                    case 146 /* GlobalKeyword */:
                         nextToken();
-                        return token() === 18 /* OpenBraceToken */ || token() === 72 /* Identifier */ || token() === 85 /* ExportKeyword */;
-                    case 92 /* ImportKeyword */:
+                        return token() === 18 /* OpenBraceToken */ || token() === 73 /* Identifier */ || token() === 86 /* ExportKeyword */;
+                    case 93 /* ImportKeyword */:
                         nextToken();
                         return token() === 10 /* StringLiteral */ || token() === 40 /* AsteriskToken */ ||
                             token() === 18 /* OpenBraceToken */ || ts.tokenIsIdentifierOrKeyword(token());
-                    case 85 /* ExportKeyword */:
+                    case 86 /* ExportKeyword */:
                         nextToken();
-                        if (token() === 59 /* EqualsToken */ || token() === 40 /* AsteriskToken */ ||
-                            token() === 18 /* OpenBraceToken */ || token() === 80 /* DefaultKeyword */ ||
-                            token() === 119 /* AsKeyword */) {
+                        if (token() === 60 /* EqualsToken */ || token() === 40 /* AsteriskToken */ ||
+                            token() === 18 /* OpenBraceToken */ || token() === 81 /* DefaultKeyword */ ||
+                            token() === 120 /* AsKeyword */) {
                             return true;
                         }
                         continue;
-                    case 116 /* StaticKeyword */:
+                    case 117 /* StaticKeyword */:
                         nextToken();
                         continue;
                     default:
@@ -21133,47 +21405,47 @@ var ts;
                 case 58 /* AtToken */:
                 case 26 /* SemicolonToken */:
                 case 18 /* OpenBraceToken */:
-                case 105 /* VarKeyword */:
-                case 111 /* LetKeyword */:
-                case 90 /* FunctionKeyword */:
-                case 76 /* ClassKeyword */:
-                case 84 /* EnumKeyword */:
-                case 91 /* IfKeyword */:
-                case 82 /* DoKeyword */:
-                case 107 /* WhileKeyword */:
-                case 89 /* ForKeyword */:
-                case 78 /* ContinueKeyword */:
-                case 73 /* BreakKeyword */:
-                case 97 /* ReturnKeyword */:
-                case 108 /* WithKeyword */:
-                case 99 /* SwitchKeyword */:
-                case 101 /* ThrowKeyword */:
-                case 103 /* TryKeyword */:
-                case 79 /* DebuggerKeyword */:
+                case 106 /* VarKeyword */:
+                case 112 /* LetKeyword */:
+                case 91 /* FunctionKeyword */:
+                case 77 /* ClassKeyword */:
+                case 85 /* EnumKeyword */:
+                case 92 /* IfKeyword */:
+                case 83 /* DoKeyword */:
+                case 108 /* WhileKeyword */:
+                case 90 /* ForKeyword */:
+                case 79 /* ContinueKeyword */:
+                case 74 /* BreakKeyword */:
+                case 98 /* ReturnKeyword */:
+                case 109 /* WithKeyword */:
+                case 100 /* SwitchKeyword */:
+                case 102 /* ThrowKeyword */:
+                case 104 /* TryKeyword */:
+                case 80 /* DebuggerKeyword */:
                 // 'catch' and 'finally' do not actually indicate that the code is part of a statement,
                 // however, we say they are here so that we may gracefully parse them and error later.
-                case 75 /* CatchKeyword */:
-                case 88 /* FinallyKeyword */:
+                case 76 /* CatchKeyword */:
+                case 89 /* FinallyKeyword */:
                     return true;
-                case 92 /* ImportKeyword */:
+                case 93 /* ImportKeyword */:
                     return isStartOfDeclaration() || lookAhead(nextTokenIsOpenParenOrLessThanOrDot);
-                case 77 /* ConstKeyword */:
-                case 85 /* ExportKeyword */:
+                case 78 /* ConstKeyword */:
+                case 86 /* ExportKeyword */:
                     return isStartOfDeclaration();
-                case 121 /* AsyncKeyword */:
-                case 125 /* DeclareKeyword */:
-                case 110 /* InterfaceKeyword */:
-                case 130 /* ModuleKeyword */:
-                case 131 /* NamespaceKeyword */:
-                case 140 /* TypeKeyword */:
-                case 145 /* GlobalKeyword */:
+                case 122 /* AsyncKeyword */:
+                case 126 /* DeclareKeyword */:
+                case 111 /* InterfaceKeyword */:
+                case 131 /* ModuleKeyword */:
+                case 132 /* NamespaceKeyword */:
+                case 141 /* TypeKeyword */:
+                case 146 /* GlobalKeyword */:
                     // When these don't start a declaration, they're an identifier in an expression statement
                     return true;
-                case 115 /* PublicKeyword */:
-                case 113 /* PrivateKeyword */:
-                case 114 /* ProtectedKeyword */:
-                case 116 /* StaticKeyword */:
-                case 133 /* ReadonlyKeyword */:
+                case 116 /* PublicKeyword */:
+                case 114 /* PrivateKeyword */:
+                case 115 /* ProtectedKeyword */:
+                case 117 /* StaticKeyword */:
+                case 134 /* ReadonlyKeyword */:
                     // When these don't start a declaration, they may be the start of a class member if an identifier
                     // immediately follows. Otherwise they're an identifier in an expression statement.
                     return isStartOfDeclaration() || !lookAhead(nextTokenIsIdentifierOrKeywordOnSameLine);
@@ -21196,63 +21468,63 @@ var ts;
                     return parseEmptyStatement();
                 case 18 /* OpenBraceToken */:
                     return parseBlock(/*ignoreMissingOpenBrace*/ false);
-                case 105 /* VarKeyword */:
-                    return parseVariableStatement(createNodeWithJSDoc(237 /* VariableDeclaration */));
-                case 111 /* LetKeyword */:
+                case 106 /* VarKeyword */:
+                    return parseVariableStatement(createNodeWithJSDoc(238 /* VariableDeclaration */));
+                case 112 /* LetKeyword */:
                     if (isLetDeclaration()) {
-                        return parseVariableStatement(createNodeWithJSDoc(237 /* VariableDeclaration */));
+                        return parseVariableStatement(createNodeWithJSDoc(238 /* VariableDeclaration */));
                     }
                     break;
-                case 90 /* FunctionKeyword */:
-                    return parseFunctionDeclaration(createNodeWithJSDoc(239 /* FunctionDeclaration */));
-                case 76 /* ClassKeyword */:
-                    return parseClassDeclaration(createNodeWithJSDoc(240 /* ClassDeclaration */));
-                case 91 /* IfKeyword */:
+                case 91 /* FunctionKeyword */:
+                    return parseFunctionDeclaration(createNodeWithJSDoc(240 /* FunctionDeclaration */));
+                case 77 /* ClassKeyword */:
+                    return parseClassDeclaration(createNodeWithJSDoc(241 /* ClassDeclaration */));
+                case 92 /* IfKeyword */:
                     return parseIfStatement();
-                case 82 /* DoKeyword */:
+                case 83 /* DoKeyword */:
                     return parseDoStatement();
-                case 107 /* WhileKeyword */:
+                case 108 /* WhileKeyword */:
                     return parseWhileStatement();
-                case 89 /* ForKeyword */:
+                case 90 /* ForKeyword */:
                     return parseForOrForInOrForOfStatement();
-                case 78 /* ContinueKeyword */:
-                    return parseBreakOrContinueStatement(228 /* ContinueStatement */);
-                case 73 /* BreakKeyword */:
-                    return parseBreakOrContinueStatement(229 /* BreakStatement */);
-                case 97 /* ReturnKeyword */:
+                case 79 /* ContinueKeyword */:
+                    return parseBreakOrContinueStatement(229 /* ContinueStatement */);
+                case 74 /* BreakKeyword */:
+                    return parseBreakOrContinueStatement(230 /* BreakStatement */);
+                case 98 /* ReturnKeyword */:
                     return parseReturnStatement();
-                case 108 /* WithKeyword */:
+                case 109 /* WithKeyword */:
                     return parseWithStatement();
-                case 99 /* SwitchKeyword */:
+                case 100 /* SwitchKeyword */:
                     return parseSwitchStatement();
-                case 101 /* ThrowKeyword */:
+                case 102 /* ThrowKeyword */:
                     return parseThrowStatement();
-                case 103 /* TryKeyword */:
+                case 104 /* TryKeyword */:
                 // Include 'catch' and 'finally' for error recovery.
-                case 75 /* CatchKeyword */:
-                case 88 /* FinallyKeyword */:
+                case 76 /* CatchKeyword */:
+                case 89 /* FinallyKeyword */:
                     return parseTryStatement();
-                case 79 /* DebuggerKeyword */:
+                case 80 /* DebuggerKeyword */:
                     return parseDebuggerStatement();
                 case 58 /* AtToken */:
                     return parseDeclaration();
-                case 121 /* AsyncKeyword */:
-                case 110 /* InterfaceKeyword */:
-                case 140 /* TypeKeyword */:
-                case 130 /* ModuleKeyword */:
-                case 131 /* NamespaceKeyword */:
-                case 125 /* DeclareKeyword */:
-                case 77 /* ConstKeyword */:
-                case 84 /* EnumKeyword */:
-                case 85 /* ExportKeyword */:
-                case 92 /* ImportKeyword */:
-                case 113 /* PrivateKeyword */:
-                case 114 /* ProtectedKeyword */:
-                case 115 /* PublicKeyword */:
-                case 118 /* AbstractKeyword */:
-                case 116 /* StaticKeyword */:
-                case 133 /* ReadonlyKeyword */:
-                case 145 /* GlobalKeyword */:
+                case 122 /* AsyncKeyword */:
+                case 111 /* InterfaceKeyword */:
+                case 141 /* TypeKeyword */:
+                case 131 /* ModuleKeyword */:
+                case 132 /* NamespaceKeyword */:
+                case 126 /* DeclareKeyword */:
+                case 78 /* ConstKeyword */:
+                case 85 /* EnumKeyword */:
+                case 86 /* ExportKeyword */:
+                case 93 /* ImportKeyword */:
+                case 114 /* PrivateKeyword */:
+                case 115 /* ProtectedKeyword */:
+                case 116 /* PublicKeyword */:
+                case 119 /* AbstractKeyword */:
+                case 117 /* StaticKeyword */:
+                case 134 /* ReadonlyKeyword */:
+                case 146 /* GlobalKeyword */:
                     if (isStartOfDeclaration()) {
                         return parseDeclaration();
                     }
@@ -21261,7 +21533,7 @@ var ts;
             return parseExpressionOrLabeledStatement();
         }
         function isDeclareModifier(modifier) {
-            return modifier.kind === 125 /* DeclareKeyword */;
+            return modifier.kind === 126 /* DeclareKeyword */;
         }
         function parseDeclaration() {
             var node = createNodeWithJSDoc(0 /* Unknown */);
@@ -21280,33 +21552,33 @@ var ts;
         }
         function parseDeclarationWorker(node) {
             switch (token()) {
-                case 105 /* VarKeyword */:
-                case 111 /* LetKeyword */:
-                case 77 /* ConstKeyword */:
+                case 106 /* VarKeyword */:
+                case 112 /* LetKeyword */:
+                case 78 /* ConstKeyword */:
                     return parseVariableStatement(node);
-                case 90 /* FunctionKeyword */:
+                case 91 /* FunctionKeyword */:
                     return parseFunctionDeclaration(node);
-                case 76 /* ClassKeyword */:
+                case 77 /* ClassKeyword */:
                     return parseClassDeclaration(node);
-                case 110 /* InterfaceKeyword */:
+                case 111 /* InterfaceKeyword */:
                     return parseInterfaceDeclaration(node);
-                case 140 /* TypeKeyword */:
+                case 141 /* TypeKeyword */:
                     return parseTypeAliasDeclaration(node);
-                case 84 /* EnumKeyword */:
+                case 85 /* EnumKeyword */:
                     return parseEnumDeclaration(node);
-                case 145 /* GlobalKeyword */:
-                case 130 /* ModuleKeyword */:
-                case 131 /* NamespaceKeyword */:
+                case 146 /* GlobalKeyword */:
+                case 131 /* ModuleKeyword */:
+                case 132 /* NamespaceKeyword */:
                     return parseModuleDeclaration(node);
-                case 92 /* ImportKeyword */:
+                case 93 /* ImportKeyword */:
                     return parseImportDeclarationOrImportEqualsDeclaration(node);
-                case 85 /* ExportKeyword */:
+                case 86 /* ExportKeyword */:
                     nextToken();
                     switch (token()) {
-                        case 80 /* DefaultKeyword */:
-                        case 59 /* EqualsToken */:
+                        case 81 /* DefaultKeyword */:
+                        case 60 /* EqualsToken */:
                             return parseExportAssignment(node);
-                        case 119 /* AsKeyword */:
+                        case 120 /* AsKeyword */:
                             return parseNamespaceExportDeclaration(node);
                         default:
                             return parseExportDeclaration(node);
@@ -21315,7 +21587,7 @@ var ts;
                     if (node.decorators || node.modifiers) {
                         // We reached this point because we encountered decorators and/or modifiers and assumed a declaration
                         // would follow. For recovery and error reporting purposes, return an incomplete declaration.
-                        var missing = createMissingNode(258 /* MissingDeclaration */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Declaration_expected);
+                        var missing = createMissingNode(259 /* MissingDeclaration */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Declaration_expected);
                         missing.pos = node.pos;
                         missing.decorators = node.decorators;
                         missing.modifiers = node.modifiers;
@@ -21338,16 +21610,16 @@ var ts;
         // DECLARATIONS
         function parseArrayBindingElement() {
             if (token() === 27 /* CommaToken */) {
-                return createNode(210 /* OmittedExpression */);
+                return createNode(211 /* OmittedExpression */);
             }
-            var node = createNode(186 /* BindingElement */);
+            var node = createNode(187 /* BindingElement */);
             node.dotDotDotToken = parseOptionalToken(25 /* DotDotDotToken */);
             node.name = parseIdentifierOrPattern();
             node.initializer = parseInitializer();
             return finishNode(node);
         }
         function parseObjectBindingElement() {
-            var node = createNode(186 /* BindingElement */);
+            var node = createNode(187 /* BindingElement */);
             node.dotDotDotToken = parseOptionalToken(25 /* DotDotDotToken */);
             var tokenIsIdentifier = isIdentifier();
             var propertyName = parsePropertyName();
@@ -21363,14 +21635,14 @@ var ts;
             return finishNode(node);
         }
         function parseObjectBindingPattern() {
-            var node = createNode(184 /* ObjectBindingPattern */);
+            var node = createNode(185 /* ObjectBindingPattern */);
             parseExpected(18 /* OpenBraceToken */);
             node.elements = parseDelimitedList(9 /* ObjectBindingElements */, parseObjectBindingElement);
             parseExpected(19 /* CloseBraceToken */);
             return finishNode(node);
         }
         function parseArrayBindingPattern() {
-            var node = createNode(185 /* ArrayBindingPattern */);
+            var node = createNode(186 /* ArrayBindingPattern */);
             parseExpected(22 /* OpenBracketToken */);
             node.elements = parseDelimitedList(10 /* ArrayBindingElements */, parseArrayBindingElement);
             parseExpected(23 /* CloseBracketToken */);
@@ -21392,9 +21664,9 @@ var ts;
             return parseVariableDeclaration(/*allowExclamation*/ true);
         }
         function parseVariableDeclaration(allowExclamation) {
-            var node = createNode(237 /* VariableDeclaration */);
+            var node = createNode(238 /* VariableDeclaration */);
             node.name = parseIdentifierOrPattern();
-            if (allowExclamation && node.name.kind === 72 /* Identifier */ &&
+            if (allowExclamation && node.name.kind === 73 /* Identifier */ &&
                 token() === 52 /* ExclamationToken */ && !scanner.hasPrecedingLineBreak()) {
                 node.exclamationToken = parseTokenNode();
             }
@@ -21405,14 +21677,14 @@ var ts;
             return finishNode(node);
         }
         function parseVariableDeclarationList(inForStatementInitializer) {
-            var node = createNode(238 /* VariableDeclarationList */);
+            var node = createNode(239 /* VariableDeclarationList */);
             switch (token()) {
-                case 105 /* VarKeyword */:
+                case 106 /* VarKeyword */:
                     break;
-                case 111 /* LetKeyword */:
+                case 112 /* LetKeyword */:
                     node.flags |= 1 /* Let */;
                     break;
-                case 77 /* ConstKeyword */:
+                case 78 /* ConstKeyword */:
                     node.flags |= 2 /* Const */;
                     break;
                 default:
@@ -21428,7 +21700,7 @@ var ts;
             // So we need to look ahead to determine if 'of' should be treated as a keyword in
             // this context.
             // The checker will then give an error that there is an empty declaration list.
-            if (token() === 147 /* OfKeyword */ && lookAhead(canFollowContextualOfKeyword)) {
+            if (token() === 148 /* OfKeyword */ && lookAhead(canFollowContextualOfKeyword)) {
                 node.declarations = createMissingList();
             }
             else {
@@ -21443,14 +21715,14 @@ var ts;
             return nextTokenIsIdentifier() && nextToken() === 21 /* CloseParenToken */;
         }
         function parseVariableStatement(node) {
-            node.kind = 219 /* VariableStatement */;
+            node.kind = 220 /* VariableStatement */;
             node.declarationList = parseVariableDeclarationList(/*inForStatementInitializer*/ false);
             parseSemicolon();
             return finishNode(node);
         }
         function parseFunctionDeclaration(node) {
-            node.kind = 239 /* FunctionDeclaration */;
-            parseExpected(90 /* FunctionKeyword */);
+            node.kind = 240 /* FunctionDeclaration */;
+            parseExpected(91 /* FunctionKeyword */);
             node.asteriskToken = parseOptionalToken(40 /* AsteriskToken */);
             node.name = ts.hasModifier(node, 512 /* Default */) ? parseOptionalIdentifier() : parseIdentifier();
             var isGenerator = node.asteriskToken ? 1 /* Yield */ : 0 /* None */;
@@ -21459,15 +21731,29 @@ var ts;
             node.body = parseFunctionBlockOrSemicolon(isGenerator | isAsync, ts.Diagnostics.or_expected);
             return finishNode(node);
         }
-        function parseConstructorDeclaration(node) {
-            node.kind = 157 /* Constructor */;
-            parseExpected(124 /* ConstructorKeyword */);
-            fillSignature(57 /* ColonToken */, 0 /* None */, node);
-            node.body = parseFunctionBlockOrSemicolon(0 /* None */, ts.Diagnostics.or_expected);
-            return finishNode(node);
+        function parseConstructorName() {
+            if (token() === 125 /* ConstructorKeyword */) {
+                return parseExpected(125 /* ConstructorKeyword */);
+            }
+            if (token() === 10 /* StringLiteral */ && lookAhead(nextToken) === 20 /* OpenParenToken */) {
+                return tryParse(function () {
+                    var literalNode = parseLiteralNode();
+                    return literalNode.text === "constructor" ? literalNode : undefined;
+                });
+            }
+        }
+        function tryParseConstructorDeclaration(node) {
+            return tryParse(function () {
+                if (parseConstructorName()) {
+                    node.kind = 158 /* Constructor */;
+                    fillSignature(57 /* ColonToken */, 0 /* None */, node);
+                    node.body = parseFunctionBlockOrSemicolon(0 /* None */, ts.Diagnostics.or_expected);
+                    return finishNode(node);
+                }
+            });
         }
         function parseMethodDeclaration(node, asteriskToken, diagnosticMessage) {
-            node.kind = 156 /* MethodDeclaration */;
+            node.kind = 157 /* MethodDeclaration */;
             node.asteriskToken = asteriskToken;
             var isGenerator = asteriskToken ? 1 /* Yield */ : 0 /* None */;
             var isAsync = ts.hasModifier(node, 256 /* Async */) ? 2 /* Await */ : 0 /* None */;
@@ -21476,7 +21762,7 @@ var ts;
             return finishNode(node);
         }
         function parsePropertyDeclaration(node) {
-            node.kind = 154 /* PropertyDeclaration */;
+            node.kind = 155 /* PropertyDeclaration */;
             if (!node.questionToken && token() === 52 /* ExclamationToken */ && !scanner.hasPrecedingLineBreak()) {
                 node.exclamationToken = parseTokenNode();
             }
@@ -21549,7 +21835,7 @@ var ts;
             // If we were able to get any potential identifier...
             if (idToken !== undefined) {
                 // If we have a non-keyword identifier, or if we have an accessor, then it's safe to parse.
-                if (!ts.isKeyword(idToken) || idToken === 137 /* SetKeyword */ || idToken === 126 /* GetKeyword */) {
+                if (!ts.isKeyword(idToken) || idToken === 138 /* SetKeyword */ || idToken === 127 /* GetKeyword */) {
                     return true;
                 }
                 // If it *is* a keyword, but not an accessor, check a little farther along
@@ -21559,7 +21845,7 @@ var ts;
                     case 28 /* LessThanToken */: // Generic Method declaration
                     case 52 /* ExclamationToken */: // Non-null assertion on property name
                     case 57 /* ColonToken */: // Type Annotation for declaration
-                    case 59 /* EqualsToken */: // Initializer for declaration
+                    case 60 /* EqualsToken */: // Initializer for declaration
                     case 56 /* QuestionToken */: // Not valid, but permitted so that it gets caught later on.
                         return true;
                     default:
@@ -21581,7 +21867,7 @@ var ts;
                 if (!parseOptional(58 /* AtToken */)) {
                     break;
                 }
-                var decorator = createNode(152 /* Decorator */, decoratorStart);
+                var decorator = createNode(153 /* Decorator */, decoratorStart);
                 decorator.expression = doInDecoratorContext(parseLeftHandSideExpressionOrHigher);
                 finishNode(decorator);
                 (list || (list = [])).push(decorator);
@@ -21601,7 +21887,7 @@ var ts;
             while (true) {
                 var modifierStart = scanner.getStartPos();
                 var modifierKind = token();
-                if (token() === 77 /* ConstKeyword */ && permitInvalidConstAsModifier) {
+                if (token() === 78 /* ConstKeyword */ && permitInvalidConstAsModifier) {
                     // We need to ensure that any subsequent modifiers appear on the same line
                     // so that when 'const' is a standalone declaration, we don't issue an error.
                     if (!tryParse(nextTokenIsOnSameLineAndCanFollowModifier)) {
@@ -21620,7 +21906,7 @@ var ts;
         }
         function parseModifiersForArrowFunction() {
             var modifiers;
-            if (token() === 121 /* AsyncKeyword */) {
+            if (token() === 122 /* AsyncKeyword */) {
                 var modifierStart = scanner.getStartPos();
                 var modifierKind = token();
                 nextToken();
@@ -21631,21 +21917,24 @@ var ts;
         }
         function parseClassElement() {
             if (token() === 26 /* SemicolonToken */) {
-                var result = createNode(217 /* SemicolonClassElement */);
+                var result = createNode(218 /* SemicolonClassElement */);
                 nextToken();
                 return finishNode(result);
             }
             var node = createNodeWithJSDoc(0 /* Unknown */);
             node.decorators = parseDecorators();
             node.modifiers = parseModifiers(/*permitInvalidConstAsModifier*/ true);
-            if (parseContextualModifier(126 /* GetKeyword */)) {
-                return parseAccessorDeclaration(node, 158 /* GetAccessor */);
+            if (parseContextualModifier(127 /* GetKeyword */)) {
+                return parseAccessorDeclaration(node, 159 /* GetAccessor */);
             }
-            if (parseContextualModifier(137 /* SetKeyword */)) {
-                return parseAccessorDeclaration(node, 159 /* SetAccessor */);
+            if (parseContextualModifier(138 /* SetKeyword */)) {
+                return parseAccessorDeclaration(node, 160 /* SetAccessor */);
             }
-            if (token() === 124 /* ConstructorKeyword */) {
-                return parseConstructorDeclaration(node);
+            if (token() === 125 /* ConstructorKeyword */ || token() === 10 /* StringLiteral */) {
+                var constructorDeclaration = tryParseConstructorDeclaration(node);
+                if (constructorDeclaration) {
+                    return constructorDeclaration;
+                }
             }
             if (isIndexSignature()) {
                 return parseIndexSignatureDeclaration(node);
@@ -21661,21 +21950,21 @@ var ts;
             }
             if (node.decorators || node.modifiers) {
                 // treat this as a property declaration with a missing name.
-                node.name = createMissingNode(72 /* Identifier */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Declaration_expected);
+                node.name = createMissingNode(73 /* Identifier */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Declaration_expected);
                 return parsePropertyDeclaration(node);
             }
             // 'isClassMemberStart' should have hinted not to attempt parsing.
             return ts.Debug.fail("Should not have attempted to parse class member declaration.");
         }
         function parseClassExpression() {
-            return parseClassDeclarationOrExpression(createNodeWithJSDoc(0 /* Unknown */), 209 /* ClassExpression */);
+            return parseClassDeclarationOrExpression(createNodeWithJSDoc(0 /* Unknown */), 210 /* ClassExpression */);
         }
         function parseClassDeclaration(node) {
-            return parseClassDeclarationOrExpression(node, 240 /* ClassDeclaration */);
+            return parseClassDeclarationOrExpression(node, 241 /* ClassDeclaration */);
         }
         function parseClassDeclarationOrExpression(node, kind) {
             node.kind = kind;
-            parseExpected(76 /* ClassKeyword */);
+            parseExpected(77 /* ClassKeyword */);
             node.name = parseNameOfClassDeclarationOrExpression();
             node.typeParameters = parseTypeParameters();
             node.heritageClauses = parseHeritageClauses();
@@ -21701,7 +21990,7 @@ var ts;
                 : undefined;
         }
         function isImplementsClause() {
-            return token() === 109 /* ImplementsKeyword */ && lookAhead(nextTokenIsIdentifierOrKeyword);
+            return token() === 110 /* ImplementsKeyword */ && lookAhead(nextTokenIsIdentifierOrKeyword);
         }
         function parseHeritageClauses() {
             // ClassTail[Yield,Await] : (Modified) See 14.5
@@ -21713,15 +22002,15 @@ var ts;
         }
         function parseHeritageClause() {
             var tok = token();
-            ts.Debug.assert(tok === 86 /* ExtendsKeyword */ || tok === 109 /* ImplementsKeyword */); // isListElement() should ensure this.
-            var node = createNode(273 /* HeritageClause */);
+            ts.Debug.assert(tok === 87 /* ExtendsKeyword */ || tok === 110 /* ImplementsKeyword */); // isListElement() should ensure this.
+            var node = createNode(274 /* HeritageClause */);
             node.token = tok;
             nextToken();
             node.types = parseDelimitedList(7 /* HeritageClauseElement */, parseExpressionWithTypeArguments);
             return finishNode(node);
         }
         function parseExpressionWithTypeArguments() {
-            var node = createNode(211 /* ExpressionWithTypeArguments */);
+            var node = createNode(212 /* ExpressionWithTypeArguments */);
             node.expression = parseLeftHandSideExpressionOrHigher();
             node.typeArguments = tryParseTypeArguments();
             return finishNode(node);
@@ -21732,14 +22021,14 @@ var ts;
                 : undefined;
         }
         function isHeritageClause() {
-            return token() === 86 /* ExtendsKeyword */ || token() === 109 /* ImplementsKeyword */;
+            return token() === 87 /* ExtendsKeyword */ || token() === 110 /* ImplementsKeyword */;
         }
         function parseClassMembers() {
             return parseList(5 /* ClassMembers */, parseClassElement);
         }
         function parseInterfaceDeclaration(node) {
-            node.kind = 241 /* InterfaceDeclaration */;
-            parseExpected(110 /* InterfaceKeyword */);
+            node.kind = 242 /* InterfaceDeclaration */;
+            parseExpected(111 /* InterfaceKeyword */);
             node.name = parseIdentifier();
             node.typeParameters = parseTypeParameters();
             node.heritageClauses = parseHeritageClauses();
@@ -21747,11 +22036,11 @@ var ts;
             return finishNode(node);
         }
         function parseTypeAliasDeclaration(node) {
-            node.kind = 242 /* TypeAliasDeclaration */;
-            parseExpected(140 /* TypeKeyword */);
+            node.kind = 243 /* TypeAliasDeclaration */;
+            parseExpected(141 /* TypeKeyword */);
             node.name = parseIdentifier();
             node.typeParameters = parseTypeParameters();
-            parseExpected(59 /* EqualsToken */);
+            parseExpected(60 /* EqualsToken */);
             node.type = parseType();
             parseSemicolon();
             return finishNode(node);
@@ -21761,14 +22050,14 @@ var ts;
         // ConstantEnumMemberSection, which starts at the beginning of an enum declaration
         // or any time an integer literal initializer is encountered.
         function parseEnumMember() {
-            var node = createNodeWithJSDoc(278 /* EnumMember */);
+            var node = createNodeWithJSDoc(279 /* EnumMember */);
             node.name = parsePropertyName();
             node.initializer = allowInAnd(parseInitializer);
             return finishNode(node);
         }
         function parseEnumDeclaration(node) {
-            node.kind = 243 /* EnumDeclaration */;
-            parseExpected(84 /* EnumKeyword */);
+            node.kind = 244 /* EnumDeclaration */;
+            parseExpected(85 /* EnumKeyword */);
             node.name = parseIdentifier();
             if (parseExpected(18 /* OpenBraceToken */)) {
                 node.members = parseDelimitedList(6 /* EnumMembers */, parseEnumMember);
@@ -21780,7 +22069,7 @@ var ts;
             return finishNode(node);
         }
         function parseModuleBlock() {
-            var node = createNode(245 /* ModuleBlock */);
+            var node = createNode(246 /* ModuleBlock */);
             if (parseExpected(18 /* OpenBraceToken */)) {
                 node.statements = parseList(1 /* BlockStatements */, parseStatement);
                 parseExpected(19 /* CloseBraceToken */);
@@ -21791,7 +22080,7 @@ var ts;
             return finishNode(node);
         }
         function parseModuleOrNamespaceDeclaration(node, flags) {
-            node.kind = 244 /* ModuleDeclaration */;
+            node.kind = 245 /* ModuleDeclaration */;
             // If we are parsing a dotted namespace name, we want to
             // propagate the 'Namespace' flag across the names if set.
             var namespaceFlag = flags & 16 /* Namespace */;
@@ -21803,8 +22092,8 @@ var ts;
             return finishNode(node);
         }
         function parseAmbientExternalModuleDeclaration(node) {
-            node.kind = 244 /* ModuleDeclaration */;
-            if (token() === 145 /* GlobalKeyword */) {
+            node.kind = 245 /* ModuleDeclaration */;
+            if (token() === 146 /* GlobalKeyword */) {
                 // parse 'global' as name of global scope augmentation
                 node.name = parseIdentifier();
                 node.flags |= 512 /* GlobalAugmentation */;
@@ -21823,15 +22112,15 @@ var ts;
         }
         function parseModuleDeclaration(node) {
             var flags = 0;
-            if (token() === 145 /* GlobalKeyword */) {
+            if (token() === 146 /* GlobalKeyword */) {
                 // global augmentation
                 return parseAmbientExternalModuleDeclaration(node);
             }
-            else if (parseOptional(131 /* NamespaceKeyword */)) {
+            else if (parseOptional(132 /* NamespaceKeyword */)) {
                 flags |= 16 /* Namespace */;
             }
             else {
-                parseExpected(130 /* ModuleKeyword */);
+                parseExpected(131 /* ModuleKeyword */);
                 if (token() === 10 /* StringLiteral */) {
                     return parseAmbientExternalModuleDeclaration(node);
                 }
@@ -21839,7 +22128,7 @@ var ts;
             return parseModuleOrNamespaceDeclaration(node, flags);
         }
         function isExternalModuleReference() {
-            return token() === 134 /* RequireKeyword */ &&
+            return token() === 135 /* RequireKeyword */ &&
                 lookAhead(nextTokenIsOpenParen);
         }
         function nextTokenIsOpenParen() {
@@ -21849,25 +22138,25 @@ var ts;
             return nextToken() === 42 /* SlashToken */;
         }
         function parseNamespaceExportDeclaration(node) {
-            node.kind = 247 /* NamespaceExportDeclaration */;
-            parseExpected(119 /* AsKeyword */);
-            parseExpected(131 /* NamespaceKeyword */);
+            node.kind = 248 /* NamespaceExportDeclaration */;
+            parseExpected(120 /* AsKeyword */);
+            parseExpected(132 /* NamespaceKeyword */);
             node.name = parseIdentifier();
             parseSemicolon();
             return finishNode(node);
         }
         function parseImportDeclarationOrImportEqualsDeclaration(node) {
-            parseExpected(92 /* ImportKeyword */);
+            parseExpected(93 /* ImportKeyword */);
             var afterImportPos = scanner.getStartPos();
             var identifier;
             if (isIdentifier()) {
                 identifier = parseIdentifier();
-                if (token() !== 27 /* CommaToken */ && token() !== 144 /* FromKeyword */) {
+                if (token() !== 27 /* CommaToken */ && token() !== 145 /* FromKeyword */) {
                     return parseImportEqualsDeclaration(node, identifier);
                 }
             }
             // Import statement
-            node.kind = 249 /* ImportDeclaration */;
+            node.kind = 250 /* ImportDeclaration */;
             // ImportDeclaration:
             //  import ImportClause from ModuleSpecifier ;
             //  import ModuleSpecifier;
@@ -21875,16 +22164,16 @@ var ts;
                 token() === 40 /* AsteriskToken */ || // import *
                 token() === 18 /* OpenBraceToken */) { // import {
                 node.importClause = parseImportClause(identifier, afterImportPos);
-                parseExpected(144 /* FromKeyword */);
+                parseExpected(145 /* FromKeyword */);
             }
             node.moduleSpecifier = parseModuleSpecifier();
             parseSemicolon();
             return finishNode(node);
         }
         function parseImportEqualsDeclaration(node, identifier) {
-            node.kind = 248 /* ImportEqualsDeclaration */;
+            node.kind = 249 /* ImportEqualsDeclaration */;
             node.name = identifier;
-            parseExpected(59 /* EqualsToken */);
+            parseExpected(60 /* EqualsToken */);
             node.moduleReference = parseModuleReference();
             parseSemicolon();
             return finishNode(node);
@@ -21896,7 +22185,7 @@ var ts;
             //  NamedImports
             //  ImportedDefaultBinding, NameSpaceImport
             //  ImportedDefaultBinding, NamedImports
-            var importClause = createNode(250 /* ImportClause */, fullStart);
+            var importClause = createNode(251 /* ImportClause */, fullStart);
             if (identifier) {
                 // ImportedDefaultBinding:
                 //  ImportedBinding
@@ -21906,7 +22195,7 @@ var ts;
             // parse namespace or named imports
             if (!importClause.name ||
                 parseOptional(27 /* CommaToken */)) {
-                importClause.namedBindings = token() === 40 /* AsteriskToken */ ? parseNamespaceImport() : parseNamedImportsOrExports(252 /* NamedImports */);
+                importClause.namedBindings = token() === 40 /* AsteriskToken */ ? parseNamespaceImport() : parseNamedImportsOrExports(253 /* NamedImports */);
             }
             return finishNode(importClause);
         }
@@ -21916,8 +22205,8 @@ var ts;
                 : parseEntityName(/*allowReservedWords*/ false);
         }
         function parseExternalModuleReference() {
-            var node = createNode(259 /* ExternalModuleReference */);
-            parseExpected(134 /* RequireKeyword */);
+            var node = createNode(260 /* ExternalModuleReference */);
+            parseExpected(135 /* RequireKeyword */);
             parseExpected(20 /* OpenParenToken */);
             node.expression = parseModuleSpecifier();
             parseExpected(21 /* CloseParenToken */);
@@ -21939,9 +22228,9 @@ var ts;
         function parseNamespaceImport() {
             // NameSpaceImport:
             //  * as ImportedBinding
-            var namespaceImport = createNode(251 /* NamespaceImport */);
+            var namespaceImport = createNode(252 /* NamespaceImport */);
             parseExpected(40 /* AsteriskToken */);
-            parseExpected(119 /* AsKeyword */);
+            parseExpected(120 /* AsKeyword */);
             namespaceImport.name = parseIdentifier();
             return finishNode(namespaceImport);
         }
@@ -21954,14 +22243,14 @@ var ts;
             // ImportsList:
             //  ImportSpecifier
             //  ImportsList, ImportSpecifier
-            node.elements = parseBracketedList(23 /* ImportOrExportSpecifiers */, kind === 252 /* NamedImports */ ? parseImportSpecifier : parseExportSpecifier, 18 /* OpenBraceToken */, 19 /* CloseBraceToken */);
+            node.elements = parseBracketedList(23 /* ImportOrExportSpecifiers */, kind === 253 /* NamedImports */ ? parseImportSpecifier : parseExportSpecifier, 18 /* OpenBraceToken */, 19 /* CloseBraceToken */);
             return finishNode(node);
         }
         function parseExportSpecifier() {
-            return parseImportOrExportSpecifier(257 /* ExportSpecifier */);
+            return parseImportOrExportSpecifier(258 /* ExportSpecifier */);
         }
         function parseImportSpecifier() {
-            return parseImportOrExportSpecifier(253 /* ImportSpecifier */);
+            return parseImportOrExportSpecifier(254 /* ImportSpecifier */);
         }
         function parseImportOrExportSpecifier(kind) {
             var node = createNode(kind);
@@ -21975,9 +22264,9 @@ var ts;
             var checkIdentifierStart = scanner.getTokenPos();
             var checkIdentifierEnd = scanner.getTextPos();
             var identifierName = parseIdentifierName();
-            if (token() === 119 /* AsKeyword */) {
+            if (token() === 120 /* AsKeyword */) {
                 node.propertyName = identifierName;
-                parseExpected(119 /* AsKeyword */);
+                parseExpected(120 /* AsKeyword */);
                 checkIdentifierIsKeyword = ts.isKeyword(token()) && !isIdentifier();
                 checkIdentifierStart = scanner.getTokenPos();
                 checkIdentifierEnd = scanner.getTextPos();
@@ -21986,24 +22275,24 @@ var ts;
             else {
                 node.name = identifierName;
             }
-            if (kind === 253 /* ImportSpecifier */ && checkIdentifierIsKeyword) {
+            if (kind === 254 /* ImportSpecifier */ && checkIdentifierIsKeyword) {
                 parseErrorAt(checkIdentifierStart, checkIdentifierEnd, ts.Diagnostics.Identifier_expected);
             }
             return finishNode(node);
         }
         function parseExportDeclaration(node) {
-            node.kind = 255 /* ExportDeclaration */;
+            node.kind = 256 /* ExportDeclaration */;
             if (parseOptional(40 /* AsteriskToken */)) {
-                parseExpected(144 /* FromKeyword */);
+                parseExpected(145 /* FromKeyword */);
                 node.moduleSpecifier = parseModuleSpecifier();
             }
             else {
-                node.exportClause = parseNamedImportsOrExports(256 /* NamedExports */);
+                node.exportClause = parseNamedImportsOrExports(257 /* NamedExports */);
                 // It is not uncommon to accidentally omit the 'from' keyword. Additionally, in editing scenarios,
                 // the 'from' keyword can be parsed as a named export when the export clause is unterminated (i.e. `export { from "moduleName";`)
                 // If we don't have a 'from' keyword, see if we have a string literal such that ASI won't take effect.
-                if (token() === 144 /* FromKeyword */ || (token() === 10 /* StringLiteral */ && !scanner.hasPrecedingLineBreak())) {
-                    parseExpected(144 /* FromKeyword */);
+                if (token() === 145 /* FromKeyword */ || (token() === 10 /* StringLiteral */ && !scanner.hasPrecedingLineBreak())) {
+                    parseExpected(145 /* FromKeyword */);
                     node.moduleSpecifier = parseModuleSpecifier();
                 }
             }
@@ -22011,12 +22300,12 @@ var ts;
             return finishNode(node);
         }
         function parseExportAssignment(node) {
-            node.kind = 254 /* ExportAssignment */;
-            if (parseOptional(59 /* EqualsToken */)) {
+            node.kind = 255 /* ExportAssignment */;
+            if (parseOptional(60 /* EqualsToken */)) {
                 node.isExportEquals = true;
             }
             else {
-                parseExpected(80 /* DefaultKeyword */);
+                parseExpected(81 /* DefaultKeyword */);
             }
             node.expression = parseAssignmentExpressionOrHigher();
             parseSemicolon();
@@ -22031,10 +22320,10 @@ var ts;
         }
         function isAnExternalModuleIndicatorNode(node) {
             return ts.hasModifier(node, 1 /* Export */)
-                || node.kind === 248 /* ImportEqualsDeclaration */ && node.moduleReference.kind === 259 /* ExternalModuleReference */
-                || node.kind === 249 /* ImportDeclaration */
-                || node.kind === 254 /* ExportAssignment */
-                || node.kind === 255 /* ExportDeclaration */
+                || node.kind === 249 /* ImportEqualsDeclaration */ && node.moduleReference.kind === 260 /* ExternalModuleReference */
+                || node.kind === 250 /* ImportDeclaration */
+                || node.kind === 255 /* ExportAssignment */
+                || node.kind === 256 /* ExportDeclaration */
                 ? node
                 : undefined;
         }
@@ -22047,7 +22336,7 @@ var ts;
             return isImportMeta(node) ? node : forEachChild(node, walkTreeForExternalModuleIndicators);
         }
         function isImportMeta(node) {
-            return ts.isMetaProperty(node) && node.keywordToken === 92 /* ImportKeyword */ && node.name.escapedText === "meta";
+            return ts.isMetaProperty(node) && node.keywordToken === 93 /* ImportKeyword */ && node.name.escapedText === "meta";
         }
         var ParsingContext;
         (function (ParsingContext) {
@@ -22086,8 +22375,8 @@ var ts;
         var JSDocParser;
         (function (JSDocParser) {
             function parseJSDocTypeExpressionForTests(content, start, length) {
-                initializeState(content, 7 /* Latest */, /*_syntaxCursor:*/ undefined, 1 /* JS */);
-                sourceFile = createSourceFile("file.js", 7 /* Latest */, 1 /* JS */, /*isDeclarationFile*/ false);
+                initializeState(content, 99 /* Latest */, /*_syntaxCursor:*/ undefined, 1 /* JS */);
+                sourceFile = createSourceFile("file.js", 99 /* Latest */, 1 /* JS */, /*isDeclarationFile*/ false);
                 scanner.setText(content, start, length);
                 currentToken = scanner.scan();
                 var jsDocTypeExpression = parseJSDocTypeExpression();
@@ -22098,18 +22387,18 @@ var ts;
             JSDocParser.parseJSDocTypeExpressionForTests = parseJSDocTypeExpressionForTests;
             // Parses out a JSDoc type expression.
             function parseJSDocTypeExpression(mayOmitBraces) {
-                var result = createNode(288 /* JSDocTypeExpression */);
+                var result = createNode(289 /* JSDocTypeExpression */);
                 var hasBrace = (mayOmitBraces ? parseOptional : parseExpected)(18 /* OpenBraceToken */);
                 result.type = doInsideOfContext(2097152 /* JSDoc */, parseJSDocType);
                 if (!mayOmitBraces || hasBrace) {
-                    parseExpected(19 /* CloseBraceToken */);
+                    parseExpectedJSDoc(19 /* CloseBraceToken */);
                 }
                 fixupParentReferences(result);
                 return finishNode(result);
             }
             JSDocParser.parseJSDocTypeExpression = parseJSDocTypeExpression;
             function parseIsolatedJSDocComment(content, start, length) {
-                initializeState(content, 7 /* Latest */, /*_syntaxCursor:*/ undefined, 1 /* JS */);
+                initializeState(content, 99 /* Latest */, /*_syntaxCursor:*/ undefined, 1 /* JS */);
                 sourceFile = { languageVariant: 0 /* Standard */, text: content }; // tslint:disable-line no-object-literal-type-assertion
                 var jsDoc = parseJSDocCommentWorker(start, length);
                 var diagnostics = parseDiagnostics;
@@ -22143,6 +22432,7 @@ var ts;
                 JSDocState[JSDocState["BeginningOfLine"] = 0] = "BeginningOfLine";
                 JSDocState[JSDocState["SawAsterisk"] = 1] = "SawAsterisk";
                 JSDocState[JSDocState["SavingComments"] = 2] = "SavingComments";
+                JSDocState[JSDocState["SavingBackticks"] = 3] = "SavingBackticks";
             })(JSDocState || (JSDocState = {}));
             var PropertyLikeParse;
             (function (PropertyLikeParse) {
@@ -22181,7 +22471,7 @@ var ts;
                         comments.push(text);
                         indent += text.length;
                     }
-                    nextJSDocToken();
+                    nextTokenJSDoc();
                     while (parseOptionalJsdoc(5 /* WhitespaceTrivia */))
                         ;
                     if (parseOptionalJsdoc(4 /* NewLineTrivia */)) {
@@ -22199,7 +22489,6 @@ var ts;
                                     // for malformed examples like `/** @param {string} x @returns {number} the length */`
                                     state = 0 /* BeginningOfLine */;
                                     margin = undefined;
-                                    indent++;
                                 }
                                 else {
                                     pushComment(scanner.getTokenText());
@@ -22244,7 +22533,7 @@ var ts;
                                 pushComment(scanner.getTokenText());
                                 break;
                         }
-                        nextJSDocToken();
+                        nextTokenJSDoc();
                     }
                     removeLeadingNewlines(comments);
                     removeTrailingWhitespace(comments);
@@ -22261,7 +22550,7 @@ var ts;
                     }
                 }
                 function createJSDocComment() {
-                    var result = createNode(296 /* JSDocComment */, start);
+                    var result = createNode(297 /* JSDocComment */, start);
                     result.tags = tags && createNodeArray(tags, tagsPos, tagsEnd);
                     result.comment = comments.length ? comments.join("") : undefined;
                     return finishNode(result, end);
@@ -22269,7 +22558,7 @@ var ts;
                 function isNextNonwhitespaceTokenEndOfFile() {
                     // We must use infinite lookahead, as there could be any number of newlines :(
                     while (true) {
-                        nextJSDocToken();
+                        nextTokenJSDoc();
                         if (token() === 1 /* EndOfFileToken */) {
                             return true;
                         }
@@ -22285,34 +22574,43 @@ var ts;
                         }
                     }
                     while (token() === 5 /* WhitespaceTrivia */ || token() === 4 /* NewLineTrivia */) {
-                        nextJSDocToken();
+                        nextTokenJSDoc();
                     }
                 }
                 function skipWhitespaceOrAsterisk() {
                     if (token() === 5 /* WhitespaceTrivia */ || token() === 4 /* NewLineTrivia */) {
                         if (lookAhead(isNextNonwhitespaceTokenEndOfFile)) {
-                            return; // Don't skip whitespace prior to EoF (or end of comment) - that shouldn't be included in any node's range
+                            return ""; // Don't skip whitespace prior to EoF (or end of comment) - that shouldn't be included in any node's range
                         }
                     }
                     var precedingLineBreak = scanner.hasPrecedingLineBreak();
+                    var seenLineBreak = false;
+                    var indentText = "";
                     while ((precedingLineBreak && token() === 40 /* AsteriskToken */) || token() === 5 /* WhitespaceTrivia */ || token() === 4 /* NewLineTrivia */) {
+                        indentText += scanner.getTokenText();
                         if (token() === 4 /* NewLineTrivia */) {
                             precedingLineBreak = true;
+                            seenLineBreak = true;
+                            indentText = "";
                         }
                         else if (token() === 40 /* AsteriskToken */) {
                             precedingLineBreak = false;
                         }
-                        nextJSDocToken();
+                        nextTokenJSDoc();
                     }
+                    return seenLineBreak ? indentText : "";
                 }
-                function parseTag(indent) {
+                function parseTag(margin) {
                     ts.Debug.assert(token() === 58 /* AtToken */);
                     var start = scanner.getTokenPos();
-                    nextJSDocToken();
+                    nextTokenJSDoc();
                     var tagName = parseJSDocIdentifierName(/*message*/ undefined);
-                    skipWhitespaceOrAsterisk();
+                    var indentText = skipWhitespaceOrAsterisk();
                     var tag;
                     switch (tagName.escapedText) {
+                        case "author":
+                            tag = parseAuthorTag(start, tagName, margin);
+                            break;
                         case "augments":
                         case "extends":
                             tag = parseAugmentsTag(start, tagName);
@@ -22330,7 +22628,7 @@ var ts;
                         case "arg":
                         case "argument":
                         case "param":
-                            return parseParameterOrPropertyTag(start, tagName, 2 /* Parameter */, indent);
+                            return parseParameterOrPropertyTag(start, tagName, 2 /* Parameter */, margin);
                         case "return":
                         case "returns":
                             tag = parseReturnTag(start, tagName);
@@ -22342,10 +22640,10 @@ var ts;
                             tag = parseTypeTag(start, tagName);
                             break;
                         case "typedef":
-                            tag = parseTypedefTag(start, tagName, indent);
+                            tag = parseTypedefTag(start, tagName, margin);
                             break;
                         case "callback":
-                            tag = parseCallbackTag(start, tagName, indent);
+                            tag = parseCallbackTag(start, tagName, margin);
                             break;
                         default:
                             tag = parseUnknownTag(start, tagName);
@@ -22353,11 +22651,14 @@ var ts;
                     }
                     if (!tag.comment) {
                         // some tags, like typedef and callback, have already parsed their comments earlier
-                        tag.comment = parseTagComments(indent + tag.end - tag.pos);
+                        if (!indentText) {
+                            margin += tag.end - tag.pos;
+                        }
+                        tag.comment = parseTagComments(margin, indentText.slice(margin));
                     }
                     return tag;
                 }
-                function parseTagComments(indent) {
+                function parseTagComments(indent, initialMargin) {
                     var comments = [];
                     var state = 0 /* BeginningOfLine */;
                     var margin;
@@ -22368,42 +22669,61 @@ var ts;
                         comments.push(text);
                         indent += text.length;
                     }
+                    if (initialMargin) {
+                        // jump straight to saving comments if there is some initial indentation
+                        pushComment(initialMargin);
+                        state = 2 /* SavingComments */;
+                    }
                     var tok = token();
                     loop: while (true) {
                         switch (tok) {
                             case 4 /* NewLineTrivia */:
                                 if (state >= 1 /* SawAsterisk */) {
                                     state = 0 /* BeginningOfLine */;
+                                    // don't use pushComment here because we want to keep the margin unchanged
                                     comments.push(scanner.getTokenText());
                                 }
                                 indent = 0;
                                 break;
                             case 58 /* AtToken */:
+                                if (state === 3 /* SavingBackticks */) {
+                                    comments.push(scanner.getTokenText());
+                                    break;
+                                }
                                 scanner.setTextPos(scanner.getTextPos() - 1);
                             // falls through
                             case 1 /* EndOfFileToken */:
                                 // Done
                                 break loop;
                             case 5 /* WhitespaceTrivia */:
-                                if (state === 2 /* SavingComments */) {
+                                if (state === 2 /* SavingComments */ || state === 3 /* SavingBackticks */) {
                                     pushComment(scanner.getTokenText());
                                 }
                                 else {
                                     var whitespace = scanner.getTokenText();
                                     // if the whitespace crosses the margin, take only the whitespace that passes the margin
                                     if (margin !== undefined && indent + whitespace.length > margin) {
-                                        comments.push(whitespace.slice(margin - indent - 1));
+                                        comments.push(whitespace.slice(margin - indent));
                                     }
                                     indent += whitespace.length;
                                 }
                                 break;
                             case 18 /* OpenBraceToken */:
                                 state = 2 /* SavingComments */;
-                                if (lookAhead(function () { return nextJSDocToken() === 58 /* AtToken */ && ts.tokenIsIdentifierOrKeyword(nextJSDocToken()) && scanner.getTokenText() === "link"; })) {
+                                if (lookAhead(function () { return nextTokenJSDoc() === 58 /* AtToken */ && ts.tokenIsIdentifierOrKeyword(nextTokenJSDoc()) && scanner.getTokenText() === "link"; })) {
                                     pushComment(scanner.getTokenText());
-                                    nextJSDocToken();
+                                    nextTokenJSDoc();
                                     pushComment(scanner.getTokenText());
-                                    nextJSDocToken();
+                                    nextTokenJSDoc();
+                                }
+                                pushComment(scanner.getTokenText());
+                                break;
+                            case 59 /* BacktickToken */:
+                                if (state === 3 /* SavingBackticks */) {
+                                    state = 2 /* SavingComments */;
+                                }
+                                else {
+                                    state = 3 /* SavingBackticks */;
                                 }
                                 pushComment(scanner.getTokenText());
                                 break;
@@ -22417,18 +22737,20 @@ var ts;
                             // record the * as a comment
                             // falls through
                             default:
-                                state = 2 /* SavingComments */; // leading identifiers start recording as well
+                                if (state !== 3 /* SavingBackticks */) {
+                                    state = 2 /* SavingComments */; // leading identifiers start recording as well
+                                }
                                 pushComment(scanner.getTokenText());
                                 break;
                         }
-                        tok = nextJSDocToken();
+                        tok = nextTokenJSDoc();
                     }
                     removeLeadingNewlines(comments);
                     removeTrailingWhitespace(comments);
                     return comments.length === 0 ? undefined : comments.join("");
                 }
                 function parseUnknownTag(start, tagName) {
-                    var result = createNode(299 /* JSDocTag */, start);
+                    var result = createNode(300 /* JSDocTag */, start);
                     result.tagName = tagName;
                     return finishNode(result);
                 }
@@ -22450,17 +22772,21 @@ var ts;
                     return token() === 18 /* OpenBraceToken */ ? parseJSDocTypeExpression() : undefined;
                 }
                 function parseBracketNameInPropertyAndParamTag() {
-                    if (token() === 14 /* NoSubstitutionTemplateLiteral */) {
-                        // a markdown-quoted name: `arg` is not legal jsdoc, but occurs in the wild
-                        return { name: createIdentifier(/*isIdentifier*/ true), isBracketed: false };
-                    }
                     // Looking for something like '[foo]', 'foo', '[foo.bar]' or 'foo.bar'
-                    var isBracketed = parseOptional(22 /* OpenBracketToken */);
+                    var isBracketed = parseOptionalJsdoc(22 /* OpenBracketToken */);
+                    if (isBracketed) {
+                        skipWhitespace();
+                    }
+                    // a markdown-quoted name: `arg` is not legal jsdoc, but occurs in the wild
+                    var isBackquoted = parseOptionalJsdoc(59 /* BacktickToken */);
                     var name = parseJSDocEntityName();
+                    if (isBackquoted) {
+                        parseExpectedTokenJSDoc(59 /* BacktickToken */);
+                    }
                     if (isBracketed) {
                         skipWhitespace();
                         // May have an optional default, e.g. '[foo = 42]'
-                        if (parseOptionalToken(59 /* EqualsToken */)) {
+                        if (parseOptionalToken(60 /* EqualsToken */)) {
                             parseExpression();
                         }
                         parseExpected(23 /* CloseBracketToken */);
@@ -22469,9 +22795,9 @@ var ts;
                 }
                 function isObjectOrObjectArrayTypeReference(node) {
                     switch (node.kind) {
-                        case 136 /* ObjectKeyword */:
+                        case 137 /* ObjectKeyword */:
                             return true;
-                        case 169 /* ArrayType */:
+                        case 170 /* ArrayType */:
                             return isObjectOrObjectArrayTypeReference(node.elementType);
                         default:
                             return ts.isTypeReferenceNode(node) && ts.isIdentifier(node.typeName) && node.typeName.escapedText === "Object";
@@ -22487,8 +22813,8 @@ var ts;
                         typeExpression = tryParseTypeExpression();
                     }
                     var result = target === 1 /* Property */ ?
-                        createNode(310 /* JSDocPropertyTag */, start) :
-                        createNode(304 /* JSDocParameterTag */, start);
+                        createNode(312 /* JSDocPropertyTag */, start) :
+                        createNode(306 /* JSDocParameterTag */, start);
                     var comment = parseTagComments(indent + scanner.getStartPos() - start);
                     var nestedTypeLiteral = target !== 4 /* CallbackParameter */ && parseNestedTypeLiteral(typeExpression, name, target, indent);
                     if (nestedTypeLiteral) {
@@ -22505,20 +22831,20 @@ var ts;
                 }
                 function parseNestedTypeLiteral(typeExpression, name, target, indent) {
                     if (typeExpression && isObjectOrObjectArrayTypeReference(typeExpression.type)) {
-                        var typeLiteralExpression = createNode(288 /* JSDocTypeExpression */, scanner.getTokenPos());
+                        var typeLiteralExpression = createNode(289 /* JSDocTypeExpression */, scanner.getTokenPos());
                         var child = void 0;
                         var jsdocTypeLiteral = void 0;
                         var start_2 = scanner.getStartPos();
                         var children = void 0;
                         while (child = tryParse(function () { return parseChildParameterOrPropertyTag(target, indent, name); })) {
-                            if (child.kind === 304 /* JSDocParameterTag */ || child.kind === 310 /* JSDocPropertyTag */) {
+                            if (child.kind === 306 /* JSDocParameterTag */ || child.kind === 312 /* JSDocPropertyTag */) {
                                 children = ts.append(children, child);
                             }
                         }
                         if (children) {
-                            jsdocTypeLiteral = createNode(297 /* JSDocTypeLiteral */, start_2);
+                            jsdocTypeLiteral = createNode(298 /* JSDocTypeLiteral */, start_2);
                             jsdocTypeLiteral.jsDocPropertyTags = children;
-                            if (typeExpression.type.kind === 169 /* ArrayType */) {
+                            if (typeExpression.type.kind === 170 /* ArrayType */) {
                                 jsdocTypeLiteral.isArrayType = true;
                             }
                             typeLiteralExpression.type = finishNode(jsdocTypeLiteral);
@@ -22527,32 +22853,86 @@ var ts;
                     }
                 }
                 function parseReturnTag(start, tagName) {
-                    if (ts.forEach(tags, function (t) { return t.kind === 305 /* JSDocReturnTag */; })) {
+                    if (ts.some(tags, ts.isJSDocReturnTag)) {
                         parseErrorAt(tagName.pos, scanner.getTokenPos(), ts.Diagnostics._0_tag_already_specified, tagName.escapedText);
                     }
-                    var result = createNode(305 /* JSDocReturnTag */, start);
+                    var result = createNode(307 /* JSDocReturnTag */, start);
                     result.tagName = tagName;
                     result.typeExpression = tryParseTypeExpression();
                     return finishNode(result);
                 }
                 function parseTypeTag(start, tagName) {
-                    if (ts.forEach(tags, function (t) { return t.kind === 307 /* JSDocTypeTag */; })) {
+                    if (ts.some(tags, ts.isJSDocTypeTag)) {
                         parseErrorAt(tagName.pos, scanner.getTokenPos(), ts.Diagnostics._0_tag_already_specified, tagName.escapedText);
                     }
-                    var result = createNode(307 /* JSDocTypeTag */, start);
+                    var result = createNode(309 /* JSDocTypeTag */, start);
                     result.tagName = tagName;
                     result.typeExpression = parseJSDocTypeExpression(/*mayOmitBraces*/ true);
                     return finishNode(result);
                 }
+                function parseAuthorTag(start, tagName, indent) {
+                    var result = createNode(302 /* JSDocAuthorTag */, start);
+                    result.tagName = tagName;
+                    var authorInfoWithEmail = tryParse(function () { return tryParseAuthorNameAndEmail(); });
+                    if (!authorInfoWithEmail) {
+                        return finishNode(result);
+                    }
+                    result.comment = authorInfoWithEmail;
+                    if (lookAhead(function () { return nextToken() !== 4 /* NewLineTrivia */; })) {
+                        var comment = parseTagComments(indent);
+                        if (comment) {
+                            result.comment += comment;
+                        }
+                    }
+                    return finishNode(result);
+                }
+                function tryParseAuthorNameAndEmail() {
+                    var comments = [];
+                    var seenLessThan = false;
+                    var seenGreaterThan = false;
+                    var token = scanner.getToken();
+                    loop: while (true) {
+                        switch (token) {
+                            case 73 /* Identifier */:
+                            case 5 /* WhitespaceTrivia */:
+                            case 24 /* DotToken */:
+                            case 58 /* AtToken */:
+                                comments.push(scanner.getTokenText());
+                                break;
+                            case 28 /* LessThanToken */:
+                                if (seenLessThan || seenGreaterThan) {
+                                    return;
+                                }
+                                seenLessThan = true;
+                                comments.push(scanner.getTokenText());
+                                break;
+                            case 30 /* GreaterThanToken */:
+                                if (!seenLessThan || seenGreaterThan) {
+                                    return;
+                                }
+                                seenGreaterThan = true;
+                                comments.push(scanner.getTokenText());
+                                scanner.setTextPos(scanner.getTokenPos() + 1);
+                                break loop;
+                            case 4 /* NewLineTrivia */:
+                            case 1 /* EndOfFileToken */:
+                                break loop;
+                        }
+                        token = nextTokenJSDoc();
+                    }
+                    if (seenLessThan && seenGreaterThan) {
+                        return comments.length === 0 ? undefined : comments.join("");
+                    }
+                }
                 function parseAugmentsTag(start, tagName) {
-                    var result = createNode(300 /* JSDocAugmentsTag */, start);
+                    var result = createNode(301 /* JSDocAugmentsTag */, start);
                     result.tagName = tagName;
                     result.class = parseExpressionWithTypeArgumentsForAugments();
                     return finishNode(result);
                 }
                 function parseExpressionWithTypeArgumentsForAugments() {
                     var usedBrace = parseOptional(18 /* OpenBraceToken */);
-                    var node = createNode(211 /* ExpressionWithTypeArguments */);
+                    var node = createNode(212 /* ExpressionWithTypeArguments */);
                     node.expression = parsePropertyAccessEntityNameExpression();
                     node.typeArguments = tryParseTypeArguments();
                     var res = finishNode(node);
@@ -22564,7 +22944,7 @@ var ts;
                 function parsePropertyAccessEntityNameExpression() {
                     var node = parseJSDocIdentifierName();
                     while (parseOptional(24 /* DotToken */)) {
-                        var prop = createNode(189 /* PropertyAccessExpression */, node.pos);
+                        var prop = createNode(190 /* PropertyAccessExpression */, node.pos);
                         prop.expression = node;
                         prop.name = parseJSDocIdentifierName();
                         node = finishNode(prop);
@@ -22572,19 +22952,19 @@ var ts;
                     return node;
                 }
                 function parseClassTag(start, tagName) {
-                    var tag = createNode(301 /* JSDocClassTag */, start);
+                    var tag = createNode(303 /* JSDocClassTag */, start);
                     tag.tagName = tagName;
                     return finishNode(tag);
                 }
                 function parseThisTag(start, tagName) {
-                    var tag = createNode(306 /* JSDocThisTag */, start);
+                    var tag = createNode(308 /* JSDocThisTag */, start);
                     tag.tagName = tagName;
                     tag.typeExpression = parseJSDocTypeExpression(/*mayOmitBraces*/ true);
                     skipWhitespace();
                     return finishNode(tag);
                 }
                 function parseEnumTag(start, tagName) {
-                    var tag = createNode(303 /* JSDocEnumTag */, start);
+                    var tag = createNode(305 /* JSDocEnumTag */, start);
                     tag.tagName = tagName;
                     tag.typeExpression = parseJSDocTypeExpression(/*mayOmitBraces*/ true);
                     skipWhitespace();
@@ -22593,7 +22973,7 @@ var ts;
                 function parseTypedefTag(start, tagName, indent) {
                     var typeExpression = tryParseTypeExpression();
                     skipWhitespaceOrAsterisk();
-                    var typedefTag = createNode(309 /* JSDocTypedefTag */, start);
+                    var typedefTag = createNode(311 /* JSDocTypedefTag */, start);
                     typedefTag.tagName = tagName;
                     typedefTag.fullName = parseJSDocTypeNameWithNamespace();
                     typedefTag.name = getJSDocTypeAliasName(typedefTag.fullName);
@@ -22607,9 +22987,9 @@ var ts;
                         var childTypeTag = void 0;
                         while (child = tryParse(function () { return parseChildPropertyTag(indent); })) {
                             if (!jsdocTypeLiteral) {
-                                jsdocTypeLiteral = createNode(297 /* JSDocTypeLiteral */, start);
+                                jsdocTypeLiteral = createNode(298 /* JSDocTypeLiteral */, start);
                             }
-                            if (child.kind === 307 /* JSDocTypeTag */) {
+                            if (child.kind === 309 /* JSDocTypeTag */) {
                                 if (childTypeTag) {
                                     break;
                                 }
@@ -22622,7 +23002,7 @@ var ts;
                             }
                         }
                         if (jsdocTypeLiteral) {
-                            if (typeExpression && typeExpression.type.kind === 169 /* ArrayType */) {
+                            if (typeExpression && typeExpression.type.kind === 170 /* ArrayType */) {
                                 jsdocTypeLiteral.isArrayType = true;
                             }
                             typedefTag.typeExpression = childTypeTag && childTypeTag.typeExpression && !isObjectOrObjectArrayTypeReference(childTypeTag.typeExpression.type) ?
@@ -22641,7 +23021,7 @@ var ts;
                     }
                     var typeNameOrNamespaceName = parseJSDocIdentifierName();
                     if (parseOptional(24 /* DotToken */)) {
-                        var jsDocNamespaceNode = createNode(244 /* ModuleDeclaration */, pos);
+                        var jsDocNamespaceNode = createNode(245 /* ModuleDeclaration */, pos);
                         if (nested) {
                             jsDocNamespaceNode.flags |= 4 /* NestedNamespace */;
                         }
@@ -22655,14 +23035,14 @@ var ts;
                     return typeNameOrNamespaceName;
                 }
                 function parseCallbackTag(start, tagName, indent) {
-                    var callbackTag = createNode(302 /* JSDocCallbackTag */, start);
+                    var callbackTag = createNode(304 /* JSDocCallbackTag */, start);
                     callbackTag.tagName = tagName;
                     callbackTag.fullName = parseJSDocTypeNameWithNamespace();
                     callbackTag.name = getJSDocTypeAliasName(callbackTag.fullName);
                     skipWhitespace();
                     callbackTag.comment = parseTagComments(indent);
                     var child;
-                    var jsdocSignature = createNode(298 /* JSDocSignature */, start);
+                    var jsdocSignature = createNode(299 /* JSDocSignature */, start);
                     jsdocSignature.parameters = [];
                     while (child = tryParse(function () { return parseChildParameterOrPropertyTag(4 /* CallbackParameter */, indent); })) {
                         jsdocSignature.parameters = ts.append(jsdocSignature.parameters, child);
@@ -22670,7 +23050,7 @@ var ts;
                     var returnTag = tryParse(function () {
                         if (parseOptionalJsdoc(58 /* AtToken */)) {
                             var tag = parseTag(indent);
-                            if (tag && tag.kind === 305 /* JSDocReturnTag */) {
+                            if (tag && tag.kind === 307 /* JSDocReturnTag */) {
                                 return tag;
                             }
                         }
@@ -22711,11 +23091,11 @@ var ts;
                     var canParseTag = true;
                     var seenAsterisk = false;
                     while (true) {
-                        switch (nextJSDocToken()) {
+                        switch (nextTokenJSDoc()) {
                             case 58 /* AtToken */:
                                 if (canParseTag) {
                                     var child = tryParseChildTag(target, indent);
-                                    if (child && (child.kind === 304 /* JSDocParameterTag */ || child.kind === 310 /* JSDocPropertyTag */) &&
+                                    if (child && (child.kind === 306 /* JSDocParameterTag */ || child.kind === 312 /* JSDocPropertyTag */) &&
                                         target !== 4 /* CallbackParameter */ &&
                                         name && (ts.isIdentifier(child.name) || !escapedTextsEqual(name, child.name.left))) {
                                         return false;
@@ -22734,7 +23114,7 @@ var ts;
                                 }
                                 seenAsterisk = true;
                                 break;
-                            case 72 /* Identifier */:
+                            case 73 /* Identifier */:
                                 canParseTag = false;
                                 break;
                             case 1 /* EndOfFileToken */:
@@ -22745,7 +23125,7 @@ var ts;
                 function tryParseChildTag(target, indent) {
                     ts.Debug.assert(token() === 58 /* AtToken */);
                     var start = scanner.getStartPos();
-                    nextJSDocToken();
+                    nextTokenJSDoc();
                     var tagName = parseJSDocIdentifierName();
                     skipWhitespace();
                     var t;
@@ -22779,25 +23159,22 @@ var ts;
                     var typeParametersPos = getNodePos();
                     do {
                         skipWhitespace();
-                        var typeParameter = createNode(150 /* TypeParameter */);
+                        var typeParameter = createNode(151 /* TypeParameter */);
                         typeParameter.name = parseJSDocIdentifierName(ts.Diagnostics.Unexpected_token_A_type_parameter_name_was_expected_without_curly_braces);
                         finishNode(typeParameter);
                         skipWhitespace();
                         typeParameters.push(typeParameter);
                     } while (parseOptionalJsdoc(27 /* CommaToken */));
-                    var result = createNode(308 /* JSDocTemplateTag */, start);
+                    var result = createNode(310 /* JSDocTemplateTag */, start);
                     result.tagName = tagName;
                     result.constraint = constraint;
                     result.typeParameters = createNodeArray(typeParameters, typeParametersPos);
                     finishNode(result);
                     return result;
                 }
-                function nextJSDocToken() {
-                    return currentToken = scanner.scanJSDocToken();
-                }
                 function parseOptionalJsdoc(t) {
                     if (token() === t) {
-                        nextJSDocToken();
+                        nextTokenJSDoc();
                         return true;
                     }
                     return false;
@@ -22821,14 +23198,14 @@ var ts;
                 }
                 function parseJSDocIdentifierName(message) {
                     if (!ts.tokenIsIdentifierOrKeyword(token())) {
-                        return createMissingNode(72 /* Identifier */, /*reportAtCurrentPosition*/ !message, message || ts.Diagnostics.Identifier_expected);
+                        return createMissingNode(73 /* Identifier */, /*reportAtCurrentPosition*/ !message, message || ts.Diagnostics.Identifier_expected);
                     }
                     var pos = scanner.getTokenPos();
                     var end = scanner.getTextPos();
-                    var result = createNode(72 /* Identifier */, pos);
+                    var result = createNode(73 /* Identifier */, pos);
                     result.escapedText = ts.escapeLeadingUnderscores(scanner.getTokenText());
                     finishNode(result, end);
-                    nextJSDocToken();
+                    nextTokenJSDoc();
                     return result;
                 }
             }
@@ -22953,7 +23330,7 @@ var ts;
             switch (node.kind) {
                 case 10 /* StringLiteral */:
                 case 8 /* NumericLiteral */:
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return true;
             }
             return false;
@@ -23320,28 +23697,16 @@ var ts;
     ts.isDeclarationFileName = isDeclarationFileName;
     /*@internal*/
     function processCommentPragmas(context, sourceText) {
-        var triviaScanner = ts.createScanner(context.languageVersion, /*skipTrivia*/ false, 0 /* Standard */, sourceText);
         var pragmas = [];
-        // Keep scanning all the leading trivia in the file until we get to something that
-        // isn't trivia.  Any single line comment will be analyzed to see if it is a
-        // reference comment.
-        while (true) {
-            var kind = triviaScanner.scan();
-            if (!ts.isTrivia(kind)) {
-                break;
-            }
-            var range = {
-                kind: triviaScanner.getToken(),
-                pos: triviaScanner.getTokenPos(),
-                end: triviaScanner.getTextPos(),
-            };
+        for (var _i = 0, _a = ts.getLeadingCommentRanges(sourceText, 0) || ts.emptyArray; _i < _a.length; _i++) {
+            var range = _a[_i];
             var comment = sourceText.substring(range.pos, range.end);
             extractPragmas(pragmas, range, comment);
         }
         context.pragmas = ts.createMap();
-        for (var _i = 0, pragmas_1 = pragmas; _i < pragmas_1.length; _i++) {
-            var pragma = pragmas_1[_i];
-            if (context.pragmas.has(pragma.name)) { // TODO: GH#18217
+        for (var _b = 0, pragmas_1 = pragmas; _b < pragmas_1.length; _b++) {
+            var pragma = pragmas_1[_b];
+            if (context.pragmas.has(pragma.name)) {
                 var currentValue = context.pragmas.get(pragma.name);
                 if (currentValue instanceof Array) {
                     currentValue.push(pragma.args);
@@ -23372,7 +23737,6 @@ var ts;
                     var typeReferenceDirectives_1 = context.typeReferenceDirectives;
                     var libReferenceDirectives_1 = context.libReferenceDirectives;
                     ts.forEach(ts.toArray(entryOrList), function (arg) {
-                        // TODO: GH#18217
                         var _a = arg.arguments, types = _a.types, lib = _a.lib, path = _a.path;
                         if (arg.arguments["no-default-lib"]) {
                             context.hasNoDefaultLib = true;
@@ -23393,7 +23757,7 @@ var ts;
                     break;
                 }
                 case "amd-dependency": {
-                    context.amdDependencies = ts.map(ts.toArray(entryOrList), function (x) { return ({ name: x.arguments.name, path: x.arguments.path }); }); // TODO: GH#18217
+                    context.amdDependencies = ts.map(ts.toArray(entryOrList), function (x) { return ({ name: x.arguments.name, path: x.arguments.path }); });
                     break;
                 }
                 case "amd-module": {
@@ -23416,7 +23780,7 @@ var ts;
                 case "ts-check": {
                     // _last_ of either nocheck or check in a file is the "winner"
                     ts.forEach(ts.toArray(entryOrList), function (entry) {
-                        if (!context.checkJsDirective || entry.range.pos > context.checkJsDirective.pos) { // TODO: GH#18217
+                        if (!context.checkJsDirective || entry.range.pos > context.checkJsDirective.pos) {
                             context.checkJsDirective = {
                                 enabled: key === "ts-check",
                                 end: entry.range.end,
@@ -23532,10 +23896,10 @@ var ts;
         if (lhs.kind !== rhs.kind) {
             return false;
         }
-        if (lhs.kind === 72 /* Identifier */) {
+        if (lhs.kind === 73 /* Identifier */) {
             return lhs.escapedText === rhs.escapedText;
         }
-        if (lhs.kind === 100 /* ThisKeyword */) {
+        if (lhs.kind === 101 /* ThisKeyword */) {
             return true;
         }
         // If we are at this statement then we must have PropertyAccessExpression and because tag name in Jsx element can only
@@ -23564,6 +23928,7 @@ var ts;
         ["es2017", "lib.es2017.d.ts"],
         ["es2018", "lib.es2018.d.ts"],
         ["es2019", "lib.es2019.d.ts"],
+        ["es2020", "lib.es2020.d.ts"],
         ["esnext", "lib.esnext.d.ts"],
         // Host only
         ["dom", "lib.dom.d.ts"],
@@ -23587,13 +23952,17 @@ var ts;
         ["es2017.string", "lib.es2017.string.d.ts"],
         ["es2017.intl", "lib.es2017.intl.d.ts"],
         ["es2017.typedarrays", "lib.es2017.typedarrays.d.ts"],
+        ["es2018.asyncgenerator", "lib.es2018.asyncgenerator.d.ts"],
         ["es2018.asynciterable", "lib.es2018.asynciterable.d.ts"],
         ["es2018.intl", "lib.es2018.intl.d.ts"],
         ["es2018.promise", "lib.es2018.promise.d.ts"],
         ["es2018.regexp", "lib.es2018.regexp.d.ts"],
         ["es2019.array", "lib.es2019.array.d.ts"],
+        ["es2019.object", "lib.es2019.object.d.ts"],
         ["es2019.string", "lib.es2019.string.d.ts"],
         ["es2019.symbol", "lib.es2019.symbol.d.ts"],
+        ["es2020.string", "lib.es2020.string.d.ts"],
+        ["es2020.symbol.wellknown", "lib.es2020.symbol.wellknown.d.ts"],
         ["esnext.array", "lib.es2019.array.d.ts"],
         ["esnext.symbol", "lib.es2019.symbol.d.ts"],
         ["esnext.asynciterable", "lib.es2018.asynciterable.d.ts"],
@@ -23680,6 +24049,19 @@ var ts;
             category: ts.Diagnostics.Advanced_Options,
             description: ts.Diagnostics.Show_verbose_diagnostic_information
         },
+        {
+            name: "incremental",
+            shortName: "i",
+            type: "boolean",
+            category: ts.Diagnostics.Basic_Options,
+            description: ts.Diagnostics.Enable_incremental_compilation,
+        },
+        {
+            name: "locale",
+            type: "string",
+            category: ts.Diagnostics.Advanced_Options,
+            description: ts.Diagnostics.The_locale_used_when_displaying_messages_to_the_user_e_g_en_us
+        },
     ];
     /* @internal */
     ts.optionDeclarations = ts.commonOptionsWithBuild.concat([
@@ -23743,10 +24125,12 @@ var ts;
                 es2017: 4 /* ES2017 */,
                 es2018: 5 /* ES2018 */,
                 es2019: 6 /* ES2019 */,
-                esnext: 7 /* ESNext */,
+                es2020: 7 /* ES2020 */,
+                esnext: 99 /* ESNext */,
             }),
             affectsSourceFile: true,
             affectsModuleResolution: true,
+            affectsEmit: true,
             paramType: ts.Diagnostics.VERSION,
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Basic_Options,
@@ -23766,6 +24150,7 @@ var ts;
                 esnext: ts.ModuleKind.ESNext
             }),
             affectsModuleResolution: true,
+            affectsEmit: true,
             paramType: ts.Diagnostics.KIND,
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Basic_Options,
@@ -23814,6 +24199,7 @@ var ts;
             name: "declaration",
             shortName: "d",
             type: "boolean",
+            affectsEmit: true,
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Basic_Options,
             description: ts.Diagnostics.Generates_corresponding_d_ts_file,
@@ -23821,6 +24207,7 @@ var ts;
         {
             name: "declarationMap",
             type: "boolean",
+            affectsEmit: true,
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Basic_Options,
             description: ts.Diagnostics.Generates_a_sourcemap_for_each_corresponding_d_ts_file,
@@ -23828,12 +24215,14 @@ var ts;
         {
             name: "emitDeclarationOnly",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Advanced_Options,
             description: ts.Diagnostics.Only_emit_d_ts_declaration_files,
         },
         {
             name: "sourceMap",
             type: "boolean",
+            affectsEmit: true,
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Basic_Options,
             description: ts.Diagnostics.Generates_corresponding_map_file,
@@ -23841,6 +24230,7 @@ var ts;
         {
             name: "outFile",
             type: "string",
+            affectsEmit: true,
             isFilePath: true,
             paramType: ts.Diagnostics.FILE,
             showInSimplifiedHelpView: true,
@@ -23850,6 +24240,7 @@ var ts;
         {
             name: "outDir",
             type: "string",
+            affectsEmit: true,
             isFilePath: true,
             paramType: ts.Diagnostics.DIRECTORY,
             showInSimplifiedHelpView: true,
@@ -23859,6 +24250,7 @@ var ts;
         {
             name: "rootDir",
             type: "string",
+            affectsEmit: true,
             isFilePath: true,
             paramType: ts.Diagnostics.LOCATION,
             category: ts.Diagnostics.Basic_Options,
@@ -23867,29 +24259,24 @@ var ts;
         {
             name: "composite",
             type: "boolean",
+            affectsEmit: true,
             isTSConfigOnly: true,
             category: ts.Diagnostics.Basic_Options,
             description: ts.Diagnostics.Enable_project_compilation,
         },
-        {
-            name: "incremental",
-            type: "boolean",
-            isTSConfigOnly: true,
-            category: ts.Diagnostics.Basic_Options,
-            description: ts.Diagnostics.Enable_incremental_compilation,
-        },
         {
             name: "tsBuildInfoFile",
             type: "string",
+            affectsEmit: true,
             isFilePath: true,
             paramType: ts.Diagnostics.FILE,
-            isTSConfigOnly: true,
             category: ts.Diagnostics.Basic_Options,
             description: ts.Diagnostics.Specify_file_to_store_incremental_compilation_information,
         },
         {
             name: "removeComments",
             type: "boolean",
+            affectsEmit: true,
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Basic_Options,
             description: ts.Diagnostics.Do_not_emit_comments_to_output,
@@ -23897,6 +24284,7 @@ var ts;
         {
             name: "noEmit",
             type: "boolean",
+            affectsEmit: true,
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Basic_Options,
             description: ts.Diagnostics.Do_not_emit_outputs,
@@ -23904,12 +24292,14 @@ var ts;
         {
             name: "importHelpers",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Basic_Options,
             description: ts.Diagnostics.Import_emit_helpers_from_tslib
         },
         {
             name: "downlevelIteration",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Basic_Options,
             description: ts.Diagnostics.Provide_full_support_for_iterables_in_for_of_spread_and_destructuring_when_targeting_ES5_or_ES3
         },
@@ -24103,6 +24493,7 @@ var ts;
             name: "esModuleInterop",
             type: "boolean",
             affectsSemanticDiagnostics: true,
+            affectsEmit: true,
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Module_Resolution_Options,
             description: ts.Diagnostics.Enables_emit_interoperability_between_CommonJS_and_ES_Modules_via_creation_of_namespace_objects_for_all_imports_Implies_allowSyntheticDefaultImports
@@ -24113,10 +24504,18 @@ var ts;
             category: ts.Diagnostics.Module_Resolution_Options,
             description: ts.Diagnostics.Do_not_resolve_the_real_path_of_symlinks,
         },
+        {
+            name: "allowUmdGlobalAccess",
+            type: "boolean",
+            affectsSemanticDiagnostics: true,
+            category: ts.Diagnostics.Module_Resolution_Options,
+            description: ts.Diagnostics.Allow_accessing_UMD_globals_from_modules,
+        },
         // Source Maps
         {
             name: "sourceRoot",
             type: "string",
+            affectsEmit: true,
             paramType: ts.Diagnostics.LOCATION,
             category: ts.Diagnostics.Source_Map_Options,
             description: ts.Diagnostics.Specify_the_location_where_debugger_should_locate_TypeScript_files_instead_of_source_locations,
@@ -24124,6 +24523,7 @@ var ts;
         {
             name: "mapRoot",
             type: "string",
+            affectsEmit: true,
             paramType: ts.Diagnostics.LOCATION,
             category: ts.Diagnostics.Source_Map_Options,
             description: ts.Diagnostics.Specify_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations,
@@ -24131,12 +24531,14 @@ var ts;
         {
             name: "inlineSourceMap",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Source_Map_Options,
             description: ts.Diagnostics.Emit_a_single_file_with_source_maps_instead_of_having_a_separate_file
         },
         {
             name: "inlineSources",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Source_Map_Options,
             description: ts.Diagnostics.Emit_the_source_alongside_the_sourcemaps_within_a_single_file_requires_inlineSourceMap_or_sourceMap_to_be_set
         },
@@ -24169,6 +24571,7 @@ var ts;
         {
             name: "out",
             type: "string",
+            affectsEmit: true,
             isFilePath: false,
             // for correct behaviour, please use outFile
             category: ts.Diagnostics.Advanced_Options,
@@ -24178,6 +24581,7 @@ var ts;
         {
             name: "reactNamespace",
             type: "string",
+            affectsEmit: true,
             category: ts.Diagnostics.Advanced_Options,
             description: ts.Diagnostics.Deprecated_Use_jsxFactory_instead_Specify_the_object_invoked_for_createElement_when_targeting_react_JSX_emit
         },
@@ -24196,21 +24600,17 @@ var ts;
         {
             name: "emitBOM",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Advanced_Options,
             description: ts.Diagnostics.Emit_a_UTF_8_Byte_Order_Mark_BOM_in_the_beginning_of_output_files
         },
-        {
-            name: "locale",
-            type: "string",
-            category: ts.Diagnostics.Advanced_Options,
-            description: ts.Diagnostics.The_locale_used_when_displaying_messages_to_the_user_e_g_en_us
-        },
         {
             name: "newLine",
             type: ts.createMapFromTemplate({
                 crlf: 0 /* CarriageReturnLineFeed */,
                 lf: 1 /* LineFeed */
             }),
+            affectsEmit: true,
             paramType: ts.Diagnostics.NEWLINE,
             category: ts.Diagnostics.Advanced_Options,
             description: ts.Diagnostics.Specify_the_end_of_line_sequence_to_be_used_when_emitting_files_Colon_CRLF_dos_or_LF_unix,
@@ -24238,6 +24638,7 @@ var ts;
         {
             name: "stripInternal",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Advanced_Options,
             description: ts.Diagnostics.Do_not_emit_declarations_for_code_that_has_an_internal_annotation,
         },
@@ -24258,24 +24659,28 @@ var ts;
         {
             name: "noEmitHelpers",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Advanced_Options,
             description: ts.Diagnostics.Do_not_generate_custom_helper_functions_like_extends_in_compiled_output
         },
         {
             name: "noEmitOnError",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Advanced_Options,
             description: ts.Diagnostics.Do_not_emit_outputs_if_any_errors_were_reported,
         },
         {
             name: "preserveConstEnums",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Advanced_Options,
             description: ts.Diagnostics.Do_not_erase_const_enum_declarations_in_generated_code
         },
         {
             name: "declarationDir",
             type: "string",
+            affectsEmit: true,
             isFilePath: true,
             paramType: ts.Diagnostics.DIRECTORY,
             category: ts.Diagnostics.Advanced_Options,
@@ -24358,6 +24763,8 @@ var ts;
     /* @internal */
     ts.semanticDiagnosticsOptionDeclarations = ts.optionDeclarations.filter(function (option) { return !!option.affectsSemanticDiagnostics; });
     /* @internal */
+    ts.affectsEmitOptionDeclarations = ts.optionDeclarations.filter(function (option) { return !!option.affectsEmit; });
+    /* @internal */
     ts.moduleResolutionOptionDeclarations = ts.optionDeclarations.filter(function (option) { return !!option.affectsModuleResolution; });
     /* @internal */
     ts.sourceFileAffectingCompilerOptions = ts.optionDeclarations.filter(function (option) {
@@ -24444,9 +24851,11 @@ var ts;
         return typeAcquisition;
     }
     ts.convertEnableAutoDiscoveryToEnable = convertEnableAutoDiscoveryToEnable;
+    /* @internal */
     function getOptionNameMap() {
         return optionNameMapCache || (optionNameMapCache = createOptionNameMap(ts.optionDeclarations));
     }
+    ts.getOptionNameMap = getOptionNameMap;
     /*@internal*/
     function createOptionNameMap(optionDeclarations) {
         var optionNameMap = ts.createMap();
@@ -24765,7 +25174,7 @@ var ts;
     /**
      * Reads the config file, reports errors if any and exits if the config file cannot be found
      */
-    function getParsedCommandLineOfConfigFile(configFileName, optionsToExtend, host) {
+    function getParsedCommandLineOfConfigFile(configFileName, optionsToExtend, host, extendedConfigCache) {
         var configFileText;
         try {
             configFileText = host.readFile(configFileName);
@@ -24785,7 +25194,9 @@ var ts;
         result.path = ts.toPath(configFileName, cwd, ts.createGetCanonicalFileName(host.useCaseSensitiveFileNames));
         result.resolvedPath = result.path;
         result.originalFileName = result.fileName;
-        return parseJsonSourceFileConfigFileContent(result, host, ts.getNormalizedAbsolutePath(ts.getDirectoryPath(configFileName), cwd), optionsToExtend, ts.getNormalizedAbsolutePath(configFileName, cwd));
+        return parseJsonSourceFileConfigFileContent(result, host, ts.getNormalizedAbsolutePath(ts.getDirectoryPath(configFileName), cwd), optionsToExtend, ts.getNormalizedAbsolutePath(configFileName, cwd), 
+        /*resolutionStack*/ undefined, 
+        /*extraFileExtension*/ undefined, extendedConfigCache);
     }
     ts.getParsedCommandLineOfConfigFile = getParsedCommandLineOfConfigFile;
     /**
@@ -24924,7 +25335,7 @@ var ts;
             var result = returnValue ? {} : undefined;
             for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
                 var element = _a[_i];
-                if (element.kind !== 275 /* PropertyAssignment */) {
+                if (element.kind !== 276 /* PropertyAssignment */) {
                     errors.push(ts.createDiagnosticForNodeInSourceFile(sourceFile, element, ts.Diagnostics.Property_assignment_expected));
                     continue;
                 }
@@ -24980,13 +25391,13 @@ var ts;
         }
         function convertPropertyValueToJson(valueExpression, option) {
             switch (valueExpression.kind) {
-                case 102 /* TrueKeyword */:
+                case 103 /* TrueKeyword */:
                     reportInvalidOptionValue(option && option.type !== "boolean");
                     return true;
-                case 87 /* FalseKeyword */:
+                case 88 /* FalseKeyword */:
                     reportInvalidOptionValue(option && option.type !== "boolean");
                     return false;
-                case 96 /* NullKeyword */:
+                case 97 /* NullKeyword */:
                     reportInvalidOptionValue(option && option.name === "extends"); // "extends" is the only option we don't allow null/undefined for
                     return null; // tslint:disable-line:no-null-keyword
                 case 10 /* StringLiteral */:
@@ -25006,13 +25417,13 @@ var ts;
                 case 8 /* NumericLiteral */:
                     reportInvalidOptionValue(option && option.type !== "number");
                     return Number(valueExpression.text);
-                case 202 /* PrefixUnaryExpression */:
+                case 203 /* PrefixUnaryExpression */:
                     if (valueExpression.operator !== 39 /* MinusToken */ || valueExpression.operand.kind !== 8 /* NumericLiteral */) {
                         break; // not valid JSON syntax
                     }
                     reportInvalidOptionValue(option && option.type !== "number");
                     return -Number(valueExpression.operand.text);
-                case 188 /* ObjectLiteralExpression */:
+                case 189 /* ObjectLiteralExpression */:
                     reportInvalidOptionValue(option && option.type !== "object");
                     var objectLiteralExpression = valueExpression;
                     // Currently having element option declaration in the tsconfig with type "object"
@@ -25029,7 +25440,7 @@ var ts;
                         return convertObjectLiteralExpressionToJson(objectLiteralExpression, /* knownOptions*/ undefined, 
                         /*extraKeyDiagnosticMessage */ undefined, /*parentOption*/ undefined);
                     }
-                case 187 /* ArrayLiteralExpression */:
+                case 188 /* ArrayLiteralExpression */:
                     reportInvalidOptionValue(option && option.type !== "list");
                     return convertArrayLiteralExpressionToJson(valueExpression.elements, option && option.element);
             }
@@ -25201,7 +25612,10 @@ var ts;
                 case "object":
                     return {};
                 default:
-                    return option.type.keys().next().value;
+                    var iterResult = option.type.keys().next();
+                    if (!iterResult.done)
+                        return iterResult.value;
+                    return ts.Debug.fail("Expected 'option.type' to have entries.");
             }
         }
         function makePadding(paddingLength) {
@@ -25285,8 +25699,8 @@ var ts;
      * @param basePath A root directory to resolve relative path entries in the config
      *    file to. e.g. outDir
      */
-    function parseJsonConfigFileContent(json, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions) {
-        return parseJsonConfigFileContentWorker(json, /*sourceFile*/ undefined, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions);
+    function parseJsonConfigFileContent(json, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions, extendedConfigCache) {
+        return parseJsonConfigFileContentWorker(json, /*sourceFile*/ undefined, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions, extendedConfigCache);
     }
     ts.parseJsonConfigFileContent = parseJsonConfigFileContent;
     /**
@@ -25296,8 +25710,8 @@ var ts;
      * @param basePath A root directory to resolve relative path entries in the config
      *    file to. e.g. outDir
      */
-    function parseJsonSourceFileConfigFileContent(sourceFile, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions) {
-        return parseJsonConfigFileContentWorker(/*json*/ undefined, sourceFile, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions);
+    function parseJsonSourceFileConfigFileContent(sourceFile, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions, extendedConfigCache) {
+        return parseJsonConfigFileContentWorker(/*json*/ undefined, sourceFile, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions, extendedConfigCache);
     }
     ts.parseJsonSourceFileConfigFileContent = parseJsonSourceFileConfigFileContent;
     /*@internal*/
@@ -25325,13 +25739,13 @@ var ts;
      *    file to. e.g. outDir
      * @param resolutionStack Only present for backwards-compatibility. Should be empty.
      */
-    function parseJsonConfigFileContentWorker(json, sourceFile, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions) {
+    function parseJsonConfigFileContentWorker(json, sourceFile, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions, extendedConfigCache) {
         if (existingOptions === void 0) { existingOptions = {}; }
         if (resolutionStack === void 0) { resolutionStack = []; }
         if (extraFileExtensions === void 0) { extraFileExtensions = []; }
         ts.Debug.assert((json === undefined && sourceFile !== undefined) || (json !== undefined && sourceFile === undefined));
         var errors = [];
-        var parsedConfig = parseConfig(json, sourceFile, host, basePath, configFileName, resolutionStack, errors);
+        var parsedConfig = parseConfig(json, sourceFile, host, basePath, configFileName, resolutionStack, errors, extendedConfigCache);
         var raw = parsedConfig.raw;
         var options = ts.extend(existingOptions, parsedConfig.options || {});
         options.configFilePath = configFileName && ts.normalizeSlashes(configFileName);
@@ -25471,7 +25885,7 @@ var ts;
      * This *just* extracts options/include/exclude/files out of a config file.
      * It does *not* resolve the included files.
      */
-    function parseConfig(json, sourceFile, host, basePath, configFileName, resolutionStack, errors) {
+    function parseConfig(json, sourceFile, host, basePath, configFileName, resolutionStack, errors, extendedConfigCache) {
         basePath = ts.normalizeSlashes(basePath);
         var resolvedPath = ts.getNormalizedAbsolutePath(configFileName || "", basePath);
         if (resolutionStack.indexOf(resolvedPath) >= 0) {
@@ -25484,7 +25898,7 @@ var ts;
         if (ownConfig.extendedConfigPath) {
             // copy the resolution stack so it is never reused between branches in potential diamond-problem scenarios.
             resolutionStack = resolutionStack.concat([resolvedPath]);
-            var extendedConfig = getExtendedConfig(sourceFile, ownConfig.extendedConfigPath, host, basePath, resolutionStack, errors);
+            var extendedConfig = getExtendedConfig(sourceFile, ownConfig.extendedConfigPath, host, basePath, resolutionStack, errors, extendedConfigCache);
             if (extendedConfig && isSuccessfulParsedTsconfig(extendedConfig)) {
                 var baseRaw_1 = extendedConfig.raw;
                 var raw_1 = ownConfig.raw;
@@ -25581,7 +25995,7 @@ var ts;
             if (!host.fileExists(extendedConfigPath) && !ts.endsWith(extendedConfigPath, ".json" /* Json */)) {
                 extendedConfigPath = extendedConfigPath + ".json";
                 if (!host.fileExists(extendedConfigPath)) {
-                    errors.push(createDiagnostic(ts.Diagnostics.File_0_does_not_exist, extendedConfig));
+                    errors.push(createDiagnostic(ts.Diagnostics.File_0_not_found, extendedConfig));
                     return undefined;
                 }
             }
@@ -25592,38 +26006,52 @@ var ts;
         if (resolved.resolvedModule) {
             return resolved.resolvedModule.resolvedFileName;
         }
-        errors.push(createDiagnostic(ts.Diagnostics.File_0_does_not_exist, extendedConfig));
+        errors.push(createDiagnostic(ts.Diagnostics.File_0_not_found, extendedConfig));
         return undefined;
     }
-    function getExtendedConfig(sourceFile, extendedConfigPath, host, basePath, resolutionStack, errors) {
+    function getExtendedConfig(sourceFile, extendedConfigPath, host, basePath, resolutionStack, errors, extendedConfigCache) {
         var _a;
-        var extendedResult = readJsonConfigFile(extendedConfigPath, function (path) { return host.readFile(path); });
+        var path = host.useCaseSensitiveFileNames ? extendedConfigPath : ts.toLowerCase(extendedConfigPath);
+        var value;
+        var extendedResult;
+        var extendedConfig;
+        if (extendedConfigCache && (value = extendedConfigCache.get(path))) {
+            (extendedResult = value.extendedResult, extendedConfig = value.extendedConfig);
+        }
+        else {
+            extendedResult = readJsonConfigFile(extendedConfigPath, function (path) { return host.readFile(path); });
+            if (!extendedResult.parseDiagnostics.length) {
+                var extendedDirname = ts.getDirectoryPath(extendedConfigPath);
+                extendedConfig = parseConfig(/*json*/ undefined, extendedResult, host, extendedDirname, ts.getBaseFileName(extendedConfigPath), resolutionStack, errors, extendedConfigCache);
+                if (isSuccessfulParsedTsconfig(extendedConfig)) {
+                    // Update the paths to reflect base path
+                    var relativeDifference_1 = ts.convertToRelativePath(extendedDirname, basePath, ts.identity);
+                    var updatePath_1 = function (path) { return ts.isRootedDiskPath(path) ? path : ts.combinePaths(relativeDifference_1, path); };
+                    var mapPropertiesInRawIfNotUndefined = function (propertyName) {
+                        if (raw_2[propertyName]) {
+                            raw_2[propertyName] = ts.map(raw_2[propertyName], updatePath_1);
+                        }
+                    };
+                    var raw_2 = extendedConfig.raw;
+                    mapPropertiesInRawIfNotUndefined("include");
+                    mapPropertiesInRawIfNotUndefined("exclude");
+                    mapPropertiesInRawIfNotUndefined("files");
+                }
+            }
+            if (extendedConfigCache) {
+                extendedConfigCache.set(path, { extendedResult: extendedResult, extendedConfig: extendedConfig });
+            }
+        }
         if (sourceFile) {
             sourceFile.extendedSourceFiles = [extendedResult.fileName];
+            if (extendedResult.extendedSourceFiles) {
+                (_a = sourceFile.extendedSourceFiles).push.apply(_a, extendedResult.extendedSourceFiles);
+            }
         }
         if (extendedResult.parseDiagnostics.length) {
             errors.push.apply(errors, extendedResult.parseDiagnostics);
             return undefined;
         }
-        var extendedDirname = ts.getDirectoryPath(extendedConfigPath);
-        var extendedConfig = parseConfig(/*json*/ undefined, extendedResult, host, extendedDirname, ts.getBaseFileName(extendedConfigPath), resolutionStack, errors);
-        if (sourceFile && extendedResult.extendedSourceFiles) {
-            (_a = sourceFile.extendedSourceFiles).push.apply(_a, extendedResult.extendedSourceFiles);
-        }
-        if (isSuccessfulParsedTsconfig(extendedConfig)) {
-            // Update the paths to reflect base path
-            var relativeDifference_1 = ts.convertToRelativePath(extendedDirname, basePath, ts.identity);
-            var updatePath_1 = function (path) { return ts.isRootedDiskPath(path) ? path : ts.combinePaths(relativeDifference_1, path); };
-            var mapPropertiesInRawIfNotUndefined = function (propertyName) {
-                if (raw_2[propertyName]) {
-                    raw_2[propertyName] = ts.map(raw_2[propertyName], updatePath_1);
-                }
-            };
-            var raw_2 = extendedConfig.raw;
-            mapPropertiesInRawIfNotUndefined("include");
-            mapPropertiesInRawIfNotUndefined("exclude");
-            mapPropertiesInRawIfNotUndefined("files");
-        }
         return extendedConfig;
     }
     function convertCompileOnSaveOptionFromJson(jsonOption, basePath, errors) {
@@ -26093,11 +26521,22 @@ var ts;
         return !!compilerOptions.traceResolution && host.trace !== undefined;
     }
     ts.isTraceEnabled = isTraceEnabled;
-    function withPackageId(packageId, r) {
+    function withPackageId(packageInfo, r) {
+        var packageId;
+        if (r && packageInfo) {
+            var packageJsonContent = packageInfo.packageJsonContent;
+            if (typeof packageJsonContent.name === "string" && typeof packageJsonContent.version === "string") {
+                packageId = {
+                    name: packageJsonContent.name,
+                    subModuleName: r.path.slice(packageInfo.packageDirectory.length + ts.directorySeparator.length),
+                    version: packageJsonContent.version
+                };
+            }
+        }
         return r && { path: r.path, extension: r.ext, packageId: packageId };
     }
     function noPackageId(r) {
-        return withPackageId(/*packageId*/ undefined, r);
+        return withPackageId(/*packageInfo*/ undefined, r);
     }
     function removeIgnoredPackageId(r) {
         if (r) {
@@ -26149,8 +26588,15 @@ var ts;
     }
     function readPackageJsonPathField(jsonContent, fieldName, baseDirectory, state) {
         var fileName = readPackageJsonField(jsonContent, fieldName, "string", state);
-        if (fileName === undefined)
+        if (fileName === undefined) {
             return;
+        }
+        if (!fileName) {
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.package_json_had_a_falsy_0_field, fieldName);
+            }
+            return;
+        }
         var path = ts.normalizePath(ts.combinePaths(baseDirectory, fileName));
         if (state.traceEnabled) {
             trace(state.host, ts.Diagnostics.package_json_has_0_field_1_that_references_2, fieldName, fileName, path);
@@ -26303,7 +26749,12 @@ var ts;
             var fileName = resolved.fileName, packageId = resolved.packageId;
             var resolvedFileName = options.preserveSymlinks ? fileName : realPath(fileName, host, traceEnabled);
             if (traceEnabled) {
-                trace(host, ts.Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2, typeReferenceDirectiveName, resolvedFileName, primary);
+                if (packageId) {
+                    trace(host, ts.Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_with_Package_ID_2_primary_Colon_3, typeReferenceDirectiveName, resolvedFileName, ts.packageIdToString(packageId), primary);
+                }
+                else {
+                    trace(host, ts.Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2, typeReferenceDirectiveName, resolvedFileName, primary);
+                }
             }
             resolvedTypeReferenceDirective = { primary: primary, resolvedFileName: resolvedFileName, packageId: packageId, isExternalLibraryImport: pathContainsNodeModules(fileName) };
         }
@@ -26405,20 +26856,28 @@ var ts;
         return result;
     }
     ts.getAutomaticTypeDirectiveNames = getAutomaticTypeDirectiveNames;
-    function createModuleResolutionCache(currentDirectory, getCanonicalFileName) {
-        return createModuleResolutionCacheWithMaps(createCacheWithRedirects(), createCacheWithRedirects(), currentDirectory, getCanonicalFileName);
+    function createModuleResolutionCache(currentDirectory, getCanonicalFileName, options) {
+        return createModuleResolutionCacheWithMaps(createCacheWithRedirects(options), createCacheWithRedirects(options), currentDirectory, getCanonicalFileName);
     }
     ts.createModuleResolutionCache = createModuleResolutionCache;
     /*@internal*/
-    function createCacheWithRedirects() {
+    function createCacheWithRedirects(options) {
         var ownMap = ts.createMap();
         var redirectsMap = ts.createMap();
         return {
             ownMap: ownMap,
             redirectsMap: redirectsMap,
             getOrCreateMapOfCacheRedirects: getOrCreateMapOfCacheRedirects,
-            clear: clear
+            clear: clear,
+            setOwnOptions: setOwnOptions,
+            setOwnMap: setOwnMap
         };
+        function setOwnOptions(newOptions) {
+            options = newOptions;
+        }
+        function setOwnMap(newOwnMap) {
+            ownMap = newOwnMap;
+        }
         function getOrCreateMapOfCacheRedirects(redirectedReference) {
             if (!redirectedReference) {
                 return ownMap;
@@ -26426,7 +26885,8 @@ var ts;
             var path = redirectedReference.sourceFile.path;
             var redirects = redirectsMap.get(path);
             if (!redirects) {
-                redirects = ts.createMap();
+                // Reuse map if redirected reference map uses same resolution
+                redirects = !options || ts.optionsHaveModuleResolutionChanges(options, redirectedReference.commandLine.options) ? ts.createMap() : ownMap;
                 redirectsMap.set(path, redirects);
             }
             return redirects;
@@ -26439,7 +26899,7 @@ var ts;
     ts.createCacheWithRedirects = createCacheWithRedirects;
     /*@internal*/
     function createModuleResolutionCacheWithMaps(directoryToModuleNameMap, moduleNameToDirectoryMap, currentDirectory, getCanonicalFileName) {
-        return { getOrCreateCacheForDirectory: getOrCreateCacheForDirectory, getOrCreateCacheForModuleName: getOrCreateCacheForModuleName };
+        return { getOrCreateCacheForDirectory: getOrCreateCacheForDirectory, getOrCreateCacheForModuleName: getOrCreateCacheForModuleName, directoryToModuleNameMap: directoryToModuleNameMap, moduleNameToDirectoryMap: moduleNameToDirectoryMap };
         function getOrCreateCacheForDirectory(directoryName, redirectedReference) {
             var path = ts.toPath(directoryName, currentDirectory, getCanonicalFileName);
             return getOrCreateCache(directoryToModuleNameMap, redirectedReference, path, ts.createMap);
@@ -26582,7 +27042,12 @@ var ts;
         }
         if (traceEnabled) {
             if (result.resolvedModule) {
-                trace(host, ts.Diagnostics.Module_name_0_was_successfully_resolved_to_1, moduleName, result.resolvedModule.resolvedFileName);
+                if (result.resolvedModule.packageId) {
+                    trace(host, ts.Diagnostics.Module_name_0_was_successfully_resolved_to_1_with_Package_ID_2, moduleName, result.resolvedModule.resolvedFileName, ts.packageIdToString(result.resolvedModule.packageId));
+                }
+                else {
+                    trace(host, ts.Diagnostics.Module_name_0_was_successfully_resolved_to_1, moduleName, result.resolvedModule.resolvedFileName);
+                }
             }
             else {
                 trace(host, ts.Diagnostics.Module_name_0_was_not_resolved, moduleName);
@@ -26852,10 +27317,9 @@ var ts;
             }
             var resolvedFromFile = loadModuleFromFile(extensions, candidate, onlyRecordFailures, state);
             if (resolvedFromFile) {
-                var nm = considerPackageJson ? parseNodeModuleFromPath(resolvedFromFile) : undefined;
-                var packageInfo = nm && getPackageJsonInfo(nm.packageDirectory, nm.subModuleName, /*onlyRecordFailures*/ false, state);
-                var packageId = packageInfo && packageInfo.packageId;
-                return withPackageId(packageId, resolvedFromFile);
+                var packageDirectory = considerPackageJson ? parseNodeModuleFromPath(resolvedFromFile) : undefined;
+                var packageInfo = packageDirectory ? getPackageJsonInfo(packageDirectory, /*onlyRecordFailures*/ false, state) : undefined;
+                return withPackageId(packageInfo, resolvedFromFile);
             }
         }
         if (!onlyRecordFailures) {
@@ -26881,11 +27345,10 @@ var ts;
      * (Not neeeded for `loadModuleFromNodeModules` as that looks up the `package.json` as part of resolution.)
      *
      * packageDirectory is the directory of the package itself.
-     * subModuleName is the path within the package.
-     *   For `blah/node_modules/foo/index.d.ts` this is { packageDirectory: "foo", subModuleName: "index.d.ts" }. (Part before "/node_modules/" is ignored.)
-     *   For `/node_modules/foo/bar.d.ts` this is { packageDirectory: "foo", subModuleName": "bar/index.d.ts" }.
-     *   For `/node_modules/@types/foo/bar/index.d.ts` this is { packageDirectory: "@types/foo", subModuleName: "bar/index.d.ts" }.
-     *   For `/node_modules/foo/bar/index.d.ts` this is { packageDirectory: "foo", subModuleName": "bar/index.d.ts" }.
+     *   For `blah/node_modules/foo/index.d.ts` this is packageDirectory: "foo"
+     *   For `/node_modules/foo/bar.d.ts` this is packageDirectory: "foo"
+     *   For `/node_modules/@types/foo/bar/index.d.ts` this is packageDirectory: "@types/foo"
+     *   For `/node_modules/foo/bar/index.d.ts` this is packageDirectory: "foo"
      */
     function parseNodeModuleFromPath(resolved) {
         var path = ts.normalizePath(resolved.path);
@@ -26898,26 +27361,12 @@ var ts;
         if (path.charCodeAt(indexAfterNodeModules) === 64 /* at */) {
             indexAfterPackageName = moveToNextDirectorySeparatorIfAvailable(path, indexAfterPackageName);
         }
-        var packageDirectory = path.slice(0, indexAfterPackageName);
-        var subModuleName = ts.removeExtension(path.slice(indexAfterPackageName + 1), resolved.ext) + ".d.ts" /* Dts */;
-        return { packageDirectory: packageDirectory, subModuleName: subModuleName };
+        return path.slice(0, indexAfterPackageName);
     }
     function moveToNextDirectorySeparatorIfAvailable(path, prevSeparatorIndex) {
         var nextSeparatorIndex = path.indexOf(ts.directorySeparator, prevSeparatorIndex + 1);
         return nextSeparatorIndex === -1 ? prevSeparatorIndex : nextSeparatorIndex;
     }
-    function addExtensionAndIndex(path) {
-        if (path === "") {
-            return "index.d.ts";
-        }
-        if (ts.endsWith(path, ".d.ts")) {
-            return path;
-        }
-        if (path === "index" || ts.endsWith(path, "/index")) {
-            return path + ".d.ts";
-        }
-        return path + "/index.d.ts";
-    }
     function loadModuleFromFileNoPackageId(extensions, candidate, onlyRecordFailures, state) {
         return noPackageId(loadModuleFromFile(extensions, candidate, onlyRecordFailures, state));
     }
@@ -26991,52 +27440,22 @@ var ts;
     }
     function loadNodeModuleFromDirectory(extensions, candidate, onlyRecordFailures, state, considerPackageJson) {
         if (considerPackageJson === void 0) { considerPackageJson = true; }
-        var packageInfo = considerPackageJson ? getPackageJsonInfo(candidate, "", onlyRecordFailures, state) : undefined;
-        var packageId = packageInfo && packageInfo.packageId;
+        var packageInfo = considerPackageJson ? getPackageJsonInfo(candidate, onlyRecordFailures, state) : undefined;
         var packageJsonContent = packageInfo && packageInfo.packageJsonContent;
-        var versionPaths = packageJsonContent && readPackageJsonTypesVersionPaths(packageJsonContent, state);
-        return withPackageId(packageId, loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageJsonContent, versionPaths));
+        var versionPaths = packageInfo && packageInfo.versionPaths;
+        return withPackageId(packageInfo, loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageJsonContent, versionPaths));
     }
-    function getPackageJsonInfo(packageDirectory, subModuleName, onlyRecordFailures, state) {
+    function getPackageJsonInfo(packageDirectory, onlyRecordFailures, state) {
         var host = state.host, traceEnabled = state.traceEnabled;
         var directoryExists = !onlyRecordFailures && ts.directoryProbablyExists(packageDirectory, host);
         var packageJsonPath = ts.combinePaths(packageDirectory, "package.json");
         if (directoryExists && host.fileExists(packageJsonPath)) {
             var packageJsonContent = ts.readJson(packageJsonPath, host);
-            if (subModuleName === "") { // looking up the root - need to handle types/typings/main redirects for subModuleName
-                var path = readPackageJsonTypesFields(packageJsonContent, packageDirectory, state);
-                if (typeof path === "string") {
-                    subModuleName = addExtensionAndIndex(path.substring(packageDirectory.length + 1));
-                }
-                else {
-                    var jsPath = readPackageJsonMainField(packageJsonContent, packageDirectory, state);
-                    if (typeof jsPath === "string" && jsPath.length > packageDirectory.length) {
-                        var potentialSubModule_1 = jsPath.substring(packageDirectory.length + 1);
-                        subModuleName = (ts.forEach(ts.supportedJSExtensions, function (extension) {
-                            return ts.tryRemoveExtension(potentialSubModule_1, extension);
-                        }) || potentialSubModule_1) + ".d.ts" /* Dts */;
-                    }
-                    else {
-                        subModuleName = "index.d.ts";
-                    }
-                }
-            }
-            if (!ts.endsWith(subModuleName, ".d.ts" /* Dts */)) {
-                subModuleName = addExtensionAndIndex(subModuleName);
+            if (traceEnabled) {
+                trace(host, ts.Diagnostics.Found_package_json_at_0, packageJsonPath);
             }
             var versionPaths = readPackageJsonTypesVersionPaths(packageJsonContent, state);
-            var packageId = typeof packageJsonContent.name === "string" && typeof packageJsonContent.version === "string"
-                ? { name: packageJsonContent.name, subModuleName: subModuleName, version: packageJsonContent.version }
-                : undefined;
-            if (traceEnabled) {
-                if (packageId) {
-                    trace(host, ts.Diagnostics.Found_package_json_at_0_Package_ID_is_1, packageJsonPath, ts.packageIdToString(packageId));
-                }
-                else {
-                    trace(host, ts.Diagnostics.Found_package_json_at_0, packageJsonPath);
-                }
-            }
-            return { packageJsonContent: packageJsonContent, packageId: packageId, versionPaths: versionPaths };
+            return { packageDirectory: packageDirectory, packageJsonContent: packageJsonContent, versionPaths: versionPaths };
         }
         else {
             if (directoryExists && traceEnabled) {
@@ -27175,37 +27594,31 @@ var ts;
     function loadModuleFromSpecificNodeModulesDirectory(extensions, moduleName, nodeModulesDirectory, nodeModulesDirectoryExists, state) {
         var candidate = ts.normalizePath(ts.combinePaths(nodeModulesDirectory, moduleName));
         // First look for a nested package.json, as in `node_modules/foo/bar/package.json`.
-        var packageJsonContent;
-        var packageId;
-        var versionPaths;
-        var packageInfo = getPackageJsonInfo(candidate, "", !nodeModulesDirectoryExists, state);
+        var packageInfo = getPackageJsonInfo(candidate, !nodeModulesDirectoryExists, state);
         if (packageInfo) {
-            (packageJsonContent = packageInfo.packageJsonContent, packageId = packageInfo.packageId, versionPaths = packageInfo.versionPaths);
             var fromFile = loadModuleFromFile(extensions, candidate, !nodeModulesDirectoryExists, state);
             if (fromFile) {
                 return noPackageId(fromFile);
             }
-            var fromDirectory = loadNodeModuleFromDirectoryWorker(extensions, candidate, !nodeModulesDirectoryExists, state, packageJsonContent, versionPaths);
-            return withPackageId(packageId, fromDirectory);
+            var fromDirectory = loadNodeModuleFromDirectoryWorker(extensions, candidate, !nodeModulesDirectoryExists, state, packageInfo.packageJsonContent, packageInfo.versionPaths);
+            return withPackageId(packageInfo, fromDirectory);
         }
         var loader = function (extensions, candidate, onlyRecordFailures, state) {
             var pathAndExtension = loadModuleFromFile(extensions, candidate, onlyRecordFailures, state) ||
-                loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageJsonContent, versionPaths);
-            return withPackageId(packageId, pathAndExtension);
+                loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageInfo && packageInfo.packageJsonContent, packageInfo && packageInfo.versionPaths);
+            return withPackageId(packageInfo, pathAndExtension);
         };
         var _a = parsePackageName(moduleName), packageName = _a.packageName, rest = _a.rest;
         if (rest !== "") { // If "rest" is empty, we just did this search above.
             var packageDirectory = ts.combinePaths(nodeModulesDirectory, packageName);
             // Don't use a "types" or "main" from here because we're not loading the root, but a subdirectory -- just here for the packageId and path mappings.
-            var packageInfo_1 = getPackageJsonInfo(packageDirectory, rest, !nodeModulesDirectoryExists, state);
-            if (packageInfo_1)
-                (packageId = packageInfo_1.packageId, versionPaths = packageInfo_1.versionPaths);
-            if (versionPaths) {
+            packageInfo = getPackageJsonInfo(packageDirectory, !nodeModulesDirectoryExists, state);
+            if (packageInfo && packageInfo.versionPaths) {
                 if (state.traceEnabled) {
-                    trace(state.host, ts.Diagnostics.package_json_has_a_typesVersions_entry_0_that_matches_compiler_version_1_looking_for_a_pattern_to_match_module_name_2, versionPaths.version, ts.version, rest);
+                    trace(state.host, ts.Diagnostics.package_json_has_a_typesVersions_entry_0_that_matches_compiler_version_1_looking_for_a_pattern_to_match_module_name_2, packageInfo.versionPaths.version, ts.version, rest);
                 }
                 var packageDirectoryExists = nodeModulesDirectoryExists && ts.directoryProbablyExists(packageDirectory, state.host);
-                var fromPaths = tryLoadModuleUsingPaths(extensions, rest, packageDirectory, versionPaths.paths, loader, !packageDirectoryExists, state);
+                var fromPaths = tryLoadModuleUsingPaths(extensions, rest, packageDirectory, packageInfo.versionPaths.paths, loader, !packageDirectoryExists, state);
                 if (fromPaths) {
                     return fromPaths.value;
                 }
@@ -27333,8 +27746,8 @@ var ts;
     }
     ts.classicNameResolver = classicNameResolver;
     /**
-     * LSHost may load a module from a global cache of typings.
-     * This is the minumum code needed to expose that functionality; the rest is in LSHost.
+     * A host may load a module from a global cache of typings.
+     * This is the minumum code needed to expose that functionality; the rest is in the host.
      */
     /* @internal */
     function loadModuleFromGlobalCache(moduleName, projectName, compilerOptions, host, globalCache) {
@@ -27373,24 +27786,24 @@ var ts;
         // A module is uninstantiated if it contains only
         switch (node.kind) {
             // 1. interface declarations, type alias declarations
-            case 241 /* InterfaceDeclaration */:
-            case 242 /* TypeAliasDeclaration */:
+            case 242 /* InterfaceDeclaration */:
+            case 243 /* TypeAliasDeclaration */:
                 return 0 /* NonInstantiated */;
             // 2. const enum declarations
-            case 243 /* EnumDeclaration */:
+            case 244 /* EnumDeclaration */:
                 if (ts.isEnumConst(node)) {
                     return 2 /* ConstEnumOnly */;
                 }
                 break;
             // 3. non-exported import declarations
-            case 249 /* ImportDeclaration */:
-            case 248 /* ImportEqualsDeclaration */:
+            case 250 /* ImportDeclaration */:
+            case 249 /* ImportEqualsDeclaration */:
                 if (!(ts.hasModifier(node, 1 /* Export */))) {
                     return 0 /* NonInstantiated */;
                 }
                 break;
             // 4. other uninstantiated module declarations.
-            case 245 /* ModuleBlock */: {
+            case 246 /* ModuleBlock */: {
                 var state_1 = 0 /* NonInstantiated */;
                 ts.forEachChild(node, function (n) {
                     var childState = getModuleInstanceStateWorker(n);
@@ -27412,9 +27825,9 @@ var ts;
                 });
                 return state_1;
             }
-            case 244 /* ModuleDeclaration */:
+            case 245 /* ModuleDeclaration */:
                 return getModuleInstanceState(node);
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 // Only jsdoc typedef definition can exist in jsdoc namespace, and it should
                 // be considered the same as type alias
                 if (node.isInJSDocNamespace) {
@@ -27580,7 +27993,7 @@ var ts;
         // Should not be called on a declaration with a computed property name,
         // unless it is a well known Symbol.
         function getDeclarationName(node) {
-            if (node.kind === 254 /* ExportAssignment */) {
+            if (node.kind === 255 /* ExportAssignment */) {
                 return node.isExportEquals ? "export=" /* ExportEquals */ : "default" /* Default */;
             }
             var name = ts.getNameOfDeclaration(node);
@@ -27589,48 +28002,51 @@ var ts;
                     var moduleName = ts.getTextOfIdentifierOrLiteral(name);
                     return (ts.isGlobalScopeAugmentation(node) ? "__global" : "\"" + moduleName + "\"");
                 }
-                if (name.kind === 149 /* ComputedPropertyName */) {
+                if (name.kind === 150 /* ComputedPropertyName */) {
                     var nameExpression = name.expression;
                     // treat computed property names where expression is string/numeric literal as just string/numeric literal
                     if (ts.isStringOrNumericLiteralLike(nameExpression)) {
                         return ts.escapeLeadingUnderscores(nameExpression.text);
                     }
+                    if (ts.isSignedNumericLiteral(nameExpression)) {
+                        return ts.tokenToString(nameExpression.operator) + nameExpression.operand.text;
+                    }
                     ts.Debug.assert(ts.isWellKnownSymbolSyntactically(nameExpression));
                     return ts.getPropertyNameForKnownSymbolName(ts.idText(nameExpression.name));
                 }
                 return ts.isPropertyNameLiteral(name) ? ts.getEscapedTextOfIdentifierOrLiteral(name) : undefined;
             }
             switch (node.kind) {
-                case 157 /* Constructor */:
+                case 158 /* Constructor */:
                     return "__constructor" /* Constructor */;
-                case 165 /* FunctionType */:
-                case 160 /* CallSignature */:
-                case 298 /* JSDocSignature */:
+                case 166 /* FunctionType */:
+                case 161 /* CallSignature */:
+                case 299 /* JSDocSignature */:
                     return "__call" /* Call */;
-                case 166 /* ConstructorType */:
-                case 161 /* ConstructSignature */:
+                case 167 /* ConstructorType */:
+                case 162 /* ConstructSignature */:
                     return "__new" /* New */;
-                case 162 /* IndexSignature */:
+                case 163 /* IndexSignature */:
                     return "__index" /* Index */;
-                case 255 /* ExportDeclaration */:
+                case 256 /* ExportDeclaration */:
                     return "__export" /* ExportStar */;
-                case 284 /* SourceFile */:
+                case 285 /* SourceFile */:
                     // json file should behave as
                     // module.exports = ...
                     return "export=" /* ExportEquals */;
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     if (ts.getAssignmentDeclarationKind(node) === 2 /* ModuleExports */) {
                         // module.exports = ...
                         return "export=" /* ExportEquals */;
                     }
                     ts.Debug.fail("Unknown binary declaration kind");
                     break;
-                case 294 /* JSDocFunctionType */:
+                case 295 /* JSDocFunctionType */:
                     return (ts.isJSDocConstructSignature(node) ? "__new" /* New */ : "__call" /* Call */);
-                case 151 /* Parameter */:
+                case 152 /* Parameter */:
                     // Parameters with names are handled at the top of this function.  Parameters
                     // without names can only come from JSDocFunctionTypes.
-                    ts.Debug.assert(node.parent.kind === 294 /* JSDocFunctionType */, "Impossible parameter parent kind", function () { return "parent is: " + (ts.SyntaxKind ? ts.SyntaxKind[node.parent.kind] : node.parent.kind) + ", expected JSDocFunctionType"; });
+                    ts.Debug.assert(node.parent.kind === 295 /* JSDocFunctionType */, "Impossible parameter parent kind", function () { return "parent is: " + (ts.SyntaxKind ? ts.SyntaxKind[node.parent.kind] : node.parent.kind) + ", expected JSDocFunctionType"; });
                     var functionType = node.parent;
                     var index = functionType.parameters.indexOf(node);
                     return "arg" + index;
@@ -27714,13 +28130,15 @@ var ts;
                             message_1 = ts.Diagnostics.Enum_declarations_can_only_merge_with_namespace_or_other_enum_declarations;
                             messageNeedsName_1 = false;
                         }
-                        if (symbol.declarations && symbol.declarations.length) {
+                        var multipleDefaultExports_1 = false;
+                        if (ts.length(symbol.declarations)) {
                             // If the current node is a default export of some sort, then check if
                             // there are any other default exports that we need to error on.
                             // We'll know whether we have other default exports depending on if `symbol` already has a declaration list set.
                             if (isDefaultExport) {
                                 message_1 = ts.Diagnostics.A_module_cannot_have_multiple_default_exports;
                                 messageNeedsName_1 = false;
+                                multipleDefaultExports_1 = true;
                             }
                             else {
                                 // This is to properly report an error in the case "export default { }" is after export default of class declaration or function declaration.
@@ -27728,17 +28146,25 @@ var ts;
                                 // 1. multiple export default of class declaration or function declaration by checking NodeFlags.Default
                                 // 2. multiple export default of export assignment. This one doesn't have NodeFlags.Default on (as export default doesn't considered as modifiers)
                                 if (symbol.declarations && symbol.declarations.length &&
-                                    (node.kind === 254 /* ExportAssignment */ && !node.isExportEquals)) {
+                                    (node.kind === 255 /* ExportAssignment */ && !node.isExportEquals)) {
                                     message_1 = ts.Diagnostics.A_module_cannot_have_multiple_default_exports;
                                     messageNeedsName_1 = false;
+                                    multipleDefaultExports_1 = true;
                                 }
                             }
                         }
-                        var addError = function (decl) {
-                            file.bindDiagnostics.push(createDiagnosticForNode(ts.getNameOfDeclaration(decl) || decl, message_1, messageNeedsName_1 ? getDisplayName(decl) : undefined));
-                        };
-                        ts.forEach(symbol.declarations, addError);
-                        addError(node);
+                        var declarationName_1 = ts.getNameOfDeclaration(node) || node;
+                        var relatedInformation_1 = [];
+                        ts.forEach(symbol.declarations, function (declaration, index) {
+                            var decl = ts.getNameOfDeclaration(declaration) || declaration;
+                            var diag = createDiagnosticForNode(decl, message_1, messageNeedsName_1 ? getDisplayName(declaration) : undefined);
+                            file.bindDiagnostics.push(multipleDefaultExports_1 ? ts.addRelatedInfo(diag, createDiagnosticForNode(declarationName_1, index === 0 ? ts.Diagnostics.Another_export_default_is_here : ts.Diagnostics.and_here)) : diag);
+                            if (multipleDefaultExports_1) {
+                                relatedInformation_1.push(createDiagnosticForNode(decl, ts.Diagnostics.The_first_export_default_is_here));
+                            }
+                        });
+                        var diag = createDiagnosticForNode(declarationName_1, message_1, messageNeedsName_1 ? getDisplayName(node) : undefined);
+                        file.bindDiagnostics.push(multipleDefaultExports_1 ? ts.addRelatedInfo.apply(void 0, [diag].concat(relatedInformation_1)) : diag);
                         symbol = createSymbol(0 /* None */, name);
                     }
                 }
@@ -27755,7 +28181,7 @@ var ts;
         function declareModuleMember(node, symbolFlags, symbolExcludes) {
             var hasExportModifier = ts.getCombinedModifierFlags(node) & 1 /* Export */;
             if (symbolFlags & 2097152 /* Alias */) {
-                if (node.kind === 257 /* ExportSpecifier */ || (node.kind === 248 /* ImportEqualsDeclaration */ && hasExportModifier)) {
+                if (node.kind === 258 /* ExportSpecifier */ || (node.kind === 249 /* ImportEqualsDeclaration */ && hasExportModifier)) {
                     return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);
                 }
                 else {
@@ -27822,7 +28248,7 @@ var ts;
             // for it.  We must clear this so we don't accidentally move any stale data forward from
             // a previous compilation.
             if (containerFlags & 1 /* IsContainer */) {
-                if (node.kind !== 197 /* ArrowFunction */) {
+                if (node.kind !== 198 /* ArrowFunction */) {
                     thisParentContainer = container;
                 }
                 container = blockScopeContainer = node;
@@ -27855,7 +28281,7 @@ var ts;
                 }
                 // We create a return control flow graph for IIFEs and constructors. For constructors
                 // we use the return control flow graph in strict property initialization checks.
-                currentReturnTarget = isIIFE || node.kind === 157 /* Constructor */ ? createBranchLabel() : undefined;
+                currentReturnTarget = isIIFE || node.kind === 158 /* Constructor */ ? createBranchLabel() : undefined;
                 currentBreakTarget = undefined;
                 currentContinueTarget = undefined;
                 activeLabels = undefined;
@@ -27869,13 +28295,13 @@ var ts;
                     if (hasExplicitReturn)
                         node.flags |= 256 /* HasExplicitReturn */;
                 }
-                if (node.kind === 284 /* SourceFile */) {
+                if (node.kind === 285 /* SourceFile */) {
                     node.flags |= emitFlags;
                 }
                 if (currentReturnTarget) {
                     addAntecedent(currentReturnTarget, currentFlow);
                     currentFlow = finishFlowLabel(currentReturnTarget);
-                    if (node.kind === 157 /* Constructor */) {
+                    if (node.kind === 158 /* Constructor */) {
                         node.returnFlowNode = currentFlow;
                     }
                 }
@@ -27919,8 +28345,8 @@ var ts;
             }
         }
         function bindEachFunctionsFirst(nodes) {
-            bindEach(nodes, function (n) { return n.kind === 239 /* FunctionDeclaration */ ? bind(n) : undefined; });
-            bindEach(nodes, function (n) { return n.kind !== 239 /* FunctionDeclaration */ ? bind(n) : undefined; });
+            bindEach(nodes, function (n) { return n.kind === 240 /* FunctionDeclaration */ ? bind(n) : undefined; });
+            bindEach(nodes, function (n) { return n.kind !== 240 /* FunctionDeclaration */ ? bind(n) : undefined; });
         }
         function bindEach(nodes, bindFunction) {
             if (bindFunction === void 0) { bindFunction = bind; }
@@ -27953,78 +28379,78 @@ var ts;
                 return;
             }
             switch (node.kind) {
-                case 224 /* WhileStatement */:
+                case 225 /* WhileStatement */:
                     bindWhileStatement(node);
                     break;
-                case 223 /* DoStatement */:
+                case 224 /* DoStatement */:
                     bindDoStatement(node);
                     break;
-                case 225 /* ForStatement */:
+                case 226 /* ForStatement */:
                     bindForStatement(node);
                     break;
-                case 226 /* ForInStatement */:
-                case 227 /* ForOfStatement */:
+                case 227 /* ForInStatement */:
+                case 228 /* ForOfStatement */:
                     bindForInOrForOfStatement(node);
                     break;
-                case 222 /* IfStatement */:
+                case 223 /* IfStatement */:
                     bindIfStatement(node);
                     break;
-                case 230 /* ReturnStatement */:
-                case 234 /* ThrowStatement */:
+                case 231 /* ReturnStatement */:
+                case 235 /* ThrowStatement */:
                     bindReturnOrThrow(node);
                     break;
-                case 229 /* BreakStatement */:
-                case 228 /* ContinueStatement */:
+                case 230 /* BreakStatement */:
+                case 229 /* ContinueStatement */:
                     bindBreakOrContinueStatement(node);
                     break;
-                case 235 /* TryStatement */:
+                case 236 /* TryStatement */:
                     bindTryStatement(node);
                     break;
-                case 232 /* SwitchStatement */:
+                case 233 /* SwitchStatement */:
                     bindSwitchStatement(node);
                     break;
-                case 246 /* CaseBlock */:
+                case 247 /* CaseBlock */:
                     bindCaseBlock(node);
                     break;
-                case 271 /* CaseClause */:
+                case 272 /* CaseClause */:
                     bindCaseClause(node);
                     break;
-                case 233 /* LabeledStatement */:
+                case 234 /* LabeledStatement */:
                     bindLabeledStatement(node);
                     break;
-                case 202 /* PrefixUnaryExpression */:
+                case 203 /* PrefixUnaryExpression */:
                     bindPrefixUnaryExpressionFlow(node);
                     break;
-                case 203 /* PostfixUnaryExpression */:
+                case 204 /* PostfixUnaryExpression */:
                     bindPostfixUnaryExpressionFlow(node);
                     break;
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     bindBinaryExpressionFlow(node);
                     break;
-                case 198 /* DeleteExpression */:
+                case 199 /* DeleteExpression */:
                     bindDeleteExpressionFlow(node);
                     break;
-                case 205 /* ConditionalExpression */:
+                case 206 /* ConditionalExpression */:
                     bindConditionalExpressionFlow(node);
                     break;
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     bindVariableDeclarationFlow(node);
                     break;
-                case 191 /* CallExpression */:
+                case 192 /* CallExpression */:
                     bindCallExpressionFlow(node);
                     break;
-                case 309 /* JSDocTypedefTag */:
-                case 302 /* JSDocCallbackTag */:
+                case 311 /* JSDocTypedefTag */:
+                case 304 /* JSDocCallbackTag */:
                     bindJSDocTypeAlias(node);
                     break;
                 // In source files and blocks, bind functions first to match hoisting that occurs at runtime
-                case 284 /* SourceFile */: {
+                case 285 /* SourceFile */: {
                     bindEachFunctionsFirst(node.statements);
                     bind(node.endOfFileToken);
                     break;
                 }
-                case 218 /* Block */:
-                case 245 /* ModuleBlock */:
+                case 219 /* Block */:
+                case 246 /* ModuleBlock */:
                     bindEachFunctionsFirst(node.statements);
                     break;
                 default:
@@ -28035,26 +28461,26 @@ var ts;
         }
         function isNarrowingExpression(expr) {
             switch (expr.kind) {
-                case 72 /* Identifier */:
-                case 100 /* ThisKeyword */:
-                case 189 /* PropertyAccessExpression */:
-                case 190 /* ElementAccessExpression */:
+                case 73 /* Identifier */:
+                case 101 /* ThisKeyword */:
+                case 190 /* PropertyAccessExpression */:
+                case 191 /* ElementAccessExpression */:
                     return isNarrowableReference(expr);
-                case 191 /* CallExpression */:
+                case 192 /* CallExpression */:
                     return hasNarrowableArgument(expr);
-                case 195 /* ParenthesizedExpression */:
+                case 196 /* ParenthesizedExpression */:
                     return isNarrowingExpression(expr.expression);
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return isNarrowingBinaryExpression(expr);
-                case 202 /* PrefixUnaryExpression */:
+                case 203 /* PrefixUnaryExpression */:
                     return expr.operator === 52 /* ExclamationToken */ && isNarrowingExpression(expr.operand);
-                case 199 /* TypeOfExpression */:
+                case 200 /* TypeOfExpression */:
                     return isNarrowingExpression(expr.expression);
             }
             return false;
         }
         function isNarrowableReference(expr) {
-            return expr.kind === 72 /* Identifier */ || expr.kind === 100 /* ThisKeyword */ || expr.kind === 98 /* SuperKeyword */ ||
+            return expr.kind === 73 /* Identifier */ || expr.kind === 101 /* ThisKeyword */ || expr.kind === 99 /* SuperKeyword */ ||
                 (ts.isPropertyAccessExpression(expr) || ts.isNonNullExpression(expr) || ts.isParenthesizedExpression(expr)) && isNarrowableReference(expr.expression) ||
                 ts.isElementAccessExpression(expr) && expr.argumentExpression &&
                     (ts.isStringLiteral(expr.argumentExpression) || ts.isNumericLiteral(expr.argumentExpression)) &&
@@ -28069,7 +28495,7 @@ var ts;
                     }
                 }
             }
-            if (expr.expression.kind === 189 /* PropertyAccessExpression */ &&
+            if (expr.expression.kind === 190 /* PropertyAccessExpression */ &&
                 isNarrowableReference(expr.expression.expression)) {
                 return true;
             }
@@ -28083,7 +28509,7 @@ var ts;
         }
         function isNarrowingBinaryExpression(expr) {
             switch (expr.operatorToken.kind) {
-                case 59 /* EqualsToken */:
+                case 60 /* EqualsToken */:
                     return isNarrowableReference(expr.left);
                 case 33 /* EqualsEqualsToken */:
                 case 34 /* ExclamationEqualsToken */:
@@ -28091,9 +28517,9 @@ var ts;
                 case 36 /* ExclamationEqualsEqualsToken */:
                     return isNarrowableOperand(expr.left) || isNarrowableOperand(expr.right) ||
                         isNarrowingTypeofOperands(expr.right, expr.left) || isNarrowingTypeofOperands(expr.left, expr.right);
-                case 94 /* InstanceOfKeyword */:
+                case 95 /* InstanceOfKeyword */:
                     return isNarrowableOperand(expr.left);
-                case 93 /* InKeyword */:
+                case 94 /* InKeyword */:
                     return isNarrowableInOperands(expr.left, expr.right);
                 case 27 /* CommaToken */:
                     return isNarrowingExpression(expr.right);
@@ -28102,11 +28528,11 @@ var ts;
         }
         function isNarrowableOperand(expr) {
             switch (expr.kind) {
-                case 195 /* ParenthesizedExpression */:
+                case 196 /* ParenthesizedExpression */:
                     return isNarrowableOperand(expr.expression);
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     switch (expr.operatorToken.kind) {
-                        case 59 /* EqualsToken */:
+                        case 60 /* EqualsToken */:
                             return isNarrowableOperand(expr.left);
                         case 27 /* CommaToken */:
                             return isNarrowableOperand(expr.right);
@@ -28143,8 +28569,8 @@ var ts;
             if (!expression) {
                 return flags & 32 /* TrueCondition */ ? antecedent : unreachableFlow;
             }
-            if (expression.kind === 102 /* TrueKeyword */ && flags & 64 /* FalseCondition */ ||
-                expression.kind === 87 /* FalseKeyword */ && flags & 32 /* TrueCondition */) {
+            if (expression.kind === 103 /* TrueKeyword */ && flags & 64 /* FalseCondition */ ||
+                expression.kind === 88 /* FalseKeyword */ && flags & 32 /* TrueCondition */) {
                 return unreachableFlow;
             }
             if (!isNarrowingExpression(expression)) {
@@ -28182,33 +28608,33 @@ var ts;
         function isStatementCondition(node) {
             var parent = node.parent;
             switch (parent.kind) {
-                case 222 /* IfStatement */:
-                case 224 /* WhileStatement */:
-                case 223 /* DoStatement */:
+                case 223 /* IfStatement */:
+                case 225 /* WhileStatement */:
+                case 224 /* DoStatement */:
                     return parent.expression === node;
-                case 225 /* ForStatement */:
-                case 205 /* ConditionalExpression */:
+                case 226 /* ForStatement */:
+                case 206 /* ConditionalExpression */:
                     return parent.condition === node;
             }
             return false;
         }
         function isLogicalExpression(node) {
             while (true) {
-                if (node.kind === 195 /* ParenthesizedExpression */) {
+                if (node.kind === 196 /* ParenthesizedExpression */) {
                     node = node.expression;
                 }
-                else if (node.kind === 202 /* PrefixUnaryExpression */ && node.operator === 52 /* ExclamationToken */) {
+                else if (node.kind === 203 /* PrefixUnaryExpression */ && node.operator === 52 /* ExclamationToken */) {
                     node = node.operand;
                 }
                 else {
-                    return node.kind === 204 /* BinaryExpression */ && (node.operatorToken.kind === 54 /* AmpersandAmpersandToken */ ||
+                    return node.kind === 205 /* BinaryExpression */ && (node.operatorToken.kind === 54 /* AmpersandAmpersandToken */ ||
                         node.operatorToken.kind === 55 /* BarBarToken */);
                 }
             }
         }
         function isTopLevelLogicalExpression(node) {
-            while (node.parent.kind === 195 /* ParenthesizedExpression */ ||
-                node.parent.kind === 202 /* PrefixUnaryExpression */ &&
+            while (node.parent.kind === 196 /* ParenthesizedExpression */ ||
+                node.parent.kind === 203 /* PrefixUnaryExpression */ &&
                     node.parent.operator === 52 /* ExclamationToken */) {
                 node = node.parent;
             }
@@ -28250,7 +28676,7 @@ var ts;
         }
         function bindDoStatement(node) {
             var preDoLabel = createLoopLabel();
-            var enclosingLabeledStatement = node.parent.kind === 233 /* LabeledStatement */
+            var enclosingLabeledStatement = node.parent.kind === 234 /* LabeledStatement */
                 ? ts.lastOrUndefined(activeLabels)
                 : undefined;
             // if do statement is wrapped in labeled statement then target labels for break/continue with or without
@@ -28284,13 +28710,13 @@ var ts;
             var postLoopLabel = createBranchLabel();
             addAntecedent(preLoopLabel, currentFlow);
             currentFlow = preLoopLabel;
-            if (node.kind === 227 /* ForOfStatement */) {
+            if (node.kind === 228 /* ForOfStatement */) {
                 bind(node.awaitModifier);
             }
             bind(node.expression);
             addAntecedent(postLoopLabel, currentFlow);
             bind(node.initializer);
-            if (node.initializer.kind !== 238 /* VariableDeclarationList */) {
+            if (node.initializer.kind !== 239 /* VariableDeclarationList */) {
                 bindAssignmentTargetFlow(node.initializer);
             }
             bindIterativeStatement(node.statement, postLoopLabel, preLoopLabel);
@@ -28312,7 +28738,7 @@ var ts;
         }
         function bindReturnOrThrow(node) {
             bind(node.expression);
-            if (node.kind === 230 /* ReturnStatement */) {
+            if (node.kind === 231 /* ReturnStatement */) {
                 hasExplicitReturn = true;
                 if (currentReturnTarget) {
                     addAntecedent(currentReturnTarget, currentFlow);
@@ -28332,7 +28758,7 @@ var ts;
             return undefined;
         }
         function bindBreakOrContinueFlow(node, breakTarget, continueTarget) {
-            var flowLabel = node.kind === 229 /* BreakStatement */ ? breakTarget : continueTarget;
+            var flowLabel = node.kind === 230 /* BreakStatement */ ? breakTarget : continueTarget;
             if (flowLabel) {
                 addAntecedent(flowLabel, currentFlow);
                 currentFlow = unreachableFlow;
@@ -28460,7 +28886,7 @@ var ts;
             preSwitchCaseFlow = currentFlow;
             bind(node.caseBlock);
             addAntecedent(postSwitchLabel, currentFlow);
-            var hasDefault = ts.forEach(node.caseBlock.clauses, function (c) { return c.kind === 272 /* DefaultClause */; });
+            var hasDefault = ts.forEach(node.caseBlock.clauses, function (c) { return c.kind === 273 /* DefaultClause */; });
             // We mark a switch statement as possibly exhaustive if it has no default clause and if all
             // case clauses have unreachable end points (e.g. they all return).
             node.possiblyExhaustive = !hasDefault && !postSwitchLabel.antecedents;
@@ -28527,14 +28953,14 @@ var ts;
             if (!activeLabel.referenced && !options.allowUnusedLabels) {
                 errorOrSuggestionOnNode(ts.unusedLabelIsError(options), node.label, ts.Diagnostics.Unused_label);
             }
-            if (!node.statement || node.statement.kind !== 223 /* DoStatement */) {
+            if (!node.statement || node.statement.kind !== 224 /* DoStatement */) {
                 // do statement sets current flow inside bindDoStatement
                 addAntecedent(postStatementLabel, currentFlow);
                 currentFlow = finishFlowLabel(postStatementLabel);
             }
         }
         function bindDestructuringTargetFlow(node) {
-            if (node.kind === 204 /* BinaryExpression */ && node.operatorToken.kind === 59 /* EqualsToken */) {
+            if (node.kind === 205 /* BinaryExpression */ && node.operatorToken.kind === 60 /* EqualsToken */) {
                 bindAssignmentTargetFlow(node.left);
             }
             else {
@@ -28545,10 +28971,10 @@ var ts;
             if (isNarrowableReference(node)) {
                 currentFlow = createFlowAssignment(currentFlow, node);
             }
-            else if (node.kind === 187 /* ArrayLiteralExpression */) {
+            else if (node.kind === 188 /* ArrayLiteralExpression */) {
                 for (var _i = 0, _a = node.elements; _i < _a.length; _i++) {
                     var e = _a[_i];
-                    if (e.kind === 208 /* SpreadElement */) {
+                    if (e.kind === 209 /* SpreadElement */) {
                         bindAssignmentTargetFlow(e.expression);
                     }
                     else {
@@ -28556,16 +28982,16 @@ var ts;
                     }
                 }
             }
-            else if (node.kind === 188 /* ObjectLiteralExpression */) {
+            else if (node.kind === 189 /* ObjectLiteralExpression */) {
                 for (var _b = 0, _c = node.properties; _b < _c.length; _b++) {
                     var p = _c[_b];
-                    if (p.kind === 275 /* PropertyAssignment */) {
+                    if (p.kind === 276 /* PropertyAssignment */) {
                         bindDestructuringTargetFlow(p.initializer);
                     }
-                    else if (p.kind === 276 /* ShorthandPropertyAssignment */) {
+                    else if (p.kind === 277 /* ShorthandPropertyAssignment */) {
                         bindAssignmentTargetFlow(p.name);
                     }
-                    else if (p.kind === 277 /* SpreadAssignment */) {
+                    else if (p.kind === 278 /* SpreadAssignment */) {
                         bindAssignmentTargetFlow(p.expression);
                     }
                 }
@@ -28621,7 +29047,7 @@ var ts;
                 bindEachChild(node);
                 if (ts.isAssignmentOperator(operator) && !ts.isAssignmentTarget(node)) {
                     bindAssignmentTargetFlow(node.left);
-                    if (operator === 59 /* EqualsToken */ && node.left.kind === 190 /* ElementAccessExpression */) {
+                    if (operator === 60 /* EqualsToken */ && node.left.kind === 191 /* ElementAccessExpression */) {
                         var elementAccess = node.left;
                         if (isNarrowableOperand(elementAccess.expression)) {
                             currentFlow = createFlowArrayMutation(currentFlow, node);
@@ -28632,7 +29058,7 @@ var ts;
         }
         function bindDeleteExpressionFlow(node) {
             bindEachChild(node);
-            if (node.expression.kind === 189 /* PropertyAccessExpression */) {
+            if (node.expression.kind === 190 /* PropertyAccessExpression */) {
                 bindAssignmentTargetFlow(node.expression);
             }
         }
@@ -28680,10 +29106,10 @@ var ts;
             // an immediately invoked function expression (IIFE). Initialize the flowNode property to
             // the current control flow (which includes evaluation of the IIFE arguments).
             var expr = node.expression;
-            while (expr.kind === 195 /* ParenthesizedExpression */) {
+            while (expr.kind === 196 /* ParenthesizedExpression */) {
                 expr = expr.expression;
             }
-            if (expr.kind === 196 /* FunctionExpression */ || expr.kind === 197 /* ArrowFunction */) {
+            if (expr.kind === 197 /* FunctionExpression */ || expr.kind === 198 /* ArrowFunction */) {
                 bindEach(node.typeArguments);
                 bindEach(node.arguments);
                 bind(node.expression);
@@ -28691,7 +29117,7 @@ var ts;
             else {
                 bindEachChild(node);
             }
-            if (node.expression.kind === 189 /* PropertyAccessExpression */) {
+            if (node.expression.kind === 190 /* PropertyAccessExpression */) {
                 var propertyAccess = node.expression;
                 if (isNarrowableOperand(propertyAccess.expression) && ts.isPushOrUnshiftIdentifier(propertyAccess.name)) {
                     currentFlow = createFlowArrayMutation(currentFlow, node);
@@ -28700,54 +29126,54 @@ var ts;
         }
         function getContainerFlags(node) {
             switch (node.kind) {
-                case 209 /* ClassExpression */:
-                case 240 /* ClassDeclaration */:
-                case 243 /* EnumDeclaration */:
-                case 188 /* ObjectLiteralExpression */:
-                case 168 /* TypeLiteral */:
-                case 297 /* JSDocTypeLiteral */:
-                case 268 /* JsxAttributes */:
+                case 210 /* ClassExpression */:
+                case 241 /* ClassDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 189 /* ObjectLiteralExpression */:
+                case 169 /* TypeLiteral */:
+                case 298 /* JSDocTypeLiteral */:
+                case 269 /* JsxAttributes */:
                     return 1 /* IsContainer */;
-                case 241 /* InterfaceDeclaration */:
+                case 242 /* InterfaceDeclaration */:
                     return 1 /* IsContainer */ | 64 /* IsInterface */;
-                case 244 /* ModuleDeclaration */:
-                case 242 /* TypeAliasDeclaration */:
-                case 181 /* MappedType */:
+                case 245 /* ModuleDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
+                case 182 /* MappedType */:
                     return 1 /* IsContainer */ | 32 /* HasLocals */;
-                case 284 /* SourceFile */:
+                case 285 /* SourceFile */:
                     return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */;
-                case 156 /* MethodDeclaration */:
+                case 157 /* MethodDeclaration */:
                     if (ts.isObjectLiteralOrClassExpressionMethod(node)) {
                         return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */ | 8 /* IsFunctionLike */ | 128 /* IsObjectLiteralOrClassExpressionMethod */;
                     }
                 // falls through
-                case 157 /* Constructor */:
-                case 239 /* FunctionDeclaration */:
-                case 155 /* MethodSignature */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
-                case 160 /* CallSignature */:
-                case 298 /* JSDocSignature */:
-                case 294 /* JSDocFunctionType */:
-                case 165 /* FunctionType */:
-                case 161 /* ConstructSignature */:
-                case 162 /* IndexSignature */:
-                case 166 /* ConstructorType */:
+                case 158 /* Constructor */:
+                case 240 /* FunctionDeclaration */:
+                case 156 /* MethodSignature */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
+                case 161 /* CallSignature */:
+                case 299 /* JSDocSignature */:
+                case 295 /* JSDocFunctionType */:
+                case 166 /* FunctionType */:
+                case 162 /* ConstructSignature */:
+                case 163 /* IndexSignature */:
+                case 167 /* ConstructorType */:
                     return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */ | 8 /* IsFunctionLike */;
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
                     return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */ | 8 /* IsFunctionLike */ | 16 /* IsFunctionExpression */;
-                case 245 /* ModuleBlock */:
+                case 246 /* ModuleBlock */:
                     return 4 /* IsControlFlowContainer */;
-                case 154 /* PropertyDeclaration */:
+                case 155 /* PropertyDeclaration */:
                     return node.initializer ? 4 /* IsControlFlowContainer */ : 0;
-                case 274 /* CatchClause */:
-                case 225 /* ForStatement */:
-                case 226 /* ForInStatement */:
-                case 227 /* ForOfStatement */:
-                case 246 /* CaseBlock */:
+                case 275 /* CatchClause */:
+                case 226 /* ForStatement */:
+                case 227 /* ForInStatement */:
+                case 228 /* ForOfStatement */:
+                case 247 /* CaseBlock */:
                     return 2 /* IsBlockScopedContainer */;
-                case 218 /* Block */:
+                case 219 /* Block */:
                     // do not treat blocks directly inside a function as a block-scoped-container.
                     // Locals that reside in this block should go to the function locals. Otherwise 'x'
                     // would not appear to be a redeclaration of a block scoped local in the following
@@ -28780,45 +29206,45 @@ var ts;
                 // members are declared (for example, a member of a class will go into a specific
                 // symbol table depending on if it is static or not). We defer to specialized
                 // handlers to take care of declaring these child members.
-                case 244 /* ModuleDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     return declareModuleMember(node, symbolFlags, symbolExcludes);
-                case 284 /* SourceFile */:
+                case 285 /* SourceFile */:
                     return declareSourceFileMember(node, symbolFlags, symbolExcludes);
-                case 209 /* ClassExpression */:
-                case 240 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
+                case 241 /* ClassDeclaration */:
                     return declareClassMember(node, symbolFlags, symbolExcludes);
-                case 243 /* EnumDeclaration */:
+                case 244 /* EnumDeclaration */:
                     return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);
-                case 168 /* TypeLiteral */:
-                case 297 /* JSDocTypeLiteral */:
-                case 188 /* ObjectLiteralExpression */:
-                case 241 /* InterfaceDeclaration */:
-                case 268 /* JsxAttributes */:
+                case 169 /* TypeLiteral */:
+                case 298 /* JSDocTypeLiteral */:
+                case 189 /* ObjectLiteralExpression */:
+                case 242 /* InterfaceDeclaration */:
+                case 269 /* JsxAttributes */:
                     // Interface/Object-types always have their children added to the 'members' of
                     // their container. They are only accessible through an instance of their
                     // container, and are never in scope otherwise (even inside the body of the
                     // object / type / interface declaring them). An exception is type parameters,
                     // which are in scope without qualification (similar to 'locals').
                     return declareSymbol(container.symbol.members, container.symbol, node, symbolFlags, symbolExcludes);
-                case 165 /* FunctionType */:
-                case 166 /* ConstructorType */:
-                case 160 /* CallSignature */:
-                case 161 /* ConstructSignature */:
-                case 298 /* JSDocSignature */:
-                case 162 /* IndexSignature */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
-                case 157 /* Constructor */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
-                case 294 /* JSDocFunctionType */:
-                case 309 /* JSDocTypedefTag */:
-                case 302 /* JSDocCallbackTag */:
-                case 242 /* TypeAliasDeclaration */:
-                case 181 /* MappedType */:
+                case 166 /* FunctionType */:
+                case 167 /* ConstructorType */:
+                case 161 /* CallSignature */:
+                case 162 /* ConstructSignature */:
+                case 299 /* JSDocSignature */:
+                case 163 /* IndexSignature */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
+                case 158 /* Constructor */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
+                case 295 /* JSDocFunctionType */:
+                case 311 /* JSDocTypedefTag */:
+                case 304 /* JSDocCallbackTag */:
+                case 243 /* TypeAliasDeclaration */:
+                case 182 /* MappedType */:
                     // All the children of these container types are never visible through another
                     // symbol (i.e. through another symbol's 'exports' or 'members').  Instead,
                     // they're only accessed 'lexically' (i.e. from code that exists underneath
@@ -28839,16 +29265,8 @@ var ts;
                 : declareSymbol(file.locals, /*parent*/ undefined, node, symbolFlags, symbolExcludes);
         }
         function hasExportDeclarations(node) {
-            var body = node.kind === 284 /* SourceFile */ ? node : node.body;
-            if (body && (body.kind === 284 /* SourceFile */ || body.kind === 245 /* ModuleBlock */)) {
-                for (var _i = 0, _a = body.statements; _i < _a.length; _i++) {
-                    var stat = _a[_i];
-                    if (stat.kind === 255 /* ExportDeclaration */ || stat.kind === 254 /* ExportAssignment */) {
-                        return true;
-                    }
-                }
-            }
-            return false;
+            var body = ts.isSourceFile(node) ? node : ts.tryCast(node.body, ts.isModuleBlock);
+            return !!body && body.statements.some(function (s) { return ts.isExportDeclaration(s) || ts.isExportAssignment(s); });
         }
         function setExportContextFlag(node) {
             // A declaration source file or ambient module declaration that contains no export declarations (but possibly regular
@@ -28927,7 +29345,7 @@ var ts;
                 var seen = ts.createUnderscoreEscapedMap();
                 for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
                     var prop = _a[_i];
-                    if (prop.kind === 277 /* SpreadAssignment */ || prop.name.kind !== 72 /* Identifier */) {
+                    if (prop.kind === 278 /* SpreadAssignment */ || prop.name.kind !== 73 /* Identifier */) {
                         continue;
                     }
                     var identifier = prop.name;
@@ -28939,7 +29357,7 @@ var ts;
                     //    c.IsAccessorDescriptor(previous) is true and IsDataDescriptor(propId.descriptor) is true.
                     //    d.IsAccessorDescriptor(previous) is true and IsAccessorDescriptor(propId.descriptor) is true
                     // and either both previous and propId.descriptor have[[Get]] fields or both previous and propId.descriptor have[[Set]] fields
-                    var currentKind = prop.kind === 275 /* PropertyAssignment */ || prop.kind === 276 /* ShorthandPropertyAssignment */ || prop.kind === 156 /* MethodDeclaration */
+                    var currentKind = prop.kind === 276 /* PropertyAssignment */ || prop.kind === 277 /* ShorthandPropertyAssignment */ || prop.kind === 157 /* MethodDeclaration */
                         ? 1 /* Property */
                         : 2 /* Accessor */;
                     var existingKind = seen.get(identifier.escapedText);
@@ -28971,10 +29389,10 @@ var ts;
         }
         function bindBlockScopedDeclaration(node, symbolFlags, symbolExcludes) {
             switch (blockScopeContainer.kind) {
-                case 244 /* ModuleDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     declareModuleMember(node, symbolFlags, symbolExcludes);
                     break;
-                case 284 /* SourceFile */:
+                case 285 /* SourceFile */:
                     if (ts.isExternalOrCommonJsModule(container)) {
                         declareModuleMember(node, symbolFlags, symbolExcludes);
                         break;
@@ -29005,7 +29423,7 @@ var ts;
                 currentFlow = { flags: 2 /* Start */ };
                 parent = typeAlias;
                 bind(typeAlias.typeExpression);
-                if (!typeAlias.fullName || typeAlias.fullName.kind === 72 /* Identifier */) {
+                if (!typeAlias.fullName || typeAlias.fullName.kind === 73 /* Identifier */) {
                     parent = typeAlias.parent;
                     bindBlockScopedDeclaration(typeAlias, 524288 /* TypeAlias */, 67897832 /* TypeAliasExcludes */);
                 }
@@ -29023,8 +29441,8 @@ var ts;
         // check for reserved words used as identifiers in strict mode code.
         function checkStrictModeIdentifier(node) {
             if (inStrictMode &&
-                node.originalKeywordKind >= 109 /* FirstFutureReservedWord */ &&
-                node.originalKeywordKind <= 117 /* LastFutureReservedWord */ &&
+                node.originalKeywordKind >= 110 /* FirstFutureReservedWord */ &&
+                node.originalKeywordKind <= 118 /* LastFutureReservedWord */ &&
                 !ts.isIdentifierName(node) &&
                 !(node.flags & 4194304 /* Ambient */)) {
                 // Report error only if there are no parse errors in file
@@ -29060,7 +29478,7 @@ var ts;
         }
         function checkStrictModeDeleteExpression(node) {
             // Grammar checking
-            if (inStrictMode && node.expression.kind === 72 /* Identifier */) {
+            if (inStrictMode && node.expression.kind === 73 /* Identifier */) {
                 // When a delete operator occurs within strict mode code, a SyntaxError is thrown if its
                 // UnaryExpression is a direct reference to a variable, function argument, or function name
                 var span = ts.getErrorSpanForNode(file, node.expression);
@@ -29071,7 +29489,7 @@ var ts;
             return ts.isIdentifier(node) && (node.escapedText === "eval" || node.escapedText === "arguments");
         }
         function checkStrictModeEvalOrArguments(contextNode, name) {
-            if (name && name.kind === 72 /* Identifier */) {
+            if (name && name.kind === 73 /* Identifier */) {
                 var identifier = name;
                 if (isEvalOrArgumentsIdentifier(identifier)) {
                     // We check first if the name is inside class declaration or class expression; if so give explicit message
@@ -29112,8 +29530,8 @@ var ts;
         function checkStrictModeFunctionDeclaration(node) {
             if (languageVersion < 2 /* ES2015 */) {
                 // Report error if function is not top level function declaration
-                if (blockScopeContainer.kind !== 284 /* SourceFile */ &&
-                    blockScopeContainer.kind !== 244 /* ModuleDeclaration */ &&
+                if (blockScopeContainer.kind !== 285 /* SourceFile */ &&
+                    blockScopeContainer.kind !== 245 /* ModuleDeclaration */ &&
                     !ts.isFunctionLike(blockScopeContainer)) {
                     // We check first if the name is inside class declaration or class expression; if so give explicit message
                     // otherwise report generic error message.
@@ -29208,7 +29626,7 @@ var ts;
             // the current 'container' node when it changes. This helps us know which symbol table
             // a local should go into for example. Since terminal nodes are known not to have
             // children, as an optimization we don't process those.
-            if (node.kind > 147 /* LastToken */) {
+            if (node.kind > 148 /* LastToken */) {
                 var saveParent = parent;
                 parent = node;
                 var containerFlags = getContainerFlags(node);
@@ -29270,7 +29688,7 @@ var ts;
         function bindWorker(node) {
             switch (node.kind) {
                 /* Strict mode checks */
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     // for typedef type names with namespaces, bind the new jsdoc type symbol here
                     // because it requires all containing namespaces to be in effect, namely the
                     // current "blockScopeContainer" needs to be set to its immediate namespace parent.
@@ -29283,13 +29701,13 @@ var ts;
                         break;
                     }
                 // falls through
-                case 100 /* ThisKeyword */:
-                    if (currentFlow && (ts.isExpression(node) || parent.kind === 276 /* ShorthandPropertyAssignment */)) {
+                case 101 /* ThisKeyword */:
+                    if (currentFlow && (ts.isExpression(node) || parent.kind === 277 /* ShorthandPropertyAssignment */)) {
                         node.flowNode = currentFlow;
                     }
                     return checkStrictModeIdentifier(node);
-                case 189 /* PropertyAccessExpression */:
-                case 190 /* ElementAccessExpression */:
+                case 190 /* PropertyAccessExpression */:
+                case 191 /* ElementAccessExpression */:
                     if (currentFlow && isNarrowableReference(node)) {
                         node.flowNode = currentFlow;
                     }
@@ -29303,7 +29721,7 @@ var ts;
                         declareSymbol(file.locals, /*parent*/ undefined, node.expression, 1 /* FunctionScopedVariable */ | 134217728 /* ModuleExports */, 67220414 /* FunctionScopedVariableExcludes */);
                     }
                     break;
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     var specialKind = ts.getAssignmentDeclarationKind(node);
                     switch (specialKind) {
                         case 1 /* ExportsProperty */:
@@ -29331,76 +29749,76 @@ var ts;
                             ts.Debug.fail("Unknown binary expression special property assignment kind");
                     }
                     return checkStrictModeBinaryExpression(node);
-                case 274 /* CatchClause */:
+                case 275 /* CatchClause */:
                     return checkStrictModeCatchClause(node);
-                case 198 /* DeleteExpression */:
+                case 199 /* DeleteExpression */:
                     return checkStrictModeDeleteExpression(node);
                 case 8 /* NumericLiteral */:
                     return checkStrictModeNumericLiteral(node);
-                case 203 /* PostfixUnaryExpression */:
+                case 204 /* PostfixUnaryExpression */:
                     return checkStrictModePostfixUnaryExpression(node);
-                case 202 /* PrefixUnaryExpression */:
+                case 203 /* PrefixUnaryExpression */:
                     return checkStrictModePrefixUnaryExpression(node);
-                case 231 /* WithStatement */:
+                case 232 /* WithStatement */:
                     return checkStrictModeWithStatement(node);
-                case 233 /* LabeledStatement */:
+                case 234 /* LabeledStatement */:
                     return checkStrictModeLabeledStatement(node);
-                case 178 /* ThisType */:
+                case 179 /* ThisType */:
                     seenThisKeyword = true;
                     return;
-                case 163 /* TypePredicate */:
+                case 164 /* TypePredicate */:
                     break; // Binding the children will handle everything
-                case 150 /* TypeParameter */:
+                case 151 /* TypeParameter */:
                     return bindTypeParameter(node);
-                case 151 /* Parameter */:
+                case 152 /* Parameter */:
                     return bindParameter(node);
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     return bindVariableDeclarationOrBindingElement(node);
-                case 186 /* BindingElement */:
+                case 187 /* BindingElement */:
                     node.flowNode = currentFlow;
                     return bindVariableDeclarationOrBindingElement(node);
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
                     return bindPropertyWorker(node);
-                case 275 /* PropertyAssignment */:
-                case 276 /* ShorthandPropertyAssignment */:
+                case 276 /* PropertyAssignment */:
+                case 277 /* ShorthandPropertyAssignment */:
                     return bindPropertyOrMethodOrAccessor(node, 4 /* Property */, 0 /* PropertyExcludes */);
-                case 278 /* EnumMember */:
+                case 279 /* EnumMember */:
                     return bindPropertyOrMethodOrAccessor(node, 8 /* EnumMember */, 68008959 /* EnumMemberExcludes */);
-                case 160 /* CallSignature */:
-                case 161 /* ConstructSignature */:
-                case 162 /* IndexSignature */:
+                case 161 /* CallSignature */:
+                case 162 /* ConstructSignature */:
+                case 163 /* IndexSignature */:
                     return declareSymbolAndAddToSymbolTable(node, 131072 /* Signature */, 0 /* None */);
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
                     // If this is an ObjectLiteralExpression method, then it sits in the same space
                     // as other properties in the object literal.  So we use SymbolFlags.PropertyExcludes
                     // so that it will conflict with any other object literal members with the same
                     // name.
                     return bindPropertyOrMethodOrAccessor(node, 8192 /* Method */ | (node.questionToken ? 16777216 /* Optional */ : 0 /* None */), ts.isObjectLiteralMethod(node) ? 0 /* PropertyExcludes */ : 67212223 /* MethodExcludes */);
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     return bindFunctionDeclaration(node);
-                case 157 /* Constructor */:
+                case 158 /* Constructor */:
                     return declareSymbolAndAddToSymbolTable(node, 16384 /* Constructor */, /*symbolExcludes:*/ 0 /* None */);
-                case 158 /* GetAccessor */:
+                case 159 /* GetAccessor */:
                     return bindPropertyOrMethodOrAccessor(node, 32768 /* GetAccessor */, 67154879 /* GetAccessorExcludes */);
-                case 159 /* SetAccessor */:
+                case 160 /* SetAccessor */:
                     return bindPropertyOrMethodOrAccessor(node, 65536 /* SetAccessor */, 67187647 /* SetAccessorExcludes */);
-                case 165 /* FunctionType */:
-                case 294 /* JSDocFunctionType */:
-                case 298 /* JSDocSignature */:
-                case 166 /* ConstructorType */:
+                case 166 /* FunctionType */:
+                case 295 /* JSDocFunctionType */:
+                case 299 /* JSDocSignature */:
+                case 167 /* ConstructorType */:
                     return bindFunctionOrConstructorType(node);
-                case 168 /* TypeLiteral */:
-                case 297 /* JSDocTypeLiteral */:
-                case 181 /* MappedType */:
+                case 169 /* TypeLiteral */:
+                case 298 /* JSDocTypeLiteral */:
+                case 182 /* MappedType */:
                     return bindAnonymousTypeWorker(node);
-                case 188 /* ObjectLiteralExpression */:
+                case 189 /* ObjectLiteralExpression */:
                     return bindObjectLiteralExpression(node);
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
                     return bindFunctionExpression(node);
-                case 191 /* CallExpression */:
+                case 192 /* CallExpression */:
                     var assignmentKind = ts.getAssignmentDeclarationKind(node);
                     switch (assignmentKind) {
                         case 7 /* ObjectDefinePropertyValue */:
@@ -29419,64 +29837,64 @@ var ts;
                     }
                     break;
                 // Members of classes, interfaces, and modules
-                case 209 /* ClassExpression */:
-                case 240 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
+                case 241 /* ClassDeclaration */:
                     // All classes are automatically in strict mode in ES6.
                     inStrictMode = true;
                     return bindClassLikeDeclaration(node);
-                case 241 /* InterfaceDeclaration */:
+                case 242 /* InterfaceDeclaration */:
                     return bindBlockScopedDeclaration(node, 64 /* Interface */, 67897736 /* InterfaceExcludes */);
-                case 242 /* TypeAliasDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
                     return bindBlockScopedDeclaration(node, 524288 /* TypeAlias */, 67897832 /* TypeAliasExcludes */);
-                case 243 /* EnumDeclaration */:
+                case 244 /* EnumDeclaration */:
                     return bindEnumDeclaration(node);
-                case 244 /* ModuleDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     return bindModuleDeclaration(node);
                 // Jsx-attributes
-                case 268 /* JsxAttributes */:
+                case 269 /* JsxAttributes */:
                     return bindJsxAttributes(node);
-                case 267 /* JsxAttribute */:
+                case 268 /* JsxAttribute */:
                     return bindJsxAttribute(node, 4 /* Property */, 0 /* PropertyExcludes */);
                 // Imports and exports
-                case 248 /* ImportEqualsDeclaration */:
-                case 251 /* NamespaceImport */:
-                case 253 /* ImportSpecifier */:
-                case 257 /* ExportSpecifier */:
+                case 249 /* ImportEqualsDeclaration */:
+                case 252 /* NamespaceImport */:
+                case 254 /* ImportSpecifier */:
+                case 258 /* ExportSpecifier */:
                     return declareSymbolAndAddToSymbolTable(node, 2097152 /* Alias */, 2097152 /* AliasExcludes */);
-                case 247 /* NamespaceExportDeclaration */:
+                case 248 /* NamespaceExportDeclaration */:
                     return bindNamespaceExportDeclaration(node);
-                case 250 /* ImportClause */:
+                case 251 /* ImportClause */:
                     return bindImportClause(node);
-                case 255 /* ExportDeclaration */:
+                case 256 /* ExportDeclaration */:
                     return bindExportDeclaration(node);
-                case 254 /* ExportAssignment */:
+                case 255 /* ExportAssignment */:
                     return bindExportAssignment(node);
-                case 284 /* SourceFile */:
+                case 285 /* SourceFile */:
                     updateStrictModeStatementList(node.statements);
                     return bindSourceFileIfExternalModule();
-                case 218 /* Block */:
+                case 219 /* Block */:
                     if (!ts.isFunctionLike(node.parent)) {
                         return;
                     }
                 // falls through
-                case 245 /* ModuleBlock */:
+                case 246 /* ModuleBlock */:
                     return updateStrictModeStatementList(node.statements);
-                case 304 /* JSDocParameterTag */:
-                    if (node.parent.kind === 298 /* JSDocSignature */) {
+                case 306 /* JSDocParameterTag */:
+                    if (node.parent.kind === 299 /* JSDocSignature */) {
                         return bindParameter(node);
                     }
-                    if (node.parent.kind !== 297 /* JSDocTypeLiteral */) {
+                    if (node.parent.kind !== 298 /* JSDocTypeLiteral */) {
                         break;
                     }
                 // falls through
-                case 310 /* JSDocPropertyTag */:
+                case 312 /* JSDocPropertyTag */:
                     var propTag = node;
-                    var flags = propTag.isBracketed || propTag.typeExpression && propTag.typeExpression.type.kind === 293 /* JSDocOptionalType */ ?
+                    var flags = propTag.isBracketed || propTag.typeExpression && propTag.typeExpression.type.kind === 294 /* JSDocOptionalType */ ?
                         4 /* Property */ | 16777216 /* Optional */ :
                         4 /* Property */;
                     return declareSymbolAndAddToSymbolTable(propTag, flags, 0 /* PropertyExcludes */);
-                case 309 /* JSDocTypedefTag */:
-                case 302 /* JSDocCallbackTag */:
+                case 311 /* JSDocTypedefTag */:
+                case 304 /* JSDocCallbackTag */:
                     return (delayedTypeAliases || (delayedTypeAliases = [])).push(node);
             }
         }
@@ -29620,11 +30038,11 @@ var ts;
             ts.Debug.assert(ts.isInJSFile(node));
             var thisContainer = ts.getThisContainer(node, /*includeArrowFunctions*/ false);
             switch (thisContainer.kind) {
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
                     var constructorSymbol = thisContainer.symbol;
                     // For `f.prototype.m = function() { this.x = 0; }`, `this.x = 0` should modify `f`'s members, not the function expression.
-                    if (ts.isBinaryExpression(thisContainer.parent) && thisContainer.parent.operatorToken.kind === 59 /* EqualsToken */) {
+                    if (ts.isBinaryExpression(thisContainer.parent) && thisContainer.parent.operatorToken.kind === 60 /* EqualsToken */) {
                         var l = thisContainer.parent.left;
                         if (ts.isPropertyAccessEntityNameExpression(l) && ts.isPrototypeAccess(l.expression)) {
                             constructorSymbol = lookupSymbolForPropertyAccess(l.expression.expression, thisParentContainer);
@@ -29637,18 +30055,18 @@ var ts;
                         declareSymbol(constructorSymbol.members, constructorSymbol, node, 4 /* Property */, 0 /* PropertyExcludes */ & ~4 /* Property */);
                     }
                     break;
-                case 157 /* Constructor */:
-                case 154 /* PropertyDeclaration */:
-                case 156 /* MethodDeclaration */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 158 /* Constructor */:
+                case 155 /* PropertyDeclaration */:
+                case 157 /* MethodDeclaration */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     // this.foo assignment in a JavaScript class
                     // Bind this property to the containing class
                     var containingClass = thisContainer.parent;
                     var symbolTable = ts.hasModifier(thisContainer, 32 /* Static */) ? containingClass.symbol.exports : containingClass.symbol.members;
                     declareSymbol(symbolTable, containingClass.symbol, node, 4 /* Property */, 0 /* None */, /*isReplaceableByMethod*/ true);
                     break;
-                case 284 /* SourceFile */:
+                case 285 /* SourceFile */:
                     // this.property = assignment in a source file -- declare symbol in exports for a module, in locals for a script
                     if (thisContainer.commonJsModuleIndicator) {
                         declareSymbol(thisContainer.symbol.exports, thisContainer.symbol, node, 4 /* Property */ | 1048576 /* ExportValue */, 0 /* None */);
@@ -29658,14 +30076,14 @@ var ts;
                     }
                     break;
                 default:
-                    ts.Debug.fail(ts.Debug.showSyntaxKind(thisContainer));
+                    ts.Debug.failBadSyntaxKind(thisContainer);
             }
         }
         function bindSpecialPropertyDeclaration(node) {
-            if (node.expression.kind === 100 /* ThisKeyword */) {
+            if (node.expression.kind === 101 /* ThisKeyword */) {
                 bindThisPropertyAssignment(node);
             }
-            else if (ts.isPropertyAccessEntityNameExpression(node) && node.parent.parent.kind === 284 /* SourceFile */) {
+            else if (ts.isPropertyAccessEntityNameExpression(node) && node.parent.parent.kind === 285 /* SourceFile */) {
                 if (ts.isPrototypeAccess(node.expression)) {
                     bindPrototypePropertyAssignment(node, node.parent);
                 }
@@ -29702,7 +30120,7 @@ var ts;
         }
         function bindObjectDefinePropertyAssignment(node) {
             var namespaceSymbol = lookupSymbolForPropertyAccess(node.arguments[0]);
-            var isToplevel = node.parent.parent.kind === 284 /* SourceFile */;
+            var isToplevel = node.parent.parent.kind === 285 /* SourceFile */;
             namespaceSymbol = bindPotentiallyMissingNamespaces(namespaceSymbol, node.arguments[0], isToplevel, /*isPrototypeProperty*/ false);
             bindPotentiallyNewExpandoMemberToNamespace(node, namespaceSymbol, /*isPrototypeProperty*/ false);
         }
@@ -29716,7 +30134,7 @@ var ts;
             // Fix up parent pointers since we're going to use these nodes before we bind into them
             node.left.parent = node;
             node.right.parent = node;
-            if (ts.isIdentifier(lhs.expression) && container === file && isNameOfExportsOrModuleExportsAliasDeclaration(file, lhs.expression)) {
+            if (ts.isIdentifier(lhs.expression) && container === file && isExportsOrModuleExportsOrAlias(file, lhs.expression)) {
                 // This can be an alias for the 'exports' or 'module.exports' names, e.g.
                 //    var util = module.exports;
                 //    util.property = function ...
@@ -29769,8 +30187,8 @@ var ts;
         function bindPropertyAssignment(name, propertyAccess, isPrototypeProperty) {
             var namespaceSymbol = lookupSymbolForPropertyAccess(name);
             var isToplevel = ts.isBinaryExpression(propertyAccess.parent)
-                ? getParentOfBinaryExpression(propertyAccess.parent).parent.kind === 284 /* SourceFile */
-                : propertyAccess.parent.parent.kind === 284 /* SourceFile */;
+                ? getParentOfBinaryExpression(propertyAccess.parent).parent.kind === 285 /* SourceFile */
+                : propertyAccess.parent.parent.kind === 285 /* SourceFile */;
             namespaceSymbol = bindPotentiallyMissingNamespaces(namespaceSymbol, propertyAccess.expression, isToplevel, isPrototypeProperty);
             bindPotentiallyNewExpandoMemberToNamespace(propertyAccess, namespaceSymbol, isPrototypeProperty);
         }
@@ -29829,9 +30247,7 @@ var ts;
             }
             else {
                 var s = forEachIdentifierInEntityName(e.expression, parent, action);
-                if (!s || !s.exports)
-                    return ts.Debug.fail();
-                return action(e.name, s.exports.get(e.name.escapedText), s);
+                return action(e.name, s && s.exports && s.exports.get(e.name.escapedText), s);
             }
         }
         function bindCallExpression(node) {
@@ -29842,7 +30258,7 @@ var ts;
             }
         }
         function bindClassLikeDeclaration(node) {
-            if (node.kind === 240 /* ClassDeclaration */) {
+            if (node.kind === 241 /* ClassDeclaration */) {
                 bindBlockScopedDeclaration(node, 32 /* Class */, 68008383 /* ClassExcludes */);
             }
             else {
@@ -29908,7 +30324,7 @@ var ts;
             }
         }
         function bindParameter(node) {
-            if (node.kind === 304 /* JSDocParameterTag */ && container.kind !== 298 /* JSDocSignature */) {
+            if (node.kind === 306 /* JSDocParameterTag */ && container.kind !== 299 /* JSDocSignature */) {
                 return;
             }
             if (inStrictMode && !(node.flags & 4194304 /* Ambient */)) {
@@ -29985,7 +30401,7 @@ var ts;
                     declareSymbolAndAddToSymbolTable(node, 262144 /* TypeParameter */, 67635688 /* TypeParameterExcludes */);
                 }
             }
-            else if (node.parent.kind === 176 /* InferType */) {
+            else if (node.parent.kind === 177 /* InferType */) {
                 var container_2 = getInferTypeContainer(node.parent);
                 if (container_2) {
                     if (!container_2.locals) {
@@ -30013,11 +30429,11 @@ var ts;
             if (currentFlow === unreachableFlow) {
                 var reportError = 
                 // report error on all statements except empty ones
-                (ts.isStatementButNotDeclaration(node) && node.kind !== 220 /* EmptyStatement */) ||
+                (ts.isStatementButNotDeclaration(node) && node.kind !== 221 /* EmptyStatement */) ||
                     // report error on class declarations
-                    node.kind === 240 /* ClassDeclaration */ ||
+                    node.kind === 241 /* ClassDeclaration */ ||
                     // report error on instantiated modules or const-enums only modules if preserveConstEnums is set
-                    (node.kind === 244 /* ModuleDeclaration */ && shouldReportErrorOnModuleDeclaration(node));
+                    (node.kind === 245 /* ModuleDeclaration */ && shouldReportErrorOnModuleDeclaration(node));
                 if (reportError) {
                     currentFlow = reportedUnreachableFlow;
                     if (!options.allowUnreachableCode) {
@@ -30061,32 +30477,41 @@ var ts;
     }
     function isPurelyTypeDeclaration(s) {
         switch (s.kind) {
-            case 241 /* InterfaceDeclaration */:
-            case 242 /* TypeAliasDeclaration */:
+            case 242 /* InterfaceDeclaration */:
+            case 243 /* TypeAliasDeclaration */:
                 return true;
-            case 244 /* ModuleDeclaration */:
+            case 245 /* ModuleDeclaration */:
                 return getModuleInstanceState(s) !== 1 /* Instantiated */;
-            case 243 /* EnumDeclaration */:
+            case 244 /* EnumDeclaration */:
                 return ts.hasModifier(s, 2048 /* Const */);
             default:
                 return false;
         }
     }
     function isExportsOrModuleExportsOrAlias(sourceFile, node) {
-        return ts.isExportsIdentifier(node) ||
-            ts.isModuleExportsPropertyAccessExpression(node) ||
-            ts.isIdentifier(node) && isNameOfExportsOrModuleExportsAliasDeclaration(sourceFile, node);
+        var i = 0;
+        var q = [node];
+        while (q.length && i < 100) {
+            i++;
+            node = q.shift();
+            if (ts.isExportsIdentifier(node) || ts.isModuleExportsPropertyAccessExpression(node)) {
+                return true;
+            }
+            else if (ts.isIdentifier(node)) {
+                var symbol = lookupSymbolForNameWorker(sourceFile, node.escapedText);
+                if (!!symbol && !!symbol.valueDeclaration && ts.isVariableDeclaration(symbol.valueDeclaration) && !!symbol.valueDeclaration.initializer) {
+                    var init = symbol.valueDeclaration.initializer;
+                    q.push(init);
+                    if (ts.isAssignmentExpression(init, /*excludeCompoundAssignment*/ true)) {
+                        q.push(init.left);
+                        q.push(init.right);
+                    }
+                }
+            }
+        }
+        return false;
     }
     ts.isExportsOrModuleExportsOrAlias = isExportsOrModuleExportsOrAlias;
-    function isNameOfExportsOrModuleExportsAliasDeclaration(sourceFile, node) {
-        var symbol = lookupSymbolForNameWorker(sourceFile, node.escapedText);
-        return !!symbol && !!symbol.valueDeclaration && ts.isVariableDeclaration(symbol.valueDeclaration) &&
-            !!symbol.valueDeclaration.initializer && isExportsOrModuleExportsOrAliasOrAssignment(sourceFile, symbol.valueDeclaration.initializer);
-    }
-    function isExportsOrModuleExportsOrAliasOrAssignment(sourceFile, node) {
-        return isExportsOrModuleExportsOrAlias(sourceFile, node) ||
-            (ts.isAssignmentExpression(node, /*excludeCompoundAssignment*/ true) && (isExportsOrModuleExportsOrAliasOrAssignment(sourceFile, node.left) || isExportsOrModuleExportsOrAliasOrAssignment(sourceFile, node.right)));
-    }
     function lookupSymbolForNameWorker(container, name) {
         var local = container.locals && container.locals.get(name);
         if (local) {
@@ -30106,58 +30531,58 @@ var ts;
     function computeTransformFlagsForNode(node, subtreeFlags) {
         var kind = node.kind;
         switch (kind) {
-            case 191 /* CallExpression */:
+            case 192 /* CallExpression */:
                 return computeCallExpression(node, subtreeFlags);
-            case 192 /* NewExpression */:
+            case 193 /* NewExpression */:
                 return computeNewExpression(node, subtreeFlags);
-            case 244 /* ModuleDeclaration */:
+            case 245 /* ModuleDeclaration */:
                 return computeModuleDeclaration(node, subtreeFlags);
-            case 195 /* ParenthesizedExpression */:
+            case 196 /* ParenthesizedExpression */:
                 return computeParenthesizedExpression(node, subtreeFlags);
-            case 204 /* BinaryExpression */:
+            case 205 /* BinaryExpression */:
                 return computeBinaryExpression(node, subtreeFlags);
-            case 221 /* ExpressionStatement */:
+            case 222 /* ExpressionStatement */:
                 return computeExpressionStatement(node, subtreeFlags);
-            case 151 /* Parameter */:
+            case 152 /* Parameter */:
                 return computeParameter(node, subtreeFlags);
-            case 197 /* ArrowFunction */:
+            case 198 /* ArrowFunction */:
                 return computeArrowFunction(node, subtreeFlags);
-            case 196 /* FunctionExpression */:
+            case 197 /* FunctionExpression */:
                 return computeFunctionExpression(node, subtreeFlags);
-            case 239 /* FunctionDeclaration */:
+            case 240 /* FunctionDeclaration */:
                 return computeFunctionDeclaration(node, subtreeFlags);
-            case 237 /* VariableDeclaration */:
+            case 238 /* VariableDeclaration */:
                 return computeVariableDeclaration(node, subtreeFlags);
-            case 238 /* VariableDeclarationList */:
+            case 239 /* VariableDeclarationList */:
                 return computeVariableDeclarationList(node, subtreeFlags);
-            case 219 /* VariableStatement */:
+            case 220 /* VariableStatement */:
                 return computeVariableStatement(node, subtreeFlags);
-            case 233 /* LabeledStatement */:
+            case 234 /* LabeledStatement */:
                 return computeLabeledStatement(node, subtreeFlags);
-            case 240 /* ClassDeclaration */:
+            case 241 /* ClassDeclaration */:
                 return computeClassDeclaration(node, subtreeFlags);
-            case 209 /* ClassExpression */:
+            case 210 /* ClassExpression */:
                 return computeClassExpression(node, subtreeFlags);
-            case 273 /* HeritageClause */:
+            case 274 /* HeritageClause */:
                 return computeHeritageClause(node, subtreeFlags);
-            case 274 /* CatchClause */:
+            case 275 /* CatchClause */:
                 return computeCatchClause(node, subtreeFlags);
-            case 211 /* ExpressionWithTypeArguments */:
+            case 212 /* ExpressionWithTypeArguments */:
                 return computeExpressionWithTypeArguments(node, subtreeFlags);
-            case 157 /* Constructor */:
+            case 158 /* Constructor */:
                 return computeConstructor(node, subtreeFlags);
-            case 154 /* PropertyDeclaration */:
+            case 155 /* PropertyDeclaration */:
                 return computePropertyDeclaration(node, subtreeFlags);
-            case 156 /* MethodDeclaration */:
+            case 157 /* MethodDeclaration */:
                 return computeMethod(node, subtreeFlags);
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
                 return computeAccessor(node, subtreeFlags);
-            case 248 /* ImportEqualsDeclaration */:
+            case 249 /* ImportEqualsDeclaration */:
                 return computeImportEquals(node, subtreeFlags);
-            case 189 /* PropertyAccessExpression */:
+            case 190 /* PropertyAccessExpression */:
                 return computePropertyAccess(node, subtreeFlags);
-            case 190 /* ElementAccessExpression */:
+            case 191 /* ElementAccessExpression */:
                 return computeElementAccess(node, subtreeFlags);
             default:
                 return computeOther(node, kind, subtreeFlags);
@@ -30179,7 +30604,7 @@ var ts;
                 transformFlags |= 2048 /* ContainsLexicalThis */;
             }
         }
-        if (expression.kind === 92 /* ImportKeyword */) {
+        if (expression.kind === 93 /* ImportKeyword */) {
             transformFlags |= 524288 /* ContainsDynamicImport */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
@@ -30202,17 +30627,17 @@ var ts;
         var transformFlags = subtreeFlags;
         var operatorTokenKind = node.operatorToken.kind;
         var leftKind = node.left.kind;
-        if (operatorTokenKind === 59 /* EqualsToken */ && leftKind === 188 /* ObjectLiteralExpression */) {
+        if (operatorTokenKind === 60 /* EqualsToken */ && leftKind === 189 /* ObjectLiteralExpression */) {
             // Destructuring object assignments with are ES2015 syntax
             // and possibly ES2018 if they contain rest
             transformFlags |= 16 /* AssertES2018 */ | 128 /* AssertES2015 */ | 512 /* AssertDestructuringAssignment */;
         }
-        else if (operatorTokenKind === 59 /* EqualsToken */ && leftKind === 187 /* ArrayLiteralExpression */) {
+        else if (operatorTokenKind === 60 /* EqualsToken */ && leftKind === 188 /* ArrayLiteralExpression */) {
             // Destructuring assignments are ES2015 syntax.
             transformFlags |= 128 /* AssertES2015 */ | 512 /* AssertDestructuringAssignment */;
         }
         else if (operatorTokenKind === 41 /* AsteriskAsteriskToken */
-            || operatorTokenKind === 63 /* AsteriskAsteriskEqualsToken */) {
+            || operatorTokenKind === 64 /* AsteriskAsteriskEqualsToken */) {
             // Exponentiation is ES2016 syntax.
             transformFlags |= 64 /* AssertES2016 */;
         }
@@ -30255,8 +30680,8 @@ var ts;
         // If the node is synthesized, it means the emitter put the parentheses there,
         // not the user. If we didn't want them, the emitter would not have put them
         // there.
-        if (expressionKind === 212 /* AsExpression */
-            || expressionKind === 194 /* TypeAssertionExpression */) {
+        if (expressionKind === 213 /* AsExpression */
+            || expressionKind === 195 /* TypeAssertionExpression */) {
             transformFlags |= 1 /* AssertTypeScript */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
@@ -30271,8 +30696,7 @@ var ts;
         else {
             // A ClassDeclaration is ES6 syntax.
             transformFlags = subtreeFlags | 128 /* AssertES2015 */;
-            // A class with a parameter property assignment, property initializer, computed property name, or decorator is
-            // TypeScript syntax.
+            // A class with a parameter property assignment or decorator is TypeScript syntax.
             // An exported declaration may be TypeScript syntax, but is handled by the visitor
             // for a namespace declaration.
             if ((subtreeFlags & 1024 /* ContainsTypeScriptClassSyntax */)
@@ -30286,8 +30710,7 @@ var ts;
     function computeClassExpression(node, subtreeFlags) {
         // A ClassExpression is ES6 syntax.
         var transformFlags = subtreeFlags | 128 /* AssertES2015 */;
-        // A class with a parameter property assignment, property initializer, or decorator is
-        // TypeScript syntax.
+        // A class with a parameter property assignment or decorator is TypeScript syntax.
         if (subtreeFlags & 1024 /* ContainsTypeScriptClassSyntax */
             || node.typeParameters) {
             transformFlags |= 1 /* AssertTypeScript */;
@@ -30298,11 +30721,11 @@ var ts;
     function computeHeritageClause(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
         switch (node.token) {
-            case 86 /* ExtendsKeyword */:
+            case 87 /* ExtendsKeyword */:
                 // An `extends` HeritageClause is ES6 syntax.
                 transformFlags |= 128 /* AssertES2015 */;
                 break;
-            case 109 /* ImplementsKeyword */:
+            case 110 /* ImplementsKeyword */:
                 // An `implements` HeritageClause is TypeScript syntax.
                 transformFlags |= 1 /* AssertTypeScript */;
                 break;
@@ -30359,7 +30782,6 @@ var ts;
             || ts.hasModifier(node, 2270 /* TypeScriptModifier */)
             || node.typeParameters
             || node.type
-            || (node.name && ts.isComputedPropertyName(node.name)) // While computed method names aren't typescript, the TS transform must visit them to emit property declarations correctly
             || !node.body) {
             transformFlags |= 1 /* AssertTypeScript */;
         }
@@ -30384,7 +30806,6 @@ var ts;
         if (node.decorators
             || ts.hasModifier(node, 2270 /* TypeScriptModifier */)
             || node.type
-            || (node.name && ts.isComputedPropertyName(node.name)) // While computed accessor names aren't typescript, the TS transform must visit them to emit property declarations correctly
             || !node.body) {
             transformFlags |= 1 /* AssertTypeScript */;
         }
@@ -30396,11 +30817,13 @@ var ts;
         return propagatePropertyNameFlags(node.name, transformFlags & ~537372672 /* MethodOrAccessorExcludes */);
     }
     function computePropertyDeclaration(node, subtreeFlags) {
-        // A PropertyDeclaration is TypeScript syntax.
-        var transformFlags = subtreeFlags | 1 /* AssertTypeScript */;
-        // If the PropertyDeclaration has an initializer or a computed name, we need to inform its ancestor
-        // so that it handle the transformation.
-        if (node.initializer || ts.isComputedPropertyName(node.name)) {
+        var transformFlags = subtreeFlags | 1048576 /* ContainsClassFields */;
+        // Decorators, TypeScript-specific modifiers, and type annotations are TypeScript syntax.
+        if (ts.some(node.decorators) || ts.hasModifier(node, 2270 /* TypeScriptModifier */) || node.type) {
+            transformFlags |= 1 /* AssertTypeScript */;
+        }
+        // Hoisted variables related to class properties should live within the TypeScript class wrapper.
+        if (ts.isComputedPropertyName(node.name) || (ts.hasStaticModifier(node) && node.initializer)) {
             transformFlags |= 1024 /* ContainsTypeScriptClassSyntax */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
@@ -30495,7 +30918,7 @@ var ts;
         var transformFlags = subtreeFlags;
         // If a PropertyAccessExpression starts with a super keyword, then it is
         // ES6 syntax, and requires a lexical `this` binding.
-        if (node.expression.kind === 98 /* SuperKeyword */) {
+        if (node.expression.kind === 99 /* SuperKeyword */) {
             // super inside of an async function requires hoisting the super access (ES2017).
             // same for super inside of an async generator, which is ES2018.
             transformFlags |= 32 /* ContainsES2017 */ | 16 /* ContainsES2018 */;
@@ -30507,7 +30930,7 @@ var ts;
         var transformFlags = subtreeFlags;
         // If an ElementAccessExpression starts with a super keyword, then it is
         // ES6 syntax, and requires a lexical `this` binding.
-        if (node.expression.kind === 98 /* SuperKeyword */) {
+        if (node.expression.kind === 99 /* SuperKeyword */) {
             // super inside of an async function requires hoisting the super access (ES2017).
             // same for super inside of an async generator, which is ES2018.
             transformFlags |= 32 /* ContainsES2017 */ | 16 /* ContainsES2018 */;
@@ -30595,43 +31018,43 @@ var ts;
         var transformFlags = subtreeFlags;
         var excludeFlags = 536870912 /* NodeExcludes */;
         switch (kind) {
-            case 121 /* AsyncKeyword */:
-            case 201 /* AwaitExpression */:
+            case 122 /* AsyncKeyword */:
+            case 202 /* AwaitExpression */:
                 // async/await is ES2017 syntax, but may be ES2018 syntax (for async generators)
                 transformFlags |= 16 /* AssertES2018 */ | 32 /* AssertES2017 */;
                 break;
-            case 194 /* TypeAssertionExpression */:
-            case 212 /* AsExpression */:
-            case 313 /* PartiallyEmittedExpression */:
+            case 195 /* TypeAssertionExpression */:
+            case 213 /* AsExpression */:
+            case 315 /* PartiallyEmittedExpression */:
                 // These nodes are TypeScript syntax.
                 transformFlags |= 1 /* AssertTypeScript */;
                 excludeFlags = 536870912 /* OuterExpressionExcludes */;
                 break;
-            case 115 /* PublicKeyword */:
-            case 113 /* PrivateKeyword */:
-            case 114 /* ProtectedKeyword */:
-            case 118 /* AbstractKeyword */:
-            case 125 /* DeclareKeyword */:
-            case 77 /* ConstKeyword */:
-            case 243 /* EnumDeclaration */:
-            case 278 /* EnumMember */:
-            case 213 /* NonNullExpression */:
-            case 133 /* ReadonlyKeyword */:
+            case 116 /* PublicKeyword */:
+            case 114 /* PrivateKeyword */:
+            case 115 /* ProtectedKeyword */:
+            case 119 /* AbstractKeyword */:
+            case 126 /* DeclareKeyword */:
+            case 78 /* ConstKeyword */:
+            case 244 /* EnumDeclaration */:
+            case 279 /* EnumMember */:
+            case 214 /* NonNullExpression */:
+            case 134 /* ReadonlyKeyword */:
                 // These nodes are TypeScript syntax.
                 transformFlags |= 1 /* AssertTypeScript */;
                 break;
-            case 260 /* JsxElement */:
-            case 261 /* JsxSelfClosingElement */:
-            case 262 /* JsxOpeningElement */:
+            case 261 /* JsxElement */:
+            case 262 /* JsxSelfClosingElement */:
+            case 263 /* JsxOpeningElement */:
             case 11 /* JsxText */:
-            case 263 /* JsxClosingElement */:
-            case 264 /* JsxFragment */:
-            case 265 /* JsxOpeningFragment */:
-            case 266 /* JsxClosingFragment */:
-            case 267 /* JsxAttribute */:
-            case 268 /* JsxAttributes */:
-            case 269 /* JsxSpreadAttribute */:
-            case 270 /* JsxExpression */:
+            case 264 /* JsxClosingElement */:
+            case 265 /* JsxFragment */:
+            case 266 /* JsxOpeningFragment */:
+            case 267 /* JsxClosingFragment */:
+            case 268 /* JsxAttribute */:
+            case 269 /* JsxAttributes */:
+            case 270 /* JsxSpreadAttribute */:
+            case 271 /* JsxExpression */:
                 // These nodes are Jsx syntax.
                 transformFlags |= 2 /* AssertJsx */;
                 break;
@@ -30639,11 +31062,11 @@ var ts;
             case 15 /* TemplateHead */:
             case 16 /* TemplateMiddle */:
             case 17 /* TemplateTail */:
-            case 206 /* TemplateExpression */:
-            case 193 /* TaggedTemplateExpression */:
-            case 276 /* ShorthandPropertyAssignment */:
-            case 116 /* StaticKeyword */:
-            case 214 /* MetaProperty */:
+            case 207 /* TemplateExpression */:
+            case 194 /* TaggedTemplateExpression */:
+            case 277 /* ShorthandPropertyAssignment */:
+            case 117 /* StaticKeyword */:
+            case 215 /* MetaProperty */:
                 // These nodes are ES6 syntax.
                 transformFlags |= 128 /* AssertES2015 */;
                 break;
@@ -30660,103 +31083,103 @@ var ts;
             case 9 /* BigIntLiteral */:
                 transformFlags |= 4 /* AssertESNext */;
                 break;
-            case 227 /* ForOfStatement */:
+            case 228 /* ForOfStatement */:
                 // This node is either ES2015 syntax or ES2017 syntax (if it is a for-await-of).
                 if (node.awaitModifier) {
                     transformFlags |= 16 /* AssertES2018 */;
                 }
                 transformFlags |= 128 /* AssertES2015 */;
                 break;
-            case 207 /* YieldExpression */:
+            case 208 /* YieldExpression */:
                 // This node is either ES2015 syntax (in a generator) or ES2017 syntax (in an async
                 // generator).
                 transformFlags |= 16 /* AssertES2018 */ | 128 /* AssertES2015 */ | 131072 /* ContainsYield */;
                 break;
-            case 120 /* AnyKeyword */:
-            case 135 /* NumberKeyword */:
-            case 146 /* BigIntKeyword */:
-            case 132 /* NeverKeyword */:
-            case 136 /* ObjectKeyword */:
-            case 138 /* StringKeyword */:
-            case 123 /* BooleanKeyword */:
-            case 139 /* SymbolKeyword */:
-            case 106 /* VoidKeyword */:
-            case 150 /* TypeParameter */:
-            case 153 /* PropertySignature */:
-            case 155 /* MethodSignature */:
-            case 160 /* CallSignature */:
-            case 161 /* ConstructSignature */:
-            case 162 /* IndexSignature */:
-            case 163 /* TypePredicate */:
-            case 164 /* TypeReference */:
-            case 165 /* FunctionType */:
-            case 166 /* ConstructorType */:
-            case 167 /* TypeQuery */:
-            case 168 /* TypeLiteral */:
-            case 169 /* ArrayType */:
-            case 170 /* TupleType */:
-            case 171 /* OptionalType */:
-            case 172 /* RestType */:
-            case 173 /* UnionType */:
-            case 174 /* IntersectionType */:
-            case 175 /* ConditionalType */:
-            case 176 /* InferType */:
-            case 177 /* ParenthesizedType */:
-            case 241 /* InterfaceDeclaration */:
-            case 242 /* TypeAliasDeclaration */:
-            case 178 /* ThisType */:
-            case 179 /* TypeOperator */:
-            case 180 /* IndexedAccessType */:
-            case 181 /* MappedType */:
-            case 182 /* LiteralType */:
-            case 247 /* NamespaceExportDeclaration */:
+            case 121 /* AnyKeyword */:
+            case 136 /* NumberKeyword */:
+            case 147 /* BigIntKeyword */:
+            case 133 /* NeverKeyword */:
+            case 137 /* ObjectKeyword */:
+            case 139 /* StringKeyword */:
+            case 124 /* BooleanKeyword */:
+            case 140 /* SymbolKeyword */:
+            case 107 /* VoidKeyword */:
+            case 151 /* TypeParameter */:
+            case 154 /* PropertySignature */:
+            case 156 /* MethodSignature */:
+            case 161 /* CallSignature */:
+            case 162 /* ConstructSignature */:
+            case 163 /* IndexSignature */:
+            case 164 /* TypePredicate */:
+            case 165 /* TypeReference */:
+            case 166 /* FunctionType */:
+            case 167 /* ConstructorType */:
+            case 168 /* TypeQuery */:
+            case 169 /* TypeLiteral */:
+            case 170 /* ArrayType */:
+            case 171 /* TupleType */:
+            case 172 /* OptionalType */:
+            case 173 /* RestType */:
+            case 174 /* UnionType */:
+            case 175 /* IntersectionType */:
+            case 176 /* ConditionalType */:
+            case 177 /* InferType */:
+            case 178 /* ParenthesizedType */:
+            case 242 /* InterfaceDeclaration */:
+            case 243 /* TypeAliasDeclaration */:
+            case 179 /* ThisType */:
+            case 180 /* TypeOperator */:
+            case 181 /* IndexedAccessType */:
+            case 182 /* MappedType */:
+            case 183 /* LiteralType */:
+            case 248 /* NamespaceExportDeclaration */:
                 // Types and signatures are TypeScript syntax, and exclude all other facts.
                 transformFlags = 1 /* AssertTypeScript */;
                 excludeFlags = -2 /* TypeExcludes */;
                 break;
-            case 149 /* ComputedPropertyName */:
+            case 150 /* ComputedPropertyName */:
                 // Even though computed property names are ES6, we don't treat them as such.
                 // This is so that they can flow through PropertyName transforms unaffected.
                 // Instead, we mark the container as ES6, so that it can properly handle the transform.
                 transformFlags |= 16384 /* ContainsComputedPropertyName */;
                 break;
-            case 208 /* SpreadElement */:
+            case 209 /* SpreadElement */:
                 transformFlags |= 128 /* AssertES2015 */ | 4096 /* ContainsRestOrSpread */;
                 break;
-            case 277 /* SpreadAssignment */:
+            case 278 /* SpreadAssignment */:
                 transformFlags |= 16 /* AssertES2018 */ | 8192 /* ContainsObjectRestOrSpread */;
                 break;
-            case 98 /* SuperKeyword */:
+            case 99 /* SuperKeyword */:
                 // This node is ES6 syntax.
                 transformFlags |= 128 /* AssertES2015 */;
                 excludeFlags = 536870912 /* OuterExpressionExcludes */; // must be set to persist `Super`
                 break;
-            case 100 /* ThisKeyword */:
+            case 101 /* ThisKeyword */:
                 // Mark this node and its ancestors as containing a lexical `this` keyword.
                 transformFlags |= 2048 /* ContainsLexicalThis */;
                 break;
-            case 184 /* ObjectBindingPattern */:
+            case 185 /* ObjectBindingPattern */:
                 transformFlags |= 128 /* AssertES2015 */ | 65536 /* ContainsBindingPattern */;
                 if (subtreeFlags & 4096 /* ContainsRestOrSpread */) {
                     transformFlags |= 16 /* AssertES2018 */ | 8192 /* ContainsObjectRestOrSpread */;
                 }
                 excludeFlags = 536875008 /* BindingPatternExcludes */;
                 break;
-            case 185 /* ArrayBindingPattern */:
+            case 186 /* ArrayBindingPattern */:
                 transformFlags |= 128 /* AssertES2015 */ | 65536 /* ContainsBindingPattern */;
                 excludeFlags = 536875008 /* BindingPatternExcludes */;
                 break;
-            case 186 /* BindingElement */:
+            case 187 /* BindingElement */:
                 transformFlags |= 128 /* AssertES2015 */;
                 if (node.dotDotDotToken) {
                     transformFlags |= 4096 /* ContainsRestOrSpread */;
                 }
                 break;
-            case 152 /* Decorator */:
+            case 153 /* Decorator */:
                 // This node is TypeScript syntax, and marks its container as also being TypeScript syntax.
                 transformFlags |= 1 /* AssertTypeScript */ | 1024 /* ContainsTypeScriptClassSyntax */;
                 break;
-            case 188 /* ObjectLiteralExpression */:
+            case 189 /* ObjectLiteralExpression */:
                 excludeFlags = 536896512 /* ObjectLiteralExcludes */;
                 if (subtreeFlags & 16384 /* ContainsComputedPropertyName */) {
                     // If an ObjectLiteralExpression contains a ComputedPropertyName, then it
@@ -30769,26 +31192,26 @@ var ts;
                     transformFlags |= 16 /* AssertES2018 */;
                 }
                 break;
-            case 187 /* ArrayLiteralExpression */:
+            case 188 /* ArrayLiteralExpression */:
                 excludeFlags = 536875008 /* ArrayLiteralOrCallOrNewExcludes */;
                 break;
-            case 223 /* DoStatement */:
-            case 224 /* WhileStatement */:
-            case 225 /* ForStatement */:
-            case 226 /* ForInStatement */:
+            case 224 /* DoStatement */:
+            case 225 /* WhileStatement */:
+            case 226 /* ForStatement */:
+            case 227 /* ForInStatement */:
                 // A loop containing a block scoped binding *may* need to be transformed from ES6.
                 if (subtreeFlags & 32768 /* ContainsBlockScopedBinding */) {
                     transformFlags |= 128 /* AssertES2015 */;
                 }
                 break;
-            case 284 /* SourceFile */:
+            case 285 /* SourceFile */:
                 break;
-            case 230 /* ReturnStatement */:
+            case 231 /* ReturnStatement */:
                 // Return statements may require an `await` in ES2018.
                 transformFlags |= 262144 /* ContainsHoistedDeclarationOrCompletion */ | 16 /* AssertES2018 */;
                 break;
-            case 228 /* ContinueStatement */:
-            case 229 /* BreakStatement */:
+            case 229 /* ContinueStatement */:
+            case 230 /* BreakStatement */:
                 transformFlags |= 262144 /* ContainsHoistedDeclarationOrCompletion */;
                 break;
         }
@@ -30806,67 +31229,67 @@ var ts;
      *       than calling this function.
      */
     function getTransformFlagsSubtreeExclusions(kind) {
-        if (kind >= 163 /* FirstTypeNode */ && kind <= 183 /* LastTypeNode */) {
+        if (kind >= 164 /* FirstTypeNode */ && kind <= 184 /* LastTypeNode */) {
             return -2 /* TypeExcludes */;
         }
         switch (kind) {
-            case 191 /* CallExpression */:
-            case 192 /* NewExpression */:
-            case 187 /* ArrayLiteralExpression */:
+            case 192 /* CallExpression */:
+            case 193 /* NewExpression */:
+            case 188 /* ArrayLiteralExpression */:
                 return 536875008 /* ArrayLiteralOrCallOrNewExcludes */;
-            case 244 /* ModuleDeclaration */:
+            case 245 /* ModuleDeclaration */:
                 return 537168896 /* ModuleExcludes */;
-            case 151 /* Parameter */:
+            case 152 /* Parameter */:
                 return 536870912 /* ParameterExcludes */;
-            case 197 /* ArrowFunction */:
+            case 198 /* ArrowFunction */:
                 return 537371648 /* ArrowFunctionExcludes */;
-            case 196 /* FunctionExpression */:
-            case 239 /* FunctionDeclaration */:
+            case 197 /* FunctionExpression */:
+            case 240 /* FunctionDeclaration */:
                 return 537373696 /* FunctionExcludes */;
-            case 238 /* VariableDeclarationList */:
+            case 239 /* VariableDeclarationList */:
                 return 536944640 /* VariableDeclarationListExcludes */;
-            case 240 /* ClassDeclaration */:
-            case 209 /* ClassExpression */:
+            case 241 /* ClassDeclaration */:
+            case 210 /* ClassExpression */:
                 return 536888320 /* ClassExcludes */;
-            case 157 /* Constructor */:
+            case 158 /* Constructor */:
                 return 537372672 /* ConstructorExcludes */;
-            case 156 /* MethodDeclaration */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
+            case 157 /* MethodDeclaration */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
                 return 537372672 /* MethodOrAccessorExcludes */;
-            case 120 /* AnyKeyword */:
-            case 135 /* NumberKeyword */:
-            case 146 /* BigIntKeyword */:
-            case 132 /* NeverKeyword */:
-            case 138 /* StringKeyword */:
-            case 136 /* ObjectKeyword */:
-            case 123 /* BooleanKeyword */:
-            case 139 /* SymbolKeyword */:
-            case 106 /* VoidKeyword */:
-            case 150 /* TypeParameter */:
-            case 153 /* PropertySignature */:
-            case 155 /* MethodSignature */:
-            case 160 /* CallSignature */:
-            case 161 /* ConstructSignature */:
-            case 162 /* IndexSignature */:
-            case 241 /* InterfaceDeclaration */:
-            case 242 /* TypeAliasDeclaration */:
+            case 121 /* AnyKeyword */:
+            case 136 /* NumberKeyword */:
+            case 147 /* BigIntKeyword */:
+            case 133 /* NeverKeyword */:
+            case 139 /* StringKeyword */:
+            case 137 /* ObjectKeyword */:
+            case 124 /* BooleanKeyword */:
+            case 140 /* SymbolKeyword */:
+            case 107 /* VoidKeyword */:
+            case 151 /* TypeParameter */:
+            case 154 /* PropertySignature */:
+            case 156 /* MethodSignature */:
+            case 161 /* CallSignature */:
+            case 162 /* ConstructSignature */:
+            case 163 /* IndexSignature */:
+            case 242 /* InterfaceDeclaration */:
+            case 243 /* TypeAliasDeclaration */:
                 return -2 /* TypeExcludes */;
-            case 188 /* ObjectLiteralExpression */:
+            case 189 /* ObjectLiteralExpression */:
                 return 536896512 /* ObjectLiteralExcludes */;
-            case 274 /* CatchClause */:
+            case 275 /* CatchClause */:
                 return 536879104 /* CatchClauseExcludes */;
-            case 184 /* ObjectBindingPattern */:
-            case 185 /* ArrayBindingPattern */:
+            case 185 /* ObjectBindingPattern */:
+            case 186 /* ArrayBindingPattern */:
                 return 536875008 /* BindingPatternExcludes */;
-            case 194 /* TypeAssertionExpression */:
-            case 212 /* AsExpression */:
-            case 313 /* PartiallyEmittedExpression */:
-            case 195 /* ParenthesizedExpression */:
-            case 98 /* SuperKeyword */:
+            case 195 /* TypeAssertionExpression */:
+            case 213 /* AsExpression */:
+            case 315 /* PartiallyEmittedExpression */:
+            case 196 /* ParenthesizedExpression */:
+            case 99 /* SuperKeyword */:
                 return 536870912 /* OuterExpressionExcludes */;
-            case 189 /* PropertyAccessExpression */:
-            case 190 /* ElementAccessExpression */:
+            case 190 /* PropertyAccessExpression */:
+            case 191 /* ElementAccessExpression */:
                 return 536870912 /* PropertyAccessExcludes */;
             default:
                 return 536870912 /* NodeExcludes */;
@@ -31041,7 +31464,7 @@ var ts;
                     //  (their type resolved directly to the member deeply referenced)
                     // So to get the intervening symbols, we need to check if there's a type
                     // query node on any of the symbol's declarations and get symbols there
-                    if (d.type && d.type.kind === 167 /* TypeQuery */) {
+                    if (d.type && d.type.kind === 168 /* TypeQuery */) {
                         var query = d.type;
                         var entity = getResolvedSymbol(getFirstIdentifier(query.exprName));
                         visitSymbol(entity);
@@ -31061,6 +31484,37 @@ var ts;
     var nextNodeId = 1;
     var nextMergeId = 1;
     var nextFlowId = 1;
+    var IterationUse;
+    (function (IterationUse) {
+        IterationUse[IterationUse["AllowsSyncIterablesFlag"] = 1] = "AllowsSyncIterablesFlag";
+        IterationUse[IterationUse["AllowsAsyncIterablesFlag"] = 2] = "AllowsAsyncIterablesFlag";
+        IterationUse[IterationUse["AllowsStringInputFlag"] = 4] = "AllowsStringInputFlag";
+        IterationUse[IterationUse["ForOfFlag"] = 8] = "ForOfFlag";
+        IterationUse[IterationUse["YieldStarFlag"] = 16] = "YieldStarFlag";
+        IterationUse[IterationUse["SpreadFlag"] = 32] = "SpreadFlag";
+        IterationUse[IterationUse["DestructuringFlag"] = 64] = "DestructuringFlag";
+        // Spread, Destructuring, Array element assignment
+        IterationUse[IterationUse["Element"] = 1] = "Element";
+        IterationUse[IterationUse["Spread"] = 33] = "Spread";
+        IterationUse[IterationUse["Destructuring"] = 65] = "Destructuring";
+        IterationUse[IterationUse["ForOf"] = 13] = "ForOf";
+        IterationUse[IterationUse["ForAwaitOf"] = 15] = "ForAwaitOf";
+        IterationUse[IterationUse["YieldStar"] = 17] = "YieldStar";
+        IterationUse[IterationUse["AsyncYieldStar"] = 19] = "AsyncYieldStar";
+        IterationUse[IterationUse["GeneratorReturnType"] = 1] = "GeneratorReturnType";
+        IterationUse[IterationUse["AsyncGeneratorReturnType"] = 2] = "AsyncGeneratorReturnType";
+    })(IterationUse || (IterationUse = {}));
+    var IterationTypeKind;
+    (function (IterationTypeKind) {
+        IterationTypeKind[IterationTypeKind["Yield"] = 0] = "Yield";
+        IterationTypeKind[IterationTypeKind["Return"] = 1] = "Return";
+        IterationTypeKind[IterationTypeKind["Next"] = 2] = "Next";
+    })(IterationTypeKind || (IterationTypeKind = {}));
+    var WideningKind;
+    (function (WideningKind) {
+        WideningKind[WideningKind["Normal"] = 0] = "Normal";
+        WideningKind[WideningKind["GeneratorYield"] = 1] = "GeneratorYield";
+    })(WideningKind || (WideningKind = {}));
     function getNodeId(node) {
         if (!node.id) {
             node.id = nextNodeId;
@@ -31116,6 +31570,7 @@ var ts;
         var typeCount = 0;
         var symbolCount = 0;
         var enumCount = 0;
+        var instantiationCount = 0;
         var instantiationDepth = 0;
         var constraintDepth = 0;
         var currentNode;
@@ -31140,8 +31595,6 @@ var ts;
         undefinedSymbol.declarations = [];
         var globalThisSymbol = createSymbol(1536 /* Module */, "globalThis", 8 /* Readonly */);
         globalThisSymbol.exports = globals;
-        globalThisSymbol.valueDeclaration = ts.createNode(72 /* Identifier */);
-        globalThisSymbol.valueDeclaration.escapedText = "globalThis";
         globals.set(globalThisSymbol.escapedName, globalThisSymbol);
         var argumentsSymbol = createSymbol(4 /* Property */, "arguments");
         var requireSymbol = createSymbol(4 /* Property */, "require");
@@ -31157,6 +31610,11 @@ var ts;
             getIdentifierCount: function () { return ts.sum(host.getSourceFiles(), "identifierCount"); },
             getSymbolCount: function () { return ts.sum(host.getSourceFiles(), "symbolCount") + symbolCount; },
             getTypeCount: function () { return typeCount; },
+            getRelationCacheSizes: function () { return ({
+                assignable: assignableRelation.size,
+                identity: identityRelation.size,
+                subtype: subtypeRelation.size,
+            }); },
             isUndefinedSymbol: function (symbol) { return symbol === undefinedSymbol; },
             isArgumentsSymbol: function (symbol) { return symbol === argumentsSymbol; },
             isUnknownSymbol: function (symbol) { return symbol === unknownSymbol; },
@@ -31223,6 +31681,10 @@ var ts;
                 node = ts.getParseTreeNode(node);
                 return node ? getTypeOfNode(node) : errorType;
             },
+            getTypeOfAssignmentPattern: function (nodeIn) {
+                var node = ts.getParseTreeNode(nodeIn, ts.isAssignmentPattern);
+                return node && getTypeOfAssignmentPattern(node) || errorType;
+            },
             getPropertySymbolOfDestructuringAssignment: function (locationIn) {
                 var location = ts.getParseTreeNode(locationIn, ts.isIdentifier);
                 return location ? getPropertySymbolOfDestructuringAssignment(location) : undefined;
@@ -31271,12 +31733,14 @@ var ts;
             },
             isContextSensitive: isContextSensitive,
             getFullyQualifiedName: getFullyQualifiedName,
-            getResolvedSignature: function (node, candidatesOutArray, agumentCount) {
-                return getResolvedSignatureWorker(node, candidatesOutArray, agumentCount, 0 /* Normal */);
+            getResolvedSignature: function (node, candidatesOutArray, argumentCount) {
+                return getResolvedSignatureWorker(node, candidatesOutArray, argumentCount, 0 /* Normal */);
             },
-            getResolvedSignatureForSignatureHelp: function (node, candidatesOutArray, agumentCount) {
-                return getResolvedSignatureWorker(node, candidatesOutArray, agumentCount, 16 /* IsForSignatureHelp */);
+            getResolvedSignatureForSignatureHelp: function (node, candidatesOutArray, argumentCount) {
+                return getResolvedSignatureWorker(node, candidatesOutArray, argumentCount, 16 /* IsForSignatureHelp */);
             },
+            getExpandedParameters: getExpandedParameters,
+            hasEffectiveRestParameter: hasEffectiveRestParameter,
             getConstantValue: function (nodeIn) {
                 var node = ts.getParseTreeNode(nodeIn, canHaveConstantValue);
                 return node ? getConstantValue(node) : undefined;
@@ -31338,6 +31802,8 @@ var ts;
             getNeverType: function () { return neverType; },
             isSymbolAccessible: isSymbolAccessible,
             getObjectFlags: ts.getObjectFlags,
+            isArrayType: isArrayType,
+            isTupleType: isTupleType,
             isArrayLikeType: isArrayLikeType,
             isTypeInvalidDueToUnionDiscriminant: isTypeInvalidDueToUnionDiscriminant,
             getAllPossiblePropertiesOfTypes: getAllPossiblePropertiesOfTypes,
@@ -31414,7 +31880,7 @@ var ts;
         var intersectionTypes = ts.createMap();
         var literalTypes = ts.createMap();
         var indexedAccessTypes = ts.createMap();
-        var conditionalTypes = ts.createMap();
+        var substitutionTypes = ts.createMap();
         var evolvingArrayTypes = [];
         var undefinedProperties = ts.createMap();
         var unknownSymbol = createSymbol(4 /* Property */, "unknown");
@@ -31424,10 +31890,10 @@ var ts;
         var wildcardType = createIntrinsicType(1 /* Any */, "any");
         var errorType = createIntrinsicType(1 /* Any */, "error");
         var unknownType = createIntrinsicType(2 /* Unknown */, "unknown");
-        var undefinedType = createNullableType(32768 /* Undefined */, "undefined", 0);
-        var undefinedWideningType = strictNullChecks ? undefinedType : createNullableType(32768 /* Undefined */, "undefined", 131072 /* ContainsWideningType */);
-        var nullType = createNullableType(65536 /* Null */, "null", 0);
-        var nullWideningType = strictNullChecks ? nullType : createNullableType(65536 /* Null */, "null", 131072 /* ContainsWideningType */);
+        var undefinedType = createIntrinsicType(32768 /* Undefined */, "undefined");
+        var undefinedWideningType = strictNullChecks ? undefinedType : createIntrinsicType(32768 /* Undefined */, "undefined", 262144 /* ContainsWideningType */);
+        var nullType = createIntrinsicType(65536 /* Null */, "null");
+        var nullWideningType = strictNullChecks ? nullType : createIntrinsicType(65536 /* Null */, "null", 262144 /* ContainsWideningType */);
         var stringType = createIntrinsicType(4 /* String */, "string");
         var numberType = createIntrinsicType(8 /* Number */, "number");
         var bigintType = createIntrinsicType(64 /* BigInt */, "bigint");
@@ -31453,6 +31919,7 @@ var ts;
         var voidType = createIntrinsicType(16384 /* Void */, "void");
         var neverType = createIntrinsicType(131072 /* Never */, "never");
         var silentNeverType = createIntrinsicType(131072 /* Never */, "never");
+        var nonInferrableType = createIntrinsicType(131072 /* Never */, "never", 1048576 /* NonInferrableType */);
         var implicitNeverType = createIntrinsicType(131072 /* Never */, "never");
         var nonPrimitiveType = createIntrinsicType(67108864 /* NonPrimitive */, "object");
         var stringNumberSymbolType = getUnionType([stringType, numberType, esSymbolType]);
@@ -31469,7 +31936,7 @@ var ts;
         var anyFunctionType = createAnonymousType(undefined, emptySymbols, ts.emptyArray, ts.emptyArray, undefined, undefined);
         // The anyFunctionType contains the anyFunctionType by definition. The flag is further propagated
         // in getPropagatingFlagsOfTypes, and it is checked in inferFromTypes.
-        anyFunctionType.objectFlags |= 524288 /* ContainsAnyFunctionType */;
+        anyFunctionType.objectFlags |= 1048576 /* NonInferrableType */;
         var noConstraintType = createAnonymousType(undefined, emptySymbols, ts.emptyArray, ts.emptyArray, undefined, undefined);
         var circularConstraintType = createAnonymousType(undefined, emptySymbols, ts.emptyArray, ts.emptyArray, undefined, undefined);
         var resolvingDefaultType = createAnonymousType(undefined, emptySymbols, ts.emptyArray, ts.emptyArray, undefined, undefined);
@@ -31483,6 +31950,41 @@ var ts;
         var resolvingSignature = createSignature(undefined, undefined, undefined, ts.emptyArray, anyType, /*resolvedTypePredicate*/ undefined, 0, /*hasRestParameter*/ false, /*hasLiteralTypes*/ false);
         var silentNeverSignature = createSignature(undefined, undefined, undefined, ts.emptyArray, silentNeverType, /*resolvedTypePredicate*/ undefined, 0, /*hasRestParameter*/ false, /*hasLiteralTypes*/ false);
         var enumNumberIndexInfo = createIndexInfo(stringType, /*isReadonly*/ true);
+        var iterationTypesCache = ts.createMap(); // cache for common IterationTypes instances
+        var noIterationTypes = {
+            get yieldType() { throw new Error("Not supported"); },
+            get returnType() { throw new Error("Not supported"); },
+            get nextType() { throw new Error("Not supported"); },
+        };
+        var anyIterationTypes = createIterationTypes(anyType, anyType, anyType);
+        var anyIterationTypesExceptNext = createIterationTypes(anyType, anyType, unknownType);
+        var defaultIterationTypes = createIterationTypes(neverType, anyType, undefinedType); // default iteration types for `Iterator`.
+        var asyncIterationTypesResolver = {
+            iterableCacheKey: "iterationTypesOfAsyncIterable",
+            iteratorCacheKey: "iterationTypesOfAsyncIterator",
+            iteratorSymbolName: "asyncIterator",
+            getGlobalIteratorType: getGlobalAsyncIteratorType,
+            getGlobalIterableType: getGlobalAsyncIterableType,
+            getGlobalIterableIteratorType: getGlobalAsyncIterableIteratorType,
+            getGlobalGeneratorType: getGlobalAsyncGeneratorType,
+            resolveIterationType: getAwaitedType,
+            mustHaveANextMethodDiagnostic: ts.Diagnostics.An_async_iterator_must_have_a_next_method,
+            mustBeAMethodDiagnostic: ts.Diagnostics.The_0_property_of_an_async_iterator_must_be_a_method,
+            mustHaveAValueDiagnostic: ts.Diagnostics.The_type_returned_by_the_0_method_of_an_async_iterator_must_be_a_promise_for_a_type_with_a_value_property,
+        };
+        var syncIterationTypesResolver = {
+            iterableCacheKey: "iterationTypesOfIterable",
+            iteratorCacheKey: "iterationTypesOfIterator",
+            iteratorSymbolName: "iterator",
+            getGlobalIteratorType: getGlobalIteratorType,
+            getGlobalIterableType: getGlobalIterableType,
+            getGlobalIterableIteratorType: getGlobalIterableIteratorType,
+            getGlobalGeneratorType: getGlobalGeneratorType,
+            resolveIterationType: function (type, _errorNode) { return type; },
+            mustHaveANextMethodDiagnostic: ts.Diagnostics.An_iterator_must_have_a_next_method,
+            mustBeAMethodDiagnostic: ts.Diagnostics.The_0_property_of_an_iterator_must_be_a_method,
+            mustHaveAValueDiagnostic: ts.Diagnostics.The_type_returned_by_the_0_method_of_an_iterator_must_have_a_value_property,
+        };
         /** Key is "/path/to/a.ts|/path/to/b.ts". */
         var amalgamatedDuplicates;
         var reverseMappedCache = ts.createMap();
@@ -31493,6 +31995,7 @@ var ts;
          * This is only used if there is no exact match.
          */
         var patternAmbientModules;
+        var patternAmbientModuleAugmentations;
         var globalObjectType;
         var globalFunctionType;
         var globalCallableFunctionType;
@@ -31521,14 +32024,17 @@ var ts;
         var deferredGlobalIterableType;
         var deferredGlobalIteratorType;
         var deferredGlobalIterableIteratorType;
+        var deferredGlobalGeneratorType;
+        var deferredGlobalIteratorYieldResultType;
+        var deferredGlobalIteratorReturnResultType;
         var deferredGlobalAsyncIterableType;
         var deferredGlobalAsyncIteratorType;
         var deferredGlobalAsyncIterableIteratorType;
+        var deferredGlobalAsyncGeneratorType;
         var deferredGlobalTemplateStringsArrayType;
         var deferredGlobalImportMetaType;
         var deferredGlobalExtractSymbol;
-        var deferredGlobalExcludeSymbol;
-        var deferredGlobalPickSymbol;
+        var deferredGlobalOmitSymbol;
         var deferredGlobalBigIntType;
         var allPotentiallyUnusedIdentifiers = ts.createMap(); // key is file name
         var flowLoopStart = 0;
@@ -31547,6 +32053,8 @@ var ts;
         var symbolLinks = [];
         var nodeLinks = [];
         var flowLoopCaches = [];
+        var flowAssignmentKeys = [];
+        var flowAssignmentTypes = [];
         var flowLoopNodes = [];
         var flowLoopKeys = [];
         var flowLoopTypes = [];
@@ -31663,6 +32171,7 @@ var ts;
         var typeofType = createTypeofType();
         var _jsxNamespace;
         var _jsxFactoryEntity;
+        var outofbandVarianceMarkerHandler;
         var subtypeRelation = ts.createMap();
         var assignableRelation = ts.createMap();
         var comparableRelation = ts.createMap();
@@ -31687,6 +32196,19 @@ var ts;
             CheckMode[CheckMode["SkipGenericFunctions"] = 8] = "SkipGenericFunctions";
             CheckMode[CheckMode["IsForSignatureHelp"] = 16] = "IsForSignatureHelp";
         })(CheckMode || (CheckMode = {}));
+        var ContextFlags;
+        (function (ContextFlags) {
+            ContextFlags[ContextFlags["None"] = 0] = "None";
+            ContextFlags[ContextFlags["Signature"] = 1] = "Signature";
+        })(ContextFlags || (ContextFlags = {}));
+        var AccessFlags;
+        (function (AccessFlags) {
+            AccessFlags[AccessFlags["None"] = 0] = "None";
+            AccessFlags[AccessFlags["NoIndexSignatures"] = 1] = "NoIndexSignatures";
+            AccessFlags[AccessFlags["Writing"] = 2] = "Writing";
+            AccessFlags[AccessFlags["CacheSymbol"] = 4] = "CacheSymbol";
+            AccessFlags[AccessFlags["NoTupleBoundsCheck"] = 8] = "NoTupleBoundsCheck";
+        })(AccessFlags || (AccessFlags = {}));
         var CallbackCheck;
         (function (CallbackCheck) {
             CallbackCheck[CallbackCheck["None"] = 0] = "None";
@@ -31772,18 +32294,6 @@ var ts;
                 return diagnostic;
             }
         }
-        function addRelatedInfo(diagnostic) {
-            var relatedInformation = [];
-            for (var _i = 1; _i < arguments.length; _i++) {
-                relatedInformation[_i - 1] = arguments[_i];
-            }
-            var _a;
-            if (!diagnostic.relatedInformation) {
-                diagnostic.relatedInformation = [];
-            }
-            (_a = diagnostic.relatedInformation).push.apply(_a, relatedInformation);
-            return diagnostic;
-        }
         function error(location, message, arg0, arg1, arg2, arg3) {
             var diagnostic = location
                 ? ts.createDiagnosticForNode(location, message, arg0, arg1, arg2, arg3)
@@ -31802,6 +32312,14 @@ var ts;
         function errorOrSuggestion(isError, location, message, arg0, arg1, arg2, arg3) {
             addErrorOrSuggestion(isError, "message" in message ? ts.createDiagnosticForNode(location, message, arg0, arg1, arg2, arg3) : ts.createDiagnosticForNodeFromMessageChain(location, message));
         }
+        function errorAndMaybeSuggestAwait(location, maybeMissingAwait, message, arg0, arg1, arg2, arg3) {
+            var diagnostic = error(location, message, arg0, arg1, arg2, arg3);
+            if (maybeMissingAwait) {
+                var related = ts.createDiagnosticForNode(location, ts.Diagnostics.Did_you_forget_to_use_await);
+                ts.addRelatedInfo(diagnostic, related);
+            }
+            return diagnostic;
+        }
         function createSymbol(flags, name, checkFlags) {
             symbolCount++;
             var symbol = (new Symbol(flags | 33554432 /* Transient */, name));
@@ -31873,7 +32391,8 @@ var ts;
          * Note: if target is transient, then it is mutable, and mergeSymbol with both mutate and return it.
          * If target is not transient, mergeSymbol will produce a transient clone, mutate that and return it.
          */
-        function mergeSymbol(target, source) {
+        function mergeSymbol(target, source, unidirectional) {
+            if (unidirectional === void 0) { unidirectional = false; }
             if (!(target.flags & getExcludedSymbolFlags(source.flags)) ||
                 (source.flags | target.flags) & 67108864 /* Assignment */) {
                 ts.Debug.assert(source !== target);
@@ -31901,17 +32420,24 @@ var ts;
                 if (source.members) {
                     if (!target.members)
                         target.members = ts.createSymbolTable();
-                    mergeSymbolTable(target.members, source.members);
+                    mergeSymbolTable(target.members, source.members, unidirectional);
                 }
                 if (source.exports) {
                     if (!target.exports)
                         target.exports = ts.createSymbolTable();
-                    mergeSymbolTable(target.exports, source.exports);
+                    mergeSymbolTable(target.exports, source.exports, unidirectional);
+                }
+                if (!unidirectional) {
+                    recordMergedSymbol(target, source);
                 }
-                recordMergedSymbol(target, source);
             }
             else if (target.flags & 1024 /* NamespaceModule */) {
-                error(ts.getNameOfDeclaration(source.declarations[0]), ts.Diagnostics.Cannot_augment_module_0_with_value_exports_because_it_resolves_to_a_non_module_entity, symbolToString(target));
+                // Do not report an error when merging `var globalThis` with the built-in `globalThis`,
+                // as we will already report a "Declaration name conflicts..." error, and this error
+                // won't make much sense.
+                if (target !== globalThisSymbol) {
+                    error(ts.getNameOfDeclaration(source.declarations[0]), ts.Diagnostics.Cannot_augment_module_0_with_value_exports_because_it_resolves_to_a_non_module_entity, symbolToString(target));
+                }
             }
             else { // error
                 var isEitherEnum = !!(target.flags & 384 /* Enum */ || source.flags & 384 /* Enum */);
@@ -31963,7 +32489,7 @@ var ts;
                 err.relatedInformation = err.relatedInformation || [];
                 if (ts.length(err.relatedInformation) >= 5)
                     continue;
-                addRelatedInfo(err, !ts.length(err.relatedInformation) ? ts.createDiagnosticForNode(relatedNode, ts.Diagnostics._0_was_also_declared_here, symbolName) : ts.createDiagnosticForNode(relatedNode, ts.Diagnostics.and_here));
+                ts.addRelatedInfo(err, !ts.length(err.relatedInformation) ? ts.createDiagnosticForNode(relatedNode, ts.Diagnostics._0_was_also_declared_here, symbolName) : ts.createDiagnosticForNode(relatedNode, ts.Diagnostics.and_here));
             }
         }
         function combineSymbolTables(first, second) {
@@ -31976,10 +32502,11 @@ var ts;
             mergeSymbolTable(combined, second);
             return combined;
         }
-        function mergeSymbolTable(target, source) {
+        function mergeSymbolTable(target, source, unidirectional) {
+            if (unidirectional === void 0) { unidirectional = false; }
             source.forEach(function (sourceSymbol, id) {
                 var targetSymbol = target.get(id);
-                target.set(id, targetSymbol ? mergeSymbol(targetSymbol, sourceSymbol) : sourceSymbol);
+                target.set(id, targetSymbol ? mergeSymbol(targetSymbol, sourceSymbol, unidirectional) : sourceSymbol);
             });
         }
         function mergeModuleAugmentation(moduleName) {
@@ -32000,14 +32527,29 @@ var ts;
                 var moduleNotFoundError = !(moduleName.parent.parent.flags & 4194304 /* Ambient */)
                     ? ts.Diagnostics.Invalid_module_name_in_augmentation_module_0_cannot_be_found
                     : undefined;
-                var mainModule = resolveExternalModuleNameWorker(moduleName, moduleName, moduleNotFoundError, /*isForAugmentation*/ true);
-                if (!mainModule) {
+                var mainModule_1 = resolveExternalModuleNameWorker(moduleName, moduleName, moduleNotFoundError, /*isForAugmentation*/ true);
+                if (!mainModule_1) {
                     return;
                 }
                 // obtain item referenced by 'export='
-                mainModule = resolveExternalModuleSymbol(mainModule);
-                if (mainModule.flags & 1920 /* Namespace */) {
-                    mainModule = mergeSymbol(mainModule, moduleAugmentation.symbol);
+                mainModule_1 = resolveExternalModuleSymbol(mainModule_1);
+                if (mainModule_1.flags & 1920 /* Namespace */) {
+                    // If we’re merging an augmentation to a pattern ambient module, we want to
+                    // perform the merge unidirectionally from the augmentation ('a.foo') to
+                    // the pattern ('*.foo'), so that 'getMergedSymbol()' on a.foo gives you
+                    // all the exports both from the pattern and from the augmentation, but
+                    // 'getMergedSymbol()' on *.foo only gives you exports from *.foo.
+                    if (ts.some(patternAmbientModules, function (module) { return mainModule_1 === module.symbol; })) {
+                        var merged = mergeSymbol(moduleAugmentation.symbol, mainModule_1, /*unidirectional*/ true);
+                        if (!patternAmbientModuleAugmentations) {
+                            patternAmbientModuleAugmentations = ts.createMap();
+                        }
+                        // moduleName will be a StringLiteral since this is not `declare global`.
+                        patternAmbientModuleAugmentations.set(moduleName.text, merged);
+                    }
+                    else {
+                        mergeSymbol(mainModule_1, moduleAugmentation.symbol);
+                    }
                 }
                 else {
                     // moduleName will be a StringLiteral since this is not `declare global`.
@@ -32041,7 +32583,7 @@ var ts;
             return nodeLinks[nodeId] || (nodeLinks[nodeId] = { flags: 0 });
         }
         function isGlobalSourceFile(node) {
-            return node.kind === 284 /* SourceFile */ && !ts.isExternalOrCommonJsModule(node);
+            return node.kind === 285 /* SourceFile */ && !ts.isExternalOrCommonJsModule(node);
         }
         function getSymbol(symbols, name, meaning) {
             if (meaning) {
@@ -32099,17 +32641,17 @@ var ts;
             }
             if (declaration.pos <= usage.pos) {
                 // declaration is before usage
-                if (declaration.kind === 186 /* BindingElement */) {
+                if (declaration.kind === 187 /* BindingElement */) {
                     // still might be illegal if declaration and usage are both binding elements (eg var [a = b, b = b] = [1, 2])
-                    var errorBindingElement = ts.getAncestor(usage, 186 /* BindingElement */);
+                    var errorBindingElement = ts.getAncestor(usage, 187 /* BindingElement */);
                     if (errorBindingElement) {
                         return ts.findAncestor(errorBindingElement, ts.isBindingElement) !== ts.findAncestor(declaration, ts.isBindingElement) ||
                             declaration.pos < errorBindingElement.pos;
                     }
                     // or it might be illegal if usage happens before parent variable is declared (eg var [a] = a)
-                    return isBlockScopedNameDeclaredBeforeUse(ts.getAncestor(declaration, 237 /* VariableDeclaration */), usage);
+                    return isBlockScopedNameDeclaredBeforeUse(ts.getAncestor(declaration, 238 /* VariableDeclaration */), usage);
                 }
-                else if (declaration.kind === 237 /* VariableDeclaration */) {
+                else if (declaration.kind === 238 /* VariableDeclaration */) {
                     // still might be illegal if usage is in the initializer of the variable declaration (eg var a = a)
                     return !isImmediatelyUsedInInitializerOfBlockScopedVariable(declaration, usage);
                 }
@@ -32117,6 +32659,10 @@ var ts;
                     // still might be illegal if the usage is within a computed property name in the class (eg class A { static p = "a"; [A.p]() {} })
                     return !ts.findAncestor(usage, function (n) { return ts.isComputedPropertyName(n) && n.parent.parent === declaration; });
                 }
+                else if (ts.isPropertyDeclaration(declaration)) {
+                    // still might be illegal if a self-referencing property initializer (eg private x = this.x)
+                    return !isPropertyImmediatelyReferencedWithinDeclaration(declaration, usage);
+                }
                 return true;
             }
             // declaration is after usage, but it can still be legal if usage is deferred:
@@ -32128,12 +32674,12 @@ var ts;
             // or if usage is in a type context:
             // 1. inside a type query (typeof in type position)
             // 2. inside a jsdoc comment
-            if (usage.parent.kind === 257 /* ExportSpecifier */ || (usage.parent.kind === 254 /* ExportAssignment */ && usage.parent.isExportEquals)) {
+            if (usage.parent.kind === 258 /* ExportSpecifier */ || (usage.parent.kind === 255 /* ExportAssignment */ && usage.parent.isExportEquals)) {
                 // export specifiers do not use the variable, they only make it available for use
                 return true;
             }
             // When resolving symbols for exports, the `usage` location passed in can be the export site directly
-            if (usage.kind === 254 /* ExportAssignment */ && usage.isExportEquals) {
+            if (usage.kind === 255 /* ExportAssignment */ && usage.isExportEquals) {
                 return true;
             }
             var container = ts.getEnclosingBlockScopeContainer(declaration);
@@ -32141,9 +32687,9 @@ var ts;
             function isImmediatelyUsedInInitializerOfBlockScopedVariable(declaration, usage) {
                 var container = ts.getEnclosingBlockScopeContainer(declaration);
                 switch (declaration.parent.parent.kind) {
-                    case 219 /* VariableStatement */:
-                    case 225 /* ForStatement */:
-                    case 227 /* ForOfStatement */:
+                    case 220 /* VariableStatement */:
+                    case 226 /* ForStatement */:
+                    case 228 /* ForOfStatement */:
                         // variable statement/for/for-of statement case,
                         // use site should not be inside variable declaration (initializer of declaration or binding element)
                         if (isSameScopeDescendentOf(usage, declaration, container)) {
@@ -32164,16 +32710,16 @@ var ts;
                         return true;
                     }
                     var initializerOfProperty = current.parent &&
-                        current.parent.kind === 154 /* PropertyDeclaration */ &&
+                        current.parent.kind === 155 /* PropertyDeclaration */ &&
                         current.parent.initializer === current;
                     if (initializerOfProperty) {
                         if (ts.hasModifier(current.parent, 32 /* Static */)) {
-                            if (declaration.kind === 156 /* MethodDeclaration */) {
+                            if (declaration.kind === 157 /* MethodDeclaration */) {
                                 return true;
                             }
                         }
                         else {
-                            var isDeclarationInstanceProperty = declaration.kind === 154 /* PropertyDeclaration */ && !ts.hasModifier(declaration, 32 /* Static */);
+                            var isDeclarationInstanceProperty = declaration.kind === 155 /* PropertyDeclaration */ && !ts.hasModifier(declaration, 32 /* Static */);
                             if (!isDeclarationInstanceProperty || ts.getContainingClass(usage) !== ts.getContainingClass(declaration)) {
                                 return true;
                             }
@@ -32182,6 +32728,36 @@ var ts;
                     return false;
                 });
             }
+            function isPropertyImmediatelyReferencedWithinDeclaration(declaration, usage) {
+                // always legal if usage is after declaration
+                if (usage.end > declaration.end) {
+                    return false;
+                }
+                // still might be legal if usage is deferred (e.g. x: any = () => this.x)
+                // otherwise illegal if immediately referenced within the declaration (e.g. x: any = this.x)
+                var ancestorChangingReferenceScope = ts.findAncestor(usage, function (node) {
+                    if (node === declaration) {
+                        return "quit";
+                    }
+                    switch (node.kind) {
+                        case 198 /* ArrowFunction */:
+                        case 155 /* PropertyDeclaration */:
+                            return true;
+                        case 219 /* Block */:
+                            switch (node.parent.kind) {
+                                case 159 /* GetAccessor */:
+                                case 157 /* MethodDeclaration */:
+                                case 160 /* SetAccessor */:
+                                    return true;
+                                default:
+                                    return false;
+                            }
+                        default:
+                            return false;
+                    }
+                });
+                return ancestorChangingReferenceScope === undefined;
+            }
         }
         /**
          * Resolve a given name for a given meaning at a given location. An error is reported if the name was not found and
@@ -32200,6 +32776,8 @@ var ts;
             var lastLocation;
             var lastSelfReferenceLocation;
             var propertyWithInvalidInitializer;
+            var associatedDeclarationForContainingInitializer;
+            var withinDeferredContext = false;
             var errorLocation = location;
             var grandparent;
             var isInExternalModule = false;
@@ -32215,12 +32793,12 @@ var ts;
                             // - parameters are only in the scope of function body
                             // This restriction does not apply to JSDoc comment types because they are parented
                             // at a higher level than type parameters would normally be
-                            if (meaning & result.flags & 67897832 /* Type */ && lastLocation.kind !== 296 /* JSDocComment */) {
+                            if (meaning & result.flags & 67897832 /* Type */ && lastLocation.kind !== 297 /* JSDocComment */) {
                                 useResult = result.flags & 262144 /* TypeParameter */
                                     // type parameters are visible in parameter list, return type and type parameter list
                                     ? lastLocation === location.type ||
-                                        lastLocation.kind === 151 /* Parameter */ ||
-                                        lastLocation.kind === 150 /* TypeParameter */
+                                        lastLocation.kind === 152 /* Parameter */ ||
+                                        lastLocation.kind === 151 /* TypeParameter */
                                     // local types not visible outside the function body
                                     : false;
                             }
@@ -32237,13 +32815,13 @@ var ts;
                                     // however it is detected separately when checking initializers of parameters
                                     // to make sure that they reference no variables declared after them.
                                     useResult =
-                                        lastLocation.kind === 151 /* Parameter */ ||
+                                        lastLocation.kind === 152 /* Parameter */ ||
                                             (lastLocation === location.type &&
                                                 !!ts.findAncestor(result.valueDeclaration, ts.isParameter));
                                 }
                             }
                         }
-                        else if (location.kind === 175 /* ConditionalType */) {
+                        else if (location.kind === 176 /* ConditionalType */) {
                             // A type parameter declared using 'infer T' in a conditional type is visible only in
                             // the true branch of the conditional type.
                             useResult = lastLocation === location.trueType;
@@ -32256,15 +32834,16 @@ var ts;
                         }
                     }
                 }
+                withinDeferredContext = withinDeferredContext || getIsDeferredContext(location, lastLocation);
                 switch (location.kind) {
-                    case 284 /* SourceFile */:
+                    case 285 /* SourceFile */:
                         if (!ts.isExternalOrCommonJsModule(location))
                             break;
                         isInExternalModule = true;
                     // falls through
-                    case 244 /* ModuleDeclaration */:
+                    case 245 /* ModuleDeclaration */:
                         var moduleExports = getSymbolOfNode(location).exports;
-                        if (location.kind === 284 /* SourceFile */ || ts.isAmbientModule(location)) {
+                        if (location.kind === 285 /* SourceFile */ || ts.isAmbientModule(location)) {
                             // It's an external module. First see if the module has an export default and if the local
                             // name of that export default matches.
                             if (result = moduleExports.get("default" /* Default */)) {
@@ -32288,7 +32867,7 @@ var ts;
                             var moduleExport = moduleExports.get(name);
                             if (moduleExport &&
                                 moduleExport.flags === 2097152 /* Alias */ &&
-                                ts.getDeclarationOfKind(moduleExport, 257 /* ExportSpecifier */)) {
+                                ts.getDeclarationOfKind(moduleExport, 258 /* ExportSpecifier */)) {
                                 break;
                             }
                         }
@@ -32302,20 +32881,19 @@ var ts;
                             }
                         }
                         break;
-                    case 243 /* EnumDeclaration */:
+                    case 244 /* EnumDeclaration */:
                         if (result = lookup(getSymbolOfNode(location).exports, name, meaning & 8 /* EnumMember */)) {
                             break loop;
                         }
                         break;
-                    case 154 /* PropertyDeclaration */:
-                    case 153 /* PropertySignature */:
+                    case 155 /* PropertyDeclaration */:
                         // TypeScript 1.0 spec (April 2014): 8.4.1
                         // Initializer expressions for instance member variables are evaluated in the scope
                         // of the class constructor body but are not permitted to reference parameters or
                         // local variables of the constructor. This effectively means that entities from outer scopes
                         // by the same name as a constructor parameter or local variable are inaccessible
                         // in initializer expressions for instance member variables.
-                        if (ts.isClassLike(location.parent) && !ts.hasModifier(location, 32 /* Static */)) {
+                        if (!ts.hasModifier(location, 32 /* Static */)) {
                             var ctor = findConstructorDeclaration(location.parent);
                             if (ctor && ctor.locals) {
                                 if (lookup(ctor.locals, name, meaning & 67220415 /* Value */)) {
@@ -32325,9 +32903,9 @@ var ts;
                             }
                         }
                         break;
-                    case 240 /* ClassDeclaration */:
-                    case 209 /* ClassExpression */:
-                    case 241 /* InterfaceDeclaration */:
+                    case 241 /* ClassDeclaration */:
+                    case 210 /* ClassExpression */:
+                    case 242 /* InterfaceDeclaration */:
                         // The below is used to lookup type parameters within a class or interface, as they are added to the class/interface locals
                         // These can never be latebound, so the symbol's raw members are sufficient. `getMembersOfNode` cannot be used, as it would
                         // trigger resolving late-bound names, which we may already be in the process of doing while we're here!
@@ -32346,7 +32924,7 @@ var ts;
                             }
                             break loop;
                         }
-                        if (location.kind === 209 /* ClassExpression */ && meaning & 32 /* Class */) {
+                        if (location.kind === 210 /* ClassExpression */ && meaning & 32 /* Class */) {
                             var className = location.name;
                             if (className && name === className.escapedText) {
                                 result = location.symbol;
@@ -32354,9 +32932,9 @@ var ts;
                             }
                         }
                         break;
-                    case 211 /* ExpressionWithTypeArguments */:
+                    case 212 /* ExpressionWithTypeArguments */:
                         // The type parameters of a class are not in scope in the base class expression.
-                        if (lastLocation === location.expression && location.parent.token === 86 /* ExtendsKeyword */) {
+                        if (lastLocation === location.expression && location.parent.token === 87 /* ExtendsKeyword */) {
                             var container = location.parent.parent;
                             if (ts.isClassLike(container) && (result = lookup(getSymbolOfNode(container).members, name, meaning & 67897832 /* Type */))) {
                                 if (nameNotFoundMessage) {
@@ -32374,9 +32952,9 @@ var ts;
                     //       [foo<T>()]() { } // <-- Reference to T from class's own computed property
                     //   }
                     //
-                    case 149 /* ComputedPropertyName */:
+                    case 150 /* ComputedPropertyName */:
                         grandparent = location.parent.parent;
-                        if (ts.isClassLike(grandparent) || grandparent.kind === 241 /* InterfaceDeclaration */) {
+                        if (ts.isClassLike(grandparent) || grandparent.kind === 242 /* InterfaceDeclaration */) {
                             // A reference to this grandparent's type parameters would be an error
                             if (result = lookup(getSymbolOfNode(grandparent).members, name, meaning & 67897832 /* Type */)) {
                                 error(errorLocation, ts.Diagnostics.A_computed_property_name_cannot_reference_a_type_parameter_from_its_containing_type);
@@ -32384,24 +32962,24 @@ var ts;
                             }
                         }
                         break;
-                    case 197 /* ArrowFunction */:
+                    case 198 /* ArrowFunction */:
                         // when targeting ES6 or higher there is no 'arguments' in an arrow function
                         // for lower compile targets the resolved symbol is used to emit an error
                         if (compilerOptions.target >= 2 /* ES2015 */) {
                             break;
                         }
                     // falls through
-                    case 156 /* MethodDeclaration */:
-                    case 157 /* Constructor */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
-                    case 239 /* FunctionDeclaration */:
+                    case 157 /* MethodDeclaration */:
+                    case 158 /* Constructor */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
+                    case 240 /* FunctionDeclaration */:
                         if (meaning & 3 /* Variable */ && name === "arguments") {
                             result = argumentsSymbol;
                             break loop;
                         }
                         break;
-                    case 196 /* FunctionExpression */:
+                    case 197 /* FunctionExpression */:
                         if (meaning & 3 /* Variable */ && name === "arguments") {
                             result = argumentsSymbol;
                             break loop;
@@ -32414,7 +32992,7 @@ var ts;
                             }
                         }
                         break;
-                    case 152 /* Decorator */:
+                    case 153 /* Decorator */:
                         // Decorators are resolved at the class declaration. Resolving at the parameter
                         // or member would result in looking up locals in the method.
                         //
@@ -32423,7 +33001,7 @@ var ts;
                         //       method(@y x, y) {} // <-- decorator y should be resolved at the class declaration, not the parameter.
                         //   }
                         //
-                        if (location.parent && location.parent.kind === 151 /* Parameter */) {
+                        if (location.parent && location.parent.kind === 152 /* Parameter */) {
                             location = location.parent;
                         }
                         //
@@ -32432,15 +33010,34 @@ var ts;
                         //       @y method(x, y) {} // <-- decorator y should be resolved at the class declaration, not the method.
                         //   }
                         //
-                        if (location.parent && ts.isClassElement(location.parent)) {
+                        // class Decorators are resolved outside of the class to avoid referencing type parameters of that class.
+                        //
+                        //   type T = number;
+                        //   declare function y(x: T): any;
+                        //   @param(1 as T) // <-- T should resolve to the type alias outside of class C
+                        //   class C<T> {}
+                        if (location.parent && (ts.isClassElement(location.parent) || location.parent.kind === 241 /* ClassDeclaration */)) {
                             location = location.parent;
                         }
                         break;
-                    case 309 /* JSDocTypedefTag */:
-                    case 302 /* JSDocCallbackTag */:
+                    case 311 /* JSDocTypedefTag */:
+                    case 304 /* JSDocCallbackTag */:
                         // js type aliases do not resolve names from their host, so skip past it
                         location = ts.getJSDocHost(location);
                         break;
+                    case 152 /* Parameter */:
+                        if (lastLocation && lastLocation === location.initializer) {
+                            associatedDeclarationForContainingInitializer = location;
+                        }
+                        break;
+                    case 187 /* BindingElement */:
+                        if (lastLocation && lastLocation === location.initializer) {
+                            var root = ts.getRootDeclaration(location);
+                            if (root.kind === 152 /* Parameter */) {
+                                associatedDeclarationForContainingInitializer = location;
+                            }
+                        }
+                        break;
                 }
                 if (isSelfReferenceLocation(location)) {
                     lastSelfReferenceLocation = location;
@@ -32456,7 +33053,7 @@ var ts;
             }
             if (!result) {
                 if (lastLocation) {
-                    ts.Debug.assert(lastLocation.kind === 284 /* SourceFile */);
+                    ts.Debug.assert(lastLocation.kind === 285 /* SourceFile */);
                     if (lastLocation.commonJsModuleIndicator && name === "exports" && meaning & lastLocation.symbol.flags) {
                         return lastLocation.symbol;
                     }
@@ -32488,7 +33085,7 @@ var ts;
                                 var suggestionName = symbolToString(suggestion);
                                 var diagnostic = error(errorLocation, suggestedNameNotFoundMessage, diagnosticName(nameArg), suggestionName);
                                 if (suggestion.valueDeclaration) {
-                                    addRelatedInfo(diagnostic, ts.createDiagnosticForNode(suggestion.valueDeclaration, ts.Diagnostics._0_is_declared_here, suggestionName));
+                                    ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(suggestion.valueDeclaration, ts.Diagnostics._0_is_declared_here, suggestionName));
                                 }
                             }
                         }
@@ -32532,20 +33129,48 @@ var ts;
                 if (result && isInExternalModule && (meaning & 67220415 /* Value */) === 67220415 /* Value */ && !(originalLocation.flags & 2097152 /* JSDoc */)) {
                     var merged = getMergedSymbol(result);
                     if (ts.length(merged.declarations) && ts.every(merged.declarations, function (d) { return ts.isNamespaceExportDeclaration(d) || ts.isSourceFile(d) && !!d.symbol.globalExports; })) {
-                        error(errorLocation, ts.Diagnostics._0_refers_to_a_UMD_global_but_the_current_file_is_a_module_Consider_adding_an_import_instead, ts.unescapeLeadingUnderscores(name)); // TODO: GH#18217
+                        errorOrSuggestion(!compilerOptions.allowUmdGlobalAccess, errorLocation, ts.Diagnostics._0_refers_to_a_UMD_global_but_the_current_file_is_a_module_Consider_adding_an_import_instead, ts.unescapeLeadingUnderscores(name));
+                    }
+                }
+                // If we're in a parameter initializer, we can't reference the values of the parameter whose initializer we're within or parameters to the right
+                if (result && associatedDeclarationForContainingInitializer && !withinDeferredContext && (meaning & 67220415 /* Value */) === 67220415 /* Value */) {
+                    var candidate = getMergedSymbol(getLateBoundSymbol(result));
+                    var root = ts.getRootDeclaration(associatedDeclarationForContainingInitializer);
+                    // A parameter initializer or binding pattern initializer within a parameter cannot refer to itself
+                    if (candidate === getSymbolOfNode(associatedDeclarationForContainingInitializer)) {
+                        error(errorLocation, ts.Diagnostics.Parameter_0_cannot_be_referenced_in_its_initializer, ts.declarationNameToString(associatedDeclarationForContainingInitializer.name));
+                    }
+                    // And it cannot refer to any declarations which come after it
+                    else if (candidate.valueDeclaration && candidate.valueDeclaration.pos > associatedDeclarationForContainingInitializer.pos && root.parent.locals && lookup(root.parent.locals, candidate.escapedName, meaning) === candidate) {
+                        error(errorLocation, ts.Diagnostics.Initializer_of_parameter_0_cannot_reference_identifier_1_declared_after_it, ts.declarationNameToString(associatedDeclarationForContainingInitializer.name), ts.declarationNameToString(errorLocation));
                     }
                 }
             }
             return result;
         }
+        function getIsDeferredContext(location, lastLocation) {
+            if (location.kind !== 198 /* ArrowFunction */ && location.kind !== 197 /* FunctionExpression */) {
+                // initializers in instance property declaration of class like entities are executed in constructor and thus deferred
+                return ts.isTypeQueryNode(location) || ((ts.isFunctionLikeDeclaration(location) ||
+                    (location.kind === 155 /* PropertyDeclaration */ && !ts.hasModifier(location, 32 /* Static */))) && (!lastLocation || lastLocation !== location.name)); // A name is evaluated within the enclosing scope - so it shouldn't count as deferred
+            }
+            if (lastLocation && lastLocation === location.name) {
+                return false;
+            }
+            // generator functions and async functions are not inlined in control flow when immediately invoked
+            if (location.asteriskToken || ts.hasModifier(location, 256 /* Async */)) {
+                return true;
+            }
+            return !ts.getImmediatelyInvokedFunctionExpression(location);
+        }
         function isSelfReferenceLocation(node) {
             switch (node.kind) {
-                case 239 /* FunctionDeclaration */:
-                case 240 /* ClassDeclaration */:
-                case 241 /* InterfaceDeclaration */:
-                case 243 /* EnumDeclaration */:
-                case 242 /* TypeAliasDeclaration */:
-                case 244 /* ModuleDeclaration */: // For `namespace N { N; }`
+                case 240 /* FunctionDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 242 /* InterfaceDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
+                case 245 /* ModuleDeclaration */: // For `namespace N { N; }`
                     return true;
                 default:
                     return false;
@@ -32557,7 +33182,7 @@ var ts;
         function isTypeParameterSymbolDeclaredInContainer(symbol, container) {
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var decl = _a[_i];
-                if (decl.kind === 150 /* TypeParameter */) {
+                if (decl.kind === 151 /* TypeParameter */) {
                     var parent = ts.isJSDocTemplateTag(decl.parent) ? ts.getJSDocHost(decl.parent) : decl.parent;
                     if (parent === container) {
                         return !(ts.isJSDocTemplateTag(decl.parent) && ts.find(decl.parent.parent.tags, ts.isJSDocTypeAlias)); // TODO: GH#18217
@@ -32612,10 +33237,10 @@ var ts;
          */
         function getEntityNameForExtendingInterface(node) {
             switch (node.kind) {
-                case 72 /* Identifier */:
-                case 189 /* PropertyAccessExpression */:
+                case 73 /* Identifier */:
+                case 190 /* PropertyAccessExpression */:
                     return node.parent ? getEntityNameForExtendingInterface(node.parent) : undefined;
-                case 211 /* ExpressionWithTypeArguments */:
+                case 212 /* ExpressionWithTypeArguments */:
                     if (ts.isEntityNameExpression(node.expression)) {
                         return node.expression;
                     }
@@ -32704,7 +33329,7 @@ var ts;
         function checkResolvedBlockScopedVariable(result, errorLocation) {
             ts.Debug.assert(!!(result.flags & 2 /* BlockScopedVariable */ || result.flags & 32 /* Class */ || result.flags & 384 /* Enum */));
             // Block-scoped variables cannot be used before their definition
-            var declaration = ts.find(result.declarations, function (d) { return ts.isBlockOrCatchScoped(d) || ts.isClassLike(d) || (d.kind === 243 /* EnumDeclaration */) || ts.isInJSFile(d) && !!ts.getJSDocEnumTag(d); });
+            var declaration = ts.find(result.declarations, function (d) { return ts.isBlockOrCatchScoped(d) || ts.isClassLike(d) || (d.kind === 244 /* EnumDeclaration */) || ts.isInJSFile(d) && !!ts.getJSDocEnumTag(d); });
             if (declaration === undefined)
                 return ts.Debug.fail("Declaration to checkResolvedBlockScopedVariable is undefined");
             if (!(declaration.flags & 4194304 /* Ambient */) && !isBlockScopedNameDeclaredBeforeUse(declaration, errorLocation)) {
@@ -32726,7 +33351,7 @@ var ts;
                     }
                 }
                 if (diagnosticMessage) {
-                    addRelatedInfo(diagnosticMessage, ts.createDiagnosticForNode(declaration, ts.Diagnostics._0_is_declared_here, declarationName));
+                    ts.addRelatedInfo(diagnosticMessage, ts.createDiagnosticForNode(declaration, ts.Diagnostics._0_is_declared_here, declarationName));
                 }
             }
         }
@@ -32739,13 +33364,13 @@ var ts;
         }
         function getAnyImportSyntax(node) {
             switch (node.kind) {
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return node;
-                case 250 /* ImportClause */:
+                case 251 /* ImportClause */:
                     return node.parent;
-                case 251 /* NamespaceImport */:
+                case 252 /* NamespaceImport */:
                     return node.parent.parent;
-                case 253 /* ImportSpecifier */:
+                case 254 /* ImportSpecifier */:
                     return node.parent.parent.parent;
                 default:
                     return undefined;
@@ -32755,7 +33380,7 @@ var ts;
             return ts.find(symbol.declarations, ts.isAliasSymbolDeclaration);
         }
         function getTargetOfImportEqualsDeclaration(node, dontResolveAlias) {
-            if (node.moduleReference.kind === 259 /* ExternalModuleReference */) {
+            if (node.moduleReference.kind === 260 /* ExternalModuleReference */) {
                 return resolveExternalModuleSymbol(resolveExternalModuleName(node, ts.getExternalModuleImportEqualsDeclarationExpression(node)));
             }
             return getSymbolOfPartOfRightHandSideOfImportEquals(node.moduleReference, dontResolveAlias);
@@ -32812,7 +33437,16 @@ var ts;
                 var file = ts.find(moduleSymbol.declarations, ts.isSourceFile);
                 var hasSyntheticDefault = canHaveSyntheticDefault(file, moduleSymbol, dontResolveAlias);
                 if (!exportDefaultSymbol && !hasSyntheticDefault) {
-                    error(node.name, ts.Diagnostics.Module_0_has_no_default_export, symbolToString(moduleSymbol));
+                    if (hasExportAssignmentSymbol(moduleSymbol)) {
+                        var compilerOptionName = moduleKind >= ts.ModuleKind.ES2015 ? "allowSyntheticDefaultImports" : "esModuleInterop";
+                        var exportEqualsSymbol = moduleSymbol.exports.get("export=" /* ExportEquals */);
+                        var exportAssignment = exportEqualsSymbol.valueDeclaration;
+                        var err = error(node.name, ts.Diagnostics.Module_0_can_only_be_default_imported_using_the_1_flag, symbolToString(moduleSymbol), compilerOptionName);
+                        ts.addRelatedInfo(err, ts.createDiagnosticForNode(exportAssignment, ts.Diagnostics.This_module_is_declared_with_using_export_and_can_only_be_used_with_a_default_import_when_using_the_0_flag, compilerOptionName));
+                    }
+                    else {
+                        error(node.name, ts.Diagnostics.Module_0_has_no_default_export, symbolToString(moduleSymbol));
+                    }
                 }
                 else if (hasSyntheticDefault) {
                     // per emit behavior, a synthetic default overrides a "real" .default member if `__esModule` is not present
@@ -32910,7 +33544,7 @@ var ts;
                             var suggestionName = symbolToString(suggestion);
                             var diagnostic = error(name, ts.Diagnostics.Module_0_has_no_exported_member_1_Did_you_mean_2, moduleName, declarationName, suggestionName);
                             if (suggestion.valueDeclaration) {
-                                addRelatedInfo(diagnostic, ts.createDiagnosticForNode(suggestion.valueDeclaration, ts.Diagnostics._0_is_declared_here, suggestionName));
+                                ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(suggestion.valueDeclaration, ts.Diagnostics._0_is_declared_here, suggestionName));
                             }
                         }
                         else {
@@ -32947,20 +33581,20 @@ var ts;
         function getTargetOfAliasDeclaration(node, dontRecursivelyResolve) {
             if (dontRecursivelyResolve === void 0) { dontRecursivelyResolve = false; }
             switch (node.kind) {
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return getTargetOfImportEqualsDeclaration(node, dontRecursivelyResolve);
-                case 250 /* ImportClause */:
+                case 251 /* ImportClause */:
                     return getTargetOfImportClause(node, dontRecursivelyResolve);
-                case 251 /* NamespaceImport */:
+                case 252 /* NamespaceImport */:
                     return getTargetOfNamespaceImport(node, dontRecursivelyResolve);
-                case 253 /* ImportSpecifier */:
+                case 254 /* ImportSpecifier */:
                     return getTargetOfImportSpecifier(node, dontRecursivelyResolve);
-                case 257 /* ExportSpecifier */:
+                case 258 /* ExportSpecifier */:
                     return getTargetOfExportSpecifier(node, 67220415 /* Value */ | 67897832 /* Type */ | 1920 /* Namespace */, dontRecursivelyResolve);
-                case 254 /* ExportAssignment */:
-                case 204 /* BinaryExpression */:
+                case 255 /* ExportAssignment */:
+                case 205 /* BinaryExpression */:
                     return getTargetOfExportAssignment(node, dontRecursivelyResolve);
-                case 247 /* NamespaceExportDeclaration */:
+                case 248 /* NamespaceExportDeclaration */:
                     return getTargetOfNamespaceExportDeclaration(node, dontRecursivelyResolve);
                 default:
                     return ts.Debug.fail();
@@ -33021,11 +33655,11 @@ var ts;
                 var node = getDeclarationOfAliasSymbol(symbol);
                 if (!node)
                     return ts.Debug.fail();
-                if (node.kind === 254 /* ExportAssignment */) {
+                if (node.kind === 255 /* ExportAssignment */) {
                     // export default <symbol>
                     checkExpressionCached(node.expression);
                 }
-                else if (node.kind === 257 /* ExportSpecifier */) {
+                else if (node.kind === 258 /* ExportSpecifier */) {
                     // export { <symbol> } or export { <symbol> as foo }
                     checkExpressionCached(node.propertyName || node.name);
                 }
@@ -33043,17 +33677,17 @@ var ts;
             //     import a = |b|; // Namespace
             //     import a = |b.c|; // Value, type, namespace
             //     import a = |b.c|.d; // Namespace
-            if (entityName.kind === 72 /* Identifier */ && ts.isRightSideOfQualifiedNameOrPropertyAccess(entityName)) {
+            if (entityName.kind === 73 /* Identifier */ && ts.isRightSideOfQualifiedNameOrPropertyAccess(entityName)) {
                 entityName = entityName.parent;
             }
             // Check for case 1 and 3 in the above example
-            if (entityName.kind === 72 /* Identifier */ || entityName.parent.kind === 148 /* QualifiedName */) {
+            if (entityName.kind === 73 /* Identifier */ || entityName.parent.kind === 149 /* QualifiedName */) {
                 return resolveEntityName(entityName, 1920 /* Namespace */, /*ignoreErrors*/ false, dontResolveAlias);
             }
             else {
                 // Case 2 in above example
                 // entityName.kind could be a QualifiedName or a Missing identifier
-                ts.Debug.assert(entityName.parent.kind === 248 /* ImportEqualsDeclaration */);
+                ts.Debug.assert(entityName.parent.kind === 249 /* ImportEqualsDeclaration */);
                 return resolveEntityName(entityName, 67220415 /* Value */ | 67897832 /* Type */ | 1920 /* Namespace */, /*ignoreErrors*/ false, dontResolveAlias);
             }
         }
@@ -33069,17 +33703,17 @@ var ts;
             }
             var namespaceMeaning = 1920 /* Namespace */ | (ts.isInJSFile(name) ? meaning & 67220415 /* Value */ : 0);
             var symbol;
-            if (name.kind === 72 /* Identifier */) {
-                var message = meaning === namespaceMeaning ? ts.Diagnostics.Cannot_find_namespace_0 : getCannotFindNameDiagnosticForName(getFirstIdentifier(name).escapedText);
+            if (name.kind === 73 /* Identifier */) {
+                var message = meaning === namespaceMeaning ? ts.Diagnostics.Cannot_find_namespace_0 : getCannotFindNameDiagnosticForName(getFirstIdentifier(name));
                 var symbolFromJSPrototype = ts.isInJSFile(name) ? resolveEntityNameFromAssignmentDeclaration(name, meaning) : undefined;
                 symbol = resolveName(location || name, name.escapedText, meaning, ignoreErrors || symbolFromJSPrototype ? undefined : message, name, /*isUse*/ true);
                 if (!symbol) {
                     return symbolFromJSPrototype;
                 }
             }
-            else if (name.kind === 148 /* QualifiedName */ || name.kind === 189 /* PropertyAccessExpression */) {
-                var left = name.kind === 148 /* QualifiedName */ ? name.left : name.expression;
-                var right = name.kind === 148 /* QualifiedName */ ? name.right : name.name;
+            else if (name.kind === 149 /* QualifiedName */ || name.kind === 190 /* PropertyAccessExpression */) {
+                var left = name.kind === 149 /* QualifiedName */ ? name.left : name.expression;
+                var right = name.kind === 149 /* QualifiedName */ ? name.right : name.name;
                 var namespace = resolveEntityName(left, namespaceMeaning, ignoreErrors, /*dontResolveAlias*/ false, location);
                 if (!namespace || ts.nodeIsMissing(right)) {
                     return undefined;
@@ -33214,6 +33848,14 @@ var ts;
             if (patternAmbientModules) {
                 var pattern = ts.findBestPatternMatch(patternAmbientModules, function (_) { return _.pattern; }, moduleReference);
                 if (pattern) {
+                    // If the module reference matched a pattern ambient module ('*.foo') but there’s also a
+                    // module augmentation by the specific name requested ('a.foo'), we store the merged symbol
+                    // by the augmentation name ('a.foo'), because asking for *.foo should not give you exports
+                    // from a.foo.
+                    var augmentation = patternAmbientModuleAugmentations && patternAmbientModuleAugmentations.get(moduleReference);
+                    if (augmentation) {
+                        return getMergedSymbol(augmentation);
+                    }
                     return getMergedSymbol(pattern.symbol);
                 }
             }
@@ -33230,20 +33872,12 @@ var ts;
                 return undefined;
             }
             if (moduleNotFoundError) {
-                // For relative paths, see if this was possibly a projectReference redirect
-                if (ts.pathIsRelative(moduleReference)) {
-                    var sourceFile_1 = ts.getSourceFileOfNode(location);
-                    var redirects = sourceFile_1.redirectedReferences;
-                    if (redirects) {
-                        var normalizedTargetPath = ts.getNormalizedAbsolutePath(moduleReference, ts.getDirectoryPath(sourceFile_1.fileName));
-                        for (var _i = 0, _a = [".ts" /* Ts */, ".tsx" /* Tsx */]; _i < _a.length; _i++) {
-                            var ext = _a[_i];
-                            var probePath = normalizedTargetPath + ext;
-                            if (redirects.indexOf(probePath) >= 0) {
-                                error(errorNode, ts.Diagnostics.Output_file_0_has_not_been_built_from_source_file_1, moduleReference, probePath);
-                                return undefined;
-                            }
-                        }
+                // See if this was possibly a projectReference redirect
+                if (resolvedModule) {
+                    var redirect = host.getProjectReferenceRedirect(resolvedModule.resolvedFileName);
+                    if (redirect) {
+                        error(errorNode, ts.Diagnostics.Output_file_0_has_not_been_built_from_source_file_1, redirect, resolvedModule.resolvedFileName);
+                        return undefined;
                     }
                 }
                 if (resolutionDiagnostic) {
@@ -33312,7 +33946,7 @@ var ts;
         function resolveESModuleSymbol(moduleSymbol, referencingLocation, dontResolveAlias) {
             var symbol = resolveExternalModuleSymbol(moduleSymbol, dontResolveAlias);
             if (!dontResolveAlias && symbol) {
-                if (!(symbol.flags & (1536 /* Module */ | 3 /* Variable */)) && !ts.getDeclarationOfKind(symbol, 284 /* SourceFile */)) {
+                if (!(symbol.flags & (1536 /* Module */ | 3 /* Variable */)) && !ts.getDeclarationOfKind(symbol, 285 /* SourceFile */)) {
                     var compilerOptionName = moduleKind >= ts.ModuleKind.ES2015
                         ? "allowSyntheticDefaultImports"
                         : "esModuleInterop";
@@ -33574,7 +34208,7 @@ var ts;
             var members = node.members;
             for (var _i = 0, members_2 = members; _i < members_2.length; _i++) {
                 var member = members_2[_i];
-                if (member.kind === 157 /* Constructor */ && ts.nodeIsPresent(member.body)) {
+                if (member.kind === 158 /* Constructor */ && ts.nodeIsPresent(member.body)) {
                     return member;
                 }
             }
@@ -33585,13 +34219,10 @@ var ts;
             result.id = typeCount;
             return result;
         }
-        function createIntrinsicType(kind, intrinsicName) {
+        function createIntrinsicType(kind, intrinsicName, objectFlags) {
+            if (objectFlags === void 0) { objectFlags = 0; }
             var type = createType(kind);
             type.intrinsicName = intrinsicName;
-            return type;
-        }
-        function createNullableType(kind, intrinsicName, objectFlags) {
-            var type = createIntrinsicType(kind, intrinsicName);
             type.objectFlags = objectFlags;
             return type;
         }
@@ -33663,12 +34294,12 @@ var ts;
                     }
                 }
                 switch (location.kind) {
-                    case 284 /* SourceFile */:
+                    case 285 /* SourceFile */:
                         if (!ts.isExternalOrCommonJsModule(location)) {
                             break;
                         }
                     // falls through
-                    case 244 /* ModuleDeclaration */:
+                    case 245 /* ModuleDeclaration */:
                         if (result = callback(getSymbolOfNode(location).exports)) {
                             return result;
                         }
@@ -33732,7 +34363,7 @@ var ts;
                         && (!useOnlyExternalAliasing || ts.some(symbolFromSymbolTable.declarations, ts.isExternalModuleImportEqualsDeclaration))
                         // While exports are generally considered to be in scope, export-specifier declared symbols are _not_
                         // See similar comment in `resolveName` for details
-                        && (ignoreQualification || !ts.getDeclarationOfKind(symbolFromSymbolTable, 257 /* ExportSpecifier */))) {
+                        && (ignoreQualification || !ts.getDeclarationOfKind(symbolFromSymbolTable, 258 /* ExportSpecifier */))) {
                         var resolvedImportedSymbol = resolveAlias(symbolFromSymbolTable);
                         if (isAccessible(symbolFromSymbolTable, resolvedImportedSymbol, ignoreQualification)) {
                             return [symbolFromSymbolTable];
@@ -33768,7 +34399,7 @@ var ts;
                     return true;
                 }
                 // Qualify if the symbol from symbol table has same meaning as expected
-                symbolFromSymbolTable = (symbolFromSymbolTable.flags & 2097152 /* Alias */ && !ts.getDeclarationOfKind(symbolFromSymbolTable, 257 /* ExportSpecifier */)) ? resolveAlias(symbolFromSymbolTable) : symbolFromSymbolTable;
+                symbolFromSymbolTable = (symbolFromSymbolTable.flags & 2097152 /* Alias */ && !ts.getDeclarationOfKind(symbolFromSymbolTable, 258 /* ExportSpecifier */)) ? resolveAlias(symbolFromSymbolTable) : symbolFromSymbolTable;
                 if (symbolFromSymbolTable.flags & meaning) {
                     qualify = true;
                     return true;
@@ -33783,10 +34414,10 @@ var ts;
                 for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                     var declaration = _a[_i];
                     switch (declaration.kind) {
-                        case 154 /* PropertyDeclaration */:
-                        case 156 /* MethodDeclaration */:
-                        case 158 /* GetAccessor */:
-                        case 159 /* SetAccessor */:
+                        case 155 /* PropertyDeclaration */:
+                        case 157 /* MethodDeclaration */:
+                        case 159 /* GetAccessor */:
+                        case 160 /* SetAccessor */:
                             continue;
                         default:
                             return false;
@@ -33842,7 +34473,7 @@ var ts;
                 var containers = getContainersOfSymbol(symbol, enclosingDeclaration);
                 // If we're trying to reference some object literal in, eg `var a = { x: 1 }`, the symbol for the literal, `__object`, is distinct
                 // from the symbol of the declaration it is being assigned to. Since we can use the declaration to refer to the literal, however,
-                // we'd like to make that connection here - potentially causing us to paint the declararation's visibiility, and therefore the literal.
+                // we'd like to make that connection here - potentially causing us to paint the declaration's visibility, and therefore the literal.
                 var firstDecl = ts.first(symbol.declarations);
                 if (!ts.length(containers) && meaning & 67220415 /* Value */ && firstDecl && ts.isObjectLiteralExpression(firstDecl)) {
                     if (firstDecl.parent && ts.isVariableDeclaration(firstDecl.parent) && firstDecl === firstDecl.parent.initializer) {
@@ -33903,14 +34534,14 @@ var ts;
             return node && getSymbolOfNode(node);
         }
         function hasExternalModuleSymbol(declaration) {
-            return ts.isAmbientModule(declaration) || (declaration.kind === 284 /* SourceFile */ && ts.isExternalOrCommonJsModule(declaration));
+            return ts.isAmbientModule(declaration) || (declaration.kind === 285 /* SourceFile */ && ts.isExternalOrCommonJsModule(declaration));
         }
         function hasNonGlobalAugmentationExternalModuleSymbol(declaration) {
-            return ts.isModuleWithStringLiteralName(declaration) || (declaration.kind === 284 /* SourceFile */ && ts.isExternalOrCommonJsModule(declaration));
+            return ts.isModuleWithStringLiteralName(declaration) || (declaration.kind === 285 /* SourceFile */ && ts.isExternalOrCommonJsModule(declaration));
         }
         function hasVisibleDeclarations(symbol, shouldComputeAliasToMakeVisible) {
             var aliasesToMakeVisible;
-            if (!ts.every(symbol.declarations, getIsDeclarationVisible)) {
+            if (!ts.every(ts.filter(symbol.declarations, function (d) { return d.kind !== 73 /* Identifier */; }), getIsDeclarationVisible)) {
                 return undefined;
             }
             return { accessibility: 0 /* Accessible */, aliasesToMakeVisible: aliasesToMakeVisible };
@@ -33953,14 +34584,14 @@ var ts;
         function isEntityNameVisible(entityName, enclosingDeclaration) {
             // get symbol of the first identifier of the entityName
             var meaning;
-            if (entityName.parent.kind === 167 /* TypeQuery */ ||
+            if (entityName.parent.kind === 168 /* TypeQuery */ ||
                 ts.isExpressionWithTypeArgumentsInClassExtendsClause(entityName.parent) ||
-                entityName.parent.kind === 149 /* ComputedPropertyName */) {
+                entityName.parent.kind === 150 /* ComputedPropertyName */) {
                 // Typeof value
                 meaning = 67220415 /* Value */ | 1048576 /* ExportValue */;
             }
-            else if (entityName.kind === 148 /* QualifiedName */ || entityName.kind === 189 /* PropertyAccessExpression */ ||
-                entityName.parent.kind === 248 /* ImportEqualsDeclaration */) {
+            else if (entityName.kind === 149 /* QualifiedName */ || entityName.kind === 190 /* PropertyAccessExpression */ ||
+                entityName.parent.kind === 249 /* ImportEqualsDeclaration */) {
                 // Left identifier from type reference or TypeAlias
                 // Entity name of the import declaration
                 meaning = 1920 /* Namespace */;
@@ -34009,10 +34640,10 @@ var ts;
             function signatureToStringWorker(writer) {
                 var sigOutput;
                 if (flags & 262144 /* WriteArrowStyleSignature */) {
-                    sigOutput = kind === 1 /* Construct */ ? 166 /* ConstructorType */ : 165 /* FunctionType */;
+                    sigOutput = kind === 1 /* Construct */ ? 167 /* ConstructorType */ : 166 /* FunctionType */;
                 }
                 else {
-                    sigOutput = kind === 1 /* Construct */ ? 161 /* ConstructSignature */ : 160 /* CallSignature */;
+                    sigOutput = kind === 1 /* Construct */ ? 162 /* ConstructSignature */ : 161 /* CallSignature */;
                 }
                 var sig = nodeBuilder.signatureToSignatureDeclaration(signature, sigOutput, enclosingDeclaration, toNodeBuilderFlags(flags) | 70221824 /* IgnoreErrors */ | 512 /* WriteTypeParametersInQualifiedName */);
                 var printer = ts.createPrinter({ removeComments: true, omitTrailingSemicolon: true });
@@ -34039,6 +34670,15 @@ var ts;
             }
             return result;
         }
+        function getTypeNamesForErrorDisplay(left, right) {
+            var leftStr = typeToString(left);
+            var rightStr = typeToString(right);
+            if (leftStr === rightStr) {
+                leftStr = typeToString(left, /*enclosingDeclaration*/ undefined, 64 /* UseFullyQualifiedType */);
+                rightStr = typeToString(right, /*enclosingDeclaration*/ undefined, 64 /* UseFullyQualifiedType */);
+            }
+            return [leftStr, rightStr];
+        }
         function toNodeBuilderFlags(flags) {
             if (flags === void 0) { flags = 0 /* None */; }
             return flags & 9469291 /* NodeBuilderFlagsMask */;
@@ -34107,26 +34747,26 @@ var ts;
                 }
                 if (type.flags & 1 /* Any */) {
                     context.approximateLength += 3;
-                    return ts.createKeywordTypeNode(120 /* AnyKeyword */);
+                    return ts.createKeywordTypeNode(121 /* AnyKeyword */);
                 }
                 if (type.flags & 2 /* Unknown */) {
-                    return ts.createKeywordTypeNode(143 /* UnknownKeyword */);
+                    return ts.createKeywordTypeNode(144 /* UnknownKeyword */);
                 }
                 if (type.flags & 4 /* String */) {
                     context.approximateLength += 6;
-                    return ts.createKeywordTypeNode(138 /* StringKeyword */);
+                    return ts.createKeywordTypeNode(139 /* StringKeyword */);
                 }
                 if (type.flags & 8 /* Number */) {
                     context.approximateLength += 6;
-                    return ts.createKeywordTypeNode(135 /* NumberKeyword */);
+                    return ts.createKeywordTypeNode(136 /* NumberKeyword */);
                 }
                 if (type.flags & 64 /* BigInt */) {
                     context.approximateLength += 6;
-                    return ts.createKeywordTypeNode(146 /* BigIntKeyword */);
+                    return ts.createKeywordTypeNode(147 /* BigIntKeyword */);
                 }
                 if (type.flags & 16 /* Boolean */) {
                     context.approximateLength += 7;
-                    return ts.createKeywordTypeNode(123 /* BooleanKeyword */);
+                    return ts.createKeywordTypeNode(124 /* BooleanKeyword */);
                 }
                 if (type.flags & 1024 /* EnumLiteral */ && !(type.flags & 1048576 /* Union */)) {
                     var parentSymbol = getParentOfSymbol(type.symbol);
@@ -34144,8 +34784,9 @@ var ts;
                     return ts.createLiteralTypeNode(ts.setEmitFlags(ts.createLiteral(type.value), 16777216 /* NoAsciiEscaping */));
                 }
                 if (type.flags & 256 /* NumberLiteral */) {
-                    context.approximateLength += (("" + type.value).length);
-                    return ts.createLiteralTypeNode((ts.createLiteral(type.value)));
+                    var value = type.value;
+                    context.approximateLength += ("" + value).length;
+                    return ts.createLiteralTypeNode(value < 0 ? ts.createPrefix(39 /* MinusToken */, ts.createLiteral(-value)) : ts.createLiteral(value));
                 }
                 if (type.flags & 2048 /* BigIntLiteral */) {
                     context.approximateLength += (ts.pseudoBigIntToString(type.value).length) + 1;
@@ -34166,33 +34807,33 @@ var ts;
                         }
                     }
                     context.approximateLength += 13;
-                    return ts.createTypeOperatorNode(142 /* UniqueKeyword */, ts.createKeywordTypeNode(139 /* SymbolKeyword */));
+                    return ts.createTypeOperatorNode(143 /* UniqueKeyword */, ts.createKeywordTypeNode(140 /* SymbolKeyword */));
                 }
                 if (type.flags & 16384 /* Void */) {
                     context.approximateLength += 4;
-                    return ts.createKeywordTypeNode(106 /* VoidKeyword */);
+                    return ts.createKeywordTypeNode(107 /* VoidKeyword */);
                 }
                 if (type.flags & 32768 /* Undefined */) {
                     context.approximateLength += 9;
-                    return ts.createKeywordTypeNode(141 /* UndefinedKeyword */);
+                    return ts.createKeywordTypeNode(142 /* UndefinedKeyword */);
                 }
                 if (type.flags & 65536 /* Null */) {
                     context.approximateLength += 4;
-                    return ts.createKeywordTypeNode(96 /* NullKeyword */);
+                    return ts.createKeywordTypeNode(97 /* NullKeyword */);
                 }
                 if (type.flags & 131072 /* Never */) {
                     context.approximateLength += 5;
-                    return ts.createKeywordTypeNode(132 /* NeverKeyword */);
+                    return ts.createKeywordTypeNode(133 /* NeverKeyword */);
                 }
                 if (type.flags & 4096 /* ESSymbol */) {
                     context.approximateLength += 6;
-                    return ts.createKeywordTypeNode(139 /* SymbolKeyword */);
+                    return ts.createKeywordTypeNode(140 /* SymbolKeyword */);
                 }
                 if (type.flags & 67108864 /* NonPrimitive */) {
                     context.approximateLength += 6;
-                    return ts.createKeywordTypeNode(136 /* ObjectKeyword */);
+                    return ts.createKeywordTypeNode(137 /* ObjectKeyword */);
                 }
-                if (type.flags & 262144 /* TypeParameter */ && type.isThisType) {
+                if (isThisTypeParameter(type)) {
                     if (context.flags & 4194304 /* InObjectTypeLiteral */) {
                         if (!context.encounteredError && !(context.flags & 32768 /* AllowThisInObjectLiteral */)) {
                             context.encounteredError = true;
@@ -34215,14 +34856,10 @@ var ts;
                         return ts.createInferTypeNode(typeParameterToDeclarationWithConstraint(type, context, /*constraintNode*/ undefined));
                     }
                     if (context.flags & 4 /* GenerateNamesForShadowedTypeParams */ &&
-                        type.flags & 262144 /* TypeParameter */ &&
-                        ts.length(type.symbol.declarations) &&
-                        ts.isTypeParameterDeclaration(type.symbol.declarations[0]) &&
-                        typeParameterShadowsNameInScope(type, context) &&
                         !isTypeSymbolAccessible(type.symbol, context.enclosingDeclaration)) {
-                        var name = type.symbol.declarations[0].name;
+                        var name = typeParameterToName(type, context);
                         context.approximateLength += ts.idText(name).length;
-                        return ts.createTypeReferenceNode(ts.getGeneratedNameForNode(name, 16 /* Optimistic */ | 8 /* ReservedInNestedScopes */), /*typeArguments*/ undefined);
+                        return ts.createTypeReferenceNode(ts.createIdentifier(ts.idText(name)), /*typeArguments*/ undefined);
                     }
                     // Ignore constraint/default when creating a usage (as opposed to declaration) of a type parameter.
                     return type.symbol
@@ -34242,7 +34879,7 @@ var ts;
                     }
                     var typeNodes = mapToTypeNodes(types, context, /*isBareList*/ true);
                     if (typeNodes && typeNodes.length > 0) {
-                        var unionOrIntersectionTypeNode = ts.createUnionOrIntersectionTypeNode(type.flags & 1048576 /* Union */ ? 173 /* UnionType */ : 174 /* IntersectionType */, typeNodes);
+                        var unionOrIntersectionTypeNode = ts.createUnionOrIntersectionTypeNode(type.flags & 1048576 /* Union */ ? 174 /* UnionType */ : 175 /* IntersectionType */, typeNodes);
                         return unionOrIntersectionTypeNode;
                     }
                     else {
@@ -34316,7 +34953,7 @@ var ts;
                             return symbolToTypeNode(symbol, context, isInstanceType);
                         }
                         // Always use 'typeof T' for type of class, enum, and module objects
-                        else if (symbol.flags & 32 /* Class */ && !getBaseTypeVariableOfClass(symbol) && !(symbol.valueDeclaration.kind === 209 /* ClassExpression */ && context.flags & 2048 /* WriteClassExpressionAsTypeLiteral */) ||
+                        else if (symbol.flags & 32 /* Class */ && !getBaseTypeVariableOfClass(symbol) && !(symbol.valueDeclaration.kind === 210 /* ClassExpression */ && context.flags & 2048 /* WriteClassExpressionAsTypeLiteral */) ||
                             symbol.flags & (384 /* Enum */ | 512 /* ValueModule */) ||
                             shouldWriteTypeOfFunctionSymbol()) {
                             return symbolToTypeNode(symbol, context, 67220415 /* Value */);
@@ -34363,7 +35000,7 @@ var ts;
                         var isNonLocalFunctionSymbol = !!(symbol.flags & 16 /* Function */) &&
                             (symbol.parent || // is exported function symbol
                                 ts.forEach(symbol.declarations, function (declaration) {
-                                    return declaration.parent.kind === 284 /* SourceFile */ || declaration.parent.kind === 245 /* ModuleBlock */;
+                                    return declaration.parent.kind === 285 /* SourceFile */ || declaration.parent.kind === 246 /* ModuleBlock */;
                                 }));
                         if (isStaticMethodSymbol || isNonLocalFunctionSymbol) {
                             // typeof is allowed only for static/non local functions
@@ -34384,12 +35021,12 @@ var ts;
                         }
                         if (resolved.callSignatures.length === 1 && !resolved.constructSignatures.length) {
                             var signature = resolved.callSignatures[0];
-                            var signatureNode = signatureToSignatureDeclarationHelper(signature, 165 /* FunctionType */, context);
+                            var signatureNode = signatureToSignatureDeclarationHelper(signature, 166 /* FunctionType */, context);
                             return signatureNode;
                         }
                         if (resolved.constructSignatures.length === 1 && !resolved.callSignatures.length) {
                             var signature = resolved.constructSignatures[0];
-                            var signatureNode = signatureToSignatureDeclarationHelper(signature, 166 /* ConstructorType */, context);
+                            var signatureNode = signatureToSignatureDeclarationHelper(signature, 167 /* ConstructorType */, context);
                             return signatureNode;
                         }
                     }
@@ -34410,7 +35047,7 @@ var ts;
                         }
                         var elementType = typeToTypeNodeHelper(typeArguments[0], context);
                         var arrayType = ts.createArrayTypeNode(elementType);
-                        return type.target === globalArrayType ? arrayType : ts.createTypeOperatorNode(133 /* ReadonlyKeyword */, arrayType);
+                        return type.target === globalArrayType ? arrayType : ts.createTypeOperatorNode(134 /* ReadonlyKeyword */, arrayType);
                     }
                     else if (type.target.objectFlags & 8 /* Tuple */) {
                         if (typeArguments.length > 0) {
@@ -34424,12 +35061,12 @@ var ts;
                                         ts.createOptionalTypeNode(tupleConstituentNodes[i]);
                                 }
                                 var tupleTypeNode = ts.createTupleTypeNode(tupleConstituentNodes);
-                                return type.target.readonly ? ts.createTypeOperatorNode(133 /* ReadonlyKeyword */, tupleTypeNode) : tupleTypeNode;
+                                return type.target.readonly ? ts.createTypeOperatorNode(134 /* ReadonlyKeyword */, tupleTypeNode) : tupleTypeNode;
                             }
                         }
                         if (context.encounteredError || (context.flags & 524288 /* AllowEmptyTuple */)) {
                             var tupleTypeNode = ts.createTupleTypeNode([]);
-                            return type.target.readonly ? ts.createTypeOperatorNode(133 /* ReadonlyKeyword */, tupleTypeNode) : tupleTypeNode;
+                            return type.target.readonly ? ts.createTypeOperatorNode(134 /* ReadonlyKeyword */, tupleTypeNode) : tupleTypeNode;
                         }
                         context.encounteredError = true;
                         return undefined; // TODO: GH#18217
@@ -34524,11 +35161,11 @@ var ts;
                     var typeElements = [];
                     for (var _i = 0, _a = resolvedType.callSignatures; _i < _a.length; _i++) {
                         var signature = _a[_i];
-                        typeElements.push(signatureToSignatureDeclarationHelper(signature, 160 /* CallSignature */, context));
+                        typeElements.push(signatureToSignatureDeclarationHelper(signature, 161 /* CallSignature */, context));
                     }
                     for (var _b = 0, _c = resolvedType.constructSignatures; _b < _c.length; _b++) {
                         var signature = _c[_b];
-                        typeElements.push(signatureToSignatureDeclarationHelper(signature, 161 /* ConstructSignature */, context));
+                        typeElements.push(signatureToSignatureDeclarationHelper(signature, 162 /* ConstructSignature */, context));
                     }
                     if (resolvedType.stringIndexInfo) {
                         var indexSignature = void 0;
@@ -34575,15 +35212,15 @@ var ts;
                 if (!(context.flags & 1 /* NoTruncation */)) {
                     return ts.createTypeReferenceNode(ts.createIdentifier("..."), /*typeArguments*/ undefined);
                 }
-                return ts.createKeywordTypeNode(120 /* AnyKeyword */);
+                return ts.createKeywordTypeNode(121 /* AnyKeyword */);
             }
             function addPropertyToElementList(propertySymbol, context, typeElements) {
-                var propertyIsReverseMapped = !!(ts.getCheckFlags(propertySymbol) & 4096 /* ReverseMapped */);
+                var propertyIsReverseMapped = !!(ts.getCheckFlags(propertySymbol) & 8192 /* ReverseMapped */);
                 var propertyType = propertyIsReverseMapped && context.flags & 33554432 /* InReverseMappedType */ ?
                     anyType : getTypeOfSymbol(propertySymbol);
                 var saveEnclosingDeclaration = context.enclosingDeclaration;
                 context.enclosingDeclaration = undefined;
-                if (context.tracker.trackSymbol && ts.getCheckFlags(propertySymbol) & 2048 /* Late */) {
+                if (context.tracker.trackSymbol && ts.getCheckFlags(propertySymbol) & 4096 /* Late */) {
                     var decl = ts.first(propertySymbol.declarations);
                     if (hasLateBindableName(decl)) {
                         trackComputedName(decl.name, saveEnclosingDeclaration, context);
@@ -34594,10 +35231,10 @@ var ts;
                 context.enclosingDeclaration = saveEnclosingDeclaration;
                 var optionalToken = propertySymbol.flags & 16777216 /* Optional */ ? ts.createToken(56 /* QuestionToken */) : undefined;
                 if (propertySymbol.flags & (16 /* Function */ | 8192 /* Method */) && !getPropertiesOfObjectType(propertyType).length && !isReadonlySymbol(propertySymbol)) {
-                    var signatures = getSignaturesOfType(propertyType, 0 /* Call */);
+                    var signatures = getSignaturesOfType(filterType(propertyType, function (t) { return !(t.flags & 32768 /* Undefined */); }), 0 /* Call */);
                     for (var _i = 0, signatures_1 = signatures; _i < signatures_1.length; _i++) {
                         var signature = signatures_1[_i];
-                        var methodDeclaration = signatureToSignatureDeclarationHelper(signature, 155 /* MethodSignature */, context);
+                        var methodDeclaration = signatureToSignatureDeclarationHelper(signature, 156 /* MethodSignature */, context);
                         methodDeclaration.name = propertyName;
                         methodDeclaration.questionToken = optionalToken;
                         if (propertySymbol.valueDeclaration) {
@@ -34615,10 +35252,10 @@ var ts;
                         propertyTypeNode = createElidedInformationPlaceholder(context);
                     }
                     else {
-                        propertyTypeNode = propertyType ? typeToTypeNodeHelper(propertyType, context) : ts.createKeywordTypeNode(120 /* AnyKeyword */);
+                        propertyTypeNode = propertyType ? typeToTypeNodeHelper(propertyType, context) : ts.createKeywordTypeNode(121 /* AnyKeyword */);
                     }
                     context.flags = savedFlags;
-                    var modifiers = isReadonlySymbol(propertySymbol) ? [ts.createToken(133 /* ReadonlyKeyword */)] : undefined;
+                    var modifiers = isReadonlySymbol(propertySymbol) ? [ts.createToken(134 /* ReadonlyKeyword */)] : undefined;
                     if (modifiers) {
                         context.approximateLength += 9;
                     }
@@ -34669,7 +35306,7 @@ var ts;
             }
             function indexInfoToIndexSignatureDeclarationHelper(indexInfo, kind, context) {
                 var name = ts.getNameFromIndexInfo(indexInfo) || "x";
-                var indexerTypeNode = ts.createKeywordTypeNode(kind === 0 /* String */ ? 138 /* StringKeyword */ : 135 /* NumberKeyword */);
+                var indexerTypeNode = ts.createKeywordTypeNode(kind === 0 /* String */ ? 139 /* StringKeyword */ : 136 /* NumberKeyword */);
                 var indexingParameter = ts.createParameter(
                 /*decorators*/ undefined, 
                 /*modifiers*/ undefined, 
@@ -34682,7 +35319,7 @@ var ts;
                 }
                 context.approximateLength += (name.length + 4);
                 return ts.createIndexSignature(
-                /*decorators*/ undefined, indexInfo.isReadonly ? [ts.createToken(133 /* ReadonlyKeyword */)] : undefined, [indexingParameter], typeNode);
+                /*decorators*/ undefined, indexInfo.isReadonly ? [ts.createToken(134 /* ReadonlyKeyword */)] : undefined, [indexingParameter], typeNode);
             }
             function signatureToSignatureDeclarationHelper(signature, kind, context) {
                 var typeParameters;
@@ -34693,7 +35330,7 @@ var ts;
                 else {
                     typeParameters = signature.typeParameters && signature.typeParameters.map(function (parameter) { return typeParameterToDeclaration(parameter, context); });
                 }
-                var parameters = getExpandedParameters(signature).map(function (parameter) { return symbolToParameterDeclaration(parameter, context, kind === 157 /* Constructor */); });
+                var parameters = getExpandedParameters(signature).map(function (parameter) { return symbolToParameterDeclaration(parameter, context, kind === 158 /* Constructor */); });
                 if (signature.thisParameter) {
                     var thisParameter = symbolToParameterDeclaration(signature.thisParameter, context);
                     parameters.unshift(thisParameter);
@@ -34712,29 +35349,20 @@ var ts;
                     returnTypeNode = returnType && typeToTypeNodeHelper(returnType, context);
                 }
                 if (context.flags & 256 /* SuppressAnyReturnType */) {
-                    if (returnTypeNode && returnTypeNode.kind === 120 /* AnyKeyword */) {
+                    if (returnTypeNode && returnTypeNode.kind === 121 /* AnyKeyword */) {
                         returnTypeNode = undefined;
                     }
                 }
                 else if (!returnTypeNode) {
-                    returnTypeNode = ts.createKeywordTypeNode(120 /* AnyKeyword */);
+                    returnTypeNode = ts.createKeywordTypeNode(121 /* AnyKeyword */);
                 }
                 context.approximateLength += 3; // Usually a signature contributes a few more characters than this, but 3 is the minimum
                 return ts.createSignatureDeclaration(kind, typeParameters, parameters, returnTypeNode, typeArguments);
             }
-            function typeParameterShadowsNameInScope(type, context) {
-                return !!resolveName(context.enclosingDeclaration, type.symbol.escapedName, 67897832 /* Type */, /*nameNotFoundArg*/ undefined, type.symbol.escapedName, /*isUse*/ false);
-            }
             function typeParameterToDeclarationWithConstraint(type, context, constraintNode) {
                 var savedContextFlags = context.flags;
                 context.flags &= ~512 /* WriteTypeParametersInQualifiedName */; // Avoids potential infinite loop when building for a claimspace with a generic
-                var shouldUseGeneratedName = context.flags & 4 /* GenerateNamesForShadowedTypeParams */ &&
-                    type.symbol.declarations && type.symbol.declarations[0] &&
-                    ts.isTypeParameterDeclaration(type.symbol.declarations[0]) &&
-                    typeParameterShadowsNameInScope(type, context);
-                var name = shouldUseGeneratedName
-                    ? ts.getGeneratedNameForNode(type.symbol.declarations[0].name, 16 /* Optimistic */ | 8 /* ReservedInNestedScopes */)
-                    : symbolToName(type.symbol, context, 67897832 /* Type */, /*expectsIdentifier*/ true);
+                var name = typeParameterToName(type, context);
                 var defaultParameter = getDefaultFromTypeParameter(type);
                 var defaultParameterNode = defaultParameter && typeToTypeNodeHelper(defaultParameter, context);
                 context.flags = savedContextFlags;
@@ -34746,9 +35374,9 @@ var ts;
                 return typeParameterToDeclarationWithConstraint(type, context, constraintNode);
             }
             function symbolToParameterDeclaration(parameterSymbol, context, preserveModifierFlags) {
-                var parameterDeclaration = ts.getDeclarationOfKind(parameterSymbol, 151 /* Parameter */);
+                var parameterDeclaration = ts.getDeclarationOfKind(parameterSymbol, 152 /* Parameter */);
                 if (!parameterDeclaration && !isTransientSymbol(parameterSymbol)) {
-                    parameterDeclaration = ts.getDeclarationOfKind(parameterSymbol, 304 /* JSDocParameterTag */);
+                    parameterDeclaration = ts.getDeclarationOfKind(parameterSymbol, 306 /* JSDocParameterTag */);
                 }
                 var parameterType = getTypeOfSymbol(parameterSymbol);
                 if (parameterDeclaration && isRequiredInitializedParameter(parameterDeclaration)) {
@@ -34756,16 +35384,16 @@ var ts;
                 }
                 var parameterTypeNode = typeToTypeNodeHelper(parameterType, context);
                 var modifiers = !(context.flags & 8192 /* OmitParameterModifiers */) && preserveModifierFlags && parameterDeclaration && parameterDeclaration.modifiers ? parameterDeclaration.modifiers.map(ts.getSynthesizedClone) : undefined;
-                var isRest = parameterDeclaration && ts.isRestParameter(parameterDeclaration) || ts.getCheckFlags(parameterSymbol) & 16384 /* RestParameter */;
+                var isRest = parameterDeclaration && ts.isRestParameter(parameterDeclaration) || ts.getCheckFlags(parameterSymbol) & 32768 /* RestParameter */;
                 var dotDotDotToken = isRest ? ts.createToken(25 /* DotDotDotToken */) : undefined;
                 var name = parameterDeclaration
                     ? parameterDeclaration.name ?
-                        parameterDeclaration.name.kind === 72 /* Identifier */ ? ts.setEmitFlags(ts.getSynthesizedClone(parameterDeclaration.name), 16777216 /* NoAsciiEscaping */) :
-                            parameterDeclaration.name.kind === 148 /* QualifiedName */ ? ts.setEmitFlags(ts.getSynthesizedClone(parameterDeclaration.name.right), 16777216 /* NoAsciiEscaping */) :
+                        parameterDeclaration.name.kind === 73 /* Identifier */ ? ts.setEmitFlags(ts.getSynthesizedClone(parameterDeclaration.name), 16777216 /* NoAsciiEscaping */) :
+                            parameterDeclaration.name.kind === 149 /* QualifiedName */ ? ts.setEmitFlags(ts.getSynthesizedClone(parameterDeclaration.name.right), 16777216 /* NoAsciiEscaping */) :
                                 cloneBindingName(parameterDeclaration.name) :
                         ts.symbolName(parameterSymbol)
                     : ts.symbolName(parameterSymbol);
-                var isOptional = parameterDeclaration && isOptionalParameter(parameterDeclaration) || ts.getCheckFlags(parameterSymbol) & 8192 /* OptionalParameter */;
+                var isOptional = parameterDeclaration && isOptionalParameter(parameterDeclaration) || ts.getCheckFlags(parameterSymbol) & 16384 /* OptionalParameter */;
                 var questionToken = isOptional ? ts.createToken(56 /* QuestionToken */) : undefined;
                 var parameterNode = ts.createParameter(
                 /*decorators*/ undefined, modifiers, dotDotDotToken, name, questionToken, parameterTypeNode, 
@@ -34780,7 +35408,7 @@ var ts;
                         }
                         var visited = ts.visitEachChild(node, elideInitializerAndSetEmitFlags, ts.nullTransformationContext, /*nodesVisitor*/ undefined, elideInitializerAndSetEmitFlags);
                         var clone = ts.nodeIsSynthesized(visited) ? visited : ts.getSynthesizedClone(visited);
-                        if (clone.kind === 186 /* BindingElement */) {
+                        if (clone.kind === 187 /* BindingElement */) {
                             clone.initializer = undefined;
                         }
                         return ts.setEmitFlags(clone, 1 /* SingleLine */ | 16777216 /* NoAsciiEscaping */);
@@ -34882,6 +35510,11 @@ var ts;
             function lookupTypeParameterNodes(chain, index, context) {
                 ts.Debug.assert(chain && 0 <= index && index < chain.length);
                 var symbol = chain[index];
+                var symbolId = "" + getSymbolId(symbol);
+                if (context.typeParameterSymbolList && context.typeParameterSymbolList.get(symbolId)) {
+                    return undefined;
+                }
+                (context.typeParameterSymbolList || (context.typeParameterSymbolList = ts.createMap())).set(symbolId, true);
                 var typeParameterNodes;
                 if (context.flags & 512 /* WriteTypeParametersInQualifiedName */ && index < (chain.length - 1)) {
                     var parentSymbol = symbol;
@@ -34906,7 +35539,7 @@ var ts;
                 return top;
             }
             function getSpecifierForModuleSymbol(symbol, context) {
-                var file = ts.getDeclarationOfKind(symbol, 284 /* SourceFile */);
+                var file = ts.getDeclarationOfKind(symbol, 285 /* SourceFile */);
                 if (file && file.moduleName !== undefined) {
                     // Use the amd name if it is available
                     return file.moduleName;
@@ -35029,6 +35662,33 @@ var ts;
                     return identifier;
                 }
             }
+            function typeParameterShadowsNameInScope(escapedName, context) {
+                return !!resolveName(context.enclosingDeclaration, escapedName, 67897832 /* Type */, /*nameNotFoundArg*/ undefined, escapedName, /*isUse*/ false);
+            }
+            function typeParameterToName(type, context) {
+                if (context.flags & 4 /* GenerateNamesForShadowedTypeParams */ && context.typeParameterNames) {
+                    var cached = context.typeParameterNames.get("" + getTypeId(type));
+                    if (cached) {
+                        return cached;
+                    }
+                }
+                var result = symbolToName(type.symbol, context, 67897832 /* Type */, /*expectsIdentifier*/ true);
+                if (context.flags & 4 /* GenerateNamesForShadowedTypeParams */) {
+                    var rawtext = result.escapedText;
+                    var i = 0;
+                    var text = rawtext;
+                    while ((context.typeParameterNamesByText && context.typeParameterNamesByText.get(text)) || typeParameterShadowsNameInScope(text, context)) {
+                        i++;
+                        text = rawtext + "_" + i;
+                    }
+                    if (text !== rawtext) {
+                        result = ts.createIdentifier(text, result.typeArguments);
+                    }
+                    (context.typeParameterNames || (context.typeParameterNames = ts.createMap())).set("" + getTypeId(type), result);
+                    (context.typeParameterNamesByText || (context.typeParameterNamesByText = ts.createMap())).set(result.escapedText, true);
+                }
+                return result;
+            }
             function symbolToName(symbol, context, meaning, expectsIdentifier) {
                 var chain = lookupSymbolChain(symbol, context, meaning);
                 if (expectsIdentifier && chain.length !== 1
@@ -35146,8 +35806,8 @@ var ts;
         }
         function getTypeAliasForTypeLiteral(type) {
             if (type.symbol && type.symbol.flags & 2048 /* TypeLiteral */) {
-                var node = ts.findAncestor(type.symbol.declarations[0].parent, function (n) { return n.kind !== 177 /* ParenthesizedType */; });
-                if (node.kind === 242 /* TypeAliasDeclaration */) {
+                var node = ts.findAncestor(type.symbol.declarations[0].parent, function (n) { return n.kind !== 178 /* ParenthesizedType */; });
+                if (node.kind === 243 /* TypeAliasDeclaration */) {
                     return getSymbolOfNode(node);
                 }
             }
@@ -35155,11 +35815,11 @@ var ts;
         }
         function isTopLevelInExternalModuleAugmentation(node) {
             return node && node.parent &&
-                node.parent.kind === 245 /* ModuleBlock */ &&
+                node.parent.kind === 246 /* ModuleBlock */ &&
                 ts.isExternalModuleAugmentation(node.parent.parent);
         }
         function isDefaultBindingContext(location) {
-            return location.kind === 284 /* SourceFile */ || ts.isAmbientModule(location);
+            return location.kind === 285 /* SourceFile */ || ts.isAmbientModule(location);
         }
         function getNameOfSymbolFromNameType(symbol, context) {
             var nameType = symbol.nameType;
@@ -35169,6 +35829,9 @@ var ts;
                     if (!ts.isIdentifierText(name, compilerOptions.target) && !isNumericLiteralName(name)) {
                         return "\"" + ts.escapeString(name, 34 /* doubleQuote */) + "\"";
                     }
+                    if (isNumericLiteralName(name) && ts.startsWith(name, "-")) {
+                        return "[" + name + "]";
+                    }
                     return name;
                 }
                 if (nameType.flags & 8192 /* UniqueESSymbol */) {
@@ -35200,7 +35863,7 @@ var ts;
                     if (ts.isCallExpression(declaration) && ts.isBindableObjectDefinePropertyCall(declaration)) {
                         return ts.symbolName(symbol);
                     }
-                    if (ts.isComputedPropertyName(name_2) && !(ts.getCheckFlags(symbol) & 2048 /* Late */) && symbol.nameType && symbol.nameType.flags & 384 /* StringOrNumberLiteral */) {
+                    if (ts.isComputedPropertyName(name_2) && !(ts.getCheckFlags(symbol) & 4096 /* Late */) && symbol.nameType && symbol.nameType.flags & 384 /* StringOrNumberLiteral */) {
                         // Computed property name isn't late bound, but has a well-known name type - use name type to generate a symbol name
                         var result = getNameOfSymbolFromNameType(symbol, context);
                         if (result !== undefined) {
@@ -35209,17 +35872,17 @@ var ts;
                     }
                     return ts.declarationNameToString(name_2);
                 }
-                if (declaration.parent && declaration.parent.kind === 237 /* VariableDeclaration */) {
+                if (declaration.parent && declaration.parent.kind === 238 /* VariableDeclaration */) {
                     return ts.declarationNameToString(declaration.parent.name);
                 }
                 switch (declaration.kind) {
-                    case 209 /* ClassExpression */:
-                    case 196 /* FunctionExpression */:
-                    case 197 /* ArrowFunction */:
+                    case 210 /* ClassExpression */:
+                    case 197 /* FunctionExpression */:
+                    case 198 /* ArrowFunction */:
                         if (context && !context.encounteredError && !(context.flags & 131072 /* AllowAnonymousIdentifier */)) {
                             context.encounteredError = true;
                         }
-                        return declaration.kind === 209 /* ClassExpression */ ? "(Anonymous class)" : "(Anonymous function)";
+                        return declaration.kind === 210 /* ClassExpression */ ? "(Anonymous class)" : "(Anonymous function)";
                 }
             }
             var name = getNameOfSymbolFromNameType(symbol, context);
@@ -35236,27 +35899,27 @@ var ts;
             return false;
             function determineIfDeclarationIsVisible() {
                 switch (node.kind) {
-                    case 302 /* JSDocCallbackTag */:
-                    case 309 /* JSDocTypedefTag */:
+                    case 304 /* JSDocCallbackTag */:
+                    case 311 /* JSDocTypedefTag */:
                         // Top-level jsdoc type aliases are considered exported
                         // First parent is comment node, second is hosting declaration or token; we only care about those tokens or declarations whose parent is a source file
                         return !!(node.parent && node.parent.parent && node.parent.parent.parent && ts.isSourceFile(node.parent.parent.parent));
-                    case 186 /* BindingElement */:
+                    case 187 /* BindingElement */:
                         return isDeclarationVisible(node.parent.parent);
-                    case 237 /* VariableDeclaration */:
+                    case 238 /* VariableDeclaration */:
                         if (ts.isBindingPattern(node.name) &&
                             !node.name.elements.length) {
                             // If the binding pattern is empty, this variable declaration is not visible
                             return false;
                         }
                     // falls through
-                    case 244 /* ModuleDeclaration */:
-                    case 240 /* ClassDeclaration */:
-                    case 241 /* InterfaceDeclaration */:
-                    case 242 /* TypeAliasDeclaration */:
-                    case 239 /* FunctionDeclaration */:
-                    case 243 /* EnumDeclaration */:
-                    case 248 /* ImportEqualsDeclaration */:
+                    case 245 /* ModuleDeclaration */:
+                    case 241 /* ClassDeclaration */:
+                    case 242 /* InterfaceDeclaration */:
+                    case 243 /* TypeAliasDeclaration */:
+                    case 240 /* FunctionDeclaration */:
+                    case 244 /* EnumDeclaration */:
+                    case 249 /* ImportEqualsDeclaration */:
                         // external module augmentation is always visible
                         if (ts.isExternalModuleAugmentation(node)) {
                             return true;
@@ -35264,53 +35927,53 @@ var ts;
                         var parent = getDeclarationContainer(node);
                         // If the node is not exported or it is not ambient module element (except import declaration)
                         if (!(ts.getCombinedModifierFlags(node) & 1 /* Export */) &&
-                            !(node.kind !== 248 /* ImportEqualsDeclaration */ && parent.kind !== 284 /* SourceFile */ && parent.flags & 4194304 /* Ambient */)) {
+                            !(node.kind !== 249 /* ImportEqualsDeclaration */ && parent.kind !== 285 /* SourceFile */ && parent.flags & 4194304 /* Ambient */)) {
                             return isGlobalSourceFile(parent);
                         }
                         // Exported members/ambient module elements (exception import declaration) are visible if parent is visible
                         return isDeclarationVisible(parent);
-                    case 154 /* PropertyDeclaration */:
-                    case 153 /* PropertySignature */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
-                    case 156 /* MethodDeclaration */:
-                    case 155 /* MethodSignature */:
+                    case 155 /* PropertyDeclaration */:
+                    case 154 /* PropertySignature */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
+                    case 157 /* MethodDeclaration */:
+                    case 156 /* MethodSignature */:
                         if (ts.hasModifier(node, 8 /* Private */ | 16 /* Protected */)) {
                             // Private/protected properties/methods are not visible
                             return false;
                         }
                     // Public properties/methods are visible if its parents are visible, so:
                     // falls through
-                    case 157 /* Constructor */:
-                    case 161 /* ConstructSignature */:
-                    case 160 /* CallSignature */:
-                    case 162 /* IndexSignature */:
-                    case 151 /* Parameter */:
-                    case 245 /* ModuleBlock */:
-                    case 165 /* FunctionType */:
-                    case 166 /* ConstructorType */:
-                    case 168 /* TypeLiteral */:
-                    case 164 /* TypeReference */:
-                    case 169 /* ArrayType */:
-                    case 170 /* TupleType */:
-                    case 173 /* UnionType */:
-                    case 174 /* IntersectionType */:
-                    case 177 /* ParenthesizedType */:
+                    case 158 /* Constructor */:
+                    case 162 /* ConstructSignature */:
+                    case 161 /* CallSignature */:
+                    case 163 /* IndexSignature */:
+                    case 152 /* Parameter */:
+                    case 246 /* ModuleBlock */:
+                    case 166 /* FunctionType */:
+                    case 167 /* ConstructorType */:
+                    case 169 /* TypeLiteral */:
+                    case 165 /* TypeReference */:
+                    case 170 /* ArrayType */:
+                    case 171 /* TupleType */:
+                    case 174 /* UnionType */:
+                    case 175 /* IntersectionType */:
+                    case 178 /* ParenthesizedType */:
                         return isDeclarationVisible(node.parent);
                     // Default binding, import specifier and namespace import is visible
                     // only on demand so by default it is not visible
-                    case 250 /* ImportClause */:
-                    case 251 /* NamespaceImport */:
-                    case 253 /* ImportSpecifier */:
+                    case 251 /* ImportClause */:
+                    case 252 /* NamespaceImport */:
+                    case 254 /* ImportSpecifier */:
                         return false;
                     // Type parameters are always visible
-                    case 150 /* TypeParameter */:
+                    case 151 /* TypeParameter */:
                     // Source file and namespace export are always visible
-                    case 284 /* SourceFile */:
-                    case 247 /* NamespaceExportDeclaration */:
+                    case 285 /* SourceFile */:
+                    case 248 /* NamespaceExportDeclaration */:
                         return true;
                     // Export assignments do not create name bindings outside the module
-                    case 254 /* ExportAssignment */:
+                    case 255 /* ExportAssignment */:
                         return false;
                     default:
                         return false;
@@ -35319,10 +35982,10 @@ var ts;
         }
         function collectLinkedAliases(node, setVisibility) {
             var exportSymbol;
-            if (node.parent && node.parent.kind === 254 /* ExportAssignment */) {
+            if (node.parent && node.parent.kind === 255 /* ExportAssignment */) {
                 exportSymbol = resolveName(node, node.escapedText, 67220415 /* Value */ | 67897832 /* Type */ | 1920 /* Namespace */ | 2097152 /* Alias */, /*nameNotFoundMessage*/ undefined, node, /*isUse*/ false);
             }
-            else if (node.parent.kind === 257 /* ExportSpecifier */) {
+            else if (node.parent.kind === 258 /* ExportSpecifier */) {
                 exportSymbol = getTargetOfExportSpecifier(node.parent, 67220415 /* Value */ | 67897832 /* Type */ | 1920 /* Namespace */ | 2097152 /* Alias */);
             }
             var result;
@@ -35418,12 +36081,12 @@ var ts;
         function getDeclarationContainer(node) {
             return ts.findAncestor(ts.getRootDeclaration(node), function (node) {
                 switch (node.kind) {
-                    case 237 /* VariableDeclaration */:
-                    case 238 /* VariableDeclarationList */:
-                    case 253 /* ImportSpecifier */:
-                    case 252 /* NamedImports */:
-                    case 251 /* NamespaceImport */:
-                    case 250 /* ImportClause */:
+                    case 238 /* VariableDeclaration */:
+                    case 239 /* VariableDeclarationList */:
+                    case 254 /* ImportSpecifier */:
+                    case 253 /* NamedImports */:
+                    case 252 /* NamespaceImport */:
+                    case 251 /* ImportClause */:
                         return false;
                     default:
                         return true;
@@ -35456,7 +36119,7 @@ var ts;
             return symbol && getSymbolLinks(symbol).type || getTypeForVariableLikeDeclaration(node, /*includeOptionality*/ false);
         }
         function isComputedNonLiteralName(name) {
-            return name.kind === 149 /* ComputedPropertyName */ && !ts.isStringOrNumericLiteralLike(name.expression);
+            return name.kind === 150 /* ComputedPropertyName */ && !ts.isStringOrNumericLiteralLike(name.expression);
         }
         function getRestType(source, properties, symbol) {
             source = filterType(source, function (t) { return !(t.flags & 98304 /* Nullable */); });
@@ -35471,13 +36134,11 @@ var ts;
                 if (omitKeyType.flags & 131072 /* Never */) {
                     return source;
                 }
-                var pickTypeAlias = getGlobalPickSymbol();
-                var excludeTypeAlias = getGlobalExcludeSymbol();
-                if (!pickTypeAlias || !excludeTypeAlias) {
+                var omitTypeAlias = getGlobalOmitSymbol();
+                if (!omitTypeAlias) {
                     return errorType;
                 }
-                var pickKeys = getTypeAliasInstantiation(excludeTypeAlias, [getIndexType(source), omitKeyType]);
-                return getTypeAliasInstantiation(pickTypeAlias, [source, pickKeys]);
+                return getTypeAliasInstantiation(omitTypeAlias, [source, omitKeyType]);
             }
             var members = ts.createSymbolTable();
             for (var _i = 0, _a = getPropertiesOfType(source); _i < _a.length; _i++) {
@@ -35510,7 +36171,7 @@ var ts;
             if (parentAccess && parentAccess.flowNode) {
                 var propName = getDestructuringPropertyName(node);
                 if (propName) {
-                    var result = ts.createNode(190 /* ElementAccessExpression */, node.pos, node.end);
+                    var result = ts.createNode(191 /* ElementAccessExpression */, node.pos, node.end);
                     result.parent = node;
                     result.expression = parentAccess;
                     var literal = ts.createNode(10 /* StringLiteral */, node.pos, node.end);
@@ -35525,23 +36186,23 @@ var ts;
         function getParentElementAccess(node) {
             var ancestor = node.parent.parent;
             switch (ancestor.kind) {
-                case 186 /* BindingElement */:
-                case 275 /* PropertyAssignment */:
+                case 187 /* BindingElement */:
+                case 276 /* PropertyAssignment */:
                     return getSyntheticElementAccess(ancestor);
-                case 187 /* ArrayLiteralExpression */:
+                case 188 /* ArrayLiteralExpression */:
                     return getSyntheticElementAccess(node.parent);
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     return ancestor.initializer;
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return ancestor.right;
             }
         }
         function getDestructuringPropertyName(node) {
             var parent = node.parent;
-            if (node.kind === 186 /* BindingElement */ && parent.kind === 184 /* ObjectBindingPattern */) {
+            if (node.kind === 187 /* BindingElement */ && parent.kind === 185 /* ObjectBindingPattern */) {
                 return getLiteralPropertyNameText(node.propertyName || node.name);
             }
-            if (node.kind === 275 /* PropertyAssignment */ || node.kind === 276 /* ShorthandPropertyAssignment */) {
+            if (node.kind === 276 /* PropertyAssignment */ || node.kind === 277 /* ShorthandPropertyAssignment */) {
                 return getLiteralPropertyNameText(node.name);
             }
             return "" + parent.elements.indexOf(node);
@@ -35563,7 +36224,7 @@ var ts;
                 parentType = getNonNullableType(parentType);
             }
             var type;
-            if (pattern.kind === 184 /* ObjectBindingPattern */) {
+            if (pattern.kind === 185 /* ObjectBindingPattern */) {
                 if (declaration.dotDotDotToken) {
                     if (parentType.flags & 2 /* Unknown */ || !isValidSpreadType(parentType)) {
                         error(declaration, ts.Diagnostics.Rest_types_may_only_be_created_from_object_types);
@@ -35590,7 +36251,7 @@ var ts;
                 // This elementType will be used if the specific property corresponding to this index is not
                 // present (aka the tuple element property). This call also checks that the parentType is in
                 // fact an iterable or array (depending on target language).
-                var elementType = checkIteratedTypeOrElementType(parentType, pattern, /*allowStringInput*/ false, /*allowAsyncIterables*/ false);
+                var elementType = checkIteratedTypeOrElementType(65 /* Destructuring */, parentType, undefinedType, pattern);
                 var index_1 = pattern.elements.indexOf(declaration);
                 if (declaration.dotDotDotToken) {
                     // If the parent is a tuple type, the rest element has a tuple type of the
@@ -35602,21 +36263,25 @@ var ts;
                 }
                 else if (isArrayLikeType(parentType)) {
                     var indexType = getLiteralType(index_1);
-                    var declaredType = getConstraintForLocation(getIndexedAccessType(parentType, indexType, declaration.name), declaration.name);
+                    var accessFlags = hasDefaultValue(declaration) ? 8 /* NoTupleBoundsCheck */ : 0;
+                    var declaredType = getConstraintForLocation(getIndexedAccessTypeOrUndefined(parentType, indexType, declaration.name, accessFlags) || errorType, declaration.name);
                     type = getFlowTypeOfDestructuring(declaration, declaredType);
                 }
                 else {
                     type = elementType;
                 }
             }
-            // In strict null checking mode, if a default value of a non-undefined type is specified, remove
-            // undefined from the final type.
-            if (strictNullChecks && declaration.initializer && !(getFalsyFlags(checkDeclarationInitializer(declaration)) & 32768 /* Undefined */)) {
-                type = getTypeWithFacts(type, 524288 /* NEUndefined */);
+            if (!declaration.initializer) {
+                return type;
             }
-            return declaration.initializer && !ts.getEffectiveTypeAnnotationNode(ts.walkUpBindingElementsAndPatterns(declaration)) ?
-                getUnionType([type, checkDeclarationInitializer(declaration)], 2 /* Subtype */) :
-                type;
+            if (ts.getEffectiveTypeAnnotationNode(ts.walkUpBindingElementsAndPatterns(declaration))) {
+                // In strict null checking mode, if a default value of a non-undefined type is specified, remove
+                // undefined from the final type.
+                return strictNullChecks && !(getFalsyFlags(checkDeclarationInitializer(declaration)) & 32768 /* Undefined */) ?
+                    getTypeWithFacts(type, 524288 /* NEUndefined */) :
+                    type;
+            }
+            return getUnionType([getTypeWithFacts(type, 524288 /* NEUndefined */), checkDeclarationInitializer(declaration)], 2 /* Subtype */);
         }
         function getTypeForDeclarationFromJSDocComment(declaration) {
             var jsdocType = ts.getJSDocType(declaration);
@@ -35627,30 +36292,30 @@ var ts;
         }
         function isNullOrUndefined(node) {
             var expr = ts.skipParentheses(node);
-            return expr.kind === 96 /* NullKeyword */ || expr.kind === 72 /* Identifier */ && getResolvedSymbol(expr) === undefinedSymbol;
+            return expr.kind === 97 /* NullKeyword */ || expr.kind === 73 /* Identifier */ && getResolvedSymbol(expr) === undefinedSymbol;
         }
         function isEmptyArrayLiteral(node) {
             var expr = ts.skipParentheses(node);
-            return expr.kind === 187 /* ArrayLiteralExpression */ && expr.elements.length === 0;
+            return expr.kind === 188 /* ArrayLiteralExpression */ && expr.elements.length === 0;
         }
         function addOptionality(type, optional) {
             if (optional === void 0) { optional = true; }
             return strictNullChecks && optional ? getOptionalType(type) : type;
         }
         function isParameterOfContextuallyTypedFunction(node) {
-            return node.kind === 151 /* Parameter */ &&
-                (node.parent.kind === 196 /* FunctionExpression */ || node.parent.kind === 197 /* ArrowFunction */) &&
+            return node.kind === 152 /* Parameter */ &&
+                (node.parent.kind === 197 /* FunctionExpression */ || node.parent.kind === 198 /* ArrowFunction */) &&
                 !!getContextualType(node.parent);
         }
         // Return the inferred type for a variable, parameter, or property declaration
         function getTypeForVariableLikeDeclaration(declaration, includeOptionality) {
             // A variable declared in a for..in statement is of type string, or of type keyof T when the
             // right hand expression is of a type parameter type.
-            if (ts.isVariableDeclaration(declaration) && declaration.parent.parent.kind === 226 /* ForInStatement */) {
+            if (ts.isVariableDeclaration(declaration) && declaration.parent.parent.kind === 227 /* ForInStatement */) {
                 var indexType = getIndexType(getNonNullableTypeIfNeeded(checkExpression(declaration.parent.parent.expression)));
                 return indexType.flags & (262144 /* TypeParameter */ | 4194304 /* Index */) ? getExtractStringType(indexType) : stringType;
             }
-            if (ts.isVariableDeclaration(declaration) && declaration.parent.parent.kind === 227 /* ForOfStatement */) {
+            if (ts.isVariableDeclaration(declaration) && declaration.parent.parent.kind === 228 /* ForOfStatement */) {
                 // checkRightHandSideOfForOf will return undefined if the for-of expression type was
                 // missing properties/signatures required to get its iteratedType (like
                 // [Symbol.iterator] or next). This may be because we accessed properties from anyType,
@@ -35669,7 +36334,7 @@ var ts;
                 return addOptionality(declaredType, isOptional);
             }
             if ((noImplicitAny || ts.isInJSFile(declaration)) &&
-                declaration.kind === 237 /* VariableDeclaration */ && !ts.isBindingPattern(declaration.name) &&
+                declaration.kind === 238 /* VariableDeclaration */ && !ts.isBindingPattern(declaration.name) &&
                 !(ts.getCombinedModifierFlags(declaration) & 1 /* Export */) && !(declaration.flags & 4194304 /* Ambient */)) {
                 // If --noImplicitAny is on or the declaration is in a Javascript file,
                 // use control flow tracked 'any' type for non-ambient, non-exported var or let variables with no
@@ -35683,11 +36348,11 @@ var ts;
                     return autoArrayType;
                 }
             }
-            if (declaration.kind === 151 /* Parameter */) {
+            if (declaration.kind === 152 /* Parameter */) {
                 var func = declaration.parent;
                 // For a parameter of a set accessor, use the type of the get accessor if one is present
-                if (func.kind === 159 /* SetAccessor */ && !hasNonBindableDynamicName(func)) {
-                    var getter = ts.getDeclarationOfKind(getSymbolOfNode(declaration.parent), 158 /* GetAccessor */);
+                if (func.kind === 160 /* SetAccessor */ && !hasNonBindableDynamicName(func)) {
+                    var getter = ts.getDeclarationOfKind(getSymbolOfNode(declaration.parent), 159 /* GetAccessor */);
                     if (getter) {
                         var getterSignature = getSignatureFromDeclaration(getter);
                         var thisParameter = getAccessorThisParameter(func);
@@ -35706,7 +36371,7 @@ var ts;
                     }
                 }
                 // Use contextual parameter type if one is available
-                var type = declaration.symbol.escapedName === "this" /* This */ ? getContextualThisParameterType(func) : getContextuallyTypedParameterType(declaration);
+                var type = declaration.symbol.escapedName === "this" /* This */ ? getContextualThisParameterType(func) : getContextuallyTypedParameterType(declaration, /*forCache*/ true);
                 if (type) {
                     return addOptionality(type, isOptional);
                 }
@@ -35736,7 +36401,7 @@ var ts;
             // No type specified and nothing can be inferred
             return undefined;
         }
-        function getWidenedTypeFromAssignmentDeclaration(symbol, resolvedSymbol) {
+        function getWidenedTypeForAssignmentDeclaration(symbol, resolvedSymbol) {
             // function/class/{} initializers are themselves containers, so they won't merge in the same way as other initializers
             var container = ts.getAssignedExpandoInitializer(symbol.valueDeclaration);
             if (container) {
@@ -35769,7 +36434,7 @@ var ts;
                     }
                 }
                 if (!ts.isCallExpression(expression)) {
-                    jsdocType = getJSDocTypeFromAssignmentDeclaration(jsdocType, expression, symbol, declaration);
+                    jsdocType = getAnnotatedTypeForAssignmentDeclaration(jsdocType, expression, symbol, declaration);
                 }
                 if (!jsdocType) {
                     (types || (types = [])).push((ts.isBinaryExpression(expression) || ts.isCallExpression(expression)) ? getInitializerTypeFromAssignmentDeclaration(symbol, resolvedSymbol, expression, kind) : neverType);
@@ -35816,15 +36481,21 @@ var ts;
             type.objectFlags |= 16384 /* JSLiteral */;
             return type;
         }
-        function getJSDocTypeFromAssignmentDeclaration(declaredType, expression, _symbol, declaration) {
-            var typeNode = ts.getJSDocType(expression.parent);
+        function getAnnotatedTypeForAssignmentDeclaration(declaredType, expression, symbol, declaration) {
+            var typeNode = ts.getEffectiveTypeAnnotationNode(expression.parent);
             if (typeNode) {
                 var type = getWidenedType(getTypeFromTypeNode(typeNode));
                 if (!declaredType) {
                     return type;
                 }
                 else if (declaredType !== errorType && type !== errorType && !isTypeIdenticalTo(declaredType, type)) {
-                    errorNextVariableOrPropertyDeclarationMustHaveSameType(declaredType, declaration, type);
+                    errorNextVariableOrPropertyDeclarationMustHaveSameType(/*firstDeclaration*/ undefined, declaredType, declaration, type);
+                }
+            }
+            if (symbol.parent) {
+                var typeNode_2 = ts.getEffectiveTypeAnnotationNode(symbol.parent.valueDeclaration);
+                if (typeNode_2) {
+                    return getTypeOfPropertyOfType(getTypeFromTypeNode(typeNode_2), symbol.escapedName);
                 }
             }
             return declaredType;
@@ -35891,9 +36562,9 @@ var ts;
             var thisContainer = ts.getThisContainer(expression, /*includeArrowFunctions*/ false);
             // Properties defined in a constructor (or base constructor, or javascript constructor function) don't get undefined added.
             // Function expressions that are assigned to the prototype count as methods.
-            return thisContainer.kind === 157 /* Constructor */ ||
-                thisContainer.kind === 239 /* FunctionDeclaration */ ||
-                (thisContainer.kind === 196 /* FunctionExpression */ && !ts.isPrototypePropertyAssignment(thisContainer.parent));
+            return thisContainer.kind === 158 /* Constructor */ ||
+                thisContainer.kind === 240 /* FunctionDeclaration */ ||
+                (thisContainer.kind === 197 /* FunctionExpression */ && !ts.isPrototypePropertyAssignment(thisContainer.parent));
         }
         function getConstructorDefinedThisAssignmentTypes(types, declarations) {
             ts.Debug.assert(types.length === declarations.length);
@@ -35937,7 +36608,7 @@ var ts;
         function getTypeFromObjectBindingPattern(pattern, includePatternInType, reportErrors) {
             var members = ts.createSymbolTable();
             var stringIndexInfo;
-            var objectFlags = 128 /* ObjectLiteral */ | 262144 /* ContainsObjectLiteral */;
+            var objectFlags = 128 /* ObjectLiteral */ | 524288 /* ContainsObjectOrArrayLiteral */;
             ts.forEach(pattern.elements, function (e) {
                 var name = e.propertyName || e.name;
                 if (e.dotDotDotToken) {
@@ -35968,7 +36639,7 @@ var ts;
         function getTypeFromArrayBindingPattern(pattern, includePatternInType, reportErrors) {
             var elements = pattern.elements;
             var lastElement = ts.lastOrUndefined(elements);
-            var hasRestElement = !!(lastElement && lastElement.kind === 186 /* BindingElement */ && lastElement.dotDotDotToken);
+            var hasRestElement = !!(lastElement && lastElement.kind === 187 /* BindingElement */ && lastElement.dotDotDotToken);
             if (elements.length === 0 || elements.length === 1 && hasRestElement) {
                 return languageVersion >= 2 /* ES2015 */ ? createIterableType(anyType) : anyArrayType;
             }
@@ -35991,7 +36662,7 @@ var ts;
         function getTypeFromBindingPattern(pattern, includePatternInType, reportErrors) {
             if (includePatternInType === void 0) { includePatternInType = false; }
             if (reportErrors === void 0) { reportErrors = false; }
-            return pattern.kind === 184 /* ObjectBindingPattern */
+            return pattern.kind === 185 /* ObjectBindingPattern */
                 ? getTypeFromObjectBindingPattern(pattern, includePatternInType, reportErrors)
                 : getTypeFromArrayBindingPattern(pattern, includePatternInType, reportErrors);
         }
@@ -36030,7 +36701,7 @@ var ts;
         }
         function declarationBelongsToPrivateAmbientMember(declaration) {
             var root = ts.getRootDeclaration(declaration);
-            var memberDeclaration = root.kind === 151 /* Parameter */ ? root.parent : root;
+            var memberDeclaration = root.kind === 152 /* Parameter */ ? root.parent : root;
             return isPrivateWithinAmbient(memberDeclaration);
         }
         function tryGetTypeFromEffectiveTypeNode(declaration) {
@@ -36083,9 +36754,6 @@ var ts;
                 }
                 return type_1;
             }
-            if (declaration.kind === 254 /* ExportAssignment */) {
-                return widenTypeForVariableLikeDeclaration(checkExpressionCached(declaration.expression), declaration);
-            }
             // Handle variable, parameter or property
             if (!pushTypeResolution(symbol, 0 /* Type */)) {
                 // Symbol is property of some kind that is merged with something - should use `getTypeOfFuncClassEnumModule` and not `getTypeOfVariableOrParameterOrProperty`
@@ -36095,9 +36763,12 @@ var ts;
                 return reportCircularityError(symbol);
             }
             var type;
-            if (ts.isInJSFile(declaration) &&
+            if (declaration.kind === 255 /* ExportAssignment */) {
+                type = widenTypeForVariableLikeDeclaration(checkExpressionCached(declaration.expression), declaration);
+            }
+            else if (ts.isInJSFile(declaration) &&
                 (ts.isCallExpression(declaration) || ts.isBinaryExpression(declaration) || ts.isPropertyAccessExpression(declaration) && ts.isBinaryExpression(declaration.parent))) {
-                type = getWidenedTypeFromAssignmentDeclaration(symbol);
+                type = getWidenedTypeForAssignmentDeclaration(symbol);
             }
             else if (ts.isJSDocPropertyLikeTag(declaration)
                 || ts.isPropertyAccessExpression(declaration)
@@ -36112,7 +36783,7 @@ var ts;
                     return getTypeOfFuncClassEnumModule(symbol);
                 }
                 type = ts.isBinaryExpression(declaration.parent) ?
-                    getWidenedTypeFromAssignmentDeclaration(symbol) :
+                    getWidenedTypeForAssignmentDeclaration(symbol) :
                     tryGetTypeFromEffectiveTypeNode(declaration) || anyType;
             }
             else if (ts.isPropertyAssignment(declaration)) {
@@ -36143,7 +36814,7 @@ var ts;
                 type = getTypeOfEnumMember(symbol);
             }
             else {
-                return ts.Debug.fail("Unhandled declaration kind! " + ts.Debug.showSyntaxKind(declaration) + " for " + ts.Debug.showSymbol(symbol));
+                return ts.Debug.fail("Unhandled declaration kind! " + ts.Debug.formatSyntaxKind(declaration.kind) + " for " + ts.Debug.formatSymbol(symbol));
             }
             if (!popTypeResolution()) {
                 // Symbol is property of some kind that is merged with something - should use `getTypeOfFuncClassEnumModule` and not `getTypeOfVariableOrParameterOrProperty`
@@ -36156,7 +36827,7 @@ var ts;
         }
         function getAnnotatedAccessorTypeNode(accessor) {
             if (accessor) {
-                if (accessor.kind === 158 /* GetAccessor */) {
+                if (accessor.kind === 159 /* GetAccessor */) {
                     var getterTypeAnnotation = ts.getEffectiveReturnTypeNode(accessor);
                     return getterTypeAnnotation;
                 }
@@ -36183,8 +36854,8 @@ var ts;
             return links.type || (links.type = getTypeOfAccessorsWorker(symbol));
         }
         function getTypeOfAccessorsWorker(symbol) {
-            var getter = ts.getDeclarationOfKind(symbol, 158 /* GetAccessor */);
-            var setter = ts.getDeclarationOfKind(symbol, 159 /* SetAccessor */);
+            var getter = ts.getDeclarationOfKind(symbol, 159 /* GetAccessor */);
+            var setter = ts.getDeclarationOfKind(symbol, 160 /* SetAccessor */);
             if (getter && ts.isInJSFile(getter)) {
                 var jsDocType = getTypeForDeclarationFromJSDocComment(getter);
                 if (jsDocType) {
@@ -36227,7 +36898,7 @@ var ts;
             if (!popTypeResolution()) {
                 type = anyType;
                 if (noImplicitAny) {
-                    var getter_1 = ts.getDeclarationOfKind(symbol, 158 /* GetAccessor */);
+                    var getter_1 = ts.getDeclarationOfKind(symbol, 159 /* GetAccessor */);
                     error(getter_1, ts.Diagnostics._0_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions, symbolToString(symbol));
                 }
             }
@@ -36267,9 +36938,9 @@ var ts;
             if (symbol.flags & 1536 /* Module */ && ts.isShorthandAmbientModuleSymbol(symbol)) {
                 return anyType;
             }
-            else if (declaration.kind === 204 /* BinaryExpression */ ||
-                declaration.kind === 189 /* PropertyAccessExpression */ && declaration.parent.kind === 204 /* BinaryExpression */) {
-                return getWidenedTypeFromAssignmentDeclaration(symbol);
+            else if (declaration.kind === 205 /* BinaryExpression */ ||
+                declaration.kind === 190 /* PropertyAccessExpression */ && declaration.parent.kind === 205 /* BinaryExpression */) {
+                return getWidenedTypeForAssignmentDeclaration(symbol);
             }
             else if (symbol.flags & 512 /* ValueModule */ && declaration && ts.isSourceFile(declaration) && declaration.commonJsModuleIndicator) {
                 var resolvedModule = resolveExternalModuleSymbol(symbol);
@@ -36278,7 +36949,7 @@ var ts;
                         return errorType;
                     }
                     var exportEquals = getMergedSymbol(symbol.exports.get("export=" /* ExportEquals */));
-                    var type_2 = getWidenedTypeFromAssignmentDeclaration(exportEquals, exportEquals === resolvedModule ? undefined : resolvedModule);
+                    var type_2 = getWidenedTypeForAssignmentDeclaration(exportEquals, exportEquals === resolvedModule ? undefined : resolvedModule);
                     if (!popTypeResolution()) {
                         return reportCircularityError(symbol);
                     }
@@ -36335,7 +37006,7 @@ var ts;
                 return errorType;
             }
             // Check if variable has initializer that circularly references the variable itself
-            if (noImplicitAny && (declaration.kind !== 151 /* Parameter */ || declaration.initializer)) {
+            if (noImplicitAny && (declaration.kind !== 152 /* Parameter */ || declaration.initializer)) {
                 error(symbol.valueDeclaration, ts.Diagnostics._0_implicitly_has_type_any_because_it_does_not_have_a_type_annotation_and_is_referenced_directly_or_indirectly_in_its_own_initializer, symbolToString(symbol));
             }
             // Circularities could also result from parameters in function expressions that end up
@@ -36343,11 +37014,23 @@ var ts;
             // we have already reported an implicit any error so we don't report anything here.
             return anyType;
         }
+        function getTypeOfSymbolWithDeferredType(symbol) {
+            var links = getSymbolLinks(symbol);
+            if (!links.type) {
+                ts.Debug.assertDefined(links.deferralParent);
+                ts.Debug.assertDefined(links.deferralConstituents);
+                links.type = links.deferralParent.flags & 1048576 /* Union */ ? getUnionType(links.deferralConstituents) : getIntersectionType(links.deferralConstituents);
+            }
+            return links.type;
+        }
         function getTypeOfSymbol(symbol) {
+            if (ts.getCheckFlags(symbol) & 65536 /* DeferredType */) {
+                return getTypeOfSymbolWithDeferredType(symbol);
+            }
             if (ts.getCheckFlags(symbol) & 1 /* Instantiated */) {
                 return getTypeOfInstantiatedSymbol(symbol);
             }
-            if (ts.getCheckFlags(symbol) & 4096 /* ReverseMapped */) {
+            if (ts.getCheckFlags(symbol) & 8192 /* ReverseMapped */) {
                 return getTypeOfReverseMappedSymbol(symbol);
             }
             if (symbol.flags & (3 /* Variable */ | 4 /* Property */)) {
@@ -36408,35 +37091,35 @@ var ts;
                     return undefined;
                 }
                 switch (node.kind) {
-                    case 240 /* ClassDeclaration */:
-                    case 209 /* ClassExpression */:
-                    case 241 /* InterfaceDeclaration */:
-                    case 160 /* CallSignature */:
-                    case 161 /* ConstructSignature */:
-                    case 155 /* MethodSignature */:
-                    case 165 /* FunctionType */:
-                    case 166 /* ConstructorType */:
-                    case 294 /* JSDocFunctionType */:
-                    case 239 /* FunctionDeclaration */:
-                    case 156 /* MethodDeclaration */:
-                    case 196 /* FunctionExpression */:
-                    case 197 /* ArrowFunction */:
-                    case 242 /* TypeAliasDeclaration */:
-                    case 308 /* JSDocTemplateTag */:
-                    case 309 /* JSDocTypedefTag */:
-                    case 302 /* JSDocCallbackTag */:
-                    case 181 /* MappedType */:
-                    case 175 /* ConditionalType */:
+                    case 241 /* ClassDeclaration */:
+                    case 210 /* ClassExpression */:
+                    case 242 /* InterfaceDeclaration */:
+                    case 161 /* CallSignature */:
+                    case 162 /* ConstructSignature */:
+                    case 156 /* MethodSignature */:
+                    case 166 /* FunctionType */:
+                    case 167 /* ConstructorType */:
+                    case 295 /* JSDocFunctionType */:
+                    case 240 /* FunctionDeclaration */:
+                    case 157 /* MethodDeclaration */:
+                    case 197 /* FunctionExpression */:
+                    case 198 /* ArrowFunction */:
+                    case 243 /* TypeAliasDeclaration */:
+                    case 310 /* JSDocTemplateTag */:
+                    case 311 /* JSDocTypedefTag */:
+                    case 304 /* JSDocCallbackTag */:
+                    case 182 /* MappedType */:
+                    case 176 /* ConditionalType */:
                         var outerTypeParameters = getOuterTypeParameters(node, includeThisTypes);
-                        if (node.kind === 181 /* MappedType */) {
+                        if (node.kind === 182 /* MappedType */) {
                             return ts.append(outerTypeParameters, getDeclaredTypeOfTypeParameter(getSymbolOfNode(node.typeParameter)));
                         }
-                        else if (node.kind === 175 /* ConditionalType */) {
+                        else if (node.kind === 176 /* ConditionalType */) {
                             return ts.concatenate(outerTypeParameters, getInferTypeParameters(node));
                         }
                         var outerAndOwnTypeParameters = appendTypeParameters(outerTypeParameters, ts.getEffectiveTypeParameterDeclarations(node));
                         var thisType = includeThisTypes &&
-                            (node.kind === 240 /* ClassDeclaration */ || node.kind === 209 /* ClassExpression */ || node.kind === 241 /* InterfaceDeclaration */) &&
+                            (node.kind === 241 /* ClassDeclaration */ || node.kind === 210 /* ClassExpression */ || node.kind === 242 /* InterfaceDeclaration */) &&
                             getDeclaredTypeOfClassOrInterface(getSymbolOfNode(node)).thisType;
                         return thisType ? ts.append(outerAndOwnTypeParameters, thisType) : outerAndOwnTypeParameters;
                 }
@@ -36444,7 +37127,7 @@ var ts;
         }
         // The outer type parameters are those defined by enclosing generic classes, methods, or functions.
         function getOuterTypeParametersOfClassOrInterface(symbol) {
-            var declaration = symbol.flags & 32 /* Class */ ? symbol.valueDeclaration : ts.getDeclarationOfKind(symbol, 241 /* InterfaceDeclaration */);
+            var declaration = symbol.flags & 32 /* Class */ ? symbol.valueDeclaration : ts.getDeclarationOfKind(symbol, 242 /* InterfaceDeclaration */);
             return getOuterTypeParameters(declaration);
         }
         // The local type parameters are the combined set of type parameters from all declarations of the class,
@@ -36453,9 +37136,9 @@ var ts;
             var result;
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var node = _a[_i];
-                if (node.kind === 241 /* InterfaceDeclaration */ ||
-                    node.kind === 240 /* ClassDeclaration */ ||
-                    node.kind === 209 /* ClassExpression */ ||
+                if (node.kind === 242 /* InterfaceDeclaration */ ||
+                    node.kind === 241 /* ClassDeclaration */ ||
+                    node.kind === 210 /* ClassExpression */ ||
                     ts.isTypeAlias(node)) {
                     var declaration = node;
                     result = appendTypeParameters(result, ts.getEffectiveTypeParameterDeclarations(declaration));
@@ -36545,7 +37228,7 @@ var ts;
                                 ctorReturn = getReturnTypeOfSignature(ctorSig[0]);
                             }
                         }
-                        addRelatedInfo(err, ts.createDiagnosticForNode(baseConstructorType.symbol.declarations[0], ts.Diagnostics.Did_you_mean_for_0_to_be_constrained_to_type_new_args_Colon_any_1, symbolToString(baseConstructorType.symbol), typeToString(ctorReturn)));
+                        ts.addRelatedInfo(err, ts.createDiagnosticForNode(baseConstructorType.symbol.declarations[0], ts.Diagnostics.Did_you_mean_for_0_to_be_constrained_to_type_new_args_Colon_any_1, symbolToString(baseConstructorType.symbol), typeToString(ctorReturn)));
                     }
                     return type.resolvedBaseConstructorType = errorType;
                 }
@@ -36649,7 +37332,7 @@ var ts;
             type.resolvedBaseTypes = type.resolvedBaseTypes || ts.emptyArray;
             for (var _i = 0, _a = type.symbol.declarations; _i < _a.length; _i++) {
                 var declaration = _a[_i];
-                if (declaration.kind === 241 /* InterfaceDeclaration */ && ts.getInterfaceBaseTypeNodes(declaration)) {
+                if (declaration.kind === 242 /* InterfaceDeclaration */ && ts.getInterfaceBaseTypeNodes(declaration)) {
                     for (var _b = 0, _c = ts.getInterfaceBaseTypeNodes(declaration); _b < _c.length; _b++) {
                         var node = _c[_b];
                         var baseType = getTypeFromTypeNode(node);
@@ -36685,7 +37368,7 @@ var ts;
         function isThislessInterface(symbol) {
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var declaration = _a[_i];
-                if (declaration.kind === 241 /* InterfaceDeclaration */) {
+                if (declaration.kind === 242 /* InterfaceDeclaration */) {
                     if (declaration.flags & 64 /* ContainsThis */) {
                         return false;
                     }
@@ -36742,7 +37425,7 @@ var ts;
                     return errorType;
                 }
                 var declaration = ts.find(symbol.declarations, function (d) {
-                    return ts.isJSDocTypeAlias(d) || d.kind === 242 /* TypeAliasDeclaration */;
+                    return ts.isJSDocTypeAlias(d) || d.kind === 243 /* TypeAliasDeclaration */;
                 });
                 var typeNode = ts.isJSDocTypeAlias(declaration) ? declaration.typeExpression : declaration.type;
                 // If typeNode is missing, we will error in checkJSDocTypedefTag.
@@ -36769,7 +37452,7 @@ var ts;
             if (expr.kind === 10 /* StringLiteral */) {
                 return true;
             }
-            else if (expr.kind === 204 /* BinaryExpression */) {
+            else if (expr.kind === 205 /* BinaryExpression */) {
                 return isStringConcatExpression(expr.left) && isStringConcatExpression(expr.right);
             }
             return false;
@@ -36783,12 +37466,12 @@ var ts;
                 case 10 /* StringLiteral */:
                 case 8 /* NumericLiteral */:
                     return true;
-                case 202 /* PrefixUnaryExpression */:
+                case 203 /* PrefixUnaryExpression */:
                     return expr.operator === 39 /* MinusToken */ &&
                         expr.operand.kind === 8 /* NumericLiteral */;
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return ts.nodeIsMissing(expr) || !!getSymbolOfNode(member.parent).exports.get(expr.escapedText);
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return isStringConcatExpression(expr);
                 default:
                     return false;
@@ -36802,7 +37485,7 @@ var ts;
             var hasNonLiteralMember = false;
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var declaration = _a[_i];
-                if (declaration.kind === 243 /* EnumDeclaration */) {
+                if (declaration.kind === 244 /* EnumDeclaration */) {
                     for (var _b = 0, _c = declaration.members; _b < _c.length; _b++) {
                         var member = _c[_b];
                         if (member.initializer && member.initializer.kind === 10 /* StringLiteral */) {
@@ -36829,10 +37512,11 @@ var ts;
                 var memberTypeList = [];
                 for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                     var declaration = _a[_i];
-                    if (declaration.kind === 243 /* EnumDeclaration */) {
+                    if (declaration.kind === 244 /* EnumDeclaration */) {
                         for (var _b = 0, _c = declaration.members; _b < _c.length; _b++) {
                             var member = _c[_b];
-                            var memberType = getFreshTypeOfLiteralType(getLiteralType(getEnumMemberValue(member), enumCount, getSymbolOfNode(member))); // TODO: GH#18217
+                            var value = getEnumMemberValue(member);
+                            var memberType = getFreshTypeOfLiteralType(getLiteralType(value !== undefined ? value : 0, enumCount, getSymbolOfNode(member)));
                             getSymbolLinks(getSymbolOfNode(member)).declaredType = memberType;
                             memberTypeList.push(getRegularTypeOfLiteralType(memberType));
                         }
@@ -36900,23 +37584,23 @@ var ts;
          */
         function isThislessType(node) {
             switch (node.kind) {
-                case 120 /* AnyKeyword */:
-                case 143 /* UnknownKeyword */:
-                case 138 /* StringKeyword */:
-                case 135 /* NumberKeyword */:
-                case 146 /* BigIntKeyword */:
-                case 123 /* BooleanKeyword */:
-                case 139 /* SymbolKeyword */:
-                case 136 /* ObjectKeyword */:
-                case 106 /* VoidKeyword */:
-                case 141 /* UndefinedKeyword */:
-                case 96 /* NullKeyword */:
-                case 132 /* NeverKeyword */:
-                case 182 /* LiteralType */:
+                case 121 /* AnyKeyword */:
+                case 144 /* UnknownKeyword */:
+                case 139 /* StringKeyword */:
+                case 136 /* NumberKeyword */:
+                case 147 /* BigIntKeyword */:
+                case 124 /* BooleanKeyword */:
+                case 140 /* SymbolKeyword */:
+                case 137 /* ObjectKeyword */:
+                case 107 /* VoidKeyword */:
+                case 142 /* UndefinedKeyword */:
+                case 97 /* NullKeyword */:
+                case 133 /* NeverKeyword */:
+                case 183 /* LiteralType */:
                     return true;
-                case 169 /* ArrayType */:
+                case 170 /* ArrayType */:
                     return isThislessType(node.elementType);
-                case 164 /* TypeReference */:
+                case 165 /* TypeReference */:
                     return !node.typeArguments || node.typeArguments.every(isThislessType);
             }
             return false;
@@ -36942,7 +37626,7 @@ var ts;
         function isThislessFunctionLikeDeclaration(node) {
             var returnType = ts.getEffectiveReturnTypeNode(node);
             var typeParameters = ts.getEffectiveTypeParameterDeclarations(node);
-            return (node.kind === 157 /* Constructor */ || (!!returnType && isThislessType(returnType))) &&
+            return (node.kind === 158 /* Constructor */ || (!!returnType && isThislessType(returnType))) &&
                 node.parameters.every(isThislessVariableLikeDeclaration) &&
                 typeParameters.every(isThislessTypeParameter);
         }
@@ -36958,14 +37642,14 @@ var ts;
                 var declaration = symbol.declarations[0];
                 if (declaration) {
                     switch (declaration.kind) {
-                        case 154 /* PropertyDeclaration */:
-                        case 153 /* PropertySignature */:
+                        case 155 /* PropertyDeclaration */:
+                        case 154 /* PropertySignature */:
                             return isThislessVariableLikeDeclaration(declaration);
-                        case 156 /* MethodDeclaration */:
-                        case 155 /* MethodSignature */:
-                        case 157 /* Constructor */:
-                        case 158 /* GetAccessor */:
-                        case 159 /* SetAccessor */:
+                        case 157 /* MethodDeclaration */:
+                        case 156 /* MethodSignature */:
+                        case 158 /* Constructor */:
+                        case 159 /* GetAccessor */:
+                        case 160 /* SetAccessor */:
                             return isThislessFunctionLikeDeclaration(declaration);
                     }
                 }
@@ -37066,7 +37750,7 @@ var ts;
          * members.
          */
         function addDeclarationToLateBoundSymbol(symbol, member, symbolFlags) {
-            ts.Debug.assert(!!(ts.getCheckFlags(symbol) & 2048 /* Late */), "Expected a late-bound symbol.");
+            ts.Debug.assert(!!(ts.getCheckFlags(symbol) & 4096 /* Late */), "Expected a late-bound symbol.");
             symbol.flags |= symbolFlags;
             getSymbolLinks(member.symbol).lateSymbol = symbol;
             if (!symbol.declarations) {
@@ -37123,7 +37807,7 @@ var ts;
                     // Get or add a late-bound symbol for the member. This allows us to merge late-bound accessor declarations.
                     var lateSymbol = lateSymbols.get(memberName);
                     if (!lateSymbol)
-                        lateSymbols.set(memberName, lateSymbol = createSymbol(0 /* None */, memberName, 2048 /* Late */));
+                        lateSymbols.set(memberName, lateSymbol = createSymbol(0 /* None */, memberName, 4096 /* Late */));
                     // Report an error if a late-bound member has the same name as an early-bound member,
                     // or if we have another early-bound symbol declaration with the same name and
                     // conflicting flags.
@@ -37135,7 +37819,7 @@ var ts;
                         var name_3 = !(type.flags & 8192 /* UniqueESSymbol */) && ts.unescapeLeadingUnderscores(memberName) || ts.declarationNameToString(decl.name);
                         ts.forEach(declarations, function (declaration) { return error(ts.getNameOfDeclaration(declaration) || declaration, ts.Diagnostics.Property_0_was_also_declared_here, name_3); });
                         error(decl.name || decl, ts.Diagnostics.Duplicate_property_0, name_3);
-                        lateSymbol = createSymbol(0 /* None */, memberName, 2048 /* Late */);
+                        lateSymbol = createSymbol(0 /* None */, memberName, 4096 /* Late */);
                     }
                     lateSymbol.nameType = type;
                     addDeclarationToLateBoundSymbol(lateSymbol, decl, symbolFlags);
@@ -37200,11 +37884,12 @@ var ts;
                 var links = getSymbolLinks(symbol);
                 if (!links.lateSymbol && ts.some(symbol.declarations, hasLateBindableName)) {
                     // force late binding of members/exports. This will set the late-bound symbol
+                    var parent = getMergedSymbol(symbol.parent);
                     if (ts.some(symbol.declarations, ts.hasStaticModifier)) {
-                        getExportsOfSymbol(symbol.parent);
+                        getExportsOfSymbol(parent);
                     }
                     else {
-                        getMembersOfSymbol(symbol.parent);
+                        getMembersOfSymbol(parent);
                     }
                 }
                 return links.lateSymbol || (links.lateSymbol = symbol);
@@ -37297,8 +37982,18 @@ var ts;
             return sig;
         }
         function cloneSignature(sig) {
-            return createSignature(sig.declaration, sig.typeParameters, sig.thisParameter, sig.parameters, /*resolvedReturnType*/ undefined, 
+            var result = createSignature(sig.declaration, sig.typeParameters, sig.thisParameter, sig.parameters, /*resolvedReturnType*/ undefined, 
             /*resolvedTypePredicate*/ undefined, sig.minArgumentCount, sig.hasRestParameter, sig.hasLiteralTypes);
+            result.target = sig.target;
+            result.mapper = sig.mapper;
+            return result;
+        }
+        function createUnionSignature(signature, unionSignatures) {
+            var result = cloneSignature(signature);
+            result.unionSignatures = unionSignatures;
+            result.target = undefined;
+            result.mapper = undefined;
+            return result;
         }
         function getExpandedParameters(sig) {
             if (sig.hasRestParameter) {
@@ -37311,8 +38006,8 @@ var ts;
                     var tupleRestIndex_1 = restType.target.hasRestElement ? elementTypes.length - 1 : -1;
                     var restParams = ts.map(elementTypes, function (t, i) {
                         var name = getParameterNameAtPosition(sig, restIndex_1 + i);
-                        var checkFlags = i === tupleRestIndex_1 ? 16384 /* RestParameter */ :
-                            i >= minLength_1 ? 8192 /* OptionalParameter */ : 0;
+                        var checkFlags = i === tupleRestIndex_1 ? 32768 /* RestParameter */ :
+                            i >= minLength_1 ? 16384 /* OptionalParameter */ : 0;
                         var symbol = createSymbol(1 /* FunctionScopedVariable */, name, checkFlags);
                         symbol.type = i === tupleRestIndex_1 ? createArrayType(t) : t;
                         return symbol;
@@ -37402,14 +38097,13 @@ var ts;
                             // Union the result types when more than one signature matches
                             if (unionSignatures.length > 1) {
                                 var thisParameter = signature.thisParameter;
-                                if (ts.forEach(unionSignatures, function (sig) { return sig.thisParameter; })) {
-                                    // TODO: GH#18217 We tested that *some* has thisParameter and now act as if *all* do
+                                var firstThisParameterOfUnionSignatures = ts.forEach(unionSignatures, function (sig) { return sig.thisParameter; });
+                                if (firstThisParameterOfUnionSignatures) {
                                     var thisType = getUnionType(ts.map(unionSignatures, function (sig) { return sig.thisParameter ? getTypeOfSymbol(sig.thisParameter) : anyType; }), 2 /* Subtype */);
-                                    thisParameter = createSymbolWithType(signature.thisParameter, thisType);
+                                    thisParameter = createSymbolWithType(firstThisParameterOfUnionSignatures, thisType);
                                 }
-                                s = cloneSignature(signature);
+                                s = createUnionSignature(signature, unionSignatures);
                                 s.thisParameter = thisParameter;
-                                s.unionSignatures = unionSignatures;
                             }
                             (result || (result = [])).push(s);
                         }
@@ -37454,9 +38148,11 @@ var ts;
             return createSymbolWithType(left, thisType);
         }
         function combineUnionParameters(left, right) {
-            var longest = getParameterCount(left) >= getParameterCount(right) ? left : right;
+            var leftCount = getParameterCount(left);
+            var rightCount = getParameterCount(right);
+            var longest = leftCount >= rightCount ? left : right;
             var shorter = longest === left ? right : left;
-            var longestCount = getParameterCount(longest);
+            var longestCount = longest === left ? leftCount : rightCount;
             var eitherHasEffectiveRest = (hasEffectiveRestParameter(left) || hasEffectiveRestParameter(right));
             var needsExtraRestElement = eitherHasEffectiveRest && !hasEffectiveRestParameter(longest);
             var params = new Array(longestCount + (needsExtraRestElement ? 1 : 0));
@@ -37466,9 +38162,13 @@ var ts;
                 var unionParamType = getIntersectionType([longestParamType, shorterParamType]);
                 var isRestParam = eitherHasEffectiveRest && !needsExtraRestElement && i === (longestCount - 1);
                 var isOptional = i >= getMinArgumentCount(longest) && i >= getMinArgumentCount(shorter);
-                var leftName = getParameterNameAtPosition(left, i);
-                var rightName = getParameterNameAtPosition(right, i);
-                var paramSymbol = createSymbol(1 /* FunctionScopedVariable */ | (isOptional && !isRestParam ? 16777216 /* Optional */ : 0), leftName === rightName ? leftName : "arg" + i);
+                var leftName = i >= leftCount ? undefined : getParameterNameAtPosition(left, i);
+                var rightName = i >= rightCount ? undefined : getParameterNameAtPosition(right, i);
+                var paramName = leftName === rightName ? leftName :
+                    !leftName ? rightName :
+                        !rightName ? leftName :
+                            undefined;
+                var paramSymbol = createSymbol(1 /* FunctionScopedVariable */ | (isOptional && !isRestParam ? 16777216 /* Optional */ : 0), paramName || "arg" + i);
                 paramSymbol.type = isRestParam ? createArrayType(unionParamType) : unionParamType;
                 params[i] = paramSymbol;
             }
@@ -37524,13 +38224,22 @@ var ts;
         function unionSpreadIndexInfos(info1, info2) {
             return info1 && info2 && createIndexInfo(getUnionType([info1.type, info2.type]), info1.isReadonly || info2.isReadonly);
         }
-        function includeMixinType(type, types, index) {
+        function findMixins(types) {
+            var constructorTypeCount = ts.countWhere(types, function (t) { return getSignaturesOfType(t, 1 /* Construct */).length > 0; });
+            var mixinFlags = ts.map(types, isMixinConstructorType);
+            if (constructorTypeCount > 0 && constructorTypeCount === ts.countWhere(mixinFlags, function (b) { return b; })) {
+                var firstMixinIndex = mixinFlags.indexOf(/*searchElement*/ true);
+                mixinFlags[firstMixinIndex] = false;
+            }
+            return mixinFlags;
+        }
+        function includeMixinType(type, types, mixinFlags, index) {
             var mixedTypes = [];
             for (var i = 0; i < types.length; i++) {
                 if (i === index) {
                     mixedTypes.push(type);
                 }
-                else if (isMixinConstructorType(types[i])) {
+                else if (mixinFlags[i]) {
                     mixedTypes.push(getReturnTypeOfSignature(getSignaturesOfType(types[i], 1 /* Construct */)[0]));
                 }
             }
@@ -37539,12 +38248,13 @@ var ts;
         function resolveIntersectionTypeMembers(type) {
             // The members and properties collections are empty for intersection types. To get all properties of an
             // intersection type use getPropertiesOfType (only the language service uses this).
-            var callSignatures = ts.emptyArray;
-            var constructSignatures = ts.emptyArray;
+            var callSignatures;
+            var constructSignatures;
             var stringIndexInfo;
             var numberIndexInfo;
             var types = type.types;
-            var mixinCount = ts.countWhere(types, isMixinConstructorType);
+            var mixinFlags = findMixins(types);
+            var mixinCount = ts.countWhere(mixinFlags, function (b) { return b; });
             var _loop_6 = function (i) {
                 var t = type.types[i];
                 // When an intersection type contains mixin constructor types, the construct signatures from
@@ -37552,25 +38262,37 @@ var ts;
                 // other construct signatures in the intersection type. For example, the intersection type
                 // '{ new(...args: any[]) => A } & { new(s: string) => B }' has a single construct signature
                 // 'new(s: string) => A & B'.
-                if (mixinCount === 0 || mixinCount === types.length && i === 0 || !isMixinConstructorType(t)) {
+                if (!mixinFlags[i]) {
                     var signatures = getSignaturesOfType(t, 1 /* Construct */);
                     if (signatures.length && mixinCount > 0) {
                         signatures = ts.map(signatures, function (s) {
                             var clone = cloneSignature(s);
-                            clone.resolvedReturnType = includeMixinType(getReturnTypeOfSignature(s), types, i);
+                            clone.resolvedReturnType = includeMixinType(getReturnTypeOfSignature(s), types, mixinFlags, i);
                             return clone;
                         });
                     }
-                    constructSignatures = ts.concatenate(constructSignatures, signatures);
+                    constructSignatures = appendSignatures(constructSignatures, signatures);
                 }
-                callSignatures = ts.concatenate(callSignatures, getSignaturesOfType(t, 0 /* Call */));
+                callSignatures = appendSignatures(callSignatures, getSignaturesOfType(t, 0 /* Call */));
                 stringIndexInfo = intersectIndexInfos(stringIndexInfo, getIndexInfoOfType(t, 0 /* String */));
                 numberIndexInfo = intersectIndexInfos(numberIndexInfo, getIndexInfoOfType(t, 1 /* Number */));
             };
             for (var i = 0; i < types.length; i++) {
                 _loop_6(i);
             }
-            setStructuredTypeMembers(type, emptySymbols, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
+            setStructuredTypeMembers(type, emptySymbols, callSignatures || ts.emptyArray, constructSignatures || ts.emptyArray, stringIndexInfo, numberIndexInfo);
+        }
+        function appendSignatures(signatures, newSignatures) {
+            var _loop_7 = function (sig) {
+                if (!signatures || ts.every(signatures, function (s) { return !compareSignaturesIdentical(s, sig, /*partialMatch*/ false, /*ignoreThisTypes*/ false, /*ignoreReturnTypes*/ false, compareTypesIdentical); })) {
+                    signatures = ts.append(signatures, sig);
+                }
+            };
+            for (var _i = 0, newSignatures_1 = newSignatures; _i < newSignatures_1.length; _i++) {
+                var sig = newSignatures_1[_i];
+                _loop_7(sig);
+            }
+            return signatures;
         }
         /**
          * Converts an AnonymousType to a ResolvedType.
@@ -37601,6 +38323,15 @@ var ts;
                 var stringIndexInfo = void 0;
                 if (symbol.exports) {
                     members = getExportsOfSymbol(symbol);
+                    if (symbol === globalThisSymbol) {
+                        var varsOnly_1 = ts.createMap();
+                        members.forEach(function (p) {
+                            if (!(p.flags & 418 /* BlockScoped */)) {
+                                varsOnly_1.set(p.escapedName, p);
+                            }
+                        });
+                        members = varsOnly_1;
+                    }
                 }
                 setStructuredTypeMembers(type, members, ts.emptyArray, ts.emptyArray, undefined, undefined);
                 if (symbol.flags & 32 /* Class */) {
@@ -37614,7 +38345,8 @@ var ts;
                         stringIndexInfo = createIndexInfo(anyType, /*isReadonly*/ false);
                     }
                 }
-                var numberIndexInfo = symbol.flags & 384 /* Enum */ ? enumNumberIndexInfo : undefined;
+                var numberIndexInfo = symbol.flags & 384 /* Enum */ && (getDeclaredTypeOfSymbol(symbol).flags & 32 /* Enum */ ||
+                    ts.some(type.properties, function (prop) { return !!(getTypeOfSymbol(prop).flags & 296 /* NumberLike */); })) ? enumNumberIndexInfo : undefined;
                 setStructuredTypeMembers(type, members, ts.emptyArray, ts.emptyArray, stringIndexInfo, numberIndexInfo);
                 // We resolve the members before computing the signatures because a signature may use
                 // typeof with a qualified name expression that circularly references the type we are
@@ -37644,7 +38376,7 @@ var ts;
             var members = ts.createSymbolTable();
             for (var _i = 0, _a = getPropertiesOfType(type.source); _i < _a.length; _i++) {
                 var prop = _a[_i];
-                var checkFlags = 4096 /* ReverseMapped */ | (readonlyMask && isReadonlySymbol(prop) ? 8 /* Readonly */ : 0);
+                var checkFlags = 8192 /* ReverseMapped */ | (readonlyMask && isReadonlySymbol(prop) ? 8 /* Readonly */ : 0);
                 var inferredProp = createSymbol(4 /* Property */ | prop.flags & optionalMask, prop.escapedName, checkFlags);
                 inferredProp.declarations = prop.declarations;
                 inferredProp.nameType = prop.nameType;
@@ -37666,7 +38398,15 @@ var ts;
                 return getIndexType(getApparentType(type.type));
             }
             if (type.flags & 16777216 /* Conditional */) {
-                return getLowerBoundOfConditionalType(type);
+                if (type.root.isDistributive) {
+                    var checkType = type.checkType;
+                    var constraint = getLowerBoundOfKeyType(checkType);
+                    if (constraint !== checkType) {
+                        var mapper = makeUnaryTypeMapper(type.root.checkType, constraint);
+                        return getConditionalTypeInstantiation(type, combineTypeMappers(mapper, type.mapper));
+                    }
+                }
+                return type;
             }
             if (type.flags & 1048576 /* Union */) {
                 return getUnionType(ts.sameMap(type.types, getLowerBoundOfKeyType));
@@ -37676,16 +38416,6 @@ var ts;
             }
             return neverType;
         }
-        function getLowerBoundOfConditionalType(type) {
-            if (type.root.isDistributive) {
-                var constraint = getLowerBoundOfKeyType(type.checkType);
-                if (constraint !== type.checkType) {
-                    var mapper = makeUnaryTypeMapper(type.root.checkType, constraint);
-                    return getConditionalTypeInstantiation(type, combineTypeMappers(mapper, type.mapper));
-                }
-            }
-            return type;
-        }
         /** Resolve the members of a mapped type { [P in K]: T } */
         function resolveMappedTypeMembers(type) {
             var members = ts.createSymbolTable();
@@ -37750,8 +38480,8 @@ var ts;
                 else if (t.flags & (1 /* Any */ | 4 /* String */)) {
                     stringIndexInfo = createIndexInfo(propType, !!(templateModifiers & 1 /* IncludeReadonly */));
                 }
-                else if (t.flags & 8 /* Number */) {
-                    numberIndexInfo = createIndexInfo(propType, !!(templateModifiers & 1 /* IncludeReadonly */));
+                else if (t.flags & (8 /* Number */ | 32 /* Enum */)) {
+                    numberIndexInfo = createIndexInfo(numberIndexInfo ? getUnionType([numberIndexInfo.type, propType]) : propType, !!(templateModifiers & 1 /* IncludeReadonly */));
                 }
             }
         }
@@ -37774,8 +38504,8 @@ var ts;
         }
         function isMappedTypeWithKeyofConstraintDeclaration(type) {
             var constraintDeclaration = getConstraintDeclarationForMappedType(type); // TODO: GH#18217
-            return constraintDeclaration.kind === 179 /* TypeOperator */ &&
-                constraintDeclaration.operator === 129 /* KeyOfKeyword */;
+            return constraintDeclaration.kind === 180 /* TypeOperator */ &&
+                constraintDeclaration.operator === 130 /* KeyOfKeyword */;
         }
         function getModifiersTypeFromMappedType(type) {
             if (!type.modifiersType) {
@@ -37792,7 +38522,7 @@ var ts;
                     var declaredType = getTypeFromMappedTypeNode(type.declaration);
                     var constraint = getConstraintTypeFromMappedType(declaredType);
                     var extendedConstraint = constraint && constraint.flags & 262144 /* TypeParameter */ ? getConstraintOfTypeParameter(constraint) : constraint;
-                    type.modifiersType = extendedConstraint && extendedConstraint.flags & 4194304 /* Index */ ? instantiateType(extendedConstraint.type, type.mapper || identityMapper) : emptyObjectType;
+                    type.modifiersType = extendedConstraint && extendedConstraint.flags & 4194304 /* Index */ ? instantiateType(extendedConstraint.type, type.mapper || identityMapper) : unknownType;
                 }
             }
             return type.modifiersType;
@@ -37888,6 +38618,26 @@ var ts;
             }
             return type.resolvedProperties;
         }
+        function getPossiblePropertiesOfUnionType(type) {
+            if (type.possiblePropertyCache) {
+                return type.possiblePropertyCache.size ? ts.arrayFrom(type.possiblePropertyCache.values()) : ts.emptyArray;
+            }
+            type.possiblePropertyCache = ts.createSymbolTable();
+            for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
+                var t = _a[_i];
+                for (var _b = 0, _c = getPropertiesOfType(t); _b < _c.length; _b++) {
+                    var p = _c[_b];
+                    if (!type.possiblePropertyCache.has(p.escapedName)) {
+                        var prop = getUnionOrIntersectionProperty(type, p.escapedName);
+                        if (prop) {
+                            type.possiblePropertyCache.set(p.escapedName, prop);
+                        }
+                    }
+                }
+            }
+            // We can't simply use the normal property cache here, since that will contain cached apparent type members :(
+            return type.possiblePropertyCache.size ? ts.arrayFrom(type.possiblePropertyCache.values()) : ts.emptyArray;
+        }
         function getPropertiesOfType(type) {
             type = getApparentType(type);
             return type.flags & 3145728 /* UnionOrIntersection */ ?
@@ -37933,24 +38683,25 @@ var ts;
             return hasNonCircularBaseConstraint(typeParameter) ? getConstraintFromTypeParameter(typeParameter) : undefined;
         }
         function getConstraintOfIndexedAccess(type) {
-            var objectType = getConstraintOfType(type.objectType) || type.objectType;
-            if (objectType !== type.objectType) {
-                var constraint = getIndexedAccessType(objectType, type.indexType, /*accessNode*/ undefined, errorType);
-                if (constraint && constraint !== errorType) {
-                    return constraint;
+            return hasNonCircularBaseConstraint(type) ? getConstraintFromIndexedAccess(type) : undefined;
+        }
+        function getSimplifiedTypeOrConstraint(type) {
+            var simplified = getSimplifiedType(type, /*writing*/ false);
+            return simplified !== type ? simplified : getConstraintOfType(type);
+        }
+        function getConstraintFromIndexedAccess(type) {
+            var indexConstraint = getSimplifiedTypeOrConstraint(type.indexType);
+            if (indexConstraint && indexConstraint !== type.indexType) {
+                var indexedAccess = getIndexedAccessTypeOrUndefined(type.objectType, indexConstraint);
+                if (indexedAccess) {
+                    return indexedAccess;
                 }
             }
-            var baseConstraint = getBaseConstraintOfType(type);
-            return baseConstraint && baseConstraint !== type ? baseConstraint : undefined;
-        }
-        function getDefaultConstraintOfTrueBranchOfConditionalType(root, combinedMapper, mapper) {
-            var rootTrueType = root.trueType;
-            var rootTrueConstraint = !(rootTrueType.flags & 33554432 /* Substitution */)
-                ? rootTrueType
-                : instantiateType((rootTrueType.substitute), combinedMapper || mapper).flags & 3 /* AnyOrUnknown */
-                    ? rootTrueType.typeVariable
-                    : getIntersectionType([rootTrueType.substitute, rootTrueType.typeVariable]);
-            return instantiateType(rootTrueConstraint, combinedMapper || mapper);
+            var objectConstraint = getSimplifiedTypeOrConstraint(type.objectType);
+            if (objectConstraint && objectConstraint !== type.objectType) {
+                return getIndexedAccessTypeOrUndefined(objectConstraint, type.indexType);
+            }
+            return undefined;
         }
         function getDefaultConstraintOfConditionalType(type) {
             if (!type.resolvedDefaultConstraint) {
@@ -37958,7 +38709,7 @@ var ts;
                 // a conditional type with a single branch of type `any` would be assignable to anything, since it's constraint would simplify to
                 // just `any`. This result is _usually_ unwanted - so instead here we elide an `any` branch from the constraint type,
                 // in effect treating `any` like `never` rather than `unknown` in this location.
-                var trueConstraint = getDefaultConstraintOfTrueBranchOfConditionalType(type.root, type.combinedMapper, type.mapper);
+                var trueConstraint = getInferredTrueTypeFromConditionalType(type);
                 var falseConstraint = getFalseTypeFromConditionalType(type);
                 type.resolvedDefaultConstraint = isTypeAny(trueConstraint) ? falseConstraint : isTypeAny(falseConstraint) ? trueConstraint : getUnionType([trueConstraint, falseConstraint]);
             }
@@ -37977,7 +38728,7 @@ var ts;
             // a union - once negated types exist and are applied to the conditional false branch, this "constraint"
             // likely doesn't need to exist.
             if (type.root.isDistributive && type.restrictiveInstantiation !== type) {
-                var simplified = getSimplifiedType(type.checkType);
+                var simplified = getSimplifiedType(type.checkType, /*writing*/ false);
                 var constraint = simplified === type.checkType ? getConstraintOfType(simplified) : simplified;
                 if (constraint && constraint !== type.checkType) {
                     var mapper = makeUnaryTypeMapper(type.root.checkType, constraint);
@@ -37989,9 +38740,12 @@ var ts;
             }
             return undefined;
         }
-        function getConstraintOfConditionalType(type) {
+        function getConstraintFromConditionalType(type) {
             return getConstraintOfDistributiveConditionalType(type) || getDefaultConstraintOfConditionalType(type);
         }
+        function getConstraintOfConditionalType(type) {
+            return hasNonCircularBaseConstraint(type) ? getConstraintFromConditionalType(type) : undefined;
+        }
         function getUnionConstraintOfIntersection(type, targetIsUnion) {
             var constraints;
             var hasDisjointDomainType = false;
@@ -38005,11 +38759,6 @@ var ts;
                         constraint = getConstraintOfType(constraint);
                     }
                     if (constraint) {
-                        // A constraint that isn't a union type implies that the final type would be a non-union
-                        // type as well. Since non-union constraints are of no interest, we can exit here.
-                        if (!(constraint.flags & 1048576 /* Union */)) {
-                            return undefined;
-                        }
                         constraints = ts.append(constraints, constraint);
                     }
                 }
@@ -38018,10 +38767,10 @@ var ts;
                 }
             }
             // If the target is a union type or if we are intersecting with types belonging to one of the
-            // disjoint domans, we may end up producing a constraint that hasn't been examined before.
+            // disjoint domains, we may end up producing a constraint that hasn't been examined before.
             if (constraints && (targetIsUnion || hasDisjointDomainType)) {
                 if (hasDisjointDomainType) {
-                    // We add any types belong to one of the disjoint domans because they might cause the final
+                    // We add any types belong to one of the disjoint domains because they might cause the final
                     // intersection operation to reduce the union constraints.
                     for (var _b = 0, _c = type.types; _b < _c.length; _b++) {
                         var t = _c[_b];
@@ -38065,9 +38814,9 @@ var ts;
                     if (!pushTypeResolution(t, 4 /* ImmediateBaseConstraint */)) {
                         return circularConstraintType;
                     }
-                    if (constraintDepth === 50) {
+                    if (constraintDepth >= 50) {
                         // We have reached 50 recursive invocations of getImmediateBaseConstraint and there is a
-                        // very high likelyhood we're dealing with an infinite generic type that perpetually generates
+                        // very high likelihood we're dealing with an infinite generic type that perpetually generates
                         // new type identities as we descend into it. We stop the recursion here and mark this type
                         // and the outer types as having circular constraints.
                         error(currentNode, ts.Diagnostics.Type_instantiation_is_excessively_deep_and_possibly_infinite);
@@ -38075,7 +38824,7 @@ var ts;
                         return t.immediateBaseConstraint = noConstraintType;
                     }
                     constraintDepth++;
-                    var result = computeBaseConstraint(getSimplifiedType(t));
+                    var result = computeBaseConstraint(getSimplifiedType(t, /*writing*/ false));
                     constraintDepth--;
                     if (!popTypeResolution()) {
                         if (t.flags & 262144 /* TypeParameter */) {
@@ -38083,7 +38832,7 @@ var ts;
                             if (errorNode) {
                                 var diagnostic = error(errorNode, ts.Diagnostics.Type_parameter_0_has_a_circular_constraint, typeToString(t));
                                 if (currentNode && !ts.isNodeDescendantOf(errorNode, currentNode) && !ts.isNodeDescendantOf(currentNode, errorNode)) {
-                                    addRelatedInfo(diagnostic, ts.createDiagnosticForNode(currentNode, ts.Diagnostics.Circularity_originates_in_type_at_this_location));
+                                    ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(currentNode, ts.Diagnostics.Circularity_originates_in_type_at_this_location));
                                 }
                             }
                         }
@@ -38127,12 +38876,15 @@ var ts;
                 if (t.flags & 8388608 /* IndexedAccess */) {
                     var baseObjectType = getBaseConstraint(t.objectType);
                     var baseIndexType = getBaseConstraint(t.indexType);
-                    var baseIndexedAccess = baseObjectType && baseIndexType ? getIndexedAccessType(baseObjectType, baseIndexType, /*accessNode*/ undefined, errorType) : undefined;
-                    return baseIndexedAccess && baseIndexedAccess !== errorType ? getBaseConstraint(baseIndexedAccess) : undefined;
+                    var baseIndexedAccess = baseObjectType && baseIndexType && getIndexedAccessTypeOrUndefined(baseObjectType, baseIndexType);
+                    return baseIndexedAccess && getBaseConstraint(baseIndexedAccess);
                 }
                 if (t.flags & 16777216 /* Conditional */) {
-                    var constraint = getConstraintOfConditionalType(t);
-                    return constraint && getBaseConstraint(constraint);
+                    var constraint = getConstraintFromConditionalType(t);
+                    constraintDepth++; // Penalize repeating conditional types (this captures the recursion within getConstraintFromConditionalType and carries it forward)
+                    var result = constraint && getBaseConstraint(constraint);
+                    constraintDepth--;
+                    return result;
                 }
                 if (t.flags & 33554432 /* Substitution */) {
                     return getBaseConstraint(t.substitute);
@@ -38206,25 +38958,26 @@ var ts;
          * type itself. Note that the apparent type of a union type is the union type itself.
          */
         function getApparentType(type) {
-            var t = type.flags & 63176704 /* Instantiable */ ? getBaseConstraintOfType(type) || emptyObjectType : type;
+            var t = type.flags & 63176704 /* Instantiable */ ? getBaseConstraintOfType(type) || unknownType : type;
             return ts.getObjectFlags(t) & 32 /* Mapped */ ? getApparentTypeOfMappedType(t) :
                 t.flags & 2097152 /* Intersection */ ? getApparentTypeOfIntersectionType(t) :
                     t.flags & 132 /* StringLike */ ? globalStringType :
                         t.flags & 296 /* NumberLike */ ? globalNumberType :
-                            t.flags & 2112 /* BigIntLike */ ? getGlobalBigIntType(/*reportErrors*/ languageVersion >= 7 /* ESNext */) :
+                            t.flags & 2112 /* BigIntLike */ ? getGlobalBigIntType(/*reportErrors*/ languageVersion >= 99 /* ESNext */) :
                                 t.flags & 528 /* BooleanLike */ ? globalBooleanType :
                                     t.flags & 12288 /* ESSymbolLike */ ? getGlobalESSymbolType(/*reportErrors*/ languageVersion >= 2 /* ES2015 */) :
                                         t.flags & 67108864 /* NonPrimitive */ ? emptyObjectType :
                                             t.flags & 4194304 /* Index */ ? keyofConstraintType :
-                                                t;
+                                                t.flags & 2 /* Unknown */ && !strictNullChecks ? emptyObjectType :
+                                                    t;
         }
         function createUnionOrIntersectionProperty(containingType, name) {
-            var props;
+            var propSet = ts.createMap();
             var indexTypes;
             var isUnion = containingType.flags & 1048576 /* Union */;
             var excludeModifiers = isUnion ? 24 /* NonPublicAccessibilityModifier */ : 0;
             // Flags we want to propagate to the result if they exist in all source symbols
-            var commonFlags = isUnion ? 0 /* None */ : 16777216 /* Optional */;
+            var optionalFlag = isUnion ? 0 /* None */ : 16777216 /* Optional */;
             var syntheticFlag = 4 /* SyntheticMethod */;
             var checkFlags = 0;
             for (var _i = 0, _a = containingType.types; _i < _a.length; _i++) {
@@ -38234,13 +38987,21 @@ var ts;
                     var prop = getPropertyOfType(type, name);
                     var modifiers = prop ? ts.getDeclarationModifierFlagsFromSymbol(prop) : 0;
                     if (prop && !(modifiers & excludeModifiers)) {
-                        commonFlags &= prop.flags;
-                        props = ts.appendIfUnique(props, prop);
+                        if (isUnion) {
+                            optionalFlag |= (prop.flags & 16777216 /* Optional */);
+                        }
+                        else {
+                            optionalFlag &= prop.flags;
+                        }
+                        var id = "" + getSymbolId(prop);
+                        if (!propSet.has(id)) {
+                            propSet.set(id, prop);
+                        }
                         checkFlags |= (isReadonlySymbol(prop) ? 8 /* Readonly */ : 0) |
-                            (!(modifiers & 24 /* NonPublicAccessibilityModifier */) ? 128 /* ContainsPublic */ : 0) |
-                            (modifiers & 16 /* Protected */ ? 256 /* ContainsProtected */ : 0) |
-                            (modifiers & 8 /* Private */ ? 512 /* ContainsPrivate */ : 0) |
-                            (modifiers & 32 /* Static */ ? 1024 /* ContainsStatic */ : 0);
+                            (!(modifiers & 24 /* NonPublicAccessibilityModifier */) ? 256 /* ContainsPublic */ : 0) |
+                            (modifiers & 16 /* Protected */ ? 512 /* ContainsProtected */ : 0) |
+                            (modifiers & 8 /* Private */ ? 1024 /* ContainsPrivate */ : 0) |
+                            (modifiers & 32 /* Static */ ? 2048 /* ContainsStatic */ : 0);
                         if (!isPrototypeProperty(prop)) {
                             syntheticFlag = 2 /* SyntheticProperty */;
                         }
@@ -38248,19 +39009,24 @@ var ts;
                     else if (isUnion) {
                         var indexInfo = !isLateBoundName(name) && (isNumericLiteralName(name) && getIndexInfoOfType(type, 1 /* Number */) || getIndexInfoOfType(type, 0 /* String */));
                         if (indexInfo) {
-                            checkFlags |= indexInfo.isReadonly ? 8 /* Readonly */ : 0;
+                            checkFlags |= 32 /* WritePartial */ | (indexInfo.isReadonly ? 8 /* Readonly */ : 0);
                             indexTypes = ts.append(indexTypes, isTupleType(type) ? getRestTypeOfTupleType(type) || undefinedType : indexInfo.type);
                         }
+                        else if (isObjectLiteralType(type)) {
+                            checkFlags |= 32 /* WritePartial */;
+                            indexTypes = ts.append(indexTypes, undefinedType);
+                        }
                         else {
-                            checkFlags |= 16 /* Partial */;
+                            checkFlags |= 16 /* ReadPartial */;
                         }
                     }
                 }
             }
-            if (!props) {
+            if (!propSet.size) {
                 return undefined;
             }
-            if (props.length === 1 && !(checkFlags & 16 /* Partial */) && !indexTypes) {
+            var props = ts.arrayFrom(propSet.values());
+            if (props.length === 1 && !(checkFlags & 16 /* ReadPartial */) && !indexTypes) {
                 return props[0];
             }
             var declarations;
@@ -38284,15 +39050,15 @@ var ts;
                     nameType = prop.nameType;
                 }
                 else if (type !== firstType) {
-                    checkFlags |= 32 /* HasNonUniformType */;
+                    checkFlags |= 64 /* HasNonUniformType */;
                 }
                 if (isLiteralType(type)) {
-                    checkFlags |= 64 /* HasLiteralType */;
+                    checkFlags |= 128 /* HasLiteralType */;
                 }
                 propTypes.push(type);
             }
             ts.addRange(propTypes, indexTypes);
-            var result = createSymbol(4 /* Property */ | commonFlags, name, syntheticFlag | checkFlags);
+            var result = createSymbol(4 /* Property */ | optionalFlag, name, syntheticFlag | checkFlags);
             result.containingType = containingType;
             if (!hasNonUniformValueDeclaration && firstValueDeclaration) {
                 result.valueDeclaration = firstValueDeclaration;
@@ -38303,7 +39069,15 @@ var ts;
             }
             result.declarations = declarations;
             result.nameType = nameType;
-            result.type = isUnion ? getUnionType(propTypes) : getIntersectionType(propTypes);
+            if (propTypes.length > 2) {
+                // When `propTypes` has the potential to explode in size when normalized, defer normalization until absolutely needed
+                result.checkFlags |= 65536 /* DeferredType */;
+                result.deferralParent = containingType;
+                result.deferralConstituents = propTypes;
+            }
+            else {
+                result.type = isUnion ? getUnionType(propTypes) : getIntersectionType(propTypes);
+            }
             return result;
         }
         // Return the symbol for a given property in a union or intersection type, or undefined if the property
@@ -38325,7 +39099,7 @@ var ts;
         function getPropertyOfUnionOrIntersectionType(type, name) {
             var property = getUnionOrIntersectionProperty(type, name);
             // We need to filter out partial properties in union types
-            return property && !(ts.getCheckFlags(property) & 16 /* Partial */) ? property : undefined;
+            return property && !(ts.getCheckFlags(property) & 16 /* ReadPartial */) ? property : undefined;
         }
         /**
          * Return the symbol for the property with the given name in the given type. Creates synthetic union properties when
@@ -38403,6 +39177,9 @@ var ts;
                         propTypes.push(getTypeOfSymbol(prop));
                     }
                 }
+                if (kind === 0 /* String */) {
+                    ts.append(propTypes, getIndexTypeOfType(type, 1 /* Number */));
+                }
                 if (propTypes.length) {
                     return getUnionType(propTypes, 2 /* Subtype */);
                 }
@@ -38431,10 +39208,10 @@ var ts;
         function isJSDocOptionalParameter(node) {
             return ts.isInJSFile(node) && (
             // node.type should only be a JSDocOptionalType when node is a parameter of a JSDocFunctionType
-            node.type && node.type.kind === 293 /* JSDocOptionalType */
+            node.type && node.type.kind === 294 /* JSDocOptionalType */
                 || ts.getJSDocParameterTags(node).some(function (_a) {
                     var isBracketed = _a.isBracketed, typeExpression = _a.typeExpression;
-                    return isBracketed || !!typeExpression && typeExpression.type.kind === 293 /* JSDocOptionalType */;
+                    return isBracketed || !!typeExpression && typeExpression.type.kind === 294 /* JSDocOptionalType */;
                 }));
         }
         function tryFindAmbientModule(moduleName, withAugmentations) {
@@ -38468,7 +39245,7 @@ var ts;
                 return false;
             }
             var isBracketed = node.isBracketed, typeExpression = node.typeExpression;
-            return isBracketed || !!typeExpression && typeExpression.type.kind === 293 /* JSDocOptionalType */;
+            return isBracketed || !!typeExpression && typeExpression.type.kind === 294 /* JSDocOptionalType */;
         }
         function createIdentifierTypePredicate(parameterName, parameterIndex, type) {
             return { kind: 1 /* Identifier */, parameterName: parameterName, parameterIndex: parameterIndex, type: type };
@@ -38506,7 +39283,7 @@ var ts;
                 var baseDefaultType = getDefaultTypeArgumentType(isJavaScriptImplicitAny);
                 for (var i = numTypeArguments; i < numTypeParameters; i++) {
                     var defaultType = getDefaultFromTypeParameter(typeParameters[i]);
-                    if (isJavaScriptImplicitAny && defaultType && isTypeIdenticalTo(defaultType, emptyObjectType)) {
+                    if (isJavaScriptImplicitAny && defaultType && (isTypeIdenticalTo(defaultType, unknownType) || isTypeIdenticalTo(defaultType, emptyObjectType))) {
                         defaultType = anyType;
                     }
                     result[i] = defaultType ? instantiateType(defaultType, createTypeMapper(typeParameters, result)) : baseDefaultType;
@@ -38550,7 +39327,7 @@ var ts;
                     else {
                         parameters.push(paramSymbol);
                     }
-                    if (type && type.kind === 182 /* LiteralType */) {
+                    if (type && type.kind === 183 /* LiteralType */) {
                         hasLiteralTypes = true;
                     }
                     // Record a new minimum argument count if this is not an optional parameter
@@ -38564,16 +39341,16 @@ var ts;
                     }
                 }
                 // If only one accessor includes a this-type annotation, the other behaves as if it had the same type annotation
-                if ((declaration.kind === 158 /* GetAccessor */ || declaration.kind === 159 /* SetAccessor */) &&
+                if ((declaration.kind === 159 /* GetAccessor */ || declaration.kind === 160 /* SetAccessor */) &&
                     !hasNonBindableDynamicName(declaration) &&
                     (!hasThisParameter || !thisParameter)) {
-                    var otherKind = declaration.kind === 158 /* GetAccessor */ ? 159 /* SetAccessor */ : 158 /* GetAccessor */;
+                    var otherKind = declaration.kind === 159 /* GetAccessor */ ? 160 /* SetAccessor */ : 159 /* GetAccessor */;
                     var other = ts.getDeclarationOfKind(getSymbolOfNode(declaration), otherKind);
                     if (other) {
                         thisParameter = getAnnotatedAccessorThisParameter(other);
                     }
                 }
-                var classType = declaration.kind === 157 /* Constructor */ ?
+                var classType = declaration.kind === 158 /* Constructor */ ?
                     getDeclaredTypeOfClassOrInterface(getMergedSymbol(declaration.parent.symbol))
                     : undefined;
                 var typeParameters = classType ? classType.localTypeParameters : getTypeParametersFromDeclaration(declaration);
@@ -38598,7 +39375,7 @@ var ts;
             var lastParamVariadicType = ts.firstDefined(lastParamTags, function (p) {
                 return p.typeExpression && ts.isJSDocVariadicType(p.typeExpression.type) ? p.typeExpression.type : undefined;
             });
-            var syntheticArgsSymbol = createSymbol(3 /* Variable */, "args", 16384 /* RestParameter */);
+            var syntheticArgsSymbol = createSymbol(3 /* Variable */, "args", 32768 /* RestParameter */);
             syntheticArgsSymbol.type = lastParamVariadicType ? createArrayType(getTypeFromTypeNode(lastParamVariadicType.type)) : anyArrayType;
             if (lastParamVariadicType) {
                 // Replace the last parameter with a rest parameter.
@@ -38631,13 +39408,13 @@ var ts;
                 if (!node)
                     return false;
                 switch (node.kind) {
-                    case 72 /* Identifier */:
+                    case 73 /* Identifier */:
                         return node.escapedText === "arguments" && ts.isExpressionNode(node);
-                    case 154 /* PropertyDeclaration */:
-                    case 156 /* MethodDeclaration */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
-                        return node.name.kind === 149 /* ComputedPropertyName */
+                    case 155 /* PropertyDeclaration */:
+                    case 157 /* MethodDeclaration */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
+                        return node.name.kind === 150 /* ComputedPropertyName */
                             && traverse(node.name);
                     default:
                         return !ts.nodeStartsNewLexicalEnvironment(node) && !ts.isPartOfTypeNode(node) && !!ts.forEachChild(node, traverse);
@@ -38702,32 +39479,23 @@ var ts;
                         }
                     }
                     signature.resolvedTypePredicate = type && ts.isTypePredicateNode(type) ?
-                        createTypePredicateFromTypePredicateNode(type, signature.declaration) :
+                        createTypePredicateFromTypePredicateNode(type, signature) :
                         jsdocPredicate || noTypePredicate;
                 }
                 ts.Debug.assert(!!signature.resolvedTypePredicate);
             }
             return signature.resolvedTypePredicate === noTypePredicate ? undefined : signature.resolvedTypePredicate;
         }
-        function createTypePredicateFromTypePredicateNode(node, func) {
+        function createTypePredicateFromTypePredicateNode(node, signature) {
             var parameterName = node.parameterName;
             var type = getTypeFromTypeNode(node.type);
-            if (parameterName.kind === 72 /* Identifier */) {
-                return createIdentifierTypePredicate(parameterName.escapedText, getTypePredicateParameterIndex(func.parameters, parameterName), type);
+            if (parameterName.kind === 73 /* Identifier */) {
+                return createIdentifierTypePredicate(parameterName.escapedText, ts.findIndex(signature.parameters, function (p) { return p.escapedName === parameterName.escapedText; }), type);
             }
             else {
                 return createThisTypePredicate(type);
             }
         }
-        function getTypePredicateParameterIndex(parameterList, parameter) {
-            for (var i = 0; i < parameterList.length; i++) {
-                var param = parameterList[i];
-                if (param.name.kind === 72 /* Identifier */ && param.name.escapedText === parameter.escapedText) {
-                    return i;
-                }
-            }
-            return -1;
-        }
         function getReturnTypeOfSignature(signature) {
             if (!signature.resolvedReturnType) {
                 if (!pushTypeResolution(signature, 3 /* ResolvedReturnType */)) {
@@ -38762,7 +39530,7 @@ var ts;
             return signature.resolvedReturnType;
         }
         function getReturnTypeFromAnnotation(declaration) {
-            if (declaration.kind === 157 /* Constructor */) {
+            if (declaration.kind === 158 /* Constructor */) {
                 return getDeclaredTypeOfClassOrInterface(getMergedSymbol(declaration.parent.symbol));
             }
             if (ts.isJSDocConstructSignature(declaration)) {
@@ -38772,12 +39540,12 @@ var ts;
             if (typeNode) {
                 return getTypeFromTypeNode(typeNode);
             }
-            if (declaration.kind === 158 /* GetAccessor */ && !hasNonBindableDynamicName(declaration)) {
+            if (declaration.kind === 159 /* GetAccessor */ && !hasNonBindableDynamicName(declaration)) {
                 var jsDocType = ts.isInJSFile(declaration) && getTypeForDeclarationFromJSDocComment(declaration);
                 if (jsDocType) {
                     return jsDocType;
                 }
-                var setter = ts.getDeclarationOfKind(getSymbolOfNode(declaration), 159 /* SetAccessor */);
+                var setter = ts.getDeclarationOfKind(getSymbolOfNode(declaration), 160 /* SetAccessor */);
                 var setterType = getAnnotatedAccessorType(setter);
                 if (setterType) {
                     return setterType;
@@ -38802,12 +39570,10 @@ var ts;
         function getSignatureInstantiation(signature, typeArguments, isJavascript, inferredTypeParameters) {
             var instantiatedSignature = getSignatureInstantiationWithoutFillingInTypeArguments(signature, fillMissingTypeArguments(typeArguments, signature.typeParameters, getMinTypeArgumentCount(signature.typeParameters), isJavascript));
             if (inferredTypeParameters) {
-                var returnSignature = getSingleCallSignature(getReturnTypeOfSignature(instantiatedSignature));
+                var returnSignature = getSingleCallOrConstructSignature(getReturnTypeOfSignature(instantiatedSignature));
                 if (returnSignature) {
                     var newReturnSignature = cloneSignature(returnSignature);
                     newReturnSignature.typeParameters = inferredTypeParameters;
-                    newReturnSignature.target = returnSignature.target;
-                    newReturnSignature.mapper = returnSignature.mapper;
                     var newInstantiatedSignature = cloneSignature(instantiatedSignature);
                     newInstantiatedSignature.resolvedReturnType = getOrCreateTypeFromSignature(newReturnSignature);
                     return newInstantiatedSignature;
@@ -38857,7 +39623,7 @@ var ts;
             var typeParameters = signature.typeParameters;
             if (typeParameters) {
                 var typeEraser_1 = createTypeEraser(typeParameters);
-                var baseConstraints = ts.map(typeParameters, function (tp) { return instantiateType(getBaseConstraintOfType(tp), typeEraser_1) || emptyObjectType; });
+                var baseConstraints = ts.map(typeParameters, function (tp) { return instantiateType(getBaseConstraintOfType(tp), typeEraser_1) || unknownType; });
                 return instantiateSignature(signature, createTypeMapper(typeParameters, baseConstraints), /*eraseTypeParameters*/ true);
             }
             return signature;
@@ -38868,7 +39634,8 @@ var ts;
             // object type literal or interface (using the new keyword). Each way of declaring a constructor
             // will result in a different declaration kind.
             if (!signature.isolatedSignatureType) {
-                var isConstructor = signature.declaration.kind === 157 /* Constructor */ || signature.declaration.kind === 161 /* ConstructSignature */; // TODO: GH#18217
+                var kind = signature.declaration ? signature.declaration.kind : 0 /* Unknown */;
+                var isConstructor = kind === 158 /* Constructor */ || kind === 162 /* ConstructSignature */ || kind === 167 /* ConstructorType */;
                 var type = createObjectType(16 /* Anonymous */);
                 type.members = emptySymbols;
                 type.properties = ts.emptyArray;
@@ -38882,7 +39649,7 @@ var ts;
             return symbol.members.get("__index" /* Index */);
         }
         function getIndexDeclarationOfSymbol(symbol, kind) {
-            var syntaxKind = kind === 1 /* Number */ ? 135 /* NumberKeyword */ : 138 /* StringKeyword */;
+            var syntaxKind = kind === 1 /* Number */ ? 136 /* NumberKeyword */ : 139 /* StringKeyword */;
             var indexSymbol = getIndexSymbol(symbol);
             if (indexSymbol) {
                 for (var _i = 0, _a = indexSymbol.declarations; _i < _a.length; _i++) {
@@ -38909,7 +39676,7 @@ var ts;
             return undefined;
         }
         function getConstraintDeclaration(type) {
-            var decl = type.symbol && ts.getDeclarationOfKind(type.symbol, 150 /* TypeParameter */);
+            var decl = type.symbol && ts.getDeclarationOfKind(type.symbol, 151 /* TypeParameter */);
             return decl && ts.getEffectiveConstraintOfTypeParameter(decl);
         }
         function getInferredTypeParameterConstraint(typeParameter) {
@@ -38917,13 +39684,13 @@ var ts;
             if (typeParameter.symbol) {
                 for (var _i = 0, _a = typeParameter.symbol.declarations; _i < _a.length; _i++) {
                     var declaration = _a[_i];
-                    if (declaration.parent.kind === 176 /* InferType */) {
+                    if (declaration.parent.kind === 177 /* InferType */) {
                         // When an 'infer T' declaration is immediately contained in a type reference node
                         // (such as 'Foo<infer T>'), T's constraint is inferred from the constraint of the
                         // corresponding type parameter in 'Foo'. When multiple 'infer T' declarations are
                         // present, we form an intersection of the inferred constraint types.
                         var grandParent = declaration.parent.parent;
-                        if (grandParent.kind === 164 /* TypeReference */) {
+                        if (grandParent.kind === 165 /* TypeReference */) {
                             var typeReference = grandParent;
                             var typeParameters = getTypeParametersForTypeReference(typeReference);
                             if (typeParameters) {
@@ -38948,7 +39715,7 @@ var ts;
                         }
                         // When an 'infer T' declaration is immediately contained in a rest parameter
                         // declaration, we infer an 'unknown[]' constraint.
-                        else if (grandParent.kind === 151 /* Parameter */ && grandParent.dotDotDotToken) {
+                        else if (grandParent.kind === 152 /* Parameter */ && grandParent.dotDotDotToken) {
                             inferences = ts.append(inferences, createArrayType(unknownType));
                         }
                     }
@@ -38972,7 +39739,7 @@ var ts;
             return typeParameter.constraint === noConstraintType ? undefined : typeParameter.constraint;
         }
         function getParentSymbolOfTypeParameter(typeParameter) {
-            var tp = ts.getDeclarationOfKind(typeParameter.symbol, 150 /* TypeParameter */);
+            var tp = ts.getDeclarationOfKind(typeParameter.symbol, 151 /* TypeParameter */);
             var host = ts.isJSDocTemplateTag(tp.parent) ? ts.getHostSignatureFromJSDoc(tp.parent) : tp.parent;
             return host && getSymbolOfNode(host);
         }
@@ -39011,7 +39778,7 @@ var ts;
                     result |= ts.getObjectFlags(type);
                 }
             }
-            return result & 917504 /* PropagatingFlags */;
+            return result & 1835008 /* PropagatingFlags */;
         }
         function createTypeReference(target, typeArguments) {
             var id = getTypeListId(typeArguments);
@@ -39105,9 +39872,9 @@ var ts;
         }
         function getTypeReferenceName(node) {
             switch (node.kind) {
-                case 164 /* TypeReference */:
+                case 165 /* TypeReference */:
                     return node.typeName;
-                case 211 /* ExpressionWithTypeArguments */:
+                case 212 /* ExpressionWithTypeArguments */:
                     // We only support expressions that are simple qualified names. For other
                     // expressions this produces undefined.
                     var expr = node.expression;
@@ -39206,13 +39973,22 @@ var ts;
             }
         }
         function getSubstitutionType(typeVariable, substitute) {
+            if (substitute.flags & 3 /* AnyOrUnknown */ || substitute === typeVariable) {
+                return typeVariable;
+            }
+            var id = getTypeId(typeVariable) + ">" + getTypeId(substitute);
+            var cached = substitutionTypes.get(id);
+            if (cached) {
+                return cached;
+            }
             var result = createType(33554432 /* Substitution */);
             result.typeVariable = typeVariable;
             result.substitute = substitute;
+            substitutionTypes.set(id, result);
             return result;
         }
         function isUnaryTupleTypeNode(node) {
-            return node.kind === 170 /* TupleType */ && node.elementTypes.length === 1;
+            return node.kind === 171 /* TupleType */ && node.elementTypes.length === 1;
         }
         function getImpliedConstraint(typeVariable, checkNode, extendsNode) {
             return isUnaryTupleTypeNode(checkNode) && isUnaryTupleTypeNode(extendsNode) ? getImpliedConstraint(typeVariable, checkNode.elementTypes[0], extendsNode.elementTypes[0]) :
@@ -39221,9 +39997,9 @@ var ts;
         }
         function getConstrainedTypeVariable(typeVariable, node) {
             var constraints;
-            while (node && !ts.isStatement(node) && node.kind !== 296 /* JSDocComment */) {
+            while (node && !ts.isStatement(node) && node.kind !== 297 /* JSDocComment */) {
                 var parent = node.parent;
-                if (parent.kind === 175 /* ConditionalType */ && node === parent.trueType) {
+                if (parent.kind === 176 /* ConditionalType */ && node === parent.trueType) {
                     var constraint = getImpliedConstraint(typeVariable, parent.checkType, parent.extendsType);
                     if (constraint) {
                         constraints = ts.append(constraints, constraint);
@@ -39234,7 +40010,7 @@ var ts;
             return constraints ? getSubstitutionType(typeVariable, getIntersectionType(ts.append(constraints, typeVariable))) : typeVariable;
         }
         function isJSDocTypeReference(node) {
-            return !!(node.flags & 2097152 /* JSDoc */) && (node.kind === 164 /* TypeReference */ || node.kind === 183 /* ImportType */);
+            return !!(node.flags & 2097152 /* JSDoc */) && (node.kind === 165 /* TypeReference */ || node.kind === 184 /* ImportType */);
         }
         function checkNoTypeArguments(node, symbol) {
             if (node.typeArguments) {
@@ -39335,9 +40111,9 @@ var ts;
                 for (var _i = 0, declarations_3 = declarations; _i < declarations_3.length; _i++) {
                     var declaration = declarations_3[_i];
                     switch (declaration.kind) {
-                        case 240 /* ClassDeclaration */:
-                        case 241 /* InterfaceDeclaration */:
-                        case 243 /* EnumDeclaration */:
+                        case 241 /* ClassDeclaration */:
+                        case 242 /* InterfaceDeclaration */:
+                        case 244 /* EnumDeclaration */:
                             return declaration;
                     }
                 }
@@ -39401,20 +40177,32 @@ var ts;
             return deferredGlobalAsyncIterableType || (deferredGlobalAsyncIterableType = getGlobalType("AsyncIterable", /*arity*/ 1, reportErrors)) || emptyGenericType;
         }
         function getGlobalAsyncIteratorType(reportErrors) {
-            return deferredGlobalAsyncIteratorType || (deferredGlobalAsyncIteratorType = getGlobalType("AsyncIterator", /*arity*/ 1, reportErrors)) || emptyGenericType;
+            return deferredGlobalAsyncIteratorType || (deferredGlobalAsyncIteratorType = getGlobalType("AsyncIterator", /*arity*/ 3, reportErrors)) || emptyGenericType;
         }
         function getGlobalAsyncIterableIteratorType(reportErrors) {
             return deferredGlobalAsyncIterableIteratorType || (deferredGlobalAsyncIterableIteratorType = getGlobalType("AsyncIterableIterator", /*arity*/ 1, reportErrors)) || emptyGenericType;
         }
+        function getGlobalAsyncGeneratorType(reportErrors) {
+            return deferredGlobalAsyncGeneratorType || (deferredGlobalAsyncGeneratorType = getGlobalType("AsyncGenerator", /*arity*/ 3, reportErrors)) || emptyGenericType;
+        }
         function getGlobalIterableType(reportErrors) {
             return deferredGlobalIterableType || (deferredGlobalIterableType = getGlobalType("Iterable", /*arity*/ 1, reportErrors)) || emptyGenericType;
         }
         function getGlobalIteratorType(reportErrors) {
-            return deferredGlobalIteratorType || (deferredGlobalIteratorType = getGlobalType("Iterator", /*arity*/ 1, reportErrors)) || emptyGenericType;
+            return deferredGlobalIteratorType || (deferredGlobalIteratorType = getGlobalType("Iterator", /*arity*/ 3, reportErrors)) || emptyGenericType;
         }
         function getGlobalIterableIteratorType(reportErrors) {
             return deferredGlobalIterableIteratorType || (deferredGlobalIterableIteratorType = getGlobalType("IterableIterator", /*arity*/ 1, reportErrors)) || emptyGenericType;
         }
+        function getGlobalGeneratorType(reportErrors) {
+            return deferredGlobalGeneratorType || (deferredGlobalGeneratorType = getGlobalType("Generator", /*arity*/ 3, reportErrors)) || emptyGenericType;
+        }
+        function getGlobalIteratorYieldResultType(reportErrors) {
+            return deferredGlobalIteratorYieldResultType || (deferredGlobalIteratorYieldResultType = getGlobalType("IteratorYieldResult", /*arity*/ 1, reportErrors)) || emptyGenericType;
+        }
+        function getGlobalIteratorReturnResultType(reportErrors) {
+            return deferredGlobalIteratorReturnResultType || (deferredGlobalIteratorReturnResultType = getGlobalType("IteratorReturnResult", /*arity*/ 1, reportErrors)) || emptyGenericType;
+        }
         function getGlobalTypeOrUndefined(name, arity) {
             if (arity === void 0) { arity = 0; }
             var symbol = getGlobalSymbol(name, 67897832 /* Type */, /*diagnostic*/ undefined);
@@ -39423,11 +40211,8 @@ var ts;
         function getGlobalExtractSymbol() {
             return deferredGlobalExtractSymbol || (deferredGlobalExtractSymbol = getGlobalSymbol("Extract", 524288 /* TypeAlias */, ts.Diagnostics.Cannot_find_global_type_0)); // TODO: GH#18217
         }
-        function getGlobalExcludeSymbol() {
-            return deferredGlobalExcludeSymbol || (deferredGlobalExcludeSymbol = getGlobalSymbol("Exclude", 524288 /* TypeAlias */, ts.Diagnostics.Cannot_find_global_type_0)); // TODO: GH#18217
-        }
-        function getGlobalPickSymbol() {
-            return deferredGlobalPickSymbol || (deferredGlobalPickSymbol = getGlobalSymbol("Pick", 524288 /* TypeAlias */, ts.Diagnostics.Cannot_find_global_type_0)); // TODO: GH#18217
+        function getGlobalOmitSymbol() {
+            return deferredGlobalOmitSymbol || (deferredGlobalOmitSymbol = getGlobalSymbol("Omit", 524288 /* TypeAlias */, ts.Diagnostics.Cannot_find_global_type_0)); // TODO: GH#18217
         }
         function getGlobalBigIntType(reportErrors) {
             return deferredGlobalBigIntType || (deferredGlobalBigIntType = getGlobalType("BigInt", /*arity*/ 0, reportErrors)) || emptyObjectType;
@@ -39441,18 +40226,9 @@ var ts;
         function createTypedPropertyDescriptorType(propertyType) {
             return createTypeFromGenericGlobalType(getGlobalTypedPropertyDescriptorType(), [propertyType]);
         }
-        function createAsyncIterableType(iteratedType) {
-            return createTypeFromGenericGlobalType(getGlobalAsyncIterableType(/*reportErrors*/ true), [iteratedType]);
-        }
-        function createAsyncIterableIteratorType(iteratedType) {
-            return createTypeFromGenericGlobalType(getGlobalAsyncIterableIteratorType(/*reportErrors*/ true), [iteratedType]);
-        }
         function createIterableType(iteratedType) {
             return createTypeFromGenericGlobalType(getGlobalIterableType(/*reportErrors*/ true), [iteratedType]);
         }
-        function createIterableIteratorType(iteratedType) {
-            return createTypeFromGenericGlobalType(getGlobalIterableIteratorType(/*reportErrors*/ true), [iteratedType]);
-        }
         function createArrayType(elementType, readonly) {
             return createTypeFromGenericGlobalType(readonly ? globalReadonlyArrayType : globalArrayType, [elementType]);
         }
@@ -39464,7 +40240,7 @@ var ts;
             return links.resolvedType;
         }
         function isReadonlyTypeOperator(node) {
-            return ts.isTypeOperatorNode(node) && node.operator === 133 /* ReadonlyKeyword */;
+            return ts.isTypeOperatorNode(node) && node.operator === 134 /* ReadonlyKeyword */;
         }
         // We represent tuple types as type references to synthesized generic interface types created by
         // this function. The types are of the form:
@@ -39539,8 +40315,8 @@ var ts;
             var links = getNodeLinks(node);
             if (!links.resolvedType) {
                 var lastElement = ts.lastOrUndefined(node.elementTypes);
-                var restElement_1 = lastElement && lastElement.kind === 172 /* RestType */ ? lastElement : undefined;
-                var minLength = ts.findLastIndex(node.elementTypes, function (n) { return n.kind !== 171 /* OptionalType */ && n !== restElement_1; }) + 1;
+                var restElement_1 = lastElement && lastElement.kind === 173 /* RestType */ ? lastElement : undefined;
+                var minLength = ts.findLastIndex(node.elementTypes, function (n) { return n.kind !== 172 /* OptionalType */ && n !== restElement_1; }) + 1;
                 var elementTypes = ts.map(node.elementTypes, function (n) {
                     var type = getTypeFromTypeNode(n);
                     return n === restElement_1 && getIndexTypeOfType(type, 1 /* Number */) || type;
@@ -39575,51 +40351,20 @@ var ts;
             }
             return false;
         }
-        // Return true if the given intersection type contains
-        // more than one unit type or,
-        // an object type and a nullable type (null or undefined), or
-        // a string-like type and a type known to be non-string-like, or
-        // a number-like type and a type known to be non-number-like, or
-        // a symbol-like type and a type known to be non-symbol-like, or
-        // a void-like type and a type known to be non-void-like, or
-        // a non-primitive type and a type known to be primitive.
-        function isEmptyIntersectionType(type) {
-            var combined = 0;
-            for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
-                var t = _a[_i];
-                if (t.flags & 109440 /* Unit */ && combined & 109440 /* Unit */) {
-                    return true;
-                }
-                combined |= t.flags;
-                if (combined & 98304 /* Nullable */ && combined & (524288 /* Object */ | 67108864 /* NonPrimitive */) ||
-                    combined & 67108864 /* NonPrimitive */ && combined & (67238908 /* DisjointDomains */ & ~67108864 /* NonPrimitive */) ||
-                    combined & 132 /* StringLike */ && combined & (67238908 /* DisjointDomains */ & ~132 /* StringLike */) ||
-                    combined & 296 /* NumberLike */ && combined & (67238908 /* DisjointDomains */ & ~296 /* NumberLike */) ||
-                    combined & 2112 /* BigIntLike */ && combined & (67238908 /* DisjointDomains */ & ~2112 /* BigIntLike */) ||
-                    combined & 12288 /* ESSymbolLike */ && combined & (67238908 /* DisjointDomains */ & ~12288 /* ESSymbolLike */) ||
-                    combined & 49152 /* VoidLike */ && combined & (67238908 /* DisjointDomains */ & ~49152 /* VoidLike */)) {
-                    return true;
-                }
-            }
-            return false;
-        }
         function addTypeToUnion(typeSet, includes, type) {
             var flags = type.flags;
             if (flags & 1048576 /* Union */) {
                 return addTypesToUnion(typeSet, includes, type.types);
             }
-            // We ignore 'never' types in unions. Likewise, we ignore intersections of unit types as they are
-            // another form of 'never' (in that they have an empty value domain). We could in theory turn
-            // intersections of unit types into 'never' upon construction, but deferring the reduction makes it
-            // easier to reason about their origin.
-            if (!(flags & 131072 /* Never */ || flags & 2097152 /* Intersection */ && isEmptyIntersectionType(type))) {
-                includes |= flags & 1835007 /* IncludesMask */;
+            // We ignore 'never' types in unions
+            if (!(flags & 131072 /* Never */)) {
+                includes |= flags & 68943871 /* IncludesMask */;
                 if (flags & 66846720 /* StructuredOrInstantiable */)
                     includes |= 262144 /* IncludesStructuredOrInstantiable */;
                 if (type === wildcardType)
                     includes |= 4194304 /* IncludesWildcard */;
                 if (!strictNullChecks && flags & 98304 /* Nullable */) {
-                    if (!(ts.getObjectFlags(type) & 131072 /* ContainsWideningType */))
+                    if (!(ts.getObjectFlags(type) & 262144 /* ContainsWideningType */))
                         includes |= 2097152 /* IncludesNonWideningType */;
                 }
                 else {
@@ -39746,7 +40491,7 @@ var ts;
                             neverType;
                 }
             }
-            return getUnionTypeFromSortedList(typeSet, includes & 66994211 /* NotPrimitiveUnion */ ? 0 : 65536 /* PrimitiveUnion */, aliasSymbol, aliasTypeArguments);
+            return getUnionTypeFromSortedList(typeSet, includes & 66994211 /* NotPrimitiveUnion */ ? 0 : 131072 /* PrimitiveUnion */, aliasSymbol, aliasTypeArguments);
         }
         function getUnionTypePredicate(signatures) {
             var first;
@@ -39824,18 +40569,23 @@ var ts;
             if (isEmptyAnonymousObjectType(type)) {
                 if (!(includes & 8388608 /* IncludesEmptyObject */)) {
                     includes |= 8388608 /* IncludesEmptyObject */;
-                    typeSet.push(type);
+                    typeSet.set(type.id.toString(), type);
                 }
             }
             else {
-                includes |= flags & 1835007 /* IncludesMask */;
                 if (flags & 3 /* AnyOrUnknown */) {
                     if (type === wildcardType)
                         includes |= 4194304 /* IncludesWildcard */;
                 }
-                else if ((strictNullChecks || !(flags & 98304 /* Nullable */)) && !ts.contains(typeSet, type)) {
-                    typeSet.push(type);
+                else if ((strictNullChecks || !(flags & 98304 /* Nullable */)) && !typeSet.has(type.id.toString())) {
+                    if (type.flags & 109440 /* Unit */ && includes & 109440 /* Unit */) {
+                        // We have seen two distinct unit types which means we should reduce to an
+                        // empty intersection. Adding TypeFlags.NonPrimitive causes that to happen.
+                        includes |= 67108864 /* NonPrimitive */;
+                    }
+                    typeSet.set(type.id.toString(), type);
                 }
+                includes |= flags & 68943871 /* IncludesMask */;
             }
             return includes;
         }
@@ -39886,7 +40636,7 @@ var ts;
         // other unions and return true. Otherwise, do nothing and return false.
         function intersectUnionsOfPrimitiveTypes(types) {
             var unionTypes;
-            var index = ts.findIndex(types, function (t) { return !!(ts.getObjectFlags(t) & 65536 /* PrimitiveUnion */); });
+            var index = ts.findIndex(types, function (t) { return !!(ts.getObjectFlags(t) & 131072 /* PrimitiveUnion */); });
             if (index < 0) {
                 return false;
             }
@@ -39895,7 +40645,7 @@ var ts;
             // the unionTypes array.
             while (i < types.length) {
                 var t = types[i];
-                if (ts.getObjectFlags(t) & 65536 /* PrimitiveUnion */) {
+                if (ts.getObjectFlags(t) & 131072 /* PrimitiveUnion */) {
                     (unionTypes || (unionTypes = [types[index]])).push(t);
                     ts.orderedRemoveItemAt(types, i);
                 }
@@ -39924,9 +40674,17 @@ var ts;
                 }
             }
             // Finally replace the first union with the result
-            types[index] = getUnionTypeFromSortedList(result, 65536 /* PrimitiveUnion */);
+            types[index] = getUnionTypeFromSortedList(result, 131072 /* PrimitiveUnion */);
             return true;
         }
+        function createIntersectionType(types, aliasSymbol, aliasTypeArguments) {
+            var result = createType(2097152 /* Intersection */);
+            result.objectFlags = getPropagatingFlagsOfTypes(types, /*excludeKinds*/ 98304 /* Nullable */);
+            result.types = types;
+            result.aliasSymbol = aliasSymbol; // See comment in `getUnionTypeFromSortedList`.
+            result.aliasTypeArguments = aliasTypeArguments;
+            return result;
+        }
         // We normalize combinations of intersection and union types based on the distributive property of the '&'
         // operator. Specifically, because X & (A | B) is equivalent to X & A | X & B, we can transform intersection
         // types with union type constituents into equivalent union types with intersection type constituents and
@@ -39938,9 +40696,26 @@ var ts;
         // Also, unlike union types, the order of the constituent types is preserved in order that overload resolution
         // for intersections of types with signatures can be deterministic.
         function getIntersectionType(types, aliasSymbol, aliasTypeArguments) {
-            var typeSet = [];
-            var includes = addTypesToIntersection(typeSet, 0, types);
-            if (includes & 131072 /* Never */) {
+            var typeMembershipMap = ts.createMap();
+            var includes = addTypesToIntersection(typeMembershipMap, 0, types);
+            var typeSet = ts.arrayFrom(typeMembershipMap.values());
+            // An intersection type is considered empty if it contains
+            // the type never, or
+            // more than one unit type or,
+            // an object type and a nullable type (null or undefined), or
+            // a string-like type and a type known to be non-string-like, or
+            // a number-like type and a type known to be non-number-like, or
+            // a symbol-like type and a type known to be non-symbol-like, or
+            // a void-like type and a type known to be non-void-like, or
+            // a non-primitive type and a type known to be primitive.
+            if (includes & 131072 /* Never */ ||
+                strictNullChecks && includes & 98304 /* Nullable */ && includes & (524288 /* Object */ | 67108864 /* NonPrimitive */ | 8388608 /* IncludesEmptyObject */) ||
+                includes & 67108864 /* NonPrimitive */ && includes & (67238908 /* DisjointDomains */ & ~67108864 /* NonPrimitive */) ||
+                includes & 132 /* StringLike */ && includes & (67238908 /* DisjointDomains */ & ~132 /* StringLike */) ||
+                includes & 296 /* NumberLike */ && includes & (67238908 /* DisjointDomains */ & ~296 /* NumberLike */) ||
+                includes & 2112 /* BigIntLike */ && includes & (67238908 /* DisjointDomains */ & ~2112 /* BigIntLike */) ||
+                includes & 12288 /* ESSymbolLike */ && includes & (67238908 /* DisjointDomains */ & ~12288 /* ESSymbolLike */) ||
+                includes & 49152 /* VoidLike */ && includes & (67238908 /* DisjointDomains */ & ~49152 /* VoidLike */)) {
                 return neverType;
             }
             if (includes & 1 /* Any */) {
@@ -39964,30 +40739,36 @@ var ts;
             if (typeSet.length === 1) {
                 return typeSet[0];
             }
-            if (includes & 1048576 /* Union */) {
-                if (intersectUnionsOfPrimitiveTypes(typeSet)) {
-                    // When the intersection creates a reduced set (which might mean that *all* union types have
-                    // disappeared), we restart the operation to get a new set of combined flags. Once we have
-                    // reduced we'll never reduce again, so this occurs at most once.
-                    return getIntersectionType(typeSet, aliasSymbol, aliasTypeArguments);
-                }
-                // We are attempting to construct a type of the form X & (A | B) & Y. Transform this into a type of
-                // the form X & A & Y | X & B & Y and recursively reduce until no union type constituents remain.
-                var unionIndex_1 = ts.findIndex(typeSet, function (t) { return (t.flags & 1048576 /* Union */) !== 0; });
-                var unionType = typeSet[unionIndex_1];
-                return getUnionType(ts.map(unionType.types, function (t) { return getIntersectionType(ts.replaceElement(typeSet, unionIndex_1, t)); }), 1 /* Literal */, aliasSymbol, aliasTypeArguments);
-            }
             var id = getTypeListId(typeSet);
-            var type = intersectionTypes.get(id);
-            if (!type) {
-                type = createType(2097152 /* Intersection */);
-                intersectionTypes.set(id, type);
-                type.objectFlags = getPropagatingFlagsOfTypes(typeSet, /*excludeKinds*/ 98304 /* Nullable */);
-                type.types = typeSet;
-                type.aliasSymbol = aliasSymbol; // See comment in `getUnionTypeFromSortedList`.
-                type.aliasTypeArguments = aliasTypeArguments;
+            var result = intersectionTypes.get(id);
+            if (!result) {
+                if (includes & 1048576 /* Union */) {
+                    if (intersectUnionsOfPrimitiveTypes(typeSet)) {
+                        // When the intersection creates a reduced set (which might mean that *all* union types have
+                        // disappeared), we restart the operation to get a new set of combined flags. Once we have
+                        // reduced we'll never reduce again, so this occurs at most once.
+                        result = getIntersectionType(typeSet, aliasSymbol, aliasTypeArguments);
+                    }
+                    else {
+                        // We are attempting to construct a type of the form X & (A | B) & Y. Transform this into a type of
+                        // the form X & A & Y | X & B & Y and recursively reduce until no union type constituents remain.
+                        // If the estimated size of the resulting union type exceeds 100000 constituents, report an error.
+                        var size = ts.reduceLeft(typeSet, function (n, t) { return n * (t.flags & 1048576 /* Union */ ? t.types.length : 1); }, 1);
+                        if (size >= 100000) {
+                            error(currentNode, ts.Diagnostics.Expression_produces_a_union_type_that_is_too_complex_to_represent);
+                            return errorType;
+                        }
+                        var unionIndex_1 = ts.findIndex(typeSet, function (t) { return (t.flags & 1048576 /* Union */) !== 0; });
+                        var unionType = typeSet[unionIndex_1];
+                        result = getUnionType(ts.map(unionType.types, function (t) { return getIntersectionType(ts.replaceElement(typeSet, unionIndex_1, t)); }), 1 /* Literal */, aliasSymbol, aliasTypeArguments);
+                    }
+                }
+                else {
+                    result = createIntersectionType(typeSet, aliasSymbol, aliasTypeArguments);
+                }
+                intersectionTypes.set(id, result);
             }
-            return type;
+            return result;
         }
         function getTypeFromIntersectionTypeNode(node) {
             var links = getNodeLinks(node);
@@ -40043,18 +40824,19 @@ var ts;
             var numberIndexInfo = getIndexInfoOfType(type, 1 /* Number */);
             return numberIndexInfo !== enumNumberIndexInfo ? numberIndexInfo : undefined;
         }
-        function getIndexType(type, stringsOnly) {
+        function getIndexType(type, stringsOnly, noIndexSignatures) {
             if (stringsOnly === void 0) { stringsOnly = keyofStringsOnly; }
-            return type.flags & 1048576 /* Union */ ? getIntersectionType(ts.map(type.types, function (t) { return getIndexType(t, stringsOnly); })) :
-                type.flags & 2097152 /* Intersection */ ? getUnionType(ts.map(type.types, function (t) { return getIndexType(t, stringsOnly); })) :
+            return type.flags & 1048576 /* Union */ ? getIntersectionType(ts.map(type.types, function (t) { return getIndexType(t, stringsOnly, noIndexSignatures); })) :
+                type.flags & 2097152 /* Intersection */ ? getUnionType(ts.map(type.types, function (t) { return getIndexType(t, stringsOnly, noIndexSignatures); })) :
                     maybeTypeOfKind(type, 58982400 /* InstantiableNonPrimitive */) ? getIndexTypeForGenericType(type, stringsOnly) :
-                        ts.getObjectFlags(type) & 32 /* Mapped */ ? getConstraintTypeFromMappedType(type) :
+                        ts.getObjectFlags(type) & 32 /* Mapped */ ? filterType(getConstraintTypeFromMappedType(type), function (t) { return !(noIndexSignatures && t.flags & (1 /* Any */ | 4 /* String */)); }) :
                             type === wildcardType ? wildcardType :
-                                type.flags & 1 /* Any */ ? keyofConstraintType :
-                                    stringsOnly ? getIndexInfoOfType(type, 0 /* String */) ? stringType : getLiteralTypeFromProperties(type, 128 /* StringLiteral */) :
-                                        getIndexInfoOfType(type, 0 /* String */) ? getUnionType([stringType, numberType, getLiteralTypeFromProperties(type, 8192 /* UniqueESSymbol */)]) :
-                                            getNonEnumNumberIndexInfo(type) ? getUnionType([numberType, getLiteralTypeFromProperties(type, 128 /* StringLiteral */ | 8192 /* UniqueESSymbol */)]) :
-                                                getLiteralTypeFromProperties(type, 8576 /* StringOrNumberLiteralOrUnique */);
+                                type.flags & 2 /* Unknown */ ? neverType :
+                                    type.flags & (1 /* Any */ | 131072 /* Never */) ? keyofConstraintType :
+                                        stringsOnly ? !noIndexSignatures && getIndexInfoOfType(type, 0 /* String */) ? stringType : getLiteralTypeFromProperties(type, 128 /* StringLiteral */) :
+                                            !noIndexSignatures && getIndexInfoOfType(type, 0 /* String */) ? getUnionType([stringType, numberType, getLiteralTypeFromProperties(type, 8192 /* UniqueESSymbol */)]) :
+                                                getNonEnumNumberIndexInfo(type) ? getUnionType([numberType, getLiteralTypeFromProperties(type, 128 /* StringLiteral */ | 8192 /* UniqueESSymbol */)]) :
+                                                    getLiteralTypeFromProperties(type, 8576 /* StringOrNumberLiteralOrUnique */);
         }
         function getExtractStringType(type) {
             if (keyofStringsOnly) {
@@ -40071,15 +40853,15 @@ var ts;
             var links = getNodeLinks(node);
             if (!links.resolvedType) {
                 switch (node.operator) {
-                    case 129 /* KeyOfKeyword */:
+                    case 130 /* KeyOfKeyword */:
                         links.resolvedType = getIndexType(getTypeFromTypeNode(node.type));
                         break;
-                    case 142 /* UniqueKeyword */:
-                        links.resolvedType = node.type.kind === 139 /* SymbolKeyword */
+                    case 143 /* UniqueKeyword */:
+                        links.resolvedType = node.type.kind === 140 /* SymbolKeyword */
                             ? getESSymbolLikeTypeForNode(ts.walkUpParenthesizedTypes(node.parent))
                             : errorType;
                         break;
-                    case 133 /* ReadonlyKeyword */:
+                    case 134 /* ReadonlyKeyword */:
                         links.resolvedType = getTypeFromTypeNode(node.type);
                         break;
                 }
@@ -40119,9 +40901,9 @@ var ts;
             }
             return false;
         }
-        function getPropertyTypeForIndexType(objectType, indexType, accessNode, cacheSymbol, missingType) {
-            var accessExpression = accessNode && accessNode.kind === 190 /* ElementAccessExpression */ ? accessNode : undefined;
-            var propName = isTypeUsableAsPropertyName(indexType) ?
+        function getPropertyNameFromIndex(indexType, accessNode) {
+            var accessExpression = accessNode && accessNode.kind === 191 /* ElementAccessExpression */ ? accessNode : undefined;
+            return isTypeUsableAsPropertyName(indexType) ?
                 getPropertyNameFromType(indexType) :
                 accessExpression && checkThatExpressionIsProperSymbolReference(accessExpression.argumentExpression, indexType, /*reportError*/ false) ?
                     ts.getPropertyNameForKnownSymbolName(ts.idText(accessExpression.argumentExpression.name)) :
@@ -40129,16 +40911,20 @@ var ts;
                         // late bound names are handled in the first branch, so here we only need to handle normal names
                         ts.getPropertyNameForPropertyNameNode(accessNode) :
                         undefined;
+        }
+        function getPropertyTypeForIndexType(originalObjectType, objectType, indexType, fullIndexType, suppressNoImplicitAnyError, accessNode, accessFlags) {
+            var accessExpression = accessNode && accessNode.kind === 191 /* ElementAccessExpression */ ? accessNode : undefined;
+            var propName = getPropertyNameFromIndex(indexType, accessNode);
             if (propName !== undefined) {
                 var prop = getPropertyOfType(objectType, propName);
                 if (prop) {
                     if (accessExpression) {
-                        markPropertyAsReferenced(prop, accessExpression, /*isThisAccess*/ accessExpression.expression.kind === 100 /* ThisKeyword */);
+                        markPropertyAsReferenced(prop, accessExpression, /*isThisAccess*/ accessExpression.expression.kind === 101 /* ThisKeyword */);
                         if (ts.isAssignmentTarget(accessExpression) && (isReferenceToReadonlyEntity(accessExpression, prop) || isReferenceThroughNamespaceImport(accessExpression))) {
                             error(accessExpression.argumentExpression, ts.Diagnostics.Cannot_assign_to_0_because_it_is_a_read_only_property, symbolToString(prop));
-                            return missingType;
+                            return undefined;
                         }
-                        if (cacheSymbol) {
+                        if (accessFlags & 4 /* CacheSymbol */) {
                             getNodeLinks(accessNode).resolvedSymbol = prop;
                         }
                     }
@@ -40148,7 +40934,7 @@ var ts;
                         propType;
                 }
                 if (everyType(objectType, isTupleType) && isNumericLiteralName(propName) && +propName >= 0) {
-                    if (accessNode && everyType(objectType, function (t) { return !t.target.hasRestElement; })) {
+                    if (accessNode && everyType(objectType, function (t) { return !t.target.hasRestElement; }) && !(accessFlags & 8 /* NoTupleBoundsCheck */)) {
                         var indexNode = getIndexNodeForAccessExpression(accessNode);
                         if (isTupleType(objectType)) {
                             error(indexNode, ts.Diagnostics.Tuple_type_0_of_length_1_has_no_element_at_index_2, typeToString(objectType), getTypeReferenceArity(objectType), ts.unescapeLeadingUnderscores(propName));
@@ -40157,6 +40943,7 @@ var ts;
                             error(indexNode, ts.Diagnostics.Property_0_does_not_exist_on_type_1, ts.unescapeLeadingUnderscores(propName), typeToString(objectType));
                         }
                     }
+                    errorIfWritingToReadonlyIndex(getIndexInfoOfType(objectType, 1 /* Number */));
                     return mapType(objectType, function (t) { return getRestTypeOfTupleType(t) || undefinedType; });
                 }
             }
@@ -40164,17 +40951,21 @@ var ts;
                 if (objectType.flags & (1 /* Any */ | 131072 /* Never */)) {
                     return objectType;
                 }
-                var indexInfo = isTypeAssignableToKind(indexType, 296 /* NumberLike */) && getIndexInfoOfType(objectType, 1 /* Number */) ||
-                    getIndexInfoOfType(objectType, 0 /* String */) ||
-                    undefined;
+                var stringIndexInfo = getIndexInfoOfType(objectType, 0 /* String */);
+                var indexInfo = isTypeAssignableToKind(indexType, 296 /* NumberLike */) && getIndexInfoOfType(objectType, 1 /* Number */) || stringIndexInfo;
                 if (indexInfo) {
+                    if (accessFlags & 1 /* NoIndexSignatures */ && indexInfo === stringIndexInfo) {
+                        if (accessExpression) {
+                            error(accessExpression, ts.Diagnostics.Type_0_cannot_be_used_to_index_type_1, typeToString(indexType), typeToString(originalObjectType));
+                        }
+                        return undefined;
+                    }
                     if (accessNode && !isTypeAssignableToKind(indexType, 4 /* String */ | 8 /* Number */)) {
                         var indexNode = getIndexNodeForAccessExpression(accessNode);
                         error(indexNode, ts.Diagnostics.Type_0_cannot_be_used_as_an_index_type, typeToString(indexType));
+                        return indexInfo.type;
                     }
-                    else if (accessExpression && indexInfo.isReadonly && (ts.isAssignmentTarget(accessExpression) || ts.isDeleteTarget(accessExpression))) {
-                        error(accessExpression, ts.Diagnostics.Index_signature_in_type_0_only_permits_reading, typeToString(objectType));
-                    }
+                    errorIfWritingToReadonlyIndex(indexInfo);
                     return indexInfo.type;
                 }
                 if (indexType.flags & 131072 /* Never */) {
@@ -40184,7 +40975,10 @@ var ts;
                     return anyType;
                 }
                 if (accessExpression && !isConstEnumObjectType(objectType)) {
-                    if (noImplicitAny && !compilerOptions.suppressImplicitAnyIndexErrors) {
+                    if (objectType.symbol === globalThisSymbol && propName !== undefined && globalThisSymbol.exports.has(propName) && (globalThisSymbol.exports.get(propName).flags & 418 /* BlockScoped */)) {
+                        error(accessExpression, ts.Diagnostics.Property_0_does_not_exist_on_type_1, ts.unescapeLeadingUnderscores(propName), typeToString(objectType));
+                    }
+                    else if (noImplicitAny && !compilerOptions.suppressImplicitAnyIndexErrors && !suppressNoImplicitAnyError) {
                         if (propName !== undefined && typeHasStaticProperty(propName, objectType)) {
                             error(accessExpression, ts.Diagnostics.Property_0_is_a_static_member_of_type_1, propName, typeToString(objectType));
                         }
@@ -40199,11 +40993,35 @@ var ts;
                                 }
                             }
                             else {
-                                error(accessExpression, ts.Diagnostics.Element_implicitly_has_an_any_type_because_type_0_has_no_index_signature, typeToString(objectType));
+                                var suggestion_1 = getSuggestionForNonexistentIndexSignature(objectType, accessExpression);
+                                if (suggestion_1 !== undefined) {
+                                    error(accessExpression, ts.Diagnostics.Element_implicitly_has_an_any_type_because_type_0_has_no_index_signature_Did_you_mean_to_call_1, typeToString(objectType), suggestion_1);
+                                }
+                                else {
+                                    var errorInfo = void 0;
+                                    if (indexType.flags & 1024 /* EnumLiteral */) {
+                                        errorInfo = ts.chainDiagnosticMessages(/* details */ undefined, ts.Diagnostics.Property_0_does_not_exist_on_type_1, "[" + typeToString(indexType) + "]", typeToString(objectType));
+                                    }
+                                    else if (indexType.flags & 8192 /* UniqueESSymbol */) {
+                                        var symbolName_2 = getFullyQualifiedName(indexType.symbol, accessExpression);
+                                        errorInfo = ts.chainDiagnosticMessages(/* details */ undefined, ts.Diagnostics.Property_0_does_not_exist_on_type_1, "[" + symbolName_2 + "]", typeToString(objectType));
+                                    }
+                                    else if (indexType.flags & 128 /* StringLiteral */) {
+                                        errorInfo = ts.chainDiagnosticMessages(/* details */ undefined, ts.Diagnostics.Property_0_does_not_exist_on_type_1, indexType.value, typeToString(objectType));
+                                    }
+                                    else if (indexType.flags & 256 /* NumberLiteral */) {
+                                        errorInfo = ts.chainDiagnosticMessages(/* details */ undefined, ts.Diagnostics.Property_0_does_not_exist_on_type_1, indexType.value, typeToString(objectType));
+                                    }
+                                    else if (indexType.flags & (8 /* Number */ | 4 /* String */)) {
+                                        errorInfo = ts.chainDiagnosticMessages(/* details */ undefined, ts.Diagnostics.No_index_signature_with_a_parameter_of_type_0_was_found_on_type_1, typeToString(indexType), typeToString(objectType));
+                                    }
+                                    errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.Element_implicitly_has_an_any_type_because_expression_of_type_0_can_t_be_used_to_index_type_1, typeToString(fullIndexType), typeToString(objectType));
+                                    diagnostics.add(ts.createDiagnosticForNodeFromMessageChain(accessExpression, errorInfo));
+                                }
                             }
                         }
                     }
-                    return missingType;
+                    return undefined;
                 }
             }
             if (isJSLiteralType(objectType)) {
@@ -40224,14 +41042,19 @@ var ts;
             if (isTypeAny(indexType)) {
                 return indexType;
             }
-            return missingType;
+            return undefined;
+            function errorIfWritingToReadonlyIndex(indexInfo) {
+                if (indexInfo && indexInfo.isReadonly && accessExpression && (ts.isAssignmentTarget(accessExpression) || ts.isDeleteTarget(accessExpression))) {
+                    error(accessExpression, ts.Diagnostics.Index_signature_in_type_0_only_permits_reading, typeToString(objectType));
+                }
+            }
         }
         function getIndexNodeForAccessExpression(accessNode) {
-            return accessNode.kind === 190 /* ElementAccessExpression */
+            return accessNode.kind === 191 /* ElementAccessExpression */
                 ? accessNode.argumentExpression
-                : accessNode.kind === 180 /* IndexedAccessType */
+                : accessNode.kind === 181 /* IndexedAccessType */
                     ? accessNode.indexType
-                    : accessNode.kind === 149 /* ComputedPropertyName */
+                    : accessNode.kind === 150 /* ComputedPropertyName */
                         ? accessNode.expression
                         : accessNode;
         }
@@ -40241,64 +41064,124 @@ var ts;
         function isGenericIndexType(type) {
             return maybeTypeOfKind(type, 58982400 /* InstantiableNonPrimitive */ | 4194304 /* Index */);
         }
-        function getSimplifiedType(type) {
-            return type.flags & 8388608 /* IndexedAccess */ ? getSimplifiedIndexedAccessType(type) : type;
+        function isThisTypeParameter(type) {
+            return !!(type.flags & 262144 /* TypeParameter */ && type.isThisType);
         }
-        function distributeIndexOverObjectType(objectType, indexType) {
-            // (T | U)[K] -> T[K] | U[K]
-            if (objectType.flags & 1048576 /* Union */) {
-                return mapType(objectType, function (t) { return getSimplifiedType(getIndexedAccessType(t, indexType)); });
-            }
+        function getSimplifiedType(type, writing) {
+            return type.flags & 8388608 /* IndexedAccess */ ? getSimplifiedIndexedAccessType(type, writing) :
+                type.flags & 16777216 /* Conditional */ ? getSimplifiedConditionalType(type, writing) :
+                    type;
+        }
+        function distributeIndexOverObjectType(objectType, indexType, writing) {
+            // (T | U)[K] -> T[K] | U[K] (reading)
+            // (T | U)[K] -> T[K] & U[K] (writing)
             // (T & U)[K] -> T[K] & U[K]
-            if (objectType.flags & 2097152 /* Intersection */) {
-                return getIntersectionType(ts.map(objectType.types, function (t) { return getSimplifiedType(getIndexedAccessType(t, indexType)); }));
+            if (objectType.flags & 3145728 /* UnionOrIntersection */) {
+                var types = ts.map(objectType.types, function (t) { return getSimplifiedType(getIndexedAccessType(t, indexType), writing); });
+                return objectType.flags & 2097152 /* Intersection */ || writing ? getIntersectionType(types) : getUnionType(types);
+            }
+        }
+        function distributeObjectOverIndexType(objectType, indexType, writing) {
+            // T[A | B] -> T[A] | T[B] (reading)
+            // T[A | B] -> T[A] & T[B] (writing)
+            if (indexType.flags & 1048576 /* Union */) {
+                var types = ts.map(indexType.types, function (t) { return getSimplifiedType(getIndexedAccessType(objectType, t), writing); });
+                return writing ? getIntersectionType(types) : getUnionType(types);
             }
         }
         // Transform an indexed access to a simpler form, if possible. Return the simpler form, or return
-        // the type itself if no transformation is possible.
-        function getSimplifiedIndexedAccessType(type) {
-            if (type.simplified) {
-                return type.simplified === circularConstraintType ? type : type.simplified;
+        // the type itself if no transformation is possible. The writing flag indicates that the type is
+        // the target of an assignment.
+        function getSimplifiedIndexedAccessType(type, writing) {
+            var cache = writing ? "simplifiedForWriting" : "simplifiedForReading";
+            if (type[cache]) {
+                return type[cache] === circularConstraintType ? type : type[cache];
             }
-            type.simplified = circularConstraintType;
+            type[cache] = circularConstraintType;
             // We recursively simplify the object type as it may in turn be an indexed access type. For example, with
             // '{ [P in T]: { [Q in U]: number } }[T][U]' we want to first simplify the inner indexed access type.
-            var objectType = getSimplifiedType(type.objectType);
-            var indexType = getSimplifiedType(type.indexType);
-            // T[A | B] -> T[A] | T[B]
-            if (indexType.flags & 1048576 /* Union */) {
-                return type.simplified = mapType(indexType, function (t) { return getSimplifiedType(getIndexedAccessType(objectType, t)); });
+            var objectType = getSimplifiedType(type.objectType, writing);
+            var indexType = getSimplifiedType(type.indexType, writing);
+            // T[A | B] -> T[A] | T[B] (reading)
+            // T[A | B] -> T[A] & T[B] (writing)
+            var distributedOverIndex = distributeObjectOverIndexType(objectType, indexType, writing);
+            if (distributedOverIndex) {
+                return type[cache] = distributedOverIndex;
             }
             // Only do the inner distributions if the index can no longer be instantiated to cause index distribution again
             if (!(indexType.flags & 63176704 /* Instantiable */)) {
-                var simplified = distributeIndexOverObjectType(objectType, indexType);
-                if (simplified) {
-                    return type.simplified = simplified;
+                // (T | U)[K] -> T[K] | U[K] (reading)
+                // (T | U)[K] -> T[K] & U[K] (writing)
+                // (T & U)[K] -> T[K] & U[K]
+                var distributedOverObject = distributeIndexOverObjectType(objectType, indexType, writing);
+                if (distributedOverObject) {
+                    return type[cache] = distributedOverObject;
                 }
             }
-            // So ultimately:
+            // So ultimately (reading):
             // ((A & B) | C)[K1 | K2] -> ((A & B) | C)[K1] | ((A & B) | C)[K2] -> (A & B)[K1] | C[K1] | (A & B)[K2] | C[K2] -> (A[K1] & B[K1]) | C[K1] | (A[K2] & B[K2]) | C[K2]
             // If the object type is a mapped type { [P in K]: E }, where K is generic, instantiate E using a mapper
             // that substitutes the index type for P. For example, for an index access { [P in K]: Box<T[P]> }[X], we
             // construct the type Box<T[X]>.
             if (isGenericMappedType(objectType)) {
-                var mapper = createTypeMapper([getTypeParameterFromMappedType(objectType)], [type.indexType]);
-                var templateMapper = combineTypeMappers(objectType.mapper, mapper);
-                return type.simplified = mapType(instantiateType(getTemplateTypeFromMappedType(objectType), templateMapper), getSimplifiedType);
+                return type[cache] = mapType(substituteIndexedMappedType(objectType, type.indexType), function (t) { return getSimplifiedType(t, writing); });
             }
-            return type.simplified = type;
+            return type[cache] = type;
         }
-        function getIndexedAccessType(objectType, indexType, accessNode, missingType) {
-            if (missingType === void 0) { missingType = accessNode ? errorType : unknownType; }
+        function getSimplifiedConditionalType(type, writing) {
+            var checkType = type.checkType;
+            var extendsType = type.extendsType;
+            var trueType = getTrueTypeFromConditionalType(type);
+            var falseType = getFalseTypeFromConditionalType(type);
+            // Simplifications for types of the form `T extends U ? T : never` and `T extends U ? never : T`.
+            if (falseType.flags & 131072 /* Never */ && getActualTypeVariable(trueType) === getActualTypeVariable(checkType)) {
+                if (checkType.flags & 1 /* Any */ || isTypeAssignableTo(getRestrictiveInstantiation(checkType), getRestrictiveInstantiation(extendsType))) { // Always true
+                    return getSimplifiedType(trueType, writing);
+                }
+                else if (isIntersectionEmpty(checkType, extendsType)) { // Always false
+                    return neverType;
+                }
+            }
+            else if (trueType.flags & 131072 /* Never */ && getActualTypeVariable(falseType) === getActualTypeVariable(checkType)) {
+                if (!(checkType.flags & 1 /* Any */) && isTypeAssignableTo(getRestrictiveInstantiation(checkType), getRestrictiveInstantiation(extendsType))) { // Always true
+                    return neverType;
+                }
+                else if (checkType.flags & 1 /* Any */ || isIntersectionEmpty(checkType, extendsType)) { // Always false
+                    return getSimplifiedType(falseType, writing);
+                }
+            }
+            return type;
+        }
+        /**
+         * Invokes union simplification logic to determine if an intersection is considered empty as a union constituent
+         */
+        function isIntersectionEmpty(type1, type2) {
+            return !!(getUnionType([intersectTypes(type1, type2), neverType]).flags & 131072 /* Never */);
+        }
+        function substituteIndexedMappedType(objectType, index) {
+            var mapper = createTypeMapper([getTypeParameterFromMappedType(objectType)], [index]);
+            var templateMapper = combineTypeMappers(objectType.mapper, mapper);
+            return instantiateType(getTemplateTypeFromMappedType(objectType), templateMapper);
+        }
+        function getIndexedAccessType(objectType, indexType, accessNode) {
+            return getIndexedAccessTypeOrUndefined(objectType, indexType, accessNode, 0 /* None */) || (accessNode ? errorType : unknownType);
+        }
+        function getIndexedAccessTypeOrUndefined(objectType, indexType, accessNode, accessFlags) {
+            if (accessFlags === void 0) { accessFlags = 0 /* None */; }
             if (objectType === wildcardType || indexType === wildcardType) {
                 return wildcardType;
             }
+            // If the object type has a string index signature and no other members we know that the result will
+            // always be the type of that index signature and we can simplify accordingly.
+            if (isStringIndexSignatureOnlyType(objectType) && !(indexType.flags & 98304 /* Nullable */) && isTypeAssignableToKind(indexType, 4 /* String */ | 8 /* Number */)) {
+                indexType = stringType;
+            }
             // If the index type is generic, or if the object type is generic and doesn't originate in an expression,
             // we are performing a higher-order index access where we cannot meaningfully access the properties of the
             // object type. Note that for a generic T and a non-generic K, we eagerly resolve T[K] if it originates in
             // an expression. This is to preserve backwards compatibility. For example, an element access 'this["foo"]'
             // has always been resolved eagerly using the constraint type of 'this' at the given location.
-            if (isGenericIndexType(indexType) || !(accessNode && accessNode.kind !== 180 /* IndexedAccessType */) && isGenericObjectType(objectType)) {
+            if (isGenericIndexType(indexType) || !(accessNode && accessNode.kind !== 181 /* IndexedAccessType */) && isGenericObjectType(objectType)) {
                 if (objectType.flags & 3 /* AnyOrUnknown */) {
                     return objectType;
                 }
@@ -40319,25 +41202,25 @@ var ts;
                 var wasMissingProp = false;
                 for (var _i = 0, _a = indexType.types; _i < _a.length; _i++) {
                     var t = _a[_i];
-                    var propType = getPropertyTypeForIndexType(apparentObjectType, t, accessNode, /*cacheSymbol*/ false, missingType);
-                    if (propType === missingType) {
-                        if (!accessNode) {
-                            // If there's no error node, we can immeditely stop, since error reporting is off
-                            return missingType;
-                        }
-                        else {
-                            // Otherwise we set a flag and return at the end of the loop so we still mark all errors
-                            wasMissingProp = true;
-                        }
+                    var propType = getPropertyTypeForIndexType(objectType, apparentObjectType, t, indexType, wasMissingProp, accessNode, accessFlags);
+                    if (propType) {
+                        propTypes.push(propType);
+                    }
+                    else if (!accessNode) {
+                        // If there's no error node, we can immeditely stop, since error reporting is off
+                        return undefined;
+                    }
+                    else {
+                        // Otherwise we set a flag and return at the end of the loop so we still mark all errors
+                        wasMissingProp = true;
                     }
-                    propTypes.push(propType);
                 }
                 if (wasMissingProp) {
-                    return missingType;
+                    return undefined;
                 }
-                return getUnionType(propTypes);
+                return accessFlags & 2 /* Writing */ ? getIntersectionType(propTypes) : getUnionType(propTypes);
             }
-            return getPropertyTypeForIndexType(apparentObjectType, indexType, accessNode, /*cacheSymbol*/ true, missingType);
+            return getPropertyTypeForIndexType(objectType, apparentObjectType, indexType, indexType, /* supressNoImplicitAnyError */ false, accessNode, accessFlags | 4 /* CacheSymbol */);
         }
         function getTypeFromIndexedAccessTypeNode(node) {
             var links = getNodeLinks(node);
@@ -40367,13 +41250,14 @@ var ts;
             return links.resolvedType;
         }
         function getActualTypeVariable(type) {
-            return type.flags & 33554432 /* Substitution */ ? type.typeVariable : type;
-        }
-        /**
-         * Invokes union simplification logic to determine if an intersection is considered empty as a union constituent
-         */
-        function isIntersectionEmpty(type1, type2) {
-            return !!(getUnionType([intersectTypes(type1, type2), neverType]).flags & 131072 /* Never */);
+            if (type.flags & 33554432 /* Substitution */) {
+                return type.typeVariable;
+            }
+            if (type.flags & 8388608 /* IndexedAccess */ && (type.objectType.flags & 33554432 /* Substitution */ ||
+                type.indexType.flags & 33554432 /* Substitution */)) {
+                return getIndexedAccessType(getActualTypeVariable(type.objectType), getActualTypeVariable(type.indexType));
+            }
+            return type;
         }
         function getConditionalType(root, mapper) {
             var checkType = instantiateType(root.checkType, mapper);
@@ -40381,35 +41265,6 @@ var ts;
             if (checkType === wildcardType || extendsType === wildcardType) {
                 return wildcardType;
             }
-            var trueType = instantiateType(root.trueType, mapper);
-            var falseType = instantiateType(root.falseType, mapper);
-            var instantiationId = "" + (root.isDistributive ? "d" : "") + getTypeId(checkType) + ">" + getTypeId(extendsType) + "?" + getTypeId(trueType) + ":" + getTypeId(falseType);
-            var result = conditionalTypes.get(instantiationId);
-            if (result) {
-                return result;
-            }
-            var newResult = getConditionalTypeWorker(root, mapper, checkType, extendsType, trueType, falseType);
-            conditionalTypes.set(instantiationId, newResult);
-            return newResult;
-        }
-        function getConditionalTypeWorker(root, mapper, checkType, extendsType, trueType, falseType) {
-            // Simplifications for types of the form `T extends U ? T : never` and `T extends U ? never : T`.
-            if (falseType.flags & 131072 /* Never */ && isTypeIdenticalTo(getActualTypeVariable(trueType), getActualTypeVariable(checkType))) {
-                if (checkType.flags & 1 /* Any */ || isTypeAssignableTo(getRestrictiveInstantiation(checkType), getRestrictiveInstantiation(extendsType))) { // Always true
-                    return getDefaultConstraintOfTrueBranchOfConditionalType(root, /*combinedMapper*/ undefined, mapper);
-                }
-                else if (isIntersectionEmpty(checkType, extendsType)) { // Always false
-                    return neverType;
-                }
-            }
-            else if (trueType.flags & 131072 /* Never */ && isTypeIdenticalTo(getActualTypeVariable(falseType), getActualTypeVariable(checkType))) {
-                if (!(checkType.flags & 1 /* Any */) && isTypeAssignableTo(getRestrictiveInstantiation(checkType), getRestrictiveInstantiation(extendsType))) { // Always true
-                    return neverType;
-                }
-                else if (checkType.flags & 1 /* Any */ || isIntersectionEmpty(checkType, extendsType)) { // Always false
-                    return falseType; // TODO: Intersect negated `extends` type here
-                }
-            }
             var checkTypeInstantiable = maybeTypeOfKind(checkType, 63176704 /* Instantiable */ | 131072 /* GenericMappedType */);
             var combinedMapper;
             if (root.inferTypeParameters) {
@@ -40418,27 +41273,27 @@ var ts;
                     // We don't want inferences from constraints as they may cause us to eagerly resolve the
                     // conditional type instead of deferring resolution. Also, we always want strict function
                     // types rules (i.e. proper contravariance) for inferences.
-                    inferTypes(context.inferences, checkType, extendsType, 32 /* NoConstraints */ | 64 /* AlwaysStrict */);
+                    inferTypes(context.inferences, checkType, extendsType, 64 /* NoConstraints */ | 128 /* AlwaysStrict */);
                 }
-                combinedMapper = combineTypeMappers(mapper, context);
+                combinedMapper = combineTypeMappers(mapper, context.mapper);
             }
             // Instantiate the extends type including inferences for 'infer T' type parameters
             var inferredExtendsType = combinedMapper ? instantiateType(root.extendsType, combinedMapper) : extendsType;
             // We attempt to resolve the conditional type only when the check and extends types are non-generic
             if (!checkTypeInstantiable && !maybeTypeOfKind(inferredExtendsType, 63176704 /* Instantiable */ | 131072 /* GenericMappedType */)) {
                 if (inferredExtendsType.flags & 3 /* AnyOrUnknown */) {
-                    return trueType;
+                    return instantiateType(root.trueType, combinedMapper || mapper);
                 }
                 // Return union of trueType and falseType for 'any' since it matches anything
                 if (checkType.flags & 1 /* Any */) {
-                    return getUnionType([instantiateType(root.trueType, combinedMapper || mapper), falseType]);
+                    return getUnionType([instantiateType(root.trueType, combinedMapper || mapper), instantiateType(root.falseType, mapper)]);
                 }
                 // Return falseType for a definitely false extends check. We check an instantiations of the two
                 // types with type parameters mapped to the wildcard type, the most permissive instantiations
                 // possible (the wildcard type is assignable to and from all types). If those are not related,
                 // then no instantiations will be and we can just return the false branch type.
                 if (!isTypeAssignableTo(getPermissiveInstantiation(checkType), getPermissiveInstantiation(inferredExtendsType))) {
-                    return falseType;
+                    return instantiateType(root.falseType, mapper);
                 }
                 // Return trueType for a definitely true extends check. We check instantiations of the two
                 // types with type parameters mapped to their restrictive form, i.e. a form of the type parameter
@@ -40457,10 +41312,6 @@ var ts;
             result.extendsType = extendsType;
             result.mapper = mapper;
             result.combinedMapper = combinedMapper;
-            if (!combinedMapper) {
-                result.resolvedTrueType = trueType;
-                result.resolvedFalseType = falseType;
-            }
             result.aliasSymbol = root.aliasSymbol;
             result.aliasTypeArguments = instantiateTypes(root.aliasTypeArguments, mapper); // TODO: GH#18217
             return result;
@@ -40471,6 +41322,9 @@ var ts;
         function getFalseTypeFromConditionalType(type) {
             return type.resolvedFalseType || (type.resolvedFalseType = instantiateType(type.root.falseType, type.mapper));
         }
+        function getInferredTrueTypeFromConditionalType(type) {
+            return type.resolvedInferredTrueType || (type.resolvedInferredTrueType = type.combinedMapper ? instantiateType(type.root.trueType, type.combinedMapper) : getTrueTypeFromConditionalType(type));
+        }
         function getInferTypeParameters(node) {
             var result;
             if (node.locals) {
@@ -40482,20 +41336,6 @@ var ts;
             }
             return result;
         }
-        function isPossiblyReferencedInConditionalType(tp, node) {
-            if (isTypeParameterPossiblyReferenced(tp, node)) {
-                return true;
-            }
-            while (node) {
-                if (node.kind === 175 /* ConditionalType */) {
-                    if (isTypeParameterPossiblyReferenced(tp, node.extendsType)) {
-                        return true;
-                    }
-                }
-                node = node.parent;
-            }
-            return false;
-        }
         function getTypeFromConditionalTypeNode(node) {
             var links = getNodeLinks(node);
             if (!links.resolvedType) {
@@ -40503,7 +41343,7 @@ var ts;
                 var aliasSymbol = getAliasSymbolForTypeNode(node);
                 var aliasTypeArguments = getTypeArgumentsForAliasSymbol(aliasSymbol);
                 var allOuterTypeParameters = getOuterTypeParameters(node, /*includeThisTypes*/ true);
-                var outerTypeParameters = aliasTypeArguments ? allOuterTypeParameters : ts.filter(allOuterTypeParameters, function (tp) { return isPossiblyReferencedInConditionalType(tp, node); });
+                var outerTypeParameters = aliasTypeArguments ? allOuterTypeParameters : ts.filter(allOuterTypeParameters, function (tp) { return isTypeParameterPossiblyReferenced(tp, node); });
                 var root = {
                     node: node,
                     checkType: checkType,
@@ -40723,7 +41563,7 @@ var ts;
                 }
             }
             var spread = createAnonymousType(symbol, members, ts.emptyArray, ts.emptyArray, getIndexInfoWithReadonly(stringIndexInfo, readonly), getIndexInfoWithReadonly(numberIndexInfo, readonly));
-            spread.objectFlags |= 128 /* ObjectLiteral */ | 262144 /* ContainsObjectLiteral */ | 1024 /* ContainsSpread */ | objectFlags;
+            spread.objectFlags |= 128 /* ObjectLiteral */ | 524288 /* ContainsObjectOrArrayLiteral */ | 1024 /* ContainsSpread */ | objectFlags;
             return spread;
         }
         /** We approximate own properties as non-methods plus methods that are inside the object literal */
@@ -40814,9 +41654,9 @@ var ts;
         function getThisType(node) {
             var container = ts.getThisContainer(node, /*includeArrowFunctions*/ false);
             var parent = container && container.parent;
-            if (parent && (ts.isClassLike(parent) || parent.kind === 241 /* InterfaceDeclaration */)) {
+            if (parent && (ts.isClassLike(parent) || parent.kind === 242 /* InterfaceDeclaration */)) {
                 if (!ts.hasModifier(container, 32 /* Static */) &&
-                    (container.kind !== 157 /* Constructor */ || ts.isNodeDescendantOf(node, container.body))) {
+                    (container.kind !== 158 /* Constructor */ || ts.isNodeDescendantOf(node, container.body))) {
                     return getDeclaredTypeOfClassOrInterface(getSymbolOfNode(parent)).thisType;
                 }
             }
@@ -40832,89 +41672,89 @@ var ts;
         }
         function getTypeFromTypeNode(node) {
             switch (node.kind) {
-                case 120 /* AnyKeyword */:
-                case 289 /* JSDocAllType */:
-                case 290 /* JSDocUnknownType */:
+                case 121 /* AnyKeyword */:
+                case 290 /* JSDocAllType */:
+                case 291 /* JSDocUnknownType */:
                     return anyType;
-                case 143 /* UnknownKeyword */:
+                case 144 /* UnknownKeyword */:
                     return unknownType;
-                case 138 /* StringKeyword */:
+                case 139 /* StringKeyword */:
                     return stringType;
-                case 135 /* NumberKeyword */:
+                case 136 /* NumberKeyword */:
                     return numberType;
-                case 146 /* BigIntKeyword */:
+                case 147 /* BigIntKeyword */:
                     return bigintType;
-                case 123 /* BooleanKeyword */:
+                case 124 /* BooleanKeyword */:
                     return booleanType;
-                case 139 /* SymbolKeyword */:
+                case 140 /* SymbolKeyword */:
                     return esSymbolType;
-                case 106 /* VoidKeyword */:
+                case 107 /* VoidKeyword */:
                     return voidType;
-                case 141 /* UndefinedKeyword */:
+                case 142 /* UndefinedKeyword */:
                     return undefinedType;
-                case 96 /* NullKeyword */:
+                case 97 /* NullKeyword */:
                     return nullType;
-                case 132 /* NeverKeyword */:
+                case 133 /* NeverKeyword */:
                     return neverType;
-                case 136 /* ObjectKeyword */:
+                case 137 /* ObjectKeyword */:
                     return node.flags & 65536 /* JavaScriptFile */ ? anyType : nonPrimitiveType;
-                case 178 /* ThisType */:
-                case 100 /* ThisKeyword */:
+                case 179 /* ThisType */:
+                case 101 /* ThisKeyword */:
                     return getTypeFromThisTypeNode(node);
-                case 182 /* LiteralType */:
+                case 183 /* LiteralType */:
                     return getTypeFromLiteralTypeNode(node);
-                case 164 /* TypeReference */:
+                case 165 /* TypeReference */:
                     return getTypeFromTypeReference(node);
-                case 163 /* TypePredicate */:
+                case 164 /* TypePredicate */:
                     return booleanType;
-                case 211 /* ExpressionWithTypeArguments */:
+                case 212 /* ExpressionWithTypeArguments */:
                     return getTypeFromTypeReference(node);
-                case 167 /* TypeQuery */:
+                case 168 /* TypeQuery */:
                     return getTypeFromTypeQueryNode(node);
-                case 169 /* ArrayType */:
+                case 170 /* ArrayType */:
                     return getTypeFromArrayTypeNode(node);
-                case 170 /* TupleType */:
+                case 171 /* TupleType */:
                     return getTypeFromTupleTypeNode(node);
-                case 171 /* OptionalType */:
+                case 172 /* OptionalType */:
                     return getTypeFromOptionalTypeNode(node);
-                case 173 /* UnionType */:
+                case 174 /* UnionType */:
                     return getTypeFromUnionTypeNode(node);
-                case 174 /* IntersectionType */:
+                case 175 /* IntersectionType */:
                     return getTypeFromIntersectionTypeNode(node);
-                case 291 /* JSDocNullableType */:
+                case 292 /* JSDocNullableType */:
                     return getTypeFromJSDocNullableTypeNode(node);
-                case 293 /* JSDocOptionalType */:
+                case 294 /* JSDocOptionalType */:
                     return addOptionality(getTypeFromTypeNode(node.type));
-                case 177 /* ParenthesizedType */:
-                case 172 /* RestType */:
-                case 292 /* JSDocNonNullableType */:
-                case 288 /* JSDocTypeExpression */:
+                case 178 /* ParenthesizedType */:
+                case 173 /* RestType */:
+                case 293 /* JSDocNonNullableType */:
+                case 289 /* JSDocTypeExpression */:
                     return getTypeFromTypeNode(node.type);
-                case 295 /* JSDocVariadicType */:
+                case 296 /* JSDocVariadicType */:
                     return getTypeFromJSDocVariadicType(node);
-                case 165 /* FunctionType */:
-                case 166 /* ConstructorType */:
-                case 168 /* TypeLiteral */:
-                case 297 /* JSDocTypeLiteral */:
-                case 294 /* JSDocFunctionType */:
-                case 298 /* JSDocSignature */:
+                case 166 /* FunctionType */:
+                case 167 /* ConstructorType */:
+                case 169 /* TypeLiteral */:
+                case 298 /* JSDocTypeLiteral */:
+                case 295 /* JSDocFunctionType */:
+                case 299 /* JSDocSignature */:
                     return getTypeFromTypeLiteralOrFunctionOrConstructorTypeNode(node);
-                case 179 /* TypeOperator */:
+                case 180 /* TypeOperator */:
                     return getTypeFromTypeOperatorNode(node);
-                case 180 /* IndexedAccessType */:
+                case 181 /* IndexedAccessType */:
                     return getTypeFromIndexedAccessTypeNode(node);
-                case 181 /* MappedType */:
+                case 182 /* MappedType */:
                     return getTypeFromMappedTypeNode(node);
-                case 175 /* ConditionalType */:
+                case 176 /* ConditionalType */:
                     return getTypeFromConditionalTypeNode(node);
-                case 176 /* InferType */:
+                case 177 /* InferType */:
                     return getTypeFromInferTypeNode(node);
-                case 183 /* ImportType */:
+                case 184 /* ImportType */:
                     return getTypeFromImportTypeNode(node);
                 // This function assumes that an identifier or qualified name is a type expression
                 // Callers should first ensure this by calling isTypeNode
-                case 72 /* Identifier */:
-                case 148 /* QualifiedName */:
+                case 73 /* Identifier */:
+                case 149 /* QualifiedName */:
                     var symbol = getSymbolAtLocation(node);
                     return symbol ? getDeclaredTypeOfSymbol(symbol) : errorType;
                 default:
@@ -40973,33 +41813,8 @@ var ts;
          * Maps forward-references to later types parameters to the empty object type.
          * This is used during inference when instantiating type parameter defaults.
          */
-        function createBackreferenceMapper(typeParameters, index) {
-            return function (t) { return typeParameters.indexOf(t) >= index ? emptyObjectType : t; };
-        }
-        function isInferenceContext(mapper) {
-            return !!mapper.typeParameters;
-        }
-        function cloneTypeMapper(mapper, extraFlags) {
-            if (extraFlags === void 0) { extraFlags = 0; }
-            return mapper && isInferenceContext(mapper) ?
-                createInferenceContext(mapper.typeParameters, mapper.signature, mapper.flags | extraFlags, mapper.compareTypes, mapper.inferences) :
-                mapper;
-        }
-        function cloneInferredPartOfContext(context) {
-            // Filter context to only those parameters which actually have inference candidates
-            var params = [];
-            var inferences = [];
-            for (var i = 0; i < context.typeParameters.length; i++) {
-                var info = context.inferences[i];
-                if (info.candidates || info.contraCandidates) {
-                    params.push(context.typeParameters[i]);
-                    inferences.push(info);
-                }
-            }
-            if (!params.length) {
-                return undefined;
-            }
-            return createInferenceContext(params, context.signature, context.flags | 1 /* NoDefault */, context.compareTypes, inferences);
+        function createBackreferenceMapper(context, index) {
+            return function (t) { return ts.findIndex(context.inferences, function (info) { return info.typeParameter === t; }) >= index ? unknownType : t; };
         }
         function combineTypeMappers(mapper1, mapper2) {
             if (!mapper1)
@@ -41082,7 +41897,7 @@ var ts;
             }
             // Keep the flags from the symbol we're instantiating.  Mark that is instantiated, and
             // also transient so that we can just store data on it directly.
-            var result = createSymbol(symbol.flags, symbol.escapedName, 1 /* Instantiated */ | ts.getCheckFlags(symbol) & (8 /* Readonly */ | 2048 /* Late */ | 8192 /* OptionalParameter */ | 16384 /* RestParameter */));
+            var result = createSymbol(symbol.flags, symbol.escapedName, 1 /* Instantiated */ | ts.getCheckFlags(symbol) & (8 /* Readonly */ | 4096 /* Late */ | 16384 /* OptionalParameter */ | 32768 /* RestParameter */));
             result.declarations = symbol.declarations;
             result.parent = symbol.parent;
             result.target = symbol;
@@ -41148,28 +41963,31 @@ var ts;
             return type;
         }
         function maybeTypeParameterReference(node) {
-            return !(node.kind === 148 /* QualifiedName */ ||
-                node.parent.kind === 164 /* TypeReference */ && node.parent.typeArguments && node === node.parent.typeName);
+            return !(node.kind === 149 /* QualifiedName */ ||
+                node.parent.kind === 165 /* TypeReference */ && node.parent.typeArguments && node === node.parent.typeName);
         }
         function isTypeParameterPossiblyReferenced(tp, node) {
             // If the type parameter doesn't have exactly one declaration, if there are invening statement blocks
             // between the node and the type parameter declaration, if the node contains actual references to the
             // type parameter, or if the node contains type queries, we consider the type parameter possibly referenced.
             if (tp.symbol && tp.symbol.declarations && tp.symbol.declarations.length === 1) {
-                var container_3 = tp.symbol.declarations[0].parent;
-                if (ts.findAncestor(node, function (n) { return n.kind === 218 /* Block */ ? "quit" : n === container_3; })) {
-                    return !!ts.forEachChild(node, containsReference);
+                var container = tp.symbol.declarations[0].parent;
+                for (var n = node; n !== container; n = n.parent) {
+                    if (!n || n.kind === 219 /* Block */ || n.kind === 176 /* ConditionalType */ && ts.forEachChild(n.extendsType, containsReference)) {
+                        return true;
+                    }
                 }
+                return !!ts.forEachChild(node, containsReference);
             }
             return true;
             function containsReference(node) {
                 switch (node.kind) {
-                    case 178 /* ThisType */:
+                    case 179 /* ThisType */:
                         return !!tp.isThisType;
-                    case 72 /* Identifier */:
+                    case 73 /* Identifier */:
                         return !tp.isThisType && ts.isPartOfTypeNode(node) && maybeTypeParameterReference(node) &&
                             getTypeFromTypeNode(node) === tp;
-                    case 167 /* TypeQuery */:
+                    case 168 /* TypeQuery */:
                         return true;
                 }
                 return !!ts.forEachChild(node, containsReference);
@@ -41294,13 +42112,14 @@ var ts;
             if (!type || !mapper || mapper === identityMapper) {
                 return type;
             }
-            if (instantiationDepth === 50) {
+            if (instantiationDepth === 50 || instantiationCount >= 5000000) {
                 // We have reached 50 recursive type instantiations and there is a very high likelyhood we're dealing
                 // with a combination of infinite generic types that perpetually generate new type identities. We stop
                 // the recursion here by yielding the error type.
                 error(currentNode, ts.Diagnostics.Type_instantiation_is_excessively_deep_and_possibly_infinite);
                 return errorType;
             }
+            instantiationCount++;
             instantiationDepth++;
             var result = instantiateTypeWorker(type, mapper);
             instantiationDepth--;
@@ -41317,7 +42136,7 @@ var ts;
                     // If the anonymous type originates in a declaration of a function, method, class, or
                     // interface, in an object type literal, or in an object literal expression, we may need
                     // to instantiate the type because it might reference a type parameter.
-                    return type.symbol && type.symbol.flags & (16 /* Function */ | 8192 /* Method */ | 32 /* Class */ | 2048 /* TypeLiteral */ | 4096 /* ObjectLiteral */) && type.symbol.declarations ?
+                    return couldContainTypeVariables(type) ?
                         getAnonymousTypeInstantiation(type, mapper) : type;
                 }
                 if (objectFlags & 32 /* Mapped */) {
@@ -41355,7 +42174,11 @@ var ts;
                     return getSubstitutionType(maybeVariable, instantiateType(type.substitute, mapper));
                 }
                 else {
-                    return maybeVariable;
+                    var sub = instantiateType(type.substitute, mapper);
+                    if (sub.flags & 3 /* AnyOrUnknown */ || isTypeAssignableTo(getRestrictiveInstantiation(maybeVariable), getRestrictiveInstantiation(sub))) {
+                        return maybeVariable;
+                    }
+                    return sub;
                 }
             }
             return type;
@@ -41386,34 +42209,35 @@ var ts;
         // Returns true if the given expression contains (at any level of nesting) a function or arrow expression
         // that is subject to contextual typing.
         function isContextSensitive(node) {
-            ts.Debug.assert(node.kind !== 156 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 157 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
             switch (node.kind) {
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
-                case 156 /* MethodDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
+                case 157 /* MethodDeclaration */:
+                case 240 /* FunctionDeclaration */: // Function declarations can have context when annotated with a jsdoc @type
                     return isContextSensitiveFunctionLikeDeclaration(node);
-                case 188 /* ObjectLiteralExpression */:
+                case 189 /* ObjectLiteralExpression */:
                     return ts.some(node.properties, isContextSensitive);
-                case 187 /* ArrayLiteralExpression */:
+                case 188 /* ArrayLiteralExpression */:
                     return ts.some(node.elements, isContextSensitive);
-                case 205 /* ConditionalExpression */:
+                case 206 /* ConditionalExpression */:
                     return isContextSensitive(node.whenTrue) ||
                         isContextSensitive(node.whenFalse);
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return node.operatorToken.kind === 55 /* BarBarToken */ &&
                         (isContextSensitive(node.left) || isContextSensitive(node.right));
-                case 275 /* PropertyAssignment */:
+                case 276 /* PropertyAssignment */:
                     return isContextSensitive(node.initializer);
-                case 195 /* ParenthesizedExpression */:
+                case 196 /* ParenthesizedExpression */:
                     return isContextSensitive(node.expression);
-                case 268 /* JsxAttributes */:
+                case 269 /* JsxAttributes */:
                     return ts.some(node.properties, isContextSensitive) || ts.isJsxOpeningElement(node.parent) && ts.some(node.parent.parent.children, isContextSensitive);
-                case 267 /* JsxAttribute */: {
+                case 268 /* JsxAttribute */: {
                     // If there is no initializer, JSX attribute has a boolean value of true which is not context sensitive.
                     var initializer = node.initializer;
                     return !!initializer && isContextSensitive(initializer);
                 }
-                case 270 /* JsxExpression */: {
+                case 271 /* JsxExpression */: {
                     // It is possible to that node.expression is undefined (e.g <div x={} />)
                     var expression = node.expression;
                     return !!expression && isContextSensitive(expression);
@@ -41422,6 +42246,9 @@ var ts;
             return false;
         }
         function isContextSensitiveFunctionLikeDeclaration(node) {
+            if (ts.isFunctionDeclaration(node) && (!ts.isInJSFile(node) || !getTypeForDeclarationFromJSDocComment(node))) {
+                return false;
+            }
             // Functions with type parameters are not context sensitive.
             if (node.typeParameters) {
                 return false;
@@ -41430,7 +42257,7 @@ var ts;
             if (ts.some(node.parameters, function (p) { return !ts.getEffectiveTypeAnnotationNode(p); })) {
                 return true;
             }
-            if (node.kind !== 197 /* ArrowFunction */) {
+            if (node.kind !== 198 /* ArrowFunction */) {
                 // If the first parameter is not an explicit 'this' parameter, then the function has
                 // an implicit 'this' parameter which is subject to contextual typing.
                 var parameter = ts.firstOrUndefined(node.parameters);
@@ -41442,7 +42269,7 @@ var ts;
         }
         function hasContextSensitiveReturnExpression(node) {
             // TODO(anhans): A block should be context-sensitive if it has a context-sensitive return value.
-            return !!node.body && node.body.kind !== 218 /* Block */ && isContextSensitive(node.body);
+            return !!node.body && node.body.kind !== 219 /* Block */ && isContextSensitive(node.body);
         }
         function isContextSensitiveFunctionOrObjectLiteralMethod(func) {
             return (ts.isInJSFile(func) && ts.isFunctionDeclaration(func) || isFunctionExpressionOrArrowFunction(func) || ts.isObjectLiteralMethod(func)) &&
@@ -41495,7 +42322,7 @@ var ts;
         function isTypeDerivedFrom(source, target) {
             return source.flags & 1048576 /* Union */ ? ts.every(source.types, function (t) { return isTypeDerivedFrom(t, target); }) :
                 target.flags & 1048576 /* Union */ ? ts.some(target.types, function (t) { return isTypeDerivedFrom(source, t); }) :
-                    source.flags & 58982400 /* InstantiableNonPrimitive */ ? isTypeDerivedFrom(getBaseConstraintOfType(source) || emptyObjectType, target) :
+                    source.flags & 58982400 /* InstantiableNonPrimitive */ ? isTypeDerivedFrom(getBaseConstraintOfType(source) || unknownType, target) :
                         target === globalObjectType ? !!(source.flags & (524288 /* Object */ | 67108864 /* NonPrimitive */)) :
                             target === globalFunctionType ? !!(source.flags & 524288 /* Object */) && isFunctionObjectType(source) :
                                 hasBaseType(source, getTargetType(target));
@@ -41524,48 +42351,49 @@ var ts;
          * attempt to issue more specific errors on, for example, specific object literal properties or tuple members.
          */
         function checkTypeAssignableToAndOptionallyElaborate(source, target, errorNode, expr, headMessage, containingMessageChain) {
-            return checkTypeRelatedToAndOptionallyElaborate(source, target, assignableRelation, errorNode, expr, headMessage, containingMessageChain);
+            return checkTypeRelatedToAndOptionallyElaborate(source, target, assignableRelation, errorNode, expr, headMessage, containingMessageChain, /*errorOutputContainer*/ undefined);
         }
-        function checkTypeRelatedToAndOptionallyElaborate(source, target, relation, errorNode, expr, headMessage, containingMessageChain) {
+        function checkTypeRelatedToAndOptionallyElaborate(source, target, relation, errorNode, expr, headMessage, containingMessageChain, errorOutputContainer) {
             if (isTypeRelatedTo(source, target, relation))
                 return true;
-            if (!errorNode || !elaborateError(expr, source, target, relation, headMessage)) {
-                return checkTypeRelatedTo(source, target, relation, errorNode, headMessage, containingMessageChain);
+            if (!errorNode || !elaborateError(expr, source, target, relation, headMessage, containingMessageChain, errorOutputContainer)) {
+                return checkTypeRelatedTo(source, target, relation, errorNode, headMessage, containingMessageChain, errorOutputContainer);
             }
             return false;
         }
         function isOrHasGenericConditional(type) {
             return !!(type.flags & 16777216 /* Conditional */ || (type.flags & 2097152 /* Intersection */ && ts.some(type.types, isOrHasGenericConditional)));
         }
-        function elaborateError(node, source, target, relation, headMessage) {
+        function elaborateError(node, source, target, relation, headMessage, containingMessageChain, errorOutputContainer) {
             if (!node || isOrHasGenericConditional(target))
                 return false;
-            if (!checkTypeRelatedTo(source, target, relation, /*errorNode*/ undefined) && elaborateDidYouMeanToCallOrConstruct(node, source, target, relation, headMessage)) {
+            if (!checkTypeRelatedTo(source, target, relation, /*errorNode*/ undefined)
+                && elaborateDidYouMeanToCallOrConstruct(node, source, target, relation, headMessage, containingMessageChain, errorOutputContainer)) {
                 return true;
             }
             switch (node.kind) {
-                case 270 /* JsxExpression */:
-                case 195 /* ParenthesizedExpression */:
-                    return elaborateError(node.expression, source, target, relation, headMessage);
-                case 204 /* BinaryExpression */:
+                case 271 /* JsxExpression */:
+                case 196 /* ParenthesizedExpression */:
+                    return elaborateError(node.expression, source, target, relation, headMessage, containingMessageChain, errorOutputContainer);
+                case 205 /* BinaryExpression */:
                     switch (node.operatorToken.kind) {
-                        case 59 /* EqualsToken */:
+                        case 60 /* EqualsToken */:
                         case 27 /* CommaToken */:
-                            return elaborateError(node.right, source, target, relation, headMessage);
+                            return elaborateError(node.right, source, target, relation, headMessage, containingMessageChain, errorOutputContainer);
                     }
                     break;
-                case 188 /* ObjectLiteralExpression */:
-                    return elaborateObjectLiteral(node, source, target, relation);
-                case 187 /* ArrayLiteralExpression */:
-                    return elaborateArrayLiteral(node, source, target, relation);
-                case 268 /* JsxAttributes */:
-                    return elaborateJsxComponents(node, source, target, relation);
-                case 197 /* ArrowFunction */:
-                    return elaborateArrowFunction(node, source, target, relation);
+                case 189 /* ObjectLiteralExpression */:
+                    return elaborateObjectLiteral(node, source, target, relation, containingMessageChain, errorOutputContainer);
+                case 188 /* ArrayLiteralExpression */:
+                    return elaborateArrayLiteral(node, source, target, relation, containingMessageChain, errorOutputContainer);
+                case 269 /* JsxAttributes */:
+                    return elaborateJsxComponents(node, source, target, relation, containingMessageChain, errorOutputContainer);
+                case 198 /* ArrowFunction */:
+                    return elaborateArrowFunction(node, source, target, relation, containingMessageChain, errorOutputContainer);
             }
             return false;
         }
-        function elaborateDidYouMeanToCallOrConstruct(node, source, target, relation, headMessage) {
+        function elaborateDidYouMeanToCallOrConstruct(node, source, target, relation, headMessage, containingMessageChain, errorOutputContainer) {
             var callSignatures = getSignaturesOfType(source, 0 /* Call */);
             var constructSignatures = getSignaturesOfType(source, 1 /* Construct */);
             for (var _i = 0, _a = [constructSignatures, callSignatures]; _i < _a.length; _i++) {
@@ -41574,16 +42402,16 @@ var ts;
                     var returnType = getReturnTypeOfSignature(s);
                     return !(returnType.flags & (1 /* Any */ | 131072 /* Never */)) && checkTypeRelatedTo(returnType, target, relation, /*errorNode*/ undefined);
                 })) {
-                    var resultObj = {};
-                    checkTypeAssignableTo(source, target, node, headMessage, /*containingChain*/ undefined, resultObj);
-                    var diagnostic = resultObj.error;
-                    addRelatedInfo(diagnostic, ts.createDiagnosticForNode(node, signatures === constructSignatures ? ts.Diagnostics.Did_you_mean_to_use_new_with_this_expression : ts.Diagnostics.Did_you_mean_to_call_this_expression));
+                    var resultObj = errorOutputContainer || {};
+                    checkTypeAssignableTo(source, target, node, headMessage, containingMessageChain, resultObj);
+                    var diagnostic = resultObj.errors[resultObj.errors.length - 1];
+                    ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(node, signatures === constructSignatures ? ts.Diagnostics.Did_you_mean_to_use_new_with_this_expression : ts.Diagnostics.Did_you_mean_to_call_this_expression));
                     return true;
                 }
             }
             return false;
         }
-        function elaborateArrowFunction(node, source, target, relation) {
+        function elaborateArrowFunction(node, source, target, relation, containingMessageChain, errorOutputContainer) {
             // Don't elaborate blocks
             if (ts.isBlock(node.body)) {
                 return false;
@@ -41604,15 +42432,15 @@ var ts;
             var sourceReturn = getReturnTypeOfSignature(sourceSig);
             var targetReturn = getUnionType(ts.map(targetSignatures, getReturnTypeOfSignature));
             if (!checkTypeRelatedTo(sourceReturn, targetReturn, relation, /*errorNode*/ undefined)) {
-                var elaborated = returnExpression && elaborateError(returnExpression, sourceReturn, targetReturn, relation, /*headMessage*/ undefined);
+                var elaborated = returnExpression && elaborateError(returnExpression, sourceReturn, targetReturn, relation, /*headMessage*/ undefined, containingMessageChain, errorOutputContainer);
                 if (elaborated) {
                     return elaborated;
                 }
-                var resultObj = {};
-                checkTypeRelatedTo(sourceReturn, targetReturn, relation, returnExpression, /*message*/ undefined, /*chain*/ undefined, resultObj);
-                if (resultObj.error) {
+                var resultObj = errorOutputContainer || {};
+                checkTypeRelatedTo(sourceReturn, targetReturn, relation, returnExpression, /*message*/ undefined, containingMessageChain, resultObj);
+                if (resultObj.errors) {
                     if (target.symbol && ts.length(target.symbol.declarations)) {
-                        addRelatedInfo(resultObj.error, ts.createDiagnosticForNode(target.symbol.declarations[0], ts.Diagnostics.The_expected_type_comes_from_the_return_type_of_this_signature));
+                        ts.addRelatedInfo(resultObj.errors[resultObj.errors.length - 1], ts.createDiagnosticForNode(target.symbol.declarations[0], ts.Diagnostics.The_expected_type_comes_from_the_return_type_of_this_signature));
                     }
                     return true;
                 }
@@ -41624,32 +42452,32 @@ var ts;
          * If that element would issue an error, we first attempt to dive into that element's inner expression and issue a more specific error by recuring into `elaborateError`
          * Otherwise, we issue an error on _every_ element which fail the assignability check
          */
-        function elaborateElementwise(iterator, source, target, relation) {
+        function elaborateElementwise(iterator, source, target, relation, containingMessageChain, errorOutputContainer) {
             // Assignability failure - check each prop individually, and if that fails, fall back on the bad error span
             var reportedError = false;
             for (var status = iterator.next(); !status.done; status = iterator.next()) {
                 var _a = status.value, prop = _a.errorNode, next = _a.innerExpression, nameType = _a.nameType, errorMessage = _a.errorMessage;
-                var targetPropType = getIndexedAccessType(target, nameType, /*accessNode*/ undefined, errorType);
-                if (targetPropType === errorType || targetPropType.flags & 8388608 /* IndexedAccess */)
+                var targetPropType = getIndexedAccessTypeOrUndefined(target, nameType);
+                if (!targetPropType || targetPropType.flags & 8388608 /* IndexedAccess */)
                     continue; // Don't elaborate on indexes on generic variables
-                var sourcePropType = getIndexedAccessType(source, nameType, /*accessNode*/ undefined, errorType);
-                if (sourcePropType !== errorType && targetPropType !== errorType && !checkTypeRelatedTo(sourcePropType, targetPropType, relation, /*errorNode*/ undefined)) {
-                    var elaborated = next && elaborateError(next, sourcePropType, targetPropType, relation, /*headMessage*/ undefined);
+                var sourcePropType = getIndexedAccessTypeOrUndefined(source, nameType);
+                if (sourcePropType && !checkTypeRelatedTo(sourcePropType, targetPropType, relation, /*errorNode*/ undefined)) {
+                    var elaborated = next && elaborateError(next, sourcePropType, targetPropType, relation, /*headMessage*/ undefined, containingMessageChain, errorOutputContainer);
                     if (elaborated) {
                         reportedError = true;
                     }
                     else {
                         // Issue error on the prop itself, since the prop couldn't elaborate the error
-                        var resultObj = {};
+                        var resultObj = errorOutputContainer || {};
                         // Use the expression type, if available
                         var specificSource = next ? checkExpressionForMutableLocation(next, 0 /* Normal */, sourcePropType) : sourcePropType;
-                        var result = checkTypeRelatedTo(specificSource, targetPropType, relation, prop, errorMessage, /*containingChain*/ undefined, resultObj);
+                        var result = checkTypeRelatedTo(specificSource, targetPropType, relation, prop, errorMessage, containingMessageChain, resultObj);
                         if (result && specificSource !== sourcePropType) {
                             // If for whatever reason the expression type doesn't yield an error, make sure we still issue an error on the sourcePropType
-                            checkTypeRelatedTo(sourcePropType, targetPropType, relation, prop, errorMessage, /*containingChain*/ undefined, resultObj);
+                            checkTypeRelatedTo(sourcePropType, targetPropType, relation, prop, errorMessage, containingMessageChain, resultObj);
                         }
-                        if (resultObj.error) {
-                            var reportedDiag = resultObj.error;
+                        if (resultObj.errors) {
+                            var reportedDiag = resultObj.errors[resultObj.errors.length - 1];
                             var propertyName = isTypeUsableAsPropertyName(nameType) ? getPropertyNameFromType(nameType) : undefined;
                             var targetProp = propertyName !== undefined ? getPropertyOfType(target, propertyName) : undefined;
                             var issuedElaboration = false;
@@ -41659,13 +42487,13 @@ var ts;
                                     undefined;
                                 if (indexInfo && indexInfo.declaration && !ts.getSourceFileOfNode(indexInfo.declaration).hasNoDefaultLib) {
                                     issuedElaboration = true;
-                                    addRelatedInfo(reportedDiag, ts.createDiagnosticForNode(indexInfo.declaration, ts.Diagnostics.The_expected_type_comes_from_this_index_signature));
+                                    ts.addRelatedInfo(reportedDiag, ts.createDiagnosticForNode(indexInfo.declaration, ts.Diagnostics.The_expected_type_comes_from_this_index_signature));
                                 }
                             }
                             if (!issuedElaboration && (targetProp && ts.length(targetProp.declarations) || target.symbol && ts.length(target.symbol.declarations))) {
                                 var targetNode = targetProp && ts.length(targetProp.declarations) ? targetProp.declarations[0] : target.symbol.declarations[0];
                                 if (!ts.getSourceFileOfNode(targetNode).hasNoDefaultLib) {
-                                    addRelatedInfo(reportedDiag, ts.createDiagnosticForNode(targetNode, ts.Diagnostics.The_expected_type_comes_from_property_0_which_is_declared_here_on_type_1, propertyName && !(nameType.flags & 8192 /* UniqueESSymbol */) ? ts.unescapeLeadingUnderscores(propertyName) : typeToString(nameType), typeToString(target)));
+                                    ts.addRelatedInfo(reportedDiag, ts.createDiagnosticForNode(targetNode, ts.Diagnostics.The_expected_type_comes_from_property_0_which_is_declared_here_on_type_1, propertyName && !(nameType.flags & 8192 /* UniqueESSymbol */) ? ts.unescapeLeadingUnderscores(propertyName) : typeToString(nameType), typeToString(target)));
                                 }
                             }
                         }
@@ -41732,26 +42560,29 @@ var ts;
         }
         function getElaborationElementForJsxChild(child, nameType, getInvalidTextDiagnostic) {
             switch (child.kind) {
-                case 270 /* JsxExpression */:
+                case 271 /* JsxExpression */:
                     // child is of the type of the expression
                     return { errorNode: child, innerExpression: child.expression, nameType: nameType };
                 case 11 /* JsxText */:
-                    if (child.containsOnlyWhiteSpaces) {
+                    if (child.containsOnlyTriviaWhiteSpaces) {
                         break; // Whitespace only jsx text isn't real jsx text
                     }
                     // child is a string
                     return { errorNode: child, innerExpression: undefined, nameType: nameType, errorMessage: getInvalidTextDiagnostic() };
-                case 260 /* JsxElement */:
-                case 261 /* JsxSelfClosingElement */:
-                case 264 /* JsxFragment */:
+                case 261 /* JsxElement */:
+                case 262 /* JsxSelfClosingElement */:
+                case 265 /* JsxFragment */:
                     // child is of type JSX.Element
                     return { errorNode: child, innerExpression: child, nameType: nameType };
                 default:
                     return ts.Debug.assertNever(child, "Found invalid jsx child");
             }
         }
-        function elaborateJsxComponents(node, source, target, relation) {
-            var result = elaborateElementwise(generateJsxAttributes(node), source, target, relation);
+        function getSemanticJsxChildren(children) {
+            return ts.filter(children, function (i) { return !ts.isJsxText(i) || !i.containsOnlyTriviaWhiteSpaces; });
+        }
+        function elaborateJsxComponents(node, source, target, relation, containingMessageChain, errorOutputContainer) {
+            var result = elaborateElementwise(generateJsxAttributes(node), source, target, relation, containingMessageChain, errorOutputContainer);
             var invalidTextDiagnostic;
             if (ts.isJsxOpeningElement(node.parent) && ts.isJsxElement(node.parent.parent)) {
                 var containingElement = node.parent.parent;
@@ -41759,7 +42590,7 @@ var ts;
                 var childrenPropName = childPropName === undefined ? "children" : ts.unescapeLeadingUnderscores(childPropName);
                 var childrenNameType = getLiteralType(childrenPropName);
                 var childrenTargetType = getIndexedAccessType(target, childrenNameType);
-                var validChildren = ts.filter(containingElement.children, function (i) { return !ts.isJsxText(i) || !i.containsOnlyWhiteSpaces; });
+                var validChildren = getSemanticJsxChildren(containingElement.children);
                 if (!ts.length(validChildren)) {
                     return result;
                 }
@@ -41769,12 +42600,16 @@ var ts;
                 if (moreThanOneRealChildren) {
                     if (arrayLikeTargetParts !== neverType) {
                         var realSource = createTupleType(checkJsxChildren(containingElement, 0 /* Normal */));
-                        result = elaborateElementwise(generateJsxChildren(containingElement, getInvalidTextualChildDiagnostic), realSource, arrayLikeTargetParts, relation) || result;
+                        var children = generateJsxChildren(containingElement, getInvalidTextualChildDiagnostic);
+                        result = elaborateElementwise(children, realSource, arrayLikeTargetParts, relation, containingMessageChain, errorOutputContainer) || result;
                     }
                     else if (!isTypeRelatedTo(getIndexedAccessType(source, childrenNameType), childrenTargetType, relation)) {
                         // arity mismatch
                         result = true;
-                        error(containingElement.openingElement.tagName, ts.Diagnostics.This_JSX_tag_s_0_prop_expects_a_single_child_of_type_1_but_multiple_children_were_provided, childrenPropName, typeToString(childrenTargetType));
+                        var diag = error(containingElement.openingElement.tagName, ts.Diagnostics.This_JSX_tag_s_0_prop_expects_a_single_child_of_type_1_but_multiple_children_were_provided, childrenPropName, typeToString(childrenTargetType));
+                        if (errorOutputContainer && errorOutputContainer.skipLogging) {
+                            (errorOutputContainer.errors || (errorOutputContainer.errors = [])).push(diag);
+                        }
                     }
                 }
                 else {
@@ -41789,13 +42624,16 @@ var ts;
                                         _a.sent();
                                         return [2 /*return*/];
                                 }
-                            }); })(), source, target, relation) || result;
+                            }); })(), source, target, relation, containingMessageChain, errorOutputContainer) || result;
                         }
                     }
                     else if (!isTypeRelatedTo(getIndexedAccessType(source, childrenNameType), childrenTargetType, relation)) {
                         // arity mismatch
                         result = true;
-                        error(containingElement.openingElement.tagName, ts.Diagnostics.This_JSX_tag_s_0_prop_expects_type_1_which_requires_multiple_children_but_only_a_single_child_was_provided, childrenPropName, typeToString(childrenTargetType));
+                        var diag = error(containingElement.openingElement.tagName, ts.Diagnostics.This_JSX_tag_s_0_prop_expects_type_1_which_requires_multiple_children_but_only_a_single_child_was_provided, childrenPropName, typeToString(childrenTargetType));
+                        if (errorOutputContainer && errorOutputContainer.skipLogging) {
+                            (errorOutputContainer.errors || (errorOutputContainer.errors = [])).push(diag);
+                        }
                     }
                 }
             }
@@ -41842,14 +42680,16 @@ var ts;
                 }
             });
         }
-        function elaborateArrayLiteral(node, source, target, relation) {
+        function elaborateArrayLiteral(node, source, target, relation, containingMessageChain, errorOutputContainer) {
+            if (target.flags & 131068 /* Primitive */)
+                return false;
             if (isTupleLikeType(source)) {
-                return elaborateElementwise(generateLimitedTupleElements(node, target), source, target, relation);
+                return elaborateElementwise(generateLimitedTupleElements(node, target), source, target, relation, containingMessageChain, errorOutputContainer);
             }
             // recreate a tuple from the elements, if possible
             var tupleizedType = checkArrayLiteral(node, 1 /* Contextual */, /*forceTuple*/ true);
             if (isTupleLikeType(tupleizedType)) {
-                return elaborateElementwise(generateLimitedTupleElements(node, target), tupleizedType, target, relation);
+                return elaborateElementwise(generateLimitedTupleElements(node, target), tupleizedType, target, relation, containingMessageChain, errorOutputContainer);
             }
             return false;
         }
@@ -41873,11 +42713,11 @@ var ts;
                         }
                         _b = prop.kind;
                         switch (_b) {
-                            case 159 /* SetAccessor */: return [3 /*break*/, 2];
-                            case 158 /* GetAccessor */: return [3 /*break*/, 2];
-                            case 156 /* MethodDeclaration */: return [3 /*break*/, 2];
-                            case 276 /* ShorthandPropertyAssignment */: return [3 /*break*/, 2];
-                            case 275 /* PropertyAssignment */: return [3 /*break*/, 4];
+                            case 160 /* SetAccessor */: return [3 /*break*/, 2];
+                            case 159 /* GetAccessor */: return [3 /*break*/, 2];
+                            case 157 /* MethodDeclaration */: return [3 /*break*/, 2];
+                            case 277 /* ShorthandPropertyAssignment */: return [3 /*break*/, 2];
+                            case 276 /* PropertyAssignment */: return [3 /*break*/, 4];
                         }
                         return [3 /*break*/, 6];
                     case 2: return [4 /*yield*/, { errorNode: prop.name, innerExpression: undefined, nameType: type }];
@@ -41898,8 +42738,10 @@ var ts;
                 }
             });
         }
-        function elaborateObjectLiteral(node, source, target, relation) {
-            return elaborateElementwise(generateObjectLiteralElements(node), source, target, relation);
+        function elaborateObjectLiteral(node, source, target, relation, containingMessageChain, errorOutputContainer) {
+            if (target.flags & 131068 /* Primitive */)
+                return false;
+            return elaborateElementwise(generateObjectLiteralElements(node), source, target, relation, containingMessageChain, errorOutputContainer);
         }
         /**
          * This is *not* a bi-directional relationship.
@@ -41912,6 +42754,14 @@ var ts;
             return compareSignaturesRelated(source, target, 0 /* None */, ignoreReturnTypes, /*reportErrors*/ false, 
             /*errorReporter*/ undefined, compareTypesAssignable) !== 0 /* False */;
         }
+        /**
+         * Returns true if `s` is `(...args: any[]) => any` or `(this: any, ...args: any[]) => any`
+         */
+        function isAnySignature(s) {
+            return !s.typeParameters && (!s.thisParameter || isTypeAny(getTypeOfParameter(s.thisParameter))) && s.parameters.length === 1 &&
+                s.hasRestParameter && (getTypeOfParameter(s.parameters[0]) === anyArrayType || isTypeAny(getTypeOfParameter(s.parameters[0]))) &&
+                isTypeAny(getReturnTypeOfSignature(s));
+        }
         /**
          * See signatureRelatedTo, compareSignaturesIdentical
          */
@@ -41920,13 +42770,16 @@ var ts;
             if (source === target) {
                 return -1 /* True */;
             }
+            if (isAnySignature(target)) {
+                return -1 /* True */;
+            }
             var targetCount = getParameterCount(target);
             if (!hasEffectiveRestParameter(target) && getMinArgumentCount(source) > targetCount) {
                 return 0 /* False */;
             }
             if (source.typeParameters && source.typeParameters !== target.typeParameters) {
                 target = getCanonicalSignature(target);
-                source = instantiateSignatureInContextOf(source, target, /*contextualMapper*/ undefined, compareTypes);
+                source = instantiateSignatureInContextOf(source, target, /*inferenceContext*/ undefined, compareTypes);
             }
             var sourceCount = getParameterCount(source);
             var sourceRestType = getNonArrayRestType(source);
@@ -41936,8 +42789,8 @@ var ts;
                 return 0 /* False */;
             }
             var kind = target.declaration ? target.declaration.kind : 0 /* Unknown */;
-            var strictVariance = !callbackCheck && strictFunctionTypes && kind !== 156 /* MethodDeclaration */ &&
-                kind !== 155 /* MethodSignature */ && kind !== 157 /* Constructor */;
+            var strictVariance = !callbackCheck && strictFunctionTypes && kind !== 157 /* MethodDeclaration */ &&
+                kind !== 156 /* MethodSignature */ && kind !== 158 /* Constructor */;
             var result = -1 /* True */;
             var sourceThisType = getThisTypeOfSignature(source);
             if (sourceThisType && sourceThisType !== voidType) {
@@ -41985,19 +42838,21 @@ var ts;
                 result &= related;
             }
             if (!ignoreReturnTypes) {
-                var targetReturnType = (target.declaration && isJSConstructor(target.declaration)) ?
+                // If a signature reolution is already in-flight, skip issuing a circularity error
+                // here and just use the `any` type directly
+                var targetReturnType = isResolvingReturnTypeOfSignature(target) ? anyType : (target.declaration && isJSConstructor(target.declaration)) ?
                     getJSClassType(target.declaration.symbol) : getReturnTypeOfSignature(target);
                 if (targetReturnType === voidType) {
                     return result;
                 }
-                var sourceReturnType = (source.declaration && isJSConstructor(source.declaration)) ?
+                var sourceReturnType = isResolvingReturnTypeOfSignature(source) ? anyType : (source.declaration && isJSConstructor(source.declaration)) ?
                     getJSClassType(source.declaration.symbol) : getReturnTypeOfSignature(source);
                 // The following block preserves behavior forbidding boolean returning functions from being assignable to type guard returning functions
                 var targetTypePredicate = getTypePredicateOfSignature(target);
                 if (targetTypePredicate) {
                     var sourceTypePredicate = getTypePredicateOfSignature(source);
                     if (sourceTypePredicate) {
-                        result &= compareTypePredicateRelatedTo(sourceTypePredicate, targetTypePredicate, source.declaration, target.declaration, reportErrors, errorReporter, compareTypes); // TODO: GH#18217
+                        result &= compareTypePredicateRelatedTo(sourceTypePredicate, targetTypePredicate, reportErrors, errorReporter, compareTypes);
                     }
                     else if (ts.isIdentifierTypePredicate(targetTypePredicate)) {
                         if (reportErrors) {
@@ -42016,7 +42871,7 @@ var ts;
             }
             return result;
         }
-        function compareTypePredicateRelatedTo(source, target, sourceDeclaration, targetDeclaration, reportErrors, errorReporter, compareTypes) {
+        function compareTypePredicateRelatedTo(source, target, reportErrors, errorReporter, compareTypes) {
             if (source.kind !== target.kind) {
                 if (reportErrors) {
                     errorReporter(ts.Diagnostics.A_this_based_type_guard_is_not_compatible_with_a_parameter_based_type_guard);
@@ -42025,12 +42880,9 @@ var ts;
                 return 0 /* False */;
             }
             if (source.kind === 1 /* Identifier */) {
-                var targetPredicate = target;
-                var sourceIndex = source.parameterIndex - (ts.getThisParameter(sourceDeclaration) ? 1 : 0);
-                var targetIndex = targetPredicate.parameterIndex - (ts.getThisParameter(targetDeclaration) ? 1 : 0);
-                if (sourceIndex !== targetIndex) {
+                if (source.parameterIndex !== target.parameterIndex) {
                     if (reportErrors) {
-                        errorReporter(ts.Diagnostics.Parameter_0_is_not_in_the_same_position_as_parameter_1, source.parameterName, targetPredicate.parameterName);
+                        errorReporter(ts.Diagnostics.Parameter_0_is_not_in_the_same_position_as_parameter_1, source.parameterName, target.parameterName);
                         errorReporter(ts.Diagnostics.Type_predicate_0_is_not_assignable_to_1, typePredicateToString(source), typePredicateToString(target));
                     }
                     return 0 /* False */;
@@ -42072,6 +42924,11 @@ var ts;
         function isEmptyAnonymousObjectType(type) {
             return !!(ts.getObjectFlags(type) & 16 /* Anonymous */) && isEmptyObjectType(type);
         }
+        function isStringIndexSignatureOnlyType(type) {
+            return type.flags & 524288 /* Object */ && !isGenericMappedType(type) && getPropertiesOfType(type).length === 0 && getIndexInfoOfType(type, 0 /* String */) && !getIndexInfoOfType(type, 1 /* Number */) ||
+                type.flags & 3145728 /* UnionOrIntersection */ && ts.every(type.types, isStringIndexSignatureOnlyType) ||
+                false;
+        }
         function isEnumTypeRelatedTo(sourceSymbol, targetSymbol, errorReporter) {
             if (sourceSymbol === targetSymbol) {
                 return true;
@@ -42180,8 +43037,8 @@ var ts;
             }
             return false;
         }
-        function isIgnoredJsxProperty(source, sourceProp, targetMemberType) {
-            return ts.getObjectFlags(source) & 4096 /* JsxAttributes */ && !(isUnhyphenatedJsxName(sourceProp.escapedName) || targetMemberType);
+        function isIgnoredJsxProperty(source, sourceProp) {
+            return ts.getObjectFlags(source) & 4096 /* JsxAttributes */ && !isUnhyphenatedJsxName(sourceProp.escapedName);
         }
         /**
          * Checks if 'source' is related to 'target' (e.g.: is a assignable to).
@@ -42192,6 +43049,7 @@ var ts;
          * @param errorNode The suggested node upon which all errors will be reported, if defined. This may or may not be the actual node used.
          * @param headMessage If the error chain should be prepended by a head message, then headMessage will be used.
          * @param containingMessageChain A chain of errors to prepend any new errors found.
+         * @param errorOutputContainer Return the diagnostic. Do not log if 'skipLogging' is truthy.
          */
         function checkTypeRelatedTo(source, target, relation, errorNode, headMessage, containingMessageChain, errorOutputContainer) {
             var errorInfo;
@@ -42203,17 +43061,21 @@ var ts;
             var depth = 0;
             var expandingFlags = 0 /* None */;
             var overflow = false;
-            var suppressNextError = false;
+            var overrideNextErrorInfo;
             ts.Debug.assert(relation !== identityRelation || !errorNode, "no error reporting in identity checking");
             var result = isRelatedTo(source, target, /*reportErrors*/ !!errorNode, headMessage);
             if (overflow) {
-                error(errorNode, ts.Diagnostics.Excessive_stack_depth_comparing_types_0_and_1, typeToString(source), typeToString(target));
+                var diag = error(errorNode, ts.Diagnostics.Excessive_stack_depth_comparing_types_0_and_1, typeToString(source), typeToString(target));
+                if (errorOutputContainer) {
+                    (errorOutputContainer.errors || (errorOutputContainer.errors = [])).push(diag);
+                }
             }
             else if (errorInfo) {
                 if (containingMessageChain) {
-                    var chain_1 = containingMessageChain();
-                    if (chain_1) {
-                        errorInfo = ts.concatenateDiagnosticMessageChains(chain_1, errorInfo);
+                    var chain = containingMessageChain();
+                    if (chain) {
+                        ts.concatenateDiagnosticMessageChains(chain, errorInfo);
+                        errorInfo = chain;
                     }
                 }
                 var relatedInformation = void 0;
@@ -42231,12 +43093,17 @@ var ts;
                 }
                 var diag = ts.createDiagnosticForNodeFromMessageChain(errorNode, errorInfo, relatedInformation);
                 if (relatedInfo) {
-                    addRelatedInfo.apply(void 0, [diag].concat(relatedInfo));
+                    ts.addRelatedInfo.apply(void 0, [diag].concat(relatedInfo));
                 }
                 if (errorOutputContainer) {
-                    errorOutputContainer.error = diag;
+                    (errorOutputContainer.errors || (errorOutputContainer.errors = [])).push(diag);
                 }
-                diagnostics.add(diag); // TODO: GH#18217
+                if (!errorOutputContainer || !errorOutputContainer.skipLogging) {
+                    diagnostics.add(diag);
+                }
+            }
+            if (errorNode && errorOutputContainer && errorOutputContainer.skipLogging && result === 0 /* False */) {
+                ts.Debug.assert(!!errorOutputContainer.errors, "missed opportunity to interact with error.");
             }
             return result !== 0 /* False */;
             function reportError(message, arg0, arg1, arg2, arg3) {
@@ -42253,11 +43120,9 @@ var ts;
                 }
             }
             function reportRelationError(message, source, target) {
-                var sourceType = typeToString(source);
-                var targetType = typeToString(target);
-                if (sourceType === targetType) {
-                    sourceType = typeToString(source, /*enclosingDeclaration*/ undefined, 64 /* UseFullyQualifiedType */);
-                    targetType = typeToString(target, /*enclosingDeclaration*/ undefined, 64 /* UseFullyQualifiedType */);
+                var _a = getTypeNamesForErrorDisplay(source, target), sourceType = _a[0], targetType = _a[1];
+                if (target.flags & 262144 /* TypeParameter */ && target.immediateBaseConstraint !== undefined && isTypeAssignableTo(source, target.immediateBaseConstraint)) {
+                    reportError(ts.Diagnostics._0_is_assignable_to_the_constraint_of_type_1_but_1_could_be_instantiated_with_a_different_subtype_of_constraint_2, sourceType, targetType, typeToString(target.immediateBaseConstraint));
                 }
                 if (!message) {
                     if (relation === comparableRelation) {
@@ -42282,24 +43147,38 @@ var ts;
                     reportError(ts.Diagnostics._0_is_a_primitive_but_1_is_a_wrapper_object_Prefer_using_0_when_possible, targetType, sourceType);
                 }
             }
-            function isUnionOrIntersectionTypeWithoutNullableConstituents(type) {
-                if (!(type.flags & 3145728 /* UnionOrIntersection */)) {
+            /**
+             * Try and elaborate array and tuple errors. Returns false
+             * if we have found an elaboration, or we should ignore
+             * any other elaborations when relating the `source` and
+             * `target` types.
+             *
+             * @param source
+             * @param target
+             * @param reportErrors
+             */
+            function tryElaborateArrayLikeErrors(source, target, reportErrors) {
+                if (isTupleLikeType(source)) {
+                    var sourceTuple = source.target;
+                    if (sourceTuple && sourceTuple.readonly && isArrayOrTupleLikeType(target) &&
+                        (!isReadonlyArrayType(target) || isTupleType(target) && !target.target.readonly)) {
+                        if (reportErrors) {
+                            reportError(ts.Diagnostics.The_type_0_is_readonly_and_cannot_be_assigned_to_the_mutable_type_1, typeToString(source), typeToString(target));
+                        }
+                        return false;
+                    }
+                    return isArrayLikeType(target);
+                }
+                if (isTupleLikeType(target)) {
+                    return isArrayLikeType(source);
+                }
+                if (isReadonlyArrayType(source) && isArrayType(target) && !isReadonlyArrayType(target)) {
+                    if (reportErrors) {
+                        reportError(ts.Diagnostics.The_type_0_is_readonly_and_cannot_be_assigned_to_the_mutable_type_1, typeToString(source), typeToString(target));
+                    }
                     return false;
                 }
-                // at this point we know that this is union or intersection type possibly with nullable constituents.
-                // check if we still will have compound type if we ignore nullable components.
-                var seenNonNullable = false;
-                for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
-                    var t = _a[_i];
-                    if (t.flags & 98304 /* Nullable */) {
-                        continue;
-                    }
-                    if (seenNonNullable) {
-                        return true;
-                    }
-                    seenNonNullable = true;
-                }
-                return false;
+                return true;
             }
             /**
              * Compare two types and return
@@ -42321,11 +43200,11 @@ var ts;
                 if (target.flags & 33554432 /* Substitution */) {
                     target = target.typeVariable;
                 }
-                if (source.flags & 8388608 /* IndexedAccess */) {
-                    source = getSimplifiedType(source);
+                if (source.flags & 25165824 /* Simplifiable */) {
+                    source = getSimplifiedType(source, /*writing*/ false);
                 }
-                if (target.flags & 8388608 /* IndexedAccess */) {
-                    target = getSimplifiedType(target);
+                if (target.flags & 25165824 /* Simplifiable */) {
+                    target = getSimplifiedType(target, /*writing*/ true);
                 }
                 // Try to see if we're relating something like `Foo` -> `Bar | null | undefined`.
                 // If so, reporting the `null` and `undefined` in the type is hardly useful.
@@ -42353,7 +43232,8 @@ var ts;
                     isSimpleTypeRelatedTo(source, target, relation, reportErrors ? reportError : undefined))
                     return -1 /* True */;
                 var isComparingJsxAttributes = !!(ts.getObjectFlags(source) & 4096 /* JsxAttributes */);
-                if (isObjectLiteralType(source) && ts.getObjectFlags(source) & 32768 /* FreshLiteral */) {
+                var isPerformingExcessPropertyChecks = (isObjectLiteralType(source) && ts.getObjectFlags(source) & 32768 /* FreshLiteral */);
+                if (isPerformingExcessPropertyChecks) {
                     var discriminantType = target.flags & 1048576 /* Union */ ? findMatchingDiscriminantType(source, target) : undefined;
                     if (hasExcessProperties(source, target, discriminantType, reportErrors)) {
                         if (reportErrors) {
@@ -42361,13 +43241,6 @@ var ts;
                         }
                         return 0 /* False */;
                     }
-                    // Above we check for excess properties with respect to the entire target type. When union
-                    // and intersection types are further deconstructed on the target side, we don't want to
-                    // make the check again (as it might fail for a partial target type). Therefore we obtain
-                    // the regular source type and proceed with that.
-                    if (isUnionOrIntersectionTypeWithoutNullableConstituents(target) && !discriminantType) {
-                        source = getRegularTypeOfObjectLiteral(source);
-                    }
                 }
                 if (relation !== comparableRelation && !isApparentIntersectionConstituent &&
                     source.flags & (131068 /* Primitive */ | 524288 /* Object */ | 2097152 /* Intersection */) && source !== globalObjectType &&
@@ -42400,11 +43273,24 @@ var ts;
                 }
                 else {
                     if (target.flags & 1048576 /* Union */) {
-                        result = typeRelatedToSomeType(source, target, reportErrors && !(source.flags & 131068 /* Primitive */) && !(target.flags & 131068 /* Primitive */));
+                        result = typeRelatedToSomeType(getRegularTypeOfObjectLiteral(source), target, reportErrors && !(source.flags & 131068 /* Primitive */) && !(target.flags & 131068 /* Primitive */));
+                        if (result && isPerformingExcessPropertyChecks) {
+                            // Validate against excess props using the original `source`
+                            var discriminantType = findMatchingDiscriminantType(source, target) || filterPrimitivesIfContainsNonPrimitive(target);
+                            if (!propertiesRelatedTo(source, discriminantType, reportErrors, /*excludedProperties*/ undefined)) {
+                                return 0 /* False */;
+                            }
+                        }
                     }
                     else if (target.flags & 2097152 /* Intersection */) {
                         isIntersectionConstituent = true; // set here to affect the following trio of checks
-                        result = typeRelatedToEachType(source, target, reportErrors);
+                        result = typeRelatedToEachType(getRegularTypeOfObjectLiteral(source), target, reportErrors);
+                        if (result && isPerformingExcessPropertyChecks) {
+                            // Validate against excess props using the original `source`
+                            if (!propertiesRelatedTo(source, target, reportErrors, /*excludedProperties*/ undefined)) {
+                                return 0 /* False */;
+                            }
+                        }
                     }
                     else if (source.flags & 2097152 /* Intersection */) {
                         // Check to see if any constituents of the intersection are immediately related to the target.
@@ -42446,8 +43332,15 @@ var ts;
                     }
                 }
                 if (!result && reportErrors) {
-                    var maybeSuppress = suppressNextError;
-                    suppressNextError = false;
+                    var maybeSuppress = overrideNextErrorInfo;
+                    overrideNextErrorInfo = undefined;
+                    if (source.flags & 524288 /* Object */ && target.flags & 524288 /* Object */) {
+                        var currentError = errorInfo;
+                        tryElaborateArrayLikeErrors(source, target, reportErrors);
+                        if (errorInfo !== currentError) {
+                            maybeSuppress = errorInfo;
+                        }
+                    }
                     if (source.flags & 524288 /* Object */ && target.flags & 131068 /* Primitive */) {
                         tryElaborateErrorsForPrimitivesAndObjects(source, target);
                     }
@@ -42501,7 +43394,7 @@ var ts;
                         // check excess properties against discriminant type only, not the entire union
                         return hasExcessProperties(source, discriminant, /*discriminant*/ undefined, reportErrors);
                     }
-                    var _loop_7 = function (prop) {
+                    var _loop_8 = function (prop) {
                         if (shouldCheckAsExcessProperty(prop, source.symbol) && !isKnownProperty(target, prop.escapedName, isComparingJsxAttributes)) {
                             if (reportErrors) {
                                 // Report error in terms of object types in the target as those are the only ones
@@ -42542,9 +43435,9 @@ var ts;
                             return { value: true };
                         }
                     };
-                    for (var _i = 0, _a = getPropertiesOfObjectType(source); _i < _a.length; _i++) {
+                    for (var _i = 0, _a = getPropertiesOfType(source); _i < _a.length; _i++) {
                         var prop = _a[_i];
-                        var state_3 = _loop_7(prop);
+                        var state_3 = _loop_8(prop);
                         if (typeof state_3 === "object")
                             return state_3.value;
                     }
@@ -42647,10 +43540,19 @@ var ts;
                 }
                 return bestMatch;
             }
+            function filterPrimitivesIfContainsNonPrimitive(type) {
+                if (maybeTypeOfKind(type, 67108864 /* NonPrimitive */)) {
+                    var result_3 = filterType(type, function (t) { return !(t.flags & 131068 /* Primitive */); });
+                    if (!(result_3.flags & 131072 /* Never */)) {
+                        return result_3;
+                    }
+                }
+                return type;
+            }
             // Keep this up-to-date with the same logic within `getApparentTypeOfContextualType`, since they should behave similarly
             function findMatchingDiscriminantType(source, target) {
-                if (target.flags & 1048576 /* Union */) {
-                    var sourceProperties = getPropertiesOfObjectType(source);
+                if (target.flags & 1048576 /* Union */ && source.flags & (2097152 /* Intersection */ | 524288 /* Object */)) {
+                    var sourceProperties = getPropertiesOfType(source);
                     if (sourceProperties) {
                         var sourcePropertiesFiltered = findDiscriminantProperties(sourceProperties, target);
                         if (sourcePropertiesFiltered) {
@@ -42713,13 +43615,20 @@ var ts;
                     // When variance information isn't available we default to covariance. This happens
                     // in the process of computing variance information for recursive types and when
                     // comparing 'this' type arguments.
-                    var variance = i < variances.length ? variances[i] : 1 /* Covariant */;
+                    var varianceFlags = i < variances.length ? variances[i] : 1 /* Covariant */;
+                    var variance = varianceFlags & 7 /* VarianceMask */;
                     // We ignore arguments for independent type parameters (because they're never witnessed).
                     if (variance !== 4 /* Independent */) {
                         var s = sources[i];
                         var t = targets[i];
                         var related = -1 /* True */;
-                        if (variance === 1 /* Covariant */) {
+                        if (varianceFlags & 8 /* Unmeasurable */) {
+                            // Even an `Unmeasurable` variance works out without a structural check if the source and target are _identical_.
+                            // We can't simply assume invariance, because `Unmeasurable` marks nonlinear relations, for example, a relation tained by
+                            // the `-?` modifier in a mapped type (where, no matter how the inputs are related, the outputs still might not be)
+                            related = relation === identityRelation ? isRelatedTo(s, t, /*reportErrors*/ false) : compareTypesIdentical(s, t);
+                        }
+                        else if (variance === 1 /* Covariant */) {
                             related = isRelatedTo(s, t, reportErrors);
                         }
                         else if (variance === 2 /* Contravariant */) {
@@ -42752,6 +43661,17 @@ var ts;
                 }
                 return result;
             }
+            function propagateSidebandVarianceFlags(typeArguments, variances) {
+                for (var i = 0; i < variances.length; i++) {
+                    var v = variances[i];
+                    if (v & 8 /* Unmeasurable */) {
+                        instantiateType(typeArguments[i], reportUnmeasurableMarkers);
+                    }
+                    if (v & 16 /* Unreliable */) {
+                        instantiateType(typeArguments[i], reportUnreliableMarkers);
+                    }
+                }
+            }
             // Determine if possibly recursive types are related. First, check if the result is already available in the global cache.
             // Second, check if we have already started a comparison of the given two types in which case we assume the result to be true.
             // Third, check if both types are part of deeply nested chains of generic type instantiations and if so assume the types are
@@ -42769,6 +43689,16 @@ var ts;
                         // as a failure, and should be updated as a reported failure by the bottom of this function.
                     }
                     else {
+                        if (outofbandVarianceMarkerHandler) {
+                            // We're in the middle of variance checking - integrate any unmeasurable/unreliable flags from this cached component
+                            if (source.flags & (524288 /* Object */ | 16777216 /* Conditional */) && source.aliasSymbol &&
+                                source.aliasTypeArguments && source.aliasSymbol === target.aliasSymbol) {
+                                propagateSidebandVarianceFlags(source.aliasTypeArguments, getAliasVariances(source.aliasSymbol));
+                            }
+                            if (ts.getObjectFlags(source) & 4 /* Reference */ && ts.getObjectFlags(target) & 4 /* Reference */ && source.target === target.target && ts.length(source.typeArguments)) {
+                                propagateSidebandVarianceFlags(source.typeArguments, getVariances(source.target));
+                            }
+                        }
                         return related === 1 /* Succeeded */ ? -1 /* True */ : 0 /* False */;
                     }
                 }
@@ -42826,21 +43756,21 @@ var ts;
                     if (flags & 4194304 /* Index */) {
                         return isRelatedTo(source.type, target.type, /*reportErrors*/ false);
                     }
-                    var result_3 = 0 /* False */;
+                    var result_4 = 0 /* False */;
                     if (flags & 8388608 /* IndexedAccess */) {
-                        if (result_3 = isRelatedTo(source.objectType, target.objectType, /*reportErrors*/ false)) {
-                            if (result_3 &= isRelatedTo(source.indexType, target.indexType, /*reportErrors*/ false)) {
-                                return result_3;
+                        if (result_4 = isRelatedTo(source.objectType, target.objectType, /*reportErrors*/ false)) {
+                            if (result_4 &= isRelatedTo(source.indexType, target.indexType, /*reportErrors*/ false)) {
+                                return result_4;
                             }
                         }
                     }
                     if (flags & 16777216 /* Conditional */) {
                         if (source.root.isDistributive === target.root.isDistributive) {
-                            if (result_3 = isRelatedTo(source.checkType, target.checkType, /*reportErrors*/ false)) {
-                                if (result_3 &= isRelatedTo(source.extendsType, target.extendsType, /*reportErrors*/ false)) {
-                                    if (result_3 &= isRelatedTo(getTrueTypeFromConditionalType(source), getTrueTypeFromConditionalType(target), /*reportErrors*/ false)) {
-                                        if (result_3 &= isRelatedTo(getFalseTypeFromConditionalType(source), getFalseTypeFromConditionalType(target), /*reportErrors*/ false)) {
-                                            return result_3;
+                            if (result_4 = isRelatedTo(source.checkType, target.checkType, /*reportErrors*/ false)) {
+                                if (result_4 &= isRelatedTo(source.extendsType, target.extendsType, /*reportErrors*/ false)) {
+                                    if (result_4 &= isRelatedTo(getTrueTypeFromConditionalType(source), getTrueTypeFromConditionalType(target), /*reportErrors*/ false)) {
+                                        if (result_4 &= isRelatedTo(getFalseTypeFromConditionalType(source), getFalseTypeFromConditionalType(target), /*reportErrors*/ false)) {
+                                            return result_4;
                                         }
                                     }
                                 }
@@ -42889,8 +43819,7 @@ var ts;
                     }
                     // A type S is assignable to keyof T if S is assignable to keyof C, where C is the
                     // simplified form of T or, if T doesn't simplify, the constraint of T.
-                    var simplified = getSimplifiedType(target.type);
-                    var constraint = simplified !== target.type ? simplified : getConstraintOfType(target.type);
+                    var constraint = getSimplifiedTypeOrConstraint(target.type);
                     if (constraint) {
                         // We require Ternary.True here such that circular constraints don't cause
                         // false positives. For example, given 'T extends { [K in keyof T]: string }',
@@ -42902,13 +43831,17 @@ var ts;
                     }
                 }
                 else if (target.flags & 8388608 /* IndexedAccess */) {
-                    // A type S is related to a type T[K], where T and K aren't both type variables, if S is related to C,
-                    // where C is the base constraint of T[K]
-                    if (relation !== identityRelation &&
-                        !(isGenericObjectType(target.objectType) && isGenericIndexType(target.indexType))) {
-                        var constraint = getBaseConstraintOfType(target);
-                        if (constraint && constraint !== target) {
-                            if (result = isRelatedTo(source, constraint, reportErrors)) {
+                    // A type S is related to a type T[K] if S is related to C, where C is the base
+                    // constraint of T[K] for writing.
+                    if (relation !== identityRelation) {
+                        var objectType = target.objectType;
+                        var indexType = target.indexType;
+                        var baseObjectType = getBaseConstraintOfType(objectType) || objectType;
+                        var baseIndexType = getBaseConstraintOfType(indexType) || indexType;
+                        if (!isGenericObjectType(baseObjectType) && !isGenericIndexType(baseIndexType)) {
+                            var accessFlags = 2 /* Writing */ | (baseObjectType !== objectType ? 1 /* NoIndexSignatures */ : 0);
+                            var constraint = getIndexedAccessTypeOrUndefined(baseObjectType, baseIndexType, /*accessNode*/ undefined, accessFlags);
+                            if (constraint && (result = isRelatedTo(source, constraint, reportErrors))) {
                                 return result;
                             }
                         }
@@ -42925,15 +43858,16 @@ var ts;
                         }
                         if (!isGenericMappedType(source)) {
                             var targetConstraint = getConstraintTypeFromMappedType(target);
-                            var sourceKeys_1 = getIndexType(source);
-                            var hasOptionalUnionKeys = modifiers & 4 /* IncludeOptional */ && targetConstraint.flags & 1048576 /* Union */;
-                            var filteredByApplicability = hasOptionalUnionKeys ? filterType(targetConstraint, function (t) { return !!isRelatedTo(t, sourceKeys_1); }) : undefined;
+                            var sourceKeys = getIndexType(source, /*stringsOnly*/ undefined, /*noIndexSignatures*/ true);
+                            var includeOptional = modifiers & 4 /* IncludeOptional */;
+                            var filteredByApplicability = includeOptional ? intersectTypes(targetConstraint, sourceKeys) : undefined;
                             // A source type T is related to a target type { [P in Q]: X } if Q is related to keyof T and T[Q] is related to X.
                             // A source type T is related to a target type { [P in Q]?: X } if some constituent Q' of Q is related to keyof T and T[Q'] is related to X.
-                            if (hasOptionalUnionKeys
+                            if (includeOptional
                                 ? !(filteredByApplicability.flags & 131072 /* Never */)
-                                : isRelatedTo(targetConstraint, sourceKeys_1)) {
-                                var indexingType = hasOptionalUnionKeys ? filteredByApplicability : getTypeParameterFromMappedType(target);
+                                : isRelatedTo(targetConstraint, sourceKeys)) {
+                                var typeParameter = getTypeParameterFromMappedType(target);
+                                var indexingType = filteredByApplicability ? getIntersectionType([filteredByApplicability, typeParameter]) : typeParameter;
                                 var indexedAccessType = getIndexedAccessType(source, indexingType);
                                 var templateType = getTemplateTypeFromMappedType(target);
                                 if (result = isRelatedTo(indexedAccessType, templateType, reportErrors)) {
@@ -42956,23 +43890,25 @@ var ts;
                             return result;
                         }
                     }
-                    var constraint = getConstraintOfType(source);
-                    if (!constraint || (source.flags & 262144 /* TypeParameter */ && constraint.flags & 1 /* Any */)) {
-                        // A type variable with no constraint is not related to the non-primitive object type.
-                        if (result = isRelatedTo(emptyObjectType, extractTypesOfKind(target, ~67108864 /* NonPrimitive */))) {
+                    else {
+                        var constraint = getConstraintOfType(source);
+                        if (!constraint || (source.flags & 262144 /* TypeParameter */ && constraint.flags & 1 /* Any */)) {
+                            // A type variable with no constraint is not related to the non-primitive object type.
+                            if (result = isRelatedTo(emptyObjectType, extractTypesOfKind(target, ~67108864 /* NonPrimitive */))) {
+                                errorInfo = saveErrorInfo;
+                                return result;
+                            }
+                        }
+                        // hi-speed no-this-instantiation check (less accurate, but avoids costly `this`-instantiation when the constraint will suffice), see #28231 for report on why this is needed
+                        else if (result = isRelatedTo(constraint, target, /*reportErrors*/ false, /*headMessage*/ undefined, isIntersectionConstituent)) {
+                            errorInfo = saveErrorInfo;
+                            return result;
+                        }
+                        // slower, fuller, this-instantiated check (necessary when comparing raw `this` types from base classes), see `subclassWithPolymorphicThisIsAssignable.ts` test for example
+                        else if (result = isRelatedTo(getTypeWithThisArgument(constraint, source), target, reportErrors, /*headMessage*/ undefined, isIntersectionConstituent)) {
                             errorInfo = saveErrorInfo;
                             return result;
                         }
-                    }
-                    // hi-speed no-this-instantiation check (less accurate, but avoids costly `this`-instantiation when the constraint will suffice), see #28231 for report on why this is needed
-                    else if (result = isRelatedTo(constraint, target, /*reportErrors*/ false, /*headMessage*/ undefined, isIntersectionConstituent)) {
-                        errorInfo = saveErrorInfo;
-                        return result;
-                    }
-                    // slower, fuller, this-instantiated check (necessary when comparing raw `this` types from base classes), see `subclassWithPolymorphicThisIsAssignable.ts` test for example
-                    else if (result = isRelatedTo(getTypeWithThisArgument(constraint, source), target, reportErrors, /*headMessage*/ undefined, isIntersectionConstituent)) {
-                        errorInfo = saveErrorInfo;
-                        return result;
                     }
                 }
                 else if (source.flags & 4194304 /* Index */) {
@@ -43032,6 +43968,9 @@ var ts;
                     if (relation !== identityRelation) {
                         source = getApparentType(source);
                     }
+                    else if (isGenericMappedType(source)) {
+                        return 0 /* False */;
+                    }
                     if (ts.getObjectFlags(source) & 4 /* Reference */ && ts.getObjectFlags(target) & 4 /* Reference */ && source.target === target.target &&
                         !(ts.getObjectFlags(source) & 8192 /* MarkerType */ || ts.getObjectFlags(target) & 8192 /* MarkerType */)) {
                         // We have type references to the same generic type, and the type references are not marker
@@ -43044,7 +43983,14 @@ var ts;
                         }
                     }
                     else if (isReadonlyArrayType(target) ? isArrayType(source) || isTupleType(source) : isArrayType(target) && isTupleType(source) && !source.target.readonly) {
-                        return isRelatedTo(getIndexTypeOfType(source, 1 /* Number */) || anyType, getIndexTypeOfType(target, 1 /* Number */) || anyType, reportErrors);
+                        if (relation !== identityRelation) {
+                            return isRelatedTo(getIndexTypeOfType(source, 1 /* Number */) || anyType, getIndexTypeOfType(target, 1 /* Number */) || anyType, reportErrors);
+                        }
+                        else {
+                            // By flags alone, we know that the `target` is a readonly array while the source is a normal array or tuple
+                            // or `target` is an array and source is a tuple - in both cases the types cannot be identical, by construction
+                            return 0 /* False */;
+                        }
                     }
                     // Consider a fresh empty object literal type "closed" under the subtype relationship - this way `{} <- {[idx: string]: any} <- fresh({})`
                     // and not `{} <- fresh({}) <- {[idx: string]: any}`
@@ -43059,7 +44005,7 @@ var ts;
                     if (source.flags & (524288 /* Object */ | 2097152 /* Intersection */) && target.flags & 524288 /* Object */) {
                         // Report structural errors only if we haven't reported any errors yet
                         var reportStructuralErrors = reportErrors && errorInfo === saveErrorInfo && !sourceIsPrimitive;
-                        result = propertiesRelatedTo(source, target, reportStructuralErrors);
+                        result = propertiesRelatedTo(source, target, reportStructuralErrors, /*excludedProperties*/ undefined);
                         if (result) {
                             result &= signaturesRelatedTo(source, target, 0 /* Call */, reportStructuralErrors);
                             if (result) {
@@ -43079,22 +44025,35 @@ var ts;
                             return result;
                         }
                     }
+                    // If S is an object type and T is a discriminated union, S may be related to T if
+                    // there exists a constituent of T for every combination of the discriminants of S
+                    // with respect to T. We do not report errors here, as we will use the existing
+                    // error result from checking each constituent of the union.
+                    if (source.flags & (524288 /* Object */ | 2097152 /* Intersection */) && target.flags & 1048576 /* Union */) {
+                        var objectOnlyTarget = extractTypesOfKind(target, 524288 /* Object */);
+                        if (objectOnlyTarget.flags & 1048576 /* Union */) {
+                            var result_5 = typeRelatedToDiscriminatedType(source, objectOnlyTarget);
+                            if (result_5) {
+                                return result_5;
+                            }
+                        }
+                    }
                 }
                 return 0 /* False */;
-                function isNonGeneric(type) {
-                    // If we're already in identity relationship checking, we should use `isRelatedTo`
-                    // to catch the `Maybe` from an excessively deep type (which we then assume means
-                    // that the type could possibly contain a generic)
-                    if (relation === identityRelation) {
-                        return isRelatedTo(type, getPermissiveInstantiation(type)) === -1 /* True */;
-                    }
-                    return isTypeIdenticalTo(type, getPermissiveInstantiation(type));
-                }
                 function relateVariances(sourceTypeArguments, targetTypeArguments, variances) {
                     if (result = typeArgumentsRelatedTo(sourceTypeArguments, targetTypeArguments, variances, reportErrors)) {
                         return result;
                     }
-                    var allowStructuralFallback = (targetTypeArguments && hasCovariantVoidArgument(targetTypeArguments, variances)) || isNonGeneric(source) || isNonGeneric(target);
+                    if (ts.some(variances, function (v) { return !!(v & 24 /* AllowsStructuralFallback */); })) {
+                        // If some type parameter was `Unmeasurable` or `Unreliable`, and we couldn't pass by assuming it was identical, then we
+                        // have to allow a structural fallback check
+                        // We elide the variance-based error elaborations, since those might not be too helpful, since we'll potentially
+                        // be assuming identity of the type parameter.
+                        originalErrorInfo = undefined;
+                        errorInfo = saveErrorInfo;
+                        return undefined;
+                    }
+                    var allowStructuralFallback = targetTypeArguments && hasCovariantVoidArgument(targetTypeArguments, variances);
                     varianceCheckFailed = !allowStructuralFallback;
                     // The type arguments did not relate appropriately, but it may be because we have no variance
                     // information (in which case typeArgumentsRelatedTo defaulted to covariance for all type
@@ -43112,7 +44071,7 @@ var ts;
                         // reveal the reason).
                         // We can switch on `reportErrors` here, since varianceCheckFailed guarantees we return `False`,
                         // we can return `False` early here to skip calculating the structural error message we don't need.
-                        if (varianceCheckFailed && !(reportErrors && ts.some(variances, function (v) { return v === 0 /* Invariant */; }))) {
+                        if (varianceCheckFailed && !(reportErrors && ts.some(variances, function (v) { return (v & 7 /* VarianceMask */) === 0 /* Invariant */; }))) {
                             return 0 /* False */;
                         }
                         // We remember the original error information so we can restore it in case the structural
@@ -43123,6 +44082,18 @@ var ts;
                     }
                 }
             }
+            function reportUnmeasurableMarkers(p) {
+                if (outofbandVarianceMarkerHandler && (p === markerSuperType || p === markerSubType || p === markerOtherType)) {
+                    outofbandVarianceMarkerHandler(/*onlyUnreliable*/ false);
+                }
+                return p;
+            }
+            function reportUnreliableMarkers(p) {
+                if (outofbandVarianceMarkerHandler && (p === markerSuperType || p === markerSubType || p === markerOtherType)) {
+                    outofbandVarianceMarkerHandler(/*onlyUnreliable*/ true);
+                }
+                return p;
+            }
             // A type [P in S]: X is related to a type [Q in T]: Y if T is related to S and X' is
             // related to Y, where X' is an instantiation of X in which P is replaced with Q. Notice
             // that S and T are contra-variant whereas X and Y are co-variant.
@@ -43130,45 +44101,281 @@ var ts;
                 var modifiersRelated = relation === comparableRelation || (relation === identityRelation ? getMappedTypeModifiers(source) === getMappedTypeModifiers(target) :
                     getCombinedMappedTypeOptionality(source) <= getCombinedMappedTypeOptionality(target));
                 if (modifiersRelated) {
-                    var result_4;
-                    if (result_4 = isRelatedTo(getConstraintTypeFromMappedType(target), getConstraintTypeFromMappedType(source), reportErrors)) {
+                    var result_6;
+                    var targetConstraint = getConstraintTypeFromMappedType(target);
+                    var sourceConstraint = instantiateType(getConstraintTypeFromMappedType(source), getCombinedMappedTypeOptionality(source) < 0 ? reportUnmeasurableMarkers : reportUnreliableMarkers);
+                    if (result_6 = isRelatedTo(targetConstraint, sourceConstraint, reportErrors)) {
                         var mapper = createTypeMapper([getTypeParameterFromMappedType(source)], [getTypeParameterFromMappedType(target)]);
-                        return result_4 & isRelatedTo(instantiateType(getTemplateTypeFromMappedType(source), mapper), getTemplateTypeFromMappedType(target), reportErrors);
+                        return result_6 & isRelatedTo(instantiateType(getTemplateTypeFromMappedType(source), mapper), getTemplateTypeFromMappedType(target), reportErrors);
                     }
                 }
                 return 0 /* False */;
             }
-            function propertiesRelatedTo(source, target, reportErrors) {
+            function typeRelatedToDiscriminatedType(source, target) {
+                // 1. Generate the combinations of discriminant properties & types 'source' can satisfy.
+                //    a. If the number of combinations is above a set limit, the comparison is too complex.
+                // 2. Filter 'target' to the subset of types whose discriminants exist in the matrix.
+                //    a. If 'target' does not satisfy all discriminants in the matrix, 'source' is not related.
+                // 3. For each type in the filtered 'target', determine if all non-discriminant properties of
+                //    'target' are related to a property in 'source'.
+                //
+                // NOTE: See ~/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithDiscriminatedUnion.ts
+                //       for examples.
+                var sourceProperties = getPropertiesOfObjectType(source);
+                var sourcePropertiesFiltered = findDiscriminantProperties(sourceProperties, target);
+                if (!sourcePropertiesFiltered)
+                    return 0 /* False */;
+                // Though we could compute the number of combinations as we generate
+                // the matrix, this would incur additional memory overhead due to
+                // array allocations. To reduce this overhead, we first compute
+                // the number of combinations to ensure we will not surpass our
+                // fixed limit before incurring the cost of any allocations:
+                var numCombinations = 1;
+                for (var _i = 0, sourcePropertiesFiltered_1 = sourcePropertiesFiltered; _i < sourcePropertiesFiltered_1.length; _i++) {
+                    var sourceProperty = sourcePropertiesFiltered_1[_i];
+                    numCombinations *= countTypes(getTypeOfSymbol(sourceProperty));
+                    if (numCombinations > 25) {
+                        // We've reached the complexity limit.
+                        return 0 /* False */;
+                    }
+                }
+                // Compute the set of types for each discriminant property.
+                var sourceDiscriminantTypes = new Array(sourcePropertiesFiltered.length);
+                var excludedProperties = ts.createUnderscoreEscapedMap();
+                for (var i = 0; i < sourcePropertiesFiltered.length; i++) {
+                    var sourceProperty = sourcePropertiesFiltered[i];
+                    var sourcePropertyType = getTypeOfSymbol(sourceProperty);
+                    sourceDiscriminantTypes[i] = sourcePropertyType.flags & 1048576 /* Union */
+                        ? sourcePropertyType.types
+                        : [sourcePropertyType];
+                    excludedProperties.set(sourceProperty.escapedName, true);
+                }
+                // Match each combination of the cartesian product of discriminant properties to one or more
+                // constituents of 'target'. If any combination does not have a match then 'source' is not relatable.
+                var discriminantCombinations = ts.cartesianProduct(sourceDiscriminantTypes);
+                var matchingTypes = [];
+                var _loop_9 = function (combination) {
+                    var hasMatch = false;
+                    outer: for (var _i = 0, _a = target.types; _i < _a.length; _i++) {
+                        var type = _a[_i];
+                        var _loop_10 = function (i) {
+                            var sourceProperty = sourcePropertiesFiltered[i];
+                            var targetProperty = getPropertyOfObjectType(type, sourceProperty.escapedName);
+                            if (!targetProperty)
+                                return "continue-outer";
+                            if (sourceProperty === targetProperty)
+                                return "continue";
+                            // We compare the source property to the target in the context of a single discriminant type.
+                            var related = propertyRelatedTo(source, target, sourceProperty, targetProperty, function (_) { return combination[i]; }, /*reportErrors*/ false);
+                            // If the target property could not be found, or if the properties were not related,
+                            // then this constituent is not a match.
+                            if (!related) {
+                                return "continue-outer";
+                            }
+                        };
+                        for (var i = 0; i < sourcePropertiesFiltered.length; i++) {
+                            var state_5 = _loop_10(i);
+                            switch (state_5) {
+                                case "continue-outer": continue outer;
+                            }
+                        }
+                        ts.pushIfUnique(matchingTypes, type, ts.equateValues);
+                        hasMatch = true;
+                    }
+                    if (!hasMatch) {
+                        return { value: 0 /* False */ };
+                    }
+                };
+                for (var _a = 0, discriminantCombinations_1 = discriminantCombinations; _a < discriminantCombinations_1.length; _a++) {
+                    var combination = discriminantCombinations_1[_a];
+                    var state_4 = _loop_9(combination);
+                    if (typeof state_4 === "object")
+                        return state_4.value;
+                }
+                // Compare the remaining non-discriminant properties of each match.
+                var result = -1 /* True */;
+                for (var _b = 0, matchingTypes_1 = matchingTypes; _b < matchingTypes_1.length; _b++) {
+                    var type = matchingTypes_1[_b];
+                    result &= propertiesRelatedTo(source, type, /*reportErrors*/ false, excludedProperties);
+                    if (result) {
+                        result &= signaturesRelatedTo(source, type, 0 /* Call */, /*reportStructuralErrors*/ false);
+                        if (result) {
+                            result &= signaturesRelatedTo(source, type, 1 /* Construct */, /*reportStructuralErrors*/ false);
+                            if (result) {
+                                result &= indexTypesRelatedTo(source, type, 0 /* String */, /*sourceIsPrimitive*/ false, /*reportStructuralErrors*/ false);
+                                if (result) {
+                                    result &= indexTypesRelatedTo(source, type, 1 /* Number */, /*sourceIsPrimitive*/ false, /*reportStructuralErrors*/ false);
+                                }
+                            }
+                        }
+                    }
+                    if (!result) {
+                        return result;
+                    }
+                }
+                return result;
+            }
+            function excludeProperties(properties, excludedProperties) {
+                if (!excludedProperties || properties.length === 0)
+                    return properties;
+                var result;
+                for (var i = 0; i < properties.length; i++) {
+                    if (!excludedProperties.has(properties[i].escapedName)) {
+                        if (result) {
+                            result.push(properties[i]);
+                        }
+                    }
+                    else if (!result) {
+                        result = properties.slice(0, i);
+                    }
+                }
+                return result || properties;
+            }
+            function isPropertySymbolTypeRelated(sourceProp, targetProp, getTypeOfSourceProperty, reportErrors) {
+                var targetIsOptional = strictNullChecks && !!(ts.getCheckFlags(targetProp) & 48 /* Partial */);
+                var source = getTypeOfSourceProperty(sourceProp);
+                if (ts.getCheckFlags(targetProp) & 65536 /* DeferredType */ && !getSymbolLinks(targetProp).type) {
+                    // Rather than resolving (and normalizing) the type, relate constituent-by-constituent without performing normalization or seconadary passes
+                    var links = getSymbolLinks(targetProp);
+                    ts.Debug.assertDefined(links.deferralParent);
+                    ts.Debug.assertDefined(links.deferralConstituents);
+                    var unionParent = !!(links.deferralParent.flags & 1048576 /* Union */);
+                    var result_7 = unionParent ? 0 /* False */ : -1 /* True */;
+                    var targetTypes = links.deferralConstituents;
+                    for (var _i = 0, targetTypes_3 = targetTypes; _i < targetTypes_3.length; _i++) {
+                        var targetType = targetTypes_3[_i];
+                        var related = isRelatedTo(source, targetType, /*reportErrors*/ false, /*headMessage*/ undefined, /*isIntersectionConstituent*/ !unionParent);
+                        if (!unionParent) {
+                            if (!related) {
+                                // Can't assign to a target individually - have to fallback to assigning to the _whole_ intersection (which forces normalization)
+                                return isRelatedTo(source, addOptionality(getTypeOfSymbol(targetProp), targetIsOptional), reportErrors);
+                            }
+                            result_7 &= related;
+                        }
+                        else {
+                            if (related) {
+                                return related;
+                            }
+                        }
+                    }
+                    if (unionParent && !result_7 && targetIsOptional) {
+                        result_7 = isRelatedTo(source, undefinedType);
+                    }
+                    if (unionParent && !result_7 && reportErrors) {
+                        // The easiest way to get the right errors here is to un-defer (which may be costly)
+                        // If it turns out this is too costly too often, we can replicate the error handling logic within
+                        // typeRelatedToSomeType without the discriminatable type branch (as that requires a manifest union
+                        // type on which to hand discriminable properties, which we are expressly trying to avoid here)
+                        return isRelatedTo(source, addOptionality(getTypeOfSymbol(targetProp), targetIsOptional), reportErrors);
+                    }
+                    return result_7;
+                }
+                else {
+                    return isRelatedTo(source, addOptionality(getTypeOfSymbol(targetProp), targetIsOptional), reportErrors);
+                }
+            }
+            function propertyRelatedTo(source, target, sourceProp, targetProp, getTypeOfSourceProperty, reportErrors) {
+                var sourcePropFlags = ts.getDeclarationModifierFlagsFromSymbol(sourceProp);
+                var targetPropFlags = ts.getDeclarationModifierFlagsFromSymbol(targetProp);
+                if (sourcePropFlags & 8 /* Private */ || targetPropFlags & 8 /* Private */) {
+                    var hasDifferingDeclarations = sourceProp.valueDeclaration !== targetProp.valueDeclaration;
+                    if (ts.getCheckFlags(sourceProp) & 1024 /* ContainsPrivate */ && hasDifferingDeclarations) {
+                        if (reportErrors) {
+                            reportError(ts.Diagnostics.Property_0_has_conflicting_declarations_and_is_inaccessible_in_type_1, symbolToString(sourceProp), typeToString(source));
+                        }
+                        return 0 /* False */;
+                    }
+                    if (hasDifferingDeclarations) {
+                        if (reportErrors) {
+                            if (sourcePropFlags & 8 /* Private */ && targetPropFlags & 8 /* Private */) {
+                                reportError(ts.Diagnostics.Types_have_separate_declarations_of_a_private_property_0, symbolToString(targetProp));
+                            }
+                            else {
+                                reportError(ts.Diagnostics.Property_0_is_private_in_type_1_but_not_in_type_2, symbolToString(targetProp), typeToString(sourcePropFlags & 8 /* Private */ ? source : target), typeToString(sourcePropFlags & 8 /* Private */ ? target : source));
+                            }
+                        }
+                        return 0 /* False */;
+                    }
+                }
+                else if (targetPropFlags & 16 /* Protected */) {
+                    if (!isValidOverrideOf(sourceProp, targetProp)) {
+                        if (reportErrors) {
+                            reportError(ts.Diagnostics.Property_0_is_protected_but_type_1_is_not_a_class_derived_from_2, symbolToString(targetProp), typeToString(getDeclaringClass(sourceProp) || source), typeToString(getDeclaringClass(targetProp) || target));
+                        }
+                        return 0 /* False */;
+                    }
+                }
+                else if (sourcePropFlags & 16 /* Protected */) {
+                    if (reportErrors) {
+                        reportError(ts.Diagnostics.Property_0_is_protected_in_type_1_but_public_in_type_2, symbolToString(targetProp), typeToString(source), typeToString(target));
+                    }
+                    return 0 /* False */;
+                }
+                // If the target comes from a partial union prop, allow `undefined` in the target type
+                var related = isPropertySymbolTypeRelated(sourceProp, targetProp, getTypeOfSourceProperty, reportErrors);
+                if (!related) {
+                    if (reportErrors) {
+                        reportError(ts.Diagnostics.Types_of_property_0_are_incompatible, symbolToString(targetProp));
+                    }
+                    return 0 /* False */;
+                }
+                // When checking for comparability, be more lenient with optional properties.
+                if (relation !== comparableRelation && sourceProp.flags & 16777216 /* Optional */ && !(targetProp.flags & 16777216 /* Optional */)) {
+                    // TypeScript 1.0 spec (April 2014): 3.8.3
+                    // S is a subtype of a type T, and T is a supertype of S if ...
+                    // S' and T are object types and, for each member M in T..
+                    // M is a property and S' contains a property N where
+                    // if M is a required property, N is also a required property
+                    // (M - property in T)
+                    // (N - property in S)
+                    if (reportErrors) {
+                        reportError(ts.Diagnostics.Property_0_is_optional_in_type_1_but_required_in_type_2, symbolToString(targetProp), typeToString(source), typeToString(target));
+                    }
+                    return 0 /* False */;
+                }
+                return related;
+            }
+            function propertiesRelatedTo(source, target, reportErrors, excludedProperties) {
                 if (relation === identityRelation) {
-                    return propertiesIdenticalTo(source, target);
+                    return propertiesIdenticalTo(source, target, excludedProperties);
                 }
                 var requireOptionalProperties = relation === subtypeRelation && !isObjectLiteralType(source) && !isEmptyArrayLiteralType(source) && !isTupleType(source);
                 var unmatchedProperty = getUnmatchedProperty(source, target, requireOptionalProperties, /*matchDiscriminantProperties*/ false);
                 if (unmatchedProperty) {
                     if (reportErrors) {
                         var props = ts.arrayFrom(getUnmatchedProperties(source, target, requireOptionalProperties, /*matchDiscriminantProperties*/ false));
+                        var shouldSkipElaboration = false;
                         if (!headMessage || (headMessage.code !== ts.Diagnostics.Class_0_incorrectly_implements_interface_1.code &&
                             headMessage.code !== ts.Diagnostics.Class_0_incorrectly_implements_class_1_Did_you_mean_to_extend_1_and_inherit_its_members_as_a_subclass.code)) {
-                            suppressNextError = true; // Retain top-level error for interface implementing issues, otherwise omit it
+                            shouldSkipElaboration = true; // Retain top-level error for interface implementing issues, otherwise omit it
                         }
                         if (props.length === 1) {
                             var propName = symbolToString(unmatchedProperty);
-                            reportError(ts.Diagnostics.Property_0_is_missing_in_type_1_but_required_in_type_2, propName, typeToString(source), typeToString(target));
+                            reportError.apply(void 0, [ts.Diagnostics.Property_0_is_missing_in_type_1_but_required_in_type_2, propName].concat(getTypeNamesForErrorDisplay(source, target)));
                             if (ts.length(unmatchedProperty.declarations)) {
                                 associateRelatedInfo(ts.createDiagnosticForNode(unmatchedProperty.declarations[0], ts.Diagnostics._0_is_declared_here, propName));
                             }
+                            if (shouldSkipElaboration) {
+                                overrideNextErrorInfo = errorInfo;
+                            }
                         }
-                        else if (props.length > 5) { // arbitrary cutoff for too-long list form
-                            reportError(ts.Diagnostics.Type_0_is_missing_the_following_properties_from_type_1_Colon_2_and_3_more, typeToString(source), typeToString(target), ts.map(props.slice(0, 4), function (p) { return symbolToString(p); }).join(", "), props.length - 4);
-                        }
-                        else {
-                            reportError(ts.Diagnostics.Type_0_is_missing_the_following_properties_from_type_1_Colon_2, typeToString(source), typeToString(target), ts.map(props, function (p) { return symbolToString(p); }).join(", "));
+                        else if (tryElaborateArrayLikeErrors(source, target, /*reportErrors*/ false)) {
+                            if (props.length > 5) { // arbitrary cutoff for too-long list form
+                                reportError(ts.Diagnostics.Type_0_is_missing_the_following_properties_from_type_1_Colon_2_and_3_more, typeToString(source), typeToString(target), ts.map(props.slice(0, 4), function (p) { return symbolToString(p); }).join(", "), props.length - 4);
+                            }
+                            else {
+                                reportError(ts.Diagnostics.Type_0_is_missing_the_following_properties_from_type_1_Colon_2, typeToString(source), typeToString(target), ts.map(props, function (p) { return symbolToString(p); }).join(", "));
+                            }
+                            if (shouldSkipElaboration) {
+                                overrideNextErrorInfo = errorInfo;
+                            }
                         }
+                        // ELSE: No array like or unmatched property error - just issue top level error (errorInfo = undefined)
                     }
                     return 0 /* False */;
                 }
                 if (isObjectLiteralType(target)) {
-                    for (var _i = 0, _a = getPropertiesOfType(source); _i < _a.length; _i++) {
+                    for (var _i = 0, _a = excludeProperties(getPropertiesOfType(source), excludedProperties); _i < _a.length; _i++) {
                         var sourceProp = _a[_i];
                         if (!getPropertyOfObjectType(target, sourceProp.escapedName)) {
                             var sourceType = getTypeOfSymbol(sourceProp);
@@ -43209,84 +44416,30 @@ var ts;
                         }
                     }
                 }
-                var properties = getPropertiesOfObjectType(target);
-                for (var _b = 0, properties_2 = properties; _b < properties_2.length; _b++) {
-                    var targetProp = properties_2[_b];
+                // We only call this for union target types when we're attempting to do excess property checking - in those cases, we want to get _all possible props_
+                // from the target union, across all members
+                var properties = target.flags & 1048576 /* Union */ ? getPossiblePropertiesOfUnionType(target) : getPropertiesOfType(target);
+                for (var _b = 0, _c = excludeProperties(properties, excludedProperties); _b < _c.length; _b++) {
+                    var targetProp = _c[_b];
                     if (!(targetProp.flags & 4194304 /* Prototype */)) {
                         var sourceProp = getPropertyOfType(source, targetProp.escapedName);
                         if (sourceProp && sourceProp !== targetProp) {
-                            if (isIgnoredJsxProperty(source, sourceProp, getTypeOfSymbol(targetProp))) {
-                                continue;
-                            }
-                            var sourcePropFlags = ts.getDeclarationModifierFlagsFromSymbol(sourceProp);
-                            var targetPropFlags = ts.getDeclarationModifierFlagsFromSymbol(targetProp);
-                            if (sourcePropFlags & 8 /* Private */ || targetPropFlags & 8 /* Private */) {
-                                var hasDifferingDeclarations = sourceProp.valueDeclaration !== targetProp.valueDeclaration;
-                                if (ts.getCheckFlags(sourceProp) & 512 /* ContainsPrivate */ && hasDifferingDeclarations) {
-                                    if (reportErrors) {
-                                        reportError(ts.Diagnostics.Property_0_has_conflicting_declarations_and_is_inaccessible_in_type_1, symbolToString(sourceProp), typeToString(source));
-                                    }
-                                    return 0 /* False */;
-                                }
-                                if (hasDifferingDeclarations) {
-                                    if (reportErrors) {
-                                        if (sourcePropFlags & 8 /* Private */ && targetPropFlags & 8 /* Private */) {
-                                            reportError(ts.Diagnostics.Types_have_separate_declarations_of_a_private_property_0, symbolToString(targetProp));
-                                        }
-                                        else {
-                                            reportError(ts.Diagnostics.Property_0_is_private_in_type_1_but_not_in_type_2, symbolToString(targetProp), typeToString(sourcePropFlags & 8 /* Private */ ? source : target), typeToString(sourcePropFlags & 8 /* Private */ ? target : source));
-                                        }
-                                    }
-                                    return 0 /* False */;
-                                }
-                            }
-                            else if (targetPropFlags & 16 /* Protected */) {
-                                if (!isValidOverrideOf(sourceProp, targetProp)) {
-                                    if (reportErrors) {
-                                        reportError(ts.Diagnostics.Property_0_is_protected_but_type_1_is_not_a_class_derived_from_2, symbolToString(targetProp), typeToString(getDeclaringClass(sourceProp) || source), typeToString(getDeclaringClass(targetProp) || target));
-                                    }
-                                    return 0 /* False */;
-                                }
-                            }
-                            else if (sourcePropFlags & 16 /* Protected */) {
-                                if (reportErrors) {
-                                    reportError(ts.Diagnostics.Property_0_is_protected_in_type_1_but_public_in_type_2, symbolToString(targetProp), typeToString(source), typeToString(target));
-                                }
-                                return 0 /* False */;
-                            }
-                            var related = isRelatedTo(getTypeOfSymbol(sourceProp), getTypeOfSymbol(targetProp), reportErrors);
+                            var related = propertyRelatedTo(source, target, sourceProp, targetProp, getTypeOfSymbol, reportErrors);
                             if (!related) {
-                                if (reportErrors) {
-                                    reportError(ts.Diagnostics.Types_of_property_0_are_incompatible, symbolToString(targetProp));
-                                }
                                 return 0 /* False */;
                             }
                             result &= related;
-                            // When checking for comparability, be more lenient with optional properties.
-                            if (relation !== comparableRelation && sourceProp.flags & 16777216 /* Optional */ && !(targetProp.flags & 16777216 /* Optional */)) {
-                                // TypeScript 1.0 spec (April 2014): 3.8.3
-                                // S is a subtype of a type T, and T is a supertype of S if ...
-                                // S' and T are object types and, for each member M in T..
-                                // M is a property and S' contains a property N where
-                                // if M is a required property, N is also a required property
-                                // (M - property in T)
-                                // (N - property in S)
-                                if (reportErrors) {
-                                    reportError(ts.Diagnostics.Property_0_is_optional_in_type_1_but_required_in_type_2, symbolToString(targetProp), typeToString(source), typeToString(target));
-                                }
-                                return 0 /* False */;
-                            }
                         }
                     }
                 }
                 return result;
             }
-            function propertiesIdenticalTo(source, target) {
+            function propertiesIdenticalTo(source, target, excludedProperties) {
                 if (!(source.flags & 524288 /* Object */ && target.flags & 524288 /* Object */)) {
                     return 0 /* False */;
                 }
-                var sourceProperties = getPropertiesOfObjectType(source);
-                var targetProperties = getPropertiesOfObjectType(target);
+                var sourceProperties = excludeProperties(getPropertiesOfObjectType(source), excludedProperties);
+                var targetProperties = excludeProperties(getPropertiesOfObjectType(target), excludedProperties);
                 if (sourceProperties.length !== targetProperties.length) {
                     return 0 /* False */;
                 }
@@ -43406,7 +44559,7 @@ var ts;
                 var result = -1 /* True */;
                 for (var _i = 0, _a = getPropertiesOfObjectType(source); _i < _a.length; _i++) {
                     var prop = _a[_i];
-                    if (isIgnoredJsxProperty(source, prop, /*targetMemberType*/ undefined)) {
+                    if (isIgnoredJsxProperty(source, prop)) {
                         continue;
                     }
                     // Skip over symbol-named members
@@ -43438,7 +44591,7 @@ var ts;
                     return indexTypesIdenticalTo(source, target, kind);
                 }
                 var targetInfo = getIndexInfoOfType(target, kind);
-                if (!targetInfo || targetInfo.type.flags & 3 /* AnyOrUnknown */ && !sourceIsPrimitive) {
+                if (!targetInfo || targetInfo.type.flags & 1 /* Any */ && !sourceIsPrimitive) {
                     // Index signature of type any permits assignment from everything but primitives
                     return -1 /* True */;
                 }
@@ -43578,8 +44731,11 @@ var ts;
                 // The emptyArray singleton is used to signal a recursive invocation.
                 cache.variances = ts.emptyArray;
                 variances = [];
-                for (var _i = 0, typeParameters_1 = typeParameters; _i < typeParameters_1.length; _i++) {
-                    var tp = typeParameters_1[_i];
+                var _loop_11 = function (tp) {
+                    var unmeasurable = false;
+                    var unreliable = false;
+                    var oldHandler = outofbandVarianceMarkerHandler;
+                    outofbandVarianceMarkerHandler = function (onlyUnreliable) { return onlyUnreliable ? unreliable = true : unmeasurable = true; };
                     // We first compare instantiations where the type parameter is replaced with
                     // marker types that have a known subtype relationship. From this we can infer
                     // invariance, covariance, contravariance or bivariance.
@@ -43594,7 +44750,20 @@ var ts;
                     if (variance === 3 /* Bivariant */ && isTypeAssignableTo(createMarkerType(cache, tp, markerOtherType), typeWithSuper)) {
                         variance = 4 /* Independent */;
                     }
+                    outofbandVarianceMarkerHandler = oldHandler;
+                    if (unmeasurable || unreliable) {
+                        if (unmeasurable) {
+                            variance |= 8 /* Unmeasurable */;
+                        }
+                        if (unreliable) {
+                            variance |= 16 /* Unreliable */;
+                        }
+                    }
                     variances.push(variance);
+                };
+                for (var _i = 0, typeParameters_1 = typeParameters; _i < typeParameters_1.length; _i++) {
+                    var tp = typeParameters_1[_i];
+                    _loop_11(tp);
                 }
                 cache.variances = variances;
             }
@@ -43611,7 +44780,7 @@ var ts;
         // See comment at call in recursiveTypeRelatedTo for when this case matters.
         function hasCovariantVoidArgument(typeArguments, variances) {
             for (var i = 0; i < variances.length; i++) {
-                if (variances[i] === 1 /* Covariant */ && typeArguments[i].flags & 16384 /* Void */) {
+                if ((variances[i] & 7 /* VarianceMask */) === 1 /* Covariant */ && typeArguments[i].flags & 16384 /* Void */) {
                     return true;
                 }
             }
@@ -43789,18 +44958,24 @@ var ts;
             if (!(isMatchingSignature(source, target, partialMatch))) {
                 return 0 /* False */;
             }
-            // Check that the two signatures have the same number of type parameters. We might consider
-            // also checking that any type parameter constraints match, but that would require instantiating
-            // the constraints with a common set of type arguments to get relatable entities in places where
-            // type parameters occur in the constraints. The complexity of doing that doesn't seem worthwhile,
-            // particularly as we're comparing erased versions of the signatures below.
+            // Check that the two signatures have the same number of type parameters.
             if (ts.length(source.typeParameters) !== ts.length(target.typeParameters)) {
                 return 0 /* False */;
             }
-            // Spec 1.0 Section 3.8.3 & 3.8.4:
-            // M and N (the signatures) are instantiated using type Any as the type argument for all type parameters declared by M and N
-            source = getErasedSignature(source);
-            target = getErasedSignature(target);
+            // Check that type parameter constraints and defaults match. If they do, instantiate the source
+            // signature with the type parameters of the target signature and continue the comparison.
+            if (target.typeParameters) {
+                var mapper = createTypeMapper(source.typeParameters, target.typeParameters);
+                for (var i = 0; i < target.typeParameters.length; i++) {
+                    var s = source.typeParameters[i];
+                    var t = target.typeParameters[i];
+                    if (!(s === t || compareTypes(instantiateType(getConstraintFromTypeParameter(s), mapper) || unknownType, getConstraintFromTypeParameter(t) || unknownType) &&
+                        compareTypes(instantiateType(getDefaultFromTypeParameter(s), mapper) || unknownType, getDefaultFromTypeParameter(t) || unknownType))) {
+                        return 0 /* False */;
+                    }
+                }
+                source = instantiateSignature(source, mapper, /*eraseTypeParameters*/ true);
+            }
             var result = -1 /* True */;
             if (!ignoreThisTypes) {
                 var sourceThisType = getThisTypeOfSignature(source);
@@ -43902,7 +45077,7 @@ var ts;
             if (propType) {
                 return propType;
             }
-            if (everyType(type, isTupleType) && !everyType(type, function (t) { return !t.target.hasRestElement; })) {
+            if (everyType(type, isTupleType)) {
                 return mapType(type, function (t) { return getRestTypeOfTupleType(t) || undefinedType; });
             }
             return undefined;
@@ -43947,6 +45122,23 @@ var ts;
             }
             return type;
         }
+        function getWidenedLiteralLikeTypeForContextualReturnTypeIfNeeded(type, contextualSignatureReturnType, isAsync) {
+            if (type && isUnitType(type)) {
+                var contextualType = !contextualSignatureReturnType ? undefined :
+                    isAsync ? getPromisedTypeOfPromise(contextualSignatureReturnType) :
+                        contextualSignatureReturnType;
+                type = getWidenedLiteralLikeTypeForContextualType(type, contextualType);
+            }
+            return type;
+        }
+        function getWidenedLiteralLikeTypeForContextualIterationTypeIfNeeded(type, contextualSignatureReturnType, kind, isAsyncGenerator) {
+            if (type && isUnitType(type)) {
+                var contextualType = !contextualSignatureReturnType ? undefined :
+                    getIterationTypeOfGeneratorFunctionReturnType(kind, contextualSignatureReturnType, isAsyncGenerator);
+                type = getWidenedLiteralLikeTypeForContextualType(type, contextualType);
+            }
+            return type;
+        }
         /**
          * Check if a Type was written as a tuple type literal.
          * Prefer using isTupleLikeType() unless the use of `elementTypes` is required.
@@ -44036,16 +45228,40 @@ var ts;
         function getNonNullableType(type) {
             return strictNullChecks ? getGlobalNonNullableTypeInstantiation(type) : type;
         }
+        /**
+         * Is source potentially coercible to target type under `==`.
+         * Assumes that `source` is a constituent of a union, hence
+         * the boolean literal flag on the LHS, but not on the RHS.
+         *
+         * This does not fully replicate the semantics of `==`. The
+         * intention is to catch cases that are clearly not right.
+         *
+         * Comparing (string | number) to number should not remove the
+         * string element.
+         *
+         * Comparing (string | number) to 1 will remove the string
+         * element, though this is not sound. This is a pragmatic
+         * choice.
+         *
+         * @see narrowTypeByEquality
+         *
+         * @param source
+         * @param target
+         */
+        function isCoercibleUnderDoubleEquals(source, target) {
+            return ((source.flags & (8 /* Number */ | 4 /* String */ | 512 /* BooleanLiteral */)) !== 0)
+                && ((target.flags & (8 /* Number */ | 4 /* String */ | 16 /* Boolean */)) !== 0);
+        }
         /**
          * Return true if type was inferred from an object literal, written as an object type literal, or is the shape of a module
          * with no call or construct signatures.
          */
         function isObjectTypeWithInferableIndex(type) {
-            return type.symbol && (type.symbol.flags & (4096 /* ObjectLiteral */ | 2048 /* TypeLiteral */ | 512 /* ValueModule */)) !== 0 &&
+            return type.symbol && (type.symbol.flags & (4096 /* ObjectLiteral */ | 2048 /* TypeLiteral */ | 384 /* Enum */ | 512 /* ValueModule */)) !== 0 &&
                 !typeHasCallOrConstructSignatures(type);
         }
         function createSymbolWithType(source, type) {
-            var symbol = createSymbol(source.flags, source.escapedName);
+            var symbol = createSymbol(source.flags, source.escapedName, ts.getCheckFlags(source) & 8 /* Readonly */);
             symbol.declarations = source.declarations;
             symbol.parent = source.parent;
             symbol.type = type;
@@ -44164,34 +45380,42 @@ var ts;
             var stringIndexInfo = getIndexInfoOfType(type, 0 /* String */);
             var numberIndexInfo = getIndexInfoOfType(type, 1 /* Number */);
             var result = createAnonymousType(type.symbol, members, ts.emptyArray, ts.emptyArray, stringIndexInfo && createIndexInfo(getWidenedType(stringIndexInfo.type), stringIndexInfo.isReadonly), numberIndexInfo && createIndexInfo(getWidenedType(numberIndexInfo.type), numberIndexInfo.isReadonly));
-            result.objectFlags |= (ts.getObjectFlags(type) & 16384 /* JSLiteral */); // Retain js literal flag through widening
+            result.objectFlags |= (ts.getObjectFlags(type) & (16384 /* JSLiteral */ | 1048576 /* NonInferrableType */)); // Retain js literal flag through widening
             return result;
         }
         function getWidenedType(type) {
             return getWidenedTypeWithContext(type, /*context*/ undefined);
         }
         function getWidenedTypeWithContext(type, context) {
-            if (ts.getObjectFlags(type) & 393216 /* RequiresWidening */) {
+            if (ts.getObjectFlags(type) & 786432 /* RequiresWidening */) {
+                if (context === undefined && type.widened) {
+                    return type.widened;
+                }
+                var result = void 0;
                 if (type.flags & 98304 /* Nullable */) {
-                    return anyType;
+                    result = anyType;
                 }
-                if (isObjectLiteralType(type)) {
-                    return getWidenedTypeOfObjectLiteral(type, context);
+                else if (isObjectLiteralType(type)) {
+                    result = getWidenedTypeOfObjectLiteral(type, context);
                 }
-                if (type.flags & 1048576 /* Union */) {
+                else if (type.flags & 1048576 /* Union */) {
                     var unionContext_1 = context || createWideningContext(/*parent*/ undefined, /*propertyName*/ undefined, type.types);
                     var widenedTypes = ts.sameMap(type.types, function (t) { return t.flags & 98304 /* Nullable */ ? t : getWidenedTypeWithContext(t, unionContext_1); });
                     // Widening an empty object literal transitions from a highly restrictive type to
                     // a highly inclusive one. For that reason we perform subtype reduction here if the
                     // union includes empty object types (e.g. reducing {} | string to just {}).
-                    return getUnionType(widenedTypes, ts.some(widenedTypes, isEmptyObjectType) ? 2 /* Subtype */ : 1 /* Literal */);
+                    result = getUnionType(widenedTypes, ts.some(widenedTypes, isEmptyObjectType) ? 2 /* Subtype */ : 1 /* Literal */);
                 }
-                if (type.flags & 2097152 /* Intersection */) {
-                    return getIntersectionType(ts.sameMap(type.types, getWidenedType));
+                else if (type.flags & 2097152 /* Intersection */) {
+                    result = getIntersectionType(ts.sameMap(type.types, getWidenedType));
                 }
-                if (isArrayType(type) || isTupleType(type)) {
-                    return createTypeReference(type.target, ts.sameMap(type.typeArguments, getWidenedType));
+                else if (isArrayType(type) || isTupleType(type)) {
+                    result = createTypeReference(type.target, ts.sameMap(type.typeArguments, getWidenedType));
                 }
+                if (result && context === undefined) {
+                    type.widened = result;
+                }
+                return result || type;
             }
             return type;
         }
@@ -44208,7 +45432,7 @@ var ts;
          */
         function reportWideningErrorsInType(type) {
             var errorReported = false;
-            if (ts.getObjectFlags(type) & 131072 /* ContainsWideningType */) {
+            if (ts.getObjectFlags(type) & 262144 /* ContainsWideningType */) {
                 if (type.flags & 1048576 /* Union */) {
                     if (ts.some(type.types, isEmptyObjectType)) {
                         errorReported = true;
@@ -44234,7 +45458,7 @@ var ts;
                     for (var _d = 0, _e = getPropertiesOfObjectType(type); _d < _e.length; _d++) {
                         var p = _e[_d];
                         var t = getTypeOfSymbol(p);
-                        if (ts.getObjectFlags(t) & 131072 /* ContainsWideningType */) {
+                        if (ts.getObjectFlags(t) & 262144 /* ContainsWideningType */) {
                             if (!reportWideningErrorsInType(t)) {
                                 error(p.valueDeclaration, ts.Diagnostics.Object_literal_s_property_0_implicitly_has_an_1_type, symbolToString(p), typeToString(getWidenedType(t)));
                             }
@@ -44245,7 +45469,7 @@ var ts;
             }
             return errorReported;
         }
-        function reportImplicitAny(declaration, type) {
+        function reportImplicitAny(declaration, type, wideningKind) {
             var typeAsString = typeToString(getWidenedType(type));
             if (ts.isInJSFile(declaration) && !ts.isCheckJsEnabledForFile(ts.getSourceFileOfNode(declaration), compilerOptions)) {
                 // Only report implicit any errors/suggestions in TS and ts-check JS files
@@ -44253,12 +45477,12 @@ var ts;
             }
             var diagnostic;
             switch (declaration.kind) {
-                case 204 /* BinaryExpression */:
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
+                case 205 /* BinaryExpression */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
                     diagnostic = noImplicitAny ? ts.Diagnostics.Member_0_implicitly_has_an_1_type : ts.Diagnostics.Member_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage;
                     break;
-                case 151 /* Parameter */:
+                case 152 /* Parameter */:
                     var param = declaration;
                     if (ts.isIdentifier(param.name) &&
                         (ts.isCallSignatureDeclaration(param.parent) || ts.isMethodSignature(param.parent) || ts.isFunctionTypeNode(param.parent)) &&
@@ -44273,30 +45497,37 @@ var ts;
                         noImplicitAny ? ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type : ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type_but_a_better_type_may_be_inferred_from_usage :
                         noImplicitAny ? ts.Diagnostics.Parameter_0_implicitly_has_an_1_type : ts.Diagnostics.Parameter_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage;
                     break;
-                case 186 /* BindingElement */:
+                case 187 /* BindingElement */:
                     diagnostic = ts.Diagnostics.Binding_element_0_implicitly_has_an_1_type;
                     if (!noImplicitAny) {
                         // Don't issue a suggestion for binding elements since the codefix doesn't yet support them.
                         return;
                     }
                     break;
-                case 294 /* JSDocFunctionType */:
+                case 295 /* JSDocFunctionType */:
                     error(declaration, ts.Diagnostics.Function_type_which_lacks_return_type_annotation_implicitly_has_an_0_return_type, typeAsString);
                     return;
-                case 239 /* FunctionDeclaration */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
+                case 240 /* FunctionDeclaration */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
                     if (noImplicitAny && !declaration.name) {
-                        error(declaration, ts.Diagnostics.Function_expression_which_lacks_return_type_annotation_implicitly_has_an_0_return_type, typeAsString);
+                        if (wideningKind === 1 /* GeneratorYield */) {
+                            error(declaration, ts.Diagnostics.Generator_implicitly_has_yield_type_0_because_it_does_not_yield_any_values_Consider_supplying_a_return_type_annotation, typeAsString);
+                        }
+                        else {
+                            error(declaration, ts.Diagnostics.Function_expression_which_lacks_return_type_annotation_implicitly_has_an_0_return_type, typeAsString);
+                        }
                         return;
                     }
-                    diagnostic = noImplicitAny ? ts.Diagnostics._0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type : ts.Diagnostics._0_implicitly_has_an_1_return_type_but_a_better_type_may_be_inferred_from_usage;
+                    diagnostic = !noImplicitAny ? ts.Diagnostics._0_implicitly_has_an_1_return_type_but_a_better_type_may_be_inferred_from_usage :
+                        wideningKind === 1 /* GeneratorYield */ ? ts.Diagnostics._0_which_lacks_return_type_annotation_implicitly_has_an_1_yield_type :
+                            ts.Diagnostics._0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type;
                     break;
-                case 181 /* MappedType */:
+                case 182 /* MappedType */:
                     if (noImplicitAny) {
                         error(declaration, ts.Diagnostics.Mapped_object_type_implicitly_has_an_any_template_type);
                     }
@@ -44306,15 +45537,15 @@ var ts;
             }
             errorOrSuggestion(noImplicitAny, declaration, diagnostic, ts.declarationNameToString(ts.getNameOfDeclaration(declaration)), typeAsString);
         }
-        function reportErrorsFromWidening(declaration, type) {
-            if (produceDiagnostics && noImplicitAny && ts.getObjectFlags(type) & 131072 /* ContainsWideningType */) {
+        function reportErrorsFromWidening(declaration, type, wideningKind) {
+            if (produceDiagnostics && noImplicitAny && ts.getObjectFlags(type) & 262144 /* ContainsWideningType */) {
                 // Report implicit any error within type if possible, otherwise report error on declaration
                 if (!reportWideningErrorsInType(type)) {
-                    reportImplicitAny(declaration, type);
+                    reportImplicitAny(declaration, type, wideningKind);
                 }
             }
         }
-        function forEachMatchingParameterType(source, target, callback) {
+        function applyToParameterTypes(source, target, callback) {
             var sourceCount = getParameterCount(source);
             var targetCount = getParameterCount(target);
             var sourceRestType = getEffectiveRestType(source);
@@ -44335,25 +45566,55 @@ var ts;
                 callback(getRestTypeAtPosition(source, paramCount), targetRestType);
             }
         }
-        function createInferenceContext(typeParameters, signature, flags, compareTypes, baseInferences) {
-            var inferences = baseInferences ? baseInferences.map(cloneInferenceInfo) : typeParameters.map(createInferenceInfo);
-            var context = mapper;
-            context.typeParameters = typeParameters;
-            context.signature = signature;
-            context.inferences = inferences;
-            context.flags = flags;
-            context.compareTypes = compareTypes || compareTypesAssignable;
+        function applyToReturnTypes(source, target, callback) {
+            var sourceTypePredicate = getTypePredicateOfSignature(source);
+            var targetTypePredicate = getTypePredicateOfSignature(target);
+            if (sourceTypePredicate && targetTypePredicate && sourceTypePredicate.kind === targetTypePredicate.kind &&
+                (sourceTypePredicate.kind === 0 /* This */ || sourceTypePredicate.parameterIndex === targetTypePredicate.parameterIndex)) {
+                callback(sourceTypePredicate.type, targetTypePredicate.type);
+            }
+            else {
+                callback(getReturnTypeOfSignature(source), getReturnTypeOfSignature(target));
+            }
+        }
+        function createInferenceContext(typeParameters, signature, flags, compareTypes) {
+            return createInferenceContextWorker(typeParameters.map(createInferenceInfo), signature, flags, compareTypes || compareTypesAssignable);
+        }
+        function cloneInferenceContext(context, extraFlags) {
+            if (extraFlags === void 0) { extraFlags = 0; }
+            return context && createInferenceContextWorker(ts.map(context.inferences, cloneInferenceInfo), context.signature, context.flags | extraFlags, context.compareTypes);
+        }
+        function createInferenceContextWorker(inferences, signature, flags, compareTypes) {
+            var context = {
+                inferences: inferences,
+                signature: signature,
+                flags: flags,
+                compareTypes: compareTypes,
+                mapper: function (t) { return mapToInferredType(context, t, /*fix*/ true); },
+                nonFixingMapper: function (t) { return mapToInferredType(context, t, /*fix*/ false); },
+            };
             return context;
-            function mapper(t) {
-                for (var i = 0; i < inferences.length; i++) {
-                    if (t === inferences[i].typeParameter) {
-                        if (!(context.flags & 4 /* NoFixing */)) {
-                            inferences[i].isFixed = true;
-                        }
-                        return getInferredType(context, i);
+        }
+        function mapToInferredType(context, t, fix) {
+            var inferences = context.inferences;
+            for (var i = 0; i < inferences.length; i++) {
+                var inference = inferences[i];
+                if (t === inference.typeParameter) {
+                    if (fix && !inference.isFixed) {
+                        clearCachedInferences(inferences);
+                        inference.isFixed = true;
                     }
+                    return getInferredType(context, i);
+                }
+            }
+            return t;
+        }
+        function clearCachedInferences(inferences) {
+            for (var _i = 0, inferences_1 = inferences; _i < inferences_1.length; _i++) {
+                var inference = inferences_1[_i];
+                if (!inference.isFixed) {
+                    inference.inferredType = undefined;
                 }
-                return t;
             }
         }
         function createInferenceInfo(typeParameter) {
@@ -44378,6 +45639,9 @@ var ts;
                 isFixed: inference.isFixed
             };
         }
+        function getMapperFromContext(context) {
+            return context && context.mapper;
+        }
         // Return true if the given type could possibly reference a type parameter for which
         // we perform type inference (i.e. a type parameter of a generic function). We cache
         // results for union and intersection types for performance reasons.
@@ -44385,7 +45649,7 @@ var ts;
             var objectFlags = ts.getObjectFlags(type);
             return !!(type.flags & 63176704 /* Instantiable */ ||
                 objectFlags & 4 /* Reference */ && ts.forEach(type.typeArguments, couldContainTypeVariables) ||
-                objectFlags & 16 /* Anonymous */ && type.symbol && type.symbol.flags & (16 /* Function */ | 8192 /* Method */ | 2048 /* TypeLiteral */ | 32 /* Class */) ||
+                objectFlags & 16 /* Anonymous */ && type.symbol && type.symbol.flags & (16 /* Function */ | 8192 /* Method */ | 32 /* Class */ | 2048 /* TypeLiteral */ | 4096 /* ObjectLiteral */) && type.symbol.declarations ||
                 objectFlags & 32 /* Mapped */ ||
                 type.flags & 3145728 /* UnionOrIntersection */ && couldUnionOrIntersectionContainTypeVariables(type));
         }
@@ -44396,7 +45660,10 @@ var ts;
             return type.couldContainTypeVariables;
         }
         function isTypeParameterAtTopLevel(type, typeParameter) {
-            return type === typeParameter || !!(type.flags & 3145728 /* UnionOrIntersection */) && ts.some(type.types, function (t) { return isTypeParameterAtTopLevel(t, typeParameter); });
+            return !!(type === typeParameter ||
+                type.flags & 3145728 /* UnionOrIntersection */ && ts.some(type.types, function (t) { return isTypeParameterAtTopLevel(t, typeParameter); }) ||
+                type.flags & 16777216 /* Conditional */ && (isTypeParameterAtTopLevel(getTrueTypeFromConditionalType(type), typeParameter) ||
+                    isTypeParameterAtTopLevel(getFalseTypeFromConditionalType(type), typeParameter)));
         }
         /** Create an object with properties named in the string literal type. Every property has type `any` */
         function createEmptyObjectTypeFromStringLiteral(type) {
@@ -44433,19 +45700,20 @@ var ts;
             reverseMappedCache.set(key, type);
             return type;
         }
+        // We consider a type to be partially inferable if it isn't marked non-inferable or if it is
+        // an object literal type with at least one property of an inferable type. For example, an object
+        // literal { a: 123, b: x => true } is marked non-inferable because it contains a context sensitive
+        // arrow function, but is considered partially inferable because property 'a' has an inferable type.
+        function isPartiallyInferableType(type) {
+            return !(ts.getObjectFlags(type) & 1048576 /* NonInferrableType */) ||
+                isObjectLiteralType(type) && ts.some(getPropertiesOfType(type), function (prop) { return isPartiallyInferableType(getTypeOfSymbol(prop)); });
+        }
         function createReverseMappedType(source, target, constraint) {
-            var properties = getPropertiesOfType(source);
-            if (properties.length === 0 && !getIndexInfoOfType(source, 0 /* String */)) {
+            // We consider a source type reverse mappable if it has a string index signature or if
+            // it has one or more properties and is of a partially inferable type.
+            if (!(getIndexInfoOfType(source, 0 /* String */) || getPropertiesOfType(source).length !== 0 && isPartiallyInferableType(source))) {
                 return undefined;
             }
-            // If any property contains context sensitive functions that have been skipped, the source type
-            // is incomplete and we can't infer a meaningful input type.
-            for (var _i = 0, properties_3 = properties; _i < properties_3.length; _i++) {
-                var prop = properties_3[_i];
-                if (ts.getObjectFlags(getTypeOfSymbol(prop)) & 524288 /* ContainsAnyFunctionType */) {
-                    return undefined;
-                }
-            }
             // For arrays and tuples we infer new arrays and tuples where the reverse mapping has been
             // applied to the element type(s).
             if (isArrayType(source)) {
@@ -44473,20 +45741,20 @@ var ts;
             var templateType = getTemplateTypeFromMappedType(target);
             var inference = createInferenceInfo(typeParameter);
             inferTypes([inference], sourceType, templateType);
-            return getTypeFromInference(inference);
+            return getTypeFromInference(inference) || unknownType;
         }
         function getUnmatchedProperties(source, target, requireOptionalProperties, matchDiscriminantProperties) {
-            var properties, _i, properties_4, targetProp, sourceProp, targetType, sourceType;
+            var properties, _i, properties_2, targetProp, sourceProp, targetType, sourceType;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        properties = target.flags & 2097152 /* Intersection */ ? getPropertiesOfUnionOrIntersectionType(target) : getPropertiesOfObjectType(target);
-                        _i = 0, properties_4 = properties;
+                        properties = target.flags & 1048576 /* Union */ ? getPossiblePropertiesOfUnionType(target) : getPropertiesOfType(target);
+                        _i = 0, properties_2 = properties;
                         _a.label = 1;
                     case 1:
-                        if (!(_i < properties_4.length)) return [3 /*break*/, 6];
-                        targetProp = properties_4[_i];
-                        if (!(requireOptionalProperties || !(targetProp.flags & 16777216 /* Optional */))) return [3 /*break*/, 5];
+                        if (!(_i < properties_2.length)) return [3 /*break*/, 6];
+                        targetProp = properties_2[_i];
+                        if (!(requireOptionalProperties || !(targetProp.flags & 16777216 /* Optional */ || ts.getCheckFlags(targetProp) & 48 /* Partial */))) return [3 /*break*/, 5];
                         sourceProp = getPropertyOfType(source, targetProp.escapedName);
                         if (!!sourceProp) return [3 /*break*/, 3];
                         return [4 /*yield*/, targetProp];
@@ -44511,7 +45779,9 @@ var ts;
             });
         }
         function getUnmatchedProperty(source, target, requireOptionalProperties, matchDiscriminantProperties) {
-            return getUnmatchedProperties(source, target, requireOptionalProperties, matchDiscriminantProperties).next().value;
+            var result = getUnmatchedProperties(source, target, requireOptionalProperties, matchDiscriminantProperties).next();
+            if (!result.done)
+                return result.value;
         }
         function tupleTypesDefinitelyUnrelated(source, target) {
             return target.target.minLength > source.target.minLength ||
@@ -44527,15 +45797,17 @@ var ts;
         function getTypeFromInference(inference) {
             return inference.candidates ? getUnionType(inference.candidates, 2 /* Subtype */) :
                 inference.contraCandidates ? getIntersectionType(inference.contraCandidates) :
-                    emptyObjectType;
+                    undefined;
         }
-        function inferTypes(inferences, originalSource, originalTarget, priority) {
+        function inferTypes(inferences, originalSource, originalTarget, priority, contravariant) {
             if (priority === void 0) { priority = 0; }
+            if (contravariant === void 0) { contravariant = false; }
             var symbolStack;
             var visited;
-            var contravariant = false;
             var bivariant = false;
             var propagationType;
+            var inferenceCount = 0;
+            var inferenceIncomplete = false;
             var allowComplexConstraintInference = true;
             inferFromTypes(originalSource, originalTarget);
             function inferFromTypes(source, target) {
@@ -44555,11 +45827,7 @@ var ts;
                 if (source.aliasSymbol && source.aliasTypeArguments && source.aliasSymbol === target.aliasSymbol) {
                     // Source and target are types originating in the same generic type alias declaration.
                     // Simply infer from source type arguments to target type arguments.
-                    var sourceTypes = source.aliasTypeArguments;
-                    var targetTypes = target.aliasTypeArguments;
-                    for (var i = 0; i < sourceTypes.length; i++) {
-                        inferFromTypes(sourceTypes[i], targetTypes[i]);
-                    }
+                    inferFromTypeArguments(source.aliasTypeArguments, target.aliasTypeArguments, getAliasVariances(source.aliasSymbol));
                     return;
                 }
                 if (source.flags & 1048576 /* Union */ && target.flags & 1048576 /* Union */ && !(source.flags & 1024 /* EnumLiteral */ && target.flags & 1024 /* EnumLiteral */) ||
@@ -44582,25 +45850,34 @@ var ts;
                     var matchingTypes = void 0;
                     for (var _b = 0, _c = source.types; _b < _c.length; _b++) {
                         var t = _c[_b];
-                        if (typeIdenticalToSomeType(t, target.types)) {
-                            (matchingTypes || (matchingTypes = [])).push(t);
-                            inferFromTypes(t, t);
-                        }
-                        else if (t.flags & (256 /* NumberLiteral */ | 128 /* StringLiteral */)) {
-                            var b = getBaseTypeOfLiteralType(t);
-                            if (typeIdenticalToSomeType(b, target.types)) {
-                                (matchingTypes || (matchingTypes = [])).push(t, b);
-                            }
+                        var matched = findMatchedType(t, target);
+                        if (matched) {
+                            (matchingTypes || (matchingTypes = [])).push(matched);
+                            inferFromTypes(matched, matched);
                         }
                     }
                     // Next, to improve the quality of inferences, reduce the source and target types by
                     // removing the identically matched constituents. For example, when inferring from
                     // 'string | string[]' to 'string | T' we reduce the types to 'string[]' and 'T'.
                     if (matchingTypes) {
-                        source = removeTypesFromUnionOrIntersection(source, matchingTypes);
-                        target = removeTypesFromUnionOrIntersection(target, matchingTypes);
+                        var s = removeTypesFromUnionOrIntersection(source, matchingTypes);
+                        var t = removeTypesFromUnionOrIntersection(target, matchingTypes);
+                        if (!(s && t))
+                            return;
+                        source = s;
+                        target = t;
                     }
                 }
+                else if (target.flags & 1048576 /* Union */ && !(target.flags & 1024 /* EnumLiteral */) || target.flags & 2097152 /* Intersection */) {
+                    var matched = findMatchedType(source, target);
+                    if (matched) {
+                        inferFromTypes(matched, matched);
+                        return;
+                    }
+                }
+                else if (target.flags & (8388608 /* IndexedAccess */ | 33554432 /* Substitution */)) {
+                    target = getActualTypeVariable(target);
+                }
                 if (target.flags & 8650752 /* TypeVariable */) {
                     // If target is a type parameter, make an inference, unless the source type contains
                     // the anyFunctionType (the wildcard type that's used to avoid contextually typing functions).
@@ -44609,7 +45886,7 @@ var ts;
                     // not contain anyFunctionType when we come back to this argument for its second round
                     // of inference. Also, we exclude inferences for silentNeverType (which is used as a wildcard
                     // when constructing types from type parameters that had no inference candidates).
-                    if (ts.getObjectFlags(source) & 524288 /* ContainsAnyFunctionType */ || source === silentNeverType || (priority & 8 /* ReturnType */ && (source === autoType || source === autoArrayType))) {
+                    if (ts.getObjectFlags(source) & 1048576 /* NonInferrableType */ || source === silentNeverType || (priority & 16 /* ReturnType */ && (source === autoType || source === autoArrayType))) {
                         return;
                     }
                     var inference = getInferenceInfoForType(target);
@@ -44626,54 +45903,46 @@ var ts;
                                 // We make contravariant inferences only if we are in a pure contravariant position,
                                 // i.e. only if we have not descended into a bivariant position.
                                 if (contravariant && !bivariant) {
-                                    inference.contraCandidates = ts.appendIfUnique(inference.contraCandidates, candidate);
+                                    if (!ts.contains(inference.contraCandidates, candidate)) {
+                                        inference.contraCandidates = ts.append(inference.contraCandidates, candidate);
+                                        clearCachedInferences(inferences);
+                                    }
                                 }
-                                else {
-                                    inference.candidates = ts.appendIfUnique(inference.candidates, candidate);
+                                else if (!ts.contains(inference.candidates, candidate)) {
+                                    inference.candidates = ts.append(inference.candidates, candidate);
+                                    clearCachedInferences(inferences);
                                 }
                             }
-                            if (!(priority & 8 /* ReturnType */) && target.flags & 262144 /* TypeParameter */ && !isTypeParameterAtTopLevel(originalTarget, target)) {
+                            if (!(priority & 16 /* ReturnType */) && target.flags & 262144 /* TypeParameter */ && inference.topLevel && !isTypeParameterAtTopLevel(originalTarget, target)) {
                                 inference.topLevel = false;
+                                clearCachedInferences(inferences);
                             }
                         }
+                        inferenceCount++;
                         return;
                     }
                     else {
                         // Infer to the simplified version of an indexed access, if possible, to (hopefully) expose more bare type parameters to the inference engine
-                        var simplified = getSimplifiedType(target);
+                        var simplified = getSimplifiedType(target, /*writing*/ false);
                         if (simplified !== target) {
-                            inferFromTypesOnce(source, simplified);
+                            invokeOnce(source, simplified, inferFromTypes);
                         }
                         else if (target.flags & 8388608 /* IndexedAccess */) {
-                            var indexType = getSimplifiedType(target.indexType);
+                            var indexType = getSimplifiedType(target.indexType, /*writing*/ false);
                             // Generally simplifications of instantiable indexes are avoided to keep relationship checking correct, however if our target is an access, we can consider
                             // that key of that access to be "instantiated", since we're looking to find the infernce goal in any way we can.
                             if (indexType.flags & 63176704 /* Instantiable */) {
-                                var simplified_1 = distributeIndexOverObjectType(getSimplifiedType(target.objectType), indexType);
+                                var simplified_1 = distributeIndexOverObjectType(getSimplifiedType(target.objectType, /*writing*/ false), indexType, /*writing*/ false);
                                 if (simplified_1 && simplified_1 !== target) {
-                                    inferFromTypesOnce(source, simplified_1);
+                                    invokeOnce(source, simplified_1, inferFromTypes);
                                 }
                             }
                         }
                     }
                 }
-                else if (target.flags & 33554432 /* Substitution */) {
-                    inferFromTypes(source, target.typeVariable);
-                }
-                if (ts.getObjectFlags(source) & 4 /* Reference */ && ts.getObjectFlags(target) & 4 /* Reference */ && source.target === target.target) {
+                if (ts.getObjectFlags(source) & 4 /* Reference */ && ts.getObjectFlags(target) & 4 /* Reference */ && (source.target === target.target || isArrayType(source) && isArrayType(target))) {
                     // If source and target are references to the same generic type, infer from type arguments
-                    var sourceTypes = source.typeArguments || ts.emptyArray;
-                    var targetTypes = target.typeArguments || ts.emptyArray;
-                    var count = sourceTypes.length < targetTypes.length ? sourceTypes.length : targetTypes.length;
-                    var variances = getVariances(source.target);
-                    for (var i = 0; i < count; i++) {
-                        if (i < variances.length && variances[i] === 2 /* Contravariant */) {
-                            inferFromContravariantTypes(sourceTypes[i], targetTypes[i]);
-                        }
-                        else {
-                            inferFromTypes(sourceTypes[i], targetTypes[i]);
-                        }
-                    }
+                    inferFromTypeArguments(source.typeArguments || ts.emptyArray, target.typeArguments || ts.emptyArray, getVariances(source.target));
                 }
                 else if (source.flags & 4194304 /* Index */ && target.flags & 4194304 /* Index */) {
                     contravariant = !contravariant;
@@ -44684,7 +45953,7 @@ var ts;
                     var empty = createEmptyObjectTypeFromStringLiteral(source);
                     contravariant = !contravariant;
                     var savePriority = priority;
-                    priority |= 16 /* LiteralKeyof */;
+                    priority |= 32 /* LiteralKeyof */;
                     inferFromTypes(empty, target.type);
                     priority = savePriority;
                     contravariant = !contravariant;
@@ -44699,34 +45968,23 @@ var ts;
                     inferFromTypes(getTrueTypeFromConditionalType(source), getTrueTypeFromConditionalType(target));
                     inferFromTypes(getFalseTypeFromConditionalType(source), getFalseTypeFromConditionalType(target));
                 }
-                else if (target.flags & 16777216 /* Conditional */) {
-                    inferFromTypes(source, getTrueTypeFromConditionalType(target));
-                    inferFromTypes(source, getFalseTypeFromConditionalType(target));
+                else if (target.flags & 16777216 /* Conditional */ && !contravariant) {
+                    var targetTypes = [getTrueTypeFromConditionalType(target), getFalseTypeFromConditionalType(target)];
+                    inferToMultipleTypes(source, targetTypes, target.flags);
                 }
                 else if (target.flags & 3145728 /* UnionOrIntersection */) {
-                    for (var _d = 0, _e = target.types; _d < _e.length; _d++) {
-                        var t = _e[_d];
-                        var savePriority = priority;
-                        // Inferences directly to naked type variables are given lower priority as they are
-                        // less specific. For example, when inferring from Promise<string> to T | Promise<T>,
-                        // we want to infer string for T, not Promise<string> | string.
-                        if (getInferenceInfoForType(t)) {
-                            priority |= 1 /* NakedTypeVariable */;
-                        }
-                        inferFromTypes(source, t);
-                        priority = savePriority;
-                    }
+                    inferToMultipleTypes(source, target.types, target.flags);
                 }
                 else if (source.flags & 1048576 /* Union */) {
                     // Source is a union or intersection type, infer from each constituent type
                     var sourceTypes = source.types;
-                    for (var _f = 0, sourceTypes_3 = sourceTypes; _f < sourceTypes_3.length; _f++) {
-                        var sourceType = sourceTypes_3[_f];
+                    for (var _d = 0, sourceTypes_3 = sourceTypes; _d < sourceTypes_3.length; _d++) {
+                        var sourceType = sourceTypes_3[_d];
                         inferFromTypes(sourceType, target);
                     }
                 }
                 else {
-                    if (!(priority & 32 /* NoConstraints */ && source.flags & (2097152 /* Intersection */ | 63176704 /* Instantiable */))) {
+                    if (!(priority & 64 /* NoConstraints */ && source.flags & (2097152 /* Intersection */ | 63176704 /* Instantiable */))) {
                         var apparentSource = getApparentType(source);
                         // getApparentType can return _any_ type, since an indexed access or conditional may simplify to any other type.
                         // If that occurs and it doesn't simplify to an object or intersection, we'll need to restart `inferFromTypes`
@@ -44745,41 +46003,35 @@ var ts;
                         source = apparentSource;
                     }
                     if (source.flags & (524288 /* Object */ | 2097152 /* Intersection */)) {
-                        var key = source.id + "," + target.id;
-                        if (visited && visited.get(key)) {
-                            return;
-                        }
-                        (visited || (visited = ts.createMap())).set(key, true);
-                        // If we are already processing another target type with the same associated symbol (such as
-                        // an instantiation of the same generic type), we do not explore this target as it would yield
-                        // no further inferences. We exclude the static side of classes from this check since it shares
-                        // its symbol with the instance side which would lead to false positives.
-                        var isNonConstructorObject = target.flags & 524288 /* Object */ &&
-                            !(ts.getObjectFlags(target) & 16 /* Anonymous */ && target.symbol && target.symbol.flags & 32 /* Class */);
-                        var symbol = isNonConstructorObject ? target.symbol : undefined;
-                        if (symbol) {
-                            if (ts.contains(symbolStack, symbol)) {
-                                return;
-                            }
-                            (symbolStack || (symbolStack = [])).push(symbol);
-                            inferFromObjectTypes(source, target);
-                            symbolStack.pop();
-                        }
-                        else {
-                            inferFromObjectTypes(source, target);
-                        }
+                        invokeOnce(source, target, inferFromObjectTypes);
                     }
                 }
-                function inferFromTypesOnce(source, target) {
-                    var key = source.id + "," + target.id;
-                    if (!visited || !visited.get(key)) {
-                        (visited || (visited = ts.createMap())).set(key, true);
-                        inferFromTypes(source, target);
+            }
+            function invokeOnce(source, target, action) {
+                var key = source.id + "," + target.id;
+                var count = visited && visited.get(key);
+                if (count !== undefined) {
+                    inferenceCount += count;
+                    return;
+                }
+                (visited || (visited = ts.createMap())).set(key, 0);
+                var startCount = inferenceCount;
+                action(source, target);
+                visited.set(key, inferenceCount - startCount);
+            }
+            function inferFromTypeArguments(sourceTypes, targetTypes, variances) {
+                var count = sourceTypes.length < targetTypes.length ? sourceTypes.length : targetTypes.length;
+                for (var i = 0; i < count; i++) {
+                    if (i < variances.length && (variances[i] & 7 /* VarianceMask */) === 2 /* Contravariant */) {
+                        inferFromContravariantTypes(sourceTypes[i], targetTypes[i]);
+                    }
+                    else {
+                        inferFromTypes(sourceTypes[i], targetTypes[i]);
                     }
                 }
             }
             function inferFromContravariantTypes(source, target) {
-                if (strictFunctionTypes || priority & 64 /* AlwaysStrict */) {
+                if (strictFunctionTypes || priority & 128 /* AlwaysStrict */) {
                     contravariant = !contravariant;
                     inferFromTypes(source, target);
                     contravariant = !contravariant;
@@ -44790,8 +46042,8 @@ var ts;
             }
             function getInferenceInfoForType(type) {
                 if (type.flags & 8650752 /* TypeVariable */) {
-                    for (var _i = 0, inferences_1 = inferences; _i < inferences_1.length; _i++) {
-                        var inference = inferences_1[_i];
+                    for (var _i = 0, inferences_2 = inferences; _i < inferences_2.length; _i++) {
+                        var inference = inferences_2[_i];
                         if (type === inference.typeParameter) {
                             return inference;
                         }
@@ -44799,6 +46051,74 @@ var ts;
                 }
                 return undefined;
             }
+            function inferToMultipleTypes(source, targets, targetFlags) {
+                var typeVariableCount = 0;
+                if (targetFlags & 1048576 /* Union */) {
+                    var nakedTypeVariable = void 0;
+                    var sources = source.flags & 1048576 /* Union */ ? source.types : [source];
+                    var matched_1 = new Array(sources.length);
+                    var saveInferenceIncomplete = inferenceIncomplete;
+                    inferenceIncomplete = false;
+                    // First infer to types that are not naked type variables. For each source type we
+                    // track whether inferences were made from that particular type to some target.
+                    for (var _i = 0, targets_1 = targets; _i < targets_1.length; _i++) {
+                        var t = targets_1[_i];
+                        if (getInferenceInfoForType(t)) {
+                            nakedTypeVariable = t;
+                            typeVariableCount++;
+                        }
+                        else {
+                            for (var i = 0; i < sources.length; i++) {
+                                var count = inferenceCount;
+                                inferFromTypes(sources[i], t);
+                                if (count !== inferenceCount)
+                                    matched_1[i] = true;
+                            }
+                        }
+                    }
+                    var inferenceComplete = !inferenceIncomplete;
+                    inferenceIncomplete = inferenceIncomplete || saveInferenceIncomplete;
+                    // If the target has a single naked type variable and inference completed (meaning we
+                    // explored the types fully), create a union of the source types from which no inferences
+                    // have been made so far and infer from that union to the naked type variable.
+                    if (typeVariableCount === 1 && inferenceComplete) {
+                        var unmatched = ts.flatMap(sources, function (s, i) { return matched_1[i] ? undefined : s; });
+                        if (unmatched.length) {
+                            inferFromTypes(getUnionType(unmatched), nakedTypeVariable);
+                            return;
+                        }
+                    }
+                }
+                else {
+                    // We infer from types that are not naked type variables first so that inferences we
+                    // make from nested naked type variables and given slightly higher priority by virtue
+                    // of being first in the candidates array.
+                    for (var _a = 0, targets_2 = targets; _a < targets_2.length; _a++) {
+                        var t = targets_2[_a];
+                        if (getInferenceInfoForType(t)) {
+                            typeVariableCount++;
+                        }
+                        else {
+                            inferFromTypes(source, t);
+                        }
+                    }
+                }
+                // Inferences directly to naked type variables are given lower priority as they are
+                // less specific. For example, when inferring from Promise<string> to T | Promise<T>,
+                // we want to infer string for T, not Promise<string> | string. For intersection types
+                // we only infer to single naked type variables.
+                if (targetFlags & 2097152 /* Intersection */ ? typeVariableCount === 1 : typeVariableCount > 0) {
+                    var savePriority = priority;
+                    priority |= 1 /* NakedTypeVariable */;
+                    for (var _b = 0, targets_3 = targets; _b < targets_3.length; _b++) {
+                        var t = targets_3[_b];
+                        if (getInferenceInfoForType(t)) {
+                            inferFromTypes(source, t);
+                        }
+                    }
+                    priority = savePriority;
+                }
+            }
             function inferToMappedType(source, target, constraintType) {
                 if (constraintType.flags & 1048576 /* Union */) {
                     var result = false;
@@ -44818,7 +46138,11 @@ var ts;
                         var inferredType = inferTypeForHomomorphicMappedType(source, target, constraintType);
                         if (inferredType) {
                             var savePriority = priority;
-                            priority |= 2 /* HomomorphicMappedType */;
+                            // We assign a lower priority to inferences made from types containing non-inferrable
+                            // types because we may only have a partial result (i.e. we may have failed to make
+                            // reverse inferences for some properties).
+                            priority |= ts.getObjectFlags(source) & 1048576 /* NonInferrableType */ ?
+                                4 /* PartialHomomorphicMappedType */ : 2 /* HomomorphicMappedType */;
                             inferFromTypes(inferredType, inference.typeParameter);
                             priority = savePriority;
                         }
@@ -44829,7 +46153,7 @@ var ts;
                     // We're inferring from some source type S to a mapped type { [P in K]: X }, where K is a type
                     // parameter. First infer from 'keyof S' to K.
                     var savePriority = priority;
-                    priority |= 4 /* MappedTypeConstraint */;
+                    priority |= 8 /* MappedTypeConstraint */;
                     inferFromTypes(getIndexType(source), constraintType);
                     priority = savePriority;
                     // If K is constrained to a type C, also infer to C. Thus, for a mapped type { [P in K]: X },
@@ -44842,16 +46166,37 @@ var ts;
                     }
                     // If no inferences can be made to K's constraint, infer from a union of the property types
                     // in the source to the template type X.
-                    var valueTypes = ts.compact([
-                        getIndexTypeOfType(source, 0 /* String */),
-                        getIndexTypeOfType(source, 1 /* Number */)
-                    ].concat(ts.map(getPropertiesOfType(source), getTypeOfSymbol)));
-                    inferFromTypes(getUnionType(valueTypes), getTemplateTypeFromMappedType(target));
+                    var propTypes = ts.map(getPropertiesOfType(source), getTypeOfSymbol);
+                    var stringIndexType = getIndexTypeOfType(source, 0 /* String */);
+                    var numberIndexInfo = getNonEnumNumberIndexInfo(source);
+                    var numberIndexType = numberIndexInfo && numberIndexInfo.type;
+                    inferFromTypes(getUnionType(ts.append(ts.append(propTypes, stringIndexType), numberIndexType)), getTemplateTypeFromMappedType(target));
                     return true;
                 }
                 return false;
             }
             function inferFromObjectTypes(source, target) {
+                // If we are already processing another target type with the same associated symbol (such as
+                // an instantiation of the same generic type), we do not explore this target as it would yield
+                // no further inferences. We exclude the static side of classes from this check since it shares
+                // its symbol with the instance side which would lead to false positives.
+                var isNonConstructorObject = target.flags & 524288 /* Object */ &&
+                    !(ts.getObjectFlags(target) & 16 /* Anonymous */ && target.symbol && target.symbol.flags & 32 /* Class */);
+                var symbol = isNonConstructorObject ? target.symbol : undefined;
+                if (symbol) {
+                    if (ts.contains(symbolStack, symbol)) {
+                        inferenceIncomplete = true;
+                        return;
+                    }
+                    (symbolStack || (symbolStack = [])).push(symbol);
+                    inferFromObjectTypesWorker(source, target);
+                    symbolStack.pop();
+                }
+                else {
+                    inferFromObjectTypesWorker(source, target);
+                }
+            }
+            function inferFromObjectTypesWorker(source, target) {
                 if (isGenericMappedType(source) && isGenericMappedType(target)) {
                     // The source and target types are generic types { [P in S]: X } and { [P in T]: Y }, so we infer
                     // from S to T and from X to Y.
@@ -44900,8 +46245,8 @@ var ts;
                     }
                 }
                 var properties = getPropertiesOfObjectType(target);
-                for (var _i = 0, properties_5 = properties; _i < properties_5.length; _i++) {
-                    var targetProp = properties_5[_i];
+                for (var _i = 0, properties_3 = properties; _i < properties_3.length; _i++) {
+                    var targetProp = properties_3[_i];
                     var sourceProp = getPropertyOfType(source, targetProp.escapedName);
                     if (sourceProp) {
                         inferFromTypes(getTypeOfSymbol(sourceProp), getTypeOfSymbol(targetProp));
@@ -44914,7 +46259,7 @@ var ts;
                 var sourceLen = sourceSignatures.length;
                 var targetLen = targetSignatures.length;
                 var len = sourceLen < targetLen ? sourceLen : targetLen;
-                var skipParameters = !!(ts.getObjectFlags(source) & 524288 /* ContainsAnyFunctionType */);
+                var skipParameters = !!(ts.getObjectFlags(source) & 1048576 /* NonInferrableType */);
                 for (var i = 0; i < len; i++) {
                     inferFromSignature(getBaseSignature(sourceSignatures[sourceLen - len + i]), getBaseSignature(targetSignatures[targetLen - len + i]), skipParameters);
                 }
@@ -44924,18 +46269,11 @@ var ts;
                     var saveBivariant = bivariant;
                     var kind = target.declaration ? target.declaration.kind : 0 /* Unknown */;
                     // Once we descend into a bivariant signature we remain bivariant for all nested inferences
-                    bivariant = bivariant || kind === 156 /* MethodDeclaration */ || kind === 155 /* MethodSignature */ || kind === 157 /* Constructor */;
-                    forEachMatchingParameterType(source, target, inferFromContravariantTypes);
+                    bivariant = bivariant || kind === 157 /* MethodDeclaration */ || kind === 156 /* MethodSignature */ || kind === 158 /* Constructor */;
+                    applyToParameterTypes(source, target, inferFromContravariantTypes);
                     bivariant = saveBivariant;
                 }
-                var sourceTypePredicate = getTypePredicateOfSignature(source);
-                var targetTypePredicate = getTypePredicateOfSignature(target);
-                if (sourceTypePredicate && targetTypePredicate && sourceTypePredicate.kind === targetTypePredicate.kind) {
-                    inferFromTypes(sourceTypePredicate.type, targetTypePredicate.type);
-                }
-                else {
-                    inferFromTypes(getReturnTypeOfSignature(source), getReturnTypeOfSignature(target));
-                }
+                applyToReturnTypes(source, target, inferFromTypes);
             }
             function inferFromIndexTypes(source, target) {
                 var targetStringIndexType = getIndexTypeOfType(target, 0 /* String */);
@@ -44957,15 +46295,33 @@ var ts;
                 }
             }
         }
-        function typeIdenticalToSomeType(type, types) {
+        function isMatchableType(type) {
+            // We exclude non-anonymous object types because some frameworks (e.g. Ember) rely on the ability to
+            // infer between types that don't witness their type variables. Such types would otherwise be eliminated
+            // because they appear identical.
+            return !(type.flags & 524288 /* Object */) || !!(ts.getObjectFlags(type) & 16 /* Anonymous */);
+        }
+        function typeMatchedBySomeType(type, types) {
             for (var _i = 0, types_11 = types; _i < types_11.length; _i++) {
                 var t = types_11[_i];
-                if (isTypeIdenticalTo(t, type)) {
+                if (t === type || isMatchableType(t) && isMatchableType(type) && isTypeIdenticalTo(t, type)) {
                     return true;
                 }
             }
             return false;
         }
+        function findMatchedType(type, target) {
+            if (typeMatchedBySomeType(type, target.types)) {
+                return type;
+            }
+            if (type.flags & (256 /* NumberLiteral */ | 128 /* StringLiteral */) && target.flags & 1048576 /* Union */) {
+                var base = getBaseTypeOfLiteralType(type);
+                if (typeMatchedBySomeType(base, target.types)) {
+                    return base;
+                }
+            }
+            return undefined;
+        }
         /**
          * Return a new union or intersection type computed by removing a given set of types
          * from a given union or intersection type.
@@ -44974,11 +46330,11 @@ var ts;
             var reducedTypes = [];
             for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
                 var t = _a[_i];
-                if (!typeIdenticalToSomeType(t, typesToRemove)) {
+                if (!typeMatchedBySomeType(t, typesToRemove)) {
                     reducedTypes.push(t);
                 }
             }
-            return type.flags & 1048576 /* Union */ ? getUnionType(reducedTypes) : getIntersectionType(reducedTypes);
+            return reducedTypes.length ? type.flags & 1048576 /* Union */ ? getUnionType(reducedTypes) : getIntersectionType(reducedTypes) : undefined;
         }
         function hasPrimitiveConstraint(type) {
             var constraint = getConstraintOfTypeParameter(type);
@@ -44987,22 +46343,25 @@ var ts;
         function isObjectLiteralType(type) {
             return !!(ts.getObjectFlags(type) & 128 /* ObjectLiteral */);
         }
-        function widenObjectLiteralCandidates(candidates) {
+        function isObjectOrArrayLiteralType(type) {
+            return !!(ts.getObjectFlags(type) & (128 /* ObjectLiteral */ | 65536 /* ArrayLiteral */));
+        }
+        function unionObjectAndArrayLiteralCandidates(candidates) {
             if (candidates.length > 1) {
-                var objectLiterals = ts.filter(candidates, isObjectLiteralType);
+                var objectLiterals = ts.filter(candidates, isObjectOrArrayLiteralType);
                 if (objectLiterals.length) {
-                    var objectLiteralsType = getWidenedType(getUnionType(objectLiterals, 2 /* Subtype */));
-                    return ts.concatenate(ts.filter(candidates, function (t) { return !isObjectLiteralType(t); }), [objectLiteralsType]);
+                    var literalsType = getUnionType(objectLiterals, 2 /* Subtype */);
+                    return ts.concatenate(ts.filter(candidates, function (t) { return !isObjectOrArrayLiteralType(t); }), [literalsType]);
                 }
             }
             return candidates;
         }
         function getContravariantInference(inference) {
-            return inference.priority & 28 /* PriorityImpliesCombination */ ? getIntersectionType(inference.contraCandidates) : getCommonSubtype(inference.contraCandidates);
+            return inference.priority & 56 /* PriorityImpliesCombination */ ? getIntersectionType(inference.contraCandidates) : getCommonSubtype(inference.contraCandidates);
         }
         function getCovariantInference(inference, signature) {
-            // Extract all object literal types and replace them with a single widened and normalized type.
-            var candidates = widenObjectLiteralCandidates(inference.candidates);
+            // Extract all object and array literal types and replace them with a single widened and normalized type.
+            var candidates = unionObjectAndArrayLiteralCandidates(inference.candidates);
             // We widen inferred literal types if
             // all inferences were made to top-level occurrences of the type parameter, and
             // the type parameter has no constraint or its constraint includes no primitive or literal types, and
@@ -45015,15 +46374,15 @@ var ts;
                     candidates;
             // If all inferences were made from a position that implies a combined result, infer a union type.
             // Otherwise, infer a common supertype.
-            var unwidenedType = inference.priority & 28 /* PriorityImpliesCombination */ ?
+            var unwidenedType = inference.priority & 56 /* PriorityImpliesCombination */ ?
                 getUnionType(baseCandidates, 2 /* Subtype */) :
                 getCommonSupertype(baseCandidates);
             return getWidenedType(unwidenedType);
         }
         function getInferredType(context, index) {
             var inference = context.inferences[index];
-            var inferredType = inference.inferredType;
-            if (!inferredType) {
+            if (!inference.inferredType) {
+                var inferredType = void 0;
                 var signature = context.signature;
                 if (signature) {
                     var inferredCovariantType = inference.candidates ? getCovariantInference(inference, signature) : undefined;
@@ -45052,31 +46411,26 @@ var ts;
                         if (defaultType) {
                             // Instantiate the default type. Any forward reference to a type
                             // parameter should be instantiated to the empty object type.
-                            inferredType = instantiateType(defaultType, combineTypeMappers(createBackreferenceMapper(context.typeParameters, index), context));
-                        }
-                        else {
-                            inferredType = getDefaultTypeArgumentType(!!(context.flags & 2 /* AnyDefault */));
+                            inferredType = instantiateType(defaultType, combineTypeMappers(createBackreferenceMapper(context, index), context.nonFixingMapper));
                         }
                     }
                 }
                 else {
                     inferredType = getTypeFromInference(inference);
                 }
-                inference.inferredType = inferredType;
+                inference.inferredType = inferredType || getDefaultTypeArgumentType(!!(context.flags & 2 /* AnyDefault */));
                 var constraint = getConstraintOfTypeParameter(inference.typeParameter);
                 if (constraint) {
-                    context.flags |= 4 /* NoFixing */;
-                    var instantiatedConstraint = instantiateType(constraint, context);
-                    if (!context.compareTypes(inferredType, getTypeWithThisArgument(instantiatedConstraint, inferredType))) {
+                    var instantiatedConstraint = instantiateType(constraint, context.nonFixingMapper);
+                    if (!inferredType || !context.compareTypes(inferredType, getTypeWithThisArgument(instantiatedConstraint, inferredType))) {
                         inference.inferredType = inferredType = instantiatedConstraint;
                     }
-                    context.flags &= ~4 /* NoFixing */;
                 }
             }
-            return inferredType;
+            return inference.inferredType;
         }
         function getDefaultTypeArgumentType(isInJavaScriptFile) {
-            return isInJavaScriptFile ? anyType : emptyObjectType;
+            return isInJavaScriptFile ? anyType : unknownType;
         }
         function getInferredTypes(context) {
             var result = [];
@@ -45086,8 +46440,8 @@ var ts;
             return result;
         }
         // EXPRESSION TYPE CHECKING
-        function getCannotFindNameDiagnosticForName(name) {
-            switch (name) {
+        function getCannotFindNameDiagnosticForName(node) {
+            switch (node.escapedText) {
                 case "document":
                 case "console":
                     return ts.Diagnostics.Cannot_find_name_0_Do_you_need_to_change_your_target_library_Try_changing_the_lib_compiler_option_to_include_dom;
@@ -45118,14 +46472,20 @@ var ts;
                 case "Iterator":
                 case "AsyncIterator":
                     return ts.Diagnostics.Cannot_find_name_0_Do_you_need_to_change_your_target_library_Try_changing_the_lib_compiler_option_to_es2015_or_later;
-                default: return ts.Diagnostics.Cannot_find_name_0;
+                default:
+                    if (node.parent.kind === 277 /* ShorthandPropertyAssignment */) {
+                        return ts.Diagnostics.No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer;
+                    }
+                    else {
+                        return ts.Diagnostics.Cannot_find_name_0;
+                    }
             }
         }
         function getResolvedSymbol(node) {
             var links = getNodeLinks(node);
             if (!links.resolvedSymbol) {
                 links.resolvedSymbol = !ts.nodeIsMissing(node) &&
-                    resolveName(node, node.escapedText, 67220415 /* Value */ | 1048576 /* ExportValue */, getCannotFindNameDiagnosticForName(node.escapedText), node, !ts.isWriteOnlyAccess(node), 
+                    resolveName(node, node.escapedText, 67220415 /* Value */ | 1048576 /* ExportValue */, getCannotFindNameDiagnosticForName(node), node, !ts.isWriteOnlyAccess(node), 
                     /*excludeGlobals*/ false, ts.Diagnostics.Cannot_find_name_0_Did_you_mean_1) || unknownSymbol;
             }
             return links.resolvedSymbol;
@@ -45134,7 +46494,7 @@ var ts;
             // TypeScript 1.0 spec (April 2014): 3.6.3
             // A type query consists of the keyword typeof followed by an expression.
             // The expression is restricted to a single identifier or a sequence of identifiers separated by periods
-            return !!ts.findAncestor(node, function (n) { return n.kind === 167 /* TypeQuery */ ? true : n.kind === 72 /* Identifier */ || n.kind === 148 /* QualifiedName */ ? false : "quit"; });
+            return !!ts.findAncestor(node, function (n) { return n.kind === 168 /* TypeQuery */ ? true : n.kind === 73 /* Identifier */ || n.kind === 149 /* QualifiedName */ ? false : "quit"; });
         }
         // Return the flow cache key for a "dotted name" (i.e. a sequence of identifiers
         // separated by dots). The key consists of the id of the symbol referenced by the
@@ -45142,21 +46502,21 @@ var ts;
         // The result is undefined if the reference isn't a dotted name. We prefix nodes
         // occurring in an apparent type position with '@' because the control flow type
         // of such nodes may be based on the apparent type instead of the declared type.
-        function getFlowCacheKey(node) {
+        function getFlowCacheKey(node, declaredType, initialType, flowContainer) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     var symbol = getResolvedSymbol(node);
-                    return symbol !== unknownSymbol ? (isConstraintPosition(node) ? "@" : "") + getSymbolId(symbol) : undefined;
-                case 100 /* ThisKeyword */:
+                    return symbol !== unknownSymbol ? (flowContainer ? getNodeId(flowContainer) : "-1") + "|" + getTypeId(declaredType) + "|" + getTypeId(initialType) + "|" + (isConstraintPosition(node) ? "@" : "") + getSymbolId(symbol) : undefined;
+                case 101 /* ThisKeyword */:
                     return "0";
-                case 213 /* NonNullExpression */:
-                case 195 /* ParenthesizedExpression */:
-                    return getFlowCacheKey(node.expression);
-                case 189 /* PropertyAccessExpression */:
-                case 190 /* ElementAccessExpression */:
+                case 214 /* NonNullExpression */:
+                case 196 /* ParenthesizedExpression */:
+                    return getFlowCacheKey(node.expression, declaredType, initialType, flowContainer);
+                case 190 /* PropertyAccessExpression */:
+                case 191 /* ElementAccessExpression */:
                     var propName = getAccessedPropertyName(node);
                     if (propName !== undefined) {
-                        var key = getFlowCacheKey(node.expression);
+                        var key = getFlowCacheKey(node.expression, declaredType, initialType, flowContainer);
                         return key && key + "." + propName;
                     }
             }
@@ -45164,24 +46524,24 @@ var ts;
         }
         function isMatchingReference(source, target) {
             switch (target.kind) {
-                case 195 /* ParenthesizedExpression */:
-                case 213 /* NonNullExpression */:
+                case 196 /* ParenthesizedExpression */:
+                case 214 /* NonNullExpression */:
                     return isMatchingReference(source, target.expression);
             }
             switch (source.kind) {
-                case 72 /* Identifier */:
-                    return target.kind === 72 /* Identifier */ && getResolvedSymbol(source) === getResolvedSymbol(target) ||
-                        (target.kind === 237 /* VariableDeclaration */ || target.kind === 186 /* BindingElement */) &&
+                case 73 /* Identifier */:
+                    return target.kind === 73 /* Identifier */ && getResolvedSymbol(source) === getResolvedSymbol(target) ||
+                        (target.kind === 238 /* VariableDeclaration */ || target.kind === 187 /* BindingElement */) &&
                             getExportSymbolOfValueSymbolIfExported(getResolvedSymbol(source)) === getSymbolOfNode(target);
-                case 100 /* ThisKeyword */:
-                    return target.kind === 100 /* ThisKeyword */;
-                case 98 /* SuperKeyword */:
-                    return target.kind === 98 /* SuperKeyword */;
-                case 213 /* NonNullExpression */:
-                case 195 /* ParenthesizedExpression */:
+                case 101 /* ThisKeyword */:
+                    return target.kind === 101 /* ThisKeyword */;
+                case 99 /* SuperKeyword */:
+                    return target.kind === 99 /* SuperKeyword */;
+                case 214 /* NonNullExpression */:
+                case 196 /* ParenthesizedExpression */:
                     return isMatchingReference(source.expression, target);
-                case 189 /* PropertyAccessExpression */:
-                case 190 /* ElementAccessExpression */:
+                case 190 /* PropertyAccessExpression */:
+                case 191 /* ElementAccessExpression */:
                     return ts.isAccessExpression(target) &&
                         getAccessedPropertyName(source) === getAccessedPropertyName(target) &&
                         isMatchingReference(source.expression, target.expression);
@@ -45189,7 +46549,7 @@ var ts;
             return false;
         }
         function getAccessedPropertyName(access) {
-            return access.kind === 189 /* PropertyAccessExpression */ ? access.name.escapedText :
+            return access.kind === 190 /* PropertyAccessExpression */ ? access.name.escapedText :
                 ts.isStringLiteral(access.argumentExpression) || ts.isNumericLiteral(access.argumentExpression) ? ts.escapeLeadingUnderscores(access.argumentExpression.text) :
                     undefined;
         }
@@ -45214,7 +46574,7 @@ var ts;
                 isDiscriminantProperty(getDeclaredTypeOfReference(target.expression), name);
         }
         function getDeclaredTypeOfReference(expr) {
-            if (expr.kind === 72 /* Identifier */) {
+            if (expr.kind === 73 /* Identifier */) {
                 return getTypeOfSymbol(getResolvedSymbol(expr));
             }
             if (ts.isAccessExpression(expr)) {
@@ -45236,7 +46596,7 @@ var ts;
                 if (prop && ts.getCheckFlags(prop) & 2 /* SyntheticProperty */) {
                     if (prop.isDiscriminantProperty === undefined) {
                         prop.isDiscriminantProperty =
-                            (prop.checkFlags & 96 /* Discriminant */) === 96 /* Discriminant */ &&
+                            (prop.checkFlags & 192 /* Discriminant */) === 192 /* Discriminant */ &&
                                 isDiscriminantType(getTypeOfSymbol(prop));
                     }
                     return !!prop.isDiscriminantProperty;
@@ -45245,7 +46605,7 @@ var ts;
             return false;
         }
         function isSyntheticThisPropertyAccess(expr) {
-            return ts.isAccessExpression(expr) && expr.expression.kind === 100 /* ThisKeyword */ && !!(expr.expression.flags & 8 /* Synthesized */);
+            return ts.isAccessExpression(expr) && expr.expression.kind === 101 /* ThisKeyword */ && !!(expr.expression.flags & 8 /* Synthesized */);
         }
         function findDiscriminantProperties(sourceProperties, target) {
             var result;
@@ -45273,7 +46633,7 @@ var ts;
                     }
                 }
             }
-            if (callExpression.expression.kind === 189 /* PropertyAccessExpression */ &&
+            if (callExpression.expression.kind === 190 /* PropertyAccessExpression */ &&
                 isOrContainsMatchingReference(reference, callExpression.expression.expression)) {
                 return true;
             }
@@ -45392,7 +46752,7 @@ var ts;
                 return strictNullChecks ? 7888800 /* ObjectStrictFacts */ : 16736160 /* ObjectFacts */;
             }
             if (flags & 63176704 /* Instantiable */) {
-                return getTypeFacts(getBaseConstraintOfType(type) || emptyObjectType);
+                return getTypeFacts(getBaseConstraintOfType(type) || unknownType);
             }
             if (flags & 3145728 /* UnionOrIntersection */) {
                 return getTypeFactsOfTypes(type.types);
@@ -45421,22 +46781,22 @@ var ts;
         }
         function getTypeOfDestructuredArrayElement(type, index) {
             return everyType(type, isTupleLikeType) && getTupleElementType(type, index) ||
-                checkIteratedTypeOrElementType(type, /*errorNode*/ undefined, /*allowStringInput*/ false, /*allowAsyncIterables*/ false) ||
+                checkIteratedTypeOrElementType(65 /* Destructuring */, type, undefinedType, /*errorNode*/ undefined) ||
                 errorType;
         }
         function getTypeOfDestructuredSpreadExpression(type) {
-            return createArrayType(checkIteratedTypeOrElementType(type, /*errorNode*/ undefined, /*allowStringInput*/ false, /*allowAsyncIterables*/ false) || errorType);
+            return createArrayType(checkIteratedTypeOrElementType(65 /* Destructuring */, type, undefinedType, /*errorNode*/ undefined) || errorType);
         }
         function getAssignedTypeOfBinaryExpression(node) {
-            var isDestructuringDefaultAssignment = node.parent.kind === 187 /* ArrayLiteralExpression */ && isDestructuringAssignmentTarget(node.parent) ||
-                node.parent.kind === 275 /* PropertyAssignment */ && isDestructuringAssignmentTarget(node.parent.parent);
+            var isDestructuringDefaultAssignment = node.parent.kind === 188 /* ArrayLiteralExpression */ && isDestructuringAssignmentTarget(node.parent) ||
+                node.parent.kind === 276 /* PropertyAssignment */ && isDestructuringAssignmentTarget(node.parent.parent);
             return isDestructuringDefaultAssignment ?
                 getTypeWithDefault(getAssignedType(node), node.right) :
                 getTypeOfExpression(node.right);
         }
         function isDestructuringAssignmentTarget(parent) {
-            return parent.parent.kind === 204 /* BinaryExpression */ && parent.parent.left === parent ||
-                parent.parent.kind === 227 /* ForOfStatement */ && parent.parent.initializer === parent;
+            return parent.parent.kind === 205 /* BinaryExpression */ && parent.parent.left === parent ||
+                parent.parent.kind === 228 /* ForOfStatement */ && parent.parent.initializer === parent;
         }
         function getAssignedTypeOfArrayLiteralElement(node, element) {
             return getTypeOfDestructuredArrayElement(getAssignedType(node), node.elements.indexOf(element));
@@ -45453,21 +46813,21 @@ var ts;
         function getAssignedType(node) {
             var parent = node.parent;
             switch (parent.kind) {
-                case 226 /* ForInStatement */:
+                case 227 /* ForInStatement */:
                     return stringType;
-                case 227 /* ForOfStatement */:
+                case 228 /* ForOfStatement */:
                     return checkRightHandSideOfForOf(parent.expression, parent.awaitModifier) || errorType;
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return getAssignedTypeOfBinaryExpression(parent);
-                case 198 /* DeleteExpression */:
+                case 199 /* DeleteExpression */:
                     return undefinedType;
-                case 187 /* ArrayLiteralExpression */:
+                case 188 /* ArrayLiteralExpression */:
                     return getAssignedTypeOfArrayLiteralElement(parent, node);
-                case 208 /* SpreadElement */:
+                case 209 /* SpreadElement */:
                     return getAssignedTypeOfSpreadExpression(parent);
-                case 275 /* PropertyAssignment */:
+                case 276 /* PropertyAssignment */:
                     return getAssignedTypeOfPropertyAssignment(parent);
-                case 276 /* ShorthandPropertyAssignment */:
+                case 277 /* ShorthandPropertyAssignment */:
                     return getAssignedTypeOfShorthandPropertyAssignment(parent);
             }
             return errorType;
@@ -45475,7 +46835,7 @@ var ts;
         function getInitialTypeOfBindingElement(node) {
             var pattern = node.parent;
             var parentType = getInitialType(pattern.parent);
-            var type = pattern.kind === 184 /* ObjectBindingPattern */ ?
+            var type = pattern.kind === 185 /* ObjectBindingPattern */ ?
                 getTypeOfDestructuredProperty(parentType, node.propertyName || node.name) :
                 !node.dotDotDotToken ?
                     getTypeOfDestructuredArrayElement(parentType, pattern.elements.indexOf(node)) :
@@ -45493,37 +46853,37 @@ var ts;
             if (node.initializer) {
                 return getTypeOfInitializer(node.initializer);
             }
-            if (node.parent.parent.kind === 226 /* ForInStatement */) {
+            if (node.parent.parent.kind === 227 /* ForInStatement */) {
                 return stringType;
             }
-            if (node.parent.parent.kind === 227 /* ForOfStatement */) {
+            if (node.parent.parent.kind === 228 /* ForOfStatement */) {
                 return checkRightHandSideOfForOf(node.parent.parent.expression, node.parent.parent.awaitModifier) || errorType;
             }
             return errorType;
         }
         function getInitialType(node) {
-            return node.kind === 237 /* VariableDeclaration */ ?
+            return node.kind === 238 /* VariableDeclaration */ ?
                 getInitialTypeOfVariableDeclaration(node) :
                 getInitialTypeOfBindingElement(node);
         }
         function getInitialOrAssignedType(node, reference) {
-            return getConstraintForLocation(node.kind === 237 /* VariableDeclaration */ || node.kind === 186 /* BindingElement */ ?
+            return getConstraintForLocation(node.kind === 238 /* VariableDeclaration */ || node.kind === 187 /* BindingElement */ ?
                 getInitialType(node) :
                 getAssignedType(node), reference);
         }
         function isEmptyArrayAssignment(node) {
-            return node.kind === 237 /* VariableDeclaration */ && node.initializer &&
+            return node.kind === 238 /* VariableDeclaration */ && node.initializer &&
                 isEmptyArrayLiteral(node.initializer) ||
-                node.kind !== 186 /* BindingElement */ && node.parent.kind === 204 /* BinaryExpression */ &&
+                node.kind !== 187 /* BindingElement */ && node.parent.kind === 205 /* BinaryExpression */ &&
                     isEmptyArrayLiteral(node.parent.right);
         }
         function getReferenceCandidate(node) {
             switch (node.kind) {
-                case 195 /* ParenthesizedExpression */:
+                case 196 /* ParenthesizedExpression */:
                     return getReferenceCandidate(node.expression);
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     switch (node.operatorToken.kind) {
-                        case 59 /* EqualsToken */:
+                        case 60 /* EqualsToken */:
                             return getReferenceCandidate(node.left);
                         case 27 /* CommaToken */:
                             return getReferenceCandidate(node.right);
@@ -45533,13 +46893,13 @@ var ts;
         }
         function getReferenceRoot(node) {
             var parent = node.parent;
-            return parent.kind === 195 /* ParenthesizedExpression */ ||
-                parent.kind === 204 /* BinaryExpression */ && parent.operatorToken.kind === 59 /* EqualsToken */ && parent.left === node ||
-                parent.kind === 204 /* BinaryExpression */ && parent.operatorToken.kind === 27 /* CommaToken */ && parent.right === node ?
+            return parent.kind === 196 /* ParenthesizedExpression */ ||
+                parent.kind === 205 /* BinaryExpression */ && parent.operatorToken.kind === 60 /* EqualsToken */ && parent.left === node ||
+                parent.kind === 205 /* BinaryExpression */ && parent.operatorToken.kind === 27 /* CommaToken */ && parent.right === node ?
                 getReferenceRoot(parent) : node;
         }
         function getTypeOfSwitchClause(clause) {
-            if (clause.kind === 271 /* CaseClause */) {
+            if (clause.kind === 272 /* CaseClause */) {
                 return getRegularTypeOfLiteralType(getTypeOfExpression(clause.expression));
             }
             return neverType;
@@ -45561,7 +46921,7 @@ var ts;
             var witnesses = [];
             for (var _i = 0, _a = switchStatement.caseBlock.clauses; _i < _a.length; _i++) {
                 var clause = _a[_i];
-                if (clause.kind === 271 /* CaseClause */) {
+                if (clause.kind === 272 /* CaseClause */) {
                     if (clause.expression.kind === 10 /* StringLiteral */) {
                         witnesses.push(clause.expression.text);
                         continue;
@@ -45607,6 +46967,9 @@ var ts;
             }
             return f(type) ? type : neverType;
         }
+        function countTypes(type) {
+            return type.flags & 1048576 /* Union */ ? type.types.length : 1;
+        }
         function mapType(type, mapper, noReductions) {
             if (type.flags & 131072 /* Never */) {
                 return type;
@@ -45614,25 +46977,20 @@ var ts;
             if (!(type.flags & 1048576 /* Union */)) {
                 return mapper(type);
             }
-            var types = type.types;
-            var mappedType;
             var mappedTypes;
-            for (var _i = 0, types_13 = types; _i < types_13.length; _i++) {
-                var current = types_13[_i];
-                var t = mapper(current);
-                if (t) {
-                    if (!mappedType) {
-                        mappedType = t;
-                    }
-                    else if (!mappedTypes) {
-                        mappedTypes = [mappedType, t];
+            for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
+                var t = _a[_i];
+                var mapped = mapper(t);
+                if (mapped) {
+                    if (!mappedTypes) {
+                        mappedTypes = [mapped];
                     }
                     else {
-                        mappedTypes.push(t);
+                        mappedTypes.push(mapped);
                     }
                 }
             }
-            return mappedTypes ? getUnionType(mappedTypes, noReductions ? 0 /* None */ : 1 /* Literal */) : mappedType;
+            return mappedTypes && getUnionType(mappedTypes, noReductions ? 0 /* None */ : 1 /* Literal */);
         }
         function extractTypesOfKind(type, kind) {
             return filterType(type, function (t) { return (t.flags & kind) !== 0; });
@@ -45700,8 +47058,8 @@ var ts;
         }
         function isEvolvingArrayTypeList(types) {
             var hasEvolvingArrayType = false;
-            for (var _i = 0, types_14 = types; _i < types_14.length; _i++) {
-                var t = types_14[_i];
+            for (var _i = 0, types_13 = types; _i < types_13.length; _i++) {
+                var t = types_13[_i];
                 if (!(t.flags & 131072 /* Never */)) {
                     if (!(ts.getObjectFlags(t) & 256 /* EvolvingArray */)) {
                         return false;
@@ -45724,12 +47082,12 @@ var ts;
         function isEvolvingArrayOperationTarget(node) {
             var root = getReferenceRoot(node);
             var parent = root.parent;
-            var isLengthPushOrUnshift = parent.kind === 189 /* PropertyAccessExpression */ && (parent.name.escapedText === "length" ||
-                parent.parent.kind === 191 /* CallExpression */ && ts.isPushOrUnshiftIdentifier(parent.name));
-            var isElementAssignment = parent.kind === 190 /* ElementAccessExpression */ &&
+            var isLengthPushOrUnshift = parent.kind === 190 /* PropertyAccessExpression */ && (parent.name.escapedText === "length" ||
+                parent.parent.kind === 192 /* CallExpression */ && ts.isPushOrUnshiftIdentifier(parent.name));
+            var isElementAssignment = parent.kind === 191 /* ElementAccessExpression */ &&
                 parent.expression === root &&
-                parent.parent.kind === 204 /* BinaryExpression */ &&
-                parent.parent.operatorToken.kind === 59 /* EqualsToken */ &&
+                parent.parent.kind === 205 /* BinaryExpression */ &&
+                parent.parent.operatorToken.kind === 60 /* EqualsToken */ &&
                 parent.parent.left === parent &&
                 !ts.isAssignmentTarget(parent.parent) &&
                 isTypeAssignableToKind(getTypeOfExpression(parent.argumentExpression), 296 /* NumberLike */);
@@ -45743,7 +47101,7 @@ var ts;
             return links.maybeTypePredicate;
         }
         function getMaybeTypePredicate(node) {
-            if (node.expression.kind !== 98 /* SuperKeyword */) {
+            if (node.expression.kind !== 99 /* SuperKeyword */) {
                 var funcType = checkNonNullExpression(node.expression);
                 if (funcType !== silentNeverType) {
                     var apparentType = getApparentType(funcType);
@@ -45761,6 +47119,7 @@ var ts;
         function getFlowTypeOfReference(reference, declaredType, initialType, flowContainer, couldBeUninitialized) {
             if (initialType === void 0) { initialType = declaredType; }
             var key;
+            var keySet = false;
             var flowDepth = 0;
             if (flowAnalysisDisabled) {
                 return errorType;
@@ -45776,10 +47135,17 @@ var ts;
             // on empty arrays are possible without implicit any errors and new element types can be inferred without
             // type mismatch errors.
             var resultType = ts.getObjectFlags(evolvedType) & 256 /* EvolvingArray */ && isEvolvingArrayOperationTarget(reference) ? autoArrayType : finalizeEvolvingArrayType(evolvedType);
-            if (reference.parent && reference.parent.kind === 213 /* NonNullExpression */ && getTypeWithFacts(resultType, 2097152 /* NEUndefinedOrNull */).flags & 131072 /* Never */) {
+            if (reference.parent && reference.parent.kind === 214 /* NonNullExpression */ && getTypeWithFacts(resultType, 2097152 /* NEUndefinedOrNull */).flags & 131072 /* Never */) {
                 return declaredType;
             }
             return resultType;
+            function getOrSetCacheKey() {
+                if (keySet) {
+                    return key;
+                }
+                keySet = true;
+                return key = getFlowCacheKey(reference, declaredType, initialType, flowContainer);
+            }
             function getTypeAtFlowNode(flow) {
                 if (flowDepth === 2000) {
                     // We have made 2000 recursive invocations. To avoid overflowing the call stack we report an error
@@ -45791,6 +47157,15 @@ var ts;
                 flowDepth++;
                 while (true) {
                     var flags = flow.flags;
+                    if (flags & 8192 /* Cached */) {
+                        var key_2 = getOrSetCacheKey();
+                        if (key_2) {
+                            var id = getFlowNodeId(flow);
+                            if (flowAssignmentKeys[id] === key_2) {
+                                return flowAssignmentTypes[id];
+                            }
+                        }
+                    }
                     if (flags & 1024 /* Shared */) {
                         // We cache results of flow type resolution for shared nodes that were previously visited in
                         // the same getFlowTypeOfReference invocation. A node is considered shared when it is the
@@ -45821,6 +47196,15 @@ var ts;
                             flow = flow.antecedent;
                             continue;
                         }
+                        else if (flowLoopCount === flowLoopStart) { // Only cache assignments when not within loop analysis
+                            var key_3 = getOrSetCacheKey();
+                            if (key_3 && !isIncomplete(type)) {
+                                flow.flags |= 8192 /* Cached */;
+                                var id = getFlowNodeId(flow);
+                                flowAssignmentKeys[id] = key_3;
+                                flowAssignmentTypes[id] = type;
+                            }
+                        }
                     }
                     else if (flags & 96 /* Condition */) {
                         type = getTypeAtFlowCondition(flow);
@@ -45848,9 +47232,9 @@ var ts;
                         // Check if we should continue with the control flow of the containing function.
                         var container = flow.container;
                         if (container && container !== flowContainer &&
-                            reference.kind !== 189 /* PropertyAccessExpression */ &&
-                            reference.kind !== 190 /* ElementAccessExpression */ &&
-                            reference.kind !== 100 /* ThisKeyword */) {
+                            reference.kind !== 190 /* PropertyAccessExpression */ &&
+                            reference.kind !== 191 /* ElementAccessExpression */ &&
+                            reference.kind !== 101 /* ThisKeyword */) {
                             flow = container.flowNode;
                             continue;
                         }
@@ -45902,14 +47286,14 @@ var ts;
                     // in which case we continue control flow analysis back to the function's declaration
                     if (ts.isVariableDeclaration(node) && (ts.isInJSFile(node) || ts.isVarConst(node))) {
                         var init = ts.getDeclaredExpandoInitializer(node);
-                        if (init && (init.kind === 196 /* FunctionExpression */ || init.kind === 197 /* ArrowFunction */)) {
+                        if (init && (init.kind === 197 /* FunctionExpression */ || init.kind === 198 /* ArrowFunction */)) {
                             return getTypeAtFlowNode(flow.antecedent);
                         }
                     }
                     return declaredType;
                 }
                 // for (const _ in ref) acts as a nonnull on ref
-                if (ts.isVariableDeclaration(node) && node.parent.parent.kind === 226 /* ForInStatement */ && isMatchingReference(reference, node.parent.parent.expression)) {
+                if (ts.isVariableDeclaration(node) && node.parent.parent.kind === 227 /* ForInStatement */ && isMatchingReference(reference, node.parent.parent.expression)) {
                     return getNonNullableTypeIfNeeded(getTypeFromFlowType(getTypeAtFlowNode(flow.antecedent)));
                 }
                 // Assignment doesn't affect reference
@@ -45918,7 +47302,7 @@ var ts;
             function getTypeAtFlowArrayMutation(flow) {
                 if (declaredType === autoType || declaredType === autoArrayType) {
                     var node = flow.node;
-                    var expr = node.kind === 191 /* CallExpression */ ?
+                    var expr = node.kind === 192 /* CallExpression */ ?
                         node.expression.expression :
                         node.left.expression;
                     if (isMatchingReference(reference, getReferenceCandidate(expr))) {
@@ -45926,7 +47310,7 @@ var ts;
                         var type = getTypeFromFlowType(flowType);
                         if (ts.getObjectFlags(type) & 256 /* EvolvingArray */) {
                             var evolvedType_1 = type;
-                            if (node.kind === 191 /* CallExpression */) {
+                            if (node.kind === 192 /* CallExpression */) {
                                 for (var _i = 0, _a = node.arguments; _i < _a.length; _i++) {
                                     var arg = _a[_i];
                                     evolvedType_1 = addEvolvingArrayElementType(evolvedType_1, arg);
@@ -45979,7 +47363,7 @@ var ts;
                 else if (isMatchingReferenceDiscriminant(expr, type)) {
                     type = narrowTypeByDiscriminant(type, expr, function (t) { return narrowTypeBySwitchOnDiscriminant(t, flow.switchStatement, flow.clauseStart, flow.clauseEnd); });
                 }
-                else if (expr.kind === 199 /* TypeOfExpression */ && isMatchingReference(reference, expr.expression)) {
+                else if (expr.kind === 200 /* TypeOfExpression */ && isMatchingReference(reference, expr.expression)) {
                     type = narrowBySwitchOnTypeOf(type, flow.switchStatement, flow.clauseStart, flow.clauseEnd);
                 }
                 else if (containsMatchingReferenceDiscriminant(reference, expr)) {
@@ -46026,12 +47410,10 @@ var ts;
                 // this flow loop junction, return the cached type.
                 var id = getFlowNodeId(flow);
                 var cache = flowLoopCaches[id] || (flowLoopCaches[id] = ts.createMap());
+                var key = getOrSetCacheKey();
                 if (!key) {
-                    key = getFlowCacheKey(reference);
                     // No cache key is generated when binding patterns are in unnarrowable situations
-                    if (!key) {
-                        return declaredType;
-                    }
+                    return declaredType;
                 }
                 var cached = cache.get(key);
                 if (cached) {
@@ -46139,7 +47521,7 @@ var ts;
                 return !assumeTrue;
             }
             function narrowByInKeyword(type, literal, assumeTrue) {
-                if ((type.flags & (1048576 /* Union */ | 524288 /* Object */)) || (type.flags & 262144 /* TypeParameter */ && type.isThisType)) {
+                if (type.flags & (1048576 /* Union */ | 524288 /* Object */) || isThisTypeParameter(type)) {
                     var propName_1 = ts.escapeLeadingUnderscores(literal.text);
                     return filterType(type, function (t) { return isTypePresencePossible(t, propName_1, assumeTrue); });
                 }
@@ -46147,8 +47529,8 @@ var ts;
             }
             function narrowTypeByBinaryExpression(type, expr, assumeTrue) {
                 switch (expr.operatorToken.kind) {
-                    case 59 /* EqualsToken */:
-                        return narrowTypeByTruthiness(type, expr.left, assumeTrue);
+                    case 60 /* EqualsToken */:
+                        return narrowTypeByTruthiness(narrowType(type, expr.right, assumeTrue), expr.left, assumeTrue);
                     case 33 /* EqualsEqualsToken */:
                     case 34 /* ExclamationEqualsToken */:
                     case 35 /* EqualsEqualsEqualsToken */:
@@ -46156,10 +47538,10 @@ var ts;
                         var operator_1 = expr.operatorToken.kind;
                         var left_1 = getReferenceCandidate(expr.left);
                         var right_1 = getReferenceCandidate(expr.right);
-                        if (left_1.kind === 199 /* TypeOfExpression */ && ts.isStringLiteralLike(right_1)) {
+                        if (left_1.kind === 200 /* TypeOfExpression */ && ts.isStringLiteralLike(right_1)) {
                             return narrowTypeByTypeof(type, left_1, operator_1, right_1, assumeTrue);
                         }
-                        if (right_1.kind === 199 /* TypeOfExpression */ && ts.isStringLiteralLike(left_1)) {
+                        if (right_1.kind === 200 /* TypeOfExpression */ && ts.isStringLiteralLike(left_1)) {
                             return narrowTypeByTypeof(type, right_1, operator_1, left_1, assumeTrue);
                         }
                         if (isMatchingReference(reference, left_1)) {
@@ -46178,9 +47560,9 @@ var ts;
                             return declaredType;
                         }
                         break;
-                    case 94 /* InstanceOfKeyword */:
+                    case 95 /* InstanceOfKeyword */:
                         return narrowTypeByInstanceof(type, expr, assumeTrue);
-                    case 93 /* InKeyword */:
+                    case 94 /* InKeyword */:
                         var target = getReferenceCandidate(expr.right);
                         if (ts.isStringLiteralLike(expr.left) && isMatchingReference(reference, target)) {
                             return narrowByInKeyword(type, expr.left, assumeTrue);
@@ -46224,7 +47606,10 @@ var ts;
                     return type;
                 }
                 if (assumeTrue) {
-                    var narrowedType = filterType(type, function (t) { return areTypesComparable(t, valueType); });
+                    var filterFn = operator === 33 /* EqualsEqualsToken */ ?
+                        (function (t) { return areTypesComparable(t, valueType) || isCoercibleUnderDoubleEquals(t, valueType); }) :
+                        function (t) { return areTypesComparable(t, valueType); };
+                    var narrowedType = filterType(type, filterFn);
                     return narrowedType.flags & 131072 /* Never */ ? type : replacePrimitivesWithLiterals(narrowedType, valueType);
                 }
                 if (isUnitType(valueType)) {
@@ -46485,7 +47870,7 @@ var ts;
                     return type;
                 }
                 if (ts.isIdentifierTypePredicate(predicate)) {
-                    var predicateArgument = callExpression.arguments[predicate.parameterIndex - (signature.thisParameter ? 1 : 0)];
+                    var predicateArgument = callExpression.arguments[predicate.parameterIndex];
                     if (predicateArgument) {
                         if (isMatchingReference(reference, predicateArgument)) {
                             return getNarrowedType(type, predicate.type, assumeTrue, isTypeSubtypeOf);
@@ -46513,19 +47898,19 @@ var ts;
             // will be a subtype or the same type as the argument.
             function narrowType(type, expr, assumeTrue) {
                 switch (expr.kind) {
-                    case 72 /* Identifier */:
-                    case 100 /* ThisKeyword */:
-                    case 98 /* SuperKeyword */:
-                    case 189 /* PropertyAccessExpression */:
-                    case 190 /* ElementAccessExpression */:
+                    case 73 /* Identifier */:
+                    case 101 /* ThisKeyword */:
+                    case 99 /* SuperKeyword */:
+                    case 190 /* PropertyAccessExpression */:
+                    case 191 /* ElementAccessExpression */:
                         return narrowTypeByTruthiness(type, expr, assumeTrue);
-                    case 191 /* CallExpression */:
+                    case 192 /* CallExpression */:
                         return narrowTypeByTypePredicate(type, expr, assumeTrue);
-                    case 195 /* ParenthesizedExpression */:
+                    case 196 /* ParenthesizedExpression */:
                         return narrowType(type, expr.expression, assumeTrue);
-                    case 204 /* BinaryExpression */:
+                    case 205 /* BinaryExpression */:
                         return narrowTypeByBinaryExpression(type, expr, assumeTrue);
-                    case 202 /* PrefixUnaryExpression */:
+                    case 203 /* PrefixUnaryExpression */:
                         if (expr.operator === 52 /* ExclamationToken */) {
                             return narrowType(type, expr.operand, !assumeTrue);
                         }
@@ -46540,7 +47925,7 @@ var ts;
             // an dotted name expression, and if the location is not an assignment target, obtain the type
             // of the expression (which will reflect control flow analysis). If the expression indeed
             // resolved to the given symbol, return the narrowed type.
-            if (location.kind === 72 /* Identifier */) {
+            if (location.kind === 73 /* Identifier */) {
                 if (ts.isRightSideOfQualifiedNameOrPropertyAccess(location)) {
                     location = location.parent;
                 }
@@ -46561,9 +47946,9 @@ var ts;
         function getControlFlowContainer(node) {
             return ts.findAncestor(node.parent, function (node) {
                 return ts.isFunctionLike(node) && !ts.getImmediatelyInvokedFunctionExpression(node) ||
-                    node.kind === 245 /* ModuleBlock */ ||
-                    node.kind === 284 /* SourceFile */ ||
-                    node.kind === 154 /* PropertyDeclaration */;
+                    node.kind === 246 /* ModuleBlock */ ||
+                    node.kind === 285 /* SourceFile */ ||
+                    node.kind === 155 /* PropertyDeclaration */;
             });
         }
         // Check if a parameter is assigned anywhere within its declaring function.
@@ -46582,10 +47967,10 @@ var ts;
             return !!ts.findAncestor(node.parent, function (node) { return ts.isFunctionLike(node) && !!(getNodeLinks(node).flags & 8388608 /* AssignmentsMarked */); });
         }
         function markParameterAssignments(node) {
-            if (node.kind === 72 /* Identifier */) {
+            if (node.kind === 73 /* Identifier */) {
                 if (ts.isAssignmentTarget(node)) {
                     var symbol = getResolvedSymbol(node);
-                    if (symbol.valueDeclaration && ts.getRootDeclaration(symbol.valueDeclaration).kind === 151 /* Parameter */) {
+                    if (symbol.valueDeclaration && ts.getRootDeclaration(symbol.valueDeclaration).kind === 152 /* Parameter */) {
                         symbol.isAssigned = true;
                     }
                 }
@@ -46600,7 +47985,7 @@ var ts;
         /** remove undefined from the annotated type of a parameter when there is an initializer (that doesn't include undefined) */
         function removeOptionalityFromDeclaredType(declaredType, declaration) {
             var annotationIncludesUndefined = strictNullChecks &&
-                declaration.kind === 151 /* Parameter */ &&
+                declaration.kind === 152 /* Parameter */ &&
                 declaration.initializer &&
                 getFalsyFlags(declaredType) & 32768 /* Undefined */ &&
                 !(getFalsyFlags(checkExpression(declaration.initializer)) & 32768 /* Undefined */);
@@ -46608,13 +47993,13 @@ var ts;
         }
         function isConstraintPosition(node) {
             var parent = node.parent;
-            return parent.kind === 189 /* PropertyAccessExpression */ ||
-                parent.kind === 191 /* CallExpression */ && parent.expression === node ||
-                parent.kind === 190 /* ElementAccessExpression */ && parent.expression === node ||
-                parent.kind === 186 /* BindingElement */ && parent.name === node && !!parent.initializer;
+            return parent.kind === 190 /* PropertyAccessExpression */ ||
+                parent.kind === 192 /* CallExpression */ && parent.expression === node ||
+                parent.kind === 191 /* ElementAccessExpression */ && parent.expression === node ||
+                parent.kind === 187 /* BindingElement */ && parent.name === node && !!parent.initializer;
         }
         function typeHasNullableConstraint(type) {
-            return type.flags & 58982400 /* InstantiableNonPrimitive */ && maybeTypeOfKind(getBaseConstraintOfType(type) || emptyObjectType, 98304 /* Nullable */);
+            return type.flags & 58982400 /* InstantiableNonPrimitive */ && maybeTypeOfKind(getBaseConstraintOfType(type) || unknownType, 98304 /* Nullable */);
         }
         function getConstraintForLocation(type, node) {
             // When a node is the left hand expression of a property access, element access, or call expression,
@@ -46645,7 +48030,7 @@ var ts;
             if (symbol === argumentsSymbol) {
                 var container = ts.getContainingFunction(node);
                 if (languageVersion < 2 /* ES2015 */) {
-                    if (container.kind === 197 /* ArrowFunction */) {
+                    if (container.kind === 198 /* ArrowFunction */) {
                         error(node, ts.Diagnostics.The_arguments_object_cannot_be_referenced_in_an_arrow_function_in_ES3_and_ES5_Consider_using_a_standard_function_expression);
                     }
                     else if (ts.hasModifier(container, 256 /* Async */)) {
@@ -46666,7 +48051,7 @@ var ts;
                 // Due to the emit for class decorators, any reference to the class from inside of the class body
                 // must instead be rewritten to point to a temporary variable to avoid issues with the double-bind
                 // behavior of class names in ES6.
-                if (declaration.kind === 240 /* ClassDeclaration */
+                if (declaration.kind === 241 /* ClassDeclaration */
                     && ts.nodeIsDecorated(declaration)) {
                     var container = ts.getContainingClass(node);
                     while (container !== undefined) {
@@ -46678,14 +48063,14 @@ var ts;
                         container = ts.getContainingClass(container);
                     }
                 }
-                else if (declaration.kind === 209 /* ClassExpression */) {
+                else if (declaration.kind === 210 /* ClassExpression */) {
                     // When we emit a class expression with static members that contain a reference
                     // to the constructor in the initializer, we will need to substitute that
                     // binding with an alias as the class name is not in scope.
                     var container = ts.getThisContainer(node, /*includeArrowFunctions*/ false);
-                    while (container.kind !== 284 /* SourceFile */) {
+                    while (container.kind !== 285 /* SourceFile */) {
                         if (container.parent === declaration) {
-                            if (container.kind === 154 /* PropertyDeclaration */ && ts.hasModifier(container, 32 /* Static */)) {
+                            if (container.kind === 155 /* PropertyDeclaration */ && ts.hasModifier(container, 32 /* Static */)) {
                                 getNodeLinks(declaration).flags |= 16777216 /* ClassWithConstructorReference */;
                                 getNodeLinks(node).flags |= 33554432 /* ConstructorReferenceInClass */;
                             }
@@ -46734,7 +48119,7 @@ var ts;
             // The declaration container is the innermost function that encloses the declaration of the variable
             // or parameter. The flow container is the innermost function starting with which we analyze the control
             // flow graph to determine the control flow based type.
-            var isParameter = ts.getRootDeclaration(declaration).kind === 151 /* Parameter */;
+            var isParameter = ts.getRootDeclaration(declaration).kind === 152 /* Parameter */;
             var declarationContainer = getControlFlowContainer(declaration);
             var flowContainer = getControlFlowContainer(node);
             var isOuterVariable = flowContainer !== declarationContainer;
@@ -46743,19 +48128,19 @@ var ts;
             // When the control flow originates in a function expression or arrow function and we are referencing
             // a const variable or parameter from an outer function, we extend the origin of the control flow
             // analysis to include the immediately enclosing function.
-            while (flowContainer !== declarationContainer && (flowContainer.kind === 196 /* FunctionExpression */ ||
-                flowContainer.kind === 197 /* ArrowFunction */ || ts.isObjectLiteralOrClassExpressionMethod(flowContainer)) &&
+            while (flowContainer !== declarationContainer && (flowContainer.kind === 197 /* FunctionExpression */ ||
+                flowContainer.kind === 198 /* ArrowFunction */ || ts.isObjectLiteralOrClassExpressionMethod(flowContainer)) &&
                 (isConstVariable(localOrExportSymbol) || isParameter && !isParameterAssigned(localOrExportSymbol))) {
                 flowContainer = getControlFlowContainer(flowContainer);
             }
             // We only look for uninitialized variables in strict null checking mode, and only when we can analyze
             // the entire control flow graph from the variable's declaration (i.e. when the flow container and
             // declaration container are the same).
-            var assumeInitialized = isParameter || isAlias || isOuterVariable || isSpreadDestructuringAssignmentTarget || isModuleExports ||
+            var assumeInitialized = isParameter || isAlias || isOuterVariable || isSpreadDestructuringAssignmentTarget || isModuleExports || ts.isBindingElement(declaration) ||
                 type !== autoType && type !== autoArrayType && (!strictNullChecks || (type.flags & 3 /* AnyOrUnknown */) !== 0 ||
-                    isInTypeQuery(node) || node.parent.kind === 257 /* ExportSpecifier */) ||
-                node.parent.kind === 213 /* NonNullExpression */ ||
-                declaration.kind === 237 /* VariableDeclaration */ && declaration.exclamationToken ||
+                    isInTypeQuery(node) || node.parent.kind === 258 /* ExportSpecifier */) ||
+                node.parent.kind === 214 /* NonNullExpression */ ||
+                declaration.kind === 238 /* VariableDeclaration */ && declaration.exclamationToken ||
                 declaration.flags & 4194304 /* Ambient */;
             var initialType = assumeInitialized ? (isParameter ? removeOptionalityFromDeclaredType(type, declaration) : type) :
                 type === autoType || type === autoArrayType ? undefinedType :
@@ -46789,7 +48174,8 @@ var ts;
         function checkNestedBlockScopedBinding(node, symbol) {
             if (languageVersion >= 2 /* ES2015 */ ||
                 (symbol.flags & (2 /* BlockScopedVariable */ | 32 /* Class */)) === 0 ||
-                symbol.valueDeclaration.parent.kind === 274 /* CatchClause */) {
+                ts.isSourceFile(symbol.valueDeclaration) ||
+                symbol.valueDeclaration.parent.kind === 275 /* CatchClause */) {
                 return;
             }
             // 1. walk from the use site up to the declaration and check
@@ -46812,7 +48198,7 @@ var ts;
                     // mark iteration statement as containing block-scoped binding captured in some function
                     var capturesBlockScopeBindingInLoopBody = true;
                     if (ts.isForStatement(container) &&
-                        ts.getAncestor(symbol.valueDeclaration, 238 /* VariableDeclarationList */).parent === container) {
+                        ts.getAncestor(symbol.valueDeclaration, 239 /* VariableDeclarationList */).parent === container) {
                         var part = getPartOfForStatementContainingNode(node.parent, container);
                         if (part) {
                             var links = getNodeLinks(part);
@@ -46830,8 +48216,8 @@ var ts;
                 }
                 // mark variables that are declared in loop initializer and reassigned inside the body of ForStatement.
                 // if body of ForStatement will be converted to function then we'll need a extra machinery to propagate reassigned values back.
-                if (container.kind === 225 /* ForStatement */ &&
-                    ts.getAncestor(symbol.valueDeclaration, 238 /* VariableDeclarationList */).parent === container &&
+                if (container.kind === 226 /* ForStatement */ &&
+                    ts.getAncestor(symbol.valueDeclaration, 239 /* VariableDeclarationList */).parent === container &&
                     isAssignedInBodyOfForStatement(node, container)) {
                     getNodeLinks(symbol.valueDeclaration).flags |= 4194304 /* NeedsLoopOutParameter */;
                 }
@@ -46849,7 +48235,7 @@ var ts;
         function isAssignedInBodyOfForStatement(node, container) {
             // skip parenthesized nodes
             var current = node;
-            while (current.parent.kind === 195 /* ParenthesizedExpression */) {
+            while (current.parent.kind === 196 /* ParenthesizedExpression */) {
                 current = current.parent;
             }
             // check if node is used as LHS in some assignment expression
@@ -46857,7 +48243,7 @@ var ts;
             if (ts.isAssignmentTarget(current)) {
                 isAssigned = true;
             }
-            else if ((current.parent.kind === 202 /* PrefixUnaryExpression */ || current.parent.kind === 203 /* PostfixUnaryExpression */)) {
+            else if ((current.parent.kind === 203 /* PrefixUnaryExpression */ || current.parent.kind === 204 /* PostfixUnaryExpression */)) {
                 var expr = current.parent;
                 isAssigned = expr.operator === 44 /* PlusPlusToken */ || expr.operator === 45 /* MinusMinusToken */;
             }
@@ -46870,7 +48256,7 @@ var ts;
         }
         function captureLexicalThis(node, container) {
             getNodeLinks(node).flags |= 2 /* LexicalThis */;
-            if (container.kind === 154 /* PropertyDeclaration */ || container.kind === 157 /* Constructor */) {
+            if (container.kind === 155 /* PropertyDeclaration */ || container.kind === 158 /* Constructor */) {
                 var classNode = container.parent;
                 getNodeLinks(classNode).flags |= 4 /* CaptureThis */;
             }
@@ -46938,37 +48324,37 @@ var ts;
             // tell whether 'this' needs to be captured.
             var container = ts.getThisContainer(node, /* includeArrowFunctions */ true);
             var capturedByArrowFunction = false;
-            if (container.kind === 157 /* Constructor */) {
+            if (container.kind === 158 /* Constructor */) {
                 checkThisBeforeSuper(node, container, ts.Diagnostics.super_must_be_called_before_accessing_this_in_the_constructor_of_a_derived_class);
             }
             // Now skip arrow functions to get the "real" owner of 'this'.
-            if (container.kind === 197 /* ArrowFunction */) {
+            if (container.kind === 198 /* ArrowFunction */) {
                 container = ts.getThisContainer(container, /* includeArrowFunctions */ false);
                 capturedByArrowFunction = true;
             }
             switch (container.kind) {
-                case 244 /* ModuleDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     error(node, ts.Diagnostics.this_cannot_be_referenced_in_a_module_or_namespace_body);
                     // do not return here so in case if lexical this is captured - it will be reflected in flags on NodeLinks
                     break;
-                case 243 /* EnumDeclaration */:
+                case 244 /* EnumDeclaration */:
                     error(node, ts.Diagnostics.this_cannot_be_referenced_in_current_location);
                     // do not return here so in case if lexical this is captured - it will be reflected in flags on NodeLinks
                     break;
-                case 157 /* Constructor */:
+                case 158 /* Constructor */:
                     if (isInConstructorArgumentInitializer(node, container)) {
                         error(node, ts.Diagnostics.this_cannot_be_referenced_in_constructor_arguments);
                         // do not return here so in case if lexical this is captured - it will be reflected in flags on NodeLinks
                     }
                     break;
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
                     if (ts.hasModifier(container, 32 /* Static */)) {
                         error(node, ts.Diagnostics.this_cannot_be_referenced_in_a_static_property_initializer);
                         // do not return here so in case if lexical this is captured - it will be reflected in flags on NodeLinks
                     }
                     break;
-                case 149 /* ComputedPropertyName */:
+                case 150 /* ComputedPropertyName */:
                     error(node, ts.Diagnostics.this_cannot_be_referenced_in_a_computed_property_name);
                     break;
             }
@@ -46988,7 +48374,7 @@ var ts;
                     if (!ts.isSourceFile(container)) {
                         var outsideThis = tryGetThisTypeAt(container);
                         if (outsideThis && outsideThis !== globalThisType_1) {
-                            addRelatedInfo(diag, ts.createDiagnosticForNode(container, ts.Diagnostics.An_outer_value_of_this_is_shadowed_by_this_container));
+                            ts.addRelatedInfo(diag, ts.createDiagnosticForNode(container, ts.Diagnostics.An_outer_value_of_this_is_shadowed_by_this_container));
                         }
                     }
                 }
@@ -47018,7 +48404,7 @@ var ts;
                 //   * /** @constructor */ function [name]() { ... }
                 //   * /** @constructor */ var x = function() { ... }
                 else if (isInJS &&
-                    (container.kind === 196 /* FunctionExpression */ || container.kind === 239 /* FunctionDeclaration */) &&
+                    (container.kind === 197 /* FunctionExpression */ || container.kind === 240 /* FunctionDeclaration */) &&
                     ts.getJSDocClassTag(container)) {
                     var classType = getJSClassType(getMergedSymbol(container.symbol));
                     if (classType) {
@@ -47054,7 +48440,7 @@ var ts;
         }
         function getClassNameFromPrototypeMethod(container) {
             // Check if it's the RHS of a x.prototype.y = function [name]() { .... }
-            if (container.kind === 196 /* FunctionExpression */ &&
+            if (container.kind === 197 /* FunctionExpression */ &&
                 ts.isBinaryExpression(container.parent) &&
                 ts.getAssignmentDeclarationKind(container.parent) === 3 /* PrototypeProperty */) {
                 // Get the 'x' of 'x.prototype.y = container'
@@ -47064,16 +48450,16 @@ var ts;
                     .expression; // x
             }
             // x.prototype = { method() { } }
-            else if (container.kind === 156 /* MethodDeclaration */ &&
-                container.parent.kind === 188 /* ObjectLiteralExpression */ &&
+            else if (container.kind === 157 /* MethodDeclaration */ &&
+                container.parent.kind === 189 /* ObjectLiteralExpression */ &&
                 ts.isBinaryExpression(container.parent.parent) &&
                 ts.getAssignmentDeclarationKind(container.parent.parent) === 6 /* Prototype */) {
                 return container.parent.parent.left.expression;
             }
             // x.prototype = { method: function() { } }
-            else if (container.kind === 196 /* FunctionExpression */ &&
-                container.parent.kind === 275 /* PropertyAssignment */ &&
-                container.parent.parent.kind === 188 /* ObjectLiteralExpression */ &&
+            else if (container.kind === 197 /* FunctionExpression */ &&
+                container.parent.kind === 276 /* PropertyAssignment */ &&
+                container.parent.parent.kind === 189 /* ObjectLiteralExpression */ &&
                 ts.isBinaryExpression(container.parent.parent.parent) &&
                 ts.getAssignmentDeclarationKind(container.parent.parent.parent) === 6 /* Prototype */) {
                 return container.parent.parent.parent.left.expression;
@@ -47081,7 +48467,7 @@ var ts;
             // Object.defineProperty(x, "method", { value: function() { } });
             // Object.defineProperty(x, "method", { set: (x: () => void) => void });
             // Object.defineProperty(x, "method", { get: () => function() { }) });
-            else if (container.kind === 196 /* FunctionExpression */ &&
+            else if (container.kind === 197 /* FunctionExpression */ &&
                 ts.isPropertyAssignment(container.parent) &&
                 ts.isIdentifier(container.parent.name) &&
                 (container.parent.name.escapedText === "value" || container.parent.name.escapedText === "get" || container.parent.name.escapedText === "set") &&
@@ -47106,7 +48492,7 @@ var ts;
         }
         function getTypeForThisExpressionFromJSDoc(node) {
             var jsdocType = ts.getJSDocType(node);
-            if (jsdocType && jsdocType.kind === 294 /* JSDocFunctionType */) {
+            if (jsdocType && jsdocType.kind === 295 /* JSDocFunctionType */) {
                 var jsDocFunctionType = jsdocType;
                 if (jsDocFunctionType.parameters.length > 0 &&
                     jsDocFunctionType.parameters[0].name &&
@@ -47120,15 +48506,15 @@ var ts;
             }
         }
         function isInConstructorArgumentInitializer(node, constructorDecl) {
-            return !!ts.findAncestor(node, function (n) { return ts.isFunctionLikeDeclaration(n) ? "quit" : n.kind === 151 /* Parameter */ && n.parent === constructorDecl; });
+            return !!ts.findAncestor(node, function (n) { return ts.isFunctionLikeDeclaration(n) ? "quit" : n.kind === 152 /* Parameter */ && n.parent === constructorDecl; });
         }
         function checkSuperExpression(node) {
-            var isCallExpression = node.parent.kind === 191 /* CallExpression */ && node.parent.expression === node;
+            var isCallExpression = node.parent.kind === 192 /* CallExpression */ && node.parent.expression === node;
             var container = ts.getSuperContainer(node, /*stopOnFunctions*/ true);
             var needToCaptureLexicalThis = false;
             // adjust the container reference in case if super is used inside arrow functions with arbitrarily deep nesting
             if (!isCallExpression) {
-                while (container && container.kind === 197 /* ArrowFunction */) {
+                while (container && container.kind === 198 /* ArrowFunction */) {
                     container = ts.getSuperContainer(container, /*stopOnFunctions*/ true);
                     needToCaptureLexicalThis = languageVersion < 2 /* ES2015 */;
                 }
@@ -47141,14 +48527,14 @@ var ts;
                 // class B {
                 //     [super.foo()]() {}
                 // }
-                var current = ts.findAncestor(node, function (n) { return n === container ? "quit" : n.kind === 149 /* ComputedPropertyName */; });
-                if (current && current.kind === 149 /* ComputedPropertyName */) {
+                var current = ts.findAncestor(node, function (n) { return n === container ? "quit" : n.kind === 150 /* ComputedPropertyName */; });
+                if (current && current.kind === 150 /* ComputedPropertyName */) {
                     error(node, ts.Diagnostics.super_cannot_be_referenced_in_a_computed_property_name);
                 }
                 else if (isCallExpression) {
                     error(node, ts.Diagnostics.Super_calls_are_not_permitted_outside_constructors_or_in_nested_functions_inside_constructors);
                 }
-                else if (!container || !container.parent || !(ts.isClassLike(container.parent) || container.parent.kind === 188 /* ObjectLiteralExpression */)) {
+                else if (!container || !container.parent || !(ts.isClassLike(container.parent) || container.parent.kind === 189 /* ObjectLiteralExpression */)) {
                     error(node, ts.Diagnostics.super_can_only_be_referenced_in_members_of_derived_classes_or_object_literal_expressions);
                 }
                 else {
@@ -47156,7 +48542,7 @@ var ts;
                 }
                 return errorType;
             }
-            if (!isCallExpression && container.kind === 157 /* Constructor */) {
+            if (!isCallExpression && container.kind === 158 /* Constructor */) {
                 checkThisBeforeSuper(node, container, ts.Diagnostics.super_must_be_called_before_accessing_a_property_of_super_in_the_constructor_of_a_derived_class);
             }
             if (ts.hasModifier(container, 32 /* Static */) || isCallExpression) {
@@ -47225,7 +48611,7 @@ var ts;
             // as a call expression cannot be used as the target of a destructuring assignment while a property access can.
             //
             // For element access expressions (`super[x]`), we emit a generic helper that forwards the element access in both situations.
-            if (container.kind === 156 /* MethodDeclaration */ && ts.hasModifier(container, 256 /* Async */)) {
+            if (container.kind === 157 /* MethodDeclaration */ && ts.hasModifier(container, 256 /* Async */)) {
                 if (ts.isSuperProperty(node.parent) && ts.isAssignmentTarget(node.parent)) {
                     getNodeLinks(container).flags |= 4096 /* AsyncMethodWithSuperBinding */;
                 }
@@ -47239,7 +48625,7 @@ var ts;
                 // in this case they should also use correct lexical this
                 captureLexicalThis(node.parent, container);
             }
-            if (container.parent.kind === 188 /* ObjectLiteralExpression */) {
+            if (container.parent.kind === 189 /* ObjectLiteralExpression */) {
                 if (languageVersion < 2 /* ES2015 */) {
                     error(node, ts.Diagnostics.super_is_only_allowed_in_members_of_object_literal_expressions_when_option_target_is_ES2015_or_higher);
                     return errorType;
@@ -47260,7 +48646,7 @@ var ts;
             if (!baseClassType) {
                 return errorType;
             }
-            if (container.kind === 157 /* Constructor */ && isInConstructorArgumentInitializer(node, container)) {
+            if (container.kind === 158 /* Constructor */ && isInConstructorArgumentInitializer(node, container)) {
                 // issue custom error message for super property access in constructor arguments (to be aligned with old compiler)
                 error(node, ts.Diagnostics.super_cannot_be_referenced_in_constructor_arguments);
                 return errorType;
@@ -47275,7 +48661,7 @@ var ts;
                 if (isCallExpression) {
                     // TS 1.0 SPEC (April 2014): 4.8.1
                     // Super calls are only permitted in constructors of derived classes
-                    return container.kind === 157 /* Constructor */;
+                    return container.kind === 158 /* Constructor */;
                 }
                 else {
                     // TS 1.0 SPEC (April 2014)
@@ -47283,21 +48669,21 @@ var ts;
                     // - In a constructor, instance member function, instance member accessor, or instance member variable initializer where this references a derived class instance
                     // - In a static member function or static member accessor
                     // topmost container must be something that is directly nested in the class declaration\object literal expression
-                    if (ts.isClassLike(container.parent) || container.parent.kind === 188 /* ObjectLiteralExpression */) {
+                    if (ts.isClassLike(container.parent) || container.parent.kind === 189 /* ObjectLiteralExpression */) {
                         if (ts.hasModifier(container, 32 /* Static */)) {
-                            return container.kind === 156 /* MethodDeclaration */ ||
-                                container.kind === 155 /* MethodSignature */ ||
-                                container.kind === 158 /* GetAccessor */ ||
-                                container.kind === 159 /* SetAccessor */;
+                            return container.kind === 157 /* MethodDeclaration */ ||
+                                container.kind === 156 /* MethodSignature */ ||
+                                container.kind === 159 /* GetAccessor */ ||
+                                container.kind === 160 /* SetAccessor */;
                         }
                         else {
-                            return container.kind === 156 /* MethodDeclaration */ ||
-                                container.kind === 155 /* MethodSignature */ ||
-                                container.kind === 158 /* GetAccessor */ ||
-                                container.kind === 159 /* SetAccessor */ ||
-                                container.kind === 154 /* PropertyDeclaration */ ||
-                                container.kind === 153 /* PropertySignature */ ||
-                                container.kind === 157 /* Constructor */;
+                            return container.kind === 157 /* MethodDeclaration */ ||
+                                container.kind === 156 /* MethodSignature */ ||
+                                container.kind === 159 /* GetAccessor */ ||
+                                container.kind === 160 /* SetAccessor */ ||
+                                container.kind === 155 /* PropertyDeclaration */ ||
+                                container.kind === 154 /* PropertySignature */ ||
+                                container.kind === 158 /* Constructor */;
                         }
                     }
                 }
@@ -47305,10 +48691,10 @@ var ts;
             }
         }
         function getContainingObjectLiteral(func) {
-            return (func.kind === 156 /* MethodDeclaration */ ||
-                func.kind === 158 /* GetAccessor */ ||
-                func.kind === 159 /* SetAccessor */) && func.parent.kind === 188 /* ObjectLiteralExpression */ ? func.parent :
-                func.kind === 196 /* FunctionExpression */ && func.parent.kind === 275 /* PropertyAssignment */ ? func.parent.parent :
+            return (func.kind === 157 /* MethodDeclaration */ ||
+                func.kind === 159 /* GetAccessor */ ||
+                func.kind === 160 /* SetAccessor */) && func.parent.kind === 189 /* ObjectLiteralExpression */ ? func.parent :
+                func.kind === 197 /* FunctionExpression */ && func.parent.kind === 276 /* PropertyAssignment */ ? func.parent.parent :
                     undefined;
         }
         function getThisTypeArgument(type) {
@@ -47320,7 +48706,7 @@ var ts;
             });
         }
         function getContextualThisParameterType(func) {
-            if (func.kind === 197 /* ArrowFunction */) {
+            if (func.kind === 198 /* ArrowFunction */) {
                 return undefined;
             }
             if (isContextSensitiveFunctionOrObjectLiteralMethod(func)) {
@@ -47345,9 +48731,9 @@ var ts;
                     while (type) {
                         var thisType = getThisTypeFromContextualType(type);
                         if (thisType) {
-                            return instantiateType(thisType, getContextualMapper(containingLiteral));
+                            return instantiateType(thisType, getMapperFromContext(getInferenceContext(containingLiteral)));
                         }
-                        if (literal.parent.kind !== 275 /* PropertyAssignment */) {
+                        if (literal.parent.kind !== 276 /* PropertyAssignment */) {
                             break;
                         }
                         literal = literal.parent.parent;
@@ -47356,14 +48742,14 @@ var ts;
                     // There was no contextual ThisType<T> for the containing object literal, so the contextual type
                     // for 'this' is the non-null form of the contextual type for the containing object literal or
                     // the type of the object literal itself.
-                    return contextualType ? getNonNullableType(contextualType) : checkExpressionCached(containingLiteral);
+                    return getWidenedType(contextualType ? getNonNullableType(contextualType) : checkExpressionCached(containingLiteral));
                 }
                 // In an assignment of the form 'obj.xxx = function(...)' or 'obj[xxx] = function(...)', the
                 // contextual type for 'this' is 'obj'.
                 var parent = func.parent;
-                if (parent.kind === 204 /* BinaryExpression */ && parent.operatorToken.kind === 59 /* EqualsToken */) {
+                if (parent.kind === 205 /* BinaryExpression */ && parent.operatorToken.kind === 60 /* EqualsToken */) {
                     var target = parent.left;
-                    if (target.kind === 189 /* PropertyAccessExpression */ || target.kind === 190 /* ElementAccessExpression */) {
+                    if (target.kind === 190 /* PropertyAccessExpression */ || target.kind === 191 /* ElementAccessExpression */) {
                         var expression = target.expression;
                         // Don't contextually type `this` as `exports` in `exports.Point = function(x, y) { this.x = x; this.y = y; }`
                         if (inJs && ts.isIdentifier(expression)) {
@@ -47372,14 +48758,14 @@ var ts;
                                 return undefined;
                             }
                         }
-                        return checkExpressionCached(expression);
+                        return getWidenedType(checkExpressionCached(expression));
                     }
                 }
             }
             return undefined;
         }
         // Return contextual type of parameter or undefined if no contextual type is available
-        function getContextuallyTypedParameterType(parameter) {
+        function getContextuallyTypedParameterType(parameter, forCache) {
             var func = parameter.parent;
             if (!isContextSensitiveFunctionOrObjectLiteralMethod(func)) {
                 return undefined;
@@ -47402,6 +48788,19 @@ var ts;
             }
             var contextualSignature = getContextualSignature(func);
             if (contextualSignature) {
+                if (forCache) {
+                    // Calling the below guarantees the types are primed and assigned in the same way
+                    // as when the parameter is reached via `checkFunctionExpressionOrObjectLiteralMethod`.
+                    // This should prevent any uninstantiated inference variables in the contextual signature
+                    // from leaking, and should lock in cached parameter types via `assignContextualParameterTypes`
+                    // which we will then immediately use the results of below.
+                    contextuallyCheckFunctionExpressionOrObjectLiteralMethod(func);
+                    var type = getTypeOfSymbol(getMergedSymbol(func.symbol));
+                    if (isTypeAny(type)) {
+                        return type;
+                    }
+                    contextualSignature = getSignaturesOfType(type, 0 /* Call */)[0];
+                }
                 var index = func.parameters.indexOf(parameter) - (ts.getThisParameter(func) ? 1 : 0);
                 return parameter.dotDotDotToken && ts.lastOrUndefined(func.parameters) === parameter ?
                     getRestTypeAtPosition(contextualSignature, index) :
@@ -47414,9 +48813,9 @@ var ts;
                 return getTypeFromTypeNode(typeNode);
             }
             switch (declaration.kind) {
-                case 151 /* Parameter */:
-                    return getContextuallyTypedParameterType(declaration);
-                case 186 /* BindingElement */:
+                case 152 /* Parameter */:
+                    return getContextuallyTypedParameterType(declaration, /*forCache*/ false);
+                case 187 /* BindingElement */:
                     return getContextualTypeForBindingElement(declaration);
                 // By default, do nothing and return undefined - only parameters and binding elements have context implied by a parent
             }
@@ -47488,7 +48887,7 @@ var ts;
                 if (contextualReturnType) {
                     return node.asteriskToken
                         ? contextualReturnType
-                        : getIteratedTypeOfGenerator(contextualReturnType, (functionFlags & 2 /* Async */) !== 0);
+                        : getIterationTypeOfGeneratorFunctionReturnType(0 /* Yield */, contextualReturnType, (functionFlags & 2 /* Async */) !== 0);
                 }
             }
             return undefined;
@@ -47537,16 +48936,16 @@ var ts;
             return getTypeAtPosition(signature, argIndex);
         }
         function getContextualTypeForSubstitutionExpression(template, substitutionExpression) {
-            if (template.parent.kind === 193 /* TaggedTemplateExpression */) {
+            if (template.parent.kind === 194 /* TaggedTemplateExpression */) {
                 return getContextualTypeForArgument(template.parent, substitutionExpression);
             }
             return undefined;
         }
-        function getContextualTypeForBinaryOperand(node) {
+        function getContextualTypeForBinaryOperand(node, contextFlags) {
             var binaryExpression = node.parent;
             var left = binaryExpression.left, operatorToken = binaryExpression.operatorToken, right = binaryExpression.right;
             switch (operatorToken.kind) {
-                case 59 /* EqualsToken */:
+                case 60 /* EqualsToken */:
                     if (node !== right) {
                         return undefined;
                     }
@@ -47556,15 +48955,17 @@ var ts;
                     }
                     return contextSensitive === true ? getTypeOfExpression(left) : contextSensitive;
                 case 55 /* BarBarToken */:
-                    // When an || expression has a contextual type, the operands are contextually typed by that type. When an ||
-                    // expression has no contextual type, the right operand is contextually typed by the type of the left operand,
-                    // except for the special case of Javascript declarations of the form `namespace.prop = namespace.prop || {}`
-                    var type = getContextualType(binaryExpression);
-                    return !type && node === right && !ts.isDefaultedExpandoInitializer(binaryExpression) ?
+                    // When an || expression has a contextual type, the operands are contextually typed by that type, except
+                    // when that type originates in a binding pattern, the right operand is contextually typed by the type of
+                    // the left operand. When an || expression has no contextual type, the right operand is contextually typed
+                    // by the type of the left operand, except for the special case of Javascript declarations of the form
+                    // `namespace.prop = namespace.prop || {}`.
+                    var type = getContextualType(binaryExpression, contextFlags);
+                    return node === right && (type && type.pattern || !type && !ts.isDefaultedExpandoInitializer(binaryExpression)) ?
                         getTypeOfExpression(left) : type;
                 case 54 /* AmpersandAmpersandToken */:
                 case 27 /* CommaToken */:
-                    return node === right ? getContextualType(binaryExpression) : undefined;
+                    return node === right ? getContextualType(binaryExpression, contextFlags) : undefined;
                 default:
                     return undefined;
             }
@@ -47640,7 +49041,15 @@ var ts;
         }
         function getTypeOfPropertyOfContextualType(type, name) {
             return mapType(type, function (t) {
-                if (t.flags & 3670016 /* StructuredType */) {
+                if (isGenericMappedType(t)) {
+                    var constraint = getConstraintTypeFromMappedType(t);
+                    var constraintOfConstraint = getBaseConstraintOfType(constraint) || constraint;
+                    var propertyNameType = getLiteralType(ts.unescapeLeadingUnderscores(name));
+                    if (isTypeAssignableTo(propertyNameType, constraintOfConstraint)) {
+                        return substituteIndexedMappedType(t, propertyNameType);
+                    }
+                }
+                else if (t.flags & 3670016 /* StructuredType */) {
                     var prop = getPropertyOfType(t, name);
                     if (prop) {
                         return getTypeOfSymbol(prop);
@@ -47663,24 +49072,24 @@ var ts;
         // In an object literal contextually typed by a type T, the contextual type of a property assignment is the type of
         // the matching property in T, if one exists. Otherwise, it is the type of the numeric index signature in T, if one
         // exists. Otherwise, it is the type of the string index signature in T, if one exists.
-        function getContextualTypeForObjectLiteralMethod(node) {
+        function getContextualTypeForObjectLiteralMethod(node, contextFlags) {
             ts.Debug.assert(ts.isObjectLiteralMethod(node));
             if (node.flags & 8388608 /* InWithStatement */) {
                 // We cannot answer semantic questions within a with block, do not proceed any further
                 return undefined;
             }
-            return getContextualTypeForObjectLiteralElement(node);
+            return getContextualTypeForObjectLiteralElement(node, contextFlags);
         }
-        function getContextualTypeForObjectLiteralElement(element) {
+        function getContextualTypeForObjectLiteralElement(element, contextFlags) {
             var objectLiteral = element.parent;
-            var type = getApparentTypeOfContextualType(objectLiteral);
+            var type = getApparentTypeOfContextualType(objectLiteral, contextFlags);
             if (type) {
                 if (!hasNonBindableDynamicName(element)) {
                     // For a (non-symbol) computed property, there is no reason to look up the name
                     // in the type. It will just be "__computed", which does not appear in any
                     // SymbolTable.
-                    var symbolName_2 = getSymbolOfNode(element).escapedName;
-                    var propertyType = getTypeOfPropertyOfContextualType(type, symbolName_2);
+                    var symbolName_3 = getSymbolOfNode(element).escapedName;
+                    var propertyType = getTypeOfPropertyOfContextualType(type, symbolName_3);
                     if (propertyType) {
                         return propertyType;
                     }
@@ -47696,12 +49105,12 @@ var ts;
         // type of T.
         function getContextualTypeForElementExpression(arrayContextualType, index) {
             return arrayContextualType && (getTypeOfPropertyOfContextualType(arrayContextualType, "" + index)
-                || getIteratedTypeOrElementType(arrayContextualType, /*errorNode*/ undefined, /*allowStringInput*/ false, /*allowAsyncIterables*/ false, /*checkAssignability*/ false));
+                || getIteratedTypeOrElementType(1 /* Element */, arrayContextualType, undefinedType, /*errorNode*/ undefined, /*checkAssignability*/ false));
         }
         // In a contextually typed conditional expression, the true/false expressions are contextually typed by the same type.
-        function getContextualTypeForConditionalOperand(node) {
+        function getContextualTypeForConditionalOperand(node, contextFlags) {
             var conditional = node.parent;
-            return node === conditional.whenTrue || node === conditional.whenFalse ? getContextualType(conditional) : undefined;
+            return node === conditional.whenTrue || node === conditional.whenFalse ? getContextualType(conditional, contextFlags) : undefined;
         }
         function getContextualTypeForChildJsxExpression(node, child) {
             var attributesType = getApparentTypeOfContextualType(node.openingElement.tagName);
@@ -47710,16 +49119,17 @@ var ts;
             if (!(attributesType && !isTypeAny(attributesType) && jsxChildrenPropertyName && jsxChildrenPropertyName !== "")) {
                 return undefined;
             }
-            var childIndex = node.children.indexOf(child);
+            var realChildren = getSemanticJsxChildren(node.children);
+            var childIndex = realChildren.indexOf(child);
             var childFieldType = getTypeOfPropertyOfContextualType(attributesType, jsxChildrenPropertyName);
-            return childFieldType && mapType(childFieldType, function (t) {
+            return childFieldType && (realChildren.length === 1 ? childFieldType : mapType(childFieldType, function (t) {
                 if (isArrayLikeType(t)) {
                     return getIndexedAccessType(t, getLiteralType(childIndex));
                 }
                 else {
                     return t;
                 }
-            }, /*noReductions*/ true);
+            }, /*noReductions*/ true));
         }
         function getContextualTypeForJsxExpression(node) {
             var exprParent = node.parent;
@@ -47753,30 +49163,30 @@ var ts;
                 case 8 /* NumericLiteral */:
                 case 9 /* BigIntLiteral */:
                 case 14 /* NoSubstitutionTemplateLiteral */:
-                case 102 /* TrueKeyword */:
-                case 87 /* FalseKeyword */:
-                case 96 /* NullKeyword */:
-                case 72 /* Identifier */:
-                case 141 /* UndefinedKeyword */:
+                case 103 /* TrueKeyword */:
+                case 88 /* FalseKeyword */:
+                case 97 /* NullKeyword */:
+                case 73 /* Identifier */:
+                case 142 /* UndefinedKeyword */:
                     return true;
-                case 189 /* PropertyAccessExpression */:
-                case 195 /* ParenthesizedExpression */:
+                case 190 /* PropertyAccessExpression */:
+                case 196 /* ParenthesizedExpression */:
                     return isPossiblyDiscriminantValue(node.expression);
-                case 270 /* JsxExpression */:
+                case 271 /* JsxExpression */:
                     return !node.expression || isPossiblyDiscriminantValue(node.expression);
             }
             return false;
         }
         function discriminateContextualTypeByObjectMembers(node, contextualType) {
-            return discriminateTypeByDiscriminableItems(contextualType, ts.map(ts.filter(node.properties, function (p) { return !!p.symbol && p.kind === 275 /* PropertyAssignment */ && isPossiblyDiscriminantValue(p.initializer) && isDiscriminantProperty(contextualType, p.symbol.escapedName); }), function (prop) { return [function () { return checkExpression(prop.initializer); }, prop.symbol.escapedName]; }), isTypeAssignableTo, contextualType);
+            return discriminateTypeByDiscriminableItems(contextualType, ts.map(ts.filter(node.properties, function (p) { return !!p.symbol && p.kind === 276 /* PropertyAssignment */ && isPossiblyDiscriminantValue(p.initializer) && isDiscriminantProperty(contextualType, p.symbol.escapedName); }), function (prop) { return [function () { return checkExpression(prop.initializer); }, prop.symbol.escapedName]; }), isTypeAssignableTo, contextualType);
         }
         function discriminateContextualTypeByJSXAttributes(node, contextualType) {
-            return discriminateTypeByDiscriminableItems(contextualType, ts.map(ts.filter(node.properties, function (p) { return !!p.symbol && p.kind === 267 /* JsxAttribute */ && isDiscriminantProperty(contextualType, p.symbol.escapedName) && (!p.initializer || isPossiblyDiscriminantValue(p.initializer)); }), function (prop) { return [!prop.initializer ? (function () { return trueType; }) : (function () { return checkExpression(prop.initializer); }), prop.symbol.escapedName]; }), isTypeAssignableTo, contextualType);
+            return discriminateTypeByDiscriminableItems(contextualType, ts.map(ts.filter(node.properties, function (p) { return !!p.symbol && p.kind === 268 /* JsxAttribute */ && isDiscriminantProperty(contextualType, p.symbol.escapedName) && (!p.initializer || isPossiblyDiscriminantValue(p.initializer)); }), function (prop) { return [!prop.initializer ? (function () { return trueType; }) : (function () { return checkExpression(prop.initializer); }), prop.symbol.escapedName]; }), isTypeAssignableTo, contextualType);
         }
         // Return the contextual type for a given expression node. During overload resolution, a contextual type may temporarily
         // be "pushed" onto a node using the contextualType property.
-        function getApparentTypeOfContextualType(node) {
-            var contextualType = instantiateContextualType(getContextualType(node), node);
+        function getApparentTypeOfContextualType(node, contextFlags) {
+            var contextualType = instantiateContextualType(getContextualType(node, contextFlags), node, contextFlags);
             if (contextualType) {
                 var apparentType = mapType(contextualType, getApparentType, /*noReductions*/ true);
                 if (apparentType.flags & 1048576 /* Union */) {
@@ -47792,11 +49202,22 @@ var ts;
         }
         // If the given contextual type contains instantiable types and if a mapper representing
         // return type inferences is available, instantiate those types using that mapper.
-        function instantiateContextualType(contextualType, node) {
+        function instantiateContextualType(contextualType, node, contextFlags) {
             if (contextualType && maybeTypeOfKind(contextualType, 63176704 /* Instantiable */)) {
-                var returnMapper = getContextualMapper(node).returnMapper;
-                if (returnMapper) {
-                    return instantiateInstantiableTypes(contextualType, returnMapper);
+                var inferenceContext = getInferenceContext(node);
+                // If no inferences have been made, nothing is gained from instantiating as type parameters
+                // would just be replaced with their defaults similar to the apparent type.
+                if (inferenceContext && ts.some(inferenceContext.inferences, hasInferenceCandidates)) {
+                    // For contextual signatures we incorporate all inferences made so far, e.g. from return
+                    // types as well as arguments to the left in a function call.
+                    if (contextFlags && contextFlags & 1 /* Signature */) {
+                        return instantiateInstantiableTypes(contextualType, inferenceContext.nonFixingMapper);
+                    }
+                    // For other purposes (e.g. determining whether to produce literal types) we only
+                    // incorporate inferences made from the return type in a function call.
+                    if (inferenceContext.returnMapper) {
+                        return instantiateInstantiableTypes(contextualType, inferenceContext.returnMapper);
+                    }
                 }
             }
             return contextualType;
@@ -47817,7 +49238,7 @@ var ts;
             return type;
         }
         /**
-         * Woah! Do you really want to use this function?
+         * Whoa! Do you really want to use this function?
          *
          * Unless you're trying to get the *non-apparent* type for a
          * value-literal type or you're authoring relevant portions of this algorithm,
@@ -47833,7 +49254,7 @@ var ts;
          * @param node the expression whose contextual type will be returned.
          * @returns the contextual type of an expression.
          */
-        function getContextualType(node) {
+        function getContextualType(node, contextFlags) {
             if (node.flags & 8388608 /* InWithStatement */) {
                 // We cannot answer semantic questions within a with block, do not proceed any further
                 return undefined;
@@ -47843,61 +49264,65 @@ var ts;
             }
             var parent = node.parent;
             switch (parent.kind) {
-                case 237 /* VariableDeclaration */:
-                case 151 /* Parameter */:
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
-                case 186 /* BindingElement */:
+                case 238 /* VariableDeclaration */:
+                case 152 /* Parameter */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
+                case 187 /* BindingElement */:
                     return getContextualTypeForInitializerExpression(node);
-                case 197 /* ArrowFunction */:
-                case 230 /* ReturnStatement */:
+                case 198 /* ArrowFunction */:
+                case 231 /* ReturnStatement */:
                     return getContextualTypeForReturnExpression(node);
-                case 207 /* YieldExpression */:
+                case 208 /* YieldExpression */:
                     return getContextualTypeForYieldOperand(parent);
-                case 201 /* AwaitExpression */:
+                case 202 /* AwaitExpression */:
                     return getContextualTypeForAwaitOperand(parent);
-                case 191 /* CallExpression */:
-                case 192 /* NewExpression */:
+                case 192 /* CallExpression */:
+                    if (parent.expression.kind === 93 /* ImportKeyword */) {
+                        return stringType;
+                    }
+                /* falls through */
+                case 193 /* NewExpression */:
                     return getContextualTypeForArgument(parent, node);
-                case 194 /* TypeAssertionExpression */:
-                case 212 /* AsExpression */:
+                case 195 /* TypeAssertionExpression */:
+                case 213 /* AsExpression */:
                     return ts.isConstTypeReference(parent.type) ? undefined : getTypeFromTypeNode(parent.type);
-                case 204 /* BinaryExpression */:
-                    return getContextualTypeForBinaryOperand(node);
-                case 275 /* PropertyAssignment */:
-                case 276 /* ShorthandPropertyAssignment */:
-                    return getContextualTypeForObjectLiteralElement(parent);
-                case 277 /* SpreadAssignment */:
-                    return getApparentTypeOfContextualType(parent.parent);
-                case 187 /* ArrayLiteralExpression */: {
+                case 205 /* BinaryExpression */:
+                    return getContextualTypeForBinaryOperand(node, contextFlags);
+                case 276 /* PropertyAssignment */:
+                case 277 /* ShorthandPropertyAssignment */:
+                    return getContextualTypeForObjectLiteralElement(parent, contextFlags);
+                case 278 /* SpreadAssignment */:
+                    return getApparentTypeOfContextualType(parent.parent, contextFlags);
+                case 188 /* ArrayLiteralExpression */: {
                     var arrayLiteral = parent;
-                    var type = getApparentTypeOfContextualType(arrayLiteral);
+                    var type = getApparentTypeOfContextualType(arrayLiteral, contextFlags);
                     return getContextualTypeForElementExpression(type, ts.indexOfNode(arrayLiteral.elements, node));
                 }
-                case 205 /* ConditionalExpression */:
-                    return getContextualTypeForConditionalOperand(node);
-                case 216 /* TemplateSpan */:
-                    ts.Debug.assert(parent.parent.kind === 206 /* TemplateExpression */);
+                case 206 /* ConditionalExpression */:
+                    return getContextualTypeForConditionalOperand(node, contextFlags);
+                case 217 /* TemplateSpan */:
+                    ts.Debug.assert(parent.parent.kind === 207 /* TemplateExpression */);
                     return getContextualTypeForSubstitutionExpression(parent.parent, node);
-                case 195 /* ParenthesizedExpression */: {
+                case 196 /* ParenthesizedExpression */: {
                     // Like in `checkParenthesizedExpression`, an `/** @type {xyz} */` comment before a parenthesized expression acts as a type cast.
                     var tag = ts.isInJSFile(parent) ? ts.getJSDocTypeTag(parent) : undefined;
-                    return tag ? getTypeFromTypeNode(tag.typeExpression.type) : getContextualType(parent);
+                    return tag ? getTypeFromTypeNode(tag.typeExpression.type) : getContextualType(parent, contextFlags);
                 }
-                case 270 /* JsxExpression */:
+                case 271 /* JsxExpression */:
                     return getContextualTypeForJsxExpression(parent);
-                case 267 /* JsxAttribute */:
-                case 269 /* JsxSpreadAttribute */:
+                case 268 /* JsxAttribute */:
+                case 270 /* JsxSpreadAttribute */:
                     return getContextualTypeForJsxAttribute(parent);
-                case 262 /* JsxOpeningElement */:
-                case 261 /* JsxSelfClosingElement */:
+                case 263 /* JsxOpeningElement */:
+                case 262 /* JsxSelfClosingElement */:
                     return getContextualJsxElementAttributesType(parent);
             }
             return undefined;
         }
-        function getContextualMapper(node) {
-            var ancestor = ts.findAncestor(node, function (n) { return !!n.contextualMapper; });
-            return ancestor ? ancestor.contextualMapper : identityMapper;
+        function getInferenceContext(node) {
+            var ancestor = ts.findAncestor(node, function (n) { return !!n.inferenceContext; });
+            return ancestor && ancestor.inferenceContext;
         }
         function getContextualJsxElementAttributesType(node) {
             if (ts.isJsxOpeningElement(node) && node.parent.contextualType) {
@@ -47912,7 +49337,7 @@ var ts;
             return getJsxReferenceKind(node) !== 0 /* Component */ ? getJsxPropsTypeFromCallSignature(signature, node) : getJsxPropsTypeFromClassType(signature, node);
         }
         function getJsxPropsTypeFromCallSignature(sig, context) {
-            var propsType = getTypeOfFirstParameterOfSignatureWithFallback(sig, emptyObjectType);
+            var propsType = getTypeOfFirstParameterOfSignatureWithFallback(sig, unknownType);
             propsType = getJsxManagedAttributesFromLocatedAttributes(context, getJsxNamespaceAt(context), propsType);
             var intrinsicAttribs = getJsxType(JsxNames.IntrinsicAttributes, context);
             if (intrinsicAttribs !== errorType) {
@@ -47983,7 +49408,7 @@ var ts;
             var forcedLookupLocation = getJsxElementPropertiesName(ns);
             var attributesType = forcedLookupLocation === undefined
                 // If there is no type ElementAttributesProperty, return the type of the first parameter of the signature, which should be the props type
-                ? getTypeOfFirstParameterOfSignatureWithFallback(sig, emptyObjectType)
+                ? getTypeOfFirstParameterOfSignatureWithFallback(sig, unknownType)
                 : forcedLookupLocation === ""
                     // If there is no e.g. 'props' member in ElementAttributesProperty, use the element class type instead
                     ? getReturnTypeOfSignature(sig)
@@ -47994,7 +49419,7 @@ var ts;
                 if (!!forcedLookupLocation && !!ts.length(context.attributes.properties)) {
                     error(context, ts.Diagnostics.JSX_element_class_does_not_support_attributes_because_it_does_not_have_a_0_property, ts.unescapeLeadingUnderscores(forcedLookupLocation));
                 }
-                return emptyObjectType;
+                return unknownType;
             }
             attributesType = getJsxManagedAttributesFromLocatedAttributes(context, ns, attributesType);
             if (isTypeAny(attributesType)) {
@@ -48045,7 +49470,7 @@ var ts;
             return !hasEffectiveRestParameter(signature) && getParameterCount(signature) < targetParameterCount;
         }
         function isFunctionExpressionOrArrowFunction(node) {
-            return node.kind === 196 /* FunctionExpression */ || node.kind === 197 /* ArrowFunction */;
+            return node.kind === 197 /* FunctionExpression */ || node.kind === 198 /* ArrowFunction */;
         }
         function getContextualSignatureForFunctionLikeDeclaration(node) {
             // Only function expressions, arrow functions, and object literal methods are contextually typed.
@@ -48053,23 +49478,20 @@ var ts;
                 ? getContextualSignature(node)
                 : undefined;
         }
-        function getContextualTypeForFunctionLikeDeclaration(node) {
-            return ts.isObjectLiteralMethod(node) ?
-                getContextualTypeForObjectLiteralMethod(node) :
-                getApparentTypeOfContextualType(node);
-        }
         // Return the contextual signature for a given expression node. A contextual type provides a
         // contextual signature if it has a single call signature and if that call signature is non-generic.
         // If the contextual type is a union type, get the signature from each type possible and if they are
         // all identical ignoring their return type, the result is same signature but with return type as
         // union type of return types from these signatures
         function getContextualSignature(node) {
-            ts.Debug.assert(node.kind !== 156 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 157 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
             var typeTagSignature = getSignatureOfTypeTag(node);
             if (typeTagSignature) {
                 return typeTagSignature;
             }
-            var type = getContextualTypeForFunctionLikeDeclaration(node);
+            var type = ts.isObjectLiteralMethod(node) ?
+                getContextualTypeForObjectLiteralMethod(node, 1 /* Signature */) :
+                getApparentTypeOfContextualType(node, 1 /* Signature */);
             if (!type) {
                 return undefined;
             }
@@ -48078,8 +49500,8 @@ var ts;
             }
             var signatureList;
             var types = type.types;
-            for (var _i = 0, types_15 = types; _i < types_15.length; _i++) {
-                var current = types_15[_i];
+            for (var _i = 0, types_14 = types; _i < types_14.length; _i++) {
+                var current = types_14[_i];
                 var signature = getContextualCallSignature(current, node);
                 if (signature) {
                     if (!signatureList) {
@@ -48097,23 +49519,20 @@ var ts;
                 }
             }
             // Result is union of signatures collected (return type is union of return types of this signature set)
-            var result;
             if (signatureList) {
-                result = cloneSignature(signatureList[0]);
-                result.unionSignatures = signatureList;
+                return signatureList.length === 1 ? signatureList[0] : createUnionSignature(signatureList[0], signatureList);
             }
-            return result;
         }
         function checkSpreadExpression(node, checkMode) {
-            if (languageVersion < 2 /* ES2015 */ && compilerOptions.downlevelIteration) {
-                checkExternalEmitHelpers(node, 1536 /* SpreadIncludes */);
+            if (languageVersion < 2 /* ES2015 */) {
+                checkExternalEmitHelpers(node, compilerOptions.downlevelIteration ? 1536 /* SpreadIncludes */ : 2048 /* SpreadArrays */);
             }
             var arrayOrIterableType = checkExpression(node.expression, checkMode);
-            return checkIteratedTypeOrElementType(arrayOrIterableType, node.expression, /*allowStringInput*/ false, /*allowAsyncIterables*/ false);
+            return checkIteratedTypeOrElementType(33 /* Spread */, arrayOrIterableType, undefinedType, node.expression);
         }
         function hasDefaultValue(node) {
-            return (node.kind === 186 /* BindingElement */ && !!node.initializer) ||
-                (node.kind === 204 /* BinaryExpression */ && node.operatorToken.kind === 59 /* EqualsToken */);
+            return (node.kind === 187 /* BindingElement */ && !!node.initializer) ||
+                (node.kind === 205 /* BinaryExpression */ && node.operatorToken.kind === 60 /* EqualsToken */);
         }
         function checkArrayLiteral(node, checkMode, forceTuple) {
             var elements = node.elements;
@@ -48125,7 +49544,7 @@ var ts;
             var inConstContext = isConstContext(node);
             for (var index = 0; index < elementCount; index++) {
                 var e = elements[index];
-                if (inDestructuringPattern && e.kind === 208 /* SpreadElement */) {
+                if (inDestructuringPattern && e.kind === 209 /* SpreadElement */) {
                     // Given the following situation:
                     //    var c: {};
                     //    [...c] = ["", 0];
@@ -48140,7 +49559,7 @@ var ts;
                     // if there is no index type / iterated type.
                     var restArrayType = checkExpression(e.expression, checkMode, forceTuple);
                     var restElementType = getIndexTypeOfType(restArrayType, 1 /* Number */) ||
-                        getIteratedTypeOrElementType(restArrayType, /*errorNode*/ undefined, /*allowStringInput*/ false, /*allowAsyncIterables*/ false, /*checkAssignability*/ false);
+                        getIteratedTypeOrElementType(65 /* Destructuring */, restArrayType, undefinedType, /*errorNode*/ undefined, /*checkAssignability*/ false);
                     if (restElementType) {
                         elementTypes.push(restElementType);
                     }
@@ -48150,12 +49569,12 @@ var ts;
                     var type = checkExpressionForMutableLocation(e, checkMode, elementContextualType, forceTuple);
                     elementTypes.push(type);
                 }
-                if (index < elementCount - 1 && e.kind === 208 /* SpreadElement */) {
+                if (index < elementCount - 1 && e.kind === 209 /* SpreadElement */) {
                     hasNonEndingSpreadElement = true;
                 }
             }
             if (!hasNonEndingSpreadElement) {
-                var hasRestElement = elementCount > 0 && elements[elementCount - 1].kind === 208 /* SpreadElement */;
+                var hasRestElement = elementCount > 0 && elements[elementCount - 1].kind === 209 /* SpreadElement */;
                 var minLength = elementCount - (hasRestElement ? 1 : 0);
                 // If array literal is actually a destructuring pattern, mark it as an implied type. We do this such
                 // that we get the same behavior for "var [x, y] = []" and "[x, y] = []".
@@ -48166,48 +49585,40 @@ var ts;
                     return type;
                 }
                 else if (tupleResult = getArrayLiteralTupleTypeIfApplicable(elementTypes, contextualType, hasRestElement, elementCount, inConstContext)) {
-                    return tupleResult;
+                    return createArrayLiteralType(tupleResult);
                 }
                 else if (forceTuple) {
-                    return createTupleType(elementTypes, minLength, hasRestElement);
+                    return createArrayLiteralType(createTupleType(elementTypes, minLength, hasRestElement));
                 }
             }
-            return createArrayType(elementTypes.length ?
+            return createArrayLiteralType(createArrayType(elementTypes.length ?
                 getUnionType(elementTypes, 2 /* Subtype */) :
-                strictNullChecks ? implicitNeverType : undefinedWideningType, inConstContext);
+                strictNullChecks ? implicitNeverType : undefinedWideningType, inConstContext));
+        }
+        function createArrayLiteralType(type) {
+            if (!(ts.getObjectFlags(type) & 4 /* Reference */)) {
+                return type;
+            }
+            var literalType = type.literalType;
+            if (!literalType) {
+                literalType = type.literalType = cloneTypeReference(type);
+                literalType.objectFlags |= 65536 /* ArrayLiteral */ | 524288 /* ContainsObjectOrArrayLiteral */;
+            }
+            return literalType;
         }
         function getArrayLiteralTupleTypeIfApplicable(elementTypes, contextualType, hasRestElement, elementCount, readonly) {
             if (elementCount === void 0) { elementCount = elementTypes.length; }
             if (readonly === void 0) { readonly = false; }
             // Infer a tuple type when the contextual type is or contains a tuple-like type
             if (readonly || (contextualType && forEachType(contextualType, isTupleLikeType))) {
-                var minLength = elementCount - (hasRestElement ? 1 : 0);
-                var pattern = contextualType && contextualType.pattern;
-                // If array literal is contextually typed by a binding pattern or an assignment pattern, pad the resulting
-                // tuple type with the corresponding binding or assignment element types to make the lengths equal.
-                if (!hasRestElement && pattern && (pattern.kind === 185 /* ArrayBindingPattern */ || pattern.kind === 187 /* ArrayLiteralExpression */)) {
-                    var patternElements = pattern.elements;
-                    for (var i = elementCount; i < patternElements.length; i++) {
-                        var e = patternElements[i];
-                        if (hasDefaultValue(e)) {
-                            elementTypes.push(contextualType.typeArguments[i]);
-                        }
-                        else if (i < patternElements.length - 1 || !(e.kind === 186 /* BindingElement */ && e.dotDotDotToken || e.kind === 208 /* SpreadElement */)) {
-                            if (e.kind !== 210 /* OmittedExpression */) {
-                                error(e, ts.Diagnostics.Initializer_provides_no_value_for_this_binding_element_and_the_binding_element_has_no_default_value);
-                            }
-                            elementTypes.push(strictNullChecks ? implicitNeverType : undefinedWideningType);
-                        }
-                    }
-                }
-                return createTupleType(elementTypes, minLength, hasRestElement, readonly);
+                return createTupleType(elementTypes, elementCount - (hasRestElement ? 1 : 0), hasRestElement, readonly);
             }
         }
         function isNumericName(name) {
             switch (name.kind) {
-                case 149 /* ComputedPropertyName */:
+                case 150 /* ComputedPropertyName */:
                     return isNumericComputedName(name);
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return isNumericLiteralName(name.escapedText);
                 case 8 /* NumericLiteral */:
                 case 10 /* StringLiteral */:
@@ -48295,7 +49706,7 @@ var ts;
             var spread = emptyObjectType;
             var contextualType = getApparentTypeOfContextualType(node);
             var contextualTypeHasPattern = contextualType && contextualType.pattern &&
-                (contextualType.pattern.kind === 184 /* ObjectBindingPattern */ || contextualType.pattern.kind === 188 /* ObjectLiteralExpression */);
+                (contextualType.pattern.kind === 185 /* ObjectBindingPattern */ || contextualType.pattern.kind === 189 /* ObjectLiteralExpression */);
             var inConstContext = isConstContext(node);
             var checkFlags = inConstContext ? 8 /* Readonly */ : 0;
             var isInJavascript = ts.isInJSFile(node) && !ts.isInJsonFile(node);
@@ -48310,13 +49721,13 @@ var ts;
             for (var i = 0; i < node.properties.length; i++) {
                 var memberDecl = node.properties[i];
                 var member = getSymbolOfNode(memberDecl);
-                var computedNameType = memberDecl.name && memberDecl.name.kind === 149 /* ComputedPropertyName */ && !ts.isWellKnownSymbolSyntactically(memberDecl.name.expression) ?
+                var computedNameType = memberDecl.name && memberDecl.name.kind === 150 /* ComputedPropertyName */ && !ts.isWellKnownSymbolSyntactically(memberDecl.name.expression) ?
                     checkComputedPropertyName(memberDecl.name) : undefined;
-                if (memberDecl.kind === 275 /* PropertyAssignment */ ||
-                    memberDecl.kind === 276 /* ShorthandPropertyAssignment */ ||
+                if (memberDecl.kind === 276 /* PropertyAssignment */ ||
+                    memberDecl.kind === 277 /* ShorthandPropertyAssignment */ ||
                     ts.isObjectLiteralMethod(memberDecl)) {
-                    var type = memberDecl.kind === 275 /* PropertyAssignment */ ? checkPropertyAssignment(memberDecl, checkMode) :
-                        memberDecl.kind === 276 /* ShorthandPropertyAssignment */ ? checkExpressionForMutableLocation(memberDecl.name, checkMode) :
+                    var type = memberDecl.kind === 276 /* PropertyAssignment */ ? checkPropertyAssignment(memberDecl, checkMode) :
+                        memberDecl.kind === 277 /* ShorthandPropertyAssignment */ ? checkExpressionForMutableLocation(memberDecl.name, checkMode) :
                             checkObjectLiteralMethod(memberDecl, checkMode);
                     if (isInJavascript) {
                         var jsDocType = getTypeForDeclarationFromJSDocComment(memberDecl);
@@ -48328,10 +49739,10 @@ var ts;
                             checkTypeAssignableTo(type, getTypeFromTypeNode(enumTag.typeExpression), memberDecl);
                         }
                     }
-                    objectFlags |= ts.getObjectFlags(type) & 917504 /* PropagatingFlags */;
+                    objectFlags |= ts.getObjectFlags(type) & 1835008 /* PropagatingFlags */;
                     var nameType = computedNameType && isTypeUsableAsPropertyName(computedNameType) ? computedNameType : undefined;
                     var prop = nameType ?
-                        createSymbol(4 /* Property */ | member.flags, getPropertyNameFromType(nameType), checkFlags | 2048 /* Late */) :
+                        createSymbol(4 /* Property */ | member.flags, getPropertyNameFromType(nameType), checkFlags | 4096 /* Late */) :
                         createSymbol(4 /* Property */ | member.flags, member.escapedName, checkFlags);
                     if (nameType) {
                         prop.nameType = nameType;
@@ -48339,8 +49750,8 @@ var ts;
                     if (inDestructuringPattern) {
                         // If object literal is an assignment pattern and if the assignment pattern specifies a default value
                         // for the property, make the property optional.
-                        var isOptional = (memberDecl.kind === 275 /* PropertyAssignment */ && hasDefaultValue(memberDecl.initializer)) ||
-                            (memberDecl.kind === 276 /* ShorthandPropertyAssignment */ && memberDecl.objectAssignmentInitializer);
+                        var isOptional = (memberDecl.kind === 276 /* PropertyAssignment */ && hasDefaultValue(memberDecl.initializer)) ||
+                            (memberDecl.kind === 277 /* ShorthandPropertyAssignment */ && memberDecl.objectAssignmentInitializer);
                         if (isOptional) {
                             prop.flags |= 16777216 /* Optional */;
                         }
@@ -48365,7 +49776,7 @@ var ts;
                     prop.target = member;
                     member = prop;
                 }
-                else if (memberDecl.kind === 277 /* SpreadAssignment */) {
+                else if (memberDecl.kind === 278 /* SpreadAssignment */) {
                     if (languageVersion < 2 /* ES2015 */) {
                         checkExternalEmitHelpers(memberDecl, 2 /* Assign */);
                     }
@@ -48391,7 +49802,7 @@ var ts;
                     // an ordinary function declaration(section 6.1) with no parameters.
                     // A set accessor declaration is processed in the same manner
                     // as an ordinary function declaration with a single parameter and a Void return type.
-                    ts.Debug.assert(memberDecl.kind === 158 /* GetAccessor */ || memberDecl.kind === 159 /* SetAccessor */);
+                    ts.Debug.assert(memberDecl.kind === 159 /* GetAccessor */ || memberDecl.kind === 160 /* SetAccessor */);
                     checkNodeDeferred(memberDecl);
                 }
                 if (computedNameType && !(computedNameType.flags & 8576 /* StringOrNumberLiteralOrUnique */)) {
@@ -48437,7 +49848,7 @@ var ts;
                 var stringIndexInfo = hasComputedStringProperty ? getObjectLiteralIndexInfo(node, offset, propertiesArray, 0 /* String */) : undefined;
                 var numberIndexInfo = hasComputedNumberProperty ? getObjectLiteralIndexInfo(node, offset, propertiesArray, 1 /* Number */) : undefined;
                 var result = createAnonymousType(node.symbol, propertiesTable, ts.emptyArray, ts.emptyArray, stringIndexInfo, numberIndexInfo);
-                result.objectFlags |= objectFlags | 128 /* ObjectLiteral */ | 262144 /* ContainsObjectLiteral */;
+                result.objectFlags |= objectFlags | 128 /* ObjectLiteral */ | 524288 /* ContainsObjectOrArrayLiteral */;
                 if (isJSObjectLiteral) {
                     result.objectFlags |= 16384 /* JSLiteral */;
                 }
@@ -48499,7 +49910,7 @@ var ts;
          * Returns true iff React would emit this tag name as a string rather than an identifier or qualified name
          */
         function isJsxIntrinsicIdentifier(tagName) {
-            return tagName.kind === 72 /* Identifier */ && ts.isIntrinsicJsxName(tagName.escapedText);
+            return tagName.kind === 73 /* Identifier */ && ts.isIntrinsicJsxName(tagName.escapedText);
         }
         function checkJsxAttribute(node, checkMode) {
             return node.initializer
@@ -48529,7 +49940,7 @@ var ts;
                 var member = attributeDecl.symbol;
                 if (ts.isJsxAttribute(attributeDecl)) {
                     var exprType = checkJsxAttribute(attributeDecl, checkMode);
-                    objectFlags |= ts.getObjectFlags(exprType) & 917504 /* PropagatingFlags */;
+                    objectFlags |= ts.getObjectFlags(exprType) & 1835008 /* PropagatingFlags */;
                     var attributeSymbol = createSymbol(4 /* Property */ | 33554432 /* Transient */ | member.flags, member.escapedName);
                     attributeSymbol.declarations = member.declarations;
                     attributeSymbol.parent = member.parent;
@@ -48544,7 +49955,7 @@ var ts;
                     }
                 }
                 else {
-                    ts.Debug.assert(attributeDecl.kind === 269 /* JsxSpreadAttribute */);
+                    ts.Debug.assert(attributeDecl.kind === 270 /* JsxSpreadAttribute */);
                     if (attributesTable.size > 0) {
                         spread = getSpreadType(spread, createJsxAttributesType(), attributes.symbol, objectFlags, /*readonly*/ false);
                         attributesTable = ts.createSymbolTable();
@@ -48567,7 +49978,7 @@ var ts;
                 }
             }
             // Handle children attribute
-            var parent = openingLikeElement.parent.kind === 260 /* JsxElement */ ? openingLikeElement.parent : undefined;
+            var parent = openingLikeElement.parent.kind === 261 /* JsxElement */ ? openingLikeElement.parent : undefined;
             // We have to check that openingElement of the parent is the one we are visiting as this may not be true for selfClosingElement
             if (parent && parent.openingElement === openingLikeElement && parent.children.length > 0) {
                 var childrenTypes = checkJsxChildren(parent, checkMode);
@@ -48609,7 +50020,7 @@ var ts;
             function createJsxAttributesType() {
                 objectFlags |= freshObjectLiteralFlag;
                 var result = createAnonymousType(attributes.symbol, attributesTable, ts.emptyArray, ts.emptyArray, /*stringIndexInfo*/ undefined, /*numberIndexInfo*/ undefined);
-                result.objectFlags |= objectFlags | 128 /* ObjectLiteral */ | 262144 /* ContainsObjectLiteral */;
+                result.objectFlags |= objectFlags | 128 /* ObjectLiteral */ | 524288 /* ContainsObjectOrArrayLiteral */;
                 return result;
             }
         }
@@ -48620,7 +50031,7 @@ var ts;
                 // In React, JSX text that contains only whitespaces will be ignored so we don't want to type-check that
                 // because then type of children property will have constituent of string type.
                 if (child.kind === 11 /* JsxText */) {
-                    if (!child.containsOnlyWhiteSpaces) {
+                    if (!child.containsOnlyTriviaWhiteSpaces) {
                         childrenTypes.push(stringType);
                     }
                 }
@@ -48947,6 +50358,7 @@ var ts;
                 type.flags & 2097152 /* Intersection */ && ts.every(type.types, isExcessPropertyCheckTarget));
         }
         function checkJsxExpression(node, checkMode) {
+            checkGrammarJsxExpression(node);
             if (node.expression) {
                 var type = checkExpression(node.expression, checkMode);
                 if (node.dotDotDotToken && type !== anyType && !isArrayType(type)) {
@@ -48985,8 +50397,8 @@ var ts;
          */
         function checkPropertyAccessibility(node, isSuper, type, prop) {
             var flags = ts.getDeclarationModifierFlagsFromSymbol(prop);
-            var errorNode = node.kind === 148 /* QualifiedName */ ? node.right : node.kind === 183 /* ImportType */ ? node : node.name;
-            if (ts.getCheckFlags(prop) & 512 /* ContainsPrivate */) {
+            var errorNode = node.kind === 149 /* QualifiedName */ ? node.right : node.kind === 184 /* ImportType */ ? node : node.name;
+            if (ts.getCheckFlags(prop) & 1024 /* ContainsPrivate */) {
                 // Synthetic property with private constituent property
                 error(errorNode, ts.Diagnostics.Property_0_has_conflicting_declarations_and_is_inaccessible_in_type_1, symbolToString(prop), typeToString(type));
                 return false;
@@ -49091,7 +50503,7 @@ var ts;
             return type;
         }
         function checkNonNullType(type, node, nullDiagnostic, undefinedDiagnostic, nullOrUndefinedDiagnostic) {
-            if (type.flags & 2 /* Unknown */) {
+            if (strictNullChecks && type.flags & 2 /* Unknown */) {
                 error(node, ts.Diagnostics.Object_is_of_type_unknown);
                 return errorType;
             }
@@ -49106,42 +50518,58 @@ var ts;
             }
             return type;
         }
+        function checkNonNullNonVoidType(type, node) {
+            var nonNullType = checkNonNullType(type, node);
+            if (nonNullType !== errorType && nonNullType.flags & 16384 /* Void */) {
+                error(node, ts.Diagnostics.Object_is_possibly_undefined);
+            }
+            return nonNullType;
+        }
         function checkPropertyAccessExpression(node) {
             return checkPropertyAccessExpressionOrQualifiedName(node, node.expression, node.name);
         }
         function checkQualifiedName(node) {
             return checkPropertyAccessExpressionOrQualifiedName(node, node.left, node.right);
         }
+        function isMethodAccessForCall(node) {
+            while (node.parent.kind === 196 /* ParenthesizedExpression */) {
+                node = node.parent;
+            }
+            return ts.isCallOrNewExpression(node.parent) && node.parent.expression === node;
+        }
         function checkPropertyAccessExpressionOrQualifiedName(node, left, right) {
             var propType;
             var leftType = checkNonNullExpression(left);
             var parentSymbol = getNodeLinks(left).resolvedSymbol;
-            var apparentType = getApparentType(getWidenedType(leftType));
+            var assignmentKind = ts.getAssignmentTargetKind(node);
+            var apparentType = getApparentType(assignmentKind !== 0 /* None */ || isMethodAccessForCall(node) ? getWidenedType(leftType) : leftType);
             if (isTypeAny(apparentType) || apparentType === silentNeverType) {
                 if (ts.isIdentifier(left) && parentSymbol) {
                     markAliasReferenced(parentSymbol, node);
                 }
                 return apparentType;
             }
-            var assignmentKind = ts.getAssignmentTargetKind(node);
             var prop = getPropertyOfType(apparentType, right.escapedText);
             if (ts.isIdentifier(left) && parentSymbol && !(prop && isConstEnumOrConstEnumOnlyModule(prop))) {
                 markAliasReferenced(parentSymbol, node);
             }
             if (!prop) {
-                var indexInfo = getIndexInfoOfType(apparentType, 0 /* String */);
+                var indexInfo = assignmentKind === 0 /* None */ || !isGenericObjectType(leftType) || isThisTypeParameter(leftType) ? getIndexInfoOfType(apparentType, 0 /* String */) : undefined;
                 if (!(indexInfo && indexInfo.type)) {
                     if (isJSLiteralType(leftType)) {
                         return anyType;
                     }
                     if (leftType.symbol === globalThisSymbol) {
-                        if (noImplicitAny) {
+                        if (globalThisSymbol.exports.has(right.escapedText) && (globalThisSymbol.exports.get(right.escapedText).flags & 418 /* BlockScoped */)) {
+                            error(right, ts.Diagnostics.Property_0_does_not_exist_on_type_1, ts.unescapeLeadingUnderscores(right.escapedText), typeToString(leftType));
+                        }
+                        else if (noImplicitAny) {
                             error(right, ts.Diagnostics.Element_implicitly_has_an_any_type_because_type_0_has_no_index_signature, typeToString(leftType));
                         }
                         return anyType;
                     }
                     if (right.escapedText && !checkAndReportErrorForExtendingInterface(node)) {
-                        reportNonexistentProperty(right, leftType.flags & 262144 /* TypeParameter */ && leftType.isThisType ? apparentType : leftType);
+                        reportNonexistentProperty(right, isThisTypeParameter(leftType) ? apparentType : leftType);
                     }
                     return errorType;
                 }
@@ -49152,9 +50580,9 @@ var ts;
             }
             else {
                 checkPropertyNotUsedBeforeDeclaration(prop, node, right);
-                markPropertyAsReferenced(prop, node, left.kind === 100 /* ThisKeyword */);
+                markPropertyAsReferenced(prop, node, left.kind === 101 /* ThisKeyword */);
                 getNodeLinks(node).resolvedSymbol = prop;
-                checkPropertyAccessibility(node, left.kind === 98 /* SuperKeyword */, apparentType, prop);
+                checkPropertyAccessibility(node, left.kind === 99 /* SuperKeyword */, apparentType, prop);
                 if (assignmentKind) {
                     if (isReferenceToReadonlyEntity(node, prop) || isReferenceThroughNamespaceImport(node)) {
                         error(right, ts.Diagnostics.Cannot_assign_to_0_because_it_is_a_read_only_property, ts.idText(right));
@@ -49163,10 +50591,14 @@ var ts;
                 }
                 propType = getConstraintForLocation(getTypeOfSymbol(prop), node);
             }
+            return getFlowTypeOfAccessExpression(node, prop, propType, right);
+        }
+        function getFlowTypeOfAccessExpression(node, prop, propType, errorNode) {
             // Only compute control flow type if this is a property access expression that isn't an
             // assignment target, and the referenced property was declared as a variable, property,
             // accessor, or optional method.
-            if (node.kind !== 189 /* PropertyAccessExpression */ ||
+            var assignmentKind = ts.getAssignmentTargetKind(node);
+            if (node.kind !== 191 /* ElementAccessExpression */ && node.kind !== 190 /* PropertyAccessExpression */ ||
                 assignmentKind === 1 /* Definite */ ||
                 prop && !(prop.flags & (3 /* Variable */ | 4 /* Property */ | 98304 /* Accessor */)) && !(prop.flags & 8192 /* Method */ && propType.flags & 1048576 /* Union */)) {
                 return propType;
@@ -49176,11 +50608,11 @@ var ts;
             // and if we are in a constructor of the same class as the property declaration, assume that
             // the property is uninitialized at the top of the control flow.
             var assumeUninitialized = false;
-            if (strictNullChecks && strictPropertyInitialization && left.kind === 100 /* ThisKeyword */) {
+            if (strictNullChecks && strictPropertyInitialization && node.expression.kind === 101 /* ThisKeyword */) {
                 var declaration = prop && prop.valueDeclaration;
                 if (declaration && isInstancePropertyWithoutInitializer(declaration)) {
                     var flowContainer = getControlFlowContainer(node);
-                    if (flowContainer.kind === 157 /* Constructor */ && flowContainer.parent === declaration.parent) {
+                    if (flowContainer.kind === 158 /* Constructor */ && flowContainer.parent === declaration.parent) {
                         assumeUninitialized = true;
                     }
                 }
@@ -49193,7 +50625,7 @@ var ts;
             }
             var flowType = getFlowTypeOfReference(node, propType, assumeUninitialized ? getOptionalType(propType) : propType);
             if (assumeUninitialized && !(getFalsyFlags(propType) & 32768 /* Undefined */) && getFalsyFlags(flowType) & 32768 /* Undefined */) {
-                error(right, ts.Diagnostics.Property_0_is_used_before_being_assigned, symbolToString(prop)); // TODO: GH#18217
+                error(errorNode, ts.Diagnostics.Property_0_is_used_before_being_assigned, symbolToString(prop)); // TODO: GH#18217
                 // Return the declared type to reduce follow-on errors
                 return propType;
             }
@@ -49211,35 +50643,35 @@ var ts;
                 && !isPropertyDeclaredInAncestorClass(prop)) {
                 diagnosticMessage = error(right, ts.Diagnostics.Property_0_is_used_before_its_initialization, declarationName);
             }
-            else if (valueDeclaration.kind === 240 /* ClassDeclaration */ &&
-                node.parent.kind !== 164 /* TypeReference */ &&
+            else if (valueDeclaration.kind === 241 /* ClassDeclaration */ &&
+                node.parent.kind !== 165 /* TypeReference */ &&
                 !(valueDeclaration.flags & 4194304 /* Ambient */) &&
                 !isBlockScopedNameDeclaredBeforeUse(valueDeclaration, right)) {
                 diagnosticMessage = error(right, ts.Diagnostics.Class_0_used_before_its_declaration, declarationName);
             }
             if (diagnosticMessage) {
-                addRelatedInfo(diagnosticMessage, ts.createDiagnosticForNode(valueDeclaration, ts.Diagnostics._0_is_declared_here, declarationName));
+                ts.addRelatedInfo(diagnosticMessage, ts.createDiagnosticForNode(valueDeclaration, ts.Diagnostics._0_is_declared_here, declarationName));
             }
         }
         function isInPropertyInitializer(node) {
             return !!ts.findAncestor(node, function (node) {
                 switch (node.kind) {
-                    case 154 /* PropertyDeclaration */:
+                    case 155 /* PropertyDeclaration */:
                         return true;
-                    case 275 /* PropertyAssignment */:
-                    case 156 /* MethodDeclaration */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
-                    case 277 /* SpreadAssignment */:
-                    case 149 /* ComputedPropertyName */:
-                    case 216 /* TemplateSpan */:
-                    case 270 /* JsxExpression */:
-                    case 267 /* JsxAttribute */:
-                    case 268 /* JsxAttributes */:
-                    case 269 /* JsxSpreadAttribute */:
-                    case 262 /* JsxOpeningElement */:
-                    case 211 /* ExpressionWithTypeArguments */:
-                    case 273 /* HeritageClause */:
+                    case 276 /* PropertyAssignment */:
+                    case 157 /* MethodDeclaration */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
+                    case 278 /* SpreadAssignment */:
+                    case 150 /* ComputedPropertyName */:
+                    case 217 /* TemplateSpan */:
+                    case 271 /* JsxExpression */:
+                    case 268 /* JsxAttribute */:
+                    case 269 /* JsxAttributes */:
+                    case 270 /* JsxSpreadAttribute */:
+                    case 263 /* JsxOpeningElement */:
+                    case 212 /* ExpressionWithTypeArguments */:
+                    case 274 /* HeritageClause */:
                         return false;
                     default:
                         return ts.isExpressionNode(node) ? false : "quit";
@@ -49291,7 +50723,8 @@ var ts;
             else {
                 var promisedType = getPromisedTypeOfPromise(containingType);
                 if (promisedType && getPropertyOfType(promisedType, propNode.escapedText)) {
-                    errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.Property_0_does_not_exist_on_type_1_Did_you_forget_to_use_await, ts.declarationNameToString(propNode), typeToString(containingType));
+                    errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.Property_0_does_not_exist_on_type_1, ts.declarationNameToString(propNode), typeToString(containingType));
+                    relatedInfo = ts.createDiagnosticForNode(propNode, ts.Diagnostics.Did_you_forget_to_use_await);
                 }
                 else {
                     var suggestion = getSuggestedSymbolForNonexistentProperty(propNode, containingType);
@@ -49307,7 +50740,7 @@ var ts;
             }
             var resultDiagnostic = ts.createDiagnosticForNodeFromMessageChain(propNode, errorInfo);
             if (relatedInfo) {
-                addRelatedInfo(resultDiagnostic, relatedInfo);
+                ts.addRelatedInfo(resultDiagnostic, relatedInfo);
             }
             diagnostics.add(resultDiagnostic);
         }
@@ -49345,6 +50778,32 @@ var ts;
             var suggestion = getSuggestedSymbolForNonexistentModule(name, targetModule);
             return suggestion && ts.symbolName(suggestion);
         }
+        function getSuggestionForNonexistentIndexSignature(objectType, expr) {
+            // check if object type has setter or getter
+            var hasProp = function (name, argCount) {
+                if (argCount === void 0) { argCount = 1; }
+                var prop = getPropertyOfObjectType(objectType, name);
+                if (prop) {
+                    var s = getSingleCallSignature(getTypeOfSymbol(prop));
+                    if (s && getMinArgumentCount(s) === argCount && typeToString(getTypeAtPosition(s, 0)) === "string") {
+                        return true;
+                    }
+                }
+                return false;
+            };
+            var suggestedMethod = ts.isAssignmentTarget(expr) ? "set" : "get";
+            if (!hasProp(suggestedMethod)) {
+                return undefined;
+            }
+            var suggestion = ts.tryGetPropertyAccessOrIdentifierToString(expr);
+            if (suggestion === undefined) {
+                suggestion = suggestedMethod;
+            }
+            else {
+                suggestion += "." + suggestedMethod;
+            }
+            return suggestion;
+        }
         /**
          * Given a name and a list of symbols whose names are *not* equal to the name, return a spelling suggestion if there is one that is close enough.
          * Names less than length 3 only check for case-insensitive equality, not levenshtein distance.
@@ -49385,34 +50844,17 @@ var ts;
         }
         function isValidPropertyAccess(node, propertyName) {
             switch (node.kind) {
-                case 189 /* PropertyAccessExpression */:
-                    return isValidPropertyAccessWithType(node, node.expression.kind === 98 /* SuperKeyword */, propertyName, getWidenedType(checkExpression(node.expression)));
-                case 148 /* QualifiedName */:
+                case 190 /* PropertyAccessExpression */:
+                    return isValidPropertyAccessWithType(node, node.expression.kind === 99 /* SuperKeyword */, propertyName, getWidenedType(checkExpression(node.expression)));
+                case 149 /* QualifiedName */:
                     return isValidPropertyAccessWithType(node, /*isSuper*/ false, propertyName, getWidenedType(checkExpression(node.left)));
-                case 183 /* ImportType */:
+                case 184 /* ImportType */:
                     return isValidPropertyAccessWithType(node, /*isSuper*/ false, propertyName, getTypeFromTypeNode(node));
             }
         }
         function isValidPropertyAccessForCompletions(node, type, property) {
-            return isValidPropertyAccessWithType(node, node.kind === 189 /* PropertyAccessExpression */ && node.expression.kind === 98 /* SuperKeyword */, property.escapedName, type)
-                && (!(property.flags & 8192 /* Method */) || isValidMethodAccess(property, type));
-        }
-        function isValidMethodAccess(method, actualThisType) {
-            var propType = getTypeOfPropertyOfType(actualThisType, method.escapedName);
-            var signatures = getSignaturesOfType(getNonNullableType(propType), 0 /* Call */);
-            ts.Debug.assert(signatures.length !== 0);
-            return signatures.some(function (sig) {
-                var signatureThisType = getThisTypeOfSignature(sig);
-                return !signatureThisType || isTypeAssignableTo(actualThisType, getInstantiatedSignatureThisType(sig, signatureThisType, actualThisType));
-            });
-        }
-        function getInstantiatedSignatureThisType(sig, signatureThisType, actualThisType) {
-            if (!sig.typeParameters) {
-                return signatureThisType;
-            }
-            var context = createInferenceContext(sig.typeParameters, sig, 0 /* None */);
-            inferTypes(context.inferences, actualThisType, signatureThisType);
-            return instantiateType(signatureThisType, createSignatureTypeMapper(sig, getInferredTypes(context)));
+            return isValidPropertyAccessWithType(node, node.kind === 190 /* PropertyAccessExpression */ && node.expression.kind === 99 /* SuperKeyword */, property.escapedName, type);
+            // Previously we validated the 'this' type of methods but this adversely affected performance. See #31377 for more context.
         }
         function isValidPropertyAccessWithType(node, isSuper, propertyName, type) {
             if (type === errorType || isTypeAny(type)) {
@@ -49428,13 +50870,13 @@ var ts;
          */
         function getForInVariableSymbol(node) {
             var initializer = node.initializer;
-            if (initializer.kind === 238 /* VariableDeclarationList */) {
+            if (initializer.kind === 239 /* VariableDeclarationList */) {
                 var variable = initializer.declarations[0];
                 if (variable && !ts.isBindingPattern(variable.name)) {
                     return getSymbolOfNode(variable);
                 }
             }
-            else if (initializer.kind === 72 /* Identifier */) {
+            else if (initializer.kind === 73 /* Identifier */) {
                 return getResolvedSymbol(initializer);
             }
             return undefined;
@@ -49451,13 +50893,13 @@ var ts;
          */
         function isForInVariableForNumericPropertyNames(expr) {
             var e = ts.skipParentheses(expr);
-            if (e.kind === 72 /* Identifier */) {
+            if (e.kind === 73 /* Identifier */) {
                 var symbol = getResolvedSymbol(e);
                 if (symbol.flags & 3 /* Variable */) {
                     var child = expr;
                     var node = expr.parent;
                     while (node) {
-                        if (node.kind === 226 /* ForInStatement */ &&
+                        if (node.kind === 227 /* ForInStatement */ &&
                             child === node.statement &&
                             getForInVariableSymbol(node) === symbol &&
                             hasNumericPropertyNames(getTypeOfExpression(node.expression))) {
@@ -49471,11 +50913,12 @@ var ts;
             return false;
         }
         function checkIndexedAccess(node) {
-            var objectType = checkNonNullExpression(node.expression);
+            var exprType = checkNonNullExpression(node.expression);
+            var objectType = ts.getAssignmentTargetKind(node) !== 0 /* None */ || isMethodAccessForCall(node) ? getWidenedType(exprType) : exprType;
             var indexExpression = node.argumentExpression;
             if (!indexExpression) {
                 var sourceFile = ts.getSourceFileOfNode(node);
-                if (node.parent.kind === 192 /* NewExpression */ && node.parent.expression === node) {
+                if (node.parent.kind === 193 /* NewExpression */ && node.parent.expression === node) {
                     var start = ts.skipTrivia(sourceFile.text, node.expression.end);
                     var end = node.end;
                     grammarErrorAtPos(sourceFile, start, end - start, ts.Diagnostics.new_T_cannot_be_used_to_create_an_array_Use_new_Array_T_instead);
@@ -49495,7 +50938,12 @@ var ts;
                 error(indexExpression, ts.Diagnostics.A_const_enum_member_can_only_be_accessed_using_a_string_literal);
                 return errorType;
             }
-            return checkIndexedAccessIndexType(getIndexedAccessType(objectType, isForInVariableForNumericPropertyNames(indexExpression) ? numberType : indexType, node), node);
+            var effectiveIndexType = isForInVariableForNumericPropertyNames(indexExpression) ? numberType : indexType;
+            var accessFlags = ts.isAssignmentTarget(node) ?
+                2 /* Writing */ | (isGenericObjectType(objectType) && !isThisTypeParameter(objectType) ? 1 /* NoIndexSignatures */ : 0) :
+                0 /* None */;
+            var indexedAccessType = getIndexedAccessTypeOrUndefined(objectType, effectiveIndexType, node, accessFlags) || errorType;
+            return checkIndexedAccessIndexType(getFlowTypeOfAccessExpression(node, indexedAccessType.symbol, indexedAccessType, indexExpression), node);
         }
         function checkThatExpressionIsProperSymbolReference(expression, expressionType, reportError) {
             if (expressionType === errorType) {
@@ -49541,13 +50989,13 @@ var ts;
                 // This gets us diagnostics for the type arguments and marks them as referenced.
                 ts.forEach(node.typeArguments, checkSourceElement);
             }
-            if (node.kind === 193 /* TaggedTemplateExpression */) {
+            if (node.kind === 194 /* TaggedTemplateExpression */) {
                 checkExpression(node.template);
             }
             else if (ts.isJsxOpeningLikeElement(node)) {
                 checkExpression(node.attributes);
             }
-            else if (node.kind !== 152 /* Decorator */) {
+            else if (node.kind !== 153 /* Decorator */) {
                 ts.forEach(node.arguments, function (argument) {
                     checkExpression(argument);
                 });
@@ -49611,7 +51059,7 @@ var ts;
             }
         }
         function isSpreadArgument(arg) {
-            return !!arg && (arg.kind === 208 /* SpreadElement */ || arg.kind === 215 /* SyntheticExpression */ && arg.isSpread);
+            return !!arg && (arg.kind === 209 /* SpreadElement */ || arg.kind === 216 /* SyntheticExpression */ && arg.isSpread);
         }
         function getSpreadArgumentIndex(args) {
             return ts.findIndex(args, isSpreadArgument);
@@ -49625,9 +51073,9 @@ var ts;
             var callIsIncomplete = false; // In incomplete call we want to be lenient when we have too few arguments
             var effectiveParameterCount = getParameterCount(signature);
             var effectiveMinimumArguments = getMinArgumentCount(signature);
-            if (node.kind === 193 /* TaggedTemplateExpression */) {
+            if (node.kind === 194 /* TaggedTemplateExpression */) {
                 argCount = args.length;
-                if (node.template.kind === 206 /* TemplateExpression */) {
+                if (node.template.kind === 207 /* TemplateExpression */) {
                     // If a tagged template expression lacks a tail literal, the call is incomplete.
                     // Specifically, a template only can end in a TemplateTail or a Missing literal.
                     var lastSpan = ts.last(node.template.templateSpans); // we should always have at least one span.
@@ -49642,7 +51090,7 @@ var ts;
                     callIsIncomplete = !!templateLiteral.isUnterminated;
                 }
             }
-            else if (node.kind === 152 /* Decorator */) {
+            else if (node.kind === 153 /* Decorator */) {
                 argCount = getDecoratorArgumentCount(node, signature);
             }
             else if (ts.isJsxOpeningLikeElement(node)) {
@@ -49657,7 +51105,7 @@ var ts;
             else {
                 if (!node.arguments) {
                     // This only happens when we have something of the form: 'new C'
-                    ts.Debug.assert(node.kind === 192 /* NewExpression */);
+                    ts.Debug.assert(node.kind === 193 /* NewExpression */);
                     return getMinArgumentCount(signature) === 0;
                 }
                 argCount = signatureHelpTrailingComma ? args.length + 1 : args.length;
@@ -49696,36 +51144,43 @@ var ts;
         }
         // If type has a single call signature and no other members, return that signature. Otherwise, return undefined.
         function getSingleCallSignature(type) {
+            return getSingleSignature(type, 0 /* Call */, /*allowMembers*/ false);
+        }
+        function getSingleCallOrConstructSignature(type) {
+            return getSingleSignature(type, 0 /* Call */, /*allowMembers*/ false) ||
+                getSingleSignature(type, 1 /* Construct */, /*allowMembers*/ false);
+        }
+        function getSingleSignature(type, kind, allowMembers) {
             if (type.flags & 524288 /* Object */) {
                 var resolved = resolveStructuredTypeMembers(type);
-                if (resolved.callSignatures.length === 1 && resolved.constructSignatures.length === 0 &&
-                    resolved.properties.length === 0 && !resolved.stringIndexInfo && !resolved.numberIndexInfo) {
-                    return resolved.callSignatures[0];
+                if (allowMembers || resolved.properties.length === 0 && !resolved.stringIndexInfo && !resolved.numberIndexInfo) {
+                    if (kind === 0 /* Call */ && resolved.callSignatures.length === 1 && resolved.constructSignatures.length === 0) {
+                        return resolved.callSignatures[0];
+                    }
+                    if (kind === 1 /* Construct */ && resolved.constructSignatures.length === 1 && resolved.callSignatures.length === 0) {
+                        return resolved.constructSignatures[0];
+                    }
                 }
             }
             return undefined;
         }
         // Instantiate a generic signature in the context of a non-generic signature (section 3.8.5 in TypeScript spec)
-        function instantiateSignatureInContextOf(signature, contextualSignature, contextualMapper, compareTypes) {
+        function instantiateSignatureInContextOf(signature, contextualSignature, inferenceContext, compareTypes) {
             var context = createInferenceContext(signature.typeParameters, signature, 0 /* None */, compareTypes);
-            // We clone the contextualMapper to avoid fixing. For example, when the source signature is <T>(x: T) => T[] and
+            // We clone the inferenceContext to avoid fixing. For example, when the source signature is <T>(x: T) => T[] and
             // the contextual signature is (...args: A) => B, we want to infer the element type of A's constraint (say 'any')
             // for T but leave it possible to later infer '[any]' back to A.
             var restType = getEffectiveRestType(contextualSignature);
-            var mapper = contextualMapper && restType && restType.flags & 262144 /* TypeParameter */ ? cloneTypeMapper(contextualMapper) : contextualMapper;
+            var mapper = inferenceContext && (restType && restType.flags & 262144 /* TypeParameter */ ? inferenceContext.nonFixingMapper : inferenceContext.mapper);
             var sourceSignature = mapper ? instantiateSignature(contextualSignature, mapper) : contextualSignature;
-            forEachMatchingParameterType(sourceSignature, signature, function (source, target) {
+            applyToParameterTypes(sourceSignature, signature, function (source, target) {
                 // Type parameters from outer context referenced by source type are fixed by instantiation of the source type
                 inferTypes(context.inferences, source, target);
             });
-            if (!contextualMapper) {
-                inferTypes(context.inferences, getReturnTypeOfSignature(contextualSignature), getReturnTypeOfSignature(signature), 8 /* ReturnType */);
-                var signaturePredicate = getTypePredicateOfSignature(signature);
-                var contextualPredicate = getTypePredicateOfSignature(sourceSignature);
-                if (signaturePredicate && contextualPredicate && signaturePredicate.kind === contextualPredicate.kind &&
-                    (signaturePredicate.kind === 0 /* This */ || signaturePredicate.parameterIndex === contextualPredicate.parameterIndex)) {
-                    inferTypes(context.inferences, contextualPredicate.type, signaturePredicate.type, 8 /* ReturnType */);
-                }
+            if (!inferenceContext) {
+                applyToReturnTypes(contextualSignature, signature, function (source, target) {
+                    inferTypes(context.inferences, source, target, 16 /* ReturnType */);
+                });
             }
             return getSignatureInstantiation(signature, getInferredTypes(context), ts.isInJSFile(contextualSignature.declaration));
         }
@@ -49736,17 +51191,6 @@ var ts;
             return getInferredTypes(context);
         }
         function inferTypeArguments(node, signature, args, checkMode, context) {
-            // Clear out all the inference results from the last time inferTypeArguments was called on this context
-            for (var _i = 0, _a = context.inferences; _i < _a.length; _i++) {
-                var inference = _a[_i];
-                // As an optimization, we don't have to clear (and later recompute) inferred types
-                // for type parameters that have already been fixed on the previous call to inferTypeArguments.
-                // It would be just as correct to reset all of them. But then we'd be repeating the same work
-                // for the type parameters that were fixed, namely the work done by getInferredType.
-                if (!inference.isFixed) {
-                    inference.inferredType = undefined;
-                }
-            }
             if (ts.isJsxOpeningLikeElement(node)) {
                 return inferJsxTypeArguments(node, signature, checkMode, context);
             }
@@ -49754,13 +51198,15 @@ var ts;
             // example, given a 'function wrap<T, U>(cb: (x: T) => U): (x: T) => U' and a call expression
             // 'let f: (x: string) => number = wrap(s => s.length)', we infer from the declared type of 'f' to the
             // return type of 'wrap'.
-            if (node.kind !== 152 /* Decorator */) {
+            if (node.kind !== 153 /* Decorator */) {
                 var contextualType = getContextualType(node);
                 if (contextualType) {
-                    // We clone the contextual mapper to avoid disturbing a resolution in progress for an
+                    // We clone the inference context to avoid disturbing a resolution in progress for an
                     // outer call expression. Effectively we just want a snapshot of whatever has been
                     // inferred for any outer call expression so far.
-                    var instantiatedType = instantiateType(contextualType, cloneTypeMapper(getContextualMapper(node), 1 /* NoDefault */));
+                    var outerContext = getInferenceContext(node);
+                    var outerMapper = getMapperFromContext(cloneInferenceContext(outerContext, 1 /* NoDefault */));
+                    var instantiatedType = instantiateType(contextualType, outerMapper);
                     // If the contextual type is a generic function type with a single call signature, we
                     // instantiate the type with its own type parameters and type arguments. This ensures that
                     // the type parameters are not erased to type any during type inference such that they can
@@ -49774,10 +51220,15 @@ var ts;
                         instantiatedType;
                     var inferenceTargetType = getReturnTypeOfSignature(signature);
                     // Inferences made from return types have lower priority than all other inferences.
-                    inferTypes(context.inferences, inferenceSourceType, inferenceTargetType, 8 /* ReturnType */);
+                    inferTypes(context.inferences, inferenceSourceType, inferenceTargetType, 16 /* ReturnType */);
                     // Create a type mapper for instantiating generic contextual types using the inferences made
-                    // from the return type.
-                    context.returnMapper = cloneInferredPartOfContext(context);
+                    // from the return type. We need a separate inference pass here because (a) instantiation of
+                    // the source type uses the outer context's return mapper (which excludes inferences made from
+                    // outer arguments), and (b) we don't want any further inferences going into this context.
+                    var returnContext = createInferenceContext(signature.typeParameters, signature, context.flags);
+                    var returnSourceType = instantiateType(contextualType, outerContext && outerContext.returnMapper);
+                    inferTypes(returnContext.inferences, returnSourceType, inferenceTargetType);
+                    context.returnMapper = ts.some(returnContext.inferences, hasInferenceCandidates) ? getMapperFromContext(returnContext) : undefined;
                 }
             }
             var thisType = getThisTypeOfSignature(signature);
@@ -49790,7 +51241,7 @@ var ts;
             var argCount = restType ? Math.min(getParameterCount(signature) - 1, args.length) : args.length;
             for (var i = 0; i < argCount; i++) {
                 var arg = args[i];
-                if (arg.kind !== 210 /* OmittedExpression */) {
+                if (arg.kind !== 211 /* OmittedExpression */) {
                     var paramType = getTypeAtPosition(signature, i);
                     var argType = checkExpressionWithContextualType(arg, paramType, context, checkMode);
                     inferTypes(context.inferences, argType, paramType);
@@ -49804,7 +51255,7 @@ var ts;
         }
         function getArrayifiedType(type) {
             if (forEachType(type, function (t) { return !(t.flags & (1 /* Any */ | 63176704 /* Instantiable */) || isArrayType(t) || isTupleType(t)); })) {
-                return createArrayType(getIndexTypeOfType(type, 1 /* Number */) || errorType);
+                return createArrayType(getIndexedAccessType(type, numberType));
             }
             return type;
         }
@@ -49814,20 +51265,20 @@ var ts;
                 if (isSpreadArgument(arg)) {
                     // We are inferring from a spread expression in the last argument position, i.e. both the parameter
                     // and the argument are ...x forms.
-                    return arg.kind === 215 /* SyntheticExpression */ ?
+                    return arg.kind === 216 /* SyntheticExpression */ ?
                         createArrayType(arg.type) :
                         getArrayifiedType(checkExpressionWithContextualType(arg.expression, restType, context, 0 /* Normal */));
                 }
             }
-            var contextualType = getIndexTypeOfType(restType, 1 /* Number */) || anyType;
-            var hasPrimitiveContextualType = maybeTypeOfKind(contextualType, 131068 /* Primitive */ | 4194304 /* Index */);
             var types = [];
             var spreadIndex = -1;
             for (var i = index; i < argCount; i++) {
+                var contextualType = getIndexedAccessType(restType, getLiteralType(i - index));
                 var argType = checkExpressionWithContextualType(args[i], contextualType, context, 0 /* Normal */);
                 if (spreadIndex < 0 && isSpreadArgument(args[i])) {
                     spreadIndex = i - index;
                 }
+                var hasPrimitiveContextualType = maybeTypeOfKind(contextualType, 131068 /* Primitive */ | 4194304 /* Index */);
                 types.push(hasPrimitiveContextualType ? getRegularTypeOfLiteralType(argType) : getWidenedLiteralType(argType));
             }
             return spreadIndex < 0 ?
@@ -49875,20 +51326,26 @@ var ts;
          * @param signature a candidate signature we are trying whether it is a call signature
          * @param relation a relationship to check parameter and argument type
          */
-        function checkApplicableSignatureForJsxOpeningLikeElement(node, signature, relation, checkMode, reportErrors) {
+        function checkApplicableSignatureForJsxOpeningLikeElement(node, signature, relation, checkMode, reportErrors, containingMessageChain, errorOutputContainer) {
             // Stateless function components can have maximum of three arguments: "props", "context", and "updater".
             // However "context" and "updater" are implicit and can't be specify by users. Only the first parameter, props,
             // can be specified by users through attributes property.
             var paramType = getEffectiveFirstArgumentForJsxSignature(signature, node);
-            var attributesType = checkExpressionWithContextualType(node.attributes, paramType, /*contextualMapper*/ undefined, checkMode);
-            return checkTypeRelatedToAndOptionallyElaborate(attributesType, paramType, relation, reportErrors ? node.tagName : undefined, node.attributes);
+            var attributesType = checkExpressionWithContextualType(node.attributes, paramType, /*inferenceContext*/ undefined, checkMode);
+            return checkTypeRelatedToAndOptionallyElaborate(attributesType, paramType, relation, reportErrors ? node.tagName : undefined, node.attributes, 
+            /*headMessage*/ undefined, containingMessageChain, errorOutputContainer);
         }
-        function checkApplicableSignature(node, args, signature, relation, checkMode, reportErrors) {
+        function getSignatureApplicabilityError(node, args, signature, relation, checkMode, reportErrors, containingMessageChain) {
+            var errorOutputContainer = { errors: undefined, skipLogging: true };
             if (ts.isJsxOpeningLikeElement(node)) {
-                return checkApplicableSignatureForJsxOpeningLikeElement(node, signature, relation, checkMode, reportErrors);
+                if (!checkApplicableSignatureForJsxOpeningLikeElement(node, signature, relation, checkMode, reportErrors, containingMessageChain, errorOutputContainer)) {
+                    ts.Debug.assert(!reportErrors || !!errorOutputContainer.errors, "jsx should have errors when reporting errors");
+                    return errorOutputContainer.errors || [];
+                }
+                return undefined;
             }
             var thisType = getThisTypeOfSignature(signature);
-            if (thisType && thisType !== voidType && node.kind !== 192 /* NewExpression */) {
+            if (thisType && thisType !== voidType && node.kind !== 193 /* NewExpression */) {
                 // If the called expression is not of the form `x.f` or `x["f"]`, then sourceType = voidType
                 // If the signature's 'this' type is voidType, then the check is skipped -- anything is compatible.
                 // If the expression is a new expression, then the check is skipped.
@@ -49896,8 +51353,9 @@ var ts;
                 var thisArgumentType = thisArgumentNode ? checkExpression(thisArgumentNode) : voidType;
                 var errorNode = reportErrors ? (thisArgumentNode || node) : undefined;
                 var headMessage_1 = ts.Diagnostics.The_this_context_of_type_0_is_not_assignable_to_method_s_this_of_type_1;
-                if (!checkTypeRelatedTo(thisArgumentType, thisType, relation, errorNode, headMessage_1)) {
-                    return false;
+                if (!checkTypeRelatedTo(thisArgumentType, thisType, relation, errorNode, headMessage_1, containingMessageChain, errorOutputContainer)) {
+                    ts.Debug.assert(!reportErrors || !!errorOutputContainer.errors, "this parameter should have errors when reporting errors");
+                    return errorOutputContainer.errors || [];
                 }
             }
             var headMessage = ts.Diagnostics.Argument_of_type_0_is_not_assignable_to_parameter_of_type_1;
@@ -49905,38 +51363,56 @@ var ts;
             var argCount = restType ? Math.min(getParameterCount(signature) - 1, args.length) : args.length;
             for (var i = 0; i < argCount; i++) {
                 var arg = args[i];
-                if (arg.kind !== 210 /* OmittedExpression */) {
+                if (arg.kind !== 211 /* OmittedExpression */) {
                     var paramType = getTypeAtPosition(signature, i);
-                    var argType = checkExpressionWithContextualType(arg, paramType, /*contextualMapper*/ undefined, checkMode);
+                    var argType = checkExpressionWithContextualType(arg, paramType, /*inferenceContext*/ undefined, checkMode);
                     // If one or more arguments are still excluded (as indicated by CheckMode.SkipContextSensitive),
                     // we obtain the regular type of any object literal arguments because we may not have inferred complete
                     // parameter types yet and therefore excess property checks may yield false positives (see #17041).
                     var checkArgType = checkMode & 4 /* SkipContextSensitive */ ? getRegularTypeOfObjectLiteral(argType) : argType;
-                    if (!checkTypeRelatedToAndOptionallyElaborate(checkArgType, paramType, relation, reportErrors ? arg : undefined, arg, headMessage)) {
-                        return false;
+                    if (!checkTypeRelatedToAndOptionallyElaborate(checkArgType, paramType, relation, reportErrors ? arg : undefined, arg, headMessage, containingMessageChain, errorOutputContainer)) {
+                        ts.Debug.assert(!reportErrors || !!errorOutputContainer.errors, "parameter should have errors when reporting errors");
+                        maybeAddMissingAwaitInfo(arg, checkArgType, paramType);
+                        return errorOutputContainer.errors || [];
                     }
                 }
             }
             if (restType) {
                 var spreadType = getSpreadArgumentType(args, argCount, args.length, restType, /*context*/ undefined);
                 var errorNode = reportErrors ? argCount < args.length ? args[argCount] : node : undefined;
-                return checkTypeRelatedTo(spreadType, restType, relation, errorNode, headMessage);
+                if (!checkTypeRelatedTo(spreadType, restType, relation, errorNode, headMessage, /*containingMessageChain*/ undefined, errorOutputContainer)) {
+                    ts.Debug.assert(!reportErrors || !!errorOutputContainer.errors, "rest parameter should have errors when reporting errors");
+                    maybeAddMissingAwaitInfo(errorNode, spreadType, restType);
+                    return errorOutputContainer.errors || [];
+                }
+            }
+            return undefined;
+            function maybeAddMissingAwaitInfo(errorNode, source, target) {
+                if (errorNode && reportErrors && errorOutputContainer.errors && errorOutputContainer.errors.length) {
+                    // Bail if target is Promise-like---something else is wrong
+                    if (getAwaitedTypeOfPromise(target)) {
+                        return;
+                    }
+                    var awaitedTypeOfSource = getAwaitedTypeOfPromise(source);
+                    if (awaitedTypeOfSource && isTypeRelatedTo(awaitedTypeOfSource, target, relation)) {
+                        ts.addRelatedInfo(errorOutputContainer.errors[0], ts.createDiagnosticForNode(errorNode, ts.Diagnostics.Did_you_forget_to_use_await));
+                    }
+                }
             }
-            return true;
         }
         /**
          * Returns the this argument in calls like x.f(...) and x[f](...). Undefined otherwise.
          */
         function getThisArgumentOfCall(node) {
-            if (node.kind === 191 /* CallExpression */) {
+            if (node.kind === 192 /* CallExpression */) {
                 var callee = ts.skipOuterExpressions(node.expression);
-                if (callee.kind === 189 /* PropertyAccessExpression */ || callee.kind === 190 /* ElementAccessExpression */) {
+                if (callee.kind === 190 /* PropertyAccessExpression */ || callee.kind === 191 /* ElementAccessExpression */) {
                     return callee.expression;
                 }
             }
         }
         function createSyntheticExpression(parent, type, isSpread) {
-            var result = ts.createNode(215 /* SyntheticExpression */, parent.pos, parent.end);
+            var result = ts.createNode(216 /* SyntheticExpression */, parent.pos, parent.end);
             result.parent = parent;
             result.type = type;
             result.isSpread = isSpread || false;
@@ -49946,17 +51422,17 @@ var ts;
          * Returns the effective arguments for an expression that works like a function invocation.
          */
         function getEffectiveCallArguments(node) {
-            if (node.kind === 193 /* TaggedTemplateExpression */) {
+            if (node.kind === 194 /* TaggedTemplateExpression */) {
                 var template = node.template;
-                var args_4 = [createSyntheticExpression(template, getGlobalTemplateStringsArrayType())];
-                if (template.kind === 206 /* TemplateExpression */) {
+                var args_3 = [createSyntheticExpression(template, getGlobalTemplateStringsArrayType())];
+                if (template.kind === 207 /* TemplateExpression */) {
                     ts.forEach(template.templateSpans, function (span) {
-                        args_4.push(span.expression);
+                        args_3.push(span.expression);
                     });
                 }
-                return args_4;
+                return args_3;
             }
-            if (node.kind === 152 /* Decorator */) {
+            if (node.kind === 153 /* Decorator */) {
                 return getEffectiveDecoratorArguments(node);
             }
             if (ts.isJsxOpeningLikeElement(node)) {
@@ -49969,7 +51445,7 @@ var ts;
                 // of the argument is a tuple type, spread the tuple elements into the argument list. We can
                 // call checkExpressionCached because spread expressions never have a contextual type.
                 var spreadArgument_1 = args[length - 1];
-                var type = checkExpressionCached(spreadArgument_1.expression);
+                var type = flowLoopCount ? checkExpression(spreadArgument_1.expression) : checkExpressionCached(spreadArgument_1.expression);
                 if (isTupleType(type)) {
                     var typeArguments = type.typeArguments || ts.emptyArray;
                     var restIndex_2 = type.target.hasRestElement ? typeArguments.length - 1 : -1;
@@ -49986,30 +51462,30 @@ var ts;
             var parent = node.parent;
             var expr = node.expression;
             switch (parent.kind) {
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
                     // For a class decorator, the `target` is the type of the class (e.g. the
                     // "static" or "constructor" side of the class).
                     return [
                         createSyntheticExpression(expr, getTypeOfSymbol(getSymbolOfNode(parent)))
                     ];
-                case 151 /* Parameter */:
+                case 152 /* Parameter */:
                     // A parameter declaration decorator will have three arguments (see
                     // `ParameterDecorator` in core.d.ts).
                     var func = parent.parent;
                     return [
-                        createSyntheticExpression(expr, parent.parent.kind === 157 /* Constructor */ ? getTypeOfSymbol(getSymbolOfNode(func)) : errorType),
+                        createSyntheticExpression(expr, parent.parent.kind === 158 /* Constructor */ ? getTypeOfSymbol(getSymbolOfNode(func)) : errorType),
                         createSyntheticExpression(expr, anyType),
                         createSyntheticExpression(expr, numberType)
                     ];
-                case 154 /* PropertyDeclaration */:
-                case 156 /* MethodDeclaration */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 155 /* PropertyDeclaration */:
+                case 157 /* MethodDeclaration */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     // A method or accessor declaration decorator will have two or three arguments (see
                     // `PropertyDecorator` and `MethodDecorator` in core.d.ts). If we are emitting decorators
                     // for ES3, we will only pass two arguments.
-                    var hasPropDesc = parent.kind !== 154 /* PropertyDeclaration */ && languageVersion !== 0 /* ES3 */;
+                    var hasPropDesc = parent.kind !== 155 /* PropertyDeclaration */ && languageVersion !== 0 /* ES3 */;
                     return [
                         createSyntheticExpression(expr, getParentTypeOfClassElement(parent)),
                         createSyntheticExpression(expr, getClassElementPropertyKeyType(parent)),
@@ -50023,22 +51499,47 @@ var ts;
          */
         function getDecoratorArgumentCount(node, signature) {
             switch (node.parent.kind) {
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
                     return 1;
-                case 154 /* PropertyDeclaration */:
+                case 155 /* PropertyDeclaration */:
                     return 2;
-                case 156 /* MethodDeclaration */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 157 /* MethodDeclaration */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     // For ES3 or decorators with only two parameters we supply only two arguments
                     return languageVersion === 0 /* ES3 */ || signature.parameters.length <= 2 ? 2 : 3;
-                case 151 /* Parameter */:
+                case 152 /* Parameter */:
                     return 3;
                 default:
                     return ts.Debug.fail();
             }
         }
+        function getDiagnosticSpanForCallNode(node, doNotIncludeArguments) {
+            var start;
+            var length;
+            var sourceFile = ts.getSourceFileOfNode(node);
+            if (ts.isPropertyAccessExpression(node.expression)) {
+                var nameSpan = ts.getErrorSpanForNode(sourceFile, node.expression.name);
+                start = nameSpan.start;
+                length = doNotIncludeArguments ? nameSpan.length : node.end - start;
+            }
+            else {
+                var expressionSpan = ts.getErrorSpanForNode(sourceFile, node.expression);
+                start = expressionSpan.start;
+                length = doNotIncludeArguments ? expressionSpan.length : node.end - start;
+            }
+            return { start: start, length: length, sourceFile: sourceFile };
+        }
+        function getDiagnosticForCallNode(node, message, arg0, arg1, arg2, arg3) {
+            if (ts.isCallExpression(node)) {
+                var _a = getDiagnosticSpanForCallNode(node), sourceFile = _a.sourceFile, start = _a.start, length_4 = _a.length;
+                return ts.createFileDiagnostic(sourceFile, start, length_4, message, arg0, arg1, arg2, arg3);
+            }
+            else {
+                return ts.createDiagnosticForNode(node, message, arg0, arg1, arg2, arg3);
+            }
+        }
         function getArgumentArityError(node, signatures, args) {
             var min = Number.POSITIVE_INFINITY;
             var max = Number.NEGATIVE_INFINITY;
@@ -50068,25 +51569,41 @@ var ts;
             if (argCount <= max && hasSpreadArgument) {
                 argCount--;
             }
+            var spanArray;
             var related;
+            var error = hasRestParameter || hasSpreadArgument ? hasRestParameter && hasSpreadArgument ? ts.Diagnostics.Expected_at_least_0_arguments_but_got_1_or_more :
+                hasRestParameter ? ts.Diagnostics.Expected_at_least_0_arguments_but_got_1 :
+                    ts.Diagnostics.Expected_0_arguments_but_got_1_or_more : ts.Diagnostics.Expected_0_arguments_but_got_1;
             if (closestSignature && getMinArgumentCount(closestSignature) > argCount && closestSignature.declaration) {
                 var paramDecl = closestSignature.declaration.parameters[closestSignature.thisParameter ? argCount + 1 : argCount];
                 if (paramDecl) {
                     related = ts.createDiagnosticForNode(paramDecl, ts.isBindingPattern(paramDecl.name) ? ts.Diagnostics.An_argument_matching_this_binding_pattern_was_not_provided : ts.Diagnostics.An_argument_for_0_was_not_provided, !paramDecl.name ? argCount : !ts.isBindingPattern(paramDecl.name) ? ts.idText(getFirstIdentifier(paramDecl.name)) : undefined);
                 }
             }
-            if (hasRestParameter || hasSpreadArgument) {
-                var error_1 = hasRestParameter && hasSpreadArgument ? ts.Diagnostics.Expected_at_least_0_arguments_but_got_1_or_more :
-                    hasRestParameter ? ts.Diagnostics.Expected_at_least_0_arguments_but_got_1 :
-                        ts.Diagnostics.Expected_0_arguments_but_got_1_or_more;
-                var diagnostic_1 = ts.createDiagnosticForNode(node, error_1, paramRange, argCount);
-                return related ? addRelatedInfo(diagnostic_1, related) : diagnostic_1;
-            }
             if (min < argCount && argCount < max) {
-                return ts.createDiagnosticForNode(node, ts.Diagnostics.No_overload_expects_0_arguments_but_overloads_do_exist_that_expect_either_1_or_2_arguments, argCount, belowArgCount, aboveArgCount);
+                return getDiagnosticForCallNode(node, ts.Diagnostics.No_overload_expects_0_arguments_but_overloads_do_exist_that_expect_either_1_or_2_arguments, argCount, belowArgCount, aboveArgCount);
             }
-            var diagnostic = ts.createDiagnosticForNode(node, ts.Diagnostics.Expected_0_arguments_but_got_1, paramRange, argCount);
-            return related ? addRelatedInfo(diagnostic, related) : diagnostic;
+            if (!hasSpreadArgument && argCount < min) {
+                var diagnostic_1 = getDiagnosticForCallNode(node, error, paramRange, argCount);
+                return related ? ts.addRelatedInfo(diagnostic_1, related) : diagnostic_1;
+            }
+            if (hasRestParameter || hasSpreadArgument) {
+                spanArray = ts.createNodeArray(args);
+                if (hasSpreadArgument && argCount) {
+                    var nextArg = ts.elementAt(args, getSpreadArgumentIndex(args) + 1) || undefined;
+                    spanArray = ts.createNodeArray(args.slice(max > argCount && nextArg ? args.indexOf(nextArg) : Math.min(max, args.length - 1)));
+                }
+            }
+            else {
+                spanArray = ts.createNodeArray(args.slice(max));
+            }
+            spanArray.pos = ts.first(spanArray).pos;
+            spanArray.end = ts.last(spanArray).end;
+            if (spanArray.end === spanArray.pos) {
+                spanArray.end++;
+            }
+            var diagnostic = ts.createDiagnosticForNodeArray(ts.getSourceFileOfNode(node), spanArray, error, paramRange, argCount);
+            return related ? ts.addRelatedInfo(diagnostic, related) : diagnostic;
         }
         function getTypeArgumentArityError(node, signatures, typeArguments) {
             var argCount = typeArguments.length;
@@ -50117,15 +51634,15 @@ var ts;
             return ts.createDiagnosticForNodeArray(ts.getSourceFileOfNode(node), typeArguments, ts.Diagnostics.Expected_0_type_arguments_but_got_1, belowArgCount === -Infinity ? aboveArgCount : belowArgCount, argCount);
         }
         function resolveCall(node, signatures, candidatesOutArray, checkMode, fallbackError) {
-            var isTaggedTemplate = node.kind === 193 /* TaggedTemplateExpression */;
-            var isDecorator = node.kind === 152 /* Decorator */;
+            var isTaggedTemplate = node.kind === 194 /* TaggedTemplateExpression */;
+            var isDecorator = node.kind === 153 /* Decorator */;
             var isJsxOpeningOrSelfClosingElement = ts.isJsxOpeningLikeElement(node);
             var reportErrors = !candidatesOutArray;
             var typeArguments;
             if (!isDecorator) {
                 typeArguments = node.typeArguments;
                 // We already perform checking on the type arguments on the class declaration itself.
-                if (isTaggedTemplate || isJsxOpeningOrSelfClosingElement || node.expression.kind !== 98 /* SuperKeyword */) {
+                if (isTaggedTemplate || isJsxOpeningOrSelfClosingElement || node.expression.kind !== 99 /* SuperKeyword */) {
                     ts.forEach(typeArguments, checkSourceElement);
                 }
             }
@@ -50134,7 +51651,7 @@ var ts;
             reorderCandidates(signatures, candidates);
             if (!candidates.length) {
                 if (reportErrors) {
-                    diagnostics.add(ts.createDiagnosticForNode(node, ts.Diagnostics.Call_target_does_not_contain_any_signatures));
+                    diagnostics.add(getDiagnosticForCallNode(node, ts.Diagnostics.Call_target_does_not_contain_any_signatures));
                 }
                 return resolveErrorCall(node);
             }
@@ -50174,13 +51691,13 @@ var ts;
             //     function foo(): void;
             //     foo<number>(0);
             //
-            var candidateForArgumentError;
+            var candidatesForArgumentError;
             var candidateForArgumentArityError;
             var candidateForTypeArgumentError;
             var result;
             // If we are in signature help, a trailing comma indicates that we intend to provide another argument,
             // so we will only accept overloads with arity at least 1 higher than the current number of provided arguments.
-            var signatureHelpTrailingComma = !!(checkMode & 16 /* IsForSignatureHelp */) && node.kind === 191 /* CallExpression */ && node.arguments.hasTrailingComma;
+            var signatureHelpTrailingComma = !!(checkMode & 16 /* IsForSignatureHelp */) && node.kind === 192 /* CallExpression */ && node.arguments.hasTrailingComma;
             // Section 4.12.1:
             // if the candidate list contains one or more signatures for which the type of each argument
             // expression is a subtype of each corresponding parameter type, the return type of the first
@@ -50205,8 +51722,66 @@ var ts;
             // If candidate is undefined, it means that no candidates had a suitable arity. In that case,
             // skip the checkApplicableSignature check.
             if (reportErrors) {
-                if (candidateForArgumentError) {
-                    checkApplicableSignature(node, args, candidateForArgumentError, assignableRelation, 0 /* Normal */, /*reportErrors*/ true);
+                if (candidatesForArgumentError) {
+                    if (candidatesForArgumentError.length === 1 || candidatesForArgumentError.length > 3) {
+                        var last_2 = candidatesForArgumentError[candidatesForArgumentError.length - 1];
+                        var chain_1;
+                        if (candidatesForArgumentError.length > 3) {
+                            chain_1 = ts.chainDiagnosticMessages(chain_1, ts.Diagnostics.The_last_overload_gave_the_following_error);
+                            chain_1 = ts.chainDiagnosticMessages(chain_1, ts.Diagnostics.No_overload_matches_this_call);
+                        }
+                        var diags = getSignatureApplicabilityError(node, args, last_2, assignableRelation, 0 /* Normal */, /*reportErrors*/ true, function () { return chain_1; });
+                        if (diags) {
+                            for (var _i = 0, diags_1 = diags; _i < diags_1.length; _i++) {
+                                var d = diags_1[_i];
+                                if (last_2.declaration && candidatesForArgumentError.length > 3) {
+                                    ts.addRelatedInfo(d, ts.createDiagnosticForNode(last_2.declaration, ts.Diagnostics.The_last_overload_is_declared_here));
+                                }
+                                diagnostics.add(d);
+                            }
+                        }
+                        else {
+                            ts.Debug.fail("No error for last overload signature");
+                        }
+                    }
+                    else {
+                        var allDiagnostics = [];
+                        var max = 0;
+                        var min_3 = Number.MAX_VALUE;
+                        var minIndex = 0;
+                        var i_1 = 0;
+                        var _loop_12 = function (c) {
+                            var chain_2 = function () { return ts.chainDiagnosticMessages(/*details*/ undefined, ts.Diagnostics.Overload_0_of_1_2_gave_the_following_error, i_1 + 1, candidates.length, signatureToString(c)); };
+                            var diags_2 = getSignatureApplicabilityError(node, args, c, assignableRelation, 0 /* Normal */, /*reportErrors*/ true, chain_2);
+                            if (diags_2) {
+                                if (diags_2.length <= min_3) {
+                                    min_3 = diags_2.length;
+                                    minIndex = i_1;
+                                }
+                                max = Math.max(max, diags_2.length);
+                                allDiagnostics.push(diags_2);
+                            }
+                            else {
+                                ts.Debug.fail("No error for 3 or fewer overload signatures");
+                            }
+                            i_1++;
+                        };
+                        for (var _a = 0, candidatesForArgumentError_1 = candidatesForArgumentError; _a < candidatesForArgumentError_1.length; _a++) {
+                            var c = candidatesForArgumentError_1[_a];
+                            _loop_12(c);
+                        }
+                        var diags_3 = max > 1 ? allDiagnostics[minIndex] : ts.flatten(allDiagnostics);
+                        ts.Debug.assert(diags_3.length > 0, "No errors reported for 3 or fewer overload signatures");
+                        var chain = ts.chainDiagnosticMessages(ts.map(diags_3, function (d) { return typeof d.messageText === "string" ? d : d.messageText; }), ts.Diagnostics.No_overload_matches_this_call);
+                        var related = ts.flatMap(diags_3, function (d) { return d.relatedInformation; });
+                        if (ts.every(diags_3, function (d) { return d.start === diags_3[0].start && d.length === diags_3[0].length && d.file === diags_3[0].file; })) {
+                            var _b = diags_3[0], file = _b.file, start = _b.start, length_5 = _b.length;
+                            diagnostics.add({ file: file, start: start, length: length_5, code: chain.code, category: chain.category, messageText: chain, relatedInformation: related });
+                        }
+                        else {
+                            diagnostics.add(ts.createDiagnosticForNodeFromMessageChain(node, chain, related));
+                        }
+                    }
                 }
                 else if (candidateForArgumentArityError) {
                     diagnostics.add(getArgumentArityError(node, [candidateForArgumentArityError], args));
@@ -50223,14 +51798,14 @@ var ts;
                         diagnostics.add(getArgumentArityError(node, signaturesWithCorrectTypeArgumentArity, args));
                     }
                     else if (fallbackError) {
-                        diagnostics.add(ts.createDiagnosticForNode(node, fallbackError));
+                        diagnostics.add(getDiagnosticForCallNode(node, fallbackError));
                     }
                 }
             }
             return produceDiagnostics || !args ? resolveErrorCall(node) : getCandidateForOverloadFailure(node, candidates, args, !!candidatesOutArray);
             function chooseOverload(candidates, relation, signatureHelpTrailingComma) {
                 if (signatureHelpTrailingComma === void 0) { signatureHelpTrailingComma = false; }
-                candidateForArgumentError = undefined;
+                candidatesForArgumentError = undefined;
                 candidateForArgumentArityError = undefined;
                 candidateForTypeArgumentError = undefined;
                 if (isSingleNonGenericCandidate) {
@@ -50238,8 +51813,8 @@ var ts;
                     if (typeArguments || !hasCorrectArity(node, args, candidate, signatureHelpTrailingComma)) {
                         return undefined;
                     }
-                    if (!checkApplicableSignature(node, args, candidate, relation, 0 /* Normal */, /*reportErrors*/ false)) {
-                        candidateForArgumentError = candidate;
+                    if (getSignatureApplicabilityError(node, args, candidate, relation, 0 /* Normal */, /*reportErrors*/ false, /*containingMessageChain*/ undefined)) {
+                        candidatesForArgumentError = [candidate];
                         return undefined;
                     }
                     return candidate;
@@ -50263,7 +51838,7 @@ var ts;
                         else {
                             inferenceContext = createInferenceContext(candidate.typeParameters, candidate, /*flags*/ ts.isInJSFile(node) ? 2 /* AnyDefault */ : 0 /* None */);
                             typeArgumentTypes = inferTypeArguments(node, candidate, args, argCheckMode | 8 /* SkipGenericFunctions */, inferenceContext);
-                            argCheckMode |= inferenceContext.flags & 8 /* SkippedGenericFunction */ ? 8 /* SkipGenericFunctions */ : 0 /* Normal */;
+                            argCheckMode |= inferenceContext.flags & 4 /* SkippedGenericFunction */ ? 8 /* SkipGenericFunctions */ : 0 /* Normal */;
                         }
                         checkCandidate = getSignatureInstantiation(candidate, typeArgumentTypes, ts.isInJSFile(candidate.declaration), inferenceContext && inferenceContext.inferredTypeParameters);
                         // If the original signature has a generic rest type, instantiation may produce a
@@ -50276,11 +51851,9 @@ var ts;
                     else {
                         checkCandidate = candidate;
                     }
-                    if (!checkApplicableSignature(node, args, checkCandidate, relation, argCheckMode, /*reportErrors*/ false)) {
+                    if (getSignatureApplicabilityError(node, args, checkCandidate, relation, argCheckMode, /*reportErrors*/ false, /*containingMessageChain*/ undefined)) {
                         // Give preference to error candidates that have no rest parameters (as they are more specific)
-                        if (!candidateForArgumentError || getEffectiveRestType(candidateForArgumentError) || !getEffectiveRestType(checkCandidate)) {
-                            candidateForArgumentError = checkCandidate;
-                        }
+                        (candidatesForArgumentError || (candidatesForArgumentError = [])).push(checkCandidate);
                         continue;
                     }
                     if (argCheckMode) {
@@ -50298,11 +51871,9 @@ var ts;
                                 continue;
                             }
                         }
-                        if (!checkApplicableSignature(node, args, checkCandidate, relation, argCheckMode, /*reportErrors*/ false)) {
+                        if (getSignatureApplicabilityError(node, args, checkCandidate, relation, argCheckMode, /*reportErrors*/ false, /*containingMessageChain*/ undefined)) {
                             // Give preference to error candidates that have no rest parameters (as they are more specific)
-                            if (!candidateForArgumentError || getEffectiveRestType(candidateForArgumentError) || !getEffectiveRestType(checkCandidate)) {
-                                candidateForArgumentError = checkCandidate;
-                            }
+                            (candidatesForArgumentError || (candidatesForArgumentError = [])).push(checkCandidate);
                             continue;
                         }
                     }
@@ -50331,7 +51902,7 @@ var ts;
             }
             var _a = ts.minAndMax(candidates, getNumNonRestParameters), minArgumentCount = _a.min, maxNonRestParam = _a.max;
             var parameters = [];
-            var _loop_8 = function (i) {
+            var _loop_13 = function (i) {
                 var symbols = ts.mapDefined(candidates, function (_a) {
                     var parameters = _a.parameters, hasRestParameter = _a.hasRestParameter;
                     return hasRestParameter ?
@@ -50342,7 +51913,7 @@ var ts;
                 parameters.push(createCombinedSymbolFromTypes(symbols, ts.mapDefined(candidates, function (candidate) { return tryGetTypeAtPosition(candidate, i); })));
             };
             for (var i = 0; i < maxNonRestParam; i++) {
-                _loop_8(i);
+                _loop_13(i);
             }
             var restParameterSymbols = ts.mapDefined(candidates, function (c) { return c.hasRestParameter ? ts.last(c.parameters) : undefined; });
             var hasRestParameter = restParameterSymbols.length !== 0;
@@ -50420,7 +51991,7 @@ var ts;
             return maxParamsIndex;
         }
         function resolveCallExpression(node, candidatesOutArray, checkMode) {
-            if (node.expression.kind === 98 /* SuperKeyword */) {
+            if (node.expression.kind === 99 /* SuperKeyword */) {
                 var superType = checkSuperExpression(node.expression);
                 if (isTypeAny(superType)) {
                     for (var _i = 0, _a = node.arguments; _i < _a.length; _i++) {
@@ -50481,7 +52052,7 @@ var ts;
                             relatedInformation = ts.createDiagnosticForNode(node.expression, ts.Diagnostics.It_is_highly_likely_that_you_are_missing_a_semicolon);
                         }
                     }
-                    invocationError(node, apparentType, 0 /* Call */, relatedInformation);
+                    invocationError(node.expression, apparentType, 0 /* Call */, relatedInformation);
                 }
                 return resolveErrorCall(node);
             }
@@ -50495,7 +52066,7 @@ var ts;
             // returns a function type, we choose to defer processing. This narrowly permits function composition
             // operators to flow inferences through return types, but otherwise processes calls right away. We
             // use the resolvingSignature singleton to indicate that we deferred processing. This result will be
-            // propagated out and eventually turned into silentNeverType (a type that is assignable to anything and
+            // propagated out and eventually turned into nonInferrableType (a type that is assignable to anything and
             // from which we never make inferences).
             if (checkMode & 8 /* SkipGenericFunctions */ && !node.typeArguments && callSignatures.some(isGenericFunctionReturningFunction)) {
                 skippedGenericFunction(node, checkMode);
@@ -50588,7 +52159,7 @@ var ts;
                 }
                 return signature;
             }
-            invocationError(node, expressionType, 1 /* Construct */);
+            invocationError(node.expression, expressionType, 1 /* Construct */);
             return resolveErrorCall(node);
         }
         function typeHasProtectedAccessibleBase(target, type) {
@@ -50599,13 +52170,12 @@ var ts;
             var firstBase = baseTypes[0];
             if (firstBase.flags & 2097152 /* Intersection */) {
                 var types = firstBase.types;
-                var mixinCount = ts.countWhere(types, isMixinConstructorType);
+                var mixinFlags = findMixins(types);
                 var i = 0;
                 for (var _i = 0, _a = firstBase.types; _i < _a.length; _i++) {
                     var intersectionMember = _a[_i];
-                    i++;
                     // We want to ignore mixin ctors
-                    if (mixinCount === 0 || mixinCount === types.length && i === 0 || !isMixinConstructorType(intersectionMember)) {
+                    if (!mixinFlags[i]) {
                         if (ts.getObjectFlags(intersectionMember) & (1 /* Class */ | 2 /* Interface */)) {
                             if (intersectionMember.symbol === target) {
                                 return true;
@@ -50615,6 +52185,7 @@ var ts;
                             }
                         }
                     }
+                    i++;
                 }
                 return false;
             }
@@ -50654,11 +52225,75 @@ var ts;
             }
             return true;
         }
-        function invocationError(node, apparentType, kind, relatedInformation) {
-            var diagnostic = error(node, (kind === 0 /* Call */ ?
-                ts.Diagnostics.Cannot_invoke_an_expression_whose_type_lacks_a_call_signature_Type_0_has_no_compatible_call_signatures :
-                ts.Diagnostics.Cannot_use_new_with_an_expression_whose_type_lacks_a_call_or_construct_signature), typeToString(apparentType));
-            invocationErrorRecovery(apparentType, kind, relatedInformation ? addRelatedInfo(diagnostic, relatedInformation) : diagnostic);
+        function invocationErrorDetails(apparentType, kind) {
+            var errorInfo;
+            var isCall = kind === 0 /* Call */;
+            var awaitedType = getAwaitedType(apparentType);
+            var maybeMissingAwait = awaitedType && getSignaturesOfType(awaitedType, kind).length > 0;
+            if (apparentType.flags & 1048576 /* Union */) {
+                var types = apparentType.types;
+                var hasSignatures = false;
+                for (var _i = 0, types_15 = types; _i < types_15.length; _i++) {
+                    var constituent = types_15[_i];
+                    var signatures = getSignaturesOfType(constituent, kind);
+                    if (signatures.length !== 0) {
+                        hasSignatures = true;
+                        if (errorInfo) {
+                            // Bail early if we already have an error, no chance of "No constituent of type is callable"
+                            break;
+                        }
+                    }
+                    else {
+                        // Error on the first non callable constituent only
+                        if (!errorInfo) {
+                            errorInfo = ts.chainDiagnosticMessages(errorInfo, isCall ?
+                                ts.Diagnostics.Type_0_has_no_call_signatures :
+                                ts.Diagnostics.Type_0_has_no_construct_signatures, typeToString(constituent));
+                            errorInfo = ts.chainDiagnosticMessages(errorInfo, isCall ?
+                                ts.Diagnostics.Not_all_constituents_of_type_0_are_callable :
+                                ts.Diagnostics.Not_all_constituents_of_type_0_are_constructable, typeToString(apparentType));
+                        }
+                        if (hasSignatures) {
+                            // Bail early if we already found a siganture, no chance of "No constituent of type is callable"
+                            break;
+                        }
+                    }
+                }
+                if (!hasSignatures) {
+                    errorInfo = ts.chainDiagnosticMessages(
+                    /* detials */ undefined, isCall ?
+                        ts.Diagnostics.No_constituent_of_type_0_is_callable :
+                        ts.Diagnostics.No_constituent_of_type_0_is_constructable, typeToString(apparentType));
+                }
+                if (!errorInfo) {
+                    errorInfo = ts.chainDiagnosticMessages(errorInfo, isCall ?
+                        ts.Diagnostics.Each_member_of_the_union_type_0_has_signatures_but_none_of_those_signatures_are_compatible_with_each_other :
+                        ts.Diagnostics.Each_member_of_the_union_type_0_has_construct_signatures_but_none_of_those_signatures_are_compatible_with_each_other, typeToString(apparentType));
+                }
+            }
+            else {
+                errorInfo = ts.chainDiagnosticMessages(errorInfo, isCall ?
+                    ts.Diagnostics.Type_0_has_no_call_signatures :
+                    ts.Diagnostics.Type_0_has_no_construct_signatures, typeToString(apparentType));
+            }
+            return {
+                messageChain: ts.chainDiagnosticMessages(errorInfo, isCall ? ts.Diagnostics.This_expression_is_not_callable : ts.Diagnostics.This_expression_is_not_constructable),
+                relatedMessage: maybeMissingAwait ? ts.Diagnostics.Did_you_forget_to_use_await : undefined,
+            };
+        }
+        function invocationError(errorTarget, apparentType, kind, relatedInformation) {
+            var _a = invocationErrorDetails(apparentType, kind), messageChain = _a.messageChain, relatedInfo = _a.relatedMessage;
+            var diagnostic = ts.createDiagnosticForNodeFromMessageChain(errorTarget, messageChain);
+            if (relatedInfo) {
+                ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(errorTarget, relatedInfo));
+            }
+            if (ts.isCallExpression(errorTarget.parent)) {
+                var _b = getDiagnosticSpanForCallNode(errorTarget.parent, /* doNotIncludeArguments */ true), start = _b.start, length_6 = _b.length;
+                diagnostic.start = start;
+                diagnostic.length = length_6;
+            }
+            diagnostics.add(diagnostic);
+            invocationErrorRecovery(apparentType, kind, relatedInformation ? ts.addRelatedInfo(diagnostic, relatedInformation) : diagnostic);
         }
         function invocationErrorRecovery(apparentType, kind, diagnostic) {
             if (!apparentType.symbol) {
@@ -50671,7 +52306,7 @@ var ts;
                 var sigs = getSignaturesOfType(getTypeOfSymbol(getSymbolLinks(apparentType.symbol).target), kind);
                 if (!sigs || !sigs.length)
                     return;
-                addRelatedInfo(diagnostic, ts.createDiagnosticForNode(importNode, ts.Diagnostics.Type_originates_at_this_import_A_namespace_style_import_cannot_be_called_or_constructed_and_will_cause_a_failure_at_runtime_Consider_using_a_default_import_or_import_require_here_instead));
+                ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(importNode, ts.Diagnostics.Type_originates_at_this_import_A_namespace_style_import_cannot_be_called_or_constructed_and_will_cause_a_failure_at_runtime_Consider_using_a_default_import_or_import_require_here_instead));
             }
         }
         function resolveTaggedTemplateExpression(node, candidatesOutArray, checkMode) {
@@ -50687,7 +52322,7 @@ var ts;
                 return resolveUntypedCall(node);
             }
             if (!callSignatures.length) {
-                invocationError(node, apparentType, 0 /* Call */);
+                invocationError(node.tag, apparentType, 0 /* Call */);
                 return resolveErrorCall(node);
             }
             return resolveCall(node, callSignatures, candidatesOutArray, checkMode);
@@ -50697,16 +52332,16 @@ var ts;
          */
         function getDiagnosticHeadMessageForDecoratorResolution(node) {
             switch (node.parent.kind) {
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_class_decorator_when_called_as_an_expression;
-                case 151 /* Parameter */:
+                case 152 /* Parameter */:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_parameter_decorator_when_called_as_an_expression;
-                case 154 /* PropertyDeclaration */:
+                case 155 /* PropertyDeclaration */:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_property_decorator_when_called_as_an_expression;
-                case 156 /* MethodDeclaration */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 157 /* MethodDeclaration */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_method_decorator_when_called_as_an_expression;
                 default:
                     return ts.Debug.fail();
@@ -50733,9 +52368,12 @@ var ts;
             }
             var headMessage = getDiagnosticHeadMessageForDecoratorResolution(node);
             if (!callSignatures.length) {
-                var errorInfo = ts.chainDiagnosticMessages(/*details*/ undefined, ts.Diagnostics.Cannot_invoke_an_expression_whose_type_lacks_a_call_signature_Type_0_has_no_compatible_call_signatures, typeToString(apparentType));
-                errorInfo = ts.chainDiagnosticMessages(errorInfo, headMessage);
-                var diag = ts.createDiagnosticForNodeFromMessageChain(node, errorInfo);
+                var errorDetails = invocationErrorDetails(apparentType, 0 /* Call */);
+                var messageChain = ts.chainDiagnosticMessages(errorDetails.messageChain, headMessage);
+                var diag = ts.createDiagnosticForNodeFromMessageChain(node.expression, messageChain);
+                if (errorDetails.relatedMessage) {
+                    ts.addRelatedInfo(diag, ts.createDiagnosticForNode(node.expression, errorDetails.relatedMessage));
+                }
                 diagnostics.add(diag);
                 invocationErrorRecovery(apparentType, 0 /* Call */, diag);
                 return resolveErrorCall(node);
@@ -50749,7 +52387,7 @@ var ts;
             // file would probably be preferable.
             var typeSymbol = exports && getSymbol(exports, JsxNames.Element, 67897832 /* Type */);
             var returnNode = typeSymbol && nodeBuilder.symbolToEntityName(typeSymbol, 67897832 /* Type */, node);
-            var declaration = ts.createFunctionTypeNode(/*typeParameters*/ undefined, [ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotdotdot*/ undefined, "props", /*questionMark*/ undefined, nodeBuilder.typeToTypeNode(result, node))], returnNode ? ts.createTypeReferenceNode(returnNode, /*typeArguments*/ undefined) : ts.createKeywordTypeNode(120 /* AnyKeyword */));
+            var declaration = ts.createFunctionTypeNode(/*typeParameters*/ undefined, [ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotdotdot*/ undefined, "props", /*questionMark*/ undefined, nodeBuilder.typeToTypeNode(result, node))], returnNode ? ts.createTypeReferenceNode(returnNode, /*typeArguments*/ undefined) : ts.createKeywordTypeNode(121 /* AnyKeyword */));
             var parameterSymbol = createSymbol(1 /* FunctionScopedVariable */, "props");
             parameterSymbol.type = result;
             return createSignature(declaration, 
@@ -50796,16 +52434,16 @@ var ts;
         }
         function resolveSignature(node, candidatesOutArray, checkMode) {
             switch (node.kind) {
-                case 191 /* CallExpression */:
+                case 192 /* CallExpression */:
                     return resolveCallExpression(node, candidatesOutArray, checkMode);
-                case 192 /* NewExpression */:
+                case 193 /* NewExpression */:
                     return resolveNewExpression(node, candidatesOutArray, checkMode);
-                case 193 /* TaggedTemplateExpression */:
+                case 194 /* TaggedTemplateExpression */:
                     return resolveTaggedTemplateExpression(node, candidatesOutArray, checkMode);
-                case 152 /* Decorator */:
+                case 153 /* Decorator */:
                     return resolveDecorator(node, candidatesOutArray, checkMode);
-                case 262 /* JsxOpeningElement */:
-                case 261 /* JsxSelfClosingElement */:
+                case 263 /* JsxOpeningElement */:
+                case 262 /* JsxSelfClosingElement */:
                     return resolveJsxOpeningLikeElement(node, candidatesOutArray, checkMode);
             }
             throw ts.Debug.assertNever(node, "Branch in 'resolveSignature' should be unreachable.");
@@ -50885,17 +52523,17 @@ var ts;
                     ts.isVariableDeclaration(decl.parent) && getSymbolOfNode(decl.parent));
             var prototype = assignmentSymbol && assignmentSymbol.exports && assignmentSymbol.exports.get("prototype");
             var init = prototype && prototype.valueDeclaration && getAssignedJSPrototype(prototype.valueDeclaration);
-            return init ? checkExpression(init) : undefined;
+            return init ? getWidenedType(checkExpressionCached(init)) : undefined;
         }
         function getAssignedJSPrototype(node) {
             if (!node.parent) {
                 return false;
             }
             var parent = node.parent;
-            while (parent && parent.kind === 189 /* PropertyAccessExpression */) {
+            while (parent && parent.kind === 190 /* PropertyAccessExpression */) {
                 parent = parent.parent;
             }
-            if (parent && ts.isBinaryExpression(parent) && ts.isPrototypeAccess(parent.left) && parent.operatorToken.kind === 59 /* EqualsToken */) {
+            if (parent && ts.isBinaryExpression(parent) && ts.isPrototypeAccess(parent.left) && parent.operatorToken.kind === 60 /* EqualsToken */) {
                 var right = ts.getInitializerOfBinaryExpression(parent);
                 return ts.isObjectLiteralExpression(right) && right;
             }
@@ -50918,18 +52556,18 @@ var ts;
             var signature = getResolvedSignature(node, /*candidatesOutArray*/ undefined, checkMode);
             if (signature === resolvingSignature) {
                 // CheckMode.SkipGenericFunctions is enabled and this is a call to a generic function that
-                // returns a function type. We defer checking and return anyFunctionType.
-                return silentNeverType;
+                // returns a function type. We defer checking and return nonInferrableType.
+                return nonInferrableType;
             }
-            if (node.expression.kind === 98 /* SuperKeyword */) {
+            if (node.expression.kind === 99 /* SuperKeyword */) {
                 return voidType;
             }
-            if (node.kind === 192 /* NewExpression */) {
+            if (node.kind === 193 /* NewExpression */) {
                 var declaration = signature.declaration;
                 if (declaration &&
-                    declaration.kind !== 157 /* Constructor */ &&
-                    declaration.kind !== 161 /* ConstructSignature */ &&
-                    declaration.kind !== 166 /* ConstructorType */ &&
+                    declaration.kind !== 158 /* Constructor */ &&
+                    declaration.kind !== 162 /* ConstructSignature */ &&
+                    declaration.kind !== 167 /* ConstructorType */ &&
                     !ts.isJSDocConstructSignature(declaration) &&
                     !isJSConstructor(declaration)) {
                     // When resolved signature is a call signature (and not a construct signature) the result type is any
@@ -51046,9 +52684,9 @@ var ts;
                 return false;
             }
             var targetDeclarationKind = resolvedRequire.flags & 16 /* Function */
-                ? 239 /* FunctionDeclaration */
+                ? 240 /* FunctionDeclaration */
                 : resolvedRequire.flags & 3 /* Variable */
-                    ? 237 /* VariableDeclaration */
+                    ? 238 /* VariableDeclaration */
                     : 0 /* Unknown */;
             if (targetDeclarationKind !== 0 /* Unknown */) {
                 var decl = ts.getDeclarationOfKind(resolvedRequire, targetDeclarationKind);
@@ -51060,7 +52698,7 @@ var ts;
         function checkTaggedTemplateExpression(node) {
             checkGrammarTypeArguments(node, node.typeArguments);
             if (languageVersion < 2 /* ES2015 */) {
-                checkExternalEmitHelpers(node, 65536 /* MakeTemplateObject */);
+                checkExternalEmitHelpers(node, 131072 /* MakeTemplateObject */);
             }
             return getReturnTypeOfSignature(getResolvedSignature(node));
         }
@@ -51073,18 +52711,28 @@ var ts;
                 case 14 /* NoSubstitutionTemplateLiteral */:
                 case 8 /* NumericLiteral */:
                 case 9 /* BigIntLiteral */:
-                case 102 /* TrueKeyword */:
-                case 87 /* FalseKeyword */:
-                case 187 /* ArrayLiteralExpression */:
-                case 188 /* ObjectLiteralExpression */:
+                case 103 /* TrueKeyword */:
+                case 88 /* FalseKeyword */:
+                case 188 /* ArrayLiteralExpression */:
+                case 189 /* ObjectLiteralExpression */:
                     return true;
-                case 195 /* ParenthesizedExpression */:
+                case 196 /* ParenthesizedExpression */:
                     return isValidConstAssertionArgument(node.expression);
-                case 202 /* PrefixUnaryExpression */:
+                case 203 /* PrefixUnaryExpression */:
                     var op = node.operator;
                     var arg = node.operand;
                     return op === 39 /* MinusToken */ && (arg.kind === 8 /* NumericLiteral */ || arg.kind === 9 /* BigIntLiteral */) ||
                         op === 38 /* PlusToken */ && arg.kind === 8 /* NumericLiteral */;
+                case 190 /* PropertyAccessExpression */:
+                case 191 /* ElementAccessExpression */:
+                    var expr = node.expression;
+                    if (ts.isIdentifier(expr)) {
+                        var symbol = getSymbolAtLocation(expr);
+                        if (symbol && symbol.flags & 2097152 /* Alias */) {
+                            symbol = resolveAlias(symbol);
+                        }
+                        return !!(symbol && (symbol.flags & 384 /* Enum */) && getEnumKind(symbol) === 1 /* Literal */);
+                    }
             }
             return false;
         }
@@ -51092,7 +52740,7 @@ var ts;
             var exprType = checkExpression(expression, checkMode);
             if (ts.isConstTypeReference(type)) {
                 if (!isValidConstAssertionArgument(expression)) {
-                    error(expression, ts.Diagnostics.A_const_assertion_can_only_be_applied_to_a_string_number_boolean_array_or_object_literal);
+                    error(expression, ts.Diagnostics.A_const_assertions_can_only_be_applied_to_references_to_enum_members_or_string_number_boolean_array_or_object_literals);
                 }
                 return getRegularTypeOfLiteralType(exprType);
             }
@@ -51112,10 +52760,10 @@ var ts;
         }
         function checkMetaProperty(node) {
             checkGrammarMetaProperty(node);
-            if (node.keywordToken === 95 /* NewKeyword */) {
+            if (node.keywordToken === 96 /* NewKeyword */) {
                 return checkNewTargetMetaProperty(node);
             }
-            if (node.keywordToken === 92 /* ImportKeyword */) {
+            if (node.keywordToken === 93 /* ImportKeyword */) {
                 return checkImportMetaProperty(node);
             }
             return ts.Debug.assertNever(node.keywordToken);
@@ -51126,7 +52774,7 @@ var ts;
                 error(node, ts.Diagnostics.Meta_property_0_is_only_allowed_in_the_body_of_a_function_declaration_function_expression_or_constructor, "new.target");
                 return errorType;
             }
-            else if (container.kind === 157 /* Constructor */) {
+            else if (container.kind === 158 /* Constructor */) {
                 var symbol = getSymbolOfNode(container.parent);
                 return getTypeOfSymbol(symbol);
             }
@@ -51136,7 +52784,7 @@ var ts;
             }
         }
         function checkImportMetaProperty(node) {
-            if (languageVersion < 7 /* ESNext */ || moduleKind < ts.ModuleKind.ESNext) {
+            if (languageVersion < 99 /* ESNext */ || moduleKind < ts.ModuleKind.ESNext) {
                 error(node, ts.Diagnostics.The_import_meta_meta_property_is_only_allowed_using_ESNext_for_the_target_and_module_compiler_options);
             }
             var file = ts.getSourceFileOfNode(node);
@@ -51177,9 +52825,14 @@ var ts;
                 return getTypeOfParameter(signature.parameters[pos]);
             }
             if (signature.hasRestParameter) {
+                // We want to return the value undefined for an out of bounds parameter position,
+                // so we need to check bounds here before calling getIndexedAccessType (which
+                // otherwise would return the type 'undefined').
                 var restType = getTypeOfSymbol(signature.parameters[paramCount]);
-                var indexType = getLiteralType(pos - paramCount);
-                return getIndexedAccessType(restType, indexType);
+                var index = pos - paramCount;
+                if (!isTupleType(restType) || restType.target.hasRestElement || index < (restType.typeArguments || ts.emptyArray).length) {
+                    return getIndexedAccessType(restType, getLiteralType(index));
+                }
             }
             return undefined;
         }
@@ -51250,14 +52903,14 @@ var ts;
         function getTypeOfFirstParameterOfSignatureWithFallback(signature, fallbackType) {
             return signature.parameters.length > 0 ? getTypeAtPosition(signature, 0) : fallbackType;
         }
-        function inferFromAnnotatedParameters(signature, context, mapper) {
+        function inferFromAnnotatedParameters(signature, context, inferenceContext) {
             var len = signature.parameters.length - (signature.hasRestParameter ? 1 : 0);
             for (var i = 0; i < len; i++) {
                 var declaration = signature.parameters[i].valueDeclaration;
                 if (declaration.type) {
                     var typeNode = ts.getEffectiveTypeAnnotationNode(declaration);
                     if (typeNode) {
-                        inferTypes(mapper.inferences, getTypeFromTypeNode(typeNode), getTypeAtPosition(context, i));
+                        inferTypes(inferenceContext.inferences, getTypeFromTypeNode(typeNode), getTypeAtPosition(context, i));
                     }
                 }
             }
@@ -51265,12 +52918,12 @@ var ts;
             if (restType && restType.flags & 262144 /* TypeParameter */) {
                 // The contextual signature has a generic rest parameter. We first instantiate the contextual
                 // signature (without fixing type parameters) and assign types to contextually typed parameters.
-                var instantiatedContext = instantiateSignature(context, cloneTypeMapper(mapper));
+                var instantiatedContext = instantiateSignature(context, inferenceContext.nonFixingMapper);
                 assignContextualParameterTypes(signature, instantiatedContext);
                 // We then infer from a tuple type representing the parameters that correspond to the contextual
                 // rest parameter.
                 var restPos = getParameterCount(context) - 1;
-                inferTypes(mapper.inferences, getRestTypeAtPosition(signature, restPos), restType);
+                inferTypes(inferenceContext.inferences, getRestTypeAtPosition(signature, restPos), restType);
             }
         }
         function assignContextualParameterTypes(signature, context) {
@@ -51307,7 +52960,7 @@ var ts;
             for (var _i = 0, _a = pattern.elements; _i < _a.length; _i++) {
                 var element = _a[_i];
                 if (!ts.isOmittedExpression(element)) {
-                    if (element.name.kind === 72 /* Identifier */) {
+                    if (element.name.kind === 73 /* Identifier */) {
                         getSymbolLinks(getSymbolOfNode(element)).type = getTypeForBindingElement(element);
                     }
                     else {
@@ -51321,9 +52974,9 @@ var ts;
             if (!links.type) {
                 links.type = contextualType;
                 var decl = parameter.valueDeclaration;
-                if (decl.name.kind !== 72 /* Identifier */) {
+                if (decl.name.kind !== 73 /* Identifier */) {
                     // if inference didn't come up with anything but {}, fall back to the binding pattern if present.
-                    if (links.type === emptyObjectType) {
+                    if (links.type === unknownType) {
                         links.type = getTypeFromBindingPattern(decl.name);
                     }
                     assignBindingElementTypes(decl.name);
@@ -51335,24 +52988,24 @@ var ts;
             var globalPromiseType = getGlobalPromiseType(/*reportErrors*/ true);
             if (globalPromiseType !== emptyGenericType) {
                 // if the promised type is itself a promise, get the underlying type; otherwise, fallback to the promised type
-                promisedType = getAwaitedType(promisedType) || emptyObjectType;
+                promisedType = getAwaitedType(promisedType) || unknownType;
                 return createTypeReference(globalPromiseType, [promisedType]);
             }
-            return emptyObjectType;
+            return unknownType;
         }
         function createPromiseLikeType(promisedType) {
             // creates a `PromiseLike<T>` type where `T` is the promisedType argument
             var globalPromiseLikeType = getGlobalPromiseLikeType(/*reportErrors*/ true);
             if (globalPromiseLikeType !== emptyGenericType) {
                 // if the promised type is itself a promise, get the underlying type; otherwise, fallback to the promised type
-                promisedType = getAwaitedType(promisedType) || emptyObjectType;
+                promisedType = getAwaitedType(promisedType) || unknownType;
                 return createTypeReference(globalPromiseLikeType, [promisedType]);
             }
-            return emptyObjectType;
+            return unknownType;
         }
         function createPromiseReturnType(func, promisedType) {
             var promiseType = createPromiseType(promisedType);
-            if (promiseType === emptyObjectType) {
+            if (promiseType === unknownType) {
                 error(func, ts.isImportCall(func) ?
                     ts.Diagnostics.A_dynamic_import_call_returns_a_Promise_Make_sure_you_have_a_declaration_for_Promise_or_include_ES2015_in_your_lib_option :
                     ts.Diagnostics.An_async_function_or_method_must_return_a_Promise_Make_sure_you_have_a_declaration_for_Promise_or_include_ES2015_in_your_lib_option);
@@ -51370,99 +53023,148 @@ var ts;
                 return errorType;
             }
             var functionFlags = ts.getFunctionFlags(func);
-            var type;
-            if (func.body.kind !== 218 /* Block */) {
-                type = checkExpressionCached(func.body, checkMode && checkMode & ~8 /* SkipGenericFunctions */);
-                if (functionFlags & 2 /* Async */) {
+            var isAsync = (functionFlags & 2 /* Async */) !== 0;
+            var isGenerator = (functionFlags & 1 /* Generator */) !== 0;
+            var returnType;
+            var yieldType;
+            var nextType;
+            var fallbackReturnType = voidType;
+            if (func.body.kind !== 219 /* Block */) { // Async or normal arrow function
+                returnType = checkExpressionCached(func.body, checkMode && checkMode & ~8 /* SkipGenericFunctions */);
+                if (isAsync) {
                     // From within an async function you can return either a non-promise value or a promise. Any
                     // Promise/A+ compatible implementation will always assimilate any foreign promise, so the
                     // return type of the body should be unwrapped to its awaited type, which we will wrap in
                     // the native Promise<T> type later in this function.
-                    type = checkAwaitedType(type, /*errorNode*/ func, ts.Diagnostics.The_return_type_of_an_async_function_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member);
+                    returnType = checkAwaitedType(returnType, /*errorNode*/ func, ts.Diagnostics.The_return_type_of_an_async_function_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member);
                 }
             }
-            else {
-                var types = checkAndAggregateReturnExpressionTypes(func, checkMode);
-                if (functionFlags & 1 /* Generator */) { // Generator or AsyncGenerator function
-                    types = ts.concatenate(checkAndAggregateYieldOperandTypes(func, checkMode), types);
-                    if (!types || types.length === 0) {
-                        var iterableIteratorAny = functionFlags & 2 /* Async */
-                            ? createAsyncIterableIteratorType(anyType) // AsyncGenerator function
-                            : createIterableIteratorType(anyType); // Generator function
-                        if (noImplicitAny) {
-                            error(func.asteriskToken, ts.Diagnostics.Generator_implicitly_has_type_0_because_it_does_not_yield_any_values_Consider_supplying_a_return_type, typeToString(iterableIteratorAny));
-                        }
-                        return iterableIteratorAny;
-                    }
+            else if (isGenerator) { // Generator or AsyncGenerator function
+                var returnTypes = checkAndAggregateReturnExpressionTypes(func, checkMode);
+                if (!returnTypes) {
+                    fallbackReturnType = neverType;
                 }
-                else {
-                    if (!types) {
-                        // For an async function, the return type will not be never, but rather a Promise for never.
-                        return functionFlags & 2 /* Async */
-                            ? createPromiseReturnType(func, neverType) // Async function
-                            : neverType; // Normal function
-                    }
-                    if (types.length === 0) {
-                        // For an async function, the return type will not be void, but rather a Promise for void.
-                        return functionFlags & 2 /* Async */
-                            ? createPromiseReturnType(func, voidType) // Async function
-                            : voidType; // Normal function
-                    }
+                else if (returnTypes.length > 0) {
+                    returnType = getUnionType(returnTypes, 2 /* Subtype */);
+                }
+                var _a = checkAndAggregateYieldOperandTypes(func, checkMode), yieldTypes = _a.yieldTypes, nextTypes = _a.nextTypes;
+                yieldType = ts.some(yieldTypes) ? getUnionType(yieldTypes, 2 /* Subtype */) : undefined;
+                nextType = ts.some(nextTypes) ? getIntersectionType(nextTypes) : undefined;
+            }
+            else { // Async or normal function
+                var types = checkAndAggregateReturnExpressionTypes(func, checkMode);
+                if (!types) {
+                    // For an async function, the return type will not be never, but rather a Promise for never.
+                    return functionFlags & 2 /* Async */
+                        ? createPromiseReturnType(func, neverType) // Async function
+                        : neverType; // Normal function
+                }
+                if (types.length === 0) {
+                    // For an async function, the return type will not be void, but rather a Promise for void.
+                    return functionFlags & 2 /* Async */
+                        ? createPromiseReturnType(func, voidType) // Async function
+                        : voidType; // Normal function
                 }
                 // Return a union of the return expression types.
-                type = getUnionType(types, 2 /* Subtype */);
+                returnType = getUnionType(types, 2 /* Subtype */);
             }
-            var contextualSignature = getContextualSignatureForFunctionLikeDeclaration(func);
-            if (!contextualSignature) {
-                reportErrorsFromWidening(func, type);
-            }
-            if (isUnitType(type)) {
-                var contextualType = !contextualSignature ? undefined :
-                    contextualSignature === getSignatureFromDeclaration(func) ? type :
-                        getReturnTypeOfSignature(contextualSignature);
-                if (contextualType) {
-                    switch (functionFlags & 3 /* AsyncGenerator */) {
-                        case 3 /* AsyncGenerator */:
-                            contextualType = getIteratedTypeOfGenerator(contextualType, /*isAsyncGenerator*/ true);
-                            break;
-                        case 1 /* Generator */:
-                            contextualType = getIteratedTypeOfGenerator(contextualType, /*isAsyncGenerator*/ false);
-                            break;
-                        case 2 /* Async */:
-                            contextualType = getPromisedTypeOfPromise(contextualType);
-                            break;
+            if (returnType || yieldType || nextType) {
+                var contextualSignature = getContextualSignatureForFunctionLikeDeclaration(func);
+                if (!contextualSignature) {
+                    if (yieldType)
+                        reportErrorsFromWidening(func, yieldType, 1 /* GeneratorYield */);
+                    if (returnType)
+                        reportErrorsFromWidening(func, returnType);
+                    if (nextType)
+                        reportErrorsFromWidening(func, nextType);
+                }
+                if (returnType && isUnitType(returnType) ||
+                    yieldType && isUnitType(yieldType) ||
+                    nextType && isUnitType(nextType)) {
+                    var contextualType = !contextualSignature ? undefined :
+                        contextualSignature === getSignatureFromDeclaration(func) ? isGenerator ? undefined : returnType :
+                            instantiateContextualType(getReturnTypeOfSignature(contextualSignature), func);
+                    if (isGenerator) {
+                        yieldType = getWidenedLiteralLikeTypeForContextualIterationTypeIfNeeded(yieldType, contextualType, 0 /* Yield */, isAsync);
+                        returnType = getWidenedLiteralLikeTypeForContextualIterationTypeIfNeeded(returnType, contextualType, 1 /* Return */, isAsync);
+                        nextType = getWidenedLiteralLikeTypeForContextualIterationTypeIfNeeded(nextType, contextualType, 2 /* Next */, isAsync);
+                    }
+                    else {
+                        returnType = getWidenedLiteralLikeTypeForContextualReturnTypeIfNeeded(returnType, contextualType, isAsync);
                     }
                 }
-                type = getWidenedLiteralLikeTypeForContextualType(type, contextualType);
+                if (yieldType)
+                    yieldType = getWidenedType(yieldType);
+                if (returnType)
+                    returnType = getWidenedType(returnType);
+                if (nextType)
+                    nextType = getWidenedType(nextType);
             }
-            var widenedType = getWidenedType(type);
-            switch (functionFlags & 3 /* AsyncGenerator */) {
-                case 3 /* AsyncGenerator */:
-                    return createAsyncIterableIteratorType(widenedType);
-                case 1 /* Generator */:
-                    return createIterableIteratorType(widenedType);
-                case 2 /* Async */:
-                    // From within an async function you can return either a non-promise value or a promise. Any
-                    // Promise/A+ compatible implementation will always assimilate any foreign promise, so the
-                    // return type of the body is awaited type of the body, wrapped in a native Promise<T> type.
-                    return createPromiseType(widenedType);
-                default:
-                    return widenedType;
+            if (isGenerator) {
+                return createGeneratorReturnType(yieldType || neverType, returnType || fallbackReturnType, nextType || unknownType, isAsync);
             }
+            else {
+                // From within an async function you can return either a non-promise value or a promise. Any
+                // Promise/A+ compatible implementation will always assimilate any foreign promise, so the
+                // return type of the body is awaited type of the body, wrapped in a native Promise<T> type.
+                return isAsync
+                    ? createPromiseType(returnType || fallbackReturnType)
+                    : returnType || fallbackReturnType;
+            }
+        }
+        function createGeneratorReturnType(yieldType, returnType, nextType, isAsyncGenerator) {
+            var resolver = isAsyncGenerator ? asyncIterationTypesResolver : syncIterationTypesResolver;
+            var globalGeneratorType = resolver.getGlobalGeneratorType(/*reportErrors*/ false);
+            yieldType = resolver.resolveIterationType(yieldType, /*errorNode*/ undefined) || unknownType;
+            returnType = resolver.resolveIterationType(returnType, /*errorNode*/ undefined) || unknownType;
+            nextType = resolver.resolveIterationType(nextType, /*errorNode*/ undefined) || unknownType;
+            if (globalGeneratorType === emptyGenericType) {
+                // Fall back to the global IterableIterator if returnType is assignable to the expected return iteration
+                // type of IterableIterator, and the expected next iteration type of IterableIterator is assignable to
+                // nextType.
+                var globalType = resolver.getGlobalIterableIteratorType(/*reportErrors*/ false);
+                var iterationTypes = globalType !== emptyGenericType ? getIterationTypesOfGlobalIterableType(globalType, resolver) : undefined;
+                var iterableIteratorReturnType = iterationTypes ? iterationTypes.returnType : anyType;
+                var iterableIteratorNextType = iterationTypes ? iterationTypes.nextType : undefinedType;
+                if (isTypeAssignableTo(returnType, iterableIteratorReturnType) &&
+                    isTypeAssignableTo(iterableIteratorNextType, nextType)) {
+                    if (globalType !== emptyGenericType) {
+                        return createTypeFromGenericGlobalType(globalType, [yieldType]);
+                    }
+                    // The global IterableIterator type doesn't exist, so report an error
+                    resolver.getGlobalIterableIteratorType(/*reportErrors*/ true);
+                    return emptyObjectType;
+                }
+                // The global Generator type doesn't exist, so report an error
+                resolver.getGlobalGeneratorType(/*reportErrors*/ true);
+                return emptyObjectType;
+            }
+            return createTypeFromGenericGlobalType(globalGeneratorType, [yieldType, returnType, nextType]);
         }
         function checkAndAggregateYieldOperandTypes(func, checkMode) {
-            var aggregatedTypes = [];
+            var yieldTypes = [];
+            var nextTypes = [];
             var isAsync = (ts.getFunctionFlags(func) & 2 /* Async */) !== 0;
             ts.forEachYieldExpression(func.body, function (yieldExpression) {
-                ts.pushIfUnique(aggregatedTypes, getYieldedTypeOfYieldExpression(yieldExpression, isAsync, checkMode));
+                var yieldExpressionType = yieldExpression.expression ? checkExpression(yieldExpression.expression, checkMode) : undefinedWideningType;
+                ts.pushIfUnique(yieldTypes, getYieldedTypeOfYieldExpression(yieldExpression, yieldExpressionType, anyType, isAsync));
+                var nextType;
+                if (yieldExpression.asteriskToken) {
+                    var iterationTypes = getIterationTypesOfIterable(yieldExpressionType, isAsync ? 19 /* AsyncYieldStar */ : 17 /* YieldStar */, yieldExpression.expression);
+                    nextType = iterationTypes && iterationTypes.nextType;
+                }
+                else {
+                    nextType = getContextualType(yieldExpression);
+                }
+                if (nextType)
+                    ts.pushIfUnique(nextTypes, nextType);
             });
-            return aggregatedTypes;
+            return { yieldTypes: yieldTypes, nextTypes: nextTypes };
         }
-        function getYieldedTypeOfYieldExpression(node, isAsync, checkMode) {
+        function getYieldedTypeOfYieldExpression(node, expressionType, sentType, isAsync) {
             var errorNode = node.expression || node;
-            var expressionType = node.expression ? checkExpression(node.expression, checkMode) : undefinedWideningType;
             // A `yield*` expression effectively yields everything that its operand yields
-            var yieldedType = node.asteriskToken ? checkIteratedTypeOrElementType(expressionType, errorNode, /*allowStringInput*/ false, isAsync) : expressionType;
+            var yieldedType = node.asteriskToken ? checkIteratedTypeOrElementType(isAsync ? 19 /* AsyncYieldStar */ : 17 /* YieldStar */, expressionType, sentType, errorNode) : expressionType;
             return !isAsync ? yieldedType : getAwaitedType(yieldedType, errorNode, node.asteriskToken
                 ? ts.Diagnostics.Type_of_iterated_elements_of_a_yield_Asterisk_operand_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member
                 : ts.Diagnostics.Type_of_yield_operand_in_an_async_generator_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member);
@@ -51513,7 +53215,7 @@ var ts;
             if (!node.possiblyExhaustive) {
                 return false;
             }
-            if (node.expression.kind === 199 /* TypeOfExpression */) {
+            if (node.expression.kind === 200 /* TypeOfExpression */) {
                 var operandType = getTypeOfExpression(node.expression.expression);
                 // This cast is safe because the switch is possibly exhaustive and does not contain a default case, so there can be no undefined.
                 var witnesses = getSwitchClauseTypeOfWitnesses(node);
@@ -51536,7 +53238,7 @@ var ts;
             if (!(func.flags & 128 /* HasImplicitReturn */)) {
                 return false;
             }
-            if (ts.some(func.body.statements, function (statement) { return statement.kind === 232 /* SwitchStatement */ && isExhaustiveSwitchStatement(statement); })) {
+            if (ts.some(func.body.statements, function (statement) { return statement.kind === 233 /* SwitchStatement */ && isExhaustiveSwitchStatement(statement); })) {
                 return false;
             }
             return true;
@@ -51579,11 +53281,11 @@ var ts;
         }
         function mayReturnNever(func) {
             switch (func.kind) {
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
                     return true;
-                case 156 /* MethodDeclaration */:
-                    return func.parent.kind === 188 /* ObjectLiteralExpression */;
+                case 157 /* MethodDeclaration */:
+                    return func.parent.kind === 189 /* ObjectLiteralExpression */;
                 default:
                     return false;
             }
@@ -51601,30 +53303,32 @@ var ts;
             if (!produceDiagnostics) {
                 return;
             }
+            var functionFlags = ts.getFunctionFlags(func);
+            var type = returnType && getReturnOrPromisedType(returnType, functionFlags);
             // Functions with with an explicitly specified 'void' or 'any' return type don't need any return expressions.
-            if (returnType && maybeTypeOfKind(returnType, 1 /* Any */ | 16384 /* Void */)) {
+            if (type && maybeTypeOfKind(type, 1 /* Any */ | 16384 /* Void */)) {
                 return;
             }
             // If all we have is a function signature, or an arrow function with an expression body, then there is nothing to check.
             // also if HasImplicitReturn flag is not set this means that all codepaths in function body end with return or throw
-            if (func.kind === 155 /* MethodSignature */ || ts.nodeIsMissing(func.body) || func.body.kind !== 218 /* Block */ || !functionHasImplicitReturn(func)) {
+            if (func.kind === 156 /* MethodSignature */ || ts.nodeIsMissing(func.body) || func.body.kind !== 219 /* Block */ || !functionHasImplicitReturn(func)) {
                 return;
             }
             var hasExplicitReturn = func.flags & 256 /* HasExplicitReturn */;
-            if (returnType && returnType.flags & 131072 /* Never */) {
+            if (type && type.flags & 131072 /* Never */) {
                 error(ts.getEffectiveReturnTypeNode(func), ts.Diagnostics.A_function_returning_never_cannot_have_a_reachable_end_point);
             }
-            else if (returnType && !hasExplicitReturn) {
+            else if (type && !hasExplicitReturn) {
                 // minimal check: function has syntactic return type annotation and no explicit return statements in the body
                 // this function does not conform to the specification.
                 // NOTE: having returnType !== undefined is a precondition for entering this branch so func.type will always be present
                 error(ts.getEffectiveReturnTypeNode(func), ts.Diagnostics.A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value);
             }
-            else if (returnType && strictNullChecks && !isTypeAssignableTo(undefinedType, returnType)) {
+            else if (type && strictNullChecks && !isTypeAssignableTo(undefinedType, type)) {
                 error(ts.getEffectiveReturnTypeNode(func), ts.Diagnostics.Function_lacks_ending_return_statement_and_return_type_does_not_include_undefined);
             }
             else if (compilerOptions.noImplicitReturns) {
-                if (!returnType) {
+                if (!type) {
                     // If return type annotation is omitted check if function has any explicit return statements.
                     // If it does not have any - its inferred return type is void - don't do any checks.
                     // Otherwise get inferred return type from function body and report error only if it is not void / anytype
@@ -51640,34 +53344,38 @@ var ts;
             }
         }
         function checkFunctionExpressionOrObjectLiteralMethod(node, checkMode) {
-            ts.Debug.assert(node.kind !== 156 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 157 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
             checkNodeDeferred(node);
             // The identityMapper object is used to indicate that function expressions are wildcards
             if (checkMode && checkMode & 4 /* SkipContextSensitive */ && isContextSensitive(node)) {
                 // Skip parameters, return signature with return type that retains noncontextual parts so inferences can still be drawn in an early stage
                 if (!ts.getEffectiveReturnTypeNode(node) && hasContextSensitiveReturnExpression(node)) {
-                    var links_1 = getNodeLinks(node);
-                    if (links_1.contextFreeType) {
-                        return links_1.contextFreeType;
+                    var links = getNodeLinks(node);
+                    if (links.contextFreeType) {
+                        return links.contextFreeType;
                     }
                     var returnType = getReturnTypeFromBody(node, checkMode);
                     var returnOnlySignature = createSignature(undefined, undefined, undefined, ts.emptyArray, returnType, /*resolvedTypePredicate*/ undefined, 0, /*hasRestParameter*/ false, /*hasLiteralTypes*/ false);
                     var returnOnlyType = createAnonymousType(node.symbol, emptySymbols, [returnOnlySignature], ts.emptyArray, undefined, undefined);
-                    returnOnlyType.objectFlags |= 524288 /* ContainsAnyFunctionType */;
-                    return links_1.contextFreeType = returnOnlyType;
+                    returnOnlyType.objectFlags |= 1048576 /* NonInferrableType */;
+                    return links.contextFreeType = returnOnlyType;
                 }
                 return anyFunctionType;
             }
             // Grammar checking
             var hasGrammarError = checkGrammarFunctionLikeDeclaration(node);
-            if (!hasGrammarError && node.kind === 196 /* FunctionExpression */) {
+            if (!hasGrammarError && node.kind === 197 /* FunctionExpression */) {
                 checkGrammarForGenerator(node);
             }
-            var links = getNodeLinks(node);
             var type = getTypeOfSymbol(getMergedSymbol(node.symbol));
             if (isTypeAny(type)) {
                 return type;
             }
+            contextuallyCheckFunctionExpressionOrObjectLiteralMethod(node, checkMode);
+            return type;
+        }
+        function contextuallyCheckFunctionExpressionOrObjectLiteralMethod(node, checkMode) {
+            var links = getNodeLinks(node);
             // Check if function expression is contextually typed and assign parameter types if so.
             if (!(links.flags & 1024 /* ContextChecked */)) {
                 var contextualSignature = getContextualSignature(node);
@@ -51677,14 +53385,18 @@ var ts;
                 if (!(links.flags & 1024 /* ContextChecked */)) {
                     links.flags |= 1024 /* ContextChecked */;
                     if (contextualSignature) {
+                        var type = getTypeOfSymbol(getMergedSymbol(node.symbol));
+                        if (isTypeAny(type)) {
+                            return;
+                        }
                         var signature = getSignaturesOfType(type, 0 /* Call */)[0];
                         if (isContextSensitive(node)) {
-                            var contextualMapper = getContextualMapper(node);
+                            var inferenceContext = getInferenceContext(node);
                             if (checkMode && checkMode & 2 /* Inferential */) {
-                                inferFromAnnotatedParameters(signature, contextualSignature, contextualMapper);
+                                inferFromAnnotatedParameters(signature, contextualSignature, inferenceContext);
                             }
-                            var instantiatedContextualSignature = contextualMapper === identityMapper ?
-                                contextualSignature : instantiateSignature(contextualSignature, contextualMapper);
+                            var instantiatedContextualSignature = inferenceContext ?
+                                instantiateSignature(contextualSignature, inferenceContext.mapper) : contextualSignature;
                             assignContextualParameterTypes(signature, instantiatedContextualSignature);
                         }
                         if (!getReturnTypeFromAnnotation(node) && !signature.resolvedReturnType) {
@@ -51697,21 +53409,19 @@ var ts;
                     checkSignatureDeclaration(node);
                 }
             }
-            return type;
         }
-        function getReturnOrPromisedType(node, functionFlags) {
-            var type = getReturnTypeFromAnnotation(node);
-            return type && ((functionFlags & 3 /* AsyncGenerator */) === 2 /* Async */) ?
-                getAwaitedType(type) || errorType : type;
+        function getReturnOrPromisedType(type, functionFlags) {
+            var isGenerator = !!(functionFlags & 1 /* Generator */);
+            var isAsync = !!(functionFlags & 2 /* Async */);
+            return type && isGenerator ? getIterationTypeOfGeneratorFunctionReturnType(1 /* Return */, type, isAsync) || errorType :
+                type && isAsync ? getAwaitedType(type) || errorType :
+                    type;
         }
         function checkFunctionExpressionOrObjectLiteralMethodDeferred(node) {
-            ts.Debug.assert(node.kind !== 156 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 157 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
             var functionFlags = ts.getFunctionFlags(node);
-            var returnOrPromisedType = getReturnOrPromisedType(node, functionFlags);
-            if ((functionFlags & 1 /* Generator */) === 0) { // Async function or normal function
-                // return is not necessary in the body of generators
-                checkAllCodePathsInNonVoidFunctionReturnOrThrow(node, returnOrPromisedType);
-            }
+            var returnType = getReturnTypeFromAnnotation(node);
+            checkAllCodePathsInNonVoidFunctionReturnOrThrow(node, returnType);
             if (node.body) {
                 if (!ts.getEffectiveReturnTypeNode(node)) {
                     // There are some checks that are only performed in getReturnTypeFromBody, that may produce errors
@@ -51721,7 +53431,7 @@ var ts;
                     // checkFunctionExpressionBodies). So it must be done now.
                     getReturnTypeOfSignature(getSignatureFromDeclaration(node));
                 }
-                if (node.body.kind === 218 /* Block */) {
+                if (node.body.kind === 219 /* Block */) {
                     checkSourceElement(node.body);
                 }
                 else {
@@ -51731,6 +53441,7 @@ var ts;
                     // check assignability of the awaited type of the expression body against the promised type of
                     // its return type annotation.
                     var exprType = checkExpression(node.body);
+                    var returnOrPromisedType = getReturnOrPromisedType(returnType, functionFlags);
                     if (returnOrPromisedType) {
                         if ((functionFlags & 3 /* AsyncGenerator */) === 2 /* Async */) { // Async function
                             var awaitedType = checkAwaitedType(exprType, node.body, ts.Diagnostics.The_return_type_of_an_async_function_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member);
@@ -51743,9 +53454,11 @@ var ts;
                 }
             }
         }
-        function checkArithmeticOperandType(operand, type, diagnostic) {
+        function checkArithmeticOperandType(operand, type, diagnostic, isAwaitValid) {
+            if (isAwaitValid === void 0) { isAwaitValid = false; }
             if (!isTypeAssignableTo(type, numberOrBigIntType)) {
-                error(operand, diagnostic);
+                var awaitedType = isAwaitValid && getAwaitedTypeOfPromise(type);
+                errorAndMaybeSuggestAwait(operand, !!awaitedType && isTypeAssignableTo(awaitedType, numberOrBigIntType), diagnostic);
                 return false;
             }
             return true;
@@ -51799,11 +53512,11 @@ var ts;
             if (isReadonlySymbol(symbol)) {
                 // Allow assignments to readonly properties within constructors of the same class declaration.
                 if (symbol.flags & 4 /* Property */ &&
-                    (expr.kind === 189 /* PropertyAccessExpression */ || expr.kind === 190 /* ElementAccessExpression */) &&
-                    expr.expression.kind === 100 /* ThisKeyword */) {
+                    (expr.kind === 190 /* PropertyAccessExpression */ || expr.kind === 191 /* ElementAccessExpression */) &&
+                    expr.expression.kind === 101 /* ThisKeyword */) {
                     // Look for if this is the constructor for the class that `symbol` is a property of.
                     var func = ts.getContainingFunction(expr);
-                    if (!(func && func.kind === 157 /* Constructor */)) {
+                    if (!(func && func.kind === 158 /* Constructor */)) {
                         return true;
                     }
                     // If func.parent is a class and symbol is a (readonly) property of that class, or
@@ -51816,13 +53529,13 @@ var ts;
             return false;
         }
         function isReferenceThroughNamespaceImport(expr) {
-            if (expr.kind === 189 /* PropertyAccessExpression */ || expr.kind === 190 /* ElementAccessExpression */) {
+            if (expr.kind === 190 /* PropertyAccessExpression */ || expr.kind === 191 /* ElementAccessExpression */) {
                 var node = ts.skipParentheses(expr.expression);
-                if (node.kind === 72 /* Identifier */) {
+                if (node.kind === 73 /* Identifier */) {
                     var symbol = getNodeLinks(node).resolvedSymbol;
                     if (symbol.flags & 2097152 /* Alias */) {
                         var declaration = getDeclarationOfAliasSymbol(symbol);
-                        return !!declaration && declaration.kind === 251 /* NamespaceImport */;
+                        return !!declaration && declaration.kind === 252 /* NamespaceImport */;
                     }
                 }
             }
@@ -51831,7 +53544,7 @@ var ts;
         function checkReferenceExpression(expr, invalidReferenceMessage) {
             // References are combinations of identifiers, parentheses, and property accesses.
             var node = ts.skipOuterExpressions(expr, 2 /* Assertions */ | 1 /* Parentheses */);
-            if (node.kind !== 72 /* Identifier */ && node.kind !== 189 /* PropertyAccessExpression */ && node.kind !== 190 /* ElementAccessExpression */) {
+            if (node.kind !== 73 /* Identifier */ && node.kind !== 190 /* PropertyAccessExpression */ && node.kind !== 191 /* ElementAccessExpression */) {
                 error(expr, invalidReferenceMessage);
                 return false;
             }
@@ -51840,7 +53553,7 @@ var ts;
         function checkDeleteExpression(node) {
             checkExpression(node.expression);
             var expr = ts.skipParentheses(node.expression);
-            if (expr.kind !== 189 /* PropertyAccessExpression */ && expr.kind !== 190 /* ElementAccessExpression */) {
+            if (expr.kind !== 190 /* PropertyAccessExpression */ && expr.kind !== 191 /* ElementAccessExpression */) {
                 error(expr, ts.Diagnostics.The_operand_of_a_delete_operator_must_be_a_property_reference);
                 return booleanType;
             }
@@ -51863,7 +53576,19 @@ var ts;
             // Grammar checking
             if (produceDiagnostics) {
                 if (!(node.flags & 16384 /* AwaitContext */)) {
-                    grammarErrorOnFirstToken(node, ts.Diagnostics.await_expression_is_only_allowed_within_an_async_function);
+                    // use of 'await' in non-async function
+                    var sourceFile = ts.getSourceFileOfNode(node);
+                    if (!hasParseDiagnostics(sourceFile)) {
+                        var span = ts.getSpanOfTokenAtPosition(sourceFile, node.pos);
+                        var diagnostic = ts.createFileDiagnostic(sourceFile, span.start, span.length, ts.Diagnostics.await_expression_is_only_allowed_within_an_async_function);
+                        var func = ts.getContainingFunction(node);
+                        if (func && func.kind !== 158 /* Constructor */) {
+                            ts.Debug.assert((ts.getFunctionFlags(func) & 2 /* Async */) === 0, "Enclosing function should never be an async function.");
+                            var relatedInfo = ts.createDiagnosticForNode(func, ts.Diagnostics.Did_you_mean_to_mark_this_function_as_async);
+                            ts.addRelatedInfo(diagnostic, relatedInfo);
+                        }
+                        diagnostics.add(diagnostic);
+                    }
                 }
                 if (isInParameterInitializerBeforeContainingFunction(node)) {
                     error(node, ts.Diagnostics.await_expressions_cannot_be_used_in_a_parameter_initializer);
@@ -52035,16 +53760,17 @@ var ts;
             if (strictNullChecks && properties.length === 0) {
                 return checkNonNullType(sourceType, node);
             }
-            for (var _i = 0, properties_6 = properties; _i < properties_6.length; _i++) {
-                var p = properties_6[_i];
-                checkObjectLiteralDestructuringPropertyAssignment(sourceType, p, properties, rightIsThis);
+            for (var i = 0; i < properties.length; i++) {
+                checkObjectLiteralDestructuringPropertyAssignment(node, sourceType, i, properties, rightIsThis);
             }
             return sourceType;
         }
         /** Note: If property cannot be a SpreadAssignment, then allProperties does not need to be provided */
-        function checkObjectLiteralDestructuringPropertyAssignment(objectLiteralType, property, allProperties, rightIsThis) {
+        function checkObjectLiteralDestructuringPropertyAssignment(node, objectLiteralType, propertyIndex, allProperties, rightIsThis) {
             if (rightIsThis === void 0) { rightIsThis = false; }
-            if (property.kind === 275 /* PropertyAssignment */ || property.kind === 276 /* ShorthandPropertyAssignment */) {
+            var properties = node.properties;
+            var property = properties[propertyIndex];
+            if (property.kind === 276 /* PropertyAssignment */ || property.kind === 277 /* ShorthandPropertyAssignment */) {
                 var name = property.name;
                 var exprType = getLiteralTypeFromPropertyName(name);
                 if (isTypeUsableAsPropertyName(exprType)) {
@@ -52057,21 +53783,29 @@ var ts;
                 }
                 var elementType = getIndexedAccessType(objectLiteralType, exprType, name);
                 var type = getFlowTypeOfDestructuring(property, elementType);
-                return checkDestructuringAssignment(property.kind === 276 /* ShorthandPropertyAssignment */ ? property : property.initializer, type);
+                return checkDestructuringAssignment(property.kind === 277 /* ShorthandPropertyAssignment */ ? property : property.initializer, type);
             }
-            else if (property.kind === 277 /* SpreadAssignment */) {
-                if (languageVersion < 7 /* ESNext */) {
-                    checkExternalEmitHelpers(property, 4 /* Rest */);
+            else if (property.kind === 278 /* SpreadAssignment */) {
+                if (propertyIndex < properties.length - 1) {
+                    error(property, ts.Diagnostics.A_rest_element_must_be_last_in_a_destructuring_pattern);
                 }
-                var nonRestNames = [];
-                if (allProperties) {
-                    for (var i = 0; i < allProperties.length - 1; i++) {
-                        nonRestNames.push(allProperties[i].name);
+                else {
+                    if (languageVersion < 99 /* ESNext */) {
+                        checkExternalEmitHelpers(property, 4 /* Rest */);
                     }
+                    var nonRestNames = [];
+                    if (allProperties) {
+                        for (var _i = 0, allProperties_1 = allProperties; _i < allProperties_1.length; _i++) {
+                            var otherProperty = allProperties_1[_i];
+                            if (!ts.isSpreadAssignment(otherProperty)) {
+                                nonRestNames.push(otherProperty.name);
+                            }
+                        }
+                    }
+                    var type = getRestType(objectLiteralType, nonRestNames, objectLiteralType.symbol);
+                    checkGrammarForDisallowedTrailingComma(allProperties, ts.Diagnostics.A_rest_parameter_or_binding_pattern_may_not_have_a_trailing_comma);
+                    return checkDestructuringAssignment(property.expression, type);
                 }
-                var type = getRestType(objectLiteralType, nonRestNames, objectLiteralType.symbol);
-                checkGrammarForDisallowedTrailingComma(allProperties, ts.Diagnostics.A_rest_parameter_or_binding_pattern_may_not_have_a_trailing_comma);
-                return checkDestructuringAssignment(property.expression, type);
             }
             else {
                 error(property, ts.Diagnostics.Property_assignment_expected);
@@ -52085,7 +53819,7 @@ var ts;
             // This elementType will be used if the specific property corresponding to this index is not
             // present (aka the tuple element property). This call also checks that the parentType is in
             // fact an iterable or array (depending on target language).
-            var elementType = checkIteratedTypeOrElementType(sourceType, node, /*allowStringInput*/ false, /*allowAsyncIterables*/ false) || errorType;
+            var elementType = checkIteratedTypeOrElementType(65 /* Destructuring */, sourceType, undefinedType, node) || errorType;
             for (var i = 0; i < elements.length; i++) {
                 checkArrayLiteralDestructuringElementAssignment(node, sourceType, i, elementType, checkMode);
             }
@@ -52094,14 +53828,16 @@ var ts;
         function checkArrayLiteralDestructuringElementAssignment(node, sourceType, elementIndex, elementType, checkMode) {
             var elements = node.elements;
             var element = elements[elementIndex];
-            if (element.kind !== 210 /* OmittedExpression */) {
-                if (element.kind !== 208 /* SpreadElement */) {
+            if (element.kind !== 211 /* OmittedExpression */) {
+                if (element.kind !== 209 /* SpreadElement */) {
                     var indexType = getLiteralType(elementIndex);
                     if (isArrayLikeType(sourceType)) {
                         // We create a synthetic expression so that getIndexedAccessType doesn't get confused
                         // when the element is a SyntaxKind.ElementAccessExpression.
-                        var elementType_2 = getIndexedAccessType(sourceType, indexType, createSyntheticExpression(element, indexType));
-                        var type = getFlowTypeOfDestructuring(element, elementType_2);
+                        var accessFlags = hasDefaultValue(element) ? 8 /* NoTupleBoundsCheck */ : 0;
+                        var elementType_2 = getIndexedAccessTypeOrUndefined(sourceType, indexType, createSyntheticExpression(element, indexType), accessFlags) || errorType;
+                        var assignedType = hasDefaultValue(element) ? getTypeWithFacts(elementType_2, 524288 /* NEUndefined */) : elementType_2;
+                        var type = getFlowTypeOfDestructuring(element, assignedType);
                         return checkDestructuringAssignment(element, type, checkMode);
                     }
                     return checkDestructuringAssignment(element, elementType, checkMode);
@@ -52111,7 +53847,7 @@ var ts;
                 }
                 else {
                     var restExpression = element.expression;
-                    if (restExpression.kind === 204 /* BinaryExpression */ && restExpression.operatorToken.kind === 59 /* EqualsToken */) {
+                    if (restExpression.kind === 205 /* BinaryExpression */ && restExpression.operatorToken.kind === 60 /* EqualsToken */) {
                         error(restExpression.operatorToken, ts.Diagnostics.A_rest_element_cannot_have_an_initializer);
                     }
                     else {
@@ -52127,7 +53863,7 @@ var ts;
         }
         function checkDestructuringAssignment(exprOrAssignment, sourceType, checkMode, rightIsThis) {
             var target;
-            if (exprOrAssignment.kind === 276 /* ShorthandPropertyAssignment */) {
+            if (exprOrAssignment.kind === 277 /* ShorthandPropertyAssignment */) {
                 var prop = exprOrAssignment;
                 if (prop.objectAssignmentInitializer) {
                     // In strict null checking mode, if a default value of a non-undefined type is specified, remove
@@ -52143,21 +53879,21 @@ var ts;
             else {
                 target = exprOrAssignment;
             }
-            if (target.kind === 204 /* BinaryExpression */ && target.operatorToken.kind === 59 /* EqualsToken */) {
+            if (target.kind === 205 /* BinaryExpression */ && target.operatorToken.kind === 60 /* EqualsToken */) {
                 checkBinaryExpression(target, checkMode);
                 target = target.left;
             }
-            if (target.kind === 188 /* ObjectLiteralExpression */) {
+            if (target.kind === 189 /* ObjectLiteralExpression */) {
                 return checkObjectLiteralAssignment(target, sourceType, rightIsThis);
             }
-            if (target.kind === 187 /* ArrayLiteralExpression */) {
+            if (target.kind === 188 /* ArrayLiteralExpression */) {
                 return checkArrayLiteralAssignment(target, sourceType, checkMode);
             }
             return checkReferenceAssignment(target, sourceType, checkMode);
         }
         function checkReferenceAssignment(target, sourceType, checkMode) {
             var targetType = checkExpression(target, checkMode);
-            var error = target.parent.kind === 277 /* SpreadAssignment */ ?
+            var error = target.parent.kind === 278 /* SpreadAssignment */ ?
                 ts.Diagnostics.The_target_of_an_object_rest_assignment_must_be_a_variable_or_a_property_access :
                 ts.Diagnostics.The_left_hand_side_of_an_assignment_expression_must_be_a_variable_or_a_property_access;
             if (checkReferenceExpression(target, error)) {
@@ -52176,39 +53912,39 @@ var ts;
         function isSideEffectFree(node) {
             node = ts.skipParentheses(node);
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                 case 10 /* StringLiteral */:
                 case 13 /* RegularExpressionLiteral */:
-                case 193 /* TaggedTemplateExpression */:
-                case 206 /* TemplateExpression */:
+                case 194 /* TaggedTemplateExpression */:
+                case 207 /* TemplateExpression */:
                 case 14 /* NoSubstitutionTemplateLiteral */:
                 case 8 /* NumericLiteral */:
                 case 9 /* BigIntLiteral */:
-                case 102 /* TrueKeyword */:
-                case 87 /* FalseKeyword */:
-                case 96 /* NullKeyword */:
-                case 141 /* UndefinedKeyword */:
-                case 196 /* FunctionExpression */:
-                case 209 /* ClassExpression */:
-                case 197 /* ArrowFunction */:
-                case 187 /* ArrayLiteralExpression */:
-                case 188 /* ObjectLiteralExpression */:
-                case 199 /* TypeOfExpression */:
-                case 213 /* NonNullExpression */:
-                case 261 /* JsxSelfClosingElement */:
-                case 260 /* JsxElement */:
+                case 103 /* TrueKeyword */:
+                case 88 /* FalseKeyword */:
+                case 97 /* NullKeyword */:
+                case 142 /* UndefinedKeyword */:
+                case 197 /* FunctionExpression */:
+                case 210 /* ClassExpression */:
+                case 198 /* ArrowFunction */:
+                case 188 /* ArrayLiteralExpression */:
+                case 189 /* ObjectLiteralExpression */:
+                case 200 /* TypeOfExpression */:
+                case 214 /* NonNullExpression */:
+                case 262 /* JsxSelfClosingElement */:
+                case 261 /* JsxElement */:
                     return true;
-                case 205 /* ConditionalExpression */:
+                case 206 /* ConditionalExpression */:
                     return isSideEffectFree(node.whenTrue) &&
                         isSideEffectFree(node.whenFalse);
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     if (ts.isAssignmentOperator(node.operatorToken.kind)) {
                         return false;
                     }
                     return isSideEffectFree(node.left) &&
                         isSideEffectFree(node.right);
-                case 202 /* PrefixUnaryExpression */:
-                case 203 /* PostfixUnaryExpression */:
+                case 203 /* PrefixUnaryExpression */:
+                case 204 /* PostfixUnaryExpression */:
                     // Unary operators ~, !, +, and - have no side effects.
                     // The rest do.
                     switch (node.operator) {
@@ -52220,9 +53956,9 @@ var ts;
                     }
                     return false;
                 // Some forms listed here for clarity
-                case 200 /* VoidExpression */: // Explicit opt-out
-                case 194 /* TypeAssertionExpression */: // Not SEF, but can produce useful type warnings
-                case 212 /* AsExpression */: // Not SEF, but can produce useful type warnings
+                case 201 /* VoidExpression */: // Explicit opt-out
+                case 195 /* TypeAssertionExpression */: // Not SEF, but can produce useful type warnings
+                case 213 /* AsExpression */: // Not SEF, but can produce useful type warnings
                 default:
                     return false;
             }
@@ -52238,8 +53974,8 @@ var ts;
         }
         function checkBinaryLikeExpression(left, operatorToken, right, checkMode, errorNode) {
             var operator = operatorToken.kind;
-            if (operator === 59 /* EqualsToken */ && (left.kind === 188 /* ObjectLiteralExpression */ || left.kind === 187 /* ArrayLiteralExpression */)) {
-                return checkDestructuringAssignment(left, checkExpression(right, checkMode), checkMode, right.kind === 100 /* ThisKeyword */);
+            if (operator === 60 /* EqualsToken */ && (left.kind === 189 /* ObjectLiteralExpression */ || left.kind === 188 /* ArrayLiteralExpression */)) {
+                return checkDestructuringAssignment(left, checkExpression(right, checkMode), checkMode, right.kind === 101 /* ThisKeyword */);
             }
             var leftType;
             if (operator === 54 /* AmpersandAmpersandToken */ || operator === 55 /* BarBarToken */) {
@@ -52252,26 +53988,26 @@ var ts;
             switch (operator) {
                 case 40 /* AsteriskToken */:
                 case 41 /* AsteriskAsteriskToken */:
-                case 62 /* AsteriskEqualsToken */:
-                case 63 /* AsteriskAsteriskEqualsToken */:
+                case 63 /* AsteriskEqualsToken */:
+                case 64 /* AsteriskAsteriskEqualsToken */:
                 case 42 /* SlashToken */:
-                case 64 /* SlashEqualsToken */:
+                case 65 /* SlashEqualsToken */:
                 case 43 /* PercentToken */:
-                case 65 /* PercentEqualsToken */:
+                case 66 /* PercentEqualsToken */:
                 case 39 /* MinusToken */:
-                case 61 /* MinusEqualsToken */:
+                case 62 /* MinusEqualsToken */:
                 case 46 /* LessThanLessThanToken */:
-                case 66 /* LessThanLessThanEqualsToken */:
+                case 67 /* LessThanLessThanEqualsToken */:
                 case 47 /* GreaterThanGreaterThanToken */:
-                case 67 /* GreaterThanGreaterThanEqualsToken */:
+                case 68 /* GreaterThanGreaterThanEqualsToken */:
                 case 48 /* GreaterThanGreaterThanGreaterThanToken */:
-                case 68 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
+                case 69 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
                 case 50 /* BarToken */:
-                case 70 /* BarEqualsToken */:
+                case 71 /* BarEqualsToken */:
                 case 51 /* CaretToken */:
-                case 71 /* CaretEqualsToken */:
+                case 72 /* CaretEqualsToken */:
                 case 49 /* AmpersandToken */:
-                case 69 /* AmpersandEqualsToken */:
+                case 70 /* AmpersandEqualsToken */:
                     if (leftType === silentNeverType || rightType === silentNeverType) {
                         return silentNeverType;
                     }
@@ -52288,8 +54024,8 @@ var ts;
                     }
                     else {
                         // otherwise just check each operand separately and report errors as normal
-                        var leftOk = checkArithmeticOperandType(left, leftType, ts.Diagnostics.The_left_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_bigint_or_an_enum_type);
-                        var rightOk = checkArithmeticOperandType(right, rightType, ts.Diagnostics.The_right_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_bigint_or_an_enum_type);
+                        var leftOk = checkArithmeticOperandType(left, leftType, ts.Diagnostics.The_left_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_bigint_or_an_enum_type, /*isAwaitValid*/ true);
+                        var rightOk = checkArithmeticOperandType(right, rightType, ts.Diagnostics.The_right_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_bigint_or_an_enum_type, /*isAwaitValid*/ true);
                         var resultType_1;
                         // If both are any or unknown, allow operation; assume it will resolve to number
                         if ((isTypeAssignableToKind(leftType, 3 /* AnyOrUnknown */) && isTypeAssignableToKind(rightType, 3 /* AnyOrUnknown */)) ||
@@ -52297,17 +54033,18 @@ var ts;
                             !(maybeTypeOfKind(leftType, 2112 /* BigIntLike */) || maybeTypeOfKind(rightType, 2112 /* BigIntLike */))) {
                             resultType_1 = numberType;
                         }
-                        // At least one is assignable to bigint, so both should be only assignable to bigint
+                        // At least one is assignable to bigint, so check that both are
                         else if (isTypeAssignableToKind(leftType, 2112 /* BigIntLike */) && isTypeAssignableToKind(rightType, 2112 /* BigIntLike */)) {
                             switch (operator) {
                                 case 48 /* GreaterThanGreaterThanGreaterThanToken */:
-                                case 68 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
+                                case 69 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
                                     reportOperatorError();
                             }
                             resultType_1 = bigintType;
                         }
+                        // Exactly one of leftType/rightType is assignable to bigint
                         else {
-                            reportOperatorError();
+                            reportOperatorError(function (awaitedLeft, awaitedRight) { return isTypeAssignableToKind(awaitedLeft, 2112 /* BigIntLike */) && isTypeAssignableToKind(awaitedRight, 2112 /* BigIntLike */); });
                             resultType_1 = errorType;
                         }
                         if (leftOk && rightOk) {
@@ -52316,7 +54053,7 @@ var ts;
                         return resultType_1;
                     }
                 case 38 /* PlusToken */:
-                case 60 /* PlusEqualsToken */:
+                case 61 /* PlusEqualsToken */:
                     if (leftType === silentNeverType || rightType === silentNeverType) {
                         return silentNeverType;
                     }
@@ -52348,10 +54085,18 @@ var ts;
                         return resultType;
                     }
                     if (!resultType) {
-                        reportOperatorError();
+                        // Types that have a reasonably good chance of being a valid operand type.
+                        // If both types have an awaited type of one of these, we’ll assume the user
+                        // might be missing an await without doing an exhaustive check that inserting
+                        // await(s) will actually be a completely valid binary expression.
+                        var closeEnoughKind_1 = 296 /* NumberLike */ | 2112 /* BigIntLike */ | 132 /* StringLike */ | 3 /* AnyOrUnknown */;
+                        reportOperatorError(function (awaitedLeft, awaitedRight) {
+                            return isTypeAssignableToKind(awaitedLeft, closeEnoughKind_1) &&
+                                isTypeAssignableToKind(awaitedRight, closeEnoughKind_1);
+                        });
                         return anyType;
                     }
-                    if (operator === 60 /* PlusEqualsToken */) {
+                    if (operator === 61 /* PlusEqualsToken */) {
                         checkAssignmentOperator(resultType);
                     }
                     return resultType;
@@ -52362,29 +54107,20 @@ var ts;
                     if (checkForDisallowedESSymbolOperand(operator)) {
                         leftType = getBaseTypeOfLiteralType(checkNonNullType(leftType, left));
                         rightType = getBaseTypeOfLiteralType(checkNonNullType(rightType, right));
-                        if (!(isTypeComparableTo(leftType, rightType) || isTypeComparableTo(rightType, leftType) ||
-                            (isTypeAssignableTo(leftType, numberOrBigIntType) && isTypeAssignableTo(rightType, numberOrBigIntType)))) {
-                            reportOperatorError();
-                        }
+                        reportOperatorErrorUnless(function (left, right) {
+                            return isTypeComparableTo(left, right) || isTypeComparableTo(right, left) || (isTypeAssignableTo(left, numberOrBigIntType) && isTypeAssignableTo(right, numberOrBigIntType));
+                        });
                     }
                     return booleanType;
                 case 33 /* EqualsEqualsToken */:
                 case 34 /* ExclamationEqualsToken */:
                 case 35 /* EqualsEqualsEqualsToken */:
                 case 36 /* ExclamationEqualsEqualsToken */:
-                    var leftIsLiteral = isLiteralType(leftType);
-                    var rightIsLiteral = isLiteralType(rightType);
-                    if (!leftIsLiteral || !rightIsLiteral) {
-                        leftType = leftIsLiteral ? getBaseTypeOfLiteralType(leftType) : leftType;
-                        rightType = rightIsLiteral ? getBaseTypeOfLiteralType(rightType) : rightType;
-                    }
-                    if (!isTypeEqualityComparableTo(leftType, rightType) && !isTypeEqualityComparableTo(rightType, leftType)) {
-                        reportOperatorError();
-                    }
+                    reportOperatorErrorUnless(function (left, right) { return isTypeEqualityComparableTo(left, right) || isTypeEqualityComparableTo(right, left); });
                     return booleanType;
-                case 94 /* InstanceOfKeyword */:
+                case 95 /* InstanceOfKeyword */:
                     return checkInstanceOfExpression(left, right, leftType, rightType);
-                case 93 /* InKeyword */:
+                case 94 /* InKeyword */:
                     return checkInExpression(left, right, leftType, rightType);
                 case 54 /* AmpersandAmpersandToken */:
                     return getTypeFacts(leftType) & 4194304 /* Truthy */ ?
@@ -52394,7 +54130,7 @@ var ts;
                     return getTypeFacts(leftType) & 8388608 /* Falsy */ ?
                         getUnionType([removeDefinitelyFalsyTypes(leftType), rightType], 2 /* Subtype */) :
                         leftType;
-                case 59 /* EqualsToken */:
+                case 60 /* EqualsToken */:
                     var declKind = ts.isBinaryExpression(left.parent) ? ts.getAssignmentDeclarationKind(left.parent) : 0 /* None */;
                     checkAssignmentDeclaration(declKind, rightType);
                     if (isAssignmentDeclaration(declKind)) {
@@ -52438,7 +54174,7 @@ var ts;
                 }
             }
             function isEvalNode(node) {
-                return node.kind === 72 /* Identifier */ && node.escapedText === "eval";
+                return node.kind === 73 /* Identifier */ && node.escapedText === "eval";
             }
             // Return true if there was no error, false if there was an error.
             function checkForDisallowedESSymbolOperand(operator) {
@@ -52454,13 +54190,13 @@ var ts;
             function getSuggestedBooleanOperator(operator) {
                 switch (operator) {
                     case 50 /* BarToken */:
-                    case 70 /* BarEqualsToken */:
+                    case 71 /* BarEqualsToken */:
                         return 55 /* BarBarToken */;
                     case 51 /* CaretToken */:
-                    case 71 /* CaretEqualsToken */:
+                    case 72 /* CaretEqualsToken */:
                         return 36 /* ExclamationEqualsEqualsToken */;
                     case 49 /* AmpersandToken */:
-                    case 69 /* AmpersandEqualsToken */:
+                    case 70 /* AmpersandEqualsToken */:
                         return 54 /* AmpersandAmpersandToken */;
                     default:
                         return undefined;
@@ -52498,22 +54234,44 @@ var ts;
                         return false;
                 }
             }
-            function reportOperatorError() {
-                var leftStr = typeToString(leftType);
-                var rightStr = typeToString(rightType);
+            /**
+             * Returns true if an error is reported
+             */
+            function reportOperatorErrorUnless(typesAreCompatible) {
+                if (!typesAreCompatible(leftType, rightType)) {
+                    reportOperatorError(typesAreCompatible);
+                    return true;
+                }
+                return false;
+            }
+            function reportOperatorError(awaitedTypesAreCompatible) {
+                var wouldWorkWithAwait = false;
                 var errNode = errorNode || operatorToken;
-                if (!tryGiveBetterPrimaryError(errNode, leftStr, rightStr)) {
-                    error(errNode, ts.Diagnostics.Operator_0_cannot_be_applied_to_types_1_and_2, ts.tokenToString(operatorToken.kind), leftStr, rightStr);
+                var _a = getTypeNamesForErrorDisplay(leftType, rightType), leftStr = _a[0], rightStr = _a[1];
+                if (awaitedTypesAreCompatible) {
+                    var awaitedLeftType = getAwaitedType(leftType);
+                    var awaitedRightType = getAwaitedType(rightType);
+                    wouldWorkWithAwait = !(awaitedLeftType === leftType && awaitedRightType === rightType)
+                        && !!(awaitedLeftType && awaitedRightType)
+                        && awaitedTypesAreCompatible(awaitedLeftType, awaitedRightType);
+                }
+                if (!tryGiveBetterPrimaryError(errNode, wouldWorkWithAwait, leftStr, rightStr)) {
+                    errorAndMaybeSuggestAwait(errNode, wouldWorkWithAwait, ts.Diagnostics.Operator_0_cannot_be_applied_to_types_1_and_2, ts.tokenToString(operatorToken.kind), leftStr, rightStr);
                 }
             }
-            function tryGiveBetterPrimaryError(errNode, leftStr, rightStr) {
+            function tryGiveBetterPrimaryError(errNode, maybeMissingAwait, leftStr, rightStr) {
+                var typeName;
                 switch (operatorToken.kind) {
                     case 35 /* EqualsEqualsEqualsToken */:
                     case 33 /* EqualsEqualsToken */:
-                        return error(errNode, ts.Diagnostics.This_condition_will_always_return_0_since_the_types_1_and_2_have_no_overlap, "false", leftStr, rightStr);
+                        typeName = "false";
+                        break;
                     case 36 /* ExclamationEqualsEqualsToken */:
                     case 34 /* ExclamationEqualsToken */:
-                        return error(errNode, ts.Diagnostics.This_condition_will_always_return_0_since_the_types_1_and_2_have_no_overlap, "true", leftStr, rightStr);
+                        typeName = "true";
+                }
+                if (typeName) {
+                    return errorAndMaybeSuggestAwait(errNode, maybeMissingAwait, ts.Diagnostics.This_condition_will_always_return_0_since_the_types_1_and_2_have_no_overlap, typeName, leftStr, rightStr);
                 }
                 return undefined;
             }
@@ -52551,30 +54309,45 @@ var ts;
                 // If the user's code is syntactically correct, the func should always have a star. After all, we are in a yield context.
                 return anyType;
             }
+            var isAsync = (functionFlags & 2 /* Async */) !== 0;
             if (node.asteriskToken) {
                 // Async generator functions prior to ESNext require the __await, __asyncDelegator,
                 // and __asyncValues helpers
-                if ((functionFlags & 3 /* AsyncGenerator */) === 3 /* AsyncGenerator */ &&
-                    languageVersion < 7 /* ESNext */) {
-                    checkExternalEmitHelpers(node, 26624 /* AsyncDelegatorIncludes */);
+                if (isAsync && languageVersion < 99 /* ESNext */) {
+                    checkExternalEmitHelpers(node, 53248 /* AsyncDelegatorIncludes */);
                 }
                 // Generator functions prior to ES2015 require the __values helper
-                if ((functionFlags & 3 /* AsyncGenerator */) === 1 /* Generator */ &&
-                    languageVersion < 2 /* ES2015 */ && compilerOptions.downlevelIteration) {
+                if (!isAsync && languageVersion < 2 /* ES2015 */ && compilerOptions.downlevelIteration) {
                     checkExternalEmitHelpers(node, 256 /* Values */);
                 }
             }
-            var isAsync = (functionFlags & 2 /* Async */) !== 0;
-            var yieldedType = getYieldedTypeOfYieldExpression(node, isAsync); // TODO: GH#18217
             // There is no point in doing an assignability check if the function
             // has no explicit return type because the return type is directly computed
             // from the yield expressions.
             var returnType = getReturnTypeFromAnnotation(func);
-            if (returnType) {
-                var signatureElementType = getIteratedTypeOfGenerator(returnType, isAsync) || anyType;
-                checkTypeAssignableToAndOptionallyElaborate(yieldedType, signatureElementType, node.expression || node, node.expression);
+            var iterationTypes = returnType && getIterationTypesOfGeneratorFunctionReturnType(returnType, isAsync);
+            var signatureYieldType = iterationTypes && iterationTypes.yieldType || anyType;
+            var signatureNextType = iterationTypes && iterationTypes.nextType || anyType;
+            var resolvedSignatureNextType = isAsync ? getAwaitedType(signatureNextType) || anyType : signatureNextType;
+            var yieldExpressionType = node.expression ? checkExpression(node.expression) : undefinedWideningType;
+            var yieldedType = getYieldedTypeOfYieldExpression(node, yieldExpressionType, resolvedSignatureNextType, isAsync);
+            if (returnType && yieldedType) {
+                checkTypeAssignableToAndOptionallyElaborate(yieldedType, signatureYieldType, node.expression || node, node.expression);
+            }
+            if (node.asteriskToken) {
+                var use = isAsync ? 19 /* AsyncYieldStar */ : 17 /* YieldStar */;
+                return getIterationTypeOfIterable(use, 1 /* Return */, yieldExpressionType, node.expression)
+                    || anyType;
+            }
+            else if (returnType) {
+                return getIterationTypeOfGeneratorFunctionReturnType(2 /* Next */, returnType, isAsync)
+                    || anyType;
+            }
+            var contextualReturnType = getContextualReturnType(func);
+            if (contextualReturnType) {
+                return getIterationTypeOfGeneratorFunctionReturnType(2 /* Next */, contextualReturnType, isAsync)
+                    || anyType;
             }
-            // Both yield and yield* expressions have type 'any'
             return anyType;
         }
         function checkConditionalExpression(node, checkMode) {
@@ -52597,25 +54370,25 @@ var ts;
             return stringType;
         }
         function getContextNode(node) {
-            if (node.kind === 268 /* JsxAttributes */ && !ts.isJsxSelfClosingElement(node.parent)) {
+            if (node.kind === 269 /* JsxAttributes */ && !ts.isJsxSelfClosingElement(node.parent)) {
                 return node.parent.parent; // Needs to be the root JsxElement, so it encompasses the attributes _and_ the children (which are essentially part of the attributes)
             }
             return node;
         }
-        function checkExpressionWithContextualType(node, contextualType, contextualMapper, checkMode) {
+        function checkExpressionWithContextualType(node, contextualType, inferenceContext, checkMode) {
             var context = getContextNode(node);
             var saveContextualType = context.contextualType;
-            var saveContextualMapper = context.contextualMapper;
+            var saveInferenceContext = context.inferenceContext;
             context.contextualType = contextualType;
-            context.contextualMapper = contextualMapper;
-            var type = checkExpression(node, checkMode | 1 /* Contextual */ | (contextualMapper ? 2 /* Inferential */ : 0));
+            context.inferenceContext = inferenceContext;
+            var type = checkExpression(node, checkMode | 1 /* Contextual */ | (inferenceContext ? 2 /* Inferential */ : 0));
             // We strip literal freshness when an appropriate contextual type is present such that contextually typed
             // literals always preserve their literal types (otherwise they might widen during type inference). An alternative
             // here would be to not mark contextually typed literals as fresh in the first place.
             var result = maybeTypeOfKind(type, 2944 /* Literal */) && isLiteralOfContextualType(type, instantiateContextualType(contextualType, node)) ?
                 getRegularTypeOfLiteralType(type) : type;
             context.contextualType = saveContextualType;
-            context.contextualMapper = saveContextualMapper;
+            context.inferenceContext = saveInferenceContext;
             return result;
         }
         function checkExpressionCached(node, checkMode) {
@@ -52636,15 +54409,18 @@ var ts;
         }
         function isTypeAssertion(node) {
             node = ts.skipParentheses(node);
-            return node.kind === 194 /* TypeAssertionExpression */ || node.kind === 212 /* AsExpression */;
+            return node.kind === 195 /* TypeAssertionExpression */ || node.kind === 213 /* AsExpression */;
         }
         function checkDeclarationInitializer(declaration) {
             var initializer = ts.getEffectiveInitializer(declaration);
             var type = getTypeOfExpression(initializer, /*cache*/ true);
+            var padded = ts.isParameter(declaration) && declaration.name.kind === 186 /* ArrayBindingPattern */ &&
+                isTupleType(type) && !type.target.hasRestElement && getTypeReferenceArity(type) < declaration.name.elements.length ?
+                padTupleType(type, declaration.name) : type;
             var widened = ts.getCombinedNodeFlags(declaration) & 2 /* Const */ ||
                 ts.isDeclarationReadonly(declaration) ||
                 isTypeAssertion(initializer) ||
-                isLiteralOfContextualType(type, getContextualType(initializer)) ? type : getWidenedLiteralType(type);
+                isLiteralOfContextualType(padded, getContextualType(initializer)) ? padded : getWidenedLiteralType(padded);
             if (ts.isInJSFile(declaration)) {
                 if (widened.flags & 98304 /* Nullable */) {
                     reportImplicitAny(declaration, anyType);
@@ -52657,6 +54433,21 @@ var ts;
             }
             return widened;
         }
+        function padTupleType(type, pattern) {
+            var patternElements = pattern.elements;
+            var arity = getTypeReferenceArity(type);
+            var elementTypes = arity ? type.typeArguments.slice() : [];
+            for (var i = arity; i < patternElements.length; i++) {
+                var e = patternElements[i];
+                if (i < patternElements.length - 1 || !(e.kind === 187 /* BindingElement */ && e.dotDotDotToken)) {
+                    elementTypes.push(!ts.isOmittedExpression(e) && hasDefaultValue(e) ? getTypeFromBindingElement(e, /*includePatternInType*/ false, /*reportErrors*/ false) : anyType);
+                    if (!ts.isOmittedExpression(e) && !hasDefaultValue(e)) {
+                        reportImplicitAny(e, anyType);
+                    }
+                }
+            }
+            return createTupleType(elementTypes, type.target.minLength, /*hasRestElement*/ false, type.target.readonly);
+        }
         function isLiteralOfContextualType(candidateType, contextualType) {
             if (contextualType) {
                 if (contextualType.flags & 3145728 /* UnionOrIntersection */) {
@@ -52667,7 +54458,7 @@ var ts;
                     // If the contextual type is a type variable constrained to a primitive type, consider
                     // this a literal context for literals of that primitive type. For example, given a
                     // type parameter 'T extends string', infer string literal types for T.
-                    var constraint = getBaseConstraintOfType(contextualType) || emptyObjectType;
+                    var constraint = getBaseConstraintOfType(contextualType) || unknownType;
                     return maybeTypeOfKind(constraint, 4 /* String */) && maybeTypeOfKind(candidateType, 128 /* StringLiteral */) ||
                         maybeTypeOfKind(constraint, 8 /* Number */) && maybeTypeOfKind(candidateType, 256 /* NumberLiteral */) ||
                         maybeTypeOfKind(constraint, 64 /* BigInt */) && maybeTypeOfKind(candidateType, 2048 /* BigIntLiteral */) ||
@@ -52700,7 +54491,7 @@ var ts;
             // Do not use hasDynamicName here, because that returns false for well known symbols.
             // We want to perform checkComputedPropertyName for all computed properties, including
             // well known symbols.
-            if (node.name.kind === 149 /* ComputedPropertyName */) {
+            if (node.name.kind === 150 /* ComputedPropertyName */) {
                 checkComputedPropertyName(node.name);
             }
             return checkExpressionForMutableLocation(node.initializer, checkMode);
@@ -52711,7 +54502,7 @@ var ts;
             // Do not use hasDynamicName here, because that returns false for well known symbols.
             // We want to perform checkComputedPropertyName for all computed properties, including
             // well known symbols.
-            if (node.name.kind === 149 /* ComputedPropertyName */) {
+            if (node.name.kind === 150 /* ComputedPropertyName */) {
                 checkComputedPropertyName(node.name);
             }
             var uninstantiatedType = checkFunctionExpressionOrObjectLiteralMethod(node, checkMode);
@@ -52719,42 +54510,52 @@ var ts;
         }
         function instantiateTypeWithSingleGenericCallSignature(node, type, checkMode) {
             if (checkMode && checkMode & (2 /* Inferential */ | 8 /* SkipGenericFunctions */)) {
-                var signature = getSingleCallSignature(type);
+                var callSignature = getSingleSignature(type, 0 /* Call */, /*allowMembers*/ true);
+                var constructSignature = getSingleSignature(type, 1 /* Construct */, /*allowMembers*/ true);
+                var signature = callSignature || constructSignature;
                 if (signature && signature.typeParameters) {
-                    if (checkMode & 8 /* SkipGenericFunctions */) {
-                        skippedGenericFunction(node, checkMode);
-                        return anyFunctionType;
-                    }
                     var contextualType = getApparentTypeOfContextualType(node);
-                    if (contextualType) {
-                        var contextualSignature = getSingleCallSignature(getNonNullableType(contextualType));
+                    if (contextualType && !isMixinConstructorType(contextualType)) {
+                        var contextualSignature = getSingleSignature(getNonNullableType(contextualType), callSignature ? 0 /* Call */ : 1 /* Construct */, /*allowMembers*/ false);
                         if (contextualSignature && !contextualSignature.typeParameters) {
-                            var context = getContextualMapper(node);
+                            if (checkMode & 8 /* SkipGenericFunctions */) {
+                                skippedGenericFunction(node, checkMode);
+                                return anyFunctionType;
+                            }
+                            var context = getInferenceContext(node);
                             // We have an expression that is an argument of a generic function for which we are performing
                             // type argument inference. The expression is of a function type with a single generic call
                             // signature and a contextual function type with a single non-generic call signature. Now check
                             // if the outer function returns a function type with a single non-generic call signature and
                             // if some of the outer function type parameters have no inferences so far. If so, we can
                             // potentially add inferred type parameters to the outer function return type.
-                            var returnSignature = context.signature && getSingleCallSignature(getReturnTypeOfSignature(context.signature));
+                            var returnType = context.signature && getReturnTypeOfSignature(context.signature);
+                            var returnSignature = returnType && getSingleCallOrConstructSignature(returnType);
                             if (returnSignature && !returnSignature.typeParameters && !ts.every(context.inferences, hasInferenceCandidates)) {
-                                // Instantiate the expression type with its own type parameters as type arguments. This
-                                // ensures that the type parameters are not erased to type any during type inference such
-                                // that they can be inferred as actual types.
+                                // Instantiate the signature with its own type parameters as type arguments, possibly
+                                // renaming the type parameters to ensure they have unique names.
                                 var uniqueTypeParameters = getUniqueTypeParameters(context, signature.typeParameters);
-                                var strippedType = getOrCreateTypeFromSignature(getSignatureInstantiationWithoutFillingInTypeArguments(signature, uniqueTypeParameters));
-                                // Infer from the stripped expression type to the contextual type starting with an empty
-                                // set of inference candidates.
-                                var inferences = ts.map(context.typeParameters, createInferenceInfo);
-                                inferTypes(inferences, strippedType, contextualType);
-                                // If we produced some inference candidates and if the type parameters for which we produced
-                                // candidates do not already have existing inferences, we adopt the new inference candidates and
-                                // add the type parameters of the expression type to the set of inferred type parameters for
-                                // the outer function return type.
-                                if (ts.some(inferences, hasInferenceCandidates) && !hasOverlappingInferences(context.inferences, inferences)) {
-                                    mergeInferences(context.inferences, inferences);
-                                    context.inferredTypeParameters = ts.concatenate(context.inferredTypeParameters, uniqueTypeParameters);
-                                    return strippedType;
+                                var instantiatedSignature = getSignatureInstantiationWithoutFillingInTypeArguments(signature, uniqueTypeParameters);
+                                // Infer from the parameters of the instantiated signature to the parameters of the
+                                // contextual signature starting with an empty set of inference candidates.
+                                var inferences_3 = ts.map(context.inferences, function (info) { return createInferenceInfo(info.typeParameter); });
+                                applyToParameterTypes(instantiatedSignature, contextualSignature, function (source, target) {
+                                    inferTypes(inferences_3, source, target, /*priority*/ 0, /*contravariant*/ true);
+                                });
+                                if (ts.some(inferences_3, hasInferenceCandidates)) {
+                                    // We have inference candidates, indicating that one or more type parameters are referenced
+                                    // in the parameter types of the contextual signature. Now also infer from the return type.
+                                    applyToReturnTypes(instantiatedSignature, contextualSignature, function (source, target) {
+                                        inferTypes(inferences_3, source, target);
+                                    });
+                                    // If the type parameters for which we produced candidates do not have any inferences yet,
+                                    // we adopt the new inference candidates and add the type parameters of the expression type
+                                    // to the set of inferred type parameters for the outer function return type.
+                                    if (!hasOverlappingInferences(context.inferences, inferences_3)) {
+                                        mergeInferences(context.inferences, inferences_3);
+                                        context.inferredTypeParameters = ts.concatenate(context.inferredTypeParameters, uniqueTypeParameters);
+                                        return getOrCreateTypeFromSignature(instantiatedSignature);
+                                    }
                                 }
                             }
                             return getOrCreateTypeFromSignature(instantiateSignatureInContextOf(signature, contextualSignature, context));
@@ -52768,8 +54569,8 @@ var ts;
             if (checkMode & 2 /* Inferential */) {
                 // We have skipped a generic function during inferential typing. Obtain the inference context and
                 // indicate this has occurred such that we know a second pass of inference is be needed.
-                var context = getContextualMapper(node);
-                context.flags |= 8 /* SkippedGenericFunction */;
+                var context = getInferenceContext(node);
+                context.flags |= 4 /* SkippedGenericFunction */;
             }
         }
         function hasInferenceCandidates(info) {
@@ -52844,7 +54645,7 @@ var ts;
             var expr = ts.skipParentheses(node);
             // Optimize for the common case of a call to a function with a single non-generic call
             // signature where we can just fetch the return type without checking the arguments.
-            if (expr.kind === 191 /* CallExpression */ && expr.expression.kind !== 98 /* SuperKeyword */ && !ts.isRequireCall(expr, /*checkArgumentIsStringLiteralLike*/ true) && !isSymbolOrSymbolForCall(expr)) {
+            if (expr.kind === 192 /* CallExpression */ && expr.expression.kind !== 99 /* SuperKeyword */ && !ts.isRequireCall(expr, /*checkArgumentIsStringLiteralLike*/ true) && !isSymbolOrSymbolForCall(expr)) {
                 var funcType = checkNonNullExpression(expr.expression);
                 var signature = getSingleCallSignature(funcType);
                 if (signature && !signature.typeParameters) {
@@ -52877,16 +54678,10 @@ var ts;
             node.contextualType = saveContextualType;
             return type;
         }
-        // Checks an expression and returns its type. The contextualMapper parameter serves two purposes: When
-        // contextualMapper is not undefined and not equal to the identityMapper function object it indicates that the
-        // expression is being inferentially typed (section 4.15.2 in spec) and provides the type mapper to use in
-        // conjunction with the generic contextual type. When contextualMapper is equal to the identityMapper function
-        // object, it serves as an indicator that all contained function and arrow expressions should be considered to
-        // have the wildcard function type; this form of type check is used during overload resolution to exclude
-        // contextually typed function and arrow expressions in the initial phase.
         function checkExpression(node, checkMode, forceTuple) {
             var saveCurrentNode = currentNode;
             currentNode = node;
+            instantiationCount = 0;
             var uninstantiatedType = checkExpressionWorker(node, checkMode, forceTuple);
             var type = instantiateTypeWithSingleGenericCallSignature(node, uninstantiatedType, checkMode);
             if (isConstEnumObjectType(type)) {
@@ -52900,10 +54695,10 @@ var ts;
             // - 'left' in property access
             // - 'object' in indexed access
             // - target in rhs of import statement
-            var ok = (node.parent.kind === 189 /* PropertyAccessExpression */ && node.parent.expression === node) ||
-                (node.parent.kind === 190 /* ElementAccessExpression */ && node.parent.expression === node) ||
-                ((node.kind === 72 /* Identifier */ || node.kind === 148 /* QualifiedName */) && isInRightSideOfImportOrExportAssignment(node) ||
-                    (node.parent.kind === 167 /* TypeQuery */ && node.parent.exprName === node));
+            var ok = (node.parent.kind === 190 /* PropertyAccessExpression */ && node.parent.expression === node) ||
+                (node.parent.kind === 191 /* ElementAccessExpression */ && node.parent.expression === node) ||
+                ((node.kind === 73 /* Identifier */ || node.kind === 149 /* QualifiedName */) && isInRightSideOfImportOrExportAssignment(node) ||
+                    (node.parent.kind === 168 /* TypeQuery */ && node.parent.exprName === node));
             if (!ok) {
                 error(node, ts.Diagnostics.const_enums_can_only_be_used_in_property_or_index_access_expressions_or_the_right_hand_side_of_an_import_declaration_or_export_assignment_or_type_query);
             }
@@ -52924,13 +54719,13 @@ var ts;
         }
         function checkExpressionWorker(node, checkMode, forceTuple) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return checkIdentifier(node);
-                case 100 /* ThisKeyword */:
+                case 101 /* ThisKeyword */:
                     return checkThisExpression(node);
-                case 98 /* SuperKeyword */:
+                case 99 /* SuperKeyword */:
                     return checkSuperExpression(node);
-                case 96 /* NullKeyword */:
+                case 97 /* NullKeyword */:
                     return nullWideningType;
                 case 14 /* NoSubstitutionTemplateLiteral */:
                 case 10 /* StringLiteral */:
@@ -52941,82 +54736,82 @@ var ts;
                 case 9 /* BigIntLiteral */:
                     checkGrammarBigIntLiteral(node);
                     return getFreshTypeOfLiteralType(getBigIntLiteralType(node));
-                case 102 /* TrueKeyword */:
+                case 103 /* TrueKeyword */:
                     return trueType;
-                case 87 /* FalseKeyword */:
+                case 88 /* FalseKeyword */:
                     return falseType;
-                case 206 /* TemplateExpression */:
+                case 207 /* TemplateExpression */:
                     return checkTemplateExpression(node);
                 case 13 /* RegularExpressionLiteral */:
                     return globalRegExpType;
-                case 187 /* ArrayLiteralExpression */:
+                case 188 /* ArrayLiteralExpression */:
                     return checkArrayLiteral(node, checkMode, forceTuple);
-                case 188 /* ObjectLiteralExpression */:
+                case 189 /* ObjectLiteralExpression */:
                     return checkObjectLiteral(node, checkMode);
-                case 189 /* PropertyAccessExpression */:
+                case 190 /* PropertyAccessExpression */:
                     return checkPropertyAccessExpression(node);
-                case 148 /* QualifiedName */:
+                case 149 /* QualifiedName */:
                     return checkQualifiedName(node);
-                case 190 /* ElementAccessExpression */:
+                case 191 /* ElementAccessExpression */:
                     return checkIndexedAccess(node);
-                case 191 /* CallExpression */:
-                    if (node.expression.kind === 92 /* ImportKeyword */) {
+                case 192 /* CallExpression */:
+                    if (node.expression.kind === 93 /* ImportKeyword */) {
                         return checkImportCallExpression(node);
                     }
                 /* falls through */
-                case 192 /* NewExpression */:
+                case 193 /* NewExpression */:
                     return checkCallExpression(node, checkMode);
-                case 193 /* TaggedTemplateExpression */:
+                case 194 /* TaggedTemplateExpression */:
                     return checkTaggedTemplateExpression(node);
-                case 195 /* ParenthesizedExpression */:
+                case 196 /* ParenthesizedExpression */:
                     return checkParenthesizedExpression(node, checkMode);
-                case 209 /* ClassExpression */:
+                case 210 /* ClassExpression */:
                     return checkClassExpression(node);
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
                     return checkFunctionExpressionOrObjectLiteralMethod(node, checkMode);
-                case 199 /* TypeOfExpression */:
+                case 200 /* TypeOfExpression */:
                     return checkTypeOfExpression(node);
-                case 194 /* TypeAssertionExpression */:
-                case 212 /* AsExpression */:
+                case 195 /* TypeAssertionExpression */:
+                case 213 /* AsExpression */:
                     return checkAssertion(node);
-                case 213 /* NonNullExpression */:
+                case 214 /* NonNullExpression */:
                     return checkNonNullAssertion(node);
-                case 214 /* MetaProperty */:
+                case 215 /* MetaProperty */:
                     return checkMetaProperty(node);
-                case 198 /* DeleteExpression */:
+                case 199 /* DeleteExpression */:
                     return checkDeleteExpression(node);
-                case 200 /* VoidExpression */:
+                case 201 /* VoidExpression */:
                     return checkVoidExpression(node);
-                case 201 /* AwaitExpression */:
+                case 202 /* AwaitExpression */:
                     return checkAwaitExpression(node);
-                case 202 /* PrefixUnaryExpression */:
+                case 203 /* PrefixUnaryExpression */:
                     return checkPrefixUnaryExpression(node);
-                case 203 /* PostfixUnaryExpression */:
+                case 204 /* PostfixUnaryExpression */:
                     return checkPostfixUnaryExpression(node);
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return checkBinaryExpression(node, checkMode);
-                case 205 /* ConditionalExpression */:
+                case 206 /* ConditionalExpression */:
                     return checkConditionalExpression(node, checkMode);
-                case 208 /* SpreadElement */:
+                case 209 /* SpreadElement */:
                     return checkSpreadExpression(node, checkMode);
-                case 210 /* OmittedExpression */:
+                case 211 /* OmittedExpression */:
                     return undefinedWideningType;
-                case 207 /* YieldExpression */:
+                case 208 /* YieldExpression */:
                     return checkYieldExpression(node);
-                case 215 /* SyntheticExpression */:
+                case 216 /* SyntheticExpression */:
                     return node.type;
-                case 270 /* JsxExpression */:
+                case 271 /* JsxExpression */:
                     return checkJsxExpression(node, checkMode);
-                case 260 /* JsxElement */:
+                case 261 /* JsxElement */:
                     return checkJsxElement(node, checkMode);
-                case 261 /* JsxSelfClosingElement */:
+                case 262 /* JsxSelfClosingElement */:
                     return checkJsxSelfClosingElement(node, checkMode);
-                case 264 /* JsxFragment */:
+                case 265 /* JsxFragment */:
                     return checkJsxFragment(node);
-                case 268 /* JsxAttributes */:
+                case 269 /* JsxAttributes */:
                     return checkJsxAttributes(node, checkMode);
-                case 262 /* JsxOpeningElement */:
+                case 263 /* JsxOpeningElement */:
                     ts.Debug.fail("Shouldn't ever directly check a JsxOpeningElement");
             }
             return errorType;
@@ -53038,7 +54833,7 @@ var ts;
             var constraintType = getConstraintOfTypeParameter(typeParameter);
             var defaultType = getDefaultFromTypeParameter(typeParameter);
             if (constraintType && defaultType) {
-                checkTypeAssignableTo(defaultType, getTypeWithThisArgument(constraintType, defaultType), node.default, ts.Diagnostics.Type_0_does_not_satisfy_the_constraint_1);
+                checkTypeAssignableTo(defaultType, getTypeWithThisArgument(instantiateType(constraintType, makeUnaryTypeMapper(typeParameter, defaultType)), defaultType), node.default, ts.Diagnostics.Type_0_does_not_satisfy_the_constraint_1);
             }
             if (produceDiagnostics) {
                 checkTypeNameIsReserved(node.name, ts.Diagnostics.Type_parameter_name_cannot_be_0);
@@ -53053,7 +54848,7 @@ var ts;
             checkVariableLikeDeclaration(node);
             var func = ts.getContainingFunction(node);
             if (ts.hasModifier(node, 92 /* ParameterPropertyModifier */)) {
-                if (!(func.kind === 157 /* Constructor */ && ts.nodeIsPresent(func.body))) {
+                if (!(func.kind === 158 /* Constructor */ && ts.nodeIsPresent(func.body))) {
                     error(node, ts.Diagnostics.A_parameter_property_is_only_allowed_in_a_constructor_implementation);
                 }
             }
@@ -53064,10 +54859,10 @@ var ts;
                 if (func.parameters.indexOf(node) !== 0) {
                     error(node, ts.Diagnostics.A_0_parameter_must_be_the_first_parameter, node.name.escapedText);
                 }
-                if (func.kind === 157 /* Constructor */ || func.kind === 161 /* ConstructSignature */ || func.kind === 166 /* ConstructorType */) {
+                if (func.kind === 158 /* Constructor */ || func.kind === 162 /* ConstructSignature */ || func.kind === 167 /* ConstructorType */) {
                     error(node, ts.Diagnostics.A_constructor_cannot_have_a_this_parameter);
                 }
-                if (func.kind === 197 /* ArrowFunction */) {
+                if (func.kind === 198 /* ArrowFunction */) {
                     error(node, ts.Diagnostics.An_arrow_function_cannot_have_a_this_parameter);
                 }
             }
@@ -53084,7 +54879,8 @@ var ts;
                 error(node, ts.Diagnostics.A_type_predicate_is_only_allowed_in_return_type_position_for_functions_and_methods);
                 return;
             }
-            var typePredicate = getTypePredicateOfSignature(getSignatureFromDeclaration(parent));
+            var signature = getSignatureFromDeclaration(parent);
+            var typePredicate = getTypePredicateOfSignature(signature);
             if (!typePredicate) {
                 return;
             }
@@ -53095,12 +54891,12 @@ var ts;
             }
             else {
                 if (typePredicate.parameterIndex >= 0) {
-                    if (parent.parameters[typePredicate.parameterIndex].dotDotDotToken) {
+                    if (signature.hasRestParameter && typePredicate.parameterIndex === signature.parameters.length - 1) {
                         error(parameterName, ts.Diagnostics.A_type_predicate_cannot_reference_a_rest_parameter);
                     }
                     else {
                         var leadingError = function () { return ts.chainDiagnosticMessages(/*details*/ undefined, ts.Diagnostics.A_type_predicate_s_type_must_be_assignable_to_its_parameter_s_type); };
-                        checkTypeAssignableTo(typePredicate.type, getTypeOfNode(parent.parameters[typePredicate.parameterIndex]), node.type, 
+                        checkTypeAssignableTo(typePredicate.type, getTypeOfSymbol(signature.parameters[typePredicate.parameterIndex]), node.type, 
                         /*headMessage*/ undefined, leadingError);
                     }
                 }
@@ -53122,13 +54918,13 @@ var ts;
         }
         function getTypePredicateParent(node) {
             switch (node.parent.kind) {
-                case 197 /* ArrowFunction */:
-                case 160 /* CallSignature */:
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
-                case 165 /* FunctionType */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
+                case 198 /* ArrowFunction */:
+                case 161 /* CallSignature */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 166 /* FunctionType */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
                     var parent = node.parent;
                     if (node === parent.type) {
                         return parent;
@@ -53142,11 +54938,11 @@ var ts;
                     continue;
                 }
                 var name = element.name;
-                if (name.kind === 72 /* Identifier */ && name.escapedText === predicateVariableName) {
+                if (name.kind === 73 /* Identifier */ && name.escapedText === predicateVariableName) {
                     error(predicateVariableNode, ts.Diagnostics.A_type_predicate_cannot_reference_element_0_in_a_binding_pattern, predicateVariableName);
                     return true;
                 }
-                else if (name.kind === 185 /* ArrayBindingPattern */ || name.kind === 184 /* ObjectBindingPattern */) {
+                else if (name.kind === 186 /* ArrayBindingPattern */ || name.kind === 185 /* ObjectBindingPattern */) {
                     if (checkIfTypePredicateVariableIsDeclaredInBindingPattern(name, predicateVariableNode, predicateVariableName)) {
                         return true;
                     }
@@ -53155,20 +54951,20 @@ var ts;
         }
         function checkSignatureDeclaration(node) {
             // Grammar checking
-            if (node.kind === 162 /* IndexSignature */) {
+            if (node.kind === 163 /* IndexSignature */) {
                 checkGrammarIndexSignature(node);
             }
             // TODO (yuisu): Remove this check in else-if when SyntaxKind.Construct is moved and ambient context is handled
-            else if (node.kind === 165 /* FunctionType */ || node.kind === 239 /* FunctionDeclaration */ || node.kind === 166 /* ConstructorType */ ||
-                node.kind === 160 /* CallSignature */ || node.kind === 157 /* Constructor */ ||
-                node.kind === 161 /* ConstructSignature */) {
+            else if (node.kind === 166 /* FunctionType */ || node.kind === 240 /* FunctionDeclaration */ || node.kind === 167 /* ConstructorType */ ||
+                node.kind === 161 /* CallSignature */ || node.kind === 158 /* Constructor */ ||
+                node.kind === 162 /* ConstructSignature */) {
                 checkGrammarFunctionLikeDeclaration(node);
             }
             var functionFlags = ts.getFunctionFlags(node);
             if (!(functionFlags & 4 /* Invalid */)) {
                 // Async generators prior to ESNext require the __await and __asyncGenerator helpers
-                if ((functionFlags & 3 /* AsyncGenerator */) === 3 /* AsyncGenerator */ && languageVersion < 7 /* ESNext */) {
-                    checkExternalEmitHelpers(node, 6144 /* AsyncGeneratorIncludes */);
+                if ((functionFlags & 3 /* AsyncGenerator */) === 3 /* AsyncGenerator */ && languageVersion < 99 /* ESNext */) {
+                    checkExternalEmitHelpers(node, 12288 /* AsyncGeneratorIncludes */);
                 }
                 // Async functions prior to ES2017 require the __awaiter helper
                 if ((functionFlags & 3 /* AsyncGenerator */) === 2 /* Async */ && languageVersion < 4 /* ES2017 */) {
@@ -53191,10 +54987,10 @@ var ts;
                 var returnTypeNode = ts.getEffectiveReturnTypeNode(node);
                 if (noImplicitAny && !returnTypeNode) {
                     switch (node.kind) {
-                        case 161 /* ConstructSignature */:
+                        case 162 /* ConstructSignature */:
                             error(node, ts.Diagnostics.Construct_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type);
                             break;
-                        case 160 /* CallSignature */:
+                        case 161 /* CallSignature */:
                             error(node, ts.Diagnostics.Call_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type);
                             break;
                     }
@@ -53207,24 +55003,24 @@ var ts;
                             error(returnTypeNode, ts.Diagnostics.A_generator_cannot_have_a_void_type_annotation);
                         }
                         else {
-                            var generatorElementType = getIteratedTypeOfGenerator(returnType, (functionFlags_1 & 2 /* Async */) !== 0) || anyType;
-                            var iterableIteratorInstantiation = functionFlags_1 & 2 /* Async */
-                                ? createAsyncIterableIteratorType(generatorElementType) // AsyncGenerator function
-                                : createIterableIteratorType(generatorElementType); // Generator function
-                            // Naively, one could check that IterableIterator<any> is assignable to the return type annotation.
+                            // Naively, one could check that Generator<any, any, any> is assignable to the return type annotation.
                             // However, that would not catch the error in the following case.
                             //
                             //    interface BadGenerator extends Iterable<number>, Iterator<string> { }
                             //    function* g(): BadGenerator { } // Iterable and Iterator have different types!
                             //
-                            checkTypeAssignableTo(iterableIteratorInstantiation, returnType, returnTypeNode);
+                            var generatorYieldType = getIterationTypeOfGeneratorFunctionReturnType(0 /* Yield */, returnType, (functionFlags_1 & 2 /* Async */) !== 0) || anyType;
+                            var generatorReturnType = getIterationTypeOfGeneratorFunctionReturnType(1 /* Return */, returnType, (functionFlags_1 & 2 /* Async */) !== 0) || generatorYieldType;
+                            var generatorNextType = getIterationTypeOfGeneratorFunctionReturnType(2 /* Next */, returnType, (functionFlags_1 & 2 /* Async */) !== 0) || unknownType;
+                            var generatorInstantiation = createGeneratorReturnType(generatorYieldType, generatorReturnType, generatorNextType, !!(functionFlags_1 & 2 /* Async */));
+                            checkTypeAssignableTo(generatorInstantiation, returnType, returnTypeNode);
                         }
                     }
                     else if ((functionFlags_1 & 3 /* AsyncGenerator */) === 2 /* Async */) {
                         checkAsyncFunctionReturnType(node, returnTypeNode);
                     }
                 }
-                if (node.kind !== 162 /* IndexSignature */ && node.kind !== 294 /* JSDocFunctionType */) {
+                if (node.kind !== 163 /* IndexSignature */ && node.kind !== 295 /* JSDocFunctionType */) {
                     registerForUnusedIdentifiersCheck(node);
                 }
             }
@@ -53241,7 +55037,7 @@ var ts;
             var staticNames = ts.createUnderscoreEscapedMap();
             for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                 var member = _a[_i];
-                if (member.kind === 157 /* Constructor */) {
+                if (member.kind === 158 /* Constructor */) {
                     for (var _b = 0, _c = member.parameters; _b < _c.length; _b++) {
                         var param = _c[_b];
                         if (ts.isParameterPropertyDeclaration(param) && !ts.isBindingPattern(param.name)) {
@@ -53256,16 +55052,16 @@ var ts;
                     var memberName = name && ts.getPropertyNameForPropertyNameNode(name);
                     if (name && memberName) {
                         switch (member.kind) {
-                            case 158 /* GetAccessor */:
+                            case 159 /* GetAccessor */:
                                 addName(names, name, memberName, 1 /* Getter */);
                                 break;
-                            case 159 /* SetAccessor */:
+                            case 160 /* SetAccessor */:
                                 addName(names, name, memberName, 2 /* Setter */);
                                 break;
-                            case 154 /* PropertyDeclaration */:
+                            case 155 /* PropertyDeclaration */:
                                 addName(names, name, memberName, 3 /* Property */);
                                 break;
-                            case 156 /* MethodDeclaration */:
+                            case 157 /* MethodDeclaration */:
                                 addName(names, name, memberName, 4 /* Method */);
                                 break;
                         }
@@ -53328,7 +55124,7 @@ var ts;
             var names = ts.createMap();
             for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                 var member = _a[_i];
-                if (member.kind === 153 /* PropertySignature */) {
+                if (member.kind === 154 /* PropertySignature */) {
                     var memberName = void 0;
                     var name = member.name;
                     switch (name.kind) {
@@ -53336,7 +55132,7 @@ var ts;
                         case 8 /* NumericLiteral */:
                             memberName = name.text;
                             break;
-                        case 72 /* Identifier */:
+                        case 73 /* Identifier */:
                             memberName = ts.idText(name);
                             break;
                         default:
@@ -53353,7 +55149,7 @@ var ts;
             }
         }
         function checkTypeForDuplicateIndexSignatures(node) {
-            if (node.kind === 241 /* InterfaceDeclaration */) {
+            if (node.kind === 242 /* InterfaceDeclaration */) {
                 var nodeSymbol = getSymbolOfNode(node);
                 // in case of merging interface declaration it is possible that we'll enter this check procedure several times for every declaration
                 // to prevent this run check only for the first declaration of a given kind
@@ -53373,7 +55169,7 @@ var ts;
                     var declaration = decl;
                     if (declaration.parameters.length === 1 && declaration.parameters[0].type) {
                         switch (declaration.parameters[0].type.kind) {
-                            case 138 /* StringKeyword */:
+                            case 139 /* StringKeyword */:
                                 if (!seenStringIndexer) {
                                     seenStringIndexer = true;
                                 }
@@ -53381,7 +55177,7 @@ var ts;
                                     error(declaration, ts.Diagnostics.Duplicate_string_index_signature);
                                 }
                                 break;
-                            case 135 /* NumberKeyword */:
+                            case 136 /* NumberKeyword */:
                                 if (!seenNumericIndexer) {
                                     seenNumericIndexer = true;
                                 }
@@ -53408,7 +55204,7 @@ var ts;
             checkFunctionOrMethodDeclaration(node);
             // Abstract methods cannot have an implementation.
             // Extra checks are to avoid reporting multiple errors relating to the "abstractness" of the node.
-            if (ts.hasModifier(node, 128 /* Abstract */) && node.kind === 156 /* MethodDeclaration */ && node.body) {
+            if (ts.hasModifier(node, 128 /* Abstract */) && node.kind === 157 /* MethodDeclaration */ && node.body) {
                 error(node, ts.Diagnostics.Method_0_cannot_have_an_implementation_because_it_is_marked_abstract, ts.declarationNameToString(node.name));
             }
         }
@@ -53433,7 +55229,7 @@ var ts;
                 return;
             }
             function isInstancePropertyWithInitializer(n) {
-                return n.kind === 154 /* PropertyDeclaration */ &&
+                return n.kind === 155 /* PropertyDeclaration */ &&
                     !ts.hasModifier(n, 32 /* Static */) &&
                     !!n.initializer;
             }
@@ -53463,7 +55259,7 @@ var ts;
                         var superCallStatement = void 0;
                         for (var _i = 0, statements_2 = statements; _i < statements_2.length; _i++) {
                             var statement = statements_2[_i];
-                            if (statement.kind === 221 /* ExpressionStatement */ && ts.isSuperCall(statement.expression)) {
+                            if (statement.kind === 222 /* ExpressionStatement */ && ts.isSuperCall(statement.expression)) {
                                 superCallStatement = statement;
                                 break;
                             }
@@ -53488,7 +55284,7 @@ var ts;
                     checkGrammarComputedPropertyName(node.name);
                 checkDecorators(node);
                 checkSignatureDeclaration(node);
-                if (node.kind === 158 /* GetAccessor */) {
+                if (node.kind === 159 /* GetAccessor */) {
                     if (!(node.flags & 4194304 /* Ambient */) && ts.nodeIsPresent(node.body) && (node.flags & 128 /* HasImplicitReturn */)) {
                         if (!(node.flags & 256 /* HasExplicitReturn */)) {
                             error(node.name, ts.Diagnostics.A_get_accessor_must_return_a_value);
@@ -53498,13 +55294,13 @@ var ts;
                 // Do not use hasDynamicName here, because that returns false for well known symbols.
                 // We want to perform checkComputedPropertyName for all computed properties, including
                 // well known symbols.
-                if (node.name.kind === 149 /* ComputedPropertyName */) {
+                if (node.name.kind === 150 /* ComputedPropertyName */) {
                     checkComputedPropertyName(node.name);
                 }
                 if (!hasNonBindableDynamicName(node)) {
                     // TypeScript 1.0 spec (April 2014): 8.4.3
                     // Accessors for the same member name must specify the same accessibility.
-                    var otherKind = node.kind === 158 /* GetAccessor */ ? 159 /* SetAccessor */ : 158 /* GetAccessor */;
+                    var otherKind = node.kind === 159 /* GetAccessor */ ? 160 /* SetAccessor */ : 159 /* GetAccessor */;
                     var otherAccessor = ts.getDeclarationOfKind(getSymbolOfNode(node), otherKind);
                     if (otherAccessor) {
                         var nodeFlags = ts.getModifierFlags(node);
@@ -53522,7 +55318,7 @@ var ts;
                     }
                 }
                 var returnType = getTypeOfAccessors(getSymbolOfNode(node));
-                if (node.kind === 158 /* GetAccessor */) {
+                if (node.kind === 159 /* GetAccessor */) {
                     checkAllCodePathsInNonVoidFunctionReturnOrThrow(node, returnType);
                 }
             }
@@ -53570,7 +55366,7 @@ var ts;
         }
         function checkTypeReferenceNode(node) {
             checkGrammarTypeArguments(node, node.typeArguments);
-            if (node.kind === 164 /* TypeReference */ && node.typeName.jsdocDotPos !== undefined && !ts.isInJSFile(node) && !ts.isInJSDoc(node)) {
+            if (node.kind === 165 /* TypeReference */ && node.typeName.jsdocDotPos !== undefined && !ts.isInJSFile(node) && !ts.isInJSDoc(node)) {
                 grammarErrorAtPos(node, node.typeName.jsdocDotPos, 1, ts.Diagnostics.JSDoc_types_can_only_be_used_inside_documentation_comments);
             }
             var type = getTypeFromTypeReference(node);
@@ -53618,7 +55414,7 @@ var ts;
             var seenOptionalElement = false;
             for (var i = 0; i < elementTypes.length; i++) {
                 var e = elementTypes[i];
-                if (e.kind === 172 /* RestType */) {
+                if (e.kind === 173 /* RestType */) {
                     if (i !== elementTypes.length - 1) {
                         grammarErrorOnNode(e, ts.Diagnostics.A_rest_element_must_be_last_in_a_tuple_type);
                         break;
@@ -53627,7 +55423,7 @@ var ts;
                         error(e, ts.Diagnostics.A_rest_element_type_must_be_an_array_type);
                     }
                 }
-                else if (e.kind === 171 /* OptionalType */) {
+                else if (e.kind === 172 /* OptionalType */) {
                     seenOptionalElement = true;
                 }
                 else if (seenOptionalElement) {
@@ -53648,7 +55444,7 @@ var ts;
             var objectType = type.objectType;
             var indexType = type.indexType;
             if (isTypeAssignableTo(indexType, getIndexType(objectType, /*stringsOnly*/ false))) {
-                if (accessNode.kind === 190 /* ElementAccessExpression */ && ts.isAssignmentTarget(accessNode) &&
+                if (accessNode.kind === 191 /* ElementAccessExpression */ && ts.isAssignmentTarget(accessNode) &&
                     ts.getObjectFlags(objectType) & 32 /* Mapped */ && getMappedTypeModifiers(objectType) & 1 /* IncludeReadonly */) {
                     error(accessNode, ts.Diagnostics.Index_signature_in_type_0_only_permits_reading, typeToString(objectType));
                 }
@@ -53656,11 +55452,22 @@ var ts;
             }
             // Check if we're indexing with a numeric type and if either object or index types
             // is a generic type with a constraint that has a numeric index signature.
-            if (getIndexInfoOfType(getApparentType(objectType), 1 /* Number */) && isTypeAssignableToKind(indexType, 296 /* NumberLike */)) {
+            var apparentObjectType = getApparentType(objectType);
+            if (getIndexInfoOfType(apparentObjectType, 1 /* Number */) && isTypeAssignableToKind(indexType, 296 /* NumberLike */)) {
                 return type;
             }
+            if (isGenericObjectType(objectType)) {
+                var propertyName_1 = getPropertyNameFromIndex(indexType, accessNode);
+                if (propertyName_1) {
+                    var propertySymbol = forEachType(apparentObjectType, function (t) { return getPropertyOfType(t, propertyName_1); });
+                    if (propertySymbol && ts.getDeclarationModifierFlagsFromSymbol(propertySymbol) & 24 /* NonPublicAccessibilityModifier */) {
+                        error(accessNode, ts.Diagnostics.Private_or_protected_member_0_cannot_be_accessed_on_a_type_parameter, ts.unescapeLeadingUnderscores(propertyName_1));
+                        return errorType;
+                    }
+                }
+            }
             error(accessNode, ts.Diagnostics.Type_0_cannot_be_used_to_index_type_1, typeToString(indexType), typeToString(objectType));
-            return type;
+            return errorType;
         }
         function checkIndexedAccessType(node) {
             checkSourceElement(node.objectType);
@@ -53688,7 +55495,7 @@ var ts;
             ts.forEachChild(node, checkSourceElement);
         }
         function checkInferType(node) {
-            if (!ts.findAncestor(node, function (n) { return n.parent && n.parent.kind === 175 /* ConditionalType */ && n.parent.extendsType === n; })) {
+            if (!ts.findAncestor(node, function (n) { return n.parent && n.parent.kind === 176 /* ConditionalType */ && n.parent.extendsType === n; })) {
                 grammarErrorOnNode(node, ts.Diagnostics.infer_declarations_are_only_permitted_in_the_extends_clause_of_a_conditional_type);
             }
             checkSourceElement(node.typeParameter);
@@ -53705,9 +55512,9 @@ var ts;
             var flags = ts.getCombinedModifierFlags(n);
             // children of classes (even ambient classes) should not be marked as ambient or export
             // because those flags have no useful semantics there.
-            if (n.parent.kind !== 241 /* InterfaceDeclaration */ &&
-                n.parent.kind !== 240 /* ClassDeclaration */ &&
-                n.parent.kind !== 209 /* ClassExpression */ &&
+            if (n.parent.kind !== 242 /* InterfaceDeclaration */ &&
+                n.parent.kind !== 241 /* ClassDeclaration */ &&
+                n.parent.kind !== 210 /* ClassExpression */ &&
                 n.flags & 4194304 /* Ambient */) {
                 if (!(flags & 2 /* Ambient */) && !(ts.isModuleBlock(n.parent) && ts.isModuleDeclaration(n.parent.parent) && ts.isGlobalScopeAugmentation(n.parent.parent))) {
                     // It is nested in an ambient context, which means it is automatically exported
@@ -53798,7 +55605,7 @@ var ts;
                         if (node.name && subsequentName &&
                             (ts.isComputedPropertyName(node.name) && ts.isComputedPropertyName(subsequentName) ||
                                 !ts.isComputedPropertyName(node.name) && !ts.isComputedPropertyName(subsequentName) && ts.getEscapedTextOfIdentifierOrLiteral(node.name) === ts.getEscapedTextOfIdentifierOrLiteral(subsequentName))) {
-                            var reportError = (node.kind === 156 /* MethodDeclaration */ || node.kind === 155 /* MethodSignature */) &&
+                            var reportError = (node.kind === 157 /* MethodDeclaration */ || node.kind === 156 /* MethodSignature */) &&
                                 ts.hasModifier(node, 32 /* Static */) !== ts.hasModifier(subsequentNode, 32 /* Static */);
                             // we can get here in two cases
                             // 1. mixed static and instance class members
@@ -53837,7 +55644,7 @@ var ts;
                 var current = declarations_4[_i];
                 var node = current;
                 var inAmbientContext = node.flags & 4194304 /* Ambient */;
-                var inAmbientContextOrInterface = node.parent.kind === 241 /* InterfaceDeclaration */ || node.parent.kind === 168 /* TypeLiteral */ || inAmbientContext;
+                var inAmbientContextOrInterface = node.parent.kind === 242 /* InterfaceDeclaration */ || node.parent.kind === 169 /* TypeLiteral */ || inAmbientContext;
                 if (inAmbientContextOrInterface) {
                     // check if declarations are consecutive only if they are non-ambient
                     // 1. ambient declarations can be interleaved
@@ -53848,7 +55655,7 @@ var ts;
                     // 2. mixing ambient and non-ambient declarations is a separate error that will be reported - do not want to report an extra one
                     previousDeclaration = undefined;
                 }
-                if (node.kind === 239 /* FunctionDeclaration */ || node.kind === 156 /* MethodDeclaration */ || node.kind === 155 /* MethodSignature */ || node.kind === 157 /* Constructor */) {
+                if (node.kind === 240 /* FunctionDeclaration */ || node.kind === 157 /* MethodDeclaration */ || node.kind === 156 /* MethodSignature */ || node.kind === 158 /* Constructor */) {
                     var currentNodeFlags = getEffectiveDeclarationFlags(node, flagsToCheck);
                     someNodeFlags |= currentNodeFlags;
                     allNodeFlags &= currentNodeFlags;
@@ -53903,7 +55710,7 @@ var ts;
                     for (var _a = 0, signatures_6 = signatures; _a < signatures_6.length; _a++) {
                         var signature = signatures_6[_a];
                         if (!isImplementationCompatibleWithOverload(bodySignature, signature)) {
-                            addRelatedInfo(error(signature.declaration, ts.Diagnostics.This_overload_signature_is_not_compatible_with_its_implementation_signature), ts.createDiagnosticForNode(bodyDeclaration, ts.Diagnostics.The_implementation_signature_is_declared_here));
+                            ts.addRelatedInfo(error(signature.declaration, ts.Diagnostics.This_overload_signature_is_not_compatible_with_its_implementation_signature), ts.createDiagnosticForNode(bodyDeclaration, ts.Diagnostics.The_implementation_signature_is_declared_here));
                             break;
                         }
                     }
@@ -53977,22 +55784,22 @@ var ts;
             function getDeclarationSpaces(decl) {
                 var d = decl;
                 switch (d.kind) {
-                    case 241 /* InterfaceDeclaration */:
-                    case 242 /* TypeAliasDeclaration */:
+                    case 242 /* InterfaceDeclaration */:
+                    case 243 /* TypeAliasDeclaration */:
                     // A jsdoc typedef and callback are, by definition, type aliases
-                    case 309 /* JSDocTypedefTag */:
-                    case 302 /* JSDocCallbackTag */:
+                    case 311 /* JSDocTypedefTag */:
+                    case 304 /* JSDocCallbackTag */:
                         return 2 /* ExportType */;
-                    case 244 /* ModuleDeclaration */:
+                    case 245 /* ModuleDeclaration */:
                         return ts.isAmbientModule(d) || ts.getModuleInstanceState(d) !== 0 /* NonInstantiated */
                             ? 4 /* ExportNamespace */ | 1 /* ExportValue */
                             : 4 /* ExportNamespace */;
-                    case 240 /* ClassDeclaration */:
-                    case 243 /* EnumDeclaration */:
+                    case 241 /* ClassDeclaration */:
+                    case 244 /* EnumDeclaration */:
                         return 2 /* ExportType */ | 1 /* ExportValue */;
-                    case 284 /* SourceFile */:
+                    case 285 /* SourceFile */:
                         return 2 /* ExportType */ | 1 /* ExportValue */ | 4 /* ExportNamespace */;
-                    case 254 /* ExportAssignment */:
+                    case 255 /* ExportAssignment */:
                         // Export assigned entity name expressions act as aliases and should fall through, otherwise they export values
                         if (!ts.isEntityNameExpression(d.expression)) {
                             return 1 /* ExportValue */;
@@ -54000,26 +55807,26 @@ var ts;
                         d = d.expression;
                     /* falls through */
                     // The below options all declare an Alias, which is allowed to merge with other values within the importing module
-                    case 248 /* ImportEqualsDeclaration */:
-                    case 251 /* NamespaceImport */:
-                    case 250 /* ImportClause */:
-                        var result_5 = 0 /* None */;
+                    case 249 /* ImportEqualsDeclaration */:
+                    case 252 /* NamespaceImport */:
+                    case 251 /* ImportClause */:
+                        var result_8 = 0 /* None */;
                         var target = resolveAlias(getSymbolOfNode(d));
-                        ts.forEach(target.declarations, function (d) { result_5 |= getDeclarationSpaces(d); });
-                        return result_5;
-                    case 237 /* VariableDeclaration */:
-                    case 186 /* BindingElement */:
-                    case 239 /* FunctionDeclaration */:
-                    case 253 /* ImportSpecifier */: // https://github.com/Microsoft/TypeScript/pull/7591
+                        ts.forEach(target.declarations, function (d) { result_8 |= getDeclarationSpaces(d); });
+                        return result_8;
+                    case 238 /* VariableDeclaration */:
+                    case 187 /* BindingElement */:
+                    case 240 /* FunctionDeclaration */:
+                    case 254 /* ImportSpecifier */: // https://github.com/Microsoft/TypeScript/pull/7591
                         return 1 /* ExportValue */;
                     default:
-                        return ts.Debug.fail(ts.Debug.showSyntaxKind(d));
+                        return ts.Debug.failBadSyntaxKind(d);
                 }
             }
         }
-        function getAwaitedTypeOfPromise(type, errorNode, diagnosticMessage) {
+        function getAwaitedTypeOfPromise(type, errorNode, diagnosticMessage, arg0) {
             var promisedType = getPromisedTypeOfPromise(type, errorNode);
-            return promisedType && getAwaitedType(promisedType, errorNode, diagnosticMessage);
+            return promisedType && getAwaitedType(promisedType, errorNode, diagnosticMessage, arg0);
         }
         /**
          * Gets the "promised type" of a promise.
@@ -54077,10 +55884,14 @@ var ts;
          * Promise-like type; otherwise, it is the type of the expression. This is used to reflect
          * The runtime behavior of the `await` keyword.
          */
-        function checkAwaitedType(type, errorNode, diagnosticMessage) {
-            return getAwaitedType(type, errorNode, diagnosticMessage) || errorType;
+        function checkAwaitedType(type, errorNode, diagnosticMessage, arg0) {
+            var awaitedType = getAwaitedType(type, errorNode, diagnosticMessage, arg0);
+            if (awaitedType === type && !(type.flags & 3 /* AnyOrUnknown */)) {
+                addErrorOrSuggestion(/*isError*/ false, ts.createDiagnosticForNode(errorNode, ts.Diagnostics.await_has_no_effect_on_the_type_of_this_expression));
+            }
+            return awaitedType || errorType;
         }
-        function getAwaitedType(type, errorNode, diagnosticMessage) {
+        function getAwaitedType(type, errorNode, diagnosticMessage, arg0) {
             var typeAsAwaitable = type;
             if (typeAsAwaitable.awaitedTypeOfType) {
                 return typeAsAwaitable.awaitedTypeOfType;
@@ -54092,7 +55903,7 @@ var ts;
                 var types = void 0;
                 for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
                     var constituentType = _a[_i];
-                    types = ts.append(types, getAwaitedType(constituentType, errorNode, diagnosticMessage));
+                    types = ts.append(types, getAwaitedType(constituentType, errorNode, diagnosticMessage, arg0));
                 }
                 if (!types) {
                     return undefined;
@@ -54142,7 +55953,7 @@ var ts;
                 // Keep track of the type we're about to unwrap to avoid bad recursive promise types.
                 // See the comments above for more information.
                 awaitedTypeStack.push(type.id);
-                var awaitedType = getAwaitedType(promisedType, errorNode, diagnosticMessage);
+                var awaitedType = getAwaitedType(promisedType, errorNode, diagnosticMessage, arg0);
                 awaitedTypeStack.pop();
                 if (!awaitedType) {
                     return undefined;
@@ -54169,7 +55980,7 @@ var ts;
                 if (errorNode) {
                     if (!diagnosticMessage)
                         return ts.Debug.fail();
-                    error(errorNode, diagnosticMessage);
+                    error(errorNode, diagnosticMessage, arg0);
                 }
                 return undefined;
             }
@@ -54239,7 +56050,7 @@ var ts;
                 var promiseConstructorSymbol = resolveEntityName(promiseConstructorName, 67220415 /* Value */, /*ignoreErrors*/ true);
                 var promiseConstructorType = promiseConstructorSymbol ? getTypeOfSymbol(promiseConstructorSymbol) : errorType;
                 if (promiseConstructorType === errorType) {
-                    if (promiseConstructorName.kind === 72 /* Identifier */ && promiseConstructorName.escapedText === "Promise" && getTargetType(returnType) === getGlobalPromiseType(/*reportErrors*/ false)) {
+                    if (promiseConstructorName.kind === 73 /* Identifier */ && promiseConstructorName.escapedText === "Promise" && getTargetType(returnType) === getGlobalPromiseType(/*reportErrors*/ false)) {
                         error(returnTypeNode, ts.Diagnostics.An_async_function_or_method_in_ES5_SlashES3_requires_the_Promise_constructor_Make_sure_you_have_a_declaration_for_the_Promise_constructor_or_include_ES2015_in_your_lib_option);
                     }
                     else {
@@ -54278,24 +56089,24 @@ var ts;
             var headMessage = getDiagnosticHeadMessageForDecoratorResolution(node);
             var errorInfo;
             switch (node.parent.kind) {
-                case 240 /* ClassDeclaration */:
+                case 241 /* ClassDeclaration */:
                     var classSymbol = getSymbolOfNode(node.parent);
                     var classConstructorType = getTypeOfSymbol(classSymbol);
                     expectedReturnType = getUnionType([classConstructorType, voidType]);
                     break;
-                case 151 /* Parameter */:
+                case 152 /* Parameter */:
                     expectedReturnType = voidType;
                     errorInfo = ts.chainDiagnosticMessages(
                     /*details*/ undefined, ts.Diagnostics.The_return_type_of_a_parameter_decorator_function_must_be_either_void_or_any);
                     break;
-                case 154 /* PropertyDeclaration */:
+                case 155 /* PropertyDeclaration */:
                     expectedReturnType = voidType;
                     errorInfo = ts.chainDiagnosticMessages(
                     /*details*/ undefined, ts.Diagnostics.The_return_type_of_a_property_decorator_function_must_be_either_void_or_any);
                     break;
-                case 156 /* MethodDeclaration */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 157 /* MethodDeclaration */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     var methodType = getTypeOfNode(node.parent);
                     var descriptorType = createTypedPropertyDescriptorType(methodType);
                     expectedReturnType = getUnionType([descriptorType, voidType]);
@@ -54316,7 +56127,7 @@ var ts;
             if (!typeName)
                 return;
             var rootName = getFirstIdentifier(typeName);
-            var meaning = (typeName.kind === 72 /* Identifier */ ? 67897832 /* Type */ : 1920 /* Namespace */) | 2097152 /* Alias */;
+            var meaning = (typeName.kind === 73 /* Identifier */ ? 67897832 /* Type */ : 1920 /* Namespace */) | 2097152 /* Alias */;
             var rootSymbol = resolveName(rootName, rootName.escapedText, meaning, /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined, /*isRefernce*/ true);
             if (rootSymbol
                 && rootSymbol.flags & 2097152 /* Alias */
@@ -54341,14 +56152,14 @@ var ts;
         function getEntityNameForDecoratorMetadata(node) {
             if (node) {
                 switch (node.kind) {
-                    case 174 /* IntersectionType */:
-                    case 173 /* UnionType */:
+                    case 175 /* IntersectionType */:
+                    case 174 /* UnionType */:
                         return getEntityNameForDecoratorMetadataFromTypeList(node.types);
-                    case 175 /* ConditionalType */:
+                    case 176 /* ConditionalType */:
                         return getEntityNameForDecoratorMetadataFromTypeList([node.trueType, node.falseType]);
-                    case 177 /* ParenthesizedType */:
+                    case 178 /* ParenthesizedType */:
                         return getEntityNameForDecoratorMetadata(node.type);
-                    case 164 /* TypeReference */:
+                    case 165 /* TypeReference */:
                         return node.typeName;
                 }
             }
@@ -54357,13 +56168,13 @@ var ts;
             var commonEntityName;
             for (var _i = 0, types_17 = types; _i < types_17.length; _i++) {
                 var typeNode = types_17[_i];
-                while (typeNode.kind === 177 /* ParenthesizedType */) {
+                while (typeNode.kind === 178 /* ParenthesizedType */) {
                     typeNode = typeNode.type; // Skip parens if need be
                 }
-                if (typeNode.kind === 132 /* NeverKeyword */) {
+                if (typeNode.kind === 133 /* NeverKeyword */) {
                     continue; // Always elide `never` from the union/intersection if possible
                 }
-                if (!strictNullChecks && (typeNode.kind === 96 /* NullKeyword */ || typeNode.kind === 141 /* UndefinedKeyword */)) {
+                if (!strictNullChecks && (typeNode.kind === 97 /* NullKeyword */ || typeNode.kind === 142 /* UndefinedKeyword */)) {
                     continue; // Elide null and undefined from unions for metadata, just like what we did prior to the implementation of strict null checks
                 }
                 var individualEntityName = getEntityNameForDecoratorMetadata(typeNode);
@@ -54405,18 +56216,18 @@ var ts;
                 return;
             }
             if (!compilerOptions.experimentalDecorators) {
-                error(node, ts.Diagnostics.Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_to_remove_this_warning);
+                error(node, ts.Diagnostics.Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_in_your_tsconfig_or_jsconfig_to_remove_this_warning);
             }
             var firstDecorator = node.decorators[0];
             checkExternalEmitHelpers(firstDecorator, 8 /* Decorate */);
-            if (node.kind === 151 /* Parameter */) {
+            if (node.kind === 152 /* Parameter */) {
                 checkExternalEmitHelpers(firstDecorator, 32 /* Param */);
             }
             if (compilerOptions.emitDecoratorMetadata) {
                 checkExternalEmitHelpers(firstDecorator, 16 /* Metadata */);
                 // we only need to perform these checks if we are emitting serialized type metadata for the target of a decorator.
                 switch (node.kind) {
-                    case 240 /* ClassDeclaration */:
+                    case 241 /* ClassDeclaration */:
                         var constructor = ts.getFirstConstructorWithBody(node);
                         if (constructor) {
                             for (var _i = 0, _a = constructor.parameters; _i < _a.length; _i++) {
@@ -54425,23 +56236,23 @@ var ts;
                             }
                         }
                         break;
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
-                        var otherKind = node.kind === 158 /* GetAccessor */ ? 159 /* SetAccessor */ : 158 /* GetAccessor */;
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
+                        var otherKind = node.kind === 159 /* GetAccessor */ ? 160 /* SetAccessor */ : 159 /* GetAccessor */;
                         var otherAccessor = ts.getDeclarationOfKind(getSymbolOfNode(node), otherKind);
                         markDecoratorMedataDataTypeNodeAsReferenced(getAnnotatedAccessorTypeNode(node) || otherAccessor && getAnnotatedAccessorTypeNode(otherAccessor));
                         break;
-                    case 156 /* MethodDeclaration */:
+                    case 157 /* MethodDeclaration */:
                         for (var _b = 0, _c = node.parameters; _b < _c.length; _b++) {
                             var parameter = _c[_b];
                             markDecoratorMedataDataTypeNodeAsReferenced(getParameterTypeNodeForDecoratorCheck(parameter));
                         }
                         markDecoratorMedataDataTypeNodeAsReferenced(ts.getEffectiveReturnTypeNode(node));
                         break;
-                    case 154 /* PropertyDeclaration */:
+                    case 155 /* PropertyDeclaration */:
                         markDecoratorMedataDataTypeNodeAsReferenced(ts.getEffectiveTypeAnnotationNode(node));
                         break;
-                    case 151 /* Parameter */:
+                    case 152 /* Parameter */:
                         markDecoratorMedataDataTypeNodeAsReferenced(getParameterTypeNodeForDecoratorCheck(node));
                         var containingSignature = node.parent;
                         for (var _d = 0, _e = containingSignature.parameters; _d < _e.length; _d++) {
@@ -54504,7 +56315,7 @@ var ts;
                     else if (ts.findLast(ts.getJSDocTags(decl), ts.isJSDocParameterTag) === node &&
                         node.typeExpression && node.typeExpression.type &&
                         !isArrayType(getTypeFromTypeNode(node.typeExpression.type))) {
-                        error(node.name, ts.Diagnostics.JSDoc_param_tag_has_name_0_but_there_is_no_parameter_with_that_name_It_would_match_arguments_if_it_had_an_array_type, ts.idText(node.name.kind === 148 /* QualifiedName */ ? node.name.right : node.name));
+                        error(node.name, ts.Diagnostics.JSDoc_param_tag_has_name_0_but_there_is_no_parameter_with_that_name_It_would_match_arguments_if_it_had_an_array_type, ts.idText(node.name.kind === 149 /* QualifiedName */ ? node.name.right : node.name));
                     }
                 }
             }
@@ -54537,9 +56348,9 @@ var ts;
         }
         function getIdentifierFromEntityNameExpression(node) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return node;
-                case 189 /* PropertyAccessExpression */:
+                case 190 /* PropertyAccessExpression */:
                     return node.name;
                 default:
                     return undefined;
@@ -54552,7 +56363,7 @@ var ts;
             // Do not use hasDynamicName here, because that returns false for well known symbols.
             // We want to perform checkComputedPropertyName for all computed properties, including
             // well known symbols.
-            if (node.name && node.name.kind === 149 /* ComputedPropertyName */) {
+            if (node.name && node.name.kind === 150 /* ComputedPropertyName */) {
                 // This check will account for methods in class/interface declarations,
                 // as well as accessors in classes/object literals
                 checkComputedPropertyName(node.name);
@@ -54581,12 +56392,9 @@ var ts;
                     }
                 }
             }
-            var body = node.kind === 155 /* MethodSignature */ ? undefined : node.body;
+            var body = node.kind === 156 /* MethodSignature */ ? undefined : node.body;
             checkSourceElement(body);
-            if ((functionFlags & 1 /* Generator */) === 0) { // Async function or normal function
-                var returnOrPromisedType = getReturnOrPromisedType(node, functionFlags);
-                checkAllCodePathsInNonVoidFunctionReturnOrThrow(node, returnOrPromisedType);
-            }
+            checkAllCodePathsInNonVoidFunctionReturnOrThrow(node, getReturnTypeFromAnnotation(node));
             if (produceDiagnostics && !ts.getEffectiveReturnTypeNode(node)) {
                 // Report an implicit any error if there is no body, no explicit return type, and node is not a private method
                 // in an ambient context
@@ -54626,42 +56434,42 @@ var ts;
             for (var _i = 0, potentiallyUnusedIdentifiers_1 = potentiallyUnusedIdentifiers; _i < potentiallyUnusedIdentifiers_1.length; _i++) {
                 var node = potentiallyUnusedIdentifiers_1[_i];
                 switch (node.kind) {
-                    case 240 /* ClassDeclaration */:
-                    case 209 /* ClassExpression */:
+                    case 241 /* ClassDeclaration */:
+                    case 210 /* ClassExpression */:
                         checkUnusedClassMembers(node, addDiagnostic);
                         checkUnusedTypeParameters(node, addDiagnostic);
                         break;
-                    case 284 /* SourceFile */:
-                    case 244 /* ModuleDeclaration */:
-                    case 218 /* Block */:
-                    case 246 /* CaseBlock */:
-                    case 225 /* ForStatement */:
-                    case 226 /* ForInStatement */:
-                    case 227 /* ForOfStatement */:
+                    case 285 /* SourceFile */:
+                    case 245 /* ModuleDeclaration */:
+                    case 219 /* Block */:
+                    case 247 /* CaseBlock */:
+                    case 226 /* ForStatement */:
+                    case 227 /* ForInStatement */:
+                    case 228 /* ForOfStatement */:
                         checkUnusedLocalsAndParameters(node, addDiagnostic);
                         break;
-                    case 157 /* Constructor */:
-                    case 196 /* FunctionExpression */:
-                    case 239 /* FunctionDeclaration */:
-                    case 197 /* ArrowFunction */:
-                    case 156 /* MethodDeclaration */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
+                    case 158 /* Constructor */:
+                    case 197 /* FunctionExpression */:
+                    case 240 /* FunctionDeclaration */:
+                    case 198 /* ArrowFunction */:
+                    case 157 /* MethodDeclaration */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
                         if (node.body) { // Don't report unused parameters in overloads
                             checkUnusedLocalsAndParameters(node, addDiagnostic);
                         }
                         checkUnusedTypeParameters(node, addDiagnostic);
                         break;
-                    case 155 /* MethodSignature */:
-                    case 160 /* CallSignature */:
-                    case 161 /* ConstructSignature */:
-                    case 165 /* FunctionType */:
-                    case 166 /* ConstructorType */:
-                    case 242 /* TypeAliasDeclaration */:
-                    case 241 /* InterfaceDeclaration */:
+                    case 156 /* MethodSignature */:
+                    case 161 /* CallSignature */:
+                    case 162 /* ConstructSignature */:
+                    case 166 /* FunctionType */:
+                    case 167 /* ConstructorType */:
+                    case 243 /* TypeAliasDeclaration */:
+                    case 242 /* InterfaceDeclaration */:
                         checkUnusedTypeParameters(node, addDiagnostic);
                         break;
-                    case 176 /* InferType */:
+                    case 177 /* InferType */:
                         checkUnusedInferTypeParameter(node, addDiagnostic);
                         break;
                     default:
@@ -54681,11 +56489,11 @@ var ts;
             for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                 var member = _a[_i];
                 switch (member.kind) {
-                    case 156 /* MethodDeclaration */:
-                    case 154 /* PropertyDeclaration */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
-                        if (member.kind === 159 /* SetAccessor */ && member.symbol.flags & 32768 /* GetAccessor */) {
+                    case 157 /* MethodDeclaration */:
+                    case 155 /* PropertyDeclaration */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
+                        if (member.kind === 160 /* SetAccessor */ && member.symbol.flags & 32768 /* GetAccessor */) {
                             // Already would have reported an error on the getter.
                             break;
                         }
@@ -54694,7 +56502,7 @@ var ts;
                             addDiagnostic(member, 0 /* Local */, ts.createDiagnosticForNode(member.name, ts.Diagnostics._0_is_declared_but_its_value_is_never_read, symbolToString(symbol)));
                         }
                         break;
-                    case 157 /* Constructor */:
+                    case 158 /* Constructor */:
                         for (var _b = 0, _c = member.parameters; _b < _c.length; _b++) {
                             var parameter = _c[_b];
                             if (!parameter.symbol.isReferenced && ts.hasModifier(parameter, 8 /* Private */)) {
@@ -54702,8 +56510,8 @@ var ts;
                             }
                         }
                         break;
-                    case 162 /* IndexSignature */:
-                    case 217 /* SemicolonClassElement */:
+                    case 163 /* IndexSignature */:
+                    case 218 /* SemicolonClassElement */:
                         // Can't be private
                         break;
                     default:
@@ -54730,7 +56538,7 @@ var ts;
                     continue;
                 var name = ts.idText(typeParameter.name);
                 var parent = typeParameter.parent;
-                if (parent.kind !== 176 /* InferType */ && parent.typeParameters.every(isTypeParameterUnused)) {
+                if (parent.kind !== 177 /* InferType */ && parent.typeParameters.every(isTypeParameterUnused)) {
                     if (seenParentsWithEveryUnused.tryAdd(parent)) {
                         var range = ts.isJSDocTemplateTag(parent)
                             // Whole @template tag
@@ -54815,7 +56623,7 @@ var ts;
                 var importDecl = importClause.parent;
                 var nDeclarations = (importClause.name ? 1 : 0) +
                     (importClause.namedBindings ?
-                        (importClause.namedBindings.kind === 251 /* NamespaceImport */ ? 1 : importClause.namedBindings.elements.length)
+                        (importClause.namedBindings.kind === 252 /* NamespaceImport */ ? 1 : importClause.namedBindings.elements.length)
                         : 0);
                 if (nDeclarations === unuseds.length) {
                     addDiagnostic(importDecl, 0 /* Local */, unuseds.length === 1
@@ -54833,7 +56641,7 @@ var ts;
                 var bindingPattern = _a[0], bindingElements = _a[1];
                 var kind = tryGetRootParameterDeclaration(bindingPattern.parent) ? 1 /* Parameter */ : 0 /* Local */;
                 if (bindingPattern.elements.length === bindingElements.length) {
-                    if (bindingElements.length === 1 && bindingPattern.parent.kind === 237 /* VariableDeclaration */ && bindingPattern.parent.parent.kind === 238 /* VariableDeclarationList */) {
+                    if (bindingElements.length === 1 && bindingPattern.parent.kind === 238 /* VariableDeclaration */ && bindingPattern.parent.parent.kind === 239 /* VariableDeclarationList */) {
                         addToGroup(unusedVariables, bindingPattern.parent.parent, bindingPattern.parent, getNodeId);
                     }
                     else {
@@ -54854,7 +56662,7 @@ var ts;
                 if (declarationList.declarations.length === declarations.length) {
                     addDiagnostic(declarationList, 0 /* Local */, declarations.length === 1
                         ? ts.createDiagnosticForNode(ts.first(declarations).name, ts.Diagnostics._0_is_declared_but_its_value_is_never_read, bindingNameText(ts.first(declarations).name))
-                        : ts.createDiagnosticForNode(declarationList.parent.kind === 219 /* VariableStatement */ ? declarationList.parent : declarationList, ts.Diagnostics.All_variables_are_unused));
+                        : ts.createDiagnosticForNode(declarationList.parent.kind === 220 /* VariableStatement */ ? declarationList.parent : declarationList, ts.Diagnostics.All_variables_are_unused));
                 }
                 else {
                     for (var _i = 0, declarations_5 = declarations; _i < declarations_5.length; _i++) {
@@ -54866,24 +56674,24 @@ var ts;
         }
         function bindingNameText(name) {
             switch (name.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return ts.idText(name);
-                case 185 /* ArrayBindingPattern */:
-                case 184 /* ObjectBindingPattern */:
+                case 186 /* ArrayBindingPattern */:
+                case 185 /* ObjectBindingPattern */:
                     return bindingNameText(ts.cast(ts.first(name.elements), ts.isBindingElement).name);
                 default:
                     return ts.Debug.assertNever(name);
             }
         }
         function isImportedDeclaration(node) {
-            return node.kind === 250 /* ImportClause */ || node.kind === 253 /* ImportSpecifier */ || node.kind === 251 /* NamespaceImport */;
+            return node.kind === 251 /* ImportClause */ || node.kind === 254 /* ImportSpecifier */ || node.kind === 252 /* NamespaceImport */;
         }
         function importClauseFromImported(decl) {
-            return decl.kind === 250 /* ImportClause */ ? decl : decl.kind === 251 /* NamespaceImport */ ? decl.parent : decl.parent.parent;
+            return decl.kind === 251 /* ImportClause */ ? decl : decl.kind === 252 /* NamespaceImport */ ? decl.parent : decl.parent.parent;
         }
         function checkBlock(node) {
             // Grammar checking for SyntaxKind.Block
-            if (node.kind === 218 /* Block */) {
+            if (node.kind === 219 /* Block */) {
                 checkGrammarStatementInAmbientContext(node);
             }
             if (ts.isFunctionOrModuleBlock(node)) {
@@ -54913,12 +56721,12 @@ var ts;
             if (!(identifier && identifier.escapedText === name)) {
                 return false;
             }
-            if (node.kind === 154 /* PropertyDeclaration */ ||
-                node.kind === 153 /* PropertySignature */ ||
-                node.kind === 156 /* MethodDeclaration */ ||
-                node.kind === 155 /* MethodSignature */ ||
-                node.kind === 158 /* GetAccessor */ ||
-                node.kind === 159 /* SetAccessor */) {
+            if (node.kind === 155 /* PropertyDeclaration */ ||
+                node.kind === 154 /* PropertySignature */ ||
+                node.kind === 157 /* MethodDeclaration */ ||
+                node.kind === 156 /* MethodSignature */ ||
+                node.kind === 159 /* GetAccessor */ ||
+                node.kind === 160 /* SetAccessor */) {
                 // it is ok to have member named '_super' or '_this' - member access is always qualified
                 return false;
             }
@@ -54927,7 +56735,7 @@ var ts;
                 return false;
             }
             var root = ts.getRootDeclaration(node);
-            if (root.kind === 151 /* Parameter */ && ts.nodeIsMissing(root.parent.body)) {
+            if (root.kind === 152 /* Parameter */ && ts.nodeIsMissing(root.parent.body)) {
                 // just an overload - no codegen impact
                 return false;
             }
@@ -54937,7 +56745,7 @@ var ts;
         function checkIfThisIsCapturedInEnclosingScope(node) {
             ts.findAncestor(node, function (current) {
                 if (getNodeCheckFlags(current) & 4 /* CaptureThis */) {
-                    var isDeclaration_1 = node.kind !== 72 /* Identifier */;
+                    var isDeclaration_1 = node.kind !== 73 /* Identifier */;
                     if (isDeclaration_1) {
                         error(ts.getNameOfDeclaration(node), ts.Diagnostics.Duplicate_identifier_this_Compiler_uses_variable_declaration_this_to_capture_this_reference);
                     }
@@ -54952,7 +56760,7 @@ var ts;
         function checkIfNewTargetIsCapturedInEnclosingScope(node) {
             ts.findAncestor(node, function (current) {
                 if (getNodeCheckFlags(current) & 8 /* CaptureNewTarget */) {
-                    var isDeclaration_2 = node.kind !== 72 /* Identifier */;
+                    var isDeclaration_2 = node.kind !== 73 /* Identifier */;
                     if (isDeclaration_2) {
                         error(ts.getNameOfDeclaration(node), ts.Diagnostics.Duplicate_identifier_newTarget_Compiler_uses_variable_declaration_newTarget_to_capture_new_target_meta_property_reference);
                     }
@@ -54978,7 +56786,7 @@ var ts;
             }
             // In case of variable declaration, node.parent is variable statement so look at the variable statement's parent
             var parent = getDeclarationContainer(node);
-            if (parent.kind === 284 /* SourceFile */ && ts.isExternalOrCommonJsModule(parent)) {
+            if (parent.kind === 285 /* SourceFile */ && ts.isExternalOrCommonJsModule(parent)) {
                 // If the declaration happens to be in external module, report error that require and exports are reserved keywords
                 error(name, ts.Diagnostics.Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module, ts.declarationNameToString(name), ts.declarationNameToString(name));
             }
@@ -54993,7 +56801,7 @@ var ts;
             }
             // In case of variable declaration, node.parent is variable statement so look at the variable statement's parent
             var parent = getDeclarationContainer(node);
-            if (parent.kind === 284 /* SourceFile */ && ts.isExternalOrCommonJsModule(parent) && parent.flags & 1024 /* HasAsyncFunctions */) {
+            if (parent.kind === 285 /* SourceFile */ && ts.isExternalOrCommonJsModule(parent) && parent.flags & 1024 /* HasAsyncFunctions */) {
                 // If the declaration happens to be in external module, report error that Promise is a reserved identifier.
                 error(name, ts.Diagnostics.Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module_containing_async_functions, ts.declarationNameToString(name), ts.declarationNameToString(name));
             }
@@ -55028,7 +56836,7 @@ var ts;
             // skip variable declarations that don't have initializers
             // NOTE: in ES6 spec initializer is required in variable declarations where name is binding pattern
             // so we'll always treat binding elements as initialized
-            if (node.kind === 237 /* VariableDeclaration */ && !node.initializer) {
+            if (node.kind === 238 /* VariableDeclaration */ && !node.initializer) {
                 return;
             }
             var symbol = getSymbolOfNode(node);
@@ -55040,17 +56848,17 @@ var ts;
                     localDeclarationSymbol !== symbol &&
                     localDeclarationSymbol.flags & 2 /* BlockScopedVariable */) {
                     if (getDeclarationNodeFlagsFromSymbol(localDeclarationSymbol) & 3 /* BlockScoped */) {
-                        var varDeclList = ts.getAncestor(localDeclarationSymbol.valueDeclaration, 238 /* VariableDeclarationList */);
-                        var container = varDeclList.parent.kind === 219 /* VariableStatement */ && varDeclList.parent.parent
+                        var varDeclList = ts.getAncestor(localDeclarationSymbol.valueDeclaration, 239 /* VariableDeclarationList */);
+                        var container = varDeclList.parent.kind === 220 /* VariableStatement */ && varDeclList.parent.parent
                             ? varDeclList.parent.parent
                             : undefined;
                         // names of block-scoped and function scoped variables can collide only
                         // if block scoped variable is defined in the function\module\source file scope (because of variable hoisting)
                         var namesShareScope = container &&
-                            (container.kind === 218 /* Block */ && ts.isFunctionLike(container.parent) ||
-                                container.kind === 245 /* ModuleBlock */ ||
-                                container.kind === 244 /* ModuleDeclaration */ ||
-                                container.kind === 284 /* SourceFile */);
+                            (container.kind === 219 /* Block */ && ts.isFunctionLike(container.parent) ||
+                                container.kind === 246 /* ModuleBlock */ ||
+                                container.kind === 245 /* ModuleDeclaration */ ||
+                                container.kind === 285 /* SourceFile */);
                         // here we know that function scoped variable is shadowed by block scoped one
                         // if they are defined in the same scope - binder has already reported redeclaration error
                         // otherwise if variable has an initializer - show error that initialization will fail
@@ -55063,69 +56871,6 @@ var ts;
                 }
             }
         }
-        // Check that a parameter initializer contains no references to parameters declared to the right of itself
-        function checkParameterInitializer(node) {
-            if (ts.getRootDeclaration(node).kind !== 151 /* Parameter */) {
-                return;
-            }
-            var func = ts.getContainingFunction(node);
-            visit(node.initializer);
-            function visit(n) {
-                if (ts.isTypeNode(n) || ts.isDeclarationName(n)) {
-                    // do not dive in types
-                    // skip declaration names (i.e. in object literal expressions)
-                    return;
-                }
-                if (n.kind === 189 /* PropertyAccessExpression */) {
-                    // skip property names in property access expression
-                    return visit(n.expression);
-                }
-                else if (n.kind === 72 /* Identifier */) {
-                    // check FunctionLikeDeclaration.locals (stores parameters\function local variable)
-                    // if it contains entry with a specified name
-                    var symbol = resolveName(n, n.escapedText, 67220415 /* Value */ | 2097152 /* Alias */, /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined, /*isUse*/ false);
-                    if (!symbol || symbol === unknownSymbol || !symbol.valueDeclaration) {
-                        return;
-                    }
-                    if (symbol.valueDeclaration === node) {
-                        error(n, ts.Diagnostics.Parameter_0_cannot_be_referenced_in_its_initializer, ts.declarationNameToString(node.name));
-                        return;
-                    }
-                    // locals map for function contain both parameters and function locals
-                    // so we need to do a bit of extra work to check if reference is legal
-                    var enclosingContainer = ts.getEnclosingBlockScopeContainer(symbol.valueDeclaration);
-                    if (enclosingContainer === func) {
-                        if (symbol.valueDeclaration.kind === 151 /* Parameter */ ||
-                            symbol.valueDeclaration.kind === 186 /* BindingElement */) {
-                            // it is ok to reference parameter in initializer if either
-                            // - parameter is located strictly on the left of current parameter declaration
-                            if (symbol.valueDeclaration.pos < node.pos) {
-                                return;
-                            }
-                            // - parameter is wrapped in function-like entity
-                            if (ts.findAncestor(n, function (current) {
-                                if (current === node.initializer) {
-                                    return "quit";
-                                }
-                                return ts.isFunctionLike(current.parent) ||
-                                    // computed property names/initializers in instance property declaration of class like entities
-                                    // are executed in constructor and thus deferred
-                                    (current.parent.kind === 154 /* PropertyDeclaration */ &&
-                                        !(ts.hasModifier(current.parent, 32 /* Static */)) &&
-                                        ts.isClassLike(current.parent.parent));
-                            })) {
-                                return;
-                            }
-                            // fall through to report error
-                        }
-                        error(n, ts.Diagnostics.Initializer_of_parameter_0_cannot_reference_identifier_1_declared_after_it, ts.declarationNameToString(node.name), ts.declarationNameToString(n));
-                    }
-                }
-                else {
-                    return ts.forEachChild(n, visit);
-                }
-            }
-        }
         function convertAutoToAny(type) {
             return type === autoType ? anyType : type === autoArrayType ? anyArrayType : type;
         }
@@ -55143,18 +56888,18 @@ var ts;
             // Do not use hasDynamicName here, because that returns false for well known symbols.
             // We want to perform checkComputedPropertyName for all computed properties, including
             // well known symbols.
-            if (node.name.kind === 149 /* ComputedPropertyName */) {
+            if (node.name.kind === 150 /* ComputedPropertyName */) {
                 checkComputedPropertyName(node.name);
                 if (node.initializer) {
                     checkExpressionCached(node.initializer);
                 }
             }
-            if (node.kind === 186 /* BindingElement */) {
-                if (node.parent.kind === 184 /* ObjectBindingPattern */ && languageVersion < 7 /* ESNext */) {
+            if (node.kind === 187 /* BindingElement */) {
+                if (node.parent.kind === 185 /* ObjectBindingPattern */ && languageVersion < 99 /* ESNext */) {
                     checkExternalEmitHelpers(node, 4 /* Rest */);
                 }
                 // check computed properties inside property names of binding elements
-                if (node.propertyName && node.propertyName.kind === 149 /* ComputedPropertyName */) {
+                if (node.propertyName && node.propertyName.kind === 150 /* ComputedPropertyName */) {
                     checkComputedPropertyName(node.propertyName);
                 }
                 // check private/protected variable access
@@ -55168,35 +56913,48 @@ var ts;
                         var property = getPropertyOfType(parentType, nameText);
                         if (property) {
                             markPropertyAsReferenced(property, /*nodeForCheckWriteOnly*/ undefined, /*isThisAccess*/ false); // A destructuring is never a write-only reference.
-                            checkPropertyAccessibility(parent, !!parent.initializer && parent.initializer.kind === 98 /* SuperKeyword */, parentType, property);
+                            checkPropertyAccessibility(parent, !!parent.initializer && parent.initializer.kind === 99 /* SuperKeyword */, parentType, property);
                         }
                     }
                 }
             }
             // For a binding pattern, check contained binding elements
             if (ts.isBindingPattern(node.name)) {
-                if (node.name.kind === 185 /* ArrayBindingPattern */ && languageVersion < 2 /* ES2015 */ && compilerOptions.downlevelIteration) {
+                if (node.name.kind === 186 /* ArrayBindingPattern */ && languageVersion < 2 /* ES2015 */ && compilerOptions.downlevelIteration) {
                     checkExternalEmitHelpers(node, 512 /* Read */);
                 }
                 ts.forEach(node.name.elements, checkSourceElement);
             }
             // For a parameter declaration with an initializer, error and exit if the containing function doesn't have a body
-            if (node.initializer && ts.getRootDeclaration(node).kind === 151 /* Parameter */ && ts.nodeIsMissing(ts.getContainingFunction(node).body)) {
+            if (node.initializer && ts.getRootDeclaration(node).kind === 152 /* Parameter */ && ts.nodeIsMissing(ts.getContainingFunction(node).body)) {
                 error(node, ts.Diagnostics.A_parameter_initializer_is_only_allowed_in_a_function_or_constructor_implementation);
                 return;
             }
             // For a binding pattern, validate the initializer and exit
             if (ts.isBindingPattern(node.name)) {
-                // Don't validate for-in initializer as it is already an error
-                if (node.initializer && node.parent.parent.kind !== 226 /* ForInStatement */) {
-                    var initializerType = checkExpressionCached(node.initializer);
-                    if (strictNullChecks && node.name.elements.length === 0) {
-                        checkNonNullType(initializerType, node);
+                var needCheckInitializer = node.initializer && node.parent.parent.kind !== 227 /* ForInStatement */;
+                var needCheckWidenedType = node.name.elements.length === 0;
+                if (needCheckInitializer || needCheckWidenedType) {
+                    // Don't validate for-in initializer as it is already an error
+                    var widenedType = getWidenedTypeForVariableLikeDeclaration(node);
+                    if (needCheckInitializer) {
+                        var initializerType = checkExpressionCached(node.initializer);
+                        if (strictNullChecks && needCheckWidenedType) {
+                            checkNonNullNonVoidType(initializerType, node);
+                        }
+                        else {
+                            checkTypeAssignableToAndOptionallyElaborate(initializerType, getWidenedTypeForVariableLikeDeclaration(node), node, node.initializer);
+                        }
                     }
-                    else {
-                        checkTypeAssignableToAndOptionallyElaborate(initializerType, getWidenedTypeForVariableLikeDeclaration(node), node, node.initializer);
+                    // check the binding pattern with empty elements
+                    if (needCheckWidenedType) {
+                        if (ts.isArrayBindingPattern(node.name)) {
+                            checkIteratedTypeOrElementType(65 /* Destructuring */, widenedType, undefinedType, node);
+                        }
+                        else if (strictNullChecks) {
+                            checkNonNullNonVoidType(widenedType, node);
+                        }
                     }
-                    checkParameterInitializer(node);
                 }
                 return;
             }
@@ -55211,9 +56969,8 @@ var ts;
                         ts.isObjectLiteralExpression(initializer) &&
                         (initializer.properties.length === 0 || ts.isPrototypeAccess(node.name)) &&
                         ts.hasEntries(symbol.exports);
-                    if (!isJSObjectLiteralInitializer && node.parent.parent.kind !== 226 /* ForInStatement */) {
+                    if (!isJSObjectLiteralInitializer && node.parent.parent.kind !== 227 /* ForInStatement */) {
                         checkTypeAssignableToAndOptionallyElaborate(checkExpressionCached(initializer), type, node, initializer, /*headMessage*/ undefined);
-                        checkParameterInitializer(node);
                     }
                 }
                 if (symbol.declarations.length > 1) {
@@ -55229,7 +56986,7 @@ var ts;
                 if (type !== errorType && declarationType !== errorType &&
                     !isTypeIdenticalTo(type, declarationType) &&
                     !(symbol.flags & 67108864 /* Assignment */)) {
-                    errorNextVariableOrPropertyDeclarationMustHaveSameType(type, node, declarationType);
+                    errorNextVariableOrPropertyDeclarationMustHaveSameType(symbol.valueDeclaration, type, node, declarationType);
                 }
                 if (node.initializer) {
                     checkTypeAssignableToAndOptionallyElaborate(checkExpressionCached(node.initializer), declarationType, node, node.initializer, /*headMessage*/ undefined);
@@ -55238,26 +56995,30 @@ var ts;
                     error(node.name, ts.Diagnostics.All_declarations_of_0_must_have_identical_modifiers, ts.declarationNameToString(node.name));
                 }
             }
-            if (node.kind !== 154 /* PropertyDeclaration */ && node.kind !== 153 /* PropertySignature */) {
+            if (node.kind !== 155 /* PropertyDeclaration */ && node.kind !== 154 /* PropertySignature */) {
                 // We know we don't have a binding pattern or computed name here
                 checkExportsOnMergedDeclarations(node);
-                if (node.kind === 237 /* VariableDeclaration */ || node.kind === 186 /* BindingElement */) {
+                if (node.kind === 238 /* VariableDeclaration */ || node.kind === 187 /* BindingElement */) {
                     checkVarDeclaredNamesNotShadowed(node);
                 }
                 checkCollisionWithRequireExportsInGeneratedCode(node, node.name);
                 checkCollisionWithGlobalPromiseInGeneratedCode(node, node.name);
             }
         }
-        function errorNextVariableOrPropertyDeclarationMustHaveSameType(firstType, nextDeclaration, nextType) {
+        function errorNextVariableOrPropertyDeclarationMustHaveSameType(firstDeclaration, firstType, nextDeclaration, nextType) {
             var nextDeclarationName = ts.getNameOfDeclaration(nextDeclaration);
-            var message = nextDeclaration.kind === 154 /* PropertyDeclaration */ || nextDeclaration.kind === 153 /* PropertySignature */
+            var message = nextDeclaration.kind === 155 /* PropertyDeclaration */ || nextDeclaration.kind === 154 /* PropertySignature */
                 ? ts.Diagnostics.Subsequent_property_declarations_must_have_the_same_type_Property_0_must_be_of_type_1_but_here_has_type_2
                 : ts.Diagnostics.Subsequent_variable_declarations_must_have_the_same_type_Variable_0_must_be_of_type_1_but_here_has_type_2;
-            error(nextDeclarationName, message, ts.declarationNameToString(nextDeclarationName), typeToString(firstType), typeToString(nextType));
+            var declName = ts.declarationNameToString(nextDeclarationName);
+            var err = error(nextDeclarationName, message, declName, typeToString(firstType), typeToString(nextType));
+            if (firstDeclaration) {
+                ts.addRelatedInfo(err, ts.createDiagnosticForNode(firstDeclaration, ts.Diagnostics._0_was_also_declared_here, declName));
+            }
         }
         function areDeclarationFlagsIdentical(left, right) {
-            if ((left.kind === 151 /* Parameter */ && right.kind === 237 /* VariableDeclaration */) ||
-                (left.kind === 237 /* VariableDeclaration */ && right.kind === 151 /* Parameter */)) {
+            if ((left.kind === 152 /* Parameter */ && right.kind === 238 /* VariableDeclaration */) ||
+                (left.kind === 238 /* VariableDeclaration */ && right.kind === 152 /* Parameter */)) {
                 // Differences in optionality between parameters and variables are allowed.
                 return true;
             }
@@ -55296,7 +57057,7 @@ var ts;
             checkGrammarStatementInAmbientContext(node);
             checkTruthinessExpression(node.expression);
             checkSourceElement(node.thenStatement);
-            if (node.thenStatement.kind === 220 /* EmptyStatement */) {
+            if (node.thenStatement.kind === 221 /* EmptyStatement */) {
                 error(node.thenStatement, ts.Diagnostics.The_body_of_an_if_statement_cannot_be_the_empty_statement);
             }
             checkSourceElement(node.elseStatement);
@@ -55323,12 +57084,12 @@ var ts;
         function checkForStatement(node) {
             // Grammar checking
             if (!checkGrammarStatementInAmbientContext(node)) {
-                if (node.initializer && node.initializer.kind === 238 /* VariableDeclarationList */) {
+                if (node.initializer && node.initializer.kind === 239 /* VariableDeclarationList */) {
                     checkGrammarVariableDeclarationList(node.initializer);
                 }
             }
             if (node.initializer) {
-                if (node.initializer.kind === 238 /* VariableDeclarationList */) {
+                if (node.initializer.kind === 239 /* VariableDeclarationList */) {
                     ts.forEach(node.initializer.declarations, checkVariableDeclaration);
                 }
                 else {
@@ -55348,9 +57109,9 @@ var ts;
             checkGrammarForInOrForOfStatement(node);
             if (node.awaitModifier) {
                 var functionFlags = ts.getFunctionFlags(ts.getContainingFunction(node));
-                if ((functionFlags & (4 /* Invalid */ | 2 /* Async */)) === 2 /* Async */ && languageVersion < 7 /* ESNext */) {
+                if ((functionFlags & (4 /* Invalid */ | 2 /* Async */)) === 2 /* Async */ && languageVersion < 99 /* ESNext */) {
                     // for..await..of in an async function or async generator function prior to ESNext requires the __asyncValues helper
-                    checkExternalEmitHelpers(node, 16384 /* ForAwaitOfIncludes */);
+                    checkExternalEmitHelpers(node, 32768 /* ForAwaitOfIncludes */);
                 }
             }
             else if (compilerOptions.downlevelIteration && languageVersion < 2 /* ES2015 */) {
@@ -55362,14 +57123,14 @@ var ts;
             // via checkRightHandSideOfForOf.
             // If the LHS is an expression, check the LHS, as a destructuring assignment or as a reference.
             // Then check that the RHS is assignable to it.
-            if (node.initializer.kind === 238 /* VariableDeclarationList */) {
+            if (node.initializer.kind === 239 /* VariableDeclarationList */) {
                 checkForInOrForOfVariableDeclaration(node);
             }
             else {
                 var varExpr = node.initializer;
                 var iteratedType = checkRightHandSideOfForOf(node.expression, node.awaitModifier);
                 // There may be a destructuring assignment on the left side
-                if (varExpr.kind === 187 /* ArrayLiteralExpression */ || varExpr.kind === 188 /* ObjectLiteralExpression */) {
+                if (varExpr.kind === 188 /* ArrayLiteralExpression */ || varExpr.kind === 189 /* ObjectLiteralExpression */) {
                     // iteratedType may be undefined. In this case, we still want to check the structure of
                     // varExpr, in particular making sure it's a valid LeftHandSideExpression. But we'd like
                     // to short circuit the type relation checking as much as possible, so we pass the unknownType.
@@ -55401,7 +57162,7 @@ var ts;
             // for (let VarDecl in Expr) Statement
             //   VarDecl must be a variable declaration without a type annotation that declares a variable of type Any,
             //   and Expr must be an expression of type Any, an object type, or a type parameter type.
-            if (node.initializer.kind === 238 /* VariableDeclarationList */) {
+            if (node.initializer.kind === 239 /* VariableDeclarationList */) {
                 var variable = node.initializer.declarations[0];
                 if (variable && ts.isBindingPattern(variable.name)) {
                     error(variable.name, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern);
@@ -55415,7 +57176,7 @@ var ts;
                 //   and Expr must be an expression of type Any, an object type, or a type parameter type.
                 var varExpr = node.initializer;
                 var leftType = checkExpression(varExpr);
-                if (varExpr.kind === 187 /* ArrayLiteralExpression */ || varExpr.kind === 188 /* ObjectLiteralExpression */) {
+                if (varExpr.kind === 188 /* ArrayLiteralExpression */ || varExpr.kind === 189 /* ObjectLiteralExpression */) {
                     error(varExpr, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern);
                 }
                 else if (!isTypeAssignableTo(getIndexTypeOrString(rightType), leftType)) {
@@ -55446,20 +57207,22 @@ var ts;
         }
         function checkRightHandSideOfForOf(rhsExpression, awaitModifier) {
             var expressionType = checkNonNullExpression(rhsExpression);
-            return checkIteratedTypeOrElementType(expressionType, rhsExpression, /*allowStringInput*/ true, awaitModifier !== undefined);
+            var use = awaitModifier ? 15 /* ForAwaitOf */ : 13 /* ForOf */;
+            return checkIteratedTypeOrElementType(use, expressionType, undefinedType, rhsExpression);
         }
-        function checkIteratedTypeOrElementType(inputType, errorNode, allowStringInput, allowAsyncIterables) {
+        function checkIteratedTypeOrElementType(use, inputType, sentType, errorNode) {
             if (isTypeAny(inputType)) {
                 return inputType;
             }
-            return getIteratedTypeOrElementType(inputType, errorNode, allowStringInput, allowAsyncIterables, /*checkAssignability*/ true) || anyType;
+            return getIteratedTypeOrElementType(use, inputType, sentType, errorNode, /*checkAssignability*/ true) || anyType;
         }
         /**
          * When consuming an iterable type in a for..of, spread, or iterator destructuring assignment
          * we want to get the iterated type of an iterable for ES2015 or later, or the iterated type
          * of a iterable (if defined globally) or element type of an array like for ES2015 or earlier.
          */
-        function getIteratedTypeOrElementType(inputType, errorNode, allowStringInput, allowAsyncIterables, checkAssignability) {
+        function getIteratedTypeOrElementType(use, inputType, sentType, errorNode, checkAssignability) {
+            var allowAsyncIterables = (use & 2 /* AllowsAsyncIterablesFlag */) !== 0;
             if (inputType === neverType) {
                 reportTypeNotIterableError(errorNode, inputType, allowAsyncIterables); // TODO: GH#18217
                 return undefined;
@@ -55471,9 +57234,21 @@ var ts;
             // downlevelIteration is requested.
             if (uplevelIteration || downlevelIteration || allowAsyncIterables) {
                 // We only report errors for an invalid iterable type in ES2015 or higher.
-                var iteratedType = getIteratedTypeOfIterable(inputType, uplevelIteration ? errorNode : undefined, allowAsyncIterables, /*allowSyncIterables*/ true, checkAssignability);
-                if (iteratedType || uplevelIteration) {
-                    return iteratedType;
+                var iterationTypes = getIterationTypesOfIterable(inputType, use, uplevelIteration ? errorNode : undefined);
+                if (checkAssignability) {
+                    if (iterationTypes) {
+                        var diagnostic = use & 8 /* ForOfFlag */ ? ts.Diagnostics.Cannot_iterate_value_because_the_next_method_of_its_iterator_expects_type_1_but_for_of_will_always_send_0 :
+                            use & 32 /* SpreadFlag */ ? ts.Diagnostics.Cannot_iterate_value_because_the_next_method_of_its_iterator_expects_type_1_but_array_spread_will_always_send_0 :
+                                use & 64 /* DestructuringFlag */ ? ts.Diagnostics.Cannot_iterate_value_because_the_next_method_of_its_iterator_expects_type_1_but_array_destructuring_will_always_send_0 :
+                                    use & 16 /* YieldStarFlag */ ? ts.Diagnostics.Cannot_delegate_iteration_to_value_because_the_next_method_of_its_iterator_expects_type_1_but_the_containing_generator_will_always_send_0 :
+                                        undefined;
+                        if (diagnostic) {
+                            checkTypeAssignableTo(sentType, iterationTypes.nextType, errorNode, diagnostic);
+                        }
+                    }
+                }
+                if (iterationTypes || uplevelIteration) {
+                    return iterationTypes && iterationTypes.yieldType;
                 }
             }
             var arrayType = inputType;
@@ -55482,7 +57257,7 @@ var ts;
             // If strings are permitted, remove any string-like constituents from the array type.
             // This allows us to find other non-string element types from an array unioned with
             // a string.
-            if (allowStringInput) {
+            if (use & 4 /* AllowsStringInputFlag */) {
                 if (arrayType.flags & 1048576 /* Union */) {
                     // After we remove all types that are StringLike, we will know if there was a string constituent
                     // based on whether the result of filter is a new array.
@@ -55517,19 +57292,19 @@ var ts;
                     // want to say that number is not an array type. But if the input was just
                     // number and string input is allowed, we want to say that number is not an
                     // array type or a string type.
-                    var isIterable = !!getIteratedTypeOfIterable(inputType, /* errorNode */ undefined, allowAsyncIterables, /*allowSyncIterables*/ true, checkAssignability);
-                    var diagnostic = !allowStringInput || hasStringConstituent
+                    var yieldType = getIterationTypeOfIterable(use, 0 /* Yield */, inputType, /*errorNode*/ undefined);
+                    var _a = !(use & 4 /* AllowsStringInputFlag */) || hasStringConstituent
                         ? downlevelIteration
-                            ? ts.Diagnostics.Type_0_is_not_an_array_type_or_does_not_have_a_Symbol_iterator_method_that_returns_an_iterator
-                            : isIterable
-                                ? ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type_Use_compiler_option_downlevelIteration_to_allow_iterating_of_iterators
-                                : ts.Diagnostics.Type_0_is_not_an_array_type
+                            ? [ts.Diagnostics.Type_0_is_not_an_array_type_or_does_not_have_a_Symbol_iterator_method_that_returns_an_iterator, true]
+                            : yieldType
+                                ? [ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type_Use_compiler_option_downlevelIteration_to_allow_iterating_of_iterators, false]
+                                : [ts.Diagnostics.Type_0_is_not_an_array_type, true]
                         : downlevelIteration
-                            ? ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type_or_does_not_have_a_Symbol_iterator_method_that_returns_an_iterator
-                            : isIterable
-                                ? ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type_Use_compiler_option_downlevelIteration_to_allow_iterating_of_iterators
-                                : ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type;
-                    error(errorNode, diagnostic, typeToString(arrayType));
+                            ? [ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type_or_does_not_have_a_Symbol_iterator_method_that_returns_an_iterator, true]
+                            : yieldType
+                                ? [ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type_Use_compiler_option_downlevelIteration_to_allow_iterating_of_iterators, false]
+                                : [ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type, true], defaultDiagnostic = _a[0], maybeMissingAwait = _a[1];
+                    errorAndMaybeSuggestAwait(errorNode, maybeMissingAwait && !!getAwaitedTypeOfPromise(arrayType), defaultDiagnostic, typeToString(arrayType));
                 }
                 return hasStringConstituent ? stringType : undefined;
             }
@@ -55544,33 +57319,78 @@ var ts;
             return arrayElementType;
         }
         /**
-         * We want to treat type as an iterable, and get the type it is an iterable of. The iterable
-         * must have the following structure (annotated with the names of the variables below):
+         * Gets the requested "iteration type" from an `Iterable`-like or `AsyncIterable`-like type.
+         */
+        function getIterationTypeOfIterable(use, typeKind, inputType, errorNode) {
+            if (isTypeAny(inputType)) {
+                return undefined;
+            }
+            var iterationTypes = getIterationTypesOfIterable(inputType, use, errorNode);
+            return iterationTypes && iterationTypes[getIterationTypesKeyFromIterationTypeKind(typeKind)];
+        }
+        function createIterationTypes(yieldType, returnType, nextType) {
+            // `yieldType` and `returnType` are defaulted to `neverType` they each will be combined
+            // via `getUnionType` when merging iteration types. `nextType` is defined as `unknownType`
+            // as it is combined via `getIntersectionType` when merging iteration types.
+            if (yieldType === void 0) { yieldType = neverType; }
+            if (returnType === void 0) { returnType = neverType; }
+            if (nextType === void 0) { nextType = unknownType; }
+            // Use the cache only for intrinsic types to keep it small as they are likely to be
+            // more frequently created (i.e. `Iterator<number, void, unknown>`). Iteration types
+            // are also cached on the type they are requested for, so we shouldn't need to maintain
+            // the cache for less-frequently used types.
+            if (yieldType.flags & 67359327 /* Intrinsic */ &&
+                returnType.flags & (1 /* Any */ | 131072 /* Never */ | 2 /* Unknown */ | 16384 /* Void */ | 32768 /* Undefined */) &&
+                nextType.flags & (1 /* Any */ | 131072 /* Never */ | 2 /* Unknown */ | 16384 /* Void */ | 32768 /* Undefined */)) {
+                var id = getTypeListId([yieldType, returnType, nextType]);
+                var iterationTypes = iterationTypesCache.get(id);
+                if (!iterationTypes) {
+                    iterationTypes = { yieldType: yieldType, returnType: returnType, nextType: nextType };
+                    iterationTypesCache.set(id, iterationTypes);
+                }
+                return iterationTypes;
+            }
+            return { yieldType: yieldType, returnType: returnType, nextType: nextType };
+        }
+        /**
+         * Combines multiple `IterationTypes` records.
          *
-         *     { // iterable
-         *         [Symbol.iterator]: { // iteratorMethod
-         *             (): Iterator<T>
-         *         }
-         *     }
+         * If `array` is empty or all elements are missing or are references to `noIterationTypes`,
+         * then `noIterationTypes` is returned. Otherwise, an `IterationTypes` record is returned
+         * for the combined iteration types.
+         */
+        function combineIterationTypes(array) {
+            var yieldTypes;
+            var returnTypes;
+            var nextTypes;
+            for (var _i = 0, array_10 = array; _i < array_10.length; _i++) {
+                var iterationTypes = array_10[_i];
+                if (iterationTypes === undefined || iterationTypes === noIterationTypes) {
+                    continue;
+                }
+                if (iterationTypes === anyIterationTypes) {
+                    return anyIterationTypes;
+                }
+                yieldTypes = ts.append(yieldTypes, iterationTypes.yieldType);
+                returnTypes = ts.append(returnTypes, iterationTypes.returnType);
+                nextTypes = ts.append(nextTypes, iterationTypes.nextType);
+            }
+            if (yieldTypes || returnTypes || nextTypes) {
+                return createIterationTypes(yieldTypes && getUnionType(yieldTypes), returnTypes && getUnionType(returnTypes), nextTypes && getIntersectionType(nextTypes));
+            }
+            return noIterationTypes;
+        }
+        /**
+         * Gets the *yield*, *return*, and *next* types from an `Iterable`-like or `AsyncIterable`-like type.
          *
-         * For an async iterable, we expect the following structure:
-         *
-         *     { // iterable
-         *         [Symbol.asyncIterator]: { // iteratorMethod
-         *             (): AsyncIterator<T>
-         *         }
-         *     }
-         *
-         * T is the type we are after. At every level that involves analyzing return types
-         * of signatures, we union the return types of all the signatures.
+         * At every level that involves analyzing return types of signatures, we union the return types of all the signatures.
          *
          * Another thing to note is that at any step of this process, we could run into a dead end,
          * meaning either the property is missing, or we run into the anyType. If either of these things
-         * happens, we return undefined to signal that we could not find the iterated type. If a property
-         * is missing, and the previous step did not result in 'any', then we also give an error if the
+         * happens, we return `undefined` to signal that we could not find the iteration type. If a property
+         * is missing, and the previous step did not result in `any`, then we also give an error if the
          * caller requested it. Then the caller can decide what to do in the case where there is no iterated
-         * type. This is different from returning anyType, because that would signify that we have matched the
-         * whole pattern and that T (above) is 'any'.
+         * type.
          *
          * For a **for-of** statement, `yield*` (in a normal generator), spread, array
          * destructuring, or normal generator we will only ever look for a `[Symbol.iterator]()`
@@ -55581,164 +57401,412 @@ var ts;
          * For a **for-await-of** statement or a `yield*` in an async generator we will look for
          * the `[Symbol.asyncIterator]()` method first, and then the `[Symbol.iterator]()` method.
          */
-        function getIteratedTypeOfIterable(type, errorNode, allowAsyncIterables, allowSyncIterables, checkAssignability) {
+        function getIterationTypesOfIterable(type, use, errorNode) {
             if (isTypeAny(type)) {
-                return undefined;
+                return anyIterationTypes;
             }
-            return mapType(type, getIteratedType);
-            function getIteratedType(type) {
-                var typeAsIterable = type;
-                if (allowAsyncIterables) {
-                    if (typeAsIterable.iteratedTypeOfAsyncIterable) {
-                        return typeAsIterable.iteratedTypeOfAsyncIterable;
+            if (!(type.flags & 1048576 /* Union */)) {
+                var iterationTypes_1 = getIterationTypesOfIterableWorker(type, use, errorNode);
+                if (iterationTypes_1 === noIterationTypes) {
+                    if (errorNode) {
+                        reportTypeNotIterableError(errorNode, type, !!(use & 2 /* AllowsAsyncIterablesFlag */));
                     }
-                    // As an optimization, if the type is an instantiation of the global `AsyncIterable<T>`
-                    // or the global `AsyncIterableIterator<T>` then just grab its type argument.
-                    if (isReferenceToType(type, getGlobalAsyncIterableType(/*reportErrors*/ false)) ||
-                        isReferenceToType(type, getGlobalAsyncIterableIteratorType(/*reportErrors*/ false))) {
-                        return typeAsIterable.iteratedTypeOfAsyncIterable = type.typeArguments[0];
-                    }
-                }
-                if (allowSyncIterables) {
-                    if (typeAsIterable.iteratedTypeOfIterable) {
-                        return allowAsyncIterables
-                            ? typeAsIterable.iteratedTypeOfAsyncIterable = getAwaitedType(typeAsIterable.iteratedTypeOfIterable)
-                            : typeAsIterable.iteratedTypeOfIterable;
-                    }
-                    // As an optimization, if the type is an instantiation of the global `Iterable<T>` or
-                    // `IterableIterator<T>` then just grab its type argument.
-                    if (isReferenceToType(type, getGlobalIterableType(/*reportErrors*/ false)) ||
-                        isReferenceToType(type, getGlobalIterableIteratorType(/*reportErrors*/ false))) {
-                        return allowAsyncIterables
-                            ? typeAsIterable.iteratedTypeOfAsyncIterable = getAwaitedType(type.typeArguments[0])
-                            : typeAsIterable.iteratedTypeOfIterable = type.typeArguments[0];
-                    }
-                }
-                var asyncMethodType = allowAsyncIterables && getTypeOfPropertyOfType(type, ts.getPropertyNameForKnownSymbolName("asyncIterator"));
-                var methodType = asyncMethodType || (allowSyncIterables ? getTypeOfPropertyOfType(type, ts.getPropertyNameForKnownSymbolName("iterator")) : undefined);
-                if (isTypeAny(methodType)) {
                     return undefined;
                 }
-                var signatures = methodType ? getSignaturesOfType(methodType, 0 /* Call */) : undefined;
-                if (!ts.some(signatures)) {
+                return iterationTypes_1;
+            }
+            var cacheKey = use & 2 /* AllowsAsyncIterablesFlag */ ? "iterationTypesOfAsyncIterable" : "iterationTypesOfIterable";
+            var cachedTypes = type[cacheKey];
+            if (cachedTypes)
+                return cachedTypes === noIterationTypes ? undefined : cachedTypes;
+            var allIterationTypes;
+            for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
+                var constituent = _a[_i];
+                var iterationTypes_2 = getIterationTypesOfIterableWorker(constituent, use, errorNode);
+                if (iterationTypes_2 === noIterationTypes) {
                     if (errorNode) {
-                        // only report on the first error
-                        reportTypeNotIterableError(errorNode, type, allowAsyncIterables);
+                        reportTypeNotIterableError(errorNode, type, !!(use & 2 /* AllowsAsyncIterablesFlag */));
                         errorNode = undefined;
                     }
-                    return undefined;
                 }
-                var returnType = getUnionType(ts.map(signatures, getReturnTypeOfSignature), 2 /* Subtype */);
-                var iteratedType = getIteratedTypeOfIterator(returnType, errorNode, /*isAsyncIterator*/ !!asyncMethodType);
-                if (checkAssignability && errorNode && iteratedType) {
-                    // If `checkAssignability` was specified, we were called from
-                    // `checkIteratedTypeOrElementType`. As such, we need to validate that
-                    // the type passed in is actually an Iterable.
-                    checkTypeAssignableTo(type, asyncMethodType
-                        ? createAsyncIterableType(iteratedType)
-                        : createIterableType(iteratedType), errorNode);
-                }
-                if (iteratedType) {
-                    return allowAsyncIterables
-                        ? typeAsIterable.iteratedTypeOfAsyncIterable = asyncMethodType ? iteratedType : getAwaitedType(iteratedType)
-                        : typeAsIterable.iteratedTypeOfIterable = iteratedType;
+                else {
+                    allIterationTypes = ts.append(allIterationTypes, iterationTypes_2);
                 }
             }
+            var iterationTypes = allIterationTypes ? combineIterationTypes(allIterationTypes) : noIterationTypes;
+            type[cacheKey] = iterationTypes;
+            return iterationTypes === noIterationTypes ? undefined : iterationTypes;
+        }
+        function getAsyncFromSyncIterationTypes(iterationTypes, errorNode) {
+            if (iterationTypes === noIterationTypes)
+                return noIterationTypes;
+            if (iterationTypes === anyIterationTypes)
+                return anyIterationTypes;
+            var yieldType = iterationTypes.yieldType, returnType = iterationTypes.returnType, nextType = iterationTypes.nextType;
+            return createIterationTypes(getAwaitedType(yieldType, errorNode) || anyType, getAwaitedType(returnType, errorNode) || anyType, nextType);
+        }
+        /**
+         * Gets the *yield*, *return*, and *next* types from a non-union type.
+         *
+         * If we are unable to find the *yield*, *return*, and *next* types, `noIterationTypes` is
+         * returned to indicate to the caller that it should report an error. Otherwise, an
+         * `IterationTypes` record is returned.
+         *
+         * NOTE: You probably don't want to call this directly and should be calling
+         * `getIterationTypesOfIterable` instead.
+         */
+        function getIterationTypesOfIterableWorker(type, use, errorNode) {
+            if (isTypeAny(type)) {
+                return anyIterationTypes;
+            }
+            if (use & 2 /* AllowsAsyncIterablesFlag */) {
+                var iterationTypes = getIterationTypesOfIterableCached(type, asyncIterationTypesResolver) ||
+                    getIterationTypesOfIterableFast(type, asyncIterationTypesResolver);
+                if (iterationTypes) {
+                    return iterationTypes;
+                }
+            }
+            if (use & 1 /* AllowsSyncIterablesFlag */) {
+                var iterationTypes = getIterationTypesOfIterableCached(type, syncIterationTypesResolver) ||
+                    getIterationTypesOfIterableFast(type, syncIterationTypesResolver);
+                if (iterationTypes) {
+                    if (use & 2 /* AllowsAsyncIterablesFlag */) {
+                        // for a sync iterable in an async context, only use the cached types if they are valid.
+                        if (iterationTypes !== noIterationTypes) {
+                            return type.iterationTypesOfAsyncIterable = getAsyncFromSyncIterationTypes(iterationTypes, errorNode);
+                        }
+                    }
+                    else {
+                        return iterationTypes;
+                    }
+                }
+            }
+            if (use & 2 /* AllowsAsyncIterablesFlag */) {
+                var iterationTypes = getIterationTypesOfIterableSlow(type, asyncIterationTypesResolver, errorNode);
+                if (iterationTypes !== noIterationTypes) {
+                    return iterationTypes;
+                }
+            }
+            if (use & 1 /* AllowsSyncIterablesFlag */) {
+                var iterationTypes = getIterationTypesOfIterableSlow(type, syncIterationTypesResolver, errorNode);
+                if (iterationTypes !== noIterationTypes) {
+                    if (use & 2 /* AllowsAsyncIterablesFlag */) {
+                        return type.iterationTypesOfAsyncIterable = iterationTypes
+                            ? getAsyncFromSyncIterationTypes(iterationTypes, errorNode)
+                            : noIterationTypes;
+                    }
+                    else {
+                        return iterationTypes;
+                    }
+                }
+            }
+            return noIterationTypes;
+        }
+        /**
+         * Gets the *yield*, *return*, and *next* types of an `Iterable`-like or
+         * `AsyncIterable`-like type from the cache.
+         *
+         * NOTE: You probably don't want to call this directly and should be calling
+         * `getIterationTypesOfIterable` instead.
+         */
+        function getIterationTypesOfIterableCached(type, resolver) {
+            return type[resolver.iterableCacheKey];
+        }
+        function getIterationTypesOfGlobalIterableType(globalType, resolver) {
+            var globalIterationTypes = getIterationTypesOfIterableCached(globalType, resolver) ||
+                getIterationTypesOfIterableSlow(globalType, resolver, /*errorNode*/ undefined);
+            return globalIterationTypes === noIterationTypes ? defaultIterationTypes : globalIterationTypes;
+        }
+        /**
+         * Gets the *yield*, *return*, and *next* types of an `Iterable`-like or `AsyncIterable`-like
+         * type from from common heuristics.
+         *
+         * If we previously analyzed this type and found no iteration types, `noIterationTypes` is
+         * returned. If we found iteration types, an `IterationTypes` record is returned.
+         * Otherwise, we return `undefined` to indicate to the caller it should perform a more
+         * exhaustive analysis.
+         *
+         * NOTE: You probably don't want to call this directly and should be calling
+         * `getIterationTypesOfIterable` instead.
+         */
+        function getIterationTypesOfIterableFast(type, resolver) {
+            // As an optimization, if the type is an instantiation of one of the following global types, then
+            // just grab its related type argument:
+            // - `Iterable<T>` or `AsyncIterable<T>`
+            // - `IterableIterator<T>` or `AsyncIterableIterator<T>`
+            var globalType;
+            if (isReferenceToType(type, globalType = resolver.getGlobalIterableType(/*reportErrors*/ false)) ||
+                isReferenceToType(type, globalType = resolver.getGlobalIterableIteratorType(/*reportErrors*/ false))) {
+                var yieldType = type.typeArguments[0];
+                // The "return" and "next" types of `Iterable` and `IterableIterator` are defined by the
+                // iteration types of their `[Symbol.iterator]()` method. The same is true for their async cousins.
+                // While we define these as `any` and `undefined` in our libs by default, a custom lib *could* use
+                // different definitions.
+                var _a = getIterationTypesOfGlobalIterableType(globalType, resolver), returnType = _a.returnType, nextType = _a.nextType;
+                return type[resolver.iterableCacheKey] = createIterationTypes(yieldType, returnType, nextType);
+            }
+            // As an optimization, if the type is an instantiation of the following global type, then
+            // just grab its related type arguments:
+            // - `Generator<T, TReturn, TNext>` or `AsyncGenerator<T, TReturn, TNext>`
+            if (isReferenceToType(type, resolver.getGlobalGeneratorType(/*reportErrors*/ false))) {
+                var _b = type.typeArguments, yieldType = _b[0], returnType = _b[1], nextType = _b[2];
+                return type[resolver.iterableCacheKey] = createIterationTypes(yieldType, returnType, nextType);
+            }
+        }
+        /**
+         * Gets the *yield*, *return*, and *next* types of an `Iterable`-like or `AsyncIterable`-like
+         * type from its members.
+         *
+         * If we successfully found the *yield*, *return*, and *next* types, an `IterationTypes`
+         * record is returned. Otherwise, `noIterationTypes` is returned.
+         *
+         * NOTE: You probably don't want to call this directly and should be calling
+         * `getIterationTypesOfIterable` instead.
+         */
+        function getIterationTypesOfIterableSlow(type, resolver, errorNode) {
+            var method = getPropertyOfType(type, ts.getPropertyNameForKnownSymbolName(resolver.iteratorSymbolName));
+            var methodType = method && !(method.flags & 16777216 /* Optional */) ? getTypeOfSymbol(method) : undefined;
+            if (isTypeAny(methodType)) {
+                return type[resolver.iterableCacheKey] = anyIterationTypes;
+            }
+            var signatures = methodType ? getSignaturesOfType(methodType, 0 /* Call */) : undefined;
+            if (!ts.some(signatures)) {
+                return type[resolver.iterableCacheKey] = noIterationTypes;
+            }
+            var iteratorType = getUnionType(ts.map(signatures, getReturnTypeOfSignature), 2 /* Subtype */);
+            var iterationTypes = getIterationTypesOfIterator(iteratorType, resolver, errorNode) || noIterationTypes;
+            return type[resolver.iterableCacheKey] = iterationTypes;
         }
         function reportTypeNotIterableError(errorNode, type, allowAsyncIterables) {
-            error(errorNode, allowAsyncIterables
+            var message = allowAsyncIterables
                 ? ts.Diagnostics.Type_0_must_have_a_Symbol_asyncIterator_method_that_returns_an_async_iterator
-                : ts.Diagnostics.Type_0_must_have_a_Symbol_iterator_method_that_returns_an_iterator, typeToString(type));
+                : ts.Diagnostics.Type_0_must_have_a_Symbol_iterator_method_that_returns_an_iterator;
+            errorAndMaybeSuggestAwait(errorNode, !!getAwaitedTypeOfPromise(type), message, typeToString(type));
         }
         /**
-         * This function has very similar logic as getIteratedTypeOfIterable, except that it operates on
-         * Iterators instead of Iterables. Here is the structure:
+         * Gets the *yield*, *return*, and *next* types from an `Iterator`-like or `AsyncIterator`-like type.
          *
-         *  { // iterator
-         *      next: { // nextMethod
-         *          (): { // nextResult
-         *              value: T // nextValue
-         *          }
-         *      }
-         *  }
-         *
-         * For an async iterator, we expect the following structure:
-         *
-         *  { // iterator
-         *      next: { // nextMethod
-         *          (): PromiseLike<{ // nextResult
-         *              value: T // nextValue
-         *          }>
-         *      }
-         *  }
+         * If we successfully found the *yield*, *return*, and *next* types, an `IterationTypes`
+         * record is returned. Otherwise, `undefined` is returned.
          */
-        function getIteratedTypeOfIterator(type, errorNode, isAsyncIterator) {
+        function getIterationTypesOfIterator(type, resolver, errorNode) {
             if (isTypeAny(type)) {
-                return undefined;
+                return anyIterationTypes;
             }
-            var typeAsIterator = type;
-            if (isAsyncIterator ? typeAsIterator.iteratedTypeOfAsyncIterator : typeAsIterator.iteratedTypeOfIterator) {
-                return isAsyncIterator ? typeAsIterator.iteratedTypeOfAsyncIterator : typeAsIterator.iteratedTypeOfIterator;
-            }
-            // As an optimization, if the type is an instantiation of the global `Iterator<T>` (for
-            // a non-async iterator) or the global `AsyncIterator<T>` (for an async-iterator) then
-            // just grab its type argument.
-            var getIteratorType = isAsyncIterator ? getGlobalAsyncIteratorType : getGlobalIteratorType;
-            if (isReferenceToType(type, getIteratorType(/*reportErrors*/ false))) {
-                return isAsyncIterator
-                    ? typeAsIterator.iteratedTypeOfAsyncIterator = type.typeArguments[0]
-                    : typeAsIterator.iteratedTypeOfIterator = type.typeArguments[0];
-            }
-            // Both async and non-async iterators must have a `next` method.
-            var nextMethod = getTypeOfPropertyOfType(type, "next");
-            if (isTypeAny(nextMethod)) {
-                return undefined;
-            }
-            var nextMethodSignatures = nextMethod ? getSignaturesOfType(nextMethod, 0 /* Call */) : ts.emptyArray;
-            if (nextMethodSignatures.length === 0) {
-                if (errorNode) {
-                    error(errorNode, isAsyncIterator
-                        ? ts.Diagnostics.An_async_iterator_must_have_a_next_method
-                        : ts.Diagnostics.An_iterator_must_have_a_next_method);
-                }
-                return undefined;
-            }
-            var nextResult = getUnionType(ts.map(nextMethodSignatures, getReturnTypeOfSignature), 2 /* Subtype */);
-            if (isTypeAny(nextResult)) {
-                return undefined;
-            }
-            // For an async iterator, we must get the awaited type of the return type.
-            if (isAsyncIterator) {
-                nextResult = getAwaitedTypeOfPromise(nextResult, errorNode, ts.Diagnostics.The_type_returned_by_the_next_method_of_an_async_iterator_must_be_a_promise_for_a_type_with_a_value_property);
-                if (isTypeAny(nextResult)) {
-                    return undefined;
-                }
-            }
-            var nextValue = nextResult && getTypeOfPropertyOfType(nextResult, "value");
-            if (!nextValue) {
-                if (errorNode) {
-                    error(errorNode, isAsyncIterator
-                        ? ts.Diagnostics.The_type_returned_by_the_next_method_of_an_async_iterator_must_be_a_promise_for_a_type_with_a_value_property
-                        : ts.Diagnostics.The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property);
-                }
-                return undefined;
-            }
-            return isAsyncIterator
-                ? typeAsIterator.iteratedTypeOfAsyncIterator = nextValue
-                : typeAsIterator.iteratedTypeOfIterator = nextValue;
+            var iterationTypes = getIterationTypesOfIteratorCached(type, resolver) ||
+                getIterationTypesOfIteratorFast(type, resolver) ||
+                getIterationTypesOfIteratorSlow(type, resolver, errorNode);
+            return iterationTypes === noIterationTypes ? undefined : iterationTypes;
         }
         /**
-         * A generator may have a return type of `Iterator<T>`, `Iterable<T>`, or
-         * `IterableIterator<T>`. An async generator may have a return type of `AsyncIterator<T>`,
-         * `AsyncIterable<T>`, or `AsyncIterableIterator<T>`. This function can be used to extract
-         * the iterated type from this return type for contextual typing and verifying signatures.
+         * Gets the iteration types of an `Iterator`-like or `AsyncIterator`-like type from the
+         * cache.
+         *
+         * NOTE: You probably don't want to call this directly and should be calling
+         * `getIterationTypesOfIterator` instead.
          */
-        function getIteratedTypeOfGenerator(returnType, isAsyncGenerator) {
+        function getIterationTypesOfIteratorCached(type, resolver) {
+            return type[resolver.iteratorCacheKey];
+        }
+        /**
+         * Gets the iteration types of an `Iterator`-like or `AsyncIterator`-like type from the
+         * cache or from common heuristics.
+         *
+         * If we previously analyzed this type and found no iteration types, `noIterationTypes` is
+         * returned. If we found iteration types, an `IterationTypes` record is returned.
+         * Otherwise, we return `undefined` to indicate to the caller it should perform a more
+         * exhaustive analysis.
+         *
+         * NOTE: You probably don't want to call this directly and should be calling
+         * `getIterationTypesOfIterator` instead.
+         */
+        function getIterationTypesOfIteratorFast(type, resolver) {
+            // As an optimization, if the type is an instantiation of one of the following global types,
+            // then just grab its related type argument:
+            // - `IterableIterator<T>` or `AsyncIterableIterator<T>`
+            // - `Iterator<T, TReturn, TNext>` or `AsyncIterator<T, TReturn, TNext>`
+            // - `Generator<T, TReturn, TNext>` or `AsyncGenerator<T, TReturn, TNext>`
+            var globalType = resolver.getGlobalIterableIteratorType(/*reportErrors*/ false);
+            if (isReferenceToType(type, globalType)) {
+                var yieldType = type.typeArguments[0];
+                // The "return" and "next" types of `IterableIterator` and `AsyncIterableIterator` are defined by the
+                // iteration types of their `next`, `return`, and `throw` methods. While we define these as `any`
+                // and `undefined` in our libs by default, a custom lib *could* use different definitions.
+                var globalIterationTypes = getIterationTypesOfIteratorCached(globalType, resolver) ||
+                    getIterationTypesOfIteratorSlow(globalType, resolver, /*errorNode*/ undefined);
+                var _a = globalIterationTypes === noIterationTypes ? defaultIterationTypes : globalIterationTypes, returnType = _a.returnType, nextType = _a.nextType;
+                return type[resolver.iteratorCacheKey] = createIterationTypes(yieldType, returnType, nextType);
+            }
+            if (isReferenceToType(type, resolver.getGlobalIteratorType(/*reportErrors*/ false)) ||
+                isReferenceToType(type, resolver.getGlobalGeneratorType(/*reportErrors*/ false))) {
+                var _b = type.typeArguments, yieldType = _b[0], returnType = _b[1], nextType = _b[2];
+                return type[resolver.iteratorCacheKey] = createIterationTypes(yieldType, returnType, nextType);
+            }
+        }
+        function isIteratorResult(type, kind) {
+            // From https://tc39.github.io/ecma262/#sec-iteratorresult-interface:
+            // > [done] is the result status of an iterator `next` method call. If the end of the iterator was reached `done` is `true`.
+            // > If the end was not reached `done` is `false` and a value is available.
+            // > If a `done` property (either own or inherited) does not exist, it is consider to have the value `false`.
+            var doneType = getTypeOfPropertyOfType(type, "done") || falseType;
+            return isTypeAssignableTo(kind === 0 /* Yield */ ? falseType : trueType, doneType);
+        }
+        function isYieldIteratorResult(type) {
+            return isIteratorResult(type, 0 /* Yield */);
+        }
+        function isReturnIteratorResult(type) {
+            return isIteratorResult(type, 1 /* Return */);
+        }
+        /**
+         * Gets the *yield* and *return* types of an `IteratorResult`-like type.
+         *
+         * If we are unable to determine a *yield* or a *return* type, `noIterationTypes` is
+         * returned to indicate to the caller that it should handle the error. Otherwise, an
+         * `IterationTypes` record is returned.
+         */
+        function getIterationTypesOfIteratorResult(type) {
+            if (isTypeAny(type)) {
+                return anyIterationTypes;
+            }
+            var cachedTypes = type.iterationTypesOfIteratorResult;
+            if (cachedTypes) {
+                return cachedTypes;
+            }
+            // As an optimization, if the type is an instantiation of one of the global `IteratorYieldResult<T>`
+            // or `IteratorReturnResult<TReturn>` types, then just grab its type argument.
+            if (isReferenceToType(type, getGlobalIteratorYieldResultType(/*reportErrors*/ false))) {
+                var yieldType_1 = type.typeArguments[0];
+                return type.iterationTypesOfIteratorResult = createIterationTypes(yieldType_1, /*returnType*/ undefined, /*nextType*/ undefined);
+            }
+            if (isReferenceToType(type, getGlobalIteratorReturnResultType(/*reportErrors*/ false))) {
+                var returnType_1 = type.typeArguments[0];
+                return type.iterationTypesOfIteratorResult = createIterationTypes(/*yieldType*/ undefined, returnType_1, /*nextType*/ undefined);
+            }
+            // Choose any constituents that can produce the requested iteration type.
+            var yieldIteratorResult = filterType(type, isYieldIteratorResult);
+            var yieldType = yieldIteratorResult !== neverType ? getTypeOfPropertyOfType(yieldIteratorResult, "value") : undefined;
+            var returnIteratorResult = filterType(type, isReturnIteratorResult);
+            var returnType = returnIteratorResult !== neverType ? getTypeOfPropertyOfType(returnIteratorResult, "value") : undefined;
+            if (!yieldType && !returnType) {
+                return type.iterationTypesOfIteratorResult = noIterationTypes;
+            }
+            // From https://tc39.github.io/ecma262/#sec-iteratorresult-interface
+            // > ... If the iterator does not have a return value, `value` is `undefined`. In that case, the
+            // > `value` property may be absent from the conforming object if it does not inherit an explicit
+            // > `value` property.
+            return type.iterationTypesOfIteratorResult = createIterationTypes(yieldType, returnType || voidType, /*nextType*/ undefined);
+        }
+        /**
+         * Gets the *yield*, *return*, and *next* types of a the `next()`, `return()`, or
+         * `throw()` method of an `Iterator`-like or `AsyncIterator`-like type.
+         *
+         * If we successfully found the *yield*, *return*, and *next* types, an `IterationTypes`
+         * record is returned. Otherwise, we return `undefined`.
+         */
+        function getIterationTypesOfMethod(type, resolver, methodName, errorNode) {
+            var method = getPropertyOfType(type, methodName);
+            // Ignore 'return' or 'throw' if they are missing.
+            if (!method && methodName !== "next") {
+                return undefined;
+            }
+            var methodType = method && !(methodName === "next" && (method.flags & 16777216 /* Optional */))
+                ? methodName === "next" ? getTypeOfSymbol(method) : getTypeWithFacts(getTypeOfSymbol(method), 2097152 /* NEUndefinedOrNull */)
+                : undefined;
+            if (isTypeAny(methodType)) {
+                // `return()` and `throw()` don't provide a *next* type.
+                return methodName === "next" ? anyIterationTypes : anyIterationTypesExceptNext;
+            }
+            // Both async and non-async iterators *must* have a `next` method.
+            var methodSignatures = methodType ? getSignaturesOfType(methodType, 0 /* Call */) : ts.emptyArray;
+            if (methodSignatures.length === 0) {
+                if (errorNode) {
+                    var diagnostic = methodName === "next"
+                        ? resolver.mustHaveANextMethodDiagnostic
+                        : resolver.mustBeAMethodDiagnostic;
+                    error(errorNode, diagnostic, methodName);
+                }
+                return methodName === "next" ? anyIterationTypes : undefined;
+            }
+            // Extract the first parameter and return type of each signature.
+            var methodParameterTypes;
+            var methodReturnTypes;
+            for (var _i = 0, methodSignatures_1 = methodSignatures; _i < methodSignatures_1.length; _i++) {
+                var signature = methodSignatures_1[_i];
+                if (methodName !== "throw" && ts.some(signature.parameters)) {
+                    methodParameterTypes = ts.append(methodParameterTypes, getTypeAtPosition(signature, 0));
+                }
+                methodReturnTypes = ts.append(methodReturnTypes, getReturnTypeOfSignature(signature));
+            }
+            // Resolve the *next* or *return* type from the first parameter of a `next()` or
+            // `return()` method, respectively.
+            var returnTypes;
+            var nextType;
+            if (methodName !== "throw") {
+                var methodParameterType = methodParameterTypes ? getUnionType(methodParameterTypes) : unknownType;
+                var resolvedMethodParameterType = resolver.resolveIterationType(methodParameterType, errorNode) || anyType;
+                if (methodName === "next") {
+                    nextType = resolvedMethodParameterType;
+                }
+                else if (methodName === "return") {
+                    returnTypes = ts.append(returnTypes, resolvedMethodParameterType);
+                }
+            }
+            // Resolve the *yield* and *return* types from the return type of the method (i.e. `IteratorResult`)
+            var yieldType;
+            var methodReturnType = methodReturnTypes ? getUnionType(methodReturnTypes, 2 /* Subtype */) : neverType;
+            var resolvedMethodReturnType = resolver.resolveIterationType(methodReturnType, errorNode) || anyType;
+            var iterationTypes = getIterationTypesOfIteratorResult(resolvedMethodReturnType);
+            if (iterationTypes === noIterationTypes) {
+                if (errorNode) {
+                    error(errorNode, resolver.mustHaveAValueDiagnostic, methodName);
+                }
+                yieldType = anyType;
+                returnTypes = ts.append(returnTypes, anyType);
+            }
+            else {
+                yieldType = iterationTypes.yieldType;
+                returnTypes = ts.append(returnTypes, iterationTypes.returnType);
+            }
+            return createIterationTypes(yieldType, getUnionType(returnTypes), nextType);
+        }
+        /**
+         * Gets the *yield*, *return*, and *next* types of an `Iterator`-like or `AsyncIterator`-like
+         * type from its members.
+         *
+         * If we successfully found the *yield*, *return*, and *next* types, an `IterationTypes`
+         * record is returned. Otherwise, `noIterationTypes` is returned.
+         *
+         * NOTE: You probably don't want to call this directly and should be calling
+         * `getIterationTypesOfIterator` instead.
+         */
+        function getIterationTypesOfIteratorSlow(type, resolver, errorNode) {
+            var iterationTypes = combineIterationTypes([
+                getIterationTypesOfMethod(type, resolver, "next", errorNode),
+                getIterationTypesOfMethod(type, resolver, "return", errorNode),
+                getIterationTypesOfMethod(type, resolver, "throw", errorNode),
+            ]);
+            return type[resolver.iteratorCacheKey] = iterationTypes;
+        }
+        /**
+         * Gets the requested "iteration type" from a type that is either `Iterable`-like, `Iterator`-like,
+         * `IterableIterator`-like, or `Generator`-like (for a non-async generator); or `AsyncIterable`-like,
+         * `AsyncIterator`-like, `AsyncIterableIterator`-like, or `AsyncGenerator`-like (for an async generator).
+         */
+        function getIterationTypeOfGeneratorFunctionReturnType(kind, returnType, isAsyncGenerator) {
             if (isTypeAny(returnType)) {
                 return undefined;
             }
-            return getIteratedTypeOfIterable(returnType, /*errorNode*/ undefined, /*allowAsyncIterables*/ isAsyncGenerator, /*allowSyncIterables*/ !isAsyncGenerator, /*checkAssignability*/ false)
-                || getIteratedTypeOfIterator(returnType, /*errorNode*/ undefined, isAsyncGenerator);
+            var iterationTypes = getIterationTypesOfGeneratorFunctionReturnType(returnType, isAsyncGenerator);
+            return iterationTypes && iterationTypes[getIterationTypesKeyFromIterationTypeKind(kind)];
+        }
+        function getIterationTypesOfGeneratorFunctionReturnType(type, isAsyncGenerator) {
+            if (isTypeAny(type)) {
+                return anyIterationTypes;
+            }
+            var use = isAsyncGenerator ? 2 /* AsyncGeneratorReturnType */ : 1 /* GeneratorReturnType */;
+            var resolver = isAsyncGenerator ? asyncIterationTypesResolver : syncIterationTypesResolver;
+            return getIterationTypesOfIterable(type, use, /*errorNode*/ undefined) ||
+                getIterationTypesOfIterator(type, resolver, /*errorNode*/ undefined);
         }
         function checkBreakOrContinueStatement(node) {
             // Grammar checking
@@ -55746,10 +57814,15 @@ var ts;
                 checkGrammarBreakOrContinueStatement(node);
             // TODO: Check that target label is valid
         }
+        function unwrapReturnType(returnType, functionFlags) {
+            var isGenerator = !!(functionFlags & 1 /* Generator */);
+            var isAsync = !!(functionFlags & 2 /* Async */);
+            return isGenerator ? getIterationTypeOfGeneratorFunctionReturnType(1 /* Return */, returnType, isAsync) || errorType :
+                isAsync ? getPromisedTypeOfPromise(returnType) || errorType :
+                    returnType;
+        }
         function isUnwrappedReturnTypeVoidOrAny(func, returnType) {
-            var unwrappedReturnType = (ts.getFunctionFlags(func) & 3 /* AsyncGenerator */) === 2 /* Async */
-                ? getPromisedTypeOfPromise(returnType) // Async function
-                : returnType; // AsyncGenerator function, Generator function, or normal function
+            var unwrappedReturnType = unwrapReturnType(returnType, ts.getFunctionFlags(func));
             return !!unwrappedReturnType && maybeTypeOfKind(unwrappedReturnType, 16384 /* Void */ | 3 /* AnyOrUnknown */);
         }
         function checkReturnStatement(node) {
@@ -55765,43 +57838,32 @@ var ts;
             var signature = getSignatureFromDeclaration(func);
             var returnType = getReturnTypeOfSignature(signature);
             var functionFlags = ts.getFunctionFlags(func);
-            var isGenerator = functionFlags & 1 /* Generator */;
             if (strictNullChecks || node.expression || returnType.flags & 131072 /* Never */) {
                 var exprType = node.expression ? checkExpressionCached(node.expression) : undefinedType;
-                if (isGenerator) { // AsyncGenerator function or Generator function
-                    // A generator does not need its return expressions checked against its return type.
-                    // Instead, the yield expressions are checked against the element type.
-                    // TODO: Check return types of generators when return type tracking is added
-                    // for generators.
-                    return;
-                }
-                else if (func.kind === 159 /* SetAccessor */) {
+                if (func.kind === 160 /* SetAccessor */) {
                     if (node.expression) {
                         error(node, ts.Diagnostics.Setters_cannot_return_a_value);
                     }
                 }
-                else if (func.kind === 157 /* Constructor */) {
+                else if (func.kind === 158 /* Constructor */) {
                     if (node.expression && !checkTypeAssignableToAndOptionallyElaborate(exprType, returnType, node, node.expression)) {
                         error(node, ts.Diagnostics.Return_type_of_constructor_signature_must_be_assignable_to_the_instance_type_of_the_class);
                     }
                 }
                 else if (getReturnTypeFromAnnotation(func)) {
-                    if (functionFlags & 2 /* Async */) { // Async function
-                        var promisedType = getPromisedTypeOfPromise(returnType);
-                        var awaitedType = checkAwaitedType(exprType, node, ts.Diagnostics.The_return_type_of_an_async_function_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member);
-                        if (promisedType) {
-                            // If the function has a return type, but promisedType is
-                            // undefined, an error will be reported in checkAsyncFunctionReturnType
-                            // so we don't need to report one here.
-                            checkTypeAssignableTo(awaitedType, promisedType, node);
-                        }
-                    }
-                    else {
-                        checkTypeAssignableToAndOptionallyElaborate(exprType, returnType, node, node.expression);
+                    var unwrappedReturnType = unwrapReturnType(returnType, functionFlags);
+                    var unwrappedExprType = functionFlags & 2 /* Async */
+                        ? checkAwaitedType(exprType, node, ts.Diagnostics.The_return_type_of_an_async_function_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member)
+                        : exprType;
+                    if (unwrappedReturnType) {
+                        // If the function has a return type, but promisedType is
+                        // undefined, an error will be reported in checkAsyncFunctionReturnType
+                        // so we don't need to report one here.
+                        checkTypeAssignableToAndOptionallyElaborate(unwrappedExprType, unwrappedReturnType, node, node.expression);
                     }
                 }
             }
-            else if (func.kind !== 157 /* Constructor */ && compilerOptions.noImplicitReturns && !isUnwrappedReturnTypeVoidOrAny(func, returnType) && !isGenerator) {
+            else if (func.kind !== 158 /* Constructor */ && compilerOptions.noImplicitReturns && !isUnwrappedReturnTypeVoidOrAny(func, returnType)) {
                 // The function has a return type, but the return statement doesn't have an expression.
                 error(node, ts.Diagnostics.Not_all_code_paths_return_a_value);
             }
@@ -55830,7 +57892,7 @@ var ts;
             var expressionIsLiteral = isLiteralType(expressionType);
             ts.forEach(node.caseBlock.clauses, function (clause) {
                 // Grammar check for duplicate default clauses, skip if we already report duplicate default clause
-                if (clause.kind === 272 /* DefaultClause */ && !hasDuplicateDefaultClause) {
+                if (clause.kind === 273 /* DefaultClause */ && !hasDuplicateDefaultClause) {
                     if (firstDefaultClause === undefined) {
                         firstDefaultClause = clause;
                     }
@@ -55842,7 +57904,7 @@ var ts;
                         hasDuplicateDefaultClause = true;
                     }
                 }
-                if (produceDiagnostics && clause.kind === 271 /* CaseClause */) {
+                if (produceDiagnostics && clause.kind === 272 /* CaseClause */) {
                     // TypeScript 1.0 spec (April 2014): 5.9
                     // In a 'switch' statement, each 'case' expression must be of a type that is comparable
                     // to or from the type of the 'switch' expression.
@@ -55871,7 +57933,7 @@ var ts;
                     if (ts.isFunctionLike(current)) {
                         return "quit";
                     }
-                    if (current.kind === 233 /* LabeledStatement */ && current.label.escapedText === node.label.escapedText) {
+                    if (current.kind === 234 /* LabeledStatement */ && current.label.escapedText === node.label.escapedText) {
                         grammarErrorOnNode(node.label, ts.Diagnostics.Duplicate_label_0, ts.getTextOfNode(node.label));
                         return true;
                     }
@@ -55978,8 +58040,8 @@ var ts;
                 // this allows us to rule out cases when both property and indexer are inherited from the base class
                 var errorNode;
                 if (propDeclaration && name &&
-                    (propDeclaration.kind === 204 /* BinaryExpression */ ||
-                        name.kind === 149 /* ComputedPropertyName */ ||
+                    (propDeclaration.kind === 205 /* BinaryExpression */ ||
+                        name.kind === 150 /* ComputedPropertyName */ ||
                         prop.parent === containingType.symbol)) {
                     errorNode = propDeclaration;
                 }
@@ -56056,7 +58118,7 @@ var ts;
         function checkTypeParametersNotReferenced(root, typeParameters, index) {
             visit(root);
             function visit(node) {
-                if (node.kind === 164 /* TypeReference */) {
+                if (node.kind === 165 /* TypeReference */) {
                     var type = getTypeFromTypeReference(node);
                     if (type.flags & 262144 /* TypeParameter */) {
                         for (var i = index; i < typeParameters.length; i++) {
@@ -56178,6 +58240,11 @@ var ts;
                 if (languageVersion < 2 /* ES2015 */) {
                     checkExternalEmitHelpers(baseTypeNode.parent, 1 /* Extends */);
                 }
+                // check both @extends and extends if both are specified.
+                var extendsNode = ts.getClassExtendsHeritageElement(node);
+                if (extendsNode && extendsNode !== baseTypeNode) {
+                    checkExpression(extendsNode.expression);
+                }
                 var baseTypes = getBaseTypes(type);
                 if (baseTypes.length && produceDiagnostics) {
                     var baseType_1 = baseTypes[0];
@@ -56185,10 +58252,6 @@ var ts;
                     var staticBaseType = getApparentType(baseConstructorType);
                     checkBaseTypeAccessibility(staticBaseType, baseTypeNode);
                     checkSourceElement(baseTypeNode.expression);
-                    var extendsNode = ts.getClassExtendsHeritageElement(node);
-                    if (extendsNode && extendsNode !== baseTypeNode) {
-                        checkExpression(extendsNode.expression);
-                    }
                     if (ts.some(baseTypeNode.typeArguments)) {
                         ts.forEach(baseTypeNode.typeArguments, checkSourceElement);
                         for (var _i = 0, _a = getConstructorsForTypeArguments(staticBaseType, baseTypeNode.typeArguments, baseTypeNode); _i < _a.length; _i++) {
@@ -56259,7 +58322,7 @@ var ts;
         function issueMemberSpecificError(node, typeWithThis, baseWithThis, broadDiag) {
             // iterate over all implemented properties and issue errors on each one which isn't compatible, rather than the class as a whole, if possible
             var issuedMemberError = false;
-            var _loop_9 = function (member) {
+            var _loop_14 = function (member) {
                 if (ts.hasStaticModifier(member)) {
                     return "continue";
                 }
@@ -56278,7 +58341,7 @@ var ts;
             };
             for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                 var member = _a[_i];
-                _loop_9(member);
+                _loop_14(member);
             }
             if (!issuedMemberError) {
                 // check again with diagnostics to generate a less-specific error
@@ -56304,7 +58367,7 @@ var ts;
         }
         function getClassOrInterfaceDeclarationsOfSymbol(symbol) {
             return ts.filter(symbol.declarations, function (d) {
-                return d.kind === 240 /* ClassDeclaration */ || d.kind === 241 /* InterfaceDeclaration */;
+                return d.kind === 241 /* ClassDeclaration */ || d.kind === 242 /* InterfaceDeclaration */;
             });
         }
         function checkKindsOfPropertyMemberOverrides(type, baseType) {
@@ -56343,7 +58406,7 @@ var ts;
                         // If there is no declaration for the derived class (as in the case of class expressions),
                         // then the class cannot be declared abstract.
                         if (baseDeclarationFlags & 128 /* Abstract */ && (!derivedClassDecl || !ts.hasModifier(derivedClassDecl, 128 /* Abstract */))) {
-                            if (derivedClassDecl.kind === 209 /* ClassExpression */) {
+                            if (derivedClassDecl.kind === 210 /* ClassExpression */) {
                                 error(derivedClassDecl, ts.Diagnostics.Non_abstract_class_expression_does_not_implement_inherited_abstract_member_0_from_class_1, symbolToString(baseProperty), typeToString(baseType));
                             }
                             else {
@@ -56393,8 +58456,8 @@ var ts;
             for (var _i = 0, baseTypes_2 = baseTypes; _i < baseTypes_2.length; _i++) {
                 var base = baseTypes_2[_i];
                 var properties = getPropertiesOfType(getTypeWithThisArgument(base, type.thisType));
-                for (var _a = 0, properties_7 = properties; _a < properties_7.length; _a++) {
-                    var prop = properties_7[_a];
+                for (var _a = 0, properties_4 = properties; _a < properties_4.length; _a++) {
+                    var prop = properties_4[_a];
                     var existing = seen.get(prop.escapedName);
                     if (!existing) {
                         seen.set(prop.escapedName, { prop: prop, containingType: base });
@@ -56435,7 +58498,7 @@ var ts;
             }
         }
         function isInstancePropertyWithoutInitializer(node) {
-            return node.kind === 154 /* PropertyDeclaration */ &&
+            return node.kind === 155 /* PropertyDeclaration */ &&
                 !ts.hasModifier(node, 32 /* Static */ | 128 /* Abstract */) &&
                 !node.exclamationToken &&
                 !node.initializer;
@@ -56459,7 +58522,7 @@ var ts;
                 var symbol = getSymbolOfNode(node);
                 checkTypeParameterListsIdentical(symbol);
                 // Only check this symbol once
-                var firstInterfaceDecl = ts.getDeclarationOfKind(symbol, 241 /* InterfaceDeclaration */);
+                var firstInterfaceDecl = ts.getDeclarationOfKind(symbol, 242 /* InterfaceDeclaration */);
                 if (node === firstInterfaceDecl) {
                     var type = getDeclaredTypeOfSymbol(symbol);
                     var typeWithThis = getTypeWithThisArgument(type);
@@ -56520,9 +58583,9 @@ var ts;
             if (member.initializer) {
                 return computeConstantValue(member);
             }
-            // In ambient enum declarations that specify no const modifier, enum member declarations that omit
-            // a value are considered computed members (as opposed to having auto-incremented values).
-            if (member.parent.flags & 4194304 /* Ambient */ && !ts.isEnumConst(member.parent)) {
+            // In ambient non-const numeric enum declarations, enum members without initializers are
+            // considered computed members (as opposed to having auto-incremented values).
+            if (member.parent.flags & 4194304 /* Ambient */ && !ts.isEnumConst(member.parent) && getEnumKind(getSymbolOfNode(member.parent)) === 0 /* Numeric */) {
                 return undefined;
             }
             // If the member declaration specifies no value, the member is considered a constant enum member.
@@ -56564,7 +58627,7 @@ var ts;
             return value;
             function evaluate(expr) {
                 switch (expr.kind) {
-                    case 202 /* PrefixUnaryExpression */:
+                    case 203 /* PrefixUnaryExpression */:
                         var value_2 = evaluate(expr.operand);
                         if (typeof value_2 === "number") {
                             switch (expr.operator) {
@@ -56574,7 +58637,7 @@ var ts;
                             }
                         }
                         break;
-                    case 204 /* BinaryExpression */:
+                    case 205 /* BinaryExpression */:
                         var left = evaluate(expr.left);
                         var right = evaluate(expr.right);
                         if (typeof left === "number" && typeof right === "number") {
@@ -56602,22 +58665,22 @@ var ts;
                     case 8 /* NumericLiteral */:
                         checkGrammarNumericLiteral(expr);
                         return +expr.text;
-                    case 195 /* ParenthesizedExpression */:
+                    case 196 /* ParenthesizedExpression */:
                         return evaluate(expr.expression);
-                    case 72 /* Identifier */:
+                    case 73 /* Identifier */:
                         var identifier = expr;
                         if (isInfinityOrNaNString(identifier.escapedText)) {
                             return +(identifier.escapedText);
                         }
                         return ts.nodeIsMissing(expr) ? 0 : evaluateEnumMember(expr, getSymbolOfNode(member.parent), identifier.escapedText);
-                    case 190 /* ElementAccessExpression */:
-                    case 189 /* PropertyAccessExpression */:
+                    case 191 /* ElementAccessExpression */:
+                    case 190 /* PropertyAccessExpression */:
                         var ex = expr;
                         if (isConstantMemberAccess(ex)) {
                             var type = getTypeOfExpression(ex.expression);
                             if (type.symbol && type.symbol.flags & 384 /* Enum */) {
                                 var name = void 0;
-                                if (ex.kind === 189 /* PropertyAccessExpression */) {
+                                if (ex.kind === 190 /* PropertyAccessExpression */) {
                                     name = ex.name.escapedText;
                                 }
                                 else {
@@ -56648,9 +58711,9 @@ var ts;
             }
         }
         function isConstantMemberAccess(node) {
-            return node.kind === 72 /* Identifier */ ||
-                node.kind === 189 /* PropertyAccessExpression */ && isConstantMemberAccess(node.expression) ||
-                node.kind === 190 /* ElementAccessExpression */ && isConstantMemberAccess(node.expression) &&
+            return node.kind === 73 /* Identifier */ ||
+                node.kind === 190 /* PropertyAccessExpression */ && isConstantMemberAccess(node.expression) ||
+                node.kind === 191 /* ElementAccessExpression */ && isConstantMemberAccess(node.expression) &&
                     node.argumentExpression.kind === 10 /* StringLiteral */;
         }
         function checkEnumDeclaration(node) {
@@ -56685,7 +58748,7 @@ var ts;
                 var seenEnumMissingInitialInitializer_1 = false;
                 ts.forEach(enumSymbol.declarations, function (declaration) {
                     // return true if we hit a violation of the rule, false otherwise
-                    if (declaration.kind !== 243 /* EnumDeclaration */) {
+                    if (declaration.kind !== 244 /* EnumDeclaration */) {
                         return false;
                     }
                     var enumDeclaration = declaration;
@@ -56708,8 +58771,8 @@ var ts;
             var declarations = symbol.declarations;
             for (var _i = 0, declarations_8 = declarations; _i < declarations_8.length; _i++) {
                 var declaration = declarations_8[_i];
-                if ((declaration.kind === 240 /* ClassDeclaration */ ||
-                    (declaration.kind === 239 /* FunctionDeclaration */ && ts.nodeIsPresent(declaration.body))) &&
+                if ((declaration.kind === 241 /* ClassDeclaration */ ||
+                    (declaration.kind === 240 /* FunctionDeclaration */ && ts.nodeIsPresent(declaration.body))) &&
                     !(declaration.flags & 4194304 /* Ambient */)) {
                     return declaration;
                 }
@@ -56758,8 +58821,8 @@ var ts;
                 var symbol = getSymbolOfNode(node);
                 // The following checks only apply on a non-ambient instantiated module declaration.
                 if (symbol.flags & 512 /* ValueModule */
-                    && symbol.declarations.length > 1
                     && !inAmbientContext
+                    && symbol.declarations.length > 1
                     && isInstantiatedModule(node, !!compilerOptions.preserveConstEnums || !!compilerOptions.isolatedModules)) {
                     var firstNonAmbientClassOrFunc = getFirstNonAmbientClassOrFunctionDeclaration(symbol);
                     if (firstNonAmbientClassOrFunc) {
@@ -56772,7 +58835,7 @@ var ts;
                     }
                     // if the module merges with a class declaration in the same lexical scope,
                     // we need to track this to ensure the correct emit.
-                    var mergedClass = ts.getDeclarationOfKind(symbol, 240 /* ClassDeclaration */);
+                    var mergedClass = ts.getDeclarationOfKind(symbol, 241 /* ClassDeclaration */);
                     if (mergedClass &&
                         inSameLexicalScope(node, mergedClass)) {
                         getNodeLinks(node).flags |= 32768 /* LexicalModuleMergesWithClass */;
@@ -56822,23 +58885,23 @@ var ts;
         }
         function checkModuleAugmentationElement(node, isGlobalAugmentation) {
             switch (node.kind) {
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     // error each individual name in variable statement instead of marking the entire variable statement
                     for (var _i = 0, _a = node.declarationList.declarations; _i < _a.length; _i++) {
                         var decl = _a[_i];
                         checkModuleAugmentationElement(decl, isGlobalAugmentation);
                     }
                     break;
-                case 254 /* ExportAssignment */:
-                case 255 /* ExportDeclaration */:
+                case 255 /* ExportAssignment */:
+                case 256 /* ExportDeclaration */:
                     grammarErrorOnFirstToken(node, ts.Diagnostics.Exports_and_export_assignments_are_not_permitted_in_module_augmentations);
                     break;
-                case 248 /* ImportEqualsDeclaration */:
-                case 249 /* ImportDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
+                case 250 /* ImportDeclaration */:
                     grammarErrorOnFirstToken(node, ts.Diagnostics.Imports_are_not_permitted_in_module_augmentations_Consider_moving_them_to_the_enclosing_external_module);
                     break;
-                case 186 /* BindingElement */:
-                case 237 /* VariableDeclaration */:
+                case 187 /* BindingElement */:
+                case 238 /* VariableDeclaration */:
                     var name = node.name;
                     if (ts.isBindingPattern(name)) {
                         for (var _b = 0, _c = name.elements; _b < _c.length; _b++) {
@@ -56849,12 +58912,12 @@ var ts;
                         break;
                     }
                 // falls through
-                case 240 /* ClassDeclaration */:
-                case 243 /* EnumDeclaration */:
-                case 239 /* FunctionDeclaration */:
-                case 241 /* InterfaceDeclaration */:
-                case 244 /* ModuleDeclaration */:
-                case 242 /* TypeAliasDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 240 /* FunctionDeclaration */:
+                case 242 /* InterfaceDeclaration */:
+                case 245 /* ModuleDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
                     if (isGlobalAugmentation) {
                         return;
                     }
@@ -56875,17 +58938,17 @@ var ts;
         }
         function getFirstIdentifier(node) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return node;
-                case 148 /* QualifiedName */:
+                case 149 /* QualifiedName */:
                     do {
                         node = node.left;
-                    } while (node.kind !== 72 /* Identifier */);
+                    } while (node.kind !== 73 /* Identifier */);
                     return node;
-                case 189 /* PropertyAccessExpression */:
+                case 190 /* PropertyAccessExpression */:
                     do {
                         node = node.expression;
-                    } while (node.kind !== 72 /* Identifier */);
+                    } while (node.kind !== 73 /* Identifier */);
                     return node;
             }
         }
@@ -56899,9 +58962,9 @@ var ts;
                 error(moduleName, ts.Diagnostics.String_literal_expected);
                 return false;
             }
-            var inAmbientExternalModule = node.parent.kind === 245 /* ModuleBlock */ && ts.isAmbientModule(node.parent.parent);
-            if (node.parent.kind !== 284 /* SourceFile */ && !inAmbientExternalModule) {
-                error(moduleName, node.kind === 255 /* ExportDeclaration */ ?
+            var inAmbientExternalModule = node.parent.kind === 246 /* ModuleBlock */ && ts.isAmbientModule(node.parent.parent);
+            if (node.parent.kind !== 285 /* SourceFile */ && !inAmbientExternalModule) {
+                error(moduleName, node.kind === 256 /* ExportDeclaration */ ?
                     ts.Diagnostics.Export_declarations_are_not_permitted_in_a_namespace :
                     ts.Diagnostics.Import_declarations_in_a_namespace_cannot_reference_a_module);
                 return false;
@@ -56934,14 +58997,14 @@ var ts;
                     (symbol.flags & 67897832 /* Type */ ? 67897832 /* Type */ : 0) |
                     (symbol.flags & 1920 /* Namespace */ ? 1920 /* Namespace */ : 0);
                 if (target.flags & excludedMeanings) {
-                    var message = node.kind === 257 /* ExportSpecifier */ ?
+                    var message = node.kind === 258 /* ExportSpecifier */ ?
                         ts.Diagnostics.Export_declaration_conflicts_with_exported_declaration_of_0 :
                         ts.Diagnostics.Import_declaration_conflicts_with_local_declaration_of_0;
                     error(node, message, symbolToString(symbol));
                 }
                 // Don't allow to re-export something with no value side when `--isolatedModules` is set.
                 if (compilerOptions.isolatedModules
-                    && node.kind === 257 /* ExportSpecifier */
+                    && node.kind === 258 /* ExportSpecifier */
                     && !(target.flags & 67220415 /* Value */)
                     && !(node.flags & 4194304 /* Ambient */)) {
                     error(node, ts.Diagnostics.Cannot_re_export_a_type_when_the_isolatedModules_flag_is_provided);
@@ -56968,7 +59031,7 @@ var ts;
                         checkImportBinding(importClause);
                     }
                     if (importClause.namedBindings) {
-                        if (importClause.namedBindings.kind === 251 /* NamespaceImport */) {
+                        if (importClause.namedBindings.kind === 252 /* NamespaceImport */) {
                             checkImportBinding(importClause.namedBindings);
                         }
                         else {
@@ -56992,7 +59055,7 @@ var ts;
                 if (ts.hasModifier(node, 1 /* Export */)) {
                     markExportAsReferenced(node);
                 }
-                if (node.moduleReference.kind !== 259 /* ExternalModuleReference */) {
+                if (node.moduleReference.kind !== 260 /* ExternalModuleReference */) {
                     var target = resolveAlias(getSymbolOfNode(node));
                     if (target !== unknownSymbol) {
                         if (target.flags & 67220415 /* Value */) {
@@ -57028,10 +59091,10 @@ var ts;
                     // export { x, y }
                     // export { x, y } from "foo"
                     ts.forEach(node.exportClause.elements, checkExportSpecifier);
-                    var inAmbientExternalModule = node.parent.kind === 245 /* ModuleBlock */ && ts.isAmbientModule(node.parent.parent);
-                    var inAmbientNamespaceDeclaration = !inAmbientExternalModule && node.parent.kind === 245 /* ModuleBlock */ &&
+                    var inAmbientExternalModule = node.parent.kind === 246 /* ModuleBlock */ && ts.isAmbientModule(node.parent.parent);
+                    var inAmbientNamespaceDeclaration = !inAmbientExternalModule && node.parent.kind === 246 /* ModuleBlock */ &&
                         !node.moduleSpecifier && node.flags & 4194304 /* Ambient */;
-                    if (node.parent.kind !== 284 /* SourceFile */ && !inAmbientExternalModule && !inAmbientNamespaceDeclaration) {
+                    if (node.parent.kind !== 285 /* SourceFile */ && !inAmbientExternalModule && !inAmbientNamespaceDeclaration) {
                         error(node, ts.Diagnostics.Export_declarations_are_not_permitted_in_a_namespace);
                     }
                 }
@@ -57042,13 +59105,13 @@ var ts;
                         error(node.moduleSpecifier, ts.Diagnostics.Module_0_uses_export_and_cannot_be_used_with_export_Asterisk, symbolToString(moduleSymbol));
                     }
                     if (moduleKind !== ts.ModuleKind.System && moduleKind !== ts.ModuleKind.ES2015 && moduleKind !== ts.ModuleKind.ESNext) {
-                        checkExternalEmitHelpers(node, 32768 /* ExportStar */);
+                        checkExternalEmitHelpers(node, 65536 /* ExportStar */);
                     }
                 }
             }
         }
         function checkGrammarModuleElementContext(node, errorMessage) {
-            var isInAppropriateContext = node.parent.kind === 284 /* SourceFile */ || node.parent.kind === 245 /* ModuleBlock */ || node.parent.kind === 244 /* ModuleDeclaration */;
+            var isInAppropriateContext = node.parent.kind === 285 /* SourceFile */ || node.parent.kind === 246 /* ModuleBlock */ || node.parent.kind === 245 /* ModuleDeclaration */;
             if (!isInAppropriateContext) {
                 grammarErrorOnFirstToken(node, errorMessage);
             }
@@ -57077,8 +59140,8 @@ var ts;
                 // If we hit an export assignment in an illegal context, just bail out to avoid cascading errors.
                 return;
             }
-            var container = node.parent.kind === 284 /* SourceFile */ ? node.parent : node.parent.parent;
-            if (container.kind === 244 /* ModuleDeclaration */ && !ts.isAmbientModule(container)) {
+            var container = node.parent.kind === 285 /* SourceFile */ ? node.parent : node.parent.parent;
+            if (container.kind === 245 /* ModuleDeclaration */ && !ts.isAmbientModule(container)) {
                 if (node.isExportEquals) {
                     error(node, ts.Diagnostics.An_export_assignment_cannot_be_used_in_a_namespace);
                 }
@@ -57091,7 +59154,7 @@ var ts;
             if (!checkGrammarDecoratorsAndModifiers(node) && ts.hasModifiers(node)) {
                 grammarErrorOnFirstToken(node, ts.Diagnostics.An_export_assignment_cannot_have_modifiers);
             }
-            if (node.expression.kind === 72 /* Identifier */) {
+            if (node.expression.kind === 73 /* Identifier */) {
                 markExportAsReferenced(node);
                 if (ts.getEmitDeclarations(compilerOptions)) {
                     collectLinkedAliases(node.expression, /*setVisibility*/ true);
@@ -57166,13 +59229,14 @@ var ts;
             return !ts.isAccessor(declaration);
         }
         function isNotOverload(declaration) {
-            return (declaration.kind !== 239 /* FunctionDeclaration */ && declaration.kind !== 156 /* MethodDeclaration */) ||
+            return (declaration.kind !== 240 /* FunctionDeclaration */ && declaration.kind !== 157 /* MethodDeclaration */) ||
                 !!declaration.body;
         }
         function checkSourceElement(node) {
             if (node) {
                 var saveCurrentNode = currentNode;
                 currentNode = node;
+                instantiationCount = 0;
                 checkSourceElementWorker(node);
                 currentNode = saveCurrentNode;
             }
@@ -57189,158 +59253,158 @@ var ts;
                 // Only bother checking on a few construct kinds.  We don't want to be excessively
                 // hitting the cancellation token on every node we check.
                 switch (kind) {
-                    case 244 /* ModuleDeclaration */:
-                    case 240 /* ClassDeclaration */:
-                    case 241 /* InterfaceDeclaration */:
-                    case 239 /* FunctionDeclaration */:
+                    case 245 /* ModuleDeclaration */:
+                    case 241 /* ClassDeclaration */:
+                    case 242 /* InterfaceDeclaration */:
+                    case 240 /* FunctionDeclaration */:
                         cancellationToken.throwIfCancellationRequested();
                 }
             }
             switch (kind) {
-                case 150 /* TypeParameter */:
+                case 151 /* TypeParameter */:
                     return checkTypeParameter(node);
-                case 151 /* Parameter */:
+                case 152 /* Parameter */:
                     return checkParameter(node);
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
                     return checkPropertyDeclaration(node);
-                case 165 /* FunctionType */:
-                case 166 /* ConstructorType */:
-                case 160 /* CallSignature */:
-                case 161 /* ConstructSignature */:
-                case 162 /* IndexSignature */:
+                case 166 /* FunctionType */:
+                case 167 /* ConstructorType */:
+                case 161 /* CallSignature */:
+                case 162 /* ConstructSignature */:
+                case 163 /* IndexSignature */:
                     return checkSignatureDeclaration(node);
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
                     return checkMethodDeclaration(node);
-                case 157 /* Constructor */:
+                case 158 /* Constructor */:
                     return checkConstructorDeclaration(node);
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     return checkAccessorDeclaration(node);
-                case 164 /* TypeReference */:
+                case 165 /* TypeReference */:
                     return checkTypeReferenceNode(node);
-                case 163 /* TypePredicate */:
+                case 164 /* TypePredicate */:
                     return checkTypePredicate(node);
-                case 167 /* TypeQuery */:
+                case 168 /* TypeQuery */:
                     return checkTypeQuery(node);
-                case 168 /* TypeLiteral */:
+                case 169 /* TypeLiteral */:
                     return checkTypeLiteral(node);
-                case 169 /* ArrayType */:
+                case 170 /* ArrayType */:
                     return checkArrayType(node);
-                case 170 /* TupleType */:
+                case 171 /* TupleType */:
                     return checkTupleType(node);
-                case 173 /* UnionType */:
-                case 174 /* IntersectionType */:
+                case 174 /* UnionType */:
+                case 175 /* IntersectionType */:
                     return checkUnionOrIntersectionType(node);
-                case 177 /* ParenthesizedType */:
-                case 171 /* OptionalType */:
-                case 172 /* RestType */:
+                case 178 /* ParenthesizedType */:
+                case 172 /* OptionalType */:
+                case 173 /* RestType */:
                     return checkSourceElement(node.type);
-                case 178 /* ThisType */:
+                case 179 /* ThisType */:
                     return checkThisType(node);
-                case 179 /* TypeOperator */:
+                case 180 /* TypeOperator */:
                     return checkTypeOperator(node);
-                case 175 /* ConditionalType */:
+                case 176 /* ConditionalType */:
                     return checkConditionalType(node);
-                case 176 /* InferType */:
+                case 177 /* InferType */:
                     return checkInferType(node);
-                case 183 /* ImportType */:
+                case 184 /* ImportType */:
                     return checkImportType(node);
-                case 300 /* JSDocAugmentsTag */:
+                case 301 /* JSDocAugmentsTag */:
                     return checkJSDocAugmentsTag(node);
-                case 309 /* JSDocTypedefTag */:
-                case 302 /* JSDocCallbackTag */:
+                case 311 /* JSDocTypedefTag */:
+                case 304 /* JSDocCallbackTag */:
                     return checkJSDocTypeAliasTag(node);
-                case 308 /* JSDocTemplateTag */:
+                case 310 /* JSDocTemplateTag */:
                     return checkJSDocTemplateTag(node);
-                case 307 /* JSDocTypeTag */:
+                case 309 /* JSDocTypeTag */:
                     return checkJSDocTypeTag(node);
-                case 304 /* JSDocParameterTag */:
+                case 306 /* JSDocParameterTag */:
                     return checkJSDocParameterTag(node);
-                case 294 /* JSDocFunctionType */:
+                case 295 /* JSDocFunctionType */:
                     checkJSDocFunctionType(node);
                 // falls through
-                case 292 /* JSDocNonNullableType */:
-                case 291 /* JSDocNullableType */:
-                case 289 /* JSDocAllType */:
-                case 290 /* JSDocUnknownType */:
-                case 297 /* JSDocTypeLiteral */:
+                case 293 /* JSDocNonNullableType */:
+                case 292 /* JSDocNullableType */:
+                case 290 /* JSDocAllType */:
+                case 291 /* JSDocUnknownType */:
+                case 298 /* JSDocTypeLiteral */:
                     checkJSDocTypeIsInJsFile(node);
                     ts.forEachChild(node, checkSourceElement);
                     return;
-                case 295 /* JSDocVariadicType */:
+                case 296 /* JSDocVariadicType */:
                     checkJSDocVariadicType(node);
                     return;
-                case 288 /* JSDocTypeExpression */:
+                case 289 /* JSDocTypeExpression */:
                     return checkSourceElement(node.type);
-                case 180 /* IndexedAccessType */:
+                case 181 /* IndexedAccessType */:
                     return checkIndexedAccessType(node);
-                case 181 /* MappedType */:
+                case 182 /* MappedType */:
                     return checkMappedType(node);
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     return checkFunctionDeclaration(node);
-                case 218 /* Block */:
-                case 245 /* ModuleBlock */:
+                case 219 /* Block */:
+                case 246 /* ModuleBlock */:
                     return checkBlock(node);
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     return checkVariableStatement(node);
-                case 221 /* ExpressionStatement */:
+                case 222 /* ExpressionStatement */:
                     return checkExpressionStatement(node);
-                case 222 /* IfStatement */:
+                case 223 /* IfStatement */:
                     return checkIfStatement(node);
-                case 223 /* DoStatement */:
+                case 224 /* DoStatement */:
                     return checkDoStatement(node);
-                case 224 /* WhileStatement */:
+                case 225 /* WhileStatement */:
                     return checkWhileStatement(node);
-                case 225 /* ForStatement */:
+                case 226 /* ForStatement */:
                     return checkForStatement(node);
-                case 226 /* ForInStatement */:
+                case 227 /* ForInStatement */:
                     return checkForInStatement(node);
-                case 227 /* ForOfStatement */:
+                case 228 /* ForOfStatement */:
                     return checkForOfStatement(node);
-                case 228 /* ContinueStatement */:
-                case 229 /* BreakStatement */:
+                case 229 /* ContinueStatement */:
+                case 230 /* BreakStatement */:
                     return checkBreakOrContinueStatement(node);
-                case 230 /* ReturnStatement */:
+                case 231 /* ReturnStatement */:
                     return checkReturnStatement(node);
-                case 231 /* WithStatement */:
+                case 232 /* WithStatement */:
                     return checkWithStatement(node);
-                case 232 /* SwitchStatement */:
+                case 233 /* SwitchStatement */:
                     return checkSwitchStatement(node);
-                case 233 /* LabeledStatement */:
+                case 234 /* LabeledStatement */:
                     return checkLabeledStatement(node);
-                case 234 /* ThrowStatement */:
+                case 235 /* ThrowStatement */:
                     return checkThrowStatement(node);
-                case 235 /* TryStatement */:
+                case 236 /* TryStatement */:
                     return checkTryStatement(node);
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     return checkVariableDeclaration(node);
-                case 186 /* BindingElement */:
+                case 187 /* BindingElement */:
                     return checkBindingElement(node);
-                case 240 /* ClassDeclaration */:
+                case 241 /* ClassDeclaration */:
                     return checkClassDeclaration(node);
-                case 241 /* InterfaceDeclaration */:
+                case 242 /* InterfaceDeclaration */:
                     return checkInterfaceDeclaration(node);
-                case 242 /* TypeAliasDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
                     return checkTypeAliasDeclaration(node);
-                case 243 /* EnumDeclaration */:
+                case 244 /* EnumDeclaration */:
                     return checkEnumDeclaration(node);
-                case 244 /* ModuleDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     return checkModuleDeclaration(node);
-                case 249 /* ImportDeclaration */:
+                case 250 /* ImportDeclaration */:
                     return checkImportDeclaration(node);
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return checkImportEqualsDeclaration(node);
-                case 255 /* ExportDeclaration */:
+                case 256 /* ExportDeclaration */:
                     return checkExportDeclaration(node);
-                case 254 /* ExportAssignment */:
+                case 255 /* ExportAssignment */:
                     return checkExportAssignment(node);
-                case 220 /* EmptyStatement */:
-                case 236 /* DebuggerStatement */:
+                case 221 /* EmptyStatement */:
+                case 237 /* DebuggerStatement */:
                     checkGrammarStatementInAmbientContext(node);
                     return;
-                case 258 /* MissingDeclaration */:
+                case 259 /* MissingDeclaration */:
                     return checkMissingDeclaration(node);
             }
         }
@@ -57433,24 +59497,25 @@ var ts;
         function checkDeferredNode(node) {
             var saveCurrentNode = currentNode;
             currentNode = node;
+            instantiationCount = 0;
             switch (node.kind) {
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
                     checkFunctionExpressionOrObjectLiteralMethodDeferred(node);
                     break;
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     checkAccessorDeclaration(node);
                     break;
-                case 209 /* ClassExpression */:
+                case 210 /* ClassExpression */:
                     checkClassExpressionDeferred(node);
                     break;
-                case 261 /* JsxSelfClosingElement */:
+                case 262 /* JsxSelfClosingElement */:
                     checkJsxSelfClosingElementDeferred(node);
                     break;
-                case 260 /* JsxElement */:
+                case 261 /* JsxElement */:
                     checkJsxElementDeferred(node);
                     break;
             }
@@ -57580,17 +59645,17 @@ var ts;
                         copySymbols(location.locals, meaning);
                     }
                     switch (location.kind) {
-                        case 284 /* SourceFile */:
+                        case 285 /* SourceFile */:
                             if (!ts.isExternalOrCommonJsModule(location))
                                 break;
                         // falls through
-                        case 244 /* ModuleDeclaration */:
+                        case 245 /* ModuleDeclaration */:
                             copySymbols(getSymbolOfNode(location).exports, meaning & 2623475 /* ModuleMember */);
                             break;
-                        case 243 /* EnumDeclaration */:
+                        case 244 /* EnumDeclaration */:
                             copySymbols(getSymbolOfNode(location).exports, meaning & 8 /* EnumMember */);
                             break;
-                        case 209 /* ClassExpression */:
+                        case 210 /* ClassExpression */:
                             var className = location.name;
                             if (className) {
                                 copySymbol(location.symbol, meaning);
@@ -57598,8 +59663,8 @@ var ts;
                         // falls through
                         // this fall-through is necessary because we would like to handle
                         // type parameter inside class expression similar to how we handle it in classDeclaration and interface Declaration
-                        case 240 /* ClassDeclaration */:
-                        case 241 /* InterfaceDeclaration */:
+                        case 241 /* ClassDeclaration */:
+                        case 242 /* InterfaceDeclaration */:
                             // If we didn't come from static member of class or interface,
                             // add the type parameters into the symbol table
                             // (type parameters of classDeclaration/classExpression and interface are in member property of the symbol.
@@ -57608,7 +59673,7 @@ var ts;
                                 copySymbols(getMembersOfSymbol(getSymbolOfNode(location)), meaning & 67897832 /* Type */);
                             }
                             break;
-                        case 196 /* FunctionExpression */:
+                        case 197 /* FunctionExpression */:
                             var funcName = location.name;
                             if (funcName) {
                                 copySymbol(location.symbol, meaning);
@@ -57650,17 +59715,17 @@ var ts;
             }
         }
         function isTypeDeclarationName(name) {
-            return name.kind === 72 /* Identifier */ &&
+            return name.kind === 73 /* Identifier */ &&
                 isTypeDeclaration(name.parent) &&
                 name.parent.name === name;
         }
         function isTypeDeclaration(node) {
             switch (node.kind) {
-                case 150 /* TypeParameter */:
-                case 240 /* ClassDeclaration */:
-                case 241 /* InterfaceDeclaration */:
-                case 242 /* TypeAliasDeclaration */:
-                case 243 /* EnumDeclaration */:
+                case 151 /* TypeParameter */:
+                case 241 /* ClassDeclaration */:
+                case 242 /* InterfaceDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
+                case 244 /* EnumDeclaration */:
                     return true;
                 default:
                     return false;
@@ -57668,16 +59733,16 @@ var ts;
         }
         // True if the given identifier is part of a type reference
         function isTypeReferenceIdentifier(node) {
-            while (node.parent.kind === 148 /* QualifiedName */) {
+            while (node.parent.kind === 149 /* QualifiedName */) {
                 node = node.parent;
             }
-            return node.parent.kind === 164 /* TypeReference */;
+            return node.parent.kind === 165 /* TypeReference */;
         }
         function isHeritageClauseElementIdentifier(node) {
-            while (node.parent.kind === 189 /* PropertyAccessExpression */) {
+            while (node.parent.kind === 190 /* PropertyAccessExpression */) {
                 node = node.parent;
             }
-            return node.parent.kind === 211 /* ExpressionWithTypeArguments */;
+            return node.parent.kind === 212 /* ExpressionWithTypeArguments */;
         }
         function forEachEnclosingClass(node, callback) {
             var result;
@@ -57705,13 +59770,13 @@ var ts;
             return !!forEachEnclosingClass(node, function (n) { return n === classDeclaration; });
         }
         function getLeftSideOfImportEqualsOrExportAssignment(nodeOnRightSide) {
-            while (nodeOnRightSide.parent.kind === 148 /* QualifiedName */) {
+            while (nodeOnRightSide.parent.kind === 149 /* QualifiedName */) {
                 nodeOnRightSide = nodeOnRightSide.parent;
             }
-            if (nodeOnRightSide.parent.kind === 248 /* ImportEqualsDeclaration */) {
+            if (nodeOnRightSide.parent.kind === 249 /* ImportEqualsDeclaration */) {
                 return nodeOnRightSide.parent.moduleReference === nodeOnRightSide ? nodeOnRightSide.parent : undefined;
             }
-            if (nodeOnRightSide.parent.kind === 254 /* ExportAssignment */) {
+            if (nodeOnRightSide.parent.kind === 255 /* ExportAssignment */) {
                 return nodeOnRightSide.parent.expression === nodeOnRightSide ? nodeOnRightSide.parent : undefined;
             }
             return undefined;
@@ -57737,7 +59802,7 @@ var ts;
                 node = parent;
                 parent = parent.parent;
             }
-            if (parent && parent.kind === 183 /* ImportType */ && parent.qualifier === node) {
+            if (parent && parent.kind === 184 /* ImportType */ && parent.qualifier === node) {
                 return parent;
             }
             return undefined;
@@ -57747,7 +59812,7 @@ var ts;
                 return getSymbolOfNode(entityName.parent);
             }
             if (ts.isInJSFile(entityName) &&
-                entityName.parent.kind === 189 /* PropertyAccessExpression */ &&
+                entityName.parent.kind === 190 /* PropertyAccessExpression */ &&
                 entityName.parent === entityName.parent.parent.left) {
                 // Check if this is a special property assignment
                 var specialPropertyAssignmentSymbol = getSpecialPropertyAssignmentSymbolFromEntityName(entityName);
@@ -57755,7 +59820,7 @@ var ts;
                     return specialPropertyAssignmentSymbol;
                 }
             }
-            if (entityName.parent.kind === 254 /* ExportAssignment */ && ts.isEntityNameExpression(entityName)) {
+            if (entityName.parent.kind === 255 /* ExportAssignment */ && ts.isEntityNameExpression(entityName)) {
                 // Even an entity name expression that doesn't resolve as an entityname may still typecheck as a property access expression
                 var success = resolveEntityName(entityName, 
                 /*all meanings*/ 67220415 /* Value */ | 67897832 /* Type */ | 1920 /* Namespace */ | 2097152 /* Alias */, /*ignoreErrors*/ true);
@@ -57765,7 +59830,7 @@ var ts;
             }
             else if (!ts.isPropertyAccessExpression(entityName) && isInRightSideOfImportOrExportAssignment(entityName)) {
                 // Since we already checked for ExportAssignment, this really could only be an Import
-                var importEqualsDeclaration = ts.getAncestor(entityName, 248 /* ImportEqualsDeclaration */);
+                var importEqualsDeclaration = ts.getAncestor(entityName, 249 /* ImportEqualsDeclaration */);
                 ts.Debug.assert(importEqualsDeclaration !== undefined);
                 return getSymbolOfPartOfRightHandSideOfImportEquals(entityName, /*dontResolveAlias*/ true);
             }
@@ -57783,7 +59848,7 @@ var ts;
             if (isHeritageClauseElementIdentifier(entityName)) {
                 var meaning = 0 /* None */;
                 // In an interface or class, we're definitely interested in a type.
-                if (entityName.parent.kind === 211 /* ExpressionWithTypeArguments */) {
+                if (entityName.parent.kind === 212 /* ExpressionWithTypeArguments */) {
                     meaning = 67897832 /* Type */;
                     // In a class 'extends' clause we are also looking for a value.
                     if (ts.isExpressionWithTypeArgumentsInClassExtendsClause(entityName.parent)) {
@@ -57799,10 +59864,10 @@ var ts;
                     return entityNameSymbol;
                 }
             }
-            if (entityName.parent.kind === 304 /* JSDocParameterTag */) {
+            if (entityName.parent.kind === 306 /* JSDocParameterTag */) {
                 return ts.getParameterSymbolFromJSDoc(entityName.parent);
             }
-            if (entityName.parent.kind === 150 /* TypeParameter */ && entityName.parent.parent.kind === 308 /* JSDocTemplateTag */) {
+            if (entityName.parent.kind === 151 /* TypeParameter */ && entityName.parent.parent.kind === 310 /* JSDocTemplateTag */) {
                 ts.Debug.assert(!ts.isInJSFile(entityName)); // Otherwise `isDeclarationName` would have been true.
                 var typeParameter = ts.getTypeParameterFromJsDoc(entityName.parent);
                 return typeParameter && typeParameter.symbol;
@@ -57812,19 +59877,19 @@ var ts;
                     // Missing entity name.
                     return undefined;
                 }
-                if (entityName.kind === 72 /* Identifier */) {
+                if (entityName.kind === 73 /* Identifier */) {
                     if (ts.isJSXTagName(entityName) && isJsxIntrinsicIdentifier(entityName)) {
                         var symbol = getIntrinsicTagSymbol(entityName.parent);
                         return symbol === unknownSymbol ? undefined : symbol;
                     }
                     return resolveEntityName(entityName, 67220415 /* Value */, /*ignoreErrors*/ false, /*dontResolveAlias*/ true);
                 }
-                else if (entityName.kind === 189 /* PropertyAccessExpression */ || entityName.kind === 148 /* QualifiedName */) {
+                else if (entityName.kind === 190 /* PropertyAccessExpression */ || entityName.kind === 149 /* QualifiedName */) {
                     var links = getNodeLinks(entityName);
                     if (links.resolvedSymbol) {
                         return links.resolvedSymbol;
                     }
-                    if (entityName.kind === 189 /* PropertyAccessExpression */) {
+                    if (entityName.kind === 190 /* PropertyAccessExpression */) {
                         checkPropertyAccessExpression(entityName);
                     }
                     else {
@@ -57834,17 +59899,17 @@ var ts;
                 }
             }
             else if (isTypeReferenceIdentifier(entityName)) {
-                var meaning = entityName.parent.kind === 164 /* TypeReference */ ? 67897832 /* Type */ : 1920 /* Namespace */;
+                var meaning = entityName.parent.kind === 165 /* TypeReference */ ? 67897832 /* Type */ : 1920 /* Namespace */;
                 return resolveEntityName(entityName, meaning, /*ignoreErrors*/ false, /*dontResolveAlias*/ true);
             }
-            if (entityName.parent.kind === 163 /* TypePredicate */) {
+            if (entityName.parent.kind === 164 /* TypePredicate */) {
                 return resolveEntityName(entityName, /*meaning*/ 1 /* FunctionScopedVariable */);
             }
             // Do we want to return undefined here?
             return undefined;
         }
         function getSymbolAtLocation(node) {
-            if (node.kind === 284 /* SourceFile */) {
+            if (node.kind === 285 /* SourceFile */) {
                 return ts.isExternalModule(node) ? getMergedSymbol(node.symbol) : undefined;
             }
             var parent = node.parent;
@@ -57863,12 +59928,12 @@ var ts;
             else if (ts.isLiteralComputedPropertyDeclarationName(node)) {
                 return getSymbolOfNode(parent.parent);
             }
-            if (node.kind === 72 /* Identifier */) {
+            if (node.kind === 73 /* Identifier */) {
                 if (isInRightSideOfImportOrExportAssignment(node)) {
                     return getSymbolOfEntityNameOrPropertyAccessExpression(node);
                 }
-                else if (parent.kind === 186 /* BindingElement */ &&
-                    grandParent.kind === 184 /* ObjectBindingPattern */ &&
+                else if (parent.kind === 187 /* BindingElement */ &&
+                    grandParent.kind === 185 /* ObjectBindingPattern */ &&
                     node === parent.propertyName) {
                     var typeOfPattern = getTypeOfNode(grandParent);
                     var propertyDeclaration = getPropertyOfType(typeOfPattern, node.escapedText);
@@ -57878,11 +59943,11 @@ var ts;
                 }
             }
             switch (node.kind) {
-                case 72 /* Identifier */:
-                case 189 /* PropertyAccessExpression */:
-                case 148 /* QualifiedName */:
+                case 73 /* Identifier */:
+                case 190 /* PropertyAccessExpression */:
+                case 149 /* QualifiedName */:
                     return getSymbolOfEntityNameOrPropertyAccessExpression(node);
-                case 100 /* ThisKeyword */:
+                case 101 /* ThisKeyword */:
                     var container = ts.getThisContainer(node, /*includeArrowFunctions*/ false);
                     if (ts.isFunctionLike(container)) {
                         var sig = getSignatureFromDeclaration(container);
@@ -57894,14 +59959,14 @@ var ts;
                         return checkExpression(node).symbol;
                     }
                 // falls through
-                case 178 /* ThisType */:
+                case 179 /* ThisType */:
                     return getTypeFromThisTypeNode(node).symbol;
-                case 98 /* SuperKeyword */:
+                case 99 /* SuperKeyword */:
                     return checkExpression(node).symbol;
-                case 124 /* ConstructorKeyword */:
+                case 125 /* ConstructorKeyword */:
                     // constructor keyword for an overload, should take us to the definition if it exist
                     var constructorDeclaration = node.parent;
-                    if (constructorDeclaration && constructorDeclaration.kind === 157 /* Constructor */) {
+                    if (constructorDeclaration && constructorDeclaration.kind === 158 /* Constructor */) {
                         return constructorDeclaration.parent.symbol;
                     }
                     return undefined;
@@ -57912,7 +59977,7 @@ var ts;
                     // 3). Dynamic import call or require in javascript
                     // 4). type A = import("./f/*gotToDefinitionHere*/oo")
                     if ((ts.isExternalModuleImportEqualsDeclaration(node.parent.parent) && ts.getExternalModuleImportEqualsDeclarationExpression(node.parent.parent) === node) ||
-                        ((node.parent.kind === 249 /* ImportDeclaration */ || node.parent.kind === 255 /* ExportDeclaration */) && node.parent.moduleSpecifier === node) ||
+                        ((node.parent.kind === 250 /* ImportDeclaration */ || node.parent.kind === 256 /* ExportDeclaration */) && node.parent.moduleSpecifier === node) ||
                         ((ts.isInJSFile(node) && ts.isRequireCall(node.parent, /*checkArgumentIsStringLiteralLike*/ false)) || ts.isImportCall(node.parent)) ||
                         (ts.isLiteralTypeNode(node.parent) && ts.isLiteralImportTypeNode(node.parent.parent) && node.parent.parent.argument === node.parent)) {
                         return resolveExternalModuleName(node, node);
@@ -57929,21 +59994,21 @@ var ts;
                             ? getTypeFromTypeNode(grandParent.objectType)
                             : undefined;
                     return objectType && getPropertyOfType(objectType, ts.escapeLeadingUnderscores(node.text));
-                case 80 /* DefaultKeyword */:
-                case 90 /* FunctionKeyword */:
+                case 81 /* DefaultKeyword */:
+                case 91 /* FunctionKeyword */:
                 case 37 /* EqualsGreaterThanToken */:
-                case 76 /* ClassKeyword */:
+                case 77 /* ClassKeyword */:
                     return getSymbolOfNode(node.parent);
-                case 183 /* ImportType */:
+                case 184 /* ImportType */:
                     return ts.isLiteralImportTypeNode(node) ? getSymbolAtLocation(node.argument.literal) : undefined;
-                case 85 /* ExportKeyword */:
+                case 86 /* ExportKeyword */:
                     return ts.isExportAssignment(node.parent) ? ts.Debug.assertDefined(node.parent.symbol) : undefined;
                 default:
                     return undefined;
             }
         }
         function getShorthandAssignmentValueSymbol(location) {
-            if (location && location.kind === 276 /* ShorthandPropertyAssignment */) {
+            if (location && location.kind === 277 /* ShorthandPropertyAssignment */) {
                 return resolveEntityName(location.name, 67220415 /* Value */ | 2097152 /* Alias */);
             }
             return undefined;
@@ -58010,33 +60075,35 @@ var ts;
         //     }
         // [ a ] from
         //     [a] = [ some array ...]
-        function getTypeOfArrayLiteralOrObjectLiteralDestructuringAssignment(expr) {
-            ts.Debug.assert(expr.kind === 188 /* ObjectLiteralExpression */ || expr.kind === 187 /* ArrayLiteralExpression */);
+        function getTypeOfAssignmentPattern(expr) {
+            ts.Debug.assert(expr.kind === 189 /* ObjectLiteralExpression */ || expr.kind === 188 /* ArrayLiteralExpression */);
             // If this is from "for of"
             //     for ( { a } of elems) {
             //     }
-            if (expr.parent.kind === 227 /* ForOfStatement */) {
+            if (expr.parent.kind === 228 /* ForOfStatement */) {
                 var iteratedType = checkRightHandSideOfForOf(expr.parent.expression, expr.parent.awaitModifier);
                 return checkDestructuringAssignment(expr, iteratedType || errorType);
             }
             // If this is from "for" initializer
             //     for ({a } = elems[0];.....) { }
-            if (expr.parent.kind === 204 /* BinaryExpression */) {
+            if (expr.parent.kind === 205 /* BinaryExpression */) {
                 var iteratedType = getTypeOfExpression(expr.parent.right);
                 return checkDestructuringAssignment(expr, iteratedType || errorType);
             }
             // If this is from nested object binding pattern
             //     for ({ skills: { primary, secondary } } = multiRobot, i = 0; i < 1; i++) {
-            if (expr.parent.kind === 275 /* PropertyAssignment */) {
-                var typeOfParentObjectLiteral = getTypeOfArrayLiteralOrObjectLiteralDestructuringAssignment(expr.parent.parent);
-                return checkObjectLiteralDestructuringPropertyAssignment(typeOfParentObjectLiteral || errorType, expr.parent); // TODO: GH#18217
+            if (expr.parent.kind === 276 /* PropertyAssignment */) {
+                var node_3 = ts.cast(expr.parent.parent, ts.isObjectLiteralExpression);
+                var typeOfParentObjectLiteral = getTypeOfAssignmentPattern(node_3) || errorType;
+                var propertyIndex = ts.indexOfNode(node_3.properties, expr.parent);
+                return checkObjectLiteralDestructuringPropertyAssignment(node_3, typeOfParentObjectLiteral, propertyIndex);
             }
             // Array literal assignment - array destructuring pattern
-            ts.Debug.assert(expr.parent.kind === 187 /* ArrayLiteralExpression */);
+            var node = ts.cast(expr.parent, ts.isArrayLiteralExpression);
             //    [{ property1: p1, property2 }] = elems;
-            var typeOfArrayLiteral = getTypeOfArrayLiteralOrObjectLiteralDestructuringAssignment(expr.parent);
-            var elementType = checkIteratedTypeOrElementType(typeOfArrayLiteral || errorType, expr.parent, /*allowStringInput*/ false, /*allowAsyncIterables*/ false) || errorType;
-            return checkArrayLiteralDestructuringElementAssignment(expr.parent, typeOfArrayLiteral, expr.parent.elements.indexOf(expr), elementType || errorType); // TODO: GH#18217
+            var typeOfArrayLiteral = getTypeOfAssignmentPattern(node) || errorType;
+            var elementType = checkIteratedTypeOrElementType(65 /* Destructuring */, typeOfArrayLiteral, undefinedType, expr.parent) || errorType;
+            return checkArrayLiteralDestructuringElementAssignment(node, typeOfArrayLiteral, node.elements.indexOf(expr), elementType);
         }
         // Gets the property symbol corresponding to the property in destructuring assignment
         // 'property1' from
@@ -58046,7 +60113,7 @@ var ts;
         //     [a] = [ property1, property2 ]
         function getPropertySymbolOfDestructuringAssignment(location) {
             // Get the type of the object or array literal and then look for property of given name in the type
-            var typeOfObjectLiteral = getTypeOfArrayLiteralOrObjectLiteralDestructuringAssignment(location.parent.parent);
+            var typeOfObjectLiteral = getTypeOfAssignmentPattern(ts.cast(location.parent.parent, ts.isAssignmentPattern));
             return typeOfObjectLiteral && getPropertyOfType(typeOfObjectLiteral, location.escapedText);
         }
         function getRegularTypeOfExpression(expr) {
@@ -58068,12 +60135,12 @@ var ts;
         function getClassElementPropertyKeyType(element) {
             var name = element.name;
             switch (name.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return getLiteralType(ts.idText(name));
                 case 8 /* NumericLiteral */:
                 case 10 /* StringLiteral */:
                     return getLiteralType(name.text);
-                case 149 /* ComputedPropertyName */:
+                case 150 /* ComputedPropertyName */:
                     var nameType = checkComputedPropertyName(name);
                     return isTypeAssignableToKind(nameType, 12288 /* ESSymbolLike */) ? nameType : stringType;
                 default:
@@ -58130,7 +60197,7 @@ var ts;
             if (!ts.isGeneratedIdentifier(nodeIn)) {
                 var node = ts.getParseTreeNode(nodeIn, ts.isIdentifier);
                 if (node) {
-                    var isPropertyName_1 = node.parent.kind === 189 /* PropertyAccessExpression */ && node.parent.name === node;
+                    var isPropertyName_1 = node.parent.kind === 190 /* PropertyAccessExpression */ && node.parent.name === node;
                     return !isPropertyName_1 && getReferencedValueSymbol(node) === argumentsSymbol;
                 }
             }
@@ -58186,7 +60253,7 @@ var ts;
                     }
                     var parentSymbol_1 = getParentOfSymbol(symbol);
                     if (parentSymbol_1) {
-                        if (parentSymbol_1.flags & 512 /* ValueModule */ && parentSymbol_1.valueDeclaration.kind === 284 /* SourceFile */) {
+                        if (parentSymbol_1.flags & 512 /* ValueModule */ && parentSymbol_1.valueDeclaration.kind === 285 /* SourceFile */) {
                             var symbolFile = parentSymbol_1.valueDeclaration;
                             var referenceFile = ts.getSourceFileOfNode(node);
                             // If `node` accesses an export and that export isn't in the same file, then symbol is a namespace export, so return undefined.
@@ -58212,12 +60279,16 @@ var ts;
             }
             return undefined;
         }
+        function isSymbolOfDestructuredElementOfCatchBinding(symbol) {
+            return ts.isBindingElement(symbol.valueDeclaration)
+                && ts.walkUpBindingElementsAndPatterns(symbol.valueDeclaration).parent.kind === 275 /* CatchClause */;
+        }
         function isSymbolOfDeclarationWithCollidingName(symbol) {
-            if (symbol.flags & 418 /* BlockScoped */) {
+            if (symbol.flags & 418 /* BlockScoped */ && !ts.isSourceFile(symbol.valueDeclaration)) {
                 var links = getSymbolLinks(symbol);
                 if (links.isDeclarationWithCollidingName === undefined) {
                     var container = ts.getEnclosingBlockScopeContainer(symbol.valueDeclaration);
-                    if (ts.isStatementWithLocals(container)) {
+                    if (ts.isStatementWithLocals(container) || isSymbolOfDestructuredElementOfCatchBinding(symbol)) {
                         var nodeLinks_1 = getNodeLinks(symbol.valueDeclaration);
                         if (resolveName(container.parent, symbol.escapedName, 67220415 /* Value */, /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined, /*isUse*/ false)) {
                             // redeclaration - always should be renamed
@@ -58241,7 +60312,7 @@ var ts;
                             //       they will not collide with anything
                             var isDeclaredInLoop = nodeLinks_1.flags & 524288 /* BlockScopedBindingInLoop */;
                             var inLoopInitializer = ts.isIterationStatement(container, /*lookInLabeledStatements*/ false);
-                            var inLoopBodyBlock = container.kind === 218 /* Block */ && ts.isIterationStatement(container.parent, /*lookInLabeledStatements*/ false);
+                            var inLoopBodyBlock = container.kind === 219 /* Block */ && ts.isIterationStatement(container.parent, /*lookInLabeledStatements*/ false);
                             links.isDeclarationWithCollidingName = !ts.isBlockScopedContainerTopLevel(container) && (!isDeclaredInLoop || (!inLoopInitializer && !inLoopBodyBlock));
                         }
                         else {
@@ -58282,18 +60353,18 @@ var ts;
         }
         function isValueAliasDeclaration(node) {
             switch (node.kind) {
-                case 248 /* ImportEqualsDeclaration */:
-                case 250 /* ImportClause */:
-                case 251 /* NamespaceImport */:
-                case 253 /* ImportSpecifier */:
-                case 257 /* ExportSpecifier */:
+                case 249 /* ImportEqualsDeclaration */:
+                case 251 /* ImportClause */:
+                case 252 /* NamespaceImport */:
+                case 254 /* ImportSpecifier */:
+                case 258 /* ExportSpecifier */:
                     return isAliasResolvedToValue(getSymbolOfNode(node) || unknownSymbol);
-                case 255 /* ExportDeclaration */:
+                case 256 /* ExportDeclaration */:
                     var exportClause = node.exportClause;
                     return !!exportClause && ts.some(exportClause.elements, isValueAliasDeclaration);
-                case 254 /* ExportAssignment */:
+                case 255 /* ExportAssignment */:
                     return node.expression
-                        && node.expression.kind === 72 /* Identifier */
+                        && node.expression.kind === 73 /* Identifier */
                         ? isAliasResolvedToValue(getSymbolOfNode(node) || unknownSymbol)
                         : true;
             }
@@ -58301,7 +60372,7 @@ var ts;
         }
         function isTopLevelValueImportEqualsWithEntityName(nodeIn) {
             var node = ts.getParseTreeNode(nodeIn, ts.isImportEqualsDeclaration);
-            if (node === undefined || node.parent.kind !== 284 /* SourceFile */ || !ts.isInternalModuleImportEqualsDeclaration(node)) {
+            if (node === undefined || node.parent.kind !== 285 /* SourceFile */ || !ts.isInternalModuleImportEqualsDeclaration(node)) {
                 // parent is not source file or it is not reference to internal module
                 return false;
             }
@@ -58402,15 +60473,15 @@ var ts;
         }
         function canHaveConstantValue(node) {
             switch (node.kind) {
-                case 278 /* EnumMember */:
-                case 189 /* PropertyAccessExpression */:
-                case 190 /* ElementAccessExpression */:
+                case 279 /* EnumMember */:
+                case 190 /* PropertyAccessExpression */:
+                case 191 /* ElementAccessExpression */:
                     return true;
             }
             return false;
         }
         function getConstantValue(node) {
-            if (node.kind === 278 /* EnumMember */) {
+            if (node.kind === 279 /* EnumMember */) {
                 return getEnumMemberValue(node);
             }
             var symbol = getNodeLinks(node).resolvedSymbol;
@@ -58495,7 +60566,7 @@ var ts;
         function createTypeOfDeclaration(declarationIn, enclosingDeclaration, flags, tracker, addUndefined) {
             var declaration = ts.getParseTreeNode(declarationIn, ts.isVariableLikeOrAccessor);
             if (!declaration) {
-                return ts.createToken(120 /* AnyKeyword */);
+                return ts.createToken(121 /* AnyKeyword */);
             }
             // Get type of the symbol if this is the valid symbol otherwise get type at location
             var symbol = getSymbolOfNode(declaration);
@@ -58514,7 +60585,7 @@ var ts;
         function createReturnTypeOfSignatureDeclaration(signatureDeclarationIn, enclosingDeclaration, flags, tracker) {
             var signatureDeclaration = ts.getParseTreeNode(signatureDeclarationIn, ts.isFunctionLike);
             if (!signatureDeclaration) {
-                return ts.createToken(120 /* AnyKeyword */);
+                return ts.createToken(121 /* AnyKeyword */);
             }
             var signature = getSignatureFromDeclaration(signatureDeclaration);
             return nodeBuilder.typeToTypeNode(getReturnTypeOfSignature(signature), enclosingDeclaration, flags | 1024 /* MultilineObjectLiterals */, tracker);
@@ -58522,7 +60593,7 @@ var ts;
         function createTypeOfExpression(exprIn, enclosingDeclaration, flags, tracker) {
             var expr = ts.getParseTreeNode(exprIn, ts.isExpression);
             if (!expr) {
-                return ts.createToken(120 /* AnyKeyword */);
+                return ts.createToken(121 /* AnyKeyword */);
             }
             var type = getWidenedType(getRegularTypeOfExpression(expr));
             return nodeBuilder.typeToTypeNode(type, enclosingDeclaration, flags | 1024 /* MultilineObjectLiterals */, tracker);
@@ -58641,17 +60712,17 @@ var ts;
                 isLateBound: function (nodeIn) {
                     var node = ts.getParseTreeNode(nodeIn, ts.isDeclaration);
                     var symbol = node && getSymbolOfNode(node);
-                    return !!(symbol && ts.getCheckFlags(symbol) & 2048 /* Late */);
+                    return !!(symbol && ts.getCheckFlags(symbol) & 4096 /* Late */);
                 },
                 getJsxFactoryEntity: function (location) { return location ? (getJsxNamespace(location), (ts.getSourceFileOfNode(location).localJsxFactory || _jsxFactoryEntity)) : _jsxFactoryEntity; },
                 getAllAccessorDeclarations: function (accessor) {
                     accessor = ts.getParseTreeNode(accessor, ts.isGetOrSetAccessorDeclaration); // TODO: GH#18217
-                    var otherKind = accessor.kind === 159 /* SetAccessor */ ? 158 /* GetAccessor */ : 159 /* SetAccessor */;
+                    var otherKind = accessor.kind === 160 /* SetAccessor */ ? 159 /* GetAccessor */ : 160 /* SetAccessor */;
                     var otherAccessor = ts.getDeclarationOfKind(getSymbolOfNode(accessor), otherKind);
                     var firstAccessor = otherAccessor && (otherAccessor.pos < accessor.pos) ? otherAccessor : accessor;
                     var secondAccessor = otherAccessor && (otherAccessor.pos < accessor.pos) ? accessor : otherAccessor;
-                    var setAccessor = accessor.kind === 159 /* SetAccessor */ ? accessor : otherAccessor;
-                    var getAccessor = accessor.kind === 158 /* GetAccessor */ ? accessor : otherAccessor;
+                    var setAccessor = accessor.kind === 160 /* SetAccessor */ ? accessor : otherAccessor;
+                    var getAccessor = accessor.kind === 159 /* GetAccessor */ ? accessor : otherAccessor;
                     return {
                         firstAccessor: firstAccessor,
                         secondAccessor: secondAccessor,
@@ -58667,7 +60738,7 @@ var ts;
                 }
             };
             function isInHeritageClause(node) {
-                return node.parent && node.parent.kind === 211 /* ExpressionWithTypeArguments */ && node.parent.parent && node.parent.parent.kind === 273 /* HeritageClause */;
+                return node.parent && node.parent.kind === 212 /* ExpressionWithTypeArguments */ && node.parent.parent && node.parent.parent.kind === 274 /* HeritageClause */;
             }
             // defined here to avoid outer scope pollution
             function getTypeReferenceDirectivesForEntityName(node) {
@@ -58679,7 +60750,7 @@ var ts;
                 // qualified names can only be used as types\namespaces
                 // identifiers are treated as values only if they appear in type queries
                 var meaning = 67897832 /* Type */ | 1920 /* Namespace */;
-                if ((node.kind === 72 /* Identifier */ && isInTypeQuery(node)) || (node.kind === 189 /* PropertyAccessExpression */ && !isInHeritageClause(node))) {
+                if ((node.kind === 73 /* Identifier */ && isInTypeQuery(node)) || (node.kind === 190 /* PropertyAccessExpression */ && !isInHeritageClause(node))) {
                     meaning = 67220415 /* Value */ | 1048576 /* ExportValue */;
                 }
                 var symbol = resolveEntityName(node, meaning, /*ignoreErrors*/ true);
@@ -58730,7 +60801,7 @@ var ts;
                         break;
                     }
                 }
-                if (current.valueDeclaration && current.valueDeclaration.kind === 284 /* SourceFile */ && current.flags & 512 /* ValueModule */) {
+                if (current.valueDeclaration && current.valueDeclaration.kind === 285 /* SourceFile */ && current.flags & 512 /* ValueModule */) {
                     return false;
                 }
                 // check that at least one declaration of top level symbol originates from type declaration file
@@ -58758,12 +60829,12 @@ var ts;
             }
         }
         function getExternalModuleFileFromDeclaration(declaration) {
-            var specifier = declaration.kind === 244 /* ModuleDeclaration */ ? ts.tryCast(declaration.name, ts.isStringLiteral) : ts.getExternalModuleName(declaration);
+            var specifier = declaration.kind === 245 /* ModuleDeclaration */ ? ts.tryCast(declaration.name, ts.isStringLiteral) : ts.getExternalModuleName(declaration);
             var moduleSymbol = resolveExternalModuleNameWorker(specifier, specifier, /*moduleNotFoundError*/ undefined); // TODO: GH#18217
             if (!moduleSymbol) {
                 return undefined;
             }
-            return ts.getDeclarationOfKind(moduleSymbol, 284 /* SourceFile */);
+            return ts.getDeclarationOfKind(moduleSymbol, 285 /* SourceFile */);
         }
         function initializeTypeChecker() {
             // Bind all source files and propagate errors
@@ -58780,6 +60851,15 @@ var ts;
                     continue;
                 }
                 if (!ts.isExternalOrCommonJsModule(file)) {
+                    // It is an error for a non-external-module (i.e. script) to declare its own `globalThis`.
+                    // We can't use `builtinGlobals` for this due to synthetic expando-namespace generation in JS files.
+                    var fileGlobalThisSymbol = file.locals.get("globalThis");
+                    if (fileGlobalThisSymbol) {
+                        for (var _d = 0, _e = fileGlobalThisSymbol.declarations; _d < _e.length; _d++) {
+                            var declaration = _e[_d];
+                            diagnostics.add(ts.createDiagnosticForNode(declaration, ts.Diagnostics.Declaration_name_conflicts_with_built_in_global_identifier_0, "globalThis"));
+                        }
+                    }
                     mergeSymbolTable(globals, file.locals);
                 }
                 if (file.jsGlobalAugmentations) {
@@ -58810,10 +60890,10 @@ var ts;
             if (augmentations) {
                 // merge _global_ module augmentations.
                 // this needs to be done after global symbol table is initialized to make sure that all ambient modules are indexed
-                for (var _d = 0, augmentations_1 = augmentations; _d < augmentations_1.length; _d++) {
-                    var list = augmentations_1[_d];
-                    for (var _e = 0, list_1 = list; _e < list_1.length; _e++) {
-                        var augmentation = list_1[_e];
+                for (var _f = 0, augmentations_1 = augmentations; _f < augmentations_1.length; _f++) {
+                    var list = augmentations_1[_f];
+                    for (var _g = 0, list_1 = list; _g < list_1.length; _g++) {
+                        var augmentation = list_1[_g];
                         if (!ts.isGlobalScopeAugmentation(augmentation.parent))
                             continue;
                         mergeModuleAugmentation(augmentation);
@@ -58825,6 +60905,7 @@ var ts;
             getSymbolLinks(undefinedSymbol).type = undefinedWideningType;
             getSymbolLinks(argumentsSymbol).type = getGlobalType("IArguments", /*arity*/ 0, /*reportErrors*/ true);
             getSymbolLinks(unknownSymbol).type = errorType;
+            getSymbolLinks(globalThisSymbol).type = createObjectType(16 /* Anonymous */, globalThisSymbol);
             // Initialize special types
             globalArrayType = getGlobalType("Array", /*arity*/ 1, /*reportErrors*/ true);
             globalObjectType = getGlobalType("Object", /*arity*/ 0, /*reportErrors*/ true);
@@ -58841,16 +60922,16 @@ var ts;
                 // autoArrayType is used as a marker, so even if global Array type is not defined, it needs to be a unique type
                 autoArrayType = createAnonymousType(undefined, emptySymbols, ts.emptyArray, ts.emptyArray, undefined, undefined);
             }
-            globalReadonlyArrayType = getGlobalTypeOrUndefined("ReadonlyArray", /*arity*/ 1);
+            globalReadonlyArrayType = getGlobalTypeOrUndefined("ReadonlyArray", /*arity*/ 1) || globalArrayType;
             anyReadonlyArrayType = globalReadonlyArrayType ? createTypeFromGenericGlobalType(globalReadonlyArrayType, [anyType]) : anyArrayType;
             globalThisType = getGlobalTypeOrUndefined("ThisType", /*arity*/ 1);
             if (augmentations) {
                 // merge _nonglobal_ module augmentations.
                 // this needs to be done after global symbol table is initialized to make sure that all ambient modules are indexed
-                for (var _f = 0, augmentations_2 = augmentations; _f < augmentations_2.length; _f++) {
-                    var list = augmentations_2[_f];
-                    for (var _g = 0, list_2 = list; _g < list_2.length; _g++) {
-                        var augmentation = list_2[_g];
+                for (var _h = 0, augmentations_2 = augmentations; _h < augmentations_2.length; _h++) {
+                    var list = augmentations_2[_h];
+                    for (var _j = 0, list_2 = list; _j < list_2.length; _j++) {
+                        var augmentation = list_2[_j];
                         if (ts.isGlobalScopeAugmentation(augmentation.parent))
                             continue;
                         mergeModuleAugmentation(augmentation);
@@ -58877,8 +60958,8 @@ var ts;
                 else {
                     // Otherwise issue top-level error since the files appear very identical in terms of what they contain
                     var list = ts.arrayFrom(conflictingSymbols.keys()).join(", ");
-                    diagnostics.add(addRelatedInfo(ts.createDiagnosticForNode(firstFile, ts.Diagnostics.Definitions_of_the_following_identifiers_conflict_with_those_in_another_file_Colon_0, list), ts.createDiagnosticForNode(secondFile, ts.Diagnostics.Conflicts_are_in_this_file)));
-                    diagnostics.add(addRelatedInfo(ts.createDiagnosticForNode(secondFile, ts.Diagnostics.Definitions_of_the_following_identifiers_conflict_with_those_in_another_file_Colon_0, list), ts.createDiagnosticForNode(firstFile, ts.Diagnostics.Conflicts_are_in_this_file)));
+                    diagnostics.add(ts.addRelatedInfo(ts.createDiagnosticForNode(firstFile, ts.Diagnostics.Definitions_of_the_following_identifiers_conflict_with_those_in_another_file_Colon_0, list), ts.createDiagnosticForNode(secondFile, ts.Diagnostics.Conflicts_are_in_this_file)));
+                    diagnostics.add(ts.addRelatedInfo(ts.createDiagnosticForNode(secondFile, ts.Diagnostics.Definitions_of_the_following_identifiers_conflict_with_those_in_another_file_Colon_0, list), ts.createDiagnosticForNode(firstFile, ts.Diagnostics.Conflicts_are_in_this_file)));
                 }
             });
             amalgamatedDuplicates = undefined;
@@ -58890,7 +60971,7 @@ var ts;
                     var helpersModule = resolveHelpersModule(sourceFile, location);
                     if (helpersModule !== unknownSymbol) {
                         var uncheckedHelpers = helpers & ~requestedExternalEmitHelpers;
-                        for (var helper = 1 /* FirstEmitHelper */; helper <= 65536 /* LastEmitHelper */; helper <<= 1) {
+                        for (var helper = 1 /* FirstEmitHelper */; helper <= 131072 /* LastEmitHelper */; helper <<= 1) {
                             if (uncheckedHelpers & helper) {
                                 var name = getHelperName(helper);
                                 var symbol = getSymbol(helpersModule.exports, ts.escapeLeadingUnderscores(name), 67220415 /* Value */);
@@ -58917,12 +60998,13 @@ var ts;
                 case 256 /* Values */: return "__values";
                 case 512 /* Read */: return "__read";
                 case 1024 /* Spread */: return "__spread";
-                case 2048 /* Await */: return "__await";
-                case 4096 /* AsyncGenerator */: return "__asyncGenerator";
-                case 8192 /* AsyncDelegator */: return "__asyncDelegator";
-                case 16384 /* AsyncValues */: return "__asyncValues";
-                case 32768 /* ExportStar */: return "__exportStar";
-                case 65536 /* MakeTemplateObject */: return "__makeTemplateObject";
+                case 2048 /* SpreadArrays */: return "__spreadArrays";
+                case 4096 /* Await */: return "__await";
+                case 8192 /* AsyncGenerator */: return "__asyncGenerator";
+                case 16384 /* AsyncDelegator */: return "__asyncDelegator";
+                case 32768 /* AsyncValues */: return "__asyncValues";
+                case 65536 /* ExportStar */: return "__exportStar";
+                case 131072 /* MakeTemplateObject */: return "__makeTemplateObject";
                 default: return ts.Debug.fail("Unrecognized helper");
             }
         }
@@ -58941,14 +61023,14 @@ var ts;
                 return false;
             }
             if (!ts.nodeCanBeDecorated(node, node.parent, node.parent.parent)) {
-                if (node.kind === 156 /* MethodDeclaration */ && !ts.nodeIsPresent(node.body)) {
+                if (node.kind === 157 /* MethodDeclaration */ && !ts.nodeIsPresent(node.body)) {
                     return grammarErrorOnFirstToken(node, ts.Diagnostics.A_decorator_can_only_decorate_a_method_implementation_not_an_overload);
                 }
                 else {
                     return grammarErrorOnFirstToken(node, ts.Diagnostics.Decorators_are_not_valid_here);
                 }
             }
-            else if (node.kind === 158 /* GetAccessor */ || node.kind === 159 /* SetAccessor */) {
+            else if (node.kind === 159 /* GetAccessor */ || node.kind === 160 /* SetAccessor */) {
                 var accessors = ts.getAllAccessorDeclarations(node.parent.members, node);
                 if (accessors.firstAccessor.decorators && node === accessors.secondAccessor) {
                     return grammarErrorOnFirstToken(node, ts.Diagnostics.Decorators_cannot_be_applied_to_multiple_get_Slashset_accessors_of_the_same_name);
@@ -58965,23 +61047,23 @@ var ts;
             var flags = 0 /* None */;
             for (var _i = 0, _a = node.modifiers; _i < _a.length; _i++) {
                 var modifier = _a[_i];
-                if (modifier.kind !== 133 /* ReadonlyKeyword */) {
-                    if (node.kind === 153 /* PropertySignature */ || node.kind === 155 /* MethodSignature */) {
+                if (modifier.kind !== 134 /* ReadonlyKeyword */) {
+                    if (node.kind === 154 /* PropertySignature */ || node.kind === 156 /* MethodSignature */) {
                         return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_type_member, ts.tokenToString(modifier.kind));
                     }
-                    if (node.kind === 162 /* IndexSignature */) {
+                    if (node.kind === 163 /* IndexSignature */) {
                         return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_an_index_signature, ts.tokenToString(modifier.kind));
                     }
                 }
                 switch (modifier.kind) {
-                    case 77 /* ConstKeyword */:
-                        if (node.kind !== 243 /* EnumDeclaration */) {
-                            return grammarErrorOnNode(node, ts.Diagnostics.A_class_member_cannot_have_the_0_keyword, ts.tokenToString(77 /* ConstKeyword */));
+                    case 78 /* ConstKeyword */:
+                        if (node.kind !== 244 /* EnumDeclaration */) {
+                            return grammarErrorOnNode(node, ts.Diagnostics.A_class_member_cannot_have_the_0_keyword, ts.tokenToString(78 /* ConstKeyword */));
                         }
                         break;
-                    case 115 /* PublicKeyword */:
-                    case 114 /* ProtectedKeyword */:
-                    case 113 /* PrivateKeyword */:
+                    case 116 /* PublicKeyword */:
+                    case 115 /* ProtectedKeyword */:
+                    case 114 /* PrivateKeyword */:
                         var text = visibilityToString(ts.modifierToFlag(modifier.kind));
                         if (flags & 28 /* AccessibilityModifier */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics.Accessibility_modifier_already_seen);
@@ -58995,11 +61077,11 @@ var ts;
                         else if (flags & 256 /* Async */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, text, "async");
                         }
-                        else if (node.parent.kind === 245 /* ModuleBlock */ || node.parent.kind === 284 /* SourceFile */) {
+                        else if (node.parent.kind === 246 /* ModuleBlock */ || node.parent.kind === 285 /* SourceFile */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_module_or_namespace_element, text);
                         }
                         else if (flags & 128 /* Abstract */) {
-                            if (modifier.kind === 113 /* PrivateKeyword */) {
+                            if (modifier.kind === 114 /* PrivateKeyword */) {
                                 return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_with_1_modifier, text, "abstract");
                             }
                             else {
@@ -59008,7 +61090,7 @@ var ts;
                         }
                         flags |= ts.modifierToFlag(modifier.kind);
                         break;
-                    case 116 /* StaticKeyword */:
+                    case 117 /* StaticKeyword */:
                         if (flags & 32 /* Static */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "static");
                         }
@@ -59018,10 +61100,10 @@ var ts;
                         else if (flags & 256 /* Async */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, "static", "async");
                         }
-                        else if (node.parent.kind === 245 /* ModuleBlock */ || node.parent.kind === 284 /* SourceFile */) {
+                        else if (node.parent.kind === 246 /* ModuleBlock */ || node.parent.kind === 285 /* SourceFile */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_module_or_namespace_element, "static");
                         }
-                        else if (node.kind === 151 /* Parameter */) {
+                        else if (node.kind === 152 /* Parameter */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "static");
                         }
                         else if (flags & 128 /* Abstract */) {
@@ -59030,18 +61112,18 @@ var ts;
                         flags |= 32 /* Static */;
                         lastStatic = modifier;
                         break;
-                    case 133 /* ReadonlyKeyword */:
+                    case 134 /* ReadonlyKeyword */:
                         if (flags & 64 /* Readonly */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "readonly");
                         }
-                        else if (node.kind !== 154 /* PropertyDeclaration */ && node.kind !== 153 /* PropertySignature */ && node.kind !== 162 /* IndexSignature */ && node.kind !== 151 /* Parameter */) {
+                        else if (node.kind !== 155 /* PropertyDeclaration */ && node.kind !== 154 /* PropertySignature */ && node.kind !== 163 /* IndexSignature */ && node.kind !== 152 /* Parameter */) {
                             // If node.kind === SyntaxKind.Parameter, checkParameter report an error if it's not a parameter property.
                             return grammarErrorOnNode(modifier, ts.Diagnostics.readonly_modifier_can_only_appear_on_a_property_declaration_or_index_signature);
                         }
                         flags |= 64 /* Readonly */;
                         lastReadonly = modifier;
                         break;
-                    case 85 /* ExportKeyword */:
+                    case 86 /* ExportKeyword */:
                         if (flags & 1 /* Export */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "export");
                         }
@@ -59054,52 +61136,52 @@ var ts;
                         else if (flags & 256 /* Async */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, "export", "async");
                         }
-                        else if (node.parent.kind === 240 /* ClassDeclaration */) {
+                        else if (node.parent.kind === 241 /* ClassDeclaration */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_class_element, "export");
                         }
-                        else if (node.kind === 151 /* Parameter */) {
+                        else if (node.kind === 152 /* Parameter */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "export");
                         }
                         flags |= 1 /* Export */;
                         break;
-                    case 80 /* DefaultKeyword */:
-                        var container = node.parent.kind === 284 /* SourceFile */ ? node.parent : node.parent.parent;
-                        if (container.kind === 244 /* ModuleDeclaration */ && !ts.isAmbientModule(container)) {
+                    case 81 /* DefaultKeyword */:
+                        var container = node.parent.kind === 285 /* SourceFile */ ? node.parent : node.parent.parent;
+                        if (container.kind === 245 /* ModuleDeclaration */ && !ts.isAmbientModule(container)) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics.A_default_export_can_only_be_used_in_an_ECMAScript_style_module);
                         }
                         flags |= 512 /* Default */;
                         break;
-                    case 125 /* DeclareKeyword */:
+                    case 126 /* DeclareKeyword */:
                         if (flags & 2 /* Ambient */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "declare");
                         }
                         else if (flags & 256 /* Async */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_in_an_ambient_context, "async");
                         }
-                        else if (node.parent.kind === 240 /* ClassDeclaration */) {
+                        else if (node.parent.kind === 241 /* ClassDeclaration */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_class_element, "declare");
                         }
-                        else if (node.kind === 151 /* Parameter */) {
+                        else if (node.kind === 152 /* Parameter */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "declare");
                         }
-                        else if ((node.parent.flags & 4194304 /* Ambient */) && node.parent.kind === 245 /* ModuleBlock */) {
+                        else if ((node.parent.flags & 4194304 /* Ambient */) && node.parent.kind === 246 /* ModuleBlock */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics.A_declare_modifier_cannot_be_used_in_an_already_ambient_context);
                         }
                         flags |= 2 /* Ambient */;
                         lastDeclare = modifier;
                         break;
-                    case 118 /* AbstractKeyword */:
+                    case 119 /* AbstractKeyword */:
                         if (flags & 128 /* Abstract */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "abstract");
                         }
-                        if (node.kind !== 240 /* ClassDeclaration */) {
-                            if (node.kind !== 156 /* MethodDeclaration */ &&
-                                node.kind !== 154 /* PropertyDeclaration */ &&
-                                node.kind !== 158 /* GetAccessor */ &&
-                                node.kind !== 159 /* SetAccessor */) {
+                        if (node.kind !== 241 /* ClassDeclaration */) {
+                            if (node.kind !== 157 /* MethodDeclaration */ &&
+                                node.kind !== 155 /* PropertyDeclaration */ &&
+                                node.kind !== 159 /* GetAccessor */ &&
+                                node.kind !== 160 /* SetAccessor */) {
                                 return grammarErrorOnNode(modifier, ts.Diagnostics.abstract_modifier_can_only_appear_on_a_class_method_or_property_declaration);
                             }
-                            if (!(node.parent.kind === 240 /* ClassDeclaration */ && ts.hasModifier(node.parent, 128 /* Abstract */))) {
+                            if (!(node.parent.kind === 241 /* ClassDeclaration */ && ts.hasModifier(node.parent, 128 /* Abstract */))) {
                                 return grammarErrorOnNode(modifier, ts.Diagnostics.Abstract_methods_can_only_appear_within_an_abstract_class);
                             }
                             if (flags & 32 /* Static */) {
@@ -59111,14 +61193,14 @@ var ts;
                         }
                         flags |= 128 /* Abstract */;
                         break;
-                    case 121 /* AsyncKeyword */:
+                    case 122 /* AsyncKeyword */:
                         if (flags & 256 /* Async */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "async");
                         }
                         else if (flags & 2 /* Ambient */ || node.parent.flags & 4194304 /* Ambient */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_in_an_ambient_context, "async");
                         }
-                        else if (node.kind === 151 /* Parameter */) {
+                        else if (node.kind === 152 /* Parameter */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "async");
                         }
                         flags |= 256 /* Async */;
@@ -59126,7 +61208,7 @@ var ts;
                         break;
                 }
             }
-            if (node.kind === 157 /* Constructor */) {
+            if (node.kind === 158 /* Constructor */) {
                 if (flags & 32 /* Static */) {
                     return grammarErrorOnNode(lastStatic, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "static");
                 }
@@ -59141,13 +61223,13 @@ var ts;
                 }
                 return false;
             }
-            else if ((node.kind === 249 /* ImportDeclaration */ || node.kind === 248 /* ImportEqualsDeclaration */) && flags & 2 /* Ambient */) {
+            else if ((node.kind === 250 /* ImportDeclaration */ || node.kind === 249 /* ImportEqualsDeclaration */) && flags & 2 /* Ambient */) {
                 return grammarErrorOnNode(lastDeclare, ts.Diagnostics.A_0_modifier_cannot_be_used_with_an_import_declaration, "declare");
             }
-            else if (node.kind === 151 /* Parameter */ && (flags & 92 /* ParameterPropertyModifier */) && ts.isBindingPattern(node.name)) {
+            else if (node.kind === 152 /* Parameter */ && (flags & 92 /* ParameterPropertyModifier */) && ts.isBindingPattern(node.name)) {
                 return grammarErrorOnNode(node, ts.Diagnostics.A_parameter_property_may_not_be_declared_using_a_binding_pattern);
             }
-            else if (node.kind === 151 /* Parameter */ && (flags & 92 /* ParameterPropertyModifier */) && node.dotDotDotToken) {
+            else if (node.kind === 152 /* Parameter */ && (flags & 92 /* ParameterPropertyModifier */) && node.dotDotDotToken) {
                 return grammarErrorOnNode(node, ts.Diagnostics.A_parameter_property_cannot_be_declared_using_a_rest_parameter);
             }
             if (flags & 256 /* Async */) {
@@ -59168,38 +61250,38 @@ var ts;
         }
         function shouldReportBadModifier(node) {
             switch (node.kind) {
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
-                case 157 /* Constructor */:
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
-                case 162 /* IndexSignature */:
-                case 244 /* ModuleDeclaration */:
-                case 249 /* ImportDeclaration */:
-                case 248 /* ImportEqualsDeclaration */:
-                case 255 /* ExportDeclaration */:
-                case 254 /* ExportAssignment */:
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
-                case 151 /* Parameter */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
+                case 158 /* Constructor */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
+                case 163 /* IndexSignature */:
+                case 245 /* ModuleDeclaration */:
+                case 250 /* ImportDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
+                case 256 /* ExportDeclaration */:
+                case 255 /* ExportAssignment */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
+                case 152 /* Parameter */:
                     return false;
                 default:
-                    if (node.parent.kind === 245 /* ModuleBlock */ || node.parent.kind === 284 /* SourceFile */) {
+                    if (node.parent.kind === 246 /* ModuleBlock */ || node.parent.kind === 285 /* SourceFile */) {
                         return false;
                     }
                     switch (node.kind) {
-                        case 239 /* FunctionDeclaration */:
-                            return nodeHasAnyModifiersExcept(node, 121 /* AsyncKeyword */);
-                        case 240 /* ClassDeclaration */:
-                            return nodeHasAnyModifiersExcept(node, 118 /* AbstractKeyword */);
-                        case 241 /* InterfaceDeclaration */:
-                        case 219 /* VariableStatement */:
-                        case 242 /* TypeAliasDeclaration */:
+                        case 240 /* FunctionDeclaration */:
+                            return nodeHasAnyModifiersExcept(node, 122 /* AsyncKeyword */);
+                        case 241 /* ClassDeclaration */:
+                            return nodeHasAnyModifiersExcept(node, 119 /* AbstractKeyword */);
+                        case 242 /* InterfaceDeclaration */:
+                        case 220 /* VariableStatement */:
+                        case 243 /* TypeAliasDeclaration */:
                             return true;
-                        case 243 /* EnumDeclaration */:
-                            return nodeHasAnyModifiersExcept(node, 77 /* ConstKeyword */);
+                        case 244 /* EnumDeclaration */:
+                            return nodeHasAnyModifiersExcept(node, 78 /* ConstKeyword */);
                         default:
                             ts.Debug.fail();
                             return false;
@@ -59211,10 +61293,10 @@ var ts;
         }
         function checkGrammarAsyncModifier(node, asyncModifier) {
             switch (node.kind) {
-                case 156 /* MethodDeclaration */:
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
+                case 157 /* MethodDeclaration */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
                     return false;
             }
             return grammarErrorOnNode(asyncModifier, ts.Diagnostics._0_modifier_cannot_be_used_here, "async");
@@ -59274,10 +61356,10 @@ var ts;
                     var nonSimpleParameters = getNonSimpleParameters(node.parameters);
                     if (ts.length(nonSimpleParameters)) {
                         ts.forEach(nonSimpleParameters, function (parameter) {
-                            addRelatedInfo(error(parameter, ts.Diagnostics.This_parameter_is_not_allowed_with_use_strict_directive), ts.createDiagnosticForNode(useStrictDirective_1, ts.Diagnostics.use_strict_directive_used_here));
+                            ts.addRelatedInfo(error(parameter, ts.Diagnostics.This_parameter_is_not_allowed_with_use_strict_directive), ts.createDiagnosticForNode(useStrictDirective_1, ts.Diagnostics.use_strict_directive_used_here));
                         });
                         var diagnostics_1 = nonSimpleParameters.map(function (parameter, index) { return (index === 0 ? ts.createDiagnosticForNode(parameter, ts.Diagnostics.Non_simple_parameter_declared_here) : ts.createDiagnosticForNode(parameter, ts.Diagnostics.and_here)); });
-                        addRelatedInfo.apply(void 0, [error(useStrictDirective_1, ts.Diagnostics.use_strict_directive_cannot_be_used_with_non_simple_parameter_list)].concat(diagnostics_1));
+                        ts.addRelatedInfo.apply(void 0, [error(useStrictDirective_1, ts.Diagnostics.use_strict_directive_cannot_be_used_with_non_simple_parameter_list)].concat(diagnostics_1));
                         return true;
                     }
                 }
@@ -59329,10 +61411,10 @@ var ts;
             if (!parameter.type) {
                 return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_must_have_a_type_annotation);
             }
-            if (parameter.type.kind !== 138 /* StringKeyword */ && parameter.type.kind !== 135 /* NumberKeyword */) {
+            if (parameter.type.kind !== 139 /* StringKeyword */ && parameter.type.kind !== 136 /* NumberKeyword */) {
                 var type = getTypeFromTypeNode(parameter.type);
                 if (type.flags & 4 /* String */ || type.flags & 8 /* Number */) {
-                    return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_type_cannot_be_a_type_alias_Consider_writing_0_Colon_1_Colon_2_instead, ts.getTextOfNode(parameter.name), typeToString(type), typeToString(getTypeFromTypeNode(node.type)));
+                    return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_type_cannot_be_a_type_alias_Consider_writing_0_Colon_1_Colon_2_instead, ts.getTextOfNode(parameter.name), typeToString(type), typeToString(node.type ? getTypeFromTypeNode(node.type) : anyType));
                 }
                 if (type.flags & 1048576 /* Union */ && allTypesAssignableToKind(type, 128 /* StringLiteral */, /*strict*/ true)) {
                     return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_type_cannot_be_a_union_type_Consider_using_a_mapped_object_type_instead);
@@ -59363,9 +61445,9 @@ var ts;
         }
         function checkGrammarForOmittedArgument(args) {
             if (args) {
-                for (var _i = 0, args_5 = args; _i < args_5.length; _i++) {
-                    var arg = args_5[_i];
-                    if (arg.kind === 210 /* OmittedExpression */) {
+                for (var _i = 0, args_4 = args; _i < args_4.length; _i++) {
+                    var arg = args_4[_i];
+                    if (arg.kind === 211 /* OmittedExpression */) {
                         return grammarErrorAtPos(arg, arg.pos, 0, ts.Diagnostics.Argument_expression_expected);
                     }
                 }
@@ -59395,7 +61477,7 @@ var ts;
             if (!checkGrammarDecoratorsAndModifiers(node) && node.heritageClauses) {
                 for (var _i = 0, _a = node.heritageClauses; _i < _a.length; _i++) {
                     var heritageClause = _a[_i];
-                    if (heritageClause.token === 86 /* ExtendsKeyword */) {
+                    if (heritageClause.token === 87 /* ExtendsKeyword */) {
                         if (seenExtendsClause) {
                             return grammarErrorOnFirstToken(heritageClause, ts.Diagnostics.extends_clause_already_seen);
                         }
@@ -59408,7 +61490,7 @@ var ts;
                         seenExtendsClause = true;
                     }
                     else {
-                        ts.Debug.assert(heritageClause.token === 109 /* ImplementsKeyword */);
+                        ts.Debug.assert(heritageClause.token === 110 /* ImplementsKeyword */);
                         if (seenImplementsClause) {
                             return grammarErrorOnFirstToken(heritageClause, ts.Diagnostics.implements_clause_already_seen);
                         }
@@ -59424,14 +61506,14 @@ var ts;
             if (node.heritageClauses) {
                 for (var _i = 0, _a = node.heritageClauses; _i < _a.length; _i++) {
                     var heritageClause = _a[_i];
-                    if (heritageClause.token === 86 /* ExtendsKeyword */) {
+                    if (heritageClause.token === 87 /* ExtendsKeyword */) {
                         if (seenExtendsClause) {
                             return grammarErrorOnFirstToken(heritageClause, ts.Diagnostics.extends_clause_already_seen);
                         }
                         seenExtendsClause = true;
                     }
                     else {
-                        ts.Debug.assert(heritageClause.token === 109 /* ImplementsKeyword */);
+                        ts.Debug.assert(heritageClause.token === 110 /* ImplementsKeyword */);
                         return grammarErrorOnFirstToken(heritageClause, ts.Diagnostics.Interface_declaration_cannot_have_implements_clause);
                     }
                     // Grammar checking heritageClause inside class declaration
@@ -59442,20 +61524,20 @@ var ts;
         }
         function checkGrammarComputedPropertyName(node) {
             // If node is not a computedPropertyName, just skip the grammar checking
-            if (node.kind !== 149 /* ComputedPropertyName */) {
+            if (node.kind !== 150 /* ComputedPropertyName */) {
                 return false;
             }
             var computedPropertyName = node;
-            if (computedPropertyName.expression.kind === 204 /* BinaryExpression */ && computedPropertyName.expression.operatorToken.kind === 27 /* CommaToken */) {
+            if (computedPropertyName.expression.kind === 205 /* BinaryExpression */ && computedPropertyName.expression.operatorToken.kind === 27 /* CommaToken */) {
                 return grammarErrorOnNode(computedPropertyName.expression, ts.Diagnostics.A_comma_expression_is_not_allowed_in_a_computed_property_name);
             }
             return false;
         }
         function checkGrammarForGenerator(node) {
             if (node.asteriskToken) {
-                ts.Debug.assert(node.kind === 239 /* FunctionDeclaration */ ||
-                    node.kind === 196 /* FunctionExpression */ ||
-                    node.kind === 156 /* MethodDeclaration */);
+                ts.Debug.assert(node.kind === 240 /* FunctionDeclaration */ ||
+                    node.kind === 197 /* FunctionExpression */ ||
+                    node.kind === 157 /* MethodDeclaration */);
                 if (node.flags & 4194304 /* Ambient */) {
                     return grammarErrorOnNode(node.asteriskToken, ts.Diagnostics.Generators_are_not_allowed_in_an_ambient_context);
                 }
@@ -59481,15 +61563,22 @@ var ts;
             var seen = ts.createUnderscoreEscapedMap();
             for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
                 var prop = _a[_i];
-                if (prop.kind === 277 /* SpreadAssignment */) {
+                if (prop.kind === 278 /* SpreadAssignment */) {
+                    if (inDestructuring) {
+                        // a rest property cannot be destructured any further
+                        var expression = ts.skipParentheses(prop.expression);
+                        if (ts.isArrayLiteralExpression(expression) || ts.isObjectLiteralExpression(expression)) {
+                            return grammarErrorOnNode(prop.expression, ts.Diagnostics.A_rest_element_cannot_contain_a_binding_pattern);
+                        }
+                    }
                     continue;
                 }
                 var name = prop.name;
-                if (name.kind === 149 /* ComputedPropertyName */) {
+                if (name.kind === 150 /* ComputedPropertyName */) {
                     // If the name is not a ComputedPropertyName, the grammar checking will skip it
                     checkGrammarComputedPropertyName(name);
                 }
-                if (prop.kind === 276 /* ShorthandPropertyAssignment */ && !inDestructuring && prop.objectAssignmentInitializer) {
+                if (prop.kind === 277 /* ShorthandPropertyAssignment */ && !inDestructuring && prop.objectAssignmentInitializer) {
                     // having objectAssignmentInitializer is only valid in ObjectAssignmentPattern
                     // outside of destructuring it is a syntax error
                     return grammarErrorOnNode(prop.equalsToken, ts.Diagnostics.can_only_be_used_in_an_object_literal_property_inside_a_destructuring_assignment);
@@ -59498,7 +61587,7 @@ var ts;
                 if (prop.modifiers) {
                     for (var _b = 0, _c = prop.modifiers; _b < _c.length; _b++) { // TODO: GH#19955
                         var mod = _c[_b];
-                        if (mod.kind !== 121 /* AsyncKeyword */ || prop.kind !== 156 /* MethodDeclaration */) {
+                        if (mod.kind !== 122 /* AsyncKeyword */ || prop.kind !== 157 /* MethodDeclaration */) {
                             grammarErrorOnNode(mod, ts.Diagnostics._0_modifier_cannot_be_used_here, ts.getTextOfNode(mod));
                         }
                     }
@@ -59513,23 +61602,23 @@ var ts;
                 // and either both previous and propId.descriptor have[[Get]] fields or both previous and propId.descriptor have[[Set]] fields
                 var currentKind = void 0;
                 switch (prop.kind) {
-                    case 276 /* ShorthandPropertyAssignment */:
+                    case 277 /* ShorthandPropertyAssignment */:
                         checkGrammarForInvalidExclamationToken(prop.exclamationToken, ts.Diagnostics.A_definite_assignment_assertion_is_not_permitted_in_this_context);
                     /* tslint:disable:no-switch-case-fall-through */
-                    case 275 /* PropertyAssignment */:
+                    case 276 /* PropertyAssignment */:
                         // Grammar checking for computedPropertyName and shorthandPropertyAssignment
                         checkGrammarForInvalidQuestionMark(prop.questionToken, ts.Diagnostics.An_object_member_cannot_be_declared_optional);
                         if (name.kind === 8 /* NumericLiteral */) {
                             checkGrammarNumericLiteral(name);
                         }
                     // falls through
-                    case 156 /* MethodDeclaration */:
+                    case 157 /* MethodDeclaration */:
                         currentKind = 1 /* Property */;
                         break;
-                    case 158 /* GetAccessor */:
+                    case 159 /* GetAccessor */:
                         currentKind = 2 /* GetAccessor */;
                         break;
-                    case 159 /* SetAccessor */:
+                    case 160 /* SetAccessor */:
                         currentKind = 4 /* SetAccessor */;
                         break;
                     default:
@@ -59566,7 +61655,7 @@ var ts;
             var seen = ts.createUnderscoreEscapedMap();
             for (var _i = 0, _a = node.attributes.properties; _i < _a.length; _i++) {
                 var attr = _a[_i];
-                if (attr.kind === 269 /* JsxSpreadAttribute */) {
+                if (attr.kind === 270 /* JsxSpreadAttribute */) {
                     continue;
                 }
                 var name = attr.name, initializer = attr.initializer;
@@ -59576,21 +61665,39 @@ var ts;
                 else {
                     return grammarErrorOnNode(name, ts.Diagnostics.JSX_elements_cannot_have_multiple_attributes_with_the_same_name);
                 }
-                if (initializer && initializer.kind === 270 /* JsxExpression */ && !initializer.expression) {
+                if (initializer && initializer.kind === 271 /* JsxExpression */ && !initializer.expression) {
                     return grammarErrorOnNode(initializer, ts.Diagnostics.JSX_attributes_must_only_be_assigned_a_non_empty_expression);
                 }
             }
         }
+        function checkGrammarJsxExpression(node) {
+            if (node.expression && ts.isCommaSequence(node.expression)) {
+                return grammarErrorOnNode(node.expression, ts.Diagnostics.JSX_expressions_may_not_use_the_comma_operator_Did_you_mean_to_write_an_array);
+            }
+        }
         function checkGrammarForInOrForOfStatement(forInOrOfStatement) {
             if (checkGrammarStatementInAmbientContext(forInOrOfStatement)) {
                 return true;
             }
-            if (forInOrOfStatement.kind === 227 /* ForOfStatement */ && forInOrOfStatement.awaitModifier) {
+            if (forInOrOfStatement.kind === 228 /* ForOfStatement */ && forInOrOfStatement.awaitModifier) {
                 if ((forInOrOfStatement.flags & 16384 /* AwaitContext */) === 0 /* None */) {
-                    return grammarErrorOnNode(forInOrOfStatement.awaitModifier, ts.Diagnostics.A_for_await_of_statement_is_only_allowed_within_an_async_function_or_async_generator);
+                    // use of 'for-await-of' in non-async function
+                    var sourceFile = ts.getSourceFileOfNode(forInOrOfStatement);
+                    if (!hasParseDiagnostics(sourceFile)) {
+                        var diagnostic = ts.createDiagnosticForNode(forInOrOfStatement.awaitModifier, ts.Diagnostics.A_for_await_of_statement_is_only_allowed_within_an_async_function_or_async_generator);
+                        var func = ts.getContainingFunction(forInOrOfStatement);
+                        if (func && func.kind !== 158 /* Constructor */) {
+                            ts.Debug.assert((ts.getFunctionFlags(func) & 2 /* Async */) === 0, "Enclosing function should never be an async function.");
+                            var relatedInfo = ts.createDiagnosticForNode(func, ts.Diagnostics.Did_you_mean_to_mark_this_function_as_async);
+                            ts.addRelatedInfo(diagnostic, relatedInfo);
+                        }
+                        diagnostics.add(diagnostic);
+                        return true;
+                    }
+                    return false;
                 }
             }
-            if (forInOrOfStatement.initializer.kind === 238 /* VariableDeclarationList */) {
+            if (forInOrOfStatement.initializer.kind === 239 /* VariableDeclarationList */) {
                 var variableList = forInOrOfStatement.initializer;
                 if (!checkGrammarVariableDeclarationList(variableList)) {
                     var declarations = variableList.declarations;
@@ -59605,20 +61712,20 @@ var ts;
                         return false;
                     }
                     if (declarations.length > 1) {
-                        var diagnostic = forInOrOfStatement.kind === 226 /* ForInStatement */
+                        var diagnostic = forInOrOfStatement.kind === 227 /* ForInStatement */
                             ? ts.Diagnostics.Only_a_single_variable_declaration_is_allowed_in_a_for_in_statement
                             : ts.Diagnostics.Only_a_single_variable_declaration_is_allowed_in_a_for_of_statement;
                         return grammarErrorOnFirstToken(variableList.declarations[1], diagnostic);
                     }
                     var firstDeclaration = declarations[0];
                     if (firstDeclaration.initializer) {
-                        var diagnostic = forInOrOfStatement.kind === 226 /* ForInStatement */
+                        var diagnostic = forInOrOfStatement.kind === 227 /* ForInStatement */
                             ? ts.Diagnostics.The_variable_declaration_of_a_for_in_statement_cannot_have_an_initializer
                             : ts.Diagnostics.The_variable_declaration_of_a_for_of_statement_cannot_have_an_initializer;
                         return grammarErrorOnNode(firstDeclaration.name, diagnostic);
                     }
                     if (firstDeclaration.type) {
-                        var diagnostic = forInOrOfStatement.kind === 226 /* ForInStatement */
+                        var diagnostic = forInOrOfStatement.kind === 227 /* ForInStatement */
                             ? ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_use_a_type_annotation
                             : ts.Diagnostics.The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation;
                         return grammarErrorOnNode(firstDeclaration, diagnostic);
@@ -59645,11 +61752,11 @@ var ts;
                 return grammarErrorOnNode(accessor.name, ts.Diagnostics.An_accessor_cannot_have_type_parameters);
             }
             else if (!doesAccessorHaveCorrectParameterCount(accessor)) {
-                return grammarErrorOnNode(accessor.name, kind === 158 /* GetAccessor */ ?
+                return grammarErrorOnNode(accessor.name, kind === 159 /* GetAccessor */ ?
                     ts.Diagnostics.A_get_accessor_cannot_have_parameters :
                     ts.Diagnostics.A_set_accessor_must_have_exactly_one_parameter);
             }
-            else if (kind === 159 /* SetAccessor */) {
+            else if (kind === 160 /* SetAccessor */) {
                 if (accessor.type) {
                     return grammarErrorOnNode(accessor.name, ts.Diagnostics.A_set_accessor_cannot_have_a_return_type_annotation);
                 }
@@ -59673,23 +61780,23 @@ var ts;
          * A set accessor has one parameter or a `this` parameter and one more parameter.
          */
         function doesAccessorHaveCorrectParameterCount(accessor) {
-            return getAccessorThisParameter(accessor) || accessor.parameters.length === (accessor.kind === 158 /* GetAccessor */ ? 0 : 1);
+            return getAccessorThisParameter(accessor) || accessor.parameters.length === (accessor.kind === 159 /* GetAccessor */ ? 0 : 1);
         }
         function getAccessorThisParameter(accessor) {
-            if (accessor.parameters.length === (accessor.kind === 158 /* GetAccessor */ ? 1 : 2)) {
+            if (accessor.parameters.length === (accessor.kind === 159 /* GetAccessor */ ? 1 : 2)) {
                 return ts.getThisParameter(accessor);
             }
         }
         function checkGrammarTypeOperatorNode(node) {
-            if (node.operator === 142 /* UniqueKeyword */) {
-                if (node.type.kind !== 139 /* SymbolKeyword */) {
-                    return grammarErrorOnNode(node.type, ts.Diagnostics._0_expected, ts.tokenToString(139 /* SymbolKeyword */));
+            if (node.operator === 143 /* UniqueKeyword */) {
+                if (node.type.kind !== 140 /* SymbolKeyword */) {
+                    return grammarErrorOnNode(node.type, ts.Diagnostics._0_expected, ts.tokenToString(140 /* SymbolKeyword */));
                 }
                 var parent = ts.walkUpParenthesizedTypes(node.parent);
                 switch (parent.kind) {
-                    case 237 /* VariableDeclaration */:
+                    case 238 /* VariableDeclaration */:
                         var decl = parent;
-                        if (decl.name.kind !== 72 /* Identifier */) {
+                        if (decl.name.kind !== 73 /* Identifier */) {
                             return grammarErrorOnNode(node, ts.Diagnostics.unique_symbol_types_may_not_be_used_on_a_variable_declaration_with_a_binding_name);
                         }
                         if (!ts.isVariableDeclarationInVariableStatement(decl)) {
@@ -59699,13 +61806,13 @@ var ts;
                             return grammarErrorOnNode(parent.name, ts.Diagnostics.A_variable_whose_type_is_a_unique_symbol_type_must_be_const);
                         }
                         break;
-                    case 154 /* PropertyDeclaration */:
+                    case 155 /* PropertyDeclaration */:
                         if (!ts.hasModifier(parent, 32 /* Static */) ||
                             !ts.hasModifier(parent, 64 /* Readonly */)) {
                             return grammarErrorOnNode(parent.name, ts.Diagnostics.A_property_of_a_class_whose_type_is_a_unique_symbol_type_must_be_both_static_and_readonly);
                         }
                         break;
-                    case 153 /* PropertySignature */:
+                    case 154 /* PropertySignature */:
                         if (!ts.hasModifier(parent, 64 /* Readonly */)) {
                             return grammarErrorOnNode(parent.name, ts.Diagnostics.A_property_of_an_interface_or_type_literal_whose_type_is_a_unique_symbol_type_must_be_readonly);
                         }
@@ -59714,9 +61821,9 @@ var ts;
                         return grammarErrorOnNode(node, ts.Diagnostics.unique_symbol_types_are_not_allowed_here);
                 }
             }
-            else if (node.operator === 133 /* ReadonlyKeyword */) {
-                if (node.type.kind !== 169 /* ArrayType */ && node.type.kind !== 170 /* TupleType */) {
-                    return grammarErrorOnFirstToken(node, ts.Diagnostics.readonly_type_modifier_is_only_permitted_on_array_and_tuple_literal_types, ts.tokenToString(139 /* SymbolKeyword */));
+            else if (node.operator === 134 /* ReadonlyKeyword */) {
+                if (node.type.kind !== 170 /* ArrayType */ && node.type.kind !== 171 /* TupleType */) {
+                    return grammarErrorOnFirstToken(node, ts.Diagnostics.readonly_type_modifier_is_only_permitted_on_array_and_tuple_literal_types, ts.tokenToString(140 /* SymbolKeyword */));
                 }
             }
         }
@@ -59729,10 +61836,10 @@ var ts;
             if (checkGrammarFunctionLikeDeclaration(node)) {
                 return true;
             }
-            if (node.kind === 156 /* MethodDeclaration */) {
-                if (node.parent.kind === 188 /* ObjectLiteralExpression */) {
+            if (node.kind === 157 /* MethodDeclaration */) {
+                if (node.parent.kind === 189 /* ObjectLiteralExpression */) {
                     // We only disallow modifier on a method declaration if it is a property of object-literal-expression
-                    if (node.modifiers && !(node.modifiers.length === 1 && ts.first(node.modifiers).kind === 121 /* AsyncKeyword */)) {
+                    if (node.modifiers && !(node.modifiers.length === 1 && ts.first(node.modifiers).kind === 122 /* AsyncKeyword */)) {
                         return grammarErrorOnFirstToken(node, ts.Diagnostics.Modifiers_cannot_appear_here);
                     }
                     else if (checkGrammarForInvalidQuestionMark(node.questionToken, ts.Diagnostics.An_object_member_cannot_be_declared_optional)) {
@@ -59758,14 +61865,14 @@ var ts;
                 if (node.flags & 4194304 /* Ambient */) {
                     return checkGrammarForInvalidDynamicName(node.name, ts.Diagnostics.A_computed_property_name_in_an_ambient_context_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type);
                 }
-                else if (node.kind === 156 /* MethodDeclaration */ && !node.body) {
+                else if (node.kind === 157 /* MethodDeclaration */ && !node.body) {
                     return checkGrammarForInvalidDynamicName(node.name, ts.Diagnostics.A_computed_property_name_in_a_method_overload_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type);
                 }
             }
-            else if (node.parent.kind === 241 /* InterfaceDeclaration */) {
+            else if (node.parent.kind === 242 /* InterfaceDeclaration */) {
                 return checkGrammarForInvalidDynamicName(node.name, ts.Diagnostics.A_computed_property_name_in_an_interface_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type);
             }
-            else if (node.parent.kind === 168 /* TypeLiteral */) {
+            else if (node.parent.kind === 169 /* TypeLiteral */) {
                 return checkGrammarForInvalidDynamicName(node.name, ts.Diagnostics.A_computed_property_name_in_a_type_literal_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type);
             }
         }
@@ -59776,11 +61883,11 @@ var ts;
                     return grammarErrorOnNode(node, ts.Diagnostics.Jump_target_cannot_cross_function_boundary);
                 }
                 switch (current.kind) {
-                    case 233 /* LabeledStatement */:
+                    case 234 /* LabeledStatement */:
                         if (node.label && current.label.escapedText === node.label.escapedText) {
                             // found matching label - verify that label usage is correct
                             // continue can only target labels that are on iteration statements
-                            var isMisplacedContinueLabel = node.kind === 228 /* ContinueStatement */
+                            var isMisplacedContinueLabel = node.kind === 229 /* ContinueStatement */
                                 && !ts.isIterationStatement(current.statement, /*lookInLabeledStatement*/ true);
                             if (isMisplacedContinueLabel) {
                                 return grammarErrorOnNode(node, ts.Diagnostics.A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement);
@@ -59788,8 +61895,8 @@ var ts;
                             return false;
                         }
                         break;
-                    case 232 /* SwitchStatement */:
-                        if (node.kind === 229 /* BreakStatement */ && !node.label) {
+                    case 233 /* SwitchStatement */:
+                        if (node.kind === 230 /* BreakStatement */ && !node.label) {
                             // unlabeled break within switch statement - ok
                             return false;
                         }
@@ -59804,13 +61911,13 @@ var ts;
                 current = current.parent;
             }
             if (node.label) {
-                var message = node.kind === 229 /* BreakStatement */
+                var message = node.kind === 230 /* BreakStatement */
                     ? ts.Diagnostics.A_break_statement_can_only_jump_to_a_label_of_an_enclosing_statement
                     : ts.Diagnostics.A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement;
                 return grammarErrorOnNode(node, message);
             }
             else {
-                var message = node.kind === 229 /* BreakStatement */
+                var message = node.kind === 230 /* BreakStatement */
                     ? ts.Diagnostics.A_break_statement_can_only_be_used_within_an_enclosing_iteration_or_switch_statement
                     : ts.Diagnostics.A_continue_statement_can_only_be_used_within_an_enclosing_iteration_statement;
                 return grammarErrorOnNode(node, message);
@@ -59834,12 +61941,12 @@ var ts;
         }
         function isStringOrNumberLiteralExpression(expr) {
             return expr.kind === 10 /* StringLiteral */ || expr.kind === 8 /* NumericLiteral */ ||
-                expr.kind === 202 /* PrefixUnaryExpression */ && expr.operator === 39 /* MinusToken */ &&
+                expr.kind === 203 /* PrefixUnaryExpression */ && expr.operator === 39 /* MinusToken */ &&
                     expr.operand.kind === 8 /* NumericLiteral */;
         }
         function isBigIntLiteralExpression(expr) {
             return expr.kind === 9 /* BigIntLiteral */ ||
-                expr.kind === 202 /* PrefixUnaryExpression */ && expr.operator === 39 /* MinusToken */ &&
+                expr.kind === 203 /* PrefixUnaryExpression */ && expr.operator === 39 /* MinusToken */ &&
                     expr.operand.kind === 9 /* BigIntLiteral */;
         }
         function isSimpleLiteralEnumReference(expr) {
@@ -59852,7 +61959,7 @@ var ts;
             if (initializer) {
                 var isInvalidInitializer = !(isStringOrNumberLiteralExpression(initializer) ||
                     isSimpleLiteralEnumReference(initializer) ||
-                    initializer.kind === 102 /* TrueKeyword */ || initializer.kind === 87 /* FalseKeyword */ ||
+                    initializer.kind === 103 /* TrueKeyword */ || initializer.kind === 88 /* FalseKeyword */ ||
                     isBigIntLiteralExpression(initializer));
                 var isConstOrReadonly = ts.isDeclarationReadonly(node) || ts.isVariableDeclaration(node) && ts.isVarConst(node);
                 if (isConstOrReadonly && !node.type) {
@@ -59869,7 +61976,7 @@ var ts;
             }
         }
         function checkGrammarVariableDeclaration(node) {
-            if (node.parent.parent.kind !== 226 /* ForInStatement */ && node.parent.parent.kind !== 227 /* ForOfStatement */) {
+            if (node.parent.parent.kind !== 227 /* ForInStatement */ && node.parent.parent.kind !== 228 /* ForOfStatement */) {
                 if (node.flags & 4194304 /* Ambient */) {
                     checkAmbientInitializer(node);
                 }
@@ -59882,8 +61989,8 @@ var ts;
                     }
                 }
             }
-            if (node.exclamationToken && (node.parent.parent.kind !== 219 /* VariableStatement */ || !node.type || node.initializer || node.flags & 4194304 /* Ambient */)) {
-                return grammarErrorOnNode(node.exclamationToken, ts.Diagnostics.A_definite_assignment_assertion_is_not_permitted_in_this_context);
+            if (node.exclamationToken && (node.parent.parent.kind !== 220 /* VariableStatement */ || !node.type || node.initializer || node.flags & 4194304 /* Ambient */)) {
+                return grammarErrorOnNode(node.exclamationToken, ts.Diagnostics.Definite_assignment_assertions_can_only_be_used_along_with_a_type_annotation);
             }
             if (compilerOptions.module !== ts.ModuleKind.ES2015 && compilerOptions.module !== ts.ModuleKind.ESNext && compilerOptions.module !== ts.ModuleKind.System && !compilerOptions.noEmit &&
                 !(node.parent.parent.flags & 4194304 /* Ambient */) && ts.hasModifier(node.parent.parent, 1 /* Export */)) {
@@ -59899,7 +62006,7 @@ var ts;
             return checkLetConstNames && checkGrammarNameInLetOrConstDeclarations(node.name);
         }
         function checkESModuleMarker(name) {
-            if (name.kind === 72 /* Identifier */) {
+            if (name.kind === 73 /* Identifier */) {
                 if (ts.idText(name) === "__esModule") {
                     return grammarErrorOnNode(name, ts.Diagnostics.Identifier_expected_esModule_is_reserved_as_an_exported_marker_when_transforming_ECMAScript_modules);
                 }
@@ -59916,8 +62023,8 @@ var ts;
             return false;
         }
         function checkGrammarNameInLetOrConstDeclarations(name) {
-            if (name.kind === 72 /* Identifier */) {
-                if (name.originalKeywordKind === 111 /* LetKeyword */) {
+            if (name.kind === 73 /* Identifier */) {
+                if (name.originalKeywordKind === 112 /* LetKeyword */) {
                     return grammarErrorOnNode(name, ts.Diagnostics.let_is_not_allowed_to_be_used_as_a_name_in_let_or_const_declarations);
                 }
             }
@@ -59944,15 +62051,15 @@ var ts;
         }
         function allowLetAndConstDeclarations(parent) {
             switch (parent.kind) {
-                case 222 /* IfStatement */:
-                case 223 /* DoStatement */:
-                case 224 /* WhileStatement */:
-                case 231 /* WithStatement */:
-                case 225 /* ForStatement */:
-                case 226 /* ForInStatement */:
-                case 227 /* ForOfStatement */:
+                case 223 /* IfStatement */:
+                case 224 /* DoStatement */:
+                case 225 /* WhileStatement */:
+                case 232 /* WithStatement */:
+                case 226 /* ForStatement */:
+                case 227 /* ForInStatement */:
+                case 228 /* ForOfStatement */:
                     return false;
-                case 233 /* LabeledStatement */:
+                case 234 /* LabeledStatement */:
                     return allowLetAndConstDeclarations(parent.parent);
             }
             return true;
@@ -59970,12 +62077,12 @@ var ts;
         function checkGrammarMetaProperty(node) {
             var escapedText = node.name.escapedText;
             switch (node.keywordToken) {
-                case 95 /* NewKeyword */:
+                case 96 /* NewKeyword */:
                     if (escapedText !== "target") {
                         return grammarErrorOnNode(node.name, ts.Diagnostics._0_is_not_a_valid_meta_property_for_keyword_1_Did_you_mean_2, node.name.escapedText, ts.tokenToString(node.keywordToken), "target");
                     }
                     break;
-                case 92 /* ImportKeyword */:
+                case 93 /* ImportKeyword */:
                     if (escapedText !== "meta") {
                         return grammarErrorOnNode(node.name, ts.Diagnostics._0_is_not_a_valid_meta_property_for_keyword_1_Did_you_mean_2, node.name.escapedText, ts.tokenToString(node.keywordToken), "meta");
                     }
@@ -60026,11 +62133,14 @@ var ts;
         }
         function checkGrammarProperty(node) {
             if (ts.isClassLike(node.parent)) {
+                if (ts.isStringLiteral(node.name) && node.name.text === "constructor") {
+                    return grammarErrorOnNode(node.name, ts.Diagnostics.Classes_may_not_have_a_field_named_constructor);
+                }
                 if (checkGrammarForInvalidDynamicName(node.name, ts.Diagnostics.A_computed_property_name_in_a_class_property_declaration_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type)) {
                     return true;
                 }
             }
-            else if (node.parent.kind === 241 /* InterfaceDeclaration */) {
+            else if (node.parent.kind === 242 /* InterfaceDeclaration */) {
                 if (checkGrammarForInvalidDynamicName(node.name, ts.Diagnostics.A_computed_property_name_in_an_interface_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type)) {
                     return true;
                 }
@@ -60038,7 +62148,7 @@ var ts;
                     return grammarErrorOnNode(node.initializer, ts.Diagnostics.An_interface_property_cannot_have_an_initializer);
                 }
             }
-            else if (node.parent.kind === 168 /* TypeLiteral */) {
+            else if (node.parent.kind === 169 /* TypeLiteral */) {
                 if (checkGrammarForInvalidDynamicName(node.name, ts.Diagnostics.A_computed_property_name_in_a_type_literal_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type)) {
                     return true;
                 }
@@ -60067,22 +62177,22 @@ var ts;
             //     export_opt   AmbientDeclaration
             //
             // TODO: The spec needs to be amended to reflect this grammar.
-            if (node.kind === 241 /* InterfaceDeclaration */ ||
-                node.kind === 242 /* TypeAliasDeclaration */ ||
-                node.kind === 249 /* ImportDeclaration */ ||
-                node.kind === 248 /* ImportEqualsDeclaration */ ||
-                node.kind === 255 /* ExportDeclaration */ ||
-                node.kind === 254 /* ExportAssignment */ ||
-                node.kind === 247 /* NamespaceExportDeclaration */ ||
+            if (node.kind === 242 /* InterfaceDeclaration */ ||
+                node.kind === 243 /* TypeAliasDeclaration */ ||
+                node.kind === 250 /* ImportDeclaration */ ||
+                node.kind === 249 /* ImportEqualsDeclaration */ ||
+                node.kind === 256 /* ExportDeclaration */ ||
+                node.kind === 255 /* ExportAssignment */ ||
+                node.kind === 248 /* NamespaceExportDeclaration */ ||
                 ts.hasModifier(node, 2 /* Ambient */ | 1 /* Export */ | 512 /* Default */)) {
                 return false;
             }
-            return grammarErrorOnFirstToken(node, ts.Diagnostics.A_declare_modifier_is_required_for_a_top_level_declaration_in_a_d_ts_file);
+            return grammarErrorOnFirstToken(node, ts.Diagnostics.Top_level_declarations_in_d_ts_files_must_start_with_either_a_declare_or_export_modifier);
         }
         function checkGrammarTopLevelElementsForRequiredDeclareModifier(file) {
             for (var _i = 0, _a = file.statements; _i < _a.length; _i++) {
                 var decl = _a[_i];
-                if (ts.isDeclaration(decl) || decl.kind === 219 /* VariableStatement */) {
+                if (ts.isDeclaration(decl) || decl.kind === 220 /* VariableStatement */) {
                     if (checkGrammarTopLevelElementForRequiredDeclareModifier(decl)) {
                         return true;
                     }
@@ -60109,11 +62219,11 @@ var ts;
                 // to prevent noisiness.  So use a bit on the block to indicate if
                 // this has already been reported, and don't report if it has.
                 //
-                if (node.parent.kind === 218 /* Block */ || node.parent.kind === 245 /* ModuleBlock */ || node.parent.kind === 284 /* SourceFile */) {
-                    var links_2 = getNodeLinks(node.parent);
+                if (node.parent.kind === 219 /* Block */ || node.parent.kind === 246 /* ModuleBlock */ || node.parent.kind === 285 /* SourceFile */) {
+                    var links_1 = getNodeLinks(node.parent);
                     // Check if the containing block ever report this error
-                    if (!links_2.hasReportedStatementInAmbientContext) {
-                        return links_2.hasReportedStatementInAmbientContext = grammarErrorOnFirstToken(node, ts.Diagnostics.Statements_are_not_allowed_in_ambient_contexts);
+                    if (!links_1.hasReportedStatementInAmbientContext) {
+                        return links_1.hasReportedStatementInAmbientContext = grammarErrorOnFirstToken(node, ts.Diagnostics.Statements_are_not_allowed_in_ambient_contexts);
                     }
                 }
                 else {
@@ -60131,10 +62241,10 @@ var ts;
                 if (languageVersion >= 1 /* ES5 */) {
                     diagnosticMessage = ts.Diagnostics.Octal_literals_are_not_available_when_targeting_ECMAScript_5_and_higher_Use_the_syntax_0;
                 }
-                else if (ts.isChildOfNodeWithKind(node, 182 /* LiteralType */)) {
+                else if (ts.isChildOfNodeWithKind(node, 183 /* LiteralType */)) {
                     diagnosticMessage = ts.Diagnostics.Octal_literal_types_must_use_ES2015_syntax_Use_the_syntax_0;
                 }
-                else if (ts.isChildOfNodeWithKind(node, 278 /* EnumMember */)) {
+                else if (ts.isChildOfNodeWithKind(node, 279 /* EnumMember */)) {
                     diagnosticMessage = ts.Diagnostics.Octal_literals_are_not_allowed_in_enums_members_initializer_Use_the_syntax_0;
                 }
                 if (diagnosticMessage) {
@@ -60149,7 +62259,7 @@ var ts;
             var literalType = ts.isLiteralTypeNode(node.parent) ||
                 ts.isPrefixUnaryExpression(node.parent) && ts.isLiteralTypeNode(node.parent.parent);
             if (!literalType) {
-                if (languageVersion < 7 /* ESNext */) {
+                if (languageVersion < 99 /* ESNext */) {
                     if (grammarErrorOnNode(node, ts.Diagnostics.BigInt_literals_are_not_available_when_targeting_lower_than_ESNext)) {
                         return true;
                     }
@@ -60202,8 +62312,8 @@ var ts;
     /** Like 'isDeclarationName', but returns true for LHS of `import { x as y }` or `export { x as y }`. */
     function isDeclarationNameOrImportPropertyName(name) {
         switch (name.parent.kind) {
-            case 253 /* ImportSpecifier */:
-            case 257 /* ExportSpecifier */:
+            case 254 /* ImportSpecifier */:
+            case 258 /* ExportSpecifier */:
                 return ts.isIdentifier(name);
             default:
                 return ts.isDeclarationName(name);
@@ -60211,14 +62321,14 @@ var ts;
     }
     function isSomeImportDeclaration(decl) {
         switch (decl.kind) {
-            case 250 /* ImportClause */: // For default import
-            case 248 /* ImportEqualsDeclaration */:
-            case 251 /* NamespaceImport */:
-            case 253 /* ImportSpecifier */: // For rename import `x as y`
+            case 251 /* ImportClause */: // For default import
+            case 249 /* ImportEqualsDeclaration */:
+            case 252 /* NamespaceImport */:
+            case 254 /* ImportSpecifier */: // For rename import `x as y`
                 return true;
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 // For regular import, `decl` is an Identifier under the ImportSpecifier.
-                return decl.parent.kind === 253 /* ImportSpecifier */;
+                return decl.parent.kind === 254 /* ImportSpecifier */;
             default:
                 return false;
         }
@@ -60237,6 +62347,13 @@ var ts;
         JsxNames.LibraryManagedAttributes = "LibraryManagedAttributes";
         // tslint:enable variable-name
     })(JsxNames || (JsxNames = {}));
+    function getIterationTypesKeyFromIterationTypeKind(typeKind) {
+        switch (typeKind) {
+            case 0 /* Yield */: return "yieldType";
+            case 1 /* Return */: return "returnType";
+            case 2 /* Next */: return "nextType";
+        }
+    }
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
@@ -60346,7 +62463,7 @@ var ts;
         return node;
     }
     function createIdentifier(text, typeArguments) {
-        var node = createSynthesizedNode(72 /* Identifier */);
+        var node = createSynthesizedNode(73 /* Identifier */);
         node.escapedText = ts.escapeLeadingUnderscores(text);
         node.originalKeywordKind = text ? ts.stringToToken(text) : 0 /* Unknown */;
         node.autoGenerateFlags = 0 /* None */;
@@ -60427,23 +62544,23 @@ var ts;
     ts.createToken = createToken;
     // Reserved words
     function createSuper() {
-        return createSynthesizedNode(98 /* SuperKeyword */);
+        return createSynthesizedNode(99 /* SuperKeyword */);
     }
     ts.createSuper = createSuper;
     function createThis() {
-        return createSynthesizedNode(100 /* ThisKeyword */);
+        return createSynthesizedNode(101 /* ThisKeyword */);
     }
     ts.createThis = createThis;
     function createNull() {
-        return createSynthesizedNode(96 /* NullKeyword */);
+        return createSynthesizedNode(97 /* NullKeyword */);
     }
     ts.createNull = createNull;
     function createTrue() {
-        return createSynthesizedNode(102 /* TrueKeyword */);
+        return createSynthesizedNode(103 /* TrueKeyword */);
     }
     ts.createTrue = createTrue;
     function createFalse() {
-        return createSynthesizedNode(87 /* FalseKeyword */);
+        return createSynthesizedNode(88 /* FalseKeyword */);
     }
     ts.createFalse = createFalse;
     // Modifiers
@@ -60454,44 +62571,44 @@ var ts;
     function createModifiersFromModifierFlags(flags) {
         var result = [];
         if (flags & 1 /* Export */) {
-            result.push(createModifier(85 /* ExportKeyword */));
+            result.push(createModifier(86 /* ExportKeyword */));
         }
         if (flags & 2 /* Ambient */) {
-            result.push(createModifier(125 /* DeclareKeyword */));
+            result.push(createModifier(126 /* DeclareKeyword */));
         }
         if (flags & 512 /* Default */) {
-            result.push(createModifier(80 /* DefaultKeyword */));
+            result.push(createModifier(81 /* DefaultKeyword */));
         }
         if (flags & 2048 /* Const */) {
-            result.push(createModifier(77 /* ConstKeyword */));
+            result.push(createModifier(78 /* ConstKeyword */));
         }
         if (flags & 4 /* Public */) {
-            result.push(createModifier(115 /* PublicKeyword */));
+            result.push(createModifier(116 /* PublicKeyword */));
         }
         if (flags & 8 /* Private */) {
-            result.push(createModifier(113 /* PrivateKeyword */));
+            result.push(createModifier(114 /* PrivateKeyword */));
         }
         if (flags & 16 /* Protected */) {
-            result.push(createModifier(114 /* ProtectedKeyword */));
+            result.push(createModifier(115 /* ProtectedKeyword */));
         }
         if (flags & 128 /* Abstract */) {
-            result.push(createModifier(118 /* AbstractKeyword */));
+            result.push(createModifier(119 /* AbstractKeyword */));
         }
         if (flags & 32 /* Static */) {
-            result.push(createModifier(116 /* StaticKeyword */));
+            result.push(createModifier(117 /* StaticKeyword */));
         }
         if (flags & 64 /* Readonly */) {
-            result.push(createModifier(133 /* ReadonlyKeyword */));
+            result.push(createModifier(134 /* ReadonlyKeyword */));
         }
         if (flags & 256 /* Async */) {
-            result.push(createModifier(121 /* AsyncKeyword */));
+            result.push(createModifier(122 /* AsyncKeyword */));
         }
         return result;
     }
     ts.createModifiersFromModifierFlags = createModifiersFromModifierFlags;
     // Names
     function createQualifiedName(left, right) {
-        var node = createSynthesizedNode(148 /* QualifiedName */);
+        var node = createSynthesizedNode(149 /* QualifiedName */);
         node.left = left;
         node.right = asName(right);
         return node;
@@ -60510,7 +62627,7 @@ var ts;
             : expression;
     }
     function createComputedPropertyName(expression) {
-        var node = createSynthesizedNode(149 /* ComputedPropertyName */);
+        var node = createSynthesizedNode(150 /* ComputedPropertyName */);
         node.expression = parenthesizeForComputedName(expression);
         return node;
     }
@@ -60523,7 +62640,7 @@ var ts;
     ts.updateComputedPropertyName = updateComputedPropertyName;
     // Signature elements
     function createTypeParameterDeclaration(name, constraint, defaultType) {
-        var node = createSynthesizedNode(150 /* TypeParameter */);
+        var node = createSynthesizedNode(151 /* TypeParameter */);
         node.name = asName(name);
         node.constraint = constraint;
         node.default = defaultType;
@@ -60539,7 +62656,7 @@ var ts;
     }
     ts.updateTypeParameterDeclaration = updateTypeParameterDeclaration;
     function createParameter(decorators, modifiers, dotDotDotToken, name, questionToken, type, initializer) {
-        var node = createSynthesizedNode(151 /* Parameter */);
+        var node = createSynthesizedNode(152 /* Parameter */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.dotDotDotToken = dotDotDotToken;
@@ -60563,7 +62680,7 @@ var ts;
     }
     ts.updateParameter = updateParameter;
     function createDecorator(expression) {
-        var node = createSynthesizedNode(152 /* Decorator */);
+        var node = createSynthesizedNode(153 /* Decorator */);
         node.expression = ts.parenthesizeForAccess(expression);
         return node;
     }
@@ -60576,7 +62693,7 @@ var ts;
     ts.updateDecorator = updateDecorator;
     // Type Elements
     function createPropertySignature(modifiers, name, questionToken, type, initializer) {
-        var node = createSynthesizedNode(153 /* PropertySignature */);
+        var node = createSynthesizedNode(154 /* PropertySignature */);
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
         node.questionToken = questionToken;
@@ -60596,7 +62713,7 @@ var ts;
     }
     ts.updatePropertySignature = updatePropertySignature;
     function createProperty(decorators, modifiers, name, questionOrExclamationToken, type, initializer) {
-        var node = createSynthesizedNode(154 /* PropertyDeclaration */);
+        var node = createSynthesizedNode(155 /* PropertyDeclaration */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
@@ -60620,7 +62737,7 @@ var ts;
     }
     ts.updateProperty = updateProperty;
     function createMethodSignature(typeParameters, parameters, type, name, questionToken) {
-        var node = createSignatureDeclaration(155 /* MethodSignature */, typeParameters, parameters, type);
+        var node = createSignatureDeclaration(156 /* MethodSignature */, typeParameters, parameters, type);
         node.name = asName(name);
         node.questionToken = questionToken;
         return node;
@@ -60637,7 +62754,7 @@ var ts;
     }
     ts.updateMethodSignature = updateMethodSignature;
     function createMethod(decorators, modifiers, asteriskToken, name, questionToken, typeParameters, parameters, type, body) {
-        var node = createSynthesizedNode(156 /* MethodDeclaration */);
+        var node = createSynthesizedNode(157 /* MethodDeclaration */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.asteriskToken = asteriskToken;
@@ -60665,7 +62782,7 @@ var ts;
     }
     ts.updateMethod = updateMethod;
     function createConstructor(decorators, modifiers, parameters, body) {
-        var node = createSynthesizedNode(157 /* Constructor */);
+        var node = createSynthesizedNode(158 /* Constructor */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.typeParameters = undefined;
@@ -60685,7 +62802,7 @@ var ts;
     }
     ts.updateConstructor = updateConstructor;
     function createGetAccessor(decorators, modifiers, name, parameters, type, body) {
-        var node = createSynthesizedNode(158 /* GetAccessor */);
+        var node = createSynthesizedNode(159 /* GetAccessor */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
@@ -60708,7 +62825,7 @@ var ts;
     }
     ts.updateGetAccessor = updateGetAccessor;
     function createSetAccessor(decorators, modifiers, name, parameters, body) {
-        var node = createSynthesizedNode(159 /* SetAccessor */);
+        var node = createSynthesizedNode(160 /* SetAccessor */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
@@ -60729,7 +62846,7 @@ var ts;
     }
     ts.updateSetAccessor = updateSetAccessor;
     function createCallSignature(typeParameters, parameters, type) {
-        return createSignatureDeclaration(160 /* CallSignature */, typeParameters, parameters, type);
+        return createSignatureDeclaration(161 /* CallSignature */, typeParameters, parameters, type);
     }
     ts.createCallSignature = createCallSignature;
     function updateCallSignature(node, typeParameters, parameters, type) {
@@ -60737,7 +62854,7 @@ var ts;
     }
     ts.updateCallSignature = updateCallSignature;
     function createConstructSignature(typeParameters, parameters, type) {
-        return createSignatureDeclaration(161 /* ConstructSignature */, typeParameters, parameters, type);
+        return createSignatureDeclaration(162 /* ConstructSignature */, typeParameters, parameters, type);
     }
     ts.createConstructSignature = createConstructSignature;
     function updateConstructSignature(node, typeParameters, parameters, type) {
@@ -60745,7 +62862,7 @@ var ts;
     }
     ts.updateConstructSignature = updateConstructSignature;
     function createIndexSignature(decorators, modifiers, parameters, type) {
-        var node = createSynthesizedNode(162 /* IndexSignature */);
+        var node = createSynthesizedNode(163 /* IndexSignature */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.parameters = createNodeArray(parameters);
@@ -60785,7 +62902,7 @@ var ts;
     }
     ts.createKeywordTypeNode = createKeywordTypeNode;
     function createTypePredicateNode(parameterName, type) {
-        var node = createSynthesizedNode(163 /* TypePredicate */);
+        var node = createSynthesizedNode(164 /* TypePredicate */);
         node.parameterName = asName(parameterName);
         node.type = type;
         return node;
@@ -60799,7 +62916,7 @@ var ts;
     }
     ts.updateTypePredicateNode = updateTypePredicateNode;
     function createTypeReferenceNode(typeName, typeArguments) {
-        var node = createSynthesizedNode(164 /* TypeReference */);
+        var node = createSynthesizedNode(165 /* TypeReference */);
         node.typeName = asName(typeName);
         node.typeArguments = typeArguments && ts.parenthesizeTypeParameters(typeArguments);
         return node;
@@ -60813,7 +62930,7 @@ var ts;
     }
     ts.updateTypeReferenceNode = updateTypeReferenceNode;
     function createFunctionTypeNode(typeParameters, parameters, type) {
-        return createSignatureDeclaration(165 /* FunctionType */, typeParameters, parameters, type);
+        return createSignatureDeclaration(166 /* FunctionType */, typeParameters, parameters, type);
     }
     ts.createFunctionTypeNode = createFunctionTypeNode;
     function updateFunctionTypeNode(node, typeParameters, parameters, type) {
@@ -60821,7 +62938,7 @@ var ts;
     }
     ts.updateFunctionTypeNode = updateFunctionTypeNode;
     function createConstructorTypeNode(typeParameters, parameters, type) {
-        return createSignatureDeclaration(166 /* ConstructorType */, typeParameters, parameters, type);
+        return createSignatureDeclaration(167 /* ConstructorType */, typeParameters, parameters, type);
     }
     ts.createConstructorTypeNode = createConstructorTypeNode;
     function updateConstructorTypeNode(node, typeParameters, parameters, type) {
@@ -60829,7 +62946,7 @@ var ts;
     }
     ts.updateConstructorTypeNode = updateConstructorTypeNode;
     function createTypeQueryNode(exprName) {
-        var node = createSynthesizedNode(167 /* TypeQuery */);
+        var node = createSynthesizedNode(168 /* TypeQuery */);
         node.exprName = exprName;
         return node;
     }
@@ -60841,7 +62958,7 @@ var ts;
     }
     ts.updateTypeQueryNode = updateTypeQueryNode;
     function createTypeLiteralNode(members) {
-        var node = createSynthesizedNode(168 /* TypeLiteral */);
+        var node = createSynthesizedNode(169 /* TypeLiteral */);
         node.members = createNodeArray(members);
         return node;
     }
@@ -60853,7 +62970,7 @@ var ts;
     }
     ts.updateTypeLiteralNode = updateTypeLiteralNode;
     function createArrayTypeNode(elementType) {
-        var node = createSynthesizedNode(169 /* ArrayType */);
+        var node = createSynthesizedNode(170 /* ArrayType */);
         node.elementType = ts.parenthesizeArrayTypeMember(elementType);
         return node;
     }
@@ -60865,7 +62982,7 @@ var ts;
     }
     ts.updateArrayTypeNode = updateArrayTypeNode;
     function createTupleTypeNode(elementTypes) {
-        var node = createSynthesizedNode(170 /* TupleType */);
+        var node = createSynthesizedNode(171 /* TupleType */);
         node.elementTypes = createNodeArray(elementTypes);
         return node;
     }
@@ -60877,7 +62994,7 @@ var ts;
     }
     ts.updateTupleTypeNode = updateTupleTypeNode;
     function createOptionalTypeNode(type) {
-        var node = createSynthesizedNode(171 /* OptionalType */);
+        var node = createSynthesizedNode(172 /* OptionalType */);
         node.type = ts.parenthesizeArrayTypeMember(type);
         return node;
     }
@@ -60889,7 +63006,7 @@ var ts;
     }
     ts.updateOptionalTypeNode = updateOptionalTypeNode;
     function createRestTypeNode(type) {
-        var node = createSynthesizedNode(172 /* RestType */);
+        var node = createSynthesizedNode(173 /* RestType */);
         node.type = type;
         return node;
     }
@@ -60901,7 +63018,7 @@ var ts;
     }
     ts.updateRestTypeNode = updateRestTypeNode;
     function createUnionTypeNode(types) {
-        return createUnionOrIntersectionTypeNode(173 /* UnionType */, types);
+        return createUnionOrIntersectionTypeNode(174 /* UnionType */, types);
     }
     ts.createUnionTypeNode = createUnionTypeNode;
     function updateUnionTypeNode(node, types) {
@@ -60909,7 +63026,7 @@ var ts;
     }
     ts.updateUnionTypeNode = updateUnionTypeNode;
     function createIntersectionTypeNode(types) {
-        return createUnionOrIntersectionTypeNode(174 /* IntersectionType */, types);
+        return createUnionOrIntersectionTypeNode(175 /* IntersectionType */, types);
     }
     ts.createIntersectionTypeNode = createIntersectionTypeNode;
     function updateIntersectionTypeNode(node, types) {
@@ -60928,7 +63045,7 @@ var ts;
             : node;
     }
     function createConditionalTypeNode(checkType, extendsType, trueType, falseType) {
-        var node = createSynthesizedNode(175 /* ConditionalType */);
+        var node = createSynthesizedNode(176 /* ConditionalType */);
         node.checkType = ts.parenthesizeConditionalTypeMember(checkType);
         node.extendsType = ts.parenthesizeConditionalTypeMember(extendsType);
         node.trueType = trueType;
@@ -60946,7 +63063,7 @@ var ts;
     }
     ts.updateConditionalTypeNode = updateConditionalTypeNode;
     function createInferTypeNode(typeParameter) {
-        var node = createSynthesizedNode(176 /* InferType */);
+        var node = createSynthesizedNode(177 /* InferType */);
         node.typeParameter = typeParameter;
         return node;
     }
@@ -60958,10 +63075,10 @@ var ts;
     }
     ts.updateInferTypeNode = updateInferTypeNode;
     function createImportTypeNode(argument, qualifier, typeArguments, isTypeOf) {
-        var node = createSynthesizedNode(183 /* ImportType */);
+        var node = createSynthesizedNode(184 /* ImportType */);
         node.argument = argument;
         node.qualifier = qualifier;
-        node.typeArguments = asNodeArray(typeArguments);
+        node.typeArguments = ts.parenthesizeTypeParameters(typeArguments);
         node.isTypeOf = isTypeOf;
         return node;
     }
@@ -60976,7 +63093,7 @@ var ts;
     }
     ts.updateImportTypeNode = updateImportTypeNode;
     function createParenthesizedType(type) {
-        var node = createSynthesizedNode(177 /* ParenthesizedType */);
+        var node = createSynthesizedNode(178 /* ParenthesizedType */);
         node.type = type;
         return node;
     }
@@ -60988,12 +63105,12 @@ var ts;
     }
     ts.updateParenthesizedType = updateParenthesizedType;
     function createThisTypeNode() {
-        return createSynthesizedNode(178 /* ThisType */);
+        return createSynthesizedNode(179 /* ThisType */);
     }
     ts.createThisTypeNode = createThisTypeNode;
     function createTypeOperatorNode(operatorOrType, type) {
-        var node = createSynthesizedNode(179 /* TypeOperator */);
-        node.operator = typeof operatorOrType === "number" ? operatorOrType : 129 /* KeyOfKeyword */;
+        var node = createSynthesizedNode(180 /* TypeOperator */);
+        node.operator = typeof operatorOrType === "number" ? operatorOrType : 130 /* KeyOfKeyword */;
         node.type = ts.parenthesizeElementTypeMember(typeof operatorOrType === "number" ? type : operatorOrType);
         return node;
     }
@@ -61003,7 +63120,7 @@ var ts;
     }
     ts.updateTypeOperatorNode = updateTypeOperatorNode;
     function createIndexedAccessTypeNode(objectType, indexType) {
-        var node = createSynthesizedNode(180 /* IndexedAccessType */);
+        var node = createSynthesizedNode(181 /* IndexedAccessType */);
         node.objectType = ts.parenthesizeElementTypeMember(objectType);
         node.indexType = indexType;
         return node;
@@ -61017,7 +63134,7 @@ var ts;
     }
     ts.updateIndexedAccessTypeNode = updateIndexedAccessTypeNode;
     function createMappedTypeNode(readonlyToken, typeParameter, questionToken, type) {
-        var node = createSynthesizedNode(181 /* MappedType */);
+        var node = createSynthesizedNode(182 /* MappedType */);
         node.readonlyToken = readonlyToken;
         node.typeParameter = typeParameter;
         node.questionToken = questionToken;
@@ -61035,7 +63152,7 @@ var ts;
     }
     ts.updateMappedTypeNode = updateMappedTypeNode;
     function createLiteralTypeNode(literal) {
-        var node = createSynthesizedNode(182 /* LiteralType */);
+        var node = createSynthesizedNode(183 /* LiteralType */);
         node.literal = literal;
         return node;
     }
@@ -61048,7 +63165,7 @@ var ts;
     ts.updateLiteralTypeNode = updateLiteralTypeNode;
     // Binding Patterns
     function createObjectBindingPattern(elements) {
-        var node = createSynthesizedNode(184 /* ObjectBindingPattern */);
+        var node = createSynthesizedNode(185 /* ObjectBindingPattern */);
         node.elements = createNodeArray(elements);
         return node;
     }
@@ -61060,7 +63177,7 @@ var ts;
     }
     ts.updateObjectBindingPattern = updateObjectBindingPattern;
     function createArrayBindingPattern(elements) {
-        var node = createSynthesizedNode(185 /* ArrayBindingPattern */);
+        var node = createSynthesizedNode(186 /* ArrayBindingPattern */);
         node.elements = createNodeArray(elements);
         return node;
     }
@@ -61072,7 +63189,7 @@ var ts;
     }
     ts.updateArrayBindingPattern = updateArrayBindingPattern;
     function createBindingElement(dotDotDotToken, propertyName, name, initializer) {
-        var node = createSynthesizedNode(186 /* BindingElement */);
+        var node = createSynthesizedNode(187 /* BindingElement */);
         node.dotDotDotToken = dotDotDotToken;
         node.propertyName = asName(propertyName);
         node.name = asName(name);
@@ -61091,7 +63208,7 @@ var ts;
     ts.updateBindingElement = updateBindingElement;
     // Expression
     function createArrayLiteral(elements, multiLine) {
-        var node = createSynthesizedNode(187 /* ArrayLiteralExpression */);
+        var node = createSynthesizedNode(188 /* ArrayLiteralExpression */);
         node.elements = ts.parenthesizeListElements(createNodeArray(elements));
         if (multiLine)
             node.multiLine = true;
@@ -61105,7 +63222,7 @@ var ts;
     }
     ts.updateArrayLiteral = updateArrayLiteral;
     function createObjectLiteral(properties, multiLine) {
-        var node = createSynthesizedNode(188 /* ObjectLiteralExpression */);
+        var node = createSynthesizedNode(189 /* ObjectLiteralExpression */);
         node.properties = createNodeArray(properties);
         if (multiLine)
             node.multiLine = true;
@@ -61119,9 +63236,9 @@ var ts;
     }
     ts.updateObjectLiteral = updateObjectLiteral;
     function createPropertyAccess(expression, name) {
-        var node = createSynthesizedNode(189 /* PropertyAccessExpression */);
+        var node = createSynthesizedNode(190 /* PropertyAccessExpression */);
         node.expression = ts.parenthesizeForAccess(expression);
-        node.name = asName(name); // TODO: GH#18217
+        node.name = asName(name);
         setEmitFlags(node, 131072 /* NoIndentation */);
         return node;
     }
@@ -61136,7 +63253,7 @@ var ts;
     }
     ts.updatePropertyAccess = updatePropertyAccess;
     function createElementAccess(expression, index) {
-        var node = createSynthesizedNode(190 /* ElementAccessExpression */);
+        var node = createSynthesizedNode(191 /* ElementAccessExpression */);
         node.expression = ts.parenthesizeForAccess(expression);
         node.argumentExpression = asExpression(index);
         return node;
@@ -61150,7 +63267,7 @@ var ts;
     }
     ts.updateElementAccess = updateElementAccess;
     function createCall(expression, typeArguments, argumentsArray) {
-        var node = createSynthesizedNode(191 /* CallExpression */);
+        var node = createSynthesizedNode(192 /* CallExpression */);
         node.expression = ts.parenthesizeForAccess(expression);
         node.typeArguments = asNodeArray(typeArguments);
         node.arguments = ts.parenthesizeListElements(createNodeArray(argumentsArray));
@@ -61166,7 +63283,7 @@ var ts;
     }
     ts.updateCall = updateCall;
     function createNew(expression, typeArguments, argumentsArray) {
-        var node = createSynthesizedNode(192 /* NewExpression */);
+        var node = createSynthesizedNode(193 /* NewExpression */);
         node.expression = ts.parenthesizeForNew(expression);
         node.typeArguments = asNodeArray(typeArguments);
         node.arguments = argumentsArray ? ts.parenthesizeListElements(createNodeArray(argumentsArray)) : undefined;
@@ -61182,7 +63299,7 @@ var ts;
     }
     ts.updateNew = updateNew;
     function createTaggedTemplate(tag, typeArgumentsOrTemplate, template) {
-        var node = createSynthesizedNode(193 /* TaggedTemplateExpression */);
+        var node = createSynthesizedNode(194 /* TaggedTemplateExpression */);
         node.tag = ts.parenthesizeForAccess(tag);
         if (template) {
             node.typeArguments = asNodeArray(typeArgumentsOrTemplate);
@@ -61205,7 +63322,7 @@ var ts;
     }
     ts.updateTaggedTemplate = updateTaggedTemplate;
     function createTypeAssertion(type, expression) {
-        var node = createSynthesizedNode(194 /* TypeAssertionExpression */);
+        var node = createSynthesizedNode(195 /* TypeAssertionExpression */);
         node.type = type;
         node.expression = ts.parenthesizePrefixOperand(expression);
         return node;
@@ -61219,7 +63336,7 @@ var ts;
     }
     ts.updateTypeAssertion = updateTypeAssertion;
     function createParen(expression) {
-        var node = createSynthesizedNode(195 /* ParenthesizedExpression */);
+        var node = createSynthesizedNode(196 /* ParenthesizedExpression */);
         node.expression = expression;
         return node;
     }
@@ -61231,7 +63348,7 @@ var ts;
     }
     ts.updateParen = updateParen;
     function createFunctionExpression(modifiers, asteriskToken, name, typeParameters, parameters, type, body) {
-        var node = createSynthesizedNode(196 /* FunctionExpression */);
+        var node = createSynthesizedNode(197 /* FunctionExpression */);
         node.modifiers = asNodeArray(modifiers);
         node.asteriskToken = asteriskToken;
         node.name = asName(name);
@@ -61255,7 +63372,7 @@ var ts;
     }
     ts.updateFunctionExpression = updateFunctionExpression;
     function createArrowFunction(modifiers, typeParameters, parameters, type, equalsGreaterThanToken, body) {
-        var node = createSynthesizedNode(197 /* ArrowFunction */);
+        var node = createSynthesizedNode(198 /* ArrowFunction */);
         node.modifiers = asNodeArray(modifiers);
         node.typeParameters = asNodeArray(typeParameters);
         node.parameters = createNodeArray(parameters);
@@ -61277,7 +63394,7 @@ var ts;
     }
     ts.updateArrowFunction = updateArrowFunction;
     function createDelete(expression) {
-        var node = createSynthesizedNode(198 /* DeleteExpression */);
+        var node = createSynthesizedNode(199 /* DeleteExpression */);
         node.expression = ts.parenthesizePrefixOperand(expression);
         return node;
     }
@@ -61289,7 +63406,7 @@ var ts;
     }
     ts.updateDelete = updateDelete;
     function createTypeOf(expression) {
-        var node = createSynthesizedNode(199 /* TypeOfExpression */);
+        var node = createSynthesizedNode(200 /* TypeOfExpression */);
         node.expression = ts.parenthesizePrefixOperand(expression);
         return node;
     }
@@ -61301,7 +63418,7 @@ var ts;
     }
     ts.updateTypeOf = updateTypeOf;
     function createVoid(expression) {
-        var node = createSynthesizedNode(200 /* VoidExpression */);
+        var node = createSynthesizedNode(201 /* VoidExpression */);
         node.expression = ts.parenthesizePrefixOperand(expression);
         return node;
     }
@@ -61313,7 +63430,7 @@ var ts;
     }
     ts.updateVoid = updateVoid;
     function createAwait(expression) {
-        var node = createSynthesizedNode(201 /* AwaitExpression */);
+        var node = createSynthesizedNode(202 /* AwaitExpression */);
         node.expression = ts.parenthesizePrefixOperand(expression);
         return node;
     }
@@ -61325,7 +63442,7 @@ var ts;
     }
     ts.updateAwait = updateAwait;
     function createPrefix(operator, operand) {
-        var node = createSynthesizedNode(202 /* PrefixUnaryExpression */);
+        var node = createSynthesizedNode(203 /* PrefixUnaryExpression */);
         node.operator = operator;
         node.operand = ts.parenthesizePrefixOperand(operand);
         return node;
@@ -61338,7 +63455,7 @@ var ts;
     }
     ts.updatePrefix = updatePrefix;
     function createPostfix(operand, operator) {
-        var node = createSynthesizedNode(203 /* PostfixUnaryExpression */);
+        var node = createSynthesizedNode(204 /* PostfixUnaryExpression */);
         node.operand = ts.parenthesizePostfixOperand(operand);
         node.operator = operator;
         return node;
@@ -61351,7 +63468,7 @@ var ts;
     }
     ts.updatePostfix = updatePostfix;
     function createBinary(left, operator, right) {
-        var node = createSynthesizedNode(204 /* BinaryExpression */);
+        var node = createSynthesizedNode(205 /* BinaryExpression */);
         var operatorToken = asToken(operator);
         var operatorKind = operatorToken.kind;
         node.left = ts.parenthesizeBinaryOperand(operatorKind, left, /*isLeftSideOfBinary*/ true, /*leftOperand*/ undefined);
@@ -61368,7 +63485,7 @@ var ts;
     }
     ts.updateBinary = updateBinary;
     function createConditional(condition, questionTokenOrWhenTrue, whenTrueOrWhenFalse, colonToken, whenFalse) {
-        var node = createSynthesizedNode(205 /* ConditionalExpression */);
+        var node = createSynthesizedNode(206 /* ConditionalExpression */);
         node.condition = ts.parenthesizeForConditionalHead(condition);
         node.questionToken = whenFalse ? questionTokenOrWhenTrue : createToken(56 /* QuestionToken */);
         node.whenTrue = ts.parenthesizeSubexpressionOfConditionalExpression(whenFalse ? whenTrueOrWhenFalse : questionTokenOrWhenTrue);
@@ -61388,7 +63505,7 @@ var ts;
     }
     ts.updateConditional = updateConditional;
     function createTemplateExpression(head, templateSpans) {
-        var node = createSynthesizedNode(206 /* TemplateExpression */);
+        var node = createSynthesizedNode(207 /* TemplateExpression */);
         node.head = head;
         node.templateSpans = createNodeArray(templateSpans);
         return node;
@@ -61426,7 +63543,7 @@ var ts;
     }
     ts.createNoSubstitutionTemplateLiteral = createNoSubstitutionTemplateLiteral;
     function createYield(asteriskTokenOrExpression, expression) {
-        var node = createSynthesizedNode(207 /* YieldExpression */);
+        var node = createSynthesizedNode(208 /* YieldExpression */);
         node.asteriskToken = asteriskTokenOrExpression && asteriskTokenOrExpression.kind === 40 /* AsteriskToken */ ? asteriskTokenOrExpression : undefined;
         node.expression = asteriskTokenOrExpression && asteriskTokenOrExpression.kind !== 40 /* AsteriskToken */ ? asteriskTokenOrExpression : expression;
         return node;
@@ -61440,7 +63557,7 @@ var ts;
     }
     ts.updateYield = updateYield;
     function createSpread(expression) {
-        var node = createSynthesizedNode(208 /* SpreadElement */);
+        var node = createSynthesizedNode(209 /* SpreadElement */);
         node.expression = ts.parenthesizeExpressionForList(expression);
         return node;
     }
@@ -61452,7 +63569,7 @@ var ts;
     }
     ts.updateSpread = updateSpread;
     function createClassExpression(modifiers, name, typeParameters, heritageClauses, members) {
-        var node = createSynthesizedNode(209 /* ClassExpression */);
+        var node = createSynthesizedNode(210 /* ClassExpression */);
         node.decorators = undefined;
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
@@ -61473,11 +63590,11 @@ var ts;
     }
     ts.updateClassExpression = updateClassExpression;
     function createOmittedExpression() {
-        return createSynthesizedNode(210 /* OmittedExpression */);
+        return createSynthesizedNode(211 /* OmittedExpression */);
     }
     ts.createOmittedExpression = createOmittedExpression;
     function createExpressionWithTypeArguments(typeArguments, expression) {
-        var node = createSynthesizedNode(211 /* ExpressionWithTypeArguments */);
+        var node = createSynthesizedNode(212 /* ExpressionWithTypeArguments */);
         node.expression = ts.parenthesizeForAccess(expression);
         node.typeArguments = asNodeArray(typeArguments);
         return node;
@@ -61491,7 +63608,7 @@ var ts;
     }
     ts.updateExpressionWithTypeArguments = updateExpressionWithTypeArguments;
     function createAsExpression(expression, type) {
-        var node = createSynthesizedNode(212 /* AsExpression */);
+        var node = createSynthesizedNode(213 /* AsExpression */);
         node.expression = expression;
         node.type = type;
         return node;
@@ -61505,7 +63622,7 @@ var ts;
     }
     ts.updateAsExpression = updateAsExpression;
     function createNonNullExpression(expression) {
-        var node = createSynthesizedNode(213 /* NonNullExpression */);
+        var node = createSynthesizedNode(214 /* NonNullExpression */);
         node.expression = ts.parenthesizeForAccess(expression);
         return node;
     }
@@ -61517,7 +63634,7 @@ var ts;
     }
     ts.updateNonNullExpression = updateNonNullExpression;
     function createMetaProperty(keywordToken, name) {
-        var node = createSynthesizedNode(214 /* MetaProperty */);
+        var node = createSynthesizedNode(215 /* MetaProperty */);
         node.keywordToken = keywordToken;
         node.name = name;
         return node;
@@ -61531,7 +63648,7 @@ var ts;
     ts.updateMetaProperty = updateMetaProperty;
     // Misc
     function createTemplateSpan(expression, literal) {
-        var node = createSynthesizedNode(216 /* TemplateSpan */);
+        var node = createSynthesizedNode(217 /* TemplateSpan */);
         node.expression = expression;
         node.literal = literal;
         return node;
@@ -61545,12 +63662,12 @@ var ts;
     }
     ts.updateTemplateSpan = updateTemplateSpan;
     function createSemicolonClassElement() {
-        return createSynthesizedNode(217 /* SemicolonClassElement */);
+        return createSynthesizedNode(218 /* SemicolonClassElement */);
     }
     ts.createSemicolonClassElement = createSemicolonClassElement;
     // Element
     function createBlock(statements, multiLine) {
-        var block = createSynthesizedNode(218 /* Block */);
+        var block = createSynthesizedNode(219 /* Block */);
         block.statements = createNodeArray(statements);
         if (multiLine)
             block.multiLine = multiLine;
@@ -61564,7 +63681,7 @@ var ts;
     }
     ts.updateBlock = updateBlock;
     function createVariableStatement(modifiers, declarationList) {
-        var node = createSynthesizedNode(219 /* VariableStatement */);
+        var node = createSynthesizedNode(220 /* VariableStatement */);
         node.decorators = undefined;
         node.modifiers = asNodeArray(modifiers);
         node.declarationList = ts.isArray(declarationList) ? createVariableDeclarationList(declarationList) : declarationList;
@@ -61579,11 +63696,11 @@ var ts;
     }
     ts.updateVariableStatement = updateVariableStatement;
     function createEmptyStatement() {
-        return createSynthesizedNode(220 /* EmptyStatement */);
+        return createSynthesizedNode(221 /* EmptyStatement */);
     }
     ts.createEmptyStatement = createEmptyStatement;
     function createExpressionStatement(expression) {
-        var node = createSynthesizedNode(221 /* ExpressionStatement */);
+        var node = createSynthesizedNode(222 /* ExpressionStatement */);
         node.expression = ts.parenthesizeExpressionForExpressionStatement(expression);
         return node;
     }
@@ -61599,10 +63716,10 @@ var ts;
     /** @deprecated Use `updateExpressionStatement` instead.  */
     ts.updateStatement = updateExpressionStatement;
     function createIf(expression, thenStatement, elseStatement) {
-        var node = createSynthesizedNode(222 /* IfStatement */);
+        var node = createSynthesizedNode(223 /* IfStatement */);
         node.expression = expression;
-        node.thenStatement = thenStatement;
-        node.elseStatement = elseStatement;
+        node.thenStatement = asEmbeddedStatement(thenStatement);
+        node.elseStatement = asEmbeddedStatement(elseStatement);
         return node;
     }
     ts.createIf = createIf;
@@ -61615,8 +63732,8 @@ var ts;
     }
     ts.updateIf = updateIf;
     function createDo(statement, expression) {
-        var node = createSynthesizedNode(223 /* DoStatement */);
-        node.statement = statement;
+        var node = createSynthesizedNode(224 /* DoStatement */);
+        node.statement = asEmbeddedStatement(statement);
         node.expression = expression;
         return node;
     }
@@ -61629,9 +63746,9 @@ var ts;
     }
     ts.updateDo = updateDo;
     function createWhile(expression, statement) {
-        var node = createSynthesizedNode(224 /* WhileStatement */);
+        var node = createSynthesizedNode(225 /* WhileStatement */);
         node.expression = expression;
-        node.statement = statement;
+        node.statement = asEmbeddedStatement(statement);
         return node;
     }
     ts.createWhile = createWhile;
@@ -61643,11 +63760,11 @@ var ts;
     }
     ts.updateWhile = updateWhile;
     function createFor(initializer, condition, incrementor, statement) {
-        var node = createSynthesizedNode(225 /* ForStatement */);
+        var node = createSynthesizedNode(226 /* ForStatement */);
         node.initializer = initializer;
         node.condition = condition;
         node.incrementor = incrementor;
-        node.statement = statement;
+        node.statement = asEmbeddedStatement(statement);
         return node;
     }
     ts.createFor = createFor;
@@ -61661,10 +63778,10 @@ var ts;
     }
     ts.updateFor = updateFor;
     function createForIn(initializer, expression, statement) {
-        var node = createSynthesizedNode(226 /* ForInStatement */);
+        var node = createSynthesizedNode(227 /* ForInStatement */);
         node.initializer = initializer;
         node.expression = expression;
-        node.statement = statement;
+        node.statement = asEmbeddedStatement(statement);
         return node;
     }
     ts.createForIn = createForIn;
@@ -61677,11 +63794,11 @@ var ts;
     }
     ts.updateForIn = updateForIn;
     function createForOf(awaitModifier, initializer, expression, statement) {
-        var node = createSynthesizedNode(227 /* ForOfStatement */);
+        var node = createSynthesizedNode(228 /* ForOfStatement */);
         node.awaitModifier = awaitModifier;
         node.initializer = initializer;
         node.expression = expression;
-        node.statement = statement;
+        node.statement = asEmbeddedStatement(statement);
         return node;
     }
     ts.createForOf = createForOf;
@@ -61695,7 +63812,7 @@ var ts;
     }
     ts.updateForOf = updateForOf;
     function createContinue(label) {
-        var node = createSynthesizedNode(228 /* ContinueStatement */);
+        var node = createSynthesizedNode(229 /* ContinueStatement */);
         node.label = asName(label);
         return node;
     }
@@ -61707,7 +63824,7 @@ var ts;
     }
     ts.updateContinue = updateContinue;
     function createBreak(label) {
-        var node = createSynthesizedNode(229 /* BreakStatement */);
+        var node = createSynthesizedNode(230 /* BreakStatement */);
         node.label = asName(label);
         return node;
     }
@@ -61719,7 +63836,7 @@ var ts;
     }
     ts.updateBreak = updateBreak;
     function createReturn(expression) {
-        var node = createSynthesizedNode(230 /* ReturnStatement */);
+        var node = createSynthesizedNode(231 /* ReturnStatement */);
         node.expression = expression;
         return node;
     }
@@ -61731,9 +63848,9 @@ var ts;
     }
     ts.updateReturn = updateReturn;
     function createWith(expression, statement) {
-        var node = createSynthesizedNode(231 /* WithStatement */);
+        var node = createSynthesizedNode(232 /* WithStatement */);
         node.expression = expression;
-        node.statement = statement;
+        node.statement = asEmbeddedStatement(statement);
         return node;
     }
     ts.createWith = createWith;
@@ -61745,7 +63862,7 @@ var ts;
     }
     ts.updateWith = updateWith;
     function createSwitch(expression, caseBlock) {
-        var node = createSynthesizedNode(232 /* SwitchStatement */);
+        var node = createSynthesizedNode(233 /* SwitchStatement */);
         node.expression = ts.parenthesizeExpressionForList(expression);
         node.caseBlock = caseBlock;
         return node;
@@ -61759,9 +63876,9 @@ var ts;
     }
     ts.updateSwitch = updateSwitch;
     function createLabel(label, statement) {
-        var node = createSynthesizedNode(233 /* LabeledStatement */);
+        var node = createSynthesizedNode(234 /* LabeledStatement */);
         node.label = asName(label);
-        node.statement = statement;
+        node.statement = asEmbeddedStatement(statement);
         return node;
     }
     ts.createLabel = createLabel;
@@ -61773,7 +63890,7 @@ var ts;
     }
     ts.updateLabel = updateLabel;
     function createThrow(expression) {
-        var node = createSynthesizedNode(234 /* ThrowStatement */);
+        var node = createSynthesizedNode(235 /* ThrowStatement */);
         node.expression = expression;
         return node;
     }
@@ -61785,7 +63902,7 @@ var ts;
     }
     ts.updateThrow = updateThrow;
     function createTry(tryBlock, catchClause, finallyBlock) {
-        var node = createSynthesizedNode(235 /* TryStatement */);
+        var node = createSynthesizedNode(236 /* TryStatement */);
         node.tryBlock = tryBlock;
         node.catchClause = catchClause;
         node.finallyBlock = finallyBlock;
@@ -61801,11 +63918,11 @@ var ts;
     }
     ts.updateTry = updateTry;
     function createDebuggerStatement() {
-        return createSynthesizedNode(236 /* DebuggerStatement */);
+        return createSynthesizedNode(237 /* DebuggerStatement */);
     }
     ts.createDebuggerStatement = createDebuggerStatement;
     function createVariableDeclaration(name, type, initializer) {
-        var node = createSynthesizedNode(237 /* VariableDeclaration */);
+        var node = createSynthesizedNode(238 /* VariableDeclaration */);
         node.name = asName(name);
         node.type = type;
         node.initializer = initializer !== undefined ? ts.parenthesizeExpressionForList(initializer) : undefined;
@@ -61822,7 +63939,7 @@ var ts;
     ts.updateVariableDeclaration = updateVariableDeclaration;
     function createVariableDeclarationList(declarations, flags) {
         if (flags === void 0) { flags = 0 /* None */; }
-        var node = createSynthesizedNode(238 /* VariableDeclarationList */);
+        var node = createSynthesizedNode(239 /* VariableDeclarationList */);
         node.flags |= flags & 3 /* BlockScoped */;
         node.declarations = createNodeArray(declarations);
         return node;
@@ -61835,7 +63952,7 @@ var ts;
     }
     ts.updateVariableDeclarationList = updateVariableDeclarationList;
     function createFunctionDeclaration(decorators, modifiers, asteriskToken, name, typeParameters, parameters, type, body) {
-        var node = createSynthesizedNode(239 /* FunctionDeclaration */);
+        var node = createSynthesizedNode(240 /* FunctionDeclaration */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.asteriskToken = asteriskToken;
@@ -61861,7 +63978,7 @@ var ts;
     }
     ts.updateFunctionDeclaration = updateFunctionDeclaration;
     function createClassDeclaration(decorators, modifiers, name, typeParameters, heritageClauses, members) {
-        var node = createSynthesizedNode(240 /* ClassDeclaration */);
+        var node = createSynthesizedNode(241 /* ClassDeclaration */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
@@ -61883,7 +64000,7 @@ var ts;
     }
     ts.updateClassDeclaration = updateClassDeclaration;
     function createInterfaceDeclaration(decorators, modifiers, name, typeParameters, heritageClauses, members) {
-        var node = createSynthesizedNode(241 /* InterfaceDeclaration */);
+        var node = createSynthesizedNode(242 /* InterfaceDeclaration */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
@@ -61905,7 +64022,7 @@ var ts;
     }
     ts.updateInterfaceDeclaration = updateInterfaceDeclaration;
     function createTypeAliasDeclaration(decorators, modifiers, name, typeParameters, type) {
-        var node = createSynthesizedNode(242 /* TypeAliasDeclaration */);
+        var node = createSynthesizedNode(243 /* TypeAliasDeclaration */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
@@ -61925,7 +64042,7 @@ var ts;
     }
     ts.updateTypeAliasDeclaration = updateTypeAliasDeclaration;
     function createEnumDeclaration(decorators, modifiers, name, members) {
-        var node = createSynthesizedNode(243 /* EnumDeclaration */);
+        var node = createSynthesizedNode(244 /* EnumDeclaration */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
@@ -61944,7 +64061,7 @@ var ts;
     ts.updateEnumDeclaration = updateEnumDeclaration;
     function createModuleDeclaration(decorators, modifiers, name, body, flags) {
         if (flags === void 0) { flags = 0 /* None */; }
-        var node = createSynthesizedNode(244 /* ModuleDeclaration */);
+        var node = createSynthesizedNode(245 /* ModuleDeclaration */);
         node.flags |= flags & (16 /* Namespace */ | 4 /* NestedNamespace */ | 512 /* GlobalAugmentation */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
@@ -61963,7 +64080,7 @@ var ts;
     }
     ts.updateModuleDeclaration = updateModuleDeclaration;
     function createModuleBlock(statements) {
-        var node = createSynthesizedNode(245 /* ModuleBlock */);
+        var node = createSynthesizedNode(246 /* ModuleBlock */);
         node.statements = createNodeArray(statements);
         return node;
     }
@@ -61975,7 +64092,7 @@ var ts;
     }
     ts.updateModuleBlock = updateModuleBlock;
     function createCaseBlock(clauses) {
-        var node = createSynthesizedNode(246 /* CaseBlock */);
+        var node = createSynthesizedNode(247 /* CaseBlock */);
         node.clauses = createNodeArray(clauses);
         return node;
     }
@@ -61987,7 +64104,7 @@ var ts;
     }
     ts.updateCaseBlock = updateCaseBlock;
     function createNamespaceExportDeclaration(name) {
-        var node = createSynthesizedNode(247 /* NamespaceExportDeclaration */);
+        var node = createSynthesizedNode(248 /* NamespaceExportDeclaration */);
         node.name = asName(name);
         return node;
     }
@@ -61999,7 +64116,7 @@ var ts;
     }
     ts.updateNamespaceExportDeclaration = updateNamespaceExportDeclaration;
     function createImportEqualsDeclaration(decorators, modifiers, name, moduleReference) {
-        var node = createSynthesizedNode(248 /* ImportEqualsDeclaration */);
+        var node = createSynthesizedNode(249 /* ImportEqualsDeclaration */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
@@ -62017,7 +64134,7 @@ var ts;
     }
     ts.updateImportEqualsDeclaration = updateImportEqualsDeclaration;
     function createImportDeclaration(decorators, modifiers, importClause, moduleSpecifier) {
-        var node = createSynthesizedNode(249 /* ImportDeclaration */);
+        var node = createSynthesizedNode(250 /* ImportDeclaration */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.importClause = importClause;
@@ -62035,7 +64152,7 @@ var ts;
     }
     ts.updateImportDeclaration = updateImportDeclaration;
     function createImportClause(name, namedBindings) {
-        var node = createSynthesizedNode(250 /* ImportClause */);
+        var node = createSynthesizedNode(251 /* ImportClause */);
         node.name = name;
         node.namedBindings = namedBindings;
         return node;
@@ -62049,7 +64166,7 @@ var ts;
     }
     ts.updateImportClause = updateImportClause;
     function createNamespaceImport(name) {
-        var node = createSynthesizedNode(251 /* NamespaceImport */);
+        var node = createSynthesizedNode(252 /* NamespaceImport */);
         node.name = name;
         return node;
     }
@@ -62061,7 +64178,7 @@ var ts;
     }
     ts.updateNamespaceImport = updateNamespaceImport;
     function createNamedImports(elements) {
-        var node = createSynthesizedNode(252 /* NamedImports */);
+        var node = createSynthesizedNode(253 /* NamedImports */);
         node.elements = createNodeArray(elements);
         return node;
     }
@@ -62073,7 +64190,7 @@ var ts;
     }
     ts.updateNamedImports = updateNamedImports;
     function createImportSpecifier(propertyName, name) {
-        var node = createSynthesizedNode(253 /* ImportSpecifier */);
+        var node = createSynthesizedNode(254 /* ImportSpecifier */);
         node.propertyName = propertyName;
         node.name = name;
         return node;
@@ -62087,11 +64204,11 @@ var ts;
     }
     ts.updateImportSpecifier = updateImportSpecifier;
     function createExportAssignment(decorators, modifiers, isExportEquals, expression) {
-        var node = createSynthesizedNode(254 /* ExportAssignment */);
+        var node = createSynthesizedNode(255 /* ExportAssignment */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.isExportEquals = isExportEquals;
-        node.expression = isExportEquals ? ts.parenthesizeBinaryOperand(59 /* EqualsToken */, expression, /*isLeftSideOfBinary*/ false, /*leftOperand*/ undefined) : ts.parenthesizeDefaultExpression(expression);
+        node.expression = isExportEquals ? ts.parenthesizeBinaryOperand(60 /* EqualsToken */, expression, /*isLeftSideOfBinary*/ false, /*leftOperand*/ undefined) : ts.parenthesizeDefaultExpression(expression);
         return node;
     }
     ts.createExportAssignment = createExportAssignment;
@@ -62104,7 +64221,7 @@ var ts;
     }
     ts.updateExportAssignment = updateExportAssignment;
     function createExportDeclaration(decorators, modifiers, exportClause, moduleSpecifier) {
-        var node = createSynthesizedNode(255 /* ExportDeclaration */);
+        var node = createSynthesizedNode(256 /* ExportDeclaration */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.exportClause = exportClause;
@@ -62122,7 +64239,7 @@ var ts;
     }
     ts.updateExportDeclaration = updateExportDeclaration;
     function createNamedExports(elements) {
-        var node = createSynthesizedNode(256 /* NamedExports */);
+        var node = createSynthesizedNode(257 /* NamedExports */);
         node.elements = createNodeArray(elements);
         return node;
     }
@@ -62134,7 +64251,7 @@ var ts;
     }
     ts.updateNamedExports = updateNamedExports;
     function createExportSpecifier(propertyName, name) {
-        var node = createSynthesizedNode(257 /* ExportSpecifier */);
+        var node = createSynthesizedNode(258 /* ExportSpecifier */);
         node.propertyName = asName(propertyName);
         node.name = asName(name);
         return node;
@@ -62149,7 +64266,7 @@ var ts;
     ts.updateExportSpecifier = updateExportSpecifier;
     // Module references
     function createExternalModuleReference(expression) {
-        var node = createSynthesizedNode(259 /* ExternalModuleReference */);
+        var node = createSynthesizedNode(260 /* ExternalModuleReference */);
         node.expression = expression;
         return node;
     }
@@ -62163,14 +64280,14 @@ var ts;
     // JSDoc
     /* @internal */
     function createJSDocTypeExpression(type) {
-        var node = createSynthesizedNode(288 /* JSDocTypeExpression */);
+        var node = createSynthesizedNode(289 /* JSDocTypeExpression */);
         node.type = type;
         return node;
     }
     ts.createJSDocTypeExpression = createJSDocTypeExpression;
     /* @internal */
     function createJSDocTypeTag(typeExpression, comment) {
-        var tag = createJSDocTag(307 /* JSDocTypeTag */, "type");
+        var tag = createJSDocTag(309 /* JSDocTypeTag */, "type");
         tag.typeExpression = typeExpression;
         tag.comment = comment;
         return tag;
@@ -62178,15 +64295,22 @@ var ts;
     ts.createJSDocTypeTag = createJSDocTypeTag;
     /* @internal */
     function createJSDocReturnTag(typeExpression, comment) {
-        var tag = createJSDocTag(305 /* JSDocReturnTag */, "returns");
+        var tag = createJSDocTag(307 /* JSDocReturnTag */, "returns");
         tag.typeExpression = typeExpression;
         tag.comment = comment;
         return tag;
     }
     ts.createJSDocReturnTag = createJSDocReturnTag;
+    /** @internal */
+    function createJSDocThisTag(typeExpression) {
+        var tag = createJSDocTag(308 /* JSDocThisTag */, "this");
+        tag.typeExpression = typeExpression;
+        return tag;
+    }
+    ts.createJSDocThisTag = createJSDocThisTag;
     /* @internal */
     function createJSDocParamTag(name, isBracketed, typeExpression, comment) {
-        var tag = createJSDocTag(304 /* JSDocParameterTag */, "param");
+        var tag = createJSDocTag(306 /* JSDocParameterTag */, "param");
         tag.typeExpression = typeExpression;
         tag.name = name;
         tag.isBracketed = isBracketed;
@@ -62196,7 +64320,7 @@ var ts;
     ts.createJSDocParamTag = createJSDocParamTag;
     /* @internal */
     function createJSDocComment(comment, tags) {
-        var node = createSynthesizedNode(296 /* JSDocComment */);
+        var node = createSynthesizedNode(297 /* JSDocComment */);
         node.comment = comment;
         node.tags = tags;
         return node;
@@ -62210,7 +64334,7 @@ var ts;
     }
     // JSX
     function createJsxElement(openingElement, children, closingElement) {
-        var node = createSynthesizedNode(260 /* JsxElement */);
+        var node = createSynthesizedNode(261 /* JsxElement */);
         node.openingElement = openingElement;
         node.children = createNodeArray(children);
         node.closingElement = closingElement;
@@ -62226,7 +64350,7 @@ var ts;
     }
     ts.updateJsxElement = updateJsxElement;
     function createJsxSelfClosingElement(tagName, typeArguments, attributes) {
-        var node = createSynthesizedNode(261 /* JsxSelfClosingElement */);
+        var node = createSynthesizedNode(262 /* JsxSelfClosingElement */);
         node.tagName = tagName;
         node.typeArguments = asNodeArray(typeArguments);
         node.attributes = attributes;
@@ -62242,7 +64366,7 @@ var ts;
     }
     ts.updateJsxSelfClosingElement = updateJsxSelfClosingElement;
     function createJsxOpeningElement(tagName, typeArguments, attributes) {
-        var node = createSynthesizedNode(262 /* JsxOpeningElement */);
+        var node = createSynthesizedNode(263 /* JsxOpeningElement */);
         node.tagName = tagName;
         node.typeArguments = asNodeArray(typeArguments);
         node.attributes = attributes;
@@ -62258,7 +64382,7 @@ var ts;
     }
     ts.updateJsxOpeningElement = updateJsxOpeningElement;
     function createJsxClosingElement(tagName) {
-        var node = createSynthesizedNode(263 /* JsxClosingElement */);
+        var node = createSynthesizedNode(264 /* JsxClosingElement */);
         node.tagName = tagName;
         return node;
     }
@@ -62270,13 +64394,35 @@ var ts;
     }
     ts.updateJsxClosingElement = updateJsxClosingElement;
     function createJsxFragment(openingFragment, children, closingFragment) {
-        var node = createSynthesizedNode(264 /* JsxFragment */);
+        var node = createSynthesizedNode(265 /* JsxFragment */);
         node.openingFragment = openingFragment;
         node.children = createNodeArray(children);
         node.closingFragment = closingFragment;
         return node;
     }
     ts.createJsxFragment = createJsxFragment;
+    function createJsxText(text, containsOnlyTriviaWhiteSpaces) {
+        var node = createSynthesizedNode(11 /* JsxText */);
+        node.text = text;
+        node.containsOnlyTriviaWhiteSpaces = !!containsOnlyTriviaWhiteSpaces;
+        return node;
+    }
+    ts.createJsxText = createJsxText;
+    function updateJsxText(node, text, containsOnlyTriviaWhiteSpaces) {
+        return node.text !== text
+            || node.containsOnlyTriviaWhiteSpaces !== containsOnlyTriviaWhiteSpaces
+            ? updateNode(createJsxText(text, containsOnlyTriviaWhiteSpaces), node)
+            : node;
+    }
+    ts.updateJsxText = updateJsxText;
+    function createJsxOpeningFragment() {
+        return createSynthesizedNode(266 /* JsxOpeningFragment */);
+    }
+    ts.createJsxOpeningFragment = createJsxOpeningFragment;
+    function createJsxJsxClosingFragment() {
+        return createSynthesizedNode(267 /* JsxClosingFragment */);
+    }
+    ts.createJsxJsxClosingFragment = createJsxJsxClosingFragment;
     function updateJsxFragment(node, openingFragment, children, closingFragment) {
         return node.openingFragment !== openingFragment
             || node.children !== children
@@ -62286,7 +64432,7 @@ var ts;
     }
     ts.updateJsxFragment = updateJsxFragment;
     function createJsxAttribute(name, initializer) {
-        var node = createSynthesizedNode(267 /* JsxAttribute */);
+        var node = createSynthesizedNode(268 /* JsxAttribute */);
         node.name = name;
         node.initializer = initializer;
         return node;
@@ -62300,7 +64446,7 @@ var ts;
     }
     ts.updateJsxAttribute = updateJsxAttribute;
     function createJsxAttributes(properties) {
-        var node = createSynthesizedNode(268 /* JsxAttributes */);
+        var node = createSynthesizedNode(269 /* JsxAttributes */);
         node.properties = createNodeArray(properties);
         return node;
     }
@@ -62312,7 +64458,7 @@ var ts;
     }
     ts.updateJsxAttributes = updateJsxAttributes;
     function createJsxSpreadAttribute(expression) {
-        var node = createSynthesizedNode(269 /* JsxSpreadAttribute */);
+        var node = createSynthesizedNode(270 /* JsxSpreadAttribute */);
         node.expression = expression;
         return node;
     }
@@ -62324,7 +64470,7 @@ var ts;
     }
     ts.updateJsxSpreadAttribute = updateJsxSpreadAttribute;
     function createJsxExpression(dotDotDotToken, expression) {
-        var node = createSynthesizedNode(270 /* JsxExpression */);
+        var node = createSynthesizedNode(271 /* JsxExpression */);
         node.dotDotDotToken = dotDotDotToken;
         node.expression = expression;
         return node;
@@ -62338,7 +64484,7 @@ var ts;
     ts.updateJsxExpression = updateJsxExpression;
     // Clauses
     function createCaseClause(expression, statements) {
-        var node = createSynthesizedNode(271 /* CaseClause */);
+        var node = createSynthesizedNode(272 /* CaseClause */);
         node.expression = ts.parenthesizeExpressionForList(expression);
         node.statements = createNodeArray(statements);
         return node;
@@ -62352,7 +64498,7 @@ var ts;
     }
     ts.updateCaseClause = updateCaseClause;
     function createDefaultClause(statements) {
-        var node = createSynthesizedNode(272 /* DefaultClause */);
+        var node = createSynthesizedNode(273 /* DefaultClause */);
         node.statements = createNodeArray(statements);
         return node;
     }
@@ -62364,7 +64510,7 @@ var ts;
     }
     ts.updateDefaultClause = updateDefaultClause;
     function createHeritageClause(token, types) {
-        var node = createSynthesizedNode(273 /* HeritageClause */);
+        var node = createSynthesizedNode(274 /* HeritageClause */);
         node.token = token;
         node.types = createNodeArray(types);
         return node;
@@ -62377,7 +64523,7 @@ var ts;
     }
     ts.updateHeritageClause = updateHeritageClause;
     function createCatchClause(variableDeclaration, block) {
-        var node = createSynthesizedNode(274 /* CatchClause */);
+        var node = createSynthesizedNode(275 /* CatchClause */);
         node.variableDeclaration = ts.isString(variableDeclaration) ? createVariableDeclaration(variableDeclaration) : variableDeclaration;
         node.block = block;
         return node;
@@ -62392,7 +64538,7 @@ var ts;
     ts.updateCatchClause = updateCatchClause;
     // Property assignments
     function createPropertyAssignment(name, initializer) {
-        var node = createSynthesizedNode(275 /* PropertyAssignment */);
+        var node = createSynthesizedNode(276 /* PropertyAssignment */);
         node.name = asName(name);
         node.questionToken = undefined;
         node.initializer = ts.parenthesizeExpressionForList(initializer);
@@ -62407,7 +64553,7 @@ var ts;
     }
     ts.updatePropertyAssignment = updatePropertyAssignment;
     function createShorthandPropertyAssignment(name, objectAssignmentInitializer) {
-        var node = createSynthesizedNode(276 /* ShorthandPropertyAssignment */);
+        var node = createSynthesizedNode(277 /* ShorthandPropertyAssignment */);
         node.name = asName(name);
         node.objectAssignmentInitializer = objectAssignmentInitializer !== undefined ? ts.parenthesizeExpressionForList(objectAssignmentInitializer) : undefined;
         return node;
@@ -62421,8 +64567,8 @@ var ts;
     }
     ts.updateShorthandPropertyAssignment = updateShorthandPropertyAssignment;
     function createSpreadAssignment(expression) {
-        var node = createSynthesizedNode(277 /* SpreadAssignment */);
-        node.expression = expression !== undefined ? ts.parenthesizeExpressionForList(expression) : undefined; // TODO: GH#18217
+        var node = createSynthesizedNode(278 /* SpreadAssignment */);
+        node.expression = ts.parenthesizeExpressionForList(expression);
         return node;
     }
     ts.createSpreadAssignment = createSpreadAssignment;
@@ -62434,7 +64580,7 @@ var ts;
     ts.updateSpreadAssignment = updateSpreadAssignment;
     // Enum
     function createEnumMember(name, initializer) {
-        var node = createSynthesizedNode(278 /* EnumMember */);
+        var node = createSynthesizedNode(279 /* EnumMember */);
         node.name = asName(name);
         node.initializer = initializer && ts.parenthesizeExpressionForList(initializer);
         return node;
@@ -62455,7 +64601,7 @@ var ts;
             (typeReferences !== undefined && node.typeReferenceDirectives !== typeReferences) ||
             (libReferences !== undefined && node.libReferenceDirectives !== libReferences) ||
             (hasNoDefaultLib !== undefined && node.hasNoDefaultLib !== hasNoDefaultLib)) {
-            var updated = createSynthesizedNode(284 /* SourceFile */);
+            var updated = createSynthesizedNode(285 /* SourceFile */);
             updated.flags |= node.flags;
             updated.statements = createNodeArray(statements);
             updated.endOfFileToken = node.endOfFileToken;
@@ -62539,7 +64685,7 @@ var ts;
      * @param original The original statement.
      */
     function createNotEmittedStatement(original) {
-        var node = createSynthesizedNode(312 /* NotEmittedStatement */);
+        var node = createSynthesizedNode(314 /* NotEmittedStatement */);
         node.original = original;
         setTextRange(node, original);
         return node;
@@ -62551,7 +64697,7 @@ var ts;
      */
     /* @internal */
     function createEndOfDeclarationMarker(original) {
-        var node = createSynthesizedNode(316 /* EndOfDeclarationMarker */);
+        var node = createSynthesizedNode(318 /* EndOfDeclarationMarker */);
         node.emitNode = {};
         node.original = original;
         return node;
@@ -62563,7 +64709,7 @@ var ts;
      */
     /* @internal */
     function createMergeDeclarationMarker(original) {
-        var node = createSynthesizedNode(315 /* MergeDeclarationMarker */);
+        var node = createSynthesizedNode(317 /* MergeDeclarationMarker */);
         node.emitNode = {};
         node.original = original;
         return node;
@@ -62578,7 +64724,7 @@ var ts;
      * @param location The location for the expression. Defaults to the positions from "original" if provided.
      */
     function createPartiallyEmittedExpression(expression, original) {
-        var node = createSynthesizedNode(313 /* PartiallyEmittedExpression */);
+        var node = createSynthesizedNode(315 /* PartiallyEmittedExpression */);
         node.expression = expression;
         node.original = original;
         setTextRange(node, original);
@@ -62594,7 +64740,7 @@ var ts;
     ts.updatePartiallyEmittedExpression = updatePartiallyEmittedExpression;
     function flattenCommaElements(node) {
         if (ts.nodeIsSynthesized(node) && !ts.isParseTreeNode(node) && !node.original && !node.emitNode && !node.id) {
-            if (node.kind === 314 /* CommaListExpression */) {
+            if (node.kind === 316 /* CommaListExpression */) {
                 return node.elements;
             }
             if (ts.isBinaryExpression(node) && node.operatorToken.kind === 27 /* CommaToken */) {
@@ -62604,7 +64750,7 @@ var ts;
         return node;
     }
     function createCommaList(elements) {
-        var node = createSynthesizedNode(314 /* CommaListExpression */);
+        var node = createSynthesizedNode(316 /* CommaListExpression */);
         node.elements = createNodeArray(ts.sameFlatMap(elements, flattenCommaElements));
         return node;
     }
@@ -62617,7 +64763,7 @@ var ts;
     ts.updateCommaList = updateCommaList;
     function createBundle(sourceFiles, prepends) {
         if (prepends === void 0) { prepends = ts.emptyArray; }
-        var node = ts.createNode(285 /* Bundle */);
+        var node = ts.createNode(286 /* Bundle */);
         node.prepends = prepends;
         node.sourceFiles = sourceFiles;
         return node;
@@ -62629,6 +64775,7 @@ var ts;
             ts.valuesHelper,
             ts.readHelper,
             ts.spreadHelper,
+            ts.spreadArraysHelper,
             ts.restHelper,
             ts.decorateHelper,
             ts.metadataHelper,
@@ -62647,7 +64794,7 @@ var ts;
         ], function (helper) { return helper.name; }));
     }
     function createUnparsedSource() {
-        var node = ts.createNode(286 /* UnparsedSource */);
+        var node = ts.createNode(287 /* UnparsedSource */);
         node.prologues = ts.emptyArray;
         node.referencedFiles = ts.emptyArray;
         node.libReferenceDirectives = ts.emptyArray;
@@ -62779,10 +64926,10 @@ var ts;
     }
     function mapBundleFileSectionKindToSyntaxKind(kind) {
         switch (kind) {
-            case "prologue" /* Prologue */: return 279 /* UnparsedPrologue */;
-            case "prepend" /* Prepend */: return 280 /* UnparsedPrepend */;
-            case "internal" /* Internal */: return 282 /* UnparsedInternalText */;
-            case "text" /* Text */: return 281 /* UnparsedText */;
+            case "prologue" /* Prologue */: return 280 /* UnparsedPrologue */;
+            case "prepend" /* Prepend */: return 281 /* UnparsedPrepend */;
+            case "internal" /* Internal */: return 283 /* UnparsedInternalText */;
+            case "text" /* Text */: return 282 /* UnparsedText */;
             case "emitHelpers" /* EmitHelpers */:
             case "no-default-lib" /* NoDefaultLib */:
             case "reference" /* Reference */:
@@ -62800,14 +64947,14 @@ var ts;
         return node;
     }
     function createUnparsedSyntheticReference(section, parent) {
-        var node = ts.createNode(283 /* UnparsedSyntheticReference */, section.pos, section.end);
+        var node = ts.createNode(284 /* UnparsedSyntheticReference */, section.pos, section.end);
         node.parent = parent;
         node.data = section.data;
         node.section = section;
         return node;
     }
     function createInputFiles(javascriptTextOrReadFileText, declarationTextOrJavascriptPath, javascriptMapPath, javascriptMapTextOrDeclarationPath, declarationMapPath, declarationMapTextOrBuildInfoPath, javascriptPath, declarationPath, buildInfoPath, buildInfo, oldFileOfCurrentEmit) {
-        var node = ts.createNode(287 /* InputFiles */);
+        var node = ts.createNode(288 /* InputFiles */);
         if (!ts.isString(javascriptTextOrReadFileText)) {
             var cache_1 = ts.createMap();
             var textGetter_1 = function (path) {
@@ -62901,7 +65048,7 @@ var ts;
     }
     ts.createLessThan = createLessThan;
     function createAssignment(left, right) {
-        return createBinary(left, 59 /* EqualsToken */, right);
+        return createBinary(left, 60 /* EqualsToken */, right);
     }
     ts.createAssignment = createAssignment;
     function createStrictEquality(left, right) {
@@ -62961,6 +65108,9 @@ var ts;
     function asToken(value) {
         return typeof value === "number" ? createToken(value) : value;
     }
+    function asEmbeddedStatement(statement) {
+        return statement && ts.isNotEmittedStatement(statement) ? setTextRange(setOriginalNode(createEmptyStatement(), statement), statement) : statement;
+    }
     /**
      * Clears any EmitNode entries from parse-tree nodes.
      * @param sourceFile A source file.
@@ -62994,7 +65144,7 @@ var ts;
                 // To avoid holding onto transformation artifacts, we keep track of any
                 // parse tree node we are annotating. This allows us to clean them up after
                 // all transformations have completed.
-                if (node.kind === 284 /* SourceFile */) {
+                if (node.kind === 285 /* SourceFile */) {
                     return node.emitNode = { annotatedNodes: [node] };
                 }
                 var sourceFile = ts.getSourceFileOfNode(ts.getParseTreeNode(ts.getSourceFileOfNode(node)));
@@ -63005,6 +65155,18 @@ var ts;
         return node.emitNode;
     }
     ts.getOrCreateEmitNode = getOrCreateEmitNode;
+    /**
+     * Sets `EmitFlags.NoComments` on a node and removes any leading and trailing synthetic comments.
+     * @internal
+     */
+    function removeAllComments(node) {
+        var emitNode = getOrCreateEmitNode(node);
+        emitNode.flags |= 1536 /* NoComments */;
+        emitNode.leadingComments = undefined;
+        emitNode.trailingComments = undefined;
+        return node;
+    }
+    ts.removeAllComments = removeAllComments;
     function setTextRange(range, location) {
         if (location) {
             range.pos = location.pos;
@@ -63295,7 +65457,7 @@ var ts;
     ts.nullTransformationContext = {
         enableEmitNotification: ts.noop,
         enableSubstitution: ts.noop,
-        endLexicalEnvironment: function () { return undefined; },
+        endLexicalEnvironment: ts.returnUndefined,
         getCompilerOptions: ts.notImplemented,
         getEmitHost: ts.notImplemented,
         getEmitResolver: ts.notImplemented,
@@ -63476,6 +65638,17 @@ var ts;
         /*typeArguments*/ undefined, argumentList), location);
     }
     ts.createSpreadHelper = createSpreadHelper;
+    ts.spreadArraysHelper = {
+        name: "typescript:spreadArrays",
+        scoped: false,
+        text: "\n            var __spreadArrays = (this && this.__spreadArrays) || function () {\n                for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;\n                for (var r = Array(s), k = 0, i = 0; i < il; i++)\n                    for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)\n                        r[k] = a[j];\n                return r;\n            };"
+    };
+    function createSpreadArraysHelper(context, argumentList, location) {
+        context.requestEmitHelper(ts.spreadArraysHelper);
+        return ts.setTextRange(ts.createCall(getHelperName("__spreadArrays"), 
+        /*typeArguments*/ undefined, argumentList), location);
+    }
+    ts.createSpreadArraysHelper = createSpreadArraysHelper;
     // Utilities
     function createForOfBindingStatement(node, boundValue) {
         if (ts.isVariableDeclarationList(node)) {
@@ -63505,7 +65678,7 @@ var ts;
         if (!outermostLabeledStatement) {
             return node;
         }
-        var updated = ts.updateLabel(outermostLabeledStatement, outermostLabeledStatement.label, outermostLabeledStatement.statement.kind === 233 /* LabeledStatement */
+        var updated = ts.updateLabel(outermostLabeledStatement, outermostLabeledStatement.label, outermostLabeledStatement.statement.kind === 234 /* LabeledStatement */
             ? restoreEnclosingLabel(node, outermostLabeledStatement.statement)
             : node);
         if (afterRestoreLabelCallback) {
@@ -63517,20 +65690,20 @@ var ts;
     function shouldBeCapturedInTempVariable(node, cacheIdentifiers) {
         var target = ts.skipParentheses(node);
         switch (target.kind) {
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 return cacheIdentifiers;
-            case 100 /* ThisKeyword */:
+            case 101 /* ThisKeyword */:
             case 8 /* NumericLiteral */:
             case 9 /* BigIntLiteral */:
             case 10 /* StringLiteral */:
                 return false;
-            case 187 /* ArrayLiteralExpression */:
+            case 188 /* ArrayLiteralExpression */:
                 var elements = target.elements;
                 if (elements.length === 0) {
                     return false;
                 }
                 return true;
-            case 188 /* ObjectLiteralExpression */:
+            case 189 /* ObjectLiteralExpression */:
                 return target.properties.length > 0;
             default:
                 return true;
@@ -63545,7 +65718,7 @@ var ts;
             thisArg = ts.createThis();
             target = callee;
         }
-        else if (callee.kind === 98 /* SuperKeyword */) {
+        else if (callee.kind === 99 /* SuperKeyword */) {
             thisArg = ts.createThis();
             target = languageVersion < 2 /* ES2015 */
                 ? ts.setTextRange(ts.createIdentifier("_super"), callee)
@@ -63557,7 +65730,7 @@ var ts;
         }
         else {
             switch (callee.kind) {
-                case 189 /* PropertyAccessExpression */: {
+                case 190 /* PropertyAccessExpression */: {
                     if (shouldBeCapturedInTempVariable(callee.expression, cacheIdentifiers)) {
                         // for `a.b()` target is `(_a = a).b` and thisArg is `_a`
                         thisArg = ts.createTempVariable(recordTempVariable);
@@ -63570,7 +65743,7 @@ var ts;
                     }
                     break;
                 }
-                case 190 /* ElementAccessExpression */: {
+                case 191 /* ElementAccessExpression */: {
                     if (shouldBeCapturedInTempVariable(callee.expression, cacheIdentifiers)) {
                         // for `a[b]()` target is `(_a = a)[b]` and thisArg is `_a`
                         thisArg = ts.createTempVariable(recordTempVariable);
@@ -63627,14 +65800,14 @@ var ts;
     ts.createExpressionForPropertyName = createExpressionForPropertyName;
     function createExpressionForObjectLiteralElementLike(node, property, receiver) {
         switch (property.kind) {
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
                 return createExpressionForAccessorDeclaration(node.properties, property, receiver, !!node.multiLine);
-            case 275 /* PropertyAssignment */:
+            case 276 /* PropertyAssignment */:
                 return createExpressionForPropertyAssignment(property, receiver);
-            case 276 /* ShorthandPropertyAssignment */:
+            case 277 /* ShorthandPropertyAssignment */:
                 return createExpressionForShorthandPropertyAssignment(property, receiver);
-            case 156 /* MethodDeclaration */:
+            case 157 /* MethodDeclaration */:
                 return createExpressionForMethodDeclaration(property, receiver);
         }
     }
@@ -63642,7 +65815,7 @@ var ts;
     function createExpressionForAccessorDeclaration(properties, property, receiver, multiLine) {
         var _a = ts.getAllAccessorDeclarations(properties, property), firstAccessor = _a.firstAccessor, getAccessor = _a.getAccessor, setAccessor = _a.setAccessor;
         if (property === firstAccessor) {
-            var properties_8 = [];
+            var properties_5 = [];
             if (getAccessor) {
                 var getterFunction = ts.createFunctionExpression(getAccessor.modifiers, 
                 /*asteriskToken*/ undefined, 
@@ -63653,7 +65826,7 @@ var ts;
                 ts.setTextRange(getterFunction, getAccessor);
                 ts.setOriginalNode(getterFunction, getAccessor);
                 var getter = ts.createPropertyAssignment("get", getterFunction);
-                properties_8.push(getter);
+                properties_5.push(getter);
             }
             if (setAccessor) {
                 var setterFunction = ts.createFunctionExpression(setAccessor.modifiers, 
@@ -63665,15 +65838,15 @@ var ts;
                 ts.setTextRange(setterFunction, setAccessor);
                 ts.setOriginalNode(setterFunction, setAccessor);
                 var setter = ts.createPropertyAssignment("set", setterFunction);
-                properties_8.push(setter);
+                properties_5.push(setter);
             }
-            properties_8.push(ts.createPropertyAssignment("enumerable", ts.createTrue()));
-            properties_8.push(ts.createPropertyAssignment("configurable", ts.createTrue()));
+            properties_5.push(ts.createPropertyAssignment("enumerable", ts.createTrue()));
+            properties_5.push(ts.createPropertyAssignment("configurable", ts.createTrue()));
             var expression = ts.setTextRange(ts.createCall(ts.createPropertyAccess(ts.createIdentifier("Object"), "defineProperty"), 
             /*typeArguments*/ undefined, [
                 receiver,
                 createExpressionForPropertyName(property.name),
-                ts.createObjectLiteral(properties_8, multiLine)
+                ts.createObjectLiteral(properties_5, multiLine)
             ]), 
             /*location*/ firstAccessor);
             return ts.aggregateTransformFlags(expression);
@@ -63960,7 +66133,7 @@ var ts;
     function parenthesizeBinaryOperand(binaryOperator, operand, isLeftSideOfBinary, leftOperand) {
         var skipped = ts.skipPartiallyEmittedExpressions(operand);
         // If the resulting expression is already parenthesized, we do not need to do any further processing.
-        if (skipped.kind === 195 /* ParenthesizedExpression */) {
+        if (skipped.kind === 196 /* ParenthesizedExpression */) {
             return operand;
         }
         return binaryOperandNeedsParentheses(binaryOperator, operand, isLeftSideOfBinary, leftOperand)
@@ -63994,10 +66167,10 @@ var ts;
         //
         // If `a ** d` is on the left of operator `**`, we need to parenthesize to preserve
         // the intended order of operations: `(a ** b) ** c`
-        var binaryOperatorPrecedence = ts.getOperatorPrecedence(204 /* BinaryExpression */, binaryOperator);
-        var binaryOperatorAssociativity = ts.getOperatorAssociativity(204 /* BinaryExpression */, binaryOperator);
+        var binaryOperatorPrecedence = ts.getOperatorPrecedence(205 /* BinaryExpression */, binaryOperator);
+        var binaryOperatorAssociativity = ts.getOperatorAssociativity(205 /* BinaryExpression */, binaryOperator);
         var emittedOperand = ts.skipPartiallyEmittedExpressions(operand);
-        if (!isLeftSideOfBinary && operand.kind === 197 /* ArrowFunction */ && binaryOperatorPrecedence > 4) {
+        if (!isLeftSideOfBinary && operand.kind === 198 /* ArrowFunction */ && binaryOperatorPrecedence > 4) {
             // We need to parenthesize arrow functions on the right side to avoid it being
             // parsed as parenthesized expression: `a && (() => {})`
             return true;
@@ -64009,7 +66182,7 @@ var ts;
                 // and is a yield expression, then we do not need parentheses.
                 if (!isLeftSideOfBinary
                     && binaryOperatorAssociativity === 1 /* Right */
-                    && operand.kind === 207 /* YieldExpression */) {
+                    && operand.kind === 208 /* YieldExpression */) {
                     return false;
                 }
                 return true;
@@ -64097,7 +66270,7 @@ var ts;
         if (ts.isLiteralKind(node.kind)) {
             return node.kind;
         }
-        if (node.kind === 204 /* BinaryExpression */ && node.operatorToken.kind === 38 /* PlusToken */) {
+        if (node.kind === 205 /* BinaryExpression */ && node.operatorToken.kind === 38 /* PlusToken */) {
             if (node.cachedLiteralKind !== undefined) {
                 return node.cachedLiteralKind;
             }
@@ -64112,7 +66285,7 @@ var ts;
         return 0 /* Unknown */;
     }
     function parenthesizeForConditionalHead(condition) {
-        var conditionalPrecedence = ts.getOperatorPrecedence(205 /* ConditionalExpression */, 56 /* QuestionToken */);
+        var conditionalPrecedence = ts.getOperatorPrecedence(206 /* ConditionalExpression */, 56 /* QuestionToken */);
         var emittedCondition = ts.skipPartiallyEmittedExpressions(condition);
         var conditionPrecedence = ts.getExpressionPrecedence(emittedCondition);
         if (ts.compareValues(conditionPrecedence, conditionalPrecedence) === -1 /* LessThan */) {
@@ -64147,8 +66320,8 @@ var ts;
         var needsParens = isCommaSequence(check);
         if (!needsParens) {
             switch (getLeftmostExpression(check, /*stopAtCallExpression*/ false).kind) {
-                case 209 /* ClassExpression */:
-                case 196 /* FunctionExpression */:
+                case 210 /* ClassExpression */:
+                case 197 /* FunctionExpression */:
                     needsParens = true;
             }
         }
@@ -64164,9 +66337,9 @@ var ts;
     function parenthesizeForNew(expression) {
         var leftmostExpr = getLeftmostExpression(expression, /*stopAtCallExpressions*/ true);
         switch (leftmostExpr.kind) {
-            case 191 /* CallExpression */:
+            case 192 /* CallExpression */:
                 return ts.createParen(expression);
-            case 192 /* NewExpression */:
+            case 193 /* NewExpression */:
                 return !leftmostExpr.arguments
                     ? ts.createParen(expression)
                     : expression;
@@ -64189,7 +66362,7 @@ var ts;
         //
         var emittedExpression = ts.skipPartiallyEmittedExpressions(expression);
         if (ts.isLeftHandSideExpression(emittedExpression)
-            && (emittedExpression.kind !== 192 /* NewExpression */ || emittedExpression.arguments)) {
+            && (emittedExpression.kind !== 193 /* NewExpression */ || emittedExpression.arguments)) {
             return expression;
         }
         return ts.setTextRange(ts.createParen(expression), expression);
@@ -64227,7 +66400,7 @@ var ts;
     function parenthesizeExpressionForList(expression) {
         var emittedExpression = ts.skipPartiallyEmittedExpressions(expression);
         var expressionPrecedence = ts.getExpressionPrecedence(emittedExpression);
-        var commaPrecedence = ts.getOperatorPrecedence(204 /* BinaryExpression */, 27 /* CommaToken */);
+        var commaPrecedence = ts.getOperatorPrecedence(205 /* BinaryExpression */, 27 /* CommaToken */);
         return expressionPrecedence > commaPrecedence
             ? expression
             : ts.setTextRange(ts.createParen(expression), expression);
@@ -64238,29 +66411,29 @@ var ts;
         if (ts.isCallExpression(emittedExpression)) {
             var callee = emittedExpression.expression;
             var kind = ts.skipPartiallyEmittedExpressions(callee).kind;
-            if (kind === 196 /* FunctionExpression */ || kind === 197 /* ArrowFunction */) {
+            if (kind === 197 /* FunctionExpression */ || kind === 198 /* ArrowFunction */) {
                 var mutableCall = ts.getMutableClone(emittedExpression);
                 mutableCall.expression = ts.setTextRange(ts.createParen(callee), callee);
                 return recreateOuterExpressions(expression, mutableCall, 4 /* PartiallyEmittedExpressions */);
             }
         }
         var leftmostExpressionKind = getLeftmostExpression(emittedExpression, /*stopAtCallExpressions*/ false).kind;
-        if (leftmostExpressionKind === 188 /* ObjectLiteralExpression */ || leftmostExpressionKind === 196 /* FunctionExpression */) {
+        if (leftmostExpressionKind === 189 /* ObjectLiteralExpression */ || leftmostExpressionKind === 197 /* FunctionExpression */) {
             return ts.setTextRange(ts.createParen(expression), expression);
         }
         return expression;
     }
     ts.parenthesizeExpressionForExpressionStatement = parenthesizeExpressionForExpressionStatement;
     function parenthesizeConditionalTypeMember(member) {
-        return member.kind === 175 /* ConditionalType */ ? ts.createParenthesizedType(member) : member;
+        return member.kind === 176 /* ConditionalType */ ? ts.createParenthesizedType(member) : member;
     }
     ts.parenthesizeConditionalTypeMember = parenthesizeConditionalTypeMember;
     function parenthesizeElementTypeMember(member) {
         switch (member.kind) {
-            case 173 /* UnionType */:
-            case 174 /* IntersectionType */:
-            case 165 /* FunctionType */:
-            case 166 /* ConstructorType */:
+            case 174 /* UnionType */:
+            case 175 /* IntersectionType */:
+            case 166 /* FunctionType */:
+            case 167 /* ConstructorType */:
                 return ts.createParenthesizedType(member);
         }
         return parenthesizeConditionalTypeMember(member);
@@ -64268,9 +66441,9 @@ var ts;
     ts.parenthesizeElementTypeMember = parenthesizeElementTypeMember;
     function parenthesizeArrayTypeMember(member) {
         switch (member.kind) {
-            case 167 /* TypeQuery */:
-            case 179 /* TypeOperator */:
-            case 176 /* InferType */:
+            case 168 /* TypeQuery */:
+            case 180 /* TypeOperator */:
+            case 177 /* InferType */:
                 return ts.createParenthesizedType(member);
         }
         return parenthesizeElementTypeMember(member);
@@ -64296,44 +66469,45 @@ var ts;
     function getLeftmostExpression(node, stopAtCallExpressions) {
         while (true) {
             switch (node.kind) {
-                case 203 /* PostfixUnaryExpression */:
+                case 204 /* PostfixUnaryExpression */:
                     node = node.operand;
                     continue;
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     node = node.left;
                     continue;
-                case 205 /* ConditionalExpression */:
+                case 206 /* ConditionalExpression */:
                     node = node.condition;
                     continue;
-                case 193 /* TaggedTemplateExpression */:
+                case 194 /* TaggedTemplateExpression */:
                     node = node.tag;
                     continue;
-                case 191 /* CallExpression */:
+                case 192 /* CallExpression */:
                     if (stopAtCallExpressions) {
                         return node;
                     }
                 // falls through
-                case 212 /* AsExpression */:
-                case 190 /* ElementAccessExpression */:
-                case 189 /* PropertyAccessExpression */:
-                case 213 /* NonNullExpression */:
-                case 313 /* PartiallyEmittedExpression */:
+                case 213 /* AsExpression */:
+                case 191 /* ElementAccessExpression */:
+                case 190 /* PropertyAccessExpression */:
+                case 214 /* NonNullExpression */:
+                case 315 /* PartiallyEmittedExpression */:
                     node = node.expression;
                     continue;
             }
             return node;
         }
     }
+    ts.getLeftmostExpression = getLeftmostExpression;
     function parenthesizeConciseBody(body) {
-        if (!ts.isBlock(body) && (isCommaSequence(body) || getLeftmostExpression(body, /*stopAtCallExpressions*/ false).kind === 188 /* ObjectLiteralExpression */)) {
+        if (!ts.isBlock(body) && (isCommaSequence(body) || getLeftmostExpression(body, /*stopAtCallExpressions*/ false).kind === 189 /* ObjectLiteralExpression */)) {
             return ts.setTextRange(ts.createParen(body), body);
         }
         return body;
     }
     ts.parenthesizeConciseBody = parenthesizeConciseBody;
     function isCommaSequence(node) {
-        return node.kind === 204 /* BinaryExpression */ && node.operatorToken.kind === 27 /* CommaToken */ ||
-            node.kind === 314 /* CommaListExpression */;
+        return node.kind === 205 /* BinaryExpression */ && node.operatorToken.kind === 27 /* CommaToken */ ||
+            node.kind === 316 /* CommaListExpression */;
     }
     ts.isCommaSequence = isCommaSequence;
     var OuterExpressionKinds;
@@ -64346,13 +66520,13 @@ var ts;
     function isOuterExpression(node, kinds) {
         if (kinds === void 0) { kinds = 7 /* All */; }
         switch (node.kind) {
-            case 195 /* ParenthesizedExpression */:
+            case 196 /* ParenthesizedExpression */:
                 return (kinds & 1 /* Parentheses */) !== 0;
-            case 194 /* TypeAssertionExpression */:
-            case 212 /* AsExpression */:
-            case 213 /* NonNullExpression */:
+            case 195 /* TypeAssertionExpression */:
+            case 213 /* AsExpression */:
+            case 214 /* NonNullExpression */:
                 return (kinds & 2 /* Assertions */) !== 0;
-            case 313 /* PartiallyEmittedExpression */:
+            case 315 /* PartiallyEmittedExpression */:
                 return (kinds & 4 /* PartiallyEmittedExpressions */) !== 0;
         }
         return false;
@@ -64377,7 +66551,7 @@ var ts;
     }
     ts.skipOuterExpressions = skipOuterExpressions;
     function skipAssertions(node) {
-        while (ts.isAssertionExpression(node) || node.kind === 213 /* NonNullExpression */) {
+        while (ts.isAssertionExpression(node) || node.kind === 214 /* NonNullExpression */) {
             node = node.expression;
         }
         return node;
@@ -64385,11 +66559,11 @@ var ts;
     ts.skipAssertions = skipAssertions;
     function updateOuterExpression(outerExpression, expression) {
         switch (outerExpression.kind) {
-            case 195 /* ParenthesizedExpression */: return ts.updateParen(outerExpression, expression);
-            case 194 /* TypeAssertionExpression */: return ts.updateTypeAssertion(outerExpression, outerExpression.type, expression);
-            case 212 /* AsExpression */: return ts.updateAsExpression(outerExpression, expression, outerExpression.type);
-            case 213 /* NonNullExpression */: return ts.updateNonNullExpression(outerExpression, expression);
-            case 313 /* PartiallyEmittedExpression */: return ts.updatePartiallyEmittedExpression(outerExpression, expression);
+            case 196 /* ParenthesizedExpression */: return ts.updateParen(outerExpression, expression);
+            case 195 /* TypeAssertionExpression */: return ts.updateTypeAssertion(outerExpression, outerExpression.type, expression);
+            case 213 /* AsExpression */: return ts.updateAsExpression(outerExpression, expression, outerExpression.type);
+            case 214 /* NonNullExpression */: return ts.updateNonNullExpression(outerExpression, expression);
+            case 315 /* PartiallyEmittedExpression */: return ts.updatePartiallyEmittedExpression(outerExpression, expression);
         }
     }
     /**
@@ -64407,7 +66581,7 @@ var ts;
      * the containing expression is created/updated.
      */
     function isIgnorableParen(node) {
-        return node.kind === 195 /* ParenthesizedExpression */
+        return node.kind === 196 /* ParenthesizedExpression */
             && ts.nodeIsSynthesized(node)
             && ts.nodeIsSynthesized(ts.getSourceMapRange(node))
             && ts.nodeIsSynthesized(ts.getCommentRange(node))
@@ -64472,10 +66646,10 @@ var ts;
             var name = namespaceDeclaration.name;
             return ts.isGeneratedIdentifier(name) ? name : ts.createIdentifier(ts.getSourceTextOfNodeFromSourceFile(sourceFile, name) || ts.idText(name));
         }
-        if (node.kind === 249 /* ImportDeclaration */ && node.importClause) {
+        if (node.kind === 250 /* ImportDeclaration */ && node.importClause) {
             return ts.getGeneratedNameForNode(node);
         }
-        if (node.kind === 255 /* ExportDeclaration */ && node.moduleSpecifier) {
+        if (node.kind === 256 /* ExportDeclaration */ && node.moduleSpecifier) {
             return ts.getGeneratedNameForNode(node);
         }
         return undefined;
@@ -64594,7 +66768,7 @@ var ts;
         }
         if (ts.isObjectLiteralElementLike(bindingElement)) {
             switch (bindingElement.kind) {
-                case 275 /* PropertyAssignment */:
+                case 276 /* PropertyAssignment */:
                     // `b` in `({ a: b } = ...)`
                     // `b` in `({ a: b = 1 } = ...)`
                     // `{b}` in `({ a: {b} } = ...)`
@@ -64606,11 +66780,11 @@ var ts;
                     // `b[0]` in `({ a: b[0] } = ...)`
                     // `b[0]` in `({ a: b[0] = 1 } = ...)`
                     return getTargetOfBindingOrAssignmentElement(bindingElement.initializer);
-                case 276 /* ShorthandPropertyAssignment */:
+                case 277 /* ShorthandPropertyAssignment */:
                     // `a` in `({ a } = ...)`
                     // `a` in `({ a = 1 } = ...)`
                     return bindingElement.name;
-                case 277 /* SpreadAssignment */:
+                case 278 /* SpreadAssignment */:
                     // `a` in `({ ...a } = ...)`
                     return getTargetOfBindingOrAssignmentElement(bindingElement.expression);
             }
@@ -64642,12 +66816,12 @@ var ts;
      */
     function getRestIndicatorOfBindingOrAssignmentElement(bindingElement) {
         switch (bindingElement.kind) {
-            case 151 /* Parameter */:
-            case 186 /* BindingElement */:
+            case 152 /* Parameter */:
+            case 187 /* BindingElement */:
                 // `...` in `let [...a] = ...`
                 return bindingElement.dotDotDotToken;
-            case 208 /* SpreadElement */:
-            case 277 /* SpreadAssignment */:
+            case 209 /* SpreadElement */:
+            case 278 /* SpreadAssignment */:
                 // `...` in `[...a] = ...`
                 return bindingElement;
         }
@@ -64659,7 +66833,7 @@ var ts;
      */
     function getPropertyNameOfBindingOrAssignmentElement(bindingElement) {
         switch (bindingElement.kind) {
-            case 186 /* BindingElement */:
+            case 187 /* BindingElement */:
                 // `a` in `let { a: b } = ...`
                 // `[a]` in `let { [a]: b } = ...`
                 // `"a"` in `let { "a": b } = ...`
@@ -64671,7 +66845,7 @@ var ts;
                         : propertyName;
                 }
                 break;
-            case 275 /* PropertyAssignment */:
+            case 276 /* PropertyAssignment */:
                 // `a` in `({ a: b } = ...)`
                 // `[a]` in `({ [a]: b } = ...)`
                 // `"a"` in `({ "a": b } = ...)`
@@ -64683,7 +66857,7 @@ var ts;
                         : propertyName;
                 }
                 break;
-            case 277 /* SpreadAssignment */:
+            case 278 /* SpreadAssignment */:
                 // `a` in `({ ...a } = ...)`
                 return bindingElement.name;
         }
@@ -64706,13 +66880,13 @@ var ts;
      */
     function getElementsOfBindingOrAssignmentPattern(name) {
         switch (name.kind) {
-            case 184 /* ObjectBindingPattern */:
-            case 185 /* ArrayBindingPattern */:
-            case 187 /* ArrayLiteralExpression */:
+            case 185 /* ObjectBindingPattern */:
+            case 186 /* ArrayBindingPattern */:
+            case 188 /* ArrayLiteralExpression */:
                 // `a` in `{a}`
                 // `a` in `[a]`
                 return name.elements;
-            case 188 /* ObjectLiteralExpression */:
+            case 189 /* ObjectLiteralExpression */:
                 // `a` in `{a}`
                 return name.properties;
         }
@@ -64752,11 +66926,11 @@ var ts;
     ts.convertToObjectAssignmentElement = convertToObjectAssignmentElement;
     function convertToAssignmentPattern(node) {
         switch (node.kind) {
-            case 185 /* ArrayBindingPattern */:
-            case 187 /* ArrayLiteralExpression */:
+            case 186 /* ArrayBindingPattern */:
+            case 188 /* ArrayLiteralExpression */:
                 return convertToArrayAssignmentPattern(node);
-            case 184 /* ObjectBindingPattern */:
-            case 188 /* ObjectLiteralExpression */:
+            case 185 /* ObjectBindingPattern */:
+            case 189 /* ObjectLiteralExpression */:
                 return convertToObjectAssignmentPattern(node);
         }
     }
@@ -64917,276 +67091,278 @@ var ts;
         }
         var kind = node.kind;
         // No need to visit nodes with no children.
-        if ((kind > 0 /* FirstToken */ && kind <= 147 /* LastToken */) || kind === 178 /* ThisType */) {
+        if ((kind > 0 /* FirstToken */ && kind <= 148 /* LastToken */) || kind === 179 /* ThisType */) {
             return node;
         }
         switch (kind) {
             // Names
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 return ts.updateIdentifier(node, nodesVisitor(node.typeArguments, visitor, isTypeNodeOrTypeParameterDeclaration));
-            case 148 /* QualifiedName */:
+            case 149 /* QualifiedName */:
                 return ts.updateQualifiedName(node, visitNode(node.left, visitor, ts.isEntityName), visitNode(node.right, visitor, ts.isIdentifier));
-            case 149 /* ComputedPropertyName */:
+            case 150 /* ComputedPropertyName */:
                 return ts.updateComputedPropertyName(node, visitNode(node.expression, visitor, ts.isExpression));
             // Signature elements
-            case 150 /* TypeParameter */:
+            case 151 /* TypeParameter */:
                 return ts.updateTypeParameterDeclaration(node, visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.constraint, visitor, ts.isTypeNode), visitNode(node.default, visitor, ts.isTypeNode));
-            case 151 /* Parameter */:
+            case 152 /* Parameter */:
                 return ts.updateParameter(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.dotDotDotToken, tokenVisitor, ts.isToken), visitNode(node.name, visitor, ts.isBindingName), visitNode(node.questionToken, tokenVisitor, ts.isToken), visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.initializer, visitor, ts.isExpression));
-            case 152 /* Decorator */:
+            case 153 /* Decorator */:
                 return ts.updateDecorator(node, visitNode(node.expression, visitor, ts.isExpression));
             // Type elements
-            case 153 /* PropertySignature */:
+            case 154 /* PropertySignature */:
                 return ts.updatePropertySignature(node, nodesVisitor(node.modifiers, visitor, ts.isToken), visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.questionToken, tokenVisitor, ts.isToken), visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.initializer, visitor, ts.isExpression));
-            case 154 /* PropertyDeclaration */:
-                return ts.updateProperty(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.questionToken, tokenVisitor, ts.isToken), visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.initializer, visitor, ts.isExpression));
-            case 155 /* MethodSignature */:
+            case 155 /* PropertyDeclaration */:
+                return ts.updateProperty(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), 
+                // QuestionToken and ExclamationToken is uniqued in Property Declaration and the signature of 'updateProperty' is that too
+                visitNode(node.questionToken || node.exclamationToken, tokenVisitor, ts.isToken), visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.initializer, visitor, ts.isExpression));
+            case 156 /* MethodSignature */:
                 return ts.updateMethodSignature(node, nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.questionToken, tokenVisitor, ts.isToken));
-            case 156 /* MethodDeclaration */:
+            case 157 /* MethodDeclaration */:
                 return ts.updateMethod(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.asteriskToken, tokenVisitor, ts.isToken), visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.questionToken, tokenVisitor, ts.isToken), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitNode(node.type, visitor, ts.isTypeNode), visitFunctionBody(node.body, visitor, context));
-            case 157 /* Constructor */:
+            case 158 /* Constructor */:
                 return ts.updateConstructor(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitFunctionBody(node.body, visitor, context));
-            case 158 /* GetAccessor */:
+            case 159 /* GetAccessor */:
                 return ts.updateGetAccessor(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitNode(node.type, visitor, ts.isTypeNode), visitFunctionBody(node.body, visitor, context));
-            case 159 /* SetAccessor */:
+            case 160 /* SetAccessor */:
                 return ts.updateSetAccessor(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitFunctionBody(node.body, visitor, context));
-            case 160 /* CallSignature */:
+            case 161 /* CallSignature */:
                 return ts.updateCallSignature(node, nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode));
-            case 161 /* ConstructSignature */:
+            case 162 /* ConstructSignature */:
                 return ts.updateConstructSignature(node, nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode));
-            case 162 /* IndexSignature */:
+            case 163 /* IndexSignature */:
                 return ts.updateIndexSignature(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode));
             // Types
-            case 163 /* TypePredicate */:
+            case 164 /* TypePredicate */:
                 return ts.updateTypePredicateNode(node, visitNode(node.parameterName, visitor), visitNode(node.type, visitor, ts.isTypeNode));
-            case 164 /* TypeReference */:
+            case 165 /* TypeReference */:
                 return ts.updateTypeReferenceNode(node, visitNode(node.typeName, visitor, ts.isEntityName), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode));
-            case 165 /* FunctionType */:
+            case 166 /* FunctionType */:
                 return ts.updateFunctionTypeNode(node, nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode));
-            case 166 /* ConstructorType */:
+            case 167 /* ConstructorType */:
                 return ts.updateConstructorTypeNode(node, nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode));
-            case 167 /* TypeQuery */:
+            case 168 /* TypeQuery */:
                 return ts.updateTypeQueryNode(node, visitNode(node.exprName, visitor, ts.isEntityName));
-            case 168 /* TypeLiteral */:
+            case 169 /* TypeLiteral */:
                 return ts.updateTypeLiteralNode(node, nodesVisitor(node.members, visitor, ts.isTypeElement));
-            case 169 /* ArrayType */:
+            case 170 /* ArrayType */:
                 return ts.updateArrayTypeNode(node, visitNode(node.elementType, visitor, ts.isTypeNode));
-            case 170 /* TupleType */:
+            case 171 /* TupleType */:
                 return ts.updateTupleTypeNode(node, nodesVisitor(node.elementTypes, visitor, ts.isTypeNode));
-            case 171 /* OptionalType */:
+            case 172 /* OptionalType */:
                 return ts.updateOptionalTypeNode(node, visitNode(node.type, visitor, ts.isTypeNode));
-            case 172 /* RestType */:
+            case 173 /* RestType */:
                 return ts.updateRestTypeNode(node, visitNode(node.type, visitor, ts.isTypeNode));
-            case 173 /* UnionType */:
+            case 174 /* UnionType */:
                 return ts.updateUnionTypeNode(node, nodesVisitor(node.types, visitor, ts.isTypeNode));
-            case 174 /* IntersectionType */:
+            case 175 /* IntersectionType */:
                 return ts.updateIntersectionTypeNode(node, nodesVisitor(node.types, visitor, ts.isTypeNode));
-            case 175 /* ConditionalType */:
+            case 176 /* ConditionalType */:
                 return ts.updateConditionalTypeNode(node, visitNode(node.checkType, visitor, ts.isTypeNode), visitNode(node.extendsType, visitor, ts.isTypeNode), visitNode(node.trueType, visitor, ts.isTypeNode), visitNode(node.falseType, visitor, ts.isTypeNode));
-            case 176 /* InferType */:
+            case 177 /* InferType */:
                 return ts.updateInferTypeNode(node, visitNode(node.typeParameter, visitor, ts.isTypeParameterDeclaration));
-            case 183 /* ImportType */:
+            case 184 /* ImportType */:
                 return ts.updateImportTypeNode(node, visitNode(node.argument, visitor, ts.isTypeNode), visitNode(node.qualifier, visitor, ts.isEntityName), visitNodes(node.typeArguments, visitor, ts.isTypeNode), node.isTypeOf);
-            case 177 /* ParenthesizedType */:
+            case 178 /* ParenthesizedType */:
                 return ts.updateParenthesizedType(node, visitNode(node.type, visitor, ts.isTypeNode));
-            case 179 /* TypeOperator */:
+            case 180 /* TypeOperator */:
                 return ts.updateTypeOperatorNode(node, visitNode(node.type, visitor, ts.isTypeNode));
-            case 180 /* IndexedAccessType */:
+            case 181 /* IndexedAccessType */:
                 return ts.updateIndexedAccessTypeNode(node, visitNode(node.objectType, visitor, ts.isTypeNode), visitNode(node.indexType, visitor, ts.isTypeNode));
-            case 181 /* MappedType */:
+            case 182 /* MappedType */:
                 return ts.updateMappedTypeNode(node, visitNode(node.readonlyToken, tokenVisitor, ts.isToken), visitNode(node.typeParameter, visitor, ts.isTypeParameterDeclaration), visitNode(node.questionToken, tokenVisitor, ts.isToken), visitNode(node.type, visitor, ts.isTypeNode));
-            case 182 /* LiteralType */:
+            case 183 /* LiteralType */:
                 return ts.updateLiteralTypeNode(node, visitNode(node.literal, visitor, ts.isExpression));
             // Binding patterns
-            case 184 /* ObjectBindingPattern */:
+            case 185 /* ObjectBindingPattern */:
                 return ts.updateObjectBindingPattern(node, nodesVisitor(node.elements, visitor, ts.isBindingElement));
-            case 185 /* ArrayBindingPattern */:
+            case 186 /* ArrayBindingPattern */:
                 return ts.updateArrayBindingPattern(node, nodesVisitor(node.elements, visitor, ts.isArrayBindingElement));
-            case 186 /* BindingElement */:
+            case 187 /* BindingElement */:
                 return ts.updateBindingElement(node, visitNode(node.dotDotDotToken, tokenVisitor, ts.isToken), visitNode(node.propertyName, visitor, ts.isPropertyName), visitNode(node.name, visitor, ts.isBindingName), visitNode(node.initializer, visitor, ts.isExpression));
             // Expression
-            case 187 /* ArrayLiteralExpression */:
+            case 188 /* ArrayLiteralExpression */:
                 return ts.updateArrayLiteral(node, nodesVisitor(node.elements, visitor, ts.isExpression));
-            case 188 /* ObjectLiteralExpression */:
+            case 189 /* ObjectLiteralExpression */:
                 return ts.updateObjectLiteral(node, nodesVisitor(node.properties, visitor, ts.isObjectLiteralElementLike));
-            case 189 /* PropertyAccessExpression */:
+            case 190 /* PropertyAccessExpression */:
                 return ts.updatePropertyAccess(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.name, visitor, ts.isIdentifier));
-            case 190 /* ElementAccessExpression */:
+            case 191 /* ElementAccessExpression */:
                 return ts.updateElementAccess(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.argumentExpression, visitor, ts.isExpression));
-            case 191 /* CallExpression */:
+            case 192 /* CallExpression */:
                 return ts.updateCall(node, visitNode(node.expression, visitor, ts.isExpression), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode), nodesVisitor(node.arguments, visitor, ts.isExpression));
-            case 192 /* NewExpression */:
+            case 193 /* NewExpression */:
                 return ts.updateNew(node, visitNode(node.expression, visitor, ts.isExpression), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode), nodesVisitor(node.arguments, visitor, ts.isExpression));
-            case 193 /* TaggedTemplateExpression */:
+            case 194 /* TaggedTemplateExpression */:
                 return ts.updateTaggedTemplate(node, visitNode(node.tag, visitor, ts.isExpression), visitNodes(node.typeArguments, visitor, ts.isExpression), visitNode(node.template, visitor, ts.isTemplateLiteral));
-            case 194 /* TypeAssertionExpression */:
+            case 195 /* TypeAssertionExpression */:
                 return ts.updateTypeAssertion(node, visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.expression, visitor, ts.isExpression));
-            case 195 /* ParenthesizedExpression */:
+            case 196 /* ParenthesizedExpression */:
                 return ts.updateParen(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 196 /* FunctionExpression */:
+            case 197 /* FunctionExpression */:
                 return ts.updateFunctionExpression(node, nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.asteriskToken, tokenVisitor, ts.isToken), visitNode(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitNode(node.type, visitor, ts.isTypeNode), visitFunctionBody(node.body, visitor, context));
-            case 197 /* ArrowFunction */:
+            case 198 /* ArrowFunction */:
                 return ts.updateArrowFunction(node, nodesVisitor(node.modifiers, visitor, ts.isModifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.equalsGreaterThanToken, visitor, ts.isToken), visitFunctionBody(node.body, visitor, context));
-            case 198 /* DeleteExpression */:
+            case 199 /* DeleteExpression */:
                 return ts.updateDelete(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 199 /* TypeOfExpression */:
+            case 200 /* TypeOfExpression */:
                 return ts.updateTypeOf(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 200 /* VoidExpression */:
+            case 201 /* VoidExpression */:
                 return ts.updateVoid(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 201 /* AwaitExpression */:
+            case 202 /* AwaitExpression */:
                 return ts.updateAwait(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 202 /* PrefixUnaryExpression */:
+            case 203 /* PrefixUnaryExpression */:
                 return ts.updatePrefix(node, visitNode(node.operand, visitor, ts.isExpression));
-            case 203 /* PostfixUnaryExpression */:
+            case 204 /* PostfixUnaryExpression */:
                 return ts.updatePostfix(node, visitNode(node.operand, visitor, ts.isExpression));
-            case 204 /* BinaryExpression */:
+            case 205 /* BinaryExpression */:
                 return ts.updateBinary(node, visitNode(node.left, visitor, ts.isExpression), visitNode(node.right, visitor, ts.isExpression), visitNode(node.operatorToken, visitor, ts.isToken));
-            case 205 /* ConditionalExpression */:
+            case 206 /* ConditionalExpression */:
                 return ts.updateConditional(node, visitNode(node.condition, visitor, ts.isExpression), visitNode(node.questionToken, visitor, ts.isToken), visitNode(node.whenTrue, visitor, ts.isExpression), visitNode(node.colonToken, visitor, ts.isToken), visitNode(node.whenFalse, visitor, ts.isExpression));
-            case 206 /* TemplateExpression */:
+            case 207 /* TemplateExpression */:
                 return ts.updateTemplateExpression(node, visitNode(node.head, visitor, ts.isTemplateHead), nodesVisitor(node.templateSpans, visitor, ts.isTemplateSpan));
-            case 207 /* YieldExpression */:
+            case 208 /* YieldExpression */:
                 return ts.updateYield(node, visitNode(node.asteriskToken, tokenVisitor, ts.isToken), visitNode(node.expression, visitor, ts.isExpression));
-            case 208 /* SpreadElement */:
+            case 209 /* SpreadElement */:
                 return ts.updateSpread(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 209 /* ClassExpression */:
+            case 210 /* ClassExpression */:
                 return ts.updateClassExpression(node, nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.heritageClauses, visitor, ts.isHeritageClause), nodesVisitor(node.members, visitor, ts.isClassElement));
-            case 211 /* ExpressionWithTypeArguments */:
+            case 212 /* ExpressionWithTypeArguments */:
                 return ts.updateExpressionWithTypeArguments(node, nodesVisitor(node.typeArguments, visitor, ts.isTypeNode), visitNode(node.expression, visitor, ts.isExpression));
-            case 212 /* AsExpression */:
+            case 213 /* AsExpression */:
                 return ts.updateAsExpression(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.type, visitor, ts.isTypeNode));
-            case 213 /* NonNullExpression */:
+            case 214 /* NonNullExpression */:
                 return ts.updateNonNullExpression(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 214 /* MetaProperty */:
+            case 215 /* MetaProperty */:
                 return ts.updateMetaProperty(node, visitNode(node.name, visitor, ts.isIdentifier));
             // Misc
-            case 216 /* TemplateSpan */:
+            case 217 /* TemplateSpan */:
                 return ts.updateTemplateSpan(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.literal, visitor, ts.isTemplateMiddleOrTemplateTail));
             // Element
-            case 218 /* Block */:
+            case 219 /* Block */:
                 return ts.updateBlock(node, nodesVisitor(node.statements, visitor, ts.isStatement));
-            case 219 /* VariableStatement */:
+            case 220 /* VariableStatement */:
                 return ts.updateVariableStatement(node, nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.declarationList, visitor, ts.isVariableDeclarationList));
-            case 221 /* ExpressionStatement */:
+            case 222 /* ExpressionStatement */:
                 return ts.updateExpressionStatement(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 222 /* IfStatement */:
+            case 223 /* IfStatement */:
                 return ts.updateIf(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.thenStatement, visitor, ts.isStatement, ts.liftToBlock), visitNode(node.elseStatement, visitor, ts.isStatement, ts.liftToBlock));
-            case 223 /* DoStatement */:
+            case 224 /* DoStatement */:
                 return ts.updateDo(node, visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock), visitNode(node.expression, visitor, ts.isExpression));
-            case 224 /* WhileStatement */:
+            case 225 /* WhileStatement */:
                 return ts.updateWhile(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock));
-            case 225 /* ForStatement */:
+            case 226 /* ForStatement */:
                 return ts.updateFor(node, visitNode(node.initializer, visitor, ts.isForInitializer), visitNode(node.condition, visitor, ts.isExpression), visitNode(node.incrementor, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock));
-            case 226 /* ForInStatement */:
+            case 227 /* ForInStatement */:
                 return ts.updateForIn(node, visitNode(node.initializer, visitor, ts.isForInitializer), visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock));
-            case 227 /* ForOfStatement */:
+            case 228 /* ForOfStatement */:
                 return ts.updateForOf(node, visitNode(node.awaitModifier, visitor, ts.isToken), visitNode(node.initializer, visitor, ts.isForInitializer), visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock));
-            case 228 /* ContinueStatement */:
+            case 229 /* ContinueStatement */:
                 return ts.updateContinue(node, visitNode(node.label, visitor, ts.isIdentifier));
-            case 229 /* BreakStatement */:
+            case 230 /* BreakStatement */:
                 return ts.updateBreak(node, visitNode(node.label, visitor, ts.isIdentifier));
-            case 230 /* ReturnStatement */:
+            case 231 /* ReturnStatement */:
                 return ts.updateReturn(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 231 /* WithStatement */:
+            case 232 /* WithStatement */:
                 return ts.updateWith(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock));
-            case 232 /* SwitchStatement */:
+            case 233 /* SwitchStatement */:
                 return ts.updateSwitch(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.caseBlock, visitor, ts.isCaseBlock));
-            case 233 /* LabeledStatement */:
+            case 234 /* LabeledStatement */:
                 return ts.updateLabel(node, visitNode(node.label, visitor, ts.isIdentifier), visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock));
-            case 234 /* ThrowStatement */:
+            case 235 /* ThrowStatement */:
                 return ts.updateThrow(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 235 /* TryStatement */:
+            case 236 /* TryStatement */:
                 return ts.updateTry(node, visitNode(node.tryBlock, visitor, ts.isBlock), visitNode(node.catchClause, visitor, ts.isCatchClause), visitNode(node.finallyBlock, visitor, ts.isBlock));
-            case 237 /* VariableDeclaration */:
+            case 238 /* VariableDeclaration */:
                 return ts.updateVariableDeclaration(node, visitNode(node.name, visitor, ts.isBindingName), visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.initializer, visitor, ts.isExpression));
-            case 238 /* VariableDeclarationList */:
+            case 239 /* VariableDeclarationList */:
                 return ts.updateVariableDeclarationList(node, nodesVisitor(node.declarations, visitor, ts.isVariableDeclaration));
-            case 239 /* FunctionDeclaration */:
+            case 240 /* FunctionDeclaration */:
                 return ts.updateFunctionDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.asteriskToken, tokenVisitor, ts.isToken), visitNode(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitNode(node.type, visitor, ts.isTypeNode), visitFunctionBody(node.body, visitor, context));
-            case 240 /* ClassDeclaration */:
+            case 241 /* ClassDeclaration */:
                 return ts.updateClassDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.heritageClauses, visitor, ts.isHeritageClause), nodesVisitor(node.members, visitor, ts.isClassElement));
-            case 241 /* InterfaceDeclaration */:
+            case 242 /* InterfaceDeclaration */:
                 return ts.updateInterfaceDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.heritageClauses, visitor, ts.isHeritageClause), nodesVisitor(node.members, visitor, ts.isTypeElement));
-            case 242 /* TypeAliasDeclaration */:
+            case 243 /* TypeAliasDeclaration */:
                 return ts.updateTypeAliasDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode));
-            case 243 /* EnumDeclaration */:
+            case 244 /* EnumDeclaration */:
                 return ts.updateEnumDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier), nodesVisitor(node.members, visitor, ts.isEnumMember));
-            case 244 /* ModuleDeclaration */:
+            case 245 /* ModuleDeclaration */:
                 return ts.updateModuleDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.body, visitor, ts.isModuleBody));
-            case 245 /* ModuleBlock */:
+            case 246 /* ModuleBlock */:
                 return ts.updateModuleBlock(node, nodesVisitor(node.statements, visitor, ts.isStatement));
-            case 246 /* CaseBlock */:
+            case 247 /* CaseBlock */:
                 return ts.updateCaseBlock(node, nodesVisitor(node.clauses, visitor, ts.isCaseOrDefaultClause));
-            case 247 /* NamespaceExportDeclaration */:
+            case 248 /* NamespaceExportDeclaration */:
                 return ts.updateNamespaceExportDeclaration(node, visitNode(node.name, visitor, ts.isIdentifier));
-            case 248 /* ImportEqualsDeclaration */:
+            case 249 /* ImportEqualsDeclaration */:
                 return ts.updateImportEqualsDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.moduleReference, visitor, ts.isModuleReference));
-            case 249 /* ImportDeclaration */:
+            case 250 /* ImportDeclaration */:
                 return ts.updateImportDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.importClause, visitor, ts.isImportClause), visitNode(node.moduleSpecifier, visitor, ts.isExpression));
-            case 250 /* ImportClause */:
+            case 251 /* ImportClause */:
                 return ts.updateImportClause(node, visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.namedBindings, visitor, ts.isNamedImportBindings));
-            case 251 /* NamespaceImport */:
+            case 252 /* NamespaceImport */:
                 return ts.updateNamespaceImport(node, visitNode(node.name, visitor, ts.isIdentifier));
-            case 252 /* NamedImports */:
+            case 253 /* NamedImports */:
                 return ts.updateNamedImports(node, nodesVisitor(node.elements, visitor, ts.isImportSpecifier));
-            case 253 /* ImportSpecifier */:
+            case 254 /* ImportSpecifier */:
                 return ts.updateImportSpecifier(node, visitNode(node.propertyName, visitor, ts.isIdentifier), visitNode(node.name, visitor, ts.isIdentifier));
-            case 254 /* ExportAssignment */:
+            case 255 /* ExportAssignment */:
                 return ts.updateExportAssignment(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.expression, visitor, ts.isExpression));
-            case 255 /* ExportDeclaration */:
+            case 256 /* ExportDeclaration */:
                 return ts.updateExportDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.exportClause, visitor, ts.isNamedExports), visitNode(node.moduleSpecifier, visitor, ts.isExpression));
-            case 256 /* NamedExports */:
+            case 257 /* NamedExports */:
                 return ts.updateNamedExports(node, nodesVisitor(node.elements, visitor, ts.isExportSpecifier));
-            case 257 /* ExportSpecifier */:
+            case 258 /* ExportSpecifier */:
                 return ts.updateExportSpecifier(node, visitNode(node.propertyName, visitor, ts.isIdentifier), visitNode(node.name, visitor, ts.isIdentifier));
             // Module references
-            case 259 /* ExternalModuleReference */:
+            case 260 /* ExternalModuleReference */:
                 return ts.updateExternalModuleReference(node, visitNode(node.expression, visitor, ts.isExpression));
             // JSX
-            case 260 /* JsxElement */:
+            case 261 /* JsxElement */:
                 return ts.updateJsxElement(node, visitNode(node.openingElement, visitor, ts.isJsxOpeningElement), nodesVisitor(node.children, visitor, ts.isJsxChild), visitNode(node.closingElement, visitor, ts.isJsxClosingElement));
-            case 261 /* JsxSelfClosingElement */:
+            case 262 /* JsxSelfClosingElement */:
                 return ts.updateJsxSelfClosingElement(node, visitNode(node.tagName, visitor, ts.isJsxTagNameExpression), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode), visitNode(node.attributes, visitor, ts.isJsxAttributes));
-            case 262 /* JsxOpeningElement */:
+            case 263 /* JsxOpeningElement */:
                 return ts.updateJsxOpeningElement(node, visitNode(node.tagName, visitor, ts.isJsxTagNameExpression), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode), visitNode(node.attributes, visitor, ts.isJsxAttributes));
-            case 263 /* JsxClosingElement */:
+            case 264 /* JsxClosingElement */:
                 return ts.updateJsxClosingElement(node, visitNode(node.tagName, visitor, ts.isJsxTagNameExpression));
-            case 264 /* JsxFragment */:
+            case 265 /* JsxFragment */:
                 return ts.updateJsxFragment(node, visitNode(node.openingFragment, visitor, ts.isJsxOpeningFragment), nodesVisitor(node.children, visitor, ts.isJsxChild), visitNode(node.closingFragment, visitor, ts.isJsxClosingFragment));
-            case 267 /* JsxAttribute */:
+            case 268 /* JsxAttribute */:
                 return ts.updateJsxAttribute(node, visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.initializer, visitor, ts.isStringLiteralOrJsxExpression));
-            case 268 /* JsxAttributes */:
+            case 269 /* JsxAttributes */:
                 return ts.updateJsxAttributes(node, nodesVisitor(node.properties, visitor, ts.isJsxAttributeLike));
-            case 269 /* JsxSpreadAttribute */:
+            case 270 /* JsxSpreadAttribute */:
                 return ts.updateJsxSpreadAttribute(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 270 /* JsxExpression */:
+            case 271 /* JsxExpression */:
                 return ts.updateJsxExpression(node, visitNode(node.expression, visitor, ts.isExpression));
             // Clauses
-            case 271 /* CaseClause */:
+            case 272 /* CaseClause */:
                 return ts.updateCaseClause(node, visitNode(node.expression, visitor, ts.isExpression), nodesVisitor(node.statements, visitor, ts.isStatement));
-            case 272 /* DefaultClause */:
+            case 273 /* DefaultClause */:
                 return ts.updateDefaultClause(node, nodesVisitor(node.statements, visitor, ts.isStatement));
-            case 273 /* HeritageClause */:
+            case 274 /* HeritageClause */:
                 return ts.updateHeritageClause(node, nodesVisitor(node.types, visitor, ts.isExpressionWithTypeArguments));
-            case 274 /* CatchClause */:
+            case 275 /* CatchClause */:
                 return ts.updateCatchClause(node, visitNode(node.variableDeclaration, visitor, ts.isVariableDeclaration), visitNode(node.block, visitor, ts.isBlock));
             // Property assignments
-            case 275 /* PropertyAssignment */:
+            case 276 /* PropertyAssignment */:
                 return ts.updatePropertyAssignment(node, visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.initializer, visitor, ts.isExpression));
-            case 276 /* ShorthandPropertyAssignment */:
+            case 277 /* ShorthandPropertyAssignment */:
                 return ts.updateShorthandPropertyAssignment(node, visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.objectAssignmentInitializer, visitor, ts.isExpression));
-            case 277 /* SpreadAssignment */:
+            case 278 /* SpreadAssignment */:
                 return ts.updateSpreadAssignment(node, visitNode(node.expression, visitor, ts.isExpression));
             // Enum
-            case 278 /* EnumMember */:
+            case 279 /* EnumMember */:
                 return ts.updateEnumMember(node, visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.initializer, visitor, ts.isExpression));
             // Top-level nodes
-            case 284 /* SourceFile */:
+            case 285 /* SourceFile */:
                 return ts.updateSourceFileNode(node, visitLexicalEnvironment(node.statements, visitor, context));
             // Transformation nodes
-            case 313 /* PartiallyEmittedExpression */:
+            case 315 /* PartiallyEmittedExpression */:
                 return ts.updatePartiallyEmittedExpression(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 314 /* CommaListExpression */:
+            case 316 /* CommaListExpression */:
                 return ts.updateCommaList(node, nodesVisitor(node.elements, visitor, ts.isExpression));
             default:
                 // No need to visit nodes with no children.
@@ -65228,58 +67404,58 @@ var ts;
         var cbNodes = cbNodeArray || cbNode;
         var kind = node.kind;
         // No need to visit nodes with no children.
-        if ((kind > 0 /* FirstToken */ && kind <= 147 /* LastToken */)) {
+        if ((kind > 0 /* FirstToken */ && kind <= 148 /* LastToken */)) {
             return initial;
         }
         // We do not yet support types.
-        if ((kind >= 163 /* TypePredicate */ && kind <= 182 /* LiteralType */)) {
+        if ((kind >= 164 /* TypePredicate */ && kind <= 183 /* LiteralType */)) {
             return initial;
         }
         var result = initial;
         switch (node.kind) {
             // Leaf nodes
-            case 217 /* SemicolonClassElement */:
-            case 220 /* EmptyStatement */:
-            case 210 /* OmittedExpression */:
-            case 236 /* DebuggerStatement */:
-            case 312 /* NotEmittedStatement */:
+            case 218 /* SemicolonClassElement */:
+            case 221 /* EmptyStatement */:
+            case 211 /* OmittedExpression */:
+            case 237 /* DebuggerStatement */:
+            case 314 /* NotEmittedStatement */:
                 // No need to visit nodes with no children.
                 break;
             // Names
-            case 148 /* QualifiedName */:
+            case 149 /* QualifiedName */:
                 result = reduceNode(node.left, cbNode, result);
                 result = reduceNode(node.right, cbNode, result);
                 break;
-            case 149 /* ComputedPropertyName */:
+            case 150 /* ComputedPropertyName */:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
             // Signature elements
-            case 151 /* Parameter */:
+            case 152 /* Parameter */:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.type, cbNode, result);
                 result = reduceNode(node.initializer, cbNode, result);
                 break;
-            case 152 /* Decorator */:
+            case 153 /* Decorator */:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
             // Type member
-            case 153 /* PropertySignature */:
+            case 154 /* PropertySignature */:
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.questionToken, cbNode, result);
                 result = reduceNode(node.type, cbNode, result);
                 result = reduceNode(node.initializer, cbNode, result);
                 break;
-            case 154 /* PropertyDeclaration */:
+            case 155 /* PropertyDeclaration */:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.type, cbNode, result);
                 result = reduceNode(node.initializer, cbNode, result);
                 break;
-            case 156 /* MethodDeclaration */:
+            case 157 /* MethodDeclaration */:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
@@ -65288,12 +67464,12 @@ var ts;
                 result = reduceNode(node.type, cbNode, result);
                 result = reduceNode(node.body, cbNode, result);
                 break;
-            case 157 /* Constructor */:
+            case 158 /* Constructor */:
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNodes(node.parameters, cbNodes, result);
                 result = reduceNode(node.body, cbNode, result);
                 break;
-            case 158 /* GetAccessor */:
+            case 159 /* GetAccessor */:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
@@ -65301,7 +67477,7 @@ var ts;
                 result = reduceNode(node.type, cbNode, result);
                 result = reduceNode(node.body, cbNode, result);
                 break;
-            case 159 /* SetAccessor */:
+            case 160 /* SetAccessor */:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
@@ -65309,50 +67485,50 @@ var ts;
                 result = reduceNode(node.body, cbNode, result);
                 break;
             // Binding patterns
-            case 184 /* ObjectBindingPattern */:
-            case 185 /* ArrayBindingPattern */:
+            case 185 /* ObjectBindingPattern */:
+            case 186 /* ArrayBindingPattern */:
                 result = reduceNodes(node.elements, cbNodes, result);
                 break;
-            case 186 /* BindingElement */:
+            case 187 /* BindingElement */:
                 result = reduceNode(node.propertyName, cbNode, result);
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.initializer, cbNode, result);
                 break;
             // Expression
-            case 187 /* ArrayLiteralExpression */:
+            case 188 /* ArrayLiteralExpression */:
                 result = reduceNodes(node.elements, cbNodes, result);
                 break;
-            case 188 /* ObjectLiteralExpression */:
+            case 189 /* ObjectLiteralExpression */:
                 result = reduceNodes(node.properties, cbNodes, result);
                 break;
-            case 189 /* PropertyAccessExpression */:
+            case 190 /* PropertyAccessExpression */:
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNode(node.name, cbNode, result);
                 break;
-            case 190 /* ElementAccessExpression */:
+            case 191 /* ElementAccessExpression */:
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNode(node.argumentExpression, cbNode, result);
                 break;
-            case 191 /* CallExpression */:
+            case 192 /* CallExpression */:
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNodes(node.typeArguments, cbNodes, result);
                 result = reduceNodes(node.arguments, cbNodes, result);
                 break;
-            case 192 /* NewExpression */:
+            case 193 /* NewExpression */:
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNodes(node.typeArguments, cbNodes, result);
                 result = reduceNodes(node.arguments, cbNodes, result);
                 break;
-            case 193 /* TaggedTemplateExpression */:
+            case 194 /* TaggedTemplateExpression */:
                 result = reduceNode(node.tag, cbNode, result);
                 result = reduceNodes(node.typeArguments, cbNodes, result);
                 result = reduceNode(node.template, cbNode, result);
                 break;
-            case 194 /* TypeAssertionExpression */:
+            case 195 /* TypeAssertionExpression */:
                 result = reduceNode(node.type, cbNode, result);
                 result = reduceNode(node.expression, cbNode, result);
                 break;
-            case 196 /* FunctionExpression */:
+            case 197 /* FunctionExpression */:
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNodes(node.typeParameters, cbNodes, result);
@@ -65360,123 +67536,123 @@ var ts;
                 result = reduceNode(node.type, cbNode, result);
                 result = reduceNode(node.body, cbNode, result);
                 break;
-            case 197 /* ArrowFunction */:
+            case 198 /* ArrowFunction */:
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNodes(node.typeParameters, cbNodes, result);
                 result = reduceNodes(node.parameters, cbNodes, result);
                 result = reduceNode(node.type, cbNode, result);
                 result = reduceNode(node.body, cbNode, result);
                 break;
-            case 195 /* ParenthesizedExpression */:
-            case 198 /* DeleteExpression */:
-            case 199 /* TypeOfExpression */:
-            case 200 /* VoidExpression */:
-            case 201 /* AwaitExpression */:
-            case 207 /* YieldExpression */:
-            case 208 /* SpreadElement */:
-            case 213 /* NonNullExpression */:
+            case 196 /* ParenthesizedExpression */:
+            case 199 /* DeleteExpression */:
+            case 200 /* TypeOfExpression */:
+            case 201 /* VoidExpression */:
+            case 202 /* AwaitExpression */:
+            case 208 /* YieldExpression */:
+            case 209 /* SpreadElement */:
+            case 214 /* NonNullExpression */:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
-            case 202 /* PrefixUnaryExpression */:
-            case 203 /* PostfixUnaryExpression */:
+            case 203 /* PrefixUnaryExpression */:
+            case 204 /* PostfixUnaryExpression */:
                 result = reduceNode(node.operand, cbNode, result);
                 break;
-            case 204 /* BinaryExpression */:
+            case 205 /* BinaryExpression */:
                 result = reduceNode(node.left, cbNode, result);
                 result = reduceNode(node.right, cbNode, result);
                 break;
-            case 205 /* ConditionalExpression */:
+            case 206 /* ConditionalExpression */:
                 result = reduceNode(node.condition, cbNode, result);
                 result = reduceNode(node.whenTrue, cbNode, result);
                 result = reduceNode(node.whenFalse, cbNode, result);
                 break;
-            case 206 /* TemplateExpression */:
+            case 207 /* TemplateExpression */:
                 result = reduceNode(node.head, cbNode, result);
                 result = reduceNodes(node.templateSpans, cbNodes, result);
                 break;
-            case 209 /* ClassExpression */:
+            case 210 /* ClassExpression */:
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNodes(node.typeParameters, cbNodes, result);
                 result = reduceNodes(node.heritageClauses, cbNodes, result);
                 result = reduceNodes(node.members, cbNodes, result);
                 break;
-            case 211 /* ExpressionWithTypeArguments */:
+            case 212 /* ExpressionWithTypeArguments */:
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNodes(node.typeArguments, cbNodes, result);
                 break;
-            case 212 /* AsExpression */:
+            case 213 /* AsExpression */:
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNode(node.type, cbNode, result);
                 break;
             // Misc
-            case 216 /* TemplateSpan */:
+            case 217 /* TemplateSpan */:
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNode(node.literal, cbNode, result);
                 break;
             // Element
-            case 218 /* Block */:
+            case 219 /* Block */:
                 result = reduceNodes(node.statements, cbNodes, result);
                 break;
-            case 219 /* VariableStatement */:
+            case 220 /* VariableStatement */:
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.declarationList, cbNode, result);
                 break;
-            case 221 /* ExpressionStatement */:
+            case 222 /* ExpressionStatement */:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
-            case 222 /* IfStatement */:
+            case 223 /* IfStatement */:
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNode(node.thenStatement, cbNode, result);
                 result = reduceNode(node.elseStatement, cbNode, result);
                 break;
-            case 223 /* DoStatement */:
+            case 224 /* DoStatement */:
                 result = reduceNode(node.statement, cbNode, result);
                 result = reduceNode(node.expression, cbNode, result);
                 break;
-            case 224 /* WhileStatement */:
-            case 231 /* WithStatement */:
+            case 225 /* WhileStatement */:
+            case 232 /* WithStatement */:
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNode(node.statement, cbNode, result);
                 break;
-            case 225 /* ForStatement */:
+            case 226 /* ForStatement */:
                 result = reduceNode(node.initializer, cbNode, result);
                 result = reduceNode(node.condition, cbNode, result);
                 result = reduceNode(node.incrementor, cbNode, result);
                 result = reduceNode(node.statement, cbNode, result);
                 break;
-            case 226 /* ForInStatement */:
-            case 227 /* ForOfStatement */:
+            case 227 /* ForInStatement */:
+            case 228 /* ForOfStatement */:
                 result = reduceNode(node.initializer, cbNode, result);
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNode(node.statement, cbNode, result);
                 break;
-            case 230 /* ReturnStatement */:
-            case 234 /* ThrowStatement */:
+            case 231 /* ReturnStatement */:
+            case 235 /* ThrowStatement */:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
-            case 232 /* SwitchStatement */:
+            case 233 /* SwitchStatement */:
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNode(node.caseBlock, cbNode, result);
                 break;
-            case 233 /* LabeledStatement */:
+            case 234 /* LabeledStatement */:
                 result = reduceNode(node.label, cbNode, result);
                 result = reduceNode(node.statement, cbNode, result);
                 break;
-            case 235 /* TryStatement */:
+            case 236 /* TryStatement */:
                 result = reduceNode(node.tryBlock, cbNode, result);
                 result = reduceNode(node.catchClause, cbNode, result);
                 result = reduceNode(node.finallyBlock, cbNode, result);
                 break;
-            case 237 /* VariableDeclaration */:
+            case 238 /* VariableDeclaration */:
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.type, cbNode, result);
                 result = reduceNode(node.initializer, cbNode, result);
                 break;
-            case 238 /* VariableDeclarationList */:
+            case 239 /* VariableDeclarationList */:
                 result = reduceNodes(node.declarations, cbNodes, result);
                 break;
-            case 239 /* FunctionDeclaration */:
+            case 240 /* FunctionDeclaration */:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
@@ -65485,7 +67661,7 @@ var ts;
                 result = reduceNode(node.type, cbNode, result);
                 result = reduceNode(node.body, cbNode, result);
                 break;
-            case 240 /* ClassDeclaration */:
+            case 241 /* ClassDeclaration */:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
@@ -65493,140 +67669,140 @@ var ts;
                 result = reduceNodes(node.heritageClauses, cbNodes, result);
                 result = reduceNodes(node.members, cbNodes, result);
                 break;
-            case 243 /* EnumDeclaration */:
+            case 244 /* EnumDeclaration */:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNodes(node.members, cbNodes, result);
                 break;
-            case 244 /* ModuleDeclaration */:
+            case 245 /* ModuleDeclaration */:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.body, cbNode, result);
                 break;
-            case 245 /* ModuleBlock */:
+            case 246 /* ModuleBlock */:
                 result = reduceNodes(node.statements, cbNodes, result);
                 break;
-            case 246 /* CaseBlock */:
+            case 247 /* CaseBlock */:
                 result = reduceNodes(node.clauses, cbNodes, result);
                 break;
-            case 248 /* ImportEqualsDeclaration */:
+            case 249 /* ImportEqualsDeclaration */:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.moduleReference, cbNode, result);
                 break;
-            case 249 /* ImportDeclaration */:
+            case 250 /* ImportDeclaration */:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.importClause, cbNode, result);
                 result = reduceNode(node.moduleSpecifier, cbNode, result);
                 break;
-            case 250 /* ImportClause */:
+            case 251 /* ImportClause */:
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.namedBindings, cbNode, result);
                 break;
-            case 251 /* NamespaceImport */:
+            case 252 /* NamespaceImport */:
                 result = reduceNode(node.name, cbNode, result);
                 break;
-            case 252 /* NamedImports */:
-            case 256 /* NamedExports */:
+            case 253 /* NamedImports */:
+            case 257 /* NamedExports */:
                 result = reduceNodes(node.elements, cbNodes, result);
                 break;
-            case 253 /* ImportSpecifier */:
-            case 257 /* ExportSpecifier */:
+            case 254 /* ImportSpecifier */:
+            case 258 /* ExportSpecifier */:
                 result = reduceNode(node.propertyName, cbNode, result);
                 result = reduceNode(node.name, cbNode, result);
                 break;
-            case 254 /* ExportAssignment */:
+            case 255 /* ExportAssignment */:
                 result = ts.reduceLeft(node.decorators, cbNode, result);
                 result = ts.reduceLeft(node.modifiers, cbNode, result);
                 result = reduceNode(node.expression, cbNode, result);
                 break;
-            case 255 /* ExportDeclaration */:
+            case 256 /* ExportDeclaration */:
                 result = ts.reduceLeft(node.decorators, cbNode, result);
                 result = ts.reduceLeft(node.modifiers, cbNode, result);
                 result = reduceNode(node.exportClause, cbNode, result);
                 result = reduceNode(node.moduleSpecifier, cbNode, result);
                 break;
             // Module references
-            case 259 /* ExternalModuleReference */:
+            case 260 /* ExternalModuleReference */:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
             // JSX
-            case 260 /* JsxElement */:
+            case 261 /* JsxElement */:
                 result = reduceNode(node.openingElement, cbNode, result);
                 result = ts.reduceLeft(node.children, cbNode, result);
                 result = reduceNode(node.closingElement, cbNode, result);
                 break;
-            case 264 /* JsxFragment */:
+            case 265 /* JsxFragment */:
                 result = reduceNode(node.openingFragment, cbNode, result);
                 result = ts.reduceLeft(node.children, cbNode, result);
                 result = reduceNode(node.closingFragment, cbNode, result);
                 break;
-            case 261 /* JsxSelfClosingElement */:
-            case 262 /* JsxOpeningElement */:
+            case 262 /* JsxSelfClosingElement */:
+            case 263 /* JsxOpeningElement */:
                 result = reduceNode(node.tagName, cbNode, result);
                 result = reduceNodes(node.typeArguments, cbNode, result);
                 result = reduceNode(node.attributes, cbNode, result);
                 break;
-            case 268 /* JsxAttributes */:
+            case 269 /* JsxAttributes */:
                 result = reduceNodes(node.properties, cbNodes, result);
                 break;
-            case 263 /* JsxClosingElement */:
+            case 264 /* JsxClosingElement */:
                 result = reduceNode(node.tagName, cbNode, result);
                 break;
-            case 267 /* JsxAttribute */:
+            case 268 /* JsxAttribute */:
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.initializer, cbNode, result);
                 break;
-            case 269 /* JsxSpreadAttribute */:
+            case 270 /* JsxSpreadAttribute */:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
-            case 270 /* JsxExpression */:
+            case 271 /* JsxExpression */:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
             // Clauses
-            case 271 /* CaseClause */:
+            case 272 /* CaseClause */:
                 result = reduceNode(node.expression, cbNode, result);
             // falls through
-            case 272 /* DefaultClause */:
+            case 273 /* DefaultClause */:
                 result = reduceNodes(node.statements, cbNodes, result);
                 break;
-            case 273 /* HeritageClause */:
+            case 274 /* HeritageClause */:
                 result = reduceNodes(node.types, cbNodes, result);
                 break;
-            case 274 /* CatchClause */:
+            case 275 /* CatchClause */:
                 result = reduceNode(node.variableDeclaration, cbNode, result);
                 result = reduceNode(node.block, cbNode, result);
                 break;
             // Property assignments
-            case 275 /* PropertyAssignment */:
+            case 276 /* PropertyAssignment */:
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.initializer, cbNode, result);
                 break;
-            case 276 /* ShorthandPropertyAssignment */:
+            case 277 /* ShorthandPropertyAssignment */:
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.objectAssignmentInitializer, cbNode, result);
                 break;
-            case 277 /* SpreadAssignment */:
+            case 278 /* SpreadAssignment */:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
             // Enum
-            case 278 /* EnumMember */:
+            case 279 /* EnumMember */:
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.initializer, cbNode, result);
                 break;
             // Top-level nodes
-            case 284 /* SourceFile */:
+            case 285 /* SourceFile */:
                 result = reduceNodes(node.statements, cbNodes, result);
                 break;
             // Transformation nodes
-            case 313 /* PartiallyEmittedExpression */:
+            case 315 /* PartiallyEmittedExpression */:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
-            case 314 /* CommaListExpression */:
+            case 316 /* CommaListExpression */:
                 result = reduceNodes(node.elements, cbNodes, result);
                 break;
             default:
@@ -65650,7 +67826,7 @@ var ts;
      * @param nodes The NodeArray.
      */
     function liftToBlock(nodes) {
-        Debug.assert(ts.every(nodes, ts.isStatement), "Cannot lift nodes to a Block.");
+        ts.Debug.assert(ts.every(nodes, ts.isStatement), "Cannot lift nodes to a Block.");
         return ts.singleOrUndefined(nodes) || ts.createBlock(nodes);
     }
     ts.liftToBlock = liftToBlock;
@@ -65699,7 +67875,7 @@ var ts;
     function aggregateTransformFlagsForSubtree(node) {
         // We do not transform ambient declarations or types, so there is no need to
         // recursively aggregate transform flags.
-        if (ts.hasModifier(node, 2 /* Ambient */) || (ts.isTypeNode(node) && node.kind !== 211 /* ExpressionWithTypeArguments */)) {
+        if (ts.hasModifier(node, 2 /* Ambient */) || (ts.isTypeNode(node) && node.kind !== 212 /* ExpressionWithTypeArguments */)) {
             return 0 /* None */;
         }
         // Aggregate the transform flags of each child.
@@ -65715,73 +67891,6 @@ var ts;
     function aggregateTransformFlagsForChildNodes(transformFlags, nodes) {
         return transformFlags | aggregateTransformFlagsForNodeArray(nodes);
     }
-    var Debug;
-    (function (Debug) {
-        var isDebugInfoEnabled = false;
-        function failBadSyntaxKind(node, message) {
-            return Debug.fail((message || "Unexpected node.") + "\r\nNode " + ts.formatSyntaxKind(node.kind) + " was unexpected.", failBadSyntaxKind);
-        }
-        Debug.failBadSyntaxKind = failBadSyntaxKind;
-        Debug.assertEachNode = Debug.shouldAssert(1 /* Normal */)
-            ? function (nodes, test, message) { return Debug.assert(test === undefined || ts.every(nodes, test), message || "Unexpected node.", function () { return "Node array did not pass test '" + Debug.getFunctionName(test) + "'."; }, Debug.assertEachNode); }
-            : ts.noop;
-        Debug.assertNode = Debug.shouldAssert(1 /* Normal */)
-            ? function (node, test, message) { return Debug.assert(test === undefined || test(node), message || "Unexpected node.", function () { return "Node " + ts.formatSyntaxKind(node.kind) + " did not pass test '" + Debug.getFunctionName(test) + "'."; }, Debug.assertNode); }
-            : ts.noop;
-        Debug.assertOptionalNode = Debug.shouldAssert(1 /* Normal */)
-            ? function (node, test, message) { return Debug.assert(test === undefined || node === undefined || test(node), message || "Unexpected node.", function () { return "Node " + ts.formatSyntaxKind(node.kind) + " did not pass test '" + Debug.getFunctionName(test) + "'."; }, Debug.assertOptionalNode); }
-            : ts.noop;
-        Debug.assertOptionalToken = Debug.shouldAssert(1 /* Normal */)
-            ? function (node, kind, message) { return Debug.assert(kind === undefined || node === undefined || node.kind === kind, message || "Unexpected node.", function () { return "Node " + ts.formatSyntaxKind(node.kind) + " was not a '" + ts.formatSyntaxKind(kind) + "' token."; }, Debug.assertOptionalToken); }
-            : ts.noop;
-        Debug.assertMissingNode = Debug.shouldAssert(1 /* Normal */)
-            ? function (node, message) { return Debug.assert(node === undefined, message || "Unexpected node.", function () { return "Node " + ts.formatSyntaxKind(node.kind) + " was unexpected'."; }, Debug.assertMissingNode); }
-            : ts.noop;
-        /**
-         * Injects debug information into frequently used types.
-         */
-        function enableDebugInfo() {
-            if (isDebugInfoEnabled)
-                return;
-            // Add additional properties in debug mode to assist with debugging.
-            Object.defineProperties(ts.objectAllocator.getSymbolConstructor().prototype, {
-                __debugFlags: { get: function () { return ts.formatSymbolFlags(this.flags); } }
-            });
-            Object.defineProperties(ts.objectAllocator.getTypeConstructor().prototype, {
-                __debugFlags: { get: function () { return ts.formatTypeFlags(this.flags); } },
-                __debugObjectFlags: { get: function () { return this.flags & 524288 /* Object */ ? ts.formatObjectFlags(this.objectFlags) : ""; } },
-                __debugTypeToString: { value: function () { return this.checker.typeToString(this); } },
-            });
-            var nodeConstructors = [
-                ts.objectAllocator.getNodeConstructor(),
-                ts.objectAllocator.getIdentifierConstructor(),
-                ts.objectAllocator.getTokenConstructor(),
-                ts.objectAllocator.getSourceFileConstructor()
-            ];
-            for (var _i = 0, nodeConstructors_1 = nodeConstructors; _i < nodeConstructors_1.length; _i++) {
-                var ctor = nodeConstructors_1[_i];
-                if (!ctor.prototype.hasOwnProperty("__debugKind")) {
-                    Object.defineProperties(ctor.prototype, {
-                        __debugKind: { get: function () { return ts.formatSyntaxKind(this.kind); } },
-                        __debugModifierFlags: { get: function () { return ts.formatModifierFlags(ts.getModifierFlagsNoCache(this)); } },
-                        __debugTransformFlags: { get: function () { return ts.formatTransformFlags(this.transformFlags); } },
-                        __debugEmitFlags: { get: function () { return ts.formatEmitFlags(ts.getEmitFlags(this)); } },
-                        __debugGetText: {
-                            value: function (includeTrivia) {
-                                if (ts.nodeIsSynthesized(this))
-                                    return "";
-                                var parseNode = ts.getParseTreeNode(this);
-                                var sourceFile = parseNode && ts.getSourceFileOfNode(parseNode);
-                                return sourceFile ? ts.getSourceTextOfNodeFromSourceFile(sourceFile, parseNode, includeTrivia) : "";
-                            }
-                        }
-                    });
-                }
-            }
-            isDebugInfoEnabled = true;
-        }
-        Debug.enableDebugInfo = enableDebugInfo;
-    })(Debug = ts.Debug || (ts.Debug = {}));
 })(ts || (ts = {}));
 /* @internal */
 var ts;
@@ -65908,7 +68017,6 @@ var ts;
             exit();
         }
         function appendSourceMap(generatedLine, generatedCharacter, map, sourceMapPath, start, end) {
-            var _a;
             ts.Debug.assert(generatedLine >= pendingGeneratedLine, "generatedLine cannot backtrack");
             ts.Debug.assert(generatedCharacter >= 0, "generatedCharacter cannot be negative");
             enter();
@@ -65916,7 +68024,8 @@ var ts;
             var sourceIndexToNewSourceIndexMap = [];
             var nameIndexToNewNameIndexMap;
             var mappingIterator = decodeMappings(map.mappings);
-            for (var _b = mappingIterator.next(), raw = _b.value, done = _b.done; !done; _a = mappingIterator.next(), raw = _a.value, done = _a.done, _a) {
+            for (var iterResult = mappingIterator.next(); !iterResult.done; iterResult = mappingIterator.next()) {
+                var raw = iterResult.value;
                 if (end && (raw.generatedLine > end.line ||
                     (raw.generatedLine === end.line && raw.generatedCharacter > end.character))) {
                     break;
@@ -66439,7 +68548,7 @@ var ts;
     function chainBundle(transformSourceFile) {
         return transformSourceFileOrBundle;
         function transformSourceFileOrBundle(node) {
-            return node.kind === 284 /* SourceFile */ ? transformSourceFile(node) : transformBundle(node);
+            return node.kind === 285 /* SourceFile */ ? transformSourceFile(node) : transformBundle(node);
         }
         function transformBundle(node) {
             return ts.createBundle(ts.map(node.sourceFiles, transformSourceFile), node.prepends);
@@ -66485,7 +68594,7 @@ var ts;
         for (var _i = 0, _a = sourceFile.statements; _i < _a.length; _i++) {
             var node = _a[_i];
             switch (node.kind) {
-                case 249 /* ImportDeclaration */:
+                case 250 /* ImportDeclaration */:
                     // import "mod"
                     // import x from "mod"
                     // import * as x from "mod"
@@ -66493,13 +68602,13 @@ var ts;
                     externalImports.push(node);
                     hasImportStarOrImportDefault = hasImportStarOrImportDefault || getImportNeedsImportStarHelper(node) || getImportNeedsImportDefaultHelper(node);
                     break;
-                case 248 /* ImportEqualsDeclaration */:
-                    if (node.moduleReference.kind === 259 /* ExternalModuleReference */) {
+                case 249 /* ImportEqualsDeclaration */:
+                    if (node.moduleReference.kind === 260 /* ExternalModuleReference */) {
                         // import x = require("mod")
                         externalImports.push(node);
                     }
                     break;
-                case 255 /* ExportDeclaration */:
+                case 256 /* ExportDeclaration */:
                     if (node.moduleSpecifier) {
                         if (!node.exportClause) {
                             // export * from "mod"
@@ -66529,13 +68638,13 @@ var ts;
                         }
                     }
                     break;
-                case 254 /* ExportAssignment */:
+                case 255 /* ExportAssignment */:
                     if (node.isExportEquals && !exportEquals) {
                         // export = x
                         exportEquals = node;
                     }
                     break;
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     if (ts.hasModifier(node, 1 /* Export */)) {
                         for (var _d = 0, _e = node.declarationList.declarations; _d < _e.length; _d++) {
                             var decl = _e[_d];
@@ -66543,7 +68652,7 @@ var ts;
                         }
                     }
                     break;
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     if (ts.hasModifier(node, 1 /* Export */)) {
                         if (ts.hasModifier(node, 512 /* Default */)) {
                             // export default function() { }
@@ -66563,7 +68672,7 @@ var ts;
                         }
                     }
                     break;
-                case 240 /* ClassDeclaration */:
+                case 241 /* ClassDeclaration */:
                     if (ts.hasModifier(node, 1 /* Export */)) {
                         if (ts.hasModifier(node, 512 /* Default */)) {
                             // export default class { }
@@ -66637,6 +68746,43 @@ var ts;
             ts.isIdentifier(expression);
     }
     ts.isSimpleCopiableExpression = isSimpleCopiableExpression;
+    /**
+     * A simple inlinable expression is an expression which can be copied into multiple locations
+     * without risk of repeating any sideeffects and whose value could not possibly change between
+     * any such locations
+     */
+    function isSimpleInlineableExpression(expression) {
+        return !ts.isIdentifier(expression) && isSimpleCopiableExpression(expression) ||
+            ts.isWellKnownSymbolSyntactically(expression);
+    }
+    ts.isSimpleInlineableExpression = isSimpleInlineableExpression;
+    /**
+     * Adds super call and preceding prologue directives into the list of statements.
+     *
+     * @param ctor The constructor node.
+     * @param result The list of statements.
+     * @param visitor The visitor to apply to each node added to the result array.
+     * @returns index of the statement that follows super call
+     */
+    function addPrologueDirectivesAndInitialSuperCall(ctor, result, visitor) {
+        if (ctor.body) {
+            var statements = ctor.body.statements;
+            // add prologue directives to the list (if any)
+            var index = ts.addPrologue(result, statements, /*ensureUseStrict*/ false, visitor);
+            if (index === statements.length) {
+                // list contains nothing but prologue directives (or empty) - exit
+                return index;
+            }
+            var statement = statements[index];
+            if (statement.kind === 222 /* ExpressionStatement */ && ts.isSuperCall(statement.expression)) {
+                result.push(ts.visitNode(statement, visitor, ts.isStatement));
+                return index + 1;
+            }
+            return index;
+        }
+        return 0;
+    }
+    ts.addPrologueDirectivesAndInitialSuperCall = addPrologueDirectivesAndInitialSuperCall;
     /**
      * @param input Template string input strings
      * @param args Names which need to be made file-level unique
@@ -66657,6 +68803,45 @@ var ts;
         };
     }
     ts.helperString = helperString;
+    /**
+     * Gets all property declarations with initializers on either the static or instance side of a class.
+     *
+     * @param node The class node.
+     * @param isStatic A value indicating whether to get properties from the static or instance side of the class.
+     */
+    function getInitializedProperties(node, isStatic) {
+        return ts.filter(node.members, isStatic ? isStaticInitializedProperty : isInstanceInitializedProperty);
+    }
+    ts.getInitializedProperties = getInitializedProperties;
+    /**
+     * Gets a value indicating whether a class element is a static property declaration with an initializer.
+     *
+     * @param member The class element node.
+     */
+    function isStaticInitializedProperty(member) {
+        return isInitializedProperty(member) && ts.hasStaticModifier(member);
+    }
+    ts.isStaticInitializedProperty = isStaticInitializedProperty;
+    /**
+     * Gets a value indicating whether a class element is an instance property declaration with an initializer.
+     *
+     * @param member The class element node.
+     */
+    function isInstanceInitializedProperty(member) {
+        return isInitializedProperty(member) && !ts.hasStaticModifier(member);
+    }
+    ts.isInstanceInitializedProperty = isInstanceInitializedProperty;
+    /**
+     * Gets a value indicating whether a class element is either a static or an instance property declaration with an initializer.
+     *
+     * @param member The class element node.
+     * @param isStatic A value indicating whether the member should be a static or instance member.
+     */
+    function isInitializedProperty(member) {
+        return member.kind === 155 /* PropertyDeclaration */
+            && member.initializer !== undefined;
+    }
+    ts.isInitializedProperty = isInitializedProperty;
 })(ts || (ts = {}));
 /*@internal*/
 var ts;
@@ -67103,7 +69288,7 @@ var ts;
     ts.restHelper = {
         name: "typescript:rest",
         scoped: false,
-        text: "\n            var __rest = (this && this.__rest) || function (s, e) {\n                var t = {};\n                for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)\n                    t[p] = s[p];\n                if (s != null && typeof Object.getOwnPropertySymbols === \"function\")\n                    for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)\n                        t[p[i]] = s[p[i]];\n                return t;\n            };"
+        text: "\n            var __rest = (this && this.__rest) || function (s, e) {\n                var t = {};\n                for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)\n                    t[p] = s[p];\n                if (s != null && typeof Object.getOwnPropertySymbols === \"function\")\n                    for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {\n                        if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))\n                            t[p[i]] = s[p[i]];\n                    }\n                return t;\n            };"
     };
     /** Given value: o, propName: p, pattern: { a, b, ...p } from the original statement
      * `{ a, b, ...p } = o`, create `p = __rest(o, ["a", "b"]);`
@@ -67179,8 +69364,8 @@ var ts;
         context.onEmitNode = onEmitNode;
         context.onSubstituteNode = onSubstituteNode;
         // Enable substitution for property/element access to emit const enum values.
-        context.enableSubstitution(189 /* PropertyAccessExpression */);
-        context.enableSubstitution(190 /* ElementAccessExpression */);
+        context.enableSubstitution(190 /* PropertyAccessExpression */);
+        context.enableSubstitution(191 /* ElementAccessExpression */);
         // These variables contain state that changes as we descend into the tree.
         var currentSourceFile;
         var currentNamespace;
@@ -67188,6 +69373,7 @@ var ts;
         var currentLexicalScope;
         var currentNameScope;
         var currentScopeFirstDeclarationsOfName;
+        var currentClassHasParameterProperties;
         /**
          * Keeps track of whether expression substitution has been enabled for specific edge cases.
          * They are persisted between each SourceFile transformation and should not be reset.
@@ -67203,21 +69389,16 @@ var ts;
          * just-in-time substitution while printing an expression identifier.
          */
         var applicableSubstitutions;
-        /**
-         * Tracks what computed name expressions originating from elided names must be inlined
-         * at the next execution site, in document order
-         */
-        var pendingExpressions;
         return transformSourceFileOrBundle;
         function transformSourceFileOrBundle(node) {
-            if (node.kind === 285 /* Bundle */) {
+            if (node.kind === 286 /* Bundle */) {
                 return transformBundle(node);
             }
             return transformSourceFile(node);
         }
         function transformBundle(node) {
             return ts.createBundle(node.sourceFiles.map(transformSourceFile), ts.mapDefined(node.prepends, function (prepend) {
-                if (prepend.kind === 287 /* InputFiles */) {
+                if (prepend.kind === 288 /* InputFiles */) {
                     return ts.createUnparsedSourceFile(prepend, "js");
                 }
                 return prepend;
@@ -67248,6 +69429,7 @@ var ts;
             var savedCurrentScope = currentLexicalScope;
             var savedCurrentNameScope = currentNameScope;
             var savedCurrentScopeFirstDeclarationsOfName = currentScopeFirstDeclarationsOfName;
+            var savedCurrentClassHasParameterProperties = currentClassHasParameterProperties;
             // Handle state changes before visiting a node.
             onBeforeVisitNode(node);
             var visited = f(node);
@@ -67257,6 +69439,7 @@ var ts;
             }
             currentLexicalScope = savedCurrentScope;
             currentNameScope = savedCurrentNameScope;
+            currentClassHasParameterProperties = savedCurrentClassHasParameterProperties;
             return visited;
         }
         /**
@@ -67266,16 +69449,16 @@ var ts;
          */
         function onBeforeVisitNode(node) {
             switch (node.kind) {
-                case 284 /* SourceFile */:
-                case 246 /* CaseBlock */:
-                case 245 /* ModuleBlock */:
-                case 218 /* Block */:
+                case 285 /* SourceFile */:
+                case 247 /* CaseBlock */:
+                case 246 /* ModuleBlock */:
+                case 219 /* Block */:
                     currentLexicalScope = node;
                     currentNameScope = undefined;
                     currentScopeFirstDeclarationsOfName = undefined;
                     break;
-                case 240 /* ClassDeclaration */:
-                case 239 /* FunctionDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     if (ts.hasModifier(node, 2 /* Ambient */)) {
                         break;
                     }
@@ -67287,7 +69470,7 @@ var ts;
                         // These nodes should always have names unless they are default-exports;
                         // however, class declaration parsing allows for undefined names, so syntactically invalid
                         // programs may also have an undefined name.
-                        ts.Debug.assert(node.kind === 240 /* ClassDeclaration */ || ts.hasModifier(node, 512 /* Default */));
+                        ts.Debug.assert(node.kind === 241 /* ClassDeclaration */ || ts.hasModifier(node, 512 /* Default */));
                     }
                     if (ts.isClassDeclaration(node)) {
                         // XXX: should probably also cover interfaces and type aliases that can have type variables?
@@ -67330,10 +69513,10 @@ var ts;
          */
         function sourceElementVisitorWorker(node) {
             switch (node.kind) {
-                case 249 /* ImportDeclaration */:
-                case 248 /* ImportEqualsDeclaration */:
-                case 254 /* ExportAssignment */:
-                case 255 /* ExportDeclaration */:
+                case 250 /* ImportDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
+                case 255 /* ExportAssignment */:
+                case 256 /* ExportDeclaration */:
                     return visitEllidableStatement(node);
                 default:
                     return visitorWorker(node);
@@ -67354,13 +69537,13 @@ var ts;
                 return node;
             }
             switch (node.kind) {
-                case 249 /* ImportDeclaration */:
+                case 250 /* ImportDeclaration */:
                     return visitImportDeclaration(node);
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return visitImportEqualsDeclaration(node);
-                case 254 /* ExportAssignment */:
+                case 255 /* ExportAssignment */:
                     return visitExportAssignment(node);
-                case 255 /* ExportDeclaration */:
+                case 256 /* ExportDeclaration */:
                     return visitExportDeclaration(node);
                 default:
                     ts.Debug.fail("Unhandled ellided statement");
@@ -67380,11 +69563,11 @@ var ts;
          * @param node The node to visit.
          */
         function namespaceElementVisitorWorker(node) {
-            if (node.kind === 255 /* ExportDeclaration */ ||
-                node.kind === 249 /* ImportDeclaration */ ||
-                node.kind === 250 /* ImportClause */ ||
-                (node.kind === 248 /* ImportEqualsDeclaration */ &&
-                    node.moduleReference.kind === 259 /* ExternalModuleReference */)) {
+            if (node.kind === 256 /* ExportDeclaration */ ||
+                node.kind === 250 /* ImportDeclaration */ ||
+                node.kind === 251 /* ImportClause */ ||
+                (node.kind === 249 /* ImportEqualsDeclaration */ &&
+                    node.moduleReference.kind === 260 /* ExternalModuleReference */)) {
                 // do not emit ES6 imports and exports since they are illegal inside a namespace
                 return undefined;
             }
@@ -67408,19 +69591,19 @@ var ts;
          */
         function classElementVisitorWorker(node) {
             switch (node.kind) {
-                case 157 /* Constructor */:
-                    // TypeScript constructors are transformed in `visitClassDeclaration`.
-                    // We elide them here as `visitorWorker` checks transform flags, which could
-                    // erronously include an ES6 constructor without TypeScript syntax.
-                    return undefined;
-                case 154 /* PropertyDeclaration */:
-                case 162 /* IndexSignature */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
-                case 156 /* MethodDeclaration */:
+                case 158 /* Constructor */:
+                    return visitConstructor(node);
+                case 155 /* PropertyDeclaration */:
+                    // Property declarations are not TypeScript syntax, but they must be visited
+                    // for the decorator transformation.
+                    return visitPropertyDeclaration(node);
+                case 163 /* IndexSignature */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
+                case 157 /* MethodDeclaration */:
                     // Fallback to the default visit behavior.
                     return visitorWorker(node);
-                case 217 /* SemicolonClassElement */:
+                case 218 /* SemicolonClassElement */:
                     return node;
                 default:
                     return ts.Debug.failBadSyntaxKind(node);
@@ -67430,7 +69613,7 @@ var ts;
             if (ts.modifierToFlag(node.kind) & 2270 /* TypeScriptModifier */) {
                 return undefined;
             }
-            else if (currentNamespace && node.kind === 85 /* ExportKeyword */) {
+            else if (currentNamespace && node.kind === 86 /* ExportKeyword */) {
                 return undefined;
             }
             return node;
@@ -67447,117 +69630,115 @@ var ts;
                 return ts.createNotEmittedStatement(node);
             }
             switch (node.kind) {
-                case 85 /* ExportKeyword */:
-                case 80 /* DefaultKeyword */:
+                case 86 /* ExportKeyword */:
+                case 81 /* DefaultKeyword */:
                     // ES6 export and default modifiers are elided when inside a namespace.
                     return currentNamespace ? undefined : node;
-                case 115 /* PublicKeyword */:
-                case 113 /* PrivateKeyword */:
-                case 114 /* ProtectedKeyword */:
-                case 118 /* AbstractKeyword */:
-                case 77 /* ConstKeyword */:
-                case 125 /* DeclareKeyword */:
-                case 133 /* ReadonlyKeyword */:
+                case 116 /* PublicKeyword */:
+                case 114 /* PrivateKeyword */:
+                case 115 /* ProtectedKeyword */:
+                case 119 /* AbstractKeyword */:
+                case 78 /* ConstKeyword */:
+                case 126 /* DeclareKeyword */:
+                case 134 /* ReadonlyKeyword */:
                 // TypeScript accessibility and readonly modifiers are elided.
-                case 169 /* ArrayType */:
-                case 170 /* TupleType */:
-                case 171 /* OptionalType */:
-                case 172 /* RestType */:
-                case 168 /* TypeLiteral */:
-                case 163 /* TypePredicate */:
-                case 150 /* TypeParameter */:
-                case 120 /* AnyKeyword */:
-                case 143 /* UnknownKeyword */:
-                case 123 /* BooleanKeyword */:
-                case 138 /* StringKeyword */:
-                case 135 /* NumberKeyword */:
-                case 132 /* NeverKeyword */:
-                case 106 /* VoidKeyword */:
-                case 139 /* SymbolKeyword */:
-                case 166 /* ConstructorType */:
-                case 165 /* FunctionType */:
-                case 167 /* TypeQuery */:
-                case 164 /* TypeReference */:
-                case 173 /* UnionType */:
-                case 174 /* IntersectionType */:
-                case 175 /* ConditionalType */:
-                case 177 /* ParenthesizedType */:
-                case 178 /* ThisType */:
-                case 179 /* TypeOperator */:
-                case 180 /* IndexedAccessType */:
-                case 181 /* MappedType */:
-                case 182 /* LiteralType */:
+                case 170 /* ArrayType */:
+                case 171 /* TupleType */:
+                case 172 /* OptionalType */:
+                case 173 /* RestType */:
+                case 169 /* TypeLiteral */:
+                case 164 /* TypePredicate */:
+                case 151 /* TypeParameter */:
+                case 121 /* AnyKeyword */:
+                case 144 /* UnknownKeyword */:
+                case 124 /* BooleanKeyword */:
+                case 139 /* StringKeyword */:
+                case 136 /* NumberKeyword */:
+                case 133 /* NeverKeyword */:
+                case 107 /* VoidKeyword */:
+                case 140 /* SymbolKeyword */:
+                case 167 /* ConstructorType */:
+                case 166 /* FunctionType */:
+                case 168 /* TypeQuery */:
+                case 165 /* TypeReference */:
+                case 174 /* UnionType */:
+                case 175 /* IntersectionType */:
+                case 176 /* ConditionalType */:
+                case 178 /* ParenthesizedType */:
+                case 179 /* ThisType */:
+                case 180 /* TypeOperator */:
+                case 181 /* IndexedAccessType */:
+                case 182 /* MappedType */:
+                case 183 /* LiteralType */:
                 // TypeScript type nodes are elided.
-                case 162 /* IndexSignature */:
+                case 163 /* IndexSignature */:
                 // TypeScript index signatures are elided.
-                case 152 /* Decorator */:
+                case 153 /* Decorator */:
                 // TypeScript decorators are elided. They will be emitted as part of visitClassDeclaration.
-                case 242 /* TypeAliasDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
                     // TypeScript type-only declarations are elided.
                     return undefined;
-                case 154 /* PropertyDeclaration */:
+                case 155 /* PropertyDeclaration */:
                     // TypeScript property declarations are elided. However their names are still visited, and can potentially be retained if they could have sideeffects
                     return visitPropertyDeclaration(node);
-                case 247 /* NamespaceExportDeclaration */:
+                case 248 /* NamespaceExportDeclaration */:
                     // TypeScript namespace export declarations are elided.
                     return undefined;
-                case 157 /* Constructor */:
+                case 158 /* Constructor */:
                     return visitConstructor(node);
-                case 241 /* InterfaceDeclaration */:
+                case 242 /* InterfaceDeclaration */:
                     // TypeScript interfaces are elided, but some comments may be preserved.
                     // See the implementation of `getLeadingComments` in comments.ts for more details.
                     return ts.createNotEmittedStatement(node);
-                case 240 /* ClassDeclaration */:
+                case 241 /* ClassDeclaration */:
                     // This may be a class declaration with TypeScript syntax extensions.
                     //
                     // TypeScript class syntax extensions include:
                     // - decorators
                     // - optional `implements` heritage clause
                     // - parameter property assignments in the constructor
-                    // - property declarations
                     // - index signatures
                     // - method overload signatures
                     return visitClassDeclaration(node);
-                case 209 /* ClassExpression */:
+                case 210 /* ClassExpression */:
                     // This may be a class expression with TypeScript syntax extensions.
                     //
                     // TypeScript class syntax extensions include:
                     // - decorators
                     // - optional `implements` heritage clause
                     // - parameter property assignments in the constructor
-                    // - property declarations
                     // - index signatures
                     // - method overload signatures
                     return visitClassExpression(node);
-                case 273 /* HeritageClause */:
+                case 274 /* HeritageClause */:
                     // This may be a heritage clause with TypeScript syntax extensions.
                     //
                     // TypeScript heritage clause extensions include:
                     // - `implements` clause
                     return visitHeritageClause(node);
-                case 211 /* ExpressionWithTypeArguments */:
+                case 212 /* ExpressionWithTypeArguments */:
                     // TypeScript supports type arguments on an expression in an `extends` heritage clause.
                     return visitExpressionWithTypeArguments(node);
-                case 156 /* MethodDeclaration */:
+                case 157 /* MethodDeclaration */:
                     // TypeScript method declarations may have decorators, modifiers
                     // or type annotations.
                     return visitMethodDeclaration(node);
-                case 158 /* GetAccessor */:
+                case 159 /* GetAccessor */:
                     // Get Accessors can have TypeScript modifiers, decorators, and type annotations.
                     return visitGetAccessor(node);
-                case 159 /* SetAccessor */:
+                case 160 /* SetAccessor */:
                     // Set Accessors can have TypeScript modifiers and type annotations.
                     return visitSetAccessor(node);
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     // Typescript function declarations can have modifiers, decorators, and type annotations.
                     return visitFunctionDeclaration(node);
-                case 196 /* FunctionExpression */:
+                case 197 /* FunctionExpression */:
                     // TypeScript function expressions can have modifiers and type annotations.
                     return visitFunctionExpression(node);
-                case 197 /* ArrowFunction */:
+                case 198 /* ArrowFunction */:
                     // TypeScript arrow functions can have modifiers and type annotations.
                     return visitArrowFunction(node);
-                case 151 /* Parameter */:
+                case 152 /* Parameter */:
                     // This may be a parameter declaration with TypeScript syntax extensions.
                     //
                     // TypeScript parameter declaration syntax extensions include:
@@ -67567,35 +69748,35 @@ var ts;
                     // - type annotations
                     // - this parameters
                     return visitParameter(node);
-                case 195 /* ParenthesizedExpression */:
+                case 196 /* ParenthesizedExpression */:
                     // ParenthesizedExpressions are TypeScript if their expression is a
                     // TypeAssertion or AsExpression
                     return visitParenthesizedExpression(node);
-                case 194 /* TypeAssertionExpression */:
-                case 212 /* AsExpression */:
+                case 195 /* TypeAssertionExpression */:
+                case 213 /* AsExpression */:
                     // TypeScript type assertions are removed, but their subtrees are preserved.
                     return visitAssertionExpression(node);
-                case 191 /* CallExpression */:
+                case 192 /* CallExpression */:
                     return visitCallExpression(node);
-                case 192 /* NewExpression */:
+                case 193 /* NewExpression */:
                     return visitNewExpression(node);
-                case 193 /* TaggedTemplateExpression */:
+                case 194 /* TaggedTemplateExpression */:
                     return visitTaggedTemplateExpression(node);
-                case 213 /* NonNullExpression */:
+                case 214 /* NonNullExpression */:
                     // TypeScript non-null expressions are removed, but their subtrees are preserved.
                     return visitNonNullExpression(node);
-                case 243 /* EnumDeclaration */:
+                case 244 /* EnumDeclaration */:
                     // TypeScript enum declarations do not exist in ES6 and must be rewritten.
                     return visitEnumDeclaration(node);
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     // TypeScript namespace exports for variable statements must be transformed.
                     return visitVariableStatement(node);
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     return visitVariableDeclaration(node);
-                case 244 /* ModuleDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     // TypeScript namespace declarations must be transformed.
                     return visitModuleDeclaration(node);
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     // TypeScript namespace or external module import.
                     return visitImportEqualsDeclaration(node);
                 default:
@@ -67633,7 +69814,7 @@ var ts;
             if (ts.some(staticProperties))
                 facts |= 1 /* HasStaticInitializedProperties */;
             var extendsClauseElement = ts.getEffectiveBaseTypeNode(node);
-            if (extendsClauseElement && ts.skipOuterExpressions(extendsClauseElement.expression).kind !== 96 /* NullKeyword */)
+            if (extendsClauseElement && ts.skipOuterExpressions(extendsClauseElement.expression).kind !== 97 /* NullKeyword */)
                 facts |= 64 /* IsDerivedClass */;
             if (shouldEmitDecorateCallForClass(node))
                 facts |= 2 /* HasConstructorDecorators */;
@@ -67662,31 +69843,16 @@ var ts;
             if (!isClassLikeDeclarationWithTypeScriptSyntax(node) && !(currentNamespace && ts.hasModifier(node, 1 /* Export */))) {
                 return ts.visitEachChild(node, visitor, context);
             }
-            var savedPendingExpressions = pendingExpressions;
-            pendingExpressions = undefined;
-            var staticProperties = getInitializedProperties(node, /*isStatic*/ true);
+            var staticProperties = ts.getInitializedProperties(node, /*isStatic*/ true);
             var facts = getClassFacts(node, staticProperties);
             if (facts & 128 /* UseImmediatelyInvokedFunctionExpression */) {
                 context.startLexicalEnvironment();
             }
             var name = node.name || (facts & 5 /* NeedsName */ ? ts.getGeneratedNameForNode(node) : undefined);
             var classStatement = facts & 2 /* HasConstructorDecorators */
-                ? createClassDeclarationHeadWithDecorators(node, name, facts)
+                ? createClassDeclarationHeadWithDecorators(node, name)
                 : createClassDeclarationHeadWithoutDecorators(node, name, facts);
             var statements = [classStatement];
-            // Write any pending expressions from elided or moved computed property names
-            if (ts.some(pendingExpressions)) {
-                statements.push(ts.createExpressionStatement(ts.inlineExpressions(pendingExpressions)));
-            }
-            pendingExpressions = savedPendingExpressions;
-            // Emit static property assignment. Because classDeclaration is lexically evaluated,
-            // it is safe to emit static property assignment after classDeclaration
-            // From ES6 specification:
-            //      HasLexicalDeclaration (N) : Determines if the argument identifier has a binding in this environment record that was created using
-            //                                  a lexical declaration such as a LexicalDeclaration or a ClassDeclaration.
-            if (facts & 1 /* HasStaticInitializedProperties */) {
-                addInitializedPropertyStatements(statements, staticProperties, facts & 128 /* UseImmediatelyInvokedFunctionExpression */ ? ts.getInternalName(node) : ts.getLocalName(node));
-            }
             // Write any decorators of the node.
             addClassElementDecorationStatements(statements, node, /*isStatic*/ false);
             addClassElementDecorationStatements(statements, node, /*isStatic*/ true);
@@ -67766,13 +69932,14 @@ var ts;
                 : undefined;
             var classDeclaration = ts.createClassDeclaration(
             /*decorators*/ undefined, modifiers, name, 
-            /*typeParameters*/ undefined, ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), transformClassMembers(node, (facts & 64 /* IsDerivedClass */) !== 0));
+            /*typeParameters*/ undefined, ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), transformClassMembers(node));
             // To better align with the old emitter, we should not emit a trailing source map
             // entry if the class has static properties.
             var emitFlags = ts.getEmitFlags(node);
             if (facts & 1 /* HasStaticInitializedProperties */) {
                 emitFlags |= 32 /* NoTrailingSourceMap */;
             }
+            ts.aggregateTransformFlags(classDeclaration);
             ts.setTextRange(classDeclaration, node);
             ts.setOriginalNode(classDeclaration, node);
             ts.setEmitFlags(classDeclaration, emitFlags);
@@ -67782,7 +69949,7 @@ var ts;
          * Transforms a decorated class declaration and appends the resulting statements. If
          * the class requires an alias to avoid issues with double-binding, the alias is returned.
          */
-        function createClassDeclarationHeadWithDecorators(node, name, facts) {
+        function createClassDeclarationHeadWithDecorators(node, name) {
             // When we emit an ES6 class that has a class decorator, we must tailor the
             // emit to certain specific cases.
             //
@@ -67875,8 +70042,9 @@ var ts;
             //      ${members}
             //  }
             var heritageClauses = ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause);
-            var members = transformClassMembers(node, (facts & 64 /* IsDerivedClass */) !== 0);
+            var members = transformClassMembers(node);
             var classExpression = ts.createClassExpression(/*modifiers*/ undefined, name, /*typeParameters*/ undefined, heritageClauses, members);
+            ts.aggregateTransformFlags(classExpression);
             ts.setOriginalNode(classExpression, node);
             ts.setTextRange(classExpression, location);
             //  let ${name} = ${classExpression} where name is either declaredName if the class doesn't contain self-reference
@@ -67895,311 +70063,40 @@ var ts;
             if (!isClassLikeDeclarationWithTypeScriptSyntax(node)) {
                 return ts.visitEachChild(node, visitor, context);
             }
-            var savedPendingExpressions = pendingExpressions;
-            pendingExpressions = undefined;
-            var staticProperties = getInitializedProperties(node, /*isStatic*/ true);
-            var heritageClauses = ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause);
-            var members = transformClassMembers(node, ts.some(heritageClauses, function (c) { return c.token === 86 /* ExtendsKeyword */; }));
             var classExpression = ts.createClassExpression(
             /*modifiers*/ undefined, node.name, 
-            /*typeParameters*/ undefined, heritageClauses, members);
+            /*typeParameters*/ undefined, ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), transformClassMembers(node));
+            ts.aggregateTransformFlags(classExpression);
             ts.setOriginalNode(classExpression, node);
             ts.setTextRange(classExpression, node);
-            if (ts.some(staticProperties) || ts.some(pendingExpressions)) {
-                var expressions = [];
-                var isClassWithConstructorReference = resolver.getNodeCheckFlags(node) & 16777216 /* ClassWithConstructorReference */;
-                var temp = ts.createTempVariable(hoistVariableDeclaration, !!isClassWithConstructorReference);
-                if (isClassWithConstructorReference) {
-                    // record an alias as the class name is not in scope for statics.
-                    enableSubstitutionForClassAliases();
-                    var alias = ts.getSynthesizedClone(temp);
-                    alias.autoGenerateFlags &= ~8 /* ReservedInNestedScopes */;
-                    classAliases[ts.getOriginalNodeId(node)] = alias;
-                }
-                // To preserve the behavior of the old emitter, we explicitly indent
-                // the body of a class with static initializers.
-                ts.setEmitFlags(classExpression, 65536 /* Indented */ | ts.getEmitFlags(classExpression));
-                expressions.push(ts.startOnNewLine(ts.createAssignment(temp, classExpression)));
-                // Add any pending expressions leftover from elided or relocated computed property names
-                ts.addRange(expressions, ts.map(pendingExpressions, ts.startOnNewLine));
-                pendingExpressions = savedPendingExpressions;
-                ts.addRange(expressions, generateInitializedPropertyExpressions(staticProperties, temp));
-                expressions.push(ts.startOnNewLine(temp));
-                return ts.inlineExpressions(expressions);
-            }
-            pendingExpressions = savedPendingExpressions;
             return classExpression;
         }
         /**
          * Transforms the members of a class.
          *
          * @param node The current class.
-         * @param isDerivedClass A value indicating whether the class has an extends clause that does not extend 'null'.
          */
-        function transformClassMembers(node, isDerivedClass) {
+        function transformClassMembers(node) {
             var members = [];
-            var constructor = transformConstructor(node, isDerivedClass);
-            if (constructor) {
-                members.push(constructor);
+            var constructor = ts.getFirstConstructorWithBody(node);
+            var parametersWithPropertyAssignments = constructor &&
+                ts.filter(constructor.parameters, ts.isParameterPropertyDeclaration);
+            if (parametersWithPropertyAssignments) {
+                for (var _i = 0, parametersWithPropertyAssignments_1 = parametersWithPropertyAssignments; _i < parametersWithPropertyAssignments_1.length; _i++) {
+                    var parameter = parametersWithPropertyAssignments_1[_i];
+                    if (ts.isIdentifier(parameter.name)) {
+                        members.push(ts.aggregateTransformFlags(ts.createProperty(
+                        /*decorators*/ undefined, 
+                        /*modifiers*/ undefined, parameter.name, 
+                        /*questionOrExclamationToken*/ undefined, 
+                        /*type*/ undefined, 
+                        /*initializer*/ undefined)));
+                    }
+                }
             }
             ts.addRange(members, ts.visitNodes(node.members, classElementVisitor, ts.isClassElement));
             return ts.setTextRange(ts.createNodeArray(members), /*location*/ node.members);
         }
-        /**
-         * Transforms (or creates) a constructor for a class.
-         *
-         * @param node The current class.
-         * @param isDerivedClass A value indicating whether the class has an extends clause that does not extend 'null'.
-         */
-        function transformConstructor(node, isDerivedClass) {
-            // Check if we have property assignment inside class declaration.
-            // If there is a property assignment, we need to emit constructor whether users define it or not
-            // If there is no property assignment, we can omit constructor if users do not define it
-            var constructor = ts.getFirstConstructorWithBody(node);
-            var hasInstancePropertyWithInitializer = ts.forEach(node.members, isInstanceInitializedProperty);
-            var hasParameterPropertyAssignments = constructor &&
-                constructor.transformFlags & 1024 /* ContainsTypeScriptClassSyntax */ &&
-                ts.forEach(constructor.parameters, isParameterWithPropertyAssignment);
-            // If the class does not contain nodes that require a synthesized constructor,
-            // accept the current constructor if it exists.
-            if (!hasInstancePropertyWithInitializer && !hasParameterPropertyAssignments) {
-                return ts.visitEachChild(constructor, visitor, context);
-            }
-            var parameters = transformConstructorParameters(constructor);
-            var body = transformConstructorBody(node, constructor, isDerivedClass);
-            //  constructor(${parameters}) {
-            //      ${body}
-            //  }
-            return ts.startOnNewLine(ts.setOriginalNode(ts.setTextRange(ts.createConstructor(
-            /*decorators*/ undefined, 
-            /*modifiers*/ undefined, parameters, body), constructor || node), constructor));
-        }
-        /**
-         * Transforms (or creates) the parameters for the constructor of a class with
-         * parameter property assignments or instance property initializers.
-         *
-         * @param constructor The constructor declaration.
-         */
-        function transformConstructorParameters(constructor) {
-            // The ES2015 spec specifies in 14.5.14. Runtime Semantics: ClassDefinitionEvaluation:
-            // If constructor is empty, then
-            //     If ClassHeritag_eopt is present and protoParent is not null, then
-            //          Let constructor be the result of parsing the source text
-            //              constructor(...args) { super (...args);}
-            //          using the syntactic grammar with the goal symbol MethodDefinition[~Yield].
-            //      Else,
-            //           Let constructor be the result of parsing the source text
-            //               constructor( ){ }
-            //           using the syntactic grammar with the goal symbol MethodDefinition[~Yield].
-            //
-            // While we could emit the '...args' rest parameter, certain later tools in the pipeline might
-            // downlevel the '...args' portion less efficiently by naively copying the contents of 'arguments' to an array.
-            // Instead, we'll avoid using a rest parameter and spread into the super call as
-            // 'super(...arguments)' instead of 'super(...args)', as you can see in "transformConstructorBody".
-            return ts.visitParameterList(constructor && constructor.parameters, visitor, context)
-                || [];
-        }
-        /**
-         * Transforms (or creates) a constructor body for a class with parameter property
-         * assignments or instance property initializers.
-         *
-         * @param node The current class.
-         * @param constructor The current class constructor.
-         * @param isDerivedClass A value indicating whether the class has an extends clause that does not extend 'null'.
-         */
-        function transformConstructorBody(node, constructor, isDerivedClass) {
-            var statements = [];
-            var indexOfFirstStatement = 0;
-            resumeLexicalEnvironment();
-            if (constructor) {
-                indexOfFirstStatement = addPrologueDirectivesAndInitialSuperCall(constructor, statements);
-                // Add parameters with property assignments. Transforms this:
-                //
-                //  constructor (public x, public y) {
-                //  }
-                //
-                // Into this:
-                //
-                //  constructor (x, y) {
-                //      this.x = x;
-                //      this.y = y;
-                //  }
-                //
-                var propertyAssignments = getParametersWithPropertyAssignments(constructor);
-                ts.addRange(statements, ts.map(propertyAssignments, transformParameterWithPropertyAssignment));
-            }
-            else if (isDerivedClass) {
-                // Add a synthetic `super` call:
-                //
-                //  super(...arguments);
-                //
-                statements.push(ts.createExpressionStatement(ts.createCall(ts.createSuper(), 
-                /*typeArguments*/ undefined, [ts.createSpread(ts.createIdentifier("arguments"))])));
-            }
-            // Add the property initializers. Transforms this:
-            //
-            //  public x = 1;
-            //
-            // Into this:
-            //
-            //  constructor() {
-            //      this.x = 1;
-            //  }
-            //
-            var properties = getInitializedProperties(node, /*isStatic*/ false);
-            addInitializedPropertyStatements(statements, properties, ts.createThis());
-            if (constructor) {
-                // The class already had a constructor, so we should add the existing statements, skipping the initial super call.
-                ts.addRange(statements, ts.visitNodes(constructor.body.statements, visitor, ts.isStatement, indexOfFirstStatement));
-            }
-            // End the lexical environment.
-            statements = ts.mergeLexicalEnvironment(statements, endLexicalEnvironment());
-            return ts.setTextRange(ts.createBlock(ts.setTextRange(ts.createNodeArray(statements), 
-            /*location*/ constructor ? constructor.body.statements : node.members), 
-            /*multiLine*/ true), 
-            /*location*/ constructor ? constructor.body : undefined);
-        }
-        /**
-         * Adds super call and preceding prologue directives into the list of statements.
-         *
-         * @param ctor The constructor node.
-         * @returns index of the statement that follows super call
-         */
-        function addPrologueDirectivesAndInitialSuperCall(ctor, result) {
-            if (ctor.body) {
-                var statements = ctor.body.statements;
-                // add prologue directives to the list (if any)
-                var index = ts.addPrologue(result, statements, /*ensureUseStrict*/ false, visitor);
-                if (index === statements.length) {
-                    // list contains nothing but prologue directives (or empty) - exit
-                    return index;
-                }
-                var statement = statements[index];
-                if (statement.kind === 221 /* ExpressionStatement */ && ts.isSuperCall(statement.expression)) {
-                    result.push(ts.visitNode(statement, visitor, ts.isStatement));
-                    return index + 1;
-                }
-                return index;
-            }
-            return 0;
-        }
-        /**
-         * Gets all parameters of a constructor that should be transformed into property assignments.
-         *
-         * @param node The constructor node.
-         */
-        function getParametersWithPropertyAssignments(node) {
-            return ts.filter(node.parameters, isParameterWithPropertyAssignment);
-        }
-        /**
-         * Determines whether a parameter should be transformed into a property assignment.
-         *
-         * @param parameter The parameter node.
-         */
-        function isParameterWithPropertyAssignment(parameter) {
-            return ts.hasModifier(parameter, 92 /* ParameterPropertyModifier */)
-                && ts.isIdentifier(parameter.name);
-        }
-        /**
-         * Transforms a parameter into a property assignment statement.
-         *
-         * @param node The parameter declaration.
-         */
-        function transformParameterWithPropertyAssignment(node) {
-            ts.Debug.assert(ts.isIdentifier(node.name));
-            var name = node.name;
-            var propertyName = ts.getMutableClone(name);
-            ts.setEmitFlags(propertyName, 1536 /* NoComments */ | 48 /* NoSourceMap */);
-            var localName = ts.getMutableClone(name);
-            ts.setEmitFlags(localName, 1536 /* NoComments */);
-            return ts.startOnNewLine(ts.setEmitFlags(ts.setTextRange(ts.createExpressionStatement(ts.createAssignment(ts.setTextRange(ts.createPropertyAccess(ts.createThis(), propertyName), node.name), localName)), ts.moveRangePos(node, -1)), 1536 /* NoComments */));
-        }
-        /**
-         * Gets all property declarations with initializers on either the static or instance side of a class.
-         *
-         * @param node The class node.
-         * @param isStatic A value indicating whether to get properties from the static or instance side of the class.
-         */
-        function getInitializedProperties(node, isStatic) {
-            return ts.filter(node.members, isStatic ? isStaticInitializedProperty : isInstanceInitializedProperty);
-        }
-        /**
-         * Gets a value indicating whether a class element is a static property declaration with an initializer.
-         *
-         * @param member The class element node.
-         */
-        function isStaticInitializedProperty(member) {
-            return isInitializedProperty(member, /*isStatic*/ true);
-        }
-        /**
-         * Gets a value indicating whether a class element is an instance property declaration with an initializer.
-         *
-         * @param member The class element node.
-         */
-        function isInstanceInitializedProperty(member) {
-            return isInitializedProperty(member, /*isStatic*/ false);
-        }
-        /**
-         * Gets a value indicating whether a class element is either a static or an instance property declaration with an initializer.
-         *
-         * @param member The class element node.
-         * @param isStatic A value indicating whether the member should be a static or instance member.
-         */
-        function isInitializedProperty(member, isStatic) {
-            return member.kind === 154 /* PropertyDeclaration */
-                && isStatic === ts.hasModifier(member, 32 /* Static */)
-                && member.initializer !== undefined;
-        }
-        /**
-         * Generates assignment statements for property initializers.
-         *
-         * @param properties An array of property declarations to transform.
-         * @param receiver The receiver on which each property should be assigned.
-         */
-        function addInitializedPropertyStatements(statements, properties, receiver) {
-            for (var _i = 0, properties_9 = properties; _i < properties_9.length; _i++) {
-                var property = properties_9[_i];
-                var statement = ts.createExpressionStatement(transformInitializedProperty(property, receiver));
-                ts.setSourceMapRange(statement, ts.moveRangePastModifiers(property));
-                ts.setCommentRange(statement, property);
-                ts.setOriginalNode(statement, property);
-                statements.push(statement);
-            }
-        }
-        /**
-         * Generates assignment expressions for property initializers.
-         *
-         * @param properties An array of property declarations to transform.
-         * @param receiver The receiver on which each property should be assigned.
-         */
-        function generateInitializedPropertyExpressions(properties, receiver) {
-            var expressions = [];
-            for (var _i = 0, properties_10 = properties; _i < properties_10.length; _i++) {
-                var property = properties_10[_i];
-                var expression = transformInitializedProperty(property, receiver);
-                ts.startOnNewLine(expression);
-                ts.setSourceMapRange(expression, ts.moveRangePastModifiers(property));
-                ts.setCommentRange(expression, property);
-                ts.setOriginalNode(expression, property);
-                expressions.push(expression);
-            }
-            return expressions;
-        }
-        /**
-         * Transforms a property initializer into an assignment statement.
-         *
-         * @param property The property declaration.
-         * @param receiver The object receiving the property assignment.
-         */
-        function transformInitializedProperty(property, receiver) {
-            // We generate a name here in order to reuse the value cached by the relocated computed name expression (which uses the same generated name)
-            var propertyName = ts.isComputedPropertyName(property.name) && !isSimpleInlineableExpression(property.name.expression)
-                ? ts.updateComputedPropertyName(property.name, ts.getGeneratedNameForNode(property.name))
-                : property.name;
-            var initializer = ts.visitNode(property.initializer, visitor, ts.isExpression);
-            var memberAccess = ts.createMemberAccessForPropertyName(receiver, propertyName, /*location*/ propertyName);
-            return ts.createAssignment(memberAccess, initializer);
-        }
         /**
          * Gets either the static or instance members of a class that are decorated, or have
          * parameters that are decorated.
@@ -68249,11 +70146,14 @@ var ts;
             var decorators;
             if (node) {
                 var parameters = node.parameters;
-                for (var i = 0; i < parameters.length; i++) {
-                    var parameter = parameters[i];
+                var firstParameterIsThis = parameters.length > 0 && ts.parameterIsThisKeyword(parameters[0]);
+                var firstParameterOffset = firstParameterIsThis ? 1 : 0;
+                var numParameters = firstParameterIsThis ? parameters.length - 1 : parameters.length;
+                for (var i = 0; i < numParameters; i++) {
+                    var parameter = parameters[i + firstParameterOffset];
                     if (decorators || parameter.decorators) {
                         if (!decorators) {
-                            decorators = new Array(parameters.length);
+                            decorators = new Array(numParameters);
                         }
                         decorators[i] = parameter.decorators;
                     }
@@ -68286,12 +70186,12 @@ var ts;
          */
         function getAllDecoratorsOfClassElement(node, member) {
             switch (member.kind) {
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     return getAllDecoratorsOfAccessors(node, member);
-                case 156 /* MethodDeclaration */:
+                case 157 /* MethodDeclaration */:
                     return getAllDecoratorsOfMethod(member);
-                case 154 /* PropertyDeclaration */:
+                case 155 /* PropertyDeclaration */:
                     return getAllDecoratorsOfProperty(member);
                 default:
                     return undefined;
@@ -68444,7 +70344,7 @@ var ts;
             var prefix = getClassMemberPrefix(node, member);
             var memberName = getExpressionForPropertyName(member, /*generateNameForComputedPropertyName*/ true);
             var descriptor = languageVersion > 0 /* ES3 */
-                ? member.kind === 154 /* PropertyDeclaration */
+                ? member.kind === 155 /* PropertyDeclaration */
                     // We emit `void 0` here to indicate to `__decorate` that it can invoke `Object.defineProperty` directly, but that it
                     // should not invoke `Object.getOwnPropertyDescriptor`.
                     ? ts.createVoidZero()
@@ -68567,10 +70467,10 @@ var ts;
          */
         function shouldAddTypeMetadata(node) {
             var kind = node.kind;
-            return kind === 156 /* MethodDeclaration */
-                || kind === 158 /* GetAccessor */
-                || kind === 159 /* SetAccessor */
-                || kind === 154 /* PropertyDeclaration */;
+            return kind === 157 /* MethodDeclaration */
+                || kind === 159 /* GetAccessor */
+                || kind === 160 /* SetAccessor */
+                || kind === 155 /* PropertyDeclaration */;
         }
         /**
          * Determines whether to emit the "design:returntype" metadata based on the node's kind.
@@ -68580,7 +70480,7 @@ var ts;
          * @param node The node to test.
          */
         function shouldAddReturnTypeMetadata(node) {
-            return node.kind === 156 /* MethodDeclaration */;
+            return node.kind === 157 /* MethodDeclaration */;
         }
         /**
          * Determines whether to emit the "design:paramtypes" metadata based on the node's kind.
@@ -68591,12 +70491,12 @@ var ts;
          */
         function shouldAddParamTypesMetadata(node) {
             switch (node.kind) {
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
                     return ts.getFirstConstructorWithBody(node) !== undefined;
-                case 156 /* MethodDeclaration */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 157 /* MethodDeclaration */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     return true;
             }
             return false;
@@ -68613,15 +70513,15 @@ var ts;
          */
         function serializeTypeOfNode(node) {
             switch (node.kind) {
-                case 154 /* PropertyDeclaration */:
-                case 151 /* Parameter */:
+                case 155 /* PropertyDeclaration */:
+                case 152 /* Parameter */:
                     return serializeTypeNode(node.type);
-                case 159 /* SetAccessor */:
-                case 158 /* GetAccessor */:
+                case 160 /* SetAccessor */:
+                case 159 /* GetAccessor */:
                     return serializeTypeNode(getAccessorTypeNode(node));
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
-                case 156 /* MethodDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
+                case 157 /* MethodDeclaration */:
                     return ts.createIdentifier("Function");
                 default:
                     return ts.createVoidZero();
@@ -68658,7 +70558,7 @@ var ts;
             return ts.createArrayLiteral(expressions);
         }
         function getParametersOfDecoratedDeclaration(node, container) {
-            if (container && node.kind === 158 /* GetAccessor */) {
+            if (container && node.kind === 159 /* GetAccessor */) {
                 var setAccessor = ts.getAllAccessorDeclarations(container.members, node).setAccessor;
                 if (setAccessor) {
                     return setAccessor.parameters;
@@ -68703,69 +70603,69 @@ var ts;
                 return ts.createIdentifier("Object");
             }
             switch (node.kind) {
-                case 106 /* VoidKeyword */:
-                case 141 /* UndefinedKeyword */:
-                case 96 /* NullKeyword */:
-                case 132 /* NeverKeyword */:
+                case 107 /* VoidKeyword */:
+                case 142 /* UndefinedKeyword */:
+                case 97 /* NullKeyword */:
+                case 133 /* NeverKeyword */:
                     return ts.createVoidZero();
-                case 177 /* ParenthesizedType */:
+                case 178 /* ParenthesizedType */:
                     return serializeTypeNode(node.type);
-                case 165 /* FunctionType */:
-                case 166 /* ConstructorType */:
+                case 166 /* FunctionType */:
+                case 167 /* ConstructorType */:
                     return ts.createIdentifier("Function");
-                case 169 /* ArrayType */:
-                case 170 /* TupleType */:
+                case 170 /* ArrayType */:
+                case 171 /* TupleType */:
                     return ts.createIdentifier("Array");
-                case 163 /* TypePredicate */:
-                case 123 /* BooleanKeyword */:
+                case 164 /* TypePredicate */:
+                case 124 /* BooleanKeyword */:
                     return ts.createIdentifier("Boolean");
-                case 138 /* StringKeyword */:
+                case 139 /* StringKeyword */:
                     return ts.createIdentifier("String");
-                case 136 /* ObjectKeyword */:
+                case 137 /* ObjectKeyword */:
                     return ts.createIdentifier("Object");
-                case 182 /* LiteralType */:
+                case 183 /* LiteralType */:
                     switch (node.literal.kind) {
                         case 10 /* StringLiteral */:
                             return ts.createIdentifier("String");
-                        case 202 /* PrefixUnaryExpression */:
+                        case 203 /* PrefixUnaryExpression */:
                         case 8 /* NumericLiteral */:
                             return ts.createIdentifier("Number");
                         case 9 /* BigIntLiteral */:
                             return getGlobalBigIntNameWithFallback();
-                        case 102 /* TrueKeyword */:
-                        case 87 /* FalseKeyword */:
+                        case 103 /* TrueKeyword */:
+                        case 88 /* FalseKeyword */:
                             return ts.createIdentifier("Boolean");
                         default:
                             return ts.Debug.failBadSyntaxKind(node.literal);
                     }
-                case 135 /* NumberKeyword */:
+                case 136 /* NumberKeyword */:
                     return ts.createIdentifier("Number");
-                case 146 /* BigIntKeyword */:
+                case 147 /* BigIntKeyword */:
                     return getGlobalBigIntNameWithFallback();
-                case 139 /* SymbolKeyword */:
+                case 140 /* SymbolKeyword */:
                     return languageVersion < 2 /* ES2015 */
                         ? getGlobalSymbolNameWithFallback()
                         : ts.createIdentifier("Symbol");
-                case 164 /* TypeReference */:
+                case 165 /* TypeReference */:
                     return serializeTypeReferenceNode(node);
-                case 174 /* IntersectionType */:
-                case 173 /* UnionType */:
+                case 175 /* IntersectionType */:
+                case 174 /* UnionType */:
                     return serializeTypeList(node.types);
-                case 175 /* ConditionalType */:
+                case 176 /* ConditionalType */:
                     return serializeTypeList([node.trueType, node.falseType]);
-                case 179 /* TypeOperator */:
-                    if (node.operator === 133 /* ReadonlyKeyword */) {
+                case 180 /* TypeOperator */:
+                    if (node.operator === 134 /* ReadonlyKeyword */) {
                         return serializeTypeNode(node.type);
                     }
                     break;
-                case 167 /* TypeQuery */:
-                case 180 /* IndexedAccessType */:
-                case 181 /* MappedType */:
-                case 168 /* TypeLiteral */:
-                case 120 /* AnyKeyword */:
-                case 143 /* UnknownKeyword */:
-                case 178 /* ThisType */:
-                case 183 /* ImportType */:
+                case 168 /* TypeQuery */:
+                case 181 /* IndexedAccessType */:
+                case 182 /* MappedType */:
+                case 169 /* TypeLiteral */:
+                case 121 /* AnyKeyword */:
+                case 144 /* UnknownKeyword */:
+                case 179 /* ThisType */:
+                case 184 /* ImportType */:
                     break;
                 default:
                     return ts.Debug.failBadSyntaxKind(node);
@@ -68778,13 +70678,13 @@ var ts;
             var serializedUnion;
             for (var _i = 0, types_18 = types; _i < types_18.length; _i++) {
                 var typeNode = types_18[_i];
-                while (typeNode.kind === 177 /* ParenthesizedType */) {
+                while (typeNode.kind === 178 /* ParenthesizedType */) {
                     typeNode = typeNode.type; // Skip parens if need be
                 }
-                if (typeNode.kind === 132 /* NeverKeyword */) {
+                if (typeNode.kind === 133 /* NeverKeyword */) {
                     continue; // Always elide `never` from the union/intersection if possible
                 }
-                if (!strictNullChecks && (typeNode.kind === 96 /* NullKeyword */ || typeNode.kind === 141 /* UndefinedKeyword */)) {
+                if (!strictNullChecks && (typeNode.kind === 97 /* NullKeyword */ || typeNode.kind === 142 /* UndefinedKeyword */)) {
                     continue; // Elide null and undefined from unions for metadata, just like what we did prior to the implementation of strict null checks
                 }
                 var serializedIndividual = serializeTypeNode(typeNode);
@@ -68864,12 +70764,12 @@ var ts;
          * @param node The entity name to serialize.
          */
         function serializeEntityNameAsExpressionFallback(node) {
-            if (node.kind === 72 /* Identifier */) {
+            if (node.kind === 73 /* Identifier */) {
                 // A -> typeof A !== undefined && A
                 var copied = serializeEntityNameAsExpression(node);
                 return createCheckedValue(copied, copied);
             }
-            if (node.left.kind === 72 /* Identifier */) {
+            if (node.left.kind === 73 /* Identifier */) {
                 // A.B -> typeof A !== undefined && A.B
                 return createCheckedValue(serializeEntityNameAsExpression(node.left), serializeEntityNameAsExpression(node));
             }
@@ -68885,7 +70785,7 @@ var ts;
          */
         function serializeEntityNameAsExpression(node) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     // Create a clone of the name with a new parent, and treat it as if it were
                     // a source tree node for the purposes of the checker.
                     var name = ts.getMutableClone(node);
@@ -68893,7 +70793,7 @@ var ts;
                     name.original = undefined;
                     name.parent = ts.getParseTreeNode(currentLexicalScope); // ensure the parent is set to a parse tree node.
                     return name;
-                case 148 /* QualifiedName */:
+                case 149 /* QualifiedName */:
                     return serializeQualifiedNameAsExpression(node);
             }
         }
@@ -68919,19 +70819,10 @@ var ts;
          * available.
          */
         function getGlobalBigIntNameWithFallback() {
-            return languageVersion < 7 /* ESNext */
+            return languageVersion < 99 /* ESNext */
                 ? ts.createConditional(ts.createTypeCheck(ts.createIdentifier("BigInt"), "function"), ts.createIdentifier("BigInt"), ts.createIdentifier("Object"))
                 : ts.createIdentifier("BigInt");
         }
-        /**
-         * A simple inlinable expression is an expression which can be copied into multiple locations
-         * without risk of repeating any sideeffects and whose value could not possibly change between
-         * any such locations
-         */
-        function isSimpleInlineableExpression(expression) {
-            return !ts.isIdentifier(expression) && ts.isSimpleCopiableExpression(expression) ||
-                ts.isWellKnownSymbolSyntactically(expression);
-        }
         /**
          * Gets an expression that represents a property name. For a computed property, a
          * name is generated for the node.
@@ -68941,7 +70832,7 @@ var ts;
         function getExpressionForPropertyName(member, generateNameForComputedPropertyName) {
             var name = member.name;
             if (ts.isComputedPropertyName(name)) {
-                return generateNameForComputedPropertyName && !isSimpleInlineableExpression(name.expression)
+                return generateNameForComputedPropertyName && !ts.isSimpleInlineableExpression(name.expression)
                     ? ts.getGeneratedNameForNode(name)
                     : name.expression;
             }
@@ -68952,25 +70843,6 @@ var ts;
                 return ts.getSynthesizedClone(name);
             }
         }
-        /**
-         * If the name is a computed property, this function transforms it, then either returns an expression which caches the
-         * value of the result or the expression itself if the value is either unused or safe to inline into multiple locations
-         * @param shouldHoist Does the expression need to be reused? (ie, for an initializer or a decorator)
-         * @param omitSimple Should expressions with no observable side-effects be elided? (ie, the expression is not hoisted for a decorator or initializer and is a literal)
-         */
-        function getPropertyNameExpressionIfNeeded(name, shouldHoist, omitSimple) {
-            if (ts.isComputedPropertyName(name)) {
-                var expression = ts.visitNode(name.expression, visitor, ts.isExpression);
-                var innerExpression = ts.skipPartiallyEmittedExpressions(expression);
-                var inlinable = isSimpleInlineableExpression(innerExpression);
-                if (!inlinable && shouldHoist) {
-                    var generatedName = ts.getGeneratedNameForNode(name);
-                    hoistVariableDeclaration(generatedName);
-                    return ts.createAssignment(generatedName, expression);
-                }
-                return (omitSimple && (inlinable || ts.isIdentifier(innerExpression))) ? undefined : expression;
-            }
-        }
         /**
          * Visits the property name of a class element, for use when emitting property
          * initializers. For a computed property on a node with decorators, a temporary
@@ -68980,18 +70852,20 @@ var ts;
          */
         function visitPropertyNameOfClassElement(member) {
             var name = member.name;
-            var expr = getPropertyNameExpressionIfNeeded(name, ts.some(member.decorators), /*omitSimple*/ false);
-            if (expr) { // expr only exists if `name` is a computed property name
-                // Inline any pending expressions from previous elided or relocated computed property name expressions in order to preserve execution order
-                if (ts.some(pendingExpressions)) {
-                    expr = ts.inlineExpressions(pendingExpressions.concat([expr]));
-                    pendingExpressions.length = 0;
+            // Computed property names need to be transformed into a hoisted variable when they are used more than once.
+            // The names are used more than once when:
+            //   - the property is non-static and its initializer is moved to the constructor (when there are parameter property assignments).
+            //   - the property has a decorator.
+            if (ts.isComputedPropertyName(name) && ((!ts.hasStaticModifier(member) && currentClassHasParameterProperties) || ts.some(member.decorators))) {
+                var expression = ts.visitNode(name.expression, visitor, ts.isExpression);
+                var innerExpression = ts.skipPartiallyEmittedExpressions(expression);
+                if (!ts.isSimpleInlineableExpression(innerExpression)) {
+                    var generatedName = ts.getGeneratedNameForNode(name);
+                    hoistVariableDeclaration(generatedName);
+                    return ts.updateComputedPropertyName(name, ts.createAssignment(generatedName, expression));
                 }
-                return ts.updateComputedPropertyName(name, expr);
-            }
-            else {
-                return name;
             }
+            return ts.visitNode(name, visitor, ts.isPropertyName);
         }
         /**
          * Transforms a HeritageClause with TypeScript syntax.
@@ -69003,7 +70877,7 @@ var ts;
          * @param node The HeritageClause to transform.
          */
         function visitHeritageClause(node) {
-            if (node.token === 109 /* ImplementsKeyword */) {
+            if (node.token === 110 /* ImplementsKeyword */) {
                 // implements clauses are elided
                 return undefined;
             }
@@ -69031,17 +70905,73 @@ var ts;
             return !ts.nodeIsMissing(node.body);
         }
         function visitPropertyDeclaration(node) {
-            var expr = getPropertyNameExpressionIfNeeded(node.name, ts.some(node.decorators) || !!node.initializer, /*omitSimple*/ true);
-            if (expr && !isSimpleInlineableExpression(expr)) {
-                (pendingExpressions || (pendingExpressions = [])).push(expr);
+            var updated = ts.updateProperty(node, 
+            /*decorators*/ undefined, ts.visitNodes(node.modifiers, visitor, ts.isModifier), visitPropertyNameOfClassElement(node), 
+            /*questionOrExclamationToken*/ undefined, 
+            /*type*/ undefined, ts.visitNode(node.initializer, visitor));
+            if (updated !== node) {
+                // While we emit the source map for the node after skipping decorators and modifiers,
+                // we need to emit the comments for the original range.
+                ts.setCommentRange(updated, node);
+                ts.setSourceMapRange(updated, ts.moveRangePastDecorators(node));
             }
-            return undefined;
+            return updated;
         }
         function visitConstructor(node) {
             if (!shouldEmitFunctionLikeDeclaration(node)) {
                 return undefined;
             }
-            return ts.updateConstructor(node, ts.visitNodes(node.decorators, visitor, ts.isDecorator), ts.visitNodes(node.modifiers, visitor, ts.isModifier), ts.visitParameterList(node.parameters, visitor, context), ts.visitFunctionBody(node.body, visitor, context));
+            return ts.updateConstructor(node, 
+            /*decorators*/ undefined, 
+            /*modifiers*/ undefined, ts.visitParameterList(node.parameters, visitor, context), transformConstructorBody(node.body, node));
+        }
+        function transformConstructorBody(body, constructor) {
+            var parametersWithPropertyAssignments = constructor &&
+                ts.filter(constructor.parameters, ts.isParameterPropertyDeclaration);
+            if (!ts.some(parametersWithPropertyAssignments)) {
+                return ts.visitFunctionBody(body, visitor, context);
+            }
+            var statements = [];
+            var indexOfFirstStatement = 0;
+            resumeLexicalEnvironment();
+            indexOfFirstStatement = ts.addPrologueDirectivesAndInitialSuperCall(constructor, statements, visitor);
+            // Add parameters with property assignments. Transforms this:
+            //
+            //  constructor (public x, public y) {
+            //  }
+            //
+            // Into this:
+            //
+            //  constructor (x, y) {
+            //      this.x = x;
+            //      this.y = y;
+            //  }
+            //
+            ts.addRange(statements, ts.map(parametersWithPropertyAssignments, transformParameterWithPropertyAssignment));
+            // Add the existing statements, skipping the initial super call.
+            ts.addRange(statements, ts.visitNodes(body.statements, visitor, ts.isStatement, indexOfFirstStatement));
+            // End the lexical environment.
+            statements = ts.mergeLexicalEnvironment(statements, endLexicalEnvironment());
+            var block = ts.createBlock(ts.setTextRange(ts.createNodeArray(statements), body.statements), /*multiLine*/ true);
+            ts.setTextRange(block, /*location*/ body);
+            ts.setOriginalNode(block, body);
+            return block;
+        }
+        /**
+         * Transforms a parameter into a property assignment statement.
+         *
+         * @param node The parameter declaration.
+         */
+        function transformParameterWithPropertyAssignment(node) {
+            var name = node.name;
+            if (!ts.isIdentifier(name)) {
+                return undefined;
+            }
+            var propertyName = ts.getMutableClone(name);
+            ts.setEmitFlags(propertyName, 1536 /* NoComments */ | 48 /* NoSourceMap */);
+            var localName = ts.getMutableClone(name);
+            ts.setEmitFlags(localName, 1536 /* NoComments */);
+            return ts.startOnNewLine(ts.removeAllComments(ts.setTextRange(ts.setOriginalNode(ts.createExpressionStatement(ts.createAssignment(ts.setTextRange(ts.createPropertyAccess(ts.createThis(), propertyName), node.name), localName)), node), ts.moveRangePos(node, -1))));
         }
         function visitMethodDeclaration(node) {
             if (!shouldEmitFunctionLikeDeclaration(node)) {
@@ -69242,7 +71172,7 @@ var ts;
          */
         function visitEnumDeclaration(node) {
             if (!shouldEmitEnumDeclaration(node)) {
-                return undefined;
+                return ts.createNotEmittedStatement(node);
             }
             var statements = [];
             // We request to be advised when the printer is about to print this node. This allows
@@ -69410,12 +71340,12 @@ var ts;
             // enums in any other scope are emitted as a `let` declaration.
             var statement = ts.createVariableStatement(ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), ts.createVariableDeclarationList([
                 ts.createVariableDeclaration(ts.getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true))
-            ], currentLexicalScope.kind === 284 /* SourceFile */ ? 0 /* None */ : 1 /* Let */));
+            ], currentLexicalScope.kind === 285 /* SourceFile */ ? 0 /* None */ : 1 /* Let */));
             ts.setOriginalNode(statement, node);
             recordEmittedDeclarationInScope(node);
             if (isFirstEmittedDeclarationInScope(node)) {
                 // Adjust the source map emit to match the old emitter.
-                if (node.kind === 243 /* EnumDeclaration */) {
+                if (node.kind === 244 /* EnumDeclaration */) {
                     ts.setSourceMapRange(statement.declarationList, node);
                 }
                 else {
@@ -69540,7 +71470,7 @@ var ts;
             var statementsLocation;
             var blockLocation;
             var body = node.body;
-            if (body.kind === 245 /* ModuleBlock */) {
+            if (body.kind === 246 /* ModuleBlock */) {
                 saveStateAndInvoke(body, function (body) { return ts.addRange(statements, ts.visitNodes(body.statements, namespaceElementVisitor, ts.isStatement)); });
                 statementsLocation = body.statements;
                 blockLocation = body;
@@ -69586,13 +71516,13 @@ var ts;
             //     })(hi = hello.hi || (hello.hi = {}));
             // })(hello || (hello = {}));
             // We only want to emit comment on the namespace which contains block body itself, not the containing namespaces.
-            if (body.kind !== 245 /* ModuleBlock */) {
+            if (body.kind !== 246 /* ModuleBlock */) {
                 ts.setEmitFlags(block, ts.getEmitFlags(block) | 1536 /* NoComments */);
             }
             return block;
         }
         function getInnerMostModuleDeclarationFromDottedModule(moduleDeclaration) {
-            if (moduleDeclaration.body.kind === 244 /* ModuleDeclaration */) {
+            if (moduleDeclaration.body.kind === 245 /* ModuleDeclaration */) {
                 var recursiveInnerModule = getInnerMostModuleDeclarationFromDottedModule(moduleDeclaration.body);
                 return recursiveInnerModule || moduleDeclaration.body;
             }
@@ -69633,7 +71563,7 @@ var ts;
          * @param node The named import bindings node.
          */
         function visitNamedImportBindings(node) {
-            if (node.kind === 251 /* NamespaceImport */) {
+            if (node.kind === 252 /* NamespaceImport */) {
                 // Elide a namespace import if it is not referenced.
                 return resolver.isReferencedAliasDeclaration(node) ? node : undefined;
             }
@@ -69846,7 +71776,7 @@ var ts;
         function enableSubstitutionForNonQualifiedEnumMembers() {
             if ((enabledSubstitutions & 8 /* NonQualifiedEnumMembers */) === 0) {
                 enabledSubstitutions |= 8 /* NonQualifiedEnumMembers */;
-                context.enableSubstitution(72 /* Identifier */);
+                context.enableSubstitution(73 /* Identifier */);
             }
         }
         function enableSubstitutionForClassAliases() {
@@ -69854,7 +71784,7 @@ var ts;
                 enabledSubstitutions |= 1 /* ClassAliases */;
                 // We need to enable substitutions for identifiers. This allows us to
                 // substitute class names inside of a class declaration.
-                context.enableSubstitution(72 /* Identifier */);
+                context.enableSubstitution(73 /* Identifier */);
                 // Keep track of class aliases.
                 classAliases = [];
             }
@@ -69864,17 +71794,17 @@ var ts;
                 enabledSubstitutions |= 2 /* NamespaceExports */;
                 // We need to enable substitutions for identifiers and shorthand property assignments. This allows us to
                 // substitute the names of exported members of a namespace.
-                context.enableSubstitution(72 /* Identifier */);
-                context.enableSubstitution(276 /* ShorthandPropertyAssignment */);
+                context.enableSubstitution(73 /* Identifier */);
+                context.enableSubstitution(277 /* ShorthandPropertyAssignment */);
                 // We need to be notified when entering and exiting namespaces.
-                context.enableEmitNotification(244 /* ModuleDeclaration */);
+                context.enableEmitNotification(245 /* ModuleDeclaration */);
             }
         }
         function isTransformedModuleDeclaration(node) {
-            return ts.getOriginalNode(node).kind === 244 /* ModuleDeclaration */;
+            return ts.getOriginalNode(node).kind === 245 /* ModuleDeclaration */;
         }
         function isTransformedEnumDeclaration(node) {
-            return ts.getOriginalNode(node).kind === 243 /* EnumDeclaration */;
+            return ts.getOriginalNode(node).kind === 244 /* EnumDeclaration */;
         }
         /**
          * Hook for node emit.
@@ -69933,11 +71863,11 @@ var ts;
         }
         function substituteExpression(node) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return substituteExpressionIdentifier(node);
-                case 189 /* PropertyAccessExpression */:
+                case 190 /* PropertyAccessExpression */:
                     return substitutePropertyAccessExpression(node);
-                case 190 /* ElementAccessExpression */:
+                case 191 /* ElementAccessExpression */:
                     return substituteElementAccessExpression(node);
             }
             return node;
@@ -69975,9 +71905,9 @@ var ts;
                 // If we are nested within a namespace declaration, we may need to qualifiy
                 // an identifier that is exported from a merged namespace.
                 var container = resolver.getReferencedExportContainer(node, /*prefixLocals*/ false);
-                if (container && container.kind !== 284 /* SourceFile */) {
-                    var substitute = (applicableSubstitutions & 2 /* NamespaceExports */ && container.kind === 244 /* ModuleDeclaration */) ||
-                        (applicableSubstitutions & 8 /* NonQualifiedEnumMembers */ && container.kind === 243 /* EnumDeclaration */);
+                if (container && container.kind !== 285 /* SourceFile */) {
+                    var substitute = (applicableSubstitutions & 2 /* NamespaceExports */ && container.kind === 245 /* ModuleDeclaration */) ||
+                        (applicableSubstitutions & 8 /* NonQualifiedEnumMembers */ && container.kind === 244 /* EnumDeclaration */);
                     if (substitute) {
                         return ts.setTextRange(ts.createPropertyAccess(ts.getGeneratedNameForNode(container), node), 
                         /*location*/ node);
@@ -70067,6 +71997,413 @@ var ts;
 })(ts || (ts = {}));
 /*@internal*/
 var ts;
+(function (ts) {
+    var ClassPropertySubstitutionFlags;
+    (function (ClassPropertySubstitutionFlags) {
+        /**
+         * Enables substitutions for class expressions with static fields
+         * which have initializers that reference the class name.
+         */
+        ClassPropertySubstitutionFlags[ClassPropertySubstitutionFlags["ClassAliases"] = 1] = "ClassAliases";
+    })(ClassPropertySubstitutionFlags || (ClassPropertySubstitutionFlags = {}));
+    /**
+     * Transforms ECMAScript Class Syntax.
+     * TypeScript parameter property syntax is transformed in the TypeScript transformer.
+     * For now, this transforms public field declarations using TypeScript class semantics
+     * (where the declarations get elided and initializers are transformed as assignments in the constructor).
+     * Eventually, this transform will change to the ECMAScript semantics (with Object.defineProperty).
+     */
+    function transformClassFields(context) {
+        var hoistVariableDeclaration = context.hoistVariableDeclaration, endLexicalEnvironment = context.endLexicalEnvironment, resumeLexicalEnvironment = context.resumeLexicalEnvironment;
+        var resolver = context.getEmitResolver();
+        var previousOnSubstituteNode = context.onSubstituteNode;
+        context.onSubstituteNode = onSubstituteNode;
+        var enabledSubstitutions;
+        var classAliases;
+        /**
+         * Tracks what computed name expressions originating from elided names must be inlined
+         * at the next execution site, in document order
+         */
+        var pendingExpressions;
+        /**
+         * Tracks what computed name expression statements and static property initializers must be
+         * emitted at the next execution site, in document order (for decorated classes).
+         */
+        var pendingStatements;
+        return ts.chainBundle(transformSourceFile);
+        function transformSourceFile(node) {
+            if (node.isDeclarationFile) {
+                return node;
+            }
+            var visited = ts.visitEachChild(node, visitor, context);
+            ts.addEmitHelpers(visited, context.readEmitHelpers());
+            return visited;
+        }
+        function visitor(node) {
+            if (!(node.transformFlags & 1048576 /* ContainsClassFields */))
+                return node;
+            switch (node.kind) {
+                case 210 /* ClassExpression */:
+                    return visitClassExpression(node);
+                case 241 /* ClassDeclaration */:
+                    return visitClassDeclaration(node);
+                case 220 /* VariableStatement */:
+                    return visitVariableStatement(node);
+            }
+            return ts.visitEachChild(node, visitor, context);
+        }
+        /**
+         * Visits the members of a class that has fields.
+         *
+         * @param node The node to visit.
+         */
+        function classElementVisitor(node) {
+            switch (node.kind) {
+                case 158 /* Constructor */:
+                    // Constructors for classes using class fields are transformed in
+                    // `visitClassDeclaration` or `visitClassExpression`.
+                    return undefined;
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
+                case 157 /* MethodDeclaration */:
+                    // Visit the name of the member (if it's a computed property name).
+                    return ts.visitEachChild(node, classElementVisitor, context);
+                case 155 /* PropertyDeclaration */:
+                    return visitPropertyDeclaration(node);
+                case 150 /* ComputedPropertyName */:
+                    return visitComputedPropertyName(node);
+                case 218 /* SemicolonClassElement */:
+                    return node;
+                default:
+                    return visitor(node);
+            }
+        }
+        function visitVariableStatement(node) {
+            var savedPendingStatements = pendingStatements;
+            pendingStatements = [];
+            var visitedNode = ts.visitEachChild(node, visitor, context);
+            var statement = ts.some(pendingStatements) ? [visitedNode].concat(pendingStatements) :
+                visitedNode;
+            pendingStatements = savedPendingStatements;
+            return statement;
+        }
+        function visitComputedPropertyName(name) {
+            var node = ts.visitEachChild(name, visitor, context);
+            if (ts.some(pendingExpressions)) {
+                var expressions = pendingExpressions;
+                expressions.push(name.expression);
+                pendingExpressions = [];
+                node = ts.updateComputedPropertyName(node, ts.inlineExpressions(expressions));
+            }
+            return node;
+        }
+        function visitPropertyDeclaration(node) {
+            ts.Debug.assert(!ts.some(node.decorators));
+            // Create a temporary variable to store a computed property name (if necessary).
+            // If it's not inlineable, then we emit an expression after the class which assigns
+            // the property name to the temporary variable.
+            var expr = getPropertyNameExpressionIfNeeded(node.name, !!node.initializer);
+            if (expr && !ts.isSimpleInlineableExpression(expr)) {
+                (pendingExpressions || (pendingExpressions = [])).push(expr);
+            }
+            return undefined;
+        }
+        function visitClassDeclaration(node) {
+            if (!ts.forEach(node.members, ts.isPropertyDeclaration)) {
+                return ts.visitEachChild(node, visitor, context);
+            }
+            var savedPendingExpressions = pendingExpressions;
+            pendingExpressions = undefined;
+            var extendsClauseElement = ts.getEffectiveBaseTypeNode(node);
+            var isDerivedClass = !!(extendsClauseElement && ts.skipOuterExpressions(extendsClauseElement.expression).kind !== 97 /* NullKeyword */);
+            var statements = [
+                ts.updateClassDeclaration(node, 
+                /*decorators*/ undefined, node.modifiers, node.name, 
+                /*typeParameters*/ undefined, ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), transformClassMembers(node, isDerivedClass))
+            ];
+            // Write any pending expressions from elided or moved computed property names
+            if (ts.some(pendingExpressions)) {
+                statements.push(ts.createExpressionStatement(ts.inlineExpressions(pendingExpressions)));
+            }
+            pendingExpressions = savedPendingExpressions;
+            // Emit static property assignment. Because classDeclaration is lexically evaluated,
+            // it is safe to emit static property assignment after classDeclaration
+            // From ES6 specification:
+            //      HasLexicalDeclaration (N) : Determines if the argument identifier has a binding in this environment record that was created using
+            //                                  a lexical declaration such as a LexicalDeclaration or a ClassDeclaration.
+            var staticProperties = ts.getInitializedProperties(node, /*isStatic*/ true);
+            if (ts.some(staticProperties)) {
+                addInitializedPropertyStatements(statements, staticProperties, ts.getInternalName(node));
+            }
+            return statements;
+        }
+        function visitClassExpression(node) {
+            if (!ts.forEach(node.members, ts.isPropertyDeclaration)) {
+                return ts.visitEachChild(node, visitor, context);
+            }
+            var savedPendingExpressions = pendingExpressions;
+            pendingExpressions = undefined;
+            // If this class expression is a transformation of a decorated class declaration,
+            // then we want to output the pendingExpressions as statements, not as inlined
+            // expressions with the class statement.
+            //
+            // In this case, we use pendingStatements to produce the same output as the
+            // class declaration transformation. The VariableStatement visitor will insert
+            // these statements after the class expression variable statement.
+            var isDecoratedClassDeclaration = ts.isClassDeclaration(ts.getOriginalNode(node));
+            var staticProperties = ts.getInitializedProperties(node, /*isStatic*/ true);
+            var extendsClauseElement = ts.getEffectiveBaseTypeNode(node);
+            var isDerivedClass = !!(extendsClauseElement && ts.skipOuterExpressions(extendsClauseElement.expression).kind !== 97 /* NullKeyword */);
+            var classExpression = ts.updateClassExpression(node, node.modifiers, node.name, 
+            /*typeParameters*/ undefined, ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), transformClassMembers(node, isDerivedClass));
+            if (ts.some(staticProperties) || ts.some(pendingExpressions)) {
+                if (isDecoratedClassDeclaration) {
+                    ts.Debug.assertDefined(pendingStatements, "Decorated classes transformed by TypeScript are expected to be within a variable declaration.");
+                    // Write any pending expressions from elided or moved computed property names
+                    if (pendingStatements && pendingExpressions && ts.some(pendingExpressions)) {
+                        pendingStatements.push(ts.createExpressionStatement(ts.inlineExpressions(pendingExpressions)));
+                    }
+                    pendingExpressions = savedPendingExpressions;
+                    if (pendingStatements && ts.some(staticProperties)) {
+                        addInitializedPropertyStatements(pendingStatements, staticProperties, ts.getInternalName(node));
+                    }
+                    return classExpression;
+                }
+                else {
+                    var expressions = [];
+                    var isClassWithConstructorReference = resolver.getNodeCheckFlags(node) & 16777216 /* ClassWithConstructorReference */;
+                    var temp = ts.createTempVariable(hoistVariableDeclaration, !!isClassWithConstructorReference);
+                    if (isClassWithConstructorReference) {
+                        // record an alias as the class name is not in scope for statics.
+                        enableSubstitutionForClassAliases();
+                        var alias = ts.getSynthesizedClone(temp);
+                        alias.autoGenerateFlags &= ~8 /* ReservedInNestedScopes */;
+                        classAliases[ts.getOriginalNodeId(node)] = alias;
+                    }
+                    // To preserve the behavior of the old emitter, we explicitly indent
+                    // the body of a class with static initializers.
+                    ts.setEmitFlags(classExpression, 65536 /* Indented */ | ts.getEmitFlags(classExpression));
+                    expressions.push(ts.startOnNewLine(ts.createAssignment(temp, classExpression)));
+                    // Add any pending expressions leftover from elided or relocated computed property names
+                    ts.addRange(expressions, ts.map(pendingExpressions, ts.startOnNewLine));
+                    ts.addRange(expressions, generateInitializedPropertyExpressions(staticProperties, temp));
+                    expressions.push(ts.startOnNewLine(temp));
+                    pendingExpressions = savedPendingExpressions;
+                    return ts.inlineExpressions(expressions);
+                }
+            }
+            pendingExpressions = savedPendingExpressions;
+            return classExpression;
+        }
+        function transformClassMembers(node, isDerivedClass) {
+            var members = [];
+            var constructor = transformConstructor(node, isDerivedClass);
+            if (constructor) {
+                members.push(constructor);
+            }
+            ts.addRange(members, ts.visitNodes(node.members, classElementVisitor, ts.isClassElement));
+            return ts.setTextRange(ts.createNodeArray(members), /*location*/ node.members);
+        }
+        function transformConstructor(node, isDerivedClass) {
+            var constructor = ts.visitNode(ts.getFirstConstructorWithBody(node), visitor, ts.isConstructorDeclaration);
+            var containsPropertyInitializer = ts.forEach(node.members, ts.isInitializedProperty);
+            if (!containsPropertyInitializer) {
+                return constructor;
+            }
+            var parameters = ts.visitParameterList(constructor ? constructor.parameters : undefined, visitor, context);
+            var body = transformConstructorBody(node, constructor, isDerivedClass);
+            if (!body) {
+                return undefined;
+            }
+            return ts.startOnNewLine(ts.setOriginalNode(ts.setTextRange(ts.createConstructor(
+            /*decorators*/ undefined, 
+            /*modifiers*/ undefined, parameters, body), constructor || node), constructor));
+        }
+        function transformConstructorBody(node, constructor, isDerivedClass) {
+            var properties = ts.getInitializedProperties(node, /*isStatic*/ false);
+            // Only generate synthetic constructor when there are property initializers to move.
+            if (!constructor && !ts.some(properties)) {
+                return ts.visitFunctionBody(/*node*/ undefined, visitor, context);
+            }
+            resumeLexicalEnvironment();
+            var indexOfFirstStatement = 0;
+            var statements = [];
+            if (!constructor && isDerivedClass) {
+                // Add a synthetic `super` call:
+                //
+                //  super(...arguments);
+                //
+                statements.push(ts.createExpressionStatement(ts.createCall(ts.createSuper(), 
+                /*typeArguments*/ undefined, [ts.createSpread(ts.createIdentifier("arguments"))])));
+            }
+            if (constructor) {
+                indexOfFirstStatement = ts.addPrologueDirectivesAndInitialSuperCall(constructor, statements, visitor);
+            }
+            // Add the property initializers. Transforms this:
+            //
+            //  public x = 1;
+            //
+            // Into this:
+            //
+            //  constructor() {
+            //      this.x = 1;
+            //  }
+            //
+            if (constructor && constructor.body) {
+                var parameterPropertyDeclarationCount = 0;
+                for (var i = indexOfFirstStatement; i < constructor.body.statements.length; i++) {
+                    if (ts.isParameterPropertyDeclaration(ts.getOriginalNode(constructor.body.statements[i]))) {
+                        parameterPropertyDeclarationCount++;
+                    }
+                    else {
+                        break;
+                    }
+                }
+                if (parameterPropertyDeclarationCount > 0) {
+                    ts.addRange(statements, ts.visitNodes(constructor.body.statements, visitor, ts.isStatement, indexOfFirstStatement, parameterPropertyDeclarationCount));
+                    indexOfFirstStatement += parameterPropertyDeclarationCount;
+                }
+            }
+            addInitializedPropertyStatements(statements, properties, ts.createThis());
+            // Add existing statements, skipping the initial super call.
+            if (constructor) {
+                ts.addRange(statements, ts.visitNodes(constructor.body.statements, visitor, ts.isStatement, indexOfFirstStatement));
+            }
+            statements = ts.mergeLexicalEnvironment(statements, endLexicalEnvironment());
+            return ts.setTextRange(ts.createBlock(ts.setTextRange(ts.createNodeArray(statements), 
+            /*location*/ constructor ? constructor.body.statements : node.members), 
+            /*multiLine*/ true), 
+            /*location*/ constructor ? constructor.body : undefined);
+        }
+        /**
+         * Generates assignment statements for property initializers.
+         *
+         * @param properties An array of property declarations to transform.
+         * @param receiver The receiver on which each property should be assigned.
+         */
+        function addInitializedPropertyStatements(statements, properties, receiver) {
+            for (var _i = 0, properties_6 = properties; _i < properties_6.length; _i++) {
+                var property = properties_6[_i];
+                var statement = ts.createExpressionStatement(transformInitializedProperty(property, receiver));
+                ts.setSourceMapRange(statement, ts.moveRangePastModifiers(property));
+                ts.setCommentRange(statement, property);
+                ts.setOriginalNode(statement, property);
+                statements.push(statement);
+            }
+        }
+        /**
+         * Generates assignment expressions for property initializers.
+         *
+         * @param properties An array of property declarations to transform.
+         * @param receiver The receiver on which each property should be assigned.
+         */
+        function generateInitializedPropertyExpressions(properties, receiver) {
+            var expressions = [];
+            for (var _i = 0, properties_7 = properties; _i < properties_7.length; _i++) {
+                var property = properties_7[_i];
+                var expression = transformInitializedProperty(property, receiver);
+                ts.startOnNewLine(expression);
+                ts.setSourceMapRange(expression, ts.moveRangePastModifiers(property));
+                ts.setCommentRange(expression, property);
+                ts.setOriginalNode(expression, property);
+                expressions.push(expression);
+            }
+            return expressions;
+        }
+        /**
+         * Transforms a property initializer into an assignment statement.
+         *
+         * @param property The property declaration.
+         * @param receiver The object receiving the property assignment.
+         */
+        function transformInitializedProperty(property, receiver) {
+            // We generate a name here in order to reuse the value cached by the relocated computed name expression (which uses the same generated name)
+            var propertyName = ts.isComputedPropertyName(property.name) && !ts.isSimpleInlineableExpression(property.name.expression)
+                ? ts.updateComputedPropertyName(property.name, ts.getGeneratedNameForNode(property.name))
+                : property.name;
+            var initializer = ts.visitNode(property.initializer, visitor, ts.isExpression);
+            var memberAccess = ts.createMemberAccessForPropertyName(receiver, propertyName, /*location*/ propertyName);
+            return ts.createAssignment(memberAccess, initializer);
+        }
+        function enableSubstitutionForClassAliases() {
+            if ((enabledSubstitutions & 1 /* ClassAliases */) === 0) {
+                enabledSubstitutions |= 1 /* ClassAliases */;
+                // We need to enable substitutions for identifiers. This allows us to
+                // substitute class names inside of a class declaration.
+                context.enableSubstitution(73 /* Identifier */);
+                // Keep track of class aliases.
+                classAliases = [];
+            }
+        }
+        /**
+         * Hooks node substitutions.
+         *
+         * @param hint The context for the emitter.
+         * @param node The node to substitute.
+         */
+        function onSubstituteNode(hint, node) {
+            node = previousOnSubstituteNode(hint, node);
+            if (hint === 1 /* Expression */) {
+                return substituteExpression(node);
+            }
+            return node;
+        }
+        function substituteExpression(node) {
+            switch (node.kind) {
+                case 73 /* Identifier */:
+                    return substituteExpressionIdentifier(node);
+            }
+            return node;
+        }
+        function substituteExpressionIdentifier(node) {
+            return trySubstituteClassAlias(node) || node;
+        }
+        function trySubstituteClassAlias(node) {
+            if (enabledSubstitutions & 1 /* ClassAliases */) {
+                if (resolver.getNodeCheckFlags(node) & 33554432 /* ConstructorReferenceInClass */) {
+                    // Due to the emit for class decorators, any reference to the class from inside of the class body
+                    // must instead be rewritten to point to a temporary variable to avoid issues with the double-bind
+                    // behavior of class names in ES6.
+                    // Also, when emitting statics for class expressions, we must substitute a class alias for
+                    // constructor references in static property initializers.
+                    var declaration = resolver.getReferencedValueDeclaration(node);
+                    if (declaration) {
+                        var classAlias = classAliases[declaration.id]; // TODO: GH#18217
+                        if (classAlias) {
+                            var clone_2 = ts.getSynthesizedClone(classAlias);
+                            ts.setSourceMapRange(clone_2, node);
+                            ts.setCommentRange(clone_2, node);
+                            return clone_2;
+                        }
+                    }
+                }
+            }
+            return undefined;
+        }
+        /**
+         * If the name is a computed property, this function transforms it, then either returns an expression which caches the
+         * value of the result or the expression itself if the value is either unused or safe to inline into multiple locations
+         * @param shouldHoist Does the expression need to be reused? (ie, for an initializer or a decorator)
+         */
+        function getPropertyNameExpressionIfNeeded(name, shouldHoist) {
+            if (ts.isComputedPropertyName(name)) {
+                var expression = ts.visitNode(name.expression, visitor, ts.isExpression);
+                var innerExpression = ts.skipPartiallyEmittedExpressions(expression);
+                var inlinable = ts.isSimpleInlineableExpression(innerExpression);
+                var alreadyTransformed = ts.isAssignmentExpression(innerExpression) && ts.isGeneratedIdentifier(innerExpression.left);
+                if (!alreadyTransformed && !inlinable && shouldHoist) {
+                    var generatedName = ts.getGeneratedNameForNode(name);
+                    hoistVariableDeclaration(generatedName);
+                    return ts.createAssignment(generatedName, expression);
+                }
+                return (inlinable || ts.isIdentifier(innerExpression)) ? undefined : expression;
+            }
+        }
+    }
+    ts.transformClassFields = transformClassFields;
+})(ts || (ts = {}));
+/*@internal*/
+var ts;
 (function (ts) {
     var ES2017SubstitutionFlags;
     (function (ES2017SubstitutionFlags) {
@@ -70117,26 +72454,26 @@ var ts;
                 return node;
             }
             switch (node.kind) {
-                case 121 /* AsyncKeyword */:
+                case 122 /* AsyncKeyword */:
                     // ES2017 async modifier should be elided for targets < ES2017
                     return undefined;
-                case 201 /* AwaitExpression */:
+                case 202 /* AwaitExpression */:
                     return visitAwaitExpression(node);
-                case 156 /* MethodDeclaration */:
+                case 157 /* MethodDeclaration */:
                     return visitMethodDeclaration(node);
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     return visitFunctionDeclaration(node);
-                case 196 /* FunctionExpression */:
+                case 197 /* FunctionExpression */:
                     return visitFunctionExpression(node);
-                case 197 /* ArrowFunction */:
+                case 198 /* ArrowFunction */:
                     return visitArrowFunction(node);
-                case 189 /* PropertyAccessExpression */:
-                    if (capturedSuperProperties && ts.isPropertyAccessExpression(node) && node.expression.kind === 98 /* SuperKeyword */) {
+                case 190 /* PropertyAccessExpression */:
+                    if (capturedSuperProperties && ts.isPropertyAccessExpression(node) && node.expression.kind === 99 /* SuperKeyword */) {
                         capturedSuperProperties.set(node.name.escapedText, true);
                     }
                     return ts.visitEachChild(node, visitor, context);
-                case 190 /* ElementAccessExpression */:
-                    if (capturedSuperProperties && node.expression.kind === 98 /* SuperKeyword */) {
+                case 191 /* ElementAccessExpression */:
+                    if (capturedSuperProperties && node.expression.kind === 99 /* SuperKeyword */) {
                         hasSuperElementAccess = true;
                     }
                     return ts.visitEachChild(node, visitor, context);
@@ -70147,27 +72484,27 @@ var ts;
         function asyncBodyVisitor(node) {
             if (ts.isNodeWithPossibleHoistedDeclaration(node)) {
                 switch (node.kind) {
-                    case 219 /* VariableStatement */:
+                    case 220 /* VariableStatement */:
                         return visitVariableStatementInAsyncBody(node);
-                    case 225 /* ForStatement */:
+                    case 226 /* ForStatement */:
                         return visitForStatementInAsyncBody(node);
-                    case 226 /* ForInStatement */:
+                    case 227 /* ForInStatement */:
                         return visitForInStatementInAsyncBody(node);
-                    case 227 /* ForOfStatement */:
+                    case 228 /* ForOfStatement */:
                         return visitForOfStatementInAsyncBody(node);
-                    case 274 /* CatchClause */:
+                    case 275 /* CatchClause */:
                         return visitCatchClauseInAsyncBody(node);
-                    case 218 /* Block */:
-                    case 232 /* SwitchStatement */:
-                    case 246 /* CaseBlock */:
-                    case 271 /* CaseClause */:
-                    case 272 /* DefaultClause */:
-                    case 235 /* TryStatement */:
-                    case 223 /* DoStatement */:
-                    case 224 /* WhileStatement */:
-                    case 222 /* IfStatement */:
-                    case 231 /* WithStatement */:
-                    case 233 /* LabeledStatement */:
+                    case 219 /* Block */:
+                    case 233 /* SwitchStatement */:
+                    case 247 /* CaseBlock */:
+                    case 272 /* CaseClause */:
+                    case 273 /* DefaultClause */:
+                    case 236 /* TryStatement */:
+                    case 224 /* DoStatement */:
+                    case 225 /* WhileStatement */:
+                    case 223 /* IfStatement */:
+                    case 232 /* WithStatement */:
+                    case 234 /* LabeledStatement */:
                         return ts.visitEachChild(node, asyncBodyVisitor, context);
                     default:
                         return ts.Debug.assertNever(node, "Unhandled node.");
@@ -70368,7 +72705,7 @@ var ts;
             var original = ts.getOriginalNode(node, ts.isFunctionLike);
             var nodeType = original.type;
             var promiseConstructor = languageVersion < 2 /* ES2015 */ ? getPromiseConstructor(nodeType) : undefined;
-            var isArrowFunction = node.kind === 197 /* ArrowFunction */;
+            var isArrowFunction = node.kind === 198 /* ArrowFunction */;
             var hasLexicalArguments = (resolver.getNodeCheckFlags(node) & 8192 /* CaptureArguments */) !== 0;
             // An async function is emit as an outer function that calls an inner
             // generator function. To preserve lexical bindings, we pass the current
@@ -70383,8 +72720,10 @@ var ts;
             }
             var savedCapturedSuperProperties = capturedSuperProperties;
             var savedHasSuperElementAccess = hasSuperElementAccess;
-            capturedSuperProperties = ts.createUnderscoreEscapedMap();
-            hasSuperElementAccess = false;
+            if (!isArrowFunction) {
+                capturedSuperProperties = ts.createUnderscoreEscapedMap();
+                hasSuperElementAccess = false;
+            }
             var result;
             if (!isArrowFunction) {
                 var statements = [];
@@ -70396,9 +72735,11 @@ var ts;
                 var emitSuperHelpers = languageVersion >= 2 /* ES2015 */ && resolver.getNodeCheckFlags(node) & (4096 /* AsyncMethodWithSuperBinding */ | 2048 /* AsyncMethodWithSuper */);
                 if (emitSuperHelpers) {
                     enableSubstitutionForAsyncMethodsWithSuper();
-                    var variableStatement = createSuperAccessVariableStatement(resolver, node, capturedSuperProperties);
-                    substitutedSuperAccessors[ts.getNodeId(variableStatement)] = true;
-                    ts.insertStatementsAfterStandardPrologue(statements, [variableStatement]);
+                    if (ts.hasEntries(capturedSuperProperties)) {
+                        var variableStatement = createSuperAccessVariableStatement(resolver, node, capturedSuperProperties);
+                        substitutedSuperAccessors[ts.getNodeId(variableStatement)] = true;
+                        ts.insertStatementsAfterStandardPrologue(statements, [variableStatement]);
+                    }
                 }
                 var block = ts.createBlock(statements, /*multiLine*/ true);
                 ts.setTextRange(block, node.body);
@@ -70425,8 +72766,10 @@ var ts;
                 }
             }
             enclosingFunctionParameterNames = savedEnclosingFunctionParameterNames;
-            capturedSuperProperties = savedCapturedSuperProperties;
-            hasSuperElementAccess = savedHasSuperElementAccess;
+            if (!isArrowFunction) {
+                capturedSuperProperties = savedCapturedSuperProperties;
+                hasSuperElementAccess = savedHasSuperElementAccess;
+            }
             return result;
         }
         function transformAsyncFunctionBodyWorker(body, start) {
@@ -70453,17 +72796,17 @@ var ts;
                 enabledSubstitutions |= 1 /* AsyncMethodsWithSuper */;
                 // We need to enable substitutions for call, property access, and element access
                 // if we need to rewrite super calls.
-                context.enableSubstitution(191 /* CallExpression */);
-                context.enableSubstitution(189 /* PropertyAccessExpression */);
-                context.enableSubstitution(190 /* ElementAccessExpression */);
+                context.enableSubstitution(192 /* CallExpression */);
+                context.enableSubstitution(190 /* PropertyAccessExpression */);
+                context.enableSubstitution(191 /* ElementAccessExpression */);
                 // We need to be notified when entering and exiting declarations that bind super.
-                context.enableEmitNotification(240 /* ClassDeclaration */);
-                context.enableEmitNotification(156 /* MethodDeclaration */);
-                context.enableEmitNotification(158 /* GetAccessor */);
-                context.enableEmitNotification(159 /* SetAccessor */);
-                context.enableEmitNotification(157 /* Constructor */);
+                context.enableEmitNotification(241 /* ClassDeclaration */);
+                context.enableEmitNotification(157 /* MethodDeclaration */);
+                context.enableEmitNotification(159 /* GetAccessor */);
+                context.enableEmitNotification(160 /* SetAccessor */);
+                context.enableEmitNotification(158 /* Constructor */);
                 // We need to be notified when entering the generated accessor arrow functions.
-                context.enableEmitNotification(219 /* VariableStatement */);
+                context.enableEmitNotification(220 /* VariableStatement */);
             }
         }
         /**
@@ -70511,23 +72854,23 @@ var ts;
         }
         function substituteExpression(node) {
             switch (node.kind) {
-                case 189 /* PropertyAccessExpression */:
+                case 190 /* PropertyAccessExpression */:
                     return substitutePropertyAccessExpression(node);
-                case 190 /* ElementAccessExpression */:
+                case 191 /* ElementAccessExpression */:
                     return substituteElementAccessExpression(node);
-                case 191 /* CallExpression */:
+                case 192 /* CallExpression */:
                     return substituteCallExpression(node);
             }
             return node;
         }
         function substitutePropertyAccessExpression(node) {
-            if (node.expression.kind === 98 /* SuperKeyword */) {
+            if (node.expression.kind === 99 /* SuperKeyword */) {
                 return ts.setTextRange(ts.createPropertyAccess(ts.createFileLevelUniqueName("_super"), node.name), node);
             }
             return node;
         }
         function substituteElementAccessExpression(node) {
-            if (node.expression.kind === 98 /* SuperKeyword */) {
+            if (node.expression.kind === 99 /* SuperKeyword */) {
                 return createSuperElementAccessInAsyncMethod(node.argumentExpression, node);
             }
             return node;
@@ -70547,11 +72890,11 @@ var ts;
         }
         function isSuperContainer(node) {
             var kind = node.kind;
-            return kind === 240 /* ClassDeclaration */
-                || kind === 157 /* Constructor */
-                || kind === 156 /* MethodDeclaration */
-                || kind === 158 /* GetAccessor */
-                || kind === 159 /* SetAccessor */;
+            return kind === 241 /* ClassDeclaration */
+                || kind === 158 /* Constructor */
+                || kind === 157 /* MethodDeclaration */
+                || kind === 159 /* GetAccessor */
+                || kind === 160 /* SetAccessor */;
         }
         function createSuperElementAccessInAsyncMethod(argumentExpression, location) {
             if (enclosingSuperContainerFlags & 4096 /* AsyncMethodWithSuperBinding */) {
@@ -70579,7 +72922,7 @@ var ts;
             /* typeParameters */ undefined, 
             /* parameters */ [], 
             /* type */ undefined, 
-            /* equalsGreaterThanToken */ undefined, ts.createPropertyAccess(ts.createSuper(), name))));
+            /* equalsGreaterThanToken */ undefined, ts.setEmitFlags(ts.createPropertyAccess(ts.setEmitFlags(ts.createSuper(), 4 /* NoSubstitution */), name), 4 /* NoSubstitution */))));
             if (hasBinding) {
                 getterAndSetter.push(ts.createPropertyAssignment("set", ts.createArrowFunction(
                 /* modifiers */ undefined, 
@@ -70594,7 +72937,7 @@ var ts;
                     /* initializer */ undefined)
                 ], 
                 /* type */ undefined, 
-                /* equalsGreaterThanToken */ undefined, ts.createAssignment(ts.createPropertyAccess(ts.createSuper(), name), ts.createIdentifier("v")))));
+                /* equalsGreaterThanToken */ undefined, ts.createAssignment(ts.setEmitFlags(ts.createPropertyAccess(ts.setEmitFlags(ts.createSuper(), 4 /* NoSubstitution */), name), 4 /* NoSubstitution */), ts.createIdentifier("v")))));
             }
             accessors.push(ts.createPropertyAssignment(name, ts.createObjectLiteral(getterAndSetter)));
         });
@@ -70613,7 +72956,7 @@ var ts;
         name: "typescript:awaiter",
         scoped: false,
         priority: 5,
-        text: "\n            var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {\n                return new (P || (P = Promise))(function (resolve, reject) {\n                    function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }\n                    function rejected(value) { try { step(generator[\"throw\"](value)); } catch (e) { reject(e); } }\n                    function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }\n                    step((generator = generator.apply(thisArg, _arguments || [])).next());\n                });\n            };"
+        text: "\n            var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {\n                function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }\n                return new (P || (P = Promise))(function (resolve, reject) {\n                    function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }\n                    function rejected(value) { try { step(generator[\"throw\"](value)); } catch (e) { reject(e); } }\n                    function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }\n                    step((generator = generator.apply(thisArg, _arguments || [])).next());\n                });\n            };"
     };
     function createAwaiterHelper(context, hasLexicalArguments, promiseConstructor, body) {
         context.requestEmitHelper(ts.awaiterHelper);
@@ -70686,7 +73029,7 @@ var ts;
             return visitorWorker(node, /*noDestructuringValue*/ true);
         }
         function visitorNoAsyncModifier(node) {
-            if (node.kind === 121 /* AsyncKeyword */) {
+            if (node.kind === 122 /* AsyncKeyword */) {
                 return undefined;
             }
             return node;
@@ -70696,53 +73039,55 @@ var ts;
                 return node;
             }
             switch (node.kind) {
-                case 201 /* AwaitExpression */:
+                case 202 /* AwaitExpression */:
                     return visitAwaitExpression(node);
-                case 207 /* YieldExpression */:
+                case 208 /* YieldExpression */:
                     return visitYieldExpression(node);
-                case 230 /* ReturnStatement */:
+                case 231 /* ReturnStatement */:
                     return visitReturnStatement(node);
-                case 233 /* LabeledStatement */:
+                case 234 /* LabeledStatement */:
                     return visitLabeledStatement(node);
-                case 188 /* ObjectLiteralExpression */:
+                case 189 /* ObjectLiteralExpression */:
                     return visitObjectLiteralExpression(node);
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return visitBinaryExpression(node, noDestructuringValue);
-                case 237 /* VariableDeclaration */:
+                case 275 /* CatchClause */:
+                    return visitCatchClause(node);
+                case 238 /* VariableDeclaration */:
                     return visitVariableDeclaration(node);
-                case 227 /* ForOfStatement */:
+                case 228 /* ForOfStatement */:
                     return visitForOfStatement(node, /*outermostLabeledStatement*/ undefined);
-                case 225 /* ForStatement */:
+                case 226 /* ForStatement */:
                     return visitForStatement(node);
-                case 200 /* VoidExpression */:
+                case 201 /* VoidExpression */:
                     return visitVoidExpression(node);
-                case 157 /* Constructor */:
+                case 158 /* Constructor */:
                     return visitConstructorDeclaration(node);
-                case 156 /* MethodDeclaration */:
+                case 157 /* MethodDeclaration */:
                     return visitMethodDeclaration(node);
-                case 158 /* GetAccessor */:
+                case 159 /* GetAccessor */:
                     return visitGetAccessorDeclaration(node);
-                case 159 /* SetAccessor */:
+                case 160 /* SetAccessor */:
                     return visitSetAccessorDeclaration(node);
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     return visitFunctionDeclaration(node);
-                case 196 /* FunctionExpression */:
+                case 197 /* FunctionExpression */:
                     return visitFunctionExpression(node);
-                case 197 /* ArrowFunction */:
+                case 198 /* ArrowFunction */:
                     return visitArrowFunction(node);
-                case 151 /* Parameter */:
+                case 152 /* Parameter */:
                     return visitParameter(node);
-                case 221 /* ExpressionStatement */:
+                case 222 /* ExpressionStatement */:
                     return visitExpressionStatement(node);
-                case 195 /* ParenthesizedExpression */:
+                case 196 /* ParenthesizedExpression */:
                     return visitParenthesizedExpression(node, noDestructuringValue);
-                case 189 /* PropertyAccessExpression */:
-                    if (capturedSuperProperties && ts.isPropertyAccessExpression(node) && node.expression.kind === 98 /* SuperKeyword */) {
+                case 190 /* PropertyAccessExpression */:
+                    if (capturedSuperProperties && ts.isPropertyAccessExpression(node) && node.expression.kind === 99 /* SuperKeyword */) {
                         capturedSuperProperties.set(node.name.escapedText, true);
                     }
                     return ts.visitEachChild(node, visitor, context);
-                case 190 /* ElementAccessExpression */:
-                    if (capturedSuperProperties && node.expression.kind === 98 /* SuperKeyword */) {
+                case 191 /* ElementAccessExpression */:
+                    if (capturedSuperProperties && node.expression.kind === 99 /* SuperKeyword */) {
                         hasSuperElementAccess = true;
                     }
                     return ts.visitEachChild(node, visitor, context);
@@ -70778,7 +73123,7 @@ var ts;
         function visitLabeledStatement(node) {
             if (enclosingFunctionFlags & 2 /* Async */) {
                 var statement = ts.unwrapInnermostStatementOfLabel(node);
-                if (statement.kind === 227 /* ForOfStatement */ && statement.awaitModifier) {
+                if (statement.kind === 228 /* ForOfStatement */ && statement.awaitModifier) {
                     return visitForOfStatement(statement, node);
                 }
                 return ts.restoreEnclosingLabel(ts.visitEachChild(statement, visitor, context), node);
@@ -70790,7 +73135,7 @@ var ts;
             var objects = [];
             for (var _i = 0, elements_4 = elements; _i < elements_4.length; _i++) {
                 var e = elements_4[_i];
-                if (e.kind === 277 /* SpreadAssignment */) {
+                if (e.kind === 278 /* SpreadAssignment */) {
                     if (chunkObject) {
                         objects.push(ts.createObjectLiteral(chunkObject));
                         chunkObject = undefined;
@@ -70799,7 +73144,7 @@ var ts;
                     objects.push(ts.visitNode(target, visitor, ts.isExpression));
                 }
                 else {
-                    chunkObject = ts.append(chunkObject, e.kind === 275 /* PropertyAssignment */
+                    chunkObject = ts.append(chunkObject, e.kind === 276 /* PropertyAssignment */
                         ? ts.createPropertyAssignment(e.name, ts.visitNode(e.initializer, visitor, ts.isExpression))
                         : ts.visitNode(e, visitor, ts.isObjectLiteralElementLike));
                 }
@@ -70813,14 +73158,39 @@ var ts;
             if (node.transformFlags & 8192 /* ContainsObjectRestOrSpread */) {
                 // spread elements emit like so:
                 // non-spread elements are chunked together into object literals, and then all are passed to __assign:
-                //     { a, ...o, b } => __assign({a}, o, {b});
+                //     { a, ...o, b } => __assign(__assign({a}, o), {b});
                 // If the first element is a spread element, then the first argument to __assign is {}:
-                //     { ...o, a, b, ...o2 } => __assign({}, o, {a, b}, o2)
+                //     { ...o, a, b, ...o2 } => __assign(__assign(__assign({}, o), {a, b}), o2)
+                //
+                // We cannot call __assign with more than two elements, since any element could cause side effects. For
+                // example:
+                //      var k = { a: 1, b: 2 };
+                //      var o = { a: 3, ...k, b: k.a++ };
+                //      // expected: { a: 1, b: 1 }
+                // If we translate the above to `__assign({ a: 3 }, k, { b: k.a++ })`, the `k.a++` will evaluate before
+                // `k` is spread and we end up with `{ a: 2, b: 1 }`.
+                //
+                // This also occurs for spread elements, not just property assignments:
+                //      var k = { a: 1, get b() { l = { z: 9 }; return 2; } };
+                //      var l = { c: 3 };
+                //      var o = { ...k, ...l };
+                //      // expected: { a: 1, b: 2, z: 9 }
+                // If we translate the above to `__assign({}, k, l)`, the `l` will evaluate before `k` is spread and we
+                // end up with `{ a: 1, b: 2, c: 3 }`
                 var objects = chunkObjectLiteralElements(node.properties);
-                if (objects.length && objects[0].kind !== 188 /* ObjectLiteralExpression */) {
+                if (objects.length && objects[0].kind !== 189 /* ObjectLiteralExpression */) {
                     objects.unshift(ts.createObjectLiteral());
                 }
-                return createAssignHelper(context, objects);
+                var expression = objects[0];
+                if (objects.length > 1) {
+                    for (var i = 1; i < objects.length; i++) {
+                        expression = createAssignHelper(context, [expression, objects[i]]);
+                    }
+                    return expression;
+                }
+                else {
+                    return createAssignHelper(context, objects);
+                }
             }
             return ts.visitEachChild(node, visitor, context);
         }
@@ -70844,6 +73214,23 @@ var ts;
             }
             return ts.visitEachChild(node, visitor, context);
         }
+        function visitCatchClause(node) {
+            if (node.variableDeclaration &&
+                ts.isBindingPattern(node.variableDeclaration.name) &&
+                node.variableDeclaration.name.transformFlags & 8192 /* ContainsObjectRestOrSpread */) {
+                var name = ts.getGeneratedNameForNode(node.variableDeclaration.name);
+                var updatedDecl = ts.updateVariableDeclaration(node.variableDeclaration, node.variableDeclaration.name, /*type*/ undefined, name);
+                var visitedBindings = ts.flattenDestructuringBinding(updatedDecl, visitor, context, 1 /* ObjectRest */);
+                var block = ts.visitNode(node.block, visitor, ts.isBlock);
+                if (ts.some(visitedBindings)) {
+                    block = ts.updateBlock(block, [
+                        ts.createVariableStatement(/*modifiers*/ undefined, visitedBindings)
+                    ].concat(block.statements));
+                }
+                return ts.updateCatchClause(node, ts.updateVariableDeclaration(node.variableDeclaration, name, /*type*/ undefined, /*initializer*/ undefined), block);
+            }
+            return ts.visitEachChild(node, visitor, context);
+        }
         /**
          * Visits a VariableDeclaration node with a binding pattern.
          *
@@ -71136,17 +73523,17 @@ var ts;
                 enabledSubstitutions |= 1 /* AsyncMethodsWithSuper */;
                 // We need to enable substitutions for call, property access, and element access
                 // if we need to rewrite super calls.
-                context.enableSubstitution(191 /* CallExpression */);
-                context.enableSubstitution(189 /* PropertyAccessExpression */);
-                context.enableSubstitution(190 /* ElementAccessExpression */);
+                context.enableSubstitution(192 /* CallExpression */);
+                context.enableSubstitution(190 /* PropertyAccessExpression */);
+                context.enableSubstitution(191 /* ElementAccessExpression */);
                 // We need to be notified when entering and exiting declarations that bind super.
-                context.enableEmitNotification(240 /* ClassDeclaration */);
-                context.enableEmitNotification(156 /* MethodDeclaration */);
-                context.enableEmitNotification(158 /* GetAccessor */);
-                context.enableEmitNotification(159 /* SetAccessor */);
-                context.enableEmitNotification(157 /* Constructor */);
+                context.enableEmitNotification(241 /* ClassDeclaration */);
+                context.enableEmitNotification(157 /* MethodDeclaration */);
+                context.enableEmitNotification(159 /* GetAccessor */);
+                context.enableEmitNotification(160 /* SetAccessor */);
+                context.enableEmitNotification(158 /* Constructor */);
                 // We need to be notified when entering the generated accessor arrow functions.
-                context.enableEmitNotification(219 /* VariableStatement */);
+                context.enableEmitNotification(220 /* VariableStatement */);
             }
         }
         /**
@@ -71194,23 +73581,23 @@ var ts;
         }
         function substituteExpression(node) {
             switch (node.kind) {
-                case 189 /* PropertyAccessExpression */:
+                case 190 /* PropertyAccessExpression */:
                     return substitutePropertyAccessExpression(node);
-                case 190 /* ElementAccessExpression */:
+                case 191 /* ElementAccessExpression */:
                     return substituteElementAccessExpression(node);
-                case 191 /* CallExpression */:
+                case 192 /* CallExpression */:
                     return substituteCallExpression(node);
             }
             return node;
         }
         function substitutePropertyAccessExpression(node) {
-            if (node.expression.kind === 98 /* SuperKeyword */) {
+            if (node.expression.kind === 99 /* SuperKeyword */) {
                 return ts.setTextRange(ts.createPropertyAccess(ts.createFileLevelUniqueName("_super"), node.name), node);
             }
             return node;
         }
         function substituteElementAccessExpression(node) {
-            if (node.expression.kind === 98 /* SuperKeyword */) {
+            if (node.expression.kind === 99 /* SuperKeyword */) {
                 return createSuperElementAccessInAsyncMethod(node.argumentExpression, node);
             }
             return node;
@@ -71230,11 +73617,11 @@ var ts;
         }
         function isSuperContainer(node) {
             var kind = node.kind;
-            return kind === 240 /* ClassDeclaration */
-                || kind === 157 /* Constructor */
-                || kind === 156 /* MethodDeclaration */
-                || kind === 158 /* GetAccessor */
-                || kind === 159 /* SetAccessor */;
+            return kind === 241 /* ClassDeclaration */
+                || kind === 158 /* Constructor */
+                || kind === 157 /* MethodDeclaration */
+                || kind === 159 /* GetAccessor */
+                || kind === 160 /* SetAccessor */;
         }
         function createSuperElementAccessInAsyncMethod(argumentExpression, location) {
             if (enclosingSuperContainerFlags & 4096 /* AsyncMethodWithSuperBinding */) {
@@ -71328,7 +73715,7 @@ var ts;
                 return node;
             }
             switch (node.kind) {
-                case 274 /* CatchClause */:
+                case 275 /* CatchClause */:
                     return visitCatchClause(node);
                 default:
                     return ts.visitEachChild(node, visitor, context);
@@ -71397,13 +73784,13 @@ var ts;
         }
         function visitorWorker(node) {
             switch (node.kind) {
-                case 260 /* JsxElement */:
+                case 261 /* JsxElement */:
                     return visitJsxElement(node, /*isChild*/ false);
-                case 261 /* JsxSelfClosingElement */:
+                case 262 /* JsxSelfClosingElement */:
                     return visitJsxSelfClosingElement(node, /*isChild*/ false);
-                case 264 /* JsxFragment */:
+                case 265 /* JsxFragment */:
                     return visitJsxFragment(node, /*isChild*/ false);
-                case 270 /* JsxExpression */:
+                case 271 /* JsxExpression */:
                     return visitJsxExpression(node);
                 default:
                     return ts.visitEachChild(node, visitor, context);
@@ -71413,13 +73800,13 @@ var ts;
             switch (node.kind) {
                 case 11 /* JsxText */:
                     return visitJsxText(node);
-                case 270 /* JsxExpression */:
+                case 271 /* JsxExpression */:
                     return visitJsxExpression(node);
-                case 260 /* JsxElement */:
+                case 261 /* JsxElement */:
                     return visitJsxElement(node, /*isChild*/ true);
-                case 261 /* JsxSelfClosingElement */:
+                case 262 /* JsxSelfClosingElement */:
                     return visitJsxSelfClosingElement(node, /*isChild*/ true);
-                case 264 /* JsxFragment */:
+                case 265 /* JsxFragment */:
                     return visitJsxFragment(node, /*isChild*/ true);
                 default:
                     return ts.Debug.failBadSyntaxKind(node);
@@ -71494,7 +73881,7 @@ var ts;
                 literal.singleQuote = node.singleQuote !== undefined ? node.singleQuote : !ts.isStringDoubleQuoted(node, currentSourceFile);
                 return ts.setTextRange(literal, node);
             }
-            else if (node.kind === 270 /* JsxExpression */) {
+            else if (node.kind === 271 /* JsxExpression */) {
                 if (node.expression === undefined) {
                     return ts.createTrue();
                 }
@@ -71505,7 +73892,7 @@ var ts;
             }
         }
         function visitJsxText(node) {
-            var fixed = fixupWhitespaceAndDecodeEntities(ts.getTextOfNode(node, /*includeTrivia*/ true));
+            var fixed = fixupWhitespaceAndDecodeEntities(node.text);
             return fixed === undefined ? undefined : ts.createLiteral(fixed);
         }
         /**
@@ -71588,7 +73975,7 @@ var ts;
             return decoded === text ? undefined : decoded;
         }
         function getTagName(node) {
-            if (node.kind === 260 /* JsxElement */) {
+            if (node.kind === 261 /* JsxElement */) {
                 return getTagName(node.openingElement);
             }
             else {
@@ -71894,7 +74281,7 @@ var ts;
                 return node;
             }
             switch (node.kind) {
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return visitBinaryExpression(node);
                 default:
                     return ts.visitEachChild(node, visitor, context);
@@ -71902,7 +74289,7 @@ var ts;
         }
         function visitBinaryExpression(node) {
             switch (node.operatorToken.kind) {
-                case 63 /* AsteriskAsteriskEqualsToken */:
+                case 64 /* AsteriskAsteriskEqualsToken */:
                     return visitExponentiationAssignmentExpression(node);
                 case 41 /* AsteriskAsteriskToken */:
                     return visitExponentiationExpression(node);
@@ -71987,62 +74374,63 @@ var ts;
         HierarchyFacts[HierarchyFacts["Block"] = 128] = "Block";
         HierarchyFacts[HierarchyFacts["IterationStatement"] = 256] = "IterationStatement";
         HierarchyFacts[HierarchyFacts["IterationStatementBlock"] = 512] = "IterationStatementBlock";
-        HierarchyFacts[HierarchyFacts["ForStatement"] = 1024] = "ForStatement";
-        HierarchyFacts[HierarchyFacts["ForInOrForOfStatement"] = 2048] = "ForInOrForOfStatement";
-        HierarchyFacts[HierarchyFacts["ConstructorWithCapturedSuper"] = 4096] = "ConstructorWithCapturedSuper";
+        HierarchyFacts[HierarchyFacts["IterationContainer"] = 1024] = "IterationContainer";
+        HierarchyFacts[HierarchyFacts["ForStatement"] = 2048] = "ForStatement";
+        HierarchyFacts[HierarchyFacts["ForInOrForOfStatement"] = 4096] = "ForInOrForOfStatement";
+        HierarchyFacts[HierarchyFacts["ConstructorWithCapturedSuper"] = 8192] = "ConstructorWithCapturedSuper";
         // NOTE: do not add more ancestor flags without also updating AncestorFactsMask below.
         // NOTE: when adding a new ancestor flag, be sure to update the subtree flags below.
         //
         // Ancestor masks
         //
-        HierarchyFacts[HierarchyFacts["AncestorFactsMask"] = 8191] = "AncestorFactsMask";
+        HierarchyFacts[HierarchyFacts["AncestorFactsMask"] = 16383] = "AncestorFactsMask";
         // We are always in *some* kind of block scope, but only specific block-scope containers are
         // top-level or Blocks.
         HierarchyFacts[HierarchyFacts["BlockScopeIncludes"] = 0] = "BlockScopeIncludes";
-        HierarchyFacts[HierarchyFacts["BlockScopeExcludes"] = 4032] = "BlockScopeExcludes";
+        HierarchyFacts[HierarchyFacts["BlockScopeExcludes"] = 7104] = "BlockScopeExcludes";
         // A source file is a top-level block scope.
         HierarchyFacts[HierarchyFacts["SourceFileIncludes"] = 64] = "SourceFileIncludes";
-        HierarchyFacts[HierarchyFacts["SourceFileExcludes"] = 3968] = "SourceFileExcludes";
+        HierarchyFacts[HierarchyFacts["SourceFileExcludes"] = 8064] = "SourceFileExcludes";
         // Functions, methods, and accessors are both new lexical scopes and new block scopes.
         HierarchyFacts[HierarchyFacts["FunctionIncludes"] = 65] = "FunctionIncludes";
-        HierarchyFacts[HierarchyFacts["FunctionExcludes"] = 8094] = "FunctionExcludes";
+        HierarchyFacts[HierarchyFacts["FunctionExcludes"] = 16286] = "FunctionExcludes";
         HierarchyFacts[HierarchyFacts["AsyncFunctionBodyIncludes"] = 69] = "AsyncFunctionBodyIncludes";
-        HierarchyFacts[HierarchyFacts["AsyncFunctionBodyExcludes"] = 8086] = "AsyncFunctionBodyExcludes";
+        HierarchyFacts[HierarchyFacts["AsyncFunctionBodyExcludes"] = 16278] = "AsyncFunctionBodyExcludes";
         // Arrow functions are lexically scoped to their container, but are new block scopes.
         HierarchyFacts[HierarchyFacts["ArrowFunctionIncludes"] = 66] = "ArrowFunctionIncludes";
-        HierarchyFacts[HierarchyFacts["ArrowFunctionExcludes"] = 8064] = "ArrowFunctionExcludes";
+        HierarchyFacts[HierarchyFacts["ArrowFunctionExcludes"] = 15232] = "ArrowFunctionExcludes";
         // Constructors are both new lexical scopes and new block scopes. Constructors are also
         // always considered non-static members of a class.
         HierarchyFacts[HierarchyFacts["ConstructorIncludes"] = 73] = "ConstructorIncludes";
-        HierarchyFacts[HierarchyFacts["ConstructorExcludes"] = 8086] = "ConstructorExcludes";
+        HierarchyFacts[HierarchyFacts["ConstructorExcludes"] = 16278] = "ConstructorExcludes";
         // 'do' and 'while' statements are not block scopes. We track that the subtree is contained
         // within an IterationStatement to indicate whether the embedded statement is an
         // IterationStatementBlock.
-        HierarchyFacts[HierarchyFacts["DoOrWhileStatementIncludes"] = 256] = "DoOrWhileStatementIncludes";
+        HierarchyFacts[HierarchyFacts["DoOrWhileStatementIncludes"] = 1280] = "DoOrWhileStatementIncludes";
         HierarchyFacts[HierarchyFacts["DoOrWhileStatementExcludes"] = 0] = "DoOrWhileStatementExcludes";
         // 'for' statements are new block scopes and have special handling for 'let' declarations.
-        HierarchyFacts[HierarchyFacts["ForStatementIncludes"] = 1280] = "ForStatementIncludes";
-        HierarchyFacts[HierarchyFacts["ForStatementExcludes"] = 3008] = "ForStatementExcludes";
+        HierarchyFacts[HierarchyFacts["ForStatementIncludes"] = 3328] = "ForStatementIncludes";
+        HierarchyFacts[HierarchyFacts["ForStatementExcludes"] = 5056] = "ForStatementExcludes";
         // 'for-in' and 'for-of' statements are new block scopes and have special handling for
         // 'let' declarations.
-        HierarchyFacts[HierarchyFacts["ForInOrForOfStatementIncludes"] = 2304] = "ForInOrForOfStatementIncludes";
-        HierarchyFacts[HierarchyFacts["ForInOrForOfStatementExcludes"] = 1984] = "ForInOrForOfStatementExcludes";
+        HierarchyFacts[HierarchyFacts["ForInOrForOfStatementIncludes"] = 5376] = "ForInOrForOfStatementIncludes";
+        HierarchyFacts[HierarchyFacts["ForInOrForOfStatementExcludes"] = 3008] = "ForInOrForOfStatementExcludes";
         // Blocks (other than function bodies) are new block scopes.
         HierarchyFacts[HierarchyFacts["BlockIncludes"] = 128] = "BlockIncludes";
-        HierarchyFacts[HierarchyFacts["BlockExcludes"] = 3904] = "BlockExcludes";
+        HierarchyFacts[HierarchyFacts["BlockExcludes"] = 6976] = "BlockExcludes";
         HierarchyFacts[HierarchyFacts["IterationStatementBlockIncludes"] = 512] = "IterationStatementBlockIncludes";
-        HierarchyFacts[HierarchyFacts["IterationStatementBlockExcludes"] = 4032] = "IterationStatementBlockExcludes";
+        HierarchyFacts[HierarchyFacts["IterationStatementBlockExcludes"] = 7104] = "IterationStatementBlockExcludes";
         //
         // Subtree facts
         //
-        HierarchyFacts[HierarchyFacts["NewTarget"] = 8192] = "NewTarget";
-        HierarchyFacts[HierarchyFacts["CapturedLexicalThis"] = 16384] = "CapturedLexicalThis";
+        HierarchyFacts[HierarchyFacts["NewTarget"] = 16384] = "NewTarget";
+        HierarchyFacts[HierarchyFacts["CapturedLexicalThis"] = 32768] = "CapturedLexicalThis";
         //
         // Subtree masks
         //
-        HierarchyFacts[HierarchyFacts["SubtreeFactsMask"] = -8192] = "SubtreeFactsMask";
+        HierarchyFacts[HierarchyFacts["SubtreeFactsMask"] = -16384] = "SubtreeFactsMask";
         HierarchyFacts[HierarchyFacts["ArrowFunctionSubtreeExcludes"] = 0] = "ArrowFunctionSubtreeExcludes";
-        HierarchyFacts[HierarchyFacts["FunctionSubtreeExcludes"] = 24576] = "FunctionSubtreeExcludes";
+        HierarchyFacts[HierarchyFacts["FunctionSubtreeExcludes"] = 49152] = "FunctionSubtreeExcludes";
     })(HierarchyFacts || (HierarchyFacts = {}));
     function transformES2015(context) {
         var startLexicalEnvironment = context.startLexicalEnvironment, resumeLexicalEnvironment = context.resumeLexicalEnvironment, endLexicalEnvironment = context.endLexicalEnvironment, hoistVariableDeclaration = context.hoistVariableDeclaration;
@@ -72091,7 +74479,7 @@ var ts;
          */
         function enterSubtree(excludeFacts, includeFacts) {
             var ancestorFacts = hierarchyFacts;
-            hierarchyFacts = (hierarchyFacts & ~excludeFacts | includeFacts) & 8191 /* AncestorFactsMask */;
+            hierarchyFacts = (hierarchyFacts & ~excludeFacts | includeFacts) & 16383 /* AncestorFactsMask */;
             return ancestorFacts;
         }
         /**
@@ -72102,17 +74490,17 @@ var ts;
          * @param includeFacts The new `HierarchyFacts` of the subtree that should be propagated.
          */
         function exitSubtree(ancestorFacts, excludeFacts, includeFacts) {
-            hierarchyFacts = (hierarchyFacts & ~excludeFacts | includeFacts) & -8192 /* SubtreeFactsMask */ | ancestorFacts;
+            hierarchyFacts = (hierarchyFacts & ~excludeFacts | includeFacts) & -16384 /* SubtreeFactsMask */ | ancestorFacts;
         }
         function isReturnVoidStatementInConstructorWithCapturedSuper(node) {
-            return (hierarchyFacts & 4096 /* ConstructorWithCapturedSuper */) !== 0
-                && node.kind === 230 /* ReturnStatement */
+            return (hierarchyFacts & 8192 /* ConstructorWithCapturedSuper */) !== 0
+                && node.kind === 231 /* ReturnStatement */
                 && !node.expression;
         }
         function shouldVisitNode(node) {
             return (node.transformFlags & 128 /* ContainsES2015 */) !== 0
                 || convertedLoopState !== undefined
-                || (hierarchyFacts & 4096 /* ConstructorWithCapturedSuper */ && (ts.isStatement(node) || (node.kind === 218 /* Block */)))
+                || (hierarchyFacts & 8192 /* ConstructorWithCapturedSuper */ && (ts.isStatement(node) || (node.kind === 219 /* Block */)))
                 || (ts.isIterationStatement(node, /*lookInLabeledStatements*/ false) && shouldConvertIterationStatement(node))
                 || (ts.getEmitFlags(node) & 33554432 /* TypeScriptClassWrapper */) !== 0;
         }
@@ -72125,72 +74513,72 @@ var ts;
             }
         }
         function callExpressionVisitor(node) {
-            if (node.kind === 98 /* SuperKeyword */) {
+            if (node.kind === 99 /* SuperKeyword */) {
                 return visitSuperKeyword(/*isExpressionOfCall*/ true);
             }
             return visitor(node);
         }
         function visitJavaScript(node) {
             switch (node.kind) {
-                case 116 /* StaticKeyword */:
+                case 117 /* StaticKeyword */:
                     return undefined; // elide static keyword
-                case 240 /* ClassDeclaration */:
+                case 241 /* ClassDeclaration */:
                     return visitClassDeclaration(node);
-                case 209 /* ClassExpression */:
+                case 210 /* ClassExpression */:
                     return visitClassExpression(node);
-                case 151 /* Parameter */:
+                case 152 /* Parameter */:
                     return visitParameter(node);
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     return visitFunctionDeclaration(node);
-                case 197 /* ArrowFunction */:
+                case 198 /* ArrowFunction */:
                     return visitArrowFunction(node);
-                case 196 /* FunctionExpression */:
+                case 197 /* FunctionExpression */:
                     return visitFunctionExpression(node);
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     return visitVariableDeclaration(node);
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return visitIdentifier(node);
-                case 238 /* VariableDeclarationList */:
+                case 239 /* VariableDeclarationList */:
                     return visitVariableDeclarationList(node);
-                case 232 /* SwitchStatement */:
+                case 233 /* SwitchStatement */:
                     return visitSwitchStatement(node);
-                case 246 /* CaseBlock */:
+                case 247 /* CaseBlock */:
                     return visitCaseBlock(node);
-                case 218 /* Block */:
+                case 219 /* Block */:
                     return visitBlock(node, /*isFunctionBody*/ false);
-                case 229 /* BreakStatement */:
-                case 228 /* ContinueStatement */:
+                case 230 /* BreakStatement */:
+                case 229 /* ContinueStatement */:
                     return visitBreakOrContinueStatement(node);
-                case 233 /* LabeledStatement */:
+                case 234 /* LabeledStatement */:
                     return visitLabeledStatement(node);
-                case 223 /* DoStatement */:
-                case 224 /* WhileStatement */:
+                case 224 /* DoStatement */:
+                case 225 /* WhileStatement */:
                     return visitDoOrWhileStatement(node, /*outermostLabeledStatement*/ undefined);
-                case 225 /* ForStatement */:
+                case 226 /* ForStatement */:
                     return visitForStatement(node, /*outermostLabeledStatement*/ undefined);
-                case 226 /* ForInStatement */:
+                case 227 /* ForInStatement */:
                     return visitForInStatement(node, /*outermostLabeledStatement*/ undefined);
-                case 227 /* ForOfStatement */:
+                case 228 /* ForOfStatement */:
                     return visitForOfStatement(node, /*outermostLabeledStatement*/ undefined);
-                case 221 /* ExpressionStatement */:
+                case 222 /* ExpressionStatement */:
                     return visitExpressionStatement(node);
-                case 188 /* ObjectLiteralExpression */:
+                case 189 /* ObjectLiteralExpression */:
                     return visitObjectLiteralExpression(node);
-                case 274 /* CatchClause */:
+                case 275 /* CatchClause */:
                     return visitCatchClause(node);
-                case 276 /* ShorthandPropertyAssignment */:
+                case 277 /* ShorthandPropertyAssignment */:
                     return visitShorthandPropertyAssignment(node);
-                case 149 /* ComputedPropertyName */:
+                case 150 /* ComputedPropertyName */:
                     return visitComputedPropertyName(node);
-                case 187 /* ArrayLiteralExpression */:
+                case 188 /* ArrayLiteralExpression */:
                     return visitArrayLiteralExpression(node);
-                case 191 /* CallExpression */:
+                case 192 /* CallExpression */:
                     return visitCallExpression(node);
-                case 192 /* NewExpression */:
+                case 193 /* NewExpression */:
                     return visitNewExpression(node);
-                case 195 /* ParenthesizedExpression */:
+                case 196 /* ParenthesizedExpression */:
                     return visitParenthesizedExpression(node, /*needsDestructuringValue*/ true);
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return visitBinaryExpression(node, /*needsDestructuringValue*/ true);
                 case 14 /* NoSubstitutionTemplateLiteral */:
                 case 15 /* TemplateHead */:
@@ -72201,35 +74589,35 @@ var ts;
                     return visitStringLiteral(node);
                 case 8 /* NumericLiteral */:
                     return visitNumericLiteral(node);
-                case 193 /* TaggedTemplateExpression */:
+                case 194 /* TaggedTemplateExpression */:
                     return visitTaggedTemplateExpression(node);
-                case 206 /* TemplateExpression */:
+                case 207 /* TemplateExpression */:
                     return visitTemplateExpression(node);
-                case 207 /* YieldExpression */:
+                case 208 /* YieldExpression */:
                     return visitYieldExpression(node);
-                case 208 /* SpreadElement */:
+                case 209 /* SpreadElement */:
                     return visitSpreadElement(node);
-                case 98 /* SuperKeyword */:
+                case 99 /* SuperKeyword */:
                     return visitSuperKeyword(/*isExpressionOfCall*/ false);
-                case 100 /* ThisKeyword */:
+                case 101 /* ThisKeyword */:
                     return visitThisKeyword(node);
-                case 214 /* MetaProperty */:
+                case 215 /* MetaProperty */:
                     return visitMetaProperty(node);
-                case 156 /* MethodDeclaration */:
+                case 157 /* MethodDeclaration */:
                     return visitMethodDeclaration(node);
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     return visitAccessorDeclaration(node);
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     return visitVariableStatement(node);
-                case 230 /* ReturnStatement */:
+                case 231 /* ReturnStatement */:
                     return visitReturnStatement(node);
                 default:
                     return ts.visitEachChild(node, visitor, context);
             }
         }
         function visitSourceFile(node) {
-            var ancestorFacts = enterSubtree(3968 /* SourceFileExcludes */, 64 /* SourceFileIncludes */);
+            var ancestorFacts = enterSubtree(8064 /* SourceFileExcludes */, 64 /* SourceFileIncludes */);
             var prologue = [];
             var statements = [];
             startLexicalEnvironment();
@@ -72256,7 +74644,7 @@ var ts;
             return ts.visitEachChild(node, visitor, context);
         }
         function visitCaseBlock(node) {
-            var ancestorFacts = enterSubtree(4032 /* BlockScopeExcludes */, 0 /* BlockScopeIncludes */);
+            var ancestorFacts = enterSubtree(7104 /* BlockScopeExcludes */, 0 /* BlockScopeIncludes */);
             var updated = ts.visitEachChild(node, visitor, context);
             exitSubtree(ancestorFacts, 0 /* None */, 0 /* None */);
             return updated;
@@ -72283,7 +74671,7 @@ var ts;
         }
         function visitThisKeyword(node) {
             if (hierarchyFacts & 2 /* ArrowFunction */) {
-                hierarchyFacts |= 16384 /* CapturedLexicalThis */;
+                hierarchyFacts |= 32768 /* CapturedLexicalThis */;
             }
             if (convertedLoopState) {
                 if (hierarchyFacts & 2 /* ArrowFunction */) {
@@ -72313,14 +74701,14 @@ var ts;
                 // it is possible if either
                 //   - break/continue is labeled and label is located inside the converted loop
                 //   - break/continue is non-labeled and located in non-converted loop/switch statement
-                var jump = node.kind === 229 /* BreakStatement */ ? 2 /* Break */ : 4 /* Continue */;
+                var jump = node.kind === 230 /* BreakStatement */ ? 2 /* Break */ : 4 /* Continue */;
                 var canUseBreakOrContinue = (node.label && convertedLoopState.labels && convertedLoopState.labels.get(ts.idText(node.label))) ||
                     (!node.label && (convertedLoopState.allowedNonLabeledJumps & jump));
                 if (!canUseBreakOrContinue) {
                     var labelMarker = void 0;
                     var label = node.label;
                     if (!label) {
-                        if (node.kind === 229 /* BreakStatement */) {
+                        if (node.kind === 230 /* BreakStatement */) {
                             convertedLoopState.nonLocalJumps |= 2 /* Break */;
                             labelMarker = "break";
                         }
@@ -72331,7 +74719,7 @@ var ts;
                         }
                     }
                     else {
-                        if (node.kind === 229 /* BreakStatement */) {
+                        if (node.kind === 230 /* BreakStatement */) {
                             labelMarker = "break-" + label.escapedText;
                             setLabeledJump(convertedLoopState, /*isBreak*/ true, ts.idText(label), labelMarker);
                         }
@@ -72526,7 +74914,7 @@ var ts;
         function addConstructor(statements, node, extendsClauseElement) {
             var savedConvertedLoopState = convertedLoopState;
             convertedLoopState = undefined;
-            var ancestorFacts = enterSubtree(8086 /* ConstructorExcludes */, 73 /* ConstructorIncludes */);
+            var ancestorFacts = enterSubtree(16278 /* ConstructorExcludes */, 73 /* ConstructorIncludes */);
             var constructor = ts.getFirstConstructorWithBody(node);
             var hasSynthesizedSuper = hasSynthesizedDefaultSuperCall(constructor, extendsClauseElement !== undefined);
             var constructorFunction = ts.createFunctionDeclaration(
@@ -72540,7 +74928,7 @@ var ts;
                 ts.setEmitFlags(constructorFunction, 8 /* CapturesThis */);
             }
             statements.push(constructorFunction);
-            exitSubtree(ancestorFacts, 24576 /* FunctionSubtreeExcludes */, 0 /* None */);
+            exitSubtree(ancestorFacts, 49152 /* FunctionSubtreeExcludes */, 0 /* None */);
             convertedLoopState = savedConvertedLoopState;
         }
         /**
@@ -72589,7 +74977,7 @@ var ts;
         function transformConstructorBody(constructor, node, extendsClauseElement, hasSynthesizedSuper) {
             // determine whether the class is known syntactically to be a derived class (e.g. a
             // class that extends a value that is not syntactically known to be `null`).
-            var isDerivedClass = !!extendsClauseElement && ts.skipOuterExpressions(extendsClauseElement.expression).kind !== 96 /* NullKeyword */;
+            var isDerivedClass = !!extendsClauseElement && ts.skipOuterExpressions(extendsClauseElement.expression).kind !== 97 /* NullKeyword */;
             // When the subclass does not have a constructor, we synthesize a *default* constructor using the following
             // representation:
             //
@@ -72633,7 +75021,7 @@ var ts;
                 }
             }
             if (superCallExpression) {
-                hierarchyFacts |= 4096 /* ConstructorWithCapturedSuper */;
+                hierarchyFacts |= 8192 /* ConstructorWithCapturedSuper */;
                 statementOffset++; // skip this statement, we will add it after visiting the rest of the body.
             }
             // visit the remaining statements
@@ -72727,11 +75115,11 @@ var ts;
          */
         function isSufficientlyCoveredByReturnStatements(statement) {
             // A return statement is considered covered.
-            if (statement.kind === 230 /* ReturnStatement */) {
+            if (statement.kind === 231 /* ReturnStatement */) {
                 return true;
             }
             // An if-statement with two covered branches is covered.
-            else if (statement.kind === 222 /* IfStatement */) {
+            else if (statement.kind === 223 /* IfStatement */) {
                 var ifStatement = statement;
                 if (ifStatement.elseStatement) {
                     return isSufficientlyCoveredByReturnStatements(ifStatement.thenStatement) &&
@@ -72739,7 +75127,7 @@ var ts;
                 }
             }
             // A block is covered if it has a last statement which is covered.
-            else if (statement.kind === 218 /* Block */) {
+            else if (statement.kind === 219 /* Block */) {
                 var lastStatement = ts.lastOrUndefined(statement.statements);
                 if (lastStatement && isSufficientlyCoveredByReturnStatements(lastStatement)) {
                     return true;
@@ -72894,10 +75282,10 @@ var ts;
                 return false;
             }
             // `declarationName` is the name of the local declaration for the parameter.
-            var declarationName = parameter.name.kind === 72 /* Identifier */ ? ts.getMutableClone(parameter.name) : ts.createTempVariable(/*recordTempVariable*/ undefined);
+            var declarationName = parameter.name.kind === 73 /* Identifier */ ? ts.getMutableClone(parameter.name) : ts.createTempVariable(/*recordTempVariable*/ undefined);
             ts.setEmitFlags(declarationName, 48 /* NoSourceMap */);
             // `expressionName` is the name of the parameter used in expressions.
-            var expressionName = parameter.name.kind === 72 /* Identifier */ ? ts.getSynthesizedClone(parameter.name) : declarationName;
+            var expressionName = parameter.name.kind === 73 /* Identifier */ ? ts.getSynthesizedClone(parameter.name) : declarationName;
             var restIndex = node.parameters.length - 1;
             var temp = ts.createLoopVariable();
             // var param = [];
@@ -72921,7 +75309,7 @@ var ts;
             ts.setEmitFlags(forStatement, 1048576 /* CustomPrologue */);
             ts.startOnNewLine(forStatement);
             prologueStatements.push(forStatement);
-            if (parameter.name.kind !== 72 /* Identifier */) {
+            if (parameter.name.kind !== 73 /* Identifier */) {
                 // do the actual destructuring of the rest parameter if necessary
                 prologueStatements.push(ts.setEmitFlags(ts.setTextRange(ts.createVariableStatement(
                 /*modifiers*/ undefined, ts.createVariableDeclarationList(ts.flattenDestructuringBinding(parameter, visitor, context, 0 /* All */, expressionName))), parameter), 1048576 /* CustomPrologue */));
@@ -72937,7 +75325,7 @@ var ts;
          * @param node A node.
          */
         function insertCaptureThisForNodeIfNeeded(statements, node) {
-            if (hierarchyFacts & 16384 /* CapturedLexicalThis */ && node.kind !== 197 /* ArrowFunction */) {
+            if (hierarchyFacts & 32768 /* CapturedLexicalThis */ && node.kind !== 198 /* ArrowFunction */) {
                 insertCaptureThisForNode(statements, node, ts.createThis());
                 return true;
             }
@@ -72955,28 +75343,28 @@ var ts;
             ts.insertStatementAfterCustomPrologue(statements, captureThisStatement);
         }
         function insertCaptureNewTargetIfNeeded(statements, node, copyOnWrite) {
-            if (hierarchyFacts & 8192 /* NewTarget */) {
+            if (hierarchyFacts & 16384 /* NewTarget */) {
                 var newTarget = void 0;
                 switch (node.kind) {
-                    case 197 /* ArrowFunction */:
+                    case 198 /* ArrowFunction */:
                         return statements;
-                    case 156 /* MethodDeclaration */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
+                    case 157 /* MethodDeclaration */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
                         // Methods and accessors cannot be constructors, so 'new.target' will
                         // always return 'undefined'.
                         newTarget = ts.createVoidZero();
                         break;
-                    case 157 /* Constructor */:
+                    case 158 /* Constructor */:
                         // Class constructors can only be called with `new`, so `this.constructor`
                         // should be relatively safe to use.
                         newTarget = ts.createPropertyAccess(ts.setEmitFlags(ts.createThis(), 4 /* NoSubstitution */), "constructor");
                         break;
-                    case 239 /* FunctionDeclaration */:
-                    case 196 /* FunctionExpression */:
+                    case 240 /* FunctionDeclaration */:
+                    case 197 /* FunctionExpression */:
                         // Functions can be called or constructed, and may have a `this` due to
                         // being a member or when calling an imported function via `other_1.f()`.
-                        newTarget = ts.createConditional(ts.createLogicalAnd(ts.setEmitFlags(ts.createThis(), 4 /* NoSubstitution */), ts.createBinary(ts.setEmitFlags(ts.createThis(), 4 /* NoSubstitution */), 94 /* InstanceOfKeyword */, ts.getLocalName(node))), ts.createPropertyAccess(ts.setEmitFlags(ts.createThis(), 4 /* NoSubstitution */), "constructor"), ts.createVoidZero());
+                        newTarget = ts.createConditional(ts.createLogicalAnd(ts.setEmitFlags(ts.createThis(), 4 /* NoSubstitution */), ts.createBinary(ts.setEmitFlags(ts.createThis(), 4 /* NoSubstitution */), 95 /* InstanceOfKeyword */, ts.getLocalName(node))), ts.createPropertyAccess(ts.setEmitFlags(ts.createThis(), 4 /* NoSubstitution */), "constructor"), ts.createVoidZero());
                         break;
                     default:
                         return ts.Debug.failBadSyntaxKind(node);
@@ -73005,24 +75393,24 @@ var ts;
             for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                 var member = _a[_i];
                 switch (member.kind) {
-                    case 217 /* SemicolonClassElement */:
+                    case 218 /* SemicolonClassElement */:
                         statements.push(transformSemicolonClassElementToStatement(member));
                         break;
-                    case 156 /* MethodDeclaration */:
+                    case 157 /* MethodDeclaration */:
                         statements.push(transformClassMethodDeclarationToStatement(getClassMemberPrefix(node, member), member, node));
                         break;
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
                         var accessors = ts.getAllAccessorDeclarations(node.members, member);
                         if (member === accessors.firstAccessor) {
                             statements.push(transformAccessorsToStatement(getClassMemberPrefix(node, member), accessors, node));
                         }
                         break;
-                    case 157 /* Constructor */:
+                    case 158 /* Constructor */:
                         // Constructors are handled in visitClassExpression/visitClassDeclaration
                         break;
                     default:
-                        ts.Debug.failBadSyntaxKind(node);
+                        ts.Debug.failBadSyntaxKind(member, currentSourceFile && currentSourceFile.fileName);
                         break;
                 }
             }
@@ -73085,7 +75473,7 @@ var ts;
             // arguments are both mapped contiguously to the accessor name.
             var target = ts.getMutableClone(receiver);
             ts.setEmitFlags(target, 1536 /* NoComments */ | 32 /* NoTrailingSourceMap */);
-            ts.setSourceMapRange(target, firstAccessor.name); // TODO: GH#18217
+            ts.setSourceMapRange(target, firstAccessor.name);
             var propertyName = ts.createExpressionForPropertyName(ts.visitNode(firstAccessor.name, visitor, ts.isPropertyName));
             ts.setEmitFlags(propertyName, 1536 /* NoComments */ | 16 /* NoLeadingSourceMap */);
             ts.setSourceMapRange(propertyName, firstAccessor.name);
@@ -73125,11 +75513,11 @@ var ts;
          */
         function visitArrowFunction(node) {
             if (node.transformFlags & 2048 /* ContainsLexicalThis */) {
-                hierarchyFacts |= 16384 /* CapturedLexicalThis */;
+                hierarchyFacts |= 32768 /* CapturedLexicalThis */;
             }
             var savedConvertedLoopState = convertedLoopState;
             convertedLoopState = undefined;
-            var ancestorFacts = enterSubtree(8064 /* ArrowFunctionExcludes */, 66 /* ArrowFunctionIncludes */);
+            var ancestorFacts = enterSubtree(15232 /* ArrowFunctionExcludes */, 66 /* ArrowFunctionIncludes */);
             var func = ts.createFunctionExpression(
             /*modifiers*/ undefined, 
             /*asteriskToken*/ undefined, 
@@ -73139,7 +75527,7 @@ var ts;
             ts.setTextRange(func, node);
             ts.setOriginalNode(func, node);
             ts.setEmitFlags(func, 8 /* CapturesThis */);
-            if (hierarchyFacts & 16384 /* CapturedLexicalThis */) {
+            if (hierarchyFacts & 32768 /* CapturedLexicalThis */) {
                 enableSubstitutionsForCapturedThis();
             }
             // If an arrow function contains
@@ -73154,16 +75542,16 @@ var ts;
          */
         function visitFunctionExpression(node) {
             var ancestorFacts = ts.getEmitFlags(node) & 262144 /* AsyncFunctionBody */
-                ? enterSubtree(8086 /* AsyncFunctionBodyExcludes */, 69 /* AsyncFunctionBodyIncludes */)
-                : enterSubtree(8094 /* FunctionExcludes */, 65 /* FunctionIncludes */);
+                ? enterSubtree(16278 /* AsyncFunctionBodyExcludes */, 69 /* AsyncFunctionBodyIncludes */)
+                : enterSubtree(16286 /* FunctionExcludes */, 65 /* FunctionIncludes */);
             var savedConvertedLoopState = convertedLoopState;
             convertedLoopState = undefined;
             var parameters = ts.visitParameterList(node.parameters, visitor, context);
             var body = transformFunctionBody(node);
-            var name = hierarchyFacts & 8192 /* NewTarget */
+            var name = hierarchyFacts & 16384 /* NewTarget */
                 ? ts.getLocalName(node)
                 : node.name;
-            exitSubtree(ancestorFacts, 24576 /* FunctionSubtreeExcludes */, 0 /* None */);
+            exitSubtree(ancestorFacts, 49152 /* FunctionSubtreeExcludes */, 0 /* None */);
             convertedLoopState = savedConvertedLoopState;
             return ts.updateFunctionExpression(node, 
             /*modifiers*/ undefined, node.asteriskToken, name, 
@@ -73178,13 +75566,13 @@ var ts;
         function visitFunctionDeclaration(node) {
             var savedConvertedLoopState = convertedLoopState;
             convertedLoopState = undefined;
-            var ancestorFacts = enterSubtree(8094 /* FunctionExcludes */, 65 /* FunctionIncludes */);
+            var ancestorFacts = enterSubtree(16286 /* FunctionExcludes */, 65 /* FunctionIncludes */);
             var parameters = ts.visitParameterList(node.parameters, visitor, context);
             var body = transformFunctionBody(node);
-            var name = hierarchyFacts & 8192 /* NewTarget */
+            var name = hierarchyFacts & 16384 /* NewTarget */
                 ? ts.getLocalName(node)
                 : node.name;
-            exitSubtree(ancestorFacts, 24576 /* FunctionSubtreeExcludes */, 0 /* None */);
+            exitSubtree(ancestorFacts, 49152 /* FunctionSubtreeExcludes */, 0 /* None */);
             convertedLoopState = savedConvertedLoopState;
             return ts.updateFunctionDeclaration(node, 
             /*decorators*/ undefined, ts.visitNodes(node.modifiers, visitor, ts.isModifier), node.asteriskToken, name, 
@@ -73202,14 +75590,14 @@ var ts;
             var savedConvertedLoopState = convertedLoopState;
             convertedLoopState = undefined;
             var ancestorFacts = container && ts.isClassLike(container) && !ts.hasModifier(node, 32 /* Static */)
-                ? enterSubtree(8094 /* FunctionExcludes */, 65 /* FunctionIncludes */ | 8 /* NonStaticClassElement */)
-                : enterSubtree(8094 /* FunctionExcludes */, 65 /* FunctionIncludes */);
+                ? enterSubtree(16286 /* FunctionExcludes */, 65 /* FunctionIncludes */ | 8 /* NonStaticClassElement */)
+                : enterSubtree(16286 /* FunctionExcludes */, 65 /* FunctionIncludes */);
             var parameters = ts.visitParameterList(node.parameters, visitor, context);
             var body = transformFunctionBody(node);
-            if (hierarchyFacts & 8192 /* NewTarget */ && !name && (node.kind === 239 /* FunctionDeclaration */ || node.kind === 196 /* FunctionExpression */)) {
+            if (hierarchyFacts & 16384 /* NewTarget */ && !name && (node.kind === 240 /* FunctionDeclaration */ || node.kind === 197 /* FunctionExpression */)) {
                 name = ts.getGeneratedNameForNode(node);
             }
-            exitSubtree(ancestorFacts, 24576 /* FunctionSubtreeExcludes */, 0 /* None */);
+            exitSubtree(ancestorFacts, 49152 /* FunctionSubtreeExcludes */, 0 /* None */);
             convertedLoopState = savedConvertedLoopState;
             return ts.setOriginalNode(ts.setTextRange(ts.createFunctionExpression(
             /*modifiers*/ undefined, node.asteriskToken, name, 
@@ -73250,7 +75638,7 @@ var ts;
                 }
             }
             else {
-                ts.Debug.assert(node.kind === 197 /* ArrowFunction */);
+                ts.Debug.assert(node.kind === 198 /* ArrowFunction */);
                 // To align with the old emitter, we use a synthetic end position on the location
                 // for the statement list we synthesize when we down-level an arrow function with
                 // an expression function body. This prevents both comments and source maps from
@@ -73304,8 +75692,8 @@ var ts;
                 return ts.visitEachChild(node, visitor, context);
             }
             var ancestorFacts = hierarchyFacts & 256 /* IterationStatement */
-                ? enterSubtree(4032 /* IterationStatementBlockExcludes */, 512 /* IterationStatementBlockIncludes */)
-                : enterSubtree(3904 /* BlockExcludes */, 128 /* BlockIncludes */);
+                ? enterSubtree(7104 /* IterationStatementBlockExcludes */, 512 /* IterationStatementBlockIncludes */)
+                : enterSubtree(6976 /* BlockExcludes */, 128 /* BlockIncludes */);
             var updated = ts.visitEachChild(node, visitor, context);
             exitSubtree(ancestorFacts, 0 /* None */, 0 /* None */);
             return updated;
@@ -73318,9 +75706,9 @@ var ts;
         function visitExpressionStatement(node) {
             // If we are here it is most likely because our expression is a destructuring assignment.
             switch (node.expression.kind) {
-                case 195 /* ParenthesizedExpression */:
+                case 196 /* ParenthesizedExpression */:
                     return ts.updateExpressionStatement(node, visitParenthesizedExpression(node.expression, /*needsDestructuringValue*/ false));
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return ts.updateExpressionStatement(node, visitBinaryExpression(node.expression, /*needsDestructuringValue*/ false));
             }
             return ts.visitEachChild(node, visitor, context);
@@ -73339,9 +75727,9 @@ var ts;
                 // expression. If we are in a state where we do not need the destructuring value,
                 // we pass that information along to the children that care about it.
                 switch (node.expression.kind) {
-                    case 195 /* ParenthesizedExpression */:
+                    case 196 /* ParenthesizedExpression */:
                         return ts.updateParen(node, visitParenthesizedExpression(node.expression, /*needsDestructuringValue*/ false));
-                    case 204 /* BinaryExpression */:
+                    case 205 /* BinaryExpression */:
                         return ts.updateParen(node, visitBinaryExpression(node.expression, /*needsDestructuringValue*/ false));
                 }
             }
@@ -73376,7 +75764,7 @@ var ts;
                             assignment = ts.flattenDestructuringAssignment(decl, visitor, context, 0 /* All */);
                         }
                         else {
-                            assignment = ts.createBinary(decl.name, 59 /* EqualsToken */, ts.visitNode(decl.initializer, visitor, ts.isExpression));
+                            assignment = ts.createBinary(decl.name, 60 /* EqualsToken */, ts.visitNode(decl.initializer, visitor, ts.isExpression));
                             ts.setTextRange(assignment, decl);
                         }
                         assignments = ts.append(assignments, assignment);
@@ -73488,11 +75876,11 @@ var ts;
                     && isDeclaredInLoop
                     && (hierarchyFacts & 512 /* IterationStatementBlock */) !== 0);
             var emitExplicitInitializer = !emittedAsTopLevel
-                && (hierarchyFacts & 2048 /* ForInOrForOfStatement */) === 0
+                && (hierarchyFacts & 4096 /* ForInOrForOfStatement */) === 0
                 && (!resolver.isDeclarationWithCollidingName(node)
                     || (isDeclaredInLoop
                         && !isCapturedInFunction
-                        && (hierarchyFacts & (1024 /* ForStatement */ | 2048 /* ForInOrForOfStatement */)) === 0));
+                        && (hierarchyFacts & (2048 /* ForStatement */ | 4096 /* ForInOrForOfStatement */)) === 0));
             return emitExplicitInitializer;
         }
         /**
@@ -73509,9 +75897,9 @@ var ts;
                 return visitVariableDeclaration(node);
             }
             if (!node.initializer && shouldEmitExplicitInitializerForLetDeclaration(node)) {
-                var clone_2 = ts.getMutableClone(node);
-                clone_2.initializer = ts.createVoidZero();
-                return clone_2;
+                var clone_3 = ts.getMutableClone(node);
+                clone_3.initializer = ts.createVoidZero();
+                return clone_3;
             }
             return ts.visitEachChild(node, visitor, context);
         }
@@ -73550,34 +75938,34 @@ var ts;
         }
         function visitIterationStatement(node, outermostLabeledStatement) {
             switch (node.kind) {
-                case 223 /* DoStatement */:
-                case 224 /* WhileStatement */:
+                case 224 /* DoStatement */:
+                case 225 /* WhileStatement */:
                     return visitDoOrWhileStatement(node, outermostLabeledStatement);
-                case 225 /* ForStatement */:
+                case 226 /* ForStatement */:
                     return visitForStatement(node, outermostLabeledStatement);
-                case 226 /* ForInStatement */:
+                case 227 /* ForInStatement */:
                     return visitForInStatement(node, outermostLabeledStatement);
-                case 227 /* ForOfStatement */:
+                case 228 /* ForOfStatement */:
                     return visitForOfStatement(node, outermostLabeledStatement);
             }
         }
         function visitIterationStatementWithFacts(excludeFacts, includeFacts, node, outermostLabeledStatement, convert) {
             var ancestorFacts = enterSubtree(excludeFacts, includeFacts);
-            var updated = convertIterationStatementBodyIfNecessary(node, outermostLabeledStatement, convert);
+            var updated = convertIterationStatementBodyIfNecessary(node, outermostLabeledStatement, ancestorFacts, convert);
             exitSubtree(ancestorFacts, 0 /* None */, 0 /* None */);
             return updated;
         }
         function visitDoOrWhileStatement(node, outermostLabeledStatement) {
-            return visitIterationStatementWithFacts(0 /* DoOrWhileStatementExcludes */, 256 /* DoOrWhileStatementIncludes */, node, outermostLabeledStatement);
+            return visitIterationStatementWithFacts(0 /* DoOrWhileStatementExcludes */, 1280 /* DoOrWhileStatementIncludes */, node, outermostLabeledStatement);
         }
         function visitForStatement(node, outermostLabeledStatement) {
-            return visitIterationStatementWithFacts(3008 /* ForStatementExcludes */, 1280 /* ForStatementIncludes */, node, outermostLabeledStatement);
+            return visitIterationStatementWithFacts(5056 /* ForStatementExcludes */, 3328 /* ForStatementIncludes */, node, outermostLabeledStatement);
         }
         function visitForInStatement(node, outermostLabeledStatement) {
-            return visitIterationStatementWithFacts(1984 /* ForInOrForOfStatementExcludes */, 2304 /* ForInOrForOfStatementIncludes */, node, outermostLabeledStatement);
+            return visitIterationStatementWithFacts(3008 /* ForInOrForOfStatementExcludes */, 5376 /* ForInOrForOfStatementIncludes */, node, outermostLabeledStatement);
         }
         function visitForOfStatement(node, outermostLabeledStatement) {
-            return visitIterationStatementWithFacts(1984 /* ForInOrForOfStatementExcludes */, 2304 /* ForInOrForOfStatementIncludes */, node, outermostLabeledStatement, compilerOptions.downlevelIteration ? convertForOfStatementForIterable : convertForOfStatementForArray);
+            return visitIterationStatementWithFacts(3008 /* ForInOrForOfStatementExcludes */, 5376 /* ForInOrForOfStatementIncludes */, node, outermostLabeledStatement, compilerOptions.downlevelIteration ? convertForOfStatementForIterable : convertForOfStatementForArray);
         }
         function convertForOfStatementHead(node, boundValue, convertedLoopBodyStatements) {
             var statements = [];
@@ -73685,7 +76073,7 @@ var ts;
             ts.setTextRange(forStatement, node);
             return ts.restoreEnclosingLabel(forStatement, outermostLabeledStatement, convertedLoopState && resetLabel);
         }
-        function convertForOfStatementForIterable(node, outermostLabeledStatement, convertedLoopBodyStatements) {
+        function convertForOfStatementForIterable(node, outermostLabeledStatement, convertedLoopBodyStatements, ancestorFacts) {
             var expression = ts.visitNode(node.expression, visitor, ts.isExpression);
             var iterator = ts.isIdentifier(expression) ? ts.getGeneratedNameForNode(expression) : ts.createTempVariable(/*recordTempVariable*/ undefined);
             var result = ts.isIdentifier(expression) ? ts.getGeneratedNameForNode(iterator) : ts.createTempVariable(/*recordTempVariable*/ undefined);
@@ -73696,9 +76084,13 @@ var ts;
             var next = ts.createCall(ts.createPropertyAccess(iterator, "next"), /*typeArguments*/ undefined, []);
             hoistVariableDeclaration(errorRecord);
             hoistVariableDeclaration(returnMethod);
+            // if we are enclosed in an outer loop ensure we reset 'errorRecord' per each iteration
+            var initializer = ancestorFacts & 1024 /* IterationContainer */
+                ? ts.inlineExpressions([ts.createAssignment(errorRecord, ts.createVoidZero()), values])
+                : values;
             var forStatement = ts.setEmitFlags(ts.setTextRange(ts.createFor(
             /*initializer*/ ts.setEmitFlags(ts.setTextRange(ts.createVariableDeclarationList([
-                ts.setTextRange(ts.createVariableDeclaration(iterator, /*type*/ undefined, values), node.expression),
+                ts.setTextRange(ts.createVariableDeclaration(iterator, /*type*/ undefined, initializer), node.expression),
                 ts.createVariableDeclaration(result, /*type*/ undefined, next)
             ]), node.expression), 2097152 /* NoHoisting */), 
             /*condition*/ ts.createLogicalNot(ts.createPropertyAccess(result, "done")), 
@@ -73741,7 +76133,7 @@ var ts;
                     && i < numInitialPropertiesWithoutYield) {
                     numInitialPropertiesWithoutYield = i;
                 }
-                if (property.name.kind === 149 /* ComputedPropertyName */) {
+                if (property.name.kind === 150 /* ComputedPropertyName */) {
                     numInitialProperties = i;
                     break;
                 }
@@ -73796,7 +76188,7 @@ var ts;
             }
             visit(node.name);
             function visit(node) {
-                if (node.kind === 72 /* Identifier */) {
+                if (node.kind === 73 /* Identifier */) {
                     state.hoistedLocalVariables.push(node);
                 }
                 else {
@@ -73809,7 +76201,7 @@ var ts;
                 }
             }
         }
-        function convertIterationStatementBodyIfNecessary(node, outermostLabeledStatement, convert) {
+        function convertIterationStatementBodyIfNecessary(node, outermostLabeledStatement, ancestorFacts, convert) {
             if (!shouldConvertIterationStatement(node)) {
                 var saveAllowedNonLabeledJumps = void 0;
                 if (convertedLoopState) {
@@ -73819,7 +76211,7 @@ var ts;
                     convertedLoopState.allowedNonLabeledJumps = 2 /* Break */ | 4 /* Continue */;
                 }
                 var result = convert
-                    ? convert(node, outermostLabeledStatement, /*convertedLoopBodyStatements*/ undefined)
+                    ? convert(node, outermostLabeledStatement, /*convertedLoopBodyStatements*/ undefined, ancestorFacts)
                     : ts.restoreEnclosingLabel(ts.visitEachChild(node, visitor, context), outermostLabeledStatement, convertedLoopState && resetLabel);
                 if (convertedLoopState) {
                     convertedLoopState.allowedNonLabeledJumps = saveAllowedNonLabeledJumps;
@@ -73844,29 +76236,29 @@ var ts;
             var loop;
             if (bodyFunction) {
                 if (convert) {
-                    loop = convert(node, outermostLabeledStatement, bodyFunction.part);
+                    loop = convert(node, outermostLabeledStatement, bodyFunction.part, ancestorFacts);
                 }
                 else {
-                    var clone_3 = convertIterationStatementCore(node, initializerFunction, ts.createBlock(bodyFunction.part, /*multiLine*/ true));
-                    ts.aggregateTransformFlags(clone_3);
-                    loop = ts.restoreEnclosingLabel(clone_3, outermostLabeledStatement, convertedLoopState && resetLabel);
+                    var clone_4 = convertIterationStatementCore(node, initializerFunction, ts.createBlock(bodyFunction.part, /*multiLine*/ true));
+                    ts.aggregateTransformFlags(clone_4);
+                    loop = ts.restoreEnclosingLabel(clone_4, outermostLabeledStatement, convertedLoopState && resetLabel);
                 }
             }
             else {
-                var clone_4 = convertIterationStatementCore(node, initializerFunction, ts.visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock));
-                ts.aggregateTransformFlags(clone_4);
-                loop = ts.restoreEnclosingLabel(clone_4, outermostLabeledStatement, convertedLoopState && resetLabel);
+                var clone_5 = convertIterationStatementCore(node, initializerFunction, ts.visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock));
+                ts.aggregateTransformFlags(clone_5);
+                loop = ts.restoreEnclosingLabel(clone_5, outermostLabeledStatement, convertedLoopState && resetLabel);
             }
             statements.push(loop);
             return statements;
         }
         function convertIterationStatementCore(node, initializerFunction, convertedLoopBody) {
             switch (node.kind) {
-                case 225 /* ForStatement */: return convertForStatement(node, initializerFunction, convertedLoopBody);
-                case 226 /* ForInStatement */: return convertForInStatement(node, convertedLoopBody);
-                case 227 /* ForOfStatement */: return convertForOfStatement(node, convertedLoopBody);
-                case 223 /* DoStatement */: return convertDoStatement(node, convertedLoopBody);
-                case 224 /* WhileStatement */: return convertWhileStatement(node, convertedLoopBody);
+                case 226 /* ForStatement */: return convertForStatement(node, initializerFunction, convertedLoopBody);
+                case 227 /* ForInStatement */: return convertForInStatement(node, convertedLoopBody);
+                case 228 /* ForOfStatement */: return convertForOfStatement(node, convertedLoopBody);
+                case 224 /* DoStatement */: return convertDoStatement(node, convertedLoopBody);
+                case 225 /* WhileStatement */: return convertWhileStatement(node, convertedLoopBody);
                 default: return ts.Debug.failBadSyntaxKind(node, "IterationStatement expected");
             }
         }
@@ -73891,11 +76283,11 @@ var ts;
         function createConvertedLoopState(node) {
             var loopInitializer;
             switch (node.kind) {
-                case 225 /* ForStatement */:
-                case 226 /* ForInStatement */:
-                case 227 /* ForOfStatement */:
+                case 226 /* ForStatement */:
+                case 227 /* ForInStatement */:
+                case 228 /* ForOfStatement */:
                     var initializer = node.initializer;
-                    if (initializer && initializer.kind === 238 /* VariableDeclarationList */) {
+                    if (initializer && initializer.kind === 239 /* VariableDeclarationList */) {
                         loopInitializer = initializer;
                     }
                     break;
@@ -74157,7 +76549,7 @@ var ts;
         function copyOutParameter(outParam, copyDirection) {
             var source = copyDirection === 0 /* ToOriginal */ ? outParam.outParamName : outParam.originalName;
             var target = copyDirection === 0 /* ToOriginal */ ? outParam.originalName : outParam.outParamName;
-            return ts.createBinary(target, 59 /* EqualsToken */, source);
+            return ts.createBinary(target, 60 /* EqualsToken */, source);
         }
         function copyOutParameters(outParams, partFlags, copyDirection, statements) {
             for (var _i = 0, outParams_1 = outParams; _i < outParams_1.length; _i++) {
@@ -74294,20 +76686,20 @@ var ts;
             for (var i = start; i < numProperties; i++) {
                 var property = properties[i];
                 switch (property.kind) {
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
                         var accessors = ts.getAllAccessorDeclarations(node.properties, property);
                         if (property === accessors.firstAccessor) {
                             expressions.push(transformAccessorsToExpression(receiver, accessors, node, !!node.multiLine));
                         }
                         break;
-                    case 156 /* MethodDeclaration */:
+                    case 157 /* MethodDeclaration */:
                         expressions.push(transformObjectLiteralMethodDeclarationToExpression(property, receiver, node, node.multiLine));
                         break;
-                    case 275 /* PropertyAssignment */:
+                    case 276 /* PropertyAssignment */:
                         expressions.push(transformPropertyAssignmentToExpression(property, receiver, node.multiLine));
                         break;
-                    case 276 /* ShorthandPropertyAssignment */:
+                    case 277 /* ShorthandPropertyAssignment */:
                         expressions.push(transformShorthandPropertyAssignmentToExpression(property, receiver, node.multiLine));
                         break;
                     default:
@@ -74362,7 +76754,7 @@ var ts;
             return expression;
         }
         function visitCatchClause(node) {
-            var ancestorFacts = enterSubtree(4032 /* BlockScopeExcludes */, 0 /* BlockScopeIncludes */);
+            var ancestorFacts = enterSubtree(7104 /* BlockScopeExcludes */, 0 /* BlockScopeIncludes */);
             var updated;
             ts.Debug.assert(!!node.variableDeclaration, "Catch clause variable should always be present when downleveling ES2015.");
             if (ts.isBindingPattern(node.variableDeclaration.name)) {
@@ -74410,17 +76802,17 @@ var ts;
             ts.Debug.assert(!ts.isComputedPropertyName(node.name));
             var savedConvertedLoopState = convertedLoopState;
             convertedLoopState = undefined;
-            var ancestorFacts = enterSubtree(8094 /* FunctionExcludes */, 65 /* FunctionIncludes */);
+            var ancestorFacts = enterSubtree(16286 /* FunctionExcludes */, 65 /* FunctionIncludes */);
             var updated;
             var parameters = ts.visitParameterList(node.parameters, visitor, context);
             var body = transformFunctionBody(node);
-            if (node.kind === 158 /* GetAccessor */) {
+            if (node.kind === 159 /* GetAccessor */) {
                 updated = ts.updateGetAccessor(node, node.decorators, node.modifiers, node.name, parameters, node.type, body);
             }
             else {
                 updated = ts.updateSetAccessor(node, node.decorators, node.modifiers, node.name, parameters, body);
             }
-            exitSubtree(ancestorFacts, 24576 /* FunctionSubtreeExcludes */, 0 /* None */);
+            exitSubtree(ancestorFacts, 49152 /* FunctionSubtreeExcludes */, 0 /* None */);
             convertedLoopState = savedConvertedLoopState;
             return updated;
         }
@@ -74467,7 +76859,7 @@ var ts;
                 return visitTypeScriptClassWrapper(node);
             }
             var expression = ts.skipOuterExpressions(node.expression);
-            if (expression.kind === 98 /* SuperKeyword */ ||
+            if (expression.kind === 99 /* SuperKeyword */ ||
                 ts.isSuperProperty(expression) ||
                 ts.some(node.arguments, ts.isSpreadElement)) {
                 return visitCallExpressionWithPotentialCapturedThisAssignment(node, /*assignToCapturedThis*/ true);
@@ -74591,10 +76983,10 @@ var ts;
             // We are here either because SuperKeyword was used somewhere in the expression, or
             // because we contain a SpreadElementExpression.
             if (node.transformFlags & 4096 /* ContainsRestOrSpread */ ||
-                node.expression.kind === 98 /* SuperKeyword */ ||
+                node.expression.kind === 99 /* SuperKeyword */ ||
                 ts.isSuperProperty(ts.skipOuterExpressions(node.expression))) {
                 var _a = ts.createCallBinding(node.expression, hoistVariableDeclaration), target = _a.target, thisArg = _a.thisArg;
-                if (node.expression.kind === 98 /* SuperKeyword */) {
+                if (node.expression.kind === 99 /* SuperKeyword */) {
                     ts.setEmitFlags(thisArg, 4 /* NoSubstitution */);
                 }
                 var resultingCall = void 0;
@@ -74612,7 +77004,7 @@ var ts;
                     //      _super.apply(this, a.concat([b]))
                     //      _super.m.apply(this, a.concat([b]))
                     //      _super.prototype.m.apply(this, a.concat([b]))
-                    resultingCall = ts.createFunctionApply(ts.visitNode(target, callExpressionVisitor, ts.isExpression), node.expression.kind === 98 /* SuperKeyword */ ? thisArg : ts.visitNode(thisArg, visitor, ts.isExpression), transformAndSpreadElements(node.arguments, /*needsUniqueCopy*/ false, /*multiLine*/ false, /*hasTrailingComma*/ false));
+                    resultingCall = ts.createFunctionApply(ts.visitNode(target, callExpressionVisitor, ts.isExpression), node.expression.kind === 99 /* SuperKeyword */ ? thisArg : ts.visitNode(thisArg, visitor, ts.isExpression), transformAndSpreadElements(node.arguments, /*needsUniqueCopy*/ false, /*multiLine*/ false, /*hasTrailingComma*/ false));
                 }
                 else {
                     // [source]
@@ -74624,10 +77016,10 @@ var ts;
                     //      _super.call(this, a)
                     //      _super.m.call(this, a)
                     //      _super.prototype.m.call(this, a)
-                    resultingCall = ts.createFunctionCall(ts.visitNode(target, callExpressionVisitor, ts.isExpression), node.expression.kind === 98 /* SuperKeyword */ ? thisArg : ts.visitNode(thisArg, visitor, ts.isExpression), ts.visitNodes(node.arguments, visitor, ts.isExpression), 
+                    resultingCall = ts.createFunctionCall(ts.visitNode(target, callExpressionVisitor, ts.isExpression), node.expression.kind === 99 /* SuperKeyword */ ? thisArg : ts.visitNode(thisArg, visitor, ts.isExpression), ts.visitNodes(node.arguments, visitor, ts.isExpression), 
                     /*location*/ node);
                 }
-                if (node.expression.kind === 98 /* SuperKeyword */) {
+                if (node.expression.kind === 99 /* SuperKeyword */) {
                     var initializer = ts.createLogicalOr(resultingCall, createActualThis());
                     resultingCall = assignToCapturedThis
                         ? ts.createAssignment(ts.createFileLevelUniqueName("_this"), initializer)
@@ -74667,8 +77059,11 @@ var ts;
             // [source]
             //      [a, ...b, c]
             //
+            // [output (downlevelIteration)]
+            //      __spread([a], b, [c])
+            //
             // [output]
-            //      [a].concat(b, [c])
+            //      __spreadArrays([a], b, [c])
             // Map spans of spread expressions into their expressions and spans of other
             // expressions into an array literal.
             var numElements = elements.length;
@@ -74678,10 +77073,7 @@ var ts;
             if (compilerOptions.downlevelIteration) {
                 if (segments.length === 1) {
                     var firstSegment = segments[0];
-                    if (ts.isCallExpression(firstSegment)
-                        && ts.isIdentifier(firstSegment.expression)
-                        && (ts.getEmitFlags(firstSegment.expression) & 4096 /* HelperName */)
-                        && firstSegment.expression.escapedText === "___spread") {
+                    if (isCallToHelper(firstSegment, "___spread")) {
                         return segments[0];
                     }
                 }
@@ -74689,15 +77081,28 @@ var ts;
             }
             else {
                 if (segments.length === 1) {
-                    var firstElement = elements[0];
-                    return needsUniqueCopy && ts.isSpreadElement(firstElement) && firstElement.expression.kind !== 187 /* ArrayLiteralExpression */
-                        ? ts.createArraySlice(segments[0])
-                        : segments[0];
+                    var firstSegment = segments[0];
+                    if (!needsUniqueCopy
+                        || isPackedArrayLiteral(firstSegment)
+                        || isCallToHelper(firstSegment, "___spreadArrays")) {
+                        return segments[0];
+                    }
                 }
-                // Rewrite using the pattern <segment0>.concat(<segment1>, <segment2>, ...)
-                return ts.createArrayConcat(segments.shift(), segments);
+                return ts.createSpreadArraysHelper(context, segments);
             }
         }
+        function isPackedElement(node) {
+            return !ts.isOmittedExpression(node);
+        }
+        function isPackedArrayLiteral(node) {
+            return ts.isArrayLiteralExpression(node) && ts.every(node.elements, isPackedElement);
+        }
+        function isCallToHelper(firstSegment, helperName) {
+            return ts.isCallExpression(firstSegment)
+                && ts.isIdentifier(firstSegment.expression)
+                && (ts.getEmitFlags(firstSegment.expression) & 4096 /* HelperName */)
+                && firstSegment.expression.escapedText === helperName;
+        }
         function partitionSpread(node) {
             return ts.isSpreadElement(node)
                 ? visitSpanOfSpreads
@@ -74905,8 +77310,8 @@ var ts;
                 : ts.createFileLevelUniqueName("_super");
         }
         function visitMetaProperty(node) {
-            if (node.keywordToken === 95 /* NewKeyword */ && node.name.escapedText === "target") {
-                hierarchyFacts |= 8192 /* NewTarget */;
+            if (node.keywordToken === 96 /* NewKeyword */ && node.name.escapedText === "target") {
+                hierarchyFacts |= 16384 /* NewTarget */;
                 return ts.createFileLevelUniqueName("_newTarget");
             }
             return node;
@@ -74921,7 +77326,7 @@ var ts;
         function onEmitNode(hint, node, emitCallback) {
             if (enabledSubstitutions & 1 /* CapturedThis */ && ts.isFunctionLike(node)) {
                 // If we are tracking a captured `this`, keep track of the enclosing function.
-                var ancestorFacts = enterSubtree(8094 /* FunctionExcludes */, ts.getEmitFlags(node) & 8 /* CapturesThis */
+                var ancestorFacts = enterSubtree(16286 /* FunctionExcludes */, ts.getEmitFlags(node) & 8 /* CapturesThis */
                     ? 65 /* FunctionIncludes */ | 16 /* CapturesThis */
                     : 65 /* FunctionIncludes */);
                 previousOnEmitNode(hint, node, emitCallback);
@@ -74937,7 +77342,7 @@ var ts;
         function enableSubstitutionsForBlockScopedBindings() {
             if ((enabledSubstitutions & 2 /* BlockScopedBindings */) === 0) {
                 enabledSubstitutions |= 2 /* BlockScopedBindings */;
-                context.enableSubstitution(72 /* Identifier */);
+                context.enableSubstitution(73 /* Identifier */);
             }
         }
         /**
@@ -74947,14 +77352,14 @@ var ts;
         function enableSubstitutionsForCapturedThis() {
             if ((enabledSubstitutions & 1 /* CapturedThis */) === 0) {
                 enabledSubstitutions |= 1 /* CapturedThis */;
-                context.enableSubstitution(100 /* ThisKeyword */);
-                context.enableEmitNotification(157 /* Constructor */);
-                context.enableEmitNotification(156 /* MethodDeclaration */);
-                context.enableEmitNotification(158 /* GetAccessor */);
-                context.enableEmitNotification(159 /* SetAccessor */);
-                context.enableEmitNotification(197 /* ArrowFunction */);
-                context.enableEmitNotification(196 /* FunctionExpression */);
-                context.enableEmitNotification(239 /* FunctionDeclaration */);
+                context.enableSubstitution(101 /* ThisKeyword */);
+                context.enableEmitNotification(158 /* Constructor */);
+                context.enableEmitNotification(157 /* MethodDeclaration */);
+                context.enableEmitNotification(159 /* GetAccessor */);
+                context.enableEmitNotification(160 /* SetAccessor */);
+                context.enableEmitNotification(198 /* ArrowFunction */);
+                context.enableEmitNotification(197 /* FunctionExpression */);
+                context.enableEmitNotification(240 /* FunctionDeclaration */);
             }
         }
         /**
@@ -74995,10 +77400,10 @@ var ts;
          */
         function isNameOfDeclarationWithCollidingName(node) {
             switch (node.parent.kind) {
-                case 186 /* BindingElement */:
-                case 240 /* ClassDeclaration */:
-                case 243 /* EnumDeclaration */:
-                case 237 /* VariableDeclaration */:
+                case 187 /* BindingElement */:
+                case 241 /* ClassDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 238 /* VariableDeclaration */:
                     return node.parent.name === node
                         && resolver.isDeclarationWithCollidingName(node.parent);
             }
@@ -75011,9 +77416,9 @@ var ts;
          */
         function substituteExpression(node) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return substituteExpressionIdentifier(node);
-                case 100 /* ThisKeyword */:
+                case 101 /* ThisKeyword */:
                     return substituteThisKeyword(node);
             }
             return node;
@@ -75080,19 +77485,19 @@ var ts;
                 return false;
             }
             var statement = ts.firstOrUndefined(constructor.body.statements);
-            if (!statement || !ts.nodeIsSynthesized(statement) || statement.kind !== 221 /* ExpressionStatement */) {
+            if (!statement || !ts.nodeIsSynthesized(statement) || statement.kind !== 222 /* ExpressionStatement */) {
                 return false;
             }
             var statementExpression = statement.expression;
-            if (!ts.nodeIsSynthesized(statementExpression) || statementExpression.kind !== 191 /* CallExpression */) {
+            if (!ts.nodeIsSynthesized(statementExpression) || statementExpression.kind !== 192 /* CallExpression */) {
                 return false;
             }
             var callTarget = statementExpression.expression;
-            if (!ts.nodeIsSynthesized(callTarget) || callTarget.kind !== 98 /* SuperKeyword */) {
+            if (!ts.nodeIsSynthesized(callTarget) || callTarget.kind !== 99 /* SuperKeyword */) {
                 return false;
             }
             var callArgument = ts.singleOrUndefined(statementExpression.arguments);
-            if (!callArgument || !ts.nodeIsSynthesized(callArgument) || callArgument.kind !== 208 /* SpreadElement */) {
+            if (!callArgument || !ts.nodeIsSynthesized(callArgument) || callArgument.kind !== 209 /* SpreadElement */) {
                 return false;
             }
             var expression = callArgument.expression;
@@ -75145,15 +77550,15 @@ var ts;
         if (compilerOptions.jsx === 1 /* Preserve */ || compilerOptions.jsx === 3 /* ReactNative */) {
             previousOnEmitNode = context.onEmitNode;
             context.onEmitNode = onEmitNode;
-            context.enableEmitNotification(262 /* JsxOpeningElement */);
-            context.enableEmitNotification(263 /* JsxClosingElement */);
-            context.enableEmitNotification(261 /* JsxSelfClosingElement */);
+            context.enableEmitNotification(263 /* JsxOpeningElement */);
+            context.enableEmitNotification(264 /* JsxClosingElement */);
+            context.enableEmitNotification(262 /* JsxSelfClosingElement */);
             noSubstitution = [];
         }
         var previousOnSubstituteNode = context.onSubstituteNode;
         context.onSubstituteNode = onSubstituteNode;
-        context.enableSubstitution(189 /* PropertyAccessExpression */);
-        context.enableSubstitution(275 /* PropertyAssignment */);
+        context.enableSubstitution(190 /* PropertyAccessExpression */);
+        context.enableSubstitution(276 /* PropertyAssignment */);
         return ts.chainBundle(transformSourceFile);
         /**
          * Transforms an ES5 source file to ES3.
@@ -75172,9 +77577,9 @@ var ts;
          */
         function onEmitNode(hint, node, emitCallback) {
             switch (node.kind) {
-                case 262 /* JsxOpeningElement */:
-                case 263 /* JsxClosingElement */:
-                case 261 /* JsxSelfClosingElement */:
+                case 263 /* JsxOpeningElement */:
+                case 264 /* JsxClosingElement */:
+                case 262 /* JsxSelfClosingElement */:
                     var tagName = node.tagName;
                     noSubstitution[ts.getOriginalNodeId(tagName)] = true;
                     break;
@@ -75231,7 +77636,7 @@ var ts;
          */
         function trySubstituteReservedName(name) {
             var token = name.originalKeywordKind || (ts.nodeIsSynthesized(name) ? ts.stringToToken(ts.idText(name)) : undefined);
-            if (token !== undefined && token >= 73 /* FirstReservedWord */ && token <= 108 /* LastReservedWord */) {
+            if (token !== undefined && token >= 74 /* FirstReservedWord */ && token <= 109 /* LastReservedWord */) {
                 return ts.setTextRange(ts.createLiteral(name), name);
             }
             return undefined;
@@ -75506,13 +77911,13 @@ var ts;
          */
         function visitJavaScriptInStatementContainingYield(node) {
             switch (node.kind) {
-                case 223 /* DoStatement */:
+                case 224 /* DoStatement */:
                     return visitDoStatement(node);
-                case 224 /* WhileStatement */:
+                case 225 /* WhileStatement */:
                     return visitWhileStatement(node);
-                case 232 /* SwitchStatement */:
+                case 233 /* SwitchStatement */:
                     return visitSwitchStatement(node);
-                case 233 /* LabeledStatement */:
+                case 234 /* LabeledStatement */:
                     return visitLabeledStatement(node);
                 default:
                     return visitJavaScriptInGeneratorFunctionBody(node);
@@ -75525,24 +77930,24 @@ var ts;
          */
         function visitJavaScriptInGeneratorFunctionBody(node) {
             switch (node.kind) {
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     return visitFunctionDeclaration(node);
-                case 196 /* FunctionExpression */:
+                case 197 /* FunctionExpression */:
                     return visitFunctionExpression(node);
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     return visitAccessorDeclaration(node);
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     return visitVariableStatement(node);
-                case 225 /* ForStatement */:
+                case 226 /* ForStatement */:
                     return visitForStatement(node);
-                case 226 /* ForInStatement */:
+                case 227 /* ForInStatement */:
                     return visitForInStatement(node);
-                case 229 /* BreakStatement */:
+                case 230 /* BreakStatement */:
                     return visitBreakStatement(node);
-                case 228 /* ContinueStatement */:
+                case 229 /* ContinueStatement */:
                     return visitContinueStatement(node);
-                case 230 /* ReturnStatement */:
+                case 231 /* ReturnStatement */:
                     return visitReturnStatement(node);
                 default:
                     if (node.transformFlags & 131072 /* ContainsYield */) {
@@ -75563,21 +77968,21 @@ var ts;
          */
         function visitJavaScriptContainingYield(node) {
             switch (node.kind) {
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return visitBinaryExpression(node);
-                case 205 /* ConditionalExpression */:
+                case 206 /* ConditionalExpression */:
                     return visitConditionalExpression(node);
-                case 207 /* YieldExpression */:
+                case 208 /* YieldExpression */:
                     return visitYieldExpression(node);
-                case 187 /* ArrayLiteralExpression */:
+                case 188 /* ArrayLiteralExpression */:
                     return visitArrayLiteralExpression(node);
-                case 188 /* ObjectLiteralExpression */:
+                case 189 /* ObjectLiteralExpression */:
                     return visitObjectLiteralExpression(node);
-                case 190 /* ElementAccessExpression */:
+                case 191 /* ElementAccessExpression */:
                     return visitElementAccessExpression(node);
-                case 191 /* CallExpression */:
+                case 192 /* CallExpression */:
                     return visitCallExpression(node);
-                case 192 /* NewExpression */:
+                case 193 /* NewExpression */:
                     return visitNewExpression(node);
                 default:
                     return ts.visitEachChild(node, visitor, context);
@@ -75590,9 +77995,9 @@ var ts;
          */
         function visitGenerator(node) {
             switch (node.kind) {
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     return visitFunctionDeclaration(node);
-                case 196 /* FunctionExpression */:
+                case 197 /* FunctionExpression */:
                     return visitFunctionExpression(node);
                 default:
                     return ts.Debug.failBadSyntaxKind(node);
@@ -75791,23 +78196,23 @@ var ts;
             }
         }
         function isCompoundAssignment(kind) {
-            return kind >= 60 /* FirstCompoundAssignment */
-                && kind <= 71 /* LastCompoundAssignment */;
+            return kind >= 61 /* FirstCompoundAssignment */
+                && kind <= 72 /* LastCompoundAssignment */;
         }
         function getOperatorForCompoundAssignment(kind) {
             switch (kind) {
-                case 60 /* PlusEqualsToken */: return 38 /* PlusToken */;
-                case 61 /* MinusEqualsToken */: return 39 /* MinusToken */;
-                case 62 /* AsteriskEqualsToken */: return 40 /* AsteriskToken */;
-                case 63 /* AsteriskAsteriskEqualsToken */: return 41 /* AsteriskAsteriskToken */;
-                case 64 /* SlashEqualsToken */: return 42 /* SlashToken */;
-                case 65 /* PercentEqualsToken */: return 43 /* PercentToken */;
-                case 66 /* LessThanLessThanEqualsToken */: return 46 /* LessThanLessThanToken */;
-                case 67 /* GreaterThanGreaterThanEqualsToken */: return 47 /* GreaterThanGreaterThanToken */;
-                case 68 /* GreaterThanGreaterThanGreaterThanEqualsToken */: return 48 /* GreaterThanGreaterThanGreaterThanToken */;
-                case 69 /* AmpersandEqualsToken */: return 49 /* AmpersandToken */;
-                case 70 /* BarEqualsToken */: return 50 /* BarToken */;
-                case 71 /* CaretEqualsToken */: return 51 /* CaretToken */;
+                case 61 /* PlusEqualsToken */: return 38 /* PlusToken */;
+                case 62 /* MinusEqualsToken */: return 39 /* MinusToken */;
+                case 63 /* AsteriskEqualsToken */: return 40 /* AsteriskToken */;
+                case 64 /* AsteriskAsteriskEqualsToken */: return 41 /* AsteriskAsteriskToken */;
+                case 65 /* SlashEqualsToken */: return 42 /* SlashToken */;
+                case 66 /* PercentEqualsToken */: return 43 /* PercentToken */;
+                case 67 /* LessThanLessThanEqualsToken */: return 46 /* LessThanLessThanToken */;
+                case 68 /* GreaterThanGreaterThanEqualsToken */: return 47 /* GreaterThanGreaterThanToken */;
+                case 69 /* GreaterThanGreaterThanGreaterThanEqualsToken */: return 48 /* GreaterThanGreaterThanGreaterThanToken */;
+                case 70 /* AmpersandEqualsToken */: return 49 /* AmpersandToken */;
+                case 71 /* BarEqualsToken */: return 50 /* BarToken */;
+                case 72 /* CaretEqualsToken */: return 51 /* CaretToken */;
             }
         }
         /**
@@ -75820,7 +78225,7 @@ var ts;
             if (containsYield(right)) {
                 var target = void 0;
                 switch (left.kind) {
-                    case 189 /* PropertyAccessExpression */:
+                    case 190 /* PropertyAccessExpression */:
                         // [source]
                         //      a.b = yield;
                         //
@@ -75832,7 +78237,7 @@ var ts;
                         //      _a.b = %sent%;
                         target = ts.updatePropertyAccess(left, cacheExpression(ts.visitNode(left.expression, visitor, ts.isLeftHandSideExpression)), left.name);
                         break;
-                    case 190 /* ElementAccessExpression */:
+                    case 191 /* ElementAccessExpression */:
                         // [source]
                         //      a[b] = yield;
                         //
@@ -75875,10 +78280,10 @@ var ts;
                 //      _a = a();
                 //  .yield resumeLabel
                 //      _a + %sent% + c()
-                var clone_5 = ts.getMutableClone(node);
-                clone_5.left = cacheExpression(ts.visitNode(node.left, visitor, ts.isExpression));
-                clone_5.right = ts.visitNode(node.right, visitor, ts.isExpression);
-                return clone_5;
+                var clone_6 = ts.getMutableClone(node);
+                clone_6.left = cacheExpression(ts.visitNode(node.left, visitor, ts.isExpression));
+                clone_6.right = ts.visitNode(node.right, visitor, ts.isExpression);
+                return clone_6;
             }
             return ts.visitEachChild(node, visitor, context);
         }
@@ -76139,10 +78544,10 @@ var ts;
                 //  .yield resumeLabel
                 //  .mark resumeLabel
                 //      a = _a[%sent%]
-                var clone_6 = ts.getMutableClone(node);
-                clone_6.expression = cacheExpression(ts.visitNode(node.expression, visitor, ts.isLeftHandSideExpression));
-                clone_6.argumentExpression = ts.visitNode(node.argumentExpression, visitor, ts.isExpression);
-                return clone_6;
+                var clone_7 = ts.getMutableClone(node);
+                clone_7.expression = cacheExpression(ts.visitNode(node.expression, visitor, ts.isLeftHandSideExpression));
+                clone_7.argumentExpression = ts.visitNode(node.argumentExpression, visitor, ts.isExpression);
+                return clone_7;
             }
             return ts.visitEachChild(node, visitor, context);
         }
@@ -76208,35 +78613,35 @@ var ts;
         }
         function transformAndEmitStatementWorker(node) {
             switch (node.kind) {
-                case 218 /* Block */:
+                case 219 /* Block */:
                     return transformAndEmitBlock(node);
-                case 221 /* ExpressionStatement */:
+                case 222 /* ExpressionStatement */:
                     return transformAndEmitExpressionStatement(node);
-                case 222 /* IfStatement */:
+                case 223 /* IfStatement */:
                     return transformAndEmitIfStatement(node);
-                case 223 /* DoStatement */:
+                case 224 /* DoStatement */:
                     return transformAndEmitDoStatement(node);
-                case 224 /* WhileStatement */:
+                case 225 /* WhileStatement */:
                     return transformAndEmitWhileStatement(node);
-                case 225 /* ForStatement */:
+                case 226 /* ForStatement */:
                     return transformAndEmitForStatement(node);
-                case 226 /* ForInStatement */:
+                case 227 /* ForInStatement */:
                     return transformAndEmitForInStatement(node);
-                case 228 /* ContinueStatement */:
+                case 229 /* ContinueStatement */:
                     return transformAndEmitContinueStatement(node);
-                case 229 /* BreakStatement */:
+                case 230 /* BreakStatement */:
                     return transformAndEmitBreakStatement(node);
-                case 230 /* ReturnStatement */:
+                case 231 /* ReturnStatement */:
                     return transformAndEmitReturnStatement(node);
-                case 231 /* WithStatement */:
+                case 232 /* WithStatement */:
                     return transformAndEmitWithStatement(node);
-                case 232 /* SwitchStatement */:
+                case 233 /* SwitchStatement */:
                     return transformAndEmitSwitchStatement(node);
-                case 233 /* LabeledStatement */:
+                case 234 /* LabeledStatement */:
                     return transformAndEmitLabeledStatement(node);
-                case 234 /* ThrowStatement */:
+                case 235 /* ThrowStatement */:
                     return transformAndEmitThrowStatement(node);
-                case 235 /* TryStatement */:
+                case 236 /* TryStatement */:
                     return transformAndEmitTryStatement(node);
                 default:
                     return emitStatement(ts.visitNode(node, visitor, ts.isStatement));
@@ -76666,7 +79071,7 @@ var ts;
                 for (var i = 0; i < numClauses; i++) {
                     var clause = caseBlock.clauses[i];
                     clauseLabels.push(defineLabel());
-                    if (clause.kind === 272 /* DefaultClause */ && defaultClauseIndex === -1) {
+                    if (clause.kind === 273 /* DefaultClause */ && defaultClauseIndex === -1) {
                         defaultClauseIndex = i;
                     }
                 }
@@ -76679,7 +79084,7 @@ var ts;
                     var defaultClausesSkipped = 0;
                     for (var i = clausesWritten; i < numClauses; i++) {
                         var clause = caseBlock.clauses[i];
-                        if (clause.kind === 271 /* CaseClause */) {
+                        if (clause.kind === 272 /* CaseClause */) {
                             if (containsYield(clause.expression) && pendingClauses.length > 0) {
                                 break;
                             }
@@ -76841,10 +79246,10 @@ var ts;
                     if (declaration) {
                         var name = renamedCatchVariableDeclarations[ts.getOriginalNodeId(declaration)];
                         if (name) {
-                            var clone_7 = ts.getMutableClone(name);
-                            ts.setSourceMapRange(clone_7, node);
-                            ts.setCommentRange(clone_7, node);
-                            return clone_7;
+                            var clone_8 = ts.getMutableClone(name);
+                            ts.setSourceMapRange(clone_8, node);
+                            ts.setCommentRange(clone_8, node);
+                            return clone_8;
                         }
                     }
                 }
@@ -76991,7 +79396,7 @@ var ts;
                 if (!renamedCatchVariables) {
                     renamedCatchVariables = ts.createMap();
                     renamedCatchVariableDeclarations = [];
-                    context.enableSubstitution(72 /* Identifier */);
+                    context.enableSubstitution(73 /* Identifier */);
                 }
                 renamedCatchVariables.set(text, true);
                 renamedCatchVariableDeclarations[ts.getOriginalNodeId(variable)] = name;
@@ -77907,12 +80312,12 @@ var ts;
         var previousOnEmitNode = context.onEmitNode;
         context.onSubstituteNode = onSubstituteNode;
         context.onEmitNode = onEmitNode;
-        context.enableSubstitution(72 /* Identifier */); // Substitutes expression identifiers with imported/exported symbols.
-        context.enableSubstitution(204 /* BinaryExpression */); // Substitutes assignments to exported symbols.
-        context.enableSubstitution(202 /* PrefixUnaryExpression */); // Substitutes updates to exported symbols.
-        context.enableSubstitution(203 /* PostfixUnaryExpression */); // Substitutes updates to exported symbols.
-        context.enableSubstitution(276 /* ShorthandPropertyAssignment */); // Substitutes shorthand property assignments for imported/exported symbols.
-        context.enableEmitNotification(284 /* SourceFile */); // Restore state when substituting nodes in a file.
+        context.enableSubstitution(73 /* Identifier */); // Substitutes expression identifiers with imported/exported symbols.
+        context.enableSubstitution(205 /* BinaryExpression */); // Substitutes assignments to exported symbols.
+        context.enableSubstitution(203 /* PrefixUnaryExpression */); // Substitutes updates to exported symbols.
+        context.enableSubstitution(204 /* PostfixUnaryExpression */); // Substitutes updates to exported symbols.
+        context.enableSubstitution(277 /* ShorthandPropertyAssignment */); // Substitutes shorthand property assignments for imported/exported symbols.
+        context.enableEmitNotification(285 /* SourceFile */); // Restore state when substituting nodes in a file.
         var moduleInfoMap = []; // The ExternalModuleInfo for each file.
         var deferredExports = []; // Exports to defer until an EndOfDeclarationMarker is found.
         var currentSourceFile; // The current file.
@@ -78240,23 +80645,23 @@ var ts;
          */
         function sourceElementVisitor(node) {
             switch (node.kind) {
-                case 249 /* ImportDeclaration */:
+                case 250 /* ImportDeclaration */:
                     return visitImportDeclaration(node);
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return visitImportEqualsDeclaration(node);
-                case 255 /* ExportDeclaration */:
+                case 256 /* ExportDeclaration */:
                     return visitExportDeclaration(node);
-                case 254 /* ExportAssignment */:
+                case 255 /* ExportAssignment */:
                     return visitExportAssignment(node);
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     return visitVariableStatement(node);
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     return visitFunctionDeclaration(node);
-                case 240 /* ClassDeclaration */:
+                case 241 /* ClassDeclaration */:
                     return visitClassDeclaration(node);
-                case 315 /* MergeDeclarationMarker */:
+                case 317 /* MergeDeclarationMarker */:
                     return visitMergeDeclarationMarker(node);
-                case 316 /* EndOfDeclarationMarker */:
+                case 318 /* EndOfDeclarationMarker */:
                     return visitEndOfDeclarationMarker(node);
                 default:
                     return ts.visitEachChild(node, moduleExpressionElementVisitor, context);
@@ -78283,24 +80688,24 @@ var ts;
                 for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
                     var elem = _a[_i];
                     switch (elem.kind) {
-                        case 275 /* PropertyAssignment */:
+                        case 276 /* PropertyAssignment */:
                             if (destructuringNeedsFlattening(elem.initializer)) {
                                 return true;
                             }
                             break;
-                        case 276 /* ShorthandPropertyAssignment */:
+                        case 277 /* ShorthandPropertyAssignment */:
                             if (destructuringNeedsFlattening(elem.name)) {
                                 return true;
                             }
                             break;
-                        case 277 /* SpreadAssignment */:
+                        case 278 /* SpreadAssignment */:
                             if (destructuringNeedsFlattening(elem.expression)) {
                                 return true;
                             }
                             break;
-                        case 156 /* MethodDeclaration */:
-                        case 158 /* GetAccessor */:
-                        case 159 /* SetAccessor */:
+                        case 157 /* MethodDeclaration */:
+                        case 159 /* GetAccessor */:
+                        case 160 /* SetAccessor */:
                             return false;
                         default: ts.Debug.assertNever(elem, "Unhandled object member kind");
                     }
@@ -78778,7 +81183,7 @@ var ts;
             //
             // To balance the declaration, add the exports of the elided variable
             // statement.
-            if (hasAssociatedEndOfDeclarationMarker(node) && node.original.kind === 219 /* VariableStatement */) {
+            if (hasAssociatedEndOfDeclarationMarker(node) && node.original.kind === 220 /* VariableStatement */) {
                 var id = ts.getOriginalNodeId(node);
                 deferredExports[id] = appendExportsOfVariableStatement(deferredExports[id], node.original);
             }
@@ -78833,10 +81238,10 @@ var ts;
             var namedBindings = importClause.namedBindings;
             if (namedBindings) {
                 switch (namedBindings.kind) {
-                    case 251 /* NamespaceImport */:
+                    case 252 /* NamespaceImport */:
                         statements = appendExportsOfDeclaration(statements, namedBindings);
                         break;
-                    case 252 /* NamedImports */:
+                    case 253 /* NamedImports */:
                         for (var _i = 0, _a = namedBindings.elements; _i < _a.length; _i++) {
                             var importBinding = _a[_i];
                             statements = appendExportsOfDeclaration(statements, importBinding);
@@ -79018,8 +81423,8 @@ var ts;
         function modifierVisitor(node) {
             // Elide module-specific modifiers.
             switch (node.kind) {
-                case 85 /* ExportKeyword */:
-                case 80 /* DefaultKeyword */:
+                case 86 /* ExportKeyword */:
+                case 81 /* DefaultKeyword */:
                     return undefined;
             }
             return node;
@@ -79035,7 +81440,7 @@ var ts;
          * @param emit A callback used to emit the node in the printer.
          */
         function onEmitNode(hint, node, emitCallback) {
-            if (node.kind === 284 /* SourceFile */) {
+            if (node.kind === 285 /* SourceFile */) {
                 currentSourceFile = node;
                 currentModuleInfo = moduleInfoMap[ts.getOriginalNodeId(currentSourceFile)];
                 noSubstitution = [];
@@ -79097,12 +81502,12 @@ var ts;
          */
         function substituteExpression(node) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return substituteExpressionIdentifier(node);
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return substituteBinaryExpression(node);
-                case 203 /* PostfixUnaryExpression */:
-                case 202 /* PrefixUnaryExpression */:
+                case 204 /* PostfixUnaryExpression */:
+                case 203 /* PrefixUnaryExpression */:
                     return substituteUnaryExpression(node);
             }
             return node;
@@ -79123,7 +81528,7 @@ var ts;
             }
             if (!ts.isGeneratedIdentifier(node) && !ts.isLocalName(node)) {
                 var exportContainer = resolver.getReferencedExportContainer(node, ts.isExportName(node));
-                if (exportContainer && exportContainer.kind === 284 /* SourceFile */) {
+                if (exportContainer && exportContainer.kind === 285 /* SourceFile */) {
                     return ts.setTextRange(ts.createPropertyAccess(ts.createIdentifier("exports"), ts.getSynthesizedClone(node)), 
                     /*location*/ node);
                 }
@@ -79198,8 +81603,8 @@ var ts;
                 && !ts.isDeclarationNameOfEnumOrNamespace(node.operand)) {
                 var exportedNames = getExports(node.operand);
                 if (exportedNames) {
-                    var expression = node.kind === 203 /* PostfixUnaryExpression */
-                        ? ts.setTextRange(ts.createBinary(node.operand, ts.createToken(node.operator === 44 /* PlusPlusToken */ ? 60 /* PlusEqualsToken */ : 61 /* MinusEqualsToken */), ts.createLiteral(1)), 
+                    var expression = node.kind === 204 /* PostfixUnaryExpression */
+                        ? ts.setTextRange(ts.createBinary(node.operand, ts.createToken(node.operator === 44 /* PlusPlusToken */ ? 61 /* PlusEqualsToken */ : 62 /* MinusEqualsToken */), ts.createLiteral(1)), 
                         /*location*/ node)
                         : node;
                     for (var _i = 0, exportedNames_3 = exportedNames; _i < exportedNames_3.length; _i++) {
@@ -79273,12 +81678,12 @@ var ts;
         var previousOnEmitNode = context.onEmitNode;
         context.onSubstituteNode = onSubstituteNode;
         context.onEmitNode = onEmitNode;
-        context.enableSubstitution(72 /* Identifier */); // Substitutes expression identifiers for imported symbols.
-        context.enableSubstitution(276 /* ShorthandPropertyAssignment */); // Substitutes expression identifiers for imported symbols
-        context.enableSubstitution(204 /* BinaryExpression */); // Substitutes assignments to exported symbols.
-        context.enableSubstitution(202 /* PrefixUnaryExpression */); // Substitutes updates to exported symbols.
-        context.enableSubstitution(203 /* PostfixUnaryExpression */); // Substitutes updates to exported symbols.
-        context.enableEmitNotification(284 /* SourceFile */); // Restore state when substituting nodes in a file.
+        context.enableSubstitution(73 /* Identifier */); // Substitutes expression identifiers for imported symbols.
+        context.enableSubstitution(277 /* ShorthandPropertyAssignment */); // Substitutes expression identifiers for imported symbols
+        context.enableSubstitution(205 /* BinaryExpression */); // Substitutes assignments to exported symbols.
+        context.enableSubstitution(203 /* PrefixUnaryExpression */); // Substitutes updates to exported symbols.
+        context.enableSubstitution(204 /* PostfixUnaryExpression */); // Substitutes updates to exported symbols.
+        context.enableEmitNotification(285 /* SourceFile */); // Restore state when substituting nodes in a file.
         var moduleInfoMap = []; // The ExternalModuleInfo for each file.
         var deferredExports = []; // Exports to defer until an EndOfDeclarationMarker is found.
         var exportFunctionsMap = []; // The export function associated with a source file.
@@ -79499,7 +81904,7 @@ var ts;
                 var hasExportDeclarationWithExportClause = false;
                 for (var _i = 0, _a = moduleInfo.externalImports; _i < _a.length; _i++) {
                     var externalImport = _a[_i];
-                    if (externalImport.kind === 255 /* ExportDeclaration */ && externalImport.exportClause) {
+                    if (externalImport.kind === 256 /* ExportDeclaration */ && externalImport.exportClause) {
                         hasExportDeclarationWithExportClause = true;
                         break;
                     }
@@ -79524,7 +81929,7 @@ var ts;
             }
             for (var _d = 0, _e = moduleInfo.externalImports; _d < _e.length; _d++) {
                 var externalImport = _e[_d];
-                if (externalImport.kind !== 255 /* ExportDeclaration */) {
+                if (externalImport.kind !== 256 /* ExportDeclaration */) {
                     continue;
                 }
                 if (!externalImport.exportClause) {
@@ -79602,19 +82007,19 @@ var ts;
                     var entry = _b[_a];
                     var importVariableName = ts.getLocalNameForExternalImport(entry, currentSourceFile); // TODO: GH#18217
                     switch (entry.kind) {
-                        case 249 /* ImportDeclaration */:
+                        case 250 /* ImportDeclaration */:
                             if (!entry.importClause) {
                                 // 'import "..."' case
                                 // module is imported only for side-effects, no emit required
                                 break;
                             }
                         // falls through
-                        case 248 /* ImportEqualsDeclaration */:
+                        case 249 /* ImportEqualsDeclaration */:
                             ts.Debug.assert(importVariableName !== undefined);
                             // save import into the local
                             statements.push(ts.createExpressionStatement(ts.createAssignment(importVariableName, parameterName)));
                             break;
-                        case 255 /* ExportDeclaration */:
+                        case 256 /* ExportDeclaration */:
                             ts.Debug.assert(importVariableName !== undefined);
                             if (entry.exportClause) {
                                 //  export {a, b as c} from 'foo'
@@ -79664,15 +82069,15 @@ var ts;
          */
         function sourceElementVisitor(node) {
             switch (node.kind) {
-                case 249 /* ImportDeclaration */:
+                case 250 /* ImportDeclaration */:
                     return visitImportDeclaration(node);
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return visitImportEqualsDeclaration(node);
-                case 255 /* ExportDeclaration */:
+                case 256 /* ExportDeclaration */:
                     // ExportDeclarations are elided as they are handled via
                     // `appendExportsOfDeclaration`.
                     return undefined;
-                case 254 /* ExportAssignment */:
+                case 255 /* ExportAssignment */:
                     return visitExportAssignment(node);
                 default:
                     return nestedElementVisitor(node);
@@ -79848,7 +82253,7 @@ var ts;
         function shouldHoistVariableDeclarationList(node) {
             // hoist only non-block scoped declarations or block scoped declarations parented by source file
             return (ts.getEmitFlags(node) & 2097152 /* NoHoisting */) === 0
-                && (enclosingBlockScopedContainer.kind === 284 /* SourceFile */
+                && (enclosingBlockScopedContainer.kind === 285 /* SourceFile */
                     || (ts.getOriginalNode(node).flags & 3 /* BlockScoped */) === 0);
         }
         /**
@@ -79912,7 +82317,7 @@ var ts;
             //
             // To balance the declaration, we defer the exports of the elided variable
             // statement until we visit this declaration's `EndOfDeclarationMarker`.
-            if (hasAssociatedEndOfDeclarationMarker(node) && node.original.kind === 219 /* VariableStatement */) {
+            if (hasAssociatedEndOfDeclarationMarker(node) && node.original.kind === 220 /* VariableStatement */) {
                 var id = ts.getOriginalNodeId(node);
                 var isExportedDeclaration = ts.hasModifier(node.original, 1 /* Export */);
                 deferredExports[id] = appendExportsOfVariableStatement(deferredExports[id], node.original, isExportedDeclaration);
@@ -79974,10 +82379,10 @@ var ts;
             var namedBindings = importClause.namedBindings;
             if (namedBindings) {
                 switch (namedBindings.kind) {
-                    case 251 /* NamespaceImport */:
+                    case 252 /* NamespaceImport */:
                         statements = appendExportsOfDeclaration(statements, namedBindings);
                         break;
-                    case 252 /* NamedImports */:
+                    case 253 /* NamedImports */:
                         for (var _i = 0, _a = namedBindings.elements; _i < _a.length; _i++) {
                             var importBinding = _a[_i];
                             statements = appendExportsOfDeclaration(statements, importBinding);
@@ -80157,43 +82562,43 @@ var ts;
          */
         function nestedElementVisitor(node) {
             switch (node.kind) {
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     return visitVariableStatement(node);
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     return visitFunctionDeclaration(node);
-                case 240 /* ClassDeclaration */:
+                case 241 /* ClassDeclaration */:
                     return visitClassDeclaration(node);
-                case 225 /* ForStatement */:
+                case 226 /* ForStatement */:
                     return visitForStatement(node);
-                case 226 /* ForInStatement */:
+                case 227 /* ForInStatement */:
                     return visitForInStatement(node);
-                case 227 /* ForOfStatement */:
+                case 228 /* ForOfStatement */:
                     return visitForOfStatement(node);
-                case 223 /* DoStatement */:
+                case 224 /* DoStatement */:
                     return visitDoStatement(node);
-                case 224 /* WhileStatement */:
+                case 225 /* WhileStatement */:
                     return visitWhileStatement(node);
-                case 233 /* LabeledStatement */:
+                case 234 /* LabeledStatement */:
                     return visitLabeledStatement(node);
-                case 231 /* WithStatement */:
+                case 232 /* WithStatement */:
                     return visitWithStatement(node);
-                case 232 /* SwitchStatement */:
+                case 233 /* SwitchStatement */:
                     return visitSwitchStatement(node);
-                case 246 /* CaseBlock */:
+                case 247 /* CaseBlock */:
                     return visitCaseBlock(node);
-                case 271 /* CaseClause */:
+                case 272 /* CaseClause */:
                     return visitCaseClause(node);
-                case 272 /* DefaultClause */:
+                case 273 /* DefaultClause */:
                     return visitDefaultClause(node);
-                case 235 /* TryStatement */:
+                case 236 /* TryStatement */:
                     return visitTryStatement(node);
-                case 274 /* CatchClause */:
+                case 275 /* CatchClause */:
                     return visitCatchClause(node);
-                case 218 /* Block */:
+                case 219 /* Block */:
                     return visitBlock(node);
-                case 315 /* MergeDeclarationMarker */:
+                case 317 /* MergeDeclarationMarker */:
                     return visitMergeDeclarationMarker(node);
-                case 316 /* EndOfDeclarationMarker */:
+                case 318 /* EndOfDeclarationMarker */:
                     return visitEndOfDeclarationMarker(node);
                 default:
                     return destructuringAndImportCallVisitor(node);
@@ -80440,7 +82845,7 @@ var ts;
             }
             else if (ts.isIdentifier(node)) {
                 var container = resolver.getReferencedExportContainer(node);
-                return container !== undefined && container.kind === 284 /* SourceFile */;
+                return container !== undefined && container.kind === 285 /* SourceFile */;
             }
             else {
                 return false;
@@ -80456,8 +82861,8 @@ var ts;
          */
         function modifierVisitor(node) {
             switch (node.kind) {
-                case 85 /* ExportKeyword */:
-                case 80 /* DefaultKeyword */:
+                case 86 /* ExportKeyword */:
+                case 81 /* DefaultKeyword */:
                     return undefined;
             }
             return node;
@@ -80473,7 +82878,7 @@ var ts;
          * @param emitCallback A callback used to emit the node in the printer.
          */
         function onEmitNode(hint, node, emitCallback) {
-            if (node.kind === 284 /* SourceFile */) {
+            if (node.kind === 285 /* SourceFile */) {
                 var id = ts.getOriginalNodeId(node);
                 currentSourceFile = node;
                 moduleInfo = moduleInfoMap[id];
@@ -80521,7 +82926,7 @@ var ts;
          */
         function substituteUnspecified(node) {
             switch (node.kind) {
-                case 276 /* ShorthandPropertyAssignment */:
+                case 277 /* ShorthandPropertyAssignment */:
                     return substituteShorthandPropertyAssignment(node);
             }
             return node;
@@ -80555,12 +82960,12 @@ var ts;
          */
         function substituteExpression(node) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return substituteExpressionIdentifier(node);
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return substituteBinaryExpression(node);
-                case 202 /* PrefixUnaryExpression */:
-                case 203 /* PostfixUnaryExpression */:
+                case 203 /* PrefixUnaryExpression */:
+                case 204 /* PostfixUnaryExpression */:
                     return substituteUnaryExpression(node);
             }
             return node;
@@ -80653,14 +83058,14 @@ var ts;
                 && !ts.isDeclarationNameOfEnumOrNamespace(node.operand)) {
                 var exportedNames = getExports(node.operand);
                 if (exportedNames) {
-                    var expression = node.kind === 203 /* PostfixUnaryExpression */
+                    var expression = node.kind === 204 /* PostfixUnaryExpression */
                         ? ts.setTextRange(ts.createPrefix(node.operator, node.operand), node)
                         : node;
                     for (var _i = 0, exportedNames_5 = exportedNames; _i < exportedNames_5.length; _i++) {
                         var exportName = exportedNames_5[_i];
                         expression = createExportExpression(exportName, preventSubstitution(expression));
                     }
-                    if (node.kind === 203 /* PostfixUnaryExpression */) {
+                    if (node.kind === 204 /* PostfixUnaryExpression */) {
                         expression = node.operator === 44 /* PlusPlusToken */
                             ? ts.createSubtract(preventSubstitution(expression), ts.createLiteral(1))
                             : ts.createAdd(preventSubstitution(expression), ts.createLiteral(1));
@@ -80682,7 +83087,7 @@ var ts;
                     || resolver.getReferencedValueDeclaration(name);
                 if (valueDeclaration) {
                     var exportContainer = resolver.getReferencedExportContainer(name, /*prefixLocals*/ false);
-                    if (exportContainer && exportContainer.kind === 284 /* SourceFile */) {
+                    if (exportContainer && exportContainer.kind === 285 /* SourceFile */) {
                         exportedNames = ts.append(exportedNames, ts.getDeclarationName(valueDeclaration));
                     }
                     exportedNames = ts.addRange(exportedNames, moduleInfo && moduleInfo.exportedBindings[ts.getOriginalNodeId(valueDeclaration)]);
@@ -80721,8 +83126,8 @@ var ts;
         var previousOnSubstituteNode = context.onSubstituteNode;
         context.onEmitNode = onEmitNode;
         context.onSubstituteNode = onSubstituteNode;
-        context.enableEmitNotification(284 /* SourceFile */);
-        context.enableSubstitution(72 /* Identifier */);
+        context.enableEmitNotification(285 /* SourceFile */);
+        context.enableSubstitution(73 /* Identifier */);
         var currentSourceFile;
         return ts.chainBundle(transformSourceFile);
         function transformSourceFile(node) {
@@ -80750,10 +83155,10 @@ var ts;
         }
         function visitor(node) {
             switch (node.kind) {
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     // Elide `import=` as it is not legal with --module ES6
                     return undefined;
-                case 254 /* ExportAssignment */:
+                case 255 /* ExportAssignment */:
                     return visitExportAssignment(node);
             }
             return node;
@@ -80861,7 +83266,7 @@ var ts;
                         ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 :
                     ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_private_name_1;
             }
-            else if (node.parent.kind === 240 /* ClassDeclaration */) {
+            else if (node.parent.kind === 241 /* ClassDeclaration */) {
                 return symbolAccessibilityResult.errorModuleName ?
                     symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                         ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
@@ -80890,7 +83295,7 @@ var ts;
                         ts.Diagnostics.Public_static_method_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 :
                     ts.Diagnostics.Public_static_method_0_of_exported_class_has_or_is_using_private_name_1;
             }
-            else if (node.parent.kind === 240 /* ClassDeclaration */) {
+            else if (node.parent.kind === 241 /* ClassDeclaration */) {
                 return symbolAccessibilityResult.errorModuleName ?
                     symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                         ts.Diagnostics.Public_method_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
@@ -80937,7 +83342,7 @@ var ts;
             return ts.Debug.assertNever(node, "Attempted to set a declaration diagnostic context for unhandled node kind: " + ts.SyntaxKind[node.kind]);
         }
         function getVariableDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult) {
-            if (node.kind === 237 /* VariableDeclaration */ || node.kind === 186 /* BindingElement */) {
+            if (node.kind === 238 /* VariableDeclaration */ || node.kind === 187 /* BindingElement */) {
                 return symbolAccessibilityResult.errorModuleName ?
                     symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                         ts.Diagnostics.Exported_variable_0_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
@@ -80946,8 +83351,8 @@ var ts;
             }
             // This check is to ensure we don't report error on constructor parameter property as that error would be reported during parameter emit
             // The only exception here is if the constructor was marked as private. we are not emitting the constructor parameters at all.
-            else if (node.kind === 154 /* PropertyDeclaration */ || node.kind === 189 /* PropertyAccessExpression */ || node.kind === 153 /* PropertySignature */ ||
-                (node.kind === 151 /* Parameter */ && ts.hasModifier(node.parent, 8 /* Private */))) {
+            else if (node.kind === 155 /* PropertyDeclaration */ || node.kind === 190 /* PropertyAccessExpression */ || node.kind === 154 /* PropertySignature */ ||
+                (node.kind === 152 /* Parameter */ && ts.hasModifier(node.parent, 8 /* Private */))) {
                 // TODO(jfreeman): Deal with computed properties in error reporting.
                 if (ts.hasModifier(node, 32 /* Static */)) {
                     return symbolAccessibilityResult.errorModuleName ?
@@ -80956,7 +83361,7 @@ var ts;
                             ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 :
                         ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_private_name_1;
                 }
-                else if (node.parent.kind === 240 /* ClassDeclaration */ || node.kind === 151 /* Parameter */) {
+                else if (node.parent.kind === 241 /* ClassDeclaration */ || node.kind === 152 /* Parameter */) {
                     return symbolAccessibilityResult.errorModuleName ?
                         symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                             ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
@@ -80981,7 +83386,7 @@ var ts;
         }
         function getAccessorDeclarationTypeVisibilityError(symbolAccessibilityResult) {
             var diagnosticMessage;
-            if (node.kind === 159 /* SetAccessor */) {
+            if (node.kind === 160 /* SetAccessor */) {
                 // Getters can infer the return type from the returned expression, but setters cannot, so the
                 // "_from_external_module_1_but_cannot_be_named" case cannot occur.
                 if (ts.hasModifier(node, 32 /* Static */)) {
@@ -81020,26 +83425,26 @@ var ts;
         function getReturnTypeVisibilityError(symbolAccessibilityResult) {
             var diagnosticMessage;
             switch (node.kind) {
-                case 161 /* ConstructSignature */:
+                case 162 /* ConstructSignature */:
                     // Interfaces cannot have return types that cannot be named
                     diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                         ts.Diagnostics.Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 :
                         ts.Diagnostics.Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_0;
                     break;
-                case 160 /* CallSignature */:
+                case 161 /* CallSignature */:
                     // Interfaces cannot have return types that cannot be named
                     diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                         ts.Diagnostics.Return_type_of_call_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 :
                         ts.Diagnostics.Return_type_of_call_signature_from_exported_interface_has_or_is_using_private_name_0;
                     break;
-                case 162 /* IndexSignature */:
+                case 163 /* IndexSignature */:
                     // Interfaces cannot have return types that cannot be named
                     diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                         ts.Diagnostics.Return_type_of_index_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 :
                         ts.Diagnostics.Return_type_of_index_signature_from_exported_interface_has_or_is_using_private_name_0;
                     break;
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
                     if (ts.hasModifier(node, 32 /* Static */)) {
                         diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                             symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
@@ -81047,7 +83452,7 @@ var ts;
                                 ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_private_module_1 :
                             ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_private_name_0;
                     }
-                    else if (node.parent.kind === 240 /* ClassDeclaration */) {
+                    else if (node.parent.kind === 241 /* ClassDeclaration */) {
                         diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                             symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                                 ts.Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named :
@@ -81061,7 +83466,7 @@ var ts;
                             ts.Diagnostics.Return_type_of_method_from_exported_interface_has_or_is_using_private_name_0;
                     }
                     break;
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                         symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                             ts.Diagnostics.Return_type_of_exported_function_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named :
@@ -81086,30 +83491,30 @@ var ts;
         }
         function getParameterDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult) {
             switch (node.parent.kind) {
-                case 157 /* Constructor */:
+                case 158 /* Constructor */:
                     return symbolAccessibilityResult.errorModuleName ?
                         symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                             ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
                             ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
                         ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_private_name_1;
-                case 161 /* ConstructSignature */:
-                case 166 /* ConstructorType */:
+                case 162 /* ConstructSignature */:
+                case 167 /* ConstructorType */:
                     // Interfaces cannot have parameter types that cannot be named
                     return symbolAccessibilityResult.errorModuleName ?
                         ts.Diagnostics.Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 :
                         ts.Diagnostics.Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1;
-                case 160 /* CallSignature */:
+                case 161 /* CallSignature */:
                     // Interfaces cannot have parameter types that cannot be named
                     return symbolAccessibilityResult.errorModuleName ?
                         ts.Diagnostics.Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 :
                         ts.Diagnostics.Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1;
-                case 162 /* IndexSignature */:
+                case 163 /* IndexSignature */:
                     // Interfaces cannot have parameter types that cannot be named
                     return symbolAccessibilityResult.errorModuleName ?
                         ts.Diagnostics.Parameter_0_of_index_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 :
                         ts.Diagnostics.Parameter_0_of_index_signature_from_exported_interface_has_or_is_using_private_name_1;
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
                     if (ts.hasModifier(node.parent, 32 /* Static */)) {
                         return symbolAccessibilityResult.errorModuleName ?
                             symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
@@ -81117,7 +83522,7 @@ var ts;
                                 ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
                             ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1;
                     }
-                    else if (node.parent.parent.kind === 240 /* ClassDeclaration */) {
+                    else if (node.parent.parent.kind === 241 /* ClassDeclaration */) {
                         return symbolAccessibilityResult.errorModuleName ?
                             symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                                 ts.Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
@@ -81130,8 +83535,8 @@ var ts;
                             ts.Diagnostics.Parameter_0_of_method_from_exported_interface_has_or_is_using_name_1_from_private_module_2 :
                             ts.Diagnostics.Parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1;
                     }
-                case 239 /* FunctionDeclaration */:
-                case 165 /* FunctionType */:
+                case 240 /* FunctionDeclaration */:
+                case 166 /* FunctionType */:
                     return symbolAccessibilityResult.errorModuleName ?
                         symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                             ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
@@ -81145,39 +83550,39 @@ var ts;
             // Type parameter constraints are named by user so we should always be able to name it
             var diagnosticMessage;
             switch (node.parent.kind) {
-                case 240 /* ClassDeclaration */:
+                case 241 /* ClassDeclaration */:
                     diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_class_has_or_is_using_private_name_1;
                     break;
-                case 241 /* InterfaceDeclaration */:
+                case 242 /* InterfaceDeclaration */:
                     diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1;
                     break;
-                case 181 /* MappedType */:
+                case 182 /* MappedType */:
                     diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_mapped_object_type_is_using_private_name_1;
                     break;
-                case 166 /* ConstructorType */:
-                case 161 /* ConstructSignature */:
+                case 167 /* ConstructorType */:
+                case 162 /* ConstructSignature */:
                     diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1;
                     break;
-                case 160 /* CallSignature */:
+                case 161 /* CallSignature */:
                     diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1;
                     break;
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
                     if (ts.hasModifier(node.parent, 32 /* Static */)) {
                         diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1;
                     }
-                    else if (node.parent.parent.kind === 240 /* ClassDeclaration */) {
+                    else if (node.parent.parent.kind === 241 /* ClassDeclaration */) {
                         diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1;
                     }
                     else {
                         diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1;
                     }
                     break;
-                case 165 /* FunctionType */:
-                case 239 /* FunctionDeclaration */:
+                case 166 /* FunctionType */:
+                case 240 /* FunctionDeclaration */:
                     diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_function_has_or_is_using_private_name_1;
                     break;
-                case 242 /* TypeAliasDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
                     diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_type_alias_has_or_is_using_private_name_1;
                     break;
                 default:
@@ -81192,9 +83597,9 @@ var ts;
         function getHeritageClauseVisibilityError() {
             var diagnosticMessage;
             // Heritage clause is written by user so it can always be named
-            if (node.parent.parent.kind === 240 /* ClassDeclaration */) {
+            if (node.parent.parent.kind === 241 /* ClassDeclaration */) {
                 // Class or Interface implemented/extended is inaccessible
-                diagnosticMessage = ts.isHeritageClause(node.parent) && node.parent.token === 109 /* ImplementsKeyword */ ?
+                diagnosticMessage = ts.isHeritageClause(node.parent) && node.parent.token === 110 /* ImplementsKeyword */ ?
                     ts.Diagnostics.Implements_clause_of_exported_class_0_has_or_is_using_private_name_1 :
                     ts.Diagnostics.extends_clause_of_exported_class_0_has_or_is_using_private_name_1;
             }
@@ -81237,12 +83642,28 @@ var ts;
         return result.diagnostics;
     }
     ts.getDeclarationDiagnostics = getDeclarationDiagnostics;
+    function hasInternalAnnotation(range, currentSourceFile) {
+        var comment = currentSourceFile.text.substring(range.pos, range.end);
+        return ts.stringContains(comment, "@internal");
+    }
     function isInternalDeclaration(node, currentSourceFile) {
         var parseTreeNode = ts.getParseTreeNode(node);
+        if (parseTreeNode && parseTreeNode.kind === 152 /* Parameter */) {
+            var paramIdx = parseTreeNode.parent.parameters.indexOf(parseTreeNode);
+            var previousSibling = paramIdx > 0 ? parseTreeNode.parent.parameters[paramIdx - 1] : undefined;
+            var text = currentSourceFile.text;
+            var commentRanges = previousSibling
+                ? ts.concatenate(
+                // to handle
+                // ... parameters, /* @internal */
+                // public param: string
+                ts.getTrailingCommentRanges(text, ts.skipTrivia(text, previousSibling.end + 1, /* stopAfterLineBreak */ false, /* stopAtComments */ true)), ts.getLeadingCommentRanges(text, node.pos))
+                : ts.getTrailingCommentRanges(text, ts.skipTrivia(text, node.pos, /* stopAfterLineBreak */ false, /* stopAtComments */ true));
+            return commentRanges && commentRanges.length && hasInternalAnnotation(ts.last(commentRanges), currentSourceFile);
+        }
         var leadingCommentRanges = parseTreeNode && ts.getLeadingCommentRangesOfNode(parseTreeNode, currentSourceFile);
         return !!ts.forEach(leadingCommentRanges, function (range) {
-            var comment = currentSourceFile.text.substring(range.pos, range.end);
-            return ts.stringContains(comment, "@internal");
+            return hasInternalAnnotation(range, currentSourceFile);
         });
     }
     ts.isInternalDeclaration = isInternalDeclaration;
@@ -81373,11 +83794,14 @@ var ts;
                 context.addDiagnostic(ts.createDiagnosticForNode(errorNameNode, ts.Diagnostics.The_inferred_type_of_0_cannot_be_named_without_a_reference_to_1_This_is_likely_not_portable_A_type_annotation_is_necessary, ts.declarationNameToString(errorNameNode), specifier));
             }
         }
+        function createEmptyExports() {
+            return ts.createExportDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, ts.createNamedExports([]), /*moduleSpecifier*/ undefined);
+        }
         function transformRoot(node) {
-            if (node.kind === 284 /* SourceFile */ && (node.isDeclarationFile || ts.isSourceFileJS(node))) {
+            if (node.kind === 285 /* SourceFile */ && (node.isDeclarationFile || ts.isSourceFileJS(node))) {
                 return node;
             }
-            if (node.kind === 285 /* Bundle */) {
+            if (node.kind === 286 /* Bundle */) {
                 isBundledEmit = true;
                 refs = ts.createMap();
                 libs = ts.createMap();
@@ -81400,14 +83824,14 @@ var ts;
                         resultHasExternalModuleIndicator = false; // unused in external module bundle emit (all external modules are within module blocks, therefore are known to be modules)
                         needsDeclare = false;
                         var statements_4 = ts.visitNodes(sourceFile.statements, visitDeclarationStatements);
-                        var newFile = ts.updateSourceFileNode(sourceFile, [ts.createModuleDeclaration([], [ts.createModifier(125 /* DeclareKeyword */)], ts.createLiteral(ts.getResolvedExternalModuleName(context.getEmitHost(), sourceFile)), ts.createModuleBlock(ts.setTextRange(ts.createNodeArray(transformAndReplaceLatePaintedStatements(statements_4)), sourceFile.statements)))], /*isDeclarationFile*/ true, /*referencedFiles*/ [], /*typeReferences*/ [], /*hasNoDefaultLib*/ false, /*libReferences*/ []);
+                        var newFile = ts.updateSourceFileNode(sourceFile, [ts.createModuleDeclaration([], [ts.createModifier(126 /* DeclareKeyword */)], ts.createLiteral(ts.getResolvedExternalModuleName(context.getEmitHost(), sourceFile)), ts.createModuleBlock(ts.setTextRange(ts.createNodeArray(transformAndReplaceLatePaintedStatements(statements_4)), sourceFile.statements)))], /*isDeclarationFile*/ true, /*referencedFiles*/ [], /*typeReferences*/ [], /*hasNoDefaultLib*/ false, /*libReferences*/ []);
                         return newFile;
                     }
                     needsDeclare = true;
                     var updated = ts.visitNodes(sourceFile.statements, visitDeclarationStatements);
                     return ts.updateSourceFileNode(sourceFile, transformAndReplaceLatePaintedStatements(updated), /*isDeclarationFile*/ true, /*referencedFiles*/ [], /*typeReferences*/ [], /*hasNoDefaultLib*/ false, /*libReferences*/ []);
                 }), ts.mapDefined(node.prepends, function (prepend) {
-                    if (prepend.kind === 287 /* InputFiles */) {
+                    if (prepend.kind === 288 /* InputFiles */) {
                         var sourceFile = ts.createUnparsedSourceFile(prepend, "dts", stripInternal);
                         hasNoDefaultLib_1 = hasNoDefaultLib_1 || !!sourceFile.hasNoDefaultLib;
                         collectReferences(sourceFile, refs);
@@ -81449,7 +83873,7 @@ var ts;
             refs.forEach(referenceVisitor);
             var emittedImports = ts.filter(combinedStatements, ts.isAnyImportSyntax);
             if (ts.isExternalModule(node) && (!resultHasExternalModuleIndicator || (needsScopeFixMarker && !resultHasScopeMarker))) {
-                combinedStatements = ts.setTextRange(ts.createNodeArray(combinedStatements.concat([ts.createExportDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, ts.createNamedExports([]), /*moduleSpecifier*/ undefined)])), combinedStatements);
+                combinedStatements = ts.setTextRange(ts.createNodeArray(combinedStatements.concat([createEmptyExports()])), combinedStatements);
             }
             var updated = ts.updateSourceFileNode(node, combinedStatements, /*isDeclarationFile*/ true, references, getFileReferencesForUsedTypeReferences(), node.hasNoDefaultLib, getLibReferences());
             updated.exportedModulesFromDeclarationEmit = exportedModulesFromDeclarationEmit;
@@ -81510,7 +83934,7 @@ var ts;
             if (noResolve || (!ts.isUnparsedSource(sourceFile) && ts.isSourceFileJS(sourceFile)))
                 return ret;
             ts.forEach(sourceFile.referencedFiles, function (f) {
-                var elem = ts.tryResolveScriptReference(host, sourceFile, f);
+                var elem = host.getSourceFileFromReference(sourceFile, f);
                 if (elem) {
                     ret.set("" + ts.getOriginalNodeId(elem), elem);
                 }
@@ -81527,11 +83951,11 @@ var ts;
             return ret;
         }
         function filterBindingPatternInitializers(name) {
-            if (name.kind === 72 /* Identifier */) {
+            if (name.kind === 73 /* Identifier */) {
                 return name;
             }
             else {
-                if (name.kind === 185 /* ArrayBindingPattern */) {
+                if (name.kind === 186 /* ArrayBindingPattern */) {
                     return ts.updateArrayBindingPattern(name, ts.visitNodes(name.elements, visitBindingElement));
                 }
                 else {
@@ -81539,7 +83963,7 @@ var ts;
                 }
             }
             function visitBindingElement(elem) {
-                if (elem.kind === 210 /* OmittedExpression */) {
+                if (elem.kind === 211 /* OmittedExpression */) {
                     return elem;
                 }
                 return ts.updateBindingElement(elem, elem.dotDotDotToken, elem.propertyName, filterBindingPatternInitializers(elem.name), shouldPrintWithInitializer(elem) ? elem.initializer : undefined);
@@ -81577,19 +84001,19 @@ var ts;
                 // Literal const declarations will have an initializer ensured rather than a type
                 return;
             }
-            var shouldUseResolverType = node.kind === 151 /* Parameter */ &&
+            var shouldUseResolverType = node.kind === 152 /* Parameter */ &&
                 (resolver.isRequiredInitializedParameter(node) ||
                     resolver.isOptionalUninitializedParameterProperty(node));
             if (type && !shouldUseResolverType) {
                 return ts.visitNode(type, visitDeclarationSubtree);
             }
             if (!ts.getParseTreeNode(node)) {
-                return type ? ts.visitNode(type, visitDeclarationSubtree) : ts.createKeywordTypeNode(120 /* AnyKeyword */);
+                return type ? ts.visitNode(type, visitDeclarationSubtree) : ts.createKeywordTypeNode(121 /* AnyKeyword */);
             }
-            if (node.kind === 159 /* SetAccessor */) {
+            if (node.kind === 160 /* SetAccessor */) {
                 // Set accessors with no associated type node (from it's param or get accessor return) are `any` since they are never contextually typed right now
                 // (The inferred type here will be void, but the old declaration emitter printed `any`, so this replicates that)
-                return ts.createKeywordTypeNode(120 /* AnyKeyword */);
+                return ts.createKeywordTypeNode(121 /* AnyKeyword */);
             }
             errorNameNode = node.name;
             var oldDiag;
@@ -81597,12 +84021,12 @@ var ts;
                 oldDiag = getSymbolAccessibilityDiagnostic;
                 getSymbolAccessibilityDiagnostic = ts.createGetSymbolAccessibilityDiagnosticForNode(node);
             }
-            if (node.kind === 237 /* VariableDeclaration */ || node.kind === 186 /* BindingElement */) {
+            if (node.kind === 238 /* VariableDeclaration */ || node.kind === 187 /* BindingElement */) {
                 return cleanup(resolver.createTypeOfDeclaration(node, enclosingDeclaration, declarationEmitNodeBuilderFlags, symbolTracker));
             }
-            if (node.kind === 151 /* Parameter */
-                || node.kind === 154 /* PropertyDeclaration */
-                || node.kind === 153 /* PropertySignature */) {
+            if (node.kind === 152 /* Parameter */
+                || node.kind === 155 /* PropertyDeclaration */
+                || node.kind === 154 /* PropertySignature */) {
                 if (!node.initializer)
                     return cleanup(resolver.createTypeOfDeclaration(node, enclosingDeclaration, declarationEmitNodeBuilderFlags, symbolTracker, shouldUseResolverType));
                 return cleanup(resolver.createTypeOfDeclaration(node, enclosingDeclaration, declarationEmitNodeBuilderFlags, symbolTracker, shouldUseResolverType) || resolver.createTypeOfExpression(node.initializer, enclosingDeclaration, declarationEmitNodeBuilderFlags, symbolTracker));
@@ -81613,26 +84037,26 @@ var ts;
                 if (!suppressNewDiagnosticContexts) {
                     getSymbolAccessibilityDiagnostic = oldDiag;
                 }
-                return returnValue || ts.createKeywordTypeNode(120 /* AnyKeyword */);
+                return returnValue || ts.createKeywordTypeNode(121 /* AnyKeyword */);
             }
         }
         function isDeclarationAndNotVisible(node) {
             node = ts.getParseTreeNode(node);
             switch (node.kind) {
-                case 239 /* FunctionDeclaration */:
-                case 244 /* ModuleDeclaration */:
-                case 241 /* InterfaceDeclaration */:
-                case 240 /* ClassDeclaration */:
-                case 242 /* TypeAliasDeclaration */:
-                case 243 /* EnumDeclaration */:
+                case 240 /* FunctionDeclaration */:
+                case 245 /* ModuleDeclaration */:
+                case 242 /* InterfaceDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
+                case 244 /* EnumDeclaration */:
                     return !resolver.isDeclarationVisible(node);
                 // The following should be doing their own visibility checks based on filtering their members
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     return !getBindingNameVisible(node);
-                case 248 /* ImportEqualsDeclaration */:
-                case 249 /* ImportDeclaration */:
-                case 255 /* ExportDeclaration */:
-                case 254 /* ExportAssignment */:
+                case 249 /* ImportEqualsDeclaration */:
+                case 250 /* ImportDeclaration */:
+                case 256 /* ExportDeclaration */:
+                case 255 /* ExportAssignment */:
                     return false;
             }
             return false;
@@ -81686,7 +84110,7 @@ var ts;
         function rewriteModuleSpecifier(parent, input) {
             if (!input)
                 return undefined; // TODO: GH#18217
-            resultHasExternalModuleIndicator = resultHasExternalModuleIndicator || (parent.kind !== 244 /* ModuleDeclaration */ && parent.kind !== 183 /* ImportType */);
+            resultHasExternalModuleIndicator = resultHasExternalModuleIndicator || (parent.kind !== 245 /* ModuleDeclaration */ && parent.kind !== 184 /* ImportType */);
             if (ts.isStringLiteralLike(input)) {
                 if (isBundledEmit) {
                     var newName = ts.getExternalModuleNameFromDeclaration(context.getEmitHost(), resolver, parent);
@@ -81706,7 +84130,7 @@ var ts;
         function transformImportEqualsDeclaration(decl) {
             if (!resolver.isDeclarationVisible(decl))
                 return;
-            if (decl.moduleReference.kind === 259 /* ExternalModuleReference */) {
+            if (decl.moduleReference.kind === 260 /* ExternalModuleReference */) {
                 // Rewrite external module names if necessary
                 var specifier = ts.getExternalModuleImportEqualsDeclarationExpression(decl);
                 return ts.updateImportEqualsDeclaration(decl, 
@@ -81733,7 +84157,7 @@ var ts;
                 return visibleDefaultBinding && ts.updateImportDeclaration(decl, /*decorators*/ undefined, decl.modifiers, ts.updateImportClause(decl.importClause, visibleDefaultBinding, 
                 /*namedBindings*/ undefined), rewriteModuleSpecifier(decl, decl.moduleSpecifier));
             }
-            if (decl.importClause.namedBindings.kind === 251 /* NamespaceImport */) {
+            if (decl.importClause.namedBindings.kind === 252 /* NamespaceImport */) {
                 // Namespace import (optionally with visible default)
                 var namedBindings = resolver.isDeclarationVisible(decl.importClause.namedBindings) ? decl.importClause.namedBindings : /*namedBindings*/ undefined;
                 return visibleDefaultBinding || namedBindings ? ts.updateImportDeclaration(decl, /*decorators*/ undefined, decl.modifiers, ts.updateImportClause(decl.importClause, visibleDefaultBinding, namedBindings), rewriteModuleSpecifier(decl, decl.moduleSpecifier)) : undefined;
@@ -81768,7 +84192,7 @@ var ts;
                 }
                 var priorNeedsDeclare = needsDeclare;
                 needsDeclare = i.parent && ts.isSourceFile(i.parent) && !(ts.isExternalModule(i.parent) && isBundledEmit);
-                var result = transformTopLevelDeclaration(i, /*privateDeclaration*/ true);
+                var result = transformTopLevelDeclaration(i);
                 needsDeclare = priorNeedsDeclare;
                 lateStatementReplacementMap.set("" + ts.getOriginalNodeId(i), result);
             }
@@ -81781,12 +84205,12 @@ var ts;
                     if (lateStatementReplacementMap.has(key)) {
                         var result = lateStatementReplacementMap.get(key);
                         lateStatementReplacementMap.delete(key);
-                        if (result && ts.isSourceFile(statement.parent)) {
+                        if (result) {
                             if (ts.isArray(result) ? ts.some(result, needsScopeMarker) : needsScopeMarker(result)) {
                                 // Top-level declarations in .d.ts files are always considered exported even without a modifier unless there's an export assignment or specifier
                                 needsScopeFixMarker = true;
                             }
-                            if (ts.isArray(result) ? ts.some(result, isExternalModuleIndicator) : isExternalModuleIndicator(result)) {
+                            if (ts.isSourceFile(statement.parent) && (ts.isArray(result) ? ts.some(result, isExternalModuleIndicator) : isExternalModuleIndicator(result))) {
                                 resultHasExternalModuleIndicator = true;
                             }
                         }
@@ -81841,68 +84265,68 @@ var ts;
                 checkEntityNameVisibility(input.exprName, enclosingDeclaration);
             }
             var oldWithinObjectLiteralType = suppressNewDiagnosticContexts;
-            var shouldEnterSuppressNewDiagnosticsContextContext = ((input.kind === 168 /* TypeLiteral */ || input.kind === 181 /* MappedType */) && input.parent.kind !== 242 /* TypeAliasDeclaration */);
+            var shouldEnterSuppressNewDiagnosticsContextContext = ((input.kind === 169 /* TypeLiteral */ || input.kind === 182 /* MappedType */) && input.parent.kind !== 243 /* TypeAliasDeclaration */);
             if (shouldEnterSuppressNewDiagnosticsContextContext) {
                 // We stop making new diagnostic contexts within object literal types. Unless it's an object type on the RHS of a type alias declaration. Then we do.
                 suppressNewDiagnosticContexts = true;
             }
             if (isProcessedComponent(input)) {
                 switch (input.kind) {
-                    case 211 /* ExpressionWithTypeArguments */: {
+                    case 212 /* ExpressionWithTypeArguments */: {
                         if ((ts.isEntityName(input.expression) || ts.isEntityNameExpression(input.expression))) {
                             checkEntityNameVisibility(input.expression, enclosingDeclaration);
                         }
                         var node = ts.visitEachChild(input, visitDeclarationSubtree, context);
                         return cleanup(ts.updateExpressionWithTypeArguments(node, ts.parenthesizeTypeParameters(node.typeArguments), node.expression));
                     }
-                    case 164 /* TypeReference */: {
+                    case 165 /* TypeReference */: {
                         checkEntityNameVisibility(input.typeName, enclosingDeclaration);
                         var node = ts.visitEachChild(input, visitDeclarationSubtree, context);
                         return cleanup(ts.updateTypeReferenceNode(node, node.typeName, ts.parenthesizeTypeParameters(node.typeArguments)));
                     }
-                    case 161 /* ConstructSignature */:
+                    case 162 /* ConstructSignature */:
                         return cleanup(ts.updateConstructSignature(input, ensureTypeParams(input, input.typeParameters), updateParamsList(input, input.parameters), ensureType(input, input.type)));
-                    case 157 /* Constructor */: {
+                    case 158 /* Constructor */: {
                         var isPrivate = ts.hasModifier(input, 8 /* Private */);
                         // A constructor declaration may not have a type annotation
-                        var ctor = ts.createSignatureDeclaration(157 /* Constructor */, isPrivate ? undefined : ensureTypeParams(input, input.typeParameters), 
+                        var ctor = ts.createSignatureDeclaration(158 /* Constructor */, isPrivate ? undefined : ensureTypeParams(input, input.typeParameters), 
                         // TODO: GH#18217
                         isPrivate ? undefined : updateParamsList(input, input.parameters, 0 /* None */), 
                         /*type*/ undefined);
                         ctor.modifiers = ts.createNodeArray(ensureModifiers(input));
                         return cleanup(ctor);
                     }
-                    case 156 /* MethodDeclaration */: {
-                        var sig = ts.createSignatureDeclaration(155 /* MethodSignature */, ensureTypeParams(input, input.typeParameters), updateParamsList(input, input.parameters), ensureType(input, input.type));
+                    case 157 /* MethodDeclaration */: {
+                        var sig = ts.createSignatureDeclaration(156 /* MethodSignature */, ensureTypeParams(input, input.typeParameters), updateParamsList(input, input.parameters), ensureType(input, input.type));
                         sig.name = input.name;
                         sig.modifiers = ts.createNodeArray(ensureModifiers(input));
                         sig.questionToken = input.questionToken;
                         return cleanup(sig);
                     }
-                    case 158 /* GetAccessor */: {
+                    case 159 /* GetAccessor */: {
                         var newNode = ensureAccessor(input);
                         return cleanup(newNode);
                     }
-                    case 159 /* SetAccessor */: {
+                    case 160 /* SetAccessor */: {
                         var newNode = ensureAccessor(input);
                         return cleanup(newNode);
                     }
-                    case 154 /* PropertyDeclaration */:
+                    case 155 /* PropertyDeclaration */:
                         return cleanup(ts.updateProperty(input, 
                         /*decorators*/ undefined, ensureModifiers(input), input.name, input.questionToken, !ts.hasModifier(input, 8 /* Private */) ? ensureType(input, input.type) : undefined, ensureNoInitializer(input)));
-                    case 153 /* PropertySignature */:
+                    case 154 /* PropertySignature */:
                         return cleanup(ts.updatePropertySignature(input, ensureModifiers(input), input.name, input.questionToken, !ts.hasModifier(input, 8 /* Private */) ? ensureType(input, input.type) : undefined, ensureNoInitializer(input)));
-                    case 155 /* MethodSignature */: {
+                    case 156 /* MethodSignature */: {
                         return cleanup(ts.updateMethodSignature(input, ensureTypeParams(input, input.typeParameters), updateParamsList(input, input.parameters), ensureType(input, input.type), input.name, input.questionToken));
                     }
-                    case 160 /* CallSignature */: {
+                    case 161 /* CallSignature */: {
                         return cleanup(ts.updateCallSignature(input, ensureTypeParams(input, input.typeParameters), updateParamsList(input, input.parameters), ensureType(input, input.type)));
                     }
-                    case 162 /* IndexSignature */: {
+                    case 163 /* IndexSignature */: {
                         return cleanup(ts.updateIndexSignature(input, 
-                        /*decorators*/ undefined, ensureModifiers(input), updateParamsList(input, input.parameters), ts.visitNode(input.type, visitDeclarationSubtree) || ts.createKeywordTypeNode(120 /* AnyKeyword */)));
+                        /*decorators*/ undefined, ensureModifiers(input), updateParamsList(input, input.parameters), ts.visitNode(input.type, visitDeclarationSubtree) || ts.createKeywordTypeNode(121 /* AnyKeyword */)));
                     }
-                    case 237 /* VariableDeclaration */: {
+                    case 238 /* VariableDeclaration */: {
                         if (ts.isBindingPattern(input.name)) {
                             return recreateBindingPattern(input.name);
                         }
@@ -81910,13 +84334,13 @@ var ts;
                         suppressNewDiagnosticContexts = true; // Variable declaration types also suppress new diagnostic contexts, provided the contexts wouldn't be made for binding pattern types
                         return cleanup(ts.updateVariableDeclaration(input, input.name, ensureType(input, input.type), ensureNoInitializer(input)));
                     }
-                    case 150 /* TypeParameter */: {
+                    case 151 /* TypeParameter */: {
                         if (isPrivateMethodTypeParameter(input) && (input.default || input.constraint)) {
                             return cleanup(ts.updateTypeParameterDeclaration(input, input.name, /*constraint*/ undefined, /*defaultType*/ undefined));
                         }
                         return cleanup(ts.visitEachChild(input, visitDeclarationSubtree, context));
                     }
-                    case 175 /* ConditionalType */: {
+                    case 176 /* ConditionalType */: {
                         // We have to process conditional types in a special way because for visibility purposes we need to push a new enclosingDeclaration
                         // just for the `infer` types in the true branch. It's an implicit declaration scope that only applies to _part_ of the type.
                         var checkType = ts.visitNode(input.checkType, visitDeclarationSubtree);
@@ -81928,13 +84352,13 @@ var ts;
                         var falseType = ts.visitNode(input.falseType, visitDeclarationSubtree);
                         return cleanup(ts.updateConditionalTypeNode(input, checkType, extendsType, trueType, falseType));
                     }
-                    case 165 /* FunctionType */: {
+                    case 166 /* FunctionType */: {
                         return cleanup(ts.updateFunctionTypeNode(input, ts.visitNodes(input.typeParameters, visitDeclarationSubtree), updateParamsList(input, input.parameters), ts.visitNode(input.type, visitDeclarationSubtree)));
                     }
-                    case 166 /* ConstructorType */: {
+                    case 167 /* ConstructorType */: {
                         return cleanup(ts.updateConstructorTypeNode(input, ts.visitNodes(input.typeParameters, visitDeclarationSubtree), updateParamsList(input, input.parameters), ts.visitNode(input.type, visitDeclarationSubtree)));
                     }
-                    case 183 /* ImportType */: {
+                    case 184 /* ImportType */: {
                         if (!ts.isLiteralImportTypeNode(input))
                             return cleanup(input);
                         return cleanup(ts.updateImportTypeNode(input, ts.updateLiteralTypeNode(input.argument, rewriteModuleSpecifier(input, input.argument.literal)), input.qualifier, ts.visitNodes(input.typeArguments, visitDeclarationSubtree, ts.isTypeNode), input.isTypeOf));
@@ -81963,7 +84387,7 @@ var ts;
             }
         }
         function isPrivateMethodTypeParameter(node) {
-            return node.parent.kind === 156 /* MethodDeclaration */ && ts.hasModifier(node.parent, 8 /* Private */);
+            return node.parent.kind === 157 /* MethodDeclaration */ && ts.hasModifier(node.parent, 8 /* Private */);
         }
         function visitDeclarationStatements(input) {
             if (!isPreservedDeclarationStatement(input)) {
@@ -81973,22 +84397,22 @@ var ts;
             if (shouldStripInternal(input))
                 return;
             switch (input.kind) {
-                case 255 /* ExportDeclaration */: {
+                case 256 /* ExportDeclaration */: {
                     if (ts.isSourceFile(input.parent)) {
                         resultHasExternalModuleIndicator = true;
-                        resultHasScopeMarker = true;
                     }
+                    resultHasScopeMarker = true;
                     // Always visible if the parent node isn't dropped for being not visible
                     // Rewrite external module names if necessary
                     return ts.updateExportDeclaration(input, /*decorators*/ undefined, input.modifiers, input.exportClause, rewriteModuleSpecifier(input, input.moduleSpecifier));
                 }
-                case 254 /* ExportAssignment */: {
+                case 255 /* ExportAssignment */: {
                     // Always visible if the parent node isn't dropped for being not visible
                     if (ts.isSourceFile(input.parent)) {
                         resultHasExternalModuleIndicator = true;
-                        resultHasScopeMarker = true;
                     }
-                    if (input.expression.kind === 72 /* Identifier */) {
+                    resultHasScopeMarker = true;
+                    if (input.expression.kind === 73 /* Identifier */) {
                         return input;
                     }
                     else {
@@ -81998,7 +84422,7 @@ var ts;
                             errorNode: input
                         }); };
                         var varDecl = ts.createVariableDeclaration(newId, resolver.createTypeOfExpression(input.expression, input, declarationEmitNodeBuilderFlags, symbolTracker), /*initializer*/ undefined);
-                        var statement = ts.createVariableStatement(needsDeclare ? [ts.createModifier(125 /* DeclareKeyword */)] : [], ts.createVariableDeclarationList([varDecl], 2 /* Const */));
+                        var statement = ts.createVariableStatement(needsDeclare ? [ts.createModifier(126 /* DeclareKeyword */)] : [], ts.createVariableDeclarationList([varDecl], 2 /* Const */));
                         return [statement, ts.updateExportAssignment(input, input.decorators, input.modifiers, newId)];
                     }
                 }
@@ -82008,14 +84432,25 @@ var ts;
             lateStatementReplacementMap.set("" + ts.getOriginalNodeId(input), result);
             return input;
         }
-        function transformTopLevelDeclaration(input, isPrivate) {
+        function stripExportModifiers(statement) {
+            if (ts.isImportEqualsDeclaration(statement) || ts.hasModifier(statement, 512 /* Default */)) {
+                // `export import` statements should remain as-is, as imports are _not_ implicitly exported in an ambient namespace
+                // Likewise, `export default` classes and the like and just be `default`, so we preserve their `export` modifiers, too
+                return statement;
+            }
+            var clone = ts.getMutableClone(statement);
+            var modifiers = ts.createModifiersFromModifierFlags(ts.getModifierFlags(statement) & (3071 /* All */ ^ 1 /* Export */));
+            clone.modifiers = modifiers.length ? ts.createNodeArray(modifiers) : undefined;
+            return clone;
+        }
+        function transformTopLevelDeclaration(input) {
             if (shouldStripInternal(input))
                 return;
             switch (input.kind) {
-                case 248 /* ImportEqualsDeclaration */: {
+                case 249 /* ImportEqualsDeclaration */: {
                     return transformImportEqualsDeclaration(input);
                 }
-                case 249 /* ImportDeclaration */: {
+                case 250 /* ImportDeclaration */: {
                     return transformImportDeclaration(input);
                 }
             }
@@ -82036,51 +84471,97 @@ var ts;
             }
             var previousNeedsDeclare = needsDeclare;
             switch (input.kind) {
-                case 242 /* TypeAliasDeclaration */: // Type aliases get `declare`d if need be (for legacy support), but that's all
+                case 243 /* TypeAliasDeclaration */: // Type aliases get `declare`d if need be (for legacy support), but that's all
                     return cleanup(ts.updateTypeAliasDeclaration(input, 
-                    /*decorators*/ undefined, ensureModifiers(input, isPrivate), input.name, ts.visitNodes(input.typeParameters, visitDeclarationSubtree, ts.isTypeParameterDeclaration), ts.visitNode(input.type, visitDeclarationSubtree, ts.isTypeNode)));
-                case 241 /* InterfaceDeclaration */: {
+                    /*decorators*/ undefined, ensureModifiers(input), input.name, ts.visitNodes(input.typeParameters, visitDeclarationSubtree, ts.isTypeParameterDeclaration), ts.visitNode(input.type, visitDeclarationSubtree, ts.isTypeNode)));
+                case 242 /* InterfaceDeclaration */: {
                     return cleanup(ts.updateInterfaceDeclaration(input, 
-                    /*decorators*/ undefined, ensureModifiers(input, isPrivate), input.name, ensureTypeParams(input, input.typeParameters), transformHeritageClauses(input.heritageClauses), ts.visitNodes(input.members, visitDeclarationSubtree)));
+                    /*decorators*/ undefined, ensureModifiers(input), input.name, ensureTypeParams(input, input.typeParameters), transformHeritageClauses(input.heritageClauses), ts.visitNodes(input.members, visitDeclarationSubtree)));
                 }
-                case 239 /* FunctionDeclaration */: {
+                case 240 /* FunctionDeclaration */: {
                     // Generators lose their generator-ness, excepting their return type
                     var clean = cleanup(ts.updateFunctionDeclaration(input, 
-                    /*decorators*/ undefined, ensureModifiers(input, isPrivate), 
+                    /*decorators*/ undefined, ensureModifiers(input), 
                     /*asteriskToken*/ undefined, input.name, ensureTypeParams(input, input.typeParameters), updateParamsList(input, input.parameters), ensureType(input, input.type), 
                     /*body*/ undefined));
                     if (clean && resolver.isExpandoFunctionDeclaration(input)) {
-                        var declarations = ts.mapDefined(resolver.getPropertiesOfContainerFunction(input), function (p) {
+                        var props = resolver.getPropertiesOfContainerFunction(input);
+                        var fakespace_1 = ts.createModuleDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, clean.name || ts.createIdentifier("_default"), ts.createModuleBlock([]), 16 /* Namespace */);
+                        fakespace_1.flags ^= 8 /* Synthesized */; // unset synthesized so it is usable as an enclosing declaration
+                        fakespace_1.parent = enclosingDeclaration;
+                        fakespace_1.locals = ts.createSymbolTable(props);
+                        fakespace_1.symbol = props[0].parent;
+                        var declarations = ts.mapDefined(props, function (p) {
                             if (!ts.isPropertyAccessExpression(p.valueDeclaration)) {
                                 return undefined;
                             }
                             getSymbolAccessibilityDiagnostic = ts.createGetSymbolAccessibilityDiagnosticForNode(p.valueDeclaration);
-                            var type = resolver.createTypeOfDeclaration(p.valueDeclaration, enclosingDeclaration, declarationEmitNodeBuilderFlags, symbolTracker);
+                            var type = resolver.createTypeOfDeclaration(p.valueDeclaration, fakespace_1, declarationEmitNodeBuilderFlags, symbolTracker);
                             getSymbolAccessibilityDiagnostic = oldDiag;
                             var varDecl = ts.createVariableDeclaration(ts.unescapeLeadingUnderscores(p.escapedName), type, /*initializer*/ undefined);
                             return ts.createVariableStatement(/*modifiers*/ undefined, ts.createVariableDeclarationList([varDecl]));
                         });
-                        var namespaceDecl = ts.createModuleDeclaration(/*decorators*/ undefined, ensureModifiers(input, isPrivate), input.name, ts.createModuleBlock(declarations), 16 /* Namespace */);
-                        return [clean, namespaceDecl];
+                        var namespaceDecl = ts.createModuleDeclaration(/*decorators*/ undefined, ensureModifiers(input), input.name, ts.createModuleBlock(declarations), 16 /* Namespace */);
+                        if (!ts.hasModifier(clean, 512 /* Default */)) {
+                            return [clean, namespaceDecl];
+                        }
+                        var modifiers = ts.createModifiersFromModifierFlags((ts.getModifierFlags(clean) & ~513 /* ExportDefault */) | 2 /* Ambient */);
+                        var cleanDeclaration = ts.updateFunctionDeclaration(clean, 
+                        /*decorators*/ undefined, modifiers, 
+                        /*asteriskToken*/ undefined, clean.name, clean.typeParameters, clean.parameters, clean.type, 
+                        /*body*/ undefined);
+                        var namespaceDeclaration = ts.updateModuleDeclaration(namespaceDecl, 
+                        /*decorators*/ undefined, modifiers, namespaceDecl.name, namespaceDecl.body);
+                        var exportDefaultDeclaration = ts.createExportAssignment(
+                        /*decorators*/ undefined, 
+                        /*modifiers*/ undefined, 
+                        /*isExportEquals*/ false, namespaceDecl.name);
+                        if (ts.isSourceFile(input.parent)) {
+                            resultHasExternalModuleIndicator = true;
+                        }
+                        resultHasScopeMarker = true;
+                        return [cleanDeclaration, namespaceDeclaration, exportDefaultDeclaration];
                     }
                     else {
                         return clean;
                     }
                 }
-                case 244 /* ModuleDeclaration */: {
+                case 245 /* ModuleDeclaration */: {
                     needsDeclare = false;
                     var inner = input.body;
-                    if (inner && inner.kind === 245 /* ModuleBlock */) {
+                    if (inner && inner.kind === 246 /* ModuleBlock */) {
+                        var oldNeedsScopeFix = needsScopeFixMarker;
+                        var oldHasScopeFix = resultHasScopeMarker;
+                        resultHasScopeMarker = false;
+                        needsScopeFixMarker = false;
                         var statements = ts.visitNodes(inner.statements, visitDeclarationStatements);
-                        var body = ts.updateModuleBlock(inner, transformAndReplaceLatePaintedStatements(statements));
+                        var lateStatements = transformAndReplaceLatePaintedStatements(statements);
+                        if (input.flags & 4194304 /* Ambient */) {
+                            needsScopeFixMarker = false; // If it was `declare`'d everything is implicitly exported already, ignore late printed "privates"
+                        }
+                        // With the final list of statements, there are 3 possibilities:
+                        // 1. There's an export assignment or export declaration in the namespace - do nothing
+                        // 2. Everything is exported and there are no export assignments or export declarations - strip all export modifiers
+                        // 3. Some things are exported, some are not, and there's no marker - add an empty marker
+                        if (!ts.isGlobalScopeAugmentation(input) && !hasScopeMarker(lateStatements) && !resultHasScopeMarker) {
+                            if (needsScopeFixMarker) {
+                                lateStatements = ts.createNodeArray(lateStatements.concat([createEmptyExports()]));
+                            }
+                            else {
+                                lateStatements = ts.visitNodes(lateStatements, stripExportModifiers);
+                            }
+                        }
+                        var body = ts.updateModuleBlock(inner, lateStatements);
                         needsDeclare = previousNeedsDeclare;
-                        var mods = ensureModifiers(input, isPrivate);
+                        needsScopeFixMarker = oldNeedsScopeFix;
+                        resultHasScopeMarker = oldHasScopeFix;
+                        var mods = ensureModifiers(input);
                         return cleanup(ts.updateModuleDeclaration(input, 
                         /*decorators*/ undefined, mods, ts.isExternalModuleAugmentation(input) ? rewriteModuleSpecifier(input, input.name) : input.name, body));
                     }
                     else {
                         needsDeclare = previousNeedsDeclare;
-                        var mods = ensureModifiers(input, isPrivate);
+                        var mods = ensureModifiers(input);
                         needsDeclare = false;
                         ts.visitNode(inner, visitDeclarationStatements);
                         // eagerly transform nested namespaces (the nesting doesn't need any elision or painting done)
@@ -82091,18 +84572,18 @@ var ts;
                         /*decorators*/ undefined, mods, input.name, body));
                     }
                 }
-                case 240 /* ClassDeclaration */: {
-                    var modifiers = ts.createNodeArray(ensureModifiers(input, isPrivate));
+                case 241 /* ClassDeclaration */: {
+                    var modifiers = ts.createNodeArray(ensureModifiers(input));
                     var typeParameters = ensureTypeParams(input, input.typeParameters);
                     var ctor = ts.getFirstConstructorWithBody(input);
                     var parameterProperties = void 0;
                     if (ctor) {
                         var oldDiag_1 = getSymbolAccessibilityDiagnostic;
                         parameterProperties = ts.compact(ts.flatMap(ctor.parameters, function (param) {
-                            if (!ts.hasModifier(param, 92 /* ParameterPropertyModifier */))
+                            if (!ts.hasModifier(param, 92 /* ParameterPropertyModifier */) || shouldStripInternal(param))
                                 return;
                             getSymbolAccessibilityDiagnostic = ts.createGetSymbolAccessibilityDiagnosticForNode(param);
-                            if (param.name.kind === 72 /* Identifier */) {
+                            if (param.name.kind === 73 /* Identifier */) {
                                 return preserveJsDoc(ts.createProperty(
                                 /*decorators*/ undefined, ensureModifiers(param), param.name, param.questionToken, ensureType(param, param.type), ensureNoInitializer(param)), param);
                             }
@@ -82132,7 +84613,7 @@ var ts;
                     }
                     var members = ts.createNodeArray(ts.concatenate(parameterProperties, ts.visitNodes(input.members, visitDeclarationSubtree)));
                     var extendsClause_1 = ts.getEffectiveBaseTypeNode(input);
-                    if (extendsClause_1 && !ts.isEntityNameExpression(extendsClause_1.expression) && extendsClause_1.expression.kind !== 96 /* NullKeyword */) {
+                    if (extendsClause_1 && !ts.isEntityNameExpression(extendsClause_1.expression) && extendsClause_1.expression.kind !== 97 /* NullKeyword */) {
                         // We must add a temporary declaration for the extends clause expression
                         var oldId = input.name ? ts.unescapeLeadingUnderscores(input.name.escapedText) : "default";
                         var newId_1 = ts.createOptimisticUniqueName(oldId + "_base");
@@ -82142,16 +84623,16 @@ var ts;
                             typeName: input.name
                         }); };
                         var varDecl = ts.createVariableDeclaration(newId_1, resolver.createTypeOfExpression(extendsClause_1.expression, input, declarationEmitNodeBuilderFlags, symbolTracker), /*initializer*/ undefined);
-                        var statement = ts.createVariableStatement(needsDeclare ? [ts.createModifier(125 /* DeclareKeyword */)] : [], ts.createVariableDeclarationList([varDecl], 2 /* Const */));
+                        var statement = ts.createVariableStatement(needsDeclare ? [ts.createModifier(126 /* DeclareKeyword */)] : [], ts.createVariableDeclarationList([varDecl], 2 /* Const */));
                         var heritageClauses = ts.createNodeArray(ts.map(input.heritageClauses, function (clause) {
-                            if (clause.token === 86 /* ExtendsKeyword */) {
+                            if (clause.token === 87 /* ExtendsKeyword */) {
                                 var oldDiag_2 = getSymbolAccessibilityDiagnostic;
                                 getSymbolAccessibilityDiagnostic = ts.createGetSymbolAccessibilityDiagnosticForNode(clause.types[0]);
                                 var newClause = ts.updateHeritageClause(clause, ts.map(clause.types, function (t) { return ts.updateExpressionWithTypeArguments(t, ts.visitNodes(t.typeArguments, visitDeclarationSubtree), newId_1); }));
                                 getSymbolAccessibilityDiagnostic = oldDiag_2;
                                 return newClause;
                             }
-                            return ts.updateHeritageClause(clause, ts.visitNodes(ts.createNodeArray(ts.filter(clause.types, function (t) { return ts.isEntityNameExpression(t.expression) || t.expression.kind === 96 /* NullKeyword */; })), visitDeclarationSubtree));
+                            return ts.updateHeritageClause(clause, ts.visitNodes(ts.createNodeArray(ts.filter(clause.types, function (t) { return ts.isEntityNameExpression(t.expression) || t.expression.kind === 97 /* NullKeyword */; })), visitDeclarationSubtree));
                         }));
                         return [statement, cleanup(ts.updateClassDeclaration(input, 
                             /*decorators*/ undefined, modifiers, input.name, typeParameters, heritageClauses, members))]; // TODO: GH#18217
@@ -82162,11 +84643,11 @@ var ts;
                         /*decorators*/ undefined, modifiers, input.name, typeParameters, heritageClauses, members));
                     }
                 }
-                case 219 /* VariableStatement */: {
-                    return cleanup(transformVariableStatement(input, isPrivate));
+                case 220 /* VariableStatement */: {
+                    return cleanup(transformVariableStatement(input));
                 }
-                case 243 /* EnumDeclaration */: {
-                    return cleanup(ts.updateEnumDeclaration(input, /*decorators*/ undefined, ts.createNodeArray(ensureModifiers(input, isPrivate)), input.name, ts.createNodeArray(ts.mapDefined(input.members, function (m) {
+                case 244 /* EnumDeclaration */: {
+                    return cleanup(ts.updateEnumDeclaration(input, /*decorators*/ undefined, ts.createNodeArray(ensureModifiers(input)), input.name, ts.createNodeArray(ts.mapDefined(input.members, function (m) {
                         if (shouldStripInternal(m))
                             return;
                         // Rewrite enum values to their constants, if available
@@ -82184,7 +84665,7 @@ var ts;
                 if (canProdiceDiagnostic) {
                     getSymbolAccessibilityDiagnostic = oldDiag;
                 }
-                if (input.kind === 244 /* ModuleDeclaration */) {
+                if (input.kind === 245 /* ModuleDeclaration */) {
                     needsDeclare = previousNeedsDeclare;
                 }
                 if (node === input) {
@@ -82193,19 +84674,19 @@ var ts;
                 return node && ts.setOriginalNode(preserveJsDoc(node, input), input);
             }
         }
-        function transformVariableStatement(input, privateDeclaration) {
+        function transformVariableStatement(input) {
             if (!ts.forEach(input.declarationList.declarations, getBindingNameVisible))
                 return;
             var nodes = ts.visitNodes(input.declarationList.declarations, visitDeclarationSubtree);
             if (!ts.length(nodes))
                 return;
-            return ts.updateVariableStatement(input, ts.createNodeArray(ensureModifiers(input, privateDeclaration)), ts.updateVariableDeclarationList(input.declarationList, nodes));
+            return ts.updateVariableStatement(input, ts.createNodeArray(ensureModifiers(input)), ts.updateVariableDeclarationList(input.declarationList, nodes));
         }
         function recreateBindingPattern(d) {
             return ts.flatten(ts.mapDefined(d.elements, function (e) { return recreateBindingElement(e); }));
         }
         function recreateBindingElement(e) {
-            if (e.kind === 210 /* OmittedExpression */) {
+            if (e.kind === 211 /* OmittedExpression */) {
                 return;
             }
             if (e.name) {
@@ -82241,26 +84722,23 @@ var ts;
         function isScopeMarker(node) {
             return ts.isExportAssignment(node) || ts.isExportDeclaration(node);
         }
-        function hasScopeMarker(node) {
-            if (ts.isModuleBlock(node)) {
-                return ts.some(node.statements, isScopeMarker);
-            }
-            return false;
+        function hasScopeMarker(statements) {
+            return ts.some(statements, isScopeMarker);
         }
-        function ensureModifiers(node, privateDeclaration) {
+        function ensureModifiers(node) {
             var currentFlags = ts.getModifierFlags(node);
-            var newFlags = ensureModifierFlags(node, privateDeclaration);
+            var newFlags = ensureModifierFlags(node);
             if (currentFlags === newFlags) {
                 return node.modifiers;
             }
             return ts.createModifiersFromModifierFlags(newFlags);
         }
-        function ensureModifierFlags(node, privateDeclaration) {
+        function ensureModifierFlags(node) {
             var mask = 3071 /* All */ ^ (4 /* Public */ | 256 /* Async */); // No async modifiers in declaration files
             var additions = (needsDeclare && !isAlwaysType(node)) ? 2 /* Ambient */ : 0 /* None */;
-            var parentIsFile = node.parent.kind === 284 /* SourceFile */;
+            var parentIsFile = node.parent.kind === 285 /* SourceFile */;
             if (!parentIsFile || (isBundledEmit && parentIsFile && ts.isExternalModule(node.parent))) {
-                mask ^= ((privateDeclaration || (isBundledEmit && parentIsFile) || hasScopeMarker(node.parent) ? 0 : 1 /* Export */) | 2 /* Ambient */);
+                mask ^= 2 /* Ambient */;
                 additions = 0 /* None */;
             }
             return maskModifierFlags(node, mask, additions);
@@ -82279,7 +84757,7 @@ var ts;
             var prop = ts.createProperty(/*decorators*/ undefined, maskModifiers(node, /*mask*/ undefined, (!accessors.setAccessor) ? 64 /* Readonly */ : 0 /* None */), node.name, node.questionToken, ensureType(node, accessorType), /*initializer*/ undefined);
             var leadingsSyntheticCommentRanges = accessors.secondAccessor && ts.getLeadingCommentRangesOfNode(accessors.secondAccessor, currentSourceFile);
             if (leadingsSyntheticCommentRanges) {
-                var _loop_10 = function (range) {
+                var _loop_15 = function (range) {
                     if (range.kind === 3 /* MultiLineCommentTrivia */) {
                         var text = currentSourceFile.text.slice(range.pos + 2, range.end - 2);
                         var lines = text.split(/\r\n?|\n/g);
@@ -82293,20 +84771,20 @@ var ts;
                 };
                 for (var _i = 0, leadingsSyntheticCommentRanges_1 = leadingsSyntheticCommentRanges; _i < leadingsSyntheticCommentRanges_1.length; _i++) {
                     var range = leadingsSyntheticCommentRanges_1[_i];
-                    _loop_10(range);
+                    _loop_15(range);
                 }
             }
             return prop;
         }
         function transformHeritageClauses(nodes) {
             return ts.createNodeArray(ts.filter(ts.map(nodes, function (clause) { return ts.updateHeritageClause(clause, ts.visitNodes(ts.createNodeArray(ts.filter(clause.types, function (t) {
-                return ts.isEntityNameExpression(t.expression) || (clause.token === 86 /* ExtendsKeyword */ && t.expression.kind === 96 /* NullKeyword */);
+                return ts.isEntityNameExpression(t.expression) || (clause.token === 87 /* ExtendsKeyword */ && t.expression.kind === 97 /* NullKeyword */);
             })), visitDeclarationSubtree)); }), function (clause) { return clause.types && !!clause.types.length; }));
         }
     }
     ts.transformDeclarations = transformDeclarations;
     function isAlwaysType(node) {
-        if (node.kind === 241 /* InterfaceDeclaration */) {
+        if (node.kind === 242 /* InterfaceDeclaration */) {
             return true;
         }
         return false;
@@ -82331,7 +84809,7 @@ var ts;
     }
     function getTypeAnnotationFromAccessor(accessor) {
         if (accessor) {
-            return accessor.kind === 158 /* GetAccessor */
+            return accessor.kind === 159 /* GetAccessor */
                 ? accessor.type // Getter - return type
                 : accessor.parameters.length > 0
                     ? accessor.parameters[0].type // Setter parameter type
@@ -82340,52 +84818,52 @@ var ts;
     }
     function canHaveLiteralInitializer(node) {
         switch (node.kind) {
-            case 154 /* PropertyDeclaration */:
-            case 153 /* PropertySignature */:
+            case 155 /* PropertyDeclaration */:
+            case 154 /* PropertySignature */:
                 return !ts.hasModifier(node, 8 /* Private */);
-            case 151 /* Parameter */:
-            case 237 /* VariableDeclaration */:
+            case 152 /* Parameter */:
+            case 238 /* VariableDeclaration */:
                 return true;
         }
         return false;
     }
     function isPreservedDeclarationStatement(node) {
         switch (node.kind) {
-            case 239 /* FunctionDeclaration */:
-            case 244 /* ModuleDeclaration */:
-            case 248 /* ImportEqualsDeclaration */:
-            case 241 /* InterfaceDeclaration */:
-            case 240 /* ClassDeclaration */:
-            case 242 /* TypeAliasDeclaration */:
-            case 243 /* EnumDeclaration */:
-            case 219 /* VariableStatement */:
-            case 249 /* ImportDeclaration */:
-            case 255 /* ExportDeclaration */:
-            case 254 /* ExportAssignment */:
+            case 240 /* FunctionDeclaration */:
+            case 245 /* ModuleDeclaration */:
+            case 249 /* ImportEqualsDeclaration */:
+            case 242 /* InterfaceDeclaration */:
+            case 241 /* ClassDeclaration */:
+            case 243 /* TypeAliasDeclaration */:
+            case 244 /* EnumDeclaration */:
+            case 220 /* VariableStatement */:
+            case 250 /* ImportDeclaration */:
+            case 256 /* ExportDeclaration */:
+            case 255 /* ExportAssignment */:
                 return true;
         }
         return false;
     }
     function isProcessedComponent(node) {
         switch (node.kind) {
-            case 161 /* ConstructSignature */:
-            case 157 /* Constructor */:
-            case 156 /* MethodDeclaration */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
-            case 154 /* PropertyDeclaration */:
-            case 153 /* PropertySignature */:
-            case 155 /* MethodSignature */:
-            case 160 /* CallSignature */:
-            case 162 /* IndexSignature */:
-            case 237 /* VariableDeclaration */:
-            case 150 /* TypeParameter */:
-            case 211 /* ExpressionWithTypeArguments */:
-            case 164 /* TypeReference */:
-            case 175 /* ConditionalType */:
-            case 165 /* FunctionType */:
-            case 166 /* ConstructorType */:
-            case 183 /* ImportType */:
+            case 162 /* ConstructSignature */:
+            case 158 /* Constructor */:
+            case 157 /* MethodDeclaration */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
+            case 155 /* PropertyDeclaration */:
+            case 154 /* PropertySignature */:
+            case 156 /* MethodSignature */:
+            case 161 /* CallSignature */:
+            case 163 /* IndexSignature */:
+            case 238 /* VariableDeclaration */:
+            case 151 /* TypeParameter */:
+            case 212 /* ExpressionWithTypeArguments */:
+            case 165 /* TypeReference */:
+            case 176 /* ConditionalType */:
+            case 166 /* FunctionType */:
+            case 167 /* ConstructorType */:
+            case 184 /* ImportType */:
                 return true;
         }
         return false;
@@ -82417,17 +84895,28 @@ var ts;
         SyntaxKindFeatureFlags[SyntaxKindFeatureFlags["Substitution"] = 1] = "Substitution";
         SyntaxKindFeatureFlags[SyntaxKindFeatureFlags["EmitNotifications"] = 2] = "EmitNotifications";
     })(SyntaxKindFeatureFlags || (SyntaxKindFeatureFlags = {}));
-    function getTransformers(compilerOptions, customTransformers) {
+    ts.noTransformers = { scriptTransformers: ts.emptyArray, declarationTransformers: ts.emptyArray };
+    function getTransformers(compilerOptions, customTransformers, emitOnlyDtsFiles) {
+        return {
+            scriptTransformers: getScriptTransformers(compilerOptions, customTransformers, emitOnlyDtsFiles),
+            declarationTransformers: getDeclarationTransformers(customTransformers),
+        };
+    }
+    ts.getTransformers = getTransformers;
+    function getScriptTransformers(compilerOptions, customTransformers, emitOnlyDtsFiles) {
+        if (emitOnlyDtsFiles)
+            return ts.emptyArray;
         var jsx = compilerOptions.jsx;
         var languageVersion = ts.getEmitScriptTarget(compilerOptions);
         var moduleKind = ts.getEmitModuleKind(compilerOptions);
         var transformers = [];
-        ts.addRange(transformers, customTransformers && customTransformers.before);
+        ts.addRange(transformers, customTransformers && ts.map(customTransformers.before, wrapScriptTransformerFactory));
         transformers.push(ts.transformTypeScript);
+        transformers.push(ts.transformClassFields);
         if (jsx === 2 /* React */) {
             transformers.push(ts.transformJsx);
         }
-        if (languageVersion < 7 /* ESNext */) {
+        if (languageVersion < 99 /* ESNext */) {
             transformers.push(ts.transformESNext);
         }
         if (languageVersion < 6 /* ES2019 */) {
@@ -82452,10 +84941,38 @@ var ts;
         if (languageVersion < 1 /* ES5 */) {
             transformers.push(ts.transformES5);
         }
-        ts.addRange(transformers, customTransformers && customTransformers.after);
+        ts.addRange(transformers, customTransformers && ts.map(customTransformers.after, wrapScriptTransformerFactory));
         return transformers;
     }
-    ts.getTransformers = getTransformers;
+    function getDeclarationTransformers(customTransformers) {
+        var transformers = [];
+        transformers.push(ts.transformDeclarations);
+        ts.addRange(transformers, customTransformers && ts.map(customTransformers.afterDeclarations, wrapDeclarationTransformerFactory));
+        return transformers;
+    }
+    /**
+     * Wrap a custom script or declaration transformer object in a `Transformer` callback with fallback support for transforming bundles.
+     */
+    function wrapCustomTransformer(transformer) {
+        return function (node) { return ts.isBundle(node) ? transformer.transformBundle(node) : transformer.transformSourceFile(node); };
+    }
+    /**
+     * Wrap a transformer factory that may return a custom script or declaration transformer object.
+     */
+    function wrapCustomTransformerFactory(transformer, handleDefault) {
+        return function (context) {
+            var customTransformer = transformer(context);
+            return typeof customTransformer === "function"
+                ? handleDefault(customTransformer)
+                : wrapCustomTransformer(customTransformer);
+        };
+    }
+    function wrapScriptTransformerFactory(transformer) {
+        return wrapCustomTransformerFactory(transformer, ts.chainBundle);
+    }
+    function wrapDeclarationTransformerFactory(transformer) {
+        return wrapCustomTransformerFactory(transformer, ts.identity);
+    }
     function noEmitSubstitution(_hint, node) {
         return node;
     }
@@ -82475,7 +84992,7 @@ var ts;
      * @param allowDtsFiles A value indicating whether to allow the transformation of .d.ts files.
      */
     function transformNodes(resolver, host, options, nodes, transformers, allowDtsFiles) {
-        var enabledSyntaxKindFeatures = new Array(317 /* Count */);
+        var enabledSyntaxKindFeatures = new Array(319 /* Count */);
         var lexicalEnvironmentVariableDeclarations;
         var lexicalEnvironmentFunctionDeclarations;
         var lexicalEnvironmentVariableDeclarationsStack = [];
@@ -82528,7 +85045,14 @@ var ts;
         }
         ts.performance.mark("beforeTransform");
         // Chain together and initialize each transformer.
-        var transformation = ts.chain.apply(void 0, transformers)(context);
+        var transformersWithContext = transformers.map(function (t) { return t(context); });
+        var transformation = function (node) {
+            for (var _i = 0, transformersWithContext_1 = transformersWithContext; _i < transformersWithContext_1.length; _i++) {
+                var transform = transformersWithContext_1[_i];
+                node = transform(node);
+            }
+            return node;
+        };
         // prevent modification of transformation hooks.
         state = 1 /* Initialized */;
         // Transform each node.
@@ -82680,6 +85204,7 @@ var ts;
                 if (lexicalEnvironmentVariableDeclarations) {
                     var statement = ts.createVariableStatement(
                     /*modifiers*/ undefined, ts.createVariableDeclarationList(lexicalEnvironmentVariableDeclarations));
+                    ts.setEmitFlags(statement, 1048576 /* CustomPrologue */);
                     if (!statements) {
                         statements = [statement];
                     }
@@ -82787,7 +85312,7 @@ var ts;
     /*@internal*/
     function getOutputPathForBuildInfo(options) {
         var configFile = options.configFilePath;
-        if (!configFile || !ts.isIncrementalCompilation(options))
+        if (!ts.isIncrementalCompilation(options))
             return undefined;
         if (options.tsBuildInfoFile)
             return options.tsBuildInfoFile;
@@ -82797,6 +85322,8 @@ var ts;
             buildInfoExtensionLess = ts.removeFileExtension(outPath);
         }
         else {
+            if (!configFile)
+                return undefined;
             var configFileExtensionLess = ts.removeFileExtension(configFile);
             buildInfoExtensionLess = options.outDir ?
                 options.rootDir ?
@@ -82821,7 +85348,7 @@ var ts;
     /*@internal*/
     function getOutputPathsFor(sourceFile, host, forceDtsPaths) {
         var options = host.getCompilerOptions();
-        if (sourceFile.kind === 285 /* Bundle */) {
+        if (sourceFile.kind === 286 /* Bundle */) {
             return getOutputPathsForBundle(options, forceDtsPaths);
         }
         else {
@@ -82864,16 +85391,99 @@ var ts;
         return ".js" /* Js */;
     }
     ts.getOutputExtension = getOutputExtension;
+    function rootDirOfOptions(configFile) {
+        return configFile.options.rootDir || ts.getDirectoryPath(ts.Debug.assertDefined(configFile.options.configFilePath));
+    }
+    function getOutputPathWithoutChangingExt(inputFileName, configFile, ignoreCase, outputDir) {
+        return outputDir ?
+            ts.resolvePath(outputDir, ts.getRelativePathFromDirectory(rootDirOfOptions(configFile), inputFileName, ignoreCase)) :
+            inputFileName;
+    }
+    /* @internal */
+    function getOutputDeclarationFileName(inputFileName, configFile, ignoreCase) {
+        ts.Debug.assert(!ts.fileExtensionIs(inputFileName, ".d.ts" /* Dts */) && ts.hasTSFileExtension(inputFileName));
+        return ts.changeExtension(getOutputPathWithoutChangingExt(inputFileName, configFile, ignoreCase, configFile.options.declarationDir || configFile.options.outDir), ".d.ts" /* Dts */);
+    }
+    ts.getOutputDeclarationFileName = getOutputDeclarationFileName;
+    function getOutputJSFileName(inputFileName, configFile, ignoreCase) {
+        var isJsonFile = ts.fileExtensionIs(inputFileName, ".json" /* Json */);
+        var outputFileName = ts.changeExtension(getOutputPathWithoutChangingExt(inputFileName, configFile, ignoreCase, configFile.options.outDir), isJsonFile ?
+            ".json" /* Json */ :
+            ts.fileExtensionIs(inputFileName, ".tsx" /* Tsx */) && configFile.options.jsx === 1 /* Preserve */ ?
+                ".jsx" /* Jsx */ :
+                ".js" /* Js */);
+        return !isJsonFile || ts.comparePaths(inputFileName, outputFileName, ts.Debug.assertDefined(configFile.options.configFilePath), ignoreCase) !== 0 /* EqualTo */ ?
+            outputFileName :
+            undefined;
+    }
+    /*@internal*/
+    function getAllProjectOutputs(configFile, ignoreCase) {
+        var outputs;
+        var addOutput = function (path) { return path && (outputs || (outputs = [])).push(path); };
+        if (configFile.options.outFile || configFile.options.out) {
+            var _a = getOutputPathsForBundle(configFile.options, /*forceDtsPaths*/ false), jsFilePath = _a.jsFilePath, sourceMapFilePath = _a.sourceMapFilePath, declarationFilePath = _a.declarationFilePath, declarationMapPath = _a.declarationMapPath, buildInfoPath = _a.buildInfoPath;
+            addOutput(jsFilePath);
+            addOutput(sourceMapFilePath);
+            addOutput(declarationFilePath);
+            addOutput(declarationMapPath);
+            addOutput(buildInfoPath);
+        }
+        else {
+            for (var _b = 0, _c = configFile.fileNames; _b < _c.length; _b++) {
+                var inputFileName = _c[_b];
+                if (ts.fileExtensionIs(inputFileName, ".d.ts" /* Dts */))
+                    continue;
+                var js = getOutputJSFileName(inputFileName, configFile, ignoreCase);
+                addOutput(js);
+                if (ts.fileExtensionIs(inputFileName, ".json" /* Json */))
+                    continue;
+                if (configFile.options.sourceMap) {
+                    addOutput(js + ".map");
+                }
+                if (ts.getEmitDeclarations(configFile.options) && ts.hasTSFileExtension(inputFileName)) {
+                    var dts = getOutputDeclarationFileName(inputFileName, configFile, ignoreCase);
+                    addOutput(dts);
+                    if (configFile.options.declarationMap) {
+                        addOutput(dts + ".map");
+                    }
+                }
+            }
+            addOutput(getOutputPathForBuildInfo(configFile.options));
+        }
+        return outputs || ts.emptyArray;
+    }
+    ts.getAllProjectOutputs = getAllProjectOutputs;
+    /*@internal*/
+    function getFirstProjectOutput(configFile, ignoreCase) {
+        if (configFile.options.outFile || configFile.options.out) {
+            var jsFilePath = getOutputPathsForBundle(configFile.options, /*forceDtsPaths*/ false).jsFilePath;
+            return ts.Debug.assertDefined(jsFilePath, "project " + configFile.options.configFilePath + " expected to have at least one output");
+        }
+        for (var _a = 0, _b = configFile.fileNames; _a < _b.length; _a++) {
+            var inputFileName = _b[_a];
+            if (ts.fileExtensionIs(inputFileName, ".d.ts" /* Dts */))
+                continue;
+            var jsFilePath = getOutputJSFileName(inputFileName, configFile, ignoreCase);
+            if (jsFilePath)
+                return jsFilePath;
+        }
+        var buildInfoPath = getOutputPathForBuildInfo(configFile.options);
+        if (buildInfoPath)
+            return buildInfoPath;
+        return ts.Debug.fail("project " + configFile.options.configFilePath + " expected to have at least one output");
+    }
+    ts.getFirstProjectOutput = getFirstProjectOutput;
     /*@internal*/
     // targetSourceFile is when users only want one file in entire project to be emitted. This is used in compileOnSave feature
-    function emitFiles(resolver, host, targetSourceFile, emitOnlyDtsFiles, transformers, declarationTransformers, onlyBuildInfo) {
+    function emitFiles(resolver, host, targetSourceFile, _a, emitOnlyDtsFiles, onlyBuildInfo) {
+        var scriptTransformers = _a.scriptTransformers, declarationTransformers = _a.declarationTransformers;
         var compilerOptions = host.getCompilerOptions();
         var sourceMapDataList = (compilerOptions.sourceMap || compilerOptions.inlineSourceMap || ts.getAreDeclarationMapsEnabled(compilerOptions)) ? [] : undefined;
         var emittedFilesList = compilerOptions.listEmittedFiles ? [] : undefined;
         var emitterDiagnostics = ts.createDiagnosticCollection();
         var newLine = ts.getNewLineCharacter(compilerOptions, function () { return host.getNewLine(); });
         var writer = ts.createTextWriter(newLine);
-        var _a = ts.performance.createTimer("printTime", "beforePrint", "afterPrint"), enter = _a.enter, exit = _a.exit;
+        var _b = ts.performance.createTimer("printTime", "beforePrint", "afterPrint"), enter = _b.enter, exit = _b.exit;
         var bundleBuildInfo;
         var emitSkipped = false;
         var exportedModulesFromDeclarationEmit;
@@ -82890,14 +85500,16 @@ var ts;
         };
         function emitSourceFileOrBundle(_a, sourceFileOrBundle) {
             var jsFilePath = _a.jsFilePath, sourceMapFilePath = _a.sourceMapFilePath, declarationFilePath = _a.declarationFilePath, declarationMapPath = _a.declarationMapPath, buildInfoPath = _a.buildInfoPath;
+            var buildInfoDirectory;
             if (buildInfoPath && sourceFileOrBundle && ts.isBundle(sourceFileOrBundle)) {
+                buildInfoDirectory = ts.getDirectoryPath(ts.getNormalizedAbsolutePath(buildInfoPath, host.getCurrentDirectory()));
                 bundleBuildInfo = {
-                    commonSourceDirectory: host.getCommonSourceDirectory(),
-                    sourceFiles: sourceFileOrBundle.sourceFiles.map(function (file) { return file.fileName; })
+                    commonSourceDirectory: relativeToBuildInfo(host.getCommonSourceDirectory()),
+                    sourceFiles: sourceFileOrBundle.sourceFiles.map(function (file) { return relativeToBuildInfo(ts.getNormalizedAbsolutePath(file.fileName, host.getCurrentDirectory())); })
                 };
             }
-            emitJsFileOrBundle(sourceFileOrBundle, jsFilePath, sourceMapFilePath);
-            emitDeclarationFileOrBundle(sourceFileOrBundle, declarationFilePath, declarationMapPath);
+            emitJsFileOrBundle(sourceFileOrBundle, jsFilePath, sourceMapFilePath, relativeToBuildInfo);
+            emitDeclarationFileOrBundle(sourceFileOrBundle, declarationFilePath, declarationMapPath, relativeToBuildInfo);
             emitBuildInfo(bundleBuildInfo, buildInfoPath);
             if (!emitSkipped && emittedFilesList) {
                 if (!emitOnlyDtsFiles) {
@@ -82918,21 +85530,22 @@ var ts;
                     emittedFilesList.push(declarationMapPath);
                 }
             }
+            function relativeToBuildInfo(path) {
+                return ts.ensurePathIsNonModuleName(ts.getRelativePathFromDirectory(buildInfoDirectory, path, host.getCanonicalFileName));
+            }
         }
         function emitBuildInfo(bundle, buildInfoPath) {
             // Write build information if applicable
             if (!buildInfoPath || targetSourceFile || emitSkipped)
                 return;
             var program = host.getProgramBuildInfo();
-            if (!bundle && !program)
-                return;
             if (host.isEmitBlocked(buildInfoPath) || compilerOptions.noEmit) {
                 emitSkipped = true;
                 return;
             }
             ts.writeFile(host, emitterDiagnostics, buildInfoPath, getBuildInfoText({ bundle: bundle, program: program, version: ts.version }), /*writeByteOrderMark*/ false);
         }
-        function emitJsFileOrBundle(sourceFileOrBundle, jsFilePath, sourceMapFilePath) {
+        function emitJsFileOrBundle(sourceFileOrBundle, jsFilePath, sourceMapFilePath, relativeToBuildInfo) {
             if (!sourceFileOrBundle || emitOnlyDtsFiles || !jsFilePath) {
                 return;
             }
@@ -82942,7 +85555,7 @@ var ts;
                 return;
             }
             // Transform the source files
-            var transform = ts.transformNodes(resolver, host, compilerOptions, [sourceFileOrBundle], transformers, /*allowDtsFiles*/ false);
+            var transform = ts.transformNodes(resolver, host, compilerOptions, [sourceFileOrBundle], scriptTransformers, /*allowDtsFiles*/ false);
             var printerOptions = {
                 removeComments: compilerOptions.removeComments,
                 newLine: compilerOptions.newLine,
@@ -82953,7 +85566,8 @@ var ts;
                 inlineSourceMap: compilerOptions.inlineSourceMap,
                 inlineSources: compilerOptions.inlineSources,
                 extendedDiagnostics: compilerOptions.extendedDiagnostics,
-                writeBundleFileInfo: !!bundleBuildInfo
+                writeBundleFileInfo: !!bundleBuildInfo,
+                relativeToBuildInfo: relativeToBuildInfo
             };
             // Create a printer to print the nodes
             var printer = createPrinter(printerOptions, {
@@ -82970,7 +85584,7 @@ var ts;
             if (bundleBuildInfo)
                 bundleBuildInfo.js = printer.bundleFileInfo;
         }
-        function emitDeclarationFileOrBundle(sourceFileOrBundle, declarationFilePath, declarationMapPath) {
+        function emitDeclarationFileOrBundle(sourceFileOrBundle, declarationFilePath, declarationMapPath, relativeToBuildInfo) {
             if (!sourceFileOrBundle || !(declarationFilePath && !ts.isInJSFile(sourceFileOrBundle))) {
                 return;
             }
@@ -82983,7 +85597,7 @@ var ts;
                 // Do that here when emitting only dts files
                 nonJsFiles.forEach(collectLinkedAliases);
             }
-            var declarationTransform = ts.transformNodes(resolver, host, compilerOptions, inputListOrBundle, ts.concatenate([ts.transformDeclarations], declarationTransformers), /*allowDtsFiles*/ false);
+            var declarationTransform = ts.transformNodes(resolver, host, compilerOptions, inputListOrBundle, declarationTransformers, /*allowDtsFiles*/ false);
             if (ts.length(declarationTransform.diagnostics)) {
                 for (var _a = 0, _b = declarationTransform.diagnostics; _a < _b.length; _a++) {
                     var diagnostic = _b[_a];
@@ -83001,7 +85615,8 @@ var ts;
                 extendedDiagnostics: compilerOptions.extendedDiagnostics,
                 onlyPrintJsDocStyle: true,
                 writeBundleFileInfo: !!bundleBuildInfo,
-                recordInternalSection: !!bundleBuildInfo
+                recordInternalSection: !!bundleBuildInfo,
+                relativeToBuildInfo: relativeToBuildInfo
             };
             var declarationPrinter = createPrinter(printerOptions, {
                 // resolver hooks
@@ -83020,8 +85635,12 @@ var ts;
                     mapRoot: compilerOptions.mapRoot,
                     extendedDiagnostics: compilerOptions.extendedDiagnostics,
                 });
-                if (emitOnlyDtsFiles && declarationTransform.transformed[0].kind === 284 /* SourceFile */) {
-                    var sourceFile = declarationTransform.transformed[0];
+                if (emitOnlyDtsFiles && declarationTransform.transformed[0].kind === 285 /* SourceFile */) {
+                    // Improved narrowing in master/3.6 makes this cast unnecessary, triggering a lint rule.
+                    // But at the same time, the LKG (3.5) necessitates it because it doesn’t narrow.
+                    // Once the LKG is updated to 3.6, this comment, the cast to `SourceFile`, and the
+                    // tslint directive can be all be removed.
+                    var sourceFile = declarationTransform.transformed[0]; // tslint:disable-line
                     exportedModulesFromDeclarationEmit = sourceFile.exportedModulesFromDeclarationEmit;
                 }
             }
@@ -83031,7 +85650,7 @@ var ts;
         }
         function collectLinkedAliases(node) {
             if (ts.isExportAssignment(node)) {
-                if (node.expression.kind === 72 /* Identifier */) {
+                if (node.expression.kind === 73 /* Identifier */) {
                     resolver.collectLinkedAliases(node.expression, /*setVisibility*/ true);
                 }
                 return;
@@ -83043,8 +85662,8 @@ var ts;
             ts.forEachChild(node, collectLinkedAliases);
         }
         function printSourceFileOrBundle(jsFilePath, sourceMapFilePath, sourceFileOrBundle, printer, mapOptions) {
-            var bundle = sourceFileOrBundle.kind === 285 /* Bundle */ ? sourceFileOrBundle : undefined;
-            var sourceFile = sourceFileOrBundle.kind === 284 /* SourceFile */ ? sourceFileOrBundle : undefined;
+            var bundle = sourceFileOrBundle.kind === 286 /* Bundle */ ? sourceFileOrBundle : undefined;
+            var sourceFile = sourceFileOrBundle.kind === 285 /* SourceFile */ ? sourceFileOrBundle : undefined;
             var sourceFiles = bundle ? bundle.sourceFiles : [sourceFile];
             var sourceMapGenerator;
             if (shouldEmitSourceMaps(mapOptions, sourceFileOrBundle)) {
@@ -83085,7 +85704,7 @@ var ts;
         }
         function shouldEmitSourceMaps(mapOptions, sourceFileOrBundle) {
             return (mapOptions.sourceMap || mapOptions.inlineSourceMap)
-                && (sourceFileOrBundle.kind !== 284 /* SourceFile */ || !ts.fileExtensionIs(sourceFileOrBundle.fileName, ".json" /* Json */));
+                && (sourceFileOrBundle.kind !== 285 /* SourceFile */ || !ts.fileExtensionIs(sourceFileOrBundle.fileName, ".json" /* Json */));
         }
         function getSourceRoot(mapOptions) {
             // Normalize source root and make sure it has trailing "/" so that it can be used to combine paths with the
@@ -83193,10 +85812,10 @@ var ts;
         getSymbolOfExternalModuleSpecifier: ts.notImplemented,
         isBindingCapturedByNode: ts.notImplemented,
     };
-    function createSourceFilesFromBundleBuildInfo(bundle) {
+    function createSourceFilesFromBundleBuildInfo(bundle, buildInfoDirectory, host) {
         var sourceFiles = bundle.sourceFiles.map(function (fileName) {
-            var sourceFile = ts.createNode(284 /* SourceFile */, 0, 0);
-            sourceFile.fileName = fileName;
+            var sourceFile = ts.createNode(285 /* SourceFile */, 0, 0);
+            sourceFile.fileName = ts.getRelativePathFromDirectory(host.getCurrentDirectory(), ts.getNormalizedAbsolutePath(fileName, buildInfoDirectory), !host.useCaseSensitiveFileNames());
             sourceFile.text = "";
             sourceFile.statements = ts.createNodeArray();
             return sourceFile;
@@ -83207,7 +85826,7 @@ var ts;
             sourceFile.text = prologueInfo.text;
             sourceFile.end = prologueInfo.text.length;
             sourceFile.statements = ts.createNodeArray(prologueInfo.directives.map(function (directive) {
-                var statement = ts.createNode(221 /* ExpressionStatement */, directive.pos, directive.end);
+                var statement = ts.createNode(222 /* ExpressionStatement */, directive.pos, directive.end);
                 statement.expression = ts.createNode(10 /* StringLiteral */, directive.expression.pos, directive.expression.end);
                 statement.expression.text = directive.expression.text;
                 return statement;
@@ -83216,7 +85835,7 @@ var ts;
         return sourceFiles;
     }
     /*@internal*/
-    function emitUsingBuildInfo(config, host, getCommandLine) {
+    function emitUsingBuildInfo(config, host, getCommandLine, customTransformers) {
         var _a = getOutputPathsForBundle(config.options, /*forceDtsPaths*/ false), buildInfoPath = _a.buildInfoPath, jsFilePath = _a.jsFilePath, sourceMapFilePath = _a.sourceMapFilePath, declarationFilePath = _a.declarationFilePath, declarationMapPath = _a.declarationMapPath;
         var buildInfoText = host.readFile(ts.Debug.assertDefined(buildInfoPath));
         if (!buildInfoText)
@@ -83239,23 +85858,25 @@ var ts;
         var buildInfo = getBuildInfo(buildInfoText);
         if (!buildInfo.bundle || !buildInfo.bundle.js || (declarationText && !buildInfo.bundle.dts))
             return buildInfoPath;
+        var buildInfoDirectory = ts.getDirectoryPath(ts.getNormalizedAbsolutePath(buildInfoPath, host.getCurrentDirectory()));
         var ownPrependInput = ts.createInputFiles(jsFileText, declarationText, sourceMapFilePath, sourceMapText, declarationMapPath, declarationMapText, jsFilePath, declarationFilePath, buildInfoPath, buildInfo, 
         /*onlyOwnText*/ true);
         var outputFiles = [];
         var prependNodes = ts.createPrependNodes(config.projectReferences, getCommandLine, function (f) { return host.readFile(f); });
-        var sourceFilesForJsEmit = createSourceFilesFromBundleBuildInfo(buildInfo.bundle);
+        var sourceFilesForJsEmit = createSourceFilesFromBundleBuildInfo(buildInfo.bundle, buildInfoDirectory, host);
         var emitHost = {
             getPrependNodes: ts.memoize(function () { return prependNodes.concat([ownPrependInput]); }),
             getCanonicalFileName: host.getCanonicalFileName,
-            getCommonSourceDirectory: function () { return buildInfo.bundle.commonSourceDirectory; },
+            getCommonSourceDirectory: function () { return ts.getNormalizedAbsolutePath(buildInfo.bundle.commonSourceDirectory, buildInfoDirectory); },
             getCompilerOptions: function () { return config.options; },
             getCurrentDirectory: function () { return host.getCurrentDirectory(); },
             getNewLine: function () { return host.getNewLine(); },
-            getSourceFile: function () { return undefined; },
-            getSourceFileByPath: function () { return undefined; },
+            getSourceFile: ts.returnUndefined,
+            getSourceFileByPath: ts.returnUndefined,
             getSourceFiles: function () { return sourceFilesForJsEmit; },
             getLibFileFromReference: ts.notImplemented,
             isSourceFileFromExternalLibrary: ts.returnFalse,
+            getResolvedProjectReferenceToRedirect: ts.returnUndefined,
             writeFile: function (name, text, writeByteOrderMark) {
                 switch (name) {
                     case jsFilePath:
@@ -83296,9 +85917,11 @@ var ts;
             fileExists: function (f) { return host.fileExists(f); },
             directoryExists: host.directoryExists && (function (f) { return host.directoryExists(f); }),
             useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); },
-            getProgramBuildInfo: function () { return undefined; }
+            getProgramBuildInfo: ts.returnUndefined,
+            getSourceFileFromReference: ts.returnUndefined,
         };
-        emitFiles(ts.notImplementedResolver, emitHost, /*targetSourceFile*/ undefined, /*emitOnlyDtsFiles*/ false, ts.getTransformers(config.options));
+        emitFiles(ts.notImplementedResolver, emitHost, 
+        /*targetSourceFile*/ undefined, ts.getTransformers(config.options, customTransformers));
         return outputFiles;
     }
     ts.emitUsingBuildInfo = emitUsingBuildInfo;
@@ -83331,6 +85954,7 @@ var ts;
         var write = writeBase;
         var isOwnFileEmit;
         var bundleFileInfo = printerOptions.writeBundleFileInfo ? { sections: [] } : undefined;
+        var relativeToBuildInfo = bundleFileInfo ? ts.Debug.assertDefined(printerOptions.relativeToBuildInfo) : undefined;
         var recordInternalSection = printerOptions.recordInternalSection;
         var sourceFileTextPos = 0;
         var sourceFileTextKind = "text" /* Text */;
@@ -83375,9 +85999,9 @@ var ts;
                     break;
             }
             switch (node.kind) {
-                case 284 /* SourceFile */: return printFile(node);
-                case 285 /* Bundle */: return printBundle(node);
-                case 286 /* UnparsedSource */: return printUnparsedSource(node);
+                case 285 /* SourceFile */: return printFile(node);
+                case 286 /* Bundle */: return printBundle(node);
+                case 287 /* UnparsedSource */: return printUnparsedSource(node);
             }
             writeNode(hint, node, sourceFile, beginPrint());
             return endPrint();
@@ -83480,7 +86104,13 @@ var ts;
                         (_a = bundleFileInfo.sections).push.apply(_a, newSections);
                     else {
                         newSections.forEach(function (section) { return ts.Debug.assert(ts.isBundleFileTextLike(section)); });
-                        bundleFileInfo.sections.push({ pos: pos, end: writer.getTextPos(), kind: "prepend" /* Prepend */, data: prepend.fileName, texts: newSections });
+                        bundleFileInfo.sections.push({
+                            pos: pos,
+                            end: writer.getTextPos(),
+                            kind: "prepend" /* Prepend */,
+                            data: relativeToBuildInfo(prepend.fileName),
+                            texts: newSections
+                        });
                     }
                 }
             }
@@ -83607,12 +86237,12 @@ var ts;
                     }
                 // falls through
                 case 2 /* Comments */:
-                    if (!commentsDisabled && node.kind !== 284 /* SourceFile */) {
+                    if (!commentsDisabled && node.kind !== 285 /* SourceFile */) {
                         return pipelineEmitWithComments;
                     }
                 // falls through
                 case 3 /* SourceMaps */:
-                    if (!sourceMapsDisabled && node.kind !== 284 /* SourceFile */ && !ts.isInJsonFile(node)) {
+                    if (!sourceMapsDisabled && node.kind !== 285 /* SourceFile */ && !ts.isInJsonFile(node)) {
                         return pipelineEmitWithSourceMap;
                     }
                 // falls through
@@ -83649,272 +86279,272 @@ var ts;
                     case 16 /* TemplateMiddle */:
                     case 17 /* TemplateTail */:
                         return emitLiteral(node);
-                    case 286 /* UnparsedSource */:
-                    case 280 /* UnparsedPrepend */:
+                    case 287 /* UnparsedSource */:
+                    case 281 /* UnparsedPrepend */:
                         return emitUnparsedSourceOrPrepend(node);
-                    case 279 /* UnparsedPrologue */:
+                    case 280 /* UnparsedPrologue */:
                         return writeUnparsedNode(node);
-                    case 281 /* UnparsedText */:
-                    case 282 /* UnparsedInternalText */:
+                    case 282 /* UnparsedText */:
+                    case 283 /* UnparsedInternalText */:
                         return emitUnparsedTextLike(node);
-                    case 283 /* UnparsedSyntheticReference */:
+                    case 284 /* UnparsedSyntheticReference */:
                         return emitUnparsedSyntheticReference(node);
                     // Identifiers
-                    case 72 /* Identifier */:
+                    case 73 /* Identifier */:
                         return emitIdentifier(node);
                     // Parse tree nodes
                     // Names
-                    case 148 /* QualifiedName */:
+                    case 149 /* QualifiedName */:
                         return emitQualifiedName(node);
-                    case 149 /* ComputedPropertyName */:
+                    case 150 /* ComputedPropertyName */:
                         return emitComputedPropertyName(node);
                     // Signature elements
-                    case 150 /* TypeParameter */:
+                    case 151 /* TypeParameter */:
                         return emitTypeParameter(node);
-                    case 151 /* Parameter */:
+                    case 152 /* Parameter */:
                         return emitParameter(node);
-                    case 152 /* Decorator */:
+                    case 153 /* Decorator */:
                         return emitDecorator(node);
                     // Type members
-                    case 153 /* PropertySignature */:
+                    case 154 /* PropertySignature */:
                         return emitPropertySignature(node);
-                    case 154 /* PropertyDeclaration */:
+                    case 155 /* PropertyDeclaration */:
                         return emitPropertyDeclaration(node);
-                    case 155 /* MethodSignature */:
+                    case 156 /* MethodSignature */:
                         return emitMethodSignature(node);
-                    case 156 /* MethodDeclaration */:
+                    case 157 /* MethodDeclaration */:
                         return emitMethodDeclaration(node);
-                    case 157 /* Constructor */:
+                    case 158 /* Constructor */:
                         return emitConstructor(node);
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
                         return emitAccessorDeclaration(node);
-                    case 160 /* CallSignature */:
+                    case 161 /* CallSignature */:
                         return emitCallSignature(node);
-                    case 161 /* ConstructSignature */:
+                    case 162 /* ConstructSignature */:
                         return emitConstructSignature(node);
-                    case 162 /* IndexSignature */:
+                    case 163 /* IndexSignature */:
                         return emitIndexSignature(node);
                     // Types
-                    case 163 /* TypePredicate */:
+                    case 164 /* TypePredicate */:
                         return emitTypePredicate(node);
-                    case 164 /* TypeReference */:
+                    case 165 /* TypeReference */:
                         return emitTypeReference(node);
-                    case 165 /* FunctionType */:
+                    case 166 /* FunctionType */:
                         return emitFunctionType(node);
-                    case 294 /* JSDocFunctionType */:
+                    case 295 /* JSDocFunctionType */:
                         return emitJSDocFunctionType(node);
-                    case 166 /* ConstructorType */:
+                    case 167 /* ConstructorType */:
                         return emitConstructorType(node);
-                    case 167 /* TypeQuery */:
+                    case 168 /* TypeQuery */:
                         return emitTypeQuery(node);
-                    case 168 /* TypeLiteral */:
+                    case 169 /* TypeLiteral */:
                         return emitTypeLiteral(node);
-                    case 169 /* ArrayType */:
+                    case 170 /* ArrayType */:
                         return emitArrayType(node);
-                    case 170 /* TupleType */:
+                    case 171 /* TupleType */:
                         return emitTupleType(node);
-                    case 171 /* OptionalType */:
+                    case 172 /* OptionalType */:
                         return emitOptionalType(node);
-                    case 173 /* UnionType */:
+                    case 174 /* UnionType */:
                         return emitUnionType(node);
-                    case 174 /* IntersectionType */:
+                    case 175 /* IntersectionType */:
                         return emitIntersectionType(node);
-                    case 175 /* ConditionalType */:
+                    case 176 /* ConditionalType */:
                         return emitConditionalType(node);
-                    case 176 /* InferType */:
+                    case 177 /* InferType */:
                         return emitInferType(node);
-                    case 177 /* ParenthesizedType */:
+                    case 178 /* ParenthesizedType */:
                         return emitParenthesizedType(node);
-                    case 211 /* ExpressionWithTypeArguments */:
+                    case 212 /* ExpressionWithTypeArguments */:
                         return emitExpressionWithTypeArguments(node);
-                    case 178 /* ThisType */:
+                    case 179 /* ThisType */:
                         return emitThisType();
-                    case 179 /* TypeOperator */:
+                    case 180 /* TypeOperator */:
                         return emitTypeOperator(node);
-                    case 180 /* IndexedAccessType */:
+                    case 181 /* IndexedAccessType */:
                         return emitIndexedAccessType(node);
-                    case 181 /* MappedType */:
+                    case 182 /* MappedType */:
                         return emitMappedType(node);
-                    case 182 /* LiteralType */:
+                    case 183 /* LiteralType */:
                         return emitLiteralType(node);
-                    case 183 /* ImportType */:
+                    case 184 /* ImportType */:
                         return emitImportTypeNode(node);
-                    case 289 /* JSDocAllType */:
+                    case 290 /* JSDocAllType */:
                         writePunctuation("*");
                         return;
-                    case 290 /* JSDocUnknownType */:
+                    case 291 /* JSDocUnknownType */:
                         writePunctuation("?");
                         return;
-                    case 291 /* JSDocNullableType */:
+                    case 292 /* JSDocNullableType */:
                         return emitJSDocNullableType(node);
-                    case 292 /* JSDocNonNullableType */:
+                    case 293 /* JSDocNonNullableType */:
                         return emitJSDocNonNullableType(node);
-                    case 293 /* JSDocOptionalType */:
+                    case 294 /* JSDocOptionalType */:
                         return emitJSDocOptionalType(node);
-                    case 172 /* RestType */:
-                    case 295 /* JSDocVariadicType */:
+                    case 173 /* RestType */:
+                    case 296 /* JSDocVariadicType */:
                         return emitRestOrJSDocVariadicType(node);
                     // Binding patterns
-                    case 184 /* ObjectBindingPattern */:
+                    case 185 /* ObjectBindingPattern */:
                         return emitObjectBindingPattern(node);
-                    case 185 /* ArrayBindingPattern */:
+                    case 186 /* ArrayBindingPattern */:
                         return emitArrayBindingPattern(node);
-                    case 186 /* BindingElement */:
+                    case 187 /* BindingElement */:
                         return emitBindingElement(node);
                     // Misc
-                    case 216 /* TemplateSpan */:
+                    case 217 /* TemplateSpan */:
                         return emitTemplateSpan(node);
-                    case 217 /* SemicolonClassElement */:
+                    case 218 /* SemicolonClassElement */:
                         return emitSemicolonClassElement();
                     // Statements
-                    case 218 /* Block */:
+                    case 219 /* Block */:
                         return emitBlock(node);
-                    case 219 /* VariableStatement */:
+                    case 220 /* VariableStatement */:
                         return emitVariableStatement(node);
-                    case 220 /* EmptyStatement */:
+                    case 221 /* EmptyStatement */:
                         return emitEmptyStatement(/*isEmbeddedStatement*/ false);
-                    case 221 /* ExpressionStatement */:
+                    case 222 /* ExpressionStatement */:
                         return emitExpressionStatement(node);
-                    case 222 /* IfStatement */:
+                    case 223 /* IfStatement */:
                         return emitIfStatement(node);
-                    case 223 /* DoStatement */:
+                    case 224 /* DoStatement */:
                         return emitDoStatement(node);
-                    case 224 /* WhileStatement */:
+                    case 225 /* WhileStatement */:
                         return emitWhileStatement(node);
-                    case 225 /* ForStatement */:
+                    case 226 /* ForStatement */:
                         return emitForStatement(node);
-                    case 226 /* ForInStatement */:
+                    case 227 /* ForInStatement */:
                         return emitForInStatement(node);
-                    case 227 /* ForOfStatement */:
+                    case 228 /* ForOfStatement */:
                         return emitForOfStatement(node);
-                    case 228 /* ContinueStatement */:
+                    case 229 /* ContinueStatement */:
                         return emitContinueStatement(node);
-                    case 229 /* BreakStatement */:
+                    case 230 /* BreakStatement */:
                         return emitBreakStatement(node);
-                    case 230 /* ReturnStatement */:
+                    case 231 /* ReturnStatement */:
                         return emitReturnStatement(node);
-                    case 231 /* WithStatement */:
+                    case 232 /* WithStatement */:
                         return emitWithStatement(node);
-                    case 232 /* SwitchStatement */:
+                    case 233 /* SwitchStatement */:
                         return emitSwitchStatement(node);
-                    case 233 /* LabeledStatement */:
+                    case 234 /* LabeledStatement */:
                         return emitLabeledStatement(node);
-                    case 234 /* ThrowStatement */:
+                    case 235 /* ThrowStatement */:
                         return emitThrowStatement(node);
-                    case 235 /* TryStatement */:
+                    case 236 /* TryStatement */:
                         return emitTryStatement(node);
-                    case 236 /* DebuggerStatement */:
+                    case 237 /* DebuggerStatement */:
                         return emitDebuggerStatement(node);
                     // Declarations
-                    case 237 /* VariableDeclaration */:
+                    case 238 /* VariableDeclaration */:
                         return emitVariableDeclaration(node);
-                    case 238 /* VariableDeclarationList */:
+                    case 239 /* VariableDeclarationList */:
                         return emitVariableDeclarationList(node);
-                    case 239 /* FunctionDeclaration */:
+                    case 240 /* FunctionDeclaration */:
                         return emitFunctionDeclaration(node);
-                    case 240 /* ClassDeclaration */:
+                    case 241 /* ClassDeclaration */:
                         return emitClassDeclaration(node);
-                    case 241 /* InterfaceDeclaration */:
+                    case 242 /* InterfaceDeclaration */:
                         return emitInterfaceDeclaration(node);
-                    case 242 /* TypeAliasDeclaration */:
+                    case 243 /* TypeAliasDeclaration */:
                         return emitTypeAliasDeclaration(node);
-                    case 243 /* EnumDeclaration */:
+                    case 244 /* EnumDeclaration */:
                         return emitEnumDeclaration(node);
-                    case 244 /* ModuleDeclaration */:
+                    case 245 /* ModuleDeclaration */:
                         return emitModuleDeclaration(node);
-                    case 245 /* ModuleBlock */:
+                    case 246 /* ModuleBlock */:
                         return emitModuleBlock(node);
-                    case 246 /* CaseBlock */:
+                    case 247 /* CaseBlock */:
                         return emitCaseBlock(node);
-                    case 247 /* NamespaceExportDeclaration */:
+                    case 248 /* NamespaceExportDeclaration */:
                         return emitNamespaceExportDeclaration(node);
-                    case 248 /* ImportEqualsDeclaration */:
+                    case 249 /* ImportEqualsDeclaration */:
                         return emitImportEqualsDeclaration(node);
-                    case 249 /* ImportDeclaration */:
+                    case 250 /* ImportDeclaration */:
                         return emitImportDeclaration(node);
-                    case 250 /* ImportClause */:
+                    case 251 /* ImportClause */:
                         return emitImportClause(node);
-                    case 251 /* NamespaceImport */:
+                    case 252 /* NamespaceImport */:
                         return emitNamespaceImport(node);
-                    case 252 /* NamedImports */:
+                    case 253 /* NamedImports */:
                         return emitNamedImports(node);
-                    case 253 /* ImportSpecifier */:
+                    case 254 /* ImportSpecifier */:
                         return emitImportSpecifier(node);
-                    case 254 /* ExportAssignment */:
+                    case 255 /* ExportAssignment */:
                         return emitExportAssignment(node);
-                    case 255 /* ExportDeclaration */:
+                    case 256 /* ExportDeclaration */:
                         return emitExportDeclaration(node);
-                    case 256 /* NamedExports */:
+                    case 257 /* NamedExports */:
                         return emitNamedExports(node);
-                    case 257 /* ExportSpecifier */:
+                    case 258 /* ExportSpecifier */:
                         return emitExportSpecifier(node);
-                    case 258 /* MissingDeclaration */:
+                    case 259 /* MissingDeclaration */:
                         return;
                     // Module references
-                    case 259 /* ExternalModuleReference */:
+                    case 260 /* ExternalModuleReference */:
                         return emitExternalModuleReference(node);
                     // JSX (non-expression)
                     case 11 /* JsxText */:
                         return emitJsxText(node);
-                    case 262 /* JsxOpeningElement */:
-                    case 265 /* JsxOpeningFragment */:
+                    case 263 /* JsxOpeningElement */:
+                    case 266 /* JsxOpeningFragment */:
                         return emitJsxOpeningElementOrFragment(node);
-                    case 263 /* JsxClosingElement */:
-                    case 266 /* JsxClosingFragment */:
+                    case 264 /* JsxClosingElement */:
+                    case 267 /* JsxClosingFragment */:
                         return emitJsxClosingElementOrFragment(node);
-                    case 267 /* JsxAttribute */:
+                    case 268 /* JsxAttribute */:
                         return emitJsxAttribute(node);
-                    case 268 /* JsxAttributes */:
+                    case 269 /* JsxAttributes */:
                         return emitJsxAttributes(node);
-                    case 269 /* JsxSpreadAttribute */:
+                    case 270 /* JsxSpreadAttribute */:
                         return emitJsxSpreadAttribute(node);
-                    case 270 /* JsxExpression */:
+                    case 271 /* JsxExpression */:
                         return emitJsxExpression(node);
                     // Clauses
-                    case 271 /* CaseClause */:
+                    case 272 /* CaseClause */:
                         return emitCaseClause(node);
-                    case 272 /* DefaultClause */:
+                    case 273 /* DefaultClause */:
                         return emitDefaultClause(node);
-                    case 273 /* HeritageClause */:
+                    case 274 /* HeritageClause */:
                         return emitHeritageClause(node);
-                    case 274 /* CatchClause */:
+                    case 275 /* CatchClause */:
                         return emitCatchClause(node);
                     // Property assignments
-                    case 275 /* PropertyAssignment */:
+                    case 276 /* PropertyAssignment */:
                         return emitPropertyAssignment(node);
-                    case 276 /* ShorthandPropertyAssignment */:
+                    case 277 /* ShorthandPropertyAssignment */:
                         return emitShorthandPropertyAssignment(node);
-                    case 277 /* SpreadAssignment */:
+                    case 278 /* SpreadAssignment */:
                         return emitSpreadAssignment(node);
                     // Enum
-                    case 278 /* EnumMember */:
+                    case 279 /* EnumMember */:
                         return emitEnumMember(node);
                     // JSDoc nodes (only used in codefixes currently)
-                    case 304 /* JSDocParameterTag */:
-                    case 310 /* JSDocPropertyTag */:
+                    case 306 /* JSDocParameterTag */:
+                    case 312 /* JSDocPropertyTag */:
                         return emitJSDocPropertyLikeTag(node);
-                    case 305 /* JSDocReturnTag */:
-                    case 307 /* JSDocTypeTag */:
-                    case 306 /* JSDocThisTag */:
-                    case 303 /* JSDocEnumTag */:
+                    case 307 /* JSDocReturnTag */:
+                    case 309 /* JSDocTypeTag */:
+                    case 308 /* JSDocThisTag */:
+                    case 305 /* JSDocEnumTag */:
                         return emitJSDocSimpleTypedTag(node);
-                    case 300 /* JSDocAugmentsTag */:
+                    case 301 /* JSDocAugmentsTag */:
                         return emitJSDocAugmentsTag(node);
-                    case 308 /* JSDocTemplateTag */:
+                    case 310 /* JSDocTemplateTag */:
                         return emitJSDocTemplateTag(node);
-                    case 309 /* JSDocTypedefTag */:
+                    case 311 /* JSDocTypedefTag */:
                         return emitJSDocTypedefTag(node);
-                    case 302 /* JSDocCallbackTag */:
+                    case 304 /* JSDocCallbackTag */:
                         return emitJSDocCallbackTag(node);
-                    case 298 /* JSDocSignature */:
+                    case 299 /* JSDocSignature */:
                         return emitJSDocSignature(node);
-                    case 297 /* JSDocTypeLiteral */:
+                    case 298 /* JSDocTypeLiteral */:
                         return emitJSDocTypeLiteral(node);
-                    case 301 /* JSDocClassTag */:
-                    case 299 /* JSDocTag */:
+                    case 303 /* JSDocClassTag */:
+                    case 300 /* JSDocTag */:
                         return emitJSDocSimpleTag(node);
-                    case 296 /* JSDocComment */:
+                    case 297 /* JSDocComment */:
                         return emitJSDoc(node);
                     // Transformation nodes (ignored)
                 }
@@ -83939,83 +86569,83 @@ var ts;
                     case 14 /* NoSubstitutionTemplateLiteral */:
                         return emitLiteral(node);
                     // Identifiers
-                    case 72 /* Identifier */:
+                    case 73 /* Identifier */:
                         return emitIdentifier(node);
                     // Reserved words
-                    case 87 /* FalseKeyword */:
-                    case 96 /* NullKeyword */:
-                    case 98 /* SuperKeyword */:
-                    case 102 /* TrueKeyword */:
-                    case 100 /* ThisKeyword */:
-                    case 92 /* ImportKeyword */:
+                    case 88 /* FalseKeyword */:
+                    case 97 /* NullKeyword */:
+                    case 99 /* SuperKeyword */:
+                    case 103 /* TrueKeyword */:
+                    case 101 /* ThisKeyword */:
+                    case 93 /* ImportKeyword */:
                         writeTokenNode(node, writeKeyword);
                         return;
                     // Expressions
-                    case 187 /* ArrayLiteralExpression */:
+                    case 188 /* ArrayLiteralExpression */:
                         return emitArrayLiteralExpression(node);
-                    case 188 /* ObjectLiteralExpression */:
+                    case 189 /* ObjectLiteralExpression */:
                         return emitObjectLiteralExpression(node);
-                    case 189 /* PropertyAccessExpression */:
+                    case 190 /* PropertyAccessExpression */:
                         return emitPropertyAccessExpression(node);
-                    case 190 /* ElementAccessExpression */:
+                    case 191 /* ElementAccessExpression */:
                         return emitElementAccessExpression(node);
-                    case 191 /* CallExpression */:
+                    case 192 /* CallExpression */:
                         return emitCallExpression(node);
-                    case 192 /* NewExpression */:
+                    case 193 /* NewExpression */:
                         return emitNewExpression(node);
-                    case 193 /* TaggedTemplateExpression */:
+                    case 194 /* TaggedTemplateExpression */:
                         return emitTaggedTemplateExpression(node);
-                    case 194 /* TypeAssertionExpression */:
+                    case 195 /* TypeAssertionExpression */:
                         return emitTypeAssertionExpression(node);
-                    case 195 /* ParenthesizedExpression */:
+                    case 196 /* ParenthesizedExpression */:
                         return emitParenthesizedExpression(node);
-                    case 196 /* FunctionExpression */:
+                    case 197 /* FunctionExpression */:
                         return emitFunctionExpression(node);
-                    case 197 /* ArrowFunction */:
+                    case 198 /* ArrowFunction */:
                         return emitArrowFunction(node);
-                    case 198 /* DeleteExpression */:
+                    case 199 /* DeleteExpression */:
                         return emitDeleteExpression(node);
-                    case 199 /* TypeOfExpression */:
+                    case 200 /* TypeOfExpression */:
                         return emitTypeOfExpression(node);
-                    case 200 /* VoidExpression */:
+                    case 201 /* VoidExpression */:
                         return emitVoidExpression(node);
-                    case 201 /* AwaitExpression */:
+                    case 202 /* AwaitExpression */:
                         return emitAwaitExpression(node);
-                    case 202 /* PrefixUnaryExpression */:
+                    case 203 /* PrefixUnaryExpression */:
                         return emitPrefixUnaryExpression(node);
-                    case 203 /* PostfixUnaryExpression */:
+                    case 204 /* PostfixUnaryExpression */:
                         return emitPostfixUnaryExpression(node);
-                    case 204 /* BinaryExpression */:
+                    case 205 /* BinaryExpression */:
                         return emitBinaryExpression(node);
-                    case 205 /* ConditionalExpression */:
+                    case 206 /* ConditionalExpression */:
                         return emitConditionalExpression(node);
-                    case 206 /* TemplateExpression */:
+                    case 207 /* TemplateExpression */:
                         return emitTemplateExpression(node);
-                    case 207 /* YieldExpression */:
+                    case 208 /* YieldExpression */:
                         return emitYieldExpression(node);
-                    case 208 /* SpreadElement */:
+                    case 209 /* SpreadElement */:
                         return emitSpreadExpression(node);
-                    case 209 /* ClassExpression */:
+                    case 210 /* ClassExpression */:
                         return emitClassExpression(node);
-                    case 210 /* OmittedExpression */:
+                    case 211 /* OmittedExpression */:
                         return;
-                    case 212 /* AsExpression */:
+                    case 213 /* AsExpression */:
                         return emitAsExpression(node);
-                    case 213 /* NonNullExpression */:
+                    case 214 /* NonNullExpression */:
                         return emitNonNullExpression(node);
-                    case 214 /* MetaProperty */:
+                    case 215 /* MetaProperty */:
                         return emitMetaProperty(node);
                     // JSX
-                    case 260 /* JsxElement */:
+                    case 261 /* JsxElement */:
                         return emitJsxElement(node);
-                    case 261 /* JsxSelfClosingElement */:
+                    case 262 /* JsxSelfClosingElement */:
                         return emitJsxSelfClosingElement(node);
-                    case 264 /* JsxFragment */:
+                    case 265 /* JsxFragment */:
                         return emitJsxFragment(node);
                     // Transformation nodes
-                    case 313 /* PartiallyEmittedExpression */:
+                    case 315 /* PartiallyEmittedExpression */:
                         return emitPartiallyEmittedExpression(node);
-                    case 314 /* CommaListExpression */:
+                    case 316 /* CommaListExpression */:
                         return emitCommaList(node);
                 }
             }
@@ -84055,7 +86685,7 @@ var ts;
         }
         function emitHelpers(node) {
             var helpersEmitted = false;
-            var bundle = node.kind === 285 /* Bundle */ ? node : undefined;
+            var bundle = node.kind === 286 /* Bundle */ ? node : undefined;
             if (bundle && moduleKind === ts.ModuleKind.None) {
                 return;
             }
@@ -84155,7 +86785,7 @@ var ts;
             var pos = getTextPosWithWriteLine();
             writeUnparsedNode(unparsed);
             if (bundleFileInfo) {
-                updateOrPushBundleFileTextLike(pos, writer.getTextPos(), unparsed.kind === 281 /* UnparsedText */ ?
+                updateOrPushBundleFileTextLike(pos, writer.getTextPos(), unparsed.kind === 282 /* UnparsedText */ ?
                     "text" /* Text */ :
                     "internal" /* Internal */);
             }
@@ -84188,7 +86818,7 @@ var ts;
             emit(node.right);
         }
         function emitEntityName(node) {
-            if (node.kind === 72 /* Identifier */) {
+            if (node.kind === 73 /* Identifier */) {
                 emitExpression(node);
             }
             else {
@@ -84224,7 +86854,7 @@ var ts;
             emit(node.dotDotDotToken);
             emitNodeWithWriter(node.name, writeParameter);
             emit(node.questionToken);
-            if (node.parent && node.parent.kind === 294 /* JSDocFunctionType */ && !node.name) {
+            if (node.parent && node.parent.kind === 295 /* JSDocFunctionType */ && !node.name) {
                 emit(node.type);
             }
             else {
@@ -84286,7 +86916,7 @@ var ts;
         function emitAccessorDeclaration(node) {
             emitDecorators(node, node.decorators);
             emitModifiers(node, node.modifiers);
-            writeKeyword(node.kind === 158 /* GetAccessor */ ? "get" : "set");
+            writeKeyword(node.kind === 159 /* GetAccessor */ ? "get" : "set");
             writeSpace();
             emit(node.name);
             emitSignatureAndBody(node, emitSignatureHead);
@@ -84463,7 +87093,7 @@ var ts;
             }
             if (node.readonlyToken) {
                 emit(node.readonlyToken);
-                if (node.readonlyToken.kind !== 133 /* ReadonlyKeyword */) {
+                if (node.readonlyToken.kind !== 134 /* ReadonlyKeyword */) {
                     writeKeyword("readonly");
                 }
                 writeSpace();
@@ -84613,7 +87243,7 @@ var ts;
             emitExpressionList(node, node.arguments, 2576 /* CallExpressionArguments */);
         }
         function emitNewExpression(node) {
-            emitTokenWithComment(95 /* NewKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(96 /* NewKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emitExpression(node.expression);
             emitTypeArguments(node, node.typeArguments);
@@ -84653,22 +87283,22 @@ var ts;
             emit(node.equalsGreaterThanToken);
         }
         function emitDeleteExpression(node) {
-            emitTokenWithComment(81 /* DeleteKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(82 /* DeleteKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emitExpression(node.expression);
         }
         function emitTypeOfExpression(node) {
-            emitTokenWithComment(104 /* TypeOfKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(105 /* TypeOfKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emitExpression(node.expression);
         }
         function emitVoidExpression(node) {
-            emitTokenWithComment(106 /* VoidKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(107 /* VoidKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emitExpression(node.expression);
         }
         function emitAwaitExpression(node) {
-            emitTokenWithComment(122 /* AwaitKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(123 /* AwaitKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emitExpression(node.expression);
         }
@@ -84693,7 +87323,7 @@ var ts;
             // expression a prefix increment whose operand is a plus expression - (++(+x))
             // The same is true of minus of course.
             var operand = node.operand;
-            return operand.kind === 202 /* PrefixUnaryExpression */
+            return operand.kind === 203 /* PrefixUnaryExpression */
                 && ((node.operator === 38 /* PlusToken */ && (operand.operator === 38 /* PlusToken */ || operand.operator === 44 /* PlusPlusToken */))
                     || (node.operator === 39 /* MinusToken */ && (operand.operator === 39 /* MinusToken */ || operand.operator === 45 /* MinusMinusToken */)));
         }
@@ -84708,7 +87338,7 @@ var ts;
             emitExpression(node.left);
             increaseIndentIf(indentBeforeOperator, isCommaOperator);
             emitLeadingCommentsOfPosition(node.operatorToken.pos);
-            writeTokenNode(node.operatorToken, node.operatorToken.kind === 93 /* InKeyword */ ? writeKeyword : writeOperator);
+            writeTokenNode(node.operatorToken, node.operatorToken.kind === 94 /* InKeyword */ ? writeKeyword : writeOperator);
             emitTrailingCommentsOfPosition(node.operatorToken.end, /*prefixSpace*/ true); // Binary operators should have a space before the comment starts
             increaseIndentIf(indentAfterOperator, /*writeSpaceIfNotIndenting*/ true);
             emitExpression(node.right);
@@ -84736,7 +87366,7 @@ var ts;
             emitList(node, node.templateSpans, 262144 /* TemplateExpressionSpans */);
         }
         function emitYieldExpression(node) {
-            emitTokenWithComment(117 /* YieldKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(118 /* YieldKeyword */, node.pos, writeKeyword, node);
             emit(node.asteriskToken);
             emitExpressionWithLeadingSpace(node.expression);
         }
@@ -84813,7 +87443,7 @@ var ts;
             }
         }
         function emitIfStatement(node) {
-            var openParenPos = emitTokenWithComment(91 /* IfKeyword */, node.pos, writeKeyword, node);
+            var openParenPos = emitTokenWithComment(92 /* IfKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emitTokenWithComment(20 /* OpenParenToken */, openParenPos, writePunctuation, node);
             emitExpression(node.expression);
@@ -84821,8 +87451,8 @@ var ts;
             emitEmbeddedStatement(node, node.thenStatement);
             if (node.elseStatement) {
                 writeLineOrSpace(node);
-                emitTokenWithComment(83 /* ElseKeyword */, node.thenStatement.end, writeKeyword, node);
-                if (node.elseStatement.kind === 222 /* IfStatement */) {
+                emitTokenWithComment(84 /* ElseKeyword */, node.thenStatement.end, writeKeyword, node);
+                if (node.elseStatement.kind === 223 /* IfStatement */) {
                     writeSpace();
                     emit(node.elseStatement);
                 }
@@ -84832,14 +87462,14 @@ var ts;
             }
         }
         function emitWhileClause(node, startPos) {
-            var openParenPos = emitTokenWithComment(107 /* WhileKeyword */, startPos, writeKeyword, node);
+            var openParenPos = emitTokenWithComment(108 /* WhileKeyword */, startPos, writeKeyword, node);
             writeSpace();
             emitTokenWithComment(20 /* OpenParenToken */, openParenPos, writePunctuation, node);
             emitExpression(node.expression);
             emitTokenWithComment(21 /* CloseParenToken */, node.expression.end, writePunctuation, node);
         }
         function emitDoStatement(node) {
-            emitTokenWithComment(82 /* DoKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(83 /* DoKeyword */, node.pos, writeKeyword, node);
             emitEmbeddedStatement(node, node.statement);
             if (ts.isBlock(node.statement)) {
                 writeSpace();
@@ -84855,7 +87485,7 @@ var ts;
             emitEmbeddedStatement(node, node.statement);
         }
         function emitForStatement(node) {
-            var openParenPos = emitTokenWithComment(89 /* ForKeyword */, node.pos, writeKeyword, node);
+            var openParenPos = emitTokenWithComment(90 /* ForKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             var pos = emitTokenWithComment(20 /* OpenParenToken */, openParenPos, writePunctuation, /*contextNode*/ node);
             emitForBinding(node.initializer);
@@ -84867,25 +87497,25 @@ var ts;
             emitEmbeddedStatement(node, node.statement);
         }
         function emitForInStatement(node) {
-            var openParenPos = emitTokenWithComment(89 /* ForKeyword */, node.pos, writeKeyword, node);
+            var openParenPos = emitTokenWithComment(90 /* ForKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emitTokenWithComment(20 /* OpenParenToken */, openParenPos, writePunctuation, node);
             emitForBinding(node.initializer);
             writeSpace();
-            emitTokenWithComment(93 /* InKeyword */, node.initializer.end, writeKeyword, node);
+            emitTokenWithComment(94 /* InKeyword */, node.initializer.end, writeKeyword, node);
             writeSpace();
             emitExpression(node.expression);
             emitTokenWithComment(21 /* CloseParenToken */, node.expression.end, writePunctuation, node);
             emitEmbeddedStatement(node, node.statement);
         }
         function emitForOfStatement(node) {
-            var openParenPos = emitTokenWithComment(89 /* ForKeyword */, node.pos, writeKeyword, node);
+            var openParenPos = emitTokenWithComment(90 /* ForKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emitWithTrailingSpace(node.awaitModifier);
             emitTokenWithComment(20 /* OpenParenToken */, openParenPos, writePunctuation, node);
             emitForBinding(node.initializer);
             writeSpace();
-            emitTokenWithComment(147 /* OfKeyword */, node.initializer.end, writeKeyword, node);
+            emitTokenWithComment(148 /* OfKeyword */, node.initializer.end, writeKeyword, node);
             writeSpace();
             emitExpression(node.expression);
             emitTokenWithComment(21 /* CloseParenToken */, node.expression.end, writePunctuation, node);
@@ -84893,7 +87523,7 @@ var ts;
         }
         function emitForBinding(node) {
             if (node !== undefined) {
-                if (node.kind === 238 /* VariableDeclarationList */) {
+                if (node.kind === 239 /* VariableDeclarationList */) {
                     emit(node);
                 }
                 else {
@@ -84902,12 +87532,12 @@ var ts;
             }
         }
         function emitContinueStatement(node) {
-            emitTokenWithComment(78 /* ContinueKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(79 /* ContinueKeyword */, node.pos, writeKeyword, node);
             emitWithLeadingSpace(node.label);
             writeTrailingSemicolon();
         }
         function emitBreakStatement(node) {
-            emitTokenWithComment(73 /* BreakKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(74 /* BreakKeyword */, node.pos, writeKeyword, node);
             emitWithLeadingSpace(node.label);
             writeTrailingSemicolon();
         }
@@ -84935,12 +87565,12 @@ var ts;
             return pos;
         }
         function emitReturnStatement(node) {
-            emitTokenWithComment(97 /* ReturnKeyword */, node.pos, writeKeyword, /*contextNode*/ node);
+            emitTokenWithComment(98 /* ReturnKeyword */, node.pos, writeKeyword, /*contextNode*/ node);
             emitExpressionWithLeadingSpace(node.expression);
             writeTrailingSemicolon();
         }
         function emitWithStatement(node) {
-            var openParenPos = emitTokenWithComment(108 /* WithKeyword */, node.pos, writeKeyword, node);
+            var openParenPos = emitTokenWithComment(109 /* WithKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emitTokenWithComment(20 /* OpenParenToken */, openParenPos, writePunctuation, node);
             emitExpression(node.expression);
@@ -84948,7 +87578,7 @@ var ts;
             emitEmbeddedStatement(node, node.statement);
         }
         function emitSwitchStatement(node) {
-            var openParenPos = emitTokenWithComment(99 /* SwitchKeyword */, node.pos, writeKeyword, node);
+            var openParenPos = emitTokenWithComment(100 /* SwitchKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emitTokenWithComment(20 /* OpenParenToken */, openParenPos, writePunctuation, node);
             emitExpression(node.expression);
@@ -84963,12 +87593,12 @@ var ts;
             emit(node.statement);
         }
         function emitThrowStatement(node) {
-            emitTokenWithComment(101 /* ThrowKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(102 /* ThrowKeyword */, node.pos, writeKeyword, node);
             emitExpressionWithLeadingSpace(node.expression);
             writeTrailingSemicolon();
         }
         function emitTryStatement(node) {
-            emitTokenWithComment(103 /* TryKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(104 /* TryKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emit(node.tryBlock);
             if (node.catchClause) {
@@ -84977,13 +87607,13 @@ var ts;
             }
             if (node.finallyBlock) {
                 writeLineOrSpace(node);
-                emitTokenWithComment(88 /* FinallyKeyword */, (node.catchClause || node.tryBlock).end, writeKeyword, node);
+                emitTokenWithComment(89 /* FinallyKeyword */, (node.catchClause || node.tryBlock).end, writeKeyword, node);
                 writeSpace();
                 emit(node.finallyBlock);
             }
         }
         function emitDebuggerStatement(node) {
-            writeToken(79 /* DebuggerKeyword */, node.pos, writeKeyword);
+            writeToken(80 /* DebuggerKeyword */, node.pos, writeKeyword);
             writeTrailingSemicolon();
         }
         //
@@ -85188,7 +87818,7 @@ var ts;
             var body = node.body;
             if (!body)
                 return writeTrailingSemicolon();
-            while (body.kind === 244 /* ModuleDeclaration */) {
+            while (body.kind === 245 /* ModuleDeclaration */) {
                 writePunctuation(".");
                 emit(body.name);
                 body = body.body;
@@ -85209,17 +87839,17 @@ var ts;
         }
         function emitImportEqualsDeclaration(node) {
             emitModifiers(node, node.modifiers);
-            emitTokenWithComment(92 /* ImportKeyword */, node.modifiers ? node.modifiers.end : node.pos, writeKeyword, node);
+            emitTokenWithComment(93 /* ImportKeyword */, node.modifiers ? node.modifiers.end : node.pos, writeKeyword, node);
             writeSpace();
             emit(node.name);
             writeSpace();
-            emitTokenWithComment(59 /* EqualsToken */, node.name.end, writePunctuation, node);
+            emitTokenWithComment(60 /* EqualsToken */, node.name.end, writePunctuation, node);
             writeSpace();
             emitModuleReference(node.moduleReference);
             writeTrailingSemicolon();
         }
         function emitModuleReference(node) {
-            if (node.kind === 72 /* Identifier */) {
+            if (node.kind === 73 /* Identifier */) {
                 emitExpression(node);
             }
             else {
@@ -85228,12 +87858,12 @@ var ts;
         }
         function emitImportDeclaration(node) {
             emitModifiers(node, node.modifiers);
-            emitTokenWithComment(92 /* ImportKeyword */, node.modifiers ? node.modifiers.end : node.pos, writeKeyword, node);
+            emitTokenWithComment(93 /* ImportKeyword */, node.modifiers ? node.modifiers.end : node.pos, writeKeyword, node);
             writeSpace();
             if (node.importClause) {
                 emit(node.importClause);
                 writeSpace();
-                emitTokenWithComment(144 /* FromKeyword */, node.importClause.end, writeKeyword, node);
+                emitTokenWithComment(145 /* FromKeyword */, node.importClause.end, writeKeyword, node);
                 writeSpace();
             }
             emitExpression(node.moduleSpecifier);
@@ -85250,7 +87880,7 @@ var ts;
         function emitNamespaceImport(node) {
             var asPos = emitTokenWithComment(40 /* AsteriskToken */, node.pos, writePunctuation, node);
             writeSpace();
-            emitTokenWithComment(119 /* AsKeyword */, asPos, writeKeyword, node);
+            emitTokenWithComment(120 /* AsKeyword */, asPos, writeKeyword, node);
             writeSpace();
             emit(node.name);
         }
@@ -85261,20 +87891,20 @@ var ts;
             emitImportOrExportSpecifier(node);
         }
         function emitExportAssignment(node) {
-            var nextPos = emitTokenWithComment(85 /* ExportKeyword */, node.pos, writeKeyword, node);
+            var nextPos = emitTokenWithComment(86 /* ExportKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             if (node.isExportEquals) {
-                emitTokenWithComment(59 /* EqualsToken */, nextPos, writeOperator, node);
+                emitTokenWithComment(60 /* EqualsToken */, nextPos, writeOperator, node);
             }
             else {
-                emitTokenWithComment(80 /* DefaultKeyword */, nextPos, writeKeyword, node);
+                emitTokenWithComment(81 /* DefaultKeyword */, nextPos, writeKeyword, node);
             }
             writeSpace();
             emitExpression(node.expression);
             writeTrailingSemicolon();
         }
         function emitExportDeclaration(node) {
-            var nextPos = emitTokenWithComment(85 /* ExportKeyword */, node.pos, writeKeyword, node);
+            var nextPos = emitTokenWithComment(86 /* ExportKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             if (node.exportClause) {
                 emit(node.exportClause);
@@ -85285,18 +87915,18 @@ var ts;
             if (node.moduleSpecifier) {
                 writeSpace();
                 var fromPos = node.exportClause ? node.exportClause.end : nextPos;
-                emitTokenWithComment(144 /* FromKeyword */, fromPos, writeKeyword, node);
+                emitTokenWithComment(145 /* FromKeyword */, fromPos, writeKeyword, node);
                 writeSpace();
                 emitExpression(node.moduleSpecifier);
             }
             writeTrailingSemicolon();
         }
         function emitNamespaceExportDeclaration(node) {
-            var nextPos = emitTokenWithComment(85 /* ExportKeyword */, node.pos, writeKeyword, node);
+            var nextPos = emitTokenWithComment(86 /* ExportKeyword */, node.pos, writeKeyword, node);
             writeSpace();
-            nextPos = emitTokenWithComment(119 /* AsKeyword */, nextPos, writeKeyword, node);
+            nextPos = emitTokenWithComment(120 /* AsKeyword */, nextPos, writeKeyword, node);
             writeSpace();
-            nextPos = emitTokenWithComment(131 /* NamespaceKeyword */, nextPos, writeKeyword, node);
+            nextPos = emitTokenWithComment(132 /* NamespaceKeyword */, nextPos, writeKeyword, node);
             writeSpace();
             emit(node.name);
             writeTrailingSemicolon();
@@ -85316,7 +87946,7 @@ var ts;
             if (node.propertyName) {
                 emit(node.propertyName);
                 writeSpace();
-                emitTokenWithComment(119 /* AsKeyword */, node.propertyName.end, writeKeyword, node);
+                emitTokenWithComment(120 /* AsKeyword */, node.propertyName.end, writeKeyword, node);
                 writeSpace();
             }
             emit(node.name);
@@ -85364,7 +87994,7 @@ var ts;
             writePunctuation(">");
         }
         function emitJsxText(node) {
-            writer.writeLiteral(getTextOfNode(node, /*includeTrivia*/ true));
+            writer.writeLiteral(node.text);
         }
         function emitJsxClosingElementOrFragment(node) {
             writePunctuation("</");
@@ -85394,7 +88024,7 @@ var ts;
             }
         }
         function emitJsxTagName(node) {
-            if (node.kind === 72 /* Identifier */) {
+            if (node.kind === 73 /* Identifier */) {
                 emitExpression(node);
             }
             else {
@@ -85405,13 +88035,13 @@ var ts;
         // Clauses
         //
         function emitCaseClause(node) {
-            emitTokenWithComment(74 /* CaseKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(75 /* CaseKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emitExpression(node.expression);
             emitCaseOrDefaultClauseRest(node, node.statements, node.expression.end);
         }
         function emitDefaultClause(node) {
-            var pos = emitTokenWithComment(80 /* DefaultKeyword */, node.pos, writeKeyword, node);
+            var pos = emitTokenWithComment(81 /* DefaultKeyword */, node.pos, writeKeyword, node);
             emitCaseOrDefaultClauseRest(node, node.statements, pos);
         }
         function emitCaseOrDefaultClauseRest(parentNode, statements, colonPos) {
@@ -85439,7 +88069,7 @@ var ts;
             emitList(node, node.types, 528 /* HeritageClauseTypes */);
         }
         function emitCatchClause(node) {
-            var openParenPos = emitTokenWithComment(75 /* CatchKeyword */, node.pos, writeKeyword, node);
+            var openParenPos = emitTokenWithComment(76 /* CatchKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             if (node.variableDeclaration) {
                 emitTokenWithComment(20 /* OpenParenToken */, openParenPos, writePunctuation, node);
@@ -85509,7 +88139,7 @@ var ts;
                 }
             }
             if (node.tags) {
-                if (node.tags.length === 1 && node.tags[0].kind === 307 /* JSDocTypeTag */ && !node.comment) {
+                if (node.tags.length === 1 && node.tags[0].kind === 309 /* JSDocTypeTag */ && !node.comment) {
                     writeSpace();
                     emit(node.tags[0]);
                 }
@@ -85543,7 +88173,7 @@ var ts;
         function emitJSDocTypedefTag(tag) {
             emitJSDocTagName(tag.tagName);
             if (tag.typeExpression) {
-                if (tag.typeExpression.kind === 288 /* JSDocTypeExpression */) {
+                if (tag.typeExpression.kind === 289 /* JSDocTypeExpression */) {
                     emitJSDocTypeExpression(tag.typeExpression);
                 }
                 else {
@@ -85562,7 +88192,7 @@ var ts;
                 emit(tag.fullName);
             }
             emitJSDocComment(tag.comment);
-            if (tag.typeExpression && tag.typeExpression.kind === 297 /* JSDocTypeLiteral */) {
+            if (tag.typeExpression && tag.typeExpression.kind === 298 /* JSDocTypeLiteral */) {
                 emitJSDocTypeLiteral(tag.typeExpression);
             }
         }
@@ -85877,7 +88507,7 @@ var ts;
         function emitInitializer(node, equalCommentStartPos, container) {
             if (node) {
                 writeSpace();
-                emitTokenWithComment(59 /* EqualsToken */, equalCommentStartPos, writeOperator, container);
+                emitTokenWithComment(60 /* EqualsToken */, equalCommentStartPos, writeOperator, container);
                 writeSpace();
                 emitExpression(node);
             }
@@ -86340,7 +88970,7 @@ var ts;
                 && ts.rangeEndIsOnSameLineAsRangeStart(block, block, currentSourceFile);
         }
         function skipSynthesizedParentheses(node) {
-            while (node.kind === 195 /* ParenthesizedExpression */ && ts.nodeIsSynthesized(node)) {
+            while (node.kind === 196 /* ParenthesizedExpression */ && ts.nodeIsSynthesized(node)) {
                 node = node.expression;
             }
             return node;
@@ -86405,81 +89035,81 @@ var ts;
             if (!node)
                 return;
             switch (node.kind) {
-                case 218 /* Block */:
+                case 219 /* Block */:
                     ts.forEach(node.statements, generateNames);
                     break;
-                case 233 /* LabeledStatement */:
-                case 231 /* WithStatement */:
-                case 223 /* DoStatement */:
-                case 224 /* WhileStatement */:
+                case 234 /* LabeledStatement */:
+                case 232 /* WithStatement */:
+                case 224 /* DoStatement */:
+                case 225 /* WhileStatement */:
                     generateNames(node.statement);
                     break;
-                case 222 /* IfStatement */:
+                case 223 /* IfStatement */:
                     generateNames(node.thenStatement);
                     generateNames(node.elseStatement);
                     break;
-                case 225 /* ForStatement */:
-                case 227 /* ForOfStatement */:
-                case 226 /* ForInStatement */:
+                case 226 /* ForStatement */:
+                case 228 /* ForOfStatement */:
+                case 227 /* ForInStatement */:
                     generateNames(node.initializer);
                     generateNames(node.statement);
                     break;
-                case 232 /* SwitchStatement */:
+                case 233 /* SwitchStatement */:
                     generateNames(node.caseBlock);
                     break;
-                case 246 /* CaseBlock */:
+                case 247 /* CaseBlock */:
                     ts.forEach(node.clauses, generateNames);
                     break;
-                case 271 /* CaseClause */:
-                case 272 /* DefaultClause */:
+                case 272 /* CaseClause */:
+                case 273 /* DefaultClause */:
                     ts.forEach(node.statements, generateNames);
                     break;
-                case 235 /* TryStatement */:
+                case 236 /* TryStatement */:
                     generateNames(node.tryBlock);
                     generateNames(node.catchClause);
                     generateNames(node.finallyBlock);
                     break;
-                case 274 /* CatchClause */:
+                case 275 /* CatchClause */:
                     generateNames(node.variableDeclaration);
                     generateNames(node.block);
                     break;
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     generateNames(node.declarationList);
                     break;
-                case 238 /* VariableDeclarationList */:
+                case 239 /* VariableDeclarationList */:
                     ts.forEach(node.declarations, generateNames);
                     break;
-                case 237 /* VariableDeclaration */:
-                case 151 /* Parameter */:
-                case 186 /* BindingElement */:
-                case 240 /* ClassDeclaration */:
+                case 238 /* VariableDeclaration */:
+                case 152 /* Parameter */:
+                case 187 /* BindingElement */:
+                case 241 /* ClassDeclaration */:
                     generateNameIfNeeded(node.name);
                     break;
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     generateNameIfNeeded(node.name);
                     if (ts.getEmitFlags(node) & 524288 /* ReuseTempVariableScope */) {
                         ts.forEach(node.parameters, generateNames);
                         generateNames(node.body);
                     }
                     break;
-                case 184 /* ObjectBindingPattern */:
-                case 185 /* ArrayBindingPattern */:
+                case 185 /* ObjectBindingPattern */:
+                case 186 /* ArrayBindingPattern */:
                     ts.forEach(node.elements, generateNames);
                     break;
-                case 249 /* ImportDeclaration */:
+                case 250 /* ImportDeclaration */:
                     generateNames(node.importClause);
                     break;
-                case 250 /* ImportClause */:
+                case 251 /* ImportClause */:
                     generateNameIfNeeded(node.name);
                     generateNames(node.namedBindings);
                     break;
-                case 251 /* NamespaceImport */:
+                case 252 /* NamespaceImport */:
                     generateNameIfNeeded(node.name);
                     break;
-                case 252 /* NamedImports */:
+                case 253 /* NamedImports */:
                     ts.forEach(node.elements, generateNames);
                     break;
-                case 253 /* ImportSpecifier */:
+                case 254 /* ImportSpecifier */:
                     generateNameIfNeeded(node.propertyName || node.name);
                     break;
             }
@@ -86488,12 +89118,12 @@ var ts;
             if (!node)
                 return;
             switch (node.kind) {
-                case 275 /* PropertyAssignment */:
-                case 276 /* ShorthandPropertyAssignment */:
-                case 154 /* PropertyDeclaration */:
-                case 156 /* MethodDeclaration */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 276 /* PropertyAssignment */:
+                case 277 /* ShorthandPropertyAssignment */:
+                case 155 /* PropertyDeclaration */:
+                case 157 /* MethodDeclaration */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     generateNameIfNeeded(node.name);
                     break;
             }
@@ -86673,24 +89303,26 @@ var ts;
          */
         function generateNameForNode(node, flags) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return makeUniqueName(getTextOfNode(node), isUniqueName, !!(flags & 16 /* Optimistic */), !!(flags & 8 /* ReservedInNestedScopes */));
-                case 244 /* ModuleDeclaration */:
-                case 243 /* EnumDeclaration */:
+                case 245 /* ModuleDeclaration */:
+                case 244 /* EnumDeclaration */:
                     return generateNameForModuleOrEnum(node);
-                case 249 /* ImportDeclaration */:
-                case 255 /* ExportDeclaration */:
+                case 250 /* ImportDeclaration */:
+                case 256 /* ExportDeclaration */:
                     return generateNameForImportOrExportDeclaration(node);
-                case 239 /* FunctionDeclaration */:
-                case 240 /* ClassDeclaration */:
-                case 254 /* ExportAssignment */:
+                case 240 /* FunctionDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 255 /* ExportAssignment */:
                     return generateNameForExportDefault();
-                case 209 /* ClassExpression */:
+                case 210 /* ClassExpression */:
                     return generateNameForClassExpression();
-                case 156 /* MethodDeclaration */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 157 /* MethodDeclaration */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     return generateNameForMethodOrAccessor(node);
+                case 150 /* ComputedPropertyName */:
+                    return makeTempVariableName(0 /* Auto */, /*reserveInNestedScopes*/ true);
                 default:
                     return makeTempVariableName(0 /* Auto */);
             }
@@ -86736,7 +89368,7 @@ var ts;
             hasWrittenComment = false;
             var emitFlags = ts.getEmitFlags(node);
             var _a = ts.getCommentRange(node), pos = _a.pos, end = _a.end;
-            var isEmittedNode = node.kind !== 312 /* NotEmittedStatement */;
+            var isEmittedNode = node.kind !== 314 /* NotEmittedStatement */;
             // We have to explicitly check that the node is JsxText because if the compilerOptions.jsx is "preserve" we will not do any transformation.
             // It is expensive to walk entire tree just to set one kind of node to have no comments.
             var skipLeadingComments = pos < 0 || (emitFlags & 512 /* NoLeadingComments */) !== 0 || node.kind === 11 /* JsxText */;
@@ -86760,7 +89392,7 @@ var ts;
                     containerEnd = end;
                     // To avoid invalid comment emit in a down-level binding pattern, we
                     // keep track of the last declaration list container's end
-                    if (node.kind === 238 /* VariableDeclarationList */) {
+                    if (node.kind === 239 /* VariableDeclarationList */) {
                         declarationListContainerEnd = end;
                     }
                 }
@@ -87017,7 +89649,7 @@ var ts;
             else {
                 var _a = ts.getSourceMapRange(node), pos = _a.pos, end = _a.end, _b = _a.source, source = _b === void 0 ? sourceMapSource : _b;
                 var emitFlags = ts.getEmitFlags(node);
-                if (node.kind !== 312 /* NotEmittedStatement */
+                if (node.kind !== 314 /* NotEmittedStatement */
                     && (emitFlags & 16 /* NoLeadingSourceMap */) === 0
                     && pos >= 0) {
                     emitSourcePos(source, skipSourceTrivia(source, pos));
@@ -87030,7 +89662,7 @@ var ts;
                 else {
                     pipelinePhase(hint, node);
                 }
-                if (node.kind !== 312 /* NotEmittedStatement */
+                if (node.kind !== 314 /* NotEmittedStatement */
                     && (emitFlags & 32 /* NoTrailingSourceMap */) === 0
                     && end >= 0) {
                     emitSourcePos(source, end);
@@ -87158,7 +89790,8 @@ var ts;
             writeFile: host.writeFile && writeFile,
             addOrDeleteFileOrDirectory: addOrDeleteFileOrDirectory,
             addOrDeleteFile: addOrDeleteFile,
-            clearCache: clearCache
+            clearCache: clearCache,
+            realpath: host.realpath && realpath
         };
         function toPath(fileName) {
             return ts.toPath(fileName, currentDirectory, getCanonicalFileName);
@@ -87255,7 +89888,7 @@ var ts;
             var rootDirPath = toPath(rootDir);
             var result = tryReadDirectory(rootDir, rootDirPath);
             if (result) {
-                return ts.matchFiles(rootDir, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory, depth, getFileSystemEntries);
+                return ts.matchFiles(rootDir, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory, depth, getFileSystemEntries, realpath);
             }
             return host.readDirectory(rootDir, extensions, excludes, includes, depth);
             function getFileSystemEntries(dir) {
@@ -87266,6 +89899,9 @@ var ts;
                 return tryReadDirectory(dir, path) || ts.emptyFileSystemEntries;
             }
         }
+        function realpath(s) {
+            return host.realpath ? host.realpath(s) : s;
+        }
         function addOrDeleteFileOrDirectory(fileOrDirectory, fileOrDirectoryPath) {
             var existingResult = getCachedFileSystemEntries(fileOrDirectoryPath);
             if (existingResult) {
@@ -87536,11 +90172,7 @@ var ts;
     function createCompilerHostWorker(options, setParentNodes, system) {
         if (system === void 0) { system = ts.sys; }
         var existingDirectories = ts.createMap();
-        function getCanonicalFileName(fileName) {
-            // if underlying system can distinguish between two files whose names differs only in cases then file name already in canonical form.
-            // otherwise use toLowerCase as a canonical form.
-            return system.useCaseSensitiveFileNames ? fileName : fileName.toLowerCase();
-        }
+        var getCanonicalFileName = ts.createGetCanonicalFileName(system.useCaseSensitiveFileNames);
         function getSourceFile(fileName, languageVersion, onError) {
             var text;
             try {
@@ -87645,7 +90277,8 @@ var ts;
             getDirectories: function (path) { return system.getDirectories(path); },
             realpath: realpath,
             readDirectory: function (path, extensions, include, exclude, depth) { return system.readDirectory(path, extensions, include, exclude, depth); },
-            createDirectory: function (d) { return system.createDirectory(d); }
+            createDirectory: function (d) { return system.createDirectory(d); },
+            createHash: ts.maybeBind(system, system.createHash)
         };
         return compilerHost;
     }
@@ -87892,11 +90525,11 @@ var ts;
                 if (diagnostic.relatedInformation) {
                     output += host.getNewLine();
                     for (var _a = 0, _b = diagnostic.relatedInformation; _a < _b.length; _a++) {
-                        var _c = _b[_a], file = _c.file, start = _c.start, length_4 = _c.length, messageText = _c.messageText;
+                        var _c = _b[_a], file = _c.file, start = _c.start, length_7 = _c.length, messageText = _c.messageText;
                         if (file) {
                             output += host.getNewLine();
                             output += halfIndent + formatLocation(file, start, host); // TODO: GH#18217
-                            output += formatCodeSpan(file, start, length_4, indent, ForegroundColorEscapeSequences.Cyan, host); // TODO: GH#18217
+                            output += formatCodeSpan(file, start, length_7, indent, ForegroundColorEscapeSequences.Cyan, host); // TODO: GH#18217
                         }
                         output += host.getNewLine();
                         output += indent + flattenDiagnosticMessageText(messageText, host.getNewLine());
@@ -87908,29 +90541,33 @@ var ts;
         return output;
     }
     ts.formatDiagnosticsWithColorAndContext = formatDiagnosticsWithColorAndContext;
-    function flattenDiagnosticMessageText(messageText, newLine) {
-        if (ts.isString(messageText)) {
-            return messageText;
+    function flattenDiagnosticMessageText(diag, newLine, indent) {
+        if (indent === void 0) { indent = 0; }
+        if (ts.isString(diag)) {
+            return diag;
         }
-        else {
-            var diagnosticChain = messageText;
-            var result = "";
-            var indent_1 = 0;
-            while (diagnosticChain) {
-                if (indent_1) {
-                    result += newLine;
-                    for (var i = 0; i < indent_1; i++) {
-                        result += "  ";
-                    }
-                }
-                result += diagnosticChain.messageText;
-                indent_1++;
-                diagnosticChain = diagnosticChain.next;
+        else if (diag === undefined) {
+            return "";
+        }
+        var result = "";
+        if (indent) {
+            result += newLine;
+            for (var i = 0; i < indent; i++) {
+                result += "  ";
             }
-            return result;
         }
+        result += diag.messageText;
+        indent++;
+        if (diag.next) {
+            for (var _i = 0, _a = diag.next; _i < _a.length; _i++) {
+                var kid = _a[_i];
+                result += flattenDiagnosticMessageText(kid, newLine, indent);
+            }
+        }
+        return result;
     }
     ts.flattenDiagnosticMessageText = flattenDiagnosticMessageText;
+    /* @internal */
     function loadWithLocalCache(names, containingFile, redirectedReference, loader) {
         if (names.length === 0) {
             return [];
@@ -87950,6 +90587,7 @@ var ts;
         }
         return resolutions;
     }
+    ts.loadWithLocalCache = loadWithLocalCache;
     /**
      * Determines if program structure is upto date or needs to be recreated
      */
@@ -88109,7 +90747,7 @@ var ts;
             }); };
         }
         else {
-            moduleResolutionCache = ts.createModuleResolutionCache(currentDirectory, function (x) { return host.getCanonicalFileName(x); });
+            moduleResolutionCache = ts.createModuleResolutionCache(currentDirectory, function (x) { return host.getCanonicalFileName(x); }, options);
             var loader_1 = function (moduleName, containingFile, redirectedReference) { return ts.resolveModuleName(moduleName, containingFile, options, host, moduleResolutionCache, redirectedReference).resolvedModule; }; // TODO: GH#18217
             resolveModuleNamesWorker = function (moduleNames, containingFile, _reusedNames, redirectedReference) { return loadWithLocalCache(ts.Debug.assertEachDefined(moduleNames), containingFile, redirectedReference, loader_1); };
         }
@@ -88156,11 +90794,18 @@ var ts;
                 if (rootNames.length) {
                     for (var _i = 0, resolvedProjectReferences_1 = resolvedProjectReferences; _i < resolvedProjectReferences_1.length; _i++) {
                         var parsedRef = resolvedProjectReferences_1[_i];
-                        if (parsedRef) {
-                            var out = parsedRef.commandLine.options.outFile || parsedRef.commandLine.options.out;
-                            if (out) {
-                                var dtsOutfile = ts.changeExtension(out, ".d.ts");
-                                processSourceFile(dtsOutfile, /*isDefaultLib*/ false, /*ignoreNoDefaultLib*/ false, /*packageId*/ undefined);
+                        if (!parsedRef)
+                            continue;
+                        var out = parsedRef.commandLine.options.outFile || parsedRef.commandLine.options.out;
+                        if (out) {
+                            processSourceFile(ts.changeExtension(out, ".d.ts"), /*isDefaultLib*/ false, /*ignoreNoDefaultLib*/ false, /*packageId*/ undefined);
+                        }
+                        else if (ts.getEmitModuleKind(parsedRef.commandLine.options) === ts.ModuleKind.None) {
+                            for (var _a = 0, _b = parsedRef.commandLine.fileNames; _a < _b.length; _a++) {
+                                var fileName = _b[_a];
+                                if (!ts.fileExtensionIs(fileName, ".d.ts" /* Dts */) && ts.hasTSFileExtension(fileName)) {
+                                    processSourceFile(ts.getOutputDeclarationFileName(fileName, parsedRef.commandLine, !host.useCaseSensitiveFileNames()), /*isDefaultLib*/ false, /*ignoreNoDefaultLib*/ false, /*packageId*/ undefined);
+                                }
                             }
                         }
                     }
@@ -88208,8 +90853,8 @@ var ts;
         // not part of the new program.
         if (oldProgram && host.onReleaseOldSourceFile) {
             var oldSourceFiles = oldProgram.getSourceFiles();
-            for (var _a = 0, oldSourceFiles_1 = oldSourceFiles; _a < oldSourceFiles_1.length; _a++) {
-                var oldSourceFile = oldSourceFiles_1[_a];
+            for (var _c = 0, oldSourceFiles_1 = oldSourceFiles; _c < oldSourceFiles_1.length; _c++) {
+                var oldSourceFile = oldSourceFiles_1[_c];
                 var newFile = getSourceFileByPath(oldSourceFile.resolvedPath);
                 if (shouldCreateNewSourceFile || !newFile ||
                     // old file wasnt redirect but new file is
@@ -88248,6 +90893,7 @@ var ts;
             getIdentifierCount: function () { return getDiagnosticsProducingTypeChecker().getIdentifierCount(); },
             getSymbolCount: function () { return getDiagnosticsProducingTypeChecker().getSymbolCount(); },
             getTypeCount: function () { return getDiagnosticsProducingTypeChecker().getTypeCount(); },
+            getRelationCacheSizes: function () { return getDiagnosticsProducingTypeChecker().getRelationCacheSizes(); },
             getFileProcessingDiagnostics: function () { return fileProcessingDiagnostics; },
             getResolvedTypeReferenceDirectives: function () { return resolvedTypeReferenceDirectives; },
             isSourceFileFromExternalLibrary: isSourceFileFromExternalLibrary,
@@ -88295,7 +90941,7 @@ var ts;
         }
         function getCommonSourceDirectory() {
             if (commonSourceDirectory === undefined) {
-                var emittedFiles = ts.filter(files, function (file) { return ts.sourceFileMayBeEmitted(file, options, isSourceFileFromExternalLibrary); });
+                var emittedFiles = ts.filter(files, function (file) { return ts.sourceFileMayBeEmitted(file, options, isSourceFileFromExternalLibrary, getResolvedProjectReferenceToRedirect); });
                 if (options.rootDir && checkSourceFilesBelongToPath(emittedFiles, options.rootDir)) {
                     // If a rootDir is specified use it as the commonSourceDirectory
                     commonSourceDirectory = ts.getNormalizedAbsolutePath(options.rootDir, currentDirectory);
@@ -88345,13 +90991,13 @@ var ts;
                 // which per above occurred during the current program creation.
                 // Since we assume the filesystem does not change during program creation,
                 // it is safe to reuse resolutions from the earlier call.
-                var result_6 = [];
+                var result_9 = [];
                 for (var _i = 0, moduleNames_1 = moduleNames; _i < moduleNames_1.length; _i++) {
                     var moduleName = moduleNames_1[_i];
                     var resolvedModule = file.resolvedModules.get(moduleName);
-                    result_6.push(resolvedModule);
+                    result_9.push(resolvedModule);
                 }
-                return result_6;
+                return result_9;
             }
             // At this point, we know at least one of the following hold:
             // - file has local declarations for ambient modules
@@ -88438,7 +91084,7 @@ var ts;
             function moduleNameResolvesToAmbientModuleInNonModifiedFile(moduleName) {
                 var resolutionToFile = ts.getResolvedModule(oldSourceFile, moduleName);
                 var resolvedFile = resolutionToFile && oldProgram.getSourceFile(resolutionToFile.resolvedFileName);
-                if (resolutionToFile && resolvedFile && !resolvedFile.externalModuleIndicator) {
+                if (resolutionToFile && resolvedFile) {
                     // In the old program, we resolved to an ambient module that was in the same
                     //   place as we expected to find an actual module file.
                     // We actually need to return 'false' here even though this seems like a 'true' case
@@ -88667,7 +91313,7 @@ var ts;
                 var filePath = newSourceFile.path;
                 addFileToFilesByName(newSourceFile, filePath, newSourceFile.resolvedPath);
                 // Set the file as found during node modules search if it was found that way in old progra,
-                if (oldProgram.isSourceFileFromExternalLibrary(oldProgram.getSourceFileByPath(filePath))) {
+                if (oldProgram.isSourceFileFromExternalLibrary(oldProgram.getSourceFileByPath(newSourceFile.resolvedPath))) {
                     sourceFilesFoundSearchingNodeModules.set(filePath, true);
                 }
             }
@@ -88684,7 +91330,8 @@ var ts;
         }
         function getEmitHost(writeFileCallback) {
             return __assign({ getPrependNodes: getPrependNodes,
-                getCanonicalFileName: getCanonicalFileName, getCommonSourceDirectory: program.getCommonSourceDirectory, getCompilerOptions: program.getCompilerOptions, getCurrentDirectory: function () { return currentDirectory; }, getNewLine: function () { return host.getNewLine(); }, getSourceFile: program.getSourceFile, getSourceFileByPath: program.getSourceFileByPath, getSourceFiles: program.getSourceFiles, getLibFileFromReference: program.getLibFileFromReference, isSourceFileFromExternalLibrary: isSourceFileFromExternalLibrary, writeFile: writeFileCallback || (function (fileName, data, writeByteOrderMark, onError, sourceFiles) { return host.writeFile(fileName, data, writeByteOrderMark, onError, sourceFiles); }), isEmitBlocked: isEmitBlocked, readFile: function (f) { return host.readFile(f); }, fileExists: function (f) {
+                getCanonicalFileName: getCanonicalFileName, getCommonSourceDirectory: program.getCommonSourceDirectory, getCompilerOptions: program.getCompilerOptions, getCurrentDirectory: function () { return currentDirectory; }, getNewLine: function () { return host.getNewLine(); }, getSourceFile: program.getSourceFile, getSourceFileByPath: program.getSourceFileByPath, getSourceFiles: program.getSourceFiles, getLibFileFromReference: program.getLibFileFromReference, isSourceFileFromExternalLibrary: isSourceFileFromExternalLibrary,
+                getResolvedProjectReferenceToRedirect: getResolvedProjectReferenceToRedirect, writeFile: writeFileCallback || (function (fileName, data, writeByteOrderMark, onError, sourceFiles) { return host.writeFile(fileName, data, writeByteOrderMark, onError, sourceFiles); }), isEmitBlocked: isEmitBlocked, readFile: function (f) { return host.readFile(f); }, fileExists: function (f) {
                     // Use local caches
                     var path = toPath(f);
                     if (getSourceFileByPath(path))
@@ -88693,16 +91340,15 @@ var ts;
                         return false;
                     // Before falling back to the host
                     return host.fileExists(f);
-                } }, (host.directoryExists ? { directoryExists: function (f) { return host.directoryExists(f); } } : {}), { useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); }, getProgramBuildInfo: function () { return program.getProgramBuildInfo && program.getProgramBuildInfo(); } });
+                } }, (host.directoryExists ? { directoryExists: function (f) { return host.directoryExists(f); } } : {}), { useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); }, getProgramBuildInfo: function () { return program.getProgramBuildInfo && program.getProgramBuildInfo(); }, getSourceFileFromReference: function (file, ref) { return program.getSourceFileFromReference(file, ref); } });
         }
         function emitBuildInfo(writeFileCallback) {
             ts.Debug.assert(!options.out && !options.outFile);
             ts.performance.mark("beforeEmit");
             var emitResult = ts.emitFiles(ts.notImplementedResolver, getEmitHost(writeFileCallback), 
             /*targetSourceFile*/ undefined, 
+            /*transformers*/ ts.noTransformers, 
             /*emitOnlyDtsFiles*/ false, 
-            /*transformers*/ undefined, 
-            /*declaraitonTransformers*/ undefined, 
             /*onlyBuildInfo*/ true);
             ts.performance.mark("afterEmit");
             ts.performance.measure("Emit", "beforeEmit", "afterEmit");
@@ -88790,8 +91436,7 @@ var ts;
             // checked is to not pass the file to getEmitResolver.
             var emitResolver = getDiagnosticsProducingTypeChecker().getEmitResolver((options.outFile || options.out) ? undefined : sourceFile, cancellationToken);
             ts.performance.mark("beforeEmit");
-            var transformers = emitOnlyDtsFiles ? [] : ts.getTransformers(options, customTransformers);
-            var emitResult = ts.emitFiles(emitResolver, getEmitHost(writeFileCallback), sourceFile, emitOnlyDtsFiles, transformers, customTransformers && customTransformers.afterDeclarations);
+            var emitResult = ts.emitFiles(emitResolver, getEmitHost(writeFileCallback), sourceFile, ts.getTransformers(options, customTransformers, emitOnlyDtsFiles), emitOnlyDtsFiles);
             ts.performance.mark("afterEmit");
             ts.performance.measure("Emit", "beforeEmit", "afterEmit");
             return emitResult;
@@ -88883,8 +91528,8 @@ var ts;
                 for (var _i = 0, _a = [bindDiagnostics, checkDiagnostics, fileProcessingDiagnosticsInFile, programDiagnosticsInFile, isCheckJs ? sourceFile.jsDocDiagnostics : undefined]; _i < _a.length; _i++) {
                     var diags = _a[_i];
                     if (diags) {
-                        for (var _b = 0, diags_1 = diags; _b < diags_1.length; _b++) {
-                            var diag = diags_1[_b];
+                        for (var _b = 0, diags_4 = diags; _b < diags_4.length; _b++) {
+                            var diag = diags_4[_b];
                             if (shouldReportDiagnostic(diag)) {
                                 diagnostics = ts.append(diagnostics, diag);
                             }
@@ -88933,22 +91578,22 @@ var ts;
                     // Return directly from the case if the given node doesnt want to visit each child
                     // Otherwise break to visit each child
                     switch (parent.kind) {
-                        case 151 /* Parameter */:
-                        case 154 /* PropertyDeclaration */:
+                        case 152 /* Parameter */:
+                        case 155 /* PropertyDeclaration */:
                             if (parent.questionToken === node) {
                                 diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics._0_can_only_be_used_in_a_ts_file, "?"));
                                 return;
                             }
                         // falls through
-                        case 156 /* MethodDeclaration */:
-                        case 155 /* MethodSignature */:
-                        case 157 /* Constructor */:
-                        case 158 /* GetAccessor */:
-                        case 159 /* SetAccessor */:
-                        case 196 /* FunctionExpression */:
-                        case 239 /* FunctionDeclaration */:
-                        case 197 /* ArrowFunction */:
-                        case 237 /* VariableDeclaration */:
+                        case 157 /* MethodDeclaration */:
+                        case 156 /* MethodSignature */:
+                        case 158 /* Constructor */:
+                        case 159 /* GetAccessor */:
+                        case 160 /* SetAccessor */:
+                        case 197 /* FunctionExpression */:
+                        case 240 /* FunctionDeclaration */:
+                        case 198 /* ArrowFunction */:
+                        case 238 /* VariableDeclaration */:
                             // type annotation
                             if (parent.type === node) {
                                 diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.types_can_only_be_used_in_a_ts_file));
@@ -88956,41 +91601,41 @@ var ts;
                             }
                     }
                     switch (node.kind) {
-                        case 248 /* ImportEqualsDeclaration */:
+                        case 249 /* ImportEqualsDeclaration */:
                             diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.import_can_only_be_used_in_a_ts_file));
                             return;
-                        case 254 /* ExportAssignment */:
+                        case 255 /* ExportAssignment */:
                             if (node.isExportEquals) {
                                 diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.export_can_only_be_used_in_a_ts_file));
                                 return;
                             }
                             break;
-                        case 273 /* HeritageClause */:
+                        case 274 /* HeritageClause */:
                             var heritageClause = node;
-                            if (heritageClause.token === 109 /* ImplementsKeyword */) {
+                            if (heritageClause.token === 110 /* ImplementsKeyword */) {
                                 diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.implements_clauses_can_only_be_used_in_a_ts_file));
                                 return;
                             }
                             break;
-                        case 241 /* InterfaceDeclaration */:
+                        case 242 /* InterfaceDeclaration */:
                             diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.interface_declarations_can_only_be_used_in_a_ts_file));
                             return;
-                        case 244 /* ModuleDeclaration */:
+                        case 245 /* ModuleDeclaration */:
                             diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.module_declarations_can_only_be_used_in_a_ts_file));
                             return;
-                        case 242 /* TypeAliasDeclaration */:
+                        case 243 /* TypeAliasDeclaration */:
                             diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.type_aliases_can_only_be_used_in_a_ts_file));
                             return;
-                        case 243 /* EnumDeclaration */:
+                        case 244 /* EnumDeclaration */:
                             diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.enum_declarations_can_only_be_used_in_a_ts_file));
                             return;
-                        case 213 /* NonNullExpression */:
+                        case 214 /* NonNullExpression */:
                             diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.non_null_assertions_can_only_be_used_in_a_ts_file));
                             return;
-                        case 212 /* AsExpression */:
+                        case 213 /* AsExpression */:
                             diagnostics.push(createDiagnosticForNode(node.type, ts.Diagnostics.type_assertion_expressions_can_only_be_used_in_a_ts_file));
                             return;
-                        case 194 /* TypeAssertionExpression */:
+                        case 195 /* TypeAssertionExpression */:
                             ts.Debug.fail(); // Won't parse these in a JS file anyway, as they are interpreted as JSX.
                     }
                     var prevParent = parent;
@@ -89000,54 +91645,54 @@ var ts;
                 }
                 function walkArray(nodes) {
                     if (parent.decorators === nodes && !options.experimentalDecorators) {
-                        diagnostics.push(createDiagnosticForNode(parent, ts.Diagnostics.Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_to_remove_this_warning));
+                        diagnostics.push(createDiagnosticForNode(parent, ts.Diagnostics.Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_in_your_tsconfig_or_jsconfig_to_remove_this_warning));
                     }
                     switch (parent.kind) {
-                        case 240 /* ClassDeclaration */:
-                        case 156 /* MethodDeclaration */:
-                        case 155 /* MethodSignature */:
-                        case 157 /* Constructor */:
-                        case 158 /* GetAccessor */:
-                        case 159 /* SetAccessor */:
-                        case 196 /* FunctionExpression */:
-                        case 239 /* FunctionDeclaration */:
-                        case 197 /* ArrowFunction */:
+                        case 241 /* ClassDeclaration */:
+                        case 157 /* MethodDeclaration */:
+                        case 156 /* MethodSignature */:
+                        case 158 /* Constructor */:
+                        case 159 /* GetAccessor */:
+                        case 160 /* SetAccessor */:
+                        case 197 /* FunctionExpression */:
+                        case 240 /* FunctionDeclaration */:
+                        case 198 /* ArrowFunction */:
                             // Check type parameters
                             if (nodes === parent.typeParameters) {
                                 diagnostics.push(createDiagnosticForNodeArray(nodes, ts.Diagnostics.type_parameter_declarations_can_only_be_used_in_a_ts_file));
                                 return;
                             }
                         // falls through
-                        case 219 /* VariableStatement */:
+                        case 220 /* VariableStatement */:
                             // Check modifiers
                             if (nodes === parent.modifiers) {
-                                return checkModifiers(nodes, parent.kind === 219 /* VariableStatement */);
+                                return checkModifiers(nodes, parent.kind === 220 /* VariableStatement */);
                             }
                             break;
-                        case 154 /* PropertyDeclaration */:
+                        case 155 /* PropertyDeclaration */:
                             // Check modifiers of property declaration
                             if (nodes === parent.modifiers) {
                                 for (var _i = 0, _a = nodes; _i < _a.length; _i++) {
                                     var modifier = _a[_i];
-                                    if (modifier.kind !== 116 /* StaticKeyword */) {
+                                    if (modifier.kind !== 117 /* StaticKeyword */) {
                                         diagnostics.push(createDiagnosticForNode(modifier, ts.Diagnostics._0_can_only_be_used_in_a_ts_file, ts.tokenToString(modifier.kind)));
                                     }
                                 }
                                 return;
                             }
                             break;
-                        case 151 /* Parameter */:
+                        case 152 /* Parameter */:
                             // Check modifiers of parameter declaration
                             if (nodes === parent.modifiers) {
                                 diagnostics.push(createDiagnosticForNodeArray(nodes, ts.Diagnostics.parameter_modifiers_can_only_be_used_in_a_ts_file));
                                 return;
                             }
                             break;
-                        case 191 /* CallExpression */:
-                        case 192 /* NewExpression */:
-                        case 211 /* ExpressionWithTypeArguments */:
-                        case 261 /* JsxSelfClosingElement */:
-                        case 262 /* JsxOpeningElement */:
+                        case 192 /* CallExpression */:
+                        case 193 /* NewExpression */:
+                        case 212 /* ExpressionWithTypeArguments */:
+                        case 262 /* JsxSelfClosingElement */:
+                        case 263 /* JsxOpeningElement */:
                             // Check type arguments
                             if (nodes === parent.typeArguments) {
                                 diagnostics.push(createDiagnosticForNodeArray(nodes, ts.Diagnostics.type_arguments_can_only_be_used_in_a_ts_file));
@@ -89064,24 +91709,24 @@ var ts;
                     for (var _i = 0, modifiers_1 = modifiers; _i < modifiers_1.length; _i++) {
                         var modifier = modifiers_1[_i];
                         switch (modifier.kind) {
-                            case 77 /* ConstKeyword */:
+                            case 78 /* ConstKeyword */:
                                 if (isConstValid) {
                                     continue;
                                 }
                             // to report error,
                             // falls through
-                            case 115 /* PublicKeyword */:
-                            case 113 /* PrivateKeyword */:
-                            case 114 /* ProtectedKeyword */:
-                            case 133 /* ReadonlyKeyword */:
-                            case 125 /* DeclareKeyword */:
-                            case 118 /* AbstractKeyword */:
+                            case 116 /* PublicKeyword */:
+                            case 114 /* PrivateKeyword */:
+                            case 115 /* ProtectedKeyword */:
+                            case 134 /* ReadonlyKeyword */:
+                            case 126 /* DeclareKeyword */:
+                            case 119 /* AbstractKeyword */:
                                 diagnostics.push(createDiagnosticForNode(modifier, ts.Diagnostics._0_can_only_be_used_in_a_ts_file, ts.tokenToString(modifier.kind)));
                                 break;
                             // These are all legal modifiers.
-                            case 116 /* StaticKeyword */:
-                            case 85 /* ExportKeyword */:
-                            case 80 /* DefaultKeyword */:
+                            case 117 /* StaticKeyword */:
+                            case 86 /* ExportKeyword */:
+                            case 81 /* DefaultKeyword */:
                         }
                     }
                 }
@@ -89156,8 +91801,8 @@ var ts;
             return a.fileName === b.fileName;
         }
         function moduleNameIsEqualTo(a, b) {
-            return a.kind === 72 /* Identifier */
-                ? b.kind === 72 /* Identifier */ && a.escapedText === b.escapedText
+            return a.kind === 73 /* Identifier */
+                ? b.kind === 73 /* Identifier */ && a.escapedText === b.escapedText
                 : b.kind === 10 /* StringLiteral */ && a.text === b.text;
         }
         function collectExternalModuleReferences(file) {
@@ -89372,7 +92017,10 @@ var ts;
                     if (isRedirect) {
                         inputName = getProjectReferenceRedirect(fileName) || fileName;
                     }
-                    if (ts.getNormalizedAbsolutePath(checkedName, currentDirectory) !== ts.getNormalizedAbsolutePath(inputName, currentDirectory)) {
+                    // Check if it differs only in drive letters its ok to ignore that error:
+                    var checkedAbsolutePath = ts.getNormalizedAbsolutePathWithoutRoot(checkedName, currentDirectory);
+                    var inputAbsolutePath = ts.getNormalizedAbsolutePathWithoutRoot(inputName, currentDirectory);
+                    if (checkedAbsolutePath !== inputAbsolutePath) {
                         reportFileNamesDifferOnlyInCasingError(inputName, checkedName, refFile, refPos, refEnd);
                     }
                 }
@@ -89401,9 +92049,13 @@ var ts;
             }
             var redirectedPath;
             if (refFile) {
-                var redirect = getProjectReferenceRedirect(fileName);
-                if (redirect) {
-                    (refFile.redirectedReferences || (refFile.redirectedReferences = [])).push(fileName);
+                var redirectProject = getProjectReferenceRedirectProject(fileName);
+                if (redirectProject) {
+                    if (redirectProject.commandLine.options.outFile || redirectProject.commandLine.options.out) {
+                        // Shouldnt create many to 1 mapping file in --out scenario
+                        return undefined;
+                    }
+                    var redirect = getProjectReferenceOutputName(redirectProject, fileName);
                     fileName = redirect;
                     // Once we start redirecting to a file, we can potentially come back to it
                     // via a back-reference from another file in the .d.ts folder. If that happens we'll
@@ -89487,20 +92139,23 @@ var ts;
             }
         }
         function getProjectReferenceRedirect(fileName) {
+            var referencedProject = getProjectReferenceRedirectProject(fileName);
+            return referencedProject && getProjectReferenceOutputName(referencedProject, fileName);
+        }
+        function getProjectReferenceRedirectProject(fileName) {
             // Ignore dts or any of the non ts files
             if (!resolvedProjectReferences || !resolvedProjectReferences.length || ts.fileExtensionIs(fileName, ".d.ts" /* Dts */) || !ts.fileExtensionIsOneOf(fileName, ts.supportedTSExtensions)) {
                 return undefined;
             }
             // If this file is produced by a referenced project, we need to rewrite it to
             // look in the output folder of the referenced project rather than the input
-            var referencedProject = getResolvedProjectReferenceToRedirect(fileName);
-            if (!referencedProject) {
-                return undefined;
-            }
+            return getResolvedProjectReferenceToRedirect(fileName);
+        }
+        function getProjectReferenceOutputName(referencedProject, fileName) {
             var out = referencedProject.commandLine.options.outFile || referencedProject.commandLine.options.out;
             return out ?
                 ts.changeExtension(out, ".d.ts" /* Dts */) :
-                ts.getOutputDeclarationFileName(fileName, referencedProject.commandLine);
+                ts.getOutputDeclarationFileName(fileName, referencedProject.commandLine, !host.useCaseSensitiveFileNames());
         }
         /**
          * Get the referenced project if the file is input file from that reference project
@@ -89741,18 +92396,33 @@ var ts;
             if (fromCache !== undefined) {
                 return fromCache || undefined;
             }
-            // An absolute path pointing to the containing directory of the config file
-            var basePath = ts.getNormalizedAbsolutePath(ts.getDirectoryPath(refPath), host.getCurrentDirectory());
-            var sourceFile = host.getSourceFile(refPath, 100 /* JSON */);
-            addFileToFilesByName(sourceFile, sourceFilePath, /*redirectedPath*/ undefined);
-            if (sourceFile === undefined) {
-                projectReferenceRedirects.set(sourceFilePath, false);
-                return undefined;
+            var commandLine;
+            var sourceFile;
+            if (host.getParsedCommandLine) {
+                commandLine = host.getParsedCommandLine(refPath);
+                if (!commandLine) {
+                    addFileToFilesByName(/*sourceFile*/ undefined, sourceFilePath, /*redirectedPath*/ undefined);
+                    projectReferenceRedirects.set(sourceFilePath, false);
+                    return undefined;
+                }
+                sourceFile = ts.Debug.assertDefined(commandLine.options.configFile);
+                ts.Debug.assert(!sourceFile.path || sourceFile.path === sourceFilePath);
+                addFileToFilesByName(sourceFile, sourceFilePath, /*redirectedPath*/ undefined);
+            }
+            else {
+                // An absolute path pointing to the containing directory of the config file
+                var basePath = ts.getNormalizedAbsolutePath(ts.getDirectoryPath(refPath), host.getCurrentDirectory());
+                sourceFile = host.getSourceFile(refPath, 100 /* JSON */);
+                addFileToFilesByName(sourceFile, sourceFilePath, /*redirectedPath*/ undefined);
+                if (sourceFile === undefined) {
+                    projectReferenceRedirects.set(sourceFilePath, false);
+                    return undefined;
+                }
+                commandLine = ts.parseJsonSourceFileConfigFileContent(sourceFile, configParsingHost, basePath, /*existingOptions*/ undefined, refPath);
             }
             sourceFile.path = sourceFilePath;
             sourceFile.resolvedPath = sourceFilePath;
             sourceFile.originalFileName = refPath;
-            var commandLine = ts.parseJsonSourceFileConfigFileContent(sourceFile, configParsingHost, basePath, /*existingOptions*/ undefined, refPath);
             var resolvedRef = { commandLine: commandLine, sourceFile: sourceFile };
             projectReferenceRedirects.set(sourceFilePath, resolvedRef);
             if (commandLine.projectReferences) {
@@ -89768,9 +92438,6 @@ var ts;
                 if (ts.getEmitDeclarations(options)) {
                     createDiagnosticForOptionName(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, getEmitDeclarationOptionName(options), "isolatedModules");
                 }
-                if (options.noEmitOnError) {
-                    createDiagnosticForOptionName(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "noEmitOnError", "isolatedModules");
-                }
                 if (options.out) {
                     createDiagnosticForOptionName(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "out", "isolatedModules");
                 }
@@ -89802,17 +92469,20 @@ var ts;
                     createDiagnosticForOptionName(ts.Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1_or_option_2, "tsBuildInfoFile", "incremental", "composite");
                 }
             }
+            else if (options.incremental && !options.outFile && !options.out && !options.configFilePath) {
+                programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_incremental_can_only_be_specified_using_tsconfig_emitting_to_single_file_or_when_option_tsBuildInfoFile_is_specified));
+            }
             verifyProjectReferences();
             // List of collected files is complete; validate exhautiveness if this is a project with a file list
             if (options.composite) {
-                var sourceFiles = files.filter(function (f) { return !f.isDeclarationFile; });
-                if (rootNames.length < sourceFiles.length) {
-                    var normalizedRootNames = rootNames.map(function (r) { return ts.normalizePath(r).toLowerCase(); });
-                    for (var _i = 0, _a = sourceFiles.map(function (f) { return ts.normalizePath(f.path).toLowerCase(); }); _i < _a.length; _i++) {
-                        var file = _a[_i];
-                        if (normalizedRootNames.indexOf(file) === -1) {
-                            programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.File_0_is_not_in_project_file_list_Projects_must_list_all_files_or_use_an_include_pattern, file));
-                        }
+                var rootPaths = rootNames.map(toPath);
+                for (var _i = 0, files_3 = files; _i < files_3.length; _i++) {
+                    var file = files_3[_i];
+                    // Ignore file that is not emitted
+                    if (!ts.sourceFileMayBeEmitted(file, options, isSourceFileFromExternalLibrary, getResolvedProjectReferenceToRedirect))
+                        continue;
+                    if (rootPaths.indexOf(file.path) === -1) {
+                        programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.File_0_is_not_listed_within_the_file_list_of_project_1_Projects_must_list_all_files_or_use_an_include_pattern, file.fileName, options.configFilePath || ""));
                     }
                 }
             }
@@ -89886,10 +92556,10 @@ var ts;
                 if (options.module === ts.ModuleKind.None && languageVersion < 2 /* ES2015 */) {
                     createDiagnosticForOptionName(ts.Diagnostics.Option_isolatedModules_can_only_be_used_when_either_option_module_is_provided_or_option_target_is_ES2015_or_higher, "isolatedModules", "target");
                 }
-                var firstNonExternalModuleSourceFile = ts.find(files, function (f) { return !ts.isExternalModule(f) && !f.isDeclarationFile && f.scriptKind !== 6 /* JSON */; });
+                var firstNonExternalModuleSourceFile = ts.find(files, function (f) { return !ts.isExternalModule(f) && !ts.isSourceFileJS(f) && !f.isDeclarationFile && f.scriptKind !== 6 /* JSON */; });
                 if (firstNonExternalModuleSourceFile) {
                     var span = ts.getErrorSpanForNode(firstNonExternalModuleSourceFile, firstNonExternalModuleSourceFile);
-                    programDiagnostics.add(ts.createFileDiagnostic(firstNonExternalModuleSourceFile, span.start, span.length, ts.Diagnostics.Cannot_compile_namespaces_when_the_isolatedModules_flag_is_provided));
+                    programDiagnostics.add(ts.createFileDiagnostic(firstNonExternalModuleSourceFile, span.start, span.length, ts.Diagnostics.All_files_must_be_modules_when_the_isolatedModules_flag_is_provided));
                 }
             }
             else if (firstNonAmbientExternalModuleSourceFile && languageVersion < 2 /* ES2015 */ && options.module === ts.ModuleKind.None) {
@@ -89974,13 +92644,13 @@ var ts;
                     var emitFilePath = toPath(emitFileName);
                     // Report error if the output overwrites input file
                     if (filesByName.has(emitFilePath)) {
-                        var chain_2;
+                        var chain = void 0;
                         if (!options.configFilePath) {
                             // The program is from either an inferred project or an external project
-                            chain_2 = ts.chainDiagnosticMessages(/*details*/ undefined, ts.Diagnostics.Adding_a_tsconfig_json_file_will_help_organize_projects_that_contain_both_TypeScript_and_JavaScript_files_Learn_more_at_https_Colon_Slash_Slashaka_ms_Slashtsconfig);
+                            chain = ts.chainDiagnosticMessages(/*details*/ undefined, ts.Diagnostics.Adding_a_tsconfig_json_file_will_help_organize_projects_that_contain_both_TypeScript_and_JavaScript_files_Learn_more_at_https_Colon_Slash_Slashaka_ms_Slashtsconfig);
                         }
-                        chain_2 = ts.chainDiagnosticMessages(chain_2, ts.Diagnostics.Cannot_write_file_0_because_it_would_overwrite_input_file, emitFileName);
-                        blockEmittingOfFile(emitFileName, ts.createCompilerDiagnosticFromMessageChain(chain_2));
+                        chain = ts.chainDiagnosticMessages(chain, ts.Diagnostics.Cannot_write_file_0_because_it_would_overwrite_input_file, emitFileName);
+                        blockEmittingOfFile(emitFileName, ts.createCompilerDiagnosticFromMessageChain(chain));
                     }
                     var emitFileKey = !host.useCaseSensitiveFileNames() ? emitFilePath.toLocaleLowerCase() : emitFilePath;
                     // Report error if multiple files write into same file
@@ -90170,7 +92840,7 @@ var ts;
             readFile: function (f) { return directoryStructureHost.readFile(f); },
             useCaseSensitiveFileNames: host.useCaseSensitiveFileNames(),
             getCurrentDirectory: function () { return host.getCurrentDirectory(); },
-            onUnRecoverableConfigFileDiagnostic: host.onUnRecoverableConfigFileDiagnostic || (function () { return undefined; }),
+            onUnRecoverableConfigFileDiagnostic: host.onUnRecoverableConfigFileDiagnostic || ts.returnUndefined,
             trace: host.trace ? function (s) { return host.trace(s); } : undefined
         };
     }
@@ -90392,7 +93062,7 @@ var ts;
             // Create the reference map, and set the file infos
             for (var _i = 0, _a = newProgram.getSourceFiles(); _i < _a.length; _i++) {
                 var sourceFile = _a[_i];
-                var version_1 = sourceFile.version;
+                var version_1 = ts.Debug.assertDefined(sourceFile.version, "Program intended to be used with Builder should have source files with versions set");
                 var oldInfo = useOldState ? oldState.fileInfos.get(sourceFile.path) : undefined;
                 if (referencedMap) {
                     var newReferences = getReferencedFiles(newProgram, sourceFile, getCanonicalFileName);
@@ -90515,6 +93185,7 @@ var ts;
             cacheToUpdateSignature.set(sourceFile.path, latestSignature);
             return !prevSignature || latestSignature !== prevSignature;
         }
+        BuilderState.updateShapeSignature = updateShapeSignature;
         /**
          * Coverts the declaration emit result into exported modules map
          */
@@ -90557,7 +93228,6 @@ var ts;
          * Get all the dependencies of the sourceFile
          */
         function getAllDependencies(state, programOfThisState, sourceFile) {
-            var _a;
             var compilerOptions = programOfThisState.getCompilerOptions();
             // With --out or --outFile all outputs go into single file, all files depend on each other
             if (compilerOptions.outFile || compilerOptions.out) {
@@ -90577,8 +93247,8 @@ var ts;
                     var references = state.referencedMap.get(path);
                     if (references) {
                         var iterator = references.keys();
-                        for (var _b = iterator.next(), value = _b.value, done = _b.done; !done; _a = iterator.next(), value = _a.value, done = _a.done, _a) {
-                            queue.push(value);
+                        for (var iterResult = iterator.next(); !iterResult.done; iterResult = iterator.next()) {
+                            queue.push(iterResult.value);
                         }
                     }
                 }
@@ -90784,7 +93454,7 @@ var ts;
                 // Unchanged file copy diagnostics
                 var diagnostics = oldState.semanticDiagnosticsPerFile.get(sourceFilePath);
                 if (diagnostics) {
-                    state.semanticDiagnosticsPerFile.set(sourceFilePath, oldState.hasReusableDiagnostic ? convertToDiagnostics(diagnostics, newProgram) : diagnostics);
+                    state.semanticDiagnosticsPerFile.set(sourceFilePath, oldState.hasReusableDiagnostic ? convertToDiagnostics(diagnostics, newProgram, getCanonicalFileName) : diagnostics);
                     if (!state.semanticDiagnosticsFromOldState) {
                         state.semanticDiagnosticsFromOldState = ts.createMap();
                     }
@@ -90792,44 +93462,37 @@ var ts;
                 }
             }
         });
-        if (oldCompilerOptions &&
-            (oldCompilerOptions.outDir !== compilerOptions.outDir ||
-                oldCompilerOptions.declarationDir !== compilerOptions.declarationDir ||
-                (oldCompilerOptions.outFile || oldCompilerOptions.out) !== (compilerOptions.outFile || compilerOptions.out))) {
+        if (oldCompilerOptions && ts.compilerOptionsAffectEmit(compilerOptions, oldCompilerOptions)) {
             // Add all files to affectedFilesPendingEmit since emit changed
-            state.affectedFilesPendingEmit = ts.concatenate(state.affectedFilesPendingEmit, newProgram.getSourceFiles().map(function (f) { return f.path; }));
-            if (state.affectedFilesPendingEmitIndex === undefined) {
-                state.affectedFilesPendingEmitIndex = 0;
-            }
+            addToAffectedFilesPendingEmit(state, newProgram.getSourceFiles().map(function (f) { return f.path; }));
             ts.Debug.assert(state.seenAffectedFiles === undefined);
             state.seenAffectedFiles = ts.createMap();
         }
         return state;
     }
-    function convertToDiagnostics(diagnostics, newProgram) {
+    function convertToDiagnostics(diagnostics, newProgram, getCanonicalFileName) {
         if (!diagnostics.length)
             return ts.emptyArray;
+        var buildInfoDirectory = ts.getDirectoryPath(ts.getNormalizedAbsolutePath(ts.getOutputPathForBuildInfo(newProgram.getCompilerOptions()), newProgram.getCurrentDirectory()));
         return diagnostics.map(function (diagnostic) {
-            var result = convertToDiagnosticRelatedInformation(diagnostic, newProgram);
+            var result = convertToDiagnosticRelatedInformation(diagnostic, newProgram, toPath);
             result.reportsUnnecessary = diagnostic.reportsUnnecessary;
             result.source = diagnostic.source;
             var relatedInformation = diagnostic.relatedInformation;
             result.relatedInformation = relatedInformation ?
                 relatedInformation.length ?
-                    relatedInformation.map(function (r) { return convertToDiagnosticRelatedInformation(r, newProgram); }) :
+                    relatedInformation.map(function (r) { return convertToDiagnosticRelatedInformation(r, newProgram, toPath); }) :
                     ts.emptyArray :
                 undefined;
             return result;
         });
+        function toPath(path) {
+            return ts.toPath(path, buildInfoDirectory, getCanonicalFileName);
+        }
     }
-    function convertToDiagnosticRelatedInformation(diagnostic, newProgram) {
-        var file = diagnostic.file, messageText = diagnostic.messageText;
-        return __assign({}, diagnostic, { file: file && newProgram.getSourceFileByPath(file), messageText: messageText === undefined || ts.isString(messageText) ?
-                messageText :
-                convertToDiagnosticMessageChain(messageText, newProgram) });
-    }
-    function convertToDiagnosticMessageChain(diagnostic, newProgram) {
-        return __assign({}, diagnostic, { next: diagnostic.next && convertToDiagnosticMessageChain(diagnostic.next, newProgram) });
+    function convertToDiagnosticRelatedInformation(diagnostic, newProgram, toPath) {
+        var file = diagnostic.file;
+        return __assign({}, diagnostic, { file: file ? newProgram.getSourceFileByPath(toPath(file)) : undefined });
     }
     /**
      * Releases program and other related not needed properties
@@ -90884,7 +93547,7 @@ var ts;
                     if (!seenAffectedFiles.has(affectedFile.path)) {
                         // Set the next affected file as seen and remove the cached semantic diagnostics
                         state.affectedFilesIndex = affectedFilesIndex;
-                        cleanSemanticDiagnosticsOfAffectedFile(state, affectedFile);
+                        handleDtsMayChangeOfAffectedFile(state, affectedFile, cancellationToken, computeHash);
                         return affectedFile;
                     }
                     seenAffectedFiles.set(affectedFile.path, true);
@@ -90945,94 +93608,49 @@ var ts;
         return undefined;
     }
     /**
-     * Remove the semantic diagnostics cached from old state for affected File and the files that are referencing modules that export entities from affected file
+     *  Handles semantic diagnostics and dts emit for affectedFile and files, that are referencing modules that export entities from affected file
+     *  This is because even though js emit doesnt change, dts emit / type used can change resulting in need for dts emit and js change
      */
-    function cleanSemanticDiagnosticsOfAffectedFile(state, affectedFile) {
-        if (removeSemanticDiagnosticsOf(state, affectedFile.path)) {
-            // If there are no more diagnostics from old cache, done
+    function handleDtsMayChangeOfAffectedFile(state, affectedFile, cancellationToken, computeHash) {
+        removeSemanticDiagnosticsOf(state, affectedFile.path);
+        // If affected files is everything except default library, then nothing more to do
+        if (state.allFilesExcludingDefaultLibraryFile === state.affectedFiles) {
+            if (!state.cleanedDiagnosticsOfLibFiles) {
+                state.cleanedDiagnosticsOfLibFiles = true;
+                var program_1 = ts.Debug.assertDefined(state.program);
+                var options_2 = program_1.getCompilerOptions();
+                ts.forEach(program_1.getSourceFiles(), function (f) {
+                    return program_1.isSourceFileDefaultLibrary(f) &&
+                        !ts.skipTypeChecking(f, options_2) &&
+                        removeSemanticDiagnosticsOf(state, f.path);
+                });
+            }
             return;
         }
-        // Clean lib file diagnostics if its all files excluding default files to emit
-        if (state.allFilesExcludingDefaultLibraryFile === state.affectedFiles && !state.cleanedDiagnosticsOfLibFiles) {
-            state.cleanedDiagnosticsOfLibFiles = true;
-            var program_1 = ts.Debug.assertDefined(state.program);
-            var options_2 = program_1.getCompilerOptions();
-            if (ts.forEach(program_1.getSourceFiles(), function (f) {
-                return program_1.isSourceFileDefaultLibrary(f) &&
-                    !ts.skipTypeChecking(f, options_2) &&
-                    removeSemanticDiagnosticsOf(state, f.path);
-            })) {
-                return;
+        forEachReferencingModulesOfExportOfAffectedFile(state, affectedFile, function (state, path) { return handleDtsMayChangeOf(state, path, cancellationToken, computeHash); });
+    }
+    /**
+     * Handle the dts may change, so they need to be added to pending emit if dts emit is enabled,
+     * Also we need to make sure signature is updated for these files
+     */
+    function handleDtsMayChangeOf(state, path, cancellationToken, computeHash) {
+        removeSemanticDiagnosticsOf(state, path);
+        if (!state.changedFilesSet.has(path)) {
+            var program = ts.Debug.assertDefined(state.program);
+            var sourceFile = program.getSourceFileByPath(path);
+            if (sourceFile) {
+                // Even though the js emit doesnt change and we are already handling dts emit and semantic diagnostics
+                // we need to update the signature to reflect correctness of the signature(which is output d.ts emit) of this file
+                // This ensures that we dont later during incremental builds considering wrong signature.
+                // Eg where this also is needed to ensure that .tsbuildinfo generated by incremental build should be same as if it was first fresh build
+                ts.BuilderState.updateShapeSignature(state, program, sourceFile, ts.Debug.assertDefined(state.currentAffectedFilesSignatures), cancellationToken, computeHash, state.currentAffectedFilesExportedModulesMap);
+                // If not dts emit, nothing more to do
+                if (ts.getEmitDeclarations(state.compilerOptions)) {
+                    addToAffectedFilesPendingEmit(state, [path]);
+                }
             }
         }
-        // If there was change in signature for the changed file,
-        // then delete the semantic diagnostics for files that are affected by using exports of this module
-        if (!state.exportedModulesMap || state.affectedFiles.length === 1 || !state.changedFilesSet.has(affectedFile.path)) {
-            return;
-        }
-        ts.Debug.assert(!!state.currentAffectedFilesExportedModulesMap);
-        var seenFileAndExportsOfFile = ts.createMap();
-        // Go through exported modules from cache first
-        // If exported modules has path, all files referencing file exported from are affected
-        if (ts.forEachEntry(state.currentAffectedFilesExportedModulesMap, function (exportedModules, exportedFromPath) {
-            return exportedModules &&
-                exportedModules.has(affectedFile.path) &&
-                removeSemanticDiagnosticsOfFilesReferencingPath(state, exportedFromPath, seenFileAndExportsOfFile);
-        })) {
-            return;
-        }
-        // If exported from path is not from cache and exported modules has path, all files referencing file exported from are affected
-        ts.forEachEntry(state.exportedModulesMap, function (exportedModules, exportedFromPath) {
-            return !state.currentAffectedFilesExportedModulesMap.has(exportedFromPath) && // If we already iterated this through cache, ignore it
-                exportedModules.has(affectedFile.path) &&
-                removeSemanticDiagnosticsOfFilesReferencingPath(state, exportedFromPath, seenFileAndExportsOfFile);
-        });
-    }
-    /**
-     * removes the semantic diagnostics of files referencing referencedPath and
-     * returns true if there are no more semantic diagnostics from old state
-     */
-    function removeSemanticDiagnosticsOfFilesReferencingPath(state, referencedPath, seenFileAndExportsOfFile) {
-        return ts.forEachEntry(state.referencedMap, function (referencesInFile, filePath) {
-            return referencesInFile.has(referencedPath) && removeSemanticDiagnosticsOfFileAndExportsOfFile(state, filePath, seenFileAndExportsOfFile);
-        });
-    }
-    /**
-     * Removes semantic diagnostics of file and anything that exports this file
-     */
-    function removeSemanticDiagnosticsOfFileAndExportsOfFile(state, filePath, seenFileAndExportsOfFile) {
-        if (!ts.addToSeen(seenFileAndExportsOfFile, filePath)) {
-            return false;
-        }
-        if (removeSemanticDiagnosticsOf(state, filePath)) {
-            // If there are no more diagnostics from old cache, done
-            return true;
-        }
-        ts.Debug.assert(!!state.currentAffectedFilesExportedModulesMap);
-        // Go through exported modules from cache first
-        // If exported modules has path, all files referencing file exported from are affected
-        if (ts.forEachEntry(state.currentAffectedFilesExportedModulesMap, function (exportedModules, exportedFromPath) {
-            return exportedModules &&
-                exportedModules.has(filePath) &&
-                removeSemanticDiagnosticsOfFileAndExportsOfFile(state, exportedFromPath, seenFileAndExportsOfFile);
-        })) {
-            return true;
-        }
-        // If exported from path is not from cache and exported modules has path, all files referencing file exported from are affected
-        if (ts.forEachEntry(state.exportedModulesMap, function (exportedModules, exportedFromPath) {
-            return !state.currentAffectedFilesExportedModulesMap.has(exportedFromPath) && // If we already iterated this through cache, ignore it
-                exportedModules.has(filePath) &&
-                removeSemanticDiagnosticsOfFileAndExportsOfFile(state, exportedFromPath, seenFileAndExportsOfFile);
-        })) {
-            return true;
-        }
-        // Remove diagnostics of files that import this file (without going to exports of referencing files)
-        return !!ts.forEachEntry(state.referencedMap, function (referencesInFile, referencingFilePath) {
-            return referencesInFile.has(filePath) &&
-                !seenFileAndExportsOfFile.has(referencingFilePath) && // Not already removed diagnostic file
-                removeSemanticDiagnosticsOf(state, referencingFilePath);
-        } // Dont add to seen since this is not yet done with the export removal
-        );
+        return false;
     }
     /**
      * Removes semantic diagnostics for path and
@@ -91046,6 +93664,78 @@ var ts;
         state.semanticDiagnosticsPerFile.delete(path);
         return !state.semanticDiagnosticsFromOldState.size;
     }
+    /**
+     * Iterate on referencing modules that export entities from affected file
+     */
+    function forEachReferencingModulesOfExportOfAffectedFile(state, affectedFile, fn) {
+        // If there was change in signature (dts output) for the changed file,
+        // then only we need to handle pending file emit
+        if (!state.exportedModulesMap || state.affectedFiles.length === 1 || !state.changedFilesSet.has(affectedFile.path)) {
+            return;
+        }
+        ts.Debug.assert(!!state.currentAffectedFilesExportedModulesMap);
+        var seenFileAndExportsOfFile = ts.createMap();
+        // Go through exported modules from cache first
+        // If exported modules has path, all files referencing file exported from are affected
+        if (ts.forEachEntry(state.currentAffectedFilesExportedModulesMap, function (exportedModules, exportedFromPath) {
+            return exportedModules &&
+                exportedModules.has(affectedFile.path) &&
+                forEachFilesReferencingPath(state, exportedFromPath, seenFileAndExportsOfFile, fn);
+        })) {
+            return;
+        }
+        // If exported from path is not from cache and exported modules has path, all files referencing file exported from are affected
+        ts.forEachEntry(state.exportedModulesMap, function (exportedModules, exportedFromPath) {
+            return !state.currentAffectedFilesExportedModulesMap.has(exportedFromPath) && // If we already iterated this through cache, ignore it
+                exportedModules.has(affectedFile.path) &&
+                forEachFilesReferencingPath(state, exportedFromPath, seenFileAndExportsOfFile, fn);
+        });
+    }
+    /**
+     * Iterate on files referencing referencedPath
+     */
+    function forEachFilesReferencingPath(state, referencedPath, seenFileAndExportsOfFile, fn) {
+        return ts.forEachEntry(state.referencedMap, function (referencesInFile, filePath) {
+            return referencesInFile.has(referencedPath) && forEachFileAndExportsOfFile(state, filePath, seenFileAndExportsOfFile, fn);
+        });
+    }
+    /**
+     * fn on file and iterate on anything that exports this file
+     */
+    function forEachFileAndExportsOfFile(state, filePath, seenFileAndExportsOfFile, fn) {
+        if (!ts.addToSeen(seenFileAndExportsOfFile, filePath)) {
+            return false;
+        }
+        if (fn(state, filePath)) {
+            // If there are no more diagnostics from old cache, done
+            return true;
+        }
+        ts.Debug.assert(!!state.currentAffectedFilesExportedModulesMap);
+        // Go through exported modules from cache first
+        // If exported modules has path, all files referencing file exported from are affected
+        if (ts.forEachEntry(state.currentAffectedFilesExportedModulesMap, function (exportedModules, exportedFromPath) {
+            return exportedModules &&
+                exportedModules.has(filePath) &&
+                forEachFileAndExportsOfFile(state, exportedFromPath, seenFileAndExportsOfFile, fn);
+        })) {
+            return true;
+        }
+        // If exported from path is not from cache and exported modules has path, all files referencing file exported from are affected
+        if (ts.forEachEntry(state.exportedModulesMap, function (exportedModules, exportedFromPath) {
+            return !state.currentAffectedFilesExportedModulesMap.has(exportedFromPath) && // If we already iterated this through cache, ignore it
+                exportedModules.has(filePath) &&
+                forEachFileAndExportsOfFile(state, exportedFromPath, seenFileAndExportsOfFile, fn);
+        })) {
+            return true;
+        }
+        // Remove diagnostics of files that import this file (without going to exports of referencing files)
+        return !!ts.forEachEntry(state.referencedMap, function (referencesInFile, referencingFilePath) {
+            return referencesInFile.has(filePath) &&
+                !seenFileAndExportsOfFile.has(referencingFilePath) && // Not already removed diagnostic file
+                fn(state, referencingFilePath);
+        } // Dont add to seen since this is not yet done with the export removal
+        );
+    }
     /**
      * This is called after completing operation on the next affected file.
      * The operations here are postponed to ensure that cancellation during the iteration is handled correctly
@@ -91098,19 +93788,24 @@ var ts;
     /**
      * Gets the program information to be emitted in buildInfo so that we can use it to create new program
      */
-    function getProgramBuildInfo(state) {
+    function getProgramBuildInfo(state, getCanonicalFileName) {
         if (state.compilerOptions.outFile || state.compilerOptions.out)
             return undefined;
+        var currentDirectory = ts.Debug.assertDefined(state.program).getCurrentDirectory();
+        var buildInfoDirectory = ts.getDirectoryPath(ts.getNormalizedAbsolutePath(ts.getOutputPathForBuildInfo(state.compilerOptions), currentDirectory));
         var fileInfos = {};
         state.fileInfos.forEach(function (value, key) {
             var signature = state.currentAffectedFilesSignatures && state.currentAffectedFilesSignatures.get(key);
-            fileInfos[key] = signature === undefined ? value : { version: value.version, signature: signature };
+            fileInfos[relativeToBuildInfo(key)] = signature === undefined ? value : { version: value.version, signature: signature };
         });
-        var result = { fileInfos: fileInfos, options: state.compilerOptions };
+        var result = {
+            fileInfos: fileInfos,
+            options: convertToReusableCompilerOptions(state.compilerOptions, relativeToBuildInfoEnsuringAbsolutePath)
+        };
         if (state.referencedMap) {
             var referencedMap_1 = {};
             state.referencedMap.forEach(function (value, key) {
-                referencedMap_1[key] = ts.arrayFrom(value.keys());
+                referencedMap_1[relativeToBuildInfo(key)] = ts.arrayFrom(value.keys(), relativeToBuildInfo);
             });
             result.referencedMap = referencedMap_1;
         }
@@ -91120,10 +93815,10 @@ var ts;
                 var newValue = state.currentAffectedFilesExportedModulesMap && state.currentAffectedFilesExportedModulesMap.get(key);
                 // Not in temporary cache, use existing value
                 if (newValue === undefined)
-                    exportedModulesMap_1[key] = ts.arrayFrom(value.keys());
+                    exportedModulesMap_1[relativeToBuildInfo(key)] = ts.arrayFrom(value.keys(), relativeToBuildInfo);
                 // Value in cache and has updated value map, use that
                 else if (newValue)
-                    exportedModulesMap_1[key] = ts.arrayFrom(newValue.keys());
+                    exportedModulesMap_1[relativeToBuildInfo(key)] = ts.arrayFrom(newValue.keys(), relativeToBuildInfo);
             });
             result.exportedModulesMap = exportedModulesMap_1;
         }
@@ -91132,39 +93827,67 @@ var ts;
             // Currently not recording actual errors since those mean no emit for tsc --build
             state.semanticDiagnosticsPerFile.forEach(function (value, key) { return semanticDiagnosticsPerFile_1.push(value.length ?
                 [
-                    key,
+                    relativeToBuildInfo(key),
                     state.hasReusableDiagnostic ?
                         value :
-                        convertToReusableDiagnostics(value)
+                        convertToReusableDiagnostics(value, relativeToBuildInfo)
                 ] :
-                key); });
+                relativeToBuildInfo(key)); });
             result.semanticDiagnosticsPerFile = semanticDiagnosticsPerFile_1;
         }
         return result;
+        function relativeToBuildInfoEnsuringAbsolutePath(path) {
+            return relativeToBuildInfo(ts.getNormalizedAbsolutePath(path, currentDirectory));
+        }
+        function relativeToBuildInfo(path) {
+            return ts.ensurePathIsNonModuleName(ts.getRelativePathFromDirectory(buildInfoDirectory, path, getCanonicalFileName));
+        }
     }
-    function convertToReusableDiagnostics(diagnostics) {
+    function convertToReusableCompilerOptions(options, relativeToBuildInfo) {
+        var result = {};
+        var optionsNameMap = ts.getOptionNameMap().optionNameMap;
+        for (var name in options) {
+            if (ts.hasProperty(options, name)) {
+                result[name] = convertToReusableCompilerOptionValue(optionsNameMap.get(name.toLowerCase()), options[name], relativeToBuildInfo);
+            }
+        }
+        if (result.configFilePath) {
+            result.configFilePath = relativeToBuildInfo(result.configFilePath);
+        }
+        return result;
+    }
+    function convertToReusableCompilerOptionValue(option, value, relativeToBuildInfo) {
+        if (option) {
+            if (option.type === "list") {
+                var values = value;
+                if (option.element.isFilePath && values.length) {
+                    return values.map(relativeToBuildInfo);
+                }
+            }
+            else if (option.isFilePath) {
+                return relativeToBuildInfo(value);
+            }
+        }
+        return value;
+    }
+    function convertToReusableDiagnostics(diagnostics, relativeToBuildInfo) {
         ts.Debug.assert(!!diagnostics.length);
         return diagnostics.map(function (diagnostic) {
-            var result = convertToReusableDiagnosticRelatedInformation(diagnostic);
+            var result = convertToReusableDiagnosticRelatedInformation(diagnostic, relativeToBuildInfo);
             result.reportsUnnecessary = diagnostic.reportsUnnecessary;
             result.source = diagnostic.source;
             var relatedInformation = diagnostic.relatedInformation;
             result.relatedInformation = relatedInformation ?
                 relatedInformation.length ?
-                    relatedInformation.map(function (r) { return convertToReusableDiagnosticRelatedInformation(r); }) :
+                    relatedInformation.map(function (r) { return convertToReusableDiagnosticRelatedInformation(r, relativeToBuildInfo); }) :
                     ts.emptyArray :
                 undefined;
             return result;
         });
     }
-    function convertToReusableDiagnosticRelatedInformation(diagnostic) {
-        var file = diagnostic.file, messageText = diagnostic.messageText;
-        return __assign({}, diagnostic, { file: file && file.path, messageText: messageText === undefined || ts.isString(messageText) ?
-                messageText :
-                convertToReusableDiagnosticMessageChain(messageText) });
-    }
-    function convertToReusableDiagnosticMessageChain(diagnostic) {
-        return __assign({}, diagnostic, { next: diagnostic.next && convertToReusableDiagnosticMessageChain(diagnostic.next) });
+    function convertToReusableDiagnosticRelatedInformation(diagnostic, relativeToBuildInfo) {
+        var file = diagnostic.file;
+        return __assign({}, diagnostic, { file: file ? relativeToBuildInfo(file.path) : undefined });
     }
     var BuilderProgramKind;
     (function (BuilderProgramKind) {
@@ -91222,7 +93945,7 @@ var ts;
         var computeHash = host.createHash || ts.generateDjb2Hash;
         var state = createBuilderProgramState(newProgram, getCanonicalFileName, oldState);
         var backupState;
-        newProgram.getProgramBuildInfo = function () { return getProgramBuildInfo(state); };
+        newProgram.getProgramBuildInfo = function () { return getProgramBuildInfo(state, getCanonicalFileName); };
         // To ensure that we arent storing any references to old program or new program without state
         newProgram = undefined; // TODO: GH#18217
         oldProgram = undefined;
@@ -91248,6 +93971,7 @@ var ts;
             result.getSemanticDiagnosticsOfNextAffectedFile = getSemanticDiagnosticsOfNextAffectedFile;
         }
         else if (kind === BuilderProgramKind.EmitAndSemanticDiagnosticsBuilderProgram) {
+            result.getSemanticDiagnosticsOfNextAffectedFile = getSemanticDiagnosticsOfNextAffectedFile;
             result.emitNextAffectedFile = emitNextAffectedFile;
         }
         else {
@@ -91273,7 +93997,7 @@ var ts;
                         return toAffectedFileResult(state, 
                         // When whole program is affected, do emit only once (eg when --out or --outFile is specified)
                         // Otherwise just affected file
-                        affected_1.emitBuildInfo(writeFile || host.writeFile, cancellationToken), affected_1, 
+                        affected_1.emitBuildInfo(writeFile || ts.maybeBind(host, host.writeFile), cancellationToken), affected_1, 
                         /*isPendingEmitFile*/ false, 
                         /*isBuildInfoEmit*/ true);
                     }
@@ -91289,14 +94013,10 @@ var ts;
                     affected = program;
                 }
             }
-            // Mark seen emitted files if there are pending files to be emitted
-            if (state.affectedFilesPendingEmit && state.program !== affected) {
-                (state.seenEmittedFiles || (state.seenEmittedFiles = ts.createMap())).set(affected.path, true);
-            }
             return toAffectedFileResult(state, 
             // When whole program is affected, do emit only once (eg when --out or --outFile is specified)
             // Otherwise just affected file
-            ts.Debug.assertDefined(state.program).emit(affected === state.program ? undefined : affected, writeFile || host.writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers), affected, isPendingEmitFile);
+            ts.Debug.assertDefined(state.program).emit(affected === state.program ? undefined : affected, writeFile || ts.maybeBind(host, host.writeFile), cancellationToken, emitOnlyDtsFiles, customTransformers), affected, isPendingEmitFile);
         }
         /**
          * Emits the JavaScript and declaration files.
@@ -91333,7 +94053,7 @@ var ts;
                     };
                 }
             }
-            return ts.Debug.assertDefined(state.program).emit(targetSourceFile, writeFile || host.writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers);
+            return ts.Debug.assertDefined(state.program).emit(targetSourceFile, writeFile || ts.maybeBind(host, host.writeFile), cancellationToken, emitOnlyDtsFiles, customTransformers);
         }
         /**
          * Return the semantic diagnostics for the next affected file or undefined if iteration is complete
@@ -91350,6 +94070,10 @@ var ts;
                     // When whole program is affected, get all semantic diagnostics (eg when --out or --outFile is specified)
                     return toAffectedFileResult(state, state.program.getSemanticDiagnostics(/*targetSourceFile*/ undefined, cancellationToken), affected);
                 }
+                // Add file to affected file pending emit to handle for later emit time
+                if (kind === BuilderProgramKind.EmitAndSemanticDiagnosticsBuilderProgram) {
+                    addToAffectedFilesPendingEmit(state, [affected.path]);
+                }
                 // Get diagnostics for the affected file if its not ignored
                 if (ignoreSourceFile && ignoreSourceFile(affected)) {
                     // Get next affected file
@@ -91380,35 +94104,29 @@ var ts;
             }
             // When semantic builder asks for diagnostics of the whole program,
             // ensure that all the affected files are handled
-            var affected;
-            var affectedFilesPendingEmit;
-            while (affected = getNextAffectedFile(state, cancellationToken, computeHash)) {
-                if (affected !== state.program && kind === BuilderProgramKind.EmitAndSemanticDiagnosticsBuilderProgram) {
-                    (affectedFilesPendingEmit || (affectedFilesPendingEmit = [])).push(affected.path);
-                }
-                doneWithAffectedFile(state, affected);
-            }
-            // In case of emit builder, cache the files to be emitted
-            if (affectedFilesPendingEmit) {
-                state.affectedFilesPendingEmit = ts.concatenate(state.affectedFilesPendingEmit, affectedFilesPendingEmit);
-                // affectedFilesPendingEmitIndex === undefined
-                // - means the emit state.affectedFilesPendingEmit was undefined before adding current affected files
-                //   so start from 0 as array would be affectedFilesPendingEmit
-                // else, continue to iterate from existing index, the current set is appended to existing files
-                if (state.affectedFilesPendingEmitIndex === undefined) {
-                    state.affectedFilesPendingEmitIndex = 0;
-                }
+            // tslint:disable-next-line no-empty
+            while (getSemanticDiagnosticsOfNextAffectedFile(cancellationToken)) {
             }
             var diagnostics;
             for (var _i = 0, _a = ts.Debug.assertDefined(state.program).getSourceFiles(); _i < _a.length; _i++) {
-                var sourceFile_2 = _a[_i];
-                diagnostics = ts.addRange(diagnostics, getSemanticDiagnosticsOfFile(state, sourceFile_2, cancellationToken));
+                var sourceFile_1 = _a[_i];
+                diagnostics = ts.addRange(diagnostics, getSemanticDiagnosticsOfFile(state, sourceFile_1, cancellationToken));
             }
             return diagnostics || ts.emptyArray;
         }
     }
     ts.createBuilderProgram = createBuilderProgram;
-    function getMapOfReferencedSet(mapLike) {
+    function addToAffectedFilesPendingEmit(state, affectedFilesPendingEmit) {
+        state.affectedFilesPendingEmit = ts.concatenate(state.affectedFilesPendingEmit, affectedFilesPendingEmit);
+        // affectedFilesPendingEmitIndex === undefined
+        // - means the emit state.affectedFilesPendingEmit was undefined before adding current affected files
+        //   so start from 0 as array would be affectedFilesPendingEmit
+        // else, continue to iterate from existing index, the current set is appended to existing files
+        if (state.affectedFilesPendingEmitIndex === undefined) {
+            state.affectedFilesPendingEmitIndex = 0;
+        }
+    }
+    function getMapOfReferencedSet(mapLike, toPath) {
         if (!mapLike)
             return undefined;
         var map = ts.createMap();
@@ -91416,18 +94134,25 @@ var ts;
         // template is undefined, and instead will just exit the loop.
         for (var key in mapLike) {
             if (ts.hasProperty(mapLike, key)) {
-                map.set(key, ts.arrayToSet(mapLike[key]));
+                map.set(toPath(key), ts.arrayToSet(mapLike[key], toPath));
             }
         }
         return map;
     }
-    function createBuildProgramUsingProgramBuildInfo(program) {
-        var fileInfos = ts.createMapFromTemplate(program.fileInfos);
+    function createBuildProgramUsingProgramBuildInfo(program, buildInfoPath, host) {
+        var buildInfoDirectory = ts.getDirectoryPath(ts.getNormalizedAbsolutePath(buildInfoPath, host.getCurrentDirectory()));
+        var getCanonicalFileName = ts.createGetCanonicalFileName(host.useCaseSensitiveFileNames());
+        var fileInfos = ts.createMap();
+        for (var key in program.fileInfos) {
+            if (ts.hasProperty(program.fileInfos, key)) {
+                fileInfos.set(toPath(key), program.fileInfos[key]);
+            }
+        }
         var state = {
             fileInfos: fileInfos,
-            compilerOptions: program.options,
-            referencedMap: getMapOfReferencedSet(program.referencedMap),
-            exportedModulesMap: getMapOfReferencedSet(program.exportedModulesMap),
+            compilerOptions: convertFromReusableCompilerOptions(program.options, toAbsolutePath),
+            referencedMap: getMapOfReferencedSet(program.referencedMap, toPath),
+            exportedModulesMap: getMapOfReferencedSet(program.exportedModulesMap, toPath),
             semanticDiagnosticsPerFile: program.semanticDiagnosticsPerFile && ts.arrayToMap(program.semanticDiagnosticsPerFile, function (value) { return ts.isString(value) ? value : value[0]; }, function (value) { return ts.isString(value) ? ts.emptyArray : value[1]; }),
             hasReusableDiagnostic: true
         };
@@ -91436,7 +94161,7 @@ var ts;
             backupState: ts.noop,
             restoreState: ts.noop,
             getProgram: ts.notImplemented,
-            getProgramOrUndefined: function () { return undefined; },
+            getProgramOrUndefined: ts.returnUndefined,
             releaseProgram: ts.noop,
             getCompilerOptions: function () { return state.compilerOptions; },
             getSourceFile: ts.notImplemented,
@@ -91453,8 +94178,41 @@ var ts;
             emitNextAffectedFile: ts.notImplemented,
             getSemanticDiagnosticsOfNextAffectedFile: ts.notImplemented,
         };
+        function toPath(path) {
+            return ts.toPath(path, buildInfoDirectory, getCanonicalFileName);
+        }
+        function toAbsolutePath(path) {
+            return ts.getNormalizedAbsolutePath(path, buildInfoDirectory);
+        }
     }
     ts.createBuildProgramUsingProgramBuildInfo = createBuildProgramUsingProgramBuildInfo;
+    function convertFromReusableCompilerOptions(options, toAbsolutePath) {
+        var result = {};
+        var optionsNameMap = ts.getOptionNameMap().optionNameMap;
+        for (var name in options) {
+            if (ts.hasProperty(options, name)) {
+                result[name] = convertFromReusableCompilerOptionValue(optionsNameMap.get(name.toLowerCase()), options[name], toAbsolutePath);
+            }
+        }
+        if (result.configFilePath) {
+            result.configFilePath = toAbsolutePath(result.configFilePath);
+        }
+        return result;
+    }
+    function convertFromReusableCompilerOptionValue(option, value, toAbsolutePath) {
+        if (option) {
+            if (option.type === "list") {
+                var values = value;
+                if (option.element.isFilePath && values.length) {
+                    return values.map(toAbsolutePath);
+                }
+            }
+            else if (option.isFilePath) {
+                return toAbsolutePath(value);
+            }
+        }
+        return value;
+    }
     function createRedirectedBuilderProgram(state, configFileParsingDiagnostics) {
         return {
             getState: ts.notImplemented,
@@ -91504,6 +94262,38 @@ var ts;
         return ts.some(ts.ignoredPaths, function (searchPath) { return ts.stringContains(path, searchPath); });
     }
     ts.isPathIgnored = isPathIgnored;
+    /**
+     * Filter out paths like
+     * "/", "/user", "/user/username", "/user/username/folderAtRoot",
+     * "c:/", "c:/users", "c:/users/username", "c:/users/username/folderAtRoot", "c:/folderAtRoot"
+     * @param dirPath
+     */
+    function canWatchDirectory(dirPath) {
+        var rootLength = ts.getRootLength(dirPath);
+        if (dirPath.length === rootLength) {
+            // Ignore "/", "c:/"
+            return false;
+        }
+        var nextDirectorySeparator = dirPath.indexOf(ts.directorySeparator, rootLength);
+        if (nextDirectorySeparator === -1) {
+            // ignore "/user", "c:/users" or "c:/folderAtRoot"
+            return false;
+        }
+        if (dirPath.charCodeAt(0) !== 47 /* slash */ &&
+            dirPath.substr(rootLength, nextDirectorySeparator).search(/users/i) === -1) {
+            // Paths like c:/folderAtRoot/subFolder are allowed
+            return true;
+        }
+        for (var searchIndex = nextDirectorySeparator + 1, searchLevels = 2; searchLevels > 0; searchLevels--) {
+            searchIndex = dirPath.indexOf(ts.directorySeparator, searchIndex) + 1;
+            if (searchIndex === 0) {
+                // Folder isnt at expected minimun levels
+                return false;
+            }
+        }
+        return true;
+    }
+    ts.canWatchDirectory = canWatchDirectory;
     ts.maxNumberOfFilesToIterateForInvalidation = 256;
     function createResolutionCache(resolutionHost, rootDirForResolution, logChangesWhenResolvingModule) {
         var filesWithChangedSetOfUnresolvedImports;
@@ -91634,7 +94424,7 @@ var ts;
             if (globalCache !== undefined && !ts.isExternalModuleNameRelative(moduleName) && !(primaryResult.resolvedModule && ts.extensionIsTS(primaryResult.resolvedModule.extension))) {
                 // create different collection of failed lookup locations for second pass
                 // if it will fail and we've already found something during the first pass - we don't want to pollute its results
-                var _a = ts.loadModuleFromGlobalCache(moduleName, resolutionHost.projectName, compilerOptions, host, globalCache), resolvedModule = _a.resolvedModule, failedLookupLocations = _a.failedLookupLocations;
+                var _a = ts.loadModuleFromGlobalCache(ts.Debug.assertDefined(resolutionHost.globalCacheResolutionModuleName)(moduleName), resolutionHost.projectName, compilerOptions, host, globalCache), resolvedModule = _a.resolvedModule, failedLookupLocations = _a.failedLookupLocations;
                 if (resolvedModule) {
                     return { resolvedModule: resolvedModule, failedLookupLocations: ts.addRange(primaryResult.failedLookupLocations, failedLookupLocations) };
                 }
@@ -91739,37 +94529,6 @@ var ts;
         function isNodeModulesAtTypesDirectory(dirPath) {
             return ts.endsWith(dirPath, "/node_modules/@types");
         }
-        /**
-         * Filter out paths like
-         * "/", "/user", "/user/username", "/user/username/folderAtRoot",
-         * "c:/", "c:/users", "c:/users/username", "c:/users/username/folderAtRoot", "c:/folderAtRoot"
-         * @param dirPath
-         */
-        function canWatchDirectory(dirPath) {
-            var rootLength = ts.getRootLength(dirPath);
-            if (dirPath.length === rootLength) {
-                // Ignore "/", "c:/"
-                return false;
-            }
-            var nextDirectorySeparator = dirPath.indexOf(ts.directorySeparator, rootLength);
-            if (nextDirectorySeparator === -1) {
-                // ignore "/user", "c:/users" or "c:/folderAtRoot"
-                return false;
-            }
-            if (dirPath.charCodeAt(0) !== 47 /* slash */ &&
-                dirPath.substr(rootLength, nextDirectorySeparator).search(/users/i) === -1) {
-                // Paths like c:/folderAtRoot/subFolder are allowed
-                return true;
-            }
-            for (var searchIndex = nextDirectorySeparator + 1, searchLevels = 2; searchLevels > 0; searchLevels--) {
-                searchIndex = dirPath.indexOf(ts.directorySeparator, searchIndex) + 1;
-                if (searchIndex === 0) {
-                    // Folder isnt at expected minimun levels
-                    return false;
-                }
-            }
-            return true;
-        }
         function getDirectoryToWatchFailedLookupLocation(failedLookupLocation, failedLookupLocationPath) {
             if (isInDirectoryPath(rootPath, failedLookupLocationPath)) {
                 // Ensure failed look up is normalized path
@@ -92027,6 +94786,10 @@ var ts;
                 // If something to do with folder/file starting with "." in node_modules folder, skip it
                 if (isPathIgnored(fileOrDirectoryPath))
                     return false;
+                // prevent saving an open file from over-eagerly triggering invalidation
+                if (resolutionHost.fileIsOpen(fileOrDirectoryPath)) {
+                    return false;
+                }
                 // Some file or directory in the watching directory is created
                 // Return early if it does not have any of the watching extension or not the custom failed lookup path
                 var dirOfFileOrDirectory = ts.getDirectoryPath(fileOrDirectoryPath);
@@ -92269,11 +95032,11 @@ var ts;
         }
         function discoverProbableSymlinks(files, getCanonicalFileName, cwd) {
             var result = ts.createMap();
-            var symlinks = ts.mapDefined(files, function (sf) {
-                return sf.resolvedModules && ts.firstDefinedIterator(sf.resolvedModules.values(), function (res) {
+            var symlinks = ts.flatten(ts.mapDefined(files, function (sf) {
+                return sf.resolvedModules && ts.compact(ts.arrayFrom(ts.mapIterator(sf.resolvedModules.values(), function (res) {
                     return res && res.originalPath && res.resolvedFileName !== res.originalPath ? [res.resolvedFileName, res.originalPath] : undefined;
-                });
-            });
+                })));
+            }));
             for (var _i = 0, symlinks_1 = symlinks; _i < symlinks_1.length; _i++) {
                 var _a = symlinks_1[_i], resolvedPath = _a[0], originalPath = _a[1];
                 var _b = guessDirectorySymlink(resolvedPath, originalPath, cwd, getCanonicalFileName), commonResolved = _b[0], commonOriginal = _b[1];
@@ -92616,25 +95379,34 @@ var ts;
         return "" + newLine + ts.flattenDiagnosticMessageText(d.messageText, newLine) + newLine + newLine;
     }
     ts.getErrorSummaryText = getErrorSummaryText;
+    function listFiles(program, writeFileName) {
+        if (program.getCompilerOptions().listFiles) {
+            ts.forEach(program.getSourceFiles(), function (file) {
+                writeFileName(file.fileName);
+            });
+        }
+    }
+    ts.listFiles = listFiles;
     /**
      * Helper that emit files, report diagnostics and lists emitted and/or source files depending on compiler options
      */
-    function emitFilesAndReportErrors(program, reportDiagnostic, writeFileName, reportSummary, writeFile) {
+    function emitFilesAndReportErrors(program, reportDiagnostic, writeFileName, reportSummary, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers) {
         // First get and report any syntactic errors.
         var diagnostics = program.getConfigFileParsingDiagnostics().slice();
         var configFileParsingDiagnosticsLength = diagnostics.length;
-        ts.addRange(diagnostics, program.getSyntacticDiagnostics());
+        ts.addRange(diagnostics, program.getSyntacticDiagnostics(/*sourceFile*/ undefined, cancellationToken));
         // If we didn't have any syntactic errors, then also try getting the global and
         // semantic errors.
         if (diagnostics.length === configFileParsingDiagnosticsLength) {
-            ts.addRange(diagnostics, program.getOptionsDiagnostics());
-            ts.addRange(diagnostics, program.getGlobalDiagnostics());
+            ts.addRange(diagnostics, program.getOptionsDiagnostics(cancellationToken));
+            ts.addRange(diagnostics, program.getGlobalDiagnostics(cancellationToken));
             if (diagnostics.length === configFileParsingDiagnosticsLength) {
-                ts.addRange(diagnostics, program.getSemanticDiagnostics());
+                ts.addRange(diagnostics, program.getSemanticDiagnostics(/*sourceFile*/ undefined, cancellationToken));
             }
         }
         // Emit and report any errors we ran into.
-        var _a = program.emit(/*targetSourceFile*/ undefined, writeFile), emittedFiles = _a.emittedFiles, emitSkipped = _a.emitSkipped, emitDiagnostics = _a.diagnostics;
+        var emitResult = program.emit(/*targetSourceFile*/ undefined, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers);
+        var emittedFiles = emitResult.emittedFiles, emitDiagnostics = emitResult.diagnostics;
         ts.addRange(diagnostics, emitDiagnostics);
         ts.sortAndDeduplicateDiagnostics(diagnostics).forEach(reportDiagnostic);
         if (writeFileName) {
@@ -92643,16 +95415,20 @@ var ts;
                 var filepath = ts.getNormalizedAbsolutePath(file, currentDir_1);
                 writeFileName("TSFILE: " + filepath);
             });
-            if (program.getCompilerOptions().listFiles) {
-                ts.forEach(program.getSourceFiles(), function (file) {
-                    writeFileName(file.fileName);
-                });
-            }
+            listFiles(program, writeFileName);
         }
         if (reportSummary) {
             reportSummary(getErrorCountForSummary(diagnostics));
         }
-        if (emitSkipped && diagnostics.length > 0) {
+        return {
+            emitResult: emitResult,
+            diagnostics: diagnostics,
+        };
+    }
+    ts.emitFilesAndReportErrors = emitFilesAndReportErrors;
+    function emitFilesAndReportErrorsAndGetExitStatus(program, reportDiagnostic, writeFileName, reportSummary, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers) {
+        var _a = emitFilesAndReportErrors(program, reportDiagnostic, writeFileName, reportSummary, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers), emitResult = _a.emitResult, diagnostics = _a.diagnostics;
+        if (emitResult.emitSkipped && diagnostics.length > 0) {
             // If the emitter didn't emit anything, then pass that value along.
             return ts.ExitStatus.DiagnosticsPresent_OutputsSkipped;
         }
@@ -92663,15 +95439,15 @@ var ts;
         }
         return ts.ExitStatus.Success;
     }
-    ts.emitFilesAndReportErrors = emitFilesAndReportErrors;
-    var noopFileWatcher = { close: ts.noop };
+    ts.emitFilesAndReportErrorsAndGetExitStatus = emitFilesAndReportErrorsAndGetExitStatus;
+    ts.noopFileWatcher = { close: ts.noop };
     function createWatchHost(system, reportWatchStatus) {
         if (system === void 0) { system = ts.sys; }
         var onWatchStatusChange = reportWatchStatus || createWatchStatusReporter(system);
         return {
             onWatchStatusChange: onWatchStatusChange,
-            watchFile: ts.maybeBind(system, system.watchFile) || (function () { return noopFileWatcher; }),
-            watchDirectory: ts.maybeBind(system, system.watchDirectory) || (function () { return noopFileWatcher; }),
+            watchFile: ts.maybeBind(system, system.watchFile) || (function () { return ts.noopFileWatcher; }),
+            watchDirectory: ts.maybeBind(system, system.watchDirectory) || (function () { return ts.noopFileWatcher; }),
             setTimeout: ts.maybeBind(system, system.setTimeout) || ts.noop,
             clearTimeout: ts.maybeBind(system, system.clearTimeout) || ts.noop
         };
@@ -92756,7 +95532,7 @@ var ts;
         }
     }
     ts.createCompilerHostFromProgramHost = createCompilerHostFromProgramHost;
-    function setCreateSourceFileAsHashVersioned(compilerHost, host) {
+    function setGetSourceFileAsHashVersioned(compilerHost, host) {
         var originalGetSourceFile = compilerHost.getSourceFile;
         var computeHash = host.createHash || ts.generateDjb2Hash;
         compilerHost.getSourceFile = function () {
@@ -92771,7 +95547,7 @@ var ts;
             return result;
         };
     }
-    ts.setCreateSourceFileAsHashVersioned = setCreateSourceFileAsHashVersioned;
+    ts.setGetSourceFileAsHashVersioned = setGetSourceFileAsHashVersioned;
     /**
      * Creates the watch compiler host that can be extended with config file or root file names and options host
      */
@@ -92846,13 +95622,25 @@ var ts;
         return host;
     }
     ts.createWatchCompilerHostOfFilesAndCompilerOptions = createWatchCompilerHostOfFilesAndCompilerOptions;
-    function readBuilderProgram(compilerOptions, readFile) {
+    function performIncrementalCompilation(input) {
+        var system = input.system || ts.sys;
+        var host = input.host || (input.host = ts.createIncrementalCompilerHost(input.options, system));
+        var builderProgram = ts.createIncrementalProgram(input);
+        var exitStatus = emitFilesAndReportErrorsAndGetExitStatus(builderProgram, input.reportDiagnostic || createDiagnosticReporter(system), function (s) { return host.trace && host.trace(s); }, input.reportErrorSummary || input.options.pretty ? function (errorCount) { return system.write(getErrorSummaryText(errorCount, system.newLine)); } : undefined);
+        if (input.afterProgramEmitAndDiagnostics)
+            input.afterProgramEmitAndDiagnostics(builderProgram);
+        return exitStatus;
+    }
+    ts.performIncrementalCompilation = performIncrementalCompilation;
+})(ts || (ts = {}));
+(function (ts) {
+    function readBuilderProgram(compilerOptions, host) {
         if (compilerOptions.out || compilerOptions.outFile)
             return undefined;
         var buildInfoPath = ts.getOutputPathForBuildInfo(compilerOptions);
         if (!buildInfoPath)
             return undefined;
-        var content = readFile(buildInfoPath);
+        var content = host.readFile(buildInfoPath);
         if (!content)
             return undefined;
         var buildInfo = ts.getBuildInfo(content);
@@ -92860,11 +95648,26 @@ var ts;
             return undefined;
         if (!buildInfo.program)
             return undefined;
-        return ts.createBuildProgramUsingProgramBuildInfo(buildInfo.program);
+        return ts.createBuildProgramUsingProgramBuildInfo(buildInfo.program, buildInfoPath, host);
     }
     ts.readBuilderProgram = readBuilderProgram;
-})(ts || (ts = {}));
-(function (ts) {
+    function createIncrementalCompilerHost(options, system) {
+        if (system === void 0) { system = ts.sys; }
+        var host = ts.createCompilerHostWorker(options, /*setParentNodes*/ undefined, system);
+        host.createHash = ts.maybeBind(system, system.createHash);
+        ts.setGetSourceFileAsHashVersioned(host, system);
+        ts.changeCompilerHostLikeToUseCache(host, function (fileName) { return ts.toPath(fileName, host.getCurrentDirectory(), host.getCanonicalFileName); });
+        return host;
+    }
+    ts.createIncrementalCompilerHost = createIncrementalCompilerHost;
+    function createIncrementalProgram(_a) {
+        var rootNames = _a.rootNames, options = _a.options, configFileParsingDiagnostics = _a.configFileParsingDiagnostics, projectReferences = _a.projectReferences, host = _a.host, createProgram = _a.createProgram;
+        host = host || createIncrementalCompilerHost(options);
+        createProgram = createProgram || ts.createEmitAndSemanticDiagnosticsBuilderProgram;
+        var oldProgram = readBuilderProgram(options, host);
+        return createProgram(rootNames, options, host, oldProgram, configFileParsingDiagnostics, projectReferences);
+    }
+    ts.createIncrementalProgram = createIncrementalProgram;
     function createWatchCompilerHost(rootFilesOrConfigFileName, options, system, createProgram, reportDiagnostic, reportWatchStatus, projectReferences) {
         if (ts.isArray(rootFilesOrConfigFileName)) {
             return ts.createWatchCompilerHostOfFilesAndCompilerOptions(rootFilesOrConfigFileName, options, system, createProgram, reportDiagnostic, reportWatchStatus, projectReferences); // TODO: GH#18217
@@ -92919,7 +95722,7 @@ var ts;
             configFileWatcher = watchFile(host, configFileName, scheduleProgramReload, ts.PollingInterval.High, "Config file" /* ConfigFile */);
         }
         var compilerHost = ts.createCompilerHostFromProgramHost(host, function () { return compilerOptions; }, directoryStructureHost);
-        ts.setCreateSourceFileAsHashVersioned(compilerHost, host);
+        ts.setGetSourceFileAsHashVersioned(compilerHost, host);
         // Members for CompilerHost
         var getNewSourceFile = compilerHost.getSourceFile;
         compilerHost.getSourceFile = function (fileName) {
@@ -92944,6 +95747,7 @@ var ts;
             hasChangedAutomaticTypeDirectiveNames = true;
             scheduleProgramUpdate();
         };
+        compilerHost.fileIsOpen = ts.returnFalse;
         compilerHost.maxNumberOfFilesToIterateForInvalidation = host.maxNumberOfFilesToIterateForInvalidation;
         compilerHost.getCurrentProgram = getCurrentProgram;
         compilerHost.writeLog = writeLog;
@@ -92960,7 +95764,7 @@ var ts;
             (function (typeDirectiveNames, containingFile, redirectedReference) { return host.resolveTypeReferenceDirectives(typeDirectiveNames, containingFile, redirectedReference); }) :
             (function (typeDirectiveNames, containingFile, redirectedReference) { return resolutionCache.resolveTypeReferenceDirectives(typeDirectiveNames, containingFile, redirectedReference); });
         var userProvidedResolution = !!host.resolveModuleNames || !!host.resolveTypeReferenceDirectives;
-        builderProgram = ts.readBuilderProgram(compilerOptions, function (path) { return compilerHost.readFile(path); });
+        builderProgram = readBuilderProgram(compilerOptions, compilerHost);
         synchronizeProgram();
         // Update the wild card directory watch
         watchConfigFileWildCardDirectories();
@@ -93291,31 +96095,9 @@ var ts;
     }
     ts.createWatchProgram = createWatchProgram;
 })(ts || (ts = {}));
-// Currently we do not want to expose API for build, we should work out the API, and then expose it just like we did for builder/watch
 /*@internal*/
 var ts;
 (function (ts) {
-    var minimumDate = new Date(-8640000000000000);
-    var maximumDate = new Date(8640000000000000);
-    var BuildResultFlags;
-    (function (BuildResultFlags) {
-        BuildResultFlags[BuildResultFlags["None"] = 0] = "None";
-        /**
-         * No errors of any kind occurred during build
-         */
-        BuildResultFlags[BuildResultFlags["Success"] = 1] = "Success";
-        /**
-         * None of the .d.ts files emitted by this build were
-         * different from the existing files on disk
-         */
-        BuildResultFlags[BuildResultFlags["DeclarationOutputUnchanged"] = 2] = "DeclarationOutputUnchanged";
-        BuildResultFlags[BuildResultFlags["ConfigFileErrors"] = 4] = "ConfigFileErrors";
-        BuildResultFlags[BuildResultFlags["SyntaxErrors"] = 8] = "SyntaxErrors";
-        BuildResultFlags[BuildResultFlags["TypeErrors"] = 16] = "TypeErrors";
-        BuildResultFlags[BuildResultFlags["DeclarationEmitErrors"] = 32] = "DeclarationEmitErrors";
-        BuildResultFlags[BuildResultFlags["EmitErrors"] = 64] = "EmitErrors";
-        BuildResultFlags[BuildResultFlags["AnyErrors"] = 124] = "AnyErrors";
-    })(BuildResultFlags || (BuildResultFlags = {}));
     var UpToDateStatusType;
     (function (UpToDateStatusType) {
         UpToDateStatusType[UpToDateStatusType["Unbuildable"] = 0] = "Unbuildable";
@@ -93344,101 +96126,51 @@ var ts;
          */
         UpToDateStatusType[UpToDateStatusType["ContainerOnly"] = 11] = "ContainerOnly";
     })(UpToDateStatusType = ts.UpToDateStatusType || (ts.UpToDateStatusType = {}));
-    function createFileMap(toPath) {
-        // tslint:disable-next-line:no-null-keyword
-        var lookup = ts.createMap();
-        return {
-            setValue: setValue,
-            getValue: getValue,
-            removeKey: removeKey,
-            forEach: forEach,
-            hasKey: hasKey,
-            getSize: getSize,
-            clear: clear
-        };
-        function forEach(action) {
-            lookup.forEach(action);
-        }
-        function hasKey(fileName) {
-            return lookup.has(toPath(fileName));
-        }
-        function removeKey(fileName) {
-            lookup.delete(toPath(fileName));
-        }
-        function setValue(fileName, value) {
-            lookup.set(toPath(fileName), value);
-        }
-        function getValue(fileName) {
-            return lookup.get(toPath(fileName));
-        }
-        function getSize() {
-            return lookup.size;
-        }
-        function clear() {
-            lookup.clear();
+    function resolveConfigFileProjectName(project) {
+        if (ts.fileExtensionIs(project, ".json" /* Json */)) {
+            return project;
         }
+        return ts.combinePaths(project, "tsconfig.json");
+    }
+    ts.resolveConfigFileProjectName = resolveConfigFileProjectName;
+})(ts || (ts = {}));
+(function (ts) {
+    var minimumDate = new Date(-8640000000000000);
+    var maximumDate = new Date(8640000000000000);
+    var BuildResultFlags;
+    (function (BuildResultFlags) {
+        BuildResultFlags[BuildResultFlags["None"] = 0] = "None";
+        /**
+         * No errors of any kind occurred during build
+         */
+        BuildResultFlags[BuildResultFlags["Success"] = 1] = "Success";
+        /**
+         * None of the .d.ts files emitted by this build were
+         * different from the existing files on disk
+         */
+        BuildResultFlags[BuildResultFlags["DeclarationOutputUnchanged"] = 2] = "DeclarationOutputUnchanged";
+        BuildResultFlags[BuildResultFlags["ConfigFileErrors"] = 4] = "ConfigFileErrors";
+        BuildResultFlags[BuildResultFlags["SyntaxErrors"] = 8] = "SyntaxErrors";
+        BuildResultFlags[BuildResultFlags["TypeErrors"] = 16] = "TypeErrors";
+        BuildResultFlags[BuildResultFlags["DeclarationEmitErrors"] = 32] = "DeclarationEmitErrors";
+        BuildResultFlags[BuildResultFlags["EmitErrors"] = 64] = "EmitErrors";
+        BuildResultFlags[BuildResultFlags["AnyErrors"] = 124] = "AnyErrors";
+    })(BuildResultFlags || (BuildResultFlags = {}));
+    function createConfigFileMap() {
+        return ts.createMap();
     }
     function getOrCreateValueFromConfigFileMap(configFileMap, resolved, createT) {
-        var existingValue = configFileMap.getValue(resolved);
+        var existingValue = configFileMap.get(resolved);
         var newValue;
         if (!existingValue) {
             newValue = createT();
-            configFileMap.setValue(resolved, newValue);
+            configFileMap.set(resolved, newValue);
         }
         return existingValue || newValue;
     }
     function getOrCreateValueMapFromConfigFileMap(configFileMap, resolved) {
         return getOrCreateValueFromConfigFileMap(configFileMap, resolved, ts.createMap);
     }
-    function getOutputDeclarationFileName(inputFileName, configFile) {
-        var relativePath = ts.getRelativePathFromDirectory(rootDirOfOptions(configFile.options, configFile.options.configFilePath), inputFileName, /*ignoreCase*/ true);
-        var outputPath = ts.resolvePath(configFile.options.declarationDir || configFile.options.outDir || ts.getDirectoryPath(configFile.options.configFilePath), relativePath);
-        return ts.changeExtension(outputPath, ".d.ts" /* Dts */);
-    }
-    ts.getOutputDeclarationFileName = getOutputDeclarationFileName;
-    function getOutputJSFileName(inputFileName, configFile) {
-        var relativePath = ts.getRelativePathFromDirectory(rootDirOfOptions(configFile.options, configFile.options.configFilePath), inputFileName, /*ignoreCase*/ true);
-        var outputPath = ts.resolvePath(configFile.options.outDir || ts.getDirectoryPath(configFile.options.configFilePath), relativePath);
-        var newExtension = ts.fileExtensionIs(inputFileName, ".json" /* Json */) ? ".json" /* Json */ :
-            ts.fileExtensionIs(inputFileName, ".tsx" /* Tsx */) && configFile.options.jsx === 1 /* Preserve */ ? ".jsx" /* Jsx */ : ".js" /* Js */;
-        return ts.changeExtension(outputPath, newExtension);
-    }
-    function getOutputFileNames(inputFileName, configFile) {
-        // outFile is handled elsewhere; .d.ts files don't generate outputs
-        if (configFile.options.outFile || configFile.options.out || ts.fileExtensionIs(inputFileName, ".d.ts" /* Dts */)) {
-            return ts.emptyArray;
-        }
-        var outputs = [];
-        var js = getOutputJSFileName(inputFileName, configFile);
-        outputs.push(js);
-        if (configFile.options.sourceMap) {
-            outputs.push(js + ".map");
-        }
-        if (ts.getEmitDeclarations(configFile.options) && !ts.fileExtensionIs(inputFileName, ".json" /* Json */)) {
-            var dts = getOutputDeclarationFileName(inputFileName, configFile);
-            outputs.push(dts);
-            if (configFile.options.declarationMap) {
-                outputs.push(dts + ".map");
-            }
-        }
-        return outputs;
-    }
-    function getOutFileOutputs(project, ignoreBuildInfo) {
-        ts.Debug.assert(!!project.options.outFile || !!project.options.out, "outFile must be set");
-        var _a = ts.getOutputPathsForBundle(project.options, /*forceDtsPaths*/ false), jsFilePath = _a.jsFilePath, sourceMapFilePath = _a.sourceMapFilePath, declarationFilePath = _a.declarationFilePath, declarationMapPath = _a.declarationMapPath, buildInfoPath = _a.buildInfoPath;
-        var outputs = [];
-        var addOutput = function (path) { return path && (outputs || (outputs = [])).push(path); };
-        addOutput(jsFilePath);
-        addOutput(sourceMapFilePath);
-        addOutput(declarationFilePath);
-        addOutput(declarationMapPath);
-        if (!ignoreBuildInfo)
-            addOutput(buildInfoPath);
-        return outputs || ts.emptyArray;
-    }
-    function rootDirOfOptions(opts, configFileName) {
-        return opts.rootDir || ts.getDirectoryPath(configFileName);
-    }
     function newer(date1, date2) {
         return date2 > date1 ? date2 : date1;
     }
@@ -93458,7 +96190,7 @@ var ts;
     ts.createBuilderStatusReporter = createBuilderStatusReporter;
     function createSolutionBuilderHostBase(system, createProgram, reportDiagnostic, reportSolutionBuilderStatus) {
         var host = ts.createProgramHost(system, createProgram);
-        host.getModifiedTime = system.getModifiedTime ? function (path) { return system.getModifiedTime(path); } : function () { return undefined; };
+        host.getModifiedTime = system.getModifiedTime ? function (path) { return system.getModifiedTime(path); } : ts.returnUndefined;
         host.setModifiedTime = system.setModifiedTime ? function (path, date) { return system.setModifiedTime(path, date); } : ts.noop;
         host.deleteFile = system.deleteFile ? function (path) { return system.deleteFile(path); } : ts.noop;
         host.reportDiagnostic = reportDiagnostic || ts.createDiagnosticReporter(system);
@@ -93483,644 +96215,459 @@ var ts;
     function getCompilerOptionsOfBuildOptions(buildOptions) {
         var result = {};
         ts.commonOptionsWithBuild.forEach(function (option) {
-            result[option.name] = buildOptions[option.name];
+            if (ts.hasProperty(buildOptions, option.name))
+                result[option.name] = buildOptions[option.name];
         });
         return result;
     }
     function createSolutionBuilder(host, rootNames, defaultOptions) {
-        var hostWithWatch = host;
+        return createSolutionBuilderWorker(/*watch*/ false, host, rootNames, defaultOptions);
+    }
+    ts.createSolutionBuilder = createSolutionBuilder;
+    function createSolutionBuilderWithWatch(host, rootNames, defaultOptions) {
+        return createSolutionBuilderWorker(/*watch*/ true, host, rootNames, defaultOptions);
+    }
+    ts.createSolutionBuilderWithWatch = createSolutionBuilderWithWatch;
+    function createSolutionBuilderState(watch, hostOrHostWithWatch, rootNames, options) {
+        var host = hostOrHostWithWatch;
+        var hostWithWatch = hostOrHostWithWatch;
         var currentDirectory = host.getCurrentDirectory();
         var getCanonicalFileName = ts.createGetCanonicalFileName(host.useCaseSensitiveFileNames());
-        var parseConfigFileHost = ts.parseConfigHostFromCompilerHostLike(host);
         // State of the solution
-        var options = defaultOptions;
         var baseCompilerOptions = getCompilerOptionsOfBuildOptions(options);
-        var configFileCache = createFileMap(toPath);
-        /** Map from output file name to its pre-build timestamp */
-        var unchangedOutputs = createFileMap(toPath);
-        /** Map from config file name to up-to-date status */
-        var projectStatus = createFileMap(toPath);
-        var missingRoots = ts.createMap();
-        var globalDependencyGraph;
-        var writeFileName = function (s) { return host.trace && host.trace(s); };
-        var readFileWithCache = function (f) { return host.readFile(f); };
-        var projectCompilerOptions = baseCompilerOptions;
-        var compilerHost = ts.createCompilerHostFromProgramHost(host, function () { return projectCompilerOptions; });
-        ts.setCreateSourceFileAsHashVersioned(compilerHost, host);
-        var buildInfoChecked = createFileMap(toPath);
-        // Watch state
-        var builderPrograms = createFileMap(toPath);
-        var diagnostics = createFileMap(toPath);
-        var projectPendingBuild = createFileMap(toPath);
-        var projectErrorsReported = createFileMap(toPath);
-        var invalidatedProjectQueue = [];
-        var nextProjectToBuild = 0;
-        var timerToBuildInvalidatedProject;
-        var reportFileChangeDetected = false;
-        var _a = ts.createWatchFactory(host, options), watchFile = _a.watchFile, watchFilePath = _a.watchFilePath, watchDirectory = _a.watchDirectory, writeLog = _a.writeLog;
-        // Watches for the solution
-        var allWatchedWildcardDirectories = createFileMap(toPath);
-        var allWatchedInputFiles = createFileMap(toPath);
-        var allWatchedConfigFiles = createFileMap(toPath);
-        return {
-            buildAllProjects: buildAllProjects,
-            getUpToDateStatusOfFile: getUpToDateStatusOfFile,
-            cleanAllProjects: cleanAllProjects,
-            resetBuildContext: resetBuildContext,
-            getBuildGraph: getBuildGraph,
-            invalidateProject: invalidateProject,
-            buildInvalidatedProject: buildInvalidatedProject,
-            resolveProjectName: resolveProjectName,
-            startWatching: startWatching
+        var compilerHost = ts.createCompilerHostFromProgramHost(host, function () { return state.projectCompilerOptions; });
+        ts.setGetSourceFileAsHashVersioned(compilerHost, host);
+        compilerHost.getParsedCommandLine = function (fileName) { return parseConfigFile(state, fileName, toResolvedConfigFilePath(state, fileName)); };
+        compilerHost.resolveModuleNames = ts.maybeBind(host, host.resolveModuleNames);
+        compilerHost.resolveTypeReferenceDirectives = ts.maybeBind(host, host.resolveTypeReferenceDirectives);
+        var moduleResolutionCache = !compilerHost.resolveModuleNames ? ts.createModuleResolutionCache(currentDirectory, getCanonicalFileName) : undefined;
+        if (!compilerHost.resolveModuleNames) {
+            var loader_3 = function (moduleName, containingFile, redirectedReference) { return ts.resolveModuleName(moduleName, containingFile, state.projectCompilerOptions, compilerHost, moduleResolutionCache, redirectedReference).resolvedModule; };
+            compilerHost.resolveModuleNames = function (moduleNames, containingFile, _reusedNames, redirectedReference) {
+                return ts.loadWithLocalCache(ts.Debug.assertEachDefined(moduleNames), containingFile, redirectedReference, loader_3);
+            };
+        }
+        var _a = ts.createWatchFactory(hostWithWatch, options), watchFile = _a.watchFile, watchFilePath = _a.watchFilePath, watchDirectory = _a.watchDirectory, writeLog = _a.writeLog;
+        var state = {
+            host: host,
+            hostWithWatch: hostWithWatch,
+            currentDirectory: currentDirectory,
+            getCanonicalFileName: getCanonicalFileName,
+            parseConfigFileHost: ts.parseConfigHostFromCompilerHostLike(host),
+            writeFileName: host.trace ? function (s) { return host.trace(s); } : undefined,
+            // State of solution
+            options: options,
+            baseCompilerOptions: baseCompilerOptions,
+            rootNames: rootNames,
+            resolvedConfigFilePaths: ts.createMap(),
+            configFileCache: createConfigFileMap(),
+            projectStatus: createConfigFileMap(),
+            buildInfoChecked: createConfigFileMap(),
+            extendedConfigCache: ts.createMap(),
+            builderPrograms: createConfigFileMap(),
+            diagnostics: createConfigFileMap(),
+            projectPendingBuild: createConfigFileMap(),
+            projectErrorsReported: createConfigFileMap(),
+            compilerHost: compilerHost,
+            moduleResolutionCache: moduleResolutionCache,
+            // Mutable state
+            buildOrder: undefined,
+            readFileWithCache: function (f) { return host.readFile(f); },
+            projectCompilerOptions: baseCompilerOptions,
+            cache: undefined,
+            allProjectBuildPending: true,
+            needsSummary: true,
+            watchAllProjectsPending: watch,
+            currentInvalidatedProject: undefined,
+            // Watch state
+            watch: watch,
+            allWatchedWildcardDirectories: createConfigFileMap(),
+            allWatchedInputFiles: createConfigFileMap(),
+            allWatchedConfigFiles: createConfigFileMap(),
+            timerToBuildInvalidatedProject: undefined,
+            reportFileChangeDetected: false,
+            watchFile: watchFile,
+            watchFilePath: watchFilePath,
+            watchDirectory: watchDirectory,
+            writeLog: writeLog,
         };
-        function toPath(fileName) {
-            return ts.toPath(fileName, currentDirectory, getCanonicalFileName);
+        return state;
+    }
+    function toPath(state, fileName) {
+        return ts.toPath(fileName, state.currentDirectory, state.getCanonicalFileName);
+    }
+    function toResolvedConfigFilePath(state, fileName) {
+        var resolvedConfigFilePaths = state.resolvedConfigFilePaths;
+        var path = resolvedConfigFilePaths.get(fileName);
+        if (path !== undefined)
+            return path;
+        var resolvedPath = toPath(state, fileName);
+        resolvedConfigFilePaths.set(fileName, resolvedPath);
+        return resolvedPath;
+    }
+    function isParsedCommandLine(entry) {
+        return !!entry.options;
+    }
+    function parseConfigFile(state, configFileName, configFilePath) {
+        var configFileCache = state.configFileCache;
+        var value = configFileCache.get(configFilePath);
+        if (value) {
+            return isParsedCommandLine(value) ? value : undefined;
         }
-        function resetBuildContext(opts) {
-            if (opts === void 0) { opts = defaultOptions; }
-            options = opts;
-            baseCompilerOptions = getCompilerOptionsOfBuildOptions(options);
-            configFileCache.clear();
-            unchangedOutputs.clear();
-            projectStatus.clear();
-            missingRoots.clear();
-            globalDependencyGraph = undefined;
-            buildInfoChecked.clear();
-            diagnostics.clear();
-            projectPendingBuild.clear();
-            projectErrorsReported.clear();
-            invalidatedProjectQueue.length = 0;
-            nextProjectToBuild = 0;
-            if (timerToBuildInvalidatedProject) {
-                clearTimeout(timerToBuildInvalidatedProject);
-                timerToBuildInvalidatedProject = undefined;
-            }
-            reportFileChangeDetected = false;
-            ts.clearMap(allWatchedWildcardDirectories, function (wildCardWatches) { return ts.clearMap(wildCardWatches, ts.closeFileWatcherOf); });
-            ts.clearMap(allWatchedInputFiles, function (inputFileWatches) { return ts.clearMap(inputFileWatches, ts.closeFileWatcher); });
-            ts.clearMap(allWatchedConfigFiles, ts.closeFileWatcher);
-            builderPrograms.clear();
+        var diagnostic;
+        var parseConfigFileHost = state.parseConfigFileHost, baseCompilerOptions = state.baseCompilerOptions, extendedConfigCache = state.extendedConfigCache, host = state.host;
+        var parsed;
+        if (host.getParsedCommandLine) {
+            parsed = host.getParsedCommandLine(configFileName);
+            if (!parsed)
+                diagnostic = ts.createCompilerDiagnostic(ts.Diagnostics.File_0_not_found, configFileName);
         }
-        function isParsedCommandLine(entry) {
-            return !!entry.options;
-        }
-        function parseConfigFile(configFilePath) {
-            var value = configFileCache.getValue(configFilePath);
-            if (value) {
-                return isParsedCommandLine(value) ? value : undefined;
-            }
-            var diagnostic;
+        else {
             parseConfigFileHost.onUnRecoverableConfigFileDiagnostic = function (d) { return diagnostic = d; };
-            var parsed = ts.getParsedCommandLineOfConfigFile(configFilePath, baseCompilerOptions, parseConfigFileHost);
+            parsed = ts.getParsedCommandLineOfConfigFile(configFileName, baseCompilerOptions, parseConfigFileHost, extendedConfigCache);
             parseConfigFileHost.onUnRecoverableConfigFileDiagnostic = ts.noop;
-            configFileCache.setValue(configFilePath, parsed || diagnostic);
-            return parsed;
         }
-        function reportStatus(message) {
+        configFileCache.set(configFilePath, parsed || diagnostic);
+        return parsed;
+    }
+    function resolveProjectName(state, name) {
+        return ts.resolveConfigFileProjectName(ts.resolvePath(state.currentDirectory, name));
+    }
+    function createBuildOrder(state, roots) {
+        var temporaryMarks = ts.createMap();
+        var permanentMarks = ts.createMap();
+        var circularityReportStack = [];
+        var buildOrder;
+        for (var _i = 0, roots_1 = roots; _i < roots_1.length; _i++) {
+            var root = roots_1[_i];
+            visit(root);
+        }
+        return buildOrder || ts.emptyArray;
+        function visit(configFileName, inCircularContext) {
+            var projPath = toResolvedConfigFilePath(state, configFileName);
+            // Already visited
+            if (permanentMarks.has(projPath))
+                return;
+            // Circular
+            if (temporaryMarks.has(projPath)) {
+                if (!inCircularContext) {
+                    // TODO:: Do we report this as error?
+                    reportStatus(state, ts.Diagnostics.Project_references_may_not_form_a_circular_graph_Cycle_detected_Colon_0, circularityReportStack.join("\r\n"));
+                }
+                return;
+            }
+            temporaryMarks.set(projPath, true);
+            circularityReportStack.push(configFileName);
+            var parsed = parseConfigFile(state, configFileName, projPath);
+            if (parsed && parsed.projectReferences) {
+                for (var _i = 0, _a = parsed.projectReferences; _i < _a.length; _i++) {
+                    var ref = _a[_i];
+                    var resolvedRefPath = resolveProjectName(state, ref.path);
+                    visit(resolvedRefPath, inCircularContext || ref.circular);
+                }
+            }
+            circularityReportStack.pop();
+            permanentMarks.set(projPath, true);
+            (buildOrder || (buildOrder = [])).push(configFileName);
+        }
+    }
+    function getBuildOrder(state) {
+        return state.buildOrder ||
+            (state.buildOrder = createBuildOrder(state, state.rootNames.map(function (f) { return resolveProjectName(state, f); })));
+    }
+    function getBuildOrderFor(state, project, onlyReferences) {
+        var resolvedProject = project && resolveProjectName(state, project);
+        var buildOrderFromState = getBuildOrder(state);
+        if (resolvedProject) {
+            var projectPath_1 = toResolvedConfigFilePath(state, resolvedProject);
+            var projectIndex = ts.findIndex(buildOrderFromState, function (configFileName) { return toResolvedConfigFilePath(state, configFileName) === projectPath_1; });
+            if (projectIndex === -1)
+                return undefined;
+        }
+        var buildOrder = resolvedProject ? createBuildOrder(state, [resolvedProject]) : buildOrderFromState;
+        ts.Debug.assert(!onlyReferences || resolvedProject !== undefined);
+        ts.Debug.assert(!onlyReferences || buildOrder[buildOrder.length - 1] === resolvedProject);
+        return onlyReferences ? buildOrder.slice(0, buildOrder.length - 1) : buildOrder;
+    }
+    function enableCache(state) {
+        if (state.cache) {
+            disableCache(state);
+        }
+        var compilerHost = state.compilerHost, host = state.host;
+        var originalReadFileWithCache = state.readFileWithCache;
+        var originalGetSourceFile = compilerHost.getSourceFile;
+        var _a = ts.changeCompilerHostLikeToUseCache(host, function (fileName) { return toPath(state, fileName); }, function () {
             var args = [];
-            for (var _i = 1; _i < arguments.length; _i++) {
-                args[_i - 1] = arguments[_i];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                args[_i] = arguments[_i];
             }
-            host.reportSolutionBuilderStatus(ts.createCompilerDiagnostic.apply(void 0, [message].concat(args)));
+            return originalGetSourceFile.call.apply(originalGetSourceFile, [compilerHost].concat(args));
+        }), originalReadFile = _a.originalReadFile, originalFileExists = _a.originalFileExists, originalDirectoryExists = _a.originalDirectoryExists, originalCreateDirectory = _a.originalCreateDirectory, originalWriteFile = _a.originalWriteFile, getSourceFileWithCache = _a.getSourceFileWithCache, readFileWithCache = _a.readFileWithCache;
+        state.readFileWithCache = readFileWithCache;
+        compilerHost.getSourceFile = getSourceFileWithCache;
+        state.cache = {
+            originalReadFile: originalReadFile,
+            originalFileExists: originalFileExists,
+            originalDirectoryExists: originalDirectoryExists,
+            originalCreateDirectory: originalCreateDirectory,
+            originalWriteFile: originalWriteFile,
+            originalReadFileWithCache: originalReadFileWithCache,
+            originalGetSourceFile: originalGetSourceFile,
+        };
+    }
+    function disableCache(state) {
+        if (!state.cache)
+            return;
+        var cache = state.cache, host = state.host, compilerHost = state.compilerHost, extendedConfigCache = state.extendedConfigCache, moduleResolutionCache = state.moduleResolutionCache;
+        host.readFile = cache.originalReadFile;
+        host.fileExists = cache.originalFileExists;
+        host.directoryExists = cache.originalDirectoryExists;
+        host.createDirectory = cache.originalCreateDirectory;
+        host.writeFile = cache.originalWriteFile;
+        compilerHost.getSourceFile = cache.originalGetSourceFile;
+        state.readFileWithCache = cache.originalReadFileWithCache;
+        extendedConfigCache.clear();
+        if (moduleResolutionCache) {
+            moduleResolutionCache.directoryToModuleNameMap.clear();
+            moduleResolutionCache.moduleNameToDirectoryMap.clear();
         }
-        function reportWatchStatus(message) {
-            var args = [];
-            for (var _i = 1; _i < arguments.length; _i++) {
-                args[_i - 1] = arguments[_i];
-            }
-            if (hostWithWatch.onWatchStatusChange) {
-                hostWithWatch.onWatchStatusChange(ts.createCompilerDiagnostic.apply(void 0, [message].concat(args)), host.getNewLine(), baseCompilerOptions);
-            }
+        state.cache = undefined;
+    }
+    function clearProjectStatus(state, resolved) {
+        state.projectStatus.delete(resolved);
+        state.diagnostics.delete(resolved);
+    }
+    function addProjToQueue(_a, proj, reloadLevel) {
+        var projectPendingBuild = _a.projectPendingBuild;
+        var value = projectPendingBuild.get(proj);
+        if (value === undefined) {
+            projectPendingBuild.set(proj, reloadLevel);
         }
-        function startWatching() {
-            var graph = getGlobalDependencyGraph();
-            for (var _i = 0, _a = graph.buildQueue; _i < _a.length; _i++) {
-                var resolved = _a[_i];
-                // Watch this file
-                watchConfigFile(resolved);
-                var cfg = parseConfigFile(resolved);
-                if (cfg) {
-                    // Update watchers for wildcard directories
-                    watchWildCardDirectories(resolved, cfg);
-                    // Watch input files
-                    watchInputFiles(resolved, cfg);
+        else if (value < reloadLevel) {
+            projectPendingBuild.set(proj, reloadLevel);
+        }
+    }
+    function setupInitialBuild(state, cancellationToken) {
+        // Set initial build if not already built
+        if (!state.allProjectBuildPending)
+            return;
+        state.allProjectBuildPending = false;
+        if (state.options.watch) {
+            reportWatchStatus(state, ts.Diagnostics.Starting_compilation_in_watch_mode);
+        }
+        enableCache(state);
+        var buildOrder = getBuildOrder(state);
+        buildOrder.forEach(function (configFileName) {
+            return state.projectPendingBuild.set(toResolvedConfigFilePath(state, configFileName), ts.ConfigFileProgramReloadLevel.None);
+        });
+        if (cancellationToken) {
+            cancellationToken.throwIfCancellationRequested();
+        }
+    }
+    var InvalidatedProjectKind;
+    (function (InvalidatedProjectKind) {
+        InvalidatedProjectKind[InvalidatedProjectKind["Build"] = 0] = "Build";
+        InvalidatedProjectKind[InvalidatedProjectKind["UpdateBundle"] = 1] = "UpdateBundle";
+        InvalidatedProjectKind[InvalidatedProjectKind["UpdateOutputFileStamps"] = 2] = "UpdateOutputFileStamps";
+    })(InvalidatedProjectKind = ts.InvalidatedProjectKind || (ts.InvalidatedProjectKind = {}));
+    function doneInvalidatedProject(state, projectPath) {
+        state.projectPendingBuild.delete(projectPath);
+        state.currentInvalidatedProject = undefined;
+        return state.diagnostics.has(projectPath) ?
+            ts.ExitStatus.DiagnosticsPresent_OutputsSkipped :
+            ts.ExitStatus.Success;
+    }
+    function createUpdateOutputFileStampsProject(state, project, projectPath, config, buildOrder) {
+        var updateOutputFileStampsPending = true;
+        return {
+            kind: InvalidatedProjectKind.UpdateOutputFileStamps,
+            project: project,
+            projectPath: projectPath,
+            buildOrder: buildOrder,
+            getCompilerOptions: function () { return config.options; },
+            getCurrentDirectory: function () { return state.currentDirectory; },
+            updateOutputFileStatmps: function () {
+                updateOutputTimestamps(state, config, projectPath);
+                updateOutputFileStampsPending = false;
+            },
+            done: function () {
+                if (updateOutputFileStampsPending) {
+                    updateOutputTimestamps(state, config, projectPath);
                 }
+                return doneInvalidatedProject(state, projectPath);
             }
-        }
-        function watchConfigFile(resolved) {
-            if (options.watch && !allWatchedConfigFiles.hasKey(resolved)) {
-                allWatchedConfigFiles.setValue(resolved, watchFile(hostWithWatch, resolved, function () {
-                    invalidateProjectAndScheduleBuilds(resolved, ts.ConfigFileProgramReloadLevel.Full);
-                }, ts.PollingInterval.High, "Config file" /* ConfigFile */, resolved));
-            }
-        }
-        function watchWildCardDirectories(resolved, parsed) {
-            if (!options.watch)
-                return;
-            ts.updateWatchingWildcardDirectories(getOrCreateValueMapFromConfigFileMap(allWatchedWildcardDirectories, resolved), ts.createMapFromTemplate(parsed.configFileSpecs.wildcardDirectories), function (dir, flags) {
-                return watchDirectory(hostWithWatch, dir, function (fileOrDirectory) {
-                    var fileOrDirectoryPath = toPath(fileOrDirectory);
-                    if (fileOrDirectoryPath !== toPath(dir) && ts.hasExtension(fileOrDirectoryPath) && !ts.isSupportedSourceFileName(fileOrDirectory, parsed.options)) {
-                        writeLog("Project: " + resolved + " Detected file add/remove of non supported extension: " + fileOrDirectory);
-                        return;
+        };
+    }
+    function createBuildOrUpdateInvalidedProject(kind, state, project, projectPath, projectIndex, config, buildOrder) {
+        var Step;
+        (function (Step) {
+            Step[Step["CreateProgram"] = 0] = "CreateProgram";
+            Step[Step["SyntaxDiagnostics"] = 1] = "SyntaxDiagnostics";
+            Step[Step["SemanticDiagnostics"] = 2] = "SemanticDiagnostics";
+            Step[Step["Emit"] = 3] = "Emit";
+            Step[Step["EmitBundle"] = 4] = "EmitBundle";
+            Step[Step["BuildInvalidatedProjectOfBundle"] = 5] = "BuildInvalidatedProjectOfBundle";
+            Step[Step["QueueReferencingProjects"] = 6] = "QueueReferencingProjects";
+            Step[Step["Done"] = 7] = "Done";
+        })(Step || (Step = {}));
+        var step = kind === InvalidatedProjectKind.Build ? Step.CreateProgram : Step.EmitBundle;
+        var program;
+        var buildResult;
+        var invalidatedProjectOfBundle;
+        return kind === InvalidatedProjectKind.Build ?
+            {
+                kind: kind,
+                project: project,
+                projectPath: projectPath,
+                buildOrder: buildOrder,
+                getCompilerOptions: function () { return config.options; },
+                getCurrentDirectory: function () { return state.currentDirectory; },
+                getBuilderProgram: function () { return withProgramOrUndefined(ts.identity); },
+                getProgram: function () {
+                    return withProgramOrUndefined(function (program) { return program.getProgramOrUndefined(); });
+                },
+                getSourceFile: function (fileName) {
+                    return withProgramOrUndefined(function (program) { return program.getSourceFile(fileName); });
+                },
+                getSourceFiles: function () {
+                    return withProgramOrEmptyArray(function (program) { return program.getSourceFiles(); });
+                },
+                getOptionsDiagnostics: function (cancellationToken) {
+                    return withProgramOrEmptyArray(function (program) { return program.getOptionsDiagnostics(cancellationToken); });
+                },
+                getGlobalDiagnostics: function (cancellationToken) {
+                    return withProgramOrEmptyArray(function (program) { return program.getGlobalDiagnostics(cancellationToken); });
+                },
+                getConfigFileParsingDiagnostics: function () {
+                    return withProgramOrEmptyArray(function (program) { return program.getConfigFileParsingDiagnostics(); });
+                },
+                getSyntacticDiagnostics: function (sourceFile, cancellationToken) {
+                    return withProgramOrEmptyArray(function (program) { return program.getSyntacticDiagnostics(sourceFile, cancellationToken); });
+                },
+                getAllDependencies: function (sourceFile) {
+                    return withProgramOrEmptyArray(function (program) { return program.getAllDependencies(sourceFile); });
+                },
+                getSemanticDiagnostics: function (sourceFile, cancellationToken) {
+                    return withProgramOrEmptyArray(function (program) { return program.getSemanticDiagnostics(sourceFile, cancellationToken); });
+                },
+                getSemanticDiagnosticsOfNextAffectedFile: function (cancellationToken, ignoreSourceFile) {
+                    return withProgramOrUndefined(function (program) {
+                        return (program.getSemanticDiagnosticsOfNextAffectedFile) &&
+                            program.getSemanticDiagnosticsOfNextAffectedFile(cancellationToken, ignoreSourceFile);
+                    });
+                },
+                emit: function (targetSourceFile, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers) {
+                    if (targetSourceFile || emitOnlyDtsFiles) {
+                        return withProgramOrUndefined(function (program) { return program.emit(targetSourceFile, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers); });
                     }
-                    if (isOutputFile(fileOrDirectory, parsed)) {
-                        writeLog(fileOrDirectory + " is output file");
-                        return;
-                    }
-                    invalidateProjectAndScheduleBuilds(resolved, ts.ConfigFileProgramReloadLevel.Partial);
-                }, flags, "Wild card directory" /* WildcardDirectory */, resolved);
-            });
-        }
-        function watchInputFiles(resolved, parsed) {
-            if (!options.watch)
-                return;
-            ts.mutateMap(getOrCreateValueMapFromConfigFileMap(allWatchedInputFiles, resolved), ts.arrayToMap(parsed.fileNames, toPath), {
-                createNewValue: function (path, input) { return watchFilePath(hostWithWatch, input, function () { return invalidateProjectAndScheduleBuilds(resolved, ts.ConfigFileProgramReloadLevel.None); }, ts.PollingInterval.Low, path, "Source file" /* SourceFile */, resolved); },
-                onDeleteValue: ts.closeFileWatcher,
-            });
-        }
-        function isOutputFile(fileName, configFile) {
-            if (configFile.options.noEmit)
-                return false;
-            // ts or tsx files are not output
-            if (!ts.fileExtensionIs(fileName, ".d.ts" /* Dts */) &&
-                (ts.fileExtensionIs(fileName, ".ts" /* Ts */) || ts.fileExtensionIs(fileName, ".tsx" /* Tsx */))) {
-                return false;
-            }
-            // If options have --outFile or --out, check if its that
-            var out = configFile.options.outFile || configFile.options.out;
-            if (out && (isSameFile(fileName, out) || isSameFile(fileName, ts.removeFileExtension(out) + ".d.ts" /* Dts */))) {
-                return true;
-            }
-            // If declarationDir is specified, return if its a file in that directory
-            if (configFile.options.declarationDir && ts.containsPath(configFile.options.declarationDir, fileName, currentDirectory, !host.useCaseSensitiveFileNames())) {
-                return true;
-            }
-            // If --outDir, check if file is in that directory
-            if (configFile.options.outDir && ts.containsPath(configFile.options.outDir, fileName, currentDirectory, !host.useCaseSensitiveFileNames())) {
-                return true;
-            }
-            return !ts.forEach(configFile.fileNames, function (inputFile) { return isSameFile(fileName, inputFile); });
-        }
-        function isSameFile(file1, file2) {
-            return ts.comparePaths(file1, file2, currentDirectory, !host.useCaseSensitiveFileNames()) === 0 /* EqualTo */;
-        }
-        function invalidateProjectAndScheduleBuilds(resolved, reloadLevel) {
-            reportFileChangeDetected = true;
-            invalidateResolvedProject(resolved, reloadLevel);
-            scheduleBuildInvalidatedProject();
-        }
-        function getUpToDateStatusOfFile(configFileName) {
-            return getUpToDateStatus(parseConfigFile(configFileName));
-        }
-        function getBuildGraph(configFileNames) {
-            return createDependencyGraph(resolveProjectNames(configFileNames));
-        }
-        function getGlobalDependencyGraph() {
-            return globalDependencyGraph || (globalDependencyGraph = getBuildGraph(rootNames));
-        }
-        function getUpToDateStatus(project) {
-            if (project === undefined) {
-                return { type: UpToDateStatusType.Unbuildable, reason: "File deleted mid-build" };
-            }
-            var prior = projectStatus.getValue(project.options.configFilePath);
-            if (prior !== undefined) {
-                return prior;
-            }
-            var actual = getUpToDateStatusWorker(project);
-            projectStatus.setValue(project.options.configFilePath, actual);
-            return actual;
-        }
-        function getUpToDateStatusWorker(project) {
-            var newestInputFileName = undefined;
-            var newestInputFileTime = minimumDate;
-            // Get timestamps of input files
-            for (var _i = 0, _a = project.fileNames; _i < _a.length; _i++) {
-                var inputFile = _a[_i];
-                if (!host.fileExists(inputFile)) {
-                    return {
-                        type: UpToDateStatusType.Unbuildable,
-                        reason: inputFile + " does not exist"
-                    };
-                }
-                var inputTime = host.getModifiedTime(inputFile) || ts.missingFileModifiedTime;
-                if (inputTime > newestInputFileTime) {
-                    newestInputFileName = inputFile;
-                    newestInputFileTime = inputTime;
-                }
-            }
-            // Collect the expected outputs of this project
-            var outputs = getAllProjectOutputs(project);
-            if (outputs.length === 0) {
-                return {
-                    type: UpToDateStatusType.ContainerOnly
-                };
-            }
-            // Now see if all outputs are newer than the newest input
-            var oldestOutputFileName = "(none)";
-            var oldestOutputFileTime = maximumDate;
-            var newestOutputFileName = "(none)";
-            var newestOutputFileTime = minimumDate;
-            var missingOutputFileName;
-            var newestDeclarationFileContentChangedTime = minimumDate;
-            var isOutOfDateWithInputs = false;
-            for (var _b = 0, outputs_1 = outputs; _b < outputs_1.length; _b++) {
-                var output = outputs_1[_b];
-                // Output is missing; can stop checking
-                // Don't immediately return because we can still be upstream-blocked, which is a higher-priority status
-                if (!host.fileExists(output)) {
-                    missingOutputFileName = output;
-                    break;
-                }
-                var outputTime = host.getModifiedTime(output) || ts.missingFileModifiedTime;
-                if (outputTime < oldestOutputFileTime) {
-                    oldestOutputFileTime = outputTime;
-                    oldestOutputFileName = output;
-                }
-                // If an output is older than the newest input, we can stop checking
-                // Don't immediately return because we can still be upstream-blocked, which is a higher-priority status
-                if (outputTime < newestInputFileTime) {
-                    isOutOfDateWithInputs = true;
-                    break;
-                }
-                if (outputTime > newestOutputFileTime) {
-                    newestOutputFileTime = outputTime;
-                    newestOutputFileName = output;
-                }
-                // Keep track of when the most recent time a .d.ts file was changed.
-                // In addition to file timestamps, we also keep track of when a .d.ts file
-                // had its file touched but not had its contents changed - this allows us
-                // to skip a downstream typecheck
-                if (isDeclarationFile(output)) {
-                    var unchangedTime = unchangedOutputs.getValue(output);
-                    if (unchangedTime !== undefined) {
-                        newestDeclarationFileContentChangedTime = newer(unchangedTime, newestDeclarationFileContentChangedTime);
-                    }
-                    else {
-                        var outputModifiedTime = host.getModifiedTime(output) || ts.missingFileModifiedTime;
-                        newestDeclarationFileContentChangedTime = newer(newestDeclarationFileContentChangedTime, outputModifiedTime);
-                    }
-                }
-            }
-            var pseudoUpToDate = false;
-            var usesPrepend = false;
-            var upstreamChangedProject;
-            if (project.projectReferences) {
-                projectStatus.setValue(project.options.configFilePath, { type: UpToDateStatusType.ComputingUpstream });
-                for (var _c = 0, _d = project.projectReferences; _c < _d.length; _c++) {
-                    var ref = _d[_c];
-                    usesPrepend = usesPrepend || !!(ref.prepend);
-                    var resolvedRef = ts.resolveProjectReferencePath(ref);
-                    var refStatus = getUpToDateStatus(parseConfigFile(resolvedRef));
-                    // Its a circular reference ignore the status of this project
-                    if (refStatus.type === UpToDateStatusType.ComputingUpstream) {
-                        continue;
-                    }
-                    // An upstream project is blocked
-                    if (refStatus.type === UpToDateStatusType.Unbuildable) {
-                        return {
-                            type: UpToDateStatusType.UpstreamBlocked,
-                            upstreamProjectName: ref.path
-                        };
-                    }
-                    // If the upstream project is out of date, then so are we (someone shouldn't have asked, though?)
-                    if (refStatus.type !== UpToDateStatusType.UpToDate) {
-                        return {
-                            type: UpToDateStatusType.UpstreamOutOfDate,
-                            upstreamProjectName: ref.path
-                        };
-                    }
-                    // Check oldest output file name only if there is no missing output file name
-                    if (!missingOutputFileName) {
-                        // If the upstream project's newest file is older than our oldest output, we
-                        // can't be out of date because of it
-                        if (refStatus.newestInputFileTime && refStatus.newestInputFileTime <= oldestOutputFileTime) {
-                            continue;
-                        }
-                        // If the upstream project has only change .d.ts files, and we've built
-                        // *after* those files, then we're "psuedo up to date" and eligible for a fast rebuild
-                        if (refStatus.newestDeclarationFileContentChangedTime && refStatus.newestDeclarationFileContentChangedTime <= oldestOutputFileTime) {
-                            pseudoUpToDate = true;
-                            upstreamChangedProject = ref.path;
-                            continue;
-                        }
-                        // We have an output older than an upstream output - we are out of date
-                        ts.Debug.assert(oldestOutputFileName !== undefined, "Should have an oldest output filename here");
-                        return {
-                            type: UpToDateStatusType.OutOfDateWithUpstream,
-                            outOfDateOutputFileName: oldestOutputFileName,
-                            newerProjectName: ref.path
-                        };
-                    }
-                }
-            }
-            if (missingOutputFileName !== undefined) {
-                return {
-                    type: UpToDateStatusType.OutputMissing,
-                    missingOutputFileName: missingOutputFileName
-                };
-            }
-            if (isOutOfDateWithInputs) {
-                return {
-                    type: UpToDateStatusType.OutOfDateWithSelf,
-                    outOfDateOutputFileName: oldestOutputFileName,
-                    newerInputFileName: newestInputFileName
-                };
-            }
-            if (!buildInfoChecked.hasKey(project.options.configFilePath)) {
-                buildInfoChecked.setValue(project.options.configFilePath, true);
-                var buildInfoPath = ts.getOutputPathForBuildInfo(project.options);
-                if (buildInfoPath) {
-                    var value = readFileWithCache(buildInfoPath);
-                    var buildInfo = value && ts.getBuildInfo(value);
-                    if (buildInfo && buildInfo.version !== ts.version) {
-                        return {
-                            type: UpToDateStatusType.TsVersionOutputOfDate,
-                            version: buildInfo.version
-                        };
-                    }
-                }
-            }
-            if (usesPrepend && pseudoUpToDate) {
-                return {
-                    type: UpToDateStatusType.OutOfDateWithPrepend,
-                    outOfDateOutputFileName: oldestOutputFileName,
-                    newerProjectName: upstreamChangedProject
-                };
-            }
-            // Up to date
-            return {
-                type: pseudoUpToDate ? UpToDateStatusType.UpToDateWithUpstreamTypes : UpToDateStatusType.UpToDate,
-                newestDeclarationFileContentChangedTime: newestDeclarationFileContentChangedTime,
-                newestInputFileTime: newestInputFileTime,
-                newestOutputFileTime: newestOutputFileTime,
-                newestInputFileName: newestInputFileName,
-                newestOutputFileName: newestOutputFileName,
-                oldestOutputFileName: oldestOutputFileName
+                    executeSteps(Step.SemanticDiagnostics, cancellationToken);
+                    if (step !== Step.Emit)
+                        return undefined;
+                    return emit(writeFile, cancellationToken, customTransformers);
+                },
+                done: done
+            } :
+            {
+                kind: kind,
+                project: project,
+                projectPath: projectPath,
+                buildOrder: buildOrder,
+                getCompilerOptions: function () { return config.options; },
+                getCurrentDirectory: function () { return state.currentDirectory; },
+                emit: function (writeFile, customTransformers) {
+                    if (step !== Step.EmitBundle)
+                        return invalidatedProjectOfBundle;
+                    return emitBundle(writeFile, customTransformers);
+                },
+                done: done,
             };
+        function done(cancellationToken, writeFile, customTransformers) {
+            executeSteps(Step.Done, cancellationToken, writeFile, customTransformers);
+            return doneInvalidatedProject(state, projectPath);
         }
-        function invalidateProject(configFileName, reloadLevel) {
-            invalidateResolvedProject(resolveProjectName(configFileName), reloadLevel);
+        function withProgramOrUndefined(action) {
+            executeSteps(Step.CreateProgram);
+            return program && action(program);
         }
-        function invalidateResolvedProject(resolved, reloadLevel) {
-            if (reloadLevel === ts.ConfigFileProgramReloadLevel.Full) {
-                configFileCache.removeKey(resolved);
-                globalDependencyGraph = undefined;
-            }
-            projectStatus.removeKey(resolved);
-            diagnostics.removeKey(resolved);
-            addProjToQueue(resolved, reloadLevel);
+        function withProgramOrEmptyArray(action) {
+            return withProgramOrUndefined(action) || ts.emptyArray;
         }
-        /**
-         * return true if new addition
-         */
-        function addProjToQueue(proj, reloadLevel) {
-            var value = projectPendingBuild.getValue(proj);
-            if (value === undefined) {
-                projectPendingBuild.setValue(proj, reloadLevel || ts.ConfigFileProgramReloadLevel.None);
-                invalidatedProjectQueue.push(proj);
-            }
-            else if (value < (reloadLevel || ts.ConfigFileProgramReloadLevel.None)) {
-                projectPendingBuild.setValue(proj, reloadLevel || ts.ConfigFileProgramReloadLevel.None);
-            }
-        }
-        function getNextInvalidatedProject() {
-            if (nextProjectToBuild < invalidatedProjectQueue.length) {
-                var project = invalidatedProjectQueue[nextProjectToBuild];
-                nextProjectToBuild++;
-                var reloadLevel = projectPendingBuild.getValue(project);
-                projectPendingBuild.removeKey(project);
-                if (!projectPendingBuild.getSize()) {
-                    invalidatedProjectQueue.length = 0;
-                    nextProjectToBuild = 0;
-                }
-                return { project: project, reloadLevel: reloadLevel };
-            }
-        }
-        function hasPendingInvalidatedProjects() {
-            return !!projectPendingBuild.getSize();
-        }
-        function scheduleBuildInvalidatedProject() {
-            if (!hostWithWatch.setTimeout || !hostWithWatch.clearTimeout) {
+        function createProgram() {
+            ts.Debug.assert(program === undefined);
+            if (state.options.dry) {
+                reportStatus(state, ts.Diagnostics.A_non_dry_build_would_build_project_0, project);
+                buildResult = BuildResultFlags.Success;
+                step = Step.QueueReferencingProjects;
                 return;
             }
-            if (timerToBuildInvalidatedProject) {
-                hostWithWatch.clearTimeout(timerToBuildInvalidatedProject);
-            }
-            timerToBuildInvalidatedProject = hostWithWatch.setTimeout(buildInvalidatedProject, 250);
-        }
-        function buildInvalidatedProject() {
-            timerToBuildInvalidatedProject = undefined;
-            if (reportFileChangeDetected) {
-                reportFileChangeDetected = false;
-                projectErrorsReported.clear();
-                reportWatchStatus(ts.Diagnostics.File_change_detected_Starting_incremental_compilation);
-            }
-            var buildProject = getNextInvalidatedProject();
-            if (buildProject) {
-                buildSingleInvalidatedProject(buildProject.project, buildProject.reloadLevel);
-                if (hasPendingInvalidatedProjects()) {
-                    if (options.watch && !timerToBuildInvalidatedProject) {
-                        scheduleBuildInvalidatedProject();
-                    }
-                }
-                else {
-                    reportErrorSummary();
-                }
-            }
-        }
-        function reportErrorSummary() {
-            if (options.watch || host.reportErrorSummary) {
-                // Report errors from the other projects
-                getGlobalDependencyGraph().buildQueue.forEach(function (project) {
-                    if (!projectErrorsReported.hasKey(project)) {
-                        reportErrors(diagnostics.getValue(project) || ts.emptyArray);
-                    }
-                });
-                var totalErrors_1 = 0;
-                diagnostics.forEach(function (singleProjectErrors) { return totalErrors_1 += ts.getErrorCountForSummary(singleProjectErrors); });
-                if (options.watch) {
-                    reportWatchStatus(ts.getWatchErrorSummaryDiagnosticMessage(totalErrors_1), totalErrors_1);
-                }
-                else {
-                    host.reportErrorSummary(totalErrors_1);
-                }
-            }
-        }
-        function buildSingleInvalidatedProject(resolved, reloadLevel) {
-            var proj = parseConfigFile(resolved);
-            if (!proj) {
-                reportParseConfigFileDiagnostic(resolved);
-                return;
-            }
-            if (reloadLevel === ts.ConfigFileProgramReloadLevel.Full) {
-                watchConfigFile(resolved);
-                watchWildCardDirectories(resolved, proj);
-                watchInputFiles(resolved, proj);
-            }
-            else if (reloadLevel === ts.ConfigFileProgramReloadLevel.Partial) {
-                // Update file names
-                var result = ts.getFileNamesFromConfigSpecs(proj.configFileSpecs, ts.getDirectoryPath(resolved), proj.options, parseConfigFileHost);
-                ts.updateErrorForNoInputFiles(result, resolved, proj.configFileSpecs, proj.errors, ts.canJsonReportNoInutFiles(proj.raw));
-                proj.fileNames = result.fileNames;
-                watchInputFiles(resolved, proj);
-            }
-            var status = getUpToDateStatus(proj);
-            verboseReportProjectStatus(resolved, status);
-            if (status.type === UpToDateStatusType.UpstreamBlocked) {
-                if (options.verbose)
-                    reportStatus(ts.Diagnostics.Skipping_build_of_project_0_because_its_dependency_1_has_errors, resolved, status.upstreamProjectName);
-                return;
-            }
-            if (status.type === UpToDateStatusType.UpToDateWithUpstreamTypes) {
-                // Fake that files have been built by updating output file stamps
-                updateOutputTimestamps(proj);
-                return;
-            }
-            var buildResult = status.type === UpToDateStatusType.OutOfDateWithPrepend ?
-                updateBundle(resolved) : // Fake that files have been built by manipulating prepend and existing output
-                buildSingleProject(resolved); // Actual build
-            if (buildResult & BuildResultFlags.AnyErrors)
-                return;
-            var _a = getGlobalDependencyGraph(), referencingProjectsMap = _a.referencingProjectsMap, buildQueue = _a.buildQueue;
-            var referencingProjects = referencingProjectsMap.getValue(resolved);
-            if (!referencingProjects)
-                return;
-            // Always use build order to queue projects
-            for (var index = buildQueue.indexOf(resolved) + 1; index < buildQueue.length; index++) {
-                var project = buildQueue[index];
-                var prepend = referencingProjects.getValue(project);
-                if (prepend !== undefined) {
-                    // If the project is referenced with prepend, always build downstream projects,
-                    // If declaration output is changed, build the project
-                    // otherwise mark the project UpToDateWithUpstreamTypes so it updates output time stamps
-                    var status_1 = projectStatus.getValue(project);
-                    if (!(buildResult & BuildResultFlags.DeclarationOutputUnchanged)) {
-                        if (status_1 && (status_1.type === UpToDateStatusType.UpToDate || status_1.type === UpToDateStatusType.UpToDateWithUpstreamTypes || status_1.type === UpToDateStatusType.OutOfDateWithPrepend)) {
-                            projectStatus.setValue(project, {
-                                type: UpToDateStatusType.OutOfDateWithUpstream,
-                                outOfDateOutputFileName: status_1.type === UpToDateStatusType.OutOfDateWithPrepend ? status_1.outOfDateOutputFileName : status_1.oldestOutputFileName,
-                                newerProjectName: resolved
-                            });
-                        }
-                    }
-                    else if (status_1 && status_1.type === UpToDateStatusType.UpToDate) {
-                        if (prepend) {
-                            projectStatus.setValue(project, {
-                                type: UpToDateStatusType.OutOfDateWithPrepend,
-                                outOfDateOutputFileName: status_1.oldestOutputFileName,
-                                newerProjectName: resolved
-                            });
-                        }
-                        else {
-                            status_1.type = UpToDateStatusType.UpToDateWithUpstreamTypes;
-                        }
-                    }
-                    addProjToQueue(project);
-                }
-            }
-        }
-        function createDependencyGraph(roots) {
-            var temporaryMarks = createFileMap(toPath);
-            var permanentMarks = createFileMap(toPath);
-            var circularityReportStack = [];
-            var buildOrder = [];
-            var referencingProjectsMap = createFileMap(toPath);
-            for (var _i = 0, roots_1 = roots; _i < roots_1.length; _i++) {
-                var root = roots_1[_i];
-                visit(root);
-            }
-            return {
-                buildQueue: buildOrder,
-                referencingProjectsMap: referencingProjectsMap
-            };
-            function visit(projPath, inCircularContext) {
-                // Already visited
-                if (permanentMarks.hasKey(projPath))
-                    return;
-                // Circular
-                if (temporaryMarks.hasKey(projPath)) {
-                    if (!inCircularContext) {
-                        // TODO:: Do we report this as error?
-                        reportStatus(ts.Diagnostics.Project_references_may_not_form_a_circular_graph_Cycle_detected_Colon_0, circularityReportStack.join("\r\n"));
-                    }
-                    return;
-                }
-                temporaryMarks.setValue(projPath, true);
-                circularityReportStack.push(projPath);
-                var parsed = parseConfigFile(projPath);
-                if (parsed && parsed.projectReferences) {
-                    for (var _i = 0, _a = parsed.projectReferences; _i < _a.length; _i++) {
-                        var ref = _a[_i];
-                        var resolvedRefPath = resolveProjectName(ref.path);
-                        visit(resolvedRefPath, inCircularContext || ref.circular);
-                        // Get projects referencing resolvedRefPath and add projPath to it
-                        var referencingProjects = getOrCreateValueFromConfigFileMap(referencingProjectsMap, resolvedRefPath, function () { return createFileMap(toPath); });
-                        referencingProjects.setValue(projPath, !!ref.prepend);
-                    }
-                }
-                circularityReportStack.pop();
-                permanentMarks.setValue(projPath, true);
-                buildOrder.push(projPath);
-            }
-        }
-        function buildSingleProject(proj) {
-            if (options.dry) {
-                reportStatus(ts.Diagnostics.A_non_dry_build_would_build_project_0, proj);
-                return BuildResultFlags.Success;
-            }
-            if (options.verbose)
-                reportStatus(ts.Diagnostics.Building_project_0, proj);
-            var resultFlags = BuildResultFlags.DeclarationOutputUnchanged;
-            var configFile = parseConfigFile(proj);
-            if (!configFile) {
-                // Failed to read the config file
-                resultFlags |= BuildResultFlags.ConfigFileErrors;
-                reportParseConfigFileDiagnostic(proj);
-                projectStatus.setValue(proj, { type: UpToDateStatusType.Unbuildable, reason: "Config file errors" });
-                return resultFlags;
-            }
-            if (configFile.fileNames.length === 0) {
-                reportAndStoreErrors(proj, configFile.errors);
+            if (state.options.verbose)
+                reportStatus(state, ts.Diagnostics.Building_project_0, project);
+            if (config.fileNames.length === 0) {
+                reportAndStoreErrors(state, projectPath, config.errors);
                 // Nothing to build - must be a solution file, basically
-                return BuildResultFlags.None;
+                buildResult = BuildResultFlags.None;
+                step = Step.QueueReferencingProjects;
+                return;
             }
-            // TODO: handle resolve module name to cache result in project reference redirect
-            projectCompilerOptions = configFile.options;
-            var program = host.createProgram(configFile.fileNames, configFile.options, compilerHost, getOldProgram(proj, configFile), configFile.errors, configFile.projectReferences);
-            // Don't emit anything in the presence of syntactic errors or options diagnostics
-            var syntaxDiagnostics = program.getConfigFileParsingDiagnostics().concat(program.getOptionsDiagnostics(), program.getGlobalDiagnostics(), program.getSyntacticDiagnostics());
-            if (syntaxDiagnostics.length) {
-                return buildErrors(syntaxDiagnostics, BuildResultFlags.SyntaxErrors, "Syntactic");
+            var host = state.host, compilerHost = state.compilerHost;
+            state.projectCompilerOptions = config.options;
+            // Update module resolution cache if needed
+            updateModuleResolutionCache(state, project, config);
+            // Create program
+            program = host.createProgram(config.fileNames, config.options, compilerHost, getOldProgram(state, projectPath, config), config.errors, config.projectReferences);
+            step++;
+        }
+        function handleDiagnostics(diagnostics, errorFlags, errorType) {
+            if (diagnostics.length) {
+                buildResult = buildErrors(state, projectPath, program, diagnostics, errorFlags, errorType);
+                step = Step.QueueReferencingProjects;
             }
-            // Same as above but now for semantic diagnostics
-            var semanticDiagnostics = program.getSemanticDiagnostics();
-            if (semanticDiagnostics.length) {
-                return buildErrors(semanticDiagnostics, BuildResultFlags.TypeErrors, "Semantic");
+            else {
+                step++;
             }
+        }
+        function getSyntaxDiagnostics(cancellationToken) {
+            ts.Debug.assertDefined(program);
+            handleDiagnostics(program.getConfigFileParsingDiagnostics().concat(program.getOptionsDiagnostics(cancellationToken), program.getGlobalDiagnostics(cancellationToken), program.getSyntacticDiagnostics(/*sourceFile*/ undefined, cancellationToken)), BuildResultFlags.SyntaxErrors, "Syntactic");
+        }
+        function getSemanticDiagnostics(cancellationToken) {
+            handleDiagnostics(ts.Debug.assertDefined(program).getSemanticDiagnostics(/*sourceFile*/ undefined, cancellationToken), BuildResultFlags.TypeErrors, "Semantic");
+        }
+        function emit(writeFileCallback, cancellationToken, customTransformers) {
+            ts.Debug.assertDefined(program);
+            ts.Debug.assert(step === Step.Emit);
             // Before emitting lets backup state, so we can revert it back if there are declaration errors to handle emit and declaration errors correctly
             program.backupState();
-            var newestDeclarationFileContentChangedTime = minimumDate;
-            var anyDtsChanged = false;
             var declDiagnostics;
             var reportDeclarationDiagnostics = function (d) { return (declDiagnostics || (declDiagnostics = [])).push(d); };
             var outputFiles = [];
-            ts.emitFilesAndReportErrors(program, reportDeclarationDiagnostics, writeFileName, /*reportSummary*/ undefined, function (name, text, writeByteOrderMark) { return outputFiles.push({ name: name, text: text, writeByteOrderMark: writeByteOrderMark }); });
+            var emitResult = ts.emitFilesAndReportErrors(program, reportDeclarationDiagnostics, 
+            /*writeFileName*/ undefined, 
+            /*reportSummary*/ undefined, function (name, text, writeByteOrderMark) { return outputFiles.push({ name: name, text: text, writeByteOrderMark: writeByteOrderMark }); }, cancellationToken, 
+            /*emitOnlyDts*/ false, customTransformers).emitResult;
             // Don't emit .d.ts if there are decl file errors
             if (declDiagnostics) {
                 program.restoreState();
-                return buildErrors(declDiagnostics, BuildResultFlags.DeclarationEmitErrors, "Declaration file");
+                buildResult = buildErrors(state, projectPath, program, declDiagnostics, BuildResultFlags.DeclarationEmitErrors, "Declaration file");
+                step = Step.QueueReferencingProjects;
+                return {
+                    emitSkipped: true,
+                    diagnostics: emitResult.diagnostics
+                };
             }
             // Actual Emit
+            var host = state.host, compilerHost = state.compilerHost;
+            var resultFlags = BuildResultFlags.DeclarationOutputUnchanged;
+            var newestDeclarationFileContentChangedTime = minimumDate;
+            var anyDtsChanged = false;
             var emitterDiagnostics = ts.createDiagnosticCollection();
-            var emittedOutputs = createFileMap(toPath);
+            var emittedOutputs = ts.createMap();
             outputFiles.forEach(function (_a) {
                 var name = _a.name, text = _a.text, writeByteOrderMark = _a.writeByteOrderMark;
                 var priorChangeTime;
                 if (!anyDtsChanged && isDeclarationFile(name)) {
                     // Check for unchanged .d.ts files
-                    if (host.fileExists(name) && readFileWithCache(name) === text) {
+                    if (host.fileExists(name) && state.readFileWithCache(name) === text) {
                         priorChangeTime = host.getModifiedTime(name);
                     }
                     else {
@@ -94128,481 +96675,872 @@ var ts;
                         anyDtsChanged = true;
                     }
                 }
-                emittedOutputs.setValue(name, true);
-                ts.writeFile(compilerHost, emitterDiagnostics, name, text, writeByteOrderMark);
+                emittedOutputs.set(toPath(state, name), name);
+                ts.writeFile(writeFileCallback ? { writeFile: writeFileCallback } : compilerHost, emitterDiagnostics, name, text, writeByteOrderMark);
                 if (priorChangeTime !== undefined) {
                     newestDeclarationFileContentChangedTime = newer(priorChangeTime, newestDeclarationFileContentChangedTime);
-                    unchangedOutputs.setValue(name, priorChangeTime);
                 }
             });
+            finishEmit(emitterDiagnostics, emittedOutputs, newestDeclarationFileContentChangedTime, 
+            /*newestDeclarationFileContentChangedTimeIsMaximumDate*/ anyDtsChanged, outputFiles.length ? outputFiles[0].name : ts.getFirstProjectOutput(config, !host.useCaseSensitiveFileNames()), resultFlags);
+            return emitResult;
+        }
+        function finishEmit(emitterDiagnostics, emittedOutputs, priorNewestUpdateTime, newestDeclarationFileContentChangedTimeIsMaximumDate, oldestOutputFileName, resultFlags) {
             var emitDiagnostics = emitterDiagnostics.getDiagnostics();
             if (emitDiagnostics.length) {
-                return buildErrors(emitDiagnostics, BuildResultFlags.EmitErrors, "Emit");
+                buildResult = buildErrors(state, projectPath, program, emitDiagnostics, BuildResultFlags.EmitErrors, "Emit");
+                step = Step.QueueReferencingProjects;
+                return emitDiagnostics;
+            }
+            if (state.writeFileName) {
+                emittedOutputs.forEach(function (name) { return listEmittedFile(state, config, name); });
+                if (program)
+                    ts.listFiles(program, state.writeFileName);
             }
             // Update time stamps for rest of the outputs
-            newestDeclarationFileContentChangedTime = updateOutputTimestampsWorker(configFile, newestDeclarationFileContentChangedTime, ts.Diagnostics.Updating_unchanged_output_timestamps_of_project_0, emittedOutputs);
-            var status = {
-                type: UpToDateStatusType.UpToDate,
-                newestDeclarationFileContentChangedTime: anyDtsChanged ? maximumDate : newestDeclarationFileContentChangedTime,
-                oldestOutputFileName: outputFiles.length ? outputFiles[0].name : getFirstProjectOutput(configFile)
-            };
-            diagnostics.removeKey(proj);
-            projectStatus.setValue(proj, status);
-            afterProgramCreate(proj, program);
-            projectCompilerOptions = baseCompilerOptions;
-            return resultFlags;
-            function buildErrors(diagnostics, errorFlags, errorType) {
-                resultFlags |= errorFlags;
-                reportAndStoreErrors(proj, diagnostics);
-                projectStatus.setValue(proj, { type: UpToDateStatusType.Unbuildable, reason: errorType + " errors" });
-                afterProgramCreate(proj, program);
-                projectCompilerOptions = baseCompilerOptions;
-                return resultFlags;
-            }
+            var newestDeclarationFileContentChangedTime = updateOutputTimestampsWorker(state, config, priorNewestUpdateTime, ts.Diagnostics.Updating_unchanged_output_timestamps_of_project_0, emittedOutputs);
+            state.diagnostics.delete(projectPath);
+            state.projectStatus.set(projectPath, {
+                type: ts.UpToDateStatusType.UpToDate,
+                newestDeclarationFileContentChangedTime: newestDeclarationFileContentChangedTimeIsMaximumDate ?
+                    maximumDate :
+                    newestDeclarationFileContentChangedTime,
+                oldestOutputFileName: oldestOutputFileName
+            });
+            if (program)
+                afterProgramCreate(state, projectPath, program);
+            state.projectCompilerOptions = state.baseCompilerOptions;
+            step = Step.QueueReferencingProjects;
+            buildResult = resultFlags;
+            return emitDiagnostics;
         }
-        function afterProgramCreate(proj, program) {
-            if (host.afterProgramEmitAndDiagnostics) {
-                host.afterProgramEmitAndDiagnostics(program);
+        function emitBundle(writeFileCallback, customTransformers) {
+            ts.Debug.assert(kind === InvalidatedProjectKind.UpdateBundle);
+            if (state.options.dry) {
+                reportStatus(state, ts.Diagnostics.A_non_dry_build_would_update_output_of_project_0, project);
+                buildResult = BuildResultFlags.Success;
+                step = Step.QueueReferencingProjects;
+                return undefined;
             }
-            if (options.watch) {
-                program.releaseProgram();
-                builderPrograms.setValue(proj, program);
-            }
-        }
-        function getOldProgram(proj, parsed) {
-            var value = builderPrograms.getValue(proj);
-            if (value)
-                return value;
-            return ts.readBuilderProgram(parsed.options, readFileWithCache);
-        }
-        function updateBundle(proj) {
-            if (options.dry) {
-                reportStatus(ts.Diagnostics.A_non_dry_build_would_update_output_of_project_0, proj);
-                return BuildResultFlags.Success;
-            }
-            if (options.verbose)
-                reportStatus(ts.Diagnostics.Updating_output_of_project_0, proj);
+            if (state.options.verbose)
+                reportStatus(state, ts.Diagnostics.Updating_output_of_project_0, project);
             // Update js, and source map
-            var config = ts.Debug.assertDefined(parseConfigFile(proj));
-            projectCompilerOptions = config.options;
-            var outputFiles = ts.emitUsingBuildInfo(config, compilerHost, function (ref) { return parseConfigFile(resolveProjectName(ref.path)); });
+            var compilerHost = state.compilerHost;
+            state.projectCompilerOptions = config.options;
+            var outputFiles = ts.emitUsingBuildInfo(config, compilerHost, function (ref) {
+                var refName = resolveProjectName(state, ref.path);
+                return parseConfigFile(state, refName, toResolvedConfigFilePath(state, refName));
+            }, customTransformers);
             if (ts.isString(outputFiles)) {
-                reportStatus(ts.Diagnostics.Cannot_update_output_of_project_0_because_there_was_error_reading_file_1, proj, relName(outputFiles));
-                return buildSingleProject(proj);
+                reportStatus(state, ts.Diagnostics.Cannot_update_output_of_project_0_because_there_was_error_reading_file_1, project, relName(state, outputFiles));
+                step = Step.BuildInvalidatedProjectOfBundle;
+                return invalidatedProjectOfBundle = createBuildOrUpdateInvalidedProject(InvalidatedProjectKind.Build, state, project, projectPath, projectIndex, config, buildOrder);
             }
             // Actual Emit
             ts.Debug.assert(!!outputFiles.length);
             var emitterDiagnostics = ts.createDiagnosticCollection();
-            var emittedOutputs = createFileMap(toPath);
+            var emittedOutputs = ts.createMap();
             outputFiles.forEach(function (_a) {
                 var name = _a.name, text = _a.text, writeByteOrderMark = _a.writeByteOrderMark;
-                emittedOutputs.setValue(name, true);
-                ts.writeFile(compilerHost, emitterDiagnostics, name, text, writeByteOrderMark);
+                emittedOutputs.set(toPath(state, name), name);
+                ts.writeFile(writeFileCallback ? { writeFile: writeFileCallback } : compilerHost, emitterDiagnostics, name, text, writeByteOrderMark);
             });
-            var emitDiagnostics = emitterDiagnostics.getDiagnostics();
-            if (emitDiagnostics.length) {
-                reportAndStoreErrors(proj, emitDiagnostics);
-                projectStatus.setValue(proj, { type: UpToDateStatusType.Unbuildable, reason: "Emit errors" });
-                projectCompilerOptions = baseCompilerOptions;
-                return BuildResultFlags.DeclarationOutputUnchanged | BuildResultFlags.EmitErrors;
-            }
-            // Update timestamps for dts
-            var newestDeclarationFileContentChangedTime = updateOutputTimestampsWorker(config, minimumDate, ts.Diagnostics.Updating_unchanged_output_timestamps_of_project_0, emittedOutputs);
-            var status = {
-                type: UpToDateStatusType.UpToDate,
-                newestDeclarationFileContentChangedTime: newestDeclarationFileContentChangedTime,
-                oldestOutputFileName: outputFiles[0].name
-            };
-            diagnostics.removeKey(proj);
-            projectStatus.setValue(proj, status);
-            projectCompilerOptions = baseCompilerOptions;
-            return BuildResultFlags.DeclarationOutputUnchanged;
+            var emitDiagnostics = finishEmit(emitterDiagnostics, emittedOutputs, minimumDate, 
+            /*newestDeclarationFileContentChangedTimeIsMaximumDate*/ false, outputFiles[0].name, BuildResultFlags.DeclarationOutputUnchanged);
+            return { emitSkipped: false, diagnostics: emitDiagnostics };
         }
-        function updateOutputTimestamps(proj) {
-            if (options.dry) {
-                return reportStatus(ts.Diagnostics.A_non_dry_build_would_update_timestamps_for_output_of_project_0, proj.options.configFilePath);
-            }
-            var priorNewestUpdateTime = updateOutputTimestampsWorker(proj, minimumDate, ts.Diagnostics.Updating_output_timestamps_of_project_0);
-            projectStatus.setValue(proj.options.configFilePath, { type: UpToDateStatusType.UpToDate, newestDeclarationFileContentChangedTime: priorNewestUpdateTime });
-        }
-        function updateOutputTimestampsWorker(proj, priorNewestUpdateTime, verboseMessage, skipOutputs) {
-            var outputs = getAllProjectOutputs(proj);
-            if (!skipOutputs || outputs.length !== skipOutputs.getSize()) {
-                if (options.verbose) {
-                    reportStatus(verboseMessage, proj.options.configFilePath);
-                }
-                var now = host.now ? host.now() : new Date();
-                for (var _i = 0, outputs_2 = outputs; _i < outputs_2.length; _i++) {
-                    var file = outputs_2[_i];
-                    if (skipOutputs && skipOutputs.hasKey(file)) {
-                        continue;
-                    }
-                    if (isDeclarationFile(file)) {
-                        priorNewestUpdateTime = newer(priorNewestUpdateTime, host.getModifiedTime(file) || ts.missingFileModifiedTime);
-                    }
-                    host.setModifiedTime(file, now);
-                    if (proj.options.listEmittedFiles) {
-                        writeFileName("TSFILE: " + file);
-                    }
+        function executeSteps(till, cancellationToken, writeFile, customTransformers) {
+            while (step <= till && step < Step.Done) {
+                var currentStep = step;
+                switch (step) {
+                    case Step.CreateProgram:
+                        createProgram();
+                        break;
+                    case Step.SyntaxDiagnostics:
+                        getSyntaxDiagnostics(cancellationToken);
+                        break;
+                    case Step.SemanticDiagnostics:
+                        getSemanticDiagnostics(cancellationToken);
+                        break;
+                    case Step.Emit:
+                        emit(writeFile, cancellationToken, customTransformers);
+                        break;
+                    case Step.EmitBundle:
+                        emitBundle(writeFile, customTransformers);
+                        break;
+                    case Step.BuildInvalidatedProjectOfBundle:
+                        ts.Debug.assertDefined(invalidatedProjectOfBundle).done(cancellationToken);
+                        step = Step.Done;
+                        break;
+                    case Step.QueueReferencingProjects:
+                        queueReferencingProjects(state, project, projectPath, projectIndex, config, buildOrder, ts.Debug.assertDefined(buildResult));
+                        step++;
+                        break;
+                    // Should never be done
+                    case Step.Done:
+                    default:
+                        ts.assertType(step);
                 }
+                ts.Debug.assert(step > currentStep);
             }
-            return priorNewestUpdateTime;
         }
-        function getFilesToClean() {
-            // Get the same graph for cleaning we'd use for building
-            var graph = getGlobalDependencyGraph();
-            var filesToDelete = [];
-            for (var _i = 0, _a = graph.buildQueue; _i < _a.length; _i++) {
-                var proj = _a[_i];
-                var parsed = parseConfigFile(proj);
-                if (parsed === undefined) {
-                    // File has gone missing; fine to ignore here
-                    reportParseConfigFileDiagnostic(proj);
-                    continue;
-                }
-                var outputs = getAllProjectOutputs(parsed);
-                for (var _b = 0, outputs_3 = outputs; _b < outputs_3.length; _b++) {
-                    var output = outputs_3[_b];
-                    if (host.fileExists(output)) {
-                        filesToDelete.push(output);
-                    }
-                }
+    }
+    function needsBuild(_a, status, config) {
+        var options = _a.options;
+        if (status.type !== ts.UpToDateStatusType.OutOfDateWithPrepend || options.force)
+            return true;
+        return config.fileNames.length === 0 ||
+            !!config.errors.length ||
+            !ts.isIncrementalCompilation(config.options);
+    }
+    function getNextInvalidatedProject(state, buildOrder, reportQueue) {
+        if (!state.projectPendingBuild.size)
+            return undefined;
+        if (state.currentInvalidatedProject) {
+            // Only if same buildOrder the currentInvalidated project can be sent again
+            return ts.arrayIsEqualTo(state.currentInvalidatedProject.buildOrder, buildOrder) ?
+                state.currentInvalidatedProject :
+                undefined;
+        }
+        var options = state.options, projectPendingBuild = state.projectPendingBuild;
+        for (var projectIndex = 0; projectIndex < buildOrder.length; projectIndex++) {
+            var project = buildOrder[projectIndex];
+            var projectPath = toResolvedConfigFilePath(state, project);
+            var reloadLevel = state.projectPendingBuild.get(projectPath);
+            if (reloadLevel === undefined)
+                continue;
+            if (reportQueue) {
+                reportQueue = false;
+                reportBuildQueue(state, buildOrder);
             }
-            return filesToDelete;
-        }
-        function cleanAllProjects() {
-            var filesToDelete = getFilesToClean();
-            if (options.dry) {
-                reportStatus(ts.Diagnostics.A_non_dry_build_would_delete_the_following_files_Colon_0, filesToDelete.map(function (f) { return "\r\n * " + f; }).join(""));
-                return ts.ExitStatus.Success;
+            var config = parseConfigFile(state, project, projectPath);
+            if (!config) {
+                reportParseConfigFileDiagnostic(state, projectPath);
+                projectPendingBuild.delete(projectPath);
+                continue;
             }
-            for (var _i = 0, filesToDelete_1 = filesToDelete; _i < filesToDelete_1.length; _i++) {
-                var output = filesToDelete_1[_i];
-                host.deleteFile(output);
+            if (reloadLevel === ts.ConfigFileProgramReloadLevel.Full) {
+                watchConfigFile(state, project, projectPath);
+                watchWildCardDirectories(state, project, projectPath, config);
+                watchInputFiles(state, project, projectPath, config);
             }
-            return ts.ExitStatus.Success;
-        }
-        function resolveProjectName(name) {
-            return resolveConfigFileProjectName(ts.resolvePath(host.getCurrentDirectory(), name));
-        }
-        function resolveProjectNames(configFileNames) {
-            return configFileNames.map(resolveProjectName);
-        }
-        function buildAllProjects() {
-            if (options.watch) {
-                reportWatchStatus(ts.Diagnostics.Starting_compilation_in_watch_mode);
+            else if (reloadLevel === ts.ConfigFileProgramReloadLevel.Partial) {
+                // Update file names
+                var result = ts.getFileNamesFromConfigSpecs(config.configFileSpecs, ts.getDirectoryPath(project), config.options, state.parseConfigFileHost);
+                ts.updateErrorForNoInputFiles(result, project, config.configFileSpecs, config.errors, ts.canJsonReportNoInutFiles(config.raw));
+                config.fileNames = result.fileNames;
+                watchInputFiles(state, project, projectPath, config);
             }
-            // TODO:: In watch mode as well to use caches for incremental build once we can invalidate caches correctly and have right api
-            // Override readFile for json files and output .d.ts to cache the text
-            var savedReadFileWithCache = readFileWithCache;
-            var savedGetSourceFile = compilerHost.getSourceFile;
-            var _a = ts.changeCompilerHostLikeToUseCache(host, toPath, function () {
-                var args = [];
-                for (var _i = 0; _i < arguments.length; _i++) {
-                    args[_i] = arguments[_i];
-                }
-                return savedGetSourceFile.call.apply(savedGetSourceFile, [compilerHost].concat(args));
-            }), originalReadFile = _a.originalReadFile, originalFileExists = _a.originalFileExists, originalDirectoryExists = _a.originalDirectoryExists, originalCreateDirectory = _a.originalCreateDirectory, originalWriteFile = _a.originalWriteFile, getSourceFileWithCache = _a.getSourceFileWithCache, newReadFileWithCache = _a.readFileWithCache;
-            readFileWithCache = newReadFileWithCache;
-            compilerHost.getSourceFile = getSourceFileWithCache;
-            var graph = getGlobalDependencyGraph();
-            reportBuildQueue(graph);
-            var anyFailed = false;
-            for (var _i = 0, _b = graph.buildQueue; _i < _b.length; _i++) {
-                var next = _b[_i];
-                var proj = parseConfigFile(next);
-                if (proj === undefined) {
-                    reportParseConfigFileDiagnostic(next);
-                    anyFailed = true;
-                    break;
-                }
-                // report errors early when using continue or break statements
-                var errors = proj.errors;
-                var status = getUpToDateStatus(proj);
-                verboseReportProjectStatus(next, status);
-                var projName = proj.options.configFilePath;
-                if (status.type === UpToDateStatusType.UpToDate && !options.force) {
-                    reportAndStoreErrors(next, errors);
+            var status = getUpToDateStatus(state, config, projectPath);
+            verboseReportProjectStatus(state, project, status);
+            if (!options.force) {
+                if (status.type === ts.UpToDateStatusType.UpToDate) {
+                    reportAndStoreErrors(state, projectPath, config.errors);
+                    projectPendingBuild.delete(projectPath);
                     // Up to date, skip
-                    if (defaultOptions.dry) {
+                    if (options.dry) {
                         // In a dry build, inform the user of this fact
-                        reportStatus(ts.Diagnostics.Project_0_is_up_to_date, projName);
+                        reportStatus(state, ts.Diagnostics.Project_0_is_up_to_date, project);
                     }
                     continue;
                 }
-                if (status.type === UpToDateStatusType.UpToDateWithUpstreamTypes && !options.force) {
-                    reportAndStoreErrors(next, errors);
-                    // Fake build
-                    updateOutputTimestamps(proj);
-                    continue;
+                if (status.type === ts.UpToDateStatusType.UpToDateWithUpstreamTypes) {
+                    reportAndStoreErrors(state, projectPath, config.errors);
+                    return createUpdateOutputFileStampsProject(state, project, projectPath, config, buildOrder);
                 }
-                if (status.type === UpToDateStatusType.UpstreamBlocked) {
-                    reportAndStoreErrors(next, errors);
-                    if (options.verbose)
-                        reportStatus(ts.Diagnostics.Skipping_build_of_project_0_because_its_dependency_1_has_errors, projName, status.upstreamProjectName);
-                    continue;
-                }
-                if (status.type === UpToDateStatusType.ContainerOnly) {
-                    reportAndStoreErrors(next, errors);
-                    // Do nothing
-                    continue;
-                }
-                var buildResult = status.type === UpToDateStatusType.OutOfDateWithPrepend && !options.force ?
-                    updateBundle(next) : // Fake that files have been built by manipulating prepend and existing output
-                    buildSingleProject(next); // Actual build
-                anyFailed = anyFailed || !!(buildResult & BuildResultFlags.AnyErrors);
             }
-            reportErrorSummary();
-            host.readFile = originalReadFile;
-            host.fileExists = originalFileExists;
-            host.directoryExists = originalDirectoryExists;
-            host.createDirectory = originalCreateDirectory;
-            host.writeFile = originalWriteFile;
-            compilerHost.getSourceFile = savedGetSourceFile;
-            readFileWithCache = savedReadFileWithCache;
-            return anyFailed ? ts.ExitStatus.DiagnosticsPresent_OutputsSkipped : ts.ExitStatus.Success;
-        }
-        function reportParseConfigFileDiagnostic(proj) {
-            reportAndStoreErrors(proj, [configFileCache.getValue(proj)]);
-        }
-        function reportAndStoreErrors(proj, errors) {
-            reportErrors(errors);
-            projectErrorsReported.setValue(proj, true);
-            diagnostics.setValue(proj, errors);
-        }
-        function reportErrors(errors) {
-            errors.forEach(function (err) { return host.reportDiagnostic(err); });
-        }
-        /**
-         * Report the build ordering inferred from the current project graph if we're in verbose mode
-         */
-        function reportBuildQueue(graph) {
-            if (options.verbose) {
-                reportStatus(ts.Diagnostics.Projects_in_this_build_Colon_0, graph.buildQueue.map(function (s) { return "\r\n    * " + relName(s); }).join(""));
+            if (status.type === ts.UpToDateStatusType.UpstreamBlocked) {
+                reportAndStoreErrors(state, projectPath, config.errors);
+                projectPendingBuild.delete(projectPath);
+                if (options.verbose)
+                    reportStatus(state, ts.Diagnostics.Skipping_build_of_project_0_because_its_dependency_1_has_errors, project, status.upstreamProjectName);
+                continue;
             }
+            if (status.type === ts.UpToDateStatusType.ContainerOnly) {
+                reportAndStoreErrors(state, projectPath, config.errors);
+                projectPendingBuild.delete(projectPath);
+                // Do nothing
+                continue;
+            }
+            return createBuildOrUpdateInvalidedProject(needsBuild(state, status, config) ?
+                InvalidatedProjectKind.Build :
+                InvalidatedProjectKind.UpdateBundle, state, project, projectPath, projectIndex, config, buildOrder);
         }
-        function relName(path) {
-            return ts.convertToRelativePath(path, host.getCurrentDirectory(), function (f) { return compilerHost.getCanonicalFileName(f); });
-        }
-        /**
-         * Report the up-to-date status of a project if we're in verbose mode
-         */
-        function verboseReportProjectStatus(configFileName, status) {
-            if (!options.verbose)
-                return;
-            return formatUpToDateStatus(configFileName, status, relName, reportStatus);
+        return undefined;
+    }
+    function listEmittedFile(_a, proj, file) {
+        var writeFileName = _a.writeFileName;
+        if (writeFileName && proj.options.listEmittedFiles) {
+            writeFileName("TSFILE: " + file);
         }
     }
-    ts.createSolutionBuilder = createSolutionBuilder;
-    function resolveConfigFileProjectName(project) {
-        if (ts.fileExtensionIs(project, ".json" /* Json */)) {
-            return project;
-        }
-        return ts.combinePaths(project, "tsconfig.json");
+    function getOldProgram(_a, proj, parsed) {
+        var options = _a.options, builderPrograms = _a.builderPrograms, compilerHost = _a.compilerHost;
+        if (options.force)
+            return undefined;
+        var value = builderPrograms.get(proj);
+        if (value)
+            return value;
+        return ts.readBuilderProgram(parsed.options, compilerHost);
     }
-    ts.resolveConfigFileProjectName = resolveConfigFileProjectName;
-    function getAllProjectOutputs(project) {
-        if (project.options.outFile || project.options.out) {
-            return getOutFileOutputs(project);
+    function afterProgramCreate(_a, proj, program) {
+        var host = _a.host, watch = _a.watch, builderPrograms = _a.builderPrograms;
+        if (host.afterProgramEmitAndDiagnostics) {
+            host.afterProgramEmitAndDiagnostics(program);
+        }
+        if (watch) {
+            program.releaseProgram();
+            builderPrograms.set(proj, program);
+        }
+    }
+    function buildErrors(state, resolvedPath, program, diagnostics, errorFlags, errorType) {
+        reportAndStoreErrors(state, resolvedPath, diagnostics);
+        // List files if any other build error using program (emit errors already report files)
+        if (program && state.writeFileName)
+            ts.listFiles(program, state.writeFileName);
+        state.projectStatus.set(resolvedPath, { type: ts.UpToDateStatusType.Unbuildable, reason: errorType + " errors" });
+        if (program)
+            afterProgramCreate(state, resolvedPath, program);
+        state.projectCompilerOptions = state.baseCompilerOptions;
+        return errorFlags;
+    }
+    function updateModuleResolutionCache(state, proj, config) {
+        if (!state.moduleResolutionCache)
+            return;
+        // Update module resolution cache if needed
+        var moduleResolutionCache = state.moduleResolutionCache;
+        var projPath = toPath(state, proj);
+        if (moduleResolutionCache.directoryToModuleNameMap.redirectsMap.size === 0) {
+            // The own map will be for projectCompilerOptions
+            ts.Debug.assert(moduleResolutionCache.moduleNameToDirectoryMap.redirectsMap.size === 0);
+            moduleResolutionCache.directoryToModuleNameMap.redirectsMap.set(projPath, moduleResolutionCache.directoryToModuleNameMap.ownMap);
+            moduleResolutionCache.moduleNameToDirectoryMap.redirectsMap.set(projPath, moduleResolutionCache.moduleNameToDirectoryMap.ownMap);
         }
         else {
-            var outputs = [];
-            for (var _i = 0, _a = project.fileNames; _i < _a.length; _i++) {
-                var inputFile = _a[_i];
-                outputs.push.apply(outputs, getOutputFileNames(inputFile, project));
-            }
-            var buildInfoPath = ts.getOutputPathForBuildInfo(project.options);
-            if (buildInfoPath)
-                outputs.push(buildInfoPath);
-            return outputs;
+            // Set correct own map
+            ts.Debug.assert(moduleResolutionCache.moduleNameToDirectoryMap.redirectsMap.size > 0);
+            var ref = {
+                sourceFile: config.options.configFile,
+                commandLine: config
+            };
+            moduleResolutionCache.directoryToModuleNameMap.setOwnMap(moduleResolutionCache.directoryToModuleNameMap.getOrCreateMapOfCacheRedirects(ref));
+            moduleResolutionCache.moduleNameToDirectoryMap.setOwnMap(moduleResolutionCache.moduleNameToDirectoryMap.getOrCreateMapOfCacheRedirects(ref));
+        }
+        moduleResolutionCache.directoryToModuleNameMap.setOwnOptions(config.options);
+        moduleResolutionCache.moduleNameToDirectoryMap.setOwnOptions(config.options);
+    }
+    function checkConfigFileUpToDateStatus(state, configFile, oldestOutputFileTime, oldestOutputFileName) {
+        // Check tsconfig time
+        var tsconfigTime = state.host.getModifiedTime(configFile) || ts.missingFileModifiedTime;
+        if (oldestOutputFileTime < tsconfigTime) {
+            return {
+                type: ts.UpToDateStatusType.OutOfDateWithSelf,
+                outOfDateOutputFileName: oldestOutputFileName,
+                newerInputFileName: configFile
+            };
         }
     }
-    ts.getAllProjectOutputs = getAllProjectOutputs;
-    function getFirstProjectOutput(project) {
-        if (project.options.outFile || project.options.out) {
-            return ts.first(getOutFileOutputs(project));
-        }
+    function getUpToDateStatusWorker(state, project, resolvedPath) {
+        var newestInputFileName = undefined;
+        var newestInputFileTime = minimumDate;
+        var host = state.host;
+        // Get timestamps of input files
         for (var _i = 0, _a = project.fileNames; _i < _a.length; _i++) {
             var inputFile = _a[_i];
-            var outputs = getOutputFileNames(inputFile, project);
-            if (outputs.length) {
-                return ts.first(outputs);
+            if (!host.fileExists(inputFile)) {
+                return {
+                    type: ts.UpToDateStatusType.Unbuildable,
+                    reason: inputFile + " does not exist"
+                };
+            }
+            var inputTime = host.getModifiedTime(inputFile) || ts.missingFileModifiedTime;
+            if (inputTime > newestInputFileTime) {
+                newestInputFileName = inputFile;
+                newestInputFileTime = inputTime;
             }
         }
-        return ts.Debug.fail("project " + project.options.configFilePath + " expected to have at least one output");
+        // Container if no files are specified in the project
+        if (!project.fileNames.length && !ts.canJsonReportNoInutFiles(project.raw)) {
+            return {
+                type: ts.UpToDateStatusType.ContainerOnly
+            };
+        }
+        // Collect the expected outputs of this project
+        var outputs = ts.getAllProjectOutputs(project, !host.useCaseSensitiveFileNames());
+        // Now see if all outputs are newer than the newest input
+        var oldestOutputFileName = "(none)";
+        var oldestOutputFileTime = maximumDate;
+        var newestOutputFileName = "(none)";
+        var newestOutputFileTime = minimumDate;
+        var missingOutputFileName;
+        var newestDeclarationFileContentChangedTime = minimumDate;
+        var isOutOfDateWithInputs = false;
+        for (var _b = 0, outputs_1 = outputs; _b < outputs_1.length; _b++) {
+            var output = outputs_1[_b];
+            // Output is missing; can stop checking
+            // Don't immediately return because we can still be upstream-blocked, which is a higher-priority status
+            if (!host.fileExists(output)) {
+                missingOutputFileName = output;
+                break;
+            }
+            var outputTime = host.getModifiedTime(output) || ts.missingFileModifiedTime;
+            if (outputTime < oldestOutputFileTime) {
+                oldestOutputFileTime = outputTime;
+                oldestOutputFileName = output;
+            }
+            // If an output is older than the newest input, we can stop checking
+            // Don't immediately return because we can still be upstream-blocked, which is a higher-priority status
+            if (outputTime < newestInputFileTime) {
+                isOutOfDateWithInputs = true;
+                break;
+            }
+            if (outputTime > newestOutputFileTime) {
+                newestOutputFileTime = outputTime;
+                newestOutputFileName = output;
+            }
+            // Keep track of when the most recent time a .d.ts file was changed.
+            // In addition to file timestamps, we also keep track of when a .d.ts file
+            // had its file touched but not had its contents changed - this allows us
+            // to skip a downstream typecheck
+            if (isDeclarationFile(output)) {
+                var outputModifiedTime = host.getModifiedTime(output) || ts.missingFileModifiedTime;
+                newestDeclarationFileContentChangedTime = newer(newestDeclarationFileContentChangedTime, outputModifiedTime);
+            }
+        }
+        var pseudoUpToDate = false;
+        var usesPrepend = false;
+        var upstreamChangedProject;
+        if (project.projectReferences) {
+            state.projectStatus.set(resolvedPath, { type: ts.UpToDateStatusType.ComputingUpstream });
+            for (var _c = 0, _d = project.projectReferences; _c < _d.length; _c++) {
+                var ref = _d[_c];
+                usesPrepend = usesPrepend || !!(ref.prepend);
+                var resolvedRef = ts.resolveProjectReferencePath(ref);
+                var resolvedRefPath = toResolvedConfigFilePath(state, resolvedRef);
+                var refStatus = getUpToDateStatus(state, parseConfigFile(state, resolvedRef, resolvedRefPath), resolvedRefPath);
+                // Its a circular reference ignore the status of this project
+                if (refStatus.type === ts.UpToDateStatusType.ComputingUpstream ||
+                    refStatus.type === ts.UpToDateStatusType.ContainerOnly) { // Container only ignore this project
+                    continue;
+                }
+                // An upstream project is blocked
+                if (refStatus.type === ts.UpToDateStatusType.Unbuildable) {
+                    return {
+                        type: ts.UpToDateStatusType.UpstreamBlocked,
+                        upstreamProjectName: ref.path
+                    };
+                }
+                // If the upstream project is out of date, then so are we (someone shouldn't have asked, though?)
+                if (refStatus.type !== ts.UpToDateStatusType.UpToDate) {
+                    return {
+                        type: ts.UpToDateStatusType.UpstreamOutOfDate,
+                        upstreamProjectName: ref.path
+                    };
+                }
+                // Check oldest output file name only if there is no missing output file name
+                if (!missingOutputFileName) {
+                    // If the upstream project's newest file is older than our oldest output, we
+                    // can't be out of date because of it
+                    if (refStatus.newestInputFileTime && refStatus.newestInputFileTime <= oldestOutputFileTime) {
+                        continue;
+                    }
+                    // If the upstream project has only change .d.ts files, and we've built
+                    // *after* those files, then we're "psuedo up to date" and eligible for a fast rebuild
+                    if (refStatus.newestDeclarationFileContentChangedTime && refStatus.newestDeclarationFileContentChangedTime <= oldestOutputFileTime) {
+                        pseudoUpToDate = true;
+                        upstreamChangedProject = ref.path;
+                        continue;
+                    }
+                    // We have an output older than an upstream output - we are out of date
+                    ts.Debug.assert(oldestOutputFileName !== undefined, "Should have an oldest output filename here");
+                    return {
+                        type: ts.UpToDateStatusType.OutOfDateWithUpstream,
+                        outOfDateOutputFileName: oldestOutputFileName,
+                        newerProjectName: ref.path
+                    };
+                }
+            }
+        }
+        if (missingOutputFileName !== undefined) {
+            return {
+                type: ts.UpToDateStatusType.OutputMissing,
+                missingOutputFileName: missingOutputFileName
+            };
+        }
+        if (isOutOfDateWithInputs) {
+            return {
+                type: ts.UpToDateStatusType.OutOfDateWithSelf,
+                outOfDateOutputFileName: oldestOutputFileName,
+                newerInputFileName: newestInputFileName
+            };
+        }
+        else {
+            // Check tsconfig time
+            var configStatus = checkConfigFileUpToDateStatus(state, project.options.configFilePath, oldestOutputFileTime, oldestOutputFileName);
+            if (configStatus)
+                return configStatus;
+            // Check extended config time
+            var extendedConfigStatus = ts.forEach(project.options.configFile.extendedSourceFiles || ts.emptyArray, function (configFile) { return checkConfigFileUpToDateStatus(state, configFile, oldestOutputFileTime, oldestOutputFileName); });
+            if (extendedConfigStatus)
+                return extendedConfigStatus;
+        }
+        if (!state.buildInfoChecked.has(resolvedPath)) {
+            state.buildInfoChecked.set(resolvedPath, true);
+            var buildInfoPath = ts.getOutputPathForBuildInfo(project.options);
+            if (buildInfoPath) {
+                var value = state.readFileWithCache(buildInfoPath);
+                var buildInfo = value && ts.getBuildInfo(value);
+                if (buildInfo && (buildInfo.bundle || buildInfo.program) && buildInfo.version !== ts.version) {
+                    return {
+                        type: ts.UpToDateStatusType.TsVersionOutputOfDate,
+                        version: buildInfo.version
+                    };
+                }
+            }
+        }
+        if (usesPrepend && pseudoUpToDate) {
+            return {
+                type: ts.UpToDateStatusType.OutOfDateWithPrepend,
+                outOfDateOutputFileName: oldestOutputFileName,
+                newerProjectName: upstreamChangedProject
+            };
+        }
+        // Up to date
+        return {
+            type: pseudoUpToDate ? ts.UpToDateStatusType.UpToDateWithUpstreamTypes : ts.UpToDateStatusType.UpToDate,
+            newestDeclarationFileContentChangedTime: newestDeclarationFileContentChangedTime,
+            newestInputFileTime: newestInputFileTime,
+            newestOutputFileTime: newestOutputFileTime,
+            newestInputFileName: newestInputFileName,
+            newestOutputFileName: newestOutputFileName,
+            oldestOutputFileName: oldestOutputFileName
+        };
     }
-    function formatUpToDateStatus(configFileName, status, relName, formatMessage) {
+    function getUpToDateStatus(state, project, resolvedPath) {
+        if (project === undefined) {
+            return { type: ts.UpToDateStatusType.Unbuildable, reason: "File deleted mid-build" };
+        }
+        var prior = state.projectStatus.get(resolvedPath);
+        if (prior !== undefined) {
+            return prior;
+        }
+        var actual = getUpToDateStatusWorker(state, project, resolvedPath);
+        state.projectStatus.set(resolvedPath, actual);
+        return actual;
+    }
+    function updateOutputTimestampsWorker(state, proj, priorNewestUpdateTime, verboseMessage, skipOutputs) {
+        var host = state.host;
+        var outputs = ts.getAllProjectOutputs(proj, !host.useCaseSensitiveFileNames());
+        if (!skipOutputs || outputs.length !== skipOutputs.size) {
+            var reportVerbose = !!state.options.verbose;
+            var now = host.now ? host.now() : new Date();
+            for (var _i = 0, outputs_2 = outputs; _i < outputs_2.length; _i++) {
+                var file = outputs_2[_i];
+                if (skipOutputs && skipOutputs.has(toPath(state, file))) {
+                    continue;
+                }
+                if (reportVerbose) {
+                    reportVerbose = false;
+                    reportStatus(state, verboseMessage, proj.options.configFilePath);
+                }
+                if (isDeclarationFile(file)) {
+                    priorNewestUpdateTime = newer(priorNewestUpdateTime, host.getModifiedTime(file) || ts.missingFileModifiedTime);
+                }
+                host.setModifiedTime(file, now);
+                listEmittedFile(state, proj, file);
+            }
+        }
+        return priorNewestUpdateTime;
+    }
+    function updateOutputTimestamps(state, proj, resolvedPath) {
+        if (state.options.dry) {
+            return reportStatus(state, ts.Diagnostics.A_non_dry_build_would_update_timestamps_for_output_of_project_0, proj.options.configFilePath);
+        }
+        var priorNewestUpdateTime = updateOutputTimestampsWorker(state, proj, minimumDate, ts.Diagnostics.Updating_output_timestamps_of_project_0);
+        state.projectStatus.set(resolvedPath, {
+            type: ts.UpToDateStatusType.UpToDate,
+            newestDeclarationFileContentChangedTime: priorNewestUpdateTime,
+            oldestOutputFileName: ts.getFirstProjectOutput(proj, !state.host.useCaseSensitiveFileNames())
+        });
+    }
+    function queueReferencingProjects(state, project, projectPath, projectIndex, config, buildOrder, buildResult) {
+        // Queue only if there are no errors
+        if (buildResult & BuildResultFlags.AnyErrors)
+            return;
+        // Only composite projects can be referenced by other projects
+        if (!config.options.composite)
+            return;
+        // Always use build order to queue projects
+        for (var index = projectIndex + 1; index < buildOrder.length; index++) {
+            var nextProject = buildOrder[index];
+            var nextProjectPath = toResolvedConfigFilePath(state, nextProject);
+            if (state.projectPendingBuild.has(nextProjectPath))
+                continue;
+            var nextProjectConfig = parseConfigFile(state, nextProject, nextProjectPath);
+            if (!nextProjectConfig || !nextProjectConfig.projectReferences)
+                continue;
+            for (var _i = 0, _a = nextProjectConfig.projectReferences; _i < _a.length; _i++) {
+                var ref = _a[_i];
+                var resolvedRefPath = resolveProjectName(state, ref.path);
+                if (toResolvedConfigFilePath(state, resolvedRefPath) !== projectPath)
+                    continue;
+                // If the project is referenced with prepend, always build downstream projects,
+                // If declaration output is changed, build the project
+                // otherwise mark the project UpToDateWithUpstreamTypes so it updates output time stamps
+                var status = state.projectStatus.get(nextProjectPath);
+                if (status) {
+                    switch (status.type) {
+                        case ts.UpToDateStatusType.UpToDate:
+                            if (buildResult & BuildResultFlags.DeclarationOutputUnchanged) {
+                                if (ref.prepend) {
+                                    state.projectStatus.set(nextProjectPath, {
+                                        type: ts.UpToDateStatusType.OutOfDateWithPrepend,
+                                        outOfDateOutputFileName: status.oldestOutputFileName,
+                                        newerProjectName: project
+                                    });
+                                }
+                                else {
+                                    status.type = ts.UpToDateStatusType.UpToDateWithUpstreamTypes;
+                                }
+                                break;
+                            }
+                        // falls through
+                        case ts.UpToDateStatusType.UpToDateWithUpstreamTypes:
+                        case ts.UpToDateStatusType.OutOfDateWithPrepend:
+                            if (!(buildResult & BuildResultFlags.DeclarationOutputUnchanged)) {
+                                state.projectStatus.set(nextProjectPath, {
+                                    type: ts.UpToDateStatusType.OutOfDateWithUpstream,
+                                    outOfDateOutputFileName: status.type === ts.UpToDateStatusType.OutOfDateWithPrepend ? status.outOfDateOutputFileName : status.oldestOutputFileName,
+                                    newerProjectName: project
+                                });
+                            }
+                            break;
+                        case ts.UpToDateStatusType.UpstreamBlocked:
+                            if (toResolvedConfigFilePath(state, resolveProjectName(state, status.upstreamProjectName)) === projectPath) {
+                                clearProjectStatus(state, nextProjectPath);
+                            }
+                            break;
+                    }
+                }
+                addProjToQueue(state, nextProjectPath, ts.ConfigFileProgramReloadLevel.None);
+                break;
+            }
+        }
+    }
+    function build(state, project, cancellationToken, onlyReferences) {
+        var buildOrder = getBuildOrderFor(state, project, onlyReferences);
+        if (!buildOrder)
+            return ts.ExitStatus.InvalidProject_OutputsSkipped;
+        setupInitialBuild(state, cancellationToken);
+        var reportQueue = true;
+        var successfulProjects = 0;
+        var errorProjects = 0;
+        while (true) {
+            var invalidatedProject = getNextInvalidatedProject(state, buildOrder, reportQueue);
+            if (!invalidatedProject)
+                break;
+            reportQueue = false;
+            invalidatedProject.done(cancellationToken);
+            if (state.diagnostics.has(invalidatedProject.projectPath)) {
+                errorProjects++;
+            }
+            else {
+                successfulProjects++;
+            }
+        }
+        disableCache(state);
+        reportErrorSummary(state, buildOrder);
+        startWatching(state, buildOrder);
+        return errorProjects ?
+            successfulProjects ?
+                ts.ExitStatus.DiagnosticsPresent_OutputsGenerated :
+                ts.ExitStatus.DiagnosticsPresent_OutputsSkipped :
+            ts.ExitStatus.Success;
+    }
+    function clean(state, project, onlyReferences) {
+        var buildOrder = getBuildOrderFor(state, project, onlyReferences);
+        if (!buildOrder)
+            return ts.ExitStatus.InvalidProject_OutputsSkipped;
+        var options = state.options, host = state.host;
+        var filesToDelete = options.dry ? [] : undefined;
+        for (var _i = 0, buildOrder_1 = buildOrder; _i < buildOrder_1.length; _i++) {
+            var proj = buildOrder_1[_i];
+            var resolvedPath = toResolvedConfigFilePath(state, proj);
+            var parsed = parseConfigFile(state, proj, resolvedPath);
+            if (parsed === undefined) {
+                // File has gone missing; fine to ignore here
+                reportParseConfigFileDiagnostic(state, resolvedPath);
+                continue;
+            }
+            var outputs = ts.getAllProjectOutputs(parsed, !host.useCaseSensitiveFileNames());
+            for (var _a = 0, outputs_3 = outputs; _a < outputs_3.length; _a++) {
+                var output = outputs_3[_a];
+                if (host.fileExists(output)) {
+                    if (filesToDelete) {
+                        filesToDelete.push(output);
+                    }
+                    else {
+                        host.deleteFile(output);
+                        invalidateProject(state, resolvedPath, ts.ConfigFileProgramReloadLevel.None);
+                    }
+                }
+            }
+        }
+        if (filesToDelete) {
+            reportStatus(state, ts.Diagnostics.A_non_dry_build_would_delete_the_following_files_Colon_0, filesToDelete.map(function (f) { return "\r\n * " + f; }).join(""));
+        }
+        return ts.ExitStatus.Success;
+    }
+    function invalidateProject(state, resolved, reloadLevel) {
+        // If host implements getParsedCommandLine, we cant get list of files from parseConfigFileHost
+        if (state.host.getParsedCommandLine && reloadLevel === ts.ConfigFileProgramReloadLevel.Partial) {
+            reloadLevel = ts.ConfigFileProgramReloadLevel.Full;
+        }
+        if (reloadLevel === ts.ConfigFileProgramReloadLevel.Full) {
+            state.configFileCache.delete(resolved);
+            state.buildOrder = undefined;
+        }
+        state.needsSummary = true;
+        clearProjectStatus(state, resolved);
+        addProjToQueue(state, resolved, reloadLevel);
+        enableCache(state);
+    }
+    function invalidateProjectAndScheduleBuilds(state, resolvedPath, reloadLevel) {
+        state.reportFileChangeDetected = true;
+        invalidateProject(state, resolvedPath, reloadLevel);
+        scheduleBuildInvalidatedProject(state);
+    }
+    function scheduleBuildInvalidatedProject(state) {
+        var hostWithWatch = state.hostWithWatch;
+        if (!hostWithWatch.setTimeout || !hostWithWatch.clearTimeout) {
+            return;
+        }
+        if (state.timerToBuildInvalidatedProject) {
+            hostWithWatch.clearTimeout(state.timerToBuildInvalidatedProject);
+        }
+        state.timerToBuildInvalidatedProject = hostWithWatch.setTimeout(buildNextInvalidatedProject, 250, state);
+    }
+    function buildNextInvalidatedProject(state) {
+        state.timerToBuildInvalidatedProject = undefined;
+        if (state.reportFileChangeDetected) {
+            state.reportFileChangeDetected = false;
+            state.projectErrorsReported.clear();
+            reportWatchStatus(state, ts.Diagnostics.File_change_detected_Starting_incremental_compilation);
+        }
+        var buildOrder = getBuildOrder(state);
+        var invalidatedProject = getNextInvalidatedProject(state, buildOrder, /*reportQueue*/ false);
+        if (invalidatedProject) {
+            invalidatedProject.done();
+            if (state.projectPendingBuild.size) {
+                // Schedule next project for build
+                if (state.watch && !state.timerToBuildInvalidatedProject) {
+                    scheduleBuildInvalidatedProject(state);
+                }
+                return;
+            }
+        }
+        disableCache(state);
+        reportErrorSummary(state, buildOrder);
+    }
+    function watchConfigFile(state, resolved, resolvedPath) {
+        if (!state.watch || state.allWatchedConfigFiles.has(resolvedPath))
+            return;
+        state.allWatchedConfigFiles.set(resolvedPath, state.watchFile(state.hostWithWatch, resolved, function () {
+            invalidateProjectAndScheduleBuilds(state, resolvedPath, ts.ConfigFileProgramReloadLevel.Full);
+        }, ts.PollingInterval.High, "Config file" /* ConfigFile */, resolved));
+    }
+    function isSameFile(state, file1, file2) {
+        return ts.comparePaths(file1, file2, state.currentDirectory, !state.host.useCaseSensitiveFileNames()) === 0 /* EqualTo */;
+    }
+    function isOutputFile(state, fileName, configFile) {
+        if (configFile.options.noEmit)
+            return false;
+        // ts or tsx files are not output
+        if (!ts.fileExtensionIs(fileName, ".d.ts" /* Dts */) &&
+            (ts.fileExtensionIs(fileName, ".ts" /* Ts */) || ts.fileExtensionIs(fileName, ".tsx" /* Tsx */))) {
+            return false;
+        }
+        // If options have --outFile or --out, check if its that
+        var out = configFile.options.outFile || configFile.options.out;
+        if (out && (isSameFile(state, fileName, out) || isSameFile(state, fileName, ts.removeFileExtension(out) + ".d.ts" /* Dts */))) {
+            return true;
+        }
+        // If declarationDir is specified, return if its a file in that directory
+        if (configFile.options.declarationDir && ts.containsPath(configFile.options.declarationDir, fileName, state.currentDirectory, !state.host.useCaseSensitiveFileNames())) {
+            return true;
+        }
+        // If --outDir, check if file is in that directory
+        if (configFile.options.outDir && ts.containsPath(configFile.options.outDir, fileName, state.currentDirectory, !state.host.useCaseSensitiveFileNames())) {
+            return true;
+        }
+        return !ts.forEach(configFile.fileNames, function (inputFile) { return isSameFile(state, fileName, inputFile); });
+    }
+    function watchWildCardDirectories(state, resolved, resolvedPath, parsed) {
+        if (!state.watch)
+            return;
+        ts.updateWatchingWildcardDirectories(getOrCreateValueMapFromConfigFileMap(state.allWatchedWildcardDirectories, resolvedPath), ts.createMapFromTemplate(parsed.configFileSpecs.wildcardDirectories), function (dir, flags) { return state.watchDirectory(state.hostWithWatch, dir, function (fileOrDirectory) {
+            var fileOrDirectoryPath = toPath(state, fileOrDirectory);
+            if (fileOrDirectoryPath !== toPath(state, dir) && ts.hasExtension(fileOrDirectoryPath) && !ts.isSupportedSourceFileName(fileOrDirectory, parsed.options)) {
+                state.writeLog("Project: " + resolved + " Detected file add/remove of non supported extension: " + fileOrDirectory);
+                return;
+            }
+            if (isOutputFile(state, fileOrDirectory, parsed)) {
+                state.writeLog(fileOrDirectory + " is output file");
+                return;
+            }
+            invalidateProjectAndScheduleBuilds(state, resolvedPath, ts.ConfigFileProgramReloadLevel.Partial);
+        }, flags, "Wild card directory" /* WildcardDirectory */, resolved); });
+    }
+    function watchInputFiles(state, resolved, resolvedPath, parsed) {
+        if (!state.watch)
+            return;
+        ts.mutateMap(getOrCreateValueMapFromConfigFileMap(state.allWatchedInputFiles, resolvedPath), ts.arrayToMap(parsed.fileNames, function (fileName) { return toPath(state, fileName); }), {
+            createNewValue: function (path, input) { return state.watchFilePath(state.hostWithWatch, input, function () { return invalidateProjectAndScheduleBuilds(state, resolvedPath, ts.ConfigFileProgramReloadLevel.None); }, ts.PollingInterval.Low, path, "Source file" /* SourceFile */, resolved); },
+            onDeleteValue: ts.closeFileWatcher,
+        });
+    }
+    function startWatching(state, buildOrder) {
+        if (!state.watchAllProjectsPending)
+            return;
+        state.watchAllProjectsPending = false;
+        for (var _i = 0, buildOrder_2 = buildOrder; _i < buildOrder_2.length; _i++) {
+            var resolved = buildOrder_2[_i];
+            var resolvedPath = toResolvedConfigFilePath(state, resolved);
+            // Watch this file
+            watchConfigFile(state, resolved, resolvedPath);
+            var cfg = parseConfigFile(state, resolved, resolvedPath);
+            if (cfg) {
+                // Update watchers for wildcard directories
+                watchWildCardDirectories(state, resolved, resolvedPath, cfg);
+                // Watch input files
+                watchInputFiles(state, resolved, resolvedPath, cfg);
+            }
+        }
+    }
+    function createSolutionBuilderWorker(watch, hostOrHostWithWatch, rootNames, options) {
+        var state = createSolutionBuilderState(watch, hostOrHostWithWatch, rootNames, options);
+        return {
+            build: function (project, cancellationToken) { return build(state, project, cancellationToken); },
+            clean: function (project) { return clean(state, project); },
+            buildReferences: function (project, cancellationToken) { return build(state, project, cancellationToken, /*onlyReferences*/ true); },
+            cleanReferences: function (project) { return clean(state, project, /*onlyReferences*/ true); },
+            getNextInvalidatedProject: function (cancellationToken) {
+                setupInitialBuild(state, cancellationToken);
+                return getNextInvalidatedProject(state, getBuildOrder(state), /*reportQueue*/ false);
+            },
+            getBuildOrder: function () { return getBuildOrder(state); },
+            getUpToDateStatusOfProject: function (project) {
+                var configFileName = resolveProjectName(state, project);
+                var configFilePath = toResolvedConfigFilePath(state, configFileName);
+                return getUpToDateStatus(state, parseConfigFile(state, configFileName, configFilePath), configFilePath);
+            },
+            invalidateProject: function (configFilePath, reloadLevel) { return invalidateProject(state, configFilePath, reloadLevel || ts.ConfigFileProgramReloadLevel.None); },
+            buildNextInvalidatedProject: function () { return buildNextInvalidatedProject(state); },
+        };
+    }
+    function relName(state, path) {
+        return ts.convertToRelativePath(path, state.currentDirectory, function (f) { return state.getCanonicalFileName(f); });
+    }
+    function reportStatus(state, message) {
+        var args = [];
+        for (var _i = 2; _i < arguments.length; _i++) {
+            args[_i - 2] = arguments[_i];
+        }
+        state.host.reportSolutionBuilderStatus(ts.createCompilerDiagnostic.apply(void 0, [message].concat(args)));
+    }
+    function reportWatchStatus(state, message) {
+        var args = [];
+        for (var _i = 2; _i < arguments.length; _i++) {
+            args[_i - 2] = arguments[_i];
+        }
+        if (state.hostWithWatch.onWatchStatusChange) {
+            state.hostWithWatch.onWatchStatusChange(ts.createCompilerDiagnostic.apply(void 0, [message].concat(args)), state.host.getNewLine(), state.baseCompilerOptions);
+        }
+    }
+    function reportErrors(_a, errors) {
+        var host = _a.host;
+        errors.forEach(function (err) { return host.reportDiagnostic(err); });
+    }
+    function reportAndStoreErrors(state, proj, errors) {
+        reportErrors(state, errors);
+        state.projectErrorsReported.set(proj, true);
+        if (errors.length) {
+            state.diagnostics.set(proj, errors);
+        }
+    }
+    function reportParseConfigFileDiagnostic(state, proj) {
+        reportAndStoreErrors(state, proj, [state.configFileCache.get(proj)]);
+    }
+    function reportErrorSummary(state, buildOrder) {
+        if (!state.needsSummary || (!state.watch && !state.host.reportErrorSummary))
+            return;
+        state.needsSummary = false;
+        var diagnostics = state.diagnostics;
+        // Report errors from the other projects
+        buildOrder.forEach(function (project) {
+            var projectPath = toResolvedConfigFilePath(state, project);
+            if (!state.projectErrorsReported.has(projectPath)) {
+                reportErrors(state, diagnostics.get(projectPath) || ts.emptyArray);
+            }
+        });
+        var totalErrors = 0;
+        diagnostics.forEach(function (singleProjectErrors) { return totalErrors += ts.getErrorCountForSummary(singleProjectErrors); });
+        if (state.watch) {
+            reportWatchStatus(state, ts.getWatchErrorSummaryDiagnosticMessage(totalErrors), totalErrors);
+        }
+        else {
+            state.host.reportErrorSummary(totalErrors);
+        }
+    }
+    /**
+     * Report the build ordering inferred from the current project graph if we're in verbose mode
+     */
+    function reportBuildQueue(state, buildQueue) {
+        if (state.options.verbose) {
+            reportStatus(state, ts.Diagnostics.Projects_in_this_build_Colon_0, buildQueue.map(function (s) { return "\r\n    * " + relName(state, s); }).join(""));
+        }
+    }
+    function reportUpToDateStatus(state, configFileName, status) {
         switch (status.type) {
-            case UpToDateStatusType.OutOfDateWithSelf:
-                return formatMessage(ts.Diagnostics.Project_0_is_out_of_date_because_oldest_output_1_is_older_than_newest_input_2, relName(configFileName), relName(status.outOfDateOutputFileName), relName(status.newerInputFileName));
-            case UpToDateStatusType.OutOfDateWithUpstream:
-                return formatMessage(ts.Diagnostics.Project_0_is_out_of_date_because_oldest_output_1_is_older_than_newest_input_2, relName(configFileName), relName(status.outOfDateOutputFileName), relName(status.newerProjectName));
-            case UpToDateStatusType.OutputMissing:
-                return formatMessage(ts.Diagnostics.Project_0_is_out_of_date_because_output_file_1_does_not_exist, relName(configFileName), relName(status.missingOutputFileName));
-            case UpToDateStatusType.UpToDate:
+            case ts.UpToDateStatusType.OutOfDateWithSelf:
+                return reportStatus(state, ts.Diagnostics.Project_0_is_out_of_date_because_oldest_output_1_is_older_than_newest_input_2, relName(state, configFileName), relName(state, status.outOfDateOutputFileName), relName(state, status.newerInputFileName));
+            case ts.UpToDateStatusType.OutOfDateWithUpstream:
+                return reportStatus(state, ts.Diagnostics.Project_0_is_out_of_date_because_oldest_output_1_is_older_than_newest_input_2, relName(state, configFileName), relName(state, status.outOfDateOutputFileName), relName(state, status.newerProjectName));
+            case ts.UpToDateStatusType.OutputMissing:
+                return reportStatus(state, ts.Diagnostics.Project_0_is_out_of_date_because_output_file_1_does_not_exist, relName(state, configFileName), relName(state, status.missingOutputFileName));
+            case ts.UpToDateStatusType.UpToDate:
                 if (status.newestInputFileTime !== undefined) {
-                    return formatMessage(ts.Diagnostics.Project_0_is_up_to_date_because_newest_input_1_is_older_than_oldest_output_2, relName(configFileName), relName(status.newestInputFileName || ""), relName(status.oldestOutputFileName || ""));
+                    return reportStatus(state, ts.Diagnostics.Project_0_is_up_to_date_because_newest_input_1_is_older_than_oldest_output_2, relName(state, configFileName), relName(state, status.newestInputFileName || ""), relName(state, status.oldestOutputFileName || ""));
                 }
                 // Don't report anything for "up to date because it was already built" -- too verbose
                 break;
-            case UpToDateStatusType.OutOfDateWithPrepend:
-                return formatMessage(ts.Diagnostics.Project_0_is_out_of_date_because_output_of_its_dependency_1_has_changed, relName(configFileName), relName(status.newerProjectName));
-            case UpToDateStatusType.UpToDateWithUpstreamTypes:
-                return formatMessage(ts.Diagnostics.Project_0_is_up_to_date_with_d_ts_files_from_its_dependencies, relName(configFileName));
-            case UpToDateStatusType.UpstreamOutOfDate:
-                return formatMessage(ts.Diagnostics.Project_0_is_out_of_date_because_its_dependency_1_is_out_of_date, relName(configFileName), relName(status.upstreamProjectName));
-            case UpToDateStatusType.UpstreamBlocked:
-                return formatMessage(ts.Diagnostics.Project_0_can_t_be_built_because_its_dependency_1_has_errors, relName(configFileName), relName(status.upstreamProjectName));
-            case UpToDateStatusType.Unbuildable:
-                return formatMessage(ts.Diagnostics.Failed_to_parse_file_0_Colon_1, relName(configFileName), status.reason);
-            case UpToDateStatusType.TsVersionOutputOfDate:
-                return formatMessage(ts.Diagnostics.Project_0_is_out_of_date_because_output_for_it_was_generated_with_version_1_that_differs_with_current_version_2, relName(configFileName), status.version, ts.version);
-            case UpToDateStatusType.ContainerOnly:
+            case ts.UpToDateStatusType.OutOfDateWithPrepend:
+                return reportStatus(state, ts.Diagnostics.Project_0_is_out_of_date_because_output_of_its_dependency_1_has_changed, relName(state, configFileName), relName(state, status.newerProjectName));
+            case ts.UpToDateStatusType.UpToDateWithUpstreamTypes:
+                return reportStatus(state, ts.Diagnostics.Project_0_is_up_to_date_with_d_ts_files_from_its_dependencies, relName(state, configFileName));
+            case ts.UpToDateStatusType.UpstreamOutOfDate:
+                return reportStatus(state, ts.Diagnostics.Project_0_is_out_of_date_because_its_dependency_1_is_out_of_date, relName(state, configFileName), relName(state, status.upstreamProjectName));
+            case ts.UpToDateStatusType.UpstreamBlocked:
+                return reportStatus(state, ts.Diagnostics.Project_0_can_t_be_built_because_its_dependency_1_has_errors, relName(state, configFileName), relName(state, status.upstreamProjectName));
+            case ts.UpToDateStatusType.Unbuildable:
+                return reportStatus(state, ts.Diagnostics.Failed_to_parse_file_0_Colon_1, relName(state, configFileName), status.reason);
+            case ts.UpToDateStatusType.TsVersionOutputOfDate:
+                return reportStatus(state, ts.Diagnostics.Project_0_is_out_of_date_because_output_for_it_was_generated_with_version_1_that_differs_with_current_version_2, relName(state, configFileName), status.version, ts.version);
+            case ts.UpToDateStatusType.ContainerOnly:
             // Don't report status on "solution" projects
-            case UpToDateStatusType.ComputingUpstream:
+            case ts.UpToDateStatusType.ComputingUpstream:
                 // Should never leak from getUptoDateStatusWorker
                 break;
             default:
                 ts.assertType(status);
         }
     }
-    ts.formatUpToDateStatus = formatUpToDateStatus;
-})(ts || (ts = {}));
-/* @internal */
-var ts;
-(function (ts) {
-    var ValueKind;
-    (function (ValueKind) {
-        ValueKind[ValueKind["Const"] = 0] = "Const";
-        ValueKind[ValueKind["Array"] = 1] = "Array";
-        ValueKind[ValueKind["FunctionOrClass"] = 2] = "FunctionOrClass";
-        ValueKind[ValueKind["Object"] = 3] = "Object";
-    })(ValueKind = ts.ValueKind || (ts.ValueKind = {}));
-    function inspectModule(fileNameToRequire) {
-        return inspectValue(ts.removeFileExtension(ts.getBaseFileName(fileNameToRequire)), tryRequire(fileNameToRequire));
-    }
-    ts.inspectModule = inspectModule;
-    function inspectValue(name, value) {
-        return getValueInfo(name, value, getRecurser());
-    }
-    ts.inspectValue = inspectValue;
-    function getRecurser() {
-        var seen = [];
-        var nameStack = [];
-        return function (obj, name, cbOk, cbFail) {
-            if (seen.indexOf(obj) !== -1 || nameStack.length > 4) {
-                return cbFail(seen.indexOf(obj) !== -1, nameStack);
-            }
-            seen.push(obj);
-            nameStack.push(name);
-            var res = cbOk();
-            nameStack.pop();
-            seen.pop();
-            return res;
-        };
-    }
-    function getValueInfo(name, value, recurser) {
-        return recurser(value, name, function () {
-            if (typeof value === "function")
-                return getFunctionOrClassInfo(value, name, recurser);
-            if (typeof value === "object") {
-                var builtin = getBuiltinType(name, value, recurser);
-                if (builtin !== undefined)
-                    return builtin;
-                var entries = getEntriesOfObject(value);
-                var hasNontrivialPrototype = Object.getPrototypeOf(value) !== Object.prototype;
-                var members = ts.flatMap(entries, function (_a) {
-                    var key = _a.key, value = _a.value;
-                    return getValueInfo(key, value, recurser);
-                });
-                return { kind: 3 /* Object */, name: name, hasNontrivialPrototype: hasNontrivialPrototype, members: members };
-            }
-            return { kind: 0 /* Const */, name: name, typeName: isNullOrUndefined(value) ? "any" : typeof value };
-        }, function (isCircularReference, keyStack) { return anyValue(name, " " + (isCircularReference ? "Circular reference" : "Too-deep object hierarchy") + " from " + keyStack.join(".")); });
-    }
-    function getFunctionOrClassInfo(fn, name, recurser) {
-        var prototypeMembers = getPrototypeMembers(fn, recurser);
-        var namespaceMembers = ts.flatMap(getEntriesOfObject(fn), function (_a) {
-            var key = _a.key, value = _a.value;
-            return getValueInfo(key, value, recurser);
-        });
-        var toString = ts.cast(Function.prototype.toString.call(fn), ts.isString);
-        var source = ts.stringContains(toString, "{ [native code] }") ? getFunctionLength(fn) : toString;
-        return { kind: 2 /* FunctionOrClass */, name: name, source: source, namespaceMembers: namespaceMembers, prototypeMembers: prototypeMembers };
-    }
-    var builtins = ts.memoize(function () {
-        var map = ts.createMap();
-        for (var _i = 0, _a = getEntriesOfObject(global); _i < _a.length; _i++) {
-            var _b = _a[_i], key = _b.key, value = _b.value;
-            if (typeof value === "function" && typeof value.prototype === "object" && value !== Object) {
-                map.set(key, value);
-            }
-        }
-        return map;
-    });
-    function getBuiltinType(name, value, recurser) {
-        return ts.isArray(value)
-            ? { name: name, kind: 1 /* Array */, inner: value.length && getValueInfo("element", ts.first(value), recurser) || anyValue(name) }
-            : ts.forEachEntry(builtins(), function (builtin, builtinName) {
-                return value instanceof builtin ? { kind: 0 /* Const */, name: name, typeName: builtinName } : undefined;
-            });
-    }
-    function getPrototypeMembers(fn, recurser) {
-        var prototype = fn.prototype;
-        // tslint:disable-next-line no-unnecessary-type-assertion (TODO: update LKG and it will really be unnecessary)
-        return typeof prototype !== "object" || prototype === null ? ts.emptyArray : ts.mapDefined(getEntriesOfObject(prototype), function (_a) {
-            var key = _a.key, value = _a.value;
-            return key === "constructor" ? undefined : getValueInfo(key, value, recurser);
-        });
-    }
-    var ignoredProperties = ["arguments", "caller", "constructor", "eval", "super_"];
-    var reservedFunctionProperties = Object.getOwnPropertyNames(ts.noop);
-    function getEntriesOfObject(obj) {
-        var seen = ts.createMap();
-        var entries = [];
-        var chain = obj;
-        while (!isNullOrUndefined(chain) && chain !== Object.prototype && chain !== Function.prototype) {
-            for (var _i = 0, _a = Object.getOwnPropertyNames(chain); _i < _a.length; _i++) {
-                var key = _a[_i];
-                if (!isJsPrivate(key) &&
-                    ignoredProperties.indexOf(key) === -1 &&
-                    (typeof obj !== "function" || reservedFunctionProperties.indexOf(key) === -1) &&
-                    // Don't add property from a higher prototype if it already exists in a lower one
-                    ts.addToSeen(seen, key)) {
-                    var value = safeGetPropertyOfObject(chain, key);
-                    // Don't repeat "toString" that matches signature from Object.prototype
-                    if (!(key === "toString" && typeof value === "function" && value.length === 0)) {
-                        entries.push({ key: key, value: value });
-                    }
-                }
-            }
-            chain = Object.getPrototypeOf(chain);
-        }
-        return entries.sort(function (e1, e2) { return ts.compareStringsCaseSensitive(e1.key, e2.key); });
-    }
-    function getFunctionLength(fn) {
-        return ts.tryCast(safeGetPropertyOfObject(fn, "length"), ts.isNumber) || 0;
-    }
-    function safeGetPropertyOfObject(obj, key) {
-        var desc = Object.getOwnPropertyDescriptor(obj, key);
-        return desc && desc.value;
-    }
-    function isNullOrUndefined(value) {
-        return value == null; // tslint:disable-line
-    }
-    function anyValue(name, comment) {
-        return { kind: 0 /* Const */, name: name, typeName: "any", comment: comment };
-    }
-    function isJsPrivate(name) {
-        return ts.startsWith(name, "_");
-    }
-    ts.isJsPrivate = isJsPrivate;
-    function tryRequire(fileNameToRequire) {
-        try {
-            return require(fileNameToRequire);
-        }
-        catch (_a) {
-            return undefined;
+    /**
+     * Report the up-to-date status of a project if we're in verbose mode
+     */
+    function verboseReportProjectStatus(state, configFileName, status) {
+        if (state.options.verbose) {
+            reportUpToDateStatus(state, configFileName, status);
         }
     }
 })(ts || (ts = {}));
@@ -94615,7 +97553,6 @@ var ts;
         server.ActionSet = "action::set";
         server.ActionInvalidate = "action::invalidate";
         server.ActionPackageInstalled = "action::packageInstalled";
-        server.ActionValueInspected = "action::valueInspected";
         server.EventTypesRegistry = "event::typesRegistry";
         server.EventBeginInstallTypes = "event::beginInstallTypes";
         server.EventEndInstallTypes = "event::endInstallTypes";
@@ -94632,6 +97569,11 @@ var ts;
              * typingsInstaller will run the command with `${npmLocation} install ...`.
              */
             Arguments.NpmLocation = "--npmLocation";
+            /**
+             * Flag indicating that the typings installer should try to validate the default npm location.
+             * If the default npm is not found when this flag is enabled, fallback to `npm install`
+             */
+            Arguments.ValidateDefaultNpmLocation = "--validateDefaultNpmLocation";
         })(Arguments = server.Arguments || (server.Arguments = {}));
         function hasArgument(argumentName) {
             return ts.sys.args.indexOf(argumentName) >= 0;
@@ -94701,6 +97643,10 @@ var ts;
             "zlib"
         ];
         JsTyping.nodeCoreModules = ts.arrayToSet(JsTyping.nodeCoreModuleList);
+        function nonRelativeModuleNameForTypingCache(moduleName) {
+            return JsTyping.nodeCoreModules.has(moduleName) ? "node" : moduleName;
+        }
+        JsTyping.nonRelativeModuleNameForTypingCache = nonRelativeModuleNameForTypingCache;
         function loadSafeList(host, safeListPath) {
             var result = ts.readConfigFile(safeListPath, function (path) { return host.readFile(path); });
             return ts.createMapFromTemplate(result.config);
@@ -94756,7 +97702,7 @@ var ts;
             getTypingNamesFromSourceFileNames(fileNames);
             // add typings for unresolved imports
             if (unresolvedImports) {
-                var module_1 = ts.deduplicate(unresolvedImports.map(function (moduleId) { return JsTyping.nodeCoreModules.has(moduleId) ? "node" : moduleId; }), ts.equateStringsCaseSensitive, ts.compareStringsCaseSensitive);
+                var module_1 = ts.deduplicate(unresolvedImports.map(nonRelativeModuleNameForTypingCache), ts.equateStringsCaseSensitive, ts.compareStringsCaseSensitive);
                 addInferredTypings(module_1, "Inferred typings from unresolved imports");
             }
             // Add the cached typing locations for inferred typings that are already installed
@@ -94884,66 +97830,82 @@ var ts;
             }
         }
         JsTyping.discoverTypings = discoverTypings;
-        var PackageNameValidationResult;
-        (function (PackageNameValidationResult) {
-            PackageNameValidationResult[PackageNameValidationResult["Ok"] = 0] = "Ok";
-            PackageNameValidationResult[PackageNameValidationResult["ScopedPackagesNotSupported"] = 1] = "ScopedPackagesNotSupported";
-            PackageNameValidationResult[PackageNameValidationResult["EmptyName"] = 2] = "EmptyName";
-            PackageNameValidationResult[PackageNameValidationResult["NameTooLong"] = 3] = "NameTooLong";
-            PackageNameValidationResult[PackageNameValidationResult["NameStartsWithDot"] = 4] = "NameStartsWithDot";
-            PackageNameValidationResult[PackageNameValidationResult["NameStartsWithUnderscore"] = 5] = "NameStartsWithUnderscore";
-            PackageNameValidationResult[PackageNameValidationResult["NameContainsNonURISafeCharacters"] = 6] = "NameContainsNonURISafeCharacters";
-        })(PackageNameValidationResult = JsTyping.PackageNameValidationResult || (JsTyping.PackageNameValidationResult = {}));
+        var NameValidationResult;
+        (function (NameValidationResult) {
+            NameValidationResult[NameValidationResult["Ok"] = 0] = "Ok";
+            NameValidationResult[NameValidationResult["EmptyName"] = 1] = "EmptyName";
+            NameValidationResult[NameValidationResult["NameTooLong"] = 2] = "NameTooLong";
+            NameValidationResult[NameValidationResult["NameStartsWithDot"] = 3] = "NameStartsWithDot";
+            NameValidationResult[NameValidationResult["NameStartsWithUnderscore"] = 4] = "NameStartsWithUnderscore";
+            NameValidationResult[NameValidationResult["NameContainsNonURISafeCharacters"] = 5] = "NameContainsNonURISafeCharacters";
+        })(NameValidationResult = JsTyping.NameValidationResult || (JsTyping.NameValidationResult = {}));
         var maxPackageNameLength = 214;
         /**
          * Validates package name using rules defined at https://docs.npmjs.com/files/package.json
          */
         function validatePackageName(packageName) {
+            return validatePackageNameWorker(packageName, /*supportScopedPackage*/ true);
+        }
+        JsTyping.validatePackageName = validatePackageName;
+        function validatePackageNameWorker(packageName, supportScopedPackage) {
             if (!packageName) {
-                return 2 /* EmptyName */;
+                return 1 /* EmptyName */;
             }
             if (packageName.length > maxPackageNameLength) {
-                return 3 /* NameTooLong */;
+                return 2 /* NameTooLong */;
             }
             if (packageName.charCodeAt(0) === 46 /* dot */) {
-                return 4 /* NameStartsWithDot */;
+                return 3 /* NameStartsWithDot */;
             }
             if (packageName.charCodeAt(0) === 95 /* _ */) {
-                return 5 /* NameStartsWithUnderscore */;
+                return 4 /* NameStartsWithUnderscore */;
             }
             // check if name is scope package like: starts with @ and has one '/' in the middle
             // scoped packages are not currently supported
-            // TODO: when support will be added we'll need to split and check both scope and package name
-            if (/^@[^/]+\/[^/]+$/.test(packageName)) {
-                return 1 /* ScopedPackagesNotSupported */;
+            if (supportScopedPackage) {
+                var matches = /^@([^/]+)\/([^/]+)$/.exec(packageName);
+                if (matches) {
+                    var scopeResult = validatePackageNameWorker(matches[1], /*supportScopedPackage*/ false);
+                    if (scopeResult !== 0 /* Ok */) {
+                        return { name: matches[1], isScopeName: true, result: scopeResult };
+                    }
+                    var packageResult = validatePackageNameWorker(matches[2], /*supportScopedPackage*/ false);
+                    if (packageResult !== 0 /* Ok */) {
+                        return { name: matches[2], isScopeName: false, result: packageResult };
+                    }
+                    return 0 /* Ok */;
+                }
             }
             if (encodeURIComponent(packageName) !== packageName) {
-                return 6 /* NameContainsNonURISafeCharacters */;
+                return 5 /* NameContainsNonURISafeCharacters */;
             }
             return 0 /* Ok */;
         }
-        JsTyping.validatePackageName = validatePackageName;
         function renderPackageNameValidationFailure(result, typing) {
+            return typeof result === "object" ?
+                renderPackageNameValidationFailureWorker(typing, result.result, result.name, result.isScopeName) :
+                renderPackageNameValidationFailureWorker(typing, result, typing, /*isScopeName*/ false);
+        }
+        JsTyping.renderPackageNameValidationFailure = renderPackageNameValidationFailure;
+        function renderPackageNameValidationFailureWorker(typing, result, name, isScopeName) {
+            var kind = isScopeName ? "Scope" : "Package";
             switch (result) {
-                case 2 /* EmptyName */:
-                    return "Package name '" + typing + "' cannot be empty";
-                case 3 /* NameTooLong */:
-                    return "Package name '" + typing + "' should be less than " + maxPackageNameLength + " characters";
-                case 4 /* NameStartsWithDot */:
-                    return "Package name '" + typing + "' cannot start with '.'";
-                case 5 /* NameStartsWithUnderscore */:
-                    return "Package name '" + typing + "' cannot start with '_'";
-                case 1 /* ScopedPackagesNotSupported */:
-                    return "Package '" + typing + "' is scoped and currently is not supported";
-                case 6 /* NameContainsNonURISafeCharacters */:
-                    return "Package name '" + typing + "' contains non URI safe characters";
+                case 1 /* EmptyName */:
+                    return "'" + typing + "':: " + kind + " name '" + name + "' cannot be empty";
+                case 2 /* NameTooLong */:
+                    return "'" + typing + "':: " + kind + " name '" + name + "' should be less than " + maxPackageNameLength + " characters";
+                case 3 /* NameStartsWithDot */:
+                    return "'" + typing + "':: " + kind + " name '" + name + "' cannot start with '.'";
+                case 4 /* NameStartsWithUnderscore */:
+                    return "'" + typing + "':: " + kind + " name '" + name + "' cannot start with '_'";
+                case 5 /* NameContainsNonURISafeCharacters */:
+                    return "'" + typing + "':: " + kind + " name '" + name + "' contains non URI safe characters";
                 case 0 /* Ok */:
                     return ts.Debug.fail(); // Shouldn't have called this.
                 default:
                     throw ts.Debug.assertNever(result);
             }
         }
-        JsTyping.renderPackageNameValidationFailure = renderPackageNameValidationFailure;
     })(JsTyping = ts.JsTyping || (ts.JsTyping = {}));
 })(ts || (ts = {}));
 var ts;
@@ -95228,7 +98190,7 @@ var ts;
 /* @internal */
 var ts;
 (function (ts) {
-    ts.scanner = ts.createScanner(7 /* Latest */, /*skipTrivia*/ true);
+    ts.scanner = ts.createScanner(99 /* Latest */, /*skipTrivia*/ true);
     var SemanticMeaning;
     (function (SemanticMeaning) {
         SemanticMeaning[SemanticMeaning["None"] = 0] = "None";
@@ -95239,37 +98201,37 @@ var ts;
     })(SemanticMeaning = ts.SemanticMeaning || (ts.SemanticMeaning = {}));
     function getMeaningFromDeclaration(node) {
         switch (node.kind) {
-            case 237 /* VariableDeclaration */:
+            case 238 /* VariableDeclaration */:
                 return ts.isInJSFile(node) && ts.getJSDocEnumTag(node) ? 7 /* All */ : 1 /* Value */;
-            case 151 /* Parameter */:
-            case 186 /* BindingElement */:
-            case 154 /* PropertyDeclaration */:
-            case 153 /* PropertySignature */:
-            case 275 /* PropertyAssignment */:
-            case 276 /* ShorthandPropertyAssignment */:
-            case 156 /* MethodDeclaration */:
-            case 155 /* MethodSignature */:
-            case 157 /* Constructor */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
-            case 239 /* FunctionDeclaration */:
-            case 196 /* FunctionExpression */:
-            case 197 /* ArrowFunction */:
-            case 274 /* CatchClause */:
-            case 267 /* JsxAttribute */:
+            case 152 /* Parameter */:
+            case 187 /* BindingElement */:
+            case 155 /* PropertyDeclaration */:
+            case 154 /* PropertySignature */:
+            case 276 /* PropertyAssignment */:
+            case 277 /* ShorthandPropertyAssignment */:
+            case 157 /* MethodDeclaration */:
+            case 156 /* MethodSignature */:
+            case 158 /* Constructor */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
+            case 240 /* FunctionDeclaration */:
+            case 197 /* FunctionExpression */:
+            case 198 /* ArrowFunction */:
+            case 275 /* CatchClause */:
+            case 268 /* JsxAttribute */:
                 return 1 /* Value */;
-            case 150 /* TypeParameter */:
-            case 241 /* InterfaceDeclaration */:
-            case 242 /* TypeAliasDeclaration */:
-            case 168 /* TypeLiteral */:
+            case 151 /* TypeParameter */:
+            case 242 /* InterfaceDeclaration */:
+            case 243 /* TypeAliasDeclaration */:
+            case 169 /* TypeLiteral */:
                 return 2 /* Type */;
-            case 309 /* JSDocTypedefTag */:
+            case 311 /* JSDocTypedefTag */:
                 // If it has no name node, it shares the name with the value declaration below it.
                 return node.name === undefined ? 1 /* Value */ | 2 /* Type */ : 2 /* Type */;
-            case 278 /* EnumMember */:
-            case 240 /* ClassDeclaration */:
+            case 279 /* EnumMember */:
+            case 241 /* ClassDeclaration */:
                 return 1 /* Value */ | 2 /* Type */;
-            case 244 /* ModuleDeclaration */:
+            case 245 /* ModuleDeclaration */:
                 if (ts.isAmbientModule(node)) {
                     return 4 /* Namespace */ | 1 /* Value */;
                 }
@@ -95279,26 +98241,26 @@ var ts;
                 else {
                     return 4 /* Namespace */;
                 }
-            case 243 /* EnumDeclaration */:
-            case 252 /* NamedImports */:
-            case 253 /* ImportSpecifier */:
-            case 248 /* ImportEqualsDeclaration */:
-            case 249 /* ImportDeclaration */:
-            case 254 /* ExportAssignment */:
-            case 255 /* ExportDeclaration */:
+            case 244 /* EnumDeclaration */:
+            case 253 /* NamedImports */:
+            case 254 /* ImportSpecifier */:
+            case 249 /* ImportEqualsDeclaration */:
+            case 250 /* ImportDeclaration */:
+            case 255 /* ExportAssignment */:
+            case 256 /* ExportDeclaration */:
                 return 7 /* All */;
             // An external module can be a Value
-            case 284 /* SourceFile */:
+            case 285 /* SourceFile */:
                 return 4 /* Namespace */ | 1 /* Value */;
         }
         return 7 /* All */;
     }
     ts.getMeaningFromDeclaration = getMeaningFromDeclaration;
     function getMeaningFromLocation(node) {
-        if (node.kind === 284 /* SourceFile */) {
+        if (node.kind === 285 /* SourceFile */) {
             return 1 /* Value */;
         }
-        else if (node.parent.kind === 254 /* ExportAssignment */ || node.parent.kind === 259 /* ExternalModuleReference */) {
+        else if (node.parent.kind === 255 /* ExportAssignment */ || node.parent.kind === 260 /* ExternalModuleReference */) {
             return 7 /* All */;
         }
         else if (isInRightSideOfInternalImportEqualsDeclaration(node)) {
@@ -95330,11 +98292,11 @@ var ts;
         //     import a = |b|; // Namespace
         //     import a = |b.c|; // Value, type, namespace
         //     import a = |b.c|.d; // Namespace
-        var name = node.kind === 148 /* QualifiedName */ ? node : ts.isQualifiedName(node.parent) && node.parent.right === node ? node.parent : undefined;
-        return name && name.parent.kind === 248 /* ImportEqualsDeclaration */ ? 7 /* All */ : 4 /* Namespace */;
+        var name = node.kind === 149 /* QualifiedName */ ? node : ts.isQualifiedName(node.parent) && node.parent.right === node ? node.parent : undefined;
+        return name && name.parent.kind === 249 /* ImportEqualsDeclaration */ ? 7 /* All */ : 4 /* Namespace */;
     }
     function isInRightSideOfInternalImportEqualsDeclaration(node) {
-        while (node.parent.kind === 148 /* QualifiedName */) {
+        while (node.parent.kind === 149 /* QualifiedName */) {
             node = node.parent;
         }
         return ts.isInternalModuleImportEqualsDeclaration(node.parent) && node.parent.moduleReference === node;
@@ -95346,27 +98308,27 @@ var ts;
     function isQualifiedNameNamespaceReference(node) {
         var root = node;
         var isLastClause = true;
-        if (root.parent.kind === 148 /* QualifiedName */) {
-            while (root.parent && root.parent.kind === 148 /* QualifiedName */) {
+        if (root.parent.kind === 149 /* QualifiedName */) {
+            while (root.parent && root.parent.kind === 149 /* QualifiedName */) {
                 root = root.parent;
             }
             isLastClause = root.right === node;
         }
-        return root.parent.kind === 164 /* TypeReference */ && !isLastClause;
+        return root.parent.kind === 165 /* TypeReference */ && !isLastClause;
     }
     function isPropertyAccessNamespaceReference(node) {
         var root = node;
         var isLastClause = true;
-        if (root.parent.kind === 189 /* PropertyAccessExpression */) {
-            while (root.parent && root.parent.kind === 189 /* PropertyAccessExpression */) {
+        if (root.parent.kind === 190 /* PropertyAccessExpression */) {
+            while (root.parent && root.parent.kind === 190 /* PropertyAccessExpression */) {
                 root = root.parent;
             }
             isLastClause = root.name === node;
         }
-        if (!isLastClause && root.parent.kind === 211 /* ExpressionWithTypeArguments */ && root.parent.parent.kind === 273 /* HeritageClause */) {
+        if (!isLastClause && root.parent.kind === 212 /* ExpressionWithTypeArguments */ && root.parent.parent.kind === 274 /* HeritageClause */) {
             var decl = root.parent.parent.parent;
-            return (decl.kind === 240 /* ClassDeclaration */ && root.parent.parent.token === 109 /* ImplementsKeyword */) ||
-                (decl.kind === 241 /* InterfaceDeclaration */ && root.parent.parent.token === 86 /* ExtendsKeyword */);
+            return (decl.kind === 241 /* ClassDeclaration */ && root.parent.parent.token === 110 /* ImplementsKeyword */) ||
+                (decl.kind === 242 /* InterfaceDeclaration */ && root.parent.parent.token === 87 /* ExtendsKeyword */);
         }
         return false;
     }
@@ -95375,17 +98337,17 @@ var ts;
             node = node.parent;
         }
         switch (node.kind) {
-            case 100 /* ThisKeyword */:
+            case 101 /* ThisKeyword */:
                 return !ts.isExpressionNode(node);
-            case 178 /* ThisType */:
+            case 179 /* ThisType */:
                 return true;
         }
         switch (node.parent.kind) {
-            case 164 /* TypeReference */:
+            case 165 /* TypeReference */:
                 return true;
-            case 183 /* ImportType */:
+            case 184 /* ImportType */:
                 return !node.parent.isTypeOf;
-            case 211 /* ExpressionWithTypeArguments */:
+            case 212 /* ExpressionWithTypeArguments */:
                 return !ts.isExpressionWithTypeArgumentsInClassExtendsClause(node.parent);
         }
         return false;
@@ -95412,7 +98374,7 @@ var ts;
     ts.climbPastPropertyAccess = climbPastPropertyAccess;
     function getTargetLabel(referenceNode, labelName) {
         while (referenceNode) {
-            if (referenceNode.kind === 233 /* LabeledStatement */ && referenceNode.label.escapedText === labelName) {
+            if (referenceNode.kind === 234 /* LabeledStatement */ && referenceNode.label.escapedText === labelName) {
                 return referenceNode.label;
             }
             referenceNode = referenceNode.parent;
@@ -95428,11 +98390,11 @@ var ts;
     }
     ts.hasPropertyAccessExpressionWithName = hasPropertyAccessExpressionWithName;
     function isJumpStatementTarget(node) {
-        return node.kind === 72 /* Identifier */ && ts.isBreakOrContinueStatement(node.parent) && node.parent.label === node;
+        return node.kind === 73 /* Identifier */ && ts.isBreakOrContinueStatement(node.parent) && node.parent.label === node;
     }
     ts.isJumpStatementTarget = isJumpStatementTarget;
     function isLabelOfLabeledStatement(node) {
-        return node.kind === 72 /* Identifier */ && ts.isLabeledStatement(node.parent) && node.parent.label === node;
+        return node.kind === 73 /* Identifier */ && ts.isLabeledStatement(node.parent) && node.parent.label === node;
     }
     ts.isLabelOfLabeledStatement = isLabelOfLabeledStatement;
     function isLabelName(node) {
@@ -95444,40 +98406,40 @@ var ts;
     }
     ts.isTagName = isTagName;
     function isRightSideOfQualifiedName(node) {
-        return node.parent.kind === 148 /* QualifiedName */ && node.parent.right === node;
+        return node.parent.kind === 149 /* QualifiedName */ && node.parent.right === node;
     }
     ts.isRightSideOfQualifiedName = isRightSideOfQualifiedName;
     function isRightSideOfPropertyAccess(node) {
-        return node && node.parent && node.parent.kind === 189 /* PropertyAccessExpression */ && node.parent.name === node;
+        return node && node.parent && node.parent.kind === 190 /* PropertyAccessExpression */ && node.parent.name === node;
     }
     ts.isRightSideOfPropertyAccess = isRightSideOfPropertyAccess;
     function isNameOfModuleDeclaration(node) {
-        return node.parent.kind === 244 /* ModuleDeclaration */ && node.parent.name === node;
+        return node.parent.kind === 245 /* ModuleDeclaration */ && node.parent.name === node;
     }
     ts.isNameOfModuleDeclaration = isNameOfModuleDeclaration;
     function isNameOfFunctionDeclaration(node) {
-        return node.kind === 72 /* Identifier */ &&
+        return node.kind === 73 /* Identifier */ &&
             ts.isFunctionLike(node.parent) && node.parent.name === node;
     }
     ts.isNameOfFunctionDeclaration = isNameOfFunctionDeclaration;
     function isLiteralNameOfPropertyDeclarationOrIndexAccess(node) {
         switch (node.parent.kind) {
-            case 154 /* PropertyDeclaration */:
-            case 153 /* PropertySignature */:
-            case 275 /* PropertyAssignment */:
-            case 278 /* EnumMember */:
-            case 156 /* MethodDeclaration */:
-            case 155 /* MethodSignature */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
-            case 244 /* ModuleDeclaration */:
+            case 155 /* PropertyDeclaration */:
+            case 154 /* PropertySignature */:
+            case 276 /* PropertyAssignment */:
+            case 279 /* EnumMember */:
+            case 157 /* MethodDeclaration */:
+            case 156 /* MethodSignature */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
+            case 245 /* ModuleDeclaration */:
                 return ts.getNameOfDeclaration(node.parent) === node;
-            case 190 /* ElementAccessExpression */:
+            case 191 /* ElementAccessExpression */:
                 return node.parent.argumentExpression === node;
-            case 149 /* ComputedPropertyName */:
+            case 150 /* ComputedPropertyName */:
                 return true;
-            case 182 /* LiteralType */:
-                return node.parent.parent.kind === 180 /* IndexedAccessType */;
+            case 183 /* LiteralType */:
+                return node.parent.parent.kind === 181 /* IndexedAccessType */;
             default:
                 return false;
         }
@@ -95501,17 +98463,17 @@ var ts;
                 return undefined;
             }
             switch (node.kind) {
-                case 284 /* SourceFile */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
-                case 240 /* ClassDeclaration */:
-                case 241 /* InterfaceDeclaration */:
-                case 243 /* EnumDeclaration */:
-                case 244 /* ModuleDeclaration */:
+                case 285 /* SourceFile */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
+                case 241 /* ClassDeclaration */:
+                case 242 /* InterfaceDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     return node;
             }
         }
@@ -95519,48 +98481,48 @@ var ts;
     ts.getContainerNode = getContainerNode;
     function getNodeKind(node) {
         switch (node.kind) {
-            case 284 /* SourceFile */:
+            case 285 /* SourceFile */:
                 return ts.isExternalModule(node) ? "module" /* moduleElement */ : "script" /* scriptElement */;
-            case 244 /* ModuleDeclaration */:
+            case 245 /* ModuleDeclaration */:
                 return "module" /* moduleElement */;
-            case 240 /* ClassDeclaration */:
-            case 209 /* ClassExpression */:
+            case 241 /* ClassDeclaration */:
+            case 210 /* ClassExpression */:
                 return "class" /* classElement */;
-            case 241 /* InterfaceDeclaration */: return "interface" /* interfaceElement */;
-            case 242 /* TypeAliasDeclaration */:
-            case 302 /* JSDocCallbackTag */:
-            case 309 /* JSDocTypedefTag */:
+            case 242 /* InterfaceDeclaration */: return "interface" /* interfaceElement */;
+            case 243 /* TypeAliasDeclaration */:
+            case 304 /* JSDocCallbackTag */:
+            case 311 /* JSDocTypedefTag */:
                 return "type" /* typeElement */;
-            case 243 /* EnumDeclaration */: return "enum" /* enumElement */;
-            case 237 /* VariableDeclaration */:
+            case 244 /* EnumDeclaration */: return "enum" /* enumElement */;
+            case 238 /* VariableDeclaration */:
                 return getKindOfVariableDeclaration(node);
-            case 186 /* BindingElement */:
+            case 187 /* BindingElement */:
                 return getKindOfVariableDeclaration(ts.getRootDeclaration(node));
-            case 197 /* ArrowFunction */:
-            case 239 /* FunctionDeclaration */:
-            case 196 /* FunctionExpression */:
+            case 198 /* ArrowFunction */:
+            case 240 /* FunctionDeclaration */:
+            case 197 /* FunctionExpression */:
                 return "function" /* functionElement */;
-            case 158 /* GetAccessor */: return "getter" /* memberGetAccessorElement */;
-            case 159 /* SetAccessor */: return "setter" /* memberSetAccessorElement */;
-            case 156 /* MethodDeclaration */:
-            case 155 /* MethodSignature */:
+            case 159 /* GetAccessor */: return "getter" /* memberGetAccessorElement */;
+            case 160 /* SetAccessor */: return "setter" /* memberSetAccessorElement */;
+            case 157 /* MethodDeclaration */:
+            case 156 /* MethodSignature */:
                 return "method" /* memberFunctionElement */;
-            case 154 /* PropertyDeclaration */:
-            case 153 /* PropertySignature */:
+            case 155 /* PropertyDeclaration */:
+            case 154 /* PropertySignature */:
                 return "property" /* memberVariableElement */;
-            case 162 /* IndexSignature */: return "index" /* indexSignatureElement */;
-            case 161 /* ConstructSignature */: return "construct" /* constructSignatureElement */;
-            case 160 /* CallSignature */: return "call" /* callSignatureElement */;
-            case 157 /* Constructor */: return "constructor" /* constructorImplementationElement */;
-            case 150 /* TypeParameter */: return "type parameter" /* typeParameterElement */;
-            case 278 /* EnumMember */: return "enum member" /* enumMemberElement */;
-            case 151 /* Parameter */: return ts.hasModifier(node, 92 /* ParameterPropertyModifier */) ? "property" /* memberVariableElement */ : "parameter" /* parameterElement */;
-            case 248 /* ImportEqualsDeclaration */:
-            case 253 /* ImportSpecifier */:
-            case 257 /* ExportSpecifier */:
-            case 251 /* NamespaceImport */:
+            case 163 /* IndexSignature */: return "index" /* indexSignatureElement */;
+            case 162 /* ConstructSignature */: return "construct" /* constructSignatureElement */;
+            case 161 /* CallSignature */: return "call" /* callSignatureElement */;
+            case 158 /* Constructor */: return "constructor" /* constructorImplementationElement */;
+            case 151 /* TypeParameter */: return "type parameter" /* typeParameterElement */;
+            case 279 /* EnumMember */: return "enum member" /* enumMemberElement */;
+            case 152 /* Parameter */: return ts.hasModifier(node, 92 /* ParameterPropertyModifier */) ? "property" /* memberVariableElement */ : "parameter" /* parameterElement */;
+            case 249 /* ImportEqualsDeclaration */:
+            case 254 /* ImportSpecifier */:
+            case 258 /* ExportSpecifier */:
+            case 252 /* NamespaceImport */:
                 return "alias" /* alias */;
-            case 204 /* BinaryExpression */:
+            case 205 /* BinaryExpression */:
                 var kind = ts.getAssignmentDeclarationKind(node);
                 var right = node.right;
                 switch (kind) {
@@ -95587,7 +98549,7 @@ var ts;
                         return "" /* unknown */;
                     }
                 }
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 return ts.isImportClause(node.parent) ? "alias" /* alias */ : "" /* unknown */;
             default:
                 return "" /* unknown */;
@@ -95603,12 +98565,12 @@ var ts;
     ts.getNodeKind = getNodeKind;
     function isThis(node) {
         switch (node.kind) {
-            case 100 /* ThisKeyword */:
+            case 101 /* ThisKeyword */:
                 // case SyntaxKind.ThisType: TODO: GH#9267
                 return true;
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 // 'this' as a parameter
-                return ts.identifierIsThisKeyword(node) && node.parent.kind === 151 /* Parameter */;
+                return ts.identifierIsThisKeyword(node) && node.parent.kind === 152 /* Parameter */;
             default:
                 return false;
         }
@@ -95673,42 +98635,42 @@ var ts;
             return false;
         }
         switch (n.kind) {
-            case 240 /* ClassDeclaration */:
-            case 241 /* InterfaceDeclaration */:
-            case 243 /* EnumDeclaration */:
-            case 188 /* ObjectLiteralExpression */:
-            case 184 /* ObjectBindingPattern */:
-            case 168 /* TypeLiteral */:
-            case 218 /* Block */:
-            case 245 /* ModuleBlock */:
-            case 246 /* CaseBlock */:
-            case 252 /* NamedImports */:
-            case 256 /* NamedExports */:
+            case 241 /* ClassDeclaration */:
+            case 242 /* InterfaceDeclaration */:
+            case 244 /* EnumDeclaration */:
+            case 189 /* ObjectLiteralExpression */:
+            case 185 /* ObjectBindingPattern */:
+            case 169 /* TypeLiteral */:
+            case 219 /* Block */:
+            case 246 /* ModuleBlock */:
+            case 247 /* CaseBlock */:
+            case 253 /* NamedImports */:
+            case 257 /* NamedExports */:
                 return nodeEndsWith(n, 19 /* CloseBraceToken */, sourceFile);
-            case 274 /* CatchClause */:
+            case 275 /* CatchClause */:
                 return isCompletedNode(n.block, sourceFile);
-            case 192 /* NewExpression */:
+            case 193 /* NewExpression */:
                 if (!n.arguments) {
                     return true;
                 }
             // falls through
-            case 191 /* CallExpression */:
-            case 195 /* ParenthesizedExpression */:
-            case 177 /* ParenthesizedType */:
+            case 192 /* CallExpression */:
+            case 196 /* ParenthesizedExpression */:
+            case 178 /* ParenthesizedType */:
                 return nodeEndsWith(n, 21 /* CloseParenToken */, sourceFile);
-            case 165 /* FunctionType */:
-            case 166 /* ConstructorType */:
+            case 166 /* FunctionType */:
+            case 167 /* ConstructorType */:
                 return isCompletedNode(n.type, sourceFile);
-            case 157 /* Constructor */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
-            case 239 /* FunctionDeclaration */:
-            case 196 /* FunctionExpression */:
-            case 156 /* MethodDeclaration */:
-            case 155 /* MethodSignature */:
-            case 161 /* ConstructSignature */:
-            case 160 /* CallSignature */:
-            case 197 /* ArrowFunction */:
+            case 158 /* Constructor */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
+            case 240 /* FunctionDeclaration */:
+            case 197 /* FunctionExpression */:
+            case 157 /* MethodDeclaration */:
+            case 156 /* MethodSignature */:
+            case 162 /* ConstructSignature */:
+            case 161 /* CallSignature */:
+            case 198 /* ArrowFunction */:
                 if (n.body) {
                     return isCompletedNode(n.body, sourceFile);
                 }
@@ -95718,65 +98680,65 @@ var ts;
                 // Even though type parameters can be unclosed, we can get away with
                 // having at least a closing paren.
                 return hasChildOfKind(n, 21 /* CloseParenToken */, sourceFile);
-            case 244 /* ModuleDeclaration */:
+            case 245 /* ModuleDeclaration */:
                 return !!n.body && isCompletedNode(n.body, sourceFile);
-            case 222 /* IfStatement */:
+            case 223 /* IfStatement */:
                 if (n.elseStatement) {
                     return isCompletedNode(n.elseStatement, sourceFile);
                 }
                 return isCompletedNode(n.thenStatement, sourceFile);
-            case 221 /* ExpressionStatement */:
+            case 222 /* ExpressionStatement */:
                 return isCompletedNode(n.expression, sourceFile) ||
                     hasChildOfKind(n, 26 /* SemicolonToken */, sourceFile);
-            case 187 /* ArrayLiteralExpression */:
-            case 185 /* ArrayBindingPattern */:
-            case 190 /* ElementAccessExpression */:
-            case 149 /* ComputedPropertyName */:
-            case 170 /* TupleType */:
+            case 188 /* ArrayLiteralExpression */:
+            case 186 /* ArrayBindingPattern */:
+            case 191 /* ElementAccessExpression */:
+            case 150 /* ComputedPropertyName */:
+            case 171 /* TupleType */:
                 return nodeEndsWith(n, 23 /* CloseBracketToken */, sourceFile);
-            case 162 /* IndexSignature */:
+            case 163 /* IndexSignature */:
                 if (n.type) {
                     return isCompletedNode(n.type, sourceFile);
                 }
                 return hasChildOfKind(n, 23 /* CloseBracketToken */, sourceFile);
-            case 271 /* CaseClause */:
-            case 272 /* DefaultClause */:
+            case 272 /* CaseClause */:
+            case 273 /* DefaultClause */:
                 // there is no such thing as terminator token for CaseClause/DefaultClause so for simplicity always consider them non-completed
                 return false;
-            case 225 /* ForStatement */:
-            case 226 /* ForInStatement */:
-            case 227 /* ForOfStatement */:
-            case 224 /* WhileStatement */:
+            case 226 /* ForStatement */:
+            case 227 /* ForInStatement */:
+            case 228 /* ForOfStatement */:
+            case 225 /* WhileStatement */:
                 return isCompletedNode(n.statement, sourceFile);
-            case 223 /* DoStatement */:
+            case 224 /* DoStatement */:
                 // rough approximation: if DoStatement has While keyword - then if node is completed is checking the presence of ')';
-                return hasChildOfKind(n, 107 /* WhileKeyword */, sourceFile)
+                return hasChildOfKind(n, 108 /* WhileKeyword */, sourceFile)
                     ? nodeEndsWith(n, 21 /* CloseParenToken */, sourceFile)
                     : isCompletedNode(n.statement, sourceFile);
-            case 167 /* TypeQuery */:
+            case 168 /* TypeQuery */:
                 return isCompletedNode(n.exprName, sourceFile);
-            case 199 /* TypeOfExpression */:
-            case 198 /* DeleteExpression */:
-            case 200 /* VoidExpression */:
-            case 207 /* YieldExpression */:
-            case 208 /* SpreadElement */:
+            case 200 /* TypeOfExpression */:
+            case 199 /* DeleteExpression */:
+            case 201 /* VoidExpression */:
+            case 208 /* YieldExpression */:
+            case 209 /* SpreadElement */:
                 var unaryWordExpression = n;
                 return isCompletedNode(unaryWordExpression.expression, sourceFile);
-            case 193 /* TaggedTemplateExpression */:
+            case 194 /* TaggedTemplateExpression */:
                 return isCompletedNode(n.template, sourceFile);
-            case 206 /* TemplateExpression */:
+            case 207 /* TemplateExpression */:
                 var lastSpan = ts.lastOrUndefined(n.templateSpans);
                 return isCompletedNode(lastSpan, sourceFile);
-            case 216 /* TemplateSpan */:
+            case 217 /* TemplateSpan */:
                 return ts.nodeIsPresent(n.literal);
-            case 255 /* ExportDeclaration */:
-            case 249 /* ImportDeclaration */:
+            case 256 /* ExportDeclaration */:
+            case 250 /* ImportDeclaration */:
                 return ts.nodeIsPresent(n.moduleSpecifier);
-            case 202 /* PrefixUnaryExpression */:
+            case 203 /* PrefixUnaryExpression */:
                 return isCompletedNode(n.operand, sourceFile);
-            case 204 /* BinaryExpression */:
+            case 205 /* BinaryExpression */:
                 return isCompletedNode(n.right, sourceFile);
-            case 205 /* ConditionalExpression */:
+            case 206 /* ConditionalExpression */:
                 return isCompletedNode(n.whenFalse, sourceFile);
             default:
                 return true;
@@ -95955,7 +98917,7 @@ var ts;
                     }
                 }
             }
-            ts.Debug.assert(startNode !== undefined || n.kind === 284 /* SourceFile */ || n.kind === 1 /* EndOfFileToken */ || ts.isJSDocCommentContainingNode(n));
+            ts.Debug.assert(startNode !== undefined || n.kind === 285 /* SourceFile */ || n.kind === 1 /* EndOfFileToken */ || ts.isJSDocCommentContainingNode(n));
             // Here we know that none of child token nodes embrace the position,
             // the only known case is when position is at the end of the file.
             // Try to find the rightmost token in the file without filtering.
@@ -96025,24 +98987,24 @@ var ts;
             return true;
         }
         // <div> { | </div> or <div a={| </div>
-        if (token.kind === 28 /* LessThanToken */ && token.parent.kind === 270 /* JsxExpression */) {
+        if (token.kind === 28 /* LessThanToken */ && token.parent.kind === 271 /* JsxExpression */) {
             return true;
         }
         // <div> {
         // |
         // } < /div>
-        if (token && token.kind === 19 /* CloseBraceToken */ && token.parent.kind === 270 /* JsxExpression */) {
+        if (token && token.kind === 19 /* CloseBraceToken */ && token.parent.kind === 271 /* JsxExpression */) {
             return true;
         }
         // <div>|</div>
-        if (token.kind === 28 /* LessThanToken */ && token.parent.kind === 263 /* JsxClosingElement */) {
+        if (token.kind === 28 /* LessThanToken */ && token.parent.kind === 264 /* JsxClosingElement */) {
             return true;
         }
         return false;
     }
     ts.isInsideJsxElementOrAttribute = isInsideJsxElementOrAttribute;
     function isWhiteSpaceOnlyJsxText(node) {
-        return ts.isJsxText(node) && node.containsOnlyWhiteSpaces;
+        return ts.isJsxText(node) && node.containsOnlyTriviaWhiteSpaces;
     }
     function isInTemplateString(sourceFile, position) {
         var token = getTokenAtPosition(sourceFile, position);
@@ -96154,15 +99116,15 @@ var ts;
                     nTypeArguments++;
                     break;
                 case 37 /* EqualsGreaterThanToken */:
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                 case 10 /* StringLiteral */:
                 case 8 /* NumericLiteral */:
                 case 9 /* BigIntLiteral */:
-                case 102 /* TrueKeyword */:
-                case 87 /* FalseKeyword */:
-                case 104 /* TypeOfKeyword */:
-                case 86 /* ExtendsKeyword */:
-                case 129 /* KeyOfKeyword */:
+                case 103 /* TrueKeyword */:
+                case 88 /* FalseKeyword */:
+                case 105 /* TypeOfKeyword */:
+                case 87 /* ExtendsKeyword */:
+                case 130 /* KeyOfKeyword */:
                 case 24 /* DotToken */:
                 case 50 /* BarToken */:
                 case 56 /* QuestionToken */:
@@ -96221,10 +99183,10 @@ var ts;
     }
     ts.getNodeModifiers = getNodeModifiers;
     function getTypeArgumentOrTypeParameterList(node) {
-        if (node.kind === 164 /* TypeReference */ || node.kind === 191 /* CallExpression */) {
+        if (node.kind === 165 /* TypeReference */ || node.kind === 192 /* CallExpression */) {
             return node.typeArguments;
         }
-        if (ts.isFunctionLike(node) || node.kind === 240 /* ClassDeclaration */ || node.kind === 241 /* InterfaceDeclaration */) {
+        if (ts.isFunctionLike(node) || node.kind === 241 /* ClassDeclaration */ || node.kind === 242 /* InterfaceDeclaration */) {
             return node.typeParameters;
         }
         return undefined;
@@ -96244,7 +99206,7 @@ var ts;
     }
     ts.isStringOrRegularExpressionOrTemplateLiteral = isStringOrRegularExpressionOrTemplateLiteral;
     function isPunctuation(kind) {
-        return 18 /* FirstPunctuation */ <= kind && kind <= 71 /* LastPunctuation */;
+        return 18 /* FirstPunctuation */ <= kind && kind <= 72 /* LastPunctuation */;
     }
     ts.isPunctuation = isPunctuation;
     function isInsideTemplateLiteral(node, position, sourceFile) {
@@ -96254,9 +99216,9 @@ var ts;
     ts.isInsideTemplateLiteral = isInsideTemplateLiteral;
     function isAccessibilityModifier(kind) {
         switch (kind) {
-            case 115 /* PublicKeyword */:
-            case 113 /* PrivateKeyword */:
-            case 114 /* ProtectedKeyword */:
+            case 116 /* PublicKeyword */:
+            case 114 /* PrivateKeyword */:
+            case 115 /* ProtectedKeyword */:
                 return true;
         }
         return false;
@@ -96269,18 +99231,18 @@ var ts;
     }
     ts.cloneCompilerOptions = cloneCompilerOptions;
     function isArrayLiteralOrObjectLiteralDestructuringPattern(node) {
-        if (node.kind === 187 /* ArrayLiteralExpression */ ||
-            node.kind === 188 /* ObjectLiteralExpression */) {
+        if (node.kind === 188 /* ArrayLiteralExpression */ ||
+            node.kind === 189 /* ObjectLiteralExpression */) {
             // [a,b,c] from:
             // [a, b, c] = someExpression;
-            if (node.parent.kind === 204 /* BinaryExpression */ &&
+            if (node.parent.kind === 205 /* BinaryExpression */ &&
                 node.parent.left === node &&
-                node.parent.operatorToken.kind === 59 /* EqualsToken */) {
+                node.parent.operatorToken.kind === 60 /* EqualsToken */) {
                 return true;
             }
             // [a, b, c] from:
             // for([a, b, c] of expression)
-            if (node.parent.kind === 227 /* ForOfStatement */ &&
+            if (node.parent.kind === 228 /* ForOfStatement */ &&
                 node.parent.initializer === node) {
                 return true;
             }
@@ -96288,7 +99250,7 @@ var ts;
             // [x, [a, b, c] ] = someExpression
             // or
             // {x, a: {a, b, c} } = someExpression
-            if (isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent.kind === 275 /* PropertyAssignment */ ? node.parent.parent : node.parent)) {
+            if (isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent.kind === 276 /* PropertyAssignment */ ? node.parent.parent : node.parent)) {
                 return true;
             }
         }
@@ -96307,8 +99269,8 @@ var ts;
         var range = isInComment(sourceFile, position, /*tokenAtPosition*/ undefined);
         return !!range && shouldBeReference === tripleSlashDirectivePrefixRegex.test(sourceFile.text.substring(range.pos, range.end));
     }
-    function createTextSpanFromNode(node, sourceFile) {
-        return ts.createTextSpanFromBounds(node.getStart(sourceFile), node.getEnd());
+    function createTextSpanFromNode(node, sourceFile, endNode) {
+        return ts.createTextSpanFromBounds(node.getStart(sourceFile), (endNode || node).getEnd());
     }
     ts.createTextSpanFromNode = createTextSpanFromNode;
     function createTextRangeFromNode(node, sourceFile) {
@@ -96332,22 +99294,23 @@ var ts;
     }
     ts.createTextChange = createTextChange;
     ts.typeKeywords = [
-        120 /* AnyKeyword */,
-        146 /* BigIntKeyword */,
-        123 /* BooleanKeyword */,
-        87 /* FalseKeyword */,
-        129 /* KeyOfKeyword */,
-        132 /* NeverKeyword */,
-        96 /* NullKeyword */,
-        135 /* NumberKeyword */,
-        136 /* ObjectKeyword */,
-        138 /* StringKeyword */,
-        139 /* SymbolKeyword */,
-        102 /* TrueKeyword */,
-        106 /* VoidKeyword */,
-        141 /* UndefinedKeyword */,
-        142 /* UniqueKeyword */,
-        143 /* UnknownKeyword */,
+        121 /* AnyKeyword */,
+        147 /* BigIntKeyword */,
+        124 /* BooleanKeyword */,
+        88 /* FalseKeyword */,
+        130 /* KeyOfKeyword */,
+        133 /* NeverKeyword */,
+        97 /* NullKeyword */,
+        136 /* NumberKeyword */,
+        137 /* ObjectKeyword */,
+        134 /* ReadonlyKeyword */,
+        139 /* StringKeyword */,
+        140 /* SymbolKeyword */,
+        103 /* TrueKeyword */,
+        107 /* VoidKeyword */,
+        142 /* UndefinedKeyword */,
+        143 /* UniqueKeyword */,
+        144 /* UnknownKeyword */,
     ];
     function isTypeKeyword(kind) {
         return ts.contains(ts.typeKeywords, kind);
@@ -96383,7 +99346,7 @@ var ts;
     }
     ts.skipConstraint = skipConstraint;
     function getNameFromPropertyName(name) {
-        return name.kind === 149 /* ComputedPropertyName */
+        return name.kind === 150 /* ComputedPropertyName */
             // treat computed property names where expression is string/numeric literal as just string/numeric literal
             ? ts.isStringOrNumericLiteralLike(name.expression) ? name.expression.text : undefined
             : ts.getTextOfIdentifierOrLiteral(name);
@@ -96459,7 +99422,7 @@ var ts;
         }
         return ts.firstDefined(symbol.declarations, function (decl) {
             var name = ts.getNameOfDeclaration(decl);
-            return name && name.kind === 72 /* Identifier */ ? name.escapedText : undefined;
+            return name && name.kind === 73 /* Identifier */ ? name.escapedText : undefined;
         });
     }
     ts.symbolEscapedNameNoDefault = symbolEscapedNameNoDefault;
@@ -96548,7 +99511,7 @@ var ts;
 /* @internal */
 (function (ts) {
     function isFirstDeclarationOfSymbolParameter(symbol) {
-        return symbol.declarations && symbol.declarations.length > 0 && symbol.declarations[0].kind === 151 /* Parameter */;
+        return symbol.declarations && symbol.declarations.length > 0 && symbol.declarations[0].kind === 152 /* Parameter */;
     }
     ts.isFirstDeclarationOfSymbolParameter = isFirstDeclarationOfSymbolParameter;
     var displayPartWriter = getDisplayPartWriter();
@@ -96770,23 +99733,6 @@ var ts;
         return !!location.parent && ts.isImportOrExportSpecifier(location.parent) && location.parent.propertyName === location;
     }
     ts.isImportOrExportSpecifierName = isImportOrExportSpecifierName;
-    /**
-     * Strip off existed single quotes or double quotes from a given string
-     *
-     * @return non-quoted string
-     */
-    function stripQuotes(name) {
-        var length = name.length;
-        if (length >= 2 && name.charCodeAt(0) === name.charCodeAt(length - 1) && startsWithQuote(name)) {
-            return name.substring(1, length - 1);
-        }
-        return name;
-    }
-    ts.stripQuotes = stripQuotes;
-    function startsWithQuote(name) {
-        return ts.isSingleOrDoubleQuote(name.charCodeAt(0));
-    }
-    ts.startsWithQuote = startsWithQuote;
     function scriptKindIs(fileName, host) {
         var scriptKinds = [];
         for (var _i = 2; _i < arguments.length; _i++) {
@@ -96802,10 +99748,15 @@ var ts;
         return ts.ensureScriptKind(fileName, host && host.getScriptKind && host.getScriptKind(fileName));
     }
     ts.getScriptKind = getScriptKind;
-    function getSymbolTarget(symbol) {
+    function getSymbolTarget(symbol, checker) {
         var next = symbol;
-        while (isTransientSymbol(next) && next.target) {
-            next = next.target;
+        while (isAliasSymbol(next) || (isTransientSymbol(next) && next.target)) {
+            if (isTransientSymbol(next) && next.target) {
+                next = next.target;
+            }
+            else {
+                next = ts.skipAlias(next, checker);
+            }
         }
         return next;
     }
@@ -96813,6 +99764,9 @@ var ts;
     function isTransientSymbol(symbol) {
         return (symbol.flags & 33554432 /* Transient */) !== 0;
     }
+    function isAliasSymbol(symbol) {
+        return (symbol.flags & 2097152 /* Alias */) !== 0;
+    }
     function getUniqueSymbolId(symbol, checker) {
         return ts.getSymbolId(ts.skipAlias(symbol, checker));
     }
@@ -96848,7 +99802,14 @@ var ts;
     function getSynthesizedDeepCloneWithRenames(node, includeTrivia, renameMap, checker, callback) {
         if (includeTrivia === void 0) { includeTrivia = true; }
         var clone;
-        if (ts.isIdentifier(node) && renameMap && checker) {
+        if (renameMap && checker && ts.isBindingElement(node) && ts.isIdentifier(node.name) && ts.isObjectBindingPattern(node.parent)) {
+            var symbol = checker.getSymbolAtLocation(node.name);
+            var renameInfo = symbol && renameMap.get(String(ts.getSymbolId(symbol)));
+            if (renameInfo && renameInfo.text !== (node.name || node.propertyName).getText()) {
+                clone = ts.createBindingElement(node.dotDotDotToken, node.propertyName || node.name, renameInfo, node.initializer);
+            }
+        }
+        else if (renameMap && checker && ts.isIdentifier(node)) {
             var symbol = checker.getSymbolAtLocation(node);
             var renameInfo = symbol && renameMap.get(String(ts.getSymbolId(symbol)));
             if (renameInfo) {
@@ -97012,15 +99973,15 @@ var ts;
     function getContextualTypeFromParent(node, checker) {
         var parent = node.parent;
         switch (parent.kind) {
-            case 192 /* NewExpression */:
+            case 193 /* NewExpression */:
                 return checker.getContextualType(parent);
-            case 204 /* BinaryExpression */: {
+            case 205 /* BinaryExpression */: {
                 var _a = parent, left = _a.left, operatorToken = _a.operatorToken, right = _a.right;
                 return isEqualityOperatorKind(operatorToken.kind)
                     ? checker.getTypeAtLocation(node === right ? left : right)
                     : checker.getContextualType(node);
             }
-            case 271 /* CaseClause */:
+            case 272 /* CaseClause */:
                 return parent.expression === node ? getSwitchedType(parent, checker) : undefined;
             default:
                 return checker.getContextualType(node);
@@ -97040,7 +100001,7 @@ var ts;
             case "double":
                 return quoted;
             case "single":
-                return "'" + stripQuotes(quoted).replace("'", "\\'").replace('\\"', '"') + "'";
+                return "'" + ts.stripQuotes(quoted).replace("'", "\\'").replace('\\"', '"') + "'";
             default:
                 return ts.Debug.assertNever(quotePreference);
         }
@@ -97062,8 +100023,8 @@ var ts;
         switch (node.kind) {
             case 10 /* StringLiteral */:
             case 14 /* NoSubstitutionTemplateLiteral */:
-            case 206 /* TemplateExpression */:
-            case 193 /* TaggedTemplateExpression */:
+            case 207 /* TemplateExpression */:
+            case 194 /* TaggedTemplateExpression */:
                 return true;
             default:
                 return false;
@@ -97102,11 +100063,55 @@ var ts;
         return typeIsAccessible ? res : undefined;
     }
     ts.getTypeNodeIfAccessible = getTypeNodeIfAccessible;
+    function syntaxUsuallyHasTrailingSemicolon(kind) {
+        return kind === 220 /* VariableStatement */
+            || kind === 222 /* ExpressionStatement */
+            || kind === 224 /* DoStatement */
+            || kind === 229 /* ContinueStatement */
+            || kind === 230 /* BreakStatement */
+            || kind === 231 /* ReturnStatement */
+            || kind === 235 /* ThrowStatement */
+            || kind === 237 /* DebuggerStatement */
+            || kind === 155 /* PropertyDeclaration */
+            || kind === 243 /* TypeAliasDeclaration */
+            || kind === 250 /* ImportDeclaration */
+            || kind === 249 /* ImportEqualsDeclaration */
+            || kind === 256 /* ExportDeclaration */;
+    }
+    ts.syntaxUsuallyHasTrailingSemicolon = syntaxUsuallyHasTrailingSemicolon;
+    function probablyUsesSemicolons(sourceFile) {
+        var withSemicolon = 0;
+        var withoutSemicolon = 0;
+        var nStatementsToObserve = 5;
+        ts.forEachChild(sourceFile, function visit(node) {
+            if (syntaxUsuallyHasTrailingSemicolon(node.kind)) {
+                var lastToken = node.getLastToken(sourceFile);
+                if (lastToken && lastToken.kind === 26 /* SemicolonToken */) {
+                    withSemicolon++;
+                }
+                else {
+                    withoutSemicolon++;
+                }
+            }
+            if (withSemicolon + withoutSemicolon >= nStatementsToObserve) {
+                return true;
+            }
+            return ts.forEachChild(node, visit);
+        });
+        // One statement missing a semicolon isn’t sufficient evidence to say the user
+        // doesn’t want semicolons, because they may not even be done writing that statement.
+        if (withSemicolon === 0 && withoutSemicolon <= 1) {
+            return true;
+        }
+        // If even 2/5 places have a semicolon, the user probably wants semicolons
+        return withSemicolon / withoutSemicolon > 1 / nStatementsToObserve;
+    }
+    ts.probablyUsesSemicolons = probablyUsesSemicolons;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
     function createClassifier() {
-        var scanner = ts.createScanner(7 /* Latest */, /*skipTrivia*/ false);
+        var scanner = ts.createScanner(99 /* Latest */, /*skipTrivia*/ false);
         function getClassificationsForLine(text, lexState, syntacticClassifierAbsent) {
             return convertClassificationsToResult(getEncodedLexicalClassifications(text, lexState, syntacticClassifierAbsent), text);
         }
@@ -97183,13 +100188,13 @@ var ts;
             function handleToken() {
                 switch (token) {
                     case 42 /* SlashToken */:
-                    case 64 /* SlashEqualsToken */:
+                    case 65 /* SlashEqualsToken */:
                         if (!noRegexTable[lastNonTriviaToken] && scanner.reScanSlashToken() === 13 /* RegularExpressionLiteral */) {
                             token = 13 /* RegularExpressionLiteral */;
                         }
                         break;
                     case 28 /* LessThanToken */:
-                        if (lastNonTriviaToken === 72 /* Identifier */) {
+                        if (lastNonTriviaToken === 73 /* Identifier */) {
                             // Could be the start of something generic.  Keep track of that by bumping
                             // up the current count of generic contexts we may be in.
                             angleBracketStack++;
@@ -97202,16 +100207,16 @@ var ts;
                             angleBracketStack--;
                         }
                         break;
-                    case 120 /* AnyKeyword */:
-                    case 138 /* StringKeyword */:
-                    case 135 /* NumberKeyword */:
-                    case 123 /* BooleanKeyword */:
-                    case 139 /* SymbolKeyword */:
+                    case 121 /* AnyKeyword */:
+                    case 139 /* StringKeyword */:
+                    case 136 /* NumberKeyword */:
+                    case 124 /* BooleanKeyword */:
+                    case 140 /* SymbolKeyword */:
                         if (angleBracketStack > 0 && !syntacticClassifierAbsent) {
                             // If it looks like we're could be in something generic, don't classify this
                             // as a keyword.  We may just get overwritten by the syntactic classifier,
                             // causing a noisy experience for the user.
-                            token = 72 /* Identifier */;
+                            token = 73 /* Identifier */;
                         }
                         break;
                     case 15 /* TemplateHead */:
@@ -97250,14 +100255,14 @@ var ts;
                             break;
                         }
                         if (lastNonTriviaToken === 24 /* DotToken */) {
-                            token = 72 /* Identifier */;
+                            token = 73 /* Identifier */;
                         }
                         else if (ts.isKeyword(lastNonTriviaToken) && ts.isKeyword(token) && !canFollow(lastNonTriviaToken, token)) {
                             // We have two keywords in a row.  Only treat the second as a keyword if
                             // it's a sequence that could legally occur in the language.  Otherwise
                             // treat it as an identifier.  This way, if someone writes "private var"
                             // we recognize that 'var' is actually an identifier here.
-                            token = 72 /* Identifier */;
+                            token = 73 /* Identifier */;
                         }
                 }
             }
@@ -97271,19 +100276,19 @@ var ts;
     /// we have a series of divide operator. this list allows us to be more accurate by ruling out
     /// locations where a regexp cannot exist.
     var noRegexTable = ts.arrayToNumericMap([
-        72 /* Identifier */,
+        73 /* Identifier */,
         10 /* StringLiteral */,
         8 /* NumericLiteral */,
         9 /* BigIntLiteral */,
         13 /* RegularExpressionLiteral */,
-        100 /* ThisKeyword */,
+        101 /* ThisKeyword */,
         44 /* PlusPlusToken */,
         45 /* MinusMinusToken */,
         21 /* CloseParenToken */,
         23 /* CloseBracketToken */,
         19 /* CloseBraceToken */,
-        102 /* TrueKeyword */,
-        87 /* FalseKeyword */,
+        103 /* TrueKeyword */,
+        88 /* FalseKeyword */,
     ], function (token) { return token; }, function () { return true; });
     function getNewEndOfLineState(scanner, token, lastOnTemplateStack) {
         switch (token) {
@@ -97395,10 +100400,10 @@ var ts;
             return true;
         }
         switch (keyword2) {
-            case 126 /* GetKeyword */:
-            case 137 /* SetKeyword */:
-            case 124 /* ConstructorKeyword */:
-            case 116 /* StaticKeyword */:
+            case 127 /* GetKeyword */:
+            case 138 /* SetKeyword */:
+            case 125 /* ConstructorKeyword */:
+            case 117 /* StaticKeyword */:
                 return true; // Allow things like "public get", "public constructor" and "public static".
             default:
                 return false; // Any other keyword following "public" is actually an identifier, not a real keyword.
@@ -97443,9 +100448,9 @@ var ts;
             case 30 /* GreaterThanToken */:
             case 31 /* LessThanEqualsToken */:
             case 32 /* GreaterThanEqualsToken */:
-            case 94 /* InstanceOfKeyword */:
-            case 93 /* InKeyword */:
-            case 119 /* AsKeyword */:
+            case 95 /* InstanceOfKeyword */:
+            case 94 /* InKeyword */:
+            case 120 /* AsKeyword */:
             case 33 /* EqualsEqualsToken */:
             case 34 /* ExclamationEqualsToken */:
             case 35 /* EqualsEqualsEqualsToken */:
@@ -97455,18 +100460,18 @@ var ts;
             case 50 /* BarToken */:
             case 54 /* AmpersandAmpersandToken */:
             case 55 /* BarBarToken */:
-            case 70 /* BarEqualsToken */:
-            case 69 /* AmpersandEqualsToken */:
-            case 71 /* CaretEqualsToken */:
-            case 66 /* LessThanLessThanEqualsToken */:
-            case 67 /* GreaterThanGreaterThanEqualsToken */:
-            case 68 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
-            case 60 /* PlusEqualsToken */:
-            case 61 /* MinusEqualsToken */:
-            case 62 /* AsteriskEqualsToken */:
-            case 64 /* SlashEqualsToken */:
-            case 65 /* PercentEqualsToken */:
-            case 59 /* EqualsToken */:
+            case 71 /* BarEqualsToken */:
+            case 70 /* AmpersandEqualsToken */:
+            case 72 /* CaretEqualsToken */:
+            case 67 /* LessThanLessThanEqualsToken */:
+            case 68 /* GreaterThanGreaterThanEqualsToken */:
+            case 69 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
+            case 61 /* PlusEqualsToken */:
+            case 62 /* MinusEqualsToken */:
+            case 63 /* AsteriskEqualsToken */:
+            case 65 /* SlashEqualsToken */:
+            case 66 /* PercentEqualsToken */:
+            case 60 /* EqualsToken */:
             case 27 /* CommaToken */:
                 return true;
             default:
@@ -97493,7 +100498,7 @@ var ts;
         else if (isBinaryExpressionOperatorToken(token) || isPrefixUnaryExpressionOperatorToken(token)) {
             return 5 /* operator */;
         }
-        else if (token >= 18 /* FirstPunctuation */ && token <= 71 /* LastPunctuation */) {
+        else if (token >= 18 /* FirstPunctuation */ && token <= 72 /* LastPunctuation */) {
             return 10 /* punctuation */;
         }
         switch (token) {
@@ -97512,7 +100517,7 @@ var ts;
             case 5 /* WhitespaceTrivia */:
             case 4 /* NewLineTrivia */:
                 return 8 /* whiteSpace */;
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
             default:
                 if (ts.isTemplateLiteralKind(token)) {
                     return 6 /* stringLiteral */;
@@ -97537,10 +100542,10 @@ var ts;
         // That means we're calling back into the host around every 1.2k of the file we process.
         // Lib.d.ts has similar numbers.
         switch (kind) {
-            case 244 /* ModuleDeclaration */:
-            case 240 /* ClassDeclaration */:
-            case 241 /* InterfaceDeclaration */:
-            case 239 /* FunctionDeclaration */:
+            case 245 /* ModuleDeclaration */:
+            case 241 /* ClassDeclaration */:
+            case 242 /* InterfaceDeclaration */:
+            case 240 /* FunctionDeclaration */:
                 cancellationToken.throwIfCancellationRequested();
         }
     }
@@ -97660,8 +100665,8 @@ var ts;
         var spanStart = span.start;
         var spanLength = span.length;
         // Make a scanner we can get trivia from.
-        var triviaScanner = ts.createScanner(7 /* Latest */, /*skipTrivia*/ false, sourceFile.languageVariant, sourceFile.text);
-        var mergeConflictScanner = ts.createScanner(7 /* Latest */, /*skipTrivia*/ false, sourceFile.languageVariant, sourceFile.text);
+        var triviaScanner = ts.createScanner(99 /* Latest */, /*skipTrivia*/ false, sourceFile.languageVariant, sourceFile.text);
+        var mergeConflictScanner = ts.createScanner(99 /* Latest */, /*skipTrivia*/ false, sourceFile.languageVariant, sourceFile.text);
         var result = [];
         processElement(sourceFile);
         return { spans: result, endOfLineState: 0 /* None */ };
@@ -97753,18 +100758,18 @@ var ts;
                     pushClassification(tag.tagName.pos, tag.tagName.end - tag.tagName.pos, 18 /* docCommentTagName */); // e.g. "param"
                     pos = tag.tagName.end;
                     switch (tag.kind) {
-                        case 304 /* JSDocParameterTag */:
+                        case 306 /* JSDocParameterTag */:
                             processJSDocParameterTag(tag);
                             break;
-                        case 308 /* JSDocTemplateTag */:
+                        case 310 /* JSDocTemplateTag */:
                             processJSDocTemplateTag(tag);
                             pos = tag.end;
                             break;
-                        case 307 /* JSDocTypeTag */:
+                        case 309 /* JSDocTypeTag */:
                             processElement(tag.typeExpression);
                             pos = tag.end;
                             break;
-                        case 305 /* JSDocReturnTag */:
+                        case 307 /* JSDocReturnTag */:
                             processElement(tag.typeExpression);
                             pos = tag.end;
                             break;
@@ -97851,22 +100856,22 @@ var ts;
         }
         function tryClassifyJsxElementName(token) {
             switch (token.parent && token.parent.kind) {
-                case 262 /* JsxOpeningElement */:
+                case 263 /* JsxOpeningElement */:
                     if (token.parent.tagName === token) {
                         return 19 /* jsxOpenTagName */;
                     }
                     break;
-                case 263 /* JsxClosingElement */:
+                case 264 /* JsxClosingElement */:
                     if (token.parent.tagName === token) {
                         return 20 /* jsxCloseTagName */;
                     }
                     break;
-                case 261 /* JsxSelfClosingElement */:
+                case 262 /* JsxSelfClosingElement */:
                     if (token.parent.tagName === token) {
                         return 21 /* jsxSelfClosingTagName */;
                     }
                     break;
-                case 267 /* JsxAttribute */:
+                case 268 /* JsxAttribute */:
                     if (token.parent.name === token) {
                         return 22 /* jsxAttribute */;
                     }
@@ -97893,19 +100898,19 @@ var ts;
             if (ts.isPunctuation(tokenKind)) {
                 if (token) {
                     var parent = token.parent;
-                    if (tokenKind === 59 /* EqualsToken */) {
+                    if (tokenKind === 60 /* EqualsToken */) {
                         // the '=' in a variable declaration is special cased here.
-                        if (parent.kind === 237 /* VariableDeclaration */ ||
-                            parent.kind === 154 /* PropertyDeclaration */ ||
-                            parent.kind === 151 /* Parameter */ ||
-                            parent.kind === 267 /* JsxAttribute */) {
+                        if (parent.kind === 238 /* VariableDeclaration */ ||
+                            parent.kind === 155 /* PropertyDeclaration */ ||
+                            parent.kind === 152 /* Parameter */ ||
+                            parent.kind === 268 /* JsxAttribute */) {
                             return 5 /* operator */;
                         }
                     }
-                    if (parent.kind === 204 /* BinaryExpression */ ||
-                        parent.kind === 202 /* PrefixUnaryExpression */ ||
-                        parent.kind === 203 /* PostfixUnaryExpression */ ||
-                        parent.kind === 205 /* ConditionalExpression */) {
+                    if (parent.kind === 205 /* BinaryExpression */ ||
+                        parent.kind === 203 /* PrefixUnaryExpression */ ||
+                        parent.kind === 204 /* PostfixUnaryExpression */ ||
+                        parent.kind === 206 /* ConditionalExpression */) {
                         return 5 /* operator */;
                     }
                 }
@@ -97919,7 +100924,7 @@ var ts;
             }
             else if (tokenKind === 10 /* StringLiteral */) {
                 // TODO: GH#18217
-                return token.parent.kind === 267 /* JsxAttribute */ ? 24 /* jsxAttributeStringLiteralValue */ : 6 /* stringLiteral */;
+                return token.parent.kind === 268 /* JsxAttribute */ ? 24 /* jsxAttributeStringLiteralValue */ : 6 /* stringLiteral */;
             }
             else if (tokenKind === 13 /* RegularExpressionLiteral */) {
                 // TODO: we should get another classification type for these literals.
@@ -97932,35 +100937,35 @@ var ts;
             else if (tokenKind === 11 /* JsxText */) {
                 return 23 /* jsxText */;
             }
-            else if (tokenKind === 72 /* Identifier */) {
+            else if (tokenKind === 73 /* Identifier */) {
                 if (token) {
                     switch (token.parent.kind) {
-                        case 240 /* ClassDeclaration */:
+                        case 241 /* ClassDeclaration */:
                             if (token.parent.name === token) {
                                 return 11 /* className */;
                             }
                             return;
-                        case 150 /* TypeParameter */:
+                        case 151 /* TypeParameter */:
                             if (token.parent.name === token) {
                                 return 15 /* typeParameterName */;
                             }
                             return;
-                        case 241 /* InterfaceDeclaration */:
+                        case 242 /* InterfaceDeclaration */:
                             if (token.parent.name === token) {
                                 return 13 /* interfaceName */;
                             }
                             return;
-                        case 243 /* EnumDeclaration */:
+                        case 244 /* EnumDeclaration */:
                             if (token.parent.name === token) {
                                 return 12 /* enumName */;
                             }
                             return;
-                        case 244 /* ModuleDeclaration */:
+                        case 245 /* ModuleDeclaration */:
                             if (token.parent.name === token) {
                                 return 14 /* moduleName */;
                             }
                             return;
-                        case 151 /* Parameter */:
+                        case 152 /* Parameter */:
                             if (token.parent.name === token) {
                                 return ts.isThisIdentifier(token) ? 3 /* keyword */ : 17 /* parameterName */;
                             }
@@ -98017,7 +101022,7 @@ var ts;
                         return convertPathCompletions(completion.paths);
                     case 1 /* Properties */: {
                         var entries = [];
-                        Completions.getCompletionEntriesFromSymbols(completion.symbols, entries, sourceFile, sourceFile, checker, 7 /* ESNext */, log, 4 /* String */, preferences); // Target will not be used, so arbitrary
+                        Completions.getCompletionEntriesFromSymbols(completion.symbols, entries, sourceFile, sourceFile, checker, 99 /* ESNext */, log, 4 /* String */, preferences); // Target will not be used, so arbitrary
                         return { isGlobalCompletion: false, isMemberCompletion: true, isNewIdentifierLocation: completion.hasIndexSignature, entries: entries };
                     }
                     case 2 /* Types */: {
@@ -98056,7 +101061,7 @@ var ts;
                 var isNewIdentifierLocation = true; // The user may type in a path that doesn't yet exist, creating a "new identifier" with respect to the collection of identifiers the server is aware of.
                 var entries = pathCompletions.map(function (_a) {
                     var name = _a.name, kind = _a.kind, span = _a.span, extension = _a.extension;
-                    return ({ name: name, kind: kind, kindModifiers: kindModifiersFromExtension(extension), sortText: "0", replacementSpan: span });
+                    return ({ name: name, kind: kind, kindModifiers: kindModifiersFromExtension(extension), sortText: Completions.SortText.LocationPriority, replacementSpan: span });
                 });
                 return { isGlobalCompletion: isGlobalCompletion, isMemberCompletion: false, isNewIdentifierLocation: isNewIdentifierLocation, entries: entries };
             }
@@ -98083,11 +101088,11 @@ var ts;
             function getStringLiteralCompletionEntries(sourceFile, node, position, typeChecker, compilerOptions, host) {
                 var parent = node.parent;
                 switch (parent.kind) {
-                    case 182 /* LiteralType */:
+                    case 183 /* LiteralType */:
                         switch (parent.parent.kind) {
-                            case 164 /* TypeReference */:
+                            case 165 /* TypeReference */:
                                 return { kind: 2 /* Types */, types: getStringLiteralTypes(typeChecker.getTypeArgumentConstraint(parent)), isNewIdentifier: false };
-                            case 180 /* IndexedAccessType */:
+                            case 181 /* IndexedAccessType */:
                                 // Get all apparent property names
                                 // i.e. interface Foo {
                                 //          foo: string;
@@ -98095,9 +101100,9 @@ var ts;
                                 //      }
                                 //      let x: Foo["/*completion position*/"]
                                 return stringLiteralCompletionsFromProperties(typeChecker.getTypeFromTypeNode(parent.parent.objectType));
-                            case 183 /* ImportType */:
+                            case 184 /* ImportType */:
                                 return { kind: 0 /* Paths */, paths: getStringLiteralCompletionsFromModuleNames(sourceFile, node, compilerOptions, host, typeChecker) };
-                            case 173 /* UnionType */: {
+                            case 174 /* UnionType */: {
                                 if (!ts.isTypeReferenceNode(parent.parent.parent))
                                     return undefined;
                                 var alreadyUsedTypes_1 = getAlreadyUsedTypesInStringLiteralUnion(parent.parent, parent);
@@ -98107,7 +101112,7 @@ var ts;
                             default:
                                 return undefined;
                         }
-                    case 275 /* PropertyAssignment */:
+                    case 276 /* PropertyAssignment */:
                         if (ts.isObjectLiteralExpression(parent.parent) && parent.name === node) {
                             // Get quoted name of properties of the object literal expression
                             // i.e. interface ConfigFiles {
@@ -98124,7 +101129,7 @@ var ts;
                             return stringLiteralCompletionsFromProperties(typeChecker.getContextualType(parent.parent));
                         }
                         return fromContextualType();
-                    case 190 /* ElementAccessExpression */: {
+                    case 191 /* ElementAccessExpression */: {
                         var _a = parent, expression = _a.expression, argumentExpression = _a.argumentExpression;
                         if (node === argumentExpression) {
                             // Get all names of properties on the expression
@@ -98137,8 +101142,8 @@ var ts;
                         }
                         return undefined;
                     }
-                    case 191 /* CallExpression */:
-                    case 192 /* NewExpression */:
+                    case 192 /* CallExpression */:
+                    case 193 /* NewExpression */:
                         if (!ts.isRequireCall(parent, /*checkArgumentIsStringLiteralLike*/ false) && !ts.isImportCall(parent)) {
                             var argumentInfo = ts.SignatureHelp.getArgumentInfoForCompletions(node, position, sourceFile);
                             // Get string literal completions from specialized signatures of the target
@@ -98147,9 +101152,9 @@ var ts;
                             return argumentInfo ? getStringLiteralCompletionsFromSignature(argumentInfo, typeChecker) : fromContextualType();
                         }
                     // falls through (is `require("")` or `import("")`)
-                    case 249 /* ImportDeclaration */:
-                    case 255 /* ExportDeclaration */:
-                    case 259 /* ExternalModuleReference */:
+                    case 250 /* ImportDeclaration */:
+                    case 256 /* ExportDeclaration */:
+                    case 260 /* ExternalModuleReference */:
                         // Get all known external module names or complete a path to a module
                         // i.e. import * as ns from "/*completion position*/";
                         //      var y = import("/*completion position*/");
@@ -98596,7 +101601,7 @@ var ts;
                 var offset = index !== -1 ? index + 1 : 0;
                 // If the range is an identifier, span is unnecessary.
                 var length = text.length - offset;
-                return length === 0 || ts.isIdentifierText(text.substr(offset, length), 7 /* ESNext */) ? undefined : ts.createTextSpan(textStart + offset, length);
+                return length === 0 || ts.isIdentifierText(text.substr(offset, length), 99 /* ESNext */) ? undefined : ts.createTextSpan(textStart + offset, length);
             }
             // Returns true if the path is explicitly relative to the script (i.e. relative to . or ..)
             function isPathRelativeToScript(path) {
@@ -98659,6 +101664,14 @@ var ts;
 (function (ts) {
     var Completions;
     (function (Completions) {
+        var SortText;
+        (function (SortText) {
+            SortText["LocationPriority"] = "0";
+            SortText["SuggestedClassMembers"] = "1";
+            SortText["GlobalsOrKeywords"] = "2";
+            SortText["AutoImportSuggestions"] = "3";
+            SortText["JavascriptIdentifiers"] = "4";
+        })(SortText = Completions.SortText || (Completions.SortText = {}));
         var SymbolOriginInfoKind;
         (function (SymbolOriginInfoKind) {
             SymbolOriginInfoKind[SymbolOriginInfoKind["ThisType"] = 0] = "ThisType";
@@ -98680,7 +101693,9 @@ var ts;
             KeywordCompletionFilters[KeywordCompletionFilters["InterfaceElementKeywords"] = 3] = "InterfaceElementKeywords";
             KeywordCompletionFilters[KeywordCompletionFilters["ConstructorParameterKeywords"] = 4] = "ConstructorParameterKeywords";
             KeywordCompletionFilters[KeywordCompletionFilters["FunctionLikeBodyKeywords"] = 5] = "FunctionLikeBodyKeywords";
-            KeywordCompletionFilters[KeywordCompletionFilters["TypeKeywords"] = 6] = "TypeKeywords";
+            KeywordCompletionFilters[KeywordCompletionFilters["TypeAssertionKeywords"] = 6] = "TypeAssertionKeywords";
+            KeywordCompletionFilters[KeywordCompletionFilters["TypeKeywords"] = 7] = "TypeKeywords";
+            KeywordCompletionFilters[KeywordCompletionFilters["Last"] = 7] = "Last";
         })(KeywordCompletionFilters || (KeywordCompletionFilters = {}));
         var GlobalsSearch;
         (function (GlobalsSearch) {
@@ -98692,14 +101707,15 @@ var ts;
             var typeChecker = program.getTypeChecker();
             var compilerOptions = program.getCompilerOptions();
             var contextToken = ts.findPrecedingToken(position, sourceFile);
-            if (triggerCharacter && !isValidTrigger(sourceFile, triggerCharacter, contextToken, position))
+            if (triggerCharacter && !ts.isInString(sourceFile, position, contextToken) && !isValidTrigger(sourceFile, triggerCharacter, contextToken, position)) {
                 return undefined;
+            }
             var stringCompletions = Completions.StringCompletions.getStringLiteralCompletions(sourceFile, position, contextToken, typeChecker, compilerOptions, host, log, preferences);
             if (stringCompletions) {
                 return stringCompletions;
             }
             if (contextToken && ts.isBreakOrContinueStatement(contextToken.parent)
-                && (contextToken.kind === 73 /* BreakKeyword */ || contextToken.kind === 78 /* ContinueKeyword */ || contextToken.kind === 72 /* Identifier */)) {
+                && (contextToken.kind === 74 /* BreakKeyword */ || contextToken.kind === 79 /* ContinueKeyword */ || contextToken.kind === 73 /* Identifier */)) {
                 return getLabelCompletionAtPosition(contextToken.parent);
             }
             var completionData = getCompletionData(program, log, sourceFile, isUncheckedFile(sourceFile, compilerOptions), position, preferences, /*detailsEntryId*/ undefined);
@@ -98726,7 +101742,7 @@ var ts;
             return { isGlobalCompletion: false, isMemberCompletion: false, isNewIdentifierLocation: false, entries: entries };
         }
         function completionInfoFromData(sourceFile, typeChecker, compilerOptions, log, completionData, preferences) {
-            var symbols = completionData.symbols, completionKind = completionData.completionKind, isInSnippetScope = completionData.isInSnippetScope, isNewIdentifierLocation = completionData.isNewIdentifierLocation, location = completionData.location, propertyAccessToConvert = completionData.propertyAccessToConvert, keywordFilters = completionData.keywordFilters, literals = completionData.literals, symbolToOriginInfoMap = completionData.symbolToOriginInfoMap, recommendedCompletion = completionData.recommendedCompletion, isJsxInitializer = completionData.isJsxInitializer;
+            var symbols = completionData.symbols, completionKind = completionData.completionKind, isInSnippetScope = completionData.isInSnippetScope, isNewIdentifierLocation = completionData.isNewIdentifierLocation, location = completionData.location, propertyAccessToConvert = completionData.propertyAccessToConvert, keywordFilters = completionData.keywordFilters, literals = completionData.literals, symbolToOriginInfoMap = completionData.symbolToOriginInfoMap, recommendedCompletion = completionData.recommendedCompletion, isJsxInitializer = completionData.isJsxInitializer, insideJsDocTagTypeExpression = completionData.insideJsDocTagTypeExpression, symbolToSortTextMap = completionData.symbolToSortTextMap;
             if (location && location.parent && ts.isJsxClosingElement(location.parent)) {
                 // In the TypeScript JSX element, if such element is not defined. When users query for completion at closing tag,
                 // instead of simply giving unknown value, the completion will return the tag-name of an associated opening-element.
@@ -98740,24 +101756,24 @@ var ts;
                     name: tagName.getFullText(sourceFile) + (hasClosingAngleBracket ? "" : ">"),
                     kind: "class" /* classElement */,
                     kindModifiers: undefined,
-                    sortText: "0",
+                    sortText: SortText.LocationPriority,
                 };
                 return { isGlobalCompletion: false, isMemberCompletion: true, isNewIdentifierLocation: false, entries: [entry] };
             }
             var entries = [];
             if (isUncheckedFile(sourceFile, compilerOptions)) {
-                var uniqueNames = getCompletionEntriesFromSymbols(symbols, entries, location, sourceFile, typeChecker, compilerOptions.target, log, completionKind, preferences, propertyAccessToConvert, isJsxInitializer, recommendedCompletion, symbolToOriginInfoMap);
+                var uniqueNames = getCompletionEntriesFromSymbols(symbols, entries, location, sourceFile, typeChecker, compilerOptions.target, log, completionKind, preferences, propertyAccessToConvert, isJsxInitializer, recommendedCompletion, symbolToOriginInfoMap, symbolToSortTextMap);
                 getJSCompletionEntries(sourceFile, location.pos, uniqueNames, compilerOptions.target, entries); // TODO: GH#18217
             }
             else {
                 if (!isNewIdentifierLocation && (!symbols || symbols.length === 0) && keywordFilters === 0 /* None */) {
                     return undefined;
                 }
-                getCompletionEntriesFromSymbols(symbols, entries, location, sourceFile, typeChecker, compilerOptions.target, log, completionKind, preferences, propertyAccessToConvert, isJsxInitializer, recommendedCompletion, symbolToOriginInfoMap);
+                getCompletionEntriesFromSymbols(symbols, entries, location, sourceFile, typeChecker, compilerOptions.target, log, completionKind, preferences, propertyAccessToConvert, isJsxInitializer, recommendedCompletion, symbolToOriginInfoMap, symbolToSortTextMap);
             }
             if (keywordFilters !== 0 /* None */) {
                 var entryNames = ts.arrayToSet(entries, function (e) { return e.name; });
-                for (var _i = 0, _a = getKeywordCompletions(keywordFilters); _i < _a.length; _i++) {
+                for (var _i = 0, _a = getKeywordCompletions(keywordFilters, !insideJsDocTagTypeExpression && ts.isSourceFileJS(sourceFile)); _i < _a.length; _i++) {
                     var keywordEntry = _a[_i];
                     if (!entryNames.has(keywordEntry.name)) {
                         entries.push(keywordEntry);
@@ -98795,7 +101811,7 @@ var ts;
                         name: realName,
                         kind: "warning" /* warning */,
                         kindModifiers: "",
-                        sortText: "1"
+                        sortText: SortText.JavascriptIdentifiers
                     });
                 }
             });
@@ -98804,14 +101820,9 @@ var ts;
             return typeof literal === "object" ? ts.pseudoBigIntToString(literal) + "n" : JSON.stringify(literal);
         };
         function createCompletionEntryForLiteral(literal) {
-            return { name: completionNameForLiteral(literal), kind: "string" /* string */, kindModifiers: "" /* none */, sortText: "0" };
+            return { name: completionNameForLiteral(literal), kind: "string" /* string */, kindModifiers: "" /* none */, sortText: SortText.LocationPriority };
         }
-        function createCompletionEntry(symbol, location, sourceFile, typeChecker, target, kind, origin, recommendedCompletion, propertyAccessToConvert, isJsxInitializer, preferences) {
-            var info = getCompletionEntryDisplayNameForSymbol(symbol, target, origin, kind);
-            if (!info) {
-                return undefined;
-            }
-            var name = info.name, needsConvertPropertyAccess = info.needsConvertPropertyAccess;
+        function createCompletionEntry(symbol, sortText, location, sourceFile, typeChecker, name, needsConvertPropertyAccess, origin, recommendedCompletion, propertyAccessToConvert, isJsxInitializer, preferences) {
             var insertText;
             var replacementSpan;
             if (origin && origin.kind === 0 /* ThisType */) {
@@ -98848,7 +101859,7 @@ var ts;
                 name: name,
                 kind: ts.SymbolDisplay.getSymbolKind(typeChecker, symbol, location),
                 kindModifiers: ts.SymbolDisplay.getSymbolModifiers(symbol),
-                sortText: "0",
+                sortText: sortText,
                 source: getSourceFromOrigin(origin),
                 hasAction: trueOrUndefined(!!origin && originIsExport(origin)),
                 isRecommended: trueOrUndefined(isRecommendedCompletionMatch(symbol, recommendedCompletion, typeChecker)),
@@ -98866,7 +101877,7 @@ var ts;
         function getSourceFromOrigin(origin) {
             return origin && originIsExport(origin) ? ts.stripQuotes(origin.moduleSymbol.name) : undefined;
         }
-        function getCompletionEntriesFromSymbols(symbols, entries, location, sourceFile, typeChecker, target, log, kind, preferences, propertyAccessToConvert, isJsxInitializer, recommendedCompletion, symbolToOriginInfoMap) {
+        function getCompletionEntriesFromSymbols(symbols, entries, location, sourceFile, typeChecker, target, log, kind, preferences, propertyAccessToConvert, isJsxInitializer, recommendedCompletion, symbolToOriginInfoMap, symbolToSortTextMap) {
             var start = ts.timestamp();
             // Tracks unique names.
             // We don't set this for global variables or completions from external module exports, because we can have multiple of those.
@@ -98876,14 +101887,18 @@ var ts;
             for (var _i = 0, symbols_1 = symbols; _i < symbols_1.length; _i++) {
                 var symbol = symbols_1[_i];
                 var origin = symbolToOriginInfoMap ? symbolToOriginInfoMap[ts.getSymbolId(symbol)] : undefined;
-                var entry = createCompletionEntry(symbol, location, sourceFile, typeChecker, target, kind, origin, recommendedCompletion, propertyAccessToConvert, isJsxInitializer, preferences);
-                if (!entry) {
+                var info = getCompletionEntryDisplayNameForSymbol(symbol, target, origin, kind);
+                if (!info) {
                     continue;
                 }
-                var name = entry.name;
+                var name = info.name, needsConvertPropertyAccess = info.needsConvertPropertyAccess;
                 if (uniques.has(name)) {
                     continue;
                 }
+                var entry = createCompletionEntry(symbol, symbolToSortTextMap && symbolToSortTextMap[ts.getSymbolId(symbol)] || SortText.LocationPriority, location, sourceFile, typeChecker, name, needsConvertPropertyAccess, origin, recommendedCompletion, propertyAccessToConvert, isJsxInitializer, preferences);
+                if (!entry) {
+                    continue;
+                }
                 // Latter case tests whether this is a global variable.
                 if (!origin && !(symbol.parent === undefined && !ts.some(symbol.declarations, function (d) { return d.getSourceFile() === location.getSourceFile(); }))) { // TODO: GH#18217
                     uniques.set(name, true);
@@ -98916,7 +101931,7 @@ var ts;
                             name: name,
                             kindModifiers: "" /* none */,
                             kind: "label" /* label */,
-                            sortText: "0"
+                            sortText: SortText.LocationPriority
                         });
                     }
                 }
@@ -99056,25 +102071,25 @@ var ts;
         function getContextualType(previousToken, position, sourceFile, checker) {
             var parent = previousToken.parent;
             switch (previousToken.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return ts.getContextualTypeFromParent(previousToken, checker);
-                case 59 /* EqualsToken */:
+                case 60 /* EqualsToken */:
                     switch (parent.kind) {
-                        case 237 /* VariableDeclaration */:
+                        case 238 /* VariableDeclaration */:
                             return checker.getContextualType(parent.initializer); // TODO: GH#18217
-                        case 204 /* BinaryExpression */:
+                        case 205 /* BinaryExpression */:
                             return checker.getTypeAtLocation(parent.left);
-                        case 267 /* JsxAttribute */:
+                        case 268 /* JsxAttribute */:
                             return checker.getContextualTypeForJsxAttribute(parent);
                         default:
                             return undefined;
                     }
-                case 95 /* NewKeyword */:
+                case 96 /* NewKeyword */:
                     return checker.getContextualType(parent);
-                case 74 /* CaseKeyword */:
+                case 75 /* CaseKeyword */:
                     return ts.getSwitchedType(ts.cast(parent, ts.isCaseClause), checker);
                 case 18 /* OpenBraceToken */:
-                    return ts.isJsxExpression(parent) && parent.parent.kind !== 260 /* JsxElement */ ? checker.getContextualTypeForJsxAttribute(parent.parent) : undefined;
+                    return ts.isJsxExpression(parent) && parent.parent.kind !== 261 /* JsxElement */ ? checker.getContextualTypeForJsxAttribute(parent.parent) : undefined;
                 default:
                     var argInfo = ts.SignatureHelp.getArgumentInfoForCompletions(previousToken, position, sourceFile);
                     return argInfo
@@ -99093,7 +102108,7 @@ var ts;
             return symbol.parent && (isModuleSymbol(symbol.parent) ? symbol : getFirstSymbolInChain(symbol.parent, enclosingDeclaration, checker));
         }
         function isModuleSymbol(symbol) {
-            return symbol.declarations.some(function (d) { return d.kind === 284 /* SourceFile */; });
+            return symbol.declarations.some(function (d) { return d.kind === 285 /* SourceFile */; });
         }
         function getCompletionData(program, log, sourceFile, isUncheckedFile, position, preferences, detailsEntryId) {
             var typeChecker = program.getTypeChecker();
@@ -99144,11 +102159,11 @@ var ts;
                     if (tag.tagName.pos <= position && position <= tag.tagName.end) {
                         return { kind: 1 /* JsDocTagName */ };
                     }
-                    if (isTagWithTypeExpression(tag) && tag.typeExpression && tag.typeExpression.kind === 288 /* JSDocTypeExpression */) {
+                    if (isTagWithTypeExpression(tag) && tag.typeExpression && tag.typeExpression.kind === 289 /* JSDocTypeExpression */) {
                         currentToken = ts.getTokenAtPosition(sourceFile, position);
                         if (!currentToken ||
                             (!ts.isDeclarationName(currentToken) &&
-                                (currentToken.parent.kind !== 310 /* JSDocPropertyTag */ ||
+                                (currentToken.parent.kind !== 312 /* JSDocPropertyTag */ ||
                                     currentToken.parent.name !== currentToken))) {
                             // Use as type location if inside tag's type expression
                             insideJsDocTagTypeExpression = isCurrentlyEditingNode(tag.typeExpression);
@@ -99198,18 +102213,26 @@ var ts;
                 if (contextToken.kind === 24 /* DotToken */) {
                     isRightOfDot = true;
                     switch (parent.kind) {
-                        case 189 /* PropertyAccessExpression */:
+                        case 190 /* PropertyAccessExpression */:
                             propertyAccessToConvert = parent;
                             node = propertyAccessToConvert.expression;
+                            if (node.end === contextToken.pos &&
+                                ts.isCallExpression(node) &&
+                                node.getChildCount(sourceFile) &&
+                                ts.last(node.getChildren(sourceFile)).kind !== 21 /* CloseParenToken */) {
+                                // This is likely dot from incorrectly parsed call expression and user is starting to write spread
+                                // eg: Math.min(./**/)
+                                return undefined;
+                            }
                             break;
-                        case 148 /* QualifiedName */:
+                        case 149 /* QualifiedName */:
                             node = parent.left;
                             break;
-                        case 244 /* ModuleDeclaration */:
+                        case 245 /* ModuleDeclaration */:
                             node = parent.name;
                             break;
-                        case 183 /* ImportType */:
-                        case 214 /* MetaProperty */:
+                        case 184 /* ImportType */:
+                        case 215 /* MetaProperty */:
                             node = parent;
                             break;
                         default:
@@ -99222,7 +102245,7 @@ var ts;
                     // <UI.Test /* completion position */ />
                     // If the tagname is a property access expression, we will then walk up to the top most of property access expression.
                     // Then, try to get a JSX container and its associated attributes type.
-                    if (parent && parent.kind === 189 /* PropertyAccessExpression */) {
+                    if (parent && parent.kind === 190 /* PropertyAccessExpression */) {
                         contextToken = parent;
                         parent = parent.parent;
                     }
@@ -99230,48 +102253,48 @@ var ts;
                     if (currentToken.parent === location) {
                         switch (currentToken.kind) {
                             case 30 /* GreaterThanToken */:
-                                if (currentToken.parent.kind === 260 /* JsxElement */ || currentToken.parent.kind === 262 /* JsxOpeningElement */) {
+                                if (currentToken.parent.kind === 261 /* JsxElement */ || currentToken.parent.kind === 263 /* JsxOpeningElement */) {
                                     location = currentToken;
                                 }
                                 break;
                             case 42 /* SlashToken */:
-                                if (currentToken.parent.kind === 261 /* JsxSelfClosingElement */) {
+                                if (currentToken.parent.kind === 262 /* JsxSelfClosingElement */) {
                                     location = currentToken;
                                 }
                                 break;
                         }
                     }
                     switch (parent.kind) {
-                        case 263 /* JsxClosingElement */:
+                        case 264 /* JsxClosingElement */:
                             if (contextToken.kind === 42 /* SlashToken */) {
                                 isStartingCloseTag = true;
                                 location = contextToken;
                             }
                             break;
-                        case 204 /* BinaryExpression */:
+                        case 205 /* BinaryExpression */:
                             if (!binaryExpressionMayBeOpenTag(parent)) {
                                 break;
                             }
                         // falls through
-                        case 261 /* JsxSelfClosingElement */:
-                        case 260 /* JsxElement */:
-                        case 262 /* JsxOpeningElement */:
+                        case 262 /* JsxSelfClosingElement */:
+                        case 261 /* JsxElement */:
+                        case 263 /* JsxOpeningElement */:
                             if (contextToken.kind === 28 /* LessThanToken */) {
                                 isRightOfOpenTag = true;
                                 location = contextToken;
                             }
                             break;
-                        case 267 /* JsxAttribute */:
+                        case 268 /* JsxAttribute */:
                             switch (previousToken.kind) {
-                                case 59 /* EqualsToken */:
+                                case 60 /* EqualsToken */:
                                     isJsxInitializer = true;
                                     break;
-                                case 72 /* Identifier */:
+                                case 73 /* Identifier */:
                                     // For `<div x=[|f/**/|]`, `parent` will be `x` and `previousToken.parent` will be `f` (which is its own JsxAttribute)
                                     // Note for `<div someBool f>` we don't want to treat this as a jsx inializer, instead it's the attribute name.
                                     if (parent !== previousToken.parent &&
                                         !parent.initializer &&
-                                        ts.findChildOfKind(parent, 59 /* EqualsToken */, sourceFile)) {
+                                        ts.findChildOfKind(parent, 60 /* EqualsToken */, sourceFile)) {
                                         isJsxInitializer = previousToken;
                                     }
                             }
@@ -99285,6 +102308,7 @@ var ts;
             var keywordFilters = 0 /* None */;
             var symbols = [];
             var symbolToOriginInfoMap = [];
+            var symbolToSortTextMap = [];
             if (isRightOfDot) {
                 getTypeScriptMemberSymbols();
             }
@@ -99316,14 +102340,30 @@ var ts;
             var contextualType = previousToken && getContextualType(previousToken, position, sourceFile, typeChecker);
             var literals = ts.mapDefined(contextualType && (contextualType.isUnion() ? contextualType.types : [contextualType]), function (t) { return t.isLiteral() ? t.value : undefined; });
             var recommendedCompletion = previousToken && contextualType && getRecommendedCompletion(previousToken, contextualType, typeChecker);
-            return { kind: 0 /* Data */, symbols: symbols, completionKind: completionKind, isInSnippetScope: isInSnippetScope, propertyAccessToConvert: propertyAccessToConvert, isNewIdentifierLocation: isNewIdentifierLocation, location: location, keywordFilters: keywordFilters, literals: literals, symbolToOriginInfoMap: symbolToOriginInfoMap, recommendedCompletion: recommendedCompletion, previousToken: previousToken, isJsxInitializer: isJsxInitializer };
+            return {
+                kind: 0 /* Data */,
+                symbols: symbols,
+                completionKind: completionKind,
+                isInSnippetScope: isInSnippetScope,
+                propertyAccessToConvert: propertyAccessToConvert,
+                isNewIdentifierLocation: isNewIdentifierLocation,
+                location: location,
+                keywordFilters: keywordFilters,
+                literals: literals,
+                symbolToOriginInfoMap: symbolToOriginInfoMap,
+                recommendedCompletion: recommendedCompletion,
+                previousToken: previousToken,
+                isJsxInitializer: isJsxInitializer,
+                insideJsDocTagTypeExpression: insideJsDocTagTypeExpression,
+                symbolToSortTextMap: symbolToSortTextMap
+            };
             function isTagWithTypeExpression(tag) {
                 switch (tag.kind) {
-                    case 304 /* JSDocParameterTag */:
-                    case 310 /* JSDocPropertyTag */:
-                    case 305 /* JSDocReturnTag */:
-                    case 307 /* JSDocTypeTag */:
-                    case 309 /* JSDocTypedefTag */:
+                    case 306 /* JSDocParameterTag */:
+                    case 312 /* JSDocPropertyTag */:
+                    case 307 /* JSDocReturnTag */:
+                    case 309 /* JSDocTypeTag */:
+                    case 311 /* JSDocTypedefTag */:
                         return true;
                     default:
                         return false;
@@ -99332,11 +102372,13 @@ var ts;
             function getTypeScriptMemberSymbols() {
                 // Right of dot member completion list
                 completionKind = 2 /* PropertyAccess */;
-                // Since this is qualified name check its a type node location
+                // Since this is qualified name check it's a type node location
                 var isImportType = ts.isLiteralImportTypeNode(node);
-                var isTypeLocation = insideJsDocTagTypeExpression || (isImportType && !node.isTypeOf) || ts.isPartOfTypeNode(node.parent);
+                var isTypeLocation = insideJsDocTagTypeExpression
+                    || (isImportType && !node.isTypeOf)
+                    || ts.isPartOfTypeNode(node.parent)
+                    || ts.isPossiblyTypeArgumentPosition(contextToken, sourceFile, typeChecker);
                 var isRhsOfImportDeclaration = ts.isInRightSideOfInternalImportEqualsDeclaration(node);
-                var allowTypeOrValue = isRhsOfImportDeclaration || (!isTypeLocation && ts.isPossiblyTypeArgumentPosition(contextToken, sourceFile, typeChecker));
                 if (ts.isEntityName(node) || isImportType) {
                     var isNamespaceName = ts.isModuleDeclaration(node.parent);
                     if (isNamespaceName)
@@ -99352,7 +102394,7 @@ var ts;
                             var isValidAccess = isNamespaceName
                                 // At `namespace N.M/**/`, if this is the only declaration of `M`, don't include `M` as a completion.
                                 ? function (symbol) { return !!(symbol.flags & 1920 /* Namespace */) && !symbol.declarations.every(function (d) { return d.parent === node.parent; }); }
-                                : allowTypeOrValue ?
+                                : isRhsOfImportDeclaration ?
                                     // Any kind is allowed when dotting off namespace in internal import equals declaration
                                     function (symbol) { return isValidTypeAccess_1(symbol) || isValidValueAccess_1(symbol); } :
                                     isTypeLocation ? isValidTypeAccess_1 : isValidValueAccess_1;
@@ -99363,15 +102405,17 @@ var ts;
                                 }
                             }
                             // If the module is merged with a value, we must get the type of the class and add its propertes (for inherited static methods).
-                            if (!isTypeLocation && symbol.declarations.some(function (d) { return d.kind !== 284 /* SourceFile */ && d.kind !== 244 /* ModuleDeclaration */ && d.kind !== 243 /* EnumDeclaration */; })) {
+                            if (!isTypeLocation &&
+                                symbol.declarations &&
+                                symbol.declarations.some(function (d) { return d.kind !== 285 /* SourceFile */ && d.kind !== 245 /* ModuleDeclaration */ && d.kind !== 244 /* EnumDeclaration */; })) {
                                 addTypeProperties(typeChecker.getTypeOfSymbolAtLocation(symbol, node));
                             }
                             return;
                         }
                     }
                 }
-                if (ts.isMetaProperty(node) && (node.keywordToken === 95 /* NewKeyword */ || node.keywordToken === 92 /* ImportKeyword */)) {
-                    var completion = (node.keywordToken === 95 /* NewKeyword */) ? "target" : "meta";
+                if (ts.isMetaProperty(node) && (node.keywordToken === 96 /* NewKeyword */ || node.keywordToken === 93 /* ImportKeyword */)) {
+                    var completion = (node.keywordToken === 96 /* NewKeyword */) ? "target" : "meta";
                     symbols.push(typeChecker.createSymbol(4 /* Property */, ts.escapeLeadingUnderscores(completion)));
                     return;
                 }
@@ -99392,7 +102436,7 @@ var ts;
                 else {
                     for (var _i = 0, _a = type.getApparentProperties(); _i < _a.length; _i++) {
                         var symbol = _a[_i];
-                        if (typeChecker.isValidPropertyAccessForCompletions(node.kind === 183 /* ImportType */ ? node : node.parent, type, symbol)) {
+                        if (typeChecker.isValidPropertyAccessForCompletions(node.kind === 184 /* ImportType */ ? node : node.parent, type, symbol)) {
                             addPropertySymbol(symbol);
                         }
                     }
@@ -99414,6 +102458,9 @@ var ts;
                         symbolToOriginInfoMap[ts.getSymbolId(firstAccessibleSymbol)] =
                             !moduleSymbol || !ts.isExternalModuleSymbol(moduleSymbol) ? { kind: 1 /* SymbolMemberNoExport */ } : { kind: 2 /* SymbolMemberExport */, moduleSymbol: moduleSymbol, isDefaultExport: false };
                     }
+                    else if (preferences.includeCompletionsWithInsertText) {
+                        symbols.push(symbol);
+                    }
                 }
                 else {
                     symbols.push(symbol);
@@ -99495,14 +102542,22 @@ var ts;
                 var isTypeOnly = isTypeOnlyCompletion();
                 var symbolMeanings = (isTypeOnly ? 0 /* None */ : 67220415 /* Value */) | 67897832 /* Type */ | 1920 /* Namespace */ | 2097152 /* Alias */;
                 symbols = ts.Debug.assertEachDefined(typeChecker.getSymbolsInScope(scopeNode, symbolMeanings), "getSymbolsInScope() should all be defined");
+                for (var _i = 0, symbols_2 = symbols; _i < symbols_2.length; _i++) {
+                    var symbol = symbols_2[_i];
+                    if (!typeChecker.isArgumentsSymbol(symbol) &&
+                        !ts.some(symbol.declarations, function (d) { return d.getSourceFile() === sourceFile; })) {
+                        symbolToSortTextMap[ts.getSymbolId(symbol)] = SortText.GlobalsOrKeywords;
+                    }
+                }
                 // Need to insert 'this.' before properties of `this` type, so only do that if `includeInsertTextCompletions`
-                if (preferences.includeCompletionsWithInsertText && scopeNode.kind !== 284 /* SourceFile */) {
+                if (preferences.includeCompletionsWithInsertText && scopeNode.kind !== 285 /* SourceFile */) {
                     var thisType = typeChecker.tryGetThisTypeAt(scopeNode, /*includeGlobalThis*/ false);
                     if (thisType) {
-                        for (var _i = 0, _a = getPropertiesForCompletion(thisType, typeChecker); _i < _a.length; _i++) {
-                            var symbol = _a[_i];
+                        for (var _a = 0, _b = getPropertiesForCompletion(thisType, typeChecker); _a < _b.length; _a++) {
+                            var symbol = _b[_a];
                             symbolToOriginInfoMap[ts.getSymbolId(symbol)] = { kind: 0 /* ThisType */ };
                             symbols.push(symbol);
+                            symbolToSortTextMap[ts.getSymbolId(symbol)] = SortText.SuggestedClassMembers;
                         }
                     }
                 }
@@ -99529,10 +102584,10 @@ var ts;
             }
             function isSnippetScope(scopeNode) {
                 switch (scopeNode.kind) {
-                    case 284 /* SourceFile */:
-                    case 206 /* TemplateExpression */:
-                    case 270 /* JsxExpression */:
-                    case 218 /* Block */:
+                    case 285 /* SourceFile */:
+                    case 207 /* TemplateExpression */:
+                    case 271 /* JsxExpression */:
+                    case 219 /* Block */:
                         return true;
                     default:
                         return ts.isStatement(scopeNode);
@@ -99540,9 +102595,11 @@ var ts;
             }
             function filterGlobalCompletion(symbols) {
                 var isTypeOnly = isTypeOnlyCompletion();
-                var allowTypes = isTypeOnly || !isContextTokenValueLocation(contextToken) && ts.isPossiblyTypeArgumentPosition(contextToken, sourceFile, typeChecker);
-                if (isTypeOnly)
-                    keywordFilters = 6 /* TypeKeywords */;
+                if (isTypeOnly) {
+                    keywordFilters = isTypeAssertion()
+                        ? 6 /* TypeAssertionKeywords */
+                        : 7 /* TypeKeywords */;
+                }
                 ts.filterMutate(symbols, function (symbol) {
                     if (!ts.isSourceFile(location)) {
                         // export = /**/ here we want to get all meanings, so any symbol is ok
@@ -99554,40 +102611,49 @@ var ts;
                         if (ts.isInRightSideOfInternalImportEqualsDeclaration(location)) {
                             return !!(symbol.flags & 1920 /* Namespace */);
                         }
-                        if (allowTypes) {
-                            // Its a type, but you can reach it by namespace.type as well
-                            var symbolAllowedAsType = symbolCanBeReferencedAtTypeLocation(symbol);
-                            if (symbolAllowedAsType || isTypeOnly) {
-                                return symbolAllowedAsType;
-                            }
+                        if (isTypeOnly) {
+                            // It's a type, but you can reach it by namespace.type as well
+                            return symbolCanBeReferencedAtTypeLocation(symbol);
                         }
                     }
                     // expressions are value space (which includes the value namespaces)
                     return !!(ts.getCombinedLocalAndExportSymbolFlags(symbol) & 67220415 /* Value */);
                 });
             }
+            function isTypeAssertion() {
+                return ts.isAssertionExpression(contextToken.parent);
+            }
             function isTypeOnlyCompletion() {
-                return insideJsDocTagTypeExpression || !isContextTokenValueLocation(contextToken) && (ts.isPartOfTypeNode(location) || isContextTokenTypeLocation(contextToken));
+                return insideJsDocTagTypeExpression
+                    || !isContextTokenValueLocation(contextToken) &&
+                        (ts.isPossiblyTypeArgumentPosition(contextToken, sourceFile, typeChecker)
+                            || ts.isPartOfTypeNode(location)
+                            || isContextTokenTypeLocation(contextToken));
             }
             function isContextTokenValueLocation(contextToken) {
                 return contextToken &&
-                    contextToken.kind === 104 /* TypeOfKeyword */ &&
-                    (contextToken.parent.kind === 167 /* TypeQuery */ || ts.isTypeOfExpression(contextToken.parent));
+                    contextToken.kind === 105 /* TypeOfKeyword */ &&
+                    (contextToken.parent.kind === 168 /* TypeQuery */ || ts.isTypeOfExpression(contextToken.parent));
             }
             function isContextTokenTypeLocation(contextToken) {
                 if (contextToken) {
                     var parentKind = contextToken.parent.kind;
                     switch (contextToken.kind) {
                         case 57 /* ColonToken */:
-                            return parentKind === 154 /* PropertyDeclaration */ ||
-                                parentKind === 153 /* PropertySignature */ ||
-                                parentKind === 151 /* Parameter */ ||
-                                parentKind === 237 /* VariableDeclaration */ ||
+                            return parentKind === 155 /* PropertyDeclaration */ ||
+                                parentKind === 154 /* PropertySignature */ ||
+                                parentKind === 152 /* Parameter */ ||
+                                parentKind === 238 /* VariableDeclaration */ ||
                                 ts.isFunctionLikeKind(parentKind);
-                        case 59 /* EqualsToken */:
-                            return parentKind === 242 /* TypeAliasDeclaration */;
-                        case 119 /* AsKeyword */:
-                            return parentKind === 212 /* AsExpression */;
+                        case 60 /* EqualsToken */:
+                            return parentKind === 243 /* TypeAliasDeclaration */;
+                        case 120 /* AsKeyword */:
+                            return parentKind === 213 /* AsExpression */;
+                        case 28 /* LessThanToken */:
+                            return parentKind === 165 /* TypeReference */ ||
+                                parentKind === 195 /* TypeAssertionExpression */;
+                        case 87 /* ExtendsKeyword */:
+                            return parentKind === 151 /* TypeParameter */;
                     }
                 }
                 return false;
@@ -99619,6 +102685,7 @@ var ts;
                         // So in `declare namespace foo {} declare module "foo" { export = foo; }`, there will just be the global completion for `foo`.
                         ts.some(resolvedModuleSymbol.declarations, function (d) { return !!d.getSourceFile().externalModuleIndicator; })) {
                         symbols.push(resolvedModuleSymbol);
+                        symbolToSortTextMap[ts.getSymbolId(resolvedModuleSymbol)] = SortText.AutoImportSuggestions;
                         symbolToOriginInfoMap[ts.getSymbolId(resolvedModuleSymbol)] = { kind: 3 /* Export */, moduleSymbol: moduleSymbol, isDefaultExport: false };
                     }
                     for (var _i = 0, _a = typeChecker.getExportsOfModule(moduleSymbol); _i < _a.length; _i++) {
@@ -99643,6 +102710,7 @@ var ts;
                         var origin = { kind: 3 /* Export */, moduleSymbol: moduleSymbol, isDefaultExport: isDefaultExport };
                         if (detailsEntryId || stringContainsCharactersInOrder(getSymbolName(symbol, origin, target).toLowerCase(), tokenTextLowerCase)) {
                             symbols.push(symbol);
+                            symbolToSortTextMap[ts.getSymbolId(symbol)] = SortText.AutoImportSuggestions;
                             symbolToOriginInfoMap[ts.getSymbolId(symbol)] = origin;
                         }
                     }
@@ -99694,11 +102762,11 @@ var ts;
                     return true;
                 }
                 if (contextToken.kind === 30 /* GreaterThanToken */ && contextToken.parent) {
-                    if (contextToken.parent.kind === 262 /* JsxOpeningElement */) {
+                    if (contextToken.parent.kind === 263 /* JsxOpeningElement */) {
                         return true;
                     }
-                    if (contextToken.parent.kind === 263 /* JsxClosingElement */ || contextToken.parent.kind === 261 /* JsxSelfClosingElement */) {
-                        return !!contextToken.parent.parent && contextToken.parent.parent.kind === 260 /* JsxElement */;
+                    if (contextToken.parent.kind === 264 /* JsxClosingElement */ || contextToken.parent.kind === 262 /* JsxSelfClosingElement */) {
+                        return !!contextToken.parent.parent && contextToken.parent.parent.kind === 261 /* JsxElement */;
                     }
                 }
                 return false;
@@ -99709,40 +102777,40 @@ var ts;
                     // Previous token may have been a keyword that was converted to an identifier.
                     switch (keywordForNode(previousToken)) {
                         case 27 /* CommaToken */:
-                            return containingNodeKind === 191 /* CallExpression */ // func( a, |
-                                || containingNodeKind === 157 /* Constructor */ // constructor( a, |   /* public, protected, private keywords are allowed here, so show completion */
-                                || containingNodeKind === 192 /* NewExpression */ // new C(a, |
-                                || containingNodeKind === 187 /* ArrayLiteralExpression */ // [a, |
-                                || containingNodeKind === 204 /* BinaryExpression */ // const x = (a, |
-                                || containingNodeKind === 165 /* FunctionType */; // var x: (s: string, list|
+                            return containingNodeKind === 192 /* CallExpression */ // func( a, |
+                                || containingNodeKind === 158 /* Constructor */ // constructor( a, |   /* public, protected, private keywords are allowed here, so show completion */
+                                || containingNodeKind === 193 /* NewExpression */ // new C(a, |
+                                || containingNodeKind === 188 /* ArrayLiteralExpression */ // [a, |
+                                || containingNodeKind === 205 /* BinaryExpression */ // const x = (a, |
+                                || containingNodeKind === 166 /* FunctionType */; // var x: (s: string, list|
                         case 20 /* OpenParenToken */:
-                            return containingNodeKind === 191 /* CallExpression */ // func( |
-                                || containingNodeKind === 157 /* Constructor */ // constructor( |
-                                || containingNodeKind === 192 /* NewExpression */ // new C(a|
-                                || containingNodeKind === 195 /* ParenthesizedExpression */ // const x = (a|
-                                || containingNodeKind === 177 /* ParenthesizedType */; // function F(pred: (a| /* this can become an arrow function, where 'a' is the argument */
+                            return containingNodeKind === 192 /* CallExpression */ // func( |
+                                || containingNodeKind === 158 /* Constructor */ // constructor( |
+                                || containingNodeKind === 193 /* NewExpression */ // new C(a|
+                                || containingNodeKind === 196 /* ParenthesizedExpression */ // const x = (a|
+                                || containingNodeKind === 178 /* ParenthesizedType */; // function F(pred: (a| /* this can become an arrow function, where 'a' is the argument */
                         case 22 /* OpenBracketToken */:
-                            return containingNodeKind === 187 /* ArrayLiteralExpression */ // [ |
-                                || containingNodeKind === 162 /* IndexSignature */ // [ | : string ]
-                                || containingNodeKind === 149 /* ComputedPropertyName */; // [ |    /* this can become an index signature */
-                        case 130 /* ModuleKeyword */: // module |
-                        case 131 /* NamespaceKeyword */: // namespace |
+                            return containingNodeKind === 188 /* ArrayLiteralExpression */ // [ |
+                                || containingNodeKind === 163 /* IndexSignature */ // [ | : string ]
+                                || containingNodeKind === 150 /* ComputedPropertyName */; // [ |    /* this can become an index signature */
+                        case 131 /* ModuleKeyword */: // module |
+                        case 132 /* NamespaceKeyword */: // namespace |
                             return true;
                         case 24 /* DotToken */:
-                            return containingNodeKind === 244 /* ModuleDeclaration */; // module A.|
+                            return containingNodeKind === 245 /* ModuleDeclaration */; // module A.|
                         case 18 /* OpenBraceToken */:
-                            return containingNodeKind === 240 /* ClassDeclaration */; // class A{ |
-                        case 59 /* EqualsToken */:
-                            return containingNodeKind === 237 /* VariableDeclaration */ // const x = a|
-                                || containingNodeKind === 204 /* BinaryExpression */; // x = a|
+                            return containingNodeKind === 241 /* ClassDeclaration */; // class A{ |
+                        case 60 /* EqualsToken */:
+                            return containingNodeKind === 238 /* VariableDeclaration */ // const x = a|
+                                || containingNodeKind === 205 /* BinaryExpression */; // x = a|
                         case 15 /* TemplateHead */:
-                            return containingNodeKind === 206 /* TemplateExpression */; // `aa ${|
+                            return containingNodeKind === 207 /* TemplateExpression */; // `aa ${|
                         case 16 /* TemplateMiddle */:
-                            return containingNodeKind === 216 /* TemplateSpan */; // `aa ${10} dd ${|
-                        case 115 /* PublicKeyword */:
-                        case 113 /* PrivateKeyword */:
-                        case 114 /* ProtectedKeyword */:
-                            return containingNodeKind === 154 /* PropertyDeclaration */; // class A{ public |
+                            return containingNodeKind === 217 /* TemplateSpan */; // `aa ${10} dd ${|
+                        case 116 /* PublicKeyword */:
+                        case 114 /* PrivateKeyword */:
+                        case 115 /* ProtectedKeyword */:
+                            return containingNodeKind === 155 /* PropertyDeclaration */; // class A{ public |
                     }
                 }
                 return false;
@@ -99769,7 +102837,7 @@ var ts;
                 completionKind = 0 /* ObjectPropertyDeclaration */;
                 var typeMembers;
                 var existingMembers;
-                if (objectLikeContainer.kind === 188 /* ObjectLiteralExpression */) {
+                if (objectLikeContainer.kind === 189 /* ObjectLiteralExpression */) {
                     var typeForObject = typeChecker.getContextualType(objectLikeContainer);
                     if (!typeForObject)
                         return 2 /* Fail */;
@@ -99778,7 +102846,7 @@ var ts;
                     existingMembers = objectLikeContainer.properties;
                 }
                 else {
-                    ts.Debug.assert(objectLikeContainer.kind === 184 /* ObjectBindingPattern */);
+                    ts.Debug.assert(objectLikeContainer.kind === 185 /* ObjectBindingPattern */);
                     // We are *only* completing on properties from the type being destructured.
                     isNewIdentifierLocation = false;
                     var rootDeclaration = ts.getRootDeclaration(objectLikeContainer.parent);
@@ -99789,12 +102857,12 @@ var ts;
                     // through type declaration or inference.
                     // Also proceed if rootDeclaration is a parameter and if its containing function expression/arrow function is contextually typed -
                     // type of parameter will flow in from the contextual type of the function
-                    var canGetType = ts.hasInitializer(rootDeclaration) || ts.hasType(rootDeclaration) || rootDeclaration.parent.parent.kind === 227 /* ForOfStatement */;
-                    if (!canGetType && rootDeclaration.kind === 151 /* Parameter */) {
+                    var canGetType = ts.hasInitializer(rootDeclaration) || ts.hasType(rootDeclaration) || rootDeclaration.parent.parent.kind === 228 /* ForOfStatement */;
+                    if (!canGetType && rootDeclaration.kind === 152 /* Parameter */) {
                         if (ts.isExpression(rootDeclaration.parent)) {
                             canGetType = !!typeChecker.getContextualType(rootDeclaration.parent);
                         }
-                        else if (rootDeclaration.parent.kind === 156 /* MethodDeclaration */ || rootDeclaration.parent.kind === 159 /* SetAccessor */) {
+                        else if (rootDeclaration.parent.kind === 157 /* MethodDeclaration */ || rootDeclaration.parent.kind === 160 /* SetAccessor */) {
                             canGetType = ts.isExpression(rootDeclaration.parent.parent) && !!typeChecker.getContextualType(rootDeclaration.parent.parent);
                         }
                     }
@@ -99836,7 +102904,7 @@ var ts;
                     return 0 /* Continue */;
                 // cursor is in an import clause
                 // try to show exported member for imported module
-                var moduleSpecifier = (namedImportsOrExports.kind === 252 /* NamedImports */ ? namedImportsOrExports.parent.parent : namedImportsOrExports.parent).moduleSpecifier;
+                var moduleSpecifier = (namedImportsOrExports.kind === 253 /* NamedImports */ ? namedImportsOrExports.parent.parent : namedImportsOrExports.parent).moduleSpecifier;
                 var moduleSpecifierSymbol = typeChecker.getSymbolAtLocation(moduleSpecifier); // TODO: GH#18217
                 if (!moduleSpecifierSymbol)
                     return 2 /* Fail */;
@@ -99852,7 +102920,7 @@ var ts;
              * Relevant symbols are stored in the captured 'symbols' variable.
              */
             function tryGetClassLikeCompletionSymbols() {
-                var decl = tryGetObjectTypeDeclarationCompletionContainer(sourceFile, contextToken, location);
+                var decl = tryGetObjectTypeDeclarationCompletionContainer(sourceFile, contextToken, location, position);
                 if (!decl)
                     return 0 /* Continue */;
                 // We're looking up possible property names from parent type.
@@ -99867,7 +102935,7 @@ var ts;
                 var classElement = contextToken.parent;
                 var classElementModifierFlags = ts.isClassElement(classElement) ? ts.getModifierFlags(classElement) : 0 /* None */;
                 // If this is context token is not something we are editing now, consider if this would lead to be modifier
-                if (contextToken.kind === 72 /* Identifier */ && !isCurrentlyEditingNode(contextToken)) {
+                if (contextToken.kind === 73 /* Identifier */ && !isCurrentlyEditingNode(contextToken)) {
                     switch (contextToken.getText()) {
                         case "private":
                             classElementModifierFlags = classElementModifierFlags | 8 /* Private */;
@@ -99904,7 +102972,7 @@ var ts;
                             break;
                         case 40 /* AsteriskToken */:
                             return ts.isMethodDeclaration(parent) ? ts.tryCast(parent.parent, ts.isObjectLiteralExpression) : undefined;
-                        case 72 /* Identifier */:
+                        case 73 /* Identifier */:
                             return contextToken.text === "async" && ts.isShorthandPropertyAssignment(contextToken.parent)
                                 ? contextToken.parent.parent : undefined;
                     }
@@ -99957,12 +103025,12 @@ var ts;
                         case 30 /* GreaterThanToken */: // End of a type argument list
                         case 29 /* LessThanSlashToken */:
                         case 42 /* SlashToken */:
-                        case 72 /* Identifier */:
-                        case 189 /* PropertyAccessExpression */:
-                        case 268 /* JsxAttributes */:
-                        case 267 /* JsxAttribute */:
-                        case 269 /* JsxSpreadAttribute */:
-                            if (parent && (parent.kind === 261 /* JsxSelfClosingElement */ || parent.kind === 262 /* JsxOpeningElement */)) {
+                        case 73 /* Identifier */:
+                        case 190 /* PropertyAccessExpression */:
+                        case 269 /* JsxAttributes */:
+                        case 268 /* JsxAttribute */:
+                        case 270 /* JsxSpreadAttribute */:
+                            if (parent && (parent.kind === 262 /* JsxSelfClosingElement */ || parent.kind === 263 /* JsxOpeningElement */)) {
                                 if (contextToken.kind === 30 /* GreaterThanToken */) {
                                     var precedingToken = ts.findPrecedingToken(contextToken.pos, sourceFile, /*startNode*/ undefined);
                                     if (!parent.typeArguments || (precedingToken && precedingToken.kind === 42 /* SlashToken */))
@@ -99970,7 +103038,7 @@ var ts;
                                 }
                                 return parent;
                             }
-                            else if (parent.kind === 267 /* JsxAttribute */) {
+                            else if (parent.kind === 268 /* JsxAttribute */) {
                                 // Currently we parse JsxOpeningLikeElement as:
                                 //      JsxOpeningLikeElement
                                 //          attributes: JsxAttributes
@@ -99982,7 +103050,7 @@ var ts;
                         // its parent is a JsxExpression, whose parent is a JsxAttribute,
                         // whose parent is a JsxOpeningLikeElement
                         case 10 /* StringLiteral */:
-                            if (parent && ((parent.kind === 267 /* JsxAttribute */) || (parent.kind === 269 /* JsxSpreadAttribute */))) {
+                            if (parent && ((parent.kind === 268 /* JsxAttribute */) || (parent.kind === 270 /* JsxSpreadAttribute */))) {
                                 // Currently we parse JsxOpeningLikeElement as:
                                 //      JsxOpeningLikeElement
                                 //          attributes: JsxAttributes
@@ -99992,8 +103060,8 @@ var ts;
                             break;
                         case 19 /* CloseBraceToken */:
                             if (parent &&
-                                parent.kind === 270 /* JsxExpression */ &&
-                                parent.parent && parent.parent.kind === 267 /* JsxAttribute */) {
+                                parent.kind === 271 /* JsxExpression */ &&
+                                parent.parent && parent.parent.kind === 268 /* JsxAttribute */) {
                                 // Currently we parse JsxOpeningLikeElement as:
                                 //      JsxOpeningLikeElement
                                 //          attributes: JsxAttributes
@@ -100001,7 +103069,7 @@ var ts;
                                 //                  each JsxAttribute can have initializer as JsxExpression
                                 return parent.parent.parent.parent;
                             }
-                            if (parent && parent.kind === 269 /* JsxSpreadAttribute */) {
+                            if (parent && parent.kind === 270 /* JsxSpreadAttribute */) {
                                 // Currently we parse JsxOpeningLikeElement as:
                                 //      JsxOpeningLikeElement
                                 //          attributes: JsxAttributes
@@ -100021,62 +103089,62 @@ var ts;
                 var containingNodeKind = parent.kind;
                 switch (contextToken.kind) {
                     case 27 /* CommaToken */:
-                        return containingNodeKind === 237 /* VariableDeclaration */ ||
-                            containingNodeKind === 238 /* VariableDeclarationList */ ||
-                            containingNodeKind === 219 /* VariableStatement */ ||
-                            containingNodeKind === 243 /* EnumDeclaration */ || // enum a { foo, |
+                        return containingNodeKind === 238 /* VariableDeclaration */ ||
+                            containingNodeKind === 239 /* VariableDeclarationList */ ||
+                            containingNodeKind === 220 /* VariableStatement */ ||
+                            containingNodeKind === 244 /* EnumDeclaration */ || // enum a { foo, |
                             isFunctionLikeButNotConstructor(containingNodeKind) ||
-                            containingNodeKind === 241 /* InterfaceDeclaration */ || // interface A<T, |
-                            containingNodeKind === 185 /* ArrayBindingPattern */ || // var [x, y|
-                            containingNodeKind === 242 /* TypeAliasDeclaration */ || // type Map, K, |
+                            containingNodeKind === 242 /* InterfaceDeclaration */ || // interface A<T, |
+                            containingNodeKind === 186 /* ArrayBindingPattern */ || // var [x, y|
+                            containingNodeKind === 243 /* TypeAliasDeclaration */ || // type Map, K, |
                             // class A<T, |
                             // var C = class D<T, |
                             (ts.isClassLike(parent) &&
                                 !!parent.typeParameters &&
                                 parent.typeParameters.end >= contextToken.pos);
                     case 24 /* DotToken */:
-                        return containingNodeKind === 185 /* ArrayBindingPattern */; // var [.|
+                        return containingNodeKind === 186 /* ArrayBindingPattern */; // var [.|
                     case 57 /* ColonToken */:
-                        return containingNodeKind === 186 /* BindingElement */; // var {x :html|
+                        return containingNodeKind === 187 /* BindingElement */; // var {x :html|
                     case 22 /* OpenBracketToken */:
-                        return containingNodeKind === 185 /* ArrayBindingPattern */; // var [x|
+                        return containingNodeKind === 186 /* ArrayBindingPattern */; // var [x|
                     case 20 /* OpenParenToken */:
-                        return containingNodeKind === 274 /* CatchClause */ ||
+                        return containingNodeKind === 275 /* CatchClause */ ||
                             isFunctionLikeButNotConstructor(containingNodeKind);
                     case 18 /* OpenBraceToken */:
-                        return containingNodeKind === 243 /* EnumDeclaration */; // enum a { |
+                        return containingNodeKind === 244 /* EnumDeclaration */; // enum a { |
                     case 28 /* LessThanToken */:
-                        return containingNodeKind === 240 /* ClassDeclaration */ || // class A< |
-                            containingNodeKind === 209 /* ClassExpression */ || // var C = class D< |
-                            containingNodeKind === 241 /* InterfaceDeclaration */ || // interface A< |
-                            containingNodeKind === 242 /* TypeAliasDeclaration */ || // type List< |
+                        return containingNodeKind === 241 /* ClassDeclaration */ || // class A< |
+                            containingNodeKind === 210 /* ClassExpression */ || // var C = class D< |
+                            containingNodeKind === 242 /* InterfaceDeclaration */ || // interface A< |
+                            containingNodeKind === 243 /* TypeAliasDeclaration */ || // type List< |
                             ts.isFunctionLikeKind(containingNodeKind);
-                    case 116 /* StaticKeyword */:
-                        return containingNodeKind === 154 /* PropertyDeclaration */ && !ts.isClassLike(parent.parent);
+                    case 117 /* StaticKeyword */:
+                        return containingNodeKind === 155 /* PropertyDeclaration */ && !ts.isClassLike(parent.parent);
                     case 25 /* DotDotDotToken */:
-                        return containingNodeKind === 151 /* Parameter */ ||
-                            (!!parent.parent && parent.parent.kind === 185 /* ArrayBindingPattern */); // var [...z|
-                    case 115 /* PublicKeyword */:
-                    case 113 /* PrivateKeyword */:
-                    case 114 /* ProtectedKeyword */:
-                        return containingNodeKind === 151 /* Parameter */ && !ts.isConstructorDeclaration(parent.parent);
-                    case 119 /* AsKeyword */:
-                        return containingNodeKind === 253 /* ImportSpecifier */ ||
-                            containingNodeKind === 257 /* ExportSpecifier */ ||
-                            containingNodeKind === 251 /* NamespaceImport */;
-                    case 126 /* GetKeyword */:
-                    case 137 /* SetKeyword */:
+                        return containingNodeKind === 152 /* Parameter */ ||
+                            (!!parent.parent && parent.parent.kind === 186 /* ArrayBindingPattern */); // var [...z|
+                    case 116 /* PublicKeyword */:
+                    case 114 /* PrivateKeyword */:
+                    case 115 /* ProtectedKeyword */:
+                        return containingNodeKind === 152 /* Parameter */ && !ts.isConstructorDeclaration(parent.parent);
+                    case 120 /* AsKeyword */:
+                        return containingNodeKind === 254 /* ImportSpecifier */ ||
+                            containingNodeKind === 258 /* ExportSpecifier */ ||
+                            containingNodeKind === 252 /* NamespaceImport */;
+                    case 127 /* GetKeyword */:
+                    case 138 /* SetKeyword */:
                         return !isFromObjectTypeDeclaration(contextToken);
-                    case 76 /* ClassKeyword */:
-                    case 84 /* EnumKeyword */:
-                    case 110 /* InterfaceKeyword */:
-                    case 90 /* FunctionKeyword */:
-                    case 105 /* VarKeyword */:
-                    case 92 /* ImportKeyword */:
-                    case 111 /* LetKeyword */:
-                    case 77 /* ConstKeyword */:
-                    case 117 /* YieldKeyword */:
-                    case 140 /* TypeKeyword */: // type htm|
+                    case 77 /* ClassKeyword */:
+                    case 85 /* EnumKeyword */:
+                    case 111 /* InterfaceKeyword */:
+                    case 91 /* FunctionKeyword */:
+                    case 106 /* VarKeyword */:
+                    case 93 /* ImportKeyword */:
+                    case 112 /* LetKeyword */:
+                    case 78 /* ConstKeyword */:
+                    case 118 /* YieldKeyword */:
+                    case 141 /* TypeKeyword */: // type htm|
                         return true;
                     case 40 /* AsteriskToken */:
                         return ts.isFunctionLike(contextToken.parent) && !ts.isMethodDeclaration(contextToken.parent);
@@ -100099,22 +103167,22 @@ var ts;
                 }
                 // Previous token may have been a keyword that was converted to an identifier.
                 switch (keywordForNode(contextToken)) {
-                    case 118 /* AbstractKeyword */:
-                    case 76 /* ClassKeyword */:
-                    case 77 /* ConstKeyword */:
-                    case 125 /* DeclareKeyword */:
-                    case 84 /* EnumKeyword */:
-                    case 90 /* FunctionKeyword */:
-                    case 110 /* InterfaceKeyword */:
-                    case 111 /* LetKeyword */:
-                    case 113 /* PrivateKeyword */:
-                    case 114 /* ProtectedKeyword */:
-                    case 115 /* PublicKeyword */:
-                    case 116 /* StaticKeyword */:
-                    case 105 /* VarKeyword */:
-                    case 117 /* YieldKeyword */:
+                    case 119 /* AbstractKeyword */:
+                    case 77 /* ClassKeyword */:
+                    case 78 /* ConstKeyword */:
+                    case 126 /* DeclareKeyword */:
+                    case 85 /* EnumKeyword */:
+                    case 91 /* FunctionKeyword */:
+                    case 111 /* InterfaceKeyword */:
+                    case 112 /* LetKeyword */:
+                    case 114 /* PrivateKeyword */:
+                    case 115 /* ProtectedKeyword */:
+                    case 116 /* PublicKeyword */:
+                    case 117 /* StaticKeyword */:
+                    case 106 /* VarKeyword */:
+                    case 118 /* YieldKeyword */:
                         return true;
-                    case 121 /* AsyncKeyword */:
+                    case 122 /* AsyncKeyword */:
                         return ts.isPropertyDeclaration(contextToken.parent);
                 }
                 return ts.isDeclarationName(contextToken)
@@ -100124,7 +103192,7 @@ var ts;
                     && !(ts.isClassLike(contextToken.parent) && (contextToken !== previousToken || position > previousToken.end));
             }
             function isFunctionLikeButNotConstructor(kind) {
-                return ts.isFunctionLikeKind(kind) && kind !== 157 /* Constructor */;
+                return ts.isFunctionLikeKind(kind) && kind !== 158 /* Constructor */;
             }
             function isDotOfNumericLiteral(contextToken) {
                 if (contextToken.kind === 8 /* NumericLiteral */) {
@@ -100147,12 +103215,12 @@ var ts;
                 for (var _i = 0, existingMembers_1 = existingMembers; _i < existingMembers_1.length; _i++) {
                     var m = existingMembers_1[_i];
                     // Ignore omitted expressions for missing members
-                    if (m.kind !== 275 /* PropertyAssignment */ &&
-                        m.kind !== 276 /* ShorthandPropertyAssignment */ &&
-                        m.kind !== 186 /* BindingElement */ &&
-                        m.kind !== 156 /* MethodDeclaration */ &&
-                        m.kind !== 158 /* GetAccessor */ &&
-                        m.kind !== 159 /* SetAccessor */) {
+                    if (m.kind !== 276 /* PropertyAssignment */ &&
+                        m.kind !== 277 /* ShorthandPropertyAssignment */ &&
+                        m.kind !== 187 /* BindingElement */ &&
+                        m.kind !== 157 /* MethodDeclaration */ &&
+                        m.kind !== 159 /* GetAccessor */ &&
+                        m.kind !== 160 /* SetAccessor */) {
                         continue;
                     }
                     // If this is the current item we are editing right now, do not filter it out
@@ -100162,7 +103230,7 @@ var ts;
                     var existingName = void 0;
                     if (ts.isBindingElement(m) && m.propertyName) {
                         // include only identifiers in completion list
-                        if (m.propertyName.kind === 72 /* Identifier */) {
+                        if (m.propertyName.kind === 73 /* Identifier */) {
                             existingName = m.propertyName.escapedText;
                         }
                     }
@@ -100187,10 +103255,10 @@ var ts;
                 for (var _i = 0, existingMembers_2 = existingMembers; _i < existingMembers_2.length; _i++) {
                     var m = existingMembers_2[_i];
                     // Ignore omitted expressions for missing members
-                    if (m.kind !== 154 /* PropertyDeclaration */ &&
-                        m.kind !== 156 /* MethodDeclaration */ &&
-                        m.kind !== 158 /* GetAccessor */ &&
-                        m.kind !== 159 /* SetAccessor */) {
+                    if (m.kind !== 155 /* PropertyDeclaration */ &&
+                        m.kind !== 157 /* MethodDeclaration */ &&
+                        m.kind !== 159 /* GetAccessor */ &&
+                        m.kind !== 160 /* SetAccessor */) {
                         continue;
                     }
                     // If this is the current item we are editing right now, do not filter it out
@@ -100230,7 +103298,7 @@ var ts;
                     if (isCurrentlyEditingNode(attr)) {
                         continue;
                     }
-                    if (attr.kind === 267 /* JsxAttribute */) {
+                    if (attr.kind === 268 /* JsxAttribute */) {
                         seenNames.set(attr.name.escapedText, true);
                     }
                 }
@@ -100274,57 +103342,104 @@ var ts;
         var _keywordCompletions = [];
         var allKeywordsCompletions = ts.memoize(function () {
             var res = [];
-            for (var i = 73 /* FirstKeyword */; i <= 147 /* LastKeyword */; i++) {
+            for (var i = 74 /* FirstKeyword */; i <= 148 /* LastKeyword */; i++) {
                 res.push({
                     name: ts.tokenToString(i),
                     kind: "keyword" /* keyword */,
                     kindModifiers: "" /* none */,
-                    sortText: "0"
+                    sortText: SortText.GlobalsOrKeywords
                 });
             }
             return res;
         });
-        function getKeywordCompletions(keywordFilter) {
+        function getKeywordCompletions(keywordFilter, filterOutTsOnlyKeywords) {
+            if (!filterOutTsOnlyKeywords)
+                return getTypescriptKeywordCompletions(keywordFilter);
+            var index = keywordFilter + 7 /* Last */ + 1;
+            return _keywordCompletions[index] ||
+                (_keywordCompletions[index] = getTypescriptKeywordCompletions(keywordFilter)
+                    .filter(function (entry) { return !isTypeScriptOnlyKeyword(ts.stringToToken(entry.name)); }));
+        }
+        function getTypescriptKeywordCompletions(keywordFilter) {
             return _keywordCompletions[keywordFilter] || (_keywordCompletions[keywordFilter] = allKeywordsCompletions().filter(function (entry) {
                 var kind = ts.stringToToken(entry.name);
                 switch (keywordFilter) {
                     case 0 /* None */:
                         return false;
                     case 1 /* All */:
-                        return kind === 121 /* AsyncKeyword */ || 122 /* AwaitKeyword */ || !ts.isContextualKeyword(kind) && !isClassMemberCompletionKeyword(kind) || kind === 125 /* DeclareKeyword */ || kind === 130 /* ModuleKeyword */
-                            || ts.isTypeKeyword(kind) && kind !== 141 /* UndefinedKeyword */;
+                        return isFunctionLikeBodyKeyword(kind)
+                            || kind === 126 /* DeclareKeyword */
+                            || kind === 131 /* ModuleKeyword */
+                            || ts.isTypeKeyword(kind) && kind !== 142 /* UndefinedKeyword */;
+                    case 5 /* FunctionLikeBodyKeywords */:
+                        return isFunctionLikeBodyKeyword(kind);
                     case 2 /* ClassElementKeywords */:
                         return isClassMemberCompletionKeyword(kind);
                     case 3 /* InterfaceElementKeywords */:
                         return isInterfaceOrTypeLiteralCompletionKeyword(kind);
                     case 4 /* ConstructorParameterKeywords */:
                         return ts.isParameterPropertyModifier(kind);
-                    case 5 /* FunctionLikeBodyKeywords */:
-                        return isFunctionLikeBodyKeyword(kind);
-                    case 6 /* TypeKeywords */:
+                    case 6 /* TypeAssertionKeywords */:
+                        return ts.isTypeKeyword(kind) || kind === 78 /* ConstKeyword */;
+                    case 7 /* TypeKeywords */:
                         return ts.isTypeKeyword(kind);
                     default:
                         return ts.Debug.assertNever(keywordFilter);
                 }
             }));
         }
+        function isTypeScriptOnlyKeyword(kind) {
+            switch (kind) {
+                case 119 /* AbstractKeyword */:
+                case 121 /* AnyKeyword */:
+                case 147 /* BigIntKeyword */:
+                case 124 /* BooleanKeyword */:
+                case 126 /* DeclareKeyword */:
+                case 85 /* EnumKeyword */:
+                case 146 /* GlobalKeyword */:
+                case 110 /* ImplementsKeyword */:
+                case 128 /* InferKeyword */:
+                case 111 /* InterfaceKeyword */:
+                case 129 /* IsKeyword */:
+                case 130 /* KeyOfKeyword */:
+                case 131 /* ModuleKeyword */:
+                case 132 /* NamespaceKeyword */:
+                case 133 /* NeverKeyword */:
+                case 136 /* NumberKeyword */:
+                case 137 /* ObjectKeyword */:
+                case 114 /* PrivateKeyword */:
+                case 115 /* ProtectedKeyword */:
+                case 116 /* PublicKeyword */:
+                case 134 /* ReadonlyKeyword */:
+                case 139 /* StringKeyword */:
+                case 140 /* SymbolKeyword */:
+                case 141 /* TypeKeyword */:
+                case 143 /* UniqueKeyword */:
+                case 144 /* UnknownKeyword */:
+                    return true;
+                default:
+                    return false;
+            }
+        }
         function isInterfaceOrTypeLiteralCompletionKeyword(kind) {
-            return kind === 133 /* ReadonlyKeyword */;
+            return kind === 134 /* ReadonlyKeyword */;
         }
         function isClassMemberCompletionKeyword(kind) {
             switch (kind) {
-                case 118 /* AbstractKeyword */:
-                case 124 /* ConstructorKeyword */:
-                case 126 /* GetKeyword */:
-                case 137 /* SetKeyword */:
-                case 121 /* AsyncKeyword */:
+                case 119 /* AbstractKeyword */:
+                case 125 /* ConstructorKeyword */:
+                case 127 /* GetKeyword */:
+                case 138 /* SetKeyword */:
+                case 122 /* AsyncKeyword */:
                     return true;
                 default:
                     return ts.isClassMemberModifier(kind);
             }
         }
         function isFunctionLikeBodyKeyword(kind) {
-            return kind === 121 /* AsyncKeyword */ || kind === 122 /* AwaitKeyword */ || !ts.isContextualKeyword(kind) && !isClassMemberCompletionKeyword(kind);
+            return kind === 122 /* AsyncKeyword */
+                || kind === 123 /* AwaitKeyword */
+                || !ts.isContextualKeyword(kind) && !isClassMemberCompletionKeyword(kind);
         }
         function keywordForNode(node) {
             return ts.isIdentifier(node) ? node.originalKeywordKind || 0 /* Unknown */ : node.kind;
@@ -100358,16 +103473,21 @@ var ts;
          * Returns the immediate owning class declaration of a context token,
          * on the condition that one exists and that the context implies completion should be given.
          */
-        function tryGetObjectTypeDeclarationCompletionContainer(sourceFile, contextToken, location) {
+        function tryGetObjectTypeDeclarationCompletionContainer(sourceFile, contextToken, location, position) {
             // class c { method() { } | method2() { } }
             switch (location.kind) {
-                case 311 /* SyntaxList */:
+                case 313 /* SyntaxList */:
                     return ts.tryCast(location.parent, ts.isObjectTypeDeclaration);
                 case 1 /* EndOfFileToken */:
                     var cls = ts.tryCast(ts.lastOrUndefined(ts.cast(location.parent, ts.isSourceFile).statements), ts.isObjectTypeDeclaration);
                     if (cls && !ts.findChildOfKind(cls, 19 /* CloseBraceToken */, sourceFile)) {
                         return cls;
                     }
+                    break;
+                case 73 /* Identifier */: // class c extends React.Component { a: () => 1\n compon| }
+                    if (isFromObjectTypeDeclaration(location)) {
+                        return ts.findAncestor(location, ts.isObjectTypeDeclaration);
+                    }
             }
             if (!contextToken)
                 return undefined;
@@ -100382,8 +103502,13 @@ var ts;
                 case 27 /* CommaToken */: // class c {getValue(): number, | }
                     return ts.tryCast(contextToken.parent, ts.isObjectTypeDeclaration);
                 default:
-                    if (!isFromObjectTypeDeclaration(contextToken))
+                    if (!isFromObjectTypeDeclaration(contextToken)) {
+                        // class c extends React.Component { a: () => 1\n| }
+                        if (ts.getLineAndCharacterOfPosition(sourceFile, contextToken.getEnd()).line !== ts.getLineAndCharacterOfPosition(sourceFile, position).line && ts.isObjectTypeDeclaration(location)) {
+                            return location;
+                        }
                         return undefined;
+                    }
                     var isValidKeyword = ts.isClassLike(contextToken.parent.parent) ? isClassMemberCompletionKeyword : isInterfaceOrTypeLiteralCompletionKeyword;
                     return (isValidKeyword(contextToken.kind) || contextToken.kind === 40 /* AsteriskToken */ || ts.isIdentifier(contextToken) && isValidKeyword(ts.stringToToken(contextToken.text))) // TODO: GH#18217
                         ? contextToken.parent.parent : undefined;
@@ -100470,40 +103595,40 @@ var ts;
         }
         function getHighlightSpans(node, sourceFile) {
             switch (node.kind) {
-                case 91 /* IfKeyword */:
-                case 83 /* ElseKeyword */:
+                case 92 /* IfKeyword */:
+                case 84 /* ElseKeyword */:
                     return ts.isIfStatement(node.parent) ? getIfElseOccurrences(node.parent, sourceFile) : undefined;
-                case 97 /* ReturnKeyword */:
+                case 98 /* ReturnKeyword */:
                     return useParent(node.parent, ts.isReturnStatement, getReturnOccurrences);
-                case 101 /* ThrowKeyword */:
+                case 102 /* ThrowKeyword */:
                     return useParent(node.parent, ts.isThrowStatement, getThrowOccurrences);
-                case 103 /* TryKeyword */:
-                case 75 /* CatchKeyword */:
-                case 88 /* FinallyKeyword */:
-                    var tryStatement = node.kind === 75 /* CatchKeyword */ ? node.parent.parent : node.parent;
+                case 104 /* TryKeyword */:
+                case 76 /* CatchKeyword */:
+                case 89 /* FinallyKeyword */:
+                    var tryStatement = node.kind === 76 /* CatchKeyword */ ? node.parent.parent : node.parent;
                     return useParent(tryStatement, ts.isTryStatement, getTryCatchFinallyOccurrences);
-                case 99 /* SwitchKeyword */:
+                case 100 /* SwitchKeyword */:
                     return useParent(node.parent, ts.isSwitchStatement, getSwitchCaseDefaultOccurrences);
-                case 74 /* CaseKeyword */:
-                case 80 /* DefaultKeyword */:
+                case 75 /* CaseKeyword */:
+                case 81 /* DefaultKeyword */:
                     return useParent(node.parent.parent.parent, ts.isSwitchStatement, getSwitchCaseDefaultOccurrences);
-                case 73 /* BreakKeyword */:
-                case 78 /* ContinueKeyword */:
+                case 74 /* BreakKeyword */:
+                case 79 /* ContinueKeyword */:
                     return useParent(node.parent, ts.isBreakOrContinueStatement, getBreakOrContinueStatementOccurrences);
-                case 89 /* ForKeyword */:
-                case 107 /* WhileKeyword */:
-                case 82 /* DoKeyword */:
+                case 90 /* ForKeyword */:
+                case 108 /* WhileKeyword */:
+                case 83 /* DoKeyword */:
                     return useParent(node.parent, function (n) { return ts.isIterationStatement(n, /*lookInLabeledStatements*/ true); }, getLoopBreakContinueOccurrences);
-                case 124 /* ConstructorKeyword */:
-                    return getFromAllDeclarations(ts.isConstructorDeclaration, [124 /* ConstructorKeyword */]);
-                case 126 /* GetKeyword */:
-                case 137 /* SetKeyword */:
-                    return getFromAllDeclarations(ts.isAccessor, [126 /* GetKeyword */, 137 /* SetKeyword */]);
-                case 122 /* AwaitKeyword */:
+                case 125 /* ConstructorKeyword */:
+                    return getFromAllDeclarations(ts.isConstructorDeclaration, [125 /* ConstructorKeyword */]);
+                case 127 /* GetKeyword */:
+                case 138 /* SetKeyword */:
+                    return getFromAllDeclarations(ts.isAccessor, [127 /* GetKeyword */, 138 /* SetKeyword */]);
+                case 123 /* AwaitKeyword */:
                     return useParent(node.parent, ts.isAwaitExpression, getAsyncAndAwaitOccurrences);
-                case 121 /* AsyncKeyword */:
+                case 122 /* AsyncKeyword */:
                     return highlightSpans(getAsyncAndAwaitOccurrences(node));
-                case 117 /* YieldKeyword */:
+                case 118 /* YieldKeyword */:
                     return highlightSpans(getYieldOccurrences(node));
                 default:
                     return ts.isModifierKind(node.kind) && (ts.isDeclaration(node.parent) || ts.isVariableStatement(node.parent))
@@ -100546,7 +103671,7 @@ var ts;
             var child = throwStatement;
             while (child.parent) {
                 var parent = child.parent;
-                if (ts.isFunctionBlock(parent) || parent.kind === 284 /* SourceFile */) {
+                if (ts.isFunctionBlock(parent) || parent.kind === 285 /* SourceFile */) {
                     return parent;
                 }
                 // A throw-statement is only owned by a try-statement if the try-statement has
@@ -100578,16 +103703,16 @@ var ts;
         function getBreakOrContinueOwner(statement) {
             return ts.findAncestor(statement, function (node) {
                 switch (node.kind) {
-                    case 232 /* SwitchStatement */:
-                        if (statement.kind === 228 /* ContinueStatement */) {
+                    case 233 /* SwitchStatement */:
+                        if (statement.kind === 229 /* ContinueStatement */) {
                             return false;
                         }
                     // falls through
-                    case 225 /* ForStatement */:
-                    case 226 /* ForInStatement */:
-                    case 227 /* ForOfStatement */:
-                    case 224 /* WhileStatement */:
-                    case 223 /* DoStatement */:
+                    case 226 /* ForStatement */:
+                    case 227 /* ForInStatement */:
+                    case 228 /* ForOfStatement */:
+                    case 225 /* WhileStatement */:
+                    case 224 /* DoStatement */:
                         return !statement.label || isLabeledBy(node, statement.label.escapedText);
                     default:
                         // Don't cross function boundaries.
@@ -100603,11 +103728,11 @@ var ts;
             // Types of node whose children might have modifiers.
             var container = declaration.parent;
             switch (container.kind) {
-                case 245 /* ModuleBlock */:
-                case 284 /* SourceFile */:
-                case 218 /* Block */:
-                case 271 /* CaseClause */:
-                case 272 /* DefaultClause */:
+                case 246 /* ModuleBlock */:
+                case 285 /* SourceFile */:
+                case 219 /* Block */:
+                case 272 /* CaseClause */:
+                case 273 /* DefaultClause */:
                     // Container is either a class declaration or the declaration is a classDeclaration
                     if (modifierFlag & 128 /* Abstract */ && ts.isClassDeclaration(declaration)) {
                         return declaration.members.concat([declaration]);
@@ -100615,12 +103740,12 @@ var ts;
                     else {
                         return container.statements;
                     }
-                case 157 /* Constructor */:
-                case 156 /* MethodDeclaration */:
-                case 239 /* FunctionDeclaration */:
+                case 158 /* Constructor */:
+                case 157 /* MethodDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     return container.parameters.concat((ts.isClassLike(container.parent) ? container.parent.members : []));
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
                     var nodes = container.members;
                     // If we're an accessibility modifier, we're in an instance member and should search
                     // the constructor's parameter list for instance members as well.
@@ -100651,12 +103776,12 @@ var ts;
         }
         function getLoopBreakContinueOccurrences(loopNode) {
             var keywords = [];
-            if (pushKeywordIf(keywords, loopNode.getFirstToken(), 89 /* ForKeyword */, 107 /* WhileKeyword */, 82 /* DoKeyword */)) {
+            if (pushKeywordIf(keywords, loopNode.getFirstToken(), 90 /* ForKeyword */, 108 /* WhileKeyword */, 83 /* DoKeyword */)) {
                 // If we succeeded and got a do-while loop, then start looking for a 'while' keyword.
-                if (loopNode.kind === 223 /* DoStatement */) {
+                if (loopNode.kind === 224 /* DoStatement */) {
                     var loopTokens = loopNode.getChildren();
                     for (var i = loopTokens.length - 1; i >= 0; i--) {
-                        if (pushKeywordIf(keywords, loopTokens[i], 107 /* WhileKeyword */)) {
+                        if (pushKeywordIf(keywords, loopTokens[i], 108 /* WhileKeyword */)) {
                             break;
                         }
                     }
@@ -100664,7 +103789,7 @@ var ts;
             }
             ts.forEach(aggregateAllBreakAndContinueStatements(loopNode.statement), function (statement) {
                 if (ownsBreakOrContinueStatement(loopNode, statement)) {
-                    pushKeywordIf(keywords, statement.getFirstToken(), 73 /* BreakKeyword */, 78 /* ContinueKeyword */);
+                    pushKeywordIf(keywords, statement.getFirstToken(), 74 /* BreakKeyword */, 79 /* ContinueKeyword */);
                 }
             });
             return keywords;
@@ -100673,13 +103798,13 @@ var ts;
             var owner = getBreakOrContinueOwner(breakOrContinueStatement);
             if (owner) {
                 switch (owner.kind) {
-                    case 225 /* ForStatement */:
-                    case 226 /* ForInStatement */:
-                    case 227 /* ForOfStatement */:
-                    case 223 /* DoStatement */:
-                    case 224 /* WhileStatement */:
+                    case 226 /* ForStatement */:
+                    case 227 /* ForInStatement */:
+                    case 228 /* ForOfStatement */:
+                    case 224 /* DoStatement */:
+                    case 225 /* WhileStatement */:
                         return getLoopBreakContinueOccurrences(owner);
-                    case 232 /* SwitchStatement */:
+                    case 233 /* SwitchStatement */:
                         return getSwitchCaseDefaultOccurrences(owner);
                 }
             }
@@ -100687,13 +103812,13 @@ var ts;
         }
         function getSwitchCaseDefaultOccurrences(switchStatement) {
             var keywords = [];
-            pushKeywordIf(keywords, switchStatement.getFirstToken(), 99 /* SwitchKeyword */);
+            pushKeywordIf(keywords, switchStatement.getFirstToken(), 100 /* SwitchKeyword */);
             // Go through each clause in the switch statement, collecting the 'case'/'default' keywords.
             ts.forEach(switchStatement.caseBlock.clauses, function (clause) {
-                pushKeywordIf(keywords, clause.getFirstToken(), 74 /* CaseKeyword */, 80 /* DefaultKeyword */);
+                pushKeywordIf(keywords, clause.getFirstToken(), 75 /* CaseKeyword */, 81 /* DefaultKeyword */);
                 ts.forEach(aggregateAllBreakAndContinueStatements(clause), function (statement) {
                     if (ownsBreakOrContinueStatement(switchStatement, statement)) {
-                        pushKeywordIf(keywords, statement.getFirstToken(), 73 /* BreakKeyword */);
+                        pushKeywordIf(keywords, statement.getFirstToken(), 74 /* BreakKeyword */);
                     }
                 });
             });
@@ -100701,13 +103826,13 @@ var ts;
         }
         function getTryCatchFinallyOccurrences(tryStatement, sourceFile) {
             var keywords = [];
-            pushKeywordIf(keywords, tryStatement.getFirstToken(), 103 /* TryKeyword */);
+            pushKeywordIf(keywords, tryStatement.getFirstToken(), 104 /* TryKeyword */);
             if (tryStatement.catchClause) {
-                pushKeywordIf(keywords, tryStatement.catchClause.getFirstToken(), 75 /* CatchKeyword */);
+                pushKeywordIf(keywords, tryStatement.catchClause.getFirstToken(), 76 /* CatchKeyword */);
             }
             if (tryStatement.finallyBlock) {
-                var finallyKeyword = ts.findChildOfKind(tryStatement, 88 /* FinallyKeyword */, sourceFile);
-                pushKeywordIf(keywords, finallyKeyword, 88 /* FinallyKeyword */);
+                var finallyKeyword = ts.findChildOfKind(tryStatement, 89 /* FinallyKeyword */, sourceFile);
+                pushKeywordIf(keywords, finallyKeyword, 89 /* FinallyKeyword */);
             }
             return keywords;
         }
@@ -100718,13 +103843,13 @@ var ts;
             }
             var keywords = [];
             ts.forEach(aggregateOwnedThrowStatements(owner), function (throwStatement) {
-                keywords.push(ts.findChildOfKind(throwStatement, 101 /* ThrowKeyword */, sourceFile));
+                keywords.push(ts.findChildOfKind(throwStatement, 102 /* ThrowKeyword */, sourceFile));
             });
             // If the "owner" is a function, then we equate 'return' and 'throw' statements in their
             // ability to "jump out" of the function, and include occurrences for both.
             if (ts.isFunctionBlock(owner)) {
                 ts.forEachReturnStatement(owner, function (returnStatement) {
-                    keywords.push(ts.findChildOfKind(returnStatement, 97 /* ReturnKeyword */, sourceFile));
+                    keywords.push(ts.findChildOfKind(returnStatement, 98 /* ReturnKeyword */, sourceFile));
                 });
             }
             return keywords;
@@ -100736,11 +103861,11 @@ var ts;
             }
             var keywords = [];
             ts.forEachReturnStatement(ts.cast(func.body, ts.isBlock), function (returnStatement) {
-                keywords.push(ts.findChildOfKind(returnStatement, 97 /* ReturnKeyword */, sourceFile));
+                keywords.push(ts.findChildOfKind(returnStatement, 98 /* ReturnKeyword */, sourceFile));
             });
             // Include 'throw' statements that do not occur within a try block.
             ts.forEach(aggregateOwnedThrowStatements(func.body), function (throwStatement) {
-                keywords.push(ts.findChildOfKind(throwStatement, 101 /* ThrowKeyword */, sourceFile));
+                keywords.push(ts.findChildOfKind(throwStatement, 102 /* ThrowKeyword */, sourceFile));
             });
             return keywords;
         }
@@ -100752,13 +103877,13 @@ var ts;
             var keywords = [];
             if (func.modifiers) {
                 func.modifiers.forEach(function (modifier) {
-                    pushKeywordIf(keywords, modifier, 121 /* AsyncKeyword */);
+                    pushKeywordIf(keywords, modifier, 122 /* AsyncKeyword */);
                 });
             }
             ts.forEachChild(func, function (child) {
                 traverseWithoutCrossingFunction(child, function (node) {
                     if (ts.isAwaitExpression(node)) {
-                        pushKeywordIf(keywords, node.getFirstToken(), 122 /* AwaitKeyword */);
+                        pushKeywordIf(keywords, node.getFirstToken(), 123 /* AwaitKeyword */);
                     }
                 });
             });
@@ -100773,7 +103898,7 @@ var ts;
             ts.forEachChild(func, function (child) {
                 traverseWithoutCrossingFunction(child, function (node) {
                     if (ts.isYieldExpression(node)) {
-                        pushKeywordIf(keywords, node.getFirstToken(), 117 /* YieldKeyword */);
+                        pushKeywordIf(keywords, node.getFirstToken(), 118 /* YieldKeyword */);
                     }
                 });
             });
@@ -100792,7 +103917,7 @@ var ts;
             // We'd like to highlight else/ifs together if they are only separated by whitespace
             // (i.e. the keywords are separated by no comments, no newlines).
             for (var i = 0; i < keywords.length; i++) {
-                if (keywords[i].kind === 83 /* ElseKeyword */ && i < keywords.length - 1) {
+                if (keywords[i].kind === 84 /* ElseKeyword */ && i < keywords.length - 1) {
                     var elseKeyword = keywords[i];
                     var ifKeyword = keywords[i + 1]; // this *should* always be an 'if' keyword.
                     var shouldCombineElseAndIf = true;
@@ -100827,10 +103952,10 @@ var ts;
             // Now traverse back down through the else branches, aggregating if/else keywords of if-statements.
             while (true) {
                 var children = ifStatement.getChildren(sourceFile);
-                pushKeywordIf(keywords, children[0], 91 /* IfKeyword */);
+                pushKeywordIf(keywords, children[0], 92 /* IfKeyword */);
                 // Generally the 'else' keyword is second-to-last, so we traverse backwards.
                 for (var i = children.length - 1; i >= 0; i--) {
-                    if (pushKeywordIf(keywords, children[i], 83 /* ElseKeyword */)) {
+                    if (pushKeywordIf(keywords, children[i], 84 /* ElseKeyword */)) {
                         break;
                     }
                 }
@@ -101046,12 +104171,12 @@ var ts;
                         if (cancellationToken)
                             cancellationToken.throwIfCancellationRequested();
                         switch (direct.kind) {
-                            case 191 /* CallExpression */:
+                            case 192 /* CallExpression */:
                                 if (!isAvailableThroughGlobal) {
                                     var parent = direct.parent;
-                                    if (exportKind === 2 /* ExportEquals */ && parent.kind === 237 /* VariableDeclaration */) {
+                                    if (exportKind === 2 /* ExportEquals */ && parent.kind === 238 /* VariableDeclaration */) {
                                         var name = parent.name;
-                                        if (name.kind === 72 /* Identifier */) {
+                                        if (name.kind === 73 /* Identifier */) {
                                             directImports.push(name);
                                             break;
                                         }
@@ -101060,22 +104185,22 @@ var ts;
                                     addIndirectUser(direct.getSourceFile());
                                 }
                                 break;
-                            case 72 /* Identifier */: // for 'const x = require("y");
+                            case 73 /* Identifier */: // for 'const x = require("y");
                                 break; // TODO: GH#23879
-                            case 248 /* ImportEqualsDeclaration */:
+                            case 249 /* ImportEqualsDeclaration */:
                                 handleNamespaceImport(direct, direct.name, ts.hasModifier(direct, 1 /* Export */), /*alreadyAddedDirect*/ false);
                                 break;
-                            case 249 /* ImportDeclaration */:
+                            case 250 /* ImportDeclaration */:
                                 directImports.push(direct);
                                 var namedBindings = direct.importClause && direct.importClause.namedBindings;
-                                if (namedBindings && namedBindings.kind === 251 /* NamespaceImport */) {
+                                if (namedBindings && namedBindings.kind === 252 /* NamespaceImport */) {
                                     handleNamespaceImport(direct, namedBindings.name, /*isReExport*/ false, /*alreadyAddedDirect*/ true);
                                 }
                                 else if (!isAvailableThroughGlobal && ts.isDefaultImport(direct)) {
                                     addIndirectUser(getSourceFileLikeForImportDeclaration(direct)); // Add a check for indirect uses to handle synthetic default imports
                                 }
                                 break;
-                            case 255 /* ExportDeclaration */:
+                            case 256 /* ExportDeclaration */:
                                 if (!direct.exportClause) {
                                     // This is `export * from "foo"`, so imports of this module may import the export too.
                                     handleDirectImports(getContainingModuleSymbol(direct, checker));
@@ -101085,11 +104210,11 @@ var ts;
                                     directImports.push(direct);
                                 }
                                 break;
-                            case 183 /* ImportType */:
+                            case 184 /* ImportType */:
                                 directImports.push(direct);
                                 break;
                             default:
-                                ts.Debug.assertNever(direct, "Unexpected import kind: " + ts.Debug.showSyntaxKind(direct));
+                                ts.Debug.failBadSyntaxKind(direct, "Unexpected import kind.");
                         }
                     }
                 }
@@ -101102,7 +104227,7 @@ var ts;
                 }
                 else if (!isAvailableThroughGlobal) {
                     var sourceFileLike = getSourceFileLikeForImportDeclaration(importDeclaration);
-                    ts.Debug.assert(sourceFileLike.kind === 284 /* SourceFile */ || sourceFileLike.kind === 244 /* ModuleDeclaration */);
+                    ts.Debug.assert(sourceFileLike.kind === 285 /* SourceFile */ || sourceFileLike.kind === 245 /* ModuleDeclaration */);
                     if (isReExport || findNamespaceReExports(sourceFileLike, name, checker)) {
                         addIndirectUsers(sourceFileLike);
                     }
@@ -101157,17 +104282,17 @@ var ts;
             }
             return { importSearches: importSearches, singleReferences: singleReferences };
             function handleImport(decl) {
-                if (decl.kind === 248 /* ImportEqualsDeclaration */) {
+                if (decl.kind === 249 /* ImportEqualsDeclaration */) {
                     if (isExternalModuleImportEquals(decl)) {
                         handleNamespaceImportLike(decl.name);
                     }
                     return;
                 }
-                if (decl.kind === 72 /* Identifier */) {
+                if (decl.kind === 73 /* Identifier */) {
                     handleNamespaceImportLike(decl);
                     return;
                 }
-                if (decl.kind === 183 /* ImportType */) {
+                if (decl.kind === 184 /* ImportType */) {
                     if (decl.qualifier) {
                         if (ts.isIdentifier(decl.qualifier) && decl.qualifier.escapedText === ts.symbolName(exportSymbol)) {
                             singleReferences.push(decl.qualifier);
@@ -101182,17 +104307,17 @@ var ts;
                 if (decl.moduleSpecifier.kind !== 10 /* StringLiteral */) {
                     return;
                 }
-                if (decl.kind === 255 /* ExportDeclaration */) {
+                if (decl.kind === 256 /* ExportDeclaration */) {
                     searchForNamedImport(decl.exportClause);
                     return;
                 }
                 var _a = decl.importClause || { name: undefined, namedBindings: undefined }, name = _a.name, namedBindings = _a.namedBindings;
                 if (namedBindings) {
                     switch (namedBindings.kind) {
-                        case 251 /* NamespaceImport */:
+                        case 252 /* NamespaceImport */:
                             handleNamespaceImportLike(namedBindings.name);
                             break;
-                        case 252 /* NamedImports */:
+                        case 253 /* NamedImports */:
                             // 'default' might be accessed as a named import `{ default as foo }`.
                             if (exportKind === 0 /* Named */ || exportKind === 1 /* Default */) {
                                 searchForNamedImport(namedBindings);
@@ -101211,7 +104336,7 @@ var ts;
                 }
             }
             /**
-             * `import x = require("./x") or `import * as x from "./x"`.
+             * `import x = require("./x")` or `import * as x from "./x"`.
              * An `export =` may be imported by this syntax, so it may be a direct import.
              * If it's not a direct import, it will be in `indirectUsers`, so we don't have to do anything here.
              */
@@ -101242,7 +104367,7 @@ var ts;
                         }
                     }
                     else {
-                        var localSymbol = element.kind === 257 /* ExportSpecifier */ && element.propertyName
+                        var localSymbol = element.kind === 258 /* ExportSpecifier */ && element.propertyName
                             ? checker.getExportSpecifierLocalTargetSymbol(element) // For re-exporting under a different name, we want to get the re-exported symbol.
                             : checker.getSymbolAtLocation(name);
                         addSearch(name, localSymbol);
@@ -101271,7 +104396,7 @@ var ts;
             for (var _i = 0, sourceFiles_1 = sourceFiles; _i < sourceFiles_1.length; _i++) {
                 var referencingFile = sourceFiles_1[_i];
                 var searchSourceFile = searchModuleSymbol.valueDeclaration;
-                if (searchSourceFile.kind === 284 /* SourceFile */) {
+                if (searchSourceFile.kind === 285 /* SourceFile */) {
                     for (var _a = 0, _b = referencingFile.referencedFiles; _a < _b.length; _a++) {
                         var ref = _b[_a];
                         if (program.getSourceFileFromReference(referencingFile, ref) === searchSourceFile) {
@@ -101319,7 +104444,7 @@ var ts;
         }
         /** Iterates over all statements at the top level or in module declarations. Returns the first truthy result. */
         function forEachPossibleImportOrExportStatement(sourceFileLike, action) {
-            return ts.forEach(sourceFileLike.kind === 284 /* SourceFile */ ? sourceFileLike.statements : sourceFileLike.body.statements, function (statement) {
+            return ts.forEach(sourceFileLike.kind === 285 /* SourceFile */ ? sourceFileLike.statements : sourceFileLike.body.statements, function (statement) {
                 return action(statement) || (isAmbientModuleDeclaration(statement) && ts.forEach(statement.body && statement.body.statements, action));
             });
         }
@@ -101334,15 +104459,15 @@ var ts;
             else {
                 forEachPossibleImportOrExportStatement(sourceFile, function (statement) {
                     switch (statement.kind) {
-                        case 255 /* ExportDeclaration */:
-                        case 249 /* ImportDeclaration */: {
+                        case 256 /* ExportDeclaration */:
+                        case 250 /* ImportDeclaration */: {
                             var decl = statement;
                             if (decl.moduleSpecifier && ts.isStringLiteral(decl.moduleSpecifier)) {
                                 action(decl, decl.moduleSpecifier);
                             }
                             break;
                         }
-                        case 248 /* ImportEqualsDeclaration */: {
+                        case 249 /* ImportEqualsDeclaration */: {
                             var decl = statement;
                             if (isExternalModuleImportEquals(decl)) {
                                 action(decl, decl.moduleReference.expression);
@@ -101366,7 +104491,7 @@ var ts;
                 var parent = node.parent;
                 var grandParent = parent.parent;
                 if (symbol.exportSymbol) {
-                    if (parent.kind === 189 /* PropertyAccessExpression */) {
+                    if (parent.kind === 190 /* PropertyAccessExpression */) {
                         // When accessing an export of a JS module, there's no alias. The symbol will still be flagged as an export even though we're at the use.
                         // So check that we are at the declaration.
                         return symbol.declarations.some(function (d) { return d === parent; }) && ts.isBinaryExpression(grandParent)
@@ -101432,7 +104557,7 @@ var ts;
                     var sym = useLhsSymbol ? checker.getSymbolAtLocation(ts.cast(node.left, ts.isPropertyAccessExpression).name) : symbol;
                     // Better detection for GH#20803
                     if (sym && !(checker.getMergedSymbol(sym.parent).flags & 1536 /* Module */)) {
-                        ts.Debug.fail("Special property assignment kind does not have a module as its parent. Assignment is " + ts.Debug.showSymbol(sym) + ", parent is " + ts.Debug.showSymbol(sym.parent));
+                        ts.Debug.fail("Special property assignment kind does not have a module as its parent. Assignment is " + ts.Debug.formatSymbol(sym) + ", parent is " + ts.Debug.formatSymbol(sym.parent));
                     }
                     return sym && exportInfo(sym, kind);
                 }
@@ -101488,10 +104613,10 @@ var ts;
         // If a reference is a class expression, the exported node would be its parent.
         // If a reference is a variable declaration, the exported node would be the variable statement.
         function getExportNode(parent, node) {
-            if (parent.kind === 237 /* VariableDeclaration */) {
+            if (parent.kind === 238 /* VariableDeclaration */) {
                 var p = parent;
                 return p.name !== node ? undefined :
-                    p.parent.kind === 274 /* CatchClause */ ? undefined : p.parent.parent.kind === 219 /* VariableStatement */ ? p.parent.parent : undefined;
+                    p.parent.kind === 275 /* CatchClause */ ? undefined : p.parent.parent.kind === 220 /* VariableStatement */ ? p.parent.parent : undefined;
             }
             else {
                 return parent;
@@ -101500,13 +104625,13 @@ var ts;
         function isNodeImport(node) {
             var parent = node.parent;
             switch (parent.kind) {
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return parent.name === node && isExternalModuleImportEquals(parent);
-                case 253 /* ImportSpecifier */:
+                case 254 /* ImportSpecifier */:
                     // For a rename import `{ foo as bar }`, don't search for the imported symbol. Just find local uses of `bar`.
                     return !parent.propertyName;
-                case 250 /* ImportClause */:
-                case 251 /* NamespaceImport */:
+                case 251 /* ImportClause */:
+                case 252 /* NamespaceImport */:
                     ts.Debug.assert(parent.name === node);
                     return true;
                 default:
@@ -101539,21 +104664,21 @@ var ts;
             return checker.getMergedSymbol(getSourceFileLikeForImportDeclaration(importer).symbol);
         }
         function getSourceFileLikeForImportDeclaration(node) {
-            if (node.kind === 191 /* CallExpression */) {
+            if (node.kind === 192 /* CallExpression */) {
                 return node.getSourceFile();
             }
             var parent = node.parent;
-            if (parent.kind === 284 /* SourceFile */) {
+            if (parent.kind === 285 /* SourceFile */) {
                 return parent;
             }
-            ts.Debug.assert(parent.kind === 245 /* ModuleBlock */);
+            ts.Debug.assert(parent.kind === 246 /* ModuleBlock */);
             return ts.cast(parent.parent, isAmbientModuleDeclaration);
         }
         function isAmbientModuleDeclaration(node) {
-            return node.kind === 244 /* ModuleDeclaration */ && node.name.kind === 10 /* StringLiteral */;
+            return node.kind === 245 /* ModuleDeclaration */ && node.name.kind === 10 /* StringLiteral */;
         }
         function isExternalModuleImportEquals(eq) {
-            return eq.moduleReference.kind === 259 /* ExternalModuleReference */ && eq.moduleReference.expression.kind === 10 /* StringLiteral */;
+            return eq.moduleReference.kind === 260 /* ExternalModuleReference */ && eq.moduleReference.expression.kind === 10 /* StringLiteral */;
         }
     })(FindAllReferences = ts.FindAllReferences || (ts.FindAllReferences = {}));
 })(ts || (ts = {}));
@@ -101580,9 +104705,131 @@ var ts;
         })(EntryKind = FindAllReferences.EntryKind || (FindAllReferences.EntryKind = {}));
         function nodeEntry(node, kind) {
             if (kind === void 0) { kind = 1 /* Node */; }
-            return { kind: kind, node: node.name || node };
+            return {
+                kind: kind,
+                node: node.name || node,
+                context: getContextNodeForNodeEntry(node)
+            };
         }
         FindAllReferences.nodeEntry = nodeEntry;
+        function isContextWithStartAndEndNode(node) {
+            return node && node.kind === undefined;
+        }
+        FindAllReferences.isContextWithStartAndEndNode = isContextWithStartAndEndNode;
+        function getContextNodeForNodeEntry(node) {
+            if (ts.isDeclaration(node)) {
+                return getContextNode(node);
+            }
+            if (!node.parent)
+                return undefined;
+            if (!ts.isDeclaration(node.parent) && !ts.isExportAssignment(node.parent)) {
+                // Special property assignment in javascript
+                if (ts.isInJSFile(node)) {
+                    var binaryExpression = ts.isBinaryExpression(node.parent) ?
+                        node.parent :
+                        ts.isPropertyAccessExpression(node.parent) &&
+                            ts.isBinaryExpression(node.parent.parent) &&
+                            node.parent.parent.left === node.parent ?
+                            node.parent.parent :
+                            undefined;
+                    if (binaryExpression && ts.getAssignmentDeclarationKind(binaryExpression) !== 0 /* None */) {
+                        return getContextNode(binaryExpression);
+                    }
+                }
+                // Jsx Tags
+                if (ts.isJsxOpeningElement(node.parent) || ts.isJsxClosingElement(node.parent)) {
+                    return node.parent.parent;
+                }
+                else if (ts.isJsxSelfClosingElement(node.parent) ||
+                    ts.isLabeledStatement(node.parent) ||
+                    ts.isBreakOrContinueStatement(node.parent)) {
+                    return node.parent;
+                }
+                else if (ts.isStringLiteralLike(node)) {
+                    var validImport = ts.tryGetImportFromModuleSpecifier(node);
+                    if (validImport) {
+                        var declOrStatement = ts.findAncestor(validImport, function (node) {
+                            return ts.isDeclaration(node) ||
+                                ts.isStatement(node) ||
+                                ts.isJSDocTag(node);
+                        });
+                        return ts.isDeclaration(declOrStatement) ?
+                            getContextNode(declOrStatement) :
+                            declOrStatement;
+                    }
+                }
+                // Handle computed property name
+                var propertyName = ts.findAncestor(node, ts.isComputedPropertyName);
+                return propertyName ?
+                    getContextNode(propertyName.parent) :
+                    undefined;
+            }
+            if (node.parent.name === node || // node is name of declaration, use parent
+                ts.isConstructorDeclaration(node.parent) ||
+                ts.isExportAssignment(node.parent) ||
+                // Property name of the import export specifier or binding pattern, use parent
+                ((ts.isImportOrExportSpecifier(node.parent) || ts.isBindingElement(node.parent))
+                    && node.parent.propertyName === node) ||
+                // Is default export
+                (node.kind === 81 /* DefaultKeyword */ && ts.hasModifier(node.parent, 513 /* ExportDefault */))) {
+                return getContextNode(node.parent);
+            }
+            return undefined;
+        }
+        function getContextNode(node) {
+            if (!node)
+                return undefined;
+            switch (node.kind) {
+                case 238 /* VariableDeclaration */:
+                    return !ts.isVariableDeclarationList(node.parent) || node.parent.declarations.length !== 1 ?
+                        node :
+                        ts.isVariableStatement(node.parent.parent) ?
+                            node.parent.parent :
+                            ts.isForInOrOfStatement(node.parent.parent) ?
+                                getContextNode(node.parent.parent) :
+                                node.parent;
+                case 187 /* BindingElement */:
+                    return getContextNode(node.parent.parent);
+                case 254 /* ImportSpecifier */:
+                    return node.parent.parent.parent;
+                case 258 /* ExportSpecifier */:
+                case 252 /* NamespaceImport */:
+                    return node.parent.parent;
+                case 251 /* ImportClause */:
+                    return node.parent;
+                case 205 /* BinaryExpression */:
+                    return ts.isExpressionStatement(node.parent) ?
+                        node.parent :
+                        node;
+                case 228 /* ForOfStatement */:
+                case 227 /* ForInStatement */:
+                    return {
+                        start: node.initializer,
+                        end: node.expression
+                    };
+                case 276 /* PropertyAssignment */:
+                case 277 /* ShorthandPropertyAssignment */:
+                    return ts.isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent) ?
+                        getContextNode(ts.findAncestor(node.parent, function (node) {
+                            return ts.isBinaryExpression(node) || ts.isForInOrOfStatement(node);
+                        })) :
+                        node;
+                default:
+                    return node;
+            }
+        }
+        FindAllReferences.getContextNode = getContextNode;
+        function toContextSpan(textSpan, sourceFile, context) {
+            if (!context)
+                return undefined;
+            var contextSpan = isContextWithStartAndEndNode(context) ?
+                getTextSpan(context.start, sourceFile, context.end) :
+                getTextSpan(context, sourceFile);
+            return contextSpan.start !== textSpan.start || contextSpan.length !== textSpan.length ?
+                { contextSpan: contextSpan } :
+                undefined;
+        }
+        FindAllReferences.toContextSpan = toContextSpan;
         function findReferencedSymbols(program, cancellationToken, sourceFiles, sourceFile, position) {
             var node = ts.getTouchingPropertyName(sourceFile, position);
             var referencedSymbols = FindAllReferences.Core.getReferencedSymbolsForNode(position, node, program, sourceFiles, cancellationToken);
@@ -101605,18 +104852,18 @@ var ts;
         }
         FindAllReferences.getImplementationsAtPosition = getImplementationsAtPosition;
         function getImplementationReferenceEntries(program, cancellationToken, sourceFiles, node, position) {
-            if (node.kind === 284 /* SourceFile */) {
+            if (node.kind === 285 /* SourceFile */) {
                 return undefined;
             }
             var checker = program.getTypeChecker();
             // If invoked directly on a shorthand property assignment, then return
             // the declaration of the symbol being assigned (not the symbol being assigned to).
-            if (node.parent.kind === 276 /* ShorthandPropertyAssignment */) {
+            if (node.parent.kind === 277 /* ShorthandPropertyAssignment */) {
                 var result_1 = [];
                 FindAllReferences.Core.getReferenceEntriesForShorthandPropertyAssignment(node, checker, function (node) { return result_1.push(nodeEntry(node)); });
                 return result_1;
             }
-            else if (node.kind === 98 /* SuperKeyword */ || ts.isSuperProperty(node.parent)) {
+            else if (node.kind === 99 /* SuperKeyword */ || ts.isSuperProperty(node.parent)) {
                 // References to and accesses on the super keyword only have one possible implementation, so no
                 // need to "Find all References"
                 var symbol = checker.getSymbolAtLocation(node);
@@ -101647,7 +104894,16 @@ var ts;
                         var symbol = def.symbol;
                         var _a = getDefinitionKindAndDisplayParts(symbol, checker, originalNode), displayParts_1 = _a.displayParts, kind_1 = _a.kind;
                         var name_1 = displayParts_1.map(function (p) { return p.text; }).join("");
-                        return { node: symbol.declarations ? ts.getNameOfDeclaration(ts.first(symbol.declarations)) || ts.first(symbol.declarations) : originalNode, name: name_1, kind: kind_1, displayParts: displayParts_1 };
+                        var declaration = symbol.declarations ? ts.first(symbol.declarations) : undefined;
+                        return {
+                            node: declaration ?
+                                ts.getNameOfDeclaration(declaration) || declaration :
+                                originalNode,
+                            name: name_1,
+                            kind: kind_1,
+                            displayParts: displayParts_1,
+                            context: getContextNode(declaration)
+                        };
                     }
                     case 1 /* Label */: {
                         var node_1 = def.node;
@@ -101672,9 +104928,13 @@ var ts;
                         return ts.Debug.assertNever(def);
                 }
             })();
-            var node = info.node, name = info.name, kind = info.kind, displayParts = info.displayParts;
+            var node = info.node, name = info.name, kind = info.kind, displayParts = info.displayParts, context = info.context;
             var sourceFile = node.getSourceFile();
-            return { containerKind: "" /* unknown */, containerName: "", fileName: sourceFile.fileName, kind: kind, name: name, textSpan: getTextSpan(ts.isComputedPropertyName(node) ? node.expression : node, sourceFile), displayParts: displayParts };
+            var textSpan = getTextSpan(ts.isComputedPropertyName(node) ? node.expression : node, sourceFile);
+            return __assign({ containerKind: "" /* unknown */, containerName: "", fileName: sourceFile.fileName, kind: kind,
+                name: name,
+                textSpan: textSpan,
+                displayParts: displayParts }, toContextSpan(textSpan, sourceFile, context));
         }
         function getDefinitionKindAndDisplayParts(symbol, checker, node) {
             var meaning = FindAllReferences.Core.getIntersectingMeaningFromDeclarations(node, symbol);
@@ -101687,20 +104947,14 @@ var ts;
         }
         FindAllReferences.toRenameLocation = toRenameLocation;
         function toReferenceEntry(entry) {
-            var _a = entryToDocumentSpan(entry), textSpan = _a.textSpan, fileName = _a.fileName;
+            var documentSpan = entryToDocumentSpan(entry);
             if (entry.kind === 0 /* Span */) {
-                return { textSpan: textSpan, fileName: fileName, isWriteAccess: false, isDefinition: false };
+                return __assign({}, documentSpan, { isWriteAccess: false, isDefinition: false });
             }
             var kind = entry.kind, node = entry.node;
-            return {
-                textSpan: textSpan,
-                fileName: fileName,
-                isWriteAccess: isWriteAccessForReference(node),
-                isDefinition: node.kind === 80 /* DefaultKeyword */
+            return __assign({}, documentSpan, { isWriteAccess: isWriteAccessForReference(node), isDefinition: node.kind === 81 /* DefaultKeyword */
                     || !!ts.getDeclarationFromName(node)
-                    || ts.isLiteralComputedPropertyDeclarationName(node),
-                isInString: kind === 2 /* StringLiteral */ ? true : undefined,
-            };
+                    || ts.isLiteralComputedPropertyDeclarationName(node), isInString: kind === 2 /* StringLiteral */ ? true : undefined });
         }
         FindAllReferences.toReferenceEntry = toReferenceEntry;
         function entryToDocumentSpan(entry) {
@@ -101709,7 +104963,8 @@ var ts;
             }
             else {
                 var sourceFile = entry.node.getSourceFile();
-                return { textSpan: getTextSpan(entry.node, sourceFile), fileName: sourceFile.fileName };
+                var textSpan = getTextSpan(entry.node, sourceFile);
+                return __assign({ textSpan: textSpan, fileName: sourceFile.fileName }, toContextSpan(textSpan, sourceFile, entry.context));
             }
         }
         function getPrefixAndSuffixText(entry, originalNode, checker) {
@@ -101738,14 +104993,13 @@ var ts;
             return ts.emptyOptions;
         }
         function toImplementationLocation(entry, checker) {
+            var documentSpan = entryToDocumentSpan(entry);
             if (entry.kind !== 0 /* Span */) {
                 var node = entry.node;
-                var sourceFile = node.getSourceFile();
-                return __assign({ textSpan: getTextSpan(node, sourceFile), fileName: sourceFile.fileName }, implementationKindDisplayParts(node, checker));
+                return __assign({}, documentSpan, implementationKindDisplayParts(node, checker));
             }
             else {
-                var textSpan = entry.textSpan, fileName = entry.fileName;
-                return { textSpan: textSpan, fileName: fileName, kind: "" /* unknown */, displayParts: [] };
+                return __assign({}, documentSpan, { kind: "" /* unknown */, displayParts: [] });
             }
         }
         function implementationKindDisplayParts(node, checker) {
@@ -101753,13 +105007,13 @@ var ts;
             if (symbol) {
                 return getDefinitionKindAndDisplayParts(symbol, checker, node);
             }
-            else if (node.kind === 188 /* ObjectLiteralExpression */) {
+            else if (node.kind === 189 /* ObjectLiteralExpression */) {
                 return {
                     kind: "interface" /* interfaceElement */,
                     displayParts: [ts.punctuationPart(20 /* OpenParenToken */), ts.textPart("object literal"), ts.punctuationPart(21 /* CloseParenToken */)]
                 };
             }
-            else if (node.kind === 209 /* ClassExpression */) {
+            else if (node.kind === 210 /* ClassExpression */) {
                 return {
                     kind: "local class" /* localClassElement */,
                     displayParts: [ts.punctuationPart(20 /* OpenParenToken */), ts.textPart("anonymous local class"), ts.punctuationPart(21 /* CloseParenToken */)]
@@ -101770,25 +105024,26 @@ var ts;
             }
         }
         function toHighlightSpan(entry) {
+            var documentSpan = entryToDocumentSpan(entry);
             if (entry.kind === 0 /* Span */) {
-                var fileName = entry.fileName, textSpan = entry.textSpan;
-                return { fileName: fileName, span: { textSpan: textSpan, kind: "reference" /* reference */ } };
+                return {
+                    fileName: documentSpan.fileName,
+                    span: {
+                        textSpan: documentSpan.textSpan,
+                        kind: "reference" /* reference */
+                    }
+                };
             }
-            var node = entry.node, kind = entry.kind;
-            var sourceFile = node.getSourceFile();
-            var writeAccess = isWriteAccessForReference(node);
-            var span = {
-                textSpan: getTextSpan(node, sourceFile),
-                kind: writeAccess ? "writtenReference" /* writtenReference */ : "reference" /* reference */,
-                isInString: kind === 2 /* StringLiteral */ ? true : undefined,
-            };
-            return { fileName: sourceFile.fileName, span: span };
+            var writeAccess = isWriteAccessForReference(entry.node);
+            var span = __assign({ textSpan: documentSpan.textSpan, kind: writeAccess ? "writtenReference" /* writtenReference */ : "reference" /* reference */, isInString: entry.kind === 2 /* StringLiteral */ ? true : undefined }, documentSpan.contextSpan && { contextSpan: documentSpan.contextSpan });
+            return { fileName: documentSpan.fileName, span: span };
         }
         FindAllReferences.toHighlightSpan = toHighlightSpan;
-        function getTextSpan(node, sourceFile) {
+        function getTextSpan(node, sourceFile, endNode) {
             var start = node.getStart(sourceFile);
-            var end = node.getEnd();
+            var end = (endNode || node).getEnd();
             if (node.kind === 10 /* StringLiteral */) {
+                ts.Debug.assert(endNode === undefined);
                 start += 1;
                 end -= 1;
             }
@@ -101802,7 +105057,7 @@ var ts;
         /** A node is considered a writeAccess iff it is a name of a declaration or a target of an assignment */
         function isWriteAccessForReference(node) {
             var decl = ts.getDeclarationFromName(node);
-            return !!decl && declarationIsWriteAccess(decl) || node.kind === 80 /* DefaultKeyword */ || ts.isWriteAccess(node);
+            return !!decl && declarationIsWriteAccess(decl) || node.kind === 81 /* DefaultKeyword */ || ts.isWriteAccess(node);
         }
         /**
          * True if 'decl' provides a value, as in `function f() {}`;
@@ -101813,46 +105068,46 @@ var ts;
             if (!!(decl.flags & 4194304 /* Ambient */))
                 return true;
             switch (decl.kind) {
-                case 204 /* BinaryExpression */:
-                case 186 /* BindingElement */:
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
-                case 80 /* DefaultKeyword */:
-                case 243 /* EnumDeclaration */:
-                case 278 /* EnumMember */:
-                case 257 /* ExportSpecifier */:
-                case 250 /* ImportClause */: // default import
-                case 248 /* ImportEqualsDeclaration */:
-                case 253 /* ImportSpecifier */:
-                case 241 /* InterfaceDeclaration */:
-                case 302 /* JSDocCallbackTag */:
-                case 309 /* JSDocTypedefTag */:
-                case 267 /* JsxAttribute */:
-                case 244 /* ModuleDeclaration */:
-                case 247 /* NamespaceExportDeclaration */:
-                case 251 /* NamespaceImport */:
-                case 151 /* Parameter */:
-                case 276 /* ShorthandPropertyAssignment */:
-                case 242 /* TypeAliasDeclaration */:
-                case 150 /* TypeParameter */:
+                case 205 /* BinaryExpression */:
+                case 187 /* BindingElement */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
+                case 81 /* DefaultKeyword */:
+                case 244 /* EnumDeclaration */:
+                case 279 /* EnumMember */:
+                case 258 /* ExportSpecifier */:
+                case 251 /* ImportClause */: // default import
+                case 249 /* ImportEqualsDeclaration */:
+                case 254 /* ImportSpecifier */:
+                case 242 /* InterfaceDeclaration */:
+                case 304 /* JSDocCallbackTag */:
+                case 311 /* JSDocTypedefTag */:
+                case 268 /* JsxAttribute */:
+                case 245 /* ModuleDeclaration */:
+                case 248 /* NamespaceExportDeclaration */:
+                case 252 /* NamespaceImport */:
+                case 152 /* Parameter */:
+                case 277 /* ShorthandPropertyAssignment */:
+                case 243 /* TypeAliasDeclaration */:
+                case 151 /* TypeParameter */:
                     return true;
-                case 275 /* PropertyAssignment */:
+                case 276 /* PropertyAssignment */:
                     // In `({ x: y } = 0);`, `x` is not a write access. (Won't call this function for `y`.)
                     return !ts.isArrayLiteralOrObjectLiteralDestructuringPattern(decl.parent);
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
-                case 157 /* Constructor */:
-                case 156 /* MethodDeclaration */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 158 /* Constructor */:
+                case 157 /* MethodDeclaration */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     return !!decl.body;
-                case 237 /* VariableDeclaration */:
-                case 154 /* PropertyDeclaration */:
+                case 238 /* VariableDeclaration */:
+                case 155 /* PropertyDeclaration */:
                     return !!decl.initializer || ts.isCatchClause(decl.parent);
-                case 155 /* MethodSignature */:
-                case 153 /* PropertySignature */:
-                case 310 /* JSDocPropertyTag */:
-                case 304 /* JSDocParameterTag */:
+                case 156 /* MethodSignature */:
+                case 154 /* PropertySignature */:
+                case 312 /* JSDocPropertyTag */:
+                case 306 /* JSDocParameterTag */:
                     return false;
                 default:
                     return ts.Debug.failBadSyntaxKind(decl);
@@ -102012,10 +105267,10 @@ var ts;
                 for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                     var decl = _a[_i];
                     switch (decl.kind) {
-                        case 284 /* SourceFile */:
+                        case 285 /* SourceFile */:
                             // Don't include the source file itself. (This may not be ideal behavior, but awkward to include an entire file as a reference.)
                             break;
-                        case 244 /* ModuleDeclaration */:
+                        case 245 /* ModuleDeclaration */:
                             if (sourceFilesSet.has(decl.getSourceFile().fileName)) {
                                 references.push(FindAllReferences.nodeEntry(decl.name));
                             }
@@ -102035,7 +105290,7 @@ var ts;
                             var node = ts.isBinaryExpression(decl) && ts.isPropertyAccessExpression(decl.left)
                                 ? decl.left.expression
                                 : ts.isExportAssignment(decl)
-                                    ? ts.Debug.assertDefined(ts.findChildOfKind(decl, 85 /* ExportKeyword */, sourceFile))
+                                    ? ts.Debug.assertDefined(ts.findChildOfKind(decl, 86 /* ExportKeyword */, sourceFile))
                                     : ts.getNameOfDeclaration(decl) || decl;
                             references.push(FindAllReferences.nodeEntry(node));
                         }
@@ -102062,7 +105317,7 @@ var ts;
                 if (ts.isThis(node)) {
                     return getReferencesForThisKeyword(node, sourceFiles, cancellationToken);
                 }
-                if (node.kind === 98 /* SuperKeyword */) {
+                if (node.kind === 99 /* SuperKeyword */) {
                     return getReferencesForSuperKeyword(node);
                 }
                 return undefined;
@@ -102079,34 +105334,37 @@ var ts;
                     // When renaming at an export specifier, rename the export and not the thing being exported.
                     getReferencesAtExportSpecifier(exportSpecifier.name, symbol, exportSpecifier, state.createSearch(node, originalSymbol, /*comingFrom*/ undefined), state, /*addReferencesHere*/ true, /*alwaysGetReferences*/ true);
                 }
-                else if (node && node.kind === 80 /* DefaultKeyword */) {
+                else if (node && node.kind === 81 /* DefaultKeyword */) {
                     addReference(node, symbol, state);
                     searchForImportsOfExport(node, symbol, { exportingModuleSymbol: ts.Debug.assertDefined(symbol.parent, "Expected export symbol to have a parent"), exportKind: 1 /* Default */ }, state);
                 }
                 else {
                     var search = state.createSearch(node, symbol, /*comingFrom*/ undefined, { allSearchSymbols: node ? populateSearchSymbolSet(symbol, node, checker, !!options.isForRename, !!options.providePrefixAndSuffixTextForRename, !!options.implementations) : [symbol] });
-                    // Try to get the smallest valid scope that we can limit our search to;
-                    // otherwise we'll need to search globally (i.e. include each file).
-                    var scope = getSymbolScope(symbol);
-                    if (scope) {
-                        getReferencesInContainer(scope, scope.getSourceFile(), search, state, /*addReferencesHere*/ !(ts.isSourceFile(scope) && !ts.contains(sourceFiles, scope)));
-                    }
-                    else {
-                        // Global search
-                        for (var _i = 0, _a = state.sourceFiles; _i < _a.length; _i++) {
-                            var sourceFile = _a[_i];
-                            state.cancellationToken.throwIfCancellationRequested();
-                            searchForName(sourceFile, search, state);
-                        }
-                    }
+                    getReferencesInContainerOrFiles(symbol, state, search);
                 }
                 return result;
             }
+            function getReferencesInContainerOrFiles(symbol, state, search) {
+                // Try to get the smallest valid scope that we can limit our search to;
+                // otherwise we'll need to search globally (i.e. include each file).
+                var scope = getSymbolScope(symbol);
+                if (scope) {
+                    getReferencesInContainer(scope, scope.getSourceFile(), search, state, /*addReferencesHere*/ !(ts.isSourceFile(scope) && !ts.contains(state.sourceFiles, scope)));
+                }
+                else {
+                    // Global search
+                    for (var _i = 0, _a = state.sourceFiles; _i < _a.length; _i++) {
+                        var sourceFile = _a[_i];
+                        state.cancellationToken.throwIfCancellationRequested();
+                        searchForName(sourceFile, search, state);
+                    }
+                }
+            }
             function getSpecialSearchKind(node) {
                 switch (node.kind) {
-                    case 124 /* ConstructorKeyword */:
+                    case 125 /* ConstructorKeyword */:
                         return 1 /* Constructor */;
-                    case 72 /* Identifier */:
+                    case 73 /* Identifier */:
                         if (ts.isClassLike(node.parent)) {
                             ts.Debug.assert(node.parent.name === node);
                             return 2 /* Class */;
@@ -102129,7 +105387,7 @@ var ts;
                         if (symbol.flags & 33554432 /* Transient */)
                             return undefined;
                         // Assertions for GH#21814. We should be handling SourceFile symbols in `getReferencedSymbolsForModule` instead of getting here.
-                        ts.Debug.fail("Unexpected symbol at " + ts.Debug.showSyntaxKind(node) + ": " + ts.Debug.showSymbol(symbol));
+                        ts.Debug.fail("Unexpected symbol at " + ts.Debug.formatSyntaxKind(node.kind) + ": " + ts.Debug.formatSymbol(symbol));
                     }
                     return ts.isTypeLiteralNode(decl.parent) && ts.isUnionTypeNode(decl.parent.parent)
                         ? checker.getPropertyOfType(checker.getTypeFromTypeNode(decl.parent.parent), symbol.name)
@@ -102153,9 +105411,7 @@ var ts;
              * Unlike `Search`, there is only one `State`.
              */
             var State = /** @class */ (function () {
-                function State(sourceFiles, sourceFilesSet, 
-                /** True if we're searching for constructor references. */
-                specialSearchKind, checker, cancellationToken, searchMeaning, options, result) {
+                function State(sourceFiles, sourceFilesSet, specialSearchKind, checker, cancellationToken, searchMeaning, options, result) {
                     this.sourceFiles = sourceFiles;
                     this.sourceFilesSet = sourceFilesSet;
                     this.specialSearchKind = specialSearchKind;
@@ -102236,8 +105492,8 @@ var ts;
                     var sourceId = ts.getNodeId(sourceFile);
                     var seenSymbols = this.sourceFileToSeenSymbols[sourceId] || (this.sourceFileToSeenSymbols[sourceId] = ts.createMap());
                     var anyNewSymbols = false;
-                    for (var _i = 0, symbols_2 = symbols; _i < symbols_2.length; _i++) {
-                        var sym = symbols_2[_i];
+                    for (var _i = 0, symbols_3 = symbols; _i < symbols_3.length; _i++) {
+                        var sym = symbols_3[_i];
                         anyNewSymbols = ts.addToSeen(seenSymbols, ts.getSymbolId(sym)) || anyNewSymbols;
                     }
                     return anyNewSymbols;
@@ -102344,7 +105600,7 @@ var ts;
                 // If this is the symbol of a named function expression or named class expression,
                 // then named references are limited to its own scope.
                 var declarations = symbol.declarations, flags = symbol.flags, parent = symbol.parent, valueDeclaration = symbol.valueDeclaration;
-                if (valueDeclaration && (valueDeclaration.kind === 196 /* FunctionExpression */ || valueDeclaration.kind === 209 /* ClassExpression */)) {
+                if (valueDeclaration && (valueDeclaration.kind === 197 /* FunctionExpression */ || valueDeclaration.kind === 210 /* ClassExpression */)) {
                     return valueDeclaration;
                 }
                 if (!declarations) {
@@ -102354,7 +105610,7 @@ var ts;
                 if (flags & (4 /* Property */ | 8192 /* Method */)) {
                     var privateDeclaration = ts.find(declarations, function (d) { return ts.hasModifier(d, 8 /* Private */); });
                     if (privateDeclaration) {
-                        return ts.getAncestor(privateDeclaration, 240 /* ClassDeclaration */);
+                        return ts.getAncestor(privateDeclaration, 241 /* ClassDeclaration */);
                     }
                     // Else this is a public property and could be accessed from anywhere.
                     return undefined;
@@ -102383,7 +105639,7 @@ var ts;
                         // Different declarations have different containers, bail out
                         return undefined;
                     }
-                    if (!container || container.kind === 284 /* SourceFile */ && !ts.isExternalOrCommonJsModule(container)) {
+                    if (!container || container.kind === 285 /* SourceFile */ && !ts.isExternalOrCommonJsModule(container)) {
                         // This is a global variable and not an external module, any declaration defined
                         // within this scope is visible outside the file
                         return undefined;
@@ -102470,8 +105726,8 @@ var ts;
                     // We found a match.  Make sure it's not part of a larger word (i.e. the char
                     // before and after it have to be a non-identifier char).
                     var endPosition = position + symbolNameLength;
-                    if ((position === 0 || !ts.isIdentifierPart(text.charCodeAt(position - 1), 7 /* Latest */)) &&
-                        (endPosition === sourceLength || !ts.isIdentifierPart(text.charCodeAt(endPosition), 7 /* Latest */))) {
+                    if ((position === 0 || !ts.isIdentifierPart(text.charCodeAt(position - 1), 99 /* Latest */)) &&
+                        (endPosition === sourceLength || !ts.isIdentifierPart(text.charCodeAt(endPosition), 99 /* Latest */))) {
                         // Found a real match.  Keep searching.
                         positions.push(position);
                     }
@@ -102491,7 +105747,7 @@ var ts;
             function isValidReferencePosition(node, searchSymbolName) {
                 // Compare the length so we filter out strict superstrings of the symbol we are looking for
                 switch (node.kind) {
-                    case 72 /* Identifier */:
+                    case 73 /* Identifier */:
                         return node.text.length === searchSymbolName.length;
                     case 10 /* StringLiteral */: {
                         var str = node;
@@ -102500,7 +105756,7 @@ var ts;
                     }
                     case 8 /* NumericLiteral */:
                         return ts.isLiteralNameOfPropertyDeclarationOrIndexAccess(node) && node.text.length === searchSymbolName.length;
-                    case 80 /* DefaultKeyword */:
+                    case 81 /* DefaultKeyword */:
                         return "default".length === searchSymbolName.length;
                     default:
                         return false;
@@ -102564,7 +105820,7 @@ var ts;
                     return;
                 }
                 if (ts.isExportSpecifier(parent)) {
-                    ts.Debug.assert(referenceLocation.kind === 72 /* Identifier */);
+                    ts.Debug.assert(referenceLocation.kind === 73 /* Identifier */);
                     getReferencesAtExportSpecifier(referenceLocation, referenceSymbol, parent, search, state, addReferencesHere);
                     return;
                 }
@@ -102620,7 +105876,9 @@ var ts;
                 }
                 // For `export { foo as bar }`, rename `foo`, but not `bar`.
                 if (!isForRenameWithPrefixAndSuffixText(state.options) || alwaysGetReferences) {
-                    var exportKind = referenceLocation.originalKeywordKind === 80 /* DefaultKeyword */ ? 1 /* Default */ : 0 /* Named */;
+                    var isDefaultExport = referenceLocation.originalKeywordKind === 81 /* DefaultKeyword */
+                        || exportSpecifier.name.originalKeywordKind === 81 /* DefaultKeyword */;
+                    var exportKind = isDefaultExport ? 1 /* Default */ : 0 /* Named */;
                     var exportSymbol = ts.Debug.assertDefined(exportSpecifier.symbol);
                     var exportInfo = ts.Debug.assertDefined(FindAllReferences.getExportInfo(exportSymbol, exportKind, state.checker));
                     searchForImportsOfExport(referenceLocation, exportSymbol, exportInfo, state);
@@ -102698,7 +105956,7 @@ var ts;
                 }
                 var pusher = function () { return state.referenceAdder(search.symbol); };
                 if (ts.isClassLike(referenceLocation.parent)) {
-                    ts.Debug.assert(referenceLocation.kind === 80 /* DefaultKeyword */ || referenceLocation.parent.name === referenceLocation);
+                    ts.Debug.assert(referenceLocation.kind === 81 /* DefaultKeyword */ || referenceLocation.parent.name === referenceLocation);
                     // This is the class declaration containing the constructor.
                     findOwnConstructorReferences(search.symbol, sourceFile, pusher());
                 }
@@ -102707,6 +105965,7 @@ var ts;
                     var classExtending = tryGetClassByExtendingIdentifier(referenceLocation);
                     if (classExtending) {
                         findSuperConstructorAccesses(classExtending, pusher());
+                        findInheritedConstructorReferences(classExtending, state);
                     }
                 }
             }
@@ -102724,7 +105983,7 @@ var ts;
                     }
                     if (member.body) {
                         member.body.forEachChild(function cb(node) {
-                            if (node.kind === 100 /* ThisKeyword */) {
+                            if (node.kind === 101 /* ThisKeyword */) {
                                 addRef(node);
                             }
                             else if (!ts.isFunctionLike(node) && !ts.isClassLike(node)) {
@@ -102739,38 +105998,46 @@ var ts;
              * Reference the constructor and all calls to `new this()`.
              */
             function findOwnConstructorReferences(classSymbol, sourceFile, addNode) {
-                for (var _i = 0, _a = classSymbol.members.get("__constructor" /* Constructor */).declarations; _i < _a.length; _i++) {
-                    var decl = _a[_i];
-                    var ctrKeyword = ts.findChildOfKind(decl, 124 /* ConstructorKeyword */, sourceFile);
-                    ts.Debug.assert(decl.kind === 157 /* Constructor */ && !!ctrKeyword);
-                    addNode(ctrKeyword);
-                }
-                classSymbol.exports.forEach(function (member) {
-                    var decl = member.valueDeclaration;
-                    if (decl && decl.kind === 156 /* MethodDeclaration */) {
-                        var body = decl.body;
-                        if (body) {
-                            forEachDescendantOfKind(body, 100 /* ThisKeyword */, function (thisKeyword) {
-                                if (ts.isNewExpressionTarget(thisKeyword)) {
-                                    addNode(thisKeyword);
-                                }
-                            });
-                        }
+                var constructorSymbol = getClassConstructorSymbol(classSymbol);
+                if (constructorSymbol) {
+                    for (var _i = 0, _a = constructorSymbol.declarations; _i < _a.length; _i++) {
+                        var decl = _a[_i];
+                        var ctrKeyword = ts.findChildOfKind(decl, 125 /* ConstructorKeyword */, sourceFile);
+                        ts.Debug.assert(decl.kind === 158 /* Constructor */ && !!ctrKeyword);
+                        addNode(ctrKeyword);
                     }
-                });
+                }
+                if (classSymbol.exports) {
+                    classSymbol.exports.forEach(function (member) {
+                        var decl = member.valueDeclaration;
+                        if (decl && decl.kind === 157 /* MethodDeclaration */) {
+                            var body = decl.body;
+                            if (body) {
+                                forEachDescendantOfKind(body, 101 /* ThisKeyword */, function (thisKeyword) {
+                                    if (ts.isNewExpressionTarget(thisKeyword)) {
+                                        addNode(thisKeyword);
+                                    }
+                                });
+                            }
+                        }
+                    });
+                }
+            }
+            function getClassConstructorSymbol(classSymbol) {
+                return classSymbol.members && classSymbol.members.get("__constructor" /* Constructor */);
             }
             /** Find references to `super` in the constructor of an extending class.  */
-            function findSuperConstructorAccesses(cls, addNode) {
-                var ctr = cls.symbol.members.get("__constructor" /* Constructor */);
-                if (!ctr) {
+            function findSuperConstructorAccesses(classDeclaration, addNode) {
+                var constructor = getClassConstructorSymbol(classDeclaration.symbol);
+                if (!constructor) {
                     return;
                 }
-                for (var _i = 0, _a = ctr.declarations; _i < _a.length; _i++) {
+                for (var _i = 0, _a = constructor.declarations; _i < _a.length; _i++) {
                     var decl = _a[_i];
-                    ts.Debug.assert(decl.kind === 157 /* Constructor */);
+                    ts.Debug.assert(decl.kind === 158 /* Constructor */);
                     var body = decl.body;
                     if (body) {
-                        forEachDescendantOfKind(body, 98 /* SuperKeyword */, function (node) {
+                        forEachDescendantOfKind(body, 99 /* SuperKeyword */, function (node) {
                             if (ts.isCallExpressionTarget(node)) {
                                 addNode(node);
                             }
@@ -102778,16 +106045,26 @@ var ts;
                     }
                 }
             }
+            function hasOwnConstructor(classDeclaration) {
+                return !!getClassConstructorSymbol(classDeclaration.symbol);
+            }
+            function findInheritedConstructorReferences(classDeclaration, state) {
+                if (hasOwnConstructor(classDeclaration))
+                    return;
+                var classSymbol = classDeclaration.symbol;
+                var search = state.createSearch(/*location*/ undefined, classSymbol, /*comingFrom*/ undefined);
+                getReferencesInContainerOrFiles(classSymbol, state, search);
+            }
             function addImplementationReferences(refNode, addReference, state) {
                 // Check if we found a function/propertyAssignment/method with an implementation or initializer
                 if (ts.isDeclarationName(refNode) && isImplementation(refNode.parent)) {
                     addReference(refNode);
                     return;
                 }
-                if (refNode.kind !== 72 /* Identifier */) {
+                if (refNode.kind !== 73 /* Identifier */) {
                     return;
                 }
-                if (refNode.parent.kind === 276 /* ShorthandPropertyAssignment */) {
+                if (refNode.parent.kind === 277 /* ShorthandPropertyAssignment */) {
                     // Go ahead and dereference the shorthand assignment by going to its definition
                     getReferenceEntriesForShorthandPropertyAssignment(refNode, state.checker, addReference);
                 }
@@ -102807,7 +106084,7 @@ var ts;
                     }
                     else if (ts.isFunctionLike(typeHavingNode) && typeHavingNode.body) {
                         var body = typeHavingNode.body;
-                        if (body.kind === 218 /* Block */) {
+                        if (body.kind === 219 /* Block */) {
                             ts.forEachReturnStatement(body, function (returnStatement) {
                                 if (returnStatement.expression)
                                     addIfImplementation(returnStatement.expression);
@@ -102835,13 +106112,13 @@ var ts;
              */
             function isImplementationExpression(node) {
                 switch (node.kind) {
-                    case 195 /* ParenthesizedExpression */:
+                    case 196 /* ParenthesizedExpression */:
                         return isImplementationExpression(node.expression);
-                    case 197 /* ArrowFunction */:
-                    case 196 /* FunctionExpression */:
-                    case 188 /* ObjectLiteralExpression */:
-                    case 209 /* ClassExpression */:
-                    case 187 /* ArrayLiteralExpression */:
+                    case 198 /* ArrowFunction */:
+                    case 197 /* FunctionExpression */:
+                    case 189 /* ObjectLiteralExpression */:
+                    case 210 /* ClassExpression */:
+                    case 188 /* ArrayLiteralExpression */:
                         return true;
                     default:
                         return false;
@@ -102894,13 +106171,13 @@ var ts;
                 // Whether 'super' occurs in a static context within a class.
                 var staticFlag = 32 /* Static */;
                 switch (searchSpaceNode.kind) {
-                    case 154 /* PropertyDeclaration */:
-                    case 153 /* PropertySignature */:
-                    case 156 /* MethodDeclaration */:
-                    case 155 /* MethodSignature */:
-                    case 157 /* Constructor */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
+                    case 155 /* PropertyDeclaration */:
+                    case 154 /* PropertySignature */:
+                    case 157 /* MethodDeclaration */:
+                    case 156 /* MethodSignature */:
+                    case 158 /* Constructor */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
                         staticFlag &= ts.getModifierFlags(searchSpaceNode);
                         searchSpaceNode = searchSpaceNode.parent; // re-assign to be the owning class
                         break;
@@ -102909,7 +106186,7 @@ var ts;
                 }
                 var sourceFile = searchSpaceNode.getSourceFile();
                 var references = ts.mapDefined(getPossibleSymbolReferenceNodes(sourceFile, "super", searchSpaceNode), function (node) {
-                    if (node.kind !== 98 /* SuperKeyword */) {
+                    if (node.kind !== 99 /* SuperKeyword */) {
                         return;
                     }
                     var container = ts.getSuperContainer(node, /*stopOnFunctions*/ false);
@@ -102921,41 +106198,41 @@ var ts;
                 return [{ definition: { type: 0 /* Symbol */, symbol: searchSpaceNode.symbol }, references: references }];
             }
             function isParameterName(node) {
-                return node.kind === 72 /* Identifier */ && node.parent.kind === 151 /* Parameter */ && node.parent.name === node;
+                return node.kind === 73 /* Identifier */ && node.parent.kind === 152 /* Parameter */ && node.parent.name === node;
             }
             function getReferencesForThisKeyword(thisOrSuperKeyword, sourceFiles, cancellationToken) {
                 var searchSpaceNode = ts.getThisContainer(thisOrSuperKeyword, /* includeArrowFunctions */ false);
                 // Whether 'this' occurs in a static context within a class.
                 var staticFlag = 32 /* Static */;
                 switch (searchSpaceNode.kind) {
-                    case 156 /* MethodDeclaration */:
-                    case 155 /* MethodSignature */:
+                    case 157 /* MethodDeclaration */:
+                    case 156 /* MethodSignature */:
                         if (ts.isObjectLiteralMethod(searchSpaceNode)) {
                             break;
                         }
                     // falls through
-                    case 154 /* PropertyDeclaration */:
-                    case 153 /* PropertySignature */:
-                    case 157 /* Constructor */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
+                    case 155 /* PropertyDeclaration */:
+                    case 154 /* PropertySignature */:
+                    case 158 /* Constructor */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
                         staticFlag &= ts.getModifierFlags(searchSpaceNode);
                         searchSpaceNode = searchSpaceNode.parent; // re-assign to be the owning class
                         break;
-                    case 284 /* SourceFile */:
+                    case 285 /* SourceFile */:
                         if (ts.isExternalModule(searchSpaceNode) || isParameterName(thisOrSuperKeyword)) {
                             return undefined;
                         }
                     // falls through
-                    case 239 /* FunctionDeclaration */:
-                    case 196 /* FunctionExpression */:
+                    case 240 /* FunctionDeclaration */:
+                    case 197 /* FunctionExpression */:
                         break;
                     // Computed properties in classes are not handled here because references to this are illegal,
                     // so there is no point finding references to them.
                     default:
                         return undefined;
                 }
-                var references = ts.flatMap(searchSpaceNode.kind === 284 /* SourceFile */ ? sourceFiles : [searchSpaceNode.getSourceFile()], function (sourceFile) {
+                var references = ts.flatMap(searchSpaceNode.kind === 285 /* SourceFile */ ? sourceFiles : [searchSpaceNode.getSourceFile()], function (sourceFile) {
                     cancellationToken.throwIfCancellationRequested();
                     return getPossibleSymbolReferenceNodes(sourceFile, "this", ts.isSourceFile(searchSpaceNode) ? sourceFile : searchSpaceNode).filter(function (node) {
                         if (!ts.isThis(node)) {
@@ -102963,19 +106240,19 @@ var ts;
                         }
                         var container = ts.getThisContainer(node, /* includeArrowFunctions */ false);
                         switch (searchSpaceNode.kind) {
-                            case 196 /* FunctionExpression */:
-                            case 239 /* FunctionDeclaration */:
+                            case 197 /* FunctionExpression */:
+                            case 240 /* FunctionDeclaration */:
                                 return searchSpaceNode.symbol === container.symbol;
-                            case 156 /* MethodDeclaration */:
-                            case 155 /* MethodSignature */:
+                            case 157 /* MethodDeclaration */:
+                            case 156 /* MethodSignature */:
                                 return ts.isObjectLiteralMethod(searchSpaceNode) && searchSpaceNode.symbol === container.symbol;
-                            case 209 /* ClassExpression */:
-                            case 240 /* ClassDeclaration */:
+                            case 210 /* ClassExpression */:
+                            case 241 /* ClassDeclaration */:
                                 // Make sure the container belongs to the same class
                                 // and has the appropriate static modifier from the original container.
                                 return container.parent && searchSpaceNode.symbol === container.parent.symbol && (ts.getModifierFlags(container) & 32 /* Static */) === staticFlag;
-                            case 284 /* SourceFile */:
-                                return container.kind === 284 /* SourceFile */ && !ts.isExternalModule(container) && !isParameterName(node);
+                            case 285 /* SourceFile */:
+                                return container.kind === 285 /* SourceFile */ && !ts.isExternalModule(container) && !isParameterName(node);
                         }
                     });
                 }).map(function (n) { return FindAllReferences.nodeEntry(n); });
@@ -103094,7 +106371,7 @@ var ts;
                     });
                 }
                 function getPropertySymbolOfObjectBindingPatternWithoutPropertyName(symbol, checker) {
-                    var bindingElement = ts.getDeclarationOfKind(symbol, 186 /* BindingElement */);
+                    var bindingElement = ts.getDeclarationOfKind(symbol, 187 /* BindingElement */);
                     if (bindingElement && ts.isObjectBindingElementWithoutPropertyName(bindingElement)) {
                         return ts.getPropertySymbolFromBindingElement(checker, bindingElement);
                     }
@@ -103453,7 +106730,7 @@ var ts;
                 else {
                     var defs = getDefinitionFromSymbol(typeChecker, symbol, node) || ts.emptyArray;
                     // For a 'super()' call, put the signature first, else put the variable first.
-                    return node.kind === 98 /* SuperKeyword */ ? [sigInfo].concat(defs) : defs.concat([sigInfo]);
+                    return node.kind === 99 /* SuperKeyword */ ? [sigInfo].concat(defs) : defs.concat([sigInfo]);
                 }
             }
             // Because name in short-hand property assignment has two different meanings: property name and property value,
@@ -103461,7 +106738,7 @@ var ts;
             // go to the declaration of the property name (in this case stay at the same position). However, if go-to-definition
             // is performed at the location of property access, we would like to go to definition of the property in the short-hand
             // assignment. This case and others are handled by the following code.
-            if (node.parent.kind === 276 /* ShorthandPropertyAssignment */) {
+            if (node.parent.kind === 277 /* ShorthandPropertyAssignment */) {
                 var shorthandSymbol_1 = typeChecker.getShorthandAssignmentValueSymbol(symbol.valueDeclaration);
                 return shorthandSymbol_1 ? shorthandSymbol_1.declarations.map(function (decl) { return createDefinitionInfo(decl, typeChecker, shorthandSymbol_1, node); }) : [];
             }
@@ -103517,7 +106794,7 @@ var ts;
         function getReferenceAtPosition(sourceFile, position, program) {
             var referencePath = findReferenceInPosition(sourceFile.referencedFiles, position);
             if (referencePath) {
-                var file = ts.tryResolveScriptReference(program, sourceFile, referencePath);
+                var file = program.getSourceFileFromReference(sourceFile, referencePath);
                 return file && { fileName: referencePath.fileName, file: file };
             }
             var typeReferenceDirective = findReferenceInPosition(sourceFile.typeReferenceDirectives, position);
@@ -103614,18 +106891,18 @@ var ts;
         //   (2) when the aliased symbol is originating from an import.
         //
         function shouldSkipAlias(node, declaration) {
-            if (node.kind !== 72 /* Identifier */) {
+            if (node.kind !== 73 /* Identifier */) {
                 return false;
             }
             if (node.parent === declaration) {
                 return true;
             }
             switch (declaration.kind) {
-                case 250 /* ImportClause */:
-                case 248 /* ImportEqualsDeclaration */:
+                case 251 /* ImportClause */:
+                case 249 /* ImportEqualsDeclaration */:
                     return true;
-                case 253 /* ImportSpecifier */:
-                    return declaration.parent.kind === 252 /* NamedImports */;
+                case 254 /* ImportSpecifier */:
+                    return declaration.parent.kind === 253 /* NamedImports */;
                 default:
                     return false;
             }
@@ -103635,7 +106912,7 @@ var ts;
             function getConstructSignatureDefinition() {
                 // Applicable only if we are in a new expression, or we are on a constructor declaration
                 // and in either case the symbol has a construct signature definition, i.e. class
-                if (symbol.flags & 32 /* Class */ && (ts.isNewExpressionTarget(node) || node.kind === 124 /* ConstructorKeyword */)) {
+                if (symbol.flags & 32 /* Class */ && (ts.isNewExpressionTarget(node) || node.kind === 125 /* ConstructorKeyword */)) {
                     var cls = ts.find(symbol.declarations, ts.isClassLike) || ts.Debug.fail("Expected declaration to have at least one class-like declaration");
                     return getSignatureDefinition(cls.members, /*selectConstructors*/ true);
                 }
@@ -103666,14 +106943,9 @@ var ts;
         function createDefinitionInfoFromName(declaration, symbolKind, symbolName, containerName) {
             var name = ts.getNameOfDeclaration(declaration) || declaration;
             var sourceFile = name.getSourceFile();
-            return {
-                fileName: sourceFile.fileName,
-                textSpan: ts.createTextSpanFromNode(name, sourceFile),
-                kind: symbolKind,
-                name: symbolName,
-                containerKind: undefined,
-                containerName: containerName
-            };
+            var textSpan = ts.createTextSpanFromNode(name, sourceFile);
+            return __assign({ fileName: sourceFile.fileName, textSpan: textSpan, kind: symbolKind, name: symbolName, containerKind: undefined, // TODO: GH#18217
+                containerName: containerName }, ts.FindAllReferences.toContextSpan(textSpan, sourceFile, ts.FindAllReferences.getContextNode(declaration)));
         }
         function createDefinitionFromSignatureDeclaration(typeChecker, decl) {
             return createDefinitionInfo(decl, typeChecker, decl.symbol, decl);
@@ -103709,9 +106981,9 @@ var ts;
         }
         function isConstructorLike(node) {
             switch (node.kind) {
-                case 157 /* Constructor */:
-                case 166 /* ConstructorType */:
-                case 161 /* ConstructSignature */:
+                case 158 /* Constructor */:
+                case 167 /* ConstructorType */:
+                case 162 /* ConstructSignature */:
                     return true;
                 default:
                     return false;
@@ -103829,11 +107101,11 @@ var ts;
         JsDoc.getJsDocCommentsFromDeclarations = getJsDocCommentsFromDeclarations;
         function getCommentHavingNodes(declaration) {
             switch (declaration.kind) {
-                case 304 /* JSDocParameterTag */:
-                case 310 /* JSDocPropertyTag */:
+                case 306 /* JSDocParameterTag */:
+                case 312 /* JSDocPropertyTag */:
                     return [declaration];
-                case 302 /* JSDocCallbackTag */:
-                case 309 /* JSDocTypedefTag */:
+                case 304 /* JSDocCallbackTag */:
+                case 311 /* JSDocTypedefTag */:
                     return [declaration, declaration.parent];
                 default:
                     return ts.getJSDocCommentsAndTags(declaration);
@@ -103854,16 +107126,16 @@ var ts;
         function getCommentText(tag) {
             var comment = tag.comment;
             switch (tag.kind) {
-                case 300 /* JSDocAugmentsTag */:
+                case 301 /* JSDocAugmentsTag */:
                     return withNode(tag.class);
-                case 308 /* JSDocTemplateTag */:
+                case 310 /* JSDocTemplateTag */:
                     return withList(tag.typeParameters);
-                case 307 /* JSDocTypeTag */:
+                case 309 /* JSDocTypeTag */:
                     return withNode(tag.typeExpression);
-                case 309 /* JSDocTypedefTag */:
-                case 302 /* JSDocCallbackTag */:
-                case 310 /* JSDocPropertyTag */:
-                case 304 /* JSDocParameterTag */:
+                case 311 /* JSDocTypedefTag */:
+                case 304 /* JSDocCallbackTag */:
+                case 312 /* JSDocPropertyTag */:
+                case 306 /* JSDocParameterTag */:
                     var name = tag.name;
                     return name ? withNode(name) : comment;
                 default:
@@ -104040,7 +107312,7 @@ var ts;
         function parameterDocComments(parameters, isJavaScriptFile, indentationStr, newLine) {
             return parameters.map(function (_a, i) {
                 var name = _a.name, dotDotDotToken = _a.dotDotDotToken;
-                var paramName = name.kind === 72 /* Identifier */ ? name.text : "param" + i;
+                var paramName = name.kind === 73 /* Identifier */ ? name.text : "param" + i;
                 var type = isJavaScriptFile ? (dotDotDotToken ? "{...any} " : "{any} ") : "";
                 return indentationStr + " * @param " + type + paramName + newLine;
             }).join("");
@@ -104050,23 +107322,23 @@ var ts;
         }
         function getCommentOwnerInfoWorker(commentOwner) {
             switch (commentOwner.kind) {
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
-                case 156 /* MethodDeclaration */:
-                case 157 /* Constructor */:
-                case 155 /* MethodSignature */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 157 /* MethodDeclaration */:
+                case 158 /* Constructor */:
+                case 156 /* MethodSignature */:
                     var parameters = commentOwner.parameters;
                     return { commentOwner: commentOwner, parameters: parameters };
-                case 275 /* PropertyAssignment */:
+                case 276 /* PropertyAssignment */:
                     return getCommentOwnerInfoWorker(commentOwner.initializer);
-                case 240 /* ClassDeclaration */:
-                case 241 /* InterfaceDeclaration */:
-                case 153 /* PropertySignature */:
-                case 243 /* EnumDeclaration */:
-                case 278 /* EnumMember */:
-                case 242 /* TypeAliasDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 242 /* InterfaceDeclaration */:
+                case 154 /* PropertySignature */:
+                case 244 /* EnumDeclaration */:
+                case 279 /* EnumMember */:
+                case 243 /* TypeAliasDeclaration */:
                     return { commentOwner: commentOwner };
-                case 219 /* VariableStatement */: {
+                case 220 /* VariableStatement */: {
                     var varStatement = commentOwner;
                     var varDeclarations = varStatement.declarationList.declarations;
                     var parameters_1 = varDeclarations.length === 1 && varDeclarations[0].initializer
@@ -104074,14 +107346,14 @@ var ts;
                         : undefined;
                     return { commentOwner: commentOwner, parameters: parameters_1 };
                 }
-                case 284 /* SourceFile */:
+                case 285 /* SourceFile */:
                     return "quit";
-                case 244 /* ModuleDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     // If in walking up the tree, we hit a a nested namespace declaration,
                     // then we must be somewhere within a dotted namespace name; however we don't
                     // want to give back a JSDoc template for the 'b' or 'c' in 'namespace a.b.c { }'.
-                    return commentOwner.parent.kind === 244 /* ModuleDeclaration */ ? undefined : { commentOwner: commentOwner };
-                case 204 /* BinaryExpression */: {
+                    return commentOwner.parent.kind === 245 /* ModuleDeclaration */ ? undefined : { commentOwner: commentOwner };
+                case 205 /* BinaryExpression */: {
                     var be = commentOwner;
                     if (ts.getAssignmentDeclarationKind(be) === 0 /* None */) {
                         return "quit";
@@ -104100,14 +107372,14 @@ var ts;
          * @returns the parameters of a signature found on the RHS if one exists; otherwise 'emptyArray'.
          */
         function getParametersFromRightHandSideOfAssignment(rightHandSide) {
-            while (rightHandSide.kind === 195 /* ParenthesizedExpression */) {
+            while (rightHandSide.kind === 196 /* ParenthesizedExpression */) {
                 rightHandSide = rightHandSide.expression;
             }
             switch (rightHandSide.kind) {
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
                     return rightHandSide.parameters;
-                case 209 /* ClassExpression */: {
+                case 210 /* ClassExpression */: {
                     var ctr = ts.find(rightHandSide.members, ts.isConstructorDeclaration);
                     return ctr ? ctr.parameters : ts.emptyArray;
                 }
@@ -104169,9 +107441,9 @@ var ts;
         }
         function shouldKeepItem(declaration, checker) {
             switch (declaration.kind) {
-                case 250 /* ImportClause */:
-                case 253 /* ImportSpecifier */:
-                case 248 /* ImportEqualsDeclaration */:
+                case 251 /* ImportClause */:
+                case 254 /* ImportSpecifier */:
+                case 249 /* ImportEqualsDeclaration */:
                     var importer = checker.getSymbolAtLocation(declaration.name); // TODO: GH#18217
                     var imported = checker.getAliasedSymbol(importer);
                     return importer.escapedName !== imported.escapedName;
@@ -104181,7 +107453,7 @@ var ts;
         }
         function tryAddSingleDeclarationName(declaration, containers) {
             var name = ts.getNameOfDeclaration(declaration);
-            return !!name && (pushLiteral(name, containers) || name.kind === 149 /* ComputedPropertyName */ && tryAddComputedPropertyName(name.expression, containers));
+            return !!name && (pushLiteral(name, containers) || name.kind === 150 /* ComputedPropertyName */ && tryAddComputedPropertyName(name.expression, containers));
         }
         // Only added the names of computed properties if they're simple dotted expressions, like:
         //
@@ -104198,7 +107470,7 @@ var ts;
             // First, if we started with a computed property name, then add all but the last
             // portion into the container array.
             var name = ts.getNameOfDeclaration(declaration);
-            if (name && name.kind === 149 /* ComputedPropertyName */ && !tryAddComputedPropertyName(name.expression, containers)) {
+            if (name && name.kind === 150 /* ComputedPropertyName */ && !tryAddComputedPropertyName(name.expression, containers)) {
                 return ts.emptyArray;
             }
             // Don't include the last portion.
@@ -104367,7 +107639,7 @@ var ts;
                 return;
             }
             switch (node.kind) {
-                case 157 /* Constructor */:
+                case 158 /* Constructor */:
                     // Get parameter properties, and treat them as being on the *same* level as the constructor, not under it.
                     var ctr = node;
                     addNodeWithRecursiveChild(ctr, ctr.body);
@@ -104379,21 +107651,21 @@ var ts;
                         }
                     }
                     break;
-                case 156 /* MethodDeclaration */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
-                case 155 /* MethodSignature */:
+                case 157 /* MethodDeclaration */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
+                case 156 /* MethodSignature */:
                     if (!ts.hasDynamicName(node)) {
                         addNodeWithRecursiveChild(node, node.body);
                     }
                     break;
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
                     if (!ts.hasDynamicName(node)) {
                         addLeafNode(node);
                     }
                     break;
-                case 250 /* ImportClause */:
+                case 251 /* ImportClause */:
                     var importClause = node;
                     // Handle default import case e.g.:
                     //    import d from "mod";
@@ -104405,7 +107677,7 @@ var ts;
                     //    import {a, b as B} from "mod";
                     var namedBindings = importClause.namedBindings;
                     if (namedBindings) {
-                        if (namedBindings.kind === 251 /* NamespaceImport */) {
+                        if (namedBindings.kind === 252 /* NamespaceImport */) {
                             addLeafNode(namedBindings);
                         }
                         else {
@@ -104416,8 +107688,8 @@ var ts;
                         }
                     }
                     break;
-                case 186 /* BindingElement */:
-                case 237 /* VariableDeclaration */:
+                case 187 /* BindingElement */:
+                case 238 /* VariableDeclaration */:
                     var _d = node, name = _d.name, initializer = _d.initializer;
                     if (ts.isBindingPattern(name)) {
                         addChildrenRecursively(name);
@@ -104438,12 +107710,12 @@ var ts;
                         addNodeWithRecursiveChild(node, initializer);
                     }
                     break;
-                case 197 /* ArrowFunction */:
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
                     addNodeWithRecursiveChild(node, node.body);
                     break;
-                case 243 /* EnumDeclaration */:
+                case 244 /* EnumDeclaration */:
                     startNode(node);
                     for (var _e = 0, _f = node.members; _e < _f.length; _e++) {
                         var member = _f[_e];
@@ -104453,9 +107725,9 @@ var ts;
                     }
                     endNode();
                     break;
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
-                case 241 /* InterfaceDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
+                case 242 /* InterfaceDeclaration */:
                     startNode(node);
                     for (var _g = 0, _h = node.members; _g < _h.length; _g++) {
                         var member = _h[_g];
@@ -104463,18 +107735,18 @@ var ts;
                     }
                     endNode();
                     break;
-                case 244 /* ModuleDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     addNodeWithRecursiveChild(node, getInteriorModule(node).body);
                     break;
-                case 257 /* ExportSpecifier */:
-                case 248 /* ImportEqualsDeclaration */:
-                case 162 /* IndexSignature */:
-                case 160 /* CallSignature */:
-                case 161 /* ConstructSignature */:
-                case 242 /* TypeAliasDeclaration */:
+                case 258 /* ExportSpecifier */:
+                case 249 /* ImportEqualsDeclaration */:
+                case 163 /* IndexSignature */:
+                case 161 /* CallSignature */:
+                case 162 /* ConstructSignature */:
+                case 243 /* TypeAliasDeclaration */:
                     addLeafNode(node);
                     break;
-                case 204 /* BinaryExpression */: {
+                case 205 /* BinaryExpression */: {
                     var special = ts.getAssignmentDeclarationKind(node);
                     switch (special) {
                         case 1 /* ExportsProperty */:
@@ -104556,12 +107828,12 @@ var ts;
                 return false;
             }
             switch (a.kind) {
-                case 154 /* PropertyDeclaration */:
-                case 156 /* MethodDeclaration */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 155 /* PropertyDeclaration */:
+                case 157 /* MethodDeclaration */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     return ts.hasModifier(a, 32 /* Static */) === ts.hasModifier(b, 32 /* Static */);
-                case 244 /* ModuleDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     return areSameModule(a, b);
                 default:
                     return true;
@@ -104577,7 +107849,7 @@ var ts;
         // Only merge module nodes that have the same chain. Don't merge 'A.B.C' with 'A'!
         function areSameModule(a, b) {
             // TODO: GH#18217
-            return a.body.kind === b.body.kind && (a.body.kind !== 244 /* ModuleDeclaration */ || areSameModule(a.body, b.body));
+            return a.body.kind === b.body.kind && (a.body.kind !== 245 /* ModuleDeclaration */ || areSameModule(a.body, b.body));
         }
         /** Merge source into target. Source should be thrown away after this is called. */
         function merge(target, source) {
@@ -104607,7 +107879,7 @@ var ts;
          * So `new()` can still come before an `aardvark` method.
          */
         function tryGetName(node) {
-            if (node.kind === 244 /* ModuleDeclaration */) {
+            if (node.kind === 245 /* ModuleDeclaration */) {
                 return getModuleName(node);
             }
             var declName = ts.getNameOfDeclaration(node);
@@ -104615,16 +107887,16 @@ var ts;
                 return ts.unescapeLeadingUnderscores(ts.getPropertyNameForPropertyNameNode(declName)); // TODO: GH#18217
             }
             switch (node.kind) {
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
-                case 209 /* ClassExpression */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
+                case 210 /* ClassExpression */:
                     return getFunctionOrClassName(node);
                 default:
                     return undefined;
             }
         }
         function getItemName(node, name) {
-            if (node.kind === 244 /* ModuleDeclaration */) {
+            if (node.kind === 245 /* ModuleDeclaration */) {
                 return getModuleName(node);
             }
             if (name) {
@@ -104634,16 +107906,16 @@ var ts;
                 }
             }
             switch (node.kind) {
-                case 284 /* SourceFile */:
+                case 285 /* SourceFile */:
                     var sourceFile = node;
                     return ts.isExternalModule(sourceFile)
                         ? "\"" + ts.escapeString(ts.getBaseFileName(ts.removeFileExtension(ts.normalizePath(sourceFile.fileName)))) + "\""
                         : "<global>";
-                case 197 /* ArrowFunction */:
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
+                case 198 /* ArrowFunction */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
                     if (ts.getModifierFlags(node) & 512 /* Default */) {
                         return "default";
                     }
@@ -104651,13 +107923,13 @@ var ts;
                     // (eg: "app\n.onactivated"), so we should remove the whitespace for readabiltiy in the
                     // navigation bar.
                     return getFunctionOrClassName(node);
-                case 157 /* Constructor */:
+                case 158 /* Constructor */:
                     return "constructor";
-                case 161 /* ConstructSignature */:
+                case 162 /* ConstructSignature */:
                     return "new()";
-                case 160 /* CallSignature */:
+                case 161 /* CallSignature */:
                     return "()";
-                case 162 /* IndexSignature */:
+                case 163 /* IndexSignature */:
                     return "[]";
                 default:
                     return "<unknown>";
@@ -104681,25 +107953,25 @@ var ts;
             return topLevel;
             function isTopLevel(item) {
                 switch (navigationBarNodeKind(item)) {
-                    case 240 /* ClassDeclaration */:
-                    case 209 /* ClassExpression */:
-                    case 243 /* EnumDeclaration */:
-                    case 241 /* InterfaceDeclaration */:
-                    case 244 /* ModuleDeclaration */:
-                    case 284 /* SourceFile */:
-                    case 242 /* TypeAliasDeclaration */:
-                    case 309 /* JSDocTypedefTag */:
-                    case 302 /* JSDocCallbackTag */:
+                    case 241 /* ClassDeclaration */:
+                    case 210 /* ClassExpression */:
+                    case 244 /* EnumDeclaration */:
+                    case 242 /* InterfaceDeclaration */:
+                    case 245 /* ModuleDeclaration */:
+                    case 285 /* SourceFile */:
+                    case 243 /* TypeAliasDeclaration */:
+                    case 311 /* JSDocTypedefTag */:
+                    case 304 /* JSDocCallbackTag */:
                         return true;
-                    case 157 /* Constructor */:
-                    case 156 /* MethodDeclaration */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
-                    case 237 /* VariableDeclaration */:
+                    case 158 /* Constructor */:
+                    case 157 /* MethodDeclaration */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
+                    case 238 /* VariableDeclaration */:
                         return hasSomeImportantChild(item);
-                    case 197 /* ArrowFunction */:
-                    case 239 /* FunctionDeclaration */:
-                    case 196 /* FunctionExpression */:
+                    case 198 /* ArrowFunction */:
+                    case 240 /* FunctionDeclaration */:
+                    case 197 /* FunctionExpression */:
                         return isTopLevelFunctionDeclaration(item);
                     default:
                         return false;
@@ -104709,10 +107981,10 @@ var ts;
                         return false;
                     }
                     switch (navigationBarNodeKind(item.parent)) {
-                        case 245 /* ModuleBlock */:
-                        case 284 /* SourceFile */:
-                        case 156 /* MethodDeclaration */:
-                        case 157 /* Constructor */:
+                        case 246 /* ModuleBlock */:
+                        case 285 /* SourceFile */:
+                        case 157 /* MethodDeclaration */:
+                        case 158 /* Constructor */:
                             return true;
                         default:
                             return hasSomeImportantChild(item);
@@ -104721,7 +107993,7 @@ var ts;
                 function hasSomeImportantChild(item) {
                     return ts.some(item.children, function (child) {
                         var childKind = navigationBarNodeKind(child);
-                        return childKind !== 237 /* VariableDeclaration */ && childKind !== 186 /* BindingElement */;
+                        return childKind !== 238 /* VariableDeclaration */ && childKind !== 187 /* BindingElement */;
                     });
                 }
             }
@@ -104778,7 +108050,7 @@ var ts;
             // Otherwise, we need to aggregate each identifier to build up the qualified name.
             var result = [];
             result.push(ts.getTextOfIdentifierOrLiteral(moduleDeclaration.name));
-            while (moduleDeclaration.body && moduleDeclaration.body.kind === 244 /* ModuleDeclaration */) {
+            while (moduleDeclaration.body && moduleDeclaration.body.kind === 245 /* ModuleDeclaration */) {
                 moduleDeclaration = moduleDeclaration.body;
                 result.push(ts.getTextOfIdentifierOrLiteral(moduleDeclaration.name));
             }
@@ -104792,13 +108064,13 @@ var ts;
             return decl.body && ts.isModuleDeclaration(decl.body) ? getInteriorModule(decl.body) : decl;
         }
         function isComputedProperty(member) {
-            return !member.name || member.name.kind === 149 /* ComputedPropertyName */;
+            return !member.name || member.name.kind === 150 /* ComputedPropertyName */;
         }
         function getNodeSpan(node) {
-            return node.kind === 284 /* SourceFile */ ? ts.createTextSpanFromRange(node) : ts.createTextSpanFromNode(node, curSourceFile);
+            return node.kind === 285 /* SourceFile */ ? ts.createTextSpanFromRange(node) : ts.createTextSpanFromNode(node, curSourceFile);
         }
         function getModifiers(node) {
-            if (node.parent && node.parent.kind === 237 /* VariableDeclaration */) {
+            if (node.parent && node.parent.kind === 238 /* VariableDeclaration */) {
                 node = node.parent;
             }
             return ts.getNodeModifiers(node);
@@ -104813,7 +108085,7 @@ var ts;
                 return ts.declarationNameToString(parent.name);
             }
             // See if it is of the form "<expr> = function(){...}". If so, use the text from the left-hand side.
-            else if (ts.isBinaryExpression(parent) && parent.operatorToken.kind === 59 /* EqualsToken */) {
+            else if (ts.isBinaryExpression(parent) && parent.operatorToken.kind === 60 /* EqualsToken */) {
                 return nodeText(parent.left).replace(whiteSpaceRegex, "");
             }
             // See if it is a property assignment, and if so use the property name
@@ -104851,9 +108123,9 @@ var ts;
         }
         function isFunctionOrClassExpression(node) {
             switch (node.kind) {
-                case 197 /* ArrowFunction */:
-                case 196 /* FunctionExpression */:
-                case 209 /* ClassExpression */:
+                case 198 /* ArrowFunction */:
+                case 197 /* FunctionExpression */:
+                case 210 /* ClassExpression */:
                     return true;
                 default:
                     return false;
@@ -104935,7 +108207,7 @@ var ts;
             var usedImports = [];
             for (var _i = 0, oldImports_1 = oldImports; _i < oldImports_1.length; _i++) {
                 var importDecl = oldImports_1[_i];
-                var importClause = importDecl.importClause;
+                var importClause = importDecl.importClause, moduleSpecifier = importDecl.moduleSpecifier;
                 if (!importClause) {
                     // Imports without import clauses are assumed to be included for their side effects and are not removed.
                     usedImports.push(importDecl);
@@ -104966,6 +108238,20 @@ var ts;
                 if (name || namedBindings) {
                     usedImports.push(updateImportDeclarationAndClause(importDecl, name, namedBindings));
                 }
+                // If a module is imported to be augmented, it’s used
+                else if (hasModuleDeclarationMatchingSpecifier(sourceFile, moduleSpecifier)) {
+                    // If we’re in a declaration file, it’s safe to remove the import clause from it
+                    if (sourceFile.isDeclarationFile) {
+                        usedImports.push(ts.createImportDeclaration(importDecl.decorators, importDecl.modifiers, 
+                        /*importClause*/ undefined, moduleSpecifier));
+                    }
+                    // If we’re not in a declaration file, we can’t remove the import clause even though
+                    // the imported symbols are unused, because removing them makes it look like the import
+                    // declaration has side effects, which will cause it to be preserved in the JS emit.
+                    else {
+                        usedImports.push(importDecl);
+                    }
+                }
             }
             return usedImports;
             function isDeclarationUsed(identifier) {
@@ -104973,6 +108259,13 @@ var ts;
                 return jsxElementsPresent && (identifier.text === jsxNamespace) || ts.FindAllReferences.Core.isSymbolReferencedInFile(identifier, typeChecker, sourceFile);
             }
         }
+        function hasModuleDeclarationMatchingSpecifier(sourceFile, moduleSpecifier) {
+            var moduleSpecifierText = ts.isStringLiteral(moduleSpecifier) && moduleSpecifier.text;
+            return ts.isString(moduleSpecifierText) && ts.some(sourceFile.moduleAugmentations, function (moduleName) {
+                return ts.isStringLiteral(moduleName)
+                    && moduleName.text === moduleSpecifierText;
+            });
+        }
         function getExternalModuleName(specifier) {
             return specifier !== undefined && ts.isStringLiteralLike(specifier)
                 ? specifier.text
@@ -105180,7 +108473,7 @@ var ts;
                 }
                 var lastImport = current - 1;
                 if (lastImport !== firstImport) {
-                    out.push(createOutliningSpanFromBounds(ts.findChildOfKind(statements[firstImport], 92 /* ImportKeyword */, sourceFile).getStart(sourceFile), statements[lastImport].getEnd(), "imports" /* Imports */));
+                    out.push(createOutliningSpanFromBounds(ts.findChildOfKind(statements[firstImport], 93 /* ImportKeyword */, sourceFile).getStart(sourceFile), statements[lastImport].getEnd(), "imports" /* Imports */));
                 }
             }
             function visitNonImportNode(n) {
@@ -105221,9 +108514,9 @@ var ts;
         function addRegionOutliningSpans(sourceFile, out) {
             var regions = [];
             var lineStarts = sourceFile.getLineStarts();
-            for (var i = 0; i < lineStarts.length; i++) {
-                var currentLineStart = lineStarts[i];
-                var lineEnd = i + 1 === lineStarts.length ? sourceFile.getEnd() : lineStarts[i + 1] - 1;
+            for (var _i = 0, lineStarts_1 = lineStarts; _i < lineStarts_1.length; _i++) {
+                var currentLineStart = lineStarts_1[_i];
+                var lineEnd = sourceFile.getLineEndOfPosition(currentLineStart);
                 var lineText = sourceFile.text.substring(currentLineStart, lineEnd);
                 var result = isRegionDelimiter(lineText);
                 if (!result || ts.isInComment(sourceFile, currentLineStart)) {
@@ -105297,31 +108590,31 @@ var ts;
         }
         function getOutliningSpanForNode(n, sourceFile) {
             switch (n.kind) {
-                case 218 /* Block */:
-                    if (ts.isFunctionBlock(n)) {
-                        return spanForNode(n.parent, /*autoCollapse*/ n.parent.kind !== 197 /* ArrowFunction */);
+                case 219 /* Block */:
+                    if (ts.isFunctionLike(n.parent)) {
+                        return functionSpan(n.parent, n, sourceFile);
                     }
                     // Check if the block is standalone, or 'attached' to some parent statement.
                     // If the latter, we want to collapse the block, but consider its hint span
                     // to be the entire span of the parent.
                     switch (n.parent.kind) {
-                        case 223 /* DoStatement */:
-                        case 226 /* ForInStatement */:
-                        case 227 /* ForOfStatement */:
-                        case 225 /* ForStatement */:
-                        case 222 /* IfStatement */:
-                        case 224 /* WhileStatement */:
-                        case 231 /* WithStatement */:
-                        case 274 /* CatchClause */:
+                        case 224 /* DoStatement */:
+                        case 227 /* ForInStatement */:
+                        case 228 /* ForOfStatement */:
+                        case 226 /* ForStatement */:
+                        case 223 /* IfStatement */:
+                        case 225 /* WhileStatement */:
+                        case 232 /* WithStatement */:
+                        case 275 /* CatchClause */:
                             return spanForNode(n.parent);
-                        case 235 /* TryStatement */:
+                        case 236 /* TryStatement */:
                             // Could be the try-block, or the finally-block.
                             var tryStatement = n.parent;
                             if (tryStatement.tryBlock === n) {
                                 return spanForNode(n.parent);
                             }
                             else if (tryStatement.finallyBlock === n) {
-                                return spanForNode(ts.findChildOfKind(tryStatement, 88 /* FinallyKeyword */, sourceFile));
+                                return spanForNode(ts.findChildOfKind(tryStatement, 89 /* FinallyKeyword */, sourceFile));
                             }
                         // falls through
                         default:
@@ -105329,22 +108622,24 @@ var ts;
                             // the span of the block, independent of any parent span.
                             return createOutliningSpan(ts.createTextSpanFromNode(n, sourceFile), "code" /* Code */);
                     }
-                case 245 /* ModuleBlock */:
+                case 246 /* ModuleBlock */:
                     return spanForNode(n.parent);
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
-                case 241 /* InterfaceDeclaration */:
-                case 243 /* EnumDeclaration */:
-                case 246 /* CaseBlock */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
+                case 242 /* InterfaceDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 247 /* CaseBlock */:
                     return spanForNode(n);
-                case 188 /* ObjectLiteralExpression */:
+                case 189 /* ObjectLiteralExpression */:
                     return spanForObjectOrArrayLiteral(n);
-                case 187 /* ArrayLiteralExpression */:
+                case 188 /* ArrayLiteralExpression */:
                     return spanForObjectOrArrayLiteral(n, 22 /* OpenBracketToken */);
-                case 260 /* JsxElement */:
+                case 261 /* JsxElement */:
                     return spanForJSXElement(n);
-                case 261 /* JsxSelfClosingElement */:
-                case 262 /* JsxOpeningElement */:
+                case 265 /* JsxFragment */:
+                    return spanForJSXFragment(n);
+                case 262 /* JsxSelfClosingElement */:
+                case 263 /* JsxOpeningElement */:
                     return spanForJSXAttributes(n.attributes);
             }
             function spanForJSXElement(node) {
@@ -105353,6 +108648,11 @@ var ts;
                 var bannerText = "<" + tagName + ">...</" + tagName + ">";
                 return createOutliningSpan(textSpan, "code" /* Code */, textSpan, /*autoCollapse*/ false, bannerText);
             }
+            function spanForJSXFragment(node) {
+                var textSpan = ts.createTextSpanFromBounds(node.openingFragment.getStart(sourceFile), node.closingFragment.getEnd());
+                var bannerText = "<>...</>";
+                return createOutliningSpan(textSpan, "code" /* Code */, textSpan, /*autoCollapse*/ false, bannerText);
+            }
             function spanForJSXAttributes(node) {
                 if (node.properties.length === 0) {
                     return undefined;
@@ -105366,20 +108666,29 @@ var ts;
                 // Otherwise, the collapsed section will include the end of the previous line.
                 return spanForNode(node, /*autoCollapse*/ false, /*useFullStart*/ !ts.isArrayLiteralExpression(node.parent) && !ts.isCallExpression(node.parent), open);
             }
-            function spanForNode(hintSpanNode, autoCollapse, useFullStart, open) {
+            function spanForNode(hintSpanNode, autoCollapse, useFullStart, open, close) {
                 if (autoCollapse === void 0) { autoCollapse = false; }
                 if (useFullStart === void 0) { useFullStart = true; }
                 if (open === void 0) { open = 18 /* OpenBraceToken */; }
+                if (close === void 0) { close = open === 18 /* OpenBraceToken */ ? 19 /* CloseBraceToken */ : 23 /* CloseBracketToken */; }
                 var openToken = ts.findChildOfKind(n, open, sourceFile);
-                var close = open === 18 /* OpenBraceToken */ ? 19 /* CloseBraceToken */ : 23 /* CloseBracketToken */;
                 var closeToken = ts.findChildOfKind(n, close, sourceFile);
-                if (!openToken || !closeToken) {
-                    return undefined;
-                }
-                var textSpan = ts.createTextSpanFromBounds(useFullStart ? openToken.getFullStart() : openToken.getStart(sourceFile), closeToken.getEnd());
-                return createOutliningSpan(textSpan, "code" /* Code */, ts.createTextSpanFromNode(hintSpanNode, sourceFile), autoCollapse);
+                return openToken && closeToken && spanBetweenTokens(openToken, closeToken, hintSpanNode, sourceFile, autoCollapse, useFullStart);
             }
         }
+        function functionSpan(node, body, sourceFile) {
+            var openToken = ts.isNodeArrayMultiLine(node.parameters, sourceFile)
+                ? ts.findChildOfKind(node, 20 /* OpenParenToken */, sourceFile)
+                : ts.findChildOfKind(body, 18 /* OpenBraceToken */, sourceFile);
+            var closeToken = ts.findChildOfKind(body, 19 /* CloseBraceToken */, sourceFile);
+            return openToken && closeToken && spanBetweenTokens(openToken, closeToken, node, sourceFile, /*autoCollapse*/ node.kind !== 198 /* ArrowFunction */);
+        }
+        function spanBetweenTokens(openToken, closeToken, hintSpanNode, sourceFile, autoCollapse, useFullStart) {
+            if (autoCollapse === void 0) { autoCollapse = false; }
+            if (useFullStart === void 0) { useFullStart = true; }
+            var textSpan = ts.createTextSpanFromBounds(useFullStart ? openToken.getFullStart() : openToken.getStart(sourceFile), closeToken.getEnd());
+            return createOutliningSpan(textSpan, "code" /* Code */, ts.createTextSpanFromNode(hintSpanNode, sourceFile), autoCollapse);
+        }
         function createOutliningSpan(textSpan, kind, hintSpan, autoCollapse, bannerText) {
             if (hintSpan === void 0) { hintSpan = textSpan; }
             if (autoCollapse === void 0) { autoCollapse = false; }
@@ -105642,7 +108951,7 @@ var ts;
         if (ch >= 65 /* A */ && ch <= 90 /* Z */) {
             return true;
         }
-        if (ch < 127 /* maxAsciiCharacter */ || !ts.isUnicodeIdentifierStart(ch, 7 /* Latest */)) {
+        if (ch < 127 /* maxAsciiCharacter */ || !ts.isUnicodeIdentifierStart(ch, 99 /* Latest */)) {
             return false;
         }
         // TODO: find a way to determine this for any unicode characters in a
@@ -105655,7 +108964,7 @@ var ts;
         if (ch >= 97 /* a */ && ch <= 122 /* z */) {
             return true;
         }
-        if (ch < 127 /* maxAsciiCharacter */ || !ts.isUnicodeIdentifierStart(ch, 7 /* Latest */)) {
+        if (ch < 127 /* maxAsciiCharacter */ || !ts.isUnicodeIdentifierStart(ch, 99 /* Latest */)) {
             return false;
         }
         // TODO: find a way to determine this for any unicode characters in a
@@ -105907,10 +109216,10 @@ var ts;
          */
         function tryConsumeDeclare() {
             var token = ts.scanner.getToken();
-            if (token === 125 /* DeclareKeyword */) {
+            if (token === 126 /* DeclareKeyword */) {
                 // declare module "mod"
                 token = nextToken();
-                if (token === 130 /* ModuleKeyword */) {
+                if (token === 131 /* ModuleKeyword */) {
                     token = nextToken();
                     if (token === 10 /* StringLiteral */) {
                         recordAmbientExternalModule();
@@ -105928,7 +109237,7 @@ var ts;
                 return false;
             }
             var token = ts.scanner.getToken();
-            if (token === 92 /* ImportKeyword */) {
+            if (token === 93 /* ImportKeyword */) {
                 token = nextToken();
                 if (token === 20 /* OpenParenToken */) {
                     token = nextToken();
@@ -105944,9 +109253,9 @@ var ts;
                     return true;
                 }
                 else {
-                    if (token === 72 /* Identifier */ || ts.isKeyword(token)) {
+                    if (token === 73 /* Identifier */ || ts.isKeyword(token)) {
                         token = nextToken();
-                        if (token === 144 /* FromKeyword */) {
+                        if (token === 145 /* FromKeyword */) {
                             token = nextToken();
                             if (token === 10 /* StringLiteral */) {
                                 // import d from "mod";
@@ -105954,7 +109263,7 @@ var ts;
                                 return true;
                             }
                         }
-                        else if (token === 59 /* EqualsToken */) {
+                        else if (token === 60 /* EqualsToken */) {
                             if (tryConsumeRequireCall(/*skipCurrentToken*/ true)) {
                                 return true;
                             }
@@ -105977,7 +109286,7 @@ var ts;
                         }
                         if (token === 19 /* CloseBraceToken */) {
                             token = nextToken();
-                            if (token === 144 /* FromKeyword */) {
+                            if (token === 145 /* FromKeyword */) {
                                 token = nextToken();
                                 if (token === 10 /* StringLiteral */) {
                                     // import {a as A} from "mod";
@@ -105989,11 +109298,11 @@ var ts;
                     }
                     else if (token === 40 /* AsteriskToken */) {
                         token = nextToken();
-                        if (token === 119 /* AsKeyword */) {
+                        if (token === 120 /* AsKeyword */) {
                             token = nextToken();
-                            if (token === 72 /* Identifier */ || ts.isKeyword(token)) {
+                            if (token === 73 /* Identifier */ || ts.isKeyword(token)) {
                                 token = nextToken();
-                                if (token === 144 /* FromKeyword */) {
+                                if (token === 145 /* FromKeyword */) {
                                     token = nextToken();
                                     if (token === 10 /* StringLiteral */) {
                                         // import * as NS from "mod"
@@ -106011,7 +109320,7 @@ var ts;
         }
         function tryConsumeExport() {
             var token = ts.scanner.getToken();
-            if (token === 85 /* ExportKeyword */) {
+            if (token === 86 /* ExportKeyword */) {
                 markAsExternalModuleIfTopLevel();
                 token = nextToken();
                 if (token === 18 /* OpenBraceToken */) {
@@ -106023,7 +109332,7 @@ var ts;
                     }
                     if (token === 19 /* CloseBraceToken */) {
                         token = nextToken();
-                        if (token === 144 /* FromKeyword */) {
+                        if (token === 145 /* FromKeyword */) {
                             token = nextToken();
                             if (token === 10 /* StringLiteral */) {
                                 // export {a as A} from "mod";
@@ -106035,7 +109344,7 @@ var ts;
                 }
                 else if (token === 40 /* AsteriskToken */) {
                     token = nextToken();
-                    if (token === 144 /* FromKeyword */) {
+                    if (token === 145 /* FromKeyword */) {
                         token = nextToken();
                         if (token === 10 /* StringLiteral */) {
                             // export * from "mod"
@@ -106043,11 +109352,11 @@ var ts;
                         }
                     }
                 }
-                else if (token === 92 /* ImportKeyword */) {
+                else if (token === 93 /* ImportKeyword */) {
                     token = nextToken();
-                    if (token === 72 /* Identifier */ || ts.isKeyword(token)) {
+                    if (token === 73 /* Identifier */ || ts.isKeyword(token)) {
                         token = nextToken();
-                        if (token === 59 /* EqualsToken */) {
+                        if (token === 60 /* EqualsToken */) {
                             if (tryConsumeRequireCall(/*skipCurrentToken*/ true)) {
                                 return true;
                             }
@@ -106060,7 +109369,7 @@ var ts;
         }
         function tryConsumeRequireCall(skipCurrentToken) {
             var token = skipCurrentToken ? nextToken() : ts.scanner.getToken();
-            if (token === 134 /* RequireKeyword */) {
+            if (token === 135 /* RequireKeyword */) {
                 token = nextToken();
                 if (token === 20 /* OpenParenToken */) {
                     token = nextToken();
@@ -106075,7 +109384,7 @@ var ts;
         }
         function tryConsumeDefine() {
             var token = ts.scanner.getToken();
-            if (token === 72 /* Identifier */ && ts.scanner.getTokenValue() === "define") {
+            if (token === 73 /* Identifier */ && ts.scanner.getTokenValue() === "define") {
                 token = nextToken();
                 if (token !== 20 /* OpenParenToken */) {
                     return true;
@@ -106209,14 +109518,14 @@ var ts;
                 return getRenameInfoError(ts.Diagnostics.You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library);
             }
             // Cannot rename `default` as in `import { default as foo } from "./someModule";
-            if (ts.isIdentifier(node) && node.originalKeywordKind === 80 /* DefaultKeyword */ && symbol.parent.flags & 1536 /* Module */) {
+            if (ts.isIdentifier(node) && node.originalKeywordKind === 81 /* DefaultKeyword */ && symbol.parent.flags & 1536 /* Module */) {
                 return undefined;
             }
             if (ts.isStringLiteralLike(node) && ts.tryGetImportFromModuleSpecifier(node)) {
                 return options && options.allowRenameOfImportPath ? getRenameInfoForModule(node, sourceFile, symbol) : undefined;
             }
             var kind = ts.SymbolDisplay.getSymbolKind(typeChecker, symbol, node);
-            var specifierName = (ts.isImportOrExportSpecifierName(node) || ts.isStringOrNumericLiteralLike(node) && node.parent.kind === 149 /* ComputedPropertyName */)
+            var specifierName = (ts.isImportOrExportSpecifierName(node) || ts.isStringOrNumericLiteralLike(node) && node.parent.kind === 150 /* ComputedPropertyName */)
                 ? ts.stripQuotes(ts.getTextOfIdentifierOrLiteral(node))
                 : undefined;
             var displayName = specifierName || typeChecker.symbolToString(symbol);
@@ -106272,9 +109581,9 @@ var ts;
         }
         function nodeIsEligibleForRename(node) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                 case 10 /* StringLiteral */:
-                case 100 /* ThisKeyword */:
+                case 101 /* ThisKeyword */:
                     return true;
                 case 8 /* NumericLiteral */:
                     return ts.isLiteralNameOfPropertyDeclarationOrIndexAccess(node);
@@ -106286,6 +109595,284 @@ var ts;
 })(ts || (ts = {}));
 /* @internal */
 var ts;
+(function (ts) {
+    var SmartSelectionRange;
+    (function (SmartSelectionRange) {
+        function getSmartSelectionRange(pos, sourceFile) {
+            var selectionRange = {
+                textSpan: ts.createTextSpanFromBounds(sourceFile.getFullStart(), sourceFile.getEnd())
+            };
+            var parentNode = sourceFile;
+            outer: while (true) {
+                var children = getSelectionChildren(parentNode);
+                if (!children.length)
+                    break;
+                for (var i = 0; i < children.length; i++) {
+                    var prevNode = children[i - 1];
+                    var node = children[i];
+                    var nextNode = children[i + 1];
+                    if (node.getStart(sourceFile) > pos) {
+                        break outer;
+                    }
+                    if (positionShouldSnapToNode(pos, node, nextNode)) {
+                        // 1. Blocks are effectively redundant with SyntaxLists.
+                        // 2. TemplateSpans, along with the SyntaxLists containing them, are a somewhat unintuitive grouping
+                        //    of things that should be considered independently.
+                        // 3. A VariableStatement’s children are just a VaraiableDeclarationList and a semicolon.
+                        // 4. A lone VariableDeclaration in a VaraibleDeclaration feels redundant with the VariableStatement.
+                        //
+                        // Dive in without pushing a selection range.
+                        if (ts.isBlock(node)
+                            || ts.isTemplateSpan(node) || ts.isTemplateHead(node)
+                            || prevNode && ts.isTemplateHead(prevNode)
+                            || ts.isVariableDeclarationList(node) && ts.isVariableStatement(parentNode)
+                            || ts.isSyntaxList(node) && ts.isVariableDeclarationList(parentNode)
+                            || ts.isVariableDeclaration(node) && ts.isSyntaxList(parentNode) && children.length === 1) {
+                            parentNode = node;
+                            break;
+                        }
+                        // Synthesize a stop for '${ ... }' since '${' and '}' actually belong to siblings.
+                        if (ts.isTemplateSpan(parentNode) && nextNode && ts.isTemplateMiddleOrTemplateTail(nextNode)) {
+                            var start_2 = node.getFullStart() - "${".length;
+                            var end_2 = nextNode.getStart() + "}".length;
+                            pushSelectionRange(start_2, end_2);
+                        }
+                        // Blocks with braces, brackets, parens, or JSX tags on separate lines should be
+                        // selected from open to close, including whitespace but not including the braces/etc. themselves.
+                        var isBetweenMultiLineBookends = ts.isSyntaxList(node)
+                            && isListOpener(prevNode)
+                            && isListCloser(nextNode)
+                            && !ts.positionsAreOnSameLine(prevNode.getStart(), nextNode.getStart(), sourceFile);
+                        var jsDocCommentStart = ts.hasJSDocNodes(node) && node.jsDoc[0].getStart();
+                        var start = isBetweenMultiLineBookends ? prevNode.getEnd() : node.getStart();
+                        var end = isBetweenMultiLineBookends ? nextNode.getStart() : node.getEnd();
+                        if (ts.isNumber(jsDocCommentStart)) {
+                            pushSelectionRange(jsDocCommentStart, end);
+                        }
+                        pushSelectionRange(start, end);
+                        // String literals should have a stop both inside and outside their quotes.
+                        if (ts.isStringLiteral(node) || ts.isTemplateLiteral(node)) {
+                            pushSelectionRange(start + 1, end - 1);
+                        }
+                        parentNode = node;
+                        break;
+                    }
+                    // If we made it to the end of the for loop, we’re done.
+                    // In practice, I’ve only seen this happen at the very end
+                    // of a SourceFile.
+                    if (i === children.length - 1) {
+                        break outer;
+                    }
+                }
+            }
+            return selectionRange;
+            function pushSelectionRange(start, end) {
+                // Skip empty ranges
+                if (start !== end) {
+                    var textSpan = ts.createTextSpanFromBounds(start, end);
+                    if (!selectionRange || (
+                    // Skip ranges that are identical to the parent
+                    !ts.textSpansEqual(textSpan, selectionRange.textSpan) &&
+                        // Skip ranges that don’t contain the original position
+                        ts.textSpanIntersectsWithPosition(textSpan, pos))) {
+                        selectionRange = __assign({ textSpan: textSpan }, selectionRange && { parent: selectionRange });
+                    }
+                }
+            }
+        }
+        SmartSelectionRange.getSmartSelectionRange = getSmartSelectionRange;
+        /**
+         * Like `ts.positionBelongsToNode`, except positions immediately after nodes
+         * count too, unless that position belongs to the next node. In effect, makes
+         * selections able to snap to preceding tokens when the cursor is on the tail
+         * end of them with only whitespace ahead.
+         * @param pos The position to check.
+         * @param node The candidate node to snap to.
+         * @param nextNode The next sibling node in the tree.
+         * @param sourceFile The source file containing the nodes.
+         */
+        function positionShouldSnapToNode(pos, node, nextNode) {
+            // Can’t use 'ts.positionBelongsToNode()' here because it cleverly accounts
+            // for missing nodes, which can’t really be considered when deciding what
+            // to select.
+            ts.Debug.assert(node.pos <= pos);
+            if (pos < node.end) {
+                return true;
+            }
+            var nodeEnd = node.getEnd();
+            var nextNodeStart = nextNode && nextNode.getStart();
+            if (nodeEnd === pos) {
+                return pos !== nextNodeStart;
+            }
+            return false;
+        }
+        var isImport = ts.or(ts.isImportDeclaration, ts.isImportEqualsDeclaration);
+        /**
+         * Gets the children of a node to be considered for selection ranging,
+         * transforming them into an artificial tree according to their intuitive
+         * grouping where no grouping actually exists in the parse tree. For example,
+         * top-level imports are grouped into their own SyntaxList so they can be
+         * selected all together, even though in the AST they’re just siblings of each
+         * other as well as of other top-level statements and declarations.
+         */
+        function getSelectionChildren(node) {
+            // Group top-level imports
+            if (ts.isSourceFile(node)) {
+                return groupChildren(node.getChildAt(0).getChildren(), isImport);
+            }
+            // Mapped types _look_ like ObjectTypes with a single member,
+            // but in fact don’t contain a SyntaxList or a node containing
+            // the “key/value” pair like ObjectTypes do, but it seems intuitive
+            // that the selection would snap to those points. The philosophy
+            // of choosing a selection range is not so much about what the
+            // syntax currently _is_ as what the syntax might easily become
+            // if the user is making a selection; e.g., we synthesize a selection
+            // around the “key/value” pair not because there’s a node there, but
+            // because it allows the mapped type to become an object type with a
+            // few keystrokes.
+            if (ts.isMappedTypeNode(node)) {
+                var _a = node.getChildren(), openBraceToken = _a[0], children = _a.slice(1);
+                var closeBraceToken = ts.Debug.assertDefined(children.pop());
+                ts.Debug.assertEqual(openBraceToken.kind, 18 /* OpenBraceToken */);
+                ts.Debug.assertEqual(closeBraceToken.kind, 19 /* CloseBraceToken */);
+                // Group `-/+readonly` and `-/+?`
+                var groupedWithPlusMinusTokens = groupChildren(children, function (child) {
+                    return child === node.readonlyToken || child.kind === 134 /* ReadonlyKeyword */ ||
+                        child === node.questionToken || child.kind === 56 /* QuestionToken */;
+                });
+                // Group type parameter with surrounding brackets
+                var groupedWithBrackets = groupChildren(groupedWithPlusMinusTokens, function (_a) {
+                    var kind = _a.kind;
+                    return kind === 22 /* OpenBracketToken */ ||
+                        kind === 151 /* TypeParameter */ ||
+                        kind === 23 /* CloseBracketToken */;
+                });
+                return [
+                    openBraceToken,
+                    // Pivot on `:`
+                    createSyntaxList(splitChildren(groupedWithBrackets, function (_a) {
+                        var kind = _a.kind;
+                        return kind === 57 /* ColonToken */;
+                    })),
+                    closeBraceToken,
+                ];
+            }
+            // Group modifiers and property name, then pivot on `:`.
+            if (ts.isPropertySignature(node)) {
+                var children = groupChildren(node.getChildren(), function (child) {
+                    return child === node.name || ts.contains(node.modifiers, child);
+                });
+                return splitChildren(children, function (_a) {
+                    var kind = _a.kind;
+                    return kind === 57 /* ColonToken */;
+                });
+            }
+            // Group the parameter name with its `...`, then that group with its `?`, then pivot on `=`.
+            if (ts.isParameter(node)) {
+                var groupedDotDotDotAndName_1 = groupChildren(node.getChildren(), function (child) {
+                    return child === node.dotDotDotToken || child === node.name;
+                });
+                var groupedWithQuestionToken = groupChildren(groupedDotDotDotAndName_1, function (child) {
+                    return child === groupedDotDotDotAndName_1[0] || child === node.questionToken;
+                });
+                return splitChildren(groupedWithQuestionToken, function (_a) {
+                    var kind = _a.kind;
+                    return kind === 60 /* EqualsToken */;
+                });
+            }
+            // Pivot on '='
+            if (ts.isBindingElement(node)) {
+                return splitChildren(node.getChildren(), function (_a) {
+                    var kind = _a.kind;
+                    return kind === 60 /* EqualsToken */;
+                });
+            }
+            return node.getChildren();
+        }
+        /**
+         * Groups sibling nodes together into their own SyntaxList if they
+         * a) are adjacent, AND b) match a predicate function.
+         */
+        function groupChildren(children, groupOn) {
+            var result = [];
+            var group;
+            for (var _i = 0, children_1 = children; _i < children_1.length; _i++) {
+                var child = children_1[_i];
+                if (groupOn(child)) {
+                    group = group || [];
+                    group.push(child);
+                }
+                else {
+                    if (group) {
+                        result.push(createSyntaxList(group));
+                        group = undefined;
+                    }
+                    result.push(child);
+                }
+            }
+            if (group) {
+                result.push(createSyntaxList(group));
+            }
+            return result;
+        }
+        /**
+         * Splits sibling nodes into up to four partitions:
+         * 1) everything left of the first node matched by `pivotOn`,
+         * 2) the first node matched by `pivotOn`,
+         * 3) everything right of the first node matched by `pivotOn`,
+         * 4) a trailing semicolon, if `separateTrailingSemicolon` is enabled.
+         * The left and right groups, if not empty, will each be grouped into their own containing SyntaxList.
+         * @param children The sibling nodes to split.
+         * @param pivotOn The predicate function to match the node to be the pivot. The first node that matches
+         * the predicate will be used; any others that may match will be included into the right-hand group.
+         * @param separateTrailingSemicolon If the last token is a semicolon, it will be returned as a separate
+         * child rather than be included in the right-hand group.
+         */
+        function splitChildren(children, pivotOn, separateTrailingSemicolon) {
+            if (separateTrailingSemicolon === void 0) { separateTrailingSemicolon = true; }
+            if (children.length < 2) {
+                return children;
+            }
+            var splitTokenIndex = ts.findIndex(children, pivotOn);
+            if (splitTokenIndex === -1) {
+                return children;
+            }
+            var leftChildren = children.slice(0, splitTokenIndex);
+            var splitToken = children[splitTokenIndex];
+            var lastToken = ts.last(children);
+            var separateLastToken = separateTrailingSemicolon && lastToken.kind === 26 /* SemicolonToken */;
+            var rightChildren = children.slice(splitTokenIndex + 1, separateLastToken ? children.length - 1 : undefined);
+            var result = ts.compact([
+                leftChildren.length ? createSyntaxList(leftChildren) : undefined,
+                splitToken,
+                rightChildren.length ? createSyntaxList(rightChildren) : undefined,
+            ]);
+            return separateLastToken ? result.concat(lastToken) : result;
+        }
+        function createSyntaxList(children) {
+            ts.Debug.assertGreaterThanOrEqual(children.length, 1);
+            var syntaxList = ts.createNode(313 /* SyntaxList */, children[0].pos, ts.last(children).end);
+            syntaxList._children = children;
+            return syntaxList;
+        }
+        function isListOpener(token) {
+            var kind = token && token.kind;
+            return kind === 18 /* OpenBraceToken */
+                || kind === 22 /* OpenBracketToken */
+                || kind === 20 /* OpenParenToken */
+                || kind === 263 /* JsxOpeningElement */;
+        }
+        function isListCloser(token) {
+            var kind = token && token.kind;
+            return kind === 19 /* CloseBraceToken */
+                || kind === 23 /* CloseBracketToken */
+                || kind === 21 /* CloseParenToken */
+                || kind === 264 /* JsxClosingElement */;
+        }
+    })(SmartSelectionRange = ts.SmartSelectionRange || (ts.SmartSelectionRange = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
 (function (ts) {
     var SignatureHelp;
     (function (SignatureHelp) {
@@ -106397,8 +109984,21 @@ var ts;
             });
         }
         function containsPrecedingToken(startingToken, sourceFile, container) {
-            var precedingToken = ts.Debug.assertDefined(ts.findPrecedingToken(startingToken.getFullStart(), sourceFile, startingToken.parent, /*excludeJsdoc*/ true));
-            return ts.rangeContainsRange(container, precedingToken);
+            var pos = startingToken.getFullStart();
+            // There’s a possibility that `startingToken.parent` contains only `startingToken` and
+            // missing nodes, none of which are valid to be returned by `findPrecedingToken`. In that
+            // case, the preceding token we want is actually higher up the tree—almost definitely the
+            // next parent, but theoretically the situation with missing nodes might be happening on
+            // multiple nested levels.
+            var currentParent = startingToken.parent;
+            while (currentParent) {
+                var precedingToken = ts.findPrecedingToken(pos, sourceFile, currentParent, /*excludeJsdoc*/ true);
+                if (precedingToken) {
+                    return ts.rangeContainsRange(container, precedingToken);
+                }
+                currentParent = currentParent.parent;
+            }
+            return ts.Debug.fail("Could not find preceding token");
         }
         function getArgumentInfoForCompletions(node, position, sourceFile) {
             var info = getImmediatelyContainingArgumentInfo(node, position, sourceFile);
@@ -106472,10 +110072,10 @@ var ts;
                 }
                 return undefined;
             }
-            else if (ts.isTemplateHead(node) && parent.parent.kind === 193 /* TaggedTemplateExpression */) {
+            else if (ts.isTemplateHead(node) && parent.parent.kind === 194 /* TaggedTemplateExpression */) {
                 var templateExpression = parent;
                 var tagExpression = templateExpression.parent;
-                ts.Debug.assert(templateExpression.kind === 206 /* TemplateExpression */);
+                ts.Debug.assert(templateExpression.kind === 207 /* TemplateExpression */);
                 var argumentIndex = ts.isInsideTemplateLiteral(node, position, sourceFile) ? 0 : 1;
                 return getArgumentListInfoForTemplate(tagExpression, argumentIndex, sourceFile);
             }
@@ -106542,17 +110142,17 @@ var ts;
                 return undefined;
             var parent = startingToken.parent;
             switch (parent.kind) {
-                case 195 /* ParenthesizedExpression */:
-                case 156 /* MethodDeclaration */:
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
+                case 196 /* ParenthesizedExpression */:
+                case 157 /* MethodDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
                     var info = getArgumentOrParameterListInfo(startingToken, sourceFile);
                     if (!info)
                         return undefined;
                     var argumentIndex = info.argumentIndex, argumentCount = info.argumentCount, argumentsSpan = info.argumentsSpan;
                     var contextualType = ts.isMethodDeclaration(parent) ? checker.getContextualTypeForObjectLiteralElement(parent) : checker.getContextualType(parent);
                     return contextualType && { contextualType: contextualType, argumentIndex: argumentIndex, argumentCount: argumentCount, argumentsSpan: argumentsSpan };
-                case 204 /* BinaryExpression */: {
+                case 205 /* BinaryExpression */: {
                     var highestBinary = getHighestBinary(parent);
                     var contextualType_1 = checker.getContextualType(highestBinary);
                     var argumentIndex_1 = startingToken.kind === 20 /* OpenParenToken */ ? 0 : countBinaryExpressionParameters(parent) - 1;
@@ -106676,7 +110276,7 @@ var ts;
             //       |       |
             // This is because a Missing node has no width. However, what we actually want is to include trivia
             // leading up to the next token in case the user is about to type in a TemplateMiddle or TemplateTail.
-            if (template.kind === 206 /* TemplateExpression */) {
+            if (template.kind === 207 /* TemplateExpression */) {
                 var lastSpan = ts.last(template.templateSpans);
                 if (lastSpan.literal.getFullWidth() === 0) {
                     applicableSpanEnd = ts.skipTrivia(sourceFile.text, applicableSpanEnd, /*stopAfterLineBreak*/ false);
@@ -106688,7 +110288,7 @@ var ts;
             var _loop_7 = function (n) {
                 // If the node is not a subspan of its parent, this is a big problem.
                 // There have been crashes that might be caused by this violation.
-                ts.Debug.assert(ts.rangeContainsRange(n.parent, n), "Not a subspan", function () { return "Child: " + ts.Debug.showSyntaxKind(n) + ", parent: " + ts.Debug.showSyntaxKind(n.parent); });
+                ts.Debug.assert(ts.rangeContainsRange(n.parent, n), "Not a subspan", function () { return "Child: " + ts.Debug.formatSyntaxKind(n.kind) + ", parent: " + ts.Debug.formatSyntaxKind(n.parent.kind); });
                 var argumentInfo = getImmediatelyContainingArgumentOrContextualParameterInfo(n, position, sourceFile, checker);
                 if (argumentInfo) {
                     return { value: argumentInfo };
@@ -106772,13 +110372,13 @@ var ts;
             var parameters = (typeParameters || ts.emptyArray).map(function (t) { return createSignatureHelpParameterForTypeParameter(t, checker, enclosingDeclaration, sourceFile, printer); });
             var parameterParts = ts.mapToDisplayParts(function (writer) {
                 var thisParameter = candidateSignature.thisParameter ? [checker.symbolToParameterDeclaration(candidateSignature.thisParameter, enclosingDeclaration, signatureHelpNodeBuilderFlags)] : [];
-                var params = ts.createNodeArray(thisParameter.concat(candidateSignature.parameters.map(function (param) { return checker.symbolToParameterDeclaration(param, enclosingDeclaration, signatureHelpNodeBuilderFlags); })));
+                var params = ts.createNodeArray(thisParameter.concat(checker.getExpandedParameters(candidateSignature).map(function (param) { return checker.symbolToParameterDeclaration(param, enclosingDeclaration, signatureHelpNodeBuilderFlags); })));
                 printer.writeList(2576 /* CallExpressionArguments */, params, sourceFile, writer);
             });
             return { isVariadic: false, parameters: parameters, prefix: [ts.punctuationPart(28 /* LessThanToken */)], suffix: [ts.punctuationPart(30 /* GreaterThanToken */)].concat(parameterParts) };
         }
         function itemInfoForParameters(candidateSignature, checker, enclosingDeclaration, sourceFile) {
-            var isVariadic = candidateSignature.hasRestParameter;
+            var isVariadic = checker.hasEffectiveRestParameter(candidateSignature);
             var printer = ts.createPrinter({ removeComments: true });
             var typeParameterParts = ts.mapToDisplayParts(function (writer) {
                 if (candidateSignature.typeParameters && candidateSignature.typeParameters.length) {
@@ -106786,7 +110386,7 @@ var ts;
                     printer.writeList(53776 /* TypeParameters */, args, sourceFile, writer);
                 }
             });
-            var parameters = candidateSignature.parameters.map(function (p) { return createSignatureHelpParameterForParameter(p, checker, enclosingDeclaration, sourceFile, printer); });
+            var parameters = checker.getExpandedParameters(candidateSignature).map(function (p) { return createSignatureHelpParameterForParameter(p, checker, enclosingDeclaration, sourceFile, printer); });
             return { isVariadic: isVariadic, parameters: parameters, prefix: typeParameterParts.concat([ts.punctuationPart(20 /* OpenParenToken */)]), suffix: [ts.punctuationPart(21 /* CloseParenToken */)] };
         }
         function createSignatureHelpParameterForParameter(parameter, checker, enclosingDeclaration, sourceFile, printer) {
@@ -106988,7 +110588,7 @@ var ts;
         function check(node) {
             if (isJsFile) {
                 switch (node.kind) {
-                    case 196 /* FunctionExpression */:
+                    case 197 /* FunctionExpression */:
                         var decl = ts.getDeclarationOfExpando(node);
                         if (decl) {
                             var symbol_1 = decl.symbol;
@@ -106998,7 +110598,7 @@ var ts;
                             }
                         }
                     // falls through if no diagnostic was created
-                    case 239 /* FunctionDeclaration */:
+                    case 240 /* FunctionDeclaration */:
                         var symbol = node.symbol;
                         if (symbol.members && (symbol.members.size > 0)) {
                             diags.push(ts.createDiagnosticForNode(ts.isVariableDeclaration(node.parent) ? node.parent.name : node, ts.Diagnostics.This_constructor_function_may_be_converted_to_a_class_declaration));
@@ -107031,11 +110631,11 @@ var ts;
     function containsTopLevelCommonjs(sourceFile) {
         return sourceFile.statements.some(function (statement) {
             switch (statement.kind) {
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     return statement.declarationList.declarations.some(function (decl) {
                         return !!decl.initializer && ts.isRequireCall(propertyAccessLeftHandSide(decl.initializer), /*checkArgumentIsStringLiteralLike*/ true);
                     });
-                case 221 /* ExpressionStatement */: {
+                case 222 /* ExpressionStatement */: {
                     var expression = statement.expression;
                     if (!ts.isBinaryExpression(expression))
                         return ts.isRequireCall(expression, /*checkArgumentIsStringLiteralLike*/ true);
@@ -107052,12 +110652,12 @@ var ts;
     }
     function importNameForConvertToDefaultImport(node) {
         switch (node.kind) {
-            case 249 /* ImportDeclaration */:
+            case 250 /* ImportDeclaration */:
                 var importClause = node.importClause, moduleSpecifier = node.moduleSpecifier;
-                return importClause && !importClause.name && importClause.namedBindings && importClause.namedBindings.kind === 251 /* NamespaceImport */ && ts.isStringLiteral(moduleSpecifier)
+                return importClause && !importClause.name && importClause.namedBindings && importClause.namedBindings.kind === 252 /* NamespaceImport */ && ts.isStringLiteral(moduleSpecifier)
                     ? importClause.namedBindings.name
                     : undefined;
-            case 248 /* ImportEqualsDeclaration */:
+            case 249 /* ImportEqualsDeclaration */:
                 return node.name;
             default:
                 return undefined;
@@ -107115,13 +110715,13 @@ var ts;
     // should be kept up to date with getTransformationBody in convertToAsyncFunction.ts
     function isFixablePromiseArgument(arg) {
         switch (arg.kind) {
-            case 239 /* FunctionDeclaration */:
-            case 196 /* FunctionExpression */:
-            case 197 /* ArrowFunction */:
+            case 240 /* FunctionDeclaration */:
+            case 197 /* FunctionExpression */:
+            case 198 /* ArrowFunction */:
                 visitedNestedConvertibleFunctions.set(getKeyFromNode(arg), true);
             /* falls through */
-            case 96 /* NullKeyword */:
-            case 72 /* Identifier */: // identifier includes undefined
+            case 97 /* NullKeyword */:
+            case 73 /* Identifier */: // identifier includes undefined
                 return true;
             default:
                 return false;
@@ -107144,7 +110744,7 @@ var ts;
             }
             var flags = ts.getCombinedLocalAndExportSymbolFlags(symbol);
             if (flags & 32 /* Class */) {
-                return ts.getDeclarationOfKind(symbol, 209 /* ClassExpression */) ?
+                return ts.getDeclarationOfKind(symbol, 210 /* ClassExpression */) ?
                     "local class" /* localClassElement */ : "class" /* classElement */;
             }
             if (flags & 384 /* Enum */)
@@ -107181,7 +110781,7 @@ var ts;
             if (typeChecker.isArgumentsSymbol(symbol)) {
                 return "local var" /* localVariableElement */;
             }
-            if (location.kind === 100 /* ThisKeyword */ && ts.isExpression(location)) {
+            if (location.kind === 101 /* ThisKeyword */ && ts.isExpression(location)) {
                 return "parameter" /* parameterElement */;
             }
             var flags = ts.getCombinedLocalAndExportSymbolFlags(symbol);
@@ -107232,11 +110832,11 @@ var ts;
                 // If we requested completions after `x.` at the top-level, we may be at a source file location.
                 switch (location.parent && location.parent.kind) {
                     // If we've typed a character of the attribute name, will be 'JsxAttribute', else will be 'JsxOpeningElement'.
-                    case 262 /* JsxOpeningElement */:
-                    case 260 /* JsxElement */:
-                    case 261 /* JsxSelfClosingElement */:
-                        return location.kind === 72 /* Identifier */ ? "property" /* memberVariableElement */ : "JSX attribute" /* jsxAttribute */;
-                    case 267 /* JsxAttribute */:
+                    case 263 /* JsxOpeningElement */:
+                    case 261 /* JsxElement */:
+                    case 262 /* JsxSelfClosingElement */:
+                        return location.kind === 73 /* Identifier */ ? "property" /* memberVariableElement */ : "JSX attribute" /* jsxAttribute */;
+                    case 268 /* JsxAttribute */:
                         return "JSX attribute" /* jsxAttribute */;
                     default:
                         return "property" /* memberVariableElement */;
@@ -107263,13 +110863,13 @@ var ts;
             var symbolFlags = ts.getCombinedLocalAndExportSymbolFlags(symbol);
             var symbolKind = semanticMeaning & 1 /* Value */ ? getSymbolKindOfConstructorPropertyMethodAccessorFunctionOrVar(typeChecker, symbol, location) : "" /* unknown */;
             var hasAddedSymbolInfo = false;
-            var isThisExpression = location.kind === 100 /* ThisKeyword */ && ts.isInExpressionContext(location);
+            var isThisExpression = location.kind === 101 /* ThisKeyword */ && ts.isInExpressionContext(location);
             var type;
             var printer;
             var documentationFromAlias;
             var tagsFromAlias;
-            if (location.kind === 100 /* ThisKeyword */ && !isThisExpression) {
-                return { displayParts: [ts.keywordPart(100 /* ThisKeyword */)], documentation: [], symbolKind: "primitive type" /* primitiveType */, tags: undefined };
+            if (location.kind === 101 /* ThisKeyword */ && !isThisExpression) {
+                return { displayParts: [ts.keywordPart(101 /* ThisKeyword */)], documentation: [], symbolKind: "primitive type" /* primitiveType */, tags: undefined };
             }
             // Class at constructor site need to be shown as constructor apart from property,method, vars
             if (symbolKind !== "" /* unknown */ || symbolFlags & 32 /* Class */ || symbolFlags & 2097152 /* Alias */) {
@@ -107279,7 +110879,7 @@ var ts;
                 }
                 var signature = void 0;
                 type = isThisExpression ? typeChecker.getTypeAtLocation(location) : typeChecker.getTypeOfSymbolAtLocation(symbol.exportSymbol || symbol, location);
-                if (location.parent && location.parent.kind === 189 /* PropertyAccessExpression */) {
+                if (location.parent && location.parent.kind === 190 /* PropertyAccessExpression */) {
                     var right = location.parent.name;
                     // Either the location is on the right of a property access, or on the left and the right is missing
                     if (right === location || (right && right.getFullWidth() === 0)) {
@@ -107298,9 +110898,8 @@ var ts;
                     callExpressionLike = location.parent;
                 }
                 if (callExpressionLike) {
-                    var candidateSignatures = [];
-                    signature = typeChecker.getResolvedSignature(callExpressionLike, candidateSignatures); // TODO: GH#18217
-                    var useConstructSignatures = callExpressionLike.kind === 192 /* NewExpression */ || (ts.isCallExpression(callExpressionLike) && callExpressionLike.expression.kind === 98 /* SuperKeyword */);
+                    signature = typeChecker.getResolvedSignature(callExpressionLike); // TODO: GH#18217
+                    var useConstructSignatures = callExpressionLike.kind === 193 /* NewExpression */ || (ts.isCallExpression(callExpressionLike) && callExpressionLike.expression.kind === 99 /* SuperKeyword */);
                     var allSignatures = useConstructSignatures ? type.getConstructSignatures() : type.getCallSignatures();
                     if (!ts.contains(allSignatures, signature.target) && !ts.contains(allSignatures, signature)) {
                         // Get the first signature if there is one -- allSignatures may contain
@@ -107318,7 +110917,7 @@ var ts;
                             pushSymbolKind(symbolKind);
                             displayParts.push(ts.spacePart());
                             if (useConstructSignatures) {
-                                displayParts.push(ts.keywordPart(95 /* NewKeyword */));
+                                displayParts.push(ts.keywordPart(96 /* NewKeyword */));
                                 displayParts.push(ts.spacePart());
                             }
                             addFullSymbolName(symbol);
@@ -107342,7 +110941,7 @@ var ts;
                                     displayParts.push(ts.lineBreakPart());
                                 }
                                 if (useConstructSignatures) {
-                                    displayParts.push(ts.keywordPart(95 /* NewKeyword */));
+                                    displayParts.push(ts.keywordPart(96 /* NewKeyword */));
                                     displayParts.push(ts.spacePart());
                                 }
                                 addSignatureDisplayParts(signature, allSignatures, 262144 /* WriteArrowStyleSignature */);
@@ -107355,29 +110954,29 @@ var ts;
                     }
                 }
                 else if ((ts.isNameOfFunctionDeclaration(location) && !(symbolFlags & 98304 /* Accessor */)) || // name of function declaration
-                    (location.kind === 124 /* ConstructorKeyword */ && location.parent.kind === 157 /* Constructor */)) { // At constructor keyword of constructor declaration
+                    (location.kind === 125 /* ConstructorKeyword */ && location.parent.kind === 158 /* Constructor */)) { // At constructor keyword of constructor declaration
                     // get the signature from the declaration and write it
                     var functionDeclaration_1 = location.parent;
                     // Use function declaration to write the signatures only if the symbol corresponding to this declaration
                     var locationIsSymbolDeclaration = ts.find(symbol.declarations, function (declaration) {
-                        return declaration === (location.kind === 124 /* ConstructorKeyword */ ? functionDeclaration_1.parent : functionDeclaration_1);
+                        return declaration === (location.kind === 125 /* ConstructorKeyword */ ? functionDeclaration_1.parent : functionDeclaration_1);
                     });
                     if (locationIsSymbolDeclaration) {
-                        var allSignatures = functionDeclaration_1.kind === 157 /* Constructor */ ? type.getNonNullableType().getConstructSignatures() : type.getNonNullableType().getCallSignatures();
+                        var allSignatures = functionDeclaration_1.kind === 158 /* Constructor */ ? type.getNonNullableType().getConstructSignatures() : type.getNonNullableType().getCallSignatures();
                         if (!typeChecker.isImplementationOfOverload(functionDeclaration_1)) {
                             signature = typeChecker.getSignatureFromDeclaration(functionDeclaration_1); // TODO: GH#18217
                         }
                         else {
                             signature = allSignatures[0];
                         }
-                        if (functionDeclaration_1.kind === 157 /* Constructor */) {
+                        if (functionDeclaration_1.kind === 158 /* Constructor */) {
                             // show (constructor) Type(...) signature
                             symbolKind = "constructor" /* constructorImplementationElement */;
                             addPrefixForAnyFunctionOrVar(type.symbol, symbolKind);
                         }
                         else {
                             // (function/method) symbol(..signature)
-                            addPrefixForAnyFunctionOrVar(functionDeclaration_1.kind === 160 /* CallSignature */ &&
+                            addPrefixForAnyFunctionOrVar(functionDeclaration_1.kind === 161 /* CallSignature */ &&
                                 !(type.symbol.flags & 2048 /* TypeLiteral */ || type.symbol.flags & 4096 /* ObjectLiteral */) ? type.symbol : symbol, symbolKind);
                         }
                         addSignatureDisplayParts(signature, allSignatures);
@@ -107387,7 +110986,7 @@ var ts;
             }
             if (symbolFlags & 32 /* Class */ && !hasAddedSymbolInfo && !isThisExpression) {
                 addAliasPrefixIfNecessary();
-                if (ts.getDeclarationOfKind(symbol, 209 /* ClassExpression */)) {
+                if (ts.getDeclarationOfKind(symbol, 210 /* ClassExpression */)) {
                     // Special case for class expressions because we would like to indicate that
                     // the class name is local to the class body (similar to function expression)
                     //      (local class) class <className>
@@ -107395,7 +110994,7 @@ var ts;
                 }
                 else {
                     // Class declaration has name which is not local.
-                    displayParts.push(ts.keywordPart(76 /* ClassKeyword */));
+                    displayParts.push(ts.keywordPart(77 /* ClassKeyword */));
                 }
                 displayParts.push(ts.spacePart());
                 addFullSymbolName(symbol);
@@ -107403,37 +111002,37 @@ var ts;
             }
             if ((symbolFlags & 64 /* Interface */) && (semanticMeaning & 2 /* Type */)) {
                 prefixNextMeaning();
-                displayParts.push(ts.keywordPart(110 /* InterfaceKeyword */));
+                displayParts.push(ts.keywordPart(111 /* InterfaceKeyword */));
                 displayParts.push(ts.spacePart());
                 addFullSymbolName(symbol);
                 writeTypeParametersOfSymbol(symbol, sourceFile);
             }
             if ((symbolFlags & 524288 /* TypeAlias */) && (semanticMeaning & 2 /* Type */)) {
                 prefixNextMeaning();
-                displayParts.push(ts.keywordPart(140 /* TypeKeyword */));
+                displayParts.push(ts.keywordPart(141 /* TypeKeyword */));
                 displayParts.push(ts.spacePart());
                 addFullSymbolName(symbol);
                 writeTypeParametersOfSymbol(symbol, sourceFile);
                 displayParts.push(ts.spacePart());
-                displayParts.push(ts.operatorPart(59 /* EqualsToken */));
+                displayParts.push(ts.operatorPart(60 /* EqualsToken */));
                 displayParts.push(ts.spacePart());
                 ts.addRange(displayParts, ts.typeToDisplayParts(typeChecker, typeChecker.getDeclaredTypeOfSymbol(symbol), enclosingDeclaration, 8388608 /* InTypeAlias */));
             }
             if (symbolFlags & 384 /* Enum */) {
                 prefixNextMeaning();
                 if (ts.some(symbol.declarations, function (d) { return ts.isEnumDeclaration(d) && ts.isEnumConst(d); })) {
-                    displayParts.push(ts.keywordPart(77 /* ConstKeyword */));
+                    displayParts.push(ts.keywordPart(78 /* ConstKeyword */));
                     displayParts.push(ts.spacePart());
                 }
-                displayParts.push(ts.keywordPart(84 /* EnumKeyword */));
+                displayParts.push(ts.keywordPart(85 /* EnumKeyword */));
                 displayParts.push(ts.spacePart());
                 addFullSymbolName(symbol);
             }
             if (symbolFlags & 1536 /* Module */ && !isThisExpression) {
                 prefixNextMeaning();
-                var declaration = ts.getDeclarationOfKind(symbol, 244 /* ModuleDeclaration */);
-                var isNamespace = declaration && declaration.name && declaration.name.kind === 72 /* Identifier */;
-                displayParts.push(ts.keywordPart(isNamespace ? 131 /* NamespaceKeyword */ : 130 /* ModuleKeyword */));
+                var declaration = ts.getDeclarationOfKind(symbol, 245 /* ModuleDeclaration */);
+                var isNamespace = declaration && declaration.name && declaration.name.kind === 73 /* Identifier */;
+                displayParts.push(ts.keywordPart(isNamespace ? 132 /* NamespaceKeyword */ : 131 /* ModuleKeyword */));
                 displayParts.push(ts.spacePart());
                 addFullSymbolName(symbol);
             }
@@ -107452,7 +111051,7 @@ var ts;
                 }
                 else {
                     // Method/function type parameter
-                    var decl = ts.getDeclarationOfKind(symbol, 150 /* TypeParameter */);
+                    var decl = ts.getDeclarationOfKind(symbol, 151 /* TypeParameter */);
                     if (decl === undefined)
                         return ts.Debug.fail();
                     var declaration = decl.parent;
@@ -107460,21 +111059,21 @@ var ts;
                         if (ts.isFunctionLikeKind(declaration.kind)) {
                             addInPrefix();
                             var signature = typeChecker.getSignatureFromDeclaration(declaration); // TODO: GH#18217
-                            if (declaration.kind === 161 /* ConstructSignature */) {
-                                displayParts.push(ts.keywordPart(95 /* NewKeyword */));
+                            if (declaration.kind === 162 /* ConstructSignature */) {
+                                displayParts.push(ts.keywordPart(96 /* NewKeyword */));
                                 displayParts.push(ts.spacePart());
                             }
-                            else if (declaration.kind !== 160 /* CallSignature */ && declaration.name) {
+                            else if (declaration.kind !== 161 /* CallSignature */ && declaration.name) {
                                 addFullSymbolName(declaration.symbol);
                             }
                             ts.addRange(displayParts, ts.signatureToDisplayParts(typeChecker, signature, sourceFile, 32 /* WriteTypeArgumentsOfSignature */));
                         }
-                        else if (declaration.kind === 242 /* TypeAliasDeclaration */) {
+                        else if (declaration.kind === 243 /* TypeAliasDeclaration */) {
                             // Type alias type parameter
                             // For example
                             //      type list<T> = T[]; // Both T will go through same code path
                             addInPrefix();
-                            displayParts.push(ts.keywordPart(140 /* TypeKeyword */));
+                            displayParts.push(ts.keywordPart(141 /* TypeKeyword */));
                             displayParts.push(ts.spacePart());
                             addFullSymbolName(declaration.symbol);
                             writeTypeParametersOfSymbol(declaration.symbol, sourceFile);
@@ -107486,11 +111085,11 @@ var ts;
                 symbolKind = "enum member" /* enumMemberElement */;
                 addPrefixForAnyFunctionOrVar(symbol, "enum member");
                 var declaration = symbol.declarations[0];
-                if (declaration.kind === 278 /* EnumMember */) {
+                if (declaration.kind === 279 /* EnumMember */) {
                     var constantValue = typeChecker.getConstantValue(declaration);
                     if (constantValue !== undefined) {
                         displayParts.push(ts.spacePart());
-                        displayParts.push(ts.operatorPart(59 /* EqualsToken */));
+                        displayParts.push(ts.operatorPart(60 /* EqualsToken */));
                         displayParts.push(ts.spacePart());
                         displayParts.push(ts.displayPart(ts.getTextOfConstantValue(constantValue), typeof constantValue === "number" ? ts.SymbolDisplayPartKind.numericLiteral : ts.SymbolDisplayPartKind.stringLiteral));
                     }
@@ -107516,32 +111115,32 @@ var ts;
                     }
                 }
                 switch (symbol.declarations[0].kind) {
-                    case 247 /* NamespaceExportDeclaration */:
-                        displayParts.push(ts.keywordPart(85 /* ExportKeyword */));
+                    case 248 /* NamespaceExportDeclaration */:
+                        displayParts.push(ts.keywordPart(86 /* ExportKeyword */));
                         displayParts.push(ts.spacePart());
-                        displayParts.push(ts.keywordPart(131 /* NamespaceKeyword */));
+                        displayParts.push(ts.keywordPart(132 /* NamespaceKeyword */));
                         break;
-                    case 254 /* ExportAssignment */:
-                        displayParts.push(ts.keywordPart(85 /* ExportKeyword */));
+                    case 255 /* ExportAssignment */:
+                        displayParts.push(ts.keywordPart(86 /* ExportKeyword */));
                         displayParts.push(ts.spacePart());
-                        displayParts.push(ts.keywordPart(symbol.declarations[0].isExportEquals ? 59 /* EqualsToken */ : 80 /* DefaultKeyword */));
+                        displayParts.push(ts.keywordPart(symbol.declarations[0].isExportEquals ? 60 /* EqualsToken */ : 81 /* DefaultKeyword */));
                         break;
-                    case 257 /* ExportSpecifier */:
-                        displayParts.push(ts.keywordPart(85 /* ExportKeyword */));
+                    case 258 /* ExportSpecifier */:
+                        displayParts.push(ts.keywordPart(86 /* ExportKeyword */));
                         break;
                     default:
-                        displayParts.push(ts.keywordPart(92 /* ImportKeyword */));
+                        displayParts.push(ts.keywordPart(93 /* ImportKeyword */));
                 }
                 displayParts.push(ts.spacePart());
                 addFullSymbolName(symbol);
                 ts.forEach(symbol.declarations, function (declaration) {
-                    if (declaration.kind === 248 /* ImportEqualsDeclaration */) {
+                    if (declaration.kind === 249 /* ImportEqualsDeclaration */) {
                         var importEqualsDeclaration = declaration;
                         if (ts.isExternalModuleImportEqualsDeclaration(importEqualsDeclaration)) {
                             displayParts.push(ts.spacePart());
-                            displayParts.push(ts.operatorPart(59 /* EqualsToken */));
+                            displayParts.push(ts.operatorPart(60 /* EqualsToken */));
                             displayParts.push(ts.spacePart());
-                            displayParts.push(ts.keywordPart(134 /* RequireKeyword */));
+                            displayParts.push(ts.keywordPart(135 /* RequireKeyword */));
                             displayParts.push(ts.punctuationPart(20 /* OpenParenToken */));
                             displayParts.push(ts.displayPart(ts.getTextOfNode(ts.getExternalModuleImportEqualsDeclarationExpression(importEqualsDeclaration)), ts.SymbolDisplayPartKind.stringLiteral));
                             displayParts.push(ts.punctuationPart(21 /* CloseParenToken */));
@@ -107550,7 +111149,7 @@ var ts;
                             var internalAliasSymbol = typeChecker.getSymbolAtLocation(importEqualsDeclaration.moduleReference);
                             if (internalAliasSymbol) {
                                 displayParts.push(ts.spacePart());
-                                displayParts.push(ts.operatorPart(59 /* EqualsToken */));
+                                displayParts.push(ts.operatorPart(60 /* EqualsToken */));
                                 displayParts.push(ts.spacePart());
                                 addFullSymbolName(internalAliasSymbol, enclosingDeclaration);
                             }
@@ -107564,7 +111163,7 @@ var ts;
                     if (type) {
                         if (isThisExpression) {
                             prefixNextMeaning();
-                            displayParts.push(ts.keywordPart(100 /* ThisKeyword */));
+                            displayParts.push(ts.keywordPart(101 /* ThisKeyword */));
                         }
                         else {
                             addPrefixForAnyFunctionOrVar(symbol, symbolKind);
@@ -107613,10 +111212,10 @@ var ts;
                     // For some special property access expressions like `exports.foo = foo` or `module.exports.foo = foo`
                     // there documentation comments might be attached to the right hand side symbol of their declarations.
                     // The pattern of such special property access is that the parent symbol is the symbol of the file.
-                    if (symbol.parent && ts.forEach(symbol.parent.declarations, function (declaration) { return declaration.kind === 284 /* SourceFile */; })) {
+                    if (symbol.parent && ts.forEach(symbol.parent.declarations, function (declaration) { return declaration.kind === 285 /* SourceFile */; })) {
                         for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                             var declaration = _a[_i];
-                            if (!declaration.parent || declaration.parent.kind !== 204 /* BinaryExpression */) {
+                            if (!declaration.parent || declaration.parent.kind !== 205 /* BinaryExpression */) {
                                 continue;
                             }
                             var rhsSymbol = typeChecker.getSymbolAtLocation(declaration.parent.right);
@@ -107659,7 +111258,7 @@ var ts;
             }
             function addInPrefix() {
                 displayParts.push(ts.spacePart());
-                displayParts.push(ts.keywordPart(93 /* InKeyword */));
+                displayParts.push(ts.keywordPart(94 /* InKeyword */));
                 displayParts.push(ts.spacePart());
             }
             function addFullSymbolName(symbolToDisplay, enclosingDeclaration) {
@@ -107729,16 +111328,16 @@ var ts;
             }
             return ts.forEach(symbol.declarations, function (declaration) {
                 // Function expressions are local
-                if (declaration.kind === 196 /* FunctionExpression */) {
+                if (declaration.kind === 197 /* FunctionExpression */) {
                     return true;
                 }
-                if (declaration.kind !== 237 /* VariableDeclaration */ && declaration.kind !== 239 /* FunctionDeclaration */) {
+                if (declaration.kind !== 238 /* VariableDeclaration */ && declaration.kind !== 240 /* FunctionDeclaration */) {
                     return false;
                 }
                 // If the parent is not sourceFile or module block it is local variable
                 for (var parent = declaration.parent; !ts.isFunctionBlock(parent); parent = parent.parent) {
                     // Reached source file or module block
-                    if (parent.kind === 284 /* SourceFile */ || parent.kind === 245 /* ModuleBlock */) {
+                    if (parent.kind === 285 /* SourceFile */ || parent.kind === 246 /* ModuleBlock */) {
                         return false;
                     }
                 }
@@ -107967,8 +111566,8 @@ var ts;
 (function (ts) {
     var formatting;
     (function (formatting) {
-        var standardScanner = ts.createScanner(7 /* Latest */, /*skipTrivia*/ false, 0 /* Standard */);
-        var jsxScanner = ts.createScanner(7 /* Latest */, /*skipTrivia*/ false, 1 /* JSX */);
+        var standardScanner = ts.createScanner(99 /* Latest */, /*skipTrivia*/ false, 0 /* Standard */);
+        var jsxScanner = ts.createScanner(99 /* Latest */, /*skipTrivia*/ false, 1 /* JSX */);
         var ScanAction;
         (function (ScanAction) {
             ScanAction[ScanAction["Scan"] = 0] = "Scan";
@@ -108032,8 +111631,8 @@ var ts;
             function shouldRescanGreaterThanToken(node) {
                 switch (node.kind) {
                     case 32 /* GreaterThanEqualsToken */:
-                    case 67 /* GreaterThanGreaterThanEqualsToken */:
-                    case 68 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
+                    case 68 /* GreaterThanGreaterThanEqualsToken */:
+                    case 69 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
                     case 48 /* GreaterThanGreaterThanGreaterThanToken */:
                     case 47 /* GreaterThanGreaterThanToken */:
                         return true;
@@ -108043,12 +111642,12 @@ var ts;
             function shouldRescanJsxIdentifier(node) {
                 if (node.parent) {
                     switch (node.parent.kind) {
-                        case 267 /* JsxAttribute */:
-                        case 262 /* JsxOpeningElement */:
-                        case 263 /* JsxClosingElement */:
-                        case 261 /* JsxSelfClosingElement */:
+                        case 268 /* JsxAttribute */:
+                        case 263 /* JsxOpeningElement */:
+                        case 264 /* JsxClosingElement */:
+                        case 262 /* JsxSelfClosingElement */:
                             // May parse an identifier like `module-layout`; that will be scanned as a keyword at first, but we should parse the whole thing to get an identifier.
-                            return ts.isKeyword(node.kind) || node.kind === 72 /* Identifier */;
+                            return ts.isKeyword(node.kind) || node.kind === 73 /* Identifier */;
                     }
                 }
                 return false;
@@ -108064,7 +111663,7 @@ var ts;
                     container.kind === 17 /* TemplateTail */;
             }
             function startsWithSlashToken(t) {
-                return t === 42 /* SlashToken */ || t === 64 /* SlashEqualsToken */;
+                return t === 42 /* SlashToken */ || t === 65 /* SlashEqualsToken */;
             }
             function readTokenInfo(n) {
                 ts.Debug.assert(isOnToken());
@@ -108223,7 +111822,7 @@ var ts;
     (function (formatting) {
         function getAllRules() {
             var allTokens = [];
-            for (var token = 0 /* FirstToken */; token <= 147 /* LastToken */; token++) {
+            for (var token = 0 /* FirstToken */; token <= 148 /* LastToken */; token++) {
                 allTokens.push(token);
             }
             function anyTokenExcept() {
@@ -108235,27 +111834,27 @@ var ts;
             }
             var anyToken = { tokens: allTokens, isSpecific: false };
             var anyTokenIncludingMultilineComments = tokenRangeFrom(allTokens.concat([3 /* MultiLineCommentTrivia */]));
-            var keywords = tokenRangeFromRange(73 /* FirstKeyword */, 147 /* LastKeyword */);
-            var binaryOperators = tokenRangeFromRange(28 /* FirstBinaryOperator */, 71 /* LastBinaryOperator */);
-            var binaryKeywordOperators = [93 /* InKeyword */, 94 /* InstanceOfKeyword */, 147 /* OfKeyword */, 119 /* AsKeyword */, 128 /* IsKeyword */];
+            var keywords = tokenRangeFromRange(74 /* FirstKeyword */, 148 /* LastKeyword */);
+            var binaryOperators = tokenRangeFromRange(28 /* FirstBinaryOperator */, 72 /* LastBinaryOperator */);
+            var binaryKeywordOperators = [94 /* InKeyword */, 95 /* InstanceOfKeyword */, 148 /* OfKeyword */, 120 /* AsKeyword */, 129 /* IsKeyword */];
             var unaryPrefixOperators = [44 /* PlusPlusToken */, 45 /* MinusMinusToken */, 53 /* TildeToken */, 52 /* ExclamationToken */];
             var unaryPrefixExpressions = [
-                8 /* NumericLiteral */, 9 /* BigIntLiteral */, 72 /* Identifier */, 20 /* OpenParenToken */,
-                22 /* OpenBracketToken */, 18 /* OpenBraceToken */, 100 /* ThisKeyword */, 95 /* NewKeyword */
+                8 /* NumericLiteral */, 9 /* BigIntLiteral */, 73 /* Identifier */, 20 /* OpenParenToken */,
+                22 /* OpenBracketToken */, 18 /* OpenBraceToken */, 101 /* ThisKeyword */, 96 /* NewKeyword */
             ];
-            var unaryPreincrementExpressions = [72 /* Identifier */, 20 /* OpenParenToken */, 100 /* ThisKeyword */, 95 /* NewKeyword */];
-            var unaryPostincrementExpressions = [72 /* Identifier */, 21 /* CloseParenToken */, 23 /* CloseBracketToken */, 95 /* NewKeyword */];
-            var unaryPredecrementExpressions = [72 /* Identifier */, 20 /* OpenParenToken */, 100 /* ThisKeyword */, 95 /* NewKeyword */];
-            var unaryPostdecrementExpressions = [72 /* Identifier */, 21 /* CloseParenToken */, 23 /* CloseBracketToken */, 95 /* NewKeyword */];
+            var unaryPreincrementExpressions = [73 /* Identifier */, 20 /* OpenParenToken */, 101 /* ThisKeyword */, 96 /* NewKeyword */];
+            var unaryPostincrementExpressions = [73 /* Identifier */, 21 /* CloseParenToken */, 23 /* CloseBracketToken */, 96 /* NewKeyword */];
+            var unaryPredecrementExpressions = [73 /* Identifier */, 20 /* OpenParenToken */, 101 /* ThisKeyword */, 96 /* NewKeyword */];
+            var unaryPostdecrementExpressions = [73 /* Identifier */, 21 /* CloseParenToken */, 23 /* CloseBracketToken */, 96 /* NewKeyword */];
             var comments = [2 /* SingleLineCommentTrivia */, 3 /* MultiLineCommentTrivia */];
-            var typeNames = [72 /* Identifier */].concat(ts.typeKeywords);
+            var typeNames = [73 /* Identifier */].concat(ts.typeKeywords);
             // Place a space before open brace in a function declaration
             // TypeScript: Function can have return types, which can be made of tons of different token kinds
             var functionOpenBraceLeftTokenRange = anyTokenIncludingMultilineComments;
             // Place a space before open brace in a TypeScript declaration that has braces as children (class, module, enum, etc)
-            var typeScriptOpenBraceLeftTokenRange = tokenRangeFrom([72 /* Identifier */, 3 /* MultiLineCommentTrivia */, 76 /* ClassKeyword */, 85 /* ExportKeyword */, 92 /* ImportKeyword */]);
+            var typeScriptOpenBraceLeftTokenRange = tokenRangeFrom([73 /* Identifier */, 3 /* MultiLineCommentTrivia */, 77 /* ClassKeyword */, 86 /* ExportKeyword */, 93 /* ImportKeyword */]);
             // Place a space before open brace in a control flow construct
-            var controlOpenBraceLeftTokenRange = tokenRangeFrom([21 /* CloseParenToken */, 3 /* MultiLineCommentTrivia */, 82 /* DoKeyword */, 103 /* TryKeyword */, 88 /* FinallyKeyword */, 83 /* ElseKeyword */]);
+            var controlOpenBraceLeftTokenRange = tokenRangeFrom([21 /* CloseParenToken */, 3 /* MultiLineCommentTrivia */, 83 /* DoKeyword */, 104 /* TryKeyword */, 89 /* FinallyKeyword */, 84 /* ElseKeyword */]);
             // These rules are higher in priority than user-configurable
             var highPriorityCommonRules = [
                 // Leave comments alone
@@ -108270,7 +111869,7 @@ var ts;
                 rule("NoSpaceAfterQuestionMark", 56 /* QuestionToken */, anyToken, [isNonJsxSameLineTokenContext], 8 /* Delete */),
                 rule("NoSpaceBeforeDot", anyToken, 24 /* DotToken */, [isNonJsxSameLineTokenContext], 8 /* Delete */),
                 rule("NoSpaceAfterDot", 24 /* DotToken */, anyToken, [isNonJsxSameLineTokenContext], 8 /* Delete */),
-                rule("NoSpaceBetweenImportParenInImportType", 92 /* ImportKeyword */, 20 /* OpenParenToken */, [isNonJsxSameLineTokenContext, isImportTypeContext], 8 /* Delete */),
+                rule("NoSpaceBetweenImportParenInImportType", 93 /* ImportKeyword */, 20 /* OpenParenToken */, [isNonJsxSameLineTokenContext, isImportTypeContext], 8 /* Delete */),
                 // Special handling of unary operators.
                 // Prefix operators generally shouldn't have a space between
                 // them and their target unary expression.
@@ -108297,79 +111896,79 @@ var ts;
                 rule("SpaceAfterCloseBrace", 19 /* CloseBraceToken */, anyTokenExcept(21 /* CloseParenToken */), [isNonJsxSameLineTokenContext, isAfterCodeBlockContext], 2 /* Space */),
                 // Special case for (}, else) and (}, while) since else & while tokens are not part of the tree which makes SpaceAfterCloseBrace rule not applied
                 // Also should not apply to })
-                rule("SpaceBetweenCloseBraceAndElse", 19 /* CloseBraceToken */, 83 /* ElseKeyword */, [isNonJsxSameLineTokenContext], 2 /* Space */),
-                rule("SpaceBetweenCloseBraceAndWhile", 19 /* CloseBraceToken */, 107 /* WhileKeyword */, [isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("SpaceBetweenCloseBraceAndElse", 19 /* CloseBraceToken */, 84 /* ElseKeyword */, [isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("SpaceBetweenCloseBraceAndWhile", 19 /* CloseBraceToken */, 108 /* WhileKeyword */, [isNonJsxSameLineTokenContext], 2 /* Space */),
                 rule("NoSpaceBetweenEmptyBraceBrackets", 18 /* OpenBraceToken */, 19 /* CloseBraceToken */, [isNonJsxSameLineTokenContext, isObjectContext], 8 /* Delete */),
                 // Add a space after control dec context if the next character is an open bracket ex: 'if (false)[a, b] = [1, 2];' -> 'if (false) [a, b] = [1, 2];'
                 rule("SpaceAfterConditionalClosingParen", 21 /* CloseParenToken */, 22 /* OpenBracketToken */, [isControlDeclContext], 2 /* Space */),
-                rule("NoSpaceBetweenFunctionKeywordAndStar", 90 /* FunctionKeyword */, 40 /* AsteriskToken */, [isFunctionDeclarationOrFunctionExpressionContext], 8 /* Delete */),
-                rule("SpaceAfterStarInGeneratorDeclaration", 40 /* AsteriskToken */, [72 /* Identifier */, 20 /* OpenParenToken */], [isFunctionDeclarationOrFunctionExpressionContext], 2 /* Space */),
-                rule("SpaceAfterFunctionInFuncDecl", 90 /* FunctionKeyword */, anyToken, [isFunctionDeclContext], 2 /* Space */),
+                rule("NoSpaceBetweenFunctionKeywordAndStar", 91 /* FunctionKeyword */, 40 /* AsteriskToken */, [isFunctionDeclarationOrFunctionExpressionContext], 8 /* Delete */),
+                rule("SpaceAfterStarInGeneratorDeclaration", 40 /* AsteriskToken */, 73 /* Identifier */, [isFunctionDeclarationOrFunctionExpressionContext], 2 /* Space */),
+                rule("SpaceAfterFunctionInFuncDecl", 91 /* FunctionKeyword */, anyToken, [isFunctionDeclContext], 2 /* Space */),
                 // Insert new line after { and before } in multi-line contexts.
                 rule("NewLineAfterOpenBraceInBlockContext", 18 /* OpenBraceToken */, anyToken, [isMultilineBlockContext], 4 /* NewLine */),
                 // For get/set members, we check for (identifier,identifier) since get/set don't have tokens and they are represented as just an identifier token.
                 // Though, we do extra check on the context to make sure we are dealing with get/set node. Example:
                 //      get x() {}
                 //      set x(val) {}
-                rule("SpaceAfterGetSetInMember", [126 /* GetKeyword */, 137 /* SetKeyword */], 72 /* Identifier */, [isFunctionDeclContext], 2 /* Space */),
-                rule("NoSpaceBetweenYieldKeywordAndStar", 117 /* YieldKeyword */, 40 /* AsteriskToken */, [isNonJsxSameLineTokenContext, isYieldOrYieldStarWithOperand], 8 /* Delete */),
-                rule("SpaceBetweenYieldOrYieldStarAndOperand", [117 /* YieldKeyword */, 40 /* AsteriskToken */], anyToken, [isNonJsxSameLineTokenContext, isYieldOrYieldStarWithOperand], 2 /* Space */),
-                rule("NoSpaceBetweenReturnAndSemicolon", 97 /* ReturnKeyword */, 26 /* SemicolonToken */, [isNonJsxSameLineTokenContext], 8 /* Delete */),
-                rule("SpaceAfterCertainKeywords", [105 /* VarKeyword */, 101 /* ThrowKeyword */, 95 /* NewKeyword */, 81 /* DeleteKeyword */, 97 /* ReturnKeyword */, 104 /* TypeOfKeyword */, 122 /* AwaitKeyword */], anyToken, [isNonJsxSameLineTokenContext], 2 /* Space */),
-                rule("SpaceAfterLetConstInVariableDeclaration", [111 /* LetKeyword */, 77 /* ConstKeyword */], anyToken, [isNonJsxSameLineTokenContext, isStartOfVariableDeclarationList], 2 /* Space */),
+                rule("SpaceAfterGetSetInMember", [127 /* GetKeyword */, 138 /* SetKeyword */], 73 /* Identifier */, [isFunctionDeclContext], 2 /* Space */),
+                rule("NoSpaceBetweenYieldKeywordAndStar", 118 /* YieldKeyword */, 40 /* AsteriskToken */, [isNonJsxSameLineTokenContext, isYieldOrYieldStarWithOperand], 8 /* Delete */),
+                rule("SpaceBetweenYieldOrYieldStarAndOperand", [118 /* YieldKeyword */, 40 /* AsteriskToken */], anyToken, [isNonJsxSameLineTokenContext, isYieldOrYieldStarWithOperand], 2 /* Space */),
+                rule("NoSpaceBetweenReturnAndSemicolon", 98 /* ReturnKeyword */, 26 /* SemicolonToken */, [isNonJsxSameLineTokenContext], 8 /* Delete */),
+                rule("SpaceAfterCertainKeywords", [106 /* VarKeyword */, 102 /* ThrowKeyword */, 96 /* NewKeyword */, 82 /* DeleteKeyword */, 98 /* ReturnKeyword */, 105 /* TypeOfKeyword */, 123 /* AwaitKeyword */], anyToken, [isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("SpaceAfterLetConstInVariableDeclaration", [112 /* LetKeyword */, 78 /* ConstKeyword */], anyToken, [isNonJsxSameLineTokenContext, isStartOfVariableDeclarationList], 2 /* Space */),
                 rule("NoSpaceBeforeOpenParenInFuncCall", anyToken, 20 /* OpenParenToken */, [isNonJsxSameLineTokenContext, isFunctionCallOrNewContext, isPreviousTokenNotComma], 8 /* Delete */),
                 // Special case for binary operators (that are keywords). For these we have to add a space and shouldn't follow any user options.
                 rule("SpaceBeforeBinaryKeywordOperator", anyToken, binaryKeywordOperators, [isNonJsxSameLineTokenContext, isBinaryOpContext], 2 /* Space */),
                 rule("SpaceAfterBinaryKeywordOperator", binaryKeywordOperators, anyToken, [isNonJsxSameLineTokenContext, isBinaryOpContext], 2 /* Space */),
-                rule("SpaceAfterVoidOperator", 106 /* VoidKeyword */, anyToken, [isNonJsxSameLineTokenContext, isVoidOpContext], 2 /* Space */),
+                rule("SpaceAfterVoidOperator", 107 /* VoidKeyword */, anyToken, [isNonJsxSameLineTokenContext, isVoidOpContext], 2 /* Space */),
                 // Async-await
-                rule("SpaceBetweenAsyncAndOpenParen", 121 /* AsyncKeyword */, 20 /* OpenParenToken */, [isArrowFunctionContext, isNonJsxSameLineTokenContext], 2 /* Space */),
-                rule("SpaceBetweenAsyncAndFunctionKeyword", 121 /* AsyncKeyword */, 90 /* FunctionKeyword */, [isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("SpaceBetweenAsyncAndOpenParen", 122 /* AsyncKeyword */, 20 /* OpenParenToken */, [isArrowFunctionContext, isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("SpaceBetweenAsyncAndFunctionKeyword", 122 /* AsyncKeyword */, 91 /* FunctionKeyword */, [isNonJsxSameLineTokenContext], 2 /* Space */),
                 // Template string
-                rule("NoSpaceBetweenTagAndTemplateString", [72 /* Identifier */, 21 /* CloseParenToken */], [14 /* NoSubstitutionTemplateLiteral */, 15 /* TemplateHead */], [isNonJsxSameLineTokenContext], 8 /* Delete */),
+                rule("NoSpaceBetweenTagAndTemplateString", [73 /* Identifier */, 21 /* CloseParenToken */], [14 /* NoSubstitutionTemplateLiteral */, 15 /* TemplateHead */], [isNonJsxSameLineTokenContext], 8 /* Delete */),
                 // JSX opening elements
-                rule("SpaceBeforeJsxAttribute", anyToken, 72 /* Identifier */, [isNextTokenParentJsxAttribute, isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("SpaceBeforeJsxAttribute", anyToken, 73 /* Identifier */, [isNextTokenParentJsxAttribute, isNonJsxSameLineTokenContext], 2 /* Space */),
                 rule("SpaceBeforeSlashInJsxOpeningElement", anyToken, 42 /* SlashToken */, [isJsxSelfClosingElementContext, isNonJsxSameLineTokenContext], 2 /* Space */),
                 rule("NoSpaceBeforeGreaterThanTokenInJsxOpeningElement", 42 /* SlashToken */, 30 /* GreaterThanToken */, [isJsxSelfClosingElementContext, isNonJsxSameLineTokenContext], 8 /* Delete */),
-                rule("NoSpaceBeforeEqualInJsxAttribute", anyToken, 59 /* EqualsToken */, [isJsxAttributeContext, isNonJsxSameLineTokenContext], 8 /* Delete */),
-                rule("NoSpaceAfterEqualInJsxAttribute", 59 /* EqualsToken */, anyToken, [isJsxAttributeContext, isNonJsxSameLineTokenContext], 8 /* Delete */),
+                rule("NoSpaceBeforeEqualInJsxAttribute", anyToken, 60 /* EqualsToken */, [isJsxAttributeContext, isNonJsxSameLineTokenContext], 8 /* Delete */),
+                rule("NoSpaceAfterEqualInJsxAttribute", 60 /* EqualsToken */, anyToken, [isJsxAttributeContext, isNonJsxSameLineTokenContext], 8 /* Delete */),
                 // TypeScript-specific rules
                 // Use of module as a function call. e.g.: import m2 = module("m2");
-                rule("NoSpaceAfterModuleImport", [130 /* ModuleKeyword */, 134 /* RequireKeyword */], 20 /* OpenParenToken */, [isNonJsxSameLineTokenContext], 8 /* Delete */),
+                rule("NoSpaceAfterModuleImport", [131 /* ModuleKeyword */, 135 /* RequireKeyword */], 20 /* OpenParenToken */, [isNonJsxSameLineTokenContext], 8 /* Delete */),
                 // Add a space around certain TypeScript keywords
                 rule("SpaceAfterCertainTypeScriptKeywords", [
-                    118 /* AbstractKeyword */,
-                    76 /* ClassKeyword */,
-                    125 /* DeclareKeyword */,
-                    80 /* DefaultKeyword */,
-                    84 /* EnumKeyword */,
-                    85 /* ExportKeyword */,
-                    86 /* ExtendsKeyword */,
-                    126 /* GetKeyword */,
-                    109 /* ImplementsKeyword */,
-                    92 /* ImportKeyword */,
-                    110 /* InterfaceKeyword */,
-                    130 /* ModuleKeyword */,
-                    131 /* NamespaceKeyword */,
-                    113 /* PrivateKeyword */,
-                    115 /* PublicKeyword */,
-                    114 /* ProtectedKeyword */,
-                    133 /* ReadonlyKeyword */,
-                    137 /* SetKeyword */,
-                    116 /* StaticKeyword */,
-                    140 /* TypeKeyword */,
-                    144 /* FromKeyword */,
-                    129 /* KeyOfKeyword */,
-                    127 /* InferKeyword */,
+                    119 /* AbstractKeyword */,
+                    77 /* ClassKeyword */,
+                    126 /* DeclareKeyword */,
+                    81 /* DefaultKeyword */,
+                    85 /* EnumKeyword */,
+                    86 /* ExportKeyword */,
+                    87 /* ExtendsKeyword */,
+                    127 /* GetKeyword */,
+                    110 /* ImplementsKeyword */,
+                    93 /* ImportKeyword */,
+                    111 /* InterfaceKeyword */,
+                    131 /* ModuleKeyword */,
+                    132 /* NamespaceKeyword */,
+                    114 /* PrivateKeyword */,
+                    116 /* PublicKeyword */,
+                    115 /* ProtectedKeyword */,
+                    134 /* ReadonlyKeyword */,
+                    138 /* SetKeyword */,
+                    117 /* StaticKeyword */,
+                    141 /* TypeKeyword */,
+                    145 /* FromKeyword */,
+                    130 /* KeyOfKeyword */,
+                    128 /* InferKeyword */,
                 ], anyToken, [isNonJsxSameLineTokenContext], 2 /* Space */),
-                rule("SpaceBeforeCertainTypeScriptKeywords", anyToken, [86 /* ExtendsKeyword */, 109 /* ImplementsKeyword */, 144 /* FromKeyword */], [isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("SpaceBeforeCertainTypeScriptKeywords", anyToken, [87 /* ExtendsKeyword */, 110 /* ImplementsKeyword */, 145 /* FromKeyword */], [isNonJsxSameLineTokenContext], 2 /* Space */),
                 // Treat string literals in module names as identifiers, and add a space between the literal and the opening Brace braces, e.g.: module "m2" {
                 rule("SpaceAfterModuleName", 10 /* StringLiteral */, 18 /* OpenBraceToken */, [isModuleDeclContext], 2 /* Space */),
                 // Lambda expressions
                 rule("SpaceBeforeArrow", anyToken, 37 /* EqualsGreaterThanToken */, [isNonJsxSameLineTokenContext], 2 /* Space */),
                 rule("SpaceAfterArrow", 37 /* EqualsGreaterThanToken */, anyToken, [isNonJsxSameLineTokenContext], 2 /* Space */),
                 // Optional parameters and let args
-                rule("NoSpaceAfterEllipsis", 25 /* DotDotDotToken */, 72 /* Identifier */, [isNonJsxSameLineTokenContext], 8 /* Delete */),
+                rule("NoSpaceAfterEllipsis", 25 /* DotDotDotToken */, 73 /* Identifier */, [isNonJsxSameLineTokenContext], 8 /* Delete */),
                 rule("NoSpaceAfterOptionalParameters", 56 /* QuestionToken */, [21 /* CloseParenToken */, 27 /* CommaToken */], [isNonJsxSameLineTokenContext, isNotBinaryOpContext], 8 /* Delete */),
                 // Remove spaces in empty interface literals. e.g.: x: {}
                 rule("NoSpaceBetweenEmptyInterfaceBraceBrackets", 18 /* OpenBraceToken */, 19 /* CloseBraceToken */, [isNonJsxSameLineTokenContext, isObjectTypeContext], 8 /* Delete */),
@@ -108380,37 +111979,38 @@ var ts;
                 rule("NoSpaceBeforeCloseAngularBracket", anyToken, 30 /* GreaterThanToken */, [isNonJsxSameLineTokenContext, isTypeArgumentOrParameterOrAssertionContext], 8 /* Delete */),
                 rule("NoSpaceAfterCloseAngularBracket", 30 /* GreaterThanToken */, [20 /* OpenParenToken */, 22 /* OpenBracketToken */, 30 /* GreaterThanToken */, 27 /* CommaToken */], [isNonJsxSameLineTokenContext, isTypeArgumentOrParameterOrAssertionContext, isNotFunctionDeclContext /*To prevent an interference with the SpaceBeforeOpenParenInFuncDecl rule*/], 8 /* Delete */),
                 // decorators
-                rule("SpaceBeforeAt", [21 /* CloseParenToken */, 72 /* Identifier */], 58 /* AtToken */, [isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("SpaceBeforeAt", [21 /* CloseParenToken */, 73 /* Identifier */], 58 /* AtToken */, [isNonJsxSameLineTokenContext], 2 /* Space */),
                 rule("NoSpaceAfterAt", 58 /* AtToken */, anyToken, [isNonJsxSameLineTokenContext], 8 /* Delete */),
                 // Insert space after @ in decorator
                 rule("SpaceAfterDecorator", anyToken, [
-                    118 /* AbstractKeyword */,
-                    72 /* Identifier */,
-                    85 /* ExportKeyword */,
-                    80 /* DefaultKeyword */,
-                    76 /* ClassKeyword */,
-                    116 /* StaticKeyword */,
-                    115 /* PublicKeyword */,
-                    113 /* PrivateKeyword */,
-                    114 /* ProtectedKeyword */,
-                    126 /* GetKeyword */,
-                    137 /* SetKeyword */,
+                    119 /* AbstractKeyword */,
+                    73 /* Identifier */,
+                    86 /* ExportKeyword */,
+                    81 /* DefaultKeyword */,
+                    77 /* ClassKeyword */,
+                    117 /* StaticKeyword */,
+                    116 /* PublicKeyword */,
+                    114 /* PrivateKeyword */,
+                    115 /* ProtectedKeyword */,
+                    127 /* GetKeyword */,
+                    138 /* SetKeyword */,
                     22 /* OpenBracketToken */,
                     40 /* AsteriskToken */,
                 ], [isEndOfDecoratorContextOnSameLine], 2 /* Space */),
                 rule("NoSpaceBeforeNonNullAssertionOperator", anyToken, 52 /* ExclamationToken */, [isNonJsxSameLineTokenContext, isNonNullAssertionContext], 8 /* Delete */),
-                rule("NoSpaceAfterNewKeywordOnConstructorSignature", 95 /* NewKeyword */, 20 /* OpenParenToken */, [isNonJsxSameLineTokenContext, isConstructorSignatureContext], 8 /* Delete */),
+                rule("NoSpaceAfterNewKeywordOnConstructorSignature", 96 /* NewKeyword */, 20 /* OpenParenToken */, [isNonJsxSameLineTokenContext, isConstructorSignatureContext], 8 /* Delete */),
+                rule("SpaceLessThanAndNonJSXTypeAnnotation", 28 /* LessThanToken */, 28 /* LessThanToken */, [isNonJsxSameLineTokenContext], 2 /* Space */),
             ];
             // These rules are applied after high priority
             var userConfigurableRules = [
                 // Treat constructor as an identifier in a function declaration, and remove spaces between constructor and following left parentheses
-                rule("SpaceAfterConstructor", 124 /* ConstructorKeyword */, 20 /* OpenParenToken */, [isOptionEnabled("insertSpaceAfterConstructor"), isNonJsxSameLineTokenContext], 2 /* Space */),
-                rule("NoSpaceAfterConstructor", 124 /* ConstructorKeyword */, 20 /* OpenParenToken */, [isOptionDisabledOrUndefined("insertSpaceAfterConstructor"), isNonJsxSameLineTokenContext], 8 /* Delete */),
+                rule("SpaceAfterConstructor", 125 /* ConstructorKeyword */, 20 /* OpenParenToken */, [isOptionEnabled("insertSpaceAfterConstructor"), isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("NoSpaceAfterConstructor", 125 /* ConstructorKeyword */, 20 /* OpenParenToken */, [isOptionDisabledOrUndefined("insertSpaceAfterConstructor"), isNonJsxSameLineTokenContext], 8 /* Delete */),
                 rule("SpaceAfterComma", 27 /* CommaToken */, anyToken, [isOptionEnabled("insertSpaceAfterCommaDelimiter"), isNonJsxSameLineTokenContext, isNonJsxElementOrFragmentContext, isNextTokenNotCloseBracket], 2 /* Space */),
                 rule("NoSpaceAfterComma", 27 /* CommaToken */, anyToken, [isOptionDisabledOrUndefined("insertSpaceAfterCommaDelimiter"), isNonJsxSameLineTokenContext, isNonJsxElementOrFragmentContext], 8 /* Delete */),
                 // Insert space after function keyword for anonymous functions
-                rule("SpaceAfterAnonymousFunctionKeyword", 90 /* FunctionKeyword */, 20 /* OpenParenToken */, [isOptionEnabled("insertSpaceAfterFunctionKeywordForAnonymousFunctions"), isFunctionDeclContext], 2 /* Space */),
-                rule("NoSpaceAfterAnonymousFunctionKeyword", 90 /* FunctionKeyword */, 20 /* OpenParenToken */, [isOptionDisabledOrUndefined("insertSpaceAfterFunctionKeywordForAnonymousFunctions"), isFunctionDeclContext], 8 /* Delete */),
+                rule("SpaceAfterAnonymousFunctionKeyword", [91 /* FunctionKeyword */, 40 /* AsteriskToken */], 20 /* OpenParenToken */, [isOptionEnabled("insertSpaceAfterFunctionKeywordForAnonymousFunctions"), isFunctionDeclContext], 2 /* Space */),
+                rule("NoSpaceAfterAnonymousFunctionKeyword", [91 /* FunctionKeyword */, 40 /* AsteriskToken */], 20 /* OpenParenToken */, [isOptionDisabledOrUndefined("insertSpaceAfterFunctionKeywordForAnonymousFunctions"), isFunctionDeclContext], 8 /* Delete */),
                 // Insert space after keywords in control flow statements
                 rule("SpaceAfterKeywordInControl", keywords, 20 /* OpenParenToken */, [isOptionEnabled("insertSpaceAfterKeywordsInControlFlowStatements"), isControlDeclContext], 2 /* Space */),
                 rule("NoSpaceAfterKeywordInControl", keywords, 20 /* OpenParenToken */, [isOptionDisabledOrUndefined("insertSpaceAfterKeywordsInControlFlowStatements"), isControlDeclContext], 8 /* Delete */),
@@ -108474,20 +112074,32 @@ var ts;
                 rule("SpaceBeforeOpenBraceInTypeScriptDeclWithBlock", typeScriptOpenBraceLeftTokenRange, 18 /* OpenBraceToken */, [isOptionDisabledOrUndefinedOrTokensOnSameLine("placeOpenBraceOnNewLineForFunctions"), isTypeScriptDeclWithBlockContext, isNotFormatOnEnter, isSameLineTokenOrBeforeBlockContext], 2 /* Space */, 1 /* CanDeleteNewLines */),
                 rule("NoSpaceBeforeComma", anyToken, 27 /* CommaToken */, [isNonJsxSameLineTokenContext], 8 /* Delete */),
                 // No space before and after indexer `x[]`
-                rule("NoSpaceBeforeOpenBracket", anyTokenExcept(121 /* AsyncKeyword */, 74 /* CaseKeyword */), 22 /* OpenBracketToken */, [isNonJsxSameLineTokenContext], 8 /* Delete */),
+                rule("NoSpaceBeforeOpenBracket", anyTokenExcept(122 /* AsyncKeyword */, 75 /* CaseKeyword */), 22 /* OpenBracketToken */, [isNonJsxSameLineTokenContext], 8 /* Delete */),
                 rule("NoSpaceAfterCloseBracket", 23 /* CloseBracketToken */, anyToken, [isNonJsxSameLineTokenContext, isNotBeforeBlockInFunctionDeclarationContext], 8 /* Delete */),
                 rule("SpaceAfterSemicolon", 26 /* SemicolonToken */, anyToken, [isNonJsxSameLineTokenContext], 2 /* Space */),
                 // Remove extra space between for and await
-                rule("SpaceBetweenForAndAwaitKeyword", 89 /* ForKeyword */, 122 /* AwaitKeyword */, [isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("SpaceBetweenForAndAwaitKeyword", 90 /* ForKeyword */, 123 /* AwaitKeyword */, [isNonJsxSameLineTokenContext], 2 /* Space */),
                 // Add a space between statements. All keywords except (do,else,case) has open/close parens after them.
                 // So, we have a rule to add a space for [),Any], [do,Any], [else,Any], and [case,Any]
-                rule("SpaceBetweenStatements", [21 /* CloseParenToken */, 82 /* DoKeyword */, 83 /* ElseKeyword */, 74 /* CaseKeyword */], anyToken, [isNonJsxSameLineTokenContext, isNonJsxElementOrFragmentContext, isNotForContext], 2 /* Space */),
+                rule("SpaceBetweenStatements", [21 /* CloseParenToken */, 83 /* DoKeyword */, 84 /* ElseKeyword */, 75 /* CaseKeyword */], anyToken, [isNonJsxSameLineTokenContext, isNonJsxElementOrFragmentContext, isNotForContext], 2 /* Space */),
                 // This low-pri rule takes care of "try {" and "finally {" in case the rule SpaceBeforeOpenBraceInControl didn't execute on FormatOnEnter.
-                rule("SpaceAfterTryFinally", [103 /* TryKeyword */, 88 /* FinallyKeyword */], 18 /* OpenBraceToken */, [isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("SpaceAfterTryFinally", [104 /* TryKeyword */, 89 /* FinallyKeyword */], 18 /* OpenBraceToken */, [isNonJsxSameLineTokenContext], 2 /* Space */),
             ];
             return highPriorityCommonRules.concat(userConfigurableRules, lowPriorityCommonRules);
         }
         formatting.getAllRules = getAllRules;
+        /**
+         * A rule takes a two tokens (left/right) and a particular context
+         * for which you're meant to look at them. You then declare what should the
+         * whitespace annotation be between these tokens via the action param.
+         *
+         * @param debugName Name to print
+         * @param left The left side of the comparison
+         * @param right The right side of the comparison
+         * @param context A set of filters to narrow down the space in which this formatter rule applies
+         * @param action a declaration of the expected whitespace
+         * @param flags whether the rule deletes a line or not, defaults to no-op
+         */
         function rule(debugName, left, right, context, action, flags) {
             if (flags === void 0) { flags = 0 /* None */; }
             return { leftTokenRange: toTokenRange(left), rightTokenRange: toTokenRange(right), rule: { debugName: debugName, context: context, action: action, flags: flags } };
@@ -108527,45 +112139,45 @@ var ts;
             return function (context) { return !context.options || !context.options.hasOwnProperty(optionName) || !!context.options[optionName]; };
         }
         function isForContext(context) {
-            return context.contextNode.kind === 225 /* ForStatement */;
+            return context.contextNode.kind === 226 /* ForStatement */;
         }
         function isNotForContext(context) {
             return !isForContext(context);
         }
         function isBinaryOpContext(context) {
             switch (context.contextNode.kind) {
-                case 204 /* BinaryExpression */:
-                case 205 /* ConditionalExpression */:
-                case 175 /* ConditionalType */:
-                case 212 /* AsExpression */:
-                case 257 /* ExportSpecifier */:
-                case 253 /* ImportSpecifier */:
-                case 163 /* TypePredicate */:
-                case 173 /* UnionType */:
-                case 174 /* IntersectionType */:
+                case 205 /* BinaryExpression */:
+                case 206 /* ConditionalExpression */:
+                case 176 /* ConditionalType */:
+                case 213 /* AsExpression */:
+                case 258 /* ExportSpecifier */:
+                case 254 /* ImportSpecifier */:
+                case 164 /* TypePredicate */:
+                case 174 /* UnionType */:
+                case 175 /* IntersectionType */:
                     return true;
                 // equals in binding elements: function foo([[x, y] = [1, 2]])
-                case 186 /* BindingElement */:
+                case 187 /* BindingElement */:
                 // equals in type X = ...
-                case 242 /* TypeAliasDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
                 // equal in import a = module('a');
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                 // equal in let a = 0;
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                 // equal in p = 0;
-                case 151 /* Parameter */:
-                case 278 /* EnumMember */:
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
-                    return context.currentTokenSpan.kind === 59 /* EqualsToken */ || context.nextTokenSpan.kind === 59 /* EqualsToken */;
+                case 152 /* Parameter */:
+                case 279 /* EnumMember */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
+                    return context.currentTokenSpan.kind === 60 /* EqualsToken */ || context.nextTokenSpan.kind === 60 /* EqualsToken */;
                 // "in" keyword in for (let x in []) { }
-                case 226 /* ForInStatement */:
+                case 227 /* ForInStatement */:
                 // "in" keyword in [P in keyof T]: T[P]
-                case 150 /* TypeParameter */:
-                    return context.currentTokenSpan.kind === 93 /* InKeyword */ || context.nextTokenSpan.kind === 93 /* InKeyword */ || context.currentTokenSpan.kind === 59 /* EqualsToken */ || context.nextTokenSpan.kind === 59 /* EqualsToken */;
+                case 151 /* TypeParameter */:
+                    return context.currentTokenSpan.kind === 94 /* InKeyword */ || context.nextTokenSpan.kind === 94 /* InKeyword */ || context.currentTokenSpan.kind === 60 /* EqualsToken */ || context.nextTokenSpan.kind === 60 /* EqualsToken */;
                 // Technically, "of" is not a binary operator, but format it the same way as "in"
-                case 227 /* ForOfStatement */:
-                    return context.currentTokenSpan.kind === 147 /* OfKeyword */ || context.nextTokenSpan.kind === 147 /* OfKeyword */;
+                case 228 /* ForOfStatement */:
+                    return context.currentTokenSpan.kind === 148 /* OfKeyword */ || context.nextTokenSpan.kind === 148 /* OfKeyword */;
             }
             return false;
         }
@@ -108577,22 +112189,22 @@ var ts;
         }
         function isTypeAnnotationContext(context) {
             var contextKind = context.contextNode.kind;
-            return contextKind === 154 /* PropertyDeclaration */ ||
-                contextKind === 153 /* PropertySignature */ ||
-                contextKind === 151 /* Parameter */ ||
-                contextKind === 237 /* VariableDeclaration */ ||
+            return contextKind === 155 /* PropertyDeclaration */ ||
+                contextKind === 154 /* PropertySignature */ ||
+                contextKind === 152 /* Parameter */ ||
+                contextKind === 238 /* VariableDeclaration */ ||
                 ts.isFunctionLikeKind(contextKind);
         }
         function isConditionalOperatorContext(context) {
-            return context.contextNode.kind === 205 /* ConditionalExpression */ ||
-                context.contextNode.kind === 175 /* ConditionalType */;
+            return context.contextNode.kind === 206 /* ConditionalExpression */ ||
+                context.contextNode.kind === 176 /* ConditionalType */;
         }
         function isSameLineTokenOrBeforeBlockContext(context) {
             return context.TokensAreOnSameLine() || isBeforeBlockContext(context);
         }
         function isBraceWrappedContext(context) {
-            return context.contextNode.kind === 184 /* ObjectBindingPattern */ ||
-                context.contextNode.kind === 181 /* MappedType */ ||
+            return context.contextNode.kind === 185 /* ObjectBindingPattern */ ||
+                context.contextNode.kind === 182 /* MappedType */ ||
                 isSingleLineBlockContext(context);
         }
         // This check is done before an open brace in a control construct, a function, or a typescript block declaration
@@ -108618,31 +112230,31 @@ var ts;
                 return true;
             }
             switch (node.kind) {
-                case 218 /* Block */:
-                case 246 /* CaseBlock */:
-                case 188 /* ObjectLiteralExpression */:
-                case 245 /* ModuleBlock */:
+                case 219 /* Block */:
+                case 247 /* CaseBlock */:
+                case 189 /* ObjectLiteralExpression */:
+                case 246 /* ModuleBlock */:
                     return true;
             }
             return false;
         }
         function isFunctionDeclContext(context) {
             switch (context.contextNode.kind) {
-                case 239 /* FunctionDeclaration */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
+                case 240 /* FunctionDeclaration */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
                 // case SyntaxKind.MemberFunctionDeclaration:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                 // case SyntaxKind.MethodSignature:
-                case 160 /* CallSignature */:
-                case 196 /* FunctionExpression */:
-                case 157 /* Constructor */:
-                case 197 /* ArrowFunction */:
+                case 161 /* CallSignature */:
+                case 197 /* FunctionExpression */:
+                case 158 /* Constructor */:
+                case 198 /* ArrowFunction */:
                 // case SyntaxKind.ConstructorDeclaration:
                 // case SyntaxKind.SimpleArrowFunctionExpression:
                 // case SyntaxKind.ParenthesizedArrowFunctionExpression:
-                case 241 /* InterfaceDeclaration */: // This one is not truly a function, but for formatting purposes, it acts just like one
+                case 242 /* InterfaceDeclaration */: // This one is not truly a function, but for formatting purposes, it acts just like one
                     return true;
             }
             return false;
@@ -108651,40 +112263,40 @@ var ts;
             return !isFunctionDeclContext(context);
         }
         function isFunctionDeclarationOrFunctionExpressionContext(context) {
-            return context.contextNode.kind === 239 /* FunctionDeclaration */ || context.contextNode.kind === 196 /* FunctionExpression */;
+            return context.contextNode.kind === 240 /* FunctionDeclaration */ || context.contextNode.kind === 197 /* FunctionExpression */;
         }
         function isTypeScriptDeclWithBlockContext(context) {
             return nodeIsTypeScriptDeclWithBlockContext(context.contextNode);
         }
         function nodeIsTypeScriptDeclWithBlockContext(node) {
             switch (node.kind) {
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
-                case 241 /* InterfaceDeclaration */:
-                case 243 /* EnumDeclaration */:
-                case 168 /* TypeLiteral */:
-                case 244 /* ModuleDeclaration */:
-                case 255 /* ExportDeclaration */:
-                case 256 /* NamedExports */:
-                case 249 /* ImportDeclaration */:
-                case 252 /* NamedImports */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
+                case 242 /* InterfaceDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 169 /* TypeLiteral */:
+                case 245 /* ModuleDeclaration */:
+                case 256 /* ExportDeclaration */:
+                case 257 /* NamedExports */:
+                case 250 /* ImportDeclaration */:
+                case 253 /* NamedImports */:
                     return true;
             }
             return false;
         }
         function isAfterCodeBlockContext(context) {
             switch (context.currentTokenParent.kind) {
-                case 240 /* ClassDeclaration */:
-                case 244 /* ModuleDeclaration */:
-                case 243 /* EnumDeclaration */:
-                case 274 /* CatchClause */:
-                case 245 /* ModuleBlock */:
-                case 232 /* SwitchStatement */:
+                case 241 /* ClassDeclaration */:
+                case 245 /* ModuleDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 275 /* CatchClause */:
+                case 246 /* ModuleBlock */:
+                case 233 /* SwitchStatement */:
                     return true;
-                case 218 /* Block */: {
+                case 219 /* Block */: {
                     var blockParent = context.currentTokenParent.parent;
                     // In a codefix scenario, we can't rely on parents being set. So just always return true.
-                    if (!blockParent || blockParent.kind !== 197 /* ArrowFunction */ && blockParent.kind !== 196 /* FunctionExpression */) {
+                    if (!blockParent || blockParent.kind !== 198 /* ArrowFunction */ && blockParent.kind !== 197 /* FunctionExpression */) {
                         return true;
                     }
                 }
@@ -108693,31 +112305,31 @@ var ts;
         }
         function isControlDeclContext(context) {
             switch (context.contextNode.kind) {
-                case 222 /* IfStatement */:
-                case 232 /* SwitchStatement */:
-                case 225 /* ForStatement */:
-                case 226 /* ForInStatement */:
-                case 227 /* ForOfStatement */:
-                case 224 /* WhileStatement */:
-                case 235 /* TryStatement */:
-                case 223 /* DoStatement */:
-                case 231 /* WithStatement */:
+                case 223 /* IfStatement */:
+                case 233 /* SwitchStatement */:
+                case 226 /* ForStatement */:
+                case 227 /* ForInStatement */:
+                case 228 /* ForOfStatement */:
+                case 225 /* WhileStatement */:
+                case 236 /* TryStatement */:
+                case 224 /* DoStatement */:
+                case 232 /* WithStatement */:
                 // TODO
                 // case SyntaxKind.ElseClause:
-                case 274 /* CatchClause */:
+                case 275 /* CatchClause */:
                     return true;
                 default:
                     return false;
             }
         }
         function isObjectContext(context) {
-            return context.contextNode.kind === 188 /* ObjectLiteralExpression */;
+            return context.contextNode.kind === 189 /* ObjectLiteralExpression */;
         }
         function isFunctionCallContext(context) {
-            return context.contextNode.kind === 191 /* CallExpression */;
+            return context.contextNode.kind === 192 /* CallExpression */;
         }
         function isNewContext(context) {
-            return context.contextNode.kind === 192 /* NewExpression */;
+            return context.contextNode.kind === 193 /* NewExpression */;
         }
         function isFunctionCallOrNewContext(context) {
             return isFunctionCallContext(context) || isNewContext(context);
@@ -108729,28 +112341,28 @@ var ts;
             return context.nextTokenSpan.kind !== 23 /* CloseBracketToken */;
         }
         function isArrowFunctionContext(context) {
-            return context.contextNode.kind === 197 /* ArrowFunction */;
+            return context.contextNode.kind === 198 /* ArrowFunction */;
         }
         function isImportTypeContext(context) {
-            return context.contextNode.kind === 183 /* ImportType */;
+            return context.contextNode.kind === 184 /* ImportType */;
         }
         function isNonJsxSameLineTokenContext(context) {
             return context.TokensAreOnSameLine() && context.contextNode.kind !== 11 /* JsxText */;
         }
         function isNonJsxElementOrFragmentContext(context) {
-            return context.contextNode.kind !== 260 /* JsxElement */ && context.contextNode.kind !== 264 /* JsxFragment */;
+            return context.contextNode.kind !== 261 /* JsxElement */ && context.contextNode.kind !== 265 /* JsxFragment */;
         }
         function isJsxExpressionContext(context) {
-            return context.contextNode.kind === 270 /* JsxExpression */ || context.contextNode.kind === 269 /* JsxSpreadAttribute */;
+            return context.contextNode.kind === 271 /* JsxExpression */ || context.contextNode.kind === 270 /* JsxSpreadAttribute */;
         }
         function isNextTokenParentJsxAttribute(context) {
-            return context.nextTokenParent.kind === 267 /* JsxAttribute */;
+            return context.nextTokenParent.kind === 268 /* JsxAttribute */;
         }
         function isJsxAttributeContext(context) {
-            return context.contextNode.kind === 267 /* JsxAttribute */;
+            return context.contextNode.kind === 268 /* JsxAttribute */;
         }
         function isJsxSelfClosingElementContext(context) {
-            return context.contextNode.kind === 261 /* JsxSelfClosingElement */;
+            return context.contextNode.kind === 262 /* JsxSelfClosingElement */;
         }
         function isNotBeforeBlockInFunctionDeclarationContext(context) {
             return !isFunctionDeclContext(context) && !isBeforeBlockContext(context);
@@ -108765,45 +112377,45 @@ var ts;
             while (ts.isExpressionNode(node)) {
                 node = node.parent;
             }
-            return node.kind === 152 /* Decorator */;
+            return node.kind === 153 /* Decorator */;
         }
         function isStartOfVariableDeclarationList(context) {
-            return context.currentTokenParent.kind === 238 /* VariableDeclarationList */ &&
+            return context.currentTokenParent.kind === 239 /* VariableDeclarationList */ &&
                 context.currentTokenParent.getStart(context.sourceFile) === context.currentTokenSpan.pos;
         }
         function isNotFormatOnEnter(context) {
             return context.formattingRequestKind !== 2 /* FormatOnEnter */;
         }
         function isModuleDeclContext(context) {
-            return context.contextNode.kind === 244 /* ModuleDeclaration */;
+            return context.contextNode.kind === 245 /* ModuleDeclaration */;
         }
         function isObjectTypeContext(context) {
-            return context.contextNode.kind === 168 /* TypeLiteral */; // && context.contextNode.parent.kind !== SyntaxKind.InterfaceDeclaration;
+            return context.contextNode.kind === 169 /* TypeLiteral */; // && context.contextNode.parent.kind !== SyntaxKind.InterfaceDeclaration;
         }
         function isConstructorSignatureContext(context) {
-            return context.contextNode.kind === 161 /* ConstructSignature */;
+            return context.contextNode.kind === 162 /* ConstructSignature */;
         }
         function isTypeArgumentOrParameterOrAssertion(token, parent) {
             if (token.kind !== 28 /* LessThanToken */ && token.kind !== 30 /* GreaterThanToken */) {
                 return false;
             }
             switch (parent.kind) {
-                case 164 /* TypeReference */:
-                case 194 /* TypeAssertionExpression */:
-                case 242 /* TypeAliasDeclaration */:
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
-                case 241 /* InterfaceDeclaration */:
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
-                case 160 /* CallSignature */:
-                case 161 /* ConstructSignature */:
-                case 191 /* CallExpression */:
-                case 192 /* NewExpression */:
-                case 211 /* ExpressionWithTypeArguments */:
+                case 165 /* TypeReference */:
+                case 195 /* TypeAssertionExpression */:
+                case 243 /* TypeAliasDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
+                case 242 /* InterfaceDeclaration */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
+                case 161 /* CallSignature */:
+                case 162 /* ConstructSignature */:
+                case 192 /* CallExpression */:
+                case 193 /* NewExpression */:
+                case 212 /* ExpressionWithTypeArguments */:
                     return true;
                 default:
                     return false;
@@ -108814,16 +112426,16 @@ var ts;
                 isTypeArgumentOrParameterOrAssertion(context.nextTokenSpan, context.nextTokenParent);
         }
         function isTypeAssertionContext(context) {
-            return context.contextNode.kind === 194 /* TypeAssertionExpression */;
+            return context.contextNode.kind === 195 /* TypeAssertionExpression */;
         }
         function isVoidOpContext(context) {
-            return context.currentTokenSpan.kind === 106 /* VoidKeyword */ && context.currentTokenParent.kind === 200 /* VoidExpression */;
+            return context.currentTokenSpan.kind === 107 /* VoidKeyword */ && context.currentTokenParent.kind === 201 /* VoidExpression */;
         }
         function isYieldOrYieldStarWithOperand(context) {
-            return context.contextNode.kind === 207 /* YieldExpression */ && context.contextNode.expression !== undefined;
+            return context.contextNode.kind === 208 /* YieldExpression */ && context.contextNode.expression !== undefined;
         }
         function isNonNullAssertionContext(context) {
-            return context.contextNode.kind === 213 /* NonNullExpression */;
+            return context.contextNode.kind === 214 /* NonNullExpression */;
         }
     })(formatting = ts.formatting || (ts.formatting = {}));
 })(ts || (ts = {}));
@@ -108874,12 +112486,12 @@ var ts;
             return map;
         }
         function getRuleBucketIndex(row, column) {
-            ts.Debug.assert(row <= 147 /* LastKeyword */ && column <= 147 /* LastKeyword */, "Must compute formatting context from tokens");
+            ts.Debug.assert(row <= 148 /* LastKeyword */ && column <= 148 /* LastKeyword */, "Must compute formatting context from tokens");
             return (row * mapRowLength) + column;
         }
         var maskBitSize = 5;
         var mask = 31; // MaskBitSize bits
-        var mapRowLength = 147 /* LastToken */ + 1;
+        var mapRowLength = 148 /* LastToken */ + 1;
         var RulesPosition;
         (function (RulesPosition) {
             RulesPosition[RulesPosition["IgnoreRulesSpecific"] = 0] = "IgnoreRulesSpecific";
@@ -109057,17 +112669,17 @@ var ts;
         // i.e. parent is class declaration with the list of members and node is one of members.
         function isListElement(parent, node) {
             switch (parent.kind) {
-                case 240 /* ClassDeclaration */:
-                case 241 /* InterfaceDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 242 /* InterfaceDeclaration */:
                     return ts.rangeContainsRange(parent.members, node);
-                case 244 /* ModuleDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     var body = parent.body;
-                    return !!body && body.kind === 245 /* ModuleBlock */ && ts.rangeContainsRange(body.statements, node);
-                case 284 /* SourceFile */:
-                case 218 /* Block */:
-                case 245 /* ModuleBlock */:
+                    return !!body && body.kind === 246 /* ModuleBlock */ && ts.rangeContainsRange(body.statements, node);
+                case 285 /* SourceFile */:
+                case 219 /* Block */:
+                case 246 /* ModuleBlock */:
                     return ts.rangeContainsRange(parent.statements, node);
-                case 274 /* CatchClause */:
+                case 275 /* CatchClause */:
                     return ts.rangeContainsRange(parent.block.statements, node);
             }
             return false;
@@ -109276,6 +112888,9 @@ var ts;
                     else if (formatting.SmartIndenter.childStartsOnTheSameLineWithElseInIfStatement(parent, node, startLine, sourceFile)) {
                         return { indentation: parentDynamicIndentation.getIndentation(), delta: delta };
                     }
+                    else if (formatting.SmartIndenter.argumentStartsOnSameLineAsPreviousArgument(parent, node, startLine, sourceFile)) {
+                        return { indentation: parentDynamicIndentation.getIndentation(), delta: delta };
+                    }
                     else {
                         return { indentation: parentDynamicIndentation.getIndentation() + parentDynamicIndentation.getDelta(node), delta: delta };
                     }
@@ -109289,19 +112904,19 @@ var ts;
                     return node.modifiers[0].kind;
                 }
                 switch (node.kind) {
-                    case 240 /* ClassDeclaration */: return 76 /* ClassKeyword */;
-                    case 241 /* InterfaceDeclaration */: return 110 /* InterfaceKeyword */;
-                    case 239 /* FunctionDeclaration */: return 90 /* FunctionKeyword */;
-                    case 243 /* EnumDeclaration */: return 243 /* EnumDeclaration */;
-                    case 158 /* GetAccessor */: return 126 /* GetKeyword */;
-                    case 159 /* SetAccessor */: return 137 /* SetKeyword */;
-                    case 156 /* MethodDeclaration */:
+                    case 241 /* ClassDeclaration */: return 77 /* ClassKeyword */;
+                    case 242 /* InterfaceDeclaration */: return 111 /* InterfaceKeyword */;
+                    case 240 /* FunctionDeclaration */: return 91 /* FunctionKeyword */;
+                    case 244 /* EnumDeclaration */: return 244 /* EnumDeclaration */;
+                    case 159 /* GetAccessor */: return 127 /* GetKeyword */;
+                    case 160 /* SetAccessor */: return 138 /* SetKeyword */;
+                    case 157 /* MethodDeclaration */:
                         if (node.asteriskToken) {
                             return 40 /* AsteriskToken */;
                         }
                     // falls through
-                    case 154 /* PropertyDeclaration */:
-                    case 151 /* Parameter */:
+                    case 155 /* PropertyDeclaration */:
+                    case 152 /* Parameter */:
                         var name = ts.getNameOfDeclaration(node);
                         if (name) {
                             return name.kind;
@@ -109351,22 +112966,22 @@ var ts;
                         case 18 /* OpenBraceToken */:
                         case 19 /* CloseBraceToken */:
                         case 21 /* CloseParenToken */:
-                        case 83 /* ElseKeyword */:
-                        case 107 /* WhileKeyword */:
+                        case 84 /* ElseKeyword */:
+                        case 108 /* WhileKeyword */:
                         case 58 /* AtToken */:
                             return false;
                         case 42 /* SlashToken */:
                         case 30 /* GreaterThanToken */:
                             switch (container.kind) {
-                                case 262 /* JsxOpeningElement */:
-                                case 263 /* JsxClosingElement */:
-                                case 261 /* JsxSelfClosingElement */:
+                                case 263 /* JsxOpeningElement */:
+                                case 264 /* JsxClosingElement */:
+                                case 262 /* JsxSelfClosingElement */:
                                     return false;
                             }
                             break;
                         case 22 /* OpenBracketToken */:
                         case 23 /* CloseBracketToken */:
-                            if (container.kind !== 181 /* MappedType */) {
+                            if (container.kind !== 182 /* MappedType */) {
                                 return false;
                             }
                             break;
@@ -109458,7 +113073,7 @@ var ts;
                         consumeTokenAndAdvanceScanner(tokenInfo, node, parentDynamicIndentation, child);
                         return inheritedIndentation;
                     }
-                    var effectiveParentStartLine = child.kind === 152 /* Decorator */ ? childStartLine : undecoratedParentStartLine;
+                    var effectiveParentStartLine = child.kind === 153 /* Decorator */ ? childStartLine : undecoratedParentStartLine;
                     var childIndentation = computeIndentation(child, childStartLine, childIndentationAmount, node, parentDynamicIndentation, effectiveParentStartLine);
                     processNode(child, childContextNode, childStartLine, undecoratedChildStartLine, childIndentation.indentation, childIndentation.delta);
                     if (child.kind === 11 /* JsxText */) {
@@ -109466,7 +113081,7 @@ var ts;
                         indentMultilineCommentOrJsxText(range, childIndentation.indentation, /*firstLineIsIndented*/ true, /*indentFinalLine*/ false);
                     }
                     childContextNode = node;
-                    if (isFirstListItem && parent.kind === 187 /* ArrayLiteralExpression */ && inheritedIndentation === -1 /* Unknown */) {
+                    if (isFirstListItem && parent.kind === 188 /* ArrayLiteralExpression */ && inheritedIndentation === -1 /* Unknown */) {
                         inheritedIndentation = childIndentation.indentation;
                     }
                     return inheritedIndentation;
@@ -109884,12 +113499,12 @@ var ts;
         formatting.getRangeOfEnclosingComment = getRangeOfEnclosingComment;
         function getOpenTokenForList(node, list) {
             switch (node.kind) {
-                case 157 /* Constructor */:
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
-                case 197 /* ArrowFunction */:
+                case 158 /* Constructor */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
+                case 198 /* ArrowFunction */:
                     if (node.typeParameters === list) {
                         return 28 /* LessThanToken */;
                     }
@@ -109897,8 +113512,8 @@ var ts;
                         return 20 /* OpenParenToken */;
                     }
                     break;
-                case 191 /* CallExpression */:
-                case 192 /* NewExpression */:
+                case 192 /* CallExpression */:
+                case 193 /* NewExpression */:
                     if (node.typeArguments === list) {
                         return 28 /* LessThanToken */;
                     }
@@ -109906,12 +113521,12 @@ var ts;
                         return 20 /* OpenParenToken */;
                     }
                     break;
-                case 164 /* TypeReference */:
+                case 165 /* TypeReference */:
                     if (node.typeArguments === list) {
                         return 28 /* LessThanToken */;
                     }
                     break;
-                case 168 /* TypeLiteral */:
+                case 169 /* TypeLiteral */:
                     return 18 /* OpenBraceToken */;
             }
             return 0 /* Unknown */;
@@ -110028,7 +113643,7 @@ var ts;
                 if (options.indentStyle === ts.IndentStyle.Block) {
                     return getBlockIndent(sourceFile, position, options);
                 }
-                if (precedingToken.kind === 27 /* CommaToken */ && precedingToken.parent.kind !== 204 /* BinaryExpression */) {
+                if (precedingToken.kind === 27 /* CommaToken */ && precedingToken.parent.kind !== 205 /* BinaryExpression */) {
                     // previous token is comma that separates items in list - find the previous item and try to derive indentation from it
                     var actualIndentation = getActualIndentationForListItemBeforeComma(precedingToken, sourceFile, options);
                     if (actualIndentation !== -1 /* Unknown */) {
@@ -110182,7 +113797,7 @@ var ts;
                 // - parent is SourceFile - by default immediate children of SourceFile are not indented except when user indents them manually
                 // - parent and child are not on the same line
                 var useActualIndentation = (ts.isDeclaration(current) || ts.isStatementButNotDeclaration(current)) &&
-                    (parent.kind === 284 /* SourceFile */ || !parentAndChildShareLine);
+                    (parent.kind === 285 /* SourceFile */ || !parentAndChildShareLine);
                 if (!useActualIndentation) {
                     return -1 /* Unknown */;
                 }
@@ -110230,8 +113845,8 @@ var ts;
             }
             SmartIndenter.isArgumentAndStartLineOverlapsExpressionBeingCalled = isArgumentAndStartLineOverlapsExpressionBeingCalled;
             function childStartsOnTheSameLineWithElseInIfStatement(parent, child, childStartLine, sourceFile) {
-                if (parent.kind === 222 /* IfStatement */ && parent.elseStatement === child) {
-                    var elseKeyword = ts.findChildOfKind(parent, 83 /* ElseKeyword */, sourceFile);
+                if (parent.kind === 223 /* IfStatement */ && parent.elseStatement === child) {
+                    var elseKeyword = ts.findChildOfKind(parent, 84 /* ElseKeyword */, sourceFile);
                     ts.Debug.assert(elseKeyword !== undefined);
                     var elseKeywordStartLine = getStartLineAndCharacterForNode(elseKeyword, sourceFile).line;
                     return elseKeywordStartLine === childStartLine;
@@ -110239,6 +113854,23 @@ var ts;
                 return false;
             }
             SmartIndenter.childStartsOnTheSameLineWithElseInIfStatement = childStartsOnTheSameLineWithElseInIfStatement;
+            function argumentStartsOnSameLineAsPreviousArgument(parent, child, childStartLine, sourceFile) {
+                if (ts.isCallOrNewExpression(parent)) {
+                    if (!parent.arguments)
+                        return false;
+                    var currentNode = ts.Debug.assertDefined(ts.find(parent.arguments, function (arg) { return arg.pos === child.pos; }));
+                    var currentIndex = parent.arguments.indexOf(currentNode);
+                    if (currentIndex === 0)
+                        return false; // Can't look at previous node if first
+                    var previousNode = parent.arguments[currentIndex - 1];
+                    var lineOfPreviousNode = ts.getLineAndCharacterOfPosition(sourceFile, previousNode.getEnd()).line;
+                    if (childStartLine === lineOfPreviousNode) {
+                        return true;
+                    }
+                }
+                return false;
+            }
+            SmartIndenter.argumentStartsOnSameLineAsPreviousArgument = argumentStartsOnSameLineAsPreviousArgument;
             function getContainingList(node, sourceFile) {
                 return node.parent && getListByRange(node.getStart(sourceFile), node.getEnd(), node.parent, sourceFile);
             }
@@ -110248,40 +113880,40 @@ var ts;
             }
             function getListByRange(start, end, node, sourceFile) {
                 switch (node.kind) {
-                    case 164 /* TypeReference */:
+                    case 165 /* TypeReference */:
                         return getList(node.typeArguments);
-                    case 188 /* ObjectLiteralExpression */:
+                    case 189 /* ObjectLiteralExpression */:
                         return getList(node.properties);
-                    case 187 /* ArrayLiteralExpression */:
+                    case 188 /* ArrayLiteralExpression */:
                         return getList(node.elements);
-                    case 168 /* TypeLiteral */:
+                    case 169 /* TypeLiteral */:
                         return getList(node.members);
-                    case 239 /* FunctionDeclaration */:
-                    case 196 /* FunctionExpression */:
-                    case 197 /* ArrowFunction */:
-                    case 156 /* MethodDeclaration */:
-                    case 155 /* MethodSignature */:
-                    case 160 /* CallSignature */:
-                    case 157 /* Constructor */:
-                    case 166 /* ConstructorType */:
-                    case 161 /* ConstructSignature */:
+                    case 240 /* FunctionDeclaration */:
+                    case 197 /* FunctionExpression */:
+                    case 198 /* ArrowFunction */:
+                    case 157 /* MethodDeclaration */:
+                    case 156 /* MethodSignature */:
+                    case 161 /* CallSignature */:
+                    case 158 /* Constructor */:
+                    case 167 /* ConstructorType */:
+                    case 162 /* ConstructSignature */:
                         return getList(node.typeParameters) || getList(node.parameters);
-                    case 240 /* ClassDeclaration */:
-                    case 209 /* ClassExpression */:
-                    case 241 /* InterfaceDeclaration */:
-                    case 242 /* TypeAliasDeclaration */:
-                    case 308 /* JSDocTemplateTag */:
+                    case 241 /* ClassDeclaration */:
+                    case 210 /* ClassExpression */:
+                    case 242 /* InterfaceDeclaration */:
+                    case 243 /* TypeAliasDeclaration */:
+                    case 310 /* JSDocTemplateTag */:
                         return getList(node.typeParameters);
-                    case 192 /* NewExpression */:
-                    case 191 /* CallExpression */:
+                    case 193 /* NewExpression */:
+                    case 192 /* CallExpression */:
                         return getList(node.typeArguments) || getList(node.arguments);
-                    case 238 /* VariableDeclarationList */:
+                    case 239 /* VariableDeclarationList */:
                         return getList(node.declarations);
-                    case 252 /* NamedImports */:
-                    case 256 /* NamedExports */:
+                    case 253 /* NamedImports */:
+                    case 257 /* NamedExports */:
                         return getList(node.elements);
-                    case 184 /* ObjectBindingPattern */:
-                    case 185 /* ArrayBindingPattern */:
+                    case 185 /* ObjectBindingPattern */:
+                    case 186 /* ArrayBindingPattern */:
                         return getList(node.elements);
                 }
                 function getList(list) {
@@ -110304,7 +113936,7 @@ var ts;
                 return findColumnForFirstNonWhitespaceCharacterInLine(sourceFile.getLineAndCharacterOfPosition(list.pos), sourceFile, options);
             }
             function getActualIndentationForListItem(node, sourceFile, options, listIndentsChild) {
-                if (node.parent && node.parent.kind === 238 /* VariableDeclarationList */) {
+                if (node.parent && node.parent.kind === 239 /* VariableDeclarationList */) {
                     // VariableDeclarationList has no wrapping tokens
                     return -1 /* Unknown */;
                 }
@@ -110377,83 +114009,83 @@ var ts;
             function nodeWillIndentChild(settings, parent, child, sourceFile, indentByDefault) {
                 var childKind = child ? child.kind : 0 /* Unknown */;
                 switch (parent.kind) {
-                    case 221 /* ExpressionStatement */:
-                    case 240 /* ClassDeclaration */:
-                    case 209 /* ClassExpression */:
-                    case 241 /* InterfaceDeclaration */:
-                    case 243 /* EnumDeclaration */:
-                    case 242 /* TypeAliasDeclaration */:
-                    case 187 /* ArrayLiteralExpression */:
-                    case 218 /* Block */:
-                    case 245 /* ModuleBlock */:
-                    case 188 /* ObjectLiteralExpression */:
-                    case 168 /* TypeLiteral */:
-                    case 181 /* MappedType */:
-                    case 170 /* TupleType */:
-                    case 246 /* CaseBlock */:
-                    case 272 /* DefaultClause */:
-                    case 271 /* CaseClause */:
-                    case 195 /* ParenthesizedExpression */:
-                    case 189 /* PropertyAccessExpression */:
-                    case 191 /* CallExpression */:
-                    case 192 /* NewExpression */:
-                    case 219 /* VariableStatement */:
-                    case 254 /* ExportAssignment */:
-                    case 230 /* ReturnStatement */:
-                    case 205 /* ConditionalExpression */:
-                    case 185 /* ArrayBindingPattern */:
-                    case 184 /* ObjectBindingPattern */:
-                    case 262 /* JsxOpeningElement */:
-                    case 265 /* JsxOpeningFragment */:
-                    case 261 /* JsxSelfClosingElement */:
-                    case 270 /* JsxExpression */:
-                    case 155 /* MethodSignature */:
-                    case 160 /* CallSignature */:
-                    case 161 /* ConstructSignature */:
-                    case 151 /* Parameter */:
-                    case 165 /* FunctionType */:
-                    case 166 /* ConstructorType */:
-                    case 177 /* ParenthesizedType */:
-                    case 193 /* TaggedTemplateExpression */:
-                    case 201 /* AwaitExpression */:
-                    case 256 /* NamedExports */:
-                    case 252 /* NamedImports */:
-                    case 257 /* ExportSpecifier */:
-                    case 253 /* ImportSpecifier */:
-                    case 154 /* PropertyDeclaration */:
+                    case 222 /* ExpressionStatement */:
+                    case 241 /* ClassDeclaration */:
+                    case 210 /* ClassExpression */:
+                    case 242 /* InterfaceDeclaration */:
+                    case 244 /* EnumDeclaration */:
+                    case 243 /* TypeAliasDeclaration */:
+                    case 188 /* ArrayLiteralExpression */:
+                    case 219 /* Block */:
+                    case 246 /* ModuleBlock */:
+                    case 189 /* ObjectLiteralExpression */:
+                    case 169 /* TypeLiteral */:
+                    case 182 /* MappedType */:
+                    case 171 /* TupleType */:
+                    case 247 /* CaseBlock */:
+                    case 273 /* DefaultClause */:
+                    case 272 /* CaseClause */:
+                    case 196 /* ParenthesizedExpression */:
+                    case 190 /* PropertyAccessExpression */:
+                    case 192 /* CallExpression */:
+                    case 193 /* NewExpression */:
+                    case 220 /* VariableStatement */:
+                    case 255 /* ExportAssignment */:
+                    case 231 /* ReturnStatement */:
+                    case 206 /* ConditionalExpression */:
+                    case 186 /* ArrayBindingPattern */:
+                    case 185 /* ObjectBindingPattern */:
+                    case 263 /* JsxOpeningElement */:
+                    case 266 /* JsxOpeningFragment */:
+                    case 262 /* JsxSelfClosingElement */:
+                    case 271 /* JsxExpression */:
+                    case 156 /* MethodSignature */:
+                    case 161 /* CallSignature */:
+                    case 162 /* ConstructSignature */:
+                    case 152 /* Parameter */:
+                    case 166 /* FunctionType */:
+                    case 167 /* ConstructorType */:
+                    case 178 /* ParenthesizedType */:
+                    case 194 /* TaggedTemplateExpression */:
+                    case 202 /* AwaitExpression */:
+                    case 257 /* NamedExports */:
+                    case 253 /* NamedImports */:
+                    case 258 /* ExportSpecifier */:
+                    case 254 /* ImportSpecifier */:
+                    case 155 /* PropertyDeclaration */:
                         return true;
-                    case 237 /* VariableDeclaration */:
-                    case 275 /* PropertyAssignment */:
-                        if (!settings.indentMultiLineObjectLiteralBeginningOnBlankLine && sourceFile && childKind === 188 /* ObjectLiteralExpression */) { // TODO: GH#18217
+                    case 238 /* VariableDeclaration */:
+                    case 276 /* PropertyAssignment */:
+                        if (!settings.indentMultiLineObjectLiteralBeginningOnBlankLine && sourceFile && childKind === 189 /* ObjectLiteralExpression */) { // TODO: GH#18217
                             return rangeIsOnOneLine(sourceFile, child);
                         }
                         return true;
-                    case 223 /* DoStatement */:
-                    case 224 /* WhileStatement */:
-                    case 226 /* ForInStatement */:
-                    case 227 /* ForOfStatement */:
-                    case 225 /* ForStatement */:
-                    case 222 /* IfStatement */:
-                    case 239 /* FunctionDeclaration */:
-                    case 196 /* FunctionExpression */:
-                    case 156 /* MethodDeclaration */:
-                    case 197 /* ArrowFunction */:
-                    case 157 /* Constructor */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
-                        return childKind !== 218 /* Block */;
-                    case 255 /* ExportDeclaration */:
-                        return childKind !== 256 /* NamedExports */;
-                    case 249 /* ImportDeclaration */:
-                        return childKind !== 250 /* ImportClause */ ||
-                            (!!child.namedBindings && child.namedBindings.kind !== 252 /* NamedImports */);
-                    case 260 /* JsxElement */:
-                        return childKind !== 263 /* JsxClosingElement */;
-                    case 264 /* JsxFragment */:
-                        return childKind !== 266 /* JsxClosingFragment */;
-                    case 174 /* IntersectionType */:
-                    case 173 /* UnionType */:
-                        if (childKind === 168 /* TypeLiteral */) {
+                    case 224 /* DoStatement */:
+                    case 225 /* WhileStatement */:
+                    case 227 /* ForInStatement */:
+                    case 228 /* ForOfStatement */:
+                    case 226 /* ForStatement */:
+                    case 223 /* IfStatement */:
+                    case 240 /* FunctionDeclaration */:
+                    case 197 /* FunctionExpression */:
+                    case 157 /* MethodDeclaration */:
+                    case 198 /* ArrowFunction */:
+                    case 158 /* Constructor */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
+                        return childKind !== 219 /* Block */;
+                    case 256 /* ExportDeclaration */:
+                        return childKind !== 257 /* NamedExports */;
+                    case 250 /* ImportDeclaration */:
+                        return childKind !== 251 /* ImportClause */ ||
+                            (!!child.namedBindings && child.namedBindings.kind !== 253 /* NamedImports */);
+                    case 261 /* JsxElement */:
+                        return childKind !== 264 /* JsxClosingElement */;
+                    case 265 /* JsxFragment */:
+                        return childKind !== 267 /* JsxClosingFragment */;
+                    case 175 /* IntersectionType */:
+                    case 174 /* UnionType */:
+                        if (childKind === 169 /* TypeLiteral */) {
                             return false;
                         }
                     // falls through
@@ -110464,11 +114096,11 @@ var ts;
             SmartIndenter.nodeWillIndentChild = nodeWillIndentChild;
             function isControlFlowEndingStatement(kind, parent) {
                 switch (kind) {
-                    case 230 /* ReturnStatement */:
-                    case 234 /* ThrowStatement */:
-                    case 228 /* ContinueStatement */:
-                    case 229 /* BreakStatement */:
-                        return parent.kind !== 218 /* Block */;
+                    case 231 /* ReturnStatement */:
+                    case 235 /* ThrowStatement */:
+                    case 229 /* ContinueStatement */:
+                    case 230 /* BreakStatement */:
+                        return parent.kind !== 219 /* Block */;
                     default:
                         return false;
                 }
@@ -110610,7 +114242,7 @@ var ts;
          * Checks if 'candidate' argument is a legal separator in the list that contains 'node' as an element
          */
         function isSeparator(node, candidate) {
-            return !!candidate && !!node.parent && (candidate.kind === 27 /* CommaToken */ || (candidate.kind === 26 /* SemicolonToken */ && node.parent.kind === 188 /* ObjectLiteralExpression */));
+            return !!candidate && !!node.parent && (candidate.kind === 27 /* CommaToken */ || (candidate.kind === 26 /* SemicolonToken */ && node.parent.kind === 189 /* ObjectLiteralExpression */));
         }
         function spaces(count) {
             var s = "";
@@ -110619,6 +114251,10 @@ var ts;
             }
             return s;
         }
+        function isThisTypeAnnotatable(containingFunction) {
+            return ts.isFunctionExpression(containingFunction) || ts.isFunctionDeclaration(containingFunction);
+        }
+        textChanges_3.isThisTypeAnnotatable = isThisTypeAnnotatable;
         var ChangeTracker = /** @class */ (function () {
             /** Public for tests only. Other callers should use `ChangeTracker.with`. */
             function ChangeTracker(newLineCharacter, formatContext) {
@@ -110771,10 +114407,15 @@ var ts;
                     }
                 }
                 else {
-                    endNode = node.kind !== 237 /* VariableDeclaration */ && node.questionToken ? node.questionToken : node.name;
+                    endNode = node.kind !== 238 /* VariableDeclaration */ && node.questionToken ? node.questionToken : node.name;
                 }
                 this.insertNodeAt(sourceFile, endNode.end, type, { prefix: ": " });
             };
+            ChangeTracker.prototype.tryInsertThisTypeAnnotation = function (sourceFile, node, type) {
+                var start = ts.findChildOfKind(node, 20 /* OpenParenToken */, sourceFile).getStart(sourceFile) + 1;
+                var suffix = node.parameters.length ? ", " : "";
+                this.insertNodeAt(sourceFile, start, type, { prefix: "this: ", suffix: suffix });
+            };
             ChangeTracker.prototype.insertTypeParameters = function (sourceFile, node, typeParameters) {
                 // If no `(`, is an arrow function `x => x`, so use the pos of the first parameter
                 var start = (ts.findChildOfKind(node, 20 /* OpenParenToken */, sourceFile) || ts.first(node.parameters)).getStart(sourceFile);
@@ -110883,18 +114524,18 @@ var ts;
             };
             ChangeTracker.prototype.getInsertNodeAfterOptionsWorker = function (node) {
                 switch (node.kind) {
-                    case 240 /* ClassDeclaration */:
-                    case 244 /* ModuleDeclaration */:
+                    case 241 /* ClassDeclaration */:
+                    case 245 /* ModuleDeclaration */:
                         return { prefix: this.newLineCharacter, suffix: this.newLineCharacter };
-                    case 237 /* VariableDeclaration */:
+                    case 238 /* VariableDeclaration */:
                     case 10 /* StringLiteral */:
-                    case 72 /* Identifier */:
+                    case 73 /* Identifier */:
                         return { prefix: ", " };
-                    case 275 /* PropertyAssignment */:
+                    case 276 /* PropertyAssignment */:
                         return { suffix: "," + this.newLineCharacter };
-                    case 85 /* ExportKeyword */:
+                    case 86 /* ExportKeyword */:
                         return { prefix: " " };
-                    case 151 /* Parameter */:
+                    case 152 /* Parameter */:
                         return {};
                     default:
                         ts.Debug.assert(ts.isStatement(node) || ts.isClassOrTypeElement(node)); // Else we haven't handled this kind of node yet -- add it
@@ -110903,12 +114544,12 @@ var ts;
             };
             ChangeTracker.prototype.insertName = function (sourceFile, node, name) {
                 ts.Debug.assert(!node.name);
-                if (node.kind === 197 /* ArrowFunction */) {
+                if (node.kind === 198 /* ArrowFunction */) {
                     var arrow = ts.findChildOfKind(node, 37 /* EqualsGreaterThanToken */, sourceFile);
                     var lparen = ts.findChildOfKind(node, 20 /* OpenParenToken */, sourceFile);
                     if (lparen) {
                         // `() => {}` --> `function f() {}`
-                        this.insertNodesAt(sourceFile, lparen.getStart(sourceFile), [ts.createToken(90 /* FunctionKeyword */), ts.createIdentifier(name)], { joiner: " " });
+                        this.insertNodesAt(sourceFile, lparen.getStart(sourceFile), [ts.createToken(91 /* FunctionKeyword */), ts.createIdentifier(name)], { joiner: " " });
                         deleteNode(this, sourceFile, arrow);
                     }
                     else {
@@ -110917,14 +114558,14 @@ var ts;
                         // Replacing full range of arrow to get rid of the leading space -- replace ` =>` with `)`
                         this.replaceRange(sourceFile, arrow, ts.createToken(21 /* CloseParenToken */));
                     }
-                    if (node.body.kind !== 218 /* Block */) {
+                    if (node.body.kind !== 219 /* Block */) {
                         // `() => 0` => `function f() { return 0; }`
-                        this.insertNodesAt(sourceFile, node.body.getStart(sourceFile), [ts.createToken(18 /* OpenBraceToken */), ts.createToken(97 /* ReturnKeyword */)], { joiner: " ", suffix: " " });
+                        this.insertNodesAt(sourceFile, node.body.getStart(sourceFile), [ts.createToken(18 /* OpenBraceToken */), ts.createToken(98 /* ReturnKeyword */)], { joiner: " ", suffix: " " });
                         this.insertNodesAt(sourceFile, node.body.end, [ts.createToken(26 /* SemicolonToken */), ts.createToken(19 /* CloseBraceToken */)], { joiner: " " });
                     }
                 }
                 else {
-                    var pos = ts.findChildOfKind(node, node.kind === 196 /* FunctionExpression */ ? 90 /* FunctionKeyword */ : 76 /* ClassKeyword */, sourceFile).end;
+                    var pos = ts.findChildOfKind(node, node.kind === 197 /* FunctionExpression */ ? 91 /* FunctionKeyword */ : 77 /* ClassKeyword */, sourceFile).end;
                     this.insertNodeAt(sourceFile, pos, ts.createIdentifier(name), { prefix: " " });
                 }
             };
@@ -111043,6 +114684,9 @@ var ts;
                     }
                 }
             };
+            ChangeTracker.prototype.parenthesizeExpression = function (sourceFile, expression) {
+                this.replaceRange(sourceFile, ts.rangeOfNode(expression), ts.createParen(expression));
+            };
             ChangeTracker.prototype.finishClassesWithNodesInsertedAtStart = function () {
                 var _this = this;
                 this.classesWithNodesInsertedAtStart.forEach(function (_a) {
@@ -111151,7 +114795,7 @@ var ts;
             function newFileChangesWorker(oldFile, scriptKind, statements, newLineCharacter, formatContext) {
                 // TODO: this emits the file, parses it back, then formats it that -- may be a less roundabout way to do this
                 var nonFormattedText = statements.map(function (s) { return getNonformattedText(s, oldFile, newLineCharacter).text; }).join(newLineCharacter);
-                var sourceFile = ts.createSourceFile("any file name", nonFormattedText, 7 /* ESNext */, /*setParentNodes*/ true, scriptKind);
+                var sourceFile = ts.createSourceFile("any file name", nonFormattedText, 99 /* ESNext */, /*setParentNodes*/ true, scriptKind);
                 var changes = ts.formatting.formatDocument(sourceFile, formatContext);
                 return applyChanges(nonFormattedText, changes) + newLineCharacter;
             }
@@ -111191,9 +114835,10 @@ var ts;
             }
             /** Note: output node may be mutated input node. */
             function getNonformattedText(node, sourceFile, newLineCharacter) {
-                var writer = new Writer(newLineCharacter);
+                var omitTrailingSemicolon = !!sourceFile && !ts.probablyUsesSemicolons(sourceFile);
+                var writer = createWriter(newLineCharacter, omitTrailingSemicolon);
                 var newLine = newLineCharacter === "\n" ? 1 /* LineFeed */ : 0 /* CarriageReturnLineFeed */;
-                ts.createPrinter({ newLine: newLine, neverAsciiEscape: true }, writer).writeNode(4 /* Unspecified */, node, sourceFile, writer);
+                ts.createPrinter({ newLine: newLine, neverAsciiEscape: true, omitTrailingSemicolon: omitTrailingSemicolon }, writer).writeNode(4 /* Unspecified */, node, sourceFile, writer);
                 return { text: writer.getText(), node: assignPositionsToNode(node) };
             }
             changesToText.getNonformattedText = getNonformattedText;
@@ -111228,136 +114873,162 @@ var ts;
             nodeArray.end = getEnd(nodes);
             return nodeArray;
         }
-        var Writer = /** @class */ (function () {
-            function Writer(newLine) {
-                var _this = this;
-                this.lastNonTriviaPosition = 0;
-                this.writer = ts.createTextWriter(newLine);
-                this.onEmitNode = function (hint, node, printCallback) {
-                    if (node) {
-                        setPos(node, _this.lastNonTriviaPosition);
-                    }
-                    printCallback(hint, node);
-                    if (node) {
-                        setEnd(node, _this.lastNonTriviaPosition);
-                    }
-                };
-                this.onBeforeEmitNodeArray = function (nodes) {
-                    if (nodes) {
-                        setPos(nodes, _this.lastNonTriviaPosition);
-                    }
-                };
-                this.onAfterEmitNodeArray = function (nodes) {
-                    if (nodes) {
-                        setEnd(nodes, _this.lastNonTriviaPosition);
-                    }
-                };
-                this.onBeforeEmitToken = function (node) {
-                    if (node) {
-                        setPos(node, _this.lastNonTriviaPosition);
-                    }
-                };
-                this.onAfterEmitToken = function (node) {
-                    if (node) {
-                        setEnd(node, _this.lastNonTriviaPosition);
-                    }
-                };
-            }
-            Writer.prototype.setLastNonTriviaPosition = function (s, force) {
+        function createWriter(newLine, omitTrailingSemicolon) {
+            var lastNonTriviaPosition = 0;
+            var writer = omitTrailingSemicolon ? ts.getTrailingSemicolonOmittingWriter(ts.createTextWriter(newLine)) : ts.createTextWriter(newLine);
+            var onEmitNode = function (hint, node, printCallback) {
+                if (node) {
+                    setPos(node, lastNonTriviaPosition);
+                }
+                printCallback(hint, node);
+                if (node) {
+                    setEnd(node, lastNonTriviaPosition);
+                }
+            };
+            var onBeforeEmitNodeArray = function (nodes) {
+                if (nodes) {
+                    setPos(nodes, lastNonTriviaPosition);
+                }
+            };
+            var onAfterEmitNodeArray = function (nodes) {
+                if (nodes) {
+                    setEnd(nodes, lastNonTriviaPosition);
+                }
+            };
+            var onBeforeEmitToken = function (node) {
+                if (node) {
+                    setPos(node, lastNonTriviaPosition);
+                }
+            };
+            var onAfterEmitToken = function (node) {
+                if (node) {
+                    setEnd(node, lastNonTriviaPosition);
+                }
+            };
+            function setLastNonTriviaPosition(s, force) {
                 if (force || !isTrivia(s)) {
-                    this.lastNonTriviaPosition = this.writer.getTextPos();
+                    lastNonTriviaPosition = writer.getTextPos();
                     var i = 0;
                     while (ts.isWhiteSpaceLike(s.charCodeAt(s.length - i - 1))) {
                         i++;
                     }
                     // trim trailing whitespaces
-                    this.lastNonTriviaPosition -= i;
+                    lastNonTriviaPosition -= i;
                 }
+            }
+            function write(s) {
+                writer.write(s);
+                setLastNonTriviaPosition(s, /*force*/ false);
+            }
+            function writeComment(s) {
+                writer.writeComment(s);
+            }
+            function writeKeyword(s) {
+                writer.writeKeyword(s);
+                setLastNonTriviaPosition(s, /*force*/ false);
+            }
+            function writeOperator(s) {
+                writer.writeOperator(s);
+                setLastNonTriviaPosition(s, /*force*/ false);
+            }
+            function writePunctuation(s) {
+                writer.writePunctuation(s);
+                setLastNonTriviaPosition(s, /*force*/ false);
+            }
+            function writeTrailingSemicolon(s) {
+                writer.writeTrailingSemicolon(s);
+                setLastNonTriviaPosition(s, /*force*/ false);
+            }
+            function writeParameter(s) {
+                writer.writeParameter(s);
+                setLastNonTriviaPosition(s, /*force*/ false);
+            }
+            function writeProperty(s) {
+                writer.writeProperty(s);
+                setLastNonTriviaPosition(s, /*force*/ false);
+            }
+            function writeSpace(s) {
+                writer.writeSpace(s);
+                setLastNonTriviaPosition(s, /*force*/ false);
+            }
+            function writeStringLiteral(s) {
+                writer.writeStringLiteral(s);
+                setLastNonTriviaPosition(s, /*force*/ false);
+            }
+            function writeSymbol(s, sym) {
+                writer.writeSymbol(s, sym);
+                setLastNonTriviaPosition(s, /*force*/ false);
+            }
+            function writeLine() {
+                writer.writeLine();
+            }
+            function increaseIndent() {
+                writer.increaseIndent();
+            }
+            function decreaseIndent() {
+                writer.decreaseIndent();
+            }
+            function getText() {
+                return writer.getText();
+            }
+            function rawWrite(s) {
+                writer.rawWrite(s);
+                setLastNonTriviaPosition(s, /*force*/ false);
+            }
+            function writeLiteral(s) {
+                writer.writeLiteral(s);
+                setLastNonTriviaPosition(s, /*force*/ true);
+            }
+            function getTextPos() {
+                return writer.getTextPos();
+            }
+            function getLine() {
+                return writer.getLine();
+            }
+            function getColumn() {
+                return writer.getColumn();
+            }
+            function getIndent() {
+                return writer.getIndent();
+            }
+            function isAtStartOfLine() {
+                return writer.isAtStartOfLine();
+            }
+            function clear() {
+                writer.clear();
+                lastNonTriviaPosition = 0;
+            }
+            return {
+                onEmitNode: onEmitNode,
+                onBeforeEmitNodeArray: onBeforeEmitNodeArray,
+                onAfterEmitNodeArray: onAfterEmitNodeArray,
+                onBeforeEmitToken: onBeforeEmitToken,
+                onAfterEmitToken: onAfterEmitToken,
+                write: write,
+                writeComment: writeComment,
+                writeKeyword: writeKeyword,
+                writeOperator: writeOperator,
+                writePunctuation: writePunctuation,
+                writeTrailingSemicolon: writeTrailingSemicolon,
+                writeParameter: writeParameter,
+                writeProperty: writeProperty,
+                writeSpace: writeSpace,
+                writeStringLiteral: writeStringLiteral,
+                writeSymbol: writeSymbol,
+                writeLine: writeLine,
+                increaseIndent: increaseIndent,
+                decreaseIndent: decreaseIndent,
+                getText: getText,
+                rawWrite: rawWrite,
+                writeLiteral: writeLiteral,
+                getTextPos: getTextPos,
+                getLine: getLine,
+                getColumn: getColumn,
+                getIndent: getIndent,
+                isAtStartOfLine: isAtStartOfLine,
+                clear: clear
             };
-            Writer.prototype.write = function (s) {
-                this.writer.write(s);
-                this.setLastNonTriviaPosition(s, /*force*/ false);
-            };
-            Writer.prototype.writeComment = function (s) {
-                this.writer.writeComment(s);
-            };
-            Writer.prototype.writeKeyword = function (s) {
-                this.writer.writeKeyword(s);
-                this.setLastNonTriviaPosition(s, /*force*/ false);
-            };
-            Writer.prototype.writeOperator = function (s) {
-                this.writer.writeOperator(s);
-                this.setLastNonTriviaPosition(s, /*force*/ false);
-            };
-            Writer.prototype.writePunctuation = function (s) {
-                this.writer.writePunctuation(s);
-                this.setLastNonTriviaPosition(s, /*force*/ false);
-            };
-            Writer.prototype.writeTrailingSemicolon = function (s) {
-                this.writer.writeTrailingSemicolon(s);
-                this.setLastNonTriviaPosition(s, /*force*/ false);
-            };
-            Writer.prototype.writeParameter = function (s) {
-                this.writer.writeParameter(s);
-                this.setLastNonTriviaPosition(s, /*force*/ false);
-            };
-            Writer.prototype.writeProperty = function (s) {
-                this.writer.writeProperty(s);
-                this.setLastNonTriviaPosition(s, /*force*/ false);
-            };
-            Writer.prototype.writeSpace = function (s) {
-                this.writer.writeSpace(s);
-                this.setLastNonTriviaPosition(s, /*force*/ false);
-            };
-            Writer.prototype.writeStringLiteral = function (s) {
-                this.writer.writeStringLiteral(s);
-                this.setLastNonTriviaPosition(s, /*force*/ false);
-            };
-            Writer.prototype.writeSymbol = function (s, sym) {
-                this.writer.writeSymbol(s, sym);
-                this.setLastNonTriviaPosition(s, /*force*/ false);
-            };
-            Writer.prototype.writeLine = function () {
-                this.writer.writeLine();
-            };
-            Writer.prototype.increaseIndent = function () {
-                this.writer.increaseIndent();
-            };
-            Writer.prototype.decreaseIndent = function () {
-                this.writer.decreaseIndent();
-            };
-            Writer.prototype.getText = function () {
-                return this.writer.getText();
-            };
-            Writer.prototype.rawWrite = function (s) {
-                this.writer.rawWrite(s);
-                this.setLastNonTriviaPosition(s, /*force*/ false);
-            };
-            Writer.prototype.writeLiteral = function (s) {
-                this.writer.writeLiteral(s);
-                this.setLastNonTriviaPosition(s, /*force*/ true);
-            };
-            Writer.prototype.getTextPos = function () {
-                return this.writer.getTextPos();
-            };
-            Writer.prototype.getLine = function () {
-                return this.writer.getLine();
-            };
-            Writer.prototype.getColumn = function () {
-                return this.writer.getColumn();
-            };
-            Writer.prototype.getIndent = function () {
-                return this.writer.getIndent();
-            };
-            Writer.prototype.isAtStartOfLine = function () {
-                return this.writer.isAtStartOfLine();
-            };
-            Writer.prototype.clear = function () {
-                this.writer.clear();
-                this.lastNonTriviaPosition = 0;
-            };
-            return Writer;
-        }());
+        }
         function getInsertionPositionAtSourceFileTop(sourceFile) {
             var lastPrologue;
             for (var _i = 0, _a = sourceFile.statements; _i < _a.length; _i++) {
@@ -111419,14 +115090,14 @@ var ts;
         }
         textChanges_3.isValidLocationToAddComment = isValidLocationToAddComment;
         function needSemicolonBetween(a, b) {
-            return (ts.isPropertySignature(a) || ts.isPropertyDeclaration(a)) && ts.isClassOrTypeElement(b) && b.name.kind === 149 /* ComputedPropertyName */
+            return (ts.isPropertySignature(a) || ts.isPropertyDeclaration(a)) && ts.isClassOrTypeElement(b) && b.name.kind === 150 /* ComputedPropertyName */
                 || ts.isStatementButNotDeclaration(a) && ts.isStatementButNotDeclaration(b); // TODO: only if b would start with a `(` or `[`
         }
         var deleteDeclaration;
         (function (deleteDeclaration_1) {
             function deleteDeclaration(changes, deletedNodesInLists, sourceFile, node) {
                 switch (node.kind) {
-                    case 151 /* Parameter */: {
+                    case 152 /* Parameter */: {
                         var oldFunction = node.parent;
                         if (ts.isArrowFunction(oldFunction) &&
                             oldFunction.parameters.length === 1 &&
@@ -111441,14 +115112,14 @@ var ts;
                         }
                         break;
                     }
-                    case 249 /* ImportDeclaration */:
+                    case 250 /* ImportDeclaration */:
                         deleteNode(changes, sourceFile, node, 
                         // For first import, leave header comment in place
                         node === sourceFile.imports[0].parent ? { leadingTriviaOption: LeadingTriviaOption.Exclude } : undefined);
                         break;
-                    case 186 /* BindingElement */:
+                    case 187 /* BindingElement */:
                         var pattern = node.parent;
-                        var preserveComma = pattern.kind === 185 /* ArrayBindingPattern */ && node !== ts.last(pattern.elements);
+                        var preserveComma = pattern.kind === 186 /* ArrayBindingPattern */ && node !== ts.last(pattern.elements);
                         if (preserveComma) {
                             deleteNode(changes, sourceFile, node);
                         }
@@ -111456,13 +115127,13 @@ var ts;
                             deleteNodeInList(changes, deletedNodesInLists, sourceFile, node);
                         }
                         break;
-                    case 237 /* VariableDeclaration */:
+                    case 238 /* VariableDeclaration */:
                         deleteVariableDeclaration(changes, deletedNodesInLists, sourceFile, node);
                         break;
-                    case 150 /* TypeParameter */:
+                    case 151 /* TypeParameter */:
                         deleteNodeInList(changes, deletedNodesInLists, sourceFile, node);
                         break;
-                    case 253 /* ImportSpecifier */:
+                    case 254 /* ImportSpecifier */:
                         var namedImports = node.parent;
                         if (namedImports.elements.length === 1) {
                             deleteImportBinding(changes, sourceFile, namedImports);
@@ -111471,7 +115142,7 @@ var ts;
                             deleteNodeInList(changes, deletedNodesInLists, sourceFile, node);
                         }
                         break;
-                    case 251 /* NamespaceImport */:
+                    case 252 /* NamespaceImport */:
                         deleteImportBinding(changes, sourceFile, node);
                         break;
                     default:
@@ -111518,13 +115189,13 @@ var ts;
                     // Delete the entire import declaration
                     // |import * as ns from './file'|
                     // |import { a } from './file'|
-                    var importDecl = ts.getAncestor(node, 249 /* ImportDeclaration */);
+                    var importDecl = ts.getAncestor(node, 250 /* ImportDeclaration */);
                     deleteNode(changes, sourceFile, importDecl);
                 }
             }
             function deleteVariableDeclaration(changes, deletedNodesInLists, sourceFile, node) {
                 var parent = node.parent;
-                if (parent.kind === 274 /* CatchClause */) {
+                if (parent.kind === 275 /* CatchClause */) {
                     // TODO: There's currently no unused diagnostic for this, could be a suggestion
                     changes.deleteNodeRange(sourceFile, ts.findChildOfKind(parent, 20 /* OpenParenToken */, sourceFile), ts.findChildOfKind(parent, 21 /* CloseParenToken */, sourceFile));
                     return;
@@ -111535,14 +115206,14 @@ var ts;
                 }
                 var gp = parent.parent;
                 switch (gp.kind) {
-                    case 227 /* ForOfStatement */:
-                    case 226 /* ForInStatement */:
+                    case 228 /* ForOfStatement */:
+                    case 227 /* ForInStatement */:
                         changes.replaceNode(sourceFile, node, ts.createObjectLiteral());
                         break;
-                    case 225 /* ForStatement */:
+                    case 226 /* ForStatement */:
                         deleteNode(changes, sourceFile, parent);
                         break;
-                    case 219 /* VariableStatement */:
+                    case 220 /* VariableStatement */:
                         deleteNode(changes, sourceFile, gp);
                         break;
                     default:
@@ -111705,14 +115376,270 @@ var ts;
             var token = ts.getTokenAtPosition(sourceFile, pos);
             var assertion = ts.Debug.assertDefined(ts.findAncestor(token, function (n) { return ts.isAsExpression(n) || ts.isTypeAssertion(n); }));
             var replacement = ts.isAsExpression(assertion)
-                ? ts.createAsExpression(assertion.expression, ts.createKeywordTypeNode(143 /* UnknownKeyword */))
-                : ts.createTypeAssertion(ts.createKeywordTypeNode(143 /* UnknownKeyword */), assertion.expression);
+                ? ts.createAsExpression(assertion.expression, ts.createKeywordTypeNode(144 /* UnknownKeyword */))
+                : ts.createTypeAssertion(ts.createKeywordTypeNode(144 /* UnknownKeyword */), assertion.expression);
             changeTracker.replaceNode(sourceFile, assertion.expression, replacement);
         }
     })(codefix = ts.codefix || (ts.codefix = {}));
 })(ts || (ts = {}));
 /* @internal */
 var ts;
+(function (ts) {
+    var codefix;
+    (function (codefix) {
+        var fixId = "addMissingAwait";
+        var propertyAccessCode = ts.Diagnostics.Property_0_does_not_exist_on_type_1.code;
+        var callableConstructableErrorCodes = [
+            ts.Diagnostics.This_expression_is_not_callable.code,
+            ts.Diagnostics.This_expression_is_not_constructable.code,
+        ];
+        var errorCodes = [
+            ts.Diagnostics.An_arithmetic_operand_must_be_of_type_any_number_bigint_or_an_enum_type.code,
+            ts.Diagnostics.The_left_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_bigint_or_an_enum_type.code,
+            ts.Diagnostics.The_right_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_bigint_or_an_enum_type.code,
+            ts.Diagnostics.Operator_0_cannot_be_applied_to_type_1.code,
+            ts.Diagnostics.Operator_0_cannot_be_applied_to_types_1_and_2.code,
+            ts.Diagnostics.This_condition_will_always_return_0_since_the_types_1_and_2_have_no_overlap.code,
+            ts.Diagnostics.Type_0_is_not_an_array_type.code,
+            ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type.code,
+            ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type_Use_compiler_option_downlevelIteration_to_allow_iterating_of_iterators.code,
+            ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type_or_does_not_have_a_Symbol_iterator_method_that_returns_an_iterator.code,
+            ts.Diagnostics.Type_0_is_not_an_array_type_or_does_not_have_a_Symbol_iterator_method_that_returns_an_iterator.code,
+            ts.Diagnostics.Type_0_must_have_a_Symbol_iterator_method_that_returns_an_iterator.code,
+            ts.Diagnostics.Type_0_must_have_a_Symbol_asyncIterator_method_that_returns_an_async_iterator.code,
+            ts.Diagnostics.Argument_of_type_0_is_not_assignable_to_parameter_of_type_1.code,
+            propertyAccessCode
+        ].concat(callableConstructableErrorCodes);
+        codefix.registerCodeFix({
+            fixIds: [fixId],
+            errorCodes: errorCodes,
+            getCodeActions: function (context) {
+                var sourceFile = context.sourceFile, errorCode = context.errorCode, span = context.span, cancellationToken = context.cancellationToken, program = context.program;
+                var expression = getAwaitableExpression(sourceFile, errorCode, span, cancellationToken, program);
+                if (!expression) {
+                    return;
+                }
+                var checker = context.program.getTypeChecker();
+                var trackChanges = function (cb) { return ts.textChanges.ChangeTracker.with(context, cb); };
+                return ts.compact([
+                    getDeclarationSiteFix(context, expression, errorCode, checker, trackChanges),
+                    getUseSiteFix(context, expression, errorCode, checker, trackChanges)
+                ]);
+            },
+            getAllCodeActions: function (context) {
+                var sourceFile = context.sourceFile, program = context.program, cancellationToken = context.cancellationToken;
+                var checker = context.program.getTypeChecker();
+                return codefix.codeFixAll(context, errorCodes, function (t, diagnostic) {
+                    var expression = getAwaitableExpression(sourceFile, diagnostic.code, diagnostic, cancellationToken, program);
+                    if (!expression) {
+                        return;
+                    }
+                    var trackChanges = function (cb) { return (cb(t), []); };
+                    return getDeclarationSiteFix(context, expression, diagnostic.code, checker, trackChanges)
+                        || getUseSiteFix(context, expression, diagnostic.code, checker, trackChanges);
+                });
+            },
+        });
+        function getDeclarationSiteFix(context, expression, errorCode, checker, trackChanges) {
+            var sourceFile = context.sourceFile;
+            var awaitableInitializer = findAwaitableInitializer(expression, sourceFile, checker);
+            if (awaitableInitializer) {
+                var initializerChanges = trackChanges(function (t) { return makeChange(t, errorCode, sourceFile, checker, awaitableInitializer); });
+                return codefix.createCodeFixActionNoFixId("addMissingAwaitToInitializer", initializerChanges, [ts.Diagnostics.Add_await_to_initializer_for_0, expression.getText(sourceFile)]);
+            }
+        }
+        function getUseSiteFix(context, expression, errorCode, checker, trackChanges) {
+            var changes = trackChanges(function (t) { return makeChange(t, errorCode, context.sourceFile, checker, expression); });
+            return codefix.createCodeFixAction(fixId, changes, ts.Diagnostics.Add_await, fixId, ts.Diagnostics.Fix_all_expressions_possibly_missing_await);
+        }
+        function isMissingAwaitError(sourceFile, errorCode, span, cancellationToken, program) {
+            var checker = program.getDiagnosticsProducingTypeChecker();
+            var diagnostics = checker.getDiagnostics(sourceFile, cancellationToken);
+            return ts.some(diagnostics, function (_a) {
+                var start = _a.start, length = _a.length, relatedInformation = _a.relatedInformation, code = _a.code;
+                return ts.isNumber(start) && ts.isNumber(length) && ts.textSpansEqual({ start: start, length: length }, span) &&
+                    code === errorCode &&
+                    !!relatedInformation &&
+                    ts.some(relatedInformation, function (related) { return related.code === ts.Diagnostics.Did_you_forget_to_use_await.code; });
+            });
+        }
+        function getAwaitableExpression(sourceFile, errorCode, span, cancellationToken, program) {
+            var token = ts.getTokenAtPosition(sourceFile, span.start);
+            // Checker has already done work to determine that await might be possible, and has attached
+            // related info to the node, so start by finding the expression that exactly matches up
+            // with the diagnostic range.
+            var expression = ts.findAncestor(token, function (node) {
+                if (node.getStart(sourceFile) < span.start || node.getEnd() > ts.textSpanEnd(span)) {
+                    return "quit";
+                }
+                return ts.isExpression(node) && ts.textSpansEqual(span, ts.createTextSpanFromNode(node, sourceFile));
+            });
+            return expression
+                && isMissingAwaitError(sourceFile, errorCode, span, cancellationToken, program)
+                && isInsideAwaitableBody(expression)
+                ? expression
+                : undefined;
+        }
+        function findAwaitableInitializer(expression, sourceFile, checker) {
+            if (!ts.isIdentifier(expression)) {
+                return;
+            }
+            var symbol = checker.getSymbolAtLocation(expression);
+            if (!symbol) {
+                return;
+            }
+            var declaration = ts.tryCast(symbol.valueDeclaration, ts.isVariableDeclaration);
+            var variableName = ts.tryCast(declaration && declaration.name, ts.isIdentifier);
+            var variableStatement = ts.getAncestor(declaration, 220 /* VariableStatement */);
+            if (!declaration || !variableStatement ||
+                declaration.type ||
+                !declaration.initializer ||
+                variableStatement.getSourceFile() !== sourceFile ||
+                ts.hasModifier(variableStatement, 1 /* Export */) ||
+                !variableName ||
+                !isInsideAwaitableBody(declaration.initializer)) {
+                return;
+            }
+            var isUsedElsewhere = ts.FindAllReferences.Core.eachSymbolReferenceInFile(variableName, checker, sourceFile, function (identifier) {
+                return identifier !== expression;
+            });
+            if (isUsedElsewhere) {
+                return;
+            }
+            return declaration.initializer;
+        }
+        function isInsideAwaitableBody(node) {
+            return node.kind & 16384 /* AwaitContext */ || !!ts.findAncestor(node, function (ancestor) {
+                return ancestor.parent && ts.isArrowFunction(ancestor.parent) && ancestor.parent.body === ancestor ||
+                    ts.isBlock(ancestor) && (ancestor.parent.kind === 240 /* FunctionDeclaration */ ||
+                        ancestor.parent.kind === 197 /* FunctionExpression */ ||
+                        ancestor.parent.kind === 198 /* ArrowFunction */ ||
+                        ancestor.parent.kind === 157 /* MethodDeclaration */);
+            });
+        }
+        function makeChange(changeTracker, errorCode, sourceFile, checker, insertionSite) {
+            if (ts.isBinaryExpression(insertionSite)) {
+                var left = insertionSite.left, right = insertionSite.right;
+                var leftType = checker.getTypeAtLocation(left);
+                var rightType = checker.getTypeAtLocation(right);
+                var newLeft = checker.getPromisedTypeOfPromise(leftType) ? ts.createAwait(left) : left;
+                var newRight = checker.getPromisedTypeOfPromise(rightType) ? ts.createAwait(right) : right;
+                changeTracker.replaceNode(sourceFile, left, newLeft);
+                changeTracker.replaceNode(sourceFile, right, newRight);
+            }
+            else if (errorCode === propertyAccessCode && ts.isPropertyAccessExpression(insertionSite.parent)) {
+                changeTracker.replaceNode(sourceFile, insertionSite.parent.expression, ts.createParen(ts.createAwait(insertionSite.parent.expression)));
+            }
+            else if (ts.contains(callableConstructableErrorCodes, errorCode) && ts.isCallOrNewExpression(insertionSite.parent)) {
+                changeTracker.replaceNode(sourceFile, insertionSite, ts.createParen(ts.createAwait(insertionSite)));
+            }
+            else {
+                changeTracker.replaceNode(sourceFile, insertionSite, ts.createAwait(insertionSite));
+            }
+        }
+    })(codefix = ts.codefix || (ts.codefix = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var codefix;
+    (function (codefix) {
+        var fixId = "addMissingConst";
+        var errorCodes = [
+            ts.Diagnostics.Cannot_find_name_0.code,
+            ts.Diagnostics.No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer.code
+        ];
+        codefix.registerCodeFix({
+            errorCodes: errorCodes,
+            getCodeActions: function (context) {
+                var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return makeChange(t, context.sourceFile, context.span.start, context.program); });
+                if (changes.length > 0) {
+                    return [codefix.createCodeFixAction(fixId, changes, ts.Diagnostics.Add_const_to_unresolved_variable, fixId, ts.Diagnostics.Add_const_to_all_unresolved_variables)];
+                }
+            },
+            fixIds: [fixId],
+            getAllCodeActions: function (context) {
+                var fixedNodes = new ts.NodeSet();
+                return codefix.codeFixAll(context, errorCodes, function (changes, diag) { return makeChange(changes, diag.file, diag.start, context.program, fixedNodes); });
+            },
+        });
+        function makeChange(changeTracker, sourceFile, pos, program, fixedNodes) {
+            var token = ts.getTokenAtPosition(sourceFile, pos);
+            var forInitializer = ts.findAncestor(token, function (node) {
+                return ts.isForInOrOfStatement(node.parent) ? node.parent.initializer === node :
+                    isPossiblyPartOfDestructuring(node) ? false : "quit";
+            });
+            if (forInitializer)
+                return applyChange(changeTracker, forInitializer, sourceFile, fixedNodes);
+            var parent = token.parent;
+            if (ts.isBinaryExpression(parent) && ts.isExpressionStatement(parent.parent)) {
+                return applyChange(changeTracker, token, sourceFile, fixedNodes);
+            }
+            if (ts.isArrayLiteralExpression(parent)) {
+                var checker_1 = program.getTypeChecker();
+                if (!ts.every(parent.elements, function (element) { return arrayElementCouldBeVariableDeclaration(element, checker_1); })) {
+                    return;
+                }
+                return applyChange(changeTracker, parent, sourceFile, fixedNodes);
+            }
+            var commaExpression = ts.findAncestor(token, function (node) {
+                return ts.isExpressionStatement(node.parent) ? true :
+                    isPossiblyPartOfCommaSeperatedInitializer(node) ? false : "quit";
+            });
+            if (commaExpression) {
+                var checker = program.getTypeChecker();
+                if (!expressionCouldBeVariableDeclaration(commaExpression, checker)) {
+                    return;
+                }
+                return applyChange(changeTracker, commaExpression, sourceFile, fixedNodes);
+            }
+        }
+        function applyChange(changeTracker, initializer, sourceFile, fixedNodes) {
+            if (!fixedNodes || fixedNodes.tryAdd(initializer)) {
+                changeTracker.insertModifierBefore(sourceFile, 78 /* ConstKeyword */, initializer);
+            }
+        }
+        function isPossiblyPartOfDestructuring(node) {
+            switch (node.kind) {
+                case 73 /* Identifier */:
+                case 188 /* ArrayLiteralExpression */:
+                case 189 /* ObjectLiteralExpression */:
+                case 276 /* PropertyAssignment */:
+                case 277 /* ShorthandPropertyAssignment */:
+                    return true;
+                default:
+                    return false;
+            }
+        }
+        function arrayElementCouldBeVariableDeclaration(expression, checker) {
+            var identifier = ts.isIdentifier(expression) ? expression :
+                ts.isAssignmentExpression(expression, /*excludeCompoundAssignment*/ true) && ts.isIdentifier(expression.left) ? expression.left :
+                    undefined;
+            return !!identifier && !checker.getSymbolAtLocation(identifier);
+        }
+        function isPossiblyPartOfCommaSeperatedInitializer(node) {
+            switch (node.kind) {
+                case 73 /* Identifier */:
+                case 205 /* BinaryExpression */:
+                case 27 /* CommaToken */:
+                    return true;
+                default:
+                    return false;
+            }
+        }
+        function expressionCouldBeVariableDeclaration(expression, checker) {
+            if (!ts.isBinaryExpression(expression)) {
+                return false;
+            }
+            if (expression.operatorToken.kind === 27 /* CommaToken */) {
+                return ts.every([expression.left, expression.right], function (expression) { return expressionCouldBeVariableDeclaration(expression, checker); });
+            }
+            return ts.isIdentifier(expression.left) && !checker.getSymbolAtLocation(expression.left);
+        }
+    })(codefix = ts.codefix || (ts.codefix = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
 (function (ts) {
     var codefix;
     (function (codefix) {
@@ -111755,11 +115682,11 @@ var ts;
         function makeChange(changeTracker, sourceFile, pos) {
             var token = ts.getTokenAtPosition(sourceFile, pos);
             if (!ts.isIdentifier(token)) {
-                return ts.Debug.fail("add-name-to-nameless-parameter operates on identifiers, but got a " + ts.formatSyntaxKind(token.kind));
+                return ts.Debug.fail("add-name-to-nameless-parameter operates on identifiers, but got a " + ts.Debug.formatSyntaxKind(token.kind));
             }
             var param = token.parent;
             if (!ts.isParameter(param)) {
-                return ts.Debug.fail("Tried to add a parameter name to a non-parameter: " + ts.formatSyntaxKind(token.kind));
+                return ts.Debug.fail("Tried to add a parameter name to a non-parameter: " + ts.Debug.formatSyntaxKind(token.kind));
             }
             var i = param.parent.parameters.indexOf(param);
             ts.Debug.assert(!param.type, "Tried to add a parameter name to a parameter that already had one.");
@@ -111841,26 +115768,26 @@ var ts;
         }
         function isDeclarationWithType(node) {
             return ts.isFunctionLikeDeclaration(node) ||
-                node.kind === 237 /* VariableDeclaration */ ||
-                node.kind === 153 /* PropertySignature */ ||
-                node.kind === 154 /* PropertyDeclaration */;
+                node.kind === 238 /* VariableDeclaration */ ||
+                node.kind === 154 /* PropertySignature */ ||
+                node.kind === 155 /* PropertyDeclaration */;
         }
         function transformJSDocType(node) {
             switch (node.kind) {
-                case 289 /* JSDocAllType */:
-                case 290 /* JSDocUnknownType */:
+                case 290 /* JSDocAllType */:
+                case 291 /* JSDocUnknownType */:
                     return ts.createTypeReferenceNode("any", ts.emptyArray);
-                case 293 /* JSDocOptionalType */:
+                case 294 /* JSDocOptionalType */:
                     return transformJSDocOptionalType(node);
-                case 292 /* JSDocNonNullableType */:
+                case 293 /* JSDocNonNullableType */:
                     return transformJSDocType(node.type);
-                case 291 /* JSDocNullableType */:
+                case 292 /* JSDocNullableType */:
                     return transformJSDocNullableType(node);
-                case 295 /* JSDocVariadicType */:
+                case 296 /* JSDocVariadicType */:
                     return transformJSDocVariadicType(node);
-                case 294 /* JSDocFunctionType */:
+                case 295 /* JSDocFunctionType */:
                     return transformJSDocFunctionType(node);
-                case 164 /* TypeReference */:
+                case 165 /* TypeReference */:
                     return transformJSDocTypeReference(node);
                 default:
                     var visited = ts.visitEachChild(node, transformJSDocType, /*context*/ undefined); // TODO: GH#18217
@@ -111882,7 +115809,7 @@ var ts;
         }
         function transformJSDocParameter(node) {
             var index = node.parent.parameters.indexOf(node);
-            var isRest = node.type.kind === 295 /* JSDocVariadicType */ && index === node.parent.parameters.length - 1; // TODO: GH#18217
+            var isRest = node.type.kind === 296 /* JSDocVariadicType */ && index === node.parent.parameters.length - 1; // TODO: GH#18217
             var name = node.name || (isRest ? "rest" : "arg" + index);
             var dotdotdot = isRest ? ts.createToken(25 /* DotDotDotToken */) : node.dotDotDotToken;
             return ts.createParameter(node.decorators, node.modifiers, dotdotdot, name, node.questionToken, ts.visitNode(node.type, transformJSDocType), node.initializer);
@@ -111922,8 +115849,8 @@ var ts;
             var index = ts.createParameter(
             /*decorators*/ undefined, 
             /*modifiers*/ undefined, 
-            /*dotDotDotToken*/ undefined, node.typeArguments[0].kind === 135 /* NumberKeyword */ ? "n" : "s", 
-            /*questionToken*/ undefined, ts.createTypeReferenceNode(node.typeArguments[0].kind === 135 /* NumberKeyword */ ? "number" : "string", []), 
+            /*dotDotDotToken*/ undefined, node.typeArguments[0].kind === 136 /* NumberKeyword */ ? "n" : "s", 
+            /*questionToken*/ undefined, ts.createTypeReferenceNode(node.typeArguments[0].kind === 136 /* NumberKeyword */ ? "number" : "string", []), 
             /*initializer*/ undefined);
             var indexSignature = ts.createTypeLiteralNode([ts.createIndexSignature(/*decorators*/ undefined, /*modifiers*/ undefined, [index], node.typeArguments[1])]);
             ts.setEmitFlags(indexSignature, 1 /* SingleLine */);
@@ -111967,6 +115894,8 @@ var ts;
             ts.Diagnostics.Property_0_implicitly_has_type_any_but_a_better_type_for_its_set_accessor_may_be_inferred_from_usage.code,
             // Property declarations
             ts.Diagnostics.Member_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage.code,
+            // Function expressions and declarations
+            ts.Diagnostics.this_implicitly_has_type_any_because_it_does_not_have_a_type_annotation.code,
         ];
         codefix.registerCodeFix({
             errorCodes: errorCodes,
@@ -111996,6 +115925,8 @@ var ts;
                 case ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type.code:
                 case ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type_but_a_better_type_may_be_inferred_from_usage.code:
                     return ts.Diagnostics.Infer_parameter_types_from_usage;
+                case ts.Diagnostics.this_implicitly_has_type_any_because_it_does_not_have_a_type_annotation.code:
+                    return ts.Diagnostics.Infer_this_type_of_0_from_usage;
                 default:
                     return ts.Diagnostics.Infer_type_of_0_from_usage;
             }
@@ -112023,7 +115954,7 @@ var ts;
             return errorCode;
         }
         function doChange(changes, sourceFile, token, errorCode, program, cancellationToken, markSeen, host) {
-            if (!ts.isParameterPropertyModifier(token.kind) && token.kind !== 72 /* Identifier */ && token.kind !== 25 /* DotDotDotToken */ && token.kind !== 100 /* ThisKeyword */) {
+            if (!ts.isParameterPropertyModifier(token.kind) && token.kind !== 73 /* Identifier */ && token.kind !== 25 /* DotDotDotToken */ && token.kind !== 101 /* ThisKeyword */) {
                 return undefined;
             }
             var parent = token.parent;
@@ -112090,6 +116021,13 @@ var ts;
                         return containingFunction;
                     }
                     return undefined;
+                // Function 'this'
+                case ts.Diagnostics.this_implicitly_has_type_any_because_it_does_not_have_a_type_annotation.code:
+                    if (ts.textChanges.isThisTypeAnnotatable(containingFunction) && markSeen(containingFunction)) {
+                        annotateThis(changes, sourceFile, containingFunction, program, host, cancellationToken);
+                        return containingFunction;
+                    }
+                    return undefined;
                 default:
                     return ts.Debug.fail(String(errorCode));
             }
@@ -112103,7 +116041,8 @@ var ts;
             if (!ts.isIdentifier(parameterDeclaration.name)) {
                 return;
             }
-            var parameterInferences = inferTypeForParametersFromUsage(containingFunction, sourceFile, program, cancellationToken) ||
+            var references = inferFunctionReferencesFromUsage(containingFunction, sourceFile, program, cancellationToken);
+            var parameterInferences = InferFromReference.inferTypeForParametersFromReferences(references, containingFunction, program, cancellationToken) ||
                 containingFunction.parameters.map(function (p) { return ({
                     declaration: p,
                     type: ts.isIdentifier(p.name) ? inferTypeForVariableFromUsage(p.name, program, cancellationToken) : program.getTypeChecker().getAnyType()
@@ -112126,6 +116065,31 @@ var ts;
                     changes.insertNodeAfter(sourceFile, ts.last(containingFunction.parameters), ts.createToken(21 /* CloseParenToken */));
             }
         }
+        function annotateThis(changes, sourceFile, containingFunction, program, host, cancellationToken) {
+            var references = inferFunctionReferencesFromUsage(containingFunction, sourceFile, program, cancellationToken);
+            if (!references) {
+                return;
+            }
+            var thisInference = InferFromReference.inferTypeForThisFromReferences(references, program, cancellationToken);
+            if (!thisInference) {
+                return;
+            }
+            var typeNode = ts.getTypeNodeIfAccessible(thisInference, containingFunction, program, host);
+            if (!typeNode) {
+                return;
+            }
+            if (ts.isInJSFile(containingFunction)) {
+                annotateJSDocThis(changes, sourceFile, containingFunction, typeNode);
+            }
+            else {
+                changes.tryInsertThisTypeAnnotation(sourceFile, containingFunction, typeNode);
+            }
+        }
+        function annotateJSDocThis(changes, sourceFile, containingFunction, typeNode) {
+            addJSDocTags(changes, sourceFile, containingFunction, [
+                ts.createJSDocThisTag(ts.createJSDocTypeExpression(typeNode)),
+            ]);
+        }
         function annotateSetAccessor(changes, sourceFile, setAccessorDeclaration, program, host, cancellationToken) {
             var param = ts.firstOrUndefined(setAccessorDeclaration.parameters);
             if (param && ts.isIdentifier(setAccessorDeclaration.name) && ts.isIdentifier(param.name)) {
@@ -112144,7 +116108,7 @@ var ts;
         function annotate(changes, sourceFile, declaration, type, program, host) {
             var typeNode = ts.getTypeNodeIfAccessible(type, declaration, program, host);
             if (typeNode) {
-                if (ts.isInJSFile(sourceFile) && declaration.kind !== 153 /* PropertySignature */) {
+                if (ts.isInJSFile(sourceFile) && declaration.kind !== 154 /* PropertySignature */) {
                     var parent = ts.isVariableDeclaration(declaration) ? ts.tryCast(declaration.parent.parent, ts.isVariableStatement) : declaration;
                     if (!parent) {
                         return;
@@ -112185,13 +116149,13 @@ var ts;
                 return !!merged;
             }); });
             var tag = ts.createJSDocComment(comments.join("\n"), ts.createNodeArray((oldTags || ts.emptyArray).concat(unmergedNewTags)));
-            var jsDocNode = parent.kind === 197 /* ArrowFunction */ ? getJsDocNodeForArrowFunction(parent) : parent;
+            var jsDocNode = parent.kind === 198 /* ArrowFunction */ ? getJsDocNodeForArrowFunction(parent) : parent;
             jsDocNode.jsDoc = parent.jsDoc;
             jsDocNode.jsDocCache = parent.jsDocCache;
             changes.insertJsdocCommentBefore(sourceFile, jsDocNode, tag);
         }
         function getJsDocNodeForArrowFunction(signature) {
-            if (signature.parent.kind === 154 /* PropertyDeclaration */) {
+            if (signature.parent.kind === 155 /* PropertyDeclaration */) {
                 return signature.parent;
             }
             return signature.parent.parent;
@@ -112201,14 +116165,14 @@ var ts;
                 return undefined;
             }
             switch (oldTag.kind) {
-                case 304 /* JSDocParameterTag */: {
+                case 306 /* JSDocParameterTag */: {
                     var oldParam = oldTag;
                     var newParam = newTag;
                     return ts.isIdentifier(oldParam.name) && ts.isIdentifier(newParam.name) && oldParam.name.escapedText === newParam.name.escapedText
                         ? ts.createJSDocParamTag(newParam.name, newParam.isBracketed, newParam.typeExpression, oldParam.comment)
                         : undefined;
                 }
-                case 305 /* JSDocReturnTag */:
+                case 307 /* JSDocReturnTag */:
                     return ts.createJSDocReturnTag(newTag.typeExpression, oldTag.comment);
             }
         }
@@ -112224,27 +116188,28 @@ var ts;
             var types = InferFromReference.inferTypesFromReferences(references, checker, cancellationToken);
             return InferFromReference.unifyFromContext(types, checker);
         }
-        function inferTypeForParametersFromUsage(containingFunction, sourceFile, program, cancellationToken) {
+        function inferFunctionReferencesFromUsage(containingFunction, sourceFile, program, cancellationToken) {
             var searchToken;
             switch (containingFunction.kind) {
-                case 157 /* Constructor */:
-                    searchToken = ts.findChildOfKind(containingFunction, 124 /* ConstructorKeyword */, sourceFile);
+                case 158 /* Constructor */:
+                    searchToken = ts.findChildOfKind(containingFunction, 125 /* ConstructorKeyword */, sourceFile);
                     break;
-                case 197 /* ArrowFunction */:
-                case 196 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
+                case 197 /* FunctionExpression */:
                     var parent = containingFunction.parent;
                     searchToken = ts.isVariableDeclaration(parent) && ts.isIdentifier(parent.name) ?
                         parent.name :
                         containingFunction.name;
                     break;
-                case 239 /* FunctionDeclaration */:
-                case 156 /* MethodDeclaration */:
+                case 240 /* FunctionDeclaration */:
+                case 157 /* MethodDeclaration */:
                     searchToken = containingFunction.name;
                     break;
             }
-            if (searchToken) {
-                return InferFromReference.inferTypeForParametersFromReferences(getReferences(searchToken, program, cancellationToken), containingFunction, program, cancellationToken);
+            if (!searchToken) {
+                return undefined;
             }
+            return getReferences(searchToken, program, cancellationToken);
         }
         var InferFromReference;
         (function (InferFromReference) {
@@ -112259,13 +116224,10 @@ var ts;
             }
             InferFromReference.inferTypesFromReferences = inferTypesFromReferences;
             function inferTypeForParametersFromReferences(references, declaration, program, cancellationToken) {
+                if (references === undefined || references.length === 0 || !declaration.parameters) {
+                    return undefined;
+                }
                 var checker = program.getTypeChecker();
-                if (references.length === 0) {
-                    return undefined;
-                }
-                if (!declaration.parameters) {
-                    return undefined;
-                }
                 var usageContext = {};
                 for (var _i = 0, references_3 = references; _i < references_3.length; _i++) {
                     var reference = references_3[_i];
@@ -112305,26 +116267,40 @@ var ts;
                 });
             }
             InferFromReference.inferTypeForParametersFromReferences = inferTypeForParametersFromReferences;
+            function inferTypeForThisFromReferences(references, program, cancellationToken) {
+                if (references.length === 0) {
+                    return undefined;
+                }
+                var checker = program.getTypeChecker();
+                var usageContext = {};
+                for (var _i = 0, references_4 = references; _i < references_4.length; _i++) {
+                    var reference = references_4[_i];
+                    cancellationToken.throwIfCancellationRequested();
+                    inferTypeFromContext(reference, checker, usageContext);
+                }
+                return unifyFromContext(usageContext.candidateThisTypes || ts.emptyArray, checker);
+            }
+            InferFromReference.inferTypeForThisFromReferences = inferTypeForThisFromReferences;
             function inferTypeFromContext(node, checker, usageContext) {
                 while (ts.isRightSideOfQualifiedNameOrPropertyAccess(node)) {
                     node = node.parent;
                 }
                 switch (node.parent.kind) {
-                    case 203 /* PostfixUnaryExpression */:
+                    case 204 /* PostfixUnaryExpression */:
                         usageContext.isNumber = true;
                         break;
-                    case 202 /* PrefixUnaryExpression */:
+                    case 203 /* PrefixUnaryExpression */:
                         inferTypeFromPrefixUnaryExpressionContext(node.parent, usageContext);
                         break;
-                    case 204 /* BinaryExpression */:
+                    case 205 /* BinaryExpression */:
                         inferTypeFromBinaryExpressionContext(node, node.parent, checker, usageContext);
                         break;
-                    case 271 /* CaseClause */:
-                    case 272 /* DefaultClause */:
+                    case 272 /* CaseClause */:
+                    case 273 /* DefaultClause */:
                         inferTypeFromSwitchStatementLabelContext(node.parent, checker, usageContext);
                         break;
-                    case 191 /* CallExpression */:
-                    case 192 /* NewExpression */:
+                    case 192 /* CallExpression */:
+                    case 193 /* NewExpression */:
                         if (node.parent.expression === node) {
                             inferTypeFromCallExpressionContext(node.parent, checker, usageContext);
                         }
@@ -112332,13 +116308,20 @@ var ts;
                             inferTypeFromContextualType(node, checker, usageContext);
                         }
                         break;
-                    case 189 /* PropertyAccessExpression */:
+                    case 190 /* PropertyAccessExpression */:
                         inferTypeFromPropertyAccessExpressionContext(node.parent, checker, usageContext);
                         break;
-                    case 190 /* ElementAccessExpression */:
+                    case 191 /* ElementAccessExpression */:
                         inferTypeFromPropertyElementExpressionContext(node.parent, node, checker, usageContext);
                         break;
-                    case 237 /* VariableDeclaration */: {
+                    case 276 /* PropertyAssignment */:
+                    case 277 /* ShorthandPropertyAssignment */:
+                        inferTypeFromPropertyAssignment(node.parent, checker, usageContext);
+                        break;
+                    case 155 /* PropertyDeclaration */:
+                        inferTypeFromPropertyDeclaration(node.parent, checker, usageContext);
+                        break;
+                    case 238 /* VariableDeclaration */: {
                         var _a = node.parent, name = _a.name, initializer = _a.initializer;
                         if (node === name) {
                             if (initializer) { // This can happen for `let x = null;` which still has an implicit-any error.
@@ -112389,17 +116372,17 @@ var ts;
                     case 50 /* BarToken */:
                     case 51 /* CaretToken */:
                     // CompoundAssignmentOperator
-                    case 61 /* MinusEqualsToken */:
-                    case 63 /* AsteriskAsteriskEqualsToken */:
-                    case 62 /* AsteriskEqualsToken */:
-                    case 64 /* SlashEqualsToken */:
-                    case 65 /* PercentEqualsToken */:
-                    case 69 /* AmpersandEqualsToken */:
-                    case 70 /* BarEqualsToken */:
-                    case 71 /* CaretEqualsToken */:
-                    case 66 /* LessThanLessThanEqualsToken */:
-                    case 68 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
-                    case 67 /* GreaterThanGreaterThanEqualsToken */:
+                    case 62 /* MinusEqualsToken */:
+                    case 64 /* AsteriskAsteriskEqualsToken */:
+                    case 63 /* AsteriskEqualsToken */:
+                    case 65 /* SlashEqualsToken */:
+                    case 66 /* PercentEqualsToken */:
+                    case 70 /* AmpersandEqualsToken */:
+                    case 71 /* BarEqualsToken */:
+                    case 72 /* CaretEqualsToken */:
+                    case 67 /* LessThanLessThanEqualsToken */:
+                    case 69 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
+                    case 68 /* GreaterThanGreaterThanEqualsToken */:
                     // AdditiveOperator
                     case 39 /* MinusToken */:
                     // RelationalOperator
@@ -112415,7 +116398,7 @@ var ts;
                             usageContext.isNumber = true;
                         }
                         break;
-                    case 60 /* PlusEqualsToken */:
+                    case 61 /* PlusEqualsToken */:
                     case 38 /* PlusToken */:
                         var otherOperandType = checker.getTypeAtLocation(parent.left === node ? parent.right : parent.left);
                         if (otherOperandType.flags & 1056 /* EnumLike */) {
@@ -112432,14 +116415,14 @@ var ts;
                         }
                         break;
                     //  AssignmentOperators
-                    case 59 /* EqualsToken */:
+                    case 60 /* EqualsToken */:
                     case 33 /* EqualsEqualsToken */:
                     case 35 /* EqualsEqualsEqualsToken */:
                     case 36 /* ExclamationEqualsEqualsToken */:
                     case 34 /* ExclamationEqualsToken */:
                         addCandidateType(usageContext, checker.getTypeAtLocation(parent.left === node ? parent.right : parent.left));
                         break;
-                    case 93 /* InKeyword */:
+                    case 94 /* InKeyword */:
                         if (node === parent.left) {
                             usageContext.isString = true;
                         }
@@ -112447,7 +116430,7 @@ var ts;
                     // LogicalOperator
                     case 55 /* BarBarToken */:
                         if (node === parent.left &&
-                            (node.parent.parent.kind === 237 /* VariableDeclaration */ || ts.isAssignmentExpression(node.parent.parent, /*excludeCompoundAssignment*/ true))) {
+                            (node.parent.parent.kind === 238 /* VariableDeclaration */ || ts.isAssignmentExpression(node.parent.parent, /*excludeCompoundAssignment*/ true))) {
                             // var x = x || {};
                             // TODO: use getFalsyflagsOfType
                             addCandidateType(usageContext, checker.getTypeAtLocation(parent.right));
@@ -112455,7 +116438,7 @@ var ts;
                         break;
                     case 54 /* AmpersandAmpersandToken */:
                     case 27 /* CommaToken */:
-                    case 94 /* InstanceOfKeyword */:
+                    case 95 /* InstanceOfKeyword */:
                         // nothing to infer here
                         break;
                 }
@@ -112475,7 +116458,7 @@ var ts;
                     }
                 }
                 inferTypeFromContext(parent, checker, callContext.returnType);
-                if (parent.kind === 191 /* CallExpression */) {
+                if (parent.kind === 192 /* CallExpression */) {
                     (usageContext.callContexts || (usageContext.callContexts = [])).push(callContext);
                 }
                 else {
@@ -112508,6 +116491,18 @@ var ts;
                     }
                 }
             }
+            function inferTypeFromPropertyAssignment(assignment, checker, usageContext) {
+                var objectLiteral = ts.isShorthandPropertyAssignment(assignment) ?
+                    assignment.parent :
+                    assignment.parent.parent;
+                var nodeWithRealType = ts.isVariableDeclaration(objectLiteral.parent) ?
+                    objectLiteral.parent :
+                    objectLiteral;
+                addCandidateThisType(usageContext, checker.getTypeAtLocation(nodeWithRealType));
+            }
+            function inferTypeFromPropertyDeclaration(declaration, checker, usageContext) {
+                addCandidateThisType(usageContext, checker.getTypeAtLocation(declaration.parent));
+            }
             function removeLowPriorityInferences(inferences, priorities) {
                 var toRemove = [];
                 for (var _i = 0, inferences_1 = inferences; _i < inferences_1.length; _i++) {
@@ -112683,6 +116678,11 @@ var ts;
                     (context.candidateTypes || (context.candidateTypes = [])).push(type);
                 }
             }
+            function addCandidateThisType(context, type) {
+                if (type && !(type.flags & 1 /* Any */) && !(type.flags & 131072 /* Never */)) {
+                    (context.candidateThisTypes || (context.candidateThisTypes = [])).push(type);
+                }
+            }
             function hasCallContext(usageContext) {
                 return !!usageContext && !!usageContext.callContexts;
             }
@@ -112715,12 +116715,12 @@ var ts;
             var precedingNode;
             var newClassDeclaration;
             switch (ctorDeclaration.kind) {
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     precedingNode = ctorDeclaration;
                     changes.delete(sourceFile, ctorDeclaration);
                     newClassDeclaration = createClassFromFunctionDeclaration(ctorDeclaration);
                     break;
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     precedingNode = ctorDeclaration.parent.parent;
                     newClassDeclaration = createClassFromVariableDeclaration(ctorDeclaration);
                     if (ctorDeclaration.parent.declarations.length === 1) {
@@ -112752,7 +116752,7 @@ var ts;
                 // all static members are stored in the "exports" array of symbol
                 if (symbol.exports) {
                     symbol.exports.forEach(function (member) {
-                        var memberElement = createClassElement(member, [ts.createToken(116 /* StaticKeyword */)]);
+                        var memberElement = createClassElement(member, [ts.createToken(117 /* StaticKeyword */)]);
                         if (memberElement) {
                             memberElements.push(memberElement);
                         }
@@ -112775,7 +116775,7 @@ var ts;
                         return;
                     }
                     // delete the entire statement if this expression is the sole expression to take care of the semicolon at the end
-                    var nodeToDelete = assignmentBinaryExpression.parent && assignmentBinaryExpression.parent.kind === 221 /* ExpressionStatement */
+                    var nodeToDelete = assignmentBinaryExpression.parent && assignmentBinaryExpression.parent.kind === 222 /* ExpressionStatement */
                         ? assignmentBinaryExpression.parent : assignmentBinaryExpression;
                     changes.delete(sourceFile, nodeToDelete);
                     if (!assignmentBinaryExpression.right) {
@@ -112783,27 +116783,27 @@ var ts;
                         /*type*/ undefined, /*initializer*/ undefined);
                     }
                     switch (assignmentBinaryExpression.right.kind) {
-                        case 196 /* FunctionExpression */: {
+                        case 197 /* FunctionExpression */: {
                             var functionExpression = assignmentBinaryExpression.right;
-                            var fullModifiers = ts.concatenate(modifiers, getModifierKindFromSource(functionExpression, 121 /* AsyncKeyword */));
+                            var fullModifiers = ts.concatenate(modifiers, getModifierKindFromSource(functionExpression, 122 /* AsyncKeyword */));
                             var method = ts.createMethod(/*decorators*/ undefined, fullModifiers, /*asteriskToken*/ undefined, memberDeclaration.name, /*questionToken*/ undefined, 
                             /*typeParameters*/ undefined, functionExpression.parameters, /*type*/ undefined, functionExpression.body);
                             ts.copyLeadingComments(assignmentBinaryExpression, method, sourceFile);
                             return method;
                         }
-                        case 197 /* ArrowFunction */: {
+                        case 198 /* ArrowFunction */: {
                             var arrowFunction = assignmentBinaryExpression.right;
                             var arrowFunctionBody = arrowFunction.body;
                             var bodyBlock = void 0;
                             // case 1: () => { return [1,2,3] }
-                            if (arrowFunctionBody.kind === 218 /* Block */) {
+                            if (arrowFunctionBody.kind === 219 /* Block */) {
                                 bodyBlock = arrowFunctionBody;
                             }
                             // case 2: () => [1,2,3]
                             else {
                                 bodyBlock = ts.createBlock([ts.createReturn(arrowFunctionBody)]);
                             }
-                            var fullModifiers = ts.concatenate(modifiers, getModifierKindFromSource(arrowFunction, 121 /* AsyncKeyword */));
+                            var fullModifiers = ts.concatenate(modifiers, getModifierKindFromSource(arrowFunction, 122 /* AsyncKeyword */));
                             var method = ts.createMethod(/*decorators*/ undefined, fullModifiers, /*asteriskToken*/ undefined, memberDeclaration.name, /*questionToken*/ undefined, 
                             /*typeParameters*/ undefined, arrowFunction.parameters, /*type*/ undefined, bodyBlock);
                             ts.copyLeadingComments(assignmentBinaryExpression, method, sourceFile);
@@ -112824,17 +116824,17 @@ var ts;
             }
             function createClassFromVariableDeclaration(node) {
                 var initializer = node.initializer;
-                if (!initializer || initializer.kind !== 196 /* FunctionExpression */) {
+                if (!initializer || initializer.kind !== 197 /* FunctionExpression */) {
                     return undefined;
                 }
-                if (node.name.kind !== 72 /* Identifier */) {
+                if (node.name.kind !== 73 /* Identifier */) {
                     return undefined;
                 }
                 var memberElements = createClassElementsFromSymbol(node.symbol);
                 if (initializer.body) {
                     memberElements.unshift(ts.createConstructor(/*decorators*/ undefined, /*modifiers*/ undefined, initializer.parameters, initializer.body));
                 }
-                var modifiers = getModifierKindFromSource(precedingNode, 85 /* ExportKeyword */);
+                var modifiers = getModifierKindFromSource(precedingNode, 86 /* ExportKeyword */);
                 var cls = ts.createClassDeclaration(/*decorators*/ undefined, modifiers, node.name, 
                 /*typeParameters*/ undefined, /*heritageClauses*/ undefined, memberElements);
                 // Don't call copyComments here because we'll already leave them in place
@@ -112845,7 +116845,7 @@ var ts;
                 if (node.body) {
                     memberElements.unshift(ts.createConstructor(/*decorators*/ undefined, /*modifiers*/ undefined, node.parameters, node.body));
                 }
-                var modifiers = getModifierKindFromSource(node, 85 /* ExportKeyword */);
+                var modifiers = getModifierKindFromSource(node, 86 /* ExportKeyword */);
                 var cls = ts.createClassDeclaration(/*decorators*/ undefined, modifiers, node.name, 
                 /*typeParameters*/ undefined, /*heritageClauses*/ undefined, memberElements);
                 // Don't call copyComments here because we'll already leave them in place
@@ -112875,6 +116875,11 @@ var ts;
             fixIds: [fixId],
             getAllCodeActions: function (context) { return codefix.codeFixAll(context, errorCodes, function (changes, err) { return convertToAsyncFunction(changes, err.file, err.start, context.program.getTypeChecker(), context); }); },
         });
+        var SynthBindingNameKind;
+        (function (SynthBindingNameKind) {
+            SynthBindingNameKind[SynthBindingNameKind["Identifier"] = 0] = "Identifier";
+            SynthBindingNameKind[SynthBindingNameKind["BindingPattern"] = 1] = "BindingPattern";
+        })(SynthBindingNameKind || (SynthBindingNameKind = {}));
         function convertToAsyncFunction(changes, sourceFile, position, checker, context) {
             // get the function declaration - returns a promise
             var tokenAtPosition = ts.getTokenAtPosition(sourceFile, position);
@@ -112903,7 +116908,7 @@ var ts;
                 return;
             }
             // add the async keyword
-            changes.insertLastModifierBefore(sourceFile, 121 /* AsyncKeyword */, functionToConvert);
+            changes.insertLastModifierBefore(sourceFile, 122 /* AsyncKeyword */, functionToConvert);
             function startTransformation(node, nodeToReplace) {
                 var newNodes = transformExpression(node, transformer, node);
                 changes.replaceNodeWithNodes(sourceFile, nodeToReplace, newNodes);
@@ -113011,8 +117016,8 @@ var ts;
                         allVarNames.push({ identifier: synthName.identifier, symbol: symbol });
                         addNameToFrequencyMap(collidingSymbolMap, ident.text, symbol);
                     }
-                    // we only care about identifiers that are parameters and declarations (don't care about other uses)
-                    else if (node.parent && (ts.isParameter(node.parent) || ts.isVariableDeclaration(node.parent))) {
+                    // we only care about identifiers that are parameters, declarations, or binding elements (don't care about other uses)
+                    else if (node.parent && (ts.isParameter(node.parent) || ts.isVariableDeclaration(node.parent) || ts.isBindingElement(node.parent))) {
                         var originalName = node.text;
                         var collidingSymbols = collidingSymbolMap.get(originalName);
                         // if the identifier name conflicts with a different identifier that we've already seen
@@ -113026,7 +117031,7 @@ var ts;
                         else {
                             var identifier = ts.getSynthesizedDeepClone(node);
                             identsToRenameMap.set(symbolIdString, identifier);
-                            synthNamesMap.set(symbolIdString, { identifier: identifier, types: [], numberOfAssignmentsOriginal: allVarNames.filter(function (elem) { return elem.identifier.text === node.text; }).length /*, numberOfAssignmentsSynthesized: 0*/ });
+                            synthNamesMap.set(symbolIdString, createSynthIdentifier(identifier, [], allVarNames.filter(function (elem) { return elem.identifier.text === node.text; }).length /*, numberOfAssignmentsSynthesized: 0*/));
                             if ((ts.isParameter(node.parent) && isExpressionOrCallOnTypePromise(node.parent.parent)) || ts.isVariableDeclaration(node.parent)) {
                                 allVarNames.push({ identifier: identifier, symbol: symbol });
                                 addNameToFrequencyMap(collidingSymbolMap, originalName, symbol);
@@ -113074,7 +117079,7 @@ var ts;
             var numVarsSameName = (originalNames.get(name.text) || ts.emptyArray).length;
             var numberOfAssignmentsOriginal = 0;
             var identifier = numVarsSameName === 0 ? name : ts.createIdentifier(name.text + "_" + numVarsSameName);
-            return { identifier: identifier, types: [], numberOfAssignmentsOriginal: numberOfAssignmentsOriginal };
+            return createSynthIdentifier(identifier, [], numberOfAssignmentsOriginal);
         }
         // dispatch function to recursively build the refactoring
         // should be kept up to date with isFixablePromiseHandler in suggestionDiagnostics.ts
@@ -113101,68 +117106,90 @@ var ts;
         }
         function transformCatch(node, transformer, prevArgName) {
             var func = node.arguments[0];
-            var argName = getArgName(func, transformer);
+            var argName = getArgBindingName(func, transformer);
             var shouldReturn = transformer.setOfExpressionsToReturn.get(ts.getNodeId(node).toString());
+            var possibleNameForVarDecl;
             /*
                 If there is another call in the chain after the .catch() we are transforming, we will need to save the result of both paths (try block and catch block)
                 To do this, we will need to synthesize a variable that we were not aware of while we were adding identifiers to the synthNamesMap
                 We will use the prevArgName and then update the synthNamesMap with a new variable name for the next transformation step
             */
             if (prevArgName && !shouldReturn) {
-                prevArgName.numberOfAssignmentsOriginal = 2; // Try block and catch block
-                transformer.synthNamesMap.forEach(function (val, key) {
-                    if (val.identifier.text === prevArgName.identifier.text) {
-                        var newSynthName = createUniqueSynthName(prevArgName);
-                        transformer.synthNamesMap.set(key, newSynthName);
-                    }
-                });
+                if (isSynthIdentifier(prevArgName)) {
+                    possibleNameForVarDecl = prevArgName;
+                    transformer.synthNamesMap.forEach(function (val, key) {
+                        if (val.identifier.text === prevArgName.identifier.text) {
+                            var newSynthName = createUniqueSynthName(prevArgName);
+                            transformer.synthNamesMap.set(key, newSynthName);
+                        }
+                    });
+                }
+                else {
+                    possibleNameForVarDecl = createSynthIdentifier(ts.createOptimisticUniqueName("result"), prevArgName.types);
+                }
+                possibleNameForVarDecl.numberOfAssignmentsOriginal = 2; // Try block and catch block
                 // update the constIdentifiers list
-                if (transformer.constIdentifiers.some(function (elem) { return elem.text === prevArgName.identifier.text; })) {
-                    transformer.constIdentifiers.push(createUniqueSynthName(prevArgName).identifier);
+                if (transformer.constIdentifiers.some(function (elem) { return elem.text === possibleNameForVarDecl.identifier.text; })) {
+                    transformer.constIdentifiers.push(createUniqueSynthName(possibleNameForVarDecl).identifier);
                 }
             }
-            var tryBlock = ts.createBlock(transformExpression(node.expression, transformer, node, prevArgName));
-            var transformationBody = getTransformationBody(func, prevArgName, argName, node, transformer);
-            var catchArg = argName ? argName.identifier.text : "e";
-            var catchClause = ts.createCatchClause(catchArg, ts.createBlock(transformationBody));
+            var tryBlock = ts.createBlock(transformExpression(node.expression, transformer, node, possibleNameForVarDecl));
+            var transformationBody = getTransformationBody(func, possibleNameForVarDecl, argName, node, transformer);
+            var catchArg = argName ? isSynthIdentifier(argName) ? argName.identifier.text : argName.bindingPattern : "e";
+            var catchVariableDeclaration = ts.createVariableDeclaration(catchArg);
+            var catchClause = ts.createCatchClause(catchVariableDeclaration, ts.createBlock(transformationBody));
             /*
                 In order to avoid an implicit any, we will synthesize a type for the declaration using the unions of the types of both paths (try block and catch block)
             */
             var varDeclList;
-            if (prevArgName && !shouldReturn) {
-                var typeArray = prevArgName.types;
+            var varDeclIdentifier;
+            if (possibleNameForVarDecl && !shouldReturn) {
+                varDeclIdentifier = ts.getSynthesizedDeepClone(possibleNameForVarDecl.identifier);
+                var typeArray = possibleNameForVarDecl.types;
                 var unionType = transformer.checker.getUnionType(typeArray, 2 /* Subtype */);
                 var unionTypeNode = transformer.isInJSFile ? undefined : transformer.checker.typeToTypeNode(unionType);
-                var varDecl = [ts.createVariableDeclaration(ts.getSynthesizedDeepClone(prevArgName.identifier), unionTypeNode)];
+                var varDecl = [ts.createVariableDeclaration(varDeclIdentifier, unionTypeNode)];
                 varDeclList = ts.createVariableStatement(/*modifiers*/ undefined, ts.createVariableDeclarationList(varDecl, 1 /* Let */));
             }
             var tryStatement = ts.createTry(tryBlock, catchClause, /*finallyBlock*/ undefined);
-            return varDeclList ? [varDeclList, tryStatement] : [tryStatement];
+            var destructuredResult = prevArgName && varDeclIdentifier && isSynthBindingPattern(prevArgName)
+                && ts.createVariableStatement(/* modifiers */ undefined, ts.createVariableDeclarationList([ts.createVariableDeclaration(ts.getSynthesizedDeepCloneWithRenames(prevArgName.bindingPattern), /* type */ undefined, varDeclIdentifier)], 2 /* Const */));
+            return ts.compact([varDeclList, tryStatement, destructuredResult]);
+        }
+        function getIdentifierTextsFromBindingName(bindingName) {
+            if (ts.isIdentifier(bindingName))
+                return [bindingName.text];
+            return ts.flatMap(bindingName.elements, function (element) {
+                if (ts.isOmittedExpression(element))
+                    return [];
+                return getIdentifierTextsFromBindingName(element.name);
+            });
         }
         function createUniqueSynthName(prevArgName) {
             var renamedPrevArg = ts.createOptimisticUniqueName(prevArgName.identifier.text);
-            var newSynthName = { identifier: renamedPrevArg, types: [], numberOfAssignmentsOriginal: 0 };
-            return newSynthName;
+            return createSynthIdentifier(renamedPrevArg);
         }
         function transformThen(node, transformer, outermostParent, prevArgName) {
             var _a = node.arguments, res = _a[0], rej = _a[1];
             if (!res) {
                 return transformExpression(node.expression, transformer, outermostParent);
             }
-            var argNameRes = getArgName(res, transformer);
+            var argNameRes = getArgBindingName(res, transformer);
             var transformationBody = getTransformationBody(res, prevArgName, argNameRes, node, transformer);
             if (rej) {
-                var argNameRej = getArgName(rej, transformer);
+                var argNameRej = getArgBindingName(rej, transformer);
                 var tryBlock = ts.createBlock(transformExpression(node.expression, transformer, node, argNameRes).concat(transformationBody));
                 var transformationBody2 = getTransformationBody(rej, prevArgName, argNameRej, node, transformer);
-                var catchArg = argNameRej ? argNameRej.identifier.text : "e";
-                var catchClause = ts.createCatchClause(catchArg, ts.createBlock(transformationBody2));
+                var catchArg = argNameRej ? isSynthIdentifier(argNameRej) ? argNameRej.identifier.text : argNameRej.bindingPattern : "e";
+                var catchVariableDeclaration = ts.createVariableDeclaration(catchArg);
+                var catchClause = ts.createCatchClause(catchVariableDeclaration, ts.createBlock(transformationBody2));
                 return [ts.createTry(tryBlock, catchClause, /* finallyBlock */ undefined)];
             }
             return transformExpression(node.expression, transformer, node, argNameRes).concat(transformationBody);
         }
-        function getFlagOfIdentifier(node, constIdentifiers) {
-            var inArr = constIdentifiers.some(function (elem) { return elem.text === node.text; });
+        function getFlagOfBindingName(bindingName, constIdentifiers) {
+            var identifiers = getIdentifierTextsFromBindingName(getNode(bindingName));
+            var inArr = constIdentifiers.some(function (elem) { return ts.contains(identifiers, elem.text); });
             return inArr ? 2 /* Const */ : 1 /* Let */;
         }
         function transformPromiseCall(node, transformer, prevArgName) {
@@ -113178,29 +117205,29 @@ var ts;
             return [ts.createReturn(ts.getSynthesizedDeepClone(node))];
         }
         function createTransformedStatement(prevArgName, rightHandSide, transformer) {
-            if (!prevArgName || prevArgName.identifier.text.length === 0) {
+            if (!prevArgName || isEmpty(prevArgName)) {
                 // if there's no argName to assign to, there still might be side effects
                 return [ts.createStatement(rightHandSide)];
             }
-            if (prevArgName.types.length < prevArgName.numberOfAssignmentsOriginal) {
+            if (isSynthIdentifier(prevArgName) && prevArgName.types.length < prevArgName.numberOfAssignmentsOriginal) {
                 // if the variable has already been declared, we don't need "let" or "const"
                 return [ts.createStatement(ts.createAssignment(ts.getSynthesizedDeepClone(prevArgName.identifier), rightHandSide))];
             }
-            return [ts.createVariableStatement(/*modifiers*/ undefined, (ts.createVariableDeclarationList([ts.createVariableDeclaration(ts.getSynthesizedDeepClone(prevArgName.identifier), /*type*/ undefined, rightHandSide)], getFlagOfIdentifier(prevArgName.identifier, transformer.constIdentifiers))))];
+            return [ts.createVariableStatement(/*modifiers*/ undefined, (ts.createVariableDeclarationList([ts.createVariableDeclaration(ts.getSynthesizedDeepClone(getNode(prevArgName)), /*type*/ undefined, rightHandSide)], getFlagOfBindingName(prevArgName, transformer.constIdentifiers))))];
         }
         // should be kept up to date with isFixablePromiseArgument in suggestionDiagnostics.ts
         function getTransformationBody(func, prevArgName, argName, parent, transformer) {
             var shouldReturn = transformer.setOfExpressionsToReturn.get(ts.getNodeId(parent).toString());
             switch (func.kind) {
-                case 96 /* NullKeyword */:
+                case 97 /* NullKeyword */:
                     // do not produce a transformed statement for a null argument
                     break;
-                case 72 /* Identifier */: // identifier includes undefined
+                case 73 /* Identifier */: // identifier includes undefined
                     if (!argName) {
                         // undefined was argument passed to promise handler
                         break;
                     }
-                    var synthCall = ts.createCall(ts.getSynthesizedDeepClone(func), /*typeArguments*/ undefined, [argName.identifier]);
+                    var synthCall = ts.createCall(ts.getSynthesizedDeepClone(func), /*typeArguments*/ undefined, isSynthIdentifier(argName) ? [argName.identifier] : []);
                     if (shouldReturn) {
                         return [ts.createReturn(synthCall)];
                     }
@@ -113217,8 +117244,8 @@ var ts;
                         prevArgName.types.push(returnType);
                     }
                     return varDeclOrAssignment;
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */: {
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */: {
                     var funcBody = func.body;
                     // Arrow functions with block bodies { } will enter this control flow
                     if (ts.isBlock(funcBody)) {
@@ -113237,7 +117264,7 @@ var ts;
                             }
                         }
                         return shouldReturn ? refactoredStmts.map(function (s) { return ts.getSynthesizedDeepClone(s); }) :
-                            removeReturns(refactoredStmts, prevArgName === undefined ? undefined : prevArgName.identifier, transformer, seenReturnStatement);
+                            removeReturns(refactoredStmts, prevArgName, transformer, seenReturnStatement);
                     }
                     else {
                         var innerRetStmts = ts.isFixablePromiseHandler(funcBody) ? [ts.createReturn(funcBody)] : ts.emptyArray;
@@ -113283,7 +117310,7 @@ var ts;
                             ret.push(ts.createExpressionStatement(possiblyAwaitedExpression));
                         }
                         else {
-                            ret.push(ts.createVariableStatement(/*modifiers*/ undefined, (ts.createVariableDeclarationList([ts.createVariableDeclaration(prevArgName, /*type*/ undefined, possiblyAwaitedExpression)], getFlagOfIdentifier(prevArgName, transformer.constIdentifiers)))));
+                            ret.push(ts.createVariableStatement(/*modifiers*/ undefined, (ts.createVariableDeclarationList([ts.createVariableDeclaration(getNode(prevArgName), /*type*/ undefined, possiblyAwaitedExpression)], getFlagOfBindingName(prevArgName, transformer.constIdentifiers)))));
                         }
                     }
                 }
@@ -113293,7 +117320,7 @@ var ts;
             }
             // if block has no return statement, need to define prevArgName as undefined to prevent undeclared variables
             if (!seenReturnStatement && prevArgName !== undefined) {
-                ret.push(ts.createVariableStatement(/*modifiers*/ undefined, (ts.createVariableDeclarationList([ts.createVariableDeclaration(prevArgName, /*type*/ undefined, ts.createIdentifier("undefined"))], getFlagOfIdentifier(prevArgName, transformer.constIdentifiers)))));
+                ret.push(ts.createVariableStatement(/*modifiers*/ undefined, (ts.createVariableDeclarationList([ts.createVariableDeclaration(getNode(prevArgName), /*type*/ undefined, ts.createIdentifier("undefined"))], getFlagOfBindingName(prevArgName, transformer.constIdentifiers)))));
             }
             return ret;
         }
@@ -113316,32 +117343,42 @@ var ts;
             }
             return innerCbBody;
         }
-        function getArgName(funcNode, transformer) {
+        function getArgBindingName(funcNode, transformer) {
             var numberOfAssignmentsOriginal = 0;
             var types = [];
             var name;
             if (ts.isFunctionLikeDeclaration(funcNode)) {
                 if (funcNode.parameters.length > 0) {
                     var param = funcNode.parameters[0].name;
-                    name = getMapEntryOrDefault(param);
+                    name = getMappedBindingNameOrDefault(param);
                 }
             }
             else if (ts.isIdentifier(funcNode)) {
                 name = getMapEntryOrDefault(funcNode);
             }
             // return undefined argName when arg is null or undefined
-            if (!name || name.identifier.text === "undefined") {
+            if (!name || "identifier" in name && name.identifier.text === "undefined") {
                 return undefined;
             }
             return name;
+            function getMappedBindingNameOrDefault(bindingName) {
+                if (ts.isIdentifier(bindingName))
+                    return getMapEntryOrDefault(bindingName);
+                var elements = ts.flatMap(bindingName.elements, function (element) {
+                    if (ts.isOmittedExpression(element))
+                        return [];
+                    return [getMappedBindingNameOrDefault(element.name)];
+                });
+                return createSynthBindingPattern(bindingName, elements);
+            }
             function getMapEntryOrDefault(identifier) {
                 var originalNode = getOriginalNode(identifier);
                 var symbol = getSymbol(originalNode);
                 if (!symbol) {
-                    return { identifier: identifier, types: types, numberOfAssignmentsOriginal: numberOfAssignmentsOriginal };
+                    return createSynthIdentifier(identifier, types, numberOfAssignmentsOriginal);
                 }
                 var mapEntry = transformer.synthNamesMap.get(ts.getSymbolId(symbol).toString());
-                return mapEntry || { identifier: identifier, types: types, numberOfAssignmentsOriginal: numberOfAssignmentsOriginal };
+                return mapEntry || createSynthIdentifier(identifier, types, numberOfAssignmentsOriginal);
             }
             function getSymbol(node) {
                 return node.symbol ? node.symbol : transformer.checker.getSymbolAtLocation(node);
@@ -113350,6 +117387,34 @@ var ts;
                 return node.original ? node.original : node;
             }
         }
+        function isEmpty(bindingName) {
+            if (!bindingName) {
+                return true;
+            }
+            if (isSynthIdentifier(bindingName)) {
+                return !bindingName.identifier.text;
+            }
+            return ts.every(bindingName.elements, isEmpty);
+        }
+        function getNode(bindingName) {
+            return isSynthIdentifier(bindingName) ? bindingName.identifier : bindingName.bindingPattern;
+        }
+        function createSynthIdentifier(identifier, types, numberOfAssignmentsOriginal) {
+            if (types === void 0) { types = []; }
+            if (numberOfAssignmentsOriginal === void 0) { numberOfAssignmentsOriginal = 0; }
+            return { kind: 0 /* Identifier */, identifier: identifier, types: types, numberOfAssignmentsOriginal: numberOfAssignmentsOriginal };
+        }
+        function createSynthBindingPattern(bindingPattern, elements, types) {
+            if (elements === void 0) { elements = ts.emptyArray; }
+            if (types === void 0) { types = []; }
+            return { kind: 1 /* BindingPattern */, bindingPattern: bindingPattern, elements: elements, types: types };
+        }
+        function isSynthIdentifier(bindingName) {
+            return bindingName.kind === 0 /* Identifier */;
+        }
+        function isSynthBindingPattern(bindingName) {
+            return bindingName.kind === 1 /* BindingPattern */;
+        }
     })(codefix = ts.codefix || (ts.codefix = {}));
 })(ts || (ts = {}));
 /* @internal */
@@ -113383,10 +117448,10 @@ var ts;
                 }
                 var importNode = ts.importFromModuleSpecifier(moduleSpecifier);
                 switch (importNode.kind) {
-                    case 248 /* ImportEqualsDeclaration */:
+                    case 249 /* ImportEqualsDeclaration */:
                         changes.replaceNode(importingFile, importNode, ts.makeImport(importNode.name, /*namedImports*/ undefined, moduleSpecifier, quotePreference));
                         break;
-                    case 191 /* CallExpression */:
+                    case 192 /* CallExpression */:
                         if (ts.isRequireCall(importNode, /*checkArgumentIsStringLiteralLike*/ false)) {
                             changes.replaceNode(importingFile, importNode, ts.createPropertyAccess(ts.getSynthesizedDeepClone(importNode), "default"));
                         }
@@ -113432,29 +117497,29 @@ var ts;
             sourceFile.forEachChild(function recur(node) {
                 if (ts.isPropertyAccessExpression(node) && ts.isExportsOrModuleExportsOrAlias(sourceFile, node.expression)) {
                     var parent = node.parent;
-                    cb(node, ts.isBinaryExpression(parent) && parent.left === node && parent.operatorToken.kind === 59 /* EqualsToken */);
+                    cb(node, ts.isBinaryExpression(parent) && parent.left === node && parent.operatorToken.kind === 60 /* EqualsToken */);
                 }
                 node.forEachChild(recur);
             });
         }
         function convertStatement(sourceFile, statement, checker, changes, identifiers, target, exports, quotePreference) {
             switch (statement.kind) {
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     convertVariableStatement(sourceFile, statement, changes, checker, identifiers, target, quotePreference);
                     return false;
-                case 221 /* ExpressionStatement */: {
+                case 222 /* ExpressionStatement */: {
                     var expression = statement.expression;
                     switch (expression.kind) {
-                        case 191 /* CallExpression */: {
+                        case 192 /* CallExpression */: {
                             if (ts.isRequireCall(expression, /*checkArgumentIsStringLiteralLike*/ true)) {
                                 // For side-effecting require() call, just make a side-effecting import.
                                 changes.replaceNode(sourceFile, statement, ts.makeImport(/*name*/ undefined, /*namedImports*/ undefined, expression.arguments[0], quotePreference));
                             }
                             return false;
                         }
-                        case 204 /* BinaryExpression */: {
+                        case 205 /* BinaryExpression */: {
                             var operatorToken = expression.operatorToken;
-                            return operatorToken.kind === 59 /* EqualsToken */ && convertAssignment(sourceFile, checker, expression, changes, exports);
+                            return operatorToken.kind === 60 /* EqualsToken */ && convertAssignment(sourceFile, checker, expression, changes, exports);
                         }
                     }
                 }
@@ -113494,8 +117559,8 @@ var ts;
         /** Converts `const name = require("moduleSpecifier").propertyName` */
         function convertPropertyAccessImport(name, propertyName, moduleSpecifier, identifiers, quotePreference) {
             switch (name.kind) {
-                case 184 /* ObjectBindingPattern */:
-                case 185 /* ArrayBindingPattern */: {
+                case 185 /* ObjectBindingPattern */:
+                case 186 /* ArrayBindingPattern */: {
                     // `const [a, b] = require("c").d` --> `import { d } from "c"; const [a, b] = d;`
                     var tmp = makeUniqueName(propertyName, identifiers);
                     return [
@@ -113503,7 +117568,7 @@ var ts;
                         makeConst(/*modifiers*/ undefined, name, ts.createIdentifier(tmp)),
                     ];
                 }
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     // `const a = require("b").c` --> `import { c as a } from "./b";
                     return [makeSingleImport(name.text, propertyName, moduleSpecifier, quotePreference)];
                 default:
@@ -113546,16 +117611,16 @@ var ts;
         function tryChangeModuleExportsObject(object) {
             var statements = ts.mapAllOrFail(object.properties, function (prop) {
                 switch (prop.kind) {
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
                     // TODO: Maybe we should handle this? See fourslash test `refactorConvertToEs6Module_export_object_shorthand.ts`.
-                    case 276 /* ShorthandPropertyAssignment */:
-                    case 277 /* SpreadAssignment */:
+                    case 277 /* ShorthandPropertyAssignment */:
+                    case 278 /* SpreadAssignment */:
                         return undefined;
-                    case 275 /* PropertyAssignment */:
+                    case 276 /* PropertyAssignment */:
                         return !ts.isIdentifier(prop.name) ? undefined : convertExportsDotXEquals_replaceNode(prop.name.text, prop.initializer);
-                    case 156 /* MethodDeclaration */:
-                        return !ts.isIdentifier(prop.name) ? undefined : functionExpressionToDeclaration(prop.name.text, [ts.createToken(85 /* ExportKeyword */)], prop);
+                    case 157 /* MethodDeclaration */:
+                        return !ts.isIdentifier(prop.name) ? undefined : functionExpressionToDeclaration(prop.name.text, [ts.createToken(86 /* ExportKeyword */)], prop);
                     default:
                         ts.Debug.assertNever(prop);
                 }
@@ -113604,7 +117669,7 @@ var ts;
             var name = left.name.text;
             if ((ts.isFunctionExpression(right) || ts.isArrowFunction(right) || ts.isClassExpression(right)) && (!right.name || right.name.text === name)) {
                 // `exports.f = function() {}` -> `export function f() {}` -- Replace `exports.f = ` with `export `, and insert the name after `function`.
-                changes.replaceRange(sourceFile, { pos: left.getStart(sourceFile), end: right.getStart(sourceFile) }, ts.createToken(85 /* ExportKeyword */), { suffix: " " });
+                changes.replaceRange(sourceFile, { pos: left.getStart(sourceFile), end: right.getStart(sourceFile) }, ts.createToken(86 /* ExportKeyword */), { suffix: " " });
                 if (!right.name)
                     changes.insertName(sourceFile, right, name);
                 var semi = ts.findChildOfKind(parent, 26 /* SemicolonToken */, sourceFile);
@@ -113613,14 +117678,14 @@ var ts;
             }
             else {
                 // `exports.f = function g() {}` -> `export const f = function g() {}` -- just replace `exports.` with `export const `
-                changes.replaceNodeRangeWithNodes(sourceFile, left.expression, ts.findChildOfKind(left, 24 /* DotToken */, sourceFile), [ts.createToken(85 /* ExportKeyword */), ts.createToken(77 /* ConstKeyword */)], { joiner: " ", suffix: " " });
+                changes.replaceNodeRangeWithNodes(sourceFile, left.expression, ts.findChildOfKind(left, 24 /* DotToken */, sourceFile), [ts.createToken(86 /* ExportKeyword */), ts.createToken(78 /* ConstKeyword */)], { joiner: " ", suffix: " " });
             }
         }
         // TODO: GH#22492 this will cause an error if a change has been made inside the body of the node.
         function convertExportsDotXEquals_replaceNode(name, exported) {
-            var modifiers = [ts.createToken(85 /* ExportKeyword */)];
+            var modifiers = [ts.createToken(86 /* ExportKeyword */)];
             switch (exported.kind) {
-                case 196 /* FunctionExpression */: {
+                case 197 /* FunctionExpression */: {
                     var expressionName = exported.name;
                     if (expressionName && expressionName.text !== name) {
                         // `exports.f = function g() {}` -> `export const f = function g() {}`
@@ -113628,10 +117693,10 @@ var ts;
                     }
                 }
                 // falls through
-                case 197 /* ArrowFunction */:
+                case 198 /* ArrowFunction */:
                     // `exports.f = function() {}` --> `export function f() {}`
                     return functionExpressionToDeclaration(name, modifiers, exported);
-                case 209 /* ClassExpression */:
+                case 210 /* ClassExpression */:
                     // `exports.C = class {}` --> `export class C {}`
                     return classExpressionToDeclaration(name, modifiers, exported);
                 default:
@@ -113649,7 +117714,7 @@ var ts;
          */
         function convertSingleImport(file, name, moduleSpecifier, changes, checker, identifiers, target, quotePreference) {
             switch (name.kind) {
-                case 184 /* ObjectBindingPattern */: {
+                case 185 /* ObjectBindingPattern */: {
                     var importSpecifiers = ts.mapAllOrFail(name.elements, function (e) {
                         return e.dotDotDotToken || e.initializer || e.propertyName && !ts.isIdentifier(e.propertyName) || !ts.isIdentifier(e.name)
                             ? undefined
@@ -113660,7 +117725,7 @@ var ts;
                     }
                 }
                 // falls through -- object destructuring has an interesting pattern and must be a variable declaration
-                case 185 /* ArrayBindingPattern */: {
+                case 186 /* ArrayBindingPattern */: {
                     /*
                     import x from "x";
                     const [a, b, c] = x;
@@ -113671,7 +117736,7 @@ var ts;
                         makeConst(/*modifiers*/ undefined, ts.getSynthesizedDeepClone(name), ts.createIdentifier(tmp)),
                     ];
                 }
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return convertSingleIdentifierImport(file, name, moduleSpecifier, changes, checker, identifiers, quotePreference);
                 default:
                     return ts.Debug.assertNever(name);
@@ -113743,11 +117808,11 @@ var ts;
         function isFreeIdentifier(node) {
             var parent = node.parent;
             switch (parent.kind) {
-                case 189 /* PropertyAccessExpression */:
+                case 190 /* PropertyAccessExpression */:
                     return parent.name !== node;
-                case 186 /* BindingElement */:
+                case 187 /* BindingElement */:
                     return parent.propertyName !== node;
-                case 253 /* ImportSpecifier */:
+                case 254 /* ImportSpecifier */:
                     return parent.propertyName !== node;
                 default:
                     return true;
@@ -114086,21 +118151,21 @@ var ts;
         function tryAddToExistingImport(existingImports) {
             return ts.firstDefined(existingImports, function (_a) {
                 var declaration = _a.declaration, importKind = _a.importKind;
-                if (declaration.kind !== 249 /* ImportDeclaration */)
+                if (declaration.kind !== 250 /* ImportDeclaration */)
                     return undefined;
                 var importClause = declaration.importClause;
                 if (!importClause)
                     return undefined;
                 var name = importClause.name, namedBindings = importClause.namedBindings;
-                return importKind === 1 /* Default */ && !name || importKind === 0 /* Named */ && (!namedBindings || namedBindings.kind === 252 /* NamedImports */)
+                return importKind === 1 /* Default */ && !name || importKind === 0 /* Named */ && (!namedBindings || namedBindings.kind === 253 /* NamedImports */)
                     ? { kind: 2 /* AddToExisting */, importClause: importClause, importKind: importKind }
                     : undefined;
             });
         }
         function getNamespaceImportName(declaration) {
-            if (declaration.kind === 249 /* ImportDeclaration */) {
+            if (declaration.kind === 250 /* ImportDeclaration */) {
                 var namedBindings = declaration.importClause && ts.isImportClause(declaration.importClause) && declaration.importClause.namedBindings;
-                return namedBindings && namedBindings.kind === 251 /* NamespaceImport */ ? namedBindings.name : undefined;
+                return namedBindings && namedBindings.kind === 252 /* NamespaceImport */ ? namedBindings.name : undefined;
             }
             else {
                 return declaration.name;
@@ -114111,7 +118176,7 @@ var ts;
             // Can't use an es6 import for a type in JS.
             return exportedSymbolIsTypeOnly && ts.isSourceFileJS(sourceFile) ? ts.emptyArray : ts.mapDefined(sourceFile.imports, function (moduleSpecifier) {
                 var i = ts.importFromModuleSpecifier(moduleSpecifier);
-                return (i.kind === 249 /* ImportDeclaration */ || i.kind === 248 /* ImportEqualsDeclaration */)
+                return (i.kind === 250 /* ImportDeclaration */ || i.kind === 249 /* ImportEqualsDeclaration */)
                     && checker.getSymbolAtLocation(moduleSpecifier) === moduleSymbol ? { declaration: i, importKind: importKind } : undefined;
             });
         }
@@ -114134,9 +118199,9 @@ var ts;
         }
         function newImportInfoFromExistingSpecifier(_a) {
             var declaration = _a.declaration, importKind = _a.importKind;
-            var expression = declaration.kind === 249 /* ImportDeclaration */
+            var expression = declaration.kind === 250 /* ImportDeclaration */
                 ? declaration.moduleSpecifier
-                : declaration.moduleReference.kind === 259 /* ExternalModuleReference */
+                : declaration.moduleReference.kind === 260 /* ExternalModuleReference */
                     ? declaration.moduleReference.expression
                     : undefined;
             return expression && ts.isStringLiteral(expression) ? { kind: 3 /* AddNew */, moduleSpecifier: expression.text, importKind: importKind } : undefined;
@@ -114258,9 +118323,11 @@ var ts;
                 var aliased = checker.getImmediateAliasedSymbol(defaultExport);
                 return aliased && getDefaultExportInfoWorker(aliased, ts.Debug.assertDefined(aliased.parent), checker, compilerOptions);
             }
-            else {
-                return { symbolForMeaning: defaultExport, name: moduleSymbolToValidIdentifier(moduleSymbol, compilerOptions.target) };
+            if (defaultExport.escapedName !== "default" /* Default */ &&
+                defaultExport.escapedName !== "export=" /* ExportEquals */) {
+                return { symbolForMeaning: defaultExport, name: defaultExport.getName() };
             }
+            return { symbolForMeaning: defaultExport, name: moduleSymbolToValidIdentifier(moduleSymbol, compilerOptions.target) };
         }
         function getNameForExportDefault(symbol) {
             return symbol.declarations && ts.firstDefined(symbol.declarations, function (declaration) {
@@ -114464,12 +118531,12 @@ var ts;
             var checker = context.program.getTypeChecker();
             var suggestion;
             if (ts.isPropertyAccessExpression(node.parent) && node.parent.name === node) {
-                ts.Debug.assert(node.kind === 72 /* Identifier */);
+                ts.Debug.assert(node.kind === 73 /* Identifier */);
                 var containingType = checker.getTypeAtLocation(node.parent.expression);
                 suggestion = checker.getSuggestionForNonexistentProperty(node, containingType);
             }
             else if (ts.isImportSpecifier(node.parent) && node.parent.name === node) {
-                ts.Debug.assert(node.kind === 72 /* Identifier */);
+                ts.Debug.assert(node.kind === 73 /* Identifier */);
                 var importDeclaration = ts.findAncestor(node, ts.isImportDeclaration);
                 var resolvedSourceFile = getResolvedSourceFileFromImportDeclaration(sourceFile, context, importDeclaration);
                 if (resolvedSourceFile && resolvedSourceFile.symbol) {
@@ -114532,7 +118599,7 @@ var ts;
         codefix.registerCodeFix({
             errorCodes: errorCodes,
             getCodeActions: function (context) {
-                var info = getInfo(context.sourceFile, context.span.start, context.program.getTypeChecker());
+                var info = getInfo(context.sourceFile, context.span.start, context.program.getTypeChecker(), context.program);
                 if (!info)
                     return undefined;
                 if (info.kind === 0 /* Enum */) {
@@ -114555,7 +118622,7 @@ var ts;
                 var typeDeclToMembers = new ts.NodeMap();
                 return codefix.createCombinedCodeActions(ts.textChanges.ChangeTracker.with(context, function (changes) {
                     codefix.eachDiagnostic(context, errorCodes, function (diag) {
-                        var info = getInfo(diag.file, diag.start, checker);
+                        var info = getInfo(diag.file, diag.start, checker, context.program);
                         if (!info || !ts.addToSeen(seen, ts.getNodeId(info.parentDeclaration) + "#" + info.token.text)) {
                             return;
                         }
@@ -114623,7 +118690,7 @@ var ts;
             InfoKind[InfoKind["Enum"] = 0] = "Enum";
             InfoKind[InfoKind["ClassOrInterface"] = 1] = "ClassOrInterface";
         })(InfoKind || (InfoKind = {}));
-        function getInfo(tokenSourceFile, tokenPos, checker) {
+        function getInfo(tokenSourceFile, tokenPos, checker, program) {
             // The identifier of the missing property. eg:
             // this.missing = 1;
             //      ^^^^^^^
@@ -114640,7 +118707,7 @@ var ts;
                 return undefined;
             // Prefer to change the class instead of the interface if they are merged
             var classOrInterface = ts.find(symbol.declarations, ts.isClassLike) || ts.find(symbol.declarations, ts.isInterfaceDeclaration);
-            if (classOrInterface) {
+            if (classOrInterface && !program.isSourceFileFromExternalLibrary(classOrInterface.getSourceFile())) {
                 var makeStatic = (leftExpressionType.target || leftExpressionType) !== checker.getDeclaredTypeOfSymbol(symbol);
                 var declSourceFile = classOrInterface.getSourceFile();
                 var inJs = ts.isSourceFileJS(declSourceFile);
@@ -114648,7 +118715,7 @@ var ts;
                 return { kind: 1 /* ClassOrInterface */, token: token, parentDeclaration: classOrInterface, makeStatic: makeStatic, declSourceFile: declSourceFile, inJs: inJs, call: call };
             }
             var enumDeclaration = ts.find(symbol.declarations, ts.isEnumDeclaration);
-            if (enumDeclaration) {
+            if (enumDeclaration && !program.isSourceFileFromExternalLibrary(enumDeclaration.getSourceFile())) {
                 return { kind: 0 /* Enum */, token: token, parentDeclaration: enumDeclaration };
             }
             return undefined;
@@ -114660,7 +118727,7 @@ var ts;
         }
         function addMissingMemberInJs(changeTracker, declSourceFile, classDeclaration, tokenName, makeStatic) {
             if (makeStatic) {
-                if (classDeclaration.kind === 209 /* ClassExpression */) {
+                if (classDeclaration.kind === 210 /* ClassExpression */) {
                     return;
                 }
                 var className = classDeclaration.name.getText();
@@ -114686,7 +118753,7 @@ var ts;
         }
         function getTypeNode(checker, classDeclaration, token) {
             var typeNode;
-            if (token.parent.parent.kind === 204 /* BinaryExpression */) {
+            if (token.parent.parent.kind === 205 /* BinaryExpression */) {
                 var binaryExpression = token.parent.parent;
                 var otherExpression = token.parent === binaryExpression.left ? binaryExpression.right : binaryExpression.left;
                 var widenedType = checker.getWidenedType(checker.getBaseTypeOfLiteralType(checker.getTypeAtLocation(otherExpression)));
@@ -114696,7 +118763,7 @@ var ts;
                 var contextualType = checker.getContextualType(token.parent);
                 typeNode = contextualType ? checker.typeToTypeNode(contextualType) : undefined;
             }
-            return typeNode || ts.createKeywordTypeNode(120 /* AnyKeyword */);
+            return typeNode || ts.createKeywordTypeNode(121 /* AnyKeyword */);
         }
         function createAddPropertyDeclarationAction(context, declSourceFile, classDeclaration, makeStatic, tokenName, typeNode) {
             var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return addPropertyDeclaration(t, declSourceFile, classDeclaration, tokenName, typeNode, makeStatic); });
@@ -114705,7 +118772,7 @@ var ts;
         function addPropertyDeclaration(changeTracker, declSourceFile, classDeclaration, tokenName, typeNode, makeStatic) {
             var property = ts.createProperty(
             /*decorators*/ undefined, 
-            /*modifiers*/ makeStatic ? [ts.createToken(116 /* StaticKeyword */)] : undefined, tokenName, 
+            /*modifiers*/ makeStatic ? [ts.createToken(117 /* StaticKeyword */)] : undefined, tokenName, 
             /*questionToken*/ undefined, typeNode, 
             /*initializer*/ undefined);
             var lastProp = getNodeToInsertPropertyAfter(classDeclaration);
@@ -114729,7 +118796,7 @@ var ts;
         }
         function createAddIndexSignatureAction(context, declSourceFile, classDeclaration, tokenName, typeNode) {
             // Index signatures cannot have the static modifier.
-            var stringTypeNode = ts.createKeywordTypeNode(138 /* StringKeyword */);
+            var stringTypeNode = ts.createKeywordTypeNode(139 /* StringKeyword */);
             var indexingParameter = ts.createParameter(
             /*decorators*/ undefined, 
             /*modifiers*/ undefined, 
@@ -114749,7 +118816,7 @@ var ts;
         }
         function addMethodDeclaration(context, changeTracker, declSourceFile, typeDecl, token, callExpression, makeStatic, inJs, preferences) {
             var methodDeclaration = codefix.createMethodFromCallExpression(context, callExpression, token.text, inJs, makeStatic, preferences, typeDecl);
-            var containingMethodDeclaration = ts.getAncestor(callExpression, 156 /* MethodDeclaration */);
+            var containingMethodDeclaration = ts.getAncestor(callExpression, 157 /* MethodDeclaration */);
             if (containingMethodDeclaration && containingMethodDeclaration.parent === typeDecl) {
                 changeTracker.insertNodeAfter(declSourceFile, containingMethodDeclaration, methodDeclaration);
             }
@@ -114813,7 +118880,6 @@ var ts;
     (function (codefix) {
         var fixName = "fixCannotFindModule";
         var fixIdInstallTypesPackage = "installTypesPackage";
-        var fixIdGenerateTypes = "generateTypes";
         var errorCodeCannotFindModule = ts.Diagnostics.Cannot_find_module_0.code;
         var errorCodes = [
             errorCodeCannotFindModule,
@@ -114828,13 +118894,12 @@ var ts;
                     return undefined;
                 var typesPackageName = getTypesPackageNameToInstall(packageName, host, context.errorCode);
                 return typesPackageName === undefined
-                    ? ts.singleElementArray(tryGetGenerateTypesAction(context, packageName))
+                    ? []
                     : [codefix.createCodeFixAction(fixName, /*changes*/ [], [ts.Diagnostics.Install_0, typesPackageName], fixIdInstallTypesPackage, ts.Diagnostics.Install_all_missing_types_packages, getInstallCommand(sourceFile.fileName, typesPackageName))];
             },
-            fixIds: [fixIdInstallTypesPackage, fixIdGenerateTypes],
+            fixIds: [fixIdInstallTypesPackage],
             getAllCodeActions: function (context) {
-                var savedTypesDir = null; // tslint:disable-line no-null-keyword
-                return codefix.codeFixAll(context, errorCodes, function (changes, diag, commands) {
+                return codefix.codeFixAll(context, errorCodes, function (_changes, diag, commands) {
                     var packageName = tryGetImportedPackageName(diag.file, diag.start);
                     if (packageName === undefined)
                         return undefined;
@@ -114846,96 +118911,12 @@ var ts;
                             }
                             break;
                         }
-                        case fixIdGenerateTypes: {
-                            var typesDir = savedTypesDir !== null ? savedTypesDir : savedTypesDir = getOrCreateTypesDirectory(changes, context);
-                            var command = typesDir === undefined ? undefined : tryGenerateTypes(typesDir, packageName, context);
-                            if (command)
-                                commands.push(command);
-                            break;
-                        }
                         default:
                             ts.Debug.fail("Bad fixId: " + context.fixId);
                     }
                 });
             },
         });
-        function tryGetGenerateTypesAction(context, packageName) {
-            var command;
-            var changes = ts.textChanges.ChangeTracker.with(context, function (t) {
-                var typesDir = getOrCreateTypesDirectory(t, context);
-                command = typesDir === undefined ? undefined : tryGenerateTypes(typesDir, packageName, context);
-            });
-            return command && codefix.createCodeFixAction(fixName, changes, [ts.Diagnostics.Generate_types_for_0, packageName], fixIdGenerateTypes, ts.Diagnostics.Generate_types_for_all_packages_without_types, command);
-        }
-        function tryGenerateTypes(typesDir, packageName, context) {
-            var file = context.sourceFile.fileName;
-            var fileToGenerateTypesFor = ts.tryResolveJSModule(packageName, ts.getDirectoryPath(file), context.host); // TODO: GH#18217
-            if (fileToGenerateTypesFor === undefined)
-                return undefined;
-            var outputFileName = ts.resolvePath(ts.getDirectoryPath(context.program.getCompilerOptions().configFile.fileName), typesDir, packageName + ".d.ts");
-            if (context.host.fileExists(outputFileName))
-                return undefined;
-            return { type: "generate types", file: file, fileToGenerateTypesFor: fileToGenerateTypesFor, outputFileName: outputFileName };
-        }
-        // If no types directory exists yet, adds it to tsconfig.json
-        function getOrCreateTypesDirectory(changes, context) {
-            var configFile = context.program.getCompilerOptions().configFile;
-            if (!configFile)
-                return undefined;
-            var tsconfigObjectLiteral = ts.getTsConfigObjectLiteralExpression(configFile);
-            if (!tsconfigObjectLiteral)
-                return undefined;
-            var compilerOptionsProperty = codefix.findJsonProperty(tsconfigObjectLiteral, "compilerOptions");
-            if (!compilerOptionsProperty) {
-                var newCompilerOptions = ts.createObjectLiteral([makeDefaultBaseUrl(), makeDefaultPaths()]);
-                changes.insertNodeAtObjectStart(configFile, tsconfigObjectLiteral, codefix.createJsonPropertyAssignment("compilerOptions", newCompilerOptions));
-                return defaultTypesDirectoryName;
-            }
-            var compilerOptions = compilerOptionsProperty.initializer;
-            if (!ts.isObjectLiteralExpression(compilerOptions))
-                return defaultTypesDirectoryName;
-            var baseUrl = getOrAddBaseUrl(changes, configFile, compilerOptions);
-            var typesDirectoryFromPathMapping = getOrAddPathMapping(changes, configFile, compilerOptions);
-            return ts.combinePaths(baseUrl, typesDirectoryFromPathMapping);
-        }
-        var defaultBaseUrl = ".";
-        function makeDefaultBaseUrl() {
-            return codefix.createJsonPropertyAssignment("baseUrl", ts.createStringLiteral(defaultBaseUrl));
-        }
-        function getOrAddBaseUrl(changes, tsconfig, compilerOptions) {
-            var baseUrlProp = codefix.findJsonProperty(compilerOptions, "baseUrl");
-            if (baseUrlProp) {
-                return ts.isStringLiteral(baseUrlProp.initializer) ? baseUrlProp.initializer.text : defaultBaseUrl;
-            }
-            else {
-                changes.insertNodeAtObjectStart(tsconfig, compilerOptions, makeDefaultBaseUrl());
-                return defaultBaseUrl;
-            }
-        }
-        var defaultTypesDirectoryName = "types";
-        function makeDefaultPathMapping() {
-            return codefix.createJsonPropertyAssignment("*", ts.createArrayLiteral([ts.createStringLiteral(defaultTypesDirectoryName + "/*")]));
-        }
-        function makeDefaultPaths() {
-            return codefix.createJsonPropertyAssignment("paths", ts.createObjectLiteral([makeDefaultPathMapping()]));
-        }
-        function getOrAddPathMapping(changes, tsconfig, compilerOptions) {
-            var paths = codefix.findJsonProperty(compilerOptions, "paths");
-            if (!paths || !ts.isObjectLiteralExpression(paths.initializer)) {
-                changes.insertNodeAtObjectStart(tsconfig, compilerOptions, makeDefaultPaths());
-                return defaultTypesDirectoryName;
-            }
-            // Look for an existing path mapping. Should look like `"*": "foo/*"`.
-            var existing = ts.firstDefined(paths.initializer.properties, function (prop) {
-                return ts.isPropertyAssignment(prop) && ts.isStringLiteral(prop.name) && prop.name.text === "*" && ts.isArrayLiteralExpression(prop.initializer)
-                    ? ts.firstDefined(prop.initializer.elements, function (value) { return ts.isStringLiteral(value) ? ts.tryRemoveSuffix(value.text, "/*") : undefined; })
-                    : undefined;
-            });
-            if (existing)
-                return existing;
-            changes.insertNodeAtObjectStart(tsconfig, paths.initializer, makeDefaultPathMapping());
-            return defaultTypesDirectoryName;
-        }
         function getInstallCommand(fileName, packageName) {
             return { type: "install package", file: fileName, packageName: packageName };
         }
@@ -115043,7 +119024,7 @@ var ts;
         }
         function getNodes(sourceFile, pos) {
             var token = ts.getTokenAtPosition(sourceFile, pos);
-            if (token.kind !== 100 /* ThisKeyword */)
+            if (token.kind !== 101 /* ThisKeyword */)
                 return undefined;
             var constructor = ts.getContainingFunction(token);
             var superCall = findSuperCall(constructor.body);
@@ -115082,7 +119063,7 @@ var ts;
         });
         function getNode(sourceFile, pos) {
             var token = ts.getTokenAtPosition(sourceFile, pos);
-            ts.Debug.assert(token.kind === 124 /* ConstructorKeyword */);
+            ts.Debug.assert(token.kind === 125 /* ConstructorKeyword */);
             return token.parent;
         }
         function doChange(changes, sourceFile, ctr) {
@@ -115098,7 +119079,7 @@ var ts;
     (function (codefix) {
         var fixId = "enableExperimentalDecorators";
         var errorCodes = [
-            ts.Diagnostics.Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_to_remove_this_warning.code
+            ts.Diagnostics.Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_in_your_tsconfig_or_jsconfig_to_remove_this_warning.code
         ];
         codefix.registerCodeFix({
             errorCodes: errorCodes,
@@ -115107,12 +119088,19 @@ var ts;
                 if (configFile === undefined) {
                     return undefined;
                 }
-                var changes = ts.textChanges.ChangeTracker.with(context, function (changeTracker) { return makeChange(changeTracker, configFile); });
+                var changes = ts.textChanges.ChangeTracker.with(context, function (changeTracker) { return doChange(changeTracker, configFile); });
                 return [codefix.createCodeFixActionNoFixId(fixId, changes, ts.Diagnostics.Enable_the_experimentalDecorators_option_in_your_configuration_file)];
             },
             fixIds: [fixId],
+            getAllCodeActions: function (context) { return codefix.codeFixAll(context, errorCodes, function (changes) {
+                var configFile = context.program.getCompilerOptions().configFile;
+                if (configFile === undefined) {
+                    return undefined;
+                }
+                doChange(changes, configFile);
+            }); },
         });
-        function makeChange(changeTracker, configFile) {
+        function doChange(changeTracker, configFile) {
             codefix.setJsonCompilerOptionValue(changeTracker, configFile, "experimentalDecorators", ts.createTrue());
         }
     })(codefix = ts.codefix || (ts.codefix = {}));
@@ -115146,14 +119134,14 @@ var ts;
             var token = ts.getTokenAtPosition(sourceFile, pos);
             var heritageClauses = ts.getContainingClass(token).heritageClauses;
             var extendsToken = heritageClauses[0].getFirstToken();
-            return extendsToken.kind === 86 /* ExtendsKeyword */ ? { extendsToken: extendsToken, heritageClauses: heritageClauses } : undefined;
+            return extendsToken.kind === 87 /* ExtendsKeyword */ ? { extendsToken: extendsToken, heritageClauses: heritageClauses } : undefined;
         }
         function doChanges(changes, sourceFile, extendsToken, heritageClauses) {
-            changes.replaceNode(sourceFile, extendsToken, ts.createToken(109 /* ImplementsKeyword */));
+            changes.replaceNode(sourceFile, extendsToken, ts.createToken(110 /* ImplementsKeyword */));
             // If there is already an implements clause, replace the implements keyword with a comma.
             if (heritageClauses.length === 2 &&
-                heritageClauses[0].token === 86 /* ExtendsKeyword */ &&
-                heritageClauses[1].token === 109 /* ImplementsKeyword */) {
+                heritageClauses[0].token === 87 /* ExtendsKeyword */ &&
+                heritageClauses[1].token === 110 /* ImplementsKeyword */) {
                 var implementsToken = heritageClauses[1].getFirstToken();
                 var implementsFullStart = implementsToken.getFullStart();
                 changes.replaceRange(sourceFile, { pos: implementsFullStart, end: implementsFullStart }, ts.createToken(27 /* CommaToken */));
@@ -115260,7 +119248,7 @@ var ts;
                     return [createDeleteFix(delVar, ts.Diagnostics.Remove_variable_statement)];
                 }
                 var result = [];
-                if (token.kind === 127 /* InferKeyword */) {
+                if (token.kind === 128 /* InferKeyword */) {
                     var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return changeInferToUnknown(t, sourceFile, token); });
                     var name = ts.cast(token.parent, ts.isInferTypeNode).typeParameter.name.text;
                     result.push(codefix.createCodeFixAction(fixName, changes, [ts.Diagnostics.Replace_infer_0_with_unknown, name], fixIdInfer, ts.Diagnostics.Replace_all_unused_infer_with_unknown));
@@ -115292,7 +119280,7 @@ var ts;
                             tryPrefixDeclaration(changes, diag.code, sourceFile, token);
                             break;
                         case fixIdDelete: {
-                            if (token.kind === 127 /* InferKeyword */)
+                            if (token.kind === 128 /* InferKeyword */)
                                 break; // Can't delete
                             var importDecl = tryGetFullImport(token);
                             if (importDecl) {
@@ -115311,7 +119299,7 @@ var ts;
                             break;
                         }
                         case fixIdInfer:
-                            if (token.kind === 127 /* InferKeyword */) {
+                            if (token.kind === 128 /* InferKeyword */) {
                                 changeInferToUnknown(changes, sourceFile, token);
                             }
                             break;
@@ -115322,7 +119310,7 @@ var ts;
             },
         });
         function changeInferToUnknown(changes, sourceFile, token) {
-            changes.replaceNode(sourceFile, token.parent, ts.createKeywordTypeNode(143 /* UnknownKeyword */));
+            changes.replaceNode(sourceFile, token.parent, ts.createKeywordTypeNode(144 /* UnknownKeyword */));
         }
         function createDeleteFix(changes, diag) {
             return codefix.createCodeFixAction(fixName, changes, diag, fixIdDelete, ts.Diagnostics.Delete_all_unused_declarations);
@@ -115332,13 +119320,13 @@ var ts;
         }
         // Sometimes the diagnostic span is an entire ImportDeclaration, so we should remove the whole thing.
         function tryGetFullImport(token) {
-            return token.kind === 92 /* ImportKeyword */ ? ts.tryCast(token.parent, ts.isImportDeclaration) : undefined;
+            return token.kind === 93 /* ImportKeyword */ ? ts.tryCast(token.parent, ts.isImportDeclaration) : undefined;
         }
         function tryDeleteFullDestructure(token, changes, sourceFile, checker, sourceFiles, isFixAll) {
             if (token.kind !== 18 /* OpenBraceToken */ || !ts.isObjectBindingPattern(token.parent))
                 return false;
             var decl = token.parent.parent;
-            if (decl.kind === 151 /* Parameter */) {
+            if (decl.kind === 152 /* Parameter */) {
                 tryDeleteParameter(changes, sourceFile, decl, checker, sourceFiles, isFixAll);
             }
             else {
@@ -115349,7 +119337,7 @@ var ts;
         function tryDeleteFullVariableStatement(sourceFile, token, changes) {
             var declarationList = ts.tryCast(token.parent, ts.isVariableDeclarationList);
             if (declarationList && declarationList.getChildren(sourceFile)[0] === token) {
-                changes.delete(sourceFile, declarationList.parent.kind === 219 /* VariableStatement */ ? declarationList.parent : declarationList);
+                changes.delete(sourceFile, declarationList.parent.kind === 220 /* VariableStatement */ ? declarationList.parent : declarationList);
                 return true;
             }
             return false;
@@ -115358,7 +119346,7 @@ var ts;
             // Don't offer to prefix a property.
             if (errorCode === ts.Diagnostics.Property_0_is_declared_but_its_value_is_never_read.code)
                 return;
-            if (token.kind === 127 /* InferKeyword */) {
+            if (token.kind === 128 /* InferKeyword */) {
                 token = ts.cast(token.parent, ts.isInferTypeNode).typeParameter.name;
             }
             if (ts.isIdentifier(token) && canPrefix(token)) {
@@ -115367,14 +119355,14 @@ var ts;
         }
         function canPrefix(token) {
             switch (token.parent.kind) {
-                case 151 /* Parameter */:
-                case 150 /* TypeParameter */:
+                case 152 /* Parameter */:
+                case 151 /* TypeParameter */:
                     return true;
-                case 237 /* VariableDeclaration */: {
+                case 238 /* VariableDeclaration */: {
                     var varDecl = token.parent;
                     switch (varDecl.parent.parent.kind) {
-                        case 227 /* ForOfStatement */:
-                        case 226 /* ForInStatement */:
+                        case 228 /* ForOfStatement */:
+                        case 227 /* ForInStatement */:
                             return true;
                     }
                 }
@@ -115421,26 +119409,26 @@ var ts;
         function mayDeleteParameter(p, checker, isFixAll) {
             var parent = p.parent;
             switch (parent.kind) {
-                case 156 /* MethodDeclaration */:
+                case 157 /* MethodDeclaration */:
                     // Don't remove a parameter if this overrides something.
                     var symbol = checker.getSymbolAtLocation(parent.name);
                     if (ts.isMemberSymbolInBaseType(symbol, checker))
                         return false;
                 // falls through
-                case 157 /* Constructor */:
-                case 239 /* FunctionDeclaration */:
+                case 158 /* Constructor */:
+                case 240 /* FunctionDeclaration */:
                     return true;
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */: {
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */: {
                     // Can't remove a non-last parameter in a callback. Can remove a parameter in code-fix-all if future parameters are also unused.
                     var parameters = parent.parameters;
                     var index = parameters.indexOf(p);
                     ts.Debug.assert(index !== -1);
                     return isFixAll
-                        ? parameters.slice(index + 1).every(function (p) { return p.name.kind === 72 /* Identifier */ && !p.symbol.isReferenced; })
+                        ? parameters.slice(index + 1).every(function (p) { return p.name.kind === 73 /* Identifier */ && !p.symbol.isReferenced; })
                         : index === parameters.length - 1;
                 }
-                case 159 /* SetAccessor */:
+                case 160 /* SetAccessor */:
                     // Setter must have a parameter
                     return false;
                 default:
@@ -115480,7 +119468,7 @@ var ts;
             var container = (ts.isBlock(statement.parent) ? statement.parent : statement).parent;
             if (!ts.isBlock(statement.parent) || statement === ts.first(statement.parent.statements)) {
                 switch (container.kind) {
-                    case 222 /* IfStatement */:
+                    case 223 /* IfStatement */:
                         if (container.elseStatement) {
                             if (ts.isBlock(statement.parent)) {
                                 break;
@@ -115491,15 +119479,15 @@ var ts;
                             return;
                         }
                     // falls through
-                    case 224 /* WhileStatement */:
-                    case 225 /* ForStatement */:
+                    case 225 /* WhileStatement */:
+                    case 226 /* ForStatement */:
                         changes.delete(sourceFile, container);
                         return;
                 }
             }
             if (ts.isBlock(statement.parent)) {
-                var end_2 = start + length;
-                var lastStatement = ts.Debug.assertDefined(lastWhere(ts.sliceAfter(statement.parent.statements, statement), function (s) { return s.pos < end_2; }));
+                var end_3 = start + length;
+                var lastStatement = ts.Debug.assertDefined(lastWhere(ts.sliceAfter(statement.parent.statements, statement), function (s) { return s.pos < end_3; }));
                 changes.deleteNodeRange(sourceFile, statement, lastStatement);
             }
             else {
@@ -115565,7 +119553,7 @@ var ts;
                 var typeNode = info.typeNode, type = info.type;
                 var original = typeNode.getText(sourceFile);
                 var actions = [fix(type, fixIdPlain, ts.Diagnostics.Change_all_jsdoc_style_types_to_TypeScript)];
-                if (typeNode.kind === 291 /* JSDocNullableType */) {
+                if (typeNode.kind === 292 /* JSDocNullableType */) {
                     // for nullable types, suggest the flow-compatible `T | null | undefined`
                     // in addition to the jsdoc/closure-compatible `T | null`
                     actions.push(fix(checker.getNullableType(type, 32768 /* Undefined */), fixIdNullable, ts.Diagnostics.Change_all_jsdoc_style_types_to_TypeScript_and_add_undefined_to_nullable_types));
@@ -115585,7 +119573,7 @@ var ts;
                     if (!info)
                         return;
                     var typeNode = info.typeNode, type = info.type;
-                    var fixedType = typeNode.kind === 291 /* JSDocNullableType */ && fixId === fixIdNullable ? checker.getNullableType(type, 32768 /* Undefined */) : type;
+                    var fixedType = typeNode.kind === 292 /* JSDocNullableType */ && fixId === fixIdNullable ? checker.getNullableType(type, 32768 /* Undefined */) : type;
                     doChange(changes, sourceFile, typeNode, fixedType, checker);
                 });
             }
@@ -115602,22 +119590,22 @@ var ts;
             // NOTE: Some locations are not handled yet:
             // MappedTypeNode.typeParameters and SignatureDeclaration.typeParameters, as well as CallExpression.typeArguments
             switch (node.kind) {
-                case 212 /* AsExpression */:
-                case 160 /* CallSignature */:
-                case 161 /* ConstructSignature */:
-                case 239 /* FunctionDeclaration */:
-                case 158 /* GetAccessor */:
-                case 162 /* IndexSignature */:
-                case 181 /* MappedType */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
-                case 151 /* Parameter */:
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
-                case 159 /* SetAccessor */:
-                case 242 /* TypeAliasDeclaration */:
-                case 194 /* TypeAssertionExpression */:
-                case 237 /* VariableDeclaration */:
+                case 213 /* AsExpression */:
+                case 161 /* CallSignature */:
+                case 162 /* ConstructSignature */:
+                case 240 /* FunctionDeclaration */:
+                case 159 /* GetAccessor */:
+                case 163 /* IndexSignature */:
+                case 182 /* MappedType */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
+                case 152 /* Parameter */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
+                case 160 /* SetAccessor */:
+                case 243 /* TypeAliasDeclaration */:
+                case 195 /* TypeAssertionExpression */:
+                case 238 /* VariableDeclaration */:
                     return true;
                 default:
                     return false;
@@ -115671,14 +119659,14 @@ var ts;
             }
             var insertBefore;
             switch (containingFunction.kind) {
-                case 156 /* MethodDeclaration */:
+                case 157 /* MethodDeclaration */:
                     insertBefore = containingFunction.name;
                     break;
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
-                    insertBefore = ts.findChildOfKind(containingFunction, 90 /* FunctionKeyword */, sourceFile);
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
+                    insertBefore = ts.findChildOfKind(containingFunction, 91 /* FunctionKeyword */, sourceFile);
                     break;
-                case 197 /* ArrowFunction */:
+                case 198 /* ArrowFunction */:
                     insertBefore = ts.findChildOfKind(containingFunction, 20 /* OpenParenToken */, sourceFile) || ts.first(containingFunction.parameters);
                     break;
                 default:
@@ -115693,11 +119681,11 @@ var ts;
             var insertBefore = _a.insertBefore, returnType = _a.returnType;
             if (returnType) {
                 var entityName = ts.getEntityNameFromTypeNode(returnType);
-                if (!entityName || entityName.kind !== 72 /* Identifier */ || entityName.text !== "Promise") {
+                if (!entityName || entityName.kind !== 73 /* Identifier */ || entityName.text !== "Promise") {
                     changes.replaceNode(sourceFile, returnType, ts.createTypeReferenceNode("Promise", ts.createNodeArray([returnType])));
                 }
             }
-            changes.insertModifierBefore(sourceFile, 121 /* AsyncKeyword */, insertBefore);
+            changes.insertModifierBefore(sourceFile, 122 /* AsyncKeyword */, insertBefore);
         }
     })(codefix = ts.codefix || (ts.codefix = {}));
 })(ts || (ts = {}));
@@ -115806,17 +119794,17 @@ var ts;
             var type = checker.getWidenedType(checker.getTypeOfSymbolAtLocation(symbol, enclosingDeclaration));
             var optional = !!(symbol.flags & 16777216 /* Optional */);
             switch (declaration.kind) {
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
-                case 153 /* PropertySignature */:
-                case 154 /* PropertyDeclaration */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
+                case 154 /* PropertySignature */:
+                case 155 /* PropertyDeclaration */:
                     var typeNode = checker.typeToTypeNode(type, enclosingDeclaration, /*flags*/ undefined, getNoopSymbolTrackerWithResolver(context));
                     out(ts.createProperty(
                     /*decorators*/ undefined, modifiers, name, optional ? ts.createToken(56 /* QuestionToken */) : undefined, typeNode, 
                     /*initializer*/ undefined));
                     break;
-                case 155 /* MethodSignature */:
-                case 156 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
+                case 157 /* MethodDeclaration */:
                     // The signature for the implementation appears as an entry in `signatures` iff
                     // there is only one signature.
                     // If there are overloads and an implementation signature, it appears as an
@@ -115857,7 +119845,7 @@ var ts;
         }
         function signatureToMethodDeclaration(context, signature, enclosingDeclaration, modifiers, name, optional, body) {
             var program = context.program;
-            var signatureDeclaration = program.getTypeChecker().signatureToSignatureDeclaration(signature, 156 /* MethodDeclaration */, enclosingDeclaration, 1 /* NoTruncation */ | 256 /* SuppressAnyReturnType */, getNoopSymbolTrackerWithResolver(context));
+            var signatureDeclaration = program.getTypeChecker().signatureToSignatureDeclaration(signature, 157 /* MethodDeclaration */, enclosingDeclaration, 1 /* NoTruncation */ | 256 /* SuppressAnyReturnType */, getNoopSymbolTrackerWithResolver(context));
             if (!signatureDeclaration) {
                 return undefined;
             }
@@ -115885,7 +119873,7 @@ var ts;
             var returnType = (inJs || !contextualType) ? undefined : checker.typeToTypeNode(contextualType, contextNode, /*flags*/ undefined, tracker);
             return ts.createMethod(
             /*decorators*/ undefined, 
-            /*modifiers*/ makeStatic ? [ts.createToken(116 /* StaticKeyword */)] : undefined, 
+            /*modifiers*/ makeStatic ? [ts.createToken(117 /* StaticKeyword */)] : undefined, 
             /*asteriskToken*/ ts.isYieldExpression(parent) ? ts.createToken(40 /* AsteriskToken */) : undefined, methodName, 
             /*questionToken*/ undefined, 
             /*typeParameters*/ inJs ? undefined : ts.map(typeArguments, function (_, i) {
@@ -115904,7 +119892,7 @@ var ts;
                 /*dotDotDotToken*/ undefined, 
                 /*name*/ names && names[i] || "arg" + i, 
                 /*questionToken*/ minArgumentCount !== undefined && i >= minArgumentCount ? ts.createToken(56 /* QuestionToken */) : undefined, 
-                /*type*/ inJs ? undefined : types && types[i] || ts.createKeywordTypeNode(120 /* AnyKeyword */), 
+                /*type*/ inJs ? undefined : types && types[i] || ts.createKeywordTypeNode(121 /* AnyKeyword */), 
                 /*initializer*/ undefined);
                 parameters.push(newParameter);
             }
@@ -115932,7 +119920,7 @@ var ts;
             var maxArgsParameterSymbolNames = maxArgsSignature.parameters.map(function (symbol) { return symbol.name; });
             var parameters = createDummyParameters(maxNonRestArgs, maxArgsParameterSymbolNames, /* types */ undefined, minArgumentCount, /*inJs*/ false);
             if (someSigHasRestParameter) {
-                var anyArrayType = ts.createArrayTypeNode(ts.createKeywordTypeNode(120 /* AnyKeyword */));
+                var anyArrayType = ts.createArrayTypeNode(ts.createKeywordTypeNode(121 /* AnyKeyword */));
                 var restParameter = ts.createParameter(
                 /*decorators*/ undefined, 
                 /*modifiers*/ undefined, ts.createToken(25 /* DotDotDotToken */), maxArgsParameterSymbolNames[maxNonRestArgs] || "rest", 
@@ -115958,10 +119946,10 @@ var ts;
         }
         function createVisibilityModifier(flags) {
             if (flags & 4 /* Public */) {
-                return ts.createToken(115 /* PublicKeyword */);
+                return ts.createToken(116 /* PublicKeyword */);
             }
             else if (flags & 16 /* Protected */) {
-                return ts.createToken(114 /* ProtectedKeyword */);
+                return ts.createToken(115 /* ProtectedKeyword */);
             }
             return undefined;
         }
@@ -116026,15 +120014,15 @@ var ts;
         }
         codefix.registerCodeFix({
             errorCodes: [
-                ts.Diagnostics.Cannot_invoke_an_expression_whose_type_lacks_a_call_signature_Type_0_has_no_compatible_call_signatures.code,
-                ts.Diagnostics.Cannot_use_new_with_an_expression_whose_type_lacks_a_call_or_construct_signature.code,
+                ts.Diagnostics.This_expression_is_not_callable.code,
+                ts.Diagnostics.This_expression_is_not_constructable.code,
             ],
             getCodeActions: getActionsForUsageOfInvalidImport
         });
         function getActionsForUsageOfInvalidImport(context) {
             var sourceFile = context.sourceFile;
-            var targetKind = ts.Diagnostics.Cannot_invoke_an_expression_whose_type_lacks_a_call_signature_Type_0_has_no_compatible_call_signatures.code === context.errorCode ? 191 /* CallExpression */ : 192 /* NewExpression */;
-            var node = ts.findAncestor(ts.getTokenAtPosition(sourceFile, context.span.start), function (a) { return a.kind === targetKind && a.getStart() === context.span.start && a.getEnd() === (context.span.start + context.span.length); });
+            var targetKind = ts.Diagnostics.This_expression_is_not_callable.code === context.errorCode ? 192 /* CallExpression */ : 193 /* NewExpression */;
+            var node = ts.findAncestor(ts.getTokenAtPosition(sourceFile, context.span.start), function (a) { return a.kind === targetKind; });
             if (!node) {
                 return [];
             }
@@ -116152,7 +120140,7 @@ var ts;
             return codefix.createCodeFixAction(fixName, changes, [ts.Diagnostics.Add_undefined_type_to_property_0, propertyDeclaration.name.getText()], fixIdAddUndefinedType, ts.Diagnostics.Add_undefined_type_to_all_uninitialized_properties);
         }
         function addUndefinedType(changeTracker, propertyDeclarationSourceFile, propertyDeclaration) {
-            var undefinedTypeNode = ts.createKeywordTypeNode(141 /* UndefinedKeyword */);
+            var undefinedTypeNode = ts.createKeywordTypeNode(142 /* UndefinedKeyword */);
             var type = propertyDeclaration.type; // TODO: GH#18217
             var types = ts.isUnionTypeNode(type) ? type.types.concat(undefinedTypeNode) : [type, undefinedTypeNode];
             changeTracker.replaceNode(propertyDeclarationSourceFile, type, ts.createUnionTypeNode(types));
@@ -116198,235 +120186,6 @@ var ts;
         }
     })(codefix = ts.codefix || (ts.codefix = {}));
 })(ts || (ts = {}));
-var ts;
-(function (ts) {
-    function generateTypesForModule(name, moduleValue, formatSettings) {
-        return generateTypesForModuleOrGlobal(name, moduleValue, formatSettings, 0 /* ExportEquals */);
-    }
-    ts.generateTypesForModule = generateTypesForModule;
-    function generateTypesForGlobal(name, globalValue, formatSettings) {
-        return generateTypesForModuleOrGlobal(name, globalValue, formatSettings, 3 /* Global */);
-    }
-    ts.generateTypesForGlobal = generateTypesForGlobal;
-    function generateTypesForModuleOrGlobal(name, globalValue, formatSettings, outputKind) {
-        return valueInfoToDeclarationFileText(ts.inspectValue(name, globalValue), formatSettings, outputKind);
-    }
-    /* @internal */
-    function valueInfoToDeclarationFileText(valueInfo, formatSettings, outputKind) {
-        if (outputKind === void 0) { outputKind = 0 /* ExportEquals */; }
-        return ts.textChanges.getNewFileText(toStatements(valueInfo, outputKind), 3 /* TS */, formatSettings.newLineCharacter || "\n", ts.formatting.getFormatContext(formatSettings));
-    }
-    ts.valueInfoToDeclarationFileText = valueInfoToDeclarationFileText;
-    /* @internal */
-    var OutputKind;
-    (function (OutputKind) {
-        OutputKind[OutputKind["ExportEquals"] = 0] = "ExportEquals";
-        OutputKind[OutputKind["NamedExport"] = 1] = "NamedExport";
-        OutputKind[OutputKind["NamespaceMember"] = 2] = "NamespaceMember";
-        OutputKind[OutputKind["Global"] = 3] = "Global";
-    })(OutputKind || (OutputKind = {}));
-    function toNamespaceMemberStatements(info) {
-        return toStatements(info, 2 /* NamespaceMember */);
-    }
-    function toStatements(info, kind) {
-        var isDefault = info.name === "default" /* Default */;
-        var name = isDefault ? "_default" : info.name;
-        if (!isValidIdentifier(name) || isDefault && kind !== 1 /* NamedExport */)
-            return ts.emptyArray;
-        var modifiers = isDefault && info.kind === 2 /* FunctionOrClass */ ? [ts.createModifier(85 /* ExportKeyword */), ts.createModifier(80 /* DefaultKeyword */)]
-            : kind === 3 /* Global */ || kind === 0 /* ExportEquals */ ? [ts.createModifier(125 /* DeclareKeyword */)]
-                : kind === 1 /* NamedExport */ ? [ts.createModifier(85 /* ExportKeyword */)]
-                    : undefined;
-        var exportEquals = function () { return kind === 0 /* ExportEquals */ ? [exportEqualsOrDefault(info.name, /*isExportEquals*/ true)] : ts.emptyArray; };
-        var exportDefault = function () { return isDefault ? [exportEqualsOrDefault("_default", /*isExportEquals*/ false)] : ts.emptyArray; };
-        switch (info.kind) {
-            case 2 /* FunctionOrClass */:
-                return exportEquals().concat(functionOrClassToStatements(modifiers, name, info));
-            case 3 /* Object */:
-                var members = info.members, hasNontrivialPrototype = info.hasNontrivialPrototype;
-                if (!hasNontrivialPrototype) {
-                    if (kind === 0 /* ExportEquals */) {
-                        return ts.flatMap(members, function (v) { return toStatements(v, 1 /* NamedExport */); });
-                    }
-                    if (members.some(function (m) { return m.kind === 2 /* FunctionOrClass */; })) {
-                        // If some member is a function, use a namespace so it gets a FunctionDeclaration or ClassDeclaration.
-                        return exportDefault().concat([createNamespace(modifiers, name, ts.flatMap(members, toNamespaceMemberStatements))]);
-                    }
-                }
-            // falls through
-            case 0 /* Const */:
-            case 1 /* Array */: {
-                var comment = info.kind === 0 /* Const */ ? info.comment : undefined;
-                var constVar = ts.createVariableStatement(modifiers, ts.createVariableDeclarationList([ts.createVariableDeclaration(name, toType(info))], 2 /* Const */));
-                return exportEquals().concat(exportDefault(), [addComment(constVar, comment)]);
-            }
-            default:
-                return ts.Debug.assertNever(info);
-        }
-    }
-    function exportEqualsOrDefault(name, isExportEquals) {
-        return ts.createExportAssignment(/*decorators*/ undefined, /*modifiers*/ undefined, isExportEquals, ts.createIdentifier(name));
-    }
-    function functionOrClassToStatements(modifiers, name, _a) {
-        var source = _a.source, prototypeMembers = _a.prototypeMembers, namespaceMembers = _a.namespaceMembers;
-        var fnAst = parseClassOrFunctionBody(source);
-        var _b = fnAst === undefined ? { parameters: ts.emptyArray, returnType: anyType() } : getParametersAndReturnType(fnAst), parameters = _b.parameters, returnType = _b.returnType;
-        var protoOrInstanceMembers = ts.createMap();
-        if (typeof fnAst === "object")
-            getConstructorFunctionInstanceProperties(fnAst, protoOrInstanceMembers);
-        for (var _i = 0, prototypeMembers_1 = prototypeMembers; _i < prototypeMembers_1.length; _i++) {
-            var p = prototypeMembers_1[_i];
-            // ignore non-functions on the prototype
-            if (p.kind === 2 /* FunctionOrClass */) {
-                var m = tryGetMethod(p);
-                if (m) {
-                    protoOrInstanceMembers.set(p.name, m);
-                }
-            }
-        }
-        var classStaticMembers = protoOrInstanceMembers.size !== 0 || fnAst === undefined || typeof fnAst !== "number" && fnAst.kind === 157 /* Constructor */ ? [] : undefined;
-        var namespaceStatements = ts.flatMap(namespaceMembers, function (info) {
-            if (!isValidIdentifier(info.name))
-                return undefined;
-            if (classStaticMembers) {
-                switch (info.kind) {
-                    case 3 /* Object */:
-                        if (info.members.some(function (m) { return m.kind === 2 /* FunctionOrClass */; })) {
-                            break;
-                        }
-                    // falls through
-                    case 1 /* Array */:
-                    case 0 /* Const */:
-                        classStaticMembers.push(addComment(ts.createProperty(/*decorators*/ undefined, [ts.createModifier(116 /* StaticKeyword */)], info.name, /*questionOrExclamationToken*/ undefined, toType(info), /*initializer*/ undefined), info.kind === 0 /* Const */ ? info.comment : undefined));
-                        return undefined;
-                    case 2 /* FunctionOrClass */:
-                        if (!info.namespaceMembers.length) { // Else, can't merge a static method with a namespace. Must make it a function on the namespace.
-                            var sig = tryGetMethod(info, [ts.createModifier(116 /* StaticKeyword */)]);
-                            if (sig) {
-                                classStaticMembers.push(sig);
-                                return undefined;
-                            }
-                        }
-                        break;
-                    default:
-                        ts.Debug.assertNever(info);
-                }
-            }
-            return toStatements(info, 2 /* NamespaceMember */);
-        });
-        var decl = classStaticMembers
-            ? ts.createClassDeclaration(
-            /*decorators*/ undefined, modifiers, name, 
-            /*typeParameters*/ undefined, 
-            /*heritageClauses*/ undefined, classStaticMembers.concat((parameters.length ? [ts.createConstructor(/*decorators*/ undefined, /*modifiers*/ undefined, parameters, /*body*/ undefined)] : ts.emptyArray), ts.arrayFrom(protoOrInstanceMembers.values())))
-            : ts.createFunctionDeclaration(/*decorators*/ undefined, modifiers, /*asteriskToken*/ undefined, name, /*typeParameters*/ undefined, parameters, returnType, /*body*/ undefined);
-        return [decl].concat((namespaceStatements.length === 0 ? ts.emptyArray : [createNamespace(modifiers && modifiers.map(function (m) { return ts.getSynthesizedDeepClone(m); }), name, namespaceStatements)]));
-    }
-    function tryGetMethod(_a, modifiers) {
-        var name = _a.name, source = _a.source;
-        if (!isValidIdentifier(name))
-            return undefined;
-        var fnAst = parseClassOrFunctionBody(source);
-        if (fnAst === undefined || (typeof fnAst !== "number" && fnAst.kind === 157 /* Constructor */))
-            return undefined;
-        var sig = getParametersAndReturnType(fnAst);
-        return sig && ts.createMethod(
-        /*decorators*/ undefined, modifiers, 
-        /*asteriskToken*/ undefined, name, 
-        /*questionToken*/ undefined, 
-        /*typeParameters*/ undefined, sig.parameters, sig.returnType, 
-        /*body*/ undefined);
-    }
-    function toType(info) {
-        switch (info.kind) {
-            case 0 /* Const */:
-                return ts.createTypeReferenceNode(info.typeName, /*typeArguments*/ undefined);
-            case 1 /* Array */:
-                return ts.createArrayTypeNode(toType(info.inner));
-            case 2 /* FunctionOrClass */:
-                return ts.createTypeReferenceNode("Function", /*typeArguments*/ undefined); // Normally we create a FunctionDeclaration, but this can happen for a function in an array.
-            case 3 /* Object */:
-                return ts.createTypeLiteralNode(info.members.map(function (m) { return ts.createPropertySignature(/*modifiers*/ undefined, toPropertyName(m.name), /*questionToken*/ undefined, toType(m), /*initializer*/ undefined); }));
-            default:
-                return ts.Debug.assertNever(info);
-        }
-    }
-    function toPropertyName(name) {
-        return ts.isIdentifierText(name, 7 /* ESNext */) ? ts.createIdentifier(name) : ts.createStringLiteral(name);
-    }
-    // Parses assignments to "this.x" in the constructor into class property declarations
-    function getConstructorFunctionInstanceProperties(fnAst, members) {
-        forEachOwnNodeOfFunction(fnAst, function (node) {
-            if (ts.isAssignmentExpression(node, /*excludeCompoundAssignment*/ true) &&
-                ts.isPropertyAccessExpression(node.left) && node.left.expression.kind === 100 /* ThisKeyword */) {
-                var name_4 = node.left.name.text;
-                if (!ts.isJsPrivate(name_4)) {
-                    ts.getOrUpdate(members, name_4, function () { return ts.createProperty(/*decorators*/ undefined, /*modifiers*/ undefined, name_4, /*questionOrExclamationToken*/ undefined, anyType(), /*initializer*/ undefined); });
-                }
-            }
-        });
-    }
-    function getParametersAndReturnType(fnAst) {
-        if (typeof fnAst === "number") {
-            return { parameters: ts.fill(fnAst, function (i) { return makeParameter("p" + i, anyType()); }), returnType: anyType() };
-        }
-        var usedArguments = false, hasReturn = false;
-        forEachOwnNodeOfFunction(fnAst, function (node) {
-            usedArguments = usedArguments || ts.isIdentifier(node) && node.text === "arguments";
-            hasReturn = hasReturn || ts.isReturnStatement(node) && !!node.expression && node.expression.kind !== 200 /* VoidExpression */;
-        });
-        var parameters = fnAst.parameters.map(function (p) { return makeParameter("" + p.name.getText(), inferParameterType(fnAst, p)); }).concat((usedArguments ? [makeRestParameter()] : ts.emptyArray));
-        return { parameters: parameters, returnType: hasReturn ? anyType() : ts.createKeywordTypeNode(106 /* VoidKeyword */) };
-    }
-    function makeParameter(name, type) {
-        return ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, name, /*questionToken*/ undefined, type);
-    }
-    function makeRestParameter() {
-        return ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, ts.createToken(25 /* DotDotDotToken */), "args", /*questionToken*/ undefined, ts.createArrayTypeNode(anyType()));
-    }
-    /** Returns 'undefined' for class with no declared constructor */
-    function parseClassOrFunctionBody(source) {
-        if (typeof source === "number")
-            return source;
-        var classOrFunction = ts.tryCast(parseExpression(source), function (node) { return ts.isFunctionExpression(node) || ts.isArrowFunction(node) || ts.isClassExpression(node); });
-        return classOrFunction
-            ? ts.isClassExpression(classOrFunction) ? ts.find(classOrFunction.members, ts.isConstructorDeclaration) : classOrFunction
-            // If that didn't parse, it's a method `m() {}`. Parse again inside of an object literal.
-            : ts.cast(ts.first(ts.cast(parseExpression("{ " + source + " }"), ts.isObjectLiteralExpression).properties), ts.isMethodDeclaration);
-    }
-    function parseExpression(expr) {
-        var text = "const _ = " + expr;
-        var srcFile = ts.createSourceFile("test.ts", text, 7 /* Latest */, /*setParentNodes*/ true);
-        return ts.first(ts.cast(ts.first(srcFile.statements), ts.isVariableStatement).declarationList.declarations).initializer;
-    }
-    function inferParameterType(_fn, _param) {
-        // TODO: Inspect function body for clues (see inferFromUsage.ts)
-        return anyType();
-    }
-    // Descends through all nodes in a function, but not in nested functions.
-    function forEachOwnNodeOfFunction(fnAst, cb) {
-        fnAst.body.forEachChild(function recur(node) {
-            cb(node);
-            if (!ts.isFunctionLike(node))
-                node.forEachChild(recur);
-        });
-    }
-    function isValidIdentifier(name) {
-        var keyword = ts.stringToToken(name);
-        return !(keyword && ts.isNonContextualKeyword(keyword)) && ts.isIdentifierText(name, 7 /* ESNext */);
-    }
-    function addComment(node, comment) {
-        if (comment !== undefined)
-            ts.addSyntheticLeadingComment(node, 2 /* SingleLineCommentTrivia */, comment);
-        return node;
-    }
-    function anyType() {
-        return ts.createKeywordTypeNode(120 /* AnyKeyword */);
-    }
-    function createNamespace(modifiers, name, statements) {
-        return ts.createModuleDeclaration(/*decorators*/ undefined, modifiers, ts.createIdentifier(name), ts.createModuleBlock(statements), 16 /* Namespace */);
-    }
-})(ts || (ts = {}));
 /* @internal */
 var ts;
 (function (ts) {
@@ -116523,8 +120282,8 @@ var ts;
         });
         function getImportTypeNode(sourceFile, pos) {
             var token = ts.getTokenAtPosition(sourceFile, pos);
-            ts.Debug.assert(token.kind === 92 /* ImportKeyword */);
-            ts.Debug.assert(token.parent.kind === 183 /* ImportType */);
+            ts.Debug.assert(token.kind === 93 /* ImportKeyword */);
+            ts.Debug.assert(token.parent.kind === 184 /* ImportType */);
             return token.parent;
         }
         function doChange(changes, sourceFile, importType) {
@@ -116576,7 +120335,7 @@ var ts;
             var otherMembers = members.filter(function (member) { return !ts.isIndexSignatureDeclaration(member); });
             var parameter = ts.first(indexSignature.parameters);
             var mappedTypeParameter = ts.createTypeParameterDeclaration(ts.cast(parameter.name, ts.isIdentifier), parameter.type);
-            var mappedIntersectionType = ts.createMappedTypeNode(ts.hasReadonlyModifier(indexSignature) ? ts.createModifier(133 /* ReadonlyKeyword */) : undefined, mappedTypeParameter, indexSignature.questionToken, indexSignature.type);
+            var mappedIntersectionType = ts.createMappedTypeNode(ts.hasReadonlyModifier(indexSignature) ? ts.createModifier(134 /* ReadonlyKeyword */) : undefined, mappedTypeParameter, indexSignature.questionToken, indexSignature.type);
             var intersectionType = ts.createIntersectionTypeNode(ts.getAllSuperTypeNodes(container).concat([
                 mappedIntersectionType
             ], (otherMembers.length ? [ts.createTypeLiteralNode(otherMembers)] : ts.emptyArray)));
@@ -116586,6 +120345,49 @@ var ts;
 })(ts || (ts = {}));
 /* @internal */
 var ts;
+(function (ts) {
+    var codefix;
+    (function (codefix) {
+        var fixId = "removeUnnecessaryAwait";
+        var errorCodes = [
+            ts.Diagnostics.await_has_no_effect_on_the_type_of_this_expression.code,
+        ];
+        codefix.registerCodeFix({
+            errorCodes: errorCodes,
+            getCodeActions: function (context) {
+                var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return makeChange(t, context.sourceFile, context.span); });
+                if (changes.length > 0) {
+                    return [codefix.createCodeFixAction(fixId, changes, ts.Diagnostics.Remove_unnecessary_await, fixId, ts.Diagnostics.Remove_all_unnecessary_uses_of_await)];
+                }
+            },
+            fixIds: [fixId],
+            getAllCodeActions: function (context) {
+                return codefix.codeFixAll(context, errorCodes, function (changes, diag) { return makeChange(changes, diag.file, diag); });
+            },
+        });
+        function makeChange(changeTracker, sourceFile, span) {
+            var awaitKeyword = ts.tryCast(ts.getTokenAtPosition(sourceFile, span.start), function (node) { return node.kind === 123 /* AwaitKeyword */; });
+            var awaitExpression = awaitKeyword && ts.tryCast(awaitKeyword.parent, ts.isAwaitExpression);
+            if (!awaitExpression) {
+                return;
+            }
+            var expressionToReplace = awaitExpression;
+            var hasSurroundingParens = ts.isParenthesizedExpression(awaitExpression.parent);
+            if (hasSurroundingParens) {
+                var leftMostExpression = ts.getLeftmostExpression(awaitExpression.expression, /*stopAtCallExpressions*/ false);
+                if (ts.isIdentifier(leftMostExpression)) {
+                    var precedingToken = ts.findPrecedingToken(awaitExpression.parent.pos, sourceFile);
+                    if (precedingToken && precedingToken.kind !== 96 /* NewKeyword */) {
+                        expressionToReplace = awaitExpression.parent;
+                    }
+                }
+            }
+            changeTracker.replaceNode(sourceFile, expressionToReplace, awaitExpression.expression);
+        }
+    })(codefix = ts.codefix || (ts.codefix = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
 (function (ts) {
     var refactor;
     (function (refactor) {
@@ -116623,16 +120425,16 @@ var ts;
                 return undefined;
             }
             switch (exportNode.kind) {
-                case 239 /* FunctionDeclaration */:
-                case 240 /* ClassDeclaration */:
-                case 241 /* InterfaceDeclaration */:
-                case 243 /* EnumDeclaration */:
-                case 242 /* TypeAliasDeclaration */:
-                case 244 /* ModuleDeclaration */: {
+                case 240 /* FunctionDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 242 /* InterfaceDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
+                case 245 /* ModuleDeclaration */: {
                     var node = exportNode;
                     return node.name && ts.isIdentifier(node.name) ? { exportNode: node, exportName: node.name, wasDefault: wasDefault, exportingModuleSymbol: exportingModuleSymbol } : undefined;
                 }
-                case 219 /* VariableStatement */: {
+                case 220 /* VariableStatement */: {
                     var vs = exportNode;
                     // Must be `export const x = something;`.
                     if (!(vs.declarationList.flags & 2 /* Const */) || vs.declarationList.declarations.length !== 1) {
@@ -116655,17 +120457,17 @@ var ts;
         function changeExport(exportingSourceFile, _a, changes, checker) {
             var wasDefault = _a.wasDefault, exportNode = _a.exportNode, exportName = _a.exportName;
             if (wasDefault) {
-                changes.delete(exportingSourceFile, ts.Debug.assertDefined(ts.findModifier(exportNode, 80 /* DefaultKeyword */)));
+                changes.delete(exportingSourceFile, ts.Debug.assertDefined(ts.findModifier(exportNode, 81 /* DefaultKeyword */)));
             }
             else {
-                var exportKeyword = ts.Debug.assertDefined(ts.findModifier(exportNode, 85 /* ExportKeyword */));
+                var exportKeyword = ts.Debug.assertDefined(ts.findModifier(exportNode, 86 /* ExportKeyword */));
                 switch (exportNode.kind) {
-                    case 239 /* FunctionDeclaration */:
-                    case 240 /* ClassDeclaration */:
-                    case 241 /* InterfaceDeclaration */:
-                        changes.insertNodeAfter(exportingSourceFile, exportKeyword, ts.createToken(80 /* DefaultKeyword */));
+                    case 240 /* FunctionDeclaration */:
+                    case 241 /* ClassDeclaration */:
+                    case 242 /* InterfaceDeclaration */:
+                        changes.insertNodeAfter(exportingSourceFile, exportKeyword, ts.createToken(81 /* DefaultKeyword */));
                         break;
-                    case 219 /* VariableStatement */:
+                    case 220 /* VariableStatement */:
                         // If 'x' isn't used in this file, `export const x = 0;` --> `export default 0;`
                         if (!ts.FindAllReferences.Core.isSymbolReferencedInFile(exportName, checker, exportingSourceFile)) {
                             // We checked in `getInfo` that an initializer exists.
@@ -116673,9 +120475,9 @@ var ts;
                             break;
                         }
                     // falls through
-                    case 243 /* EnumDeclaration */:
-                    case 242 /* TypeAliasDeclaration */:
-                    case 244 /* ModuleDeclaration */:
+                    case 244 /* EnumDeclaration */:
+                    case 243 /* TypeAliasDeclaration */:
+                    case 245 /* ModuleDeclaration */:
                         // `export type T = number;` -> `type T = number; export default T;`
                         changes.deleteModifier(exportingSourceFile, exportKeyword);
                         changes.insertNodeAfter(exportingSourceFile, exportNode, ts.createExportDefault(ts.createIdentifier(exportName.text)));
@@ -116702,18 +120504,18 @@ var ts;
         function changeDefaultToNamedImport(importingSourceFile, ref, changes, exportName) {
             var parent = ref.parent;
             switch (parent.kind) {
-                case 189 /* PropertyAccessExpression */:
+                case 190 /* PropertyAccessExpression */:
                     // `a.default` --> `a.foo`
                     changes.replaceNode(importingSourceFile, ref, ts.createIdentifier(exportName));
                     break;
-                case 253 /* ImportSpecifier */:
-                case 257 /* ExportSpecifier */: {
+                case 254 /* ImportSpecifier */:
+                case 258 /* ExportSpecifier */: {
                     var spec = parent;
                     // `default as foo` --> `foo`, `default as bar` --> `foo as bar`
                     changes.replaceNode(importingSourceFile, spec, makeImportSpecifier(exportName, spec.name.text));
                     break;
                 }
-                case 250 /* ImportClause */: {
+                case 251 /* ImportClause */: {
                     var clause = parent;
                     ts.Debug.assert(clause.name === ref);
                     var spec = makeImportSpecifier(exportName, ref.text);
@@ -116722,7 +120524,7 @@ var ts;
                         // `import foo from "./a";` --> `import { foo } from "./a";`
                         changes.replaceNode(importingSourceFile, ref, ts.createNamedImports([spec]));
                     }
-                    else if (namedBindings.kind === 251 /* NamespaceImport */) {
+                    else if (namedBindings.kind === 252 /* NamespaceImport */) {
                         // `import foo, * as a from "./a";` --> `import * as a from ".a/"; import { foo } from "./a";`
                         changes.deleteRange(importingSourceFile, { pos: ref.getStart(importingSourceFile), end: namedBindings.getStart(importingSourceFile) });
                         var quotePreference = ts.isStringLiteral(clause.parent.moduleSpecifier) ? ts.quotePreferenceFromString(clause.parent.moduleSpecifier, importingSourceFile) : 1 /* Double */;
@@ -116743,11 +120545,11 @@ var ts;
         function changeNamedToDefaultImport(importingSourceFile, ref, changes) {
             var parent = ref.parent;
             switch (parent.kind) {
-                case 189 /* PropertyAccessExpression */:
+                case 190 /* PropertyAccessExpression */:
                     // `a.foo` --> `a.default`
                     changes.replaceNode(importingSourceFile, ref, ts.createIdentifier("default"));
                     break;
-                case 253 /* ImportSpecifier */: {
+                case 254 /* ImportSpecifier */: {
                     // `import { foo } from "./a";` --> `import foo from "./a";`
                     // `import { foo as bar } from "./a";` --> `import bar from "./a";`
                     var defaultImport = ts.createIdentifier(parent.name.text);
@@ -116760,7 +120562,7 @@ var ts;
                     }
                     break;
                 }
-                case 257 /* ExportSpecifier */: {
+                case 258 /* ExportSpecifier */: {
                     // `export { foo } from "./a";` --> `export { default as foo } from "./a";`
                     // `export { foo as bar } from "./a";` --> `export { default as bar } from "./a";`
                     // `export { foo as default } from "./a";` --> `export { default } from "./a";`
@@ -116793,8 +120595,8 @@ var ts;
                 var i = getImportToConvert(context);
                 if (!i)
                     return ts.emptyArray;
-                var description = i.kind === 251 /* NamespaceImport */ ? ts.Diagnostics.Convert_namespace_import_to_named_imports.message : ts.Diagnostics.Convert_named_imports_to_namespace_import.message;
-                var actionName = i.kind === 251 /* NamespaceImport */ ? actionNameNamespaceToNamed : actionNameNamedToNamespace;
+                var description = i.kind === 252 /* NamespaceImport */ ? ts.Diagnostics.Convert_namespace_import_to_named_imports.message : ts.Diagnostics.Convert_named_imports_to_namespace_import.message;
+                var actionName = i.kind === 252 /* NamespaceImport */ ? actionNameNamespaceToNamed : actionNameNamedToNamespace;
                 return [{ name: refactorName, description: description, actions: [{ name: actionName, description: description }] }];
             },
             getEditsForAction: function (context, actionName) {
@@ -116816,7 +120618,7 @@ var ts;
         }
         function doChange(sourceFile, program, changes, toConvert) {
             var checker = program.getTypeChecker();
-            if (toConvert.kind === 251 /* NamespaceImport */) {
+            if (toConvert.kind === 252 /* NamespaceImport */) {
                 doChangeNamespaceToNamed(sourceFile, checker, changes, toConvert, ts.getAllowSyntheticDefaultImports(program.getCompilerOptions()));
             }
             else {
@@ -116868,7 +120670,7 @@ var ts;
         function doChangeNamedToNamespace(sourceFile, checker, changes, toConvert) {
             var importDecl = toConvert.parent.parent;
             var moduleSpecifier = importDecl.moduleSpecifier;
-            var preferredName = moduleSpecifier && ts.isStringLiteral(moduleSpecifier) ? ts.codefix.moduleSpecifierToValidIdentifier(moduleSpecifier.text, 7 /* ESNext */) : "module";
+            var preferredName = moduleSpecifier && ts.isStringLiteral(moduleSpecifier) ? ts.codefix.moduleSpecifierToValidIdentifier(moduleSpecifier.text, 99 /* ESNext */) : "module";
             var namespaceNameConflicts = toConvert.elements.some(function (element) {
                 return ts.FindAllReferences.Core.eachSymbolReferenceInFile(element.name, checker, sourceFile, function (id) {
                     return !!checker.resolveName(preferredName, id, 67108863 /* All */, /*excludeGlobals*/ true);
@@ -117159,20 +120961,20 @@ var ts;
                 function checkForStaticContext(nodeToCheck, containingClass) {
                     var current = nodeToCheck;
                     while (current !== containingClass) {
-                        if (current.kind === 154 /* PropertyDeclaration */) {
+                        if (current.kind === 155 /* PropertyDeclaration */) {
                             if (ts.hasModifier(current, 32 /* Static */)) {
                                 rangeFacts |= RangeFacts.InStaticRegion;
                             }
                             break;
                         }
-                        else if (current.kind === 151 /* Parameter */) {
+                        else if (current.kind === 152 /* Parameter */) {
                             var ctorOrMethod = ts.getContainingFunction(current);
-                            if (ctorOrMethod.kind === 157 /* Constructor */) {
+                            if (ctorOrMethod.kind === 158 /* Constructor */) {
                                 rangeFacts |= RangeFacts.InStaticRegion;
                             }
                             break;
                         }
-                        else if (current.kind === 156 /* MethodDeclaration */) {
+                        else if (current.kind === 157 /* MethodDeclaration */) {
                             if (ts.hasModifier(current, 32 /* Static */)) {
                                 rangeFacts |= RangeFacts.InStaticRegion;
                             }
@@ -117215,7 +121017,7 @@ var ts;
                             return true;
                         }
                         if (ts.isDeclaration(node)) {
-                            var declaringNode = (node.kind === 237 /* VariableDeclaration */) ? node.parent.parent : node;
+                            var declaringNode = (node.kind === 238 /* VariableDeclaration */) ? node.parent.parent : node;
                             if (ts.hasModifier(declaringNode, 1 /* Export */)) {
                                 // TODO: GH#18217 Silly to use `errors ||` since it's definitely not defined (see top of `visit`)
                                 // Also, if we're only pushing one error, just use `let error: Diagnostic | undefined`!
@@ -117227,13 +121029,13 @@ var ts;
                         }
                         // Some things can't be extracted in certain situations
                         switch (node.kind) {
-                            case 249 /* ImportDeclaration */:
+                            case 250 /* ImportDeclaration */:
                                 (errors || (errors = [])).push(ts.createDiagnosticForNode(node, Messages.cannotExtractImport));
                                 return true;
-                            case 98 /* SuperKeyword */:
+                            case 99 /* SuperKeyword */:
                                 // For a super *constructor call*, we have to be extracting the entire class,
                                 // but a super *method call* simply implies a 'this' reference
-                                if (node.parent.kind === 191 /* CallExpression */) {
+                                if (node.parent.kind === 192 /* CallExpression */) {
                                     // Super constructor call
                                     var containingClass_1 = ts.getContainingClass(node); // TODO:GH#18217
                                     if (containingClass_1.pos < span.start || containingClass_1.end >= (span.start + span.length)) {
@@ -117248,8 +121050,8 @@ var ts;
                         }
                         if (ts.isFunctionLikeDeclaration(node) || ts.isClassLike(node)) {
                             switch (node.kind) {
-                                case 239 /* FunctionDeclaration */:
-                                case 240 /* ClassDeclaration */:
+                                case 240 /* FunctionDeclaration */:
+                                case 241 /* ClassDeclaration */:
                                     if (ts.isSourceFile(node.parent) && node.parent.externalModuleIndicator === undefined) {
                                         // You cannot extract global declarations
                                         (errors || (errors = [])).push(ts.createDiagnosticForNode(node, Messages.functionWillNotBeVisibleInTheNewScope));
@@ -117261,20 +121063,20 @@ var ts;
                         }
                         var savedPermittedJumps = permittedJumps;
                         switch (node.kind) {
-                            case 222 /* IfStatement */:
+                            case 223 /* IfStatement */:
                                 permittedJumps = 0 /* None */;
                                 break;
-                            case 235 /* TryStatement */:
+                            case 236 /* TryStatement */:
                                 // forbid all jumps inside try blocks
                                 permittedJumps = 0 /* None */;
                                 break;
-                            case 218 /* Block */:
-                                if (node.parent && node.parent.kind === 235 /* TryStatement */ && node.parent.finallyBlock === node) {
+                            case 219 /* Block */:
+                                if (node.parent && node.parent.kind === 236 /* TryStatement */ && node.parent.finallyBlock === node) {
                                     // allow unconditional returns from finally blocks
                                     permittedJumps = 4 /* Return */;
                                 }
                                 break;
-                            case 271 /* CaseClause */:
+                            case 272 /* CaseClause */:
                                 // allow unlabeled break inside case clauses
                                 permittedJumps |= 1 /* Break */;
                                 break;
@@ -117286,19 +121088,19 @@ var ts;
                                 break;
                         }
                         switch (node.kind) {
-                            case 178 /* ThisType */:
-                            case 100 /* ThisKeyword */:
+                            case 179 /* ThisType */:
+                            case 101 /* ThisKeyword */:
                                 rangeFacts |= RangeFacts.UsesThis;
                                 break;
-                            case 233 /* LabeledStatement */: {
+                            case 234 /* LabeledStatement */: {
                                 var label = node.label;
                                 (seenLabels || (seenLabels = [])).push(label.escapedText);
                                 ts.forEachChild(node, visit);
                                 seenLabels.pop();
                                 break;
                             }
-                            case 229 /* BreakStatement */:
-                            case 228 /* ContinueStatement */: {
+                            case 230 /* BreakStatement */:
+                            case 229 /* ContinueStatement */: {
                                 var label = node.label;
                                 if (label) {
                                     if (!ts.contains(seenLabels, label.escapedText)) {
@@ -117307,20 +121109,20 @@ var ts;
                                     }
                                 }
                                 else {
-                                    if (!(permittedJumps & (node.kind === 229 /* BreakStatement */ ? 1 /* Break */ : 2 /* Continue */))) {
+                                    if (!(permittedJumps & (node.kind === 230 /* BreakStatement */ ? 1 /* Break */ : 2 /* Continue */))) {
                                         // attempt to break or continue in a forbidden context
                                         (errors || (errors = [])).push(ts.createDiagnosticForNode(node, Messages.cannotExtractRangeContainingConditionalBreakOrContinueStatements));
                                     }
                                 }
                                 break;
                             }
-                            case 201 /* AwaitExpression */:
+                            case 202 /* AwaitExpression */:
                                 rangeFacts |= RangeFacts.IsAsyncFunction;
                                 break;
-                            case 207 /* YieldExpression */:
+                            case 208 /* YieldExpression */:
                                 rangeFacts |= RangeFacts.IsGenerator;
                                 break;
-                            case 230 /* ReturnStatement */:
+                            case 231 /* ReturnStatement */:
                                 if (permittedJumps & 4 /* Return */) {
                                     rangeFacts |= RangeFacts.HasReturn;
                                 }
@@ -117374,7 +121176,7 @@ var ts;
                 while (true) {
                     current = current.parent;
                     // A function parameter's initializer is actually in the outer scope, not the function declaration
-                    if (current.kind === 151 /* Parameter */) {
+                    if (current.kind === 152 /* Parameter */) {
                         // Skip all the way to the outer scope of the function that declared this parameter
                         current = ts.findAncestor(current, function (parent) { return ts.isFunctionLikeDeclaration(parent); }).parent;
                     }
@@ -117385,7 +121187,7 @@ var ts;
                     //  * Module/namespace or source file
                     if (isScope(current)) {
                         scopes.push(current);
-                        if (current.kind === 284 /* SourceFile */) {
+                        if (current.kind === 285 /* SourceFile */) {
                             return scopes;
                         }
                     }
@@ -117475,32 +121277,32 @@ var ts;
             }
             function getDescriptionForFunctionLikeDeclaration(scope) {
                 switch (scope.kind) {
-                    case 157 /* Constructor */:
+                    case 158 /* Constructor */:
                         return "constructor";
-                    case 196 /* FunctionExpression */:
-                    case 239 /* FunctionDeclaration */:
+                    case 197 /* FunctionExpression */:
+                    case 240 /* FunctionDeclaration */:
                         return scope.name
                             ? "function '" + scope.name.text + "'"
                             : "anonymous function";
-                    case 197 /* ArrowFunction */:
+                    case 198 /* ArrowFunction */:
                         return "arrow function";
-                    case 156 /* MethodDeclaration */:
+                    case 157 /* MethodDeclaration */:
                         return "method '" + scope.name.getText() + "'";
-                    case 158 /* GetAccessor */:
+                    case 159 /* GetAccessor */:
                         return "'get " + scope.name.getText() + "'";
-                    case 159 /* SetAccessor */:
+                    case 160 /* SetAccessor */:
                         return "'set " + scope.name.getText() + "'";
                     default:
                         throw ts.Debug.assertNever(scope);
                 }
             }
             function getDescriptionForClassLikeDeclaration(scope) {
-                return scope.kind === 240 /* ClassDeclaration */
+                return scope.kind === 241 /* ClassDeclaration */
                     ? scope.name ? "class '" + scope.name.text + "'" : "anonymous class declaration"
                     : scope.name ? "class expression '" + scope.name.text + "'" : "anonymous class expression";
             }
             function getDescriptionForModuleLikeDeclaration(scope) {
-                return scope.kind === 245 /* ModuleBlock */
+                return scope.kind === 246 /* ModuleBlock */
                     ? "namespace '" + scope.parent.name.getText() + "'"
                     : scope.externalModuleIndicator ? 0 /* Module */ : 1 /* Global */;
             }
@@ -117566,12 +121368,12 @@ var ts;
                 var newFunction;
                 if (ts.isClassLike(scope)) {
                     // always create private method in TypeScript files
-                    var modifiers = isJS ? [] : [ts.createToken(113 /* PrivateKeyword */)];
+                    var modifiers = isJS ? [] : [ts.createToken(114 /* PrivateKeyword */)];
                     if (range.facts & RangeFacts.InStaticRegion) {
-                        modifiers.push(ts.createToken(116 /* StaticKeyword */));
+                        modifiers.push(ts.createToken(117 /* StaticKeyword */));
                     }
                     if (range.facts & RangeFacts.IsAsyncFunction) {
-                        modifiers.push(ts.createToken(121 /* AsyncKeyword */));
+                        modifiers.push(ts.createToken(122 /* AsyncKeyword */));
                     }
                     newFunction = ts.createMethod(
                     /*decorators*/ undefined, modifiers.length ? modifiers : undefined, range.facts & RangeFacts.IsGenerator ? ts.createToken(40 /* AsteriskToken */) : undefined, functionName, 
@@ -117579,7 +121381,7 @@ var ts;
                 }
                 else {
                     newFunction = ts.createFunctionDeclaration(
-                    /*decorators*/ undefined, range.facts & RangeFacts.IsAsyncFunction ? [ts.createToken(121 /* AsyncKeyword */)] : undefined, range.facts & RangeFacts.IsGenerator ? ts.createToken(40 /* AsteriskToken */) : undefined, functionName, typeParameters, parameters, returnType, body);
+                    /*decorators*/ undefined, range.facts & RangeFacts.IsAsyncFunction ? [ts.createToken(122 /* AsyncKeyword */)] : undefined, range.facts & RangeFacts.IsGenerator ? ts.createToken(40 /* AsteriskToken */) : undefined, functionName, typeParameters, parameters, returnType, body);
                 }
                 var changeTracker = ts.textChanges.ChangeTracker.fromContext(context);
                 var minInsertionPos = (isReadonlyArray(range.range) ? ts.last(range.range) : range.range).end;
@@ -117720,9 +121522,9 @@ var ts;
                     while (ts.isParenthesizedTypeNode(withoutParens)) {
                         withoutParens = withoutParens.type;
                     }
-                    return ts.isUnionTypeNode(withoutParens) && ts.find(withoutParens.types, function (t) { return t.kind === 141 /* UndefinedKeyword */; })
+                    return ts.isUnionTypeNode(withoutParens) && ts.find(withoutParens.types, function (t) { return t.kind === 142 /* UndefinedKeyword */; })
                         ? clone
-                        : ts.createUnionTypeNode([clone, ts.createKeywordTypeNode(141 /* UndefinedKeyword */)]);
+                        : ts.createUnionTypeNode([clone, ts.createKeywordTypeNode(142 /* UndefinedKeyword */)]);
                 }
             }
             /**
@@ -117745,11 +121547,11 @@ var ts;
                 if (ts.isClassLike(scope)) {
                     ts.Debug.assert(!isJS); // See CannotExtractToJSClass
                     var modifiers = [];
-                    modifiers.push(ts.createToken(113 /* PrivateKeyword */));
+                    modifiers.push(ts.createToken(114 /* PrivateKeyword */));
                     if (rangeFacts & RangeFacts.InStaticRegion) {
-                        modifiers.push(ts.createToken(116 /* StaticKeyword */));
+                        modifiers.push(ts.createToken(117 /* StaticKeyword */));
                     }
-                    modifiers.push(ts.createToken(133 /* ReadonlyKeyword */));
+                    modifiers.push(ts.createToken(134 /* ReadonlyKeyword */));
                     var newVariable = ts.createProperty(
                     /*decorators*/ undefined, modifiers, localNameText, 
                     /*questionToken*/ undefined, variableType, initializer);
@@ -117778,7 +121580,7 @@ var ts;
                         var localReference = ts.createIdentifier(localNameText);
                         changeTracker.replaceNode(context.file, node, localReference);
                     }
-                    else if (node.parent.kind === 221 /* ExpressionStatement */ && scope === ts.findAncestor(node, isScope)) {
+                    else if (node.parent.kind === 222 /* ExpressionStatement */ && scope === ts.findAncestor(node, isScope)) {
                         // If the parent is an expression statement and the target scope is the immediately enclosing one,
                         // replace the statement with the declaration.
                         var newVariableStatement = ts.createVariableStatement(
@@ -117797,7 +121599,7 @@ var ts;
                             changeTracker.insertNodeBefore(context.file, nodeToInsertBefore, newVariableStatement, /*blankLineBetween*/ false);
                         }
                         // Consume
-                        if (node.parent.kind === 221 /* ExpressionStatement */) {
+                        if (node.parent.kind === 222 /* ExpressionStatement */) {
                             // If the parent is an expression statement, delete it.
                             changeTracker.delete(context.file, node.parent);
                         }
@@ -117884,7 +121686,7 @@ var ts;
                     return { body: ts.createBlock(statements, /*multiLine*/ true), returnValueProperty: undefined };
                 }
                 function visitor(node) {
-                    if (!ignoreReturns && node.kind === 230 /* ReturnStatement */ && hasWritesOrVariableDeclarations) {
+                    if (!ignoreReturns && node.kind === 231 /* ReturnStatement */ && hasWritesOrVariableDeclarations) {
                         var assignments = getPropertyAssignmentsForWritesAndVariableDeclarations(exposedVariableDeclarations, writes);
                         if (node.expression) {
                             if (!returnValueProperty) {
@@ -118062,7 +121864,7 @@ var ts;
                     var scope = scopes_1[_i];
                     usagesPerScope.push({ usages: ts.createMap(), typeParameterUsages: ts.createMap(), substitutions: ts.createMap() });
                     substitutionsPerScope.push(ts.createMap());
-                    functionErrorsPerScope.push(ts.isFunctionLikeDeclaration(scope) && scope.kind !== 239 /* FunctionDeclaration */
+                    functionErrorsPerScope.push(ts.isFunctionLikeDeclaration(scope) && scope.kind !== 240 /* FunctionDeclaration */
                         ? [ts.createDiagnosticForNode(scope, Messages.cannotExtractToOtherFunctionLike)]
                         : []);
                     var constantErrors = [];
@@ -118378,30 +122180,30 @@ var ts;
             function isExtractableExpression(node) {
                 var parent = node.parent;
                 switch (parent.kind) {
-                    case 278 /* EnumMember */:
+                    case 279 /* EnumMember */:
                         return false;
                 }
                 switch (node.kind) {
                     case 10 /* StringLiteral */:
-                        return parent.kind !== 249 /* ImportDeclaration */ &&
-                            parent.kind !== 253 /* ImportSpecifier */;
-                    case 208 /* SpreadElement */:
-                    case 184 /* ObjectBindingPattern */:
-                    case 186 /* BindingElement */:
+                        return parent.kind !== 250 /* ImportDeclaration */ &&
+                            parent.kind !== 254 /* ImportSpecifier */;
+                    case 209 /* SpreadElement */:
+                    case 185 /* ObjectBindingPattern */:
+                    case 187 /* BindingElement */:
                         return false;
-                    case 72 /* Identifier */:
-                        return parent.kind !== 186 /* BindingElement */ &&
-                            parent.kind !== 253 /* ImportSpecifier */ &&
-                            parent.kind !== 257 /* ExportSpecifier */;
+                    case 73 /* Identifier */:
+                        return parent.kind !== 187 /* BindingElement */ &&
+                            parent.kind !== 254 /* ImportSpecifier */ &&
+                            parent.kind !== 258 /* ExportSpecifier */;
                 }
                 return true;
             }
             function isBlockLike(node) {
                 switch (node.kind) {
-                    case 218 /* Block */:
-                    case 284 /* SourceFile */:
-                    case 245 /* ModuleBlock */:
-                    case 271 /* CaseClause */:
+                    case 219 /* Block */:
+                    case 285 /* SourceFile */:
+                    case 246 /* ModuleBlock */:
+                    case 272 /* CaseClause */:
                         return true;
                     default:
                         return false;
@@ -118412,6 +122214,136 @@ var ts;
 })(ts || (ts = {}));
 /* @internal */
 var ts;
+(function (ts) {
+    var refactor;
+    (function (refactor) {
+        var refactorName = "Extract type";
+        var extractToTypeAlias = "Extract to type alias";
+        var extractToTypeDef = "Extract to typedef";
+        refactor.registerRefactor(refactorName, {
+            getAvailableActions: function (context) {
+                var info = getRangeToExtract(context);
+                if (!info)
+                    return ts.emptyArray;
+                return [{
+                        name: refactorName,
+                        description: ts.getLocaleSpecificMessage(ts.Diagnostics.Extract_type),
+                        actions: [info.isJS ? {
+                                name: extractToTypeDef, description: ts.getLocaleSpecificMessage(ts.Diagnostics.Extract_to_typedef)
+                            } : {
+                                name: extractToTypeAlias, description: ts.getLocaleSpecificMessage(ts.Diagnostics.Extract_to_type_alias)
+                            }]
+                    }];
+            },
+            getEditsForAction: function (context, actionName) {
+                ts.Debug.assert(actionName === extractToTypeAlias || actionName === extractToTypeDef);
+                var file = context.file;
+                var info = ts.Debug.assertDefined(getRangeToExtract(context));
+                ts.Debug.assert(actionName === extractToTypeAlias && !info.isJS || actionName === extractToTypeDef && info.isJS);
+                var name = ts.getUniqueName("NewType", file);
+                var edits = ts.textChanges.ChangeTracker.with(context, function (changes) { return info.isJS ?
+                    doTypedefChange(changes, file, name, info.firstStatement, info.selection, info.typeParameters) :
+                    doTypeAliasChange(changes, file, name, info.firstStatement, info.selection, info.typeParameters); });
+                var renameFilename = file.fileName;
+                var renameLocation = ts.getRenameLocation(edits, renameFilename, name, /*preferLastLocation*/ false);
+                return { edits: edits, renameFilename: renameFilename, renameLocation: renameLocation };
+            }
+        });
+        function getRangeToExtract(context) {
+            var file = context.file, startPosition = context.startPosition;
+            var isJS = ts.isSourceFileJS(file);
+            var current = ts.getTokenAtPosition(file, startPosition);
+            var range = ts.createTextRangeFromSpan(ts.getRefactorContextSpan(context));
+            var selection = ts.findAncestor(current, (function (node) { return node.parent && rangeContainsSkipTrivia(range, node, file) && !rangeContainsSkipTrivia(range, node.parent, file); }));
+            if (!selection || !ts.isTypeNode(selection))
+                return undefined;
+            var checker = context.program.getTypeChecker();
+            var firstStatement = ts.Debug.assertDefined(isJS ? ts.findAncestor(selection, isStatementAndHasJSDoc) : ts.findAncestor(selection, ts.isStatement));
+            var typeParameters = collectTypeParameters(checker, selection, firstStatement, file);
+            if (!typeParameters)
+                return undefined;
+            return { isJS: isJS, selection: selection, firstStatement: firstStatement, typeParameters: typeParameters };
+        }
+        function isStatementAndHasJSDoc(n) {
+            return ts.isStatement(n) && ts.hasJSDocNodes(n);
+        }
+        function rangeContainsSkipTrivia(r1, node, file) {
+            return ts.rangeContainsStartEnd(r1, ts.skipTrivia(file.text, node.pos), node.end);
+        }
+        function collectTypeParameters(checker, selection, statement, file) {
+            var result = [];
+            return visitor(selection) ? undefined : result;
+            function visitor(node) {
+                if (ts.isTypeReferenceNode(node)) {
+                    if (ts.isIdentifier(node.typeName)) {
+                        var symbol = checker.resolveName(node.typeName.text, node.typeName, 262144 /* TypeParameter */, /* excludeGlobals */ true);
+                        if (symbol) {
+                            var declaration = ts.cast(ts.first(symbol.declarations), ts.isTypeParameterDeclaration);
+                            if (rangeContainsSkipTrivia(statement, declaration, file) && !rangeContainsSkipTrivia(selection, declaration, file)) {
+                                result.push(declaration);
+                            }
+                        }
+                    }
+                }
+                else if (ts.isInferTypeNode(node)) {
+                    var conditionalTypeNode = ts.findAncestor(node, function (n) { return ts.isConditionalTypeNode(n) && rangeContainsSkipTrivia(n.extendsType, node, file); });
+                    if (!conditionalTypeNode || !rangeContainsSkipTrivia(selection, conditionalTypeNode, file)) {
+                        return true;
+                    }
+                }
+                else if ((ts.isTypePredicateNode(node) || ts.isThisTypeNode(node))) {
+                    var functionLikeNode = ts.findAncestor(node.parent, ts.isFunctionLike);
+                    if (functionLikeNode && functionLikeNode.type && rangeContainsSkipTrivia(functionLikeNode.type, node, file) && !rangeContainsSkipTrivia(selection, functionLikeNode, file)) {
+                        return true;
+                    }
+                }
+                else if (ts.isTypeQueryNode(node)) {
+                    if (ts.isIdentifier(node.exprName)) {
+                        var symbol = checker.resolveName(node.exprName.text, node.exprName, 67220415 /* Value */, /* excludeGlobals */ false);
+                        if (symbol && rangeContainsSkipTrivia(statement, symbol.valueDeclaration, file) && !rangeContainsSkipTrivia(selection, symbol.valueDeclaration, file)) {
+                            return true;
+                        }
+                    }
+                    else {
+                        if (ts.isThisIdentifier(node.exprName.left) && !rangeContainsSkipTrivia(selection, node.parent, file)) {
+                            return true;
+                        }
+                    }
+                }
+                return ts.forEachChild(node, visitor);
+            }
+        }
+        function doTypeAliasChange(changes, file, name, firstStatement, selection, typeParameters) {
+            var newTypeNode = ts.createTypeAliasDeclaration(
+            /* decorators */ undefined, 
+            /* modifiers */ undefined, name, typeParameters.map(function (id) { return ts.updateTypeParameterDeclaration(id, id.name, id.constraint, /* defaultType */ undefined); }), selection);
+            changes.insertNodeBefore(file, firstStatement, newTypeNode, /* blankLineBetween */ true);
+            changes.replaceNode(file, selection, ts.createTypeReferenceNode(name, typeParameters.map(function (id) { return ts.createTypeReferenceNode(id.name, /* typeArguments */ undefined); })));
+        }
+        function doTypedefChange(changes, file, name, firstStatement, selection, typeParameters) {
+            var node = ts.createNode(311 /* JSDocTypedefTag */);
+            node.tagName = ts.createIdentifier("typedef"); // TODO: jsdoc factory https://github.com/Microsoft/TypeScript/pull/29539
+            node.fullName = ts.createIdentifier(name);
+            node.name = node.fullName;
+            node.typeExpression = ts.createJSDocTypeExpression(selection);
+            var templates = [];
+            ts.forEach(typeParameters, function (typeParameter) {
+                var constraint = ts.getEffectiveConstraintOfTypeParameter(typeParameter);
+                var template = ts.createNode(310 /* JSDocTemplateTag */);
+                template.tagName = ts.createIdentifier("template");
+                template.constraint = constraint && ts.cast(constraint, ts.isJSDocTypeExpression);
+                var parameter = ts.createNode(151 /* TypeParameter */);
+                parameter.name = typeParameter.name;
+                template.typeParameters = ts.createNodeArray([parameter]);
+                templates.push(template);
+            });
+            changes.insertNodeBefore(file, firstStatement, ts.createJSDocComment(/* comment */ undefined, ts.createNodeArray(ts.concatenate(templates, [node]))), /* blankLineBetween */ true);
+            changes.replaceNode(file, selection, ts.createTypeReferenceNode(name, typeParameters.map(function (id) { return ts.createTypeReferenceNode(id.name, /* typeArguments */ undefined); })));
+        }
+    })(refactor = ts.refactor || (ts.refactor = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
 (function (ts) {
     var refactor;
     (function (refactor) {
@@ -118450,10 +122382,10 @@ var ts;
                 var modifierFlags = ts.getModifierFlags(declaration) & ~64 /* Readonly */;
                 var accessorModifiers = isInClassLike
                     ? !modifierFlags || modifierFlags & 8 /* Private */
-                        ? getModifiers(isJS, isStatic, 115 /* PublicKeyword */)
+                        ? getModifiers(isJS, isStatic, 116 /* PublicKeyword */)
                         : ts.createNodeArray(ts.createModifiersFromModifierFlags(modifierFlags))
                     : undefined;
-                var fieldModifiers = isInClassLike ? getModifiers(isJS, isStatic, 113 /* PrivateKeyword */) : undefined;
+                var fieldModifiers = isInClassLike ? getModifiers(isJS, isStatic, 114 /* PrivateKeyword */) : undefined;
                 updateFieldDeclaration(changeTracker, file, declaration, fieldName, fieldModifiers);
                 var getAccessor = generateGetAccessor(fieldName, accessorName, type, accessorModifiers, isStatic, container);
                 ts.suppressLeadingAndTrailingTrivia(getAccessor);
@@ -118491,7 +122423,7 @@ var ts;
                 return ts.isIdentifier(fieldName) ? ts.createPropertyAccess(leftHead, fieldName) : ts.createElementAccess(leftHead, ts.createLiteral(fieldName));
             }
             function getModifiers(isJS, isStatic, accessModifier) {
-                var modifiers = ts.append(!isJS ? [ts.createToken(accessModifier)] : undefined, isStatic ? ts.createToken(116 /* StaticKeyword */) : undefined);
+                var modifiers = ts.append(!isJS ? [ts.createToken(accessModifier)] : undefined, isStatic ? ts.createToken(117 /* StaticKeyword */) : undefined);
                 return modifiers && ts.createNodeArray(modifiers);
             }
             function startsWithUnderscore(name) {
@@ -118514,7 +122446,7 @@ var ts;
                     isStatic: ts.hasStaticModifier(declaration),
                     isReadonly: ts.hasReadonlyModifier(declaration),
                     type: ts.getTypeAnnotationNode(declaration),
-                    container: declaration.kind === 151 /* Parameter */ ? declaration.parent.parent : declaration.parent,
+                    container: declaration.kind === 152 /* Parameter */ ? declaration.parent.parent : declaration.parent,
                     originalName: declaration.name.text,
                     declaration: declaration,
                     fieldName: fieldName,
@@ -118571,13 +122503,13 @@ var ts;
                     return;
                 constructor.body.forEachChild(function recur(node) {
                     if (ts.isElementAccessExpression(node) &&
-                        node.expression.kind === 100 /* ThisKeyword */ &&
+                        node.expression.kind === 101 /* ThisKeyword */ &&
                         ts.isStringLiteral(node.argumentExpression) &&
                         node.argumentExpression.text === originalName &&
                         ts.isWriteAccess(node)) {
                         changeTracker.replaceNode(file, node.argumentExpression, ts.createStringLiteral(fieldName));
                     }
-                    if (ts.isPropertyAccessExpression(node) && node.expression.kind === 100 /* ThisKeyword */ && node.name.text === originalName && ts.isWriteAccess(node)) {
+                    if (ts.isPropertyAccessExpression(node) && node.expression.kind === 101 /* ThisKeyword */ && node.name.text === originalName && ts.isWriteAccess(node)) {
                         changeTracker.replaceNode(file, node.name, ts.createIdentifier(fieldName));
                     }
                     if (!ts.isFunctionLike(node) && !ts.isClassLike(node)) {
@@ -118659,11 +122591,11 @@ var ts;
         }
         function isPureImport(node) {
             switch (node.kind) {
-                case 249 /* ImportDeclaration */:
+                case 250 /* ImportDeclaration */:
                     return true;
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return !ts.hasModifier(node, 1 /* Export */);
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     return node.declarationList.declarations.every(function (d) { return !!d.initializer && ts.isRequireCall(d.initializer, /*checkArgumentIsStringLiteralLike*/ true); });
                 default:
                     return false;
@@ -118751,19 +122683,19 @@ var ts;
         }
         function getNamespaceLikeImport(node) {
             switch (node.kind) {
-                case 249 /* ImportDeclaration */:
-                    return node.importClause && node.importClause.namedBindings && node.importClause.namedBindings.kind === 251 /* NamespaceImport */ ?
+                case 250 /* ImportDeclaration */:
+                    return node.importClause && node.importClause.namedBindings && node.importClause.namedBindings.kind === 252 /* NamespaceImport */ ?
                         node.importClause.namedBindings.name : undefined;
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return node.name;
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     return ts.tryCast(node.name, ts.isIdentifier);
                 default:
                     return ts.Debug.assertNever(node);
             }
         }
         function updateNamespaceLikeImport(changes, sourceFile, checker, movedSymbols, newModuleName, newModuleSpecifier, oldImportId, oldImportNode) {
-            var preferredNewNamespaceName = ts.codefix.moduleSpecifierToValidIdentifier(newModuleName, 7 /* ESNext */);
+            var preferredNewNamespaceName = ts.codefix.moduleSpecifierToValidIdentifier(newModuleName, 99 /* ESNext */);
             var needUniqueName = false;
             var toChange = [];
             ts.FindAllReferences.Core.eachSymbolReferenceInFile(oldImportId, checker, sourceFile, function (ref) {
@@ -118787,20 +122719,20 @@ var ts;
             var newNamespaceId = ts.createIdentifier(newNamespaceName);
             var newModuleString = ts.createLiteral(newModuleSpecifier);
             switch (node.kind) {
-                case 249 /* ImportDeclaration */:
+                case 250 /* ImportDeclaration */:
                     return ts.createImportDeclaration(
                     /*decorators*/ undefined, /*modifiers*/ undefined, ts.createImportClause(/*name*/ undefined, ts.createNamespaceImport(newNamespaceId)), newModuleString);
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return ts.createImportEqualsDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, newNamespaceId, ts.createExternalModuleReference(newModuleString));
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     return ts.createVariableDeclaration(newNamespaceId, /*type*/ undefined, createRequireCall(newModuleString));
                 default:
                     return ts.Debug.assertNever(node);
             }
         }
         function moduleSpecifierFromImport(i) {
-            return (i.kind === 249 /* ImportDeclaration */ ? i.moduleSpecifier
-                : i.kind === 248 /* ImportEqualsDeclaration */ ? i.moduleReference.expression
+            return (i.kind === 250 /* ImportDeclaration */ ? i.moduleSpecifier
+                : i.kind === 249 /* ImportEqualsDeclaration */ ? i.moduleReference.expression
                     : i.initializer.arguments[0]);
         }
         function forEachImportInStatement(statement, cb) {
@@ -118870,15 +122802,15 @@ var ts;
         }
         function deleteUnusedImports(sourceFile, importDecl, changes, isUnused) {
             switch (importDecl.kind) {
-                case 249 /* ImportDeclaration */:
+                case 250 /* ImportDeclaration */:
                     deleteUnusedImportsInDeclaration(sourceFile, importDecl, changes, isUnused);
                     break;
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     if (isUnused(importDecl.name)) {
                         changes.delete(sourceFile, importDecl);
                     }
                     break;
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     deleteUnusedImportsInVariableDeclaration(sourceFile, importDecl, changes, isUnused);
                     break;
                 default:
@@ -118891,7 +122823,7 @@ var ts;
             var _a = importDecl.importClause, name = _a.name, namedBindings = _a.namedBindings;
             var defaultUnused = !name || isUnused(name);
             var namedBindingsUnused = !namedBindings ||
-                (namedBindings.kind === 251 /* NamespaceImport */ ? isUnused(namedBindings.name) : namedBindings.elements.length !== 0 && namedBindings.elements.every(function (e) { return isUnused(e.name); }));
+                (namedBindings.kind === 252 /* NamespaceImport */ ? isUnused(namedBindings.name) : namedBindings.elements.length !== 0 && namedBindings.elements.every(function (e) { return isUnused(e.name); }));
             if (defaultUnused && namedBindingsUnused) {
                 changes.delete(sourceFile, importDecl);
             }
@@ -118903,7 +122835,7 @@ var ts;
                     if (namedBindingsUnused) {
                         changes.delete(sourceFile, namedBindings);
                     }
-                    else if (namedBindings.kind === 252 /* NamedImports */) {
+                    else if (namedBindings.kind === 253 /* NamedImports */) {
                         for (var _i = 0, _b = namedBindings.elements; _i < _b.length; _i++) {
                             var element = _b[_i];
                             if (isUnused(element.name))
@@ -118916,14 +122848,14 @@ var ts;
         function deleteUnusedImportsInVariableDeclaration(sourceFile, varDecl, changes, isUnused) {
             var name = varDecl.name;
             switch (name.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     if (isUnused(name)) {
                         changes.delete(sourceFile, name);
                     }
                     break;
-                case 185 /* ArrayBindingPattern */:
+                case 186 /* ArrayBindingPattern */:
                     break;
-                case 184 /* ObjectBindingPattern */:
+                case 185 /* ObjectBindingPattern */:
                     if (name.elements.every(function (e) { return ts.isIdentifier(e.name) && isUnused(e.name); })) {
                         changes.delete(sourceFile, ts.isVariableDeclarationList(varDecl.parent) && varDecl.parent.declarations.length === 1 ? varDecl.parent.parent : varDecl);
                     }
@@ -119050,13 +122982,13 @@ var ts;
         // Below should all be utilities
         function isInImport(decl) {
             switch (decl.kind) {
-                case 248 /* ImportEqualsDeclaration */:
-                case 253 /* ImportSpecifier */:
-                case 250 /* ImportClause */:
+                case 249 /* ImportEqualsDeclaration */:
+                case 254 /* ImportSpecifier */:
+                case 251 /* ImportClause */:
                     return true;
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     return isVariableDeclarationInImport(decl);
-                case 186 /* BindingElement */:
+                case 187 /* BindingElement */:
                     return ts.isVariableDeclaration(decl.parent.parent) && isVariableDeclarationInImport(decl.parent.parent);
                 default:
                     return false;
@@ -119068,7 +123000,7 @@ var ts;
         }
         function filterImport(i, moduleSpecifier, keep) {
             switch (i.kind) {
-                case 249 /* ImportDeclaration */: {
+                case 250 /* ImportDeclaration */: {
                     var clause = i.importClause;
                     if (!clause)
                         return undefined;
@@ -119078,9 +123010,9 @@ var ts;
                         ? ts.createImportDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, ts.createImportClause(defaultImport, namedBindings), moduleSpecifier)
                         : undefined;
                 }
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return keep(i.name) ? i : undefined;
-                case 237 /* VariableDeclaration */: {
+                case 238 /* VariableDeclaration */: {
                     var name = filterBindingName(i.name, keep);
                     return name ? makeVariableStatement(name, i.type, createRequireCall(moduleSpecifier), i.parent.flags) : undefined;
                 }
@@ -119089,7 +123021,7 @@ var ts;
             }
         }
         function filterNamedBindings(namedBindings, keep) {
-            if (namedBindings.kind === 251 /* NamespaceImport */) {
+            if (namedBindings.kind === 252 /* NamespaceImport */) {
                 return keep(namedBindings.name) ? namedBindings : undefined;
             }
             else {
@@ -119099,11 +123031,11 @@ var ts;
         }
         function filterBindingName(name, keep) {
             switch (name.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return keep(name) ? name : undefined;
-                case 185 /* ArrayBindingPattern */:
+                case 186 /* ArrayBindingPattern */:
                     return name;
-                case 184 /* ObjectBindingPattern */: {
+                case 185 /* ObjectBindingPattern */: {
                     // We can't handle nested destructurings or property names well here, so just copy them all.
                     var newElements = name.elements.filter(function (prop) { return prop.propertyName || !ts.isIdentifier(prop.name) || keep(prop.name); });
                     return newElements.length ? ts.createObjectBindingPattern(newElements) : undefined;
@@ -119160,13 +123092,13 @@ var ts;
         }
         function isNonVariableTopLevelDeclaration(node) {
             switch (node.kind) {
-                case 239 /* FunctionDeclaration */:
-                case 240 /* ClassDeclaration */:
-                case 244 /* ModuleDeclaration */:
-                case 243 /* EnumDeclaration */:
-                case 242 /* TypeAliasDeclaration */:
-                case 241 /* InterfaceDeclaration */:
-                case 248 /* ImportEqualsDeclaration */:
+                case 240 /* FunctionDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 245 /* ModuleDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
+                case 242 /* InterfaceDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return true;
                 default:
                     return false;
@@ -119174,17 +123106,17 @@ var ts;
         }
         function forEachTopLevelDeclaration(statement, cb) {
             switch (statement.kind) {
-                case 239 /* FunctionDeclaration */:
-                case 240 /* ClassDeclaration */:
-                case 244 /* ModuleDeclaration */:
-                case 243 /* EnumDeclaration */:
-                case 242 /* TypeAliasDeclaration */:
-                case 241 /* InterfaceDeclaration */:
-                case 248 /* ImportEqualsDeclaration */:
+                case 240 /* FunctionDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 245 /* ModuleDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
+                case 242 /* InterfaceDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return cb(statement);
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     return ts.firstDefined(statement.declarationList.declarations, function (decl) { return forEachTopLevelDeclarationInBindingName(decl.name, cb); });
-                case 221 /* ExpressionStatement */: {
+                case 222 /* ExpressionStatement */: {
                     var expression = statement.expression;
                     return ts.isBinaryExpression(expression) && ts.getAssignmentDeclarationKind(expression) === 1 /* ExportsProperty */
                         ? cb(statement)
@@ -119194,10 +123126,10 @@ var ts;
         }
         function forEachTopLevelDeclarationInBindingName(name, cb) {
             switch (name.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return cb(ts.cast(name.parent, function (x) { return ts.isVariableDeclaration(x) || ts.isBindingElement(x); }));
-                case 185 /* ArrayBindingPattern */:
-                case 184 /* ObjectBindingPattern */:
+                case 186 /* ArrayBindingPattern */:
+                case 185 /* ObjectBindingPattern */:
                     return ts.firstDefined(name.elements, function (em) { return ts.isOmittedExpression(em) ? undefined : forEachTopLevelDeclarationInBindingName(em.name, cb); });
                 default:
                     return ts.Debug.assertNever(name);
@@ -119208,9 +123140,9 @@ var ts;
         }
         function getTopLevelDeclarationStatement(d) {
             switch (d.kind) {
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     return d.parent.parent;
-                case 186 /* BindingElement */:
+                case 187 /* BindingElement */:
                     return getTopLevelDeclarationStatement(ts.cast(d.parent.parent, function (p) { return ts.isVariableDeclaration(p) || ts.isBindingElement(p); }));
                 default:
                     return d;
@@ -119241,25 +123173,25 @@ var ts;
             return useEs6Exports ? [addEs6Export(decl)] : addCommonjsExport(decl);
         }
         function addEs6Export(d) {
-            var modifiers = ts.concatenate([ts.createModifier(85 /* ExportKeyword */)], d.modifiers);
+            var modifiers = ts.concatenate([ts.createModifier(86 /* ExportKeyword */)], d.modifiers);
             switch (d.kind) {
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     return ts.updateFunctionDeclaration(d, d.decorators, modifiers, d.asteriskToken, d.name, d.typeParameters, d.parameters, d.type, d.body);
-                case 240 /* ClassDeclaration */:
+                case 241 /* ClassDeclaration */:
                     return ts.updateClassDeclaration(d, d.decorators, modifiers, d.name, d.typeParameters, d.heritageClauses, d.members);
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     return ts.updateVariableStatement(d, modifiers, d.declarationList);
-                case 244 /* ModuleDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     return ts.updateModuleDeclaration(d, d.decorators, modifiers, d.name, d.body);
-                case 243 /* EnumDeclaration */:
+                case 244 /* EnumDeclaration */:
                     return ts.updateEnumDeclaration(d, d.decorators, modifiers, d.name, d.members);
-                case 242 /* TypeAliasDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
                     return ts.updateTypeAliasDeclaration(d, d.decorators, modifiers, d.name, d.typeParameters, d.type);
-                case 241 /* InterfaceDeclaration */:
+                case 242 /* InterfaceDeclaration */:
                     return ts.updateInterfaceDeclaration(d, d.decorators, modifiers, d.name, d.typeParameters, d.heritageClauses, d.members);
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return ts.updateImportEqualsDeclaration(d, d.decorators, modifiers, d.name, d.moduleReference);
-                case 221 /* ExpressionStatement */:
+                case 222 /* ExpressionStatement */:
                     return ts.Debug.fail(); // Shouldn't try to add 'export' keyword to `exports.x = ...`
                 default:
                     return ts.Debug.assertNever(d);
@@ -119270,18 +123202,18 @@ var ts;
         }
         function getNamesToExportInCommonJS(decl) {
             switch (decl.kind) {
-                case 239 /* FunctionDeclaration */:
-                case 240 /* ClassDeclaration */:
+                case 240 /* FunctionDeclaration */:
+                case 241 /* ClassDeclaration */:
                     return [decl.name.text]; // TODO: GH#18217
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     return ts.mapDefined(decl.declarationList.declarations, function (d) { return ts.isIdentifier(d.name) ? d.name.text : undefined; });
-                case 244 /* ModuleDeclaration */:
-                case 243 /* EnumDeclaration */:
-                case 242 /* TypeAliasDeclaration */:
-                case 241 /* InterfaceDeclaration */:
-                case 248 /* ImportEqualsDeclaration */:
+                case 245 /* ModuleDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
+                case 242 /* InterfaceDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return ts.emptyArray;
-                case 221 /* ExpressionStatement */:
+                case 222 /* ExpressionStatement */:
                     return ts.Debug.fail(); // Shouldn't try to add 'export' keyword to `exports.x = ...`
                 default:
                     return ts.Debug.assertNever(decl);
@@ -119289,7 +123221,7 @@ var ts;
         }
         /** Creates `exports.x = x;` */
         function createExportAssignment(name) {
-            return ts.createExpressionStatement(ts.createBinary(ts.createPropertyAccess(ts.createIdentifier("exports"), ts.createIdentifier(name)), 59 /* EqualsToken */, ts.createIdentifier(name)));
+            return ts.createExpressionStatement(ts.createBinary(ts.createPropertyAccess(ts.createIdentifier("exports"), ts.createIdentifier(name)), 60 /* EqualsToken */, ts.createIdentifier(name)));
         }
     })(refactor = ts.refactor || (ts.refactor = {}));
 })(ts || (ts = {}));
@@ -119388,9 +123320,9 @@ var ts;
 (function (ts) {
     var refactor;
     (function (refactor) {
-        var convertToNamedParameters;
-        (function (convertToNamedParameters) {
-            var refactorName = "Convert to named parameters";
+        var convertParamsToDestructuredObject;
+        (function (convertParamsToDestructuredObject) {
+            var refactorName = "Convert parameters to destructured object";
             var minimumParameterLength = 2;
             refactor.registerRefactor(refactorName, { getEditsForAction: getEditsForAction, getAvailableActions: getAvailableActions });
             function getAvailableActions(context) {
@@ -119401,7 +123333,7 @@ var ts;
                 var functionDeclaration = getFunctionDeclarationAtPosition(file, startPosition, context.program.getTypeChecker());
                 if (!functionDeclaration)
                     return ts.emptyArray;
-                var description = ts.getLocaleSpecificMessage(ts.Diagnostics.Convert_to_named_parameters);
+                var description = ts.getLocaleSpecificMessage(ts.Diagnostics.Convert_parameters_to_destructured_object);
                 return [{
                         name: refactorName,
                         description: description,
@@ -119448,15 +123380,15 @@ var ts;
                 var checker = program.getTypeChecker();
                 var references = ts.flatMap(names, /*mapfn*/ function (/*mapfn*/ name) { return ts.FindAllReferences.getReferenceEntriesForNode(-1, name, program, program.getSourceFiles(), cancellationToken); });
                 var groupedReferences = groupReferences(references);
-                if (!ts.every(groupedReferences.declarations, function (decl) { return ts.contains(names, decl); })) {
+                if (!ts.every(groupedReferences.declarations, /*callback*/ function (/*callback*/ decl) { return ts.contains(names, decl); })) {
                     groupedReferences.valid = false;
                 }
                 return groupedReferences;
                 function groupReferences(referenceEntries) {
                     var classReferences = { accessExpressions: [], typeUsages: [] };
                     var groupedReferences = { functionCalls: [], declarations: [], classReferences: classReferences, valid: true };
-                    var functionSymbols = ts.map(functionNames, checker.getSymbolAtLocation);
-                    var classSymbols = ts.map(classNames, checker.getSymbolAtLocation);
+                    var functionSymbols = ts.map(functionNames, getSymbolTargetAtLocation);
+                    var classSymbols = ts.map(classNames, getSymbolTargetAtLocation);
                     var isConstructor = ts.isConstructorDeclaration(functionDeclaration);
                     for (var _i = 0, referenceEntries_1 = referenceEntries; _i < referenceEntries_1.length; _i++) {
                         var entry = referenceEntries_1[_i];
@@ -119464,7 +123396,22 @@ var ts;
                             groupedReferences.valid = false;
                             continue;
                         }
-                        if (ts.contains(functionSymbols, checker.getSymbolAtLocation(entry.node), symbolComparer)) {
+                        /* We compare symbols because in some cases find all references wil return a reference that may or may not be to the refactored function.
+                        Example from the refactorConvertParamsToDestructuredObject_methodCallUnion.ts test:
+                            class A { foo(a: number, b: number) { return a + b; } }
+                            class B { foo(c: number, d: number) { return c + d; } }
+                            declare const ab: A | B;
+                            ab.foo(1, 2);
+                        Find all references will return `ab.foo(1, 2)` as a reference to A's `foo` but we could be calling B's `foo`.
+                        When looking for constructor calls, however, the symbol on the constructor call reference is going to be the corresponding class symbol.
+                        So we need to add a special case for this because when calling a constructor of a class through one of its subclasses,
+                        the symbols are going to be different.
+                        */
+                        if (ts.contains(functionSymbols, getSymbolTargetAtLocation(entry.node)) || ts.isNewExpressionTarget(entry.node)) {
+                            var importOrExportReference = entryToImportOrExport(entry);
+                            if (importOrExportReference) {
+                                continue;
+                            }
                             var decl = entryToDeclaration(entry);
                             if (decl) {
                                 groupedReferences.declarations.push(decl);
@@ -119477,7 +123424,11 @@ var ts;
                             }
                         }
                         // if the refactored function is a constructor, we must also check if the references to its class are valid
-                        if (isConstructor && ts.contains(classSymbols, checker.getSymbolAtLocation(entry.node), symbolComparer)) {
+                        if (isConstructor && ts.contains(classSymbols, getSymbolTargetAtLocation(entry.node))) {
+                            var importOrExportReference = entryToImportOrExport(entry);
+                            if (importOrExportReference) {
+                                continue;
+                            }
                             var decl = entryToDeclaration(entry);
                             if (decl) {
                                 groupedReferences.declarations.push(decl);
@@ -119502,9 +123453,23 @@ var ts;
                     }
                     return groupedReferences;
                 }
+                function getSymbolTargetAtLocation(node) {
+                    var symbol = checker.getSymbolAtLocation(node);
+                    return symbol && ts.getSymbolTarget(symbol, checker);
+                }
             }
-            function symbolComparer(a, b) {
-                return ts.getSymbolTarget(a) === ts.getSymbolTarget(b);
+            function entryToImportOrExport(entry) {
+                var node = entry.node;
+                if (ts.isImportSpecifier(node.parent)
+                    || ts.isImportClause(node.parent)
+                    || ts.isImportEqualsDeclaration(node.parent)
+                    || ts.isNamespaceImport(node.parent)) {
+                    return node;
+                }
+                if (ts.isExportSpecifier(node.parent) || ts.isExportAssignment(node.parent)) {
+                    return node;
+                }
+                return undefined;
             }
             function entryToDeclaration(entry) {
                 if (ts.isDeclaration(entry.node.parent)) {
@@ -119517,37 +123482,31 @@ var ts;
                     var functionReference = entry.node;
                     var parent = functionReference.parent;
                     switch (parent.kind) {
-                        // Function call (foo(...) or super(...))
-                        case 191 /* CallExpression */:
-                            var callExpression = ts.tryCast(parent, ts.isCallExpression);
-                            if (callExpression && callExpression.expression === functionReference) {
-                                return callExpression;
+                        // foo(...) or super(...) or new Foo(...)
+                        case 192 /* CallExpression */:
+                        case 193 /* NewExpression */:
+                            var callOrNewExpression = ts.tryCast(parent, ts.isCallOrNewExpression);
+                            if (callOrNewExpression && callOrNewExpression.expression === functionReference) {
+                                return callOrNewExpression;
                             }
                             break;
-                        // Constructor call (new Foo(...))
-                        case 192 /* NewExpression */:
-                            var newExpression = ts.tryCast(parent, ts.isNewExpression);
-                            if (newExpression && newExpression.expression === functionReference) {
-                                return newExpression;
-                            }
-                            break;
-                        // Method call (x.foo(...))
-                        case 189 /* PropertyAccessExpression */:
+                        // x.foo(...)
+                        case 190 /* PropertyAccessExpression */:
                             var propertyAccessExpression = ts.tryCast(parent, ts.isPropertyAccessExpression);
                             if (propertyAccessExpression && propertyAccessExpression.parent && propertyAccessExpression.name === functionReference) {
-                                var callExpression_1 = ts.tryCast(propertyAccessExpression.parent, ts.isCallExpression);
-                                if (callExpression_1 && callExpression_1.expression === propertyAccessExpression) {
-                                    return callExpression_1;
+                                var callOrNewExpression_1 = ts.tryCast(propertyAccessExpression.parent, ts.isCallOrNewExpression);
+                                if (callOrNewExpression_1 && callOrNewExpression_1.expression === propertyAccessExpression) {
+                                    return callOrNewExpression_1;
                                 }
                             }
                             break;
-                        // Method call (x["foo"](...))
-                        case 190 /* ElementAccessExpression */:
+                        // x["foo"](...)
+                        case 191 /* ElementAccessExpression */:
                             var elementAccessExpression = ts.tryCast(parent, ts.isElementAccessExpression);
                             if (elementAccessExpression && elementAccessExpression.parent && elementAccessExpression.argumentExpression === functionReference) {
-                                var callExpression_2 = ts.tryCast(elementAccessExpression.parent, ts.isCallExpression);
-                                if (callExpression_2 && callExpression_2.expression === elementAccessExpression) {
-                                    return callExpression_2;
+                                var callOrNewExpression_2 = ts.tryCast(elementAccessExpression.parent, ts.isCallOrNewExpression);
+                                if (callOrNewExpression_2 && callOrNewExpression_2.expression === elementAccessExpression) {
+                                    return callOrNewExpression_2;
                                 }
                             }
                             break;
@@ -119561,14 +123520,14 @@ var ts;
                     var parent = reference.parent;
                     switch (parent.kind) {
                         // `C.foo`
-                        case 189 /* PropertyAccessExpression */:
+                        case 190 /* PropertyAccessExpression */:
                             var propertyAccessExpression = ts.tryCast(parent, ts.isPropertyAccessExpression);
                             if (propertyAccessExpression && propertyAccessExpression.expression === reference) {
                                 return propertyAccessExpression;
                             }
                             break;
                         // `C["foo"]`
-                        case 190 /* ElementAccessExpression */:
+                        case 191 /* ElementAccessExpression */:
                             var elementAccessExpression = ts.tryCast(parent, ts.isElementAccessExpression);
                             if (elementAccessExpression && elementAccessExpression.expression === reference) {
                                 return elementAccessExpression;
@@ -119587,7 +123546,10 @@ var ts;
             }
             function getFunctionDeclarationAtPosition(file, startPosition, checker) {
                 var node = ts.getTouchingToken(file, startPosition);
-                var functionDeclaration = ts.getContainingFunction(node);
+                var functionDeclaration = ts.getContainingFunctionDeclaration(node);
+                // don't offer refactor on top-level JSDoc
+                if (isTopLevelJSDoc(node))
+                    return undefined;
                 if (functionDeclaration
                     && isValidFunctionDeclaration(functionDeclaration, checker)
                     && ts.rangeContainsRange(functionDeclaration, node)
@@ -119595,31 +123557,57 @@ var ts;
                     return functionDeclaration;
                 return undefined;
             }
+            function isTopLevelJSDoc(node) {
+                var containingJSDoc = ts.findAncestor(node, ts.isJSDocNode);
+                if (containingJSDoc) {
+                    var containingNonJSDoc = ts.findAncestor(containingJSDoc, function (n) { return !ts.isJSDocNode(n); });
+                    return !!containingNonJSDoc && ts.isFunctionLikeDeclaration(containingNonJSDoc);
+                }
+                return false;
+            }
             function isValidFunctionDeclaration(functionDeclaration, checker) {
-                if (!isValidParameterNodeArray(functionDeclaration.parameters))
+                if (!isValidParameterNodeArray(functionDeclaration.parameters, checker))
                     return false;
                 switch (functionDeclaration.kind) {
-                    case 239 /* FunctionDeclaration */:
-                    case 156 /* MethodDeclaration */:
-                        return !!functionDeclaration.name && !!functionDeclaration.body && !checker.isImplementationOfOverload(functionDeclaration);
-                    case 157 /* Constructor */:
+                    case 240 /* FunctionDeclaration */:
+                        return hasNameOrDefault(functionDeclaration) && isSingleImplementation(functionDeclaration, checker);
+                    case 157 /* MethodDeclaration */:
+                        return isSingleImplementation(functionDeclaration, checker);
+                    case 158 /* Constructor */:
                         if (ts.isClassDeclaration(functionDeclaration.parent)) {
-                            return !!functionDeclaration.body && !!functionDeclaration.parent.name && !checker.isImplementationOfOverload(functionDeclaration);
+                            return hasNameOrDefault(functionDeclaration.parent) && isSingleImplementation(functionDeclaration, checker);
                         }
                         else {
-                            return isValidVariableDeclaration(functionDeclaration.parent.parent) && !!functionDeclaration.body && !checker.isImplementationOfOverload(functionDeclaration);
+                            return isValidVariableDeclaration(functionDeclaration.parent.parent)
+                                && isSingleImplementation(functionDeclaration, checker);
                         }
-                    case 196 /* FunctionExpression */:
-                    case 197 /* ArrowFunction */:
+                    case 197 /* FunctionExpression */:
+                    case 198 /* ArrowFunction */:
                         return isValidVariableDeclaration(functionDeclaration.parent);
                 }
                 return false;
             }
-            function isValidParameterNodeArray(parameters) {
-                return getRefactorableParametersLength(parameters) >= minimumParameterLength && ts.every(parameters, isValidParameterDeclaration);
+            function isSingleImplementation(functionDeclaration, checker) {
+                return !!functionDeclaration.body && !checker.isImplementationOfOverload(functionDeclaration);
             }
-            function isValidParameterDeclaration(paramDeclaration) {
-                return !paramDeclaration.modifiers && !paramDeclaration.decorators && ts.isIdentifier(paramDeclaration.name);
+            function hasNameOrDefault(functionOrClassDeclaration) {
+                if (!functionOrClassDeclaration.name) {
+                    var defaultKeyword = ts.findModifier(functionOrClassDeclaration, 81 /* DefaultKeyword */);
+                    return !!defaultKeyword;
+                }
+                return true;
+            }
+            function isValidParameterNodeArray(parameters, checker) {
+                return getRefactorableParametersLength(parameters) >= minimumParameterLength
+                    && ts.every(parameters, /*callback*/ function (/*callback*/ paramDecl) { return isValidParameterDeclaration(paramDecl, checker); });
+            }
+            function isValidParameterDeclaration(parameterDeclaration, checker) {
+                if (ts.isRestParameter(parameterDeclaration)) {
+                    var type = checker.getTypeAtLocation(parameterDeclaration);
+                    if (!checker.isArrayType(type) && !checker.isTupleType(type))
+                        return false;
+                }
+                return !parameterDeclaration.modifiers && !parameterDeclaration.decorators && ts.isIdentifier(parameterDeclaration.name);
             }
             function isValidVariableDeclaration(node) {
                 return ts.isVariableDeclaration(node) && ts.isVarConst(node) && ts.isIdentifier(node.name) && !node.type; // TODO: GH#30113
@@ -119639,13 +123627,22 @@ var ts;
                 }
                 return parameters;
             }
+            function createPropertyOrShorthandAssignment(name, initializer) {
+                if (ts.isIdentifier(initializer) && ts.getTextOfIdentifierOrLiteral(initializer) === name) {
+                    return ts.createShorthandPropertyAssignment(name);
+                }
+                return ts.createPropertyAssignment(name, initializer);
+            }
             function createNewArgument(functionDeclaration, functionArguments) {
                 var parameters = getRefactorableParameters(functionDeclaration.parameters);
                 var hasRestParameter = ts.isRestParameter(ts.last(parameters));
                 var nonRestArguments = hasRestParameter ? functionArguments.slice(0, parameters.length - 1) : functionArguments;
                 var properties = ts.map(nonRestArguments, function (arg, i) {
-                    var property = ts.createPropertyAssignment(getParameterName(parameters[i]), arg);
-                    ts.suppressLeadingAndTrailingTrivia(property.initializer);
+                    var parameterName = getParameterName(parameters[i]);
+                    var property = createPropertyOrShorthandAssignment(parameterName, arg);
+                    ts.suppressLeadingAndTrailingTrivia(property.name);
+                    if (ts.isPropertyAssignment(property))
+                        ts.suppressLeadingAndTrailingTrivia(property.initializer);
                     copyComments(arg, property);
                     return property;
                 });
@@ -119658,14 +123655,14 @@ var ts;
                 return objectLiteral;
             }
             function createNewParameters(functionDeclaration, program, host) {
+                var checker = program.getTypeChecker();
                 var refactorableParameters = getRefactorableParameters(functionDeclaration.parameters);
                 var bindingElements = ts.map(refactorableParameters, createBindingElementFromParameterDeclaration);
                 var objectParameterName = ts.createObjectBindingPattern(bindingElements);
                 var objectParameterType = createParameterTypeNode(refactorableParameters);
-                var checker = program.getTypeChecker();
                 var objectInitializer;
                 // If every parameter in the original function was optional, add an empty object initializer to the new object parameter
-                if (ts.every(refactorableParameters, checker.isOptionalParameter)) {
+                if (ts.every(refactorableParameters, isOptionalParameter)) {
                     objectInitializer = ts.createObjectLiteral();
                 }
                 var objectParameter = ts.createParameter(
@@ -119689,6 +123686,16 @@ var ts;
                     return ts.createNodeArray([newThisParameter, objectParameter]);
                 }
                 return ts.createNodeArray([objectParameter]);
+                function createBindingElementFromParameterDeclaration(parameterDeclaration) {
+                    var element = ts.createBindingElement(
+                    /*dotDotDotToken*/ undefined, 
+                    /*propertyName*/ undefined, getParameterName(parameterDeclaration), ts.isRestParameter(parameterDeclaration) && isOptionalParameter(parameterDeclaration) ? ts.createArrayLiteral() : parameterDeclaration.initializer);
+                    ts.suppressLeadingAndTrailingTrivia(element);
+                    if (parameterDeclaration.initializer && element.initializer) {
+                        copyComments(parameterDeclaration.initializer, element.initializer);
+                    }
+                    return element;
+                }
                 function createParameterTypeNode(parameters) {
                     var members = ts.map(parameters, createPropertySignatureFromParameterDeclaration);
                     var typeNode = ts.addEmitFlags(ts.createTypeLiteralNode(members), 1 /* SingleLine */);
@@ -119700,7 +123707,7 @@ var ts;
                         parameterType = getTypeNode(parameterDeclaration);
                     }
                     var propertySignature = ts.createPropertySignature(
-                    /*modifiers*/ undefined, getParameterName(parameterDeclaration), parameterDeclaration.initializer || ts.isRestParameter(parameterDeclaration) ? ts.createToken(56 /* QuestionToken */) : parameterDeclaration.questionToken, parameterType, 
+                    /*modifiers*/ undefined, getParameterName(parameterDeclaration), isOptionalParameter(parameterDeclaration) ? ts.createToken(56 /* QuestionToken */) : parameterDeclaration.questionToken, parameterType, 
                     /*initializer*/ undefined);
                     ts.suppressLeadingAndTrailingTrivia(propertySignature);
                     copyComments(parameterDeclaration.name, propertySignature.name);
@@ -119710,20 +123717,16 @@ var ts;
                     return propertySignature;
                 }
                 function getTypeNode(node) {
-                    var checker = program.getTypeChecker();
                     var type = checker.getTypeAtLocation(node);
                     return ts.getTypeNodeIfAccessible(type, node, program, host);
                 }
-            }
-            function createBindingElementFromParameterDeclaration(parameterDeclaration) {
-                var element = ts.createBindingElement(
-                /*dotDotDotToken*/ undefined, 
-                /*propertyName*/ undefined, getParameterName(parameterDeclaration), ts.isRestParameter(parameterDeclaration) ? ts.createArrayLiteral() : parameterDeclaration.initializer);
-                ts.suppressLeadingAndTrailingTrivia(element);
-                if (parameterDeclaration.initializer && element.initializer) {
-                    copyComments(parameterDeclaration.initializer, element.initializer);
+                function isOptionalParameter(parameterDeclaration) {
+                    if (ts.isRestParameter(parameterDeclaration)) {
+                        var type = checker.getTypeAtLocation(parameterDeclaration);
+                        return !checker.isTupleType(type);
+                    }
+                    return checker.isOptionalParameter(parameterDeclaration);
                 }
-                return element;
             }
             function copyComments(sourceNode, targetNode) {
                 var sourceFile = sourceNode.getSourceFile();
@@ -119750,10 +123753,15 @@ var ts;
             }
             function getClassNames(constructorDeclaration) {
                 switch (constructorDeclaration.parent.kind) {
-                    case 240 /* ClassDeclaration */:
+                    case 241 /* ClassDeclaration */:
                         var classDeclaration = constructorDeclaration.parent;
-                        return [classDeclaration.name];
-                    case 209 /* ClassExpression */:
+                        if (classDeclaration.name)
+                            return [classDeclaration.name];
+                        // If the class declaration doesn't have a name, it should have a default modifier.
+                        // We validated this in `isValidFunctionDeclaration` through `hasNameOrDefault`
+                        var defaultModifier = ts.Debug.assertDefined(ts.findModifier(classDeclaration, 81 /* DefaultKeyword */), "Nameless class declaration should be a default export");
+                        return [defaultModifier];
+                    case 210 /* ClassExpression */:
                         var classExpression = constructorDeclaration.parent;
                         var variableDeclaration = constructorDeclaration.parent.parent;
                         var className = classExpression.name;
@@ -119764,19 +123772,25 @@ var ts;
             }
             function getFunctionNames(functionDeclaration) {
                 switch (functionDeclaration.kind) {
-                    case 239 /* FunctionDeclaration */:
-                    case 156 /* MethodDeclaration */:
+                    case 240 /* FunctionDeclaration */:
+                        if (functionDeclaration.name)
+                            return [functionDeclaration.name];
+                        // If the function declaration doesn't have a name, it should have a default modifier.
+                        // We validated this in `isValidFunctionDeclaration` through `hasNameOrDefault`
+                        var defaultModifier = ts.Debug.assertDefined(ts.findModifier(functionDeclaration, 81 /* DefaultKeyword */), "Nameless function declaration should be a default export");
+                        return [defaultModifier];
+                    case 157 /* MethodDeclaration */:
                         return [functionDeclaration.name];
-                    case 157 /* Constructor */:
-                        var ctrKeyword = ts.findChildOfKind(functionDeclaration, 124 /* ConstructorKeyword */, functionDeclaration.getSourceFile());
-                        if (functionDeclaration.parent.kind === 209 /* ClassExpression */) {
+                    case 158 /* Constructor */:
+                        var ctrKeyword = ts.Debug.assertDefined(ts.findChildOfKind(functionDeclaration, 125 /* ConstructorKeyword */, functionDeclaration.getSourceFile()), "Constructor declaration should have constructor keyword");
+                        if (functionDeclaration.parent.kind === 210 /* ClassExpression */) {
                             var variableDeclaration = functionDeclaration.parent.parent;
                             return [variableDeclaration.name, ctrKeyword];
                         }
                         return [ctrKeyword];
-                    case 197 /* ArrowFunction */:
+                    case 198 /* ArrowFunction */:
                         return [functionDeclaration.parent.name];
-                    case 196 /* FunctionExpression */:
+                    case 197 /* FunctionExpression */:
                         if (functionDeclaration.name)
                             return [functionDeclaration.name, functionDeclaration.parent.name];
                         return [functionDeclaration.parent.name];
@@ -119784,7 +123798,7 @@ var ts;
                         return ts.Debug.assertNever(functionDeclaration);
                 }
             }
-        })(convertToNamedParameters = refactor.convertToNamedParameters || (refactor.convertToNamedParameters = {}));
+        })(convertParamsToDestructuredObject = refactor.convertParamsToDestructuredObject || (refactor.convertParamsToDestructuredObject = {}));
     })(refactor = ts.refactor || (ts.refactor = {}));
 })(ts || (ts = {}));
 var ts;
@@ -119793,7 +123807,7 @@ var ts;
     ts.servicesVersion = "0.8";
     function createNode(kind, pos, end, parent) {
         var node = ts.isNodeKind(kind) ? new NodeObject(kind, pos, end) :
-            kind === 72 /* Identifier */ ? new IdentifierObject(72 /* Identifier */, pos, end) :
+            kind === 73 /* Identifier */ ? new IdentifierObject(73 /* Identifier */, pos, end) :
                 new TokenObject(kind, pos, end);
         node.parent = parent;
         node.flags = parent.flags & 12679168 /* ContextFlags */;
@@ -119867,8 +123881,8 @@ var ts;
             if (!children.length) {
                 return undefined;
             }
-            var child = ts.find(children, function (kid) { return kid.kind < 288 /* FirstJSDocNode */ || kid.kind > 310 /* LastJSDocNode */; });
-            return child.kind < 148 /* FirstNode */ ?
+            var child = ts.find(children, function (kid) { return kid.kind < 289 /* FirstJSDocNode */ || kid.kind > 312 /* LastJSDocNode */; });
+            return child.kind < 149 /* FirstNode */ ?
                 child :
                 child.getFirstToken(sourceFile);
         };
@@ -119879,7 +123893,7 @@ var ts;
             if (!child) {
                 return undefined;
             }
-            return child.kind < 148 /* FirstNode */ ? child : child.getLastToken(sourceFile);
+            return child.kind < 149 /* FirstNode */ ? child : child.getLastToken(sourceFile);
         };
         NodeObject.prototype.forEachChild = function (cbNode, cbNodeArray) {
             return ts.forEachChild(this, cbNode, cbNodeArray);
@@ -119925,8 +123939,8 @@ var ts;
             var token = ts.scanner.scan();
             var textPos = ts.scanner.getTextPos();
             if (textPos <= end) {
-                if (token === 72 /* Identifier */) {
-                    ts.Debug.fail("Did not expect " + ts.Debug.showSyntaxKind(parent) + " to have an Identifier in its trivia");
+                if (token === 73 /* Identifier */) {
+                    ts.Debug.fail("Did not expect " + ts.Debug.formatSyntaxKind(parent.kind) + " to have an Identifier in its trivia");
                 }
                 nodes.push(createNode(token, pos, textPos, parent));
             }
@@ -119937,7 +123951,7 @@ var ts;
         }
     }
     function createSyntaxList(nodes, parent) {
-        var list = createNode(311 /* SyntaxList */, nodes.pos, nodes.end, parent);
+        var list = createNode(313 /* SyntaxList */, nodes.pos, nodes.end, parent);
         list._children = [];
         var pos = nodes.pos;
         for (var _i = 0, nodes_1 = nodes; _i < nodes_1.length; _i++) {
@@ -120071,7 +124085,7 @@ var ts;
         });
         return IdentifierObject;
     }(TokenOrIdentifierObject));
-    IdentifierObject.prototype.kind = 72 /* Identifier */;
+    IdentifierObject.prototype.kind = 73 /* Identifier */;
     var TypeObject = /** @class */ (function () {
         function TypeObject(checker, flags) {
             this.checker = checker;
@@ -120272,10 +124286,10 @@ var ts;
             }
             function visit(node) {
                 switch (node.kind) {
-                    case 239 /* FunctionDeclaration */:
-                    case 196 /* FunctionExpression */:
-                    case 156 /* MethodDeclaration */:
-                    case 155 /* MethodSignature */:
+                    case 240 /* FunctionDeclaration */:
+                    case 197 /* FunctionExpression */:
+                    case 157 /* MethodDeclaration */:
+                    case 156 /* MethodSignature */:
                         var functionDeclaration = node;
                         var declarationName = getDeclarationName(functionDeclaration);
                         if (declarationName) {
@@ -120295,31 +124309,31 @@ var ts;
                         }
                         ts.forEachChild(node, visit);
                         break;
-                    case 240 /* ClassDeclaration */:
-                    case 209 /* ClassExpression */:
-                    case 241 /* InterfaceDeclaration */:
-                    case 242 /* TypeAliasDeclaration */:
-                    case 243 /* EnumDeclaration */:
-                    case 244 /* ModuleDeclaration */:
-                    case 248 /* ImportEqualsDeclaration */:
-                    case 257 /* ExportSpecifier */:
-                    case 253 /* ImportSpecifier */:
-                    case 250 /* ImportClause */:
-                    case 251 /* NamespaceImport */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
-                    case 168 /* TypeLiteral */:
+                    case 241 /* ClassDeclaration */:
+                    case 210 /* ClassExpression */:
+                    case 242 /* InterfaceDeclaration */:
+                    case 243 /* TypeAliasDeclaration */:
+                    case 244 /* EnumDeclaration */:
+                    case 245 /* ModuleDeclaration */:
+                    case 249 /* ImportEqualsDeclaration */:
+                    case 258 /* ExportSpecifier */:
+                    case 254 /* ImportSpecifier */:
+                    case 251 /* ImportClause */:
+                    case 252 /* NamespaceImport */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
+                    case 169 /* TypeLiteral */:
                         addDeclaration(node);
                         ts.forEachChild(node, visit);
                         break;
-                    case 151 /* Parameter */:
+                    case 152 /* Parameter */:
                         // Only consider parameter properties
                         if (!ts.hasModifier(node, 92 /* ParameterPropertyModifier */)) {
                             break;
                         }
                     // falls through
-                    case 237 /* VariableDeclaration */:
-                    case 186 /* BindingElement */: {
+                    case 238 /* VariableDeclaration */:
+                    case 187 /* BindingElement */: {
                         var decl = node;
                         if (ts.isBindingPattern(decl.name)) {
                             ts.forEachChild(decl.name, visit);
@@ -120330,19 +124344,19 @@ var ts;
                         }
                     }
                     // falls through
-                    case 278 /* EnumMember */:
-                    case 154 /* PropertyDeclaration */:
-                    case 153 /* PropertySignature */:
+                    case 279 /* EnumMember */:
+                    case 155 /* PropertyDeclaration */:
+                    case 154 /* PropertySignature */:
                         addDeclaration(node);
                         break;
-                    case 255 /* ExportDeclaration */:
+                    case 256 /* ExportDeclaration */:
                         // Handle named exports case e.g.:
                         //    export {a, b as B} from "mod";
                         if (node.exportClause) {
                             ts.forEach(node.exportClause.elements, visit);
                         }
                         break;
-                    case 249 /* ImportDeclaration */:
+                    case 250 /* ImportDeclaration */:
                         var importClause = node.importClause;
                         if (importClause) {
                             // Handle default import case e.g.:
@@ -120354,7 +124368,7 @@ var ts;
                             //    import * as NS from "mod";
                             //    import {a, b as B} from "mod";
                             if (importClause.namedBindings) {
-                                if (importClause.namedBindings.kind === 251 /* NamespaceImport */) {
+                                if (importClause.namedBindings.kind === 252 /* NamespaceImport */) {
                                     addDeclaration(importClause.namedBindings);
                                 }
                                 else {
@@ -120363,7 +124377,7 @@ var ts;
                             }
                         }
                         break;
-                    case 204 /* BinaryExpression */:
+                    case 205 /* BinaryExpression */:
                         if (ts.getAssignmentDeclarationKind(node) !== 0 /* None */) {
                             addDeclaration(node);
                         }
@@ -120532,7 +124546,7 @@ var ts;
             var sourceFile;
             if (this.currentFileName !== fileName) {
                 // This is a new file, just parse it
-                sourceFile = createLanguageServiceSourceFile(fileName, scriptSnapshot, 7 /* Latest */, version, /*setNodeParents*/ true, scriptKind);
+                sourceFile = createLanguageServiceSourceFile(fileName, scriptSnapshot, 99 /* Latest */, version, /*setNodeParents*/ true, scriptKind);
             }
             else if (this.currentFileVersion !== version) {
                 // This is the same file, just a newer version. Incrementally parse the file.
@@ -120656,9 +124670,9 @@ var ts;
     }());
     ts.ThrottledCancellationToken = ThrottledCancellationToken;
     function createLanguageService(host, documentRegistry, syntaxOnly) {
+        var _a;
         if (documentRegistry === void 0) { documentRegistry = ts.createDocumentRegistry(host.useCaseSensitiveFileNames && host.useCaseSensitiveFileNames(), host.getCurrentDirectory()); }
         if (syntaxOnly === void 0) { syntaxOnly = false; }
-        var _a;
         var syntaxTreeCache = new SyntaxTreeCache(host);
         var program;
         var lastProjectVersion;
@@ -120689,7 +124703,7 @@ var ts;
         function getValidSourceFile(fileName) {
             var sourceFile = program.getSourceFile(fileName);
             if (!sourceFile) {
-                throw new Error("Could not find file: '" + fileName + "'.");
+                throw new Error("Could not find sourceFile: '" + fileName + "' in " + (program && JSON.stringify(program.getSourceFiles().map(function (f) { return f.fileName; }))) + ".");
             }
             return sourceFile;
         }
@@ -120936,41 +124950,48 @@ var ts;
                 return undefined;
             }
             var typeChecker = program.getTypeChecker();
-            var symbol = getSymbolAtLocationForQuickInfo(node, typeChecker);
+            var nodeForQuickInfo = getNodeForQuickInfo(node);
+            var symbol = getSymbolAtLocationForQuickInfo(nodeForQuickInfo, typeChecker);
             if (!symbol || typeChecker.isUnknownSymbol(symbol)) {
-                var type_2 = shouldGetType(sourceFile, node, position) ? typeChecker.getTypeAtLocation(node) : undefined;
+                var type_2 = shouldGetType(sourceFile, nodeForQuickInfo, position) ? typeChecker.getTypeAtLocation(nodeForQuickInfo) : undefined;
                 return type_2 && {
                     kind: "" /* unknown */,
                     kindModifiers: "" /* none */,
-                    textSpan: ts.createTextSpanFromNode(node, sourceFile),
-                    displayParts: typeChecker.runWithCancellationToken(cancellationToken, function (typeChecker) { return ts.typeToDisplayParts(typeChecker, type_2, ts.getContainerNode(node)); }),
+                    textSpan: ts.createTextSpanFromNode(nodeForQuickInfo, sourceFile),
+                    displayParts: typeChecker.runWithCancellationToken(cancellationToken, function (typeChecker) { return ts.typeToDisplayParts(typeChecker, type_2, ts.getContainerNode(nodeForQuickInfo)); }),
                     documentation: type_2.symbol ? type_2.symbol.getDocumentationComment(typeChecker) : undefined,
                     tags: type_2.symbol ? type_2.symbol.getJsDocTags() : undefined
                 };
             }
             var _a = typeChecker.runWithCancellationToken(cancellationToken, function (typeChecker) {
-                return ts.SymbolDisplay.getSymbolDisplayPartsDocumentationAndSymbolKind(typeChecker, symbol, sourceFile, ts.getContainerNode(node), node);
+                return ts.SymbolDisplay.getSymbolDisplayPartsDocumentationAndSymbolKind(typeChecker, symbol, sourceFile, ts.getContainerNode(nodeForQuickInfo), nodeForQuickInfo);
             }), symbolKind = _a.symbolKind, displayParts = _a.displayParts, documentation = _a.documentation, tags = _a.tags;
             return {
                 kind: symbolKind,
                 kindModifiers: ts.SymbolDisplay.getSymbolModifiers(symbol),
-                textSpan: ts.createTextSpanFromNode(node, sourceFile),
+                textSpan: ts.createTextSpanFromNode(nodeForQuickInfo, sourceFile),
                 displayParts: displayParts,
                 documentation: documentation,
                 tags: tags,
             };
         }
+        function getNodeForQuickInfo(node) {
+            if (ts.isNewExpression(node.parent) && node.pos === node.parent.pos) {
+                return node.parent.expression;
+            }
+            return node;
+        }
         function shouldGetType(sourceFile, node, position) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return !ts.isLabelName(node) && !ts.isTagName(node);
-                case 189 /* PropertyAccessExpression */:
-                case 148 /* QualifiedName */:
+                case 190 /* PropertyAccessExpression */:
+                case 149 /* QualifiedName */:
                     // Don't return quickInfo if inside the comment in `a/**/.b`
                     return !ts.isInComment(sourceFile, position);
-                case 100 /* ThisKeyword */:
-                case 178 /* ThisType */:
-                case 98 /* SuperKeyword */:
+                case 101 /* ThisKeyword */:
+                case 179 /* ThisType */:
+                case 99 /* SuperKeyword */:
                     return true;
                 default:
                     return false;
@@ -120996,13 +125017,7 @@ var ts;
         }
         /// References and Occurrences
         function getOccurrencesAtPosition(fileName, position) {
-            return ts.flatMap(getDocumentHighlights(fileName, position, [fileName]), function (entry) { return entry.highlightSpans.map(function (highlightSpan) { return ({
-                fileName: entry.fileName,
-                textSpan: highlightSpan.textSpan,
-                isWriteAccess: highlightSpan.kind === "writtenReference" /* writtenReference */,
-                isDefinition: false,
-                isInString: highlightSpan.isInString,
-            }); }); });
+            return ts.flatMap(getDocumentHighlights(fileName, position, [fileName]), function (entry) { return entry.highlightSpans.map(function (highlightSpan) { return (__assign({ fileName: entry.fileName, textSpan: highlightSpan.textSpan, isWriteAccess: highlightSpan.kind === "writtenReference" /* writtenReference */, isDefinition: false }, highlightSpan.isInString && { isInString: true }, highlightSpan.contextSpan && { contextSpan: highlightSpan.contextSpan })); }); });
         }
         function getDocumentHighlights(fileName, position, filesToSearch) {
             var normalizedFileName = ts.normalizePath(fileName);
@@ -121019,7 +125034,8 @@ var ts;
             if (ts.isIdentifier(node) && (ts.isJsxOpeningElement(node.parent) || ts.isJsxClosingElement(node.parent)) && ts.isIntrinsicJsxName(node.escapedText)) {
                 var _a = node.parent.parent, openingElement = _a.openingElement, closingElement = _a.closingElement;
                 return [openingElement, closingElement].map(function (node) {
-                    return ({ fileName: sourceFile.fileName, textSpan: ts.createTextSpanFromNode(node.tagName, sourceFile) });
+                    var textSpan = ts.createTextSpanFromNode(node.tagName, sourceFile);
+                    return __assign({ fileName: sourceFile.fileName, textSpan: textSpan }, ts.FindAllReferences.toContextSpan(textSpan, sourceFile, node.parent));
                 });
             }
             else {
@@ -121077,16 +125093,16 @@ var ts;
                 return undefined;
             }
             switch (node.kind) {
-                case 189 /* PropertyAccessExpression */:
-                case 148 /* QualifiedName */:
+                case 190 /* PropertyAccessExpression */:
+                case 149 /* QualifiedName */:
                 case 10 /* StringLiteral */:
-                case 87 /* FalseKeyword */:
-                case 102 /* TrueKeyword */:
-                case 96 /* NullKeyword */:
-                case 98 /* SuperKeyword */:
-                case 100 /* ThisKeyword */:
-                case 178 /* ThisType */:
-                case 72 /* Identifier */:
+                case 88 /* FalseKeyword */:
+                case 103 /* TrueKeyword */:
+                case 97 /* NullKeyword */:
+                case 99 /* SuperKeyword */:
+                case 101 /* ThisKeyword */:
+                case 179 /* ThisType */:
+                case 73 /* Identifier */:
                     break;
                 // Cant create the text span
                 default:
@@ -121102,7 +125118,7 @@ var ts;
                     // If this is name of a module declarations, check if this is right side of dotted module name
                     // If parent of the module declaration which is parent of this node is module declaration and its body is the module declaration that this node is name of
                     // Then this name is name from dotted module
-                    if (nodeForStartPos.parent.parent.kind === 244 /* ModuleDeclaration */ &&
+                    if (nodeForStartPos.parent.parent.kind === 245 /* ModuleDeclaration */ &&
                         nodeForStartPos.parent.parent.body === nodeForStartPos.parent) {
                         // Use parent module declarations name for start pos
                         nodeForStartPos = nodeForStartPos.parent.parent.name;
@@ -121245,30 +125261,14 @@ var ts;
         }
         function applyCodeActionCommand(fileName, actionOrFormatSettingsOrUndefined) {
             var action = typeof fileName === "string" ? actionOrFormatSettingsOrUndefined : fileName;
-            var formatSettings = typeof fileName !== "string" ? actionOrFormatSettingsOrUndefined : undefined;
-            return ts.isArray(action) ? Promise.all(action.map(function (a) { return applySingleCodeActionCommand(a, formatSettings); })) : applySingleCodeActionCommand(action, formatSettings);
+            return ts.isArray(action) ? Promise.all(action.map(function (a) { return applySingleCodeActionCommand(a); })) : applySingleCodeActionCommand(action);
         }
-        function applySingleCodeActionCommand(action, formatSettings) {
+        function applySingleCodeActionCommand(action) {
             var getPath = function (path) { return ts.toPath(path, currentDirectory, getCanonicalFileName); };
-            switch (action.type) {
-                case "install package":
-                    return host.installPackage
-                        ? host.installPackage({ fileName: getPath(action.file), packageName: action.packageName })
-                        : Promise.reject("Host does not implement `installPackage`");
-                case "generate types": {
-                    var fileToGenerateTypesFor = action.fileToGenerateTypesFor, outputFileName_1 = action.outputFileName;
-                    if (!host.inspectValue)
-                        return Promise.reject("Host does not implement `installPackage`");
-                    var valueInfoPromise = host.inspectValue({ fileNameToRequire: fileToGenerateTypesFor });
-                    return valueInfoPromise.then(function (valueInfo) {
-                        var fullOut = getPath(outputFileName_1);
-                        host.writeFile(fullOut, ts.valueInfoToDeclarationFileText(valueInfo, formatSettings || ts.testFormatSettings)); // TODO: GH#18217
-                        return { successMessage: "Wrote types to '" + fullOut + "'" };
-                    });
-                }
-                default:
-                    return ts.Debug.assertNever(action);
-            }
+            ts.Debug.assertEqual(action.type, "install package");
+            return host.installPackage
+                ? host.installPackage({ fileName: getPath(action.file), packageName: action.packageName })
+                : Promise.reject("Host does not implement `installPackage`");
         }
         function getDocCommentTemplateAtPosition(fileName, position) {
             return ts.JsDoc.getDocCommentTemplateAtPosition(ts.getNewLineOrDefaultFromHost(host), syntaxTreeCache.getCurrentSourceFile(fileName), position);
@@ -121464,6 +125464,9 @@ var ts;
                 preferences: preferences,
             };
         }
+        function getSmartSelectionRange(fileName, position) {
+            return ts.SmartSelectionRange.getSmartSelectionRange(position, syntaxTreeCache.getCurrentSourceFile(fileName));
+        }
         function getApplicableRefactors(fileName, positionOrRange, preferences) {
             if (preferences === void 0) { preferences = ts.emptyOptions; }
             synchronizeHostData();
@@ -121504,6 +125507,7 @@ var ts;
             getBreakpointStatementAtPosition: getBreakpointStatementAtPosition,
             getNavigateToItems: getNavigateToItems,
             getRenameInfo: getRenameInfo,
+            getSmartSelectionRange: getSmartSelectionRange,
             findRenameLocations: findRenameLocations,
             getNavigationBarItems: getNavigationBarItems,
             getNavigationTree: getNavigationTree,
@@ -121566,7 +125570,7 @@ var ts;
      */
     function literalIsName(node) {
         return ts.isDeclarationName(node) ||
-            node.parent.kind === 259 /* ExternalModuleReference */ ||
+            node.parent.kind === 260 /* ExternalModuleReference */ ||
             isArgumentOfElementAccessExpression(node) ||
             ts.isLiteralComputedPropertyDeclarationName(node);
     }
@@ -121583,13 +125587,13 @@ var ts;
         switch (node.kind) {
             case 10 /* StringLiteral */:
             case 8 /* NumericLiteral */:
-                if (node.parent.kind === 149 /* ComputedPropertyName */) {
+                if (node.parent.kind === 150 /* ComputedPropertyName */) {
                     return ts.isObjectLiteralElement(node.parent.parent) ? node.parent.parent : undefined;
                 }
             // falls through
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 return ts.isObjectLiteralElement(node.parent) &&
-                    (node.parent.parent.kind === 188 /* ObjectLiteralExpression */ || node.parent.parent.kind === 268 /* JsxAttributes */) &&
+                    (node.parent.parent.kind === 189 /* ObjectLiteralExpression */ || node.parent.parent.kind === 269 /* JsxAttributes */) &&
                     node.parent.name === node ? node.parent : undefined;
         }
         return undefined;
@@ -121631,7 +125635,7 @@ var ts;
     function isArgumentOfElementAccessExpression(node) {
         return node &&
             node.parent &&
-            node.parent.kind === 190 /* ElementAccessExpression */ &&
+            node.parent.kind === 191 /* ElementAccessExpression */ &&
             node.parent.argumentExpression === node;
     }
     /**
@@ -121711,114 +125715,114 @@ var ts;
                 if (node) {
                     var parent = node.parent;
                     switch (node.kind) {
-                        case 219 /* VariableStatement */:
+                        case 220 /* VariableStatement */:
                             // Span on first variable declaration
                             return spanInVariableDeclaration(node.declarationList.declarations[0]);
-                        case 237 /* VariableDeclaration */:
-                        case 154 /* PropertyDeclaration */:
-                        case 153 /* PropertySignature */:
+                        case 238 /* VariableDeclaration */:
+                        case 155 /* PropertyDeclaration */:
+                        case 154 /* PropertySignature */:
                             return spanInVariableDeclaration(node);
-                        case 151 /* Parameter */:
+                        case 152 /* Parameter */:
                             return spanInParameterDeclaration(node);
-                        case 239 /* FunctionDeclaration */:
-                        case 156 /* MethodDeclaration */:
-                        case 155 /* MethodSignature */:
-                        case 158 /* GetAccessor */:
-                        case 159 /* SetAccessor */:
-                        case 157 /* Constructor */:
-                        case 196 /* FunctionExpression */:
-                        case 197 /* ArrowFunction */:
+                        case 240 /* FunctionDeclaration */:
+                        case 157 /* MethodDeclaration */:
+                        case 156 /* MethodSignature */:
+                        case 159 /* GetAccessor */:
+                        case 160 /* SetAccessor */:
+                        case 158 /* Constructor */:
+                        case 197 /* FunctionExpression */:
+                        case 198 /* ArrowFunction */:
                             return spanInFunctionDeclaration(node);
-                        case 218 /* Block */:
+                        case 219 /* Block */:
                             if (ts.isFunctionBlock(node)) {
                                 return spanInFunctionBlock(node);
                             }
                         // falls through
-                        case 245 /* ModuleBlock */:
+                        case 246 /* ModuleBlock */:
                             return spanInBlock(node);
-                        case 274 /* CatchClause */:
+                        case 275 /* CatchClause */:
                             return spanInBlock(node.block);
-                        case 221 /* ExpressionStatement */:
+                        case 222 /* ExpressionStatement */:
                             // span on the expression
                             return textSpan(node.expression);
-                        case 230 /* ReturnStatement */:
+                        case 231 /* ReturnStatement */:
                             // span on return keyword and expression if present
                             return textSpan(node.getChildAt(0), node.expression);
-                        case 224 /* WhileStatement */:
+                        case 225 /* WhileStatement */:
                             // Span on while(...)
                             return textSpanEndingAtNextToken(node, node.expression);
-                        case 223 /* DoStatement */:
+                        case 224 /* DoStatement */:
                             // span in statement of the do statement
                             return spanInNode(node.statement);
-                        case 236 /* DebuggerStatement */:
+                        case 237 /* DebuggerStatement */:
                             // span on debugger keyword
                             return textSpan(node.getChildAt(0));
-                        case 222 /* IfStatement */:
+                        case 223 /* IfStatement */:
                             // set on if(..) span
                             return textSpanEndingAtNextToken(node, node.expression);
-                        case 233 /* LabeledStatement */:
+                        case 234 /* LabeledStatement */:
                             // span in statement
                             return spanInNode(node.statement);
-                        case 229 /* BreakStatement */:
-                        case 228 /* ContinueStatement */:
+                        case 230 /* BreakStatement */:
+                        case 229 /* ContinueStatement */:
                             // On break or continue keyword and label if present
                             return textSpan(node.getChildAt(0), node.label);
-                        case 225 /* ForStatement */:
+                        case 226 /* ForStatement */:
                             return spanInForStatement(node);
-                        case 226 /* ForInStatement */:
+                        case 227 /* ForInStatement */:
                             // span of for (a in ...)
                             return textSpanEndingAtNextToken(node, node.expression);
-                        case 227 /* ForOfStatement */:
+                        case 228 /* ForOfStatement */:
                             // span in initializer
                             return spanInInitializerOfForLike(node);
-                        case 232 /* SwitchStatement */:
+                        case 233 /* SwitchStatement */:
                             // span on switch(...)
                             return textSpanEndingAtNextToken(node, node.expression);
-                        case 271 /* CaseClause */:
-                        case 272 /* DefaultClause */:
+                        case 272 /* CaseClause */:
+                        case 273 /* DefaultClause */:
                             // span in first statement of the clause
                             return spanInNode(node.statements[0]);
-                        case 235 /* TryStatement */:
+                        case 236 /* TryStatement */:
                             // span in try block
                             return spanInBlock(node.tryBlock);
-                        case 234 /* ThrowStatement */:
+                        case 235 /* ThrowStatement */:
                             // span in throw ...
                             return textSpan(node, node.expression);
-                        case 254 /* ExportAssignment */:
+                        case 255 /* ExportAssignment */:
                             // span on export = id
                             return textSpan(node, node.expression);
-                        case 248 /* ImportEqualsDeclaration */:
+                        case 249 /* ImportEqualsDeclaration */:
                             // import statement without including semicolon
                             return textSpan(node, node.moduleReference);
-                        case 249 /* ImportDeclaration */:
+                        case 250 /* ImportDeclaration */:
                             // import statement without including semicolon
                             return textSpan(node, node.moduleSpecifier);
-                        case 255 /* ExportDeclaration */:
+                        case 256 /* ExportDeclaration */:
                             // import statement without including semicolon
                             return textSpan(node, node.moduleSpecifier);
-                        case 244 /* ModuleDeclaration */:
+                        case 245 /* ModuleDeclaration */:
                             // span on complete module if it is instantiated
                             if (ts.getModuleInstanceState(node) !== 1 /* Instantiated */) {
                                 return undefined;
                             }
                         // falls through
-                        case 240 /* ClassDeclaration */:
-                        case 243 /* EnumDeclaration */:
-                        case 278 /* EnumMember */:
-                        case 186 /* BindingElement */:
+                        case 241 /* ClassDeclaration */:
+                        case 244 /* EnumDeclaration */:
+                        case 279 /* EnumMember */:
+                        case 187 /* BindingElement */:
                             // span on complete node
                             return textSpan(node);
-                        case 231 /* WithStatement */:
+                        case 232 /* WithStatement */:
                             // span in statement
                             return spanInNode(node.statement);
-                        case 152 /* Decorator */:
+                        case 153 /* Decorator */:
                             return spanInNodeArray(parent.decorators);
-                        case 184 /* ObjectBindingPattern */:
-                        case 185 /* ArrayBindingPattern */:
+                        case 185 /* ObjectBindingPattern */:
+                        case 186 /* ArrayBindingPattern */:
                             return spanInBindingPattern(node);
                         // No breakpoint in interface, type alias
-                        case 241 /* InterfaceDeclaration */:
-                        case 242 /* TypeAliasDeclaration */:
+                        case 242 /* InterfaceDeclaration */:
+                        case 243 /* TypeAliasDeclaration */:
                             return undefined;
                         // Tokens:
                         case 26 /* SemicolonToken */:
@@ -121842,13 +125846,13 @@ var ts;
                         case 28 /* LessThanToken */:
                             return spanInGreaterThanOrLessThanToken(node);
                         // Keywords:
-                        case 107 /* WhileKeyword */:
+                        case 108 /* WhileKeyword */:
                             return spanInWhileKeyword(node);
-                        case 83 /* ElseKeyword */:
-                        case 75 /* CatchKeyword */:
-                        case 88 /* FinallyKeyword */:
+                        case 84 /* ElseKeyword */:
+                        case 76 /* CatchKeyword */:
+                        case 89 /* FinallyKeyword */:
                             return spanInNextNode(node);
-                        case 147 /* OfKeyword */:
+                        case 148 /* OfKeyword */:
                             return spanInOfKeyword(node);
                         default:
                             // Destructuring pattern in destructuring assignment
@@ -121860,14 +125864,14 @@ var ts;
                             // Set breakpoint on identifier element of destructuring pattern
                             // `a` or `...c` or `d: x` from
                             // `[a, b, ...c]` or `{ a, b }` or `{ d: x }` from destructuring pattern
-                            if ((node.kind === 72 /* Identifier */ ||
-                                node.kind === 208 /* SpreadElement */ ||
-                                node.kind === 275 /* PropertyAssignment */ ||
-                                node.kind === 276 /* ShorthandPropertyAssignment */) &&
+                            if ((node.kind === 73 /* Identifier */ ||
+                                node.kind === 209 /* SpreadElement */ ||
+                                node.kind === 276 /* PropertyAssignment */ ||
+                                node.kind === 277 /* ShorthandPropertyAssignment */) &&
                                 ts.isArrayLiteralOrObjectLiteralDestructuringPattern(parent)) {
                                 return textSpan(node);
                             }
-                            if (node.kind === 204 /* BinaryExpression */) {
+                            if (node.kind === 205 /* BinaryExpression */) {
                                 var _a = node, left = _a.left, operatorToken = _a.operatorToken;
                                 // Set breakpoint in destructuring pattern if its destructuring assignment
                                 // [a, b, c] or {a, b, c} of
@@ -121876,7 +125880,7 @@ var ts;
                                 if (ts.isArrayLiteralOrObjectLiteralDestructuringPattern(left)) {
                                     return spanInArrayLiteralOrObjectLiteralDestructuringPattern(left);
                                 }
-                                if (operatorToken.kind === 59 /* EqualsToken */ && ts.isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent)) {
+                                if (operatorToken.kind === 60 /* EqualsToken */ && ts.isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent)) {
                                     // Set breakpoint on assignment expression element of destructuring pattern
                                     // a = expression of
                                     // [a = expression, b, c] = someExpression or
@@ -121889,22 +125893,22 @@ var ts;
                             }
                             if (ts.isExpressionNode(node)) {
                                 switch (parent.kind) {
-                                    case 223 /* DoStatement */:
+                                    case 224 /* DoStatement */:
                                         // Set span as if on while keyword
                                         return spanInPreviousNode(node);
-                                    case 152 /* Decorator */:
+                                    case 153 /* Decorator */:
                                         // Set breakpoint on the decorator emit
                                         return spanInNode(node.parent);
-                                    case 225 /* ForStatement */:
-                                    case 227 /* ForOfStatement */:
+                                    case 226 /* ForStatement */:
+                                    case 228 /* ForOfStatement */:
                                         return textSpan(node);
-                                    case 204 /* BinaryExpression */:
+                                    case 205 /* BinaryExpression */:
                                         if (node.parent.operatorToken.kind === 27 /* CommaToken */) {
                                             // If this is a comma expression, the breakpoint is possible in this expression
                                             return textSpan(node);
                                         }
                                         break;
-                                    case 197 /* ArrowFunction */:
+                                    case 198 /* ArrowFunction */:
                                         if (node.parent.body === node) {
                                             // If this is body of arrow function, it is allowed to have the breakpoint
                                             return textSpan(node);
@@ -121913,21 +125917,21 @@ var ts;
                                 }
                             }
                             switch (node.parent.kind) {
-                                case 275 /* PropertyAssignment */:
+                                case 276 /* PropertyAssignment */:
                                     // If this is name of property assignment, set breakpoint in the initializer
                                     if (node.parent.name === node &&
                                         !ts.isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent.parent)) {
                                         return spanInNode(node.parent.initializer);
                                     }
                                     break;
-                                case 194 /* TypeAssertionExpression */:
+                                case 195 /* TypeAssertionExpression */:
                                     // Breakpoint in type assertion goes to its operand
                                     if (node.parent.type === node) {
                                         return spanInNextNode(node.parent.type);
                                     }
                                     break;
-                                case 237 /* VariableDeclaration */:
-                                case 151 /* Parameter */: {
+                                case 238 /* VariableDeclaration */:
+                                case 152 /* Parameter */: {
                                     // initializer of variable/parameter declaration go to previous node
                                     var _b = node.parent, initializer = _b.initializer, type = _b.type;
                                     if (initializer === node || type === node || ts.isAssignmentOperator(node.kind)) {
@@ -121935,7 +125939,7 @@ var ts;
                                     }
                                     break;
                                 }
-                                case 204 /* BinaryExpression */: {
+                                case 205 /* BinaryExpression */: {
                                     var left = node.parent.left;
                                     if (ts.isArrayLiteralOrObjectLiteralDestructuringPattern(left) && node !== left) {
                                         // If initializer of destructuring assignment move to previous token
@@ -121965,7 +125969,7 @@ var ts;
                 }
                 function spanInVariableDeclaration(variableDeclaration) {
                     // If declaration of for in statement, just set the span in parent
-                    if (variableDeclaration.parent.parent.kind === 226 /* ForInStatement */) {
+                    if (variableDeclaration.parent.parent.kind === 227 /* ForInStatement */) {
                         return spanInNode(variableDeclaration.parent.parent);
                     }
                     var parent = variableDeclaration.parent;
@@ -121977,7 +125981,7 @@ var ts;
                     // or its declaration from 'for of'
                     if (variableDeclaration.initializer ||
                         ts.hasModifier(variableDeclaration, 1 /* Export */) ||
-                        parent.parent.kind === 227 /* ForOfStatement */) {
+                        parent.parent.kind === 228 /* ForOfStatement */) {
                         return textSpanFromVariableDeclaration(variableDeclaration);
                     }
                     if (ts.isVariableDeclarationList(variableDeclaration.parent) &&
@@ -122018,7 +126022,7 @@ var ts;
                 }
                 function canFunctionHaveSpanInWholeDeclaration(functionDeclaration) {
                     return ts.hasModifier(functionDeclaration, 1 /* Export */) ||
-                        (functionDeclaration.parent.kind === 240 /* ClassDeclaration */ && functionDeclaration.kind !== 157 /* Constructor */);
+                        (functionDeclaration.parent.kind === 241 /* ClassDeclaration */ && functionDeclaration.kind !== 158 /* Constructor */);
                 }
                 function spanInFunctionDeclaration(functionDeclaration) {
                     // No breakpoints in the function signature
@@ -122041,26 +126045,26 @@ var ts;
                 }
                 function spanInBlock(block) {
                     switch (block.parent.kind) {
-                        case 244 /* ModuleDeclaration */:
+                        case 245 /* ModuleDeclaration */:
                             if (ts.getModuleInstanceState(block.parent) !== 1 /* Instantiated */) {
                                 return undefined;
                             }
                         // falls through
                         // Set on parent if on same line otherwise on first statement
-                        case 224 /* WhileStatement */:
-                        case 222 /* IfStatement */:
-                        case 226 /* ForInStatement */:
+                        case 225 /* WhileStatement */:
+                        case 223 /* IfStatement */:
+                        case 227 /* ForInStatement */:
                             return spanInNodeIfStartsOnSameLine(block.parent, block.statements[0]);
                         // Set span on previous token if it starts on same line otherwise on the first statement of the block
-                        case 225 /* ForStatement */:
-                        case 227 /* ForOfStatement */:
+                        case 226 /* ForStatement */:
+                        case 228 /* ForOfStatement */:
                             return spanInNodeIfStartsOnSameLine(ts.findPrecedingToken(block.pos, sourceFile, block.parent), block.statements[0]);
                     }
                     // Default action is to set on first statement
                     return spanInNode(block.statements[0]);
                 }
                 function spanInInitializerOfForLike(forLikeStatement) {
-                    if (forLikeStatement.initializer.kind === 238 /* VariableDeclarationList */) {
+                    if (forLikeStatement.initializer.kind === 239 /* VariableDeclarationList */) {
                         // Declaration list - set breakpoint in first declaration
                         var variableDeclarationList = forLikeStatement.initializer;
                         if (variableDeclarationList.declarations.length > 0) {
@@ -122085,21 +126089,21 @@ var ts;
                 }
                 function spanInBindingPattern(bindingPattern) {
                     // Set breakpoint in first binding element
-                    var firstBindingElement = ts.forEach(bindingPattern.elements, function (element) { return element.kind !== 210 /* OmittedExpression */ ? element : undefined; });
+                    var firstBindingElement = ts.forEach(bindingPattern.elements, function (element) { return element.kind !== 211 /* OmittedExpression */ ? element : undefined; });
                     if (firstBindingElement) {
                         return spanInNode(firstBindingElement);
                     }
                     // Empty binding pattern of binding element, set breakpoint on binding element
-                    if (bindingPattern.parent.kind === 186 /* BindingElement */) {
+                    if (bindingPattern.parent.kind === 187 /* BindingElement */) {
                         return textSpan(bindingPattern.parent);
                     }
                     // Variable declaration is used as the span
                     return textSpanFromVariableDeclaration(bindingPattern.parent);
                 }
                 function spanInArrayLiteralOrObjectLiteralDestructuringPattern(node) {
-                    ts.Debug.assert(node.kind !== 185 /* ArrayBindingPattern */ && node.kind !== 184 /* ObjectBindingPattern */);
-                    var elements = node.kind === 187 /* ArrayLiteralExpression */ ? node.elements : node.properties;
-                    var firstBindingElement = ts.forEach(elements, function (element) { return element.kind !== 210 /* OmittedExpression */ ? element : undefined; });
+                    ts.Debug.assert(node.kind !== 186 /* ArrayBindingPattern */ && node.kind !== 185 /* ObjectBindingPattern */);
+                    var elements = node.kind === 188 /* ArrayLiteralExpression */ ? node.elements : node.properties;
+                    var firstBindingElement = ts.forEach(elements, function (element) { return element.kind !== 211 /* OmittedExpression */ ? element : undefined; });
                     if (firstBindingElement) {
                         return spanInNode(firstBindingElement);
                     }
@@ -122107,18 +126111,18 @@ var ts;
                     // just nested element in another destructuring assignment
                     // set breakpoint on assignment when parent is destructuring assignment
                     // Otherwise set breakpoint for this element
-                    return textSpan(node.parent.kind === 204 /* BinaryExpression */ ? node.parent : node);
+                    return textSpan(node.parent.kind === 205 /* BinaryExpression */ ? node.parent : node);
                 }
                 // Tokens:
                 function spanInOpenBraceToken(node) {
                     switch (node.parent.kind) {
-                        case 243 /* EnumDeclaration */:
+                        case 244 /* EnumDeclaration */:
                             var enumDeclaration = node.parent;
                             return spanInNodeIfStartsOnSameLine(ts.findPrecedingToken(node.pos, sourceFile, node.parent), enumDeclaration.members.length ? enumDeclaration.members[0] : enumDeclaration.getLastToken(sourceFile));
-                        case 240 /* ClassDeclaration */:
+                        case 241 /* ClassDeclaration */:
                             var classDeclaration = node.parent;
                             return spanInNodeIfStartsOnSameLine(ts.findPrecedingToken(node.pos, sourceFile, node.parent), classDeclaration.members.length ? classDeclaration.members[0] : classDeclaration.getLastToken(sourceFile));
-                        case 246 /* CaseBlock */:
+                        case 247 /* CaseBlock */:
                             return spanInNodeIfStartsOnSameLine(node.parent.parent, node.parent.clauses[0]);
                     }
                     // Default to parent node
@@ -122126,25 +126130,25 @@ var ts;
                 }
                 function spanInCloseBraceToken(node) {
                     switch (node.parent.kind) {
-                        case 245 /* ModuleBlock */:
+                        case 246 /* ModuleBlock */:
                             // If this is not an instantiated module block, no bp span
                             if (ts.getModuleInstanceState(node.parent.parent) !== 1 /* Instantiated */) {
                                 return undefined;
                             }
                         // falls through
-                        case 243 /* EnumDeclaration */:
-                        case 240 /* ClassDeclaration */:
+                        case 244 /* EnumDeclaration */:
+                        case 241 /* ClassDeclaration */:
                             // Span on close brace token
                             return textSpan(node);
-                        case 218 /* Block */:
+                        case 219 /* Block */:
                             if (ts.isFunctionBlock(node.parent)) {
                                 // Span on close brace token
                                 return textSpan(node);
                             }
                         // falls through
-                        case 274 /* CatchClause */:
+                        case 275 /* CatchClause */:
                             return spanInNode(ts.lastOrUndefined(node.parent.statements));
-                        case 246 /* CaseBlock */:
+                        case 247 /* CaseBlock */:
                             // breakpoint in last statement of the last clause
                             var caseBlock = node.parent;
                             var lastClause = ts.lastOrUndefined(caseBlock.clauses);
@@ -122152,7 +126156,7 @@ var ts;
                                 return spanInNode(ts.lastOrUndefined(lastClause.statements));
                             }
                             return undefined;
-                        case 184 /* ObjectBindingPattern */:
+                        case 185 /* ObjectBindingPattern */:
                             // Breakpoint in last binding element or binding pattern if it contains no elements
                             var bindingPattern = node.parent;
                             return spanInNode(ts.lastOrUndefined(bindingPattern.elements) || bindingPattern);
@@ -122168,7 +126172,7 @@ var ts;
                 }
                 function spanInCloseBracketToken(node) {
                     switch (node.parent.kind) {
-                        case 185 /* ArrayBindingPattern */:
+                        case 186 /* ArrayBindingPattern */:
                             // Breakpoint in last binding element or binding pattern if it contains no elements
                             var bindingPattern = node.parent;
                             return textSpan(ts.lastOrUndefined(bindingPattern.elements) || bindingPattern);
@@ -122183,12 +126187,12 @@ var ts;
                     }
                 }
                 function spanInOpenParenToken(node) {
-                    if (node.parent.kind === 223 /* DoStatement */ || // Go to while keyword and do action instead
-                        node.parent.kind === 191 /* CallExpression */ ||
-                        node.parent.kind === 192 /* NewExpression */) {
+                    if (node.parent.kind === 224 /* DoStatement */ || // Go to while keyword and do action instead
+                        node.parent.kind === 192 /* CallExpression */ ||
+                        node.parent.kind === 193 /* NewExpression */) {
                         return spanInPreviousNode(node);
                     }
-                    if (node.parent.kind === 195 /* ParenthesizedExpression */) {
+                    if (node.parent.kind === 196 /* ParenthesizedExpression */) {
                         return spanInNextNode(node);
                     }
                     // Default to parent node
@@ -122197,21 +126201,21 @@ var ts;
                 function spanInCloseParenToken(node) {
                     // Is this close paren token of parameter list, set span in previous token
                     switch (node.parent.kind) {
-                        case 196 /* FunctionExpression */:
-                        case 239 /* FunctionDeclaration */:
-                        case 197 /* ArrowFunction */:
-                        case 156 /* MethodDeclaration */:
-                        case 155 /* MethodSignature */:
-                        case 158 /* GetAccessor */:
-                        case 159 /* SetAccessor */:
-                        case 157 /* Constructor */:
-                        case 224 /* WhileStatement */:
-                        case 223 /* DoStatement */:
-                        case 225 /* ForStatement */:
-                        case 227 /* ForOfStatement */:
-                        case 191 /* CallExpression */:
-                        case 192 /* NewExpression */:
-                        case 195 /* ParenthesizedExpression */:
+                        case 197 /* FunctionExpression */:
+                        case 240 /* FunctionDeclaration */:
+                        case 198 /* ArrowFunction */:
+                        case 157 /* MethodDeclaration */:
+                        case 156 /* MethodSignature */:
+                        case 159 /* GetAccessor */:
+                        case 160 /* SetAccessor */:
+                        case 158 /* Constructor */:
+                        case 225 /* WhileStatement */:
+                        case 224 /* DoStatement */:
+                        case 226 /* ForStatement */:
+                        case 228 /* ForOfStatement */:
+                        case 192 /* CallExpression */:
+                        case 193 /* NewExpression */:
+                        case 196 /* ParenthesizedExpression */:
                             return spanInPreviousNode(node);
                         // Default to parent node
                         default:
@@ -122221,20 +126225,20 @@ var ts;
                 function spanInColonToken(node) {
                     // Is this : specifying return annotation of the function declaration
                     if (ts.isFunctionLike(node.parent) ||
-                        node.parent.kind === 275 /* PropertyAssignment */ ||
-                        node.parent.kind === 151 /* Parameter */) {
+                        node.parent.kind === 276 /* PropertyAssignment */ ||
+                        node.parent.kind === 152 /* Parameter */) {
                         return spanInPreviousNode(node);
                     }
                     return spanInNode(node.parent);
                 }
                 function spanInGreaterThanOrLessThanToken(node) {
-                    if (node.parent.kind === 194 /* TypeAssertionExpression */) {
+                    if (node.parent.kind === 195 /* TypeAssertionExpression */) {
                         return spanInNextNode(node);
                     }
                     return spanInNode(node.parent);
                 }
                 function spanInWhileKeyword(node) {
-                    if (node.parent.kind === 223 /* DoStatement */) {
+                    if (node.parent.kind === 224 /* DoStatement */) {
                         // Set span on while expression
                         return textSpanEndingAtNextToken(node, node.parent.expression);
                     }
@@ -122242,7 +126246,7 @@ var ts;
                     return spanInNode(node.parent);
                 }
                 function spanInOfKeyword(node) {
-                    if (node.parent.kind === 227 /* ForOfStatement */) {
+                    if (node.parent.kind === 228 /* ForOfStatement */) {
                         // Set using next token
                         return spanInNextNode(node);
                     }
@@ -122711,6 +126715,10 @@ var ts;
             var _this = this;
             return this.forwardJSONCall("getRenameInfo('" + fileName + "', " + position + ")", function () { return _this.languageService.getRenameInfo(fileName, position, options); });
         };
+        LanguageServiceShimObject.prototype.getSmartSelectionRange = function (fileName, position) {
+            var _this = this;
+            return this.forwardJSONCall("getSmartSelectionRange('" + fileName + "', " + position + ")", function () { return _this.languageService.getSmartSelectionRange(fileName, position); });
+        };
         LanguageServiceShimObject.prototype.findRenameLocations = function (fileName, position, findInStrings, findInComments, providePrefixAndSuffixTextForRename) {
             var _this = this;
             return this.forwardJSONCall("findRenameLocations('" + fileName + "', " + position + ", " + findInStrings + ", " + findInComments + ", " + providePrefixAndSuffixTextForRename + ")", function () { return _this.languageService.findRenameLocations(fileName, position, findInStrings, findInComments, providePrefixAndSuffixTextForRename); });
@@ -123253,6 +127261,8 @@ var ts;
         WatchType["ConfigFileForInferredRoot"] = "Config file for the inferred project root";
         WatchType["NodeModulesForClosedScriptInfo"] = "node_modules for closed script infos in them";
         WatchType["MissingSourceMapFile"] = "Missing source map file";
+        WatchType["NoopConfigFileForInferredRoot"] = "Noop Config file for the inferred project root";
+        WatchType["MissingGeneratedFile"] = "Missing generated file";
     })(WatchType = ts.WatchType || (ts.WatchType = {}));
 })(ts || (ts = {}));
 // tslint:disable no-unnecessary-qualifier
@@ -123356,6 +127366,8 @@ var ts;
                 CommandTypes["ApplyChangedToOpenFiles"] = "applyChangedToOpenFiles";
                 CommandTypes["UpdateOpen"] = "updateOpen";
                 /* @internal */
+                CommandTypes["EncodedSyntacticClassificationsFull"] = "encodedSyntacticClassifications-full";
+                /* @internal */
                 CommandTypes["EncodedSemanticClassificationsFull"] = "encodedSemanticClassifications-full";
                 /* @internal */
                 CommandTypes["Cleanup"] = "cleanup";
@@ -123391,6 +127403,9 @@ var ts;
                 /* @internal */
                 CommandTypes["GetEditsForFileRenameFull"] = "getEditsForFileRename-full";
                 CommandTypes["ConfigurePlugin"] = "configurePlugin";
+                CommandTypes["SelectionRange"] = "selectionRange";
+                /* @internal */
+                CommandTypes["SelectionRangeFull"] = "selectionRange-full";
                 // NOTE: If updating this, be sure to also update `allCommandNames` in `harness/unittests/session.ts`.
             })(CommandTypes = protocol.CommandTypes || (protocol.CommandTypes = {}));
             var IndentStyle;
@@ -123435,6 +127450,9 @@ var ts;
                 ScriptTarget["ES2015"] = "ES2015";
                 ScriptTarget["ES2016"] = "ES2016";
                 ScriptTarget["ES2017"] = "ES2017";
+                ScriptTarget["ES2018"] = "ES2018";
+                ScriptTarget["ES2019"] = "ES2019";
+                ScriptTarget["ES2020"] = "ES2020";
                 ScriptTarget["ESNext"] = "ESNext";
             })(ScriptTarget = protocol.ScriptTarget || (protocol.ScriptTarget = {}));
         })(protocol = server.protocol || (server.protocol = {}));
@@ -123942,7 +127960,6 @@ var ts;
             isKnownTypesPackageName: ts.returnFalse,
             // Should never be called because we never provide a types registry.
             installPackage: ts.notImplemented,
-            inspectValue: ts.notImplemented,
             enqueueInstallTypingsRequest: ts.noop,
             attach: ts.noop,
             onProjectClosed: ts.noop,
@@ -124004,9 +128021,6 @@ var ts;
             TypingsCache.prototype.installPackage = function (options) {
                 return this.installer.installPackage(options);
             };
-            TypingsCache.prototype.inspectValue = function (options) {
-                return this.installer.inspectValue(options);
-            };
             TypingsCache.prototype.enqueueInstallTypingsForProject = function (project, unresolvedImports, forceRefresh) {
                 var typeAcquisition = project.getTypeAcquisition();
                 if (!typeAcquisition || !typeAcquisition.enable) {
@@ -124131,9 +128145,13 @@ var ts;
             return value instanceof server.ScriptInfo;
         }
         server.isScriptInfo = isScriptInfo;
+        function isGeneratedFileWatcher(watch) {
+            return watch.generatedFilePath !== undefined;
+        }
         var Project = /** @class */ (function () {
             /*@internal*/
-            function Project(projectName, projectKind, projectService, documentRegistry, hasExplicitListOfFiles, lastFileExceededProgramSize, compilerOptions, compileOnSaveEnabled, directoryStructureHost, currentDirectory) {
+            function Project(
+            /*@internal*/ projectName, projectKind, projectService, documentRegistry, hasExplicitListOfFiles, lastFileExceededProgramSize, compilerOptions, compileOnSaveEnabled, directoryStructureHost, currentDirectory) {
                 var _this = this;
                 this.projectName = projectName;
                 this.projectKind = projectKind;
@@ -124176,6 +128194,8 @@ var ts;
                 this.hasChangedAutomaticTypeDirectiveNames = false;
                 /*@internal*/
                 this.typingFiles = server.emptyArray;
+                /*@internal*/
+                this.globalCacheResolutionModuleName = ts.JsTyping.nonRelativeModuleNameForTypingCache;
                 this.directoryStructureHost = directoryStructureHost;
                 this.currentDirectory = this.projectService.getNormalizedAbsolutePath(currentDirectory || "");
                 this.getCanonicalFileName = this.projectService.toCanonicalFileName;
@@ -124218,13 +128238,13 @@ var ts;
                 server.updateProjectIfDirty(this);
                 return hasOneOrMoreJsAndNoTsFiles(this);
             };
-            Project.resolveModule = function (moduleName, initialDir, host, log) {
+            Project.resolveModule = function (moduleName, initialDir, host, log, logErrors) {
                 var resolvedPath = ts.normalizeSlashes(host.resolvePath(ts.combinePaths(initialDir, "node_modules")));
                 log("Loading " + moduleName + " from " + initialDir + " (resolved to " + resolvedPath + ")");
                 var result = host.require(resolvedPath, moduleName); // TODO: GH#18217
                 if (result.error) {
                     var err = result.error.stack || result.error.message || JSON.stringify(result.error);
-                    log("Failed to load module '" + moduleName + "': " + err);
+                    (logErrors || log)("Failed to load module '" + moduleName + "' from " + resolvedPath + ": " + err);
                     return undefined;
                 }
                 return result.module;
@@ -124235,10 +128255,6 @@ var ts;
             Project.prototype.installPackage = function (options) {
                 return this.typingsCache.installPackage(__assign({}, options, { projectName: this.projectName, projectRootPath: this.toPath(this.currentDirectory) }));
             };
-            /* @internal */
-            Project.prototype.inspectValue = function (options) {
-                return this.typingsCache.inspectValue(options);
-            };
             Object.defineProperty(Project.prototype, "typingsCache", {
                 get: function () {
                     return this.projectService.typingsCache;
@@ -124377,6 +128393,10 @@ var ts;
                 return this.getTypeAcquisition().enable ? this.projectService.typingsInstaller.globalTypingsCacheLocation : undefined;
             };
             /*@internal*/
+            Project.prototype.fileIsOpen = function (filePath) {
+                return this.projectService.openFiles.has(filePath);
+            };
+            /*@internal*/
             Project.prototype.writeLog = function (s) {
                 this.projectService.logger.info(s);
             };
@@ -124468,6 +128488,7 @@ var ts;
                 this.lastFileExceededProgramSize = lastFileExceededProgramSize;
                 this.builderState = undefined;
                 this.resolutionCache.closeTypeRootsWatch();
+                this.clearGeneratedFileWatch();
                 this.projectService.onUpdateLanguageServiceStateForProject(this, /*languageServiceEnabled*/ false);
             };
             Project.prototype.getProjectName = function () {
@@ -124545,6 +128566,7 @@ var ts;
                     ts.clearMap(this.missingFilesMap, ts.closeFileWatcher);
                     this.missingFilesMap = undefined;
                 }
+                this.clearGeneratedFileWatch();
                 // signal language service to release source files acquired from document registry
                 this.languageService.dispose();
                 this.languageService = undefined;
@@ -124802,6 +128824,32 @@ var ts;
                     ts.updateMissingFilePathsWatch(this.program, this.missingFilesMap || (this.missingFilesMap = ts.createMap()), 
                     // Watch the missing files
                     function (missingFilePath) { return _this.addMissingFileWatcher(missingFilePath); });
+                    if (this.generatedFilesMap) {
+                        var outPath = this.compilerOptions.outFile && this.compilerOptions.out;
+                        if (isGeneratedFileWatcher(this.generatedFilesMap)) {
+                            // --out
+                            if (!outPath || !this.isValidGeneratedFileWatcher(ts.removeFileExtension(outPath) + ".d.ts" /* Dts */, this.generatedFilesMap)) {
+                                this.clearGeneratedFileWatch();
+                            }
+                        }
+                        else {
+                            // MultiFile
+                            if (outPath) {
+                                this.clearGeneratedFileWatch();
+                            }
+                            else {
+                                this.generatedFilesMap.forEach(function (watcher, source) {
+                                    var sourceFile = _this.program.getSourceFileByPath(source);
+                                    if (!sourceFile ||
+                                        sourceFile.resolvedPath !== source ||
+                                        !_this.isValidGeneratedFileWatcher(ts.getDeclarationEmitOutputFilePathWorker(sourceFile.fileName, _this.compilerOptions, _this.currentDirectory, _this.program.getCommonSourceDirectory(), _this.getCanonicalFileName), watcher)) {
+                                        ts.closeFileWatcherOf(watcher);
+                                        _this.generatedFilesMap.delete(source);
+                                    }
+                                });
+                            }
+                        }
+                    }
                     // Watch the type locations that would be added to program as part of automatic type resolutions
                     if (this.languageServiceEnabled) {
                         this.resolutionCache.updateTypeRootsWatch();
@@ -124811,7 +128859,7 @@ var ts;
                 this.externalFiles = this.getExternalFiles();
                 ts.enumerateInsertsAndDeletes(this.externalFiles, oldExternalFiles, ts.getStringComparer(!this.useCaseSensitiveFileNames()), 
                 // Ensure a ScriptInfo is created for new external files. This is performed indirectly
-                // by the LSHost for files in the program when the program is retrieved above but
+                // by the host for files in the program when the program is retrieved above but
                 // the program doesn't contain external files so this must be done explicitly.
                 function (inserted) {
                     var scriptInfo = _this.projectService.getOrCreateScriptInfoNotOpenedByClient(inserted, _this.currentDirectory, _this.directoryStructureHost);
@@ -124819,6 +128867,9 @@ var ts;
                 }, function (removed) { return _this.detachScriptInfoFromProject(removed); });
                 var elapsed = ts.timestamp() - start;
                 this.writeLog("Finishing updateGraphWorker: Project: " + this.getProjectName() + " Version: " + this.getProjectVersion() + " structureChanged: " + hasNewProgram + " Elapsed: " + elapsed + "ms");
+                if (this.program !== oldProgram) {
+                    this.print();
+                }
                 return hasNewProgram;
             };
             Project.prototype.detachScriptInfoFromProject = function (uncheckedFileName, noRemoveResolution) {
@@ -124848,6 +128899,52 @@ var ts;
             Project.prototype.isWatchedMissingFile = function (path) {
                 return !!this.missingFilesMap && this.missingFilesMap.has(path);
             };
+            /* @internal */
+            Project.prototype.addGeneratedFileWatch = function (generatedFile, sourceFile) {
+                if (this.compilerOptions.outFile || this.compilerOptions.out) {
+                    // Single watcher
+                    if (!this.generatedFilesMap) {
+                        this.generatedFilesMap = this.createGeneratedFileWatcher(generatedFile);
+                    }
+                }
+                else {
+                    // Map
+                    var path = this.toPath(sourceFile);
+                    if (this.generatedFilesMap) {
+                        if (isGeneratedFileWatcher(this.generatedFilesMap)) {
+                            ts.Debug.fail(this.projectName + " Expected to not have --out watcher for generated file with options: " + JSON.stringify(this.compilerOptions));
+                            return;
+                        }
+                        if (this.generatedFilesMap.has(path))
+                            return;
+                    }
+                    else {
+                        this.generatedFilesMap = ts.createMap();
+                    }
+                    this.generatedFilesMap.set(path, this.createGeneratedFileWatcher(generatedFile));
+                }
+            };
+            Project.prototype.createGeneratedFileWatcher = function (generatedFile) {
+                var _this = this;
+                return {
+                    generatedFilePath: this.toPath(generatedFile),
+                    watcher: this.projectService.watchFactory.watchFile(this.projectService.host, generatedFile, function () { return _this.projectService.delayUpdateProjectGraphAndEnsureProjectStructureForOpenFiles(_this); }, ts.PollingInterval.High, "Missing generated file" /* MissingGeneratedFile */, this)
+                };
+            };
+            Project.prototype.isValidGeneratedFileWatcher = function (generateFile, watcher) {
+                return this.toPath(generateFile) === watcher.generatedFilePath;
+            };
+            Project.prototype.clearGeneratedFileWatch = function () {
+                if (this.generatedFilesMap) {
+                    if (isGeneratedFileWatcher(this.generatedFilesMap)) {
+                        ts.closeFileWatcherOf(this.generatedFilesMap);
+                    }
+                    else {
+                        ts.clearMap(this.generatedFilesMap, ts.closeFileWatcherOf);
+                    }
+                    this.generatedFilesMap = undefined;
+                }
+            };
             Project.prototype.getScriptInfoForNormalizedPath = function (fileName) {
                 var scriptInfo = this.projectService.getScriptInfoForPath(this.toPath(fileName));
                 if (scriptInfo && !scriptInfo.isAttached(this)) {
@@ -124983,11 +129080,11 @@ var ts;
             Project.prototype.enablePlugin = function (pluginConfigEntry, searchPaths, pluginConfigOverrides) {
                 var _this = this;
                 this.projectService.logger.info("Enabling plugin " + pluginConfigEntry.name + " from candidate paths: " + searchPaths.join(","));
-                var log = function (message) {
-                    _this.projectService.logger.info(message);
-                };
+                var log = function (message) { return _this.projectService.logger.info(message); };
+                var errorLogs;
+                var logError = function (message) { (errorLogs || (errorLogs = [])).push(message); };
                 var resolvedModule = ts.firstDefined(searchPaths, function (searchPath) {
-                    return Project.resolveModule(pluginConfigEntry.name, searchPath, _this.projectService.host, log);
+                    return Project.resolveModule(pluginConfigEntry.name, searchPath, _this.projectService.host, log, logError);
                 });
                 if (resolvedModule) {
                     var configurationOverride = pluginConfigOverrides && pluginConfigOverrides.get(pluginConfigEntry.name);
@@ -125000,6 +129097,7 @@ var ts;
                     this.enableProxy(resolvedModule, pluginConfigEntry);
                 }
                 else {
+                    ts.forEach(errorLogs, log);
                     this.projectService.logger.info("Couldn't find " + pluginConfigEntry.name);
                 }
             };
@@ -125352,12 +129450,13 @@ var ts;
         var ExternalProject = /** @class */ (function (_super) {
             __extends(ExternalProject, _super);
             /*@internal*/
-            function ExternalProject(externalProjectName, projectService, documentRegistry, compilerOptions, lastFileExceededProgramSize, compileOnSaveEnabled, projectFilePath) {
+            function ExternalProject(externalProjectName, projectService, documentRegistry, compilerOptions, lastFileExceededProgramSize, compileOnSaveEnabled, projectFilePath, pluginConfigOverrides) {
                 var _this = _super.call(this, externalProjectName, ProjectKind.External, projectService, documentRegistry, 
                 /*hasExplicitListOfFiles*/ true, lastFileExceededProgramSize, compilerOptions, compileOnSaveEnabled, projectService.host, ts.getDirectoryPath(projectFilePath || ts.normalizeSlashes(externalProjectName))) || this;
                 _this.externalProjectName = externalProjectName;
                 _this.compileOnSaveEnabled = compileOnSaveEnabled;
                 _this.excludedFiles = [];
+                _this.enableGlobalPlugins(_this.getCompilerOptions(), pluginConfigOverrides);
                 return _this;
             }
             ExternalProject.prototype.updateGraph = function () {
@@ -126048,6 +130147,10 @@ var ts;
                 return this.watchFactory.watchDirectory(this.host, directory, function (fileOrDirectory) {
                     var fileOrDirectoryPath = _this.toPath(fileOrDirectory);
                     project.getCachedDirectoryStructureHost().addOrDeleteFileOrDirectory(fileOrDirectory, fileOrDirectoryPath);
+                    // don't trigger callback on open, existing files
+                    if (project.fileIsOpen(fileOrDirectoryPath)) {
+                        return;
+                    }
                     if (ts.isPathIgnored(fileOrDirectoryPath))
                         return;
                     var configFilename = project.getConfigFilePath();
@@ -126115,7 +130218,13 @@ var ts;
                 project.print();
                 project.close();
                 if (ts.Debug.shouldAssert(1 /* Normal */)) {
-                    this.filenameToScriptInfo.forEach(function (info) { return ts.Debug.assert(!info.isAttached(project), "Found script Info still attached to project", function () { return project.projectName + ": ScriptInfos still attached: " + JSON.stringify(ts.mapDefined(ts.arrayFrom(_this.filenameToScriptInfo.values()), function (info) { return info.isAttached(project) ? info : undefined; })); }); });
+                    this.filenameToScriptInfo.forEach(function (info) { return ts.Debug.assert(!info.isAttached(project), "Found script Info still attached to project", function () { return project.projectName + ": ScriptInfos still attached: " + JSON.stringify(ts.arrayFrom(ts.mapDefinedIterator(_this.filenameToScriptInfo.values(), function (info) { return info.isAttached(project) ?
+                        {
+                            fileName: info.fileName,
+                            projects: info.containingProjects.map(function (p) { return p.projectName; }),
+                            hasMixedContent: info.hasMixedContent
+                        } : undefined; })), 
+                    /*replacer*/ undefined, " "); }); });
                 }
                 // Remove the project from pending project updates
                 this.pendingProjectUpdates.delete(project.getProjectName());
@@ -126340,7 +130449,9 @@ var ts;
                 });
                 var watches = [];
                 if (configFileExistenceInfo.configFileWatcherForRootOfInferredProject) {
-                    watches.push("Config file for the inferred project root" /* ConfigFileForInferredRoot */);
+                    watches.push(configFileExistenceInfo.configFileWatcherForRootOfInferredProject === ts.noopFileWatcher ?
+                        "Noop Config file for the inferred project root" /* NoopConfigFileForInferredRoot */ :
+                        "Config file for the inferred project root" /* ConfigFileForInferredRoot */);
                 }
                 if (this.configuredProjects.has(canonicalConfigFilePath)) {
                     watches.push("Config file" /* ConfigFile */);
@@ -126352,7 +130463,10 @@ var ts;
              */
             ProjectService.prototype.createConfigFileWatcherOfConfigFileExistence = function (configFileName, canonicalConfigFilePath, configFileExistenceInfo) {
                 var _this = this;
-                configFileExistenceInfo.configFileWatcherForRootOfInferredProject = this.watchFactory.watchFile(this.host, configFileName, function (_filename, eventKind) { return _this.onConfigFileChangeForOpenScriptInfo(configFileName, eventKind); }, ts.PollingInterval.High, "Config file for the inferred project root" /* ConfigFileForInferredRoot */);
+                configFileExistenceInfo.configFileWatcherForRootOfInferredProject =
+                    ts.canWatchDirectory(ts.getDirectoryPath(canonicalConfigFilePath)) ?
+                        this.watchFactory.watchFile(this.host, configFileName, function (_filename, eventKind) { return _this.onConfigFileChangeForOpenScriptInfo(configFileName, eventKind); }, ts.PollingInterval.High, "Config file for the inferred project root" /* ConfigFileForInferredRoot */) :
+                        ts.noopFileWatcher;
                 this.logConfigFileWatchUpdate(configFileName, canonicalConfigFilePath, configFileExistenceInfo, "Updated the callback" /* UpdatedCallback */);
             };
             /**
@@ -126578,7 +130692,8 @@ var ts;
             ProjectService.prototype.createExternalProject = function (projectFileName, files, options, typeAcquisition, excludedFiles) {
                 var compilerOptions = convertCompilerOptions(options);
                 var project = new server.ExternalProject(projectFileName, this, this.documentRegistry, compilerOptions, 
-                /*lastFileExceededProgramSize*/ this.getFilenameForExceededTotalSizeLimitForNonTsFiles(projectFileName, compilerOptions, files, externalFilePropertyReader), options.compileOnSave === undefined ? true : options.compileOnSave);
+                /*lastFileExceededProgramSize*/ this.getFilenameForExceededTotalSizeLimitForNonTsFiles(projectFileName, compilerOptions, files, externalFilePropertyReader), options.compileOnSave === undefined ? true : options.compileOnSave, 
+                /*projectFilePath*/ undefined, this.currentPluginConfigOverrides);
                 project.excludedFiles = excludedFiles;
                 this.addFilesToNonInferredProject(project, files, externalFilePropertyReader, typeAcquisition);
                 this.externalProjects.push(project);
@@ -127118,8 +131233,13 @@ var ts;
                 var _this = this;
                 // Since declaration info and map file watches arent updating project's directory structure host (which can cache file structure) use host
                 var declarationInfo = this.getOrCreateScriptInfoNotOpenedByClient(generatedFileName, project.currentDirectory, this.host);
-                if (!declarationInfo)
+                if (!declarationInfo) {
+                    if (sourceFileName) {
+                        // Project contains source file and it generates the generated file name
+                        project.addGeneratedFileWatch(generatedFileName, sourceFileName);
+                    }
                     return undefined;
+                }
                 // Try to get from cache
                 declarationInfo.getSnapshot(); // Ensure synchronized
                 if (ts.isString(declarationInfo.sourceMapFilePath)) {
@@ -127652,9 +131772,10 @@ var ts;
                 var assignOrphanScriptInfosToInferredProject = false;
                 if (openFiles) {
                     while (true) {
-                        var _a = openFiles.next(), file = _a.value, done = _a.done;
-                        if (done)
+                        var iterResult = openFiles.next();
+                        if (iterResult.done)
                             break;
+                        var file = iterResult.value;
                         var scriptInfo = this.getScriptInfo(file.fileName);
                         ts.Debug.assert(!scriptInfo || !scriptInfo.isScriptOpen(), "Script should not exist and not be open already");
                         // Create script infos so we have the new content for all the open files before we do any updates to projects
@@ -127664,9 +131785,10 @@ var ts;
                 }
                 if (changedFiles) {
                     while (true) {
-                        var _b = changedFiles.next(), file = _b.value, done = _b.done;
-                        if (done)
+                        var iterResult = changedFiles.next();
+                        if (iterResult.done)
                             break;
+                        var file = iterResult.value;
                         var scriptInfo = this.getScriptInfo(file.fileName);
                         ts.Debug.assert(!!scriptInfo);
                         // Make edits to script infos and marks containing project as dirty
@@ -127697,9 +131819,10 @@ var ts;
             /* @internal */
             ProjectService.prototype.applyChangesToFile = function (scriptInfo, changes) {
                 while (true) {
-                    var _a = changes.next(), change = _a.value, done = _a.done;
-                    if (done)
+                    var iterResult = changes.next();
+                    if (iterResult.done)
                         break;
+                    var change = iterResult.value;
                     scriptInfo.editContent(change.span.start, change.span.start + change.span.length, change.newText);
                 }
             };
@@ -128278,7 +132401,8 @@ var ts;
                 var project = _a.project, location = _a.location;
                 var _loop_8 = function (outputReferencedSymbol) {
                     var mappedDefinitionFile = getMappedLocation(project, documentSpanLocation(outputReferencedSymbol.definition));
-                    var definition = mappedDefinitionFile === undefined ? outputReferencedSymbol.definition : __assign({}, outputReferencedSymbol.definition, { textSpan: ts.createTextSpan(mappedDefinitionFile.pos, outputReferencedSymbol.definition.textSpan.length), fileName: mappedDefinitionFile.fileName });
+                    var definition = mappedDefinitionFile === undefined ?
+                        outputReferencedSymbol.definition : __assign({}, outputReferencedSymbol.definition, { textSpan: ts.createTextSpan(mappedDefinitionFile.pos, outputReferencedSymbol.definition.textSpan.length), fileName: mappedDefinitionFile.fileName, contextSpan: getMappedContextSpan(outputReferencedSymbol.definition, project) });
                     var symbolToAddTo = ts.find(outputs, function (o) { return ts.documentSpansEqual(o.definition, definition); });
                     if (!symbolToAddTo) {
                         symbolToAddTo = { definition: definition, references: [] };
@@ -128379,14 +132503,37 @@ var ts;
             var fileName = _a.fileName, textSpan = _a.textSpan;
             return { fileName: fileName, pos: textSpan.start };
         }
-        function getMappedLocation(location, projectService, project) {
+        function getMappedLocation(location, project) {
             var mapsTo = project.getSourceMapper().tryGetSourcePosition(location);
-            return mapsTo && projectService.fileExists(server.toNormalizedPath(mapsTo.fileName)) ? mapsTo : undefined;
+            return mapsTo && project.projectService.fileExists(server.toNormalizedPath(mapsTo.fileName)) ? mapsTo : undefined;
+        }
+        function getMappedDocumentSpan(documentSpan, project) {
+            var newPosition = getMappedLocation(documentSpanLocation(documentSpan), project);
+            if (!newPosition)
+                return undefined;
+            return {
+                fileName: newPosition.fileName,
+                textSpan: {
+                    start: newPosition.pos,
+                    length: documentSpan.textSpan.length
+                },
+                originalFileName: documentSpan.fileName,
+                originalTextSpan: documentSpan.textSpan,
+                contextSpan: getMappedContextSpan(documentSpan, project),
+                originalContextSpan: documentSpan.contextSpan
+            };
+        }
+        function getMappedContextSpan(documentSpan, project) {
+            var contextSpanStart = documentSpan.contextSpan && getMappedLocation({ fileName: documentSpan.fileName, pos: documentSpan.contextSpan.start }, project);
+            var contextSpanEnd = documentSpan.contextSpan && getMappedLocation({ fileName: documentSpan.fileName, pos: documentSpan.contextSpan.start + documentSpan.contextSpan.length }, project);
+            return contextSpanStart && contextSpanEnd ?
+                { start: contextSpanStart.pos, length: contextSpanEnd.pos - contextSpanStart.pos } :
+                undefined;
         }
         var Session = /** @class */ (function () {
             function Session(opts) {
-                var _a;
                 var _this = this;
+                var _a;
                 this.changeSeq = 0;
                 this.handlers = ts.createMapFromTemplate((_a = {},
                     _a[server.CommandNames.Status] = function () {
@@ -128580,6 +132727,9 @@ var ts;
                     _a[server.CommandNames.CompilerOptionsDiagnosticsFull] = function (request) {
                         return _this.requiredResponse(_this.getCompilerOptionsDiagnostics(request.arguments));
                     },
+                    _a[server.CommandNames.EncodedSyntacticClassificationsFull] = function (request) {
+                        return _this.requiredResponse(_this.getEncodedSyntacticClassifications(request.arguments));
+                    },
                     _a[server.CommandNames.EncodedSemanticClassificationsFull] = function (request) {
                         return _this.requiredResponse(_this.getEncodedSemanticClassifications(request.arguments));
                     },
@@ -128715,8 +132865,15 @@ var ts;
                     },
                     _a[server.CommandNames.ConfigurePlugin] = function (request) {
                         _this.configurePlugin(request.arguments);
+                        _this.doOutput(/*info*/ undefined, server.CommandNames.ConfigurePlugin, request.seq, /*success*/ true);
                         return _this.notRequired();
                     },
+                    _a[server.CommandNames.SelectionRange] = function (request) {
+                        return _this.requiredResponse(_this.getSmartSelectionRange(request.arguments, /*simplifiedResult*/ true));
+                    },
+                    _a[server.CommandNames.SelectionRangeFull] = function (request) {
+                        return _this.requiredResponse(_this.getSmartSelectionRange(request.arguments, /*simplifiedResult*/ false));
+                    },
                     _a));
                 this.host = opts.host;
                 this.cancellationToken = opts.cancellationToken;
@@ -128833,16 +132990,31 @@ var ts;
                         msg += "\n" + server.indent(err.stack);
                     }
                 }
-                if (fileRequest && this.logger.hasLevel(server.LogLevel.verbose)) {
-                    try {
-                        var _a = this.getFileAndProject(fileRequest), file = _a.file, project = _a.project;
-                        var scriptInfo = project.getScriptInfoForNormalizedPath(file);
-                        if (scriptInfo) {
-                            var text = ts.getSnapshotText(scriptInfo.getSnapshot());
-                            msg += "\n\nFile text of " + fileRequest.file + ":" + server.indent(text) + "\n";
+                if (this.logger.hasLevel(server.LogLevel.verbose)) {
+                    if (fileRequest) {
+                        try {
+                            var _a = this.getFileAndProject(fileRequest), file = _a.file, project = _a.project;
+                            var scriptInfo = project.getScriptInfoForNormalizedPath(file);
+                            if (scriptInfo) {
+                                var text = ts.getSnapshotText(scriptInfo.getSnapshot());
+                                msg += "\n\nFile text of " + fileRequest.file + ":" + server.indent(text) + "\n";
+                            }
                         }
+                        catch (_b) { } // tslint:disable-line no-empty
+                    }
+                    if (err.message && err.message.indexOf("Could not find sourceFile:") !== -1) {
+                        msg += "\n\nProjects::\n";
+                        var counter_1 = 0;
+                        var addProjectInfo = function (project) {
+                            msg += "\nProject '" + project.projectName + "' (" + server.ProjectKind[project.projectKind] + ") " + counter_1 + "\n";
+                            msg += project.filesToString(/*writeProjectFileNames*/ true);
+                            msg += "\n-----------------------------------------------\n";
+                            counter_1++;
+                        };
+                        this.projectService.externalProjects.forEach(addProjectInfo);
+                        this.projectService.configuredProjects.forEach(addProjectInfo);
+                        this.projectService.inferredProjects.forEach(addProjectInfo);
                     }
-                    catch (_b) { } // tslint:disable-line no-empty
                 }
                 this.logger.msg(msg, server.Msg.Err);
             };
@@ -128989,6 +133161,10 @@ var ts;
                     this.host.gc();
                 }
             };
+            Session.prototype.getEncodedSyntacticClassifications = function (args) {
+                var _a = this.getFileAndLanguageServiceForSyntacticOperation(args), file = _a.file, languageService = _a.languageService;
+                return languageService.getEncodedSyntacticClassifications(file, args);
+            };
             Session.prototype.getEncodedSemanticClassifications = function (args) {
                 var _a = this.getFileAndProject(args), file = _a.file, project = _a.project;
                 return project.getLanguageService().getEncodedSemanticClassifications(file, args);
@@ -129066,22 +133242,9 @@ var ts;
                 return simplifiedResult ? this.mapDefinitionInfo(definitions, project) : definitions.map(Session.mapToOriginalLocation);
             };
             Session.prototype.mapDefinitionInfoLocations = function (definitions, project) {
-                var _this = this;
                 return definitions.map(function (info) {
-                    var newLoc = getMappedLocation(documentSpanLocation(info), _this.projectService, project);
-                    return !newLoc ? info : {
-                        containerKind: info.containerKind,
-                        containerName: info.containerName,
-                        fileName: newLoc.fileName,
-                        kind: info.kind,
-                        name: info.name,
-                        textSpan: {
-                            start: newLoc.pos,
-                            length: info.textSpan.length
-                        },
-                        originalFileName: info.fileName,
-                        originalTextSpan: info.textSpan,
-                    };
+                    var newDocumentSpan = getMappedDocumentSpan(info, project);
+                    return !newDocumentSpan ? info : __assign({}, newDocumentSpan, { containerKind: info.containerKind, containerName: info.containerName, kind: info.kind, name: info.name });
                 });
             };
             Session.prototype.getDefinitionAndBoundSpan = function (args, simplifiedResult) {
@@ -129100,7 +133263,7 @@ var ts;
                 if (simplifiedResult) {
                     return {
                         definitions: this.mapDefinitionInfo(definitions, project),
-                        textSpan: this.toLocationTextSpan(textSpan, scriptInfo)
+                        textSpan: toProcolTextSpan(textSpan, scriptInfo)
                     };
                 }
                 return {
@@ -129114,7 +133277,7 @@ var ts;
             };
             Session.prototype.mapDefinitionInfo = function (definitions, project) {
                 var _this = this;
-                return definitions.map(function (def) { return _this.toFileSpan(def.fileName, def.textSpan, project); });
+                return definitions.map(function (def) { return _this.toFileSpanWithContext(def.fileName, def.textSpan, def.contextSpan, project); });
             };
             /*
              * When we map a .d.ts location to .ts, Visual Studio gets confused because there's no associated Roslyn Document in
@@ -129126,7 +133289,7 @@ var ts;
             Session.mapToOriginalLocation = function (def) {
                 if (def.originalFileName) {
                     ts.Debug.assert(def.originalTextSpan !== undefined, "originalTextSpan should be present if originalFileName is");
-                    return __assign({}, def, { fileName: def.originalFileName, textSpan: def.originalTextSpan, targetFileName: def.fileName, targetTextSpan: def.textSpan });
+                    return __assign({}, def, { fileName: def.originalFileName, textSpan: def.originalTextSpan, targetFileName: def.fileName, targetTextSpan: def.textSpan, contextSpan: def.originalContextSpan, targetContextSpan: def.contextSpan });
                 }
                 return def;
             };
@@ -129140,6 +133303,12 @@ var ts;
                     end: { line: end.line + 1, offset: end.character + 1 }
                 };
             };
+            Session.prototype.toFileSpanWithContext = function (fileName, textSpan, contextSpan, project) {
+                var fileSpan = this.toFileSpan(fileName, textSpan, project);
+                var context = contextSpan && this.toFileSpan(fileName, contextSpan, project);
+                return context ? __assign({}, fileSpan, { contextStart: context.start, contextEnd: context.end }) :
+                    fileSpan;
+            };
             Session.prototype.getTypeDefinition = function (args) {
                 var _a = this.getFileAndProject(args), file = _a.file, project = _a.project;
                 var position = this.getPositionInFile(args, file);
@@ -129147,20 +133316,9 @@ var ts;
                 return this.mapDefinitionInfo(definitions, project);
             };
             Session.prototype.mapImplementationLocations = function (implementations, project) {
-                var _this = this;
                 return implementations.map(function (info) {
-                    var newLoc = getMappedLocation(documentSpanLocation(info), _this.projectService, project);
-                    return !newLoc ? info : {
-                        fileName: newLoc.fileName,
-                        kind: info.kind,
-                        displayParts: info.displayParts,
-                        textSpan: {
-                            start: newLoc.pos,
-                            length: info.textSpan.length
-                        },
-                        originalFileName: info.fileName,
-                        originalTextSpan: info.textSpan,
-                    };
+                    var newDocumentSpan = getMappedDocumentSpan(info, project);
+                    return !newDocumentSpan ? info : __assign({}, newDocumentSpan, { kind: info.kind, displayParts: info.displayParts });
                 });
             };
             Session.prototype.getImplementation = function (args, simplifiedResult) {
@@ -129168,36 +133326,24 @@ var ts;
                 var _a = this.getFileAndProject(args), file = _a.file, project = _a.project;
                 var position = this.getPositionInFile(args, file);
                 var implementations = this.mapImplementationLocations(project.getLanguageService().getImplementationAtPosition(file, position) || server.emptyArray, project);
-                if (simplifiedResult) {
-                    return implementations.map(function (_a) {
-                        var fileName = _a.fileName, textSpan = _a.textSpan;
-                        return _this.toFileSpan(fileName, textSpan, project);
-                    });
-                }
-                return implementations.map(Session.mapToOriginalLocation);
+                return simplifiedResult ?
+                    implementations.map(function (_a) {
+                        var fileName = _a.fileName, textSpan = _a.textSpan, contextSpan = _a.contextSpan;
+                        return _this.toFileSpanWithContext(fileName, textSpan, contextSpan, project);
+                    }) :
+                    implementations.map(Session.mapToOriginalLocation);
             };
             Session.prototype.getOccurrences = function (args) {
                 var _a = this.getFileAndProject(args), file = _a.file, project = _a.project;
                 var position = this.getPositionInFile(args, file);
                 var occurrences = project.getLanguageService().getOccurrencesAtPosition(file, position);
-                if (!occurrences) {
-                    return server.emptyArray;
-                }
-                return occurrences.map(function (occurrence) {
-                    var fileName = occurrence.fileName, isWriteAccess = occurrence.isWriteAccess, textSpan = occurrence.textSpan, isInString = occurrence.isInString;
-                    var scriptInfo = project.getScriptInfo(fileName);
-                    var result = {
-                        start: scriptInfo.positionToLineOffset(textSpan.start),
-                        end: scriptInfo.positionToLineOffset(ts.textSpanEnd(textSpan)),
-                        file: fileName,
-                        isWriteAccess: isWriteAccess,
-                    };
-                    // no need to serialize the property if it is not true
-                    if (isInString) {
-                        result.isInString = isInString;
-                    }
-                    return result;
-                });
+                return occurrences ?
+                    occurrences.map(function (occurrence) {
+                        var fileName = occurrence.fileName, isWriteAccess = occurrence.isWriteAccess, textSpan = occurrence.textSpan, isInString = occurrence.isInString, contextSpan = occurrence.contextSpan;
+                        var scriptInfo = project.getScriptInfo(fileName);
+                        return __assign({}, toProtocolTextSpanWithContext(textSpan, contextSpan, scriptInfo), { file: fileName, isWriteAccess: isWriteAccess }, (isInString ? { isInString: isInString } : undefined));
+                    }) :
+                    server.emptyArray;
             };
             Session.prototype.getSyntacticDiagnosticsSync = function (args) {
                 var configFile = this.getConfigFileAndProject(args).configFile;
@@ -129233,29 +133379,21 @@ var ts;
                 var _a = this.getFileAndProject(args), file = _a.file, project = _a.project;
                 var position = this.getPositionInFile(args, file);
                 var documentHighlights = project.getLanguageService().getDocumentHighlights(file, position, args.filesToSearch);
-                if (!documentHighlights) {
+                if (!documentHighlights)
                     return server.emptyArray;
-                }
-                if (simplifiedResult) {
-                    return documentHighlights.map(convertToDocumentHighlightsItem);
-                }
-                else {
+                if (!simplifiedResult)
                     return documentHighlights;
-                }
-                function convertToDocumentHighlightsItem(documentHighlights) {
-                    var fileName = documentHighlights.fileName, highlightSpans = documentHighlights.highlightSpans;
+                return documentHighlights.map(function (_a) {
+                    var fileName = _a.fileName, highlightSpans = _a.highlightSpans;
                     var scriptInfo = project.getScriptInfo(fileName);
                     return {
                         file: fileName,
-                        highlightSpans: highlightSpans.map(convertHighlightSpan)
+                        highlightSpans: highlightSpans.map(function (_a) {
+                            var textSpan = _a.textSpan, kind = _a.kind, contextSpan = _a.contextSpan;
+                            return (__assign({}, toProtocolTextSpanWithContext(textSpan, contextSpan, scriptInfo), { kind: kind }));
+                        })
                     };
-                    function convertHighlightSpan(highlightSpan) {
-                        var textSpan = highlightSpan.textSpan, kind = highlightSpan.kind;
-                        var start = scriptInfo.positionToLineOffset(textSpan.start);
-                        var end = scriptInfo.positionToLineOffset(ts.textSpanEnd(textSpan));
-                        return { start: start, end: end, kind: kind };
-                    }
-                }
+                });
             };
             Session.prototype.setCompilerOptionsForInferredProjects = function (args) {
                 this.projectService.setCompilerOptionsForInferredProjects(args.options, args.projectRootPath);
@@ -129332,7 +133470,7 @@ var ts;
             Session.prototype.mapRenameInfo = function (info, scriptInfo) {
                 if (info.canRename) {
                     var canRename = info.canRename, fileToRename = info.fileToRename, displayName = info.displayName, fullDisplayName = info.fullDisplayName, kind = info.kind, kindModifiers = info.kindModifiers, triggerSpan = info.triggerSpan;
-                    return ts.identity({ canRename: canRename, fileToRename: fileToRename, displayName: displayName, fullDisplayName: fullDisplayName, kind: kind, kindModifiers: kindModifiers, triggerSpan: this.toLocationTextSpan(triggerSpan, scriptInfo) });
+                    return ts.identity({ canRename: canRename, fileToRename: fileToRename, displayName: displayName, fullDisplayName: fullDisplayName, kind: kind, kindModifiers: kindModifiers, triggerSpan: toProcolTextSpan(triggerSpan, scriptInfo) });
                 }
                 else {
                     return info;
@@ -129342,12 +133480,12 @@ var ts;
                 var map = ts.createMap();
                 for (var _i = 0, locations_1 = locations; _i < locations_1.length; _i++) {
                     var _a = locations_1[_i];
-                    var fileName = _a.fileName, textSpan = _a.textSpan, _ = _a.originalTextSpan, _1 = _a.originalFileName, prefixSuffixText = __rest(_a, ["fileName", "textSpan", "originalTextSpan", "originalFileName"]);
+                    var fileName = _a.fileName, textSpan = _a.textSpan, contextSpan = _a.contextSpan, _2 = _a.originalContextSpan, _ = _a.originalTextSpan, _1 = _a.originalFileName, prefixSuffixText = __rest(_a, ["fileName", "textSpan", "contextSpan", "originalContextSpan", "originalTextSpan", "originalFileName"]);
                     var group_1 = map.get(fileName);
                     if (!group_1)
                         map.set(fileName, group_1 = { file: fileName, locs: [] });
                     var scriptInfo = ts.Debug.assertDefined(this.projectService.getScriptInfo(fileName));
-                    group_1.locs.push(__assign({}, this.toLocationTextSpan(textSpan, scriptInfo), prefixSuffixText));
+                    group_1.locs.push(__assign({}, toProtocolTextSpanWithContext(textSpan, contextSpan, scriptInfo), prefixSuffixText));
                 }
                 return ts.arrayFrom(map.values());
             };
@@ -129357,30 +133495,28 @@ var ts;
                 var projects = this.getProjects(args);
                 var position = this.getPositionInFile(args, file);
                 var references = combineProjectOutputForReferences(projects, this.getDefaultProject(args), { fileName: args.file, pos: position });
-                if (simplifiedResult) {
-                    var defaultProject = this.getDefaultProject(args);
-                    var scriptInfo = defaultProject.getScriptInfoForNormalizedPath(file);
-                    var nameInfo = defaultProject.getLanguageService().getQuickInfoAtPosition(file, position);
-                    var symbolDisplayString = nameInfo ? ts.displayPartsToString(nameInfo.displayParts) : "";
-                    var nameSpan = nameInfo && nameInfo.textSpan;
-                    var symbolStartOffset = nameSpan ? scriptInfo.positionToLineOffset(nameSpan.start).offset : 0;
-                    var symbolName_1 = nameSpan ? scriptInfo.getSnapshot().getText(nameSpan.start, ts.textSpanEnd(nameSpan)) : "";
-                    var refs = ts.flatMap(references, function (referencedSymbol) {
-                        return referencedSymbol.references.map(function (_a) {
-                            var fileName = _a.fileName, textSpan = _a.textSpan, isWriteAccess = _a.isWriteAccess, isDefinition = _a.isDefinition;
-                            var scriptInfo = ts.Debug.assertDefined(_this.projectService.getScriptInfo(fileName));
-                            var start = scriptInfo.positionToLineOffset(textSpan.start);
-                            var lineSpan = scriptInfo.lineToTextSpan(start.line - 1);
-                            var lineText = scriptInfo.getSnapshot().getText(lineSpan.start, ts.textSpanEnd(lineSpan)).replace(/\r|\n/g, "");
-                            return __assign({}, toFileSpan(fileName, textSpan, scriptInfo), { lineText: lineText, isWriteAccess: isWriteAccess, isDefinition: isDefinition });
-                        });
-                    });
-                    var result = { refs: refs, symbolName: symbolName_1, symbolStartOffset: symbolStartOffset, symbolDisplayString: symbolDisplayString };
-                    return result;
-                }
-                else {
+                if (!simplifiedResult)
                     return references;
-                }
+                var defaultProject = this.getDefaultProject(args);
+                var scriptInfo = defaultProject.getScriptInfoForNormalizedPath(file);
+                var nameInfo = defaultProject.getLanguageService().getQuickInfoAtPosition(file, position);
+                var symbolDisplayString = nameInfo ? ts.displayPartsToString(nameInfo.displayParts) : "";
+                var nameSpan = nameInfo && nameInfo.textSpan;
+                var symbolStartOffset = nameSpan ? scriptInfo.positionToLineOffset(nameSpan.start).offset : 0;
+                var symbolName = nameSpan ? scriptInfo.getSnapshot().getText(nameSpan.start, ts.textSpanEnd(nameSpan)) : "";
+                var refs = ts.flatMap(references, function (referencedSymbol) {
+                    return referencedSymbol.references.map(function (_a) {
+                        var fileName = _a.fileName, textSpan = _a.textSpan, contextSpan = _a.contextSpan, isWriteAccess = _a.isWriteAccess, isDefinition = _a.isDefinition;
+                        var scriptInfo = ts.Debug.assertDefined(_this.projectService.getScriptInfo(fileName));
+                        var span = toProtocolTextSpanWithContext(textSpan, contextSpan, scriptInfo);
+                        var lineSpan = scriptInfo.lineToTextSpan(span.start.line - 1);
+                        var lineText = scriptInfo.getSnapshot().getText(lineSpan.start, ts.textSpanEnd(lineSpan)).replace(/\r|\n/g, "");
+                        return __assign({ file: fileName }, span, { lineText: lineText,
+                            isWriteAccess: isWriteAccess,
+                            isDefinition: isDefinition });
+                    });
+                });
+                return { refs: refs, symbolName: symbolName, symbolStartOffset: symbolStartOffset, symbolDisplayString: symbolDisplayString };
             };
             /**
              * @param fileName is the name of the file to be opened
@@ -129418,14 +133554,13 @@ var ts;
                 return { file: file, project: project };
             };
             Session.prototype.getOutliningSpans = function (args, simplifiedResult) {
-                var _this = this;
                 var _a = this.getFileAndLanguageServiceForSyntacticOperation(args), file = _a.file, languageService = _a.languageService;
                 var spans = languageService.getOutliningSpans(file);
                 if (simplifiedResult) {
                     var scriptInfo_1 = this.projectService.getScriptInfoForNormalizedPath(file);
                     return spans.map(function (s) { return ({
-                        textSpan: _this.toLocationTextSpan(s.textSpan, scriptInfo_1),
-                        hintSpan: _this.toLocationTextSpan(s.hintSpan, scriptInfo_1),
+                        textSpan: toProcolTextSpan(s.textSpan, scriptInfo_1),
+                        hintSpan: toProcolTextSpan(s.hintSpan, scriptInfo_1),
                         bannerText: s.bannerText,
                         autoCollapse: s.autoCollapse,
                         kind: s.kind
@@ -129575,7 +133710,6 @@ var ts;
                 });
             };
             Session.prototype.getCompletions = function (args, kind) {
-                var _this = this;
                 var _a = this.getFileAndProject(args), file = _a.file, project = _a.project;
                 var scriptInfo = this.projectService.getScriptInfoForNormalizedPath(file);
                 var position = this.getPosition(args, scriptInfo);
@@ -129588,7 +133722,7 @@ var ts;
                 var entries = ts.mapDefined(completions.entries, function (entry) {
                     if (completions.isMemberCompletion || ts.startsWith(entry.name.toLowerCase(), prefix.toLowerCase())) {
                         var name = entry.name, kind_1 = entry.kind, kindModifiers = entry.kindModifiers, sortText = entry.sortText, insertText = entry.insertText, replacementSpan = entry.replacementSpan, hasAction = entry.hasAction, source = entry.source, isRecommended = entry.isRecommended;
-                        var convertedSpan = replacementSpan ? _this.toLocationTextSpan(replacementSpan, scriptInfo) : undefined;
+                        var convertedSpan = replacementSpan ? toProcolTextSpan(replacementSpan, scriptInfo) : undefined;
                         // Use `hasAction || undefined` to avoid serializing `false`.
                         return { name: name, kind: kind_1, kindModifiers: kindModifiers, sortText: sortText, insertText: insertText, replacementSpan: convertedSpan, hasAction: hasAction || undefined, source: source, isRecommended: isRecommended };
                     }
@@ -129732,7 +133866,7 @@ var ts;
                     text: item.text,
                     kind: item.kind,
                     kindModifiers: item.kindModifiers,
-                    spans: item.spans.map(function (span) { return _this.toLocationTextSpan(span, scriptInfo); }),
+                    spans: item.spans.map(function (span) { return toProcolTextSpan(span, scriptInfo); }),
                     childItems: _this.mapLocationNavigationBarItems(item.childItems, scriptInfo),
                     indent: item.indent
                 }); });
@@ -129752,17 +133886,11 @@ var ts;
                     text: tree.text,
                     kind: tree.kind,
                     kindModifiers: tree.kindModifiers,
-                    spans: tree.spans.map(function (span) { return _this.toLocationTextSpan(span, scriptInfo); }),
-                    nameSpan: tree.nameSpan && this.toLocationTextSpan(tree.nameSpan, scriptInfo),
+                    spans: tree.spans.map(function (span) { return toProcolTextSpan(span, scriptInfo); }),
+                    nameSpan: tree.nameSpan && toProcolTextSpan(tree.nameSpan, scriptInfo),
                     childItems: ts.map(tree.childItems, function (item) { return _this.toLocationNavigationTree(item, scriptInfo); })
                 };
             };
-            Session.prototype.toLocationTextSpan = function (span, scriptInfo) {
-                return {
-                    start: scriptInfo.positionToLineOffset(span.start),
-                    end: scriptInfo.positionToLineOffset(ts.textSpanEnd(span))
-                };
-            };
             Session.prototype.getNavigationTree = function (args, simplifiedResult) {
                 var _a = this.getFileAndLanguageServiceForSyntacticOperation(args), file = _a.file, languageService = _a.languageService;
                 var tree = languageService.getNavigationTree(file);
@@ -129978,7 +134106,6 @@ var ts;
                 };
             };
             Session.prototype.getBraceMatching = function (args, simplifiedResult) {
-                var _this = this;
                 var _a = this.getFileAndLanguageServiceForSyntacticOperation(args), file = _a.file, languageService = _a.languageService;
                 var scriptInfo = this.projectService.getScriptInfoForNormalizedPath(file);
                 var position = this.getPosition(args, scriptInfo);
@@ -129986,7 +134113,7 @@ var ts;
                 return !spans
                     ? undefined
                     : simplifiedResult
-                        ? spans.map(function (span) { return _this.toLocationTextSpan(span, scriptInfo); })
+                        ? spans.map(function (span) { return toProcolTextSpan(span, scriptInfo); })
                         : spans;
             };
             Session.prototype.getDiagnosticsForProject = function (next, delay, fileName) {
@@ -130038,6 +134165,26 @@ var ts;
             Session.prototype.configurePlugin = function (args) {
                 this.projectService.configurePlugin(args);
             };
+            Session.prototype.getSmartSelectionRange = function (args, simplifiedResult) {
+                var _this = this;
+                var locations = args.locations;
+                var _a = this.getFileAndLanguageServiceForSyntacticOperation(args), file = _a.file, languageService = _a.languageService;
+                var scriptInfo = ts.Debug.assertDefined(this.projectService.getScriptInfo(file));
+                return ts.map(locations, function (location) {
+                    var pos = _this.getPosition(location, scriptInfo);
+                    var selectionRange = languageService.getSmartSelectionRange(file, pos);
+                    return simplifiedResult ? _this.mapSelectionRange(selectionRange, scriptInfo) : selectionRange;
+                });
+            };
+            Session.prototype.mapSelectionRange = function (selectionRange, scriptInfo) {
+                var result = {
+                    textSpan: toProcolTextSpan(selectionRange.textSpan, scriptInfo),
+                };
+                if (selectionRange.parent) {
+                    result.parent = this.mapSelectionRange(selectionRange.parent, scriptInfo);
+                }
+                return result;
+            };
             Session.prototype.getCanonicalFileName = function (fileName) {
                 var name = this.host.useCaseSensitiveFileNames ? fileName : fileName.toLowerCase();
                 return ts.normalizePath(name);
@@ -130143,8 +134290,17 @@ var ts;
             return Session;
         }());
         server.Session = Session;
-        function toFileSpan(fileName, textSpan, scriptInfo) {
-            return { file: fileName, start: scriptInfo.positionToLineOffset(textSpan.start), end: scriptInfo.positionToLineOffset(ts.textSpanEnd(textSpan)) };
+        function toProcolTextSpan(textSpan, scriptInfo) {
+            return {
+                start: scriptInfo.positionToLineOffset(textSpan.start),
+                end: scriptInfo.positionToLineOffset(ts.textSpanEnd(textSpan))
+            };
+        }
+        function toProtocolTextSpanWithContext(span, contextSpan, scriptInfo) {
+            var textSpan = toProcolTextSpan(span, scriptInfo);
+            var contextTextSpan = contextSpan && toProcolTextSpan(contextSpan, scriptInfo);
+            return contextTextSpan ? __assign({}, textSpan, { contextStart: contextTextSpan.start, contextEnd: contextTextSpan.end }) :
+                textSpan;
         }
         function convertTextChangeToCodeEdit(change, scriptInfo) {
             return { start: positionToLineOffset(scriptInfo, change.span.start), end: positionToLineOffset(scriptInfo, ts.textSpanEnd(change.span)), newText: change.newText };
diff --git a/lib/typescript.d.ts b/lib/typescript.d.ts
index 907cdf39144..7a2559bbc22 100644
--- a/lib/typescript.d.ts
+++ b/lib/typescript.d.ts
@@ -14,7 +14,7 @@ and limitations under the License.
 ***************************************************************************** */
 
 declare namespace ts {
-    const versionMajorMinor = "3.4";
+    const versionMajorMinor = "3.6";
     /** The version of the TypeScript compiler release */
     const version: string;
 }
@@ -53,7 +53,7 @@ declare namespace ts {
     interface Iterator<T> {
         next(): {
             value: T;
-            done: false;
+            done?: false;
         } | {
             value: never;
             done: true;
@@ -72,7 +72,7 @@ declare namespace ts {
         pos: number;
         end: number;
     }
-    type JsDocSyntaxKind = SyntaxKind.EndOfFileToken | SyntaxKind.WhitespaceTrivia | SyntaxKind.AtToken | SyntaxKind.NewLineTrivia | SyntaxKind.AsteriskToken | SyntaxKind.OpenBraceToken | SyntaxKind.CloseBraceToken | SyntaxKind.LessThanToken | SyntaxKind.OpenBracketToken | SyntaxKind.CloseBracketToken | SyntaxKind.EqualsToken | SyntaxKind.CommaToken | SyntaxKind.DotToken | SyntaxKind.Identifier | SyntaxKind.NoSubstitutionTemplateLiteral | SyntaxKind.Unknown | KeywordSyntaxKind;
+    type JSDocSyntaxKind = SyntaxKind.EndOfFileToken | SyntaxKind.WhitespaceTrivia | SyntaxKind.AtToken | SyntaxKind.NewLineTrivia | SyntaxKind.AsteriskToken | SyntaxKind.OpenBraceToken | SyntaxKind.CloseBraceToken | SyntaxKind.LessThanToken | SyntaxKind.GreaterThanToken | SyntaxKind.OpenBracketToken | SyntaxKind.CloseBracketToken | SyntaxKind.EqualsToken | SyntaxKind.CommaToken | SyntaxKind.DotToken | SyntaxKind.Identifier | SyntaxKind.BacktickToken | SyntaxKind.Unknown | KeywordSyntaxKind;
     type KeywordSyntaxKind = SyntaxKind.AbstractKeyword | SyntaxKind.AnyKeyword | SyntaxKind.AsKeyword | SyntaxKind.BigIntKeyword | SyntaxKind.BooleanKeyword | SyntaxKind.BreakKeyword | SyntaxKind.CaseKeyword | SyntaxKind.CatchKeyword | SyntaxKind.ClassKeyword | SyntaxKind.ContinueKeyword | SyntaxKind.ConstKeyword | SyntaxKind.ConstructorKeyword | SyntaxKind.DebuggerKeyword | SyntaxKind.DeclareKeyword | SyntaxKind.DefaultKeyword | SyntaxKind.DeleteKeyword | SyntaxKind.DoKeyword | SyntaxKind.ElseKeyword | SyntaxKind.EnumKeyword | SyntaxKind.ExportKeyword | SyntaxKind.ExtendsKeyword | SyntaxKind.FalseKeyword | SyntaxKind.FinallyKeyword | SyntaxKind.ForKeyword | SyntaxKind.FromKeyword | SyntaxKind.FunctionKeyword | SyntaxKind.GetKeyword | SyntaxKind.IfKeyword | SyntaxKind.ImplementsKeyword | SyntaxKind.ImportKeyword | SyntaxKind.InKeyword | SyntaxKind.InferKeyword | SyntaxKind.InstanceOfKeyword | SyntaxKind.InterfaceKeyword | SyntaxKind.IsKeyword | SyntaxKind.KeyOfKeyword | SyntaxKind.LetKeyword | SyntaxKind.ModuleKeyword | SyntaxKind.NamespaceKeyword | SyntaxKind.NeverKeyword | SyntaxKind.NewKeyword | SyntaxKind.NullKeyword | SyntaxKind.NumberKeyword | SyntaxKind.ObjectKeyword | SyntaxKind.PackageKeyword | SyntaxKind.PrivateKeyword | SyntaxKind.ProtectedKeyword | SyntaxKind.PublicKeyword | SyntaxKind.ReadonlyKeyword | SyntaxKind.RequireKeyword | SyntaxKind.GlobalKeyword | SyntaxKind.ReturnKeyword | SyntaxKind.SetKeyword | SyntaxKind.StaticKeyword | SyntaxKind.StringKeyword | SyntaxKind.SuperKeyword | SyntaxKind.SwitchKeyword | SyntaxKind.SymbolKeyword | SyntaxKind.ThisKeyword | SyntaxKind.ThrowKeyword | SyntaxKind.TrueKeyword | SyntaxKind.TryKeyword | SyntaxKind.TypeKeyword | SyntaxKind.TypeOfKeyword | SyntaxKind.UndefinedKeyword | SyntaxKind.UniqueKeyword | SyntaxKind.UnknownKeyword | SyntaxKind.VarKeyword | SyntaxKind.VoidKeyword | SyntaxKind.WhileKeyword | SyntaxKind.WithKeyword | SyntaxKind.YieldKeyword | SyntaxKind.AsyncKeyword | SyntaxKind.AwaitKeyword | SyntaxKind.OfKeyword;
     type JsxTokenSyntaxKind = SyntaxKind.LessThanSlashToken | SyntaxKind.EndOfFileToken | SyntaxKind.ConflictMarkerTrivia | SyntaxKind.JsxText | SyntaxKind.JsxTextAllWhiteSpaces | SyntaxKind.OpenBraceToken | SyntaxKind.LessThanToken;
     enum SyntaxKind {
@@ -135,281 +135,284 @@ declare namespace ts {
         QuestionToken = 56,
         ColonToken = 57,
         AtToken = 58,
-        EqualsToken = 59,
-        PlusEqualsToken = 60,
-        MinusEqualsToken = 61,
-        AsteriskEqualsToken = 62,
-        AsteriskAsteriskEqualsToken = 63,
-        SlashEqualsToken = 64,
-        PercentEqualsToken = 65,
-        LessThanLessThanEqualsToken = 66,
-        GreaterThanGreaterThanEqualsToken = 67,
-        GreaterThanGreaterThanGreaterThanEqualsToken = 68,
-        AmpersandEqualsToken = 69,
-        BarEqualsToken = 70,
-        CaretEqualsToken = 71,
-        Identifier = 72,
-        BreakKeyword = 73,
-        CaseKeyword = 74,
-        CatchKeyword = 75,
-        ClassKeyword = 76,
-        ConstKeyword = 77,
-        ContinueKeyword = 78,
-        DebuggerKeyword = 79,
-        DefaultKeyword = 80,
-        DeleteKeyword = 81,
-        DoKeyword = 82,
-        ElseKeyword = 83,
-        EnumKeyword = 84,
-        ExportKeyword = 85,
-        ExtendsKeyword = 86,
-        FalseKeyword = 87,
-        FinallyKeyword = 88,
-        ForKeyword = 89,
-        FunctionKeyword = 90,
-        IfKeyword = 91,
-        ImportKeyword = 92,
-        InKeyword = 93,
-        InstanceOfKeyword = 94,
-        NewKeyword = 95,
-        NullKeyword = 96,
-        ReturnKeyword = 97,
-        SuperKeyword = 98,
-        SwitchKeyword = 99,
-        ThisKeyword = 100,
-        ThrowKeyword = 101,
-        TrueKeyword = 102,
-        TryKeyword = 103,
-        TypeOfKeyword = 104,
-        VarKeyword = 105,
-        VoidKeyword = 106,
-        WhileKeyword = 107,
-        WithKeyword = 108,
-        ImplementsKeyword = 109,
-        InterfaceKeyword = 110,
-        LetKeyword = 111,
-        PackageKeyword = 112,
-        PrivateKeyword = 113,
-        ProtectedKeyword = 114,
-        PublicKeyword = 115,
-        StaticKeyword = 116,
-        YieldKeyword = 117,
-        AbstractKeyword = 118,
-        AsKeyword = 119,
-        AnyKeyword = 120,
-        AsyncKeyword = 121,
-        AwaitKeyword = 122,
-        BooleanKeyword = 123,
-        ConstructorKeyword = 124,
-        DeclareKeyword = 125,
-        GetKeyword = 126,
-        InferKeyword = 127,
-        IsKeyword = 128,
-        KeyOfKeyword = 129,
-        ModuleKeyword = 130,
-        NamespaceKeyword = 131,
-        NeverKeyword = 132,
-        ReadonlyKeyword = 133,
-        RequireKeyword = 134,
-        NumberKeyword = 135,
-        ObjectKeyword = 136,
-        SetKeyword = 137,
-        StringKeyword = 138,
-        SymbolKeyword = 139,
-        TypeKeyword = 140,
-        UndefinedKeyword = 141,
-        UniqueKeyword = 142,
-        UnknownKeyword = 143,
-        FromKeyword = 144,
-        GlobalKeyword = 145,
-        BigIntKeyword = 146,
-        OfKeyword = 147,
-        QualifiedName = 148,
-        ComputedPropertyName = 149,
-        TypeParameter = 150,
-        Parameter = 151,
-        Decorator = 152,
-        PropertySignature = 153,
-        PropertyDeclaration = 154,
-        MethodSignature = 155,
-        MethodDeclaration = 156,
-        Constructor = 157,
-        GetAccessor = 158,
-        SetAccessor = 159,
-        CallSignature = 160,
-        ConstructSignature = 161,
-        IndexSignature = 162,
-        TypePredicate = 163,
-        TypeReference = 164,
-        FunctionType = 165,
-        ConstructorType = 166,
-        TypeQuery = 167,
-        TypeLiteral = 168,
-        ArrayType = 169,
-        TupleType = 170,
-        OptionalType = 171,
-        RestType = 172,
-        UnionType = 173,
-        IntersectionType = 174,
-        ConditionalType = 175,
-        InferType = 176,
-        ParenthesizedType = 177,
-        ThisType = 178,
-        TypeOperator = 179,
-        IndexedAccessType = 180,
-        MappedType = 181,
-        LiteralType = 182,
-        ImportType = 183,
-        ObjectBindingPattern = 184,
-        ArrayBindingPattern = 185,
-        BindingElement = 186,
-        ArrayLiteralExpression = 187,
-        ObjectLiteralExpression = 188,
-        PropertyAccessExpression = 189,
-        ElementAccessExpression = 190,
-        CallExpression = 191,
-        NewExpression = 192,
-        TaggedTemplateExpression = 193,
-        TypeAssertionExpression = 194,
-        ParenthesizedExpression = 195,
-        FunctionExpression = 196,
-        ArrowFunction = 197,
-        DeleteExpression = 198,
-        TypeOfExpression = 199,
-        VoidExpression = 200,
-        AwaitExpression = 201,
-        PrefixUnaryExpression = 202,
-        PostfixUnaryExpression = 203,
-        BinaryExpression = 204,
-        ConditionalExpression = 205,
-        TemplateExpression = 206,
-        YieldExpression = 207,
-        SpreadElement = 208,
-        ClassExpression = 209,
-        OmittedExpression = 210,
-        ExpressionWithTypeArguments = 211,
-        AsExpression = 212,
-        NonNullExpression = 213,
-        MetaProperty = 214,
-        SyntheticExpression = 215,
-        TemplateSpan = 216,
-        SemicolonClassElement = 217,
-        Block = 218,
-        VariableStatement = 219,
-        EmptyStatement = 220,
-        ExpressionStatement = 221,
-        IfStatement = 222,
-        DoStatement = 223,
-        WhileStatement = 224,
-        ForStatement = 225,
-        ForInStatement = 226,
-        ForOfStatement = 227,
-        ContinueStatement = 228,
-        BreakStatement = 229,
-        ReturnStatement = 230,
-        WithStatement = 231,
-        SwitchStatement = 232,
-        LabeledStatement = 233,
-        ThrowStatement = 234,
-        TryStatement = 235,
-        DebuggerStatement = 236,
-        VariableDeclaration = 237,
-        VariableDeclarationList = 238,
-        FunctionDeclaration = 239,
-        ClassDeclaration = 240,
-        InterfaceDeclaration = 241,
-        TypeAliasDeclaration = 242,
-        EnumDeclaration = 243,
-        ModuleDeclaration = 244,
-        ModuleBlock = 245,
-        CaseBlock = 246,
-        NamespaceExportDeclaration = 247,
-        ImportEqualsDeclaration = 248,
-        ImportDeclaration = 249,
-        ImportClause = 250,
-        NamespaceImport = 251,
-        NamedImports = 252,
-        ImportSpecifier = 253,
-        ExportAssignment = 254,
-        ExportDeclaration = 255,
-        NamedExports = 256,
-        ExportSpecifier = 257,
-        MissingDeclaration = 258,
-        ExternalModuleReference = 259,
-        JsxElement = 260,
-        JsxSelfClosingElement = 261,
-        JsxOpeningElement = 262,
-        JsxClosingElement = 263,
-        JsxFragment = 264,
-        JsxOpeningFragment = 265,
-        JsxClosingFragment = 266,
-        JsxAttribute = 267,
-        JsxAttributes = 268,
-        JsxSpreadAttribute = 269,
-        JsxExpression = 270,
-        CaseClause = 271,
-        DefaultClause = 272,
-        HeritageClause = 273,
-        CatchClause = 274,
-        PropertyAssignment = 275,
-        ShorthandPropertyAssignment = 276,
-        SpreadAssignment = 277,
-        EnumMember = 278,
-        UnparsedPrologue = 279,
-        UnparsedPrepend = 280,
-        UnparsedText = 281,
-        UnparsedInternalText = 282,
-        UnparsedSyntheticReference = 283,
-        SourceFile = 284,
-        Bundle = 285,
-        UnparsedSource = 286,
-        InputFiles = 287,
-        JSDocTypeExpression = 288,
-        JSDocAllType = 289,
-        JSDocUnknownType = 290,
-        JSDocNullableType = 291,
-        JSDocNonNullableType = 292,
-        JSDocOptionalType = 293,
-        JSDocFunctionType = 294,
-        JSDocVariadicType = 295,
-        JSDocComment = 296,
-        JSDocTypeLiteral = 297,
-        JSDocSignature = 298,
-        JSDocTag = 299,
-        JSDocAugmentsTag = 300,
-        JSDocClassTag = 301,
-        JSDocCallbackTag = 302,
-        JSDocEnumTag = 303,
-        JSDocParameterTag = 304,
-        JSDocReturnTag = 305,
-        JSDocThisTag = 306,
-        JSDocTypeTag = 307,
-        JSDocTemplateTag = 308,
-        JSDocTypedefTag = 309,
-        JSDocPropertyTag = 310,
-        SyntaxList = 311,
-        NotEmittedStatement = 312,
-        PartiallyEmittedExpression = 313,
-        CommaListExpression = 314,
-        MergeDeclarationMarker = 315,
-        EndOfDeclarationMarker = 316,
-        Count = 317,
-        FirstAssignment = 59,
-        LastAssignment = 71,
-        FirstCompoundAssignment = 60,
-        LastCompoundAssignment = 71,
-        FirstReservedWord = 73,
-        LastReservedWord = 108,
-        FirstKeyword = 73,
-        LastKeyword = 147,
-        FirstFutureReservedWord = 109,
-        LastFutureReservedWord = 117,
-        FirstTypeNode = 163,
-        LastTypeNode = 183,
+        /** Only the JSDoc scanner produces BacktickToken. The normal scanner produces NoSubstitutionTemplateLiteral and related kinds. */
+        BacktickToken = 59,
+        EqualsToken = 60,
+        PlusEqualsToken = 61,
+        MinusEqualsToken = 62,
+        AsteriskEqualsToken = 63,
+        AsteriskAsteriskEqualsToken = 64,
+        SlashEqualsToken = 65,
+        PercentEqualsToken = 66,
+        LessThanLessThanEqualsToken = 67,
+        GreaterThanGreaterThanEqualsToken = 68,
+        GreaterThanGreaterThanGreaterThanEqualsToken = 69,
+        AmpersandEqualsToken = 70,
+        BarEqualsToken = 71,
+        CaretEqualsToken = 72,
+        Identifier = 73,
+        BreakKeyword = 74,
+        CaseKeyword = 75,
+        CatchKeyword = 76,
+        ClassKeyword = 77,
+        ConstKeyword = 78,
+        ContinueKeyword = 79,
+        DebuggerKeyword = 80,
+        DefaultKeyword = 81,
+        DeleteKeyword = 82,
+        DoKeyword = 83,
+        ElseKeyword = 84,
+        EnumKeyword = 85,
+        ExportKeyword = 86,
+        ExtendsKeyword = 87,
+        FalseKeyword = 88,
+        FinallyKeyword = 89,
+        ForKeyword = 90,
+        FunctionKeyword = 91,
+        IfKeyword = 92,
+        ImportKeyword = 93,
+        InKeyword = 94,
+        InstanceOfKeyword = 95,
+        NewKeyword = 96,
+        NullKeyword = 97,
+        ReturnKeyword = 98,
+        SuperKeyword = 99,
+        SwitchKeyword = 100,
+        ThisKeyword = 101,
+        ThrowKeyword = 102,
+        TrueKeyword = 103,
+        TryKeyword = 104,
+        TypeOfKeyword = 105,
+        VarKeyword = 106,
+        VoidKeyword = 107,
+        WhileKeyword = 108,
+        WithKeyword = 109,
+        ImplementsKeyword = 110,
+        InterfaceKeyword = 111,
+        LetKeyword = 112,
+        PackageKeyword = 113,
+        PrivateKeyword = 114,
+        ProtectedKeyword = 115,
+        PublicKeyword = 116,
+        StaticKeyword = 117,
+        YieldKeyword = 118,
+        AbstractKeyword = 119,
+        AsKeyword = 120,
+        AnyKeyword = 121,
+        AsyncKeyword = 122,
+        AwaitKeyword = 123,
+        BooleanKeyword = 124,
+        ConstructorKeyword = 125,
+        DeclareKeyword = 126,
+        GetKeyword = 127,
+        InferKeyword = 128,
+        IsKeyword = 129,
+        KeyOfKeyword = 130,
+        ModuleKeyword = 131,
+        NamespaceKeyword = 132,
+        NeverKeyword = 133,
+        ReadonlyKeyword = 134,
+        RequireKeyword = 135,
+        NumberKeyword = 136,
+        ObjectKeyword = 137,
+        SetKeyword = 138,
+        StringKeyword = 139,
+        SymbolKeyword = 140,
+        TypeKeyword = 141,
+        UndefinedKeyword = 142,
+        UniqueKeyword = 143,
+        UnknownKeyword = 144,
+        FromKeyword = 145,
+        GlobalKeyword = 146,
+        BigIntKeyword = 147,
+        OfKeyword = 148,
+        QualifiedName = 149,
+        ComputedPropertyName = 150,
+        TypeParameter = 151,
+        Parameter = 152,
+        Decorator = 153,
+        PropertySignature = 154,
+        PropertyDeclaration = 155,
+        MethodSignature = 156,
+        MethodDeclaration = 157,
+        Constructor = 158,
+        GetAccessor = 159,
+        SetAccessor = 160,
+        CallSignature = 161,
+        ConstructSignature = 162,
+        IndexSignature = 163,
+        TypePredicate = 164,
+        TypeReference = 165,
+        FunctionType = 166,
+        ConstructorType = 167,
+        TypeQuery = 168,
+        TypeLiteral = 169,
+        ArrayType = 170,
+        TupleType = 171,
+        OptionalType = 172,
+        RestType = 173,
+        UnionType = 174,
+        IntersectionType = 175,
+        ConditionalType = 176,
+        InferType = 177,
+        ParenthesizedType = 178,
+        ThisType = 179,
+        TypeOperator = 180,
+        IndexedAccessType = 181,
+        MappedType = 182,
+        LiteralType = 183,
+        ImportType = 184,
+        ObjectBindingPattern = 185,
+        ArrayBindingPattern = 186,
+        BindingElement = 187,
+        ArrayLiteralExpression = 188,
+        ObjectLiteralExpression = 189,
+        PropertyAccessExpression = 190,
+        ElementAccessExpression = 191,
+        CallExpression = 192,
+        NewExpression = 193,
+        TaggedTemplateExpression = 194,
+        TypeAssertionExpression = 195,
+        ParenthesizedExpression = 196,
+        FunctionExpression = 197,
+        ArrowFunction = 198,
+        DeleteExpression = 199,
+        TypeOfExpression = 200,
+        VoidExpression = 201,
+        AwaitExpression = 202,
+        PrefixUnaryExpression = 203,
+        PostfixUnaryExpression = 204,
+        BinaryExpression = 205,
+        ConditionalExpression = 206,
+        TemplateExpression = 207,
+        YieldExpression = 208,
+        SpreadElement = 209,
+        ClassExpression = 210,
+        OmittedExpression = 211,
+        ExpressionWithTypeArguments = 212,
+        AsExpression = 213,
+        NonNullExpression = 214,
+        MetaProperty = 215,
+        SyntheticExpression = 216,
+        TemplateSpan = 217,
+        SemicolonClassElement = 218,
+        Block = 219,
+        VariableStatement = 220,
+        EmptyStatement = 221,
+        ExpressionStatement = 222,
+        IfStatement = 223,
+        DoStatement = 224,
+        WhileStatement = 225,
+        ForStatement = 226,
+        ForInStatement = 227,
+        ForOfStatement = 228,
+        ContinueStatement = 229,
+        BreakStatement = 230,
+        ReturnStatement = 231,
+        WithStatement = 232,
+        SwitchStatement = 233,
+        LabeledStatement = 234,
+        ThrowStatement = 235,
+        TryStatement = 236,
+        DebuggerStatement = 237,
+        VariableDeclaration = 238,
+        VariableDeclarationList = 239,
+        FunctionDeclaration = 240,
+        ClassDeclaration = 241,
+        InterfaceDeclaration = 242,
+        TypeAliasDeclaration = 243,
+        EnumDeclaration = 244,
+        ModuleDeclaration = 245,
+        ModuleBlock = 246,
+        CaseBlock = 247,
+        NamespaceExportDeclaration = 248,
+        ImportEqualsDeclaration = 249,
+        ImportDeclaration = 250,
+        ImportClause = 251,
+        NamespaceImport = 252,
+        NamedImports = 253,
+        ImportSpecifier = 254,
+        ExportAssignment = 255,
+        ExportDeclaration = 256,
+        NamedExports = 257,
+        ExportSpecifier = 258,
+        MissingDeclaration = 259,
+        ExternalModuleReference = 260,
+        JsxElement = 261,
+        JsxSelfClosingElement = 262,
+        JsxOpeningElement = 263,
+        JsxClosingElement = 264,
+        JsxFragment = 265,
+        JsxOpeningFragment = 266,
+        JsxClosingFragment = 267,
+        JsxAttribute = 268,
+        JsxAttributes = 269,
+        JsxSpreadAttribute = 270,
+        JsxExpression = 271,
+        CaseClause = 272,
+        DefaultClause = 273,
+        HeritageClause = 274,
+        CatchClause = 275,
+        PropertyAssignment = 276,
+        ShorthandPropertyAssignment = 277,
+        SpreadAssignment = 278,
+        EnumMember = 279,
+        UnparsedPrologue = 280,
+        UnparsedPrepend = 281,
+        UnparsedText = 282,
+        UnparsedInternalText = 283,
+        UnparsedSyntheticReference = 284,
+        SourceFile = 285,
+        Bundle = 286,
+        UnparsedSource = 287,
+        InputFiles = 288,
+        JSDocTypeExpression = 289,
+        JSDocAllType = 290,
+        JSDocUnknownType = 291,
+        JSDocNullableType = 292,
+        JSDocNonNullableType = 293,
+        JSDocOptionalType = 294,
+        JSDocFunctionType = 295,
+        JSDocVariadicType = 296,
+        JSDocComment = 297,
+        JSDocTypeLiteral = 298,
+        JSDocSignature = 299,
+        JSDocTag = 300,
+        JSDocAugmentsTag = 301,
+        JSDocAuthorTag = 302,
+        JSDocClassTag = 303,
+        JSDocCallbackTag = 304,
+        JSDocEnumTag = 305,
+        JSDocParameterTag = 306,
+        JSDocReturnTag = 307,
+        JSDocThisTag = 308,
+        JSDocTypeTag = 309,
+        JSDocTemplateTag = 310,
+        JSDocTypedefTag = 311,
+        JSDocPropertyTag = 312,
+        SyntaxList = 313,
+        NotEmittedStatement = 314,
+        PartiallyEmittedExpression = 315,
+        CommaListExpression = 316,
+        MergeDeclarationMarker = 317,
+        EndOfDeclarationMarker = 318,
+        Count = 319,
+        FirstAssignment = 60,
+        LastAssignment = 72,
+        FirstCompoundAssignment = 61,
+        LastCompoundAssignment = 72,
+        FirstReservedWord = 74,
+        LastReservedWord = 109,
+        FirstKeyword = 74,
+        LastKeyword = 148,
+        FirstFutureReservedWord = 110,
+        LastFutureReservedWord = 118,
+        FirstTypeNode = 164,
+        LastTypeNode = 184,
         FirstPunctuation = 18,
-        LastPunctuation = 71,
+        LastPunctuation = 72,
         FirstToken = 0,
-        LastToken = 147,
+        LastToken = 148,
         FirstTriviaToken = 2,
         LastTriviaToken = 7,
         FirstLiteralToken = 8,
@@ -417,12 +420,12 @@ declare namespace ts {
         FirstTemplateToken = 14,
         LastTemplateToken = 17,
         FirstBinaryOperator = 28,
-        LastBinaryOperator = 71,
-        FirstNode = 148,
-        FirstJSDocNode = 288,
-        LastJSDocNode = 310,
-        FirstJSDocTagNode = 299,
-        LastJSDocTagNode = 310,
+        LastBinaryOperator = 72,
+        FirstNode = 149,
+        FirstJSDocNode = 289,
+        LastJSDocNode = 312,
+        FirstJSDocTagNode = 300,
+        LastJSDocTagNode = 312,
     }
     enum NodeFlags {
         None = 0,
@@ -1152,6 +1155,7 @@ declare namespace ts {
         expression: JsxTagNameExpression;
     }
     interface JsxAttributes extends ObjectLiteralExpressionBase<JsxAttributeLike> {
+        kind: SyntaxKind.JsxAttributes;
         parent: JsxOpeningLikeElement;
     }
     interface JsxOpeningElement extends Expression {
@@ -1203,9 +1207,9 @@ declare namespace ts {
         dotDotDotToken?: Token<SyntaxKind.DotDotDotToken>;
         expression?: Expression;
     }
-    interface JsxText extends Node {
+    interface JsxText extends LiteralLikeNode {
         kind: SyntaxKind.JsxText;
-        containsOnlyWhiteSpaces: boolean;
+        containsOnlyTriviaWhiteSpaces: boolean;
         parent: JsxElement;
     }
     type JsxChild = JsxText | JsxExpression | JsxElement | JsxSelfClosingElement | JsxFragment;
@@ -1579,6 +1583,9 @@ declare namespace ts {
             expression: Identifier | PropertyAccessEntityNameExpression;
         };
     }
+    interface JSDocAuthorTag extends JSDocTag {
+        kind: SyntaxKind.JSDocAuthorTag;
+    }
     interface JSDocClassTag extends JSDocTag {
         kind: SyntaxKind.JSDocClassTag;
     }
@@ -1601,7 +1608,7 @@ declare namespace ts {
     }
     interface JSDocTypeTag extends JSDocTag {
         kind: SyntaxKind.JSDocTypeTag;
-        typeExpression?: JSDocTypeExpression;
+        typeExpression: JSDocTypeExpression;
     }
     interface JSDocTypedefTag extends JSDocTag, NamedDeclaration {
         parent: JSDoc;
@@ -1877,13 +1884,18 @@ declare namespace ts {
         sourceFile: SourceFile;
         references?: ReadonlyArray<ResolvedProjectReference | undefined>;
     }
+    type CustomTransformerFactory = (context: TransformationContext) => CustomTransformer;
+    interface CustomTransformer {
+        transformSourceFile(node: SourceFile): SourceFile;
+        transformBundle(node: Bundle): Bundle;
+    }
     interface CustomTransformers {
         /** Custom transformers to evaluate before built-in .js transformations. */
-        before?: TransformerFactory<SourceFile>[];
+        before?: (TransformerFactory<SourceFile> | CustomTransformerFactory)[];
         /** Custom transformers to evaluate after built-in .js transformations. */
-        after?: TransformerFactory<SourceFile>[];
+        after?: (TransformerFactory<SourceFile> | CustomTransformerFactory)[];
         /** Custom transformers to evaluate after built-in .d.ts transformations. */
-        afterDeclarations?: TransformerFactory<Bundle | SourceFile>[];
+        afterDeclarations?: (TransformerFactory<Bundle | SourceFile> | CustomTransformerFactory)[];
     }
     interface SourceMapSpan {
         /** Line number in the .js file. */
@@ -1903,7 +1915,8 @@ declare namespace ts {
     enum ExitStatus {
         Success = 0,
         DiagnosticsPresent_OutputsSkipped = 1,
-        DiagnosticsPresent_OutputsGenerated = 2
+        DiagnosticsPresent_OutputsGenerated = 2,
+        InvalidProject_OutputsSkipped = 3
     }
     interface EmitResult {
         emitSkipped: boolean;
@@ -1962,6 +1975,7 @@ declare namespace ts {
          */
         getExportSymbolOfSymbol(symbol: Symbol): Symbol;
         getPropertySymbolOfDestructuringAssignment(location: Identifier): Symbol | undefined;
+        getTypeOfAssignmentPattern(pattern: AssignmentPattern): Type;
         getTypeAtLocation(node: Node): Type;
         getTypeFromTypeNode(node: TypeNode): Type;
         signatureToString(signature: Signature, enclosingDeclaration?: Node, flags?: TypeFormatFlags, kind?: SignatureKind): string;
@@ -2294,6 +2308,7 @@ declare namespace ts {
         MarkerType = 8192,
         JSLiteral = 16384,
         FreshLiteral = 32768,
+        ArrayLiteral = 65536,
         ClassOrInterface = 3,
     }
     interface ObjectType extends Type {
@@ -2359,7 +2374,8 @@ declare namespace ts {
         objectType: Type;
         indexType: Type;
         constraint?: Type;
-        simplified?: Type;
+        simplifiedForReading?: Type;
+        simplifiedForWriting?: Type;
     }
     type TypeVariable = TypeParameter | IndexedAccessType;
     interface IndexType extends InstantiableType {
@@ -2382,8 +2398,8 @@ declare namespace ts {
         root: ConditionalRoot;
         checkType: Type;
         extendsType: Type;
-        resolvedTrueType?: Type;
-        resolvedFalseType?: Type;
+        resolvedTrueType: Type;
+        resolvedFalseType: Type;
     }
     interface SubstitutionType extends InstantiableType {
         typeVariable: TypeVariable;
@@ -2410,12 +2426,13 @@ declare namespace ts {
     enum InferencePriority {
         NakedTypeVariable = 1,
         HomomorphicMappedType = 2,
-        MappedTypeConstraint = 4,
-        ReturnType = 8,
-        LiteralKeyof = 16,
-        NoConstraints = 32,
-        AlwaysStrict = 64,
-        PriorityImpliesCombination = 28
+        PartialHomomorphicMappedType = 4,
+        MappedTypeConstraint = 8,
+        ReturnType = 16,
+        LiteralKeyof = 32,
+        NoConstraints = 64,
+        AlwaysStrict = 128,
+        PriorityImpliesCombination = 56
     }
     /** @deprecated Use FileExtensionInfo instead. */
     type JsFileExtensionInfo = FileExtensionInfo;
@@ -2441,7 +2458,7 @@ declare namespace ts {
         messageText: string;
         category: DiagnosticCategory;
         code: number;
-        next?: DiagnosticMessageChain;
+        next?: DiagnosticMessageChain[];
     }
     interface Diagnostic extends DiagnosticRelatedInformation {
         /** May store more in future. For now, this will simply be `true` to indicate when a diagnostic is an unused-identifier diagnostic. */
@@ -2489,6 +2506,7 @@ declare namespace ts {
     interface CompilerOptions {
         allowJs?: boolean;
         allowSyntheticDefaultImports?: boolean;
+        allowUmdGlobalAccess?: boolean;
         allowUnreachableCode?: boolean;
         allowUnusedLabels?: boolean;
         alwaysStrict?: boolean;
@@ -2582,7 +2600,7 @@ declare namespace ts {
         UMD = 3,
         System = 4,
         ES2015 = 5,
-        ESNext = 6
+        ESNext = 99
     }
     enum JsxEmit {
         None = 0,
@@ -2621,9 +2639,10 @@ declare namespace ts {
         ES2017 = 4,
         ES2018 = 5,
         ES2019 = 6,
-        ESNext = 7,
+        ES2020 = 7,
+        ESNext = 99,
         JSON = 100,
-        Latest = 7
+        Latest = 99
     }
     enum LanguageVariant {
         Standard = 0,
@@ -2756,6 +2775,7 @@ declare namespace ts {
         resolveTypeReferenceDirectives?(typeReferenceDirectiveNames: string[], containingFile: string, redirectedReference?: ResolvedProjectReference): (ResolvedTypeReferenceDirective | undefined)[];
         getEnvironmentVariable?(name: string): string | undefined;
         createHash?(data: string): string;
+        getParsedCommandLine?(fileName: string): ParsedCommandLine | undefined;
     }
     interface SourceMapRange extends TextRange {
         source?: SourceMapSource;
@@ -3159,7 +3179,7 @@ declare namespace ts {
         reScanJsxToken(): JsxTokenSyntaxKind;
         reScanLessThanToken(): SyntaxKind;
         scanJsxToken(): JsxTokenSyntaxKind;
-        scanJSDocToken(): JsDocSyntaxKind;
+        scanJsDocToken(): JSDocSyntaxKind;
         scan(): SyntaxKind;
         getText(): string;
         setText(text: string | undefined, start?: number, length?: number): void;
@@ -3517,6 +3537,7 @@ declare namespace ts {
     function isJSDocFunctionType(node: Node): node is JSDocFunctionType;
     function isJSDocVariadicType(node: Node): node is JSDocVariadicType;
     function isJSDoc(node: Node): node is JSDoc;
+    function isJSDocAuthorTag(node: Node): node is JSDocAuthorTag;
     function isJSDocAugmentsTag(node: Node): node is JSDocAugmentsTag;
     function isJSDocClassTag(node: Node): node is JSDocClassTag;
     function isJSDocEnumTag(node: Node): node is JSDocEnumTag;
@@ -3627,7 +3648,7 @@ declare namespace ts {
     /**
      * Reads the config file, reports errors if any and exits if the config file cannot be found
      */
-    function getParsedCommandLineOfConfigFile(configFileName: string, optionsToExtend: CompilerOptions, host: ParseConfigFileHost): ParsedCommandLine | undefined;
+    function getParsedCommandLineOfConfigFile(configFileName: string, optionsToExtend: CompilerOptions, host: ParseConfigFileHost, extendedConfigCache?: Map<ExtendedConfigCacheEntry>): ParsedCommandLine | undefined;
     /**
      * Read tsconfig.json file
      * @param fileName The path to the config file
@@ -3661,7 +3682,7 @@ declare namespace ts {
      * @param basePath A root directory to resolve relative path entries in the config
      *    file to. e.g. outDir
      */
-    function parseJsonConfigFileContent(json: any, host: ParseConfigHost, basePath: string, existingOptions?: CompilerOptions, configFileName?: string, resolutionStack?: Path[], extraFileExtensions?: ReadonlyArray<FileExtensionInfo>): ParsedCommandLine;
+    function parseJsonConfigFileContent(json: any, host: ParseConfigHost, basePath: string, existingOptions?: CompilerOptions, configFileName?: string, resolutionStack?: Path[], extraFileExtensions?: ReadonlyArray<FileExtensionInfo>, extendedConfigCache?: Map<ExtendedConfigCacheEntry>): ParsedCommandLine;
     /**
      * Parse the contents of a config file (tsconfig.json).
      * @param jsonNode The contents of the config file to parse
@@ -3669,7 +3690,20 @@ declare namespace ts {
      * @param basePath A root directory to resolve relative path entries in the config
      *    file to. e.g. outDir
      */
-    function parseJsonSourceFileConfigFileContent(sourceFile: TsConfigSourceFile, host: ParseConfigHost, basePath: string, existingOptions?: CompilerOptions, configFileName?: string, resolutionStack?: Path[], extraFileExtensions?: ReadonlyArray<FileExtensionInfo>): ParsedCommandLine;
+    function parseJsonSourceFileConfigFileContent(sourceFile: TsConfigSourceFile, host: ParseConfigHost, basePath: string, existingOptions?: CompilerOptions, configFileName?: string, resolutionStack?: Path[], extraFileExtensions?: ReadonlyArray<FileExtensionInfo>, extendedConfigCache?: Map<ExtendedConfigCacheEntry>): ParsedCommandLine;
+    interface ParsedTsconfig {
+        raw: any;
+        options?: CompilerOptions;
+        typeAcquisition?: TypeAcquisition;
+        /**
+         * Note that the case of the config path has not yet been normalized, as no files have been imported into the project yet
+         */
+        extendedConfigPath?: string;
+    }
+    interface ExtendedConfigCacheEntry {
+        extendedResult: TsConfigSourceFile;
+        extendedConfig: ParsedTsconfig | undefined;
+    }
     function convertCompilerOptionsFromJson(jsonOptions: any, basePath: string, configFileName?: string): {
         options: CompilerOptions;
         errors: Diagnostic[];
@@ -3714,7 +3748,7 @@ declare namespace ts {
         get(directory: string): ResolvedModuleWithFailedLookupLocations | undefined;
         set(directory: string, result: ResolvedModuleWithFailedLookupLocations): void;
     }
-    function createModuleResolutionCache(currentDirectory: string, getCanonicalFileName: (s: string) => string): ModuleResolutionCache;
+    function createModuleResolutionCache(currentDirectory: string, getCanonicalFileName: (s: string) => string, options?: CompilerOptions): ModuleResolutionCache;
     function resolveModuleNameFromCache(moduleName: string, containingFile: string, cache: ModuleResolutionCache): ResolvedModuleWithFailedLookupLocations | undefined;
     function resolveModuleName(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost, cache?: ModuleResolutionCache, redirectedReference?: ResolvedProjectReference): ResolvedModuleWithFailedLookupLocations;
     function nodeModuleNameResolver(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost, cache?: ModuleResolutionCache, redirectedReference?: ResolvedProjectReference): ResolvedModuleWithFailedLookupLocations;
@@ -3837,7 +3871,7 @@ declare namespace ts {
     function updateArrayLiteral(node: ArrayLiteralExpression, elements: ReadonlyArray<Expression>): ArrayLiteralExpression;
     function createObjectLiteral(properties?: ReadonlyArray<ObjectLiteralElementLike>, multiLine?: boolean): ObjectLiteralExpression;
     function updateObjectLiteral(node: ObjectLiteralExpression, properties: ReadonlyArray<ObjectLiteralElementLike>): ObjectLiteralExpression;
-    function createPropertyAccess(expression: Expression, name: string | Identifier | undefined): PropertyAccessExpression;
+    function createPropertyAccess(expression: Expression, name: string | Identifier): PropertyAccessExpression;
     function updatePropertyAccess(node: PropertyAccessExpression, expression: Expression, name: Identifier): PropertyAccessExpression;
     function createElementAccess(expression: Expression, index: number | Expression): ElementAccessExpression;
     function updateElementAccess(node: ElementAccessExpression, expression: Expression, argumentExpression: Expression): ElementAccessExpression;
@@ -3992,6 +4026,10 @@ declare namespace ts {
     function createJsxClosingElement(tagName: JsxTagNameExpression): JsxClosingElement;
     function updateJsxClosingElement(node: JsxClosingElement, tagName: JsxTagNameExpression): JsxClosingElement;
     function createJsxFragment(openingFragment: JsxOpeningFragment, children: ReadonlyArray<JsxChild>, closingFragment: JsxClosingFragment): JsxFragment;
+    function createJsxText(text: string, containsOnlyTriviaWhiteSpaces?: boolean): JsxText;
+    function updateJsxText(node: JsxText, text: string, containsOnlyTriviaWhiteSpaces?: boolean): JsxText;
+    function createJsxOpeningFragment(): JsxOpeningFragment;
+    function createJsxJsxClosingFragment(): JsxClosingFragment;
     function updateJsxFragment(node: JsxFragment, openingFragment: JsxOpeningFragment, children: ReadonlyArray<JsxChild>, closingFragment: JsxClosingFragment): JsxFragment;
     function createJsxAttribute(name: Identifier, initializer: StringLiteral | JsxExpression): JsxAttribute;
     function updateJsxAttribute(node: JsxAttribute, name: Identifier, initializer: StringLiteral | JsxExpression): JsxAttribute;
@@ -4048,7 +4086,7 @@ declare namespace ts {
     function createInputFiles(javascriptText: string, declarationText: string): InputFiles;
     function createInputFiles(readFileText: (path: string) => string | undefined, javascriptPath: string, javascriptMapPath: string | undefined, declarationPath: string, declarationMapPath: string | undefined, buildInfoPath: string | undefined): InputFiles;
     function createInputFiles(javascriptText: string, declarationText: string, javascriptMapPath: string | undefined, javascriptMapText: string | undefined, declarationMapPath: string | undefined, declarationMapText: string | undefined): InputFiles;
-    function updateBundle(node: Bundle, sourceFiles: ReadonlyArray<SourceFile>, prepends?: ReadonlyArray<UnparsedSource>): Bundle;
+    function updateBundle(node: Bundle, sourceFiles: ReadonlyArray<SourceFile>, prepends?: ReadonlyArray<UnparsedSource | InputFiles>): Bundle;
     function createImmediatelyInvokedFunctionExpression(statements: ReadonlyArray<Statement>): CallExpression;
     function createImmediatelyInvokedFunctionExpression(statements: ReadonlyArray<Statement>, param: ParameterDeclaration, paramValue: Expression): CallExpression;
     function createImmediatelyInvokedArrowFunction(statements: ReadonlyArray<Statement>): CallExpression;
@@ -4240,7 +4278,7 @@ declare namespace ts {
     function formatDiagnostics(diagnostics: ReadonlyArray<Diagnostic>, host: FormatDiagnosticsHost): string;
     function formatDiagnostic(diagnostic: Diagnostic, host: FormatDiagnosticsHost): string;
     function formatDiagnosticsWithColorAndContext(diagnostics: ReadonlyArray<Diagnostic>, host: FormatDiagnosticsHost): string;
-    function flattenDiagnosticMessageText(messageText: string | DiagnosticMessageChain | undefined, newLine: string): string;
+    function flattenDiagnosticMessageText(diag: string | DiagnosticMessageChain | undefined, newLine: string, indent?: number): string;
     function getConfigFileParsingDiagnostics(configFileParseResult: ParsedCommandLine): ReadonlyArray<Diagnostic>;
     /**
      * Create a new 'Program' instance. A Program is an immutable collection of 'SourceFile's and a 'CompilerOptions'
@@ -4393,7 +4431,7 @@ declare namespace ts {
      * The builder that can handle the changes in program and iterate through changed file to emit the files
      * The semantic diagnostics are cached per file and managed by clearing for the changed/affected files
      */
-    interface EmitAndSemanticDiagnosticsBuilderProgram extends BuilderProgram {
+    interface EmitAndSemanticDiagnosticsBuilderProgram extends SemanticDiagnosticsBuilderProgram {
         /**
          * Emits the next affected file's emit result (EmitResult and sourceFiles emitted) or returns undefined if iteration is complete
          * The first of writeFile if provided, writeFile of BuilderProgramHost if provided, writeFile of compiler host
@@ -4419,6 +4457,22 @@ declare namespace ts {
     function createAbstractBuilder(rootNames: ReadonlyArray<string> | undefined, options: CompilerOptions | undefined, host?: CompilerHost, oldProgram?: BuilderProgram, configFileParsingDiagnostics?: ReadonlyArray<Diagnostic>, projectReferences?: ReadonlyArray<ProjectReference>): BuilderProgram;
 }
 declare namespace ts {
+    interface ReadBuildProgramHost {
+        useCaseSensitiveFileNames(): boolean;
+        getCurrentDirectory(): string;
+        readFile(fileName: string): string | undefined;
+    }
+    function readBuilderProgram(compilerOptions: CompilerOptions, host: ReadBuildProgramHost): EmitAndSemanticDiagnosticsBuilderProgram | undefined;
+    function createIncrementalCompilerHost(options: CompilerOptions, system?: System): CompilerHost;
+    interface IncrementalProgramOptions<T extends BuilderProgram> {
+        rootNames: ReadonlyArray<string>;
+        options: CompilerOptions;
+        configFileParsingDiagnostics?: ReadonlyArray<Diagnostic>;
+        projectReferences?: ReadonlyArray<ProjectReference>;
+        host?: CompilerHost;
+        createProgram?: CreateProgram<T>;
+    }
+    function createIncrementalProgram<T extends BuilderProgram = EmitAndSemanticDiagnosticsBuilderProgram>({ rootNames, options, configFileParsingDiagnostics, projectReferences, host, createProgram }: IncrementalProgramOptions<T>): T;
     type WatchStatusReporter = (diagnostic: Diagnostic, newLine: string, options: CompilerOptions) => void;
     /** Create the program with rootNames and options, if they are undefined, oldProgram and new configFile diagnostics create new program */
     type CreateProgram<T extends BuilderProgram> = (rootNames: ReadonlyArray<string> | undefined, options: CompilerOptions | undefined, host?: CompilerHost, oldProgram?: T, configFileParsingDiagnostics?: ReadonlyArray<Diagnostic>, projectReferences?: ReadonlyArray<ProjectReference> | undefined) => T;
@@ -4505,6 +4559,8 @@ declare namespace ts {
     interface Watch<T> {
         /** Synchronize with host and get updated program */
         getProgram(): T;
+        /** Closes the watch */
+        close(): void;
     }
     /**
      * Creates the watch what generates program using the config file
@@ -4532,17 +4588,101 @@ declare namespace ts {
      */
     function createWatchProgram<T extends BuilderProgram>(host: WatchCompilerHostOfConfigFile<T>): WatchOfConfigFile<T>;
 }
+declare namespace ts {
+    interface BuildOptions {
+        dry?: boolean;
+        force?: boolean;
+        verbose?: boolean;
+        incremental?: boolean;
+        traceResolution?: boolean;
+        [option: string]: CompilerOptionsValue | undefined;
+    }
+    type ReportEmitErrorSummary = (errorCount: number) => void;
+    interface SolutionBuilderHostBase<T extends BuilderProgram> extends ProgramHost<T> {
+        createDirectory?(path: string): void;
+        /**
+         * Should provide create directory and writeFile if done of invalidatedProjects is not invoked with
+         * writeFileCallback
+         */
+        writeFile?(path: string, data: string, writeByteOrderMark?: boolean): void;
+        getModifiedTime(fileName: string): Date | undefined;
+        setModifiedTime(fileName: string, date: Date): void;
+        deleteFile(fileName: string): void;
+        getParsedCommandLine?(fileName: string): ParsedCommandLine | undefined;
+        reportDiagnostic: DiagnosticReporter;
+        reportSolutionBuilderStatus: DiagnosticReporter;
+        afterProgramEmitAndDiagnostics?(program: T): void;
+    }
+    interface SolutionBuilderHost<T extends BuilderProgram> extends SolutionBuilderHostBase<T> {
+        reportErrorSummary?: ReportEmitErrorSummary;
+    }
+    interface SolutionBuilderWithWatchHost<T extends BuilderProgram> extends SolutionBuilderHostBase<T>, WatchHost {
+    }
+    interface SolutionBuilder<T extends BuilderProgram> {
+        build(project?: string, cancellationToken?: CancellationToken): ExitStatus;
+        clean(project?: string): ExitStatus;
+        buildReferences(project: string, cancellationToken?: CancellationToken): ExitStatus;
+        cleanReferences(project?: string): ExitStatus;
+        getNextInvalidatedProject(cancellationToken?: CancellationToken): InvalidatedProject<T> | undefined;
+    }
+    /**
+     * Create a function that reports watch status by writing to the system and handles the formating of the diagnostic
+     */
+    function createBuilderStatusReporter(system: System, pretty?: boolean): DiagnosticReporter;
+    function createSolutionBuilderHost<T extends BuilderProgram = EmitAndSemanticDiagnosticsBuilderProgram>(system?: System, createProgram?: CreateProgram<T>, reportDiagnostic?: DiagnosticReporter, reportSolutionBuilderStatus?: DiagnosticReporter, reportErrorSummary?: ReportEmitErrorSummary): SolutionBuilderHost<T>;
+    function createSolutionBuilderWithWatchHost<T extends BuilderProgram = EmitAndSemanticDiagnosticsBuilderProgram>(system?: System, createProgram?: CreateProgram<T>, reportDiagnostic?: DiagnosticReporter, reportSolutionBuilderStatus?: DiagnosticReporter, reportWatchStatus?: WatchStatusReporter): SolutionBuilderWithWatchHost<T>;
+    function createSolutionBuilder<T extends BuilderProgram>(host: SolutionBuilderHost<T>, rootNames: ReadonlyArray<string>, defaultOptions: BuildOptions): SolutionBuilder<T>;
+    function createSolutionBuilderWithWatch<T extends BuilderProgram>(host: SolutionBuilderWithWatchHost<T>, rootNames: ReadonlyArray<string>, defaultOptions: BuildOptions): SolutionBuilder<T>;
+    enum InvalidatedProjectKind {
+        Build = 0,
+        UpdateBundle = 1,
+        UpdateOutputFileStamps = 2
+    }
+    interface InvalidatedProjectBase {
+        readonly kind: InvalidatedProjectKind;
+        readonly project: ResolvedConfigFileName;
+        /**
+         *  To dispose this project and ensure that all the necessary actions are taken and state is updated accordingly
+         */
+        done(cancellationToken?: CancellationToken, writeFile?: WriteFileCallback, customTransformers?: CustomTransformers): ExitStatus;
+        getCompilerOptions(): CompilerOptions;
+        getCurrentDirectory(): string;
+    }
+    interface UpdateOutputFileStampsProject extends InvalidatedProjectBase {
+        readonly kind: InvalidatedProjectKind.UpdateOutputFileStamps;
+        updateOutputFileStatmps(): void;
+    }
+    interface BuildInvalidedProject<T extends BuilderProgram> extends InvalidatedProjectBase {
+        readonly kind: InvalidatedProjectKind.Build;
+        getBuilderProgram(): T | undefined;
+        getProgram(): Program | undefined;
+        getSourceFile(fileName: string): SourceFile | undefined;
+        getSourceFiles(): ReadonlyArray<SourceFile>;
+        getOptionsDiagnostics(cancellationToken?: CancellationToken): ReadonlyArray<Diagnostic>;
+        getGlobalDiagnostics(cancellationToken?: CancellationToken): ReadonlyArray<Diagnostic>;
+        getConfigFileParsingDiagnostics(): ReadonlyArray<Diagnostic>;
+        getSyntacticDiagnostics(sourceFile?: SourceFile, cancellationToken?: CancellationToken): ReadonlyArray<Diagnostic>;
+        getAllDependencies(sourceFile: SourceFile): ReadonlyArray<string>;
+        getSemanticDiagnostics(sourceFile?: SourceFile, cancellationToken?: CancellationToken): ReadonlyArray<Diagnostic>;
+        getSemanticDiagnosticsOfNextAffectedFile(cancellationToken?: CancellationToken, ignoreSourceFile?: (sourceFile: SourceFile) => boolean): AffectedFileResult<ReadonlyArray<Diagnostic>>;
+        emit(targetSourceFile?: SourceFile, writeFile?: WriteFileCallback, cancellationToken?: CancellationToken, emitOnlyDtsFiles?: boolean, customTransformers?: CustomTransformers): EmitResult | undefined;
+    }
+    interface UpdateBundleProject<T extends BuilderProgram> extends InvalidatedProjectBase {
+        readonly kind: InvalidatedProjectKind.UpdateBundle;
+        emit(writeFile?: WriteFileCallback, customTransformers?: CustomTransformers): EmitResult | BuildInvalidedProject<T> | undefined;
+    }
+    type InvalidatedProject<T extends BuilderProgram> = UpdateOutputFileStampsProject | BuildInvalidedProject<T> | UpdateBundleProject<T>;
+}
 declare namespace ts.server {
     type ActionSet = "action::set";
     type ActionInvalidate = "action::invalidate";
     type ActionPackageInstalled = "action::packageInstalled";
-    type ActionValueInspected = "action::valueInspected";
     type EventTypesRegistry = "event::typesRegistry";
     type EventBeginInstallTypes = "event::beginInstallTypes";
     type EventEndInstallTypes = "event::endInstallTypes";
     type EventInitializationFailed = "event::initializationFailed";
     interface TypingInstallerResponse {
-        readonly kind: ActionSet | ActionInvalidate | EventTypesRegistry | ActionPackageInstalled | ActionValueInspected | EventBeginInstallTypes | EventEndInstallTypes | EventInitializationFailed;
+        readonly kind: ActionSet | ActionInvalidate | EventTypesRegistry | ActionPackageInstalled | EventBeginInstallTypes | EventEndInstallTypes | EventInitializationFailed;
     }
     interface TypingInstallerRequestWithProjectName {
         readonly projectName: string;
@@ -4781,6 +4921,7 @@ declare namespace ts {
         getSignatureHelpItems(fileName: string, position: number, options: SignatureHelpItemsOptions | undefined): SignatureHelpItems | undefined;
         getRenameInfo(fileName: string, position: number, options?: RenameInfoOptions): RenameInfo;
         findRenameLocations(fileName: string, position: number, findInStrings: boolean, findInComments: boolean, providePrefixAndSuffixTextForRename?: boolean): ReadonlyArray<RenameLocation> | undefined;
+        getSmartSelectionRange(fileName: string, position: number): SelectionRange;
         getDefinitionAtPosition(fileName: string, position: number): ReadonlyArray<DefinitionInfo> | undefined;
         getDefinitionAndBoundSpan(fileName: string, position: number): DefinitionInfoAndBoundSpan | undefined;
         getTypeDefinitionAtPosition(fileName: string, position: number): ReadonlyArray<DefinitionInfo> | undefined;
@@ -4975,16 +5116,9 @@ declare namespace ts {
         changes: ReadonlyArray<FileTextChanges>;
         commands?: ReadonlyArray<CodeActionCommand>;
     }
-    type CodeActionCommand = InstallPackageAction | GenerateTypesAction;
+    type CodeActionCommand = InstallPackageAction;
     interface InstallPackageAction {
     }
-    interface GenerateTypesAction extends GenerateTypesOptions {
-    }
-    interface GenerateTypesOptions {
-        readonly file: string;
-        readonly fileToGenerateTypesFor: string;
-        readonly outputFileName: string;
-    }
     /**
      * A set of one or more available refactoring actions, grouped under a parent refactoring.
      */
@@ -5048,6 +5182,12 @@ declare namespace ts {
          */
         originalTextSpan?: TextSpan;
         originalFileName?: string;
+        /**
+         * If DocumentSpan.textSpan is the span for name of the declaration,
+         * then this is the span for relevant declaration
+         */
+        contextSpan?: TextSpan;
+        originalContextSpan?: TextSpan;
     }
     interface RenameLocation extends DocumentSpan {
         readonly prefixText?: string;
@@ -5076,6 +5216,7 @@ declare namespace ts {
         fileName?: string;
         isInString?: true;
         textSpan: TextSpan;
+        contextSpan?: TextSpan;
         kind: HighlightSpanKind;
     }
     interface NavigateToItem {
@@ -5232,6 +5373,10 @@ declare namespace ts {
         displayParts: SymbolDisplayPart[];
         isOptional: boolean;
     }
+    interface SelectionRange {
+        textSpan: TextSpan;
+        parent?: SelectionRange;
+    }
     /**
      * Represents a single signature to show in signature help.
      * The id is used for subsequent calls into the language service to ask questions about the
@@ -5259,7 +5404,7 @@ declare namespace ts {
         argumentCount: number;
     }
     interface CompletionInfo {
-        /** Not true for all glboal completions. This will be true if the enclosing scope matches a few syntax kinds. See `isSnippetScope`. */
+        /** Not true for all global completions. This will be true if the enclosing scope matches a few syntax kinds. See `isSnippetScope`. */
         isGlobalCompletion: boolean;
         isMemberCompletion: boolean;
         /**
@@ -5608,10 +5753,6 @@ declare namespace ts {
     function transpileModule(input: string, transpileOptions: TranspileOptions): TranspileOutput;
     function transpile(input: string, compilerOptions?: CompilerOptions, fileName?: string, diagnostics?: Diagnostic[], moduleName?: string): string;
 }
-declare namespace ts {
-    function generateTypesForModule(name: string, moduleValue: unknown, formatSettings: FormatCodeSettings): string;
-    function generateTypesForGlobal(name: string, globalValue: unknown, formatSettings: FormatCodeSettings): string;
-}
 declare namespace ts {
     /** The version of the language service API */
     const servicesVersion = "0.8";
diff --git a/lib/typescript.js b/lib/typescript.js
index 157d835bb16..b93aa3daff6 100644
--- a/lib/typescript.js
+++ b/lib/typescript.js
@@ -73,7 +73,7 @@ var ts;
 (function (ts) {
     // WARNING: The script `configureNightly.ts` uses a regexp to parse out these values.
     // If changing the text in this section, be sure to test `configureNightly` too.
-    ts.versionMajorMinor = "3.4";
+    ts.versionMajorMinor = "3.6";
     /** The version of the TypeScript compiler release */
     ts.version = ts.versionMajorMinor + ".0-dev";
 })(ts || (ts = {}));
@@ -205,7 +205,7 @@ var ts;
                         entry.nextEntry.previousEntry = previousEntry;
                     }
                     // When the deleted entry was the last one, we need to
-                    // adust the lastEntry reference.
+                    // adjust the lastEntry reference.
                     if (this.lastEntry === entry) {
                         this.lastEntry = previousEntry;
                     }
@@ -254,11 +254,12 @@ var ts;
             class_1.prototype.forEach = function (action) {
                 var iterator = this.entries();
                 while (true) {
-                    var _a = iterator.next(), entry = _a.value, done = _a.done;
-                    if (done) {
+                    var iterResult = iterator.next();
+                    if (iterResult.done) {
                         break;
                     }
-                    action(entry[1], entry[0]);
+                    var _a = iterResult.value, key = _a[0], value = _a[1];
+                    action(value, key);
                 }
             };
             return class_1;
@@ -302,11 +303,11 @@ var ts;
     ts.firstDefined = firstDefined;
     function firstDefinedIterator(iter, callback) {
         while (true) {
-            var _a = iter.next(), value = _a.value, done = _a.done;
-            if (done) {
+            var iterResult = iter.next();
+            if (iterResult.done) {
                 return undefined;
             }
-            var result = callback(value);
+            var result = callback(iterResult.value);
             if (result !== undefined) {
                 return result;
             }
@@ -315,7 +316,7 @@ var ts;
     ts.firstDefinedIterator = firstDefinedIterator;
     function zipWith(arrayA, arrayB, callback) {
         var result = [];
-        Debug.assertEqual(arrayA.length, arrayB.length);
+        ts.Debug.assertEqual(arrayA.length, arrayB.length);
         for (var i = 0; i < arrayA.length; i++) {
             result.push(callback(arrayA[i], arrayB[i], i));
         }
@@ -323,7 +324,7 @@ var ts;
     }
     ts.zipWith = zipWith;
     function zipToIterator(arrayA, arrayB) {
-        Debug.assertEqual(arrayA.length, arrayB.length);
+        ts.Debug.assertEqual(arrayA.length, arrayB.length);
         var i = 0;
         return {
             next: function () {
@@ -337,7 +338,7 @@ var ts;
     }
     ts.zipToIterator = zipToIterator;
     function zipToMap(keys, values) {
-        Debug.assert(keys.length === values.length);
+        ts.Debug.assert(keys.length === values.length);
         var map = createMap();
         for (var i = 0; i < keys.length; ++i) {
             map.set(keys[i], values[i]);
@@ -411,7 +412,7 @@ var ts;
                 return result;
             }
         }
-        return Debug.fail();
+        return ts.Debug.fail();
     }
     ts.findMap = findMap;
     function contains(array, value, equalityComparer) {
@@ -529,19 +530,21 @@ var ts;
         return array;
     }
     ts.sameMap = sameMap;
+    /**
+     * Flattens an array containing a mix of array or non-array elements.
+     *
+     * @param array The array to flatten.
+     */
     function flatten(array) {
-        var result;
-        if (array) {
-            result = [];
-            for (var _i = 0, array_2 = array; _i < array_2.length; _i++) {
-                var v = array_2[_i];
-                if (v) {
-                    if (isArray(v)) {
-                        addRange(result, v);
-                    }
-                    else {
-                        result.push(v);
-                    }
+        var result = [];
+        for (var _i = 0, array_2 = array; _i < array_2.length; _i++) {
+            var v = array_2[_i];
+            if (v) {
+                if (isArray(v)) {
+                    addRange(result, v);
+                }
+                else {
+                    result.push(v);
                 }
             }
         }
@@ -841,7 +844,7 @@ var ts;
                     continue;
                 case -1 /* LessThan */:
                     // If `array` is sorted, `next` should **never** be less than `last`.
-                    return Debug.fail("Array is unsorted.");
+                    return ts.Debug.fail("Array is unsorted.");
             }
             deduplicated.push(last = next);
         }
@@ -908,13 +911,13 @@ var ts;
         loopB: for (var offsetA = 0, offsetB = 0; offsetB < arrayB.length; offsetB++) {
             if (offsetB > 0) {
                 // Ensure `arrayB` is properly sorted.
-                Debug.assertGreaterThanOrEqual(comparer(arrayB[offsetB], arrayB[offsetB - 1]), 0 /* EqualTo */);
+                ts.Debug.assertGreaterThanOrEqual(comparer(arrayB[offsetB], arrayB[offsetB - 1]), 0 /* EqualTo */);
             }
             loopA: for (var startA = offsetA; offsetA < arrayA.length; offsetA++) {
                 if (offsetA > startA) {
                     // Ensure `arrayA` is properly sorted. We only need to perform this check if
                     // `offsetA` has changed since we entered the loop.
-                    Debug.assertGreaterThanOrEqual(comparer(arrayA[offsetA], arrayA[offsetA - 1]), 0 /* EqualTo */);
+                    ts.Debug.assertGreaterThanOrEqual(comparer(arrayA[offsetA], arrayA[offsetA - 1]), 0 /* EqualTo */);
                 }
                 switch (comparer(arrayB[offsetB], arrayA[offsetA])) {
                     case -1 /* LessThan */:
@@ -1084,7 +1087,7 @@ var ts;
     }
     ts.firstOrUndefined = firstOrUndefined;
     function first(array) {
-        Debug.assert(array.length !== 0);
+        ts.Debug.assert(array.length !== 0);
         return array[0];
     }
     ts.first = first;
@@ -1096,7 +1099,7 @@ var ts;
     }
     ts.lastOrUndefined = lastOrUndefined;
     function last(array) {
-        Debug.assert(array.length !== 0);
+        ts.Debug.assert(array.length !== 0);
         return array[array.length - 1];
     }
     ts.last = last;
@@ -1238,10 +1241,9 @@ var ts;
     }
     ts.getOwnValues = getOwnValues;
     function arrayFrom(iterator, map) {
-        var _a;
         var result = [];
-        for (var _b = iterator.next(), value = _b.value, done = _b.done; !done; _a = iterator.next(), value = _a.value, done = _a.done, _a) {
-            result.push(map ? map(value) : value);
+        for (var iterResult = iterator.next(); !iterResult.done; iterResult = iterator.next()) {
+            result.push(map ? map(iterResult.value) : iterResult.value);
         }
         return result;
     }
@@ -1421,7 +1423,7 @@ var ts;
     function cast(value, test) {
         if (value !== undefined && test(value))
             return value;
-        return Debug.fail("Invalid cast. The supplied value " + value + " did not pass the test '" + Debug.getFunctionName(test) + "'.");
+        return ts.Debug.fail("Invalid cast. The supplied value " + value + " did not pass the test '" + ts.Debug.getFunctionName(test) + "'.");
     }
     ts.cast = cast;
     /** Does nothing. */
@@ -1433,6 +1435,9 @@ var ts;
     /** Do nothing and return true */
     function returnTrue() { return true; }
     ts.returnTrue = returnTrue;
+    /** Do nothing and return undefined */
+    function returnUndefined() { return undefined; }
+    ts.returnUndefined = returnUndefined;
     /** Returns its argument. */
     function identity(x) { return x; }
     ts.identity = identity;
@@ -1455,38 +1460,13 @@ var ts;
         };
     }
     ts.memoize = memoize;
-    function chain(a, b, c, d, e) {
+    function compose(a, b, c, d, e) {
         if (e) {
             var args_2 = [];
             for (var i = 0; i < arguments.length; i++) {
                 args_2[i] = arguments[i];
             }
-            return function (t) { return compose.apply(void 0, map(args_2, function (f) { return f(t); })); };
-        }
-        else if (d) {
-            return function (t) { return compose(a(t), b(t), c(t), d(t)); };
-        }
-        else if (c) {
-            return function (t) { return compose(a(t), b(t), c(t)); };
-        }
-        else if (b) {
-            return function (t) { return compose(a(t), b(t)); };
-        }
-        else if (a) {
-            return function (t) { return compose(a(t)); };
-        }
-        else {
-            return function (_) { return function (u) { return u; }; };
-        }
-    }
-    ts.chain = chain;
-    function compose(a, b, c, d, e) {
-        if (e) {
-            var args_3 = [];
-            for (var i = 0; i < arguments.length; i++) {
-                args_3[i] = arguments[i];
-            }
-            return function (t) { return reduceLeft(args_3, function (u, f) { return f(u); }, t); };
+            return function (t) { return reduceLeft(args_2, function (u, f) { return f(u); }, t); };
         }
         else if (d) {
             return function (t) { return d(c(b(a(t)))); };
@@ -1512,92 +1492,6 @@ var ts;
         AssertionLevel[AssertionLevel["Aggressive"] = 2] = "Aggressive";
         AssertionLevel[AssertionLevel["VeryAggressive"] = 3] = "VeryAggressive";
     })(AssertionLevel = ts.AssertionLevel || (ts.AssertionLevel = {}));
-    var Debug;
-    (function (Debug) {
-        Debug.currentAssertionLevel = 0 /* None */;
-        Debug.isDebugging = false;
-        function shouldAssert(level) {
-            return Debug.currentAssertionLevel >= level;
-        }
-        Debug.shouldAssert = shouldAssert;
-        function assert(expression, message, verboseDebugInfo, stackCrawlMark) {
-            if (!expression) {
-                if (verboseDebugInfo) {
-                    message += "\r\nVerbose Debug Information: " + (typeof verboseDebugInfo === "string" ? verboseDebugInfo : verboseDebugInfo());
-                }
-                fail(message ? "False expression: " + message : "False expression.", stackCrawlMark || assert);
-            }
-        }
-        Debug.assert = assert;
-        function assertEqual(a, b, msg, msg2) {
-            if (a !== b) {
-                var message = msg ? msg2 ? msg + " " + msg2 : msg : "";
-                fail("Expected " + a + " === " + b + ". " + message);
-            }
-        }
-        Debug.assertEqual = assertEqual;
-        function assertLessThan(a, b, msg) {
-            if (a >= b) {
-                fail("Expected " + a + " < " + b + ". " + (msg || ""));
-            }
-        }
-        Debug.assertLessThan = assertLessThan;
-        function assertLessThanOrEqual(a, b) {
-            if (a > b) {
-                fail("Expected " + a + " <= " + b);
-            }
-        }
-        Debug.assertLessThanOrEqual = assertLessThanOrEqual;
-        function assertGreaterThanOrEqual(a, b) {
-            if (a < b) {
-                fail("Expected " + a + " >= " + b);
-            }
-        }
-        Debug.assertGreaterThanOrEqual = assertGreaterThanOrEqual;
-        function fail(message, stackCrawlMark) {
-            debugger;
-            var e = new Error(message ? "Debug Failure. " + message : "Debug Failure.");
-            if (Error.captureStackTrace) {
-                Error.captureStackTrace(e, stackCrawlMark || fail);
-            }
-            throw e;
-        }
-        Debug.fail = fail;
-        function assertDefined(value, message) {
-            if (value === undefined || value === null)
-                return fail(message);
-            return value;
-        }
-        Debug.assertDefined = assertDefined;
-        function assertEachDefined(value, message) {
-            for (var _i = 0, value_1 = value; _i < value_1.length; _i++) {
-                var v = value_1[_i];
-                assertDefined(v, message);
-            }
-            return value;
-        }
-        Debug.assertEachDefined = assertEachDefined;
-        function assertNever(member, message, stackCrawlMark) {
-            if (message === void 0) { message = "Illegal value:"; }
-            var detail = typeof member === "object" && "kind" in member && "pos" in member ? "SyntaxKind: " + Debug.showSyntaxKind(member) : JSON.stringify(member);
-            return fail(message + " " + detail, stackCrawlMark || assertNever);
-        }
-        Debug.assertNever = assertNever;
-        function getFunctionName(func) {
-            if (typeof func !== "function") {
-                return "";
-            }
-            else if (func.hasOwnProperty("name")) {
-                return func.name;
-            }
-            else {
-                var text = Function.prototype.toString.call(func);
-                var match = /^function\s+([\w\$]+)\s*\(/.exec(text);
-                return match ? match[1] : "";
-            }
-        }
-        Debug.getFunctionName = getFunctionName;
-    })(Debug = ts.Debug || (ts.Debug = {}));
     function equateValues(a, b) {
         return a === b;
     }
@@ -1854,7 +1748,7 @@ var ts;
                     bestCandidate = candidate;
                 }
                 else {
-                    Debug.assert(distance < bestDistance); // Else `levenshteinWithMax` should return undefined
+                    ts.Debug.assert(distance < bestDistance); // Else `levenshteinWithMax` should return undefined
                     bestDistance = distance;
                     bestCandidate = candidate;
                 }
@@ -1998,7 +1892,7 @@ var ts;
      * E.g.: matchedText(tryParsePattern("foo*baz"), "foobarbaz") === "bar"
      */
     function matchedText(pattern, candidate) {
-        Debug.assert(isPatternMatch(pattern, candidate));
+        ts.Debug.assert(isPatternMatch(pattern, candidate));
         return candidate.substring(pattern.prefix.length, candidate.length - pattern.suffix.length);
     }
     ts.matchedText = matchedText;
@@ -2091,6 +1985,267 @@ var ts;
         return result;
     }
     ts.fill = fill;
+    function cartesianProduct(arrays) {
+        var result = [];
+        cartesianProductWorker(arrays, result, /*outer*/ undefined, 0);
+        return result;
+    }
+    ts.cartesianProduct = cartesianProduct;
+    function cartesianProductWorker(arrays, result, outer, index) {
+        for (var _i = 0, _a = arrays[index]; _i < _a.length; _i++) {
+            var element = _a[_i];
+            var inner = void 0;
+            if (outer) {
+                inner = outer.slice();
+                inner.push(element);
+            }
+            else {
+                inner = [element];
+            }
+            if (index === arrays.length - 1) {
+                result.push(inner);
+            }
+            else {
+                cartesianProductWorker(arrays, result, inner, index + 1);
+            }
+        }
+    }
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var Debug;
+    (function (Debug) {
+        Debug.currentAssertionLevel = 0 /* None */;
+        Debug.isDebugging = false;
+        function shouldAssert(level) {
+            return Debug.currentAssertionLevel >= level;
+        }
+        Debug.shouldAssert = shouldAssert;
+        function assert(expression, message, verboseDebugInfo, stackCrawlMark) {
+            if (!expression) {
+                if (verboseDebugInfo) {
+                    message += "\r\nVerbose Debug Information: " + (typeof verboseDebugInfo === "string" ? verboseDebugInfo : verboseDebugInfo());
+                }
+                fail(message ? "False expression: " + message : "False expression.", stackCrawlMark || assert);
+            }
+        }
+        Debug.assert = assert;
+        function assertEqual(a, b, msg, msg2) {
+            if (a !== b) {
+                var message = msg ? msg2 ? msg + " " + msg2 : msg : "";
+                fail("Expected " + a + " === " + b + ". " + message);
+            }
+        }
+        Debug.assertEqual = assertEqual;
+        function assertLessThan(a, b, msg) {
+            if (a >= b) {
+                fail("Expected " + a + " < " + b + ". " + (msg || ""));
+            }
+        }
+        Debug.assertLessThan = assertLessThan;
+        function assertLessThanOrEqual(a, b) {
+            if (a > b) {
+                fail("Expected " + a + " <= " + b);
+            }
+        }
+        Debug.assertLessThanOrEqual = assertLessThanOrEqual;
+        function assertGreaterThanOrEqual(a, b) {
+            if (a < b) {
+                fail("Expected " + a + " >= " + b);
+            }
+        }
+        Debug.assertGreaterThanOrEqual = assertGreaterThanOrEqual;
+        function fail(message, stackCrawlMark) {
+            debugger;
+            var e = new Error(message ? "Debug Failure. " + message : "Debug Failure.");
+            if (Error.captureStackTrace) {
+                Error.captureStackTrace(e, stackCrawlMark || fail);
+            }
+            throw e;
+        }
+        Debug.fail = fail;
+        function assertDefined(value, message) {
+            if (value === undefined || value === null)
+                return fail(message);
+            return value;
+        }
+        Debug.assertDefined = assertDefined;
+        function assertEachDefined(value, message) {
+            for (var _i = 0, value_1 = value; _i < value_1.length; _i++) {
+                var v = value_1[_i];
+                assertDefined(v, message);
+            }
+            return value;
+        }
+        Debug.assertEachDefined = assertEachDefined;
+        function assertNever(member, message, stackCrawlMark) {
+            if (message === void 0) { message = "Illegal value:"; }
+            var detail = typeof member === "object" && "kind" in member && "pos" in member && formatSyntaxKind ? "SyntaxKind: " + formatSyntaxKind(member.kind) : JSON.stringify(member);
+            return fail(message + " " + detail, stackCrawlMark || assertNever);
+        }
+        Debug.assertNever = assertNever;
+        function getFunctionName(func) {
+            if (typeof func !== "function") {
+                return "";
+            }
+            else if (func.hasOwnProperty("name")) {
+                return func.name;
+            }
+            else {
+                var text = Function.prototype.toString.call(func);
+                var match = /^function\s+([\w\$]+)\s*\(/.exec(text);
+                return match ? match[1] : "";
+            }
+        }
+        Debug.getFunctionName = getFunctionName;
+        function formatSymbol(symbol) {
+            return "{ name: " + ts.unescapeLeadingUnderscores(symbol.escapedName) + "; flags: " + formatSymbolFlags(symbol.flags) + "; declarations: " + ts.map(symbol.declarations, function (node) { return formatSyntaxKind(node.kind); }) + " }";
+        }
+        Debug.formatSymbol = formatSymbol;
+        /**
+         * Formats an enum value as a string for debugging and debug assertions.
+         */
+        function formatEnum(value, enumObject, isFlags) {
+            if (value === void 0) { value = 0; }
+            var members = getEnumMembers(enumObject);
+            if (value === 0) {
+                return members.length > 0 && members[0][0] === 0 ? members[0][1] : "0";
+            }
+            if (isFlags) {
+                var result = "";
+                var remainingFlags = value;
+                for (var i = members.length - 1; i >= 0 && remainingFlags !== 0; i--) {
+                    var _a = members[i], enumValue = _a[0], enumName = _a[1];
+                    if (enumValue !== 0 && (remainingFlags & enumValue) === enumValue) {
+                        remainingFlags &= ~enumValue;
+                        result = "" + enumName + (result ? "|" : "") + result;
+                    }
+                }
+                if (remainingFlags === 0) {
+                    return result;
+                }
+            }
+            else {
+                for (var _i = 0, members_1 = members; _i < members_1.length; _i++) {
+                    var _b = members_1[_i], enumValue = _b[0], enumName = _b[1];
+                    if (enumValue === value) {
+                        return enumName;
+                    }
+                }
+            }
+            return value.toString();
+        }
+        Debug.formatEnum = formatEnum;
+        function getEnumMembers(enumObject) {
+            var result = [];
+            for (var name in enumObject) {
+                var value = enumObject[name];
+                if (typeof value === "number") {
+                    result.push([value, name]);
+                }
+            }
+            return ts.stableSort(result, function (x, y) { return ts.compareValues(x[0], y[0]); });
+        }
+        function formatSyntaxKind(kind) {
+            return formatEnum(kind, ts.SyntaxKind, /*isFlags*/ false);
+        }
+        Debug.formatSyntaxKind = formatSyntaxKind;
+        function formatNodeFlags(flags) {
+            return formatEnum(flags, ts.NodeFlags, /*isFlags*/ true);
+        }
+        Debug.formatNodeFlags = formatNodeFlags;
+        function formatModifierFlags(flags) {
+            return formatEnum(flags, ts.ModifierFlags, /*isFlags*/ true);
+        }
+        Debug.formatModifierFlags = formatModifierFlags;
+        function formatTransformFlags(flags) {
+            return formatEnum(flags, ts.TransformFlags, /*isFlags*/ true);
+        }
+        Debug.formatTransformFlags = formatTransformFlags;
+        function formatEmitFlags(flags) {
+            return formatEnum(flags, ts.EmitFlags, /*isFlags*/ true);
+        }
+        Debug.formatEmitFlags = formatEmitFlags;
+        function formatSymbolFlags(flags) {
+            return formatEnum(flags, ts.SymbolFlags, /*isFlags*/ true);
+        }
+        Debug.formatSymbolFlags = formatSymbolFlags;
+        function formatTypeFlags(flags) {
+            return formatEnum(flags, ts.TypeFlags, /*isFlags*/ true);
+        }
+        Debug.formatTypeFlags = formatTypeFlags;
+        function formatObjectFlags(flags) {
+            return formatEnum(flags, ts.ObjectFlags, /*isFlags*/ true);
+        }
+        Debug.formatObjectFlags = formatObjectFlags;
+        function failBadSyntaxKind(node, message) {
+            return fail((message || "Unexpected node.") + "\r\nNode " + formatSyntaxKind(node.kind) + " was unexpected.", failBadSyntaxKind);
+        }
+        Debug.failBadSyntaxKind = failBadSyntaxKind;
+        Debug.assertEachNode = shouldAssert(1 /* Normal */)
+            ? function (nodes, test, message) { return assert(test === undefined || ts.every(nodes, test), message || "Unexpected node.", function () { return "Node array did not pass test '" + getFunctionName(test) + "'."; }, Debug.assertEachNode); }
+            : ts.noop;
+        Debug.assertNode = shouldAssert(1 /* Normal */)
+            ? function (node, test, message) { return assert(test === undefined || test(node), message || "Unexpected node.", function () { return "Node " + formatSyntaxKind(node.kind) + " did not pass test '" + getFunctionName(test) + "'."; }, Debug.assertNode); }
+            : ts.noop;
+        Debug.assertOptionalNode = shouldAssert(1 /* Normal */)
+            ? function (node, test, message) { return assert(test === undefined || node === undefined || test(node), message || "Unexpected node.", function () { return "Node " + formatSyntaxKind(node.kind) + " did not pass test '" + getFunctionName(test) + "'."; }, Debug.assertOptionalNode); }
+            : ts.noop;
+        Debug.assertOptionalToken = shouldAssert(1 /* Normal */)
+            ? function (node, kind, message) { return assert(kind === undefined || node === undefined || node.kind === kind, message || "Unexpected node.", function () { return "Node " + formatSyntaxKind(node.kind) + " was not a '" + formatSyntaxKind(kind) + "' token."; }, Debug.assertOptionalToken); }
+            : ts.noop;
+        Debug.assertMissingNode = shouldAssert(1 /* Normal */)
+            ? function (node, message) { return assert(node === undefined, message || "Unexpected node.", function () { return "Node " + formatSyntaxKind(node.kind) + " was unexpected'."; }, Debug.assertMissingNode); }
+            : ts.noop;
+        var isDebugInfoEnabled = false;
+        /**
+         * Injects debug information into frequently used types.
+         */
+        function enableDebugInfo() {
+            if (isDebugInfoEnabled)
+                return;
+            // Add additional properties in debug mode to assist with debugging.
+            Object.defineProperties(ts.objectAllocator.getSymbolConstructor().prototype, {
+                __debugFlags: { get: function () { return formatSymbolFlags(this.flags); } }
+            });
+            Object.defineProperties(ts.objectAllocator.getTypeConstructor().prototype, {
+                __debugFlags: { get: function () { return formatTypeFlags(this.flags); } },
+                __debugObjectFlags: { get: function () { return this.flags & 524288 /* Object */ ? formatObjectFlags(this.objectFlags) : ""; } },
+                __debugTypeToString: { value: function () { return this.checker.typeToString(this); } },
+            });
+            var nodeConstructors = [
+                ts.objectAllocator.getNodeConstructor(),
+                ts.objectAllocator.getIdentifierConstructor(),
+                ts.objectAllocator.getTokenConstructor(),
+                ts.objectAllocator.getSourceFileConstructor()
+            ];
+            for (var _i = 0, nodeConstructors_1 = nodeConstructors; _i < nodeConstructors_1.length; _i++) {
+                var ctor = nodeConstructors_1[_i];
+                if (!ctor.prototype.hasOwnProperty("__debugKind")) {
+                    Object.defineProperties(ctor.prototype, {
+                        __debugKind: { get: function () { return formatSyntaxKind(this.kind); } },
+                        __debugNodeFlags: { get: function () { return formatNodeFlags(this.flags); } },
+                        __debugModifierFlags: { get: function () { return formatModifierFlags(ts.getModifierFlagsNoCache(this)); } },
+                        __debugTransformFlags: { get: function () { return formatTransformFlags(this.transformFlags); } },
+                        __debugIsParseTreeNode: { get: function () { return ts.isParseTreeNode(this); } },
+                        __debugEmitFlags: { get: function () { return formatEmitFlags(ts.getEmitFlags(this)); } },
+                        __debugGetText: {
+                            value: function (includeTrivia) {
+                                if (ts.nodeIsSynthesized(this))
+                                    return "";
+                                var parseNode = ts.getParseTreeNode(this);
+                                var sourceFile = parseNode && ts.getSourceFileOfNode(parseNode);
+                                return sourceFile ? ts.getSourceTextOfNodeFromSourceFile(sourceFile, parseNode, includeTrivia) : "";
+                            }
+                        }
+                    });
+                }
+            }
+            isDebugInfoEnabled = true;
+        }
+        Debug.enableDebugInfo = enableDebugInfo;
+    })(Debug = ts.Debug || (ts.Debug = {}));
 })(ts || (ts = {}));
 /*@internal*/
 var ts;
@@ -2643,309 +2798,312 @@ var ts;
         SyntaxKind[SyntaxKind["QuestionToken"] = 56] = "QuestionToken";
         SyntaxKind[SyntaxKind["ColonToken"] = 57] = "ColonToken";
         SyntaxKind[SyntaxKind["AtToken"] = 58] = "AtToken";
+        /** Only the JSDoc scanner produces BacktickToken. The normal scanner produces NoSubstitutionTemplateLiteral and related kinds. */
+        SyntaxKind[SyntaxKind["BacktickToken"] = 59] = "BacktickToken";
         // Assignments
-        SyntaxKind[SyntaxKind["EqualsToken"] = 59] = "EqualsToken";
-        SyntaxKind[SyntaxKind["PlusEqualsToken"] = 60] = "PlusEqualsToken";
-        SyntaxKind[SyntaxKind["MinusEqualsToken"] = 61] = "MinusEqualsToken";
-        SyntaxKind[SyntaxKind["AsteriskEqualsToken"] = 62] = "AsteriskEqualsToken";
-        SyntaxKind[SyntaxKind["AsteriskAsteriskEqualsToken"] = 63] = "AsteriskAsteriskEqualsToken";
-        SyntaxKind[SyntaxKind["SlashEqualsToken"] = 64] = "SlashEqualsToken";
-        SyntaxKind[SyntaxKind["PercentEqualsToken"] = 65] = "PercentEqualsToken";
-        SyntaxKind[SyntaxKind["LessThanLessThanEqualsToken"] = 66] = "LessThanLessThanEqualsToken";
-        SyntaxKind[SyntaxKind["GreaterThanGreaterThanEqualsToken"] = 67] = "GreaterThanGreaterThanEqualsToken";
-        SyntaxKind[SyntaxKind["GreaterThanGreaterThanGreaterThanEqualsToken"] = 68] = "GreaterThanGreaterThanGreaterThanEqualsToken";
-        SyntaxKind[SyntaxKind["AmpersandEqualsToken"] = 69] = "AmpersandEqualsToken";
-        SyntaxKind[SyntaxKind["BarEqualsToken"] = 70] = "BarEqualsToken";
-        SyntaxKind[SyntaxKind["CaretEqualsToken"] = 71] = "CaretEqualsToken";
+        SyntaxKind[SyntaxKind["EqualsToken"] = 60] = "EqualsToken";
+        SyntaxKind[SyntaxKind["PlusEqualsToken"] = 61] = "PlusEqualsToken";
+        SyntaxKind[SyntaxKind["MinusEqualsToken"] = 62] = "MinusEqualsToken";
+        SyntaxKind[SyntaxKind["AsteriskEqualsToken"] = 63] = "AsteriskEqualsToken";
+        SyntaxKind[SyntaxKind["AsteriskAsteriskEqualsToken"] = 64] = "AsteriskAsteriskEqualsToken";
+        SyntaxKind[SyntaxKind["SlashEqualsToken"] = 65] = "SlashEqualsToken";
+        SyntaxKind[SyntaxKind["PercentEqualsToken"] = 66] = "PercentEqualsToken";
+        SyntaxKind[SyntaxKind["LessThanLessThanEqualsToken"] = 67] = "LessThanLessThanEqualsToken";
+        SyntaxKind[SyntaxKind["GreaterThanGreaterThanEqualsToken"] = 68] = "GreaterThanGreaterThanEqualsToken";
+        SyntaxKind[SyntaxKind["GreaterThanGreaterThanGreaterThanEqualsToken"] = 69] = "GreaterThanGreaterThanGreaterThanEqualsToken";
+        SyntaxKind[SyntaxKind["AmpersandEqualsToken"] = 70] = "AmpersandEqualsToken";
+        SyntaxKind[SyntaxKind["BarEqualsToken"] = 71] = "BarEqualsToken";
+        SyntaxKind[SyntaxKind["CaretEqualsToken"] = 72] = "CaretEqualsToken";
         // Identifiers
-        SyntaxKind[SyntaxKind["Identifier"] = 72] = "Identifier";
+        SyntaxKind[SyntaxKind["Identifier"] = 73] = "Identifier";
         // Reserved words
-        SyntaxKind[SyntaxKind["BreakKeyword"] = 73] = "BreakKeyword";
-        SyntaxKind[SyntaxKind["CaseKeyword"] = 74] = "CaseKeyword";
-        SyntaxKind[SyntaxKind["CatchKeyword"] = 75] = "CatchKeyword";
-        SyntaxKind[SyntaxKind["ClassKeyword"] = 76] = "ClassKeyword";
-        SyntaxKind[SyntaxKind["ConstKeyword"] = 77] = "ConstKeyword";
-        SyntaxKind[SyntaxKind["ContinueKeyword"] = 78] = "ContinueKeyword";
-        SyntaxKind[SyntaxKind["DebuggerKeyword"] = 79] = "DebuggerKeyword";
-        SyntaxKind[SyntaxKind["DefaultKeyword"] = 80] = "DefaultKeyword";
-        SyntaxKind[SyntaxKind["DeleteKeyword"] = 81] = "DeleteKeyword";
-        SyntaxKind[SyntaxKind["DoKeyword"] = 82] = "DoKeyword";
-        SyntaxKind[SyntaxKind["ElseKeyword"] = 83] = "ElseKeyword";
-        SyntaxKind[SyntaxKind["EnumKeyword"] = 84] = "EnumKeyword";
-        SyntaxKind[SyntaxKind["ExportKeyword"] = 85] = "ExportKeyword";
-        SyntaxKind[SyntaxKind["ExtendsKeyword"] = 86] = "ExtendsKeyword";
-        SyntaxKind[SyntaxKind["FalseKeyword"] = 87] = "FalseKeyword";
-        SyntaxKind[SyntaxKind["FinallyKeyword"] = 88] = "FinallyKeyword";
-        SyntaxKind[SyntaxKind["ForKeyword"] = 89] = "ForKeyword";
-        SyntaxKind[SyntaxKind["FunctionKeyword"] = 90] = "FunctionKeyword";
-        SyntaxKind[SyntaxKind["IfKeyword"] = 91] = "IfKeyword";
-        SyntaxKind[SyntaxKind["ImportKeyword"] = 92] = "ImportKeyword";
-        SyntaxKind[SyntaxKind["InKeyword"] = 93] = "InKeyword";
-        SyntaxKind[SyntaxKind["InstanceOfKeyword"] = 94] = "InstanceOfKeyword";
-        SyntaxKind[SyntaxKind["NewKeyword"] = 95] = "NewKeyword";
-        SyntaxKind[SyntaxKind["NullKeyword"] = 96] = "NullKeyword";
-        SyntaxKind[SyntaxKind["ReturnKeyword"] = 97] = "ReturnKeyword";
-        SyntaxKind[SyntaxKind["SuperKeyword"] = 98] = "SuperKeyword";
-        SyntaxKind[SyntaxKind["SwitchKeyword"] = 99] = "SwitchKeyword";
-        SyntaxKind[SyntaxKind["ThisKeyword"] = 100] = "ThisKeyword";
-        SyntaxKind[SyntaxKind["ThrowKeyword"] = 101] = "ThrowKeyword";
-        SyntaxKind[SyntaxKind["TrueKeyword"] = 102] = "TrueKeyword";
-        SyntaxKind[SyntaxKind["TryKeyword"] = 103] = "TryKeyword";
-        SyntaxKind[SyntaxKind["TypeOfKeyword"] = 104] = "TypeOfKeyword";
-        SyntaxKind[SyntaxKind["VarKeyword"] = 105] = "VarKeyword";
-        SyntaxKind[SyntaxKind["VoidKeyword"] = 106] = "VoidKeyword";
-        SyntaxKind[SyntaxKind["WhileKeyword"] = 107] = "WhileKeyword";
-        SyntaxKind[SyntaxKind["WithKeyword"] = 108] = "WithKeyword";
+        SyntaxKind[SyntaxKind["BreakKeyword"] = 74] = "BreakKeyword";
+        SyntaxKind[SyntaxKind["CaseKeyword"] = 75] = "CaseKeyword";
+        SyntaxKind[SyntaxKind["CatchKeyword"] = 76] = "CatchKeyword";
+        SyntaxKind[SyntaxKind["ClassKeyword"] = 77] = "ClassKeyword";
+        SyntaxKind[SyntaxKind["ConstKeyword"] = 78] = "ConstKeyword";
+        SyntaxKind[SyntaxKind["ContinueKeyword"] = 79] = "ContinueKeyword";
+        SyntaxKind[SyntaxKind["DebuggerKeyword"] = 80] = "DebuggerKeyword";
+        SyntaxKind[SyntaxKind["DefaultKeyword"] = 81] = "DefaultKeyword";
+        SyntaxKind[SyntaxKind["DeleteKeyword"] = 82] = "DeleteKeyword";
+        SyntaxKind[SyntaxKind["DoKeyword"] = 83] = "DoKeyword";
+        SyntaxKind[SyntaxKind["ElseKeyword"] = 84] = "ElseKeyword";
+        SyntaxKind[SyntaxKind["EnumKeyword"] = 85] = "EnumKeyword";
+        SyntaxKind[SyntaxKind["ExportKeyword"] = 86] = "ExportKeyword";
+        SyntaxKind[SyntaxKind["ExtendsKeyword"] = 87] = "ExtendsKeyword";
+        SyntaxKind[SyntaxKind["FalseKeyword"] = 88] = "FalseKeyword";
+        SyntaxKind[SyntaxKind["FinallyKeyword"] = 89] = "FinallyKeyword";
+        SyntaxKind[SyntaxKind["ForKeyword"] = 90] = "ForKeyword";
+        SyntaxKind[SyntaxKind["FunctionKeyword"] = 91] = "FunctionKeyword";
+        SyntaxKind[SyntaxKind["IfKeyword"] = 92] = "IfKeyword";
+        SyntaxKind[SyntaxKind["ImportKeyword"] = 93] = "ImportKeyword";
+        SyntaxKind[SyntaxKind["InKeyword"] = 94] = "InKeyword";
+        SyntaxKind[SyntaxKind["InstanceOfKeyword"] = 95] = "InstanceOfKeyword";
+        SyntaxKind[SyntaxKind["NewKeyword"] = 96] = "NewKeyword";
+        SyntaxKind[SyntaxKind["NullKeyword"] = 97] = "NullKeyword";
+        SyntaxKind[SyntaxKind["ReturnKeyword"] = 98] = "ReturnKeyword";
+        SyntaxKind[SyntaxKind["SuperKeyword"] = 99] = "SuperKeyword";
+        SyntaxKind[SyntaxKind["SwitchKeyword"] = 100] = "SwitchKeyword";
+        SyntaxKind[SyntaxKind["ThisKeyword"] = 101] = "ThisKeyword";
+        SyntaxKind[SyntaxKind["ThrowKeyword"] = 102] = "ThrowKeyword";
+        SyntaxKind[SyntaxKind["TrueKeyword"] = 103] = "TrueKeyword";
+        SyntaxKind[SyntaxKind["TryKeyword"] = 104] = "TryKeyword";
+        SyntaxKind[SyntaxKind["TypeOfKeyword"] = 105] = "TypeOfKeyword";
+        SyntaxKind[SyntaxKind["VarKeyword"] = 106] = "VarKeyword";
+        SyntaxKind[SyntaxKind["VoidKeyword"] = 107] = "VoidKeyword";
+        SyntaxKind[SyntaxKind["WhileKeyword"] = 108] = "WhileKeyword";
+        SyntaxKind[SyntaxKind["WithKeyword"] = 109] = "WithKeyword";
         // Strict mode reserved words
-        SyntaxKind[SyntaxKind["ImplementsKeyword"] = 109] = "ImplementsKeyword";
-        SyntaxKind[SyntaxKind["InterfaceKeyword"] = 110] = "InterfaceKeyword";
-        SyntaxKind[SyntaxKind["LetKeyword"] = 111] = "LetKeyword";
-        SyntaxKind[SyntaxKind["PackageKeyword"] = 112] = "PackageKeyword";
-        SyntaxKind[SyntaxKind["PrivateKeyword"] = 113] = "PrivateKeyword";
-        SyntaxKind[SyntaxKind["ProtectedKeyword"] = 114] = "ProtectedKeyword";
-        SyntaxKind[SyntaxKind["PublicKeyword"] = 115] = "PublicKeyword";
-        SyntaxKind[SyntaxKind["StaticKeyword"] = 116] = "StaticKeyword";
-        SyntaxKind[SyntaxKind["YieldKeyword"] = 117] = "YieldKeyword";
+        SyntaxKind[SyntaxKind["ImplementsKeyword"] = 110] = "ImplementsKeyword";
+        SyntaxKind[SyntaxKind["InterfaceKeyword"] = 111] = "InterfaceKeyword";
+        SyntaxKind[SyntaxKind["LetKeyword"] = 112] = "LetKeyword";
+        SyntaxKind[SyntaxKind["PackageKeyword"] = 113] = "PackageKeyword";
+        SyntaxKind[SyntaxKind["PrivateKeyword"] = 114] = "PrivateKeyword";
+        SyntaxKind[SyntaxKind["ProtectedKeyword"] = 115] = "ProtectedKeyword";
+        SyntaxKind[SyntaxKind["PublicKeyword"] = 116] = "PublicKeyword";
+        SyntaxKind[SyntaxKind["StaticKeyword"] = 117] = "StaticKeyword";
+        SyntaxKind[SyntaxKind["YieldKeyword"] = 118] = "YieldKeyword";
         // Contextual keywords
-        SyntaxKind[SyntaxKind["AbstractKeyword"] = 118] = "AbstractKeyword";
-        SyntaxKind[SyntaxKind["AsKeyword"] = 119] = "AsKeyword";
-        SyntaxKind[SyntaxKind["AnyKeyword"] = 120] = "AnyKeyword";
-        SyntaxKind[SyntaxKind["AsyncKeyword"] = 121] = "AsyncKeyword";
-        SyntaxKind[SyntaxKind["AwaitKeyword"] = 122] = "AwaitKeyword";
-        SyntaxKind[SyntaxKind["BooleanKeyword"] = 123] = "BooleanKeyword";
-        SyntaxKind[SyntaxKind["ConstructorKeyword"] = 124] = "ConstructorKeyword";
-        SyntaxKind[SyntaxKind["DeclareKeyword"] = 125] = "DeclareKeyword";
-        SyntaxKind[SyntaxKind["GetKeyword"] = 126] = "GetKeyword";
-        SyntaxKind[SyntaxKind["InferKeyword"] = 127] = "InferKeyword";
-        SyntaxKind[SyntaxKind["IsKeyword"] = 128] = "IsKeyword";
-        SyntaxKind[SyntaxKind["KeyOfKeyword"] = 129] = "KeyOfKeyword";
-        SyntaxKind[SyntaxKind["ModuleKeyword"] = 130] = "ModuleKeyword";
-        SyntaxKind[SyntaxKind["NamespaceKeyword"] = 131] = "NamespaceKeyword";
-        SyntaxKind[SyntaxKind["NeverKeyword"] = 132] = "NeverKeyword";
-        SyntaxKind[SyntaxKind["ReadonlyKeyword"] = 133] = "ReadonlyKeyword";
-        SyntaxKind[SyntaxKind["RequireKeyword"] = 134] = "RequireKeyword";
-        SyntaxKind[SyntaxKind["NumberKeyword"] = 135] = "NumberKeyword";
-        SyntaxKind[SyntaxKind["ObjectKeyword"] = 136] = "ObjectKeyword";
-        SyntaxKind[SyntaxKind["SetKeyword"] = 137] = "SetKeyword";
-        SyntaxKind[SyntaxKind["StringKeyword"] = 138] = "StringKeyword";
-        SyntaxKind[SyntaxKind["SymbolKeyword"] = 139] = "SymbolKeyword";
-        SyntaxKind[SyntaxKind["TypeKeyword"] = 140] = "TypeKeyword";
-        SyntaxKind[SyntaxKind["UndefinedKeyword"] = 141] = "UndefinedKeyword";
-        SyntaxKind[SyntaxKind["UniqueKeyword"] = 142] = "UniqueKeyword";
-        SyntaxKind[SyntaxKind["UnknownKeyword"] = 143] = "UnknownKeyword";
-        SyntaxKind[SyntaxKind["FromKeyword"] = 144] = "FromKeyword";
-        SyntaxKind[SyntaxKind["GlobalKeyword"] = 145] = "GlobalKeyword";
-        SyntaxKind[SyntaxKind["BigIntKeyword"] = 146] = "BigIntKeyword";
-        SyntaxKind[SyntaxKind["OfKeyword"] = 147] = "OfKeyword";
+        SyntaxKind[SyntaxKind["AbstractKeyword"] = 119] = "AbstractKeyword";
+        SyntaxKind[SyntaxKind["AsKeyword"] = 120] = "AsKeyword";
+        SyntaxKind[SyntaxKind["AnyKeyword"] = 121] = "AnyKeyword";
+        SyntaxKind[SyntaxKind["AsyncKeyword"] = 122] = "AsyncKeyword";
+        SyntaxKind[SyntaxKind["AwaitKeyword"] = 123] = "AwaitKeyword";
+        SyntaxKind[SyntaxKind["BooleanKeyword"] = 124] = "BooleanKeyword";
+        SyntaxKind[SyntaxKind["ConstructorKeyword"] = 125] = "ConstructorKeyword";
+        SyntaxKind[SyntaxKind["DeclareKeyword"] = 126] = "DeclareKeyword";
+        SyntaxKind[SyntaxKind["GetKeyword"] = 127] = "GetKeyword";
+        SyntaxKind[SyntaxKind["InferKeyword"] = 128] = "InferKeyword";
+        SyntaxKind[SyntaxKind["IsKeyword"] = 129] = "IsKeyword";
+        SyntaxKind[SyntaxKind["KeyOfKeyword"] = 130] = "KeyOfKeyword";
+        SyntaxKind[SyntaxKind["ModuleKeyword"] = 131] = "ModuleKeyword";
+        SyntaxKind[SyntaxKind["NamespaceKeyword"] = 132] = "NamespaceKeyword";
+        SyntaxKind[SyntaxKind["NeverKeyword"] = 133] = "NeverKeyword";
+        SyntaxKind[SyntaxKind["ReadonlyKeyword"] = 134] = "ReadonlyKeyword";
+        SyntaxKind[SyntaxKind["RequireKeyword"] = 135] = "RequireKeyword";
+        SyntaxKind[SyntaxKind["NumberKeyword"] = 136] = "NumberKeyword";
+        SyntaxKind[SyntaxKind["ObjectKeyword"] = 137] = "ObjectKeyword";
+        SyntaxKind[SyntaxKind["SetKeyword"] = 138] = "SetKeyword";
+        SyntaxKind[SyntaxKind["StringKeyword"] = 139] = "StringKeyword";
+        SyntaxKind[SyntaxKind["SymbolKeyword"] = 140] = "SymbolKeyword";
+        SyntaxKind[SyntaxKind["TypeKeyword"] = 141] = "TypeKeyword";
+        SyntaxKind[SyntaxKind["UndefinedKeyword"] = 142] = "UndefinedKeyword";
+        SyntaxKind[SyntaxKind["UniqueKeyword"] = 143] = "UniqueKeyword";
+        SyntaxKind[SyntaxKind["UnknownKeyword"] = 144] = "UnknownKeyword";
+        SyntaxKind[SyntaxKind["FromKeyword"] = 145] = "FromKeyword";
+        SyntaxKind[SyntaxKind["GlobalKeyword"] = 146] = "GlobalKeyword";
+        SyntaxKind[SyntaxKind["BigIntKeyword"] = 147] = "BigIntKeyword";
+        SyntaxKind[SyntaxKind["OfKeyword"] = 148] = "OfKeyword";
         // Parse tree nodes
         // Names
-        SyntaxKind[SyntaxKind["QualifiedName"] = 148] = "QualifiedName";
-        SyntaxKind[SyntaxKind["ComputedPropertyName"] = 149] = "ComputedPropertyName";
+        SyntaxKind[SyntaxKind["QualifiedName"] = 149] = "QualifiedName";
+        SyntaxKind[SyntaxKind["ComputedPropertyName"] = 150] = "ComputedPropertyName";
         // Signature elements
-        SyntaxKind[SyntaxKind["TypeParameter"] = 150] = "TypeParameter";
-        SyntaxKind[SyntaxKind["Parameter"] = 151] = "Parameter";
-        SyntaxKind[SyntaxKind["Decorator"] = 152] = "Decorator";
+        SyntaxKind[SyntaxKind["TypeParameter"] = 151] = "TypeParameter";
+        SyntaxKind[SyntaxKind["Parameter"] = 152] = "Parameter";
+        SyntaxKind[SyntaxKind["Decorator"] = 153] = "Decorator";
         // TypeMember
-        SyntaxKind[SyntaxKind["PropertySignature"] = 153] = "PropertySignature";
-        SyntaxKind[SyntaxKind["PropertyDeclaration"] = 154] = "PropertyDeclaration";
-        SyntaxKind[SyntaxKind["MethodSignature"] = 155] = "MethodSignature";
-        SyntaxKind[SyntaxKind["MethodDeclaration"] = 156] = "MethodDeclaration";
-        SyntaxKind[SyntaxKind["Constructor"] = 157] = "Constructor";
-        SyntaxKind[SyntaxKind["GetAccessor"] = 158] = "GetAccessor";
-        SyntaxKind[SyntaxKind["SetAccessor"] = 159] = "SetAccessor";
-        SyntaxKind[SyntaxKind["CallSignature"] = 160] = "CallSignature";
-        SyntaxKind[SyntaxKind["ConstructSignature"] = 161] = "ConstructSignature";
-        SyntaxKind[SyntaxKind["IndexSignature"] = 162] = "IndexSignature";
+        SyntaxKind[SyntaxKind["PropertySignature"] = 154] = "PropertySignature";
+        SyntaxKind[SyntaxKind["PropertyDeclaration"] = 155] = "PropertyDeclaration";
+        SyntaxKind[SyntaxKind["MethodSignature"] = 156] = "MethodSignature";
+        SyntaxKind[SyntaxKind["MethodDeclaration"] = 157] = "MethodDeclaration";
+        SyntaxKind[SyntaxKind["Constructor"] = 158] = "Constructor";
+        SyntaxKind[SyntaxKind["GetAccessor"] = 159] = "GetAccessor";
+        SyntaxKind[SyntaxKind["SetAccessor"] = 160] = "SetAccessor";
+        SyntaxKind[SyntaxKind["CallSignature"] = 161] = "CallSignature";
+        SyntaxKind[SyntaxKind["ConstructSignature"] = 162] = "ConstructSignature";
+        SyntaxKind[SyntaxKind["IndexSignature"] = 163] = "IndexSignature";
         // Type
-        SyntaxKind[SyntaxKind["TypePredicate"] = 163] = "TypePredicate";
-        SyntaxKind[SyntaxKind["TypeReference"] = 164] = "TypeReference";
-        SyntaxKind[SyntaxKind["FunctionType"] = 165] = "FunctionType";
-        SyntaxKind[SyntaxKind["ConstructorType"] = 166] = "ConstructorType";
-        SyntaxKind[SyntaxKind["TypeQuery"] = 167] = "TypeQuery";
-        SyntaxKind[SyntaxKind["TypeLiteral"] = 168] = "TypeLiteral";
-        SyntaxKind[SyntaxKind["ArrayType"] = 169] = "ArrayType";
-        SyntaxKind[SyntaxKind["TupleType"] = 170] = "TupleType";
-        SyntaxKind[SyntaxKind["OptionalType"] = 171] = "OptionalType";
-        SyntaxKind[SyntaxKind["RestType"] = 172] = "RestType";
-        SyntaxKind[SyntaxKind["UnionType"] = 173] = "UnionType";
-        SyntaxKind[SyntaxKind["IntersectionType"] = 174] = "IntersectionType";
-        SyntaxKind[SyntaxKind["ConditionalType"] = 175] = "ConditionalType";
-        SyntaxKind[SyntaxKind["InferType"] = 176] = "InferType";
-        SyntaxKind[SyntaxKind["ParenthesizedType"] = 177] = "ParenthesizedType";
-        SyntaxKind[SyntaxKind["ThisType"] = 178] = "ThisType";
-        SyntaxKind[SyntaxKind["TypeOperator"] = 179] = "TypeOperator";
-        SyntaxKind[SyntaxKind["IndexedAccessType"] = 180] = "IndexedAccessType";
-        SyntaxKind[SyntaxKind["MappedType"] = 181] = "MappedType";
-        SyntaxKind[SyntaxKind["LiteralType"] = 182] = "LiteralType";
-        SyntaxKind[SyntaxKind["ImportType"] = 183] = "ImportType";
+        SyntaxKind[SyntaxKind["TypePredicate"] = 164] = "TypePredicate";
+        SyntaxKind[SyntaxKind["TypeReference"] = 165] = "TypeReference";
+        SyntaxKind[SyntaxKind["FunctionType"] = 166] = "FunctionType";
+        SyntaxKind[SyntaxKind["ConstructorType"] = 167] = "ConstructorType";
+        SyntaxKind[SyntaxKind["TypeQuery"] = 168] = "TypeQuery";
+        SyntaxKind[SyntaxKind["TypeLiteral"] = 169] = "TypeLiteral";
+        SyntaxKind[SyntaxKind["ArrayType"] = 170] = "ArrayType";
+        SyntaxKind[SyntaxKind["TupleType"] = 171] = "TupleType";
+        SyntaxKind[SyntaxKind["OptionalType"] = 172] = "OptionalType";
+        SyntaxKind[SyntaxKind["RestType"] = 173] = "RestType";
+        SyntaxKind[SyntaxKind["UnionType"] = 174] = "UnionType";
+        SyntaxKind[SyntaxKind["IntersectionType"] = 175] = "IntersectionType";
+        SyntaxKind[SyntaxKind["ConditionalType"] = 176] = "ConditionalType";
+        SyntaxKind[SyntaxKind["InferType"] = 177] = "InferType";
+        SyntaxKind[SyntaxKind["ParenthesizedType"] = 178] = "ParenthesizedType";
+        SyntaxKind[SyntaxKind["ThisType"] = 179] = "ThisType";
+        SyntaxKind[SyntaxKind["TypeOperator"] = 180] = "TypeOperator";
+        SyntaxKind[SyntaxKind["IndexedAccessType"] = 181] = "IndexedAccessType";
+        SyntaxKind[SyntaxKind["MappedType"] = 182] = "MappedType";
+        SyntaxKind[SyntaxKind["LiteralType"] = 183] = "LiteralType";
+        SyntaxKind[SyntaxKind["ImportType"] = 184] = "ImportType";
         // Binding patterns
-        SyntaxKind[SyntaxKind["ObjectBindingPattern"] = 184] = "ObjectBindingPattern";
-        SyntaxKind[SyntaxKind["ArrayBindingPattern"] = 185] = "ArrayBindingPattern";
-        SyntaxKind[SyntaxKind["BindingElement"] = 186] = "BindingElement";
+        SyntaxKind[SyntaxKind["ObjectBindingPattern"] = 185] = "ObjectBindingPattern";
+        SyntaxKind[SyntaxKind["ArrayBindingPattern"] = 186] = "ArrayBindingPattern";
+        SyntaxKind[SyntaxKind["BindingElement"] = 187] = "BindingElement";
         // Expression
-        SyntaxKind[SyntaxKind["ArrayLiteralExpression"] = 187] = "ArrayLiteralExpression";
-        SyntaxKind[SyntaxKind["ObjectLiteralExpression"] = 188] = "ObjectLiteralExpression";
-        SyntaxKind[SyntaxKind["PropertyAccessExpression"] = 189] = "PropertyAccessExpression";
-        SyntaxKind[SyntaxKind["ElementAccessExpression"] = 190] = "ElementAccessExpression";
-        SyntaxKind[SyntaxKind["CallExpression"] = 191] = "CallExpression";
-        SyntaxKind[SyntaxKind["NewExpression"] = 192] = "NewExpression";
-        SyntaxKind[SyntaxKind["TaggedTemplateExpression"] = 193] = "TaggedTemplateExpression";
-        SyntaxKind[SyntaxKind["TypeAssertionExpression"] = 194] = "TypeAssertionExpression";
-        SyntaxKind[SyntaxKind["ParenthesizedExpression"] = 195] = "ParenthesizedExpression";
-        SyntaxKind[SyntaxKind["FunctionExpression"] = 196] = "FunctionExpression";
-        SyntaxKind[SyntaxKind["ArrowFunction"] = 197] = "ArrowFunction";
-        SyntaxKind[SyntaxKind["DeleteExpression"] = 198] = "DeleteExpression";
-        SyntaxKind[SyntaxKind["TypeOfExpression"] = 199] = "TypeOfExpression";
-        SyntaxKind[SyntaxKind["VoidExpression"] = 200] = "VoidExpression";
-        SyntaxKind[SyntaxKind["AwaitExpression"] = 201] = "AwaitExpression";
-        SyntaxKind[SyntaxKind["PrefixUnaryExpression"] = 202] = "PrefixUnaryExpression";
-        SyntaxKind[SyntaxKind["PostfixUnaryExpression"] = 203] = "PostfixUnaryExpression";
-        SyntaxKind[SyntaxKind["BinaryExpression"] = 204] = "BinaryExpression";
-        SyntaxKind[SyntaxKind["ConditionalExpression"] = 205] = "ConditionalExpression";
-        SyntaxKind[SyntaxKind["TemplateExpression"] = 206] = "TemplateExpression";
-        SyntaxKind[SyntaxKind["YieldExpression"] = 207] = "YieldExpression";
-        SyntaxKind[SyntaxKind["SpreadElement"] = 208] = "SpreadElement";
-        SyntaxKind[SyntaxKind["ClassExpression"] = 209] = "ClassExpression";
-        SyntaxKind[SyntaxKind["OmittedExpression"] = 210] = "OmittedExpression";
-        SyntaxKind[SyntaxKind["ExpressionWithTypeArguments"] = 211] = "ExpressionWithTypeArguments";
-        SyntaxKind[SyntaxKind["AsExpression"] = 212] = "AsExpression";
-        SyntaxKind[SyntaxKind["NonNullExpression"] = 213] = "NonNullExpression";
-        SyntaxKind[SyntaxKind["MetaProperty"] = 214] = "MetaProperty";
-        SyntaxKind[SyntaxKind["SyntheticExpression"] = 215] = "SyntheticExpression";
+        SyntaxKind[SyntaxKind["ArrayLiteralExpression"] = 188] = "ArrayLiteralExpression";
+        SyntaxKind[SyntaxKind["ObjectLiteralExpression"] = 189] = "ObjectLiteralExpression";
+        SyntaxKind[SyntaxKind["PropertyAccessExpression"] = 190] = "PropertyAccessExpression";
+        SyntaxKind[SyntaxKind["ElementAccessExpression"] = 191] = "ElementAccessExpression";
+        SyntaxKind[SyntaxKind["CallExpression"] = 192] = "CallExpression";
+        SyntaxKind[SyntaxKind["NewExpression"] = 193] = "NewExpression";
+        SyntaxKind[SyntaxKind["TaggedTemplateExpression"] = 194] = "TaggedTemplateExpression";
+        SyntaxKind[SyntaxKind["TypeAssertionExpression"] = 195] = "TypeAssertionExpression";
+        SyntaxKind[SyntaxKind["ParenthesizedExpression"] = 196] = "ParenthesizedExpression";
+        SyntaxKind[SyntaxKind["FunctionExpression"] = 197] = "FunctionExpression";
+        SyntaxKind[SyntaxKind["ArrowFunction"] = 198] = "ArrowFunction";
+        SyntaxKind[SyntaxKind["DeleteExpression"] = 199] = "DeleteExpression";
+        SyntaxKind[SyntaxKind["TypeOfExpression"] = 200] = "TypeOfExpression";
+        SyntaxKind[SyntaxKind["VoidExpression"] = 201] = "VoidExpression";
+        SyntaxKind[SyntaxKind["AwaitExpression"] = 202] = "AwaitExpression";
+        SyntaxKind[SyntaxKind["PrefixUnaryExpression"] = 203] = "PrefixUnaryExpression";
+        SyntaxKind[SyntaxKind["PostfixUnaryExpression"] = 204] = "PostfixUnaryExpression";
+        SyntaxKind[SyntaxKind["BinaryExpression"] = 205] = "BinaryExpression";
+        SyntaxKind[SyntaxKind["ConditionalExpression"] = 206] = "ConditionalExpression";
+        SyntaxKind[SyntaxKind["TemplateExpression"] = 207] = "TemplateExpression";
+        SyntaxKind[SyntaxKind["YieldExpression"] = 208] = "YieldExpression";
+        SyntaxKind[SyntaxKind["SpreadElement"] = 209] = "SpreadElement";
+        SyntaxKind[SyntaxKind["ClassExpression"] = 210] = "ClassExpression";
+        SyntaxKind[SyntaxKind["OmittedExpression"] = 211] = "OmittedExpression";
+        SyntaxKind[SyntaxKind["ExpressionWithTypeArguments"] = 212] = "ExpressionWithTypeArguments";
+        SyntaxKind[SyntaxKind["AsExpression"] = 213] = "AsExpression";
+        SyntaxKind[SyntaxKind["NonNullExpression"] = 214] = "NonNullExpression";
+        SyntaxKind[SyntaxKind["MetaProperty"] = 215] = "MetaProperty";
+        SyntaxKind[SyntaxKind["SyntheticExpression"] = 216] = "SyntheticExpression";
         // Misc
-        SyntaxKind[SyntaxKind["TemplateSpan"] = 216] = "TemplateSpan";
-        SyntaxKind[SyntaxKind["SemicolonClassElement"] = 217] = "SemicolonClassElement";
+        SyntaxKind[SyntaxKind["TemplateSpan"] = 217] = "TemplateSpan";
+        SyntaxKind[SyntaxKind["SemicolonClassElement"] = 218] = "SemicolonClassElement";
         // Element
-        SyntaxKind[SyntaxKind["Block"] = 218] = "Block";
-        SyntaxKind[SyntaxKind["VariableStatement"] = 219] = "VariableStatement";
-        SyntaxKind[SyntaxKind["EmptyStatement"] = 220] = "EmptyStatement";
-        SyntaxKind[SyntaxKind["ExpressionStatement"] = 221] = "ExpressionStatement";
-        SyntaxKind[SyntaxKind["IfStatement"] = 222] = "IfStatement";
-        SyntaxKind[SyntaxKind["DoStatement"] = 223] = "DoStatement";
-        SyntaxKind[SyntaxKind["WhileStatement"] = 224] = "WhileStatement";
-        SyntaxKind[SyntaxKind["ForStatement"] = 225] = "ForStatement";
-        SyntaxKind[SyntaxKind["ForInStatement"] = 226] = "ForInStatement";
-        SyntaxKind[SyntaxKind["ForOfStatement"] = 227] = "ForOfStatement";
-        SyntaxKind[SyntaxKind["ContinueStatement"] = 228] = "ContinueStatement";
-        SyntaxKind[SyntaxKind["BreakStatement"] = 229] = "BreakStatement";
-        SyntaxKind[SyntaxKind["ReturnStatement"] = 230] = "ReturnStatement";
-        SyntaxKind[SyntaxKind["WithStatement"] = 231] = "WithStatement";
-        SyntaxKind[SyntaxKind["SwitchStatement"] = 232] = "SwitchStatement";
-        SyntaxKind[SyntaxKind["LabeledStatement"] = 233] = "LabeledStatement";
-        SyntaxKind[SyntaxKind["ThrowStatement"] = 234] = "ThrowStatement";
-        SyntaxKind[SyntaxKind["TryStatement"] = 235] = "TryStatement";
-        SyntaxKind[SyntaxKind["DebuggerStatement"] = 236] = "DebuggerStatement";
-        SyntaxKind[SyntaxKind["VariableDeclaration"] = 237] = "VariableDeclaration";
-        SyntaxKind[SyntaxKind["VariableDeclarationList"] = 238] = "VariableDeclarationList";
-        SyntaxKind[SyntaxKind["FunctionDeclaration"] = 239] = "FunctionDeclaration";
-        SyntaxKind[SyntaxKind["ClassDeclaration"] = 240] = "ClassDeclaration";
-        SyntaxKind[SyntaxKind["InterfaceDeclaration"] = 241] = "InterfaceDeclaration";
-        SyntaxKind[SyntaxKind["TypeAliasDeclaration"] = 242] = "TypeAliasDeclaration";
-        SyntaxKind[SyntaxKind["EnumDeclaration"] = 243] = "EnumDeclaration";
-        SyntaxKind[SyntaxKind["ModuleDeclaration"] = 244] = "ModuleDeclaration";
-        SyntaxKind[SyntaxKind["ModuleBlock"] = 245] = "ModuleBlock";
-        SyntaxKind[SyntaxKind["CaseBlock"] = 246] = "CaseBlock";
-        SyntaxKind[SyntaxKind["NamespaceExportDeclaration"] = 247] = "NamespaceExportDeclaration";
-        SyntaxKind[SyntaxKind["ImportEqualsDeclaration"] = 248] = "ImportEqualsDeclaration";
-        SyntaxKind[SyntaxKind["ImportDeclaration"] = 249] = "ImportDeclaration";
-        SyntaxKind[SyntaxKind["ImportClause"] = 250] = "ImportClause";
-        SyntaxKind[SyntaxKind["NamespaceImport"] = 251] = "NamespaceImport";
-        SyntaxKind[SyntaxKind["NamedImports"] = 252] = "NamedImports";
-        SyntaxKind[SyntaxKind["ImportSpecifier"] = 253] = "ImportSpecifier";
-        SyntaxKind[SyntaxKind["ExportAssignment"] = 254] = "ExportAssignment";
-        SyntaxKind[SyntaxKind["ExportDeclaration"] = 255] = "ExportDeclaration";
-        SyntaxKind[SyntaxKind["NamedExports"] = 256] = "NamedExports";
-        SyntaxKind[SyntaxKind["ExportSpecifier"] = 257] = "ExportSpecifier";
-        SyntaxKind[SyntaxKind["MissingDeclaration"] = 258] = "MissingDeclaration";
+        SyntaxKind[SyntaxKind["Block"] = 219] = "Block";
+        SyntaxKind[SyntaxKind["VariableStatement"] = 220] = "VariableStatement";
+        SyntaxKind[SyntaxKind["EmptyStatement"] = 221] = "EmptyStatement";
+        SyntaxKind[SyntaxKind["ExpressionStatement"] = 222] = "ExpressionStatement";
+        SyntaxKind[SyntaxKind["IfStatement"] = 223] = "IfStatement";
+        SyntaxKind[SyntaxKind["DoStatement"] = 224] = "DoStatement";
+        SyntaxKind[SyntaxKind["WhileStatement"] = 225] = "WhileStatement";
+        SyntaxKind[SyntaxKind["ForStatement"] = 226] = "ForStatement";
+        SyntaxKind[SyntaxKind["ForInStatement"] = 227] = "ForInStatement";
+        SyntaxKind[SyntaxKind["ForOfStatement"] = 228] = "ForOfStatement";
+        SyntaxKind[SyntaxKind["ContinueStatement"] = 229] = "ContinueStatement";
+        SyntaxKind[SyntaxKind["BreakStatement"] = 230] = "BreakStatement";
+        SyntaxKind[SyntaxKind["ReturnStatement"] = 231] = "ReturnStatement";
+        SyntaxKind[SyntaxKind["WithStatement"] = 232] = "WithStatement";
+        SyntaxKind[SyntaxKind["SwitchStatement"] = 233] = "SwitchStatement";
+        SyntaxKind[SyntaxKind["LabeledStatement"] = 234] = "LabeledStatement";
+        SyntaxKind[SyntaxKind["ThrowStatement"] = 235] = "ThrowStatement";
+        SyntaxKind[SyntaxKind["TryStatement"] = 236] = "TryStatement";
+        SyntaxKind[SyntaxKind["DebuggerStatement"] = 237] = "DebuggerStatement";
+        SyntaxKind[SyntaxKind["VariableDeclaration"] = 238] = "VariableDeclaration";
+        SyntaxKind[SyntaxKind["VariableDeclarationList"] = 239] = "VariableDeclarationList";
+        SyntaxKind[SyntaxKind["FunctionDeclaration"] = 240] = "FunctionDeclaration";
+        SyntaxKind[SyntaxKind["ClassDeclaration"] = 241] = "ClassDeclaration";
+        SyntaxKind[SyntaxKind["InterfaceDeclaration"] = 242] = "InterfaceDeclaration";
+        SyntaxKind[SyntaxKind["TypeAliasDeclaration"] = 243] = "TypeAliasDeclaration";
+        SyntaxKind[SyntaxKind["EnumDeclaration"] = 244] = "EnumDeclaration";
+        SyntaxKind[SyntaxKind["ModuleDeclaration"] = 245] = "ModuleDeclaration";
+        SyntaxKind[SyntaxKind["ModuleBlock"] = 246] = "ModuleBlock";
+        SyntaxKind[SyntaxKind["CaseBlock"] = 247] = "CaseBlock";
+        SyntaxKind[SyntaxKind["NamespaceExportDeclaration"] = 248] = "NamespaceExportDeclaration";
+        SyntaxKind[SyntaxKind["ImportEqualsDeclaration"] = 249] = "ImportEqualsDeclaration";
+        SyntaxKind[SyntaxKind["ImportDeclaration"] = 250] = "ImportDeclaration";
+        SyntaxKind[SyntaxKind["ImportClause"] = 251] = "ImportClause";
+        SyntaxKind[SyntaxKind["NamespaceImport"] = 252] = "NamespaceImport";
+        SyntaxKind[SyntaxKind["NamedImports"] = 253] = "NamedImports";
+        SyntaxKind[SyntaxKind["ImportSpecifier"] = 254] = "ImportSpecifier";
+        SyntaxKind[SyntaxKind["ExportAssignment"] = 255] = "ExportAssignment";
+        SyntaxKind[SyntaxKind["ExportDeclaration"] = 256] = "ExportDeclaration";
+        SyntaxKind[SyntaxKind["NamedExports"] = 257] = "NamedExports";
+        SyntaxKind[SyntaxKind["ExportSpecifier"] = 258] = "ExportSpecifier";
+        SyntaxKind[SyntaxKind["MissingDeclaration"] = 259] = "MissingDeclaration";
         // Module references
-        SyntaxKind[SyntaxKind["ExternalModuleReference"] = 259] = "ExternalModuleReference";
+        SyntaxKind[SyntaxKind["ExternalModuleReference"] = 260] = "ExternalModuleReference";
         // JSX
-        SyntaxKind[SyntaxKind["JsxElement"] = 260] = "JsxElement";
-        SyntaxKind[SyntaxKind["JsxSelfClosingElement"] = 261] = "JsxSelfClosingElement";
-        SyntaxKind[SyntaxKind["JsxOpeningElement"] = 262] = "JsxOpeningElement";
-        SyntaxKind[SyntaxKind["JsxClosingElement"] = 263] = "JsxClosingElement";
-        SyntaxKind[SyntaxKind["JsxFragment"] = 264] = "JsxFragment";
-        SyntaxKind[SyntaxKind["JsxOpeningFragment"] = 265] = "JsxOpeningFragment";
-        SyntaxKind[SyntaxKind["JsxClosingFragment"] = 266] = "JsxClosingFragment";
-        SyntaxKind[SyntaxKind["JsxAttribute"] = 267] = "JsxAttribute";
-        SyntaxKind[SyntaxKind["JsxAttributes"] = 268] = "JsxAttributes";
-        SyntaxKind[SyntaxKind["JsxSpreadAttribute"] = 269] = "JsxSpreadAttribute";
-        SyntaxKind[SyntaxKind["JsxExpression"] = 270] = "JsxExpression";
+        SyntaxKind[SyntaxKind["JsxElement"] = 261] = "JsxElement";
+        SyntaxKind[SyntaxKind["JsxSelfClosingElement"] = 262] = "JsxSelfClosingElement";
+        SyntaxKind[SyntaxKind["JsxOpeningElement"] = 263] = "JsxOpeningElement";
+        SyntaxKind[SyntaxKind["JsxClosingElement"] = 264] = "JsxClosingElement";
+        SyntaxKind[SyntaxKind["JsxFragment"] = 265] = "JsxFragment";
+        SyntaxKind[SyntaxKind["JsxOpeningFragment"] = 266] = "JsxOpeningFragment";
+        SyntaxKind[SyntaxKind["JsxClosingFragment"] = 267] = "JsxClosingFragment";
+        SyntaxKind[SyntaxKind["JsxAttribute"] = 268] = "JsxAttribute";
+        SyntaxKind[SyntaxKind["JsxAttributes"] = 269] = "JsxAttributes";
+        SyntaxKind[SyntaxKind["JsxSpreadAttribute"] = 270] = "JsxSpreadAttribute";
+        SyntaxKind[SyntaxKind["JsxExpression"] = 271] = "JsxExpression";
         // Clauses
-        SyntaxKind[SyntaxKind["CaseClause"] = 271] = "CaseClause";
-        SyntaxKind[SyntaxKind["DefaultClause"] = 272] = "DefaultClause";
-        SyntaxKind[SyntaxKind["HeritageClause"] = 273] = "HeritageClause";
-        SyntaxKind[SyntaxKind["CatchClause"] = 274] = "CatchClause";
+        SyntaxKind[SyntaxKind["CaseClause"] = 272] = "CaseClause";
+        SyntaxKind[SyntaxKind["DefaultClause"] = 273] = "DefaultClause";
+        SyntaxKind[SyntaxKind["HeritageClause"] = 274] = "HeritageClause";
+        SyntaxKind[SyntaxKind["CatchClause"] = 275] = "CatchClause";
         // Property assignments
-        SyntaxKind[SyntaxKind["PropertyAssignment"] = 275] = "PropertyAssignment";
-        SyntaxKind[SyntaxKind["ShorthandPropertyAssignment"] = 276] = "ShorthandPropertyAssignment";
-        SyntaxKind[SyntaxKind["SpreadAssignment"] = 277] = "SpreadAssignment";
+        SyntaxKind[SyntaxKind["PropertyAssignment"] = 276] = "PropertyAssignment";
+        SyntaxKind[SyntaxKind["ShorthandPropertyAssignment"] = 277] = "ShorthandPropertyAssignment";
+        SyntaxKind[SyntaxKind["SpreadAssignment"] = 278] = "SpreadAssignment";
         // Enum
-        SyntaxKind[SyntaxKind["EnumMember"] = 278] = "EnumMember";
+        SyntaxKind[SyntaxKind["EnumMember"] = 279] = "EnumMember";
         // Unparsed
-        SyntaxKind[SyntaxKind["UnparsedPrologue"] = 279] = "UnparsedPrologue";
-        SyntaxKind[SyntaxKind["UnparsedPrepend"] = 280] = "UnparsedPrepend";
-        SyntaxKind[SyntaxKind["UnparsedText"] = 281] = "UnparsedText";
-        SyntaxKind[SyntaxKind["UnparsedInternalText"] = 282] = "UnparsedInternalText";
-        SyntaxKind[SyntaxKind["UnparsedSyntheticReference"] = 283] = "UnparsedSyntheticReference";
+        SyntaxKind[SyntaxKind["UnparsedPrologue"] = 280] = "UnparsedPrologue";
+        SyntaxKind[SyntaxKind["UnparsedPrepend"] = 281] = "UnparsedPrepend";
+        SyntaxKind[SyntaxKind["UnparsedText"] = 282] = "UnparsedText";
+        SyntaxKind[SyntaxKind["UnparsedInternalText"] = 283] = "UnparsedInternalText";
+        SyntaxKind[SyntaxKind["UnparsedSyntheticReference"] = 284] = "UnparsedSyntheticReference";
         // Top-level nodes
-        SyntaxKind[SyntaxKind["SourceFile"] = 284] = "SourceFile";
-        SyntaxKind[SyntaxKind["Bundle"] = 285] = "Bundle";
-        SyntaxKind[SyntaxKind["UnparsedSource"] = 286] = "UnparsedSource";
-        SyntaxKind[SyntaxKind["InputFiles"] = 287] = "InputFiles";
+        SyntaxKind[SyntaxKind["SourceFile"] = 285] = "SourceFile";
+        SyntaxKind[SyntaxKind["Bundle"] = 286] = "Bundle";
+        SyntaxKind[SyntaxKind["UnparsedSource"] = 287] = "UnparsedSource";
+        SyntaxKind[SyntaxKind["InputFiles"] = 288] = "InputFiles";
         // JSDoc nodes
-        SyntaxKind[SyntaxKind["JSDocTypeExpression"] = 288] = "JSDocTypeExpression";
+        SyntaxKind[SyntaxKind["JSDocTypeExpression"] = 289] = "JSDocTypeExpression";
         // The * type
-        SyntaxKind[SyntaxKind["JSDocAllType"] = 289] = "JSDocAllType";
+        SyntaxKind[SyntaxKind["JSDocAllType"] = 290] = "JSDocAllType";
         // The ? type
-        SyntaxKind[SyntaxKind["JSDocUnknownType"] = 290] = "JSDocUnknownType";
-        SyntaxKind[SyntaxKind["JSDocNullableType"] = 291] = "JSDocNullableType";
-        SyntaxKind[SyntaxKind["JSDocNonNullableType"] = 292] = "JSDocNonNullableType";
-        SyntaxKind[SyntaxKind["JSDocOptionalType"] = 293] = "JSDocOptionalType";
-        SyntaxKind[SyntaxKind["JSDocFunctionType"] = 294] = "JSDocFunctionType";
-        SyntaxKind[SyntaxKind["JSDocVariadicType"] = 295] = "JSDocVariadicType";
-        SyntaxKind[SyntaxKind["JSDocComment"] = 296] = "JSDocComment";
-        SyntaxKind[SyntaxKind["JSDocTypeLiteral"] = 297] = "JSDocTypeLiteral";
-        SyntaxKind[SyntaxKind["JSDocSignature"] = 298] = "JSDocSignature";
-        SyntaxKind[SyntaxKind["JSDocTag"] = 299] = "JSDocTag";
-        SyntaxKind[SyntaxKind["JSDocAugmentsTag"] = 300] = "JSDocAugmentsTag";
-        SyntaxKind[SyntaxKind["JSDocClassTag"] = 301] = "JSDocClassTag";
-        SyntaxKind[SyntaxKind["JSDocCallbackTag"] = 302] = "JSDocCallbackTag";
-        SyntaxKind[SyntaxKind["JSDocEnumTag"] = 303] = "JSDocEnumTag";
-        SyntaxKind[SyntaxKind["JSDocParameterTag"] = 304] = "JSDocParameterTag";
-        SyntaxKind[SyntaxKind["JSDocReturnTag"] = 305] = "JSDocReturnTag";
-        SyntaxKind[SyntaxKind["JSDocThisTag"] = 306] = "JSDocThisTag";
-        SyntaxKind[SyntaxKind["JSDocTypeTag"] = 307] = "JSDocTypeTag";
-        SyntaxKind[SyntaxKind["JSDocTemplateTag"] = 308] = "JSDocTemplateTag";
-        SyntaxKind[SyntaxKind["JSDocTypedefTag"] = 309] = "JSDocTypedefTag";
-        SyntaxKind[SyntaxKind["JSDocPropertyTag"] = 310] = "JSDocPropertyTag";
+        SyntaxKind[SyntaxKind["JSDocUnknownType"] = 291] = "JSDocUnknownType";
+        SyntaxKind[SyntaxKind["JSDocNullableType"] = 292] = "JSDocNullableType";
+        SyntaxKind[SyntaxKind["JSDocNonNullableType"] = 293] = "JSDocNonNullableType";
+        SyntaxKind[SyntaxKind["JSDocOptionalType"] = 294] = "JSDocOptionalType";
+        SyntaxKind[SyntaxKind["JSDocFunctionType"] = 295] = "JSDocFunctionType";
+        SyntaxKind[SyntaxKind["JSDocVariadicType"] = 296] = "JSDocVariadicType";
+        SyntaxKind[SyntaxKind["JSDocComment"] = 297] = "JSDocComment";
+        SyntaxKind[SyntaxKind["JSDocTypeLiteral"] = 298] = "JSDocTypeLiteral";
+        SyntaxKind[SyntaxKind["JSDocSignature"] = 299] = "JSDocSignature";
+        SyntaxKind[SyntaxKind["JSDocTag"] = 300] = "JSDocTag";
+        SyntaxKind[SyntaxKind["JSDocAugmentsTag"] = 301] = "JSDocAugmentsTag";
+        SyntaxKind[SyntaxKind["JSDocAuthorTag"] = 302] = "JSDocAuthorTag";
+        SyntaxKind[SyntaxKind["JSDocClassTag"] = 303] = "JSDocClassTag";
+        SyntaxKind[SyntaxKind["JSDocCallbackTag"] = 304] = "JSDocCallbackTag";
+        SyntaxKind[SyntaxKind["JSDocEnumTag"] = 305] = "JSDocEnumTag";
+        SyntaxKind[SyntaxKind["JSDocParameterTag"] = 306] = "JSDocParameterTag";
+        SyntaxKind[SyntaxKind["JSDocReturnTag"] = 307] = "JSDocReturnTag";
+        SyntaxKind[SyntaxKind["JSDocThisTag"] = 308] = "JSDocThisTag";
+        SyntaxKind[SyntaxKind["JSDocTypeTag"] = 309] = "JSDocTypeTag";
+        SyntaxKind[SyntaxKind["JSDocTemplateTag"] = 310] = "JSDocTemplateTag";
+        SyntaxKind[SyntaxKind["JSDocTypedefTag"] = 311] = "JSDocTypedefTag";
+        SyntaxKind[SyntaxKind["JSDocPropertyTag"] = 312] = "JSDocPropertyTag";
         // Synthesized list
-        SyntaxKind[SyntaxKind["SyntaxList"] = 311] = "SyntaxList";
+        SyntaxKind[SyntaxKind["SyntaxList"] = 313] = "SyntaxList";
         // Transformation nodes
-        SyntaxKind[SyntaxKind["NotEmittedStatement"] = 312] = "NotEmittedStatement";
-        SyntaxKind[SyntaxKind["PartiallyEmittedExpression"] = 313] = "PartiallyEmittedExpression";
-        SyntaxKind[SyntaxKind["CommaListExpression"] = 314] = "CommaListExpression";
-        SyntaxKind[SyntaxKind["MergeDeclarationMarker"] = 315] = "MergeDeclarationMarker";
-        SyntaxKind[SyntaxKind["EndOfDeclarationMarker"] = 316] = "EndOfDeclarationMarker";
+        SyntaxKind[SyntaxKind["NotEmittedStatement"] = 314] = "NotEmittedStatement";
+        SyntaxKind[SyntaxKind["PartiallyEmittedExpression"] = 315] = "PartiallyEmittedExpression";
+        SyntaxKind[SyntaxKind["CommaListExpression"] = 316] = "CommaListExpression";
+        SyntaxKind[SyntaxKind["MergeDeclarationMarker"] = 317] = "MergeDeclarationMarker";
+        SyntaxKind[SyntaxKind["EndOfDeclarationMarker"] = 318] = "EndOfDeclarationMarker";
         // Enum value count
-        SyntaxKind[SyntaxKind["Count"] = 317] = "Count";
+        SyntaxKind[SyntaxKind["Count"] = 319] = "Count";
         // Markers
-        SyntaxKind[SyntaxKind["FirstAssignment"] = 59] = "FirstAssignment";
-        SyntaxKind[SyntaxKind["LastAssignment"] = 71] = "LastAssignment";
-        SyntaxKind[SyntaxKind["FirstCompoundAssignment"] = 60] = "FirstCompoundAssignment";
-        SyntaxKind[SyntaxKind["LastCompoundAssignment"] = 71] = "LastCompoundAssignment";
-        SyntaxKind[SyntaxKind["FirstReservedWord"] = 73] = "FirstReservedWord";
-        SyntaxKind[SyntaxKind["LastReservedWord"] = 108] = "LastReservedWord";
-        SyntaxKind[SyntaxKind["FirstKeyword"] = 73] = "FirstKeyword";
-        SyntaxKind[SyntaxKind["LastKeyword"] = 147] = "LastKeyword";
-        SyntaxKind[SyntaxKind["FirstFutureReservedWord"] = 109] = "FirstFutureReservedWord";
-        SyntaxKind[SyntaxKind["LastFutureReservedWord"] = 117] = "LastFutureReservedWord";
-        SyntaxKind[SyntaxKind["FirstTypeNode"] = 163] = "FirstTypeNode";
-        SyntaxKind[SyntaxKind["LastTypeNode"] = 183] = "LastTypeNode";
+        SyntaxKind[SyntaxKind["FirstAssignment"] = 60] = "FirstAssignment";
+        SyntaxKind[SyntaxKind["LastAssignment"] = 72] = "LastAssignment";
+        SyntaxKind[SyntaxKind["FirstCompoundAssignment"] = 61] = "FirstCompoundAssignment";
+        SyntaxKind[SyntaxKind["LastCompoundAssignment"] = 72] = "LastCompoundAssignment";
+        SyntaxKind[SyntaxKind["FirstReservedWord"] = 74] = "FirstReservedWord";
+        SyntaxKind[SyntaxKind["LastReservedWord"] = 109] = "LastReservedWord";
+        SyntaxKind[SyntaxKind["FirstKeyword"] = 74] = "FirstKeyword";
+        SyntaxKind[SyntaxKind["LastKeyword"] = 148] = "LastKeyword";
+        SyntaxKind[SyntaxKind["FirstFutureReservedWord"] = 110] = "FirstFutureReservedWord";
+        SyntaxKind[SyntaxKind["LastFutureReservedWord"] = 118] = "LastFutureReservedWord";
+        SyntaxKind[SyntaxKind["FirstTypeNode"] = 164] = "FirstTypeNode";
+        SyntaxKind[SyntaxKind["LastTypeNode"] = 184] = "LastTypeNode";
         SyntaxKind[SyntaxKind["FirstPunctuation"] = 18] = "FirstPunctuation";
-        SyntaxKind[SyntaxKind["LastPunctuation"] = 71] = "LastPunctuation";
+        SyntaxKind[SyntaxKind["LastPunctuation"] = 72] = "LastPunctuation";
         SyntaxKind[SyntaxKind["FirstToken"] = 0] = "FirstToken";
-        SyntaxKind[SyntaxKind["LastToken"] = 147] = "LastToken";
+        SyntaxKind[SyntaxKind["LastToken"] = 148] = "LastToken";
         SyntaxKind[SyntaxKind["FirstTriviaToken"] = 2] = "FirstTriviaToken";
         SyntaxKind[SyntaxKind["LastTriviaToken"] = 7] = "LastTriviaToken";
         SyntaxKind[SyntaxKind["FirstLiteralToken"] = 8] = "FirstLiteralToken";
@@ -2953,14 +3111,14 @@ var ts;
         SyntaxKind[SyntaxKind["FirstTemplateToken"] = 14] = "FirstTemplateToken";
         SyntaxKind[SyntaxKind["LastTemplateToken"] = 17] = "LastTemplateToken";
         SyntaxKind[SyntaxKind["FirstBinaryOperator"] = 28] = "FirstBinaryOperator";
-        SyntaxKind[SyntaxKind["LastBinaryOperator"] = 71] = "LastBinaryOperator";
-        SyntaxKind[SyntaxKind["FirstNode"] = 148] = "FirstNode";
-        SyntaxKind[SyntaxKind["FirstJSDocNode"] = 288] = "FirstJSDocNode";
-        SyntaxKind[SyntaxKind["LastJSDocNode"] = 310] = "LastJSDocNode";
-        SyntaxKind[SyntaxKind["FirstJSDocTagNode"] = 299] = "FirstJSDocTagNode";
-        SyntaxKind[SyntaxKind["LastJSDocTagNode"] = 310] = "LastJSDocTagNode";
-        /* @internal */ SyntaxKind[SyntaxKind["FirstContextualKeyword"] = 118] = "FirstContextualKeyword";
-        /* @internal */ SyntaxKind[SyntaxKind["LastContextualKeyword"] = 147] = "LastContextualKeyword";
+        SyntaxKind[SyntaxKind["LastBinaryOperator"] = 72] = "LastBinaryOperator";
+        SyntaxKind[SyntaxKind["FirstNode"] = 149] = "FirstNode";
+        SyntaxKind[SyntaxKind["FirstJSDocNode"] = 289] = "FirstJSDocNode";
+        SyntaxKind[SyntaxKind["LastJSDocNode"] = 312] = "LastJSDocNode";
+        SyntaxKind[SyntaxKind["FirstJSDocTagNode"] = 300] = "FirstJSDocTagNode";
+        SyntaxKind[SyntaxKind["LastJSDocTagNode"] = 312] = "LastJSDocTagNode";
+        /* @internal */ SyntaxKind[SyntaxKind["FirstContextualKeyword"] = 119] = "FirstContextualKeyword";
+        /* @internal */ SyntaxKind[SyntaxKind["LastContextualKeyword"] = 148] = "LastContextualKeyword";
     })(SyntaxKind = ts.SyntaxKind || (ts.SyntaxKind = {}));
     var NodeFlags;
     (function (NodeFlags) {
@@ -3103,6 +3261,8 @@ var ts;
         FlowFlags[FlowFlags["Shared"] = 1024] = "Shared";
         FlowFlags[FlowFlags["PreFinally"] = 2048] = "PreFinally";
         FlowFlags[FlowFlags["AfterFinally"] = 4096] = "AfterFinally";
+        /** @internal */
+        FlowFlags[FlowFlags["Cached"] = 8192] = "Cached";
         FlowFlags[FlowFlags["Label"] = 12] = "Label";
         FlowFlags[FlowFlags["Condition"] = 96] = "Condition";
     })(FlowFlags = ts.FlowFlags || (ts.FlowFlags = {}));
@@ -3130,6 +3290,8 @@ var ts;
         ExitStatus[ExitStatus["DiagnosticsPresent_OutputsSkipped"] = 1] = "DiagnosticsPresent_OutputsSkipped";
         // Diagnostics were produced and outputs were generated in spite of them.
         ExitStatus[ExitStatus["DiagnosticsPresent_OutputsGenerated"] = 2] = "DiagnosticsPresent_OutputsGenerated";
+        // When build skipped because passed in project is invalid
+        ExitStatus[ExitStatus["InvalidProject_OutputsSkipped"] = 3] = "InvalidProject_OutputsSkipped";
     })(ExitStatus = ts.ExitStatus || (ts.ExitStatus = {}));
     /* @internal */
     var UnionReduction;
@@ -3355,19 +3517,22 @@ var ts;
         CheckFlags[CheckFlags["SyntheticProperty"] = 2] = "SyntheticProperty";
         CheckFlags[CheckFlags["SyntheticMethod"] = 4] = "SyntheticMethod";
         CheckFlags[CheckFlags["Readonly"] = 8] = "Readonly";
-        CheckFlags[CheckFlags["Partial"] = 16] = "Partial";
-        CheckFlags[CheckFlags["HasNonUniformType"] = 32] = "HasNonUniformType";
-        CheckFlags[CheckFlags["HasLiteralType"] = 64] = "HasLiteralType";
-        CheckFlags[CheckFlags["ContainsPublic"] = 128] = "ContainsPublic";
-        CheckFlags[CheckFlags["ContainsProtected"] = 256] = "ContainsProtected";
-        CheckFlags[CheckFlags["ContainsPrivate"] = 512] = "ContainsPrivate";
-        CheckFlags[CheckFlags["ContainsStatic"] = 1024] = "ContainsStatic";
-        CheckFlags[CheckFlags["Late"] = 2048] = "Late";
-        CheckFlags[CheckFlags["ReverseMapped"] = 4096] = "ReverseMapped";
-        CheckFlags[CheckFlags["OptionalParameter"] = 8192] = "OptionalParameter";
-        CheckFlags[CheckFlags["RestParameter"] = 16384] = "RestParameter";
+        CheckFlags[CheckFlags["ReadPartial"] = 16] = "ReadPartial";
+        CheckFlags[CheckFlags["WritePartial"] = 32] = "WritePartial";
+        CheckFlags[CheckFlags["HasNonUniformType"] = 64] = "HasNonUniformType";
+        CheckFlags[CheckFlags["HasLiteralType"] = 128] = "HasLiteralType";
+        CheckFlags[CheckFlags["ContainsPublic"] = 256] = "ContainsPublic";
+        CheckFlags[CheckFlags["ContainsProtected"] = 512] = "ContainsProtected";
+        CheckFlags[CheckFlags["ContainsPrivate"] = 1024] = "ContainsPrivate";
+        CheckFlags[CheckFlags["ContainsStatic"] = 2048] = "ContainsStatic";
+        CheckFlags[CheckFlags["Late"] = 4096] = "Late";
+        CheckFlags[CheckFlags["ReverseMapped"] = 8192] = "ReverseMapped";
+        CheckFlags[CheckFlags["OptionalParameter"] = 16384] = "OptionalParameter";
+        CheckFlags[CheckFlags["RestParameter"] = 32768] = "RestParameter";
+        CheckFlags[CheckFlags["DeferredType"] = 65536] = "DeferredType";
         CheckFlags[CheckFlags["Synthetic"] = 6] = "Synthetic";
-        CheckFlags[CheckFlags["Discriminant"] = 96] = "Discriminant";
+        CheckFlags[CheckFlags["Discriminant"] = 192] = "Discriminant";
+        CheckFlags[CheckFlags["Partial"] = 48] = "Partial";
     })(CheckFlags = ts.CheckFlags || (ts.CheckFlags = {}));
     var InternalSymbolName;
     (function (InternalSymbolName) {
@@ -3477,7 +3642,9 @@ var ts;
         TypeFlags[TypeFlags["Instantiable"] = 63176704] = "Instantiable";
         TypeFlags[TypeFlags["StructuredOrInstantiable"] = 66846720] = "StructuredOrInstantiable";
         /* @internal */
-        TypeFlags[TypeFlags["ObjectFlagsType"] = 3768320] = "ObjectFlagsType";
+        TypeFlags[TypeFlags["ObjectFlagsType"] = 3899392] = "ObjectFlagsType";
+        /* @internal */
+        TypeFlags[TypeFlags["Simplifiable"] = 25165824] = "Simplifiable";
         // 'Narrowable' types are types where narrowing actually narrows.
         // This *should* be every type other than null, undefined, void, and never
         TypeFlags[TypeFlags["Narrowable"] = 133970943] = "Narrowable";
@@ -3486,7 +3653,7 @@ var ts;
         TypeFlags[TypeFlags["NotPrimitiveUnion"] = 66994211] = "NotPrimitiveUnion";
         // The following flags are aggregated during union and intersection type construction
         /* @internal */
-        TypeFlags[TypeFlags["IncludesMask"] = 1835007] = "IncludesMask";
+        TypeFlags[TypeFlags["IncludesMask"] = 68943871] = "IncludesMask";
         // The following flags are used for different purposes during union and intersection type construction
         /* @internal */
         TypeFlags[TypeFlags["IncludesStructuredOrInstantiable"] = 262144] = "IncludesStructuredOrInstantiable";
@@ -3518,29 +3685,34 @@ var ts;
         ObjectFlags[ObjectFlags["MarkerType"] = 8192] = "MarkerType";
         ObjectFlags[ObjectFlags["JSLiteral"] = 16384] = "JSLiteral";
         ObjectFlags[ObjectFlags["FreshLiteral"] = 32768] = "FreshLiteral";
+        ObjectFlags[ObjectFlags["ArrayLiteral"] = 65536] = "ArrayLiteral";
         /* @internal */
-        ObjectFlags[ObjectFlags["PrimitiveUnion"] = 65536] = "PrimitiveUnion";
+        ObjectFlags[ObjectFlags["PrimitiveUnion"] = 131072] = "PrimitiveUnion";
         /* @internal */
-        ObjectFlags[ObjectFlags["ContainsWideningType"] = 131072] = "ContainsWideningType";
+        ObjectFlags[ObjectFlags["ContainsWideningType"] = 262144] = "ContainsWideningType";
         /* @internal */
-        ObjectFlags[ObjectFlags["ContainsObjectLiteral"] = 262144] = "ContainsObjectLiteral";
+        ObjectFlags[ObjectFlags["ContainsObjectOrArrayLiteral"] = 524288] = "ContainsObjectOrArrayLiteral";
         /* @internal */
-        ObjectFlags[ObjectFlags["ContainsAnyFunctionType"] = 524288] = "ContainsAnyFunctionType";
+        ObjectFlags[ObjectFlags["NonInferrableType"] = 1048576] = "NonInferrableType";
         ObjectFlags[ObjectFlags["ClassOrInterface"] = 3] = "ClassOrInterface";
         /* @internal */
-        ObjectFlags[ObjectFlags["RequiresWidening"] = 393216] = "RequiresWidening";
+        ObjectFlags[ObjectFlags["RequiresWidening"] = 786432] = "RequiresWidening";
         /* @internal */
-        ObjectFlags[ObjectFlags["PropagatingFlags"] = 917504] = "PropagatingFlags";
+        ObjectFlags[ObjectFlags["PropagatingFlags"] = 1835008] = "PropagatingFlags";
     })(ObjectFlags = ts.ObjectFlags || (ts.ObjectFlags = {}));
     /* @internal */
-    var Variance;
-    (function (Variance) {
-        Variance[Variance["Invariant"] = 0] = "Invariant";
-        Variance[Variance["Covariant"] = 1] = "Covariant";
-        Variance[Variance["Contravariant"] = 2] = "Contravariant";
-        Variance[Variance["Bivariant"] = 3] = "Bivariant";
-        Variance[Variance["Independent"] = 4] = "Independent";
-    })(Variance = ts.Variance || (ts.Variance = {}));
+    var VarianceFlags;
+    (function (VarianceFlags) {
+        VarianceFlags[VarianceFlags["Invariant"] = 0] = "Invariant";
+        VarianceFlags[VarianceFlags["Covariant"] = 1] = "Covariant";
+        VarianceFlags[VarianceFlags["Contravariant"] = 2] = "Contravariant";
+        VarianceFlags[VarianceFlags["Bivariant"] = 3] = "Bivariant";
+        VarianceFlags[VarianceFlags["Independent"] = 4] = "Independent";
+        VarianceFlags[VarianceFlags["VarianceMask"] = 7] = "VarianceMask";
+        VarianceFlags[VarianceFlags["Unmeasurable"] = 8] = "Unmeasurable";
+        VarianceFlags[VarianceFlags["Unreliable"] = 16] = "Unreliable";
+        VarianceFlags[VarianceFlags["AllowsStructuralFallback"] = 24] = "AllowsStructuralFallback";
+    })(VarianceFlags = ts.VarianceFlags || (ts.VarianceFlags = {}));
     /* @internal */
     var JsxReferenceKind;
     (function (JsxReferenceKind) {
@@ -3562,12 +3734,13 @@ var ts;
     (function (InferencePriority) {
         InferencePriority[InferencePriority["NakedTypeVariable"] = 1] = "NakedTypeVariable";
         InferencePriority[InferencePriority["HomomorphicMappedType"] = 2] = "HomomorphicMappedType";
-        InferencePriority[InferencePriority["MappedTypeConstraint"] = 4] = "MappedTypeConstraint";
-        InferencePriority[InferencePriority["ReturnType"] = 8] = "ReturnType";
-        InferencePriority[InferencePriority["LiteralKeyof"] = 16] = "LiteralKeyof";
-        InferencePriority[InferencePriority["NoConstraints"] = 32] = "NoConstraints";
-        InferencePriority[InferencePriority["AlwaysStrict"] = 64] = "AlwaysStrict";
-        InferencePriority[InferencePriority["PriorityImpliesCombination"] = 28] = "PriorityImpliesCombination";
+        InferencePriority[InferencePriority["PartialHomomorphicMappedType"] = 4] = "PartialHomomorphicMappedType";
+        InferencePriority[InferencePriority["MappedTypeConstraint"] = 8] = "MappedTypeConstraint";
+        InferencePriority[InferencePriority["ReturnType"] = 16] = "ReturnType";
+        InferencePriority[InferencePriority["LiteralKeyof"] = 32] = "LiteralKeyof";
+        InferencePriority[InferencePriority["NoConstraints"] = 64] = "NoConstraints";
+        InferencePriority[InferencePriority["AlwaysStrict"] = 128] = "AlwaysStrict";
+        InferencePriority[InferencePriority["PriorityImpliesCombination"] = 56] = "PriorityImpliesCombination";
     })(InferencePriority = ts.InferencePriority || (ts.InferencePriority = {}));
     /* @internal */
     var InferenceFlags;
@@ -3575,8 +3748,7 @@ var ts;
         InferenceFlags[InferenceFlags["None"] = 0] = "None";
         InferenceFlags[InferenceFlags["NoDefault"] = 1] = "NoDefault";
         InferenceFlags[InferenceFlags["AnyDefault"] = 2] = "AnyDefault";
-        InferenceFlags[InferenceFlags["NoFixing"] = 4] = "NoFixing";
-        InferenceFlags[InferenceFlags["SkippedGenericFunction"] = 8] = "SkippedGenericFunction";
+        InferenceFlags[InferenceFlags["SkippedGenericFunction"] = 4] = "SkippedGenericFunction";
     })(InferenceFlags = ts.InferenceFlags || (ts.InferenceFlags = {}));
     /**
      * Ternary values are defined such that
@@ -3647,7 +3819,7 @@ var ts;
         ModuleKind[ModuleKind["UMD"] = 3] = "UMD";
         ModuleKind[ModuleKind["System"] = 4] = "System";
         ModuleKind[ModuleKind["ES2015"] = 5] = "ES2015";
-        ModuleKind[ModuleKind["ESNext"] = 6] = "ESNext";
+        ModuleKind[ModuleKind["ESNext"] = 99] = "ESNext";
     })(ModuleKind = ts.ModuleKind || (ts.ModuleKind = {}));
     var JsxEmit;
     (function (JsxEmit) {
@@ -3685,9 +3857,10 @@ var ts;
         ScriptTarget[ScriptTarget["ES2017"] = 4] = "ES2017";
         ScriptTarget[ScriptTarget["ES2018"] = 5] = "ES2018";
         ScriptTarget[ScriptTarget["ES2019"] = 6] = "ES2019";
-        ScriptTarget[ScriptTarget["ESNext"] = 7] = "ESNext";
+        ScriptTarget[ScriptTarget["ES2020"] = 7] = "ES2020";
+        ScriptTarget[ScriptTarget["ESNext"] = 99] = "ESNext";
         ScriptTarget[ScriptTarget["JSON"] = 100] = "JSON";
-        ScriptTarget[ScriptTarget["Latest"] = 7] = "Latest";
+        ScriptTarget[ScriptTarget["Latest"] = 99] = "Latest";
     })(ScriptTarget = ts.ScriptTarget || (ts.ScriptTarget = {}));
     var LanguageVariant;
     (function (LanguageVariant) {
@@ -3866,6 +4039,7 @@ var ts;
         TransformFlags[TransformFlags["ContainsYield"] = 131072] = "ContainsYield";
         TransformFlags[TransformFlags["ContainsHoistedDeclarationOrCompletion"] = 262144] = "ContainsHoistedDeclarationOrCompletion";
         TransformFlags[TransformFlags["ContainsDynamicImport"] = 524288] = "ContainsDynamicImport";
+        TransformFlags[TransformFlags["ContainsClassFields"] = 1048576] = "ContainsClassFields";
         // Please leave this as 1 << 29.
         // It is the maximum bit we can set before we outgrow the size of a v8 small integer (SMI) on an x86 system.
         // It is a good reminder of how much room we have left
@@ -3960,22 +4134,23 @@ var ts;
         ExternalEmitHelpers[ExternalEmitHelpers["Values"] = 256] = "Values";
         ExternalEmitHelpers[ExternalEmitHelpers["Read"] = 512] = "Read";
         ExternalEmitHelpers[ExternalEmitHelpers["Spread"] = 1024] = "Spread";
-        ExternalEmitHelpers[ExternalEmitHelpers["Await"] = 2048] = "Await";
-        ExternalEmitHelpers[ExternalEmitHelpers["AsyncGenerator"] = 4096] = "AsyncGenerator";
-        ExternalEmitHelpers[ExternalEmitHelpers["AsyncDelegator"] = 8192] = "AsyncDelegator";
-        ExternalEmitHelpers[ExternalEmitHelpers["AsyncValues"] = 16384] = "AsyncValues";
-        ExternalEmitHelpers[ExternalEmitHelpers["ExportStar"] = 32768] = "ExportStar";
-        ExternalEmitHelpers[ExternalEmitHelpers["MakeTemplateObject"] = 65536] = "MakeTemplateObject";
+        ExternalEmitHelpers[ExternalEmitHelpers["SpreadArrays"] = 2048] = "SpreadArrays";
+        ExternalEmitHelpers[ExternalEmitHelpers["Await"] = 4096] = "Await";
+        ExternalEmitHelpers[ExternalEmitHelpers["AsyncGenerator"] = 8192] = "AsyncGenerator";
+        ExternalEmitHelpers[ExternalEmitHelpers["AsyncDelegator"] = 16384] = "AsyncDelegator";
+        ExternalEmitHelpers[ExternalEmitHelpers["AsyncValues"] = 32768] = "AsyncValues";
+        ExternalEmitHelpers[ExternalEmitHelpers["ExportStar"] = 65536] = "ExportStar";
+        ExternalEmitHelpers[ExternalEmitHelpers["MakeTemplateObject"] = 131072] = "MakeTemplateObject";
         ExternalEmitHelpers[ExternalEmitHelpers["FirstEmitHelper"] = 1] = "FirstEmitHelper";
-        ExternalEmitHelpers[ExternalEmitHelpers["LastEmitHelper"] = 65536] = "LastEmitHelper";
+        ExternalEmitHelpers[ExternalEmitHelpers["LastEmitHelper"] = 131072] = "LastEmitHelper";
         // Helpers included by ES2015 for..of
         ExternalEmitHelpers[ExternalEmitHelpers["ForOfIncludes"] = 256] = "ForOfIncludes";
         // Helpers included by ES2017 for..await..of
-        ExternalEmitHelpers[ExternalEmitHelpers["ForAwaitOfIncludes"] = 16384] = "ForAwaitOfIncludes";
+        ExternalEmitHelpers[ExternalEmitHelpers["ForAwaitOfIncludes"] = 32768] = "ForAwaitOfIncludes";
         // Helpers included by ES2017 async generators
-        ExternalEmitHelpers[ExternalEmitHelpers["AsyncGeneratorIncludes"] = 6144] = "AsyncGeneratorIncludes";
+        ExternalEmitHelpers[ExternalEmitHelpers["AsyncGeneratorIncludes"] = 12288] = "AsyncGeneratorIncludes";
         // Helpers included by yield* in ES2017 async generators
-        ExternalEmitHelpers[ExternalEmitHelpers["AsyncDelegatorIncludes"] = 26624] = "AsyncDelegatorIncludes";
+        ExternalEmitHelpers[ExternalEmitHelpers["AsyncDelegatorIncludes"] = 53248] = "AsyncDelegatorIncludes";
         // Helpers included by ES2015 spread
         ExternalEmitHelpers[ExternalEmitHelpers["SpreadIncludes"] = 1536] = "SpreadIncludes";
     })(ExternalEmitHelpers = ts.ExternalEmitHelpers || (ts.ExternalEmitHelpers = {}));
@@ -4100,17 +4275,10 @@ var ts;
         PragmaKindFlags[PragmaKindFlags["All"] = 7] = "All";
         PragmaKindFlags[PragmaKindFlags["Default"] = 7] = "Default";
     })(PragmaKindFlags = ts.PragmaKindFlags || (ts.PragmaKindFlags = {}));
-    /**
-     * This function only exists to cause exact types to be inferred for all the literals within `commentPragmas`
-     */
-    /* @internal */
-    function _contextuallyTypePragmas(args) {
-        return args;
-    }
     // While not strictly a type, this is here because `PragmaMap` needs to be here to be used with `SourceFile`, and we don't
     //  fancy effectively defining it twice, once in value-space and once in type-space
     /* @internal */
-    ts.commentPragmas = _contextuallyTypePragmas({
+    ts.commentPragmas = {
         "reference": {
             args: [
                 { name: "types", optional: true, captureSpan: true },
@@ -4138,7 +4306,7 @@ var ts;
             args: [{ name: "factory" }],
             kind: 4 /* MultiLine */
         },
-    });
+    };
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
@@ -4148,8 +4316,11 @@ var ts;
      */
     /* @internal */
     function generateDjb2Hash(data) {
-        var chars = data.split("").map(function (str) { return str.charCodeAt(0); });
-        return "" + chars.reduce(function (prev, curr) { return ((prev << 5) + prev) + curr; }, 5381);
+        var acc = 5381;
+        for (var i = 0; i < data.length; i++) {
+            acc = ((acc << 5) + acc) + data.charCodeAt(i);
+        }
+        return acc.toString();
     }
     ts.generateDjb2Hash = generateDjb2Hash;
     /**
@@ -4410,7 +4581,7 @@ var ts;
     }
     ts.getFileWatcherEventKind = getFileWatcherEventKind;
     /*@internal*/
-    ts.ignoredPaths = ["/node_modules/.", "/.git"];
+    ts.ignoredPaths = ["/node_modules/.", "/.git", "/.#"];
     /**
      * Watch the directory recursively using host provided method to watch child directories
      * that means if this is recursive watcher, watch the children directories as well
@@ -4996,7 +5167,7 @@ var ts;
                 }
             }
             function readDirectory(path, extensions, excludes, includes, depth) {
-                return ts.matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, process.cwd(), depth, getAccessibleFileSystemEntries);
+                return ts.matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, process.cwd(), depth, getAccessibleFileSystemEntries, realpath);
             }
             function fileSystemEntryExists(path, entryKind) {
                 try {
@@ -5182,7 +5353,7 @@ var ts;
         _0_modifier_cannot_appear_on_a_data_property: diag(1043, ts.DiagnosticCategory.Error, "_0_modifier_cannot_appear_on_a_data_property_1043", "'{0}' modifier cannot appear on a data property."),
         _0_modifier_cannot_appear_on_a_module_or_namespace_element: diag(1044, ts.DiagnosticCategory.Error, "_0_modifier_cannot_appear_on_a_module_or_namespace_element_1044", "'{0}' modifier cannot appear on a module or namespace element."),
         A_0_modifier_cannot_be_used_with_an_interface_declaration: diag(1045, ts.DiagnosticCategory.Error, "A_0_modifier_cannot_be_used_with_an_interface_declaration_1045", "A '{0}' modifier cannot be used with an interface declaration."),
-        A_declare_modifier_is_required_for_a_top_level_declaration_in_a_d_ts_file: diag(1046, ts.DiagnosticCategory.Error, "A_declare_modifier_is_required_for_a_top_level_declaration_in_a_d_ts_file_1046", "A 'declare' modifier is required for a top level declaration in a .d.ts file."),
+        Top_level_declarations_in_d_ts_files_must_start_with_either_a_declare_or_export_modifier: diag(1046, ts.DiagnosticCategory.Error, "Top_level_declarations_in_d_ts_files_must_start_with_either_a_declare_or_export_modifier_1046", "Top-level declarations in .d.ts files must start with either a 'declare' or 'export' modifier."),
         A_rest_parameter_cannot_be_optional: diag(1047, ts.DiagnosticCategory.Error, "A_rest_parameter_cannot_be_optional_1047", "A rest parameter cannot be optional."),
         A_rest_parameter_cannot_have_an_initializer: diag(1048, ts.DiagnosticCategory.Error, "A_rest_parameter_cannot_have_an_initializer_1048", "A rest parameter cannot have an initializer."),
         A_set_accessor_must_have_exactly_one_parameter: diag(1049, ts.DiagnosticCategory.Error, "A_set_accessor_must_have_exactly_one_parameter_1049", "A 'set' accessor must have exactly one parameter."),
@@ -5311,7 +5482,7 @@ var ts;
         Cannot_re_export_a_type_when_the_isolatedModules_flag_is_provided: diag(1205, ts.DiagnosticCategory.Error, "Cannot_re_export_a_type_when_the_isolatedModules_flag_is_provided_1205", "Cannot re-export a type when the '--isolatedModules' flag is provided."),
         Decorators_are_not_valid_here: diag(1206, ts.DiagnosticCategory.Error, "Decorators_are_not_valid_here_1206", "Decorators are not valid here."),
         Decorators_cannot_be_applied_to_multiple_get_Slashset_accessors_of_the_same_name: diag(1207, ts.DiagnosticCategory.Error, "Decorators_cannot_be_applied_to_multiple_get_Slashset_accessors_of_the_same_name_1207", "Decorators cannot be applied to multiple get/set accessors of the same name."),
-        Cannot_compile_namespaces_when_the_isolatedModules_flag_is_provided: diag(1208, ts.DiagnosticCategory.Error, "Cannot_compile_namespaces_when_the_isolatedModules_flag_is_provided_1208", "Cannot compile namespaces when the '--isolatedModules' flag is provided."),
+        All_files_must_be_modules_when_the_isolatedModules_flag_is_provided: diag(1208, ts.DiagnosticCategory.Error, "All_files_must_be_modules_when_the_isolatedModules_flag_is_provided_1208", "All files must be modules when the '--isolatedModules' flag is provided."),
         Invalid_use_of_0_Class_definitions_are_automatically_in_strict_mode: diag(1210, ts.DiagnosticCategory.Error, "Invalid_use_of_0_Class_definitions_are_automatically_in_strict_mode_1210", "Invalid use of '{0}'. Class definitions are automatically in strict mode."),
         A_class_declaration_without_the_default_modifier_must_have_a_name: diag(1211, ts.DiagnosticCategory.Error, "A_class_declaration_without_the_default_modifier_must_have_a_name_1211", "A class declaration without the 'default' modifier must have a name."),
         Identifier_expected_0_is_a_reserved_word_in_strict_mode: diag(1212, ts.DiagnosticCategory.Error, "Identifier_expected_0_is_a_reserved_word_in_strict_mode_1212", "Identifier expected. '{0}' is a reserved word in strict mode."),
@@ -5320,7 +5491,7 @@ var ts;
         Invalid_use_of_0_Modules_are_automatically_in_strict_mode: diag(1215, ts.DiagnosticCategory.Error, "Invalid_use_of_0_Modules_are_automatically_in_strict_mode_1215", "Invalid use of '{0}'. Modules are automatically in strict mode."),
         Identifier_expected_esModule_is_reserved_as_an_exported_marker_when_transforming_ECMAScript_modules: diag(1216, ts.DiagnosticCategory.Error, "Identifier_expected_esModule_is_reserved_as_an_exported_marker_when_transforming_ECMAScript_modules_1216", "Identifier expected. '__esModule' is reserved as an exported marker when transforming ECMAScript modules."),
         Export_assignment_is_not_supported_when_module_flag_is_system: diag(1218, ts.DiagnosticCategory.Error, "Export_assignment_is_not_supported_when_module_flag_is_system_1218", "Export assignment is not supported when '--module' flag is 'system'."),
-        Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_to_remove_this_warning: diag(1219, ts.DiagnosticCategory.Error, "Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_t_1219", "Experimental support for decorators is a feature that is subject to change in a future release. Set the 'experimentalDecorators' option to remove this warning."),
+        Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_in_your_tsconfig_or_jsconfig_to_remove_this_warning: diag(1219, ts.DiagnosticCategory.Error, "Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_t_1219", "Experimental support for decorators is a feature that is subject to change in a future release. Set the 'experimentalDecorators' option in your 'tsconfig' or 'jsconfig' to remove this warning."),
         Generators_are_only_available_when_targeting_ECMAScript_2015_or_higher: diag(1220, ts.DiagnosticCategory.Error, "Generators_are_only_available_when_targeting_ECMAScript_2015_or_higher_1220", "Generators are only available when targeting ECMAScript 2015 or higher."),
         Generators_are_not_allowed_in_an_ambient_context: diag(1221, ts.DiagnosticCategory.Error, "Generators_are_not_allowed_in_an_ambient_context_1221", "Generators are not allowed in an ambient context."),
         An_overload_signature_cannot_be_declared_as_a_generator: diag(1222, ts.DiagnosticCategory.Error, "An_overload_signature_cannot_be_declared_as_a_generator_1222", "An overload signature cannot be declared as a generator."),
@@ -5359,6 +5530,8 @@ var ts;
         A_definite_assignment_assertion_is_not_permitted_in_this_context: diag(1255, ts.DiagnosticCategory.Error, "A_definite_assignment_assertion_is_not_permitted_in_this_context_1255", "A definite assignment assertion '!' is not permitted in this context."),
         A_rest_element_must_be_last_in_a_tuple_type: diag(1256, ts.DiagnosticCategory.Error, "A_rest_element_must_be_last_in_a_tuple_type_1256", "A rest element must be last in a tuple type."),
         A_required_element_cannot_follow_an_optional_element: diag(1257, ts.DiagnosticCategory.Error, "A_required_element_cannot_follow_an_optional_element_1257", "A required element cannot follow an optional element."),
+        Definite_assignment_assertions_can_only_be_used_along_with_a_type_annotation: diag(1258, ts.DiagnosticCategory.Error, "Definite_assignment_assertions_can_only_be_used_along_with_a_type_annotation_1258", "Definite assignment assertions can only be used along with a type annotation."),
+        Module_0_can_only_be_default_imported_using_the_1_flag: diag(1259, ts.DiagnosticCategory.Error, "Module_0_can_only_be_default_imported_using_the_1_flag_1259", "Module '{0}' can only be default-imported using the '{1}' flag"),
         with_statements_are_not_allowed_in_an_async_function_block: diag(1300, ts.DiagnosticCategory.Error, "with_statements_are_not_allowed_in_an_async_function_block_1300", "'with' statements are not allowed in an async function block."),
         await_expression_is_only_allowed_within_an_async_function: diag(1308, ts.DiagnosticCategory.Error, "await_expression_is_only_allowed_within_an_async_function_1308", "'await' expression is only allowed within an async function."),
         can_only_be_used_in_an_object_literal_property_inside_a_destructuring_assignment: diag(1312, ts.DiagnosticCategory.Error, "can_only_be_used_in_an_object_literal_property_inside_a_destructuring_assignment_1312", "'=' can only be used in an object literal property inside a destructuring assignment."),
@@ -5403,7 +5576,8 @@ var ts;
         A_bigint_literal_cannot_use_exponential_notation: diag(1352, ts.DiagnosticCategory.Error, "A_bigint_literal_cannot_use_exponential_notation_1352", "A bigint literal cannot use exponential notation."),
         A_bigint_literal_must_be_an_integer: diag(1353, ts.DiagnosticCategory.Error, "A_bigint_literal_must_be_an_integer_1353", "A bigint literal must be an integer."),
         readonly_type_modifier_is_only_permitted_on_array_and_tuple_literal_types: diag(1354, ts.DiagnosticCategory.Error, "readonly_type_modifier_is_only_permitted_on_array_and_tuple_literal_types_1354", "'readonly' type modifier is only permitted on array and tuple literal types."),
-        A_const_assertion_can_only_be_applied_to_a_string_number_boolean_array_or_object_literal: diag(1355, ts.DiagnosticCategory.Error, "A_const_assertion_can_only_be_applied_to_a_string_number_boolean_array_or_object_literal_1355", "A 'const' assertion can only be applied to a string, number, boolean, array, or object literal."),
+        A_const_assertions_can_only_be_applied_to_references_to_enum_members_or_string_number_boolean_array_or_object_literals: diag(1355, ts.DiagnosticCategory.Error, "A_const_assertions_can_only_be_applied_to_references_to_enum_members_or_string_number_boolean_array__1355", "A 'const' assertions can only be applied to references to enum members, or string, number, boolean, array, or object literals."),
+        Did_you_mean_to_mark_this_function_as_async: diag(1356, ts.DiagnosticCategory.Error, "Did_you_mean_to_mark_this_function_as_async_1356", "Did you mean to mark this function as 'async'?"),
         Duplicate_identifier_0: diag(2300, ts.DiagnosticCategory.Error, "Duplicate_identifier_0_2300", "Duplicate identifier '{0}'."),
         Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor: diag(2301, ts.DiagnosticCategory.Error, "Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor_2301", "Initializer of instance member variable '{0}' cannot reference identifier '{1}' declared in the constructor."),
         Static_members_cannot_reference_class_type_parameters: diag(2302, ts.DiagnosticCategory.Error, "Static_members_cannot_reference_class_type_parameters_2302", "Static members cannot reference class type parameters."),
@@ -5453,9 +5627,9 @@ var ts;
         Call_target_does_not_contain_any_signatures: diag(2346, ts.DiagnosticCategory.Error, "Call_target_does_not_contain_any_signatures_2346", "Call target does not contain any signatures."),
         Untyped_function_calls_may_not_accept_type_arguments: diag(2347, ts.DiagnosticCategory.Error, "Untyped_function_calls_may_not_accept_type_arguments_2347", "Untyped function calls may not accept type arguments."),
         Value_of_type_0_is_not_callable_Did_you_mean_to_include_new: diag(2348, ts.DiagnosticCategory.Error, "Value_of_type_0_is_not_callable_Did_you_mean_to_include_new_2348", "Value of type '{0}' is not callable. Did you mean to include 'new'?"),
-        Cannot_invoke_an_expression_whose_type_lacks_a_call_signature_Type_0_has_no_compatible_call_signatures: diag(2349, ts.DiagnosticCategory.Error, "Cannot_invoke_an_expression_whose_type_lacks_a_call_signature_Type_0_has_no_compatible_call_signatur_2349", "Cannot invoke an expression whose type lacks a call signature. Type '{0}' has no compatible call signatures."),
+        This_expression_is_not_callable: diag(2349, ts.DiagnosticCategory.Error, "This_expression_is_not_callable_2349", "This expression is not callable."),
         Only_a_void_function_can_be_called_with_the_new_keyword: diag(2350, ts.DiagnosticCategory.Error, "Only_a_void_function_can_be_called_with_the_new_keyword_2350", "Only a void function can be called with the 'new' keyword."),
-        Cannot_use_new_with_an_expression_whose_type_lacks_a_call_or_construct_signature: diag(2351, ts.DiagnosticCategory.Error, "Cannot_use_new_with_an_expression_whose_type_lacks_a_call_or_construct_signature_2351", "Cannot use 'new' with an expression whose type lacks a call or construct signature."),
+        This_expression_is_not_constructable: diag(2351, ts.DiagnosticCategory.Error, "This_expression_is_not_constructable_2351", "This expression is not constructable."),
         Conversion_of_type_0_to_type_1_may_be_a_mistake_because_neither_type_sufficiently_overlaps_with_the_other_If_this_was_intentional_convert_the_expression_to_unknown_first: diag(2352, ts.DiagnosticCategory.Error, "Conversion_of_type_0_to_type_1_may_be_a_mistake_because_neither_type_sufficiently_overlaps_with_the__2352", "Conversion of type '{0}' to type '{1}' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first."),
         Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1: diag(2353, ts.DiagnosticCategory.Error, "Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1_2353", "Object literal may only specify known properties, and '{0}' does not exist in type '{1}'."),
         This_syntax_requires_an_imported_helper_but_module_0_cannot_be_found: diag(2354, ts.DiagnosticCategory.Error, "This_syntax_requires_an_imported_helper_but_module_0_cannot_be_found_2354", "This syntax requires an imported helper but module '{0}' cannot be found."),
@@ -5585,7 +5759,7 @@ var ts;
         The_left_hand_side_of_a_for_of_statement_must_be_a_variable_or_a_property_access: diag(2487, ts.DiagnosticCategory.Error, "The_left_hand_side_of_a_for_of_statement_must_be_a_variable_or_a_property_access_2487", "The left-hand side of a 'for...of' statement must be a variable or a property access."),
         Type_0_must_have_a_Symbol_iterator_method_that_returns_an_iterator: diag(2488, ts.DiagnosticCategory.Error, "Type_0_must_have_a_Symbol_iterator_method_that_returns_an_iterator_2488", "Type '{0}' must have a '[Symbol.iterator]()' method that returns an iterator."),
         An_iterator_must_have_a_next_method: diag(2489, ts.DiagnosticCategory.Error, "An_iterator_must_have_a_next_method_2489", "An iterator must have a 'next()' method."),
-        The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property: diag(2490, ts.DiagnosticCategory.Error, "The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property_2490", "The type returned by the 'next()' method of an iterator must have a 'value' property."),
+        The_type_returned_by_the_0_method_of_an_iterator_must_have_a_value_property: diag(2490, ts.DiagnosticCategory.Error, "The_type_returned_by_the_0_method_of_an_iterator_must_have_a_value_property_2490", "The type returned by the '{0}()' method of an iterator must have a 'value' property."),
         The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern: diag(2491, ts.DiagnosticCategory.Error, "The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern_2491", "The left-hand side of a 'for...in' statement cannot be a destructuring pattern."),
         Cannot_redeclare_identifier_0_in_catch_clause: diag(2492, ts.DiagnosticCategory.Error, "Cannot_redeclare_identifier_0_in_catch_clause_2492", "Cannot redeclare identifier '{0}' in catch clause."),
         Tuple_type_0_of_length_1_has_no_element_at_index_2: diag(2493, ts.DiagnosticCategory.Error, "Tuple_type_0_of_length_1_has_no_element_at_index_2_2493", "Tuple type '{0}' of length '{1}' has no element at index '{2}'."),
@@ -5642,7 +5816,7 @@ var ts;
         Expression_resolves_to_variable_declaration_newTarget_that_compiler_uses_to_capture_new_target_meta_property_reference: diag(2544, ts.DiagnosticCategory.Error, "Expression_resolves_to_variable_declaration_newTarget_that_compiler_uses_to_capture_new_target_meta__2544", "Expression resolves to variable declaration '_newTarget' that compiler uses to capture 'new.target' meta-property reference."),
         A_mixin_class_must_have_a_constructor_with_a_single_rest_parameter_of_type_any: diag(2545, ts.DiagnosticCategory.Error, "A_mixin_class_must_have_a_constructor_with_a_single_rest_parameter_of_type_any_2545", "A mixin class must have a constructor with a single rest parameter of type 'any[]'."),
         Property_0_has_conflicting_declarations_and_is_inaccessible_in_type_1: diag(2546, ts.DiagnosticCategory.Error, "Property_0_has_conflicting_declarations_and_is_inaccessible_in_type_1_2546", "Property '{0}' has conflicting declarations and is inaccessible in type '{1}'."),
-        The_type_returned_by_the_next_method_of_an_async_iterator_must_be_a_promise_for_a_type_with_a_value_property: diag(2547, ts.DiagnosticCategory.Error, "The_type_returned_by_the_next_method_of_an_async_iterator_must_be_a_promise_for_a_type_with_a_value__2547", "The type returned by the 'next()' method of an async iterator must be a promise for a type with a 'value' property."),
+        The_type_returned_by_the_0_method_of_an_async_iterator_must_be_a_promise_for_a_type_with_a_value_property: diag(2547, ts.DiagnosticCategory.Error, "The_type_returned_by_the_0_method_of_an_async_iterator_must_be_a_promise_for_a_type_with_a_value_pro_2547", "The type returned by the '{0}()' method of an async iterator must be a promise for a type with a 'value' property."),
         Type_0_is_not_an_array_type_or_does_not_have_a_Symbol_iterator_method_that_returns_an_iterator: diag(2548, ts.DiagnosticCategory.Error, "Type_0_is_not_an_array_type_or_does_not_have_a_Symbol_iterator_method_that_returns_an_iterator_2548", "Type '{0}' is not an array type or does not have a '[Symbol.iterator]()' method that returns an iterator."),
         Type_0_is_not_an_array_type_or_a_string_type_or_does_not_have_a_Symbol_iterator_method_that_returns_an_iterator: diag(2549, ts.DiagnosticCategory.Error, "Type_0_is_not_an_array_type_or_a_string_type_or_does_not_have_a_Symbol_iterator_method_that_returns__2549", "Type '{0}' is not an array type or a string type or does not have a '[Symbol.iterator]()' method that returns an iterator."),
         Property_0_does_not_exist_on_type_1_Did_you_mean_2: diag(2551, ts.DiagnosticCategory.Error, "Property_0_does_not_exist_on_type_1_Did_you_mean_2_2551", "Property '{0}' does not exist on type '{1}'. Did you mean '{2}'?"),
@@ -5663,7 +5837,6 @@ var ts;
         A_rest_element_cannot_have_a_property_name: diag(2566, ts.DiagnosticCategory.Error, "A_rest_element_cannot_have_a_property_name_2566", "A rest element cannot have a property name."),
         Enum_declarations_can_only_merge_with_namespace_or_other_enum_declarations: diag(2567, ts.DiagnosticCategory.Error, "Enum_declarations_can_only_merge_with_namespace_or_other_enum_declarations_2567", "Enum declarations can only merge with namespace or other enum declarations."),
         Type_0_is_not_an_array_type_or_a_string_type_Use_compiler_option_downlevelIteration_to_allow_iterating_of_iterators: diag(2569, ts.DiagnosticCategory.Error, "Type_0_is_not_an_array_type_or_a_string_type_Use_compiler_option_downlevelIteration_to_allow_iterati_2569", "Type '{0}' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators."),
-        Property_0_does_not_exist_on_type_1_Did_you_forget_to_use_await: diag(2570, ts.DiagnosticCategory.Error, "Property_0_does_not_exist_on_type_1_Did_you_forget_to_use_await_2570", "Property '{0}' does not exist on type '{1}'. Did you forget to use 'await'?"),
         Object_is_of_type_unknown: diag(2571, ts.DiagnosticCategory.Error, "Object_is_of_type_unknown_2571", "Object is of type 'unknown'."),
         Rest_signatures_are_incompatible: diag(2572, ts.DiagnosticCategory.Error, "Rest_signatures_are_incompatible_2572", "Rest signatures are incompatible."),
         Property_0_is_incompatible_with_rest_element_type: diag(2573, ts.DiagnosticCategory.Error, "Property_0_is_incompatible_with_rest_element_type_2573", "Property '{0}' is incompatible with rest element type."),
@@ -5685,6 +5858,7 @@ var ts;
         Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_node_Try_npm_i_types_Slashnode_and_then_add_node_to_the_types_field_in_your_tsconfig: diag(2591, ts.DiagnosticCategory.Error, "Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_node_Try_npm_i_types_Slashnode_and_th_2591", "Cannot find name '{0}'. Do you need to install type definitions for node? Try `npm i @types/node` and then add `node` to the types field in your tsconfig."),
         Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_jQuery_Try_npm_i_types_Slashjquery_and_then_add_jquery_to_the_types_field_in_your_tsconfig: diag(2592, ts.DiagnosticCategory.Error, "Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_jQuery_Try_npm_i_types_Slashjquery_an_2592", "Cannot find name '{0}'. Do you need to install type definitions for jQuery? Try `npm i @types/jquery` and then add `jquery` to the types field in your tsconfig."),
         Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_a_test_runner_Try_npm_i_types_Slashjest_or_npm_i_types_Slashmocha_and_then_add_jest_or_mocha_to_the_types_field_in_your_tsconfig: diag(2593, ts.DiagnosticCategory.Error, "Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_a_test_runner_Try_npm_i_types_Slashje_2593", "Cannot find name '{0}'. Do you need to install type definitions for a test runner? Try `npm i @types/jest` or `npm i @types/mocha` and then add `jest` or `mocha` to the types field in your tsconfig."),
+        This_module_is_declared_with_using_export_and_can_only_be_used_with_a_default_import_when_using_the_0_flag: diag(2594, ts.DiagnosticCategory.Error, "This_module_is_declared_with_using_export_and_can_only_be_used_with_a_default_import_when_using_the__2594", "This module is declared with using 'export =', and can only be used with a default import when using the '{0}' flag."),
         JSX_element_attributes_type_0_may_not_be_a_union_type: diag(2600, ts.DiagnosticCategory.Error, "JSX_element_attributes_type_0_may_not_be_a_union_type_2600", "JSX element attributes type '{0}' may not be a union type."),
         The_return_type_of_a_JSX_element_constructor_must_return_an_object_type: diag(2601, ts.DiagnosticCategory.Error, "The_return_type_of_a_JSX_element_constructor_must_return_an_object_type_2601", "The return type of a JSX element constructor must return an object type."),
         JSX_element_implicitly_has_type_any_because_the_global_type_JSX_Element_does_not_exist: diag(2602, ts.DiagnosticCategory.Error, "JSX_element_implicitly_has_type_any_because_the_global_type_JSX_Element_does_not_exist_2602", "JSX element implicitly has type 'any' because the global type 'JSX.Element' does not exist."),
@@ -5795,6 +5969,28 @@ var ts;
         _0_refers_to_a_value_but_is_being_used_as_a_type_here: diag(2749, ts.DiagnosticCategory.Error, "_0_refers_to_a_value_but_is_being_used_as_a_type_here_2749", "'{0}' refers to a value, but is being used as a type here."),
         The_implementation_signature_is_declared_here: diag(2750, ts.DiagnosticCategory.Error, "The_implementation_signature_is_declared_here_2750", "The implementation signature is declared here."),
         Circularity_originates_in_type_at_this_location: diag(2751, ts.DiagnosticCategory.Error, "Circularity_originates_in_type_at_this_location_2751", "Circularity originates in type at this location."),
+        The_first_export_default_is_here: diag(2752, ts.DiagnosticCategory.Error, "The_first_export_default_is_here_2752", "The first export default is here."),
+        Another_export_default_is_here: diag(2753, ts.DiagnosticCategory.Error, "Another_export_default_is_here_2753", "Another export default is here."),
+        super_may_not_use_type_arguments: diag(2754, ts.DiagnosticCategory.Error, "super_may_not_use_type_arguments_2754", "'super' may not use type arguments."),
+        No_constituent_of_type_0_is_callable: diag(2755, ts.DiagnosticCategory.Error, "No_constituent_of_type_0_is_callable_2755", "No constituent of type '{0}' is callable."),
+        Not_all_constituents_of_type_0_are_callable: diag(2756, ts.DiagnosticCategory.Error, "Not_all_constituents_of_type_0_are_callable_2756", "Not all constituents of type '{0}' are callable."),
+        Type_0_has_no_call_signatures: diag(2757, ts.DiagnosticCategory.Error, "Type_0_has_no_call_signatures_2757", "Type '{0}' has no call signatures."),
+        Each_member_of_the_union_type_0_has_signatures_but_none_of_those_signatures_are_compatible_with_each_other: diag(2758, ts.DiagnosticCategory.Error, "Each_member_of_the_union_type_0_has_signatures_but_none_of_those_signatures_are_compatible_with_each_2758", "Each member of the union type '{0}' has signatures, but none of those signatures are compatible with each other."),
+        No_constituent_of_type_0_is_constructable: diag(2759, ts.DiagnosticCategory.Error, "No_constituent_of_type_0_is_constructable_2759", "No constituent of type '{0}' is constructable."),
+        Not_all_constituents_of_type_0_are_constructable: diag(2760, ts.DiagnosticCategory.Error, "Not_all_constituents_of_type_0_are_constructable_2760", "Not all constituents of type '{0}' are constructable."),
+        Type_0_has_no_construct_signatures: diag(2761, ts.DiagnosticCategory.Error, "Type_0_has_no_construct_signatures_2761", "Type '{0}' has no construct signatures."),
+        Each_member_of_the_union_type_0_has_construct_signatures_but_none_of_those_signatures_are_compatible_with_each_other: diag(2762, ts.DiagnosticCategory.Error, "Each_member_of_the_union_type_0_has_construct_signatures_but_none_of_those_signatures_are_compatible_2762", "Each member of the union type '{0}' has construct signatures, but none of those signatures are compatible with each other."),
+        Cannot_iterate_value_because_the_next_method_of_its_iterator_expects_type_1_but_for_of_will_always_send_0: diag(2763, ts.DiagnosticCategory.Error, "Cannot_iterate_value_because_the_next_method_of_its_iterator_expects_type_1_but_for_of_will_always_s_2763", "Cannot iterate value because the 'next' method of its iterator expects type '{1}', but for-of will always send '{0}'."),
+        Cannot_iterate_value_because_the_next_method_of_its_iterator_expects_type_1_but_array_spread_will_always_send_0: diag(2764, ts.DiagnosticCategory.Error, "Cannot_iterate_value_because_the_next_method_of_its_iterator_expects_type_1_but_array_spread_will_al_2764", "Cannot iterate value because the 'next' method of its iterator expects type '{1}', but array spread will always send '{0}'."),
+        Cannot_iterate_value_because_the_next_method_of_its_iterator_expects_type_1_but_array_destructuring_will_always_send_0: diag(2765, ts.DiagnosticCategory.Error, "Cannot_iterate_value_because_the_next_method_of_its_iterator_expects_type_1_but_array_destructuring__2765", "Cannot iterate value because the 'next' method of its iterator expects type '{1}', but array destructuring will always send '{0}'."),
+        Cannot_delegate_iteration_to_value_because_the_next_method_of_its_iterator_expects_type_1_but_the_containing_generator_will_always_send_0: diag(2766, ts.DiagnosticCategory.Error, "Cannot_delegate_iteration_to_value_because_the_next_method_of_its_iterator_expects_type_1_but_the_co_2766", "Cannot delegate iteration to value because the 'next' method of its iterator expects type '{1}', but the containing generator will always send '{0}'."),
+        The_0_property_of_an_iterator_must_be_a_method: diag(2767, ts.DiagnosticCategory.Error, "The_0_property_of_an_iterator_must_be_a_method_2767", "The '{0}' property of an iterator must be a method."),
+        The_0_property_of_an_async_iterator_must_be_a_method: diag(2768, ts.DiagnosticCategory.Error, "The_0_property_of_an_async_iterator_must_be_a_method_2768", "The '{0}' property of an async iterator must be a method."),
+        No_overload_matches_this_call: diag(2769, ts.DiagnosticCategory.Error, "No_overload_matches_this_call_2769", "No overload matches this call."),
+        The_last_overload_gave_the_following_error: diag(2770, ts.DiagnosticCategory.Error, "The_last_overload_gave_the_following_error_2770", "The last overload gave the following error."),
+        The_last_overload_is_declared_here: diag(2771, ts.DiagnosticCategory.Error, "The_last_overload_is_declared_here_2771", "The last overload is declared here."),
+        Overload_0_of_1_2_gave_the_following_error: diag(2772, ts.DiagnosticCategory.Error, "Overload_0_of_1_2_gave_the_following_error_2772", "Overload {0} of {1}, '{2}', gave the following error."),
+        Did_you_forget_to_use_await: diag(2773, ts.DiagnosticCategory.Error, "Did_you_forget_to_use_await_2773", "Did you forget to use 'await'?"),
         Import_declaration_0_is_using_private_name_1: diag(4000, ts.DiagnosticCategory.Error, "Import_declaration_0_is_using_private_name_1_4000", "Import declaration '{0}' is using private name '{1}'."),
         Type_parameter_0_of_exported_class_has_or_is_using_private_name_1: diag(4002, ts.DiagnosticCategory.Error, "Type_parameter_0_of_exported_class_has_or_is_using_private_name_1_4002", "Type parameter '{0}' of exported class has or is using private name '{1}'."),
         Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1: diag(4004, ts.DiagnosticCategory.Error, "Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1_4004", "Type parameter '{0}' of exported interface has or is using private name '{1}'."),
@@ -5879,6 +6075,8 @@ var ts;
         Method_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2: diag(4101, ts.DiagnosticCategory.Error, "Method_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2_4101", "Method '{0}' of exported interface has or is using name '{1}' from private module '{2}'."),
         Method_0_of_exported_interface_has_or_is_using_private_name_1: diag(4102, ts.DiagnosticCategory.Error, "Method_0_of_exported_interface_has_or_is_using_private_name_1_4102", "Method '{0}' of exported interface has or is using private name '{1}'."),
         Type_parameter_0_of_exported_mapped_object_type_is_using_private_name_1: diag(4103, ts.DiagnosticCategory.Error, "Type_parameter_0_of_exported_mapped_object_type_is_using_private_name_1_4103", "Type parameter '{0}' of exported mapped object type is using private name '{1}'."),
+        The_type_0_is_readonly_and_cannot_be_assigned_to_the_mutable_type_1: diag(4104, ts.DiagnosticCategory.Error, "The_type_0_is_readonly_and_cannot_be_assigned_to_the_mutable_type_1_4104", "The type '{0}' is 'readonly' and cannot be assigned to the mutable type '{1}'."),
+        Private_or_protected_member_0_cannot_be_accessed_on_a_type_parameter: diag(4105, ts.DiagnosticCategory.Error, "Private_or_protected_member_0_cannot_be_accessed_on_a_type_parameter_4105", "Private or protected member '{0}' cannot be accessed on a type parameter."),
         The_current_host_does_not_support_the_0_option: diag(5001, ts.DiagnosticCategory.Error, "The_current_host_does_not_support_the_0_option_5001", "The current host does not support the '{0}' option."),
         Cannot_find_the_common_subdirectory_path_for_the_input_files: diag(5009, ts.DiagnosticCategory.Error, "Cannot_find_the_common_subdirectory_path_for_the_input_files_5009", "Cannot find the common subdirectory path for the input files."),
         File_specification_cannot_end_in_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0: diag(5010, ts.DiagnosticCategory.Error, "File_specification_cannot_end_in_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0_5010", "File specification cannot end in a recursive directory wildcard ('**'): '{0}'."),
@@ -5912,6 +6110,8 @@ var ts;
         Option_resolveJsonModule_can_only_be_specified_when_module_code_generation_is_commonjs_amd_es2015_or_esNext: diag(5071, ts.DiagnosticCategory.Error, "Option_resolveJsonModule_can_only_be_specified_when_module_code_generation_is_commonjs_amd_es2015_or_5071", "Option '--resolveJsonModule' can only be specified when module code generation is 'commonjs', 'amd', 'es2015' or 'esNext'."),
         Unknown_build_option_0: diag(5072, ts.DiagnosticCategory.Error, "Unknown_build_option_0_5072", "Unknown build option '{0}'."),
         Build_option_0_requires_a_value_of_type_1: diag(5073, ts.DiagnosticCategory.Error, "Build_option_0_requires_a_value_of_type_1_5073", "Build option '{0}' requires a value of type {1}."),
+        Option_incremental_can_only_be_specified_using_tsconfig_emitting_to_single_file_or_when_option_tsBuildInfoFile_is_specified: diag(5074, ts.DiagnosticCategory.Error, "Option_incremental_can_only_be_specified_using_tsconfig_emitting_to_single_file_or_when_option_tsBui_5074", "Option '--incremental' can only be specified using tsconfig, emitting to single file or when option `--tsBuildInfoFile` is specified."),
+        _0_is_assignable_to_the_constraint_of_type_1_but_1_could_be_instantiated_with_a_different_subtype_of_constraint_2: diag(5075, ts.DiagnosticCategory.Error, "_0_is_assignable_to_the_constraint_of_type_1_but_1_could_be_instantiated_with_a_different_subtype_of_5075", "'{0}' is assignable to the constraint of type '{1}', but '{1}' could be instantiated with a different subtype of constraint '{2}'."),
         Generates_a_sourcemap_for_each_corresponding_d_ts_file: diag(6000, ts.DiagnosticCategory.Message, "Generates_a_sourcemap_for_each_corresponding_d_ts_file_6000", "Generates a sourcemap for each corresponding '.d.ts' file."),
         Concatenate_and_emit_output_to_single_file: diag(6001, ts.DiagnosticCategory.Message, "Concatenate_and_emit_output_to_single_file_6001", "Concatenate and emit output to single file."),
         Generates_corresponding_d_ts_file: diag(6002, ts.DiagnosticCategory.Message, "Generates_corresponding_d_ts_file_6002", "Generates corresponding '.d.ts' file."),
@@ -6088,7 +6288,6 @@ var ts;
         Enable_strict_checking_of_property_initialization_in_classes: diag(6187, ts.DiagnosticCategory.Message, "Enable_strict_checking_of_property_initialization_in_classes_6187", "Enable strict checking of property initialization in classes."),
         Numeric_separators_are_not_allowed_here: diag(6188, ts.DiagnosticCategory.Error, "Numeric_separators_are_not_allowed_here_6188", "Numeric separators are not allowed here."),
         Multiple_consecutive_numeric_separators_are_not_permitted: diag(6189, ts.DiagnosticCategory.Error, "Multiple_consecutive_numeric_separators_are_not_permitted_6189", "Multiple consecutive numeric separators are not permitted."),
-        Found_package_json_at_0_Package_ID_is_1: diag(6190, ts.DiagnosticCategory.Message, "Found_package_json_at_0_Package_ID_is_1_6190", "Found 'package.json' at '{0}'. Package ID is '{1}'."),
         Whether_to_keep_outdated_console_output_in_watch_mode_instead_of_clearing_the_screen: diag(6191, ts.DiagnosticCategory.Message, "Whether_to_keep_outdated_console_output_in_watch_mode_instead_of_clearing_the_screen_6191", "Whether to keep outdated console output in watch mode instead of clearing the screen."),
         All_imports_in_import_declaration_are_unused: diag(6192, ts.DiagnosticCategory.Error, "All_imports_in_import_declaration_are_unused_6192", "All imports in import declaration are unused.", /*reportsUnnecessary*/ true),
         Found_1_error_Watching_for_file_changes: diag(6193, ts.DiagnosticCategory.Message, "Found_1_error_Watching_for_file_changes_6193", "Found 1 error. Watching for file changes."),
@@ -6115,13 +6314,16 @@ var ts;
         Using_compiler_options_of_project_reference_redirect_0: diag(6215, ts.DiagnosticCategory.Message, "Using_compiler_options_of_project_reference_redirect_0_6215", "Using compiler options of project reference redirect '{0}'."),
         Found_1_error: diag(6216, ts.DiagnosticCategory.Message, "Found_1_error_6216", "Found 1 error."),
         Found_0_errors: diag(6217, ts.DiagnosticCategory.Message, "Found_0_errors_6217", "Found {0} errors."),
+        Module_name_0_was_successfully_resolved_to_1_with_Package_ID_2: diag(6218, ts.DiagnosticCategory.Message, "Module_name_0_was_successfully_resolved_to_1_with_Package_ID_2_6218", "======== Module name '{0}' was successfully resolved to '{1}' with Package ID '{2}'. ========"),
+        Type_reference_directive_0_was_successfully_resolved_to_1_with_Package_ID_2_primary_Colon_3: diag(6219, ts.DiagnosticCategory.Message, "Type_reference_directive_0_was_successfully_resolved_to_1_with_Package_ID_2_primary_Colon_3_6219", "======== Type reference directive '{0}' was successfully resolved to '{1}' with Package ID '{2}', primary: {3}. ========"),
+        package_json_had_a_falsy_0_field: diag(6220, ts.DiagnosticCategory.Message, "package_json_had_a_falsy_0_field_6220", "'package.json' had a falsy '{0}' field."),
         Projects_to_reference: diag(6300, ts.DiagnosticCategory.Message, "Projects_to_reference_6300", "Projects to reference"),
         Enable_project_compilation: diag(6302, ts.DiagnosticCategory.Message, "Enable_project_compilation_6302", "Enable project compilation"),
         Project_references_may_not_form_a_circular_graph_Cycle_detected_Colon_0: diag(6202, ts.DiagnosticCategory.Error, "Project_references_may_not_form_a_circular_graph_Cycle_detected_Colon_0_6202", "Project references may not form a circular graph. Cycle detected: {0}"),
         Composite_projects_may_not_disable_declaration_emit: diag(6304, ts.DiagnosticCategory.Error, "Composite_projects_may_not_disable_declaration_emit_6304", "Composite projects may not disable declaration emit."),
         Output_file_0_has_not_been_built_from_source_file_1: diag(6305, ts.DiagnosticCategory.Error, "Output_file_0_has_not_been_built_from_source_file_1_6305", "Output file '{0}' has not been built from source file '{1}'."),
         Referenced_project_0_must_have_setting_composite_Colon_true: diag(6306, ts.DiagnosticCategory.Error, "Referenced_project_0_must_have_setting_composite_Colon_true_6306", "Referenced project '{0}' must have setting \"composite\": true."),
-        File_0_is_not_in_project_file_list_Projects_must_list_all_files_or_use_an_include_pattern: diag(6307, ts.DiagnosticCategory.Error, "File_0_is_not_in_project_file_list_Projects_must_list_all_files_or_use_an_include_pattern_6307", "File '{0}' is not in project file list. Projects must list all files or use an 'include' pattern."),
+        File_0_is_not_listed_within_the_file_list_of_project_1_Projects_must_list_all_files_or_use_an_include_pattern: diag(6307, ts.DiagnosticCategory.Error, "File_0_is_not_listed_within_the_file_list_of_project_1_Projects_must_list_all_files_or_use_an_includ_6307", "File '{0}' is not listed within the file list of project '{1}'. Projects must list all files or use an 'include' pattern."),
         Cannot_prepend_project_0_because_it_does_not_have_outFile_set: diag(6308, ts.DiagnosticCategory.Error, "Cannot_prepend_project_0_because_it_does_not_have_outFile_set_6308", "Cannot prepend project '{0}' because it does not have 'outFile' set"),
         Output_file_0_from_project_1_does_not_exist: diag(6309, ts.DiagnosticCategory.Error, "Output_file_0_from_project_1_does_not_exist_6309", "Output file '{0}' from project '{1}' does not exist"),
         Project_0_is_out_of_date_because_oldest_output_1_is_older_than_newest_input_2: diag(6350, ts.DiagnosticCategory.Message, "Project_0_is_out_of_date_because_oldest_output_1_is_older_than_newest_input_2_6350", "Project '{0}' is out of date because oldest output '{1}' is older than newest input '{2}'"),
@@ -6176,7 +6378,7 @@ var ts;
         _0_implicitly_has_type_any_because_it_does_not_have_a_type_annotation_and_is_referenced_directly_or_indirectly_in_its_own_initializer: diag(7022, ts.DiagnosticCategory.Error, "_0_implicitly_has_type_any_because_it_does_not_have_a_type_annotation_and_is_referenced_directly_or__7022", "'{0}' implicitly has type 'any' because it does not have a type annotation and is referenced directly or indirectly in its own initializer."),
         _0_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions: diag(7023, ts.DiagnosticCategory.Error, "_0_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_reference_7023", "'{0}' implicitly has return type 'any' because it does not have a return type annotation and is referenced directly or indirectly in one of its return expressions."),
         Function_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions: diag(7024, ts.DiagnosticCategory.Error, "Function_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_ref_7024", "Function implicitly has return type 'any' because it does not have a return type annotation and is referenced directly or indirectly in one of its return expressions."),
-        Generator_implicitly_has_type_0_because_it_does_not_yield_any_values_Consider_supplying_a_return_type: diag(7025, ts.DiagnosticCategory.Error, "Generator_implicitly_has_type_0_because_it_does_not_yield_any_values_Consider_supplying_a_return_typ_7025", "Generator implicitly has type '{0}' because it does not yield any values. Consider supplying a return type."),
+        Generator_implicitly_has_yield_type_0_because_it_does_not_yield_any_values_Consider_supplying_a_return_type_annotation: diag(7025, ts.DiagnosticCategory.Error, "Generator_implicitly_has_yield_type_0_because_it_does_not_yield_any_values_Consider_supplying_a_retu_7025", "Generator implicitly has yield type '{0}' because it does not yield any values. Consider supplying a return type annotation."),
         JSX_element_implicitly_has_type_any_because_no_interface_JSX_0_exists: diag(7026, ts.DiagnosticCategory.Error, "JSX_element_implicitly_has_type_any_because_no_interface_JSX_0_exists_7026", "JSX element implicitly has type 'any' because no interface 'JSX.{0}' exists."),
         Unreachable_code_detected: diag(7027, ts.DiagnosticCategory.Error, "Unreachable_code_detected_7027", "Unreachable code detected.", /*reportsUnnecessary*/ true),
         Unused_label: diag(7028, ts.DiagnosticCategory.Error, "Unused_label_7028", "Unused label.", /*reportsUnnecessary*/ true),
@@ -6203,6 +6405,10 @@ var ts;
         Property_0_implicitly_has_type_any_but_a_better_type_for_its_set_accessor_may_be_inferred_from_usage: diag(7049, ts.DiagnosticCategory.Suggestion, "Property_0_implicitly_has_type_any_but_a_better_type_for_its_set_accessor_may_be_inferred_from_usage_7049", "Property '{0}' implicitly has type 'any', but a better type for its set accessor may be inferred from usage."),
         _0_implicitly_has_an_1_return_type_but_a_better_type_may_be_inferred_from_usage: diag(7050, ts.DiagnosticCategory.Suggestion, "_0_implicitly_has_an_1_return_type_but_a_better_type_may_be_inferred_from_usage_7050", "'{0}' implicitly has an '{1}' return type, but a better type may be inferred from usage."),
         Parameter_has_a_name_but_no_type_Did_you_mean_0_Colon_1: diag(7051, ts.DiagnosticCategory.Error, "Parameter_has_a_name_but_no_type_Did_you_mean_0_Colon_1_7051", "Parameter has a name but no type. Did you mean '{0}: {1}'?"),
+        Element_implicitly_has_an_any_type_because_type_0_has_no_index_signature_Did_you_mean_to_call_1: diag(7052, ts.DiagnosticCategory.Error, "Element_implicitly_has_an_any_type_because_type_0_has_no_index_signature_Did_you_mean_to_call_1_7052", "Element implicitly has an 'any' type because type '{0}' has no index signature. Did you mean to call '{1}' ?"),
+        Element_implicitly_has_an_any_type_because_expression_of_type_0_can_t_be_used_to_index_type_1: diag(7053, ts.DiagnosticCategory.Error, "Element_implicitly_has_an_any_type_because_expression_of_type_0_can_t_be_used_to_index_type_1_7053", "Element implicitly has an 'any' type because expression of type '{0}' can't be used to index type '{1}'."),
+        No_index_signature_with_a_parameter_of_type_0_was_found_on_type_1: diag(7054, ts.DiagnosticCategory.Error, "No_index_signature_with_a_parameter_of_type_0_was_found_on_type_1_7054", "No index signature with a parameter of type '{0}' was found on type '{1}'."),
+        _0_which_lacks_return_type_annotation_implicitly_has_an_1_yield_type: diag(7055, ts.DiagnosticCategory.Error, "_0_which_lacks_return_type_annotation_implicitly_has_an_1_yield_type_7055", "'{0}', which lacks return-type annotation, implicitly has an '{1}' yield type."),
         You_cannot_rename_this_element: diag(8000, ts.DiagnosticCategory.Error, "You_cannot_rename_this_element_8000", "You cannot rename this element."),
         You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library: diag(8001, ts.DiagnosticCategory.Error, "You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library_8001", "You cannot rename elements that are defined in the standard TypeScript library."),
         import_can_only_be_used_in_a_ts_file: diag(8002, ts.DiagnosticCategory.Error, "import_can_only_be_used_in_a_ts_file_8002", "'import ... =' can only be used in a .ts file."),
@@ -6266,6 +6472,7 @@ var ts;
         JSDoc_types_may_be_moved_to_TypeScript_types: diag(80004, ts.DiagnosticCategory.Suggestion, "JSDoc_types_may_be_moved_to_TypeScript_types_80004", "JSDoc types may be moved to TypeScript types."),
         require_call_may_be_converted_to_an_import: diag(80005, ts.DiagnosticCategory.Suggestion, "require_call_may_be_converted_to_an_import_80005", "'require' call may be converted to an import."),
         This_may_be_converted_to_an_async_function: diag(80006, ts.DiagnosticCategory.Suggestion, "This_may_be_converted_to_an_async_function_80006", "This may be converted to an async function."),
+        await_has_no_effect_on_the_type_of_this_expression: diag(80007, ts.DiagnosticCategory.Suggestion, "await_has_no_effect_on_the_type_of_this_expression_80007", "'await' has no effect on the type of this expression."),
         Add_missing_super_call: diag(90001, ts.DiagnosticCategory.Message, "Add_missing_super_call_90001", "Add missing 'super()' call"),
         Make_super_call_the_first_statement_in_the_constructor: diag(90002, ts.DiagnosticCategory.Message, "Make_super_call_the_first_statement_in_the_constructor_90002", "Make 'super()' call the first statement in the constructor"),
         Change_extends_to_implements: diag(90003, ts.DiagnosticCategory.Message, "Change_extends_to_implements_90003", "Change 'extends' to 'implements'"),
@@ -6364,15 +6571,28 @@ var ts;
         Add_all_missing_imports: diag(95064, ts.DiagnosticCategory.Message, "Add_all_missing_imports_95064", "Add all missing imports"),
         Convert_to_async_function: diag(95065, ts.DiagnosticCategory.Message, "Convert_to_async_function_95065", "Convert to async function"),
         Convert_all_to_async_functions: diag(95066, ts.DiagnosticCategory.Message, "Convert_all_to_async_functions_95066", "Convert all to async functions"),
-        Generate_types_for_0: diag(95067, ts.DiagnosticCategory.Message, "Generate_types_for_0_95067", "Generate types for '{0}'"),
-        Generate_types_for_all_packages_without_types: diag(95068, ts.DiagnosticCategory.Message, "Generate_types_for_all_packages_without_types_95068", "Generate types for all packages without types"),
         Add_unknown_conversion_for_non_overlapping_types: diag(95069, ts.DiagnosticCategory.Message, "Add_unknown_conversion_for_non_overlapping_types_95069", "Add 'unknown' conversion for non-overlapping types"),
         Add_unknown_to_all_conversions_of_non_overlapping_types: diag(95070, ts.DiagnosticCategory.Message, "Add_unknown_to_all_conversions_of_non_overlapping_types_95070", "Add 'unknown' to all conversions of non-overlapping types"),
         Add_missing_new_operator_to_call: diag(95071, ts.DiagnosticCategory.Message, "Add_missing_new_operator_to_call_95071", "Add missing 'new' operator to call"),
         Add_missing_new_operator_to_all_calls: diag(95072, ts.DiagnosticCategory.Message, "Add_missing_new_operator_to_all_calls_95072", "Add missing 'new' operator to all calls"),
         Add_names_to_all_parameters_without_names: diag(95073, ts.DiagnosticCategory.Message, "Add_names_to_all_parameters_without_names_95073", "Add names to all parameters without names"),
         Enable_the_experimentalDecorators_option_in_your_configuration_file: diag(95074, ts.DiagnosticCategory.Message, "Enable_the_experimentalDecorators_option_in_your_configuration_file_95074", "Enable the 'experimentalDecorators' option in your configuration file"),
-        Convert_to_named_parameters: diag(95075, ts.DiagnosticCategory.Message, "Convert_to_named_parameters_95075", "Convert to named parameters"),
+        Convert_parameters_to_destructured_object: diag(95075, ts.DiagnosticCategory.Message, "Convert_parameters_to_destructured_object_95075", "Convert parameters to destructured object"),
+        Allow_accessing_UMD_globals_from_modules: diag(95076, ts.DiagnosticCategory.Message, "Allow_accessing_UMD_globals_from_modules_95076", "Allow accessing UMD globals from modules."),
+        Extract_type: diag(95077, ts.DiagnosticCategory.Message, "Extract_type_95077", "Extract type"),
+        Extract_to_type_alias: diag(95078, ts.DiagnosticCategory.Message, "Extract_to_type_alias_95078", "Extract to type alias"),
+        Extract_to_typedef: diag(95079, ts.DiagnosticCategory.Message, "Extract_to_typedef_95079", "Extract to typedef"),
+        Infer_this_type_of_0_from_usage: diag(95080, ts.DiagnosticCategory.Message, "Infer_this_type_of_0_from_usage_95080", "Infer 'this' type of '{0}' from usage"),
+        Add_const_to_unresolved_variable: diag(95081, ts.DiagnosticCategory.Message, "Add_const_to_unresolved_variable_95081", "Add 'const' to unresolved variable"),
+        Add_const_to_all_unresolved_variables: diag(95082, ts.DiagnosticCategory.Message, "Add_const_to_all_unresolved_variables_95082", "Add 'const' to all unresolved variables"),
+        Add_await: diag(95083, ts.DiagnosticCategory.Message, "Add_await_95083", "Add 'await'"),
+        Add_await_to_initializer_for_0: diag(95084, ts.DiagnosticCategory.Message, "Add_await_to_initializer_for_0_95084", "Add 'await' to initializer for '{0}'"),
+        Fix_all_expressions_possibly_missing_await: diag(95085, ts.DiagnosticCategory.Message, "Fix_all_expressions_possibly_missing_await_95085", "Fix all expressions possibly missing 'await'"),
+        Remove_unnecessary_await: diag(95086, ts.DiagnosticCategory.Message, "Remove_unnecessary_await_95086", "Remove unnecessary 'await'"),
+        Remove_all_unnecessary_uses_of_await: diag(95087, ts.DiagnosticCategory.Message, "Remove_all_unnecessary_uses_of_await_95087", "Remove all unnecessary uses of 'await'"),
+        No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer: diag(18004, ts.DiagnosticCategory.Error, "No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer_18004", "No value exists in scope for the shorthand property '{0}'. Either declare one or provide an initializer."),
+        Classes_may_not_have_a_field_named_constructor: diag(18006, ts.DiagnosticCategory.Error, "Classes_may_not_have_a_field_named_constructor_18006", "Classes may not have a field named 'constructor'."),
+        JSX_expressions_may_not_use_the_comma_operator_Did_you_mean_to_write_an_array: diag(18007, ts.DiagnosticCategory.Error, "JSX_expressions_may_not_use_the_comma_operator_Did_you_mean_to_write_an_array_18007", "JSX expressions may not use the comma operator. Did you mean to write an array?"),
     };
 })(ts || (ts = {}));
 var ts;
@@ -6380,7 +6600,7 @@ var ts;
     var _a;
     /* @internal */
     function tokenIsIdentifierOrKeyword(token) {
-        return token >= 72 /* Identifier */;
+        return token >= 73 /* Identifier */;
     }
     ts.tokenIsIdentifierOrKeyword = tokenIsIdentifierOrKeyword;
     /* @internal */
@@ -6389,85 +6609,85 @@ var ts;
     }
     ts.tokenIsIdentifierOrKeywordOrGreaterThan = tokenIsIdentifierOrKeywordOrGreaterThan;
     var textToKeywordObj = (_a = {
-            abstract: 118 /* AbstractKeyword */,
-            any: 120 /* AnyKeyword */,
-            as: 119 /* AsKeyword */,
-            bigint: 146 /* BigIntKeyword */,
-            boolean: 123 /* BooleanKeyword */,
-            break: 73 /* BreakKeyword */,
-            case: 74 /* CaseKeyword */,
-            catch: 75 /* CatchKeyword */,
-            class: 76 /* ClassKeyword */,
-            continue: 78 /* ContinueKeyword */,
-            const: 77 /* ConstKeyword */
+            abstract: 119 /* AbstractKeyword */,
+            any: 121 /* AnyKeyword */,
+            as: 120 /* AsKeyword */,
+            bigint: 147 /* BigIntKeyword */,
+            boolean: 124 /* BooleanKeyword */,
+            break: 74 /* BreakKeyword */,
+            case: 75 /* CaseKeyword */,
+            catch: 76 /* CatchKeyword */,
+            class: 77 /* ClassKeyword */,
+            continue: 79 /* ContinueKeyword */,
+            const: 78 /* ConstKeyword */
         },
-        _a["" + "constructor"] = 124 /* ConstructorKeyword */,
-        _a.debugger = 79 /* DebuggerKeyword */,
-        _a.declare = 125 /* DeclareKeyword */,
-        _a.default = 80 /* DefaultKeyword */,
-        _a.delete = 81 /* DeleteKeyword */,
-        _a.do = 82 /* DoKeyword */,
-        _a.else = 83 /* ElseKeyword */,
-        _a.enum = 84 /* EnumKeyword */,
-        _a.export = 85 /* ExportKeyword */,
-        _a.extends = 86 /* ExtendsKeyword */,
-        _a.false = 87 /* FalseKeyword */,
-        _a.finally = 88 /* FinallyKeyword */,
-        _a.for = 89 /* ForKeyword */,
-        _a.from = 144 /* FromKeyword */,
-        _a.function = 90 /* FunctionKeyword */,
-        _a.get = 126 /* GetKeyword */,
-        _a.if = 91 /* IfKeyword */,
-        _a.implements = 109 /* ImplementsKeyword */,
-        _a.import = 92 /* ImportKeyword */,
-        _a.in = 93 /* InKeyword */,
-        _a.infer = 127 /* InferKeyword */,
-        _a.instanceof = 94 /* InstanceOfKeyword */,
-        _a.interface = 110 /* InterfaceKeyword */,
-        _a.is = 128 /* IsKeyword */,
-        _a.keyof = 129 /* KeyOfKeyword */,
-        _a.let = 111 /* LetKeyword */,
-        _a.module = 130 /* ModuleKeyword */,
-        _a.namespace = 131 /* NamespaceKeyword */,
-        _a.never = 132 /* NeverKeyword */,
-        _a.new = 95 /* NewKeyword */,
-        _a.null = 96 /* NullKeyword */,
-        _a.number = 135 /* NumberKeyword */,
-        _a.object = 136 /* ObjectKeyword */,
-        _a.package = 112 /* PackageKeyword */,
-        _a.private = 113 /* PrivateKeyword */,
-        _a.protected = 114 /* ProtectedKeyword */,
-        _a.public = 115 /* PublicKeyword */,
-        _a.readonly = 133 /* ReadonlyKeyword */,
-        _a.require = 134 /* RequireKeyword */,
-        _a.global = 145 /* GlobalKeyword */,
-        _a.return = 97 /* ReturnKeyword */,
-        _a.set = 137 /* SetKeyword */,
-        _a.static = 116 /* StaticKeyword */,
-        _a.string = 138 /* StringKeyword */,
-        _a.super = 98 /* SuperKeyword */,
-        _a.switch = 99 /* SwitchKeyword */,
-        _a.symbol = 139 /* SymbolKeyword */,
-        _a.this = 100 /* ThisKeyword */,
-        _a.throw = 101 /* ThrowKeyword */,
-        _a.true = 102 /* TrueKeyword */,
-        _a.try = 103 /* TryKeyword */,
-        _a.type = 140 /* TypeKeyword */,
-        _a.typeof = 104 /* TypeOfKeyword */,
-        _a.undefined = 141 /* UndefinedKeyword */,
-        _a.unique = 142 /* UniqueKeyword */,
-        _a.unknown = 143 /* UnknownKeyword */,
-        _a.var = 105 /* VarKeyword */,
-        _a.void = 106 /* VoidKeyword */,
-        _a.while = 107 /* WhileKeyword */,
-        _a.with = 108 /* WithKeyword */,
-        _a.yield = 117 /* YieldKeyword */,
-        _a.async = 121 /* AsyncKeyword */,
-        _a.await = 122 /* AwaitKeyword */,
-        _a.of = 147 /* OfKeyword */,
+        _a["" + "constructor"] = 125 /* ConstructorKeyword */,
+        _a.debugger = 80 /* DebuggerKeyword */,
+        _a.declare = 126 /* DeclareKeyword */,
+        _a.default = 81 /* DefaultKeyword */,
+        _a.delete = 82 /* DeleteKeyword */,
+        _a.do = 83 /* DoKeyword */,
+        _a.else = 84 /* ElseKeyword */,
+        _a.enum = 85 /* EnumKeyword */,
+        _a.export = 86 /* ExportKeyword */,
+        _a.extends = 87 /* ExtendsKeyword */,
+        _a.false = 88 /* FalseKeyword */,
+        _a.finally = 89 /* FinallyKeyword */,
+        _a.for = 90 /* ForKeyword */,
+        _a.from = 145 /* FromKeyword */,
+        _a.function = 91 /* FunctionKeyword */,
+        _a.get = 127 /* GetKeyword */,
+        _a.if = 92 /* IfKeyword */,
+        _a.implements = 110 /* ImplementsKeyword */,
+        _a.import = 93 /* ImportKeyword */,
+        _a.in = 94 /* InKeyword */,
+        _a.infer = 128 /* InferKeyword */,
+        _a.instanceof = 95 /* InstanceOfKeyword */,
+        _a.interface = 111 /* InterfaceKeyword */,
+        _a.is = 129 /* IsKeyword */,
+        _a.keyof = 130 /* KeyOfKeyword */,
+        _a.let = 112 /* LetKeyword */,
+        _a.module = 131 /* ModuleKeyword */,
+        _a.namespace = 132 /* NamespaceKeyword */,
+        _a.never = 133 /* NeverKeyword */,
+        _a.new = 96 /* NewKeyword */,
+        _a.null = 97 /* NullKeyword */,
+        _a.number = 136 /* NumberKeyword */,
+        _a.object = 137 /* ObjectKeyword */,
+        _a.package = 113 /* PackageKeyword */,
+        _a.private = 114 /* PrivateKeyword */,
+        _a.protected = 115 /* ProtectedKeyword */,
+        _a.public = 116 /* PublicKeyword */,
+        _a.readonly = 134 /* ReadonlyKeyword */,
+        _a.require = 135 /* RequireKeyword */,
+        _a.global = 146 /* GlobalKeyword */,
+        _a.return = 98 /* ReturnKeyword */,
+        _a.set = 138 /* SetKeyword */,
+        _a.static = 117 /* StaticKeyword */,
+        _a.string = 139 /* StringKeyword */,
+        _a.super = 99 /* SuperKeyword */,
+        _a.switch = 100 /* SwitchKeyword */,
+        _a.symbol = 140 /* SymbolKeyword */,
+        _a.this = 101 /* ThisKeyword */,
+        _a.throw = 102 /* ThrowKeyword */,
+        _a.true = 103 /* TrueKeyword */,
+        _a.try = 104 /* TryKeyword */,
+        _a.type = 141 /* TypeKeyword */,
+        _a.typeof = 105 /* TypeOfKeyword */,
+        _a.undefined = 142 /* UndefinedKeyword */,
+        _a.unique = 143 /* UniqueKeyword */,
+        _a.unknown = 144 /* UnknownKeyword */,
+        _a.var = 106 /* VarKeyword */,
+        _a.void = 107 /* VoidKeyword */,
+        _a.while = 108 /* WhileKeyword */,
+        _a.with = 109 /* WithKeyword */,
+        _a.yield = 118 /* YieldKeyword */,
+        _a.async = 122 /* AsyncKeyword */,
+        _a.await = 123 /* AwaitKeyword */,
+        _a.of = 148 /* OfKeyword */,
         _a);
     var textToKeyword = ts.createMapFromTemplate(textToKeywordObj);
-    var textToToken = ts.createMapFromTemplate(__assign({}, textToKeywordObj, { "{": 18 /* OpenBraceToken */, "}": 19 /* CloseBraceToken */, "(": 20 /* OpenParenToken */, ")": 21 /* CloseParenToken */, "[": 22 /* OpenBracketToken */, "]": 23 /* CloseBracketToken */, ".": 24 /* DotToken */, "...": 25 /* DotDotDotToken */, ";": 26 /* SemicolonToken */, ",": 27 /* CommaToken */, "<": 28 /* LessThanToken */, ">": 30 /* GreaterThanToken */, "<=": 31 /* LessThanEqualsToken */, ">=": 32 /* GreaterThanEqualsToken */, "==": 33 /* EqualsEqualsToken */, "!=": 34 /* ExclamationEqualsToken */, "===": 35 /* EqualsEqualsEqualsToken */, "!==": 36 /* ExclamationEqualsEqualsToken */, "=>": 37 /* EqualsGreaterThanToken */, "+": 38 /* PlusToken */, "-": 39 /* MinusToken */, "**": 41 /* AsteriskAsteriskToken */, "*": 40 /* AsteriskToken */, "/": 42 /* SlashToken */, "%": 43 /* PercentToken */, "++": 44 /* PlusPlusToken */, "--": 45 /* MinusMinusToken */, "<<": 46 /* LessThanLessThanToken */, "</": 29 /* LessThanSlashToken */, ">>": 47 /* GreaterThanGreaterThanToken */, ">>>": 48 /* GreaterThanGreaterThanGreaterThanToken */, "&": 49 /* AmpersandToken */, "|": 50 /* BarToken */, "^": 51 /* CaretToken */, "!": 52 /* ExclamationToken */, "~": 53 /* TildeToken */, "&&": 54 /* AmpersandAmpersandToken */, "||": 55 /* BarBarToken */, "?": 56 /* QuestionToken */, ":": 57 /* ColonToken */, "=": 59 /* EqualsToken */, "+=": 60 /* PlusEqualsToken */, "-=": 61 /* MinusEqualsToken */, "*=": 62 /* AsteriskEqualsToken */, "**=": 63 /* AsteriskAsteriskEqualsToken */, "/=": 64 /* SlashEqualsToken */, "%=": 65 /* PercentEqualsToken */, "<<=": 66 /* LessThanLessThanEqualsToken */, ">>=": 67 /* GreaterThanGreaterThanEqualsToken */, ">>>=": 68 /* GreaterThanGreaterThanGreaterThanEqualsToken */, "&=": 69 /* AmpersandEqualsToken */, "|=": 70 /* BarEqualsToken */, "^=": 71 /* CaretEqualsToken */, "@": 58 /* AtToken */ }));
+    var textToToken = ts.createMapFromTemplate(__assign({}, textToKeywordObj, { "{": 18 /* OpenBraceToken */, "}": 19 /* CloseBraceToken */, "(": 20 /* OpenParenToken */, ")": 21 /* CloseParenToken */, "[": 22 /* OpenBracketToken */, "]": 23 /* CloseBracketToken */, ".": 24 /* DotToken */, "...": 25 /* DotDotDotToken */, ";": 26 /* SemicolonToken */, ",": 27 /* CommaToken */, "<": 28 /* LessThanToken */, ">": 30 /* GreaterThanToken */, "<=": 31 /* LessThanEqualsToken */, ">=": 32 /* GreaterThanEqualsToken */, "==": 33 /* EqualsEqualsToken */, "!=": 34 /* ExclamationEqualsToken */, "===": 35 /* EqualsEqualsEqualsToken */, "!==": 36 /* ExclamationEqualsEqualsToken */, "=>": 37 /* EqualsGreaterThanToken */, "+": 38 /* PlusToken */, "-": 39 /* MinusToken */, "**": 41 /* AsteriskAsteriskToken */, "*": 40 /* AsteriskToken */, "/": 42 /* SlashToken */, "%": 43 /* PercentToken */, "++": 44 /* PlusPlusToken */, "--": 45 /* MinusMinusToken */, "<<": 46 /* LessThanLessThanToken */, "</": 29 /* LessThanSlashToken */, ">>": 47 /* GreaterThanGreaterThanToken */, ">>>": 48 /* GreaterThanGreaterThanGreaterThanToken */, "&": 49 /* AmpersandToken */, "|": 50 /* BarToken */, "^": 51 /* CaretToken */, "!": 52 /* ExclamationToken */, "~": 53 /* TildeToken */, "&&": 54 /* AmpersandAmpersandToken */, "||": 55 /* BarBarToken */, "?": 56 /* QuestionToken */, ":": 57 /* ColonToken */, "=": 60 /* EqualsToken */, "+=": 61 /* PlusEqualsToken */, "-=": 62 /* MinusEqualsToken */, "*=": 63 /* AsteriskEqualsToken */, "**=": 64 /* AsteriskAsteriskEqualsToken */, "/=": 65 /* SlashEqualsToken */, "%=": 66 /* PercentEqualsToken */, "<<=": 67 /* LessThanLessThanEqualsToken */, ">>=": 68 /* GreaterThanGreaterThanEqualsToken */, ">>>=": 69 /* GreaterThanGreaterThanGreaterThanEqualsToken */, "&=": 70 /* AmpersandEqualsToken */, "|=": 71 /* BarEqualsToken */, "^=": 72 /* CaretEqualsToken */, "@": 58 /* AtToken */, "`": 59 /* BacktickToken */ }));
     /*
         As per ECMAScript Language Specification 3th Edition, Section 7.6: Identifiers
         IdentifierStart ::
@@ -7081,8 +7301,8 @@ var ts;
             getTokenValue: function () { return tokenValue; },
             hasExtendedUnicodeEscape: function () { return (tokenFlags & 8 /* ExtendedUnicodeEscape */) !== 0; },
             hasPrecedingLineBreak: function () { return (tokenFlags & 1 /* PrecedingLineBreak */) !== 0; },
-            isIdentifier: function () { return token === 72 /* Identifier */ || token > 108 /* LastReservedWord */; },
-            isReservedWord: function () { return token >= 73 /* FirstReservedWord */ && token <= 108 /* LastReservedWord */; },
+            isIdentifier: function () { return token === 73 /* Identifier */ || token > 109 /* LastReservedWord */; },
+            isReservedWord: function () { return token >= 74 /* FirstReservedWord */ && token <= 109 /* LastReservedWord */; },
             isUnterminated: function () { return (tokenFlags & 4 /* Unterminated */) !== 0; },
             getTokenFlags: function () { return tokenFlags; },
             reScanGreaterToken: reScanGreaterToken,
@@ -7093,7 +7313,7 @@ var ts;
             reScanJsxToken: reScanJsxToken,
             reScanLessThanToken: reScanLessThanToken,
             scanJsxToken: scanJsxToken,
-            scanJSDocToken: scanJSDocToken,
+            scanJsDocToken: scanJsDocToken,
             scan: scan,
             getText: getText,
             setText: setText,
@@ -7533,7 +7753,7 @@ var ts;
                     }
                 }
             }
-            return token = 72 /* Identifier */;
+            return token = 73 /* Identifier */;
         }
         function scanBinaryOrOctalDigits(base) {
             var value = "";
@@ -7682,7 +7902,7 @@ var ts;
                         return token = scanTemplateAndSetTokenValue();
                     case 37 /* percent */:
                         if (text.charCodeAt(pos + 1) === 61 /* equals */) {
-                            return pos += 2, token = 65 /* PercentEqualsToken */;
+                            return pos += 2, token = 66 /* PercentEqualsToken */;
                         }
                         pos++;
                         return token = 43 /* PercentToken */;
@@ -7691,7 +7911,7 @@ var ts;
                             return pos += 2, token = 54 /* AmpersandAmpersandToken */;
                         }
                         if (text.charCodeAt(pos + 1) === 61 /* equals */) {
-                            return pos += 2, token = 69 /* AmpersandEqualsToken */;
+                            return pos += 2, token = 70 /* AmpersandEqualsToken */;
                         }
                         pos++;
                         return token = 49 /* AmpersandToken */;
@@ -7703,11 +7923,11 @@ var ts;
                         return token = 21 /* CloseParenToken */;
                     case 42 /* asterisk */:
                         if (text.charCodeAt(pos + 1) === 61 /* equals */) {
-                            return pos += 2, token = 62 /* AsteriskEqualsToken */;
+                            return pos += 2, token = 63 /* AsteriskEqualsToken */;
                         }
                         if (text.charCodeAt(pos + 1) === 42 /* asterisk */) {
                             if (text.charCodeAt(pos + 2) === 61 /* equals */) {
-                                return pos += 3, token = 63 /* AsteriskAsteriskEqualsToken */;
+                                return pos += 3, token = 64 /* AsteriskAsteriskEqualsToken */;
                             }
                             return pos += 2, token = 41 /* AsteriskAsteriskToken */;
                         }
@@ -7723,7 +7943,7 @@ var ts;
                             return pos += 2, token = 44 /* PlusPlusToken */;
                         }
                         if (text.charCodeAt(pos + 1) === 61 /* equals */) {
-                            return pos += 2, token = 60 /* PlusEqualsToken */;
+                            return pos += 2, token = 61 /* PlusEqualsToken */;
                         }
                         pos++;
                         return token = 38 /* PlusToken */;
@@ -7735,7 +7955,7 @@ var ts;
                             return pos += 2, token = 45 /* MinusMinusToken */;
                         }
                         if (text.charCodeAt(pos + 1) === 61 /* equals */) {
-                            return pos += 2, token = 61 /* MinusEqualsToken */;
+                            return pos += 2, token = 62 /* MinusEqualsToken */;
                         }
                         pos++;
                         return token = 39 /* MinusToken */;
@@ -7799,7 +8019,7 @@ var ts;
                             }
                         }
                         if (text.charCodeAt(pos + 1) === 61 /* equals */) {
-                            return pos += 2, token = 64 /* SlashEqualsToken */;
+                            return pos += 2, token = 65 /* SlashEqualsToken */;
                         }
                         pos++;
                         return token = 42 /* SlashToken */;
@@ -7876,7 +8096,7 @@ var ts;
                         }
                         if (text.charCodeAt(pos + 1) === 60 /* lessThan */) {
                             if (text.charCodeAt(pos + 2) === 61 /* equals */) {
-                                return pos += 3, token = 66 /* LessThanLessThanEqualsToken */;
+                                return pos += 3, token = 67 /* LessThanLessThanEqualsToken */;
                             }
                             return pos += 2, token = 46 /* LessThanLessThanToken */;
                         }
@@ -7910,7 +8130,7 @@ var ts;
                             return pos += 2, token = 37 /* EqualsGreaterThanToken */;
                         }
                         pos++;
-                        return token = 59 /* EqualsToken */;
+                        return token = 60 /* EqualsToken */;
                     case 62 /* greaterThan */:
                         if (isConflictMarkerTrivia(text, pos)) {
                             pos = scanConflictMarkerTrivia(text, pos, error);
@@ -7934,7 +8154,7 @@ var ts;
                         return token = 23 /* CloseBracketToken */;
                     case 94 /* caret */:
                         if (text.charCodeAt(pos + 1) === 61 /* equals */) {
-                            return pos += 2, token = 71 /* CaretEqualsToken */;
+                            return pos += 2, token = 72 /* CaretEqualsToken */;
                         }
                         pos++;
                         return token = 51 /* CaretToken */;
@@ -7955,7 +8175,7 @@ var ts;
                             return pos += 2, token = 55 /* BarBarToken */;
                         }
                         if (text.charCodeAt(pos + 1) === 61 /* equals */) {
-                            return pos += 2, token = 70 /* BarEqualsToken */;
+                            return pos += 2, token = 71 /* BarEqualsToken */;
                         }
                         pos++;
                         return token = 50 /* BarToken */;
@@ -8009,12 +8229,12 @@ var ts;
                 if (text.charCodeAt(pos) === 62 /* greaterThan */) {
                     if (text.charCodeAt(pos + 1) === 62 /* greaterThan */) {
                         if (text.charCodeAt(pos + 2) === 61 /* equals */) {
-                            return pos += 3, token = 68 /* GreaterThanGreaterThanGreaterThanEqualsToken */;
+                            return pos += 3, token = 69 /* GreaterThanGreaterThanGreaterThanEqualsToken */;
                         }
                         return pos += 2, token = 48 /* GreaterThanGreaterThanGreaterThanToken */;
                     }
                     if (text.charCodeAt(pos + 1) === 61 /* equals */) {
-                        return pos += 2, token = 67 /* GreaterThanGreaterThanEqualsToken */;
+                        return pos += 2, token = 68 /* GreaterThanGreaterThanEqualsToken */;
                     }
                     pos++;
                     return token = 47 /* GreaterThanGreaterThanToken */;
@@ -8027,7 +8247,7 @@ var ts;
             return token;
         }
         function reScanSlashToken() {
-            if (token === 42 /* SlashToken */ || token === 64 /* SlashEqualsToken */) {
+            if (token === 42 /* SlashToken */ || token === 65 /* SlashEqualsToken */) {
                 var p = tokenPos + 1;
                 var inEscape = false;
                 var inCharacterClass = false;
@@ -8143,6 +8363,7 @@ var ts;
                 }
                 pos++;
             }
+            tokenValue = text.substring(startPos, pos);
             return firstNonWhitespace === -1 ? 12 /* JsxTextAllWhiteSpaces */ : 11 /* JsxText */;
         }
         // Scans a JSX identifier; these differ from normal identifiers in that
@@ -8175,7 +8396,7 @@ var ts;
                     return scan();
             }
         }
-        function scanJSDocToken() {
+        function scanJsDocToken() {
             startPos = tokenPos = pos;
             tokenFlags = 0;
             if (pos >= end) {
@@ -8210,22 +8431,19 @@ var ts;
                     return token = 23 /* CloseBracketToken */;
                 case 60 /* lessThan */:
                     return token = 28 /* LessThanToken */;
+                case 62 /* greaterThan */:
+                    return token = 30 /* GreaterThanToken */;
                 case 61 /* equals */:
-                    return token = 59 /* EqualsToken */;
+                    return token = 60 /* EqualsToken */;
                 case 44 /* comma */:
                     return token = 27 /* CommaToken */;
                 case 46 /* dot */:
                     return token = 24 /* DotToken */;
                 case 96 /* backtick */:
-                    while (pos < end && text.charCodeAt(pos) !== 96 /* backtick */) {
-                        pos++;
-                    }
-                    tokenValue = text.substring(tokenPos + 1, pos);
-                    pos++;
-                    return token = 14 /* NoSubstitutionTemplateLiteral */;
+                    return token = 59 /* BacktickToken */;
             }
-            if (isIdentifierStart(ch, 7 /* Latest */)) {
-                while (isIdentifierPart(text.charCodeAt(pos), 7 /* Latest */) && pos < end) {
+            if (isIdentifierStart(ch, 99 /* Latest */)) {
+                while (isIdentifierPart(text.charCodeAt(pos), 99 /* Latest */) && pos < end) {
                     pos++;
                 }
                 tokenValue = text.substring(tokenPos, pos);
@@ -8410,11 +8628,16 @@ var ts;
     }
     ts.toPath = toPath;
     function changesAffectModuleResolution(oldOptions, newOptions) {
-        return oldOptions.configFilePath !== newOptions.configFilePath || ts.moduleResolutionOptionDeclarations.some(function (o) {
+        return oldOptions.configFilePath !== newOptions.configFilePath ||
+            optionsHaveModuleResolutionChanges(oldOptions, newOptions);
+    }
+    ts.changesAffectModuleResolution = changesAffectModuleResolution;
+    function optionsHaveModuleResolutionChanges(oldOptions, newOptions) {
+        return ts.moduleResolutionOptionDeclarations.some(function (o) {
             return !ts.isJsonEqual(ts.getCompilerOptionValue(oldOptions, o), ts.getCompilerOptionValue(newOptions, o));
         });
     }
-    ts.changesAffectModuleResolution = changesAffectModuleResolution;
+    ts.optionsHaveModuleResolutionChanges = optionsHaveModuleResolutionChanges;
     function findAncestor(node, callback) {
         while (node) {
             var result = callback(node);
@@ -8443,10 +8666,9 @@ var ts;
     }
     ts.forEachAncestor = forEachAncestor;
     function forEachEntry(map, callback) {
-        var _a;
         var iterator = map.entries();
-        for (var _b = iterator.next(), pair = _b.value, done = _b.done; !done; _a = iterator.next(), pair = _a.value, done = _a.done, _a) {
-            var key = pair[0], value = pair[1];
+        for (var iterResult = iterator.next(); !iterResult.done; iterResult = iterator.next()) {
+            var _a = iterResult.value, key = _a[0], value = _a[1];
             var result = callback(value, key);
             if (result) {
                 return result;
@@ -8456,10 +8678,9 @@ var ts;
     }
     ts.forEachEntry = forEachEntry;
     function forEachKey(map, callback) {
-        var _a;
         var iterator = map.keys();
-        for (var _b = iterator.next(), key = _b.value, done = _b.done; !done; _a = iterator.next(), key = _a.value, done = _a.done, _a) {
-            var result = callback(key);
+        for (var iterResult = iterator.next(); !iterResult.done; iterResult = iterator.next()) {
+            var result = callback(iterResult.value);
             if (result) {
                 return result;
             }
@@ -8583,7 +8804,7 @@ var ts;
         }
     }
     function getSourceFileOfNode(node) {
-        while (node && node.kind !== 284 /* SourceFile */) {
+        while (node && node.kind !== 285 /* SourceFile */) {
             node = node.parent;
         }
         return node;
@@ -8591,11 +8812,11 @@ var ts;
     ts.getSourceFileOfNode = getSourceFileOfNode;
     function isStatementWithLocals(node) {
         switch (node.kind) {
-            case 218 /* Block */:
-            case 246 /* CaseBlock */:
-            case 225 /* ForStatement */:
-            case 226 /* ForInStatement */:
-            case 227 /* ForOfStatement */:
+            case 219 /* Block */:
+            case 247 /* CaseBlock */:
+            case 226 /* ForStatement */:
+            case 227 /* ForInStatement */:
+            case 228 /* ForOfStatement */:
                 return true;
         }
         return false;
@@ -8763,7 +8984,7 @@ var ts;
         // the syntax list itself considers them as normal trivia. Therefore if we simply skip
         // trivia for the list, we may have skipped the JSDocComment as well. So we should process its
         // first child to determine the actual position of its first token.
-        if (node.kind === 311 /* SyntaxList */ && node._children.length > 0) {
+        if (node.kind === 313 /* SyntaxList */ && node._children.length > 0) {
             return getTokenPosOfNode(node._children[0], sourceFile, includeJsDoc);
         }
         return ts.skipTrivia((sourceFile || getSourceFileOfNode(node)).text, node.pos);
@@ -8782,7 +9003,7 @@ var ts;
     }
     ts.getSourceTextOfNodeFromSourceFile = getSourceTextOfNodeFromSourceFile;
     function isJSDocTypeExpressionOrChild(node) {
-        return node.kind === 288 /* JSDocTypeExpression */ || (node.parent && isJSDocTypeExpressionOrChild(node.parent));
+        return node.kind === 289 /* JSDocTypeExpression */ || (node.parent && isJSDocTypeExpressionOrChild(node.parent));
     }
     function getTextOfNodeFromSourceText(sourceText, node, includeTrivia) {
         if (includeTrivia === void 0) { includeTrivia = false; }
@@ -8874,7 +9095,7 @@ var ts;
     ts.isBlockOrCatchScoped = isBlockOrCatchScoped;
     function isCatchClauseVariableDeclarationOrBindingElement(declaration) {
         var node = getRootDeclaration(declaration);
-        return node.kind === 237 /* VariableDeclaration */ && node.parent.kind === 274 /* CatchClause */;
+        return node.kind === 238 /* VariableDeclaration */ && node.parent.kind === 275 /* CatchClause */;
     }
     ts.isCatchClauseVariableDeclarationOrBindingElement = isCatchClauseVariableDeclarationOrBindingElement;
     function isAmbientModule(node) {
@@ -8906,11 +9127,11 @@ var ts;
     ts.isShorthandAmbientModuleSymbol = isShorthandAmbientModuleSymbol;
     function isShorthandAmbientModule(node) {
         // The only kind of module that can be missing a body is a shorthand ambient module.
-        return node && node.kind === 244 /* ModuleDeclaration */ && (!node.body);
+        return node && node.kind === 245 /* ModuleDeclaration */ && (!node.body);
     }
     function isBlockScopedContainerTopLevel(node) {
-        return node.kind === 284 /* SourceFile */ ||
-            node.kind === 244 /* ModuleDeclaration */ ||
+        return node.kind === 285 /* SourceFile */ ||
+            node.kind === 245 /* ModuleDeclaration */ ||
             ts.isFunctionLike(node);
     }
     ts.isBlockScopedContainerTopLevel = isBlockScopedContainerTopLevel;
@@ -8927,9 +9148,9 @@ var ts;
         // - defined in the top level scope and source file is an external module
         // - defined inside ambient module declaration located in the top level scope and source file not an external module
         switch (node.parent.kind) {
-            case 284 /* SourceFile */:
+            case 285 /* SourceFile */:
                 return ts.isExternalModule(node.parent);
-            case 245 /* ModuleBlock */:
+            case 246 /* ModuleBlock */:
                 return isAmbientModule(node.parent.parent) && ts.isSourceFile(node.parent.parent.parent) && !ts.isExternalModule(node.parent.parent.parent);
         }
         return false;
@@ -8945,22 +9166,22 @@ var ts;
     ts.isEffectiveExternalModule = isEffectiveExternalModule;
     function isBlockScope(node, parentNode) {
         switch (node.kind) {
-            case 284 /* SourceFile */:
-            case 246 /* CaseBlock */:
-            case 274 /* CatchClause */:
-            case 244 /* ModuleDeclaration */:
-            case 225 /* ForStatement */:
-            case 226 /* ForInStatement */:
-            case 227 /* ForOfStatement */:
-            case 157 /* Constructor */:
-            case 156 /* MethodDeclaration */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
-            case 239 /* FunctionDeclaration */:
-            case 196 /* FunctionExpression */:
-            case 197 /* ArrowFunction */:
+            case 285 /* SourceFile */:
+            case 247 /* CaseBlock */:
+            case 275 /* CatchClause */:
+            case 245 /* ModuleDeclaration */:
+            case 226 /* ForStatement */:
+            case 227 /* ForInStatement */:
+            case 228 /* ForOfStatement */:
+            case 158 /* Constructor */:
+            case 157 /* MethodDeclaration */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
+            case 240 /* FunctionDeclaration */:
+            case 197 /* FunctionExpression */:
+            case 198 /* ArrowFunction */:
                 return true;
-            case 218 /* Block */:
+            case 219 /* Block */:
                 // function block is not considered block-scope container
                 // see comment in binder.ts: bind(...), case for SyntaxKind.Block
                 return !ts.isFunctionLike(parentNode);
@@ -8970,9 +9191,9 @@ var ts;
     ts.isBlockScope = isBlockScope;
     function isDeclarationWithTypeParameters(node) {
         switch (node.kind) {
-            case 302 /* JSDocCallbackTag */:
-            case 309 /* JSDocTypedefTag */:
-            case 298 /* JSDocSignature */:
+            case 304 /* JSDocCallbackTag */:
+            case 311 /* JSDocTypedefTag */:
+            case 299 /* JSDocSignature */:
                 return true;
             default:
                 ts.assertType(node);
@@ -8982,25 +9203,25 @@ var ts;
     ts.isDeclarationWithTypeParameters = isDeclarationWithTypeParameters;
     function isDeclarationWithTypeParameterChildren(node) {
         switch (node.kind) {
-            case 160 /* CallSignature */:
-            case 161 /* ConstructSignature */:
-            case 155 /* MethodSignature */:
-            case 162 /* IndexSignature */:
-            case 165 /* FunctionType */:
-            case 166 /* ConstructorType */:
-            case 294 /* JSDocFunctionType */:
-            case 240 /* ClassDeclaration */:
-            case 209 /* ClassExpression */:
-            case 241 /* InterfaceDeclaration */:
-            case 242 /* TypeAliasDeclaration */:
-            case 308 /* JSDocTemplateTag */:
-            case 239 /* FunctionDeclaration */:
-            case 156 /* MethodDeclaration */:
-            case 157 /* Constructor */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
-            case 196 /* FunctionExpression */:
-            case 197 /* ArrowFunction */:
+            case 161 /* CallSignature */:
+            case 162 /* ConstructSignature */:
+            case 156 /* MethodSignature */:
+            case 163 /* IndexSignature */:
+            case 166 /* FunctionType */:
+            case 167 /* ConstructorType */:
+            case 295 /* JSDocFunctionType */:
+            case 241 /* ClassDeclaration */:
+            case 210 /* ClassExpression */:
+            case 242 /* InterfaceDeclaration */:
+            case 243 /* TypeAliasDeclaration */:
+            case 310 /* JSDocTemplateTag */:
+            case 240 /* FunctionDeclaration */:
+            case 157 /* MethodDeclaration */:
+            case 158 /* Constructor */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
+            case 197 /* FunctionExpression */:
+            case 198 /* ArrowFunction */:
                 return true;
             default:
                 ts.assertType(node);
@@ -9010,8 +9231,8 @@ var ts;
     ts.isDeclarationWithTypeParameterChildren = isDeclarationWithTypeParameterChildren;
     function isAnyImportSyntax(node) {
         switch (node.kind) {
-            case 249 /* ImportDeclaration */:
-            case 248 /* ImportEqualsDeclaration */:
+            case 250 /* ImportDeclaration */:
+            case 249 /* ImportEqualsDeclaration */:
                 return true;
             default:
                 return false;
@@ -9020,15 +9241,15 @@ var ts;
     ts.isAnyImportSyntax = isAnyImportSyntax;
     function isLateVisibilityPaintedStatement(node) {
         switch (node.kind) {
-            case 249 /* ImportDeclaration */:
-            case 248 /* ImportEqualsDeclaration */:
-            case 219 /* VariableStatement */:
-            case 240 /* ClassDeclaration */:
-            case 239 /* FunctionDeclaration */:
-            case 244 /* ModuleDeclaration */:
-            case 242 /* TypeAliasDeclaration */:
-            case 241 /* InterfaceDeclaration */:
-            case 243 /* EnumDeclaration */:
+            case 250 /* ImportDeclaration */:
+            case 249 /* ImportEqualsDeclaration */:
+            case 220 /* VariableStatement */:
+            case 241 /* ClassDeclaration */:
+            case 240 /* FunctionDeclaration */:
+            case 245 /* ModuleDeclaration */:
+            case 243 /* TypeAliasDeclaration */:
+            case 242 /* InterfaceDeclaration */:
+            case 244 /* EnumDeclaration */:
                 return true;
             default:
                 return false;
@@ -9058,13 +9279,13 @@ var ts;
     ts.getNameFromIndexInfo = getNameFromIndexInfo;
     function getTextOfPropertyName(name) {
         switch (name.kind) {
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 return name.escapedText;
             case 10 /* StringLiteral */:
             case 8 /* NumericLiteral */:
             case 14 /* NoSubstitutionTemplateLiteral */:
                 return ts.escapeLeadingUnderscores(name.text);
-            case 149 /* ComputedPropertyName */:
+            case 150 /* ComputedPropertyName */:
                 if (isStringOrNumericLiteralLike(name.expression))
                     return ts.escapeLeadingUnderscores(name.expression.text);
                 return ts.Debug.fail("Text of property name cannot be read from non-literal-valued ComputedPropertyNames");
@@ -9075,11 +9296,11 @@ var ts;
     ts.getTextOfPropertyName = getTextOfPropertyName;
     function entityNameToString(name) {
         switch (name.kind) {
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 return getFullWidth(name) === 0 ? ts.idText(name) : getTextOfNode(name);
-            case 148 /* QualifiedName */:
+            case 149 /* QualifiedName */:
                 return entityNameToString(name.left) + "." + entityNameToString(name.right);
-            case 189 /* PropertyAccessExpression */:
+            case 190 /* PropertyAccessExpression */:
                 return entityNameToString(name.expression) + "." + entityNameToString(name.name);
             default:
                 throw ts.Debug.assertNever(name);
@@ -9124,7 +9345,7 @@ var ts;
     ts.getSpanOfTokenAtPosition = getSpanOfTokenAtPosition;
     function getErrorSpanForArrowFunction(sourceFile, node) {
         var pos = ts.skipTrivia(sourceFile.text, node.pos);
-        if (node.body && node.body.kind === 218 /* Block */) {
+        if (node.body && node.body.kind === 219 /* Block */) {
             var startLine = ts.getLineAndCharacterOfPosition(sourceFile, node.body.pos).line;
             var endLine = ts.getLineAndCharacterOfPosition(sourceFile, node.body.end).line;
             if (startLine < endLine) {
@@ -9138,7 +9359,7 @@ var ts;
     function getErrorSpanForNode(sourceFile, node) {
         var errorNode = node;
         switch (node.kind) {
-            case 284 /* SourceFile */:
+            case 285 /* SourceFile */:
                 var pos_1 = ts.skipTrivia(sourceFile.text, 0, /*stopAfterLineBreak*/ false);
                 if (pos_1 === sourceFile.text.length) {
                     // file is empty - return span for the beginning of the file
@@ -9147,25 +9368,25 @@ var ts;
                 return getSpanOfTokenAtPosition(sourceFile, pos_1);
             // This list is a work in progress. Add missing node kinds to improve their error
             // spans.
-            case 237 /* VariableDeclaration */:
-            case 186 /* BindingElement */:
-            case 240 /* ClassDeclaration */:
-            case 209 /* ClassExpression */:
-            case 241 /* InterfaceDeclaration */:
-            case 244 /* ModuleDeclaration */:
-            case 243 /* EnumDeclaration */:
-            case 278 /* EnumMember */:
-            case 239 /* FunctionDeclaration */:
-            case 196 /* FunctionExpression */:
-            case 156 /* MethodDeclaration */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
-            case 242 /* TypeAliasDeclaration */:
-            case 154 /* PropertyDeclaration */:
-            case 153 /* PropertySignature */:
+            case 238 /* VariableDeclaration */:
+            case 187 /* BindingElement */:
+            case 241 /* ClassDeclaration */:
+            case 210 /* ClassExpression */:
+            case 242 /* InterfaceDeclaration */:
+            case 245 /* ModuleDeclaration */:
+            case 244 /* EnumDeclaration */:
+            case 279 /* EnumMember */:
+            case 240 /* FunctionDeclaration */:
+            case 197 /* FunctionExpression */:
+            case 157 /* MethodDeclaration */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
+            case 243 /* TypeAliasDeclaration */:
+            case 155 /* PropertyDeclaration */:
+            case 154 /* PropertySignature */:
                 errorNode = node.name;
                 break;
-            case 197 /* ArrowFunction */:
+            case 198 /* ArrowFunction */:
                 return getErrorSpanForArrowFunction(sourceFile, node);
         }
         if (errorNode === undefined) {
@@ -9214,11 +9435,11 @@ var ts;
     }
     ts.isLet = isLet;
     function isSuperCall(n) {
-        return n.kind === 191 /* CallExpression */ && n.expression.kind === 98 /* SuperKeyword */;
+        return n.kind === 192 /* CallExpression */ && n.expression.kind === 99 /* SuperKeyword */;
     }
     ts.isSuperCall = isSuperCall;
     function isImportCall(n) {
-        return n.kind === 191 /* CallExpression */ && n.expression.kind === 92 /* ImportKeyword */;
+        return n.kind === 192 /* CallExpression */ && n.expression.kind === 93 /* ImportKeyword */;
     }
     ts.isImportCall = isImportCall;
     function isLiteralImportTypeNode(n) {
@@ -9226,7 +9447,7 @@ var ts;
     }
     ts.isLiteralImportTypeNode = isLiteralImportTypeNode;
     function isPrologueDirective(node) {
-        return node.kind === 221 /* ExpressionStatement */
+        return node.kind === 222 /* ExpressionStatement */
             && node.expression.kind === 10 /* StringLiteral */;
     }
     ts.isPrologueDirective = isPrologueDirective;
@@ -9235,11 +9456,11 @@ var ts;
     }
     ts.getLeadingCommentRangesOfNode = getLeadingCommentRangesOfNode;
     function getJSDocCommentRanges(node, text) {
-        var commentRanges = (node.kind === 151 /* Parameter */ ||
-            node.kind === 150 /* TypeParameter */ ||
-            node.kind === 196 /* FunctionExpression */ ||
-            node.kind === 197 /* ArrowFunction */ ||
-            node.kind === 195 /* ParenthesizedExpression */) ?
+        var commentRanges = (node.kind === 152 /* Parameter */ ||
+            node.kind === 151 /* TypeParameter */ ||
+            node.kind === 197 /* FunctionExpression */ ||
+            node.kind === 198 /* ArrowFunction */ ||
+            node.kind === 196 /* ParenthesizedExpression */) ?
             ts.concatenate(ts.getTrailingCommentRanges(text, node.pos), ts.getLeadingCommentRanges(text, node.pos)) :
             ts.getLeadingCommentRanges(text, node.pos);
         // True if the comment starts with '/**' but not if it is '/**/'
@@ -9255,48 +9476,48 @@ var ts;
     ts.fullTripleSlashAMDReferencePathRegEx = /^(\/\/\/\s*<amd-dependency\s+path\s*=\s*)('|")(.+?)\2.*?\/>/;
     var defaultLibReferenceRegEx = /^(\/\/\/\s*<reference\s+no-default-lib\s*=\s*)('|")(.+?)\2\s*\/>/;
     function isPartOfTypeNode(node) {
-        if (163 /* FirstTypeNode */ <= node.kind && node.kind <= 183 /* LastTypeNode */) {
+        if (164 /* FirstTypeNode */ <= node.kind && node.kind <= 184 /* LastTypeNode */) {
             return true;
         }
         switch (node.kind) {
-            case 120 /* AnyKeyword */:
-            case 143 /* UnknownKeyword */:
-            case 135 /* NumberKeyword */:
-            case 146 /* BigIntKeyword */:
-            case 138 /* StringKeyword */:
-            case 123 /* BooleanKeyword */:
-            case 139 /* SymbolKeyword */:
-            case 136 /* ObjectKeyword */:
-            case 141 /* UndefinedKeyword */:
-            case 132 /* NeverKeyword */:
+            case 121 /* AnyKeyword */:
+            case 144 /* UnknownKeyword */:
+            case 136 /* NumberKeyword */:
+            case 147 /* BigIntKeyword */:
+            case 139 /* StringKeyword */:
+            case 124 /* BooleanKeyword */:
+            case 140 /* SymbolKeyword */:
+            case 137 /* ObjectKeyword */:
+            case 142 /* UndefinedKeyword */:
+            case 133 /* NeverKeyword */:
                 return true;
-            case 106 /* VoidKeyword */:
-                return node.parent.kind !== 200 /* VoidExpression */;
-            case 211 /* ExpressionWithTypeArguments */:
+            case 107 /* VoidKeyword */:
+                return node.parent.kind !== 201 /* VoidExpression */;
+            case 212 /* ExpressionWithTypeArguments */:
                 return !isExpressionWithTypeArgumentsInClassExtendsClause(node);
-            case 150 /* TypeParameter */:
-                return node.parent.kind === 181 /* MappedType */ || node.parent.kind === 176 /* InferType */;
+            case 151 /* TypeParameter */:
+                return node.parent.kind === 182 /* MappedType */ || node.parent.kind === 177 /* InferType */;
             // Identifiers and qualified names may be type nodes, depending on their context. Climb
             // above them to find the lowest container
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 // If the identifier is the RHS of a qualified name, then it's a type iff its parent is.
-                if (node.parent.kind === 148 /* QualifiedName */ && node.parent.right === node) {
+                if (node.parent.kind === 149 /* QualifiedName */ && node.parent.right === node) {
                     node = node.parent;
                 }
-                else if (node.parent.kind === 189 /* PropertyAccessExpression */ && node.parent.name === node) {
+                else if (node.parent.kind === 190 /* PropertyAccessExpression */ && node.parent.name === node) {
                     node = node.parent;
                 }
                 // At this point, node is either a qualified name or an identifier
-                ts.Debug.assert(node.kind === 72 /* Identifier */ || node.kind === 148 /* QualifiedName */ || node.kind === 189 /* PropertyAccessExpression */, "'node' was expected to be a qualified name, identifier or property access in 'isPartOfTypeNode'.");
+                ts.Debug.assert(node.kind === 73 /* Identifier */ || node.kind === 149 /* QualifiedName */ || node.kind === 190 /* PropertyAccessExpression */, "'node' was expected to be a qualified name, identifier or property access in 'isPartOfTypeNode'.");
             // falls through
-            case 148 /* QualifiedName */:
-            case 189 /* PropertyAccessExpression */:
-            case 100 /* ThisKeyword */: {
+            case 149 /* QualifiedName */:
+            case 190 /* PropertyAccessExpression */:
+            case 101 /* ThisKeyword */: {
                 var parent = node.parent;
-                if (parent.kind === 167 /* TypeQuery */) {
+                if (parent.kind === 168 /* TypeQuery */) {
                     return false;
                 }
-                if (parent.kind === 183 /* ImportType */) {
+                if (parent.kind === 184 /* ImportType */) {
                     return !parent.isTypeOf;
                 }
                 // Do not recursively call isPartOfTypeNode on the parent. In the example:
@@ -9305,40 +9526,40 @@ var ts;
                 //
                 // Calling isPartOfTypeNode would consider the qualified name A.B a type node.
                 // Only C and A.B.C are type nodes.
-                if (163 /* FirstTypeNode */ <= parent.kind && parent.kind <= 183 /* LastTypeNode */) {
+                if (164 /* FirstTypeNode */ <= parent.kind && parent.kind <= 184 /* LastTypeNode */) {
                     return true;
                 }
                 switch (parent.kind) {
-                    case 211 /* ExpressionWithTypeArguments */:
+                    case 212 /* ExpressionWithTypeArguments */:
                         return !isExpressionWithTypeArgumentsInClassExtendsClause(parent);
-                    case 150 /* TypeParameter */:
+                    case 151 /* TypeParameter */:
                         return node === parent.constraint;
-                    case 308 /* JSDocTemplateTag */:
+                    case 310 /* JSDocTemplateTag */:
                         return node === parent.constraint;
-                    case 154 /* PropertyDeclaration */:
-                    case 153 /* PropertySignature */:
-                    case 151 /* Parameter */:
-                    case 237 /* VariableDeclaration */:
+                    case 155 /* PropertyDeclaration */:
+                    case 154 /* PropertySignature */:
+                    case 152 /* Parameter */:
+                    case 238 /* VariableDeclaration */:
                         return node === parent.type;
-                    case 239 /* FunctionDeclaration */:
-                    case 196 /* FunctionExpression */:
-                    case 197 /* ArrowFunction */:
-                    case 157 /* Constructor */:
-                    case 156 /* MethodDeclaration */:
-                    case 155 /* MethodSignature */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
+                    case 240 /* FunctionDeclaration */:
+                    case 197 /* FunctionExpression */:
+                    case 198 /* ArrowFunction */:
+                    case 158 /* Constructor */:
+                    case 157 /* MethodDeclaration */:
+                    case 156 /* MethodSignature */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
                         return node === parent.type;
-                    case 160 /* CallSignature */:
-                    case 161 /* ConstructSignature */:
-                    case 162 /* IndexSignature */:
+                    case 161 /* CallSignature */:
+                    case 162 /* ConstructSignature */:
+                    case 163 /* IndexSignature */:
                         return node === parent.type;
-                    case 194 /* TypeAssertionExpression */:
+                    case 195 /* TypeAssertionExpression */:
                         return node === parent.type;
-                    case 191 /* CallExpression */:
-                    case 192 /* NewExpression */:
+                    case 192 /* CallExpression */:
+                    case 193 /* NewExpression */:
                         return ts.contains(parent.typeArguments, node);
-                    case 193 /* TaggedTemplateExpression */:
+                    case 194 /* TaggedTemplateExpression */:
                         // TODO (drosen): TaggedTemplateExpressions may eventually support type arguments.
                         return false;
                 }
@@ -9363,23 +9584,23 @@ var ts;
         return traverse(body);
         function traverse(node) {
             switch (node.kind) {
-                case 230 /* ReturnStatement */:
+                case 231 /* ReturnStatement */:
                     return visitor(node);
-                case 246 /* CaseBlock */:
-                case 218 /* Block */:
-                case 222 /* IfStatement */:
-                case 223 /* DoStatement */:
-                case 224 /* WhileStatement */:
-                case 225 /* ForStatement */:
-                case 226 /* ForInStatement */:
-                case 227 /* ForOfStatement */:
-                case 231 /* WithStatement */:
-                case 232 /* SwitchStatement */:
-                case 271 /* CaseClause */:
-                case 272 /* DefaultClause */:
-                case 233 /* LabeledStatement */:
-                case 235 /* TryStatement */:
-                case 274 /* CatchClause */:
+                case 247 /* CaseBlock */:
+                case 219 /* Block */:
+                case 223 /* IfStatement */:
+                case 224 /* DoStatement */:
+                case 225 /* WhileStatement */:
+                case 226 /* ForStatement */:
+                case 227 /* ForInStatement */:
+                case 228 /* ForOfStatement */:
+                case 232 /* WithStatement */:
+                case 233 /* SwitchStatement */:
+                case 272 /* CaseClause */:
+                case 273 /* DefaultClause */:
+                case 234 /* LabeledStatement */:
+                case 236 /* TryStatement */:
+                case 275 /* CatchClause */:
                     return ts.forEachChild(node, traverse);
             }
         }
@@ -9389,26 +9610,26 @@ var ts;
         return traverse(body);
         function traverse(node) {
             switch (node.kind) {
-                case 207 /* YieldExpression */:
+                case 208 /* YieldExpression */:
                     visitor(node);
                     var operand = node.expression;
                     if (operand) {
                         traverse(operand);
                     }
                     return;
-                case 243 /* EnumDeclaration */:
-                case 241 /* InterfaceDeclaration */:
-                case 244 /* ModuleDeclaration */:
-                case 242 /* TypeAliasDeclaration */:
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
+                case 244 /* EnumDeclaration */:
+                case 242 /* InterfaceDeclaration */:
+                case 245 /* ModuleDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
                     // These are not allowed inside a generator now, but eventually they may be allowed
                     // as local types. Regardless, any yield statements contained within them should be
                     // skipped in this traversal.
                     return;
                 default:
                     if (ts.isFunctionLike(node)) {
-                        if (node.name && node.name.kind === 149 /* ComputedPropertyName */) {
+                        if (node.name && node.name.kind === 150 /* ComputedPropertyName */) {
                             // Note that we will not include methods/accessors of a class because they would require
                             // first descending into the class. This is by design.
                             traverse(node.name.expression);
@@ -9431,10 +9652,10 @@ var ts;
      * @param node The type node.
      */
     function getRestParameterElementType(node) {
-        if (node && node.kind === 169 /* ArrayType */) {
+        if (node && node.kind === 170 /* ArrayType */) {
             return node.elementType;
         }
-        else if (node && node.kind === 164 /* TypeReference */) {
+        else if (node && node.kind === 165 /* TypeReference */) {
             return ts.singleOrUndefined(node.typeArguments);
         }
         else {
@@ -9444,12 +9665,12 @@ var ts;
     ts.getRestParameterElementType = getRestParameterElementType;
     function getMembersOfDeclaration(node) {
         switch (node.kind) {
-            case 241 /* InterfaceDeclaration */:
-            case 240 /* ClassDeclaration */:
-            case 209 /* ClassExpression */:
-            case 168 /* TypeLiteral */:
+            case 242 /* InterfaceDeclaration */:
+            case 241 /* ClassDeclaration */:
+            case 210 /* ClassExpression */:
+            case 169 /* TypeLiteral */:
                 return node.members;
-            case 188 /* ObjectLiteralExpression */:
+            case 189 /* ObjectLiteralExpression */:
                 return node.properties;
         }
     }
@@ -9457,14 +9678,14 @@ var ts;
     function isVariableLike(node) {
         if (node) {
             switch (node.kind) {
-                case 186 /* BindingElement */:
-                case 278 /* EnumMember */:
-                case 151 /* Parameter */:
-                case 275 /* PropertyAssignment */:
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
-                case 276 /* ShorthandPropertyAssignment */:
-                case 237 /* VariableDeclaration */:
+                case 187 /* BindingElement */:
+                case 279 /* EnumMember */:
+                case 152 /* Parameter */:
+                case 276 /* PropertyAssignment */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
+                case 277 /* ShorthandPropertyAssignment */:
+                case 238 /* VariableDeclaration */:
                     return true;
             }
         }
@@ -9476,8 +9697,8 @@ var ts;
     }
     ts.isVariableLikeOrAccessor = isVariableLikeOrAccessor;
     function isVariableDeclarationInVariableStatement(node) {
-        return node.parent.kind === 238 /* VariableDeclarationList */
-            && node.parent.parent.kind === 219 /* VariableStatement */;
+        return node.parent.kind === 239 /* VariableDeclarationList */
+            && node.parent.parent.kind === 220 /* VariableStatement */;
     }
     ts.isVariableDeclarationInVariableStatement = isVariableDeclarationInVariableStatement;
     function isValidESSymbolDeclaration(node) {
@@ -9488,13 +9709,13 @@ var ts;
     ts.isValidESSymbolDeclaration = isValidESSymbolDeclaration;
     function introducesArgumentsExoticObject(node) {
         switch (node.kind) {
-            case 156 /* MethodDeclaration */:
-            case 155 /* MethodSignature */:
-            case 157 /* Constructor */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
-            case 239 /* FunctionDeclaration */:
-            case 196 /* FunctionExpression */:
+            case 157 /* MethodDeclaration */:
+            case 156 /* MethodSignature */:
+            case 158 /* Constructor */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
+            case 240 /* FunctionDeclaration */:
+            case 197 /* FunctionExpression */:
                 return true;
         }
         return false;
@@ -9505,7 +9726,7 @@ var ts;
             if (beforeUnwrapLabelCallback) {
                 beforeUnwrapLabelCallback(node);
             }
-            if (node.statement.kind !== 233 /* LabeledStatement */) {
+            if (node.statement.kind !== 234 /* LabeledStatement */) {
                 return node.statement;
             }
             node = node.statement;
@@ -9513,17 +9734,17 @@ var ts;
     }
     ts.unwrapInnermostStatementOfLabel = unwrapInnermostStatementOfLabel;
     function isFunctionBlock(node) {
-        return node && node.kind === 218 /* Block */ && ts.isFunctionLike(node.parent);
+        return node && node.kind === 219 /* Block */ && ts.isFunctionLike(node.parent);
     }
     ts.isFunctionBlock = isFunctionBlock;
     function isObjectLiteralMethod(node) {
-        return node && node.kind === 156 /* MethodDeclaration */ && node.parent.kind === 188 /* ObjectLiteralExpression */;
+        return node && node.kind === 157 /* MethodDeclaration */ && node.parent.kind === 189 /* ObjectLiteralExpression */;
     }
     ts.isObjectLiteralMethod = isObjectLiteralMethod;
     function isObjectLiteralOrClassExpressionMethod(node) {
-        return node.kind === 156 /* MethodDeclaration */ &&
-            (node.parent.kind === 188 /* ObjectLiteralExpression */ ||
-                node.parent.kind === 209 /* ClassExpression */);
+        return node.kind === 157 /* MethodDeclaration */ &&
+            (node.parent.kind === 189 /* ObjectLiteralExpression */ ||
+                node.parent.kind === 210 /* ClassExpression */);
     }
     ts.isObjectLiteralOrClassExpressionMethod = isObjectLiteralOrClassExpressionMethod;
     function isIdentifierTypePredicate(predicate) {
@@ -9536,7 +9757,7 @@ var ts;
     ts.isThisTypePredicate = isThisTypePredicate;
     function getPropertyAssignment(objectLiteral, key, key2) {
         return objectLiteral.properties.filter(function (property) {
-            if (property.kind === 275 /* PropertyAssignment */) {
+            if (property.kind === 276 /* PropertyAssignment */) {
                 var propName = getTextOfPropertyName(property.name);
                 return key === propName || (!!key2 && key2 === propName);
             }
@@ -9568,19 +9789,23 @@ var ts;
         return findAncestor(node.parent, ts.isFunctionLike);
     }
     ts.getContainingFunction = getContainingFunction;
+    function getContainingFunctionDeclaration(node) {
+        return findAncestor(node.parent, ts.isFunctionLikeDeclaration);
+    }
+    ts.getContainingFunctionDeclaration = getContainingFunctionDeclaration;
     function getContainingClass(node) {
         return findAncestor(node.parent, ts.isClassLike);
     }
     ts.getContainingClass = getContainingClass;
     function getThisContainer(node, includeArrowFunctions) {
-        ts.Debug.assert(node.kind !== 284 /* SourceFile */);
+        ts.Debug.assert(node.kind !== 285 /* SourceFile */);
         while (true) {
             node = node.parent;
             if (!node) {
                 return ts.Debug.fail(); // If we never pass in a SourceFile, this should be unreachable, since we'll stop when we reach that.
             }
             switch (node.kind) {
-                case 149 /* ComputedPropertyName */:
+                case 150 /* ComputedPropertyName */:
                     // If the grandparent node is an object literal (as opposed to a class),
                     // then the computed property is not a 'this' container.
                     // A computed property name in a class needs to be a this container
@@ -9595,9 +9820,9 @@ var ts;
                     // the *body* of the container.
                     node = node.parent;
                     break;
-                case 152 /* Decorator */:
+                case 153 /* Decorator */:
                     // Decorators are always applied outside of the body of a class or method.
-                    if (node.parent.kind === 151 /* Parameter */ && ts.isClassElement(node.parent.parent)) {
+                    if (node.parent.kind === 152 /* Parameter */ && ts.isClassElement(node.parent.parent)) {
                         // If the decorator's parent is a Parameter, we resolve the this container from
                         // the grandparent class declaration.
                         node = node.parent.parent;
@@ -9608,26 +9833,26 @@ var ts;
                         node = node.parent;
                     }
                     break;
-                case 197 /* ArrowFunction */:
+                case 198 /* ArrowFunction */:
                     if (!includeArrowFunctions) {
                         continue;
                     }
                 // falls through
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
-                case 244 /* ModuleDeclaration */:
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
-                case 157 /* Constructor */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
-                case 160 /* CallSignature */:
-                case 161 /* ConstructSignature */:
-                case 162 /* IndexSignature */:
-                case 243 /* EnumDeclaration */:
-                case 284 /* SourceFile */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 245 /* ModuleDeclaration */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
+                case 158 /* Constructor */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
+                case 161 /* CallSignature */:
+                case 162 /* ConstructSignature */:
+                case 163 /* IndexSignature */:
+                case 244 /* EnumDeclaration */:
+                case 285 /* SourceFile */:
                     return node;
             }
         }
@@ -9637,9 +9862,9 @@ var ts;
         var container = getThisContainer(node, /*includeArrowFunctions*/ false);
         if (container) {
             switch (container.kind) {
-                case 157 /* Constructor */:
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
+                case 158 /* Constructor */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
                     return container;
             }
         }
@@ -9661,27 +9886,27 @@ var ts;
                 return node;
             }
             switch (node.kind) {
-                case 149 /* ComputedPropertyName */:
+                case 150 /* ComputedPropertyName */:
                     node = node.parent;
                     break;
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
                     if (!stopOnFunctions) {
                         continue;
                     }
                 // falls through
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
-                case 157 /* Constructor */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
+                case 158 /* Constructor */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     return node;
-                case 152 /* Decorator */:
+                case 153 /* Decorator */:
                     // Decorators are always applied outside of the body of a class or method.
-                    if (node.parent.kind === 151 /* Parameter */ && ts.isClassElement(node.parent.parent)) {
+                    if (node.parent.kind === 152 /* Parameter */ && ts.isClassElement(node.parent.parent)) {
                         // If the decorator's parent is a Parameter, we resolve the this container from
                         // the grandparent class declaration.
                         node = node.parent.parent;
@@ -9697,21 +9922,21 @@ var ts;
     }
     ts.getSuperContainer = getSuperContainer;
     function getImmediatelyInvokedFunctionExpression(func) {
-        if (func.kind === 196 /* FunctionExpression */ || func.kind === 197 /* ArrowFunction */) {
+        if (func.kind === 197 /* FunctionExpression */ || func.kind === 198 /* ArrowFunction */) {
             var prev = func;
             var parent = func.parent;
-            while (parent.kind === 195 /* ParenthesizedExpression */) {
+            while (parent.kind === 196 /* ParenthesizedExpression */) {
                 prev = parent;
                 parent = parent.parent;
             }
-            if (parent.kind === 191 /* CallExpression */ && parent.expression === prev) {
+            if (parent.kind === 192 /* CallExpression */ && parent.expression === prev) {
                 return parent;
             }
         }
     }
     ts.getImmediatelyInvokedFunctionExpression = getImmediatelyInvokedFunctionExpression;
     function isSuperOrSuperProperty(node) {
-        return node.kind === 98 /* SuperKeyword */
+        return node.kind === 99 /* SuperKeyword */
             || isSuperProperty(node);
     }
     ts.isSuperOrSuperProperty = isSuperOrSuperProperty;
@@ -9720,8 +9945,8 @@ var ts;
      */
     function isSuperProperty(node) {
         var kind = node.kind;
-        return (kind === 189 /* PropertyAccessExpression */ || kind === 190 /* ElementAccessExpression */)
-            && node.expression.kind === 98 /* SuperKeyword */;
+        return (kind === 190 /* PropertyAccessExpression */ || kind === 191 /* ElementAccessExpression */)
+            && node.expression.kind === 99 /* SuperKeyword */;
     }
     ts.isSuperProperty = isSuperProperty;
     /**
@@ -9729,20 +9954,20 @@ var ts;
      */
     function isThisProperty(node) {
         var kind = node.kind;
-        return (kind === 189 /* PropertyAccessExpression */ || kind === 190 /* ElementAccessExpression */)
-            && node.expression.kind === 100 /* ThisKeyword */;
+        return (kind === 190 /* PropertyAccessExpression */ || kind === 191 /* ElementAccessExpression */)
+            && node.expression.kind === 101 /* ThisKeyword */;
     }
     ts.isThisProperty = isThisProperty;
     function getEntityNameFromTypeNode(node) {
         switch (node.kind) {
-            case 164 /* TypeReference */:
+            case 165 /* TypeReference */:
                 return node.typeName;
-            case 211 /* ExpressionWithTypeArguments */:
+            case 212 /* ExpressionWithTypeArguments */:
                 return isEntityNameExpression(node.expression)
                     ? node.expression
                     : undefined;
-            case 72 /* Identifier */:
-            case 148 /* QualifiedName */:
+            case 73 /* Identifier */:
+            case 149 /* QualifiedName */:
                 return node;
         }
         return undefined;
@@ -9750,10 +9975,10 @@ var ts;
     ts.getEntityNameFromTypeNode = getEntityNameFromTypeNode;
     function getInvokedExpression(node) {
         switch (node.kind) {
-            case 193 /* TaggedTemplateExpression */:
+            case 194 /* TaggedTemplateExpression */:
                 return node.tag;
-            case 262 /* JsxOpeningElement */:
-            case 261 /* JsxSelfClosingElement */:
+            case 263 /* JsxOpeningElement */:
+            case 262 /* JsxSelfClosingElement */:
                 return node.tagName;
             default:
                 return node.expression;
@@ -9762,25 +9987,25 @@ var ts;
     ts.getInvokedExpression = getInvokedExpression;
     function nodeCanBeDecorated(node, parent, grandparent) {
         switch (node.kind) {
-            case 240 /* ClassDeclaration */:
+            case 241 /* ClassDeclaration */:
                 // classes are valid targets
                 return true;
-            case 154 /* PropertyDeclaration */:
+            case 155 /* PropertyDeclaration */:
                 // property declarations are valid if their parent is a class declaration.
-                return parent.kind === 240 /* ClassDeclaration */;
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
-            case 156 /* MethodDeclaration */:
+                return parent.kind === 241 /* ClassDeclaration */;
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
+            case 157 /* MethodDeclaration */:
                 // if this method has a body and its parent is a class declaration, this is a valid target.
                 return node.body !== undefined
-                    && parent.kind === 240 /* ClassDeclaration */;
-            case 151 /* Parameter */:
+                    && parent.kind === 241 /* ClassDeclaration */;
+            case 152 /* Parameter */:
                 // if the parameter's parent has a body and its grandparent is a class declaration, this is a valid target;
                 return parent.body !== undefined
-                    && (parent.kind === 157 /* Constructor */
-                        || parent.kind === 156 /* MethodDeclaration */
-                        || parent.kind === 159 /* SetAccessor */)
-                    && grandparent.kind === 240 /* ClassDeclaration */;
+                    && (parent.kind === 158 /* Constructor */
+                        || parent.kind === 157 /* MethodDeclaration */
+                        || parent.kind === 160 /* SetAccessor */)
+                    && grandparent.kind === 241 /* ClassDeclaration */;
         }
         return false;
     }
@@ -9796,10 +10021,10 @@ var ts;
     ts.nodeOrChildIsDecorated = nodeOrChildIsDecorated;
     function childIsDecorated(node, parent) {
         switch (node.kind) {
-            case 240 /* ClassDeclaration */:
+            case 241 /* ClassDeclaration */:
                 return ts.some(node.members, function (m) { return nodeOrChildIsDecorated(m, node, parent); }); // TODO: GH#18217
-            case 156 /* MethodDeclaration */:
-            case 159 /* SetAccessor */:
+            case 157 /* MethodDeclaration */:
+            case 160 /* SetAccessor */:
                 return ts.some(node.parameters, function (p) { return nodeIsDecorated(p, node, parent); }); // TODO: GH#18217
             default:
                 return false;
@@ -9808,9 +10033,9 @@ var ts;
     ts.childIsDecorated = childIsDecorated;
     function isJSXTagName(node) {
         var parent = node.parent;
-        if (parent.kind === 262 /* JsxOpeningElement */ ||
-            parent.kind === 261 /* JsxSelfClosingElement */ ||
-            parent.kind === 263 /* JsxClosingElement */) {
+        if (parent.kind === 263 /* JsxOpeningElement */ ||
+            parent.kind === 262 /* JsxSelfClosingElement */ ||
+            parent.kind === 264 /* JsxClosingElement */) {
             return parent.tagName === node;
         }
         return false;
@@ -9818,57 +10043,57 @@ var ts;
     ts.isJSXTagName = isJSXTagName;
     function isExpressionNode(node) {
         switch (node.kind) {
-            case 98 /* SuperKeyword */:
-            case 96 /* NullKeyword */:
-            case 102 /* TrueKeyword */:
-            case 87 /* FalseKeyword */:
+            case 99 /* SuperKeyword */:
+            case 97 /* NullKeyword */:
+            case 103 /* TrueKeyword */:
+            case 88 /* FalseKeyword */:
             case 13 /* RegularExpressionLiteral */:
-            case 187 /* ArrayLiteralExpression */:
-            case 188 /* ObjectLiteralExpression */:
-            case 189 /* PropertyAccessExpression */:
-            case 190 /* ElementAccessExpression */:
-            case 191 /* CallExpression */:
-            case 192 /* NewExpression */:
-            case 193 /* TaggedTemplateExpression */:
-            case 212 /* AsExpression */:
-            case 194 /* TypeAssertionExpression */:
-            case 213 /* NonNullExpression */:
-            case 195 /* ParenthesizedExpression */:
-            case 196 /* FunctionExpression */:
-            case 209 /* ClassExpression */:
-            case 197 /* ArrowFunction */:
-            case 200 /* VoidExpression */:
-            case 198 /* DeleteExpression */:
-            case 199 /* TypeOfExpression */:
-            case 202 /* PrefixUnaryExpression */:
-            case 203 /* PostfixUnaryExpression */:
-            case 204 /* BinaryExpression */:
-            case 205 /* ConditionalExpression */:
-            case 208 /* SpreadElement */:
-            case 206 /* TemplateExpression */:
+            case 188 /* ArrayLiteralExpression */:
+            case 189 /* ObjectLiteralExpression */:
+            case 190 /* PropertyAccessExpression */:
+            case 191 /* ElementAccessExpression */:
+            case 192 /* CallExpression */:
+            case 193 /* NewExpression */:
+            case 194 /* TaggedTemplateExpression */:
+            case 213 /* AsExpression */:
+            case 195 /* TypeAssertionExpression */:
+            case 214 /* NonNullExpression */:
+            case 196 /* ParenthesizedExpression */:
+            case 197 /* FunctionExpression */:
+            case 210 /* ClassExpression */:
+            case 198 /* ArrowFunction */:
+            case 201 /* VoidExpression */:
+            case 199 /* DeleteExpression */:
+            case 200 /* TypeOfExpression */:
+            case 203 /* PrefixUnaryExpression */:
+            case 204 /* PostfixUnaryExpression */:
+            case 205 /* BinaryExpression */:
+            case 206 /* ConditionalExpression */:
+            case 209 /* SpreadElement */:
+            case 207 /* TemplateExpression */:
             case 14 /* NoSubstitutionTemplateLiteral */:
-            case 210 /* OmittedExpression */:
-            case 260 /* JsxElement */:
-            case 261 /* JsxSelfClosingElement */:
-            case 264 /* JsxFragment */:
-            case 207 /* YieldExpression */:
-            case 201 /* AwaitExpression */:
-            case 214 /* MetaProperty */:
+            case 211 /* OmittedExpression */:
+            case 261 /* JsxElement */:
+            case 262 /* JsxSelfClosingElement */:
+            case 265 /* JsxFragment */:
+            case 208 /* YieldExpression */:
+            case 202 /* AwaitExpression */:
+            case 215 /* MetaProperty */:
                 return true;
-            case 148 /* QualifiedName */:
-                while (node.parent.kind === 148 /* QualifiedName */) {
+            case 149 /* QualifiedName */:
+                while (node.parent.kind === 149 /* QualifiedName */) {
                     node = node.parent;
                 }
-                return node.parent.kind === 167 /* TypeQuery */ || isJSXTagName(node);
-            case 72 /* Identifier */:
-                if (node.parent.kind === 167 /* TypeQuery */ || isJSXTagName(node)) {
+                return node.parent.kind === 168 /* TypeQuery */ || isJSXTagName(node);
+            case 73 /* Identifier */:
+                if (node.parent.kind === 168 /* TypeQuery */ || isJSXTagName(node)) {
                     return true;
                 }
             // falls through
             case 8 /* NumericLiteral */:
             case 9 /* BigIntLiteral */:
             case 10 /* StringLiteral */:
-            case 100 /* ThisKeyword */:
+            case 101 /* ThisKeyword */:
                 return isInExpressionContext(node);
             default:
                 return false;
@@ -9878,49 +10103,49 @@ var ts;
     function isInExpressionContext(node) {
         var parent = node.parent;
         switch (parent.kind) {
-            case 237 /* VariableDeclaration */:
-            case 151 /* Parameter */:
-            case 154 /* PropertyDeclaration */:
-            case 153 /* PropertySignature */:
-            case 278 /* EnumMember */:
-            case 275 /* PropertyAssignment */:
-            case 186 /* BindingElement */:
+            case 238 /* VariableDeclaration */:
+            case 152 /* Parameter */:
+            case 155 /* PropertyDeclaration */:
+            case 154 /* PropertySignature */:
+            case 279 /* EnumMember */:
+            case 276 /* PropertyAssignment */:
+            case 187 /* BindingElement */:
                 return parent.initializer === node;
-            case 221 /* ExpressionStatement */:
-            case 222 /* IfStatement */:
-            case 223 /* DoStatement */:
-            case 224 /* WhileStatement */:
-            case 230 /* ReturnStatement */:
-            case 231 /* WithStatement */:
-            case 232 /* SwitchStatement */:
-            case 271 /* CaseClause */:
-            case 234 /* ThrowStatement */:
+            case 222 /* ExpressionStatement */:
+            case 223 /* IfStatement */:
+            case 224 /* DoStatement */:
+            case 225 /* WhileStatement */:
+            case 231 /* ReturnStatement */:
+            case 232 /* WithStatement */:
+            case 233 /* SwitchStatement */:
+            case 272 /* CaseClause */:
+            case 235 /* ThrowStatement */:
                 return parent.expression === node;
-            case 225 /* ForStatement */:
+            case 226 /* ForStatement */:
                 var forStatement = parent;
-                return (forStatement.initializer === node && forStatement.initializer.kind !== 238 /* VariableDeclarationList */) ||
+                return (forStatement.initializer === node && forStatement.initializer.kind !== 239 /* VariableDeclarationList */) ||
                     forStatement.condition === node ||
                     forStatement.incrementor === node;
-            case 226 /* ForInStatement */:
-            case 227 /* ForOfStatement */:
+            case 227 /* ForInStatement */:
+            case 228 /* ForOfStatement */:
                 var forInStatement = parent;
-                return (forInStatement.initializer === node && forInStatement.initializer.kind !== 238 /* VariableDeclarationList */) ||
+                return (forInStatement.initializer === node && forInStatement.initializer.kind !== 239 /* VariableDeclarationList */) ||
                     forInStatement.expression === node;
-            case 194 /* TypeAssertionExpression */:
-            case 212 /* AsExpression */:
+            case 195 /* TypeAssertionExpression */:
+            case 213 /* AsExpression */:
                 return node === parent.expression;
-            case 216 /* TemplateSpan */:
+            case 217 /* TemplateSpan */:
                 return node === parent.expression;
-            case 149 /* ComputedPropertyName */:
+            case 150 /* ComputedPropertyName */:
                 return node === parent.expression;
-            case 152 /* Decorator */:
-            case 270 /* JsxExpression */:
-            case 269 /* JsxSpreadAttribute */:
-            case 277 /* SpreadAssignment */:
+            case 153 /* Decorator */:
+            case 271 /* JsxExpression */:
+            case 270 /* JsxSpreadAttribute */:
+            case 278 /* SpreadAssignment */:
                 return true;
-            case 211 /* ExpressionWithTypeArguments */:
+            case 212 /* ExpressionWithTypeArguments */:
                 return parent.expression === node && isExpressionWithTypeArgumentsInClassExtendsClause(parent);
-            case 276 /* ShorthandPropertyAssignment */:
+            case 277 /* ShorthandPropertyAssignment */:
                 return parent.objectAssignmentInitializer === node;
             default:
                 return isExpressionNode(parent);
@@ -9928,7 +10153,7 @@ var ts;
     }
     ts.isInExpressionContext = isInExpressionContext;
     function isExternalModuleImportEqualsDeclaration(node) {
-        return node.kind === 248 /* ImportEqualsDeclaration */ && node.moduleReference.kind === 259 /* ExternalModuleReference */;
+        return node.kind === 249 /* ImportEqualsDeclaration */ && node.moduleReference.kind === 260 /* ExternalModuleReference */;
     }
     ts.isExternalModuleImportEqualsDeclaration = isExternalModuleImportEqualsDeclaration;
     function getExternalModuleImportEqualsDeclarationExpression(node) {
@@ -9937,7 +10162,7 @@ var ts;
     }
     ts.getExternalModuleImportEqualsDeclarationExpression = getExternalModuleImportEqualsDeclarationExpression;
     function isInternalModuleImportEqualsDeclaration(node) {
-        return node.kind === 248 /* ImportEqualsDeclaration */ && node.moduleReference.kind !== 259 /* ExternalModuleReference */;
+        return node.kind === 249 /* ImportEqualsDeclaration */ && node.moduleReference.kind !== 260 /* ExternalModuleReference */;
     }
     ts.isInternalModuleImportEqualsDeclaration = isInternalModuleImportEqualsDeclaration;
     function isSourceFileJS(file) {
@@ -9965,15 +10190,15 @@ var ts;
             ts.isIdentifier(node.typeName) &&
             node.typeName.escapedText === "Object" &&
             node.typeArguments && node.typeArguments.length === 2 &&
-            (node.typeArguments[0].kind === 138 /* StringKeyword */ || node.typeArguments[0].kind === 135 /* NumberKeyword */);
+            (node.typeArguments[0].kind === 139 /* StringKeyword */ || node.typeArguments[0].kind === 136 /* NumberKeyword */);
     }
     ts.isJSDocIndexSignature = isJSDocIndexSignature;
     function isRequireCall(callExpression, checkArgumentIsStringLiteralLike) {
-        if (callExpression.kind !== 191 /* CallExpression */) {
+        if (callExpression.kind !== 192 /* CallExpression */) {
             return false;
         }
         var _a = callExpression, expression = _a.expression, args = _a.arguments;
-        if (expression.kind !== 72 /* Identifier */ || expression.escapedText !== "require") {
+        if (expression.kind !== 73 /* Identifier */ || expression.escapedText !== "require") {
             return false;
         }
         if (args.length !== 1) {
@@ -10004,7 +10229,7 @@ var ts;
             name = node.parent.name;
             decl = node.parent;
         }
-        else if (ts.isBinaryExpression(node.parent) && node.parent.operatorToken.kind === 59 /* EqualsToken */ && node.parent.right === node) {
+        else if (ts.isBinaryExpression(node.parent) && node.parent.operatorToken.kind === 60 /* EqualsToken */ && node.parent.right === node) {
             name = node.parent.left;
             decl = name;
         }
@@ -10013,7 +10238,7 @@ var ts;
                 name = node.parent.parent.name;
                 decl = node.parent.parent;
             }
-            else if (ts.isBinaryExpression(node.parent.parent) && node.parent.parent.operatorToken.kind === 59 /* EqualsToken */ && node.parent.parent.right === node.parent) {
+            else if (ts.isBinaryExpression(node.parent.parent) && node.parent.parent.operatorToken.kind === 60 /* EqualsToken */ && node.parent.parent.right === node.parent) {
                 name = node.parent.parent.left;
                 decl = name;
             }
@@ -10055,7 +10280,7 @@ var ts;
      * We treat the right hand side of assignments with container-like initalizers as declarations.
      */
     function getAssignedExpandoInitializer(node) {
-        if (node && node.parent && ts.isBinaryExpression(node.parent) && node.parent.operatorToken.kind === 59 /* EqualsToken */) {
+        if (node && node.parent && ts.isBinaryExpression(node.parent) && node.parent.operatorToken.kind === 60 /* EqualsToken */) {
             var isPrototypeAssignment = isPrototypeAccess(node.parent.left);
             return getExpandoInitializer(node.parent.right, isPrototypeAssignment) ||
                 getDefaultedExpandoInitializer(node.parent.left, node.parent.right, isPrototypeAssignment);
@@ -10081,11 +10306,11 @@ var ts;
     function getExpandoInitializer(initializer, isPrototypeAssignment) {
         if (ts.isCallExpression(initializer)) {
             var e = skipParentheses(initializer.expression);
-            return e.kind === 196 /* FunctionExpression */ || e.kind === 197 /* ArrowFunction */ ? initializer : undefined;
+            return e.kind === 197 /* FunctionExpression */ || e.kind === 198 /* ArrowFunction */ ? initializer : undefined;
         }
-        if (initializer.kind === 196 /* FunctionExpression */ ||
-            initializer.kind === 209 /* ClassExpression */ ||
-            initializer.kind === 197 /* ArrowFunction */) {
+        if (initializer.kind === 197 /* FunctionExpression */ ||
+            initializer.kind === 210 /* ClassExpression */ ||
+            initializer.kind === 198 /* ArrowFunction */) {
             return initializer;
         }
         if (ts.isObjectLiteralExpression(initializer) && (initializer.properties.length === 0 || isPrototypeAssignment)) {
@@ -10109,7 +10334,7 @@ var ts;
     }
     function isDefaultedExpandoInitializer(node) {
         var name = ts.isVariableDeclaration(node.parent) ? node.parent.name :
-            ts.isBinaryExpression(node.parent) && node.parent.operatorToken.kind === 59 /* EqualsToken */ ? node.parent.left :
+            ts.isBinaryExpression(node.parent) && node.parent.operatorToken.kind === 60 /* EqualsToken */ ? node.parent.left :
                 undefined;
         return name && getExpandoInitializer(node.right, isPrototypeAccess(name)) && isEntityNameExpression(name) && isSameEntityName(name, node.left);
     }
@@ -10118,7 +10343,7 @@ var ts;
     function getNameOfExpando(node) {
         if (ts.isBinaryExpression(node.parent)) {
             var parent = (node.parent.operatorToken.kind === 55 /* BarBarToken */ && ts.isBinaryExpression(node.parent.parent)) ? node.parent.parent : node.parent;
-            if (parent.operatorToken.kind === 59 /* EqualsToken */ && ts.isIdentifier(parent.left)) {
+            if (parent.operatorToken.kind === 60 /* EqualsToken */ && ts.isIdentifier(parent.left)) {
                 return parent.left;
             }
         }
@@ -10141,7 +10366,7 @@ var ts;
             return name.escapedText === initializer.escapedText;
         }
         if (ts.isIdentifier(name) && ts.isPropertyAccessExpression(initializer)) {
-            return (initializer.expression.kind === 100 /* ThisKeyword */ ||
+            return (initializer.expression.kind === 101 /* ThisKeyword */ ||
                 ts.isIdentifier(initializer.expression) &&
                     (initializer.expression.escapedText === "window" ||
                         initializer.expression.escapedText === "self" ||
@@ -10199,7 +10424,7 @@ var ts;
             }
             return 7 /* ObjectDefinePropertyValue */;
         }
-        if (expr.operatorToken.kind !== 59 /* EqualsToken */ ||
+        if (expr.operatorToken.kind !== 60 /* EqualsToken */ ||
             !ts.isPropertyAccessExpression(expr.left)) {
             return 0 /* None */;
         }
@@ -10211,7 +10436,7 @@ var ts;
         return getAssignmentDeclarationPropertyAccessKind(lhs);
     }
     function getAssignmentDeclarationPropertyAccessKind(lhs) {
-        if (lhs.expression.kind === 100 /* ThisKeyword */) {
+        if (lhs.expression.kind === 101 /* ThisKeyword */) {
             return 4 /* ThisProperty */;
         }
         else if (isModuleExportsPropertyAccessExpression(lhs)) {
@@ -10253,7 +10478,7 @@ var ts;
     ts.isPrototypePropertyAssignment = isPrototypePropertyAssignment;
     function isSpecialPropertyDeclaration(expr) {
         return isInJSFile(expr) &&
-            expr.parent && expr.parent.kind === 221 /* ExpressionStatement */ &&
+            expr.parent && expr.parent.kind === 222 /* ExpressionStatement */ &&
             !!ts.getJSDocTypeTag(expr.parent);
     }
     ts.isSpecialPropertyDeclaration = isSpecialPropertyDeclaration;
@@ -10262,23 +10487,23 @@ var ts;
             return false;
         }
         var decl = symbol.valueDeclaration;
-        return decl.kind === 239 /* FunctionDeclaration */ || ts.isVariableDeclaration(decl) && decl.initializer && ts.isFunctionLike(decl.initializer);
+        return decl.kind === 240 /* FunctionDeclaration */ || ts.isVariableDeclaration(decl) && decl.initializer && ts.isFunctionLike(decl.initializer);
     }
     ts.isFunctionSymbol = isFunctionSymbol;
     function importFromModuleSpecifier(node) {
-        return tryGetImportFromModuleSpecifier(node) || ts.Debug.fail(ts.Debug.showSyntaxKind(node.parent));
+        return tryGetImportFromModuleSpecifier(node) || ts.Debug.failBadSyntaxKind(node.parent);
     }
     ts.importFromModuleSpecifier = importFromModuleSpecifier;
     function tryGetImportFromModuleSpecifier(node) {
         switch (node.parent.kind) {
-            case 249 /* ImportDeclaration */:
-            case 255 /* ExportDeclaration */:
+            case 250 /* ImportDeclaration */:
+            case 256 /* ExportDeclaration */:
                 return node.parent;
-            case 259 /* ExternalModuleReference */:
+            case 260 /* ExternalModuleReference */:
                 return node.parent.parent;
-            case 191 /* CallExpression */:
+            case 192 /* CallExpression */:
                 return isImportCall(node.parent) || isRequireCall(node.parent, /*checkArg*/ false) ? node.parent : undefined;
-            case 182 /* LiteralType */:
+            case 183 /* LiteralType */:
                 ts.Debug.assert(ts.isStringLiteral(node));
                 return ts.tryCast(node.parent.parent, ts.isImportTypeNode);
             default:
@@ -10288,12 +10513,12 @@ var ts;
     ts.tryGetImportFromModuleSpecifier = tryGetImportFromModuleSpecifier;
     function getExternalModuleName(node) {
         switch (node.kind) {
-            case 249 /* ImportDeclaration */:
-            case 255 /* ExportDeclaration */:
+            case 250 /* ImportDeclaration */:
+            case 256 /* ExportDeclaration */:
                 return node.moduleSpecifier;
-            case 248 /* ImportEqualsDeclaration */:
-                return node.moduleReference.kind === 259 /* ExternalModuleReference */ ? node.moduleReference.expression : undefined;
-            case 183 /* ImportType */:
+            case 249 /* ImportEqualsDeclaration */:
+                return node.moduleReference.kind === 260 /* ExternalModuleReference */ ? node.moduleReference.expression : undefined;
+            case 184 /* ImportType */:
                 return isLiteralImportTypeNode(node) ? node.argument.literal : undefined;
             default:
                 return ts.Debug.assertNever(node);
@@ -10302,11 +10527,11 @@ var ts;
     ts.getExternalModuleName = getExternalModuleName;
     function getNamespaceDeclarationNode(node) {
         switch (node.kind) {
-            case 249 /* ImportDeclaration */:
+            case 250 /* ImportDeclaration */:
                 return node.importClause && ts.tryCast(node.importClause.namedBindings, ts.isNamespaceImport);
-            case 248 /* ImportEqualsDeclaration */:
+            case 249 /* ImportEqualsDeclaration */:
                 return node;
-            case 255 /* ExportDeclaration */:
+            case 256 /* ExportDeclaration */:
                 return undefined;
             default:
                 return ts.Debug.assertNever(node);
@@ -10314,19 +10539,19 @@ var ts;
     }
     ts.getNamespaceDeclarationNode = getNamespaceDeclarationNode;
     function isDefaultImport(node) {
-        return node.kind === 249 /* ImportDeclaration */ && !!node.importClause && !!node.importClause.name;
+        return node.kind === 250 /* ImportDeclaration */ && !!node.importClause && !!node.importClause.name;
     }
     ts.isDefaultImport = isDefaultImport;
     function hasQuestionToken(node) {
         if (node) {
             switch (node.kind) {
-                case 151 /* Parameter */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
-                case 276 /* ShorthandPropertyAssignment */:
-                case 275 /* PropertyAssignment */:
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
+                case 152 /* Parameter */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
+                case 277 /* ShorthandPropertyAssignment */:
+                case 276 /* PropertyAssignment */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
                     return node.questionToken !== undefined;
             }
         }
@@ -10340,7 +10565,7 @@ var ts;
     }
     ts.isJSDocConstructSignature = isJSDocConstructSignature;
     function isJSDocTypeAlias(node) {
-        return node.kind === 309 /* JSDocTypedefTag */ || node.kind === 302 /* JSDocCallbackTag */;
+        return node.kind === 311 /* JSDocTypedefTag */ || node.kind === 304 /* JSDocCallbackTag */;
     }
     ts.isJSDocTypeAlias = isJSDocTypeAlias;
     function isTypeAlias(node) {
@@ -10350,7 +10575,7 @@ var ts;
     function getSourceOfAssignment(node) {
         return ts.isExpressionStatement(node) &&
             node.expression && ts.isBinaryExpression(node.expression) &&
-            node.expression.operatorToken.kind === 59 /* EqualsToken */
+            node.expression.operatorToken.kind === 60 /* EqualsToken */
             ? node.expression.right
             : undefined;
     }
@@ -10365,12 +10590,12 @@ var ts;
     }
     function getSingleInitializerOfVariableStatementOrPropertyDeclaration(node) {
         switch (node.kind) {
-            case 219 /* VariableStatement */:
+            case 220 /* VariableStatement */:
                 var v = getSingleVariableOfVariableStatement(node);
                 return v && v.initializer;
-            case 154 /* PropertyDeclaration */:
+            case 155 /* PropertyDeclaration */:
                 return node.initializer;
-            case 275 /* PropertyAssignment */:
+            case 276 /* PropertyAssignment */:
                 return node.initializer;
         }
     }
@@ -10381,7 +10606,7 @@ var ts;
     function getNestedModuleDeclaration(node) {
         return ts.isModuleDeclaration(node) &&
             node.body &&
-            node.body.kind === 244 /* ModuleDeclaration */
+            node.body.kind === 245 /* ModuleDeclaration */
             ? node.body
             : undefined;
     }
@@ -10389,18 +10614,18 @@ var ts;
         var result;
         // Pull parameter comments from declaring function as well
         if (isVariableLike(hostNode) && ts.hasInitializer(hostNode) && ts.hasJSDocNodes(hostNode.initializer)) {
-            result = ts.addRange(result, hostNode.initializer.jsDoc);
+            result = ts.append(result, ts.last(hostNode.initializer.jsDoc));
         }
         var node = hostNode;
         while (node && node.parent) {
             if (ts.hasJSDocNodes(node)) {
-                result = ts.addRange(result, node.jsDoc);
+                result = ts.append(result, ts.last(node.jsDoc));
             }
-            if (node.kind === 151 /* Parameter */) {
+            if (node.kind === 152 /* Parameter */) {
                 result = ts.addRange(result, ts.getJSDocParameterTags(node));
                 break;
             }
-            if (node.kind === 150 /* TypeParameter */) {
+            if (node.kind === 151 /* TypeParameter */) {
                 result = ts.addRange(result, ts.getJSDocTypeParameterTags(node));
                 break;
             }
@@ -10411,11 +10636,12 @@ var ts;
     ts.getJSDocCommentsAndTags = getJSDocCommentsAndTags;
     function getNextJSDocCommentLocation(node) {
         var parent = node.parent;
-        if (parent.kind === 275 /* PropertyAssignment */ ||
-            parent.kind === 154 /* PropertyDeclaration */ ||
-            parent.kind === 221 /* ExpressionStatement */ && node.kind === 189 /* PropertyAccessExpression */ ||
+        if (parent.kind === 276 /* PropertyAssignment */ ||
+            parent.kind === 255 /* ExportAssignment */ ||
+            parent.kind === 155 /* PropertyDeclaration */ ||
+            parent.kind === 222 /* ExpressionStatement */ && node.kind === 190 /* PropertyAccessExpression */ ||
             getNestedModuleDeclaration(parent) ||
-            ts.isBinaryExpression(node) && node.operatorToken.kind === 59 /* EqualsToken */) {
+            ts.isBinaryExpression(node) && node.operatorToken.kind === 60 /* EqualsToken */) {
             return parent;
         }
         // Try to recognize this pattern when node is initializer of variable declaration and JSDoc comments are on containing variable statement.
@@ -10426,7 +10652,7 @@ var ts;
         // var x = function(name) { return name.length; }
         else if (parent.parent &&
             (getSingleVariableOfVariableStatement(parent.parent) === node ||
-                ts.isBinaryExpression(parent) && parent.operatorToken.kind === 59 /* EqualsToken */)) {
+                ts.isBinaryExpression(parent) && parent.operatorToken.kind === 60 /* EqualsToken */)) {
             return parent.parent;
         }
         else if (parent.parent && parent.parent.parent &&
@@ -10449,7 +10675,7 @@ var ts;
         if (!decl) {
             return undefined;
         }
-        var parameter = ts.find(decl.parameters, function (p) { return p.name.kind === 72 /* Identifier */ && p.name.escapedText === name; });
+        var parameter = ts.find(decl.parameters, function (p) { return p.name.kind === 73 /* Identifier */ && p.name.escapedText === name; });
         return parameter && parameter.symbol;
     }
     ts.getParameterSymbolFromJSDoc = getParameterSymbolFromJSDoc;
@@ -10484,7 +10710,7 @@ var ts;
     ts.hasRestParameter = hasRestParameter;
     function isRestParameter(node) {
         var type = ts.isJSDocParameterTag(node) ? (node.typeExpression && node.typeExpression.type) : node.type;
-        return node.dotDotDotToken !== undefined || !!type && type.kind === 295 /* JSDocVariadicType */;
+        return node.dotDotDotToken !== undefined || !!type && type.kind === 296 /* JSDocVariadicType */;
     }
     ts.isRestParameter = isRestParameter;
     var AssignmentKind;
@@ -10497,31 +10723,31 @@ var ts;
         var parent = node.parent;
         while (true) {
             switch (parent.kind) {
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     var binaryOperator = parent.operatorToken.kind;
                     return isAssignmentOperator(binaryOperator) && parent.left === node ?
-                        binaryOperator === 59 /* EqualsToken */ ? 1 /* Definite */ : 2 /* Compound */ :
+                        binaryOperator === 60 /* EqualsToken */ ? 1 /* Definite */ : 2 /* Compound */ :
                         0 /* None */;
-                case 202 /* PrefixUnaryExpression */:
-                case 203 /* PostfixUnaryExpression */:
+                case 203 /* PrefixUnaryExpression */:
+                case 204 /* PostfixUnaryExpression */:
                     var unaryOperator = parent.operator;
                     return unaryOperator === 44 /* PlusPlusToken */ || unaryOperator === 45 /* MinusMinusToken */ ? 2 /* Compound */ : 0 /* None */;
-                case 226 /* ForInStatement */:
-                case 227 /* ForOfStatement */:
+                case 227 /* ForInStatement */:
+                case 228 /* ForOfStatement */:
                     return parent.initializer === node ? 1 /* Definite */ : 0 /* None */;
-                case 195 /* ParenthesizedExpression */:
-                case 187 /* ArrayLiteralExpression */:
-                case 208 /* SpreadElement */:
-                case 213 /* NonNullExpression */:
+                case 196 /* ParenthesizedExpression */:
+                case 188 /* ArrayLiteralExpression */:
+                case 209 /* SpreadElement */:
+                case 214 /* NonNullExpression */:
                     node = parent;
                     break;
-                case 276 /* ShorthandPropertyAssignment */:
+                case 277 /* ShorthandPropertyAssignment */:
                     if (parent.name !== node) {
                         return 0 /* None */;
                     }
                     node = parent.parent;
                     break;
-                case 275 /* PropertyAssignment */:
+                case 276 /* PropertyAssignment */:
                     if (parent.name === node) {
                         return 0 /* None */;
                     }
@@ -10548,22 +10774,22 @@ var ts;
      */
     function isNodeWithPossibleHoistedDeclaration(node) {
         switch (node.kind) {
-            case 218 /* Block */:
-            case 219 /* VariableStatement */:
-            case 231 /* WithStatement */:
-            case 222 /* IfStatement */:
-            case 232 /* SwitchStatement */:
-            case 246 /* CaseBlock */:
-            case 271 /* CaseClause */:
-            case 272 /* DefaultClause */:
-            case 233 /* LabeledStatement */:
-            case 225 /* ForStatement */:
-            case 226 /* ForInStatement */:
-            case 227 /* ForOfStatement */:
-            case 223 /* DoStatement */:
-            case 224 /* WhileStatement */:
-            case 235 /* TryStatement */:
-            case 274 /* CatchClause */:
+            case 219 /* Block */:
+            case 220 /* VariableStatement */:
+            case 232 /* WithStatement */:
+            case 223 /* IfStatement */:
+            case 233 /* SwitchStatement */:
+            case 247 /* CaseBlock */:
+            case 272 /* CaseClause */:
+            case 273 /* DefaultClause */:
+            case 234 /* LabeledStatement */:
+            case 226 /* ForStatement */:
+            case 227 /* ForInStatement */:
+            case 228 /* ForOfStatement */:
+            case 224 /* DoStatement */:
+            case 225 /* WhileStatement */:
+            case 236 /* TryStatement */:
+            case 275 /* CatchClause */:
                 return true;
         }
         return false;
@@ -10580,33 +10806,33 @@ var ts;
         return node;
     }
     function walkUpParenthesizedTypes(node) {
-        return walkUp(node, 177 /* ParenthesizedType */);
+        return walkUp(node, 178 /* ParenthesizedType */);
     }
     ts.walkUpParenthesizedTypes = walkUpParenthesizedTypes;
     function walkUpParenthesizedExpressions(node) {
-        return walkUp(node, 195 /* ParenthesizedExpression */);
+        return walkUp(node, 196 /* ParenthesizedExpression */);
     }
     ts.walkUpParenthesizedExpressions = walkUpParenthesizedExpressions;
     function skipParentheses(node) {
-        while (node.kind === 195 /* ParenthesizedExpression */) {
+        while (node.kind === 196 /* ParenthesizedExpression */) {
             node = node.expression;
         }
         return node;
     }
     ts.skipParentheses = skipParentheses;
     function skipParenthesesUp(node) {
-        while (node.kind === 195 /* ParenthesizedExpression */) {
+        while (node.kind === 196 /* ParenthesizedExpression */) {
             node = node.parent;
         }
         return node;
     }
     // a node is delete target iff. it is PropertyAccessExpression/ElementAccessExpression with parentheses skipped
     function isDeleteTarget(node) {
-        if (node.kind !== 189 /* PropertyAccessExpression */ && node.kind !== 190 /* ElementAccessExpression */) {
+        if (node.kind !== 190 /* PropertyAccessExpression */ && node.kind !== 191 /* ElementAccessExpression */) {
             return false;
         }
         node = walkUpParenthesizedExpressions(node.parent);
-        return node && node.kind === 198 /* DeleteExpression */;
+        return node && node.kind === 199 /* DeleteExpression */;
     }
     ts.isDeleteTarget = isDeleteTarget;
     function isNodeDescendantOf(node, ancestor) {
@@ -10632,7 +10858,7 @@ var ts;
                 if (ts.isComputedPropertyName(parent))
                     return parent.parent;
             // falls through
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 if (ts.isDeclaration(parent)) {
                     return parent.name === name ? parent : undefined;
                 }
@@ -10656,7 +10882,7 @@ var ts;
     ts.getDeclarationFromName = getDeclarationFromName;
     function isLiteralComputedPropertyDeclarationName(node) {
         return (node.kind === 10 /* StringLiteral */ || node.kind === 8 /* NumericLiteral */) &&
-            node.parent.kind === 149 /* ComputedPropertyName */ &&
+            node.parent.kind === 150 /* ComputedPropertyName */ &&
             ts.isDeclaration(node.parent.parent);
     }
     ts.isLiteralComputedPropertyDeclarationName = isLiteralComputedPropertyDeclarationName;
@@ -10664,32 +10890,32 @@ var ts;
     function isIdentifierName(node) {
         var parent = node.parent;
         switch (parent.kind) {
-            case 154 /* PropertyDeclaration */:
-            case 153 /* PropertySignature */:
-            case 156 /* MethodDeclaration */:
-            case 155 /* MethodSignature */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
-            case 278 /* EnumMember */:
-            case 275 /* PropertyAssignment */:
-            case 189 /* PropertyAccessExpression */:
+            case 155 /* PropertyDeclaration */:
+            case 154 /* PropertySignature */:
+            case 157 /* MethodDeclaration */:
+            case 156 /* MethodSignature */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
+            case 279 /* EnumMember */:
+            case 276 /* PropertyAssignment */:
+            case 190 /* PropertyAccessExpression */:
                 // Name in member declaration or property name in property access
                 return parent.name === node;
-            case 148 /* QualifiedName */:
+            case 149 /* QualifiedName */:
                 // Name on right hand side of dot in a type query or type reference
                 if (parent.right === node) {
-                    while (parent.kind === 148 /* QualifiedName */) {
+                    while (parent.kind === 149 /* QualifiedName */) {
                         parent = parent.parent;
                     }
-                    return parent.kind === 167 /* TypeQuery */ || parent.kind === 164 /* TypeReference */;
+                    return parent.kind === 168 /* TypeQuery */ || parent.kind === 165 /* TypeReference */;
                 }
                 return false;
-            case 186 /* BindingElement */:
-            case 253 /* ImportSpecifier */:
+            case 187 /* BindingElement */:
+            case 254 /* ImportSpecifier */:
                 // Property name in binding element or import specifier
                 return parent.propertyName === node;
-            case 257 /* ExportSpecifier */:
-            case 267 /* JsxAttribute */:
+            case 258 /* ExportSpecifier */:
+            case 268 /* JsxAttribute */:
                 // Any name in an export specifier or JSX Attribute
                 return true;
         }
@@ -10706,13 +10932,13 @@ var ts;
     // export default <EntityNameExpression>
     // module.exports = <EntityNameExpression>
     function isAliasSymbolDeclaration(node) {
-        return node.kind === 248 /* ImportEqualsDeclaration */ ||
-            node.kind === 247 /* NamespaceExportDeclaration */ ||
-            node.kind === 250 /* ImportClause */ && !!node.name ||
-            node.kind === 251 /* NamespaceImport */ ||
-            node.kind === 253 /* ImportSpecifier */ ||
-            node.kind === 257 /* ExportSpecifier */ ||
-            node.kind === 254 /* ExportAssignment */ && exportAssignmentIsAlias(node) ||
+        return node.kind === 249 /* ImportEqualsDeclaration */ ||
+            node.kind === 248 /* NamespaceExportDeclaration */ ||
+            node.kind === 251 /* ImportClause */ && !!node.name ||
+            node.kind === 252 /* NamespaceImport */ ||
+            node.kind === 254 /* ImportSpecifier */ ||
+            node.kind === 258 /* ExportSpecifier */ ||
+            node.kind === 255 /* ExportAssignment */ && exportAssignmentIsAlias(node) ||
             ts.isBinaryExpression(node) && getAssignmentDeclarationKind(node) === 2 /* ModuleExports */ && exportAssignmentIsAlias(node);
     }
     ts.isAliasSymbolDeclaration = isAliasSymbolDeclaration;
@@ -10734,12 +10960,12 @@ var ts;
     }
     ts.getEffectiveBaseTypeNode = getEffectiveBaseTypeNode;
     function getClassExtendsHeritageElement(node) {
-        var heritageClause = getHeritageClause(node.heritageClauses, 86 /* ExtendsKeyword */);
+        var heritageClause = getHeritageClause(node.heritageClauses, 87 /* ExtendsKeyword */);
         return heritageClause && heritageClause.types.length > 0 ? heritageClause.types[0] : undefined;
     }
     ts.getClassExtendsHeritageElement = getClassExtendsHeritageElement;
     function getClassImplementsHeritageClauseElements(node) {
-        var heritageClause = getHeritageClause(node.heritageClauses, 109 /* ImplementsKeyword */);
+        var heritageClause = getHeritageClause(node.heritageClauses, 110 /* ImplementsKeyword */);
         return heritageClause ? heritageClause.types : undefined;
     }
     ts.getClassImplementsHeritageClauseElements = getClassImplementsHeritageClauseElements;
@@ -10751,7 +10977,7 @@ var ts;
     }
     ts.getAllSuperTypeNodes = getAllSuperTypeNodes;
     function getInterfaceBaseTypeNodes(node) {
-        var heritageClause = getHeritageClause(node.heritageClauses, 86 /* ExtendsKeyword */);
+        var heritageClause = getHeritageClause(node.heritageClauses, 87 /* ExtendsKeyword */);
         return heritageClause ? heritageClause.types : undefined;
     }
     ts.getInterfaceBaseTypeNodes = getInterfaceBaseTypeNodes;
@@ -10767,13 +10993,6 @@ var ts;
         return undefined;
     }
     ts.getHeritageClause = getHeritageClause;
-    function tryResolveScriptReference(host, sourceFile, reference) {
-        if (!host.getCompilerOptions().noResolve) {
-            var referenceFileName = ts.isRootedDiskPath(reference.fileName) ? reference.fileName : ts.combinePaths(ts.getDirectoryPath(sourceFile.fileName), reference.fileName);
-            return host.getSourceFile(referenceFileName);
-        }
-    }
-    ts.tryResolveScriptReference = tryResolveScriptReference;
     function getAncestor(node, kind) {
         while (node) {
             if (node.kind === kind) {
@@ -10785,11 +11004,11 @@ var ts;
     }
     ts.getAncestor = getAncestor;
     function isKeyword(token) {
-        return 73 /* FirstKeyword */ <= token && token <= 147 /* LastKeyword */;
+        return 74 /* FirstKeyword */ <= token && token <= 148 /* LastKeyword */;
     }
     ts.isKeyword = isKeyword;
     function isContextualKeyword(token) {
-        return 118 /* FirstContextualKeyword */ <= token && token <= 147 /* LastContextualKeyword */;
+        return 119 /* FirstContextualKeyword */ <= token && token <= 148 /* LastContextualKeyword */;
     }
     ts.isContextualKeyword = isContextualKeyword;
     function isNonContextualKeyword(token) {
@@ -10824,14 +11043,14 @@ var ts;
         }
         var flags = 0 /* Normal */;
         switch (node.kind) {
-            case 239 /* FunctionDeclaration */:
-            case 196 /* FunctionExpression */:
-            case 156 /* MethodDeclaration */:
+            case 240 /* FunctionDeclaration */:
+            case 197 /* FunctionExpression */:
+            case 157 /* MethodDeclaration */:
                 if (node.asteriskToken) {
                     flags |= 1 /* Generator */;
                 }
             // falls through
-            case 197 /* ArrowFunction */:
+            case 198 /* ArrowFunction */:
                 if (hasModifier(node, 256 /* Async */)) {
                     flags |= 2 /* Async */;
                 }
@@ -10845,10 +11064,10 @@ var ts;
     ts.getFunctionFlags = getFunctionFlags;
     function isAsyncFunction(node) {
         switch (node.kind) {
-            case 239 /* FunctionDeclaration */:
-            case 196 /* FunctionExpression */:
-            case 197 /* ArrowFunction */:
-            case 156 /* MethodDeclaration */:
+            case 240 /* FunctionDeclaration */:
+            case 197 /* FunctionExpression */:
+            case 198 /* ArrowFunction */:
+            case 157 /* MethodDeclaration */:
                 return node.body !== undefined
                     && node.asteriskToken === undefined
                     && hasModifier(node, 256 /* Async */);
@@ -10860,11 +11079,19 @@ var ts;
         return ts.isStringLiteralLike(node) || ts.isNumericLiteral(node);
     }
     ts.isStringOrNumericLiteralLike = isStringOrNumericLiteralLike;
+    function isSignedNumericLiteral(node) {
+        return ts.isPrefixUnaryExpression(node) && (node.operator === 38 /* PlusToken */ || node.operator === 39 /* MinusToken */) && ts.isNumericLiteral(node.operand);
+    }
+    ts.isSignedNumericLiteral = isSignedNumericLiteral;
     /**
-     * A declaration has a dynamic name if both of the following are true:
-     *   1. The declaration has a computed property name
-     *   2. The computed name is *not* expressed as Symbol.<name>, where name
-     *      is a property of the Symbol constructor that denotes a built in
+     * A declaration has a dynamic name if all of the following are true:
+     *   1. The declaration has a computed property name.
+     *   2. The computed name is *not* expressed as a StringLiteral.
+     *   3. The computed name is *not* expressed as a NumericLiteral.
+     *   4. The computed name is *not* expressed as a PlusToken or MinusToken
+     *      immediately followed by a NumericLiteral.
+     *   5. The computed name is *not* expressed as `Symbol.<name>`, where `<name>`
+     *      is a property of the Symbol constructor that denotes a built-in
      *      Symbol.
      */
     function hasDynamicName(declaration) {
@@ -10873,8 +11100,9 @@ var ts;
     }
     ts.hasDynamicName = hasDynamicName;
     function isDynamicName(name) {
-        return name.kind === 149 /* ComputedPropertyName */ &&
+        return name.kind === 150 /* ComputedPropertyName */ &&
             !isStringOrNumericLiteralLike(name.expression) &&
+            !isSignedNumericLiteral(name.expression) &&
             !isWellKnownSymbolSyntactically(name.expression);
     }
     ts.isDynamicName = isDynamicName;
@@ -10889,12 +11117,12 @@ var ts;
     ts.isWellKnownSymbolSyntactically = isWellKnownSymbolSyntactically;
     function getPropertyNameForPropertyNameNode(name) {
         switch (name.kind) {
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 return name.escapedText;
             case 10 /* StringLiteral */:
             case 8 /* NumericLiteral */:
                 return ts.escapeLeadingUnderscores(name.text);
-            case 149 /* ComputedPropertyName */:
+            case 150 /* ComputedPropertyName */:
                 var nameExpression = name.expression;
                 if (isWellKnownSymbolSyntactically(nameExpression)) {
                     return getPropertyNameForKnownSymbolName(ts.idText(nameExpression.name));
@@ -10910,7 +11138,7 @@ var ts;
     ts.getPropertyNameForPropertyNameNode = getPropertyNameForPropertyNameNode;
     function isPropertyNameLiteral(node) {
         switch (node.kind) {
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
             case 10 /* StringLiteral */:
             case 14 /* NoSubstitutionTemplateLiteral */:
             case 8 /* NumericLiteral */:
@@ -10921,11 +11149,11 @@ var ts;
     }
     ts.isPropertyNameLiteral = isPropertyNameLiteral;
     function getTextOfIdentifierOrLiteral(node) {
-        return node.kind === 72 /* Identifier */ ? ts.idText(node) : node.text;
+        return node.kind === 73 /* Identifier */ ? ts.idText(node) : node.text;
     }
     ts.getTextOfIdentifierOrLiteral = getTextOfIdentifierOrLiteral;
     function getEscapedTextOfIdentifierOrLiteral(node) {
-        return node.kind === 72 /* Identifier */ ? node.escapedText : ts.escapeLeadingUnderscores(node.text);
+        return node.kind === 73 /* Identifier */ ? node.escapedText : ts.escapeLeadingUnderscores(node.text);
     }
     ts.getEscapedTextOfIdentifierOrLiteral = getEscapedTextOfIdentifierOrLiteral;
     function getPropertyNameForKnownSymbolName(symbolName) {
@@ -10940,7 +11168,7 @@ var ts;
      * Includes the word "Symbol" with unicode escapes
      */
     function isESSymbolIdentifier(node) {
-        return node.kind === 72 /* Identifier */ && node.escapedText === "Symbol";
+        return node.kind === 73 /* Identifier */ && node.escapedText === "Symbol";
     }
     ts.isESSymbolIdentifier = isESSymbolIdentifier;
     function isPushOrUnshiftIdentifier(node) {
@@ -10949,11 +11177,11 @@ var ts;
     ts.isPushOrUnshiftIdentifier = isPushOrUnshiftIdentifier;
     function isParameterDeclaration(node) {
         var root = getRootDeclaration(node);
-        return root.kind === 151 /* Parameter */;
+        return root.kind === 152 /* Parameter */;
     }
     ts.isParameterDeclaration = isParameterDeclaration;
     function getRootDeclaration(node) {
-        while (node.kind === 186 /* BindingElement */) {
+        while (node.kind === 187 /* BindingElement */) {
             node = node.parent.parent;
         }
         return node;
@@ -10961,15 +11189,15 @@ var ts;
     ts.getRootDeclaration = getRootDeclaration;
     function nodeStartsNewLexicalEnvironment(node) {
         var kind = node.kind;
-        return kind === 157 /* Constructor */
-            || kind === 196 /* FunctionExpression */
-            || kind === 239 /* FunctionDeclaration */
-            || kind === 197 /* ArrowFunction */
-            || kind === 156 /* MethodDeclaration */
-            || kind === 158 /* GetAccessor */
-            || kind === 159 /* SetAccessor */
-            || kind === 244 /* ModuleDeclaration */
-            || kind === 284 /* SourceFile */;
+        return kind === 158 /* Constructor */
+            || kind === 197 /* FunctionExpression */
+            || kind === 240 /* FunctionDeclaration */
+            || kind === 198 /* ArrowFunction */
+            || kind === 157 /* MethodDeclaration */
+            || kind === 159 /* GetAccessor */
+            || kind === 160 /* SetAccessor */
+            || kind === 245 /* ModuleDeclaration */
+            || kind === 285 /* SourceFile */;
     }
     ts.nodeStartsNewLexicalEnvironment = nodeStartsNewLexicalEnvironment;
     function nodeIsSynthesized(range) {
@@ -10988,38 +11216,38 @@ var ts;
     })(Associativity = ts.Associativity || (ts.Associativity = {}));
     function getExpressionAssociativity(expression) {
         var operator = getOperator(expression);
-        var hasArguments = expression.kind === 192 /* NewExpression */ && expression.arguments !== undefined;
+        var hasArguments = expression.kind === 193 /* NewExpression */ && expression.arguments !== undefined;
         return getOperatorAssociativity(expression.kind, operator, hasArguments);
     }
     ts.getExpressionAssociativity = getExpressionAssociativity;
     function getOperatorAssociativity(kind, operator, hasArguments) {
         switch (kind) {
-            case 192 /* NewExpression */:
+            case 193 /* NewExpression */:
                 return hasArguments ? 0 /* Left */ : 1 /* Right */;
-            case 202 /* PrefixUnaryExpression */:
-            case 199 /* TypeOfExpression */:
-            case 200 /* VoidExpression */:
-            case 198 /* DeleteExpression */:
-            case 201 /* AwaitExpression */:
-            case 205 /* ConditionalExpression */:
-            case 207 /* YieldExpression */:
+            case 203 /* PrefixUnaryExpression */:
+            case 200 /* TypeOfExpression */:
+            case 201 /* VoidExpression */:
+            case 199 /* DeleteExpression */:
+            case 202 /* AwaitExpression */:
+            case 206 /* ConditionalExpression */:
+            case 208 /* YieldExpression */:
                 return 1 /* Right */;
-            case 204 /* BinaryExpression */:
+            case 205 /* BinaryExpression */:
                 switch (operator) {
                     case 41 /* AsteriskAsteriskToken */:
-                    case 59 /* EqualsToken */:
-                    case 60 /* PlusEqualsToken */:
-                    case 61 /* MinusEqualsToken */:
-                    case 63 /* AsteriskAsteriskEqualsToken */:
-                    case 62 /* AsteriskEqualsToken */:
-                    case 64 /* SlashEqualsToken */:
-                    case 65 /* PercentEqualsToken */:
-                    case 66 /* LessThanLessThanEqualsToken */:
-                    case 67 /* GreaterThanGreaterThanEqualsToken */:
-                    case 68 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
-                    case 69 /* AmpersandEqualsToken */:
-                    case 71 /* CaretEqualsToken */:
-                    case 70 /* BarEqualsToken */:
+                    case 60 /* EqualsToken */:
+                    case 61 /* PlusEqualsToken */:
+                    case 62 /* MinusEqualsToken */:
+                    case 64 /* AsteriskAsteriskEqualsToken */:
+                    case 63 /* AsteriskEqualsToken */:
+                    case 65 /* SlashEqualsToken */:
+                    case 66 /* PercentEqualsToken */:
+                    case 67 /* LessThanLessThanEqualsToken */:
+                    case 68 /* GreaterThanGreaterThanEqualsToken */:
+                    case 69 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
+                    case 70 /* AmpersandEqualsToken */:
+                    case 72 /* CaretEqualsToken */:
+                    case 71 /* BarEqualsToken */:
                         return 1 /* Right */;
                 }
         }
@@ -11028,15 +11256,15 @@ var ts;
     ts.getOperatorAssociativity = getOperatorAssociativity;
     function getExpressionPrecedence(expression) {
         var operator = getOperator(expression);
-        var hasArguments = expression.kind === 192 /* NewExpression */ && expression.arguments !== undefined;
+        var hasArguments = expression.kind === 193 /* NewExpression */ && expression.arguments !== undefined;
         return getOperatorPrecedence(expression.kind, operator, hasArguments);
     }
     ts.getExpressionPrecedence = getExpressionPrecedence;
     function getOperator(expression) {
-        if (expression.kind === 204 /* BinaryExpression */) {
+        if (expression.kind === 205 /* BinaryExpression */) {
             return expression.operatorToken.kind;
         }
-        else if (expression.kind === 202 /* PrefixUnaryExpression */ || expression.kind === 203 /* PostfixUnaryExpression */) {
+        else if (expression.kind === 203 /* PrefixUnaryExpression */ || expression.kind === 204 /* PostfixUnaryExpression */) {
             return expression.operator;
         }
         else {
@@ -11046,73 +11274,73 @@ var ts;
     ts.getOperator = getOperator;
     function getOperatorPrecedence(nodeKind, operatorKind, hasArguments) {
         switch (nodeKind) {
-            case 314 /* CommaListExpression */:
+            case 316 /* CommaListExpression */:
                 return 0;
-            case 208 /* SpreadElement */:
+            case 209 /* SpreadElement */:
                 return 1;
-            case 207 /* YieldExpression */:
+            case 208 /* YieldExpression */:
                 return 2;
-            case 205 /* ConditionalExpression */:
+            case 206 /* ConditionalExpression */:
                 return 4;
-            case 204 /* BinaryExpression */:
+            case 205 /* BinaryExpression */:
                 switch (operatorKind) {
                     case 27 /* CommaToken */:
                         return 0;
-                    case 59 /* EqualsToken */:
-                    case 60 /* PlusEqualsToken */:
-                    case 61 /* MinusEqualsToken */:
-                    case 63 /* AsteriskAsteriskEqualsToken */:
-                    case 62 /* AsteriskEqualsToken */:
-                    case 64 /* SlashEqualsToken */:
-                    case 65 /* PercentEqualsToken */:
-                    case 66 /* LessThanLessThanEqualsToken */:
-                    case 67 /* GreaterThanGreaterThanEqualsToken */:
-                    case 68 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
-                    case 69 /* AmpersandEqualsToken */:
-                    case 71 /* CaretEqualsToken */:
-                    case 70 /* BarEqualsToken */:
+                    case 60 /* EqualsToken */:
+                    case 61 /* PlusEqualsToken */:
+                    case 62 /* MinusEqualsToken */:
+                    case 64 /* AsteriskAsteriskEqualsToken */:
+                    case 63 /* AsteriskEqualsToken */:
+                    case 65 /* SlashEqualsToken */:
+                    case 66 /* PercentEqualsToken */:
+                    case 67 /* LessThanLessThanEqualsToken */:
+                    case 68 /* GreaterThanGreaterThanEqualsToken */:
+                    case 69 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
+                    case 70 /* AmpersandEqualsToken */:
+                    case 72 /* CaretEqualsToken */:
+                    case 71 /* BarEqualsToken */:
                         return 3;
                     default:
                         return getBinaryOperatorPrecedence(operatorKind);
                 }
-            case 202 /* PrefixUnaryExpression */:
-            case 199 /* TypeOfExpression */:
-            case 200 /* VoidExpression */:
-            case 198 /* DeleteExpression */:
-            case 201 /* AwaitExpression */:
+            case 203 /* PrefixUnaryExpression */:
+            case 200 /* TypeOfExpression */:
+            case 201 /* VoidExpression */:
+            case 199 /* DeleteExpression */:
+            case 202 /* AwaitExpression */:
                 return 16;
-            case 203 /* PostfixUnaryExpression */:
+            case 204 /* PostfixUnaryExpression */:
                 return 17;
-            case 191 /* CallExpression */:
+            case 192 /* CallExpression */:
                 return 18;
-            case 192 /* NewExpression */:
+            case 193 /* NewExpression */:
                 return hasArguments ? 19 : 18;
-            case 193 /* TaggedTemplateExpression */:
-            case 189 /* PropertyAccessExpression */:
-            case 190 /* ElementAccessExpression */:
+            case 194 /* TaggedTemplateExpression */:
+            case 190 /* PropertyAccessExpression */:
+            case 191 /* ElementAccessExpression */:
                 return 19;
-            case 100 /* ThisKeyword */:
-            case 98 /* SuperKeyword */:
-            case 72 /* Identifier */:
-            case 96 /* NullKeyword */:
-            case 102 /* TrueKeyword */:
-            case 87 /* FalseKeyword */:
+            case 101 /* ThisKeyword */:
+            case 99 /* SuperKeyword */:
+            case 73 /* Identifier */:
+            case 97 /* NullKeyword */:
+            case 103 /* TrueKeyword */:
+            case 88 /* FalseKeyword */:
             case 8 /* NumericLiteral */:
             case 9 /* BigIntLiteral */:
             case 10 /* StringLiteral */:
-            case 187 /* ArrayLiteralExpression */:
-            case 188 /* ObjectLiteralExpression */:
-            case 196 /* FunctionExpression */:
-            case 197 /* ArrowFunction */:
-            case 209 /* ClassExpression */:
-            case 260 /* JsxElement */:
-            case 261 /* JsxSelfClosingElement */:
-            case 264 /* JsxFragment */:
+            case 188 /* ArrayLiteralExpression */:
+            case 189 /* ObjectLiteralExpression */:
+            case 197 /* FunctionExpression */:
+            case 198 /* ArrowFunction */:
+            case 210 /* ClassExpression */:
+            case 261 /* JsxElement */:
+            case 262 /* JsxSelfClosingElement */:
+            case 265 /* JsxFragment */:
             case 13 /* RegularExpressionLiteral */:
             case 14 /* NoSubstitutionTemplateLiteral */:
-            case 206 /* TemplateExpression */:
-            case 195 /* ParenthesizedExpression */:
-            case 210 /* OmittedExpression */:
+            case 207 /* TemplateExpression */:
+            case 196 /* ParenthesizedExpression */:
+            case 211 /* OmittedExpression */:
                 return 20;
             default:
                 return -1;
@@ -11140,9 +11368,9 @@ var ts;
             case 30 /* GreaterThanToken */:
             case 31 /* LessThanEqualsToken */:
             case 32 /* GreaterThanEqualsToken */:
-            case 94 /* InstanceOfKeyword */:
-            case 93 /* InKeyword */:
-            case 119 /* AsKeyword */:
+            case 95 /* InstanceOfKeyword */:
+            case 94 /* InKeyword */:
+            case 120 /* AsKeyword */:
                 return 11;
             case 46 /* LessThanLessThanToken */:
             case 47 /* GreaterThanGreaterThanToken */:
@@ -11267,6 +11495,23 @@ var ts;
         return s.replace(escapedCharsRegExp, getReplacement);
     }
     ts.escapeString = escapeString;
+    /**
+     * Strip off existed single quotes or double quotes from a given string
+     *
+     * @return non-quoted string
+     */
+    function stripQuotes(name) {
+        var length = name.length;
+        if (length >= 2 && name.charCodeAt(0) === name.charCodeAt(length - 1) && startsWithQuote(name)) {
+            return name.substring(1, length - 1);
+        }
+        return name;
+    }
+    ts.stripQuotes = stripQuotes;
+    function startsWithQuote(name) {
+        return isSingleOrDoubleQuote(name.charCodeAt(0));
+    }
+    ts.startsWithQuote = startsWithQuote;
     function getReplacement(c, offset, input) {
         if (c.charCodeAt(0) === 0 /* nullCharacter */) {
             var lookAhead = input.charCodeAt(offset + c.length);
@@ -11525,23 +11770,27 @@ var ts;
     function getSourceFilesToEmit(host, targetSourceFile) {
         var options = host.getCompilerOptions();
         var isSourceFileFromExternalLibrary = function (file) { return host.isSourceFileFromExternalLibrary(file); };
+        var getResolvedProjectReferenceToRedirect = function (fileName) { return host.getResolvedProjectReferenceToRedirect(fileName); };
         if (options.outFile || options.out) {
             var moduleKind = ts.getEmitModuleKind(options);
             var moduleEmitEnabled_1 = options.emitDeclarationOnly || moduleKind === ts.ModuleKind.AMD || moduleKind === ts.ModuleKind.System;
             // Can emit only sources that are not declaration file and are either non module code or module with --module or --target es6 specified
             return ts.filter(host.getSourceFiles(), function (sourceFile) {
-                return (moduleEmitEnabled_1 || !ts.isExternalModule(sourceFile)) && sourceFileMayBeEmitted(sourceFile, options, isSourceFileFromExternalLibrary);
+                return (moduleEmitEnabled_1 || !ts.isExternalModule(sourceFile)) && sourceFileMayBeEmitted(sourceFile, options, isSourceFileFromExternalLibrary, getResolvedProjectReferenceToRedirect);
             });
         }
         else {
             var sourceFiles = targetSourceFile === undefined ? host.getSourceFiles() : [targetSourceFile];
-            return ts.filter(sourceFiles, function (sourceFile) { return sourceFileMayBeEmitted(sourceFile, options, isSourceFileFromExternalLibrary); });
+            return ts.filter(sourceFiles, function (sourceFile) { return sourceFileMayBeEmitted(sourceFile, options, isSourceFileFromExternalLibrary, getResolvedProjectReferenceToRedirect); });
         }
     }
     ts.getSourceFilesToEmit = getSourceFilesToEmit;
     /** Don't call this for `--outFile`, just for `--outDir` or plain emit. `--outFile` needs additional checks. */
-    function sourceFileMayBeEmitted(sourceFile, options, isSourceFileFromExternalLibrary) {
-        return !(options.noEmitForJsFiles && isSourceFileJS(sourceFile)) && !sourceFile.isDeclarationFile && !isSourceFileFromExternalLibrary(sourceFile);
+    function sourceFileMayBeEmitted(sourceFile, options, isSourceFileFromExternalLibrary, getResolvedProjectReferenceToRedirect) {
+        return !(options.noEmitForJsFiles && isSourceFileJS(sourceFile)) &&
+            !sourceFile.isDeclarationFile &&
+            !isSourceFileFromExternalLibrary(sourceFile) &&
+            !(isJsonSourceFile(sourceFile) && getResolvedProjectReferenceToRedirect(sourceFile.fileName));
     }
     ts.sourceFileMayBeEmitted = sourceFileMayBeEmitted;
     function getSourceFilePathInNewDir(fileName, host, newDirPath) {
@@ -11600,11 +11849,11 @@ var ts;
     }
     ts.parameterIsThisKeyword = parameterIsThisKeyword;
     function isThisIdentifier(node) {
-        return !!node && node.kind === 72 /* Identifier */ && identifierIsThisKeyword(node);
+        return !!node && node.kind === 73 /* Identifier */ && identifierIsThisKeyword(node);
     }
     ts.isThisIdentifier = isThisIdentifier;
     function identifierIsThisKeyword(id) {
-        return id.originalKeywordKind === 100 /* ThisKeyword */;
+        return id.originalKeywordKind === 101 /* ThisKeyword */;
     }
     ts.identifierIsThisKeyword = identifierIsThisKeyword;
     function getAllAccessorDeclarations(declarations, accessor) {
@@ -11615,10 +11864,10 @@ var ts;
         var setAccessor;
         if (hasDynamicName(accessor)) {
             firstAccessor = accessor;
-            if (accessor.kind === 158 /* GetAccessor */) {
+            if (accessor.kind === 159 /* GetAccessor */) {
                 getAccessor = accessor;
             }
-            else if (accessor.kind === 159 /* SetAccessor */) {
+            else if (accessor.kind === 160 /* SetAccessor */) {
                 setAccessor = accessor;
             }
             else {
@@ -11638,10 +11887,10 @@ var ts;
                         else if (!secondAccessor) {
                             secondAccessor = member;
                         }
-                        if (member.kind === 158 /* GetAccessor */ && !getAccessor) {
+                        if (member.kind === 159 /* GetAccessor */ && !getAccessor) {
                             getAccessor = member;
                         }
-                        if (member.kind === 159 /* SetAccessor */ && !setAccessor) {
+                        if (member.kind === 160 /* SetAccessor */ && !setAccessor) {
                             setAccessor = member;
                         }
                     }
@@ -11687,7 +11936,7 @@ var ts;
     ts.getJSDocTypeParameterDeclarations = getJSDocTypeParameterDeclarations;
     /** template tags are only available when a typedef isn't already using them */
     function isNonTypeAliasTemplate(tag) {
-        return ts.isJSDocTemplateTag(tag) && !(tag.parent.kind === 296 /* JSDocComment */ && tag.parent.tags.some(isJSDocTypeAlias));
+        return ts.isJSDocTemplateTag(tag) && !(tag.parent.kind === 297 /* JSDocComment */ && tag.parent.tags.some(isJSDocTypeAlias));
     }
     /**
      * Gets the effective type annotation of the value parameter of a set accessor. If the node
@@ -11927,7 +12176,7 @@ var ts;
                 flags |= modifierToFlag(modifier.kind);
             }
         }
-        if (node.flags & 4 /* NestedNamespace */ || (node.kind === 72 /* Identifier */ && node.isInJSDocNamespace)) {
+        if (node.flags & 4 /* NestedNamespace */ || (node.kind === 73 /* Identifier */ && node.isInJSDocNamespace)) {
             flags |= 1 /* Export */;
         }
         return flags;
@@ -11935,17 +12184,17 @@ var ts;
     ts.getModifierFlagsNoCache = getModifierFlagsNoCache;
     function modifierToFlag(token) {
         switch (token) {
-            case 116 /* StaticKeyword */: return 32 /* Static */;
-            case 115 /* PublicKeyword */: return 4 /* Public */;
-            case 114 /* ProtectedKeyword */: return 16 /* Protected */;
-            case 113 /* PrivateKeyword */: return 8 /* Private */;
-            case 118 /* AbstractKeyword */: return 128 /* Abstract */;
-            case 85 /* ExportKeyword */: return 1 /* Export */;
-            case 125 /* DeclareKeyword */: return 2 /* Ambient */;
-            case 77 /* ConstKeyword */: return 2048 /* Const */;
-            case 80 /* DefaultKeyword */: return 512 /* Default */;
-            case 121 /* AsyncKeyword */: return 256 /* Async */;
-            case 133 /* ReadonlyKeyword */: return 64 /* Readonly */;
+            case 117 /* StaticKeyword */: return 32 /* Static */;
+            case 116 /* PublicKeyword */: return 4 /* Public */;
+            case 115 /* ProtectedKeyword */: return 16 /* Protected */;
+            case 114 /* PrivateKeyword */: return 8 /* Private */;
+            case 119 /* AbstractKeyword */: return 128 /* Abstract */;
+            case 86 /* ExportKeyword */: return 1 /* Export */;
+            case 126 /* DeclareKeyword */: return 2 /* Ambient */;
+            case 78 /* ConstKeyword */: return 2048 /* Const */;
+            case 81 /* DefaultKeyword */: return 512 /* Default */;
+            case 122 /* AsyncKeyword */: return 256 /* Async */;
+            case 134 /* ReadonlyKeyword */: return 64 /* Readonly */;
         }
         return 0 /* None */;
     }
@@ -11957,7 +12206,7 @@ var ts;
     }
     ts.isLogicalOperator = isLogicalOperator;
     function isAssignmentOperator(token) {
-        return token >= 59 /* FirstAssignment */ && token <= 71 /* LastAssignment */;
+        return token >= 60 /* FirstAssignment */ && token <= 72 /* LastAssignment */;
     }
     ts.isAssignmentOperator = isAssignmentOperator;
     /** Get `C` given `N` if `N` is in the position `class C extends N` where `N` is an ExpressionWithTypeArguments. */
@@ -11970,14 +12219,14 @@ var ts;
         return ts.isExpressionWithTypeArguments(node)
             && ts.isHeritageClause(node.parent)
             && ts.isClassLike(node.parent.parent)
-            ? { class: node.parent.parent, isImplements: node.parent.token === 109 /* ImplementsKeyword */ }
+            ? { class: node.parent.parent, isImplements: node.parent.token === 110 /* ImplementsKeyword */ }
             : undefined;
     }
     ts.tryGetClassImplementingOrExtendingExpressionWithTypeArguments = tryGetClassImplementingOrExtendingExpressionWithTypeArguments;
     function isAssignmentExpression(node, excludeCompoundAssignment) {
         return ts.isBinaryExpression(node)
             && (excludeCompoundAssignment
-                ? node.operatorToken.kind === 59 /* EqualsToken */
+                ? node.operatorToken.kind === 60 /* EqualsToken */
                 : isAssignmentOperator(node.operatorToken.kind))
             && ts.isLeftHandSideExpression(node.left);
     }
@@ -11985,8 +12234,8 @@ var ts;
     function isDestructuringAssignment(node) {
         if (isAssignmentExpression(node, /*excludeCompoundAssignment*/ true)) {
             var kind = node.left.kind;
-            return kind === 188 /* ObjectLiteralExpression */
-                || kind === 187 /* ArrayLiteralExpression */;
+            return kind === 189 /* ObjectLiteralExpression */
+                || kind === 188 /* ArrayLiteralExpression */;
         }
         return false;
     }
@@ -11996,29 +12245,39 @@ var ts;
     }
     ts.isExpressionWithTypeArgumentsInClassExtendsClause = isExpressionWithTypeArgumentsInClassExtendsClause;
     function isEntityNameExpression(node) {
-        return node.kind === 72 /* Identifier */ || isPropertyAccessEntityNameExpression(node);
+        return node.kind === 73 /* Identifier */ || isPropertyAccessEntityNameExpression(node);
     }
     ts.isEntityNameExpression = isEntityNameExpression;
     function isPropertyAccessEntityNameExpression(node) {
         return ts.isPropertyAccessExpression(node) && isEntityNameExpression(node.expression);
     }
     ts.isPropertyAccessEntityNameExpression = isPropertyAccessEntityNameExpression;
+    function tryGetPropertyAccessOrIdentifierToString(expr) {
+        if (ts.isPropertyAccessExpression(expr)) {
+            return tryGetPropertyAccessOrIdentifierToString(expr.expression) + "." + expr.name;
+        }
+        if (ts.isIdentifier(expr)) {
+            return ts.unescapeLeadingUnderscores(expr.escapedText);
+        }
+        return undefined;
+    }
+    ts.tryGetPropertyAccessOrIdentifierToString = tryGetPropertyAccessOrIdentifierToString;
     function isPrototypeAccess(node) {
         return ts.isPropertyAccessExpression(node) && node.name.escapedText === "prototype";
     }
     ts.isPrototypeAccess = isPrototypeAccess;
     function isRightSideOfQualifiedNameOrPropertyAccess(node) {
-        return (node.parent.kind === 148 /* QualifiedName */ && node.parent.right === node) ||
-            (node.parent.kind === 189 /* PropertyAccessExpression */ && node.parent.name === node);
+        return (node.parent.kind === 149 /* QualifiedName */ && node.parent.right === node) ||
+            (node.parent.kind === 190 /* PropertyAccessExpression */ && node.parent.name === node);
     }
     ts.isRightSideOfQualifiedNameOrPropertyAccess = isRightSideOfQualifiedNameOrPropertyAccess;
     function isEmptyObjectLiteral(expression) {
-        return expression.kind === 188 /* ObjectLiteralExpression */ &&
+        return expression.kind === 189 /* ObjectLiteralExpression */ &&
             expression.properties.length === 0;
     }
     ts.isEmptyObjectLiteral = isEmptyObjectLiteral;
     function isEmptyArrayLiteral(expression) {
-        return expression.kind === 187 /* ArrayLiteralExpression */ &&
+        return expression.kind === 188 /* ArrayLiteralExpression */ &&
             expression.elements.length === 0;
     }
     ts.isEmptyArrayLiteral = isEmptyArrayLiteral;
@@ -12206,77 +12465,6 @@ var ts;
         return getNewLine ? getNewLine() : ts.sys ? ts.sys.newLine : carriageReturnLineFeed;
     }
     ts.getNewLineCharacter = getNewLineCharacter;
-    /**
-     * Formats an enum value as a string for debugging and debug assertions.
-     */
-    function formatEnum(value, enumObject, isFlags) {
-        if (value === void 0) { value = 0; }
-        var members = getEnumMembers(enumObject);
-        if (value === 0) {
-            return members.length > 0 && members[0][0] === 0 ? members[0][1] : "0";
-        }
-        if (isFlags) {
-            var result = "";
-            var remainingFlags = value;
-            for (var i = members.length - 1; i >= 0 && remainingFlags !== 0; i--) {
-                var _a = members[i], enumValue = _a[0], enumName = _a[1];
-                if (enumValue !== 0 && (remainingFlags & enumValue) === enumValue) {
-                    remainingFlags &= ~enumValue;
-                    result = "" + enumName + (result ? ", " : "") + result;
-                }
-            }
-            if (remainingFlags === 0) {
-                return result;
-            }
-        }
-        else {
-            for (var _i = 0, members_1 = members; _i < members_1.length; _i++) {
-                var _b = members_1[_i], enumValue = _b[0], enumName = _b[1];
-                if (enumValue === value) {
-                    return enumName;
-                }
-            }
-        }
-        return value.toString();
-    }
-    function getEnumMembers(enumObject) {
-        var result = [];
-        for (var name in enumObject) {
-            var value = enumObject[name];
-            if (typeof value === "number") {
-                result.push([value, name]);
-            }
-        }
-        return ts.stableSort(result, function (x, y) { return ts.compareValues(x[0], y[0]); });
-    }
-    function formatSyntaxKind(kind) {
-        return formatEnum(kind, ts.SyntaxKind, /*isFlags*/ false);
-    }
-    ts.formatSyntaxKind = formatSyntaxKind;
-    function formatModifierFlags(flags) {
-        return formatEnum(flags, ts.ModifierFlags, /*isFlags*/ true);
-    }
-    ts.formatModifierFlags = formatModifierFlags;
-    function formatTransformFlags(flags) {
-        return formatEnum(flags, ts.TransformFlags, /*isFlags*/ true);
-    }
-    ts.formatTransformFlags = formatTransformFlags;
-    function formatEmitFlags(flags) {
-        return formatEnum(flags, ts.EmitFlags, /*isFlags*/ true);
-    }
-    ts.formatEmitFlags = formatEmitFlags;
-    function formatSymbolFlags(flags) {
-        return formatEnum(flags, ts.SymbolFlags, /*isFlags*/ true);
-    }
-    ts.formatSymbolFlags = formatSymbolFlags;
-    function formatTypeFlags(flags) {
-        return formatEnum(flags, ts.TypeFlags, /*isFlags*/ true);
-    }
-    ts.formatTypeFlags = formatTypeFlags;
-    function formatObjectFlags(flags) {
-        return formatEnum(flags, ts.ObjectFlags, /*isFlags*/ true);
-    }
-    ts.formatObjectFlags = formatObjectFlags;
     /**
      * Creates a new TextRange from the provided pos and end.
      *
@@ -12366,6 +12554,10 @@ var ts;
         return positionsAreOnSameLine(range1.end, getStartPositionOfRange(range2, sourceFile), sourceFile);
     }
     ts.rangeEndIsOnSameLineAsRangeStart = rangeEndIsOnSameLineAsRangeStart;
+    function isNodeArrayMultiLine(list, sourceFile) {
+        return !positionsAreOnSameLine(list.pos, list.end, sourceFile);
+    }
+    ts.isNodeArrayMultiLine = isNodeArrayMultiLine;
     function positionsAreOnSameLine(pos1, pos2, sourceFile) {
         return pos1 === pos2 ||
             getLineOfLocalPosition(sourceFile, pos1) === getLineOfLocalPosition(sourceFile, pos2);
@@ -12383,8 +12575,8 @@ var ts;
         var parseNode = ts.getParseTreeNode(node);
         if (parseNode) {
             switch (parseNode.parent.kind) {
-                case 243 /* EnumDeclaration */:
-                case 244 /* ModuleDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     return parseNode === parseNode.parent.name;
             }
         }
@@ -12418,10 +12610,10 @@ var ts;
         }
         if (getCheckFlags(s) & 6 /* Synthetic */) {
             var checkFlags = s.checkFlags;
-            var accessModifier = checkFlags & 512 /* ContainsPrivate */ ? 8 /* Private */ :
-                checkFlags & 128 /* ContainsPublic */ ? 4 /* Public */ :
+            var accessModifier = checkFlags & 1024 /* ContainsPrivate */ ? 8 /* Private */ :
+                checkFlags & 256 /* ContainsPublic */ ? 4 /* Public */ :
                     16 /* Protected */;
-            var staticModifier = checkFlags & 1024 /* ContainsStatic */ ? 32 /* Static */ : 0;
+            var staticModifier = checkFlags & 2048 /* ContainsStatic */ ? 32 /* Static */ : 0;
             return accessModifier | staticModifier;
         }
         if (s.flags & 4194304 /* Prototype */) {
@@ -12461,35 +12653,35 @@ var ts;
         if (!parent)
             return 0 /* Read */;
         switch (parent.kind) {
-            case 195 /* ParenthesizedExpression */:
+            case 196 /* ParenthesizedExpression */:
                 return accessKind(parent);
-            case 203 /* PostfixUnaryExpression */:
-            case 202 /* PrefixUnaryExpression */:
+            case 204 /* PostfixUnaryExpression */:
+            case 203 /* PrefixUnaryExpression */:
                 var operator = parent.operator;
                 return operator === 44 /* PlusPlusToken */ || operator === 45 /* MinusMinusToken */ ? writeOrReadWrite() : 0 /* Read */;
-            case 204 /* BinaryExpression */:
+            case 205 /* BinaryExpression */:
                 var _a = parent, left = _a.left, operatorToken = _a.operatorToken;
                 return left === node && isAssignmentOperator(operatorToken.kind) ?
-                    operatorToken.kind === 59 /* EqualsToken */ ? 1 /* Write */ : writeOrReadWrite()
+                    operatorToken.kind === 60 /* EqualsToken */ ? 1 /* Write */ : writeOrReadWrite()
                     : 0 /* Read */;
-            case 189 /* PropertyAccessExpression */:
+            case 190 /* PropertyAccessExpression */:
                 return parent.name !== node ? 0 /* Read */ : accessKind(parent);
-            case 275 /* PropertyAssignment */: {
+            case 276 /* PropertyAssignment */: {
                 var parentAccess = accessKind(parent.parent);
                 // In `({ x: varname }) = { x: 1 }`, the left `x` is a read, the right `x` is a write.
                 return node === parent.name ? reverseAccessKind(parentAccess) : parentAccess;
             }
-            case 276 /* ShorthandPropertyAssignment */:
+            case 277 /* ShorthandPropertyAssignment */:
                 // Assume it's the local variable being accessed, since we don't check public properties for --noUnusedLocals.
                 return node === parent.objectAssignmentInitializer ? 0 /* Read */ : accessKind(parent.parent);
-            case 187 /* ArrayLiteralExpression */:
+            case 188 /* ArrayLiteralExpression */:
                 return accessKind(parent);
             default:
                 return 0 /* Read */;
         }
         function writeOrReadWrite() {
             // If grandparent is not an ExpressionStatement, this is used as an expression in addition to having a side effect.
-            return parent.parent && skipParenthesesUp(parent.parent).kind === 221 /* ExpressionStatement */ ? 1 /* Write */ : 2 /* ReadWrite */;
+            return parent.parent && skipParenthesesUp(parent.parent).kind === 222 /* ExpressionStatement */ ? 1 /* Write */ : 2 /* ReadWrite */;
         }
     }
     function reverseAccessKind(a) {
@@ -12592,7 +12784,7 @@ var ts;
     }
     ts.getClassLikeDeclarationOfSymbol = getClassLikeDeclarationOfSymbol;
     function getObjectFlags(type) {
-        return type.flags & 3768320 /* ObjectFlagsType */ ? type.objectFlags : 0;
+        return type.flags & 3899392 /* ObjectFlagsType */ ? type.objectFlags : 0;
     }
     ts.getObjectFlags = getObjectFlags;
     function typeHasCallOrConstructSignatures(type, checker) {
@@ -12644,32 +12836,32 @@ var ts;
     }
     ts.isObjectTypeDeclaration = isObjectTypeDeclaration;
     function isTypeNodeKind(kind) {
-        return (kind >= 163 /* FirstTypeNode */ && kind <= 183 /* LastTypeNode */)
-            || kind === 120 /* AnyKeyword */
-            || kind === 143 /* UnknownKeyword */
-            || kind === 135 /* NumberKeyword */
-            || kind === 146 /* BigIntKeyword */
-            || kind === 136 /* ObjectKeyword */
-            || kind === 123 /* BooleanKeyword */
-            || kind === 138 /* StringKeyword */
-            || kind === 139 /* SymbolKeyword */
-            || kind === 100 /* ThisKeyword */
-            || kind === 106 /* VoidKeyword */
-            || kind === 141 /* UndefinedKeyword */
-            || kind === 96 /* NullKeyword */
-            || kind === 132 /* NeverKeyword */
-            || kind === 211 /* ExpressionWithTypeArguments */
-            || kind === 289 /* JSDocAllType */
-            || kind === 290 /* JSDocUnknownType */
-            || kind === 291 /* JSDocNullableType */
-            || kind === 292 /* JSDocNonNullableType */
-            || kind === 293 /* JSDocOptionalType */
-            || kind === 294 /* JSDocFunctionType */
-            || kind === 295 /* JSDocVariadicType */;
+        return (kind >= 164 /* FirstTypeNode */ && kind <= 184 /* LastTypeNode */)
+            || kind === 121 /* AnyKeyword */
+            || kind === 144 /* UnknownKeyword */
+            || kind === 136 /* NumberKeyword */
+            || kind === 147 /* BigIntKeyword */
+            || kind === 137 /* ObjectKeyword */
+            || kind === 124 /* BooleanKeyword */
+            || kind === 139 /* StringKeyword */
+            || kind === 140 /* SymbolKeyword */
+            || kind === 101 /* ThisKeyword */
+            || kind === 107 /* VoidKeyword */
+            || kind === 142 /* UndefinedKeyword */
+            || kind === 97 /* NullKeyword */
+            || kind === 133 /* NeverKeyword */
+            || kind === 212 /* ExpressionWithTypeArguments */
+            || kind === 290 /* JSDocAllType */
+            || kind === 291 /* JSDocUnknownType */
+            || kind === 292 /* JSDocNullableType */
+            || kind === 293 /* JSDocNonNullableType */
+            || kind === 294 /* JSDocOptionalType */
+            || kind === 295 /* JSDocFunctionType */
+            || kind === 296 /* JSDocVariadicType */;
     }
     ts.isTypeNodeKind = isTypeNodeKind;
     function isAccessExpression(node) {
-        return node.kind === 189 /* PropertyAccessExpression */ || node.kind === 190 /* ElementAccessExpression */;
+        return node.kind === 190 /* PropertyAccessExpression */ || node.kind === 191 /* ElementAccessExpression */;
     }
     ts.isAccessExpression = isAccessExpression;
     function isBundleFileTextLike(section) {
@@ -12686,8 +12878,10 @@ var ts;
 (function (ts) {
     function getDefaultLibFileName(options) {
         switch (options.target) {
-            case 7 /* ESNext */:
+            case 99 /* ESNext */:
                 return "lib.esnext.full.d.ts";
+            case 7 /* ES2020 */:
+                return "lib.es2020.full.d.ts";
             case 6 /* ES2019 */:
                 return "lib.es2019.full.d.ts";
             case 5 /* ES2018 */:
@@ -12904,9 +13098,9 @@ var ts;
     }
     ts.collapseTextChangeRangesAcrossMultipleVersions = collapseTextChangeRangesAcrossMultipleVersions;
     function getTypeParameterOwner(d) {
-        if (d && d.kind === 150 /* TypeParameter */) {
+        if (d && d.kind === 151 /* TypeParameter */) {
             for (var current = d; current; current = current.parent) {
-                if (ts.isFunctionLike(current) || ts.isClassLike(current) || current.kind === 241 /* InterfaceDeclaration */) {
+                if (ts.isFunctionLike(current) || ts.isClassLike(current) || current.kind === 242 /* InterfaceDeclaration */) {
                     return current;
                 }
             }
@@ -12914,7 +13108,7 @@ var ts;
     }
     ts.getTypeParameterOwner = getTypeParameterOwner;
     function isParameterPropertyDeclaration(node) {
-        return ts.hasModifier(node, 92 /* ParameterPropertyModifier */) && node.parent.kind === 157 /* Constructor */;
+        return ts.hasModifier(node, 92 /* ParameterPropertyModifier */) && node.parent.kind === 158 /* Constructor */;
     }
     ts.isParameterPropertyDeclaration = isParameterPropertyDeclaration;
     function isEmptyBindingPattern(node) {
@@ -12944,14 +13138,14 @@ var ts;
             node = walkUpBindingElementsAndPatterns(node);
         }
         var flags = getFlags(node);
-        if (node.kind === 237 /* VariableDeclaration */) {
+        if (node.kind === 238 /* VariableDeclaration */) {
             node = node.parent;
         }
-        if (node && node.kind === 238 /* VariableDeclarationList */) {
+        if (node && node.kind === 239 /* VariableDeclarationList */) {
             flags |= getFlags(node);
             node = node.parent;
         }
-        if (node && node.kind === 219 /* VariableStatement */) {
+        if (node && node.kind === 220 /* VariableStatement */) {
             flags |= getFlags(node);
         }
         return flags;
@@ -13097,27 +13291,27 @@ var ts;
         }
         // Covers remaining cases (returning undefined if none match).
         switch (hostNode.kind) {
-            case 219 /* VariableStatement */:
+            case 220 /* VariableStatement */:
                 if (hostNode.declarationList && hostNode.declarationList.declarations[0]) {
                     return getDeclarationIdentifier(hostNode.declarationList.declarations[0]);
                 }
                 break;
-            case 221 /* ExpressionStatement */:
+            case 222 /* ExpressionStatement */:
                 var expr = hostNode.expression;
                 switch (expr.kind) {
-                    case 189 /* PropertyAccessExpression */:
+                    case 190 /* PropertyAccessExpression */:
                         return expr.name;
-                    case 190 /* ElementAccessExpression */:
+                    case 191 /* ElementAccessExpression */:
                         var arg = expr.argumentExpression;
                         if (ts.isIdentifier(arg)) {
                             return arg;
                         }
                 }
                 break;
-            case 195 /* ParenthesizedExpression */: {
+            case 196 /* ParenthesizedExpression */: {
                 return getDeclarationIdentifier(hostNode.expression);
             }
-            case 233 /* LabeledStatement */: {
+            case 234 /* LabeledStatement */: {
                 if (ts.isDeclaration(hostNode.statement) || ts.isExpression(hostNode.statement)) {
                     return getDeclarationIdentifier(hostNode.statement);
                 }
@@ -13141,18 +13335,18 @@ var ts;
     /** @internal */
     function getNonAssignedNameOfDeclaration(declaration) {
         switch (declaration.kind) {
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 return declaration;
-            case 310 /* JSDocPropertyTag */:
-            case 304 /* JSDocParameterTag */: {
+            case 312 /* JSDocPropertyTag */:
+            case 306 /* JSDocParameterTag */: {
                 var name = declaration.name;
-                if (name.kind === 148 /* QualifiedName */) {
+                if (name.kind === 149 /* QualifiedName */) {
                     return name.right;
                 }
                 break;
             }
-            case 191 /* CallExpression */:
-            case 204 /* BinaryExpression */: {
+            case 192 /* CallExpression */:
+            case 205 /* BinaryExpression */: {
                 var expr = declaration;
                 switch (ts.getAssignmentDeclarationKind(expr)) {
                     case 1 /* ExportsProperty */:
@@ -13168,9 +13362,9 @@ var ts;
                         return undefined;
                 }
             }
-            case 309 /* JSDocTypedefTag */:
+            case 311 /* JSDocTypedefTag */:
                 return getNameOfJSDocTypedef(declaration);
-            case 254 /* ExportAssignment */: {
+            case 255 /* ExportAssignment */: {
                 var expression = declaration.expression;
                 return ts.isIdentifier(expression) ? expression : undefined;
             }
@@ -13200,6 +13394,9 @@ var ts;
                 return node.parent.left.name;
             }
         }
+        else if (ts.isVariableDeclaration(node.parent) && ts.isIdentifier(node.parent.name)) {
+            return node.parent.name;
+        }
     }
     /**
      * Gets the JSDoc parameter tags for the node if present.
@@ -13372,7 +13569,7 @@ var ts;
             return ts.emptyArray;
         }
         if (ts.isJSDocTypeAlias(node)) {
-            ts.Debug.assert(node.parent.kind === 296 /* JSDocComment */);
+            ts.Debug.assert(node.parent.kind === 297 /* JSDocComment */);
             return ts.flatMap(node.parent.tags, function (tag) { return ts.isJSDocTemplateTag(tag) ? tag.typeParameters : undefined; });
         }
         if (node.typeParameters) {
@@ -13440,198 +13637,198 @@ var ts;
     }
     ts.isTemplateTail = isTemplateTail;
     function isIdentifier(node) {
-        return node.kind === 72 /* Identifier */;
+        return node.kind === 73 /* Identifier */;
     }
     ts.isIdentifier = isIdentifier;
     // Names
     function isQualifiedName(node) {
-        return node.kind === 148 /* QualifiedName */;
+        return node.kind === 149 /* QualifiedName */;
     }
     ts.isQualifiedName = isQualifiedName;
     function isComputedPropertyName(node) {
-        return node.kind === 149 /* ComputedPropertyName */;
+        return node.kind === 150 /* ComputedPropertyName */;
     }
     ts.isComputedPropertyName = isComputedPropertyName;
     // Signature elements
     function isTypeParameterDeclaration(node) {
-        return node.kind === 150 /* TypeParameter */;
+        return node.kind === 151 /* TypeParameter */;
     }
     ts.isTypeParameterDeclaration = isTypeParameterDeclaration;
     function isParameter(node) {
-        return node.kind === 151 /* Parameter */;
+        return node.kind === 152 /* Parameter */;
     }
     ts.isParameter = isParameter;
     function isDecorator(node) {
-        return node.kind === 152 /* Decorator */;
+        return node.kind === 153 /* Decorator */;
     }
     ts.isDecorator = isDecorator;
     // TypeMember
     function isPropertySignature(node) {
-        return node.kind === 153 /* PropertySignature */;
+        return node.kind === 154 /* PropertySignature */;
     }
     ts.isPropertySignature = isPropertySignature;
     function isPropertyDeclaration(node) {
-        return node.kind === 154 /* PropertyDeclaration */;
+        return node.kind === 155 /* PropertyDeclaration */;
     }
     ts.isPropertyDeclaration = isPropertyDeclaration;
     function isMethodSignature(node) {
-        return node.kind === 155 /* MethodSignature */;
+        return node.kind === 156 /* MethodSignature */;
     }
     ts.isMethodSignature = isMethodSignature;
     function isMethodDeclaration(node) {
-        return node.kind === 156 /* MethodDeclaration */;
+        return node.kind === 157 /* MethodDeclaration */;
     }
     ts.isMethodDeclaration = isMethodDeclaration;
     function isConstructorDeclaration(node) {
-        return node.kind === 157 /* Constructor */;
+        return node.kind === 158 /* Constructor */;
     }
     ts.isConstructorDeclaration = isConstructorDeclaration;
     function isGetAccessorDeclaration(node) {
-        return node.kind === 158 /* GetAccessor */;
+        return node.kind === 159 /* GetAccessor */;
     }
     ts.isGetAccessorDeclaration = isGetAccessorDeclaration;
     function isSetAccessorDeclaration(node) {
-        return node.kind === 159 /* SetAccessor */;
+        return node.kind === 160 /* SetAccessor */;
     }
     ts.isSetAccessorDeclaration = isSetAccessorDeclaration;
     function isCallSignatureDeclaration(node) {
-        return node.kind === 160 /* CallSignature */;
+        return node.kind === 161 /* CallSignature */;
     }
     ts.isCallSignatureDeclaration = isCallSignatureDeclaration;
     function isConstructSignatureDeclaration(node) {
-        return node.kind === 161 /* ConstructSignature */;
+        return node.kind === 162 /* ConstructSignature */;
     }
     ts.isConstructSignatureDeclaration = isConstructSignatureDeclaration;
     function isIndexSignatureDeclaration(node) {
-        return node.kind === 162 /* IndexSignature */;
+        return node.kind === 163 /* IndexSignature */;
     }
     ts.isIndexSignatureDeclaration = isIndexSignatureDeclaration;
     /* @internal */
     function isGetOrSetAccessorDeclaration(node) {
-        return node.kind === 159 /* SetAccessor */ || node.kind === 158 /* GetAccessor */;
+        return node.kind === 160 /* SetAccessor */ || node.kind === 159 /* GetAccessor */;
     }
     ts.isGetOrSetAccessorDeclaration = isGetOrSetAccessorDeclaration;
     // Type
     function isTypePredicateNode(node) {
-        return node.kind === 163 /* TypePredicate */;
+        return node.kind === 164 /* TypePredicate */;
     }
     ts.isTypePredicateNode = isTypePredicateNode;
     function isTypeReferenceNode(node) {
-        return node.kind === 164 /* TypeReference */;
+        return node.kind === 165 /* TypeReference */;
     }
     ts.isTypeReferenceNode = isTypeReferenceNode;
     function isFunctionTypeNode(node) {
-        return node.kind === 165 /* FunctionType */;
+        return node.kind === 166 /* FunctionType */;
     }
     ts.isFunctionTypeNode = isFunctionTypeNode;
     function isConstructorTypeNode(node) {
-        return node.kind === 166 /* ConstructorType */;
+        return node.kind === 167 /* ConstructorType */;
     }
     ts.isConstructorTypeNode = isConstructorTypeNode;
     function isTypeQueryNode(node) {
-        return node.kind === 167 /* TypeQuery */;
+        return node.kind === 168 /* TypeQuery */;
     }
     ts.isTypeQueryNode = isTypeQueryNode;
     function isTypeLiteralNode(node) {
-        return node.kind === 168 /* TypeLiteral */;
+        return node.kind === 169 /* TypeLiteral */;
     }
     ts.isTypeLiteralNode = isTypeLiteralNode;
     function isArrayTypeNode(node) {
-        return node.kind === 169 /* ArrayType */;
+        return node.kind === 170 /* ArrayType */;
     }
     ts.isArrayTypeNode = isArrayTypeNode;
     function isTupleTypeNode(node) {
-        return node.kind === 170 /* TupleType */;
+        return node.kind === 171 /* TupleType */;
     }
     ts.isTupleTypeNode = isTupleTypeNode;
     function isUnionTypeNode(node) {
-        return node.kind === 173 /* UnionType */;
+        return node.kind === 174 /* UnionType */;
     }
     ts.isUnionTypeNode = isUnionTypeNode;
     function isIntersectionTypeNode(node) {
-        return node.kind === 174 /* IntersectionType */;
+        return node.kind === 175 /* IntersectionType */;
     }
     ts.isIntersectionTypeNode = isIntersectionTypeNode;
     function isConditionalTypeNode(node) {
-        return node.kind === 175 /* ConditionalType */;
+        return node.kind === 176 /* ConditionalType */;
     }
     ts.isConditionalTypeNode = isConditionalTypeNode;
     function isInferTypeNode(node) {
-        return node.kind === 176 /* InferType */;
+        return node.kind === 177 /* InferType */;
     }
     ts.isInferTypeNode = isInferTypeNode;
     function isParenthesizedTypeNode(node) {
-        return node.kind === 177 /* ParenthesizedType */;
+        return node.kind === 178 /* ParenthesizedType */;
     }
     ts.isParenthesizedTypeNode = isParenthesizedTypeNode;
     function isThisTypeNode(node) {
-        return node.kind === 178 /* ThisType */;
+        return node.kind === 179 /* ThisType */;
     }
     ts.isThisTypeNode = isThisTypeNode;
     function isTypeOperatorNode(node) {
-        return node.kind === 179 /* TypeOperator */;
+        return node.kind === 180 /* TypeOperator */;
     }
     ts.isTypeOperatorNode = isTypeOperatorNode;
     function isIndexedAccessTypeNode(node) {
-        return node.kind === 180 /* IndexedAccessType */;
+        return node.kind === 181 /* IndexedAccessType */;
     }
     ts.isIndexedAccessTypeNode = isIndexedAccessTypeNode;
     function isMappedTypeNode(node) {
-        return node.kind === 181 /* MappedType */;
+        return node.kind === 182 /* MappedType */;
     }
     ts.isMappedTypeNode = isMappedTypeNode;
     function isLiteralTypeNode(node) {
-        return node.kind === 182 /* LiteralType */;
+        return node.kind === 183 /* LiteralType */;
     }
     ts.isLiteralTypeNode = isLiteralTypeNode;
     function isImportTypeNode(node) {
-        return node.kind === 183 /* ImportType */;
+        return node.kind === 184 /* ImportType */;
     }
     ts.isImportTypeNode = isImportTypeNode;
     // Binding patterns
     function isObjectBindingPattern(node) {
-        return node.kind === 184 /* ObjectBindingPattern */;
+        return node.kind === 185 /* ObjectBindingPattern */;
     }
     ts.isObjectBindingPattern = isObjectBindingPattern;
     function isArrayBindingPattern(node) {
-        return node.kind === 185 /* ArrayBindingPattern */;
+        return node.kind === 186 /* ArrayBindingPattern */;
     }
     ts.isArrayBindingPattern = isArrayBindingPattern;
     function isBindingElement(node) {
-        return node.kind === 186 /* BindingElement */;
+        return node.kind === 187 /* BindingElement */;
     }
     ts.isBindingElement = isBindingElement;
     // Expression
     function isArrayLiteralExpression(node) {
-        return node.kind === 187 /* ArrayLiteralExpression */;
+        return node.kind === 188 /* ArrayLiteralExpression */;
     }
     ts.isArrayLiteralExpression = isArrayLiteralExpression;
     function isObjectLiteralExpression(node) {
-        return node.kind === 188 /* ObjectLiteralExpression */;
+        return node.kind === 189 /* ObjectLiteralExpression */;
     }
     ts.isObjectLiteralExpression = isObjectLiteralExpression;
     function isPropertyAccessExpression(node) {
-        return node.kind === 189 /* PropertyAccessExpression */;
+        return node.kind === 190 /* PropertyAccessExpression */;
     }
     ts.isPropertyAccessExpression = isPropertyAccessExpression;
     function isElementAccessExpression(node) {
-        return node.kind === 190 /* ElementAccessExpression */;
+        return node.kind === 191 /* ElementAccessExpression */;
     }
     ts.isElementAccessExpression = isElementAccessExpression;
     function isCallExpression(node) {
-        return node.kind === 191 /* CallExpression */;
+        return node.kind === 192 /* CallExpression */;
     }
     ts.isCallExpression = isCallExpression;
     function isNewExpression(node) {
-        return node.kind === 192 /* NewExpression */;
+        return node.kind === 193 /* NewExpression */;
     }
     ts.isNewExpression = isNewExpression;
     function isTaggedTemplateExpression(node) {
-        return node.kind === 193 /* TaggedTemplateExpression */;
+        return node.kind === 194 /* TaggedTemplateExpression */;
     }
     ts.isTaggedTemplateExpression = isTaggedTemplateExpression;
     function isTypeAssertion(node) {
-        return node.kind === 194 /* TypeAssertionExpression */;
+        return node.kind === 195 /* TypeAssertionExpression */;
     }
     ts.isTypeAssertion = isTypeAssertion;
     function isConstTypeReference(node) {
@@ -13640,376 +13837,376 @@ var ts;
     }
     ts.isConstTypeReference = isConstTypeReference;
     function isParenthesizedExpression(node) {
-        return node.kind === 195 /* ParenthesizedExpression */;
+        return node.kind === 196 /* ParenthesizedExpression */;
     }
     ts.isParenthesizedExpression = isParenthesizedExpression;
     function skipPartiallyEmittedExpressions(node) {
-        while (node.kind === 313 /* PartiallyEmittedExpression */) {
+        while (node.kind === 315 /* PartiallyEmittedExpression */) {
             node = node.expression;
         }
         return node;
     }
     ts.skipPartiallyEmittedExpressions = skipPartiallyEmittedExpressions;
     function isFunctionExpression(node) {
-        return node.kind === 196 /* FunctionExpression */;
+        return node.kind === 197 /* FunctionExpression */;
     }
     ts.isFunctionExpression = isFunctionExpression;
     function isArrowFunction(node) {
-        return node.kind === 197 /* ArrowFunction */;
+        return node.kind === 198 /* ArrowFunction */;
     }
     ts.isArrowFunction = isArrowFunction;
     function isDeleteExpression(node) {
-        return node.kind === 198 /* DeleteExpression */;
+        return node.kind === 199 /* DeleteExpression */;
     }
     ts.isDeleteExpression = isDeleteExpression;
     function isTypeOfExpression(node) {
-        return node.kind === 199 /* TypeOfExpression */;
+        return node.kind === 200 /* TypeOfExpression */;
     }
     ts.isTypeOfExpression = isTypeOfExpression;
     function isVoidExpression(node) {
-        return node.kind === 200 /* VoidExpression */;
+        return node.kind === 201 /* VoidExpression */;
     }
     ts.isVoidExpression = isVoidExpression;
     function isAwaitExpression(node) {
-        return node.kind === 201 /* AwaitExpression */;
+        return node.kind === 202 /* AwaitExpression */;
     }
     ts.isAwaitExpression = isAwaitExpression;
     function isPrefixUnaryExpression(node) {
-        return node.kind === 202 /* PrefixUnaryExpression */;
+        return node.kind === 203 /* PrefixUnaryExpression */;
     }
     ts.isPrefixUnaryExpression = isPrefixUnaryExpression;
     function isPostfixUnaryExpression(node) {
-        return node.kind === 203 /* PostfixUnaryExpression */;
+        return node.kind === 204 /* PostfixUnaryExpression */;
     }
     ts.isPostfixUnaryExpression = isPostfixUnaryExpression;
     function isBinaryExpression(node) {
-        return node.kind === 204 /* BinaryExpression */;
+        return node.kind === 205 /* BinaryExpression */;
     }
     ts.isBinaryExpression = isBinaryExpression;
     function isConditionalExpression(node) {
-        return node.kind === 205 /* ConditionalExpression */;
+        return node.kind === 206 /* ConditionalExpression */;
     }
     ts.isConditionalExpression = isConditionalExpression;
     function isTemplateExpression(node) {
-        return node.kind === 206 /* TemplateExpression */;
+        return node.kind === 207 /* TemplateExpression */;
     }
     ts.isTemplateExpression = isTemplateExpression;
     function isYieldExpression(node) {
-        return node.kind === 207 /* YieldExpression */;
+        return node.kind === 208 /* YieldExpression */;
     }
     ts.isYieldExpression = isYieldExpression;
     function isSpreadElement(node) {
-        return node.kind === 208 /* SpreadElement */;
+        return node.kind === 209 /* SpreadElement */;
     }
     ts.isSpreadElement = isSpreadElement;
     function isClassExpression(node) {
-        return node.kind === 209 /* ClassExpression */;
+        return node.kind === 210 /* ClassExpression */;
     }
     ts.isClassExpression = isClassExpression;
     function isOmittedExpression(node) {
-        return node.kind === 210 /* OmittedExpression */;
+        return node.kind === 211 /* OmittedExpression */;
     }
     ts.isOmittedExpression = isOmittedExpression;
     function isExpressionWithTypeArguments(node) {
-        return node.kind === 211 /* ExpressionWithTypeArguments */;
+        return node.kind === 212 /* ExpressionWithTypeArguments */;
     }
     ts.isExpressionWithTypeArguments = isExpressionWithTypeArguments;
     function isAsExpression(node) {
-        return node.kind === 212 /* AsExpression */;
+        return node.kind === 213 /* AsExpression */;
     }
     ts.isAsExpression = isAsExpression;
     function isNonNullExpression(node) {
-        return node.kind === 213 /* NonNullExpression */;
+        return node.kind === 214 /* NonNullExpression */;
     }
     ts.isNonNullExpression = isNonNullExpression;
     function isMetaProperty(node) {
-        return node.kind === 214 /* MetaProperty */;
+        return node.kind === 215 /* MetaProperty */;
     }
     ts.isMetaProperty = isMetaProperty;
     // Misc
     function isTemplateSpan(node) {
-        return node.kind === 216 /* TemplateSpan */;
+        return node.kind === 217 /* TemplateSpan */;
     }
     ts.isTemplateSpan = isTemplateSpan;
     function isSemicolonClassElement(node) {
-        return node.kind === 217 /* SemicolonClassElement */;
+        return node.kind === 218 /* SemicolonClassElement */;
     }
     ts.isSemicolonClassElement = isSemicolonClassElement;
     // Block
     function isBlock(node) {
-        return node.kind === 218 /* Block */;
+        return node.kind === 219 /* Block */;
     }
     ts.isBlock = isBlock;
     function isVariableStatement(node) {
-        return node.kind === 219 /* VariableStatement */;
+        return node.kind === 220 /* VariableStatement */;
     }
     ts.isVariableStatement = isVariableStatement;
     function isEmptyStatement(node) {
-        return node.kind === 220 /* EmptyStatement */;
+        return node.kind === 221 /* EmptyStatement */;
     }
     ts.isEmptyStatement = isEmptyStatement;
     function isExpressionStatement(node) {
-        return node.kind === 221 /* ExpressionStatement */;
+        return node.kind === 222 /* ExpressionStatement */;
     }
     ts.isExpressionStatement = isExpressionStatement;
     function isIfStatement(node) {
-        return node.kind === 222 /* IfStatement */;
+        return node.kind === 223 /* IfStatement */;
     }
     ts.isIfStatement = isIfStatement;
     function isDoStatement(node) {
-        return node.kind === 223 /* DoStatement */;
+        return node.kind === 224 /* DoStatement */;
     }
     ts.isDoStatement = isDoStatement;
     function isWhileStatement(node) {
-        return node.kind === 224 /* WhileStatement */;
+        return node.kind === 225 /* WhileStatement */;
     }
     ts.isWhileStatement = isWhileStatement;
     function isForStatement(node) {
-        return node.kind === 225 /* ForStatement */;
+        return node.kind === 226 /* ForStatement */;
     }
     ts.isForStatement = isForStatement;
     function isForInStatement(node) {
-        return node.kind === 226 /* ForInStatement */;
+        return node.kind === 227 /* ForInStatement */;
     }
     ts.isForInStatement = isForInStatement;
     function isForOfStatement(node) {
-        return node.kind === 227 /* ForOfStatement */;
+        return node.kind === 228 /* ForOfStatement */;
     }
     ts.isForOfStatement = isForOfStatement;
     function isContinueStatement(node) {
-        return node.kind === 228 /* ContinueStatement */;
+        return node.kind === 229 /* ContinueStatement */;
     }
     ts.isContinueStatement = isContinueStatement;
     function isBreakStatement(node) {
-        return node.kind === 229 /* BreakStatement */;
+        return node.kind === 230 /* BreakStatement */;
     }
     ts.isBreakStatement = isBreakStatement;
     function isBreakOrContinueStatement(node) {
-        return node.kind === 229 /* BreakStatement */ || node.kind === 228 /* ContinueStatement */;
+        return node.kind === 230 /* BreakStatement */ || node.kind === 229 /* ContinueStatement */;
     }
     ts.isBreakOrContinueStatement = isBreakOrContinueStatement;
     function isReturnStatement(node) {
-        return node.kind === 230 /* ReturnStatement */;
+        return node.kind === 231 /* ReturnStatement */;
     }
     ts.isReturnStatement = isReturnStatement;
     function isWithStatement(node) {
-        return node.kind === 231 /* WithStatement */;
+        return node.kind === 232 /* WithStatement */;
     }
     ts.isWithStatement = isWithStatement;
     function isSwitchStatement(node) {
-        return node.kind === 232 /* SwitchStatement */;
+        return node.kind === 233 /* SwitchStatement */;
     }
     ts.isSwitchStatement = isSwitchStatement;
     function isLabeledStatement(node) {
-        return node.kind === 233 /* LabeledStatement */;
+        return node.kind === 234 /* LabeledStatement */;
     }
     ts.isLabeledStatement = isLabeledStatement;
     function isThrowStatement(node) {
-        return node.kind === 234 /* ThrowStatement */;
+        return node.kind === 235 /* ThrowStatement */;
     }
     ts.isThrowStatement = isThrowStatement;
     function isTryStatement(node) {
-        return node.kind === 235 /* TryStatement */;
+        return node.kind === 236 /* TryStatement */;
     }
     ts.isTryStatement = isTryStatement;
     function isDebuggerStatement(node) {
-        return node.kind === 236 /* DebuggerStatement */;
+        return node.kind === 237 /* DebuggerStatement */;
     }
     ts.isDebuggerStatement = isDebuggerStatement;
     function isVariableDeclaration(node) {
-        return node.kind === 237 /* VariableDeclaration */;
+        return node.kind === 238 /* VariableDeclaration */;
     }
     ts.isVariableDeclaration = isVariableDeclaration;
     function isVariableDeclarationList(node) {
-        return node.kind === 238 /* VariableDeclarationList */;
+        return node.kind === 239 /* VariableDeclarationList */;
     }
     ts.isVariableDeclarationList = isVariableDeclarationList;
     function isFunctionDeclaration(node) {
-        return node.kind === 239 /* FunctionDeclaration */;
+        return node.kind === 240 /* FunctionDeclaration */;
     }
     ts.isFunctionDeclaration = isFunctionDeclaration;
     function isClassDeclaration(node) {
-        return node.kind === 240 /* ClassDeclaration */;
+        return node.kind === 241 /* ClassDeclaration */;
     }
     ts.isClassDeclaration = isClassDeclaration;
     function isInterfaceDeclaration(node) {
-        return node.kind === 241 /* InterfaceDeclaration */;
+        return node.kind === 242 /* InterfaceDeclaration */;
     }
     ts.isInterfaceDeclaration = isInterfaceDeclaration;
     function isTypeAliasDeclaration(node) {
-        return node.kind === 242 /* TypeAliasDeclaration */;
+        return node.kind === 243 /* TypeAliasDeclaration */;
     }
     ts.isTypeAliasDeclaration = isTypeAliasDeclaration;
     function isEnumDeclaration(node) {
-        return node.kind === 243 /* EnumDeclaration */;
+        return node.kind === 244 /* EnumDeclaration */;
     }
     ts.isEnumDeclaration = isEnumDeclaration;
     function isModuleDeclaration(node) {
-        return node.kind === 244 /* ModuleDeclaration */;
+        return node.kind === 245 /* ModuleDeclaration */;
     }
     ts.isModuleDeclaration = isModuleDeclaration;
     function isModuleBlock(node) {
-        return node.kind === 245 /* ModuleBlock */;
+        return node.kind === 246 /* ModuleBlock */;
     }
     ts.isModuleBlock = isModuleBlock;
     function isCaseBlock(node) {
-        return node.kind === 246 /* CaseBlock */;
+        return node.kind === 247 /* CaseBlock */;
     }
     ts.isCaseBlock = isCaseBlock;
     function isNamespaceExportDeclaration(node) {
-        return node.kind === 247 /* NamespaceExportDeclaration */;
+        return node.kind === 248 /* NamespaceExportDeclaration */;
     }
     ts.isNamespaceExportDeclaration = isNamespaceExportDeclaration;
     function isImportEqualsDeclaration(node) {
-        return node.kind === 248 /* ImportEqualsDeclaration */;
+        return node.kind === 249 /* ImportEqualsDeclaration */;
     }
     ts.isImportEqualsDeclaration = isImportEqualsDeclaration;
     function isImportDeclaration(node) {
-        return node.kind === 249 /* ImportDeclaration */;
+        return node.kind === 250 /* ImportDeclaration */;
     }
     ts.isImportDeclaration = isImportDeclaration;
     function isImportClause(node) {
-        return node.kind === 250 /* ImportClause */;
+        return node.kind === 251 /* ImportClause */;
     }
     ts.isImportClause = isImportClause;
     function isNamespaceImport(node) {
-        return node.kind === 251 /* NamespaceImport */;
+        return node.kind === 252 /* NamespaceImport */;
     }
     ts.isNamespaceImport = isNamespaceImport;
     function isNamedImports(node) {
-        return node.kind === 252 /* NamedImports */;
+        return node.kind === 253 /* NamedImports */;
     }
     ts.isNamedImports = isNamedImports;
     function isImportSpecifier(node) {
-        return node.kind === 253 /* ImportSpecifier */;
+        return node.kind === 254 /* ImportSpecifier */;
     }
     ts.isImportSpecifier = isImportSpecifier;
     function isExportAssignment(node) {
-        return node.kind === 254 /* ExportAssignment */;
+        return node.kind === 255 /* ExportAssignment */;
     }
     ts.isExportAssignment = isExportAssignment;
     function isExportDeclaration(node) {
-        return node.kind === 255 /* ExportDeclaration */;
+        return node.kind === 256 /* ExportDeclaration */;
     }
     ts.isExportDeclaration = isExportDeclaration;
     function isNamedExports(node) {
-        return node.kind === 256 /* NamedExports */;
+        return node.kind === 257 /* NamedExports */;
     }
     ts.isNamedExports = isNamedExports;
     function isExportSpecifier(node) {
-        return node.kind === 257 /* ExportSpecifier */;
+        return node.kind === 258 /* ExportSpecifier */;
     }
     ts.isExportSpecifier = isExportSpecifier;
     function isMissingDeclaration(node) {
-        return node.kind === 258 /* MissingDeclaration */;
+        return node.kind === 259 /* MissingDeclaration */;
     }
     ts.isMissingDeclaration = isMissingDeclaration;
     // Module References
     function isExternalModuleReference(node) {
-        return node.kind === 259 /* ExternalModuleReference */;
+        return node.kind === 260 /* ExternalModuleReference */;
     }
     ts.isExternalModuleReference = isExternalModuleReference;
     // JSX
     function isJsxElement(node) {
-        return node.kind === 260 /* JsxElement */;
+        return node.kind === 261 /* JsxElement */;
     }
     ts.isJsxElement = isJsxElement;
     function isJsxSelfClosingElement(node) {
-        return node.kind === 261 /* JsxSelfClosingElement */;
+        return node.kind === 262 /* JsxSelfClosingElement */;
     }
     ts.isJsxSelfClosingElement = isJsxSelfClosingElement;
     function isJsxOpeningElement(node) {
-        return node.kind === 262 /* JsxOpeningElement */;
+        return node.kind === 263 /* JsxOpeningElement */;
     }
     ts.isJsxOpeningElement = isJsxOpeningElement;
     function isJsxClosingElement(node) {
-        return node.kind === 263 /* JsxClosingElement */;
+        return node.kind === 264 /* JsxClosingElement */;
     }
     ts.isJsxClosingElement = isJsxClosingElement;
     function isJsxFragment(node) {
-        return node.kind === 264 /* JsxFragment */;
+        return node.kind === 265 /* JsxFragment */;
     }
     ts.isJsxFragment = isJsxFragment;
     function isJsxOpeningFragment(node) {
-        return node.kind === 265 /* JsxOpeningFragment */;
+        return node.kind === 266 /* JsxOpeningFragment */;
     }
     ts.isJsxOpeningFragment = isJsxOpeningFragment;
     function isJsxClosingFragment(node) {
-        return node.kind === 266 /* JsxClosingFragment */;
+        return node.kind === 267 /* JsxClosingFragment */;
     }
     ts.isJsxClosingFragment = isJsxClosingFragment;
     function isJsxAttribute(node) {
-        return node.kind === 267 /* JsxAttribute */;
+        return node.kind === 268 /* JsxAttribute */;
     }
     ts.isJsxAttribute = isJsxAttribute;
     function isJsxAttributes(node) {
-        return node.kind === 268 /* JsxAttributes */;
+        return node.kind === 269 /* JsxAttributes */;
     }
     ts.isJsxAttributes = isJsxAttributes;
     function isJsxSpreadAttribute(node) {
-        return node.kind === 269 /* JsxSpreadAttribute */;
+        return node.kind === 270 /* JsxSpreadAttribute */;
     }
     ts.isJsxSpreadAttribute = isJsxSpreadAttribute;
     function isJsxExpression(node) {
-        return node.kind === 270 /* JsxExpression */;
+        return node.kind === 271 /* JsxExpression */;
     }
     ts.isJsxExpression = isJsxExpression;
     // Clauses
     function isCaseClause(node) {
-        return node.kind === 271 /* CaseClause */;
+        return node.kind === 272 /* CaseClause */;
     }
     ts.isCaseClause = isCaseClause;
     function isDefaultClause(node) {
-        return node.kind === 272 /* DefaultClause */;
+        return node.kind === 273 /* DefaultClause */;
     }
     ts.isDefaultClause = isDefaultClause;
     function isHeritageClause(node) {
-        return node.kind === 273 /* HeritageClause */;
+        return node.kind === 274 /* HeritageClause */;
     }
     ts.isHeritageClause = isHeritageClause;
     function isCatchClause(node) {
-        return node.kind === 274 /* CatchClause */;
+        return node.kind === 275 /* CatchClause */;
     }
     ts.isCatchClause = isCatchClause;
     // Property assignments
     function isPropertyAssignment(node) {
-        return node.kind === 275 /* PropertyAssignment */;
+        return node.kind === 276 /* PropertyAssignment */;
     }
     ts.isPropertyAssignment = isPropertyAssignment;
     function isShorthandPropertyAssignment(node) {
-        return node.kind === 276 /* ShorthandPropertyAssignment */;
+        return node.kind === 277 /* ShorthandPropertyAssignment */;
     }
     ts.isShorthandPropertyAssignment = isShorthandPropertyAssignment;
     function isSpreadAssignment(node) {
-        return node.kind === 277 /* SpreadAssignment */;
+        return node.kind === 278 /* SpreadAssignment */;
     }
     ts.isSpreadAssignment = isSpreadAssignment;
     // Enum
     function isEnumMember(node) {
-        return node.kind === 278 /* EnumMember */;
+        return node.kind === 279 /* EnumMember */;
     }
     ts.isEnumMember = isEnumMember;
     // Top-level nodes
     function isSourceFile(node) {
-        return node.kind === 284 /* SourceFile */;
+        return node.kind === 285 /* SourceFile */;
     }
     ts.isSourceFile = isSourceFile;
     function isBundle(node) {
-        return node.kind === 285 /* Bundle */;
+        return node.kind === 286 /* Bundle */;
     }
     ts.isBundle = isBundle;
     function isUnparsedSource(node) {
-        return node.kind === 286 /* UnparsedSource */;
+        return node.kind === 287 /* UnparsedSource */;
     }
     ts.isUnparsedSource = isUnparsedSource;
     function isUnparsedPrepend(node) {
-        return node.kind === 280 /* UnparsedPrepend */;
+        return node.kind === 281 /* UnparsedPrepend */;
     }
     ts.isUnparsedPrepend = isUnparsedPrepend;
     function isUnparsedTextLike(node) {
         switch (node.kind) {
-            case 281 /* UnparsedText */:
-            case 282 /* UnparsedInternalText */:
+            case 282 /* UnparsedText */:
+            case 283 /* UnparsedInternalText */:
                 return true;
             default:
                 return false;
@@ -14018,101 +14215,105 @@ var ts;
     ts.isUnparsedTextLike = isUnparsedTextLike;
     function isUnparsedNode(node) {
         return isUnparsedTextLike(node) ||
-            node.kind === 279 /* UnparsedPrologue */ ||
-            node.kind === 283 /* UnparsedSyntheticReference */;
+            node.kind === 280 /* UnparsedPrologue */ ||
+            node.kind === 284 /* UnparsedSyntheticReference */;
     }
     ts.isUnparsedNode = isUnparsedNode;
     // JSDoc
     function isJSDocTypeExpression(node) {
-        return node.kind === 288 /* JSDocTypeExpression */;
+        return node.kind === 289 /* JSDocTypeExpression */;
     }
     ts.isJSDocTypeExpression = isJSDocTypeExpression;
     function isJSDocAllType(node) {
-        return node.kind === 289 /* JSDocAllType */;
+        return node.kind === 290 /* JSDocAllType */;
     }
     ts.isJSDocAllType = isJSDocAllType;
     function isJSDocUnknownType(node) {
-        return node.kind === 290 /* JSDocUnknownType */;
+        return node.kind === 291 /* JSDocUnknownType */;
     }
     ts.isJSDocUnknownType = isJSDocUnknownType;
     function isJSDocNullableType(node) {
-        return node.kind === 291 /* JSDocNullableType */;
+        return node.kind === 292 /* JSDocNullableType */;
     }
     ts.isJSDocNullableType = isJSDocNullableType;
     function isJSDocNonNullableType(node) {
-        return node.kind === 292 /* JSDocNonNullableType */;
+        return node.kind === 293 /* JSDocNonNullableType */;
     }
     ts.isJSDocNonNullableType = isJSDocNonNullableType;
     function isJSDocOptionalType(node) {
-        return node.kind === 293 /* JSDocOptionalType */;
+        return node.kind === 294 /* JSDocOptionalType */;
     }
     ts.isJSDocOptionalType = isJSDocOptionalType;
     function isJSDocFunctionType(node) {
-        return node.kind === 294 /* JSDocFunctionType */;
+        return node.kind === 295 /* JSDocFunctionType */;
     }
     ts.isJSDocFunctionType = isJSDocFunctionType;
     function isJSDocVariadicType(node) {
-        return node.kind === 295 /* JSDocVariadicType */;
+        return node.kind === 296 /* JSDocVariadicType */;
     }
     ts.isJSDocVariadicType = isJSDocVariadicType;
     function isJSDoc(node) {
-        return node.kind === 296 /* JSDocComment */;
+        return node.kind === 297 /* JSDocComment */;
     }
     ts.isJSDoc = isJSDoc;
+    function isJSDocAuthorTag(node) {
+        return node.kind === 302 /* JSDocAuthorTag */;
+    }
+    ts.isJSDocAuthorTag = isJSDocAuthorTag;
     function isJSDocAugmentsTag(node) {
-        return node.kind === 300 /* JSDocAugmentsTag */;
+        return node.kind === 301 /* JSDocAugmentsTag */;
     }
     ts.isJSDocAugmentsTag = isJSDocAugmentsTag;
     function isJSDocClassTag(node) {
-        return node.kind === 301 /* JSDocClassTag */;
+        return node.kind === 303 /* JSDocClassTag */;
     }
     ts.isJSDocClassTag = isJSDocClassTag;
     function isJSDocEnumTag(node) {
-        return node.kind === 303 /* JSDocEnumTag */;
+        return node.kind === 305 /* JSDocEnumTag */;
     }
     ts.isJSDocEnumTag = isJSDocEnumTag;
     function isJSDocThisTag(node) {
-        return node.kind === 306 /* JSDocThisTag */;
+        return node.kind === 308 /* JSDocThisTag */;
     }
     ts.isJSDocThisTag = isJSDocThisTag;
     function isJSDocParameterTag(node) {
-        return node.kind === 304 /* JSDocParameterTag */;
+        return node.kind === 306 /* JSDocParameterTag */;
     }
     ts.isJSDocParameterTag = isJSDocParameterTag;
     function isJSDocReturnTag(node) {
-        return node.kind === 305 /* JSDocReturnTag */;
+        return node.kind === 307 /* JSDocReturnTag */;
     }
     ts.isJSDocReturnTag = isJSDocReturnTag;
     function isJSDocTypeTag(node) {
-        return node.kind === 307 /* JSDocTypeTag */;
+        return node.kind === 309 /* JSDocTypeTag */;
     }
     ts.isJSDocTypeTag = isJSDocTypeTag;
     function isJSDocTemplateTag(node) {
-        return node.kind === 308 /* JSDocTemplateTag */;
+        return node.kind === 310 /* JSDocTemplateTag */;
     }
     ts.isJSDocTemplateTag = isJSDocTemplateTag;
     function isJSDocTypedefTag(node) {
-        return node.kind === 309 /* JSDocTypedefTag */;
+        return node.kind === 311 /* JSDocTypedefTag */;
     }
     ts.isJSDocTypedefTag = isJSDocTypedefTag;
     function isJSDocPropertyTag(node) {
-        return node.kind === 310 /* JSDocPropertyTag */;
+        return node.kind === 312 /* JSDocPropertyTag */;
     }
     ts.isJSDocPropertyTag = isJSDocPropertyTag;
     function isJSDocPropertyLikeTag(node) {
-        return node.kind === 310 /* JSDocPropertyTag */ || node.kind === 304 /* JSDocParameterTag */;
+        return node.kind === 312 /* JSDocPropertyTag */ || node.kind === 306 /* JSDocParameterTag */;
     }
     ts.isJSDocPropertyLikeTag = isJSDocPropertyLikeTag;
     function isJSDocTypeLiteral(node) {
-        return node.kind === 297 /* JSDocTypeLiteral */;
+        return node.kind === 298 /* JSDocTypeLiteral */;
     }
     ts.isJSDocTypeLiteral = isJSDocTypeLiteral;
     function isJSDocCallbackTag(node) {
-        return node.kind === 302 /* JSDocCallbackTag */;
+        return node.kind === 304 /* JSDocCallbackTag */;
     }
     ts.isJSDocCallbackTag = isJSDocCallbackTag;
     function isJSDocSignature(node) {
-        return node.kind === 298 /* JSDocSignature */;
+        return node.kind === 299 /* JSDocSignature */;
     }
     ts.isJSDocSignature = isJSDocSignature;
 })(ts || (ts = {}));
@@ -14123,7 +14324,7 @@ var ts;
 (function (ts) {
     /* @internal */
     function isSyntaxList(n) {
-        return n.kind === 311 /* SyntaxList */;
+        return n.kind === 313 /* SyntaxList */;
     }
     ts.isSyntaxList = isSyntaxList;
     /* @internal */
@@ -14133,7 +14334,7 @@ var ts;
     ts.isNode = isNode;
     /* @internal */
     function isNodeKind(kind) {
-        return kind >= 148 /* FirstNode */;
+        return kind >= 149 /* FirstNode */;
     }
     ts.isNodeKind = isNodeKind;
     /**
@@ -14142,7 +14343,7 @@ var ts;
      * Literals are considered tokens, except TemplateLiteral, but does include TemplateHead/Middle/Tail.
      */
     function isToken(n) {
-        return n.kind >= 0 /* FirstToken */ && n.kind <= 147 /* LastToken */;
+        return n.kind >= 0 /* FirstToken */ && n.kind <= 148 /* LastToken */;
     }
     ts.isToken = isToken;
     // Node Arrays
@@ -14195,17 +14396,17 @@ var ts;
     /* @internal */
     function isModifierKind(token) {
         switch (token) {
-            case 118 /* AbstractKeyword */:
-            case 121 /* AsyncKeyword */:
-            case 77 /* ConstKeyword */:
-            case 125 /* DeclareKeyword */:
-            case 80 /* DefaultKeyword */:
-            case 85 /* ExportKeyword */:
-            case 115 /* PublicKeyword */:
-            case 113 /* PrivateKeyword */:
-            case 114 /* ProtectedKeyword */:
-            case 133 /* ReadonlyKeyword */:
-            case 116 /* StaticKeyword */:
+            case 119 /* AbstractKeyword */:
+            case 122 /* AsyncKeyword */:
+            case 78 /* ConstKeyword */:
+            case 126 /* DeclareKeyword */:
+            case 81 /* DefaultKeyword */:
+            case 86 /* ExportKeyword */:
+            case 116 /* PublicKeyword */:
+            case 114 /* PrivateKeyword */:
+            case 115 /* ProtectedKeyword */:
+            case 134 /* ReadonlyKeyword */:
+            case 117 /* StaticKeyword */:
                 return true;
         }
         return false;
@@ -14218,7 +14419,7 @@ var ts;
     ts.isParameterPropertyModifier = isParameterPropertyModifier;
     /* @internal */
     function isClassMemberModifier(idToken) {
-        return isParameterPropertyModifier(idToken) || idToken === 116 /* StaticKeyword */;
+        return isParameterPropertyModifier(idToken) || idToken === 117 /* StaticKeyword */;
     }
     ts.isClassMemberModifier = isClassMemberModifier;
     function isModifier(node) {
@@ -14227,23 +14428,23 @@ var ts;
     ts.isModifier = isModifier;
     function isEntityName(node) {
         var kind = node.kind;
-        return kind === 148 /* QualifiedName */
-            || kind === 72 /* Identifier */;
+        return kind === 149 /* QualifiedName */
+            || kind === 73 /* Identifier */;
     }
     ts.isEntityName = isEntityName;
     function isPropertyName(node) {
         var kind = node.kind;
-        return kind === 72 /* Identifier */
+        return kind === 73 /* Identifier */
             || kind === 10 /* StringLiteral */
             || kind === 8 /* NumericLiteral */
-            || kind === 149 /* ComputedPropertyName */;
+            || kind === 150 /* ComputedPropertyName */;
     }
     ts.isPropertyName = isPropertyName;
     function isBindingName(node) {
         var kind = node.kind;
-        return kind === 72 /* Identifier */
-            || kind === 184 /* ObjectBindingPattern */
-            || kind === 185 /* ArrayBindingPattern */;
+        return kind === 73 /* Identifier */
+            || kind === 185 /* ObjectBindingPattern */
+            || kind === 186 /* ArrayBindingPattern */;
     }
     ts.isBindingName = isBindingName;
     // Functions
@@ -14258,13 +14459,13 @@ var ts;
     ts.isFunctionLikeDeclaration = isFunctionLikeDeclaration;
     function isFunctionLikeDeclarationKind(kind) {
         switch (kind) {
-            case 239 /* FunctionDeclaration */:
-            case 156 /* MethodDeclaration */:
-            case 157 /* Constructor */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
-            case 196 /* FunctionExpression */:
-            case 197 /* ArrowFunction */:
+            case 240 /* FunctionDeclaration */:
+            case 157 /* MethodDeclaration */:
+            case 158 /* Constructor */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
+            case 197 /* FunctionExpression */:
+            case 198 /* ArrowFunction */:
                 return true;
             default:
                 return false;
@@ -14273,14 +14474,14 @@ var ts;
     /* @internal */
     function isFunctionLikeKind(kind) {
         switch (kind) {
-            case 155 /* MethodSignature */:
-            case 160 /* CallSignature */:
-            case 298 /* JSDocSignature */:
-            case 161 /* ConstructSignature */:
-            case 162 /* IndexSignature */:
-            case 165 /* FunctionType */:
-            case 294 /* JSDocFunctionType */:
-            case 166 /* ConstructorType */:
+            case 156 /* MethodSignature */:
+            case 161 /* CallSignature */:
+            case 299 /* JSDocSignature */:
+            case 162 /* ConstructSignature */:
+            case 163 /* IndexSignature */:
+            case 166 /* FunctionType */:
+            case 295 /* JSDocFunctionType */:
+            case 167 /* ConstructorType */:
                 return true;
             default:
                 return isFunctionLikeDeclarationKind(kind);
@@ -14295,29 +14496,29 @@ var ts;
     // Classes
     function isClassElement(node) {
         var kind = node.kind;
-        return kind === 157 /* Constructor */
-            || kind === 154 /* PropertyDeclaration */
-            || kind === 156 /* MethodDeclaration */
-            || kind === 158 /* GetAccessor */
-            || kind === 159 /* SetAccessor */
-            || kind === 162 /* IndexSignature */
-            || kind === 217 /* SemicolonClassElement */;
+        return kind === 158 /* Constructor */
+            || kind === 155 /* PropertyDeclaration */
+            || kind === 157 /* MethodDeclaration */
+            || kind === 159 /* GetAccessor */
+            || kind === 160 /* SetAccessor */
+            || kind === 163 /* IndexSignature */
+            || kind === 218 /* SemicolonClassElement */;
     }
     ts.isClassElement = isClassElement;
     function isClassLike(node) {
-        return node && (node.kind === 240 /* ClassDeclaration */ || node.kind === 209 /* ClassExpression */);
+        return node && (node.kind === 241 /* ClassDeclaration */ || node.kind === 210 /* ClassExpression */);
     }
     ts.isClassLike = isClassLike;
     function isAccessor(node) {
-        return node && (node.kind === 158 /* GetAccessor */ || node.kind === 159 /* SetAccessor */);
+        return node && (node.kind === 159 /* GetAccessor */ || node.kind === 160 /* SetAccessor */);
     }
     ts.isAccessor = isAccessor;
     /* @internal */
     function isMethodOrAccessor(node) {
         switch (node.kind) {
-            case 156 /* MethodDeclaration */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
+            case 157 /* MethodDeclaration */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
                 return true;
             default:
                 return false;
@@ -14327,11 +14528,11 @@ var ts;
     // Type members
     function isTypeElement(node) {
         var kind = node.kind;
-        return kind === 161 /* ConstructSignature */
-            || kind === 160 /* CallSignature */
-            || kind === 153 /* PropertySignature */
-            || kind === 155 /* MethodSignature */
-            || kind === 162 /* IndexSignature */;
+        return kind === 162 /* ConstructSignature */
+            || kind === 161 /* CallSignature */
+            || kind === 154 /* PropertySignature */
+            || kind === 156 /* MethodSignature */
+            || kind === 163 /* IndexSignature */;
     }
     ts.isTypeElement = isTypeElement;
     function isClassOrTypeElement(node) {
@@ -14340,12 +14541,12 @@ var ts;
     ts.isClassOrTypeElement = isClassOrTypeElement;
     function isObjectLiteralElementLike(node) {
         var kind = node.kind;
-        return kind === 275 /* PropertyAssignment */
-            || kind === 276 /* ShorthandPropertyAssignment */
-            || kind === 277 /* SpreadAssignment */
-            || kind === 156 /* MethodDeclaration */
-            || kind === 158 /* GetAccessor */
-            || kind === 159 /* SetAccessor */;
+        return kind === 276 /* PropertyAssignment */
+            || kind === 277 /* ShorthandPropertyAssignment */
+            || kind === 278 /* SpreadAssignment */
+            || kind === 157 /* MethodDeclaration */
+            || kind === 159 /* GetAccessor */
+            || kind === 160 /* SetAccessor */;
     }
     ts.isObjectLiteralElementLike = isObjectLiteralElementLike;
     // Type
@@ -14360,8 +14561,8 @@ var ts;
     ts.isTypeNode = isTypeNode;
     function isFunctionOrConstructorTypeNode(node) {
         switch (node.kind) {
-            case 165 /* FunctionType */:
-            case 166 /* ConstructorType */:
+            case 166 /* FunctionType */:
+            case 167 /* ConstructorType */:
                 return true;
         }
         return false;
@@ -14372,8 +14573,8 @@ var ts;
     function isBindingPattern(node) {
         if (node) {
             var kind = node.kind;
-            return kind === 185 /* ArrayBindingPattern */
-                || kind === 184 /* ObjectBindingPattern */;
+            return kind === 186 /* ArrayBindingPattern */
+                || kind === 185 /* ObjectBindingPattern */;
         }
         return false;
     }
@@ -14381,15 +14582,15 @@ var ts;
     /* @internal */
     function isAssignmentPattern(node) {
         var kind = node.kind;
-        return kind === 187 /* ArrayLiteralExpression */
-            || kind === 188 /* ObjectLiteralExpression */;
+        return kind === 188 /* ArrayLiteralExpression */
+            || kind === 189 /* ObjectLiteralExpression */;
     }
     ts.isAssignmentPattern = isAssignmentPattern;
     /* @internal */
     function isArrayBindingElement(node) {
         var kind = node.kind;
-        return kind === 186 /* BindingElement */
-            || kind === 210 /* OmittedExpression */;
+        return kind === 187 /* BindingElement */
+            || kind === 211 /* OmittedExpression */;
     }
     ts.isArrayBindingElement = isArrayBindingElement;
     /**
@@ -14398,9 +14599,9 @@ var ts;
     /* @internal */
     function isDeclarationBindingElement(bindingElement) {
         switch (bindingElement.kind) {
-            case 237 /* VariableDeclaration */:
-            case 151 /* Parameter */:
-            case 186 /* BindingElement */:
+            case 238 /* VariableDeclaration */:
+            case 152 /* Parameter */:
+            case 187 /* BindingElement */:
                 return true;
         }
         return false;
@@ -14421,8 +14622,8 @@ var ts;
     /* @internal */
     function isObjectBindingOrAssignmentPattern(node) {
         switch (node.kind) {
-            case 184 /* ObjectBindingPattern */:
-            case 188 /* ObjectLiteralExpression */:
+            case 185 /* ObjectBindingPattern */:
+            case 189 /* ObjectLiteralExpression */:
                 return true;
         }
         return false;
@@ -14434,8 +14635,8 @@ var ts;
     /* @internal */
     function isArrayBindingOrAssignmentPattern(node) {
         switch (node.kind) {
-            case 185 /* ArrayBindingPattern */:
-            case 187 /* ArrayLiteralExpression */:
+            case 186 /* ArrayBindingPattern */:
+            case 188 /* ArrayLiteralExpression */:
                 return true;
         }
         return false;
@@ -14444,26 +14645,26 @@ var ts;
     /* @internal */
     function isPropertyAccessOrQualifiedNameOrImportTypeNode(node) {
         var kind = node.kind;
-        return kind === 189 /* PropertyAccessExpression */
-            || kind === 148 /* QualifiedName */
-            || kind === 183 /* ImportType */;
+        return kind === 190 /* PropertyAccessExpression */
+            || kind === 149 /* QualifiedName */
+            || kind === 184 /* ImportType */;
     }
     ts.isPropertyAccessOrQualifiedNameOrImportTypeNode = isPropertyAccessOrQualifiedNameOrImportTypeNode;
     // Expression
     function isPropertyAccessOrQualifiedName(node) {
         var kind = node.kind;
-        return kind === 189 /* PropertyAccessExpression */
-            || kind === 148 /* QualifiedName */;
+        return kind === 190 /* PropertyAccessExpression */
+            || kind === 149 /* QualifiedName */;
     }
     ts.isPropertyAccessOrQualifiedName = isPropertyAccessOrQualifiedName;
     function isCallLikeExpression(node) {
         switch (node.kind) {
-            case 262 /* JsxOpeningElement */:
-            case 261 /* JsxSelfClosingElement */:
-            case 191 /* CallExpression */:
-            case 192 /* NewExpression */:
-            case 193 /* TaggedTemplateExpression */:
-            case 152 /* Decorator */:
+            case 263 /* JsxOpeningElement */:
+            case 262 /* JsxSelfClosingElement */:
+            case 192 /* CallExpression */:
+            case 193 /* NewExpression */:
+            case 194 /* TaggedTemplateExpression */:
+            case 153 /* Decorator */:
                 return true;
             default:
                 return false;
@@ -14471,12 +14672,12 @@ var ts;
     }
     ts.isCallLikeExpression = isCallLikeExpression;
     function isCallOrNewExpression(node) {
-        return node.kind === 191 /* CallExpression */ || node.kind === 192 /* NewExpression */;
+        return node.kind === 192 /* CallExpression */ || node.kind === 193 /* NewExpression */;
     }
     ts.isCallOrNewExpression = isCallOrNewExpression;
     function isTemplateLiteral(node) {
         var kind = node.kind;
-        return kind === 206 /* TemplateExpression */
+        return kind === 207 /* TemplateExpression */
             || kind === 14 /* NoSubstitutionTemplateLiteral */;
     }
     ts.isTemplateLiteral = isTemplateLiteral;
@@ -14487,34 +14688,34 @@ var ts;
     ts.isLeftHandSideExpression = isLeftHandSideExpression;
     function isLeftHandSideExpressionKind(kind) {
         switch (kind) {
-            case 189 /* PropertyAccessExpression */:
-            case 190 /* ElementAccessExpression */:
-            case 192 /* NewExpression */:
-            case 191 /* CallExpression */:
-            case 260 /* JsxElement */:
-            case 261 /* JsxSelfClosingElement */:
-            case 264 /* JsxFragment */:
-            case 193 /* TaggedTemplateExpression */:
-            case 187 /* ArrayLiteralExpression */:
-            case 195 /* ParenthesizedExpression */:
-            case 188 /* ObjectLiteralExpression */:
-            case 209 /* ClassExpression */:
-            case 196 /* FunctionExpression */:
-            case 72 /* Identifier */:
+            case 190 /* PropertyAccessExpression */:
+            case 191 /* ElementAccessExpression */:
+            case 193 /* NewExpression */:
+            case 192 /* CallExpression */:
+            case 261 /* JsxElement */:
+            case 262 /* JsxSelfClosingElement */:
+            case 265 /* JsxFragment */:
+            case 194 /* TaggedTemplateExpression */:
+            case 188 /* ArrayLiteralExpression */:
+            case 196 /* ParenthesizedExpression */:
+            case 189 /* ObjectLiteralExpression */:
+            case 210 /* ClassExpression */:
+            case 197 /* FunctionExpression */:
+            case 73 /* Identifier */:
             case 13 /* RegularExpressionLiteral */:
             case 8 /* NumericLiteral */:
             case 9 /* BigIntLiteral */:
             case 10 /* StringLiteral */:
             case 14 /* NoSubstitutionTemplateLiteral */:
-            case 206 /* TemplateExpression */:
-            case 87 /* FalseKeyword */:
-            case 96 /* NullKeyword */:
-            case 100 /* ThisKeyword */:
-            case 102 /* TrueKeyword */:
-            case 98 /* SuperKeyword */:
-            case 213 /* NonNullExpression */:
-            case 214 /* MetaProperty */:
-            case 92 /* ImportKeyword */: // technically this is only an Expression if it's in a CallExpression
+            case 207 /* TemplateExpression */:
+            case 88 /* FalseKeyword */:
+            case 97 /* NullKeyword */:
+            case 101 /* ThisKeyword */:
+            case 103 /* TrueKeyword */:
+            case 99 /* SuperKeyword */:
+            case 214 /* NonNullExpression */:
+            case 215 /* MetaProperty */:
+            case 93 /* ImportKeyword */: // technically this is only an Expression if it's in a CallExpression
                 return true;
             default:
                 return false;
@@ -14527,13 +14728,13 @@ var ts;
     ts.isUnaryExpression = isUnaryExpression;
     function isUnaryExpressionKind(kind) {
         switch (kind) {
-            case 202 /* PrefixUnaryExpression */:
-            case 203 /* PostfixUnaryExpression */:
-            case 198 /* DeleteExpression */:
-            case 199 /* TypeOfExpression */:
-            case 200 /* VoidExpression */:
-            case 201 /* AwaitExpression */:
-            case 194 /* TypeAssertionExpression */:
+            case 203 /* PrefixUnaryExpression */:
+            case 204 /* PostfixUnaryExpression */:
+            case 199 /* DeleteExpression */:
+            case 200 /* TypeOfExpression */:
+            case 201 /* VoidExpression */:
+            case 202 /* AwaitExpression */:
+            case 195 /* TypeAssertionExpression */:
                 return true;
             default:
                 return isLeftHandSideExpressionKind(kind);
@@ -14542,9 +14743,9 @@ var ts;
     /* @internal */
     function isUnaryExpressionWithWrite(expr) {
         switch (expr.kind) {
-            case 203 /* PostfixUnaryExpression */:
+            case 204 /* PostfixUnaryExpression */:
                 return true;
-            case 202 /* PrefixUnaryExpression */:
+            case 203 /* PrefixUnaryExpression */:
                 return expr.operator === 44 /* PlusPlusToken */ ||
                     expr.operator === 45 /* MinusMinusToken */;
             default:
@@ -14563,15 +14764,15 @@ var ts;
     ts.isExpression = isExpression;
     function isExpressionKind(kind) {
         switch (kind) {
-            case 205 /* ConditionalExpression */:
-            case 207 /* YieldExpression */:
-            case 197 /* ArrowFunction */:
-            case 204 /* BinaryExpression */:
-            case 208 /* SpreadElement */:
-            case 212 /* AsExpression */:
-            case 210 /* OmittedExpression */:
-            case 314 /* CommaListExpression */:
-            case 313 /* PartiallyEmittedExpression */:
+            case 206 /* ConditionalExpression */:
+            case 208 /* YieldExpression */:
+            case 198 /* ArrowFunction */:
+            case 205 /* BinaryExpression */:
+            case 209 /* SpreadElement */:
+            case 213 /* AsExpression */:
+            case 211 /* OmittedExpression */:
+            case 316 /* CommaListExpression */:
+            case 315 /* PartiallyEmittedExpression */:
                 return true;
             default:
                 return isUnaryExpressionKind(kind);
@@ -14579,18 +14780,18 @@ var ts;
     }
     function isAssertionExpression(node) {
         var kind = node.kind;
-        return kind === 194 /* TypeAssertionExpression */
-            || kind === 212 /* AsExpression */;
+        return kind === 195 /* TypeAssertionExpression */
+            || kind === 213 /* AsExpression */;
     }
     ts.isAssertionExpression = isAssertionExpression;
     /* @internal */
     function isPartiallyEmittedExpression(node) {
-        return node.kind === 313 /* PartiallyEmittedExpression */;
+        return node.kind === 315 /* PartiallyEmittedExpression */;
     }
     ts.isPartiallyEmittedExpression = isPartiallyEmittedExpression;
     /* @internal */
     function isNotEmittedStatement(node) {
-        return node.kind === 312 /* NotEmittedStatement */;
+        return node.kind === 314 /* NotEmittedStatement */;
     }
     ts.isNotEmittedStatement = isNotEmittedStatement;
     /* @internal */
@@ -14601,13 +14802,13 @@ var ts;
     ts.isNotEmittedOrPartiallyEmittedNode = isNotEmittedOrPartiallyEmittedNode;
     function isIterationStatement(node, lookInLabeledStatements) {
         switch (node.kind) {
-            case 225 /* ForStatement */:
-            case 226 /* ForInStatement */:
-            case 227 /* ForOfStatement */:
-            case 223 /* DoStatement */:
-            case 224 /* WhileStatement */:
+            case 226 /* ForStatement */:
+            case 227 /* ForInStatement */:
+            case 228 /* ForOfStatement */:
+            case 224 /* DoStatement */:
+            case 225 /* WhileStatement */:
                 return true;
-            case 233 /* LabeledStatement */:
+            case 234 /* LabeledStatement */:
                 return lookInLabeledStatements && isIterationStatement(node.statement, lookInLabeledStatements);
         }
         return false;
@@ -14615,7 +14816,7 @@ var ts;
     ts.isIterationStatement = isIterationStatement;
     /* @internal */
     function isForInOrOfStatement(node) {
-        return node.kind === 226 /* ForInStatement */ || node.kind === 227 /* ForOfStatement */;
+        return node.kind === 227 /* ForInStatement */ || node.kind === 228 /* ForOfStatement */;
     }
     ts.isForInOrOfStatement = isForInOrOfStatement;
     // Element
@@ -14639,113 +14840,113 @@ var ts;
     /* @internal */
     function isModuleBody(node) {
         var kind = node.kind;
-        return kind === 245 /* ModuleBlock */
-            || kind === 244 /* ModuleDeclaration */
-            || kind === 72 /* Identifier */;
+        return kind === 246 /* ModuleBlock */
+            || kind === 245 /* ModuleDeclaration */
+            || kind === 73 /* Identifier */;
     }
     ts.isModuleBody = isModuleBody;
     /* @internal */
     function isNamespaceBody(node) {
         var kind = node.kind;
-        return kind === 245 /* ModuleBlock */
-            || kind === 244 /* ModuleDeclaration */;
+        return kind === 246 /* ModuleBlock */
+            || kind === 245 /* ModuleDeclaration */;
     }
     ts.isNamespaceBody = isNamespaceBody;
     /* @internal */
     function isJSDocNamespaceBody(node) {
         var kind = node.kind;
-        return kind === 72 /* Identifier */
-            || kind === 244 /* ModuleDeclaration */;
+        return kind === 73 /* Identifier */
+            || kind === 245 /* ModuleDeclaration */;
     }
     ts.isJSDocNamespaceBody = isJSDocNamespaceBody;
     /* @internal */
     function isNamedImportBindings(node) {
         var kind = node.kind;
-        return kind === 252 /* NamedImports */
-            || kind === 251 /* NamespaceImport */;
+        return kind === 253 /* NamedImports */
+            || kind === 252 /* NamespaceImport */;
     }
     ts.isNamedImportBindings = isNamedImportBindings;
     /* @internal */
     function isModuleOrEnumDeclaration(node) {
-        return node.kind === 244 /* ModuleDeclaration */ || node.kind === 243 /* EnumDeclaration */;
+        return node.kind === 245 /* ModuleDeclaration */ || node.kind === 244 /* EnumDeclaration */;
     }
     ts.isModuleOrEnumDeclaration = isModuleOrEnumDeclaration;
     function isDeclarationKind(kind) {
-        return kind === 197 /* ArrowFunction */
-            || kind === 186 /* BindingElement */
-            || kind === 240 /* ClassDeclaration */
-            || kind === 209 /* ClassExpression */
-            || kind === 157 /* Constructor */
-            || kind === 243 /* EnumDeclaration */
-            || kind === 278 /* EnumMember */
-            || kind === 257 /* ExportSpecifier */
-            || kind === 239 /* FunctionDeclaration */
-            || kind === 196 /* FunctionExpression */
-            || kind === 158 /* GetAccessor */
-            || kind === 250 /* ImportClause */
-            || kind === 248 /* ImportEqualsDeclaration */
-            || kind === 253 /* ImportSpecifier */
-            || kind === 241 /* InterfaceDeclaration */
-            || kind === 267 /* JsxAttribute */
-            || kind === 156 /* MethodDeclaration */
-            || kind === 155 /* MethodSignature */
-            || kind === 244 /* ModuleDeclaration */
-            || kind === 247 /* NamespaceExportDeclaration */
-            || kind === 251 /* NamespaceImport */
-            || kind === 151 /* Parameter */
-            || kind === 275 /* PropertyAssignment */
-            || kind === 154 /* PropertyDeclaration */
-            || kind === 153 /* PropertySignature */
-            || kind === 159 /* SetAccessor */
-            || kind === 276 /* ShorthandPropertyAssignment */
-            || kind === 242 /* TypeAliasDeclaration */
-            || kind === 150 /* TypeParameter */
-            || kind === 237 /* VariableDeclaration */
-            || kind === 309 /* JSDocTypedefTag */
-            || kind === 302 /* JSDocCallbackTag */
-            || kind === 310 /* JSDocPropertyTag */;
+        return kind === 198 /* ArrowFunction */
+            || kind === 187 /* BindingElement */
+            || kind === 241 /* ClassDeclaration */
+            || kind === 210 /* ClassExpression */
+            || kind === 158 /* Constructor */
+            || kind === 244 /* EnumDeclaration */
+            || kind === 279 /* EnumMember */
+            || kind === 258 /* ExportSpecifier */
+            || kind === 240 /* FunctionDeclaration */
+            || kind === 197 /* FunctionExpression */
+            || kind === 159 /* GetAccessor */
+            || kind === 251 /* ImportClause */
+            || kind === 249 /* ImportEqualsDeclaration */
+            || kind === 254 /* ImportSpecifier */
+            || kind === 242 /* InterfaceDeclaration */
+            || kind === 268 /* JsxAttribute */
+            || kind === 157 /* MethodDeclaration */
+            || kind === 156 /* MethodSignature */
+            || kind === 245 /* ModuleDeclaration */
+            || kind === 248 /* NamespaceExportDeclaration */
+            || kind === 252 /* NamespaceImport */
+            || kind === 152 /* Parameter */
+            || kind === 276 /* PropertyAssignment */
+            || kind === 155 /* PropertyDeclaration */
+            || kind === 154 /* PropertySignature */
+            || kind === 160 /* SetAccessor */
+            || kind === 277 /* ShorthandPropertyAssignment */
+            || kind === 243 /* TypeAliasDeclaration */
+            || kind === 151 /* TypeParameter */
+            || kind === 238 /* VariableDeclaration */
+            || kind === 311 /* JSDocTypedefTag */
+            || kind === 304 /* JSDocCallbackTag */
+            || kind === 312 /* JSDocPropertyTag */;
     }
     function isDeclarationStatementKind(kind) {
-        return kind === 239 /* FunctionDeclaration */
-            || kind === 258 /* MissingDeclaration */
-            || kind === 240 /* ClassDeclaration */
-            || kind === 241 /* InterfaceDeclaration */
-            || kind === 242 /* TypeAliasDeclaration */
-            || kind === 243 /* EnumDeclaration */
-            || kind === 244 /* ModuleDeclaration */
-            || kind === 249 /* ImportDeclaration */
-            || kind === 248 /* ImportEqualsDeclaration */
-            || kind === 255 /* ExportDeclaration */
-            || kind === 254 /* ExportAssignment */
-            || kind === 247 /* NamespaceExportDeclaration */;
+        return kind === 240 /* FunctionDeclaration */
+            || kind === 259 /* MissingDeclaration */
+            || kind === 241 /* ClassDeclaration */
+            || kind === 242 /* InterfaceDeclaration */
+            || kind === 243 /* TypeAliasDeclaration */
+            || kind === 244 /* EnumDeclaration */
+            || kind === 245 /* ModuleDeclaration */
+            || kind === 250 /* ImportDeclaration */
+            || kind === 249 /* ImportEqualsDeclaration */
+            || kind === 256 /* ExportDeclaration */
+            || kind === 255 /* ExportAssignment */
+            || kind === 248 /* NamespaceExportDeclaration */;
     }
     function isStatementKindButNotDeclarationKind(kind) {
-        return kind === 229 /* BreakStatement */
-            || kind === 228 /* ContinueStatement */
-            || kind === 236 /* DebuggerStatement */
-            || kind === 223 /* DoStatement */
-            || kind === 221 /* ExpressionStatement */
-            || kind === 220 /* EmptyStatement */
-            || kind === 226 /* ForInStatement */
-            || kind === 227 /* ForOfStatement */
-            || kind === 225 /* ForStatement */
-            || kind === 222 /* IfStatement */
-            || kind === 233 /* LabeledStatement */
-            || kind === 230 /* ReturnStatement */
-            || kind === 232 /* SwitchStatement */
-            || kind === 234 /* ThrowStatement */
-            || kind === 235 /* TryStatement */
-            || kind === 219 /* VariableStatement */
-            || kind === 224 /* WhileStatement */
-            || kind === 231 /* WithStatement */
-            || kind === 312 /* NotEmittedStatement */
-            || kind === 316 /* EndOfDeclarationMarker */
-            || kind === 315 /* MergeDeclarationMarker */;
+        return kind === 230 /* BreakStatement */
+            || kind === 229 /* ContinueStatement */
+            || kind === 237 /* DebuggerStatement */
+            || kind === 224 /* DoStatement */
+            || kind === 222 /* ExpressionStatement */
+            || kind === 221 /* EmptyStatement */
+            || kind === 227 /* ForInStatement */
+            || kind === 228 /* ForOfStatement */
+            || kind === 226 /* ForStatement */
+            || kind === 223 /* IfStatement */
+            || kind === 234 /* LabeledStatement */
+            || kind === 231 /* ReturnStatement */
+            || kind === 233 /* SwitchStatement */
+            || kind === 235 /* ThrowStatement */
+            || kind === 236 /* TryStatement */
+            || kind === 220 /* VariableStatement */
+            || kind === 225 /* WhileStatement */
+            || kind === 232 /* WithStatement */
+            || kind === 314 /* NotEmittedStatement */
+            || kind === 318 /* EndOfDeclarationMarker */
+            || kind === 317 /* MergeDeclarationMarker */;
     }
     /* @internal */
     function isDeclaration(node) {
-        if (node.kind === 150 /* TypeParameter */) {
-            return (node.parent && node.parent.kind !== 308 /* JSDocTemplateTag */) || ts.isInJSFile(node);
+        if (node.kind === 151 /* TypeParameter */) {
+            return (node.parent && node.parent.kind !== 310 /* JSDocTemplateTag */) || ts.isInJSFile(node);
         }
         return isDeclarationKind(node.kind);
     }
@@ -14772,10 +14973,10 @@ var ts;
     }
     ts.isStatement = isStatement;
     function isBlockStatement(node) {
-        if (node.kind !== 218 /* Block */)
+        if (node.kind !== 219 /* Block */)
             return false;
         if (node.parent !== undefined) {
-            if (node.parent.kind === 235 /* TryStatement */ || node.parent.kind === 274 /* CatchClause */) {
+            if (node.parent.kind === 236 /* TryStatement */ || node.parent.kind === 275 /* CatchClause */) {
                 return false;
             }
         }
@@ -14785,81 +14986,81 @@ var ts;
     /* @internal */
     function isModuleReference(node) {
         var kind = node.kind;
-        return kind === 259 /* ExternalModuleReference */
-            || kind === 148 /* QualifiedName */
-            || kind === 72 /* Identifier */;
+        return kind === 260 /* ExternalModuleReference */
+            || kind === 149 /* QualifiedName */
+            || kind === 73 /* Identifier */;
     }
     ts.isModuleReference = isModuleReference;
     // JSX
     /* @internal */
     function isJsxTagNameExpression(node) {
         var kind = node.kind;
-        return kind === 100 /* ThisKeyword */
-            || kind === 72 /* Identifier */
-            || kind === 189 /* PropertyAccessExpression */;
+        return kind === 101 /* ThisKeyword */
+            || kind === 73 /* Identifier */
+            || kind === 190 /* PropertyAccessExpression */;
     }
     ts.isJsxTagNameExpression = isJsxTagNameExpression;
     /* @internal */
     function isJsxChild(node) {
         var kind = node.kind;
-        return kind === 260 /* JsxElement */
-            || kind === 270 /* JsxExpression */
-            || kind === 261 /* JsxSelfClosingElement */
+        return kind === 261 /* JsxElement */
+            || kind === 271 /* JsxExpression */
+            || kind === 262 /* JsxSelfClosingElement */
             || kind === 11 /* JsxText */
-            || kind === 264 /* JsxFragment */;
+            || kind === 265 /* JsxFragment */;
     }
     ts.isJsxChild = isJsxChild;
     /* @internal */
     function isJsxAttributeLike(node) {
         var kind = node.kind;
-        return kind === 267 /* JsxAttribute */
-            || kind === 269 /* JsxSpreadAttribute */;
+        return kind === 268 /* JsxAttribute */
+            || kind === 270 /* JsxSpreadAttribute */;
     }
     ts.isJsxAttributeLike = isJsxAttributeLike;
     /* @internal */
     function isStringLiteralOrJsxExpression(node) {
         var kind = node.kind;
         return kind === 10 /* StringLiteral */
-            || kind === 270 /* JsxExpression */;
+            || kind === 271 /* JsxExpression */;
     }
     ts.isStringLiteralOrJsxExpression = isStringLiteralOrJsxExpression;
     function isJsxOpeningLikeElement(node) {
         var kind = node.kind;
-        return kind === 262 /* JsxOpeningElement */
-            || kind === 261 /* JsxSelfClosingElement */;
+        return kind === 263 /* JsxOpeningElement */
+            || kind === 262 /* JsxSelfClosingElement */;
     }
     ts.isJsxOpeningLikeElement = isJsxOpeningLikeElement;
     // Clauses
     function isCaseOrDefaultClause(node) {
         var kind = node.kind;
-        return kind === 271 /* CaseClause */
-            || kind === 272 /* DefaultClause */;
+        return kind === 272 /* CaseClause */
+            || kind === 273 /* DefaultClause */;
     }
     ts.isCaseOrDefaultClause = isCaseOrDefaultClause;
     // JSDoc
     /** True if node is of some JSDoc syntax kind. */
     /* @internal */
     function isJSDocNode(node) {
-        return node.kind >= 288 /* FirstJSDocNode */ && node.kind <= 310 /* LastJSDocNode */;
+        return node.kind >= 289 /* FirstJSDocNode */ && node.kind <= 312 /* LastJSDocNode */;
     }
     ts.isJSDocNode = isJSDocNode;
     /** True if node is of a kind that may contain comment text. */
     function isJSDocCommentContainingNode(node) {
-        return node.kind === 296 /* JSDocComment */ || isJSDocTag(node) || ts.isJSDocTypeLiteral(node) || ts.isJSDocSignature(node);
+        return node.kind === 297 /* JSDocComment */ || isJSDocTag(node) || ts.isJSDocTypeLiteral(node) || ts.isJSDocSignature(node);
     }
     ts.isJSDocCommentContainingNode = isJSDocCommentContainingNode;
     // TODO: determine what this does before making it public.
     /* @internal */
     function isJSDocTag(node) {
-        return node.kind >= 299 /* FirstJSDocTagNode */ && node.kind <= 310 /* LastJSDocTagNode */;
+        return node.kind >= 300 /* FirstJSDocTagNode */ && node.kind <= 312 /* LastJSDocTagNode */;
     }
     ts.isJSDocTag = isJSDocTag;
     function isSetAccessor(node) {
-        return node.kind === 159 /* SetAccessor */;
+        return node.kind === 160 /* SetAccessor */;
     }
     ts.isSetAccessor = isSetAccessor;
     function isGetAccessor(node) {
-        return node.kind === 158 /* GetAccessor */;
+        return node.kind === 159 /* GetAccessor */;
     }
     ts.isGetAccessor = isGetAccessor;
     /** True if has jsdoc nodes attached to it. */
@@ -14889,12 +15090,12 @@ var ts;
     }
     ts.hasOnlyExpressionInitializer = hasOnlyExpressionInitializer;
     function isObjectLiteralElement(node) {
-        return node.kind === 267 /* JsxAttribute */ || node.kind === 269 /* JsxSpreadAttribute */ || isObjectLiteralElementLike(node);
+        return node.kind === 268 /* JsxAttribute */ || node.kind === 270 /* JsxSpreadAttribute */ || isObjectLiteralElementLike(node);
     }
     ts.isObjectLiteralElement = isObjectLiteralElement;
     /* @internal */
     function isTypeReferenceType(node) {
-        return node.kind === 164 /* TypeReference */ || node.kind === 211 /* ExpressionWithTypeArguments */;
+        return node.kind === 165 /* TypeReference */ || node.kind === 212 /* ExpressionWithTypeArguments */;
     }
     ts.isTypeReferenceType = isTypeReferenceType;
     var MAX_SMI_X86 = 1073741823;
@@ -14930,7 +15131,7 @@ var ts;
 /* @internal */
 (function (ts) {
     function isNamedImportsOrExports(node) {
-        return node.kind === 252 /* NamedImports */ || node.kind === 256 /* NamedExports */;
+        return node.kind === 253 /* NamedImports */ || node.kind === 257 /* NamedExports */;
     }
     ts.isNamedImportsOrExports = isNamedImportsOrExports;
     function Symbol(flags, name) {
@@ -15050,17 +15251,16 @@ var ts;
             messageText: text,
             category: message.category,
             code: message.code,
-            next: details
+            next: details === undefined || Array.isArray(details) ? details : [details]
         };
     }
     ts.chainDiagnosticMessages = chainDiagnosticMessages;
     function concatenateDiagnosticMessageChains(headChain, tailChain) {
         var lastChain = headChain;
         while (lastChain.next) {
-            lastChain = lastChain.next;
+            lastChain = lastChain.next[0];
         }
-        lastChain.next = tailChain;
-        return headChain;
+        lastChain.next = [tailChain];
     }
     ts.concatenateDiagnosticMessageChains = concatenateDiagnosticMessageChains;
     function getDiagnosticFilePath(diagnostic) {
@@ -15094,25 +15294,42 @@ var ts;
         return d1.relatedInformation ? -1 /* LessThan */ : 1 /* GreaterThan */;
     }
     function compareMessageText(t1, t2) {
-        var text1 = t1;
-        var text2 = t2;
-        while (text1 && text2) {
-            // We still have both chains.
-            var string1 = ts.isString(text1) ? text1 : text1.messageText;
-            var string2 = ts.isString(text2) ? text2 : text2.messageText;
-            var res = ts.compareStringsCaseSensitive(string1, string2);
+        if (typeof t1 === "string" && typeof t2 === "string") {
+            return ts.compareStringsCaseSensitive(t1, t2);
+        }
+        else if (typeof t1 === "string") {
+            return -1 /* LessThan */;
+        }
+        else if (typeof t2 === "string") {
+            return 1 /* GreaterThan */;
+        }
+        var res = ts.compareStringsCaseSensitive(t1.messageText, t2.messageText);
+        if (res) {
+            return res;
+        }
+        if (!t1.next && !t2.next) {
+            return 0 /* EqualTo */;
+        }
+        if (!t1.next) {
+            return -1 /* LessThan */;
+        }
+        if (!t2.next) {
+            return 1 /* GreaterThan */;
+        }
+        var len = Math.min(t1.next.length, t2.next.length);
+        for (var i = 0; i < len; i++) {
+            res = compareMessageText(t1.next[i], t2.next[i]);
             if (res) {
                 return res;
             }
-            text1 = ts.isString(text1) ? undefined : text1.next;
-            text2 = ts.isString(text2) ? undefined : text2.next;
         }
-        if (!text1 && !text2) {
-            // if the chains are done, then these messages are the same.
-            return 0 /* EqualTo */;
+        if (t1.next.length < t2.next.length) {
+            return -1 /* LessThan */;
         }
-        // We still have one chain remaining.  The shorter chain should come first.
-        return text1 ? 1 /* GreaterThan */ : -1 /* LessThan */;
+        else if (t1.next.length > t2.next.length) {
+            return 1 /* GreaterThan */;
+        }
+        return 0 /* EqualTo */;
     }
     function getEmitScriptTarget(compilerOptions) {
         return compilerOptions.target || 0 /* ES3 */;
@@ -15181,6 +15398,11 @@ var ts;
             ts.semanticDiagnosticsOptionDeclarations.some(function (option) { return !ts.isJsonEqual(getCompilerOptionValue(oldOptions, option), getCompilerOptionValue(newOptions, option)); });
     }
     ts.compilerOptionsAffectSemanticDiagnostics = compilerOptionsAffectSemanticDiagnostics;
+    function compilerOptionsAffectEmit(newOptions, oldOptions) {
+        return oldOptions !== newOptions &&
+            ts.affectsEmitOptionDeclarations.some(function (option) { return !ts.isJsonEqual(getCompilerOptionValue(oldOptions, option), getCompilerOptionValue(newOptions, option)); });
+    }
+    ts.compilerOptionsAffectEmit = compilerOptionsAffectEmit;
     function getCompilerOptionValue(options, option) {
         return option.strictFlag ? getStrictOptionValue(options, option.name) : options[option.name];
     }
@@ -15459,6 +15681,15 @@ var ts;
         return root + pathComponents.slice(1).join(ts.directorySeparator);
     }
     ts.getPathFromPathComponents = getPathFromPathComponents;
+    function getNormalizedAbsolutePathWithoutRoot(fileName, currentDirectory) {
+        return getPathWithoutRoot(getNormalizedPathComponents(fileName, currentDirectory));
+    }
+    ts.getNormalizedAbsolutePathWithoutRoot = getNormalizedAbsolutePathWithoutRoot;
+    function getPathWithoutRoot(pathComponents) {
+        if (pathComponents.length === 0)
+            return "";
+        return pathComponents.slice(1).join(ts.directorySeparator);
+    }
 })(ts || (ts = {}));
 /* @internal */
 (function (ts) {
@@ -15489,7 +15720,7 @@ var ts;
     }
     ts.getRelativePathFromFile = getRelativePathFromFile;
     function getRelativePathFromDirectory(fromDirectory, to, getCanonicalFileNameOrIgnoreCase) {
-        Debug.assert((ts.getRootLength(fromDirectory) > 0) === (ts.getRootLength(to) > 0), "Paths must either both be absolute or both be relative");
+        ts.Debug.assert((ts.getRootLength(fromDirectory) > 0) === (ts.getRootLength(to) > 0), "Paths must either both be absolute or both be relative");
         var getCanonicalFileName = typeof getCanonicalFileNameOrIgnoreCase === "function" ? getCanonicalFileNameOrIgnoreCase : ts.identity;
         var ignoreCase = typeof getCanonicalFileNameOrIgnoreCase === "boolean" ? getCanonicalFileNameOrIgnoreCase : false;
         var pathComponents = getPathComponentsRelativeTo(fromDirectory, to, ignoreCase ? ts.equateStringsCaseInsensitive : ts.equateStringsCaseSensitive, getCanonicalFileName);
@@ -15859,7 +16090,7 @@ var ts;
     }
     ts.getRegexFromPattern = getRegexFromPattern;
     /** @param path directory of the tsconfig.json */
-    function matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory, depth, getFileSystemEntries) {
+    function matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory, depth, getFileSystemEntries, realpath) {
         path = ts.normalizePath(path);
         currentDirectory = ts.normalizePath(currentDirectory);
         var patterns = getFileMatcherPatterns(path, excludes, includes, useCaseSensitiveFileNames, currentDirectory);
@@ -15869,12 +16100,18 @@ var ts;
         // Associate an array of results with each include regex. This keeps results in order of the "include" order.
         // If there are no "includes", then just put everything in results[0].
         var results = includeFileRegexes ? includeFileRegexes.map(function () { return []; }) : [[]];
+        var visited = ts.createMap();
+        var toCanonical = ts.createGetCanonicalFileName(useCaseSensitiveFileNames);
         for (var _i = 0, _a = patterns.basePaths; _i < _a.length; _i++) {
             var basePath = _a[_i];
             visitDirectory(basePath, combinePaths(currentDirectory, basePath), depth);
         }
         return ts.flatten(results);
         function visitDirectory(path, absolutePath, depth) {
+            var canonicalPath = toCanonical(realpath(absolutePath));
+            if (visited.has(canonicalPath))
+                return;
+            visited.set(canonicalPath, true);
             var _a = getFileSystemEntries(path), files = _a.files, directories = _a.directories;
             var _loop_1 = function (current) {
                 var name = combinePaths(path, current);
@@ -16127,32 +16364,9 @@ var ts;
         return pathext ? path.slice(0, path.length - pathext.length) + (ts.startsWith(ext, ".") ? ext : "." + ext) : path;
     }
     ts.changeAnyExtension = changeAnyExtension;
-    var Debug;
-    (function (Debug) {
-        function showSymbol(symbol) {
-            var symbolFlags = ts.SymbolFlags;
-            return "{ flags: " + (symbolFlags ? showFlags(symbol.flags, symbolFlags) : symbol.flags) + "; declarations: " + ts.map(symbol.declarations, showSyntaxKind) + " }";
-        }
-        Debug.showSymbol = showSymbol;
-        function showFlags(flags, flagsEnum) {
-            var out = [];
-            for (var pow = 0; pow <= 30; pow++) {
-                var n = 1 << pow;
-                if (flags & n) {
-                    out.push(flagsEnum[n]);
-                }
-            }
-            return out.join("|");
-        }
-        function showSyntaxKind(node) {
-            var syntaxKind = ts.SyntaxKind;
-            return syntaxKind ? syntaxKind[node.kind] : node.kind.toString();
-        }
-        Debug.showSyntaxKind = showSyntaxKind;
-    })(Debug = ts.Debug || (ts.Debug = {}));
     function tryParsePattern(pattern) {
         // This should be verified outside of here and a proper error thrown.
-        Debug.assert(ts.hasZeroOrOneAsteriskCharacter(pattern));
+        ts.Debug.assert(ts.hasZeroOrOneAsteriskCharacter(pattern));
         var indexOfStar = pattern.indexOf("*");
         return indexOfStar === -1 ? undefined : {
             prefix: pattern.substr(0, indexOfStar),
@@ -16181,7 +16395,7 @@ var ts;
      */
     function extensionFromPath(path) {
         var ext = tryGetExtensionFromPath(path);
-        return ext !== undefined ? ext : Debug.fail("File " + path + " has unknown extension.");
+        return ext !== undefined ? ext : ts.Debug.fail("File " + path + " has unknown extension.");
     }
     ts.extensionFromPath = extensionFromPath;
     function isAnySupportedFileExtension(path) {
@@ -16253,12 +16467,25 @@ var ts;
     ts.matchPatternOrExact = matchPatternOrExact;
     function sliceAfter(arr, value) {
         var index = arr.indexOf(value);
-        Debug.assert(index !== -1);
+        ts.Debug.assert(index !== -1);
         return arr.slice(index);
     }
     ts.sliceAfter = sliceAfter;
+    function addRelatedInfo(diagnostic) {
+        var _a;
+        var relatedInformation = [];
+        for (var _i = 1; _i < arguments.length; _i++) {
+            relatedInformation[_i - 1] = arguments[_i];
+        }
+        if (!diagnostic.relatedInformation) {
+            diagnostic.relatedInformation = [];
+        }
+        (_a = diagnostic.relatedInformation).push.apply(_a, relatedInformation);
+        return diagnostic;
+    }
+    ts.addRelatedInfo = addRelatedInfo;
     function minAndMax(arr, getValue) {
-        Debug.assert(arr.length !== 0);
+        ts.Debug.assert(arr.length !== 0);
         var min = getValue(arr[0]);
         var max = min;
         for (var i = 1; i < arr.length; i++) {
@@ -16456,10 +16683,10 @@ var ts;
     var SourceFileConstructor;
     // tslint:enable variable-name
     function createNode(kind, pos, end) {
-        if (kind === 284 /* SourceFile */) {
+        if (kind === 285 /* SourceFile */) {
             return new (SourceFileConstructor || (SourceFileConstructor = ts.objectAllocator.getSourceFileConstructor()))(kind, pos, end);
         }
-        else if (kind === 72 /* Identifier */) {
+        else if (kind === 73 /* Identifier */) {
             return new (IdentifierConstructor || (IdentifierConstructor = ts.objectAllocator.getIdentifierConstructor()))(kind, pos, end);
         }
         else if (!ts.isNodeKind(kind)) {
@@ -16508,19 +16735,19 @@ var ts;
      * that they appear in the source code. The language service depends on this property to locate nodes by position.
      */
     function forEachChild(node, cbNode, cbNodes) {
-        if (!node || node.kind <= 147 /* LastToken */) {
+        if (!node || node.kind <= 148 /* LastToken */) {
             return;
         }
         switch (node.kind) {
-            case 148 /* QualifiedName */:
+            case 149 /* QualifiedName */:
                 return visitNode(cbNode, node.left) ||
                     visitNode(cbNode, node.right);
-            case 150 /* TypeParameter */:
+            case 151 /* TypeParameter */:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.constraint) ||
                     visitNode(cbNode, node.default) ||
                     visitNode(cbNode, node.expression);
-            case 276 /* ShorthandPropertyAssignment */:
+            case 277 /* ShorthandPropertyAssignment */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
@@ -16528,9 +16755,9 @@ var ts;
                     visitNode(cbNode, node.exclamationToken) ||
                     visitNode(cbNode, node.equalsToken) ||
                     visitNode(cbNode, node.objectAssignmentInitializer);
-            case 277 /* SpreadAssignment */:
+            case 278 /* SpreadAssignment */:
                 return visitNode(cbNode, node.expression);
-            case 151 /* Parameter */:
+            case 152 /* Parameter */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.dotDotDotToken) ||
@@ -16538,7 +16765,7 @@ var ts;
                     visitNode(cbNode, node.questionToken) ||
                     visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.initializer);
-            case 154 /* PropertyDeclaration */:
+            case 155 /* PropertyDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
@@ -16546,51 +16773,51 @@ var ts;
                     visitNode(cbNode, node.exclamationToken) ||
                     visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.initializer);
-            case 153 /* PropertySignature */:
+            case 154 /* PropertySignature */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.questionToken) ||
                     visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.initializer);
-            case 275 /* PropertyAssignment */:
+            case 276 /* PropertyAssignment */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.questionToken) ||
                     visitNode(cbNode, node.initializer);
-            case 237 /* VariableDeclaration */:
+            case 238 /* VariableDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.exclamationToken) ||
                     visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.initializer);
-            case 186 /* BindingElement */:
+            case 187 /* BindingElement */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.dotDotDotToken) ||
                     visitNode(cbNode, node.propertyName) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.initializer);
-            case 165 /* FunctionType */:
-            case 166 /* ConstructorType */:
-            case 160 /* CallSignature */:
-            case 161 /* ConstructSignature */:
-            case 162 /* IndexSignature */:
+            case 166 /* FunctionType */:
+            case 167 /* ConstructorType */:
+            case 161 /* CallSignature */:
+            case 162 /* ConstructSignature */:
+            case 163 /* IndexSignature */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNodes(cbNode, cbNodes, node.typeParameters) ||
                     visitNodes(cbNode, cbNodes, node.parameters) ||
                     visitNode(cbNode, node.type);
-            case 156 /* MethodDeclaration */:
-            case 155 /* MethodSignature */:
-            case 157 /* Constructor */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
-            case 196 /* FunctionExpression */:
-            case 239 /* FunctionDeclaration */:
-            case 197 /* ArrowFunction */:
+            case 157 /* MethodDeclaration */:
+            case 156 /* MethodSignature */:
+            case 158 /* Constructor */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
+            case 197 /* FunctionExpression */:
+            case 240 /* FunctionDeclaration */:
+            case 198 /* ArrowFunction */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.asteriskToken) ||
@@ -16602,343 +16829,345 @@ var ts;
                     visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.equalsGreaterThanToken) ||
                     visitNode(cbNode, node.body);
-            case 164 /* TypeReference */:
+            case 165 /* TypeReference */:
                 return visitNode(cbNode, node.typeName) ||
                     visitNodes(cbNode, cbNodes, node.typeArguments);
-            case 163 /* TypePredicate */:
+            case 164 /* TypePredicate */:
                 return visitNode(cbNode, node.parameterName) ||
                     visitNode(cbNode, node.type);
-            case 167 /* TypeQuery */:
+            case 168 /* TypeQuery */:
                 return visitNode(cbNode, node.exprName);
-            case 168 /* TypeLiteral */:
+            case 169 /* TypeLiteral */:
                 return visitNodes(cbNode, cbNodes, node.members);
-            case 169 /* ArrayType */:
+            case 170 /* ArrayType */:
                 return visitNode(cbNode, node.elementType);
-            case 170 /* TupleType */:
+            case 171 /* TupleType */:
                 return visitNodes(cbNode, cbNodes, node.elementTypes);
-            case 173 /* UnionType */:
-            case 174 /* IntersectionType */:
+            case 174 /* UnionType */:
+            case 175 /* IntersectionType */:
                 return visitNodes(cbNode, cbNodes, node.types);
-            case 175 /* ConditionalType */:
+            case 176 /* ConditionalType */:
                 return visitNode(cbNode, node.checkType) ||
                     visitNode(cbNode, node.extendsType) ||
                     visitNode(cbNode, node.trueType) ||
                     visitNode(cbNode, node.falseType);
-            case 176 /* InferType */:
+            case 177 /* InferType */:
                 return visitNode(cbNode, node.typeParameter);
-            case 183 /* ImportType */:
+            case 184 /* ImportType */:
                 return visitNode(cbNode, node.argument) ||
                     visitNode(cbNode, node.qualifier) ||
                     visitNodes(cbNode, cbNodes, node.typeArguments);
-            case 177 /* ParenthesizedType */:
-            case 179 /* TypeOperator */:
+            case 178 /* ParenthesizedType */:
+            case 180 /* TypeOperator */:
                 return visitNode(cbNode, node.type);
-            case 180 /* IndexedAccessType */:
+            case 181 /* IndexedAccessType */:
                 return visitNode(cbNode, node.objectType) ||
                     visitNode(cbNode, node.indexType);
-            case 181 /* MappedType */:
+            case 182 /* MappedType */:
                 return visitNode(cbNode, node.readonlyToken) ||
                     visitNode(cbNode, node.typeParameter) ||
                     visitNode(cbNode, node.questionToken) ||
                     visitNode(cbNode, node.type);
-            case 182 /* LiteralType */:
+            case 183 /* LiteralType */:
                 return visitNode(cbNode, node.literal);
-            case 184 /* ObjectBindingPattern */:
-            case 185 /* ArrayBindingPattern */:
+            case 185 /* ObjectBindingPattern */:
+            case 186 /* ArrayBindingPattern */:
                 return visitNodes(cbNode, cbNodes, node.elements);
-            case 187 /* ArrayLiteralExpression */:
+            case 188 /* ArrayLiteralExpression */:
                 return visitNodes(cbNode, cbNodes, node.elements);
-            case 188 /* ObjectLiteralExpression */:
+            case 189 /* ObjectLiteralExpression */:
                 return visitNodes(cbNode, cbNodes, node.properties);
-            case 189 /* PropertyAccessExpression */:
+            case 190 /* PropertyAccessExpression */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.name);
-            case 190 /* ElementAccessExpression */:
+            case 191 /* ElementAccessExpression */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.argumentExpression);
-            case 191 /* CallExpression */:
-            case 192 /* NewExpression */:
+            case 192 /* CallExpression */:
+            case 193 /* NewExpression */:
                 return visitNode(cbNode, node.expression) ||
                     visitNodes(cbNode, cbNodes, node.typeArguments) ||
                     visitNodes(cbNode, cbNodes, node.arguments);
-            case 193 /* TaggedTemplateExpression */:
+            case 194 /* TaggedTemplateExpression */:
                 return visitNode(cbNode, node.tag) ||
                     visitNodes(cbNode, cbNodes, node.typeArguments) ||
                     visitNode(cbNode, node.template);
-            case 194 /* TypeAssertionExpression */:
+            case 195 /* TypeAssertionExpression */:
                 return visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.expression);
-            case 195 /* ParenthesizedExpression */:
+            case 196 /* ParenthesizedExpression */:
                 return visitNode(cbNode, node.expression);
-            case 198 /* DeleteExpression */:
+            case 199 /* DeleteExpression */:
                 return visitNode(cbNode, node.expression);
-            case 199 /* TypeOfExpression */:
+            case 200 /* TypeOfExpression */:
                 return visitNode(cbNode, node.expression);
-            case 200 /* VoidExpression */:
+            case 201 /* VoidExpression */:
                 return visitNode(cbNode, node.expression);
-            case 202 /* PrefixUnaryExpression */:
+            case 203 /* PrefixUnaryExpression */:
                 return visitNode(cbNode, node.operand);
-            case 207 /* YieldExpression */:
+            case 208 /* YieldExpression */:
                 return visitNode(cbNode, node.asteriskToken) ||
                     visitNode(cbNode, node.expression);
-            case 201 /* AwaitExpression */:
+            case 202 /* AwaitExpression */:
                 return visitNode(cbNode, node.expression);
-            case 203 /* PostfixUnaryExpression */:
+            case 204 /* PostfixUnaryExpression */:
                 return visitNode(cbNode, node.operand);
-            case 204 /* BinaryExpression */:
+            case 205 /* BinaryExpression */:
                 return visitNode(cbNode, node.left) ||
                     visitNode(cbNode, node.operatorToken) ||
                     visitNode(cbNode, node.right);
-            case 212 /* AsExpression */:
+            case 213 /* AsExpression */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.type);
-            case 213 /* NonNullExpression */:
+            case 214 /* NonNullExpression */:
                 return visitNode(cbNode, node.expression);
-            case 214 /* MetaProperty */:
+            case 215 /* MetaProperty */:
                 return visitNode(cbNode, node.name);
-            case 205 /* ConditionalExpression */:
+            case 206 /* ConditionalExpression */:
                 return visitNode(cbNode, node.condition) ||
                     visitNode(cbNode, node.questionToken) ||
                     visitNode(cbNode, node.whenTrue) ||
                     visitNode(cbNode, node.colonToken) ||
                     visitNode(cbNode, node.whenFalse);
-            case 208 /* SpreadElement */:
+            case 209 /* SpreadElement */:
                 return visitNode(cbNode, node.expression);
-            case 218 /* Block */:
-            case 245 /* ModuleBlock */:
+            case 219 /* Block */:
+            case 246 /* ModuleBlock */:
                 return visitNodes(cbNode, cbNodes, node.statements);
-            case 284 /* SourceFile */:
+            case 285 /* SourceFile */:
                 return visitNodes(cbNode, cbNodes, node.statements) ||
                     visitNode(cbNode, node.endOfFileToken);
-            case 219 /* VariableStatement */:
+            case 220 /* VariableStatement */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.declarationList);
-            case 238 /* VariableDeclarationList */:
+            case 239 /* VariableDeclarationList */:
                 return visitNodes(cbNode, cbNodes, node.declarations);
-            case 221 /* ExpressionStatement */:
+            case 222 /* ExpressionStatement */:
                 return visitNode(cbNode, node.expression);
-            case 222 /* IfStatement */:
+            case 223 /* IfStatement */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.thenStatement) ||
                     visitNode(cbNode, node.elseStatement);
-            case 223 /* DoStatement */:
+            case 224 /* DoStatement */:
                 return visitNode(cbNode, node.statement) ||
                     visitNode(cbNode, node.expression);
-            case 224 /* WhileStatement */:
+            case 225 /* WhileStatement */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.statement);
-            case 225 /* ForStatement */:
+            case 226 /* ForStatement */:
                 return visitNode(cbNode, node.initializer) ||
                     visitNode(cbNode, node.condition) ||
                     visitNode(cbNode, node.incrementor) ||
                     visitNode(cbNode, node.statement);
-            case 226 /* ForInStatement */:
+            case 227 /* ForInStatement */:
                 return visitNode(cbNode, node.initializer) ||
                     visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.statement);
-            case 227 /* ForOfStatement */:
+            case 228 /* ForOfStatement */:
                 return visitNode(cbNode, node.awaitModifier) ||
                     visitNode(cbNode, node.initializer) ||
                     visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.statement);
-            case 228 /* ContinueStatement */:
-            case 229 /* BreakStatement */:
+            case 229 /* ContinueStatement */:
+            case 230 /* BreakStatement */:
                 return visitNode(cbNode, node.label);
-            case 230 /* ReturnStatement */:
+            case 231 /* ReturnStatement */:
                 return visitNode(cbNode, node.expression);
-            case 231 /* WithStatement */:
+            case 232 /* WithStatement */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.statement);
-            case 232 /* SwitchStatement */:
+            case 233 /* SwitchStatement */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.caseBlock);
-            case 246 /* CaseBlock */:
+            case 247 /* CaseBlock */:
                 return visitNodes(cbNode, cbNodes, node.clauses);
-            case 271 /* CaseClause */:
+            case 272 /* CaseClause */:
                 return visitNode(cbNode, node.expression) ||
                     visitNodes(cbNode, cbNodes, node.statements);
-            case 272 /* DefaultClause */:
+            case 273 /* DefaultClause */:
                 return visitNodes(cbNode, cbNodes, node.statements);
-            case 233 /* LabeledStatement */:
+            case 234 /* LabeledStatement */:
                 return visitNode(cbNode, node.label) ||
                     visitNode(cbNode, node.statement);
-            case 234 /* ThrowStatement */:
+            case 235 /* ThrowStatement */:
                 return visitNode(cbNode, node.expression);
-            case 235 /* TryStatement */:
+            case 236 /* TryStatement */:
                 return visitNode(cbNode, node.tryBlock) ||
                     visitNode(cbNode, node.catchClause) ||
                     visitNode(cbNode, node.finallyBlock);
-            case 274 /* CatchClause */:
+            case 275 /* CatchClause */:
                 return visitNode(cbNode, node.variableDeclaration) ||
                     visitNode(cbNode, node.block);
-            case 152 /* Decorator */:
+            case 153 /* Decorator */:
                 return visitNode(cbNode, node.expression);
-            case 240 /* ClassDeclaration */:
-            case 209 /* ClassExpression */:
+            case 241 /* ClassDeclaration */:
+            case 210 /* ClassExpression */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNodes(cbNode, cbNodes, node.typeParameters) ||
                     visitNodes(cbNode, cbNodes, node.heritageClauses) ||
                     visitNodes(cbNode, cbNodes, node.members);
-            case 241 /* InterfaceDeclaration */:
+            case 242 /* InterfaceDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNodes(cbNode, cbNodes, node.typeParameters) ||
                     visitNodes(cbNode, cbNodes, node.heritageClauses) ||
                     visitNodes(cbNode, cbNodes, node.members);
-            case 242 /* TypeAliasDeclaration */:
+            case 243 /* TypeAliasDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNodes(cbNode, cbNodes, node.typeParameters) ||
                     visitNode(cbNode, node.type);
-            case 243 /* EnumDeclaration */:
+            case 244 /* EnumDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNodes(cbNode, cbNodes, node.members);
-            case 278 /* EnumMember */:
+            case 279 /* EnumMember */:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.initializer);
-            case 244 /* ModuleDeclaration */:
+            case 245 /* ModuleDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.body);
-            case 248 /* ImportEqualsDeclaration */:
+            case 249 /* ImportEqualsDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.moduleReference);
-            case 249 /* ImportDeclaration */:
+            case 250 /* ImportDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.importClause) ||
                     visitNode(cbNode, node.moduleSpecifier);
-            case 250 /* ImportClause */:
+            case 251 /* ImportClause */:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.namedBindings);
-            case 247 /* NamespaceExportDeclaration */:
+            case 248 /* NamespaceExportDeclaration */:
                 return visitNode(cbNode, node.name);
-            case 251 /* NamespaceImport */:
+            case 252 /* NamespaceImport */:
                 return visitNode(cbNode, node.name);
-            case 252 /* NamedImports */:
-            case 256 /* NamedExports */:
+            case 253 /* NamedImports */:
+            case 257 /* NamedExports */:
                 return visitNodes(cbNode, cbNodes, node.elements);
-            case 255 /* ExportDeclaration */:
+            case 256 /* ExportDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.exportClause) ||
                     visitNode(cbNode, node.moduleSpecifier);
-            case 253 /* ImportSpecifier */:
-            case 257 /* ExportSpecifier */:
+            case 254 /* ImportSpecifier */:
+            case 258 /* ExportSpecifier */:
                 return visitNode(cbNode, node.propertyName) ||
                     visitNode(cbNode, node.name);
-            case 254 /* ExportAssignment */:
+            case 255 /* ExportAssignment */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.expression);
-            case 206 /* TemplateExpression */:
+            case 207 /* TemplateExpression */:
                 return visitNode(cbNode, node.head) || visitNodes(cbNode, cbNodes, node.templateSpans);
-            case 216 /* TemplateSpan */:
+            case 217 /* TemplateSpan */:
                 return visitNode(cbNode, node.expression) || visitNode(cbNode, node.literal);
-            case 149 /* ComputedPropertyName */:
+            case 150 /* ComputedPropertyName */:
                 return visitNode(cbNode, node.expression);
-            case 273 /* HeritageClause */:
+            case 274 /* HeritageClause */:
                 return visitNodes(cbNode, cbNodes, node.types);
-            case 211 /* ExpressionWithTypeArguments */:
+            case 212 /* ExpressionWithTypeArguments */:
                 return visitNode(cbNode, node.expression) ||
                     visitNodes(cbNode, cbNodes, node.typeArguments);
-            case 259 /* ExternalModuleReference */:
+            case 260 /* ExternalModuleReference */:
                 return visitNode(cbNode, node.expression);
-            case 258 /* MissingDeclaration */:
+            case 259 /* MissingDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators);
-            case 314 /* CommaListExpression */:
+            case 316 /* CommaListExpression */:
                 return visitNodes(cbNode, cbNodes, node.elements);
-            case 260 /* JsxElement */:
+            case 261 /* JsxElement */:
                 return visitNode(cbNode, node.openingElement) ||
                     visitNodes(cbNode, cbNodes, node.children) ||
                     visitNode(cbNode, node.closingElement);
-            case 264 /* JsxFragment */:
+            case 265 /* JsxFragment */:
                 return visitNode(cbNode, node.openingFragment) ||
                     visitNodes(cbNode, cbNodes, node.children) ||
                     visitNode(cbNode, node.closingFragment);
-            case 261 /* JsxSelfClosingElement */:
-            case 262 /* JsxOpeningElement */:
+            case 262 /* JsxSelfClosingElement */:
+            case 263 /* JsxOpeningElement */:
                 return visitNode(cbNode, node.tagName) ||
                     visitNodes(cbNode, cbNodes, node.typeArguments) ||
                     visitNode(cbNode, node.attributes);
-            case 268 /* JsxAttributes */:
+            case 269 /* JsxAttributes */:
                 return visitNodes(cbNode, cbNodes, node.properties);
-            case 267 /* JsxAttribute */:
+            case 268 /* JsxAttribute */:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.initializer);
-            case 269 /* JsxSpreadAttribute */:
+            case 270 /* JsxSpreadAttribute */:
                 return visitNode(cbNode, node.expression);
-            case 270 /* JsxExpression */:
+            case 271 /* JsxExpression */:
                 return visitNode(cbNode, node.dotDotDotToken) ||
                     visitNode(cbNode, node.expression);
-            case 263 /* JsxClosingElement */:
+            case 264 /* JsxClosingElement */:
                 return visitNode(cbNode, node.tagName);
-            case 171 /* OptionalType */:
-            case 172 /* RestType */:
-            case 288 /* JSDocTypeExpression */:
-            case 292 /* JSDocNonNullableType */:
-            case 291 /* JSDocNullableType */:
-            case 293 /* JSDocOptionalType */:
-            case 295 /* JSDocVariadicType */:
+            case 172 /* OptionalType */:
+            case 173 /* RestType */:
+            case 289 /* JSDocTypeExpression */:
+            case 293 /* JSDocNonNullableType */:
+            case 292 /* JSDocNullableType */:
+            case 294 /* JSDocOptionalType */:
+            case 296 /* JSDocVariadicType */:
                 return visitNode(cbNode, node.type);
-            case 294 /* JSDocFunctionType */:
+            case 295 /* JSDocFunctionType */:
                 return visitNodes(cbNode, cbNodes, node.parameters) ||
                     visitNode(cbNode, node.type);
-            case 296 /* JSDocComment */:
+            case 297 /* JSDocComment */:
                 return visitNodes(cbNode, cbNodes, node.tags);
-            case 304 /* JSDocParameterTag */:
-            case 310 /* JSDocPropertyTag */:
+            case 306 /* JSDocParameterTag */:
+            case 312 /* JSDocPropertyTag */:
                 return visitNode(cbNode, node.tagName) ||
                     (node.isNameFirst
                         ? visitNode(cbNode, node.name) ||
                             visitNode(cbNode, node.typeExpression)
                         : visitNode(cbNode, node.typeExpression) ||
                             visitNode(cbNode, node.name));
-            case 300 /* JSDocAugmentsTag */:
+            case 302 /* JSDocAuthorTag */:
+                return visitNode(cbNode, node.tagName);
+            case 301 /* JSDocAugmentsTag */:
                 return visitNode(cbNode, node.tagName) ||
                     visitNode(cbNode, node.class);
-            case 308 /* JSDocTemplateTag */:
+            case 310 /* JSDocTemplateTag */:
                 return visitNode(cbNode, node.tagName) ||
                     visitNode(cbNode, node.constraint) ||
                     visitNodes(cbNode, cbNodes, node.typeParameters);
-            case 309 /* JSDocTypedefTag */:
+            case 311 /* JSDocTypedefTag */:
                 return visitNode(cbNode, node.tagName) ||
                     (node.typeExpression &&
-                        node.typeExpression.kind === 288 /* JSDocTypeExpression */
+                        node.typeExpression.kind === 289 /* JSDocTypeExpression */
                         ? visitNode(cbNode, node.typeExpression) ||
                             visitNode(cbNode, node.fullName)
                         : visitNode(cbNode, node.fullName) ||
                             visitNode(cbNode, node.typeExpression));
-            case 302 /* JSDocCallbackTag */:
+            case 304 /* JSDocCallbackTag */:
                 return visitNode(cbNode, node.tagName) ||
                     visitNode(cbNode, node.fullName) ||
                     visitNode(cbNode, node.typeExpression);
-            case 305 /* JSDocReturnTag */:
-            case 307 /* JSDocTypeTag */:
-            case 306 /* JSDocThisTag */:
-            case 303 /* JSDocEnumTag */:
+            case 307 /* JSDocReturnTag */:
+            case 309 /* JSDocTypeTag */:
+            case 308 /* JSDocThisTag */:
+            case 305 /* JSDocEnumTag */:
                 return visitNode(cbNode, node.tagName) ||
                     visitNode(cbNode, node.typeExpression);
-            case 298 /* JSDocSignature */:
+            case 299 /* JSDocSignature */:
                 return ts.forEach(node.typeParameters, cbNode) ||
                     ts.forEach(node.parameters, cbNode) ||
                     visitNode(cbNode, node.type);
-            case 297 /* JSDocTypeLiteral */:
+            case 298 /* JSDocTypeLiteral */:
                 return ts.forEach(node.jsDocPropertyTags, cbNode);
-            case 299 /* JSDocTag */:
-            case 301 /* JSDocClassTag */:
+            case 300 /* JSDocTag */:
+            case 303 /* JSDocClassTag */:
                 return visitNode(cbNode, node.tagName);
-            case 313 /* PartiallyEmittedExpression */:
+            case 315 /* PartiallyEmittedExpression */:
                 return visitNode(cbNode, node.expression);
         }
     }
@@ -17018,7 +17247,7 @@ var ts;
     (function (Parser) {
         // Share a single scanner across all calls to parse a source file.  This helps speed things
         // up by avoiding the cost of creating/compiling scanners over and over again.
-        var scanner = ts.createScanner(7 /* Latest */, /*skipTrivia*/ true);
+        var scanner = ts.createScanner(99 /* Latest */, /*skipTrivia*/ true);
         var disallowInAndDecoratorContext = 2048 /* DisallowInContext */ | 8192 /* DecoratorContext */;
         // capture constructors in 'initializeState' to avoid null checks
         // tslint:disable variable-name
@@ -17156,14 +17385,14 @@ var ts;
                 sourceFile.endOfFileToken = parseTokenNode();
             }
             else {
-                var statement = createNode(221 /* ExpressionStatement */);
+                var statement = createNode(222 /* ExpressionStatement */);
                 switch (token()) {
                     case 22 /* OpenBracketToken */:
                         statement.expression = parseArrayLiteralExpression();
                         break;
-                    case 102 /* TrueKeyword */:
-                    case 87 /* FalseKeyword */:
-                    case 96 /* NullKeyword */:
+                    case 103 /* TrueKeyword */:
+                    case 88 /* FalseKeyword */:
+                    case 97 /* NullKeyword */:
                         statement.expression = parseTokenNode();
                         break;
                     case 39 /* MinusToken */:
@@ -17312,7 +17541,7 @@ var ts;
         function createSourceFile(fileName, languageVersion, scriptKind, isDeclarationFile) {
             // code from createNode is inlined here so createNode won't have to deal with special case of creating source files
             // this is quite rare comparing to other nodes and createNode should be as fast as possible
-            var sourceFile = new SourceFileConstructor(284 /* SourceFile */, /*pos*/ 0, /* end */ sourceText.length);
+            var sourceFile = new SourceFileConstructor(285 /* SourceFile */, /*pos*/ 0, /* end */ sourceText.length);
             nodeCount++;
             sourceFile.text = sourceText;
             sourceFile.bindDiagnostics = [];
@@ -17455,6 +17684,9 @@ var ts;
         function nextToken() {
             return currentToken = scanner.scan();
         }
+        function nextTokenJSDoc() {
+            return currentToken = scanner.scanJsDocToken();
+        }
         function reScanGreaterToken() {
             return currentToken = scanner.reScanGreaterToken();
         }
@@ -17520,20 +17752,20 @@ var ts;
         }
         // Ignore strict mode flag because we will report an error in type checker instead.
         function isIdentifier() {
-            if (token() === 72 /* Identifier */) {
+            if (token() === 73 /* Identifier */) {
                 return true;
             }
             // If we have a 'yield' keyword, and we're in the [yield] context, then 'yield' is
             // considered a keyword and is not an identifier.
-            if (token() === 117 /* YieldKeyword */ && inYieldContext()) {
+            if (token() === 118 /* YieldKeyword */ && inYieldContext()) {
                 return false;
             }
             // If we have a 'await' keyword, and we're in the [Await] context, then 'await' is
             // considered a keyword and is not an identifier.
-            if (token() === 122 /* AwaitKeyword */ && inAwaitContext()) {
+            if (token() === 123 /* AwaitKeyword */ && inAwaitContext()) {
                 return false;
             }
-            return token() > 108 /* LastReservedWord */;
+            return token() > 109 /* LastReservedWord */;
         }
         function parseExpected(kind, diagnosticMessage, shouldAdvance) {
             if (shouldAdvance === void 0) { shouldAdvance = true; }
@@ -17552,6 +17784,14 @@ var ts;
             }
             return false;
         }
+        function parseExpectedJSDoc(kind) {
+            if (token() === kind) {
+                nextTokenJSDoc();
+                return true;
+            }
+            parseErrorAtCurrentToken(ts.Diagnostics._0_expected, ts.tokenToString(kind));
+            return false;
+        }
         function parseOptional(t) {
             if (token() === t) {
                 nextToken();
@@ -17565,15 +17805,30 @@ var ts;
             }
             return undefined;
         }
+        function parseOptionalTokenJSDoc(t) {
+            if (token() === t) {
+                return parseTokenNodeJSDoc();
+            }
+            return undefined;
+        }
         function parseExpectedToken(t, diagnosticMessage, arg0) {
             return parseOptionalToken(t) ||
                 createMissingNode(t, /*reportAtCurrentPosition*/ false, diagnosticMessage || ts.Diagnostics._0_expected, arg0 || ts.tokenToString(t));
         }
+        function parseExpectedTokenJSDoc(t) {
+            return parseOptionalTokenJSDoc(t) ||
+                createMissingNode(t, /*reportAtCurrentPosition*/ false, ts.Diagnostics._0_expected, ts.tokenToString(t));
+        }
         function parseTokenNode() {
             var node = createNode(token());
             nextToken();
             return finishNode(node);
         }
+        function parseTokenNodeJSDoc() {
+            var node = createNode(token());
+            nextTokenJSDoc();
+            return finishNode(node);
+        }
         function canParseSemicolon() {
             // If there's a real semicolon, then we can always parse it out.
             if (token() === 26 /* SemicolonToken */) {
@@ -17598,7 +17853,7 @@ var ts;
             nodeCount++;
             var p = pos >= 0 ? pos : scanner.getStartPos();
             return ts.isNodeKind(kind) || kind === 0 /* Unknown */ ? new NodeConstructor(kind, p, p) :
-                kind === 72 /* Identifier */ ? new IdentifierConstructor(kind, p, p) :
+                kind === 73 /* Identifier */ ? new IdentifierConstructor(kind, p, p) :
                     new TokenConstructor(kind, p, p);
         }
         function createNodeWithJSDoc(kind, pos) {
@@ -17640,7 +17895,7 @@ var ts;
                 parseErrorAtCurrentToken(diagnosticMessage, arg0);
             }
             var result = createNode(kind);
-            if (kind === 72 /* Identifier */) {
+            if (kind === 73 /* Identifier */) {
                 result.escapedText = "";
             }
             else if (ts.isLiteralKind(kind) || ts.isTemplateLiteralKind(kind)) {
@@ -17661,9 +17916,9 @@ var ts;
         function createIdentifier(isIdentifier, diagnosticMessage) {
             identifierCount++;
             if (isIdentifier) {
-                var node = createNode(72 /* Identifier */);
+                var node = createNode(73 /* Identifier */);
                 // Store original token kind if it is not just an Identifier so we can report appropriate error later in type checker
-                if (token() !== 72 /* Identifier */) {
+                if (token() !== 73 /* Identifier */) {
                     node.originalKeywordKind = token();
                 }
                 node.escapedText = ts.escapeLeadingUnderscores(internIdentifier(scanner.getTokenValue()));
@@ -17672,7 +17927,7 @@ var ts;
             }
             // Only for end of file because the error gets reported incorrectly on embedded script tags.
             var reportAtCurrentPosition = token() === 1 /* EndOfFileToken */;
-            return createMissingNode(72 /* Identifier */, reportAtCurrentPosition, diagnosticMessage || ts.Diagnostics.Identifier_expected);
+            return createMissingNode(73 /* Identifier */, reportAtCurrentPosition, diagnosticMessage || ts.Diagnostics.Identifier_expected);
         }
         function parseIdentifier(diagnosticMessage) {
             return createIdentifier(isIdentifier(), diagnosticMessage);
@@ -17703,7 +17958,7 @@ var ts;
             // PropertyName [Yield]:
             //      LiteralPropertyName
             //      ComputedPropertyName[?Yield]
-            var node = createNode(149 /* ComputedPropertyName */);
+            var node = createNode(150 /* ComputedPropertyName */);
             parseExpected(22 /* OpenBracketToken */);
             // We parse any expression (including a comma expression). But the grammar
             // says that only an assignment expression is allowed, so the grammar checker
@@ -17724,20 +17979,20 @@ var ts;
         }
         function nextTokenCanFollowModifier() {
             switch (token()) {
-                case 77 /* ConstKeyword */:
+                case 78 /* ConstKeyword */:
                     // 'const' is only a modifier if followed by 'enum'.
-                    return nextToken() === 84 /* EnumKeyword */;
-                case 85 /* ExportKeyword */:
+                    return nextToken() === 85 /* EnumKeyword */;
+                case 86 /* ExportKeyword */:
                     nextToken();
-                    if (token() === 80 /* DefaultKeyword */) {
+                    if (token() === 81 /* DefaultKeyword */) {
                         return lookAhead(nextTokenCanFollowDefaultKeyword);
                     }
-                    return token() !== 40 /* AsteriskToken */ && token() !== 119 /* AsKeyword */ && token() !== 18 /* OpenBraceToken */ && canFollowModifier();
-                case 80 /* DefaultKeyword */:
+                    return token() !== 40 /* AsteriskToken */ && token() !== 120 /* AsKeyword */ && token() !== 18 /* OpenBraceToken */ && canFollowModifier();
+                case 81 /* DefaultKeyword */:
                     return nextTokenCanFollowDefaultKeyword();
-                case 116 /* StaticKeyword */:
-                case 126 /* GetKeyword */:
-                case 137 /* SetKeyword */:
+                case 117 /* StaticKeyword */:
+                case 127 /* GetKeyword */:
+                case 138 /* SetKeyword */:
                     nextToken();
                     return canFollowModifier();
                 default:
@@ -17756,10 +18011,10 @@ var ts;
         }
         function nextTokenCanFollowDefaultKeyword() {
             nextToken();
-            return token() === 76 /* ClassKeyword */ || token() === 90 /* FunctionKeyword */ ||
-                token() === 110 /* InterfaceKeyword */ ||
-                (token() === 118 /* AbstractKeyword */ && lookAhead(nextTokenIsClassKeywordOnSameLine)) ||
-                (token() === 121 /* AsyncKeyword */ && lookAhead(nextTokenIsFunctionKeywordOnSameLine));
+            return token() === 77 /* ClassKeyword */ || token() === 91 /* FunctionKeyword */ ||
+                token() === 111 /* InterfaceKeyword */ ||
+                (token() === 119 /* AbstractKeyword */ && lookAhead(nextTokenIsClassKeywordOnSameLine)) ||
+                (token() === 122 /* AsyncKeyword */ && lookAhead(nextTokenIsFunctionKeywordOnSameLine));
         }
         // True if positioned at the start of a list element
         function isListElement(parsingContext, inErrorRecovery) {
@@ -17779,7 +18034,7 @@ var ts;
                     // outer module.  We just want to consume and move on.
                     return !(token() === 26 /* SemicolonToken */ && inErrorRecovery) && isStartOfStatement();
                 case 2 /* SwitchClauses */:
-                    return token() === 74 /* CaseKeyword */ || token() === 80 /* DefaultKeyword */;
+                    return token() === 75 /* CaseKeyword */ || token() === 81 /* DefaultKeyword */;
                 case 4 /* TypeMembers */:
                     return lookAhead(isTypeMemberStart);
                 case 5 /* ClassMembers */:
@@ -17865,7 +18120,7 @@ var ts;
                 //      extends {} extends
                 //      extends {} implements
                 var next = nextToken();
-                return next === 27 /* CommaToken */ || next === 18 /* OpenBraceToken */ || next === 86 /* ExtendsKeyword */ || next === 109 /* ImplementsKeyword */;
+                return next === 27 /* CommaToken */ || next === 18 /* OpenBraceToken */ || next === 87 /* ExtendsKeyword */ || next === 110 /* ImplementsKeyword */;
             }
             return true;
         }
@@ -17882,8 +18137,8 @@ var ts;
             return ts.tokenIsIdentifierOrKeywordOrGreaterThan(token());
         }
         function isHeritageClauseExtendsOrImplementsKeyword() {
-            if (token() === 109 /* ImplementsKeyword */ ||
-                token() === 86 /* ExtendsKeyword */) {
+            if (token() === 110 /* ImplementsKeyword */ ||
+                token() === 87 /* ExtendsKeyword */) {
                 return lookAhead(nextTokenIsStartOfExpression);
             }
             return false;
@@ -17913,14 +18168,14 @@ var ts;
                 case 23 /* ImportOrExportSpecifiers */:
                     return token() === 19 /* CloseBraceToken */;
                 case 3 /* SwitchClauseStatements */:
-                    return token() === 19 /* CloseBraceToken */ || token() === 74 /* CaseKeyword */ || token() === 80 /* DefaultKeyword */;
+                    return token() === 19 /* CloseBraceToken */ || token() === 75 /* CaseKeyword */ || token() === 81 /* DefaultKeyword */;
                 case 7 /* HeritageClauseElement */:
-                    return token() === 18 /* OpenBraceToken */ || token() === 86 /* ExtendsKeyword */ || token() === 109 /* ImplementsKeyword */;
+                    return token() === 18 /* OpenBraceToken */ || token() === 87 /* ExtendsKeyword */ || token() === 110 /* ImplementsKeyword */;
                 case 8 /* VariableDeclarations */:
                     return isVariableDeclaratorListTerminator();
                 case 19 /* TypeParameters */:
                     // Tokens other than '>' are here for better error recovery
-                    return token() === 30 /* GreaterThanToken */ || token() === 20 /* OpenParenToken */ || token() === 18 /* OpenBraceToken */ || token() === 86 /* ExtendsKeyword */ || token() === 109 /* ImplementsKeyword */;
+                    return token() === 30 /* GreaterThanToken */ || token() === 20 /* OpenParenToken */ || token() === 18 /* OpenBraceToken */ || token() === 87 /* ExtendsKeyword */ || token() === 110 /* ImplementsKeyword */;
                 case 11 /* ArgumentExpressions */:
                     // Tokens other than ')' are here for better error recovery
                     return token() === 21 /* CloseParenToken */ || token() === 26 /* SemicolonToken */;
@@ -18137,20 +18392,20 @@ var ts;
         function isReusableClassMember(node) {
             if (node) {
                 switch (node.kind) {
-                    case 157 /* Constructor */:
-                    case 162 /* IndexSignature */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
-                    case 154 /* PropertyDeclaration */:
-                    case 217 /* SemicolonClassElement */:
+                    case 158 /* Constructor */:
+                    case 163 /* IndexSignature */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
+                    case 155 /* PropertyDeclaration */:
+                    case 218 /* SemicolonClassElement */:
                         return true;
-                    case 156 /* MethodDeclaration */:
+                    case 157 /* MethodDeclaration */:
                         // Method declarations are not necessarily reusable.  An object-literal
                         // may have a method calls "constructor(...)" and we must reparse that
                         // into an actual .ConstructorDeclaration.
                         var methodDeclaration = node;
-                        var nameIsConstructor = methodDeclaration.name.kind === 72 /* Identifier */ &&
-                            methodDeclaration.name.originalKeywordKind === 124 /* ConstructorKeyword */;
+                        var nameIsConstructor = methodDeclaration.name.kind === 73 /* Identifier */ &&
+                            methodDeclaration.name.originalKeywordKind === 125 /* ConstructorKeyword */;
                         return !nameIsConstructor;
                 }
             }
@@ -18159,8 +18414,8 @@ var ts;
         function isReusableSwitchClause(node) {
             if (node) {
                 switch (node.kind) {
-                    case 271 /* CaseClause */:
-                    case 272 /* DefaultClause */:
+                    case 272 /* CaseClause */:
+                    case 273 /* DefaultClause */:
                         return true;
                 }
             }
@@ -18169,58 +18424,58 @@ var ts;
         function isReusableStatement(node) {
             if (node) {
                 switch (node.kind) {
-                    case 239 /* FunctionDeclaration */:
-                    case 219 /* VariableStatement */:
-                    case 218 /* Block */:
-                    case 222 /* IfStatement */:
-                    case 221 /* ExpressionStatement */:
-                    case 234 /* ThrowStatement */:
-                    case 230 /* ReturnStatement */:
-                    case 232 /* SwitchStatement */:
-                    case 229 /* BreakStatement */:
-                    case 228 /* ContinueStatement */:
-                    case 226 /* ForInStatement */:
-                    case 227 /* ForOfStatement */:
-                    case 225 /* ForStatement */:
-                    case 224 /* WhileStatement */:
-                    case 231 /* WithStatement */:
-                    case 220 /* EmptyStatement */:
-                    case 235 /* TryStatement */:
-                    case 233 /* LabeledStatement */:
-                    case 223 /* DoStatement */:
-                    case 236 /* DebuggerStatement */:
-                    case 249 /* ImportDeclaration */:
-                    case 248 /* ImportEqualsDeclaration */:
-                    case 255 /* ExportDeclaration */:
-                    case 254 /* ExportAssignment */:
-                    case 244 /* ModuleDeclaration */:
-                    case 240 /* ClassDeclaration */:
-                    case 241 /* InterfaceDeclaration */:
-                    case 243 /* EnumDeclaration */:
-                    case 242 /* TypeAliasDeclaration */:
+                    case 240 /* FunctionDeclaration */:
+                    case 220 /* VariableStatement */:
+                    case 219 /* Block */:
+                    case 223 /* IfStatement */:
+                    case 222 /* ExpressionStatement */:
+                    case 235 /* ThrowStatement */:
+                    case 231 /* ReturnStatement */:
+                    case 233 /* SwitchStatement */:
+                    case 230 /* BreakStatement */:
+                    case 229 /* ContinueStatement */:
+                    case 227 /* ForInStatement */:
+                    case 228 /* ForOfStatement */:
+                    case 226 /* ForStatement */:
+                    case 225 /* WhileStatement */:
+                    case 232 /* WithStatement */:
+                    case 221 /* EmptyStatement */:
+                    case 236 /* TryStatement */:
+                    case 234 /* LabeledStatement */:
+                    case 224 /* DoStatement */:
+                    case 237 /* DebuggerStatement */:
+                    case 250 /* ImportDeclaration */:
+                    case 249 /* ImportEqualsDeclaration */:
+                    case 256 /* ExportDeclaration */:
+                    case 255 /* ExportAssignment */:
+                    case 245 /* ModuleDeclaration */:
+                    case 241 /* ClassDeclaration */:
+                    case 242 /* InterfaceDeclaration */:
+                    case 244 /* EnumDeclaration */:
+                    case 243 /* TypeAliasDeclaration */:
                         return true;
                 }
             }
             return false;
         }
         function isReusableEnumMember(node) {
-            return node.kind === 278 /* EnumMember */;
+            return node.kind === 279 /* EnumMember */;
         }
         function isReusableTypeMember(node) {
             if (node) {
                 switch (node.kind) {
-                    case 161 /* ConstructSignature */:
-                    case 155 /* MethodSignature */:
-                    case 162 /* IndexSignature */:
-                    case 153 /* PropertySignature */:
-                    case 160 /* CallSignature */:
+                    case 162 /* ConstructSignature */:
+                    case 156 /* MethodSignature */:
+                    case 163 /* IndexSignature */:
+                    case 154 /* PropertySignature */:
+                    case 161 /* CallSignature */:
                         return true;
                 }
             }
             return false;
         }
         function isReusableVariableDeclaration(node) {
-            if (node.kind !== 237 /* VariableDeclaration */) {
+            if (node.kind !== 238 /* VariableDeclaration */) {
                 return false;
             }
             // Very subtle incremental parsing bug.  Consider the following code:
@@ -18241,7 +18496,7 @@ var ts;
             return variableDeclarator.initializer === undefined;
         }
         function isReusableParameter(node) {
-            if (node.kind !== 151 /* Parameter */) {
+            if (node.kind !== 152 /* Parameter */) {
                 return false;
             }
             // See the comment in isReusableVariableDeclaration for why we do this.
@@ -18377,7 +18632,7 @@ var ts;
             return entity;
         }
         function createQualifiedName(entity, name) {
-            var node = createNode(148 /* QualifiedName */, entity.pos);
+            var node = createNode(149 /* QualifiedName */, entity.pos);
             node.left = entity;
             node.right = name;
             return finishNode(node);
@@ -18408,13 +18663,13 @@ var ts;
                     // Report that we need an identifier.  However, report it right after the dot,
                     // and not on the next token.  This is because the next token might actually
                     // be an identifier and the error would be quite confusing.
-                    return createMissingNode(72 /* Identifier */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Identifier_expected);
+                    return createMissingNode(73 /* Identifier */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Identifier_expected);
                 }
             }
             return allowIdentifierNames ? parseIdentifierName() : parseIdentifier();
         }
         function parseTemplateExpression() {
-            var template = createNode(206 /* TemplateExpression */);
+            var template = createNode(207 /* TemplateExpression */);
             template.head = parseTemplateHead();
             ts.Debug.assert(template.head.kind === 15 /* TemplateHead */, "Template head has wrong token kind");
             var list = [];
@@ -18426,7 +18681,7 @@ var ts;
             return finishNode(template);
         }
         function parseTemplateSpan() {
-            var span = createNode(216 /* TemplateSpan */);
+            var span = createNode(217 /* TemplateSpan */);
             span.expression = allowInAnd(parseExpression);
             var literal;
             if (token() === 19 /* CloseBraceToken */) {
@@ -18476,7 +18731,7 @@ var ts;
         }
         // TYPES
         function parseTypeReference() {
-            var node = createNode(164 /* TypeReference */);
+            var node = createNode(165 /* TypeReference */);
             node.typeName = parseEntityName(/*allowReservedWords*/ true, ts.Diagnostics.Type_expected);
             if (!scanner.hasPrecedingLineBreak() && reScanLessThanToken() === 28 /* LessThanToken */) {
                 node.typeArguments = parseBracketedList(20 /* TypeArguments */, parseType, 28 /* LessThanToken */, 30 /* GreaterThanToken */);
@@ -18486,14 +18741,14 @@ var ts;
         // If true, we should abort parsing an error function.
         function typeHasArrowFunctionBlockingParseError(node) {
             switch (node.kind) {
-                case 164 /* TypeReference */:
+                case 165 /* TypeReference */:
                     return ts.nodeIsMissing(node.typeName);
-                case 165 /* FunctionType */:
-                case 166 /* ConstructorType */: {
+                case 166 /* FunctionType */:
+                case 167 /* ConstructorType */: {
                     var _a = node, parameters = _a.parameters, type = _a.type;
                     return isMissingList(parameters) || typeHasArrowFunctionBlockingParseError(type);
                 }
-                case 177 /* ParenthesizedType */:
+                case 178 /* ParenthesizedType */:
                     return typeHasArrowFunctionBlockingParseError(node.type);
                 default:
                     return false;
@@ -18501,20 +18756,20 @@ var ts;
         }
         function parseThisTypePredicate(lhs) {
             nextToken();
-            var node = createNode(163 /* TypePredicate */, lhs.pos);
+            var node = createNode(164 /* TypePredicate */, lhs.pos);
             node.parameterName = lhs;
             node.type = parseType();
             return finishNode(node);
         }
         function parseThisTypeNode() {
-            var node = createNode(178 /* ThisType */);
+            var node = createNode(179 /* ThisType */);
             nextToken();
             return finishNode(node);
         }
         function parseJSDocAllType(postFixEquals) {
-            var result = createNode(289 /* JSDocAllType */);
+            var result = createNode(290 /* JSDocAllType */);
             if (postFixEquals) {
-                return createPostfixType(293 /* JSDocOptionalType */, result);
+                return createPostfixType(294 /* JSDocOptionalType */, result);
             }
             else {
                 nextToken();
@@ -18522,7 +18777,7 @@ var ts;
             return finishNode(result);
         }
         function parseJSDocNonNullableType() {
-            var result = createNode(292 /* JSDocNonNullableType */);
+            var result = createNode(293 /* JSDocNonNullableType */);
             nextToken();
             result.type = parseNonArrayType();
             return finishNode(result);
@@ -18544,31 +18799,31 @@ var ts;
                 token() === 19 /* CloseBraceToken */ ||
                 token() === 21 /* CloseParenToken */ ||
                 token() === 30 /* GreaterThanToken */ ||
-                token() === 59 /* EqualsToken */ ||
+                token() === 60 /* EqualsToken */ ||
                 token() === 50 /* BarToken */) {
-                var result = createNode(290 /* JSDocUnknownType */, pos);
+                var result = createNode(291 /* JSDocUnknownType */, pos);
                 return finishNode(result);
             }
             else {
-                var result = createNode(291 /* JSDocNullableType */, pos);
+                var result = createNode(292 /* JSDocNullableType */, pos);
                 result.type = parseType();
                 return finishNode(result);
             }
         }
         function parseJSDocFunctionType() {
             if (lookAhead(nextTokenIsOpenParen)) {
-                var result = createNodeWithJSDoc(294 /* JSDocFunctionType */);
+                var result = createNodeWithJSDoc(295 /* JSDocFunctionType */);
                 nextToken();
                 fillSignature(57 /* ColonToken */, 4 /* Type */ | 32 /* JSDoc */, result);
                 return finishNode(result);
             }
-            var node = createNode(164 /* TypeReference */);
+            var node = createNode(165 /* TypeReference */);
             node.typeName = parseIdentifierName();
             return finishNode(node);
         }
         function parseJSDocParameter() {
-            var parameter = createNode(151 /* Parameter */);
-            if (token() === 100 /* ThisKeyword */ || token() === 95 /* NewKeyword */) {
+            var parameter = createNode(152 /* Parameter */);
+            if (token() === 101 /* ThisKeyword */ || token() === 96 /* NewKeyword */) {
                 parameter.name = parseIdentifierName();
                 parseExpected(57 /* ColonToken */);
             }
@@ -18581,25 +18836,25 @@ var ts;
             var type = parseTypeOrTypePredicate();
             scanner.setInJSDocType(false);
             if (dotdotdot) {
-                var variadic = createNode(295 /* JSDocVariadicType */, dotdotdot.pos);
+                var variadic = createNode(296 /* JSDocVariadicType */, dotdotdot.pos);
                 variadic.type = type;
                 type = finishNode(variadic);
             }
-            if (token() === 59 /* EqualsToken */) {
-                return createPostfixType(293 /* JSDocOptionalType */, type);
+            if (token() === 60 /* EqualsToken */) {
+                return createPostfixType(294 /* JSDocOptionalType */, type);
             }
             return type;
         }
         function parseTypeQuery() {
-            var node = createNode(167 /* TypeQuery */);
-            parseExpected(104 /* TypeOfKeyword */);
+            var node = createNode(168 /* TypeQuery */);
+            parseExpected(105 /* TypeOfKeyword */);
             node.exprName = parseEntityName(/*allowReservedWords*/ true);
             return finishNode(node);
         }
         function parseTypeParameter() {
-            var node = createNode(150 /* TypeParameter */);
+            var node = createNode(151 /* TypeParameter */);
             node.name = parseIdentifier();
-            if (parseOptional(86 /* ExtendsKeyword */)) {
+            if (parseOptional(87 /* ExtendsKeyword */)) {
                 // It's not uncommon for people to write improper constraints to a generic.  If the
                 // user writes a constraint that is an expression and not an actual type, then parse
                 // it out as an expression (so we can recover well), but report that a type is needed
@@ -18618,7 +18873,7 @@ var ts;
                     node.expression = parseUnaryExpressionOrHigher();
                 }
             }
-            if (parseOptional(59 /* EqualsToken */)) {
+            if (parseOptional(60 /* EqualsToken */)) {
                 node.default = parseType();
             }
             return finishNode(node);
@@ -18642,8 +18897,8 @@ var ts;
                 isStartOfType(/*inStartOfParameter*/ !isJSDocParameter);
         }
         function parseParameter() {
-            var node = createNodeWithJSDoc(151 /* Parameter */);
-            if (token() === 100 /* ThisKeyword */) {
+            var node = createNodeWithJSDoc(152 /* Parameter */);
+            if (token() === 101 /* ThisKeyword */) {
                 node.name = createIdentifier(/*isIdentifier*/ true);
                 node.type = parseParameterType();
                 return finishNode(node);
@@ -18743,8 +18998,8 @@ var ts;
         }
         function parseSignatureMember(kind) {
             var node = createNodeWithJSDoc(kind);
-            if (kind === 161 /* ConstructSignature */) {
-                parseExpected(95 /* NewKeyword */);
+            if (kind === 162 /* ConstructSignature */) {
+                parseExpected(96 /* NewKeyword */);
             }
             fillSignature(57 /* ColonToken */, 4 /* Type */, node);
             parseTypeMemberSemicolon();
@@ -18804,7 +19059,7 @@ var ts;
             return token() === 57 /* ColonToken */ || token() === 27 /* CommaToken */ || token() === 23 /* CloseBracketToken */;
         }
         function parseIndexSignatureDeclaration(node) {
-            node.kind = 162 /* IndexSignature */;
+            node.kind = 163 /* IndexSignature */;
             node.parameters = parseBracketedList(16 /* Parameters */, parseParameter, 22 /* OpenBracketToken */, 23 /* CloseBracketToken */);
             node.type = parseTypeAnnotation();
             parseTypeMemberSemicolon();
@@ -18814,15 +19069,15 @@ var ts;
             node.name = parsePropertyName();
             node.questionToken = parseOptionalToken(56 /* QuestionToken */);
             if (token() === 20 /* OpenParenToken */ || token() === 28 /* LessThanToken */) {
-                node.kind = 155 /* MethodSignature */;
+                node.kind = 156 /* MethodSignature */;
                 // Method signatures don't exist in expression contexts.  So they have neither
                 // [Yield] nor [Await]
                 fillSignature(57 /* ColonToken */, 4 /* Type */, node);
             }
             else {
-                node.kind = 153 /* PropertySignature */;
+                node.kind = 154 /* PropertySignature */;
                 node.type = parseTypeAnnotation();
-                if (token() === 59 /* EqualsToken */) {
+                if (token() === 60 /* EqualsToken */) {
                     // Although type literal properties cannot not have initializers, we attempt
                     // to parse an initializer so we can report in the checker that an interface
                     // property or type literal property cannot have an initializer.
@@ -18866,10 +19121,10 @@ var ts;
         }
         function parseTypeMember() {
             if (token() === 20 /* OpenParenToken */ || token() === 28 /* LessThanToken */) {
-                return parseSignatureMember(160 /* CallSignature */);
+                return parseSignatureMember(161 /* CallSignature */);
             }
-            if (token() === 95 /* NewKeyword */ && lookAhead(nextTokenIsOpenParenOrLessThan)) {
-                return parseSignatureMember(161 /* ConstructSignature */);
+            if (token() === 96 /* NewKeyword */ && lookAhead(nextTokenIsOpenParenOrLessThan)) {
+                return parseSignatureMember(162 /* ConstructSignature */);
             }
             var node = createNodeWithJSDoc(0 /* Unknown */);
             node.modifiers = parseModifiers();
@@ -18895,7 +19150,7 @@ var ts;
             return false;
         }
         function parseTypeLiteral() {
-            var node = createNode(168 /* TypeLiteral */);
+            var node = createNode(169 /* TypeLiteral */);
             node.members = parseObjectTypeMembers();
             return finishNode(node);
         }
@@ -18913,27 +19168,27 @@ var ts;
         function isStartOfMappedType() {
             nextToken();
             if (token() === 38 /* PlusToken */ || token() === 39 /* MinusToken */) {
-                return nextToken() === 133 /* ReadonlyKeyword */;
+                return nextToken() === 134 /* ReadonlyKeyword */;
             }
-            if (token() === 133 /* ReadonlyKeyword */) {
+            if (token() === 134 /* ReadonlyKeyword */) {
                 nextToken();
             }
-            return token() === 22 /* OpenBracketToken */ && nextTokenIsIdentifier() && nextToken() === 93 /* InKeyword */;
+            return token() === 22 /* OpenBracketToken */ && nextTokenIsIdentifier() && nextToken() === 94 /* InKeyword */;
         }
         function parseMappedTypeParameter() {
-            var node = createNode(150 /* TypeParameter */);
+            var node = createNode(151 /* TypeParameter */);
             node.name = parseIdentifier();
-            parseExpected(93 /* InKeyword */);
+            parseExpected(94 /* InKeyword */);
             node.constraint = parseType();
             return finishNode(node);
         }
         function parseMappedType() {
-            var node = createNode(181 /* MappedType */);
+            var node = createNode(182 /* MappedType */);
             parseExpected(18 /* OpenBraceToken */);
-            if (token() === 133 /* ReadonlyKeyword */ || token() === 38 /* PlusToken */ || token() === 39 /* MinusToken */) {
+            if (token() === 134 /* ReadonlyKeyword */ || token() === 38 /* PlusToken */ || token() === 39 /* MinusToken */) {
                 node.readonlyToken = parseTokenNode();
-                if (node.readonlyToken.kind !== 133 /* ReadonlyKeyword */) {
-                    parseExpectedToken(133 /* ReadonlyKeyword */);
+                if (node.readonlyToken.kind !== 134 /* ReadonlyKeyword */) {
+                    parseExpectedToken(134 /* ReadonlyKeyword */);
                 }
             }
             parseExpected(22 /* OpenBracketToken */);
@@ -18953,23 +19208,23 @@ var ts;
         function parseTupleElementType() {
             var pos = getNodePos();
             if (parseOptional(25 /* DotDotDotToken */)) {
-                var node = createNode(172 /* RestType */, pos);
+                var node = createNode(173 /* RestType */, pos);
                 node.type = parseType();
                 return finishNode(node);
             }
             var type = parseType();
-            if (!(contextFlags & 2097152 /* JSDoc */) && type.kind === 291 /* JSDocNullableType */ && type.pos === type.type.pos) {
-                type.kind = 171 /* OptionalType */;
+            if (!(contextFlags & 2097152 /* JSDoc */) && type.kind === 292 /* JSDocNullableType */ && type.pos === type.type.pos) {
+                type.kind = 172 /* OptionalType */;
             }
             return type;
         }
         function parseTupleType() {
-            var node = createNode(170 /* TupleType */);
+            var node = createNode(171 /* TupleType */);
             node.elementTypes = parseBracketedList(21 /* TupleElementTypes */, parseTupleElementType, 22 /* OpenBracketToken */, 23 /* CloseBracketToken */);
             return finishNode(node);
         }
         function parseParenthesizedType() {
-            var node = createNode(177 /* ParenthesizedType */);
+            var node = createNode(178 /* ParenthesizedType */);
             parseExpected(20 /* OpenParenToken */);
             node.type = parseType();
             parseExpected(21 /* CloseParenToken */);
@@ -18977,7 +19232,7 @@ var ts;
         }
         function parseFunctionOrConstructorType() {
             var pos = getNodePos();
-            var kind = parseOptional(95 /* NewKeyword */) ? 166 /* ConstructorType */ : 165 /* FunctionType */;
+            var kind = parseOptional(96 /* NewKeyword */) ? 167 /* ConstructorType */ : 166 /* FunctionType */;
             var node = createNodeWithJSDoc(kind, pos);
             fillSignature(37 /* EqualsGreaterThanToken */, 4 /* Type */, node);
             return finishNode(node);
@@ -18987,14 +19242,14 @@ var ts;
             return token() === 24 /* DotToken */ ? undefined : node;
         }
         function parseLiteralTypeNode(negative) {
-            var node = createNode(182 /* LiteralType */);
+            var node = createNode(183 /* LiteralType */);
             var unaryMinusExpression;
             if (negative) {
-                unaryMinusExpression = createNode(202 /* PrefixUnaryExpression */);
+                unaryMinusExpression = createNode(203 /* PrefixUnaryExpression */);
                 unaryMinusExpression.operator = 39 /* MinusToken */;
                 nextToken();
             }
-            var expression = token() === 102 /* TrueKeyword */ || token() === 87 /* FalseKeyword */
+            var expression = token() === 103 /* TrueKeyword */ || token() === 88 /* FalseKeyword */
                 ? parseTokenNode()
                 : parseLiteralLikeNode(token());
             if (negative) {
@@ -19007,22 +19262,24 @@ var ts;
         }
         function isStartOfTypeOfImportType() {
             nextToken();
-            return token() === 92 /* ImportKeyword */;
+            return token() === 93 /* ImportKeyword */;
         }
         function parseImportType() {
             sourceFile.flags |= 524288 /* PossiblyContainsDynamicImport */;
-            var node = createNode(183 /* ImportType */);
-            if (parseOptional(104 /* TypeOfKeyword */)) {
+            var node = createNode(184 /* ImportType */);
+            if (parseOptional(105 /* TypeOfKeyword */)) {
                 node.isTypeOf = true;
             }
-            parseExpected(92 /* ImportKeyword */);
+            parseExpected(93 /* ImportKeyword */);
             parseExpected(20 /* OpenParenToken */);
             node.argument = parseType();
             parseExpected(21 /* CloseParenToken */);
             if (parseOptional(24 /* DotToken */)) {
                 node.qualifier = parseEntityName(/*allowReservedWords*/ true, ts.Diagnostics.Type_expected);
             }
-            node.typeArguments = tryParseTypeArguments();
+            if (!scanner.hasPrecedingLineBreak() && reScanLessThanToken() === 28 /* LessThanToken */) {
+                node.typeArguments = parseBracketedList(20 /* TypeArguments */, parseType, 28 /* LessThanToken */, 30 /* GreaterThanToken */);
+            }
             return finishNode(node);
         }
         function nextTokenIsNumericOrBigIntLiteral() {
@@ -19031,25 +19288,25 @@ var ts;
         }
         function parseNonArrayType() {
             switch (token()) {
-                case 120 /* AnyKeyword */:
-                case 143 /* UnknownKeyword */:
-                case 138 /* StringKeyword */:
-                case 135 /* NumberKeyword */:
-                case 146 /* BigIntKeyword */:
-                case 139 /* SymbolKeyword */:
-                case 123 /* BooleanKeyword */:
-                case 141 /* UndefinedKeyword */:
-                case 132 /* NeverKeyword */:
-                case 136 /* ObjectKeyword */:
+                case 121 /* AnyKeyword */:
+                case 144 /* UnknownKeyword */:
+                case 139 /* StringKeyword */:
+                case 136 /* NumberKeyword */:
+                case 147 /* BigIntKeyword */:
+                case 140 /* SymbolKeyword */:
+                case 124 /* BooleanKeyword */:
+                case 142 /* UndefinedKeyword */:
+                case 133 /* NeverKeyword */:
+                case 137 /* ObjectKeyword */:
                     // If these are followed by a dot, then parse these out as a dotted type reference instead.
                     return tryParse(parseKeywordAndNoDot) || parseTypeReference();
                 case 40 /* AsteriskToken */:
                     return parseJSDocAllType(/*postfixEquals*/ false);
-                case 62 /* AsteriskEqualsToken */:
+                case 63 /* AsteriskEqualsToken */:
                     return parseJSDocAllType(/*postfixEquals*/ true);
                 case 56 /* QuestionToken */:
                     return parseJSDocUnknownOrNullableType();
-                case 90 /* FunctionKeyword */:
+                case 91 /* FunctionKeyword */:
                     return parseJSDocFunctionType();
                 case 52 /* ExclamationToken */:
                     return parseJSDocNonNullableType();
@@ -19057,24 +19314,24 @@ var ts;
                 case 10 /* StringLiteral */:
                 case 8 /* NumericLiteral */:
                 case 9 /* BigIntLiteral */:
-                case 102 /* TrueKeyword */:
-                case 87 /* FalseKeyword */:
+                case 103 /* TrueKeyword */:
+                case 88 /* FalseKeyword */:
                     return parseLiteralTypeNode();
                 case 39 /* MinusToken */:
                     return lookAhead(nextTokenIsNumericOrBigIntLiteral) ? parseLiteralTypeNode(/*negative*/ true) : parseTypeReference();
-                case 106 /* VoidKeyword */:
-                case 96 /* NullKeyword */:
+                case 107 /* VoidKeyword */:
+                case 97 /* NullKeyword */:
                     return parseTokenNode();
-                case 100 /* ThisKeyword */: {
+                case 101 /* ThisKeyword */: {
                     var thisKeyword = parseThisTypeNode();
-                    if (token() === 128 /* IsKeyword */ && !scanner.hasPrecedingLineBreak()) {
+                    if (token() === 129 /* IsKeyword */ && !scanner.hasPrecedingLineBreak()) {
                         return parseThisTypePredicate(thisKeyword);
                     }
                     else {
                         return thisKeyword;
                     }
                 }
-                case 104 /* TypeOfKeyword */:
+                case 105 /* TypeOfKeyword */:
                     return lookAhead(isStartOfTypeOfImportType) ? parseImportType() : parseTypeQuery();
                 case 18 /* OpenBraceToken */:
                     return lookAhead(isStartOfMappedType) ? parseMappedType() : parseTypeLiteral();
@@ -19082,7 +19339,7 @@ var ts;
                     return parseTupleType();
                 case 20 /* OpenParenToken */:
                     return parseParenthesizedType();
-                case 92 /* ImportKeyword */:
+                case 93 /* ImportKeyword */:
                     return parseImportType();
                 default:
                     return parseTypeReference();
@@ -19090,41 +19347,41 @@ var ts;
         }
         function isStartOfType(inStartOfParameter) {
             switch (token()) {
-                case 120 /* AnyKeyword */:
-                case 143 /* UnknownKeyword */:
-                case 138 /* StringKeyword */:
-                case 135 /* NumberKeyword */:
-                case 146 /* BigIntKeyword */:
-                case 123 /* BooleanKeyword */:
-                case 133 /* ReadonlyKeyword */:
-                case 139 /* SymbolKeyword */:
-                case 142 /* UniqueKeyword */:
-                case 106 /* VoidKeyword */:
-                case 141 /* UndefinedKeyword */:
-                case 96 /* NullKeyword */:
-                case 100 /* ThisKeyword */:
-                case 104 /* TypeOfKeyword */:
-                case 132 /* NeverKeyword */:
+                case 121 /* AnyKeyword */:
+                case 144 /* UnknownKeyword */:
+                case 139 /* StringKeyword */:
+                case 136 /* NumberKeyword */:
+                case 147 /* BigIntKeyword */:
+                case 124 /* BooleanKeyword */:
+                case 134 /* ReadonlyKeyword */:
+                case 140 /* SymbolKeyword */:
+                case 143 /* UniqueKeyword */:
+                case 107 /* VoidKeyword */:
+                case 142 /* UndefinedKeyword */:
+                case 97 /* NullKeyword */:
+                case 101 /* ThisKeyword */:
+                case 105 /* TypeOfKeyword */:
+                case 133 /* NeverKeyword */:
                 case 18 /* OpenBraceToken */:
                 case 22 /* OpenBracketToken */:
                 case 28 /* LessThanToken */:
                 case 50 /* BarToken */:
                 case 49 /* AmpersandToken */:
-                case 95 /* NewKeyword */:
+                case 96 /* NewKeyword */:
                 case 10 /* StringLiteral */:
                 case 8 /* NumericLiteral */:
                 case 9 /* BigIntLiteral */:
-                case 102 /* TrueKeyword */:
-                case 87 /* FalseKeyword */:
-                case 136 /* ObjectKeyword */:
+                case 103 /* TrueKeyword */:
+                case 88 /* FalseKeyword */:
+                case 137 /* ObjectKeyword */:
                 case 40 /* AsteriskToken */:
                 case 56 /* QuestionToken */:
                 case 52 /* ExclamationToken */:
                 case 25 /* DotDotDotToken */:
-                case 127 /* InferKeyword */:
-                case 92 /* ImportKeyword */:
+                case 128 /* InferKeyword */:
+                case 93 /* ImportKeyword */:
                     return true;
-                case 90 /* FunctionKeyword */:
+                case 91 /* FunctionKeyword */:
                     return !inStartOfParameter;
                 case 39 /* MinusToken */:
                     return !inStartOfParameter && lookAhead(nextTokenIsNumericOrBigIntLiteral);
@@ -19145,26 +19402,26 @@ var ts;
             while (!scanner.hasPrecedingLineBreak()) {
                 switch (token()) {
                     case 52 /* ExclamationToken */:
-                        type = createPostfixType(292 /* JSDocNonNullableType */, type);
+                        type = createPostfixType(293 /* JSDocNonNullableType */, type);
                         break;
                     case 56 /* QuestionToken */:
                         // If not in JSDoc and next token is start of a type we have a conditional type
                         if (!(contextFlags & 2097152 /* JSDoc */) && lookAhead(nextTokenIsStartOfType)) {
                             return type;
                         }
-                        type = createPostfixType(291 /* JSDocNullableType */, type);
+                        type = createPostfixType(292 /* JSDocNullableType */, type);
                         break;
                     case 22 /* OpenBracketToken */:
                         parseExpected(22 /* OpenBracketToken */);
                         if (isStartOfType()) {
-                            var node = createNode(180 /* IndexedAccessType */, type.pos);
+                            var node = createNode(181 /* IndexedAccessType */, type.pos);
                             node.objectType = type;
                             node.indexType = parseType();
                             parseExpected(23 /* CloseBracketToken */);
                             type = finishNode(node);
                         }
                         else {
-                            var node = createNode(169 /* ArrayType */, type.pos);
+                            var node = createNode(170 /* ArrayType */, type.pos);
                             node.elementType = type;
                             parseExpected(23 /* CloseBracketToken */);
                             type = finishNode(node);
@@ -19183,16 +19440,16 @@ var ts;
             return finishNode(postfix);
         }
         function parseTypeOperator(operator) {
-            var node = createNode(179 /* TypeOperator */);
+            var node = createNode(180 /* TypeOperator */);
             parseExpected(operator);
             node.operator = operator;
             node.type = parseTypeOperatorOrHigher();
             return finishNode(node);
         }
         function parseInferType() {
-            var node = createNode(176 /* InferType */);
-            parseExpected(127 /* InferKeyword */);
-            var typeParameter = createNode(150 /* TypeParameter */);
+            var node = createNode(177 /* InferType */);
+            parseExpected(128 /* InferKeyword */);
+            var typeParameter = createNode(151 /* TypeParameter */);
             typeParameter.name = parseIdentifier();
             node.typeParameter = finishNode(typeParameter);
             return finishNode(node);
@@ -19200,34 +19457,35 @@ var ts;
         function parseTypeOperatorOrHigher() {
             var operator = token();
             switch (operator) {
-                case 129 /* KeyOfKeyword */:
-                case 142 /* UniqueKeyword */:
-                case 133 /* ReadonlyKeyword */:
+                case 130 /* KeyOfKeyword */:
+                case 143 /* UniqueKeyword */:
+                case 134 /* ReadonlyKeyword */:
                     return parseTypeOperator(operator);
-                case 127 /* InferKeyword */:
+                case 128 /* InferKeyword */:
                     return parseInferType();
             }
             return parsePostfixTypeOrHigher();
         }
         function parseUnionOrIntersectionType(kind, parseConstituentType, operator) {
-            parseOptional(operator);
+            var start = scanner.getStartPos();
+            var hasLeadingOperator = parseOptional(operator);
             var type = parseConstituentType();
-            if (token() === operator) {
+            if (token() === operator || hasLeadingOperator) {
                 var types = [type];
                 while (parseOptional(operator)) {
                     types.push(parseConstituentType());
                 }
-                var node = createNode(kind, type.pos);
-                node.types = createNodeArray(types, type.pos);
+                var node = createNode(kind, start);
+                node.types = createNodeArray(types, start);
                 type = finishNode(node);
             }
             return type;
         }
         function parseIntersectionTypeOrHigher() {
-            return parseUnionOrIntersectionType(174 /* IntersectionType */, parseTypeOperatorOrHigher, 49 /* AmpersandToken */);
+            return parseUnionOrIntersectionType(175 /* IntersectionType */, parseTypeOperatorOrHigher, 49 /* AmpersandToken */);
         }
         function parseUnionTypeOrHigher() {
-            return parseUnionOrIntersectionType(173 /* UnionType */, parseIntersectionTypeOrHigher, 50 /* BarToken */);
+            return parseUnionOrIntersectionType(174 /* UnionType */, parseIntersectionTypeOrHigher, 50 /* BarToken */);
         }
         function isStartOfFunctionType() {
             if (token() === 28 /* LessThanToken */) {
@@ -19240,7 +19498,7 @@ var ts;
                 // Skip modifiers
                 parseModifiers();
             }
-            if (isIdentifier() || token() === 100 /* ThisKeyword */) {
+            if (isIdentifier() || token() === 101 /* ThisKeyword */) {
                 nextToken();
                 return true;
             }
@@ -19263,7 +19521,7 @@ var ts;
                 // We successfully skipped modifiers (if any) and an identifier or binding pattern,
                 // now see if we have something that indicates a parameter declaration
                 if (token() === 57 /* ColonToken */ || token() === 27 /* CommaToken */ ||
-                    token() === 56 /* QuestionToken */ || token() === 59 /* EqualsToken */) {
+                    token() === 56 /* QuestionToken */ || token() === 60 /* EqualsToken */) {
                     // ( xxx :
                     // ( xxx ,
                     // ( xxx ?
@@ -19284,7 +19542,7 @@ var ts;
             var typePredicateVariable = isIdentifier() && tryParse(parseTypePredicatePrefix);
             var type = parseType();
             if (typePredicateVariable) {
-                var node = createNode(163 /* TypePredicate */, typePredicateVariable.pos);
+                var node = createNode(164 /* TypePredicate */, typePredicateVariable.pos);
                 node.parameterName = typePredicateVariable;
                 node.type = type;
                 return finishNode(node);
@@ -19295,7 +19553,7 @@ var ts;
         }
         function parseTypePredicatePrefix() {
             var id = parseIdentifier();
-            if (token() === 128 /* IsKeyword */ && !scanner.hasPrecedingLineBreak()) {
+            if (token() === 129 /* IsKeyword */ && !scanner.hasPrecedingLineBreak()) {
                 nextToken();
                 return id;
             }
@@ -19306,12 +19564,12 @@ var ts;
             return doOutsideOfContext(20480 /* TypeExcludesFlags */, parseTypeWorker);
         }
         function parseTypeWorker(noConditionalTypes) {
-            if (isStartOfFunctionType() || token() === 95 /* NewKeyword */) {
+            if (isStartOfFunctionType() || token() === 96 /* NewKeyword */) {
                 return parseFunctionOrConstructorType();
             }
             var type = parseUnionTypeOrHigher();
-            if (!noConditionalTypes && !scanner.hasPrecedingLineBreak() && parseOptional(86 /* ExtendsKeyword */)) {
-                var node = createNode(175 /* ConditionalType */, type.pos);
+            if (!noConditionalTypes && !scanner.hasPrecedingLineBreak() && parseOptional(87 /* ExtendsKeyword */)) {
+                var node = createNode(176 /* ConditionalType */, type.pos);
                 node.checkType = type;
                 // The type following 'extends' is not permitted to be another conditional type
                 node.extendsType = parseTypeWorker(/*noConditionalTypes*/ true);
@@ -19329,11 +19587,11 @@ var ts;
         // EXPRESSIONS
         function isStartOfLeftHandSideExpression() {
             switch (token()) {
-                case 100 /* ThisKeyword */:
-                case 98 /* SuperKeyword */:
-                case 96 /* NullKeyword */:
-                case 102 /* TrueKeyword */:
-                case 87 /* FalseKeyword */:
+                case 101 /* ThisKeyword */:
+                case 99 /* SuperKeyword */:
+                case 97 /* NullKeyword */:
+                case 103 /* TrueKeyword */:
+                case 88 /* FalseKeyword */:
                 case 8 /* NumericLiteral */:
                 case 9 /* BigIntLiteral */:
                 case 10 /* StringLiteral */:
@@ -19342,14 +19600,14 @@ var ts;
                 case 20 /* OpenParenToken */:
                 case 22 /* OpenBracketToken */:
                 case 18 /* OpenBraceToken */:
-                case 90 /* FunctionKeyword */:
-                case 76 /* ClassKeyword */:
-                case 95 /* NewKeyword */:
+                case 91 /* FunctionKeyword */:
+                case 77 /* ClassKeyword */:
+                case 96 /* NewKeyword */:
                 case 42 /* SlashToken */:
-                case 64 /* SlashEqualsToken */:
-                case 72 /* Identifier */:
+                case 65 /* SlashEqualsToken */:
+                case 73 /* Identifier */:
                     return true;
-                case 92 /* ImportKeyword */:
+                case 93 /* ImportKeyword */:
                     return lookAhead(nextTokenIsOpenParenOrLessThanOrDot);
                 default:
                     return isIdentifier();
@@ -19364,14 +19622,14 @@ var ts;
                 case 39 /* MinusToken */:
                 case 53 /* TildeToken */:
                 case 52 /* ExclamationToken */:
-                case 81 /* DeleteKeyword */:
-                case 104 /* TypeOfKeyword */:
-                case 106 /* VoidKeyword */:
+                case 82 /* DeleteKeyword */:
+                case 105 /* TypeOfKeyword */:
+                case 107 /* VoidKeyword */:
                 case 44 /* PlusPlusToken */:
                 case 45 /* MinusMinusToken */:
                 case 28 /* LessThanToken */:
-                case 122 /* AwaitKeyword */:
-                case 117 /* YieldKeyword */:
+                case 123 /* AwaitKeyword */:
+                case 118 /* YieldKeyword */:
                     // Yield/await always starts an expression.  Either it is an identifier (in which case
                     // it is definitely an expression).  Or it's a keyword (either because we're in
                     // a generator or async function, or in strict mode (or both)) and it started a yield or await expression.
@@ -19390,8 +19648,8 @@ var ts;
         function isStartOfExpressionStatement() {
             // As per the grammar, none of '{' or 'function' or 'class' can start an expression statement.
             return token() !== 18 /* OpenBraceToken */ &&
-                token() !== 90 /* FunctionKeyword */ &&
-                token() !== 76 /* ClassKeyword */ &&
+                token() !== 91 /* FunctionKeyword */ &&
+                token() !== 77 /* ClassKeyword */ &&
                 token() !== 58 /* AtToken */ &&
                 isStartOfExpression();
         }
@@ -19415,7 +19673,7 @@ var ts;
             return expr;
         }
         function parseInitializer() {
-            return parseOptional(59 /* EqualsToken */) ? parseAssignmentExpressionOrHigher() : undefined;
+            return parseOptional(60 /* EqualsToken */) ? parseAssignmentExpressionOrHigher() : undefined;
         }
         function parseAssignmentExpressionOrHigher() {
             //  AssignmentExpression[in,yield]:
@@ -19460,7 +19718,7 @@ var ts;
             // To avoid a look-ahead, we did not handle the case of an arrow function with a single un-parenthesized
             // parameter ('x => ...') above. We handle it here by checking if the parsed expression was a single
             // identifier and the current token is an arrow.
-            if (expr.kind === 72 /* Identifier */ && token() === 37 /* EqualsGreaterThanToken */) {
+            if (expr.kind === 73 /* Identifier */ && token() === 37 /* EqualsGreaterThanToken */) {
                 return parseSimpleArrowFunctionExpression(expr);
             }
             // Now see if we might be in cases '2' or '3'.
@@ -19476,7 +19734,7 @@ var ts;
             return parseConditionalExpressionRest(expr);
         }
         function isYieldExpression() {
-            if (token() === 117 /* YieldKeyword */) {
+            if (token() === 118 /* YieldKeyword */) {
                 // If we have a 'yield' keyword, and this is a context where yield expressions are
                 // allowed, then definitely parse out a yield expression.
                 if (inYieldContext()) {
@@ -19505,7 +19763,7 @@ var ts;
             return !scanner.hasPrecedingLineBreak() && isIdentifier();
         }
         function parseYieldExpression() {
-            var node = createNode(207 /* YieldExpression */);
+            var node = createNode(208 /* YieldExpression */);
             // YieldExpression[In] :
             //      yield
             //      yield [no LineTerminator here] [Lexical goal InputElementRegExp]AssignmentExpression[?In, Yield]
@@ -19527,13 +19785,13 @@ var ts;
             ts.Debug.assert(token() === 37 /* EqualsGreaterThanToken */, "parseSimpleArrowFunctionExpression should only have been called if we had a =>");
             var node;
             if (asyncModifier) {
-                node = createNode(197 /* ArrowFunction */, asyncModifier.pos);
+                node = createNode(198 /* ArrowFunction */, asyncModifier.pos);
                 node.modifiers = asyncModifier;
             }
             else {
-                node = createNode(197 /* ArrowFunction */, identifier.pos);
+                node = createNode(198 /* ArrowFunction */, identifier.pos);
             }
-            var parameter = createNode(151 /* Parameter */, identifier.pos);
+            var parameter = createNode(152 /* Parameter */, identifier.pos);
             parameter.name = identifier;
             finishNode(parameter);
             node.parameters = createNodeArray([parameter], parameter.pos, parameter.end);
@@ -19573,7 +19831,7 @@ var ts;
         //  Unknown     -> There *might* be a parenthesized arrow function here.
         //                 Speculatively look ahead to be sure, and rollback if not.
         function isParenthesizedArrowFunctionExpression() {
-            if (token() === 20 /* OpenParenToken */ || token() === 28 /* LessThanToken */ || token() === 121 /* AsyncKeyword */) {
+            if (token() === 20 /* OpenParenToken */ || token() === 28 /* LessThanToken */ || token() === 122 /* AsyncKeyword */) {
                 return lookAhead(isParenthesizedArrowFunctionExpressionWorker);
             }
             if (token() === 37 /* EqualsGreaterThanToken */) {
@@ -19586,7 +19844,7 @@ var ts;
             return 0 /* False */;
         }
         function isParenthesizedArrowFunctionExpressionWorker() {
-            if (token() === 121 /* AsyncKeyword */) {
+            if (token() === 122 /* AsyncKeyword */) {
                 nextToken();
                 if (scanner.hasPrecedingLineBreak()) {
                     return 0 /* False */;
@@ -19630,13 +19888,13 @@ var ts;
                 // Check for "(xxx yyy", where xxx is a modifier and yyy is an identifier. This
                 // isn't actually allowed, but we want to treat it as a lambda so we can provide
                 // a good error message.
-                if (ts.isModifierKind(second) && second !== 121 /* AsyncKeyword */ && lookAhead(nextTokenIsIdentifier)) {
+                if (ts.isModifierKind(second) && second !== 122 /* AsyncKeyword */ && lookAhead(nextTokenIsIdentifier)) {
                     return 1 /* True */;
                 }
                 // If we had "(" followed by something that's not an identifier,
                 // then this definitely doesn't look like a lambda.  "this" is not
                 // valid, but we want to parse it and then give a semantic error.
-                if (!isIdentifier() && second !== 100 /* ThisKeyword */) {
+                if (!isIdentifier() && second !== 101 /* ThisKeyword */) {
                     return 0 /* False */;
                 }
                 switch (nextToken()) {
@@ -19647,13 +19905,13 @@ var ts;
                     case 56 /* QuestionToken */:
                         nextToken();
                         // If we have "(a?:" or "(a?," or "(a?=" or "(a?)" then it is definitely a lambda.
-                        if (token() === 57 /* ColonToken */ || token() === 27 /* CommaToken */ || token() === 59 /* EqualsToken */ || token() === 21 /* CloseParenToken */) {
+                        if (token() === 57 /* ColonToken */ || token() === 27 /* CommaToken */ || token() === 60 /* EqualsToken */ || token() === 21 /* CloseParenToken */) {
                             return 1 /* True */;
                         }
                         // Otherwise it is definitely not a lambda.
                         return 0 /* False */;
                     case 27 /* CommaToken */:
-                    case 59 /* EqualsToken */:
+                    case 60 /* EqualsToken */:
                     case 21 /* CloseParenToken */:
                         // If we have "(a," or "(a=" or "(a)" this *could* be an arrow function
                         return 2 /* Unknown */;
@@ -19672,10 +19930,10 @@ var ts;
                 if (sourceFile.languageVariant === 1 /* JSX */) {
                     var isArrowFunctionInJsx = lookAhead(function () {
                         var third = nextToken();
-                        if (third === 86 /* ExtendsKeyword */) {
+                        if (third === 87 /* ExtendsKeyword */) {
                             var fourth = nextToken();
                             switch (fourth) {
-                                case 59 /* EqualsToken */:
+                                case 60 /* EqualsToken */:
                                 case 30 /* GreaterThanToken */:
                                     return false;
                                 default:
@@ -19701,7 +19959,7 @@ var ts;
         }
         function tryParseAsyncSimpleArrowFunctionExpression() {
             // We do a check here so that we won't be doing unnecessarily call to "lookAhead"
-            if (token() === 121 /* AsyncKeyword */) {
+            if (token() === 122 /* AsyncKeyword */) {
                 if (lookAhead(isUnParenthesizedAsyncArrowFunctionWorker) === 1 /* True */) {
                     var asyncModifier = parseModifiersForArrowFunction();
                     var expr = parseBinaryExpressionOrHigher(/*precedence*/ 0);
@@ -19714,7 +19972,7 @@ var ts;
             // AsyncArrowFunctionExpression:
             //      1) async[no LineTerminator here]AsyncArrowBindingIdentifier[?Yield][no LineTerminator here]=>AsyncConciseBody[?In]
             //      2) CoverCallExpressionAndAsyncArrowHead[?Yield, ?Await][no LineTerminator here]=>AsyncConciseBody[?In]
-            if (token() === 121 /* AsyncKeyword */) {
+            if (token() === 122 /* AsyncKeyword */) {
                 nextToken();
                 // If the "async" is followed by "=>" token then it is not a beginning of an async arrow-function
                 // but instead a simple arrow-function which will be parsed inside "parseAssignmentExpressionOrHigher"
@@ -19723,14 +19981,14 @@ var ts;
                 }
                 // Check for un-parenthesized AsyncArrowFunction
                 var expr = parseBinaryExpressionOrHigher(/*precedence*/ 0);
-                if (!scanner.hasPrecedingLineBreak() && expr.kind === 72 /* Identifier */ && token() === 37 /* EqualsGreaterThanToken */) {
+                if (!scanner.hasPrecedingLineBreak() && expr.kind === 73 /* Identifier */ && token() === 37 /* EqualsGreaterThanToken */) {
                     return 1 /* True */;
                 }
             }
             return 0 /* False */;
         }
         function parseParenthesizedArrowFunctionExpressionHead(allowAmbiguity) {
-            var node = createNodeWithJSDoc(197 /* ArrowFunction */);
+            var node = createNodeWithJSDoc(198 /* ArrowFunction */);
             node.modifiers = parseModifiersForArrowFunction();
             var isAsync = ts.hasModifier(node, 256 /* Async */) ? 2 /* Await */ : 0 /* None */;
             // Arrow functions are never generators.
@@ -19749,9 +20007,11 @@ var ts;
             //  - "(x = 10)" is an assignment expression parsed as a signature with a default parameter value.
             //  - "(x,y)" is a comma expression parsed as a signature with two parameters.
             //  - "a ? (b): c" will have "(b):" parsed as a signature with a return type annotation.
+            //  - "a ? (b): function() {}" will too, since function() is a valid JSDoc function type.
             //
             // So we need just a bit of lookahead to ensure that it can only be a signature.
-            if (!allowAmbiguity && token() !== 37 /* EqualsGreaterThanToken */ && token() !== 18 /* OpenBraceToken */) {
+            var hasJSDocFunctionType = node.type && ts.isJSDocFunctionType(node.type);
+            if (!allowAmbiguity && token() !== 37 /* EqualsGreaterThanToken */ && (hasJSDocFunctionType || token() !== 18 /* OpenBraceToken */)) {
                 // Returning undefined here will cause our caller to rewind to where we started from.
                 return undefined;
             }
@@ -19762,8 +20022,8 @@ var ts;
                 return parseFunctionBlock(isAsync ? 2 /* Await */ : 0 /* None */);
             }
             if (token() !== 26 /* SemicolonToken */ &&
-                token() !== 90 /* FunctionKeyword */ &&
-                token() !== 76 /* ClassKeyword */ &&
+                token() !== 91 /* FunctionKeyword */ &&
+                token() !== 77 /* ClassKeyword */ &&
                 isStartOfStatement() &&
                 !isStartOfExpressionStatement()) {
                 // Check if we got a plain statement (i.e. no expression-statements, no function/class expressions/declarations)
@@ -19794,14 +20054,14 @@ var ts;
             }
             // Note: we explicitly 'allowIn' in the whenTrue part of the condition expression, and
             // we do not that for the 'whenFalse' part.
-            var node = createNode(205 /* ConditionalExpression */, leftOperand.pos);
+            var node = createNode(206 /* ConditionalExpression */, leftOperand.pos);
             node.condition = leftOperand;
             node.questionToken = questionToken;
             node.whenTrue = doOutsideOfContext(disallowInAndDecoratorContext, parseAssignmentExpressionOrHigher);
             node.colonToken = parseExpectedToken(57 /* ColonToken */);
             node.whenFalse = ts.nodeIsPresent(node.colonToken)
                 ? parseAssignmentExpressionOrHigher()
-                : createMissingNode(72 /* Identifier */, /*reportAtCurrentPosition*/ false, ts.Diagnostics._0_expected, ts.tokenToString(57 /* ColonToken */));
+                : createMissingNode(73 /* Identifier */, /*reportAtCurrentPosition*/ false, ts.Diagnostics._0_expected, ts.tokenToString(57 /* ColonToken */));
             return finishNode(node);
         }
         function parseBinaryExpressionOrHigher(precedence) {
@@ -19809,7 +20069,7 @@ var ts;
             return parseBinaryExpressionRest(precedence, leftOperand);
         }
         function isInOrOfKeyword(t) {
-            return t === 93 /* InKeyword */ || t === 147 /* OfKeyword */;
+            return t === 94 /* InKeyword */ || t === 148 /* OfKeyword */;
         }
         function parseBinaryExpressionRest(precedence, leftOperand) {
             while (true) {
@@ -19844,10 +20104,10 @@ var ts;
                 if (!consumeCurrentOperator) {
                     break;
                 }
-                if (token() === 93 /* InKeyword */ && inDisallowInContext()) {
+                if (token() === 94 /* InKeyword */ && inDisallowInContext()) {
                     break;
                 }
-                if (token() === 119 /* AsKeyword */) {
+                if (token() === 120 /* AsKeyword */) {
                     // Make sure we *do* perform ASI for constructs like this:
                     //    var x = foo
                     //    as (Bar)
@@ -19868,51 +20128,51 @@ var ts;
             return leftOperand;
         }
         function isBinaryOperator() {
-            if (inDisallowInContext() && token() === 93 /* InKeyword */) {
+            if (inDisallowInContext() && token() === 94 /* InKeyword */) {
                 return false;
             }
             return ts.getBinaryOperatorPrecedence(token()) > 0;
         }
         function makeBinaryExpression(left, operatorToken, right) {
-            var node = createNode(204 /* BinaryExpression */, left.pos);
+            var node = createNode(205 /* BinaryExpression */, left.pos);
             node.left = left;
             node.operatorToken = operatorToken;
             node.right = right;
             return finishNode(node);
         }
         function makeAsExpression(left, right) {
-            var node = createNode(212 /* AsExpression */, left.pos);
+            var node = createNode(213 /* AsExpression */, left.pos);
             node.expression = left;
             node.type = right;
             return finishNode(node);
         }
         function parsePrefixUnaryExpression() {
-            var node = createNode(202 /* PrefixUnaryExpression */);
+            var node = createNode(203 /* PrefixUnaryExpression */);
             node.operator = token();
             nextToken();
             node.operand = parseSimpleUnaryExpression();
             return finishNode(node);
         }
         function parseDeleteExpression() {
-            var node = createNode(198 /* DeleteExpression */);
+            var node = createNode(199 /* DeleteExpression */);
             nextToken();
             node.expression = parseSimpleUnaryExpression();
             return finishNode(node);
         }
         function parseTypeOfExpression() {
-            var node = createNode(199 /* TypeOfExpression */);
+            var node = createNode(200 /* TypeOfExpression */);
             nextToken();
             node.expression = parseSimpleUnaryExpression();
             return finishNode(node);
         }
         function parseVoidExpression() {
-            var node = createNode(200 /* VoidExpression */);
+            var node = createNode(201 /* VoidExpression */);
             nextToken();
             node.expression = parseSimpleUnaryExpression();
             return finishNode(node);
         }
         function isAwaitExpression() {
-            if (token() === 122 /* AwaitKeyword */) {
+            if (token() === 123 /* AwaitKeyword */) {
                 if (inAwaitContext()) {
                     return true;
                 }
@@ -19922,7 +20182,7 @@ var ts;
             return false;
         }
         function parseAwaitExpression() {
-            var node = createNode(201 /* AwaitExpression */);
+            var node = createNode(202 /* AwaitExpression */);
             nextToken();
             node.expression = parseSimpleUnaryExpression();
             return finishNode(node);
@@ -19966,7 +20226,7 @@ var ts;
             if (token() === 41 /* AsteriskAsteriskToken */) {
                 var pos = ts.skipTrivia(sourceText, simpleUnaryExpression.pos);
                 var end = simpleUnaryExpression.end;
-                if (simpleUnaryExpression.kind === 194 /* TypeAssertionExpression */) {
+                if (simpleUnaryExpression.kind === 195 /* TypeAssertionExpression */) {
                     parseErrorAt(pos, end, ts.Diagnostics.A_type_assertion_expression_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Consider_enclosing_the_expression_in_parentheses);
                 }
                 else {
@@ -19996,18 +20256,18 @@ var ts;
                 case 53 /* TildeToken */:
                 case 52 /* ExclamationToken */:
                     return parsePrefixUnaryExpression();
-                case 81 /* DeleteKeyword */:
+                case 82 /* DeleteKeyword */:
                     return parseDeleteExpression();
-                case 104 /* TypeOfKeyword */:
+                case 105 /* TypeOfKeyword */:
                     return parseTypeOfExpression();
-                case 106 /* VoidKeyword */:
+                case 107 /* VoidKeyword */:
                     return parseVoidExpression();
                 case 28 /* LessThanToken */:
                     // This is modified UnaryExpression grammar in TypeScript
                     //  UnaryExpression (modified):
                     //      < type > UnaryExpression
                     return parseTypeAssertion();
-                case 122 /* AwaitKeyword */:
+                case 123 /* AwaitKeyword */:
                     if (isAwaitExpression()) {
                         return parseAwaitExpression();
                     }
@@ -20034,10 +20294,10 @@ var ts;
                 case 39 /* MinusToken */:
                 case 53 /* TildeToken */:
                 case 52 /* ExclamationToken */:
-                case 81 /* DeleteKeyword */:
-                case 104 /* TypeOfKeyword */:
-                case 106 /* VoidKeyword */:
-                case 122 /* AwaitKeyword */:
+                case 82 /* DeleteKeyword */:
+                case 105 /* TypeOfKeyword */:
+                case 107 /* VoidKeyword */:
+                case 123 /* AwaitKeyword */:
                     return false;
                 case 28 /* LessThanToken */:
                     // If we are not in JSX context, we are parsing TypeAssertion which is an UnaryExpression
@@ -20063,7 +20323,7 @@ var ts;
          */
         function parseUpdateExpression() {
             if (token() === 44 /* PlusPlusToken */ || token() === 45 /* MinusMinusToken */) {
-                var node = createNode(202 /* PrefixUnaryExpression */);
+                var node = createNode(203 /* PrefixUnaryExpression */);
                 node.operator = token();
                 nextToken();
                 node.operand = parseLeftHandSideExpressionOrHigher();
@@ -20076,7 +20336,7 @@ var ts;
             var expression = parseLeftHandSideExpressionOrHigher();
             ts.Debug.assert(ts.isLeftHandSideExpression(expression));
             if ((token() === 44 /* PlusPlusToken */ || token() === 45 /* MinusMinusToken */) && !scanner.hasPrecedingLineBreak()) {
-                var node = createNode(203 /* PostfixUnaryExpression */, expression.pos);
+                var node = createNode(204 /* PostfixUnaryExpression */, expression.pos);
                 node.operand = expression;
                 node.operator = token();
                 nextToken();
@@ -20117,7 +20377,7 @@ var ts;
             // 3)we have a MemberExpression which either completes the LeftHandSideExpression,
             // or starts the beginning of the first four CallExpression productions.
             var expression;
-            if (token() === 92 /* ImportKeyword */) {
+            if (token() === 93 /* ImportKeyword */) {
                 if (lookAhead(nextTokenIsOpenParenOrLessThan)) {
                     // We don't want to eagerly consume all import keyword as import call expression so we look ahead to find "("
                     // For example:
@@ -20132,8 +20392,8 @@ var ts;
                     var fullStart = scanner.getStartPos();
                     nextToken(); // advance past the 'import'
                     nextToken(); // advance past the dot
-                    var node = createNode(214 /* MetaProperty */, fullStart);
-                    node.keywordToken = 92 /* ImportKeyword */;
+                    var node = createNode(215 /* MetaProperty */, fullStart);
+                    node.keywordToken = 93 /* ImportKeyword */;
                     node.name = parseIdentifierName();
                     expression = finishNode(node);
                     sourceFile.flags |= 1048576 /* PossiblyContainsImportMeta */;
@@ -20143,7 +20403,7 @@ var ts;
                 }
             }
             else {
-                expression = token() === 98 /* SuperKeyword */ ? parseSuperExpression() : parseMemberExpressionOrHigher();
+                expression = token() === 99 /* SuperKeyword */ ? parseSuperExpression() : parseMemberExpressionOrHigher();
             }
             // Now, we *may* be complete.  However, we might have consumed the start of a
             // CallExpression.  As such, we need to consume the rest of it here to be complete.
@@ -20202,12 +20462,19 @@ var ts;
         }
         function parseSuperExpression() {
             var expression = parseTokenNode();
+            if (token() === 28 /* LessThanToken */) {
+                var startPos = getNodePos();
+                var typeArguments = tryParse(parseTypeArgumentsInExpression);
+                if (typeArguments !== undefined) {
+                    parseErrorAt(startPos, getNodePos(), ts.Diagnostics.super_may_not_use_type_arguments);
+                }
+            }
             if (token() === 20 /* OpenParenToken */ || token() === 24 /* DotToken */ || token() === 22 /* OpenBracketToken */) {
                 return expression;
             }
             // If we have seen "super" it must be followed by '(' or '.'.
             // If it wasn't then just try to parse out a '.' and report an error.
-            var node = createNode(189 /* PropertyAccessExpression */, expression.pos);
+            var node = createNode(190 /* PropertyAccessExpression */, expression.pos);
             node.expression = expression;
             parseExpectedToken(24 /* DotToken */, ts.Diagnostics.super_must_be_followed_by_an_argument_list_or_member_access);
             node.name = parseRightSideOfDot(/*allowIdentifierNames*/ true);
@@ -20216,8 +20483,8 @@ var ts;
         function parseJsxElementOrSelfClosingElementOrFragment(inExpressionContext) {
             var opening = parseJsxOpeningOrSelfClosingElementOrOpeningFragment(inExpressionContext);
             var result;
-            if (opening.kind === 262 /* JsxOpeningElement */) {
-                var node = createNode(260 /* JsxElement */, opening.pos);
+            if (opening.kind === 263 /* JsxOpeningElement */) {
+                var node = createNode(261 /* JsxElement */, opening.pos);
                 node.openingElement = opening;
                 node.children = parseJsxChildren(node.openingElement);
                 node.closingElement = parseJsxClosingElement(inExpressionContext);
@@ -20226,15 +20493,15 @@ var ts;
                 }
                 result = finishNode(node);
             }
-            else if (opening.kind === 265 /* JsxOpeningFragment */) {
-                var node = createNode(264 /* JsxFragment */, opening.pos);
+            else if (opening.kind === 266 /* JsxOpeningFragment */) {
+                var node = createNode(265 /* JsxFragment */, opening.pos);
                 node.openingFragment = opening;
                 node.children = parseJsxChildren(node.openingFragment);
                 node.closingFragment = parseJsxClosingFragment(inExpressionContext);
                 result = finishNode(node);
             }
             else {
-                ts.Debug.assert(opening.kind === 261 /* JsxSelfClosingElement */);
+                ts.Debug.assert(opening.kind === 262 /* JsxSelfClosingElement */);
                 // Nothing else to do for self-closing elements
                 result = opening;
             }
@@ -20249,11 +20516,11 @@ var ts;
                 var invalidElement = tryParse(function () { return parseJsxElementOrSelfClosingElementOrFragment(/*inExpressionContext*/ true); });
                 if (invalidElement) {
                     parseErrorAtCurrentToken(ts.Diagnostics.JSX_expressions_must_have_one_parent_element);
-                    var badNode = createNode(204 /* BinaryExpression */, result.pos);
+                    var badNode = createNode(205 /* BinaryExpression */, result.pos);
                     badNode.end = invalidElement.end;
                     badNode.left = result;
                     badNode.right = invalidElement;
-                    badNode.operatorToken = createMissingNode(27 /* CommaToken */, /*reportAtCurrentPosition*/ false, /*diagnosticMessage*/ undefined); // TODO: GH#18217
+                    badNode.operatorToken = createMissingNode(27 /* CommaToken */, /*reportAtCurrentPosition*/ false);
                     badNode.operatorToken.pos = badNode.operatorToken.end = badNode.right.pos;
                     return badNode;
                 }
@@ -20262,7 +20529,8 @@ var ts;
         }
         function parseJsxText() {
             var node = createNode(11 /* JsxText */);
-            node.containsOnlyWhiteSpaces = currentToken === 12 /* JsxTextAllWhiteSpaces */;
+            node.text = scanner.getTokenValue();
+            node.containsOnlyTriviaWhiteSpaces = currentToken === 12 /* JsxTextAllWhiteSpaces */;
             currentToken = scanner.scanJsxToken();
             return finishNode(node);
         }
@@ -20307,7 +20575,7 @@ var ts;
             return createNodeArray(list, listPos);
         }
         function parseJsxAttributes() {
-            var jsxAttributes = createNode(268 /* JsxAttributes */);
+            var jsxAttributes = createNode(269 /* JsxAttributes */);
             jsxAttributes.properties = parseList(13 /* JsxAttributes */, parseJsxAttribute);
             return finishNode(jsxAttributes);
         }
@@ -20316,7 +20584,7 @@ var ts;
             parseExpected(28 /* LessThanToken */);
             if (token() === 30 /* GreaterThanToken */) {
                 // See below for explanation of scanJsxText
-                var node_1 = createNode(265 /* JsxOpeningFragment */, fullStart);
+                var node_1 = createNode(266 /* JsxOpeningFragment */, fullStart);
                 scanJsxText();
                 return finishNode(node_1);
             }
@@ -20328,7 +20596,7 @@ var ts;
                 // Closing tag, so scan the immediately-following text with the JSX scanning instead
                 // of regular scanning to avoid treating illegal characters (e.g. '#') as immediate
                 // scanning errors
-                node = createNode(262 /* JsxOpeningElement */, fullStart);
+                node = createNode(263 /* JsxOpeningElement */, fullStart);
                 scanJsxText();
             }
             else {
@@ -20340,7 +20608,7 @@ var ts;
                     parseExpected(30 /* GreaterThanToken */, /*diagnostic*/ undefined, /*shouldAdvance*/ false);
                     scanJsxText();
                 }
-                node = createNode(261 /* JsxSelfClosingElement */, fullStart);
+                node = createNode(262 /* JsxSelfClosingElement */, fullStart);
             }
             node.tagName = tagName;
             node.typeArguments = typeArguments;
@@ -20354,10 +20622,10 @@ var ts;
             //      primaryExpression in the form of an identifier and "this" keyword
             // We can't just simply use parseLeftHandSideExpressionOrHigher because then we will start consider class,function etc as a keyword
             // We only want to consider "this" as a primaryExpression
-            var expression = token() === 100 /* ThisKeyword */ ?
+            var expression = token() === 101 /* ThisKeyword */ ?
                 parseTokenNode() : parseIdentifierName();
             while (parseOptional(24 /* DotToken */)) {
-                var propertyAccess = createNode(189 /* PropertyAccessExpression */, expression.pos);
+                var propertyAccess = createNode(190 /* PropertyAccessExpression */, expression.pos);
                 propertyAccess.expression = expression;
                 propertyAccess.name = parseRightSideOfDot(/*allowIdentifierNames*/ true);
                 expression = finishNode(propertyAccess);
@@ -20365,20 +20633,24 @@ var ts;
             return expression;
         }
         function parseJsxExpression(inExpressionContext) {
-            var node = createNode(270 /* JsxExpression */);
+            var node = createNode(271 /* JsxExpression */);
             if (!parseExpected(18 /* OpenBraceToken */)) {
                 return undefined;
             }
             if (token() !== 19 /* CloseBraceToken */) {
                 node.dotDotDotToken = parseOptionalToken(25 /* DotDotDotToken */);
-                node.expression = parseAssignmentExpressionOrHigher();
+                // Only an AssignmentExpression is valid here per the JSX spec,
+                // but we can unambiguously parse a comma sequence and provide
+                // a better error message in grammar checking.
+                node.expression = parseExpression();
             }
             if (inExpressionContext) {
                 parseExpected(19 /* CloseBraceToken */);
             }
             else {
-                parseExpected(19 /* CloseBraceToken */, /*message*/ undefined, /*shouldAdvance*/ false);
-                scanJsxText();
+                if (parseExpected(19 /* CloseBraceToken */, /*message*/ undefined, /*shouldAdvance*/ false)) {
+                    scanJsxText();
+                }
             }
             return finishNode(node);
         }
@@ -20387,9 +20659,9 @@ var ts;
                 return parseJsxSpreadAttribute();
             }
             scanJsxIdentifier();
-            var node = createNode(267 /* JsxAttribute */);
+            var node = createNode(268 /* JsxAttribute */);
             node.name = parseIdentifierName();
-            if (token() === 59 /* EqualsToken */) {
+            if (token() === 60 /* EqualsToken */) {
                 switch (scanJsxAttributeValue()) {
                     case 10 /* StringLiteral */:
                         node.initializer = parseLiteralNode();
@@ -20402,7 +20674,7 @@ var ts;
             return finishNode(node);
         }
         function parseJsxSpreadAttribute() {
-            var node = createNode(269 /* JsxSpreadAttribute */);
+            var node = createNode(270 /* JsxSpreadAttribute */);
             parseExpected(18 /* OpenBraceToken */);
             parseExpected(25 /* DotDotDotToken */);
             node.expression = parseExpression();
@@ -20410,7 +20682,7 @@ var ts;
             return finishNode(node);
         }
         function parseJsxClosingElement(inExpressionContext) {
-            var node = createNode(263 /* JsxClosingElement */);
+            var node = createNode(264 /* JsxClosingElement */);
             parseExpected(29 /* LessThanSlashToken */);
             node.tagName = parseJsxElementName();
             if (inExpressionContext) {
@@ -20423,7 +20695,7 @@ var ts;
             return finishNode(node);
         }
         function parseJsxClosingFragment(inExpressionContext) {
-            var node = createNode(266 /* JsxClosingFragment */);
+            var node = createNode(267 /* JsxClosingFragment */);
             parseExpected(29 /* LessThanSlashToken */);
             if (ts.tokenIsIdentifierOrKeyword(token())) {
                 parseErrorAtRange(parseJsxElementName(), ts.Diagnostics.Expected_corresponding_closing_tag_for_JSX_fragment);
@@ -20438,7 +20710,7 @@ var ts;
             return finishNode(node);
         }
         function parseTypeAssertion() {
-            var node = createNode(194 /* TypeAssertionExpression */);
+            var node = createNode(195 /* TypeAssertionExpression */);
             parseExpected(28 /* LessThanToken */);
             node.type = parseType();
             parseExpected(30 /* GreaterThanToken */);
@@ -20449,7 +20721,7 @@ var ts;
             while (true) {
                 var dotToken = parseOptionalToken(24 /* DotToken */);
                 if (dotToken) {
-                    var propertyAccess = createNode(189 /* PropertyAccessExpression */, expression.pos);
+                    var propertyAccess = createNode(190 /* PropertyAccessExpression */, expression.pos);
                     propertyAccess.expression = expression;
                     propertyAccess.name = parseRightSideOfDot(/*allowIdentifierNames*/ true);
                     expression = finishNode(propertyAccess);
@@ -20457,17 +20729,17 @@ var ts;
                 }
                 if (token() === 52 /* ExclamationToken */ && !scanner.hasPrecedingLineBreak()) {
                     nextToken();
-                    var nonNullExpression = createNode(213 /* NonNullExpression */, expression.pos);
+                    var nonNullExpression = createNode(214 /* NonNullExpression */, expression.pos);
                     nonNullExpression.expression = expression;
                     expression = finishNode(nonNullExpression);
                     continue;
                 }
                 // when in the [Decorator] context, we do not parse ElementAccess as it could be part of a ComputedPropertyName
                 if (!inDecoratorContext() && parseOptional(22 /* OpenBracketToken */)) {
-                    var indexedAccess = createNode(190 /* ElementAccessExpression */, expression.pos);
+                    var indexedAccess = createNode(191 /* ElementAccessExpression */, expression.pos);
                     indexedAccess.expression = expression;
                     if (token() === 23 /* CloseBracketToken */) {
-                        indexedAccess.argumentExpression = createMissingNode(72 /* Identifier */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.An_element_access_expression_should_take_an_argument);
+                        indexedAccess.argumentExpression = createMissingNode(73 /* Identifier */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.An_element_access_expression_should_take_an_argument);
                     }
                     else {
                         var argument = allowInAnd(parseExpression);
@@ -20491,7 +20763,7 @@ var ts;
             return token() === 14 /* NoSubstitutionTemplateLiteral */ || token() === 15 /* TemplateHead */;
         }
         function parseTaggedTemplateRest(tag, typeArguments) {
-            var tagExpression = createNode(193 /* TaggedTemplateExpression */, tag.pos);
+            var tagExpression = createNode(194 /* TaggedTemplateExpression */, tag.pos);
             tagExpression.tag = tag;
             tagExpression.typeArguments = typeArguments;
             tagExpression.template = token() === 14 /* NoSubstitutionTemplateLiteral */
@@ -20516,7 +20788,7 @@ var ts;
                         expression = parseTaggedTemplateRest(expression, typeArguments);
                         continue;
                     }
-                    var callExpr = createNode(191 /* CallExpression */, expression.pos);
+                    var callExpr = createNode(192 /* CallExpression */, expression.pos);
                     callExpr.expression = expression;
                     callExpr.typeArguments = typeArguments;
                     callExpr.arguments = parseArgumentList();
@@ -20524,7 +20796,7 @@ var ts;
                     continue;
                 }
                 else if (token() === 20 /* OpenParenToken */) {
-                    var callExpr = createNode(191 /* CallExpression */, expression.pos);
+                    var callExpr = createNode(192 /* CallExpression */, expression.pos);
                     callExpr.expression = expression;
                     callExpr.arguments = parseArgumentList();
                     expression = finishNode(callExpr);
@@ -20600,11 +20872,11 @@ var ts;
                 case 10 /* StringLiteral */:
                 case 14 /* NoSubstitutionTemplateLiteral */:
                     return parseLiteralNode();
-                case 100 /* ThisKeyword */:
-                case 98 /* SuperKeyword */:
-                case 96 /* NullKeyword */:
-                case 102 /* TrueKeyword */:
-                case 87 /* FalseKeyword */:
+                case 101 /* ThisKeyword */:
+                case 99 /* SuperKeyword */:
+                case 97 /* NullKeyword */:
+                case 103 /* TrueKeyword */:
+                case 88 /* FalseKeyword */:
                     return parseTokenNode();
                 case 20 /* OpenParenToken */:
                     return parseParenthesizedExpression();
@@ -20612,7 +20884,7 @@ var ts;
                     return parseArrayLiteralExpression();
                 case 18 /* OpenBraceToken */:
                     return parseObjectLiteralExpression();
-                case 121 /* AsyncKeyword */:
+                case 122 /* AsyncKeyword */:
                     // Async arrow functions are parsed earlier in parseAssignmentExpressionOrHigher.
                     // If we encounter `async [no LineTerminator here] function` then this is an async
                     // function; otherwise, its an identifier.
@@ -20620,14 +20892,14 @@ var ts;
                         break;
                     }
                     return parseFunctionExpression();
-                case 76 /* ClassKeyword */:
+                case 77 /* ClassKeyword */:
                     return parseClassExpression();
-                case 90 /* FunctionKeyword */:
+                case 91 /* FunctionKeyword */:
                     return parseFunctionExpression();
-                case 95 /* NewKeyword */:
+                case 96 /* NewKeyword */:
                     return parseNewExpressionOrNewDotTarget();
                 case 42 /* SlashToken */:
-                case 64 /* SlashEqualsToken */:
+                case 65 /* SlashEqualsToken */:
                     if (reScanSlashToken() === 13 /* RegularExpressionLiteral */) {
                         return parseLiteralNode();
                     }
@@ -20638,28 +20910,28 @@ var ts;
             return parseIdentifier(ts.Diagnostics.Expression_expected);
         }
         function parseParenthesizedExpression() {
-            var node = createNodeWithJSDoc(195 /* ParenthesizedExpression */);
+            var node = createNodeWithJSDoc(196 /* ParenthesizedExpression */);
             parseExpected(20 /* OpenParenToken */);
             node.expression = allowInAnd(parseExpression);
             parseExpected(21 /* CloseParenToken */);
             return finishNode(node);
         }
         function parseSpreadElement() {
-            var node = createNode(208 /* SpreadElement */);
+            var node = createNode(209 /* SpreadElement */);
             parseExpected(25 /* DotDotDotToken */);
             node.expression = parseAssignmentExpressionOrHigher();
             return finishNode(node);
         }
         function parseArgumentOrArrayLiteralElement() {
             return token() === 25 /* DotDotDotToken */ ? parseSpreadElement() :
-                token() === 27 /* CommaToken */ ? createNode(210 /* OmittedExpression */) :
+                token() === 27 /* CommaToken */ ? createNode(211 /* OmittedExpression */) :
                     parseAssignmentExpressionOrHigher();
         }
         function parseArgumentExpression() {
             return doOutsideOfContext(disallowInAndDecoratorContext, parseArgumentOrArrayLiteralElement);
         }
         function parseArrayLiteralExpression() {
-            var node = createNode(187 /* ArrayLiteralExpression */);
+            var node = createNode(188 /* ArrayLiteralExpression */);
             parseExpected(22 /* OpenBracketToken */);
             if (scanner.hasPrecedingLineBreak()) {
                 node.multiLine = true;
@@ -20671,17 +20943,17 @@ var ts;
         function parseObjectLiteralElement() {
             var node = createNodeWithJSDoc(0 /* Unknown */);
             if (parseOptionalToken(25 /* DotDotDotToken */)) {
-                node.kind = 277 /* SpreadAssignment */;
+                node.kind = 278 /* SpreadAssignment */;
                 node.expression = parseAssignmentExpressionOrHigher();
                 return finishNode(node);
             }
             node.decorators = parseDecorators();
             node.modifiers = parseModifiers();
-            if (parseContextualModifier(126 /* GetKeyword */)) {
-                return parseAccessorDeclaration(node, 158 /* GetAccessor */);
+            if (parseContextualModifier(127 /* GetKeyword */)) {
+                return parseAccessorDeclaration(node, 159 /* GetAccessor */);
             }
-            if (parseContextualModifier(137 /* SetKeyword */)) {
-                return parseAccessorDeclaration(node, 159 /* SetAccessor */);
+            if (parseContextualModifier(138 /* SetKeyword */)) {
+                return parseAccessorDeclaration(node, 160 /* SetAccessor */);
             }
             var asteriskToken = parseOptionalToken(40 /* AsteriskToken */);
             var tokenIsIdentifier = isIdentifier();
@@ -20699,22 +20971,22 @@ var ts;
             // this is necessary because ObjectLiteral productions are also used to cover grammar for ObjectAssignmentPattern
             var isShorthandPropertyAssignment = tokenIsIdentifier && (token() !== 57 /* ColonToken */);
             if (isShorthandPropertyAssignment) {
-                node.kind = 276 /* ShorthandPropertyAssignment */;
-                var equalsToken = parseOptionalToken(59 /* EqualsToken */);
+                node.kind = 277 /* ShorthandPropertyAssignment */;
+                var equalsToken = parseOptionalToken(60 /* EqualsToken */);
                 if (equalsToken) {
                     node.equalsToken = equalsToken;
                     node.objectAssignmentInitializer = allowInAnd(parseAssignmentExpressionOrHigher);
                 }
             }
             else {
-                node.kind = 275 /* PropertyAssignment */;
+                node.kind = 276 /* PropertyAssignment */;
                 parseExpected(57 /* ColonToken */);
                 node.initializer = allowInAnd(parseAssignmentExpressionOrHigher);
             }
             return finishNode(node);
         }
         function parseObjectLiteralExpression() {
-            var node = createNode(188 /* ObjectLiteralExpression */);
+            var node = createNode(189 /* ObjectLiteralExpression */);
             parseExpected(18 /* OpenBraceToken */);
             if (scanner.hasPrecedingLineBreak()) {
                 node.multiLine = true;
@@ -20733,9 +21005,9 @@ var ts;
             if (saveDecoratorContext) {
                 setDecoratorContext(/*val*/ false);
             }
-            var node = createNodeWithJSDoc(196 /* FunctionExpression */);
+            var node = createNodeWithJSDoc(197 /* FunctionExpression */);
             node.modifiers = parseModifiers();
-            parseExpected(90 /* FunctionKeyword */);
+            parseExpected(91 /* FunctionKeyword */);
             node.asteriskToken = parseOptionalToken(40 /* AsteriskToken */);
             var isGenerator = node.asteriskToken ? 1 /* Yield */ : 0 /* None */;
             var isAsync = ts.hasModifier(node, 256 /* Async */) ? 2 /* Await */ : 0 /* None */;
@@ -20756,10 +21028,10 @@ var ts;
         }
         function parseNewExpressionOrNewDotTarget() {
             var fullStart = scanner.getStartPos();
-            parseExpected(95 /* NewKeyword */);
+            parseExpected(96 /* NewKeyword */);
             if (parseOptional(24 /* DotToken */)) {
-                var node_2 = createNode(214 /* MetaProperty */, fullStart);
-                node_2.keywordToken = 95 /* NewKeyword */;
+                var node_2 = createNode(215 /* MetaProperty */, fullStart);
+                node_2.keywordToken = 96 /* NewKeyword */;
                 node_2.name = parseIdentifierName();
                 return finishNode(node_2);
             }
@@ -20775,7 +21047,7 @@ var ts;
                 }
                 break;
             }
-            var node = createNode(192 /* NewExpression */, fullStart);
+            var node = createNode(193 /* NewExpression */, fullStart);
             node.expression = expression;
             node.typeArguments = typeArguments;
             if (node.typeArguments || token() === 20 /* OpenParenToken */) {
@@ -20785,7 +21057,7 @@ var ts;
         }
         // STATEMENTS
         function parseBlock(ignoreMissingOpenBrace, diagnosticMessage) {
-            var node = createNode(218 /* Block */);
+            var node = createNode(219 /* Block */);
             if (parseExpected(18 /* OpenBraceToken */, diagnosticMessage) || ignoreMissingOpenBrace) {
                 if (scanner.hasPrecedingLineBreak()) {
                     node.multiLine = true;
@@ -20818,25 +21090,25 @@ var ts;
             return block;
         }
         function parseEmptyStatement() {
-            var node = createNode(220 /* EmptyStatement */);
+            var node = createNode(221 /* EmptyStatement */);
             parseExpected(26 /* SemicolonToken */);
             return finishNode(node);
         }
         function parseIfStatement() {
-            var node = createNode(222 /* IfStatement */);
-            parseExpected(91 /* IfKeyword */);
+            var node = createNode(223 /* IfStatement */);
+            parseExpected(92 /* IfKeyword */);
             parseExpected(20 /* OpenParenToken */);
             node.expression = allowInAnd(parseExpression);
             parseExpected(21 /* CloseParenToken */);
             node.thenStatement = parseStatement();
-            node.elseStatement = parseOptional(83 /* ElseKeyword */) ? parseStatement() : undefined;
+            node.elseStatement = parseOptional(84 /* ElseKeyword */) ? parseStatement() : undefined;
             return finishNode(node);
         }
         function parseDoStatement() {
-            var node = createNode(223 /* DoStatement */);
-            parseExpected(82 /* DoKeyword */);
+            var node = createNode(224 /* DoStatement */);
+            parseExpected(83 /* DoKeyword */);
             node.statement = parseStatement();
-            parseExpected(107 /* WhileKeyword */);
+            parseExpected(108 /* WhileKeyword */);
             parseExpected(20 /* OpenParenToken */);
             node.expression = allowInAnd(parseExpression);
             parseExpected(21 /* CloseParenToken */);
@@ -20848,8 +21120,8 @@ var ts;
             return finishNode(node);
         }
         function parseWhileStatement() {
-            var node = createNode(224 /* WhileStatement */);
-            parseExpected(107 /* WhileKeyword */);
+            var node = createNode(225 /* WhileStatement */);
+            parseExpected(108 /* WhileKeyword */);
             parseExpected(20 /* OpenParenToken */);
             node.expression = allowInAnd(parseExpression);
             parseExpected(21 /* CloseParenToken */);
@@ -20858,12 +21130,12 @@ var ts;
         }
         function parseForOrForInOrForOfStatement() {
             var pos = getNodePos();
-            parseExpected(89 /* ForKeyword */);
-            var awaitToken = parseOptionalToken(122 /* AwaitKeyword */);
+            parseExpected(90 /* ForKeyword */);
+            var awaitToken = parseOptionalToken(123 /* AwaitKeyword */);
             parseExpected(20 /* OpenParenToken */);
             var initializer;
             if (token() !== 26 /* SemicolonToken */) {
-                if (token() === 105 /* VarKeyword */ || token() === 111 /* LetKeyword */ || token() === 77 /* ConstKeyword */) {
+                if (token() === 106 /* VarKeyword */ || token() === 112 /* LetKeyword */ || token() === 78 /* ConstKeyword */) {
                     initializer = parseVariableDeclarationList(/*inForStatementInitializer*/ true);
                 }
                 else {
@@ -20871,23 +21143,23 @@ var ts;
                 }
             }
             var forOrForInOrForOfStatement;
-            if (awaitToken ? parseExpected(147 /* OfKeyword */) : parseOptional(147 /* OfKeyword */)) {
-                var forOfStatement = createNode(227 /* ForOfStatement */, pos);
+            if (awaitToken ? parseExpected(148 /* OfKeyword */) : parseOptional(148 /* OfKeyword */)) {
+                var forOfStatement = createNode(228 /* ForOfStatement */, pos);
                 forOfStatement.awaitModifier = awaitToken;
                 forOfStatement.initializer = initializer;
                 forOfStatement.expression = allowInAnd(parseAssignmentExpressionOrHigher);
                 parseExpected(21 /* CloseParenToken */);
                 forOrForInOrForOfStatement = forOfStatement;
             }
-            else if (parseOptional(93 /* InKeyword */)) {
-                var forInStatement = createNode(226 /* ForInStatement */, pos);
+            else if (parseOptional(94 /* InKeyword */)) {
+                var forInStatement = createNode(227 /* ForInStatement */, pos);
                 forInStatement.initializer = initializer;
                 forInStatement.expression = allowInAnd(parseExpression);
                 parseExpected(21 /* CloseParenToken */);
                 forOrForInOrForOfStatement = forInStatement;
             }
             else {
-                var forStatement = createNode(225 /* ForStatement */, pos);
+                var forStatement = createNode(226 /* ForStatement */, pos);
                 forStatement.initializer = initializer;
                 parseExpected(26 /* SemicolonToken */);
                 if (token() !== 26 /* SemicolonToken */ && token() !== 21 /* CloseParenToken */) {
@@ -20905,7 +21177,7 @@ var ts;
         }
         function parseBreakOrContinueStatement(kind) {
             var node = createNode(kind);
-            parseExpected(kind === 229 /* BreakStatement */ ? 73 /* BreakKeyword */ : 78 /* ContinueKeyword */);
+            parseExpected(kind === 230 /* BreakStatement */ ? 74 /* BreakKeyword */ : 79 /* ContinueKeyword */);
             if (!canParseSemicolon()) {
                 node.label = parseIdentifier();
             }
@@ -20913,8 +21185,8 @@ var ts;
             return finishNode(node);
         }
         function parseReturnStatement() {
-            var node = createNode(230 /* ReturnStatement */);
-            parseExpected(97 /* ReturnKeyword */);
+            var node = createNode(231 /* ReturnStatement */);
+            parseExpected(98 /* ReturnKeyword */);
             if (!canParseSemicolon()) {
                 node.expression = allowInAnd(parseExpression);
             }
@@ -20922,8 +21194,8 @@ var ts;
             return finishNode(node);
         }
         function parseWithStatement() {
-            var node = createNode(231 /* WithStatement */);
-            parseExpected(108 /* WithKeyword */);
+            var node = createNode(232 /* WithStatement */);
+            parseExpected(109 /* WithKeyword */);
             parseExpected(20 /* OpenParenToken */);
             node.expression = allowInAnd(parseExpression);
             parseExpected(21 /* CloseParenToken */);
@@ -20931,30 +21203,30 @@ var ts;
             return finishNode(node);
         }
         function parseCaseClause() {
-            var node = createNode(271 /* CaseClause */);
-            parseExpected(74 /* CaseKeyword */);
+            var node = createNode(272 /* CaseClause */);
+            parseExpected(75 /* CaseKeyword */);
             node.expression = allowInAnd(parseExpression);
             parseExpected(57 /* ColonToken */);
             node.statements = parseList(3 /* SwitchClauseStatements */, parseStatement);
             return finishNode(node);
         }
         function parseDefaultClause() {
-            var node = createNode(272 /* DefaultClause */);
-            parseExpected(80 /* DefaultKeyword */);
+            var node = createNode(273 /* DefaultClause */);
+            parseExpected(81 /* DefaultKeyword */);
             parseExpected(57 /* ColonToken */);
             node.statements = parseList(3 /* SwitchClauseStatements */, parseStatement);
             return finishNode(node);
         }
         function parseCaseOrDefaultClause() {
-            return token() === 74 /* CaseKeyword */ ? parseCaseClause() : parseDefaultClause();
+            return token() === 75 /* CaseKeyword */ ? parseCaseClause() : parseDefaultClause();
         }
         function parseSwitchStatement() {
-            var node = createNode(232 /* SwitchStatement */);
-            parseExpected(99 /* SwitchKeyword */);
+            var node = createNode(233 /* SwitchStatement */);
+            parseExpected(100 /* SwitchKeyword */);
             parseExpected(20 /* OpenParenToken */);
             node.expression = allowInAnd(parseExpression);
             parseExpected(21 /* CloseParenToken */);
-            var caseBlock = createNode(246 /* CaseBlock */);
+            var caseBlock = createNode(247 /* CaseBlock */);
             parseExpected(18 /* OpenBraceToken */);
             caseBlock.clauses = parseList(2 /* SwitchClauses */, parseCaseOrDefaultClause);
             parseExpected(19 /* CloseBraceToken */);
@@ -20969,29 +21241,29 @@ var ts;
             // directly as that might consume an expression on the following line.
             // We just return 'undefined' in that case.  The actual error will be reported in the
             // grammar walker.
-            var node = createNode(234 /* ThrowStatement */);
-            parseExpected(101 /* ThrowKeyword */);
+            var node = createNode(235 /* ThrowStatement */);
+            parseExpected(102 /* ThrowKeyword */);
             node.expression = scanner.hasPrecedingLineBreak() ? undefined : allowInAnd(parseExpression);
             parseSemicolon();
             return finishNode(node);
         }
         // TODO: Review for error recovery
         function parseTryStatement() {
-            var node = createNode(235 /* TryStatement */);
-            parseExpected(103 /* TryKeyword */);
+            var node = createNode(236 /* TryStatement */);
+            parseExpected(104 /* TryKeyword */);
             node.tryBlock = parseBlock(/*ignoreMissingOpenBrace*/ false);
-            node.catchClause = token() === 75 /* CatchKeyword */ ? parseCatchClause() : undefined;
+            node.catchClause = token() === 76 /* CatchKeyword */ ? parseCatchClause() : undefined;
             // If we don't have a catch clause, then we must have a finally clause.  Try to parse
             // one out no matter what.
-            if (!node.catchClause || token() === 88 /* FinallyKeyword */) {
-                parseExpected(88 /* FinallyKeyword */);
+            if (!node.catchClause || token() === 89 /* FinallyKeyword */) {
+                parseExpected(89 /* FinallyKeyword */);
                 node.finallyBlock = parseBlock(/*ignoreMissingOpenBrace*/ false);
             }
             return finishNode(node);
         }
         function parseCatchClause() {
-            var result = createNode(274 /* CatchClause */);
-            parseExpected(75 /* CatchKeyword */);
+            var result = createNode(275 /* CatchClause */);
+            parseExpected(76 /* CatchKeyword */);
             if (parseOptional(20 /* OpenParenToken */)) {
                 result.variableDeclaration = parseVariableDeclaration();
                 parseExpected(21 /* CloseParenToken */);
@@ -21004,8 +21276,8 @@ var ts;
             return finishNode(result);
         }
         function parseDebuggerStatement() {
-            var node = createNode(236 /* DebuggerStatement */);
-            parseExpected(79 /* DebuggerKeyword */);
+            var node = createNode(237 /* DebuggerStatement */);
+            parseExpected(80 /* DebuggerKeyword */);
             parseSemicolon();
             return finishNode(node);
         }
@@ -21015,13 +21287,13 @@ var ts;
             // a colon.
             var node = createNodeWithJSDoc(0 /* Unknown */);
             var expression = allowInAnd(parseExpression);
-            if (expression.kind === 72 /* Identifier */ && parseOptional(57 /* ColonToken */)) {
-                node.kind = 233 /* LabeledStatement */;
+            if (expression.kind === 73 /* Identifier */ && parseOptional(57 /* ColonToken */)) {
+                node.kind = 234 /* LabeledStatement */;
                 node.label = expression;
                 node.statement = parseStatement();
             }
             else {
-                node.kind = 221 /* ExpressionStatement */;
+                node.kind = 222 /* ExpressionStatement */;
                 node.expression = expression;
                 parseSemicolon();
             }
@@ -21033,11 +21305,11 @@ var ts;
         }
         function nextTokenIsClassKeywordOnSameLine() {
             nextToken();
-            return token() === 76 /* ClassKeyword */ && !scanner.hasPrecedingLineBreak();
+            return token() === 77 /* ClassKeyword */ && !scanner.hasPrecedingLineBreak();
         }
         function nextTokenIsFunctionKeywordOnSameLine() {
             nextToken();
-            return token() === 90 /* FunctionKeyword */ && !scanner.hasPrecedingLineBreak();
+            return token() === 91 /* FunctionKeyword */ && !scanner.hasPrecedingLineBreak();
         }
         function nextTokenIsIdentifierOrKeywordOrLiteralOnSameLine() {
             nextToken();
@@ -21046,12 +21318,12 @@ var ts;
         function isDeclaration() {
             while (true) {
                 switch (token()) {
-                    case 105 /* VarKeyword */:
-                    case 111 /* LetKeyword */:
-                    case 77 /* ConstKeyword */:
-                    case 90 /* FunctionKeyword */:
-                    case 76 /* ClassKeyword */:
-                    case 84 /* EnumKeyword */:
+                    case 106 /* VarKeyword */:
+                    case 112 /* LetKeyword */:
+                    case 78 /* ConstKeyword */:
+                    case 91 /* FunctionKeyword */:
+                    case 77 /* ClassKeyword */:
+                    case 85 /* EnumKeyword */:
                         return true;
                     // 'declare', 'module', 'namespace', 'interface'* and 'type' are all legal JavaScript identifiers;
                     // however, an identifier cannot be followed by another identifier on the same line. This is what we
@@ -21074,41 +21346,41 @@ var ts;
                     //   I {}
                     //
                     // could be legal, it would add complexity for very little gain.
-                    case 110 /* InterfaceKeyword */:
-                    case 140 /* TypeKeyword */:
+                    case 111 /* InterfaceKeyword */:
+                    case 141 /* TypeKeyword */:
                         return nextTokenIsIdentifierOnSameLine();
-                    case 130 /* ModuleKeyword */:
-                    case 131 /* NamespaceKeyword */:
+                    case 131 /* ModuleKeyword */:
+                    case 132 /* NamespaceKeyword */:
                         return nextTokenIsIdentifierOrStringLiteralOnSameLine();
-                    case 118 /* AbstractKeyword */:
-                    case 121 /* AsyncKeyword */:
-                    case 125 /* DeclareKeyword */:
-                    case 113 /* PrivateKeyword */:
-                    case 114 /* ProtectedKeyword */:
-                    case 115 /* PublicKeyword */:
-                    case 133 /* ReadonlyKeyword */:
+                    case 119 /* AbstractKeyword */:
+                    case 122 /* AsyncKeyword */:
+                    case 126 /* DeclareKeyword */:
+                    case 114 /* PrivateKeyword */:
+                    case 115 /* ProtectedKeyword */:
+                    case 116 /* PublicKeyword */:
+                    case 134 /* ReadonlyKeyword */:
                         nextToken();
                         // ASI takes effect for this modifier.
                         if (scanner.hasPrecedingLineBreak()) {
                             return false;
                         }
                         continue;
-                    case 145 /* GlobalKeyword */:
+                    case 146 /* GlobalKeyword */:
                         nextToken();
-                        return token() === 18 /* OpenBraceToken */ || token() === 72 /* Identifier */ || token() === 85 /* ExportKeyword */;
-                    case 92 /* ImportKeyword */:
+                        return token() === 18 /* OpenBraceToken */ || token() === 73 /* Identifier */ || token() === 86 /* ExportKeyword */;
+                    case 93 /* ImportKeyword */:
                         nextToken();
                         return token() === 10 /* StringLiteral */ || token() === 40 /* AsteriskToken */ ||
                             token() === 18 /* OpenBraceToken */ || ts.tokenIsIdentifierOrKeyword(token());
-                    case 85 /* ExportKeyword */:
+                    case 86 /* ExportKeyword */:
                         nextToken();
-                        if (token() === 59 /* EqualsToken */ || token() === 40 /* AsteriskToken */ ||
-                            token() === 18 /* OpenBraceToken */ || token() === 80 /* DefaultKeyword */ ||
-                            token() === 119 /* AsKeyword */) {
+                        if (token() === 60 /* EqualsToken */ || token() === 40 /* AsteriskToken */ ||
+                            token() === 18 /* OpenBraceToken */ || token() === 81 /* DefaultKeyword */ ||
+                            token() === 120 /* AsKeyword */) {
                             return true;
                         }
                         continue;
-                    case 116 /* StaticKeyword */:
+                    case 117 /* StaticKeyword */:
                         nextToken();
                         continue;
                     default:
@@ -21124,47 +21396,47 @@ var ts;
                 case 58 /* AtToken */:
                 case 26 /* SemicolonToken */:
                 case 18 /* OpenBraceToken */:
-                case 105 /* VarKeyword */:
-                case 111 /* LetKeyword */:
-                case 90 /* FunctionKeyword */:
-                case 76 /* ClassKeyword */:
-                case 84 /* EnumKeyword */:
-                case 91 /* IfKeyword */:
-                case 82 /* DoKeyword */:
-                case 107 /* WhileKeyword */:
-                case 89 /* ForKeyword */:
-                case 78 /* ContinueKeyword */:
-                case 73 /* BreakKeyword */:
-                case 97 /* ReturnKeyword */:
-                case 108 /* WithKeyword */:
-                case 99 /* SwitchKeyword */:
-                case 101 /* ThrowKeyword */:
-                case 103 /* TryKeyword */:
-                case 79 /* DebuggerKeyword */:
+                case 106 /* VarKeyword */:
+                case 112 /* LetKeyword */:
+                case 91 /* FunctionKeyword */:
+                case 77 /* ClassKeyword */:
+                case 85 /* EnumKeyword */:
+                case 92 /* IfKeyword */:
+                case 83 /* DoKeyword */:
+                case 108 /* WhileKeyword */:
+                case 90 /* ForKeyword */:
+                case 79 /* ContinueKeyword */:
+                case 74 /* BreakKeyword */:
+                case 98 /* ReturnKeyword */:
+                case 109 /* WithKeyword */:
+                case 100 /* SwitchKeyword */:
+                case 102 /* ThrowKeyword */:
+                case 104 /* TryKeyword */:
+                case 80 /* DebuggerKeyword */:
                 // 'catch' and 'finally' do not actually indicate that the code is part of a statement,
                 // however, we say they are here so that we may gracefully parse them and error later.
-                case 75 /* CatchKeyword */:
-                case 88 /* FinallyKeyword */:
+                case 76 /* CatchKeyword */:
+                case 89 /* FinallyKeyword */:
                     return true;
-                case 92 /* ImportKeyword */:
+                case 93 /* ImportKeyword */:
                     return isStartOfDeclaration() || lookAhead(nextTokenIsOpenParenOrLessThanOrDot);
-                case 77 /* ConstKeyword */:
-                case 85 /* ExportKeyword */:
+                case 78 /* ConstKeyword */:
+                case 86 /* ExportKeyword */:
                     return isStartOfDeclaration();
-                case 121 /* AsyncKeyword */:
-                case 125 /* DeclareKeyword */:
-                case 110 /* InterfaceKeyword */:
-                case 130 /* ModuleKeyword */:
-                case 131 /* NamespaceKeyword */:
-                case 140 /* TypeKeyword */:
-                case 145 /* GlobalKeyword */:
+                case 122 /* AsyncKeyword */:
+                case 126 /* DeclareKeyword */:
+                case 111 /* InterfaceKeyword */:
+                case 131 /* ModuleKeyword */:
+                case 132 /* NamespaceKeyword */:
+                case 141 /* TypeKeyword */:
+                case 146 /* GlobalKeyword */:
                     // When these don't start a declaration, they're an identifier in an expression statement
                     return true;
-                case 115 /* PublicKeyword */:
-                case 113 /* PrivateKeyword */:
-                case 114 /* ProtectedKeyword */:
-                case 116 /* StaticKeyword */:
-                case 133 /* ReadonlyKeyword */:
+                case 116 /* PublicKeyword */:
+                case 114 /* PrivateKeyword */:
+                case 115 /* ProtectedKeyword */:
+                case 117 /* StaticKeyword */:
+                case 134 /* ReadonlyKeyword */:
                     // When these don't start a declaration, they may be the start of a class member if an identifier
                     // immediately follows. Otherwise they're an identifier in an expression statement.
                     return isStartOfDeclaration() || !lookAhead(nextTokenIsIdentifierOrKeywordOnSameLine);
@@ -21187,63 +21459,63 @@ var ts;
                     return parseEmptyStatement();
                 case 18 /* OpenBraceToken */:
                     return parseBlock(/*ignoreMissingOpenBrace*/ false);
-                case 105 /* VarKeyword */:
-                    return parseVariableStatement(createNodeWithJSDoc(237 /* VariableDeclaration */));
-                case 111 /* LetKeyword */:
+                case 106 /* VarKeyword */:
+                    return parseVariableStatement(createNodeWithJSDoc(238 /* VariableDeclaration */));
+                case 112 /* LetKeyword */:
                     if (isLetDeclaration()) {
-                        return parseVariableStatement(createNodeWithJSDoc(237 /* VariableDeclaration */));
+                        return parseVariableStatement(createNodeWithJSDoc(238 /* VariableDeclaration */));
                     }
                     break;
-                case 90 /* FunctionKeyword */:
-                    return parseFunctionDeclaration(createNodeWithJSDoc(239 /* FunctionDeclaration */));
-                case 76 /* ClassKeyword */:
-                    return parseClassDeclaration(createNodeWithJSDoc(240 /* ClassDeclaration */));
-                case 91 /* IfKeyword */:
+                case 91 /* FunctionKeyword */:
+                    return parseFunctionDeclaration(createNodeWithJSDoc(240 /* FunctionDeclaration */));
+                case 77 /* ClassKeyword */:
+                    return parseClassDeclaration(createNodeWithJSDoc(241 /* ClassDeclaration */));
+                case 92 /* IfKeyword */:
                     return parseIfStatement();
-                case 82 /* DoKeyword */:
+                case 83 /* DoKeyword */:
                     return parseDoStatement();
-                case 107 /* WhileKeyword */:
+                case 108 /* WhileKeyword */:
                     return parseWhileStatement();
-                case 89 /* ForKeyword */:
+                case 90 /* ForKeyword */:
                     return parseForOrForInOrForOfStatement();
-                case 78 /* ContinueKeyword */:
-                    return parseBreakOrContinueStatement(228 /* ContinueStatement */);
-                case 73 /* BreakKeyword */:
-                    return parseBreakOrContinueStatement(229 /* BreakStatement */);
-                case 97 /* ReturnKeyword */:
+                case 79 /* ContinueKeyword */:
+                    return parseBreakOrContinueStatement(229 /* ContinueStatement */);
+                case 74 /* BreakKeyword */:
+                    return parseBreakOrContinueStatement(230 /* BreakStatement */);
+                case 98 /* ReturnKeyword */:
                     return parseReturnStatement();
-                case 108 /* WithKeyword */:
+                case 109 /* WithKeyword */:
                     return parseWithStatement();
-                case 99 /* SwitchKeyword */:
+                case 100 /* SwitchKeyword */:
                     return parseSwitchStatement();
-                case 101 /* ThrowKeyword */:
+                case 102 /* ThrowKeyword */:
                     return parseThrowStatement();
-                case 103 /* TryKeyword */:
+                case 104 /* TryKeyword */:
                 // Include 'catch' and 'finally' for error recovery.
-                case 75 /* CatchKeyword */:
-                case 88 /* FinallyKeyword */:
+                case 76 /* CatchKeyword */:
+                case 89 /* FinallyKeyword */:
                     return parseTryStatement();
-                case 79 /* DebuggerKeyword */:
+                case 80 /* DebuggerKeyword */:
                     return parseDebuggerStatement();
                 case 58 /* AtToken */:
                     return parseDeclaration();
-                case 121 /* AsyncKeyword */:
-                case 110 /* InterfaceKeyword */:
-                case 140 /* TypeKeyword */:
-                case 130 /* ModuleKeyword */:
-                case 131 /* NamespaceKeyword */:
-                case 125 /* DeclareKeyword */:
-                case 77 /* ConstKeyword */:
-                case 84 /* EnumKeyword */:
-                case 85 /* ExportKeyword */:
-                case 92 /* ImportKeyword */:
-                case 113 /* PrivateKeyword */:
-                case 114 /* ProtectedKeyword */:
-                case 115 /* PublicKeyword */:
-                case 118 /* AbstractKeyword */:
-                case 116 /* StaticKeyword */:
-                case 133 /* ReadonlyKeyword */:
-                case 145 /* GlobalKeyword */:
+                case 122 /* AsyncKeyword */:
+                case 111 /* InterfaceKeyword */:
+                case 141 /* TypeKeyword */:
+                case 131 /* ModuleKeyword */:
+                case 132 /* NamespaceKeyword */:
+                case 126 /* DeclareKeyword */:
+                case 78 /* ConstKeyword */:
+                case 85 /* EnumKeyword */:
+                case 86 /* ExportKeyword */:
+                case 93 /* ImportKeyword */:
+                case 114 /* PrivateKeyword */:
+                case 115 /* ProtectedKeyword */:
+                case 116 /* PublicKeyword */:
+                case 119 /* AbstractKeyword */:
+                case 117 /* StaticKeyword */:
+                case 134 /* ReadonlyKeyword */:
+                case 146 /* GlobalKeyword */:
                     if (isStartOfDeclaration()) {
                         return parseDeclaration();
                     }
@@ -21252,7 +21524,7 @@ var ts;
             return parseExpressionOrLabeledStatement();
         }
         function isDeclareModifier(modifier) {
-            return modifier.kind === 125 /* DeclareKeyword */;
+            return modifier.kind === 126 /* DeclareKeyword */;
         }
         function parseDeclaration() {
             var node = createNodeWithJSDoc(0 /* Unknown */);
@@ -21271,33 +21543,33 @@ var ts;
         }
         function parseDeclarationWorker(node) {
             switch (token()) {
-                case 105 /* VarKeyword */:
-                case 111 /* LetKeyword */:
-                case 77 /* ConstKeyword */:
+                case 106 /* VarKeyword */:
+                case 112 /* LetKeyword */:
+                case 78 /* ConstKeyword */:
                     return parseVariableStatement(node);
-                case 90 /* FunctionKeyword */:
+                case 91 /* FunctionKeyword */:
                     return parseFunctionDeclaration(node);
-                case 76 /* ClassKeyword */:
+                case 77 /* ClassKeyword */:
                     return parseClassDeclaration(node);
-                case 110 /* InterfaceKeyword */:
+                case 111 /* InterfaceKeyword */:
                     return parseInterfaceDeclaration(node);
-                case 140 /* TypeKeyword */:
+                case 141 /* TypeKeyword */:
                     return parseTypeAliasDeclaration(node);
-                case 84 /* EnumKeyword */:
+                case 85 /* EnumKeyword */:
                     return parseEnumDeclaration(node);
-                case 145 /* GlobalKeyword */:
-                case 130 /* ModuleKeyword */:
-                case 131 /* NamespaceKeyword */:
+                case 146 /* GlobalKeyword */:
+                case 131 /* ModuleKeyword */:
+                case 132 /* NamespaceKeyword */:
                     return parseModuleDeclaration(node);
-                case 92 /* ImportKeyword */:
+                case 93 /* ImportKeyword */:
                     return parseImportDeclarationOrImportEqualsDeclaration(node);
-                case 85 /* ExportKeyword */:
+                case 86 /* ExportKeyword */:
                     nextToken();
                     switch (token()) {
-                        case 80 /* DefaultKeyword */:
-                        case 59 /* EqualsToken */:
+                        case 81 /* DefaultKeyword */:
+                        case 60 /* EqualsToken */:
                             return parseExportAssignment(node);
-                        case 119 /* AsKeyword */:
+                        case 120 /* AsKeyword */:
                             return parseNamespaceExportDeclaration(node);
                         default:
                             return parseExportDeclaration(node);
@@ -21306,7 +21578,7 @@ var ts;
                     if (node.decorators || node.modifiers) {
                         // We reached this point because we encountered decorators and/or modifiers and assumed a declaration
                         // would follow. For recovery and error reporting purposes, return an incomplete declaration.
-                        var missing = createMissingNode(258 /* MissingDeclaration */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Declaration_expected);
+                        var missing = createMissingNode(259 /* MissingDeclaration */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Declaration_expected);
                         missing.pos = node.pos;
                         missing.decorators = node.decorators;
                         missing.modifiers = node.modifiers;
@@ -21329,16 +21601,16 @@ var ts;
         // DECLARATIONS
         function parseArrayBindingElement() {
             if (token() === 27 /* CommaToken */) {
-                return createNode(210 /* OmittedExpression */);
+                return createNode(211 /* OmittedExpression */);
             }
-            var node = createNode(186 /* BindingElement */);
+            var node = createNode(187 /* BindingElement */);
             node.dotDotDotToken = parseOptionalToken(25 /* DotDotDotToken */);
             node.name = parseIdentifierOrPattern();
             node.initializer = parseInitializer();
             return finishNode(node);
         }
         function parseObjectBindingElement() {
-            var node = createNode(186 /* BindingElement */);
+            var node = createNode(187 /* BindingElement */);
             node.dotDotDotToken = parseOptionalToken(25 /* DotDotDotToken */);
             var tokenIsIdentifier = isIdentifier();
             var propertyName = parsePropertyName();
@@ -21354,14 +21626,14 @@ var ts;
             return finishNode(node);
         }
         function parseObjectBindingPattern() {
-            var node = createNode(184 /* ObjectBindingPattern */);
+            var node = createNode(185 /* ObjectBindingPattern */);
             parseExpected(18 /* OpenBraceToken */);
             node.elements = parseDelimitedList(9 /* ObjectBindingElements */, parseObjectBindingElement);
             parseExpected(19 /* CloseBraceToken */);
             return finishNode(node);
         }
         function parseArrayBindingPattern() {
-            var node = createNode(185 /* ArrayBindingPattern */);
+            var node = createNode(186 /* ArrayBindingPattern */);
             parseExpected(22 /* OpenBracketToken */);
             node.elements = parseDelimitedList(10 /* ArrayBindingElements */, parseArrayBindingElement);
             parseExpected(23 /* CloseBracketToken */);
@@ -21383,9 +21655,9 @@ var ts;
             return parseVariableDeclaration(/*allowExclamation*/ true);
         }
         function parseVariableDeclaration(allowExclamation) {
-            var node = createNode(237 /* VariableDeclaration */);
+            var node = createNode(238 /* VariableDeclaration */);
             node.name = parseIdentifierOrPattern();
-            if (allowExclamation && node.name.kind === 72 /* Identifier */ &&
+            if (allowExclamation && node.name.kind === 73 /* Identifier */ &&
                 token() === 52 /* ExclamationToken */ && !scanner.hasPrecedingLineBreak()) {
                 node.exclamationToken = parseTokenNode();
             }
@@ -21396,14 +21668,14 @@ var ts;
             return finishNode(node);
         }
         function parseVariableDeclarationList(inForStatementInitializer) {
-            var node = createNode(238 /* VariableDeclarationList */);
+            var node = createNode(239 /* VariableDeclarationList */);
             switch (token()) {
-                case 105 /* VarKeyword */:
+                case 106 /* VarKeyword */:
                     break;
-                case 111 /* LetKeyword */:
+                case 112 /* LetKeyword */:
                     node.flags |= 1 /* Let */;
                     break;
-                case 77 /* ConstKeyword */:
+                case 78 /* ConstKeyword */:
                     node.flags |= 2 /* Const */;
                     break;
                 default:
@@ -21419,7 +21691,7 @@ var ts;
             // So we need to look ahead to determine if 'of' should be treated as a keyword in
             // this context.
             // The checker will then give an error that there is an empty declaration list.
-            if (token() === 147 /* OfKeyword */ && lookAhead(canFollowContextualOfKeyword)) {
+            if (token() === 148 /* OfKeyword */ && lookAhead(canFollowContextualOfKeyword)) {
                 node.declarations = createMissingList();
             }
             else {
@@ -21434,14 +21706,14 @@ var ts;
             return nextTokenIsIdentifier() && nextToken() === 21 /* CloseParenToken */;
         }
         function parseVariableStatement(node) {
-            node.kind = 219 /* VariableStatement */;
+            node.kind = 220 /* VariableStatement */;
             node.declarationList = parseVariableDeclarationList(/*inForStatementInitializer*/ false);
             parseSemicolon();
             return finishNode(node);
         }
         function parseFunctionDeclaration(node) {
-            node.kind = 239 /* FunctionDeclaration */;
-            parseExpected(90 /* FunctionKeyword */);
+            node.kind = 240 /* FunctionDeclaration */;
+            parseExpected(91 /* FunctionKeyword */);
             node.asteriskToken = parseOptionalToken(40 /* AsteriskToken */);
             node.name = ts.hasModifier(node, 512 /* Default */) ? parseOptionalIdentifier() : parseIdentifier();
             var isGenerator = node.asteriskToken ? 1 /* Yield */ : 0 /* None */;
@@ -21450,15 +21722,29 @@ var ts;
             node.body = parseFunctionBlockOrSemicolon(isGenerator | isAsync, ts.Diagnostics.or_expected);
             return finishNode(node);
         }
-        function parseConstructorDeclaration(node) {
-            node.kind = 157 /* Constructor */;
-            parseExpected(124 /* ConstructorKeyword */);
-            fillSignature(57 /* ColonToken */, 0 /* None */, node);
-            node.body = parseFunctionBlockOrSemicolon(0 /* None */, ts.Diagnostics.or_expected);
-            return finishNode(node);
+        function parseConstructorName() {
+            if (token() === 125 /* ConstructorKeyword */) {
+                return parseExpected(125 /* ConstructorKeyword */);
+            }
+            if (token() === 10 /* StringLiteral */ && lookAhead(nextToken) === 20 /* OpenParenToken */) {
+                return tryParse(function () {
+                    var literalNode = parseLiteralNode();
+                    return literalNode.text === "constructor" ? literalNode : undefined;
+                });
+            }
+        }
+        function tryParseConstructorDeclaration(node) {
+            return tryParse(function () {
+                if (parseConstructorName()) {
+                    node.kind = 158 /* Constructor */;
+                    fillSignature(57 /* ColonToken */, 0 /* None */, node);
+                    node.body = parseFunctionBlockOrSemicolon(0 /* None */, ts.Diagnostics.or_expected);
+                    return finishNode(node);
+                }
+            });
         }
         function parseMethodDeclaration(node, asteriskToken, diagnosticMessage) {
-            node.kind = 156 /* MethodDeclaration */;
+            node.kind = 157 /* MethodDeclaration */;
             node.asteriskToken = asteriskToken;
             var isGenerator = asteriskToken ? 1 /* Yield */ : 0 /* None */;
             var isAsync = ts.hasModifier(node, 256 /* Async */) ? 2 /* Await */ : 0 /* None */;
@@ -21467,7 +21753,7 @@ var ts;
             return finishNode(node);
         }
         function parsePropertyDeclaration(node) {
-            node.kind = 154 /* PropertyDeclaration */;
+            node.kind = 155 /* PropertyDeclaration */;
             if (!node.questionToken && token() === 52 /* ExclamationToken */ && !scanner.hasPrecedingLineBreak()) {
                 node.exclamationToken = parseTokenNode();
             }
@@ -21540,7 +21826,7 @@ var ts;
             // If we were able to get any potential identifier...
             if (idToken !== undefined) {
                 // If we have a non-keyword identifier, or if we have an accessor, then it's safe to parse.
-                if (!ts.isKeyword(idToken) || idToken === 137 /* SetKeyword */ || idToken === 126 /* GetKeyword */) {
+                if (!ts.isKeyword(idToken) || idToken === 138 /* SetKeyword */ || idToken === 127 /* GetKeyword */) {
                     return true;
                 }
                 // If it *is* a keyword, but not an accessor, check a little farther along
@@ -21550,7 +21836,7 @@ var ts;
                     case 28 /* LessThanToken */: // Generic Method declaration
                     case 52 /* ExclamationToken */: // Non-null assertion on property name
                     case 57 /* ColonToken */: // Type Annotation for declaration
-                    case 59 /* EqualsToken */: // Initializer for declaration
+                    case 60 /* EqualsToken */: // Initializer for declaration
                     case 56 /* QuestionToken */: // Not valid, but permitted so that it gets caught later on.
                         return true;
                     default:
@@ -21572,7 +21858,7 @@ var ts;
                 if (!parseOptional(58 /* AtToken */)) {
                     break;
                 }
-                var decorator = createNode(152 /* Decorator */, decoratorStart);
+                var decorator = createNode(153 /* Decorator */, decoratorStart);
                 decorator.expression = doInDecoratorContext(parseLeftHandSideExpressionOrHigher);
                 finishNode(decorator);
                 (list || (list = [])).push(decorator);
@@ -21592,7 +21878,7 @@ var ts;
             while (true) {
                 var modifierStart = scanner.getStartPos();
                 var modifierKind = token();
-                if (token() === 77 /* ConstKeyword */ && permitInvalidConstAsModifier) {
+                if (token() === 78 /* ConstKeyword */ && permitInvalidConstAsModifier) {
                     // We need to ensure that any subsequent modifiers appear on the same line
                     // so that when 'const' is a standalone declaration, we don't issue an error.
                     if (!tryParse(nextTokenIsOnSameLineAndCanFollowModifier)) {
@@ -21611,7 +21897,7 @@ var ts;
         }
         function parseModifiersForArrowFunction() {
             var modifiers;
-            if (token() === 121 /* AsyncKeyword */) {
+            if (token() === 122 /* AsyncKeyword */) {
                 var modifierStart = scanner.getStartPos();
                 var modifierKind = token();
                 nextToken();
@@ -21622,21 +21908,24 @@ var ts;
         }
         function parseClassElement() {
             if (token() === 26 /* SemicolonToken */) {
-                var result = createNode(217 /* SemicolonClassElement */);
+                var result = createNode(218 /* SemicolonClassElement */);
                 nextToken();
                 return finishNode(result);
             }
             var node = createNodeWithJSDoc(0 /* Unknown */);
             node.decorators = parseDecorators();
             node.modifiers = parseModifiers(/*permitInvalidConstAsModifier*/ true);
-            if (parseContextualModifier(126 /* GetKeyword */)) {
-                return parseAccessorDeclaration(node, 158 /* GetAccessor */);
+            if (parseContextualModifier(127 /* GetKeyword */)) {
+                return parseAccessorDeclaration(node, 159 /* GetAccessor */);
             }
-            if (parseContextualModifier(137 /* SetKeyword */)) {
-                return parseAccessorDeclaration(node, 159 /* SetAccessor */);
+            if (parseContextualModifier(138 /* SetKeyword */)) {
+                return parseAccessorDeclaration(node, 160 /* SetAccessor */);
             }
-            if (token() === 124 /* ConstructorKeyword */) {
-                return parseConstructorDeclaration(node);
+            if (token() === 125 /* ConstructorKeyword */ || token() === 10 /* StringLiteral */) {
+                var constructorDeclaration = tryParseConstructorDeclaration(node);
+                if (constructorDeclaration) {
+                    return constructorDeclaration;
+                }
             }
             if (isIndexSignature()) {
                 return parseIndexSignatureDeclaration(node);
@@ -21652,21 +21941,21 @@ var ts;
             }
             if (node.decorators || node.modifiers) {
                 // treat this as a property declaration with a missing name.
-                node.name = createMissingNode(72 /* Identifier */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Declaration_expected);
+                node.name = createMissingNode(73 /* Identifier */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Declaration_expected);
                 return parsePropertyDeclaration(node);
             }
             // 'isClassMemberStart' should have hinted not to attempt parsing.
             return ts.Debug.fail("Should not have attempted to parse class member declaration.");
         }
         function parseClassExpression() {
-            return parseClassDeclarationOrExpression(createNodeWithJSDoc(0 /* Unknown */), 209 /* ClassExpression */);
+            return parseClassDeclarationOrExpression(createNodeWithJSDoc(0 /* Unknown */), 210 /* ClassExpression */);
         }
         function parseClassDeclaration(node) {
-            return parseClassDeclarationOrExpression(node, 240 /* ClassDeclaration */);
+            return parseClassDeclarationOrExpression(node, 241 /* ClassDeclaration */);
         }
         function parseClassDeclarationOrExpression(node, kind) {
             node.kind = kind;
-            parseExpected(76 /* ClassKeyword */);
+            parseExpected(77 /* ClassKeyword */);
             node.name = parseNameOfClassDeclarationOrExpression();
             node.typeParameters = parseTypeParameters();
             node.heritageClauses = parseHeritageClauses();
@@ -21692,7 +21981,7 @@ var ts;
                 : undefined;
         }
         function isImplementsClause() {
-            return token() === 109 /* ImplementsKeyword */ && lookAhead(nextTokenIsIdentifierOrKeyword);
+            return token() === 110 /* ImplementsKeyword */ && lookAhead(nextTokenIsIdentifierOrKeyword);
         }
         function parseHeritageClauses() {
             // ClassTail[Yield,Await] : (Modified) See 14.5
@@ -21704,15 +21993,15 @@ var ts;
         }
         function parseHeritageClause() {
             var tok = token();
-            ts.Debug.assert(tok === 86 /* ExtendsKeyword */ || tok === 109 /* ImplementsKeyword */); // isListElement() should ensure this.
-            var node = createNode(273 /* HeritageClause */);
+            ts.Debug.assert(tok === 87 /* ExtendsKeyword */ || tok === 110 /* ImplementsKeyword */); // isListElement() should ensure this.
+            var node = createNode(274 /* HeritageClause */);
             node.token = tok;
             nextToken();
             node.types = parseDelimitedList(7 /* HeritageClauseElement */, parseExpressionWithTypeArguments);
             return finishNode(node);
         }
         function parseExpressionWithTypeArguments() {
-            var node = createNode(211 /* ExpressionWithTypeArguments */);
+            var node = createNode(212 /* ExpressionWithTypeArguments */);
             node.expression = parseLeftHandSideExpressionOrHigher();
             node.typeArguments = tryParseTypeArguments();
             return finishNode(node);
@@ -21723,14 +22012,14 @@ var ts;
                 : undefined;
         }
         function isHeritageClause() {
-            return token() === 86 /* ExtendsKeyword */ || token() === 109 /* ImplementsKeyword */;
+            return token() === 87 /* ExtendsKeyword */ || token() === 110 /* ImplementsKeyword */;
         }
         function parseClassMembers() {
             return parseList(5 /* ClassMembers */, parseClassElement);
         }
         function parseInterfaceDeclaration(node) {
-            node.kind = 241 /* InterfaceDeclaration */;
-            parseExpected(110 /* InterfaceKeyword */);
+            node.kind = 242 /* InterfaceDeclaration */;
+            parseExpected(111 /* InterfaceKeyword */);
             node.name = parseIdentifier();
             node.typeParameters = parseTypeParameters();
             node.heritageClauses = parseHeritageClauses();
@@ -21738,11 +22027,11 @@ var ts;
             return finishNode(node);
         }
         function parseTypeAliasDeclaration(node) {
-            node.kind = 242 /* TypeAliasDeclaration */;
-            parseExpected(140 /* TypeKeyword */);
+            node.kind = 243 /* TypeAliasDeclaration */;
+            parseExpected(141 /* TypeKeyword */);
             node.name = parseIdentifier();
             node.typeParameters = parseTypeParameters();
-            parseExpected(59 /* EqualsToken */);
+            parseExpected(60 /* EqualsToken */);
             node.type = parseType();
             parseSemicolon();
             return finishNode(node);
@@ -21752,14 +22041,14 @@ var ts;
         // ConstantEnumMemberSection, which starts at the beginning of an enum declaration
         // or any time an integer literal initializer is encountered.
         function parseEnumMember() {
-            var node = createNodeWithJSDoc(278 /* EnumMember */);
+            var node = createNodeWithJSDoc(279 /* EnumMember */);
             node.name = parsePropertyName();
             node.initializer = allowInAnd(parseInitializer);
             return finishNode(node);
         }
         function parseEnumDeclaration(node) {
-            node.kind = 243 /* EnumDeclaration */;
-            parseExpected(84 /* EnumKeyword */);
+            node.kind = 244 /* EnumDeclaration */;
+            parseExpected(85 /* EnumKeyword */);
             node.name = parseIdentifier();
             if (parseExpected(18 /* OpenBraceToken */)) {
                 node.members = parseDelimitedList(6 /* EnumMembers */, parseEnumMember);
@@ -21771,7 +22060,7 @@ var ts;
             return finishNode(node);
         }
         function parseModuleBlock() {
-            var node = createNode(245 /* ModuleBlock */);
+            var node = createNode(246 /* ModuleBlock */);
             if (parseExpected(18 /* OpenBraceToken */)) {
                 node.statements = parseList(1 /* BlockStatements */, parseStatement);
                 parseExpected(19 /* CloseBraceToken */);
@@ -21782,7 +22071,7 @@ var ts;
             return finishNode(node);
         }
         function parseModuleOrNamespaceDeclaration(node, flags) {
-            node.kind = 244 /* ModuleDeclaration */;
+            node.kind = 245 /* ModuleDeclaration */;
             // If we are parsing a dotted namespace name, we want to
             // propagate the 'Namespace' flag across the names if set.
             var namespaceFlag = flags & 16 /* Namespace */;
@@ -21794,8 +22083,8 @@ var ts;
             return finishNode(node);
         }
         function parseAmbientExternalModuleDeclaration(node) {
-            node.kind = 244 /* ModuleDeclaration */;
-            if (token() === 145 /* GlobalKeyword */) {
+            node.kind = 245 /* ModuleDeclaration */;
+            if (token() === 146 /* GlobalKeyword */) {
                 // parse 'global' as name of global scope augmentation
                 node.name = parseIdentifier();
                 node.flags |= 512 /* GlobalAugmentation */;
@@ -21814,15 +22103,15 @@ var ts;
         }
         function parseModuleDeclaration(node) {
             var flags = 0;
-            if (token() === 145 /* GlobalKeyword */) {
+            if (token() === 146 /* GlobalKeyword */) {
                 // global augmentation
                 return parseAmbientExternalModuleDeclaration(node);
             }
-            else if (parseOptional(131 /* NamespaceKeyword */)) {
+            else if (parseOptional(132 /* NamespaceKeyword */)) {
                 flags |= 16 /* Namespace */;
             }
             else {
-                parseExpected(130 /* ModuleKeyword */);
+                parseExpected(131 /* ModuleKeyword */);
                 if (token() === 10 /* StringLiteral */) {
                     return parseAmbientExternalModuleDeclaration(node);
                 }
@@ -21830,7 +22119,7 @@ var ts;
             return parseModuleOrNamespaceDeclaration(node, flags);
         }
         function isExternalModuleReference() {
-            return token() === 134 /* RequireKeyword */ &&
+            return token() === 135 /* RequireKeyword */ &&
                 lookAhead(nextTokenIsOpenParen);
         }
         function nextTokenIsOpenParen() {
@@ -21840,25 +22129,25 @@ var ts;
             return nextToken() === 42 /* SlashToken */;
         }
         function parseNamespaceExportDeclaration(node) {
-            node.kind = 247 /* NamespaceExportDeclaration */;
-            parseExpected(119 /* AsKeyword */);
-            parseExpected(131 /* NamespaceKeyword */);
+            node.kind = 248 /* NamespaceExportDeclaration */;
+            parseExpected(120 /* AsKeyword */);
+            parseExpected(132 /* NamespaceKeyword */);
             node.name = parseIdentifier();
             parseSemicolon();
             return finishNode(node);
         }
         function parseImportDeclarationOrImportEqualsDeclaration(node) {
-            parseExpected(92 /* ImportKeyword */);
+            parseExpected(93 /* ImportKeyword */);
             var afterImportPos = scanner.getStartPos();
             var identifier;
             if (isIdentifier()) {
                 identifier = parseIdentifier();
-                if (token() !== 27 /* CommaToken */ && token() !== 144 /* FromKeyword */) {
+                if (token() !== 27 /* CommaToken */ && token() !== 145 /* FromKeyword */) {
                     return parseImportEqualsDeclaration(node, identifier);
                 }
             }
             // Import statement
-            node.kind = 249 /* ImportDeclaration */;
+            node.kind = 250 /* ImportDeclaration */;
             // ImportDeclaration:
             //  import ImportClause from ModuleSpecifier ;
             //  import ModuleSpecifier;
@@ -21866,16 +22155,16 @@ var ts;
                 token() === 40 /* AsteriskToken */ || // import *
                 token() === 18 /* OpenBraceToken */) { // import {
                 node.importClause = parseImportClause(identifier, afterImportPos);
-                parseExpected(144 /* FromKeyword */);
+                parseExpected(145 /* FromKeyword */);
             }
             node.moduleSpecifier = parseModuleSpecifier();
             parseSemicolon();
             return finishNode(node);
         }
         function parseImportEqualsDeclaration(node, identifier) {
-            node.kind = 248 /* ImportEqualsDeclaration */;
+            node.kind = 249 /* ImportEqualsDeclaration */;
             node.name = identifier;
-            parseExpected(59 /* EqualsToken */);
+            parseExpected(60 /* EqualsToken */);
             node.moduleReference = parseModuleReference();
             parseSemicolon();
             return finishNode(node);
@@ -21887,7 +22176,7 @@ var ts;
             //  NamedImports
             //  ImportedDefaultBinding, NameSpaceImport
             //  ImportedDefaultBinding, NamedImports
-            var importClause = createNode(250 /* ImportClause */, fullStart);
+            var importClause = createNode(251 /* ImportClause */, fullStart);
             if (identifier) {
                 // ImportedDefaultBinding:
                 //  ImportedBinding
@@ -21897,7 +22186,7 @@ var ts;
             // parse namespace or named imports
             if (!importClause.name ||
                 parseOptional(27 /* CommaToken */)) {
-                importClause.namedBindings = token() === 40 /* AsteriskToken */ ? parseNamespaceImport() : parseNamedImportsOrExports(252 /* NamedImports */);
+                importClause.namedBindings = token() === 40 /* AsteriskToken */ ? parseNamespaceImport() : parseNamedImportsOrExports(253 /* NamedImports */);
             }
             return finishNode(importClause);
         }
@@ -21907,8 +22196,8 @@ var ts;
                 : parseEntityName(/*allowReservedWords*/ false);
         }
         function parseExternalModuleReference() {
-            var node = createNode(259 /* ExternalModuleReference */);
-            parseExpected(134 /* RequireKeyword */);
+            var node = createNode(260 /* ExternalModuleReference */);
+            parseExpected(135 /* RequireKeyword */);
             parseExpected(20 /* OpenParenToken */);
             node.expression = parseModuleSpecifier();
             parseExpected(21 /* CloseParenToken */);
@@ -21930,9 +22219,9 @@ var ts;
         function parseNamespaceImport() {
             // NameSpaceImport:
             //  * as ImportedBinding
-            var namespaceImport = createNode(251 /* NamespaceImport */);
+            var namespaceImport = createNode(252 /* NamespaceImport */);
             parseExpected(40 /* AsteriskToken */);
-            parseExpected(119 /* AsKeyword */);
+            parseExpected(120 /* AsKeyword */);
             namespaceImport.name = parseIdentifier();
             return finishNode(namespaceImport);
         }
@@ -21945,14 +22234,14 @@ var ts;
             // ImportsList:
             //  ImportSpecifier
             //  ImportsList, ImportSpecifier
-            node.elements = parseBracketedList(23 /* ImportOrExportSpecifiers */, kind === 252 /* NamedImports */ ? parseImportSpecifier : parseExportSpecifier, 18 /* OpenBraceToken */, 19 /* CloseBraceToken */);
+            node.elements = parseBracketedList(23 /* ImportOrExportSpecifiers */, kind === 253 /* NamedImports */ ? parseImportSpecifier : parseExportSpecifier, 18 /* OpenBraceToken */, 19 /* CloseBraceToken */);
             return finishNode(node);
         }
         function parseExportSpecifier() {
-            return parseImportOrExportSpecifier(257 /* ExportSpecifier */);
+            return parseImportOrExportSpecifier(258 /* ExportSpecifier */);
         }
         function parseImportSpecifier() {
-            return parseImportOrExportSpecifier(253 /* ImportSpecifier */);
+            return parseImportOrExportSpecifier(254 /* ImportSpecifier */);
         }
         function parseImportOrExportSpecifier(kind) {
             var node = createNode(kind);
@@ -21966,9 +22255,9 @@ var ts;
             var checkIdentifierStart = scanner.getTokenPos();
             var checkIdentifierEnd = scanner.getTextPos();
             var identifierName = parseIdentifierName();
-            if (token() === 119 /* AsKeyword */) {
+            if (token() === 120 /* AsKeyword */) {
                 node.propertyName = identifierName;
-                parseExpected(119 /* AsKeyword */);
+                parseExpected(120 /* AsKeyword */);
                 checkIdentifierIsKeyword = ts.isKeyword(token()) && !isIdentifier();
                 checkIdentifierStart = scanner.getTokenPos();
                 checkIdentifierEnd = scanner.getTextPos();
@@ -21977,24 +22266,24 @@ var ts;
             else {
                 node.name = identifierName;
             }
-            if (kind === 253 /* ImportSpecifier */ && checkIdentifierIsKeyword) {
+            if (kind === 254 /* ImportSpecifier */ && checkIdentifierIsKeyword) {
                 parseErrorAt(checkIdentifierStart, checkIdentifierEnd, ts.Diagnostics.Identifier_expected);
             }
             return finishNode(node);
         }
         function parseExportDeclaration(node) {
-            node.kind = 255 /* ExportDeclaration */;
+            node.kind = 256 /* ExportDeclaration */;
             if (parseOptional(40 /* AsteriskToken */)) {
-                parseExpected(144 /* FromKeyword */);
+                parseExpected(145 /* FromKeyword */);
                 node.moduleSpecifier = parseModuleSpecifier();
             }
             else {
-                node.exportClause = parseNamedImportsOrExports(256 /* NamedExports */);
+                node.exportClause = parseNamedImportsOrExports(257 /* NamedExports */);
                 // It is not uncommon to accidentally omit the 'from' keyword. Additionally, in editing scenarios,
                 // the 'from' keyword can be parsed as a named export when the export clause is unterminated (i.e. `export { from "moduleName";`)
                 // If we don't have a 'from' keyword, see if we have a string literal such that ASI won't take effect.
-                if (token() === 144 /* FromKeyword */ || (token() === 10 /* StringLiteral */ && !scanner.hasPrecedingLineBreak())) {
-                    parseExpected(144 /* FromKeyword */);
+                if (token() === 145 /* FromKeyword */ || (token() === 10 /* StringLiteral */ && !scanner.hasPrecedingLineBreak())) {
+                    parseExpected(145 /* FromKeyword */);
                     node.moduleSpecifier = parseModuleSpecifier();
                 }
             }
@@ -22002,12 +22291,12 @@ var ts;
             return finishNode(node);
         }
         function parseExportAssignment(node) {
-            node.kind = 254 /* ExportAssignment */;
-            if (parseOptional(59 /* EqualsToken */)) {
+            node.kind = 255 /* ExportAssignment */;
+            if (parseOptional(60 /* EqualsToken */)) {
                 node.isExportEquals = true;
             }
             else {
-                parseExpected(80 /* DefaultKeyword */);
+                parseExpected(81 /* DefaultKeyword */);
             }
             node.expression = parseAssignmentExpressionOrHigher();
             parseSemicolon();
@@ -22022,10 +22311,10 @@ var ts;
         }
         function isAnExternalModuleIndicatorNode(node) {
             return ts.hasModifier(node, 1 /* Export */)
-                || node.kind === 248 /* ImportEqualsDeclaration */ && node.moduleReference.kind === 259 /* ExternalModuleReference */
-                || node.kind === 249 /* ImportDeclaration */
-                || node.kind === 254 /* ExportAssignment */
-                || node.kind === 255 /* ExportDeclaration */
+                || node.kind === 249 /* ImportEqualsDeclaration */ && node.moduleReference.kind === 260 /* ExternalModuleReference */
+                || node.kind === 250 /* ImportDeclaration */
+                || node.kind === 255 /* ExportAssignment */
+                || node.kind === 256 /* ExportDeclaration */
                 ? node
                 : undefined;
         }
@@ -22038,7 +22327,7 @@ var ts;
             return isImportMeta(node) ? node : forEachChild(node, walkTreeForExternalModuleIndicators);
         }
         function isImportMeta(node) {
-            return ts.isMetaProperty(node) && node.keywordToken === 92 /* ImportKeyword */ && node.name.escapedText === "meta";
+            return ts.isMetaProperty(node) && node.keywordToken === 93 /* ImportKeyword */ && node.name.escapedText === "meta";
         }
         var ParsingContext;
         (function (ParsingContext) {
@@ -22077,8 +22366,8 @@ var ts;
         var JSDocParser;
         (function (JSDocParser) {
             function parseJSDocTypeExpressionForTests(content, start, length) {
-                initializeState(content, 7 /* Latest */, /*_syntaxCursor:*/ undefined, 1 /* JS */);
-                sourceFile = createSourceFile("file.js", 7 /* Latest */, 1 /* JS */, /*isDeclarationFile*/ false);
+                initializeState(content, 99 /* Latest */, /*_syntaxCursor:*/ undefined, 1 /* JS */);
+                sourceFile = createSourceFile("file.js", 99 /* Latest */, 1 /* JS */, /*isDeclarationFile*/ false);
                 scanner.setText(content, start, length);
                 currentToken = scanner.scan();
                 var jsDocTypeExpression = parseJSDocTypeExpression();
@@ -22089,18 +22378,18 @@ var ts;
             JSDocParser.parseJSDocTypeExpressionForTests = parseJSDocTypeExpressionForTests;
             // Parses out a JSDoc type expression.
             function parseJSDocTypeExpression(mayOmitBraces) {
-                var result = createNode(288 /* JSDocTypeExpression */);
+                var result = createNode(289 /* JSDocTypeExpression */);
                 var hasBrace = (mayOmitBraces ? parseOptional : parseExpected)(18 /* OpenBraceToken */);
                 result.type = doInsideOfContext(2097152 /* JSDoc */, parseJSDocType);
                 if (!mayOmitBraces || hasBrace) {
-                    parseExpected(19 /* CloseBraceToken */);
+                    parseExpectedJSDoc(19 /* CloseBraceToken */);
                 }
                 fixupParentReferences(result);
                 return finishNode(result);
             }
             JSDocParser.parseJSDocTypeExpression = parseJSDocTypeExpression;
             function parseIsolatedJSDocComment(content, start, length) {
-                initializeState(content, 7 /* Latest */, /*_syntaxCursor:*/ undefined, 1 /* JS */);
+                initializeState(content, 99 /* Latest */, /*_syntaxCursor:*/ undefined, 1 /* JS */);
                 sourceFile = { languageVariant: 0 /* Standard */, text: content }; // tslint:disable-line no-object-literal-type-assertion
                 var jsDoc = parseJSDocCommentWorker(start, length);
                 var diagnostics = parseDiagnostics;
@@ -22134,6 +22423,7 @@ var ts;
                 JSDocState[JSDocState["BeginningOfLine"] = 0] = "BeginningOfLine";
                 JSDocState[JSDocState["SawAsterisk"] = 1] = "SawAsterisk";
                 JSDocState[JSDocState["SavingComments"] = 2] = "SavingComments";
+                JSDocState[JSDocState["SavingBackticks"] = 3] = "SavingBackticks";
             })(JSDocState || (JSDocState = {}));
             var PropertyLikeParse;
             (function (PropertyLikeParse) {
@@ -22172,7 +22462,7 @@ var ts;
                         comments.push(text);
                         indent += text.length;
                     }
-                    nextJSDocToken();
+                    nextTokenJSDoc();
                     while (parseOptionalJsdoc(5 /* WhitespaceTrivia */))
                         ;
                     if (parseOptionalJsdoc(4 /* NewLineTrivia */)) {
@@ -22190,7 +22480,6 @@ var ts;
                                     // for malformed examples like `/** @param {string} x @returns {number} the length */`
                                     state = 0 /* BeginningOfLine */;
                                     margin = undefined;
-                                    indent++;
                                 }
                                 else {
                                     pushComment(scanner.getTokenText());
@@ -22235,7 +22524,7 @@ var ts;
                                 pushComment(scanner.getTokenText());
                                 break;
                         }
-                        nextJSDocToken();
+                        nextTokenJSDoc();
                     }
                     removeLeadingNewlines(comments);
                     removeTrailingWhitespace(comments);
@@ -22252,7 +22541,7 @@ var ts;
                     }
                 }
                 function createJSDocComment() {
-                    var result = createNode(296 /* JSDocComment */, start);
+                    var result = createNode(297 /* JSDocComment */, start);
                     result.tags = tags && createNodeArray(tags, tagsPos, tagsEnd);
                     result.comment = comments.length ? comments.join("") : undefined;
                     return finishNode(result, end);
@@ -22260,7 +22549,7 @@ var ts;
                 function isNextNonwhitespaceTokenEndOfFile() {
                     // We must use infinite lookahead, as there could be any number of newlines :(
                     while (true) {
-                        nextJSDocToken();
+                        nextTokenJSDoc();
                         if (token() === 1 /* EndOfFileToken */) {
                             return true;
                         }
@@ -22276,34 +22565,43 @@ var ts;
                         }
                     }
                     while (token() === 5 /* WhitespaceTrivia */ || token() === 4 /* NewLineTrivia */) {
-                        nextJSDocToken();
+                        nextTokenJSDoc();
                     }
                 }
                 function skipWhitespaceOrAsterisk() {
                     if (token() === 5 /* WhitespaceTrivia */ || token() === 4 /* NewLineTrivia */) {
                         if (lookAhead(isNextNonwhitespaceTokenEndOfFile)) {
-                            return; // Don't skip whitespace prior to EoF (or end of comment) - that shouldn't be included in any node's range
+                            return ""; // Don't skip whitespace prior to EoF (or end of comment) - that shouldn't be included in any node's range
                         }
                     }
                     var precedingLineBreak = scanner.hasPrecedingLineBreak();
+                    var seenLineBreak = false;
+                    var indentText = "";
                     while ((precedingLineBreak && token() === 40 /* AsteriskToken */) || token() === 5 /* WhitespaceTrivia */ || token() === 4 /* NewLineTrivia */) {
+                        indentText += scanner.getTokenText();
                         if (token() === 4 /* NewLineTrivia */) {
                             precedingLineBreak = true;
+                            seenLineBreak = true;
+                            indentText = "";
                         }
                         else if (token() === 40 /* AsteriskToken */) {
                             precedingLineBreak = false;
                         }
-                        nextJSDocToken();
+                        nextTokenJSDoc();
                     }
+                    return seenLineBreak ? indentText : "";
                 }
-                function parseTag(indent) {
+                function parseTag(margin) {
                     ts.Debug.assert(token() === 58 /* AtToken */);
                     var start = scanner.getTokenPos();
-                    nextJSDocToken();
+                    nextTokenJSDoc();
                     var tagName = parseJSDocIdentifierName(/*message*/ undefined);
-                    skipWhitespaceOrAsterisk();
+                    var indentText = skipWhitespaceOrAsterisk();
                     var tag;
                     switch (tagName.escapedText) {
+                        case "author":
+                            tag = parseAuthorTag(start, tagName, margin);
+                            break;
                         case "augments":
                         case "extends":
                             tag = parseAugmentsTag(start, tagName);
@@ -22321,7 +22619,7 @@ var ts;
                         case "arg":
                         case "argument":
                         case "param":
-                            return parseParameterOrPropertyTag(start, tagName, 2 /* Parameter */, indent);
+                            return parseParameterOrPropertyTag(start, tagName, 2 /* Parameter */, margin);
                         case "return":
                         case "returns":
                             tag = parseReturnTag(start, tagName);
@@ -22333,10 +22631,10 @@ var ts;
                             tag = parseTypeTag(start, tagName);
                             break;
                         case "typedef":
-                            tag = parseTypedefTag(start, tagName, indent);
+                            tag = parseTypedefTag(start, tagName, margin);
                             break;
                         case "callback":
-                            tag = parseCallbackTag(start, tagName, indent);
+                            tag = parseCallbackTag(start, tagName, margin);
                             break;
                         default:
                             tag = parseUnknownTag(start, tagName);
@@ -22344,11 +22642,14 @@ var ts;
                     }
                     if (!tag.comment) {
                         // some tags, like typedef and callback, have already parsed their comments earlier
-                        tag.comment = parseTagComments(indent + tag.end - tag.pos);
+                        if (!indentText) {
+                            margin += tag.end - tag.pos;
+                        }
+                        tag.comment = parseTagComments(margin, indentText.slice(margin));
                     }
                     return tag;
                 }
-                function parseTagComments(indent) {
+                function parseTagComments(indent, initialMargin) {
                     var comments = [];
                     var state = 0 /* BeginningOfLine */;
                     var margin;
@@ -22359,42 +22660,61 @@ var ts;
                         comments.push(text);
                         indent += text.length;
                     }
+                    if (initialMargin) {
+                        // jump straight to saving comments if there is some initial indentation
+                        pushComment(initialMargin);
+                        state = 2 /* SavingComments */;
+                    }
                     var tok = token();
                     loop: while (true) {
                         switch (tok) {
                             case 4 /* NewLineTrivia */:
                                 if (state >= 1 /* SawAsterisk */) {
                                     state = 0 /* BeginningOfLine */;
+                                    // don't use pushComment here because we want to keep the margin unchanged
                                     comments.push(scanner.getTokenText());
                                 }
                                 indent = 0;
                                 break;
                             case 58 /* AtToken */:
+                                if (state === 3 /* SavingBackticks */) {
+                                    comments.push(scanner.getTokenText());
+                                    break;
+                                }
                                 scanner.setTextPos(scanner.getTextPos() - 1);
                             // falls through
                             case 1 /* EndOfFileToken */:
                                 // Done
                                 break loop;
                             case 5 /* WhitespaceTrivia */:
-                                if (state === 2 /* SavingComments */) {
+                                if (state === 2 /* SavingComments */ || state === 3 /* SavingBackticks */) {
                                     pushComment(scanner.getTokenText());
                                 }
                                 else {
                                     var whitespace = scanner.getTokenText();
                                     // if the whitespace crosses the margin, take only the whitespace that passes the margin
                                     if (margin !== undefined && indent + whitespace.length > margin) {
-                                        comments.push(whitespace.slice(margin - indent - 1));
+                                        comments.push(whitespace.slice(margin - indent));
                                     }
                                     indent += whitespace.length;
                                 }
                                 break;
                             case 18 /* OpenBraceToken */:
                                 state = 2 /* SavingComments */;
-                                if (lookAhead(function () { return nextJSDocToken() === 58 /* AtToken */ && ts.tokenIsIdentifierOrKeyword(nextJSDocToken()) && scanner.getTokenText() === "link"; })) {
+                                if (lookAhead(function () { return nextTokenJSDoc() === 58 /* AtToken */ && ts.tokenIsIdentifierOrKeyword(nextTokenJSDoc()) && scanner.getTokenText() === "link"; })) {
                                     pushComment(scanner.getTokenText());
-                                    nextJSDocToken();
+                                    nextTokenJSDoc();
                                     pushComment(scanner.getTokenText());
-                                    nextJSDocToken();
+                                    nextTokenJSDoc();
+                                }
+                                pushComment(scanner.getTokenText());
+                                break;
+                            case 59 /* BacktickToken */:
+                                if (state === 3 /* SavingBackticks */) {
+                                    state = 2 /* SavingComments */;
+                                }
+                                else {
+                                    state = 3 /* SavingBackticks */;
                                 }
                                 pushComment(scanner.getTokenText());
                                 break;
@@ -22408,18 +22728,20 @@ var ts;
                             // record the * as a comment
                             // falls through
                             default:
-                                state = 2 /* SavingComments */; // leading identifiers start recording as well
+                                if (state !== 3 /* SavingBackticks */) {
+                                    state = 2 /* SavingComments */; // leading identifiers start recording as well
+                                }
                                 pushComment(scanner.getTokenText());
                                 break;
                         }
-                        tok = nextJSDocToken();
+                        tok = nextTokenJSDoc();
                     }
                     removeLeadingNewlines(comments);
                     removeTrailingWhitespace(comments);
                     return comments.length === 0 ? undefined : comments.join("");
                 }
                 function parseUnknownTag(start, tagName) {
-                    var result = createNode(299 /* JSDocTag */, start);
+                    var result = createNode(300 /* JSDocTag */, start);
                     result.tagName = tagName;
                     return finishNode(result);
                 }
@@ -22441,17 +22763,21 @@ var ts;
                     return token() === 18 /* OpenBraceToken */ ? parseJSDocTypeExpression() : undefined;
                 }
                 function parseBracketNameInPropertyAndParamTag() {
-                    if (token() === 14 /* NoSubstitutionTemplateLiteral */) {
-                        // a markdown-quoted name: `arg` is not legal jsdoc, but occurs in the wild
-                        return { name: createIdentifier(/*isIdentifier*/ true), isBracketed: false };
-                    }
                     // Looking for something like '[foo]', 'foo', '[foo.bar]' or 'foo.bar'
-                    var isBracketed = parseOptional(22 /* OpenBracketToken */);
+                    var isBracketed = parseOptionalJsdoc(22 /* OpenBracketToken */);
+                    if (isBracketed) {
+                        skipWhitespace();
+                    }
+                    // a markdown-quoted name: `arg` is not legal jsdoc, but occurs in the wild
+                    var isBackquoted = parseOptionalJsdoc(59 /* BacktickToken */);
                     var name = parseJSDocEntityName();
+                    if (isBackquoted) {
+                        parseExpectedTokenJSDoc(59 /* BacktickToken */);
+                    }
                     if (isBracketed) {
                         skipWhitespace();
                         // May have an optional default, e.g. '[foo = 42]'
-                        if (parseOptionalToken(59 /* EqualsToken */)) {
+                        if (parseOptionalToken(60 /* EqualsToken */)) {
                             parseExpression();
                         }
                         parseExpected(23 /* CloseBracketToken */);
@@ -22460,9 +22786,9 @@ var ts;
                 }
                 function isObjectOrObjectArrayTypeReference(node) {
                     switch (node.kind) {
-                        case 136 /* ObjectKeyword */:
+                        case 137 /* ObjectKeyword */:
                             return true;
-                        case 169 /* ArrayType */:
+                        case 170 /* ArrayType */:
                             return isObjectOrObjectArrayTypeReference(node.elementType);
                         default:
                             return ts.isTypeReferenceNode(node) && ts.isIdentifier(node.typeName) && node.typeName.escapedText === "Object";
@@ -22478,8 +22804,8 @@ var ts;
                         typeExpression = tryParseTypeExpression();
                     }
                     var result = target === 1 /* Property */ ?
-                        createNode(310 /* JSDocPropertyTag */, start) :
-                        createNode(304 /* JSDocParameterTag */, start);
+                        createNode(312 /* JSDocPropertyTag */, start) :
+                        createNode(306 /* JSDocParameterTag */, start);
                     var comment = parseTagComments(indent + scanner.getStartPos() - start);
                     var nestedTypeLiteral = target !== 4 /* CallbackParameter */ && parseNestedTypeLiteral(typeExpression, name, target, indent);
                     if (nestedTypeLiteral) {
@@ -22496,20 +22822,20 @@ var ts;
                 }
                 function parseNestedTypeLiteral(typeExpression, name, target, indent) {
                     if (typeExpression && isObjectOrObjectArrayTypeReference(typeExpression.type)) {
-                        var typeLiteralExpression = createNode(288 /* JSDocTypeExpression */, scanner.getTokenPos());
+                        var typeLiteralExpression = createNode(289 /* JSDocTypeExpression */, scanner.getTokenPos());
                         var child = void 0;
                         var jsdocTypeLiteral = void 0;
                         var start_2 = scanner.getStartPos();
                         var children = void 0;
                         while (child = tryParse(function () { return parseChildParameterOrPropertyTag(target, indent, name); })) {
-                            if (child.kind === 304 /* JSDocParameterTag */ || child.kind === 310 /* JSDocPropertyTag */) {
+                            if (child.kind === 306 /* JSDocParameterTag */ || child.kind === 312 /* JSDocPropertyTag */) {
                                 children = ts.append(children, child);
                             }
                         }
                         if (children) {
-                            jsdocTypeLiteral = createNode(297 /* JSDocTypeLiteral */, start_2);
+                            jsdocTypeLiteral = createNode(298 /* JSDocTypeLiteral */, start_2);
                             jsdocTypeLiteral.jsDocPropertyTags = children;
-                            if (typeExpression.type.kind === 169 /* ArrayType */) {
+                            if (typeExpression.type.kind === 170 /* ArrayType */) {
                                 jsdocTypeLiteral.isArrayType = true;
                             }
                             typeLiteralExpression.type = finishNode(jsdocTypeLiteral);
@@ -22518,32 +22844,86 @@ var ts;
                     }
                 }
                 function parseReturnTag(start, tagName) {
-                    if (ts.forEach(tags, function (t) { return t.kind === 305 /* JSDocReturnTag */; })) {
+                    if (ts.some(tags, ts.isJSDocReturnTag)) {
                         parseErrorAt(tagName.pos, scanner.getTokenPos(), ts.Diagnostics._0_tag_already_specified, tagName.escapedText);
                     }
-                    var result = createNode(305 /* JSDocReturnTag */, start);
+                    var result = createNode(307 /* JSDocReturnTag */, start);
                     result.tagName = tagName;
                     result.typeExpression = tryParseTypeExpression();
                     return finishNode(result);
                 }
                 function parseTypeTag(start, tagName) {
-                    if (ts.forEach(tags, function (t) { return t.kind === 307 /* JSDocTypeTag */; })) {
+                    if (ts.some(tags, ts.isJSDocTypeTag)) {
                         parseErrorAt(tagName.pos, scanner.getTokenPos(), ts.Diagnostics._0_tag_already_specified, tagName.escapedText);
                     }
-                    var result = createNode(307 /* JSDocTypeTag */, start);
+                    var result = createNode(309 /* JSDocTypeTag */, start);
                     result.tagName = tagName;
                     result.typeExpression = parseJSDocTypeExpression(/*mayOmitBraces*/ true);
                     return finishNode(result);
                 }
+                function parseAuthorTag(start, tagName, indent) {
+                    var result = createNode(302 /* JSDocAuthorTag */, start);
+                    result.tagName = tagName;
+                    var authorInfoWithEmail = tryParse(function () { return tryParseAuthorNameAndEmail(); });
+                    if (!authorInfoWithEmail) {
+                        return finishNode(result);
+                    }
+                    result.comment = authorInfoWithEmail;
+                    if (lookAhead(function () { return nextToken() !== 4 /* NewLineTrivia */; })) {
+                        var comment = parseTagComments(indent);
+                        if (comment) {
+                            result.comment += comment;
+                        }
+                    }
+                    return finishNode(result);
+                }
+                function tryParseAuthorNameAndEmail() {
+                    var comments = [];
+                    var seenLessThan = false;
+                    var seenGreaterThan = false;
+                    var token = scanner.getToken();
+                    loop: while (true) {
+                        switch (token) {
+                            case 73 /* Identifier */:
+                            case 5 /* WhitespaceTrivia */:
+                            case 24 /* DotToken */:
+                            case 58 /* AtToken */:
+                                comments.push(scanner.getTokenText());
+                                break;
+                            case 28 /* LessThanToken */:
+                                if (seenLessThan || seenGreaterThan) {
+                                    return;
+                                }
+                                seenLessThan = true;
+                                comments.push(scanner.getTokenText());
+                                break;
+                            case 30 /* GreaterThanToken */:
+                                if (!seenLessThan || seenGreaterThan) {
+                                    return;
+                                }
+                                seenGreaterThan = true;
+                                comments.push(scanner.getTokenText());
+                                scanner.setTextPos(scanner.getTokenPos() + 1);
+                                break loop;
+                            case 4 /* NewLineTrivia */:
+                            case 1 /* EndOfFileToken */:
+                                break loop;
+                        }
+                        token = nextTokenJSDoc();
+                    }
+                    if (seenLessThan && seenGreaterThan) {
+                        return comments.length === 0 ? undefined : comments.join("");
+                    }
+                }
                 function parseAugmentsTag(start, tagName) {
-                    var result = createNode(300 /* JSDocAugmentsTag */, start);
+                    var result = createNode(301 /* JSDocAugmentsTag */, start);
                     result.tagName = tagName;
                     result.class = parseExpressionWithTypeArgumentsForAugments();
                     return finishNode(result);
                 }
                 function parseExpressionWithTypeArgumentsForAugments() {
                     var usedBrace = parseOptional(18 /* OpenBraceToken */);
-                    var node = createNode(211 /* ExpressionWithTypeArguments */);
+                    var node = createNode(212 /* ExpressionWithTypeArguments */);
                     node.expression = parsePropertyAccessEntityNameExpression();
                     node.typeArguments = tryParseTypeArguments();
                     var res = finishNode(node);
@@ -22555,7 +22935,7 @@ var ts;
                 function parsePropertyAccessEntityNameExpression() {
                     var node = parseJSDocIdentifierName();
                     while (parseOptional(24 /* DotToken */)) {
-                        var prop = createNode(189 /* PropertyAccessExpression */, node.pos);
+                        var prop = createNode(190 /* PropertyAccessExpression */, node.pos);
                         prop.expression = node;
                         prop.name = parseJSDocIdentifierName();
                         node = finishNode(prop);
@@ -22563,19 +22943,19 @@ var ts;
                     return node;
                 }
                 function parseClassTag(start, tagName) {
-                    var tag = createNode(301 /* JSDocClassTag */, start);
+                    var tag = createNode(303 /* JSDocClassTag */, start);
                     tag.tagName = tagName;
                     return finishNode(tag);
                 }
                 function parseThisTag(start, tagName) {
-                    var tag = createNode(306 /* JSDocThisTag */, start);
+                    var tag = createNode(308 /* JSDocThisTag */, start);
                     tag.tagName = tagName;
                     tag.typeExpression = parseJSDocTypeExpression(/*mayOmitBraces*/ true);
                     skipWhitespace();
                     return finishNode(tag);
                 }
                 function parseEnumTag(start, tagName) {
-                    var tag = createNode(303 /* JSDocEnumTag */, start);
+                    var tag = createNode(305 /* JSDocEnumTag */, start);
                     tag.tagName = tagName;
                     tag.typeExpression = parseJSDocTypeExpression(/*mayOmitBraces*/ true);
                     skipWhitespace();
@@ -22584,7 +22964,7 @@ var ts;
                 function parseTypedefTag(start, tagName, indent) {
                     var typeExpression = tryParseTypeExpression();
                     skipWhitespaceOrAsterisk();
-                    var typedefTag = createNode(309 /* JSDocTypedefTag */, start);
+                    var typedefTag = createNode(311 /* JSDocTypedefTag */, start);
                     typedefTag.tagName = tagName;
                     typedefTag.fullName = parseJSDocTypeNameWithNamespace();
                     typedefTag.name = getJSDocTypeAliasName(typedefTag.fullName);
@@ -22598,9 +22978,9 @@ var ts;
                         var childTypeTag = void 0;
                         while (child = tryParse(function () { return parseChildPropertyTag(indent); })) {
                             if (!jsdocTypeLiteral) {
-                                jsdocTypeLiteral = createNode(297 /* JSDocTypeLiteral */, start);
+                                jsdocTypeLiteral = createNode(298 /* JSDocTypeLiteral */, start);
                             }
-                            if (child.kind === 307 /* JSDocTypeTag */) {
+                            if (child.kind === 309 /* JSDocTypeTag */) {
                                 if (childTypeTag) {
                                     break;
                                 }
@@ -22613,7 +22993,7 @@ var ts;
                             }
                         }
                         if (jsdocTypeLiteral) {
-                            if (typeExpression && typeExpression.type.kind === 169 /* ArrayType */) {
+                            if (typeExpression && typeExpression.type.kind === 170 /* ArrayType */) {
                                 jsdocTypeLiteral.isArrayType = true;
                             }
                             typedefTag.typeExpression = childTypeTag && childTypeTag.typeExpression && !isObjectOrObjectArrayTypeReference(childTypeTag.typeExpression.type) ?
@@ -22632,7 +23012,7 @@ var ts;
                     }
                     var typeNameOrNamespaceName = parseJSDocIdentifierName();
                     if (parseOptional(24 /* DotToken */)) {
-                        var jsDocNamespaceNode = createNode(244 /* ModuleDeclaration */, pos);
+                        var jsDocNamespaceNode = createNode(245 /* ModuleDeclaration */, pos);
                         if (nested) {
                             jsDocNamespaceNode.flags |= 4 /* NestedNamespace */;
                         }
@@ -22646,14 +23026,14 @@ var ts;
                     return typeNameOrNamespaceName;
                 }
                 function parseCallbackTag(start, tagName, indent) {
-                    var callbackTag = createNode(302 /* JSDocCallbackTag */, start);
+                    var callbackTag = createNode(304 /* JSDocCallbackTag */, start);
                     callbackTag.tagName = tagName;
                     callbackTag.fullName = parseJSDocTypeNameWithNamespace();
                     callbackTag.name = getJSDocTypeAliasName(callbackTag.fullName);
                     skipWhitespace();
                     callbackTag.comment = parseTagComments(indent);
                     var child;
-                    var jsdocSignature = createNode(298 /* JSDocSignature */, start);
+                    var jsdocSignature = createNode(299 /* JSDocSignature */, start);
                     jsdocSignature.parameters = [];
                     while (child = tryParse(function () { return parseChildParameterOrPropertyTag(4 /* CallbackParameter */, indent); })) {
                         jsdocSignature.parameters = ts.append(jsdocSignature.parameters, child);
@@ -22661,7 +23041,7 @@ var ts;
                     var returnTag = tryParse(function () {
                         if (parseOptionalJsdoc(58 /* AtToken */)) {
                             var tag = parseTag(indent);
-                            if (tag && tag.kind === 305 /* JSDocReturnTag */) {
+                            if (tag && tag.kind === 307 /* JSDocReturnTag */) {
                                 return tag;
                             }
                         }
@@ -22702,11 +23082,11 @@ var ts;
                     var canParseTag = true;
                     var seenAsterisk = false;
                     while (true) {
-                        switch (nextJSDocToken()) {
+                        switch (nextTokenJSDoc()) {
                             case 58 /* AtToken */:
                                 if (canParseTag) {
                                     var child = tryParseChildTag(target, indent);
-                                    if (child && (child.kind === 304 /* JSDocParameterTag */ || child.kind === 310 /* JSDocPropertyTag */) &&
+                                    if (child && (child.kind === 306 /* JSDocParameterTag */ || child.kind === 312 /* JSDocPropertyTag */) &&
                                         target !== 4 /* CallbackParameter */ &&
                                         name && (ts.isIdentifier(child.name) || !escapedTextsEqual(name, child.name.left))) {
                                         return false;
@@ -22725,7 +23105,7 @@ var ts;
                                 }
                                 seenAsterisk = true;
                                 break;
-                            case 72 /* Identifier */:
+                            case 73 /* Identifier */:
                                 canParseTag = false;
                                 break;
                             case 1 /* EndOfFileToken */:
@@ -22736,7 +23116,7 @@ var ts;
                 function tryParseChildTag(target, indent) {
                     ts.Debug.assert(token() === 58 /* AtToken */);
                     var start = scanner.getStartPos();
-                    nextJSDocToken();
+                    nextTokenJSDoc();
                     var tagName = parseJSDocIdentifierName();
                     skipWhitespace();
                     var t;
@@ -22770,25 +23150,22 @@ var ts;
                     var typeParametersPos = getNodePos();
                     do {
                         skipWhitespace();
-                        var typeParameter = createNode(150 /* TypeParameter */);
+                        var typeParameter = createNode(151 /* TypeParameter */);
                         typeParameter.name = parseJSDocIdentifierName(ts.Diagnostics.Unexpected_token_A_type_parameter_name_was_expected_without_curly_braces);
                         finishNode(typeParameter);
                         skipWhitespace();
                         typeParameters.push(typeParameter);
                     } while (parseOptionalJsdoc(27 /* CommaToken */));
-                    var result = createNode(308 /* JSDocTemplateTag */, start);
+                    var result = createNode(310 /* JSDocTemplateTag */, start);
                     result.tagName = tagName;
                     result.constraint = constraint;
                     result.typeParameters = createNodeArray(typeParameters, typeParametersPos);
                     finishNode(result);
                     return result;
                 }
-                function nextJSDocToken() {
-                    return currentToken = scanner.scanJSDocToken();
-                }
                 function parseOptionalJsdoc(t) {
                     if (token() === t) {
-                        nextJSDocToken();
+                        nextTokenJSDoc();
                         return true;
                     }
                     return false;
@@ -22812,14 +23189,14 @@ var ts;
                 }
                 function parseJSDocIdentifierName(message) {
                     if (!ts.tokenIsIdentifierOrKeyword(token())) {
-                        return createMissingNode(72 /* Identifier */, /*reportAtCurrentPosition*/ !message, message || ts.Diagnostics.Identifier_expected);
+                        return createMissingNode(73 /* Identifier */, /*reportAtCurrentPosition*/ !message, message || ts.Diagnostics.Identifier_expected);
                     }
                     var pos = scanner.getTokenPos();
                     var end = scanner.getTextPos();
-                    var result = createNode(72 /* Identifier */, pos);
+                    var result = createNode(73 /* Identifier */, pos);
                     result.escapedText = ts.escapeLeadingUnderscores(scanner.getTokenText());
                     finishNode(result, end);
-                    nextJSDocToken();
+                    nextTokenJSDoc();
                     return result;
                 }
             }
@@ -22944,7 +23321,7 @@ var ts;
             switch (node.kind) {
                 case 10 /* StringLiteral */:
                 case 8 /* NumericLiteral */:
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return true;
             }
             return false;
@@ -23311,28 +23688,16 @@ var ts;
     ts.isDeclarationFileName = isDeclarationFileName;
     /*@internal*/
     function processCommentPragmas(context, sourceText) {
-        var triviaScanner = ts.createScanner(context.languageVersion, /*skipTrivia*/ false, 0 /* Standard */, sourceText);
         var pragmas = [];
-        // Keep scanning all the leading trivia in the file until we get to something that
-        // isn't trivia.  Any single line comment will be analyzed to see if it is a
-        // reference comment.
-        while (true) {
-            var kind = triviaScanner.scan();
-            if (!ts.isTrivia(kind)) {
-                break;
-            }
-            var range = {
-                kind: triviaScanner.getToken(),
-                pos: triviaScanner.getTokenPos(),
-                end: triviaScanner.getTextPos(),
-            };
+        for (var _i = 0, _a = ts.getLeadingCommentRanges(sourceText, 0) || ts.emptyArray; _i < _a.length; _i++) {
+            var range = _a[_i];
             var comment = sourceText.substring(range.pos, range.end);
             extractPragmas(pragmas, range, comment);
         }
         context.pragmas = ts.createMap();
-        for (var _i = 0, pragmas_1 = pragmas; _i < pragmas_1.length; _i++) {
-            var pragma = pragmas_1[_i];
-            if (context.pragmas.has(pragma.name)) { // TODO: GH#18217
+        for (var _b = 0, pragmas_1 = pragmas; _b < pragmas_1.length; _b++) {
+            var pragma = pragmas_1[_b];
+            if (context.pragmas.has(pragma.name)) {
                 var currentValue = context.pragmas.get(pragma.name);
                 if (currentValue instanceof Array) {
                     currentValue.push(pragma.args);
@@ -23363,7 +23728,6 @@ var ts;
                     var typeReferenceDirectives_1 = context.typeReferenceDirectives;
                     var libReferenceDirectives_1 = context.libReferenceDirectives;
                     ts.forEach(ts.toArray(entryOrList), function (arg) {
-                        // TODO: GH#18217
                         var _a = arg.arguments, types = _a.types, lib = _a.lib, path = _a.path;
                         if (arg.arguments["no-default-lib"]) {
                             context.hasNoDefaultLib = true;
@@ -23384,7 +23748,7 @@ var ts;
                     break;
                 }
                 case "amd-dependency": {
-                    context.amdDependencies = ts.map(ts.toArray(entryOrList), function (x) { return ({ name: x.arguments.name, path: x.arguments.path }); }); // TODO: GH#18217
+                    context.amdDependencies = ts.map(ts.toArray(entryOrList), function (x) { return ({ name: x.arguments.name, path: x.arguments.path }); });
                     break;
                 }
                 case "amd-module": {
@@ -23407,7 +23771,7 @@ var ts;
                 case "ts-check": {
                     // _last_ of either nocheck or check in a file is the "winner"
                     ts.forEach(ts.toArray(entryOrList), function (entry) {
-                        if (!context.checkJsDirective || entry.range.pos > context.checkJsDirective.pos) { // TODO: GH#18217
+                        if (!context.checkJsDirective || entry.range.pos > context.checkJsDirective.pos) {
                             context.checkJsDirective = {
                                 enabled: key === "ts-check",
                                 end: entry.range.end,
@@ -23523,10 +23887,10 @@ var ts;
         if (lhs.kind !== rhs.kind) {
             return false;
         }
-        if (lhs.kind === 72 /* Identifier */) {
+        if (lhs.kind === 73 /* Identifier */) {
             return lhs.escapedText === rhs.escapedText;
         }
-        if (lhs.kind === 100 /* ThisKeyword */) {
+        if (lhs.kind === 101 /* ThisKeyword */) {
             return true;
         }
         // If we are at this statement then we must have PropertyAccessExpression and because tag name in Jsx element can only
@@ -23555,6 +23919,7 @@ var ts;
         ["es2017", "lib.es2017.d.ts"],
         ["es2018", "lib.es2018.d.ts"],
         ["es2019", "lib.es2019.d.ts"],
+        ["es2020", "lib.es2020.d.ts"],
         ["esnext", "lib.esnext.d.ts"],
         // Host only
         ["dom", "lib.dom.d.ts"],
@@ -23578,13 +23943,17 @@ var ts;
         ["es2017.string", "lib.es2017.string.d.ts"],
         ["es2017.intl", "lib.es2017.intl.d.ts"],
         ["es2017.typedarrays", "lib.es2017.typedarrays.d.ts"],
+        ["es2018.asyncgenerator", "lib.es2018.asyncgenerator.d.ts"],
         ["es2018.asynciterable", "lib.es2018.asynciterable.d.ts"],
         ["es2018.intl", "lib.es2018.intl.d.ts"],
         ["es2018.promise", "lib.es2018.promise.d.ts"],
         ["es2018.regexp", "lib.es2018.regexp.d.ts"],
         ["es2019.array", "lib.es2019.array.d.ts"],
+        ["es2019.object", "lib.es2019.object.d.ts"],
         ["es2019.string", "lib.es2019.string.d.ts"],
         ["es2019.symbol", "lib.es2019.symbol.d.ts"],
+        ["es2020.string", "lib.es2020.string.d.ts"],
+        ["es2020.symbol.wellknown", "lib.es2020.symbol.wellknown.d.ts"],
         ["esnext.array", "lib.es2019.array.d.ts"],
         ["esnext.symbol", "lib.es2019.symbol.d.ts"],
         ["esnext.asynciterable", "lib.es2018.asynciterable.d.ts"],
@@ -23671,6 +24040,19 @@ var ts;
             category: ts.Diagnostics.Advanced_Options,
             description: ts.Diagnostics.Show_verbose_diagnostic_information
         },
+        {
+            name: "incremental",
+            shortName: "i",
+            type: "boolean",
+            category: ts.Diagnostics.Basic_Options,
+            description: ts.Diagnostics.Enable_incremental_compilation,
+        },
+        {
+            name: "locale",
+            type: "string",
+            category: ts.Diagnostics.Advanced_Options,
+            description: ts.Diagnostics.The_locale_used_when_displaying_messages_to_the_user_e_g_en_us
+        },
     ];
     /* @internal */
     ts.optionDeclarations = ts.commonOptionsWithBuild.concat([
@@ -23734,10 +24116,12 @@ var ts;
                 es2017: 4 /* ES2017 */,
                 es2018: 5 /* ES2018 */,
                 es2019: 6 /* ES2019 */,
-                esnext: 7 /* ESNext */,
+                es2020: 7 /* ES2020 */,
+                esnext: 99 /* ESNext */,
             }),
             affectsSourceFile: true,
             affectsModuleResolution: true,
+            affectsEmit: true,
             paramType: ts.Diagnostics.VERSION,
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Basic_Options,
@@ -23757,6 +24141,7 @@ var ts;
                 esnext: ts.ModuleKind.ESNext
             }),
             affectsModuleResolution: true,
+            affectsEmit: true,
             paramType: ts.Diagnostics.KIND,
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Basic_Options,
@@ -23805,6 +24190,7 @@ var ts;
             name: "declaration",
             shortName: "d",
             type: "boolean",
+            affectsEmit: true,
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Basic_Options,
             description: ts.Diagnostics.Generates_corresponding_d_ts_file,
@@ -23812,6 +24198,7 @@ var ts;
         {
             name: "declarationMap",
             type: "boolean",
+            affectsEmit: true,
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Basic_Options,
             description: ts.Diagnostics.Generates_a_sourcemap_for_each_corresponding_d_ts_file,
@@ -23819,12 +24206,14 @@ var ts;
         {
             name: "emitDeclarationOnly",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Advanced_Options,
             description: ts.Diagnostics.Only_emit_d_ts_declaration_files,
         },
         {
             name: "sourceMap",
             type: "boolean",
+            affectsEmit: true,
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Basic_Options,
             description: ts.Diagnostics.Generates_corresponding_map_file,
@@ -23832,6 +24221,7 @@ var ts;
         {
             name: "outFile",
             type: "string",
+            affectsEmit: true,
             isFilePath: true,
             paramType: ts.Diagnostics.FILE,
             showInSimplifiedHelpView: true,
@@ -23841,6 +24231,7 @@ var ts;
         {
             name: "outDir",
             type: "string",
+            affectsEmit: true,
             isFilePath: true,
             paramType: ts.Diagnostics.DIRECTORY,
             showInSimplifiedHelpView: true,
@@ -23850,6 +24241,7 @@ var ts;
         {
             name: "rootDir",
             type: "string",
+            affectsEmit: true,
             isFilePath: true,
             paramType: ts.Diagnostics.LOCATION,
             category: ts.Diagnostics.Basic_Options,
@@ -23858,29 +24250,24 @@ var ts;
         {
             name: "composite",
             type: "boolean",
+            affectsEmit: true,
             isTSConfigOnly: true,
             category: ts.Diagnostics.Basic_Options,
             description: ts.Diagnostics.Enable_project_compilation,
         },
-        {
-            name: "incremental",
-            type: "boolean",
-            isTSConfigOnly: true,
-            category: ts.Diagnostics.Basic_Options,
-            description: ts.Diagnostics.Enable_incremental_compilation,
-        },
         {
             name: "tsBuildInfoFile",
             type: "string",
+            affectsEmit: true,
             isFilePath: true,
             paramType: ts.Diagnostics.FILE,
-            isTSConfigOnly: true,
             category: ts.Diagnostics.Basic_Options,
             description: ts.Diagnostics.Specify_file_to_store_incremental_compilation_information,
         },
         {
             name: "removeComments",
             type: "boolean",
+            affectsEmit: true,
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Basic_Options,
             description: ts.Diagnostics.Do_not_emit_comments_to_output,
@@ -23888,6 +24275,7 @@ var ts;
         {
             name: "noEmit",
             type: "boolean",
+            affectsEmit: true,
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Basic_Options,
             description: ts.Diagnostics.Do_not_emit_outputs,
@@ -23895,12 +24283,14 @@ var ts;
         {
             name: "importHelpers",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Basic_Options,
             description: ts.Diagnostics.Import_emit_helpers_from_tslib
         },
         {
             name: "downlevelIteration",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Basic_Options,
             description: ts.Diagnostics.Provide_full_support_for_iterables_in_for_of_spread_and_destructuring_when_targeting_ES5_or_ES3
         },
@@ -24094,6 +24484,7 @@ var ts;
             name: "esModuleInterop",
             type: "boolean",
             affectsSemanticDiagnostics: true,
+            affectsEmit: true,
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Module_Resolution_Options,
             description: ts.Diagnostics.Enables_emit_interoperability_between_CommonJS_and_ES_Modules_via_creation_of_namespace_objects_for_all_imports_Implies_allowSyntheticDefaultImports
@@ -24104,10 +24495,18 @@ var ts;
             category: ts.Diagnostics.Module_Resolution_Options,
             description: ts.Diagnostics.Do_not_resolve_the_real_path_of_symlinks,
         },
+        {
+            name: "allowUmdGlobalAccess",
+            type: "boolean",
+            affectsSemanticDiagnostics: true,
+            category: ts.Diagnostics.Module_Resolution_Options,
+            description: ts.Diagnostics.Allow_accessing_UMD_globals_from_modules,
+        },
         // Source Maps
         {
             name: "sourceRoot",
             type: "string",
+            affectsEmit: true,
             paramType: ts.Diagnostics.LOCATION,
             category: ts.Diagnostics.Source_Map_Options,
             description: ts.Diagnostics.Specify_the_location_where_debugger_should_locate_TypeScript_files_instead_of_source_locations,
@@ -24115,6 +24514,7 @@ var ts;
         {
             name: "mapRoot",
             type: "string",
+            affectsEmit: true,
             paramType: ts.Diagnostics.LOCATION,
             category: ts.Diagnostics.Source_Map_Options,
             description: ts.Diagnostics.Specify_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations,
@@ -24122,12 +24522,14 @@ var ts;
         {
             name: "inlineSourceMap",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Source_Map_Options,
             description: ts.Diagnostics.Emit_a_single_file_with_source_maps_instead_of_having_a_separate_file
         },
         {
             name: "inlineSources",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Source_Map_Options,
             description: ts.Diagnostics.Emit_the_source_alongside_the_sourcemaps_within_a_single_file_requires_inlineSourceMap_or_sourceMap_to_be_set
         },
@@ -24160,6 +24562,7 @@ var ts;
         {
             name: "out",
             type: "string",
+            affectsEmit: true,
             isFilePath: false,
             // for correct behaviour, please use outFile
             category: ts.Diagnostics.Advanced_Options,
@@ -24169,6 +24572,7 @@ var ts;
         {
             name: "reactNamespace",
             type: "string",
+            affectsEmit: true,
             category: ts.Diagnostics.Advanced_Options,
             description: ts.Diagnostics.Deprecated_Use_jsxFactory_instead_Specify_the_object_invoked_for_createElement_when_targeting_react_JSX_emit
         },
@@ -24187,21 +24591,17 @@ var ts;
         {
             name: "emitBOM",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Advanced_Options,
             description: ts.Diagnostics.Emit_a_UTF_8_Byte_Order_Mark_BOM_in_the_beginning_of_output_files
         },
-        {
-            name: "locale",
-            type: "string",
-            category: ts.Diagnostics.Advanced_Options,
-            description: ts.Diagnostics.The_locale_used_when_displaying_messages_to_the_user_e_g_en_us
-        },
         {
             name: "newLine",
             type: ts.createMapFromTemplate({
                 crlf: 0 /* CarriageReturnLineFeed */,
                 lf: 1 /* LineFeed */
             }),
+            affectsEmit: true,
             paramType: ts.Diagnostics.NEWLINE,
             category: ts.Diagnostics.Advanced_Options,
             description: ts.Diagnostics.Specify_the_end_of_line_sequence_to_be_used_when_emitting_files_Colon_CRLF_dos_or_LF_unix,
@@ -24229,6 +24629,7 @@ var ts;
         {
             name: "stripInternal",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Advanced_Options,
             description: ts.Diagnostics.Do_not_emit_declarations_for_code_that_has_an_internal_annotation,
         },
@@ -24249,24 +24650,28 @@ var ts;
         {
             name: "noEmitHelpers",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Advanced_Options,
             description: ts.Diagnostics.Do_not_generate_custom_helper_functions_like_extends_in_compiled_output
         },
         {
             name: "noEmitOnError",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Advanced_Options,
             description: ts.Diagnostics.Do_not_emit_outputs_if_any_errors_were_reported,
         },
         {
             name: "preserveConstEnums",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Advanced_Options,
             description: ts.Diagnostics.Do_not_erase_const_enum_declarations_in_generated_code
         },
         {
             name: "declarationDir",
             type: "string",
+            affectsEmit: true,
             isFilePath: true,
             paramType: ts.Diagnostics.DIRECTORY,
             category: ts.Diagnostics.Advanced_Options,
@@ -24349,6 +24754,8 @@ var ts;
     /* @internal */
     ts.semanticDiagnosticsOptionDeclarations = ts.optionDeclarations.filter(function (option) { return !!option.affectsSemanticDiagnostics; });
     /* @internal */
+    ts.affectsEmitOptionDeclarations = ts.optionDeclarations.filter(function (option) { return !!option.affectsEmit; });
+    /* @internal */
     ts.moduleResolutionOptionDeclarations = ts.optionDeclarations.filter(function (option) { return !!option.affectsModuleResolution; });
     /* @internal */
     ts.sourceFileAffectingCompilerOptions = ts.optionDeclarations.filter(function (option) {
@@ -24435,9 +24842,11 @@ var ts;
         return typeAcquisition;
     }
     ts.convertEnableAutoDiscoveryToEnable = convertEnableAutoDiscoveryToEnable;
+    /* @internal */
     function getOptionNameMap() {
         return optionNameMapCache || (optionNameMapCache = createOptionNameMap(ts.optionDeclarations));
     }
+    ts.getOptionNameMap = getOptionNameMap;
     /*@internal*/
     function createOptionNameMap(optionDeclarations) {
         var optionNameMap = ts.createMap();
@@ -24756,7 +25165,7 @@ var ts;
     /**
      * Reads the config file, reports errors if any and exits if the config file cannot be found
      */
-    function getParsedCommandLineOfConfigFile(configFileName, optionsToExtend, host) {
+    function getParsedCommandLineOfConfigFile(configFileName, optionsToExtend, host, extendedConfigCache) {
         var configFileText;
         try {
             configFileText = host.readFile(configFileName);
@@ -24776,7 +25185,9 @@ var ts;
         result.path = ts.toPath(configFileName, cwd, ts.createGetCanonicalFileName(host.useCaseSensitiveFileNames));
         result.resolvedPath = result.path;
         result.originalFileName = result.fileName;
-        return parseJsonSourceFileConfigFileContent(result, host, ts.getNormalizedAbsolutePath(ts.getDirectoryPath(configFileName), cwd), optionsToExtend, ts.getNormalizedAbsolutePath(configFileName, cwd));
+        return parseJsonSourceFileConfigFileContent(result, host, ts.getNormalizedAbsolutePath(ts.getDirectoryPath(configFileName), cwd), optionsToExtend, ts.getNormalizedAbsolutePath(configFileName, cwd), 
+        /*resolutionStack*/ undefined, 
+        /*extraFileExtension*/ undefined, extendedConfigCache);
     }
     ts.getParsedCommandLineOfConfigFile = getParsedCommandLineOfConfigFile;
     /**
@@ -24915,7 +25326,7 @@ var ts;
             var result = returnValue ? {} : undefined;
             for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
                 var element = _a[_i];
-                if (element.kind !== 275 /* PropertyAssignment */) {
+                if (element.kind !== 276 /* PropertyAssignment */) {
                     errors.push(ts.createDiagnosticForNodeInSourceFile(sourceFile, element, ts.Diagnostics.Property_assignment_expected));
                     continue;
                 }
@@ -24971,13 +25382,13 @@ var ts;
         }
         function convertPropertyValueToJson(valueExpression, option) {
             switch (valueExpression.kind) {
-                case 102 /* TrueKeyword */:
+                case 103 /* TrueKeyword */:
                     reportInvalidOptionValue(option && option.type !== "boolean");
                     return true;
-                case 87 /* FalseKeyword */:
+                case 88 /* FalseKeyword */:
                     reportInvalidOptionValue(option && option.type !== "boolean");
                     return false;
-                case 96 /* NullKeyword */:
+                case 97 /* NullKeyword */:
                     reportInvalidOptionValue(option && option.name === "extends"); // "extends" is the only option we don't allow null/undefined for
                     return null; // tslint:disable-line:no-null-keyword
                 case 10 /* StringLiteral */:
@@ -24997,13 +25408,13 @@ var ts;
                 case 8 /* NumericLiteral */:
                     reportInvalidOptionValue(option && option.type !== "number");
                     return Number(valueExpression.text);
-                case 202 /* PrefixUnaryExpression */:
+                case 203 /* PrefixUnaryExpression */:
                     if (valueExpression.operator !== 39 /* MinusToken */ || valueExpression.operand.kind !== 8 /* NumericLiteral */) {
                         break; // not valid JSON syntax
                     }
                     reportInvalidOptionValue(option && option.type !== "number");
                     return -Number(valueExpression.operand.text);
-                case 188 /* ObjectLiteralExpression */:
+                case 189 /* ObjectLiteralExpression */:
                     reportInvalidOptionValue(option && option.type !== "object");
                     var objectLiteralExpression = valueExpression;
                     // Currently having element option declaration in the tsconfig with type "object"
@@ -25020,7 +25431,7 @@ var ts;
                         return convertObjectLiteralExpressionToJson(objectLiteralExpression, /* knownOptions*/ undefined, 
                         /*extraKeyDiagnosticMessage */ undefined, /*parentOption*/ undefined);
                     }
-                case 187 /* ArrayLiteralExpression */:
+                case 188 /* ArrayLiteralExpression */:
                     reportInvalidOptionValue(option && option.type !== "list");
                     return convertArrayLiteralExpressionToJson(valueExpression.elements, option && option.element);
             }
@@ -25192,7 +25603,10 @@ var ts;
                 case "object":
                     return {};
                 default:
-                    return option.type.keys().next().value;
+                    var iterResult = option.type.keys().next();
+                    if (!iterResult.done)
+                        return iterResult.value;
+                    return ts.Debug.fail("Expected 'option.type' to have entries.");
             }
         }
         function makePadding(paddingLength) {
@@ -25276,8 +25690,8 @@ var ts;
      * @param basePath A root directory to resolve relative path entries in the config
      *    file to. e.g. outDir
      */
-    function parseJsonConfigFileContent(json, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions) {
-        return parseJsonConfigFileContentWorker(json, /*sourceFile*/ undefined, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions);
+    function parseJsonConfigFileContent(json, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions, extendedConfigCache) {
+        return parseJsonConfigFileContentWorker(json, /*sourceFile*/ undefined, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions, extendedConfigCache);
     }
     ts.parseJsonConfigFileContent = parseJsonConfigFileContent;
     /**
@@ -25287,8 +25701,8 @@ var ts;
      * @param basePath A root directory to resolve relative path entries in the config
      *    file to. e.g. outDir
      */
-    function parseJsonSourceFileConfigFileContent(sourceFile, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions) {
-        return parseJsonConfigFileContentWorker(/*json*/ undefined, sourceFile, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions);
+    function parseJsonSourceFileConfigFileContent(sourceFile, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions, extendedConfigCache) {
+        return parseJsonConfigFileContentWorker(/*json*/ undefined, sourceFile, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions, extendedConfigCache);
     }
     ts.parseJsonSourceFileConfigFileContent = parseJsonSourceFileConfigFileContent;
     /*@internal*/
@@ -25316,13 +25730,13 @@ var ts;
      *    file to. e.g. outDir
      * @param resolutionStack Only present for backwards-compatibility. Should be empty.
      */
-    function parseJsonConfigFileContentWorker(json, sourceFile, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions) {
+    function parseJsonConfigFileContentWorker(json, sourceFile, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions, extendedConfigCache) {
         if (existingOptions === void 0) { existingOptions = {}; }
         if (resolutionStack === void 0) { resolutionStack = []; }
         if (extraFileExtensions === void 0) { extraFileExtensions = []; }
         ts.Debug.assert((json === undefined && sourceFile !== undefined) || (json !== undefined && sourceFile === undefined));
         var errors = [];
-        var parsedConfig = parseConfig(json, sourceFile, host, basePath, configFileName, resolutionStack, errors);
+        var parsedConfig = parseConfig(json, sourceFile, host, basePath, configFileName, resolutionStack, errors, extendedConfigCache);
         var raw = parsedConfig.raw;
         var options = ts.extend(existingOptions, parsedConfig.options || {});
         options.configFilePath = configFileName && ts.normalizeSlashes(configFileName);
@@ -25462,7 +25876,7 @@ var ts;
      * This *just* extracts options/include/exclude/files out of a config file.
      * It does *not* resolve the included files.
      */
-    function parseConfig(json, sourceFile, host, basePath, configFileName, resolutionStack, errors) {
+    function parseConfig(json, sourceFile, host, basePath, configFileName, resolutionStack, errors, extendedConfigCache) {
         basePath = ts.normalizeSlashes(basePath);
         var resolvedPath = ts.getNormalizedAbsolutePath(configFileName || "", basePath);
         if (resolutionStack.indexOf(resolvedPath) >= 0) {
@@ -25475,7 +25889,7 @@ var ts;
         if (ownConfig.extendedConfigPath) {
             // copy the resolution stack so it is never reused between branches in potential diamond-problem scenarios.
             resolutionStack = resolutionStack.concat([resolvedPath]);
-            var extendedConfig = getExtendedConfig(sourceFile, ownConfig.extendedConfigPath, host, basePath, resolutionStack, errors);
+            var extendedConfig = getExtendedConfig(sourceFile, ownConfig.extendedConfigPath, host, basePath, resolutionStack, errors, extendedConfigCache);
             if (extendedConfig && isSuccessfulParsedTsconfig(extendedConfig)) {
                 var baseRaw_1 = extendedConfig.raw;
                 var raw_1 = ownConfig.raw;
@@ -25572,7 +25986,7 @@ var ts;
             if (!host.fileExists(extendedConfigPath) && !ts.endsWith(extendedConfigPath, ".json" /* Json */)) {
                 extendedConfigPath = extendedConfigPath + ".json";
                 if (!host.fileExists(extendedConfigPath)) {
-                    errors.push(createDiagnostic(ts.Diagnostics.File_0_does_not_exist, extendedConfig));
+                    errors.push(createDiagnostic(ts.Diagnostics.File_0_not_found, extendedConfig));
                     return undefined;
                 }
             }
@@ -25583,38 +25997,52 @@ var ts;
         if (resolved.resolvedModule) {
             return resolved.resolvedModule.resolvedFileName;
         }
-        errors.push(createDiagnostic(ts.Diagnostics.File_0_does_not_exist, extendedConfig));
+        errors.push(createDiagnostic(ts.Diagnostics.File_0_not_found, extendedConfig));
         return undefined;
     }
-    function getExtendedConfig(sourceFile, extendedConfigPath, host, basePath, resolutionStack, errors) {
+    function getExtendedConfig(sourceFile, extendedConfigPath, host, basePath, resolutionStack, errors, extendedConfigCache) {
         var _a;
-        var extendedResult = readJsonConfigFile(extendedConfigPath, function (path) { return host.readFile(path); });
+        var path = host.useCaseSensitiveFileNames ? extendedConfigPath : ts.toLowerCase(extendedConfigPath);
+        var value;
+        var extendedResult;
+        var extendedConfig;
+        if (extendedConfigCache && (value = extendedConfigCache.get(path))) {
+            (extendedResult = value.extendedResult, extendedConfig = value.extendedConfig);
+        }
+        else {
+            extendedResult = readJsonConfigFile(extendedConfigPath, function (path) { return host.readFile(path); });
+            if (!extendedResult.parseDiagnostics.length) {
+                var extendedDirname = ts.getDirectoryPath(extendedConfigPath);
+                extendedConfig = parseConfig(/*json*/ undefined, extendedResult, host, extendedDirname, ts.getBaseFileName(extendedConfigPath), resolutionStack, errors, extendedConfigCache);
+                if (isSuccessfulParsedTsconfig(extendedConfig)) {
+                    // Update the paths to reflect base path
+                    var relativeDifference_1 = ts.convertToRelativePath(extendedDirname, basePath, ts.identity);
+                    var updatePath_1 = function (path) { return ts.isRootedDiskPath(path) ? path : ts.combinePaths(relativeDifference_1, path); };
+                    var mapPropertiesInRawIfNotUndefined = function (propertyName) {
+                        if (raw_2[propertyName]) {
+                            raw_2[propertyName] = ts.map(raw_2[propertyName], updatePath_1);
+                        }
+                    };
+                    var raw_2 = extendedConfig.raw;
+                    mapPropertiesInRawIfNotUndefined("include");
+                    mapPropertiesInRawIfNotUndefined("exclude");
+                    mapPropertiesInRawIfNotUndefined("files");
+                }
+            }
+            if (extendedConfigCache) {
+                extendedConfigCache.set(path, { extendedResult: extendedResult, extendedConfig: extendedConfig });
+            }
+        }
         if (sourceFile) {
             sourceFile.extendedSourceFiles = [extendedResult.fileName];
+            if (extendedResult.extendedSourceFiles) {
+                (_a = sourceFile.extendedSourceFiles).push.apply(_a, extendedResult.extendedSourceFiles);
+            }
         }
         if (extendedResult.parseDiagnostics.length) {
             errors.push.apply(errors, extendedResult.parseDiagnostics);
             return undefined;
         }
-        var extendedDirname = ts.getDirectoryPath(extendedConfigPath);
-        var extendedConfig = parseConfig(/*json*/ undefined, extendedResult, host, extendedDirname, ts.getBaseFileName(extendedConfigPath), resolutionStack, errors);
-        if (sourceFile && extendedResult.extendedSourceFiles) {
-            (_a = sourceFile.extendedSourceFiles).push.apply(_a, extendedResult.extendedSourceFiles);
-        }
-        if (isSuccessfulParsedTsconfig(extendedConfig)) {
-            // Update the paths to reflect base path
-            var relativeDifference_1 = ts.convertToRelativePath(extendedDirname, basePath, ts.identity);
-            var updatePath_1 = function (path) { return ts.isRootedDiskPath(path) ? path : ts.combinePaths(relativeDifference_1, path); };
-            var mapPropertiesInRawIfNotUndefined = function (propertyName) {
-                if (raw_2[propertyName]) {
-                    raw_2[propertyName] = ts.map(raw_2[propertyName], updatePath_1);
-                }
-            };
-            var raw_2 = extendedConfig.raw;
-            mapPropertiesInRawIfNotUndefined("include");
-            mapPropertiesInRawIfNotUndefined("exclude");
-            mapPropertiesInRawIfNotUndefined("files");
-        }
         return extendedConfig;
     }
     function convertCompileOnSaveOptionFromJson(jsonOption, basePath, errors) {
@@ -26084,11 +26512,22 @@ var ts;
         return !!compilerOptions.traceResolution && host.trace !== undefined;
     }
     ts.isTraceEnabled = isTraceEnabled;
-    function withPackageId(packageId, r) {
+    function withPackageId(packageInfo, r) {
+        var packageId;
+        if (r && packageInfo) {
+            var packageJsonContent = packageInfo.packageJsonContent;
+            if (typeof packageJsonContent.name === "string" && typeof packageJsonContent.version === "string") {
+                packageId = {
+                    name: packageJsonContent.name,
+                    subModuleName: r.path.slice(packageInfo.packageDirectory.length + ts.directorySeparator.length),
+                    version: packageJsonContent.version
+                };
+            }
+        }
         return r && { path: r.path, extension: r.ext, packageId: packageId };
     }
     function noPackageId(r) {
-        return withPackageId(/*packageId*/ undefined, r);
+        return withPackageId(/*packageInfo*/ undefined, r);
     }
     function removeIgnoredPackageId(r) {
         if (r) {
@@ -26140,8 +26579,15 @@ var ts;
     }
     function readPackageJsonPathField(jsonContent, fieldName, baseDirectory, state) {
         var fileName = readPackageJsonField(jsonContent, fieldName, "string", state);
-        if (fileName === undefined)
+        if (fileName === undefined) {
             return;
+        }
+        if (!fileName) {
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.package_json_had_a_falsy_0_field, fieldName);
+            }
+            return;
+        }
         var path = ts.normalizePath(ts.combinePaths(baseDirectory, fileName));
         if (state.traceEnabled) {
             trace(state.host, ts.Diagnostics.package_json_has_0_field_1_that_references_2, fieldName, fileName, path);
@@ -26294,7 +26740,12 @@ var ts;
             var fileName = resolved.fileName, packageId = resolved.packageId;
             var resolvedFileName = options.preserveSymlinks ? fileName : realPath(fileName, host, traceEnabled);
             if (traceEnabled) {
-                trace(host, ts.Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2, typeReferenceDirectiveName, resolvedFileName, primary);
+                if (packageId) {
+                    trace(host, ts.Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_with_Package_ID_2_primary_Colon_3, typeReferenceDirectiveName, resolvedFileName, ts.packageIdToString(packageId), primary);
+                }
+                else {
+                    trace(host, ts.Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2, typeReferenceDirectiveName, resolvedFileName, primary);
+                }
             }
             resolvedTypeReferenceDirective = { primary: primary, resolvedFileName: resolvedFileName, packageId: packageId, isExternalLibraryImport: pathContainsNodeModules(fileName) };
         }
@@ -26396,20 +26847,28 @@ var ts;
         return result;
     }
     ts.getAutomaticTypeDirectiveNames = getAutomaticTypeDirectiveNames;
-    function createModuleResolutionCache(currentDirectory, getCanonicalFileName) {
-        return createModuleResolutionCacheWithMaps(createCacheWithRedirects(), createCacheWithRedirects(), currentDirectory, getCanonicalFileName);
+    function createModuleResolutionCache(currentDirectory, getCanonicalFileName, options) {
+        return createModuleResolutionCacheWithMaps(createCacheWithRedirects(options), createCacheWithRedirects(options), currentDirectory, getCanonicalFileName);
     }
     ts.createModuleResolutionCache = createModuleResolutionCache;
     /*@internal*/
-    function createCacheWithRedirects() {
+    function createCacheWithRedirects(options) {
         var ownMap = ts.createMap();
         var redirectsMap = ts.createMap();
         return {
             ownMap: ownMap,
             redirectsMap: redirectsMap,
             getOrCreateMapOfCacheRedirects: getOrCreateMapOfCacheRedirects,
-            clear: clear
+            clear: clear,
+            setOwnOptions: setOwnOptions,
+            setOwnMap: setOwnMap
         };
+        function setOwnOptions(newOptions) {
+            options = newOptions;
+        }
+        function setOwnMap(newOwnMap) {
+            ownMap = newOwnMap;
+        }
         function getOrCreateMapOfCacheRedirects(redirectedReference) {
             if (!redirectedReference) {
                 return ownMap;
@@ -26417,7 +26876,8 @@ var ts;
             var path = redirectedReference.sourceFile.path;
             var redirects = redirectsMap.get(path);
             if (!redirects) {
-                redirects = ts.createMap();
+                // Reuse map if redirected reference map uses same resolution
+                redirects = !options || ts.optionsHaveModuleResolutionChanges(options, redirectedReference.commandLine.options) ? ts.createMap() : ownMap;
                 redirectsMap.set(path, redirects);
             }
             return redirects;
@@ -26430,7 +26890,7 @@ var ts;
     ts.createCacheWithRedirects = createCacheWithRedirects;
     /*@internal*/
     function createModuleResolutionCacheWithMaps(directoryToModuleNameMap, moduleNameToDirectoryMap, currentDirectory, getCanonicalFileName) {
-        return { getOrCreateCacheForDirectory: getOrCreateCacheForDirectory, getOrCreateCacheForModuleName: getOrCreateCacheForModuleName };
+        return { getOrCreateCacheForDirectory: getOrCreateCacheForDirectory, getOrCreateCacheForModuleName: getOrCreateCacheForModuleName, directoryToModuleNameMap: directoryToModuleNameMap, moduleNameToDirectoryMap: moduleNameToDirectoryMap };
         function getOrCreateCacheForDirectory(directoryName, redirectedReference) {
             var path = ts.toPath(directoryName, currentDirectory, getCanonicalFileName);
             return getOrCreateCache(directoryToModuleNameMap, redirectedReference, path, ts.createMap);
@@ -26573,7 +27033,12 @@ var ts;
         }
         if (traceEnabled) {
             if (result.resolvedModule) {
-                trace(host, ts.Diagnostics.Module_name_0_was_successfully_resolved_to_1, moduleName, result.resolvedModule.resolvedFileName);
+                if (result.resolvedModule.packageId) {
+                    trace(host, ts.Diagnostics.Module_name_0_was_successfully_resolved_to_1_with_Package_ID_2, moduleName, result.resolvedModule.resolvedFileName, ts.packageIdToString(result.resolvedModule.packageId));
+                }
+                else {
+                    trace(host, ts.Diagnostics.Module_name_0_was_successfully_resolved_to_1, moduleName, result.resolvedModule.resolvedFileName);
+                }
             }
             else {
                 trace(host, ts.Diagnostics.Module_name_0_was_not_resolved, moduleName);
@@ -26843,10 +27308,9 @@ var ts;
             }
             var resolvedFromFile = loadModuleFromFile(extensions, candidate, onlyRecordFailures, state);
             if (resolvedFromFile) {
-                var nm = considerPackageJson ? parseNodeModuleFromPath(resolvedFromFile) : undefined;
-                var packageInfo = nm && getPackageJsonInfo(nm.packageDirectory, nm.subModuleName, /*onlyRecordFailures*/ false, state);
-                var packageId = packageInfo && packageInfo.packageId;
-                return withPackageId(packageId, resolvedFromFile);
+                var packageDirectory = considerPackageJson ? parseNodeModuleFromPath(resolvedFromFile) : undefined;
+                var packageInfo = packageDirectory ? getPackageJsonInfo(packageDirectory, /*onlyRecordFailures*/ false, state) : undefined;
+                return withPackageId(packageInfo, resolvedFromFile);
             }
         }
         if (!onlyRecordFailures) {
@@ -26872,11 +27336,10 @@ var ts;
      * (Not neeeded for `loadModuleFromNodeModules` as that looks up the `package.json` as part of resolution.)
      *
      * packageDirectory is the directory of the package itself.
-     * subModuleName is the path within the package.
-     *   For `blah/node_modules/foo/index.d.ts` this is { packageDirectory: "foo", subModuleName: "index.d.ts" }. (Part before "/node_modules/" is ignored.)
-     *   For `/node_modules/foo/bar.d.ts` this is { packageDirectory: "foo", subModuleName": "bar/index.d.ts" }.
-     *   For `/node_modules/@types/foo/bar/index.d.ts` this is { packageDirectory: "@types/foo", subModuleName: "bar/index.d.ts" }.
-     *   For `/node_modules/foo/bar/index.d.ts` this is { packageDirectory: "foo", subModuleName": "bar/index.d.ts" }.
+     *   For `blah/node_modules/foo/index.d.ts` this is packageDirectory: "foo"
+     *   For `/node_modules/foo/bar.d.ts` this is packageDirectory: "foo"
+     *   For `/node_modules/@types/foo/bar/index.d.ts` this is packageDirectory: "@types/foo"
+     *   For `/node_modules/foo/bar/index.d.ts` this is packageDirectory: "foo"
      */
     function parseNodeModuleFromPath(resolved) {
         var path = ts.normalizePath(resolved.path);
@@ -26889,26 +27352,12 @@ var ts;
         if (path.charCodeAt(indexAfterNodeModules) === 64 /* at */) {
             indexAfterPackageName = moveToNextDirectorySeparatorIfAvailable(path, indexAfterPackageName);
         }
-        var packageDirectory = path.slice(0, indexAfterPackageName);
-        var subModuleName = ts.removeExtension(path.slice(indexAfterPackageName + 1), resolved.ext) + ".d.ts" /* Dts */;
-        return { packageDirectory: packageDirectory, subModuleName: subModuleName };
+        return path.slice(0, indexAfterPackageName);
     }
     function moveToNextDirectorySeparatorIfAvailable(path, prevSeparatorIndex) {
         var nextSeparatorIndex = path.indexOf(ts.directorySeparator, prevSeparatorIndex + 1);
         return nextSeparatorIndex === -1 ? prevSeparatorIndex : nextSeparatorIndex;
     }
-    function addExtensionAndIndex(path) {
-        if (path === "") {
-            return "index.d.ts";
-        }
-        if (ts.endsWith(path, ".d.ts")) {
-            return path;
-        }
-        if (path === "index" || ts.endsWith(path, "/index")) {
-            return path + ".d.ts";
-        }
-        return path + "/index.d.ts";
-    }
     function loadModuleFromFileNoPackageId(extensions, candidate, onlyRecordFailures, state) {
         return noPackageId(loadModuleFromFile(extensions, candidate, onlyRecordFailures, state));
     }
@@ -26982,52 +27431,22 @@ var ts;
     }
     function loadNodeModuleFromDirectory(extensions, candidate, onlyRecordFailures, state, considerPackageJson) {
         if (considerPackageJson === void 0) { considerPackageJson = true; }
-        var packageInfo = considerPackageJson ? getPackageJsonInfo(candidate, "", onlyRecordFailures, state) : undefined;
-        var packageId = packageInfo && packageInfo.packageId;
+        var packageInfo = considerPackageJson ? getPackageJsonInfo(candidate, onlyRecordFailures, state) : undefined;
         var packageJsonContent = packageInfo && packageInfo.packageJsonContent;
-        var versionPaths = packageJsonContent && readPackageJsonTypesVersionPaths(packageJsonContent, state);
-        return withPackageId(packageId, loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageJsonContent, versionPaths));
+        var versionPaths = packageInfo && packageInfo.versionPaths;
+        return withPackageId(packageInfo, loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageJsonContent, versionPaths));
     }
-    function getPackageJsonInfo(packageDirectory, subModuleName, onlyRecordFailures, state) {
+    function getPackageJsonInfo(packageDirectory, onlyRecordFailures, state) {
         var host = state.host, traceEnabled = state.traceEnabled;
         var directoryExists = !onlyRecordFailures && ts.directoryProbablyExists(packageDirectory, host);
         var packageJsonPath = ts.combinePaths(packageDirectory, "package.json");
         if (directoryExists && host.fileExists(packageJsonPath)) {
             var packageJsonContent = ts.readJson(packageJsonPath, host);
-            if (subModuleName === "") { // looking up the root - need to handle types/typings/main redirects for subModuleName
-                var path = readPackageJsonTypesFields(packageJsonContent, packageDirectory, state);
-                if (typeof path === "string") {
-                    subModuleName = addExtensionAndIndex(path.substring(packageDirectory.length + 1));
-                }
-                else {
-                    var jsPath = readPackageJsonMainField(packageJsonContent, packageDirectory, state);
-                    if (typeof jsPath === "string" && jsPath.length > packageDirectory.length) {
-                        var potentialSubModule_1 = jsPath.substring(packageDirectory.length + 1);
-                        subModuleName = (ts.forEach(ts.supportedJSExtensions, function (extension) {
-                            return ts.tryRemoveExtension(potentialSubModule_1, extension);
-                        }) || potentialSubModule_1) + ".d.ts" /* Dts */;
-                    }
-                    else {
-                        subModuleName = "index.d.ts";
-                    }
-                }
-            }
-            if (!ts.endsWith(subModuleName, ".d.ts" /* Dts */)) {
-                subModuleName = addExtensionAndIndex(subModuleName);
+            if (traceEnabled) {
+                trace(host, ts.Diagnostics.Found_package_json_at_0, packageJsonPath);
             }
             var versionPaths = readPackageJsonTypesVersionPaths(packageJsonContent, state);
-            var packageId = typeof packageJsonContent.name === "string" && typeof packageJsonContent.version === "string"
-                ? { name: packageJsonContent.name, subModuleName: subModuleName, version: packageJsonContent.version }
-                : undefined;
-            if (traceEnabled) {
-                if (packageId) {
-                    trace(host, ts.Diagnostics.Found_package_json_at_0_Package_ID_is_1, packageJsonPath, ts.packageIdToString(packageId));
-                }
-                else {
-                    trace(host, ts.Diagnostics.Found_package_json_at_0, packageJsonPath);
-                }
-            }
-            return { packageJsonContent: packageJsonContent, packageId: packageId, versionPaths: versionPaths };
+            return { packageDirectory: packageDirectory, packageJsonContent: packageJsonContent, versionPaths: versionPaths };
         }
         else {
             if (directoryExists && traceEnabled) {
@@ -27166,37 +27585,31 @@ var ts;
     function loadModuleFromSpecificNodeModulesDirectory(extensions, moduleName, nodeModulesDirectory, nodeModulesDirectoryExists, state) {
         var candidate = ts.normalizePath(ts.combinePaths(nodeModulesDirectory, moduleName));
         // First look for a nested package.json, as in `node_modules/foo/bar/package.json`.
-        var packageJsonContent;
-        var packageId;
-        var versionPaths;
-        var packageInfo = getPackageJsonInfo(candidate, "", !nodeModulesDirectoryExists, state);
+        var packageInfo = getPackageJsonInfo(candidate, !nodeModulesDirectoryExists, state);
         if (packageInfo) {
-            (packageJsonContent = packageInfo.packageJsonContent, packageId = packageInfo.packageId, versionPaths = packageInfo.versionPaths);
             var fromFile = loadModuleFromFile(extensions, candidate, !nodeModulesDirectoryExists, state);
             if (fromFile) {
                 return noPackageId(fromFile);
             }
-            var fromDirectory = loadNodeModuleFromDirectoryWorker(extensions, candidate, !nodeModulesDirectoryExists, state, packageJsonContent, versionPaths);
-            return withPackageId(packageId, fromDirectory);
+            var fromDirectory = loadNodeModuleFromDirectoryWorker(extensions, candidate, !nodeModulesDirectoryExists, state, packageInfo.packageJsonContent, packageInfo.versionPaths);
+            return withPackageId(packageInfo, fromDirectory);
         }
         var loader = function (extensions, candidate, onlyRecordFailures, state) {
             var pathAndExtension = loadModuleFromFile(extensions, candidate, onlyRecordFailures, state) ||
-                loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageJsonContent, versionPaths);
-            return withPackageId(packageId, pathAndExtension);
+                loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageInfo && packageInfo.packageJsonContent, packageInfo && packageInfo.versionPaths);
+            return withPackageId(packageInfo, pathAndExtension);
         };
         var _a = parsePackageName(moduleName), packageName = _a.packageName, rest = _a.rest;
         if (rest !== "") { // If "rest" is empty, we just did this search above.
             var packageDirectory = ts.combinePaths(nodeModulesDirectory, packageName);
             // Don't use a "types" or "main" from here because we're not loading the root, but a subdirectory -- just here for the packageId and path mappings.
-            var packageInfo_1 = getPackageJsonInfo(packageDirectory, rest, !nodeModulesDirectoryExists, state);
-            if (packageInfo_1)
-                (packageId = packageInfo_1.packageId, versionPaths = packageInfo_1.versionPaths);
-            if (versionPaths) {
+            packageInfo = getPackageJsonInfo(packageDirectory, !nodeModulesDirectoryExists, state);
+            if (packageInfo && packageInfo.versionPaths) {
                 if (state.traceEnabled) {
-                    trace(state.host, ts.Diagnostics.package_json_has_a_typesVersions_entry_0_that_matches_compiler_version_1_looking_for_a_pattern_to_match_module_name_2, versionPaths.version, ts.version, rest);
+                    trace(state.host, ts.Diagnostics.package_json_has_a_typesVersions_entry_0_that_matches_compiler_version_1_looking_for_a_pattern_to_match_module_name_2, packageInfo.versionPaths.version, ts.version, rest);
                 }
                 var packageDirectoryExists = nodeModulesDirectoryExists && ts.directoryProbablyExists(packageDirectory, state.host);
-                var fromPaths = tryLoadModuleUsingPaths(extensions, rest, packageDirectory, versionPaths.paths, loader, !packageDirectoryExists, state);
+                var fromPaths = tryLoadModuleUsingPaths(extensions, rest, packageDirectory, packageInfo.versionPaths.paths, loader, !packageDirectoryExists, state);
                 if (fromPaths) {
                     return fromPaths.value;
                 }
@@ -27324,8 +27737,8 @@ var ts;
     }
     ts.classicNameResolver = classicNameResolver;
     /**
-     * LSHost may load a module from a global cache of typings.
-     * This is the minumum code needed to expose that functionality; the rest is in LSHost.
+     * A host may load a module from a global cache of typings.
+     * This is the minumum code needed to expose that functionality; the rest is in the host.
      */
     /* @internal */
     function loadModuleFromGlobalCache(moduleName, projectName, compilerOptions, host, globalCache) {
@@ -27364,24 +27777,24 @@ var ts;
         // A module is uninstantiated if it contains only
         switch (node.kind) {
             // 1. interface declarations, type alias declarations
-            case 241 /* InterfaceDeclaration */:
-            case 242 /* TypeAliasDeclaration */:
+            case 242 /* InterfaceDeclaration */:
+            case 243 /* TypeAliasDeclaration */:
                 return 0 /* NonInstantiated */;
             // 2. const enum declarations
-            case 243 /* EnumDeclaration */:
+            case 244 /* EnumDeclaration */:
                 if (ts.isEnumConst(node)) {
                     return 2 /* ConstEnumOnly */;
                 }
                 break;
             // 3. non-exported import declarations
-            case 249 /* ImportDeclaration */:
-            case 248 /* ImportEqualsDeclaration */:
+            case 250 /* ImportDeclaration */:
+            case 249 /* ImportEqualsDeclaration */:
                 if (!(ts.hasModifier(node, 1 /* Export */))) {
                     return 0 /* NonInstantiated */;
                 }
                 break;
             // 4. other uninstantiated module declarations.
-            case 245 /* ModuleBlock */: {
+            case 246 /* ModuleBlock */: {
                 var state_1 = 0 /* NonInstantiated */;
                 ts.forEachChild(node, function (n) {
                     var childState = getModuleInstanceStateWorker(n);
@@ -27403,9 +27816,9 @@ var ts;
                 });
                 return state_1;
             }
-            case 244 /* ModuleDeclaration */:
+            case 245 /* ModuleDeclaration */:
                 return getModuleInstanceState(node);
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 // Only jsdoc typedef definition can exist in jsdoc namespace, and it should
                 // be considered the same as type alias
                 if (node.isInJSDocNamespace) {
@@ -27571,7 +27984,7 @@ var ts;
         // Should not be called on a declaration with a computed property name,
         // unless it is a well known Symbol.
         function getDeclarationName(node) {
-            if (node.kind === 254 /* ExportAssignment */) {
+            if (node.kind === 255 /* ExportAssignment */) {
                 return node.isExportEquals ? "export=" /* ExportEquals */ : "default" /* Default */;
             }
             var name = ts.getNameOfDeclaration(node);
@@ -27580,48 +27993,51 @@ var ts;
                     var moduleName = ts.getTextOfIdentifierOrLiteral(name);
                     return (ts.isGlobalScopeAugmentation(node) ? "__global" : "\"" + moduleName + "\"");
                 }
-                if (name.kind === 149 /* ComputedPropertyName */) {
+                if (name.kind === 150 /* ComputedPropertyName */) {
                     var nameExpression = name.expression;
                     // treat computed property names where expression is string/numeric literal as just string/numeric literal
                     if (ts.isStringOrNumericLiteralLike(nameExpression)) {
                         return ts.escapeLeadingUnderscores(nameExpression.text);
                     }
+                    if (ts.isSignedNumericLiteral(nameExpression)) {
+                        return ts.tokenToString(nameExpression.operator) + nameExpression.operand.text;
+                    }
                     ts.Debug.assert(ts.isWellKnownSymbolSyntactically(nameExpression));
                     return ts.getPropertyNameForKnownSymbolName(ts.idText(nameExpression.name));
                 }
                 return ts.isPropertyNameLiteral(name) ? ts.getEscapedTextOfIdentifierOrLiteral(name) : undefined;
             }
             switch (node.kind) {
-                case 157 /* Constructor */:
+                case 158 /* Constructor */:
                     return "__constructor" /* Constructor */;
-                case 165 /* FunctionType */:
-                case 160 /* CallSignature */:
-                case 298 /* JSDocSignature */:
+                case 166 /* FunctionType */:
+                case 161 /* CallSignature */:
+                case 299 /* JSDocSignature */:
                     return "__call" /* Call */;
-                case 166 /* ConstructorType */:
-                case 161 /* ConstructSignature */:
+                case 167 /* ConstructorType */:
+                case 162 /* ConstructSignature */:
                     return "__new" /* New */;
-                case 162 /* IndexSignature */:
+                case 163 /* IndexSignature */:
                     return "__index" /* Index */;
-                case 255 /* ExportDeclaration */:
+                case 256 /* ExportDeclaration */:
                     return "__export" /* ExportStar */;
-                case 284 /* SourceFile */:
+                case 285 /* SourceFile */:
                     // json file should behave as
                     // module.exports = ...
                     return "export=" /* ExportEquals */;
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     if (ts.getAssignmentDeclarationKind(node) === 2 /* ModuleExports */) {
                         // module.exports = ...
                         return "export=" /* ExportEquals */;
                     }
                     ts.Debug.fail("Unknown binary declaration kind");
                     break;
-                case 294 /* JSDocFunctionType */:
+                case 295 /* JSDocFunctionType */:
                     return (ts.isJSDocConstructSignature(node) ? "__new" /* New */ : "__call" /* Call */);
-                case 151 /* Parameter */:
+                case 152 /* Parameter */:
                     // Parameters with names are handled at the top of this function.  Parameters
                     // without names can only come from JSDocFunctionTypes.
-                    ts.Debug.assert(node.parent.kind === 294 /* JSDocFunctionType */, "Impossible parameter parent kind", function () { return "parent is: " + (ts.SyntaxKind ? ts.SyntaxKind[node.parent.kind] : node.parent.kind) + ", expected JSDocFunctionType"; });
+                    ts.Debug.assert(node.parent.kind === 295 /* JSDocFunctionType */, "Impossible parameter parent kind", function () { return "parent is: " + (ts.SyntaxKind ? ts.SyntaxKind[node.parent.kind] : node.parent.kind) + ", expected JSDocFunctionType"; });
                     var functionType = node.parent;
                     var index = functionType.parameters.indexOf(node);
                     return "arg" + index;
@@ -27705,13 +28121,15 @@ var ts;
                             message_1 = ts.Diagnostics.Enum_declarations_can_only_merge_with_namespace_or_other_enum_declarations;
                             messageNeedsName_1 = false;
                         }
-                        if (symbol.declarations && symbol.declarations.length) {
+                        var multipleDefaultExports_1 = false;
+                        if (ts.length(symbol.declarations)) {
                             // If the current node is a default export of some sort, then check if
                             // there are any other default exports that we need to error on.
                             // We'll know whether we have other default exports depending on if `symbol` already has a declaration list set.
                             if (isDefaultExport) {
                                 message_1 = ts.Diagnostics.A_module_cannot_have_multiple_default_exports;
                                 messageNeedsName_1 = false;
+                                multipleDefaultExports_1 = true;
                             }
                             else {
                                 // This is to properly report an error in the case "export default { }" is after export default of class declaration or function declaration.
@@ -27719,17 +28137,25 @@ var ts;
                                 // 1. multiple export default of class declaration or function declaration by checking NodeFlags.Default
                                 // 2. multiple export default of export assignment. This one doesn't have NodeFlags.Default on (as export default doesn't considered as modifiers)
                                 if (symbol.declarations && symbol.declarations.length &&
-                                    (node.kind === 254 /* ExportAssignment */ && !node.isExportEquals)) {
+                                    (node.kind === 255 /* ExportAssignment */ && !node.isExportEquals)) {
                                     message_1 = ts.Diagnostics.A_module_cannot_have_multiple_default_exports;
                                     messageNeedsName_1 = false;
+                                    multipleDefaultExports_1 = true;
                                 }
                             }
                         }
-                        var addError = function (decl) {
-                            file.bindDiagnostics.push(createDiagnosticForNode(ts.getNameOfDeclaration(decl) || decl, message_1, messageNeedsName_1 ? getDisplayName(decl) : undefined));
-                        };
-                        ts.forEach(symbol.declarations, addError);
-                        addError(node);
+                        var declarationName_1 = ts.getNameOfDeclaration(node) || node;
+                        var relatedInformation_1 = [];
+                        ts.forEach(symbol.declarations, function (declaration, index) {
+                            var decl = ts.getNameOfDeclaration(declaration) || declaration;
+                            var diag = createDiagnosticForNode(decl, message_1, messageNeedsName_1 ? getDisplayName(declaration) : undefined);
+                            file.bindDiagnostics.push(multipleDefaultExports_1 ? ts.addRelatedInfo(diag, createDiagnosticForNode(declarationName_1, index === 0 ? ts.Diagnostics.Another_export_default_is_here : ts.Diagnostics.and_here)) : diag);
+                            if (multipleDefaultExports_1) {
+                                relatedInformation_1.push(createDiagnosticForNode(decl, ts.Diagnostics.The_first_export_default_is_here));
+                            }
+                        });
+                        var diag = createDiagnosticForNode(declarationName_1, message_1, messageNeedsName_1 ? getDisplayName(node) : undefined);
+                        file.bindDiagnostics.push(multipleDefaultExports_1 ? ts.addRelatedInfo.apply(void 0, [diag].concat(relatedInformation_1)) : diag);
                         symbol = createSymbol(0 /* None */, name);
                     }
                 }
@@ -27746,7 +28172,7 @@ var ts;
         function declareModuleMember(node, symbolFlags, symbolExcludes) {
             var hasExportModifier = ts.getCombinedModifierFlags(node) & 1 /* Export */;
             if (symbolFlags & 2097152 /* Alias */) {
-                if (node.kind === 257 /* ExportSpecifier */ || (node.kind === 248 /* ImportEqualsDeclaration */ && hasExportModifier)) {
+                if (node.kind === 258 /* ExportSpecifier */ || (node.kind === 249 /* ImportEqualsDeclaration */ && hasExportModifier)) {
                     return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);
                 }
                 else {
@@ -27813,7 +28239,7 @@ var ts;
             // for it.  We must clear this so we don't accidentally move any stale data forward from
             // a previous compilation.
             if (containerFlags & 1 /* IsContainer */) {
-                if (node.kind !== 197 /* ArrowFunction */) {
+                if (node.kind !== 198 /* ArrowFunction */) {
                     thisParentContainer = container;
                 }
                 container = blockScopeContainer = node;
@@ -27846,7 +28272,7 @@ var ts;
                 }
                 // We create a return control flow graph for IIFEs and constructors. For constructors
                 // we use the return control flow graph in strict property initialization checks.
-                currentReturnTarget = isIIFE || node.kind === 157 /* Constructor */ ? createBranchLabel() : undefined;
+                currentReturnTarget = isIIFE || node.kind === 158 /* Constructor */ ? createBranchLabel() : undefined;
                 currentBreakTarget = undefined;
                 currentContinueTarget = undefined;
                 activeLabels = undefined;
@@ -27860,13 +28286,13 @@ var ts;
                     if (hasExplicitReturn)
                         node.flags |= 256 /* HasExplicitReturn */;
                 }
-                if (node.kind === 284 /* SourceFile */) {
+                if (node.kind === 285 /* SourceFile */) {
                     node.flags |= emitFlags;
                 }
                 if (currentReturnTarget) {
                     addAntecedent(currentReturnTarget, currentFlow);
                     currentFlow = finishFlowLabel(currentReturnTarget);
-                    if (node.kind === 157 /* Constructor */) {
+                    if (node.kind === 158 /* Constructor */) {
                         node.returnFlowNode = currentFlow;
                     }
                 }
@@ -27910,8 +28336,8 @@ var ts;
             }
         }
         function bindEachFunctionsFirst(nodes) {
-            bindEach(nodes, function (n) { return n.kind === 239 /* FunctionDeclaration */ ? bind(n) : undefined; });
-            bindEach(nodes, function (n) { return n.kind !== 239 /* FunctionDeclaration */ ? bind(n) : undefined; });
+            bindEach(nodes, function (n) { return n.kind === 240 /* FunctionDeclaration */ ? bind(n) : undefined; });
+            bindEach(nodes, function (n) { return n.kind !== 240 /* FunctionDeclaration */ ? bind(n) : undefined; });
         }
         function bindEach(nodes, bindFunction) {
             if (bindFunction === void 0) { bindFunction = bind; }
@@ -27944,78 +28370,78 @@ var ts;
                 return;
             }
             switch (node.kind) {
-                case 224 /* WhileStatement */:
+                case 225 /* WhileStatement */:
                     bindWhileStatement(node);
                     break;
-                case 223 /* DoStatement */:
+                case 224 /* DoStatement */:
                     bindDoStatement(node);
                     break;
-                case 225 /* ForStatement */:
+                case 226 /* ForStatement */:
                     bindForStatement(node);
                     break;
-                case 226 /* ForInStatement */:
-                case 227 /* ForOfStatement */:
+                case 227 /* ForInStatement */:
+                case 228 /* ForOfStatement */:
                     bindForInOrForOfStatement(node);
                     break;
-                case 222 /* IfStatement */:
+                case 223 /* IfStatement */:
                     bindIfStatement(node);
                     break;
-                case 230 /* ReturnStatement */:
-                case 234 /* ThrowStatement */:
+                case 231 /* ReturnStatement */:
+                case 235 /* ThrowStatement */:
                     bindReturnOrThrow(node);
                     break;
-                case 229 /* BreakStatement */:
-                case 228 /* ContinueStatement */:
+                case 230 /* BreakStatement */:
+                case 229 /* ContinueStatement */:
                     bindBreakOrContinueStatement(node);
                     break;
-                case 235 /* TryStatement */:
+                case 236 /* TryStatement */:
                     bindTryStatement(node);
                     break;
-                case 232 /* SwitchStatement */:
+                case 233 /* SwitchStatement */:
                     bindSwitchStatement(node);
                     break;
-                case 246 /* CaseBlock */:
+                case 247 /* CaseBlock */:
                     bindCaseBlock(node);
                     break;
-                case 271 /* CaseClause */:
+                case 272 /* CaseClause */:
                     bindCaseClause(node);
                     break;
-                case 233 /* LabeledStatement */:
+                case 234 /* LabeledStatement */:
                     bindLabeledStatement(node);
                     break;
-                case 202 /* PrefixUnaryExpression */:
+                case 203 /* PrefixUnaryExpression */:
                     bindPrefixUnaryExpressionFlow(node);
                     break;
-                case 203 /* PostfixUnaryExpression */:
+                case 204 /* PostfixUnaryExpression */:
                     bindPostfixUnaryExpressionFlow(node);
                     break;
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     bindBinaryExpressionFlow(node);
                     break;
-                case 198 /* DeleteExpression */:
+                case 199 /* DeleteExpression */:
                     bindDeleteExpressionFlow(node);
                     break;
-                case 205 /* ConditionalExpression */:
+                case 206 /* ConditionalExpression */:
                     bindConditionalExpressionFlow(node);
                     break;
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     bindVariableDeclarationFlow(node);
                     break;
-                case 191 /* CallExpression */:
+                case 192 /* CallExpression */:
                     bindCallExpressionFlow(node);
                     break;
-                case 309 /* JSDocTypedefTag */:
-                case 302 /* JSDocCallbackTag */:
+                case 311 /* JSDocTypedefTag */:
+                case 304 /* JSDocCallbackTag */:
                     bindJSDocTypeAlias(node);
                     break;
                 // In source files and blocks, bind functions first to match hoisting that occurs at runtime
-                case 284 /* SourceFile */: {
+                case 285 /* SourceFile */: {
                     bindEachFunctionsFirst(node.statements);
                     bind(node.endOfFileToken);
                     break;
                 }
-                case 218 /* Block */:
-                case 245 /* ModuleBlock */:
+                case 219 /* Block */:
+                case 246 /* ModuleBlock */:
                     bindEachFunctionsFirst(node.statements);
                     break;
                 default:
@@ -28026,26 +28452,26 @@ var ts;
         }
         function isNarrowingExpression(expr) {
             switch (expr.kind) {
-                case 72 /* Identifier */:
-                case 100 /* ThisKeyword */:
-                case 189 /* PropertyAccessExpression */:
-                case 190 /* ElementAccessExpression */:
+                case 73 /* Identifier */:
+                case 101 /* ThisKeyword */:
+                case 190 /* PropertyAccessExpression */:
+                case 191 /* ElementAccessExpression */:
                     return isNarrowableReference(expr);
-                case 191 /* CallExpression */:
+                case 192 /* CallExpression */:
                     return hasNarrowableArgument(expr);
-                case 195 /* ParenthesizedExpression */:
+                case 196 /* ParenthesizedExpression */:
                     return isNarrowingExpression(expr.expression);
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return isNarrowingBinaryExpression(expr);
-                case 202 /* PrefixUnaryExpression */:
+                case 203 /* PrefixUnaryExpression */:
                     return expr.operator === 52 /* ExclamationToken */ && isNarrowingExpression(expr.operand);
-                case 199 /* TypeOfExpression */:
+                case 200 /* TypeOfExpression */:
                     return isNarrowingExpression(expr.expression);
             }
             return false;
         }
         function isNarrowableReference(expr) {
-            return expr.kind === 72 /* Identifier */ || expr.kind === 100 /* ThisKeyword */ || expr.kind === 98 /* SuperKeyword */ ||
+            return expr.kind === 73 /* Identifier */ || expr.kind === 101 /* ThisKeyword */ || expr.kind === 99 /* SuperKeyword */ ||
                 (ts.isPropertyAccessExpression(expr) || ts.isNonNullExpression(expr) || ts.isParenthesizedExpression(expr)) && isNarrowableReference(expr.expression) ||
                 ts.isElementAccessExpression(expr) && expr.argumentExpression &&
                     (ts.isStringLiteral(expr.argumentExpression) || ts.isNumericLiteral(expr.argumentExpression)) &&
@@ -28060,7 +28486,7 @@ var ts;
                     }
                 }
             }
-            if (expr.expression.kind === 189 /* PropertyAccessExpression */ &&
+            if (expr.expression.kind === 190 /* PropertyAccessExpression */ &&
                 isNarrowableReference(expr.expression.expression)) {
                 return true;
             }
@@ -28074,7 +28500,7 @@ var ts;
         }
         function isNarrowingBinaryExpression(expr) {
             switch (expr.operatorToken.kind) {
-                case 59 /* EqualsToken */:
+                case 60 /* EqualsToken */:
                     return isNarrowableReference(expr.left);
                 case 33 /* EqualsEqualsToken */:
                 case 34 /* ExclamationEqualsToken */:
@@ -28082,9 +28508,9 @@ var ts;
                 case 36 /* ExclamationEqualsEqualsToken */:
                     return isNarrowableOperand(expr.left) || isNarrowableOperand(expr.right) ||
                         isNarrowingTypeofOperands(expr.right, expr.left) || isNarrowingTypeofOperands(expr.left, expr.right);
-                case 94 /* InstanceOfKeyword */:
+                case 95 /* InstanceOfKeyword */:
                     return isNarrowableOperand(expr.left);
-                case 93 /* InKeyword */:
+                case 94 /* InKeyword */:
                     return isNarrowableInOperands(expr.left, expr.right);
                 case 27 /* CommaToken */:
                     return isNarrowingExpression(expr.right);
@@ -28093,11 +28519,11 @@ var ts;
         }
         function isNarrowableOperand(expr) {
             switch (expr.kind) {
-                case 195 /* ParenthesizedExpression */:
+                case 196 /* ParenthesizedExpression */:
                     return isNarrowableOperand(expr.expression);
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     switch (expr.operatorToken.kind) {
-                        case 59 /* EqualsToken */:
+                        case 60 /* EqualsToken */:
                             return isNarrowableOperand(expr.left);
                         case 27 /* CommaToken */:
                             return isNarrowableOperand(expr.right);
@@ -28134,8 +28560,8 @@ var ts;
             if (!expression) {
                 return flags & 32 /* TrueCondition */ ? antecedent : unreachableFlow;
             }
-            if (expression.kind === 102 /* TrueKeyword */ && flags & 64 /* FalseCondition */ ||
-                expression.kind === 87 /* FalseKeyword */ && flags & 32 /* TrueCondition */) {
+            if (expression.kind === 103 /* TrueKeyword */ && flags & 64 /* FalseCondition */ ||
+                expression.kind === 88 /* FalseKeyword */ && flags & 32 /* TrueCondition */) {
                 return unreachableFlow;
             }
             if (!isNarrowingExpression(expression)) {
@@ -28173,33 +28599,33 @@ var ts;
         function isStatementCondition(node) {
             var parent = node.parent;
             switch (parent.kind) {
-                case 222 /* IfStatement */:
-                case 224 /* WhileStatement */:
-                case 223 /* DoStatement */:
+                case 223 /* IfStatement */:
+                case 225 /* WhileStatement */:
+                case 224 /* DoStatement */:
                     return parent.expression === node;
-                case 225 /* ForStatement */:
-                case 205 /* ConditionalExpression */:
+                case 226 /* ForStatement */:
+                case 206 /* ConditionalExpression */:
                     return parent.condition === node;
             }
             return false;
         }
         function isLogicalExpression(node) {
             while (true) {
-                if (node.kind === 195 /* ParenthesizedExpression */) {
+                if (node.kind === 196 /* ParenthesizedExpression */) {
                     node = node.expression;
                 }
-                else if (node.kind === 202 /* PrefixUnaryExpression */ && node.operator === 52 /* ExclamationToken */) {
+                else if (node.kind === 203 /* PrefixUnaryExpression */ && node.operator === 52 /* ExclamationToken */) {
                     node = node.operand;
                 }
                 else {
-                    return node.kind === 204 /* BinaryExpression */ && (node.operatorToken.kind === 54 /* AmpersandAmpersandToken */ ||
+                    return node.kind === 205 /* BinaryExpression */ && (node.operatorToken.kind === 54 /* AmpersandAmpersandToken */ ||
                         node.operatorToken.kind === 55 /* BarBarToken */);
                 }
             }
         }
         function isTopLevelLogicalExpression(node) {
-            while (node.parent.kind === 195 /* ParenthesizedExpression */ ||
-                node.parent.kind === 202 /* PrefixUnaryExpression */ &&
+            while (node.parent.kind === 196 /* ParenthesizedExpression */ ||
+                node.parent.kind === 203 /* PrefixUnaryExpression */ &&
                     node.parent.operator === 52 /* ExclamationToken */) {
                 node = node.parent;
             }
@@ -28241,7 +28667,7 @@ var ts;
         }
         function bindDoStatement(node) {
             var preDoLabel = createLoopLabel();
-            var enclosingLabeledStatement = node.parent.kind === 233 /* LabeledStatement */
+            var enclosingLabeledStatement = node.parent.kind === 234 /* LabeledStatement */
                 ? ts.lastOrUndefined(activeLabels)
                 : undefined;
             // if do statement is wrapped in labeled statement then target labels for break/continue with or without
@@ -28275,13 +28701,13 @@ var ts;
             var postLoopLabel = createBranchLabel();
             addAntecedent(preLoopLabel, currentFlow);
             currentFlow = preLoopLabel;
-            if (node.kind === 227 /* ForOfStatement */) {
+            if (node.kind === 228 /* ForOfStatement */) {
                 bind(node.awaitModifier);
             }
             bind(node.expression);
             addAntecedent(postLoopLabel, currentFlow);
             bind(node.initializer);
-            if (node.initializer.kind !== 238 /* VariableDeclarationList */) {
+            if (node.initializer.kind !== 239 /* VariableDeclarationList */) {
                 bindAssignmentTargetFlow(node.initializer);
             }
             bindIterativeStatement(node.statement, postLoopLabel, preLoopLabel);
@@ -28303,7 +28729,7 @@ var ts;
         }
         function bindReturnOrThrow(node) {
             bind(node.expression);
-            if (node.kind === 230 /* ReturnStatement */) {
+            if (node.kind === 231 /* ReturnStatement */) {
                 hasExplicitReturn = true;
                 if (currentReturnTarget) {
                     addAntecedent(currentReturnTarget, currentFlow);
@@ -28323,7 +28749,7 @@ var ts;
             return undefined;
         }
         function bindBreakOrContinueFlow(node, breakTarget, continueTarget) {
-            var flowLabel = node.kind === 229 /* BreakStatement */ ? breakTarget : continueTarget;
+            var flowLabel = node.kind === 230 /* BreakStatement */ ? breakTarget : continueTarget;
             if (flowLabel) {
                 addAntecedent(flowLabel, currentFlow);
                 currentFlow = unreachableFlow;
@@ -28451,7 +28877,7 @@ var ts;
             preSwitchCaseFlow = currentFlow;
             bind(node.caseBlock);
             addAntecedent(postSwitchLabel, currentFlow);
-            var hasDefault = ts.forEach(node.caseBlock.clauses, function (c) { return c.kind === 272 /* DefaultClause */; });
+            var hasDefault = ts.forEach(node.caseBlock.clauses, function (c) { return c.kind === 273 /* DefaultClause */; });
             // We mark a switch statement as possibly exhaustive if it has no default clause and if all
             // case clauses have unreachable end points (e.g. they all return).
             node.possiblyExhaustive = !hasDefault && !postSwitchLabel.antecedents;
@@ -28518,14 +28944,14 @@ var ts;
             if (!activeLabel.referenced && !options.allowUnusedLabels) {
                 errorOrSuggestionOnNode(ts.unusedLabelIsError(options), node.label, ts.Diagnostics.Unused_label);
             }
-            if (!node.statement || node.statement.kind !== 223 /* DoStatement */) {
+            if (!node.statement || node.statement.kind !== 224 /* DoStatement */) {
                 // do statement sets current flow inside bindDoStatement
                 addAntecedent(postStatementLabel, currentFlow);
                 currentFlow = finishFlowLabel(postStatementLabel);
             }
         }
         function bindDestructuringTargetFlow(node) {
-            if (node.kind === 204 /* BinaryExpression */ && node.operatorToken.kind === 59 /* EqualsToken */) {
+            if (node.kind === 205 /* BinaryExpression */ && node.operatorToken.kind === 60 /* EqualsToken */) {
                 bindAssignmentTargetFlow(node.left);
             }
             else {
@@ -28536,10 +28962,10 @@ var ts;
             if (isNarrowableReference(node)) {
                 currentFlow = createFlowAssignment(currentFlow, node);
             }
-            else if (node.kind === 187 /* ArrayLiteralExpression */) {
+            else if (node.kind === 188 /* ArrayLiteralExpression */) {
                 for (var _i = 0, _a = node.elements; _i < _a.length; _i++) {
                     var e = _a[_i];
-                    if (e.kind === 208 /* SpreadElement */) {
+                    if (e.kind === 209 /* SpreadElement */) {
                         bindAssignmentTargetFlow(e.expression);
                     }
                     else {
@@ -28547,16 +28973,16 @@ var ts;
                     }
                 }
             }
-            else if (node.kind === 188 /* ObjectLiteralExpression */) {
+            else if (node.kind === 189 /* ObjectLiteralExpression */) {
                 for (var _b = 0, _c = node.properties; _b < _c.length; _b++) {
                     var p = _c[_b];
-                    if (p.kind === 275 /* PropertyAssignment */) {
+                    if (p.kind === 276 /* PropertyAssignment */) {
                         bindDestructuringTargetFlow(p.initializer);
                     }
-                    else if (p.kind === 276 /* ShorthandPropertyAssignment */) {
+                    else if (p.kind === 277 /* ShorthandPropertyAssignment */) {
                         bindAssignmentTargetFlow(p.name);
                     }
-                    else if (p.kind === 277 /* SpreadAssignment */) {
+                    else if (p.kind === 278 /* SpreadAssignment */) {
                         bindAssignmentTargetFlow(p.expression);
                     }
                 }
@@ -28612,7 +29038,7 @@ var ts;
                 bindEachChild(node);
                 if (ts.isAssignmentOperator(operator) && !ts.isAssignmentTarget(node)) {
                     bindAssignmentTargetFlow(node.left);
-                    if (operator === 59 /* EqualsToken */ && node.left.kind === 190 /* ElementAccessExpression */) {
+                    if (operator === 60 /* EqualsToken */ && node.left.kind === 191 /* ElementAccessExpression */) {
                         var elementAccess = node.left;
                         if (isNarrowableOperand(elementAccess.expression)) {
                             currentFlow = createFlowArrayMutation(currentFlow, node);
@@ -28623,7 +29049,7 @@ var ts;
         }
         function bindDeleteExpressionFlow(node) {
             bindEachChild(node);
-            if (node.expression.kind === 189 /* PropertyAccessExpression */) {
+            if (node.expression.kind === 190 /* PropertyAccessExpression */) {
                 bindAssignmentTargetFlow(node.expression);
             }
         }
@@ -28671,10 +29097,10 @@ var ts;
             // an immediately invoked function expression (IIFE). Initialize the flowNode property to
             // the current control flow (which includes evaluation of the IIFE arguments).
             var expr = node.expression;
-            while (expr.kind === 195 /* ParenthesizedExpression */) {
+            while (expr.kind === 196 /* ParenthesizedExpression */) {
                 expr = expr.expression;
             }
-            if (expr.kind === 196 /* FunctionExpression */ || expr.kind === 197 /* ArrowFunction */) {
+            if (expr.kind === 197 /* FunctionExpression */ || expr.kind === 198 /* ArrowFunction */) {
                 bindEach(node.typeArguments);
                 bindEach(node.arguments);
                 bind(node.expression);
@@ -28682,7 +29108,7 @@ var ts;
             else {
                 bindEachChild(node);
             }
-            if (node.expression.kind === 189 /* PropertyAccessExpression */) {
+            if (node.expression.kind === 190 /* PropertyAccessExpression */) {
                 var propertyAccess = node.expression;
                 if (isNarrowableOperand(propertyAccess.expression) && ts.isPushOrUnshiftIdentifier(propertyAccess.name)) {
                     currentFlow = createFlowArrayMutation(currentFlow, node);
@@ -28691,54 +29117,54 @@ var ts;
         }
         function getContainerFlags(node) {
             switch (node.kind) {
-                case 209 /* ClassExpression */:
-                case 240 /* ClassDeclaration */:
-                case 243 /* EnumDeclaration */:
-                case 188 /* ObjectLiteralExpression */:
-                case 168 /* TypeLiteral */:
-                case 297 /* JSDocTypeLiteral */:
-                case 268 /* JsxAttributes */:
+                case 210 /* ClassExpression */:
+                case 241 /* ClassDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 189 /* ObjectLiteralExpression */:
+                case 169 /* TypeLiteral */:
+                case 298 /* JSDocTypeLiteral */:
+                case 269 /* JsxAttributes */:
                     return 1 /* IsContainer */;
-                case 241 /* InterfaceDeclaration */:
+                case 242 /* InterfaceDeclaration */:
                     return 1 /* IsContainer */ | 64 /* IsInterface */;
-                case 244 /* ModuleDeclaration */:
-                case 242 /* TypeAliasDeclaration */:
-                case 181 /* MappedType */:
+                case 245 /* ModuleDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
+                case 182 /* MappedType */:
                     return 1 /* IsContainer */ | 32 /* HasLocals */;
-                case 284 /* SourceFile */:
+                case 285 /* SourceFile */:
                     return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */;
-                case 156 /* MethodDeclaration */:
+                case 157 /* MethodDeclaration */:
                     if (ts.isObjectLiteralOrClassExpressionMethod(node)) {
                         return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */ | 8 /* IsFunctionLike */ | 128 /* IsObjectLiteralOrClassExpressionMethod */;
                     }
                 // falls through
-                case 157 /* Constructor */:
-                case 239 /* FunctionDeclaration */:
-                case 155 /* MethodSignature */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
-                case 160 /* CallSignature */:
-                case 298 /* JSDocSignature */:
-                case 294 /* JSDocFunctionType */:
-                case 165 /* FunctionType */:
-                case 161 /* ConstructSignature */:
-                case 162 /* IndexSignature */:
-                case 166 /* ConstructorType */:
+                case 158 /* Constructor */:
+                case 240 /* FunctionDeclaration */:
+                case 156 /* MethodSignature */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
+                case 161 /* CallSignature */:
+                case 299 /* JSDocSignature */:
+                case 295 /* JSDocFunctionType */:
+                case 166 /* FunctionType */:
+                case 162 /* ConstructSignature */:
+                case 163 /* IndexSignature */:
+                case 167 /* ConstructorType */:
                     return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */ | 8 /* IsFunctionLike */;
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
                     return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */ | 8 /* IsFunctionLike */ | 16 /* IsFunctionExpression */;
-                case 245 /* ModuleBlock */:
+                case 246 /* ModuleBlock */:
                     return 4 /* IsControlFlowContainer */;
-                case 154 /* PropertyDeclaration */:
+                case 155 /* PropertyDeclaration */:
                     return node.initializer ? 4 /* IsControlFlowContainer */ : 0;
-                case 274 /* CatchClause */:
-                case 225 /* ForStatement */:
-                case 226 /* ForInStatement */:
-                case 227 /* ForOfStatement */:
-                case 246 /* CaseBlock */:
+                case 275 /* CatchClause */:
+                case 226 /* ForStatement */:
+                case 227 /* ForInStatement */:
+                case 228 /* ForOfStatement */:
+                case 247 /* CaseBlock */:
                     return 2 /* IsBlockScopedContainer */;
-                case 218 /* Block */:
+                case 219 /* Block */:
                     // do not treat blocks directly inside a function as a block-scoped-container.
                     // Locals that reside in this block should go to the function locals. Otherwise 'x'
                     // would not appear to be a redeclaration of a block scoped local in the following
@@ -28771,45 +29197,45 @@ var ts;
                 // members are declared (for example, a member of a class will go into a specific
                 // symbol table depending on if it is static or not). We defer to specialized
                 // handlers to take care of declaring these child members.
-                case 244 /* ModuleDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     return declareModuleMember(node, symbolFlags, symbolExcludes);
-                case 284 /* SourceFile */:
+                case 285 /* SourceFile */:
                     return declareSourceFileMember(node, symbolFlags, symbolExcludes);
-                case 209 /* ClassExpression */:
-                case 240 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
+                case 241 /* ClassDeclaration */:
                     return declareClassMember(node, symbolFlags, symbolExcludes);
-                case 243 /* EnumDeclaration */:
+                case 244 /* EnumDeclaration */:
                     return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);
-                case 168 /* TypeLiteral */:
-                case 297 /* JSDocTypeLiteral */:
-                case 188 /* ObjectLiteralExpression */:
-                case 241 /* InterfaceDeclaration */:
-                case 268 /* JsxAttributes */:
+                case 169 /* TypeLiteral */:
+                case 298 /* JSDocTypeLiteral */:
+                case 189 /* ObjectLiteralExpression */:
+                case 242 /* InterfaceDeclaration */:
+                case 269 /* JsxAttributes */:
                     // Interface/Object-types always have their children added to the 'members' of
                     // their container. They are only accessible through an instance of their
                     // container, and are never in scope otherwise (even inside the body of the
                     // object / type / interface declaring them). An exception is type parameters,
                     // which are in scope without qualification (similar to 'locals').
                     return declareSymbol(container.symbol.members, container.symbol, node, symbolFlags, symbolExcludes);
-                case 165 /* FunctionType */:
-                case 166 /* ConstructorType */:
-                case 160 /* CallSignature */:
-                case 161 /* ConstructSignature */:
-                case 298 /* JSDocSignature */:
-                case 162 /* IndexSignature */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
-                case 157 /* Constructor */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
-                case 294 /* JSDocFunctionType */:
-                case 309 /* JSDocTypedefTag */:
-                case 302 /* JSDocCallbackTag */:
-                case 242 /* TypeAliasDeclaration */:
-                case 181 /* MappedType */:
+                case 166 /* FunctionType */:
+                case 167 /* ConstructorType */:
+                case 161 /* CallSignature */:
+                case 162 /* ConstructSignature */:
+                case 299 /* JSDocSignature */:
+                case 163 /* IndexSignature */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
+                case 158 /* Constructor */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
+                case 295 /* JSDocFunctionType */:
+                case 311 /* JSDocTypedefTag */:
+                case 304 /* JSDocCallbackTag */:
+                case 243 /* TypeAliasDeclaration */:
+                case 182 /* MappedType */:
                     // All the children of these container types are never visible through another
                     // symbol (i.e. through another symbol's 'exports' or 'members').  Instead,
                     // they're only accessed 'lexically' (i.e. from code that exists underneath
@@ -28830,16 +29256,8 @@ var ts;
                 : declareSymbol(file.locals, /*parent*/ undefined, node, symbolFlags, symbolExcludes);
         }
         function hasExportDeclarations(node) {
-            var body = node.kind === 284 /* SourceFile */ ? node : node.body;
-            if (body && (body.kind === 284 /* SourceFile */ || body.kind === 245 /* ModuleBlock */)) {
-                for (var _i = 0, _a = body.statements; _i < _a.length; _i++) {
-                    var stat = _a[_i];
-                    if (stat.kind === 255 /* ExportDeclaration */ || stat.kind === 254 /* ExportAssignment */) {
-                        return true;
-                    }
-                }
-            }
-            return false;
+            var body = ts.isSourceFile(node) ? node : ts.tryCast(node.body, ts.isModuleBlock);
+            return !!body && body.statements.some(function (s) { return ts.isExportDeclaration(s) || ts.isExportAssignment(s); });
         }
         function setExportContextFlag(node) {
             // A declaration source file or ambient module declaration that contains no export declarations (but possibly regular
@@ -28918,7 +29336,7 @@ var ts;
                 var seen = ts.createUnderscoreEscapedMap();
                 for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
                     var prop = _a[_i];
-                    if (prop.kind === 277 /* SpreadAssignment */ || prop.name.kind !== 72 /* Identifier */) {
+                    if (prop.kind === 278 /* SpreadAssignment */ || prop.name.kind !== 73 /* Identifier */) {
                         continue;
                     }
                     var identifier = prop.name;
@@ -28930,7 +29348,7 @@ var ts;
                     //    c.IsAccessorDescriptor(previous) is true and IsDataDescriptor(propId.descriptor) is true.
                     //    d.IsAccessorDescriptor(previous) is true and IsAccessorDescriptor(propId.descriptor) is true
                     // and either both previous and propId.descriptor have[[Get]] fields or both previous and propId.descriptor have[[Set]] fields
-                    var currentKind = prop.kind === 275 /* PropertyAssignment */ || prop.kind === 276 /* ShorthandPropertyAssignment */ || prop.kind === 156 /* MethodDeclaration */
+                    var currentKind = prop.kind === 276 /* PropertyAssignment */ || prop.kind === 277 /* ShorthandPropertyAssignment */ || prop.kind === 157 /* MethodDeclaration */
                         ? 1 /* Property */
                         : 2 /* Accessor */;
                     var existingKind = seen.get(identifier.escapedText);
@@ -28962,10 +29380,10 @@ var ts;
         }
         function bindBlockScopedDeclaration(node, symbolFlags, symbolExcludes) {
             switch (blockScopeContainer.kind) {
-                case 244 /* ModuleDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     declareModuleMember(node, symbolFlags, symbolExcludes);
                     break;
-                case 284 /* SourceFile */:
+                case 285 /* SourceFile */:
                     if (ts.isExternalOrCommonJsModule(container)) {
                         declareModuleMember(node, symbolFlags, symbolExcludes);
                         break;
@@ -28996,7 +29414,7 @@ var ts;
                 currentFlow = { flags: 2 /* Start */ };
                 parent = typeAlias;
                 bind(typeAlias.typeExpression);
-                if (!typeAlias.fullName || typeAlias.fullName.kind === 72 /* Identifier */) {
+                if (!typeAlias.fullName || typeAlias.fullName.kind === 73 /* Identifier */) {
                     parent = typeAlias.parent;
                     bindBlockScopedDeclaration(typeAlias, 524288 /* TypeAlias */, 67897832 /* TypeAliasExcludes */);
                 }
@@ -29014,8 +29432,8 @@ var ts;
         // check for reserved words used as identifiers in strict mode code.
         function checkStrictModeIdentifier(node) {
             if (inStrictMode &&
-                node.originalKeywordKind >= 109 /* FirstFutureReservedWord */ &&
-                node.originalKeywordKind <= 117 /* LastFutureReservedWord */ &&
+                node.originalKeywordKind >= 110 /* FirstFutureReservedWord */ &&
+                node.originalKeywordKind <= 118 /* LastFutureReservedWord */ &&
                 !ts.isIdentifierName(node) &&
                 !(node.flags & 4194304 /* Ambient */)) {
                 // Report error only if there are no parse errors in file
@@ -29051,7 +29469,7 @@ var ts;
         }
         function checkStrictModeDeleteExpression(node) {
             // Grammar checking
-            if (inStrictMode && node.expression.kind === 72 /* Identifier */) {
+            if (inStrictMode && node.expression.kind === 73 /* Identifier */) {
                 // When a delete operator occurs within strict mode code, a SyntaxError is thrown if its
                 // UnaryExpression is a direct reference to a variable, function argument, or function name
                 var span = ts.getErrorSpanForNode(file, node.expression);
@@ -29062,7 +29480,7 @@ var ts;
             return ts.isIdentifier(node) && (node.escapedText === "eval" || node.escapedText === "arguments");
         }
         function checkStrictModeEvalOrArguments(contextNode, name) {
-            if (name && name.kind === 72 /* Identifier */) {
+            if (name && name.kind === 73 /* Identifier */) {
                 var identifier = name;
                 if (isEvalOrArgumentsIdentifier(identifier)) {
                     // We check first if the name is inside class declaration or class expression; if so give explicit message
@@ -29103,8 +29521,8 @@ var ts;
         function checkStrictModeFunctionDeclaration(node) {
             if (languageVersion < 2 /* ES2015 */) {
                 // Report error if function is not top level function declaration
-                if (blockScopeContainer.kind !== 284 /* SourceFile */ &&
-                    blockScopeContainer.kind !== 244 /* ModuleDeclaration */ &&
+                if (blockScopeContainer.kind !== 285 /* SourceFile */ &&
+                    blockScopeContainer.kind !== 245 /* ModuleDeclaration */ &&
                     !ts.isFunctionLike(blockScopeContainer)) {
                     // We check first if the name is inside class declaration or class expression; if so give explicit message
                     // otherwise report generic error message.
@@ -29199,7 +29617,7 @@ var ts;
             // the current 'container' node when it changes. This helps us know which symbol table
             // a local should go into for example. Since terminal nodes are known not to have
             // children, as an optimization we don't process those.
-            if (node.kind > 147 /* LastToken */) {
+            if (node.kind > 148 /* LastToken */) {
                 var saveParent = parent;
                 parent = node;
                 var containerFlags = getContainerFlags(node);
@@ -29261,7 +29679,7 @@ var ts;
         function bindWorker(node) {
             switch (node.kind) {
                 /* Strict mode checks */
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     // for typedef type names with namespaces, bind the new jsdoc type symbol here
                     // because it requires all containing namespaces to be in effect, namely the
                     // current "blockScopeContainer" needs to be set to its immediate namespace parent.
@@ -29274,13 +29692,13 @@ var ts;
                         break;
                     }
                 // falls through
-                case 100 /* ThisKeyword */:
-                    if (currentFlow && (ts.isExpression(node) || parent.kind === 276 /* ShorthandPropertyAssignment */)) {
+                case 101 /* ThisKeyword */:
+                    if (currentFlow && (ts.isExpression(node) || parent.kind === 277 /* ShorthandPropertyAssignment */)) {
                         node.flowNode = currentFlow;
                     }
                     return checkStrictModeIdentifier(node);
-                case 189 /* PropertyAccessExpression */:
-                case 190 /* ElementAccessExpression */:
+                case 190 /* PropertyAccessExpression */:
+                case 191 /* ElementAccessExpression */:
                     if (currentFlow && isNarrowableReference(node)) {
                         node.flowNode = currentFlow;
                     }
@@ -29294,7 +29712,7 @@ var ts;
                         declareSymbol(file.locals, /*parent*/ undefined, node.expression, 1 /* FunctionScopedVariable */ | 134217728 /* ModuleExports */, 67220414 /* FunctionScopedVariableExcludes */);
                     }
                     break;
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     var specialKind = ts.getAssignmentDeclarationKind(node);
                     switch (specialKind) {
                         case 1 /* ExportsProperty */:
@@ -29322,76 +29740,76 @@ var ts;
                             ts.Debug.fail("Unknown binary expression special property assignment kind");
                     }
                     return checkStrictModeBinaryExpression(node);
-                case 274 /* CatchClause */:
+                case 275 /* CatchClause */:
                     return checkStrictModeCatchClause(node);
-                case 198 /* DeleteExpression */:
+                case 199 /* DeleteExpression */:
                     return checkStrictModeDeleteExpression(node);
                 case 8 /* NumericLiteral */:
                     return checkStrictModeNumericLiteral(node);
-                case 203 /* PostfixUnaryExpression */:
+                case 204 /* PostfixUnaryExpression */:
                     return checkStrictModePostfixUnaryExpression(node);
-                case 202 /* PrefixUnaryExpression */:
+                case 203 /* PrefixUnaryExpression */:
                     return checkStrictModePrefixUnaryExpression(node);
-                case 231 /* WithStatement */:
+                case 232 /* WithStatement */:
                     return checkStrictModeWithStatement(node);
-                case 233 /* LabeledStatement */:
+                case 234 /* LabeledStatement */:
                     return checkStrictModeLabeledStatement(node);
-                case 178 /* ThisType */:
+                case 179 /* ThisType */:
                     seenThisKeyword = true;
                     return;
-                case 163 /* TypePredicate */:
+                case 164 /* TypePredicate */:
                     break; // Binding the children will handle everything
-                case 150 /* TypeParameter */:
+                case 151 /* TypeParameter */:
                     return bindTypeParameter(node);
-                case 151 /* Parameter */:
+                case 152 /* Parameter */:
                     return bindParameter(node);
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     return bindVariableDeclarationOrBindingElement(node);
-                case 186 /* BindingElement */:
+                case 187 /* BindingElement */:
                     node.flowNode = currentFlow;
                     return bindVariableDeclarationOrBindingElement(node);
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
                     return bindPropertyWorker(node);
-                case 275 /* PropertyAssignment */:
-                case 276 /* ShorthandPropertyAssignment */:
+                case 276 /* PropertyAssignment */:
+                case 277 /* ShorthandPropertyAssignment */:
                     return bindPropertyOrMethodOrAccessor(node, 4 /* Property */, 0 /* PropertyExcludes */);
-                case 278 /* EnumMember */:
+                case 279 /* EnumMember */:
                     return bindPropertyOrMethodOrAccessor(node, 8 /* EnumMember */, 68008959 /* EnumMemberExcludes */);
-                case 160 /* CallSignature */:
-                case 161 /* ConstructSignature */:
-                case 162 /* IndexSignature */:
+                case 161 /* CallSignature */:
+                case 162 /* ConstructSignature */:
+                case 163 /* IndexSignature */:
                     return declareSymbolAndAddToSymbolTable(node, 131072 /* Signature */, 0 /* None */);
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
                     // If this is an ObjectLiteralExpression method, then it sits in the same space
                     // as other properties in the object literal.  So we use SymbolFlags.PropertyExcludes
                     // so that it will conflict with any other object literal members with the same
                     // name.
                     return bindPropertyOrMethodOrAccessor(node, 8192 /* Method */ | (node.questionToken ? 16777216 /* Optional */ : 0 /* None */), ts.isObjectLiteralMethod(node) ? 0 /* PropertyExcludes */ : 67212223 /* MethodExcludes */);
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     return bindFunctionDeclaration(node);
-                case 157 /* Constructor */:
+                case 158 /* Constructor */:
                     return declareSymbolAndAddToSymbolTable(node, 16384 /* Constructor */, /*symbolExcludes:*/ 0 /* None */);
-                case 158 /* GetAccessor */:
+                case 159 /* GetAccessor */:
                     return bindPropertyOrMethodOrAccessor(node, 32768 /* GetAccessor */, 67154879 /* GetAccessorExcludes */);
-                case 159 /* SetAccessor */:
+                case 160 /* SetAccessor */:
                     return bindPropertyOrMethodOrAccessor(node, 65536 /* SetAccessor */, 67187647 /* SetAccessorExcludes */);
-                case 165 /* FunctionType */:
-                case 294 /* JSDocFunctionType */:
-                case 298 /* JSDocSignature */:
-                case 166 /* ConstructorType */:
+                case 166 /* FunctionType */:
+                case 295 /* JSDocFunctionType */:
+                case 299 /* JSDocSignature */:
+                case 167 /* ConstructorType */:
                     return bindFunctionOrConstructorType(node);
-                case 168 /* TypeLiteral */:
-                case 297 /* JSDocTypeLiteral */:
-                case 181 /* MappedType */:
+                case 169 /* TypeLiteral */:
+                case 298 /* JSDocTypeLiteral */:
+                case 182 /* MappedType */:
                     return bindAnonymousTypeWorker(node);
-                case 188 /* ObjectLiteralExpression */:
+                case 189 /* ObjectLiteralExpression */:
                     return bindObjectLiteralExpression(node);
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
                     return bindFunctionExpression(node);
-                case 191 /* CallExpression */:
+                case 192 /* CallExpression */:
                     var assignmentKind = ts.getAssignmentDeclarationKind(node);
                     switch (assignmentKind) {
                         case 7 /* ObjectDefinePropertyValue */:
@@ -29410,64 +29828,64 @@ var ts;
                     }
                     break;
                 // Members of classes, interfaces, and modules
-                case 209 /* ClassExpression */:
-                case 240 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
+                case 241 /* ClassDeclaration */:
                     // All classes are automatically in strict mode in ES6.
                     inStrictMode = true;
                     return bindClassLikeDeclaration(node);
-                case 241 /* InterfaceDeclaration */:
+                case 242 /* InterfaceDeclaration */:
                     return bindBlockScopedDeclaration(node, 64 /* Interface */, 67897736 /* InterfaceExcludes */);
-                case 242 /* TypeAliasDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
                     return bindBlockScopedDeclaration(node, 524288 /* TypeAlias */, 67897832 /* TypeAliasExcludes */);
-                case 243 /* EnumDeclaration */:
+                case 244 /* EnumDeclaration */:
                     return bindEnumDeclaration(node);
-                case 244 /* ModuleDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     return bindModuleDeclaration(node);
                 // Jsx-attributes
-                case 268 /* JsxAttributes */:
+                case 269 /* JsxAttributes */:
                     return bindJsxAttributes(node);
-                case 267 /* JsxAttribute */:
+                case 268 /* JsxAttribute */:
                     return bindJsxAttribute(node, 4 /* Property */, 0 /* PropertyExcludes */);
                 // Imports and exports
-                case 248 /* ImportEqualsDeclaration */:
-                case 251 /* NamespaceImport */:
-                case 253 /* ImportSpecifier */:
-                case 257 /* ExportSpecifier */:
+                case 249 /* ImportEqualsDeclaration */:
+                case 252 /* NamespaceImport */:
+                case 254 /* ImportSpecifier */:
+                case 258 /* ExportSpecifier */:
                     return declareSymbolAndAddToSymbolTable(node, 2097152 /* Alias */, 2097152 /* AliasExcludes */);
-                case 247 /* NamespaceExportDeclaration */:
+                case 248 /* NamespaceExportDeclaration */:
                     return bindNamespaceExportDeclaration(node);
-                case 250 /* ImportClause */:
+                case 251 /* ImportClause */:
                     return bindImportClause(node);
-                case 255 /* ExportDeclaration */:
+                case 256 /* ExportDeclaration */:
                     return bindExportDeclaration(node);
-                case 254 /* ExportAssignment */:
+                case 255 /* ExportAssignment */:
                     return bindExportAssignment(node);
-                case 284 /* SourceFile */:
+                case 285 /* SourceFile */:
                     updateStrictModeStatementList(node.statements);
                     return bindSourceFileIfExternalModule();
-                case 218 /* Block */:
+                case 219 /* Block */:
                     if (!ts.isFunctionLike(node.parent)) {
                         return;
                     }
                 // falls through
-                case 245 /* ModuleBlock */:
+                case 246 /* ModuleBlock */:
                     return updateStrictModeStatementList(node.statements);
-                case 304 /* JSDocParameterTag */:
-                    if (node.parent.kind === 298 /* JSDocSignature */) {
+                case 306 /* JSDocParameterTag */:
+                    if (node.parent.kind === 299 /* JSDocSignature */) {
                         return bindParameter(node);
                     }
-                    if (node.parent.kind !== 297 /* JSDocTypeLiteral */) {
+                    if (node.parent.kind !== 298 /* JSDocTypeLiteral */) {
                         break;
                     }
                 // falls through
-                case 310 /* JSDocPropertyTag */:
+                case 312 /* JSDocPropertyTag */:
                     var propTag = node;
-                    var flags = propTag.isBracketed || propTag.typeExpression && propTag.typeExpression.type.kind === 293 /* JSDocOptionalType */ ?
+                    var flags = propTag.isBracketed || propTag.typeExpression && propTag.typeExpression.type.kind === 294 /* JSDocOptionalType */ ?
                         4 /* Property */ | 16777216 /* Optional */ :
                         4 /* Property */;
                     return declareSymbolAndAddToSymbolTable(propTag, flags, 0 /* PropertyExcludes */);
-                case 309 /* JSDocTypedefTag */:
-                case 302 /* JSDocCallbackTag */:
+                case 311 /* JSDocTypedefTag */:
+                case 304 /* JSDocCallbackTag */:
                     return (delayedTypeAliases || (delayedTypeAliases = [])).push(node);
             }
         }
@@ -29611,11 +30029,11 @@ var ts;
             ts.Debug.assert(ts.isInJSFile(node));
             var thisContainer = ts.getThisContainer(node, /*includeArrowFunctions*/ false);
             switch (thisContainer.kind) {
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
                     var constructorSymbol = thisContainer.symbol;
                     // For `f.prototype.m = function() { this.x = 0; }`, `this.x = 0` should modify `f`'s members, not the function expression.
-                    if (ts.isBinaryExpression(thisContainer.parent) && thisContainer.parent.operatorToken.kind === 59 /* EqualsToken */) {
+                    if (ts.isBinaryExpression(thisContainer.parent) && thisContainer.parent.operatorToken.kind === 60 /* EqualsToken */) {
                         var l = thisContainer.parent.left;
                         if (ts.isPropertyAccessEntityNameExpression(l) && ts.isPrototypeAccess(l.expression)) {
                             constructorSymbol = lookupSymbolForPropertyAccess(l.expression.expression, thisParentContainer);
@@ -29628,18 +30046,18 @@ var ts;
                         declareSymbol(constructorSymbol.members, constructorSymbol, node, 4 /* Property */, 0 /* PropertyExcludes */ & ~4 /* Property */);
                     }
                     break;
-                case 157 /* Constructor */:
-                case 154 /* PropertyDeclaration */:
-                case 156 /* MethodDeclaration */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 158 /* Constructor */:
+                case 155 /* PropertyDeclaration */:
+                case 157 /* MethodDeclaration */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     // this.foo assignment in a JavaScript class
                     // Bind this property to the containing class
                     var containingClass = thisContainer.parent;
                     var symbolTable = ts.hasModifier(thisContainer, 32 /* Static */) ? containingClass.symbol.exports : containingClass.symbol.members;
                     declareSymbol(symbolTable, containingClass.symbol, node, 4 /* Property */, 0 /* None */, /*isReplaceableByMethod*/ true);
                     break;
-                case 284 /* SourceFile */:
+                case 285 /* SourceFile */:
                     // this.property = assignment in a source file -- declare symbol in exports for a module, in locals for a script
                     if (thisContainer.commonJsModuleIndicator) {
                         declareSymbol(thisContainer.symbol.exports, thisContainer.symbol, node, 4 /* Property */ | 1048576 /* ExportValue */, 0 /* None */);
@@ -29649,14 +30067,14 @@ var ts;
                     }
                     break;
                 default:
-                    ts.Debug.fail(ts.Debug.showSyntaxKind(thisContainer));
+                    ts.Debug.failBadSyntaxKind(thisContainer);
             }
         }
         function bindSpecialPropertyDeclaration(node) {
-            if (node.expression.kind === 100 /* ThisKeyword */) {
+            if (node.expression.kind === 101 /* ThisKeyword */) {
                 bindThisPropertyAssignment(node);
             }
-            else if (ts.isPropertyAccessEntityNameExpression(node) && node.parent.parent.kind === 284 /* SourceFile */) {
+            else if (ts.isPropertyAccessEntityNameExpression(node) && node.parent.parent.kind === 285 /* SourceFile */) {
                 if (ts.isPrototypeAccess(node.expression)) {
                     bindPrototypePropertyAssignment(node, node.parent);
                 }
@@ -29693,7 +30111,7 @@ var ts;
         }
         function bindObjectDefinePropertyAssignment(node) {
             var namespaceSymbol = lookupSymbolForPropertyAccess(node.arguments[0]);
-            var isToplevel = node.parent.parent.kind === 284 /* SourceFile */;
+            var isToplevel = node.parent.parent.kind === 285 /* SourceFile */;
             namespaceSymbol = bindPotentiallyMissingNamespaces(namespaceSymbol, node.arguments[0], isToplevel, /*isPrototypeProperty*/ false);
             bindPotentiallyNewExpandoMemberToNamespace(node, namespaceSymbol, /*isPrototypeProperty*/ false);
         }
@@ -29707,7 +30125,7 @@ var ts;
             // Fix up parent pointers since we're going to use these nodes before we bind into them
             node.left.parent = node;
             node.right.parent = node;
-            if (ts.isIdentifier(lhs.expression) && container === file && isNameOfExportsOrModuleExportsAliasDeclaration(file, lhs.expression)) {
+            if (ts.isIdentifier(lhs.expression) && container === file && isExportsOrModuleExportsOrAlias(file, lhs.expression)) {
                 // This can be an alias for the 'exports' or 'module.exports' names, e.g.
                 //    var util = module.exports;
                 //    util.property = function ...
@@ -29760,8 +30178,8 @@ var ts;
         function bindPropertyAssignment(name, propertyAccess, isPrototypeProperty) {
             var namespaceSymbol = lookupSymbolForPropertyAccess(name);
             var isToplevel = ts.isBinaryExpression(propertyAccess.parent)
-                ? getParentOfBinaryExpression(propertyAccess.parent).parent.kind === 284 /* SourceFile */
-                : propertyAccess.parent.parent.kind === 284 /* SourceFile */;
+                ? getParentOfBinaryExpression(propertyAccess.parent).parent.kind === 285 /* SourceFile */
+                : propertyAccess.parent.parent.kind === 285 /* SourceFile */;
             namespaceSymbol = bindPotentiallyMissingNamespaces(namespaceSymbol, propertyAccess.expression, isToplevel, isPrototypeProperty);
             bindPotentiallyNewExpandoMemberToNamespace(propertyAccess, namespaceSymbol, isPrototypeProperty);
         }
@@ -29820,9 +30238,7 @@ var ts;
             }
             else {
                 var s = forEachIdentifierInEntityName(e.expression, parent, action);
-                if (!s || !s.exports)
-                    return ts.Debug.fail();
-                return action(e.name, s.exports.get(e.name.escapedText), s);
+                return action(e.name, s && s.exports && s.exports.get(e.name.escapedText), s);
             }
         }
         function bindCallExpression(node) {
@@ -29833,7 +30249,7 @@ var ts;
             }
         }
         function bindClassLikeDeclaration(node) {
-            if (node.kind === 240 /* ClassDeclaration */) {
+            if (node.kind === 241 /* ClassDeclaration */) {
                 bindBlockScopedDeclaration(node, 32 /* Class */, 68008383 /* ClassExcludes */);
             }
             else {
@@ -29899,7 +30315,7 @@ var ts;
             }
         }
         function bindParameter(node) {
-            if (node.kind === 304 /* JSDocParameterTag */ && container.kind !== 298 /* JSDocSignature */) {
+            if (node.kind === 306 /* JSDocParameterTag */ && container.kind !== 299 /* JSDocSignature */) {
                 return;
             }
             if (inStrictMode && !(node.flags & 4194304 /* Ambient */)) {
@@ -29976,7 +30392,7 @@ var ts;
                     declareSymbolAndAddToSymbolTable(node, 262144 /* TypeParameter */, 67635688 /* TypeParameterExcludes */);
                 }
             }
-            else if (node.parent.kind === 176 /* InferType */) {
+            else if (node.parent.kind === 177 /* InferType */) {
                 var container_2 = getInferTypeContainer(node.parent);
                 if (container_2) {
                     if (!container_2.locals) {
@@ -30004,11 +30420,11 @@ var ts;
             if (currentFlow === unreachableFlow) {
                 var reportError = 
                 // report error on all statements except empty ones
-                (ts.isStatementButNotDeclaration(node) && node.kind !== 220 /* EmptyStatement */) ||
+                (ts.isStatementButNotDeclaration(node) && node.kind !== 221 /* EmptyStatement */) ||
                     // report error on class declarations
-                    node.kind === 240 /* ClassDeclaration */ ||
+                    node.kind === 241 /* ClassDeclaration */ ||
                     // report error on instantiated modules or const-enums only modules if preserveConstEnums is set
-                    (node.kind === 244 /* ModuleDeclaration */ && shouldReportErrorOnModuleDeclaration(node));
+                    (node.kind === 245 /* ModuleDeclaration */ && shouldReportErrorOnModuleDeclaration(node));
                 if (reportError) {
                     currentFlow = reportedUnreachableFlow;
                     if (!options.allowUnreachableCode) {
@@ -30052,32 +30468,41 @@ var ts;
     }
     function isPurelyTypeDeclaration(s) {
         switch (s.kind) {
-            case 241 /* InterfaceDeclaration */:
-            case 242 /* TypeAliasDeclaration */:
+            case 242 /* InterfaceDeclaration */:
+            case 243 /* TypeAliasDeclaration */:
                 return true;
-            case 244 /* ModuleDeclaration */:
+            case 245 /* ModuleDeclaration */:
                 return getModuleInstanceState(s) !== 1 /* Instantiated */;
-            case 243 /* EnumDeclaration */:
+            case 244 /* EnumDeclaration */:
                 return ts.hasModifier(s, 2048 /* Const */);
             default:
                 return false;
         }
     }
     function isExportsOrModuleExportsOrAlias(sourceFile, node) {
-        return ts.isExportsIdentifier(node) ||
-            ts.isModuleExportsPropertyAccessExpression(node) ||
-            ts.isIdentifier(node) && isNameOfExportsOrModuleExportsAliasDeclaration(sourceFile, node);
+        var i = 0;
+        var q = [node];
+        while (q.length && i < 100) {
+            i++;
+            node = q.shift();
+            if (ts.isExportsIdentifier(node) || ts.isModuleExportsPropertyAccessExpression(node)) {
+                return true;
+            }
+            else if (ts.isIdentifier(node)) {
+                var symbol = lookupSymbolForNameWorker(sourceFile, node.escapedText);
+                if (!!symbol && !!symbol.valueDeclaration && ts.isVariableDeclaration(symbol.valueDeclaration) && !!symbol.valueDeclaration.initializer) {
+                    var init = symbol.valueDeclaration.initializer;
+                    q.push(init);
+                    if (ts.isAssignmentExpression(init, /*excludeCompoundAssignment*/ true)) {
+                        q.push(init.left);
+                        q.push(init.right);
+                    }
+                }
+            }
+        }
+        return false;
     }
     ts.isExportsOrModuleExportsOrAlias = isExportsOrModuleExportsOrAlias;
-    function isNameOfExportsOrModuleExportsAliasDeclaration(sourceFile, node) {
-        var symbol = lookupSymbolForNameWorker(sourceFile, node.escapedText);
-        return !!symbol && !!symbol.valueDeclaration && ts.isVariableDeclaration(symbol.valueDeclaration) &&
-            !!symbol.valueDeclaration.initializer && isExportsOrModuleExportsOrAliasOrAssignment(sourceFile, symbol.valueDeclaration.initializer);
-    }
-    function isExportsOrModuleExportsOrAliasOrAssignment(sourceFile, node) {
-        return isExportsOrModuleExportsOrAlias(sourceFile, node) ||
-            (ts.isAssignmentExpression(node, /*excludeCompoundAssignment*/ true) && (isExportsOrModuleExportsOrAliasOrAssignment(sourceFile, node.left) || isExportsOrModuleExportsOrAliasOrAssignment(sourceFile, node.right)));
-    }
     function lookupSymbolForNameWorker(container, name) {
         var local = container.locals && container.locals.get(name);
         if (local) {
@@ -30097,58 +30522,58 @@ var ts;
     function computeTransformFlagsForNode(node, subtreeFlags) {
         var kind = node.kind;
         switch (kind) {
-            case 191 /* CallExpression */:
+            case 192 /* CallExpression */:
                 return computeCallExpression(node, subtreeFlags);
-            case 192 /* NewExpression */:
+            case 193 /* NewExpression */:
                 return computeNewExpression(node, subtreeFlags);
-            case 244 /* ModuleDeclaration */:
+            case 245 /* ModuleDeclaration */:
                 return computeModuleDeclaration(node, subtreeFlags);
-            case 195 /* ParenthesizedExpression */:
+            case 196 /* ParenthesizedExpression */:
                 return computeParenthesizedExpression(node, subtreeFlags);
-            case 204 /* BinaryExpression */:
+            case 205 /* BinaryExpression */:
                 return computeBinaryExpression(node, subtreeFlags);
-            case 221 /* ExpressionStatement */:
+            case 222 /* ExpressionStatement */:
                 return computeExpressionStatement(node, subtreeFlags);
-            case 151 /* Parameter */:
+            case 152 /* Parameter */:
                 return computeParameter(node, subtreeFlags);
-            case 197 /* ArrowFunction */:
+            case 198 /* ArrowFunction */:
                 return computeArrowFunction(node, subtreeFlags);
-            case 196 /* FunctionExpression */:
+            case 197 /* FunctionExpression */:
                 return computeFunctionExpression(node, subtreeFlags);
-            case 239 /* FunctionDeclaration */:
+            case 240 /* FunctionDeclaration */:
                 return computeFunctionDeclaration(node, subtreeFlags);
-            case 237 /* VariableDeclaration */:
+            case 238 /* VariableDeclaration */:
                 return computeVariableDeclaration(node, subtreeFlags);
-            case 238 /* VariableDeclarationList */:
+            case 239 /* VariableDeclarationList */:
                 return computeVariableDeclarationList(node, subtreeFlags);
-            case 219 /* VariableStatement */:
+            case 220 /* VariableStatement */:
                 return computeVariableStatement(node, subtreeFlags);
-            case 233 /* LabeledStatement */:
+            case 234 /* LabeledStatement */:
                 return computeLabeledStatement(node, subtreeFlags);
-            case 240 /* ClassDeclaration */:
+            case 241 /* ClassDeclaration */:
                 return computeClassDeclaration(node, subtreeFlags);
-            case 209 /* ClassExpression */:
+            case 210 /* ClassExpression */:
                 return computeClassExpression(node, subtreeFlags);
-            case 273 /* HeritageClause */:
+            case 274 /* HeritageClause */:
                 return computeHeritageClause(node, subtreeFlags);
-            case 274 /* CatchClause */:
+            case 275 /* CatchClause */:
                 return computeCatchClause(node, subtreeFlags);
-            case 211 /* ExpressionWithTypeArguments */:
+            case 212 /* ExpressionWithTypeArguments */:
                 return computeExpressionWithTypeArguments(node, subtreeFlags);
-            case 157 /* Constructor */:
+            case 158 /* Constructor */:
                 return computeConstructor(node, subtreeFlags);
-            case 154 /* PropertyDeclaration */:
+            case 155 /* PropertyDeclaration */:
                 return computePropertyDeclaration(node, subtreeFlags);
-            case 156 /* MethodDeclaration */:
+            case 157 /* MethodDeclaration */:
                 return computeMethod(node, subtreeFlags);
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
                 return computeAccessor(node, subtreeFlags);
-            case 248 /* ImportEqualsDeclaration */:
+            case 249 /* ImportEqualsDeclaration */:
                 return computeImportEquals(node, subtreeFlags);
-            case 189 /* PropertyAccessExpression */:
+            case 190 /* PropertyAccessExpression */:
                 return computePropertyAccess(node, subtreeFlags);
-            case 190 /* ElementAccessExpression */:
+            case 191 /* ElementAccessExpression */:
                 return computeElementAccess(node, subtreeFlags);
             default:
                 return computeOther(node, kind, subtreeFlags);
@@ -30170,7 +30595,7 @@ var ts;
                 transformFlags |= 2048 /* ContainsLexicalThis */;
             }
         }
-        if (expression.kind === 92 /* ImportKeyword */) {
+        if (expression.kind === 93 /* ImportKeyword */) {
             transformFlags |= 524288 /* ContainsDynamicImport */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
@@ -30193,17 +30618,17 @@ var ts;
         var transformFlags = subtreeFlags;
         var operatorTokenKind = node.operatorToken.kind;
         var leftKind = node.left.kind;
-        if (operatorTokenKind === 59 /* EqualsToken */ && leftKind === 188 /* ObjectLiteralExpression */) {
+        if (operatorTokenKind === 60 /* EqualsToken */ && leftKind === 189 /* ObjectLiteralExpression */) {
             // Destructuring object assignments with are ES2015 syntax
             // and possibly ES2018 if they contain rest
             transformFlags |= 16 /* AssertES2018 */ | 128 /* AssertES2015 */ | 512 /* AssertDestructuringAssignment */;
         }
-        else if (operatorTokenKind === 59 /* EqualsToken */ && leftKind === 187 /* ArrayLiteralExpression */) {
+        else if (operatorTokenKind === 60 /* EqualsToken */ && leftKind === 188 /* ArrayLiteralExpression */) {
             // Destructuring assignments are ES2015 syntax.
             transformFlags |= 128 /* AssertES2015 */ | 512 /* AssertDestructuringAssignment */;
         }
         else if (operatorTokenKind === 41 /* AsteriskAsteriskToken */
-            || operatorTokenKind === 63 /* AsteriskAsteriskEqualsToken */) {
+            || operatorTokenKind === 64 /* AsteriskAsteriskEqualsToken */) {
             // Exponentiation is ES2016 syntax.
             transformFlags |= 64 /* AssertES2016 */;
         }
@@ -30246,8 +30671,8 @@ var ts;
         // If the node is synthesized, it means the emitter put the parentheses there,
         // not the user. If we didn't want them, the emitter would not have put them
         // there.
-        if (expressionKind === 212 /* AsExpression */
-            || expressionKind === 194 /* TypeAssertionExpression */) {
+        if (expressionKind === 213 /* AsExpression */
+            || expressionKind === 195 /* TypeAssertionExpression */) {
             transformFlags |= 1 /* AssertTypeScript */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
@@ -30262,8 +30687,7 @@ var ts;
         else {
             // A ClassDeclaration is ES6 syntax.
             transformFlags = subtreeFlags | 128 /* AssertES2015 */;
-            // A class with a parameter property assignment, property initializer, computed property name, or decorator is
-            // TypeScript syntax.
+            // A class with a parameter property assignment or decorator is TypeScript syntax.
             // An exported declaration may be TypeScript syntax, but is handled by the visitor
             // for a namespace declaration.
             if ((subtreeFlags & 1024 /* ContainsTypeScriptClassSyntax */)
@@ -30277,8 +30701,7 @@ var ts;
     function computeClassExpression(node, subtreeFlags) {
         // A ClassExpression is ES6 syntax.
         var transformFlags = subtreeFlags | 128 /* AssertES2015 */;
-        // A class with a parameter property assignment, property initializer, or decorator is
-        // TypeScript syntax.
+        // A class with a parameter property assignment or decorator is TypeScript syntax.
         if (subtreeFlags & 1024 /* ContainsTypeScriptClassSyntax */
             || node.typeParameters) {
             transformFlags |= 1 /* AssertTypeScript */;
@@ -30289,11 +30712,11 @@ var ts;
     function computeHeritageClause(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
         switch (node.token) {
-            case 86 /* ExtendsKeyword */:
+            case 87 /* ExtendsKeyword */:
                 // An `extends` HeritageClause is ES6 syntax.
                 transformFlags |= 128 /* AssertES2015 */;
                 break;
-            case 109 /* ImplementsKeyword */:
+            case 110 /* ImplementsKeyword */:
                 // An `implements` HeritageClause is TypeScript syntax.
                 transformFlags |= 1 /* AssertTypeScript */;
                 break;
@@ -30350,7 +30773,6 @@ var ts;
             || ts.hasModifier(node, 2270 /* TypeScriptModifier */)
             || node.typeParameters
             || node.type
-            || (node.name && ts.isComputedPropertyName(node.name)) // While computed method names aren't typescript, the TS transform must visit them to emit property declarations correctly
             || !node.body) {
             transformFlags |= 1 /* AssertTypeScript */;
         }
@@ -30375,7 +30797,6 @@ var ts;
         if (node.decorators
             || ts.hasModifier(node, 2270 /* TypeScriptModifier */)
             || node.type
-            || (node.name && ts.isComputedPropertyName(node.name)) // While computed accessor names aren't typescript, the TS transform must visit them to emit property declarations correctly
             || !node.body) {
             transformFlags |= 1 /* AssertTypeScript */;
         }
@@ -30387,11 +30808,13 @@ var ts;
         return propagatePropertyNameFlags(node.name, transformFlags & ~537372672 /* MethodOrAccessorExcludes */);
     }
     function computePropertyDeclaration(node, subtreeFlags) {
-        // A PropertyDeclaration is TypeScript syntax.
-        var transformFlags = subtreeFlags | 1 /* AssertTypeScript */;
-        // If the PropertyDeclaration has an initializer or a computed name, we need to inform its ancestor
-        // so that it handle the transformation.
-        if (node.initializer || ts.isComputedPropertyName(node.name)) {
+        var transformFlags = subtreeFlags | 1048576 /* ContainsClassFields */;
+        // Decorators, TypeScript-specific modifiers, and type annotations are TypeScript syntax.
+        if (ts.some(node.decorators) || ts.hasModifier(node, 2270 /* TypeScriptModifier */) || node.type) {
+            transformFlags |= 1 /* AssertTypeScript */;
+        }
+        // Hoisted variables related to class properties should live within the TypeScript class wrapper.
+        if (ts.isComputedPropertyName(node.name) || (ts.hasStaticModifier(node) && node.initializer)) {
             transformFlags |= 1024 /* ContainsTypeScriptClassSyntax */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
@@ -30486,7 +30909,7 @@ var ts;
         var transformFlags = subtreeFlags;
         // If a PropertyAccessExpression starts with a super keyword, then it is
         // ES6 syntax, and requires a lexical `this` binding.
-        if (node.expression.kind === 98 /* SuperKeyword */) {
+        if (node.expression.kind === 99 /* SuperKeyword */) {
             // super inside of an async function requires hoisting the super access (ES2017).
             // same for super inside of an async generator, which is ES2018.
             transformFlags |= 32 /* ContainsES2017 */ | 16 /* ContainsES2018 */;
@@ -30498,7 +30921,7 @@ var ts;
         var transformFlags = subtreeFlags;
         // If an ElementAccessExpression starts with a super keyword, then it is
         // ES6 syntax, and requires a lexical `this` binding.
-        if (node.expression.kind === 98 /* SuperKeyword */) {
+        if (node.expression.kind === 99 /* SuperKeyword */) {
             // super inside of an async function requires hoisting the super access (ES2017).
             // same for super inside of an async generator, which is ES2018.
             transformFlags |= 32 /* ContainsES2017 */ | 16 /* ContainsES2018 */;
@@ -30586,43 +31009,43 @@ var ts;
         var transformFlags = subtreeFlags;
         var excludeFlags = 536870912 /* NodeExcludes */;
         switch (kind) {
-            case 121 /* AsyncKeyword */:
-            case 201 /* AwaitExpression */:
+            case 122 /* AsyncKeyword */:
+            case 202 /* AwaitExpression */:
                 // async/await is ES2017 syntax, but may be ES2018 syntax (for async generators)
                 transformFlags |= 16 /* AssertES2018 */ | 32 /* AssertES2017 */;
                 break;
-            case 194 /* TypeAssertionExpression */:
-            case 212 /* AsExpression */:
-            case 313 /* PartiallyEmittedExpression */:
+            case 195 /* TypeAssertionExpression */:
+            case 213 /* AsExpression */:
+            case 315 /* PartiallyEmittedExpression */:
                 // These nodes are TypeScript syntax.
                 transformFlags |= 1 /* AssertTypeScript */;
                 excludeFlags = 536870912 /* OuterExpressionExcludes */;
                 break;
-            case 115 /* PublicKeyword */:
-            case 113 /* PrivateKeyword */:
-            case 114 /* ProtectedKeyword */:
-            case 118 /* AbstractKeyword */:
-            case 125 /* DeclareKeyword */:
-            case 77 /* ConstKeyword */:
-            case 243 /* EnumDeclaration */:
-            case 278 /* EnumMember */:
-            case 213 /* NonNullExpression */:
-            case 133 /* ReadonlyKeyword */:
+            case 116 /* PublicKeyword */:
+            case 114 /* PrivateKeyword */:
+            case 115 /* ProtectedKeyword */:
+            case 119 /* AbstractKeyword */:
+            case 126 /* DeclareKeyword */:
+            case 78 /* ConstKeyword */:
+            case 244 /* EnumDeclaration */:
+            case 279 /* EnumMember */:
+            case 214 /* NonNullExpression */:
+            case 134 /* ReadonlyKeyword */:
                 // These nodes are TypeScript syntax.
                 transformFlags |= 1 /* AssertTypeScript */;
                 break;
-            case 260 /* JsxElement */:
-            case 261 /* JsxSelfClosingElement */:
-            case 262 /* JsxOpeningElement */:
+            case 261 /* JsxElement */:
+            case 262 /* JsxSelfClosingElement */:
+            case 263 /* JsxOpeningElement */:
             case 11 /* JsxText */:
-            case 263 /* JsxClosingElement */:
-            case 264 /* JsxFragment */:
-            case 265 /* JsxOpeningFragment */:
-            case 266 /* JsxClosingFragment */:
-            case 267 /* JsxAttribute */:
-            case 268 /* JsxAttributes */:
-            case 269 /* JsxSpreadAttribute */:
-            case 270 /* JsxExpression */:
+            case 264 /* JsxClosingElement */:
+            case 265 /* JsxFragment */:
+            case 266 /* JsxOpeningFragment */:
+            case 267 /* JsxClosingFragment */:
+            case 268 /* JsxAttribute */:
+            case 269 /* JsxAttributes */:
+            case 270 /* JsxSpreadAttribute */:
+            case 271 /* JsxExpression */:
                 // These nodes are Jsx syntax.
                 transformFlags |= 2 /* AssertJsx */;
                 break;
@@ -30630,11 +31053,11 @@ var ts;
             case 15 /* TemplateHead */:
             case 16 /* TemplateMiddle */:
             case 17 /* TemplateTail */:
-            case 206 /* TemplateExpression */:
-            case 193 /* TaggedTemplateExpression */:
-            case 276 /* ShorthandPropertyAssignment */:
-            case 116 /* StaticKeyword */:
-            case 214 /* MetaProperty */:
+            case 207 /* TemplateExpression */:
+            case 194 /* TaggedTemplateExpression */:
+            case 277 /* ShorthandPropertyAssignment */:
+            case 117 /* StaticKeyword */:
+            case 215 /* MetaProperty */:
                 // These nodes are ES6 syntax.
                 transformFlags |= 128 /* AssertES2015 */;
                 break;
@@ -30651,103 +31074,103 @@ var ts;
             case 9 /* BigIntLiteral */:
                 transformFlags |= 4 /* AssertESNext */;
                 break;
-            case 227 /* ForOfStatement */:
+            case 228 /* ForOfStatement */:
                 // This node is either ES2015 syntax or ES2017 syntax (if it is a for-await-of).
                 if (node.awaitModifier) {
                     transformFlags |= 16 /* AssertES2018 */;
                 }
                 transformFlags |= 128 /* AssertES2015 */;
                 break;
-            case 207 /* YieldExpression */:
+            case 208 /* YieldExpression */:
                 // This node is either ES2015 syntax (in a generator) or ES2017 syntax (in an async
                 // generator).
                 transformFlags |= 16 /* AssertES2018 */ | 128 /* AssertES2015 */ | 131072 /* ContainsYield */;
                 break;
-            case 120 /* AnyKeyword */:
-            case 135 /* NumberKeyword */:
-            case 146 /* BigIntKeyword */:
-            case 132 /* NeverKeyword */:
-            case 136 /* ObjectKeyword */:
-            case 138 /* StringKeyword */:
-            case 123 /* BooleanKeyword */:
-            case 139 /* SymbolKeyword */:
-            case 106 /* VoidKeyword */:
-            case 150 /* TypeParameter */:
-            case 153 /* PropertySignature */:
-            case 155 /* MethodSignature */:
-            case 160 /* CallSignature */:
-            case 161 /* ConstructSignature */:
-            case 162 /* IndexSignature */:
-            case 163 /* TypePredicate */:
-            case 164 /* TypeReference */:
-            case 165 /* FunctionType */:
-            case 166 /* ConstructorType */:
-            case 167 /* TypeQuery */:
-            case 168 /* TypeLiteral */:
-            case 169 /* ArrayType */:
-            case 170 /* TupleType */:
-            case 171 /* OptionalType */:
-            case 172 /* RestType */:
-            case 173 /* UnionType */:
-            case 174 /* IntersectionType */:
-            case 175 /* ConditionalType */:
-            case 176 /* InferType */:
-            case 177 /* ParenthesizedType */:
-            case 241 /* InterfaceDeclaration */:
-            case 242 /* TypeAliasDeclaration */:
-            case 178 /* ThisType */:
-            case 179 /* TypeOperator */:
-            case 180 /* IndexedAccessType */:
-            case 181 /* MappedType */:
-            case 182 /* LiteralType */:
-            case 247 /* NamespaceExportDeclaration */:
+            case 121 /* AnyKeyword */:
+            case 136 /* NumberKeyword */:
+            case 147 /* BigIntKeyword */:
+            case 133 /* NeverKeyword */:
+            case 137 /* ObjectKeyword */:
+            case 139 /* StringKeyword */:
+            case 124 /* BooleanKeyword */:
+            case 140 /* SymbolKeyword */:
+            case 107 /* VoidKeyword */:
+            case 151 /* TypeParameter */:
+            case 154 /* PropertySignature */:
+            case 156 /* MethodSignature */:
+            case 161 /* CallSignature */:
+            case 162 /* ConstructSignature */:
+            case 163 /* IndexSignature */:
+            case 164 /* TypePredicate */:
+            case 165 /* TypeReference */:
+            case 166 /* FunctionType */:
+            case 167 /* ConstructorType */:
+            case 168 /* TypeQuery */:
+            case 169 /* TypeLiteral */:
+            case 170 /* ArrayType */:
+            case 171 /* TupleType */:
+            case 172 /* OptionalType */:
+            case 173 /* RestType */:
+            case 174 /* UnionType */:
+            case 175 /* IntersectionType */:
+            case 176 /* ConditionalType */:
+            case 177 /* InferType */:
+            case 178 /* ParenthesizedType */:
+            case 242 /* InterfaceDeclaration */:
+            case 243 /* TypeAliasDeclaration */:
+            case 179 /* ThisType */:
+            case 180 /* TypeOperator */:
+            case 181 /* IndexedAccessType */:
+            case 182 /* MappedType */:
+            case 183 /* LiteralType */:
+            case 248 /* NamespaceExportDeclaration */:
                 // Types and signatures are TypeScript syntax, and exclude all other facts.
                 transformFlags = 1 /* AssertTypeScript */;
                 excludeFlags = -2 /* TypeExcludes */;
                 break;
-            case 149 /* ComputedPropertyName */:
+            case 150 /* ComputedPropertyName */:
                 // Even though computed property names are ES6, we don't treat them as such.
                 // This is so that they can flow through PropertyName transforms unaffected.
                 // Instead, we mark the container as ES6, so that it can properly handle the transform.
                 transformFlags |= 16384 /* ContainsComputedPropertyName */;
                 break;
-            case 208 /* SpreadElement */:
+            case 209 /* SpreadElement */:
                 transformFlags |= 128 /* AssertES2015 */ | 4096 /* ContainsRestOrSpread */;
                 break;
-            case 277 /* SpreadAssignment */:
+            case 278 /* SpreadAssignment */:
                 transformFlags |= 16 /* AssertES2018 */ | 8192 /* ContainsObjectRestOrSpread */;
                 break;
-            case 98 /* SuperKeyword */:
+            case 99 /* SuperKeyword */:
                 // This node is ES6 syntax.
                 transformFlags |= 128 /* AssertES2015 */;
                 excludeFlags = 536870912 /* OuterExpressionExcludes */; // must be set to persist `Super`
                 break;
-            case 100 /* ThisKeyword */:
+            case 101 /* ThisKeyword */:
                 // Mark this node and its ancestors as containing a lexical `this` keyword.
                 transformFlags |= 2048 /* ContainsLexicalThis */;
                 break;
-            case 184 /* ObjectBindingPattern */:
+            case 185 /* ObjectBindingPattern */:
                 transformFlags |= 128 /* AssertES2015 */ | 65536 /* ContainsBindingPattern */;
                 if (subtreeFlags & 4096 /* ContainsRestOrSpread */) {
                     transformFlags |= 16 /* AssertES2018 */ | 8192 /* ContainsObjectRestOrSpread */;
                 }
                 excludeFlags = 536875008 /* BindingPatternExcludes */;
                 break;
-            case 185 /* ArrayBindingPattern */:
+            case 186 /* ArrayBindingPattern */:
                 transformFlags |= 128 /* AssertES2015 */ | 65536 /* ContainsBindingPattern */;
                 excludeFlags = 536875008 /* BindingPatternExcludes */;
                 break;
-            case 186 /* BindingElement */:
+            case 187 /* BindingElement */:
                 transformFlags |= 128 /* AssertES2015 */;
                 if (node.dotDotDotToken) {
                     transformFlags |= 4096 /* ContainsRestOrSpread */;
                 }
                 break;
-            case 152 /* Decorator */:
+            case 153 /* Decorator */:
                 // This node is TypeScript syntax, and marks its container as also being TypeScript syntax.
                 transformFlags |= 1 /* AssertTypeScript */ | 1024 /* ContainsTypeScriptClassSyntax */;
                 break;
-            case 188 /* ObjectLiteralExpression */:
+            case 189 /* ObjectLiteralExpression */:
                 excludeFlags = 536896512 /* ObjectLiteralExcludes */;
                 if (subtreeFlags & 16384 /* ContainsComputedPropertyName */) {
                     // If an ObjectLiteralExpression contains a ComputedPropertyName, then it
@@ -30760,26 +31183,26 @@ var ts;
                     transformFlags |= 16 /* AssertES2018 */;
                 }
                 break;
-            case 187 /* ArrayLiteralExpression */:
+            case 188 /* ArrayLiteralExpression */:
                 excludeFlags = 536875008 /* ArrayLiteralOrCallOrNewExcludes */;
                 break;
-            case 223 /* DoStatement */:
-            case 224 /* WhileStatement */:
-            case 225 /* ForStatement */:
-            case 226 /* ForInStatement */:
+            case 224 /* DoStatement */:
+            case 225 /* WhileStatement */:
+            case 226 /* ForStatement */:
+            case 227 /* ForInStatement */:
                 // A loop containing a block scoped binding *may* need to be transformed from ES6.
                 if (subtreeFlags & 32768 /* ContainsBlockScopedBinding */) {
                     transformFlags |= 128 /* AssertES2015 */;
                 }
                 break;
-            case 284 /* SourceFile */:
+            case 285 /* SourceFile */:
                 break;
-            case 230 /* ReturnStatement */:
+            case 231 /* ReturnStatement */:
                 // Return statements may require an `await` in ES2018.
                 transformFlags |= 262144 /* ContainsHoistedDeclarationOrCompletion */ | 16 /* AssertES2018 */;
                 break;
-            case 228 /* ContinueStatement */:
-            case 229 /* BreakStatement */:
+            case 229 /* ContinueStatement */:
+            case 230 /* BreakStatement */:
                 transformFlags |= 262144 /* ContainsHoistedDeclarationOrCompletion */;
                 break;
         }
@@ -30797,67 +31220,67 @@ var ts;
      *       than calling this function.
      */
     function getTransformFlagsSubtreeExclusions(kind) {
-        if (kind >= 163 /* FirstTypeNode */ && kind <= 183 /* LastTypeNode */) {
+        if (kind >= 164 /* FirstTypeNode */ && kind <= 184 /* LastTypeNode */) {
             return -2 /* TypeExcludes */;
         }
         switch (kind) {
-            case 191 /* CallExpression */:
-            case 192 /* NewExpression */:
-            case 187 /* ArrayLiteralExpression */:
+            case 192 /* CallExpression */:
+            case 193 /* NewExpression */:
+            case 188 /* ArrayLiteralExpression */:
                 return 536875008 /* ArrayLiteralOrCallOrNewExcludes */;
-            case 244 /* ModuleDeclaration */:
+            case 245 /* ModuleDeclaration */:
                 return 537168896 /* ModuleExcludes */;
-            case 151 /* Parameter */:
+            case 152 /* Parameter */:
                 return 536870912 /* ParameterExcludes */;
-            case 197 /* ArrowFunction */:
+            case 198 /* ArrowFunction */:
                 return 537371648 /* ArrowFunctionExcludes */;
-            case 196 /* FunctionExpression */:
-            case 239 /* FunctionDeclaration */:
+            case 197 /* FunctionExpression */:
+            case 240 /* FunctionDeclaration */:
                 return 537373696 /* FunctionExcludes */;
-            case 238 /* VariableDeclarationList */:
+            case 239 /* VariableDeclarationList */:
                 return 536944640 /* VariableDeclarationListExcludes */;
-            case 240 /* ClassDeclaration */:
-            case 209 /* ClassExpression */:
+            case 241 /* ClassDeclaration */:
+            case 210 /* ClassExpression */:
                 return 536888320 /* ClassExcludes */;
-            case 157 /* Constructor */:
+            case 158 /* Constructor */:
                 return 537372672 /* ConstructorExcludes */;
-            case 156 /* MethodDeclaration */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
+            case 157 /* MethodDeclaration */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
                 return 537372672 /* MethodOrAccessorExcludes */;
-            case 120 /* AnyKeyword */:
-            case 135 /* NumberKeyword */:
-            case 146 /* BigIntKeyword */:
-            case 132 /* NeverKeyword */:
-            case 138 /* StringKeyword */:
-            case 136 /* ObjectKeyword */:
-            case 123 /* BooleanKeyword */:
-            case 139 /* SymbolKeyword */:
-            case 106 /* VoidKeyword */:
-            case 150 /* TypeParameter */:
-            case 153 /* PropertySignature */:
-            case 155 /* MethodSignature */:
-            case 160 /* CallSignature */:
-            case 161 /* ConstructSignature */:
-            case 162 /* IndexSignature */:
-            case 241 /* InterfaceDeclaration */:
-            case 242 /* TypeAliasDeclaration */:
+            case 121 /* AnyKeyword */:
+            case 136 /* NumberKeyword */:
+            case 147 /* BigIntKeyword */:
+            case 133 /* NeverKeyword */:
+            case 139 /* StringKeyword */:
+            case 137 /* ObjectKeyword */:
+            case 124 /* BooleanKeyword */:
+            case 140 /* SymbolKeyword */:
+            case 107 /* VoidKeyword */:
+            case 151 /* TypeParameter */:
+            case 154 /* PropertySignature */:
+            case 156 /* MethodSignature */:
+            case 161 /* CallSignature */:
+            case 162 /* ConstructSignature */:
+            case 163 /* IndexSignature */:
+            case 242 /* InterfaceDeclaration */:
+            case 243 /* TypeAliasDeclaration */:
                 return -2 /* TypeExcludes */;
-            case 188 /* ObjectLiteralExpression */:
+            case 189 /* ObjectLiteralExpression */:
                 return 536896512 /* ObjectLiteralExcludes */;
-            case 274 /* CatchClause */:
+            case 275 /* CatchClause */:
                 return 536879104 /* CatchClauseExcludes */;
-            case 184 /* ObjectBindingPattern */:
-            case 185 /* ArrayBindingPattern */:
+            case 185 /* ObjectBindingPattern */:
+            case 186 /* ArrayBindingPattern */:
                 return 536875008 /* BindingPatternExcludes */;
-            case 194 /* TypeAssertionExpression */:
-            case 212 /* AsExpression */:
-            case 313 /* PartiallyEmittedExpression */:
-            case 195 /* ParenthesizedExpression */:
-            case 98 /* SuperKeyword */:
+            case 195 /* TypeAssertionExpression */:
+            case 213 /* AsExpression */:
+            case 315 /* PartiallyEmittedExpression */:
+            case 196 /* ParenthesizedExpression */:
+            case 99 /* SuperKeyword */:
                 return 536870912 /* OuterExpressionExcludes */;
-            case 189 /* PropertyAccessExpression */:
-            case 190 /* ElementAccessExpression */:
+            case 190 /* PropertyAccessExpression */:
+            case 191 /* ElementAccessExpression */:
                 return 536870912 /* PropertyAccessExcludes */;
             default:
                 return 536870912 /* NodeExcludes */;
@@ -31032,7 +31455,7 @@ var ts;
                     //  (their type resolved directly to the member deeply referenced)
                     // So to get the intervening symbols, we need to check if there's a type
                     // query node on any of the symbol's declarations and get symbols there
-                    if (d.type && d.type.kind === 167 /* TypeQuery */) {
+                    if (d.type && d.type.kind === 168 /* TypeQuery */) {
                         var query = d.type;
                         var entity = getResolvedSymbol(getFirstIdentifier(query.exprName));
                         visitSymbol(entity);
@@ -31052,6 +31475,37 @@ var ts;
     var nextNodeId = 1;
     var nextMergeId = 1;
     var nextFlowId = 1;
+    var IterationUse;
+    (function (IterationUse) {
+        IterationUse[IterationUse["AllowsSyncIterablesFlag"] = 1] = "AllowsSyncIterablesFlag";
+        IterationUse[IterationUse["AllowsAsyncIterablesFlag"] = 2] = "AllowsAsyncIterablesFlag";
+        IterationUse[IterationUse["AllowsStringInputFlag"] = 4] = "AllowsStringInputFlag";
+        IterationUse[IterationUse["ForOfFlag"] = 8] = "ForOfFlag";
+        IterationUse[IterationUse["YieldStarFlag"] = 16] = "YieldStarFlag";
+        IterationUse[IterationUse["SpreadFlag"] = 32] = "SpreadFlag";
+        IterationUse[IterationUse["DestructuringFlag"] = 64] = "DestructuringFlag";
+        // Spread, Destructuring, Array element assignment
+        IterationUse[IterationUse["Element"] = 1] = "Element";
+        IterationUse[IterationUse["Spread"] = 33] = "Spread";
+        IterationUse[IterationUse["Destructuring"] = 65] = "Destructuring";
+        IterationUse[IterationUse["ForOf"] = 13] = "ForOf";
+        IterationUse[IterationUse["ForAwaitOf"] = 15] = "ForAwaitOf";
+        IterationUse[IterationUse["YieldStar"] = 17] = "YieldStar";
+        IterationUse[IterationUse["AsyncYieldStar"] = 19] = "AsyncYieldStar";
+        IterationUse[IterationUse["GeneratorReturnType"] = 1] = "GeneratorReturnType";
+        IterationUse[IterationUse["AsyncGeneratorReturnType"] = 2] = "AsyncGeneratorReturnType";
+    })(IterationUse || (IterationUse = {}));
+    var IterationTypeKind;
+    (function (IterationTypeKind) {
+        IterationTypeKind[IterationTypeKind["Yield"] = 0] = "Yield";
+        IterationTypeKind[IterationTypeKind["Return"] = 1] = "Return";
+        IterationTypeKind[IterationTypeKind["Next"] = 2] = "Next";
+    })(IterationTypeKind || (IterationTypeKind = {}));
+    var WideningKind;
+    (function (WideningKind) {
+        WideningKind[WideningKind["Normal"] = 0] = "Normal";
+        WideningKind[WideningKind["GeneratorYield"] = 1] = "GeneratorYield";
+    })(WideningKind || (WideningKind = {}));
     function getNodeId(node) {
         if (!node.id) {
             node.id = nextNodeId;
@@ -31107,6 +31561,7 @@ var ts;
         var typeCount = 0;
         var symbolCount = 0;
         var enumCount = 0;
+        var instantiationCount = 0;
         var instantiationDepth = 0;
         var constraintDepth = 0;
         var currentNode;
@@ -31131,8 +31586,6 @@ var ts;
         undefinedSymbol.declarations = [];
         var globalThisSymbol = createSymbol(1536 /* Module */, "globalThis", 8 /* Readonly */);
         globalThisSymbol.exports = globals;
-        globalThisSymbol.valueDeclaration = ts.createNode(72 /* Identifier */);
-        globalThisSymbol.valueDeclaration.escapedText = "globalThis";
         globals.set(globalThisSymbol.escapedName, globalThisSymbol);
         var argumentsSymbol = createSymbol(4 /* Property */, "arguments");
         var requireSymbol = createSymbol(4 /* Property */, "require");
@@ -31148,6 +31601,11 @@ var ts;
             getIdentifierCount: function () { return ts.sum(host.getSourceFiles(), "identifierCount"); },
             getSymbolCount: function () { return ts.sum(host.getSourceFiles(), "symbolCount") + symbolCount; },
             getTypeCount: function () { return typeCount; },
+            getRelationCacheSizes: function () { return ({
+                assignable: assignableRelation.size,
+                identity: identityRelation.size,
+                subtype: subtypeRelation.size,
+            }); },
             isUndefinedSymbol: function (symbol) { return symbol === undefinedSymbol; },
             isArgumentsSymbol: function (symbol) { return symbol === argumentsSymbol; },
             isUnknownSymbol: function (symbol) { return symbol === unknownSymbol; },
@@ -31214,6 +31672,10 @@ var ts;
                 node = ts.getParseTreeNode(node);
                 return node ? getTypeOfNode(node) : errorType;
             },
+            getTypeOfAssignmentPattern: function (nodeIn) {
+                var node = ts.getParseTreeNode(nodeIn, ts.isAssignmentPattern);
+                return node && getTypeOfAssignmentPattern(node) || errorType;
+            },
             getPropertySymbolOfDestructuringAssignment: function (locationIn) {
                 var location = ts.getParseTreeNode(locationIn, ts.isIdentifier);
                 return location ? getPropertySymbolOfDestructuringAssignment(location) : undefined;
@@ -31262,12 +31724,14 @@ var ts;
             },
             isContextSensitive: isContextSensitive,
             getFullyQualifiedName: getFullyQualifiedName,
-            getResolvedSignature: function (node, candidatesOutArray, agumentCount) {
-                return getResolvedSignatureWorker(node, candidatesOutArray, agumentCount, 0 /* Normal */);
+            getResolvedSignature: function (node, candidatesOutArray, argumentCount) {
+                return getResolvedSignatureWorker(node, candidatesOutArray, argumentCount, 0 /* Normal */);
             },
-            getResolvedSignatureForSignatureHelp: function (node, candidatesOutArray, agumentCount) {
-                return getResolvedSignatureWorker(node, candidatesOutArray, agumentCount, 16 /* IsForSignatureHelp */);
+            getResolvedSignatureForSignatureHelp: function (node, candidatesOutArray, argumentCount) {
+                return getResolvedSignatureWorker(node, candidatesOutArray, argumentCount, 16 /* IsForSignatureHelp */);
             },
+            getExpandedParameters: getExpandedParameters,
+            hasEffectiveRestParameter: hasEffectiveRestParameter,
             getConstantValue: function (nodeIn) {
                 var node = ts.getParseTreeNode(nodeIn, canHaveConstantValue);
                 return node ? getConstantValue(node) : undefined;
@@ -31329,6 +31793,8 @@ var ts;
             getNeverType: function () { return neverType; },
             isSymbolAccessible: isSymbolAccessible,
             getObjectFlags: ts.getObjectFlags,
+            isArrayType: isArrayType,
+            isTupleType: isTupleType,
             isArrayLikeType: isArrayLikeType,
             isTypeInvalidDueToUnionDiscriminant: isTypeInvalidDueToUnionDiscriminant,
             getAllPossiblePropertiesOfTypes: getAllPossiblePropertiesOfTypes,
@@ -31405,7 +31871,7 @@ var ts;
         var intersectionTypes = ts.createMap();
         var literalTypes = ts.createMap();
         var indexedAccessTypes = ts.createMap();
-        var conditionalTypes = ts.createMap();
+        var substitutionTypes = ts.createMap();
         var evolvingArrayTypes = [];
         var undefinedProperties = ts.createMap();
         var unknownSymbol = createSymbol(4 /* Property */, "unknown");
@@ -31415,10 +31881,10 @@ var ts;
         var wildcardType = createIntrinsicType(1 /* Any */, "any");
         var errorType = createIntrinsicType(1 /* Any */, "error");
         var unknownType = createIntrinsicType(2 /* Unknown */, "unknown");
-        var undefinedType = createNullableType(32768 /* Undefined */, "undefined", 0);
-        var undefinedWideningType = strictNullChecks ? undefinedType : createNullableType(32768 /* Undefined */, "undefined", 131072 /* ContainsWideningType */);
-        var nullType = createNullableType(65536 /* Null */, "null", 0);
-        var nullWideningType = strictNullChecks ? nullType : createNullableType(65536 /* Null */, "null", 131072 /* ContainsWideningType */);
+        var undefinedType = createIntrinsicType(32768 /* Undefined */, "undefined");
+        var undefinedWideningType = strictNullChecks ? undefinedType : createIntrinsicType(32768 /* Undefined */, "undefined", 262144 /* ContainsWideningType */);
+        var nullType = createIntrinsicType(65536 /* Null */, "null");
+        var nullWideningType = strictNullChecks ? nullType : createIntrinsicType(65536 /* Null */, "null", 262144 /* ContainsWideningType */);
         var stringType = createIntrinsicType(4 /* String */, "string");
         var numberType = createIntrinsicType(8 /* Number */, "number");
         var bigintType = createIntrinsicType(64 /* BigInt */, "bigint");
@@ -31444,6 +31910,7 @@ var ts;
         var voidType = createIntrinsicType(16384 /* Void */, "void");
         var neverType = createIntrinsicType(131072 /* Never */, "never");
         var silentNeverType = createIntrinsicType(131072 /* Never */, "never");
+        var nonInferrableType = createIntrinsicType(131072 /* Never */, "never", 1048576 /* NonInferrableType */);
         var implicitNeverType = createIntrinsicType(131072 /* Never */, "never");
         var nonPrimitiveType = createIntrinsicType(67108864 /* NonPrimitive */, "object");
         var stringNumberSymbolType = getUnionType([stringType, numberType, esSymbolType]);
@@ -31460,7 +31927,7 @@ var ts;
         var anyFunctionType = createAnonymousType(undefined, emptySymbols, ts.emptyArray, ts.emptyArray, undefined, undefined);
         // The anyFunctionType contains the anyFunctionType by definition. The flag is further propagated
         // in getPropagatingFlagsOfTypes, and it is checked in inferFromTypes.
-        anyFunctionType.objectFlags |= 524288 /* ContainsAnyFunctionType */;
+        anyFunctionType.objectFlags |= 1048576 /* NonInferrableType */;
         var noConstraintType = createAnonymousType(undefined, emptySymbols, ts.emptyArray, ts.emptyArray, undefined, undefined);
         var circularConstraintType = createAnonymousType(undefined, emptySymbols, ts.emptyArray, ts.emptyArray, undefined, undefined);
         var resolvingDefaultType = createAnonymousType(undefined, emptySymbols, ts.emptyArray, ts.emptyArray, undefined, undefined);
@@ -31474,6 +31941,41 @@ var ts;
         var resolvingSignature = createSignature(undefined, undefined, undefined, ts.emptyArray, anyType, /*resolvedTypePredicate*/ undefined, 0, /*hasRestParameter*/ false, /*hasLiteralTypes*/ false);
         var silentNeverSignature = createSignature(undefined, undefined, undefined, ts.emptyArray, silentNeverType, /*resolvedTypePredicate*/ undefined, 0, /*hasRestParameter*/ false, /*hasLiteralTypes*/ false);
         var enumNumberIndexInfo = createIndexInfo(stringType, /*isReadonly*/ true);
+        var iterationTypesCache = ts.createMap(); // cache for common IterationTypes instances
+        var noIterationTypes = {
+            get yieldType() { throw new Error("Not supported"); },
+            get returnType() { throw new Error("Not supported"); },
+            get nextType() { throw new Error("Not supported"); },
+        };
+        var anyIterationTypes = createIterationTypes(anyType, anyType, anyType);
+        var anyIterationTypesExceptNext = createIterationTypes(anyType, anyType, unknownType);
+        var defaultIterationTypes = createIterationTypes(neverType, anyType, undefinedType); // default iteration types for `Iterator`.
+        var asyncIterationTypesResolver = {
+            iterableCacheKey: "iterationTypesOfAsyncIterable",
+            iteratorCacheKey: "iterationTypesOfAsyncIterator",
+            iteratorSymbolName: "asyncIterator",
+            getGlobalIteratorType: getGlobalAsyncIteratorType,
+            getGlobalIterableType: getGlobalAsyncIterableType,
+            getGlobalIterableIteratorType: getGlobalAsyncIterableIteratorType,
+            getGlobalGeneratorType: getGlobalAsyncGeneratorType,
+            resolveIterationType: getAwaitedType,
+            mustHaveANextMethodDiagnostic: ts.Diagnostics.An_async_iterator_must_have_a_next_method,
+            mustBeAMethodDiagnostic: ts.Diagnostics.The_0_property_of_an_async_iterator_must_be_a_method,
+            mustHaveAValueDiagnostic: ts.Diagnostics.The_type_returned_by_the_0_method_of_an_async_iterator_must_be_a_promise_for_a_type_with_a_value_property,
+        };
+        var syncIterationTypesResolver = {
+            iterableCacheKey: "iterationTypesOfIterable",
+            iteratorCacheKey: "iterationTypesOfIterator",
+            iteratorSymbolName: "iterator",
+            getGlobalIteratorType: getGlobalIteratorType,
+            getGlobalIterableType: getGlobalIterableType,
+            getGlobalIterableIteratorType: getGlobalIterableIteratorType,
+            getGlobalGeneratorType: getGlobalGeneratorType,
+            resolveIterationType: function (type, _errorNode) { return type; },
+            mustHaveANextMethodDiagnostic: ts.Diagnostics.An_iterator_must_have_a_next_method,
+            mustBeAMethodDiagnostic: ts.Diagnostics.The_0_property_of_an_iterator_must_be_a_method,
+            mustHaveAValueDiagnostic: ts.Diagnostics.The_type_returned_by_the_0_method_of_an_iterator_must_have_a_value_property,
+        };
         /** Key is "/path/to/a.ts|/path/to/b.ts". */
         var amalgamatedDuplicates;
         var reverseMappedCache = ts.createMap();
@@ -31484,6 +31986,7 @@ var ts;
          * This is only used if there is no exact match.
          */
         var patternAmbientModules;
+        var patternAmbientModuleAugmentations;
         var globalObjectType;
         var globalFunctionType;
         var globalCallableFunctionType;
@@ -31512,14 +32015,17 @@ var ts;
         var deferredGlobalIterableType;
         var deferredGlobalIteratorType;
         var deferredGlobalIterableIteratorType;
+        var deferredGlobalGeneratorType;
+        var deferredGlobalIteratorYieldResultType;
+        var deferredGlobalIteratorReturnResultType;
         var deferredGlobalAsyncIterableType;
         var deferredGlobalAsyncIteratorType;
         var deferredGlobalAsyncIterableIteratorType;
+        var deferredGlobalAsyncGeneratorType;
         var deferredGlobalTemplateStringsArrayType;
         var deferredGlobalImportMetaType;
         var deferredGlobalExtractSymbol;
-        var deferredGlobalExcludeSymbol;
-        var deferredGlobalPickSymbol;
+        var deferredGlobalOmitSymbol;
         var deferredGlobalBigIntType;
         var allPotentiallyUnusedIdentifiers = ts.createMap(); // key is file name
         var flowLoopStart = 0;
@@ -31538,6 +32044,8 @@ var ts;
         var symbolLinks = [];
         var nodeLinks = [];
         var flowLoopCaches = [];
+        var flowAssignmentKeys = [];
+        var flowAssignmentTypes = [];
         var flowLoopNodes = [];
         var flowLoopKeys = [];
         var flowLoopTypes = [];
@@ -31654,6 +32162,7 @@ var ts;
         var typeofType = createTypeofType();
         var _jsxNamespace;
         var _jsxFactoryEntity;
+        var outofbandVarianceMarkerHandler;
         var subtypeRelation = ts.createMap();
         var assignableRelation = ts.createMap();
         var comparableRelation = ts.createMap();
@@ -31678,6 +32187,19 @@ var ts;
             CheckMode[CheckMode["SkipGenericFunctions"] = 8] = "SkipGenericFunctions";
             CheckMode[CheckMode["IsForSignatureHelp"] = 16] = "IsForSignatureHelp";
         })(CheckMode || (CheckMode = {}));
+        var ContextFlags;
+        (function (ContextFlags) {
+            ContextFlags[ContextFlags["None"] = 0] = "None";
+            ContextFlags[ContextFlags["Signature"] = 1] = "Signature";
+        })(ContextFlags || (ContextFlags = {}));
+        var AccessFlags;
+        (function (AccessFlags) {
+            AccessFlags[AccessFlags["None"] = 0] = "None";
+            AccessFlags[AccessFlags["NoIndexSignatures"] = 1] = "NoIndexSignatures";
+            AccessFlags[AccessFlags["Writing"] = 2] = "Writing";
+            AccessFlags[AccessFlags["CacheSymbol"] = 4] = "CacheSymbol";
+            AccessFlags[AccessFlags["NoTupleBoundsCheck"] = 8] = "NoTupleBoundsCheck";
+        })(AccessFlags || (AccessFlags = {}));
         var CallbackCheck;
         (function (CallbackCheck) {
             CallbackCheck[CallbackCheck["None"] = 0] = "None";
@@ -31763,18 +32285,6 @@ var ts;
                 return diagnostic;
             }
         }
-        function addRelatedInfo(diagnostic) {
-            var relatedInformation = [];
-            for (var _i = 1; _i < arguments.length; _i++) {
-                relatedInformation[_i - 1] = arguments[_i];
-            }
-            var _a;
-            if (!diagnostic.relatedInformation) {
-                diagnostic.relatedInformation = [];
-            }
-            (_a = diagnostic.relatedInformation).push.apply(_a, relatedInformation);
-            return diagnostic;
-        }
         function error(location, message, arg0, arg1, arg2, arg3) {
             var diagnostic = location
                 ? ts.createDiagnosticForNode(location, message, arg0, arg1, arg2, arg3)
@@ -31793,6 +32303,14 @@ var ts;
         function errorOrSuggestion(isError, location, message, arg0, arg1, arg2, arg3) {
             addErrorOrSuggestion(isError, "message" in message ? ts.createDiagnosticForNode(location, message, arg0, arg1, arg2, arg3) : ts.createDiagnosticForNodeFromMessageChain(location, message));
         }
+        function errorAndMaybeSuggestAwait(location, maybeMissingAwait, message, arg0, arg1, arg2, arg3) {
+            var diagnostic = error(location, message, arg0, arg1, arg2, arg3);
+            if (maybeMissingAwait) {
+                var related = ts.createDiagnosticForNode(location, ts.Diagnostics.Did_you_forget_to_use_await);
+                ts.addRelatedInfo(diagnostic, related);
+            }
+            return diagnostic;
+        }
         function createSymbol(flags, name, checkFlags) {
             symbolCount++;
             var symbol = (new Symbol(flags | 33554432 /* Transient */, name));
@@ -31864,7 +32382,8 @@ var ts;
          * Note: if target is transient, then it is mutable, and mergeSymbol with both mutate and return it.
          * If target is not transient, mergeSymbol will produce a transient clone, mutate that and return it.
          */
-        function mergeSymbol(target, source) {
+        function mergeSymbol(target, source, unidirectional) {
+            if (unidirectional === void 0) { unidirectional = false; }
             if (!(target.flags & getExcludedSymbolFlags(source.flags)) ||
                 (source.flags | target.flags) & 67108864 /* Assignment */) {
                 ts.Debug.assert(source !== target);
@@ -31892,17 +32411,24 @@ var ts;
                 if (source.members) {
                     if (!target.members)
                         target.members = ts.createSymbolTable();
-                    mergeSymbolTable(target.members, source.members);
+                    mergeSymbolTable(target.members, source.members, unidirectional);
                 }
                 if (source.exports) {
                     if (!target.exports)
                         target.exports = ts.createSymbolTable();
-                    mergeSymbolTable(target.exports, source.exports);
+                    mergeSymbolTable(target.exports, source.exports, unidirectional);
+                }
+                if (!unidirectional) {
+                    recordMergedSymbol(target, source);
                 }
-                recordMergedSymbol(target, source);
             }
             else if (target.flags & 1024 /* NamespaceModule */) {
-                error(ts.getNameOfDeclaration(source.declarations[0]), ts.Diagnostics.Cannot_augment_module_0_with_value_exports_because_it_resolves_to_a_non_module_entity, symbolToString(target));
+                // Do not report an error when merging `var globalThis` with the built-in `globalThis`,
+                // as we will already report a "Declaration name conflicts..." error, and this error
+                // won't make much sense.
+                if (target !== globalThisSymbol) {
+                    error(ts.getNameOfDeclaration(source.declarations[0]), ts.Diagnostics.Cannot_augment_module_0_with_value_exports_because_it_resolves_to_a_non_module_entity, symbolToString(target));
+                }
             }
             else { // error
                 var isEitherEnum = !!(target.flags & 384 /* Enum */ || source.flags & 384 /* Enum */);
@@ -31954,7 +32480,7 @@ var ts;
                 err.relatedInformation = err.relatedInformation || [];
                 if (ts.length(err.relatedInformation) >= 5)
                     continue;
-                addRelatedInfo(err, !ts.length(err.relatedInformation) ? ts.createDiagnosticForNode(relatedNode, ts.Diagnostics._0_was_also_declared_here, symbolName) : ts.createDiagnosticForNode(relatedNode, ts.Diagnostics.and_here));
+                ts.addRelatedInfo(err, !ts.length(err.relatedInformation) ? ts.createDiagnosticForNode(relatedNode, ts.Diagnostics._0_was_also_declared_here, symbolName) : ts.createDiagnosticForNode(relatedNode, ts.Diagnostics.and_here));
             }
         }
         function combineSymbolTables(first, second) {
@@ -31967,10 +32493,11 @@ var ts;
             mergeSymbolTable(combined, second);
             return combined;
         }
-        function mergeSymbolTable(target, source) {
+        function mergeSymbolTable(target, source, unidirectional) {
+            if (unidirectional === void 0) { unidirectional = false; }
             source.forEach(function (sourceSymbol, id) {
                 var targetSymbol = target.get(id);
-                target.set(id, targetSymbol ? mergeSymbol(targetSymbol, sourceSymbol) : sourceSymbol);
+                target.set(id, targetSymbol ? mergeSymbol(targetSymbol, sourceSymbol, unidirectional) : sourceSymbol);
             });
         }
         function mergeModuleAugmentation(moduleName) {
@@ -31991,14 +32518,29 @@ var ts;
                 var moduleNotFoundError = !(moduleName.parent.parent.flags & 4194304 /* Ambient */)
                     ? ts.Diagnostics.Invalid_module_name_in_augmentation_module_0_cannot_be_found
                     : undefined;
-                var mainModule = resolveExternalModuleNameWorker(moduleName, moduleName, moduleNotFoundError, /*isForAugmentation*/ true);
-                if (!mainModule) {
+                var mainModule_1 = resolveExternalModuleNameWorker(moduleName, moduleName, moduleNotFoundError, /*isForAugmentation*/ true);
+                if (!mainModule_1) {
                     return;
                 }
                 // obtain item referenced by 'export='
-                mainModule = resolveExternalModuleSymbol(mainModule);
-                if (mainModule.flags & 1920 /* Namespace */) {
-                    mainModule = mergeSymbol(mainModule, moduleAugmentation.symbol);
+                mainModule_1 = resolveExternalModuleSymbol(mainModule_1);
+                if (mainModule_1.flags & 1920 /* Namespace */) {
+                    // If we’re merging an augmentation to a pattern ambient module, we want to
+                    // perform the merge unidirectionally from the augmentation ('a.foo') to
+                    // the pattern ('*.foo'), so that 'getMergedSymbol()' on a.foo gives you
+                    // all the exports both from the pattern and from the augmentation, but
+                    // 'getMergedSymbol()' on *.foo only gives you exports from *.foo.
+                    if (ts.some(patternAmbientModules, function (module) { return mainModule_1 === module.symbol; })) {
+                        var merged = mergeSymbol(moduleAugmentation.symbol, mainModule_1, /*unidirectional*/ true);
+                        if (!patternAmbientModuleAugmentations) {
+                            patternAmbientModuleAugmentations = ts.createMap();
+                        }
+                        // moduleName will be a StringLiteral since this is not `declare global`.
+                        patternAmbientModuleAugmentations.set(moduleName.text, merged);
+                    }
+                    else {
+                        mergeSymbol(mainModule_1, moduleAugmentation.symbol);
+                    }
                 }
                 else {
                     // moduleName will be a StringLiteral since this is not `declare global`.
@@ -32032,7 +32574,7 @@ var ts;
             return nodeLinks[nodeId] || (nodeLinks[nodeId] = { flags: 0 });
         }
         function isGlobalSourceFile(node) {
-            return node.kind === 284 /* SourceFile */ && !ts.isExternalOrCommonJsModule(node);
+            return node.kind === 285 /* SourceFile */ && !ts.isExternalOrCommonJsModule(node);
         }
         function getSymbol(symbols, name, meaning) {
             if (meaning) {
@@ -32090,17 +32632,17 @@ var ts;
             }
             if (declaration.pos <= usage.pos) {
                 // declaration is before usage
-                if (declaration.kind === 186 /* BindingElement */) {
+                if (declaration.kind === 187 /* BindingElement */) {
                     // still might be illegal if declaration and usage are both binding elements (eg var [a = b, b = b] = [1, 2])
-                    var errorBindingElement = ts.getAncestor(usage, 186 /* BindingElement */);
+                    var errorBindingElement = ts.getAncestor(usage, 187 /* BindingElement */);
                     if (errorBindingElement) {
                         return ts.findAncestor(errorBindingElement, ts.isBindingElement) !== ts.findAncestor(declaration, ts.isBindingElement) ||
                             declaration.pos < errorBindingElement.pos;
                     }
                     // or it might be illegal if usage happens before parent variable is declared (eg var [a] = a)
-                    return isBlockScopedNameDeclaredBeforeUse(ts.getAncestor(declaration, 237 /* VariableDeclaration */), usage);
+                    return isBlockScopedNameDeclaredBeforeUse(ts.getAncestor(declaration, 238 /* VariableDeclaration */), usage);
                 }
-                else if (declaration.kind === 237 /* VariableDeclaration */) {
+                else if (declaration.kind === 238 /* VariableDeclaration */) {
                     // still might be illegal if usage is in the initializer of the variable declaration (eg var a = a)
                     return !isImmediatelyUsedInInitializerOfBlockScopedVariable(declaration, usage);
                 }
@@ -32108,6 +32650,10 @@ var ts;
                     // still might be illegal if the usage is within a computed property name in the class (eg class A { static p = "a"; [A.p]() {} })
                     return !ts.findAncestor(usage, function (n) { return ts.isComputedPropertyName(n) && n.parent.parent === declaration; });
                 }
+                else if (ts.isPropertyDeclaration(declaration)) {
+                    // still might be illegal if a self-referencing property initializer (eg private x = this.x)
+                    return !isPropertyImmediatelyReferencedWithinDeclaration(declaration, usage);
+                }
                 return true;
             }
             // declaration is after usage, but it can still be legal if usage is deferred:
@@ -32119,12 +32665,12 @@ var ts;
             // or if usage is in a type context:
             // 1. inside a type query (typeof in type position)
             // 2. inside a jsdoc comment
-            if (usage.parent.kind === 257 /* ExportSpecifier */ || (usage.parent.kind === 254 /* ExportAssignment */ && usage.parent.isExportEquals)) {
+            if (usage.parent.kind === 258 /* ExportSpecifier */ || (usage.parent.kind === 255 /* ExportAssignment */ && usage.parent.isExportEquals)) {
                 // export specifiers do not use the variable, they only make it available for use
                 return true;
             }
             // When resolving symbols for exports, the `usage` location passed in can be the export site directly
-            if (usage.kind === 254 /* ExportAssignment */ && usage.isExportEquals) {
+            if (usage.kind === 255 /* ExportAssignment */ && usage.isExportEquals) {
                 return true;
             }
             var container = ts.getEnclosingBlockScopeContainer(declaration);
@@ -32132,9 +32678,9 @@ var ts;
             function isImmediatelyUsedInInitializerOfBlockScopedVariable(declaration, usage) {
                 var container = ts.getEnclosingBlockScopeContainer(declaration);
                 switch (declaration.parent.parent.kind) {
-                    case 219 /* VariableStatement */:
-                    case 225 /* ForStatement */:
-                    case 227 /* ForOfStatement */:
+                    case 220 /* VariableStatement */:
+                    case 226 /* ForStatement */:
+                    case 228 /* ForOfStatement */:
                         // variable statement/for/for-of statement case,
                         // use site should not be inside variable declaration (initializer of declaration or binding element)
                         if (isSameScopeDescendentOf(usage, declaration, container)) {
@@ -32155,16 +32701,16 @@ var ts;
                         return true;
                     }
                     var initializerOfProperty = current.parent &&
-                        current.parent.kind === 154 /* PropertyDeclaration */ &&
+                        current.parent.kind === 155 /* PropertyDeclaration */ &&
                         current.parent.initializer === current;
                     if (initializerOfProperty) {
                         if (ts.hasModifier(current.parent, 32 /* Static */)) {
-                            if (declaration.kind === 156 /* MethodDeclaration */) {
+                            if (declaration.kind === 157 /* MethodDeclaration */) {
                                 return true;
                             }
                         }
                         else {
-                            var isDeclarationInstanceProperty = declaration.kind === 154 /* PropertyDeclaration */ && !ts.hasModifier(declaration, 32 /* Static */);
+                            var isDeclarationInstanceProperty = declaration.kind === 155 /* PropertyDeclaration */ && !ts.hasModifier(declaration, 32 /* Static */);
                             if (!isDeclarationInstanceProperty || ts.getContainingClass(usage) !== ts.getContainingClass(declaration)) {
                                 return true;
                             }
@@ -32173,6 +32719,36 @@ var ts;
                     return false;
                 });
             }
+            function isPropertyImmediatelyReferencedWithinDeclaration(declaration, usage) {
+                // always legal if usage is after declaration
+                if (usage.end > declaration.end) {
+                    return false;
+                }
+                // still might be legal if usage is deferred (e.g. x: any = () => this.x)
+                // otherwise illegal if immediately referenced within the declaration (e.g. x: any = this.x)
+                var ancestorChangingReferenceScope = ts.findAncestor(usage, function (node) {
+                    if (node === declaration) {
+                        return "quit";
+                    }
+                    switch (node.kind) {
+                        case 198 /* ArrowFunction */:
+                        case 155 /* PropertyDeclaration */:
+                            return true;
+                        case 219 /* Block */:
+                            switch (node.parent.kind) {
+                                case 159 /* GetAccessor */:
+                                case 157 /* MethodDeclaration */:
+                                case 160 /* SetAccessor */:
+                                    return true;
+                                default:
+                                    return false;
+                            }
+                        default:
+                            return false;
+                    }
+                });
+                return ancestorChangingReferenceScope === undefined;
+            }
         }
         /**
          * Resolve a given name for a given meaning at a given location. An error is reported if the name was not found and
@@ -32191,6 +32767,8 @@ var ts;
             var lastLocation;
             var lastSelfReferenceLocation;
             var propertyWithInvalidInitializer;
+            var associatedDeclarationForContainingInitializer;
+            var withinDeferredContext = false;
             var errorLocation = location;
             var grandparent;
             var isInExternalModule = false;
@@ -32206,12 +32784,12 @@ var ts;
                             // - parameters are only in the scope of function body
                             // This restriction does not apply to JSDoc comment types because they are parented
                             // at a higher level than type parameters would normally be
-                            if (meaning & result.flags & 67897832 /* Type */ && lastLocation.kind !== 296 /* JSDocComment */) {
+                            if (meaning & result.flags & 67897832 /* Type */ && lastLocation.kind !== 297 /* JSDocComment */) {
                                 useResult = result.flags & 262144 /* TypeParameter */
                                     // type parameters are visible in parameter list, return type and type parameter list
                                     ? lastLocation === location.type ||
-                                        lastLocation.kind === 151 /* Parameter */ ||
-                                        lastLocation.kind === 150 /* TypeParameter */
+                                        lastLocation.kind === 152 /* Parameter */ ||
+                                        lastLocation.kind === 151 /* TypeParameter */
                                     // local types not visible outside the function body
                                     : false;
                             }
@@ -32228,13 +32806,13 @@ var ts;
                                     // however it is detected separately when checking initializers of parameters
                                     // to make sure that they reference no variables declared after them.
                                     useResult =
-                                        lastLocation.kind === 151 /* Parameter */ ||
+                                        lastLocation.kind === 152 /* Parameter */ ||
                                             (lastLocation === location.type &&
                                                 !!ts.findAncestor(result.valueDeclaration, ts.isParameter));
                                 }
                             }
                         }
-                        else if (location.kind === 175 /* ConditionalType */) {
+                        else if (location.kind === 176 /* ConditionalType */) {
                             // A type parameter declared using 'infer T' in a conditional type is visible only in
                             // the true branch of the conditional type.
                             useResult = lastLocation === location.trueType;
@@ -32247,15 +32825,16 @@ var ts;
                         }
                     }
                 }
+                withinDeferredContext = withinDeferredContext || getIsDeferredContext(location, lastLocation);
                 switch (location.kind) {
-                    case 284 /* SourceFile */:
+                    case 285 /* SourceFile */:
                         if (!ts.isExternalOrCommonJsModule(location))
                             break;
                         isInExternalModule = true;
                     // falls through
-                    case 244 /* ModuleDeclaration */:
+                    case 245 /* ModuleDeclaration */:
                         var moduleExports = getSymbolOfNode(location).exports;
-                        if (location.kind === 284 /* SourceFile */ || ts.isAmbientModule(location)) {
+                        if (location.kind === 285 /* SourceFile */ || ts.isAmbientModule(location)) {
                             // It's an external module. First see if the module has an export default and if the local
                             // name of that export default matches.
                             if (result = moduleExports.get("default" /* Default */)) {
@@ -32279,7 +32858,7 @@ var ts;
                             var moduleExport = moduleExports.get(name);
                             if (moduleExport &&
                                 moduleExport.flags === 2097152 /* Alias */ &&
-                                ts.getDeclarationOfKind(moduleExport, 257 /* ExportSpecifier */)) {
+                                ts.getDeclarationOfKind(moduleExport, 258 /* ExportSpecifier */)) {
                                 break;
                             }
                         }
@@ -32293,20 +32872,19 @@ var ts;
                             }
                         }
                         break;
-                    case 243 /* EnumDeclaration */:
+                    case 244 /* EnumDeclaration */:
                         if (result = lookup(getSymbolOfNode(location).exports, name, meaning & 8 /* EnumMember */)) {
                             break loop;
                         }
                         break;
-                    case 154 /* PropertyDeclaration */:
-                    case 153 /* PropertySignature */:
+                    case 155 /* PropertyDeclaration */:
                         // TypeScript 1.0 spec (April 2014): 8.4.1
                         // Initializer expressions for instance member variables are evaluated in the scope
                         // of the class constructor body but are not permitted to reference parameters or
                         // local variables of the constructor. This effectively means that entities from outer scopes
                         // by the same name as a constructor parameter or local variable are inaccessible
                         // in initializer expressions for instance member variables.
-                        if (ts.isClassLike(location.parent) && !ts.hasModifier(location, 32 /* Static */)) {
+                        if (!ts.hasModifier(location, 32 /* Static */)) {
                             var ctor = findConstructorDeclaration(location.parent);
                             if (ctor && ctor.locals) {
                                 if (lookup(ctor.locals, name, meaning & 67220415 /* Value */)) {
@@ -32316,9 +32894,9 @@ var ts;
                             }
                         }
                         break;
-                    case 240 /* ClassDeclaration */:
-                    case 209 /* ClassExpression */:
-                    case 241 /* InterfaceDeclaration */:
+                    case 241 /* ClassDeclaration */:
+                    case 210 /* ClassExpression */:
+                    case 242 /* InterfaceDeclaration */:
                         // The below is used to lookup type parameters within a class or interface, as they are added to the class/interface locals
                         // These can never be latebound, so the symbol's raw members are sufficient. `getMembersOfNode` cannot be used, as it would
                         // trigger resolving late-bound names, which we may already be in the process of doing while we're here!
@@ -32337,7 +32915,7 @@ var ts;
                             }
                             break loop;
                         }
-                        if (location.kind === 209 /* ClassExpression */ && meaning & 32 /* Class */) {
+                        if (location.kind === 210 /* ClassExpression */ && meaning & 32 /* Class */) {
                             var className = location.name;
                             if (className && name === className.escapedText) {
                                 result = location.symbol;
@@ -32345,9 +32923,9 @@ var ts;
                             }
                         }
                         break;
-                    case 211 /* ExpressionWithTypeArguments */:
+                    case 212 /* ExpressionWithTypeArguments */:
                         // The type parameters of a class are not in scope in the base class expression.
-                        if (lastLocation === location.expression && location.parent.token === 86 /* ExtendsKeyword */) {
+                        if (lastLocation === location.expression && location.parent.token === 87 /* ExtendsKeyword */) {
                             var container = location.parent.parent;
                             if (ts.isClassLike(container) && (result = lookup(getSymbolOfNode(container).members, name, meaning & 67897832 /* Type */))) {
                                 if (nameNotFoundMessage) {
@@ -32365,9 +32943,9 @@ var ts;
                     //       [foo<T>()]() { } // <-- Reference to T from class's own computed property
                     //   }
                     //
-                    case 149 /* ComputedPropertyName */:
+                    case 150 /* ComputedPropertyName */:
                         grandparent = location.parent.parent;
-                        if (ts.isClassLike(grandparent) || grandparent.kind === 241 /* InterfaceDeclaration */) {
+                        if (ts.isClassLike(grandparent) || grandparent.kind === 242 /* InterfaceDeclaration */) {
                             // A reference to this grandparent's type parameters would be an error
                             if (result = lookup(getSymbolOfNode(grandparent).members, name, meaning & 67897832 /* Type */)) {
                                 error(errorLocation, ts.Diagnostics.A_computed_property_name_cannot_reference_a_type_parameter_from_its_containing_type);
@@ -32375,24 +32953,24 @@ var ts;
                             }
                         }
                         break;
-                    case 197 /* ArrowFunction */:
+                    case 198 /* ArrowFunction */:
                         // when targeting ES6 or higher there is no 'arguments' in an arrow function
                         // for lower compile targets the resolved symbol is used to emit an error
                         if (compilerOptions.target >= 2 /* ES2015 */) {
                             break;
                         }
                     // falls through
-                    case 156 /* MethodDeclaration */:
-                    case 157 /* Constructor */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
-                    case 239 /* FunctionDeclaration */:
+                    case 157 /* MethodDeclaration */:
+                    case 158 /* Constructor */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
+                    case 240 /* FunctionDeclaration */:
                         if (meaning & 3 /* Variable */ && name === "arguments") {
                             result = argumentsSymbol;
                             break loop;
                         }
                         break;
-                    case 196 /* FunctionExpression */:
+                    case 197 /* FunctionExpression */:
                         if (meaning & 3 /* Variable */ && name === "arguments") {
                             result = argumentsSymbol;
                             break loop;
@@ -32405,7 +32983,7 @@ var ts;
                             }
                         }
                         break;
-                    case 152 /* Decorator */:
+                    case 153 /* Decorator */:
                         // Decorators are resolved at the class declaration. Resolving at the parameter
                         // or member would result in looking up locals in the method.
                         //
@@ -32414,7 +32992,7 @@ var ts;
                         //       method(@y x, y) {} // <-- decorator y should be resolved at the class declaration, not the parameter.
                         //   }
                         //
-                        if (location.parent && location.parent.kind === 151 /* Parameter */) {
+                        if (location.parent && location.parent.kind === 152 /* Parameter */) {
                             location = location.parent;
                         }
                         //
@@ -32423,15 +33001,34 @@ var ts;
                         //       @y method(x, y) {} // <-- decorator y should be resolved at the class declaration, not the method.
                         //   }
                         //
-                        if (location.parent && ts.isClassElement(location.parent)) {
+                        // class Decorators are resolved outside of the class to avoid referencing type parameters of that class.
+                        //
+                        //   type T = number;
+                        //   declare function y(x: T): any;
+                        //   @param(1 as T) // <-- T should resolve to the type alias outside of class C
+                        //   class C<T> {}
+                        if (location.parent && (ts.isClassElement(location.parent) || location.parent.kind === 241 /* ClassDeclaration */)) {
                             location = location.parent;
                         }
                         break;
-                    case 309 /* JSDocTypedefTag */:
-                    case 302 /* JSDocCallbackTag */:
+                    case 311 /* JSDocTypedefTag */:
+                    case 304 /* JSDocCallbackTag */:
                         // js type aliases do not resolve names from their host, so skip past it
                         location = ts.getJSDocHost(location);
                         break;
+                    case 152 /* Parameter */:
+                        if (lastLocation && lastLocation === location.initializer) {
+                            associatedDeclarationForContainingInitializer = location;
+                        }
+                        break;
+                    case 187 /* BindingElement */:
+                        if (lastLocation && lastLocation === location.initializer) {
+                            var root = ts.getRootDeclaration(location);
+                            if (root.kind === 152 /* Parameter */) {
+                                associatedDeclarationForContainingInitializer = location;
+                            }
+                        }
+                        break;
                 }
                 if (isSelfReferenceLocation(location)) {
                     lastSelfReferenceLocation = location;
@@ -32447,7 +33044,7 @@ var ts;
             }
             if (!result) {
                 if (lastLocation) {
-                    ts.Debug.assert(lastLocation.kind === 284 /* SourceFile */);
+                    ts.Debug.assert(lastLocation.kind === 285 /* SourceFile */);
                     if (lastLocation.commonJsModuleIndicator && name === "exports" && meaning & lastLocation.symbol.flags) {
                         return lastLocation.symbol;
                     }
@@ -32479,7 +33076,7 @@ var ts;
                                 var suggestionName = symbolToString(suggestion);
                                 var diagnostic = error(errorLocation, suggestedNameNotFoundMessage, diagnosticName(nameArg), suggestionName);
                                 if (suggestion.valueDeclaration) {
-                                    addRelatedInfo(diagnostic, ts.createDiagnosticForNode(suggestion.valueDeclaration, ts.Diagnostics._0_is_declared_here, suggestionName));
+                                    ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(suggestion.valueDeclaration, ts.Diagnostics._0_is_declared_here, suggestionName));
                                 }
                             }
                         }
@@ -32523,20 +33120,48 @@ var ts;
                 if (result && isInExternalModule && (meaning & 67220415 /* Value */) === 67220415 /* Value */ && !(originalLocation.flags & 2097152 /* JSDoc */)) {
                     var merged = getMergedSymbol(result);
                     if (ts.length(merged.declarations) && ts.every(merged.declarations, function (d) { return ts.isNamespaceExportDeclaration(d) || ts.isSourceFile(d) && !!d.symbol.globalExports; })) {
-                        error(errorLocation, ts.Diagnostics._0_refers_to_a_UMD_global_but_the_current_file_is_a_module_Consider_adding_an_import_instead, ts.unescapeLeadingUnderscores(name)); // TODO: GH#18217
+                        errorOrSuggestion(!compilerOptions.allowUmdGlobalAccess, errorLocation, ts.Diagnostics._0_refers_to_a_UMD_global_but_the_current_file_is_a_module_Consider_adding_an_import_instead, ts.unescapeLeadingUnderscores(name));
+                    }
+                }
+                // If we're in a parameter initializer, we can't reference the values of the parameter whose initializer we're within or parameters to the right
+                if (result && associatedDeclarationForContainingInitializer && !withinDeferredContext && (meaning & 67220415 /* Value */) === 67220415 /* Value */) {
+                    var candidate = getMergedSymbol(getLateBoundSymbol(result));
+                    var root = ts.getRootDeclaration(associatedDeclarationForContainingInitializer);
+                    // A parameter initializer or binding pattern initializer within a parameter cannot refer to itself
+                    if (candidate === getSymbolOfNode(associatedDeclarationForContainingInitializer)) {
+                        error(errorLocation, ts.Diagnostics.Parameter_0_cannot_be_referenced_in_its_initializer, ts.declarationNameToString(associatedDeclarationForContainingInitializer.name));
+                    }
+                    // And it cannot refer to any declarations which come after it
+                    else if (candidate.valueDeclaration && candidate.valueDeclaration.pos > associatedDeclarationForContainingInitializer.pos && root.parent.locals && lookup(root.parent.locals, candidate.escapedName, meaning) === candidate) {
+                        error(errorLocation, ts.Diagnostics.Initializer_of_parameter_0_cannot_reference_identifier_1_declared_after_it, ts.declarationNameToString(associatedDeclarationForContainingInitializer.name), ts.declarationNameToString(errorLocation));
                     }
                 }
             }
             return result;
         }
+        function getIsDeferredContext(location, lastLocation) {
+            if (location.kind !== 198 /* ArrowFunction */ && location.kind !== 197 /* FunctionExpression */) {
+                // initializers in instance property declaration of class like entities are executed in constructor and thus deferred
+                return ts.isTypeQueryNode(location) || ((ts.isFunctionLikeDeclaration(location) ||
+                    (location.kind === 155 /* PropertyDeclaration */ && !ts.hasModifier(location, 32 /* Static */))) && (!lastLocation || lastLocation !== location.name)); // A name is evaluated within the enclosing scope - so it shouldn't count as deferred
+            }
+            if (lastLocation && lastLocation === location.name) {
+                return false;
+            }
+            // generator functions and async functions are not inlined in control flow when immediately invoked
+            if (location.asteriskToken || ts.hasModifier(location, 256 /* Async */)) {
+                return true;
+            }
+            return !ts.getImmediatelyInvokedFunctionExpression(location);
+        }
         function isSelfReferenceLocation(node) {
             switch (node.kind) {
-                case 239 /* FunctionDeclaration */:
-                case 240 /* ClassDeclaration */:
-                case 241 /* InterfaceDeclaration */:
-                case 243 /* EnumDeclaration */:
-                case 242 /* TypeAliasDeclaration */:
-                case 244 /* ModuleDeclaration */: // For `namespace N { N; }`
+                case 240 /* FunctionDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 242 /* InterfaceDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
+                case 245 /* ModuleDeclaration */: // For `namespace N { N; }`
                     return true;
                 default:
                     return false;
@@ -32548,7 +33173,7 @@ var ts;
         function isTypeParameterSymbolDeclaredInContainer(symbol, container) {
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var decl = _a[_i];
-                if (decl.kind === 150 /* TypeParameter */) {
+                if (decl.kind === 151 /* TypeParameter */) {
                     var parent = ts.isJSDocTemplateTag(decl.parent) ? ts.getJSDocHost(decl.parent) : decl.parent;
                     if (parent === container) {
                         return !(ts.isJSDocTemplateTag(decl.parent) && ts.find(decl.parent.parent.tags, ts.isJSDocTypeAlias)); // TODO: GH#18217
@@ -32603,10 +33228,10 @@ var ts;
          */
         function getEntityNameForExtendingInterface(node) {
             switch (node.kind) {
-                case 72 /* Identifier */:
-                case 189 /* PropertyAccessExpression */:
+                case 73 /* Identifier */:
+                case 190 /* PropertyAccessExpression */:
                     return node.parent ? getEntityNameForExtendingInterface(node.parent) : undefined;
-                case 211 /* ExpressionWithTypeArguments */:
+                case 212 /* ExpressionWithTypeArguments */:
                     if (ts.isEntityNameExpression(node.expression)) {
                         return node.expression;
                     }
@@ -32695,7 +33320,7 @@ var ts;
         function checkResolvedBlockScopedVariable(result, errorLocation) {
             ts.Debug.assert(!!(result.flags & 2 /* BlockScopedVariable */ || result.flags & 32 /* Class */ || result.flags & 384 /* Enum */));
             // Block-scoped variables cannot be used before their definition
-            var declaration = ts.find(result.declarations, function (d) { return ts.isBlockOrCatchScoped(d) || ts.isClassLike(d) || (d.kind === 243 /* EnumDeclaration */) || ts.isInJSFile(d) && !!ts.getJSDocEnumTag(d); });
+            var declaration = ts.find(result.declarations, function (d) { return ts.isBlockOrCatchScoped(d) || ts.isClassLike(d) || (d.kind === 244 /* EnumDeclaration */) || ts.isInJSFile(d) && !!ts.getJSDocEnumTag(d); });
             if (declaration === undefined)
                 return ts.Debug.fail("Declaration to checkResolvedBlockScopedVariable is undefined");
             if (!(declaration.flags & 4194304 /* Ambient */) && !isBlockScopedNameDeclaredBeforeUse(declaration, errorLocation)) {
@@ -32717,7 +33342,7 @@ var ts;
                     }
                 }
                 if (diagnosticMessage) {
-                    addRelatedInfo(diagnosticMessage, ts.createDiagnosticForNode(declaration, ts.Diagnostics._0_is_declared_here, declarationName));
+                    ts.addRelatedInfo(diagnosticMessage, ts.createDiagnosticForNode(declaration, ts.Diagnostics._0_is_declared_here, declarationName));
                 }
             }
         }
@@ -32730,13 +33355,13 @@ var ts;
         }
         function getAnyImportSyntax(node) {
             switch (node.kind) {
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return node;
-                case 250 /* ImportClause */:
+                case 251 /* ImportClause */:
                     return node.parent;
-                case 251 /* NamespaceImport */:
+                case 252 /* NamespaceImport */:
                     return node.parent.parent;
-                case 253 /* ImportSpecifier */:
+                case 254 /* ImportSpecifier */:
                     return node.parent.parent.parent;
                 default:
                     return undefined;
@@ -32746,7 +33371,7 @@ var ts;
             return ts.find(symbol.declarations, ts.isAliasSymbolDeclaration);
         }
         function getTargetOfImportEqualsDeclaration(node, dontResolveAlias) {
-            if (node.moduleReference.kind === 259 /* ExternalModuleReference */) {
+            if (node.moduleReference.kind === 260 /* ExternalModuleReference */) {
                 return resolveExternalModuleSymbol(resolveExternalModuleName(node, ts.getExternalModuleImportEqualsDeclarationExpression(node)));
             }
             return getSymbolOfPartOfRightHandSideOfImportEquals(node.moduleReference, dontResolveAlias);
@@ -32803,7 +33428,16 @@ var ts;
                 var file = ts.find(moduleSymbol.declarations, ts.isSourceFile);
                 var hasSyntheticDefault = canHaveSyntheticDefault(file, moduleSymbol, dontResolveAlias);
                 if (!exportDefaultSymbol && !hasSyntheticDefault) {
-                    error(node.name, ts.Diagnostics.Module_0_has_no_default_export, symbolToString(moduleSymbol));
+                    if (hasExportAssignmentSymbol(moduleSymbol)) {
+                        var compilerOptionName = moduleKind >= ts.ModuleKind.ES2015 ? "allowSyntheticDefaultImports" : "esModuleInterop";
+                        var exportEqualsSymbol = moduleSymbol.exports.get("export=" /* ExportEquals */);
+                        var exportAssignment = exportEqualsSymbol.valueDeclaration;
+                        var err = error(node.name, ts.Diagnostics.Module_0_can_only_be_default_imported_using_the_1_flag, symbolToString(moduleSymbol), compilerOptionName);
+                        ts.addRelatedInfo(err, ts.createDiagnosticForNode(exportAssignment, ts.Diagnostics.This_module_is_declared_with_using_export_and_can_only_be_used_with_a_default_import_when_using_the_0_flag, compilerOptionName));
+                    }
+                    else {
+                        error(node.name, ts.Diagnostics.Module_0_has_no_default_export, symbolToString(moduleSymbol));
+                    }
                 }
                 else if (hasSyntheticDefault) {
                     // per emit behavior, a synthetic default overrides a "real" .default member if `__esModule` is not present
@@ -32901,7 +33535,7 @@ var ts;
                             var suggestionName = symbolToString(suggestion);
                             var diagnostic = error(name, ts.Diagnostics.Module_0_has_no_exported_member_1_Did_you_mean_2, moduleName, declarationName, suggestionName);
                             if (suggestion.valueDeclaration) {
-                                addRelatedInfo(diagnostic, ts.createDiagnosticForNode(suggestion.valueDeclaration, ts.Diagnostics._0_is_declared_here, suggestionName));
+                                ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(suggestion.valueDeclaration, ts.Diagnostics._0_is_declared_here, suggestionName));
                             }
                         }
                         else {
@@ -32938,20 +33572,20 @@ var ts;
         function getTargetOfAliasDeclaration(node, dontRecursivelyResolve) {
             if (dontRecursivelyResolve === void 0) { dontRecursivelyResolve = false; }
             switch (node.kind) {
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return getTargetOfImportEqualsDeclaration(node, dontRecursivelyResolve);
-                case 250 /* ImportClause */:
+                case 251 /* ImportClause */:
                     return getTargetOfImportClause(node, dontRecursivelyResolve);
-                case 251 /* NamespaceImport */:
+                case 252 /* NamespaceImport */:
                     return getTargetOfNamespaceImport(node, dontRecursivelyResolve);
-                case 253 /* ImportSpecifier */:
+                case 254 /* ImportSpecifier */:
                     return getTargetOfImportSpecifier(node, dontRecursivelyResolve);
-                case 257 /* ExportSpecifier */:
+                case 258 /* ExportSpecifier */:
                     return getTargetOfExportSpecifier(node, 67220415 /* Value */ | 67897832 /* Type */ | 1920 /* Namespace */, dontRecursivelyResolve);
-                case 254 /* ExportAssignment */:
-                case 204 /* BinaryExpression */:
+                case 255 /* ExportAssignment */:
+                case 205 /* BinaryExpression */:
                     return getTargetOfExportAssignment(node, dontRecursivelyResolve);
-                case 247 /* NamespaceExportDeclaration */:
+                case 248 /* NamespaceExportDeclaration */:
                     return getTargetOfNamespaceExportDeclaration(node, dontRecursivelyResolve);
                 default:
                     return ts.Debug.fail();
@@ -33012,11 +33646,11 @@ var ts;
                 var node = getDeclarationOfAliasSymbol(symbol);
                 if (!node)
                     return ts.Debug.fail();
-                if (node.kind === 254 /* ExportAssignment */) {
+                if (node.kind === 255 /* ExportAssignment */) {
                     // export default <symbol>
                     checkExpressionCached(node.expression);
                 }
-                else if (node.kind === 257 /* ExportSpecifier */) {
+                else if (node.kind === 258 /* ExportSpecifier */) {
                     // export { <symbol> } or export { <symbol> as foo }
                     checkExpressionCached(node.propertyName || node.name);
                 }
@@ -33034,17 +33668,17 @@ var ts;
             //     import a = |b|; // Namespace
             //     import a = |b.c|; // Value, type, namespace
             //     import a = |b.c|.d; // Namespace
-            if (entityName.kind === 72 /* Identifier */ && ts.isRightSideOfQualifiedNameOrPropertyAccess(entityName)) {
+            if (entityName.kind === 73 /* Identifier */ && ts.isRightSideOfQualifiedNameOrPropertyAccess(entityName)) {
                 entityName = entityName.parent;
             }
             // Check for case 1 and 3 in the above example
-            if (entityName.kind === 72 /* Identifier */ || entityName.parent.kind === 148 /* QualifiedName */) {
+            if (entityName.kind === 73 /* Identifier */ || entityName.parent.kind === 149 /* QualifiedName */) {
                 return resolveEntityName(entityName, 1920 /* Namespace */, /*ignoreErrors*/ false, dontResolveAlias);
             }
             else {
                 // Case 2 in above example
                 // entityName.kind could be a QualifiedName or a Missing identifier
-                ts.Debug.assert(entityName.parent.kind === 248 /* ImportEqualsDeclaration */);
+                ts.Debug.assert(entityName.parent.kind === 249 /* ImportEqualsDeclaration */);
                 return resolveEntityName(entityName, 67220415 /* Value */ | 67897832 /* Type */ | 1920 /* Namespace */, /*ignoreErrors*/ false, dontResolveAlias);
             }
         }
@@ -33060,17 +33694,17 @@ var ts;
             }
             var namespaceMeaning = 1920 /* Namespace */ | (ts.isInJSFile(name) ? meaning & 67220415 /* Value */ : 0);
             var symbol;
-            if (name.kind === 72 /* Identifier */) {
-                var message = meaning === namespaceMeaning ? ts.Diagnostics.Cannot_find_namespace_0 : getCannotFindNameDiagnosticForName(getFirstIdentifier(name).escapedText);
+            if (name.kind === 73 /* Identifier */) {
+                var message = meaning === namespaceMeaning ? ts.Diagnostics.Cannot_find_namespace_0 : getCannotFindNameDiagnosticForName(getFirstIdentifier(name));
                 var symbolFromJSPrototype = ts.isInJSFile(name) ? resolveEntityNameFromAssignmentDeclaration(name, meaning) : undefined;
                 symbol = resolveName(location || name, name.escapedText, meaning, ignoreErrors || symbolFromJSPrototype ? undefined : message, name, /*isUse*/ true);
                 if (!symbol) {
                     return symbolFromJSPrototype;
                 }
             }
-            else if (name.kind === 148 /* QualifiedName */ || name.kind === 189 /* PropertyAccessExpression */) {
-                var left = name.kind === 148 /* QualifiedName */ ? name.left : name.expression;
-                var right = name.kind === 148 /* QualifiedName */ ? name.right : name.name;
+            else if (name.kind === 149 /* QualifiedName */ || name.kind === 190 /* PropertyAccessExpression */) {
+                var left = name.kind === 149 /* QualifiedName */ ? name.left : name.expression;
+                var right = name.kind === 149 /* QualifiedName */ ? name.right : name.name;
                 var namespace = resolveEntityName(left, namespaceMeaning, ignoreErrors, /*dontResolveAlias*/ false, location);
                 if (!namespace || ts.nodeIsMissing(right)) {
                     return undefined;
@@ -33205,6 +33839,14 @@ var ts;
             if (patternAmbientModules) {
                 var pattern = ts.findBestPatternMatch(patternAmbientModules, function (_) { return _.pattern; }, moduleReference);
                 if (pattern) {
+                    // If the module reference matched a pattern ambient module ('*.foo') but there’s also a
+                    // module augmentation by the specific name requested ('a.foo'), we store the merged symbol
+                    // by the augmentation name ('a.foo'), because asking for *.foo should not give you exports
+                    // from a.foo.
+                    var augmentation = patternAmbientModuleAugmentations && patternAmbientModuleAugmentations.get(moduleReference);
+                    if (augmentation) {
+                        return getMergedSymbol(augmentation);
+                    }
                     return getMergedSymbol(pattern.symbol);
                 }
             }
@@ -33221,20 +33863,12 @@ var ts;
                 return undefined;
             }
             if (moduleNotFoundError) {
-                // For relative paths, see if this was possibly a projectReference redirect
-                if (ts.pathIsRelative(moduleReference)) {
-                    var sourceFile_1 = ts.getSourceFileOfNode(location);
-                    var redirects = sourceFile_1.redirectedReferences;
-                    if (redirects) {
-                        var normalizedTargetPath = ts.getNormalizedAbsolutePath(moduleReference, ts.getDirectoryPath(sourceFile_1.fileName));
-                        for (var _i = 0, _a = [".ts" /* Ts */, ".tsx" /* Tsx */]; _i < _a.length; _i++) {
-                            var ext = _a[_i];
-                            var probePath = normalizedTargetPath + ext;
-                            if (redirects.indexOf(probePath) >= 0) {
-                                error(errorNode, ts.Diagnostics.Output_file_0_has_not_been_built_from_source_file_1, moduleReference, probePath);
-                                return undefined;
-                            }
-                        }
+                // See if this was possibly a projectReference redirect
+                if (resolvedModule) {
+                    var redirect = host.getProjectReferenceRedirect(resolvedModule.resolvedFileName);
+                    if (redirect) {
+                        error(errorNode, ts.Diagnostics.Output_file_0_has_not_been_built_from_source_file_1, redirect, resolvedModule.resolvedFileName);
+                        return undefined;
                     }
                 }
                 if (resolutionDiagnostic) {
@@ -33303,7 +33937,7 @@ var ts;
         function resolveESModuleSymbol(moduleSymbol, referencingLocation, dontResolveAlias) {
             var symbol = resolveExternalModuleSymbol(moduleSymbol, dontResolveAlias);
             if (!dontResolveAlias && symbol) {
-                if (!(symbol.flags & (1536 /* Module */ | 3 /* Variable */)) && !ts.getDeclarationOfKind(symbol, 284 /* SourceFile */)) {
+                if (!(symbol.flags & (1536 /* Module */ | 3 /* Variable */)) && !ts.getDeclarationOfKind(symbol, 285 /* SourceFile */)) {
                     var compilerOptionName = moduleKind >= ts.ModuleKind.ES2015
                         ? "allowSyntheticDefaultImports"
                         : "esModuleInterop";
@@ -33565,7 +34199,7 @@ var ts;
             var members = node.members;
             for (var _i = 0, members_2 = members; _i < members_2.length; _i++) {
                 var member = members_2[_i];
-                if (member.kind === 157 /* Constructor */ && ts.nodeIsPresent(member.body)) {
+                if (member.kind === 158 /* Constructor */ && ts.nodeIsPresent(member.body)) {
                     return member;
                 }
             }
@@ -33576,13 +34210,10 @@ var ts;
             result.id = typeCount;
             return result;
         }
-        function createIntrinsicType(kind, intrinsicName) {
+        function createIntrinsicType(kind, intrinsicName, objectFlags) {
+            if (objectFlags === void 0) { objectFlags = 0; }
             var type = createType(kind);
             type.intrinsicName = intrinsicName;
-            return type;
-        }
-        function createNullableType(kind, intrinsicName, objectFlags) {
-            var type = createIntrinsicType(kind, intrinsicName);
             type.objectFlags = objectFlags;
             return type;
         }
@@ -33654,12 +34285,12 @@ var ts;
                     }
                 }
                 switch (location.kind) {
-                    case 284 /* SourceFile */:
+                    case 285 /* SourceFile */:
                         if (!ts.isExternalOrCommonJsModule(location)) {
                             break;
                         }
                     // falls through
-                    case 244 /* ModuleDeclaration */:
+                    case 245 /* ModuleDeclaration */:
                         if (result = callback(getSymbolOfNode(location).exports)) {
                             return result;
                         }
@@ -33723,7 +34354,7 @@ var ts;
                         && (!useOnlyExternalAliasing || ts.some(symbolFromSymbolTable.declarations, ts.isExternalModuleImportEqualsDeclaration))
                         // While exports are generally considered to be in scope, export-specifier declared symbols are _not_
                         // See similar comment in `resolveName` for details
-                        && (ignoreQualification || !ts.getDeclarationOfKind(symbolFromSymbolTable, 257 /* ExportSpecifier */))) {
+                        && (ignoreQualification || !ts.getDeclarationOfKind(symbolFromSymbolTable, 258 /* ExportSpecifier */))) {
                         var resolvedImportedSymbol = resolveAlias(symbolFromSymbolTable);
                         if (isAccessible(symbolFromSymbolTable, resolvedImportedSymbol, ignoreQualification)) {
                             return [symbolFromSymbolTable];
@@ -33759,7 +34390,7 @@ var ts;
                     return true;
                 }
                 // Qualify if the symbol from symbol table has same meaning as expected
-                symbolFromSymbolTable = (symbolFromSymbolTable.flags & 2097152 /* Alias */ && !ts.getDeclarationOfKind(symbolFromSymbolTable, 257 /* ExportSpecifier */)) ? resolveAlias(symbolFromSymbolTable) : symbolFromSymbolTable;
+                symbolFromSymbolTable = (symbolFromSymbolTable.flags & 2097152 /* Alias */ && !ts.getDeclarationOfKind(symbolFromSymbolTable, 258 /* ExportSpecifier */)) ? resolveAlias(symbolFromSymbolTable) : symbolFromSymbolTable;
                 if (symbolFromSymbolTable.flags & meaning) {
                     qualify = true;
                     return true;
@@ -33774,10 +34405,10 @@ var ts;
                 for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                     var declaration = _a[_i];
                     switch (declaration.kind) {
-                        case 154 /* PropertyDeclaration */:
-                        case 156 /* MethodDeclaration */:
-                        case 158 /* GetAccessor */:
-                        case 159 /* SetAccessor */:
+                        case 155 /* PropertyDeclaration */:
+                        case 157 /* MethodDeclaration */:
+                        case 159 /* GetAccessor */:
+                        case 160 /* SetAccessor */:
                             continue;
                         default:
                             return false;
@@ -33833,7 +34464,7 @@ var ts;
                 var containers = getContainersOfSymbol(symbol, enclosingDeclaration);
                 // If we're trying to reference some object literal in, eg `var a = { x: 1 }`, the symbol for the literal, `__object`, is distinct
                 // from the symbol of the declaration it is being assigned to. Since we can use the declaration to refer to the literal, however,
-                // we'd like to make that connection here - potentially causing us to paint the declararation's visibiility, and therefore the literal.
+                // we'd like to make that connection here - potentially causing us to paint the declaration's visibility, and therefore the literal.
                 var firstDecl = ts.first(symbol.declarations);
                 if (!ts.length(containers) && meaning & 67220415 /* Value */ && firstDecl && ts.isObjectLiteralExpression(firstDecl)) {
                     if (firstDecl.parent && ts.isVariableDeclaration(firstDecl.parent) && firstDecl === firstDecl.parent.initializer) {
@@ -33894,14 +34525,14 @@ var ts;
             return node && getSymbolOfNode(node);
         }
         function hasExternalModuleSymbol(declaration) {
-            return ts.isAmbientModule(declaration) || (declaration.kind === 284 /* SourceFile */ && ts.isExternalOrCommonJsModule(declaration));
+            return ts.isAmbientModule(declaration) || (declaration.kind === 285 /* SourceFile */ && ts.isExternalOrCommonJsModule(declaration));
         }
         function hasNonGlobalAugmentationExternalModuleSymbol(declaration) {
-            return ts.isModuleWithStringLiteralName(declaration) || (declaration.kind === 284 /* SourceFile */ && ts.isExternalOrCommonJsModule(declaration));
+            return ts.isModuleWithStringLiteralName(declaration) || (declaration.kind === 285 /* SourceFile */ && ts.isExternalOrCommonJsModule(declaration));
         }
         function hasVisibleDeclarations(symbol, shouldComputeAliasToMakeVisible) {
             var aliasesToMakeVisible;
-            if (!ts.every(symbol.declarations, getIsDeclarationVisible)) {
+            if (!ts.every(ts.filter(symbol.declarations, function (d) { return d.kind !== 73 /* Identifier */; }), getIsDeclarationVisible)) {
                 return undefined;
             }
             return { accessibility: 0 /* Accessible */, aliasesToMakeVisible: aliasesToMakeVisible };
@@ -33944,14 +34575,14 @@ var ts;
         function isEntityNameVisible(entityName, enclosingDeclaration) {
             // get symbol of the first identifier of the entityName
             var meaning;
-            if (entityName.parent.kind === 167 /* TypeQuery */ ||
+            if (entityName.parent.kind === 168 /* TypeQuery */ ||
                 ts.isExpressionWithTypeArgumentsInClassExtendsClause(entityName.parent) ||
-                entityName.parent.kind === 149 /* ComputedPropertyName */) {
+                entityName.parent.kind === 150 /* ComputedPropertyName */) {
                 // Typeof value
                 meaning = 67220415 /* Value */ | 1048576 /* ExportValue */;
             }
-            else if (entityName.kind === 148 /* QualifiedName */ || entityName.kind === 189 /* PropertyAccessExpression */ ||
-                entityName.parent.kind === 248 /* ImportEqualsDeclaration */) {
+            else if (entityName.kind === 149 /* QualifiedName */ || entityName.kind === 190 /* PropertyAccessExpression */ ||
+                entityName.parent.kind === 249 /* ImportEqualsDeclaration */) {
                 // Left identifier from type reference or TypeAlias
                 // Entity name of the import declaration
                 meaning = 1920 /* Namespace */;
@@ -34000,10 +34631,10 @@ var ts;
             function signatureToStringWorker(writer) {
                 var sigOutput;
                 if (flags & 262144 /* WriteArrowStyleSignature */) {
-                    sigOutput = kind === 1 /* Construct */ ? 166 /* ConstructorType */ : 165 /* FunctionType */;
+                    sigOutput = kind === 1 /* Construct */ ? 167 /* ConstructorType */ : 166 /* FunctionType */;
                 }
                 else {
-                    sigOutput = kind === 1 /* Construct */ ? 161 /* ConstructSignature */ : 160 /* CallSignature */;
+                    sigOutput = kind === 1 /* Construct */ ? 162 /* ConstructSignature */ : 161 /* CallSignature */;
                 }
                 var sig = nodeBuilder.signatureToSignatureDeclaration(signature, sigOutput, enclosingDeclaration, toNodeBuilderFlags(flags) | 70221824 /* IgnoreErrors */ | 512 /* WriteTypeParametersInQualifiedName */);
                 var printer = ts.createPrinter({ removeComments: true, omitTrailingSemicolon: true });
@@ -34030,6 +34661,15 @@ var ts;
             }
             return result;
         }
+        function getTypeNamesForErrorDisplay(left, right) {
+            var leftStr = typeToString(left);
+            var rightStr = typeToString(right);
+            if (leftStr === rightStr) {
+                leftStr = typeToString(left, /*enclosingDeclaration*/ undefined, 64 /* UseFullyQualifiedType */);
+                rightStr = typeToString(right, /*enclosingDeclaration*/ undefined, 64 /* UseFullyQualifiedType */);
+            }
+            return [leftStr, rightStr];
+        }
         function toNodeBuilderFlags(flags) {
             if (flags === void 0) { flags = 0 /* None */; }
             return flags & 9469291 /* NodeBuilderFlagsMask */;
@@ -34098,26 +34738,26 @@ var ts;
                 }
                 if (type.flags & 1 /* Any */) {
                     context.approximateLength += 3;
-                    return ts.createKeywordTypeNode(120 /* AnyKeyword */);
+                    return ts.createKeywordTypeNode(121 /* AnyKeyword */);
                 }
                 if (type.flags & 2 /* Unknown */) {
-                    return ts.createKeywordTypeNode(143 /* UnknownKeyword */);
+                    return ts.createKeywordTypeNode(144 /* UnknownKeyword */);
                 }
                 if (type.flags & 4 /* String */) {
                     context.approximateLength += 6;
-                    return ts.createKeywordTypeNode(138 /* StringKeyword */);
+                    return ts.createKeywordTypeNode(139 /* StringKeyword */);
                 }
                 if (type.flags & 8 /* Number */) {
                     context.approximateLength += 6;
-                    return ts.createKeywordTypeNode(135 /* NumberKeyword */);
+                    return ts.createKeywordTypeNode(136 /* NumberKeyword */);
                 }
                 if (type.flags & 64 /* BigInt */) {
                     context.approximateLength += 6;
-                    return ts.createKeywordTypeNode(146 /* BigIntKeyword */);
+                    return ts.createKeywordTypeNode(147 /* BigIntKeyword */);
                 }
                 if (type.flags & 16 /* Boolean */) {
                     context.approximateLength += 7;
-                    return ts.createKeywordTypeNode(123 /* BooleanKeyword */);
+                    return ts.createKeywordTypeNode(124 /* BooleanKeyword */);
                 }
                 if (type.flags & 1024 /* EnumLiteral */ && !(type.flags & 1048576 /* Union */)) {
                     var parentSymbol = getParentOfSymbol(type.symbol);
@@ -34135,8 +34775,9 @@ var ts;
                     return ts.createLiteralTypeNode(ts.setEmitFlags(ts.createLiteral(type.value), 16777216 /* NoAsciiEscaping */));
                 }
                 if (type.flags & 256 /* NumberLiteral */) {
-                    context.approximateLength += (("" + type.value).length);
-                    return ts.createLiteralTypeNode((ts.createLiteral(type.value)));
+                    var value = type.value;
+                    context.approximateLength += ("" + value).length;
+                    return ts.createLiteralTypeNode(value < 0 ? ts.createPrefix(39 /* MinusToken */, ts.createLiteral(-value)) : ts.createLiteral(value));
                 }
                 if (type.flags & 2048 /* BigIntLiteral */) {
                     context.approximateLength += (ts.pseudoBigIntToString(type.value).length) + 1;
@@ -34157,33 +34798,33 @@ var ts;
                         }
                     }
                     context.approximateLength += 13;
-                    return ts.createTypeOperatorNode(142 /* UniqueKeyword */, ts.createKeywordTypeNode(139 /* SymbolKeyword */));
+                    return ts.createTypeOperatorNode(143 /* UniqueKeyword */, ts.createKeywordTypeNode(140 /* SymbolKeyword */));
                 }
                 if (type.flags & 16384 /* Void */) {
                     context.approximateLength += 4;
-                    return ts.createKeywordTypeNode(106 /* VoidKeyword */);
+                    return ts.createKeywordTypeNode(107 /* VoidKeyword */);
                 }
                 if (type.flags & 32768 /* Undefined */) {
                     context.approximateLength += 9;
-                    return ts.createKeywordTypeNode(141 /* UndefinedKeyword */);
+                    return ts.createKeywordTypeNode(142 /* UndefinedKeyword */);
                 }
                 if (type.flags & 65536 /* Null */) {
                     context.approximateLength += 4;
-                    return ts.createKeywordTypeNode(96 /* NullKeyword */);
+                    return ts.createKeywordTypeNode(97 /* NullKeyword */);
                 }
                 if (type.flags & 131072 /* Never */) {
                     context.approximateLength += 5;
-                    return ts.createKeywordTypeNode(132 /* NeverKeyword */);
+                    return ts.createKeywordTypeNode(133 /* NeverKeyword */);
                 }
                 if (type.flags & 4096 /* ESSymbol */) {
                     context.approximateLength += 6;
-                    return ts.createKeywordTypeNode(139 /* SymbolKeyword */);
+                    return ts.createKeywordTypeNode(140 /* SymbolKeyword */);
                 }
                 if (type.flags & 67108864 /* NonPrimitive */) {
                     context.approximateLength += 6;
-                    return ts.createKeywordTypeNode(136 /* ObjectKeyword */);
+                    return ts.createKeywordTypeNode(137 /* ObjectKeyword */);
                 }
-                if (type.flags & 262144 /* TypeParameter */ && type.isThisType) {
+                if (isThisTypeParameter(type)) {
                     if (context.flags & 4194304 /* InObjectTypeLiteral */) {
                         if (!context.encounteredError && !(context.flags & 32768 /* AllowThisInObjectLiteral */)) {
                             context.encounteredError = true;
@@ -34206,14 +34847,10 @@ var ts;
                         return ts.createInferTypeNode(typeParameterToDeclarationWithConstraint(type, context, /*constraintNode*/ undefined));
                     }
                     if (context.flags & 4 /* GenerateNamesForShadowedTypeParams */ &&
-                        type.flags & 262144 /* TypeParameter */ &&
-                        ts.length(type.symbol.declarations) &&
-                        ts.isTypeParameterDeclaration(type.symbol.declarations[0]) &&
-                        typeParameterShadowsNameInScope(type, context) &&
                         !isTypeSymbolAccessible(type.symbol, context.enclosingDeclaration)) {
-                        var name = type.symbol.declarations[0].name;
+                        var name = typeParameterToName(type, context);
                         context.approximateLength += ts.idText(name).length;
-                        return ts.createTypeReferenceNode(ts.getGeneratedNameForNode(name, 16 /* Optimistic */ | 8 /* ReservedInNestedScopes */), /*typeArguments*/ undefined);
+                        return ts.createTypeReferenceNode(ts.createIdentifier(ts.idText(name)), /*typeArguments*/ undefined);
                     }
                     // Ignore constraint/default when creating a usage (as opposed to declaration) of a type parameter.
                     return type.symbol
@@ -34233,7 +34870,7 @@ var ts;
                     }
                     var typeNodes = mapToTypeNodes(types, context, /*isBareList*/ true);
                     if (typeNodes && typeNodes.length > 0) {
-                        var unionOrIntersectionTypeNode = ts.createUnionOrIntersectionTypeNode(type.flags & 1048576 /* Union */ ? 173 /* UnionType */ : 174 /* IntersectionType */, typeNodes);
+                        var unionOrIntersectionTypeNode = ts.createUnionOrIntersectionTypeNode(type.flags & 1048576 /* Union */ ? 174 /* UnionType */ : 175 /* IntersectionType */, typeNodes);
                         return unionOrIntersectionTypeNode;
                     }
                     else {
@@ -34307,7 +34944,7 @@ var ts;
                             return symbolToTypeNode(symbol, context, isInstanceType);
                         }
                         // Always use 'typeof T' for type of class, enum, and module objects
-                        else if (symbol.flags & 32 /* Class */ && !getBaseTypeVariableOfClass(symbol) && !(symbol.valueDeclaration.kind === 209 /* ClassExpression */ && context.flags & 2048 /* WriteClassExpressionAsTypeLiteral */) ||
+                        else if (symbol.flags & 32 /* Class */ && !getBaseTypeVariableOfClass(symbol) && !(symbol.valueDeclaration.kind === 210 /* ClassExpression */ && context.flags & 2048 /* WriteClassExpressionAsTypeLiteral */) ||
                             symbol.flags & (384 /* Enum */ | 512 /* ValueModule */) ||
                             shouldWriteTypeOfFunctionSymbol()) {
                             return symbolToTypeNode(symbol, context, 67220415 /* Value */);
@@ -34354,7 +34991,7 @@ var ts;
                         var isNonLocalFunctionSymbol = !!(symbol.flags & 16 /* Function */) &&
                             (symbol.parent || // is exported function symbol
                                 ts.forEach(symbol.declarations, function (declaration) {
-                                    return declaration.parent.kind === 284 /* SourceFile */ || declaration.parent.kind === 245 /* ModuleBlock */;
+                                    return declaration.parent.kind === 285 /* SourceFile */ || declaration.parent.kind === 246 /* ModuleBlock */;
                                 }));
                         if (isStaticMethodSymbol || isNonLocalFunctionSymbol) {
                             // typeof is allowed only for static/non local functions
@@ -34375,12 +35012,12 @@ var ts;
                         }
                         if (resolved.callSignatures.length === 1 && !resolved.constructSignatures.length) {
                             var signature = resolved.callSignatures[0];
-                            var signatureNode = signatureToSignatureDeclarationHelper(signature, 165 /* FunctionType */, context);
+                            var signatureNode = signatureToSignatureDeclarationHelper(signature, 166 /* FunctionType */, context);
                             return signatureNode;
                         }
                         if (resolved.constructSignatures.length === 1 && !resolved.callSignatures.length) {
                             var signature = resolved.constructSignatures[0];
-                            var signatureNode = signatureToSignatureDeclarationHelper(signature, 166 /* ConstructorType */, context);
+                            var signatureNode = signatureToSignatureDeclarationHelper(signature, 167 /* ConstructorType */, context);
                             return signatureNode;
                         }
                     }
@@ -34401,7 +35038,7 @@ var ts;
                         }
                         var elementType = typeToTypeNodeHelper(typeArguments[0], context);
                         var arrayType = ts.createArrayTypeNode(elementType);
-                        return type.target === globalArrayType ? arrayType : ts.createTypeOperatorNode(133 /* ReadonlyKeyword */, arrayType);
+                        return type.target === globalArrayType ? arrayType : ts.createTypeOperatorNode(134 /* ReadonlyKeyword */, arrayType);
                     }
                     else if (type.target.objectFlags & 8 /* Tuple */) {
                         if (typeArguments.length > 0) {
@@ -34415,12 +35052,12 @@ var ts;
                                         ts.createOptionalTypeNode(tupleConstituentNodes[i]);
                                 }
                                 var tupleTypeNode = ts.createTupleTypeNode(tupleConstituentNodes);
-                                return type.target.readonly ? ts.createTypeOperatorNode(133 /* ReadonlyKeyword */, tupleTypeNode) : tupleTypeNode;
+                                return type.target.readonly ? ts.createTypeOperatorNode(134 /* ReadonlyKeyword */, tupleTypeNode) : tupleTypeNode;
                             }
                         }
                         if (context.encounteredError || (context.flags & 524288 /* AllowEmptyTuple */)) {
                             var tupleTypeNode = ts.createTupleTypeNode([]);
-                            return type.target.readonly ? ts.createTypeOperatorNode(133 /* ReadonlyKeyword */, tupleTypeNode) : tupleTypeNode;
+                            return type.target.readonly ? ts.createTypeOperatorNode(134 /* ReadonlyKeyword */, tupleTypeNode) : tupleTypeNode;
                         }
                         context.encounteredError = true;
                         return undefined; // TODO: GH#18217
@@ -34515,11 +35152,11 @@ var ts;
                     var typeElements = [];
                     for (var _i = 0, _a = resolvedType.callSignatures; _i < _a.length; _i++) {
                         var signature = _a[_i];
-                        typeElements.push(signatureToSignatureDeclarationHelper(signature, 160 /* CallSignature */, context));
+                        typeElements.push(signatureToSignatureDeclarationHelper(signature, 161 /* CallSignature */, context));
                     }
                     for (var _b = 0, _c = resolvedType.constructSignatures; _b < _c.length; _b++) {
                         var signature = _c[_b];
-                        typeElements.push(signatureToSignatureDeclarationHelper(signature, 161 /* ConstructSignature */, context));
+                        typeElements.push(signatureToSignatureDeclarationHelper(signature, 162 /* ConstructSignature */, context));
                     }
                     if (resolvedType.stringIndexInfo) {
                         var indexSignature = void 0;
@@ -34566,15 +35203,15 @@ var ts;
                 if (!(context.flags & 1 /* NoTruncation */)) {
                     return ts.createTypeReferenceNode(ts.createIdentifier("..."), /*typeArguments*/ undefined);
                 }
-                return ts.createKeywordTypeNode(120 /* AnyKeyword */);
+                return ts.createKeywordTypeNode(121 /* AnyKeyword */);
             }
             function addPropertyToElementList(propertySymbol, context, typeElements) {
-                var propertyIsReverseMapped = !!(ts.getCheckFlags(propertySymbol) & 4096 /* ReverseMapped */);
+                var propertyIsReverseMapped = !!(ts.getCheckFlags(propertySymbol) & 8192 /* ReverseMapped */);
                 var propertyType = propertyIsReverseMapped && context.flags & 33554432 /* InReverseMappedType */ ?
                     anyType : getTypeOfSymbol(propertySymbol);
                 var saveEnclosingDeclaration = context.enclosingDeclaration;
                 context.enclosingDeclaration = undefined;
-                if (context.tracker.trackSymbol && ts.getCheckFlags(propertySymbol) & 2048 /* Late */) {
+                if (context.tracker.trackSymbol && ts.getCheckFlags(propertySymbol) & 4096 /* Late */) {
                     var decl = ts.first(propertySymbol.declarations);
                     if (hasLateBindableName(decl)) {
                         trackComputedName(decl.name, saveEnclosingDeclaration, context);
@@ -34585,10 +35222,10 @@ var ts;
                 context.enclosingDeclaration = saveEnclosingDeclaration;
                 var optionalToken = propertySymbol.flags & 16777216 /* Optional */ ? ts.createToken(56 /* QuestionToken */) : undefined;
                 if (propertySymbol.flags & (16 /* Function */ | 8192 /* Method */) && !getPropertiesOfObjectType(propertyType).length && !isReadonlySymbol(propertySymbol)) {
-                    var signatures = getSignaturesOfType(propertyType, 0 /* Call */);
+                    var signatures = getSignaturesOfType(filterType(propertyType, function (t) { return !(t.flags & 32768 /* Undefined */); }), 0 /* Call */);
                     for (var _i = 0, signatures_1 = signatures; _i < signatures_1.length; _i++) {
                         var signature = signatures_1[_i];
-                        var methodDeclaration = signatureToSignatureDeclarationHelper(signature, 155 /* MethodSignature */, context);
+                        var methodDeclaration = signatureToSignatureDeclarationHelper(signature, 156 /* MethodSignature */, context);
                         methodDeclaration.name = propertyName;
                         methodDeclaration.questionToken = optionalToken;
                         if (propertySymbol.valueDeclaration) {
@@ -34606,10 +35243,10 @@ var ts;
                         propertyTypeNode = createElidedInformationPlaceholder(context);
                     }
                     else {
-                        propertyTypeNode = propertyType ? typeToTypeNodeHelper(propertyType, context) : ts.createKeywordTypeNode(120 /* AnyKeyword */);
+                        propertyTypeNode = propertyType ? typeToTypeNodeHelper(propertyType, context) : ts.createKeywordTypeNode(121 /* AnyKeyword */);
                     }
                     context.flags = savedFlags;
-                    var modifiers = isReadonlySymbol(propertySymbol) ? [ts.createToken(133 /* ReadonlyKeyword */)] : undefined;
+                    var modifiers = isReadonlySymbol(propertySymbol) ? [ts.createToken(134 /* ReadonlyKeyword */)] : undefined;
                     if (modifiers) {
                         context.approximateLength += 9;
                     }
@@ -34660,7 +35297,7 @@ var ts;
             }
             function indexInfoToIndexSignatureDeclarationHelper(indexInfo, kind, context) {
                 var name = ts.getNameFromIndexInfo(indexInfo) || "x";
-                var indexerTypeNode = ts.createKeywordTypeNode(kind === 0 /* String */ ? 138 /* StringKeyword */ : 135 /* NumberKeyword */);
+                var indexerTypeNode = ts.createKeywordTypeNode(kind === 0 /* String */ ? 139 /* StringKeyword */ : 136 /* NumberKeyword */);
                 var indexingParameter = ts.createParameter(
                 /*decorators*/ undefined, 
                 /*modifiers*/ undefined, 
@@ -34673,7 +35310,7 @@ var ts;
                 }
                 context.approximateLength += (name.length + 4);
                 return ts.createIndexSignature(
-                /*decorators*/ undefined, indexInfo.isReadonly ? [ts.createToken(133 /* ReadonlyKeyword */)] : undefined, [indexingParameter], typeNode);
+                /*decorators*/ undefined, indexInfo.isReadonly ? [ts.createToken(134 /* ReadonlyKeyword */)] : undefined, [indexingParameter], typeNode);
             }
             function signatureToSignatureDeclarationHelper(signature, kind, context) {
                 var typeParameters;
@@ -34684,7 +35321,7 @@ var ts;
                 else {
                     typeParameters = signature.typeParameters && signature.typeParameters.map(function (parameter) { return typeParameterToDeclaration(parameter, context); });
                 }
-                var parameters = getExpandedParameters(signature).map(function (parameter) { return symbolToParameterDeclaration(parameter, context, kind === 157 /* Constructor */); });
+                var parameters = getExpandedParameters(signature).map(function (parameter) { return symbolToParameterDeclaration(parameter, context, kind === 158 /* Constructor */); });
                 if (signature.thisParameter) {
                     var thisParameter = symbolToParameterDeclaration(signature.thisParameter, context);
                     parameters.unshift(thisParameter);
@@ -34703,29 +35340,20 @@ var ts;
                     returnTypeNode = returnType && typeToTypeNodeHelper(returnType, context);
                 }
                 if (context.flags & 256 /* SuppressAnyReturnType */) {
-                    if (returnTypeNode && returnTypeNode.kind === 120 /* AnyKeyword */) {
+                    if (returnTypeNode && returnTypeNode.kind === 121 /* AnyKeyword */) {
                         returnTypeNode = undefined;
                     }
                 }
                 else if (!returnTypeNode) {
-                    returnTypeNode = ts.createKeywordTypeNode(120 /* AnyKeyword */);
+                    returnTypeNode = ts.createKeywordTypeNode(121 /* AnyKeyword */);
                 }
                 context.approximateLength += 3; // Usually a signature contributes a few more characters than this, but 3 is the minimum
                 return ts.createSignatureDeclaration(kind, typeParameters, parameters, returnTypeNode, typeArguments);
             }
-            function typeParameterShadowsNameInScope(type, context) {
-                return !!resolveName(context.enclosingDeclaration, type.symbol.escapedName, 67897832 /* Type */, /*nameNotFoundArg*/ undefined, type.symbol.escapedName, /*isUse*/ false);
-            }
             function typeParameterToDeclarationWithConstraint(type, context, constraintNode) {
                 var savedContextFlags = context.flags;
                 context.flags &= ~512 /* WriteTypeParametersInQualifiedName */; // Avoids potential infinite loop when building for a claimspace with a generic
-                var shouldUseGeneratedName = context.flags & 4 /* GenerateNamesForShadowedTypeParams */ &&
-                    type.symbol.declarations && type.symbol.declarations[0] &&
-                    ts.isTypeParameterDeclaration(type.symbol.declarations[0]) &&
-                    typeParameterShadowsNameInScope(type, context);
-                var name = shouldUseGeneratedName
-                    ? ts.getGeneratedNameForNode(type.symbol.declarations[0].name, 16 /* Optimistic */ | 8 /* ReservedInNestedScopes */)
-                    : symbolToName(type.symbol, context, 67897832 /* Type */, /*expectsIdentifier*/ true);
+                var name = typeParameterToName(type, context);
                 var defaultParameter = getDefaultFromTypeParameter(type);
                 var defaultParameterNode = defaultParameter && typeToTypeNodeHelper(defaultParameter, context);
                 context.flags = savedContextFlags;
@@ -34737,9 +35365,9 @@ var ts;
                 return typeParameterToDeclarationWithConstraint(type, context, constraintNode);
             }
             function symbolToParameterDeclaration(parameterSymbol, context, preserveModifierFlags) {
-                var parameterDeclaration = ts.getDeclarationOfKind(parameterSymbol, 151 /* Parameter */);
+                var parameterDeclaration = ts.getDeclarationOfKind(parameterSymbol, 152 /* Parameter */);
                 if (!parameterDeclaration && !isTransientSymbol(parameterSymbol)) {
-                    parameterDeclaration = ts.getDeclarationOfKind(parameterSymbol, 304 /* JSDocParameterTag */);
+                    parameterDeclaration = ts.getDeclarationOfKind(parameterSymbol, 306 /* JSDocParameterTag */);
                 }
                 var parameterType = getTypeOfSymbol(parameterSymbol);
                 if (parameterDeclaration && isRequiredInitializedParameter(parameterDeclaration)) {
@@ -34747,16 +35375,16 @@ var ts;
                 }
                 var parameterTypeNode = typeToTypeNodeHelper(parameterType, context);
                 var modifiers = !(context.flags & 8192 /* OmitParameterModifiers */) && preserveModifierFlags && parameterDeclaration && parameterDeclaration.modifiers ? parameterDeclaration.modifiers.map(ts.getSynthesizedClone) : undefined;
-                var isRest = parameterDeclaration && ts.isRestParameter(parameterDeclaration) || ts.getCheckFlags(parameterSymbol) & 16384 /* RestParameter */;
+                var isRest = parameterDeclaration && ts.isRestParameter(parameterDeclaration) || ts.getCheckFlags(parameterSymbol) & 32768 /* RestParameter */;
                 var dotDotDotToken = isRest ? ts.createToken(25 /* DotDotDotToken */) : undefined;
                 var name = parameterDeclaration
                     ? parameterDeclaration.name ?
-                        parameterDeclaration.name.kind === 72 /* Identifier */ ? ts.setEmitFlags(ts.getSynthesizedClone(parameterDeclaration.name), 16777216 /* NoAsciiEscaping */) :
-                            parameterDeclaration.name.kind === 148 /* QualifiedName */ ? ts.setEmitFlags(ts.getSynthesizedClone(parameterDeclaration.name.right), 16777216 /* NoAsciiEscaping */) :
+                        parameterDeclaration.name.kind === 73 /* Identifier */ ? ts.setEmitFlags(ts.getSynthesizedClone(parameterDeclaration.name), 16777216 /* NoAsciiEscaping */) :
+                            parameterDeclaration.name.kind === 149 /* QualifiedName */ ? ts.setEmitFlags(ts.getSynthesizedClone(parameterDeclaration.name.right), 16777216 /* NoAsciiEscaping */) :
                                 cloneBindingName(parameterDeclaration.name) :
                         ts.symbolName(parameterSymbol)
                     : ts.symbolName(parameterSymbol);
-                var isOptional = parameterDeclaration && isOptionalParameter(parameterDeclaration) || ts.getCheckFlags(parameterSymbol) & 8192 /* OptionalParameter */;
+                var isOptional = parameterDeclaration && isOptionalParameter(parameterDeclaration) || ts.getCheckFlags(parameterSymbol) & 16384 /* OptionalParameter */;
                 var questionToken = isOptional ? ts.createToken(56 /* QuestionToken */) : undefined;
                 var parameterNode = ts.createParameter(
                 /*decorators*/ undefined, modifiers, dotDotDotToken, name, questionToken, parameterTypeNode, 
@@ -34771,7 +35399,7 @@ var ts;
                         }
                         var visited = ts.visitEachChild(node, elideInitializerAndSetEmitFlags, ts.nullTransformationContext, /*nodesVisitor*/ undefined, elideInitializerAndSetEmitFlags);
                         var clone = ts.nodeIsSynthesized(visited) ? visited : ts.getSynthesizedClone(visited);
-                        if (clone.kind === 186 /* BindingElement */) {
+                        if (clone.kind === 187 /* BindingElement */) {
                             clone.initializer = undefined;
                         }
                         return ts.setEmitFlags(clone, 1 /* SingleLine */ | 16777216 /* NoAsciiEscaping */);
@@ -34873,6 +35501,11 @@ var ts;
             function lookupTypeParameterNodes(chain, index, context) {
                 ts.Debug.assert(chain && 0 <= index && index < chain.length);
                 var symbol = chain[index];
+                var symbolId = "" + getSymbolId(symbol);
+                if (context.typeParameterSymbolList && context.typeParameterSymbolList.get(symbolId)) {
+                    return undefined;
+                }
+                (context.typeParameterSymbolList || (context.typeParameterSymbolList = ts.createMap())).set(symbolId, true);
                 var typeParameterNodes;
                 if (context.flags & 512 /* WriteTypeParametersInQualifiedName */ && index < (chain.length - 1)) {
                     var parentSymbol = symbol;
@@ -34897,7 +35530,7 @@ var ts;
                 return top;
             }
             function getSpecifierForModuleSymbol(symbol, context) {
-                var file = ts.getDeclarationOfKind(symbol, 284 /* SourceFile */);
+                var file = ts.getDeclarationOfKind(symbol, 285 /* SourceFile */);
                 if (file && file.moduleName !== undefined) {
                     // Use the amd name if it is available
                     return file.moduleName;
@@ -35020,6 +35653,33 @@ var ts;
                     return identifier;
                 }
             }
+            function typeParameterShadowsNameInScope(escapedName, context) {
+                return !!resolveName(context.enclosingDeclaration, escapedName, 67897832 /* Type */, /*nameNotFoundArg*/ undefined, escapedName, /*isUse*/ false);
+            }
+            function typeParameterToName(type, context) {
+                if (context.flags & 4 /* GenerateNamesForShadowedTypeParams */ && context.typeParameterNames) {
+                    var cached = context.typeParameterNames.get("" + getTypeId(type));
+                    if (cached) {
+                        return cached;
+                    }
+                }
+                var result = symbolToName(type.symbol, context, 67897832 /* Type */, /*expectsIdentifier*/ true);
+                if (context.flags & 4 /* GenerateNamesForShadowedTypeParams */) {
+                    var rawtext = result.escapedText;
+                    var i = 0;
+                    var text = rawtext;
+                    while ((context.typeParameterNamesByText && context.typeParameterNamesByText.get(text)) || typeParameterShadowsNameInScope(text, context)) {
+                        i++;
+                        text = rawtext + "_" + i;
+                    }
+                    if (text !== rawtext) {
+                        result = ts.createIdentifier(text, result.typeArguments);
+                    }
+                    (context.typeParameterNames || (context.typeParameterNames = ts.createMap())).set("" + getTypeId(type), result);
+                    (context.typeParameterNamesByText || (context.typeParameterNamesByText = ts.createMap())).set(result.escapedText, true);
+                }
+                return result;
+            }
             function symbolToName(symbol, context, meaning, expectsIdentifier) {
                 var chain = lookupSymbolChain(symbol, context, meaning);
                 if (expectsIdentifier && chain.length !== 1
@@ -35137,8 +35797,8 @@ var ts;
         }
         function getTypeAliasForTypeLiteral(type) {
             if (type.symbol && type.symbol.flags & 2048 /* TypeLiteral */) {
-                var node = ts.findAncestor(type.symbol.declarations[0].parent, function (n) { return n.kind !== 177 /* ParenthesizedType */; });
-                if (node.kind === 242 /* TypeAliasDeclaration */) {
+                var node = ts.findAncestor(type.symbol.declarations[0].parent, function (n) { return n.kind !== 178 /* ParenthesizedType */; });
+                if (node.kind === 243 /* TypeAliasDeclaration */) {
                     return getSymbolOfNode(node);
                 }
             }
@@ -35146,11 +35806,11 @@ var ts;
         }
         function isTopLevelInExternalModuleAugmentation(node) {
             return node && node.parent &&
-                node.parent.kind === 245 /* ModuleBlock */ &&
+                node.parent.kind === 246 /* ModuleBlock */ &&
                 ts.isExternalModuleAugmentation(node.parent.parent);
         }
         function isDefaultBindingContext(location) {
-            return location.kind === 284 /* SourceFile */ || ts.isAmbientModule(location);
+            return location.kind === 285 /* SourceFile */ || ts.isAmbientModule(location);
         }
         function getNameOfSymbolFromNameType(symbol, context) {
             var nameType = symbol.nameType;
@@ -35160,6 +35820,9 @@ var ts;
                     if (!ts.isIdentifierText(name, compilerOptions.target) && !isNumericLiteralName(name)) {
                         return "\"" + ts.escapeString(name, 34 /* doubleQuote */) + "\"";
                     }
+                    if (isNumericLiteralName(name) && ts.startsWith(name, "-")) {
+                        return "[" + name + "]";
+                    }
                     return name;
                 }
                 if (nameType.flags & 8192 /* UniqueESSymbol */) {
@@ -35191,7 +35854,7 @@ var ts;
                     if (ts.isCallExpression(declaration) && ts.isBindableObjectDefinePropertyCall(declaration)) {
                         return ts.symbolName(symbol);
                     }
-                    if (ts.isComputedPropertyName(name_2) && !(ts.getCheckFlags(symbol) & 2048 /* Late */) && symbol.nameType && symbol.nameType.flags & 384 /* StringOrNumberLiteral */) {
+                    if (ts.isComputedPropertyName(name_2) && !(ts.getCheckFlags(symbol) & 4096 /* Late */) && symbol.nameType && symbol.nameType.flags & 384 /* StringOrNumberLiteral */) {
                         // Computed property name isn't late bound, but has a well-known name type - use name type to generate a symbol name
                         var result = getNameOfSymbolFromNameType(symbol, context);
                         if (result !== undefined) {
@@ -35200,17 +35863,17 @@ var ts;
                     }
                     return ts.declarationNameToString(name_2);
                 }
-                if (declaration.parent && declaration.parent.kind === 237 /* VariableDeclaration */) {
+                if (declaration.parent && declaration.parent.kind === 238 /* VariableDeclaration */) {
                     return ts.declarationNameToString(declaration.parent.name);
                 }
                 switch (declaration.kind) {
-                    case 209 /* ClassExpression */:
-                    case 196 /* FunctionExpression */:
-                    case 197 /* ArrowFunction */:
+                    case 210 /* ClassExpression */:
+                    case 197 /* FunctionExpression */:
+                    case 198 /* ArrowFunction */:
                         if (context && !context.encounteredError && !(context.flags & 131072 /* AllowAnonymousIdentifier */)) {
                             context.encounteredError = true;
                         }
-                        return declaration.kind === 209 /* ClassExpression */ ? "(Anonymous class)" : "(Anonymous function)";
+                        return declaration.kind === 210 /* ClassExpression */ ? "(Anonymous class)" : "(Anonymous function)";
                 }
             }
             var name = getNameOfSymbolFromNameType(symbol, context);
@@ -35227,27 +35890,27 @@ var ts;
             return false;
             function determineIfDeclarationIsVisible() {
                 switch (node.kind) {
-                    case 302 /* JSDocCallbackTag */:
-                    case 309 /* JSDocTypedefTag */:
+                    case 304 /* JSDocCallbackTag */:
+                    case 311 /* JSDocTypedefTag */:
                         // Top-level jsdoc type aliases are considered exported
                         // First parent is comment node, second is hosting declaration or token; we only care about those tokens or declarations whose parent is a source file
                         return !!(node.parent && node.parent.parent && node.parent.parent.parent && ts.isSourceFile(node.parent.parent.parent));
-                    case 186 /* BindingElement */:
+                    case 187 /* BindingElement */:
                         return isDeclarationVisible(node.parent.parent);
-                    case 237 /* VariableDeclaration */:
+                    case 238 /* VariableDeclaration */:
                         if (ts.isBindingPattern(node.name) &&
                             !node.name.elements.length) {
                             // If the binding pattern is empty, this variable declaration is not visible
                             return false;
                         }
                     // falls through
-                    case 244 /* ModuleDeclaration */:
-                    case 240 /* ClassDeclaration */:
-                    case 241 /* InterfaceDeclaration */:
-                    case 242 /* TypeAliasDeclaration */:
-                    case 239 /* FunctionDeclaration */:
-                    case 243 /* EnumDeclaration */:
-                    case 248 /* ImportEqualsDeclaration */:
+                    case 245 /* ModuleDeclaration */:
+                    case 241 /* ClassDeclaration */:
+                    case 242 /* InterfaceDeclaration */:
+                    case 243 /* TypeAliasDeclaration */:
+                    case 240 /* FunctionDeclaration */:
+                    case 244 /* EnumDeclaration */:
+                    case 249 /* ImportEqualsDeclaration */:
                         // external module augmentation is always visible
                         if (ts.isExternalModuleAugmentation(node)) {
                             return true;
@@ -35255,53 +35918,53 @@ var ts;
                         var parent = getDeclarationContainer(node);
                         // If the node is not exported or it is not ambient module element (except import declaration)
                         if (!(ts.getCombinedModifierFlags(node) & 1 /* Export */) &&
-                            !(node.kind !== 248 /* ImportEqualsDeclaration */ && parent.kind !== 284 /* SourceFile */ && parent.flags & 4194304 /* Ambient */)) {
+                            !(node.kind !== 249 /* ImportEqualsDeclaration */ && parent.kind !== 285 /* SourceFile */ && parent.flags & 4194304 /* Ambient */)) {
                             return isGlobalSourceFile(parent);
                         }
                         // Exported members/ambient module elements (exception import declaration) are visible if parent is visible
                         return isDeclarationVisible(parent);
-                    case 154 /* PropertyDeclaration */:
-                    case 153 /* PropertySignature */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
-                    case 156 /* MethodDeclaration */:
-                    case 155 /* MethodSignature */:
+                    case 155 /* PropertyDeclaration */:
+                    case 154 /* PropertySignature */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
+                    case 157 /* MethodDeclaration */:
+                    case 156 /* MethodSignature */:
                         if (ts.hasModifier(node, 8 /* Private */ | 16 /* Protected */)) {
                             // Private/protected properties/methods are not visible
                             return false;
                         }
                     // Public properties/methods are visible if its parents are visible, so:
                     // falls through
-                    case 157 /* Constructor */:
-                    case 161 /* ConstructSignature */:
-                    case 160 /* CallSignature */:
-                    case 162 /* IndexSignature */:
-                    case 151 /* Parameter */:
-                    case 245 /* ModuleBlock */:
-                    case 165 /* FunctionType */:
-                    case 166 /* ConstructorType */:
-                    case 168 /* TypeLiteral */:
-                    case 164 /* TypeReference */:
-                    case 169 /* ArrayType */:
-                    case 170 /* TupleType */:
-                    case 173 /* UnionType */:
-                    case 174 /* IntersectionType */:
-                    case 177 /* ParenthesizedType */:
+                    case 158 /* Constructor */:
+                    case 162 /* ConstructSignature */:
+                    case 161 /* CallSignature */:
+                    case 163 /* IndexSignature */:
+                    case 152 /* Parameter */:
+                    case 246 /* ModuleBlock */:
+                    case 166 /* FunctionType */:
+                    case 167 /* ConstructorType */:
+                    case 169 /* TypeLiteral */:
+                    case 165 /* TypeReference */:
+                    case 170 /* ArrayType */:
+                    case 171 /* TupleType */:
+                    case 174 /* UnionType */:
+                    case 175 /* IntersectionType */:
+                    case 178 /* ParenthesizedType */:
                         return isDeclarationVisible(node.parent);
                     // Default binding, import specifier and namespace import is visible
                     // only on demand so by default it is not visible
-                    case 250 /* ImportClause */:
-                    case 251 /* NamespaceImport */:
-                    case 253 /* ImportSpecifier */:
+                    case 251 /* ImportClause */:
+                    case 252 /* NamespaceImport */:
+                    case 254 /* ImportSpecifier */:
                         return false;
                     // Type parameters are always visible
-                    case 150 /* TypeParameter */:
+                    case 151 /* TypeParameter */:
                     // Source file and namespace export are always visible
-                    case 284 /* SourceFile */:
-                    case 247 /* NamespaceExportDeclaration */:
+                    case 285 /* SourceFile */:
+                    case 248 /* NamespaceExportDeclaration */:
                         return true;
                     // Export assignments do not create name bindings outside the module
-                    case 254 /* ExportAssignment */:
+                    case 255 /* ExportAssignment */:
                         return false;
                     default:
                         return false;
@@ -35310,10 +35973,10 @@ var ts;
         }
         function collectLinkedAliases(node, setVisibility) {
             var exportSymbol;
-            if (node.parent && node.parent.kind === 254 /* ExportAssignment */) {
+            if (node.parent && node.parent.kind === 255 /* ExportAssignment */) {
                 exportSymbol = resolveName(node, node.escapedText, 67220415 /* Value */ | 67897832 /* Type */ | 1920 /* Namespace */ | 2097152 /* Alias */, /*nameNotFoundMessage*/ undefined, node, /*isUse*/ false);
             }
-            else if (node.parent.kind === 257 /* ExportSpecifier */) {
+            else if (node.parent.kind === 258 /* ExportSpecifier */) {
                 exportSymbol = getTargetOfExportSpecifier(node.parent, 67220415 /* Value */ | 67897832 /* Type */ | 1920 /* Namespace */ | 2097152 /* Alias */);
             }
             var result;
@@ -35409,12 +36072,12 @@ var ts;
         function getDeclarationContainer(node) {
             return ts.findAncestor(ts.getRootDeclaration(node), function (node) {
                 switch (node.kind) {
-                    case 237 /* VariableDeclaration */:
-                    case 238 /* VariableDeclarationList */:
-                    case 253 /* ImportSpecifier */:
-                    case 252 /* NamedImports */:
-                    case 251 /* NamespaceImport */:
-                    case 250 /* ImportClause */:
+                    case 238 /* VariableDeclaration */:
+                    case 239 /* VariableDeclarationList */:
+                    case 254 /* ImportSpecifier */:
+                    case 253 /* NamedImports */:
+                    case 252 /* NamespaceImport */:
+                    case 251 /* ImportClause */:
                         return false;
                     default:
                         return true;
@@ -35447,7 +36110,7 @@ var ts;
             return symbol && getSymbolLinks(symbol).type || getTypeForVariableLikeDeclaration(node, /*includeOptionality*/ false);
         }
         function isComputedNonLiteralName(name) {
-            return name.kind === 149 /* ComputedPropertyName */ && !ts.isStringOrNumericLiteralLike(name.expression);
+            return name.kind === 150 /* ComputedPropertyName */ && !ts.isStringOrNumericLiteralLike(name.expression);
         }
         function getRestType(source, properties, symbol) {
             source = filterType(source, function (t) { return !(t.flags & 98304 /* Nullable */); });
@@ -35462,13 +36125,11 @@ var ts;
                 if (omitKeyType.flags & 131072 /* Never */) {
                     return source;
                 }
-                var pickTypeAlias = getGlobalPickSymbol();
-                var excludeTypeAlias = getGlobalExcludeSymbol();
-                if (!pickTypeAlias || !excludeTypeAlias) {
+                var omitTypeAlias = getGlobalOmitSymbol();
+                if (!omitTypeAlias) {
                     return errorType;
                 }
-                var pickKeys = getTypeAliasInstantiation(excludeTypeAlias, [getIndexType(source), omitKeyType]);
-                return getTypeAliasInstantiation(pickTypeAlias, [source, pickKeys]);
+                return getTypeAliasInstantiation(omitTypeAlias, [source, omitKeyType]);
             }
             var members = ts.createSymbolTable();
             for (var _i = 0, _a = getPropertiesOfType(source); _i < _a.length; _i++) {
@@ -35501,7 +36162,7 @@ var ts;
             if (parentAccess && parentAccess.flowNode) {
                 var propName = getDestructuringPropertyName(node);
                 if (propName) {
-                    var result = ts.createNode(190 /* ElementAccessExpression */, node.pos, node.end);
+                    var result = ts.createNode(191 /* ElementAccessExpression */, node.pos, node.end);
                     result.parent = node;
                     result.expression = parentAccess;
                     var literal = ts.createNode(10 /* StringLiteral */, node.pos, node.end);
@@ -35516,23 +36177,23 @@ var ts;
         function getParentElementAccess(node) {
             var ancestor = node.parent.parent;
             switch (ancestor.kind) {
-                case 186 /* BindingElement */:
-                case 275 /* PropertyAssignment */:
+                case 187 /* BindingElement */:
+                case 276 /* PropertyAssignment */:
                     return getSyntheticElementAccess(ancestor);
-                case 187 /* ArrayLiteralExpression */:
+                case 188 /* ArrayLiteralExpression */:
                     return getSyntheticElementAccess(node.parent);
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     return ancestor.initializer;
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return ancestor.right;
             }
         }
         function getDestructuringPropertyName(node) {
             var parent = node.parent;
-            if (node.kind === 186 /* BindingElement */ && parent.kind === 184 /* ObjectBindingPattern */) {
+            if (node.kind === 187 /* BindingElement */ && parent.kind === 185 /* ObjectBindingPattern */) {
                 return getLiteralPropertyNameText(node.propertyName || node.name);
             }
-            if (node.kind === 275 /* PropertyAssignment */ || node.kind === 276 /* ShorthandPropertyAssignment */) {
+            if (node.kind === 276 /* PropertyAssignment */ || node.kind === 277 /* ShorthandPropertyAssignment */) {
                 return getLiteralPropertyNameText(node.name);
             }
             return "" + parent.elements.indexOf(node);
@@ -35554,7 +36215,7 @@ var ts;
                 parentType = getNonNullableType(parentType);
             }
             var type;
-            if (pattern.kind === 184 /* ObjectBindingPattern */) {
+            if (pattern.kind === 185 /* ObjectBindingPattern */) {
                 if (declaration.dotDotDotToken) {
                     if (parentType.flags & 2 /* Unknown */ || !isValidSpreadType(parentType)) {
                         error(declaration, ts.Diagnostics.Rest_types_may_only_be_created_from_object_types);
@@ -35581,7 +36242,7 @@ var ts;
                 // This elementType will be used if the specific property corresponding to this index is not
                 // present (aka the tuple element property). This call also checks that the parentType is in
                 // fact an iterable or array (depending on target language).
-                var elementType = checkIteratedTypeOrElementType(parentType, pattern, /*allowStringInput*/ false, /*allowAsyncIterables*/ false);
+                var elementType = checkIteratedTypeOrElementType(65 /* Destructuring */, parentType, undefinedType, pattern);
                 var index_1 = pattern.elements.indexOf(declaration);
                 if (declaration.dotDotDotToken) {
                     // If the parent is a tuple type, the rest element has a tuple type of the
@@ -35593,21 +36254,25 @@ var ts;
                 }
                 else if (isArrayLikeType(parentType)) {
                     var indexType = getLiteralType(index_1);
-                    var declaredType = getConstraintForLocation(getIndexedAccessType(parentType, indexType, declaration.name), declaration.name);
+                    var accessFlags = hasDefaultValue(declaration) ? 8 /* NoTupleBoundsCheck */ : 0;
+                    var declaredType = getConstraintForLocation(getIndexedAccessTypeOrUndefined(parentType, indexType, declaration.name, accessFlags) || errorType, declaration.name);
                     type = getFlowTypeOfDestructuring(declaration, declaredType);
                 }
                 else {
                     type = elementType;
                 }
             }
-            // In strict null checking mode, if a default value of a non-undefined type is specified, remove
-            // undefined from the final type.
-            if (strictNullChecks && declaration.initializer && !(getFalsyFlags(checkDeclarationInitializer(declaration)) & 32768 /* Undefined */)) {
-                type = getTypeWithFacts(type, 524288 /* NEUndefined */);
+            if (!declaration.initializer) {
+                return type;
             }
-            return declaration.initializer && !ts.getEffectiveTypeAnnotationNode(ts.walkUpBindingElementsAndPatterns(declaration)) ?
-                getUnionType([type, checkDeclarationInitializer(declaration)], 2 /* Subtype */) :
-                type;
+            if (ts.getEffectiveTypeAnnotationNode(ts.walkUpBindingElementsAndPatterns(declaration))) {
+                // In strict null checking mode, if a default value of a non-undefined type is specified, remove
+                // undefined from the final type.
+                return strictNullChecks && !(getFalsyFlags(checkDeclarationInitializer(declaration)) & 32768 /* Undefined */) ?
+                    getTypeWithFacts(type, 524288 /* NEUndefined */) :
+                    type;
+            }
+            return getUnionType([getTypeWithFacts(type, 524288 /* NEUndefined */), checkDeclarationInitializer(declaration)], 2 /* Subtype */);
         }
         function getTypeForDeclarationFromJSDocComment(declaration) {
             var jsdocType = ts.getJSDocType(declaration);
@@ -35618,30 +36283,30 @@ var ts;
         }
         function isNullOrUndefined(node) {
             var expr = ts.skipParentheses(node);
-            return expr.kind === 96 /* NullKeyword */ || expr.kind === 72 /* Identifier */ && getResolvedSymbol(expr) === undefinedSymbol;
+            return expr.kind === 97 /* NullKeyword */ || expr.kind === 73 /* Identifier */ && getResolvedSymbol(expr) === undefinedSymbol;
         }
         function isEmptyArrayLiteral(node) {
             var expr = ts.skipParentheses(node);
-            return expr.kind === 187 /* ArrayLiteralExpression */ && expr.elements.length === 0;
+            return expr.kind === 188 /* ArrayLiteralExpression */ && expr.elements.length === 0;
         }
         function addOptionality(type, optional) {
             if (optional === void 0) { optional = true; }
             return strictNullChecks && optional ? getOptionalType(type) : type;
         }
         function isParameterOfContextuallyTypedFunction(node) {
-            return node.kind === 151 /* Parameter */ &&
-                (node.parent.kind === 196 /* FunctionExpression */ || node.parent.kind === 197 /* ArrowFunction */) &&
+            return node.kind === 152 /* Parameter */ &&
+                (node.parent.kind === 197 /* FunctionExpression */ || node.parent.kind === 198 /* ArrowFunction */) &&
                 !!getContextualType(node.parent);
         }
         // Return the inferred type for a variable, parameter, or property declaration
         function getTypeForVariableLikeDeclaration(declaration, includeOptionality) {
             // A variable declared in a for..in statement is of type string, or of type keyof T when the
             // right hand expression is of a type parameter type.
-            if (ts.isVariableDeclaration(declaration) && declaration.parent.parent.kind === 226 /* ForInStatement */) {
+            if (ts.isVariableDeclaration(declaration) && declaration.parent.parent.kind === 227 /* ForInStatement */) {
                 var indexType = getIndexType(getNonNullableTypeIfNeeded(checkExpression(declaration.parent.parent.expression)));
                 return indexType.flags & (262144 /* TypeParameter */ | 4194304 /* Index */) ? getExtractStringType(indexType) : stringType;
             }
-            if (ts.isVariableDeclaration(declaration) && declaration.parent.parent.kind === 227 /* ForOfStatement */) {
+            if (ts.isVariableDeclaration(declaration) && declaration.parent.parent.kind === 228 /* ForOfStatement */) {
                 // checkRightHandSideOfForOf will return undefined if the for-of expression type was
                 // missing properties/signatures required to get its iteratedType (like
                 // [Symbol.iterator] or next). This may be because we accessed properties from anyType,
@@ -35660,7 +36325,7 @@ var ts;
                 return addOptionality(declaredType, isOptional);
             }
             if ((noImplicitAny || ts.isInJSFile(declaration)) &&
-                declaration.kind === 237 /* VariableDeclaration */ && !ts.isBindingPattern(declaration.name) &&
+                declaration.kind === 238 /* VariableDeclaration */ && !ts.isBindingPattern(declaration.name) &&
                 !(ts.getCombinedModifierFlags(declaration) & 1 /* Export */) && !(declaration.flags & 4194304 /* Ambient */)) {
                 // If --noImplicitAny is on or the declaration is in a Javascript file,
                 // use control flow tracked 'any' type for non-ambient, non-exported var or let variables with no
@@ -35674,11 +36339,11 @@ var ts;
                     return autoArrayType;
                 }
             }
-            if (declaration.kind === 151 /* Parameter */) {
+            if (declaration.kind === 152 /* Parameter */) {
                 var func = declaration.parent;
                 // For a parameter of a set accessor, use the type of the get accessor if one is present
-                if (func.kind === 159 /* SetAccessor */ && !hasNonBindableDynamicName(func)) {
-                    var getter = ts.getDeclarationOfKind(getSymbolOfNode(declaration.parent), 158 /* GetAccessor */);
+                if (func.kind === 160 /* SetAccessor */ && !hasNonBindableDynamicName(func)) {
+                    var getter = ts.getDeclarationOfKind(getSymbolOfNode(declaration.parent), 159 /* GetAccessor */);
                     if (getter) {
                         var getterSignature = getSignatureFromDeclaration(getter);
                         var thisParameter = getAccessorThisParameter(func);
@@ -35697,7 +36362,7 @@ var ts;
                     }
                 }
                 // Use contextual parameter type if one is available
-                var type = declaration.symbol.escapedName === "this" /* This */ ? getContextualThisParameterType(func) : getContextuallyTypedParameterType(declaration);
+                var type = declaration.symbol.escapedName === "this" /* This */ ? getContextualThisParameterType(func) : getContextuallyTypedParameterType(declaration, /*forCache*/ true);
                 if (type) {
                     return addOptionality(type, isOptional);
                 }
@@ -35727,7 +36392,7 @@ var ts;
             // No type specified and nothing can be inferred
             return undefined;
         }
-        function getWidenedTypeFromAssignmentDeclaration(symbol, resolvedSymbol) {
+        function getWidenedTypeForAssignmentDeclaration(symbol, resolvedSymbol) {
             // function/class/{} initializers are themselves containers, so they won't merge in the same way as other initializers
             var container = ts.getAssignedExpandoInitializer(symbol.valueDeclaration);
             if (container) {
@@ -35760,7 +36425,7 @@ var ts;
                     }
                 }
                 if (!ts.isCallExpression(expression)) {
-                    jsdocType = getJSDocTypeFromAssignmentDeclaration(jsdocType, expression, symbol, declaration);
+                    jsdocType = getAnnotatedTypeForAssignmentDeclaration(jsdocType, expression, symbol, declaration);
                 }
                 if (!jsdocType) {
                     (types || (types = [])).push((ts.isBinaryExpression(expression) || ts.isCallExpression(expression)) ? getInitializerTypeFromAssignmentDeclaration(symbol, resolvedSymbol, expression, kind) : neverType);
@@ -35807,15 +36472,21 @@ var ts;
             type.objectFlags |= 16384 /* JSLiteral */;
             return type;
         }
-        function getJSDocTypeFromAssignmentDeclaration(declaredType, expression, _symbol, declaration) {
-            var typeNode = ts.getJSDocType(expression.parent);
+        function getAnnotatedTypeForAssignmentDeclaration(declaredType, expression, symbol, declaration) {
+            var typeNode = ts.getEffectiveTypeAnnotationNode(expression.parent);
             if (typeNode) {
                 var type = getWidenedType(getTypeFromTypeNode(typeNode));
                 if (!declaredType) {
                     return type;
                 }
                 else if (declaredType !== errorType && type !== errorType && !isTypeIdenticalTo(declaredType, type)) {
-                    errorNextVariableOrPropertyDeclarationMustHaveSameType(declaredType, declaration, type);
+                    errorNextVariableOrPropertyDeclarationMustHaveSameType(/*firstDeclaration*/ undefined, declaredType, declaration, type);
+                }
+            }
+            if (symbol.parent) {
+                var typeNode_2 = ts.getEffectiveTypeAnnotationNode(symbol.parent.valueDeclaration);
+                if (typeNode_2) {
+                    return getTypeOfPropertyOfType(getTypeFromTypeNode(typeNode_2), symbol.escapedName);
                 }
             }
             return declaredType;
@@ -35882,9 +36553,9 @@ var ts;
             var thisContainer = ts.getThisContainer(expression, /*includeArrowFunctions*/ false);
             // Properties defined in a constructor (or base constructor, or javascript constructor function) don't get undefined added.
             // Function expressions that are assigned to the prototype count as methods.
-            return thisContainer.kind === 157 /* Constructor */ ||
-                thisContainer.kind === 239 /* FunctionDeclaration */ ||
-                (thisContainer.kind === 196 /* FunctionExpression */ && !ts.isPrototypePropertyAssignment(thisContainer.parent));
+            return thisContainer.kind === 158 /* Constructor */ ||
+                thisContainer.kind === 240 /* FunctionDeclaration */ ||
+                (thisContainer.kind === 197 /* FunctionExpression */ && !ts.isPrototypePropertyAssignment(thisContainer.parent));
         }
         function getConstructorDefinedThisAssignmentTypes(types, declarations) {
             ts.Debug.assert(types.length === declarations.length);
@@ -35928,7 +36599,7 @@ var ts;
         function getTypeFromObjectBindingPattern(pattern, includePatternInType, reportErrors) {
             var members = ts.createSymbolTable();
             var stringIndexInfo;
-            var objectFlags = 128 /* ObjectLiteral */ | 262144 /* ContainsObjectLiteral */;
+            var objectFlags = 128 /* ObjectLiteral */ | 524288 /* ContainsObjectOrArrayLiteral */;
             ts.forEach(pattern.elements, function (e) {
                 var name = e.propertyName || e.name;
                 if (e.dotDotDotToken) {
@@ -35959,7 +36630,7 @@ var ts;
         function getTypeFromArrayBindingPattern(pattern, includePatternInType, reportErrors) {
             var elements = pattern.elements;
             var lastElement = ts.lastOrUndefined(elements);
-            var hasRestElement = !!(lastElement && lastElement.kind === 186 /* BindingElement */ && lastElement.dotDotDotToken);
+            var hasRestElement = !!(lastElement && lastElement.kind === 187 /* BindingElement */ && lastElement.dotDotDotToken);
             if (elements.length === 0 || elements.length === 1 && hasRestElement) {
                 return languageVersion >= 2 /* ES2015 */ ? createIterableType(anyType) : anyArrayType;
             }
@@ -35982,7 +36653,7 @@ var ts;
         function getTypeFromBindingPattern(pattern, includePatternInType, reportErrors) {
             if (includePatternInType === void 0) { includePatternInType = false; }
             if (reportErrors === void 0) { reportErrors = false; }
-            return pattern.kind === 184 /* ObjectBindingPattern */
+            return pattern.kind === 185 /* ObjectBindingPattern */
                 ? getTypeFromObjectBindingPattern(pattern, includePatternInType, reportErrors)
                 : getTypeFromArrayBindingPattern(pattern, includePatternInType, reportErrors);
         }
@@ -36021,7 +36692,7 @@ var ts;
         }
         function declarationBelongsToPrivateAmbientMember(declaration) {
             var root = ts.getRootDeclaration(declaration);
-            var memberDeclaration = root.kind === 151 /* Parameter */ ? root.parent : root;
+            var memberDeclaration = root.kind === 152 /* Parameter */ ? root.parent : root;
             return isPrivateWithinAmbient(memberDeclaration);
         }
         function tryGetTypeFromEffectiveTypeNode(declaration) {
@@ -36074,9 +36745,6 @@ var ts;
                 }
                 return type_1;
             }
-            if (declaration.kind === 254 /* ExportAssignment */) {
-                return widenTypeForVariableLikeDeclaration(checkExpressionCached(declaration.expression), declaration);
-            }
             // Handle variable, parameter or property
             if (!pushTypeResolution(symbol, 0 /* Type */)) {
                 // Symbol is property of some kind that is merged with something - should use `getTypeOfFuncClassEnumModule` and not `getTypeOfVariableOrParameterOrProperty`
@@ -36086,9 +36754,12 @@ var ts;
                 return reportCircularityError(symbol);
             }
             var type;
-            if (ts.isInJSFile(declaration) &&
+            if (declaration.kind === 255 /* ExportAssignment */) {
+                type = widenTypeForVariableLikeDeclaration(checkExpressionCached(declaration.expression), declaration);
+            }
+            else if (ts.isInJSFile(declaration) &&
                 (ts.isCallExpression(declaration) || ts.isBinaryExpression(declaration) || ts.isPropertyAccessExpression(declaration) && ts.isBinaryExpression(declaration.parent))) {
-                type = getWidenedTypeFromAssignmentDeclaration(symbol);
+                type = getWidenedTypeForAssignmentDeclaration(symbol);
             }
             else if (ts.isJSDocPropertyLikeTag(declaration)
                 || ts.isPropertyAccessExpression(declaration)
@@ -36103,7 +36774,7 @@ var ts;
                     return getTypeOfFuncClassEnumModule(symbol);
                 }
                 type = ts.isBinaryExpression(declaration.parent) ?
-                    getWidenedTypeFromAssignmentDeclaration(symbol) :
+                    getWidenedTypeForAssignmentDeclaration(symbol) :
                     tryGetTypeFromEffectiveTypeNode(declaration) || anyType;
             }
             else if (ts.isPropertyAssignment(declaration)) {
@@ -36134,7 +36805,7 @@ var ts;
                 type = getTypeOfEnumMember(symbol);
             }
             else {
-                return ts.Debug.fail("Unhandled declaration kind! " + ts.Debug.showSyntaxKind(declaration) + " for " + ts.Debug.showSymbol(symbol));
+                return ts.Debug.fail("Unhandled declaration kind! " + ts.Debug.formatSyntaxKind(declaration.kind) + " for " + ts.Debug.formatSymbol(symbol));
             }
             if (!popTypeResolution()) {
                 // Symbol is property of some kind that is merged with something - should use `getTypeOfFuncClassEnumModule` and not `getTypeOfVariableOrParameterOrProperty`
@@ -36147,7 +36818,7 @@ var ts;
         }
         function getAnnotatedAccessorTypeNode(accessor) {
             if (accessor) {
-                if (accessor.kind === 158 /* GetAccessor */) {
+                if (accessor.kind === 159 /* GetAccessor */) {
                     var getterTypeAnnotation = ts.getEffectiveReturnTypeNode(accessor);
                     return getterTypeAnnotation;
                 }
@@ -36174,8 +36845,8 @@ var ts;
             return links.type || (links.type = getTypeOfAccessorsWorker(symbol));
         }
         function getTypeOfAccessorsWorker(symbol) {
-            var getter = ts.getDeclarationOfKind(symbol, 158 /* GetAccessor */);
-            var setter = ts.getDeclarationOfKind(symbol, 159 /* SetAccessor */);
+            var getter = ts.getDeclarationOfKind(symbol, 159 /* GetAccessor */);
+            var setter = ts.getDeclarationOfKind(symbol, 160 /* SetAccessor */);
             if (getter && ts.isInJSFile(getter)) {
                 var jsDocType = getTypeForDeclarationFromJSDocComment(getter);
                 if (jsDocType) {
@@ -36218,7 +36889,7 @@ var ts;
             if (!popTypeResolution()) {
                 type = anyType;
                 if (noImplicitAny) {
-                    var getter_1 = ts.getDeclarationOfKind(symbol, 158 /* GetAccessor */);
+                    var getter_1 = ts.getDeclarationOfKind(symbol, 159 /* GetAccessor */);
                     error(getter_1, ts.Diagnostics._0_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions, symbolToString(symbol));
                 }
             }
@@ -36258,9 +36929,9 @@ var ts;
             if (symbol.flags & 1536 /* Module */ && ts.isShorthandAmbientModuleSymbol(symbol)) {
                 return anyType;
             }
-            else if (declaration.kind === 204 /* BinaryExpression */ ||
-                declaration.kind === 189 /* PropertyAccessExpression */ && declaration.parent.kind === 204 /* BinaryExpression */) {
-                return getWidenedTypeFromAssignmentDeclaration(symbol);
+            else if (declaration.kind === 205 /* BinaryExpression */ ||
+                declaration.kind === 190 /* PropertyAccessExpression */ && declaration.parent.kind === 205 /* BinaryExpression */) {
+                return getWidenedTypeForAssignmentDeclaration(symbol);
             }
             else if (symbol.flags & 512 /* ValueModule */ && declaration && ts.isSourceFile(declaration) && declaration.commonJsModuleIndicator) {
                 var resolvedModule = resolveExternalModuleSymbol(symbol);
@@ -36269,7 +36940,7 @@ var ts;
                         return errorType;
                     }
                     var exportEquals = getMergedSymbol(symbol.exports.get("export=" /* ExportEquals */));
-                    var type_2 = getWidenedTypeFromAssignmentDeclaration(exportEquals, exportEquals === resolvedModule ? undefined : resolvedModule);
+                    var type_2 = getWidenedTypeForAssignmentDeclaration(exportEquals, exportEquals === resolvedModule ? undefined : resolvedModule);
                     if (!popTypeResolution()) {
                         return reportCircularityError(symbol);
                     }
@@ -36326,7 +36997,7 @@ var ts;
                 return errorType;
             }
             // Check if variable has initializer that circularly references the variable itself
-            if (noImplicitAny && (declaration.kind !== 151 /* Parameter */ || declaration.initializer)) {
+            if (noImplicitAny && (declaration.kind !== 152 /* Parameter */ || declaration.initializer)) {
                 error(symbol.valueDeclaration, ts.Diagnostics._0_implicitly_has_type_any_because_it_does_not_have_a_type_annotation_and_is_referenced_directly_or_indirectly_in_its_own_initializer, symbolToString(symbol));
             }
             // Circularities could also result from parameters in function expressions that end up
@@ -36334,11 +37005,23 @@ var ts;
             // we have already reported an implicit any error so we don't report anything here.
             return anyType;
         }
+        function getTypeOfSymbolWithDeferredType(symbol) {
+            var links = getSymbolLinks(symbol);
+            if (!links.type) {
+                ts.Debug.assertDefined(links.deferralParent);
+                ts.Debug.assertDefined(links.deferralConstituents);
+                links.type = links.deferralParent.flags & 1048576 /* Union */ ? getUnionType(links.deferralConstituents) : getIntersectionType(links.deferralConstituents);
+            }
+            return links.type;
+        }
         function getTypeOfSymbol(symbol) {
+            if (ts.getCheckFlags(symbol) & 65536 /* DeferredType */) {
+                return getTypeOfSymbolWithDeferredType(symbol);
+            }
             if (ts.getCheckFlags(symbol) & 1 /* Instantiated */) {
                 return getTypeOfInstantiatedSymbol(symbol);
             }
-            if (ts.getCheckFlags(symbol) & 4096 /* ReverseMapped */) {
+            if (ts.getCheckFlags(symbol) & 8192 /* ReverseMapped */) {
                 return getTypeOfReverseMappedSymbol(symbol);
             }
             if (symbol.flags & (3 /* Variable */ | 4 /* Property */)) {
@@ -36399,35 +37082,35 @@ var ts;
                     return undefined;
                 }
                 switch (node.kind) {
-                    case 240 /* ClassDeclaration */:
-                    case 209 /* ClassExpression */:
-                    case 241 /* InterfaceDeclaration */:
-                    case 160 /* CallSignature */:
-                    case 161 /* ConstructSignature */:
-                    case 155 /* MethodSignature */:
-                    case 165 /* FunctionType */:
-                    case 166 /* ConstructorType */:
-                    case 294 /* JSDocFunctionType */:
-                    case 239 /* FunctionDeclaration */:
-                    case 156 /* MethodDeclaration */:
-                    case 196 /* FunctionExpression */:
-                    case 197 /* ArrowFunction */:
-                    case 242 /* TypeAliasDeclaration */:
-                    case 308 /* JSDocTemplateTag */:
-                    case 309 /* JSDocTypedefTag */:
-                    case 302 /* JSDocCallbackTag */:
-                    case 181 /* MappedType */:
-                    case 175 /* ConditionalType */:
+                    case 241 /* ClassDeclaration */:
+                    case 210 /* ClassExpression */:
+                    case 242 /* InterfaceDeclaration */:
+                    case 161 /* CallSignature */:
+                    case 162 /* ConstructSignature */:
+                    case 156 /* MethodSignature */:
+                    case 166 /* FunctionType */:
+                    case 167 /* ConstructorType */:
+                    case 295 /* JSDocFunctionType */:
+                    case 240 /* FunctionDeclaration */:
+                    case 157 /* MethodDeclaration */:
+                    case 197 /* FunctionExpression */:
+                    case 198 /* ArrowFunction */:
+                    case 243 /* TypeAliasDeclaration */:
+                    case 310 /* JSDocTemplateTag */:
+                    case 311 /* JSDocTypedefTag */:
+                    case 304 /* JSDocCallbackTag */:
+                    case 182 /* MappedType */:
+                    case 176 /* ConditionalType */:
                         var outerTypeParameters = getOuterTypeParameters(node, includeThisTypes);
-                        if (node.kind === 181 /* MappedType */) {
+                        if (node.kind === 182 /* MappedType */) {
                             return ts.append(outerTypeParameters, getDeclaredTypeOfTypeParameter(getSymbolOfNode(node.typeParameter)));
                         }
-                        else if (node.kind === 175 /* ConditionalType */) {
+                        else if (node.kind === 176 /* ConditionalType */) {
                             return ts.concatenate(outerTypeParameters, getInferTypeParameters(node));
                         }
                         var outerAndOwnTypeParameters = appendTypeParameters(outerTypeParameters, ts.getEffectiveTypeParameterDeclarations(node));
                         var thisType = includeThisTypes &&
-                            (node.kind === 240 /* ClassDeclaration */ || node.kind === 209 /* ClassExpression */ || node.kind === 241 /* InterfaceDeclaration */) &&
+                            (node.kind === 241 /* ClassDeclaration */ || node.kind === 210 /* ClassExpression */ || node.kind === 242 /* InterfaceDeclaration */) &&
                             getDeclaredTypeOfClassOrInterface(getSymbolOfNode(node)).thisType;
                         return thisType ? ts.append(outerAndOwnTypeParameters, thisType) : outerAndOwnTypeParameters;
                 }
@@ -36435,7 +37118,7 @@ var ts;
         }
         // The outer type parameters are those defined by enclosing generic classes, methods, or functions.
         function getOuterTypeParametersOfClassOrInterface(symbol) {
-            var declaration = symbol.flags & 32 /* Class */ ? symbol.valueDeclaration : ts.getDeclarationOfKind(symbol, 241 /* InterfaceDeclaration */);
+            var declaration = symbol.flags & 32 /* Class */ ? symbol.valueDeclaration : ts.getDeclarationOfKind(symbol, 242 /* InterfaceDeclaration */);
             return getOuterTypeParameters(declaration);
         }
         // The local type parameters are the combined set of type parameters from all declarations of the class,
@@ -36444,9 +37127,9 @@ var ts;
             var result;
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var node = _a[_i];
-                if (node.kind === 241 /* InterfaceDeclaration */ ||
-                    node.kind === 240 /* ClassDeclaration */ ||
-                    node.kind === 209 /* ClassExpression */ ||
+                if (node.kind === 242 /* InterfaceDeclaration */ ||
+                    node.kind === 241 /* ClassDeclaration */ ||
+                    node.kind === 210 /* ClassExpression */ ||
                     ts.isTypeAlias(node)) {
                     var declaration = node;
                     result = appendTypeParameters(result, ts.getEffectiveTypeParameterDeclarations(declaration));
@@ -36536,7 +37219,7 @@ var ts;
                                 ctorReturn = getReturnTypeOfSignature(ctorSig[0]);
                             }
                         }
-                        addRelatedInfo(err, ts.createDiagnosticForNode(baseConstructorType.symbol.declarations[0], ts.Diagnostics.Did_you_mean_for_0_to_be_constrained_to_type_new_args_Colon_any_1, symbolToString(baseConstructorType.symbol), typeToString(ctorReturn)));
+                        ts.addRelatedInfo(err, ts.createDiagnosticForNode(baseConstructorType.symbol.declarations[0], ts.Diagnostics.Did_you_mean_for_0_to_be_constrained_to_type_new_args_Colon_any_1, symbolToString(baseConstructorType.symbol), typeToString(ctorReturn)));
                     }
                     return type.resolvedBaseConstructorType = errorType;
                 }
@@ -36640,7 +37323,7 @@ var ts;
             type.resolvedBaseTypes = type.resolvedBaseTypes || ts.emptyArray;
             for (var _i = 0, _a = type.symbol.declarations; _i < _a.length; _i++) {
                 var declaration = _a[_i];
-                if (declaration.kind === 241 /* InterfaceDeclaration */ && ts.getInterfaceBaseTypeNodes(declaration)) {
+                if (declaration.kind === 242 /* InterfaceDeclaration */ && ts.getInterfaceBaseTypeNodes(declaration)) {
                     for (var _b = 0, _c = ts.getInterfaceBaseTypeNodes(declaration); _b < _c.length; _b++) {
                         var node = _c[_b];
                         var baseType = getTypeFromTypeNode(node);
@@ -36676,7 +37359,7 @@ var ts;
         function isThislessInterface(symbol) {
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var declaration = _a[_i];
-                if (declaration.kind === 241 /* InterfaceDeclaration */) {
+                if (declaration.kind === 242 /* InterfaceDeclaration */) {
                     if (declaration.flags & 64 /* ContainsThis */) {
                         return false;
                     }
@@ -36733,7 +37416,7 @@ var ts;
                     return errorType;
                 }
                 var declaration = ts.find(symbol.declarations, function (d) {
-                    return ts.isJSDocTypeAlias(d) || d.kind === 242 /* TypeAliasDeclaration */;
+                    return ts.isJSDocTypeAlias(d) || d.kind === 243 /* TypeAliasDeclaration */;
                 });
                 var typeNode = ts.isJSDocTypeAlias(declaration) ? declaration.typeExpression : declaration.type;
                 // If typeNode is missing, we will error in checkJSDocTypedefTag.
@@ -36760,7 +37443,7 @@ var ts;
             if (expr.kind === 10 /* StringLiteral */) {
                 return true;
             }
-            else if (expr.kind === 204 /* BinaryExpression */) {
+            else if (expr.kind === 205 /* BinaryExpression */) {
                 return isStringConcatExpression(expr.left) && isStringConcatExpression(expr.right);
             }
             return false;
@@ -36774,12 +37457,12 @@ var ts;
                 case 10 /* StringLiteral */:
                 case 8 /* NumericLiteral */:
                     return true;
-                case 202 /* PrefixUnaryExpression */:
+                case 203 /* PrefixUnaryExpression */:
                     return expr.operator === 39 /* MinusToken */ &&
                         expr.operand.kind === 8 /* NumericLiteral */;
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return ts.nodeIsMissing(expr) || !!getSymbolOfNode(member.parent).exports.get(expr.escapedText);
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return isStringConcatExpression(expr);
                 default:
                     return false;
@@ -36793,7 +37476,7 @@ var ts;
             var hasNonLiteralMember = false;
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var declaration = _a[_i];
-                if (declaration.kind === 243 /* EnumDeclaration */) {
+                if (declaration.kind === 244 /* EnumDeclaration */) {
                     for (var _b = 0, _c = declaration.members; _b < _c.length; _b++) {
                         var member = _c[_b];
                         if (member.initializer && member.initializer.kind === 10 /* StringLiteral */) {
@@ -36820,10 +37503,11 @@ var ts;
                 var memberTypeList = [];
                 for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                     var declaration = _a[_i];
-                    if (declaration.kind === 243 /* EnumDeclaration */) {
+                    if (declaration.kind === 244 /* EnumDeclaration */) {
                         for (var _b = 0, _c = declaration.members; _b < _c.length; _b++) {
                             var member = _c[_b];
-                            var memberType = getFreshTypeOfLiteralType(getLiteralType(getEnumMemberValue(member), enumCount, getSymbolOfNode(member))); // TODO: GH#18217
+                            var value = getEnumMemberValue(member);
+                            var memberType = getFreshTypeOfLiteralType(getLiteralType(value !== undefined ? value : 0, enumCount, getSymbolOfNode(member)));
                             getSymbolLinks(getSymbolOfNode(member)).declaredType = memberType;
                             memberTypeList.push(getRegularTypeOfLiteralType(memberType));
                         }
@@ -36891,23 +37575,23 @@ var ts;
          */
         function isThislessType(node) {
             switch (node.kind) {
-                case 120 /* AnyKeyword */:
-                case 143 /* UnknownKeyword */:
-                case 138 /* StringKeyword */:
-                case 135 /* NumberKeyword */:
-                case 146 /* BigIntKeyword */:
-                case 123 /* BooleanKeyword */:
-                case 139 /* SymbolKeyword */:
-                case 136 /* ObjectKeyword */:
-                case 106 /* VoidKeyword */:
-                case 141 /* UndefinedKeyword */:
-                case 96 /* NullKeyword */:
-                case 132 /* NeverKeyword */:
-                case 182 /* LiteralType */:
+                case 121 /* AnyKeyword */:
+                case 144 /* UnknownKeyword */:
+                case 139 /* StringKeyword */:
+                case 136 /* NumberKeyword */:
+                case 147 /* BigIntKeyword */:
+                case 124 /* BooleanKeyword */:
+                case 140 /* SymbolKeyword */:
+                case 137 /* ObjectKeyword */:
+                case 107 /* VoidKeyword */:
+                case 142 /* UndefinedKeyword */:
+                case 97 /* NullKeyword */:
+                case 133 /* NeverKeyword */:
+                case 183 /* LiteralType */:
                     return true;
-                case 169 /* ArrayType */:
+                case 170 /* ArrayType */:
                     return isThislessType(node.elementType);
-                case 164 /* TypeReference */:
+                case 165 /* TypeReference */:
                     return !node.typeArguments || node.typeArguments.every(isThislessType);
             }
             return false;
@@ -36933,7 +37617,7 @@ var ts;
         function isThislessFunctionLikeDeclaration(node) {
             var returnType = ts.getEffectiveReturnTypeNode(node);
             var typeParameters = ts.getEffectiveTypeParameterDeclarations(node);
-            return (node.kind === 157 /* Constructor */ || (!!returnType && isThislessType(returnType))) &&
+            return (node.kind === 158 /* Constructor */ || (!!returnType && isThislessType(returnType))) &&
                 node.parameters.every(isThislessVariableLikeDeclaration) &&
                 typeParameters.every(isThislessTypeParameter);
         }
@@ -36949,14 +37633,14 @@ var ts;
                 var declaration = symbol.declarations[0];
                 if (declaration) {
                     switch (declaration.kind) {
-                        case 154 /* PropertyDeclaration */:
-                        case 153 /* PropertySignature */:
+                        case 155 /* PropertyDeclaration */:
+                        case 154 /* PropertySignature */:
                             return isThislessVariableLikeDeclaration(declaration);
-                        case 156 /* MethodDeclaration */:
-                        case 155 /* MethodSignature */:
-                        case 157 /* Constructor */:
-                        case 158 /* GetAccessor */:
-                        case 159 /* SetAccessor */:
+                        case 157 /* MethodDeclaration */:
+                        case 156 /* MethodSignature */:
+                        case 158 /* Constructor */:
+                        case 159 /* GetAccessor */:
+                        case 160 /* SetAccessor */:
                             return isThislessFunctionLikeDeclaration(declaration);
                     }
                 }
@@ -37057,7 +37741,7 @@ var ts;
          * members.
          */
         function addDeclarationToLateBoundSymbol(symbol, member, symbolFlags) {
-            ts.Debug.assert(!!(ts.getCheckFlags(symbol) & 2048 /* Late */), "Expected a late-bound symbol.");
+            ts.Debug.assert(!!(ts.getCheckFlags(symbol) & 4096 /* Late */), "Expected a late-bound symbol.");
             symbol.flags |= symbolFlags;
             getSymbolLinks(member.symbol).lateSymbol = symbol;
             if (!symbol.declarations) {
@@ -37114,7 +37798,7 @@ var ts;
                     // Get or add a late-bound symbol for the member. This allows us to merge late-bound accessor declarations.
                     var lateSymbol = lateSymbols.get(memberName);
                     if (!lateSymbol)
-                        lateSymbols.set(memberName, lateSymbol = createSymbol(0 /* None */, memberName, 2048 /* Late */));
+                        lateSymbols.set(memberName, lateSymbol = createSymbol(0 /* None */, memberName, 4096 /* Late */));
                     // Report an error if a late-bound member has the same name as an early-bound member,
                     // or if we have another early-bound symbol declaration with the same name and
                     // conflicting flags.
@@ -37126,7 +37810,7 @@ var ts;
                         var name_3 = !(type.flags & 8192 /* UniqueESSymbol */) && ts.unescapeLeadingUnderscores(memberName) || ts.declarationNameToString(decl.name);
                         ts.forEach(declarations, function (declaration) { return error(ts.getNameOfDeclaration(declaration) || declaration, ts.Diagnostics.Property_0_was_also_declared_here, name_3); });
                         error(decl.name || decl, ts.Diagnostics.Duplicate_property_0, name_3);
-                        lateSymbol = createSymbol(0 /* None */, memberName, 2048 /* Late */);
+                        lateSymbol = createSymbol(0 /* None */, memberName, 4096 /* Late */);
                     }
                     lateSymbol.nameType = type;
                     addDeclarationToLateBoundSymbol(lateSymbol, decl, symbolFlags);
@@ -37191,11 +37875,12 @@ var ts;
                 var links = getSymbolLinks(symbol);
                 if (!links.lateSymbol && ts.some(symbol.declarations, hasLateBindableName)) {
                     // force late binding of members/exports. This will set the late-bound symbol
+                    var parent = getMergedSymbol(symbol.parent);
                     if (ts.some(symbol.declarations, ts.hasStaticModifier)) {
-                        getExportsOfSymbol(symbol.parent);
+                        getExportsOfSymbol(parent);
                     }
                     else {
-                        getMembersOfSymbol(symbol.parent);
+                        getMembersOfSymbol(parent);
                     }
                 }
                 return links.lateSymbol || (links.lateSymbol = symbol);
@@ -37288,8 +37973,18 @@ var ts;
             return sig;
         }
         function cloneSignature(sig) {
-            return createSignature(sig.declaration, sig.typeParameters, sig.thisParameter, sig.parameters, /*resolvedReturnType*/ undefined, 
+            var result = createSignature(sig.declaration, sig.typeParameters, sig.thisParameter, sig.parameters, /*resolvedReturnType*/ undefined, 
             /*resolvedTypePredicate*/ undefined, sig.minArgumentCount, sig.hasRestParameter, sig.hasLiteralTypes);
+            result.target = sig.target;
+            result.mapper = sig.mapper;
+            return result;
+        }
+        function createUnionSignature(signature, unionSignatures) {
+            var result = cloneSignature(signature);
+            result.unionSignatures = unionSignatures;
+            result.target = undefined;
+            result.mapper = undefined;
+            return result;
         }
         function getExpandedParameters(sig) {
             if (sig.hasRestParameter) {
@@ -37302,8 +37997,8 @@ var ts;
                     var tupleRestIndex_1 = restType.target.hasRestElement ? elementTypes.length - 1 : -1;
                     var restParams = ts.map(elementTypes, function (t, i) {
                         var name = getParameterNameAtPosition(sig, restIndex_1 + i);
-                        var checkFlags = i === tupleRestIndex_1 ? 16384 /* RestParameter */ :
-                            i >= minLength_1 ? 8192 /* OptionalParameter */ : 0;
+                        var checkFlags = i === tupleRestIndex_1 ? 32768 /* RestParameter */ :
+                            i >= minLength_1 ? 16384 /* OptionalParameter */ : 0;
                         var symbol = createSymbol(1 /* FunctionScopedVariable */, name, checkFlags);
                         symbol.type = i === tupleRestIndex_1 ? createArrayType(t) : t;
                         return symbol;
@@ -37393,14 +38088,13 @@ var ts;
                             // Union the result types when more than one signature matches
                             if (unionSignatures.length > 1) {
                                 var thisParameter = signature.thisParameter;
-                                if (ts.forEach(unionSignatures, function (sig) { return sig.thisParameter; })) {
-                                    // TODO: GH#18217 We tested that *some* has thisParameter and now act as if *all* do
+                                var firstThisParameterOfUnionSignatures = ts.forEach(unionSignatures, function (sig) { return sig.thisParameter; });
+                                if (firstThisParameterOfUnionSignatures) {
                                     var thisType = getUnionType(ts.map(unionSignatures, function (sig) { return sig.thisParameter ? getTypeOfSymbol(sig.thisParameter) : anyType; }), 2 /* Subtype */);
-                                    thisParameter = createSymbolWithType(signature.thisParameter, thisType);
+                                    thisParameter = createSymbolWithType(firstThisParameterOfUnionSignatures, thisType);
                                 }
-                                s = cloneSignature(signature);
+                                s = createUnionSignature(signature, unionSignatures);
                                 s.thisParameter = thisParameter;
-                                s.unionSignatures = unionSignatures;
                             }
                             (result || (result = [])).push(s);
                         }
@@ -37445,9 +38139,11 @@ var ts;
             return createSymbolWithType(left, thisType);
         }
         function combineUnionParameters(left, right) {
-            var longest = getParameterCount(left) >= getParameterCount(right) ? left : right;
+            var leftCount = getParameterCount(left);
+            var rightCount = getParameterCount(right);
+            var longest = leftCount >= rightCount ? left : right;
             var shorter = longest === left ? right : left;
-            var longestCount = getParameterCount(longest);
+            var longestCount = longest === left ? leftCount : rightCount;
             var eitherHasEffectiveRest = (hasEffectiveRestParameter(left) || hasEffectiveRestParameter(right));
             var needsExtraRestElement = eitherHasEffectiveRest && !hasEffectiveRestParameter(longest);
             var params = new Array(longestCount + (needsExtraRestElement ? 1 : 0));
@@ -37457,9 +38153,13 @@ var ts;
                 var unionParamType = getIntersectionType([longestParamType, shorterParamType]);
                 var isRestParam = eitherHasEffectiveRest && !needsExtraRestElement && i === (longestCount - 1);
                 var isOptional = i >= getMinArgumentCount(longest) && i >= getMinArgumentCount(shorter);
-                var leftName = getParameterNameAtPosition(left, i);
-                var rightName = getParameterNameAtPosition(right, i);
-                var paramSymbol = createSymbol(1 /* FunctionScopedVariable */ | (isOptional && !isRestParam ? 16777216 /* Optional */ : 0), leftName === rightName ? leftName : "arg" + i);
+                var leftName = i >= leftCount ? undefined : getParameterNameAtPosition(left, i);
+                var rightName = i >= rightCount ? undefined : getParameterNameAtPosition(right, i);
+                var paramName = leftName === rightName ? leftName :
+                    !leftName ? rightName :
+                        !rightName ? leftName :
+                            undefined;
+                var paramSymbol = createSymbol(1 /* FunctionScopedVariable */ | (isOptional && !isRestParam ? 16777216 /* Optional */ : 0), paramName || "arg" + i);
                 paramSymbol.type = isRestParam ? createArrayType(unionParamType) : unionParamType;
                 params[i] = paramSymbol;
             }
@@ -37515,13 +38215,22 @@ var ts;
         function unionSpreadIndexInfos(info1, info2) {
             return info1 && info2 && createIndexInfo(getUnionType([info1.type, info2.type]), info1.isReadonly || info2.isReadonly);
         }
-        function includeMixinType(type, types, index) {
+        function findMixins(types) {
+            var constructorTypeCount = ts.countWhere(types, function (t) { return getSignaturesOfType(t, 1 /* Construct */).length > 0; });
+            var mixinFlags = ts.map(types, isMixinConstructorType);
+            if (constructorTypeCount > 0 && constructorTypeCount === ts.countWhere(mixinFlags, function (b) { return b; })) {
+                var firstMixinIndex = mixinFlags.indexOf(/*searchElement*/ true);
+                mixinFlags[firstMixinIndex] = false;
+            }
+            return mixinFlags;
+        }
+        function includeMixinType(type, types, mixinFlags, index) {
             var mixedTypes = [];
             for (var i = 0; i < types.length; i++) {
                 if (i === index) {
                     mixedTypes.push(type);
                 }
-                else if (isMixinConstructorType(types[i])) {
+                else if (mixinFlags[i]) {
                     mixedTypes.push(getReturnTypeOfSignature(getSignaturesOfType(types[i], 1 /* Construct */)[0]));
                 }
             }
@@ -37530,12 +38239,13 @@ var ts;
         function resolveIntersectionTypeMembers(type) {
             // The members and properties collections are empty for intersection types. To get all properties of an
             // intersection type use getPropertiesOfType (only the language service uses this).
-            var callSignatures = ts.emptyArray;
-            var constructSignatures = ts.emptyArray;
+            var callSignatures;
+            var constructSignatures;
             var stringIndexInfo;
             var numberIndexInfo;
             var types = type.types;
-            var mixinCount = ts.countWhere(types, isMixinConstructorType);
+            var mixinFlags = findMixins(types);
+            var mixinCount = ts.countWhere(mixinFlags, function (b) { return b; });
             var _loop_6 = function (i) {
                 var t = type.types[i];
                 // When an intersection type contains mixin constructor types, the construct signatures from
@@ -37543,25 +38253,37 @@ var ts;
                 // other construct signatures in the intersection type. For example, the intersection type
                 // '{ new(...args: any[]) => A } & { new(s: string) => B }' has a single construct signature
                 // 'new(s: string) => A & B'.
-                if (mixinCount === 0 || mixinCount === types.length && i === 0 || !isMixinConstructorType(t)) {
+                if (!mixinFlags[i]) {
                     var signatures = getSignaturesOfType(t, 1 /* Construct */);
                     if (signatures.length && mixinCount > 0) {
                         signatures = ts.map(signatures, function (s) {
                             var clone = cloneSignature(s);
-                            clone.resolvedReturnType = includeMixinType(getReturnTypeOfSignature(s), types, i);
+                            clone.resolvedReturnType = includeMixinType(getReturnTypeOfSignature(s), types, mixinFlags, i);
                             return clone;
                         });
                     }
-                    constructSignatures = ts.concatenate(constructSignatures, signatures);
+                    constructSignatures = appendSignatures(constructSignatures, signatures);
                 }
-                callSignatures = ts.concatenate(callSignatures, getSignaturesOfType(t, 0 /* Call */));
+                callSignatures = appendSignatures(callSignatures, getSignaturesOfType(t, 0 /* Call */));
                 stringIndexInfo = intersectIndexInfos(stringIndexInfo, getIndexInfoOfType(t, 0 /* String */));
                 numberIndexInfo = intersectIndexInfos(numberIndexInfo, getIndexInfoOfType(t, 1 /* Number */));
             };
             for (var i = 0; i < types.length; i++) {
                 _loop_6(i);
             }
-            setStructuredTypeMembers(type, emptySymbols, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
+            setStructuredTypeMembers(type, emptySymbols, callSignatures || ts.emptyArray, constructSignatures || ts.emptyArray, stringIndexInfo, numberIndexInfo);
+        }
+        function appendSignatures(signatures, newSignatures) {
+            var _loop_7 = function (sig) {
+                if (!signatures || ts.every(signatures, function (s) { return !compareSignaturesIdentical(s, sig, /*partialMatch*/ false, /*ignoreThisTypes*/ false, /*ignoreReturnTypes*/ false, compareTypesIdentical); })) {
+                    signatures = ts.append(signatures, sig);
+                }
+            };
+            for (var _i = 0, newSignatures_1 = newSignatures; _i < newSignatures_1.length; _i++) {
+                var sig = newSignatures_1[_i];
+                _loop_7(sig);
+            }
+            return signatures;
         }
         /**
          * Converts an AnonymousType to a ResolvedType.
@@ -37592,6 +38314,15 @@ var ts;
                 var stringIndexInfo = void 0;
                 if (symbol.exports) {
                     members = getExportsOfSymbol(symbol);
+                    if (symbol === globalThisSymbol) {
+                        var varsOnly_1 = ts.createMap();
+                        members.forEach(function (p) {
+                            if (!(p.flags & 418 /* BlockScoped */)) {
+                                varsOnly_1.set(p.escapedName, p);
+                            }
+                        });
+                        members = varsOnly_1;
+                    }
                 }
                 setStructuredTypeMembers(type, members, ts.emptyArray, ts.emptyArray, undefined, undefined);
                 if (symbol.flags & 32 /* Class */) {
@@ -37605,7 +38336,8 @@ var ts;
                         stringIndexInfo = createIndexInfo(anyType, /*isReadonly*/ false);
                     }
                 }
-                var numberIndexInfo = symbol.flags & 384 /* Enum */ ? enumNumberIndexInfo : undefined;
+                var numberIndexInfo = symbol.flags & 384 /* Enum */ && (getDeclaredTypeOfSymbol(symbol).flags & 32 /* Enum */ ||
+                    ts.some(type.properties, function (prop) { return !!(getTypeOfSymbol(prop).flags & 296 /* NumberLike */); })) ? enumNumberIndexInfo : undefined;
                 setStructuredTypeMembers(type, members, ts.emptyArray, ts.emptyArray, stringIndexInfo, numberIndexInfo);
                 // We resolve the members before computing the signatures because a signature may use
                 // typeof with a qualified name expression that circularly references the type we are
@@ -37635,7 +38367,7 @@ var ts;
             var members = ts.createSymbolTable();
             for (var _i = 0, _a = getPropertiesOfType(type.source); _i < _a.length; _i++) {
                 var prop = _a[_i];
-                var checkFlags = 4096 /* ReverseMapped */ | (readonlyMask && isReadonlySymbol(prop) ? 8 /* Readonly */ : 0);
+                var checkFlags = 8192 /* ReverseMapped */ | (readonlyMask && isReadonlySymbol(prop) ? 8 /* Readonly */ : 0);
                 var inferredProp = createSymbol(4 /* Property */ | prop.flags & optionalMask, prop.escapedName, checkFlags);
                 inferredProp.declarations = prop.declarations;
                 inferredProp.nameType = prop.nameType;
@@ -37657,7 +38389,15 @@ var ts;
                 return getIndexType(getApparentType(type.type));
             }
             if (type.flags & 16777216 /* Conditional */) {
-                return getLowerBoundOfConditionalType(type);
+                if (type.root.isDistributive) {
+                    var checkType = type.checkType;
+                    var constraint = getLowerBoundOfKeyType(checkType);
+                    if (constraint !== checkType) {
+                        var mapper = makeUnaryTypeMapper(type.root.checkType, constraint);
+                        return getConditionalTypeInstantiation(type, combineTypeMappers(mapper, type.mapper));
+                    }
+                }
+                return type;
             }
             if (type.flags & 1048576 /* Union */) {
                 return getUnionType(ts.sameMap(type.types, getLowerBoundOfKeyType));
@@ -37667,16 +38407,6 @@ var ts;
             }
             return neverType;
         }
-        function getLowerBoundOfConditionalType(type) {
-            if (type.root.isDistributive) {
-                var constraint = getLowerBoundOfKeyType(type.checkType);
-                if (constraint !== type.checkType) {
-                    var mapper = makeUnaryTypeMapper(type.root.checkType, constraint);
-                    return getConditionalTypeInstantiation(type, combineTypeMappers(mapper, type.mapper));
-                }
-            }
-            return type;
-        }
         /** Resolve the members of a mapped type { [P in K]: T } */
         function resolveMappedTypeMembers(type) {
             var members = ts.createSymbolTable();
@@ -37741,8 +38471,8 @@ var ts;
                 else if (t.flags & (1 /* Any */ | 4 /* String */)) {
                     stringIndexInfo = createIndexInfo(propType, !!(templateModifiers & 1 /* IncludeReadonly */));
                 }
-                else if (t.flags & 8 /* Number */) {
-                    numberIndexInfo = createIndexInfo(propType, !!(templateModifiers & 1 /* IncludeReadonly */));
+                else if (t.flags & (8 /* Number */ | 32 /* Enum */)) {
+                    numberIndexInfo = createIndexInfo(numberIndexInfo ? getUnionType([numberIndexInfo.type, propType]) : propType, !!(templateModifiers & 1 /* IncludeReadonly */));
                 }
             }
         }
@@ -37765,8 +38495,8 @@ var ts;
         }
         function isMappedTypeWithKeyofConstraintDeclaration(type) {
             var constraintDeclaration = getConstraintDeclarationForMappedType(type); // TODO: GH#18217
-            return constraintDeclaration.kind === 179 /* TypeOperator */ &&
-                constraintDeclaration.operator === 129 /* KeyOfKeyword */;
+            return constraintDeclaration.kind === 180 /* TypeOperator */ &&
+                constraintDeclaration.operator === 130 /* KeyOfKeyword */;
         }
         function getModifiersTypeFromMappedType(type) {
             if (!type.modifiersType) {
@@ -37783,7 +38513,7 @@ var ts;
                     var declaredType = getTypeFromMappedTypeNode(type.declaration);
                     var constraint = getConstraintTypeFromMappedType(declaredType);
                     var extendedConstraint = constraint && constraint.flags & 262144 /* TypeParameter */ ? getConstraintOfTypeParameter(constraint) : constraint;
-                    type.modifiersType = extendedConstraint && extendedConstraint.flags & 4194304 /* Index */ ? instantiateType(extendedConstraint.type, type.mapper || identityMapper) : emptyObjectType;
+                    type.modifiersType = extendedConstraint && extendedConstraint.flags & 4194304 /* Index */ ? instantiateType(extendedConstraint.type, type.mapper || identityMapper) : unknownType;
                 }
             }
             return type.modifiersType;
@@ -37879,6 +38609,26 @@ var ts;
             }
             return type.resolvedProperties;
         }
+        function getPossiblePropertiesOfUnionType(type) {
+            if (type.possiblePropertyCache) {
+                return type.possiblePropertyCache.size ? ts.arrayFrom(type.possiblePropertyCache.values()) : ts.emptyArray;
+            }
+            type.possiblePropertyCache = ts.createSymbolTable();
+            for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
+                var t = _a[_i];
+                for (var _b = 0, _c = getPropertiesOfType(t); _b < _c.length; _b++) {
+                    var p = _c[_b];
+                    if (!type.possiblePropertyCache.has(p.escapedName)) {
+                        var prop = getUnionOrIntersectionProperty(type, p.escapedName);
+                        if (prop) {
+                            type.possiblePropertyCache.set(p.escapedName, prop);
+                        }
+                    }
+                }
+            }
+            // We can't simply use the normal property cache here, since that will contain cached apparent type members :(
+            return type.possiblePropertyCache.size ? ts.arrayFrom(type.possiblePropertyCache.values()) : ts.emptyArray;
+        }
         function getPropertiesOfType(type) {
             type = getApparentType(type);
             return type.flags & 3145728 /* UnionOrIntersection */ ?
@@ -37924,24 +38674,25 @@ var ts;
             return hasNonCircularBaseConstraint(typeParameter) ? getConstraintFromTypeParameter(typeParameter) : undefined;
         }
         function getConstraintOfIndexedAccess(type) {
-            var objectType = getConstraintOfType(type.objectType) || type.objectType;
-            if (objectType !== type.objectType) {
-                var constraint = getIndexedAccessType(objectType, type.indexType, /*accessNode*/ undefined, errorType);
-                if (constraint && constraint !== errorType) {
-                    return constraint;
+            return hasNonCircularBaseConstraint(type) ? getConstraintFromIndexedAccess(type) : undefined;
+        }
+        function getSimplifiedTypeOrConstraint(type) {
+            var simplified = getSimplifiedType(type, /*writing*/ false);
+            return simplified !== type ? simplified : getConstraintOfType(type);
+        }
+        function getConstraintFromIndexedAccess(type) {
+            var indexConstraint = getSimplifiedTypeOrConstraint(type.indexType);
+            if (indexConstraint && indexConstraint !== type.indexType) {
+                var indexedAccess = getIndexedAccessTypeOrUndefined(type.objectType, indexConstraint);
+                if (indexedAccess) {
+                    return indexedAccess;
                 }
             }
-            var baseConstraint = getBaseConstraintOfType(type);
-            return baseConstraint && baseConstraint !== type ? baseConstraint : undefined;
-        }
-        function getDefaultConstraintOfTrueBranchOfConditionalType(root, combinedMapper, mapper) {
-            var rootTrueType = root.trueType;
-            var rootTrueConstraint = !(rootTrueType.flags & 33554432 /* Substitution */)
-                ? rootTrueType
-                : instantiateType((rootTrueType.substitute), combinedMapper || mapper).flags & 3 /* AnyOrUnknown */
-                    ? rootTrueType.typeVariable
-                    : getIntersectionType([rootTrueType.substitute, rootTrueType.typeVariable]);
-            return instantiateType(rootTrueConstraint, combinedMapper || mapper);
+            var objectConstraint = getSimplifiedTypeOrConstraint(type.objectType);
+            if (objectConstraint && objectConstraint !== type.objectType) {
+                return getIndexedAccessTypeOrUndefined(objectConstraint, type.indexType);
+            }
+            return undefined;
         }
         function getDefaultConstraintOfConditionalType(type) {
             if (!type.resolvedDefaultConstraint) {
@@ -37949,7 +38700,7 @@ var ts;
                 // a conditional type with a single branch of type `any` would be assignable to anything, since it's constraint would simplify to
                 // just `any`. This result is _usually_ unwanted - so instead here we elide an `any` branch from the constraint type,
                 // in effect treating `any` like `never` rather than `unknown` in this location.
-                var trueConstraint = getDefaultConstraintOfTrueBranchOfConditionalType(type.root, type.combinedMapper, type.mapper);
+                var trueConstraint = getInferredTrueTypeFromConditionalType(type);
                 var falseConstraint = getFalseTypeFromConditionalType(type);
                 type.resolvedDefaultConstraint = isTypeAny(trueConstraint) ? falseConstraint : isTypeAny(falseConstraint) ? trueConstraint : getUnionType([trueConstraint, falseConstraint]);
             }
@@ -37968,7 +38719,7 @@ var ts;
             // a union - once negated types exist and are applied to the conditional false branch, this "constraint"
             // likely doesn't need to exist.
             if (type.root.isDistributive && type.restrictiveInstantiation !== type) {
-                var simplified = getSimplifiedType(type.checkType);
+                var simplified = getSimplifiedType(type.checkType, /*writing*/ false);
                 var constraint = simplified === type.checkType ? getConstraintOfType(simplified) : simplified;
                 if (constraint && constraint !== type.checkType) {
                     var mapper = makeUnaryTypeMapper(type.root.checkType, constraint);
@@ -37980,9 +38731,12 @@ var ts;
             }
             return undefined;
         }
-        function getConstraintOfConditionalType(type) {
+        function getConstraintFromConditionalType(type) {
             return getConstraintOfDistributiveConditionalType(type) || getDefaultConstraintOfConditionalType(type);
         }
+        function getConstraintOfConditionalType(type) {
+            return hasNonCircularBaseConstraint(type) ? getConstraintFromConditionalType(type) : undefined;
+        }
         function getUnionConstraintOfIntersection(type, targetIsUnion) {
             var constraints;
             var hasDisjointDomainType = false;
@@ -37996,11 +38750,6 @@ var ts;
                         constraint = getConstraintOfType(constraint);
                     }
                     if (constraint) {
-                        // A constraint that isn't a union type implies that the final type would be a non-union
-                        // type as well. Since non-union constraints are of no interest, we can exit here.
-                        if (!(constraint.flags & 1048576 /* Union */)) {
-                            return undefined;
-                        }
                         constraints = ts.append(constraints, constraint);
                     }
                 }
@@ -38009,10 +38758,10 @@ var ts;
                 }
             }
             // If the target is a union type or if we are intersecting with types belonging to one of the
-            // disjoint domans, we may end up producing a constraint that hasn't been examined before.
+            // disjoint domains, we may end up producing a constraint that hasn't been examined before.
             if (constraints && (targetIsUnion || hasDisjointDomainType)) {
                 if (hasDisjointDomainType) {
-                    // We add any types belong to one of the disjoint domans because they might cause the final
+                    // We add any types belong to one of the disjoint domains because they might cause the final
                     // intersection operation to reduce the union constraints.
                     for (var _b = 0, _c = type.types; _b < _c.length; _b++) {
                         var t = _c[_b];
@@ -38056,9 +38805,9 @@ var ts;
                     if (!pushTypeResolution(t, 4 /* ImmediateBaseConstraint */)) {
                         return circularConstraintType;
                     }
-                    if (constraintDepth === 50) {
+                    if (constraintDepth >= 50) {
                         // We have reached 50 recursive invocations of getImmediateBaseConstraint and there is a
-                        // very high likelyhood we're dealing with an infinite generic type that perpetually generates
+                        // very high likelihood we're dealing with an infinite generic type that perpetually generates
                         // new type identities as we descend into it. We stop the recursion here and mark this type
                         // and the outer types as having circular constraints.
                         error(currentNode, ts.Diagnostics.Type_instantiation_is_excessively_deep_and_possibly_infinite);
@@ -38066,7 +38815,7 @@ var ts;
                         return t.immediateBaseConstraint = noConstraintType;
                     }
                     constraintDepth++;
-                    var result = computeBaseConstraint(getSimplifiedType(t));
+                    var result = computeBaseConstraint(getSimplifiedType(t, /*writing*/ false));
                     constraintDepth--;
                     if (!popTypeResolution()) {
                         if (t.flags & 262144 /* TypeParameter */) {
@@ -38074,7 +38823,7 @@ var ts;
                             if (errorNode) {
                                 var diagnostic = error(errorNode, ts.Diagnostics.Type_parameter_0_has_a_circular_constraint, typeToString(t));
                                 if (currentNode && !ts.isNodeDescendantOf(errorNode, currentNode) && !ts.isNodeDescendantOf(currentNode, errorNode)) {
-                                    addRelatedInfo(diagnostic, ts.createDiagnosticForNode(currentNode, ts.Diagnostics.Circularity_originates_in_type_at_this_location));
+                                    ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(currentNode, ts.Diagnostics.Circularity_originates_in_type_at_this_location));
                                 }
                             }
                         }
@@ -38118,12 +38867,15 @@ var ts;
                 if (t.flags & 8388608 /* IndexedAccess */) {
                     var baseObjectType = getBaseConstraint(t.objectType);
                     var baseIndexType = getBaseConstraint(t.indexType);
-                    var baseIndexedAccess = baseObjectType && baseIndexType ? getIndexedAccessType(baseObjectType, baseIndexType, /*accessNode*/ undefined, errorType) : undefined;
-                    return baseIndexedAccess && baseIndexedAccess !== errorType ? getBaseConstraint(baseIndexedAccess) : undefined;
+                    var baseIndexedAccess = baseObjectType && baseIndexType && getIndexedAccessTypeOrUndefined(baseObjectType, baseIndexType);
+                    return baseIndexedAccess && getBaseConstraint(baseIndexedAccess);
                 }
                 if (t.flags & 16777216 /* Conditional */) {
-                    var constraint = getConstraintOfConditionalType(t);
-                    return constraint && getBaseConstraint(constraint);
+                    var constraint = getConstraintFromConditionalType(t);
+                    constraintDepth++; // Penalize repeating conditional types (this captures the recursion within getConstraintFromConditionalType and carries it forward)
+                    var result = constraint && getBaseConstraint(constraint);
+                    constraintDepth--;
+                    return result;
                 }
                 if (t.flags & 33554432 /* Substitution */) {
                     return getBaseConstraint(t.substitute);
@@ -38197,25 +38949,26 @@ var ts;
          * type itself. Note that the apparent type of a union type is the union type itself.
          */
         function getApparentType(type) {
-            var t = type.flags & 63176704 /* Instantiable */ ? getBaseConstraintOfType(type) || emptyObjectType : type;
+            var t = type.flags & 63176704 /* Instantiable */ ? getBaseConstraintOfType(type) || unknownType : type;
             return ts.getObjectFlags(t) & 32 /* Mapped */ ? getApparentTypeOfMappedType(t) :
                 t.flags & 2097152 /* Intersection */ ? getApparentTypeOfIntersectionType(t) :
                     t.flags & 132 /* StringLike */ ? globalStringType :
                         t.flags & 296 /* NumberLike */ ? globalNumberType :
-                            t.flags & 2112 /* BigIntLike */ ? getGlobalBigIntType(/*reportErrors*/ languageVersion >= 7 /* ESNext */) :
+                            t.flags & 2112 /* BigIntLike */ ? getGlobalBigIntType(/*reportErrors*/ languageVersion >= 99 /* ESNext */) :
                                 t.flags & 528 /* BooleanLike */ ? globalBooleanType :
                                     t.flags & 12288 /* ESSymbolLike */ ? getGlobalESSymbolType(/*reportErrors*/ languageVersion >= 2 /* ES2015 */) :
                                         t.flags & 67108864 /* NonPrimitive */ ? emptyObjectType :
                                             t.flags & 4194304 /* Index */ ? keyofConstraintType :
-                                                t;
+                                                t.flags & 2 /* Unknown */ && !strictNullChecks ? emptyObjectType :
+                                                    t;
         }
         function createUnionOrIntersectionProperty(containingType, name) {
-            var props;
+            var propSet = ts.createMap();
             var indexTypes;
             var isUnion = containingType.flags & 1048576 /* Union */;
             var excludeModifiers = isUnion ? 24 /* NonPublicAccessibilityModifier */ : 0;
             // Flags we want to propagate to the result if they exist in all source symbols
-            var commonFlags = isUnion ? 0 /* None */ : 16777216 /* Optional */;
+            var optionalFlag = isUnion ? 0 /* None */ : 16777216 /* Optional */;
             var syntheticFlag = 4 /* SyntheticMethod */;
             var checkFlags = 0;
             for (var _i = 0, _a = containingType.types; _i < _a.length; _i++) {
@@ -38225,13 +38978,21 @@ var ts;
                     var prop = getPropertyOfType(type, name);
                     var modifiers = prop ? ts.getDeclarationModifierFlagsFromSymbol(prop) : 0;
                     if (prop && !(modifiers & excludeModifiers)) {
-                        commonFlags &= prop.flags;
-                        props = ts.appendIfUnique(props, prop);
+                        if (isUnion) {
+                            optionalFlag |= (prop.flags & 16777216 /* Optional */);
+                        }
+                        else {
+                            optionalFlag &= prop.flags;
+                        }
+                        var id = "" + getSymbolId(prop);
+                        if (!propSet.has(id)) {
+                            propSet.set(id, prop);
+                        }
                         checkFlags |= (isReadonlySymbol(prop) ? 8 /* Readonly */ : 0) |
-                            (!(modifiers & 24 /* NonPublicAccessibilityModifier */) ? 128 /* ContainsPublic */ : 0) |
-                            (modifiers & 16 /* Protected */ ? 256 /* ContainsProtected */ : 0) |
-                            (modifiers & 8 /* Private */ ? 512 /* ContainsPrivate */ : 0) |
-                            (modifiers & 32 /* Static */ ? 1024 /* ContainsStatic */ : 0);
+                            (!(modifiers & 24 /* NonPublicAccessibilityModifier */) ? 256 /* ContainsPublic */ : 0) |
+                            (modifiers & 16 /* Protected */ ? 512 /* ContainsProtected */ : 0) |
+                            (modifiers & 8 /* Private */ ? 1024 /* ContainsPrivate */ : 0) |
+                            (modifiers & 32 /* Static */ ? 2048 /* ContainsStatic */ : 0);
                         if (!isPrototypeProperty(prop)) {
                             syntheticFlag = 2 /* SyntheticProperty */;
                         }
@@ -38239,19 +39000,24 @@ var ts;
                     else if (isUnion) {
                         var indexInfo = !isLateBoundName(name) && (isNumericLiteralName(name) && getIndexInfoOfType(type, 1 /* Number */) || getIndexInfoOfType(type, 0 /* String */));
                         if (indexInfo) {
-                            checkFlags |= indexInfo.isReadonly ? 8 /* Readonly */ : 0;
+                            checkFlags |= 32 /* WritePartial */ | (indexInfo.isReadonly ? 8 /* Readonly */ : 0);
                             indexTypes = ts.append(indexTypes, isTupleType(type) ? getRestTypeOfTupleType(type) || undefinedType : indexInfo.type);
                         }
+                        else if (isObjectLiteralType(type)) {
+                            checkFlags |= 32 /* WritePartial */;
+                            indexTypes = ts.append(indexTypes, undefinedType);
+                        }
                         else {
-                            checkFlags |= 16 /* Partial */;
+                            checkFlags |= 16 /* ReadPartial */;
                         }
                     }
                 }
             }
-            if (!props) {
+            if (!propSet.size) {
                 return undefined;
             }
-            if (props.length === 1 && !(checkFlags & 16 /* Partial */) && !indexTypes) {
+            var props = ts.arrayFrom(propSet.values());
+            if (props.length === 1 && !(checkFlags & 16 /* ReadPartial */) && !indexTypes) {
                 return props[0];
             }
             var declarations;
@@ -38275,15 +39041,15 @@ var ts;
                     nameType = prop.nameType;
                 }
                 else if (type !== firstType) {
-                    checkFlags |= 32 /* HasNonUniformType */;
+                    checkFlags |= 64 /* HasNonUniformType */;
                 }
                 if (isLiteralType(type)) {
-                    checkFlags |= 64 /* HasLiteralType */;
+                    checkFlags |= 128 /* HasLiteralType */;
                 }
                 propTypes.push(type);
             }
             ts.addRange(propTypes, indexTypes);
-            var result = createSymbol(4 /* Property */ | commonFlags, name, syntheticFlag | checkFlags);
+            var result = createSymbol(4 /* Property */ | optionalFlag, name, syntheticFlag | checkFlags);
             result.containingType = containingType;
             if (!hasNonUniformValueDeclaration && firstValueDeclaration) {
                 result.valueDeclaration = firstValueDeclaration;
@@ -38294,7 +39060,15 @@ var ts;
             }
             result.declarations = declarations;
             result.nameType = nameType;
-            result.type = isUnion ? getUnionType(propTypes) : getIntersectionType(propTypes);
+            if (propTypes.length > 2) {
+                // When `propTypes` has the potential to explode in size when normalized, defer normalization until absolutely needed
+                result.checkFlags |= 65536 /* DeferredType */;
+                result.deferralParent = containingType;
+                result.deferralConstituents = propTypes;
+            }
+            else {
+                result.type = isUnion ? getUnionType(propTypes) : getIntersectionType(propTypes);
+            }
             return result;
         }
         // Return the symbol for a given property in a union or intersection type, or undefined if the property
@@ -38316,7 +39090,7 @@ var ts;
         function getPropertyOfUnionOrIntersectionType(type, name) {
             var property = getUnionOrIntersectionProperty(type, name);
             // We need to filter out partial properties in union types
-            return property && !(ts.getCheckFlags(property) & 16 /* Partial */) ? property : undefined;
+            return property && !(ts.getCheckFlags(property) & 16 /* ReadPartial */) ? property : undefined;
         }
         /**
          * Return the symbol for the property with the given name in the given type. Creates synthetic union properties when
@@ -38394,6 +39168,9 @@ var ts;
                         propTypes.push(getTypeOfSymbol(prop));
                     }
                 }
+                if (kind === 0 /* String */) {
+                    ts.append(propTypes, getIndexTypeOfType(type, 1 /* Number */));
+                }
                 if (propTypes.length) {
                     return getUnionType(propTypes, 2 /* Subtype */);
                 }
@@ -38422,10 +39199,10 @@ var ts;
         function isJSDocOptionalParameter(node) {
             return ts.isInJSFile(node) && (
             // node.type should only be a JSDocOptionalType when node is a parameter of a JSDocFunctionType
-            node.type && node.type.kind === 293 /* JSDocOptionalType */
+            node.type && node.type.kind === 294 /* JSDocOptionalType */
                 || ts.getJSDocParameterTags(node).some(function (_a) {
                     var isBracketed = _a.isBracketed, typeExpression = _a.typeExpression;
-                    return isBracketed || !!typeExpression && typeExpression.type.kind === 293 /* JSDocOptionalType */;
+                    return isBracketed || !!typeExpression && typeExpression.type.kind === 294 /* JSDocOptionalType */;
                 }));
         }
         function tryFindAmbientModule(moduleName, withAugmentations) {
@@ -38459,7 +39236,7 @@ var ts;
                 return false;
             }
             var isBracketed = node.isBracketed, typeExpression = node.typeExpression;
-            return isBracketed || !!typeExpression && typeExpression.type.kind === 293 /* JSDocOptionalType */;
+            return isBracketed || !!typeExpression && typeExpression.type.kind === 294 /* JSDocOptionalType */;
         }
         function createIdentifierTypePredicate(parameterName, parameterIndex, type) {
             return { kind: 1 /* Identifier */, parameterName: parameterName, parameterIndex: parameterIndex, type: type };
@@ -38497,7 +39274,7 @@ var ts;
                 var baseDefaultType = getDefaultTypeArgumentType(isJavaScriptImplicitAny);
                 for (var i = numTypeArguments; i < numTypeParameters; i++) {
                     var defaultType = getDefaultFromTypeParameter(typeParameters[i]);
-                    if (isJavaScriptImplicitAny && defaultType && isTypeIdenticalTo(defaultType, emptyObjectType)) {
+                    if (isJavaScriptImplicitAny && defaultType && (isTypeIdenticalTo(defaultType, unknownType) || isTypeIdenticalTo(defaultType, emptyObjectType))) {
                         defaultType = anyType;
                     }
                     result[i] = defaultType ? instantiateType(defaultType, createTypeMapper(typeParameters, result)) : baseDefaultType;
@@ -38541,7 +39318,7 @@ var ts;
                     else {
                         parameters.push(paramSymbol);
                     }
-                    if (type && type.kind === 182 /* LiteralType */) {
+                    if (type && type.kind === 183 /* LiteralType */) {
                         hasLiteralTypes = true;
                     }
                     // Record a new minimum argument count if this is not an optional parameter
@@ -38555,16 +39332,16 @@ var ts;
                     }
                 }
                 // If only one accessor includes a this-type annotation, the other behaves as if it had the same type annotation
-                if ((declaration.kind === 158 /* GetAccessor */ || declaration.kind === 159 /* SetAccessor */) &&
+                if ((declaration.kind === 159 /* GetAccessor */ || declaration.kind === 160 /* SetAccessor */) &&
                     !hasNonBindableDynamicName(declaration) &&
                     (!hasThisParameter || !thisParameter)) {
-                    var otherKind = declaration.kind === 158 /* GetAccessor */ ? 159 /* SetAccessor */ : 158 /* GetAccessor */;
+                    var otherKind = declaration.kind === 159 /* GetAccessor */ ? 160 /* SetAccessor */ : 159 /* GetAccessor */;
                     var other = ts.getDeclarationOfKind(getSymbolOfNode(declaration), otherKind);
                     if (other) {
                         thisParameter = getAnnotatedAccessorThisParameter(other);
                     }
                 }
-                var classType = declaration.kind === 157 /* Constructor */ ?
+                var classType = declaration.kind === 158 /* Constructor */ ?
                     getDeclaredTypeOfClassOrInterface(getMergedSymbol(declaration.parent.symbol))
                     : undefined;
                 var typeParameters = classType ? classType.localTypeParameters : getTypeParametersFromDeclaration(declaration);
@@ -38589,7 +39366,7 @@ var ts;
             var lastParamVariadicType = ts.firstDefined(lastParamTags, function (p) {
                 return p.typeExpression && ts.isJSDocVariadicType(p.typeExpression.type) ? p.typeExpression.type : undefined;
             });
-            var syntheticArgsSymbol = createSymbol(3 /* Variable */, "args", 16384 /* RestParameter */);
+            var syntheticArgsSymbol = createSymbol(3 /* Variable */, "args", 32768 /* RestParameter */);
             syntheticArgsSymbol.type = lastParamVariadicType ? createArrayType(getTypeFromTypeNode(lastParamVariadicType.type)) : anyArrayType;
             if (lastParamVariadicType) {
                 // Replace the last parameter with a rest parameter.
@@ -38622,13 +39399,13 @@ var ts;
                 if (!node)
                     return false;
                 switch (node.kind) {
-                    case 72 /* Identifier */:
+                    case 73 /* Identifier */:
                         return node.escapedText === "arguments" && ts.isExpressionNode(node);
-                    case 154 /* PropertyDeclaration */:
-                    case 156 /* MethodDeclaration */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
-                        return node.name.kind === 149 /* ComputedPropertyName */
+                    case 155 /* PropertyDeclaration */:
+                    case 157 /* MethodDeclaration */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
+                        return node.name.kind === 150 /* ComputedPropertyName */
                             && traverse(node.name);
                     default:
                         return !ts.nodeStartsNewLexicalEnvironment(node) && !ts.isPartOfTypeNode(node) && !!ts.forEachChild(node, traverse);
@@ -38693,32 +39470,23 @@ var ts;
                         }
                     }
                     signature.resolvedTypePredicate = type && ts.isTypePredicateNode(type) ?
-                        createTypePredicateFromTypePredicateNode(type, signature.declaration) :
+                        createTypePredicateFromTypePredicateNode(type, signature) :
                         jsdocPredicate || noTypePredicate;
                 }
                 ts.Debug.assert(!!signature.resolvedTypePredicate);
             }
             return signature.resolvedTypePredicate === noTypePredicate ? undefined : signature.resolvedTypePredicate;
         }
-        function createTypePredicateFromTypePredicateNode(node, func) {
+        function createTypePredicateFromTypePredicateNode(node, signature) {
             var parameterName = node.parameterName;
             var type = getTypeFromTypeNode(node.type);
-            if (parameterName.kind === 72 /* Identifier */) {
-                return createIdentifierTypePredicate(parameterName.escapedText, getTypePredicateParameterIndex(func.parameters, parameterName), type);
+            if (parameterName.kind === 73 /* Identifier */) {
+                return createIdentifierTypePredicate(parameterName.escapedText, ts.findIndex(signature.parameters, function (p) { return p.escapedName === parameterName.escapedText; }), type);
             }
             else {
                 return createThisTypePredicate(type);
             }
         }
-        function getTypePredicateParameterIndex(parameterList, parameter) {
-            for (var i = 0; i < parameterList.length; i++) {
-                var param = parameterList[i];
-                if (param.name.kind === 72 /* Identifier */ && param.name.escapedText === parameter.escapedText) {
-                    return i;
-                }
-            }
-            return -1;
-        }
         function getReturnTypeOfSignature(signature) {
             if (!signature.resolvedReturnType) {
                 if (!pushTypeResolution(signature, 3 /* ResolvedReturnType */)) {
@@ -38753,7 +39521,7 @@ var ts;
             return signature.resolvedReturnType;
         }
         function getReturnTypeFromAnnotation(declaration) {
-            if (declaration.kind === 157 /* Constructor */) {
+            if (declaration.kind === 158 /* Constructor */) {
                 return getDeclaredTypeOfClassOrInterface(getMergedSymbol(declaration.parent.symbol));
             }
             if (ts.isJSDocConstructSignature(declaration)) {
@@ -38763,12 +39531,12 @@ var ts;
             if (typeNode) {
                 return getTypeFromTypeNode(typeNode);
             }
-            if (declaration.kind === 158 /* GetAccessor */ && !hasNonBindableDynamicName(declaration)) {
+            if (declaration.kind === 159 /* GetAccessor */ && !hasNonBindableDynamicName(declaration)) {
                 var jsDocType = ts.isInJSFile(declaration) && getTypeForDeclarationFromJSDocComment(declaration);
                 if (jsDocType) {
                     return jsDocType;
                 }
-                var setter = ts.getDeclarationOfKind(getSymbolOfNode(declaration), 159 /* SetAccessor */);
+                var setter = ts.getDeclarationOfKind(getSymbolOfNode(declaration), 160 /* SetAccessor */);
                 var setterType = getAnnotatedAccessorType(setter);
                 if (setterType) {
                     return setterType;
@@ -38793,12 +39561,10 @@ var ts;
         function getSignatureInstantiation(signature, typeArguments, isJavascript, inferredTypeParameters) {
             var instantiatedSignature = getSignatureInstantiationWithoutFillingInTypeArguments(signature, fillMissingTypeArguments(typeArguments, signature.typeParameters, getMinTypeArgumentCount(signature.typeParameters), isJavascript));
             if (inferredTypeParameters) {
-                var returnSignature = getSingleCallSignature(getReturnTypeOfSignature(instantiatedSignature));
+                var returnSignature = getSingleCallOrConstructSignature(getReturnTypeOfSignature(instantiatedSignature));
                 if (returnSignature) {
                     var newReturnSignature = cloneSignature(returnSignature);
                     newReturnSignature.typeParameters = inferredTypeParameters;
-                    newReturnSignature.target = returnSignature.target;
-                    newReturnSignature.mapper = returnSignature.mapper;
                     var newInstantiatedSignature = cloneSignature(instantiatedSignature);
                     newInstantiatedSignature.resolvedReturnType = getOrCreateTypeFromSignature(newReturnSignature);
                     return newInstantiatedSignature;
@@ -38848,7 +39614,7 @@ var ts;
             var typeParameters = signature.typeParameters;
             if (typeParameters) {
                 var typeEraser_1 = createTypeEraser(typeParameters);
-                var baseConstraints = ts.map(typeParameters, function (tp) { return instantiateType(getBaseConstraintOfType(tp), typeEraser_1) || emptyObjectType; });
+                var baseConstraints = ts.map(typeParameters, function (tp) { return instantiateType(getBaseConstraintOfType(tp), typeEraser_1) || unknownType; });
                 return instantiateSignature(signature, createTypeMapper(typeParameters, baseConstraints), /*eraseTypeParameters*/ true);
             }
             return signature;
@@ -38859,7 +39625,8 @@ var ts;
             // object type literal or interface (using the new keyword). Each way of declaring a constructor
             // will result in a different declaration kind.
             if (!signature.isolatedSignatureType) {
-                var isConstructor = signature.declaration.kind === 157 /* Constructor */ || signature.declaration.kind === 161 /* ConstructSignature */; // TODO: GH#18217
+                var kind = signature.declaration ? signature.declaration.kind : 0 /* Unknown */;
+                var isConstructor = kind === 158 /* Constructor */ || kind === 162 /* ConstructSignature */ || kind === 167 /* ConstructorType */;
                 var type = createObjectType(16 /* Anonymous */);
                 type.members = emptySymbols;
                 type.properties = ts.emptyArray;
@@ -38873,7 +39640,7 @@ var ts;
             return symbol.members.get("__index" /* Index */);
         }
         function getIndexDeclarationOfSymbol(symbol, kind) {
-            var syntaxKind = kind === 1 /* Number */ ? 135 /* NumberKeyword */ : 138 /* StringKeyword */;
+            var syntaxKind = kind === 1 /* Number */ ? 136 /* NumberKeyword */ : 139 /* StringKeyword */;
             var indexSymbol = getIndexSymbol(symbol);
             if (indexSymbol) {
                 for (var _i = 0, _a = indexSymbol.declarations; _i < _a.length; _i++) {
@@ -38900,7 +39667,7 @@ var ts;
             return undefined;
         }
         function getConstraintDeclaration(type) {
-            var decl = type.symbol && ts.getDeclarationOfKind(type.symbol, 150 /* TypeParameter */);
+            var decl = type.symbol && ts.getDeclarationOfKind(type.symbol, 151 /* TypeParameter */);
             return decl && ts.getEffectiveConstraintOfTypeParameter(decl);
         }
         function getInferredTypeParameterConstraint(typeParameter) {
@@ -38908,13 +39675,13 @@ var ts;
             if (typeParameter.symbol) {
                 for (var _i = 0, _a = typeParameter.symbol.declarations; _i < _a.length; _i++) {
                     var declaration = _a[_i];
-                    if (declaration.parent.kind === 176 /* InferType */) {
+                    if (declaration.parent.kind === 177 /* InferType */) {
                         // When an 'infer T' declaration is immediately contained in a type reference node
                         // (such as 'Foo<infer T>'), T's constraint is inferred from the constraint of the
                         // corresponding type parameter in 'Foo'. When multiple 'infer T' declarations are
                         // present, we form an intersection of the inferred constraint types.
                         var grandParent = declaration.parent.parent;
-                        if (grandParent.kind === 164 /* TypeReference */) {
+                        if (grandParent.kind === 165 /* TypeReference */) {
                             var typeReference = grandParent;
                             var typeParameters = getTypeParametersForTypeReference(typeReference);
                             if (typeParameters) {
@@ -38939,7 +39706,7 @@ var ts;
                         }
                         // When an 'infer T' declaration is immediately contained in a rest parameter
                         // declaration, we infer an 'unknown[]' constraint.
-                        else if (grandParent.kind === 151 /* Parameter */ && grandParent.dotDotDotToken) {
+                        else if (grandParent.kind === 152 /* Parameter */ && grandParent.dotDotDotToken) {
                             inferences = ts.append(inferences, createArrayType(unknownType));
                         }
                     }
@@ -38963,7 +39730,7 @@ var ts;
             return typeParameter.constraint === noConstraintType ? undefined : typeParameter.constraint;
         }
         function getParentSymbolOfTypeParameter(typeParameter) {
-            var tp = ts.getDeclarationOfKind(typeParameter.symbol, 150 /* TypeParameter */);
+            var tp = ts.getDeclarationOfKind(typeParameter.symbol, 151 /* TypeParameter */);
             var host = ts.isJSDocTemplateTag(tp.parent) ? ts.getHostSignatureFromJSDoc(tp.parent) : tp.parent;
             return host && getSymbolOfNode(host);
         }
@@ -39002,7 +39769,7 @@ var ts;
                     result |= ts.getObjectFlags(type);
                 }
             }
-            return result & 917504 /* PropagatingFlags */;
+            return result & 1835008 /* PropagatingFlags */;
         }
         function createTypeReference(target, typeArguments) {
             var id = getTypeListId(typeArguments);
@@ -39096,9 +39863,9 @@ var ts;
         }
         function getTypeReferenceName(node) {
             switch (node.kind) {
-                case 164 /* TypeReference */:
+                case 165 /* TypeReference */:
                     return node.typeName;
-                case 211 /* ExpressionWithTypeArguments */:
+                case 212 /* ExpressionWithTypeArguments */:
                     // We only support expressions that are simple qualified names. For other
                     // expressions this produces undefined.
                     var expr = node.expression;
@@ -39197,13 +39964,22 @@ var ts;
             }
         }
         function getSubstitutionType(typeVariable, substitute) {
+            if (substitute.flags & 3 /* AnyOrUnknown */ || substitute === typeVariable) {
+                return typeVariable;
+            }
+            var id = getTypeId(typeVariable) + ">" + getTypeId(substitute);
+            var cached = substitutionTypes.get(id);
+            if (cached) {
+                return cached;
+            }
             var result = createType(33554432 /* Substitution */);
             result.typeVariable = typeVariable;
             result.substitute = substitute;
+            substitutionTypes.set(id, result);
             return result;
         }
         function isUnaryTupleTypeNode(node) {
-            return node.kind === 170 /* TupleType */ && node.elementTypes.length === 1;
+            return node.kind === 171 /* TupleType */ && node.elementTypes.length === 1;
         }
         function getImpliedConstraint(typeVariable, checkNode, extendsNode) {
             return isUnaryTupleTypeNode(checkNode) && isUnaryTupleTypeNode(extendsNode) ? getImpliedConstraint(typeVariable, checkNode.elementTypes[0], extendsNode.elementTypes[0]) :
@@ -39212,9 +39988,9 @@ var ts;
         }
         function getConstrainedTypeVariable(typeVariable, node) {
             var constraints;
-            while (node && !ts.isStatement(node) && node.kind !== 296 /* JSDocComment */) {
+            while (node && !ts.isStatement(node) && node.kind !== 297 /* JSDocComment */) {
                 var parent = node.parent;
-                if (parent.kind === 175 /* ConditionalType */ && node === parent.trueType) {
+                if (parent.kind === 176 /* ConditionalType */ && node === parent.trueType) {
                     var constraint = getImpliedConstraint(typeVariable, parent.checkType, parent.extendsType);
                     if (constraint) {
                         constraints = ts.append(constraints, constraint);
@@ -39225,7 +40001,7 @@ var ts;
             return constraints ? getSubstitutionType(typeVariable, getIntersectionType(ts.append(constraints, typeVariable))) : typeVariable;
         }
         function isJSDocTypeReference(node) {
-            return !!(node.flags & 2097152 /* JSDoc */) && (node.kind === 164 /* TypeReference */ || node.kind === 183 /* ImportType */);
+            return !!(node.flags & 2097152 /* JSDoc */) && (node.kind === 165 /* TypeReference */ || node.kind === 184 /* ImportType */);
         }
         function checkNoTypeArguments(node, symbol) {
             if (node.typeArguments) {
@@ -39326,9 +40102,9 @@ var ts;
                 for (var _i = 0, declarations_3 = declarations; _i < declarations_3.length; _i++) {
                     var declaration = declarations_3[_i];
                     switch (declaration.kind) {
-                        case 240 /* ClassDeclaration */:
-                        case 241 /* InterfaceDeclaration */:
-                        case 243 /* EnumDeclaration */:
+                        case 241 /* ClassDeclaration */:
+                        case 242 /* InterfaceDeclaration */:
+                        case 244 /* EnumDeclaration */:
                             return declaration;
                     }
                 }
@@ -39392,20 +40168,32 @@ var ts;
             return deferredGlobalAsyncIterableType || (deferredGlobalAsyncIterableType = getGlobalType("AsyncIterable", /*arity*/ 1, reportErrors)) || emptyGenericType;
         }
         function getGlobalAsyncIteratorType(reportErrors) {
-            return deferredGlobalAsyncIteratorType || (deferredGlobalAsyncIteratorType = getGlobalType("AsyncIterator", /*arity*/ 1, reportErrors)) || emptyGenericType;
+            return deferredGlobalAsyncIteratorType || (deferredGlobalAsyncIteratorType = getGlobalType("AsyncIterator", /*arity*/ 3, reportErrors)) || emptyGenericType;
         }
         function getGlobalAsyncIterableIteratorType(reportErrors) {
             return deferredGlobalAsyncIterableIteratorType || (deferredGlobalAsyncIterableIteratorType = getGlobalType("AsyncIterableIterator", /*arity*/ 1, reportErrors)) || emptyGenericType;
         }
+        function getGlobalAsyncGeneratorType(reportErrors) {
+            return deferredGlobalAsyncGeneratorType || (deferredGlobalAsyncGeneratorType = getGlobalType("AsyncGenerator", /*arity*/ 3, reportErrors)) || emptyGenericType;
+        }
         function getGlobalIterableType(reportErrors) {
             return deferredGlobalIterableType || (deferredGlobalIterableType = getGlobalType("Iterable", /*arity*/ 1, reportErrors)) || emptyGenericType;
         }
         function getGlobalIteratorType(reportErrors) {
-            return deferredGlobalIteratorType || (deferredGlobalIteratorType = getGlobalType("Iterator", /*arity*/ 1, reportErrors)) || emptyGenericType;
+            return deferredGlobalIteratorType || (deferredGlobalIteratorType = getGlobalType("Iterator", /*arity*/ 3, reportErrors)) || emptyGenericType;
         }
         function getGlobalIterableIteratorType(reportErrors) {
             return deferredGlobalIterableIteratorType || (deferredGlobalIterableIteratorType = getGlobalType("IterableIterator", /*arity*/ 1, reportErrors)) || emptyGenericType;
         }
+        function getGlobalGeneratorType(reportErrors) {
+            return deferredGlobalGeneratorType || (deferredGlobalGeneratorType = getGlobalType("Generator", /*arity*/ 3, reportErrors)) || emptyGenericType;
+        }
+        function getGlobalIteratorYieldResultType(reportErrors) {
+            return deferredGlobalIteratorYieldResultType || (deferredGlobalIteratorYieldResultType = getGlobalType("IteratorYieldResult", /*arity*/ 1, reportErrors)) || emptyGenericType;
+        }
+        function getGlobalIteratorReturnResultType(reportErrors) {
+            return deferredGlobalIteratorReturnResultType || (deferredGlobalIteratorReturnResultType = getGlobalType("IteratorReturnResult", /*arity*/ 1, reportErrors)) || emptyGenericType;
+        }
         function getGlobalTypeOrUndefined(name, arity) {
             if (arity === void 0) { arity = 0; }
             var symbol = getGlobalSymbol(name, 67897832 /* Type */, /*diagnostic*/ undefined);
@@ -39414,11 +40202,8 @@ var ts;
         function getGlobalExtractSymbol() {
             return deferredGlobalExtractSymbol || (deferredGlobalExtractSymbol = getGlobalSymbol("Extract", 524288 /* TypeAlias */, ts.Diagnostics.Cannot_find_global_type_0)); // TODO: GH#18217
         }
-        function getGlobalExcludeSymbol() {
-            return deferredGlobalExcludeSymbol || (deferredGlobalExcludeSymbol = getGlobalSymbol("Exclude", 524288 /* TypeAlias */, ts.Diagnostics.Cannot_find_global_type_0)); // TODO: GH#18217
-        }
-        function getGlobalPickSymbol() {
-            return deferredGlobalPickSymbol || (deferredGlobalPickSymbol = getGlobalSymbol("Pick", 524288 /* TypeAlias */, ts.Diagnostics.Cannot_find_global_type_0)); // TODO: GH#18217
+        function getGlobalOmitSymbol() {
+            return deferredGlobalOmitSymbol || (deferredGlobalOmitSymbol = getGlobalSymbol("Omit", 524288 /* TypeAlias */, ts.Diagnostics.Cannot_find_global_type_0)); // TODO: GH#18217
         }
         function getGlobalBigIntType(reportErrors) {
             return deferredGlobalBigIntType || (deferredGlobalBigIntType = getGlobalType("BigInt", /*arity*/ 0, reportErrors)) || emptyObjectType;
@@ -39432,18 +40217,9 @@ var ts;
         function createTypedPropertyDescriptorType(propertyType) {
             return createTypeFromGenericGlobalType(getGlobalTypedPropertyDescriptorType(), [propertyType]);
         }
-        function createAsyncIterableType(iteratedType) {
-            return createTypeFromGenericGlobalType(getGlobalAsyncIterableType(/*reportErrors*/ true), [iteratedType]);
-        }
-        function createAsyncIterableIteratorType(iteratedType) {
-            return createTypeFromGenericGlobalType(getGlobalAsyncIterableIteratorType(/*reportErrors*/ true), [iteratedType]);
-        }
         function createIterableType(iteratedType) {
             return createTypeFromGenericGlobalType(getGlobalIterableType(/*reportErrors*/ true), [iteratedType]);
         }
-        function createIterableIteratorType(iteratedType) {
-            return createTypeFromGenericGlobalType(getGlobalIterableIteratorType(/*reportErrors*/ true), [iteratedType]);
-        }
         function createArrayType(elementType, readonly) {
             return createTypeFromGenericGlobalType(readonly ? globalReadonlyArrayType : globalArrayType, [elementType]);
         }
@@ -39455,7 +40231,7 @@ var ts;
             return links.resolvedType;
         }
         function isReadonlyTypeOperator(node) {
-            return ts.isTypeOperatorNode(node) && node.operator === 133 /* ReadonlyKeyword */;
+            return ts.isTypeOperatorNode(node) && node.operator === 134 /* ReadonlyKeyword */;
         }
         // We represent tuple types as type references to synthesized generic interface types created by
         // this function. The types are of the form:
@@ -39530,8 +40306,8 @@ var ts;
             var links = getNodeLinks(node);
             if (!links.resolvedType) {
                 var lastElement = ts.lastOrUndefined(node.elementTypes);
-                var restElement_1 = lastElement && lastElement.kind === 172 /* RestType */ ? lastElement : undefined;
-                var minLength = ts.findLastIndex(node.elementTypes, function (n) { return n.kind !== 171 /* OptionalType */ && n !== restElement_1; }) + 1;
+                var restElement_1 = lastElement && lastElement.kind === 173 /* RestType */ ? lastElement : undefined;
+                var minLength = ts.findLastIndex(node.elementTypes, function (n) { return n.kind !== 172 /* OptionalType */ && n !== restElement_1; }) + 1;
                 var elementTypes = ts.map(node.elementTypes, function (n) {
                     var type = getTypeFromTypeNode(n);
                     return n === restElement_1 && getIndexTypeOfType(type, 1 /* Number */) || type;
@@ -39566,51 +40342,20 @@ var ts;
             }
             return false;
         }
-        // Return true if the given intersection type contains
-        // more than one unit type or,
-        // an object type and a nullable type (null or undefined), or
-        // a string-like type and a type known to be non-string-like, or
-        // a number-like type and a type known to be non-number-like, or
-        // a symbol-like type and a type known to be non-symbol-like, or
-        // a void-like type and a type known to be non-void-like, or
-        // a non-primitive type and a type known to be primitive.
-        function isEmptyIntersectionType(type) {
-            var combined = 0;
-            for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
-                var t = _a[_i];
-                if (t.flags & 109440 /* Unit */ && combined & 109440 /* Unit */) {
-                    return true;
-                }
-                combined |= t.flags;
-                if (combined & 98304 /* Nullable */ && combined & (524288 /* Object */ | 67108864 /* NonPrimitive */) ||
-                    combined & 67108864 /* NonPrimitive */ && combined & (67238908 /* DisjointDomains */ & ~67108864 /* NonPrimitive */) ||
-                    combined & 132 /* StringLike */ && combined & (67238908 /* DisjointDomains */ & ~132 /* StringLike */) ||
-                    combined & 296 /* NumberLike */ && combined & (67238908 /* DisjointDomains */ & ~296 /* NumberLike */) ||
-                    combined & 2112 /* BigIntLike */ && combined & (67238908 /* DisjointDomains */ & ~2112 /* BigIntLike */) ||
-                    combined & 12288 /* ESSymbolLike */ && combined & (67238908 /* DisjointDomains */ & ~12288 /* ESSymbolLike */) ||
-                    combined & 49152 /* VoidLike */ && combined & (67238908 /* DisjointDomains */ & ~49152 /* VoidLike */)) {
-                    return true;
-                }
-            }
-            return false;
-        }
         function addTypeToUnion(typeSet, includes, type) {
             var flags = type.flags;
             if (flags & 1048576 /* Union */) {
                 return addTypesToUnion(typeSet, includes, type.types);
             }
-            // We ignore 'never' types in unions. Likewise, we ignore intersections of unit types as they are
-            // another form of 'never' (in that they have an empty value domain). We could in theory turn
-            // intersections of unit types into 'never' upon construction, but deferring the reduction makes it
-            // easier to reason about their origin.
-            if (!(flags & 131072 /* Never */ || flags & 2097152 /* Intersection */ && isEmptyIntersectionType(type))) {
-                includes |= flags & 1835007 /* IncludesMask */;
+            // We ignore 'never' types in unions
+            if (!(flags & 131072 /* Never */)) {
+                includes |= flags & 68943871 /* IncludesMask */;
                 if (flags & 66846720 /* StructuredOrInstantiable */)
                     includes |= 262144 /* IncludesStructuredOrInstantiable */;
                 if (type === wildcardType)
                     includes |= 4194304 /* IncludesWildcard */;
                 if (!strictNullChecks && flags & 98304 /* Nullable */) {
-                    if (!(ts.getObjectFlags(type) & 131072 /* ContainsWideningType */))
+                    if (!(ts.getObjectFlags(type) & 262144 /* ContainsWideningType */))
                         includes |= 2097152 /* IncludesNonWideningType */;
                 }
                 else {
@@ -39737,7 +40482,7 @@ var ts;
                             neverType;
                 }
             }
-            return getUnionTypeFromSortedList(typeSet, includes & 66994211 /* NotPrimitiveUnion */ ? 0 : 65536 /* PrimitiveUnion */, aliasSymbol, aliasTypeArguments);
+            return getUnionTypeFromSortedList(typeSet, includes & 66994211 /* NotPrimitiveUnion */ ? 0 : 131072 /* PrimitiveUnion */, aliasSymbol, aliasTypeArguments);
         }
         function getUnionTypePredicate(signatures) {
             var first;
@@ -39815,18 +40560,23 @@ var ts;
             if (isEmptyAnonymousObjectType(type)) {
                 if (!(includes & 8388608 /* IncludesEmptyObject */)) {
                     includes |= 8388608 /* IncludesEmptyObject */;
-                    typeSet.push(type);
+                    typeSet.set(type.id.toString(), type);
                 }
             }
             else {
-                includes |= flags & 1835007 /* IncludesMask */;
                 if (flags & 3 /* AnyOrUnknown */) {
                     if (type === wildcardType)
                         includes |= 4194304 /* IncludesWildcard */;
                 }
-                else if ((strictNullChecks || !(flags & 98304 /* Nullable */)) && !ts.contains(typeSet, type)) {
-                    typeSet.push(type);
+                else if ((strictNullChecks || !(flags & 98304 /* Nullable */)) && !typeSet.has(type.id.toString())) {
+                    if (type.flags & 109440 /* Unit */ && includes & 109440 /* Unit */) {
+                        // We have seen two distinct unit types which means we should reduce to an
+                        // empty intersection. Adding TypeFlags.NonPrimitive causes that to happen.
+                        includes |= 67108864 /* NonPrimitive */;
+                    }
+                    typeSet.set(type.id.toString(), type);
                 }
+                includes |= flags & 68943871 /* IncludesMask */;
             }
             return includes;
         }
@@ -39877,7 +40627,7 @@ var ts;
         // other unions and return true. Otherwise, do nothing and return false.
         function intersectUnionsOfPrimitiveTypes(types) {
             var unionTypes;
-            var index = ts.findIndex(types, function (t) { return !!(ts.getObjectFlags(t) & 65536 /* PrimitiveUnion */); });
+            var index = ts.findIndex(types, function (t) { return !!(ts.getObjectFlags(t) & 131072 /* PrimitiveUnion */); });
             if (index < 0) {
                 return false;
             }
@@ -39886,7 +40636,7 @@ var ts;
             // the unionTypes array.
             while (i < types.length) {
                 var t = types[i];
-                if (ts.getObjectFlags(t) & 65536 /* PrimitiveUnion */) {
+                if (ts.getObjectFlags(t) & 131072 /* PrimitiveUnion */) {
                     (unionTypes || (unionTypes = [types[index]])).push(t);
                     ts.orderedRemoveItemAt(types, i);
                 }
@@ -39915,9 +40665,17 @@ var ts;
                 }
             }
             // Finally replace the first union with the result
-            types[index] = getUnionTypeFromSortedList(result, 65536 /* PrimitiveUnion */);
+            types[index] = getUnionTypeFromSortedList(result, 131072 /* PrimitiveUnion */);
             return true;
         }
+        function createIntersectionType(types, aliasSymbol, aliasTypeArguments) {
+            var result = createType(2097152 /* Intersection */);
+            result.objectFlags = getPropagatingFlagsOfTypes(types, /*excludeKinds*/ 98304 /* Nullable */);
+            result.types = types;
+            result.aliasSymbol = aliasSymbol; // See comment in `getUnionTypeFromSortedList`.
+            result.aliasTypeArguments = aliasTypeArguments;
+            return result;
+        }
         // We normalize combinations of intersection and union types based on the distributive property of the '&'
         // operator. Specifically, because X & (A | B) is equivalent to X & A | X & B, we can transform intersection
         // types with union type constituents into equivalent union types with intersection type constituents and
@@ -39929,9 +40687,26 @@ var ts;
         // Also, unlike union types, the order of the constituent types is preserved in order that overload resolution
         // for intersections of types with signatures can be deterministic.
         function getIntersectionType(types, aliasSymbol, aliasTypeArguments) {
-            var typeSet = [];
-            var includes = addTypesToIntersection(typeSet, 0, types);
-            if (includes & 131072 /* Never */) {
+            var typeMembershipMap = ts.createMap();
+            var includes = addTypesToIntersection(typeMembershipMap, 0, types);
+            var typeSet = ts.arrayFrom(typeMembershipMap.values());
+            // An intersection type is considered empty if it contains
+            // the type never, or
+            // more than one unit type or,
+            // an object type and a nullable type (null or undefined), or
+            // a string-like type and a type known to be non-string-like, or
+            // a number-like type and a type known to be non-number-like, or
+            // a symbol-like type and a type known to be non-symbol-like, or
+            // a void-like type and a type known to be non-void-like, or
+            // a non-primitive type and a type known to be primitive.
+            if (includes & 131072 /* Never */ ||
+                strictNullChecks && includes & 98304 /* Nullable */ && includes & (524288 /* Object */ | 67108864 /* NonPrimitive */ | 8388608 /* IncludesEmptyObject */) ||
+                includes & 67108864 /* NonPrimitive */ && includes & (67238908 /* DisjointDomains */ & ~67108864 /* NonPrimitive */) ||
+                includes & 132 /* StringLike */ && includes & (67238908 /* DisjointDomains */ & ~132 /* StringLike */) ||
+                includes & 296 /* NumberLike */ && includes & (67238908 /* DisjointDomains */ & ~296 /* NumberLike */) ||
+                includes & 2112 /* BigIntLike */ && includes & (67238908 /* DisjointDomains */ & ~2112 /* BigIntLike */) ||
+                includes & 12288 /* ESSymbolLike */ && includes & (67238908 /* DisjointDomains */ & ~12288 /* ESSymbolLike */) ||
+                includes & 49152 /* VoidLike */ && includes & (67238908 /* DisjointDomains */ & ~49152 /* VoidLike */)) {
                 return neverType;
             }
             if (includes & 1 /* Any */) {
@@ -39955,30 +40730,36 @@ var ts;
             if (typeSet.length === 1) {
                 return typeSet[0];
             }
-            if (includes & 1048576 /* Union */) {
-                if (intersectUnionsOfPrimitiveTypes(typeSet)) {
-                    // When the intersection creates a reduced set (which might mean that *all* union types have
-                    // disappeared), we restart the operation to get a new set of combined flags. Once we have
-                    // reduced we'll never reduce again, so this occurs at most once.
-                    return getIntersectionType(typeSet, aliasSymbol, aliasTypeArguments);
-                }
-                // We are attempting to construct a type of the form X & (A | B) & Y. Transform this into a type of
-                // the form X & A & Y | X & B & Y and recursively reduce until no union type constituents remain.
-                var unionIndex_1 = ts.findIndex(typeSet, function (t) { return (t.flags & 1048576 /* Union */) !== 0; });
-                var unionType = typeSet[unionIndex_1];
-                return getUnionType(ts.map(unionType.types, function (t) { return getIntersectionType(ts.replaceElement(typeSet, unionIndex_1, t)); }), 1 /* Literal */, aliasSymbol, aliasTypeArguments);
-            }
             var id = getTypeListId(typeSet);
-            var type = intersectionTypes.get(id);
-            if (!type) {
-                type = createType(2097152 /* Intersection */);
-                intersectionTypes.set(id, type);
-                type.objectFlags = getPropagatingFlagsOfTypes(typeSet, /*excludeKinds*/ 98304 /* Nullable */);
-                type.types = typeSet;
-                type.aliasSymbol = aliasSymbol; // See comment in `getUnionTypeFromSortedList`.
-                type.aliasTypeArguments = aliasTypeArguments;
+            var result = intersectionTypes.get(id);
+            if (!result) {
+                if (includes & 1048576 /* Union */) {
+                    if (intersectUnionsOfPrimitiveTypes(typeSet)) {
+                        // When the intersection creates a reduced set (which might mean that *all* union types have
+                        // disappeared), we restart the operation to get a new set of combined flags. Once we have
+                        // reduced we'll never reduce again, so this occurs at most once.
+                        result = getIntersectionType(typeSet, aliasSymbol, aliasTypeArguments);
+                    }
+                    else {
+                        // We are attempting to construct a type of the form X & (A | B) & Y. Transform this into a type of
+                        // the form X & A & Y | X & B & Y and recursively reduce until no union type constituents remain.
+                        // If the estimated size of the resulting union type exceeds 100000 constituents, report an error.
+                        var size = ts.reduceLeft(typeSet, function (n, t) { return n * (t.flags & 1048576 /* Union */ ? t.types.length : 1); }, 1);
+                        if (size >= 100000) {
+                            error(currentNode, ts.Diagnostics.Expression_produces_a_union_type_that_is_too_complex_to_represent);
+                            return errorType;
+                        }
+                        var unionIndex_1 = ts.findIndex(typeSet, function (t) { return (t.flags & 1048576 /* Union */) !== 0; });
+                        var unionType = typeSet[unionIndex_1];
+                        result = getUnionType(ts.map(unionType.types, function (t) { return getIntersectionType(ts.replaceElement(typeSet, unionIndex_1, t)); }), 1 /* Literal */, aliasSymbol, aliasTypeArguments);
+                    }
+                }
+                else {
+                    result = createIntersectionType(typeSet, aliasSymbol, aliasTypeArguments);
+                }
+                intersectionTypes.set(id, result);
             }
-            return type;
+            return result;
         }
         function getTypeFromIntersectionTypeNode(node) {
             var links = getNodeLinks(node);
@@ -40034,18 +40815,19 @@ var ts;
             var numberIndexInfo = getIndexInfoOfType(type, 1 /* Number */);
             return numberIndexInfo !== enumNumberIndexInfo ? numberIndexInfo : undefined;
         }
-        function getIndexType(type, stringsOnly) {
+        function getIndexType(type, stringsOnly, noIndexSignatures) {
             if (stringsOnly === void 0) { stringsOnly = keyofStringsOnly; }
-            return type.flags & 1048576 /* Union */ ? getIntersectionType(ts.map(type.types, function (t) { return getIndexType(t, stringsOnly); })) :
-                type.flags & 2097152 /* Intersection */ ? getUnionType(ts.map(type.types, function (t) { return getIndexType(t, stringsOnly); })) :
+            return type.flags & 1048576 /* Union */ ? getIntersectionType(ts.map(type.types, function (t) { return getIndexType(t, stringsOnly, noIndexSignatures); })) :
+                type.flags & 2097152 /* Intersection */ ? getUnionType(ts.map(type.types, function (t) { return getIndexType(t, stringsOnly, noIndexSignatures); })) :
                     maybeTypeOfKind(type, 58982400 /* InstantiableNonPrimitive */) ? getIndexTypeForGenericType(type, stringsOnly) :
-                        ts.getObjectFlags(type) & 32 /* Mapped */ ? getConstraintTypeFromMappedType(type) :
+                        ts.getObjectFlags(type) & 32 /* Mapped */ ? filterType(getConstraintTypeFromMappedType(type), function (t) { return !(noIndexSignatures && t.flags & (1 /* Any */ | 4 /* String */)); }) :
                             type === wildcardType ? wildcardType :
-                                type.flags & 1 /* Any */ ? keyofConstraintType :
-                                    stringsOnly ? getIndexInfoOfType(type, 0 /* String */) ? stringType : getLiteralTypeFromProperties(type, 128 /* StringLiteral */) :
-                                        getIndexInfoOfType(type, 0 /* String */) ? getUnionType([stringType, numberType, getLiteralTypeFromProperties(type, 8192 /* UniqueESSymbol */)]) :
-                                            getNonEnumNumberIndexInfo(type) ? getUnionType([numberType, getLiteralTypeFromProperties(type, 128 /* StringLiteral */ | 8192 /* UniqueESSymbol */)]) :
-                                                getLiteralTypeFromProperties(type, 8576 /* StringOrNumberLiteralOrUnique */);
+                                type.flags & 2 /* Unknown */ ? neverType :
+                                    type.flags & (1 /* Any */ | 131072 /* Never */) ? keyofConstraintType :
+                                        stringsOnly ? !noIndexSignatures && getIndexInfoOfType(type, 0 /* String */) ? stringType : getLiteralTypeFromProperties(type, 128 /* StringLiteral */) :
+                                            !noIndexSignatures && getIndexInfoOfType(type, 0 /* String */) ? getUnionType([stringType, numberType, getLiteralTypeFromProperties(type, 8192 /* UniqueESSymbol */)]) :
+                                                getNonEnumNumberIndexInfo(type) ? getUnionType([numberType, getLiteralTypeFromProperties(type, 128 /* StringLiteral */ | 8192 /* UniqueESSymbol */)]) :
+                                                    getLiteralTypeFromProperties(type, 8576 /* StringOrNumberLiteralOrUnique */);
         }
         function getExtractStringType(type) {
             if (keyofStringsOnly) {
@@ -40062,15 +40844,15 @@ var ts;
             var links = getNodeLinks(node);
             if (!links.resolvedType) {
                 switch (node.operator) {
-                    case 129 /* KeyOfKeyword */:
+                    case 130 /* KeyOfKeyword */:
                         links.resolvedType = getIndexType(getTypeFromTypeNode(node.type));
                         break;
-                    case 142 /* UniqueKeyword */:
-                        links.resolvedType = node.type.kind === 139 /* SymbolKeyword */
+                    case 143 /* UniqueKeyword */:
+                        links.resolvedType = node.type.kind === 140 /* SymbolKeyword */
                             ? getESSymbolLikeTypeForNode(ts.walkUpParenthesizedTypes(node.parent))
                             : errorType;
                         break;
-                    case 133 /* ReadonlyKeyword */:
+                    case 134 /* ReadonlyKeyword */:
                         links.resolvedType = getTypeFromTypeNode(node.type);
                         break;
                 }
@@ -40110,9 +40892,9 @@ var ts;
             }
             return false;
         }
-        function getPropertyTypeForIndexType(objectType, indexType, accessNode, cacheSymbol, missingType) {
-            var accessExpression = accessNode && accessNode.kind === 190 /* ElementAccessExpression */ ? accessNode : undefined;
-            var propName = isTypeUsableAsPropertyName(indexType) ?
+        function getPropertyNameFromIndex(indexType, accessNode) {
+            var accessExpression = accessNode && accessNode.kind === 191 /* ElementAccessExpression */ ? accessNode : undefined;
+            return isTypeUsableAsPropertyName(indexType) ?
                 getPropertyNameFromType(indexType) :
                 accessExpression && checkThatExpressionIsProperSymbolReference(accessExpression.argumentExpression, indexType, /*reportError*/ false) ?
                     ts.getPropertyNameForKnownSymbolName(ts.idText(accessExpression.argumentExpression.name)) :
@@ -40120,16 +40902,20 @@ var ts;
                         // late bound names are handled in the first branch, so here we only need to handle normal names
                         ts.getPropertyNameForPropertyNameNode(accessNode) :
                         undefined;
+        }
+        function getPropertyTypeForIndexType(originalObjectType, objectType, indexType, fullIndexType, suppressNoImplicitAnyError, accessNode, accessFlags) {
+            var accessExpression = accessNode && accessNode.kind === 191 /* ElementAccessExpression */ ? accessNode : undefined;
+            var propName = getPropertyNameFromIndex(indexType, accessNode);
             if (propName !== undefined) {
                 var prop = getPropertyOfType(objectType, propName);
                 if (prop) {
                     if (accessExpression) {
-                        markPropertyAsReferenced(prop, accessExpression, /*isThisAccess*/ accessExpression.expression.kind === 100 /* ThisKeyword */);
+                        markPropertyAsReferenced(prop, accessExpression, /*isThisAccess*/ accessExpression.expression.kind === 101 /* ThisKeyword */);
                         if (ts.isAssignmentTarget(accessExpression) && (isReferenceToReadonlyEntity(accessExpression, prop) || isReferenceThroughNamespaceImport(accessExpression))) {
                             error(accessExpression.argumentExpression, ts.Diagnostics.Cannot_assign_to_0_because_it_is_a_read_only_property, symbolToString(prop));
-                            return missingType;
+                            return undefined;
                         }
-                        if (cacheSymbol) {
+                        if (accessFlags & 4 /* CacheSymbol */) {
                             getNodeLinks(accessNode).resolvedSymbol = prop;
                         }
                     }
@@ -40139,7 +40925,7 @@ var ts;
                         propType;
                 }
                 if (everyType(objectType, isTupleType) && isNumericLiteralName(propName) && +propName >= 0) {
-                    if (accessNode && everyType(objectType, function (t) { return !t.target.hasRestElement; })) {
+                    if (accessNode && everyType(objectType, function (t) { return !t.target.hasRestElement; }) && !(accessFlags & 8 /* NoTupleBoundsCheck */)) {
                         var indexNode = getIndexNodeForAccessExpression(accessNode);
                         if (isTupleType(objectType)) {
                             error(indexNode, ts.Diagnostics.Tuple_type_0_of_length_1_has_no_element_at_index_2, typeToString(objectType), getTypeReferenceArity(objectType), ts.unescapeLeadingUnderscores(propName));
@@ -40148,6 +40934,7 @@ var ts;
                             error(indexNode, ts.Diagnostics.Property_0_does_not_exist_on_type_1, ts.unescapeLeadingUnderscores(propName), typeToString(objectType));
                         }
                     }
+                    errorIfWritingToReadonlyIndex(getIndexInfoOfType(objectType, 1 /* Number */));
                     return mapType(objectType, function (t) { return getRestTypeOfTupleType(t) || undefinedType; });
                 }
             }
@@ -40155,17 +40942,21 @@ var ts;
                 if (objectType.flags & (1 /* Any */ | 131072 /* Never */)) {
                     return objectType;
                 }
-                var indexInfo = isTypeAssignableToKind(indexType, 296 /* NumberLike */) && getIndexInfoOfType(objectType, 1 /* Number */) ||
-                    getIndexInfoOfType(objectType, 0 /* String */) ||
-                    undefined;
+                var stringIndexInfo = getIndexInfoOfType(objectType, 0 /* String */);
+                var indexInfo = isTypeAssignableToKind(indexType, 296 /* NumberLike */) && getIndexInfoOfType(objectType, 1 /* Number */) || stringIndexInfo;
                 if (indexInfo) {
+                    if (accessFlags & 1 /* NoIndexSignatures */ && indexInfo === stringIndexInfo) {
+                        if (accessExpression) {
+                            error(accessExpression, ts.Diagnostics.Type_0_cannot_be_used_to_index_type_1, typeToString(indexType), typeToString(originalObjectType));
+                        }
+                        return undefined;
+                    }
                     if (accessNode && !isTypeAssignableToKind(indexType, 4 /* String */ | 8 /* Number */)) {
                         var indexNode = getIndexNodeForAccessExpression(accessNode);
                         error(indexNode, ts.Diagnostics.Type_0_cannot_be_used_as_an_index_type, typeToString(indexType));
+                        return indexInfo.type;
                     }
-                    else if (accessExpression && indexInfo.isReadonly && (ts.isAssignmentTarget(accessExpression) || ts.isDeleteTarget(accessExpression))) {
-                        error(accessExpression, ts.Diagnostics.Index_signature_in_type_0_only_permits_reading, typeToString(objectType));
-                    }
+                    errorIfWritingToReadonlyIndex(indexInfo);
                     return indexInfo.type;
                 }
                 if (indexType.flags & 131072 /* Never */) {
@@ -40175,7 +40966,10 @@ var ts;
                     return anyType;
                 }
                 if (accessExpression && !isConstEnumObjectType(objectType)) {
-                    if (noImplicitAny && !compilerOptions.suppressImplicitAnyIndexErrors) {
+                    if (objectType.symbol === globalThisSymbol && propName !== undefined && globalThisSymbol.exports.has(propName) && (globalThisSymbol.exports.get(propName).flags & 418 /* BlockScoped */)) {
+                        error(accessExpression, ts.Diagnostics.Property_0_does_not_exist_on_type_1, ts.unescapeLeadingUnderscores(propName), typeToString(objectType));
+                    }
+                    else if (noImplicitAny && !compilerOptions.suppressImplicitAnyIndexErrors && !suppressNoImplicitAnyError) {
                         if (propName !== undefined && typeHasStaticProperty(propName, objectType)) {
                             error(accessExpression, ts.Diagnostics.Property_0_is_a_static_member_of_type_1, propName, typeToString(objectType));
                         }
@@ -40190,11 +40984,35 @@ var ts;
                                 }
                             }
                             else {
-                                error(accessExpression, ts.Diagnostics.Element_implicitly_has_an_any_type_because_type_0_has_no_index_signature, typeToString(objectType));
+                                var suggestion_1 = getSuggestionForNonexistentIndexSignature(objectType, accessExpression);
+                                if (suggestion_1 !== undefined) {
+                                    error(accessExpression, ts.Diagnostics.Element_implicitly_has_an_any_type_because_type_0_has_no_index_signature_Did_you_mean_to_call_1, typeToString(objectType), suggestion_1);
+                                }
+                                else {
+                                    var errorInfo = void 0;
+                                    if (indexType.flags & 1024 /* EnumLiteral */) {
+                                        errorInfo = ts.chainDiagnosticMessages(/* details */ undefined, ts.Diagnostics.Property_0_does_not_exist_on_type_1, "[" + typeToString(indexType) + "]", typeToString(objectType));
+                                    }
+                                    else if (indexType.flags & 8192 /* UniqueESSymbol */) {
+                                        var symbolName_2 = getFullyQualifiedName(indexType.symbol, accessExpression);
+                                        errorInfo = ts.chainDiagnosticMessages(/* details */ undefined, ts.Diagnostics.Property_0_does_not_exist_on_type_1, "[" + symbolName_2 + "]", typeToString(objectType));
+                                    }
+                                    else if (indexType.flags & 128 /* StringLiteral */) {
+                                        errorInfo = ts.chainDiagnosticMessages(/* details */ undefined, ts.Diagnostics.Property_0_does_not_exist_on_type_1, indexType.value, typeToString(objectType));
+                                    }
+                                    else if (indexType.flags & 256 /* NumberLiteral */) {
+                                        errorInfo = ts.chainDiagnosticMessages(/* details */ undefined, ts.Diagnostics.Property_0_does_not_exist_on_type_1, indexType.value, typeToString(objectType));
+                                    }
+                                    else if (indexType.flags & (8 /* Number */ | 4 /* String */)) {
+                                        errorInfo = ts.chainDiagnosticMessages(/* details */ undefined, ts.Diagnostics.No_index_signature_with_a_parameter_of_type_0_was_found_on_type_1, typeToString(indexType), typeToString(objectType));
+                                    }
+                                    errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.Element_implicitly_has_an_any_type_because_expression_of_type_0_can_t_be_used_to_index_type_1, typeToString(fullIndexType), typeToString(objectType));
+                                    diagnostics.add(ts.createDiagnosticForNodeFromMessageChain(accessExpression, errorInfo));
+                                }
                             }
                         }
                     }
-                    return missingType;
+                    return undefined;
                 }
             }
             if (isJSLiteralType(objectType)) {
@@ -40215,14 +41033,19 @@ var ts;
             if (isTypeAny(indexType)) {
                 return indexType;
             }
-            return missingType;
+            return undefined;
+            function errorIfWritingToReadonlyIndex(indexInfo) {
+                if (indexInfo && indexInfo.isReadonly && accessExpression && (ts.isAssignmentTarget(accessExpression) || ts.isDeleteTarget(accessExpression))) {
+                    error(accessExpression, ts.Diagnostics.Index_signature_in_type_0_only_permits_reading, typeToString(objectType));
+                }
+            }
         }
         function getIndexNodeForAccessExpression(accessNode) {
-            return accessNode.kind === 190 /* ElementAccessExpression */
+            return accessNode.kind === 191 /* ElementAccessExpression */
                 ? accessNode.argumentExpression
-                : accessNode.kind === 180 /* IndexedAccessType */
+                : accessNode.kind === 181 /* IndexedAccessType */
                     ? accessNode.indexType
-                    : accessNode.kind === 149 /* ComputedPropertyName */
+                    : accessNode.kind === 150 /* ComputedPropertyName */
                         ? accessNode.expression
                         : accessNode;
         }
@@ -40232,64 +41055,124 @@ var ts;
         function isGenericIndexType(type) {
             return maybeTypeOfKind(type, 58982400 /* InstantiableNonPrimitive */ | 4194304 /* Index */);
         }
-        function getSimplifiedType(type) {
-            return type.flags & 8388608 /* IndexedAccess */ ? getSimplifiedIndexedAccessType(type) : type;
+        function isThisTypeParameter(type) {
+            return !!(type.flags & 262144 /* TypeParameter */ && type.isThisType);
         }
-        function distributeIndexOverObjectType(objectType, indexType) {
-            // (T | U)[K] -> T[K] | U[K]
-            if (objectType.flags & 1048576 /* Union */) {
-                return mapType(objectType, function (t) { return getSimplifiedType(getIndexedAccessType(t, indexType)); });
-            }
+        function getSimplifiedType(type, writing) {
+            return type.flags & 8388608 /* IndexedAccess */ ? getSimplifiedIndexedAccessType(type, writing) :
+                type.flags & 16777216 /* Conditional */ ? getSimplifiedConditionalType(type, writing) :
+                    type;
+        }
+        function distributeIndexOverObjectType(objectType, indexType, writing) {
+            // (T | U)[K] -> T[K] | U[K] (reading)
+            // (T | U)[K] -> T[K] & U[K] (writing)
             // (T & U)[K] -> T[K] & U[K]
-            if (objectType.flags & 2097152 /* Intersection */) {
-                return getIntersectionType(ts.map(objectType.types, function (t) { return getSimplifiedType(getIndexedAccessType(t, indexType)); }));
+            if (objectType.flags & 3145728 /* UnionOrIntersection */) {
+                var types = ts.map(objectType.types, function (t) { return getSimplifiedType(getIndexedAccessType(t, indexType), writing); });
+                return objectType.flags & 2097152 /* Intersection */ || writing ? getIntersectionType(types) : getUnionType(types);
+            }
+        }
+        function distributeObjectOverIndexType(objectType, indexType, writing) {
+            // T[A | B] -> T[A] | T[B] (reading)
+            // T[A | B] -> T[A] & T[B] (writing)
+            if (indexType.flags & 1048576 /* Union */) {
+                var types = ts.map(indexType.types, function (t) { return getSimplifiedType(getIndexedAccessType(objectType, t), writing); });
+                return writing ? getIntersectionType(types) : getUnionType(types);
             }
         }
         // Transform an indexed access to a simpler form, if possible. Return the simpler form, or return
-        // the type itself if no transformation is possible.
-        function getSimplifiedIndexedAccessType(type) {
-            if (type.simplified) {
-                return type.simplified === circularConstraintType ? type : type.simplified;
+        // the type itself if no transformation is possible. The writing flag indicates that the type is
+        // the target of an assignment.
+        function getSimplifiedIndexedAccessType(type, writing) {
+            var cache = writing ? "simplifiedForWriting" : "simplifiedForReading";
+            if (type[cache]) {
+                return type[cache] === circularConstraintType ? type : type[cache];
             }
-            type.simplified = circularConstraintType;
+            type[cache] = circularConstraintType;
             // We recursively simplify the object type as it may in turn be an indexed access type. For example, with
             // '{ [P in T]: { [Q in U]: number } }[T][U]' we want to first simplify the inner indexed access type.
-            var objectType = getSimplifiedType(type.objectType);
-            var indexType = getSimplifiedType(type.indexType);
-            // T[A | B] -> T[A] | T[B]
-            if (indexType.flags & 1048576 /* Union */) {
-                return type.simplified = mapType(indexType, function (t) { return getSimplifiedType(getIndexedAccessType(objectType, t)); });
+            var objectType = getSimplifiedType(type.objectType, writing);
+            var indexType = getSimplifiedType(type.indexType, writing);
+            // T[A | B] -> T[A] | T[B] (reading)
+            // T[A | B] -> T[A] & T[B] (writing)
+            var distributedOverIndex = distributeObjectOverIndexType(objectType, indexType, writing);
+            if (distributedOverIndex) {
+                return type[cache] = distributedOverIndex;
             }
             // Only do the inner distributions if the index can no longer be instantiated to cause index distribution again
             if (!(indexType.flags & 63176704 /* Instantiable */)) {
-                var simplified = distributeIndexOverObjectType(objectType, indexType);
-                if (simplified) {
-                    return type.simplified = simplified;
+                // (T | U)[K] -> T[K] | U[K] (reading)
+                // (T | U)[K] -> T[K] & U[K] (writing)
+                // (T & U)[K] -> T[K] & U[K]
+                var distributedOverObject = distributeIndexOverObjectType(objectType, indexType, writing);
+                if (distributedOverObject) {
+                    return type[cache] = distributedOverObject;
                 }
             }
-            // So ultimately:
+            // So ultimately (reading):
             // ((A & B) | C)[K1 | K2] -> ((A & B) | C)[K1] | ((A & B) | C)[K2] -> (A & B)[K1] | C[K1] | (A & B)[K2] | C[K2] -> (A[K1] & B[K1]) | C[K1] | (A[K2] & B[K2]) | C[K2]
             // If the object type is a mapped type { [P in K]: E }, where K is generic, instantiate E using a mapper
             // that substitutes the index type for P. For example, for an index access { [P in K]: Box<T[P]> }[X], we
             // construct the type Box<T[X]>.
             if (isGenericMappedType(objectType)) {
-                var mapper = createTypeMapper([getTypeParameterFromMappedType(objectType)], [type.indexType]);
-                var templateMapper = combineTypeMappers(objectType.mapper, mapper);
-                return type.simplified = mapType(instantiateType(getTemplateTypeFromMappedType(objectType), templateMapper), getSimplifiedType);
+                return type[cache] = mapType(substituteIndexedMappedType(objectType, type.indexType), function (t) { return getSimplifiedType(t, writing); });
             }
-            return type.simplified = type;
+            return type[cache] = type;
         }
-        function getIndexedAccessType(objectType, indexType, accessNode, missingType) {
-            if (missingType === void 0) { missingType = accessNode ? errorType : unknownType; }
+        function getSimplifiedConditionalType(type, writing) {
+            var checkType = type.checkType;
+            var extendsType = type.extendsType;
+            var trueType = getTrueTypeFromConditionalType(type);
+            var falseType = getFalseTypeFromConditionalType(type);
+            // Simplifications for types of the form `T extends U ? T : never` and `T extends U ? never : T`.
+            if (falseType.flags & 131072 /* Never */ && getActualTypeVariable(trueType) === getActualTypeVariable(checkType)) {
+                if (checkType.flags & 1 /* Any */ || isTypeAssignableTo(getRestrictiveInstantiation(checkType), getRestrictiveInstantiation(extendsType))) { // Always true
+                    return getSimplifiedType(trueType, writing);
+                }
+                else if (isIntersectionEmpty(checkType, extendsType)) { // Always false
+                    return neverType;
+                }
+            }
+            else if (trueType.flags & 131072 /* Never */ && getActualTypeVariable(falseType) === getActualTypeVariable(checkType)) {
+                if (!(checkType.flags & 1 /* Any */) && isTypeAssignableTo(getRestrictiveInstantiation(checkType), getRestrictiveInstantiation(extendsType))) { // Always true
+                    return neverType;
+                }
+                else if (checkType.flags & 1 /* Any */ || isIntersectionEmpty(checkType, extendsType)) { // Always false
+                    return getSimplifiedType(falseType, writing);
+                }
+            }
+            return type;
+        }
+        /**
+         * Invokes union simplification logic to determine if an intersection is considered empty as a union constituent
+         */
+        function isIntersectionEmpty(type1, type2) {
+            return !!(getUnionType([intersectTypes(type1, type2), neverType]).flags & 131072 /* Never */);
+        }
+        function substituteIndexedMappedType(objectType, index) {
+            var mapper = createTypeMapper([getTypeParameterFromMappedType(objectType)], [index]);
+            var templateMapper = combineTypeMappers(objectType.mapper, mapper);
+            return instantiateType(getTemplateTypeFromMappedType(objectType), templateMapper);
+        }
+        function getIndexedAccessType(objectType, indexType, accessNode) {
+            return getIndexedAccessTypeOrUndefined(objectType, indexType, accessNode, 0 /* None */) || (accessNode ? errorType : unknownType);
+        }
+        function getIndexedAccessTypeOrUndefined(objectType, indexType, accessNode, accessFlags) {
+            if (accessFlags === void 0) { accessFlags = 0 /* None */; }
             if (objectType === wildcardType || indexType === wildcardType) {
                 return wildcardType;
             }
+            // If the object type has a string index signature and no other members we know that the result will
+            // always be the type of that index signature and we can simplify accordingly.
+            if (isStringIndexSignatureOnlyType(objectType) && !(indexType.flags & 98304 /* Nullable */) && isTypeAssignableToKind(indexType, 4 /* String */ | 8 /* Number */)) {
+                indexType = stringType;
+            }
             // If the index type is generic, or if the object type is generic and doesn't originate in an expression,
             // we are performing a higher-order index access where we cannot meaningfully access the properties of the
             // object type. Note that for a generic T and a non-generic K, we eagerly resolve T[K] if it originates in
             // an expression. This is to preserve backwards compatibility. For example, an element access 'this["foo"]'
             // has always been resolved eagerly using the constraint type of 'this' at the given location.
-            if (isGenericIndexType(indexType) || !(accessNode && accessNode.kind !== 180 /* IndexedAccessType */) && isGenericObjectType(objectType)) {
+            if (isGenericIndexType(indexType) || !(accessNode && accessNode.kind !== 181 /* IndexedAccessType */) && isGenericObjectType(objectType)) {
                 if (objectType.flags & 3 /* AnyOrUnknown */) {
                     return objectType;
                 }
@@ -40310,25 +41193,25 @@ var ts;
                 var wasMissingProp = false;
                 for (var _i = 0, _a = indexType.types; _i < _a.length; _i++) {
                     var t = _a[_i];
-                    var propType = getPropertyTypeForIndexType(apparentObjectType, t, accessNode, /*cacheSymbol*/ false, missingType);
-                    if (propType === missingType) {
-                        if (!accessNode) {
-                            // If there's no error node, we can immeditely stop, since error reporting is off
-                            return missingType;
-                        }
-                        else {
-                            // Otherwise we set a flag and return at the end of the loop so we still mark all errors
-                            wasMissingProp = true;
-                        }
+                    var propType = getPropertyTypeForIndexType(objectType, apparentObjectType, t, indexType, wasMissingProp, accessNode, accessFlags);
+                    if (propType) {
+                        propTypes.push(propType);
+                    }
+                    else if (!accessNode) {
+                        // If there's no error node, we can immeditely stop, since error reporting is off
+                        return undefined;
+                    }
+                    else {
+                        // Otherwise we set a flag and return at the end of the loop so we still mark all errors
+                        wasMissingProp = true;
                     }
-                    propTypes.push(propType);
                 }
                 if (wasMissingProp) {
-                    return missingType;
+                    return undefined;
                 }
-                return getUnionType(propTypes);
+                return accessFlags & 2 /* Writing */ ? getIntersectionType(propTypes) : getUnionType(propTypes);
             }
-            return getPropertyTypeForIndexType(apparentObjectType, indexType, accessNode, /*cacheSymbol*/ true, missingType);
+            return getPropertyTypeForIndexType(objectType, apparentObjectType, indexType, indexType, /* supressNoImplicitAnyError */ false, accessNode, accessFlags | 4 /* CacheSymbol */);
         }
         function getTypeFromIndexedAccessTypeNode(node) {
             var links = getNodeLinks(node);
@@ -40358,13 +41241,14 @@ var ts;
             return links.resolvedType;
         }
         function getActualTypeVariable(type) {
-            return type.flags & 33554432 /* Substitution */ ? type.typeVariable : type;
-        }
-        /**
-         * Invokes union simplification logic to determine if an intersection is considered empty as a union constituent
-         */
-        function isIntersectionEmpty(type1, type2) {
-            return !!(getUnionType([intersectTypes(type1, type2), neverType]).flags & 131072 /* Never */);
+            if (type.flags & 33554432 /* Substitution */) {
+                return type.typeVariable;
+            }
+            if (type.flags & 8388608 /* IndexedAccess */ && (type.objectType.flags & 33554432 /* Substitution */ ||
+                type.indexType.flags & 33554432 /* Substitution */)) {
+                return getIndexedAccessType(getActualTypeVariable(type.objectType), getActualTypeVariable(type.indexType));
+            }
+            return type;
         }
         function getConditionalType(root, mapper) {
             var checkType = instantiateType(root.checkType, mapper);
@@ -40372,35 +41256,6 @@ var ts;
             if (checkType === wildcardType || extendsType === wildcardType) {
                 return wildcardType;
             }
-            var trueType = instantiateType(root.trueType, mapper);
-            var falseType = instantiateType(root.falseType, mapper);
-            var instantiationId = "" + (root.isDistributive ? "d" : "") + getTypeId(checkType) + ">" + getTypeId(extendsType) + "?" + getTypeId(trueType) + ":" + getTypeId(falseType);
-            var result = conditionalTypes.get(instantiationId);
-            if (result) {
-                return result;
-            }
-            var newResult = getConditionalTypeWorker(root, mapper, checkType, extendsType, trueType, falseType);
-            conditionalTypes.set(instantiationId, newResult);
-            return newResult;
-        }
-        function getConditionalTypeWorker(root, mapper, checkType, extendsType, trueType, falseType) {
-            // Simplifications for types of the form `T extends U ? T : never` and `T extends U ? never : T`.
-            if (falseType.flags & 131072 /* Never */ && isTypeIdenticalTo(getActualTypeVariable(trueType), getActualTypeVariable(checkType))) {
-                if (checkType.flags & 1 /* Any */ || isTypeAssignableTo(getRestrictiveInstantiation(checkType), getRestrictiveInstantiation(extendsType))) { // Always true
-                    return getDefaultConstraintOfTrueBranchOfConditionalType(root, /*combinedMapper*/ undefined, mapper);
-                }
-                else if (isIntersectionEmpty(checkType, extendsType)) { // Always false
-                    return neverType;
-                }
-            }
-            else if (trueType.flags & 131072 /* Never */ && isTypeIdenticalTo(getActualTypeVariable(falseType), getActualTypeVariable(checkType))) {
-                if (!(checkType.flags & 1 /* Any */) && isTypeAssignableTo(getRestrictiveInstantiation(checkType), getRestrictiveInstantiation(extendsType))) { // Always true
-                    return neverType;
-                }
-                else if (checkType.flags & 1 /* Any */ || isIntersectionEmpty(checkType, extendsType)) { // Always false
-                    return falseType; // TODO: Intersect negated `extends` type here
-                }
-            }
             var checkTypeInstantiable = maybeTypeOfKind(checkType, 63176704 /* Instantiable */ | 131072 /* GenericMappedType */);
             var combinedMapper;
             if (root.inferTypeParameters) {
@@ -40409,27 +41264,27 @@ var ts;
                     // We don't want inferences from constraints as they may cause us to eagerly resolve the
                     // conditional type instead of deferring resolution. Also, we always want strict function
                     // types rules (i.e. proper contravariance) for inferences.
-                    inferTypes(context.inferences, checkType, extendsType, 32 /* NoConstraints */ | 64 /* AlwaysStrict */);
+                    inferTypes(context.inferences, checkType, extendsType, 64 /* NoConstraints */ | 128 /* AlwaysStrict */);
                 }
-                combinedMapper = combineTypeMappers(mapper, context);
+                combinedMapper = combineTypeMappers(mapper, context.mapper);
             }
             // Instantiate the extends type including inferences for 'infer T' type parameters
             var inferredExtendsType = combinedMapper ? instantiateType(root.extendsType, combinedMapper) : extendsType;
             // We attempt to resolve the conditional type only when the check and extends types are non-generic
             if (!checkTypeInstantiable && !maybeTypeOfKind(inferredExtendsType, 63176704 /* Instantiable */ | 131072 /* GenericMappedType */)) {
                 if (inferredExtendsType.flags & 3 /* AnyOrUnknown */) {
-                    return trueType;
+                    return instantiateType(root.trueType, combinedMapper || mapper);
                 }
                 // Return union of trueType and falseType for 'any' since it matches anything
                 if (checkType.flags & 1 /* Any */) {
-                    return getUnionType([instantiateType(root.trueType, combinedMapper || mapper), falseType]);
+                    return getUnionType([instantiateType(root.trueType, combinedMapper || mapper), instantiateType(root.falseType, mapper)]);
                 }
                 // Return falseType for a definitely false extends check. We check an instantiations of the two
                 // types with type parameters mapped to the wildcard type, the most permissive instantiations
                 // possible (the wildcard type is assignable to and from all types). If those are not related,
                 // then no instantiations will be and we can just return the false branch type.
                 if (!isTypeAssignableTo(getPermissiveInstantiation(checkType), getPermissiveInstantiation(inferredExtendsType))) {
-                    return falseType;
+                    return instantiateType(root.falseType, mapper);
                 }
                 // Return trueType for a definitely true extends check. We check instantiations of the two
                 // types with type parameters mapped to their restrictive form, i.e. a form of the type parameter
@@ -40448,10 +41303,6 @@ var ts;
             result.extendsType = extendsType;
             result.mapper = mapper;
             result.combinedMapper = combinedMapper;
-            if (!combinedMapper) {
-                result.resolvedTrueType = trueType;
-                result.resolvedFalseType = falseType;
-            }
             result.aliasSymbol = root.aliasSymbol;
             result.aliasTypeArguments = instantiateTypes(root.aliasTypeArguments, mapper); // TODO: GH#18217
             return result;
@@ -40462,6 +41313,9 @@ var ts;
         function getFalseTypeFromConditionalType(type) {
             return type.resolvedFalseType || (type.resolvedFalseType = instantiateType(type.root.falseType, type.mapper));
         }
+        function getInferredTrueTypeFromConditionalType(type) {
+            return type.resolvedInferredTrueType || (type.resolvedInferredTrueType = type.combinedMapper ? instantiateType(type.root.trueType, type.combinedMapper) : getTrueTypeFromConditionalType(type));
+        }
         function getInferTypeParameters(node) {
             var result;
             if (node.locals) {
@@ -40473,20 +41327,6 @@ var ts;
             }
             return result;
         }
-        function isPossiblyReferencedInConditionalType(tp, node) {
-            if (isTypeParameterPossiblyReferenced(tp, node)) {
-                return true;
-            }
-            while (node) {
-                if (node.kind === 175 /* ConditionalType */) {
-                    if (isTypeParameterPossiblyReferenced(tp, node.extendsType)) {
-                        return true;
-                    }
-                }
-                node = node.parent;
-            }
-            return false;
-        }
         function getTypeFromConditionalTypeNode(node) {
             var links = getNodeLinks(node);
             if (!links.resolvedType) {
@@ -40494,7 +41334,7 @@ var ts;
                 var aliasSymbol = getAliasSymbolForTypeNode(node);
                 var aliasTypeArguments = getTypeArgumentsForAliasSymbol(aliasSymbol);
                 var allOuterTypeParameters = getOuterTypeParameters(node, /*includeThisTypes*/ true);
-                var outerTypeParameters = aliasTypeArguments ? allOuterTypeParameters : ts.filter(allOuterTypeParameters, function (tp) { return isPossiblyReferencedInConditionalType(tp, node); });
+                var outerTypeParameters = aliasTypeArguments ? allOuterTypeParameters : ts.filter(allOuterTypeParameters, function (tp) { return isTypeParameterPossiblyReferenced(tp, node); });
                 var root = {
                     node: node,
                     checkType: checkType,
@@ -40714,7 +41554,7 @@ var ts;
                 }
             }
             var spread = createAnonymousType(symbol, members, ts.emptyArray, ts.emptyArray, getIndexInfoWithReadonly(stringIndexInfo, readonly), getIndexInfoWithReadonly(numberIndexInfo, readonly));
-            spread.objectFlags |= 128 /* ObjectLiteral */ | 262144 /* ContainsObjectLiteral */ | 1024 /* ContainsSpread */ | objectFlags;
+            spread.objectFlags |= 128 /* ObjectLiteral */ | 524288 /* ContainsObjectOrArrayLiteral */ | 1024 /* ContainsSpread */ | objectFlags;
             return spread;
         }
         /** We approximate own properties as non-methods plus methods that are inside the object literal */
@@ -40805,9 +41645,9 @@ var ts;
         function getThisType(node) {
             var container = ts.getThisContainer(node, /*includeArrowFunctions*/ false);
             var parent = container && container.parent;
-            if (parent && (ts.isClassLike(parent) || parent.kind === 241 /* InterfaceDeclaration */)) {
+            if (parent && (ts.isClassLike(parent) || parent.kind === 242 /* InterfaceDeclaration */)) {
                 if (!ts.hasModifier(container, 32 /* Static */) &&
-                    (container.kind !== 157 /* Constructor */ || ts.isNodeDescendantOf(node, container.body))) {
+                    (container.kind !== 158 /* Constructor */ || ts.isNodeDescendantOf(node, container.body))) {
                     return getDeclaredTypeOfClassOrInterface(getSymbolOfNode(parent)).thisType;
                 }
             }
@@ -40823,89 +41663,89 @@ var ts;
         }
         function getTypeFromTypeNode(node) {
             switch (node.kind) {
-                case 120 /* AnyKeyword */:
-                case 289 /* JSDocAllType */:
-                case 290 /* JSDocUnknownType */:
+                case 121 /* AnyKeyword */:
+                case 290 /* JSDocAllType */:
+                case 291 /* JSDocUnknownType */:
                     return anyType;
-                case 143 /* UnknownKeyword */:
+                case 144 /* UnknownKeyword */:
                     return unknownType;
-                case 138 /* StringKeyword */:
+                case 139 /* StringKeyword */:
                     return stringType;
-                case 135 /* NumberKeyword */:
+                case 136 /* NumberKeyword */:
                     return numberType;
-                case 146 /* BigIntKeyword */:
+                case 147 /* BigIntKeyword */:
                     return bigintType;
-                case 123 /* BooleanKeyword */:
+                case 124 /* BooleanKeyword */:
                     return booleanType;
-                case 139 /* SymbolKeyword */:
+                case 140 /* SymbolKeyword */:
                     return esSymbolType;
-                case 106 /* VoidKeyword */:
+                case 107 /* VoidKeyword */:
                     return voidType;
-                case 141 /* UndefinedKeyword */:
+                case 142 /* UndefinedKeyword */:
                     return undefinedType;
-                case 96 /* NullKeyword */:
+                case 97 /* NullKeyword */:
                     return nullType;
-                case 132 /* NeverKeyword */:
+                case 133 /* NeverKeyword */:
                     return neverType;
-                case 136 /* ObjectKeyword */:
+                case 137 /* ObjectKeyword */:
                     return node.flags & 65536 /* JavaScriptFile */ ? anyType : nonPrimitiveType;
-                case 178 /* ThisType */:
-                case 100 /* ThisKeyword */:
+                case 179 /* ThisType */:
+                case 101 /* ThisKeyword */:
                     return getTypeFromThisTypeNode(node);
-                case 182 /* LiteralType */:
+                case 183 /* LiteralType */:
                     return getTypeFromLiteralTypeNode(node);
-                case 164 /* TypeReference */:
+                case 165 /* TypeReference */:
                     return getTypeFromTypeReference(node);
-                case 163 /* TypePredicate */:
+                case 164 /* TypePredicate */:
                     return booleanType;
-                case 211 /* ExpressionWithTypeArguments */:
+                case 212 /* ExpressionWithTypeArguments */:
                     return getTypeFromTypeReference(node);
-                case 167 /* TypeQuery */:
+                case 168 /* TypeQuery */:
                     return getTypeFromTypeQueryNode(node);
-                case 169 /* ArrayType */:
+                case 170 /* ArrayType */:
                     return getTypeFromArrayTypeNode(node);
-                case 170 /* TupleType */:
+                case 171 /* TupleType */:
                     return getTypeFromTupleTypeNode(node);
-                case 171 /* OptionalType */:
+                case 172 /* OptionalType */:
                     return getTypeFromOptionalTypeNode(node);
-                case 173 /* UnionType */:
+                case 174 /* UnionType */:
                     return getTypeFromUnionTypeNode(node);
-                case 174 /* IntersectionType */:
+                case 175 /* IntersectionType */:
                     return getTypeFromIntersectionTypeNode(node);
-                case 291 /* JSDocNullableType */:
+                case 292 /* JSDocNullableType */:
                     return getTypeFromJSDocNullableTypeNode(node);
-                case 293 /* JSDocOptionalType */:
+                case 294 /* JSDocOptionalType */:
                     return addOptionality(getTypeFromTypeNode(node.type));
-                case 177 /* ParenthesizedType */:
-                case 172 /* RestType */:
-                case 292 /* JSDocNonNullableType */:
-                case 288 /* JSDocTypeExpression */:
+                case 178 /* ParenthesizedType */:
+                case 173 /* RestType */:
+                case 293 /* JSDocNonNullableType */:
+                case 289 /* JSDocTypeExpression */:
                     return getTypeFromTypeNode(node.type);
-                case 295 /* JSDocVariadicType */:
+                case 296 /* JSDocVariadicType */:
                     return getTypeFromJSDocVariadicType(node);
-                case 165 /* FunctionType */:
-                case 166 /* ConstructorType */:
-                case 168 /* TypeLiteral */:
-                case 297 /* JSDocTypeLiteral */:
-                case 294 /* JSDocFunctionType */:
-                case 298 /* JSDocSignature */:
+                case 166 /* FunctionType */:
+                case 167 /* ConstructorType */:
+                case 169 /* TypeLiteral */:
+                case 298 /* JSDocTypeLiteral */:
+                case 295 /* JSDocFunctionType */:
+                case 299 /* JSDocSignature */:
                     return getTypeFromTypeLiteralOrFunctionOrConstructorTypeNode(node);
-                case 179 /* TypeOperator */:
+                case 180 /* TypeOperator */:
                     return getTypeFromTypeOperatorNode(node);
-                case 180 /* IndexedAccessType */:
+                case 181 /* IndexedAccessType */:
                     return getTypeFromIndexedAccessTypeNode(node);
-                case 181 /* MappedType */:
+                case 182 /* MappedType */:
                     return getTypeFromMappedTypeNode(node);
-                case 175 /* ConditionalType */:
+                case 176 /* ConditionalType */:
                     return getTypeFromConditionalTypeNode(node);
-                case 176 /* InferType */:
+                case 177 /* InferType */:
                     return getTypeFromInferTypeNode(node);
-                case 183 /* ImportType */:
+                case 184 /* ImportType */:
                     return getTypeFromImportTypeNode(node);
                 // This function assumes that an identifier or qualified name is a type expression
                 // Callers should first ensure this by calling isTypeNode
-                case 72 /* Identifier */:
-                case 148 /* QualifiedName */:
+                case 73 /* Identifier */:
+                case 149 /* QualifiedName */:
                     var symbol = getSymbolAtLocation(node);
                     return symbol ? getDeclaredTypeOfSymbol(symbol) : errorType;
                 default:
@@ -40964,33 +41804,8 @@ var ts;
          * Maps forward-references to later types parameters to the empty object type.
          * This is used during inference when instantiating type parameter defaults.
          */
-        function createBackreferenceMapper(typeParameters, index) {
-            return function (t) { return typeParameters.indexOf(t) >= index ? emptyObjectType : t; };
-        }
-        function isInferenceContext(mapper) {
-            return !!mapper.typeParameters;
-        }
-        function cloneTypeMapper(mapper, extraFlags) {
-            if (extraFlags === void 0) { extraFlags = 0; }
-            return mapper && isInferenceContext(mapper) ?
-                createInferenceContext(mapper.typeParameters, mapper.signature, mapper.flags | extraFlags, mapper.compareTypes, mapper.inferences) :
-                mapper;
-        }
-        function cloneInferredPartOfContext(context) {
-            // Filter context to only those parameters which actually have inference candidates
-            var params = [];
-            var inferences = [];
-            for (var i = 0; i < context.typeParameters.length; i++) {
-                var info = context.inferences[i];
-                if (info.candidates || info.contraCandidates) {
-                    params.push(context.typeParameters[i]);
-                    inferences.push(info);
-                }
-            }
-            if (!params.length) {
-                return undefined;
-            }
-            return createInferenceContext(params, context.signature, context.flags | 1 /* NoDefault */, context.compareTypes, inferences);
+        function createBackreferenceMapper(context, index) {
+            return function (t) { return ts.findIndex(context.inferences, function (info) { return info.typeParameter === t; }) >= index ? unknownType : t; };
         }
         function combineTypeMappers(mapper1, mapper2) {
             if (!mapper1)
@@ -41073,7 +41888,7 @@ var ts;
             }
             // Keep the flags from the symbol we're instantiating.  Mark that is instantiated, and
             // also transient so that we can just store data on it directly.
-            var result = createSymbol(symbol.flags, symbol.escapedName, 1 /* Instantiated */ | ts.getCheckFlags(symbol) & (8 /* Readonly */ | 2048 /* Late */ | 8192 /* OptionalParameter */ | 16384 /* RestParameter */));
+            var result = createSymbol(symbol.flags, symbol.escapedName, 1 /* Instantiated */ | ts.getCheckFlags(symbol) & (8 /* Readonly */ | 4096 /* Late */ | 16384 /* OptionalParameter */ | 32768 /* RestParameter */));
             result.declarations = symbol.declarations;
             result.parent = symbol.parent;
             result.target = symbol;
@@ -41139,28 +41954,31 @@ var ts;
             return type;
         }
         function maybeTypeParameterReference(node) {
-            return !(node.kind === 148 /* QualifiedName */ ||
-                node.parent.kind === 164 /* TypeReference */ && node.parent.typeArguments && node === node.parent.typeName);
+            return !(node.kind === 149 /* QualifiedName */ ||
+                node.parent.kind === 165 /* TypeReference */ && node.parent.typeArguments && node === node.parent.typeName);
         }
         function isTypeParameterPossiblyReferenced(tp, node) {
             // If the type parameter doesn't have exactly one declaration, if there are invening statement blocks
             // between the node and the type parameter declaration, if the node contains actual references to the
             // type parameter, or if the node contains type queries, we consider the type parameter possibly referenced.
             if (tp.symbol && tp.symbol.declarations && tp.symbol.declarations.length === 1) {
-                var container_3 = tp.symbol.declarations[0].parent;
-                if (ts.findAncestor(node, function (n) { return n.kind === 218 /* Block */ ? "quit" : n === container_3; })) {
-                    return !!ts.forEachChild(node, containsReference);
+                var container = tp.symbol.declarations[0].parent;
+                for (var n = node; n !== container; n = n.parent) {
+                    if (!n || n.kind === 219 /* Block */ || n.kind === 176 /* ConditionalType */ && ts.forEachChild(n.extendsType, containsReference)) {
+                        return true;
+                    }
                 }
+                return !!ts.forEachChild(node, containsReference);
             }
             return true;
             function containsReference(node) {
                 switch (node.kind) {
-                    case 178 /* ThisType */:
+                    case 179 /* ThisType */:
                         return !!tp.isThisType;
-                    case 72 /* Identifier */:
+                    case 73 /* Identifier */:
                         return !tp.isThisType && ts.isPartOfTypeNode(node) && maybeTypeParameterReference(node) &&
                             getTypeFromTypeNode(node) === tp;
-                    case 167 /* TypeQuery */:
+                    case 168 /* TypeQuery */:
                         return true;
                 }
                 return !!ts.forEachChild(node, containsReference);
@@ -41285,13 +42103,14 @@ var ts;
             if (!type || !mapper || mapper === identityMapper) {
                 return type;
             }
-            if (instantiationDepth === 50) {
+            if (instantiationDepth === 50 || instantiationCount >= 5000000) {
                 // We have reached 50 recursive type instantiations and there is a very high likelyhood we're dealing
                 // with a combination of infinite generic types that perpetually generate new type identities. We stop
                 // the recursion here by yielding the error type.
                 error(currentNode, ts.Diagnostics.Type_instantiation_is_excessively_deep_and_possibly_infinite);
                 return errorType;
             }
+            instantiationCount++;
             instantiationDepth++;
             var result = instantiateTypeWorker(type, mapper);
             instantiationDepth--;
@@ -41308,7 +42127,7 @@ var ts;
                     // If the anonymous type originates in a declaration of a function, method, class, or
                     // interface, in an object type literal, or in an object literal expression, we may need
                     // to instantiate the type because it might reference a type parameter.
-                    return type.symbol && type.symbol.flags & (16 /* Function */ | 8192 /* Method */ | 32 /* Class */ | 2048 /* TypeLiteral */ | 4096 /* ObjectLiteral */) && type.symbol.declarations ?
+                    return couldContainTypeVariables(type) ?
                         getAnonymousTypeInstantiation(type, mapper) : type;
                 }
                 if (objectFlags & 32 /* Mapped */) {
@@ -41346,7 +42165,11 @@ var ts;
                     return getSubstitutionType(maybeVariable, instantiateType(type.substitute, mapper));
                 }
                 else {
-                    return maybeVariable;
+                    var sub = instantiateType(type.substitute, mapper);
+                    if (sub.flags & 3 /* AnyOrUnknown */ || isTypeAssignableTo(getRestrictiveInstantiation(maybeVariable), getRestrictiveInstantiation(sub))) {
+                        return maybeVariable;
+                    }
+                    return sub;
                 }
             }
             return type;
@@ -41377,34 +42200,35 @@ var ts;
         // Returns true if the given expression contains (at any level of nesting) a function or arrow expression
         // that is subject to contextual typing.
         function isContextSensitive(node) {
-            ts.Debug.assert(node.kind !== 156 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 157 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
             switch (node.kind) {
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
-                case 156 /* MethodDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
+                case 157 /* MethodDeclaration */:
+                case 240 /* FunctionDeclaration */: // Function declarations can have context when annotated with a jsdoc @type
                     return isContextSensitiveFunctionLikeDeclaration(node);
-                case 188 /* ObjectLiteralExpression */:
+                case 189 /* ObjectLiteralExpression */:
                     return ts.some(node.properties, isContextSensitive);
-                case 187 /* ArrayLiteralExpression */:
+                case 188 /* ArrayLiteralExpression */:
                     return ts.some(node.elements, isContextSensitive);
-                case 205 /* ConditionalExpression */:
+                case 206 /* ConditionalExpression */:
                     return isContextSensitive(node.whenTrue) ||
                         isContextSensitive(node.whenFalse);
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return node.operatorToken.kind === 55 /* BarBarToken */ &&
                         (isContextSensitive(node.left) || isContextSensitive(node.right));
-                case 275 /* PropertyAssignment */:
+                case 276 /* PropertyAssignment */:
                     return isContextSensitive(node.initializer);
-                case 195 /* ParenthesizedExpression */:
+                case 196 /* ParenthesizedExpression */:
                     return isContextSensitive(node.expression);
-                case 268 /* JsxAttributes */:
+                case 269 /* JsxAttributes */:
                     return ts.some(node.properties, isContextSensitive) || ts.isJsxOpeningElement(node.parent) && ts.some(node.parent.parent.children, isContextSensitive);
-                case 267 /* JsxAttribute */: {
+                case 268 /* JsxAttribute */: {
                     // If there is no initializer, JSX attribute has a boolean value of true which is not context sensitive.
                     var initializer = node.initializer;
                     return !!initializer && isContextSensitive(initializer);
                 }
-                case 270 /* JsxExpression */: {
+                case 271 /* JsxExpression */: {
                     // It is possible to that node.expression is undefined (e.g <div x={} />)
                     var expression = node.expression;
                     return !!expression && isContextSensitive(expression);
@@ -41413,6 +42237,9 @@ var ts;
             return false;
         }
         function isContextSensitiveFunctionLikeDeclaration(node) {
+            if (ts.isFunctionDeclaration(node) && (!ts.isInJSFile(node) || !getTypeForDeclarationFromJSDocComment(node))) {
+                return false;
+            }
             // Functions with type parameters are not context sensitive.
             if (node.typeParameters) {
                 return false;
@@ -41421,7 +42248,7 @@ var ts;
             if (ts.some(node.parameters, function (p) { return !ts.getEffectiveTypeAnnotationNode(p); })) {
                 return true;
             }
-            if (node.kind !== 197 /* ArrowFunction */) {
+            if (node.kind !== 198 /* ArrowFunction */) {
                 // If the first parameter is not an explicit 'this' parameter, then the function has
                 // an implicit 'this' parameter which is subject to contextual typing.
                 var parameter = ts.firstOrUndefined(node.parameters);
@@ -41433,7 +42260,7 @@ var ts;
         }
         function hasContextSensitiveReturnExpression(node) {
             // TODO(anhans): A block should be context-sensitive if it has a context-sensitive return value.
-            return !!node.body && node.body.kind !== 218 /* Block */ && isContextSensitive(node.body);
+            return !!node.body && node.body.kind !== 219 /* Block */ && isContextSensitive(node.body);
         }
         function isContextSensitiveFunctionOrObjectLiteralMethod(func) {
             return (ts.isInJSFile(func) && ts.isFunctionDeclaration(func) || isFunctionExpressionOrArrowFunction(func) || ts.isObjectLiteralMethod(func)) &&
@@ -41486,7 +42313,7 @@ var ts;
         function isTypeDerivedFrom(source, target) {
             return source.flags & 1048576 /* Union */ ? ts.every(source.types, function (t) { return isTypeDerivedFrom(t, target); }) :
                 target.flags & 1048576 /* Union */ ? ts.some(target.types, function (t) { return isTypeDerivedFrom(source, t); }) :
-                    source.flags & 58982400 /* InstantiableNonPrimitive */ ? isTypeDerivedFrom(getBaseConstraintOfType(source) || emptyObjectType, target) :
+                    source.flags & 58982400 /* InstantiableNonPrimitive */ ? isTypeDerivedFrom(getBaseConstraintOfType(source) || unknownType, target) :
                         target === globalObjectType ? !!(source.flags & (524288 /* Object */ | 67108864 /* NonPrimitive */)) :
                             target === globalFunctionType ? !!(source.flags & 524288 /* Object */) && isFunctionObjectType(source) :
                                 hasBaseType(source, getTargetType(target));
@@ -41515,48 +42342,49 @@ var ts;
          * attempt to issue more specific errors on, for example, specific object literal properties or tuple members.
          */
         function checkTypeAssignableToAndOptionallyElaborate(source, target, errorNode, expr, headMessage, containingMessageChain) {
-            return checkTypeRelatedToAndOptionallyElaborate(source, target, assignableRelation, errorNode, expr, headMessage, containingMessageChain);
+            return checkTypeRelatedToAndOptionallyElaborate(source, target, assignableRelation, errorNode, expr, headMessage, containingMessageChain, /*errorOutputContainer*/ undefined);
         }
-        function checkTypeRelatedToAndOptionallyElaborate(source, target, relation, errorNode, expr, headMessage, containingMessageChain) {
+        function checkTypeRelatedToAndOptionallyElaborate(source, target, relation, errorNode, expr, headMessage, containingMessageChain, errorOutputContainer) {
             if (isTypeRelatedTo(source, target, relation))
                 return true;
-            if (!errorNode || !elaborateError(expr, source, target, relation, headMessage)) {
-                return checkTypeRelatedTo(source, target, relation, errorNode, headMessage, containingMessageChain);
+            if (!errorNode || !elaborateError(expr, source, target, relation, headMessage, containingMessageChain, errorOutputContainer)) {
+                return checkTypeRelatedTo(source, target, relation, errorNode, headMessage, containingMessageChain, errorOutputContainer);
             }
             return false;
         }
         function isOrHasGenericConditional(type) {
             return !!(type.flags & 16777216 /* Conditional */ || (type.flags & 2097152 /* Intersection */ && ts.some(type.types, isOrHasGenericConditional)));
         }
-        function elaborateError(node, source, target, relation, headMessage) {
+        function elaborateError(node, source, target, relation, headMessage, containingMessageChain, errorOutputContainer) {
             if (!node || isOrHasGenericConditional(target))
                 return false;
-            if (!checkTypeRelatedTo(source, target, relation, /*errorNode*/ undefined) && elaborateDidYouMeanToCallOrConstruct(node, source, target, relation, headMessage)) {
+            if (!checkTypeRelatedTo(source, target, relation, /*errorNode*/ undefined)
+                && elaborateDidYouMeanToCallOrConstruct(node, source, target, relation, headMessage, containingMessageChain, errorOutputContainer)) {
                 return true;
             }
             switch (node.kind) {
-                case 270 /* JsxExpression */:
-                case 195 /* ParenthesizedExpression */:
-                    return elaborateError(node.expression, source, target, relation, headMessage);
-                case 204 /* BinaryExpression */:
+                case 271 /* JsxExpression */:
+                case 196 /* ParenthesizedExpression */:
+                    return elaborateError(node.expression, source, target, relation, headMessage, containingMessageChain, errorOutputContainer);
+                case 205 /* BinaryExpression */:
                     switch (node.operatorToken.kind) {
-                        case 59 /* EqualsToken */:
+                        case 60 /* EqualsToken */:
                         case 27 /* CommaToken */:
-                            return elaborateError(node.right, source, target, relation, headMessage);
+                            return elaborateError(node.right, source, target, relation, headMessage, containingMessageChain, errorOutputContainer);
                     }
                     break;
-                case 188 /* ObjectLiteralExpression */:
-                    return elaborateObjectLiteral(node, source, target, relation);
-                case 187 /* ArrayLiteralExpression */:
-                    return elaborateArrayLiteral(node, source, target, relation);
-                case 268 /* JsxAttributes */:
-                    return elaborateJsxComponents(node, source, target, relation);
-                case 197 /* ArrowFunction */:
-                    return elaborateArrowFunction(node, source, target, relation);
+                case 189 /* ObjectLiteralExpression */:
+                    return elaborateObjectLiteral(node, source, target, relation, containingMessageChain, errorOutputContainer);
+                case 188 /* ArrayLiteralExpression */:
+                    return elaborateArrayLiteral(node, source, target, relation, containingMessageChain, errorOutputContainer);
+                case 269 /* JsxAttributes */:
+                    return elaborateJsxComponents(node, source, target, relation, containingMessageChain, errorOutputContainer);
+                case 198 /* ArrowFunction */:
+                    return elaborateArrowFunction(node, source, target, relation, containingMessageChain, errorOutputContainer);
             }
             return false;
         }
-        function elaborateDidYouMeanToCallOrConstruct(node, source, target, relation, headMessage) {
+        function elaborateDidYouMeanToCallOrConstruct(node, source, target, relation, headMessage, containingMessageChain, errorOutputContainer) {
             var callSignatures = getSignaturesOfType(source, 0 /* Call */);
             var constructSignatures = getSignaturesOfType(source, 1 /* Construct */);
             for (var _i = 0, _a = [constructSignatures, callSignatures]; _i < _a.length; _i++) {
@@ -41565,16 +42393,16 @@ var ts;
                     var returnType = getReturnTypeOfSignature(s);
                     return !(returnType.flags & (1 /* Any */ | 131072 /* Never */)) && checkTypeRelatedTo(returnType, target, relation, /*errorNode*/ undefined);
                 })) {
-                    var resultObj = {};
-                    checkTypeAssignableTo(source, target, node, headMessage, /*containingChain*/ undefined, resultObj);
-                    var diagnostic = resultObj.error;
-                    addRelatedInfo(diagnostic, ts.createDiagnosticForNode(node, signatures === constructSignatures ? ts.Diagnostics.Did_you_mean_to_use_new_with_this_expression : ts.Diagnostics.Did_you_mean_to_call_this_expression));
+                    var resultObj = errorOutputContainer || {};
+                    checkTypeAssignableTo(source, target, node, headMessage, containingMessageChain, resultObj);
+                    var diagnostic = resultObj.errors[resultObj.errors.length - 1];
+                    ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(node, signatures === constructSignatures ? ts.Diagnostics.Did_you_mean_to_use_new_with_this_expression : ts.Diagnostics.Did_you_mean_to_call_this_expression));
                     return true;
                 }
             }
             return false;
         }
-        function elaborateArrowFunction(node, source, target, relation) {
+        function elaborateArrowFunction(node, source, target, relation, containingMessageChain, errorOutputContainer) {
             // Don't elaborate blocks
             if (ts.isBlock(node.body)) {
                 return false;
@@ -41595,15 +42423,15 @@ var ts;
             var sourceReturn = getReturnTypeOfSignature(sourceSig);
             var targetReturn = getUnionType(ts.map(targetSignatures, getReturnTypeOfSignature));
             if (!checkTypeRelatedTo(sourceReturn, targetReturn, relation, /*errorNode*/ undefined)) {
-                var elaborated = returnExpression && elaborateError(returnExpression, sourceReturn, targetReturn, relation, /*headMessage*/ undefined);
+                var elaborated = returnExpression && elaborateError(returnExpression, sourceReturn, targetReturn, relation, /*headMessage*/ undefined, containingMessageChain, errorOutputContainer);
                 if (elaborated) {
                     return elaborated;
                 }
-                var resultObj = {};
-                checkTypeRelatedTo(sourceReturn, targetReturn, relation, returnExpression, /*message*/ undefined, /*chain*/ undefined, resultObj);
-                if (resultObj.error) {
+                var resultObj = errorOutputContainer || {};
+                checkTypeRelatedTo(sourceReturn, targetReturn, relation, returnExpression, /*message*/ undefined, containingMessageChain, resultObj);
+                if (resultObj.errors) {
                     if (target.symbol && ts.length(target.symbol.declarations)) {
-                        addRelatedInfo(resultObj.error, ts.createDiagnosticForNode(target.symbol.declarations[0], ts.Diagnostics.The_expected_type_comes_from_the_return_type_of_this_signature));
+                        ts.addRelatedInfo(resultObj.errors[resultObj.errors.length - 1], ts.createDiagnosticForNode(target.symbol.declarations[0], ts.Diagnostics.The_expected_type_comes_from_the_return_type_of_this_signature));
                     }
                     return true;
                 }
@@ -41615,32 +42443,32 @@ var ts;
          * If that element would issue an error, we first attempt to dive into that element's inner expression and issue a more specific error by recuring into `elaborateError`
          * Otherwise, we issue an error on _every_ element which fail the assignability check
          */
-        function elaborateElementwise(iterator, source, target, relation) {
+        function elaborateElementwise(iterator, source, target, relation, containingMessageChain, errorOutputContainer) {
             // Assignability failure - check each prop individually, and if that fails, fall back on the bad error span
             var reportedError = false;
             for (var status = iterator.next(); !status.done; status = iterator.next()) {
                 var _a = status.value, prop = _a.errorNode, next = _a.innerExpression, nameType = _a.nameType, errorMessage = _a.errorMessage;
-                var targetPropType = getIndexedAccessType(target, nameType, /*accessNode*/ undefined, errorType);
-                if (targetPropType === errorType || targetPropType.flags & 8388608 /* IndexedAccess */)
+                var targetPropType = getIndexedAccessTypeOrUndefined(target, nameType);
+                if (!targetPropType || targetPropType.flags & 8388608 /* IndexedAccess */)
                     continue; // Don't elaborate on indexes on generic variables
-                var sourcePropType = getIndexedAccessType(source, nameType, /*accessNode*/ undefined, errorType);
-                if (sourcePropType !== errorType && targetPropType !== errorType && !checkTypeRelatedTo(sourcePropType, targetPropType, relation, /*errorNode*/ undefined)) {
-                    var elaborated = next && elaborateError(next, sourcePropType, targetPropType, relation, /*headMessage*/ undefined);
+                var sourcePropType = getIndexedAccessTypeOrUndefined(source, nameType);
+                if (sourcePropType && !checkTypeRelatedTo(sourcePropType, targetPropType, relation, /*errorNode*/ undefined)) {
+                    var elaborated = next && elaborateError(next, sourcePropType, targetPropType, relation, /*headMessage*/ undefined, containingMessageChain, errorOutputContainer);
                     if (elaborated) {
                         reportedError = true;
                     }
                     else {
                         // Issue error on the prop itself, since the prop couldn't elaborate the error
-                        var resultObj = {};
+                        var resultObj = errorOutputContainer || {};
                         // Use the expression type, if available
                         var specificSource = next ? checkExpressionForMutableLocation(next, 0 /* Normal */, sourcePropType) : sourcePropType;
-                        var result = checkTypeRelatedTo(specificSource, targetPropType, relation, prop, errorMessage, /*containingChain*/ undefined, resultObj);
+                        var result = checkTypeRelatedTo(specificSource, targetPropType, relation, prop, errorMessage, containingMessageChain, resultObj);
                         if (result && specificSource !== sourcePropType) {
                             // If for whatever reason the expression type doesn't yield an error, make sure we still issue an error on the sourcePropType
-                            checkTypeRelatedTo(sourcePropType, targetPropType, relation, prop, errorMessage, /*containingChain*/ undefined, resultObj);
+                            checkTypeRelatedTo(sourcePropType, targetPropType, relation, prop, errorMessage, containingMessageChain, resultObj);
                         }
-                        if (resultObj.error) {
-                            var reportedDiag = resultObj.error;
+                        if (resultObj.errors) {
+                            var reportedDiag = resultObj.errors[resultObj.errors.length - 1];
                             var propertyName = isTypeUsableAsPropertyName(nameType) ? getPropertyNameFromType(nameType) : undefined;
                             var targetProp = propertyName !== undefined ? getPropertyOfType(target, propertyName) : undefined;
                             var issuedElaboration = false;
@@ -41650,13 +42478,13 @@ var ts;
                                     undefined;
                                 if (indexInfo && indexInfo.declaration && !ts.getSourceFileOfNode(indexInfo.declaration).hasNoDefaultLib) {
                                     issuedElaboration = true;
-                                    addRelatedInfo(reportedDiag, ts.createDiagnosticForNode(indexInfo.declaration, ts.Diagnostics.The_expected_type_comes_from_this_index_signature));
+                                    ts.addRelatedInfo(reportedDiag, ts.createDiagnosticForNode(indexInfo.declaration, ts.Diagnostics.The_expected_type_comes_from_this_index_signature));
                                 }
                             }
                             if (!issuedElaboration && (targetProp && ts.length(targetProp.declarations) || target.symbol && ts.length(target.symbol.declarations))) {
                                 var targetNode = targetProp && ts.length(targetProp.declarations) ? targetProp.declarations[0] : target.symbol.declarations[0];
                                 if (!ts.getSourceFileOfNode(targetNode).hasNoDefaultLib) {
-                                    addRelatedInfo(reportedDiag, ts.createDiagnosticForNode(targetNode, ts.Diagnostics.The_expected_type_comes_from_property_0_which_is_declared_here_on_type_1, propertyName && !(nameType.flags & 8192 /* UniqueESSymbol */) ? ts.unescapeLeadingUnderscores(propertyName) : typeToString(nameType), typeToString(target)));
+                                    ts.addRelatedInfo(reportedDiag, ts.createDiagnosticForNode(targetNode, ts.Diagnostics.The_expected_type_comes_from_property_0_which_is_declared_here_on_type_1, propertyName && !(nameType.flags & 8192 /* UniqueESSymbol */) ? ts.unescapeLeadingUnderscores(propertyName) : typeToString(nameType), typeToString(target)));
                                 }
                             }
                         }
@@ -41723,26 +42551,29 @@ var ts;
         }
         function getElaborationElementForJsxChild(child, nameType, getInvalidTextDiagnostic) {
             switch (child.kind) {
-                case 270 /* JsxExpression */:
+                case 271 /* JsxExpression */:
                     // child is of the type of the expression
                     return { errorNode: child, innerExpression: child.expression, nameType: nameType };
                 case 11 /* JsxText */:
-                    if (child.containsOnlyWhiteSpaces) {
+                    if (child.containsOnlyTriviaWhiteSpaces) {
                         break; // Whitespace only jsx text isn't real jsx text
                     }
                     // child is a string
                     return { errorNode: child, innerExpression: undefined, nameType: nameType, errorMessage: getInvalidTextDiagnostic() };
-                case 260 /* JsxElement */:
-                case 261 /* JsxSelfClosingElement */:
-                case 264 /* JsxFragment */:
+                case 261 /* JsxElement */:
+                case 262 /* JsxSelfClosingElement */:
+                case 265 /* JsxFragment */:
                     // child is of type JSX.Element
                     return { errorNode: child, innerExpression: child, nameType: nameType };
                 default:
                     return ts.Debug.assertNever(child, "Found invalid jsx child");
             }
         }
-        function elaborateJsxComponents(node, source, target, relation) {
-            var result = elaborateElementwise(generateJsxAttributes(node), source, target, relation);
+        function getSemanticJsxChildren(children) {
+            return ts.filter(children, function (i) { return !ts.isJsxText(i) || !i.containsOnlyTriviaWhiteSpaces; });
+        }
+        function elaborateJsxComponents(node, source, target, relation, containingMessageChain, errorOutputContainer) {
+            var result = elaborateElementwise(generateJsxAttributes(node), source, target, relation, containingMessageChain, errorOutputContainer);
             var invalidTextDiagnostic;
             if (ts.isJsxOpeningElement(node.parent) && ts.isJsxElement(node.parent.parent)) {
                 var containingElement = node.parent.parent;
@@ -41750,7 +42581,7 @@ var ts;
                 var childrenPropName = childPropName === undefined ? "children" : ts.unescapeLeadingUnderscores(childPropName);
                 var childrenNameType = getLiteralType(childrenPropName);
                 var childrenTargetType = getIndexedAccessType(target, childrenNameType);
-                var validChildren = ts.filter(containingElement.children, function (i) { return !ts.isJsxText(i) || !i.containsOnlyWhiteSpaces; });
+                var validChildren = getSemanticJsxChildren(containingElement.children);
                 if (!ts.length(validChildren)) {
                     return result;
                 }
@@ -41760,12 +42591,16 @@ var ts;
                 if (moreThanOneRealChildren) {
                     if (arrayLikeTargetParts !== neverType) {
                         var realSource = createTupleType(checkJsxChildren(containingElement, 0 /* Normal */));
-                        result = elaborateElementwise(generateJsxChildren(containingElement, getInvalidTextualChildDiagnostic), realSource, arrayLikeTargetParts, relation) || result;
+                        var children = generateJsxChildren(containingElement, getInvalidTextualChildDiagnostic);
+                        result = elaborateElementwise(children, realSource, arrayLikeTargetParts, relation, containingMessageChain, errorOutputContainer) || result;
                     }
                     else if (!isTypeRelatedTo(getIndexedAccessType(source, childrenNameType), childrenTargetType, relation)) {
                         // arity mismatch
                         result = true;
-                        error(containingElement.openingElement.tagName, ts.Diagnostics.This_JSX_tag_s_0_prop_expects_a_single_child_of_type_1_but_multiple_children_were_provided, childrenPropName, typeToString(childrenTargetType));
+                        var diag = error(containingElement.openingElement.tagName, ts.Diagnostics.This_JSX_tag_s_0_prop_expects_a_single_child_of_type_1_but_multiple_children_were_provided, childrenPropName, typeToString(childrenTargetType));
+                        if (errorOutputContainer && errorOutputContainer.skipLogging) {
+                            (errorOutputContainer.errors || (errorOutputContainer.errors = [])).push(diag);
+                        }
                     }
                 }
                 else {
@@ -41780,13 +42615,16 @@ var ts;
                                         _a.sent();
                                         return [2 /*return*/];
                                 }
-                            }); })(), source, target, relation) || result;
+                            }); })(), source, target, relation, containingMessageChain, errorOutputContainer) || result;
                         }
                     }
                     else if (!isTypeRelatedTo(getIndexedAccessType(source, childrenNameType), childrenTargetType, relation)) {
                         // arity mismatch
                         result = true;
-                        error(containingElement.openingElement.tagName, ts.Diagnostics.This_JSX_tag_s_0_prop_expects_type_1_which_requires_multiple_children_but_only_a_single_child_was_provided, childrenPropName, typeToString(childrenTargetType));
+                        var diag = error(containingElement.openingElement.tagName, ts.Diagnostics.This_JSX_tag_s_0_prop_expects_type_1_which_requires_multiple_children_but_only_a_single_child_was_provided, childrenPropName, typeToString(childrenTargetType));
+                        if (errorOutputContainer && errorOutputContainer.skipLogging) {
+                            (errorOutputContainer.errors || (errorOutputContainer.errors = [])).push(diag);
+                        }
                     }
                 }
             }
@@ -41833,14 +42671,16 @@ var ts;
                 }
             });
         }
-        function elaborateArrayLiteral(node, source, target, relation) {
+        function elaborateArrayLiteral(node, source, target, relation, containingMessageChain, errorOutputContainer) {
+            if (target.flags & 131068 /* Primitive */)
+                return false;
             if (isTupleLikeType(source)) {
-                return elaborateElementwise(generateLimitedTupleElements(node, target), source, target, relation);
+                return elaborateElementwise(generateLimitedTupleElements(node, target), source, target, relation, containingMessageChain, errorOutputContainer);
             }
             // recreate a tuple from the elements, if possible
             var tupleizedType = checkArrayLiteral(node, 1 /* Contextual */, /*forceTuple*/ true);
             if (isTupleLikeType(tupleizedType)) {
-                return elaborateElementwise(generateLimitedTupleElements(node, target), tupleizedType, target, relation);
+                return elaborateElementwise(generateLimitedTupleElements(node, target), tupleizedType, target, relation, containingMessageChain, errorOutputContainer);
             }
             return false;
         }
@@ -41864,11 +42704,11 @@ var ts;
                         }
                         _b = prop.kind;
                         switch (_b) {
-                            case 159 /* SetAccessor */: return [3 /*break*/, 2];
-                            case 158 /* GetAccessor */: return [3 /*break*/, 2];
-                            case 156 /* MethodDeclaration */: return [3 /*break*/, 2];
-                            case 276 /* ShorthandPropertyAssignment */: return [3 /*break*/, 2];
-                            case 275 /* PropertyAssignment */: return [3 /*break*/, 4];
+                            case 160 /* SetAccessor */: return [3 /*break*/, 2];
+                            case 159 /* GetAccessor */: return [3 /*break*/, 2];
+                            case 157 /* MethodDeclaration */: return [3 /*break*/, 2];
+                            case 277 /* ShorthandPropertyAssignment */: return [3 /*break*/, 2];
+                            case 276 /* PropertyAssignment */: return [3 /*break*/, 4];
                         }
                         return [3 /*break*/, 6];
                     case 2: return [4 /*yield*/, { errorNode: prop.name, innerExpression: undefined, nameType: type }];
@@ -41889,8 +42729,10 @@ var ts;
                 }
             });
         }
-        function elaborateObjectLiteral(node, source, target, relation) {
-            return elaborateElementwise(generateObjectLiteralElements(node), source, target, relation);
+        function elaborateObjectLiteral(node, source, target, relation, containingMessageChain, errorOutputContainer) {
+            if (target.flags & 131068 /* Primitive */)
+                return false;
+            return elaborateElementwise(generateObjectLiteralElements(node), source, target, relation, containingMessageChain, errorOutputContainer);
         }
         /**
          * This is *not* a bi-directional relationship.
@@ -41903,6 +42745,14 @@ var ts;
             return compareSignaturesRelated(source, target, 0 /* None */, ignoreReturnTypes, /*reportErrors*/ false, 
             /*errorReporter*/ undefined, compareTypesAssignable) !== 0 /* False */;
         }
+        /**
+         * Returns true if `s` is `(...args: any[]) => any` or `(this: any, ...args: any[]) => any`
+         */
+        function isAnySignature(s) {
+            return !s.typeParameters && (!s.thisParameter || isTypeAny(getTypeOfParameter(s.thisParameter))) && s.parameters.length === 1 &&
+                s.hasRestParameter && (getTypeOfParameter(s.parameters[0]) === anyArrayType || isTypeAny(getTypeOfParameter(s.parameters[0]))) &&
+                isTypeAny(getReturnTypeOfSignature(s));
+        }
         /**
          * See signatureRelatedTo, compareSignaturesIdentical
          */
@@ -41911,13 +42761,16 @@ var ts;
             if (source === target) {
                 return -1 /* True */;
             }
+            if (isAnySignature(target)) {
+                return -1 /* True */;
+            }
             var targetCount = getParameterCount(target);
             if (!hasEffectiveRestParameter(target) && getMinArgumentCount(source) > targetCount) {
                 return 0 /* False */;
             }
             if (source.typeParameters && source.typeParameters !== target.typeParameters) {
                 target = getCanonicalSignature(target);
-                source = instantiateSignatureInContextOf(source, target, /*contextualMapper*/ undefined, compareTypes);
+                source = instantiateSignatureInContextOf(source, target, /*inferenceContext*/ undefined, compareTypes);
             }
             var sourceCount = getParameterCount(source);
             var sourceRestType = getNonArrayRestType(source);
@@ -41927,8 +42780,8 @@ var ts;
                 return 0 /* False */;
             }
             var kind = target.declaration ? target.declaration.kind : 0 /* Unknown */;
-            var strictVariance = !callbackCheck && strictFunctionTypes && kind !== 156 /* MethodDeclaration */ &&
-                kind !== 155 /* MethodSignature */ && kind !== 157 /* Constructor */;
+            var strictVariance = !callbackCheck && strictFunctionTypes && kind !== 157 /* MethodDeclaration */ &&
+                kind !== 156 /* MethodSignature */ && kind !== 158 /* Constructor */;
             var result = -1 /* True */;
             var sourceThisType = getThisTypeOfSignature(source);
             if (sourceThisType && sourceThisType !== voidType) {
@@ -41976,19 +42829,21 @@ var ts;
                 result &= related;
             }
             if (!ignoreReturnTypes) {
-                var targetReturnType = (target.declaration && isJSConstructor(target.declaration)) ?
+                // If a signature reolution is already in-flight, skip issuing a circularity error
+                // here and just use the `any` type directly
+                var targetReturnType = isResolvingReturnTypeOfSignature(target) ? anyType : (target.declaration && isJSConstructor(target.declaration)) ?
                     getJSClassType(target.declaration.symbol) : getReturnTypeOfSignature(target);
                 if (targetReturnType === voidType) {
                     return result;
                 }
-                var sourceReturnType = (source.declaration && isJSConstructor(source.declaration)) ?
+                var sourceReturnType = isResolvingReturnTypeOfSignature(source) ? anyType : (source.declaration && isJSConstructor(source.declaration)) ?
                     getJSClassType(source.declaration.symbol) : getReturnTypeOfSignature(source);
                 // The following block preserves behavior forbidding boolean returning functions from being assignable to type guard returning functions
                 var targetTypePredicate = getTypePredicateOfSignature(target);
                 if (targetTypePredicate) {
                     var sourceTypePredicate = getTypePredicateOfSignature(source);
                     if (sourceTypePredicate) {
-                        result &= compareTypePredicateRelatedTo(sourceTypePredicate, targetTypePredicate, source.declaration, target.declaration, reportErrors, errorReporter, compareTypes); // TODO: GH#18217
+                        result &= compareTypePredicateRelatedTo(sourceTypePredicate, targetTypePredicate, reportErrors, errorReporter, compareTypes);
                     }
                     else if (ts.isIdentifierTypePredicate(targetTypePredicate)) {
                         if (reportErrors) {
@@ -42007,7 +42862,7 @@ var ts;
             }
             return result;
         }
-        function compareTypePredicateRelatedTo(source, target, sourceDeclaration, targetDeclaration, reportErrors, errorReporter, compareTypes) {
+        function compareTypePredicateRelatedTo(source, target, reportErrors, errorReporter, compareTypes) {
             if (source.kind !== target.kind) {
                 if (reportErrors) {
                     errorReporter(ts.Diagnostics.A_this_based_type_guard_is_not_compatible_with_a_parameter_based_type_guard);
@@ -42016,12 +42871,9 @@ var ts;
                 return 0 /* False */;
             }
             if (source.kind === 1 /* Identifier */) {
-                var targetPredicate = target;
-                var sourceIndex = source.parameterIndex - (ts.getThisParameter(sourceDeclaration) ? 1 : 0);
-                var targetIndex = targetPredicate.parameterIndex - (ts.getThisParameter(targetDeclaration) ? 1 : 0);
-                if (sourceIndex !== targetIndex) {
+                if (source.parameterIndex !== target.parameterIndex) {
                     if (reportErrors) {
-                        errorReporter(ts.Diagnostics.Parameter_0_is_not_in_the_same_position_as_parameter_1, source.parameterName, targetPredicate.parameterName);
+                        errorReporter(ts.Diagnostics.Parameter_0_is_not_in_the_same_position_as_parameter_1, source.parameterName, target.parameterName);
                         errorReporter(ts.Diagnostics.Type_predicate_0_is_not_assignable_to_1, typePredicateToString(source), typePredicateToString(target));
                     }
                     return 0 /* False */;
@@ -42063,6 +42915,11 @@ var ts;
         function isEmptyAnonymousObjectType(type) {
             return !!(ts.getObjectFlags(type) & 16 /* Anonymous */) && isEmptyObjectType(type);
         }
+        function isStringIndexSignatureOnlyType(type) {
+            return type.flags & 524288 /* Object */ && !isGenericMappedType(type) && getPropertiesOfType(type).length === 0 && getIndexInfoOfType(type, 0 /* String */) && !getIndexInfoOfType(type, 1 /* Number */) ||
+                type.flags & 3145728 /* UnionOrIntersection */ && ts.every(type.types, isStringIndexSignatureOnlyType) ||
+                false;
+        }
         function isEnumTypeRelatedTo(sourceSymbol, targetSymbol, errorReporter) {
             if (sourceSymbol === targetSymbol) {
                 return true;
@@ -42171,8 +43028,8 @@ var ts;
             }
             return false;
         }
-        function isIgnoredJsxProperty(source, sourceProp, targetMemberType) {
-            return ts.getObjectFlags(source) & 4096 /* JsxAttributes */ && !(isUnhyphenatedJsxName(sourceProp.escapedName) || targetMemberType);
+        function isIgnoredJsxProperty(source, sourceProp) {
+            return ts.getObjectFlags(source) & 4096 /* JsxAttributes */ && !isUnhyphenatedJsxName(sourceProp.escapedName);
         }
         /**
          * Checks if 'source' is related to 'target' (e.g.: is a assignable to).
@@ -42183,6 +43040,7 @@ var ts;
          * @param errorNode The suggested node upon which all errors will be reported, if defined. This may or may not be the actual node used.
          * @param headMessage If the error chain should be prepended by a head message, then headMessage will be used.
          * @param containingMessageChain A chain of errors to prepend any new errors found.
+         * @param errorOutputContainer Return the diagnostic. Do not log if 'skipLogging' is truthy.
          */
         function checkTypeRelatedTo(source, target, relation, errorNode, headMessage, containingMessageChain, errorOutputContainer) {
             var errorInfo;
@@ -42194,17 +43052,21 @@ var ts;
             var depth = 0;
             var expandingFlags = 0 /* None */;
             var overflow = false;
-            var suppressNextError = false;
+            var overrideNextErrorInfo;
             ts.Debug.assert(relation !== identityRelation || !errorNode, "no error reporting in identity checking");
             var result = isRelatedTo(source, target, /*reportErrors*/ !!errorNode, headMessage);
             if (overflow) {
-                error(errorNode, ts.Diagnostics.Excessive_stack_depth_comparing_types_0_and_1, typeToString(source), typeToString(target));
+                var diag = error(errorNode, ts.Diagnostics.Excessive_stack_depth_comparing_types_0_and_1, typeToString(source), typeToString(target));
+                if (errorOutputContainer) {
+                    (errorOutputContainer.errors || (errorOutputContainer.errors = [])).push(diag);
+                }
             }
             else if (errorInfo) {
                 if (containingMessageChain) {
-                    var chain_1 = containingMessageChain();
-                    if (chain_1) {
-                        errorInfo = ts.concatenateDiagnosticMessageChains(chain_1, errorInfo);
+                    var chain = containingMessageChain();
+                    if (chain) {
+                        ts.concatenateDiagnosticMessageChains(chain, errorInfo);
+                        errorInfo = chain;
                     }
                 }
                 var relatedInformation = void 0;
@@ -42222,12 +43084,17 @@ var ts;
                 }
                 var diag = ts.createDiagnosticForNodeFromMessageChain(errorNode, errorInfo, relatedInformation);
                 if (relatedInfo) {
-                    addRelatedInfo.apply(void 0, [diag].concat(relatedInfo));
+                    ts.addRelatedInfo.apply(void 0, [diag].concat(relatedInfo));
                 }
                 if (errorOutputContainer) {
-                    errorOutputContainer.error = diag;
+                    (errorOutputContainer.errors || (errorOutputContainer.errors = [])).push(diag);
                 }
-                diagnostics.add(diag); // TODO: GH#18217
+                if (!errorOutputContainer || !errorOutputContainer.skipLogging) {
+                    diagnostics.add(diag);
+                }
+            }
+            if (errorNode && errorOutputContainer && errorOutputContainer.skipLogging && result === 0 /* False */) {
+                ts.Debug.assert(!!errorOutputContainer.errors, "missed opportunity to interact with error.");
             }
             return result !== 0 /* False */;
             function reportError(message, arg0, arg1, arg2, arg3) {
@@ -42244,11 +43111,9 @@ var ts;
                 }
             }
             function reportRelationError(message, source, target) {
-                var sourceType = typeToString(source);
-                var targetType = typeToString(target);
-                if (sourceType === targetType) {
-                    sourceType = typeToString(source, /*enclosingDeclaration*/ undefined, 64 /* UseFullyQualifiedType */);
-                    targetType = typeToString(target, /*enclosingDeclaration*/ undefined, 64 /* UseFullyQualifiedType */);
+                var _a = getTypeNamesForErrorDisplay(source, target), sourceType = _a[0], targetType = _a[1];
+                if (target.flags & 262144 /* TypeParameter */ && target.immediateBaseConstraint !== undefined && isTypeAssignableTo(source, target.immediateBaseConstraint)) {
+                    reportError(ts.Diagnostics._0_is_assignable_to_the_constraint_of_type_1_but_1_could_be_instantiated_with_a_different_subtype_of_constraint_2, sourceType, targetType, typeToString(target.immediateBaseConstraint));
                 }
                 if (!message) {
                     if (relation === comparableRelation) {
@@ -42273,24 +43138,38 @@ var ts;
                     reportError(ts.Diagnostics._0_is_a_primitive_but_1_is_a_wrapper_object_Prefer_using_0_when_possible, targetType, sourceType);
                 }
             }
-            function isUnionOrIntersectionTypeWithoutNullableConstituents(type) {
-                if (!(type.flags & 3145728 /* UnionOrIntersection */)) {
+            /**
+             * Try and elaborate array and tuple errors. Returns false
+             * if we have found an elaboration, or we should ignore
+             * any other elaborations when relating the `source` and
+             * `target` types.
+             *
+             * @param source
+             * @param target
+             * @param reportErrors
+             */
+            function tryElaborateArrayLikeErrors(source, target, reportErrors) {
+                if (isTupleLikeType(source)) {
+                    var sourceTuple = source.target;
+                    if (sourceTuple && sourceTuple.readonly && isArrayOrTupleLikeType(target) &&
+                        (!isReadonlyArrayType(target) || isTupleType(target) && !target.target.readonly)) {
+                        if (reportErrors) {
+                            reportError(ts.Diagnostics.The_type_0_is_readonly_and_cannot_be_assigned_to_the_mutable_type_1, typeToString(source), typeToString(target));
+                        }
+                        return false;
+                    }
+                    return isArrayLikeType(target);
+                }
+                if (isTupleLikeType(target)) {
+                    return isArrayLikeType(source);
+                }
+                if (isReadonlyArrayType(source) && isArrayType(target) && !isReadonlyArrayType(target)) {
+                    if (reportErrors) {
+                        reportError(ts.Diagnostics.The_type_0_is_readonly_and_cannot_be_assigned_to_the_mutable_type_1, typeToString(source), typeToString(target));
+                    }
                     return false;
                 }
-                // at this point we know that this is union or intersection type possibly with nullable constituents.
-                // check if we still will have compound type if we ignore nullable components.
-                var seenNonNullable = false;
-                for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
-                    var t = _a[_i];
-                    if (t.flags & 98304 /* Nullable */) {
-                        continue;
-                    }
-                    if (seenNonNullable) {
-                        return true;
-                    }
-                    seenNonNullable = true;
-                }
-                return false;
+                return true;
             }
             /**
              * Compare two types and return
@@ -42312,11 +43191,11 @@ var ts;
                 if (target.flags & 33554432 /* Substitution */) {
                     target = target.typeVariable;
                 }
-                if (source.flags & 8388608 /* IndexedAccess */) {
-                    source = getSimplifiedType(source);
+                if (source.flags & 25165824 /* Simplifiable */) {
+                    source = getSimplifiedType(source, /*writing*/ false);
                 }
-                if (target.flags & 8388608 /* IndexedAccess */) {
-                    target = getSimplifiedType(target);
+                if (target.flags & 25165824 /* Simplifiable */) {
+                    target = getSimplifiedType(target, /*writing*/ true);
                 }
                 // Try to see if we're relating something like `Foo` -> `Bar | null | undefined`.
                 // If so, reporting the `null` and `undefined` in the type is hardly useful.
@@ -42344,7 +43223,8 @@ var ts;
                     isSimpleTypeRelatedTo(source, target, relation, reportErrors ? reportError : undefined))
                     return -1 /* True */;
                 var isComparingJsxAttributes = !!(ts.getObjectFlags(source) & 4096 /* JsxAttributes */);
-                if (isObjectLiteralType(source) && ts.getObjectFlags(source) & 32768 /* FreshLiteral */) {
+                var isPerformingExcessPropertyChecks = (isObjectLiteralType(source) && ts.getObjectFlags(source) & 32768 /* FreshLiteral */);
+                if (isPerformingExcessPropertyChecks) {
                     var discriminantType = target.flags & 1048576 /* Union */ ? findMatchingDiscriminantType(source, target) : undefined;
                     if (hasExcessProperties(source, target, discriminantType, reportErrors)) {
                         if (reportErrors) {
@@ -42352,13 +43232,6 @@ var ts;
                         }
                         return 0 /* False */;
                     }
-                    // Above we check for excess properties with respect to the entire target type. When union
-                    // and intersection types are further deconstructed on the target side, we don't want to
-                    // make the check again (as it might fail for a partial target type). Therefore we obtain
-                    // the regular source type and proceed with that.
-                    if (isUnionOrIntersectionTypeWithoutNullableConstituents(target) && !discriminantType) {
-                        source = getRegularTypeOfObjectLiteral(source);
-                    }
                 }
                 if (relation !== comparableRelation && !isApparentIntersectionConstituent &&
                     source.flags & (131068 /* Primitive */ | 524288 /* Object */ | 2097152 /* Intersection */) && source !== globalObjectType &&
@@ -42391,11 +43264,24 @@ var ts;
                 }
                 else {
                     if (target.flags & 1048576 /* Union */) {
-                        result = typeRelatedToSomeType(source, target, reportErrors && !(source.flags & 131068 /* Primitive */) && !(target.flags & 131068 /* Primitive */));
+                        result = typeRelatedToSomeType(getRegularTypeOfObjectLiteral(source), target, reportErrors && !(source.flags & 131068 /* Primitive */) && !(target.flags & 131068 /* Primitive */));
+                        if (result && isPerformingExcessPropertyChecks) {
+                            // Validate against excess props using the original `source`
+                            var discriminantType = findMatchingDiscriminantType(source, target) || filterPrimitivesIfContainsNonPrimitive(target);
+                            if (!propertiesRelatedTo(source, discriminantType, reportErrors, /*excludedProperties*/ undefined)) {
+                                return 0 /* False */;
+                            }
+                        }
                     }
                     else if (target.flags & 2097152 /* Intersection */) {
                         isIntersectionConstituent = true; // set here to affect the following trio of checks
-                        result = typeRelatedToEachType(source, target, reportErrors);
+                        result = typeRelatedToEachType(getRegularTypeOfObjectLiteral(source), target, reportErrors);
+                        if (result && isPerformingExcessPropertyChecks) {
+                            // Validate against excess props using the original `source`
+                            if (!propertiesRelatedTo(source, target, reportErrors, /*excludedProperties*/ undefined)) {
+                                return 0 /* False */;
+                            }
+                        }
                     }
                     else if (source.flags & 2097152 /* Intersection */) {
                         // Check to see if any constituents of the intersection are immediately related to the target.
@@ -42437,8 +43323,15 @@ var ts;
                     }
                 }
                 if (!result && reportErrors) {
-                    var maybeSuppress = suppressNextError;
-                    suppressNextError = false;
+                    var maybeSuppress = overrideNextErrorInfo;
+                    overrideNextErrorInfo = undefined;
+                    if (source.flags & 524288 /* Object */ && target.flags & 524288 /* Object */) {
+                        var currentError = errorInfo;
+                        tryElaborateArrayLikeErrors(source, target, reportErrors);
+                        if (errorInfo !== currentError) {
+                            maybeSuppress = errorInfo;
+                        }
+                    }
                     if (source.flags & 524288 /* Object */ && target.flags & 131068 /* Primitive */) {
                         tryElaborateErrorsForPrimitivesAndObjects(source, target);
                     }
@@ -42492,7 +43385,7 @@ var ts;
                         // check excess properties against discriminant type only, not the entire union
                         return hasExcessProperties(source, discriminant, /*discriminant*/ undefined, reportErrors);
                     }
-                    var _loop_7 = function (prop) {
+                    var _loop_8 = function (prop) {
                         if (shouldCheckAsExcessProperty(prop, source.symbol) && !isKnownProperty(target, prop.escapedName, isComparingJsxAttributes)) {
                             if (reportErrors) {
                                 // Report error in terms of object types in the target as those are the only ones
@@ -42533,9 +43426,9 @@ var ts;
                             return { value: true };
                         }
                     };
-                    for (var _i = 0, _a = getPropertiesOfObjectType(source); _i < _a.length; _i++) {
+                    for (var _i = 0, _a = getPropertiesOfType(source); _i < _a.length; _i++) {
                         var prop = _a[_i];
-                        var state_3 = _loop_7(prop);
+                        var state_3 = _loop_8(prop);
                         if (typeof state_3 === "object")
                             return state_3.value;
                     }
@@ -42638,10 +43531,19 @@ var ts;
                 }
                 return bestMatch;
             }
+            function filterPrimitivesIfContainsNonPrimitive(type) {
+                if (maybeTypeOfKind(type, 67108864 /* NonPrimitive */)) {
+                    var result_3 = filterType(type, function (t) { return !(t.flags & 131068 /* Primitive */); });
+                    if (!(result_3.flags & 131072 /* Never */)) {
+                        return result_3;
+                    }
+                }
+                return type;
+            }
             // Keep this up-to-date with the same logic within `getApparentTypeOfContextualType`, since they should behave similarly
             function findMatchingDiscriminantType(source, target) {
-                if (target.flags & 1048576 /* Union */) {
-                    var sourceProperties = getPropertiesOfObjectType(source);
+                if (target.flags & 1048576 /* Union */ && source.flags & (2097152 /* Intersection */ | 524288 /* Object */)) {
+                    var sourceProperties = getPropertiesOfType(source);
                     if (sourceProperties) {
                         var sourcePropertiesFiltered = findDiscriminantProperties(sourceProperties, target);
                         if (sourcePropertiesFiltered) {
@@ -42704,13 +43606,20 @@ var ts;
                     // When variance information isn't available we default to covariance. This happens
                     // in the process of computing variance information for recursive types and when
                     // comparing 'this' type arguments.
-                    var variance = i < variances.length ? variances[i] : 1 /* Covariant */;
+                    var varianceFlags = i < variances.length ? variances[i] : 1 /* Covariant */;
+                    var variance = varianceFlags & 7 /* VarianceMask */;
                     // We ignore arguments for independent type parameters (because they're never witnessed).
                     if (variance !== 4 /* Independent */) {
                         var s = sources[i];
                         var t = targets[i];
                         var related = -1 /* True */;
-                        if (variance === 1 /* Covariant */) {
+                        if (varianceFlags & 8 /* Unmeasurable */) {
+                            // Even an `Unmeasurable` variance works out without a structural check if the source and target are _identical_.
+                            // We can't simply assume invariance, because `Unmeasurable` marks nonlinear relations, for example, a relation tained by
+                            // the `-?` modifier in a mapped type (where, no matter how the inputs are related, the outputs still might not be)
+                            related = relation === identityRelation ? isRelatedTo(s, t, /*reportErrors*/ false) : compareTypesIdentical(s, t);
+                        }
+                        else if (variance === 1 /* Covariant */) {
                             related = isRelatedTo(s, t, reportErrors);
                         }
                         else if (variance === 2 /* Contravariant */) {
@@ -42743,6 +43652,17 @@ var ts;
                 }
                 return result;
             }
+            function propagateSidebandVarianceFlags(typeArguments, variances) {
+                for (var i = 0; i < variances.length; i++) {
+                    var v = variances[i];
+                    if (v & 8 /* Unmeasurable */) {
+                        instantiateType(typeArguments[i], reportUnmeasurableMarkers);
+                    }
+                    if (v & 16 /* Unreliable */) {
+                        instantiateType(typeArguments[i], reportUnreliableMarkers);
+                    }
+                }
+            }
             // Determine if possibly recursive types are related. First, check if the result is already available in the global cache.
             // Second, check if we have already started a comparison of the given two types in which case we assume the result to be true.
             // Third, check if both types are part of deeply nested chains of generic type instantiations and if so assume the types are
@@ -42760,6 +43680,16 @@ var ts;
                         // as a failure, and should be updated as a reported failure by the bottom of this function.
                     }
                     else {
+                        if (outofbandVarianceMarkerHandler) {
+                            // We're in the middle of variance checking - integrate any unmeasurable/unreliable flags from this cached component
+                            if (source.flags & (524288 /* Object */ | 16777216 /* Conditional */) && source.aliasSymbol &&
+                                source.aliasTypeArguments && source.aliasSymbol === target.aliasSymbol) {
+                                propagateSidebandVarianceFlags(source.aliasTypeArguments, getAliasVariances(source.aliasSymbol));
+                            }
+                            if (ts.getObjectFlags(source) & 4 /* Reference */ && ts.getObjectFlags(target) & 4 /* Reference */ && source.target === target.target && ts.length(source.typeArguments)) {
+                                propagateSidebandVarianceFlags(source.typeArguments, getVariances(source.target));
+                            }
+                        }
                         return related === 1 /* Succeeded */ ? -1 /* True */ : 0 /* False */;
                     }
                 }
@@ -42817,21 +43747,21 @@ var ts;
                     if (flags & 4194304 /* Index */) {
                         return isRelatedTo(source.type, target.type, /*reportErrors*/ false);
                     }
-                    var result_3 = 0 /* False */;
+                    var result_4 = 0 /* False */;
                     if (flags & 8388608 /* IndexedAccess */) {
-                        if (result_3 = isRelatedTo(source.objectType, target.objectType, /*reportErrors*/ false)) {
-                            if (result_3 &= isRelatedTo(source.indexType, target.indexType, /*reportErrors*/ false)) {
-                                return result_3;
+                        if (result_4 = isRelatedTo(source.objectType, target.objectType, /*reportErrors*/ false)) {
+                            if (result_4 &= isRelatedTo(source.indexType, target.indexType, /*reportErrors*/ false)) {
+                                return result_4;
                             }
                         }
                     }
                     if (flags & 16777216 /* Conditional */) {
                         if (source.root.isDistributive === target.root.isDistributive) {
-                            if (result_3 = isRelatedTo(source.checkType, target.checkType, /*reportErrors*/ false)) {
-                                if (result_3 &= isRelatedTo(source.extendsType, target.extendsType, /*reportErrors*/ false)) {
-                                    if (result_3 &= isRelatedTo(getTrueTypeFromConditionalType(source), getTrueTypeFromConditionalType(target), /*reportErrors*/ false)) {
-                                        if (result_3 &= isRelatedTo(getFalseTypeFromConditionalType(source), getFalseTypeFromConditionalType(target), /*reportErrors*/ false)) {
-                                            return result_3;
+                            if (result_4 = isRelatedTo(source.checkType, target.checkType, /*reportErrors*/ false)) {
+                                if (result_4 &= isRelatedTo(source.extendsType, target.extendsType, /*reportErrors*/ false)) {
+                                    if (result_4 &= isRelatedTo(getTrueTypeFromConditionalType(source), getTrueTypeFromConditionalType(target), /*reportErrors*/ false)) {
+                                        if (result_4 &= isRelatedTo(getFalseTypeFromConditionalType(source), getFalseTypeFromConditionalType(target), /*reportErrors*/ false)) {
+                                            return result_4;
                                         }
                                     }
                                 }
@@ -42880,8 +43810,7 @@ var ts;
                     }
                     // A type S is assignable to keyof T if S is assignable to keyof C, where C is the
                     // simplified form of T or, if T doesn't simplify, the constraint of T.
-                    var simplified = getSimplifiedType(target.type);
-                    var constraint = simplified !== target.type ? simplified : getConstraintOfType(target.type);
+                    var constraint = getSimplifiedTypeOrConstraint(target.type);
                     if (constraint) {
                         // We require Ternary.True here such that circular constraints don't cause
                         // false positives. For example, given 'T extends { [K in keyof T]: string }',
@@ -42893,13 +43822,17 @@ var ts;
                     }
                 }
                 else if (target.flags & 8388608 /* IndexedAccess */) {
-                    // A type S is related to a type T[K], where T and K aren't both type variables, if S is related to C,
-                    // where C is the base constraint of T[K]
-                    if (relation !== identityRelation &&
-                        !(isGenericObjectType(target.objectType) && isGenericIndexType(target.indexType))) {
-                        var constraint = getBaseConstraintOfType(target);
-                        if (constraint && constraint !== target) {
-                            if (result = isRelatedTo(source, constraint, reportErrors)) {
+                    // A type S is related to a type T[K] if S is related to C, where C is the base
+                    // constraint of T[K] for writing.
+                    if (relation !== identityRelation) {
+                        var objectType = target.objectType;
+                        var indexType = target.indexType;
+                        var baseObjectType = getBaseConstraintOfType(objectType) || objectType;
+                        var baseIndexType = getBaseConstraintOfType(indexType) || indexType;
+                        if (!isGenericObjectType(baseObjectType) && !isGenericIndexType(baseIndexType)) {
+                            var accessFlags = 2 /* Writing */ | (baseObjectType !== objectType ? 1 /* NoIndexSignatures */ : 0);
+                            var constraint = getIndexedAccessTypeOrUndefined(baseObjectType, baseIndexType, /*accessNode*/ undefined, accessFlags);
+                            if (constraint && (result = isRelatedTo(source, constraint, reportErrors))) {
                                 return result;
                             }
                         }
@@ -42916,15 +43849,16 @@ var ts;
                         }
                         if (!isGenericMappedType(source)) {
                             var targetConstraint = getConstraintTypeFromMappedType(target);
-                            var sourceKeys_1 = getIndexType(source);
-                            var hasOptionalUnionKeys = modifiers & 4 /* IncludeOptional */ && targetConstraint.flags & 1048576 /* Union */;
-                            var filteredByApplicability = hasOptionalUnionKeys ? filterType(targetConstraint, function (t) { return !!isRelatedTo(t, sourceKeys_1); }) : undefined;
+                            var sourceKeys = getIndexType(source, /*stringsOnly*/ undefined, /*noIndexSignatures*/ true);
+                            var includeOptional = modifiers & 4 /* IncludeOptional */;
+                            var filteredByApplicability = includeOptional ? intersectTypes(targetConstraint, sourceKeys) : undefined;
                             // A source type T is related to a target type { [P in Q]: X } if Q is related to keyof T and T[Q] is related to X.
                             // A source type T is related to a target type { [P in Q]?: X } if some constituent Q' of Q is related to keyof T and T[Q'] is related to X.
-                            if (hasOptionalUnionKeys
+                            if (includeOptional
                                 ? !(filteredByApplicability.flags & 131072 /* Never */)
-                                : isRelatedTo(targetConstraint, sourceKeys_1)) {
-                                var indexingType = hasOptionalUnionKeys ? filteredByApplicability : getTypeParameterFromMappedType(target);
+                                : isRelatedTo(targetConstraint, sourceKeys)) {
+                                var typeParameter = getTypeParameterFromMappedType(target);
+                                var indexingType = filteredByApplicability ? getIntersectionType([filteredByApplicability, typeParameter]) : typeParameter;
                                 var indexedAccessType = getIndexedAccessType(source, indexingType);
                                 var templateType = getTemplateTypeFromMappedType(target);
                                 if (result = isRelatedTo(indexedAccessType, templateType, reportErrors)) {
@@ -42947,23 +43881,25 @@ var ts;
                             return result;
                         }
                     }
-                    var constraint = getConstraintOfType(source);
-                    if (!constraint || (source.flags & 262144 /* TypeParameter */ && constraint.flags & 1 /* Any */)) {
-                        // A type variable with no constraint is not related to the non-primitive object type.
-                        if (result = isRelatedTo(emptyObjectType, extractTypesOfKind(target, ~67108864 /* NonPrimitive */))) {
+                    else {
+                        var constraint = getConstraintOfType(source);
+                        if (!constraint || (source.flags & 262144 /* TypeParameter */ && constraint.flags & 1 /* Any */)) {
+                            // A type variable with no constraint is not related to the non-primitive object type.
+                            if (result = isRelatedTo(emptyObjectType, extractTypesOfKind(target, ~67108864 /* NonPrimitive */))) {
+                                errorInfo = saveErrorInfo;
+                                return result;
+                            }
+                        }
+                        // hi-speed no-this-instantiation check (less accurate, but avoids costly `this`-instantiation when the constraint will suffice), see #28231 for report on why this is needed
+                        else if (result = isRelatedTo(constraint, target, /*reportErrors*/ false, /*headMessage*/ undefined, isIntersectionConstituent)) {
+                            errorInfo = saveErrorInfo;
+                            return result;
+                        }
+                        // slower, fuller, this-instantiated check (necessary when comparing raw `this` types from base classes), see `subclassWithPolymorphicThisIsAssignable.ts` test for example
+                        else if (result = isRelatedTo(getTypeWithThisArgument(constraint, source), target, reportErrors, /*headMessage*/ undefined, isIntersectionConstituent)) {
                             errorInfo = saveErrorInfo;
                             return result;
                         }
-                    }
-                    // hi-speed no-this-instantiation check (less accurate, but avoids costly `this`-instantiation when the constraint will suffice), see #28231 for report on why this is needed
-                    else if (result = isRelatedTo(constraint, target, /*reportErrors*/ false, /*headMessage*/ undefined, isIntersectionConstituent)) {
-                        errorInfo = saveErrorInfo;
-                        return result;
-                    }
-                    // slower, fuller, this-instantiated check (necessary when comparing raw `this` types from base classes), see `subclassWithPolymorphicThisIsAssignable.ts` test for example
-                    else if (result = isRelatedTo(getTypeWithThisArgument(constraint, source), target, reportErrors, /*headMessage*/ undefined, isIntersectionConstituent)) {
-                        errorInfo = saveErrorInfo;
-                        return result;
                     }
                 }
                 else if (source.flags & 4194304 /* Index */) {
@@ -43023,6 +43959,9 @@ var ts;
                     if (relation !== identityRelation) {
                         source = getApparentType(source);
                     }
+                    else if (isGenericMappedType(source)) {
+                        return 0 /* False */;
+                    }
                     if (ts.getObjectFlags(source) & 4 /* Reference */ && ts.getObjectFlags(target) & 4 /* Reference */ && source.target === target.target &&
                         !(ts.getObjectFlags(source) & 8192 /* MarkerType */ || ts.getObjectFlags(target) & 8192 /* MarkerType */)) {
                         // We have type references to the same generic type, and the type references are not marker
@@ -43035,7 +43974,14 @@ var ts;
                         }
                     }
                     else if (isReadonlyArrayType(target) ? isArrayType(source) || isTupleType(source) : isArrayType(target) && isTupleType(source) && !source.target.readonly) {
-                        return isRelatedTo(getIndexTypeOfType(source, 1 /* Number */) || anyType, getIndexTypeOfType(target, 1 /* Number */) || anyType, reportErrors);
+                        if (relation !== identityRelation) {
+                            return isRelatedTo(getIndexTypeOfType(source, 1 /* Number */) || anyType, getIndexTypeOfType(target, 1 /* Number */) || anyType, reportErrors);
+                        }
+                        else {
+                            // By flags alone, we know that the `target` is a readonly array while the source is a normal array or tuple
+                            // or `target` is an array and source is a tuple - in both cases the types cannot be identical, by construction
+                            return 0 /* False */;
+                        }
                     }
                     // Consider a fresh empty object literal type "closed" under the subtype relationship - this way `{} <- {[idx: string]: any} <- fresh({})`
                     // and not `{} <- fresh({}) <- {[idx: string]: any}`
@@ -43050,7 +43996,7 @@ var ts;
                     if (source.flags & (524288 /* Object */ | 2097152 /* Intersection */) && target.flags & 524288 /* Object */) {
                         // Report structural errors only if we haven't reported any errors yet
                         var reportStructuralErrors = reportErrors && errorInfo === saveErrorInfo && !sourceIsPrimitive;
-                        result = propertiesRelatedTo(source, target, reportStructuralErrors);
+                        result = propertiesRelatedTo(source, target, reportStructuralErrors, /*excludedProperties*/ undefined);
                         if (result) {
                             result &= signaturesRelatedTo(source, target, 0 /* Call */, reportStructuralErrors);
                             if (result) {
@@ -43070,22 +44016,35 @@ var ts;
                             return result;
                         }
                     }
+                    // If S is an object type and T is a discriminated union, S may be related to T if
+                    // there exists a constituent of T for every combination of the discriminants of S
+                    // with respect to T. We do not report errors here, as we will use the existing
+                    // error result from checking each constituent of the union.
+                    if (source.flags & (524288 /* Object */ | 2097152 /* Intersection */) && target.flags & 1048576 /* Union */) {
+                        var objectOnlyTarget = extractTypesOfKind(target, 524288 /* Object */);
+                        if (objectOnlyTarget.flags & 1048576 /* Union */) {
+                            var result_5 = typeRelatedToDiscriminatedType(source, objectOnlyTarget);
+                            if (result_5) {
+                                return result_5;
+                            }
+                        }
+                    }
                 }
                 return 0 /* False */;
-                function isNonGeneric(type) {
-                    // If we're already in identity relationship checking, we should use `isRelatedTo`
-                    // to catch the `Maybe` from an excessively deep type (which we then assume means
-                    // that the type could possibly contain a generic)
-                    if (relation === identityRelation) {
-                        return isRelatedTo(type, getPermissiveInstantiation(type)) === -1 /* True */;
-                    }
-                    return isTypeIdenticalTo(type, getPermissiveInstantiation(type));
-                }
                 function relateVariances(sourceTypeArguments, targetTypeArguments, variances) {
                     if (result = typeArgumentsRelatedTo(sourceTypeArguments, targetTypeArguments, variances, reportErrors)) {
                         return result;
                     }
-                    var allowStructuralFallback = (targetTypeArguments && hasCovariantVoidArgument(targetTypeArguments, variances)) || isNonGeneric(source) || isNonGeneric(target);
+                    if (ts.some(variances, function (v) { return !!(v & 24 /* AllowsStructuralFallback */); })) {
+                        // If some type parameter was `Unmeasurable` or `Unreliable`, and we couldn't pass by assuming it was identical, then we
+                        // have to allow a structural fallback check
+                        // We elide the variance-based error elaborations, since those might not be too helpful, since we'll potentially
+                        // be assuming identity of the type parameter.
+                        originalErrorInfo = undefined;
+                        errorInfo = saveErrorInfo;
+                        return undefined;
+                    }
+                    var allowStructuralFallback = targetTypeArguments && hasCovariantVoidArgument(targetTypeArguments, variances);
                     varianceCheckFailed = !allowStructuralFallback;
                     // The type arguments did not relate appropriately, but it may be because we have no variance
                     // information (in which case typeArgumentsRelatedTo defaulted to covariance for all type
@@ -43103,7 +44062,7 @@ var ts;
                         // reveal the reason).
                         // We can switch on `reportErrors` here, since varianceCheckFailed guarantees we return `False`,
                         // we can return `False` early here to skip calculating the structural error message we don't need.
-                        if (varianceCheckFailed && !(reportErrors && ts.some(variances, function (v) { return v === 0 /* Invariant */; }))) {
+                        if (varianceCheckFailed && !(reportErrors && ts.some(variances, function (v) { return (v & 7 /* VarianceMask */) === 0 /* Invariant */; }))) {
                             return 0 /* False */;
                         }
                         // We remember the original error information so we can restore it in case the structural
@@ -43114,6 +44073,18 @@ var ts;
                     }
                 }
             }
+            function reportUnmeasurableMarkers(p) {
+                if (outofbandVarianceMarkerHandler && (p === markerSuperType || p === markerSubType || p === markerOtherType)) {
+                    outofbandVarianceMarkerHandler(/*onlyUnreliable*/ false);
+                }
+                return p;
+            }
+            function reportUnreliableMarkers(p) {
+                if (outofbandVarianceMarkerHandler && (p === markerSuperType || p === markerSubType || p === markerOtherType)) {
+                    outofbandVarianceMarkerHandler(/*onlyUnreliable*/ true);
+                }
+                return p;
+            }
             // A type [P in S]: X is related to a type [Q in T]: Y if T is related to S and X' is
             // related to Y, where X' is an instantiation of X in which P is replaced with Q. Notice
             // that S and T are contra-variant whereas X and Y are co-variant.
@@ -43121,45 +44092,281 @@ var ts;
                 var modifiersRelated = relation === comparableRelation || (relation === identityRelation ? getMappedTypeModifiers(source) === getMappedTypeModifiers(target) :
                     getCombinedMappedTypeOptionality(source) <= getCombinedMappedTypeOptionality(target));
                 if (modifiersRelated) {
-                    var result_4;
-                    if (result_4 = isRelatedTo(getConstraintTypeFromMappedType(target), getConstraintTypeFromMappedType(source), reportErrors)) {
+                    var result_6;
+                    var targetConstraint = getConstraintTypeFromMappedType(target);
+                    var sourceConstraint = instantiateType(getConstraintTypeFromMappedType(source), getCombinedMappedTypeOptionality(source) < 0 ? reportUnmeasurableMarkers : reportUnreliableMarkers);
+                    if (result_6 = isRelatedTo(targetConstraint, sourceConstraint, reportErrors)) {
                         var mapper = createTypeMapper([getTypeParameterFromMappedType(source)], [getTypeParameterFromMappedType(target)]);
-                        return result_4 & isRelatedTo(instantiateType(getTemplateTypeFromMappedType(source), mapper), getTemplateTypeFromMappedType(target), reportErrors);
+                        return result_6 & isRelatedTo(instantiateType(getTemplateTypeFromMappedType(source), mapper), getTemplateTypeFromMappedType(target), reportErrors);
                     }
                 }
                 return 0 /* False */;
             }
-            function propertiesRelatedTo(source, target, reportErrors) {
+            function typeRelatedToDiscriminatedType(source, target) {
+                // 1. Generate the combinations of discriminant properties & types 'source' can satisfy.
+                //    a. If the number of combinations is above a set limit, the comparison is too complex.
+                // 2. Filter 'target' to the subset of types whose discriminants exist in the matrix.
+                //    a. If 'target' does not satisfy all discriminants in the matrix, 'source' is not related.
+                // 3. For each type in the filtered 'target', determine if all non-discriminant properties of
+                //    'target' are related to a property in 'source'.
+                //
+                // NOTE: See ~/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithDiscriminatedUnion.ts
+                //       for examples.
+                var sourceProperties = getPropertiesOfObjectType(source);
+                var sourcePropertiesFiltered = findDiscriminantProperties(sourceProperties, target);
+                if (!sourcePropertiesFiltered)
+                    return 0 /* False */;
+                // Though we could compute the number of combinations as we generate
+                // the matrix, this would incur additional memory overhead due to
+                // array allocations. To reduce this overhead, we first compute
+                // the number of combinations to ensure we will not surpass our
+                // fixed limit before incurring the cost of any allocations:
+                var numCombinations = 1;
+                for (var _i = 0, sourcePropertiesFiltered_1 = sourcePropertiesFiltered; _i < sourcePropertiesFiltered_1.length; _i++) {
+                    var sourceProperty = sourcePropertiesFiltered_1[_i];
+                    numCombinations *= countTypes(getTypeOfSymbol(sourceProperty));
+                    if (numCombinations > 25) {
+                        // We've reached the complexity limit.
+                        return 0 /* False */;
+                    }
+                }
+                // Compute the set of types for each discriminant property.
+                var sourceDiscriminantTypes = new Array(sourcePropertiesFiltered.length);
+                var excludedProperties = ts.createUnderscoreEscapedMap();
+                for (var i = 0; i < sourcePropertiesFiltered.length; i++) {
+                    var sourceProperty = sourcePropertiesFiltered[i];
+                    var sourcePropertyType = getTypeOfSymbol(sourceProperty);
+                    sourceDiscriminantTypes[i] = sourcePropertyType.flags & 1048576 /* Union */
+                        ? sourcePropertyType.types
+                        : [sourcePropertyType];
+                    excludedProperties.set(sourceProperty.escapedName, true);
+                }
+                // Match each combination of the cartesian product of discriminant properties to one or more
+                // constituents of 'target'. If any combination does not have a match then 'source' is not relatable.
+                var discriminantCombinations = ts.cartesianProduct(sourceDiscriminantTypes);
+                var matchingTypes = [];
+                var _loop_9 = function (combination) {
+                    var hasMatch = false;
+                    outer: for (var _i = 0, _a = target.types; _i < _a.length; _i++) {
+                        var type = _a[_i];
+                        var _loop_10 = function (i) {
+                            var sourceProperty = sourcePropertiesFiltered[i];
+                            var targetProperty = getPropertyOfObjectType(type, sourceProperty.escapedName);
+                            if (!targetProperty)
+                                return "continue-outer";
+                            if (sourceProperty === targetProperty)
+                                return "continue";
+                            // We compare the source property to the target in the context of a single discriminant type.
+                            var related = propertyRelatedTo(source, target, sourceProperty, targetProperty, function (_) { return combination[i]; }, /*reportErrors*/ false);
+                            // If the target property could not be found, or if the properties were not related,
+                            // then this constituent is not a match.
+                            if (!related) {
+                                return "continue-outer";
+                            }
+                        };
+                        for (var i = 0; i < sourcePropertiesFiltered.length; i++) {
+                            var state_5 = _loop_10(i);
+                            switch (state_5) {
+                                case "continue-outer": continue outer;
+                            }
+                        }
+                        ts.pushIfUnique(matchingTypes, type, ts.equateValues);
+                        hasMatch = true;
+                    }
+                    if (!hasMatch) {
+                        return { value: 0 /* False */ };
+                    }
+                };
+                for (var _a = 0, discriminantCombinations_1 = discriminantCombinations; _a < discriminantCombinations_1.length; _a++) {
+                    var combination = discriminantCombinations_1[_a];
+                    var state_4 = _loop_9(combination);
+                    if (typeof state_4 === "object")
+                        return state_4.value;
+                }
+                // Compare the remaining non-discriminant properties of each match.
+                var result = -1 /* True */;
+                for (var _b = 0, matchingTypes_1 = matchingTypes; _b < matchingTypes_1.length; _b++) {
+                    var type = matchingTypes_1[_b];
+                    result &= propertiesRelatedTo(source, type, /*reportErrors*/ false, excludedProperties);
+                    if (result) {
+                        result &= signaturesRelatedTo(source, type, 0 /* Call */, /*reportStructuralErrors*/ false);
+                        if (result) {
+                            result &= signaturesRelatedTo(source, type, 1 /* Construct */, /*reportStructuralErrors*/ false);
+                            if (result) {
+                                result &= indexTypesRelatedTo(source, type, 0 /* String */, /*sourceIsPrimitive*/ false, /*reportStructuralErrors*/ false);
+                                if (result) {
+                                    result &= indexTypesRelatedTo(source, type, 1 /* Number */, /*sourceIsPrimitive*/ false, /*reportStructuralErrors*/ false);
+                                }
+                            }
+                        }
+                    }
+                    if (!result) {
+                        return result;
+                    }
+                }
+                return result;
+            }
+            function excludeProperties(properties, excludedProperties) {
+                if (!excludedProperties || properties.length === 0)
+                    return properties;
+                var result;
+                for (var i = 0; i < properties.length; i++) {
+                    if (!excludedProperties.has(properties[i].escapedName)) {
+                        if (result) {
+                            result.push(properties[i]);
+                        }
+                    }
+                    else if (!result) {
+                        result = properties.slice(0, i);
+                    }
+                }
+                return result || properties;
+            }
+            function isPropertySymbolTypeRelated(sourceProp, targetProp, getTypeOfSourceProperty, reportErrors) {
+                var targetIsOptional = strictNullChecks && !!(ts.getCheckFlags(targetProp) & 48 /* Partial */);
+                var source = getTypeOfSourceProperty(sourceProp);
+                if (ts.getCheckFlags(targetProp) & 65536 /* DeferredType */ && !getSymbolLinks(targetProp).type) {
+                    // Rather than resolving (and normalizing) the type, relate constituent-by-constituent without performing normalization or seconadary passes
+                    var links = getSymbolLinks(targetProp);
+                    ts.Debug.assertDefined(links.deferralParent);
+                    ts.Debug.assertDefined(links.deferralConstituents);
+                    var unionParent = !!(links.deferralParent.flags & 1048576 /* Union */);
+                    var result_7 = unionParent ? 0 /* False */ : -1 /* True */;
+                    var targetTypes = links.deferralConstituents;
+                    for (var _i = 0, targetTypes_3 = targetTypes; _i < targetTypes_3.length; _i++) {
+                        var targetType = targetTypes_3[_i];
+                        var related = isRelatedTo(source, targetType, /*reportErrors*/ false, /*headMessage*/ undefined, /*isIntersectionConstituent*/ !unionParent);
+                        if (!unionParent) {
+                            if (!related) {
+                                // Can't assign to a target individually - have to fallback to assigning to the _whole_ intersection (which forces normalization)
+                                return isRelatedTo(source, addOptionality(getTypeOfSymbol(targetProp), targetIsOptional), reportErrors);
+                            }
+                            result_7 &= related;
+                        }
+                        else {
+                            if (related) {
+                                return related;
+                            }
+                        }
+                    }
+                    if (unionParent && !result_7 && targetIsOptional) {
+                        result_7 = isRelatedTo(source, undefinedType);
+                    }
+                    if (unionParent && !result_7 && reportErrors) {
+                        // The easiest way to get the right errors here is to un-defer (which may be costly)
+                        // If it turns out this is too costly too often, we can replicate the error handling logic within
+                        // typeRelatedToSomeType without the discriminatable type branch (as that requires a manifest union
+                        // type on which to hand discriminable properties, which we are expressly trying to avoid here)
+                        return isRelatedTo(source, addOptionality(getTypeOfSymbol(targetProp), targetIsOptional), reportErrors);
+                    }
+                    return result_7;
+                }
+                else {
+                    return isRelatedTo(source, addOptionality(getTypeOfSymbol(targetProp), targetIsOptional), reportErrors);
+                }
+            }
+            function propertyRelatedTo(source, target, sourceProp, targetProp, getTypeOfSourceProperty, reportErrors) {
+                var sourcePropFlags = ts.getDeclarationModifierFlagsFromSymbol(sourceProp);
+                var targetPropFlags = ts.getDeclarationModifierFlagsFromSymbol(targetProp);
+                if (sourcePropFlags & 8 /* Private */ || targetPropFlags & 8 /* Private */) {
+                    var hasDifferingDeclarations = sourceProp.valueDeclaration !== targetProp.valueDeclaration;
+                    if (ts.getCheckFlags(sourceProp) & 1024 /* ContainsPrivate */ && hasDifferingDeclarations) {
+                        if (reportErrors) {
+                            reportError(ts.Diagnostics.Property_0_has_conflicting_declarations_and_is_inaccessible_in_type_1, symbolToString(sourceProp), typeToString(source));
+                        }
+                        return 0 /* False */;
+                    }
+                    if (hasDifferingDeclarations) {
+                        if (reportErrors) {
+                            if (sourcePropFlags & 8 /* Private */ && targetPropFlags & 8 /* Private */) {
+                                reportError(ts.Diagnostics.Types_have_separate_declarations_of_a_private_property_0, symbolToString(targetProp));
+                            }
+                            else {
+                                reportError(ts.Diagnostics.Property_0_is_private_in_type_1_but_not_in_type_2, symbolToString(targetProp), typeToString(sourcePropFlags & 8 /* Private */ ? source : target), typeToString(sourcePropFlags & 8 /* Private */ ? target : source));
+                            }
+                        }
+                        return 0 /* False */;
+                    }
+                }
+                else if (targetPropFlags & 16 /* Protected */) {
+                    if (!isValidOverrideOf(sourceProp, targetProp)) {
+                        if (reportErrors) {
+                            reportError(ts.Diagnostics.Property_0_is_protected_but_type_1_is_not_a_class_derived_from_2, symbolToString(targetProp), typeToString(getDeclaringClass(sourceProp) || source), typeToString(getDeclaringClass(targetProp) || target));
+                        }
+                        return 0 /* False */;
+                    }
+                }
+                else if (sourcePropFlags & 16 /* Protected */) {
+                    if (reportErrors) {
+                        reportError(ts.Diagnostics.Property_0_is_protected_in_type_1_but_public_in_type_2, symbolToString(targetProp), typeToString(source), typeToString(target));
+                    }
+                    return 0 /* False */;
+                }
+                // If the target comes from a partial union prop, allow `undefined` in the target type
+                var related = isPropertySymbolTypeRelated(sourceProp, targetProp, getTypeOfSourceProperty, reportErrors);
+                if (!related) {
+                    if (reportErrors) {
+                        reportError(ts.Diagnostics.Types_of_property_0_are_incompatible, symbolToString(targetProp));
+                    }
+                    return 0 /* False */;
+                }
+                // When checking for comparability, be more lenient with optional properties.
+                if (relation !== comparableRelation && sourceProp.flags & 16777216 /* Optional */ && !(targetProp.flags & 16777216 /* Optional */)) {
+                    // TypeScript 1.0 spec (April 2014): 3.8.3
+                    // S is a subtype of a type T, and T is a supertype of S if ...
+                    // S' and T are object types and, for each member M in T..
+                    // M is a property and S' contains a property N where
+                    // if M is a required property, N is also a required property
+                    // (M - property in T)
+                    // (N - property in S)
+                    if (reportErrors) {
+                        reportError(ts.Diagnostics.Property_0_is_optional_in_type_1_but_required_in_type_2, symbolToString(targetProp), typeToString(source), typeToString(target));
+                    }
+                    return 0 /* False */;
+                }
+                return related;
+            }
+            function propertiesRelatedTo(source, target, reportErrors, excludedProperties) {
                 if (relation === identityRelation) {
-                    return propertiesIdenticalTo(source, target);
+                    return propertiesIdenticalTo(source, target, excludedProperties);
                 }
                 var requireOptionalProperties = relation === subtypeRelation && !isObjectLiteralType(source) && !isEmptyArrayLiteralType(source) && !isTupleType(source);
                 var unmatchedProperty = getUnmatchedProperty(source, target, requireOptionalProperties, /*matchDiscriminantProperties*/ false);
                 if (unmatchedProperty) {
                     if (reportErrors) {
                         var props = ts.arrayFrom(getUnmatchedProperties(source, target, requireOptionalProperties, /*matchDiscriminantProperties*/ false));
+                        var shouldSkipElaboration = false;
                         if (!headMessage || (headMessage.code !== ts.Diagnostics.Class_0_incorrectly_implements_interface_1.code &&
                             headMessage.code !== ts.Diagnostics.Class_0_incorrectly_implements_class_1_Did_you_mean_to_extend_1_and_inherit_its_members_as_a_subclass.code)) {
-                            suppressNextError = true; // Retain top-level error for interface implementing issues, otherwise omit it
+                            shouldSkipElaboration = true; // Retain top-level error for interface implementing issues, otherwise omit it
                         }
                         if (props.length === 1) {
                             var propName = symbolToString(unmatchedProperty);
-                            reportError(ts.Diagnostics.Property_0_is_missing_in_type_1_but_required_in_type_2, propName, typeToString(source), typeToString(target));
+                            reportError.apply(void 0, [ts.Diagnostics.Property_0_is_missing_in_type_1_but_required_in_type_2, propName].concat(getTypeNamesForErrorDisplay(source, target)));
                             if (ts.length(unmatchedProperty.declarations)) {
                                 associateRelatedInfo(ts.createDiagnosticForNode(unmatchedProperty.declarations[0], ts.Diagnostics._0_is_declared_here, propName));
                             }
+                            if (shouldSkipElaboration) {
+                                overrideNextErrorInfo = errorInfo;
+                            }
                         }
-                        else if (props.length > 5) { // arbitrary cutoff for too-long list form
-                            reportError(ts.Diagnostics.Type_0_is_missing_the_following_properties_from_type_1_Colon_2_and_3_more, typeToString(source), typeToString(target), ts.map(props.slice(0, 4), function (p) { return symbolToString(p); }).join(", "), props.length - 4);
-                        }
-                        else {
-                            reportError(ts.Diagnostics.Type_0_is_missing_the_following_properties_from_type_1_Colon_2, typeToString(source), typeToString(target), ts.map(props, function (p) { return symbolToString(p); }).join(", "));
+                        else if (tryElaborateArrayLikeErrors(source, target, /*reportErrors*/ false)) {
+                            if (props.length > 5) { // arbitrary cutoff for too-long list form
+                                reportError(ts.Diagnostics.Type_0_is_missing_the_following_properties_from_type_1_Colon_2_and_3_more, typeToString(source), typeToString(target), ts.map(props.slice(0, 4), function (p) { return symbolToString(p); }).join(", "), props.length - 4);
+                            }
+                            else {
+                                reportError(ts.Diagnostics.Type_0_is_missing_the_following_properties_from_type_1_Colon_2, typeToString(source), typeToString(target), ts.map(props, function (p) { return symbolToString(p); }).join(", "));
+                            }
+                            if (shouldSkipElaboration) {
+                                overrideNextErrorInfo = errorInfo;
+                            }
                         }
+                        // ELSE: No array like or unmatched property error - just issue top level error (errorInfo = undefined)
                     }
                     return 0 /* False */;
                 }
                 if (isObjectLiteralType(target)) {
-                    for (var _i = 0, _a = getPropertiesOfType(source); _i < _a.length; _i++) {
+                    for (var _i = 0, _a = excludeProperties(getPropertiesOfType(source), excludedProperties); _i < _a.length; _i++) {
                         var sourceProp = _a[_i];
                         if (!getPropertyOfObjectType(target, sourceProp.escapedName)) {
                             var sourceType = getTypeOfSymbol(sourceProp);
@@ -43200,84 +44407,30 @@ var ts;
                         }
                     }
                 }
-                var properties = getPropertiesOfObjectType(target);
-                for (var _b = 0, properties_2 = properties; _b < properties_2.length; _b++) {
-                    var targetProp = properties_2[_b];
+                // We only call this for union target types when we're attempting to do excess property checking - in those cases, we want to get _all possible props_
+                // from the target union, across all members
+                var properties = target.flags & 1048576 /* Union */ ? getPossiblePropertiesOfUnionType(target) : getPropertiesOfType(target);
+                for (var _b = 0, _c = excludeProperties(properties, excludedProperties); _b < _c.length; _b++) {
+                    var targetProp = _c[_b];
                     if (!(targetProp.flags & 4194304 /* Prototype */)) {
                         var sourceProp = getPropertyOfType(source, targetProp.escapedName);
                         if (sourceProp && sourceProp !== targetProp) {
-                            if (isIgnoredJsxProperty(source, sourceProp, getTypeOfSymbol(targetProp))) {
-                                continue;
-                            }
-                            var sourcePropFlags = ts.getDeclarationModifierFlagsFromSymbol(sourceProp);
-                            var targetPropFlags = ts.getDeclarationModifierFlagsFromSymbol(targetProp);
-                            if (sourcePropFlags & 8 /* Private */ || targetPropFlags & 8 /* Private */) {
-                                var hasDifferingDeclarations = sourceProp.valueDeclaration !== targetProp.valueDeclaration;
-                                if (ts.getCheckFlags(sourceProp) & 512 /* ContainsPrivate */ && hasDifferingDeclarations) {
-                                    if (reportErrors) {
-                                        reportError(ts.Diagnostics.Property_0_has_conflicting_declarations_and_is_inaccessible_in_type_1, symbolToString(sourceProp), typeToString(source));
-                                    }
-                                    return 0 /* False */;
-                                }
-                                if (hasDifferingDeclarations) {
-                                    if (reportErrors) {
-                                        if (sourcePropFlags & 8 /* Private */ && targetPropFlags & 8 /* Private */) {
-                                            reportError(ts.Diagnostics.Types_have_separate_declarations_of_a_private_property_0, symbolToString(targetProp));
-                                        }
-                                        else {
-                                            reportError(ts.Diagnostics.Property_0_is_private_in_type_1_but_not_in_type_2, symbolToString(targetProp), typeToString(sourcePropFlags & 8 /* Private */ ? source : target), typeToString(sourcePropFlags & 8 /* Private */ ? target : source));
-                                        }
-                                    }
-                                    return 0 /* False */;
-                                }
-                            }
-                            else if (targetPropFlags & 16 /* Protected */) {
-                                if (!isValidOverrideOf(sourceProp, targetProp)) {
-                                    if (reportErrors) {
-                                        reportError(ts.Diagnostics.Property_0_is_protected_but_type_1_is_not_a_class_derived_from_2, symbolToString(targetProp), typeToString(getDeclaringClass(sourceProp) || source), typeToString(getDeclaringClass(targetProp) || target));
-                                    }
-                                    return 0 /* False */;
-                                }
-                            }
-                            else if (sourcePropFlags & 16 /* Protected */) {
-                                if (reportErrors) {
-                                    reportError(ts.Diagnostics.Property_0_is_protected_in_type_1_but_public_in_type_2, symbolToString(targetProp), typeToString(source), typeToString(target));
-                                }
-                                return 0 /* False */;
-                            }
-                            var related = isRelatedTo(getTypeOfSymbol(sourceProp), getTypeOfSymbol(targetProp), reportErrors);
+                            var related = propertyRelatedTo(source, target, sourceProp, targetProp, getTypeOfSymbol, reportErrors);
                             if (!related) {
-                                if (reportErrors) {
-                                    reportError(ts.Diagnostics.Types_of_property_0_are_incompatible, symbolToString(targetProp));
-                                }
                                 return 0 /* False */;
                             }
                             result &= related;
-                            // When checking for comparability, be more lenient with optional properties.
-                            if (relation !== comparableRelation && sourceProp.flags & 16777216 /* Optional */ && !(targetProp.flags & 16777216 /* Optional */)) {
-                                // TypeScript 1.0 spec (April 2014): 3.8.3
-                                // S is a subtype of a type T, and T is a supertype of S if ...
-                                // S' and T are object types and, for each member M in T..
-                                // M is a property and S' contains a property N where
-                                // if M is a required property, N is also a required property
-                                // (M - property in T)
-                                // (N - property in S)
-                                if (reportErrors) {
-                                    reportError(ts.Diagnostics.Property_0_is_optional_in_type_1_but_required_in_type_2, symbolToString(targetProp), typeToString(source), typeToString(target));
-                                }
-                                return 0 /* False */;
-                            }
                         }
                     }
                 }
                 return result;
             }
-            function propertiesIdenticalTo(source, target) {
+            function propertiesIdenticalTo(source, target, excludedProperties) {
                 if (!(source.flags & 524288 /* Object */ && target.flags & 524288 /* Object */)) {
                     return 0 /* False */;
                 }
-                var sourceProperties = getPropertiesOfObjectType(source);
-                var targetProperties = getPropertiesOfObjectType(target);
+                var sourceProperties = excludeProperties(getPropertiesOfObjectType(source), excludedProperties);
+                var targetProperties = excludeProperties(getPropertiesOfObjectType(target), excludedProperties);
                 if (sourceProperties.length !== targetProperties.length) {
                     return 0 /* False */;
                 }
@@ -43397,7 +44550,7 @@ var ts;
                 var result = -1 /* True */;
                 for (var _i = 0, _a = getPropertiesOfObjectType(source); _i < _a.length; _i++) {
                     var prop = _a[_i];
-                    if (isIgnoredJsxProperty(source, prop, /*targetMemberType*/ undefined)) {
+                    if (isIgnoredJsxProperty(source, prop)) {
                         continue;
                     }
                     // Skip over symbol-named members
@@ -43429,7 +44582,7 @@ var ts;
                     return indexTypesIdenticalTo(source, target, kind);
                 }
                 var targetInfo = getIndexInfoOfType(target, kind);
-                if (!targetInfo || targetInfo.type.flags & 3 /* AnyOrUnknown */ && !sourceIsPrimitive) {
+                if (!targetInfo || targetInfo.type.flags & 1 /* Any */ && !sourceIsPrimitive) {
                     // Index signature of type any permits assignment from everything but primitives
                     return -1 /* True */;
                 }
@@ -43569,8 +44722,11 @@ var ts;
                 // The emptyArray singleton is used to signal a recursive invocation.
                 cache.variances = ts.emptyArray;
                 variances = [];
-                for (var _i = 0, typeParameters_1 = typeParameters; _i < typeParameters_1.length; _i++) {
-                    var tp = typeParameters_1[_i];
+                var _loop_11 = function (tp) {
+                    var unmeasurable = false;
+                    var unreliable = false;
+                    var oldHandler = outofbandVarianceMarkerHandler;
+                    outofbandVarianceMarkerHandler = function (onlyUnreliable) { return onlyUnreliable ? unreliable = true : unmeasurable = true; };
                     // We first compare instantiations where the type parameter is replaced with
                     // marker types that have a known subtype relationship. From this we can infer
                     // invariance, covariance, contravariance or bivariance.
@@ -43585,7 +44741,20 @@ var ts;
                     if (variance === 3 /* Bivariant */ && isTypeAssignableTo(createMarkerType(cache, tp, markerOtherType), typeWithSuper)) {
                         variance = 4 /* Independent */;
                     }
+                    outofbandVarianceMarkerHandler = oldHandler;
+                    if (unmeasurable || unreliable) {
+                        if (unmeasurable) {
+                            variance |= 8 /* Unmeasurable */;
+                        }
+                        if (unreliable) {
+                            variance |= 16 /* Unreliable */;
+                        }
+                    }
                     variances.push(variance);
+                };
+                for (var _i = 0, typeParameters_1 = typeParameters; _i < typeParameters_1.length; _i++) {
+                    var tp = typeParameters_1[_i];
+                    _loop_11(tp);
                 }
                 cache.variances = variances;
             }
@@ -43602,7 +44771,7 @@ var ts;
         // See comment at call in recursiveTypeRelatedTo for when this case matters.
         function hasCovariantVoidArgument(typeArguments, variances) {
             for (var i = 0; i < variances.length; i++) {
-                if (variances[i] === 1 /* Covariant */ && typeArguments[i].flags & 16384 /* Void */) {
+                if ((variances[i] & 7 /* VarianceMask */) === 1 /* Covariant */ && typeArguments[i].flags & 16384 /* Void */) {
                     return true;
                 }
             }
@@ -43780,18 +44949,24 @@ var ts;
             if (!(isMatchingSignature(source, target, partialMatch))) {
                 return 0 /* False */;
             }
-            // Check that the two signatures have the same number of type parameters. We might consider
-            // also checking that any type parameter constraints match, but that would require instantiating
-            // the constraints with a common set of type arguments to get relatable entities in places where
-            // type parameters occur in the constraints. The complexity of doing that doesn't seem worthwhile,
-            // particularly as we're comparing erased versions of the signatures below.
+            // Check that the two signatures have the same number of type parameters.
             if (ts.length(source.typeParameters) !== ts.length(target.typeParameters)) {
                 return 0 /* False */;
             }
-            // Spec 1.0 Section 3.8.3 & 3.8.4:
-            // M and N (the signatures) are instantiated using type Any as the type argument for all type parameters declared by M and N
-            source = getErasedSignature(source);
-            target = getErasedSignature(target);
+            // Check that type parameter constraints and defaults match. If they do, instantiate the source
+            // signature with the type parameters of the target signature and continue the comparison.
+            if (target.typeParameters) {
+                var mapper = createTypeMapper(source.typeParameters, target.typeParameters);
+                for (var i = 0; i < target.typeParameters.length; i++) {
+                    var s = source.typeParameters[i];
+                    var t = target.typeParameters[i];
+                    if (!(s === t || compareTypes(instantiateType(getConstraintFromTypeParameter(s), mapper) || unknownType, getConstraintFromTypeParameter(t) || unknownType) &&
+                        compareTypes(instantiateType(getDefaultFromTypeParameter(s), mapper) || unknownType, getDefaultFromTypeParameter(t) || unknownType))) {
+                        return 0 /* False */;
+                    }
+                }
+                source = instantiateSignature(source, mapper, /*eraseTypeParameters*/ true);
+            }
             var result = -1 /* True */;
             if (!ignoreThisTypes) {
                 var sourceThisType = getThisTypeOfSignature(source);
@@ -43893,7 +45068,7 @@ var ts;
             if (propType) {
                 return propType;
             }
-            if (everyType(type, isTupleType) && !everyType(type, function (t) { return !t.target.hasRestElement; })) {
+            if (everyType(type, isTupleType)) {
                 return mapType(type, function (t) { return getRestTypeOfTupleType(t) || undefinedType; });
             }
             return undefined;
@@ -43938,6 +45113,23 @@ var ts;
             }
             return type;
         }
+        function getWidenedLiteralLikeTypeForContextualReturnTypeIfNeeded(type, contextualSignatureReturnType, isAsync) {
+            if (type && isUnitType(type)) {
+                var contextualType = !contextualSignatureReturnType ? undefined :
+                    isAsync ? getPromisedTypeOfPromise(contextualSignatureReturnType) :
+                        contextualSignatureReturnType;
+                type = getWidenedLiteralLikeTypeForContextualType(type, contextualType);
+            }
+            return type;
+        }
+        function getWidenedLiteralLikeTypeForContextualIterationTypeIfNeeded(type, contextualSignatureReturnType, kind, isAsyncGenerator) {
+            if (type && isUnitType(type)) {
+                var contextualType = !contextualSignatureReturnType ? undefined :
+                    getIterationTypeOfGeneratorFunctionReturnType(kind, contextualSignatureReturnType, isAsyncGenerator);
+                type = getWidenedLiteralLikeTypeForContextualType(type, contextualType);
+            }
+            return type;
+        }
         /**
          * Check if a Type was written as a tuple type literal.
          * Prefer using isTupleLikeType() unless the use of `elementTypes` is required.
@@ -44027,16 +45219,40 @@ var ts;
         function getNonNullableType(type) {
             return strictNullChecks ? getGlobalNonNullableTypeInstantiation(type) : type;
         }
+        /**
+         * Is source potentially coercible to target type under `==`.
+         * Assumes that `source` is a constituent of a union, hence
+         * the boolean literal flag on the LHS, but not on the RHS.
+         *
+         * This does not fully replicate the semantics of `==`. The
+         * intention is to catch cases that are clearly not right.
+         *
+         * Comparing (string | number) to number should not remove the
+         * string element.
+         *
+         * Comparing (string | number) to 1 will remove the string
+         * element, though this is not sound. This is a pragmatic
+         * choice.
+         *
+         * @see narrowTypeByEquality
+         *
+         * @param source
+         * @param target
+         */
+        function isCoercibleUnderDoubleEquals(source, target) {
+            return ((source.flags & (8 /* Number */ | 4 /* String */ | 512 /* BooleanLiteral */)) !== 0)
+                && ((target.flags & (8 /* Number */ | 4 /* String */ | 16 /* Boolean */)) !== 0);
+        }
         /**
          * Return true if type was inferred from an object literal, written as an object type literal, or is the shape of a module
          * with no call or construct signatures.
          */
         function isObjectTypeWithInferableIndex(type) {
-            return type.symbol && (type.symbol.flags & (4096 /* ObjectLiteral */ | 2048 /* TypeLiteral */ | 512 /* ValueModule */)) !== 0 &&
+            return type.symbol && (type.symbol.flags & (4096 /* ObjectLiteral */ | 2048 /* TypeLiteral */ | 384 /* Enum */ | 512 /* ValueModule */)) !== 0 &&
                 !typeHasCallOrConstructSignatures(type);
         }
         function createSymbolWithType(source, type) {
-            var symbol = createSymbol(source.flags, source.escapedName);
+            var symbol = createSymbol(source.flags, source.escapedName, ts.getCheckFlags(source) & 8 /* Readonly */);
             symbol.declarations = source.declarations;
             symbol.parent = source.parent;
             symbol.type = type;
@@ -44155,34 +45371,42 @@ var ts;
             var stringIndexInfo = getIndexInfoOfType(type, 0 /* String */);
             var numberIndexInfo = getIndexInfoOfType(type, 1 /* Number */);
             var result = createAnonymousType(type.symbol, members, ts.emptyArray, ts.emptyArray, stringIndexInfo && createIndexInfo(getWidenedType(stringIndexInfo.type), stringIndexInfo.isReadonly), numberIndexInfo && createIndexInfo(getWidenedType(numberIndexInfo.type), numberIndexInfo.isReadonly));
-            result.objectFlags |= (ts.getObjectFlags(type) & 16384 /* JSLiteral */); // Retain js literal flag through widening
+            result.objectFlags |= (ts.getObjectFlags(type) & (16384 /* JSLiteral */ | 1048576 /* NonInferrableType */)); // Retain js literal flag through widening
             return result;
         }
         function getWidenedType(type) {
             return getWidenedTypeWithContext(type, /*context*/ undefined);
         }
         function getWidenedTypeWithContext(type, context) {
-            if (ts.getObjectFlags(type) & 393216 /* RequiresWidening */) {
+            if (ts.getObjectFlags(type) & 786432 /* RequiresWidening */) {
+                if (context === undefined && type.widened) {
+                    return type.widened;
+                }
+                var result = void 0;
                 if (type.flags & 98304 /* Nullable */) {
-                    return anyType;
+                    result = anyType;
                 }
-                if (isObjectLiteralType(type)) {
-                    return getWidenedTypeOfObjectLiteral(type, context);
+                else if (isObjectLiteralType(type)) {
+                    result = getWidenedTypeOfObjectLiteral(type, context);
                 }
-                if (type.flags & 1048576 /* Union */) {
+                else if (type.flags & 1048576 /* Union */) {
                     var unionContext_1 = context || createWideningContext(/*parent*/ undefined, /*propertyName*/ undefined, type.types);
                     var widenedTypes = ts.sameMap(type.types, function (t) { return t.flags & 98304 /* Nullable */ ? t : getWidenedTypeWithContext(t, unionContext_1); });
                     // Widening an empty object literal transitions from a highly restrictive type to
                     // a highly inclusive one. For that reason we perform subtype reduction here if the
                     // union includes empty object types (e.g. reducing {} | string to just {}).
-                    return getUnionType(widenedTypes, ts.some(widenedTypes, isEmptyObjectType) ? 2 /* Subtype */ : 1 /* Literal */);
+                    result = getUnionType(widenedTypes, ts.some(widenedTypes, isEmptyObjectType) ? 2 /* Subtype */ : 1 /* Literal */);
                 }
-                if (type.flags & 2097152 /* Intersection */) {
-                    return getIntersectionType(ts.sameMap(type.types, getWidenedType));
+                else if (type.flags & 2097152 /* Intersection */) {
+                    result = getIntersectionType(ts.sameMap(type.types, getWidenedType));
                 }
-                if (isArrayType(type) || isTupleType(type)) {
-                    return createTypeReference(type.target, ts.sameMap(type.typeArguments, getWidenedType));
+                else if (isArrayType(type) || isTupleType(type)) {
+                    result = createTypeReference(type.target, ts.sameMap(type.typeArguments, getWidenedType));
                 }
+                if (result && context === undefined) {
+                    type.widened = result;
+                }
+                return result || type;
             }
             return type;
         }
@@ -44199,7 +45423,7 @@ var ts;
          */
         function reportWideningErrorsInType(type) {
             var errorReported = false;
-            if (ts.getObjectFlags(type) & 131072 /* ContainsWideningType */) {
+            if (ts.getObjectFlags(type) & 262144 /* ContainsWideningType */) {
                 if (type.flags & 1048576 /* Union */) {
                     if (ts.some(type.types, isEmptyObjectType)) {
                         errorReported = true;
@@ -44225,7 +45449,7 @@ var ts;
                     for (var _d = 0, _e = getPropertiesOfObjectType(type); _d < _e.length; _d++) {
                         var p = _e[_d];
                         var t = getTypeOfSymbol(p);
-                        if (ts.getObjectFlags(t) & 131072 /* ContainsWideningType */) {
+                        if (ts.getObjectFlags(t) & 262144 /* ContainsWideningType */) {
                             if (!reportWideningErrorsInType(t)) {
                                 error(p.valueDeclaration, ts.Diagnostics.Object_literal_s_property_0_implicitly_has_an_1_type, symbolToString(p), typeToString(getWidenedType(t)));
                             }
@@ -44236,7 +45460,7 @@ var ts;
             }
             return errorReported;
         }
-        function reportImplicitAny(declaration, type) {
+        function reportImplicitAny(declaration, type, wideningKind) {
             var typeAsString = typeToString(getWidenedType(type));
             if (ts.isInJSFile(declaration) && !ts.isCheckJsEnabledForFile(ts.getSourceFileOfNode(declaration), compilerOptions)) {
                 // Only report implicit any errors/suggestions in TS and ts-check JS files
@@ -44244,12 +45468,12 @@ var ts;
             }
             var diagnostic;
             switch (declaration.kind) {
-                case 204 /* BinaryExpression */:
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
+                case 205 /* BinaryExpression */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
                     diagnostic = noImplicitAny ? ts.Diagnostics.Member_0_implicitly_has_an_1_type : ts.Diagnostics.Member_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage;
                     break;
-                case 151 /* Parameter */:
+                case 152 /* Parameter */:
                     var param = declaration;
                     if (ts.isIdentifier(param.name) &&
                         (ts.isCallSignatureDeclaration(param.parent) || ts.isMethodSignature(param.parent) || ts.isFunctionTypeNode(param.parent)) &&
@@ -44264,30 +45488,37 @@ var ts;
                         noImplicitAny ? ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type : ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type_but_a_better_type_may_be_inferred_from_usage :
                         noImplicitAny ? ts.Diagnostics.Parameter_0_implicitly_has_an_1_type : ts.Diagnostics.Parameter_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage;
                     break;
-                case 186 /* BindingElement */:
+                case 187 /* BindingElement */:
                     diagnostic = ts.Diagnostics.Binding_element_0_implicitly_has_an_1_type;
                     if (!noImplicitAny) {
                         // Don't issue a suggestion for binding elements since the codefix doesn't yet support them.
                         return;
                     }
                     break;
-                case 294 /* JSDocFunctionType */:
+                case 295 /* JSDocFunctionType */:
                     error(declaration, ts.Diagnostics.Function_type_which_lacks_return_type_annotation_implicitly_has_an_0_return_type, typeAsString);
                     return;
-                case 239 /* FunctionDeclaration */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
+                case 240 /* FunctionDeclaration */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
                     if (noImplicitAny && !declaration.name) {
-                        error(declaration, ts.Diagnostics.Function_expression_which_lacks_return_type_annotation_implicitly_has_an_0_return_type, typeAsString);
+                        if (wideningKind === 1 /* GeneratorYield */) {
+                            error(declaration, ts.Diagnostics.Generator_implicitly_has_yield_type_0_because_it_does_not_yield_any_values_Consider_supplying_a_return_type_annotation, typeAsString);
+                        }
+                        else {
+                            error(declaration, ts.Diagnostics.Function_expression_which_lacks_return_type_annotation_implicitly_has_an_0_return_type, typeAsString);
+                        }
                         return;
                     }
-                    diagnostic = noImplicitAny ? ts.Diagnostics._0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type : ts.Diagnostics._0_implicitly_has_an_1_return_type_but_a_better_type_may_be_inferred_from_usage;
+                    diagnostic = !noImplicitAny ? ts.Diagnostics._0_implicitly_has_an_1_return_type_but_a_better_type_may_be_inferred_from_usage :
+                        wideningKind === 1 /* GeneratorYield */ ? ts.Diagnostics._0_which_lacks_return_type_annotation_implicitly_has_an_1_yield_type :
+                            ts.Diagnostics._0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type;
                     break;
-                case 181 /* MappedType */:
+                case 182 /* MappedType */:
                     if (noImplicitAny) {
                         error(declaration, ts.Diagnostics.Mapped_object_type_implicitly_has_an_any_template_type);
                     }
@@ -44297,15 +45528,15 @@ var ts;
             }
             errorOrSuggestion(noImplicitAny, declaration, diagnostic, ts.declarationNameToString(ts.getNameOfDeclaration(declaration)), typeAsString);
         }
-        function reportErrorsFromWidening(declaration, type) {
-            if (produceDiagnostics && noImplicitAny && ts.getObjectFlags(type) & 131072 /* ContainsWideningType */) {
+        function reportErrorsFromWidening(declaration, type, wideningKind) {
+            if (produceDiagnostics && noImplicitAny && ts.getObjectFlags(type) & 262144 /* ContainsWideningType */) {
                 // Report implicit any error within type if possible, otherwise report error on declaration
                 if (!reportWideningErrorsInType(type)) {
-                    reportImplicitAny(declaration, type);
+                    reportImplicitAny(declaration, type, wideningKind);
                 }
             }
         }
-        function forEachMatchingParameterType(source, target, callback) {
+        function applyToParameterTypes(source, target, callback) {
             var sourceCount = getParameterCount(source);
             var targetCount = getParameterCount(target);
             var sourceRestType = getEffectiveRestType(source);
@@ -44326,25 +45557,55 @@ var ts;
                 callback(getRestTypeAtPosition(source, paramCount), targetRestType);
             }
         }
-        function createInferenceContext(typeParameters, signature, flags, compareTypes, baseInferences) {
-            var inferences = baseInferences ? baseInferences.map(cloneInferenceInfo) : typeParameters.map(createInferenceInfo);
-            var context = mapper;
-            context.typeParameters = typeParameters;
-            context.signature = signature;
-            context.inferences = inferences;
-            context.flags = flags;
-            context.compareTypes = compareTypes || compareTypesAssignable;
+        function applyToReturnTypes(source, target, callback) {
+            var sourceTypePredicate = getTypePredicateOfSignature(source);
+            var targetTypePredicate = getTypePredicateOfSignature(target);
+            if (sourceTypePredicate && targetTypePredicate && sourceTypePredicate.kind === targetTypePredicate.kind &&
+                (sourceTypePredicate.kind === 0 /* This */ || sourceTypePredicate.parameterIndex === targetTypePredicate.parameterIndex)) {
+                callback(sourceTypePredicate.type, targetTypePredicate.type);
+            }
+            else {
+                callback(getReturnTypeOfSignature(source), getReturnTypeOfSignature(target));
+            }
+        }
+        function createInferenceContext(typeParameters, signature, flags, compareTypes) {
+            return createInferenceContextWorker(typeParameters.map(createInferenceInfo), signature, flags, compareTypes || compareTypesAssignable);
+        }
+        function cloneInferenceContext(context, extraFlags) {
+            if (extraFlags === void 0) { extraFlags = 0; }
+            return context && createInferenceContextWorker(ts.map(context.inferences, cloneInferenceInfo), context.signature, context.flags | extraFlags, context.compareTypes);
+        }
+        function createInferenceContextWorker(inferences, signature, flags, compareTypes) {
+            var context = {
+                inferences: inferences,
+                signature: signature,
+                flags: flags,
+                compareTypes: compareTypes,
+                mapper: function (t) { return mapToInferredType(context, t, /*fix*/ true); },
+                nonFixingMapper: function (t) { return mapToInferredType(context, t, /*fix*/ false); },
+            };
             return context;
-            function mapper(t) {
-                for (var i = 0; i < inferences.length; i++) {
-                    if (t === inferences[i].typeParameter) {
-                        if (!(context.flags & 4 /* NoFixing */)) {
-                            inferences[i].isFixed = true;
-                        }
-                        return getInferredType(context, i);
+        }
+        function mapToInferredType(context, t, fix) {
+            var inferences = context.inferences;
+            for (var i = 0; i < inferences.length; i++) {
+                var inference = inferences[i];
+                if (t === inference.typeParameter) {
+                    if (fix && !inference.isFixed) {
+                        clearCachedInferences(inferences);
+                        inference.isFixed = true;
                     }
+                    return getInferredType(context, i);
+                }
+            }
+            return t;
+        }
+        function clearCachedInferences(inferences) {
+            for (var _i = 0, inferences_1 = inferences; _i < inferences_1.length; _i++) {
+                var inference = inferences_1[_i];
+                if (!inference.isFixed) {
+                    inference.inferredType = undefined;
                 }
-                return t;
             }
         }
         function createInferenceInfo(typeParameter) {
@@ -44369,6 +45630,9 @@ var ts;
                 isFixed: inference.isFixed
             };
         }
+        function getMapperFromContext(context) {
+            return context && context.mapper;
+        }
         // Return true if the given type could possibly reference a type parameter for which
         // we perform type inference (i.e. a type parameter of a generic function). We cache
         // results for union and intersection types for performance reasons.
@@ -44376,7 +45640,7 @@ var ts;
             var objectFlags = ts.getObjectFlags(type);
             return !!(type.flags & 63176704 /* Instantiable */ ||
                 objectFlags & 4 /* Reference */ && ts.forEach(type.typeArguments, couldContainTypeVariables) ||
-                objectFlags & 16 /* Anonymous */ && type.symbol && type.symbol.flags & (16 /* Function */ | 8192 /* Method */ | 2048 /* TypeLiteral */ | 32 /* Class */) ||
+                objectFlags & 16 /* Anonymous */ && type.symbol && type.symbol.flags & (16 /* Function */ | 8192 /* Method */ | 32 /* Class */ | 2048 /* TypeLiteral */ | 4096 /* ObjectLiteral */) && type.symbol.declarations ||
                 objectFlags & 32 /* Mapped */ ||
                 type.flags & 3145728 /* UnionOrIntersection */ && couldUnionOrIntersectionContainTypeVariables(type));
         }
@@ -44387,7 +45651,10 @@ var ts;
             return type.couldContainTypeVariables;
         }
         function isTypeParameterAtTopLevel(type, typeParameter) {
-            return type === typeParameter || !!(type.flags & 3145728 /* UnionOrIntersection */) && ts.some(type.types, function (t) { return isTypeParameterAtTopLevel(t, typeParameter); });
+            return !!(type === typeParameter ||
+                type.flags & 3145728 /* UnionOrIntersection */ && ts.some(type.types, function (t) { return isTypeParameterAtTopLevel(t, typeParameter); }) ||
+                type.flags & 16777216 /* Conditional */ && (isTypeParameterAtTopLevel(getTrueTypeFromConditionalType(type), typeParameter) ||
+                    isTypeParameterAtTopLevel(getFalseTypeFromConditionalType(type), typeParameter)));
         }
         /** Create an object with properties named in the string literal type. Every property has type `any` */
         function createEmptyObjectTypeFromStringLiteral(type) {
@@ -44424,19 +45691,20 @@ var ts;
             reverseMappedCache.set(key, type);
             return type;
         }
+        // We consider a type to be partially inferable if it isn't marked non-inferable or if it is
+        // an object literal type with at least one property of an inferable type. For example, an object
+        // literal { a: 123, b: x => true } is marked non-inferable because it contains a context sensitive
+        // arrow function, but is considered partially inferable because property 'a' has an inferable type.
+        function isPartiallyInferableType(type) {
+            return !(ts.getObjectFlags(type) & 1048576 /* NonInferrableType */) ||
+                isObjectLiteralType(type) && ts.some(getPropertiesOfType(type), function (prop) { return isPartiallyInferableType(getTypeOfSymbol(prop)); });
+        }
         function createReverseMappedType(source, target, constraint) {
-            var properties = getPropertiesOfType(source);
-            if (properties.length === 0 && !getIndexInfoOfType(source, 0 /* String */)) {
+            // We consider a source type reverse mappable if it has a string index signature or if
+            // it has one or more properties and is of a partially inferable type.
+            if (!(getIndexInfoOfType(source, 0 /* String */) || getPropertiesOfType(source).length !== 0 && isPartiallyInferableType(source))) {
                 return undefined;
             }
-            // If any property contains context sensitive functions that have been skipped, the source type
-            // is incomplete and we can't infer a meaningful input type.
-            for (var _i = 0, properties_3 = properties; _i < properties_3.length; _i++) {
-                var prop = properties_3[_i];
-                if (ts.getObjectFlags(getTypeOfSymbol(prop)) & 524288 /* ContainsAnyFunctionType */) {
-                    return undefined;
-                }
-            }
             // For arrays and tuples we infer new arrays and tuples where the reverse mapping has been
             // applied to the element type(s).
             if (isArrayType(source)) {
@@ -44464,20 +45732,20 @@ var ts;
             var templateType = getTemplateTypeFromMappedType(target);
             var inference = createInferenceInfo(typeParameter);
             inferTypes([inference], sourceType, templateType);
-            return getTypeFromInference(inference);
+            return getTypeFromInference(inference) || unknownType;
         }
         function getUnmatchedProperties(source, target, requireOptionalProperties, matchDiscriminantProperties) {
-            var properties, _i, properties_4, targetProp, sourceProp, targetType, sourceType;
+            var properties, _i, properties_2, targetProp, sourceProp, targetType, sourceType;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        properties = target.flags & 2097152 /* Intersection */ ? getPropertiesOfUnionOrIntersectionType(target) : getPropertiesOfObjectType(target);
-                        _i = 0, properties_4 = properties;
+                        properties = target.flags & 1048576 /* Union */ ? getPossiblePropertiesOfUnionType(target) : getPropertiesOfType(target);
+                        _i = 0, properties_2 = properties;
                         _a.label = 1;
                     case 1:
-                        if (!(_i < properties_4.length)) return [3 /*break*/, 6];
-                        targetProp = properties_4[_i];
-                        if (!(requireOptionalProperties || !(targetProp.flags & 16777216 /* Optional */))) return [3 /*break*/, 5];
+                        if (!(_i < properties_2.length)) return [3 /*break*/, 6];
+                        targetProp = properties_2[_i];
+                        if (!(requireOptionalProperties || !(targetProp.flags & 16777216 /* Optional */ || ts.getCheckFlags(targetProp) & 48 /* Partial */))) return [3 /*break*/, 5];
                         sourceProp = getPropertyOfType(source, targetProp.escapedName);
                         if (!!sourceProp) return [3 /*break*/, 3];
                         return [4 /*yield*/, targetProp];
@@ -44502,7 +45770,9 @@ var ts;
             });
         }
         function getUnmatchedProperty(source, target, requireOptionalProperties, matchDiscriminantProperties) {
-            return getUnmatchedProperties(source, target, requireOptionalProperties, matchDiscriminantProperties).next().value;
+            var result = getUnmatchedProperties(source, target, requireOptionalProperties, matchDiscriminantProperties).next();
+            if (!result.done)
+                return result.value;
         }
         function tupleTypesDefinitelyUnrelated(source, target) {
             return target.target.minLength > source.target.minLength ||
@@ -44518,15 +45788,17 @@ var ts;
         function getTypeFromInference(inference) {
             return inference.candidates ? getUnionType(inference.candidates, 2 /* Subtype */) :
                 inference.contraCandidates ? getIntersectionType(inference.contraCandidates) :
-                    emptyObjectType;
+                    undefined;
         }
-        function inferTypes(inferences, originalSource, originalTarget, priority) {
+        function inferTypes(inferences, originalSource, originalTarget, priority, contravariant) {
             if (priority === void 0) { priority = 0; }
+            if (contravariant === void 0) { contravariant = false; }
             var symbolStack;
             var visited;
-            var contravariant = false;
             var bivariant = false;
             var propagationType;
+            var inferenceCount = 0;
+            var inferenceIncomplete = false;
             var allowComplexConstraintInference = true;
             inferFromTypes(originalSource, originalTarget);
             function inferFromTypes(source, target) {
@@ -44546,11 +45818,7 @@ var ts;
                 if (source.aliasSymbol && source.aliasTypeArguments && source.aliasSymbol === target.aliasSymbol) {
                     // Source and target are types originating in the same generic type alias declaration.
                     // Simply infer from source type arguments to target type arguments.
-                    var sourceTypes = source.aliasTypeArguments;
-                    var targetTypes = target.aliasTypeArguments;
-                    for (var i = 0; i < sourceTypes.length; i++) {
-                        inferFromTypes(sourceTypes[i], targetTypes[i]);
-                    }
+                    inferFromTypeArguments(source.aliasTypeArguments, target.aliasTypeArguments, getAliasVariances(source.aliasSymbol));
                     return;
                 }
                 if (source.flags & 1048576 /* Union */ && target.flags & 1048576 /* Union */ && !(source.flags & 1024 /* EnumLiteral */ && target.flags & 1024 /* EnumLiteral */) ||
@@ -44573,25 +45841,34 @@ var ts;
                     var matchingTypes = void 0;
                     for (var _b = 0, _c = source.types; _b < _c.length; _b++) {
                         var t = _c[_b];
-                        if (typeIdenticalToSomeType(t, target.types)) {
-                            (matchingTypes || (matchingTypes = [])).push(t);
-                            inferFromTypes(t, t);
-                        }
-                        else if (t.flags & (256 /* NumberLiteral */ | 128 /* StringLiteral */)) {
-                            var b = getBaseTypeOfLiteralType(t);
-                            if (typeIdenticalToSomeType(b, target.types)) {
-                                (matchingTypes || (matchingTypes = [])).push(t, b);
-                            }
+                        var matched = findMatchedType(t, target);
+                        if (matched) {
+                            (matchingTypes || (matchingTypes = [])).push(matched);
+                            inferFromTypes(matched, matched);
                         }
                     }
                     // Next, to improve the quality of inferences, reduce the source and target types by
                     // removing the identically matched constituents. For example, when inferring from
                     // 'string | string[]' to 'string | T' we reduce the types to 'string[]' and 'T'.
                     if (matchingTypes) {
-                        source = removeTypesFromUnionOrIntersection(source, matchingTypes);
-                        target = removeTypesFromUnionOrIntersection(target, matchingTypes);
+                        var s = removeTypesFromUnionOrIntersection(source, matchingTypes);
+                        var t = removeTypesFromUnionOrIntersection(target, matchingTypes);
+                        if (!(s && t))
+                            return;
+                        source = s;
+                        target = t;
                     }
                 }
+                else if (target.flags & 1048576 /* Union */ && !(target.flags & 1024 /* EnumLiteral */) || target.flags & 2097152 /* Intersection */) {
+                    var matched = findMatchedType(source, target);
+                    if (matched) {
+                        inferFromTypes(matched, matched);
+                        return;
+                    }
+                }
+                else if (target.flags & (8388608 /* IndexedAccess */ | 33554432 /* Substitution */)) {
+                    target = getActualTypeVariable(target);
+                }
                 if (target.flags & 8650752 /* TypeVariable */) {
                     // If target is a type parameter, make an inference, unless the source type contains
                     // the anyFunctionType (the wildcard type that's used to avoid contextually typing functions).
@@ -44600,7 +45877,7 @@ var ts;
                     // not contain anyFunctionType when we come back to this argument for its second round
                     // of inference. Also, we exclude inferences for silentNeverType (which is used as a wildcard
                     // when constructing types from type parameters that had no inference candidates).
-                    if (ts.getObjectFlags(source) & 524288 /* ContainsAnyFunctionType */ || source === silentNeverType || (priority & 8 /* ReturnType */ && (source === autoType || source === autoArrayType))) {
+                    if (ts.getObjectFlags(source) & 1048576 /* NonInferrableType */ || source === silentNeverType || (priority & 16 /* ReturnType */ && (source === autoType || source === autoArrayType))) {
                         return;
                     }
                     var inference = getInferenceInfoForType(target);
@@ -44617,54 +45894,46 @@ var ts;
                                 // We make contravariant inferences only if we are in a pure contravariant position,
                                 // i.e. only if we have not descended into a bivariant position.
                                 if (contravariant && !bivariant) {
-                                    inference.contraCandidates = ts.appendIfUnique(inference.contraCandidates, candidate);
+                                    if (!ts.contains(inference.contraCandidates, candidate)) {
+                                        inference.contraCandidates = ts.append(inference.contraCandidates, candidate);
+                                        clearCachedInferences(inferences);
+                                    }
                                 }
-                                else {
-                                    inference.candidates = ts.appendIfUnique(inference.candidates, candidate);
+                                else if (!ts.contains(inference.candidates, candidate)) {
+                                    inference.candidates = ts.append(inference.candidates, candidate);
+                                    clearCachedInferences(inferences);
                                 }
                             }
-                            if (!(priority & 8 /* ReturnType */) && target.flags & 262144 /* TypeParameter */ && !isTypeParameterAtTopLevel(originalTarget, target)) {
+                            if (!(priority & 16 /* ReturnType */) && target.flags & 262144 /* TypeParameter */ && inference.topLevel && !isTypeParameterAtTopLevel(originalTarget, target)) {
                                 inference.topLevel = false;
+                                clearCachedInferences(inferences);
                             }
                         }
+                        inferenceCount++;
                         return;
                     }
                     else {
                         // Infer to the simplified version of an indexed access, if possible, to (hopefully) expose more bare type parameters to the inference engine
-                        var simplified = getSimplifiedType(target);
+                        var simplified = getSimplifiedType(target, /*writing*/ false);
                         if (simplified !== target) {
-                            inferFromTypesOnce(source, simplified);
+                            invokeOnce(source, simplified, inferFromTypes);
                         }
                         else if (target.flags & 8388608 /* IndexedAccess */) {
-                            var indexType = getSimplifiedType(target.indexType);
+                            var indexType = getSimplifiedType(target.indexType, /*writing*/ false);
                             // Generally simplifications of instantiable indexes are avoided to keep relationship checking correct, however if our target is an access, we can consider
                             // that key of that access to be "instantiated", since we're looking to find the infernce goal in any way we can.
                             if (indexType.flags & 63176704 /* Instantiable */) {
-                                var simplified_1 = distributeIndexOverObjectType(getSimplifiedType(target.objectType), indexType);
+                                var simplified_1 = distributeIndexOverObjectType(getSimplifiedType(target.objectType, /*writing*/ false), indexType, /*writing*/ false);
                                 if (simplified_1 && simplified_1 !== target) {
-                                    inferFromTypesOnce(source, simplified_1);
+                                    invokeOnce(source, simplified_1, inferFromTypes);
                                 }
                             }
                         }
                     }
                 }
-                else if (target.flags & 33554432 /* Substitution */) {
-                    inferFromTypes(source, target.typeVariable);
-                }
-                if (ts.getObjectFlags(source) & 4 /* Reference */ && ts.getObjectFlags(target) & 4 /* Reference */ && source.target === target.target) {
+                if (ts.getObjectFlags(source) & 4 /* Reference */ && ts.getObjectFlags(target) & 4 /* Reference */ && (source.target === target.target || isArrayType(source) && isArrayType(target))) {
                     // If source and target are references to the same generic type, infer from type arguments
-                    var sourceTypes = source.typeArguments || ts.emptyArray;
-                    var targetTypes = target.typeArguments || ts.emptyArray;
-                    var count = sourceTypes.length < targetTypes.length ? sourceTypes.length : targetTypes.length;
-                    var variances = getVariances(source.target);
-                    for (var i = 0; i < count; i++) {
-                        if (i < variances.length && variances[i] === 2 /* Contravariant */) {
-                            inferFromContravariantTypes(sourceTypes[i], targetTypes[i]);
-                        }
-                        else {
-                            inferFromTypes(sourceTypes[i], targetTypes[i]);
-                        }
-                    }
+                    inferFromTypeArguments(source.typeArguments || ts.emptyArray, target.typeArguments || ts.emptyArray, getVariances(source.target));
                 }
                 else if (source.flags & 4194304 /* Index */ && target.flags & 4194304 /* Index */) {
                     contravariant = !contravariant;
@@ -44675,7 +45944,7 @@ var ts;
                     var empty = createEmptyObjectTypeFromStringLiteral(source);
                     contravariant = !contravariant;
                     var savePriority = priority;
-                    priority |= 16 /* LiteralKeyof */;
+                    priority |= 32 /* LiteralKeyof */;
                     inferFromTypes(empty, target.type);
                     priority = savePriority;
                     contravariant = !contravariant;
@@ -44690,34 +45959,23 @@ var ts;
                     inferFromTypes(getTrueTypeFromConditionalType(source), getTrueTypeFromConditionalType(target));
                     inferFromTypes(getFalseTypeFromConditionalType(source), getFalseTypeFromConditionalType(target));
                 }
-                else if (target.flags & 16777216 /* Conditional */) {
-                    inferFromTypes(source, getTrueTypeFromConditionalType(target));
-                    inferFromTypes(source, getFalseTypeFromConditionalType(target));
+                else if (target.flags & 16777216 /* Conditional */ && !contravariant) {
+                    var targetTypes = [getTrueTypeFromConditionalType(target), getFalseTypeFromConditionalType(target)];
+                    inferToMultipleTypes(source, targetTypes, target.flags);
                 }
                 else if (target.flags & 3145728 /* UnionOrIntersection */) {
-                    for (var _d = 0, _e = target.types; _d < _e.length; _d++) {
-                        var t = _e[_d];
-                        var savePriority = priority;
-                        // Inferences directly to naked type variables are given lower priority as they are
-                        // less specific. For example, when inferring from Promise<string> to T | Promise<T>,
-                        // we want to infer string for T, not Promise<string> | string.
-                        if (getInferenceInfoForType(t)) {
-                            priority |= 1 /* NakedTypeVariable */;
-                        }
-                        inferFromTypes(source, t);
-                        priority = savePriority;
-                    }
+                    inferToMultipleTypes(source, target.types, target.flags);
                 }
                 else if (source.flags & 1048576 /* Union */) {
                     // Source is a union or intersection type, infer from each constituent type
                     var sourceTypes = source.types;
-                    for (var _f = 0, sourceTypes_3 = sourceTypes; _f < sourceTypes_3.length; _f++) {
-                        var sourceType = sourceTypes_3[_f];
+                    for (var _d = 0, sourceTypes_3 = sourceTypes; _d < sourceTypes_3.length; _d++) {
+                        var sourceType = sourceTypes_3[_d];
                         inferFromTypes(sourceType, target);
                     }
                 }
                 else {
-                    if (!(priority & 32 /* NoConstraints */ && source.flags & (2097152 /* Intersection */ | 63176704 /* Instantiable */))) {
+                    if (!(priority & 64 /* NoConstraints */ && source.flags & (2097152 /* Intersection */ | 63176704 /* Instantiable */))) {
                         var apparentSource = getApparentType(source);
                         // getApparentType can return _any_ type, since an indexed access or conditional may simplify to any other type.
                         // If that occurs and it doesn't simplify to an object or intersection, we'll need to restart `inferFromTypes`
@@ -44736,41 +45994,35 @@ var ts;
                         source = apparentSource;
                     }
                     if (source.flags & (524288 /* Object */ | 2097152 /* Intersection */)) {
-                        var key = source.id + "," + target.id;
-                        if (visited && visited.get(key)) {
-                            return;
-                        }
-                        (visited || (visited = ts.createMap())).set(key, true);
-                        // If we are already processing another target type with the same associated symbol (such as
-                        // an instantiation of the same generic type), we do not explore this target as it would yield
-                        // no further inferences. We exclude the static side of classes from this check since it shares
-                        // its symbol with the instance side which would lead to false positives.
-                        var isNonConstructorObject = target.flags & 524288 /* Object */ &&
-                            !(ts.getObjectFlags(target) & 16 /* Anonymous */ && target.symbol && target.symbol.flags & 32 /* Class */);
-                        var symbol = isNonConstructorObject ? target.symbol : undefined;
-                        if (symbol) {
-                            if (ts.contains(symbolStack, symbol)) {
-                                return;
-                            }
-                            (symbolStack || (symbolStack = [])).push(symbol);
-                            inferFromObjectTypes(source, target);
-                            symbolStack.pop();
-                        }
-                        else {
-                            inferFromObjectTypes(source, target);
-                        }
+                        invokeOnce(source, target, inferFromObjectTypes);
                     }
                 }
-                function inferFromTypesOnce(source, target) {
-                    var key = source.id + "," + target.id;
-                    if (!visited || !visited.get(key)) {
-                        (visited || (visited = ts.createMap())).set(key, true);
-                        inferFromTypes(source, target);
+            }
+            function invokeOnce(source, target, action) {
+                var key = source.id + "," + target.id;
+                var count = visited && visited.get(key);
+                if (count !== undefined) {
+                    inferenceCount += count;
+                    return;
+                }
+                (visited || (visited = ts.createMap())).set(key, 0);
+                var startCount = inferenceCount;
+                action(source, target);
+                visited.set(key, inferenceCount - startCount);
+            }
+            function inferFromTypeArguments(sourceTypes, targetTypes, variances) {
+                var count = sourceTypes.length < targetTypes.length ? sourceTypes.length : targetTypes.length;
+                for (var i = 0; i < count; i++) {
+                    if (i < variances.length && (variances[i] & 7 /* VarianceMask */) === 2 /* Contravariant */) {
+                        inferFromContravariantTypes(sourceTypes[i], targetTypes[i]);
+                    }
+                    else {
+                        inferFromTypes(sourceTypes[i], targetTypes[i]);
                     }
                 }
             }
             function inferFromContravariantTypes(source, target) {
-                if (strictFunctionTypes || priority & 64 /* AlwaysStrict */) {
+                if (strictFunctionTypes || priority & 128 /* AlwaysStrict */) {
                     contravariant = !contravariant;
                     inferFromTypes(source, target);
                     contravariant = !contravariant;
@@ -44781,8 +46033,8 @@ var ts;
             }
             function getInferenceInfoForType(type) {
                 if (type.flags & 8650752 /* TypeVariable */) {
-                    for (var _i = 0, inferences_1 = inferences; _i < inferences_1.length; _i++) {
-                        var inference = inferences_1[_i];
+                    for (var _i = 0, inferences_2 = inferences; _i < inferences_2.length; _i++) {
+                        var inference = inferences_2[_i];
                         if (type === inference.typeParameter) {
                             return inference;
                         }
@@ -44790,6 +46042,74 @@ var ts;
                 }
                 return undefined;
             }
+            function inferToMultipleTypes(source, targets, targetFlags) {
+                var typeVariableCount = 0;
+                if (targetFlags & 1048576 /* Union */) {
+                    var nakedTypeVariable = void 0;
+                    var sources = source.flags & 1048576 /* Union */ ? source.types : [source];
+                    var matched_1 = new Array(sources.length);
+                    var saveInferenceIncomplete = inferenceIncomplete;
+                    inferenceIncomplete = false;
+                    // First infer to types that are not naked type variables. For each source type we
+                    // track whether inferences were made from that particular type to some target.
+                    for (var _i = 0, targets_1 = targets; _i < targets_1.length; _i++) {
+                        var t = targets_1[_i];
+                        if (getInferenceInfoForType(t)) {
+                            nakedTypeVariable = t;
+                            typeVariableCount++;
+                        }
+                        else {
+                            for (var i = 0; i < sources.length; i++) {
+                                var count = inferenceCount;
+                                inferFromTypes(sources[i], t);
+                                if (count !== inferenceCount)
+                                    matched_1[i] = true;
+                            }
+                        }
+                    }
+                    var inferenceComplete = !inferenceIncomplete;
+                    inferenceIncomplete = inferenceIncomplete || saveInferenceIncomplete;
+                    // If the target has a single naked type variable and inference completed (meaning we
+                    // explored the types fully), create a union of the source types from which no inferences
+                    // have been made so far and infer from that union to the naked type variable.
+                    if (typeVariableCount === 1 && inferenceComplete) {
+                        var unmatched = ts.flatMap(sources, function (s, i) { return matched_1[i] ? undefined : s; });
+                        if (unmatched.length) {
+                            inferFromTypes(getUnionType(unmatched), nakedTypeVariable);
+                            return;
+                        }
+                    }
+                }
+                else {
+                    // We infer from types that are not naked type variables first so that inferences we
+                    // make from nested naked type variables and given slightly higher priority by virtue
+                    // of being first in the candidates array.
+                    for (var _a = 0, targets_2 = targets; _a < targets_2.length; _a++) {
+                        var t = targets_2[_a];
+                        if (getInferenceInfoForType(t)) {
+                            typeVariableCount++;
+                        }
+                        else {
+                            inferFromTypes(source, t);
+                        }
+                    }
+                }
+                // Inferences directly to naked type variables are given lower priority as they are
+                // less specific. For example, when inferring from Promise<string> to T | Promise<T>,
+                // we want to infer string for T, not Promise<string> | string. For intersection types
+                // we only infer to single naked type variables.
+                if (targetFlags & 2097152 /* Intersection */ ? typeVariableCount === 1 : typeVariableCount > 0) {
+                    var savePriority = priority;
+                    priority |= 1 /* NakedTypeVariable */;
+                    for (var _b = 0, targets_3 = targets; _b < targets_3.length; _b++) {
+                        var t = targets_3[_b];
+                        if (getInferenceInfoForType(t)) {
+                            inferFromTypes(source, t);
+                        }
+                    }
+                    priority = savePriority;
+                }
+            }
             function inferToMappedType(source, target, constraintType) {
                 if (constraintType.flags & 1048576 /* Union */) {
                     var result = false;
@@ -44809,7 +46129,11 @@ var ts;
                         var inferredType = inferTypeForHomomorphicMappedType(source, target, constraintType);
                         if (inferredType) {
                             var savePriority = priority;
-                            priority |= 2 /* HomomorphicMappedType */;
+                            // We assign a lower priority to inferences made from types containing non-inferrable
+                            // types because we may only have a partial result (i.e. we may have failed to make
+                            // reverse inferences for some properties).
+                            priority |= ts.getObjectFlags(source) & 1048576 /* NonInferrableType */ ?
+                                4 /* PartialHomomorphicMappedType */ : 2 /* HomomorphicMappedType */;
                             inferFromTypes(inferredType, inference.typeParameter);
                             priority = savePriority;
                         }
@@ -44820,7 +46144,7 @@ var ts;
                     // We're inferring from some source type S to a mapped type { [P in K]: X }, where K is a type
                     // parameter. First infer from 'keyof S' to K.
                     var savePriority = priority;
-                    priority |= 4 /* MappedTypeConstraint */;
+                    priority |= 8 /* MappedTypeConstraint */;
                     inferFromTypes(getIndexType(source), constraintType);
                     priority = savePriority;
                     // If K is constrained to a type C, also infer to C. Thus, for a mapped type { [P in K]: X },
@@ -44833,16 +46157,37 @@ var ts;
                     }
                     // If no inferences can be made to K's constraint, infer from a union of the property types
                     // in the source to the template type X.
-                    var valueTypes = ts.compact([
-                        getIndexTypeOfType(source, 0 /* String */),
-                        getIndexTypeOfType(source, 1 /* Number */)
-                    ].concat(ts.map(getPropertiesOfType(source), getTypeOfSymbol)));
-                    inferFromTypes(getUnionType(valueTypes), getTemplateTypeFromMappedType(target));
+                    var propTypes = ts.map(getPropertiesOfType(source), getTypeOfSymbol);
+                    var stringIndexType = getIndexTypeOfType(source, 0 /* String */);
+                    var numberIndexInfo = getNonEnumNumberIndexInfo(source);
+                    var numberIndexType = numberIndexInfo && numberIndexInfo.type;
+                    inferFromTypes(getUnionType(ts.append(ts.append(propTypes, stringIndexType), numberIndexType)), getTemplateTypeFromMappedType(target));
                     return true;
                 }
                 return false;
             }
             function inferFromObjectTypes(source, target) {
+                // If we are already processing another target type with the same associated symbol (such as
+                // an instantiation of the same generic type), we do not explore this target as it would yield
+                // no further inferences. We exclude the static side of classes from this check since it shares
+                // its symbol with the instance side which would lead to false positives.
+                var isNonConstructorObject = target.flags & 524288 /* Object */ &&
+                    !(ts.getObjectFlags(target) & 16 /* Anonymous */ && target.symbol && target.symbol.flags & 32 /* Class */);
+                var symbol = isNonConstructorObject ? target.symbol : undefined;
+                if (symbol) {
+                    if (ts.contains(symbolStack, symbol)) {
+                        inferenceIncomplete = true;
+                        return;
+                    }
+                    (symbolStack || (symbolStack = [])).push(symbol);
+                    inferFromObjectTypesWorker(source, target);
+                    symbolStack.pop();
+                }
+                else {
+                    inferFromObjectTypesWorker(source, target);
+                }
+            }
+            function inferFromObjectTypesWorker(source, target) {
                 if (isGenericMappedType(source) && isGenericMappedType(target)) {
                     // The source and target types are generic types { [P in S]: X } and { [P in T]: Y }, so we infer
                     // from S to T and from X to Y.
@@ -44891,8 +46236,8 @@ var ts;
                     }
                 }
                 var properties = getPropertiesOfObjectType(target);
-                for (var _i = 0, properties_5 = properties; _i < properties_5.length; _i++) {
-                    var targetProp = properties_5[_i];
+                for (var _i = 0, properties_3 = properties; _i < properties_3.length; _i++) {
+                    var targetProp = properties_3[_i];
                     var sourceProp = getPropertyOfType(source, targetProp.escapedName);
                     if (sourceProp) {
                         inferFromTypes(getTypeOfSymbol(sourceProp), getTypeOfSymbol(targetProp));
@@ -44905,7 +46250,7 @@ var ts;
                 var sourceLen = sourceSignatures.length;
                 var targetLen = targetSignatures.length;
                 var len = sourceLen < targetLen ? sourceLen : targetLen;
-                var skipParameters = !!(ts.getObjectFlags(source) & 524288 /* ContainsAnyFunctionType */);
+                var skipParameters = !!(ts.getObjectFlags(source) & 1048576 /* NonInferrableType */);
                 for (var i = 0; i < len; i++) {
                     inferFromSignature(getBaseSignature(sourceSignatures[sourceLen - len + i]), getBaseSignature(targetSignatures[targetLen - len + i]), skipParameters);
                 }
@@ -44915,18 +46260,11 @@ var ts;
                     var saveBivariant = bivariant;
                     var kind = target.declaration ? target.declaration.kind : 0 /* Unknown */;
                     // Once we descend into a bivariant signature we remain bivariant for all nested inferences
-                    bivariant = bivariant || kind === 156 /* MethodDeclaration */ || kind === 155 /* MethodSignature */ || kind === 157 /* Constructor */;
-                    forEachMatchingParameterType(source, target, inferFromContravariantTypes);
+                    bivariant = bivariant || kind === 157 /* MethodDeclaration */ || kind === 156 /* MethodSignature */ || kind === 158 /* Constructor */;
+                    applyToParameterTypes(source, target, inferFromContravariantTypes);
                     bivariant = saveBivariant;
                 }
-                var sourceTypePredicate = getTypePredicateOfSignature(source);
-                var targetTypePredicate = getTypePredicateOfSignature(target);
-                if (sourceTypePredicate && targetTypePredicate && sourceTypePredicate.kind === targetTypePredicate.kind) {
-                    inferFromTypes(sourceTypePredicate.type, targetTypePredicate.type);
-                }
-                else {
-                    inferFromTypes(getReturnTypeOfSignature(source), getReturnTypeOfSignature(target));
-                }
+                applyToReturnTypes(source, target, inferFromTypes);
             }
             function inferFromIndexTypes(source, target) {
                 var targetStringIndexType = getIndexTypeOfType(target, 0 /* String */);
@@ -44948,15 +46286,33 @@ var ts;
                 }
             }
         }
-        function typeIdenticalToSomeType(type, types) {
+        function isMatchableType(type) {
+            // We exclude non-anonymous object types because some frameworks (e.g. Ember) rely on the ability to
+            // infer between types that don't witness their type variables. Such types would otherwise be eliminated
+            // because they appear identical.
+            return !(type.flags & 524288 /* Object */) || !!(ts.getObjectFlags(type) & 16 /* Anonymous */);
+        }
+        function typeMatchedBySomeType(type, types) {
             for (var _i = 0, types_11 = types; _i < types_11.length; _i++) {
                 var t = types_11[_i];
-                if (isTypeIdenticalTo(t, type)) {
+                if (t === type || isMatchableType(t) && isMatchableType(type) && isTypeIdenticalTo(t, type)) {
                     return true;
                 }
             }
             return false;
         }
+        function findMatchedType(type, target) {
+            if (typeMatchedBySomeType(type, target.types)) {
+                return type;
+            }
+            if (type.flags & (256 /* NumberLiteral */ | 128 /* StringLiteral */) && target.flags & 1048576 /* Union */) {
+                var base = getBaseTypeOfLiteralType(type);
+                if (typeMatchedBySomeType(base, target.types)) {
+                    return base;
+                }
+            }
+            return undefined;
+        }
         /**
          * Return a new union or intersection type computed by removing a given set of types
          * from a given union or intersection type.
@@ -44965,11 +46321,11 @@ var ts;
             var reducedTypes = [];
             for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
                 var t = _a[_i];
-                if (!typeIdenticalToSomeType(t, typesToRemove)) {
+                if (!typeMatchedBySomeType(t, typesToRemove)) {
                     reducedTypes.push(t);
                 }
             }
-            return type.flags & 1048576 /* Union */ ? getUnionType(reducedTypes) : getIntersectionType(reducedTypes);
+            return reducedTypes.length ? type.flags & 1048576 /* Union */ ? getUnionType(reducedTypes) : getIntersectionType(reducedTypes) : undefined;
         }
         function hasPrimitiveConstraint(type) {
             var constraint = getConstraintOfTypeParameter(type);
@@ -44978,22 +46334,25 @@ var ts;
         function isObjectLiteralType(type) {
             return !!(ts.getObjectFlags(type) & 128 /* ObjectLiteral */);
         }
-        function widenObjectLiteralCandidates(candidates) {
+        function isObjectOrArrayLiteralType(type) {
+            return !!(ts.getObjectFlags(type) & (128 /* ObjectLiteral */ | 65536 /* ArrayLiteral */));
+        }
+        function unionObjectAndArrayLiteralCandidates(candidates) {
             if (candidates.length > 1) {
-                var objectLiterals = ts.filter(candidates, isObjectLiteralType);
+                var objectLiterals = ts.filter(candidates, isObjectOrArrayLiteralType);
                 if (objectLiterals.length) {
-                    var objectLiteralsType = getWidenedType(getUnionType(objectLiterals, 2 /* Subtype */));
-                    return ts.concatenate(ts.filter(candidates, function (t) { return !isObjectLiteralType(t); }), [objectLiteralsType]);
+                    var literalsType = getUnionType(objectLiterals, 2 /* Subtype */);
+                    return ts.concatenate(ts.filter(candidates, function (t) { return !isObjectOrArrayLiteralType(t); }), [literalsType]);
                 }
             }
             return candidates;
         }
         function getContravariantInference(inference) {
-            return inference.priority & 28 /* PriorityImpliesCombination */ ? getIntersectionType(inference.contraCandidates) : getCommonSubtype(inference.contraCandidates);
+            return inference.priority & 56 /* PriorityImpliesCombination */ ? getIntersectionType(inference.contraCandidates) : getCommonSubtype(inference.contraCandidates);
         }
         function getCovariantInference(inference, signature) {
-            // Extract all object literal types and replace them with a single widened and normalized type.
-            var candidates = widenObjectLiteralCandidates(inference.candidates);
+            // Extract all object and array literal types and replace them with a single widened and normalized type.
+            var candidates = unionObjectAndArrayLiteralCandidates(inference.candidates);
             // We widen inferred literal types if
             // all inferences were made to top-level occurrences of the type parameter, and
             // the type parameter has no constraint or its constraint includes no primitive or literal types, and
@@ -45006,15 +46365,15 @@ var ts;
                     candidates;
             // If all inferences were made from a position that implies a combined result, infer a union type.
             // Otherwise, infer a common supertype.
-            var unwidenedType = inference.priority & 28 /* PriorityImpliesCombination */ ?
+            var unwidenedType = inference.priority & 56 /* PriorityImpliesCombination */ ?
                 getUnionType(baseCandidates, 2 /* Subtype */) :
                 getCommonSupertype(baseCandidates);
             return getWidenedType(unwidenedType);
         }
         function getInferredType(context, index) {
             var inference = context.inferences[index];
-            var inferredType = inference.inferredType;
-            if (!inferredType) {
+            if (!inference.inferredType) {
+                var inferredType = void 0;
                 var signature = context.signature;
                 if (signature) {
                     var inferredCovariantType = inference.candidates ? getCovariantInference(inference, signature) : undefined;
@@ -45043,31 +46402,26 @@ var ts;
                         if (defaultType) {
                             // Instantiate the default type. Any forward reference to a type
                             // parameter should be instantiated to the empty object type.
-                            inferredType = instantiateType(defaultType, combineTypeMappers(createBackreferenceMapper(context.typeParameters, index), context));
-                        }
-                        else {
-                            inferredType = getDefaultTypeArgumentType(!!(context.flags & 2 /* AnyDefault */));
+                            inferredType = instantiateType(defaultType, combineTypeMappers(createBackreferenceMapper(context, index), context.nonFixingMapper));
                         }
                     }
                 }
                 else {
                     inferredType = getTypeFromInference(inference);
                 }
-                inference.inferredType = inferredType;
+                inference.inferredType = inferredType || getDefaultTypeArgumentType(!!(context.flags & 2 /* AnyDefault */));
                 var constraint = getConstraintOfTypeParameter(inference.typeParameter);
                 if (constraint) {
-                    context.flags |= 4 /* NoFixing */;
-                    var instantiatedConstraint = instantiateType(constraint, context);
-                    if (!context.compareTypes(inferredType, getTypeWithThisArgument(instantiatedConstraint, inferredType))) {
+                    var instantiatedConstraint = instantiateType(constraint, context.nonFixingMapper);
+                    if (!inferredType || !context.compareTypes(inferredType, getTypeWithThisArgument(instantiatedConstraint, inferredType))) {
                         inference.inferredType = inferredType = instantiatedConstraint;
                     }
-                    context.flags &= ~4 /* NoFixing */;
                 }
             }
-            return inferredType;
+            return inference.inferredType;
         }
         function getDefaultTypeArgumentType(isInJavaScriptFile) {
-            return isInJavaScriptFile ? anyType : emptyObjectType;
+            return isInJavaScriptFile ? anyType : unknownType;
         }
         function getInferredTypes(context) {
             var result = [];
@@ -45077,8 +46431,8 @@ var ts;
             return result;
         }
         // EXPRESSION TYPE CHECKING
-        function getCannotFindNameDiagnosticForName(name) {
-            switch (name) {
+        function getCannotFindNameDiagnosticForName(node) {
+            switch (node.escapedText) {
                 case "document":
                 case "console":
                     return ts.Diagnostics.Cannot_find_name_0_Do_you_need_to_change_your_target_library_Try_changing_the_lib_compiler_option_to_include_dom;
@@ -45109,14 +46463,20 @@ var ts;
                 case "Iterator":
                 case "AsyncIterator":
                     return ts.Diagnostics.Cannot_find_name_0_Do_you_need_to_change_your_target_library_Try_changing_the_lib_compiler_option_to_es2015_or_later;
-                default: return ts.Diagnostics.Cannot_find_name_0;
+                default:
+                    if (node.parent.kind === 277 /* ShorthandPropertyAssignment */) {
+                        return ts.Diagnostics.No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer;
+                    }
+                    else {
+                        return ts.Diagnostics.Cannot_find_name_0;
+                    }
             }
         }
         function getResolvedSymbol(node) {
             var links = getNodeLinks(node);
             if (!links.resolvedSymbol) {
                 links.resolvedSymbol = !ts.nodeIsMissing(node) &&
-                    resolveName(node, node.escapedText, 67220415 /* Value */ | 1048576 /* ExportValue */, getCannotFindNameDiagnosticForName(node.escapedText), node, !ts.isWriteOnlyAccess(node), 
+                    resolveName(node, node.escapedText, 67220415 /* Value */ | 1048576 /* ExportValue */, getCannotFindNameDiagnosticForName(node), node, !ts.isWriteOnlyAccess(node), 
                     /*excludeGlobals*/ false, ts.Diagnostics.Cannot_find_name_0_Did_you_mean_1) || unknownSymbol;
             }
             return links.resolvedSymbol;
@@ -45125,7 +46485,7 @@ var ts;
             // TypeScript 1.0 spec (April 2014): 3.6.3
             // A type query consists of the keyword typeof followed by an expression.
             // The expression is restricted to a single identifier or a sequence of identifiers separated by periods
-            return !!ts.findAncestor(node, function (n) { return n.kind === 167 /* TypeQuery */ ? true : n.kind === 72 /* Identifier */ || n.kind === 148 /* QualifiedName */ ? false : "quit"; });
+            return !!ts.findAncestor(node, function (n) { return n.kind === 168 /* TypeQuery */ ? true : n.kind === 73 /* Identifier */ || n.kind === 149 /* QualifiedName */ ? false : "quit"; });
         }
         // Return the flow cache key for a "dotted name" (i.e. a sequence of identifiers
         // separated by dots). The key consists of the id of the symbol referenced by the
@@ -45133,21 +46493,21 @@ var ts;
         // The result is undefined if the reference isn't a dotted name. We prefix nodes
         // occurring in an apparent type position with '@' because the control flow type
         // of such nodes may be based on the apparent type instead of the declared type.
-        function getFlowCacheKey(node) {
+        function getFlowCacheKey(node, declaredType, initialType, flowContainer) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     var symbol = getResolvedSymbol(node);
-                    return symbol !== unknownSymbol ? (isConstraintPosition(node) ? "@" : "") + getSymbolId(symbol) : undefined;
-                case 100 /* ThisKeyword */:
+                    return symbol !== unknownSymbol ? (flowContainer ? getNodeId(flowContainer) : "-1") + "|" + getTypeId(declaredType) + "|" + getTypeId(initialType) + "|" + (isConstraintPosition(node) ? "@" : "") + getSymbolId(symbol) : undefined;
+                case 101 /* ThisKeyword */:
                     return "0";
-                case 213 /* NonNullExpression */:
-                case 195 /* ParenthesizedExpression */:
-                    return getFlowCacheKey(node.expression);
-                case 189 /* PropertyAccessExpression */:
-                case 190 /* ElementAccessExpression */:
+                case 214 /* NonNullExpression */:
+                case 196 /* ParenthesizedExpression */:
+                    return getFlowCacheKey(node.expression, declaredType, initialType, flowContainer);
+                case 190 /* PropertyAccessExpression */:
+                case 191 /* ElementAccessExpression */:
                     var propName = getAccessedPropertyName(node);
                     if (propName !== undefined) {
-                        var key = getFlowCacheKey(node.expression);
+                        var key = getFlowCacheKey(node.expression, declaredType, initialType, flowContainer);
                         return key && key + "." + propName;
                     }
             }
@@ -45155,24 +46515,24 @@ var ts;
         }
         function isMatchingReference(source, target) {
             switch (target.kind) {
-                case 195 /* ParenthesizedExpression */:
-                case 213 /* NonNullExpression */:
+                case 196 /* ParenthesizedExpression */:
+                case 214 /* NonNullExpression */:
                     return isMatchingReference(source, target.expression);
             }
             switch (source.kind) {
-                case 72 /* Identifier */:
-                    return target.kind === 72 /* Identifier */ && getResolvedSymbol(source) === getResolvedSymbol(target) ||
-                        (target.kind === 237 /* VariableDeclaration */ || target.kind === 186 /* BindingElement */) &&
+                case 73 /* Identifier */:
+                    return target.kind === 73 /* Identifier */ && getResolvedSymbol(source) === getResolvedSymbol(target) ||
+                        (target.kind === 238 /* VariableDeclaration */ || target.kind === 187 /* BindingElement */) &&
                             getExportSymbolOfValueSymbolIfExported(getResolvedSymbol(source)) === getSymbolOfNode(target);
-                case 100 /* ThisKeyword */:
-                    return target.kind === 100 /* ThisKeyword */;
-                case 98 /* SuperKeyword */:
-                    return target.kind === 98 /* SuperKeyword */;
-                case 213 /* NonNullExpression */:
-                case 195 /* ParenthesizedExpression */:
+                case 101 /* ThisKeyword */:
+                    return target.kind === 101 /* ThisKeyword */;
+                case 99 /* SuperKeyword */:
+                    return target.kind === 99 /* SuperKeyword */;
+                case 214 /* NonNullExpression */:
+                case 196 /* ParenthesizedExpression */:
                     return isMatchingReference(source.expression, target);
-                case 189 /* PropertyAccessExpression */:
-                case 190 /* ElementAccessExpression */:
+                case 190 /* PropertyAccessExpression */:
+                case 191 /* ElementAccessExpression */:
                     return ts.isAccessExpression(target) &&
                         getAccessedPropertyName(source) === getAccessedPropertyName(target) &&
                         isMatchingReference(source.expression, target.expression);
@@ -45180,7 +46540,7 @@ var ts;
             return false;
         }
         function getAccessedPropertyName(access) {
-            return access.kind === 189 /* PropertyAccessExpression */ ? access.name.escapedText :
+            return access.kind === 190 /* PropertyAccessExpression */ ? access.name.escapedText :
                 ts.isStringLiteral(access.argumentExpression) || ts.isNumericLiteral(access.argumentExpression) ? ts.escapeLeadingUnderscores(access.argumentExpression.text) :
                     undefined;
         }
@@ -45205,7 +46565,7 @@ var ts;
                 isDiscriminantProperty(getDeclaredTypeOfReference(target.expression), name);
         }
         function getDeclaredTypeOfReference(expr) {
-            if (expr.kind === 72 /* Identifier */) {
+            if (expr.kind === 73 /* Identifier */) {
                 return getTypeOfSymbol(getResolvedSymbol(expr));
             }
             if (ts.isAccessExpression(expr)) {
@@ -45227,7 +46587,7 @@ var ts;
                 if (prop && ts.getCheckFlags(prop) & 2 /* SyntheticProperty */) {
                     if (prop.isDiscriminantProperty === undefined) {
                         prop.isDiscriminantProperty =
-                            (prop.checkFlags & 96 /* Discriminant */) === 96 /* Discriminant */ &&
+                            (prop.checkFlags & 192 /* Discriminant */) === 192 /* Discriminant */ &&
                                 isDiscriminantType(getTypeOfSymbol(prop));
                     }
                     return !!prop.isDiscriminantProperty;
@@ -45236,7 +46596,7 @@ var ts;
             return false;
         }
         function isSyntheticThisPropertyAccess(expr) {
-            return ts.isAccessExpression(expr) && expr.expression.kind === 100 /* ThisKeyword */ && !!(expr.expression.flags & 8 /* Synthesized */);
+            return ts.isAccessExpression(expr) && expr.expression.kind === 101 /* ThisKeyword */ && !!(expr.expression.flags & 8 /* Synthesized */);
         }
         function findDiscriminantProperties(sourceProperties, target) {
             var result;
@@ -45264,7 +46624,7 @@ var ts;
                     }
                 }
             }
-            if (callExpression.expression.kind === 189 /* PropertyAccessExpression */ &&
+            if (callExpression.expression.kind === 190 /* PropertyAccessExpression */ &&
                 isOrContainsMatchingReference(reference, callExpression.expression.expression)) {
                 return true;
             }
@@ -45383,7 +46743,7 @@ var ts;
                 return strictNullChecks ? 7888800 /* ObjectStrictFacts */ : 16736160 /* ObjectFacts */;
             }
             if (flags & 63176704 /* Instantiable */) {
-                return getTypeFacts(getBaseConstraintOfType(type) || emptyObjectType);
+                return getTypeFacts(getBaseConstraintOfType(type) || unknownType);
             }
             if (flags & 3145728 /* UnionOrIntersection */) {
                 return getTypeFactsOfTypes(type.types);
@@ -45412,22 +46772,22 @@ var ts;
         }
         function getTypeOfDestructuredArrayElement(type, index) {
             return everyType(type, isTupleLikeType) && getTupleElementType(type, index) ||
-                checkIteratedTypeOrElementType(type, /*errorNode*/ undefined, /*allowStringInput*/ false, /*allowAsyncIterables*/ false) ||
+                checkIteratedTypeOrElementType(65 /* Destructuring */, type, undefinedType, /*errorNode*/ undefined) ||
                 errorType;
         }
         function getTypeOfDestructuredSpreadExpression(type) {
-            return createArrayType(checkIteratedTypeOrElementType(type, /*errorNode*/ undefined, /*allowStringInput*/ false, /*allowAsyncIterables*/ false) || errorType);
+            return createArrayType(checkIteratedTypeOrElementType(65 /* Destructuring */, type, undefinedType, /*errorNode*/ undefined) || errorType);
         }
         function getAssignedTypeOfBinaryExpression(node) {
-            var isDestructuringDefaultAssignment = node.parent.kind === 187 /* ArrayLiteralExpression */ && isDestructuringAssignmentTarget(node.parent) ||
-                node.parent.kind === 275 /* PropertyAssignment */ && isDestructuringAssignmentTarget(node.parent.parent);
+            var isDestructuringDefaultAssignment = node.parent.kind === 188 /* ArrayLiteralExpression */ && isDestructuringAssignmentTarget(node.parent) ||
+                node.parent.kind === 276 /* PropertyAssignment */ && isDestructuringAssignmentTarget(node.parent.parent);
             return isDestructuringDefaultAssignment ?
                 getTypeWithDefault(getAssignedType(node), node.right) :
                 getTypeOfExpression(node.right);
         }
         function isDestructuringAssignmentTarget(parent) {
-            return parent.parent.kind === 204 /* BinaryExpression */ && parent.parent.left === parent ||
-                parent.parent.kind === 227 /* ForOfStatement */ && parent.parent.initializer === parent;
+            return parent.parent.kind === 205 /* BinaryExpression */ && parent.parent.left === parent ||
+                parent.parent.kind === 228 /* ForOfStatement */ && parent.parent.initializer === parent;
         }
         function getAssignedTypeOfArrayLiteralElement(node, element) {
             return getTypeOfDestructuredArrayElement(getAssignedType(node), node.elements.indexOf(element));
@@ -45444,21 +46804,21 @@ var ts;
         function getAssignedType(node) {
             var parent = node.parent;
             switch (parent.kind) {
-                case 226 /* ForInStatement */:
+                case 227 /* ForInStatement */:
                     return stringType;
-                case 227 /* ForOfStatement */:
+                case 228 /* ForOfStatement */:
                     return checkRightHandSideOfForOf(parent.expression, parent.awaitModifier) || errorType;
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return getAssignedTypeOfBinaryExpression(parent);
-                case 198 /* DeleteExpression */:
+                case 199 /* DeleteExpression */:
                     return undefinedType;
-                case 187 /* ArrayLiteralExpression */:
+                case 188 /* ArrayLiteralExpression */:
                     return getAssignedTypeOfArrayLiteralElement(parent, node);
-                case 208 /* SpreadElement */:
+                case 209 /* SpreadElement */:
                     return getAssignedTypeOfSpreadExpression(parent);
-                case 275 /* PropertyAssignment */:
+                case 276 /* PropertyAssignment */:
                     return getAssignedTypeOfPropertyAssignment(parent);
-                case 276 /* ShorthandPropertyAssignment */:
+                case 277 /* ShorthandPropertyAssignment */:
                     return getAssignedTypeOfShorthandPropertyAssignment(parent);
             }
             return errorType;
@@ -45466,7 +46826,7 @@ var ts;
         function getInitialTypeOfBindingElement(node) {
             var pattern = node.parent;
             var parentType = getInitialType(pattern.parent);
-            var type = pattern.kind === 184 /* ObjectBindingPattern */ ?
+            var type = pattern.kind === 185 /* ObjectBindingPattern */ ?
                 getTypeOfDestructuredProperty(parentType, node.propertyName || node.name) :
                 !node.dotDotDotToken ?
                     getTypeOfDestructuredArrayElement(parentType, pattern.elements.indexOf(node)) :
@@ -45484,37 +46844,37 @@ var ts;
             if (node.initializer) {
                 return getTypeOfInitializer(node.initializer);
             }
-            if (node.parent.parent.kind === 226 /* ForInStatement */) {
+            if (node.parent.parent.kind === 227 /* ForInStatement */) {
                 return stringType;
             }
-            if (node.parent.parent.kind === 227 /* ForOfStatement */) {
+            if (node.parent.parent.kind === 228 /* ForOfStatement */) {
                 return checkRightHandSideOfForOf(node.parent.parent.expression, node.parent.parent.awaitModifier) || errorType;
             }
             return errorType;
         }
         function getInitialType(node) {
-            return node.kind === 237 /* VariableDeclaration */ ?
+            return node.kind === 238 /* VariableDeclaration */ ?
                 getInitialTypeOfVariableDeclaration(node) :
                 getInitialTypeOfBindingElement(node);
         }
         function getInitialOrAssignedType(node, reference) {
-            return getConstraintForLocation(node.kind === 237 /* VariableDeclaration */ || node.kind === 186 /* BindingElement */ ?
+            return getConstraintForLocation(node.kind === 238 /* VariableDeclaration */ || node.kind === 187 /* BindingElement */ ?
                 getInitialType(node) :
                 getAssignedType(node), reference);
         }
         function isEmptyArrayAssignment(node) {
-            return node.kind === 237 /* VariableDeclaration */ && node.initializer &&
+            return node.kind === 238 /* VariableDeclaration */ && node.initializer &&
                 isEmptyArrayLiteral(node.initializer) ||
-                node.kind !== 186 /* BindingElement */ && node.parent.kind === 204 /* BinaryExpression */ &&
+                node.kind !== 187 /* BindingElement */ && node.parent.kind === 205 /* BinaryExpression */ &&
                     isEmptyArrayLiteral(node.parent.right);
         }
         function getReferenceCandidate(node) {
             switch (node.kind) {
-                case 195 /* ParenthesizedExpression */:
+                case 196 /* ParenthesizedExpression */:
                     return getReferenceCandidate(node.expression);
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     switch (node.operatorToken.kind) {
-                        case 59 /* EqualsToken */:
+                        case 60 /* EqualsToken */:
                             return getReferenceCandidate(node.left);
                         case 27 /* CommaToken */:
                             return getReferenceCandidate(node.right);
@@ -45524,13 +46884,13 @@ var ts;
         }
         function getReferenceRoot(node) {
             var parent = node.parent;
-            return parent.kind === 195 /* ParenthesizedExpression */ ||
-                parent.kind === 204 /* BinaryExpression */ && parent.operatorToken.kind === 59 /* EqualsToken */ && parent.left === node ||
-                parent.kind === 204 /* BinaryExpression */ && parent.operatorToken.kind === 27 /* CommaToken */ && parent.right === node ?
+            return parent.kind === 196 /* ParenthesizedExpression */ ||
+                parent.kind === 205 /* BinaryExpression */ && parent.operatorToken.kind === 60 /* EqualsToken */ && parent.left === node ||
+                parent.kind === 205 /* BinaryExpression */ && parent.operatorToken.kind === 27 /* CommaToken */ && parent.right === node ?
                 getReferenceRoot(parent) : node;
         }
         function getTypeOfSwitchClause(clause) {
-            if (clause.kind === 271 /* CaseClause */) {
+            if (clause.kind === 272 /* CaseClause */) {
                 return getRegularTypeOfLiteralType(getTypeOfExpression(clause.expression));
             }
             return neverType;
@@ -45552,7 +46912,7 @@ var ts;
             var witnesses = [];
             for (var _i = 0, _a = switchStatement.caseBlock.clauses; _i < _a.length; _i++) {
                 var clause = _a[_i];
-                if (clause.kind === 271 /* CaseClause */) {
+                if (clause.kind === 272 /* CaseClause */) {
                     if (clause.expression.kind === 10 /* StringLiteral */) {
                         witnesses.push(clause.expression.text);
                         continue;
@@ -45598,6 +46958,9 @@ var ts;
             }
             return f(type) ? type : neverType;
         }
+        function countTypes(type) {
+            return type.flags & 1048576 /* Union */ ? type.types.length : 1;
+        }
         function mapType(type, mapper, noReductions) {
             if (type.flags & 131072 /* Never */) {
                 return type;
@@ -45605,25 +46968,20 @@ var ts;
             if (!(type.flags & 1048576 /* Union */)) {
                 return mapper(type);
             }
-            var types = type.types;
-            var mappedType;
             var mappedTypes;
-            for (var _i = 0, types_13 = types; _i < types_13.length; _i++) {
-                var current = types_13[_i];
-                var t = mapper(current);
-                if (t) {
-                    if (!mappedType) {
-                        mappedType = t;
-                    }
-                    else if (!mappedTypes) {
-                        mappedTypes = [mappedType, t];
+            for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
+                var t = _a[_i];
+                var mapped = mapper(t);
+                if (mapped) {
+                    if (!mappedTypes) {
+                        mappedTypes = [mapped];
                     }
                     else {
-                        mappedTypes.push(t);
+                        mappedTypes.push(mapped);
                     }
                 }
             }
-            return mappedTypes ? getUnionType(mappedTypes, noReductions ? 0 /* None */ : 1 /* Literal */) : mappedType;
+            return mappedTypes && getUnionType(mappedTypes, noReductions ? 0 /* None */ : 1 /* Literal */);
         }
         function extractTypesOfKind(type, kind) {
             return filterType(type, function (t) { return (t.flags & kind) !== 0; });
@@ -45691,8 +47049,8 @@ var ts;
         }
         function isEvolvingArrayTypeList(types) {
             var hasEvolvingArrayType = false;
-            for (var _i = 0, types_14 = types; _i < types_14.length; _i++) {
-                var t = types_14[_i];
+            for (var _i = 0, types_13 = types; _i < types_13.length; _i++) {
+                var t = types_13[_i];
                 if (!(t.flags & 131072 /* Never */)) {
                     if (!(ts.getObjectFlags(t) & 256 /* EvolvingArray */)) {
                         return false;
@@ -45715,12 +47073,12 @@ var ts;
         function isEvolvingArrayOperationTarget(node) {
             var root = getReferenceRoot(node);
             var parent = root.parent;
-            var isLengthPushOrUnshift = parent.kind === 189 /* PropertyAccessExpression */ && (parent.name.escapedText === "length" ||
-                parent.parent.kind === 191 /* CallExpression */ && ts.isPushOrUnshiftIdentifier(parent.name));
-            var isElementAssignment = parent.kind === 190 /* ElementAccessExpression */ &&
+            var isLengthPushOrUnshift = parent.kind === 190 /* PropertyAccessExpression */ && (parent.name.escapedText === "length" ||
+                parent.parent.kind === 192 /* CallExpression */ && ts.isPushOrUnshiftIdentifier(parent.name));
+            var isElementAssignment = parent.kind === 191 /* ElementAccessExpression */ &&
                 parent.expression === root &&
-                parent.parent.kind === 204 /* BinaryExpression */ &&
-                parent.parent.operatorToken.kind === 59 /* EqualsToken */ &&
+                parent.parent.kind === 205 /* BinaryExpression */ &&
+                parent.parent.operatorToken.kind === 60 /* EqualsToken */ &&
                 parent.parent.left === parent &&
                 !ts.isAssignmentTarget(parent.parent) &&
                 isTypeAssignableToKind(getTypeOfExpression(parent.argumentExpression), 296 /* NumberLike */);
@@ -45734,7 +47092,7 @@ var ts;
             return links.maybeTypePredicate;
         }
         function getMaybeTypePredicate(node) {
-            if (node.expression.kind !== 98 /* SuperKeyword */) {
+            if (node.expression.kind !== 99 /* SuperKeyword */) {
                 var funcType = checkNonNullExpression(node.expression);
                 if (funcType !== silentNeverType) {
                     var apparentType = getApparentType(funcType);
@@ -45752,6 +47110,7 @@ var ts;
         function getFlowTypeOfReference(reference, declaredType, initialType, flowContainer, couldBeUninitialized) {
             if (initialType === void 0) { initialType = declaredType; }
             var key;
+            var keySet = false;
             var flowDepth = 0;
             if (flowAnalysisDisabled) {
                 return errorType;
@@ -45767,10 +47126,17 @@ var ts;
             // on empty arrays are possible without implicit any errors and new element types can be inferred without
             // type mismatch errors.
             var resultType = ts.getObjectFlags(evolvedType) & 256 /* EvolvingArray */ && isEvolvingArrayOperationTarget(reference) ? autoArrayType : finalizeEvolvingArrayType(evolvedType);
-            if (reference.parent && reference.parent.kind === 213 /* NonNullExpression */ && getTypeWithFacts(resultType, 2097152 /* NEUndefinedOrNull */).flags & 131072 /* Never */) {
+            if (reference.parent && reference.parent.kind === 214 /* NonNullExpression */ && getTypeWithFacts(resultType, 2097152 /* NEUndefinedOrNull */).flags & 131072 /* Never */) {
                 return declaredType;
             }
             return resultType;
+            function getOrSetCacheKey() {
+                if (keySet) {
+                    return key;
+                }
+                keySet = true;
+                return key = getFlowCacheKey(reference, declaredType, initialType, flowContainer);
+            }
             function getTypeAtFlowNode(flow) {
                 if (flowDepth === 2000) {
                     // We have made 2000 recursive invocations. To avoid overflowing the call stack we report an error
@@ -45782,6 +47148,15 @@ var ts;
                 flowDepth++;
                 while (true) {
                     var flags = flow.flags;
+                    if (flags & 8192 /* Cached */) {
+                        var key_2 = getOrSetCacheKey();
+                        if (key_2) {
+                            var id = getFlowNodeId(flow);
+                            if (flowAssignmentKeys[id] === key_2) {
+                                return flowAssignmentTypes[id];
+                            }
+                        }
+                    }
                     if (flags & 1024 /* Shared */) {
                         // We cache results of flow type resolution for shared nodes that were previously visited in
                         // the same getFlowTypeOfReference invocation. A node is considered shared when it is the
@@ -45812,6 +47187,15 @@ var ts;
                             flow = flow.antecedent;
                             continue;
                         }
+                        else if (flowLoopCount === flowLoopStart) { // Only cache assignments when not within loop analysis
+                            var key_3 = getOrSetCacheKey();
+                            if (key_3 && !isIncomplete(type)) {
+                                flow.flags |= 8192 /* Cached */;
+                                var id = getFlowNodeId(flow);
+                                flowAssignmentKeys[id] = key_3;
+                                flowAssignmentTypes[id] = type;
+                            }
+                        }
                     }
                     else if (flags & 96 /* Condition */) {
                         type = getTypeAtFlowCondition(flow);
@@ -45839,9 +47223,9 @@ var ts;
                         // Check if we should continue with the control flow of the containing function.
                         var container = flow.container;
                         if (container && container !== flowContainer &&
-                            reference.kind !== 189 /* PropertyAccessExpression */ &&
-                            reference.kind !== 190 /* ElementAccessExpression */ &&
-                            reference.kind !== 100 /* ThisKeyword */) {
+                            reference.kind !== 190 /* PropertyAccessExpression */ &&
+                            reference.kind !== 191 /* ElementAccessExpression */ &&
+                            reference.kind !== 101 /* ThisKeyword */) {
                             flow = container.flowNode;
                             continue;
                         }
@@ -45893,14 +47277,14 @@ var ts;
                     // in which case we continue control flow analysis back to the function's declaration
                     if (ts.isVariableDeclaration(node) && (ts.isInJSFile(node) || ts.isVarConst(node))) {
                         var init = ts.getDeclaredExpandoInitializer(node);
-                        if (init && (init.kind === 196 /* FunctionExpression */ || init.kind === 197 /* ArrowFunction */)) {
+                        if (init && (init.kind === 197 /* FunctionExpression */ || init.kind === 198 /* ArrowFunction */)) {
                             return getTypeAtFlowNode(flow.antecedent);
                         }
                     }
                     return declaredType;
                 }
                 // for (const _ in ref) acts as a nonnull on ref
-                if (ts.isVariableDeclaration(node) && node.parent.parent.kind === 226 /* ForInStatement */ && isMatchingReference(reference, node.parent.parent.expression)) {
+                if (ts.isVariableDeclaration(node) && node.parent.parent.kind === 227 /* ForInStatement */ && isMatchingReference(reference, node.parent.parent.expression)) {
                     return getNonNullableTypeIfNeeded(getTypeFromFlowType(getTypeAtFlowNode(flow.antecedent)));
                 }
                 // Assignment doesn't affect reference
@@ -45909,7 +47293,7 @@ var ts;
             function getTypeAtFlowArrayMutation(flow) {
                 if (declaredType === autoType || declaredType === autoArrayType) {
                     var node = flow.node;
-                    var expr = node.kind === 191 /* CallExpression */ ?
+                    var expr = node.kind === 192 /* CallExpression */ ?
                         node.expression.expression :
                         node.left.expression;
                     if (isMatchingReference(reference, getReferenceCandidate(expr))) {
@@ -45917,7 +47301,7 @@ var ts;
                         var type = getTypeFromFlowType(flowType);
                         if (ts.getObjectFlags(type) & 256 /* EvolvingArray */) {
                             var evolvedType_1 = type;
-                            if (node.kind === 191 /* CallExpression */) {
+                            if (node.kind === 192 /* CallExpression */) {
                                 for (var _i = 0, _a = node.arguments; _i < _a.length; _i++) {
                                     var arg = _a[_i];
                                     evolvedType_1 = addEvolvingArrayElementType(evolvedType_1, arg);
@@ -45970,7 +47354,7 @@ var ts;
                 else if (isMatchingReferenceDiscriminant(expr, type)) {
                     type = narrowTypeByDiscriminant(type, expr, function (t) { return narrowTypeBySwitchOnDiscriminant(t, flow.switchStatement, flow.clauseStart, flow.clauseEnd); });
                 }
-                else if (expr.kind === 199 /* TypeOfExpression */ && isMatchingReference(reference, expr.expression)) {
+                else if (expr.kind === 200 /* TypeOfExpression */ && isMatchingReference(reference, expr.expression)) {
                     type = narrowBySwitchOnTypeOf(type, flow.switchStatement, flow.clauseStart, flow.clauseEnd);
                 }
                 else if (containsMatchingReferenceDiscriminant(reference, expr)) {
@@ -46017,12 +47401,10 @@ var ts;
                 // this flow loop junction, return the cached type.
                 var id = getFlowNodeId(flow);
                 var cache = flowLoopCaches[id] || (flowLoopCaches[id] = ts.createMap());
+                var key = getOrSetCacheKey();
                 if (!key) {
-                    key = getFlowCacheKey(reference);
                     // No cache key is generated when binding patterns are in unnarrowable situations
-                    if (!key) {
-                        return declaredType;
-                    }
+                    return declaredType;
                 }
                 var cached = cache.get(key);
                 if (cached) {
@@ -46130,7 +47512,7 @@ var ts;
                 return !assumeTrue;
             }
             function narrowByInKeyword(type, literal, assumeTrue) {
-                if ((type.flags & (1048576 /* Union */ | 524288 /* Object */)) || (type.flags & 262144 /* TypeParameter */ && type.isThisType)) {
+                if (type.flags & (1048576 /* Union */ | 524288 /* Object */) || isThisTypeParameter(type)) {
                     var propName_1 = ts.escapeLeadingUnderscores(literal.text);
                     return filterType(type, function (t) { return isTypePresencePossible(t, propName_1, assumeTrue); });
                 }
@@ -46138,8 +47520,8 @@ var ts;
             }
             function narrowTypeByBinaryExpression(type, expr, assumeTrue) {
                 switch (expr.operatorToken.kind) {
-                    case 59 /* EqualsToken */:
-                        return narrowTypeByTruthiness(type, expr.left, assumeTrue);
+                    case 60 /* EqualsToken */:
+                        return narrowTypeByTruthiness(narrowType(type, expr.right, assumeTrue), expr.left, assumeTrue);
                     case 33 /* EqualsEqualsToken */:
                     case 34 /* ExclamationEqualsToken */:
                     case 35 /* EqualsEqualsEqualsToken */:
@@ -46147,10 +47529,10 @@ var ts;
                         var operator_1 = expr.operatorToken.kind;
                         var left_1 = getReferenceCandidate(expr.left);
                         var right_1 = getReferenceCandidate(expr.right);
-                        if (left_1.kind === 199 /* TypeOfExpression */ && ts.isStringLiteralLike(right_1)) {
+                        if (left_1.kind === 200 /* TypeOfExpression */ && ts.isStringLiteralLike(right_1)) {
                             return narrowTypeByTypeof(type, left_1, operator_1, right_1, assumeTrue);
                         }
-                        if (right_1.kind === 199 /* TypeOfExpression */ && ts.isStringLiteralLike(left_1)) {
+                        if (right_1.kind === 200 /* TypeOfExpression */ && ts.isStringLiteralLike(left_1)) {
                             return narrowTypeByTypeof(type, right_1, operator_1, left_1, assumeTrue);
                         }
                         if (isMatchingReference(reference, left_1)) {
@@ -46169,9 +47551,9 @@ var ts;
                             return declaredType;
                         }
                         break;
-                    case 94 /* InstanceOfKeyword */:
+                    case 95 /* InstanceOfKeyword */:
                         return narrowTypeByInstanceof(type, expr, assumeTrue);
-                    case 93 /* InKeyword */:
+                    case 94 /* InKeyword */:
                         var target = getReferenceCandidate(expr.right);
                         if (ts.isStringLiteralLike(expr.left) && isMatchingReference(reference, target)) {
                             return narrowByInKeyword(type, expr.left, assumeTrue);
@@ -46215,7 +47597,10 @@ var ts;
                     return type;
                 }
                 if (assumeTrue) {
-                    var narrowedType = filterType(type, function (t) { return areTypesComparable(t, valueType); });
+                    var filterFn = operator === 33 /* EqualsEqualsToken */ ?
+                        (function (t) { return areTypesComparable(t, valueType) || isCoercibleUnderDoubleEquals(t, valueType); }) :
+                        function (t) { return areTypesComparable(t, valueType); };
+                    var narrowedType = filterType(type, filterFn);
                     return narrowedType.flags & 131072 /* Never */ ? type : replacePrimitivesWithLiterals(narrowedType, valueType);
                 }
                 if (isUnitType(valueType)) {
@@ -46476,7 +47861,7 @@ var ts;
                     return type;
                 }
                 if (ts.isIdentifierTypePredicate(predicate)) {
-                    var predicateArgument = callExpression.arguments[predicate.parameterIndex - (signature.thisParameter ? 1 : 0)];
+                    var predicateArgument = callExpression.arguments[predicate.parameterIndex];
                     if (predicateArgument) {
                         if (isMatchingReference(reference, predicateArgument)) {
                             return getNarrowedType(type, predicate.type, assumeTrue, isTypeSubtypeOf);
@@ -46504,19 +47889,19 @@ var ts;
             // will be a subtype or the same type as the argument.
             function narrowType(type, expr, assumeTrue) {
                 switch (expr.kind) {
-                    case 72 /* Identifier */:
-                    case 100 /* ThisKeyword */:
-                    case 98 /* SuperKeyword */:
-                    case 189 /* PropertyAccessExpression */:
-                    case 190 /* ElementAccessExpression */:
+                    case 73 /* Identifier */:
+                    case 101 /* ThisKeyword */:
+                    case 99 /* SuperKeyword */:
+                    case 190 /* PropertyAccessExpression */:
+                    case 191 /* ElementAccessExpression */:
                         return narrowTypeByTruthiness(type, expr, assumeTrue);
-                    case 191 /* CallExpression */:
+                    case 192 /* CallExpression */:
                         return narrowTypeByTypePredicate(type, expr, assumeTrue);
-                    case 195 /* ParenthesizedExpression */:
+                    case 196 /* ParenthesizedExpression */:
                         return narrowType(type, expr.expression, assumeTrue);
-                    case 204 /* BinaryExpression */:
+                    case 205 /* BinaryExpression */:
                         return narrowTypeByBinaryExpression(type, expr, assumeTrue);
-                    case 202 /* PrefixUnaryExpression */:
+                    case 203 /* PrefixUnaryExpression */:
                         if (expr.operator === 52 /* ExclamationToken */) {
                             return narrowType(type, expr.operand, !assumeTrue);
                         }
@@ -46531,7 +47916,7 @@ var ts;
             // an dotted name expression, and if the location is not an assignment target, obtain the type
             // of the expression (which will reflect control flow analysis). If the expression indeed
             // resolved to the given symbol, return the narrowed type.
-            if (location.kind === 72 /* Identifier */) {
+            if (location.kind === 73 /* Identifier */) {
                 if (ts.isRightSideOfQualifiedNameOrPropertyAccess(location)) {
                     location = location.parent;
                 }
@@ -46552,9 +47937,9 @@ var ts;
         function getControlFlowContainer(node) {
             return ts.findAncestor(node.parent, function (node) {
                 return ts.isFunctionLike(node) && !ts.getImmediatelyInvokedFunctionExpression(node) ||
-                    node.kind === 245 /* ModuleBlock */ ||
-                    node.kind === 284 /* SourceFile */ ||
-                    node.kind === 154 /* PropertyDeclaration */;
+                    node.kind === 246 /* ModuleBlock */ ||
+                    node.kind === 285 /* SourceFile */ ||
+                    node.kind === 155 /* PropertyDeclaration */;
             });
         }
         // Check if a parameter is assigned anywhere within its declaring function.
@@ -46573,10 +47958,10 @@ var ts;
             return !!ts.findAncestor(node.parent, function (node) { return ts.isFunctionLike(node) && !!(getNodeLinks(node).flags & 8388608 /* AssignmentsMarked */); });
         }
         function markParameterAssignments(node) {
-            if (node.kind === 72 /* Identifier */) {
+            if (node.kind === 73 /* Identifier */) {
                 if (ts.isAssignmentTarget(node)) {
                     var symbol = getResolvedSymbol(node);
-                    if (symbol.valueDeclaration && ts.getRootDeclaration(symbol.valueDeclaration).kind === 151 /* Parameter */) {
+                    if (symbol.valueDeclaration && ts.getRootDeclaration(symbol.valueDeclaration).kind === 152 /* Parameter */) {
                         symbol.isAssigned = true;
                     }
                 }
@@ -46591,7 +47976,7 @@ var ts;
         /** remove undefined from the annotated type of a parameter when there is an initializer (that doesn't include undefined) */
         function removeOptionalityFromDeclaredType(declaredType, declaration) {
             var annotationIncludesUndefined = strictNullChecks &&
-                declaration.kind === 151 /* Parameter */ &&
+                declaration.kind === 152 /* Parameter */ &&
                 declaration.initializer &&
                 getFalsyFlags(declaredType) & 32768 /* Undefined */ &&
                 !(getFalsyFlags(checkExpression(declaration.initializer)) & 32768 /* Undefined */);
@@ -46599,13 +47984,13 @@ var ts;
         }
         function isConstraintPosition(node) {
             var parent = node.parent;
-            return parent.kind === 189 /* PropertyAccessExpression */ ||
-                parent.kind === 191 /* CallExpression */ && parent.expression === node ||
-                parent.kind === 190 /* ElementAccessExpression */ && parent.expression === node ||
-                parent.kind === 186 /* BindingElement */ && parent.name === node && !!parent.initializer;
+            return parent.kind === 190 /* PropertyAccessExpression */ ||
+                parent.kind === 192 /* CallExpression */ && parent.expression === node ||
+                parent.kind === 191 /* ElementAccessExpression */ && parent.expression === node ||
+                parent.kind === 187 /* BindingElement */ && parent.name === node && !!parent.initializer;
         }
         function typeHasNullableConstraint(type) {
-            return type.flags & 58982400 /* InstantiableNonPrimitive */ && maybeTypeOfKind(getBaseConstraintOfType(type) || emptyObjectType, 98304 /* Nullable */);
+            return type.flags & 58982400 /* InstantiableNonPrimitive */ && maybeTypeOfKind(getBaseConstraintOfType(type) || unknownType, 98304 /* Nullable */);
         }
         function getConstraintForLocation(type, node) {
             // When a node is the left hand expression of a property access, element access, or call expression,
@@ -46636,7 +48021,7 @@ var ts;
             if (symbol === argumentsSymbol) {
                 var container = ts.getContainingFunction(node);
                 if (languageVersion < 2 /* ES2015 */) {
-                    if (container.kind === 197 /* ArrowFunction */) {
+                    if (container.kind === 198 /* ArrowFunction */) {
                         error(node, ts.Diagnostics.The_arguments_object_cannot_be_referenced_in_an_arrow_function_in_ES3_and_ES5_Consider_using_a_standard_function_expression);
                     }
                     else if (ts.hasModifier(container, 256 /* Async */)) {
@@ -46657,7 +48042,7 @@ var ts;
                 // Due to the emit for class decorators, any reference to the class from inside of the class body
                 // must instead be rewritten to point to a temporary variable to avoid issues with the double-bind
                 // behavior of class names in ES6.
-                if (declaration.kind === 240 /* ClassDeclaration */
+                if (declaration.kind === 241 /* ClassDeclaration */
                     && ts.nodeIsDecorated(declaration)) {
                     var container = ts.getContainingClass(node);
                     while (container !== undefined) {
@@ -46669,14 +48054,14 @@ var ts;
                         container = ts.getContainingClass(container);
                     }
                 }
-                else if (declaration.kind === 209 /* ClassExpression */) {
+                else if (declaration.kind === 210 /* ClassExpression */) {
                     // When we emit a class expression with static members that contain a reference
                     // to the constructor in the initializer, we will need to substitute that
                     // binding with an alias as the class name is not in scope.
                     var container = ts.getThisContainer(node, /*includeArrowFunctions*/ false);
-                    while (container.kind !== 284 /* SourceFile */) {
+                    while (container.kind !== 285 /* SourceFile */) {
                         if (container.parent === declaration) {
-                            if (container.kind === 154 /* PropertyDeclaration */ && ts.hasModifier(container, 32 /* Static */)) {
+                            if (container.kind === 155 /* PropertyDeclaration */ && ts.hasModifier(container, 32 /* Static */)) {
                                 getNodeLinks(declaration).flags |= 16777216 /* ClassWithConstructorReference */;
                                 getNodeLinks(node).flags |= 33554432 /* ConstructorReferenceInClass */;
                             }
@@ -46725,7 +48110,7 @@ var ts;
             // The declaration container is the innermost function that encloses the declaration of the variable
             // or parameter. The flow container is the innermost function starting with which we analyze the control
             // flow graph to determine the control flow based type.
-            var isParameter = ts.getRootDeclaration(declaration).kind === 151 /* Parameter */;
+            var isParameter = ts.getRootDeclaration(declaration).kind === 152 /* Parameter */;
             var declarationContainer = getControlFlowContainer(declaration);
             var flowContainer = getControlFlowContainer(node);
             var isOuterVariable = flowContainer !== declarationContainer;
@@ -46734,19 +48119,19 @@ var ts;
             // When the control flow originates in a function expression or arrow function and we are referencing
             // a const variable or parameter from an outer function, we extend the origin of the control flow
             // analysis to include the immediately enclosing function.
-            while (flowContainer !== declarationContainer && (flowContainer.kind === 196 /* FunctionExpression */ ||
-                flowContainer.kind === 197 /* ArrowFunction */ || ts.isObjectLiteralOrClassExpressionMethod(flowContainer)) &&
+            while (flowContainer !== declarationContainer && (flowContainer.kind === 197 /* FunctionExpression */ ||
+                flowContainer.kind === 198 /* ArrowFunction */ || ts.isObjectLiteralOrClassExpressionMethod(flowContainer)) &&
                 (isConstVariable(localOrExportSymbol) || isParameter && !isParameterAssigned(localOrExportSymbol))) {
                 flowContainer = getControlFlowContainer(flowContainer);
             }
             // We only look for uninitialized variables in strict null checking mode, and only when we can analyze
             // the entire control flow graph from the variable's declaration (i.e. when the flow container and
             // declaration container are the same).
-            var assumeInitialized = isParameter || isAlias || isOuterVariable || isSpreadDestructuringAssignmentTarget || isModuleExports ||
+            var assumeInitialized = isParameter || isAlias || isOuterVariable || isSpreadDestructuringAssignmentTarget || isModuleExports || ts.isBindingElement(declaration) ||
                 type !== autoType && type !== autoArrayType && (!strictNullChecks || (type.flags & 3 /* AnyOrUnknown */) !== 0 ||
-                    isInTypeQuery(node) || node.parent.kind === 257 /* ExportSpecifier */) ||
-                node.parent.kind === 213 /* NonNullExpression */ ||
-                declaration.kind === 237 /* VariableDeclaration */ && declaration.exclamationToken ||
+                    isInTypeQuery(node) || node.parent.kind === 258 /* ExportSpecifier */) ||
+                node.parent.kind === 214 /* NonNullExpression */ ||
+                declaration.kind === 238 /* VariableDeclaration */ && declaration.exclamationToken ||
                 declaration.flags & 4194304 /* Ambient */;
             var initialType = assumeInitialized ? (isParameter ? removeOptionalityFromDeclaredType(type, declaration) : type) :
                 type === autoType || type === autoArrayType ? undefinedType :
@@ -46780,7 +48165,8 @@ var ts;
         function checkNestedBlockScopedBinding(node, symbol) {
             if (languageVersion >= 2 /* ES2015 */ ||
                 (symbol.flags & (2 /* BlockScopedVariable */ | 32 /* Class */)) === 0 ||
-                symbol.valueDeclaration.parent.kind === 274 /* CatchClause */) {
+                ts.isSourceFile(symbol.valueDeclaration) ||
+                symbol.valueDeclaration.parent.kind === 275 /* CatchClause */) {
                 return;
             }
             // 1. walk from the use site up to the declaration and check
@@ -46803,7 +48189,7 @@ var ts;
                     // mark iteration statement as containing block-scoped binding captured in some function
                     var capturesBlockScopeBindingInLoopBody = true;
                     if (ts.isForStatement(container) &&
-                        ts.getAncestor(symbol.valueDeclaration, 238 /* VariableDeclarationList */).parent === container) {
+                        ts.getAncestor(symbol.valueDeclaration, 239 /* VariableDeclarationList */).parent === container) {
                         var part = getPartOfForStatementContainingNode(node.parent, container);
                         if (part) {
                             var links = getNodeLinks(part);
@@ -46821,8 +48207,8 @@ var ts;
                 }
                 // mark variables that are declared in loop initializer and reassigned inside the body of ForStatement.
                 // if body of ForStatement will be converted to function then we'll need a extra machinery to propagate reassigned values back.
-                if (container.kind === 225 /* ForStatement */ &&
-                    ts.getAncestor(symbol.valueDeclaration, 238 /* VariableDeclarationList */).parent === container &&
+                if (container.kind === 226 /* ForStatement */ &&
+                    ts.getAncestor(symbol.valueDeclaration, 239 /* VariableDeclarationList */).parent === container &&
                     isAssignedInBodyOfForStatement(node, container)) {
                     getNodeLinks(symbol.valueDeclaration).flags |= 4194304 /* NeedsLoopOutParameter */;
                 }
@@ -46840,7 +48226,7 @@ var ts;
         function isAssignedInBodyOfForStatement(node, container) {
             // skip parenthesized nodes
             var current = node;
-            while (current.parent.kind === 195 /* ParenthesizedExpression */) {
+            while (current.parent.kind === 196 /* ParenthesizedExpression */) {
                 current = current.parent;
             }
             // check if node is used as LHS in some assignment expression
@@ -46848,7 +48234,7 @@ var ts;
             if (ts.isAssignmentTarget(current)) {
                 isAssigned = true;
             }
-            else if ((current.parent.kind === 202 /* PrefixUnaryExpression */ || current.parent.kind === 203 /* PostfixUnaryExpression */)) {
+            else if ((current.parent.kind === 203 /* PrefixUnaryExpression */ || current.parent.kind === 204 /* PostfixUnaryExpression */)) {
                 var expr = current.parent;
                 isAssigned = expr.operator === 44 /* PlusPlusToken */ || expr.operator === 45 /* MinusMinusToken */;
             }
@@ -46861,7 +48247,7 @@ var ts;
         }
         function captureLexicalThis(node, container) {
             getNodeLinks(node).flags |= 2 /* LexicalThis */;
-            if (container.kind === 154 /* PropertyDeclaration */ || container.kind === 157 /* Constructor */) {
+            if (container.kind === 155 /* PropertyDeclaration */ || container.kind === 158 /* Constructor */) {
                 var classNode = container.parent;
                 getNodeLinks(classNode).flags |= 4 /* CaptureThis */;
             }
@@ -46929,37 +48315,37 @@ var ts;
             // tell whether 'this' needs to be captured.
             var container = ts.getThisContainer(node, /* includeArrowFunctions */ true);
             var capturedByArrowFunction = false;
-            if (container.kind === 157 /* Constructor */) {
+            if (container.kind === 158 /* Constructor */) {
                 checkThisBeforeSuper(node, container, ts.Diagnostics.super_must_be_called_before_accessing_this_in_the_constructor_of_a_derived_class);
             }
             // Now skip arrow functions to get the "real" owner of 'this'.
-            if (container.kind === 197 /* ArrowFunction */) {
+            if (container.kind === 198 /* ArrowFunction */) {
                 container = ts.getThisContainer(container, /* includeArrowFunctions */ false);
                 capturedByArrowFunction = true;
             }
             switch (container.kind) {
-                case 244 /* ModuleDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     error(node, ts.Diagnostics.this_cannot_be_referenced_in_a_module_or_namespace_body);
                     // do not return here so in case if lexical this is captured - it will be reflected in flags on NodeLinks
                     break;
-                case 243 /* EnumDeclaration */:
+                case 244 /* EnumDeclaration */:
                     error(node, ts.Diagnostics.this_cannot_be_referenced_in_current_location);
                     // do not return here so in case if lexical this is captured - it will be reflected in flags on NodeLinks
                     break;
-                case 157 /* Constructor */:
+                case 158 /* Constructor */:
                     if (isInConstructorArgumentInitializer(node, container)) {
                         error(node, ts.Diagnostics.this_cannot_be_referenced_in_constructor_arguments);
                         // do not return here so in case if lexical this is captured - it will be reflected in flags on NodeLinks
                     }
                     break;
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
                     if (ts.hasModifier(container, 32 /* Static */)) {
                         error(node, ts.Diagnostics.this_cannot_be_referenced_in_a_static_property_initializer);
                         // do not return here so in case if lexical this is captured - it will be reflected in flags on NodeLinks
                     }
                     break;
-                case 149 /* ComputedPropertyName */:
+                case 150 /* ComputedPropertyName */:
                     error(node, ts.Diagnostics.this_cannot_be_referenced_in_a_computed_property_name);
                     break;
             }
@@ -46979,7 +48365,7 @@ var ts;
                     if (!ts.isSourceFile(container)) {
                         var outsideThis = tryGetThisTypeAt(container);
                         if (outsideThis && outsideThis !== globalThisType_1) {
-                            addRelatedInfo(diag, ts.createDiagnosticForNode(container, ts.Diagnostics.An_outer_value_of_this_is_shadowed_by_this_container));
+                            ts.addRelatedInfo(diag, ts.createDiagnosticForNode(container, ts.Diagnostics.An_outer_value_of_this_is_shadowed_by_this_container));
                         }
                     }
                 }
@@ -47009,7 +48395,7 @@ var ts;
                 //   * /** @constructor */ function [name]() { ... }
                 //   * /** @constructor */ var x = function() { ... }
                 else if (isInJS &&
-                    (container.kind === 196 /* FunctionExpression */ || container.kind === 239 /* FunctionDeclaration */) &&
+                    (container.kind === 197 /* FunctionExpression */ || container.kind === 240 /* FunctionDeclaration */) &&
                     ts.getJSDocClassTag(container)) {
                     var classType = getJSClassType(getMergedSymbol(container.symbol));
                     if (classType) {
@@ -47045,7 +48431,7 @@ var ts;
         }
         function getClassNameFromPrototypeMethod(container) {
             // Check if it's the RHS of a x.prototype.y = function [name]() { .... }
-            if (container.kind === 196 /* FunctionExpression */ &&
+            if (container.kind === 197 /* FunctionExpression */ &&
                 ts.isBinaryExpression(container.parent) &&
                 ts.getAssignmentDeclarationKind(container.parent) === 3 /* PrototypeProperty */) {
                 // Get the 'x' of 'x.prototype.y = container'
@@ -47055,16 +48441,16 @@ var ts;
                     .expression; // x
             }
             // x.prototype = { method() { } }
-            else if (container.kind === 156 /* MethodDeclaration */ &&
-                container.parent.kind === 188 /* ObjectLiteralExpression */ &&
+            else if (container.kind === 157 /* MethodDeclaration */ &&
+                container.parent.kind === 189 /* ObjectLiteralExpression */ &&
                 ts.isBinaryExpression(container.parent.parent) &&
                 ts.getAssignmentDeclarationKind(container.parent.parent) === 6 /* Prototype */) {
                 return container.parent.parent.left.expression;
             }
             // x.prototype = { method: function() { } }
-            else if (container.kind === 196 /* FunctionExpression */ &&
-                container.parent.kind === 275 /* PropertyAssignment */ &&
-                container.parent.parent.kind === 188 /* ObjectLiteralExpression */ &&
+            else if (container.kind === 197 /* FunctionExpression */ &&
+                container.parent.kind === 276 /* PropertyAssignment */ &&
+                container.parent.parent.kind === 189 /* ObjectLiteralExpression */ &&
                 ts.isBinaryExpression(container.parent.parent.parent) &&
                 ts.getAssignmentDeclarationKind(container.parent.parent.parent) === 6 /* Prototype */) {
                 return container.parent.parent.parent.left.expression;
@@ -47072,7 +48458,7 @@ var ts;
             // Object.defineProperty(x, "method", { value: function() { } });
             // Object.defineProperty(x, "method", { set: (x: () => void) => void });
             // Object.defineProperty(x, "method", { get: () => function() { }) });
-            else if (container.kind === 196 /* FunctionExpression */ &&
+            else if (container.kind === 197 /* FunctionExpression */ &&
                 ts.isPropertyAssignment(container.parent) &&
                 ts.isIdentifier(container.parent.name) &&
                 (container.parent.name.escapedText === "value" || container.parent.name.escapedText === "get" || container.parent.name.escapedText === "set") &&
@@ -47097,7 +48483,7 @@ var ts;
         }
         function getTypeForThisExpressionFromJSDoc(node) {
             var jsdocType = ts.getJSDocType(node);
-            if (jsdocType && jsdocType.kind === 294 /* JSDocFunctionType */) {
+            if (jsdocType && jsdocType.kind === 295 /* JSDocFunctionType */) {
                 var jsDocFunctionType = jsdocType;
                 if (jsDocFunctionType.parameters.length > 0 &&
                     jsDocFunctionType.parameters[0].name &&
@@ -47111,15 +48497,15 @@ var ts;
             }
         }
         function isInConstructorArgumentInitializer(node, constructorDecl) {
-            return !!ts.findAncestor(node, function (n) { return ts.isFunctionLikeDeclaration(n) ? "quit" : n.kind === 151 /* Parameter */ && n.parent === constructorDecl; });
+            return !!ts.findAncestor(node, function (n) { return ts.isFunctionLikeDeclaration(n) ? "quit" : n.kind === 152 /* Parameter */ && n.parent === constructorDecl; });
         }
         function checkSuperExpression(node) {
-            var isCallExpression = node.parent.kind === 191 /* CallExpression */ && node.parent.expression === node;
+            var isCallExpression = node.parent.kind === 192 /* CallExpression */ && node.parent.expression === node;
             var container = ts.getSuperContainer(node, /*stopOnFunctions*/ true);
             var needToCaptureLexicalThis = false;
             // adjust the container reference in case if super is used inside arrow functions with arbitrarily deep nesting
             if (!isCallExpression) {
-                while (container && container.kind === 197 /* ArrowFunction */) {
+                while (container && container.kind === 198 /* ArrowFunction */) {
                     container = ts.getSuperContainer(container, /*stopOnFunctions*/ true);
                     needToCaptureLexicalThis = languageVersion < 2 /* ES2015 */;
                 }
@@ -47132,14 +48518,14 @@ var ts;
                 // class B {
                 //     [super.foo()]() {}
                 // }
-                var current = ts.findAncestor(node, function (n) { return n === container ? "quit" : n.kind === 149 /* ComputedPropertyName */; });
-                if (current && current.kind === 149 /* ComputedPropertyName */) {
+                var current = ts.findAncestor(node, function (n) { return n === container ? "quit" : n.kind === 150 /* ComputedPropertyName */; });
+                if (current && current.kind === 150 /* ComputedPropertyName */) {
                     error(node, ts.Diagnostics.super_cannot_be_referenced_in_a_computed_property_name);
                 }
                 else if (isCallExpression) {
                     error(node, ts.Diagnostics.Super_calls_are_not_permitted_outside_constructors_or_in_nested_functions_inside_constructors);
                 }
-                else if (!container || !container.parent || !(ts.isClassLike(container.parent) || container.parent.kind === 188 /* ObjectLiteralExpression */)) {
+                else if (!container || !container.parent || !(ts.isClassLike(container.parent) || container.parent.kind === 189 /* ObjectLiteralExpression */)) {
                     error(node, ts.Diagnostics.super_can_only_be_referenced_in_members_of_derived_classes_or_object_literal_expressions);
                 }
                 else {
@@ -47147,7 +48533,7 @@ var ts;
                 }
                 return errorType;
             }
-            if (!isCallExpression && container.kind === 157 /* Constructor */) {
+            if (!isCallExpression && container.kind === 158 /* Constructor */) {
                 checkThisBeforeSuper(node, container, ts.Diagnostics.super_must_be_called_before_accessing_a_property_of_super_in_the_constructor_of_a_derived_class);
             }
             if (ts.hasModifier(container, 32 /* Static */) || isCallExpression) {
@@ -47216,7 +48602,7 @@ var ts;
             // as a call expression cannot be used as the target of a destructuring assignment while a property access can.
             //
             // For element access expressions (`super[x]`), we emit a generic helper that forwards the element access in both situations.
-            if (container.kind === 156 /* MethodDeclaration */ && ts.hasModifier(container, 256 /* Async */)) {
+            if (container.kind === 157 /* MethodDeclaration */ && ts.hasModifier(container, 256 /* Async */)) {
                 if (ts.isSuperProperty(node.parent) && ts.isAssignmentTarget(node.parent)) {
                     getNodeLinks(container).flags |= 4096 /* AsyncMethodWithSuperBinding */;
                 }
@@ -47230,7 +48616,7 @@ var ts;
                 // in this case they should also use correct lexical this
                 captureLexicalThis(node.parent, container);
             }
-            if (container.parent.kind === 188 /* ObjectLiteralExpression */) {
+            if (container.parent.kind === 189 /* ObjectLiteralExpression */) {
                 if (languageVersion < 2 /* ES2015 */) {
                     error(node, ts.Diagnostics.super_is_only_allowed_in_members_of_object_literal_expressions_when_option_target_is_ES2015_or_higher);
                     return errorType;
@@ -47251,7 +48637,7 @@ var ts;
             if (!baseClassType) {
                 return errorType;
             }
-            if (container.kind === 157 /* Constructor */ && isInConstructorArgumentInitializer(node, container)) {
+            if (container.kind === 158 /* Constructor */ && isInConstructorArgumentInitializer(node, container)) {
                 // issue custom error message for super property access in constructor arguments (to be aligned with old compiler)
                 error(node, ts.Diagnostics.super_cannot_be_referenced_in_constructor_arguments);
                 return errorType;
@@ -47266,7 +48652,7 @@ var ts;
                 if (isCallExpression) {
                     // TS 1.0 SPEC (April 2014): 4.8.1
                     // Super calls are only permitted in constructors of derived classes
-                    return container.kind === 157 /* Constructor */;
+                    return container.kind === 158 /* Constructor */;
                 }
                 else {
                     // TS 1.0 SPEC (April 2014)
@@ -47274,21 +48660,21 @@ var ts;
                     // - In a constructor, instance member function, instance member accessor, or instance member variable initializer where this references a derived class instance
                     // - In a static member function or static member accessor
                     // topmost container must be something that is directly nested in the class declaration\object literal expression
-                    if (ts.isClassLike(container.parent) || container.parent.kind === 188 /* ObjectLiteralExpression */) {
+                    if (ts.isClassLike(container.parent) || container.parent.kind === 189 /* ObjectLiteralExpression */) {
                         if (ts.hasModifier(container, 32 /* Static */)) {
-                            return container.kind === 156 /* MethodDeclaration */ ||
-                                container.kind === 155 /* MethodSignature */ ||
-                                container.kind === 158 /* GetAccessor */ ||
-                                container.kind === 159 /* SetAccessor */;
+                            return container.kind === 157 /* MethodDeclaration */ ||
+                                container.kind === 156 /* MethodSignature */ ||
+                                container.kind === 159 /* GetAccessor */ ||
+                                container.kind === 160 /* SetAccessor */;
                         }
                         else {
-                            return container.kind === 156 /* MethodDeclaration */ ||
-                                container.kind === 155 /* MethodSignature */ ||
-                                container.kind === 158 /* GetAccessor */ ||
-                                container.kind === 159 /* SetAccessor */ ||
-                                container.kind === 154 /* PropertyDeclaration */ ||
-                                container.kind === 153 /* PropertySignature */ ||
-                                container.kind === 157 /* Constructor */;
+                            return container.kind === 157 /* MethodDeclaration */ ||
+                                container.kind === 156 /* MethodSignature */ ||
+                                container.kind === 159 /* GetAccessor */ ||
+                                container.kind === 160 /* SetAccessor */ ||
+                                container.kind === 155 /* PropertyDeclaration */ ||
+                                container.kind === 154 /* PropertySignature */ ||
+                                container.kind === 158 /* Constructor */;
                         }
                     }
                 }
@@ -47296,10 +48682,10 @@ var ts;
             }
         }
         function getContainingObjectLiteral(func) {
-            return (func.kind === 156 /* MethodDeclaration */ ||
-                func.kind === 158 /* GetAccessor */ ||
-                func.kind === 159 /* SetAccessor */) && func.parent.kind === 188 /* ObjectLiteralExpression */ ? func.parent :
-                func.kind === 196 /* FunctionExpression */ && func.parent.kind === 275 /* PropertyAssignment */ ? func.parent.parent :
+            return (func.kind === 157 /* MethodDeclaration */ ||
+                func.kind === 159 /* GetAccessor */ ||
+                func.kind === 160 /* SetAccessor */) && func.parent.kind === 189 /* ObjectLiteralExpression */ ? func.parent :
+                func.kind === 197 /* FunctionExpression */ && func.parent.kind === 276 /* PropertyAssignment */ ? func.parent.parent :
                     undefined;
         }
         function getThisTypeArgument(type) {
@@ -47311,7 +48697,7 @@ var ts;
             });
         }
         function getContextualThisParameterType(func) {
-            if (func.kind === 197 /* ArrowFunction */) {
+            if (func.kind === 198 /* ArrowFunction */) {
                 return undefined;
             }
             if (isContextSensitiveFunctionOrObjectLiteralMethod(func)) {
@@ -47336,9 +48722,9 @@ var ts;
                     while (type) {
                         var thisType = getThisTypeFromContextualType(type);
                         if (thisType) {
-                            return instantiateType(thisType, getContextualMapper(containingLiteral));
+                            return instantiateType(thisType, getMapperFromContext(getInferenceContext(containingLiteral)));
                         }
-                        if (literal.parent.kind !== 275 /* PropertyAssignment */) {
+                        if (literal.parent.kind !== 276 /* PropertyAssignment */) {
                             break;
                         }
                         literal = literal.parent.parent;
@@ -47347,14 +48733,14 @@ var ts;
                     // There was no contextual ThisType<T> for the containing object literal, so the contextual type
                     // for 'this' is the non-null form of the contextual type for the containing object literal or
                     // the type of the object literal itself.
-                    return contextualType ? getNonNullableType(contextualType) : checkExpressionCached(containingLiteral);
+                    return getWidenedType(contextualType ? getNonNullableType(contextualType) : checkExpressionCached(containingLiteral));
                 }
                 // In an assignment of the form 'obj.xxx = function(...)' or 'obj[xxx] = function(...)', the
                 // contextual type for 'this' is 'obj'.
                 var parent = func.parent;
-                if (parent.kind === 204 /* BinaryExpression */ && parent.operatorToken.kind === 59 /* EqualsToken */) {
+                if (parent.kind === 205 /* BinaryExpression */ && parent.operatorToken.kind === 60 /* EqualsToken */) {
                     var target = parent.left;
-                    if (target.kind === 189 /* PropertyAccessExpression */ || target.kind === 190 /* ElementAccessExpression */) {
+                    if (target.kind === 190 /* PropertyAccessExpression */ || target.kind === 191 /* ElementAccessExpression */) {
                         var expression = target.expression;
                         // Don't contextually type `this` as `exports` in `exports.Point = function(x, y) { this.x = x; this.y = y; }`
                         if (inJs && ts.isIdentifier(expression)) {
@@ -47363,14 +48749,14 @@ var ts;
                                 return undefined;
                             }
                         }
-                        return checkExpressionCached(expression);
+                        return getWidenedType(checkExpressionCached(expression));
                     }
                 }
             }
             return undefined;
         }
         // Return contextual type of parameter or undefined if no contextual type is available
-        function getContextuallyTypedParameterType(parameter) {
+        function getContextuallyTypedParameterType(parameter, forCache) {
             var func = parameter.parent;
             if (!isContextSensitiveFunctionOrObjectLiteralMethod(func)) {
                 return undefined;
@@ -47393,6 +48779,19 @@ var ts;
             }
             var contextualSignature = getContextualSignature(func);
             if (contextualSignature) {
+                if (forCache) {
+                    // Calling the below guarantees the types are primed and assigned in the same way
+                    // as when the parameter is reached via `checkFunctionExpressionOrObjectLiteralMethod`.
+                    // This should prevent any uninstantiated inference variables in the contextual signature
+                    // from leaking, and should lock in cached parameter types via `assignContextualParameterTypes`
+                    // which we will then immediately use the results of below.
+                    contextuallyCheckFunctionExpressionOrObjectLiteralMethod(func);
+                    var type = getTypeOfSymbol(getMergedSymbol(func.symbol));
+                    if (isTypeAny(type)) {
+                        return type;
+                    }
+                    contextualSignature = getSignaturesOfType(type, 0 /* Call */)[0];
+                }
                 var index = func.parameters.indexOf(parameter) - (ts.getThisParameter(func) ? 1 : 0);
                 return parameter.dotDotDotToken && ts.lastOrUndefined(func.parameters) === parameter ?
                     getRestTypeAtPosition(contextualSignature, index) :
@@ -47405,9 +48804,9 @@ var ts;
                 return getTypeFromTypeNode(typeNode);
             }
             switch (declaration.kind) {
-                case 151 /* Parameter */:
-                    return getContextuallyTypedParameterType(declaration);
-                case 186 /* BindingElement */:
+                case 152 /* Parameter */:
+                    return getContextuallyTypedParameterType(declaration, /*forCache*/ false);
+                case 187 /* BindingElement */:
                     return getContextualTypeForBindingElement(declaration);
                 // By default, do nothing and return undefined - only parameters and binding elements have context implied by a parent
             }
@@ -47479,7 +48878,7 @@ var ts;
                 if (contextualReturnType) {
                     return node.asteriskToken
                         ? contextualReturnType
-                        : getIteratedTypeOfGenerator(contextualReturnType, (functionFlags & 2 /* Async */) !== 0);
+                        : getIterationTypeOfGeneratorFunctionReturnType(0 /* Yield */, contextualReturnType, (functionFlags & 2 /* Async */) !== 0);
                 }
             }
             return undefined;
@@ -47528,16 +48927,16 @@ var ts;
             return getTypeAtPosition(signature, argIndex);
         }
         function getContextualTypeForSubstitutionExpression(template, substitutionExpression) {
-            if (template.parent.kind === 193 /* TaggedTemplateExpression */) {
+            if (template.parent.kind === 194 /* TaggedTemplateExpression */) {
                 return getContextualTypeForArgument(template.parent, substitutionExpression);
             }
             return undefined;
         }
-        function getContextualTypeForBinaryOperand(node) {
+        function getContextualTypeForBinaryOperand(node, contextFlags) {
             var binaryExpression = node.parent;
             var left = binaryExpression.left, operatorToken = binaryExpression.operatorToken, right = binaryExpression.right;
             switch (operatorToken.kind) {
-                case 59 /* EqualsToken */:
+                case 60 /* EqualsToken */:
                     if (node !== right) {
                         return undefined;
                     }
@@ -47547,15 +48946,17 @@ var ts;
                     }
                     return contextSensitive === true ? getTypeOfExpression(left) : contextSensitive;
                 case 55 /* BarBarToken */:
-                    // When an || expression has a contextual type, the operands are contextually typed by that type. When an ||
-                    // expression has no contextual type, the right operand is contextually typed by the type of the left operand,
-                    // except for the special case of Javascript declarations of the form `namespace.prop = namespace.prop || {}`
-                    var type = getContextualType(binaryExpression);
-                    return !type && node === right && !ts.isDefaultedExpandoInitializer(binaryExpression) ?
+                    // When an || expression has a contextual type, the operands are contextually typed by that type, except
+                    // when that type originates in a binding pattern, the right operand is contextually typed by the type of
+                    // the left operand. When an || expression has no contextual type, the right operand is contextually typed
+                    // by the type of the left operand, except for the special case of Javascript declarations of the form
+                    // `namespace.prop = namespace.prop || {}`.
+                    var type = getContextualType(binaryExpression, contextFlags);
+                    return node === right && (type && type.pattern || !type && !ts.isDefaultedExpandoInitializer(binaryExpression)) ?
                         getTypeOfExpression(left) : type;
                 case 54 /* AmpersandAmpersandToken */:
                 case 27 /* CommaToken */:
-                    return node === right ? getContextualType(binaryExpression) : undefined;
+                    return node === right ? getContextualType(binaryExpression, contextFlags) : undefined;
                 default:
                     return undefined;
             }
@@ -47631,7 +49032,15 @@ var ts;
         }
         function getTypeOfPropertyOfContextualType(type, name) {
             return mapType(type, function (t) {
-                if (t.flags & 3670016 /* StructuredType */) {
+                if (isGenericMappedType(t)) {
+                    var constraint = getConstraintTypeFromMappedType(t);
+                    var constraintOfConstraint = getBaseConstraintOfType(constraint) || constraint;
+                    var propertyNameType = getLiteralType(ts.unescapeLeadingUnderscores(name));
+                    if (isTypeAssignableTo(propertyNameType, constraintOfConstraint)) {
+                        return substituteIndexedMappedType(t, propertyNameType);
+                    }
+                }
+                else if (t.flags & 3670016 /* StructuredType */) {
                     var prop = getPropertyOfType(t, name);
                     if (prop) {
                         return getTypeOfSymbol(prop);
@@ -47654,24 +49063,24 @@ var ts;
         // In an object literal contextually typed by a type T, the contextual type of a property assignment is the type of
         // the matching property in T, if one exists. Otherwise, it is the type of the numeric index signature in T, if one
         // exists. Otherwise, it is the type of the string index signature in T, if one exists.
-        function getContextualTypeForObjectLiteralMethod(node) {
+        function getContextualTypeForObjectLiteralMethod(node, contextFlags) {
             ts.Debug.assert(ts.isObjectLiteralMethod(node));
             if (node.flags & 8388608 /* InWithStatement */) {
                 // We cannot answer semantic questions within a with block, do not proceed any further
                 return undefined;
             }
-            return getContextualTypeForObjectLiteralElement(node);
+            return getContextualTypeForObjectLiteralElement(node, contextFlags);
         }
-        function getContextualTypeForObjectLiteralElement(element) {
+        function getContextualTypeForObjectLiteralElement(element, contextFlags) {
             var objectLiteral = element.parent;
-            var type = getApparentTypeOfContextualType(objectLiteral);
+            var type = getApparentTypeOfContextualType(objectLiteral, contextFlags);
             if (type) {
                 if (!hasNonBindableDynamicName(element)) {
                     // For a (non-symbol) computed property, there is no reason to look up the name
                     // in the type. It will just be "__computed", which does not appear in any
                     // SymbolTable.
-                    var symbolName_2 = getSymbolOfNode(element).escapedName;
-                    var propertyType = getTypeOfPropertyOfContextualType(type, symbolName_2);
+                    var symbolName_3 = getSymbolOfNode(element).escapedName;
+                    var propertyType = getTypeOfPropertyOfContextualType(type, symbolName_3);
                     if (propertyType) {
                         return propertyType;
                     }
@@ -47687,12 +49096,12 @@ var ts;
         // type of T.
         function getContextualTypeForElementExpression(arrayContextualType, index) {
             return arrayContextualType && (getTypeOfPropertyOfContextualType(arrayContextualType, "" + index)
-                || getIteratedTypeOrElementType(arrayContextualType, /*errorNode*/ undefined, /*allowStringInput*/ false, /*allowAsyncIterables*/ false, /*checkAssignability*/ false));
+                || getIteratedTypeOrElementType(1 /* Element */, arrayContextualType, undefinedType, /*errorNode*/ undefined, /*checkAssignability*/ false));
         }
         // In a contextually typed conditional expression, the true/false expressions are contextually typed by the same type.
-        function getContextualTypeForConditionalOperand(node) {
+        function getContextualTypeForConditionalOperand(node, contextFlags) {
             var conditional = node.parent;
-            return node === conditional.whenTrue || node === conditional.whenFalse ? getContextualType(conditional) : undefined;
+            return node === conditional.whenTrue || node === conditional.whenFalse ? getContextualType(conditional, contextFlags) : undefined;
         }
         function getContextualTypeForChildJsxExpression(node, child) {
             var attributesType = getApparentTypeOfContextualType(node.openingElement.tagName);
@@ -47701,16 +49110,17 @@ var ts;
             if (!(attributesType && !isTypeAny(attributesType) && jsxChildrenPropertyName && jsxChildrenPropertyName !== "")) {
                 return undefined;
             }
-            var childIndex = node.children.indexOf(child);
+            var realChildren = getSemanticJsxChildren(node.children);
+            var childIndex = realChildren.indexOf(child);
             var childFieldType = getTypeOfPropertyOfContextualType(attributesType, jsxChildrenPropertyName);
-            return childFieldType && mapType(childFieldType, function (t) {
+            return childFieldType && (realChildren.length === 1 ? childFieldType : mapType(childFieldType, function (t) {
                 if (isArrayLikeType(t)) {
                     return getIndexedAccessType(t, getLiteralType(childIndex));
                 }
                 else {
                     return t;
                 }
-            }, /*noReductions*/ true);
+            }, /*noReductions*/ true));
         }
         function getContextualTypeForJsxExpression(node) {
             var exprParent = node.parent;
@@ -47744,30 +49154,30 @@ var ts;
                 case 8 /* NumericLiteral */:
                 case 9 /* BigIntLiteral */:
                 case 14 /* NoSubstitutionTemplateLiteral */:
-                case 102 /* TrueKeyword */:
-                case 87 /* FalseKeyword */:
-                case 96 /* NullKeyword */:
-                case 72 /* Identifier */:
-                case 141 /* UndefinedKeyword */:
+                case 103 /* TrueKeyword */:
+                case 88 /* FalseKeyword */:
+                case 97 /* NullKeyword */:
+                case 73 /* Identifier */:
+                case 142 /* UndefinedKeyword */:
                     return true;
-                case 189 /* PropertyAccessExpression */:
-                case 195 /* ParenthesizedExpression */:
+                case 190 /* PropertyAccessExpression */:
+                case 196 /* ParenthesizedExpression */:
                     return isPossiblyDiscriminantValue(node.expression);
-                case 270 /* JsxExpression */:
+                case 271 /* JsxExpression */:
                     return !node.expression || isPossiblyDiscriminantValue(node.expression);
             }
             return false;
         }
         function discriminateContextualTypeByObjectMembers(node, contextualType) {
-            return discriminateTypeByDiscriminableItems(contextualType, ts.map(ts.filter(node.properties, function (p) { return !!p.symbol && p.kind === 275 /* PropertyAssignment */ && isPossiblyDiscriminantValue(p.initializer) && isDiscriminantProperty(contextualType, p.symbol.escapedName); }), function (prop) { return [function () { return checkExpression(prop.initializer); }, prop.symbol.escapedName]; }), isTypeAssignableTo, contextualType);
+            return discriminateTypeByDiscriminableItems(contextualType, ts.map(ts.filter(node.properties, function (p) { return !!p.symbol && p.kind === 276 /* PropertyAssignment */ && isPossiblyDiscriminantValue(p.initializer) && isDiscriminantProperty(contextualType, p.symbol.escapedName); }), function (prop) { return [function () { return checkExpression(prop.initializer); }, prop.symbol.escapedName]; }), isTypeAssignableTo, contextualType);
         }
         function discriminateContextualTypeByJSXAttributes(node, contextualType) {
-            return discriminateTypeByDiscriminableItems(contextualType, ts.map(ts.filter(node.properties, function (p) { return !!p.symbol && p.kind === 267 /* JsxAttribute */ && isDiscriminantProperty(contextualType, p.symbol.escapedName) && (!p.initializer || isPossiblyDiscriminantValue(p.initializer)); }), function (prop) { return [!prop.initializer ? (function () { return trueType; }) : (function () { return checkExpression(prop.initializer); }), prop.symbol.escapedName]; }), isTypeAssignableTo, contextualType);
+            return discriminateTypeByDiscriminableItems(contextualType, ts.map(ts.filter(node.properties, function (p) { return !!p.symbol && p.kind === 268 /* JsxAttribute */ && isDiscriminantProperty(contextualType, p.symbol.escapedName) && (!p.initializer || isPossiblyDiscriminantValue(p.initializer)); }), function (prop) { return [!prop.initializer ? (function () { return trueType; }) : (function () { return checkExpression(prop.initializer); }), prop.symbol.escapedName]; }), isTypeAssignableTo, contextualType);
         }
         // Return the contextual type for a given expression node. During overload resolution, a contextual type may temporarily
         // be "pushed" onto a node using the contextualType property.
-        function getApparentTypeOfContextualType(node) {
-            var contextualType = instantiateContextualType(getContextualType(node), node);
+        function getApparentTypeOfContextualType(node, contextFlags) {
+            var contextualType = instantiateContextualType(getContextualType(node, contextFlags), node, contextFlags);
             if (contextualType) {
                 var apparentType = mapType(contextualType, getApparentType, /*noReductions*/ true);
                 if (apparentType.flags & 1048576 /* Union */) {
@@ -47783,11 +49193,22 @@ var ts;
         }
         // If the given contextual type contains instantiable types and if a mapper representing
         // return type inferences is available, instantiate those types using that mapper.
-        function instantiateContextualType(contextualType, node) {
+        function instantiateContextualType(contextualType, node, contextFlags) {
             if (contextualType && maybeTypeOfKind(contextualType, 63176704 /* Instantiable */)) {
-                var returnMapper = getContextualMapper(node).returnMapper;
-                if (returnMapper) {
-                    return instantiateInstantiableTypes(contextualType, returnMapper);
+                var inferenceContext = getInferenceContext(node);
+                // If no inferences have been made, nothing is gained from instantiating as type parameters
+                // would just be replaced with their defaults similar to the apparent type.
+                if (inferenceContext && ts.some(inferenceContext.inferences, hasInferenceCandidates)) {
+                    // For contextual signatures we incorporate all inferences made so far, e.g. from return
+                    // types as well as arguments to the left in a function call.
+                    if (contextFlags && contextFlags & 1 /* Signature */) {
+                        return instantiateInstantiableTypes(contextualType, inferenceContext.nonFixingMapper);
+                    }
+                    // For other purposes (e.g. determining whether to produce literal types) we only
+                    // incorporate inferences made from the return type in a function call.
+                    if (inferenceContext.returnMapper) {
+                        return instantiateInstantiableTypes(contextualType, inferenceContext.returnMapper);
+                    }
                 }
             }
             return contextualType;
@@ -47808,7 +49229,7 @@ var ts;
             return type;
         }
         /**
-         * Woah! Do you really want to use this function?
+         * Whoa! Do you really want to use this function?
          *
          * Unless you're trying to get the *non-apparent* type for a
          * value-literal type or you're authoring relevant portions of this algorithm,
@@ -47824,7 +49245,7 @@ var ts;
          * @param node the expression whose contextual type will be returned.
          * @returns the contextual type of an expression.
          */
-        function getContextualType(node) {
+        function getContextualType(node, contextFlags) {
             if (node.flags & 8388608 /* InWithStatement */) {
                 // We cannot answer semantic questions within a with block, do not proceed any further
                 return undefined;
@@ -47834,61 +49255,65 @@ var ts;
             }
             var parent = node.parent;
             switch (parent.kind) {
-                case 237 /* VariableDeclaration */:
-                case 151 /* Parameter */:
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
-                case 186 /* BindingElement */:
+                case 238 /* VariableDeclaration */:
+                case 152 /* Parameter */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
+                case 187 /* BindingElement */:
                     return getContextualTypeForInitializerExpression(node);
-                case 197 /* ArrowFunction */:
-                case 230 /* ReturnStatement */:
+                case 198 /* ArrowFunction */:
+                case 231 /* ReturnStatement */:
                     return getContextualTypeForReturnExpression(node);
-                case 207 /* YieldExpression */:
+                case 208 /* YieldExpression */:
                     return getContextualTypeForYieldOperand(parent);
-                case 201 /* AwaitExpression */:
+                case 202 /* AwaitExpression */:
                     return getContextualTypeForAwaitOperand(parent);
-                case 191 /* CallExpression */:
-                case 192 /* NewExpression */:
+                case 192 /* CallExpression */:
+                    if (parent.expression.kind === 93 /* ImportKeyword */) {
+                        return stringType;
+                    }
+                /* falls through */
+                case 193 /* NewExpression */:
                     return getContextualTypeForArgument(parent, node);
-                case 194 /* TypeAssertionExpression */:
-                case 212 /* AsExpression */:
+                case 195 /* TypeAssertionExpression */:
+                case 213 /* AsExpression */:
                     return ts.isConstTypeReference(parent.type) ? undefined : getTypeFromTypeNode(parent.type);
-                case 204 /* BinaryExpression */:
-                    return getContextualTypeForBinaryOperand(node);
-                case 275 /* PropertyAssignment */:
-                case 276 /* ShorthandPropertyAssignment */:
-                    return getContextualTypeForObjectLiteralElement(parent);
-                case 277 /* SpreadAssignment */:
-                    return getApparentTypeOfContextualType(parent.parent);
-                case 187 /* ArrayLiteralExpression */: {
+                case 205 /* BinaryExpression */:
+                    return getContextualTypeForBinaryOperand(node, contextFlags);
+                case 276 /* PropertyAssignment */:
+                case 277 /* ShorthandPropertyAssignment */:
+                    return getContextualTypeForObjectLiteralElement(parent, contextFlags);
+                case 278 /* SpreadAssignment */:
+                    return getApparentTypeOfContextualType(parent.parent, contextFlags);
+                case 188 /* ArrayLiteralExpression */: {
                     var arrayLiteral = parent;
-                    var type = getApparentTypeOfContextualType(arrayLiteral);
+                    var type = getApparentTypeOfContextualType(arrayLiteral, contextFlags);
                     return getContextualTypeForElementExpression(type, ts.indexOfNode(arrayLiteral.elements, node));
                 }
-                case 205 /* ConditionalExpression */:
-                    return getContextualTypeForConditionalOperand(node);
-                case 216 /* TemplateSpan */:
-                    ts.Debug.assert(parent.parent.kind === 206 /* TemplateExpression */);
+                case 206 /* ConditionalExpression */:
+                    return getContextualTypeForConditionalOperand(node, contextFlags);
+                case 217 /* TemplateSpan */:
+                    ts.Debug.assert(parent.parent.kind === 207 /* TemplateExpression */);
                     return getContextualTypeForSubstitutionExpression(parent.parent, node);
-                case 195 /* ParenthesizedExpression */: {
+                case 196 /* ParenthesizedExpression */: {
                     // Like in `checkParenthesizedExpression`, an `/** @type {xyz} */` comment before a parenthesized expression acts as a type cast.
                     var tag = ts.isInJSFile(parent) ? ts.getJSDocTypeTag(parent) : undefined;
-                    return tag ? getTypeFromTypeNode(tag.typeExpression.type) : getContextualType(parent);
+                    return tag ? getTypeFromTypeNode(tag.typeExpression.type) : getContextualType(parent, contextFlags);
                 }
-                case 270 /* JsxExpression */:
+                case 271 /* JsxExpression */:
                     return getContextualTypeForJsxExpression(parent);
-                case 267 /* JsxAttribute */:
-                case 269 /* JsxSpreadAttribute */:
+                case 268 /* JsxAttribute */:
+                case 270 /* JsxSpreadAttribute */:
                     return getContextualTypeForJsxAttribute(parent);
-                case 262 /* JsxOpeningElement */:
-                case 261 /* JsxSelfClosingElement */:
+                case 263 /* JsxOpeningElement */:
+                case 262 /* JsxSelfClosingElement */:
                     return getContextualJsxElementAttributesType(parent);
             }
             return undefined;
         }
-        function getContextualMapper(node) {
-            var ancestor = ts.findAncestor(node, function (n) { return !!n.contextualMapper; });
-            return ancestor ? ancestor.contextualMapper : identityMapper;
+        function getInferenceContext(node) {
+            var ancestor = ts.findAncestor(node, function (n) { return !!n.inferenceContext; });
+            return ancestor && ancestor.inferenceContext;
         }
         function getContextualJsxElementAttributesType(node) {
             if (ts.isJsxOpeningElement(node) && node.parent.contextualType) {
@@ -47903,7 +49328,7 @@ var ts;
             return getJsxReferenceKind(node) !== 0 /* Component */ ? getJsxPropsTypeFromCallSignature(signature, node) : getJsxPropsTypeFromClassType(signature, node);
         }
         function getJsxPropsTypeFromCallSignature(sig, context) {
-            var propsType = getTypeOfFirstParameterOfSignatureWithFallback(sig, emptyObjectType);
+            var propsType = getTypeOfFirstParameterOfSignatureWithFallback(sig, unknownType);
             propsType = getJsxManagedAttributesFromLocatedAttributes(context, getJsxNamespaceAt(context), propsType);
             var intrinsicAttribs = getJsxType(JsxNames.IntrinsicAttributes, context);
             if (intrinsicAttribs !== errorType) {
@@ -47974,7 +49399,7 @@ var ts;
             var forcedLookupLocation = getJsxElementPropertiesName(ns);
             var attributesType = forcedLookupLocation === undefined
                 // If there is no type ElementAttributesProperty, return the type of the first parameter of the signature, which should be the props type
-                ? getTypeOfFirstParameterOfSignatureWithFallback(sig, emptyObjectType)
+                ? getTypeOfFirstParameterOfSignatureWithFallback(sig, unknownType)
                 : forcedLookupLocation === ""
                     // If there is no e.g. 'props' member in ElementAttributesProperty, use the element class type instead
                     ? getReturnTypeOfSignature(sig)
@@ -47985,7 +49410,7 @@ var ts;
                 if (!!forcedLookupLocation && !!ts.length(context.attributes.properties)) {
                     error(context, ts.Diagnostics.JSX_element_class_does_not_support_attributes_because_it_does_not_have_a_0_property, ts.unescapeLeadingUnderscores(forcedLookupLocation));
                 }
-                return emptyObjectType;
+                return unknownType;
             }
             attributesType = getJsxManagedAttributesFromLocatedAttributes(context, ns, attributesType);
             if (isTypeAny(attributesType)) {
@@ -48036,7 +49461,7 @@ var ts;
             return !hasEffectiveRestParameter(signature) && getParameterCount(signature) < targetParameterCount;
         }
         function isFunctionExpressionOrArrowFunction(node) {
-            return node.kind === 196 /* FunctionExpression */ || node.kind === 197 /* ArrowFunction */;
+            return node.kind === 197 /* FunctionExpression */ || node.kind === 198 /* ArrowFunction */;
         }
         function getContextualSignatureForFunctionLikeDeclaration(node) {
             // Only function expressions, arrow functions, and object literal methods are contextually typed.
@@ -48044,23 +49469,20 @@ var ts;
                 ? getContextualSignature(node)
                 : undefined;
         }
-        function getContextualTypeForFunctionLikeDeclaration(node) {
-            return ts.isObjectLiteralMethod(node) ?
-                getContextualTypeForObjectLiteralMethod(node) :
-                getApparentTypeOfContextualType(node);
-        }
         // Return the contextual signature for a given expression node. A contextual type provides a
         // contextual signature if it has a single call signature and if that call signature is non-generic.
         // If the contextual type is a union type, get the signature from each type possible and if they are
         // all identical ignoring their return type, the result is same signature but with return type as
         // union type of return types from these signatures
         function getContextualSignature(node) {
-            ts.Debug.assert(node.kind !== 156 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 157 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
             var typeTagSignature = getSignatureOfTypeTag(node);
             if (typeTagSignature) {
                 return typeTagSignature;
             }
-            var type = getContextualTypeForFunctionLikeDeclaration(node);
+            var type = ts.isObjectLiteralMethod(node) ?
+                getContextualTypeForObjectLiteralMethod(node, 1 /* Signature */) :
+                getApparentTypeOfContextualType(node, 1 /* Signature */);
             if (!type) {
                 return undefined;
             }
@@ -48069,8 +49491,8 @@ var ts;
             }
             var signatureList;
             var types = type.types;
-            for (var _i = 0, types_15 = types; _i < types_15.length; _i++) {
-                var current = types_15[_i];
+            for (var _i = 0, types_14 = types; _i < types_14.length; _i++) {
+                var current = types_14[_i];
                 var signature = getContextualCallSignature(current, node);
                 if (signature) {
                     if (!signatureList) {
@@ -48088,23 +49510,20 @@ var ts;
                 }
             }
             // Result is union of signatures collected (return type is union of return types of this signature set)
-            var result;
             if (signatureList) {
-                result = cloneSignature(signatureList[0]);
-                result.unionSignatures = signatureList;
+                return signatureList.length === 1 ? signatureList[0] : createUnionSignature(signatureList[0], signatureList);
             }
-            return result;
         }
         function checkSpreadExpression(node, checkMode) {
-            if (languageVersion < 2 /* ES2015 */ && compilerOptions.downlevelIteration) {
-                checkExternalEmitHelpers(node, 1536 /* SpreadIncludes */);
+            if (languageVersion < 2 /* ES2015 */) {
+                checkExternalEmitHelpers(node, compilerOptions.downlevelIteration ? 1536 /* SpreadIncludes */ : 2048 /* SpreadArrays */);
             }
             var arrayOrIterableType = checkExpression(node.expression, checkMode);
-            return checkIteratedTypeOrElementType(arrayOrIterableType, node.expression, /*allowStringInput*/ false, /*allowAsyncIterables*/ false);
+            return checkIteratedTypeOrElementType(33 /* Spread */, arrayOrIterableType, undefinedType, node.expression);
         }
         function hasDefaultValue(node) {
-            return (node.kind === 186 /* BindingElement */ && !!node.initializer) ||
-                (node.kind === 204 /* BinaryExpression */ && node.operatorToken.kind === 59 /* EqualsToken */);
+            return (node.kind === 187 /* BindingElement */ && !!node.initializer) ||
+                (node.kind === 205 /* BinaryExpression */ && node.operatorToken.kind === 60 /* EqualsToken */);
         }
         function checkArrayLiteral(node, checkMode, forceTuple) {
             var elements = node.elements;
@@ -48116,7 +49535,7 @@ var ts;
             var inConstContext = isConstContext(node);
             for (var index = 0; index < elementCount; index++) {
                 var e = elements[index];
-                if (inDestructuringPattern && e.kind === 208 /* SpreadElement */) {
+                if (inDestructuringPattern && e.kind === 209 /* SpreadElement */) {
                     // Given the following situation:
                     //    var c: {};
                     //    [...c] = ["", 0];
@@ -48131,7 +49550,7 @@ var ts;
                     // if there is no index type / iterated type.
                     var restArrayType = checkExpression(e.expression, checkMode, forceTuple);
                     var restElementType = getIndexTypeOfType(restArrayType, 1 /* Number */) ||
-                        getIteratedTypeOrElementType(restArrayType, /*errorNode*/ undefined, /*allowStringInput*/ false, /*allowAsyncIterables*/ false, /*checkAssignability*/ false);
+                        getIteratedTypeOrElementType(65 /* Destructuring */, restArrayType, undefinedType, /*errorNode*/ undefined, /*checkAssignability*/ false);
                     if (restElementType) {
                         elementTypes.push(restElementType);
                     }
@@ -48141,12 +49560,12 @@ var ts;
                     var type = checkExpressionForMutableLocation(e, checkMode, elementContextualType, forceTuple);
                     elementTypes.push(type);
                 }
-                if (index < elementCount - 1 && e.kind === 208 /* SpreadElement */) {
+                if (index < elementCount - 1 && e.kind === 209 /* SpreadElement */) {
                     hasNonEndingSpreadElement = true;
                 }
             }
             if (!hasNonEndingSpreadElement) {
-                var hasRestElement = elementCount > 0 && elements[elementCount - 1].kind === 208 /* SpreadElement */;
+                var hasRestElement = elementCount > 0 && elements[elementCount - 1].kind === 209 /* SpreadElement */;
                 var minLength = elementCount - (hasRestElement ? 1 : 0);
                 // If array literal is actually a destructuring pattern, mark it as an implied type. We do this such
                 // that we get the same behavior for "var [x, y] = []" and "[x, y] = []".
@@ -48157,48 +49576,40 @@ var ts;
                     return type;
                 }
                 else if (tupleResult = getArrayLiteralTupleTypeIfApplicable(elementTypes, contextualType, hasRestElement, elementCount, inConstContext)) {
-                    return tupleResult;
+                    return createArrayLiteralType(tupleResult);
                 }
                 else if (forceTuple) {
-                    return createTupleType(elementTypes, minLength, hasRestElement);
+                    return createArrayLiteralType(createTupleType(elementTypes, minLength, hasRestElement));
                 }
             }
-            return createArrayType(elementTypes.length ?
+            return createArrayLiteralType(createArrayType(elementTypes.length ?
                 getUnionType(elementTypes, 2 /* Subtype */) :
-                strictNullChecks ? implicitNeverType : undefinedWideningType, inConstContext);
+                strictNullChecks ? implicitNeverType : undefinedWideningType, inConstContext));
+        }
+        function createArrayLiteralType(type) {
+            if (!(ts.getObjectFlags(type) & 4 /* Reference */)) {
+                return type;
+            }
+            var literalType = type.literalType;
+            if (!literalType) {
+                literalType = type.literalType = cloneTypeReference(type);
+                literalType.objectFlags |= 65536 /* ArrayLiteral */ | 524288 /* ContainsObjectOrArrayLiteral */;
+            }
+            return literalType;
         }
         function getArrayLiteralTupleTypeIfApplicable(elementTypes, contextualType, hasRestElement, elementCount, readonly) {
             if (elementCount === void 0) { elementCount = elementTypes.length; }
             if (readonly === void 0) { readonly = false; }
             // Infer a tuple type when the contextual type is or contains a tuple-like type
             if (readonly || (contextualType && forEachType(contextualType, isTupleLikeType))) {
-                var minLength = elementCount - (hasRestElement ? 1 : 0);
-                var pattern = contextualType && contextualType.pattern;
-                // If array literal is contextually typed by a binding pattern or an assignment pattern, pad the resulting
-                // tuple type with the corresponding binding or assignment element types to make the lengths equal.
-                if (!hasRestElement && pattern && (pattern.kind === 185 /* ArrayBindingPattern */ || pattern.kind === 187 /* ArrayLiteralExpression */)) {
-                    var patternElements = pattern.elements;
-                    for (var i = elementCount; i < patternElements.length; i++) {
-                        var e = patternElements[i];
-                        if (hasDefaultValue(e)) {
-                            elementTypes.push(contextualType.typeArguments[i]);
-                        }
-                        else if (i < patternElements.length - 1 || !(e.kind === 186 /* BindingElement */ && e.dotDotDotToken || e.kind === 208 /* SpreadElement */)) {
-                            if (e.kind !== 210 /* OmittedExpression */) {
-                                error(e, ts.Diagnostics.Initializer_provides_no_value_for_this_binding_element_and_the_binding_element_has_no_default_value);
-                            }
-                            elementTypes.push(strictNullChecks ? implicitNeverType : undefinedWideningType);
-                        }
-                    }
-                }
-                return createTupleType(elementTypes, minLength, hasRestElement, readonly);
+                return createTupleType(elementTypes, elementCount - (hasRestElement ? 1 : 0), hasRestElement, readonly);
             }
         }
         function isNumericName(name) {
             switch (name.kind) {
-                case 149 /* ComputedPropertyName */:
+                case 150 /* ComputedPropertyName */:
                     return isNumericComputedName(name);
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return isNumericLiteralName(name.escapedText);
                 case 8 /* NumericLiteral */:
                 case 10 /* StringLiteral */:
@@ -48286,7 +49697,7 @@ var ts;
             var spread = emptyObjectType;
             var contextualType = getApparentTypeOfContextualType(node);
             var contextualTypeHasPattern = contextualType && contextualType.pattern &&
-                (contextualType.pattern.kind === 184 /* ObjectBindingPattern */ || contextualType.pattern.kind === 188 /* ObjectLiteralExpression */);
+                (contextualType.pattern.kind === 185 /* ObjectBindingPattern */ || contextualType.pattern.kind === 189 /* ObjectLiteralExpression */);
             var inConstContext = isConstContext(node);
             var checkFlags = inConstContext ? 8 /* Readonly */ : 0;
             var isInJavascript = ts.isInJSFile(node) && !ts.isInJsonFile(node);
@@ -48301,13 +49712,13 @@ var ts;
             for (var i = 0; i < node.properties.length; i++) {
                 var memberDecl = node.properties[i];
                 var member = getSymbolOfNode(memberDecl);
-                var computedNameType = memberDecl.name && memberDecl.name.kind === 149 /* ComputedPropertyName */ && !ts.isWellKnownSymbolSyntactically(memberDecl.name.expression) ?
+                var computedNameType = memberDecl.name && memberDecl.name.kind === 150 /* ComputedPropertyName */ && !ts.isWellKnownSymbolSyntactically(memberDecl.name.expression) ?
                     checkComputedPropertyName(memberDecl.name) : undefined;
-                if (memberDecl.kind === 275 /* PropertyAssignment */ ||
-                    memberDecl.kind === 276 /* ShorthandPropertyAssignment */ ||
+                if (memberDecl.kind === 276 /* PropertyAssignment */ ||
+                    memberDecl.kind === 277 /* ShorthandPropertyAssignment */ ||
                     ts.isObjectLiteralMethod(memberDecl)) {
-                    var type = memberDecl.kind === 275 /* PropertyAssignment */ ? checkPropertyAssignment(memberDecl, checkMode) :
-                        memberDecl.kind === 276 /* ShorthandPropertyAssignment */ ? checkExpressionForMutableLocation(memberDecl.name, checkMode) :
+                    var type = memberDecl.kind === 276 /* PropertyAssignment */ ? checkPropertyAssignment(memberDecl, checkMode) :
+                        memberDecl.kind === 277 /* ShorthandPropertyAssignment */ ? checkExpressionForMutableLocation(memberDecl.name, checkMode) :
                             checkObjectLiteralMethod(memberDecl, checkMode);
                     if (isInJavascript) {
                         var jsDocType = getTypeForDeclarationFromJSDocComment(memberDecl);
@@ -48319,10 +49730,10 @@ var ts;
                             checkTypeAssignableTo(type, getTypeFromTypeNode(enumTag.typeExpression), memberDecl);
                         }
                     }
-                    objectFlags |= ts.getObjectFlags(type) & 917504 /* PropagatingFlags */;
+                    objectFlags |= ts.getObjectFlags(type) & 1835008 /* PropagatingFlags */;
                     var nameType = computedNameType && isTypeUsableAsPropertyName(computedNameType) ? computedNameType : undefined;
                     var prop = nameType ?
-                        createSymbol(4 /* Property */ | member.flags, getPropertyNameFromType(nameType), checkFlags | 2048 /* Late */) :
+                        createSymbol(4 /* Property */ | member.flags, getPropertyNameFromType(nameType), checkFlags | 4096 /* Late */) :
                         createSymbol(4 /* Property */ | member.flags, member.escapedName, checkFlags);
                     if (nameType) {
                         prop.nameType = nameType;
@@ -48330,8 +49741,8 @@ var ts;
                     if (inDestructuringPattern) {
                         // If object literal is an assignment pattern and if the assignment pattern specifies a default value
                         // for the property, make the property optional.
-                        var isOptional = (memberDecl.kind === 275 /* PropertyAssignment */ && hasDefaultValue(memberDecl.initializer)) ||
-                            (memberDecl.kind === 276 /* ShorthandPropertyAssignment */ && memberDecl.objectAssignmentInitializer);
+                        var isOptional = (memberDecl.kind === 276 /* PropertyAssignment */ && hasDefaultValue(memberDecl.initializer)) ||
+                            (memberDecl.kind === 277 /* ShorthandPropertyAssignment */ && memberDecl.objectAssignmentInitializer);
                         if (isOptional) {
                             prop.flags |= 16777216 /* Optional */;
                         }
@@ -48356,7 +49767,7 @@ var ts;
                     prop.target = member;
                     member = prop;
                 }
-                else if (memberDecl.kind === 277 /* SpreadAssignment */) {
+                else if (memberDecl.kind === 278 /* SpreadAssignment */) {
                     if (languageVersion < 2 /* ES2015 */) {
                         checkExternalEmitHelpers(memberDecl, 2 /* Assign */);
                     }
@@ -48382,7 +49793,7 @@ var ts;
                     // an ordinary function declaration(section 6.1) with no parameters.
                     // A set accessor declaration is processed in the same manner
                     // as an ordinary function declaration with a single parameter and a Void return type.
-                    ts.Debug.assert(memberDecl.kind === 158 /* GetAccessor */ || memberDecl.kind === 159 /* SetAccessor */);
+                    ts.Debug.assert(memberDecl.kind === 159 /* GetAccessor */ || memberDecl.kind === 160 /* SetAccessor */);
                     checkNodeDeferred(memberDecl);
                 }
                 if (computedNameType && !(computedNameType.flags & 8576 /* StringOrNumberLiteralOrUnique */)) {
@@ -48428,7 +49839,7 @@ var ts;
                 var stringIndexInfo = hasComputedStringProperty ? getObjectLiteralIndexInfo(node, offset, propertiesArray, 0 /* String */) : undefined;
                 var numberIndexInfo = hasComputedNumberProperty ? getObjectLiteralIndexInfo(node, offset, propertiesArray, 1 /* Number */) : undefined;
                 var result = createAnonymousType(node.symbol, propertiesTable, ts.emptyArray, ts.emptyArray, stringIndexInfo, numberIndexInfo);
-                result.objectFlags |= objectFlags | 128 /* ObjectLiteral */ | 262144 /* ContainsObjectLiteral */;
+                result.objectFlags |= objectFlags | 128 /* ObjectLiteral */ | 524288 /* ContainsObjectOrArrayLiteral */;
                 if (isJSObjectLiteral) {
                     result.objectFlags |= 16384 /* JSLiteral */;
                 }
@@ -48490,7 +49901,7 @@ var ts;
          * Returns true iff React would emit this tag name as a string rather than an identifier or qualified name
          */
         function isJsxIntrinsicIdentifier(tagName) {
-            return tagName.kind === 72 /* Identifier */ && ts.isIntrinsicJsxName(tagName.escapedText);
+            return tagName.kind === 73 /* Identifier */ && ts.isIntrinsicJsxName(tagName.escapedText);
         }
         function checkJsxAttribute(node, checkMode) {
             return node.initializer
@@ -48520,7 +49931,7 @@ var ts;
                 var member = attributeDecl.symbol;
                 if (ts.isJsxAttribute(attributeDecl)) {
                     var exprType = checkJsxAttribute(attributeDecl, checkMode);
-                    objectFlags |= ts.getObjectFlags(exprType) & 917504 /* PropagatingFlags */;
+                    objectFlags |= ts.getObjectFlags(exprType) & 1835008 /* PropagatingFlags */;
                     var attributeSymbol = createSymbol(4 /* Property */ | 33554432 /* Transient */ | member.flags, member.escapedName);
                     attributeSymbol.declarations = member.declarations;
                     attributeSymbol.parent = member.parent;
@@ -48535,7 +49946,7 @@ var ts;
                     }
                 }
                 else {
-                    ts.Debug.assert(attributeDecl.kind === 269 /* JsxSpreadAttribute */);
+                    ts.Debug.assert(attributeDecl.kind === 270 /* JsxSpreadAttribute */);
                     if (attributesTable.size > 0) {
                         spread = getSpreadType(spread, createJsxAttributesType(), attributes.symbol, objectFlags, /*readonly*/ false);
                         attributesTable = ts.createSymbolTable();
@@ -48558,7 +49969,7 @@ var ts;
                 }
             }
             // Handle children attribute
-            var parent = openingLikeElement.parent.kind === 260 /* JsxElement */ ? openingLikeElement.parent : undefined;
+            var parent = openingLikeElement.parent.kind === 261 /* JsxElement */ ? openingLikeElement.parent : undefined;
             // We have to check that openingElement of the parent is the one we are visiting as this may not be true for selfClosingElement
             if (parent && parent.openingElement === openingLikeElement && parent.children.length > 0) {
                 var childrenTypes = checkJsxChildren(parent, checkMode);
@@ -48600,7 +50011,7 @@ var ts;
             function createJsxAttributesType() {
                 objectFlags |= freshObjectLiteralFlag;
                 var result = createAnonymousType(attributes.symbol, attributesTable, ts.emptyArray, ts.emptyArray, /*stringIndexInfo*/ undefined, /*numberIndexInfo*/ undefined);
-                result.objectFlags |= objectFlags | 128 /* ObjectLiteral */ | 262144 /* ContainsObjectLiteral */;
+                result.objectFlags |= objectFlags | 128 /* ObjectLiteral */ | 524288 /* ContainsObjectOrArrayLiteral */;
                 return result;
             }
         }
@@ -48611,7 +50022,7 @@ var ts;
                 // In React, JSX text that contains only whitespaces will be ignored so we don't want to type-check that
                 // because then type of children property will have constituent of string type.
                 if (child.kind === 11 /* JsxText */) {
-                    if (!child.containsOnlyWhiteSpaces) {
+                    if (!child.containsOnlyTriviaWhiteSpaces) {
                         childrenTypes.push(stringType);
                     }
                 }
@@ -48938,6 +50349,7 @@ var ts;
                 type.flags & 2097152 /* Intersection */ && ts.every(type.types, isExcessPropertyCheckTarget));
         }
         function checkJsxExpression(node, checkMode) {
+            checkGrammarJsxExpression(node);
             if (node.expression) {
                 var type = checkExpression(node.expression, checkMode);
                 if (node.dotDotDotToken && type !== anyType && !isArrayType(type)) {
@@ -48976,8 +50388,8 @@ var ts;
          */
         function checkPropertyAccessibility(node, isSuper, type, prop) {
             var flags = ts.getDeclarationModifierFlagsFromSymbol(prop);
-            var errorNode = node.kind === 148 /* QualifiedName */ ? node.right : node.kind === 183 /* ImportType */ ? node : node.name;
-            if (ts.getCheckFlags(prop) & 512 /* ContainsPrivate */) {
+            var errorNode = node.kind === 149 /* QualifiedName */ ? node.right : node.kind === 184 /* ImportType */ ? node : node.name;
+            if (ts.getCheckFlags(prop) & 1024 /* ContainsPrivate */) {
                 // Synthetic property with private constituent property
                 error(errorNode, ts.Diagnostics.Property_0_has_conflicting_declarations_and_is_inaccessible_in_type_1, symbolToString(prop), typeToString(type));
                 return false;
@@ -49082,7 +50494,7 @@ var ts;
             return type;
         }
         function checkNonNullType(type, node, nullDiagnostic, undefinedDiagnostic, nullOrUndefinedDiagnostic) {
-            if (type.flags & 2 /* Unknown */) {
+            if (strictNullChecks && type.flags & 2 /* Unknown */) {
                 error(node, ts.Diagnostics.Object_is_of_type_unknown);
                 return errorType;
             }
@@ -49097,42 +50509,58 @@ var ts;
             }
             return type;
         }
+        function checkNonNullNonVoidType(type, node) {
+            var nonNullType = checkNonNullType(type, node);
+            if (nonNullType !== errorType && nonNullType.flags & 16384 /* Void */) {
+                error(node, ts.Diagnostics.Object_is_possibly_undefined);
+            }
+            return nonNullType;
+        }
         function checkPropertyAccessExpression(node) {
             return checkPropertyAccessExpressionOrQualifiedName(node, node.expression, node.name);
         }
         function checkQualifiedName(node) {
             return checkPropertyAccessExpressionOrQualifiedName(node, node.left, node.right);
         }
+        function isMethodAccessForCall(node) {
+            while (node.parent.kind === 196 /* ParenthesizedExpression */) {
+                node = node.parent;
+            }
+            return ts.isCallOrNewExpression(node.parent) && node.parent.expression === node;
+        }
         function checkPropertyAccessExpressionOrQualifiedName(node, left, right) {
             var propType;
             var leftType = checkNonNullExpression(left);
             var parentSymbol = getNodeLinks(left).resolvedSymbol;
-            var apparentType = getApparentType(getWidenedType(leftType));
+            var assignmentKind = ts.getAssignmentTargetKind(node);
+            var apparentType = getApparentType(assignmentKind !== 0 /* None */ || isMethodAccessForCall(node) ? getWidenedType(leftType) : leftType);
             if (isTypeAny(apparentType) || apparentType === silentNeverType) {
                 if (ts.isIdentifier(left) && parentSymbol) {
                     markAliasReferenced(parentSymbol, node);
                 }
                 return apparentType;
             }
-            var assignmentKind = ts.getAssignmentTargetKind(node);
             var prop = getPropertyOfType(apparentType, right.escapedText);
             if (ts.isIdentifier(left) && parentSymbol && !(prop && isConstEnumOrConstEnumOnlyModule(prop))) {
                 markAliasReferenced(parentSymbol, node);
             }
             if (!prop) {
-                var indexInfo = getIndexInfoOfType(apparentType, 0 /* String */);
+                var indexInfo = assignmentKind === 0 /* None */ || !isGenericObjectType(leftType) || isThisTypeParameter(leftType) ? getIndexInfoOfType(apparentType, 0 /* String */) : undefined;
                 if (!(indexInfo && indexInfo.type)) {
                     if (isJSLiteralType(leftType)) {
                         return anyType;
                     }
                     if (leftType.symbol === globalThisSymbol) {
-                        if (noImplicitAny) {
+                        if (globalThisSymbol.exports.has(right.escapedText) && (globalThisSymbol.exports.get(right.escapedText).flags & 418 /* BlockScoped */)) {
+                            error(right, ts.Diagnostics.Property_0_does_not_exist_on_type_1, ts.unescapeLeadingUnderscores(right.escapedText), typeToString(leftType));
+                        }
+                        else if (noImplicitAny) {
                             error(right, ts.Diagnostics.Element_implicitly_has_an_any_type_because_type_0_has_no_index_signature, typeToString(leftType));
                         }
                         return anyType;
                     }
                     if (right.escapedText && !checkAndReportErrorForExtendingInterface(node)) {
-                        reportNonexistentProperty(right, leftType.flags & 262144 /* TypeParameter */ && leftType.isThisType ? apparentType : leftType);
+                        reportNonexistentProperty(right, isThisTypeParameter(leftType) ? apparentType : leftType);
                     }
                     return errorType;
                 }
@@ -49143,9 +50571,9 @@ var ts;
             }
             else {
                 checkPropertyNotUsedBeforeDeclaration(prop, node, right);
-                markPropertyAsReferenced(prop, node, left.kind === 100 /* ThisKeyword */);
+                markPropertyAsReferenced(prop, node, left.kind === 101 /* ThisKeyword */);
                 getNodeLinks(node).resolvedSymbol = prop;
-                checkPropertyAccessibility(node, left.kind === 98 /* SuperKeyword */, apparentType, prop);
+                checkPropertyAccessibility(node, left.kind === 99 /* SuperKeyword */, apparentType, prop);
                 if (assignmentKind) {
                     if (isReferenceToReadonlyEntity(node, prop) || isReferenceThroughNamespaceImport(node)) {
                         error(right, ts.Diagnostics.Cannot_assign_to_0_because_it_is_a_read_only_property, ts.idText(right));
@@ -49154,10 +50582,14 @@ var ts;
                 }
                 propType = getConstraintForLocation(getTypeOfSymbol(prop), node);
             }
+            return getFlowTypeOfAccessExpression(node, prop, propType, right);
+        }
+        function getFlowTypeOfAccessExpression(node, prop, propType, errorNode) {
             // Only compute control flow type if this is a property access expression that isn't an
             // assignment target, and the referenced property was declared as a variable, property,
             // accessor, or optional method.
-            if (node.kind !== 189 /* PropertyAccessExpression */ ||
+            var assignmentKind = ts.getAssignmentTargetKind(node);
+            if (node.kind !== 191 /* ElementAccessExpression */ && node.kind !== 190 /* PropertyAccessExpression */ ||
                 assignmentKind === 1 /* Definite */ ||
                 prop && !(prop.flags & (3 /* Variable */ | 4 /* Property */ | 98304 /* Accessor */)) && !(prop.flags & 8192 /* Method */ && propType.flags & 1048576 /* Union */)) {
                 return propType;
@@ -49167,11 +50599,11 @@ var ts;
             // and if we are in a constructor of the same class as the property declaration, assume that
             // the property is uninitialized at the top of the control flow.
             var assumeUninitialized = false;
-            if (strictNullChecks && strictPropertyInitialization && left.kind === 100 /* ThisKeyword */) {
+            if (strictNullChecks && strictPropertyInitialization && node.expression.kind === 101 /* ThisKeyword */) {
                 var declaration = prop && prop.valueDeclaration;
                 if (declaration && isInstancePropertyWithoutInitializer(declaration)) {
                     var flowContainer = getControlFlowContainer(node);
-                    if (flowContainer.kind === 157 /* Constructor */ && flowContainer.parent === declaration.parent) {
+                    if (flowContainer.kind === 158 /* Constructor */ && flowContainer.parent === declaration.parent) {
                         assumeUninitialized = true;
                     }
                 }
@@ -49184,7 +50616,7 @@ var ts;
             }
             var flowType = getFlowTypeOfReference(node, propType, assumeUninitialized ? getOptionalType(propType) : propType);
             if (assumeUninitialized && !(getFalsyFlags(propType) & 32768 /* Undefined */) && getFalsyFlags(flowType) & 32768 /* Undefined */) {
-                error(right, ts.Diagnostics.Property_0_is_used_before_being_assigned, symbolToString(prop)); // TODO: GH#18217
+                error(errorNode, ts.Diagnostics.Property_0_is_used_before_being_assigned, symbolToString(prop)); // TODO: GH#18217
                 // Return the declared type to reduce follow-on errors
                 return propType;
             }
@@ -49202,35 +50634,35 @@ var ts;
                 && !isPropertyDeclaredInAncestorClass(prop)) {
                 diagnosticMessage = error(right, ts.Diagnostics.Property_0_is_used_before_its_initialization, declarationName);
             }
-            else if (valueDeclaration.kind === 240 /* ClassDeclaration */ &&
-                node.parent.kind !== 164 /* TypeReference */ &&
+            else if (valueDeclaration.kind === 241 /* ClassDeclaration */ &&
+                node.parent.kind !== 165 /* TypeReference */ &&
                 !(valueDeclaration.flags & 4194304 /* Ambient */) &&
                 !isBlockScopedNameDeclaredBeforeUse(valueDeclaration, right)) {
                 diagnosticMessage = error(right, ts.Diagnostics.Class_0_used_before_its_declaration, declarationName);
             }
             if (diagnosticMessage) {
-                addRelatedInfo(diagnosticMessage, ts.createDiagnosticForNode(valueDeclaration, ts.Diagnostics._0_is_declared_here, declarationName));
+                ts.addRelatedInfo(diagnosticMessage, ts.createDiagnosticForNode(valueDeclaration, ts.Diagnostics._0_is_declared_here, declarationName));
             }
         }
         function isInPropertyInitializer(node) {
             return !!ts.findAncestor(node, function (node) {
                 switch (node.kind) {
-                    case 154 /* PropertyDeclaration */:
+                    case 155 /* PropertyDeclaration */:
                         return true;
-                    case 275 /* PropertyAssignment */:
-                    case 156 /* MethodDeclaration */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
-                    case 277 /* SpreadAssignment */:
-                    case 149 /* ComputedPropertyName */:
-                    case 216 /* TemplateSpan */:
-                    case 270 /* JsxExpression */:
-                    case 267 /* JsxAttribute */:
-                    case 268 /* JsxAttributes */:
-                    case 269 /* JsxSpreadAttribute */:
-                    case 262 /* JsxOpeningElement */:
-                    case 211 /* ExpressionWithTypeArguments */:
-                    case 273 /* HeritageClause */:
+                    case 276 /* PropertyAssignment */:
+                    case 157 /* MethodDeclaration */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
+                    case 278 /* SpreadAssignment */:
+                    case 150 /* ComputedPropertyName */:
+                    case 217 /* TemplateSpan */:
+                    case 271 /* JsxExpression */:
+                    case 268 /* JsxAttribute */:
+                    case 269 /* JsxAttributes */:
+                    case 270 /* JsxSpreadAttribute */:
+                    case 263 /* JsxOpeningElement */:
+                    case 212 /* ExpressionWithTypeArguments */:
+                    case 274 /* HeritageClause */:
                         return false;
                     default:
                         return ts.isExpressionNode(node) ? false : "quit";
@@ -49282,7 +50714,8 @@ var ts;
             else {
                 var promisedType = getPromisedTypeOfPromise(containingType);
                 if (promisedType && getPropertyOfType(promisedType, propNode.escapedText)) {
-                    errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.Property_0_does_not_exist_on_type_1_Did_you_forget_to_use_await, ts.declarationNameToString(propNode), typeToString(containingType));
+                    errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.Property_0_does_not_exist_on_type_1, ts.declarationNameToString(propNode), typeToString(containingType));
+                    relatedInfo = ts.createDiagnosticForNode(propNode, ts.Diagnostics.Did_you_forget_to_use_await);
                 }
                 else {
                     var suggestion = getSuggestedSymbolForNonexistentProperty(propNode, containingType);
@@ -49298,7 +50731,7 @@ var ts;
             }
             var resultDiagnostic = ts.createDiagnosticForNodeFromMessageChain(propNode, errorInfo);
             if (relatedInfo) {
-                addRelatedInfo(resultDiagnostic, relatedInfo);
+                ts.addRelatedInfo(resultDiagnostic, relatedInfo);
             }
             diagnostics.add(resultDiagnostic);
         }
@@ -49336,6 +50769,32 @@ var ts;
             var suggestion = getSuggestedSymbolForNonexistentModule(name, targetModule);
             return suggestion && ts.symbolName(suggestion);
         }
+        function getSuggestionForNonexistentIndexSignature(objectType, expr) {
+            // check if object type has setter or getter
+            var hasProp = function (name, argCount) {
+                if (argCount === void 0) { argCount = 1; }
+                var prop = getPropertyOfObjectType(objectType, name);
+                if (prop) {
+                    var s = getSingleCallSignature(getTypeOfSymbol(prop));
+                    if (s && getMinArgumentCount(s) === argCount && typeToString(getTypeAtPosition(s, 0)) === "string") {
+                        return true;
+                    }
+                }
+                return false;
+            };
+            var suggestedMethod = ts.isAssignmentTarget(expr) ? "set" : "get";
+            if (!hasProp(suggestedMethod)) {
+                return undefined;
+            }
+            var suggestion = ts.tryGetPropertyAccessOrIdentifierToString(expr);
+            if (suggestion === undefined) {
+                suggestion = suggestedMethod;
+            }
+            else {
+                suggestion += "." + suggestedMethod;
+            }
+            return suggestion;
+        }
         /**
          * Given a name and a list of symbols whose names are *not* equal to the name, return a spelling suggestion if there is one that is close enough.
          * Names less than length 3 only check for case-insensitive equality, not levenshtein distance.
@@ -49376,34 +50835,17 @@ var ts;
         }
         function isValidPropertyAccess(node, propertyName) {
             switch (node.kind) {
-                case 189 /* PropertyAccessExpression */:
-                    return isValidPropertyAccessWithType(node, node.expression.kind === 98 /* SuperKeyword */, propertyName, getWidenedType(checkExpression(node.expression)));
-                case 148 /* QualifiedName */:
+                case 190 /* PropertyAccessExpression */:
+                    return isValidPropertyAccessWithType(node, node.expression.kind === 99 /* SuperKeyword */, propertyName, getWidenedType(checkExpression(node.expression)));
+                case 149 /* QualifiedName */:
                     return isValidPropertyAccessWithType(node, /*isSuper*/ false, propertyName, getWidenedType(checkExpression(node.left)));
-                case 183 /* ImportType */:
+                case 184 /* ImportType */:
                     return isValidPropertyAccessWithType(node, /*isSuper*/ false, propertyName, getTypeFromTypeNode(node));
             }
         }
         function isValidPropertyAccessForCompletions(node, type, property) {
-            return isValidPropertyAccessWithType(node, node.kind === 189 /* PropertyAccessExpression */ && node.expression.kind === 98 /* SuperKeyword */, property.escapedName, type)
-                && (!(property.flags & 8192 /* Method */) || isValidMethodAccess(property, type));
-        }
-        function isValidMethodAccess(method, actualThisType) {
-            var propType = getTypeOfPropertyOfType(actualThisType, method.escapedName);
-            var signatures = getSignaturesOfType(getNonNullableType(propType), 0 /* Call */);
-            ts.Debug.assert(signatures.length !== 0);
-            return signatures.some(function (sig) {
-                var signatureThisType = getThisTypeOfSignature(sig);
-                return !signatureThisType || isTypeAssignableTo(actualThisType, getInstantiatedSignatureThisType(sig, signatureThisType, actualThisType));
-            });
-        }
-        function getInstantiatedSignatureThisType(sig, signatureThisType, actualThisType) {
-            if (!sig.typeParameters) {
-                return signatureThisType;
-            }
-            var context = createInferenceContext(sig.typeParameters, sig, 0 /* None */);
-            inferTypes(context.inferences, actualThisType, signatureThisType);
-            return instantiateType(signatureThisType, createSignatureTypeMapper(sig, getInferredTypes(context)));
+            return isValidPropertyAccessWithType(node, node.kind === 190 /* PropertyAccessExpression */ && node.expression.kind === 99 /* SuperKeyword */, property.escapedName, type);
+            // Previously we validated the 'this' type of methods but this adversely affected performance. See #31377 for more context.
         }
         function isValidPropertyAccessWithType(node, isSuper, propertyName, type) {
             if (type === errorType || isTypeAny(type)) {
@@ -49419,13 +50861,13 @@ var ts;
          */
         function getForInVariableSymbol(node) {
             var initializer = node.initializer;
-            if (initializer.kind === 238 /* VariableDeclarationList */) {
+            if (initializer.kind === 239 /* VariableDeclarationList */) {
                 var variable = initializer.declarations[0];
                 if (variable && !ts.isBindingPattern(variable.name)) {
                     return getSymbolOfNode(variable);
                 }
             }
-            else if (initializer.kind === 72 /* Identifier */) {
+            else if (initializer.kind === 73 /* Identifier */) {
                 return getResolvedSymbol(initializer);
             }
             return undefined;
@@ -49442,13 +50884,13 @@ var ts;
          */
         function isForInVariableForNumericPropertyNames(expr) {
             var e = ts.skipParentheses(expr);
-            if (e.kind === 72 /* Identifier */) {
+            if (e.kind === 73 /* Identifier */) {
                 var symbol = getResolvedSymbol(e);
                 if (symbol.flags & 3 /* Variable */) {
                     var child = expr;
                     var node = expr.parent;
                     while (node) {
-                        if (node.kind === 226 /* ForInStatement */ &&
+                        if (node.kind === 227 /* ForInStatement */ &&
                             child === node.statement &&
                             getForInVariableSymbol(node) === symbol &&
                             hasNumericPropertyNames(getTypeOfExpression(node.expression))) {
@@ -49462,11 +50904,12 @@ var ts;
             return false;
         }
         function checkIndexedAccess(node) {
-            var objectType = checkNonNullExpression(node.expression);
+            var exprType = checkNonNullExpression(node.expression);
+            var objectType = ts.getAssignmentTargetKind(node) !== 0 /* None */ || isMethodAccessForCall(node) ? getWidenedType(exprType) : exprType;
             var indexExpression = node.argumentExpression;
             if (!indexExpression) {
                 var sourceFile = ts.getSourceFileOfNode(node);
-                if (node.parent.kind === 192 /* NewExpression */ && node.parent.expression === node) {
+                if (node.parent.kind === 193 /* NewExpression */ && node.parent.expression === node) {
                     var start = ts.skipTrivia(sourceFile.text, node.expression.end);
                     var end = node.end;
                     grammarErrorAtPos(sourceFile, start, end - start, ts.Diagnostics.new_T_cannot_be_used_to_create_an_array_Use_new_Array_T_instead);
@@ -49486,7 +50929,12 @@ var ts;
                 error(indexExpression, ts.Diagnostics.A_const_enum_member_can_only_be_accessed_using_a_string_literal);
                 return errorType;
             }
-            return checkIndexedAccessIndexType(getIndexedAccessType(objectType, isForInVariableForNumericPropertyNames(indexExpression) ? numberType : indexType, node), node);
+            var effectiveIndexType = isForInVariableForNumericPropertyNames(indexExpression) ? numberType : indexType;
+            var accessFlags = ts.isAssignmentTarget(node) ?
+                2 /* Writing */ | (isGenericObjectType(objectType) && !isThisTypeParameter(objectType) ? 1 /* NoIndexSignatures */ : 0) :
+                0 /* None */;
+            var indexedAccessType = getIndexedAccessTypeOrUndefined(objectType, effectiveIndexType, node, accessFlags) || errorType;
+            return checkIndexedAccessIndexType(getFlowTypeOfAccessExpression(node, indexedAccessType.symbol, indexedAccessType, indexExpression), node);
         }
         function checkThatExpressionIsProperSymbolReference(expression, expressionType, reportError) {
             if (expressionType === errorType) {
@@ -49532,13 +50980,13 @@ var ts;
                 // This gets us diagnostics for the type arguments and marks them as referenced.
                 ts.forEach(node.typeArguments, checkSourceElement);
             }
-            if (node.kind === 193 /* TaggedTemplateExpression */) {
+            if (node.kind === 194 /* TaggedTemplateExpression */) {
                 checkExpression(node.template);
             }
             else if (ts.isJsxOpeningLikeElement(node)) {
                 checkExpression(node.attributes);
             }
-            else if (node.kind !== 152 /* Decorator */) {
+            else if (node.kind !== 153 /* Decorator */) {
                 ts.forEach(node.arguments, function (argument) {
                     checkExpression(argument);
                 });
@@ -49602,7 +51050,7 @@ var ts;
             }
         }
         function isSpreadArgument(arg) {
-            return !!arg && (arg.kind === 208 /* SpreadElement */ || arg.kind === 215 /* SyntheticExpression */ && arg.isSpread);
+            return !!arg && (arg.kind === 209 /* SpreadElement */ || arg.kind === 216 /* SyntheticExpression */ && arg.isSpread);
         }
         function getSpreadArgumentIndex(args) {
             return ts.findIndex(args, isSpreadArgument);
@@ -49616,9 +51064,9 @@ var ts;
             var callIsIncomplete = false; // In incomplete call we want to be lenient when we have too few arguments
             var effectiveParameterCount = getParameterCount(signature);
             var effectiveMinimumArguments = getMinArgumentCount(signature);
-            if (node.kind === 193 /* TaggedTemplateExpression */) {
+            if (node.kind === 194 /* TaggedTemplateExpression */) {
                 argCount = args.length;
-                if (node.template.kind === 206 /* TemplateExpression */) {
+                if (node.template.kind === 207 /* TemplateExpression */) {
                     // If a tagged template expression lacks a tail literal, the call is incomplete.
                     // Specifically, a template only can end in a TemplateTail or a Missing literal.
                     var lastSpan = ts.last(node.template.templateSpans); // we should always have at least one span.
@@ -49633,7 +51081,7 @@ var ts;
                     callIsIncomplete = !!templateLiteral.isUnterminated;
                 }
             }
-            else if (node.kind === 152 /* Decorator */) {
+            else if (node.kind === 153 /* Decorator */) {
                 argCount = getDecoratorArgumentCount(node, signature);
             }
             else if (ts.isJsxOpeningLikeElement(node)) {
@@ -49648,7 +51096,7 @@ var ts;
             else {
                 if (!node.arguments) {
                     // This only happens when we have something of the form: 'new C'
-                    ts.Debug.assert(node.kind === 192 /* NewExpression */);
+                    ts.Debug.assert(node.kind === 193 /* NewExpression */);
                     return getMinArgumentCount(signature) === 0;
                 }
                 argCount = signatureHelpTrailingComma ? args.length + 1 : args.length;
@@ -49687,36 +51135,43 @@ var ts;
         }
         // If type has a single call signature and no other members, return that signature. Otherwise, return undefined.
         function getSingleCallSignature(type) {
+            return getSingleSignature(type, 0 /* Call */, /*allowMembers*/ false);
+        }
+        function getSingleCallOrConstructSignature(type) {
+            return getSingleSignature(type, 0 /* Call */, /*allowMembers*/ false) ||
+                getSingleSignature(type, 1 /* Construct */, /*allowMembers*/ false);
+        }
+        function getSingleSignature(type, kind, allowMembers) {
             if (type.flags & 524288 /* Object */) {
                 var resolved = resolveStructuredTypeMembers(type);
-                if (resolved.callSignatures.length === 1 && resolved.constructSignatures.length === 0 &&
-                    resolved.properties.length === 0 && !resolved.stringIndexInfo && !resolved.numberIndexInfo) {
-                    return resolved.callSignatures[0];
+                if (allowMembers || resolved.properties.length === 0 && !resolved.stringIndexInfo && !resolved.numberIndexInfo) {
+                    if (kind === 0 /* Call */ && resolved.callSignatures.length === 1 && resolved.constructSignatures.length === 0) {
+                        return resolved.callSignatures[0];
+                    }
+                    if (kind === 1 /* Construct */ && resolved.constructSignatures.length === 1 && resolved.callSignatures.length === 0) {
+                        return resolved.constructSignatures[0];
+                    }
                 }
             }
             return undefined;
         }
         // Instantiate a generic signature in the context of a non-generic signature (section 3.8.5 in TypeScript spec)
-        function instantiateSignatureInContextOf(signature, contextualSignature, contextualMapper, compareTypes) {
+        function instantiateSignatureInContextOf(signature, contextualSignature, inferenceContext, compareTypes) {
             var context = createInferenceContext(signature.typeParameters, signature, 0 /* None */, compareTypes);
-            // We clone the contextualMapper to avoid fixing. For example, when the source signature is <T>(x: T) => T[] and
+            // We clone the inferenceContext to avoid fixing. For example, when the source signature is <T>(x: T) => T[] and
             // the contextual signature is (...args: A) => B, we want to infer the element type of A's constraint (say 'any')
             // for T but leave it possible to later infer '[any]' back to A.
             var restType = getEffectiveRestType(contextualSignature);
-            var mapper = contextualMapper && restType && restType.flags & 262144 /* TypeParameter */ ? cloneTypeMapper(contextualMapper) : contextualMapper;
+            var mapper = inferenceContext && (restType && restType.flags & 262144 /* TypeParameter */ ? inferenceContext.nonFixingMapper : inferenceContext.mapper);
             var sourceSignature = mapper ? instantiateSignature(contextualSignature, mapper) : contextualSignature;
-            forEachMatchingParameterType(sourceSignature, signature, function (source, target) {
+            applyToParameterTypes(sourceSignature, signature, function (source, target) {
                 // Type parameters from outer context referenced by source type are fixed by instantiation of the source type
                 inferTypes(context.inferences, source, target);
             });
-            if (!contextualMapper) {
-                inferTypes(context.inferences, getReturnTypeOfSignature(contextualSignature), getReturnTypeOfSignature(signature), 8 /* ReturnType */);
-                var signaturePredicate = getTypePredicateOfSignature(signature);
-                var contextualPredicate = getTypePredicateOfSignature(sourceSignature);
-                if (signaturePredicate && contextualPredicate && signaturePredicate.kind === contextualPredicate.kind &&
-                    (signaturePredicate.kind === 0 /* This */ || signaturePredicate.parameterIndex === contextualPredicate.parameterIndex)) {
-                    inferTypes(context.inferences, contextualPredicate.type, signaturePredicate.type, 8 /* ReturnType */);
-                }
+            if (!inferenceContext) {
+                applyToReturnTypes(contextualSignature, signature, function (source, target) {
+                    inferTypes(context.inferences, source, target, 16 /* ReturnType */);
+                });
             }
             return getSignatureInstantiation(signature, getInferredTypes(context), ts.isInJSFile(contextualSignature.declaration));
         }
@@ -49727,17 +51182,6 @@ var ts;
             return getInferredTypes(context);
         }
         function inferTypeArguments(node, signature, args, checkMode, context) {
-            // Clear out all the inference results from the last time inferTypeArguments was called on this context
-            for (var _i = 0, _a = context.inferences; _i < _a.length; _i++) {
-                var inference = _a[_i];
-                // As an optimization, we don't have to clear (and later recompute) inferred types
-                // for type parameters that have already been fixed on the previous call to inferTypeArguments.
-                // It would be just as correct to reset all of them. But then we'd be repeating the same work
-                // for the type parameters that were fixed, namely the work done by getInferredType.
-                if (!inference.isFixed) {
-                    inference.inferredType = undefined;
-                }
-            }
             if (ts.isJsxOpeningLikeElement(node)) {
                 return inferJsxTypeArguments(node, signature, checkMode, context);
             }
@@ -49745,13 +51189,15 @@ var ts;
             // example, given a 'function wrap<T, U>(cb: (x: T) => U): (x: T) => U' and a call expression
             // 'let f: (x: string) => number = wrap(s => s.length)', we infer from the declared type of 'f' to the
             // return type of 'wrap'.
-            if (node.kind !== 152 /* Decorator */) {
+            if (node.kind !== 153 /* Decorator */) {
                 var contextualType = getContextualType(node);
                 if (contextualType) {
-                    // We clone the contextual mapper to avoid disturbing a resolution in progress for an
+                    // We clone the inference context to avoid disturbing a resolution in progress for an
                     // outer call expression. Effectively we just want a snapshot of whatever has been
                     // inferred for any outer call expression so far.
-                    var instantiatedType = instantiateType(contextualType, cloneTypeMapper(getContextualMapper(node), 1 /* NoDefault */));
+                    var outerContext = getInferenceContext(node);
+                    var outerMapper = getMapperFromContext(cloneInferenceContext(outerContext, 1 /* NoDefault */));
+                    var instantiatedType = instantiateType(contextualType, outerMapper);
                     // If the contextual type is a generic function type with a single call signature, we
                     // instantiate the type with its own type parameters and type arguments. This ensures that
                     // the type parameters are not erased to type any during type inference such that they can
@@ -49765,10 +51211,15 @@ var ts;
                         instantiatedType;
                     var inferenceTargetType = getReturnTypeOfSignature(signature);
                     // Inferences made from return types have lower priority than all other inferences.
-                    inferTypes(context.inferences, inferenceSourceType, inferenceTargetType, 8 /* ReturnType */);
+                    inferTypes(context.inferences, inferenceSourceType, inferenceTargetType, 16 /* ReturnType */);
                     // Create a type mapper for instantiating generic contextual types using the inferences made
-                    // from the return type.
-                    context.returnMapper = cloneInferredPartOfContext(context);
+                    // from the return type. We need a separate inference pass here because (a) instantiation of
+                    // the source type uses the outer context's return mapper (which excludes inferences made from
+                    // outer arguments), and (b) we don't want any further inferences going into this context.
+                    var returnContext = createInferenceContext(signature.typeParameters, signature, context.flags);
+                    var returnSourceType = instantiateType(contextualType, outerContext && outerContext.returnMapper);
+                    inferTypes(returnContext.inferences, returnSourceType, inferenceTargetType);
+                    context.returnMapper = ts.some(returnContext.inferences, hasInferenceCandidates) ? getMapperFromContext(returnContext) : undefined;
                 }
             }
             var thisType = getThisTypeOfSignature(signature);
@@ -49781,7 +51232,7 @@ var ts;
             var argCount = restType ? Math.min(getParameterCount(signature) - 1, args.length) : args.length;
             for (var i = 0; i < argCount; i++) {
                 var arg = args[i];
-                if (arg.kind !== 210 /* OmittedExpression */) {
+                if (arg.kind !== 211 /* OmittedExpression */) {
                     var paramType = getTypeAtPosition(signature, i);
                     var argType = checkExpressionWithContextualType(arg, paramType, context, checkMode);
                     inferTypes(context.inferences, argType, paramType);
@@ -49795,7 +51246,7 @@ var ts;
         }
         function getArrayifiedType(type) {
             if (forEachType(type, function (t) { return !(t.flags & (1 /* Any */ | 63176704 /* Instantiable */) || isArrayType(t) || isTupleType(t)); })) {
-                return createArrayType(getIndexTypeOfType(type, 1 /* Number */) || errorType);
+                return createArrayType(getIndexedAccessType(type, numberType));
             }
             return type;
         }
@@ -49805,20 +51256,20 @@ var ts;
                 if (isSpreadArgument(arg)) {
                     // We are inferring from a spread expression in the last argument position, i.e. both the parameter
                     // and the argument are ...x forms.
-                    return arg.kind === 215 /* SyntheticExpression */ ?
+                    return arg.kind === 216 /* SyntheticExpression */ ?
                         createArrayType(arg.type) :
                         getArrayifiedType(checkExpressionWithContextualType(arg.expression, restType, context, 0 /* Normal */));
                 }
             }
-            var contextualType = getIndexTypeOfType(restType, 1 /* Number */) || anyType;
-            var hasPrimitiveContextualType = maybeTypeOfKind(contextualType, 131068 /* Primitive */ | 4194304 /* Index */);
             var types = [];
             var spreadIndex = -1;
             for (var i = index; i < argCount; i++) {
+                var contextualType = getIndexedAccessType(restType, getLiteralType(i - index));
                 var argType = checkExpressionWithContextualType(args[i], contextualType, context, 0 /* Normal */);
                 if (spreadIndex < 0 && isSpreadArgument(args[i])) {
                     spreadIndex = i - index;
                 }
+                var hasPrimitiveContextualType = maybeTypeOfKind(contextualType, 131068 /* Primitive */ | 4194304 /* Index */);
                 types.push(hasPrimitiveContextualType ? getRegularTypeOfLiteralType(argType) : getWidenedLiteralType(argType));
             }
             return spreadIndex < 0 ?
@@ -49866,20 +51317,26 @@ var ts;
          * @param signature a candidate signature we are trying whether it is a call signature
          * @param relation a relationship to check parameter and argument type
          */
-        function checkApplicableSignatureForJsxOpeningLikeElement(node, signature, relation, checkMode, reportErrors) {
+        function checkApplicableSignatureForJsxOpeningLikeElement(node, signature, relation, checkMode, reportErrors, containingMessageChain, errorOutputContainer) {
             // Stateless function components can have maximum of three arguments: "props", "context", and "updater".
             // However "context" and "updater" are implicit and can't be specify by users. Only the first parameter, props,
             // can be specified by users through attributes property.
             var paramType = getEffectiveFirstArgumentForJsxSignature(signature, node);
-            var attributesType = checkExpressionWithContextualType(node.attributes, paramType, /*contextualMapper*/ undefined, checkMode);
-            return checkTypeRelatedToAndOptionallyElaborate(attributesType, paramType, relation, reportErrors ? node.tagName : undefined, node.attributes);
+            var attributesType = checkExpressionWithContextualType(node.attributes, paramType, /*inferenceContext*/ undefined, checkMode);
+            return checkTypeRelatedToAndOptionallyElaborate(attributesType, paramType, relation, reportErrors ? node.tagName : undefined, node.attributes, 
+            /*headMessage*/ undefined, containingMessageChain, errorOutputContainer);
         }
-        function checkApplicableSignature(node, args, signature, relation, checkMode, reportErrors) {
+        function getSignatureApplicabilityError(node, args, signature, relation, checkMode, reportErrors, containingMessageChain) {
+            var errorOutputContainer = { errors: undefined, skipLogging: true };
             if (ts.isJsxOpeningLikeElement(node)) {
-                return checkApplicableSignatureForJsxOpeningLikeElement(node, signature, relation, checkMode, reportErrors);
+                if (!checkApplicableSignatureForJsxOpeningLikeElement(node, signature, relation, checkMode, reportErrors, containingMessageChain, errorOutputContainer)) {
+                    ts.Debug.assert(!reportErrors || !!errorOutputContainer.errors, "jsx should have errors when reporting errors");
+                    return errorOutputContainer.errors || [];
+                }
+                return undefined;
             }
             var thisType = getThisTypeOfSignature(signature);
-            if (thisType && thisType !== voidType && node.kind !== 192 /* NewExpression */) {
+            if (thisType && thisType !== voidType && node.kind !== 193 /* NewExpression */) {
                 // If the called expression is not of the form `x.f` or `x["f"]`, then sourceType = voidType
                 // If the signature's 'this' type is voidType, then the check is skipped -- anything is compatible.
                 // If the expression is a new expression, then the check is skipped.
@@ -49887,8 +51344,9 @@ var ts;
                 var thisArgumentType = thisArgumentNode ? checkExpression(thisArgumentNode) : voidType;
                 var errorNode = reportErrors ? (thisArgumentNode || node) : undefined;
                 var headMessage_1 = ts.Diagnostics.The_this_context_of_type_0_is_not_assignable_to_method_s_this_of_type_1;
-                if (!checkTypeRelatedTo(thisArgumentType, thisType, relation, errorNode, headMessage_1)) {
-                    return false;
+                if (!checkTypeRelatedTo(thisArgumentType, thisType, relation, errorNode, headMessage_1, containingMessageChain, errorOutputContainer)) {
+                    ts.Debug.assert(!reportErrors || !!errorOutputContainer.errors, "this parameter should have errors when reporting errors");
+                    return errorOutputContainer.errors || [];
                 }
             }
             var headMessage = ts.Diagnostics.Argument_of_type_0_is_not_assignable_to_parameter_of_type_1;
@@ -49896,38 +51354,56 @@ var ts;
             var argCount = restType ? Math.min(getParameterCount(signature) - 1, args.length) : args.length;
             for (var i = 0; i < argCount; i++) {
                 var arg = args[i];
-                if (arg.kind !== 210 /* OmittedExpression */) {
+                if (arg.kind !== 211 /* OmittedExpression */) {
                     var paramType = getTypeAtPosition(signature, i);
-                    var argType = checkExpressionWithContextualType(arg, paramType, /*contextualMapper*/ undefined, checkMode);
+                    var argType = checkExpressionWithContextualType(arg, paramType, /*inferenceContext*/ undefined, checkMode);
                     // If one or more arguments are still excluded (as indicated by CheckMode.SkipContextSensitive),
                     // we obtain the regular type of any object literal arguments because we may not have inferred complete
                     // parameter types yet and therefore excess property checks may yield false positives (see #17041).
                     var checkArgType = checkMode & 4 /* SkipContextSensitive */ ? getRegularTypeOfObjectLiteral(argType) : argType;
-                    if (!checkTypeRelatedToAndOptionallyElaborate(checkArgType, paramType, relation, reportErrors ? arg : undefined, arg, headMessage)) {
-                        return false;
+                    if (!checkTypeRelatedToAndOptionallyElaborate(checkArgType, paramType, relation, reportErrors ? arg : undefined, arg, headMessage, containingMessageChain, errorOutputContainer)) {
+                        ts.Debug.assert(!reportErrors || !!errorOutputContainer.errors, "parameter should have errors when reporting errors");
+                        maybeAddMissingAwaitInfo(arg, checkArgType, paramType);
+                        return errorOutputContainer.errors || [];
                     }
                 }
             }
             if (restType) {
                 var spreadType = getSpreadArgumentType(args, argCount, args.length, restType, /*context*/ undefined);
                 var errorNode = reportErrors ? argCount < args.length ? args[argCount] : node : undefined;
-                return checkTypeRelatedTo(spreadType, restType, relation, errorNode, headMessage);
+                if (!checkTypeRelatedTo(spreadType, restType, relation, errorNode, headMessage, /*containingMessageChain*/ undefined, errorOutputContainer)) {
+                    ts.Debug.assert(!reportErrors || !!errorOutputContainer.errors, "rest parameter should have errors when reporting errors");
+                    maybeAddMissingAwaitInfo(errorNode, spreadType, restType);
+                    return errorOutputContainer.errors || [];
+                }
+            }
+            return undefined;
+            function maybeAddMissingAwaitInfo(errorNode, source, target) {
+                if (errorNode && reportErrors && errorOutputContainer.errors && errorOutputContainer.errors.length) {
+                    // Bail if target is Promise-like---something else is wrong
+                    if (getAwaitedTypeOfPromise(target)) {
+                        return;
+                    }
+                    var awaitedTypeOfSource = getAwaitedTypeOfPromise(source);
+                    if (awaitedTypeOfSource && isTypeRelatedTo(awaitedTypeOfSource, target, relation)) {
+                        ts.addRelatedInfo(errorOutputContainer.errors[0], ts.createDiagnosticForNode(errorNode, ts.Diagnostics.Did_you_forget_to_use_await));
+                    }
+                }
             }
-            return true;
         }
         /**
          * Returns the this argument in calls like x.f(...) and x[f](...). Undefined otherwise.
          */
         function getThisArgumentOfCall(node) {
-            if (node.kind === 191 /* CallExpression */) {
+            if (node.kind === 192 /* CallExpression */) {
                 var callee = ts.skipOuterExpressions(node.expression);
-                if (callee.kind === 189 /* PropertyAccessExpression */ || callee.kind === 190 /* ElementAccessExpression */) {
+                if (callee.kind === 190 /* PropertyAccessExpression */ || callee.kind === 191 /* ElementAccessExpression */) {
                     return callee.expression;
                 }
             }
         }
         function createSyntheticExpression(parent, type, isSpread) {
-            var result = ts.createNode(215 /* SyntheticExpression */, parent.pos, parent.end);
+            var result = ts.createNode(216 /* SyntheticExpression */, parent.pos, parent.end);
             result.parent = parent;
             result.type = type;
             result.isSpread = isSpread || false;
@@ -49937,17 +51413,17 @@ var ts;
          * Returns the effective arguments for an expression that works like a function invocation.
          */
         function getEffectiveCallArguments(node) {
-            if (node.kind === 193 /* TaggedTemplateExpression */) {
+            if (node.kind === 194 /* TaggedTemplateExpression */) {
                 var template = node.template;
-                var args_4 = [createSyntheticExpression(template, getGlobalTemplateStringsArrayType())];
-                if (template.kind === 206 /* TemplateExpression */) {
+                var args_3 = [createSyntheticExpression(template, getGlobalTemplateStringsArrayType())];
+                if (template.kind === 207 /* TemplateExpression */) {
                     ts.forEach(template.templateSpans, function (span) {
-                        args_4.push(span.expression);
+                        args_3.push(span.expression);
                     });
                 }
-                return args_4;
+                return args_3;
             }
-            if (node.kind === 152 /* Decorator */) {
+            if (node.kind === 153 /* Decorator */) {
                 return getEffectiveDecoratorArguments(node);
             }
             if (ts.isJsxOpeningLikeElement(node)) {
@@ -49960,7 +51436,7 @@ var ts;
                 // of the argument is a tuple type, spread the tuple elements into the argument list. We can
                 // call checkExpressionCached because spread expressions never have a contextual type.
                 var spreadArgument_1 = args[length - 1];
-                var type = checkExpressionCached(spreadArgument_1.expression);
+                var type = flowLoopCount ? checkExpression(spreadArgument_1.expression) : checkExpressionCached(spreadArgument_1.expression);
                 if (isTupleType(type)) {
                     var typeArguments = type.typeArguments || ts.emptyArray;
                     var restIndex_2 = type.target.hasRestElement ? typeArguments.length - 1 : -1;
@@ -49977,30 +51453,30 @@ var ts;
             var parent = node.parent;
             var expr = node.expression;
             switch (parent.kind) {
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
                     // For a class decorator, the `target` is the type of the class (e.g. the
                     // "static" or "constructor" side of the class).
                     return [
                         createSyntheticExpression(expr, getTypeOfSymbol(getSymbolOfNode(parent)))
                     ];
-                case 151 /* Parameter */:
+                case 152 /* Parameter */:
                     // A parameter declaration decorator will have three arguments (see
                     // `ParameterDecorator` in core.d.ts).
                     var func = parent.parent;
                     return [
-                        createSyntheticExpression(expr, parent.parent.kind === 157 /* Constructor */ ? getTypeOfSymbol(getSymbolOfNode(func)) : errorType),
+                        createSyntheticExpression(expr, parent.parent.kind === 158 /* Constructor */ ? getTypeOfSymbol(getSymbolOfNode(func)) : errorType),
                         createSyntheticExpression(expr, anyType),
                         createSyntheticExpression(expr, numberType)
                     ];
-                case 154 /* PropertyDeclaration */:
-                case 156 /* MethodDeclaration */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 155 /* PropertyDeclaration */:
+                case 157 /* MethodDeclaration */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     // A method or accessor declaration decorator will have two or three arguments (see
                     // `PropertyDecorator` and `MethodDecorator` in core.d.ts). If we are emitting decorators
                     // for ES3, we will only pass two arguments.
-                    var hasPropDesc = parent.kind !== 154 /* PropertyDeclaration */ && languageVersion !== 0 /* ES3 */;
+                    var hasPropDesc = parent.kind !== 155 /* PropertyDeclaration */ && languageVersion !== 0 /* ES3 */;
                     return [
                         createSyntheticExpression(expr, getParentTypeOfClassElement(parent)),
                         createSyntheticExpression(expr, getClassElementPropertyKeyType(parent)),
@@ -50014,22 +51490,47 @@ var ts;
          */
         function getDecoratorArgumentCount(node, signature) {
             switch (node.parent.kind) {
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
                     return 1;
-                case 154 /* PropertyDeclaration */:
+                case 155 /* PropertyDeclaration */:
                     return 2;
-                case 156 /* MethodDeclaration */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 157 /* MethodDeclaration */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     // For ES3 or decorators with only two parameters we supply only two arguments
                     return languageVersion === 0 /* ES3 */ || signature.parameters.length <= 2 ? 2 : 3;
-                case 151 /* Parameter */:
+                case 152 /* Parameter */:
                     return 3;
                 default:
                     return ts.Debug.fail();
             }
         }
+        function getDiagnosticSpanForCallNode(node, doNotIncludeArguments) {
+            var start;
+            var length;
+            var sourceFile = ts.getSourceFileOfNode(node);
+            if (ts.isPropertyAccessExpression(node.expression)) {
+                var nameSpan = ts.getErrorSpanForNode(sourceFile, node.expression.name);
+                start = nameSpan.start;
+                length = doNotIncludeArguments ? nameSpan.length : node.end - start;
+            }
+            else {
+                var expressionSpan = ts.getErrorSpanForNode(sourceFile, node.expression);
+                start = expressionSpan.start;
+                length = doNotIncludeArguments ? expressionSpan.length : node.end - start;
+            }
+            return { start: start, length: length, sourceFile: sourceFile };
+        }
+        function getDiagnosticForCallNode(node, message, arg0, arg1, arg2, arg3) {
+            if (ts.isCallExpression(node)) {
+                var _a = getDiagnosticSpanForCallNode(node), sourceFile = _a.sourceFile, start = _a.start, length_4 = _a.length;
+                return ts.createFileDiagnostic(sourceFile, start, length_4, message, arg0, arg1, arg2, arg3);
+            }
+            else {
+                return ts.createDiagnosticForNode(node, message, arg0, arg1, arg2, arg3);
+            }
+        }
         function getArgumentArityError(node, signatures, args) {
             var min = Number.POSITIVE_INFINITY;
             var max = Number.NEGATIVE_INFINITY;
@@ -50059,25 +51560,41 @@ var ts;
             if (argCount <= max && hasSpreadArgument) {
                 argCount--;
             }
+            var spanArray;
             var related;
+            var error = hasRestParameter || hasSpreadArgument ? hasRestParameter && hasSpreadArgument ? ts.Diagnostics.Expected_at_least_0_arguments_but_got_1_or_more :
+                hasRestParameter ? ts.Diagnostics.Expected_at_least_0_arguments_but_got_1 :
+                    ts.Diagnostics.Expected_0_arguments_but_got_1_or_more : ts.Diagnostics.Expected_0_arguments_but_got_1;
             if (closestSignature && getMinArgumentCount(closestSignature) > argCount && closestSignature.declaration) {
                 var paramDecl = closestSignature.declaration.parameters[closestSignature.thisParameter ? argCount + 1 : argCount];
                 if (paramDecl) {
                     related = ts.createDiagnosticForNode(paramDecl, ts.isBindingPattern(paramDecl.name) ? ts.Diagnostics.An_argument_matching_this_binding_pattern_was_not_provided : ts.Diagnostics.An_argument_for_0_was_not_provided, !paramDecl.name ? argCount : !ts.isBindingPattern(paramDecl.name) ? ts.idText(getFirstIdentifier(paramDecl.name)) : undefined);
                 }
             }
-            if (hasRestParameter || hasSpreadArgument) {
-                var error_1 = hasRestParameter && hasSpreadArgument ? ts.Diagnostics.Expected_at_least_0_arguments_but_got_1_or_more :
-                    hasRestParameter ? ts.Diagnostics.Expected_at_least_0_arguments_but_got_1 :
-                        ts.Diagnostics.Expected_0_arguments_but_got_1_or_more;
-                var diagnostic_1 = ts.createDiagnosticForNode(node, error_1, paramRange, argCount);
-                return related ? addRelatedInfo(diagnostic_1, related) : diagnostic_1;
-            }
             if (min < argCount && argCount < max) {
-                return ts.createDiagnosticForNode(node, ts.Diagnostics.No_overload_expects_0_arguments_but_overloads_do_exist_that_expect_either_1_or_2_arguments, argCount, belowArgCount, aboveArgCount);
+                return getDiagnosticForCallNode(node, ts.Diagnostics.No_overload_expects_0_arguments_but_overloads_do_exist_that_expect_either_1_or_2_arguments, argCount, belowArgCount, aboveArgCount);
             }
-            var diagnostic = ts.createDiagnosticForNode(node, ts.Diagnostics.Expected_0_arguments_but_got_1, paramRange, argCount);
-            return related ? addRelatedInfo(diagnostic, related) : diagnostic;
+            if (!hasSpreadArgument && argCount < min) {
+                var diagnostic_1 = getDiagnosticForCallNode(node, error, paramRange, argCount);
+                return related ? ts.addRelatedInfo(diagnostic_1, related) : diagnostic_1;
+            }
+            if (hasRestParameter || hasSpreadArgument) {
+                spanArray = ts.createNodeArray(args);
+                if (hasSpreadArgument && argCount) {
+                    var nextArg = ts.elementAt(args, getSpreadArgumentIndex(args) + 1) || undefined;
+                    spanArray = ts.createNodeArray(args.slice(max > argCount && nextArg ? args.indexOf(nextArg) : Math.min(max, args.length - 1)));
+                }
+            }
+            else {
+                spanArray = ts.createNodeArray(args.slice(max));
+            }
+            spanArray.pos = ts.first(spanArray).pos;
+            spanArray.end = ts.last(spanArray).end;
+            if (spanArray.end === spanArray.pos) {
+                spanArray.end++;
+            }
+            var diagnostic = ts.createDiagnosticForNodeArray(ts.getSourceFileOfNode(node), spanArray, error, paramRange, argCount);
+            return related ? ts.addRelatedInfo(diagnostic, related) : diagnostic;
         }
         function getTypeArgumentArityError(node, signatures, typeArguments) {
             var argCount = typeArguments.length;
@@ -50108,15 +51625,15 @@ var ts;
             return ts.createDiagnosticForNodeArray(ts.getSourceFileOfNode(node), typeArguments, ts.Diagnostics.Expected_0_type_arguments_but_got_1, belowArgCount === -Infinity ? aboveArgCount : belowArgCount, argCount);
         }
         function resolveCall(node, signatures, candidatesOutArray, checkMode, fallbackError) {
-            var isTaggedTemplate = node.kind === 193 /* TaggedTemplateExpression */;
-            var isDecorator = node.kind === 152 /* Decorator */;
+            var isTaggedTemplate = node.kind === 194 /* TaggedTemplateExpression */;
+            var isDecorator = node.kind === 153 /* Decorator */;
             var isJsxOpeningOrSelfClosingElement = ts.isJsxOpeningLikeElement(node);
             var reportErrors = !candidatesOutArray;
             var typeArguments;
             if (!isDecorator) {
                 typeArguments = node.typeArguments;
                 // We already perform checking on the type arguments on the class declaration itself.
-                if (isTaggedTemplate || isJsxOpeningOrSelfClosingElement || node.expression.kind !== 98 /* SuperKeyword */) {
+                if (isTaggedTemplate || isJsxOpeningOrSelfClosingElement || node.expression.kind !== 99 /* SuperKeyword */) {
                     ts.forEach(typeArguments, checkSourceElement);
                 }
             }
@@ -50125,7 +51642,7 @@ var ts;
             reorderCandidates(signatures, candidates);
             if (!candidates.length) {
                 if (reportErrors) {
-                    diagnostics.add(ts.createDiagnosticForNode(node, ts.Diagnostics.Call_target_does_not_contain_any_signatures));
+                    diagnostics.add(getDiagnosticForCallNode(node, ts.Diagnostics.Call_target_does_not_contain_any_signatures));
                 }
                 return resolveErrorCall(node);
             }
@@ -50165,13 +51682,13 @@ var ts;
             //     function foo(): void;
             //     foo<number>(0);
             //
-            var candidateForArgumentError;
+            var candidatesForArgumentError;
             var candidateForArgumentArityError;
             var candidateForTypeArgumentError;
             var result;
             // If we are in signature help, a trailing comma indicates that we intend to provide another argument,
             // so we will only accept overloads with arity at least 1 higher than the current number of provided arguments.
-            var signatureHelpTrailingComma = !!(checkMode & 16 /* IsForSignatureHelp */) && node.kind === 191 /* CallExpression */ && node.arguments.hasTrailingComma;
+            var signatureHelpTrailingComma = !!(checkMode & 16 /* IsForSignatureHelp */) && node.kind === 192 /* CallExpression */ && node.arguments.hasTrailingComma;
             // Section 4.12.1:
             // if the candidate list contains one or more signatures for which the type of each argument
             // expression is a subtype of each corresponding parameter type, the return type of the first
@@ -50196,8 +51713,66 @@ var ts;
             // If candidate is undefined, it means that no candidates had a suitable arity. In that case,
             // skip the checkApplicableSignature check.
             if (reportErrors) {
-                if (candidateForArgumentError) {
-                    checkApplicableSignature(node, args, candidateForArgumentError, assignableRelation, 0 /* Normal */, /*reportErrors*/ true);
+                if (candidatesForArgumentError) {
+                    if (candidatesForArgumentError.length === 1 || candidatesForArgumentError.length > 3) {
+                        var last_2 = candidatesForArgumentError[candidatesForArgumentError.length - 1];
+                        var chain_1;
+                        if (candidatesForArgumentError.length > 3) {
+                            chain_1 = ts.chainDiagnosticMessages(chain_1, ts.Diagnostics.The_last_overload_gave_the_following_error);
+                            chain_1 = ts.chainDiagnosticMessages(chain_1, ts.Diagnostics.No_overload_matches_this_call);
+                        }
+                        var diags = getSignatureApplicabilityError(node, args, last_2, assignableRelation, 0 /* Normal */, /*reportErrors*/ true, function () { return chain_1; });
+                        if (diags) {
+                            for (var _i = 0, diags_1 = diags; _i < diags_1.length; _i++) {
+                                var d = diags_1[_i];
+                                if (last_2.declaration && candidatesForArgumentError.length > 3) {
+                                    ts.addRelatedInfo(d, ts.createDiagnosticForNode(last_2.declaration, ts.Diagnostics.The_last_overload_is_declared_here));
+                                }
+                                diagnostics.add(d);
+                            }
+                        }
+                        else {
+                            ts.Debug.fail("No error for last overload signature");
+                        }
+                    }
+                    else {
+                        var allDiagnostics = [];
+                        var max = 0;
+                        var min_3 = Number.MAX_VALUE;
+                        var minIndex = 0;
+                        var i_1 = 0;
+                        var _loop_12 = function (c) {
+                            var chain_2 = function () { return ts.chainDiagnosticMessages(/*details*/ undefined, ts.Diagnostics.Overload_0_of_1_2_gave_the_following_error, i_1 + 1, candidates.length, signatureToString(c)); };
+                            var diags_2 = getSignatureApplicabilityError(node, args, c, assignableRelation, 0 /* Normal */, /*reportErrors*/ true, chain_2);
+                            if (diags_2) {
+                                if (diags_2.length <= min_3) {
+                                    min_3 = diags_2.length;
+                                    minIndex = i_1;
+                                }
+                                max = Math.max(max, diags_2.length);
+                                allDiagnostics.push(diags_2);
+                            }
+                            else {
+                                ts.Debug.fail("No error for 3 or fewer overload signatures");
+                            }
+                            i_1++;
+                        };
+                        for (var _a = 0, candidatesForArgumentError_1 = candidatesForArgumentError; _a < candidatesForArgumentError_1.length; _a++) {
+                            var c = candidatesForArgumentError_1[_a];
+                            _loop_12(c);
+                        }
+                        var diags_3 = max > 1 ? allDiagnostics[minIndex] : ts.flatten(allDiagnostics);
+                        ts.Debug.assert(diags_3.length > 0, "No errors reported for 3 or fewer overload signatures");
+                        var chain = ts.chainDiagnosticMessages(ts.map(diags_3, function (d) { return typeof d.messageText === "string" ? d : d.messageText; }), ts.Diagnostics.No_overload_matches_this_call);
+                        var related = ts.flatMap(diags_3, function (d) { return d.relatedInformation; });
+                        if (ts.every(diags_3, function (d) { return d.start === diags_3[0].start && d.length === diags_3[0].length && d.file === diags_3[0].file; })) {
+                            var _b = diags_3[0], file = _b.file, start = _b.start, length_5 = _b.length;
+                            diagnostics.add({ file: file, start: start, length: length_5, code: chain.code, category: chain.category, messageText: chain, relatedInformation: related });
+                        }
+                        else {
+                            diagnostics.add(ts.createDiagnosticForNodeFromMessageChain(node, chain, related));
+                        }
+                    }
                 }
                 else if (candidateForArgumentArityError) {
                     diagnostics.add(getArgumentArityError(node, [candidateForArgumentArityError], args));
@@ -50214,14 +51789,14 @@ var ts;
                         diagnostics.add(getArgumentArityError(node, signaturesWithCorrectTypeArgumentArity, args));
                     }
                     else if (fallbackError) {
-                        diagnostics.add(ts.createDiagnosticForNode(node, fallbackError));
+                        diagnostics.add(getDiagnosticForCallNode(node, fallbackError));
                     }
                 }
             }
             return produceDiagnostics || !args ? resolveErrorCall(node) : getCandidateForOverloadFailure(node, candidates, args, !!candidatesOutArray);
             function chooseOverload(candidates, relation, signatureHelpTrailingComma) {
                 if (signatureHelpTrailingComma === void 0) { signatureHelpTrailingComma = false; }
-                candidateForArgumentError = undefined;
+                candidatesForArgumentError = undefined;
                 candidateForArgumentArityError = undefined;
                 candidateForTypeArgumentError = undefined;
                 if (isSingleNonGenericCandidate) {
@@ -50229,8 +51804,8 @@ var ts;
                     if (typeArguments || !hasCorrectArity(node, args, candidate, signatureHelpTrailingComma)) {
                         return undefined;
                     }
-                    if (!checkApplicableSignature(node, args, candidate, relation, 0 /* Normal */, /*reportErrors*/ false)) {
-                        candidateForArgumentError = candidate;
+                    if (getSignatureApplicabilityError(node, args, candidate, relation, 0 /* Normal */, /*reportErrors*/ false, /*containingMessageChain*/ undefined)) {
+                        candidatesForArgumentError = [candidate];
                         return undefined;
                     }
                     return candidate;
@@ -50254,7 +51829,7 @@ var ts;
                         else {
                             inferenceContext = createInferenceContext(candidate.typeParameters, candidate, /*flags*/ ts.isInJSFile(node) ? 2 /* AnyDefault */ : 0 /* None */);
                             typeArgumentTypes = inferTypeArguments(node, candidate, args, argCheckMode | 8 /* SkipGenericFunctions */, inferenceContext);
-                            argCheckMode |= inferenceContext.flags & 8 /* SkippedGenericFunction */ ? 8 /* SkipGenericFunctions */ : 0 /* Normal */;
+                            argCheckMode |= inferenceContext.flags & 4 /* SkippedGenericFunction */ ? 8 /* SkipGenericFunctions */ : 0 /* Normal */;
                         }
                         checkCandidate = getSignatureInstantiation(candidate, typeArgumentTypes, ts.isInJSFile(candidate.declaration), inferenceContext && inferenceContext.inferredTypeParameters);
                         // If the original signature has a generic rest type, instantiation may produce a
@@ -50267,11 +51842,9 @@ var ts;
                     else {
                         checkCandidate = candidate;
                     }
-                    if (!checkApplicableSignature(node, args, checkCandidate, relation, argCheckMode, /*reportErrors*/ false)) {
+                    if (getSignatureApplicabilityError(node, args, checkCandidate, relation, argCheckMode, /*reportErrors*/ false, /*containingMessageChain*/ undefined)) {
                         // Give preference to error candidates that have no rest parameters (as they are more specific)
-                        if (!candidateForArgumentError || getEffectiveRestType(candidateForArgumentError) || !getEffectiveRestType(checkCandidate)) {
-                            candidateForArgumentError = checkCandidate;
-                        }
+                        (candidatesForArgumentError || (candidatesForArgumentError = [])).push(checkCandidate);
                         continue;
                     }
                     if (argCheckMode) {
@@ -50289,11 +51862,9 @@ var ts;
                                 continue;
                             }
                         }
-                        if (!checkApplicableSignature(node, args, checkCandidate, relation, argCheckMode, /*reportErrors*/ false)) {
+                        if (getSignatureApplicabilityError(node, args, checkCandidate, relation, argCheckMode, /*reportErrors*/ false, /*containingMessageChain*/ undefined)) {
                             // Give preference to error candidates that have no rest parameters (as they are more specific)
-                            if (!candidateForArgumentError || getEffectiveRestType(candidateForArgumentError) || !getEffectiveRestType(checkCandidate)) {
-                                candidateForArgumentError = checkCandidate;
-                            }
+                            (candidatesForArgumentError || (candidatesForArgumentError = [])).push(checkCandidate);
                             continue;
                         }
                     }
@@ -50322,7 +51893,7 @@ var ts;
             }
             var _a = ts.minAndMax(candidates, getNumNonRestParameters), minArgumentCount = _a.min, maxNonRestParam = _a.max;
             var parameters = [];
-            var _loop_8 = function (i) {
+            var _loop_13 = function (i) {
                 var symbols = ts.mapDefined(candidates, function (_a) {
                     var parameters = _a.parameters, hasRestParameter = _a.hasRestParameter;
                     return hasRestParameter ?
@@ -50333,7 +51904,7 @@ var ts;
                 parameters.push(createCombinedSymbolFromTypes(symbols, ts.mapDefined(candidates, function (candidate) { return tryGetTypeAtPosition(candidate, i); })));
             };
             for (var i = 0; i < maxNonRestParam; i++) {
-                _loop_8(i);
+                _loop_13(i);
             }
             var restParameterSymbols = ts.mapDefined(candidates, function (c) { return c.hasRestParameter ? ts.last(c.parameters) : undefined; });
             var hasRestParameter = restParameterSymbols.length !== 0;
@@ -50411,7 +51982,7 @@ var ts;
             return maxParamsIndex;
         }
         function resolveCallExpression(node, candidatesOutArray, checkMode) {
-            if (node.expression.kind === 98 /* SuperKeyword */) {
+            if (node.expression.kind === 99 /* SuperKeyword */) {
                 var superType = checkSuperExpression(node.expression);
                 if (isTypeAny(superType)) {
                     for (var _i = 0, _a = node.arguments; _i < _a.length; _i++) {
@@ -50472,7 +52043,7 @@ var ts;
                             relatedInformation = ts.createDiagnosticForNode(node.expression, ts.Diagnostics.It_is_highly_likely_that_you_are_missing_a_semicolon);
                         }
                     }
-                    invocationError(node, apparentType, 0 /* Call */, relatedInformation);
+                    invocationError(node.expression, apparentType, 0 /* Call */, relatedInformation);
                 }
                 return resolveErrorCall(node);
             }
@@ -50486,7 +52057,7 @@ var ts;
             // returns a function type, we choose to defer processing. This narrowly permits function composition
             // operators to flow inferences through return types, but otherwise processes calls right away. We
             // use the resolvingSignature singleton to indicate that we deferred processing. This result will be
-            // propagated out and eventually turned into silentNeverType (a type that is assignable to anything and
+            // propagated out and eventually turned into nonInferrableType (a type that is assignable to anything and
             // from which we never make inferences).
             if (checkMode & 8 /* SkipGenericFunctions */ && !node.typeArguments && callSignatures.some(isGenericFunctionReturningFunction)) {
                 skippedGenericFunction(node, checkMode);
@@ -50579,7 +52150,7 @@ var ts;
                 }
                 return signature;
             }
-            invocationError(node, expressionType, 1 /* Construct */);
+            invocationError(node.expression, expressionType, 1 /* Construct */);
             return resolveErrorCall(node);
         }
         function typeHasProtectedAccessibleBase(target, type) {
@@ -50590,13 +52161,12 @@ var ts;
             var firstBase = baseTypes[0];
             if (firstBase.flags & 2097152 /* Intersection */) {
                 var types = firstBase.types;
-                var mixinCount = ts.countWhere(types, isMixinConstructorType);
+                var mixinFlags = findMixins(types);
                 var i = 0;
                 for (var _i = 0, _a = firstBase.types; _i < _a.length; _i++) {
                     var intersectionMember = _a[_i];
-                    i++;
                     // We want to ignore mixin ctors
-                    if (mixinCount === 0 || mixinCount === types.length && i === 0 || !isMixinConstructorType(intersectionMember)) {
+                    if (!mixinFlags[i]) {
                         if (ts.getObjectFlags(intersectionMember) & (1 /* Class */ | 2 /* Interface */)) {
                             if (intersectionMember.symbol === target) {
                                 return true;
@@ -50606,6 +52176,7 @@ var ts;
                             }
                         }
                     }
+                    i++;
                 }
                 return false;
             }
@@ -50645,11 +52216,75 @@ var ts;
             }
             return true;
         }
-        function invocationError(node, apparentType, kind, relatedInformation) {
-            var diagnostic = error(node, (kind === 0 /* Call */ ?
-                ts.Diagnostics.Cannot_invoke_an_expression_whose_type_lacks_a_call_signature_Type_0_has_no_compatible_call_signatures :
-                ts.Diagnostics.Cannot_use_new_with_an_expression_whose_type_lacks_a_call_or_construct_signature), typeToString(apparentType));
-            invocationErrorRecovery(apparentType, kind, relatedInformation ? addRelatedInfo(diagnostic, relatedInformation) : diagnostic);
+        function invocationErrorDetails(apparentType, kind) {
+            var errorInfo;
+            var isCall = kind === 0 /* Call */;
+            var awaitedType = getAwaitedType(apparentType);
+            var maybeMissingAwait = awaitedType && getSignaturesOfType(awaitedType, kind).length > 0;
+            if (apparentType.flags & 1048576 /* Union */) {
+                var types = apparentType.types;
+                var hasSignatures = false;
+                for (var _i = 0, types_15 = types; _i < types_15.length; _i++) {
+                    var constituent = types_15[_i];
+                    var signatures = getSignaturesOfType(constituent, kind);
+                    if (signatures.length !== 0) {
+                        hasSignatures = true;
+                        if (errorInfo) {
+                            // Bail early if we already have an error, no chance of "No constituent of type is callable"
+                            break;
+                        }
+                    }
+                    else {
+                        // Error on the first non callable constituent only
+                        if (!errorInfo) {
+                            errorInfo = ts.chainDiagnosticMessages(errorInfo, isCall ?
+                                ts.Diagnostics.Type_0_has_no_call_signatures :
+                                ts.Diagnostics.Type_0_has_no_construct_signatures, typeToString(constituent));
+                            errorInfo = ts.chainDiagnosticMessages(errorInfo, isCall ?
+                                ts.Diagnostics.Not_all_constituents_of_type_0_are_callable :
+                                ts.Diagnostics.Not_all_constituents_of_type_0_are_constructable, typeToString(apparentType));
+                        }
+                        if (hasSignatures) {
+                            // Bail early if we already found a siganture, no chance of "No constituent of type is callable"
+                            break;
+                        }
+                    }
+                }
+                if (!hasSignatures) {
+                    errorInfo = ts.chainDiagnosticMessages(
+                    /* detials */ undefined, isCall ?
+                        ts.Diagnostics.No_constituent_of_type_0_is_callable :
+                        ts.Diagnostics.No_constituent_of_type_0_is_constructable, typeToString(apparentType));
+                }
+                if (!errorInfo) {
+                    errorInfo = ts.chainDiagnosticMessages(errorInfo, isCall ?
+                        ts.Diagnostics.Each_member_of_the_union_type_0_has_signatures_but_none_of_those_signatures_are_compatible_with_each_other :
+                        ts.Diagnostics.Each_member_of_the_union_type_0_has_construct_signatures_but_none_of_those_signatures_are_compatible_with_each_other, typeToString(apparentType));
+                }
+            }
+            else {
+                errorInfo = ts.chainDiagnosticMessages(errorInfo, isCall ?
+                    ts.Diagnostics.Type_0_has_no_call_signatures :
+                    ts.Diagnostics.Type_0_has_no_construct_signatures, typeToString(apparentType));
+            }
+            return {
+                messageChain: ts.chainDiagnosticMessages(errorInfo, isCall ? ts.Diagnostics.This_expression_is_not_callable : ts.Diagnostics.This_expression_is_not_constructable),
+                relatedMessage: maybeMissingAwait ? ts.Diagnostics.Did_you_forget_to_use_await : undefined,
+            };
+        }
+        function invocationError(errorTarget, apparentType, kind, relatedInformation) {
+            var _a = invocationErrorDetails(apparentType, kind), messageChain = _a.messageChain, relatedInfo = _a.relatedMessage;
+            var diagnostic = ts.createDiagnosticForNodeFromMessageChain(errorTarget, messageChain);
+            if (relatedInfo) {
+                ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(errorTarget, relatedInfo));
+            }
+            if (ts.isCallExpression(errorTarget.parent)) {
+                var _b = getDiagnosticSpanForCallNode(errorTarget.parent, /* doNotIncludeArguments */ true), start = _b.start, length_6 = _b.length;
+                diagnostic.start = start;
+                diagnostic.length = length_6;
+            }
+            diagnostics.add(diagnostic);
+            invocationErrorRecovery(apparentType, kind, relatedInformation ? ts.addRelatedInfo(diagnostic, relatedInformation) : diagnostic);
         }
         function invocationErrorRecovery(apparentType, kind, diagnostic) {
             if (!apparentType.symbol) {
@@ -50662,7 +52297,7 @@ var ts;
                 var sigs = getSignaturesOfType(getTypeOfSymbol(getSymbolLinks(apparentType.symbol).target), kind);
                 if (!sigs || !sigs.length)
                     return;
-                addRelatedInfo(diagnostic, ts.createDiagnosticForNode(importNode, ts.Diagnostics.Type_originates_at_this_import_A_namespace_style_import_cannot_be_called_or_constructed_and_will_cause_a_failure_at_runtime_Consider_using_a_default_import_or_import_require_here_instead));
+                ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(importNode, ts.Diagnostics.Type_originates_at_this_import_A_namespace_style_import_cannot_be_called_or_constructed_and_will_cause_a_failure_at_runtime_Consider_using_a_default_import_or_import_require_here_instead));
             }
         }
         function resolveTaggedTemplateExpression(node, candidatesOutArray, checkMode) {
@@ -50678,7 +52313,7 @@ var ts;
                 return resolveUntypedCall(node);
             }
             if (!callSignatures.length) {
-                invocationError(node, apparentType, 0 /* Call */);
+                invocationError(node.tag, apparentType, 0 /* Call */);
                 return resolveErrorCall(node);
             }
             return resolveCall(node, callSignatures, candidatesOutArray, checkMode);
@@ -50688,16 +52323,16 @@ var ts;
          */
         function getDiagnosticHeadMessageForDecoratorResolution(node) {
             switch (node.parent.kind) {
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_class_decorator_when_called_as_an_expression;
-                case 151 /* Parameter */:
+                case 152 /* Parameter */:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_parameter_decorator_when_called_as_an_expression;
-                case 154 /* PropertyDeclaration */:
+                case 155 /* PropertyDeclaration */:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_property_decorator_when_called_as_an_expression;
-                case 156 /* MethodDeclaration */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 157 /* MethodDeclaration */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_method_decorator_when_called_as_an_expression;
                 default:
                     return ts.Debug.fail();
@@ -50724,9 +52359,12 @@ var ts;
             }
             var headMessage = getDiagnosticHeadMessageForDecoratorResolution(node);
             if (!callSignatures.length) {
-                var errorInfo = ts.chainDiagnosticMessages(/*details*/ undefined, ts.Diagnostics.Cannot_invoke_an_expression_whose_type_lacks_a_call_signature_Type_0_has_no_compatible_call_signatures, typeToString(apparentType));
-                errorInfo = ts.chainDiagnosticMessages(errorInfo, headMessage);
-                var diag = ts.createDiagnosticForNodeFromMessageChain(node, errorInfo);
+                var errorDetails = invocationErrorDetails(apparentType, 0 /* Call */);
+                var messageChain = ts.chainDiagnosticMessages(errorDetails.messageChain, headMessage);
+                var diag = ts.createDiagnosticForNodeFromMessageChain(node.expression, messageChain);
+                if (errorDetails.relatedMessage) {
+                    ts.addRelatedInfo(diag, ts.createDiagnosticForNode(node.expression, errorDetails.relatedMessage));
+                }
                 diagnostics.add(diag);
                 invocationErrorRecovery(apparentType, 0 /* Call */, diag);
                 return resolveErrorCall(node);
@@ -50740,7 +52378,7 @@ var ts;
             // file would probably be preferable.
             var typeSymbol = exports && getSymbol(exports, JsxNames.Element, 67897832 /* Type */);
             var returnNode = typeSymbol && nodeBuilder.symbolToEntityName(typeSymbol, 67897832 /* Type */, node);
-            var declaration = ts.createFunctionTypeNode(/*typeParameters*/ undefined, [ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotdotdot*/ undefined, "props", /*questionMark*/ undefined, nodeBuilder.typeToTypeNode(result, node))], returnNode ? ts.createTypeReferenceNode(returnNode, /*typeArguments*/ undefined) : ts.createKeywordTypeNode(120 /* AnyKeyword */));
+            var declaration = ts.createFunctionTypeNode(/*typeParameters*/ undefined, [ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotdotdot*/ undefined, "props", /*questionMark*/ undefined, nodeBuilder.typeToTypeNode(result, node))], returnNode ? ts.createTypeReferenceNode(returnNode, /*typeArguments*/ undefined) : ts.createKeywordTypeNode(121 /* AnyKeyword */));
             var parameterSymbol = createSymbol(1 /* FunctionScopedVariable */, "props");
             parameterSymbol.type = result;
             return createSignature(declaration, 
@@ -50787,16 +52425,16 @@ var ts;
         }
         function resolveSignature(node, candidatesOutArray, checkMode) {
             switch (node.kind) {
-                case 191 /* CallExpression */:
+                case 192 /* CallExpression */:
                     return resolveCallExpression(node, candidatesOutArray, checkMode);
-                case 192 /* NewExpression */:
+                case 193 /* NewExpression */:
                     return resolveNewExpression(node, candidatesOutArray, checkMode);
-                case 193 /* TaggedTemplateExpression */:
+                case 194 /* TaggedTemplateExpression */:
                     return resolveTaggedTemplateExpression(node, candidatesOutArray, checkMode);
-                case 152 /* Decorator */:
+                case 153 /* Decorator */:
                     return resolveDecorator(node, candidatesOutArray, checkMode);
-                case 262 /* JsxOpeningElement */:
-                case 261 /* JsxSelfClosingElement */:
+                case 263 /* JsxOpeningElement */:
+                case 262 /* JsxSelfClosingElement */:
                     return resolveJsxOpeningLikeElement(node, candidatesOutArray, checkMode);
             }
             throw ts.Debug.assertNever(node, "Branch in 'resolveSignature' should be unreachable.");
@@ -50876,17 +52514,17 @@ var ts;
                     ts.isVariableDeclaration(decl.parent) && getSymbolOfNode(decl.parent));
             var prototype = assignmentSymbol && assignmentSymbol.exports && assignmentSymbol.exports.get("prototype");
             var init = prototype && prototype.valueDeclaration && getAssignedJSPrototype(prototype.valueDeclaration);
-            return init ? checkExpression(init) : undefined;
+            return init ? getWidenedType(checkExpressionCached(init)) : undefined;
         }
         function getAssignedJSPrototype(node) {
             if (!node.parent) {
                 return false;
             }
             var parent = node.parent;
-            while (parent && parent.kind === 189 /* PropertyAccessExpression */) {
+            while (parent && parent.kind === 190 /* PropertyAccessExpression */) {
                 parent = parent.parent;
             }
-            if (parent && ts.isBinaryExpression(parent) && ts.isPrototypeAccess(parent.left) && parent.operatorToken.kind === 59 /* EqualsToken */) {
+            if (parent && ts.isBinaryExpression(parent) && ts.isPrototypeAccess(parent.left) && parent.operatorToken.kind === 60 /* EqualsToken */) {
                 var right = ts.getInitializerOfBinaryExpression(parent);
                 return ts.isObjectLiteralExpression(right) && right;
             }
@@ -50909,18 +52547,18 @@ var ts;
             var signature = getResolvedSignature(node, /*candidatesOutArray*/ undefined, checkMode);
             if (signature === resolvingSignature) {
                 // CheckMode.SkipGenericFunctions is enabled and this is a call to a generic function that
-                // returns a function type. We defer checking and return anyFunctionType.
-                return silentNeverType;
+                // returns a function type. We defer checking and return nonInferrableType.
+                return nonInferrableType;
             }
-            if (node.expression.kind === 98 /* SuperKeyword */) {
+            if (node.expression.kind === 99 /* SuperKeyword */) {
                 return voidType;
             }
-            if (node.kind === 192 /* NewExpression */) {
+            if (node.kind === 193 /* NewExpression */) {
                 var declaration = signature.declaration;
                 if (declaration &&
-                    declaration.kind !== 157 /* Constructor */ &&
-                    declaration.kind !== 161 /* ConstructSignature */ &&
-                    declaration.kind !== 166 /* ConstructorType */ &&
+                    declaration.kind !== 158 /* Constructor */ &&
+                    declaration.kind !== 162 /* ConstructSignature */ &&
+                    declaration.kind !== 167 /* ConstructorType */ &&
                     !ts.isJSDocConstructSignature(declaration) &&
                     !isJSConstructor(declaration)) {
                     // When resolved signature is a call signature (and not a construct signature) the result type is any
@@ -51037,9 +52675,9 @@ var ts;
                 return false;
             }
             var targetDeclarationKind = resolvedRequire.flags & 16 /* Function */
-                ? 239 /* FunctionDeclaration */
+                ? 240 /* FunctionDeclaration */
                 : resolvedRequire.flags & 3 /* Variable */
-                    ? 237 /* VariableDeclaration */
+                    ? 238 /* VariableDeclaration */
                     : 0 /* Unknown */;
             if (targetDeclarationKind !== 0 /* Unknown */) {
                 var decl = ts.getDeclarationOfKind(resolvedRequire, targetDeclarationKind);
@@ -51051,7 +52689,7 @@ var ts;
         function checkTaggedTemplateExpression(node) {
             checkGrammarTypeArguments(node, node.typeArguments);
             if (languageVersion < 2 /* ES2015 */) {
-                checkExternalEmitHelpers(node, 65536 /* MakeTemplateObject */);
+                checkExternalEmitHelpers(node, 131072 /* MakeTemplateObject */);
             }
             return getReturnTypeOfSignature(getResolvedSignature(node));
         }
@@ -51064,18 +52702,28 @@ var ts;
                 case 14 /* NoSubstitutionTemplateLiteral */:
                 case 8 /* NumericLiteral */:
                 case 9 /* BigIntLiteral */:
-                case 102 /* TrueKeyword */:
-                case 87 /* FalseKeyword */:
-                case 187 /* ArrayLiteralExpression */:
-                case 188 /* ObjectLiteralExpression */:
+                case 103 /* TrueKeyword */:
+                case 88 /* FalseKeyword */:
+                case 188 /* ArrayLiteralExpression */:
+                case 189 /* ObjectLiteralExpression */:
                     return true;
-                case 195 /* ParenthesizedExpression */:
+                case 196 /* ParenthesizedExpression */:
                     return isValidConstAssertionArgument(node.expression);
-                case 202 /* PrefixUnaryExpression */:
+                case 203 /* PrefixUnaryExpression */:
                     var op = node.operator;
                     var arg = node.operand;
                     return op === 39 /* MinusToken */ && (arg.kind === 8 /* NumericLiteral */ || arg.kind === 9 /* BigIntLiteral */) ||
                         op === 38 /* PlusToken */ && arg.kind === 8 /* NumericLiteral */;
+                case 190 /* PropertyAccessExpression */:
+                case 191 /* ElementAccessExpression */:
+                    var expr = node.expression;
+                    if (ts.isIdentifier(expr)) {
+                        var symbol = getSymbolAtLocation(expr);
+                        if (symbol && symbol.flags & 2097152 /* Alias */) {
+                            symbol = resolveAlias(symbol);
+                        }
+                        return !!(symbol && (symbol.flags & 384 /* Enum */) && getEnumKind(symbol) === 1 /* Literal */);
+                    }
             }
             return false;
         }
@@ -51083,7 +52731,7 @@ var ts;
             var exprType = checkExpression(expression, checkMode);
             if (ts.isConstTypeReference(type)) {
                 if (!isValidConstAssertionArgument(expression)) {
-                    error(expression, ts.Diagnostics.A_const_assertion_can_only_be_applied_to_a_string_number_boolean_array_or_object_literal);
+                    error(expression, ts.Diagnostics.A_const_assertions_can_only_be_applied_to_references_to_enum_members_or_string_number_boolean_array_or_object_literals);
                 }
                 return getRegularTypeOfLiteralType(exprType);
             }
@@ -51103,10 +52751,10 @@ var ts;
         }
         function checkMetaProperty(node) {
             checkGrammarMetaProperty(node);
-            if (node.keywordToken === 95 /* NewKeyword */) {
+            if (node.keywordToken === 96 /* NewKeyword */) {
                 return checkNewTargetMetaProperty(node);
             }
-            if (node.keywordToken === 92 /* ImportKeyword */) {
+            if (node.keywordToken === 93 /* ImportKeyword */) {
                 return checkImportMetaProperty(node);
             }
             return ts.Debug.assertNever(node.keywordToken);
@@ -51117,7 +52765,7 @@ var ts;
                 error(node, ts.Diagnostics.Meta_property_0_is_only_allowed_in_the_body_of_a_function_declaration_function_expression_or_constructor, "new.target");
                 return errorType;
             }
-            else if (container.kind === 157 /* Constructor */) {
+            else if (container.kind === 158 /* Constructor */) {
                 var symbol = getSymbolOfNode(container.parent);
                 return getTypeOfSymbol(symbol);
             }
@@ -51127,7 +52775,7 @@ var ts;
             }
         }
         function checkImportMetaProperty(node) {
-            if (languageVersion < 7 /* ESNext */ || moduleKind < ts.ModuleKind.ESNext) {
+            if (languageVersion < 99 /* ESNext */ || moduleKind < ts.ModuleKind.ESNext) {
                 error(node, ts.Diagnostics.The_import_meta_meta_property_is_only_allowed_using_ESNext_for_the_target_and_module_compiler_options);
             }
             var file = ts.getSourceFileOfNode(node);
@@ -51168,9 +52816,14 @@ var ts;
                 return getTypeOfParameter(signature.parameters[pos]);
             }
             if (signature.hasRestParameter) {
+                // We want to return the value undefined for an out of bounds parameter position,
+                // so we need to check bounds here before calling getIndexedAccessType (which
+                // otherwise would return the type 'undefined').
                 var restType = getTypeOfSymbol(signature.parameters[paramCount]);
-                var indexType = getLiteralType(pos - paramCount);
-                return getIndexedAccessType(restType, indexType);
+                var index = pos - paramCount;
+                if (!isTupleType(restType) || restType.target.hasRestElement || index < (restType.typeArguments || ts.emptyArray).length) {
+                    return getIndexedAccessType(restType, getLiteralType(index));
+                }
             }
             return undefined;
         }
@@ -51241,14 +52894,14 @@ var ts;
         function getTypeOfFirstParameterOfSignatureWithFallback(signature, fallbackType) {
             return signature.parameters.length > 0 ? getTypeAtPosition(signature, 0) : fallbackType;
         }
-        function inferFromAnnotatedParameters(signature, context, mapper) {
+        function inferFromAnnotatedParameters(signature, context, inferenceContext) {
             var len = signature.parameters.length - (signature.hasRestParameter ? 1 : 0);
             for (var i = 0; i < len; i++) {
                 var declaration = signature.parameters[i].valueDeclaration;
                 if (declaration.type) {
                     var typeNode = ts.getEffectiveTypeAnnotationNode(declaration);
                     if (typeNode) {
-                        inferTypes(mapper.inferences, getTypeFromTypeNode(typeNode), getTypeAtPosition(context, i));
+                        inferTypes(inferenceContext.inferences, getTypeFromTypeNode(typeNode), getTypeAtPosition(context, i));
                     }
                 }
             }
@@ -51256,12 +52909,12 @@ var ts;
             if (restType && restType.flags & 262144 /* TypeParameter */) {
                 // The contextual signature has a generic rest parameter. We first instantiate the contextual
                 // signature (without fixing type parameters) and assign types to contextually typed parameters.
-                var instantiatedContext = instantiateSignature(context, cloneTypeMapper(mapper));
+                var instantiatedContext = instantiateSignature(context, inferenceContext.nonFixingMapper);
                 assignContextualParameterTypes(signature, instantiatedContext);
                 // We then infer from a tuple type representing the parameters that correspond to the contextual
                 // rest parameter.
                 var restPos = getParameterCount(context) - 1;
-                inferTypes(mapper.inferences, getRestTypeAtPosition(signature, restPos), restType);
+                inferTypes(inferenceContext.inferences, getRestTypeAtPosition(signature, restPos), restType);
             }
         }
         function assignContextualParameterTypes(signature, context) {
@@ -51298,7 +52951,7 @@ var ts;
             for (var _i = 0, _a = pattern.elements; _i < _a.length; _i++) {
                 var element = _a[_i];
                 if (!ts.isOmittedExpression(element)) {
-                    if (element.name.kind === 72 /* Identifier */) {
+                    if (element.name.kind === 73 /* Identifier */) {
                         getSymbolLinks(getSymbolOfNode(element)).type = getTypeForBindingElement(element);
                     }
                     else {
@@ -51312,9 +52965,9 @@ var ts;
             if (!links.type) {
                 links.type = contextualType;
                 var decl = parameter.valueDeclaration;
-                if (decl.name.kind !== 72 /* Identifier */) {
+                if (decl.name.kind !== 73 /* Identifier */) {
                     // if inference didn't come up with anything but {}, fall back to the binding pattern if present.
-                    if (links.type === emptyObjectType) {
+                    if (links.type === unknownType) {
                         links.type = getTypeFromBindingPattern(decl.name);
                     }
                     assignBindingElementTypes(decl.name);
@@ -51326,24 +52979,24 @@ var ts;
             var globalPromiseType = getGlobalPromiseType(/*reportErrors*/ true);
             if (globalPromiseType !== emptyGenericType) {
                 // if the promised type is itself a promise, get the underlying type; otherwise, fallback to the promised type
-                promisedType = getAwaitedType(promisedType) || emptyObjectType;
+                promisedType = getAwaitedType(promisedType) || unknownType;
                 return createTypeReference(globalPromiseType, [promisedType]);
             }
-            return emptyObjectType;
+            return unknownType;
         }
         function createPromiseLikeType(promisedType) {
             // creates a `PromiseLike<T>` type where `T` is the promisedType argument
             var globalPromiseLikeType = getGlobalPromiseLikeType(/*reportErrors*/ true);
             if (globalPromiseLikeType !== emptyGenericType) {
                 // if the promised type is itself a promise, get the underlying type; otherwise, fallback to the promised type
-                promisedType = getAwaitedType(promisedType) || emptyObjectType;
+                promisedType = getAwaitedType(promisedType) || unknownType;
                 return createTypeReference(globalPromiseLikeType, [promisedType]);
             }
-            return emptyObjectType;
+            return unknownType;
         }
         function createPromiseReturnType(func, promisedType) {
             var promiseType = createPromiseType(promisedType);
-            if (promiseType === emptyObjectType) {
+            if (promiseType === unknownType) {
                 error(func, ts.isImportCall(func) ?
                     ts.Diagnostics.A_dynamic_import_call_returns_a_Promise_Make_sure_you_have_a_declaration_for_Promise_or_include_ES2015_in_your_lib_option :
                     ts.Diagnostics.An_async_function_or_method_must_return_a_Promise_Make_sure_you_have_a_declaration_for_Promise_or_include_ES2015_in_your_lib_option);
@@ -51361,99 +53014,148 @@ var ts;
                 return errorType;
             }
             var functionFlags = ts.getFunctionFlags(func);
-            var type;
-            if (func.body.kind !== 218 /* Block */) {
-                type = checkExpressionCached(func.body, checkMode && checkMode & ~8 /* SkipGenericFunctions */);
-                if (functionFlags & 2 /* Async */) {
+            var isAsync = (functionFlags & 2 /* Async */) !== 0;
+            var isGenerator = (functionFlags & 1 /* Generator */) !== 0;
+            var returnType;
+            var yieldType;
+            var nextType;
+            var fallbackReturnType = voidType;
+            if (func.body.kind !== 219 /* Block */) { // Async or normal arrow function
+                returnType = checkExpressionCached(func.body, checkMode && checkMode & ~8 /* SkipGenericFunctions */);
+                if (isAsync) {
                     // From within an async function you can return either a non-promise value or a promise. Any
                     // Promise/A+ compatible implementation will always assimilate any foreign promise, so the
                     // return type of the body should be unwrapped to its awaited type, which we will wrap in
                     // the native Promise<T> type later in this function.
-                    type = checkAwaitedType(type, /*errorNode*/ func, ts.Diagnostics.The_return_type_of_an_async_function_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member);
+                    returnType = checkAwaitedType(returnType, /*errorNode*/ func, ts.Diagnostics.The_return_type_of_an_async_function_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member);
                 }
             }
-            else {
-                var types = checkAndAggregateReturnExpressionTypes(func, checkMode);
-                if (functionFlags & 1 /* Generator */) { // Generator or AsyncGenerator function
-                    types = ts.concatenate(checkAndAggregateYieldOperandTypes(func, checkMode), types);
-                    if (!types || types.length === 0) {
-                        var iterableIteratorAny = functionFlags & 2 /* Async */
-                            ? createAsyncIterableIteratorType(anyType) // AsyncGenerator function
-                            : createIterableIteratorType(anyType); // Generator function
-                        if (noImplicitAny) {
-                            error(func.asteriskToken, ts.Diagnostics.Generator_implicitly_has_type_0_because_it_does_not_yield_any_values_Consider_supplying_a_return_type, typeToString(iterableIteratorAny));
-                        }
-                        return iterableIteratorAny;
-                    }
+            else if (isGenerator) { // Generator or AsyncGenerator function
+                var returnTypes = checkAndAggregateReturnExpressionTypes(func, checkMode);
+                if (!returnTypes) {
+                    fallbackReturnType = neverType;
                 }
-                else {
-                    if (!types) {
-                        // For an async function, the return type will not be never, but rather a Promise for never.
-                        return functionFlags & 2 /* Async */
-                            ? createPromiseReturnType(func, neverType) // Async function
-                            : neverType; // Normal function
-                    }
-                    if (types.length === 0) {
-                        // For an async function, the return type will not be void, but rather a Promise for void.
-                        return functionFlags & 2 /* Async */
-                            ? createPromiseReturnType(func, voidType) // Async function
-                            : voidType; // Normal function
-                    }
+                else if (returnTypes.length > 0) {
+                    returnType = getUnionType(returnTypes, 2 /* Subtype */);
+                }
+                var _a = checkAndAggregateYieldOperandTypes(func, checkMode), yieldTypes = _a.yieldTypes, nextTypes = _a.nextTypes;
+                yieldType = ts.some(yieldTypes) ? getUnionType(yieldTypes, 2 /* Subtype */) : undefined;
+                nextType = ts.some(nextTypes) ? getIntersectionType(nextTypes) : undefined;
+            }
+            else { // Async or normal function
+                var types = checkAndAggregateReturnExpressionTypes(func, checkMode);
+                if (!types) {
+                    // For an async function, the return type will not be never, but rather a Promise for never.
+                    return functionFlags & 2 /* Async */
+                        ? createPromiseReturnType(func, neverType) // Async function
+                        : neverType; // Normal function
+                }
+                if (types.length === 0) {
+                    // For an async function, the return type will not be void, but rather a Promise for void.
+                    return functionFlags & 2 /* Async */
+                        ? createPromiseReturnType(func, voidType) // Async function
+                        : voidType; // Normal function
                 }
                 // Return a union of the return expression types.
-                type = getUnionType(types, 2 /* Subtype */);
+                returnType = getUnionType(types, 2 /* Subtype */);
             }
-            var contextualSignature = getContextualSignatureForFunctionLikeDeclaration(func);
-            if (!contextualSignature) {
-                reportErrorsFromWidening(func, type);
-            }
-            if (isUnitType(type)) {
-                var contextualType = !contextualSignature ? undefined :
-                    contextualSignature === getSignatureFromDeclaration(func) ? type :
-                        getReturnTypeOfSignature(contextualSignature);
-                if (contextualType) {
-                    switch (functionFlags & 3 /* AsyncGenerator */) {
-                        case 3 /* AsyncGenerator */:
-                            contextualType = getIteratedTypeOfGenerator(contextualType, /*isAsyncGenerator*/ true);
-                            break;
-                        case 1 /* Generator */:
-                            contextualType = getIteratedTypeOfGenerator(contextualType, /*isAsyncGenerator*/ false);
-                            break;
-                        case 2 /* Async */:
-                            contextualType = getPromisedTypeOfPromise(contextualType);
-                            break;
+            if (returnType || yieldType || nextType) {
+                var contextualSignature = getContextualSignatureForFunctionLikeDeclaration(func);
+                if (!contextualSignature) {
+                    if (yieldType)
+                        reportErrorsFromWidening(func, yieldType, 1 /* GeneratorYield */);
+                    if (returnType)
+                        reportErrorsFromWidening(func, returnType);
+                    if (nextType)
+                        reportErrorsFromWidening(func, nextType);
+                }
+                if (returnType && isUnitType(returnType) ||
+                    yieldType && isUnitType(yieldType) ||
+                    nextType && isUnitType(nextType)) {
+                    var contextualType = !contextualSignature ? undefined :
+                        contextualSignature === getSignatureFromDeclaration(func) ? isGenerator ? undefined : returnType :
+                            instantiateContextualType(getReturnTypeOfSignature(contextualSignature), func);
+                    if (isGenerator) {
+                        yieldType = getWidenedLiteralLikeTypeForContextualIterationTypeIfNeeded(yieldType, contextualType, 0 /* Yield */, isAsync);
+                        returnType = getWidenedLiteralLikeTypeForContextualIterationTypeIfNeeded(returnType, contextualType, 1 /* Return */, isAsync);
+                        nextType = getWidenedLiteralLikeTypeForContextualIterationTypeIfNeeded(nextType, contextualType, 2 /* Next */, isAsync);
+                    }
+                    else {
+                        returnType = getWidenedLiteralLikeTypeForContextualReturnTypeIfNeeded(returnType, contextualType, isAsync);
                     }
                 }
-                type = getWidenedLiteralLikeTypeForContextualType(type, contextualType);
+                if (yieldType)
+                    yieldType = getWidenedType(yieldType);
+                if (returnType)
+                    returnType = getWidenedType(returnType);
+                if (nextType)
+                    nextType = getWidenedType(nextType);
             }
-            var widenedType = getWidenedType(type);
-            switch (functionFlags & 3 /* AsyncGenerator */) {
-                case 3 /* AsyncGenerator */:
-                    return createAsyncIterableIteratorType(widenedType);
-                case 1 /* Generator */:
-                    return createIterableIteratorType(widenedType);
-                case 2 /* Async */:
-                    // From within an async function you can return either a non-promise value or a promise. Any
-                    // Promise/A+ compatible implementation will always assimilate any foreign promise, so the
-                    // return type of the body is awaited type of the body, wrapped in a native Promise<T> type.
-                    return createPromiseType(widenedType);
-                default:
-                    return widenedType;
+            if (isGenerator) {
+                return createGeneratorReturnType(yieldType || neverType, returnType || fallbackReturnType, nextType || unknownType, isAsync);
             }
+            else {
+                // From within an async function you can return either a non-promise value or a promise. Any
+                // Promise/A+ compatible implementation will always assimilate any foreign promise, so the
+                // return type of the body is awaited type of the body, wrapped in a native Promise<T> type.
+                return isAsync
+                    ? createPromiseType(returnType || fallbackReturnType)
+                    : returnType || fallbackReturnType;
+            }
+        }
+        function createGeneratorReturnType(yieldType, returnType, nextType, isAsyncGenerator) {
+            var resolver = isAsyncGenerator ? asyncIterationTypesResolver : syncIterationTypesResolver;
+            var globalGeneratorType = resolver.getGlobalGeneratorType(/*reportErrors*/ false);
+            yieldType = resolver.resolveIterationType(yieldType, /*errorNode*/ undefined) || unknownType;
+            returnType = resolver.resolveIterationType(returnType, /*errorNode*/ undefined) || unknownType;
+            nextType = resolver.resolveIterationType(nextType, /*errorNode*/ undefined) || unknownType;
+            if (globalGeneratorType === emptyGenericType) {
+                // Fall back to the global IterableIterator if returnType is assignable to the expected return iteration
+                // type of IterableIterator, and the expected next iteration type of IterableIterator is assignable to
+                // nextType.
+                var globalType = resolver.getGlobalIterableIteratorType(/*reportErrors*/ false);
+                var iterationTypes = globalType !== emptyGenericType ? getIterationTypesOfGlobalIterableType(globalType, resolver) : undefined;
+                var iterableIteratorReturnType = iterationTypes ? iterationTypes.returnType : anyType;
+                var iterableIteratorNextType = iterationTypes ? iterationTypes.nextType : undefinedType;
+                if (isTypeAssignableTo(returnType, iterableIteratorReturnType) &&
+                    isTypeAssignableTo(iterableIteratorNextType, nextType)) {
+                    if (globalType !== emptyGenericType) {
+                        return createTypeFromGenericGlobalType(globalType, [yieldType]);
+                    }
+                    // The global IterableIterator type doesn't exist, so report an error
+                    resolver.getGlobalIterableIteratorType(/*reportErrors*/ true);
+                    return emptyObjectType;
+                }
+                // The global Generator type doesn't exist, so report an error
+                resolver.getGlobalGeneratorType(/*reportErrors*/ true);
+                return emptyObjectType;
+            }
+            return createTypeFromGenericGlobalType(globalGeneratorType, [yieldType, returnType, nextType]);
         }
         function checkAndAggregateYieldOperandTypes(func, checkMode) {
-            var aggregatedTypes = [];
+            var yieldTypes = [];
+            var nextTypes = [];
             var isAsync = (ts.getFunctionFlags(func) & 2 /* Async */) !== 0;
             ts.forEachYieldExpression(func.body, function (yieldExpression) {
-                ts.pushIfUnique(aggregatedTypes, getYieldedTypeOfYieldExpression(yieldExpression, isAsync, checkMode));
+                var yieldExpressionType = yieldExpression.expression ? checkExpression(yieldExpression.expression, checkMode) : undefinedWideningType;
+                ts.pushIfUnique(yieldTypes, getYieldedTypeOfYieldExpression(yieldExpression, yieldExpressionType, anyType, isAsync));
+                var nextType;
+                if (yieldExpression.asteriskToken) {
+                    var iterationTypes = getIterationTypesOfIterable(yieldExpressionType, isAsync ? 19 /* AsyncYieldStar */ : 17 /* YieldStar */, yieldExpression.expression);
+                    nextType = iterationTypes && iterationTypes.nextType;
+                }
+                else {
+                    nextType = getContextualType(yieldExpression);
+                }
+                if (nextType)
+                    ts.pushIfUnique(nextTypes, nextType);
             });
-            return aggregatedTypes;
+            return { yieldTypes: yieldTypes, nextTypes: nextTypes };
         }
-        function getYieldedTypeOfYieldExpression(node, isAsync, checkMode) {
+        function getYieldedTypeOfYieldExpression(node, expressionType, sentType, isAsync) {
             var errorNode = node.expression || node;
-            var expressionType = node.expression ? checkExpression(node.expression, checkMode) : undefinedWideningType;
             // A `yield*` expression effectively yields everything that its operand yields
-            var yieldedType = node.asteriskToken ? checkIteratedTypeOrElementType(expressionType, errorNode, /*allowStringInput*/ false, isAsync) : expressionType;
+            var yieldedType = node.asteriskToken ? checkIteratedTypeOrElementType(isAsync ? 19 /* AsyncYieldStar */ : 17 /* YieldStar */, expressionType, sentType, errorNode) : expressionType;
             return !isAsync ? yieldedType : getAwaitedType(yieldedType, errorNode, node.asteriskToken
                 ? ts.Diagnostics.Type_of_iterated_elements_of_a_yield_Asterisk_operand_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member
                 : ts.Diagnostics.Type_of_yield_operand_in_an_async_generator_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member);
@@ -51504,7 +53206,7 @@ var ts;
             if (!node.possiblyExhaustive) {
                 return false;
             }
-            if (node.expression.kind === 199 /* TypeOfExpression */) {
+            if (node.expression.kind === 200 /* TypeOfExpression */) {
                 var operandType = getTypeOfExpression(node.expression.expression);
                 // This cast is safe because the switch is possibly exhaustive and does not contain a default case, so there can be no undefined.
                 var witnesses = getSwitchClauseTypeOfWitnesses(node);
@@ -51527,7 +53229,7 @@ var ts;
             if (!(func.flags & 128 /* HasImplicitReturn */)) {
                 return false;
             }
-            if (ts.some(func.body.statements, function (statement) { return statement.kind === 232 /* SwitchStatement */ && isExhaustiveSwitchStatement(statement); })) {
+            if (ts.some(func.body.statements, function (statement) { return statement.kind === 233 /* SwitchStatement */ && isExhaustiveSwitchStatement(statement); })) {
                 return false;
             }
             return true;
@@ -51570,11 +53272,11 @@ var ts;
         }
         function mayReturnNever(func) {
             switch (func.kind) {
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
                     return true;
-                case 156 /* MethodDeclaration */:
-                    return func.parent.kind === 188 /* ObjectLiteralExpression */;
+                case 157 /* MethodDeclaration */:
+                    return func.parent.kind === 189 /* ObjectLiteralExpression */;
                 default:
                     return false;
             }
@@ -51592,30 +53294,32 @@ var ts;
             if (!produceDiagnostics) {
                 return;
             }
+            var functionFlags = ts.getFunctionFlags(func);
+            var type = returnType && getReturnOrPromisedType(returnType, functionFlags);
             // Functions with with an explicitly specified 'void' or 'any' return type don't need any return expressions.
-            if (returnType && maybeTypeOfKind(returnType, 1 /* Any */ | 16384 /* Void */)) {
+            if (type && maybeTypeOfKind(type, 1 /* Any */ | 16384 /* Void */)) {
                 return;
             }
             // If all we have is a function signature, or an arrow function with an expression body, then there is nothing to check.
             // also if HasImplicitReturn flag is not set this means that all codepaths in function body end with return or throw
-            if (func.kind === 155 /* MethodSignature */ || ts.nodeIsMissing(func.body) || func.body.kind !== 218 /* Block */ || !functionHasImplicitReturn(func)) {
+            if (func.kind === 156 /* MethodSignature */ || ts.nodeIsMissing(func.body) || func.body.kind !== 219 /* Block */ || !functionHasImplicitReturn(func)) {
                 return;
             }
             var hasExplicitReturn = func.flags & 256 /* HasExplicitReturn */;
-            if (returnType && returnType.flags & 131072 /* Never */) {
+            if (type && type.flags & 131072 /* Never */) {
                 error(ts.getEffectiveReturnTypeNode(func), ts.Diagnostics.A_function_returning_never_cannot_have_a_reachable_end_point);
             }
-            else if (returnType && !hasExplicitReturn) {
+            else if (type && !hasExplicitReturn) {
                 // minimal check: function has syntactic return type annotation and no explicit return statements in the body
                 // this function does not conform to the specification.
                 // NOTE: having returnType !== undefined is a precondition for entering this branch so func.type will always be present
                 error(ts.getEffectiveReturnTypeNode(func), ts.Diagnostics.A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value);
             }
-            else if (returnType && strictNullChecks && !isTypeAssignableTo(undefinedType, returnType)) {
+            else if (type && strictNullChecks && !isTypeAssignableTo(undefinedType, type)) {
                 error(ts.getEffectiveReturnTypeNode(func), ts.Diagnostics.Function_lacks_ending_return_statement_and_return_type_does_not_include_undefined);
             }
             else if (compilerOptions.noImplicitReturns) {
-                if (!returnType) {
+                if (!type) {
                     // If return type annotation is omitted check if function has any explicit return statements.
                     // If it does not have any - its inferred return type is void - don't do any checks.
                     // Otherwise get inferred return type from function body and report error only if it is not void / anytype
@@ -51631,34 +53335,38 @@ var ts;
             }
         }
         function checkFunctionExpressionOrObjectLiteralMethod(node, checkMode) {
-            ts.Debug.assert(node.kind !== 156 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 157 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
             checkNodeDeferred(node);
             // The identityMapper object is used to indicate that function expressions are wildcards
             if (checkMode && checkMode & 4 /* SkipContextSensitive */ && isContextSensitive(node)) {
                 // Skip parameters, return signature with return type that retains noncontextual parts so inferences can still be drawn in an early stage
                 if (!ts.getEffectiveReturnTypeNode(node) && hasContextSensitiveReturnExpression(node)) {
-                    var links_1 = getNodeLinks(node);
-                    if (links_1.contextFreeType) {
-                        return links_1.contextFreeType;
+                    var links = getNodeLinks(node);
+                    if (links.contextFreeType) {
+                        return links.contextFreeType;
                     }
                     var returnType = getReturnTypeFromBody(node, checkMode);
                     var returnOnlySignature = createSignature(undefined, undefined, undefined, ts.emptyArray, returnType, /*resolvedTypePredicate*/ undefined, 0, /*hasRestParameter*/ false, /*hasLiteralTypes*/ false);
                     var returnOnlyType = createAnonymousType(node.symbol, emptySymbols, [returnOnlySignature], ts.emptyArray, undefined, undefined);
-                    returnOnlyType.objectFlags |= 524288 /* ContainsAnyFunctionType */;
-                    return links_1.contextFreeType = returnOnlyType;
+                    returnOnlyType.objectFlags |= 1048576 /* NonInferrableType */;
+                    return links.contextFreeType = returnOnlyType;
                 }
                 return anyFunctionType;
             }
             // Grammar checking
             var hasGrammarError = checkGrammarFunctionLikeDeclaration(node);
-            if (!hasGrammarError && node.kind === 196 /* FunctionExpression */) {
+            if (!hasGrammarError && node.kind === 197 /* FunctionExpression */) {
                 checkGrammarForGenerator(node);
             }
-            var links = getNodeLinks(node);
             var type = getTypeOfSymbol(getMergedSymbol(node.symbol));
             if (isTypeAny(type)) {
                 return type;
             }
+            contextuallyCheckFunctionExpressionOrObjectLiteralMethod(node, checkMode);
+            return type;
+        }
+        function contextuallyCheckFunctionExpressionOrObjectLiteralMethod(node, checkMode) {
+            var links = getNodeLinks(node);
             // Check if function expression is contextually typed and assign parameter types if so.
             if (!(links.flags & 1024 /* ContextChecked */)) {
                 var contextualSignature = getContextualSignature(node);
@@ -51668,14 +53376,18 @@ var ts;
                 if (!(links.flags & 1024 /* ContextChecked */)) {
                     links.flags |= 1024 /* ContextChecked */;
                     if (contextualSignature) {
+                        var type = getTypeOfSymbol(getMergedSymbol(node.symbol));
+                        if (isTypeAny(type)) {
+                            return;
+                        }
                         var signature = getSignaturesOfType(type, 0 /* Call */)[0];
                         if (isContextSensitive(node)) {
-                            var contextualMapper = getContextualMapper(node);
+                            var inferenceContext = getInferenceContext(node);
                             if (checkMode && checkMode & 2 /* Inferential */) {
-                                inferFromAnnotatedParameters(signature, contextualSignature, contextualMapper);
+                                inferFromAnnotatedParameters(signature, contextualSignature, inferenceContext);
                             }
-                            var instantiatedContextualSignature = contextualMapper === identityMapper ?
-                                contextualSignature : instantiateSignature(contextualSignature, contextualMapper);
+                            var instantiatedContextualSignature = inferenceContext ?
+                                instantiateSignature(contextualSignature, inferenceContext.mapper) : contextualSignature;
                             assignContextualParameterTypes(signature, instantiatedContextualSignature);
                         }
                         if (!getReturnTypeFromAnnotation(node) && !signature.resolvedReturnType) {
@@ -51688,21 +53400,19 @@ var ts;
                     checkSignatureDeclaration(node);
                 }
             }
-            return type;
         }
-        function getReturnOrPromisedType(node, functionFlags) {
-            var type = getReturnTypeFromAnnotation(node);
-            return type && ((functionFlags & 3 /* AsyncGenerator */) === 2 /* Async */) ?
-                getAwaitedType(type) || errorType : type;
+        function getReturnOrPromisedType(type, functionFlags) {
+            var isGenerator = !!(functionFlags & 1 /* Generator */);
+            var isAsync = !!(functionFlags & 2 /* Async */);
+            return type && isGenerator ? getIterationTypeOfGeneratorFunctionReturnType(1 /* Return */, type, isAsync) || errorType :
+                type && isAsync ? getAwaitedType(type) || errorType :
+                    type;
         }
         function checkFunctionExpressionOrObjectLiteralMethodDeferred(node) {
-            ts.Debug.assert(node.kind !== 156 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 157 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
             var functionFlags = ts.getFunctionFlags(node);
-            var returnOrPromisedType = getReturnOrPromisedType(node, functionFlags);
-            if ((functionFlags & 1 /* Generator */) === 0) { // Async function or normal function
-                // return is not necessary in the body of generators
-                checkAllCodePathsInNonVoidFunctionReturnOrThrow(node, returnOrPromisedType);
-            }
+            var returnType = getReturnTypeFromAnnotation(node);
+            checkAllCodePathsInNonVoidFunctionReturnOrThrow(node, returnType);
             if (node.body) {
                 if (!ts.getEffectiveReturnTypeNode(node)) {
                     // There are some checks that are only performed in getReturnTypeFromBody, that may produce errors
@@ -51712,7 +53422,7 @@ var ts;
                     // checkFunctionExpressionBodies). So it must be done now.
                     getReturnTypeOfSignature(getSignatureFromDeclaration(node));
                 }
-                if (node.body.kind === 218 /* Block */) {
+                if (node.body.kind === 219 /* Block */) {
                     checkSourceElement(node.body);
                 }
                 else {
@@ -51722,6 +53432,7 @@ var ts;
                     // check assignability of the awaited type of the expression body against the promised type of
                     // its return type annotation.
                     var exprType = checkExpression(node.body);
+                    var returnOrPromisedType = getReturnOrPromisedType(returnType, functionFlags);
                     if (returnOrPromisedType) {
                         if ((functionFlags & 3 /* AsyncGenerator */) === 2 /* Async */) { // Async function
                             var awaitedType = checkAwaitedType(exprType, node.body, ts.Diagnostics.The_return_type_of_an_async_function_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member);
@@ -51734,9 +53445,11 @@ var ts;
                 }
             }
         }
-        function checkArithmeticOperandType(operand, type, diagnostic) {
+        function checkArithmeticOperandType(operand, type, diagnostic, isAwaitValid) {
+            if (isAwaitValid === void 0) { isAwaitValid = false; }
             if (!isTypeAssignableTo(type, numberOrBigIntType)) {
-                error(operand, diagnostic);
+                var awaitedType = isAwaitValid && getAwaitedTypeOfPromise(type);
+                errorAndMaybeSuggestAwait(operand, !!awaitedType && isTypeAssignableTo(awaitedType, numberOrBigIntType), diagnostic);
                 return false;
             }
             return true;
@@ -51790,11 +53503,11 @@ var ts;
             if (isReadonlySymbol(symbol)) {
                 // Allow assignments to readonly properties within constructors of the same class declaration.
                 if (symbol.flags & 4 /* Property */ &&
-                    (expr.kind === 189 /* PropertyAccessExpression */ || expr.kind === 190 /* ElementAccessExpression */) &&
-                    expr.expression.kind === 100 /* ThisKeyword */) {
+                    (expr.kind === 190 /* PropertyAccessExpression */ || expr.kind === 191 /* ElementAccessExpression */) &&
+                    expr.expression.kind === 101 /* ThisKeyword */) {
                     // Look for if this is the constructor for the class that `symbol` is a property of.
                     var func = ts.getContainingFunction(expr);
-                    if (!(func && func.kind === 157 /* Constructor */)) {
+                    if (!(func && func.kind === 158 /* Constructor */)) {
                         return true;
                     }
                     // If func.parent is a class and symbol is a (readonly) property of that class, or
@@ -51807,13 +53520,13 @@ var ts;
             return false;
         }
         function isReferenceThroughNamespaceImport(expr) {
-            if (expr.kind === 189 /* PropertyAccessExpression */ || expr.kind === 190 /* ElementAccessExpression */) {
+            if (expr.kind === 190 /* PropertyAccessExpression */ || expr.kind === 191 /* ElementAccessExpression */) {
                 var node = ts.skipParentheses(expr.expression);
-                if (node.kind === 72 /* Identifier */) {
+                if (node.kind === 73 /* Identifier */) {
                     var symbol = getNodeLinks(node).resolvedSymbol;
                     if (symbol.flags & 2097152 /* Alias */) {
                         var declaration = getDeclarationOfAliasSymbol(symbol);
-                        return !!declaration && declaration.kind === 251 /* NamespaceImport */;
+                        return !!declaration && declaration.kind === 252 /* NamespaceImport */;
                     }
                 }
             }
@@ -51822,7 +53535,7 @@ var ts;
         function checkReferenceExpression(expr, invalidReferenceMessage) {
             // References are combinations of identifiers, parentheses, and property accesses.
             var node = ts.skipOuterExpressions(expr, 2 /* Assertions */ | 1 /* Parentheses */);
-            if (node.kind !== 72 /* Identifier */ && node.kind !== 189 /* PropertyAccessExpression */ && node.kind !== 190 /* ElementAccessExpression */) {
+            if (node.kind !== 73 /* Identifier */ && node.kind !== 190 /* PropertyAccessExpression */ && node.kind !== 191 /* ElementAccessExpression */) {
                 error(expr, invalidReferenceMessage);
                 return false;
             }
@@ -51831,7 +53544,7 @@ var ts;
         function checkDeleteExpression(node) {
             checkExpression(node.expression);
             var expr = ts.skipParentheses(node.expression);
-            if (expr.kind !== 189 /* PropertyAccessExpression */ && expr.kind !== 190 /* ElementAccessExpression */) {
+            if (expr.kind !== 190 /* PropertyAccessExpression */ && expr.kind !== 191 /* ElementAccessExpression */) {
                 error(expr, ts.Diagnostics.The_operand_of_a_delete_operator_must_be_a_property_reference);
                 return booleanType;
             }
@@ -51854,7 +53567,19 @@ var ts;
             // Grammar checking
             if (produceDiagnostics) {
                 if (!(node.flags & 16384 /* AwaitContext */)) {
-                    grammarErrorOnFirstToken(node, ts.Diagnostics.await_expression_is_only_allowed_within_an_async_function);
+                    // use of 'await' in non-async function
+                    var sourceFile = ts.getSourceFileOfNode(node);
+                    if (!hasParseDiagnostics(sourceFile)) {
+                        var span = ts.getSpanOfTokenAtPosition(sourceFile, node.pos);
+                        var diagnostic = ts.createFileDiagnostic(sourceFile, span.start, span.length, ts.Diagnostics.await_expression_is_only_allowed_within_an_async_function);
+                        var func = ts.getContainingFunction(node);
+                        if (func && func.kind !== 158 /* Constructor */) {
+                            ts.Debug.assert((ts.getFunctionFlags(func) & 2 /* Async */) === 0, "Enclosing function should never be an async function.");
+                            var relatedInfo = ts.createDiagnosticForNode(func, ts.Diagnostics.Did_you_mean_to_mark_this_function_as_async);
+                            ts.addRelatedInfo(diagnostic, relatedInfo);
+                        }
+                        diagnostics.add(diagnostic);
+                    }
                 }
                 if (isInParameterInitializerBeforeContainingFunction(node)) {
                     error(node, ts.Diagnostics.await_expressions_cannot_be_used_in_a_parameter_initializer);
@@ -52026,16 +53751,17 @@ var ts;
             if (strictNullChecks && properties.length === 0) {
                 return checkNonNullType(sourceType, node);
             }
-            for (var _i = 0, properties_6 = properties; _i < properties_6.length; _i++) {
-                var p = properties_6[_i];
-                checkObjectLiteralDestructuringPropertyAssignment(sourceType, p, properties, rightIsThis);
+            for (var i = 0; i < properties.length; i++) {
+                checkObjectLiteralDestructuringPropertyAssignment(node, sourceType, i, properties, rightIsThis);
             }
             return sourceType;
         }
         /** Note: If property cannot be a SpreadAssignment, then allProperties does not need to be provided */
-        function checkObjectLiteralDestructuringPropertyAssignment(objectLiteralType, property, allProperties, rightIsThis) {
+        function checkObjectLiteralDestructuringPropertyAssignment(node, objectLiteralType, propertyIndex, allProperties, rightIsThis) {
             if (rightIsThis === void 0) { rightIsThis = false; }
-            if (property.kind === 275 /* PropertyAssignment */ || property.kind === 276 /* ShorthandPropertyAssignment */) {
+            var properties = node.properties;
+            var property = properties[propertyIndex];
+            if (property.kind === 276 /* PropertyAssignment */ || property.kind === 277 /* ShorthandPropertyAssignment */) {
                 var name = property.name;
                 var exprType = getLiteralTypeFromPropertyName(name);
                 if (isTypeUsableAsPropertyName(exprType)) {
@@ -52048,21 +53774,29 @@ var ts;
                 }
                 var elementType = getIndexedAccessType(objectLiteralType, exprType, name);
                 var type = getFlowTypeOfDestructuring(property, elementType);
-                return checkDestructuringAssignment(property.kind === 276 /* ShorthandPropertyAssignment */ ? property : property.initializer, type);
+                return checkDestructuringAssignment(property.kind === 277 /* ShorthandPropertyAssignment */ ? property : property.initializer, type);
             }
-            else if (property.kind === 277 /* SpreadAssignment */) {
-                if (languageVersion < 7 /* ESNext */) {
-                    checkExternalEmitHelpers(property, 4 /* Rest */);
+            else if (property.kind === 278 /* SpreadAssignment */) {
+                if (propertyIndex < properties.length - 1) {
+                    error(property, ts.Diagnostics.A_rest_element_must_be_last_in_a_destructuring_pattern);
                 }
-                var nonRestNames = [];
-                if (allProperties) {
-                    for (var i = 0; i < allProperties.length - 1; i++) {
-                        nonRestNames.push(allProperties[i].name);
+                else {
+                    if (languageVersion < 99 /* ESNext */) {
+                        checkExternalEmitHelpers(property, 4 /* Rest */);
                     }
+                    var nonRestNames = [];
+                    if (allProperties) {
+                        for (var _i = 0, allProperties_1 = allProperties; _i < allProperties_1.length; _i++) {
+                            var otherProperty = allProperties_1[_i];
+                            if (!ts.isSpreadAssignment(otherProperty)) {
+                                nonRestNames.push(otherProperty.name);
+                            }
+                        }
+                    }
+                    var type = getRestType(objectLiteralType, nonRestNames, objectLiteralType.symbol);
+                    checkGrammarForDisallowedTrailingComma(allProperties, ts.Diagnostics.A_rest_parameter_or_binding_pattern_may_not_have_a_trailing_comma);
+                    return checkDestructuringAssignment(property.expression, type);
                 }
-                var type = getRestType(objectLiteralType, nonRestNames, objectLiteralType.symbol);
-                checkGrammarForDisallowedTrailingComma(allProperties, ts.Diagnostics.A_rest_parameter_or_binding_pattern_may_not_have_a_trailing_comma);
-                return checkDestructuringAssignment(property.expression, type);
             }
             else {
                 error(property, ts.Diagnostics.Property_assignment_expected);
@@ -52076,7 +53810,7 @@ var ts;
             // This elementType will be used if the specific property corresponding to this index is not
             // present (aka the tuple element property). This call also checks that the parentType is in
             // fact an iterable or array (depending on target language).
-            var elementType = checkIteratedTypeOrElementType(sourceType, node, /*allowStringInput*/ false, /*allowAsyncIterables*/ false) || errorType;
+            var elementType = checkIteratedTypeOrElementType(65 /* Destructuring */, sourceType, undefinedType, node) || errorType;
             for (var i = 0; i < elements.length; i++) {
                 checkArrayLiteralDestructuringElementAssignment(node, sourceType, i, elementType, checkMode);
             }
@@ -52085,14 +53819,16 @@ var ts;
         function checkArrayLiteralDestructuringElementAssignment(node, sourceType, elementIndex, elementType, checkMode) {
             var elements = node.elements;
             var element = elements[elementIndex];
-            if (element.kind !== 210 /* OmittedExpression */) {
-                if (element.kind !== 208 /* SpreadElement */) {
+            if (element.kind !== 211 /* OmittedExpression */) {
+                if (element.kind !== 209 /* SpreadElement */) {
                     var indexType = getLiteralType(elementIndex);
                     if (isArrayLikeType(sourceType)) {
                         // We create a synthetic expression so that getIndexedAccessType doesn't get confused
                         // when the element is a SyntaxKind.ElementAccessExpression.
-                        var elementType_2 = getIndexedAccessType(sourceType, indexType, createSyntheticExpression(element, indexType));
-                        var type = getFlowTypeOfDestructuring(element, elementType_2);
+                        var accessFlags = hasDefaultValue(element) ? 8 /* NoTupleBoundsCheck */ : 0;
+                        var elementType_2 = getIndexedAccessTypeOrUndefined(sourceType, indexType, createSyntheticExpression(element, indexType), accessFlags) || errorType;
+                        var assignedType = hasDefaultValue(element) ? getTypeWithFacts(elementType_2, 524288 /* NEUndefined */) : elementType_2;
+                        var type = getFlowTypeOfDestructuring(element, assignedType);
                         return checkDestructuringAssignment(element, type, checkMode);
                     }
                     return checkDestructuringAssignment(element, elementType, checkMode);
@@ -52102,7 +53838,7 @@ var ts;
                 }
                 else {
                     var restExpression = element.expression;
-                    if (restExpression.kind === 204 /* BinaryExpression */ && restExpression.operatorToken.kind === 59 /* EqualsToken */) {
+                    if (restExpression.kind === 205 /* BinaryExpression */ && restExpression.operatorToken.kind === 60 /* EqualsToken */) {
                         error(restExpression.operatorToken, ts.Diagnostics.A_rest_element_cannot_have_an_initializer);
                     }
                     else {
@@ -52118,7 +53854,7 @@ var ts;
         }
         function checkDestructuringAssignment(exprOrAssignment, sourceType, checkMode, rightIsThis) {
             var target;
-            if (exprOrAssignment.kind === 276 /* ShorthandPropertyAssignment */) {
+            if (exprOrAssignment.kind === 277 /* ShorthandPropertyAssignment */) {
                 var prop = exprOrAssignment;
                 if (prop.objectAssignmentInitializer) {
                     // In strict null checking mode, if a default value of a non-undefined type is specified, remove
@@ -52134,21 +53870,21 @@ var ts;
             else {
                 target = exprOrAssignment;
             }
-            if (target.kind === 204 /* BinaryExpression */ && target.operatorToken.kind === 59 /* EqualsToken */) {
+            if (target.kind === 205 /* BinaryExpression */ && target.operatorToken.kind === 60 /* EqualsToken */) {
                 checkBinaryExpression(target, checkMode);
                 target = target.left;
             }
-            if (target.kind === 188 /* ObjectLiteralExpression */) {
+            if (target.kind === 189 /* ObjectLiteralExpression */) {
                 return checkObjectLiteralAssignment(target, sourceType, rightIsThis);
             }
-            if (target.kind === 187 /* ArrayLiteralExpression */) {
+            if (target.kind === 188 /* ArrayLiteralExpression */) {
                 return checkArrayLiteralAssignment(target, sourceType, checkMode);
             }
             return checkReferenceAssignment(target, sourceType, checkMode);
         }
         function checkReferenceAssignment(target, sourceType, checkMode) {
             var targetType = checkExpression(target, checkMode);
-            var error = target.parent.kind === 277 /* SpreadAssignment */ ?
+            var error = target.parent.kind === 278 /* SpreadAssignment */ ?
                 ts.Diagnostics.The_target_of_an_object_rest_assignment_must_be_a_variable_or_a_property_access :
                 ts.Diagnostics.The_left_hand_side_of_an_assignment_expression_must_be_a_variable_or_a_property_access;
             if (checkReferenceExpression(target, error)) {
@@ -52167,39 +53903,39 @@ var ts;
         function isSideEffectFree(node) {
             node = ts.skipParentheses(node);
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                 case 10 /* StringLiteral */:
                 case 13 /* RegularExpressionLiteral */:
-                case 193 /* TaggedTemplateExpression */:
-                case 206 /* TemplateExpression */:
+                case 194 /* TaggedTemplateExpression */:
+                case 207 /* TemplateExpression */:
                 case 14 /* NoSubstitutionTemplateLiteral */:
                 case 8 /* NumericLiteral */:
                 case 9 /* BigIntLiteral */:
-                case 102 /* TrueKeyword */:
-                case 87 /* FalseKeyword */:
-                case 96 /* NullKeyword */:
-                case 141 /* UndefinedKeyword */:
-                case 196 /* FunctionExpression */:
-                case 209 /* ClassExpression */:
-                case 197 /* ArrowFunction */:
-                case 187 /* ArrayLiteralExpression */:
-                case 188 /* ObjectLiteralExpression */:
-                case 199 /* TypeOfExpression */:
-                case 213 /* NonNullExpression */:
-                case 261 /* JsxSelfClosingElement */:
-                case 260 /* JsxElement */:
+                case 103 /* TrueKeyword */:
+                case 88 /* FalseKeyword */:
+                case 97 /* NullKeyword */:
+                case 142 /* UndefinedKeyword */:
+                case 197 /* FunctionExpression */:
+                case 210 /* ClassExpression */:
+                case 198 /* ArrowFunction */:
+                case 188 /* ArrayLiteralExpression */:
+                case 189 /* ObjectLiteralExpression */:
+                case 200 /* TypeOfExpression */:
+                case 214 /* NonNullExpression */:
+                case 262 /* JsxSelfClosingElement */:
+                case 261 /* JsxElement */:
                     return true;
-                case 205 /* ConditionalExpression */:
+                case 206 /* ConditionalExpression */:
                     return isSideEffectFree(node.whenTrue) &&
                         isSideEffectFree(node.whenFalse);
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     if (ts.isAssignmentOperator(node.operatorToken.kind)) {
                         return false;
                     }
                     return isSideEffectFree(node.left) &&
                         isSideEffectFree(node.right);
-                case 202 /* PrefixUnaryExpression */:
-                case 203 /* PostfixUnaryExpression */:
+                case 203 /* PrefixUnaryExpression */:
+                case 204 /* PostfixUnaryExpression */:
                     // Unary operators ~, !, +, and - have no side effects.
                     // The rest do.
                     switch (node.operator) {
@@ -52211,9 +53947,9 @@ var ts;
                     }
                     return false;
                 // Some forms listed here for clarity
-                case 200 /* VoidExpression */: // Explicit opt-out
-                case 194 /* TypeAssertionExpression */: // Not SEF, but can produce useful type warnings
-                case 212 /* AsExpression */: // Not SEF, but can produce useful type warnings
+                case 201 /* VoidExpression */: // Explicit opt-out
+                case 195 /* TypeAssertionExpression */: // Not SEF, but can produce useful type warnings
+                case 213 /* AsExpression */: // Not SEF, but can produce useful type warnings
                 default:
                     return false;
             }
@@ -52229,8 +53965,8 @@ var ts;
         }
         function checkBinaryLikeExpression(left, operatorToken, right, checkMode, errorNode) {
             var operator = operatorToken.kind;
-            if (operator === 59 /* EqualsToken */ && (left.kind === 188 /* ObjectLiteralExpression */ || left.kind === 187 /* ArrayLiteralExpression */)) {
-                return checkDestructuringAssignment(left, checkExpression(right, checkMode), checkMode, right.kind === 100 /* ThisKeyword */);
+            if (operator === 60 /* EqualsToken */ && (left.kind === 189 /* ObjectLiteralExpression */ || left.kind === 188 /* ArrayLiteralExpression */)) {
+                return checkDestructuringAssignment(left, checkExpression(right, checkMode), checkMode, right.kind === 101 /* ThisKeyword */);
             }
             var leftType;
             if (operator === 54 /* AmpersandAmpersandToken */ || operator === 55 /* BarBarToken */) {
@@ -52243,26 +53979,26 @@ var ts;
             switch (operator) {
                 case 40 /* AsteriskToken */:
                 case 41 /* AsteriskAsteriskToken */:
-                case 62 /* AsteriskEqualsToken */:
-                case 63 /* AsteriskAsteriskEqualsToken */:
+                case 63 /* AsteriskEqualsToken */:
+                case 64 /* AsteriskAsteriskEqualsToken */:
                 case 42 /* SlashToken */:
-                case 64 /* SlashEqualsToken */:
+                case 65 /* SlashEqualsToken */:
                 case 43 /* PercentToken */:
-                case 65 /* PercentEqualsToken */:
+                case 66 /* PercentEqualsToken */:
                 case 39 /* MinusToken */:
-                case 61 /* MinusEqualsToken */:
+                case 62 /* MinusEqualsToken */:
                 case 46 /* LessThanLessThanToken */:
-                case 66 /* LessThanLessThanEqualsToken */:
+                case 67 /* LessThanLessThanEqualsToken */:
                 case 47 /* GreaterThanGreaterThanToken */:
-                case 67 /* GreaterThanGreaterThanEqualsToken */:
+                case 68 /* GreaterThanGreaterThanEqualsToken */:
                 case 48 /* GreaterThanGreaterThanGreaterThanToken */:
-                case 68 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
+                case 69 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
                 case 50 /* BarToken */:
-                case 70 /* BarEqualsToken */:
+                case 71 /* BarEqualsToken */:
                 case 51 /* CaretToken */:
-                case 71 /* CaretEqualsToken */:
+                case 72 /* CaretEqualsToken */:
                 case 49 /* AmpersandToken */:
-                case 69 /* AmpersandEqualsToken */:
+                case 70 /* AmpersandEqualsToken */:
                     if (leftType === silentNeverType || rightType === silentNeverType) {
                         return silentNeverType;
                     }
@@ -52279,8 +54015,8 @@ var ts;
                     }
                     else {
                         // otherwise just check each operand separately and report errors as normal
-                        var leftOk = checkArithmeticOperandType(left, leftType, ts.Diagnostics.The_left_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_bigint_or_an_enum_type);
-                        var rightOk = checkArithmeticOperandType(right, rightType, ts.Diagnostics.The_right_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_bigint_or_an_enum_type);
+                        var leftOk = checkArithmeticOperandType(left, leftType, ts.Diagnostics.The_left_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_bigint_or_an_enum_type, /*isAwaitValid*/ true);
+                        var rightOk = checkArithmeticOperandType(right, rightType, ts.Diagnostics.The_right_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_bigint_or_an_enum_type, /*isAwaitValid*/ true);
                         var resultType_1;
                         // If both are any or unknown, allow operation; assume it will resolve to number
                         if ((isTypeAssignableToKind(leftType, 3 /* AnyOrUnknown */) && isTypeAssignableToKind(rightType, 3 /* AnyOrUnknown */)) ||
@@ -52288,17 +54024,18 @@ var ts;
                             !(maybeTypeOfKind(leftType, 2112 /* BigIntLike */) || maybeTypeOfKind(rightType, 2112 /* BigIntLike */))) {
                             resultType_1 = numberType;
                         }
-                        // At least one is assignable to bigint, so both should be only assignable to bigint
+                        // At least one is assignable to bigint, so check that both are
                         else if (isTypeAssignableToKind(leftType, 2112 /* BigIntLike */) && isTypeAssignableToKind(rightType, 2112 /* BigIntLike */)) {
                             switch (operator) {
                                 case 48 /* GreaterThanGreaterThanGreaterThanToken */:
-                                case 68 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
+                                case 69 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
                                     reportOperatorError();
                             }
                             resultType_1 = bigintType;
                         }
+                        // Exactly one of leftType/rightType is assignable to bigint
                         else {
-                            reportOperatorError();
+                            reportOperatorError(function (awaitedLeft, awaitedRight) { return isTypeAssignableToKind(awaitedLeft, 2112 /* BigIntLike */) && isTypeAssignableToKind(awaitedRight, 2112 /* BigIntLike */); });
                             resultType_1 = errorType;
                         }
                         if (leftOk && rightOk) {
@@ -52307,7 +54044,7 @@ var ts;
                         return resultType_1;
                     }
                 case 38 /* PlusToken */:
-                case 60 /* PlusEqualsToken */:
+                case 61 /* PlusEqualsToken */:
                     if (leftType === silentNeverType || rightType === silentNeverType) {
                         return silentNeverType;
                     }
@@ -52339,10 +54076,18 @@ var ts;
                         return resultType;
                     }
                     if (!resultType) {
-                        reportOperatorError();
+                        // Types that have a reasonably good chance of being a valid operand type.
+                        // If both types have an awaited type of one of these, we’ll assume the user
+                        // might be missing an await without doing an exhaustive check that inserting
+                        // await(s) will actually be a completely valid binary expression.
+                        var closeEnoughKind_1 = 296 /* NumberLike */ | 2112 /* BigIntLike */ | 132 /* StringLike */ | 3 /* AnyOrUnknown */;
+                        reportOperatorError(function (awaitedLeft, awaitedRight) {
+                            return isTypeAssignableToKind(awaitedLeft, closeEnoughKind_1) &&
+                                isTypeAssignableToKind(awaitedRight, closeEnoughKind_1);
+                        });
                         return anyType;
                     }
-                    if (operator === 60 /* PlusEqualsToken */) {
+                    if (operator === 61 /* PlusEqualsToken */) {
                         checkAssignmentOperator(resultType);
                     }
                     return resultType;
@@ -52353,29 +54098,20 @@ var ts;
                     if (checkForDisallowedESSymbolOperand(operator)) {
                         leftType = getBaseTypeOfLiteralType(checkNonNullType(leftType, left));
                         rightType = getBaseTypeOfLiteralType(checkNonNullType(rightType, right));
-                        if (!(isTypeComparableTo(leftType, rightType) || isTypeComparableTo(rightType, leftType) ||
-                            (isTypeAssignableTo(leftType, numberOrBigIntType) && isTypeAssignableTo(rightType, numberOrBigIntType)))) {
-                            reportOperatorError();
-                        }
+                        reportOperatorErrorUnless(function (left, right) {
+                            return isTypeComparableTo(left, right) || isTypeComparableTo(right, left) || (isTypeAssignableTo(left, numberOrBigIntType) && isTypeAssignableTo(right, numberOrBigIntType));
+                        });
                     }
                     return booleanType;
                 case 33 /* EqualsEqualsToken */:
                 case 34 /* ExclamationEqualsToken */:
                 case 35 /* EqualsEqualsEqualsToken */:
                 case 36 /* ExclamationEqualsEqualsToken */:
-                    var leftIsLiteral = isLiteralType(leftType);
-                    var rightIsLiteral = isLiteralType(rightType);
-                    if (!leftIsLiteral || !rightIsLiteral) {
-                        leftType = leftIsLiteral ? getBaseTypeOfLiteralType(leftType) : leftType;
-                        rightType = rightIsLiteral ? getBaseTypeOfLiteralType(rightType) : rightType;
-                    }
-                    if (!isTypeEqualityComparableTo(leftType, rightType) && !isTypeEqualityComparableTo(rightType, leftType)) {
-                        reportOperatorError();
-                    }
+                    reportOperatorErrorUnless(function (left, right) { return isTypeEqualityComparableTo(left, right) || isTypeEqualityComparableTo(right, left); });
                     return booleanType;
-                case 94 /* InstanceOfKeyword */:
+                case 95 /* InstanceOfKeyword */:
                     return checkInstanceOfExpression(left, right, leftType, rightType);
-                case 93 /* InKeyword */:
+                case 94 /* InKeyword */:
                     return checkInExpression(left, right, leftType, rightType);
                 case 54 /* AmpersandAmpersandToken */:
                     return getTypeFacts(leftType) & 4194304 /* Truthy */ ?
@@ -52385,7 +54121,7 @@ var ts;
                     return getTypeFacts(leftType) & 8388608 /* Falsy */ ?
                         getUnionType([removeDefinitelyFalsyTypes(leftType), rightType], 2 /* Subtype */) :
                         leftType;
-                case 59 /* EqualsToken */:
+                case 60 /* EqualsToken */:
                     var declKind = ts.isBinaryExpression(left.parent) ? ts.getAssignmentDeclarationKind(left.parent) : 0 /* None */;
                     checkAssignmentDeclaration(declKind, rightType);
                     if (isAssignmentDeclaration(declKind)) {
@@ -52429,7 +54165,7 @@ var ts;
                 }
             }
             function isEvalNode(node) {
-                return node.kind === 72 /* Identifier */ && node.escapedText === "eval";
+                return node.kind === 73 /* Identifier */ && node.escapedText === "eval";
             }
             // Return true if there was no error, false if there was an error.
             function checkForDisallowedESSymbolOperand(operator) {
@@ -52445,13 +54181,13 @@ var ts;
             function getSuggestedBooleanOperator(operator) {
                 switch (operator) {
                     case 50 /* BarToken */:
-                    case 70 /* BarEqualsToken */:
+                    case 71 /* BarEqualsToken */:
                         return 55 /* BarBarToken */;
                     case 51 /* CaretToken */:
-                    case 71 /* CaretEqualsToken */:
+                    case 72 /* CaretEqualsToken */:
                         return 36 /* ExclamationEqualsEqualsToken */;
                     case 49 /* AmpersandToken */:
-                    case 69 /* AmpersandEqualsToken */:
+                    case 70 /* AmpersandEqualsToken */:
                         return 54 /* AmpersandAmpersandToken */;
                     default:
                         return undefined;
@@ -52489,22 +54225,44 @@ var ts;
                         return false;
                 }
             }
-            function reportOperatorError() {
-                var leftStr = typeToString(leftType);
-                var rightStr = typeToString(rightType);
+            /**
+             * Returns true if an error is reported
+             */
+            function reportOperatorErrorUnless(typesAreCompatible) {
+                if (!typesAreCompatible(leftType, rightType)) {
+                    reportOperatorError(typesAreCompatible);
+                    return true;
+                }
+                return false;
+            }
+            function reportOperatorError(awaitedTypesAreCompatible) {
+                var wouldWorkWithAwait = false;
                 var errNode = errorNode || operatorToken;
-                if (!tryGiveBetterPrimaryError(errNode, leftStr, rightStr)) {
-                    error(errNode, ts.Diagnostics.Operator_0_cannot_be_applied_to_types_1_and_2, ts.tokenToString(operatorToken.kind), leftStr, rightStr);
+                var _a = getTypeNamesForErrorDisplay(leftType, rightType), leftStr = _a[0], rightStr = _a[1];
+                if (awaitedTypesAreCompatible) {
+                    var awaitedLeftType = getAwaitedType(leftType);
+                    var awaitedRightType = getAwaitedType(rightType);
+                    wouldWorkWithAwait = !(awaitedLeftType === leftType && awaitedRightType === rightType)
+                        && !!(awaitedLeftType && awaitedRightType)
+                        && awaitedTypesAreCompatible(awaitedLeftType, awaitedRightType);
+                }
+                if (!tryGiveBetterPrimaryError(errNode, wouldWorkWithAwait, leftStr, rightStr)) {
+                    errorAndMaybeSuggestAwait(errNode, wouldWorkWithAwait, ts.Diagnostics.Operator_0_cannot_be_applied_to_types_1_and_2, ts.tokenToString(operatorToken.kind), leftStr, rightStr);
                 }
             }
-            function tryGiveBetterPrimaryError(errNode, leftStr, rightStr) {
+            function tryGiveBetterPrimaryError(errNode, maybeMissingAwait, leftStr, rightStr) {
+                var typeName;
                 switch (operatorToken.kind) {
                     case 35 /* EqualsEqualsEqualsToken */:
                     case 33 /* EqualsEqualsToken */:
-                        return error(errNode, ts.Diagnostics.This_condition_will_always_return_0_since_the_types_1_and_2_have_no_overlap, "false", leftStr, rightStr);
+                        typeName = "false";
+                        break;
                     case 36 /* ExclamationEqualsEqualsToken */:
                     case 34 /* ExclamationEqualsToken */:
-                        return error(errNode, ts.Diagnostics.This_condition_will_always_return_0_since_the_types_1_and_2_have_no_overlap, "true", leftStr, rightStr);
+                        typeName = "true";
+                }
+                if (typeName) {
+                    return errorAndMaybeSuggestAwait(errNode, maybeMissingAwait, ts.Diagnostics.This_condition_will_always_return_0_since_the_types_1_and_2_have_no_overlap, typeName, leftStr, rightStr);
                 }
                 return undefined;
             }
@@ -52542,30 +54300,45 @@ var ts;
                 // If the user's code is syntactically correct, the func should always have a star. After all, we are in a yield context.
                 return anyType;
             }
+            var isAsync = (functionFlags & 2 /* Async */) !== 0;
             if (node.asteriskToken) {
                 // Async generator functions prior to ESNext require the __await, __asyncDelegator,
                 // and __asyncValues helpers
-                if ((functionFlags & 3 /* AsyncGenerator */) === 3 /* AsyncGenerator */ &&
-                    languageVersion < 7 /* ESNext */) {
-                    checkExternalEmitHelpers(node, 26624 /* AsyncDelegatorIncludes */);
+                if (isAsync && languageVersion < 99 /* ESNext */) {
+                    checkExternalEmitHelpers(node, 53248 /* AsyncDelegatorIncludes */);
                 }
                 // Generator functions prior to ES2015 require the __values helper
-                if ((functionFlags & 3 /* AsyncGenerator */) === 1 /* Generator */ &&
-                    languageVersion < 2 /* ES2015 */ && compilerOptions.downlevelIteration) {
+                if (!isAsync && languageVersion < 2 /* ES2015 */ && compilerOptions.downlevelIteration) {
                     checkExternalEmitHelpers(node, 256 /* Values */);
                 }
             }
-            var isAsync = (functionFlags & 2 /* Async */) !== 0;
-            var yieldedType = getYieldedTypeOfYieldExpression(node, isAsync); // TODO: GH#18217
             // There is no point in doing an assignability check if the function
             // has no explicit return type because the return type is directly computed
             // from the yield expressions.
             var returnType = getReturnTypeFromAnnotation(func);
-            if (returnType) {
-                var signatureElementType = getIteratedTypeOfGenerator(returnType, isAsync) || anyType;
-                checkTypeAssignableToAndOptionallyElaborate(yieldedType, signatureElementType, node.expression || node, node.expression);
+            var iterationTypes = returnType && getIterationTypesOfGeneratorFunctionReturnType(returnType, isAsync);
+            var signatureYieldType = iterationTypes && iterationTypes.yieldType || anyType;
+            var signatureNextType = iterationTypes && iterationTypes.nextType || anyType;
+            var resolvedSignatureNextType = isAsync ? getAwaitedType(signatureNextType) || anyType : signatureNextType;
+            var yieldExpressionType = node.expression ? checkExpression(node.expression) : undefinedWideningType;
+            var yieldedType = getYieldedTypeOfYieldExpression(node, yieldExpressionType, resolvedSignatureNextType, isAsync);
+            if (returnType && yieldedType) {
+                checkTypeAssignableToAndOptionallyElaborate(yieldedType, signatureYieldType, node.expression || node, node.expression);
+            }
+            if (node.asteriskToken) {
+                var use = isAsync ? 19 /* AsyncYieldStar */ : 17 /* YieldStar */;
+                return getIterationTypeOfIterable(use, 1 /* Return */, yieldExpressionType, node.expression)
+                    || anyType;
+            }
+            else if (returnType) {
+                return getIterationTypeOfGeneratorFunctionReturnType(2 /* Next */, returnType, isAsync)
+                    || anyType;
+            }
+            var contextualReturnType = getContextualReturnType(func);
+            if (contextualReturnType) {
+                return getIterationTypeOfGeneratorFunctionReturnType(2 /* Next */, contextualReturnType, isAsync)
+                    || anyType;
             }
-            // Both yield and yield* expressions have type 'any'
             return anyType;
         }
         function checkConditionalExpression(node, checkMode) {
@@ -52588,25 +54361,25 @@ var ts;
             return stringType;
         }
         function getContextNode(node) {
-            if (node.kind === 268 /* JsxAttributes */ && !ts.isJsxSelfClosingElement(node.parent)) {
+            if (node.kind === 269 /* JsxAttributes */ && !ts.isJsxSelfClosingElement(node.parent)) {
                 return node.parent.parent; // Needs to be the root JsxElement, so it encompasses the attributes _and_ the children (which are essentially part of the attributes)
             }
             return node;
         }
-        function checkExpressionWithContextualType(node, contextualType, contextualMapper, checkMode) {
+        function checkExpressionWithContextualType(node, contextualType, inferenceContext, checkMode) {
             var context = getContextNode(node);
             var saveContextualType = context.contextualType;
-            var saveContextualMapper = context.contextualMapper;
+            var saveInferenceContext = context.inferenceContext;
             context.contextualType = contextualType;
-            context.contextualMapper = contextualMapper;
-            var type = checkExpression(node, checkMode | 1 /* Contextual */ | (contextualMapper ? 2 /* Inferential */ : 0));
+            context.inferenceContext = inferenceContext;
+            var type = checkExpression(node, checkMode | 1 /* Contextual */ | (inferenceContext ? 2 /* Inferential */ : 0));
             // We strip literal freshness when an appropriate contextual type is present such that contextually typed
             // literals always preserve their literal types (otherwise they might widen during type inference). An alternative
             // here would be to not mark contextually typed literals as fresh in the first place.
             var result = maybeTypeOfKind(type, 2944 /* Literal */) && isLiteralOfContextualType(type, instantiateContextualType(contextualType, node)) ?
                 getRegularTypeOfLiteralType(type) : type;
             context.contextualType = saveContextualType;
-            context.contextualMapper = saveContextualMapper;
+            context.inferenceContext = saveInferenceContext;
             return result;
         }
         function checkExpressionCached(node, checkMode) {
@@ -52627,15 +54400,18 @@ var ts;
         }
         function isTypeAssertion(node) {
             node = ts.skipParentheses(node);
-            return node.kind === 194 /* TypeAssertionExpression */ || node.kind === 212 /* AsExpression */;
+            return node.kind === 195 /* TypeAssertionExpression */ || node.kind === 213 /* AsExpression */;
         }
         function checkDeclarationInitializer(declaration) {
             var initializer = ts.getEffectiveInitializer(declaration);
             var type = getTypeOfExpression(initializer, /*cache*/ true);
+            var padded = ts.isParameter(declaration) && declaration.name.kind === 186 /* ArrayBindingPattern */ &&
+                isTupleType(type) && !type.target.hasRestElement && getTypeReferenceArity(type) < declaration.name.elements.length ?
+                padTupleType(type, declaration.name) : type;
             var widened = ts.getCombinedNodeFlags(declaration) & 2 /* Const */ ||
                 ts.isDeclarationReadonly(declaration) ||
                 isTypeAssertion(initializer) ||
-                isLiteralOfContextualType(type, getContextualType(initializer)) ? type : getWidenedLiteralType(type);
+                isLiteralOfContextualType(padded, getContextualType(initializer)) ? padded : getWidenedLiteralType(padded);
             if (ts.isInJSFile(declaration)) {
                 if (widened.flags & 98304 /* Nullable */) {
                     reportImplicitAny(declaration, anyType);
@@ -52648,6 +54424,21 @@ var ts;
             }
             return widened;
         }
+        function padTupleType(type, pattern) {
+            var patternElements = pattern.elements;
+            var arity = getTypeReferenceArity(type);
+            var elementTypes = arity ? type.typeArguments.slice() : [];
+            for (var i = arity; i < patternElements.length; i++) {
+                var e = patternElements[i];
+                if (i < patternElements.length - 1 || !(e.kind === 187 /* BindingElement */ && e.dotDotDotToken)) {
+                    elementTypes.push(!ts.isOmittedExpression(e) && hasDefaultValue(e) ? getTypeFromBindingElement(e, /*includePatternInType*/ false, /*reportErrors*/ false) : anyType);
+                    if (!ts.isOmittedExpression(e) && !hasDefaultValue(e)) {
+                        reportImplicitAny(e, anyType);
+                    }
+                }
+            }
+            return createTupleType(elementTypes, type.target.minLength, /*hasRestElement*/ false, type.target.readonly);
+        }
         function isLiteralOfContextualType(candidateType, contextualType) {
             if (contextualType) {
                 if (contextualType.flags & 3145728 /* UnionOrIntersection */) {
@@ -52658,7 +54449,7 @@ var ts;
                     // If the contextual type is a type variable constrained to a primitive type, consider
                     // this a literal context for literals of that primitive type. For example, given a
                     // type parameter 'T extends string', infer string literal types for T.
-                    var constraint = getBaseConstraintOfType(contextualType) || emptyObjectType;
+                    var constraint = getBaseConstraintOfType(contextualType) || unknownType;
                     return maybeTypeOfKind(constraint, 4 /* String */) && maybeTypeOfKind(candidateType, 128 /* StringLiteral */) ||
                         maybeTypeOfKind(constraint, 8 /* Number */) && maybeTypeOfKind(candidateType, 256 /* NumberLiteral */) ||
                         maybeTypeOfKind(constraint, 64 /* BigInt */) && maybeTypeOfKind(candidateType, 2048 /* BigIntLiteral */) ||
@@ -52691,7 +54482,7 @@ var ts;
             // Do not use hasDynamicName here, because that returns false for well known symbols.
             // We want to perform checkComputedPropertyName for all computed properties, including
             // well known symbols.
-            if (node.name.kind === 149 /* ComputedPropertyName */) {
+            if (node.name.kind === 150 /* ComputedPropertyName */) {
                 checkComputedPropertyName(node.name);
             }
             return checkExpressionForMutableLocation(node.initializer, checkMode);
@@ -52702,7 +54493,7 @@ var ts;
             // Do not use hasDynamicName here, because that returns false for well known symbols.
             // We want to perform checkComputedPropertyName for all computed properties, including
             // well known symbols.
-            if (node.name.kind === 149 /* ComputedPropertyName */) {
+            if (node.name.kind === 150 /* ComputedPropertyName */) {
                 checkComputedPropertyName(node.name);
             }
             var uninstantiatedType = checkFunctionExpressionOrObjectLiteralMethod(node, checkMode);
@@ -52710,42 +54501,52 @@ var ts;
         }
         function instantiateTypeWithSingleGenericCallSignature(node, type, checkMode) {
             if (checkMode && checkMode & (2 /* Inferential */ | 8 /* SkipGenericFunctions */)) {
-                var signature = getSingleCallSignature(type);
+                var callSignature = getSingleSignature(type, 0 /* Call */, /*allowMembers*/ true);
+                var constructSignature = getSingleSignature(type, 1 /* Construct */, /*allowMembers*/ true);
+                var signature = callSignature || constructSignature;
                 if (signature && signature.typeParameters) {
-                    if (checkMode & 8 /* SkipGenericFunctions */) {
-                        skippedGenericFunction(node, checkMode);
-                        return anyFunctionType;
-                    }
                     var contextualType = getApparentTypeOfContextualType(node);
-                    if (contextualType) {
-                        var contextualSignature = getSingleCallSignature(getNonNullableType(contextualType));
+                    if (contextualType && !isMixinConstructorType(contextualType)) {
+                        var contextualSignature = getSingleSignature(getNonNullableType(contextualType), callSignature ? 0 /* Call */ : 1 /* Construct */, /*allowMembers*/ false);
                         if (contextualSignature && !contextualSignature.typeParameters) {
-                            var context = getContextualMapper(node);
+                            if (checkMode & 8 /* SkipGenericFunctions */) {
+                                skippedGenericFunction(node, checkMode);
+                                return anyFunctionType;
+                            }
+                            var context = getInferenceContext(node);
                             // We have an expression that is an argument of a generic function for which we are performing
                             // type argument inference. The expression is of a function type with a single generic call
                             // signature and a contextual function type with a single non-generic call signature. Now check
                             // if the outer function returns a function type with a single non-generic call signature and
                             // if some of the outer function type parameters have no inferences so far. If so, we can
                             // potentially add inferred type parameters to the outer function return type.
-                            var returnSignature = context.signature && getSingleCallSignature(getReturnTypeOfSignature(context.signature));
+                            var returnType = context.signature && getReturnTypeOfSignature(context.signature);
+                            var returnSignature = returnType && getSingleCallOrConstructSignature(returnType);
                             if (returnSignature && !returnSignature.typeParameters && !ts.every(context.inferences, hasInferenceCandidates)) {
-                                // Instantiate the expression type with its own type parameters as type arguments. This
-                                // ensures that the type parameters are not erased to type any during type inference such
-                                // that they can be inferred as actual types.
+                                // Instantiate the signature with its own type parameters as type arguments, possibly
+                                // renaming the type parameters to ensure they have unique names.
                                 var uniqueTypeParameters = getUniqueTypeParameters(context, signature.typeParameters);
-                                var strippedType = getOrCreateTypeFromSignature(getSignatureInstantiationWithoutFillingInTypeArguments(signature, uniqueTypeParameters));
-                                // Infer from the stripped expression type to the contextual type starting with an empty
-                                // set of inference candidates.
-                                var inferences = ts.map(context.typeParameters, createInferenceInfo);
-                                inferTypes(inferences, strippedType, contextualType);
-                                // If we produced some inference candidates and if the type parameters for which we produced
-                                // candidates do not already have existing inferences, we adopt the new inference candidates and
-                                // add the type parameters of the expression type to the set of inferred type parameters for
-                                // the outer function return type.
-                                if (ts.some(inferences, hasInferenceCandidates) && !hasOverlappingInferences(context.inferences, inferences)) {
-                                    mergeInferences(context.inferences, inferences);
-                                    context.inferredTypeParameters = ts.concatenate(context.inferredTypeParameters, uniqueTypeParameters);
-                                    return strippedType;
+                                var instantiatedSignature = getSignatureInstantiationWithoutFillingInTypeArguments(signature, uniqueTypeParameters);
+                                // Infer from the parameters of the instantiated signature to the parameters of the
+                                // contextual signature starting with an empty set of inference candidates.
+                                var inferences_3 = ts.map(context.inferences, function (info) { return createInferenceInfo(info.typeParameter); });
+                                applyToParameterTypes(instantiatedSignature, contextualSignature, function (source, target) {
+                                    inferTypes(inferences_3, source, target, /*priority*/ 0, /*contravariant*/ true);
+                                });
+                                if (ts.some(inferences_3, hasInferenceCandidates)) {
+                                    // We have inference candidates, indicating that one or more type parameters are referenced
+                                    // in the parameter types of the contextual signature. Now also infer from the return type.
+                                    applyToReturnTypes(instantiatedSignature, contextualSignature, function (source, target) {
+                                        inferTypes(inferences_3, source, target);
+                                    });
+                                    // If the type parameters for which we produced candidates do not have any inferences yet,
+                                    // we adopt the new inference candidates and add the type parameters of the expression type
+                                    // to the set of inferred type parameters for the outer function return type.
+                                    if (!hasOverlappingInferences(context.inferences, inferences_3)) {
+                                        mergeInferences(context.inferences, inferences_3);
+                                        context.inferredTypeParameters = ts.concatenate(context.inferredTypeParameters, uniqueTypeParameters);
+                                        return getOrCreateTypeFromSignature(instantiatedSignature);
+                                    }
                                 }
                             }
                             return getOrCreateTypeFromSignature(instantiateSignatureInContextOf(signature, contextualSignature, context));
@@ -52759,8 +54560,8 @@ var ts;
             if (checkMode & 2 /* Inferential */) {
                 // We have skipped a generic function during inferential typing. Obtain the inference context and
                 // indicate this has occurred such that we know a second pass of inference is be needed.
-                var context = getContextualMapper(node);
-                context.flags |= 8 /* SkippedGenericFunction */;
+                var context = getInferenceContext(node);
+                context.flags |= 4 /* SkippedGenericFunction */;
             }
         }
         function hasInferenceCandidates(info) {
@@ -52835,7 +54636,7 @@ var ts;
             var expr = ts.skipParentheses(node);
             // Optimize for the common case of a call to a function with a single non-generic call
             // signature where we can just fetch the return type without checking the arguments.
-            if (expr.kind === 191 /* CallExpression */ && expr.expression.kind !== 98 /* SuperKeyword */ && !ts.isRequireCall(expr, /*checkArgumentIsStringLiteralLike*/ true) && !isSymbolOrSymbolForCall(expr)) {
+            if (expr.kind === 192 /* CallExpression */ && expr.expression.kind !== 99 /* SuperKeyword */ && !ts.isRequireCall(expr, /*checkArgumentIsStringLiteralLike*/ true) && !isSymbolOrSymbolForCall(expr)) {
                 var funcType = checkNonNullExpression(expr.expression);
                 var signature = getSingleCallSignature(funcType);
                 if (signature && !signature.typeParameters) {
@@ -52868,16 +54669,10 @@ var ts;
             node.contextualType = saveContextualType;
             return type;
         }
-        // Checks an expression and returns its type. The contextualMapper parameter serves two purposes: When
-        // contextualMapper is not undefined and not equal to the identityMapper function object it indicates that the
-        // expression is being inferentially typed (section 4.15.2 in spec) and provides the type mapper to use in
-        // conjunction with the generic contextual type. When contextualMapper is equal to the identityMapper function
-        // object, it serves as an indicator that all contained function and arrow expressions should be considered to
-        // have the wildcard function type; this form of type check is used during overload resolution to exclude
-        // contextually typed function and arrow expressions in the initial phase.
         function checkExpression(node, checkMode, forceTuple) {
             var saveCurrentNode = currentNode;
             currentNode = node;
+            instantiationCount = 0;
             var uninstantiatedType = checkExpressionWorker(node, checkMode, forceTuple);
             var type = instantiateTypeWithSingleGenericCallSignature(node, uninstantiatedType, checkMode);
             if (isConstEnumObjectType(type)) {
@@ -52891,10 +54686,10 @@ var ts;
             // - 'left' in property access
             // - 'object' in indexed access
             // - target in rhs of import statement
-            var ok = (node.parent.kind === 189 /* PropertyAccessExpression */ && node.parent.expression === node) ||
-                (node.parent.kind === 190 /* ElementAccessExpression */ && node.parent.expression === node) ||
-                ((node.kind === 72 /* Identifier */ || node.kind === 148 /* QualifiedName */) && isInRightSideOfImportOrExportAssignment(node) ||
-                    (node.parent.kind === 167 /* TypeQuery */ && node.parent.exprName === node));
+            var ok = (node.parent.kind === 190 /* PropertyAccessExpression */ && node.parent.expression === node) ||
+                (node.parent.kind === 191 /* ElementAccessExpression */ && node.parent.expression === node) ||
+                ((node.kind === 73 /* Identifier */ || node.kind === 149 /* QualifiedName */) && isInRightSideOfImportOrExportAssignment(node) ||
+                    (node.parent.kind === 168 /* TypeQuery */ && node.parent.exprName === node));
             if (!ok) {
                 error(node, ts.Diagnostics.const_enums_can_only_be_used_in_property_or_index_access_expressions_or_the_right_hand_side_of_an_import_declaration_or_export_assignment_or_type_query);
             }
@@ -52915,13 +54710,13 @@ var ts;
         }
         function checkExpressionWorker(node, checkMode, forceTuple) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return checkIdentifier(node);
-                case 100 /* ThisKeyword */:
+                case 101 /* ThisKeyword */:
                     return checkThisExpression(node);
-                case 98 /* SuperKeyword */:
+                case 99 /* SuperKeyword */:
                     return checkSuperExpression(node);
-                case 96 /* NullKeyword */:
+                case 97 /* NullKeyword */:
                     return nullWideningType;
                 case 14 /* NoSubstitutionTemplateLiteral */:
                 case 10 /* StringLiteral */:
@@ -52932,82 +54727,82 @@ var ts;
                 case 9 /* BigIntLiteral */:
                     checkGrammarBigIntLiteral(node);
                     return getFreshTypeOfLiteralType(getBigIntLiteralType(node));
-                case 102 /* TrueKeyword */:
+                case 103 /* TrueKeyword */:
                     return trueType;
-                case 87 /* FalseKeyword */:
+                case 88 /* FalseKeyword */:
                     return falseType;
-                case 206 /* TemplateExpression */:
+                case 207 /* TemplateExpression */:
                     return checkTemplateExpression(node);
                 case 13 /* RegularExpressionLiteral */:
                     return globalRegExpType;
-                case 187 /* ArrayLiteralExpression */:
+                case 188 /* ArrayLiteralExpression */:
                     return checkArrayLiteral(node, checkMode, forceTuple);
-                case 188 /* ObjectLiteralExpression */:
+                case 189 /* ObjectLiteralExpression */:
                     return checkObjectLiteral(node, checkMode);
-                case 189 /* PropertyAccessExpression */:
+                case 190 /* PropertyAccessExpression */:
                     return checkPropertyAccessExpression(node);
-                case 148 /* QualifiedName */:
+                case 149 /* QualifiedName */:
                     return checkQualifiedName(node);
-                case 190 /* ElementAccessExpression */:
+                case 191 /* ElementAccessExpression */:
                     return checkIndexedAccess(node);
-                case 191 /* CallExpression */:
-                    if (node.expression.kind === 92 /* ImportKeyword */) {
+                case 192 /* CallExpression */:
+                    if (node.expression.kind === 93 /* ImportKeyword */) {
                         return checkImportCallExpression(node);
                     }
                 /* falls through */
-                case 192 /* NewExpression */:
+                case 193 /* NewExpression */:
                     return checkCallExpression(node, checkMode);
-                case 193 /* TaggedTemplateExpression */:
+                case 194 /* TaggedTemplateExpression */:
                     return checkTaggedTemplateExpression(node);
-                case 195 /* ParenthesizedExpression */:
+                case 196 /* ParenthesizedExpression */:
                     return checkParenthesizedExpression(node, checkMode);
-                case 209 /* ClassExpression */:
+                case 210 /* ClassExpression */:
                     return checkClassExpression(node);
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
                     return checkFunctionExpressionOrObjectLiteralMethod(node, checkMode);
-                case 199 /* TypeOfExpression */:
+                case 200 /* TypeOfExpression */:
                     return checkTypeOfExpression(node);
-                case 194 /* TypeAssertionExpression */:
-                case 212 /* AsExpression */:
+                case 195 /* TypeAssertionExpression */:
+                case 213 /* AsExpression */:
                     return checkAssertion(node);
-                case 213 /* NonNullExpression */:
+                case 214 /* NonNullExpression */:
                     return checkNonNullAssertion(node);
-                case 214 /* MetaProperty */:
+                case 215 /* MetaProperty */:
                     return checkMetaProperty(node);
-                case 198 /* DeleteExpression */:
+                case 199 /* DeleteExpression */:
                     return checkDeleteExpression(node);
-                case 200 /* VoidExpression */:
+                case 201 /* VoidExpression */:
                     return checkVoidExpression(node);
-                case 201 /* AwaitExpression */:
+                case 202 /* AwaitExpression */:
                     return checkAwaitExpression(node);
-                case 202 /* PrefixUnaryExpression */:
+                case 203 /* PrefixUnaryExpression */:
                     return checkPrefixUnaryExpression(node);
-                case 203 /* PostfixUnaryExpression */:
+                case 204 /* PostfixUnaryExpression */:
                     return checkPostfixUnaryExpression(node);
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return checkBinaryExpression(node, checkMode);
-                case 205 /* ConditionalExpression */:
+                case 206 /* ConditionalExpression */:
                     return checkConditionalExpression(node, checkMode);
-                case 208 /* SpreadElement */:
+                case 209 /* SpreadElement */:
                     return checkSpreadExpression(node, checkMode);
-                case 210 /* OmittedExpression */:
+                case 211 /* OmittedExpression */:
                     return undefinedWideningType;
-                case 207 /* YieldExpression */:
+                case 208 /* YieldExpression */:
                     return checkYieldExpression(node);
-                case 215 /* SyntheticExpression */:
+                case 216 /* SyntheticExpression */:
                     return node.type;
-                case 270 /* JsxExpression */:
+                case 271 /* JsxExpression */:
                     return checkJsxExpression(node, checkMode);
-                case 260 /* JsxElement */:
+                case 261 /* JsxElement */:
                     return checkJsxElement(node, checkMode);
-                case 261 /* JsxSelfClosingElement */:
+                case 262 /* JsxSelfClosingElement */:
                     return checkJsxSelfClosingElement(node, checkMode);
-                case 264 /* JsxFragment */:
+                case 265 /* JsxFragment */:
                     return checkJsxFragment(node);
-                case 268 /* JsxAttributes */:
+                case 269 /* JsxAttributes */:
                     return checkJsxAttributes(node, checkMode);
-                case 262 /* JsxOpeningElement */:
+                case 263 /* JsxOpeningElement */:
                     ts.Debug.fail("Shouldn't ever directly check a JsxOpeningElement");
             }
             return errorType;
@@ -53029,7 +54824,7 @@ var ts;
             var constraintType = getConstraintOfTypeParameter(typeParameter);
             var defaultType = getDefaultFromTypeParameter(typeParameter);
             if (constraintType && defaultType) {
-                checkTypeAssignableTo(defaultType, getTypeWithThisArgument(constraintType, defaultType), node.default, ts.Diagnostics.Type_0_does_not_satisfy_the_constraint_1);
+                checkTypeAssignableTo(defaultType, getTypeWithThisArgument(instantiateType(constraintType, makeUnaryTypeMapper(typeParameter, defaultType)), defaultType), node.default, ts.Diagnostics.Type_0_does_not_satisfy_the_constraint_1);
             }
             if (produceDiagnostics) {
                 checkTypeNameIsReserved(node.name, ts.Diagnostics.Type_parameter_name_cannot_be_0);
@@ -53044,7 +54839,7 @@ var ts;
             checkVariableLikeDeclaration(node);
             var func = ts.getContainingFunction(node);
             if (ts.hasModifier(node, 92 /* ParameterPropertyModifier */)) {
-                if (!(func.kind === 157 /* Constructor */ && ts.nodeIsPresent(func.body))) {
+                if (!(func.kind === 158 /* Constructor */ && ts.nodeIsPresent(func.body))) {
                     error(node, ts.Diagnostics.A_parameter_property_is_only_allowed_in_a_constructor_implementation);
                 }
             }
@@ -53055,10 +54850,10 @@ var ts;
                 if (func.parameters.indexOf(node) !== 0) {
                     error(node, ts.Diagnostics.A_0_parameter_must_be_the_first_parameter, node.name.escapedText);
                 }
-                if (func.kind === 157 /* Constructor */ || func.kind === 161 /* ConstructSignature */ || func.kind === 166 /* ConstructorType */) {
+                if (func.kind === 158 /* Constructor */ || func.kind === 162 /* ConstructSignature */ || func.kind === 167 /* ConstructorType */) {
                     error(node, ts.Diagnostics.A_constructor_cannot_have_a_this_parameter);
                 }
-                if (func.kind === 197 /* ArrowFunction */) {
+                if (func.kind === 198 /* ArrowFunction */) {
                     error(node, ts.Diagnostics.An_arrow_function_cannot_have_a_this_parameter);
                 }
             }
@@ -53075,7 +54870,8 @@ var ts;
                 error(node, ts.Diagnostics.A_type_predicate_is_only_allowed_in_return_type_position_for_functions_and_methods);
                 return;
             }
-            var typePredicate = getTypePredicateOfSignature(getSignatureFromDeclaration(parent));
+            var signature = getSignatureFromDeclaration(parent);
+            var typePredicate = getTypePredicateOfSignature(signature);
             if (!typePredicate) {
                 return;
             }
@@ -53086,12 +54882,12 @@ var ts;
             }
             else {
                 if (typePredicate.parameterIndex >= 0) {
-                    if (parent.parameters[typePredicate.parameterIndex].dotDotDotToken) {
+                    if (signature.hasRestParameter && typePredicate.parameterIndex === signature.parameters.length - 1) {
                         error(parameterName, ts.Diagnostics.A_type_predicate_cannot_reference_a_rest_parameter);
                     }
                     else {
                         var leadingError = function () { return ts.chainDiagnosticMessages(/*details*/ undefined, ts.Diagnostics.A_type_predicate_s_type_must_be_assignable_to_its_parameter_s_type); };
-                        checkTypeAssignableTo(typePredicate.type, getTypeOfNode(parent.parameters[typePredicate.parameterIndex]), node.type, 
+                        checkTypeAssignableTo(typePredicate.type, getTypeOfSymbol(signature.parameters[typePredicate.parameterIndex]), node.type, 
                         /*headMessage*/ undefined, leadingError);
                     }
                 }
@@ -53113,13 +54909,13 @@ var ts;
         }
         function getTypePredicateParent(node) {
             switch (node.parent.kind) {
-                case 197 /* ArrowFunction */:
-                case 160 /* CallSignature */:
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
-                case 165 /* FunctionType */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
+                case 198 /* ArrowFunction */:
+                case 161 /* CallSignature */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 166 /* FunctionType */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
                     var parent = node.parent;
                     if (node === parent.type) {
                         return parent;
@@ -53133,11 +54929,11 @@ var ts;
                     continue;
                 }
                 var name = element.name;
-                if (name.kind === 72 /* Identifier */ && name.escapedText === predicateVariableName) {
+                if (name.kind === 73 /* Identifier */ && name.escapedText === predicateVariableName) {
                     error(predicateVariableNode, ts.Diagnostics.A_type_predicate_cannot_reference_element_0_in_a_binding_pattern, predicateVariableName);
                     return true;
                 }
-                else if (name.kind === 185 /* ArrayBindingPattern */ || name.kind === 184 /* ObjectBindingPattern */) {
+                else if (name.kind === 186 /* ArrayBindingPattern */ || name.kind === 185 /* ObjectBindingPattern */) {
                     if (checkIfTypePredicateVariableIsDeclaredInBindingPattern(name, predicateVariableNode, predicateVariableName)) {
                         return true;
                     }
@@ -53146,20 +54942,20 @@ var ts;
         }
         function checkSignatureDeclaration(node) {
             // Grammar checking
-            if (node.kind === 162 /* IndexSignature */) {
+            if (node.kind === 163 /* IndexSignature */) {
                 checkGrammarIndexSignature(node);
             }
             // TODO (yuisu): Remove this check in else-if when SyntaxKind.Construct is moved and ambient context is handled
-            else if (node.kind === 165 /* FunctionType */ || node.kind === 239 /* FunctionDeclaration */ || node.kind === 166 /* ConstructorType */ ||
-                node.kind === 160 /* CallSignature */ || node.kind === 157 /* Constructor */ ||
-                node.kind === 161 /* ConstructSignature */) {
+            else if (node.kind === 166 /* FunctionType */ || node.kind === 240 /* FunctionDeclaration */ || node.kind === 167 /* ConstructorType */ ||
+                node.kind === 161 /* CallSignature */ || node.kind === 158 /* Constructor */ ||
+                node.kind === 162 /* ConstructSignature */) {
                 checkGrammarFunctionLikeDeclaration(node);
             }
             var functionFlags = ts.getFunctionFlags(node);
             if (!(functionFlags & 4 /* Invalid */)) {
                 // Async generators prior to ESNext require the __await and __asyncGenerator helpers
-                if ((functionFlags & 3 /* AsyncGenerator */) === 3 /* AsyncGenerator */ && languageVersion < 7 /* ESNext */) {
-                    checkExternalEmitHelpers(node, 6144 /* AsyncGeneratorIncludes */);
+                if ((functionFlags & 3 /* AsyncGenerator */) === 3 /* AsyncGenerator */ && languageVersion < 99 /* ESNext */) {
+                    checkExternalEmitHelpers(node, 12288 /* AsyncGeneratorIncludes */);
                 }
                 // Async functions prior to ES2017 require the __awaiter helper
                 if ((functionFlags & 3 /* AsyncGenerator */) === 2 /* Async */ && languageVersion < 4 /* ES2017 */) {
@@ -53182,10 +54978,10 @@ var ts;
                 var returnTypeNode = ts.getEffectiveReturnTypeNode(node);
                 if (noImplicitAny && !returnTypeNode) {
                     switch (node.kind) {
-                        case 161 /* ConstructSignature */:
+                        case 162 /* ConstructSignature */:
                             error(node, ts.Diagnostics.Construct_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type);
                             break;
-                        case 160 /* CallSignature */:
+                        case 161 /* CallSignature */:
                             error(node, ts.Diagnostics.Call_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type);
                             break;
                     }
@@ -53198,24 +54994,24 @@ var ts;
                             error(returnTypeNode, ts.Diagnostics.A_generator_cannot_have_a_void_type_annotation);
                         }
                         else {
-                            var generatorElementType = getIteratedTypeOfGenerator(returnType, (functionFlags_1 & 2 /* Async */) !== 0) || anyType;
-                            var iterableIteratorInstantiation = functionFlags_1 & 2 /* Async */
-                                ? createAsyncIterableIteratorType(generatorElementType) // AsyncGenerator function
-                                : createIterableIteratorType(generatorElementType); // Generator function
-                            // Naively, one could check that IterableIterator<any> is assignable to the return type annotation.
+                            // Naively, one could check that Generator<any, any, any> is assignable to the return type annotation.
                             // However, that would not catch the error in the following case.
                             //
                             //    interface BadGenerator extends Iterable<number>, Iterator<string> { }
                             //    function* g(): BadGenerator { } // Iterable and Iterator have different types!
                             //
-                            checkTypeAssignableTo(iterableIteratorInstantiation, returnType, returnTypeNode);
+                            var generatorYieldType = getIterationTypeOfGeneratorFunctionReturnType(0 /* Yield */, returnType, (functionFlags_1 & 2 /* Async */) !== 0) || anyType;
+                            var generatorReturnType = getIterationTypeOfGeneratorFunctionReturnType(1 /* Return */, returnType, (functionFlags_1 & 2 /* Async */) !== 0) || generatorYieldType;
+                            var generatorNextType = getIterationTypeOfGeneratorFunctionReturnType(2 /* Next */, returnType, (functionFlags_1 & 2 /* Async */) !== 0) || unknownType;
+                            var generatorInstantiation = createGeneratorReturnType(generatorYieldType, generatorReturnType, generatorNextType, !!(functionFlags_1 & 2 /* Async */));
+                            checkTypeAssignableTo(generatorInstantiation, returnType, returnTypeNode);
                         }
                     }
                     else if ((functionFlags_1 & 3 /* AsyncGenerator */) === 2 /* Async */) {
                         checkAsyncFunctionReturnType(node, returnTypeNode);
                     }
                 }
-                if (node.kind !== 162 /* IndexSignature */ && node.kind !== 294 /* JSDocFunctionType */) {
+                if (node.kind !== 163 /* IndexSignature */ && node.kind !== 295 /* JSDocFunctionType */) {
                     registerForUnusedIdentifiersCheck(node);
                 }
             }
@@ -53232,7 +55028,7 @@ var ts;
             var staticNames = ts.createUnderscoreEscapedMap();
             for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                 var member = _a[_i];
-                if (member.kind === 157 /* Constructor */) {
+                if (member.kind === 158 /* Constructor */) {
                     for (var _b = 0, _c = member.parameters; _b < _c.length; _b++) {
                         var param = _c[_b];
                         if (ts.isParameterPropertyDeclaration(param) && !ts.isBindingPattern(param.name)) {
@@ -53247,16 +55043,16 @@ var ts;
                     var memberName = name && ts.getPropertyNameForPropertyNameNode(name);
                     if (name && memberName) {
                         switch (member.kind) {
-                            case 158 /* GetAccessor */:
+                            case 159 /* GetAccessor */:
                                 addName(names, name, memberName, 1 /* Getter */);
                                 break;
-                            case 159 /* SetAccessor */:
+                            case 160 /* SetAccessor */:
                                 addName(names, name, memberName, 2 /* Setter */);
                                 break;
-                            case 154 /* PropertyDeclaration */:
+                            case 155 /* PropertyDeclaration */:
                                 addName(names, name, memberName, 3 /* Property */);
                                 break;
-                            case 156 /* MethodDeclaration */:
+                            case 157 /* MethodDeclaration */:
                                 addName(names, name, memberName, 4 /* Method */);
                                 break;
                         }
@@ -53319,7 +55115,7 @@ var ts;
             var names = ts.createMap();
             for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                 var member = _a[_i];
-                if (member.kind === 153 /* PropertySignature */) {
+                if (member.kind === 154 /* PropertySignature */) {
                     var memberName = void 0;
                     var name = member.name;
                     switch (name.kind) {
@@ -53327,7 +55123,7 @@ var ts;
                         case 8 /* NumericLiteral */:
                             memberName = name.text;
                             break;
-                        case 72 /* Identifier */:
+                        case 73 /* Identifier */:
                             memberName = ts.idText(name);
                             break;
                         default:
@@ -53344,7 +55140,7 @@ var ts;
             }
         }
         function checkTypeForDuplicateIndexSignatures(node) {
-            if (node.kind === 241 /* InterfaceDeclaration */) {
+            if (node.kind === 242 /* InterfaceDeclaration */) {
                 var nodeSymbol = getSymbolOfNode(node);
                 // in case of merging interface declaration it is possible that we'll enter this check procedure several times for every declaration
                 // to prevent this run check only for the first declaration of a given kind
@@ -53364,7 +55160,7 @@ var ts;
                     var declaration = decl;
                     if (declaration.parameters.length === 1 && declaration.parameters[0].type) {
                         switch (declaration.parameters[0].type.kind) {
-                            case 138 /* StringKeyword */:
+                            case 139 /* StringKeyword */:
                                 if (!seenStringIndexer) {
                                     seenStringIndexer = true;
                                 }
@@ -53372,7 +55168,7 @@ var ts;
                                     error(declaration, ts.Diagnostics.Duplicate_string_index_signature);
                                 }
                                 break;
-                            case 135 /* NumberKeyword */:
+                            case 136 /* NumberKeyword */:
                                 if (!seenNumericIndexer) {
                                     seenNumericIndexer = true;
                                 }
@@ -53399,7 +55195,7 @@ var ts;
             checkFunctionOrMethodDeclaration(node);
             // Abstract methods cannot have an implementation.
             // Extra checks are to avoid reporting multiple errors relating to the "abstractness" of the node.
-            if (ts.hasModifier(node, 128 /* Abstract */) && node.kind === 156 /* MethodDeclaration */ && node.body) {
+            if (ts.hasModifier(node, 128 /* Abstract */) && node.kind === 157 /* MethodDeclaration */ && node.body) {
                 error(node, ts.Diagnostics.Method_0_cannot_have_an_implementation_because_it_is_marked_abstract, ts.declarationNameToString(node.name));
             }
         }
@@ -53424,7 +55220,7 @@ var ts;
                 return;
             }
             function isInstancePropertyWithInitializer(n) {
-                return n.kind === 154 /* PropertyDeclaration */ &&
+                return n.kind === 155 /* PropertyDeclaration */ &&
                     !ts.hasModifier(n, 32 /* Static */) &&
                     !!n.initializer;
             }
@@ -53454,7 +55250,7 @@ var ts;
                         var superCallStatement = void 0;
                         for (var _i = 0, statements_2 = statements; _i < statements_2.length; _i++) {
                             var statement = statements_2[_i];
-                            if (statement.kind === 221 /* ExpressionStatement */ && ts.isSuperCall(statement.expression)) {
+                            if (statement.kind === 222 /* ExpressionStatement */ && ts.isSuperCall(statement.expression)) {
                                 superCallStatement = statement;
                                 break;
                             }
@@ -53479,7 +55275,7 @@ var ts;
                     checkGrammarComputedPropertyName(node.name);
                 checkDecorators(node);
                 checkSignatureDeclaration(node);
-                if (node.kind === 158 /* GetAccessor */) {
+                if (node.kind === 159 /* GetAccessor */) {
                     if (!(node.flags & 4194304 /* Ambient */) && ts.nodeIsPresent(node.body) && (node.flags & 128 /* HasImplicitReturn */)) {
                         if (!(node.flags & 256 /* HasExplicitReturn */)) {
                             error(node.name, ts.Diagnostics.A_get_accessor_must_return_a_value);
@@ -53489,13 +55285,13 @@ var ts;
                 // Do not use hasDynamicName here, because that returns false for well known symbols.
                 // We want to perform checkComputedPropertyName for all computed properties, including
                 // well known symbols.
-                if (node.name.kind === 149 /* ComputedPropertyName */) {
+                if (node.name.kind === 150 /* ComputedPropertyName */) {
                     checkComputedPropertyName(node.name);
                 }
                 if (!hasNonBindableDynamicName(node)) {
                     // TypeScript 1.0 spec (April 2014): 8.4.3
                     // Accessors for the same member name must specify the same accessibility.
-                    var otherKind = node.kind === 158 /* GetAccessor */ ? 159 /* SetAccessor */ : 158 /* GetAccessor */;
+                    var otherKind = node.kind === 159 /* GetAccessor */ ? 160 /* SetAccessor */ : 159 /* GetAccessor */;
                     var otherAccessor = ts.getDeclarationOfKind(getSymbolOfNode(node), otherKind);
                     if (otherAccessor) {
                         var nodeFlags = ts.getModifierFlags(node);
@@ -53513,7 +55309,7 @@ var ts;
                     }
                 }
                 var returnType = getTypeOfAccessors(getSymbolOfNode(node));
-                if (node.kind === 158 /* GetAccessor */) {
+                if (node.kind === 159 /* GetAccessor */) {
                     checkAllCodePathsInNonVoidFunctionReturnOrThrow(node, returnType);
                 }
             }
@@ -53561,7 +55357,7 @@ var ts;
         }
         function checkTypeReferenceNode(node) {
             checkGrammarTypeArguments(node, node.typeArguments);
-            if (node.kind === 164 /* TypeReference */ && node.typeName.jsdocDotPos !== undefined && !ts.isInJSFile(node) && !ts.isInJSDoc(node)) {
+            if (node.kind === 165 /* TypeReference */ && node.typeName.jsdocDotPos !== undefined && !ts.isInJSFile(node) && !ts.isInJSDoc(node)) {
                 grammarErrorAtPos(node, node.typeName.jsdocDotPos, 1, ts.Diagnostics.JSDoc_types_can_only_be_used_inside_documentation_comments);
             }
             var type = getTypeFromTypeReference(node);
@@ -53609,7 +55405,7 @@ var ts;
             var seenOptionalElement = false;
             for (var i = 0; i < elementTypes.length; i++) {
                 var e = elementTypes[i];
-                if (e.kind === 172 /* RestType */) {
+                if (e.kind === 173 /* RestType */) {
                     if (i !== elementTypes.length - 1) {
                         grammarErrorOnNode(e, ts.Diagnostics.A_rest_element_must_be_last_in_a_tuple_type);
                         break;
@@ -53618,7 +55414,7 @@ var ts;
                         error(e, ts.Diagnostics.A_rest_element_type_must_be_an_array_type);
                     }
                 }
-                else if (e.kind === 171 /* OptionalType */) {
+                else if (e.kind === 172 /* OptionalType */) {
                     seenOptionalElement = true;
                 }
                 else if (seenOptionalElement) {
@@ -53639,7 +55435,7 @@ var ts;
             var objectType = type.objectType;
             var indexType = type.indexType;
             if (isTypeAssignableTo(indexType, getIndexType(objectType, /*stringsOnly*/ false))) {
-                if (accessNode.kind === 190 /* ElementAccessExpression */ && ts.isAssignmentTarget(accessNode) &&
+                if (accessNode.kind === 191 /* ElementAccessExpression */ && ts.isAssignmentTarget(accessNode) &&
                     ts.getObjectFlags(objectType) & 32 /* Mapped */ && getMappedTypeModifiers(objectType) & 1 /* IncludeReadonly */) {
                     error(accessNode, ts.Diagnostics.Index_signature_in_type_0_only_permits_reading, typeToString(objectType));
                 }
@@ -53647,11 +55443,22 @@ var ts;
             }
             // Check if we're indexing with a numeric type and if either object or index types
             // is a generic type with a constraint that has a numeric index signature.
-            if (getIndexInfoOfType(getApparentType(objectType), 1 /* Number */) && isTypeAssignableToKind(indexType, 296 /* NumberLike */)) {
+            var apparentObjectType = getApparentType(objectType);
+            if (getIndexInfoOfType(apparentObjectType, 1 /* Number */) && isTypeAssignableToKind(indexType, 296 /* NumberLike */)) {
                 return type;
             }
+            if (isGenericObjectType(objectType)) {
+                var propertyName_1 = getPropertyNameFromIndex(indexType, accessNode);
+                if (propertyName_1) {
+                    var propertySymbol = forEachType(apparentObjectType, function (t) { return getPropertyOfType(t, propertyName_1); });
+                    if (propertySymbol && ts.getDeclarationModifierFlagsFromSymbol(propertySymbol) & 24 /* NonPublicAccessibilityModifier */) {
+                        error(accessNode, ts.Diagnostics.Private_or_protected_member_0_cannot_be_accessed_on_a_type_parameter, ts.unescapeLeadingUnderscores(propertyName_1));
+                        return errorType;
+                    }
+                }
+            }
             error(accessNode, ts.Diagnostics.Type_0_cannot_be_used_to_index_type_1, typeToString(indexType), typeToString(objectType));
-            return type;
+            return errorType;
         }
         function checkIndexedAccessType(node) {
             checkSourceElement(node.objectType);
@@ -53679,7 +55486,7 @@ var ts;
             ts.forEachChild(node, checkSourceElement);
         }
         function checkInferType(node) {
-            if (!ts.findAncestor(node, function (n) { return n.parent && n.parent.kind === 175 /* ConditionalType */ && n.parent.extendsType === n; })) {
+            if (!ts.findAncestor(node, function (n) { return n.parent && n.parent.kind === 176 /* ConditionalType */ && n.parent.extendsType === n; })) {
                 grammarErrorOnNode(node, ts.Diagnostics.infer_declarations_are_only_permitted_in_the_extends_clause_of_a_conditional_type);
             }
             checkSourceElement(node.typeParameter);
@@ -53696,9 +55503,9 @@ var ts;
             var flags = ts.getCombinedModifierFlags(n);
             // children of classes (even ambient classes) should not be marked as ambient or export
             // because those flags have no useful semantics there.
-            if (n.parent.kind !== 241 /* InterfaceDeclaration */ &&
-                n.parent.kind !== 240 /* ClassDeclaration */ &&
-                n.parent.kind !== 209 /* ClassExpression */ &&
+            if (n.parent.kind !== 242 /* InterfaceDeclaration */ &&
+                n.parent.kind !== 241 /* ClassDeclaration */ &&
+                n.parent.kind !== 210 /* ClassExpression */ &&
                 n.flags & 4194304 /* Ambient */) {
                 if (!(flags & 2 /* Ambient */) && !(ts.isModuleBlock(n.parent) && ts.isModuleDeclaration(n.parent.parent) && ts.isGlobalScopeAugmentation(n.parent.parent))) {
                     // It is nested in an ambient context, which means it is automatically exported
@@ -53789,7 +55596,7 @@ var ts;
                         if (node.name && subsequentName &&
                             (ts.isComputedPropertyName(node.name) && ts.isComputedPropertyName(subsequentName) ||
                                 !ts.isComputedPropertyName(node.name) && !ts.isComputedPropertyName(subsequentName) && ts.getEscapedTextOfIdentifierOrLiteral(node.name) === ts.getEscapedTextOfIdentifierOrLiteral(subsequentName))) {
-                            var reportError = (node.kind === 156 /* MethodDeclaration */ || node.kind === 155 /* MethodSignature */) &&
+                            var reportError = (node.kind === 157 /* MethodDeclaration */ || node.kind === 156 /* MethodSignature */) &&
                                 ts.hasModifier(node, 32 /* Static */) !== ts.hasModifier(subsequentNode, 32 /* Static */);
                             // we can get here in two cases
                             // 1. mixed static and instance class members
@@ -53828,7 +55635,7 @@ var ts;
                 var current = declarations_4[_i];
                 var node = current;
                 var inAmbientContext = node.flags & 4194304 /* Ambient */;
-                var inAmbientContextOrInterface = node.parent.kind === 241 /* InterfaceDeclaration */ || node.parent.kind === 168 /* TypeLiteral */ || inAmbientContext;
+                var inAmbientContextOrInterface = node.parent.kind === 242 /* InterfaceDeclaration */ || node.parent.kind === 169 /* TypeLiteral */ || inAmbientContext;
                 if (inAmbientContextOrInterface) {
                     // check if declarations are consecutive only if they are non-ambient
                     // 1. ambient declarations can be interleaved
@@ -53839,7 +55646,7 @@ var ts;
                     // 2. mixing ambient and non-ambient declarations is a separate error that will be reported - do not want to report an extra one
                     previousDeclaration = undefined;
                 }
-                if (node.kind === 239 /* FunctionDeclaration */ || node.kind === 156 /* MethodDeclaration */ || node.kind === 155 /* MethodSignature */ || node.kind === 157 /* Constructor */) {
+                if (node.kind === 240 /* FunctionDeclaration */ || node.kind === 157 /* MethodDeclaration */ || node.kind === 156 /* MethodSignature */ || node.kind === 158 /* Constructor */) {
                     var currentNodeFlags = getEffectiveDeclarationFlags(node, flagsToCheck);
                     someNodeFlags |= currentNodeFlags;
                     allNodeFlags &= currentNodeFlags;
@@ -53894,7 +55701,7 @@ var ts;
                     for (var _a = 0, signatures_6 = signatures; _a < signatures_6.length; _a++) {
                         var signature = signatures_6[_a];
                         if (!isImplementationCompatibleWithOverload(bodySignature, signature)) {
-                            addRelatedInfo(error(signature.declaration, ts.Diagnostics.This_overload_signature_is_not_compatible_with_its_implementation_signature), ts.createDiagnosticForNode(bodyDeclaration, ts.Diagnostics.The_implementation_signature_is_declared_here));
+                            ts.addRelatedInfo(error(signature.declaration, ts.Diagnostics.This_overload_signature_is_not_compatible_with_its_implementation_signature), ts.createDiagnosticForNode(bodyDeclaration, ts.Diagnostics.The_implementation_signature_is_declared_here));
                             break;
                         }
                     }
@@ -53968,22 +55775,22 @@ var ts;
             function getDeclarationSpaces(decl) {
                 var d = decl;
                 switch (d.kind) {
-                    case 241 /* InterfaceDeclaration */:
-                    case 242 /* TypeAliasDeclaration */:
+                    case 242 /* InterfaceDeclaration */:
+                    case 243 /* TypeAliasDeclaration */:
                     // A jsdoc typedef and callback are, by definition, type aliases
-                    case 309 /* JSDocTypedefTag */:
-                    case 302 /* JSDocCallbackTag */:
+                    case 311 /* JSDocTypedefTag */:
+                    case 304 /* JSDocCallbackTag */:
                         return 2 /* ExportType */;
-                    case 244 /* ModuleDeclaration */:
+                    case 245 /* ModuleDeclaration */:
                         return ts.isAmbientModule(d) || ts.getModuleInstanceState(d) !== 0 /* NonInstantiated */
                             ? 4 /* ExportNamespace */ | 1 /* ExportValue */
                             : 4 /* ExportNamespace */;
-                    case 240 /* ClassDeclaration */:
-                    case 243 /* EnumDeclaration */:
+                    case 241 /* ClassDeclaration */:
+                    case 244 /* EnumDeclaration */:
                         return 2 /* ExportType */ | 1 /* ExportValue */;
-                    case 284 /* SourceFile */:
+                    case 285 /* SourceFile */:
                         return 2 /* ExportType */ | 1 /* ExportValue */ | 4 /* ExportNamespace */;
-                    case 254 /* ExportAssignment */:
+                    case 255 /* ExportAssignment */:
                         // Export assigned entity name expressions act as aliases and should fall through, otherwise they export values
                         if (!ts.isEntityNameExpression(d.expression)) {
                             return 1 /* ExportValue */;
@@ -53991,26 +55798,26 @@ var ts;
                         d = d.expression;
                     /* falls through */
                     // The below options all declare an Alias, which is allowed to merge with other values within the importing module
-                    case 248 /* ImportEqualsDeclaration */:
-                    case 251 /* NamespaceImport */:
-                    case 250 /* ImportClause */:
-                        var result_5 = 0 /* None */;
+                    case 249 /* ImportEqualsDeclaration */:
+                    case 252 /* NamespaceImport */:
+                    case 251 /* ImportClause */:
+                        var result_8 = 0 /* None */;
                         var target = resolveAlias(getSymbolOfNode(d));
-                        ts.forEach(target.declarations, function (d) { result_5 |= getDeclarationSpaces(d); });
-                        return result_5;
-                    case 237 /* VariableDeclaration */:
-                    case 186 /* BindingElement */:
-                    case 239 /* FunctionDeclaration */:
-                    case 253 /* ImportSpecifier */: // https://github.com/Microsoft/TypeScript/pull/7591
+                        ts.forEach(target.declarations, function (d) { result_8 |= getDeclarationSpaces(d); });
+                        return result_8;
+                    case 238 /* VariableDeclaration */:
+                    case 187 /* BindingElement */:
+                    case 240 /* FunctionDeclaration */:
+                    case 254 /* ImportSpecifier */: // https://github.com/Microsoft/TypeScript/pull/7591
                         return 1 /* ExportValue */;
                     default:
-                        return ts.Debug.fail(ts.Debug.showSyntaxKind(d));
+                        return ts.Debug.failBadSyntaxKind(d);
                 }
             }
         }
-        function getAwaitedTypeOfPromise(type, errorNode, diagnosticMessage) {
+        function getAwaitedTypeOfPromise(type, errorNode, diagnosticMessage, arg0) {
             var promisedType = getPromisedTypeOfPromise(type, errorNode);
-            return promisedType && getAwaitedType(promisedType, errorNode, diagnosticMessage);
+            return promisedType && getAwaitedType(promisedType, errorNode, diagnosticMessage, arg0);
         }
         /**
          * Gets the "promised type" of a promise.
@@ -54068,10 +55875,14 @@ var ts;
          * Promise-like type; otherwise, it is the type of the expression. This is used to reflect
          * The runtime behavior of the `await` keyword.
          */
-        function checkAwaitedType(type, errorNode, diagnosticMessage) {
-            return getAwaitedType(type, errorNode, diagnosticMessage) || errorType;
+        function checkAwaitedType(type, errorNode, diagnosticMessage, arg0) {
+            var awaitedType = getAwaitedType(type, errorNode, diagnosticMessage, arg0);
+            if (awaitedType === type && !(type.flags & 3 /* AnyOrUnknown */)) {
+                addErrorOrSuggestion(/*isError*/ false, ts.createDiagnosticForNode(errorNode, ts.Diagnostics.await_has_no_effect_on_the_type_of_this_expression));
+            }
+            return awaitedType || errorType;
         }
-        function getAwaitedType(type, errorNode, diagnosticMessage) {
+        function getAwaitedType(type, errorNode, diagnosticMessage, arg0) {
             var typeAsAwaitable = type;
             if (typeAsAwaitable.awaitedTypeOfType) {
                 return typeAsAwaitable.awaitedTypeOfType;
@@ -54083,7 +55894,7 @@ var ts;
                 var types = void 0;
                 for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
                     var constituentType = _a[_i];
-                    types = ts.append(types, getAwaitedType(constituentType, errorNode, diagnosticMessage));
+                    types = ts.append(types, getAwaitedType(constituentType, errorNode, diagnosticMessage, arg0));
                 }
                 if (!types) {
                     return undefined;
@@ -54133,7 +55944,7 @@ var ts;
                 // Keep track of the type we're about to unwrap to avoid bad recursive promise types.
                 // See the comments above for more information.
                 awaitedTypeStack.push(type.id);
-                var awaitedType = getAwaitedType(promisedType, errorNode, diagnosticMessage);
+                var awaitedType = getAwaitedType(promisedType, errorNode, diagnosticMessage, arg0);
                 awaitedTypeStack.pop();
                 if (!awaitedType) {
                     return undefined;
@@ -54160,7 +55971,7 @@ var ts;
                 if (errorNode) {
                     if (!diagnosticMessage)
                         return ts.Debug.fail();
-                    error(errorNode, diagnosticMessage);
+                    error(errorNode, diagnosticMessage, arg0);
                 }
                 return undefined;
             }
@@ -54230,7 +56041,7 @@ var ts;
                 var promiseConstructorSymbol = resolveEntityName(promiseConstructorName, 67220415 /* Value */, /*ignoreErrors*/ true);
                 var promiseConstructorType = promiseConstructorSymbol ? getTypeOfSymbol(promiseConstructorSymbol) : errorType;
                 if (promiseConstructorType === errorType) {
-                    if (promiseConstructorName.kind === 72 /* Identifier */ && promiseConstructorName.escapedText === "Promise" && getTargetType(returnType) === getGlobalPromiseType(/*reportErrors*/ false)) {
+                    if (promiseConstructorName.kind === 73 /* Identifier */ && promiseConstructorName.escapedText === "Promise" && getTargetType(returnType) === getGlobalPromiseType(/*reportErrors*/ false)) {
                         error(returnTypeNode, ts.Diagnostics.An_async_function_or_method_in_ES5_SlashES3_requires_the_Promise_constructor_Make_sure_you_have_a_declaration_for_the_Promise_constructor_or_include_ES2015_in_your_lib_option);
                     }
                     else {
@@ -54269,24 +56080,24 @@ var ts;
             var headMessage = getDiagnosticHeadMessageForDecoratorResolution(node);
             var errorInfo;
             switch (node.parent.kind) {
-                case 240 /* ClassDeclaration */:
+                case 241 /* ClassDeclaration */:
                     var classSymbol = getSymbolOfNode(node.parent);
                     var classConstructorType = getTypeOfSymbol(classSymbol);
                     expectedReturnType = getUnionType([classConstructorType, voidType]);
                     break;
-                case 151 /* Parameter */:
+                case 152 /* Parameter */:
                     expectedReturnType = voidType;
                     errorInfo = ts.chainDiagnosticMessages(
                     /*details*/ undefined, ts.Diagnostics.The_return_type_of_a_parameter_decorator_function_must_be_either_void_or_any);
                     break;
-                case 154 /* PropertyDeclaration */:
+                case 155 /* PropertyDeclaration */:
                     expectedReturnType = voidType;
                     errorInfo = ts.chainDiagnosticMessages(
                     /*details*/ undefined, ts.Diagnostics.The_return_type_of_a_property_decorator_function_must_be_either_void_or_any);
                     break;
-                case 156 /* MethodDeclaration */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 157 /* MethodDeclaration */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     var methodType = getTypeOfNode(node.parent);
                     var descriptorType = createTypedPropertyDescriptorType(methodType);
                     expectedReturnType = getUnionType([descriptorType, voidType]);
@@ -54307,7 +56118,7 @@ var ts;
             if (!typeName)
                 return;
             var rootName = getFirstIdentifier(typeName);
-            var meaning = (typeName.kind === 72 /* Identifier */ ? 67897832 /* Type */ : 1920 /* Namespace */) | 2097152 /* Alias */;
+            var meaning = (typeName.kind === 73 /* Identifier */ ? 67897832 /* Type */ : 1920 /* Namespace */) | 2097152 /* Alias */;
             var rootSymbol = resolveName(rootName, rootName.escapedText, meaning, /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined, /*isRefernce*/ true);
             if (rootSymbol
                 && rootSymbol.flags & 2097152 /* Alias */
@@ -54332,14 +56143,14 @@ var ts;
         function getEntityNameForDecoratorMetadata(node) {
             if (node) {
                 switch (node.kind) {
-                    case 174 /* IntersectionType */:
-                    case 173 /* UnionType */:
+                    case 175 /* IntersectionType */:
+                    case 174 /* UnionType */:
                         return getEntityNameForDecoratorMetadataFromTypeList(node.types);
-                    case 175 /* ConditionalType */:
+                    case 176 /* ConditionalType */:
                         return getEntityNameForDecoratorMetadataFromTypeList([node.trueType, node.falseType]);
-                    case 177 /* ParenthesizedType */:
+                    case 178 /* ParenthesizedType */:
                         return getEntityNameForDecoratorMetadata(node.type);
-                    case 164 /* TypeReference */:
+                    case 165 /* TypeReference */:
                         return node.typeName;
                 }
             }
@@ -54348,13 +56159,13 @@ var ts;
             var commonEntityName;
             for (var _i = 0, types_17 = types; _i < types_17.length; _i++) {
                 var typeNode = types_17[_i];
-                while (typeNode.kind === 177 /* ParenthesizedType */) {
+                while (typeNode.kind === 178 /* ParenthesizedType */) {
                     typeNode = typeNode.type; // Skip parens if need be
                 }
-                if (typeNode.kind === 132 /* NeverKeyword */) {
+                if (typeNode.kind === 133 /* NeverKeyword */) {
                     continue; // Always elide `never` from the union/intersection if possible
                 }
-                if (!strictNullChecks && (typeNode.kind === 96 /* NullKeyword */ || typeNode.kind === 141 /* UndefinedKeyword */)) {
+                if (!strictNullChecks && (typeNode.kind === 97 /* NullKeyword */ || typeNode.kind === 142 /* UndefinedKeyword */)) {
                     continue; // Elide null and undefined from unions for metadata, just like what we did prior to the implementation of strict null checks
                 }
                 var individualEntityName = getEntityNameForDecoratorMetadata(typeNode);
@@ -54396,18 +56207,18 @@ var ts;
                 return;
             }
             if (!compilerOptions.experimentalDecorators) {
-                error(node, ts.Diagnostics.Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_to_remove_this_warning);
+                error(node, ts.Diagnostics.Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_in_your_tsconfig_or_jsconfig_to_remove_this_warning);
             }
             var firstDecorator = node.decorators[0];
             checkExternalEmitHelpers(firstDecorator, 8 /* Decorate */);
-            if (node.kind === 151 /* Parameter */) {
+            if (node.kind === 152 /* Parameter */) {
                 checkExternalEmitHelpers(firstDecorator, 32 /* Param */);
             }
             if (compilerOptions.emitDecoratorMetadata) {
                 checkExternalEmitHelpers(firstDecorator, 16 /* Metadata */);
                 // we only need to perform these checks if we are emitting serialized type metadata for the target of a decorator.
                 switch (node.kind) {
-                    case 240 /* ClassDeclaration */:
+                    case 241 /* ClassDeclaration */:
                         var constructor = ts.getFirstConstructorWithBody(node);
                         if (constructor) {
                             for (var _i = 0, _a = constructor.parameters; _i < _a.length; _i++) {
@@ -54416,23 +56227,23 @@ var ts;
                             }
                         }
                         break;
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
-                        var otherKind = node.kind === 158 /* GetAccessor */ ? 159 /* SetAccessor */ : 158 /* GetAccessor */;
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
+                        var otherKind = node.kind === 159 /* GetAccessor */ ? 160 /* SetAccessor */ : 159 /* GetAccessor */;
                         var otherAccessor = ts.getDeclarationOfKind(getSymbolOfNode(node), otherKind);
                         markDecoratorMedataDataTypeNodeAsReferenced(getAnnotatedAccessorTypeNode(node) || otherAccessor && getAnnotatedAccessorTypeNode(otherAccessor));
                         break;
-                    case 156 /* MethodDeclaration */:
+                    case 157 /* MethodDeclaration */:
                         for (var _b = 0, _c = node.parameters; _b < _c.length; _b++) {
                             var parameter = _c[_b];
                             markDecoratorMedataDataTypeNodeAsReferenced(getParameterTypeNodeForDecoratorCheck(parameter));
                         }
                         markDecoratorMedataDataTypeNodeAsReferenced(ts.getEffectiveReturnTypeNode(node));
                         break;
-                    case 154 /* PropertyDeclaration */:
+                    case 155 /* PropertyDeclaration */:
                         markDecoratorMedataDataTypeNodeAsReferenced(ts.getEffectiveTypeAnnotationNode(node));
                         break;
-                    case 151 /* Parameter */:
+                    case 152 /* Parameter */:
                         markDecoratorMedataDataTypeNodeAsReferenced(getParameterTypeNodeForDecoratorCheck(node));
                         var containingSignature = node.parent;
                         for (var _d = 0, _e = containingSignature.parameters; _d < _e.length; _d++) {
@@ -54495,7 +56306,7 @@ var ts;
                     else if (ts.findLast(ts.getJSDocTags(decl), ts.isJSDocParameterTag) === node &&
                         node.typeExpression && node.typeExpression.type &&
                         !isArrayType(getTypeFromTypeNode(node.typeExpression.type))) {
-                        error(node.name, ts.Diagnostics.JSDoc_param_tag_has_name_0_but_there_is_no_parameter_with_that_name_It_would_match_arguments_if_it_had_an_array_type, ts.idText(node.name.kind === 148 /* QualifiedName */ ? node.name.right : node.name));
+                        error(node.name, ts.Diagnostics.JSDoc_param_tag_has_name_0_but_there_is_no_parameter_with_that_name_It_would_match_arguments_if_it_had_an_array_type, ts.idText(node.name.kind === 149 /* QualifiedName */ ? node.name.right : node.name));
                     }
                 }
             }
@@ -54528,9 +56339,9 @@ var ts;
         }
         function getIdentifierFromEntityNameExpression(node) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return node;
-                case 189 /* PropertyAccessExpression */:
+                case 190 /* PropertyAccessExpression */:
                     return node.name;
                 default:
                     return undefined;
@@ -54543,7 +56354,7 @@ var ts;
             // Do not use hasDynamicName here, because that returns false for well known symbols.
             // We want to perform checkComputedPropertyName for all computed properties, including
             // well known symbols.
-            if (node.name && node.name.kind === 149 /* ComputedPropertyName */) {
+            if (node.name && node.name.kind === 150 /* ComputedPropertyName */) {
                 // This check will account for methods in class/interface declarations,
                 // as well as accessors in classes/object literals
                 checkComputedPropertyName(node.name);
@@ -54572,12 +56383,9 @@ var ts;
                     }
                 }
             }
-            var body = node.kind === 155 /* MethodSignature */ ? undefined : node.body;
+            var body = node.kind === 156 /* MethodSignature */ ? undefined : node.body;
             checkSourceElement(body);
-            if ((functionFlags & 1 /* Generator */) === 0) { // Async function or normal function
-                var returnOrPromisedType = getReturnOrPromisedType(node, functionFlags);
-                checkAllCodePathsInNonVoidFunctionReturnOrThrow(node, returnOrPromisedType);
-            }
+            checkAllCodePathsInNonVoidFunctionReturnOrThrow(node, getReturnTypeFromAnnotation(node));
             if (produceDiagnostics && !ts.getEffectiveReturnTypeNode(node)) {
                 // Report an implicit any error if there is no body, no explicit return type, and node is not a private method
                 // in an ambient context
@@ -54617,42 +56425,42 @@ var ts;
             for (var _i = 0, potentiallyUnusedIdentifiers_1 = potentiallyUnusedIdentifiers; _i < potentiallyUnusedIdentifiers_1.length; _i++) {
                 var node = potentiallyUnusedIdentifiers_1[_i];
                 switch (node.kind) {
-                    case 240 /* ClassDeclaration */:
-                    case 209 /* ClassExpression */:
+                    case 241 /* ClassDeclaration */:
+                    case 210 /* ClassExpression */:
                         checkUnusedClassMembers(node, addDiagnostic);
                         checkUnusedTypeParameters(node, addDiagnostic);
                         break;
-                    case 284 /* SourceFile */:
-                    case 244 /* ModuleDeclaration */:
-                    case 218 /* Block */:
-                    case 246 /* CaseBlock */:
-                    case 225 /* ForStatement */:
-                    case 226 /* ForInStatement */:
-                    case 227 /* ForOfStatement */:
+                    case 285 /* SourceFile */:
+                    case 245 /* ModuleDeclaration */:
+                    case 219 /* Block */:
+                    case 247 /* CaseBlock */:
+                    case 226 /* ForStatement */:
+                    case 227 /* ForInStatement */:
+                    case 228 /* ForOfStatement */:
                         checkUnusedLocalsAndParameters(node, addDiagnostic);
                         break;
-                    case 157 /* Constructor */:
-                    case 196 /* FunctionExpression */:
-                    case 239 /* FunctionDeclaration */:
-                    case 197 /* ArrowFunction */:
-                    case 156 /* MethodDeclaration */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
+                    case 158 /* Constructor */:
+                    case 197 /* FunctionExpression */:
+                    case 240 /* FunctionDeclaration */:
+                    case 198 /* ArrowFunction */:
+                    case 157 /* MethodDeclaration */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
                         if (node.body) { // Don't report unused parameters in overloads
                             checkUnusedLocalsAndParameters(node, addDiagnostic);
                         }
                         checkUnusedTypeParameters(node, addDiagnostic);
                         break;
-                    case 155 /* MethodSignature */:
-                    case 160 /* CallSignature */:
-                    case 161 /* ConstructSignature */:
-                    case 165 /* FunctionType */:
-                    case 166 /* ConstructorType */:
-                    case 242 /* TypeAliasDeclaration */:
-                    case 241 /* InterfaceDeclaration */:
+                    case 156 /* MethodSignature */:
+                    case 161 /* CallSignature */:
+                    case 162 /* ConstructSignature */:
+                    case 166 /* FunctionType */:
+                    case 167 /* ConstructorType */:
+                    case 243 /* TypeAliasDeclaration */:
+                    case 242 /* InterfaceDeclaration */:
                         checkUnusedTypeParameters(node, addDiagnostic);
                         break;
-                    case 176 /* InferType */:
+                    case 177 /* InferType */:
                         checkUnusedInferTypeParameter(node, addDiagnostic);
                         break;
                     default:
@@ -54672,11 +56480,11 @@ var ts;
             for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                 var member = _a[_i];
                 switch (member.kind) {
-                    case 156 /* MethodDeclaration */:
-                    case 154 /* PropertyDeclaration */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
-                        if (member.kind === 159 /* SetAccessor */ && member.symbol.flags & 32768 /* GetAccessor */) {
+                    case 157 /* MethodDeclaration */:
+                    case 155 /* PropertyDeclaration */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
+                        if (member.kind === 160 /* SetAccessor */ && member.symbol.flags & 32768 /* GetAccessor */) {
                             // Already would have reported an error on the getter.
                             break;
                         }
@@ -54685,7 +56493,7 @@ var ts;
                             addDiagnostic(member, 0 /* Local */, ts.createDiagnosticForNode(member.name, ts.Diagnostics._0_is_declared_but_its_value_is_never_read, symbolToString(symbol)));
                         }
                         break;
-                    case 157 /* Constructor */:
+                    case 158 /* Constructor */:
                         for (var _b = 0, _c = member.parameters; _b < _c.length; _b++) {
                             var parameter = _c[_b];
                             if (!parameter.symbol.isReferenced && ts.hasModifier(parameter, 8 /* Private */)) {
@@ -54693,8 +56501,8 @@ var ts;
                             }
                         }
                         break;
-                    case 162 /* IndexSignature */:
-                    case 217 /* SemicolonClassElement */:
+                    case 163 /* IndexSignature */:
+                    case 218 /* SemicolonClassElement */:
                         // Can't be private
                         break;
                     default:
@@ -54721,7 +56529,7 @@ var ts;
                     continue;
                 var name = ts.idText(typeParameter.name);
                 var parent = typeParameter.parent;
-                if (parent.kind !== 176 /* InferType */ && parent.typeParameters.every(isTypeParameterUnused)) {
+                if (parent.kind !== 177 /* InferType */ && parent.typeParameters.every(isTypeParameterUnused)) {
                     if (seenParentsWithEveryUnused.tryAdd(parent)) {
                         var range = ts.isJSDocTemplateTag(parent)
                             // Whole @template tag
@@ -54806,7 +56614,7 @@ var ts;
                 var importDecl = importClause.parent;
                 var nDeclarations = (importClause.name ? 1 : 0) +
                     (importClause.namedBindings ?
-                        (importClause.namedBindings.kind === 251 /* NamespaceImport */ ? 1 : importClause.namedBindings.elements.length)
+                        (importClause.namedBindings.kind === 252 /* NamespaceImport */ ? 1 : importClause.namedBindings.elements.length)
                         : 0);
                 if (nDeclarations === unuseds.length) {
                     addDiagnostic(importDecl, 0 /* Local */, unuseds.length === 1
@@ -54824,7 +56632,7 @@ var ts;
                 var bindingPattern = _a[0], bindingElements = _a[1];
                 var kind = tryGetRootParameterDeclaration(bindingPattern.parent) ? 1 /* Parameter */ : 0 /* Local */;
                 if (bindingPattern.elements.length === bindingElements.length) {
-                    if (bindingElements.length === 1 && bindingPattern.parent.kind === 237 /* VariableDeclaration */ && bindingPattern.parent.parent.kind === 238 /* VariableDeclarationList */) {
+                    if (bindingElements.length === 1 && bindingPattern.parent.kind === 238 /* VariableDeclaration */ && bindingPattern.parent.parent.kind === 239 /* VariableDeclarationList */) {
                         addToGroup(unusedVariables, bindingPattern.parent.parent, bindingPattern.parent, getNodeId);
                     }
                     else {
@@ -54845,7 +56653,7 @@ var ts;
                 if (declarationList.declarations.length === declarations.length) {
                     addDiagnostic(declarationList, 0 /* Local */, declarations.length === 1
                         ? ts.createDiagnosticForNode(ts.first(declarations).name, ts.Diagnostics._0_is_declared_but_its_value_is_never_read, bindingNameText(ts.first(declarations).name))
-                        : ts.createDiagnosticForNode(declarationList.parent.kind === 219 /* VariableStatement */ ? declarationList.parent : declarationList, ts.Diagnostics.All_variables_are_unused));
+                        : ts.createDiagnosticForNode(declarationList.parent.kind === 220 /* VariableStatement */ ? declarationList.parent : declarationList, ts.Diagnostics.All_variables_are_unused));
                 }
                 else {
                     for (var _i = 0, declarations_5 = declarations; _i < declarations_5.length; _i++) {
@@ -54857,24 +56665,24 @@ var ts;
         }
         function bindingNameText(name) {
             switch (name.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return ts.idText(name);
-                case 185 /* ArrayBindingPattern */:
-                case 184 /* ObjectBindingPattern */:
+                case 186 /* ArrayBindingPattern */:
+                case 185 /* ObjectBindingPattern */:
                     return bindingNameText(ts.cast(ts.first(name.elements), ts.isBindingElement).name);
                 default:
                     return ts.Debug.assertNever(name);
             }
         }
         function isImportedDeclaration(node) {
-            return node.kind === 250 /* ImportClause */ || node.kind === 253 /* ImportSpecifier */ || node.kind === 251 /* NamespaceImport */;
+            return node.kind === 251 /* ImportClause */ || node.kind === 254 /* ImportSpecifier */ || node.kind === 252 /* NamespaceImport */;
         }
         function importClauseFromImported(decl) {
-            return decl.kind === 250 /* ImportClause */ ? decl : decl.kind === 251 /* NamespaceImport */ ? decl.parent : decl.parent.parent;
+            return decl.kind === 251 /* ImportClause */ ? decl : decl.kind === 252 /* NamespaceImport */ ? decl.parent : decl.parent.parent;
         }
         function checkBlock(node) {
             // Grammar checking for SyntaxKind.Block
-            if (node.kind === 218 /* Block */) {
+            if (node.kind === 219 /* Block */) {
                 checkGrammarStatementInAmbientContext(node);
             }
             if (ts.isFunctionOrModuleBlock(node)) {
@@ -54904,12 +56712,12 @@ var ts;
             if (!(identifier && identifier.escapedText === name)) {
                 return false;
             }
-            if (node.kind === 154 /* PropertyDeclaration */ ||
-                node.kind === 153 /* PropertySignature */ ||
-                node.kind === 156 /* MethodDeclaration */ ||
-                node.kind === 155 /* MethodSignature */ ||
-                node.kind === 158 /* GetAccessor */ ||
-                node.kind === 159 /* SetAccessor */) {
+            if (node.kind === 155 /* PropertyDeclaration */ ||
+                node.kind === 154 /* PropertySignature */ ||
+                node.kind === 157 /* MethodDeclaration */ ||
+                node.kind === 156 /* MethodSignature */ ||
+                node.kind === 159 /* GetAccessor */ ||
+                node.kind === 160 /* SetAccessor */) {
                 // it is ok to have member named '_super' or '_this' - member access is always qualified
                 return false;
             }
@@ -54918,7 +56726,7 @@ var ts;
                 return false;
             }
             var root = ts.getRootDeclaration(node);
-            if (root.kind === 151 /* Parameter */ && ts.nodeIsMissing(root.parent.body)) {
+            if (root.kind === 152 /* Parameter */ && ts.nodeIsMissing(root.parent.body)) {
                 // just an overload - no codegen impact
                 return false;
             }
@@ -54928,7 +56736,7 @@ var ts;
         function checkIfThisIsCapturedInEnclosingScope(node) {
             ts.findAncestor(node, function (current) {
                 if (getNodeCheckFlags(current) & 4 /* CaptureThis */) {
-                    var isDeclaration_1 = node.kind !== 72 /* Identifier */;
+                    var isDeclaration_1 = node.kind !== 73 /* Identifier */;
                     if (isDeclaration_1) {
                         error(ts.getNameOfDeclaration(node), ts.Diagnostics.Duplicate_identifier_this_Compiler_uses_variable_declaration_this_to_capture_this_reference);
                     }
@@ -54943,7 +56751,7 @@ var ts;
         function checkIfNewTargetIsCapturedInEnclosingScope(node) {
             ts.findAncestor(node, function (current) {
                 if (getNodeCheckFlags(current) & 8 /* CaptureNewTarget */) {
-                    var isDeclaration_2 = node.kind !== 72 /* Identifier */;
+                    var isDeclaration_2 = node.kind !== 73 /* Identifier */;
                     if (isDeclaration_2) {
                         error(ts.getNameOfDeclaration(node), ts.Diagnostics.Duplicate_identifier_newTarget_Compiler_uses_variable_declaration_newTarget_to_capture_new_target_meta_property_reference);
                     }
@@ -54969,7 +56777,7 @@ var ts;
             }
             // In case of variable declaration, node.parent is variable statement so look at the variable statement's parent
             var parent = getDeclarationContainer(node);
-            if (parent.kind === 284 /* SourceFile */ && ts.isExternalOrCommonJsModule(parent)) {
+            if (parent.kind === 285 /* SourceFile */ && ts.isExternalOrCommonJsModule(parent)) {
                 // If the declaration happens to be in external module, report error that require and exports are reserved keywords
                 error(name, ts.Diagnostics.Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module, ts.declarationNameToString(name), ts.declarationNameToString(name));
             }
@@ -54984,7 +56792,7 @@ var ts;
             }
             // In case of variable declaration, node.parent is variable statement so look at the variable statement's parent
             var parent = getDeclarationContainer(node);
-            if (parent.kind === 284 /* SourceFile */ && ts.isExternalOrCommonJsModule(parent) && parent.flags & 1024 /* HasAsyncFunctions */) {
+            if (parent.kind === 285 /* SourceFile */ && ts.isExternalOrCommonJsModule(parent) && parent.flags & 1024 /* HasAsyncFunctions */) {
                 // If the declaration happens to be in external module, report error that Promise is a reserved identifier.
                 error(name, ts.Diagnostics.Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module_containing_async_functions, ts.declarationNameToString(name), ts.declarationNameToString(name));
             }
@@ -55019,7 +56827,7 @@ var ts;
             // skip variable declarations that don't have initializers
             // NOTE: in ES6 spec initializer is required in variable declarations where name is binding pattern
             // so we'll always treat binding elements as initialized
-            if (node.kind === 237 /* VariableDeclaration */ && !node.initializer) {
+            if (node.kind === 238 /* VariableDeclaration */ && !node.initializer) {
                 return;
             }
             var symbol = getSymbolOfNode(node);
@@ -55031,17 +56839,17 @@ var ts;
                     localDeclarationSymbol !== symbol &&
                     localDeclarationSymbol.flags & 2 /* BlockScopedVariable */) {
                     if (getDeclarationNodeFlagsFromSymbol(localDeclarationSymbol) & 3 /* BlockScoped */) {
-                        var varDeclList = ts.getAncestor(localDeclarationSymbol.valueDeclaration, 238 /* VariableDeclarationList */);
-                        var container = varDeclList.parent.kind === 219 /* VariableStatement */ && varDeclList.parent.parent
+                        var varDeclList = ts.getAncestor(localDeclarationSymbol.valueDeclaration, 239 /* VariableDeclarationList */);
+                        var container = varDeclList.parent.kind === 220 /* VariableStatement */ && varDeclList.parent.parent
                             ? varDeclList.parent.parent
                             : undefined;
                         // names of block-scoped and function scoped variables can collide only
                         // if block scoped variable is defined in the function\module\source file scope (because of variable hoisting)
                         var namesShareScope = container &&
-                            (container.kind === 218 /* Block */ && ts.isFunctionLike(container.parent) ||
-                                container.kind === 245 /* ModuleBlock */ ||
-                                container.kind === 244 /* ModuleDeclaration */ ||
-                                container.kind === 284 /* SourceFile */);
+                            (container.kind === 219 /* Block */ && ts.isFunctionLike(container.parent) ||
+                                container.kind === 246 /* ModuleBlock */ ||
+                                container.kind === 245 /* ModuleDeclaration */ ||
+                                container.kind === 285 /* SourceFile */);
                         // here we know that function scoped variable is shadowed by block scoped one
                         // if they are defined in the same scope - binder has already reported redeclaration error
                         // otherwise if variable has an initializer - show error that initialization will fail
@@ -55054,69 +56862,6 @@ var ts;
                 }
             }
         }
-        // Check that a parameter initializer contains no references to parameters declared to the right of itself
-        function checkParameterInitializer(node) {
-            if (ts.getRootDeclaration(node).kind !== 151 /* Parameter */) {
-                return;
-            }
-            var func = ts.getContainingFunction(node);
-            visit(node.initializer);
-            function visit(n) {
-                if (ts.isTypeNode(n) || ts.isDeclarationName(n)) {
-                    // do not dive in types
-                    // skip declaration names (i.e. in object literal expressions)
-                    return;
-                }
-                if (n.kind === 189 /* PropertyAccessExpression */) {
-                    // skip property names in property access expression
-                    return visit(n.expression);
-                }
-                else if (n.kind === 72 /* Identifier */) {
-                    // check FunctionLikeDeclaration.locals (stores parameters\function local variable)
-                    // if it contains entry with a specified name
-                    var symbol = resolveName(n, n.escapedText, 67220415 /* Value */ | 2097152 /* Alias */, /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined, /*isUse*/ false);
-                    if (!symbol || symbol === unknownSymbol || !symbol.valueDeclaration) {
-                        return;
-                    }
-                    if (symbol.valueDeclaration === node) {
-                        error(n, ts.Diagnostics.Parameter_0_cannot_be_referenced_in_its_initializer, ts.declarationNameToString(node.name));
-                        return;
-                    }
-                    // locals map for function contain both parameters and function locals
-                    // so we need to do a bit of extra work to check if reference is legal
-                    var enclosingContainer = ts.getEnclosingBlockScopeContainer(symbol.valueDeclaration);
-                    if (enclosingContainer === func) {
-                        if (symbol.valueDeclaration.kind === 151 /* Parameter */ ||
-                            symbol.valueDeclaration.kind === 186 /* BindingElement */) {
-                            // it is ok to reference parameter in initializer if either
-                            // - parameter is located strictly on the left of current parameter declaration
-                            if (symbol.valueDeclaration.pos < node.pos) {
-                                return;
-                            }
-                            // - parameter is wrapped in function-like entity
-                            if (ts.findAncestor(n, function (current) {
-                                if (current === node.initializer) {
-                                    return "quit";
-                                }
-                                return ts.isFunctionLike(current.parent) ||
-                                    // computed property names/initializers in instance property declaration of class like entities
-                                    // are executed in constructor and thus deferred
-                                    (current.parent.kind === 154 /* PropertyDeclaration */ &&
-                                        !(ts.hasModifier(current.parent, 32 /* Static */)) &&
-                                        ts.isClassLike(current.parent.parent));
-                            })) {
-                                return;
-                            }
-                            // fall through to report error
-                        }
-                        error(n, ts.Diagnostics.Initializer_of_parameter_0_cannot_reference_identifier_1_declared_after_it, ts.declarationNameToString(node.name), ts.declarationNameToString(n));
-                    }
-                }
-                else {
-                    return ts.forEachChild(n, visit);
-                }
-            }
-        }
         function convertAutoToAny(type) {
             return type === autoType ? anyType : type === autoArrayType ? anyArrayType : type;
         }
@@ -55134,18 +56879,18 @@ var ts;
             // Do not use hasDynamicName here, because that returns false for well known symbols.
             // We want to perform checkComputedPropertyName for all computed properties, including
             // well known symbols.
-            if (node.name.kind === 149 /* ComputedPropertyName */) {
+            if (node.name.kind === 150 /* ComputedPropertyName */) {
                 checkComputedPropertyName(node.name);
                 if (node.initializer) {
                     checkExpressionCached(node.initializer);
                 }
             }
-            if (node.kind === 186 /* BindingElement */) {
-                if (node.parent.kind === 184 /* ObjectBindingPattern */ && languageVersion < 7 /* ESNext */) {
+            if (node.kind === 187 /* BindingElement */) {
+                if (node.parent.kind === 185 /* ObjectBindingPattern */ && languageVersion < 99 /* ESNext */) {
                     checkExternalEmitHelpers(node, 4 /* Rest */);
                 }
                 // check computed properties inside property names of binding elements
-                if (node.propertyName && node.propertyName.kind === 149 /* ComputedPropertyName */) {
+                if (node.propertyName && node.propertyName.kind === 150 /* ComputedPropertyName */) {
                     checkComputedPropertyName(node.propertyName);
                 }
                 // check private/protected variable access
@@ -55159,35 +56904,48 @@ var ts;
                         var property = getPropertyOfType(parentType, nameText);
                         if (property) {
                             markPropertyAsReferenced(property, /*nodeForCheckWriteOnly*/ undefined, /*isThisAccess*/ false); // A destructuring is never a write-only reference.
-                            checkPropertyAccessibility(parent, !!parent.initializer && parent.initializer.kind === 98 /* SuperKeyword */, parentType, property);
+                            checkPropertyAccessibility(parent, !!parent.initializer && parent.initializer.kind === 99 /* SuperKeyword */, parentType, property);
                         }
                     }
                 }
             }
             // For a binding pattern, check contained binding elements
             if (ts.isBindingPattern(node.name)) {
-                if (node.name.kind === 185 /* ArrayBindingPattern */ && languageVersion < 2 /* ES2015 */ && compilerOptions.downlevelIteration) {
+                if (node.name.kind === 186 /* ArrayBindingPattern */ && languageVersion < 2 /* ES2015 */ && compilerOptions.downlevelIteration) {
                     checkExternalEmitHelpers(node, 512 /* Read */);
                 }
                 ts.forEach(node.name.elements, checkSourceElement);
             }
             // For a parameter declaration with an initializer, error and exit if the containing function doesn't have a body
-            if (node.initializer && ts.getRootDeclaration(node).kind === 151 /* Parameter */ && ts.nodeIsMissing(ts.getContainingFunction(node).body)) {
+            if (node.initializer && ts.getRootDeclaration(node).kind === 152 /* Parameter */ && ts.nodeIsMissing(ts.getContainingFunction(node).body)) {
                 error(node, ts.Diagnostics.A_parameter_initializer_is_only_allowed_in_a_function_or_constructor_implementation);
                 return;
             }
             // For a binding pattern, validate the initializer and exit
             if (ts.isBindingPattern(node.name)) {
-                // Don't validate for-in initializer as it is already an error
-                if (node.initializer && node.parent.parent.kind !== 226 /* ForInStatement */) {
-                    var initializerType = checkExpressionCached(node.initializer);
-                    if (strictNullChecks && node.name.elements.length === 0) {
-                        checkNonNullType(initializerType, node);
+                var needCheckInitializer = node.initializer && node.parent.parent.kind !== 227 /* ForInStatement */;
+                var needCheckWidenedType = node.name.elements.length === 0;
+                if (needCheckInitializer || needCheckWidenedType) {
+                    // Don't validate for-in initializer as it is already an error
+                    var widenedType = getWidenedTypeForVariableLikeDeclaration(node);
+                    if (needCheckInitializer) {
+                        var initializerType = checkExpressionCached(node.initializer);
+                        if (strictNullChecks && needCheckWidenedType) {
+                            checkNonNullNonVoidType(initializerType, node);
+                        }
+                        else {
+                            checkTypeAssignableToAndOptionallyElaborate(initializerType, getWidenedTypeForVariableLikeDeclaration(node), node, node.initializer);
+                        }
                     }
-                    else {
-                        checkTypeAssignableToAndOptionallyElaborate(initializerType, getWidenedTypeForVariableLikeDeclaration(node), node, node.initializer);
+                    // check the binding pattern with empty elements
+                    if (needCheckWidenedType) {
+                        if (ts.isArrayBindingPattern(node.name)) {
+                            checkIteratedTypeOrElementType(65 /* Destructuring */, widenedType, undefinedType, node);
+                        }
+                        else if (strictNullChecks) {
+                            checkNonNullNonVoidType(widenedType, node);
+                        }
                     }
-                    checkParameterInitializer(node);
                 }
                 return;
             }
@@ -55202,9 +56960,8 @@ var ts;
                         ts.isObjectLiteralExpression(initializer) &&
                         (initializer.properties.length === 0 || ts.isPrototypeAccess(node.name)) &&
                         ts.hasEntries(symbol.exports);
-                    if (!isJSObjectLiteralInitializer && node.parent.parent.kind !== 226 /* ForInStatement */) {
+                    if (!isJSObjectLiteralInitializer && node.parent.parent.kind !== 227 /* ForInStatement */) {
                         checkTypeAssignableToAndOptionallyElaborate(checkExpressionCached(initializer), type, node, initializer, /*headMessage*/ undefined);
-                        checkParameterInitializer(node);
                     }
                 }
                 if (symbol.declarations.length > 1) {
@@ -55220,7 +56977,7 @@ var ts;
                 if (type !== errorType && declarationType !== errorType &&
                     !isTypeIdenticalTo(type, declarationType) &&
                     !(symbol.flags & 67108864 /* Assignment */)) {
-                    errorNextVariableOrPropertyDeclarationMustHaveSameType(type, node, declarationType);
+                    errorNextVariableOrPropertyDeclarationMustHaveSameType(symbol.valueDeclaration, type, node, declarationType);
                 }
                 if (node.initializer) {
                     checkTypeAssignableToAndOptionallyElaborate(checkExpressionCached(node.initializer), declarationType, node, node.initializer, /*headMessage*/ undefined);
@@ -55229,26 +56986,30 @@ var ts;
                     error(node.name, ts.Diagnostics.All_declarations_of_0_must_have_identical_modifiers, ts.declarationNameToString(node.name));
                 }
             }
-            if (node.kind !== 154 /* PropertyDeclaration */ && node.kind !== 153 /* PropertySignature */) {
+            if (node.kind !== 155 /* PropertyDeclaration */ && node.kind !== 154 /* PropertySignature */) {
                 // We know we don't have a binding pattern or computed name here
                 checkExportsOnMergedDeclarations(node);
-                if (node.kind === 237 /* VariableDeclaration */ || node.kind === 186 /* BindingElement */) {
+                if (node.kind === 238 /* VariableDeclaration */ || node.kind === 187 /* BindingElement */) {
                     checkVarDeclaredNamesNotShadowed(node);
                 }
                 checkCollisionWithRequireExportsInGeneratedCode(node, node.name);
                 checkCollisionWithGlobalPromiseInGeneratedCode(node, node.name);
             }
         }
-        function errorNextVariableOrPropertyDeclarationMustHaveSameType(firstType, nextDeclaration, nextType) {
+        function errorNextVariableOrPropertyDeclarationMustHaveSameType(firstDeclaration, firstType, nextDeclaration, nextType) {
             var nextDeclarationName = ts.getNameOfDeclaration(nextDeclaration);
-            var message = nextDeclaration.kind === 154 /* PropertyDeclaration */ || nextDeclaration.kind === 153 /* PropertySignature */
+            var message = nextDeclaration.kind === 155 /* PropertyDeclaration */ || nextDeclaration.kind === 154 /* PropertySignature */
                 ? ts.Diagnostics.Subsequent_property_declarations_must_have_the_same_type_Property_0_must_be_of_type_1_but_here_has_type_2
                 : ts.Diagnostics.Subsequent_variable_declarations_must_have_the_same_type_Variable_0_must_be_of_type_1_but_here_has_type_2;
-            error(nextDeclarationName, message, ts.declarationNameToString(nextDeclarationName), typeToString(firstType), typeToString(nextType));
+            var declName = ts.declarationNameToString(nextDeclarationName);
+            var err = error(nextDeclarationName, message, declName, typeToString(firstType), typeToString(nextType));
+            if (firstDeclaration) {
+                ts.addRelatedInfo(err, ts.createDiagnosticForNode(firstDeclaration, ts.Diagnostics._0_was_also_declared_here, declName));
+            }
         }
         function areDeclarationFlagsIdentical(left, right) {
-            if ((left.kind === 151 /* Parameter */ && right.kind === 237 /* VariableDeclaration */) ||
-                (left.kind === 237 /* VariableDeclaration */ && right.kind === 151 /* Parameter */)) {
+            if ((left.kind === 152 /* Parameter */ && right.kind === 238 /* VariableDeclaration */) ||
+                (left.kind === 238 /* VariableDeclaration */ && right.kind === 152 /* Parameter */)) {
                 // Differences in optionality between parameters and variables are allowed.
                 return true;
             }
@@ -55287,7 +57048,7 @@ var ts;
             checkGrammarStatementInAmbientContext(node);
             checkTruthinessExpression(node.expression);
             checkSourceElement(node.thenStatement);
-            if (node.thenStatement.kind === 220 /* EmptyStatement */) {
+            if (node.thenStatement.kind === 221 /* EmptyStatement */) {
                 error(node.thenStatement, ts.Diagnostics.The_body_of_an_if_statement_cannot_be_the_empty_statement);
             }
             checkSourceElement(node.elseStatement);
@@ -55314,12 +57075,12 @@ var ts;
         function checkForStatement(node) {
             // Grammar checking
             if (!checkGrammarStatementInAmbientContext(node)) {
-                if (node.initializer && node.initializer.kind === 238 /* VariableDeclarationList */) {
+                if (node.initializer && node.initializer.kind === 239 /* VariableDeclarationList */) {
                     checkGrammarVariableDeclarationList(node.initializer);
                 }
             }
             if (node.initializer) {
-                if (node.initializer.kind === 238 /* VariableDeclarationList */) {
+                if (node.initializer.kind === 239 /* VariableDeclarationList */) {
                     ts.forEach(node.initializer.declarations, checkVariableDeclaration);
                 }
                 else {
@@ -55339,9 +57100,9 @@ var ts;
             checkGrammarForInOrForOfStatement(node);
             if (node.awaitModifier) {
                 var functionFlags = ts.getFunctionFlags(ts.getContainingFunction(node));
-                if ((functionFlags & (4 /* Invalid */ | 2 /* Async */)) === 2 /* Async */ && languageVersion < 7 /* ESNext */) {
+                if ((functionFlags & (4 /* Invalid */ | 2 /* Async */)) === 2 /* Async */ && languageVersion < 99 /* ESNext */) {
                     // for..await..of in an async function or async generator function prior to ESNext requires the __asyncValues helper
-                    checkExternalEmitHelpers(node, 16384 /* ForAwaitOfIncludes */);
+                    checkExternalEmitHelpers(node, 32768 /* ForAwaitOfIncludes */);
                 }
             }
             else if (compilerOptions.downlevelIteration && languageVersion < 2 /* ES2015 */) {
@@ -55353,14 +57114,14 @@ var ts;
             // via checkRightHandSideOfForOf.
             // If the LHS is an expression, check the LHS, as a destructuring assignment or as a reference.
             // Then check that the RHS is assignable to it.
-            if (node.initializer.kind === 238 /* VariableDeclarationList */) {
+            if (node.initializer.kind === 239 /* VariableDeclarationList */) {
                 checkForInOrForOfVariableDeclaration(node);
             }
             else {
                 var varExpr = node.initializer;
                 var iteratedType = checkRightHandSideOfForOf(node.expression, node.awaitModifier);
                 // There may be a destructuring assignment on the left side
-                if (varExpr.kind === 187 /* ArrayLiteralExpression */ || varExpr.kind === 188 /* ObjectLiteralExpression */) {
+                if (varExpr.kind === 188 /* ArrayLiteralExpression */ || varExpr.kind === 189 /* ObjectLiteralExpression */) {
                     // iteratedType may be undefined. In this case, we still want to check the structure of
                     // varExpr, in particular making sure it's a valid LeftHandSideExpression. But we'd like
                     // to short circuit the type relation checking as much as possible, so we pass the unknownType.
@@ -55392,7 +57153,7 @@ var ts;
             // for (let VarDecl in Expr) Statement
             //   VarDecl must be a variable declaration without a type annotation that declares a variable of type Any,
             //   and Expr must be an expression of type Any, an object type, or a type parameter type.
-            if (node.initializer.kind === 238 /* VariableDeclarationList */) {
+            if (node.initializer.kind === 239 /* VariableDeclarationList */) {
                 var variable = node.initializer.declarations[0];
                 if (variable && ts.isBindingPattern(variable.name)) {
                     error(variable.name, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern);
@@ -55406,7 +57167,7 @@ var ts;
                 //   and Expr must be an expression of type Any, an object type, or a type parameter type.
                 var varExpr = node.initializer;
                 var leftType = checkExpression(varExpr);
-                if (varExpr.kind === 187 /* ArrayLiteralExpression */ || varExpr.kind === 188 /* ObjectLiteralExpression */) {
+                if (varExpr.kind === 188 /* ArrayLiteralExpression */ || varExpr.kind === 189 /* ObjectLiteralExpression */) {
                     error(varExpr, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern);
                 }
                 else if (!isTypeAssignableTo(getIndexTypeOrString(rightType), leftType)) {
@@ -55437,20 +57198,22 @@ var ts;
         }
         function checkRightHandSideOfForOf(rhsExpression, awaitModifier) {
             var expressionType = checkNonNullExpression(rhsExpression);
-            return checkIteratedTypeOrElementType(expressionType, rhsExpression, /*allowStringInput*/ true, awaitModifier !== undefined);
+            var use = awaitModifier ? 15 /* ForAwaitOf */ : 13 /* ForOf */;
+            return checkIteratedTypeOrElementType(use, expressionType, undefinedType, rhsExpression);
         }
-        function checkIteratedTypeOrElementType(inputType, errorNode, allowStringInput, allowAsyncIterables) {
+        function checkIteratedTypeOrElementType(use, inputType, sentType, errorNode) {
             if (isTypeAny(inputType)) {
                 return inputType;
             }
-            return getIteratedTypeOrElementType(inputType, errorNode, allowStringInput, allowAsyncIterables, /*checkAssignability*/ true) || anyType;
+            return getIteratedTypeOrElementType(use, inputType, sentType, errorNode, /*checkAssignability*/ true) || anyType;
         }
         /**
          * When consuming an iterable type in a for..of, spread, or iterator destructuring assignment
          * we want to get the iterated type of an iterable for ES2015 or later, or the iterated type
          * of a iterable (if defined globally) or element type of an array like for ES2015 or earlier.
          */
-        function getIteratedTypeOrElementType(inputType, errorNode, allowStringInput, allowAsyncIterables, checkAssignability) {
+        function getIteratedTypeOrElementType(use, inputType, sentType, errorNode, checkAssignability) {
+            var allowAsyncIterables = (use & 2 /* AllowsAsyncIterablesFlag */) !== 0;
             if (inputType === neverType) {
                 reportTypeNotIterableError(errorNode, inputType, allowAsyncIterables); // TODO: GH#18217
                 return undefined;
@@ -55462,9 +57225,21 @@ var ts;
             // downlevelIteration is requested.
             if (uplevelIteration || downlevelIteration || allowAsyncIterables) {
                 // We only report errors for an invalid iterable type in ES2015 or higher.
-                var iteratedType = getIteratedTypeOfIterable(inputType, uplevelIteration ? errorNode : undefined, allowAsyncIterables, /*allowSyncIterables*/ true, checkAssignability);
-                if (iteratedType || uplevelIteration) {
-                    return iteratedType;
+                var iterationTypes = getIterationTypesOfIterable(inputType, use, uplevelIteration ? errorNode : undefined);
+                if (checkAssignability) {
+                    if (iterationTypes) {
+                        var diagnostic = use & 8 /* ForOfFlag */ ? ts.Diagnostics.Cannot_iterate_value_because_the_next_method_of_its_iterator_expects_type_1_but_for_of_will_always_send_0 :
+                            use & 32 /* SpreadFlag */ ? ts.Diagnostics.Cannot_iterate_value_because_the_next_method_of_its_iterator_expects_type_1_but_array_spread_will_always_send_0 :
+                                use & 64 /* DestructuringFlag */ ? ts.Diagnostics.Cannot_iterate_value_because_the_next_method_of_its_iterator_expects_type_1_but_array_destructuring_will_always_send_0 :
+                                    use & 16 /* YieldStarFlag */ ? ts.Diagnostics.Cannot_delegate_iteration_to_value_because_the_next_method_of_its_iterator_expects_type_1_but_the_containing_generator_will_always_send_0 :
+                                        undefined;
+                        if (diagnostic) {
+                            checkTypeAssignableTo(sentType, iterationTypes.nextType, errorNode, diagnostic);
+                        }
+                    }
+                }
+                if (iterationTypes || uplevelIteration) {
+                    return iterationTypes && iterationTypes.yieldType;
                 }
             }
             var arrayType = inputType;
@@ -55473,7 +57248,7 @@ var ts;
             // If strings are permitted, remove any string-like constituents from the array type.
             // This allows us to find other non-string element types from an array unioned with
             // a string.
-            if (allowStringInput) {
+            if (use & 4 /* AllowsStringInputFlag */) {
                 if (arrayType.flags & 1048576 /* Union */) {
                     // After we remove all types that are StringLike, we will know if there was a string constituent
                     // based on whether the result of filter is a new array.
@@ -55508,19 +57283,19 @@ var ts;
                     // want to say that number is not an array type. But if the input was just
                     // number and string input is allowed, we want to say that number is not an
                     // array type or a string type.
-                    var isIterable = !!getIteratedTypeOfIterable(inputType, /* errorNode */ undefined, allowAsyncIterables, /*allowSyncIterables*/ true, checkAssignability);
-                    var diagnostic = !allowStringInput || hasStringConstituent
+                    var yieldType = getIterationTypeOfIterable(use, 0 /* Yield */, inputType, /*errorNode*/ undefined);
+                    var _a = !(use & 4 /* AllowsStringInputFlag */) || hasStringConstituent
                         ? downlevelIteration
-                            ? ts.Diagnostics.Type_0_is_not_an_array_type_or_does_not_have_a_Symbol_iterator_method_that_returns_an_iterator
-                            : isIterable
-                                ? ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type_Use_compiler_option_downlevelIteration_to_allow_iterating_of_iterators
-                                : ts.Diagnostics.Type_0_is_not_an_array_type
+                            ? [ts.Diagnostics.Type_0_is_not_an_array_type_or_does_not_have_a_Symbol_iterator_method_that_returns_an_iterator, true]
+                            : yieldType
+                                ? [ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type_Use_compiler_option_downlevelIteration_to_allow_iterating_of_iterators, false]
+                                : [ts.Diagnostics.Type_0_is_not_an_array_type, true]
                         : downlevelIteration
-                            ? ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type_or_does_not_have_a_Symbol_iterator_method_that_returns_an_iterator
-                            : isIterable
-                                ? ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type_Use_compiler_option_downlevelIteration_to_allow_iterating_of_iterators
-                                : ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type;
-                    error(errorNode, diagnostic, typeToString(arrayType));
+                            ? [ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type_or_does_not_have_a_Symbol_iterator_method_that_returns_an_iterator, true]
+                            : yieldType
+                                ? [ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type_Use_compiler_option_downlevelIteration_to_allow_iterating_of_iterators, false]
+                                : [ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type, true], defaultDiagnostic = _a[0], maybeMissingAwait = _a[1];
+                    errorAndMaybeSuggestAwait(errorNode, maybeMissingAwait && !!getAwaitedTypeOfPromise(arrayType), defaultDiagnostic, typeToString(arrayType));
                 }
                 return hasStringConstituent ? stringType : undefined;
             }
@@ -55535,33 +57310,78 @@ var ts;
             return arrayElementType;
         }
         /**
-         * We want to treat type as an iterable, and get the type it is an iterable of. The iterable
-         * must have the following structure (annotated with the names of the variables below):
+         * Gets the requested "iteration type" from an `Iterable`-like or `AsyncIterable`-like type.
+         */
+        function getIterationTypeOfIterable(use, typeKind, inputType, errorNode) {
+            if (isTypeAny(inputType)) {
+                return undefined;
+            }
+            var iterationTypes = getIterationTypesOfIterable(inputType, use, errorNode);
+            return iterationTypes && iterationTypes[getIterationTypesKeyFromIterationTypeKind(typeKind)];
+        }
+        function createIterationTypes(yieldType, returnType, nextType) {
+            // `yieldType` and `returnType` are defaulted to `neverType` they each will be combined
+            // via `getUnionType` when merging iteration types. `nextType` is defined as `unknownType`
+            // as it is combined via `getIntersectionType` when merging iteration types.
+            if (yieldType === void 0) { yieldType = neverType; }
+            if (returnType === void 0) { returnType = neverType; }
+            if (nextType === void 0) { nextType = unknownType; }
+            // Use the cache only for intrinsic types to keep it small as they are likely to be
+            // more frequently created (i.e. `Iterator<number, void, unknown>`). Iteration types
+            // are also cached on the type they are requested for, so we shouldn't need to maintain
+            // the cache for less-frequently used types.
+            if (yieldType.flags & 67359327 /* Intrinsic */ &&
+                returnType.flags & (1 /* Any */ | 131072 /* Never */ | 2 /* Unknown */ | 16384 /* Void */ | 32768 /* Undefined */) &&
+                nextType.flags & (1 /* Any */ | 131072 /* Never */ | 2 /* Unknown */ | 16384 /* Void */ | 32768 /* Undefined */)) {
+                var id = getTypeListId([yieldType, returnType, nextType]);
+                var iterationTypes = iterationTypesCache.get(id);
+                if (!iterationTypes) {
+                    iterationTypes = { yieldType: yieldType, returnType: returnType, nextType: nextType };
+                    iterationTypesCache.set(id, iterationTypes);
+                }
+                return iterationTypes;
+            }
+            return { yieldType: yieldType, returnType: returnType, nextType: nextType };
+        }
+        /**
+         * Combines multiple `IterationTypes` records.
          *
-         *     { // iterable
-         *         [Symbol.iterator]: { // iteratorMethod
-         *             (): Iterator<T>
-         *         }
-         *     }
+         * If `array` is empty or all elements are missing or are references to `noIterationTypes`,
+         * then `noIterationTypes` is returned. Otherwise, an `IterationTypes` record is returned
+         * for the combined iteration types.
+         */
+        function combineIterationTypes(array) {
+            var yieldTypes;
+            var returnTypes;
+            var nextTypes;
+            for (var _i = 0, array_10 = array; _i < array_10.length; _i++) {
+                var iterationTypes = array_10[_i];
+                if (iterationTypes === undefined || iterationTypes === noIterationTypes) {
+                    continue;
+                }
+                if (iterationTypes === anyIterationTypes) {
+                    return anyIterationTypes;
+                }
+                yieldTypes = ts.append(yieldTypes, iterationTypes.yieldType);
+                returnTypes = ts.append(returnTypes, iterationTypes.returnType);
+                nextTypes = ts.append(nextTypes, iterationTypes.nextType);
+            }
+            if (yieldTypes || returnTypes || nextTypes) {
+                return createIterationTypes(yieldTypes && getUnionType(yieldTypes), returnTypes && getUnionType(returnTypes), nextTypes && getIntersectionType(nextTypes));
+            }
+            return noIterationTypes;
+        }
+        /**
+         * Gets the *yield*, *return*, and *next* types from an `Iterable`-like or `AsyncIterable`-like type.
          *
-         * For an async iterable, we expect the following structure:
-         *
-         *     { // iterable
-         *         [Symbol.asyncIterator]: { // iteratorMethod
-         *             (): AsyncIterator<T>
-         *         }
-         *     }
-         *
-         * T is the type we are after. At every level that involves analyzing return types
-         * of signatures, we union the return types of all the signatures.
+         * At every level that involves analyzing return types of signatures, we union the return types of all the signatures.
          *
          * Another thing to note is that at any step of this process, we could run into a dead end,
          * meaning either the property is missing, or we run into the anyType. If either of these things
-         * happens, we return undefined to signal that we could not find the iterated type. If a property
-         * is missing, and the previous step did not result in 'any', then we also give an error if the
+         * happens, we return `undefined` to signal that we could not find the iteration type. If a property
+         * is missing, and the previous step did not result in `any`, then we also give an error if the
          * caller requested it. Then the caller can decide what to do in the case where there is no iterated
-         * type. This is different from returning anyType, because that would signify that we have matched the
-         * whole pattern and that T (above) is 'any'.
+         * type.
          *
          * For a **for-of** statement, `yield*` (in a normal generator), spread, array
          * destructuring, or normal generator we will only ever look for a `[Symbol.iterator]()`
@@ -55572,164 +57392,412 @@ var ts;
          * For a **for-await-of** statement or a `yield*` in an async generator we will look for
          * the `[Symbol.asyncIterator]()` method first, and then the `[Symbol.iterator]()` method.
          */
-        function getIteratedTypeOfIterable(type, errorNode, allowAsyncIterables, allowSyncIterables, checkAssignability) {
+        function getIterationTypesOfIterable(type, use, errorNode) {
             if (isTypeAny(type)) {
-                return undefined;
+                return anyIterationTypes;
             }
-            return mapType(type, getIteratedType);
-            function getIteratedType(type) {
-                var typeAsIterable = type;
-                if (allowAsyncIterables) {
-                    if (typeAsIterable.iteratedTypeOfAsyncIterable) {
-                        return typeAsIterable.iteratedTypeOfAsyncIterable;
+            if (!(type.flags & 1048576 /* Union */)) {
+                var iterationTypes_1 = getIterationTypesOfIterableWorker(type, use, errorNode);
+                if (iterationTypes_1 === noIterationTypes) {
+                    if (errorNode) {
+                        reportTypeNotIterableError(errorNode, type, !!(use & 2 /* AllowsAsyncIterablesFlag */));
                     }
-                    // As an optimization, if the type is an instantiation of the global `AsyncIterable<T>`
-                    // or the global `AsyncIterableIterator<T>` then just grab its type argument.
-                    if (isReferenceToType(type, getGlobalAsyncIterableType(/*reportErrors*/ false)) ||
-                        isReferenceToType(type, getGlobalAsyncIterableIteratorType(/*reportErrors*/ false))) {
-                        return typeAsIterable.iteratedTypeOfAsyncIterable = type.typeArguments[0];
-                    }
-                }
-                if (allowSyncIterables) {
-                    if (typeAsIterable.iteratedTypeOfIterable) {
-                        return allowAsyncIterables
-                            ? typeAsIterable.iteratedTypeOfAsyncIterable = getAwaitedType(typeAsIterable.iteratedTypeOfIterable)
-                            : typeAsIterable.iteratedTypeOfIterable;
-                    }
-                    // As an optimization, if the type is an instantiation of the global `Iterable<T>` or
-                    // `IterableIterator<T>` then just grab its type argument.
-                    if (isReferenceToType(type, getGlobalIterableType(/*reportErrors*/ false)) ||
-                        isReferenceToType(type, getGlobalIterableIteratorType(/*reportErrors*/ false))) {
-                        return allowAsyncIterables
-                            ? typeAsIterable.iteratedTypeOfAsyncIterable = getAwaitedType(type.typeArguments[0])
-                            : typeAsIterable.iteratedTypeOfIterable = type.typeArguments[0];
-                    }
-                }
-                var asyncMethodType = allowAsyncIterables && getTypeOfPropertyOfType(type, ts.getPropertyNameForKnownSymbolName("asyncIterator"));
-                var methodType = asyncMethodType || (allowSyncIterables ? getTypeOfPropertyOfType(type, ts.getPropertyNameForKnownSymbolName("iterator")) : undefined);
-                if (isTypeAny(methodType)) {
                     return undefined;
                 }
-                var signatures = methodType ? getSignaturesOfType(methodType, 0 /* Call */) : undefined;
-                if (!ts.some(signatures)) {
+                return iterationTypes_1;
+            }
+            var cacheKey = use & 2 /* AllowsAsyncIterablesFlag */ ? "iterationTypesOfAsyncIterable" : "iterationTypesOfIterable";
+            var cachedTypes = type[cacheKey];
+            if (cachedTypes)
+                return cachedTypes === noIterationTypes ? undefined : cachedTypes;
+            var allIterationTypes;
+            for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
+                var constituent = _a[_i];
+                var iterationTypes_2 = getIterationTypesOfIterableWorker(constituent, use, errorNode);
+                if (iterationTypes_2 === noIterationTypes) {
                     if (errorNode) {
-                        // only report on the first error
-                        reportTypeNotIterableError(errorNode, type, allowAsyncIterables);
+                        reportTypeNotIterableError(errorNode, type, !!(use & 2 /* AllowsAsyncIterablesFlag */));
                         errorNode = undefined;
                     }
-                    return undefined;
                 }
-                var returnType = getUnionType(ts.map(signatures, getReturnTypeOfSignature), 2 /* Subtype */);
-                var iteratedType = getIteratedTypeOfIterator(returnType, errorNode, /*isAsyncIterator*/ !!asyncMethodType);
-                if (checkAssignability && errorNode && iteratedType) {
-                    // If `checkAssignability` was specified, we were called from
-                    // `checkIteratedTypeOrElementType`. As such, we need to validate that
-                    // the type passed in is actually an Iterable.
-                    checkTypeAssignableTo(type, asyncMethodType
-                        ? createAsyncIterableType(iteratedType)
-                        : createIterableType(iteratedType), errorNode);
-                }
-                if (iteratedType) {
-                    return allowAsyncIterables
-                        ? typeAsIterable.iteratedTypeOfAsyncIterable = asyncMethodType ? iteratedType : getAwaitedType(iteratedType)
-                        : typeAsIterable.iteratedTypeOfIterable = iteratedType;
+                else {
+                    allIterationTypes = ts.append(allIterationTypes, iterationTypes_2);
                 }
             }
+            var iterationTypes = allIterationTypes ? combineIterationTypes(allIterationTypes) : noIterationTypes;
+            type[cacheKey] = iterationTypes;
+            return iterationTypes === noIterationTypes ? undefined : iterationTypes;
+        }
+        function getAsyncFromSyncIterationTypes(iterationTypes, errorNode) {
+            if (iterationTypes === noIterationTypes)
+                return noIterationTypes;
+            if (iterationTypes === anyIterationTypes)
+                return anyIterationTypes;
+            var yieldType = iterationTypes.yieldType, returnType = iterationTypes.returnType, nextType = iterationTypes.nextType;
+            return createIterationTypes(getAwaitedType(yieldType, errorNode) || anyType, getAwaitedType(returnType, errorNode) || anyType, nextType);
+        }
+        /**
+         * Gets the *yield*, *return*, and *next* types from a non-union type.
+         *
+         * If we are unable to find the *yield*, *return*, and *next* types, `noIterationTypes` is
+         * returned to indicate to the caller that it should report an error. Otherwise, an
+         * `IterationTypes` record is returned.
+         *
+         * NOTE: You probably don't want to call this directly and should be calling
+         * `getIterationTypesOfIterable` instead.
+         */
+        function getIterationTypesOfIterableWorker(type, use, errorNode) {
+            if (isTypeAny(type)) {
+                return anyIterationTypes;
+            }
+            if (use & 2 /* AllowsAsyncIterablesFlag */) {
+                var iterationTypes = getIterationTypesOfIterableCached(type, asyncIterationTypesResolver) ||
+                    getIterationTypesOfIterableFast(type, asyncIterationTypesResolver);
+                if (iterationTypes) {
+                    return iterationTypes;
+                }
+            }
+            if (use & 1 /* AllowsSyncIterablesFlag */) {
+                var iterationTypes = getIterationTypesOfIterableCached(type, syncIterationTypesResolver) ||
+                    getIterationTypesOfIterableFast(type, syncIterationTypesResolver);
+                if (iterationTypes) {
+                    if (use & 2 /* AllowsAsyncIterablesFlag */) {
+                        // for a sync iterable in an async context, only use the cached types if they are valid.
+                        if (iterationTypes !== noIterationTypes) {
+                            return type.iterationTypesOfAsyncIterable = getAsyncFromSyncIterationTypes(iterationTypes, errorNode);
+                        }
+                    }
+                    else {
+                        return iterationTypes;
+                    }
+                }
+            }
+            if (use & 2 /* AllowsAsyncIterablesFlag */) {
+                var iterationTypes = getIterationTypesOfIterableSlow(type, asyncIterationTypesResolver, errorNode);
+                if (iterationTypes !== noIterationTypes) {
+                    return iterationTypes;
+                }
+            }
+            if (use & 1 /* AllowsSyncIterablesFlag */) {
+                var iterationTypes = getIterationTypesOfIterableSlow(type, syncIterationTypesResolver, errorNode);
+                if (iterationTypes !== noIterationTypes) {
+                    if (use & 2 /* AllowsAsyncIterablesFlag */) {
+                        return type.iterationTypesOfAsyncIterable = iterationTypes
+                            ? getAsyncFromSyncIterationTypes(iterationTypes, errorNode)
+                            : noIterationTypes;
+                    }
+                    else {
+                        return iterationTypes;
+                    }
+                }
+            }
+            return noIterationTypes;
+        }
+        /**
+         * Gets the *yield*, *return*, and *next* types of an `Iterable`-like or
+         * `AsyncIterable`-like type from the cache.
+         *
+         * NOTE: You probably don't want to call this directly and should be calling
+         * `getIterationTypesOfIterable` instead.
+         */
+        function getIterationTypesOfIterableCached(type, resolver) {
+            return type[resolver.iterableCacheKey];
+        }
+        function getIterationTypesOfGlobalIterableType(globalType, resolver) {
+            var globalIterationTypes = getIterationTypesOfIterableCached(globalType, resolver) ||
+                getIterationTypesOfIterableSlow(globalType, resolver, /*errorNode*/ undefined);
+            return globalIterationTypes === noIterationTypes ? defaultIterationTypes : globalIterationTypes;
+        }
+        /**
+         * Gets the *yield*, *return*, and *next* types of an `Iterable`-like or `AsyncIterable`-like
+         * type from from common heuristics.
+         *
+         * If we previously analyzed this type and found no iteration types, `noIterationTypes` is
+         * returned. If we found iteration types, an `IterationTypes` record is returned.
+         * Otherwise, we return `undefined` to indicate to the caller it should perform a more
+         * exhaustive analysis.
+         *
+         * NOTE: You probably don't want to call this directly and should be calling
+         * `getIterationTypesOfIterable` instead.
+         */
+        function getIterationTypesOfIterableFast(type, resolver) {
+            // As an optimization, if the type is an instantiation of one of the following global types, then
+            // just grab its related type argument:
+            // - `Iterable<T>` or `AsyncIterable<T>`
+            // - `IterableIterator<T>` or `AsyncIterableIterator<T>`
+            var globalType;
+            if (isReferenceToType(type, globalType = resolver.getGlobalIterableType(/*reportErrors*/ false)) ||
+                isReferenceToType(type, globalType = resolver.getGlobalIterableIteratorType(/*reportErrors*/ false))) {
+                var yieldType = type.typeArguments[0];
+                // The "return" and "next" types of `Iterable` and `IterableIterator` are defined by the
+                // iteration types of their `[Symbol.iterator]()` method. The same is true for their async cousins.
+                // While we define these as `any` and `undefined` in our libs by default, a custom lib *could* use
+                // different definitions.
+                var _a = getIterationTypesOfGlobalIterableType(globalType, resolver), returnType = _a.returnType, nextType = _a.nextType;
+                return type[resolver.iterableCacheKey] = createIterationTypes(yieldType, returnType, nextType);
+            }
+            // As an optimization, if the type is an instantiation of the following global type, then
+            // just grab its related type arguments:
+            // - `Generator<T, TReturn, TNext>` or `AsyncGenerator<T, TReturn, TNext>`
+            if (isReferenceToType(type, resolver.getGlobalGeneratorType(/*reportErrors*/ false))) {
+                var _b = type.typeArguments, yieldType = _b[0], returnType = _b[1], nextType = _b[2];
+                return type[resolver.iterableCacheKey] = createIterationTypes(yieldType, returnType, nextType);
+            }
+        }
+        /**
+         * Gets the *yield*, *return*, and *next* types of an `Iterable`-like or `AsyncIterable`-like
+         * type from its members.
+         *
+         * If we successfully found the *yield*, *return*, and *next* types, an `IterationTypes`
+         * record is returned. Otherwise, `noIterationTypes` is returned.
+         *
+         * NOTE: You probably don't want to call this directly and should be calling
+         * `getIterationTypesOfIterable` instead.
+         */
+        function getIterationTypesOfIterableSlow(type, resolver, errorNode) {
+            var method = getPropertyOfType(type, ts.getPropertyNameForKnownSymbolName(resolver.iteratorSymbolName));
+            var methodType = method && !(method.flags & 16777216 /* Optional */) ? getTypeOfSymbol(method) : undefined;
+            if (isTypeAny(methodType)) {
+                return type[resolver.iterableCacheKey] = anyIterationTypes;
+            }
+            var signatures = methodType ? getSignaturesOfType(methodType, 0 /* Call */) : undefined;
+            if (!ts.some(signatures)) {
+                return type[resolver.iterableCacheKey] = noIterationTypes;
+            }
+            var iteratorType = getUnionType(ts.map(signatures, getReturnTypeOfSignature), 2 /* Subtype */);
+            var iterationTypes = getIterationTypesOfIterator(iteratorType, resolver, errorNode) || noIterationTypes;
+            return type[resolver.iterableCacheKey] = iterationTypes;
         }
         function reportTypeNotIterableError(errorNode, type, allowAsyncIterables) {
-            error(errorNode, allowAsyncIterables
+            var message = allowAsyncIterables
                 ? ts.Diagnostics.Type_0_must_have_a_Symbol_asyncIterator_method_that_returns_an_async_iterator
-                : ts.Diagnostics.Type_0_must_have_a_Symbol_iterator_method_that_returns_an_iterator, typeToString(type));
+                : ts.Diagnostics.Type_0_must_have_a_Symbol_iterator_method_that_returns_an_iterator;
+            errorAndMaybeSuggestAwait(errorNode, !!getAwaitedTypeOfPromise(type), message, typeToString(type));
         }
         /**
-         * This function has very similar logic as getIteratedTypeOfIterable, except that it operates on
-         * Iterators instead of Iterables. Here is the structure:
+         * Gets the *yield*, *return*, and *next* types from an `Iterator`-like or `AsyncIterator`-like type.
          *
-         *  { // iterator
-         *      next: { // nextMethod
-         *          (): { // nextResult
-         *              value: T // nextValue
-         *          }
-         *      }
-         *  }
-         *
-         * For an async iterator, we expect the following structure:
-         *
-         *  { // iterator
-         *      next: { // nextMethod
-         *          (): PromiseLike<{ // nextResult
-         *              value: T // nextValue
-         *          }>
-         *      }
-         *  }
+         * If we successfully found the *yield*, *return*, and *next* types, an `IterationTypes`
+         * record is returned. Otherwise, `undefined` is returned.
          */
-        function getIteratedTypeOfIterator(type, errorNode, isAsyncIterator) {
+        function getIterationTypesOfIterator(type, resolver, errorNode) {
             if (isTypeAny(type)) {
-                return undefined;
+                return anyIterationTypes;
             }
-            var typeAsIterator = type;
-            if (isAsyncIterator ? typeAsIterator.iteratedTypeOfAsyncIterator : typeAsIterator.iteratedTypeOfIterator) {
-                return isAsyncIterator ? typeAsIterator.iteratedTypeOfAsyncIterator : typeAsIterator.iteratedTypeOfIterator;
-            }
-            // As an optimization, if the type is an instantiation of the global `Iterator<T>` (for
-            // a non-async iterator) or the global `AsyncIterator<T>` (for an async-iterator) then
-            // just grab its type argument.
-            var getIteratorType = isAsyncIterator ? getGlobalAsyncIteratorType : getGlobalIteratorType;
-            if (isReferenceToType(type, getIteratorType(/*reportErrors*/ false))) {
-                return isAsyncIterator
-                    ? typeAsIterator.iteratedTypeOfAsyncIterator = type.typeArguments[0]
-                    : typeAsIterator.iteratedTypeOfIterator = type.typeArguments[0];
-            }
-            // Both async and non-async iterators must have a `next` method.
-            var nextMethod = getTypeOfPropertyOfType(type, "next");
-            if (isTypeAny(nextMethod)) {
-                return undefined;
-            }
-            var nextMethodSignatures = nextMethod ? getSignaturesOfType(nextMethod, 0 /* Call */) : ts.emptyArray;
-            if (nextMethodSignatures.length === 0) {
-                if (errorNode) {
-                    error(errorNode, isAsyncIterator
-                        ? ts.Diagnostics.An_async_iterator_must_have_a_next_method
-                        : ts.Diagnostics.An_iterator_must_have_a_next_method);
-                }
-                return undefined;
-            }
-            var nextResult = getUnionType(ts.map(nextMethodSignatures, getReturnTypeOfSignature), 2 /* Subtype */);
-            if (isTypeAny(nextResult)) {
-                return undefined;
-            }
-            // For an async iterator, we must get the awaited type of the return type.
-            if (isAsyncIterator) {
-                nextResult = getAwaitedTypeOfPromise(nextResult, errorNode, ts.Diagnostics.The_type_returned_by_the_next_method_of_an_async_iterator_must_be_a_promise_for_a_type_with_a_value_property);
-                if (isTypeAny(nextResult)) {
-                    return undefined;
-                }
-            }
-            var nextValue = nextResult && getTypeOfPropertyOfType(nextResult, "value");
-            if (!nextValue) {
-                if (errorNode) {
-                    error(errorNode, isAsyncIterator
-                        ? ts.Diagnostics.The_type_returned_by_the_next_method_of_an_async_iterator_must_be_a_promise_for_a_type_with_a_value_property
-                        : ts.Diagnostics.The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property);
-                }
-                return undefined;
-            }
-            return isAsyncIterator
-                ? typeAsIterator.iteratedTypeOfAsyncIterator = nextValue
-                : typeAsIterator.iteratedTypeOfIterator = nextValue;
+            var iterationTypes = getIterationTypesOfIteratorCached(type, resolver) ||
+                getIterationTypesOfIteratorFast(type, resolver) ||
+                getIterationTypesOfIteratorSlow(type, resolver, errorNode);
+            return iterationTypes === noIterationTypes ? undefined : iterationTypes;
         }
         /**
-         * A generator may have a return type of `Iterator<T>`, `Iterable<T>`, or
-         * `IterableIterator<T>`. An async generator may have a return type of `AsyncIterator<T>`,
-         * `AsyncIterable<T>`, or `AsyncIterableIterator<T>`. This function can be used to extract
-         * the iterated type from this return type for contextual typing and verifying signatures.
+         * Gets the iteration types of an `Iterator`-like or `AsyncIterator`-like type from the
+         * cache.
+         *
+         * NOTE: You probably don't want to call this directly and should be calling
+         * `getIterationTypesOfIterator` instead.
          */
-        function getIteratedTypeOfGenerator(returnType, isAsyncGenerator) {
+        function getIterationTypesOfIteratorCached(type, resolver) {
+            return type[resolver.iteratorCacheKey];
+        }
+        /**
+         * Gets the iteration types of an `Iterator`-like or `AsyncIterator`-like type from the
+         * cache or from common heuristics.
+         *
+         * If we previously analyzed this type and found no iteration types, `noIterationTypes` is
+         * returned. If we found iteration types, an `IterationTypes` record is returned.
+         * Otherwise, we return `undefined` to indicate to the caller it should perform a more
+         * exhaustive analysis.
+         *
+         * NOTE: You probably don't want to call this directly and should be calling
+         * `getIterationTypesOfIterator` instead.
+         */
+        function getIterationTypesOfIteratorFast(type, resolver) {
+            // As an optimization, if the type is an instantiation of one of the following global types,
+            // then just grab its related type argument:
+            // - `IterableIterator<T>` or `AsyncIterableIterator<T>`
+            // - `Iterator<T, TReturn, TNext>` or `AsyncIterator<T, TReturn, TNext>`
+            // - `Generator<T, TReturn, TNext>` or `AsyncGenerator<T, TReturn, TNext>`
+            var globalType = resolver.getGlobalIterableIteratorType(/*reportErrors*/ false);
+            if (isReferenceToType(type, globalType)) {
+                var yieldType = type.typeArguments[0];
+                // The "return" and "next" types of `IterableIterator` and `AsyncIterableIterator` are defined by the
+                // iteration types of their `next`, `return`, and `throw` methods. While we define these as `any`
+                // and `undefined` in our libs by default, a custom lib *could* use different definitions.
+                var globalIterationTypes = getIterationTypesOfIteratorCached(globalType, resolver) ||
+                    getIterationTypesOfIteratorSlow(globalType, resolver, /*errorNode*/ undefined);
+                var _a = globalIterationTypes === noIterationTypes ? defaultIterationTypes : globalIterationTypes, returnType = _a.returnType, nextType = _a.nextType;
+                return type[resolver.iteratorCacheKey] = createIterationTypes(yieldType, returnType, nextType);
+            }
+            if (isReferenceToType(type, resolver.getGlobalIteratorType(/*reportErrors*/ false)) ||
+                isReferenceToType(type, resolver.getGlobalGeneratorType(/*reportErrors*/ false))) {
+                var _b = type.typeArguments, yieldType = _b[0], returnType = _b[1], nextType = _b[2];
+                return type[resolver.iteratorCacheKey] = createIterationTypes(yieldType, returnType, nextType);
+            }
+        }
+        function isIteratorResult(type, kind) {
+            // From https://tc39.github.io/ecma262/#sec-iteratorresult-interface:
+            // > [done] is the result status of an iterator `next` method call. If the end of the iterator was reached `done` is `true`.
+            // > If the end was not reached `done` is `false` and a value is available.
+            // > If a `done` property (either own or inherited) does not exist, it is consider to have the value `false`.
+            var doneType = getTypeOfPropertyOfType(type, "done") || falseType;
+            return isTypeAssignableTo(kind === 0 /* Yield */ ? falseType : trueType, doneType);
+        }
+        function isYieldIteratorResult(type) {
+            return isIteratorResult(type, 0 /* Yield */);
+        }
+        function isReturnIteratorResult(type) {
+            return isIteratorResult(type, 1 /* Return */);
+        }
+        /**
+         * Gets the *yield* and *return* types of an `IteratorResult`-like type.
+         *
+         * If we are unable to determine a *yield* or a *return* type, `noIterationTypes` is
+         * returned to indicate to the caller that it should handle the error. Otherwise, an
+         * `IterationTypes` record is returned.
+         */
+        function getIterationTypesOfIteratorResult(type) {
+            if (isTypeAny(type)) {
+                return anyIterationTypes;
+            }
+            var cachedTypes = type.iterationTypesOfIteratorResult;
+            if (cachedTypes) {
+                return cachedTypes;
+            }
+            // As an optimization, if the type is an instantiation of one of the global `IteratorYieldResult<T>`
+            // or `IteratorReturnResult<TReturn>` types, then just grab its type argument.
+            if (isReferenceToType(type, getGlobalIteratorYieldResultType(/*reportErrors*/ false))) {
+                var yieldType_1 = type.typeArguments[0];
+                return type.iterationTypesOfIteratorResult = createIterationTypes(yieldType_1, /*returnType*/ undefined, /*nextType*/ undefined);
+            }
+            if (isReferenceToType(type, getGlobalIteratorReturnResultType(/*reportErrors*/ false))) {
+                var returnType_1 = type.typeArguments[0];
+                return type.iterationTypesOfIteratorResult = createIterationTypes(/*yieldType*/ undefined, returnType_1, /*nextType*/ undefined);
+            }
+            // Choose any constituents that can produce the requested iteration type.
+            var yieldIteratorResult = filterType(type, isYieldIteratorResult);
+            var yieldType = yieldIteratorResult !== neverType ? getTypeOfPropertyOfType(yieldIteratorResult, "value") : undefined;
+            var returnIteratorResult = filterType(type, isReturnIteratorResult);
+            var returnType = returnIteratorResult !== neverType ? getTypeOfPropertyOfType(returnIteratorResult, "value") : undefined;
+            if (!yieldType && !returnType) {
+                return type.iterationTypesOfIteratorResult = noIterationTypes;
+            }
+            // From https://tc39.github.io/ecma262/#sec-iteratorresult-interface
+            // > ... If the iterator does not have a return value, `value` is `undefined`. In that case, the
+            // > `value` property may be absent from the conforming object if it does not inherit an explicit
+            // > `value` property.
+            return type.iterationTypesOfIteratorResult = createIterationTypes(yieldType, returnType || voidType, /*nextType*/ undefined);
+        }
+        /**
+         * Gets the *yield*, *return*, and *next* types of a the `next()`, `return()`, or
+         * `throw()` method of an `Iterator`-like or `AsyncIterator`-like type.
+         *
+         * If we successfully found the *yield*, *return*, and *next* types, an `IterationTypes`
+         * record is returned. Otherwise, we return `undefined`.
+         */
+        function getIterationTypesOfMethod(type, resolver, methodName, errorNode) {
+            var method = getPropertyOfType(type, methodName);
+            // Ignore 'return' or 'throw' if they are missing.
+            if (!method && methodName !== "next") {
+                return undefined;
+            }
+            var methodType = method && !(methodName === "next" && (method.flags & 16777216 /* Optional */))
+                ? methodName === "next" ? getTypeOfSymbol(method) : getTypeWithFacts(getTypeOfSymbol(method), 2097152 /* NEUndefinedOrNull */)
+                : undefined;
+            if (isTypeAny(methodType)) {
+                // `return()` and `throw()` don't provide a *next* type.
+                return methodName === "next" ? anyIterationTypes : anyIterationTypesExceptNext;
+            }
+            // Both async and non-async iterators *must* have a `next` method.
+            var methodSignatures = methodType ? getSignaturesOfType(methodType, 0 /* Call */) : ts.emptyArray;
+            if (methodSignatures.length === 0) {
+                if (errorNode) {
+                    var diagnostic = methodName === "next"
+                        ? resolver.mustHaveANextMethodDiagnostic
+                        : resolver.mustBeAMethodDiagnostic;
+                    error(errorNode, diagnostic, methodName);
+                }
+                return methodName === "next" ? anyIterationTypes : undefined;
+            }
+            // Extract the first parameter and return type of each signature.
+            var methodParameterTypes;
+            var methodReturnTypes;
+            for (var _i = 0, methodSignatures_1 = methodSignatures; _i < methodSignatures_1.length; _i++) {
+                var signature = methodSignatures_1[_i];
+                if (methodName !== "throw" && ts.some(signature.parameters)) {
+                    methodParameterTypes = ts.append(methodParameterTypes, getTypeAtPosition(signature, 0));
+                }
+                methodReturnTypes = ts.append(methodReturnTypes, getReturnTypeOfSignature(signature));
+            }
+            // Resolve the *next* or *return* type from the first parameter of a `next()` or
+            // `return()` method, respectively.
+            var returnTypes;
+            var nextType;
+            if (methodName !== "throw") {
+                var methodParameterType = methodParameterTypes ? getUnionType(methodParameterTypes) : unknownType;
+                var resolvedMethodParameterType = resolver.resolveIterationType(methodParameterType, errorNode) || anyType;
+                if (methodName === "next") {
+                    nextType = resolvedMethodParameterType;
+                }
+                else if (methodName === "return") {
+                    returnTypes = ts.append(returnTypes, resolvedMethodParameterType);
+                }
+            }
+            // Resolve the *yield* and *return* types from the return type of the method (i.e. `IteratorResult`)
+            var yieldType;
+            var methodReturnType = methodReturnTypes ? getUnionType(methodReturnTypes, 2 /* Subtype */) : neverType;
+            var resolvedMethodReturnType = resolver.resolveIterationType(methodReturnType, errorNode) || anyType;
+            var iterationTypes = getIterationTypesOfIteratorResult(resolvedMethodReturnType);
+            if (iterationTypes === noIterationTypes) {
+                if (errorNode) {
+                    error(errorNode, resolver.mustHaveAValueDiagnostic, methodName);
+                }
+                yieldType = anyType;
+                returnTypes = ts.append(returnTypes, anyType);
+            }
+            else {
+                yieldType = iterationTypes.yieldType;
+                returnTypes = ts.append(returnTypes, iterationTypes.returnType);
+            }
+            return createIterationTypes(yieldType, getUnionType(returnTypes), nextType);
+        }
+        /**
+         * Gets the *yield*, *return*, and *next* types of an `Iterator`-like or `AsyncIterator`-like
+         * type from its members.
+         *
+         * If we successfully found the *yield*, *return*, and *next* types, an `IterationTypes`
+         * record is returned. Otherwise, `noIterationTypes` is returned.
+         *
+         * NOTE: You probably don't want to call this directly and should be calling
+         * `getIterationTypesOfIterator` instead.
+         */
+        function getIterationTypesOfIteratorSlow(type, resolver, errorNode) {
+            var iterationTypes = combineIterationTypes([
+                getIterationTypesOfMethod(type, resolver, "next", errorNode),
+                getIterationTypesOfMethod(type, resolver, "return", errorNode),
+                getIterationTypesOfMethod(type, resolver, "throw", errorNode),
+            ]);
+            return type[resolver.iteratorCacheKey] = iterationTypes;
+        }
+        /**
+         * Gets the requested "iteration type" from a type that is either `Iterable`-like, `Iterator`-like,
+         * `IterableIterator`-like, or `Generator`-like (for a non-async generator); or `AsyncIterable`-like,
+         * `AsyncIterator`-like, `AsyncIterableIterator`-like, or `AsyncGenerator`-like (for an async generator).
+         */
+        function getIterationTypeOfGeneratorFunctionReturnType(kind, returnType, isAsyncGenerator) {
             if (isTypeAny(returnType)) {
                 return undefined;
             }
-            return getIteratedTypeOfIterable(returnType, /*errorNode*/ undefined, /*allowAsyncIterables*/ isAsyncGenerator, /*allowSyncIterables*/ !isAsyncGenerator, /*checkAssignability*/ false)
-                || getIteratedTypeOfIterator(returnType, /*errorNode*/ undefined, isAsyncGenerator);
+            var iterationTypes = getIterationTypesOfGeneratorFunctionReturnType(returnType, isAsyncGenerator);
+            return iterationTypes && iterationTypes[getIterationTypesKeyFromIterationTypeKind(kind)];
+        }
+        function getIterationTypesOfGeneratorFunctionReturnType(type, isAsyncGenerator) {
+            if (isTypeAny(type)) {
+                return anyIterationTypes;
+            }
+            var use = isAsyncGenerator ? 2 /* AsyncGeneratorReturnType */ : 1 /* GeneratorReturnType */;
+            var resolver = isAsyncGenerator ? asyncIterationTypesResolver : syncIterationTypesResolver;
+            return getIterationTypesOfIterable(type, use, /*errorNode*/ undefined) ||
+                getIterationTypesOfIterator(type, resolver, /*errorNode*/ undefined);
         }
         function checkBreakOrContinueStatement(node) {
             // Grammar checking
@@ -55737,10 +57805,15 @@ var ts;
                 checkGrammarBreakOrContinueStatement(node);
             // TODO: Check that target label is valid
         }
+        function unwrapReturnType(returnType, functionFlags) {
+            var isGenerator = !!(functionFlags & 1 /* Generator */);
+            var isAsync = !!(functionFlags & 2 /* Async */);
+            return isGenerator ? getIterationTypeOfGeneratorFunctionReturnType(1 /* Return */, returnType, isAsync) || errorType :
+                isAsync ? getPromisedTypeOfPromise(returnType) || errorType :
+                    returnType;
+        }
         function isUnwrappedReturnTypeVoidOrAny(func, returnType) {
-            var unwrappedReturnType = (ts.getFunctionFlags(func) & 3 /* AsyncGenerator */) === 2 /* Async */
-                ? getPromisedTypeOfPromise(returnType) // Async function
-                : returnType; // AsyncGenerator function, Generator function, or normal function
+            var unwrappedReturnType = unwrapReturnType(returnType, ts.getFunctionFlags(func));
             return !!unwrappedReturnType && maybeTypeOfKind(unwrappedReturnType, 16384 /* Void */ | 3 /* AnyOrUnknown */);
         }
         function checkReturnStatement(node) {
@@ -55756,43 +57829,32 @@ var ts;
             var signature = getSignatureFromDeclaration(func);
             var returnType = getReturnTypeOfSignature(signature);
             var functionFlags = ts.getFunctionFlags(func);
-            var isGenerator = functionFlags & 1 /* Generator */;
             if (strictNullChecks || node.expression || returnType.flags & 131072 /* Never */) {
                 var exprType = node.expression ? checkExpressionCached(node.expression) : undefinedType;
-                if (isGenerator) { // AsyncGenerator function or Generator function
-                    // A generator does not need its return expressions checked against its return type.
-                    // Instead, the yield expressions are checked against the element type.
-                    // TODO: Check return types of generators when return type tracking is added
-                    // for generators.
-                    return;
-                }
-                else if (func.kind === 159 /* SetAccessor */) {
+                if (func.kind === 160 /* SetAccessor */) {
                     if (node.expression) {
                         error(node, ts.Diagnostics.Setters_cannot_return_a_value);
                     }
                 }
-                else if (func.kind === 157 /* Constructor */) {
+                else if (func.kind === 158 /* Constructor */) {
                     if (node.expression && !checkTypeAssignableToAndOptionallyElaborate(exprType, returnType, node, node.expression)) {
                         error(node, ts.Diagnostics.Return_type_of_constructor_signature_must_be_assignable_to_the_instance_type_of_the_class);
                     }
                 }
                 else if (getReturnTypeFromAnnotation(func)) {
-                    if (functionFlags & 2 /* Async */) { // Async function
-                        var promisedType = getPromisedTypeOfPromise(returnType);
-                        var awaitedType = checkAwaitedType(exprType, node, ts.Diagnostics.The_return_type_of_an_async_function_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member);
-                        if (promisedType) {
-                            // If the function has a return type, but promisedType is
-                            // undefined, an error will be reported in checkAsyncFunctionReturnType
-                            // so we don't need to report one here.
-                            checkTypeAssignableTo(awaitedType, promisedType, node);
-                        }
-                    }
-                    else {
-                        checkTypeAssignableToAndOptionallyElaborate(exprType, returnType, node, node.expression);
+                    var unwrappedReturnType = unwrapReturnType(returnType, functionFlags);
+                    var unwrappedExprType = functionFlags & 2 /* Async */
+                        ? checkAwaitedType(exprType, node, ts.Diagnostics.The_return_type_of_an_async_function_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member)
+                        : exprType;
+                    if (unwrappedReturnType) {
+                        // If the function has a return type, but promisedType is
+                        // undefined, an error will be reported in checkAsyncFunctionReturnType
+                        // so we don't need to report one here.
+                        checkTypeAssignableToAndOptionallyElaborate(unwrappedExprType, unwrappedReturnType, node, node.expression);
                     }
                 }
             }
-            else if (func.kind !== 157 /* Constructor */ && compilerOptions.noImplicitReturns && !isUnwrappedReturnTypeVoidOrAny(func, returnType) && !isGenerator) {
+            else if (func.kind !== 158 /* Constructor */ && compilerOptions.noImplicitReturns && !isUnwrappedReturnTypeVoidOrAny(func, returnType)) {
                 // The function has a return type, but the return statement doesn't have an expression.
                 error(node, ts.Diagnostics.Not_all_code_paths_return_a_value);
             }
@@ -55821,7 +57883,7 @@ var ts;
             var expressionIsLiteral = isLiteralType(expressionType);
             ts.forEach(node.caseBlock.clauses, function (clause) {
                 // Grammar check for duplicate default clauses, skip if we already report duplicate default clause
-                if (clause.kind === 272 /* DefaultClause */ && !hasDuplicateDefaultClause) {
+                if (clause.kind === 273 /* DefaultClause */ && !hasDuplicateDefaultClause) {
                     if (firstDefaultClause === undefined) {
                         firstDefaultClause = clause;
                     }
@@ -55833,7 +57895,7 @@ var ts;
                         hasDuplicateDefaultClause = true;
                     }
                 }
-                if (produceDiagnostics && clause.kind === 271 /* CaseClause */) {
+                if (produceDiagnostics && clause.kind === 272 /* CaseClause */) {
                     // TypeScript 1.0 spec (April 2014): 5.9
                     // In a 'switch' statement, each 'case' expression must be of a type that is comparable
                     // to or from the type of the 'switch' expression.
@@ -55862,7 +57924,7 @@ var ts;
                     if (ts.isFunctionLike(current)) {
                         return "quit";
                     }
-                    if (current.kind === 233 /* LabeledStatement */ && current.label.escapedText === node.label.escapedText) {
+                    if (current.kind === 234 /* LabeledStatement */ && current.label.escapedText === node.label.escapedText) {
                         grammarErrorOnNode(node.label, ts.Diagnostics.Duplicate_label_0, ts.getTextOfNode(node.label));
                         return true;
                     }
@@ -55969,8 +58031,8 @@ var ts;
                 // this allows us to rule out cases when both property and indexer are inherited from the base class
                 var errorNode;
                 if (propDeclaration && name &&
-                    (propDeclaration.kind === 204 /* BinaryExpression */ ||
-                        name.kind === 149 /* ComputedPropertyName */ ||
+                    (propDeclaration.kind === 205 /* BinaryExpression */ ||
+                        name.kind === 150 /* ComputedPropertyName */ ||
                         prop.parent === containingType.symbol)) {
                     errorNode = propDeclaration;
                 }
@@ -56047,7 +58109,7 @@ var ts;
         function checkTypeParametersNotReferenced(root, typeParameters, index) {
             visit(root);
             function visit(node) {
-                if (node.kind === 164 /* TypeReference */) {
+                if (node.kind === 165 /* TypeReference */) {
                     var type = getTypeFromTypeReference(node);
                     if (type.flags & 262144 /* TypeParameter */) {
                         for (var i = index; i < typeParameters.length; i++) {
@@ -56169,6 +58231,11 @@ var ts;
                 if (languageVersion < 2 /* ES2015 */) {
                     checkExternalEmitHelpers(baseTypeNode.parent, 1 /* Extends */);
                 }
+                // check both @extends and extends if both are specified.
+                var extendsNode = ts.getClassExtendsHeritageElement(node);
+                if (extendsNode && extendsNode !== baseTypeNode) {
+                    checkExpression(extendsNode.expression);
+                }
                 var baseTypes = getBaseTypes(type);
                 if (baseTypes.length && produceDiagnostics) {
                     var baseType_1 = baseTypes[0];
@@ -56176,10 +58243,6 @@ var ts;
                     var staticBaseType = getApparentType(baseConstructorType);
                     checkBaseTypeAccessibility(staticBaseType, baseTypeNode);
                     checkSourceElement(baseTypeNode.expression);
-                    var extendsNode = ts.getClassExtendsHeritageElement(node);
-                    if (extendsNode && extendsNode !== baseTypeNode) {
-                        checkExpression(extendsNode.expression);
-                    }
                     if (ts.some(baseTypeNode.typeArguments)) {
                         ts.forEach(baseTypeNode.typeArguments, checkSourceElement);
                         for (var _i = 0, _a = getConstructorsForTypeArguments(staticBaseType, baseTypeNode.typeArguments, baseTypeNode); _i < _a.length; _i++) {
@@ -56250,7 +58313,7 @@ var ts;
         function issueMemberSpecificError(node, typeWithThis, baseWithThis, broadDiag) {
             // iterate over all implemented properties and issue errors on each one which isn't compatible, rather than the class as a whole, if possible
             var issuedMemberError = false;
-            var _loop_9 = function (member) {
+            var _loop_14 = function (member) {
                 if (ts.hasStaticModifier(member)) {
                     return "continue";
                 }
@@ -56269,7 +58332,7 @@ var ts;
             };
             for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                 var member = _a[_i];
-                _loop_9(member);
+                _loop_14(member);
             }
             if (!issuedMemberError) {
                 // check again with diagnostics to generate a less-specific error
@@ -56295,7 +58358,7 @@ var ts;
         }
         function getClassOrInterfaceDeclarationsOfSymbol(symbol) {
             return ts.filter(symbol.declarations, function (d) {
-                return d.kind === 240 /* ClassDeclaration */ || d.kind === 241 /* InterfaceDeclaration */;
+                return d.kind === 241 /* ClassDeclaration */ || d.kind === 242 /* InterfaceDeclaration */;
             });
         }
         function checkKindsOfPropertyMemberOverrides(type, baseType) {
@@ -56334,7 +58397,7 @@ var ts;
                         // If there is no declaration for the derived class (as in the case of class expressions),
                         // then the class cannot be declared abstract.
                         if (baseDeclarationFlags & 128 /* Abstract */ && (!derivedClassDecl || !ts.hasModifier(derivedClassDecl, 128 /* Abstract */))) {
-                            if (derivedClassDecl.kind === 209 /* ClassExpression */) {
+                            if (derivedClassDecl.kind === 210 /* ClassExpression */) {
                                 error(derivedClassDecl, ts.Diagnostics.Non_abstract_class_expression_does_not_implement_inherited_abstract_member_0_from_class_1, symbolToString(baseProperty), typeToString(baseType));
                             }
                             else {
@@ -56384,8 +58447,8 @@ var ts;
             for (var _i = 0, baseTypes_2 = baseTypes; _i < baseTypes_2.length; _i++) {
                 var base = baseTypes_2[_i];
                 var properties = getPropertiesOfType(getTypeWithThisArgument(base, type.thisType));
-                for (var _a = 0, properties_7 = properties; _a < properties_7.length; _a++) {
-                    var prop = properties_7[_a];
+                for (var _a = 0, properties_4 = properties; _a < properties_4.length; _a++) {
+                    var prop = properties_4[_a];
                     var existing = seen.get(prop.escapedName);
                     if (!existing) {
                         seen.set(prop.escapedName, { prop: prop, containingType: base });
@@ -56426,7 +58489,7 @@ var ts;
             }
         }
         function isInstancePropertyWithoutInitializer(node) {
-            return node.kind === 154 /* PropertyDeclaration */ &&
+            return node.kind === 155 /* PropertyDeclaration */ &&
                 !ts.hasModifier(node, 32 /* Static */ | 128 /* Abstract */) &&
                 !node.exclamationToken &&
                 !node.initializer;
@@ -56450,7 +58513,7 @@ var ts;
                 var symbol = getSymbolOfNode(node);
                 checkTypeParameterListsIdentical(symbol);
                 // Only check this symbol once
-                var firstInterfaceDecl = ts.getDeclarationOfKind(symbol, 241 /* InterfaceDeclaration */);
+                var firstInterfaceDecl = ts.getDeclarationOfKind(symbol, 242 /* InterfaceDeclaration */);
                 if (node === firstInterfaceDecl) {
                     var type = getDeclaredTypeOfSymbol(symbol);
                     var typeWithThis = getTypeWithThisArgument(type);
@@ -56511,9 +58574,9 @@ var ts;
             if (member.initializer) {
                 return computeConstantValue(member);
             }
-            // In ambient enum declarations that specify no const modifier, enum member declarations that omit
-            // a value are considered computed members (as opposed to having auto-incremented values).
-            if (member.parent.flags & 4194304 /* Ambient */ && !ts.isEnumConst(member.parent)) {
+            // In ambient non-const numeric enum declarations, enum members without initializers are
+            // considered computed members (as opposed to having auto-incremented values).
+            if (member.parent.flags & 4194304 /* Ambient */ && !ts.isEnumConst(member.parent) && getEnumKind(getSymbolOfNode(member.parent)) === 0 /* Numeric */) {
                 return undefined;
             }
             // If the member declaration specifies no value, the member is considered a constant enum member.
@@ -56555,7 +58618,7 @@ var ts;
             return value;
             function evaluate(expr) {
                 switch (expr.kind) {
-                    case 202 /* PrefixUnaryExpression */:
+                    case 203 /* PrefixUnaryExpression */:
                         var value_2 = evaluate(expr.operand);
                         if (typeof value_2 === "number") {
                             switch (expr.operator) {
@@ -56565,7 +58628,7 @@ var ts;
                             }
                         }
                         break;
-                    case 204 /* BinaryExpression */:
+                    case 205 /* BinaryExpression */:
                         var left = evaluate(expr.left);
                         var right = evaluate(expr.right);
                         if (typeof left === "number" && typeof right === "number") {
@@ -56593,22 +58656,22 @@ var ts;
                     case 8 /* NumericLiteral */:
                         checkGrammarNumericLiteral(expr);
                         return +expr.text;
-                    case 195 /* ParenthesizedExpression */:
+                    case 196 /* ParenthesizedExpression */:
                         return evaluate(expr.expression);
-                    case 72 /* Identifier */:
+                    case 73 /* Identifier */:
                         var identifier = expr;
                         if (isInfinityOrNaNString(identifier.escapedText)) {
                             return +(identifier.escapedText);
                         }
                         return ts.nodeIsMissing(expr) ? 0 : evaluateEnumMember(expr, getSymbolOfNode(member.parent), identifier.escapedText);
-                    case 190 /* ElementAccessExpression */:
-                    case 189 /* PropertyAccessExpression */:
+                    case 191 /* ElementAccessExpression */:
+                    case 190 /* PropertyAccessExpression */:
                         var ex = expr;
                         if (isConstantMemberAccess(ex)) {
                             var type = getTypeOfExpression(ex.expression);
                             if (type.symbol && type.symbol.flags & 384 /* Enum */) {
                                 var name = void 0;
-                                if (ex.kind === 189 /* PropertyAccessExpression */) {
+                                if (ex.kind === 190 /* PropertyAccessExpression */) {
                                     name = ex.name.escapedText;
                                 }
                                 else {
@@ -56639,9 +58702,9 @@ var ts;
             }
         }
         function isConstantMemberAccess(node) {
-            return node.kind === 72 /* Identifier */ ||
-                node.kind === 189 /* PropertyAccessExpression */ && isConstantMemberAccess(node.expression) ||
-                node.kind === 190 /* ElementAccessExpression */ && isConstantMemberAccess(node.expression) &&
+            return node.kind === 73 /* Identifier */ ||
+                node.kind === 190 /* PropertyAccessExpression */ && isConstantMemberAccess(node.expression) ||
+                node.kind === 191 /* ElementAccessExpression */ && isConstantMemberAccess(node.expression) &&
                     node.argumentExpression.kind === 10 /* StringLiteral */;
         }
         function checkEnumDeclaration(node) {
@@ -56676,7 +58739,7 @@ var ts;
                 var seenEnumMissingInitialInitializer_1 = false;
                 ts.forEach(enumSymbol.declarations, function (declaration) {
                     // return true if we hit a violation of the rule, false otherwise
-                    if (declaration.kind !== 243 /* EnumDeclaration */) {
+                    if (declaration.kind !== 244 /* EnumDeclaration */) {
                         return false;
                     }
                     var enumDeclaration = declaration;
@@ -56699,8 +58762,8 @@ var ts;
             var declarations = symbol.declarations;
             for (var _i = 0, declarations_8 = declarations; _i < declarations_8.length; _i++) {
                 var declaration = declarations_8[_i];
-                if ((declaration.kind === 240 /* ClassDeclaration */ ||
-                    (declaration.kind === 239 /* FunctionDeclaration */ && ts.nodeIsPresent(declaration.body))) &&
+                if ((declaration.kind === 241 /* ClassDeclaration */ ||
+                    (declaration.kind === 240 /* FunctionDeclaration */ && ts.nodeIsPresent(declaration.body))) &&
                     !(declaration.flags & 4194304 /* Ambient */)) {
                     return declaration;
                 }
@@ -56749,8 +58812,8 @@ var ts;
                 var symbol = getSymbolOfNode(node);
                 // The following checks only apply on a non-ambient instantiated module declaration.
                 if (symbol.flags & 512 /* ValueModule */
-                    && symbol.declarations.length > 1
                     && !inAmbientContext
+                    && symbol.declarations.length > 1
                     && isInstantiatedModule(node, !!compilerOptions.preserveConstEnums || !!compilerOptions.isolatedModules)) {
                     var firstNonAmbientClassOrFunc = getFirstNonAmbientClassOrFunctionDeclaration(symbol);
                     if (firstNonAmbientClassOrFunc) {
@@ -56763,7 +58826,7 @@ var ts;
                     }
                     // if the module merges with a class declaration in the same lexical scope,
                     // we need to track this to ensure the correct emit.
-                    var mergedClass = ts.getDeclarationOfKind(symbol, 240 /* ClassDeclaration */);
+                    var mergedClass = ts.getDeclarationOfKind(symbol, 241 /* ClassDeclaration */);
                     if (mergedClass &&
                         inSameLexicalScope(node, mergedClass)) {
                         getNodeLinks(node).flags |= 32768 /* LexicalModuleMergesWithClass */;
@@ -56813,23 +58876,23 @@ var ts;
         }
         function checkModuleAugmentationElement(node, isGlobalAugmentation) {
             switch (node.kind) {
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     // error each individual name in variable statement instead of marking the entire variable statement
                     for (var _i = 0, _a = node.declarationList.declarations; _i < _a.length; _i++) {
                         var decl = _a[_i];
                         checkModuleAugmentationElement(decl, isGlobalAugmentation);
                     }
                     break;
-                case 254 /* ExportAssignment */:
-                case 255 /* ExportDeclaration */:
+                case 255 /* ExportAssignment */:
+                case 256 /* ExportDeclaration */:
                     grammarErrorOnFirstToken(node, ts.Diagnostics.Exports_and_export_assignments_are_not_permitted_in_module_augmentations);
                     break;
-                case 248 /* ImportEqualsDeclaration */:
-                case 249 /* ImportDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
+                case 250 /* ImportDeclaration */:
                     grammarErrorOnFirstToken(node, ts.Diagnostics.Imports_are_not_permitted_in_module_augmentations_Consider_moving_them_to_the_enclosing_external_module);
                     break;
-                case 186 /* BindingElement */:
-                case 237 /* VariableDeclaration */:
+                case 187 /* BindingElement */:
+                case 238 /* VariableDeclaration */:
                     var name = node.name;
                     if (ts.isBindingPattern(name)) {
                         for (var _b = 0, _c = name.elements; _b < _c.length; _b++) {
@@ -56840,12 +58903,12 @@ var ts;
                         break;
                     }
                 // falls through
-                case 240 /* ClassDeclaration */:
-                case 243 /* EnumDeclaration */:
-                case 239 /* FunctionDeclaration */:
-                case 241 /* InterfaceDeclaration */:
-                case 244 /* ModuleDeclaration */:
-                case 242 /* TypeAliasDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 240 /* FunctionDeclaration */:
+                case 242 /* InterfaceDeclaration */:
+                case 245 /* ModuleDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
                     if (isGlobalAugmentation) {
                         return;
                     }
@@ -56866,17 +58929,17 @@ var ts;
         }
         function getFirstIdentifier(node) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return node;
-                case 148 /* QualifiedName */:
+                case 149 /* QualifiedName */:
                     do {
                         node = node.left;
-                    } while (node.kind !== 72 /* Identifier */);
+                    } while (node.kind !== 73 /* Identifier */);
                     return node;
-                case 189 /* PropertyAccessExpression */:
+                case 190 /* PropertyAccessExpression */:
                     do {
                         node = node.expression;
-                    } while (node.kind !== 72 /* Identifier */);
+                    } while (node.kind !== 73 /* Identifier */);
                     return node;
             }
         }
@@ -56890,9 +58953,9 @@ var ts;
                 error(moduleName, ts.Diagnostics.String_literal_expected);
                 return false;
             }
-            var inAmbientExternalModule = node.parent.kind === 245 /* ModuleBlock */ && ts.isAmbientModule(node.parent.parent);
-            if (node.parent.kind !== 284 /* SourceFile */ && !inAmbientExternalModule) {
-                error(moduleName, node.kind === 255 /* ExportDeclaration */ ?
+            var inAmbientExternalModule = node.parent.kind === 246 /* ModuleBlock */ && ts.isAmbientModule(node.parent.parent);
+            if (node.parent.kind !== 285 /* SourceFile */ && !inAmbientExternalModule) {
+                error(moduleName, node.kind === 256 /* ExportDeclaration */ ?
                     ts.Diagnostics.Export_declarations_are_not_permitted_in_a_namespace :
                     ts.Diagnostics.Import_declarations_in_a_namespace_cannot_reference_a_module);
                 return false;
@@ -56925,14 +58988,14 @@ var ts;
                     (symbol.flags & 67897832 /* Type */ ? 67897832 /* Type */ : 0) |
                     (symbol.flags & 1920 /* Namespace */ ? 1920 /* Namespace */ : 0);
                 if (target.flags & excludedMeanings) {
-                    var message = node.kind === 257 /* ExportSpecifier */ ?
+                    var message = node.kind === 258 /* ExportSpecifier */ ?
                         ts.Diagnostics.Export_declaration_conflicts_with_exported_declaration_of_0 :
                         ts.Diagnostics.Import_declaration_conflicts_with_local_declaration_of_0;
                     error(node, message, symbolToString(symbol));
                 }
                 // Don't allow to re-export something with no value side when `--isolatedModules` is set.
                 if (compilerOptions.isolatedModules
-                    && node.kind === 257 /* ExportSpecifier */
+                    && node.kind === 258 /* ExportSpecifier */
                     && !(target.flags & 67220415 /* Value */)
                     && !(node.flags & 4194304 /* Ambient */)) {
                     error(node, ts.Diagnostics.Cannot_re_export_a_type_when_the_isolatedModules_flag_is_provided);
@@ -56959,7 +59022,7 @@ var ts;
                         checkImportBinding(importClause);
                     }
                     if (importClause.namedBindings) {
-                        if (importClause.namedBindings.kind === 251 /* NamespaceImport */) {
+                        if (importClause.namedBindings.kind === 252 /* NamespaceImport */) {
                             checkImportBinding(importClause.namedBindings);
                         }
                         else {
@@ -56983,7 +59046,7 @@ var ts;
                 if (ts.hasModifier(node, 1 /* Export */)) {
                     markExportAsReferenced(node);
                 }
-                if (node.moduleReference.kind !== 259 /* ExternalModuleReference */) {
+                if (node.moduleReference.kind !== 260 /* ExternalModuleReference */) {
                     var target = resolveAlias(getSymbolOfNode(node));
                     if (target !== unknownSymbol) {
                         if (target.flags & 67220415 /* Value */) {
@@ -57019,10 +59082,10 @@ var ts;
                     // export { x, y }
                     // export { x, y } from "foo"
                     ts.forEach(node.exportClause.elements, checkExportSpecifier);
-                    var inAmbientExternalModule = node.parent.kind === 245 /* ModuleBlock */ && ts.isAmbientModule(node.parent.parent);
-                    var inAmbientNamespaceDeclaration = !inAmbientExternalModule && node.parent.kind === 245 /* ModuleBlock */ &&
+                    var inAmbientExternalModule = node.parent.kind === 246 /* ModuleBlock */ && ts.isAmbientModule(node.parent.parent);
+                    var inAmbientNamespaceDeclaration = !inAmbientExternalModule && node.parent.kind === 246 /* ModuleBlock */ &&
                         !node.moduleSpecifier && node.flags & 4194304 /* Ambient */;
-                    if (node.parent.kind !== 284 /* SourceFile */ && !inAmbientExternalModule && !inAmbientNamespaceDeclaration) {
+                    if (node.parent.kind !== 285 /* SourceFile */ && !inAmbientExternalModule && !inAmbientNamespaceDeclaration) {
                         error(node, ts.Diagnostics.Export_declarations_are_not_permitted_in_a_namespace);
                     }
                 }
@@ -57033,13 +59096,13 @@ var ts;
                         error(node.moduleSpecifier, ts.Diagnostics.Module_0_uses_export_and_cannot_be_used_with_export_Asterisk, symbolToString(moduleSymbol));
                     }
                     if (moduleKind !== ts.ModuleKind.System && moduleKind !== ts.ModuleKind.ES2015 && moduleKind !== ts.ModuleKind.ESNext) {
-                        checkExternalEmitHelpers(node, 32768 /* ExportStar */);
+                        checkExternalEmitHelpers(node, 65536 /* ExportStar */);
                     }
                 }
             }
         }
         function checkGrammarModuleElementContext(node, errorMessage) {
-            var isInAppropriateContext = node.parent.kind === 284 /* SourceFile */ || node.parent.kind === 245 /* ModuleBlock */ || node.parent.kind === 244 /* ModuleDeclaration */;
+            var isInAppropriateContext = node.parent.kind === 285 /* SourceFile */ || node.parent.kind === 246 /* ModuleBlock */ || node.parent.kind === 245 /* ModuleDeclaration */;
             if (!isInAppropriateContext) {
                 grammarErrorOnFirstToken(node, errorMessage);
             }
@@ -57068,8 +59131,8 @@ var ts;
                 // If we hit an export assignment in an illegal context, just bail out to avoid cascading errors.
                 return;
             }
-            var container = node.parent.kind === 284 /* SourceFile */ ? node.parent : node.parent.parent;
-            if (container.kind === 244 /* ModuleDeclaration */ && !ts.isAmbientModule(container)) {
+            var container = node.parent.kind === 285 /* SourceFile */ ? node.parent : node.parent.parent;
+            if (container.kind === 245 /* ModuleDeclaration */ && !ts.isAmbientModule(container)) {
                 if (node.isExportEquals) {
                     error(node, ts.Diagnostics.An_export_assignment_cannot_be_used_in_a_namespace);
                 }
@@ -57082,7 +59145,7 @@ var ts;
             if (!checkGrammarDecoratorsAndModifiers(node) && ts.hasModifiers(node)) {
                 grammarErrorOnFirstToken(node, ts.Diagnostics.An_export_assignment_cannot_have_modifiers);
             }
-            if (node.expression.kind === 72 /* Identifier */) {
+            if (node.expression.kind === 73 /* Identifier */) {
                 markExportAsReferenced(node);
                 if (ts.getEmitDeclarations(compilerOptions)) {
                     collectLinkedAliases(node.expression, /*setVisibility*/ true);
@@ -57157,13 +59220,14 @@ var ts;
             return !ts.isAccessor(declaration);
         }
         function isNotOverload(declaration) {
-            return (declaration.kind !== 239 /* FunctionDeclaration */ && declaration.kind !== 156 /* MethodDeclaration */) ||
+            return (declaration.kind !== 240 /* FunctionDeclaration */ && declaration.kind !== 157 /* MethodDeclaration */) ||
                 !!declaration.body;
         }
         function checkSourceElement(node) {
             if (node) {
                 var saveCurrentNode = currentNode;
                 currentNode = node;
+                instantiationCount = 0;
                 checkSourceElementWorker(node);
                 currentNode = saveCurrentNode;
             }
@@ -57180,158 +59244,158 @@ var ts;
                 // Only bother checking on a few construct kinds.  We don't want to be excessively
                 // hitting the cancellation token on every node we check.
                 switch (kind) {
-                    case 244 /* ModuleDeclaration */:
-                    case 240 /* ClassDeclaration */:
-                    case 241 /* InterfaceDeclaration */:
-                    case 239 /* FunctionDeclaration */:
+                    case 245 /* ModuleDeclaration */:
+                    case 241 /* ClassDeclaration */:
+                    case 242 /* InterfaceDeclaration */:
+                    case 240 /* FunctionDeclaration */:
                         cancellationToken.throwIfCancellationRequested();
                 }
             }
             switch (kind) {
-                case 150 /* TypeParameter */:
+                case 151 /* TypeParameter */:
                     return checkTypeParameter(node);
-                case 151 /* Parameter */:
+                case 152 /* Parameter */:
                     return checkParameter(node);
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
                     return checkPropertyDeclaration(node);
-                case 165 /* FunctionType */:
-                case 166 /* ConstructorType */:
-                case 160 /* CallSignature */:
-                case 161 /* ConstructSignature */:
-                case 162 /* IndexSignature */:
+                case 166 /* FunctionType */:
+                case 167 /* ConstructorType */:
+                case 161 /* CallSignature */:
+                case 162 /* ConstructSignature */:
+                case 163 /* IndexSignature */:
                     return checkSignatureDeclaration(node);
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
                     return checkMethodDeclaration(node);
-                case 157 /* Constructor */:
+                case 158 /* Constructor */:
                     return checkConstructorDeclaration(node);
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     return checkAccessorDeclaration(node);
-                case 164 /* TypeReference */:
+                case 165 /* TypeReference */:
                     return checkTypeReferenceNode(node);
-                case 163 /* TypePredicate */:
+                case 164 /* TypePredicate */:
                     return checkTypePredicate(node);
-                case 167 /* TypeQuery */:
+                case 168 /* TypeQuery */:
                     return checkTypeQuery(node);
-                case 168 /* TypeLiteral */:
+                case 169 /* TypeLiteral */:
                     return checkTypeLiteral(node);
-                case 169 /* ArrayType */:
+                case 170 /* ArrayType */:
                     return checkArrayType(node);
-                case 170 /* TupleType */:
+                case 171 /* TupleType */:
                     return checkTupleType(node);
-                case 173 /* UnionType */:
-                case 174 /* IntersectionType */:
+                case 174 /* UnionType */:
+                case 175 /* IntersectionType */:
                     return checkUnionOrIntersectionType(node);
-                case 177 /* ParenthesizedType */:
-                case 171 /* OptionalType */:
-                case 172 /* RestType */:
+                case 178 /* ParenthesizedType */:
+                case 172 /* OptionalType */:
+                case 173 /* RestType */:
                     return checkSourceElement(node.type);
-                case 178 /* ThisType */:
+                case 179 /* ThisType */:
                     return checkThisType(node);
-                case 179 /* TypeOperator */:
+                case 180 /* TypeOperator */:
                     return checkTypeOperator(node);
-                case 175 /* ConditionalType */:
+                case 176 /* ConditionalType */:
                     return checkConditionalType(node);
-                case 176 /* InferType */:
+                case 177 /* InferType */:
                     return checkInferType(node);
-                case 183 /* ImportType */:
+                case 184 /* ImportType */:
                     return checkImportType(node);
-                case 300 /* JSDocAugmentsTag */:
+                case 301 /* JSDocAugmentsTag */:
                     return checkJSDocAugmentsTag(node);
-                case 309 /* JSDocTypedefTag */:
-                case 302 /* JSDocCallbackTag */:
+                case 311 /* JSDocTypedefTag */:
+                case 304 /* JSDocCallbackTag */:
                     return checkJSDocTypeAliasTag(node);
-                case 308 /* JSDocTemplateTag */:
+                case 310 /* JSDocTemplateTag */:
                     return checkJSDocTemplateTag(node);
-                case 307 /* JSDocTypeTag */:
+                case 309 /* JSDocTypeTag */:
                     return checkJSDocTypeTag(node);
-                case 304 /* JSDocParameterTag */:
+                case 306 /* JSDocParameterTag */:
                     return checkJSDocParameterTag(node);
-                case 294 /* JSDocFunctionType */:
+                case 295 /* JSDocFunctionType */:
                     checkJSDocFunctionType(node);
                 // falls through
-                case 292 /* JSDocNonNullableType */:
-                case 291 /* JSDocNullableType */:
-                case 289 /* JSDocAllType */:
-                case 290 /* JSDocUnknownType */:
-                case 297 /* JSDocTypeLiteral */:
+                case 293 /* JSDocNonNullableType */:
+                case 292 /* JSDocNullableType */:
+                case 290 /* JSDocAllType */:
+                case 291 /* JSDocUnknownType */:
+                case 298 /* JSDocTypeLiteral */:
                     checkJSDocTypeIsInJsFile(node);
                     ts.forEachChild(node, checkSourceElement);
                     return;
-                case 295 /* JSDocVariadicType */:
+                case 296 /* JSDocVariadicType */:
                     checkJSDocVariadicType(node);
                     return;
-                case 288 /* JSDocTypeExpression */:
+                case 289 /* JSDocTypeExpression */:
                     return checkSourceElement(node.type);
-                case 180 /* IndexedAccessType */:
+                case 181 /* IndexedAccessType */:
                     return checkIndexedAccessType(node);
-                case 181 /* MappedType */:
+                case 182 /* MappedType */:
                     return checkMappedType(node);
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     return checkFunctionDeclaration(node);
-                case 218 /* Block */:
-                case 245 /* ModuleBlock */:
+                case 219 /* Block */:
+                case 246 /* ModuleBlock */:
                     return checkBlock(node);
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     return checkVariableStatement(node);
-                case 221 /* ExpressionStatement */:
+                case 222 /* ExpressionStatement */:
                     return checkExpressionStatement(node);
-                case 222 /* IfStatement */:
+                case 223 /* IfStatement */:
                     return checkIfStatement(node);
-                case 223 /* DoStatement */:
+                case 224 /* DoStatement */:
                     return checkDoStatement(node);
-                case 224 /* WhileStatement */:
+                case 225 /* WhileStatement */:
                     return checkWhileStatement(node);
-                case 225 /* ForStatement */:
+                case 226 /* ForStatement */:
                     return checkForStatement(node);
-                case 226 /* ForInStatement */:
+                case 227 /* ForInStatement */:
                     return checkForInStatement(node);
-                case 227 /* ForOfStatement */:
+                case 228 /* ForOfStatement */:
                     return checkForOfStatement(node);
-                case 228 /* ContinueStatement */:
-                case 229 /* BreakStatement */:
+                case 229 /* ContinueStatement */:
+                case 230 /* BreakStatement */:
                     return checkBreakOrContinueStatement(node);
-                case 230 /* ReturnStatement */:
+                case 231 /* ReturnStatement */:
                     return checkReturnStatement(node);
-                case 231 /* WithStatement */:
+                case 232 /* WithStatement */:
                     return checkWithStatement(node);
-                case 232 /* SwitchStatement */:
+                case 233 /* SwitchStatement */:
                     return checkSwitchStatement(node);
-                case 233 /* LabeledStatement */:
+                case 234 /* LabeledStatement */:
                     return checkLabeledStatement(node);
-                case 234 /* ThrowStatement */:
+                case 235 /* ThrowStatement */:
                     return checkThrowStatement(node);
-                case 235 /* TryStatement */:
+                case 236 /* TryStatement */:
                     return checkTryStatement(node);
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     return checkVariableDeclaration(node);
-                case 186 /* BindingElement */:
+                case 187 /* BindingElement */:
                     return checkBindingElement(node);
-                case 240 /* ClassDeclaration */:
+                case 241 /* ClassDeclaration */:
                     return checkClassDeclaration(node);
-                case 241 /* InterfaceDeclaration */:
+                case 242 /* InterfaceDeclaration */:
                     return checkInterfaceDeclaration(node);
-                case 242 /* TypeAliasDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
                     return checkTypeAliasDeclaration(node);
-                case 243 /* EnumDeclaration */:
+                case 244 /* EnumDeclaration */:
                     return checkEnumDeclaration(node);
-                case 244 /* ModuleDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     return checkModuleDeclaration(node);
-                case 249 /* ImportDeclaration */:
+                case 250 /* ImportDeclaration */:
                     return checkImportDeclaration(node);
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return checkImportEqualsDeclaration(node);
-                case 255 /* ExportDeclaration */:
+                case 256 /* ExportDeclaration */:
                     return checkExportDeclaration(node);
-                case 254 /* ExportAssignment */:
+                case 255 /* ExportAssignment */:
                     return checkExportAssignment(node);
-                case 220 /* EmptyStatement */:
-                case 236 /* DebuggerStatement */:
+                case 221 /* EmptyStatement */:
+                case 237 /* DebuggerStatement */:
                     checkGrammarStatementInAmbientContext(node);
                     return;
-                case 258 /* MissingDeclaration */:
+                case 259 /* MissingDeclaration */:
                     return checkMissingDeclaration(node);
             }
         }
@@ -57424,24 +59488,25 @@ var ts;
         function checkDeferredNode(node) {
             var saveCurrentNode = currentNode;
             currentNode = node;
+            instantiationCount = 0;
             switch (node.kind) {
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
                     checkFunctionExpressionOrObjectLiteralMethodDeferred(node);
                     break;
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     checkAccessorDeclaration(node);
                     break;
-                case 209 /* ClassExpression */:
+                case 210 /* ClassExpression */:
                     checkClassExpressionDeferred(node);
                     break;
-                case 261 /* JsxSelfClosingElement */:
+                case 262 /* JsxSelfClosingElement */:
                     checkJsxSelfClosingElementDeferred(node);
                     break;
-                case 260 /* JsxElement */:
+                case 261 /* JsxElement */:
                     checkJsxElementDeferred(node);
                     break;
             }
@@ -57571,17 +59636,17 @@ var ts;
                         copySymbols(location.locals, meaning);
                     }
                     switch (location.kind) {
-                        case 284 /* SourceFile */:
+                        case 285 /* SourceFile */:
                             if (!ts.isExternalOrCommonJsModule(location))
                                 break;
                         // falls through
-                        case 244 /* ModuleDeclaration */:
+                        case 245 /* ModuleDeclaration */:
                             copySymbols(getSymbolOfNode(location).exports, meaning & 2623475 /* ModuleMember */);
                             break;
-                        case 243 /* EnumDeclaration */:
+                        case 244 /* EnumDeclaration */:
                             copySymbols(getSymbolOfNode(location).exports, meaning & 8 /* EnumMember */);
                             break;
-                        case 209 /* ClassExpression */:
+                        case 210 /* ClassExpression */:
                             var className = location.name;
                             if (className) {
                                 copySymbol(location.symbol, meaning);
@@ -57589,8 +59654,8 @@ var ts;
                         // falls through
                         // this fall-through is necessary because we would like to handle
                         // type parameter inside class expression similar to how we handle it in classDeclaration and interface Declaration
-                        case 240 /* ClassDeclaration */:
-                        case 241 /* InterfaceDeclaration */:
+                        case 241 /* ClassDeclaration */:
+                        case 242 /* InterfaceDeclaration */:
                             // If we didn't come from static member of class or interface,
                             // add the type parameters into the symbol table
                             // (type parameters of classDeclaration/classExpression and interface are in member property of the symbol.
@@ -57599,7 +59664,7 @@ var ts;
                                 copySymbols(getMembersOfSymbol(getSymbolOfNode(location)), meaning & 67897832 /* Type */);
                             }
                             break;
-                        case 196 /* FunctionExpression */:
+                        case 197 /* FunctionExpression */:
                             var funcName = location.name;
                             if (funcName) {
                                 copySymbol(location.symbol, meaning);
@@ -57641,17 +59706,17 @@ var ts;
             }
         }
         function isTypeDeclarationName(name) {
-            return name.kind === 72 /* Identifier */ &&
+            return name.kind === 73 /* Identifier */ &&
                 isTypeDeclaration(name.parent) &&
                 name.parent.name === name;
         }
         function isTypeDeclaration(node) {
             switch (node.kind) {
-                case 150 /* TypeParameter */:
-                case 240 /* ClassDeclaration */:
-                case 241 /* InterfaceDeclaration */:
-                case 242 /* TypeAliasDeclaration */:
-                case 243 /* EnumDeclaration */:
+                case 151 /* TypeParameter */:
+                case 241 /* ClassDeclaration */:
+                case 242 /* InterfaceDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
+                case 244 /* EnumDeclaration */:
                     return true;
                 default:
                     return false;
@@ -57659,16 +59724,16 @@ var ts;
         }
         // True if the given identifier is part of a type reference
         function isTypeReferenceIdentifier(node) {
-            while (node.parent.kind === 148 /* QualifiedName */) {
+            while (node.parent.kind === 149 /* QualifiedName */) {
                 node = node.parent;
             }
-            return node.parent.kind === 164 /* TypeReference */;
+            return node.parent.kind === 165 /* TypeReference */;
         }
         function isHeritageClauseElementIdentifier(node) {
-            while (node.parent.kind === 189 /* PropertyAccessExpression */) {
+            while (node.parent.kind === 190 /* PropertyAccessExpression */) {
                 node = node.parent;
             }
-            return node.parent.kind === 211 /* ExpressionWithTypeArguments */;
+            return node.parent.kind === 212 /* ExpressionWithTypeArguments */;
         }
         function forEachEnclosingClass(node, callback) {
             var result;
@@ -57696,13 +59761,13 @@ var ts;
             return !!forEachEnclosingClass(node, function (n) { return n === classDeclaration; });
         }
         function getLeftSideOfImportEqualsOrExportAssignment(nodeOnRightSide) {
-            while (nodeOnRightSide.parent.kind === 148 /* QualifiedName */) {
+            while (nodeOnRightSide.parent.kind === 149 /* QualifiedName */) {
                 nodeOnRightSide = nodeOnRightSide.parent;
             }
-            if (nodeOnRightSide.parent.kind === 248 /* ImportEqualsDeclaration */) {
+            if (nodeOnRightSide.parent.kind === 249 /* ImportEqualsDeclaration */) {
                 return nodeOnRightSide.parent.moduleReference === nodeOnRightSide ? nodeOnRightSide.parent : undefined;
             }
-            if (nodeOnRightSide.parent.kind === 254 /* ExportAssignment */) {
+            if (nodeOnRightSide.parent.kind === 255 /* ExportAssignment */) {
                 return nodeOnRightSide.parent.expression === nodeOnRightSide ? nodeOnRightSide.parent : undefined;
             }
             return undefined;
@@ -57728,7 +59793,7 @@ var ts;
                 node = parent;
                 parent = parent.parent;
             }
-            if (parent && parent.kind === 183 /* ImportType */ && parent.qualifier === node) {
+            if (parent && parent.kind === 184 /* ImportType */ && parent.qualifier === node) {
                 return parent;
             }
             return undefined;
@@ -57738,7 +59803,7 @@ var ts;
                 return getSymbolOfNode(entityName.parent);
             }
             if (ts.isInJSFile(entityName) &&
-                entityName.parent.kind === 189 /* PropertyAccessExpression */ &&
+                entityName.parent.kind === 190 /* PropertyAccessExpression */ &&
                 entityName.parent === entityName.parent.parent.left) {
                 // Check if this is a special property assignment
                 var specialPropertyAssignmentSymbol = getSpecialPropertyAssignmentSymbolFromEntityName(entityName);
@@ -57746,7 +59811,7 @@ var ts;
                     return specialPropertyAssignmentSymbol;
                 }
             }
-            if (entityName.parent.kind === 254 /* ExportAssignment */ && ts.isEntityNameExpression(entityName)) {
+            if (entityName.parent.kind === 255 /* ExportAssignment */ && ts.isEntityNameExpression(entityName)) {
                 // Even an entity name expression that doesn't resolve as an entityname may still typecheck as a property access expression
                 var success = resolveEntityName(entityName, 
                 /*all meanings*/ 67220415 /* Value */ | 67897832 /* Type */ | 1920 /* Namespace */ | 2097152 /* Alias */, /*ignoreErrors*/ true);
@@ -57756,7 +59821,7 @@ var ts;
             }
             else if (!ts.isPropertyAccessExpression(entityName) && isInRightSideOfImportOrExportAssignment(entityName)) {
                 // Since we already checked for ExportAssignment, this really could only be an Import
-                var importEqualsDeclaration = ts.getAncestor(entityName, 248 /* ImportEqualsDeclaration */);
+                var importEqualsDeclaration = ts.getAncestor(entityName, 249 /* ImportEqualsDeclaration */);
                 ts.Debug.assert(importEqualsDeclaration !== undefined);
                 return getSymbolOfPartOfRightHandSideOfImportEquals(entityName, /*dontResolveAlias*/ true);
             }
@@ -57774,7 +59839,7 @@ var ts;
             if (isHeritageClauseElementIdentifier(entityName)) {
                 var meaning = 0 /* None */;
                 // In an interface or class, we're definitely interested in a type.
-                if (entityName.parent.kind === 211 /* ExpressionWithTypeArguments */) {
+                if (entityName.parent.kind === 212 /* ExpressionWithTypeArguments */) {
                     meaning = 67897832 /* Type */;
                     // In a class 'extends' clause we are also looking for a value.
                     if (ts.isExpressionWithTypeArgumentsInClassExtendsClause(entityName.parent)) {
@@ -57790,10 +59855,10 @@ var ts;
                     return entityNameSymbol;
                 }
             }
-            if (entityName.parent.kind === 304 /* JSDocParameterTag */) {
+            if (entityName.parent.kind === 306 /* JSDocParameterTag */) {
                 return ts.getParameterSymbolFromJSDoc(entityName.parent);
             }
-            if (entityName.parent.kind === 150 /* TypeParameter */ && entityName.parent.parent.kind === 308 /* JSDocTemplateTag */) {
+            if (entityName.parent.kind === 151 /* TypeParameter */ && entityName.parent.parent.kind === 310 /* JSDocTemplateTag */) {
                 ts.Debug.assert(!ts.isInJSFile(entityName)); // Otherwise `isDeclarationName` would have been true.
                 var typeParameter = ts.getTypeParameterFromJsDoc(entityName.parent);
                 return typeParameter && typeParameter.symbol;
@@ -57803,19 +59868,19 @@ var ts;
                     // Missing entity name.
                     return undefined;
                 }
-                if (entityName.kind === 72 /* Identifier */) {
+                if (entityName.kind === 73 /* Identifier */) {
                     if (ts.isJSXTagName(entityName) && isJsxIntrinsicIdentifier(entityName)) {
                         var symbol = getIntrinsicTagSymbol(entityName.parent);
                         return symbol === unknownSymbol ? undefined : symbol;
                     }
                     return resolveEntityName(entityName, 67220415 /* Value */, /*ignoreErrors*/ false, /*dontResolveAlias*/ true);
                 }
-                else if (entityName.kind === 189 /* PropertyAccessExpression */ || entityName.kind === 148 /* QualifiedName */) {
+                else if (entityName.kind === 190 /* PropertyAccessExpression */ || entityName.kind === 149 /* QualifiedName */) {
                     var links = getNodeLinks(entityName);
                     if (links.resolvedSymbol) {
                         return links.resolvedSymbol;
                     }
-                    if (entityName.kind === 189 /* PropertyAccessExpression */) {
+                    if (entityName.kind === 190 /* PropertyAccessExpression */) {
                         checkPropertyAccessExpression(entityName);
                     }
                     else {
@@ -57825,17 +59890,17 @@ var ts;
                 }
             }
             else if (isTypeReferenceIdentifier(entityName)) {
-                var meaning = entityName.parent.kind === 164 /* TypeReference */ ? 67897832 /* Type */ : 1920 /* Namespace */;
+                var meaning = entityName.parent.kind === 165 /* TypeReference */ ? 67897832 /* Type */ : 1920 /* Namespace */;
                 return resolveEntityName(entityName, meaning, /*ignoreErrors*/ false, /*dontResolveAlias*/ true);
             }
-            if (entityName.parent.kind === 163 /* TypePredicate */) {
+            if (entityName.parent.kind === 164 /* TypePredicate */) {
                 return resolveEntityName(entityName, /*meaning*/ 1 /* FunctionScopedVariable */);
             }
             // Do we want to return undefined here?
             return undefined;
         }
         function getSymbolAtLocation(node) {
-            if (node.kind === 284 /* SourceFile */) {
+            if (node.kind === 285 /* SourceFile */) {
                 return ts.isExternalModule(node) ? getMergedSymbol(node.symbol) : undefined;
             }
             var parent = node.parent;
@@ -57854,12 +59919,12 @@ var ts;
             else if (ts.isLiteralComputedPropertyDeclarationName(node)) {
                 return getSymbolOfNode(parent.parent);
             }
-            if (node.kind === 72 /* Identifier */) {
+            if (node.kind === 73 /* Identifier */) {
                 if (isInRightSideOfImportOrExportAssignment(node)) {
                     return getSymbolOfEntityNameOrPropertyAccessExpression(node);
                 }
-                else if (parent.kind === 186 /* BindingElement */ &&
-                    grandParent.kind === 184 /* ObjectBindingPattern */ &&
+                else if (parent.kind === 187 /* BindingElement */ &&
+                    grandParent.kind === 185 /* ObjectBindingPattern */ &&
                     node === parent.propertyName) {
                     var typeOfPattern = getTypeOfNode(grandParent);
                     var propertyDeclaration = getPropertyOfType(typeOfPattern, node.escapedText);
@@ -57869,11 +59934,11 @@ var ts;
                 }
             }
             switch (node.kind) {
-                case 72 /* Identifier */:
-                case 189 /* PropertyAccessExpression */:
-                case 148 /* QualifiedName */:
+                case 73 /* Identifier */:
+                case 190 /* PropertyAccessExpression */:
+                case 149 /* QualifiedName */:
                     return getSymbolOfEntityNameOrPropertyAccessExpression(node);
-                case 100 /* ThisKeyword */:
+                case 101 /* ThisKeyword */:
                     var container = ts.getThisContainer(node, /*includeArrowFunctions*/ false);
                     if (ts.isFunctionLike(container)) {
                         var sig = getSignatureFromDeclaration(container);
@@ -57885,14 +59950,14 @@ var ts;
                         return checkExpression(node).symbol;
                     }
                 // falls through
-                case 178 /* ThisType */:
+                case 179 /* ThisType */:
                     return getTypeFromThisTypeNode(node).symbol;
-                case 98 /* SuperKeyword */:
+                case 99 /* SuperKeyword */:
                     return checkExpression(node).symbol;
-                case 124 /* ConstructorKeyword */:
+                case 125 /* ConstructorKeyword */:
                     // constructor keyword for an overload, should take us to the definition if it exist
                     var constructorDeclaration = node.parent;
-                    if (constructorDeclaration && constructorDeclaration.kind === 157 /* Constructor */) {
+                    if (constructorDeclaration && constructorDeclaration.kind === 158 /* Constructor */) {
                         return constructorDeclaration.parent.symbol;
                     }
                     return undefined;
@@ -57903,7 +59968,7 @@ var ts;
                     // 3). Dynamic import call or require in javascript
                     // 4). type A = import("./f/*gotToDefinitionHere*/oo")
                     if ((ts.isExternalModuleImportEqualsDeclaration(node.parent.parent) && ts.getExternalModuleImportEqualsDeclarationExpression(node.parent.parent) === node) ||
-                        ((node.parent.kind === 249 /* ImportDeclaration */ || node.parent.kind === 255 /* ExportDeclaration */) && node.parent.moduleSpecifier === node) ||
+                        ((node.parent.kind === 250 /* ImportDeclaration */ || node.parent.kind === 256 /* ExportDeclaration */) && node.parent.moduleSpecifier === node) ||
                         ((ts.isInJSFile(node) && ts.isRequireCall(node.parent, /*checkArgumentIsStringLiteralLike*/ false)) || ts.isImportCall(node.parent)) ||
                         (ts.isLiteralTypeNode(node.parent) && ts.isLiteralImportTypeNode(node.parent.parent) && node.parent.parent.argument === node.parent)) {
                         return resolveExternalModuleName(node, node);
@@ -57920,21 +59985,21 @@ var ts;
                             ? getTypeFromTypeNode(grandParent.objectType)
                             : undefined;
                     return objectType && getPropertyOfType(objectType, ts.escapeLeadingUnderscores(node.text));
-                case 80 /* DefaultKeyword */:
-                case 90 /* FunctionKeyword */:
+                case 81 /* DefaultKeyword */:
+                case 91 /* FunctionKeyword */:
                 case 37 /* EqualsGreaterThanToken */:
-                case 76 /* ClassKeyword */:
+                case 77 /* ClassKeyword */:
                     return getSymbolOfNode(node.parent);
-                case 183 /* ImportType */:
+                case 184 /* ImportType */:
                     return ts.isLiteralImportTypeNode(node) ? getSymbolAtLocation(node.argument.literal) : undefined;
-                case 85 /* ExportKeyword */:
+                case 86 /* ExportKeyword */:
                     return ts.isExportAssignment(node.parent) ? ts.Debug.assertDefined(node.parent.symbol) : undefined;
                 default:
                     return undefined;
             }
         }
         function getShorthandAssignmentValueSymbol(location) {
-            if (location && location.kind === 276 /* ShorthandPropertyAssignment */) {
+            if (location && location.kind === 277 /* ShorthandPropertyAssignment */) {
                 return resolveEntityName(location.name, 67220415 /* Value */ | 2097152 /* Alias */);
             }
             return undefined;
@@ -58001,33 +60066,35 @@ var ts;
         //     }
         // [ a ] from
         //     [a] = [ some array ...]
-        function getTypeOfArrayLiteralOrObjectLiteralDestructuringAssignment(expr) {
-            ts.Debug.assert(expr.kind === 188 /* ObjectLiteralExpression */ || expr.kind === 187 /* ArrayLiteralExpression */);
+        function getTypeOfAssignmentPattern(expr) {
+            ts.Debug.assert(expr.kind === 189 /* ObjectLiteralExpression */ || expr.kind === 188 /* ArrayLiteralExpression */);
             // If this is from "for of"
             //     for ( { a } of elems) {
             //     }
-            if (expr.parent.kind === 227 /* ForOfStatement */) {
+            if (expr.parent.kind === 228 /* ForOfStatement */) {
                 var iteratedType = checkRightHandSideOfForOf(expr.parent.expression, expr.parent.awaitModifier);
                 return checkDestructuringAssignment(expr, iteratedType || errorType);
             }
             // If this is from "for" initializer
             //     for ({a } = elems[0];.....) { }
-            if (expr.parent.kind === 204 /* BinaryExpression */) {
+            if (expr.parent.kind === 205 /* BinaryExpression */) {
                 var iteratedType = getTypeOfExpression(expr.parent.right);
                 return checkDestructuringAssignment(expr, iteratedType || errorType);
             }
             // If this is from nested object binding pattern
             //     for ({ skills: { primary, secondary } } = multiRobot, i = 0; i < 1; i++) {
-            if (expr.parent.kind === 275 /* PropertyAssignment */) {
-                var typeOfParentObjectLiteral = getTypeOfArrayLiteralOrObjectLiteralDestructuringAssignment(expr.parent.parent);
-                return checkObjectLiteralDestructuringPropertyAssignment(typeOfParentObjectLiteral || errorType, expr.parent); // TODO: GH#18217
+            if (expr.parent.kind === 276 /* PropertyAssignment */) {
+                var node_3 = ts.cast(expr.parent.parent, ts.isObjectLiteralExpression);
+                var typeOfParentObjectLiteral = getTypeOfAssignmentPattern(node_3) || errorType;
+                var propertyIndex = ts.indexOfNode(node_3.properties, expr.parent);
+                return checkObjectLiteralDestructuringPropertyAssignment(node_3, typeOfParentObjectLiteral, propertyIndex);
             }
             // Array literal assignment - array destructuring pattern
-            ts.Debug.assert(expr.parent.kind === 187 /* ArrayLiteralExpression */);
+            var node = ts.cast(expr.parent, ts.isArrayLiteralExpression);
             //    [{ property1: p1, property2 }] = elems;
-            var typeOfArrayLiteral = getTypeOfArrayLiteralOrObjectLiteralDestructuringAssignment(expr.parent);
-            var elementType = checkIteratedTypeOrElementType(typeOfArrayLiteral || errorType, expr.parent, /*allowStringInput*/ false, /*allowAsyncIterables*/ false) || errorType;
-            return checkArrayLiteralDestructuringElementAssignment(expr.parent, typeOfArrayLiteral, expr.parent.elements.indexOf(expr), elementType || errorType); // TODO: GH#18217
+            var typeOfArrayLiteral = getTypeOfAssignmentPattern(node) || errorType;
+            var elementType = checkIteratedTypeOrElementType(65 /* Destructuring */, typeOfArrayLiteral, undefinedType, expr.parent) || errorType;
+            return checkArrayLiteralDestructuringElementAssignment(node, typeOfArrayLiteral, node.elements.indexOf(expr), elementType);
         }
         // Gets the property symbol corresponding to the property in destructuring assignment
         // 'property1' from
@@ -58037,7 +60104,7 @@ var ts;
         //     [a] = [ property1, property2 ]
         function getPropertySymbolOfDestructuringAssignment(location) {
             // Get the type of the object or array literal and then look for property of given name in the type
-            var typeOfObjectLiteral = getTypeOfArrayLiteralOrObjectLiteralDestructuringAssignment(location.parent.parent);
+            var typeOfObjectLiteral = getTypeOfAssignmentPattern(ts.cast(location.parent.parent, ts.isAssignmentPattern));
             return typeOfObjectLiteral && getPropertyOfType(typeOfObjectLiteral, location.escapedText);
         }
         function getRegularTypeOfExpression(expr) {
@@ -58059,12 +60126,12 @@ var ts;
         function getClassElementPropertyKeyType(element) {
             var name = element.name;
             switch (name.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return getLiteralType(ts.idText(name));
                 case 8 /* NumericLiteral */:
                 case 10 /* StringLiteral */:
                     return getLiteralType(name.text);
-                case 149 /* ComputedPropertyName */:
+                case 150 /* ComputedPropertyName */:
                     var nameType = checkComputedPropertyName(name);
                     return isTypeAssignableToKind(nameType, 12288 /* ESSymbolLike */) ? nameType : stringType;
                 default:
@@ -58121,7 +60188,7 @@ var ts;
             if (!ts.isGeneratedIdentifier(nodeIn)) {
                 var node = ts.getParseTreeNode(nodeIn, ts.isIdentifier);
                 if (node) {
-                    var isPropertyName_1 = node.parent.kind === 189 /* PropertyAccessExpression */ && node.parent.name === node;
+                    var isPropertyName_1 = node.parent.kind === 190 /* PropertyAccessExpression */ && node.parent.name === node;
                     return !isPropertyName_1 && getReferencedValueSymbol(node) === argumentsSymbol;
                 }
             }
@@ -58177,7 +60244,7 @@ var ts;
                     }
                     var parentSymbol_1 = getParentOfSymbol(symbol);
                     if (parentSymbol_1) {
-                        if (parentSymbol_1.flags & 512 /* ValueModule */ && parentSymbol_1.valueDeclaration.kind === 284 /* SourceFile */) {
+                        if (parentSymbol_1.flags & 512 /* ValueModule */ && parentSymbol_1.valueDeclaration.kind === 285 /* SourceFile */) {
                             var symbolFile = parentSymbol_1.valueDeclaration;
                             var referenceFile = ts.getSourceFileOfNode(node);
                             // If `node` accesses an export and that export isn't in the same file, then symbol is a namespace export, so return undefined.
@@ -58203,12 +60270,16 @@ var ts;
             }
             return undefined;
         }
+        function isSymbolOfDestructuredElementOfCatchBinding(symbol) {
+            return ts.isBindingElement(symbol.valueDeclaration)
+                && ts.walkUpBindingElementsAndPatterns(symbol.valueDeclaration).parent.kind === 275 /* CatchClause */;
+        }
         function isSymbolOfDeclarationWithCollidingName(symbol) {
-            if (symbol.flags & 418 /* BlockScoped */) {
+            if (symbol.flags & 418 /* BlockScoped */ && !ts.isSourceFile(symbol.valueDeclaration)) {
                 var links = getSymbolLinks(symbol);
                 if (links.isDeclarationWithCollidingName === undefined) {
                     var container = ts.getEnclosingBlockScopeContainer(symbol.valueDeclaration);
-                    if (ts.isStatementWithLocals(container)) {
+                    if (ts.isStatementWithLocals(container) || isSymbolOfDestructuredElementOfCatchBinding(symbol)) {
                         var nodeLinks_1 = getNodeLinks(symbol.valueDeclaration);
                         if (resolveName(container.parent, symbol.escapedName, 67220415 /* Value */, /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined, /*isUse*/ false)) {
                             // redeclaration - always should be renamed
@@ -58232,7 +60303,7 @@ var ts;
                             //       they will not collide with anything
                             var isDeclaredInLoop = nodeLinks_1.flags & 524288 /* BlockScopedBindingInLoop */;
                             var inLoopInitializer = ts.isIterationStatement(container, /*lookInLabeledStatements*/ false);
-                            var inLoopBodyBlock = container.kind === 218 /* Block */ && ts.isIterationStatement(container.parent, /*lookInLabeledStatements*/ false);
+                            var inLoopBodyBlock = container.kind === 219 /* Block */ && ts.isIterationStatement(container.parent, /*lookInLabeledStatements*/ false);
                             links.isDeclarationWithCollidingName = !ts.isBlockScopedContainerTopLevel(container) && (!isDeclaredInLoop || (!inLoopInitializer && !inLoopBodyBlock));
                         }
                         else {
@@ -58273,18 +60344,18 @@ var ts;
         }
         function isValueAliasDeclaration(node) {
             switch (node.kind) {
-                case 248 /* ImportEqualsDeclaration */:
-                case 250 /* ImportClause */:
-                case 251 /* NamespaceImport */:
-                case 253 /* ImportSpecifier */:
-                case 257 /* ExportSpecifier */:
+                case 249 /* ImportEqualsDeclaration */:
+                case 251 /* ImportClause */:
+                case 252 /* NamespaceImport */:
+                case 254 /* ImportSpecifier */:
+                case 258 /* ExportSpecifier */:
                     return isAliasResolvedToValue(getSymbolOfNode(node) || unknownSymbol);
-                case 255 /* ExportDeclaration */:
+                case 256 /* ExportDeclaration */:
                     var exportClause = node.exportClause;
                     return !!exportClause && ts.some(exportClause.elements, isValueAliasDeclaration);
-                case 254 /* ExportAssignment */:
+                case 255 /* ExportAssignment */:
                     return node.expression
-                        && node.expression.kind === 72 /* Identifier */
+                        && node.expression.kind === 73 /* Identifier */
                         ? isAliasResolvedToValue(getSymbolOfNode(node) || unknownSymbol)
                         : true;
             }
@@ -58292,7 +60363,7 @@ var ts;
         }
         function isTopLevelValueImportEqualsWithEntityName(nodeIn) {
             var node = ts.getParseTreeNode(nodeIn, ts.isImportEqualsDeclaration);
-            if (node === undefined || node.parent.kind !== 284 /* SourceFile */ || !ts.isInternalModuleImportEqualsDeclaration(node)) {
+            if (node === undefined || node.parent.kind !== 285 /* SourceFile */ || !ts.isInternalModuleImportEqualsDeclaration(node)) {
                 // parent is not source file or it is not reference to internal module
                 return false;
             }
@@ -58393,15 +60464,15 @@ var ts;
         }
         function canHaveConstantValue(node) {
             switch (node.kind) {
-                case 278 /* EnumMember */:
-                case 189 /* PropertyAccessExpression */:
-                case 190 /* ElementAccessExpression */:
+                case 279 /* EnumMember */:
+                case 190 /* PropertyAccessExpression */:
+                case 191 /* ElementAccessExpression */:
                     return true;
             }
             return false;
         }
         function getConstantValue(node) {
-            if (node.kind === 278 /* EnumMember */) {
+            if (node.kind === 279 /* EnumMember */) {
                 return getEnumMemberValue(node);
             }
             var symbol = getNodeLinks(node).resolvedSymbol;
@@ -58486,7 +60557,7 @@ var ts;
         function createTypeOfDeclaration(declarationIn, enclosingDeclaration, flags, tracker, addUndefined) {
             var declaration = ts.getParseTreeNode(declarationIn, ts.isVariableLikeOrAccessor);
             if (!declaration) {
-                return ts.createToken(120 /* AnyKeyword */);
+                return ts.createToken(121 /* AnyKeyword */);
             }
             // Get type of the symbol if this is the valid symbol otherwise get type at location
             var symbol = getSymbolOfNode(declaration);
@@ -58505,7 +60576,7 @@ var ts;
         function createReturnTypeOfSignatureDeclaration(signatureDeclarationIn, enclosingDeclaration, flags, tracker) {
             var signatureDeclaration = ts.getParseTreeNode(signatureDeclarationIn, ts.isFunctionLike);
             if (!signatureDeclaration) {
-                return ts.createToken(120 /* AnyKeyword */);
+                return ts.createToken(121 /* AnyKeyword */);
             }
             var signature = getSignatureFromDeclaration(signatureDeclaration);
             return nodeBuilder.typeToTypeNode(getReturnTypeOfSignature(signature), enclosingDeclaration, flags | 1024 /* MultilineObjectLiterals */, tracker);
@@ -58513,7 +60584,7 @@ var ts;
         function createTypeOfExpression(exprIn, enclosingDeclaration, flags, tracker) {
             var expr = ts.getParseTreeNode(exprIn, ts.isExpression);
             if (!expr) {
-                return ts.createToken(120 /* AnyKeyword */);
+                return ts.createToken(121 /* AnyKeyword */);
             }
             var type = getWidenedType(getRegularTypeOfExpression(expr));
             return nodeBuilder.typeToTypeNode(type, enclosingDeclaration, flags | 1024 /* MultilineObjectLiterals */, tracker);
@@ -58632,17 +60703,17 @@ var ts;
                 isLateBound: function (nodeIn) {
                     var node = ts.getParseTreeNode(nodeIn, ts.isDeclaration);
                     var symbol = node && getSymbolOfNode(node);
-                    return !!(symbol && ts.getCheckFlags(symbol) & 2048 /* Late */);
+                    return !!(symbol && ts.getCheckFlags(symbol) & 4096 /* Late */);
                 },
                 getJsxFactoryEntity: function (location) { return location ? (getJsxNamespace(location), (ts.getSourceFileOfNode(location).localJsxFactory || _jsxFactoryEntity)) : _jsxFactoryEntity; },
                 getAllAccessorDeclarations: function (accessor) {
                     accessor = ts.getParseTreeNode(accessor, ts.isGetOrSetAccessorDeclaration); // TODO: GH#18217
-                    var otherKind = accessor.kind === 159 /* SetAccessor */ ? 158 /* GetAccessor */ : 159 /* SetAccessor */;
+                    var otherKind = accessor.kind === 160 /* SetAccessor */ ? 159 /* GetAccessor */ : 160 /* SetAccessor */;
                     var otherAccessor = ts.getDeclarationOfKind(getSymbolOfNode(accessor), otherKind);
                     var firstAccessor = otherAccessor && (otherAccessor.pos < accessor.pos) ? otherAccessor : accessor;
                     var secondAccessor = otherAccessor && (otherAccessor.pos < accessor.pos) ? accessor : otherAccessor;
-                    var setAccessor = accessor.kind === 159 /* SetAccessor */ ? accessor : otherAccessor;
-                    var getAccessor = accessor.kind === 158 /* GetAccessor */ ? accessor : otherAccessor;
+                    var setAccessor = accessor.kind === 160 /* SetAccessor */ ? accessor : otherAccessor;
+                    var getAccessor = accessor.kind === 159 /* GetAccessor */ ? accessor : otherAccessor;
                     return {
                         firstAccessor: firstAccessor,
                         secondAccessor: secondAccessor,
@@ -58658,7 +60729,7 @@ var ts;
                 }
             };
             function isInHeritageClause(node) {
-                return node.parent && node.parent.kind === 211 /* ExpressionWithTypeArguments */ && node.parent.parent && node.parent.parent.kind === 273 /* HeritageClause */;
+                return node.parent && node.parent.kind === 212 /* ExpressionWithTypeArguments */ && node.parent.parent && node.parent.parent.kind === 274 /* HeritageClause */;
             }
             // defined here to avoid outer scope pollution
             function getTypeReferenceDirectivesForEntityName(node) {
@@ -58670,7 +60741,7 @@ var ts;
                 // qualified names can only be used as types\namespaces
                 // identifiers are treated as values only if they appear in type queries
                 var meaning = 67897832 /* Type */ | 1920 /* Namespace */;
-                if ((node.kind === 72 /* Identifier */ && isInTypeQuery(node)) || (node.kind === 189 /* PropertyAccessExpression */ && !isInHeritageClause(node))) {
+                if ((node.kind === 73 /* Identifier */ && isInTypeQuery(node)) || (node.kind === 190 /* PropertyAccessExpression */ && !isInHeritageClause(node))) {
                     meaning = 67220415 /* Value */ | 1048576 /* ExportValue */;
                 }
                 var symbol = resolveEntityName(node, meaning, /*ignoreErrors*/ true);
@@ -58721,7 +60792,7 @@ var ts;
                         break;
                     }
                 }
-                if (current.valueDeclaration && current.valueDeclaration.kind === 284 /* SourceFile */ && current.flags & 512 /* ValueModule */) {
+                if (current.valueDeclaration && current.valueDeclaration.kind === 285 /* SourceFile */ && current.flags & 512 /* ValueModule */) {
                     return false;
                 }
                 // check that at least one declaration of top level symbol originates from type declaration file
@@ -58749,12 +60820,12 @@ var ts;
             }
         }
         function getExternalModuleFileFromDeclaration(declaration) {
-            var specifier = declaration.kind === 244 /* ModuleDeclaration */ ? ts.tryCast(declaration.name, ts.isStringLiteral) : ts.getExternalModuleName(declaration);
+            var specifier = declaration.kind === 245 /* ModuleDeclaration */ ? ts.tryCast(declaration.name, ts.isStringLiteral) : ts.getExternalModuleName(declaration);
             var moduleSymbol = resolveExternalModuleNameWorker(specifier, specifier, /*moduleNotFoundError*/ undefined); // TODO: GH#18217
             if (!moduleSymbol) {
                 return undefined;
             }
-            return ts.getDeclarationOfKind(moduleSymbol, 284 /* SourceFile */);
+            return ts.getDeclarationOfKind(moduleSymbol, 285 /* SourceFile */);
         }
         function initializeTypeChecker() {
             // Bind all source files and propagate errors
@@ -58771,6 +60842,15 @@ var ts;
                     continue;
                 }
                 if (!ts.isExternalOrCommonJsModule(file)) {
+                    // It is an error for a non-external-module (i.e. script) to declare its own `globalThis`.
+                    // We can't use `builtinGlobals` for this due to synthetic expando-namespace generation in JS files.
+                    var fileGlobalThisSymbol = file.locals.get("globalThis");
+                    if (fileGlobalThisSymbol) {
+                        for (var _d = 0, _e = fileGlobalThisSymbol.declarations; _d < _e.length; _d++) {
+                            var declaration = _e[_d];
+                            diagnostics.add(ts.createDiagnosticForNode(declaration, ts.Diagnostics.Declaration_name_conflicts_with_built_in_global_identifier_0, "globalThis"));
+                        }
+                    }
                     mergeSymbolTable(globals, file.locals);
                 }
                 if (file.jsGlobalAugmentations) {
@@ -58801,10 +60881,10 @@ var ts;
             if (augmentations) {
                 // merge _global_ module augmentations.
                 // this needs to be done after global symbol table is initialized to make sure that all ambient modules are indexed
-                for (var _d = 0, augmentations_1 = augmentations; _d < augmentations_1.length; _d++) {
-                    var list = augmentations_1[_d];
-                    for (var _e = 0, list_1 = list; _e < list_1.length; _e++) {
-                        var augmentation = list_1[_e];
+                for (var _f = 0, augmentations_1 = augmentations; _f < augmentations_1.length; _f++) {
+                    var list = augmentations_1[_f];
+                    for (var _g = 0, list_1 = list; _g < list_1.length; _g++) {
+                        var augmentation = list_1[_g];
                         if (!ts.isGlobalScopeAugmentation(augmentation.parent))
                             continue;
                         mergeModuleAugmentation(augmentation);
@@ -58816,6 +60896,7 @@ var ts;
             getSymbolLinks(undefinedSymbol).type = undefinedWideningType;
             getSymbolLinks(argumentsSymbol).type = getGlobalType("IArguments", /*arity*/ 0, /*reportErrors*/ true);
             getSymbolLinks(unknownSymbol).type = errorType;
+            getSymbolLinks(globalThisSymbol).type = createObjectType(16 /* Anonymous */, globalThisSymbol);
             // Initialize special types
             globalArrayType = getGlobalType("Array", /*arity*/ 1, /*reportErrors*/ true);
             globalObjectType = getGlobalType("Object", /*arity*/ 0, /*reportErrors*/ true);
@@ -58832,16 +60913,16 @@ var ts;
                 // autoArrayType is used as a marker, so even if global Array type is not defined, it needs to be a unique type
                 autoArrayType = createAnonymousType(undefined, emptySymbols, ts.emptyArray, ts.emptyArray, undefined, undefined);
             }
-            globalReadonlyArrayType = getGlobalTypeOrUndefined("ReadonlyArray", /*arity*/ 1);
+            globalReadonlyArrayType = getGlobalTypeOrUndefined("ReadonlyArray", /*arity*/ 1) || globalArrayType;
             anyReadonlyArrayType = globalReadonlyArrayType ? createTypeFromGenericGlobalType(globalReadonlyArrayType, [anyType]) : anyArrayType;
             globalThisType = getGlobalTypeOrUndefined("ThisType", /*arity*/ 1);
             if (augmentations) {
                 // merge _nonglobal_ module augmentations.
                 // this needs to be done after global symbol table is initialized to make sure that all ambient modules are indexed
-                for (var _f = 0, augmentations_2 = augmentations; _f < augmentations_2.length; _f++) {
-                    var list = augmentations_2[_f];
-                    for (var _g = 0, list_2 = list; _g < list_2.length; _g++) {
-                        var augmentation = list_2[_g];
+                for (var _h = 0, augmentations_2 = augmentations; _h < augmentations_2.length; _h++) {
+                    var list = augmentations_2[_h];
+                    for (var _j = 0, list_2 = list; _j < list_2.length; _j++) {
+                        var augmentation = list_2[_j];
                         if (ts.isGlobalScopeAugmentation(augmentation.parent))
                             continue;
                         mergeModuleAugmentation(augmentation);
@@ -58868,8 +60949,8 @@ var ts;
                 else {
                     // Otherwise issue top-level error since the files appear very identical in terms of what they contain
                     var list = ts.arrayFrom(conflictingSymbols.keys()).join(", ");
-                    diagnostics.add(addRelatedInfo(ts.createDiagnosticForNode(firstFile, ts.Diagnostics.Definitions_of_the_following_identifiers_conflict_with_those_in_another_file_Colon_0, list), ts.createDiagnosticForNode(secondFile, ts.Diagnostics.Conflicts_are_in_this_file)));
-                    diagnostics.add(addRelatedInfo(ts.createDiagnosticForNode(secondFile, ts.Diagnostics.Definitions_of_the_following_identifiers_conflict_with_those_in_another_file_Colon_0, list), ts.createDiagnosticForNode(firstFile, ts.Diagnostics.Conflicts_are_in_this_file)));
+                    diagnostics.add(ts.addRelatedInfo(ts.createDiagnosticForNode(firstFile, ts.Diagnostics.Definitions_of_the_following_identifiers_conflict_with_those_in_another_file_Colon_0, list), ts.createDiagnosticForNode(secondFile, ts.Diagnostics.Conflicts_are_in_this_file)));
+                    diagnostics.add(ts.addRelatedInfo(ts.createDiagnosticForNode(secondFile, ts.Diagnostics.Definitions_of_the_following_identifiers_conflict_with_those_in_another_file_Colon_0, list), ts.createDiagnosticForNode(firstFile, ts.Diagnostics.Conflicts_are_in_this_file)));
                 }
             });
             amalgamatedDuplicates = undefined;
@@ -58881,7 +60962,7 @@ var ts;
                     var helpersModule = resolveHelpersModule(sourceFile, location);
                     if (helpersModule !== unknownSymbol) {
                         var uncheckedHelpers = helpers & ~requestedExternalEmitHelpers;
-                        for (var helper = 1 /* FirstEmitHelper */; helper <= 65536 /* LastEmitHelper */; helper <<= 1) {
+                        for (var helper = 1 /* FirstEmitHelper */; helper <= 131072 /* LastEmitHelper */; helper <<= 1) {
                             if (uncheckedHelpers & helper) {
                                 var name = getHelperName(helper);
                                 var symbol = getSymbol(helpersModule.exports, ts.escapeLeadingUnderscores(name), 67220415 /* Value */);
@@ -58908,12 +60989,13 @@ var ts;
                 case 256 /* Values */: return "__values";
                 case 512 /* Read */: return "__read";
                 case 1024 /* Spread */: return "__spread";
-                case 2048 /* Await */: return "__await";
-                case 4096 /* AsyncGenerator */: return "__asyncGenerator";
-                case 8192 /* AsyncDelegator */: return "__asyncDelegator";
-                case 16384 /* AsyncValues */: return "__asyncValues";
-                case 32768 /* ExportStar */: return "__exportStar";
-                case 65536 /* MakeTemplateObject */: return "__makeTemplateObject";
+                case 2048 /* SpreadArrays */: return "__spreadArrays";
+                case 4096 /* Await */: return "__await";
+                case 8192 /* AsyncGenerator */: return "__asyncGenerator";
+                case 16384 /* AsyncDelegator */: return "__asyncDelegator";
+                case 32768 /* AsyncValues */: return "__asyncValues";
+                case 65536 /* ExportStar */: return "__exportStar";
+                case 131072 /* MakeTemplateObject */: return "__makeTemplateObject";
                 default: return ts.Debug.fail("Unrecognized helper");
             }
         }
@@ -58932,14 +61014,14 @@ var ts;
                 return false;
             }
             if (!ts.nodeCanBeDecorated(node, node.parent, node.parent.parent)) {
-                if (node.kind === 156 /* MethodDeclaration */ && !ts.nodeIsPresent(node.body)) {
+                if (node.kind === 157 /* MethodDeclaration */ && !ts.nodeIsPresent(node.body)) {
                     return grammarErrorOnFirstToken(node, ts.Diagnostics.A_decorator_can_only_decorate_a_method_implementation_not_an_overload);
                 }
                 else {
                     return grammarErrorOnFirstToken(node, ts.Diagnostics.Decorators_are_not_valid_here);
                 }
             }
-            else if (node.kind === 158 /* GetAccessor */ || node.kind === 159 /* SetAccessor */) {
+            else if (node.kind === 159 /* GetAccessor */ || node.kind === 160 /* SetAccessor */) {
                 var accessors = ts.getAllAccessorDeclarations(node.parent.members, node);
                 if (accessors.firstAccessor.decorators && node === accessors.secondAccessor) {
                     return grammarErrorOnFirstToken(node, ts.Diagnostics.Decorators_cannot_be_applied_to_multiple_get_Slashset_accessors_of_the_same_name);
@@ -58956,23 +61038,23 @@ var ts;
             var flags = 0 /* None */;
             for (var _i = 0, _a = node.modifiers; _i < _a.length; _i++) {
                 var modifier = _a[_i];
-                if (modifier.kind !== 133 /* ReadonlyKeyword */) {
-                    if (node.kind === 153 /* PropertySignature */ || node.kind === 155 /* MethodSignature */) {
+                if (modifier.kind !== 134 /* ReadonlyKeyword */) {
+                    if (node.kind === 154 /* PropertySignature */ || node.kind === 156 /* MethodSignature */) {
                         return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_type_member, ts.tokenToString(modifier.kind));
                     }
-                    if (node.kind === 162 /* IndexSignature */) {
+                    if (node.kind === 163 /* IndexSignature */) {
                         return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_an_index_signature, ts.tokenToString(modifier.kind));
                     }
                 }
                 switch (modifier.kind) {
-                    case 77 /* ConstKeyword */:
-                        if (node.kind !== 243 /* EnumDeclaration */) {
-                            return grammarErrorOnNode(node, ts.Diagnostics.A_class_member_cannot_have_the_0_keyword, ts.tokenToString(77 /* ConstKeyword */));
+                    case 78 /* ConstKeyword */:
+                        if (node.kind !== 244 /* EnumDeclaration */) {
+                            return grammarErrorOnNode(node, ts.Diagnostics.A_class_member_cannot_have_the_0_keyword, ts.tokenToString(78 /* ConstKeyword */));
                         }
                         break;
-                    case 115 /* PublicKeyword */:
-                    case 114 /* ProtectedKeyword */:
-                    case 113 /* PrivateKeyword */:
+                    case 116 /* PublicKeyword */:
+                    case 115 /* ProtectedKeyword */:
+                    case 114 /* PrivateKeyword */:
                         var text = visibilityToString(ts.modifierToFlag(modifier.kind));
                         if (flags & 28 /* AccessibilityModifier */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics.Accessibility_modifier_already_seen);
@@ -58986,11 +61068,11 @@ var ts;
                         else if (flags & 256 /* Async */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, text, "async");
                         }
-                        else if (node.parent.kind === 245 /* ModuleBlock */ || node.parent.kind === 284 /* SourceFile */) {
+                        else if (node.parent.kind === 246 /* ModuleBlock */ || node.parent.kind === 285 /* SourceFile */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_module_or_namespace_element, text);
                         }
                         else if (flags & 128 /* Abstract */) {
-                            if (modifier.kind === 113 /* PrivateKeyword */) {
+                            if (modifier.kind === 114 /* PrivateKeyword */) {
                                 return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_with_1_modifier, text, "abstract");
                             }
                             else {
@@ -58999,7 +61081,7 @@ var ts;
                         }
                         flags |= ts.modifierToFlag(modifier.kind);
                         break;
-                    case 116 /* StaticKeyword */:
+                    case 117 /* StaticKeyword */:
                         if (flags & 32 /* Static */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "static");
                         }
@@ -59009,10 +61091,10 @@ var ts;
                         else if (flags & 256 /* Async */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, "static", "async");
                         }
-                        else if (node.parent.kind === 245 /* ModuleBlock */ || node.parent.kind === 284 /* SourceFile */) {
+                        else if (node.parent.kind === 246 /* ModuleBlock */ || node.parent.kind === 285 /* SourceFile */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_module_or_namespace_element, "static");
                         }
-                        else if (node.kind === 151 /* Parameter */) {
+                        else if (node.kind === 152 /* Parameter */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "static");
                         }
                         else if (flags & 128 /* Abstract */) {
@@ -59021,18 +61103,18 @@ var ts;
                         flags |= 32 /* Static */;
                         lastStatic = modifier;
                         break;
-                    case 133 /* ReadonlyKeyword */:
+                    case 134 /* ReadonlyKeyword */:
                         if (flags & 64 /* Readonly */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "readonly");
                         }
-                        else if (node.kind !== 154 /* PropertyDeclaration */ && node.kind !== 153 /* PropertySignature */ && node.kind !== 162 /* IndexSignature */ && node.kind !== 151 /* Parameter */) {
+                        else if (node.kind !== 155 /* PropertyDeclaration */ && node.kind !== 154 /* PropertySignature */ && node.kind !== 163 /* IndexSignature */ && node.kind !== 152 /* Parameter */) {
                             // If node.kind === SyntaxKind.Parameter, checkParameter report an error if it's not a parameter property.
                             return grammarErrorOnNode(modifier, ts.Diagnostics.readonly_modifier_can_only_appear_on_a_property_declaration_or_index_signature);
                         }
                         flags |= 64 /* Readonly */;
                         lastReadonly = modifier;
                         break;
-                    case 85 /* ExportKeyword */:
+                    case 86 /* ExportKeyword */:
                         if (flags & 1 /* Export */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "export");
                         }
@@ -59045,52 +61127,52 @@ var ts;
                         else if (flags & 256 /* Async */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, "export", "async");
                         }
-                        else if (node.parent.kind === 240 /* ClassDeclaration */) {
+                        else if (node.parent.kind === 241 /* ClassDeclaration */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_class_element, "export");
                         }
-                        else if (node.kind === 151 /* Parameter */) {
+                        else if (node.kind === 152 /* Parameter */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "export");
                         }
                         flags |= 1 /* Export */;
                         break;
-                    case 80 /* DefaultKeyword */:
-                        var container = node.parent.kind === 284 /* SourceFile */ ? node.parent : node.parent.parent;
-                        if (container.kind === 244 /* ModuleDeclaration */ && !ts.isAmbientModule(container)) {
+                    case 81 /* DefaultKeyword */:
+                        var container = node.parent.kind === 285 /* SourceFile */ ? node.parent : node.parent.parent;
+                        if (container.kind === 245 /* ModuleDeclaration */ && !ts.isAmbientModule(container)) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics.A_default_export_can_only_be_used_in_an_ECMAScript_style_module);
                         }
                         flags |= 512 /* Default */;
                         break;
-                    case 125 /* DeclareKeyword */:
+                    case 126 /* DeclareKeyword */:
                         if (flags & 2 /* Ambient */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "declare");
                         }
                         else if (flags & 256 /* Async */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_in_an_ambient_context, "async");
                         }
-                        else if (node.parent.kind === 240 /* ClassDeclaration */) {
+                        else if (node.parent.kind === 241 /* ClassDeclaration */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_class_element, "declare");
                         }
-                        else if (node.kind === 151 /* Parameter */) {
+                        else if (node.kind === 152 /* Parameter */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "declare");
                         }
-                        else if ((node.parent.flags & 4194304 /* Ambient */) && node.parent.kind === 245 /* ModuleBlock */) {
+                        else if ((node.parent.flags & 4194304 /* Ambient */) && node.parent.kind === 246 /* ModuleBlock */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics.A_declare_modifier_cannot_be_used_in_an_already_ambient_context);
                         }
                         flags |= 2 /* Ambient */;
                         lastDeclare = modifier;
                         break;
-                    case 118 /* AbstractKeyword */:
+                    case 119 /* AbstractKeyword */:
                         if (flags & 128 /* Abstract */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "abstract");
                         }
-                        if (node.kind !== 240 /* ClassDeclaration */) {
-                            if (node.kind !== 156 /* MethodDeclaration */ &&
-                                node.kind !== 154 /* PropertyDeclaration */ &&
-                                node.kind !== 158 /* GetAccessor */ &&
-                                node.kind !== 159 /* SetAccessor */) {
+                        if (node.kind !== 241 /* ClassDeclaration */) {
+                            if (node.kind !== 157 /* MethodDeclaration */ &&
+                                node.kind !== 155 /* PropertyDeclaration */ &&
+                                node.kind !== 159 /* GetAccessor */ &&
+                                node.kind !== 160 /* SetAccessor */) {
                                 return grammarErrorOnNode(modifier, ts.Diagnostics.abstract_modifier_can_only_appear_on_a_class_method_or_property_declaration);
                             }
-                            if (!(node.parent.kind === 240 /* ClassDeclaration */ && ts.hasModifier(node.parent, 128 /* Abstract */))) {
+                            if (!(node.parent.kind === 241 /* ClassDeclaration */ && ts.hasModifier(node.parent, 128 /* Abstract */))) {
                                 return grammarErrorOnNode(modifier, ts.Diagnostics.Abstract_methods_can_only_appear_within_an_abstract_class);
                             }
                             if (flags & 32 /* Static */) {
@@ -59102,14 +61184,14 @@ var ts;
                         }
                         flags |= 128 /* Abstract */;
                         break;
-                    case 121 /* AsyncKeyword */:
+                    case 122 /* AsyncKeyword */:
                         if (flags & 256 /* Async */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "async");
                         }
                         else if (flags & 2 /* Ambient */ || node.parent.flags & 4194304 /* Ambient */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_in_an_ambient_context, "async");
                         }
-                        else if (node.kind === 151 /* Parameter */) {
+                        else if (node.kind === 152 /* Parameter */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "async");
                         }
                         flags |= 256 /* Async */;
@@ -59117,7 +61199,7 @@ var ts;
                         break;
                 }
             }
-            if (node.kind === 157 /* Constructor */) {
+            if (node.kind === 158 /* Constructor */) {
                 if (flags & 32 /* Static */) {
                     return grammarErrorOnNode(lastStatic, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "static");
                 }
@@ -59132,13 +61214,13 @@ var ts;
                 }
                 return false;
             }
-            else if ((node.kind === 249 /* ImportDeclaration */ || node.kind === 248 /* ImportEqualsDeclaration */) && flags & 2 /* Ambient */) {
+            else if ((node.kind === 250 /* ImportDeclaration */ || node.kind === 249 /* ImportEqualsDeclaration */) && flags & 2 /* Ambient */) {
                 return grammarErrorOnNode(lastDeclare, ts.Diagnostics.A_0_modifier_cannot_be_used_with_an_import_declaration, "declare");
             }
-            else if (node.kind === 151 /* Parameter */ && (flags & 92 /* ParameterPropertyModifier */) && ts.isBindingPattern(node.name)) {
+            else if (node.kind === 152 /* Parameter */ && (flags & 92 /* ParameterPropertyModifier */) && ts.isBindingPattern(node.name)) {
                 return grammarErrorOnNode(node, ts.Diagnostics.A_parameter_property_may_not_be_declared_using_a_binding_pattern);
             }
-            else if (node.kind === 151 /* Parameter */ && (flags & 92 /* ParameterPropertyModifier */) && node.dotDotDotToken) {
+            else if (node.kind === 152 /* Parameter */ && (flags & 92 /* ParameterPropertyModifier */) && node.dotDotDotToken) {
                 return grammarErrorOnNode(node, ts.Diagnostics.A_parameter_property_cannot_be_declared_using_a_rest_parameter);
             }
             if (flags & 256 /* Async */) {
@@ -59159,38 +61241,38 @@ var ts;
         }
         function shouldReportBadModifier(node) {
             switch (node.kind) {
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
-                case 157 /* Constructor */:
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
-                case 162 /* IndexSignature */:
-                case 244 /* ModuleDeclaration */:
-                case 249 /* ImportDeclaration */:
-                case 248 /* ImportEqualsDeclaration */:
-                case 255 /* ExportDeclaration */:
-                case 254 /* ExportAssignment */:
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
-                case 151 /* Parameter */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
+                case 158 /* Constructor */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
+                case 163 /* IndexSignature */:
+                case 245 /* ModuleDeclaration */:
+                case 250 /* ImportDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
+                case 256 /* ExportDeclaration */:
+                case 255 /* ExportAssignment */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
+                case 152 /* Parameter */:
                     return false;
                 default:
-                    if (node.parent.kind === 245 /* ModuleBlock */ || node.parent.kind === 284 /* SourceFile */) {
+                    if (node.parent.kind === 246 /* ModuleBlock */ || node.parent.kind === 285 /* SourceFile */) {
                         return false;
                     }
                     switch (node.kind) {
-                        case 239 /* FunctionDeclaration */:
-                            return nodeHasAnyModifiersExcept(node, 121 /* AsyncKeyword */);
-                        case 240 /* ClassDeclaration */:
-                            return nodeHasAnyModifiersExcept(node, 118 /* AbstractKeyword */);
-                        case 241 /* InterfaceDeclaration */:
-                        case 219 /* VariableStatement */:
-                        case 242 /* TypeAliasDeclaration */:
+                        case 240 /* FunctionDeclaration */:
+                            return nodeHasAnyModifiersExcept(node, 122 /* AsyncKeyword */);
+                        case 241 /* ClassDeclaration */:
+                            return nodeHasAnyModifiersExcept(node, 119 /* AbstractKeyword */);
+                        case 242 /* InterfaceDeclaration */:
+                        case 220 /* VariableStatement */:
+                        case 243 /* TypeAliasDeclaration */:
                             return true;
-                        case 243 /* EnumDeclaration */:
-                            return nodeHasAnyModifiersExcept(node, 77 /* ConstKeyword */);
+                        case 244 /* EnumDeclaration */:
+                            return nodeHasAnyModifiersExcept(node, 78 /* ConstKeyword */);
                         default:
                             ts.Debug.fail();
                             return false;
@@ -59202,10 +61284,10 @@ var ts;
         }
         function checkGrammarAsyncModifier(node, asyncModifier) {
             switch (node.kind) {
-                case 156 /* MethodDeclaration */:
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
+                case 157 /* MethodDeclaration */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
                     return false;
             }
             return grammarErrorOnNode(asyncModifier, ts.Diagnostics._0_modifier_cannot_be_used_here, "async");
@@ -59265,10 +61347,10 @@ var ts;
                     var nonSimpleParameters = getNonSimpleParameters(node.parameters);
                     if (ts.length(nonSimpleParameters)) {
                         ts.forEach(nonSimpleParameters, function (parameter) {
-                            addRelatedInfo(error(parameter, ts.Diagnostics.This_parameter_is_not_allowed_with_use_strict_directive), ts.createDiagnosticForNode(useStrictDirective_1, ts.Diagnostics.use_strict_directive_used_here));
+                            ts.addRelatedInfo(error(parameter, ts.Diagnostics.This_parameter_is_not_allowed_with_use_strict_directive), ts.createDiagnosticForNode(useStrictDirective_1, ts.Diagnostics.use_strict_directive_used_here));
                         });
                         var diagnostics_1 = nonSimpleParameters.map(function (parameter, index) { return (index === 0 ? ts.createDiagnosticForNode(parameter, ts.Diagnostics.Non_simple_parameter_declared_here) : ts.createDiagnosticForNode(parameter, ts.Diagnostics.and_here)); });
-                        addRelatedInfo.apply(void 0, [error(useStrictDirective_1, ts.Diagnostics.use_strict_directive_cannot_be_used_with_non_simple_parameter_list)].concat(diagnostics_1));
+                        ts.addRelatedInfo.apply(void 0, [error(useStrictDirective_1, ts.Diagnostics.use_strict_directive_cannot_be_used_with_non_simple_parameter_list)].concat(diagnostics_1));
                         return true;
                     }
                 }
@@ -59320,10 +61402,10 @@ var ts;
             if (!parameter.type) {
                 return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_must_have_a_type_annotation);
             }
-            if (parameter.type.kind !== 138 /* StringKeyword */ && parameter.type.kind !== 135 /* NumberKeyword */) {
+            if (parameter.type.kind !== 139 /* StringKeyword */ && parameter.type.kind !== 136 /* NumberKeyword */) {
                 var type = getTypeFromTypeNode(parameter.type);
                 if (type.flags & 4 /* String */ || type.flags & 8 /* Number */) {
-                    return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_type_cannot_be_a_type_alias_Consider_writing_0_Colon_1_Colon_2_instead, ts.getTextOfNode(parameter.name), typeToString(type), typeToString(getTypeFromTypeNode(node.type)));
+                    return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_type_cannot_be_a_type_alias_Consider_writing_0_Colon_1_Colon_2_instead, ts.getTextOfNode(parameter.name), typeToString(type), typeToString(node.type ? getTypeFromTypeNode(node.type) : anyType));
                 }
                 if (type.flags & 1048576 /* Union */ && allTypesAssignableToKind(type, 128 /* StringLiteral */, /*strict*/ true)) {
                     return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_type_cannot_be_a_union_type_Consider_using_a_mapped_object_type_instead);
@@ -59354,9 +61436,9 @@ var ts;
         }
         function checkGrammarForOmittedArgument(args) {
             if (args) {
-                for (var _i = 0, args_5 = args; _i < args_5.length; _i++) {
-                    var arg = args_5[_i];
-                    if (arg.kind === 210 /* OmittedExpression */) {
+                for (var _i = 0, args_4 = args; _i < args_4.length; _i++) {
+                    var arg = args_4[_i];
+                    if (arg.kind === 211 /* OmittedExpression */) {
                         return grammarErrorAtPos(arg, arg.pos, 0, ts.Diagnostics.Argument_expression_expected);
                     }
                 }
@@ -59386,7 +61468,7 @@ var ts;
             if (!checkGrammarDecoratorsAndModifiers(node) && node.heritageClauses) {
                 for (var _i = 0, _a = node.heritageClauses; _i < _a.length; _i++) {
                     var heritageClause = _a[_i];
-                    if (heritageClause.token === 86 /* ExtendsKeyword */) {
+                    if (heritageClause.token === 87 /* ExtendsKeyword */) {
                         if (seenExtendsClause) {
                             return grammarErrorOnFirstToken(heritageClause, ts.Diagnostics.extends_clause_already_seen);
                         }
@@ -59399,7 +61481,7 @@ var ts;
                         seenExtendsClause = true;
                     }
                     else {
-                        ts.Debug.assert(heritageClause.token === 109 /* ImplementsKeyword */);
+                        ts.Debug.assert(heritageClause.token === 110 /* ImplementsKeyword */);
                         if (seenImplementsClause) {
                             return grammarErrorOnFirstToken(heritageClause, ts.Diagnostics.implements_clause_already_seen);
                         }
@@ -59415,14 +61497,14 @@ var ts;
             if (node.heritageClauses) {
                 for (var _i = 0, _a = node.heritageClauses; _i < _a.length; _i++) {
                     var heritageClause = _a[_i];
-                    if (heritageClause.token === 86 /* ExtendsKeyword */) {
+                    if (heritageClause.token === 87 /* ExtendsKeyword */) {
                         if (seenExtendsClause) {
                             return grammarErrorOnFirstToken(heritageClause, ts.Diagnostics.extends_clause_already_seen);
                         }
                         seenExtendsClause = true;
                     }
                     else {
-                        ts.Debug.assert(heritageClause.token === 109 /* ImplementsKeyword */);
+                        ts.Debug.assert(heritageClause.token === 110 /* ImplementsKeyword */);
                         return grammarErrorOnFirstToken(heritageClause, ts.Diagnostics.Interface_declaration_cannot_have_implements_clause);
                     }
                     // Grammar checking heritageClause inside class declaration
@@ -59433,20 +61515,20 @@ var ts;
         }
         function checkGrammarComputedPropertyName(node) {
             // If node is not a computedPropertyName, just skip the grammar checking
-            if (node.kind !== 149 /* ComputedPropertyName */) {
+            if (node.kind !== 150 /* ComputedPropertyName */) {
                 return false;
             }
             var computedPropertyName = node;
-            if (computedPropertyName.expression.kind === 204 /* BinaryExpression */ && computedPropertyName.expression.operatorToken.kind === 27 /* CommaToken */) {
+            if (computedPropertyName.expression.kind === 205 /* BinaryExpression */ && computedPropertyName.expression.operatorToken.kind === 27 /* CommaToken */) {
                 return grammarErrorOnNode(computedPropertyName.expression, ts.Diagnostics.A_comma_expression_is_not_allowed_in_a_computed_property_name);
             }
             return false;
         }
         function checkGrammarForGenerator(node) {
             if (node.asteriskToken) {
-                ts.Debug.assert(node.kind === 239 /* FunctionDeclaration */ ||
-                    node.kind === 196 /* FunctionExpression */ ||
-                    node.kind === 156 /* MethodDeclaration */);
+                ts.Debug.assert(node.kind === 240 /* FunctionDeclaration */ ||
+                    node.kind === 197 /* FunctionExpression */ ||
+                    node.kind === 157 /* MethodDeclaration */);
                 if (node.flags & 4194304 /* Ambient */) {
                     return grammarErrorOnNode(node.asteriskToken, ts.Diagnostics.Generators_are_not_allowed_in_an_ambient_context);
                 }
@@ -59472,15 +61554,22 @@ var ts;
             var seen = ts.createUnderscoreEscapedMap();
             for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
                 var prop = _a[_i];
-                if (prop.kind === 277 /* SpreadAssignment */) {
+                if (prop.kind === 278 /* SpreadAssignment */) {
+                    if (inDestructuring) {
+                        // a rest property cannot be destructured any further
+                        var expression = ts.skipParentheses(prop.expression);
+                        if (ts.isArrayLiteralExpression(expression) || ts.isObjectLiteralExpression(expression)) {
+                            return grammarErrorOnNode(prop.expression, ts.Diagnostics.A_rest_element_cannot_contain_a_binding_pattern);
+                        }
+                    }
                     continue;
                 }
                 var name = prop.name;
-                if (name.kind === 149 /* ComputedPropertyName */) {
+                if (name.kind === 150 /* ComputedPropertyName */) {
                     // If the name is not a ComputedPropertyName, the grammar checking will skip it
                     checkGrammarComputedPropertyName(name);
                 }
-                if (prop.kind === 276 /* ShorthandPropertyAssignment */ && !inDestructuring && prop.objectAssignmentInitializer) {
+                if (prop.kind === 277 /* ShorthandPropertyAssignment */ && !inDestructuring && prop.objectAssignmentInitializer) {
                     // having objectAssignmentInitializer is only valid in ObjectAssignmentPattern
                     // outside of destructuring it is a syntax error
                     return grammarErrorOnNode(prop.equalsToken, ts.Diagnostics.can_only_be_used_in_an_object_literal_property_inside_a_destructuring_assignment);
@@ -59489,7 +61578,7 @@ var ts;
                 if (prop.modifiers) {
                     for (var _b = 0, _c = prop.modifiers; _b < _c.length; _b++) { // TODO: GH#19955
                         var mod = _c[_b];
-                        if (mod.kind !== 121 /* AsyncKeyword */ || prop.kind !== 156 /* MethodDeclaration */) {
+                        if (mod.kind !== 122 /* AsyncKeyword */ || prop.kind !== 157 /* MethodDeclaration */) {
                             grammarErrorOnNode(mod, ts.Diagnostics._0_modifier_cannot_be_used_here, ts.getTextOfNode(mod));
                         }
                     }
@@ -59504,23 +61593,23 @@ var ts;
                 // and either both previous and propId.descriptor have[[Get]] fields or both previous and propId.descriptor have[[Set]] fields
                 var currentKind = void 0;
                 switch (prop.kind) {
-                    case 276 /* ShorthandPropertyAssignment */:
+                    case 277 /* ShorthandPropertyAssignment */:
                         checkGrammarForInvalidExclamationToken(prop.exclamationToken, ts.Diagnostics.A_definite_assignment_assertion_is_not_permitted_in_this_context);
                     /* tslint:disable:no-switch-case-fall-through */
-                    case 275 /* PropertyAssignment */:
+                    case 276 /* PropertyAssignment */:
                         // Grammar checking for computedPropertyName and shorthandPropertyAssignment
                         checkGrammarForInvalidQuestionMark(prop.questionToken, ts.Diagnostics.An_object_member_cannot_be_declared_optional);
                         if (name.kind === 8 /* NumericLiteral */) {
                             checkGrammarNumericLiteral(name);
                         }
                     // falls through
-                    case 156 /* MethodDeclaration */:
+                    case 157 /* MethodDeclaration */:
                         currentKind = 1 /* Property */;
                         break;
-                    case 158 /* GetAccessor */:
+                    case 159 /* GetAccessor */:
                         currentKind = 2 /* GetAccessor */;
                         break;
-                    case 159 /* SetAccessor */:
+                    case 160 /* SetAccessor */:
                         currentKind = 4 /* SetAccessor */;
                         break;
                     default:
@@ -59557,7 +61646,7 @@ var ts;
             var seen = ts.createUnderscoreEscapedMap();
             for (var _i = 0, _a = node.attributes.properties; _i < _a.length; _i++) {
                 var attr = _a[_i];
-                if (attr.kind === 269 /* JsxSpreadAttribute */) {
+                if (attr.kind === 270 /* JsxSpreadAttribute */) {
                     continue;
                 }
                 var name = attr.name, initializer = attr.initializer;
@@ -59567,21 +61656,39 @@ var ts;
                 else {
                     return grammarErrorOnNode(name, ts.Diagnostics.JSX_elements_cannot_have_multiple_attributes_with_the_same_name);
                 }
-                if (initializer && initializer.kind === 270 /* JsxExpression */ && !initializer.expression) {
+                if (initializer && initializer.kind === 271 /* JsxExpression */ && !initializer.expression) {
                     return grammarErrorOnNode(initializer, ts.Diagnostics.JSX_attributes_must_only_be_assigned_a_non_empty_expression);
                 }
             }
         }
+        function checkGrammarJsxExpression(node) {
+            if (node.expression && ts.isCommaSequence(node.expression)) {
+                return grammarErrorOnNode(node.expression, ts.Diagnostics.JSX_expressions_may_not_use_the_comma_operator_Did_you_mean_to_write_an_array);
+            }
+        }
         function checkGrammarForInOrForOfStatement(forInOrOfStatement) {
             if (checkGrammarStatementInAmbientContext(forInOrOfStatement)) {
                 return true;
             }
-            if (forInOrOfStatement.kind === 227 /* ForOfStatement */ && forInOrOfStatement.awaitModifier) {
+            if (forInOrOfStatement.kind === 228 /* ForOfStatement */ && forInOrOfStatement.awaitModifier) {
                 if ((forInOrOfStatement.flags & 16384 /* AwaitContext */) === 0 /* None */) {
-                    return grammarErrorOnNode(forInOrOfStatement.awaitModifier, ts.Diagnostics.A_for_await_of_statement_is_only_allowed_within_an_async_function_or_async_generator);
+                    // use of 'for-await-of' in non-async function
+                    var sourceFile = ts.getSourceFileOfNode(forInOrOfStatement);
+                    if (!hasParseDiagnostics(sourceFile)) {
+                        var diagnostic = ts.createDiagnosticForNode(forInOrOfStatement.awaitModifier, ts.Diagnostics.A_for_await_of_statement_is_only_allowed_within_an_async_function_or_async_generator);
+                        var func = ts.getContainingFunction(forInOrOfStatement);
+                        if (func && func.kind !== 158 /* Constructor */) {
+                            ts.Debug.assert((ts.getFunctionFlags(func) & 2 /* Async */) === 0, "Enclosing function should never be an async function.");
+                            var relatedInfo = ts.createDiagnosticForNode(func, ts.Diagnostics.Did_you_mean_to_mark_this_function_as_async);
+                            ts.addRelatedInfo(diagnostic, relatedInfo);
+                        }
+                        diagnostics.add(diagnostic);
+                        return true;
+                    }
+                    return false;
                 }
             }
-            if (forInOrOfStatement.initializer.kind === 238 /* VariableDeclarationList */) {
+            if (forInOrOfStatement.initializer.kind === 239 /* VariableDeclarationList */) {
                 var variableList = forInOrOfStatement.initializer;
                 if (!checkGrammarVariableDeclarationList(variableList)) {
                     var declarations = variableList.declarations;
@@ -59596,20 +61703,20 @@ var ts;
                         return false;
                     }
                     if (declarations.length > 1) {
-                        var diagnostic = forInOrOfStatement.kind === 226 /* ForInStatement */
+                        var diagnostic = forInOrOfStatement.kind === 227 /* ForInStatement */
                             ? ts.Diagnostics.Only_a_single_variable_declaration_is_allowed_in_a_for_in_statement
                             : ts.Diagnostics.Only_a_single_variable_declaration_is_allowed_in_a_for_of_statement;
                         return grammarErrorOnFirstToken(variableList.declarations[1], diagnostic);
                     }
                     var firstDeclaration = declarations[0];
                     if (firstDeclaration.initializer) {
-                        var diagnostic = forInOrOfStatement.kind === 226 /* ForInStatement */
+                        var diagnostic = forInOrOfStatement.kind === 227 /* ForInStatement */
                             ? ts.Diagnostics.The_variable_declaration_of_a_for_in_statement_cannot_have_an_initializer
                             : ts.Diagnostics.The_variable_declaration_of_a_for_of_statement_cannot_have_an_initializer;
                         return grammarErrorOnNode(firstDeclaration.name, diagnostic);
                     }
                     if (firstDeclaration.type) {
-                        var diagnostic = forInOrOfStatement.kind === 226 /* ForInStatement */
+                        var diagnostic = forInOrOfStatement.kind === 227 /* ForInStatement */
                             ? ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_use_a_type_annotation
                             : ts.Diagnostics.The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation;
                         return grammarErrorOnNode(firstDeclaration, diagnostic);
@@ -59636,11 +61743,11 @@ var ts;
                 return grammarErrorOnNode(accessor.name, ts.Diagnostics.An_accessor_cannot_have_type_parameters);
             }
             else if (!doesAccessorHaveCorrectParameterCount(accessor)) {
-                return grammarErrorOnNode(accessor.name, kind === 158 /* GetAccessor */ ?
+                return grammarErrorOnNode(accessor.name, kind === 159 /* GetAccessor */ ?
                     ts.Diagnostics.A_get_accessor_cannot_have_parameters :
                     ts.Diagnostics.A_set_accessor_must_have_exactly_one_parameter);
             }
-            else if (kind === 159 /* SetAccessor */) {
+            else if (kind === 160 /* SetAccessor */) {
                 if (accessor.type) {
                     return grammarErrorOnNode(accessor.name, ts.Diagnostics.A_set_accessor_cannot_have_a_return_type_annotation);
                 }
@@ -59664,23 +61771,23 @@ var ts;
          * A set accessor has one parameter or a `this` parameter and one more parameter.
          */
         function doesAccessorHaveCorrectParameterCount(accessor) {
-            return getAccessorThisParameter(accessor) || accessor.parameters.length === (accessor.kind === 158 /* GetAccessor */ ? 0 : 1);
+            return getAccessorThisParameter(accessor) || accessor.parameters.length === (accessor.kind === 159 /* GetAccessor */ ? 0 : 1);
         }
         function getAccessorThisParameter(accessor) {
-            if (accessor.parameters.length === (accessor.kind === 158 /* GetAccessor */ ? 1 : 2)) {
+            if (accessor.parameters.length === (accessor.kind === 159 /* GetAccessor */ ? 1 : 2)) {
                 return ts.getThisParameter(accessor);
             }
         }
         function checkGrammarTypeOperatorNode(node) {
-            if (node.operator === 142 /* UniqueKeyword */) {
-                if (node.type.kind !== 139 /* SymbolKeyword */) {
-                    return grammarErrorOnNode(node.type, ts.Diagnostics._0_expected, ts.tokenToString(139 /* SymbolKeyword */));
+            if (node.operator === 143 /* UniqueKeyword */) {
+                if (node.type.kind !== 140 /* SymbolKeyword */) {
+                    return grammarErrorOnNode(node.type, ts.Diagnostics._0_expected, ts.tokenToString(140 /* SymbolKeyword */));
                 }
                 var parent = ts.walkUpParenthesizedTypes(node.parent);
                 switch (parent.kind) {
-                    case 237 /* VariableDeclaration */:
+                    case 238 /* VariableDeclaration */:
                         var decl = parent;
-                        if (decl.name.kind !== 72 /* Identifier */) {
+                        if (decl.name.kind !== 73 /* Identifier */) {
                             return grammarErrorOnNode(node, ts.Diagnostics.unique_symbol_types_may_not_be_used_on_a_variable_declaration_with_a_binding_name);
                         }
                         if (!ts.isVariableDeclarationInVariableStatement(decl)) {
@@ -59690,13 +61797,13 @@ var ts;
                             return grammarErrorOnNode(parent.name, ts.Diagnostics.A_variable_whose_type_is_a_unique_symbol_type_must_be_const);
                         }
                         break;
-                    case 154 /* PropertyDeclaration */:
+                    case 155 /* PropertyDeclaration */:
                         if (!ts.hasModifier(parent, 32 /* Static */) ||
                             !ts.hasModifier(parent, 64 /* Readonly */)) {
                             return grammarErrorOnNode(parent.name, ts.Diagnostics.A_property_of_a_class_whose_type_is_a_unique_symbol_type_must_be_both_static_and_readonly);
                         }
                         break;
-                    case 153 /* PropertySignature */:
+                    case 154 /* PropertySignature */:
                         if (!ts.hasModifier(parent, 64 /* Readonly */)) {
                             return grammarErrorOnNode(parent.name, ts.Diagnostics.A_property_of_an_interface_or_type_literal_whose_type_is_a_unique_symbol_type_must_be_readonly);
                         }
@@ -59705,9 +61812,9 @@ var ts;
                         return grammarErrorOnNode(node, ts.Diagnostics.unique_symbol_types_are_not_allowed_here);
                 }
             }
-            else if (node.operator === 133 /* ReadonlyKeyword */) {
-                if (node.type.kind !== 169 /* ArrayType */ && node.type.kind !== 170 /* TupleType */) {
-                    return grammarErrorOnFirstToken(node, ts.Diagnostics.readonly_type_modifier_is_only_permitted_on_array_and_tuple_literal_types, ts.tokenToString(139 /* SymbolKeyword */));
+            else if (node.operator === 134 /* ReadonlyKeyword */) {
+                if (node.type.kind !== 170 /* ArrayType */ && node.type.kind !== 171 /* TupleType */) {
+                    return grammarErrorOnFirstToken(node, ts.Diagnostics.readonly_type_modifier_is_only_permitted_on_array_and_tuple_literal_types, ts.tokenToString(140 /* SymbolKeyword */));
                 }
             }
         }
@@ -59720,10 +61827,10 @@ var ts;
             if (checkGrammarFunctionLikeDeclaration(node)) {
                 return true;
             }
-            if (node.kind === 156 /* MethodDeclaration */) {
-                if (node.parent.kind === 188 /* ObjectLiteralExpression */) {
+            if (node.kind === 157 /* MethodDeclaration */) {
+                if (node.parent.kind === 189 /* ObjectLiteralExpression */) {
                     // We only disallow modifier on a method declaration if it is a property of object-literal-expression
-                    if (node.modifiers && !(node.modifiers.length === 1 && ts.first(node.modifiers).kind === 121 /* AsyncKeyword */)) {
+                    if (node.modifiers && !(node.modifiers.length === 1 && ts.first(node.modifiers).kind === 122 /* AsyncKeyword */)) {
                         return grammarErrorOnFirstToken(node, ts.Diagnostics.Modifiers_cannot_appear_here);
                     }
                     else if (checkGrammarForInvalidQuestionMark(node.questionToken, ts.Diagnostics.An_object_member_cannot_be_declared_optional)) {
@@ -59749,14 +61856,14 @@ var ts;
                 if (node.flags & 4194304 /* Ambient */) {
                     return checkGrammarForInvalidDynamicName(node.name, ts.Diagnostics.A_computed_property_name_in_an_ambient_context_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type);
                 }
-                else if (node.kind === 156 /* MethodDeclaration */ && !node.body) {
+                else if (node.kind === 157 /* MethodDeclaration */ && !node.body) {
                     return checkGrammarForInvalidDynamicName(node.name, ts.Diagnostics.A_computed_property_name_in_a_method_overload_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type);
                 }
             }
-            else if (node.parent.kind === 241 /* InterfaceDeclaration */) {
+            else if (node.parent.kind === 242 /* InterfaceDeclaration */) {
                 return checkGrammarForInvalidDynamicName(node.name, ts.Diagnostics.A_computed_property_name_in_an_interface_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type);
             }
-            else if (node.parent.kind === 168 /* TypeLiteral */) {
+            else if (node.parent.kind === 169 /* TypeLiteral */) {
                 return checkGrammarForInvalidDynamicName(node.name, ts.Diagnostics.A_computed_property_name_in_a_type_literal_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type);
             }
         }
@@ -59767,11 +61874,11 @@ var ts;
                     return grammarErrorOnNode(node, ts.Diagnostics.Jump_target_cannot_cross_function_boundary);
                 }
                 switch (current.kind) {
-                    case 233 /* LabeledStatement */:
+                    case 234 /* LabeledStatement */:
                         if (node.label && current.label.escapedText === node.label.escapedText) {
                             // found matching label - verify that label usage is correct
                             // continue can only target labels that are on iteration statements
-                            var isMisplacedContinueLabel = node.kind === 228 /* ContinueStatement */
+                            var isMisplacedContinueLabel = node.kind === 229 /* ContinueStatement */
                                 && !ts.isIterationStatement(current.statement, /*lookInLabeledStatement*/ true);
                             if (isMisplacedContinueLabel) {
                                 return grammarErrorOnNode(node, ts.Diagnostics.A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement);
@@ -59779,8 +61886,8 @@ var ts;
                             return false;
                         }
                         break;
-                    case 232 /* SwitchStatement */:
-                        if (node.kind === 229 /* BreakStatement */ && !node.label) {
+                    case 233 /* SwitchStatement */:
+                        if (node.kind === 230 /* BreakStatement */ && !node.label) {
                             // unlabeled break within switch statement - ok
                             return false;
                         }
@@ -59795,13 +61902,13 @@ var ts;
                 current = current.parent;
             }
             if (node.label) {
-                var message = node.kind === 229 /* BreakStatement */
+                var message = node.kind === 230 /* BreakStatement */
                     ? ts.Diagnostics.A_break_statement_can_only_jump_to_a_label_of_an_enclosing_statement
                     : ts.Diagnostics.A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement;
                 return grammarErrorOnNode(node, message);
             }
             else {
-                var message = node.kind === 229 /* BreakStatement */
+                var message = node.kind === 230 /* BreakStatement */
                     ? ts.Diagnostics.A_break_statement_can_only_be_used_within_an_enclosing_iteration_or_switch_statement
                     : ts.Diagnostics.A_continue_statement_can_only_be_used_within_an_enclosing_iteration_statement;
                 return grammarErrorOnNode(node, message);
@@ -59825,12 +61932,12 @@ var ts;
         }
         function isStringOrNumberLiteralExpression(expr) {
             return expr.kind === 10 /* StringLiteral */ || expr.kind === 8 /* NumericLiteral */ ||
-                expr.kind === 202 /* PrefixUnaryExpression */ && expr.operator === 39 /* MinusToken */ &&
+                expr.kind === 203 /* PrefixUnaryExpression */ && expr.operator === 39 /* MinusToken */ &&
                     expr.operand.kind === 8 /* NumericLiteral */;
         }
         function isBigIntLiteralExpression(expr) {
             return expr.kind === 9 /* BigIntLiteral */ ||
-                expr.kind === 202 /* PrefixUnaryExpression */ && expr.operator === 39 /* MinusToken */ &&
+                expr.kind === 203 /* PrefixUnaryExpression */ && expr.operator === 39 /* MinusToken */ &&
                     expr.operand.kind === 9 /* BigIntLiteral */;
         }
         function isSimpleLiteralEnumReference(expr) {
@@ -59843,7 +61950,7 @@ var ts;
             if (initializer) {
                 var isInvalidInitializer = !(isStringOrNumberLiteralExpression(initializer) ||
                     isSimpleLiteralEnumReference(initializer) ||
-                    initializer.kind === 102 /* TrueKeyword */ || initializer.kind === 87 /* FalseKeyword */ ||
+                    initializer.kind === 103 /* TrueKeyword */ || initializer.kind === 88 /* FalseKeyword */ ||
                     isBigIntLiteralExpression(initializer));
                 var isConstOrReadonly = ts.isDeclarationReadonly(node) || ts.isVariableDeclaration(node) && ts.isVarConst(node);
                 if (isConstOrReadonly && !node.type) {
@@ -59860,7 +61967,7 @@ var ts;
             }
         }
         function checkGrammarVariableDeclaration(node) {
-            if (node.parent.parent.kind !== 226 /* ForInStatement */ && node.parent.parent.kind !== 227 /* ForOfStatement */) {
+            if (node.parent.parent.kind !== 227 /* ForInStatement */ && node.parent.parent.kind !== 228 /* ForOfStatement */) {
                 if (node.flags & 4194304 /* Ambient */) {
                     checkAmbientInitializer(node);
                 }
@@ -59873,8 +61980,8 @@ var ts;
                     }
                 }
             }
-            if (node.exclamationToken && (node.parent.parent.kind !== 219 /* VariableStatement */ || !node.type || node.initializer || node.flags & 4194304 /* Ambient */)) {
-                return grammarErrorOnNode(node.exclamationToken, ts.Diagnostics.A_definite_assignment_assertion_is_not_permitted_in_this_context);
+            if (node.exclamationToken && (node.parent.parent.kind !== 220 /* VariableStatement */ || !node.type || node.initializer || node.flags & 4194304 /* Ambient */)) {
+                return grammarErrorOnNode(node.exclamationToken, ts.Diagnostics.Definite_assignment_assertions_can_only_be_used_along_with_a_type_annotation);
             }
             if (compilerOptions.module !== ts.ModuleKind.ES2015 && compilerOptions.module !== ts.ModuleKind.ESNext && compilerOptions.module !== ts.ModuleKind.System && !compilerOptions.noEmit &&
                 !(node.parent.parent.flags & 4194304 /* Ambient */) && ts.hasModifier(node.parent.parent, 1 /* Export */)) {
@@ -59890,7 +61997,7 @@ var ts;
             return checkLetConstNames && checkGrammarNameInLetOrConstDeclarations(node.name);
         }
         function checkESModuleMarker(name) {
-            if (name.kind === 72 /* Identifier */) {
+            if (name.kind === 73 /* Identifier */) {
                 if (ts.idText(name) === "__esModule") {
                     return grammarErrorOnNode(name, ts.Diagnostics.Identifier_expected_esModule_is_reserved_as_an_exported_marker_when_transforming_ECMAScript_modules);
                 }
@@ -59907,8 +62014,8 @@ var ts;
             return false;
         }
         function checkGrammarNameInLetOrConstDeclarations(name) {
-            if (name.kind === 72 /* Identifier */) {
-                if (name.originalKeywordKind === 111 /* LetKeyword */) {
+            if (name.kind === 73 /* Identifier */) {
+                if (name.originalKeywordKind === 112 /* LetKeyword */) {
                     return grammarErrorOnNode(name, ts.Diagnostics.let_is_not_allowed_to_be_used_as_a_name_in_let_or_const_declarations);
                 }
             }
@@ -59935,15 +62042,15 @@ var ts;
         }
         function allowLetAndConstDeclarations(parent) {
             switch (parent.kind) {
-                case 222 /* IfStatement */:
-                case 223 /* DoStatement */:
-                case 224 /* WhileStatement */:
-                case 231 /* WithStatement */:
-                case 225 /* ForStatement */:
-                case 226 /* ForInStatement */:
-                case 227 /* ForOfStatement */:
+                case 223 /* IfStatement */:
+                case 224 /* DoStatement */:
+                case 225 /* WhileStatement */:
+                case 232 /* WithStatement */:
+                case 226 /* ForStatement */:
+                case 227 /* ForInStatement */:
+                case 228 /* ForOfStatement */:
                     return false;
-                case 233 /* LabeledStatement */:
+                case 234 /* LabeledStatement */:
                     return allowLetAndConstDeclarations(parent.parent);
             }
             return true;
@@ -59961,12 +62068,12 @@ var ts;
         function checkGrammarMetaProperty(node) {
             var escapedText = node.name.escapedText;
             switch (node.keywordToken) {
-                case 95 /* NewKeyword */:
+                case 96 /* NewKeyword */:
                     if (escapedText !== "target") {
                         return grammarErrorOnNode(node.name, ts.Diagnostics._0_is_not_a_valid_meta_property_for_keyword_1_Did_you_mean_2, node.name.escapedText, ts.tokenToString(node.keywordToken), "target");
                     }
                     break;
-                case 92 /* ImportKeyword */:
+                case 93 /* ImportKeyword */:
                     if (escapedText !== "meta") {
                         return grammarErrorOnNode(node.name, ts.Diagnostics._0_is_not_a_valid_meta_property_for_keyword_1_Did_you_mean_2, node.name.escapedText, ts.tokenToString(node.keywordToken), "meta");
                     }
@@ -60017,11 +62124,14 @@ var ts;
         }
         function checkGrammarProperty(node) {
             if (ts.isClassLike(node.parent)) {
+                if (ts.isStringLiteral(node.name) && node.name.text === "constructor") {
+                    return grammarErrorOnNode(node.name, ts.Diagnostics.Classes_may_not_have_a_field_named_constructor);
+                }
                 if (checkGrammarForInvalidDynamicName(node.name, ts.Diagnostics.A_computed_property_name_in_a_class_property_declaration_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type)) {
                     return true;
                 }
             }
-            else if (node.parent.kind === 241 /* InterfaceDeclaration */) {
+            else if (node.parent.kind === 242 /* InterfaceDeclaration */) {
                 if (checkGrammarForInvalidDynamicName(node.name, ts.Diagnostics.A_computed_property_name_in_an_interface_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type)) {
                     return true;
                 }
@@ -60029,7 +62139,7 @@ var ts;
                     return grammarErrorOnNode(node.initializer, ts.Diagnostics.An_interface_property_cannot_have_an_initializer);
                 }
             }
-            else if (node.parent.kind === 168 /* TypeLiteral */) {
+            else if (node.parent.kind === 169 /* TypeLiteral */) {
                 if (checkGrammarForInvalidDynamicName(node.name, ts.Diagnostics.A_computed_property_name_in_a_type_literal_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type)) {
                     return true;
                 }
@@ -60058,22 +62168,22 @@ var ts;
             //     export_opt   AmbientDeclaration
             //
             // TODO: The spec needs to be amended to reflect this grammar.
-            if (node.kind === 241 /* InterfaceDeclaration */ ||
-                node.kind === 242 /* TypeAliasDeclaration */ ||
-                node.kind === 249 /* ImportDeclaration */ ||
-                node.kind === 248 /* ImportEqualsDeclaration */ ||
-                node.kind === 255 /* ExportDeclaration */ ||
-                node.kind === 254 /* ExportAssignment */ ||
-                node.kind === 247 /* NamespaceExportDeclaration */ ||
+            if (node.kind === 242 /* InterfaceDeclaration */ ||
+                node.kind === 243 /* TypeAliasDeclaration */ ||
+                node.kind === 250 /* ImportDeclaration */ ||
+                node.kind === 249 /* ImportEqualsDeclaration */ ||
+                node.kind === 256 /* ExportDeclaration */ ||
+                node.kind === 255 /* ExportAssignment */ ||
+                node.kind === 248 /* NamespaceExportDeclaration */ ||
                 ts.hasModifier(node, 2 /* Ambient */ | 1 /* Export */ | 512 /* Default */)) {
                 return false;
             }
-            return grammarErrorOnFirstToken(node, ts.Diagnostics.A_declare_modifier_is_required_for_a_top_level_declaration_in_a_d_ts_file);
+            return grammarErrorOnFirstToken(node, ts.Diagnostics.Top_level_declarations_in_d_ts_files_must_start_with_either_a_declare_or_export_modifier);
         }
         function checkGrammarTopLevelElementsForRequiredDeclareModifier(file) {
             for (var _i = 0, _a = file.statements; _i < _a.length; _i++) {
                 var decl = _a[_i];
-                if (ts.isDeclaration(decl) || decl.kind === 219 /* VariableStatement */) {
+                if (ts.isDeclaration(decl) || decl.kind === 220 /* VariableStatement */) {
                     if (checkGrammarTopLevelElementForRequiredDeclareModifier(decl)) {
                         return true;
                     }
@@ -60100,11 +62210,11 @@ var ts;
                 // to prevent noisiness.  So use a bit on the block to indicate if
                 // this has already been reported, and don't report if it has.
                 //
-                if (node.parent.kind === 218 /* Block */ || node.parent.kind === 245 /* ModuleBlock */ || node.parent.kind === 284 /* SourceFile */) {
-                    var links_2 = getNodeLinks(node.parent);
+                if (node.parent.kind === 219 /* Block */ || node.parent.kind === 246 /* ModuleBlock */ || node.parent.kind === 285 /* SourceFile */) {
+                    var links_1 = getNodeLinks(node.parent);
                     // Check if the containing block ever report this error
-                    if (!links_2.hasReportedStatementInAmbientContext) {
-                        return links_2.hasReportedStatementInAmbientContext = grammarErrorOnFirstToken(node, ts.Diagnostics.Statements_are_not_allowed_in_ambient_contexts);
+                    if (!links_1.hasReportedStatementInAmbientContext) {
+                        return links_1.hasReportedStatementInAmbientContext = grammarErrorOnFirstToken(node, ts.Diagnostics.Statements_are_not_allowed_in_ambient_contexts);
                     }
                 }
                 else {
@@ -60122,10 +62232,10 @@ var ts;
                 if (languageVersion >= 1 /* ES5 */) {
                     diagnosticMessage = ts.Diagnostics.Octal_literals_are_not_available_when_targeting_ECMAScript_5_and_higher_Use_the_syntax_0;
                 }
-                else if (ts.isChildOfNodeWithKind(node, 182 /* LiteralType */)) {
+                else if (ts.isChildOfNodeWithKind(node, 183 /* LiteralType */)) {
                     diagnosticMessage = ts.Diagnostics.Octal_literal_types_must_use_ES2015_syntax_Use_the_syntax_0;
                 }
-                else if (ts.isChildOfNodeWithKind(node, 278 /* EnumMember */)) {
+                else if (ts.isChildOfNodeWithKind(node, 279 /* EnumMember */)) {
                     diagnosticMessage = ts.Diagnostics.Octal_literals_are_not_allowed_in_enums_members_initializer_Use_the_syntax_0;
                 }
                 if (diagnosticMessage) {
@@ -60140,7 +62250,7 @@ var ts;
             var literalType = ts.isLiteralTypeNode(node.parent) ||
                 ts.isPrefixUnaryExpression(node.parent) && ts.isLiteralTypeNode(node.parent.parent);
             if (!literalType) {
-                if (languageVersion < 7 /* ESNext */) {
+                if (languageVersion < 99 /* ESNext */) {
                     if (grammarErrorOnNode(node, ts.Diagnostics.BigInt_literals_are_not_available_when_targeting_lower_than_ESNext)) {
                         return true;
                     }
@@ -60193,8 +62303,8 @@ var ts;
     /** Like 'isDeclarationName', but returns true for LHS of `import { x as y }` or `export { x as y }`. */
     function isDeclarationNameOrImportPropertyName(name) {
         switch (name.parent.kind) {
-            case 253 /* ImportSpecifier */:
-            case 257 /* ExportSpecifier */:
+            case 254 /* ImportSpecifier */:
+            case 258 /* ExportSpecifier */:
                 return ts.isIdentifier(name);
             default:
                 return ts.isDeclarationName(name);
@@ -60202,14 +62312,14 @@ var ts;
     }
     function isSomeImportDeclaration(decl) {
         switch (decl.kind) {
-            case 250 /* ImportClause */: // For default import
-            case 248 /* ImportEqualsDeclaration */:
-            case 251 /* NamespaceImport */:
-            case 253 /* ImportSpecifier */: // For rename import `x as y`
+            case 251 /* ImportClause */: // For default import
+            case 249 /* ImportEqualsDeclaration */:
+            case 252 /* NamespaceImport */:
+            case 254 /* ImportSpecifier */: // For rename import `x as y`
                 return true;
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 // For regular import, `decl` is an Identifier under the ImportSpecifier.
-                return decl.parent.kind === 253 /* ImportSpecifier */;
+                return decl.parent.kind === 254 /* ImportSpecifier */;
             default:
                 return false;
         }
@@ -60228,6 +62338,13 @@ var ts;
         JsxNames.LibraryManagedAttributes = "LibraryManagedAttributes";
         // tslint:enable variable-name
     })(JsxNames || (JsxNames = {}));
+    function getIterationTypesKeyFromIterationTypeKind(typeKind) {
+        switch (typeKind) {
+            case 0 /* Yield */: return "yieldType";
+            case 1 /* Return */: return "returnType";
+            case 2 /* Next */: return "nextType";
+        }
+    }
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
@@ -60337,7 +62454,7 @@ var ts;
         return node;
     }
     function createIdentifier(text, typeArguments) {
-        var node = createSynthesizedNode(72 /* Identifier */);
+        var node = createSynthesizedNode(73 /* Identifier */);
         node.escapedText = ts.escapeLeadingUnderscores(text);
         node.originalKeywordKind = text ? ts.stringToToken(text) : 0 /* Unknown */;
         node.autoGenerateFlags = 0 /* None */;
@@ -60418,23 +62535,23 @@ var ts;
     ts.createToken = createToken;
     // Reserved words
     function createSuper() {
-        return createSynthesizedNode(98 /* SuperKeyword */);
+        return createSynthesizedNode(99 /* SuperKeyword */);
     }
     ts.createSuper = createSuper;
     function createThis() {
-        return createSynthesizedNode(100 /* ThisKeyword */);
+        return createSynthesizedNode(101 /* ThisKeyword */);
     }
     ts.createThis = createThis;
     function createNull() {
-        return createSynthesizedNode(96 /* NullKeyword */);
+        return createSynthesizedNode(97 /* NullKeyword */);
     }
     ts.createNull = createNull;
     function createTrue() {
-        return createSynthesizedNode(102 /* TrueKeyword */);
+        return createSynthesizedNode(103 /* TrueKeyword */);
     }
     ts.createTrue = createTrue;
     function createFalse() {
-        return createSynthesizedNode(87 /* FalseKeyword */);
+        return createSynthesizedNode(88 /* FalseKeyword */);
     }
     ts.createFalse = createFalse;
     // Modifiers
@@ -60445,44 +62562,44 @@ var ts;
     function createModifiersFromModifierFlags(flags) {
         var result = [];
         if (flags & 1 /* Export */) {
-            result.push(createModifier(85 /* ExportKeyword */));
+            result.push(createModifier(86 /* ExportKeyword */));
         }
         if (flags & 2 /* Ambient */) {
-            result.push(createModifier(125 /* DeclareKeyword */));
+            result.push(createModifier(126 /* DeclareKeyword */));
         }
         if (flags & 512 /* Default */) {
-            result.push(createModifier(80 /* DefaultKeyword */));
+            result.push(createModifier(81 /* DefaultKeyword */));
         }
         if (flags & 2048 /* Const */) {
-            result.push(createModifier(77 /* ConstKeyword */));
+            result.push(createModifier(78 /* ConstKeyword */));
         }
         if (flags & 4 /* Public */) {
-            result.push(createModifier(115 /* PublicKeyword */));
+            result.push(createModifier(116 /* PublicKeyword */));
         }
         if (flags & 8 /* Private */) {
-            result.push(createModifier(113 /* PrivateKeyword */));
+            result.push(createModifier(114 /* PrivateKeyword */));
         }
         if (flags & 16 /* Protected */) {
-            result.push(createModifier(114 /* ProtectedKeyword */));
+            result.push(createModifier(115 /* ProtectedKeyword */));
         }
         if (flags & 128 /* Abstract */) {
-            result.push(createModifier(118 /* AbstractKeyword */));
+            result.push(createModifier(119 /* AbstractKeyword */));
         }
         if (flags & 32 /* Static */) {
-            result.push(createModifier(116 /* StaticKeyword */));
+            result.push(createModifier(117 /* StaticKeyword */));
         }
         if (flags & 64 /* Readonly */) {
-            result.push(createModifier(133 /* ReadonlyKeyword */));
+            result.push(createModifier(134 /* ReadonlyKeyword */));
         }
         if (flags & 256 /* Async */) {
-            result.push(createModifier(121 /* AsyncKeyword */));
+            result.push(createModifier(122 /* AsyncKeyword */));
         }
         return result;
     }
     ts.createModifiersFromModifierFlags = createModifiersFromModifierFlags;
     // Names
     function createQualifiedName(left, right) {
-        var node = createSynthesizedNode(148 /* QualifiedName */);
+        var node = createSynthesizedNode(149 /* QualifiedName */);
         node.left = left;
         node.right = asName(right);
         return node;
@@ -60501,7 +62618,7 @@ var ts;
             : expression;
     }
     function createComputedPropertyName(expression) {
-        var node = createSynthesizedNode(149 /* ComputedPropertyName */);
+        var node = createSynthesizedNode(150 /* ComputedPropertyName */);
         node.expression = parenthesizeForComputedName(expression);
         return node;
     }
@@ -60514,7 +62631,7 @@ var ts;
     ts.updateComputedPropertyName = updateComputedPropertyName;
     // Signature elements
     function createTypeParameterDeclaration(name, constraint, defaultType) {
-        var node = createSynthesizedNode(150 /* TypeParameter */);
+        var node = createSynthesizedNode(151 /* TypeParameter */);
         node.name = asName(name);
         node.constraint = constraint;
         node.default = defaultType;
@@ -60530,7 +62647,7 @@ var ts;
     }
     ts.updateTypeParameterDeclaration = updateTypeParameterDeclaration;
     function createParameter(decorators, modifiers, dotDotDotToken, name, questionToken, type, initializer) {
-        var node = createSynthesizedNode(151 /* Parameter */);
+        var node = createSynthesizedNode(152 /* Parameter */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.dotDotDotToken = dotDotDotToken;
@@ -60554,7 +62671,7 @@ var ts;
     }
     ts.updateParameter = updateParameter;
     function createDecorator(expression) {
-        var node = createSynthesizedNode(152 /* Decorator */);
+        var node = createSynthesizedNode(153 /* Decorator */);
         node.expression = ts.parenthesizeForAccess(expression);
         return node;
     }
@@ -60567,7 +62684,7 @@ var ts;
     ts.updateDecorator = updateDecorator;
     // Type Elements
     function createPropertySignature(modifiers, name, questionToken, type, initializer) {
-        var node = createSynthesizedNode(153 /* PropertySignature */);
+        var node = createSynthesizedNode(154 /* PropertySignature */);
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
         node.questionToken = questionToken;
@@ -60587,7 +62704,7 @@ var ts;
     }
     ts.updatePropertySignature = updatePropertySignature;
     function createProperty(decorators, modifiers, name, questionOrExclamationToken, type, initializer) {
-        var node = createSynthesizedNode(154 /* PropertyDeclaration */);
+        var node = createSynthesizedNode(155 /* PropertyDeclaration */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
@@ -60611,7 +62728,7 @@ var ts;
     }
     ts.updateProperty = updateProperty;
     function createMethodSignature(typeParameters, parameters, type, name, questionToken) {
-        var node = createSignatureDeclaration(155 /* MethodSignature */, typeParameters, parameters, type);
+        var node = createSignatureDeclaration(156 /* MethodSignature */, typeParameters, parameters, type);
         node.name = asName(name);
         node.questionToken = questionToken;
         return node;
@@ -60628,7 +62745,7 @@ var ts;
     }
     ts.updateMethodSignature = updateMethodSignature;
     function createMethod(decorators, modifiers, asteriskToken, name, questionToken, typeParameters, parameters, type, body) {
-        var node = createSynthesizedNode(156 /* MethodDeclaration */);
+        var node = createSynthesizedNode(157 /* MethodDeclaration */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.asteriskToken = asteriskToken;
@@ -60656,7 +62773,7 @@ var ts;
     }
     ts.updateMethod = updateMethod;
     function createConstructor(decorators, modifiers, parameters, body) {
-        var node = createSynthesizedNode(157 /* Constructor */);
+        var node = createSynthesizedNode(158 /* Constructor */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.typeParameters = undefined;
@@ -60676,7 +62793,7 @@ var ts;
     }
     ts.updateConstructor = updateConstructor;
     function createGetAccessor(decorators, modifiers, name, parameters, type, body) {
-        var node = createSynthesizedNode(158 /* GetAccessor */);
+        var node = createSynthesizedNode(159 /* GetAccessor */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
@@ -60699,7 +62816,7 @@ var ts;
     }
     ts.updateGetAccessor = updateGetAccessor;
     function createSetAccessor(decorators, modifiers, name, parameters, body) {
-        var node = createSynthesizedNode(159 /* SetAccessor */);
+        var node = createSynthesizedNode(160 /* SetAccessor */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
@@ -60720,7 +62837,7 @@ var ts;
     }
     ts.updateSetAccessor = updateSetAccessor;
     function createCallSignature(typeParameters, parameters, type) {
-        return createSignatureDeclaration(160 /* CallSignature */, typeParameters, parameters, type);
+        return createSignatureDeclaration(161 /* CallSignature */, typeParameters, parameters, type);
     }
     ts.createCallSignature = createCallSignature;
     function updateCallSignature(node, typeParameters, parameters, type) {
@@ -60728,7 +62845,7 @@ var ts;
     }
     ts.updateCallSignature = updateCallSignature;
     function createConstructSignature(typeParameters, parameters, type) {
-        return createSignatureDeclaration(161 /* ConstructSignature */, typeParameters, parameters, type);
+        return createSignatureDeclaration(162 /* ConstructSignature */, typeParameters, parameters, type);
     }
     ts.createConstructSignature = createConstructSignature;
     function updateConstructSignature(node, typeParameters, parameters, type) {
@@ -60736,7 +62853,7 @@ var ts;
     }
     ts.updateConstructSignature = updateConstructSignature;
     function createIndexSignature(decorators, modifiers, parameters, type) {
-        var node = createSynthesizedNode(162 /* IndexSignature */);
+        var node = createSynthesizedNode(163 /* IndexSignature */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.parameters = createNodeArray(parameters);
@@ -60776,7 +62893,7 @@ var ts;
     }
     ts.createKeywordTypeNode = createKeywordTypeNode;
     function createTypePredicateNode(parameterName, type) {
-        var node = createSynthesizedNode(163 /* TypePredicate */);
+        var node = createSynthesizedNode(164 /* TypePredicate */);
         node.parameterName = asName(parameterName);
         node.type = type;
         return node;
@@ -60790,7 +62907,7 @@ var ts;
     }
     ts.updateTypePredicateNode = updateTypePredicateNode;
     function createTypeReferenceNode(typeName, typeArguments) {
-        var node = createSynthesizedNode(164 /* TypeReference */);
+        var node = createSynthesizedNode(165 /* TypeReference */);
         node.typeName = asName(typeName);
         node.typeArguments = typeArguments && ts.parenthesizeTypeParameters(typeArguments);
         return node;
@@ -60804,7 +62921,7 @@ var ts;
     }
     ts.updateTypeReferenceNode = updateTypeReferenceNode;
     function createFunctionTypeNode(typeParameters, parameters, type) {
-        return createSignatureDeclaration(165 /* FunctionType */, typeParameters, parameters, type);
+        return createSignatureDeclaration(166 /* FunctionType */, typeParameters, parameters, type);
     }
     ts.createFunctionTypeNode = createFunctionTypeNode;
     function updateFunctionTypeNode(node, typeParameters, parameters, type) {
@@ -60812,7 +62929,7 @@ var ts;
     }
     ts.updateFunctionTypeNode = updateFunctionTypeNode;
     function createConstructorTypeNode(typeParameters, parameters, type) {
-        return createSignatureDeclaration(166 /* ConstructorType */, typeParameters, parameters, type);
+        return createSignatureDeclaration(167 /* ConstructorType */, typeParameters, parameters, type);
     }
     ts.createConstructorTypeNode = createConstructorTypeNode;
     function updateConstructorTypeNode(node, typeParameters, parameters, type) {
@@ -60820,7 +62937,7 @@ var ts;
     }
     ts.updateConstructorTypeNode = updateConstructorTypeNode;
     function createTypeQueryNode(exprName) {
-        var node = createSynthesizedNode(167 /* TypeQuery */);
+        var node = createSynthesizedNode(168 /* TypeQuery */);
         node.exprName = exprName;
         return node;
     }
@@ -60832,7 +62949,7 @@ var ts;
     }
     ts.updateTypeQueryNode = updateTypeQueryNode;
     function createTypeLiteralNode(members) {
-        var node = createSynthesizedNode(168 /* TypeLiteral */);
+        var node = createSynthesizedNode(169 /* TypeLiteral */);
         node.members = createNodeArray(members);
         return node;
     }
@@ -60844,7 +62961,7 @@ var ts;
     }
     ts.updateTypeLiteralNode = updateTypeLiteralNode;
     function createArrayTypeNode(elementType) {
-        var node = createSynthesizedNode(169 /* ArrayType */);
+        var node = createSynthesizedNode(170 /* ArrayType */);
         node.elementType = ts.parenthesizeArrayTypeMember(elementType);
         return node;
     }
@@ -60856,7 +62973,7 @@ var ts;
     }
     ts.updateArrayTypeNode = updateArrayTypeNode;
     function createTupleTypeNode(elementTypes) {
-        var node = createSynthesizedNode(170 /* TupleType */);
+        var node = createSynthesizedNode(171 /* TupleType */);
         node.elementTypes = createNodeArray(elementTypes);
         return node;
     }
@@ -60868,7 +62985,7 @@ var ts;
     }
     ts.updateTupleTypeNode = updateTupleTypeNode;
     function createOptionalTypeNode(type) {
-        var node = createSynthesizedNode(171 /* OptionalType */);
+        var node = createSynthesizedNode(172 /* OptionalType */);
         node.type = ts.parenthesizeArrayTypeMember(type);
         return node;
     }
@@ -60880,7 +62997,7 @@ var ts;
     }
     ts.updateOptionalTypeNode = updateOptionalTypeNode;
     function createRestTypeNode(type) {
-        var node = createSynthesizedNode(172 /* RestType */);
+        var node = createSynthesizedNode(173 /* RestType */);
         node.type = type;
         return node;
     }
@@ -60892,7 +63009,7 @@ var ts;
     }
     ts.updateRestTypeNode = updateRestTypeNode;
     function createUnionTypeNode(types) {
-        return createUnionOrIntersectionTypeNode(173 /* UnionType */, types);
+        return createUnionOrIntersectionTypeNode(174 /* UnionType */, types);
     }
     ts.createUnionTypeNode = createUnionTypeNode;
     function updateUnionTypeNode(node, types) {
@@ -60900,7 +63017,7 @@ var ts;
     }
     ts.updateUnionTypeNode = updateUnionTypeNode;
     function createIntersectionTypeNode(types) {
-        return createUnionOrIntersectionTypeNode(174 /* IntersectionType */, types);
+        return createUnionOrIntersectionTypeNode(175 /* IntersectionType */, types);
     }
     ts.createIntersectionTypeNode = createIntersectionTypeNode;
     function updateIntersectionTypeNode(node, types) {
@@ -60919,7 +63036,7 @@ var ts;
             : node;
     }
     function createConditionalTypeNode(checkType, extendsType, trueType, falseType) {
-        var node = createSynthesizedNode(175 /* ConditionalType */);
+        var node = createSynthesizedNode(176 /* ConditionalType */);
         node.checkType = ts.parenthesizeConditionalTypeMember(checkType);
         node.extendsType = ts.parenthesizeConditionalTypeMember(extendsType);
         node.trueType = trueType;
@@ -60937,7 +63054,7 @@ var ts;
     }
     ts.updateConditionalTypeNode = updateConditionalTypeNode;
     function createInferTypeNode(typeParameter) {
-        var node = createSynthesizedNode(176 /* InferType */);
+        var node = createSynthesizedNode(177 /* InferType */);
         node.typeParameter = typeParameter;
         return node;
     }
@@ -60949,10 +63066,10 @@ var ts;
     }
     ts.updateInferTypeNode = updateInferTypeNode;
     function createImportTypeNode(argument, qualifier, typeArguments, isTypeOf) {
-        var node = createSynthesizedNode(183 /* ImportType */);
+        var node = createSynthesizedNode(184 /* ImportType */);
         node.argument = argument;
         node.qualifier = qualifier;
-        node.typeArguments = asNodeArray(typeArguments);
+        node.typeArguments = ts.parenthesizeTypeParameters(typeArguments);
         node.isTypeOf = isTypeOf;
         return node;
     }
@@ -60967,7 +63084,7 @@ var ts;
     }
     ts.updateImportTypeNode = updateImportTypeNode;
     function createParenthesizedType(type) {
-        var node = createSynthesizedNode(177 /* ParenthesizedType */);
+        var node = createSynthesizedNode(178 /* ParenthesizedType */);
         node.type = type;
         return node;
     }
@@ -60979,12 +63096,12 @@ var ts;
     }
     ts.updateParenthesizedType = updateParenthesizedType;
     function createThisTypeNode() {
-        return createSynthesizedNode(178 /* ThisType */);
+        return createSynthesizedNode(179 /* ThisType */);
     }
     ts.createThisTypeNode = createThisTypeNode;
     function createTypeOperatorNode(operatorOrType, type) {
-        var node = createSynthesizedNode(179 /* TypeOperator */);
-        node.operator = typeof operatorOrType === "number" ? operatorOrType : 129 /* KeyOfKeyword */;
+        var node = createSynthesizedNode(180 /* TypeOperator */);
+        node.operator = typeof operatorOrType === "number" ? operatorOrType : 130 /* KeyOfKeyword */;
         node.type = ts.parenthesizeElementTypeMember(typeof operatorOrType === "number" ? type : operatorOrType);
         return node;
     }
@@ -60994,7 +63111,7 @@ var ts;
     }
     ts.updateTypeOperatorNode = updateTypeOperatorNode;
     function createIndexedAccessTypeNode(objectType, indexType) {
-        var node = createSynthesizedNode(180 /* IndexedAccessType */);
+        var node = createSynthesizedNode(181 /* IndexedAccessType */);
         node.objectType = ts.parenthesizeElementTypeMember(objectType);
         node.indexType = indexType;
         return node;
@@ -61008,7 +63125,7 @@ var ts;
     }
     ts.updateIndexedAccessTypeNode = updateIndexedAccessTypeNode;
     function createMappedTypeNode(readonlyToken, typeParameter, questionToken, type) {
-        var node = createSynthesizedNode(181 /* MappedType */);
+        var node = createSynthesizedNode(182 /* MappedType */);
         node.readonlyToken = readonlyToken;
         node.typeParameter = typeParameter;
         node.questionToken = questionToken;
@@ -61026,7 +63143,7 @@ var ts;
     }
     ts.updateMappedTypeNode = updateMappedTypeNode;
     function createLiteralTypeNode(literal) {
-        var node = createSynthesizedNode(182 /* LiteralType */);
+        var node = createSynthesizedNode(183 /* LiteralType */);
         node.literal = literal;
         return node;
     }
@@ -61039,7 +63156,7 @@ var ts;
     ts.updateLiteralTypeNode = updateLiteralTypeNode;
     // Binding Patterns
     function createObjectBindingPattern(elements) {
-        var node = createSynthesizedNode(184 /* ObjectBindingPattern */);
+        var node = createSynthesizedNode(185 /* ObjectBindingPattern */);
         node.elements = createNodeArray(elements);
         return node;
     }
@@ -61051,7 +63168,7 @@ var ts;
     }
     ts.updateObjectBindingPattern = updateObjectBindingPattern;
     function createArrayBindingPattern(elements) {
-        var node = createSynthesizedNode(185 /* ArrayBindingPattern */);
+        var node = createSynthesizedNode(186 /* ArrayBindingPattern */);
         node.elements = createNodeArray(elements);
         return node;
     }
@@ -61063,7 +63180,7 @@ var ts;
     }
     ts.updateArrayBindingPattern = updateArrayBindingPattern;
     function createBindingElement(dotDotDotToken, propertyName, name, initializer) {
-        var node = createSynthesizedNode(186 /* BindingElement */);
+        var node = createSynthesizedNode(187 /* BindingElement */);
         node.dotDotDotToken = dotDotDotToken;
         node.propertyName = asName(propertyName);
         node.name = asName(name);
@@ -61082,7 +63199,7 @@ var ts;
     ts.updateBindingElement = updateBindingElement;
     // Expression
     function createArrayLiteral(elements, multiLine) {
-        var node = createSynthesizedNode(187 /* ArrayLiteralExpression */);
+        var node = createSynthesizedNode(188 /* ArrayLiteralExpression */);
         node.elements = ts.parenthesizeListElements(createNodeArray(elements));
         if (multiLine)
             node.multiLine = true;
@@ -61096,7 +63213,7 @@ var ts;
     }
     ts.updateArrayLiteral = updateArrayLiteral;
     function createObjectLiteral(properties, multiLine) {
-        var node = createSynthesizedNode(188 /* ObjectLiteralExpression */);
+        var node = createSynthesizedNode(189 /* ObjectLiteralExpression */);
         node.properties = createNodeArray(properties);
         if (multiLine)
             node.multiLine = true;
@@ -61110,9 +63227,9 @@ var ts;
     }
     ts.updateObjectLiteral = updateObjectLiteral;
     function createPropertyAccess(expression, name) {
-        var node = createSynthesizedNode(189 /* PropertyAccessExpression */);
+        var node = createSynthesizedNode(190 /* PropertyAccessExpression */);
         node.expression = ts.parenthesizeForAccess(expression);
-        node.name = asName(name); // TODO: GH#18217
+        node.name = asName(name);
         setEmitFlags(node, 131072 /* NoIndentation */);
         return node;
     }
@@ -61127,7 +63244,7 @@ var ts;
     }
     ts.updatePropertyAccess = updatePropertyAccess;
     function createElementAccess(expression, index) {
-        var node = createSynthesizedNode(190 /* ElementAccessExpression */);
+        var node = createSynthesizedNode(191 /* ElementAccessExpression */);
         node.expression = ts.parenthesizeForAccess(expression);
         node.argumentExpression = asExpression(index);
         return node;
@@ -61141,7 +63258,7 @@ var ts;
     }
     ts.updateElementAccess = updateElementAccess;
     function createCall(expression, typeArguments, argumentsArray) {
-        var node = createSynthesizedNode(191 /* CallExpression */);
+        var node = createSynthesizedNode(192 /* CallExpression */);
         node.expression = ts.parenthesizeForAccess(expression);
         node.typeArguments = asNodeArray(typeArguments);
         node.arguments = ts.parenthesizeListElements(createNodeArray(argumentsArray));
@@ -61157,7 +63274,7 @@ var ts;
     }
     ts.updateCall = updateCall;
     function createNew(expression, typeArguments, argumentsArray) {
-        var node = createSynthesizedNode(192 /* NewExpression */);
+        var node = createSynthesizedNode(193 /* NewExpression */);
         node.expression = ts.parenthesizeForNew(expression);
         node.typeArguments = asNodeArray(typeArguments);
         node.arguments = argumentsArray ? ts.parenthesizeListElements(createNodeArray(argumentsArray)) : undefined;
@@ -61173,7 +63290,7 @@ var ts;
     }
     ts.updateNew = updateNew;
     function createTaggedTemplate(tag, typeArgumentsOrTemplate, template) {
-        var node = createSynthesizedNode(193 /* TaggedTemplateExpression */);
+        var node = createSynthesizedNode(194 /* TaggedTemplateExpression */);
         node.tag = ts.parenthesizeForAccess(tag);
         if (template) {
             node.typeArguments = asNodeArray(typeArgumentsOrTemplate);
@@ -61196,7 +63313,7 @@ var ts;
     }
     ts.updateTaggedTemplate = updateTaggedTemplate;
     function createTypeAssertion(type, expression) {
-        var node = createSynthesizedNode(194 /* TypeAssertionExpression */);
+        var node = createSynthesizedNode(195 /* TypeAssertionExpression */);
         node.type = type;
         node.expression = ts.parenthesizePrefixOperand(expression);
         return node;
@@ -61210,7 +63327,7 @@ var ts;
     }
     ts.updateTypeAssertion = updateTypeAssertion;
     function createParen(expression) {
-        var node = createSynthesizedNode(195 /* ParenthesizedExpression */);
+        var node = createSynthesizedNode(196 /* ParenthesizedExpression */);
         node.expression = expression;
         return node;
     }
@@ -61222,7 +63339,7 @@ var ts;
     }
     ts.updateParen = updateParen;
     function createFunctionExpression(modifiers, asteriskToken, name, typeParameters, parameters, type, body) {
-        var node = createSynthesizedNode(196 /* FunctionExpression */);
+        var node = createSynthesizedNode(197 /* FunctionExpression */);
         node.modifiers = asNodeArray(modifiers);
         node.asteriskToken = asteriskToken;
         node.name = asName(name);
@@ -61246,7 +63363,7 @@ var ts;
     }
     ts.updateFunctionExpression = updateFunctionExpression;
     function createArrowFunction(modifiers, typeParameters, parameters, type, equalsGreaterThanToken, body) {
-        var node = createSynthesizedNode(197 /* ArrowFunction */);
+        var node = createSynthesizedNode(198 /* ArrowFunction */);
         node.modifiers = asNodeArray(modifiers);
         node.typeParameters = asNodeArray(typeParameters);
         node.parameters = createNodeArray(parameters);
@@ -61268,7 +63385,7 @@ var ts;
     }
     ts.updateArrowFunction = updateArrowFunction;
     function createDelete(expression) {
-        var node = createSynthesizedNode(198 /* DeleteExpression */);
+        var node = createSynthesizedNode(199 /* DeleteExpression */);
         node.expression = ts.parenthesizePrefixOperand(expression);
         return node;
     }
@@ -61280,7 +63397,7 @@ var ts;
     }
     ts.updateDelete = updateDelete;
     function createTypeOf(expression) {
-        var node = createSynthesizedNode(199 /* TypeOfExpression */);
+        var node = createSynthesizedNode(200 /* TypeOfExpression */);
         node.expression = ts.parenthesizePrefixOperand(expression);
         return node;
     }
@@ -61292,7 +63409,7 @@ var ts;
     }
     ts.updateTypeOf = updateTypeOf;
     function createVoid(expression) {
-        var node = createSynthesizedNode(200 /* VoidExpression */);
+        var node = createSynthesizedNode(201 /* VoidExpression */);
         node.expression = ts.parenthesizePrefixOperand(expression);
         return node;
     }
@@ -61304,7 +63421,7 @@ var ts;
     }
     ts.updateVoid = updateVoid;
     function createAwait(expression) {
-        var node = createSynthesizedNode(201 /* AwaitExpression */);
+        var node = createSynthesizedNode(202 /* AwaitExpression */);
         node.expression = ts.parenthesizePrefixOperand(expression);
         return node;
     }
@@ -61316,7 +63433,7 @@ var ts;
     }
     ts.updateAwait = updateAwait;
     function createPrefix(operator, operand) {
-        var node = createSynthesizedNode(202 /* PrefixUnaryExpression */);
+        var node = createSynthesizedNode(203 /* PrefixUnaryExpression */);
         node.operator = operator;
         node.operand = ts.parenthesizePrefixOperand(operand);
         return node;
@@ -61329,7 +63446,7 @@ var ts;
     }
     ts.updatePrefix = updatePrefix;
     function createPostfix(operand, operator) {
-        var node = createSynthesizedNode(203 /* PostfixUnaryExpression */);
+        var node = createSynthesizedNode(204 /* PostfixUnaryExpression */);
         node.operand = ts.parenthesizePostfixOperand(operand);
         node.operator = operator;
         return node;
@@ -61342,7 +63459,7 @@ var ts;
     }
     ts.updatePostfix = updatePostfix;
     function createBinary(left, operator, right) {
-        var node = createSynthesizedNode(204 /* BinaryExpression */);
+        var node = createSynthesizedNode(205 /* BinaryExpression */);
         var operatorToken = asToken(operator);
         var operatorKind = operatorToken.kind;
         node.left = ts.parenthesizeBinaryOperand(operatorKind, left, /*isLeftSideOfBinary*/ true, /*leftOperand*/ undefined);
@@ -61359,7 +63476,7 @@ var ts;
     }
     ts.updateBinary = updateBinary;
     function createConditional(condition, questionTokenOrWhenTrue, whenTrueOrWhenFalse, colonToken, whenFalse) {
-        var node = createSynthesizedNode(205 /* ConditionalExpression */);
+        var node = createSynthesizedNode(206 /* ConditionalExpression */);
         node.condition = ts.parenthesizeForConditionalHead(condition);
         node.questionToken = whenFalse ? questionTokenOrWhenTrue : createToken(56 /* QuestionToken */);
         node.whenTrue = ts.parenthesizeSubexpressionOfConditionalExpression(whenFalse ? whenTrueOrWhenFalse : questionTokenOrWhenTrue);
@@ -61379,7 +63496,7 @@ var ts;
     }
     ts.updateConditional = updateConditional;
     function createTemplateExpression(head, templateSpans) {
-        var node = createSynthesizedNode(206 /* TemplateExpression */);
+        var node = createSynthesizedNode(207 /* TemplateExpression */);
         node.head = head;
         node.templateSpans = createNodeArray(templateSpans);
         return node;
@@ -61417,7 +63534,7 @@ var ts;
     }
     ts.createNoSubstitutionTemplateLiteral = createNoSubstitutionTemplateLiteral;
     function createYield(asteriskTokenOrExpression, expression) {
-        var node = createSynthesizedNode(207 /* YieldExpression */);
+        var node = createSynthesizedNode(208 /* YieldExpression */);
         node.asteriskToken = asteriskTokenOrExpression && asteriskTokenOrExpression.kind === 40 /* AsteriskToken */ ? asteriskTokenOrExpression : undefined;
         node.expression = asteriskTokenOrExpression && asteriskTokenOrExpression.kind !== 40 /* AsteriskToken */ ? asteriskTokenOrExpression : expression;
         return node;
@@ -61431,7 +63548,7 @@ var ts;
     }
     ts.updateYield = updateYield;
     function createSpread(expression) {
-        var node = createSynthesizedNode(208 /* SpreadElement */);
+        var node = createSynthesizedNode(209 /* SpreadElement */);
         node.expression = ts.parenthesizeExpressionForList(expression);
         return node;
     }
@@ -61443,7 +63560,7 @@ var ts;
     }
     ts.updateSpread = updateSpread;
     function createClassExpression(modifiers, name, typeParameters, heritageClauses, members) {
-        var node = createSynthesizedNode(209 /* ClassExpression */);
+        var node = createSynthesizedNode(210 /* ClassExpression */);
         node.decorators = undefined;
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
@@ -61464,11 +63581,11 @@ var ts;
     }
     ts.updateClassExpression = updateClassExpression;
     function createOmittedExpression() {
-        return createSynthesizedNode(210 /* OmittedExpression */);
+        return createSynthesizedNode(211 /* OmittedExpression */);
     }
     ts.createOmittedExpression = createOmittedExpression;
     function createExpressionWithTypeArguments(typeArguments, expression) {
-        var node = createSynthesizedNode(211 /* ExpressionWithTypeArguments */);
+        var node = createSynthesizedNode(212 /* ExpressionWithTypeArguments */);
         node.expression = ts.parenthesizeForAccess(expression);
         node.typeArguments = asNodeArray(typeArguments);
         return node;
@@ -61482,7 +63599,7 @@ var ts;
     }
     ts.updateExpressionWithTypeArguments = updateExpressionWithTypeArguments;
     function createAsExpression(expression, type) {
-        var node = createSynthesizedNode(212 /* AsExpression */);
+        var node = createSynthesizedNode(213 /* AsExpression */);
         node.expression = expression;
         node.type = type;
         return node;
@@ -61496,7 +63613,7 @@ var ts;
     }
     ts.updateAsExpression = updateAsExpression;
     function createNonNullExpression(expression) {
-        var node = createSynthesizedNode(213 /* NonNullExpression */);
+        var node = createSynthesizedNode(214 /* NonNullExpression */);
         node.expression = ts.parenthesizeForAccess(expression);
         return node;
     }
@@ -61508,7 +63625,7 @@ var ts;
     }
     ts.updateNonNullExpression = updateNonNullExpression;
     function createMetaProperty(keywordToken, name) {
-        var node = createSynthesizedNode(214 /* MetaProperty */);
+        var node = createSynthesizedNode(215 /* MetaProperty */);
         node.keywordToken = keywordToken;
         node.name = name;
         return node;
@@ -61522,7 +63639,7 @@ var ts;
     ts.updateMetaProperty = updateMetaProperty;
     // Misc
     function createTemplateSpan(expression, literal) {
-        var node = createSynthesizedNode(216 /* TemplateSpan */);
+        var node = createSynthesizedNode(217 /* TemplateSpan */);
         node.expression = expression;
         node.literal = literal;
         return node;
@@ -61536,12 +63653,12 @@ var ts;
     }
     ts.updateTemplateSpan = updateTemplateSpan;
     function createSemicolonClassElement() {
-        return createSynthesizedNode(217 /* SemicolonClassElement */);
+        return createSynthesizedNode(218 /* SemicolonClassElement */);
     }
     ts.createSemicolonClassElement = createSemicolonClassElement;
     // Element
     function createBlock(statements, multiLine) {
-        var block = createSynthesizedNode(218 /* Block */);
+        var block = createSynthesizedNode(219 /* Block */);
         block.statements = createNodeArray(statements);
         if (multiLine)
             block.multiLine = multiLine;
@@ -61555,7 +63672,7 @@ var ts;
     }
     ts.updateBlock = updateBlock;
     function createVariableStatement(modifiers, declarationList) {
-        var node = createSynthesizedNode(219 /* VariableStatement */);
+        var node = createSynthesizedNode(220 /* VariableStatement */);
         node.decorators = undefined;
         node.modifiers = asNodeArray(modifiers);
         node.declarationList = ts.isArray(declarationList) ? createVariableDeclarationList(declarationList) : declarationList;
@@ -61570,11 +63687,11 @@ var ts;
     }
     ts.updateVariableStatement = updateVariableStatement;
     function createEmptyStatement() {
-        return createSynthesizedNode(220 /* EmptyStatement */);
+        return createSynthesizedNode(221 /* EmptyStatement */);
     }
     ts.createEmptyStatement = createEmptyStatement;
     function createExpressionStatement(expression) {
-        var node = createSynthesizedNode(221 /* ExpressionStatement */);
+        var node = createSynthesizedNode(222 /* ExpressionStatement */);
         node.expression = ts.parenthesizeExpressionForExpressionStatement(expression);
         return node;
     }
@@ -61590,10 +63707,10 @@ var ts;
     /** @deprecated Use `updateExpressionStatement` instead.  */
     ts.updateStatement = updateExpressionStatement;
     function createIf(expression, thenStatement, elseStatement) {
-        var node = createSynthesizedNode(222 /* IfStatement */);
+        var node = createSynthesizedNode(223 /* IfStatement */);
         node.expression = expression;
-        node.thenStatement = thenStatement;
-        node.elseStatement = elseStatement;
+        node.thenStatement = asEmbeddedStatement(thenStatement);
+        node.elseStatement = asEmbeddedStatement(elseStatement);
         return node;
     }
     ts.createIf = createIf;
@@ -61606,8 +63723,8 @@ var ts;
     }
     ts.updateIf = updateIf;
     function createDo(statement, expression) {
-        var node = createSynthesizedNode(223 /* DoStatement */);
-        node.statement = statement;
+        var node = createSynthesizedNode(224 /* DoStatement */);
+        node.statement = asEmbeddedStatement(statement);
         node.expression = expression;
         return node;
     }
@@ -61620,9 +63737,9 @@ var ts;
     }
     ts.updateDo = updateDo;
     function createWhile(expression, statement) {
-        var node = createSynthesizedNode(224 /* WhileStatement */);
+        var node = createSynthesizedNode(225 /* WhileStatement */);
         node.expression = expression;
-        node.statement = statement;
+        node.statement = asEmbeddedStatement(statement);
         return node;
     }
     ts.createWhile = createWhile;
@@ -61634,11 +63751,11 @@ var ts;
     }
     ts.updateWhile = updateWhile;
     function createFor(initializer, condition, incrementor, statement) {
-        var node = createSynthesizedNode(225 /* ForStatement */);
+        var node = createSynthesizedNode(226 /* ForStatement */);
         node.initializer = initializer;
         node.condition = condition;
         node.incrementor = incrementor;
-        node.statement = statement;
+        node.statement = asEmbeddedStatement(statement);
         return node;
     }
     ts.createFor = createFor;
@@ -61652,10 +63769,10 @@ var ts;
     }
     ts.updateFor = updateFor;
     function createForIn(initializer, expression, statement) {
-        var node = createSynthesizedNode(226 /* ForInStatement */);
+        var node = createSynthesizedNode(227 /* ForInStatement */);
         node.initializer = initializer;
         node.expression = expression;
-        node.statement = statement;
+        node.statement = asEmbeddedStatement(statement);
         return node;
     }
     ts.createForIn = createForIn;
@@ -61668,11 +63785,11 @@ var ts;
     }
     ts.updateForIn = updateForIn;
     function createForOf(awaitModifier, initializer, expression, statement) {
-        var node = createSynthesizedNode(227 /* ForOfStatement */);
+        var node = createSynthesizedNode(228 /* ForOfStatement */);
         node.awaitModifier = awaitModifier;
         node.initializer = initializer;
         node.expression = expression;
-        node.statement = statement;
+        node.statement = asEmbeddedStatement(statement);
         return node;
     }
     ts.createForOf = createForOf;
@@ -61686,7 +63803,7 @@ var ts;
     }
     ts.updateForOf = updateForOf;
     function createContinue(label) {
-        var node = createSynthesizedNode(228 /* ContinueStatement */);
+        var node = createSynthesizedNode(229 /* ContinueStatement */);
         node.label = asName(label);
         return node;
     }
@@ -61698,7 +63815,7 @@ var ts;
     }
     ts.updateContinue = updateContinue;
     function createBreak(label) {
-        var node = createSynthesizedNode(229 /* BreakStatement */);
+        var node = createSynthesizedNode(230 /* BreakStatement */);
         node.label = asName(label);
         return node;
     }
@@ -61710,7 +63827,7 @@ var ts;
     }
     ts.updateBreak = updateBreak;
     function createReturn(expression) {
-        var node = createSynthesizedNode(230 /* ReturnStatement */);
+        var node = createSynthesizedNode(231 /* ReturnStatement */);
         node.expression = expression;
         return node;
     }
@@ -61722,9 +63839,9 @@ var ts;
     }
     ts.updateReturn = updateReturn;
     function createWith(expression, statement) {
-        var node = createSynthesizedNode(231 /* WithStatement */);
+        var node = createSynthesizedNode(232 /* WithStatement */);
         node.expression = expression;
-        node.statement = statement;
+        node.statement = asEmbeddedStatement(statement);
         return node;
     }
     ts.createWith = createWith;
@@ -61736,7 +63853,7 @@ var ts;
     }
     ts.updateWith = updateWith;
     function createSwitch(expression, caseBlock) {
-        var node = createSynthesizedNode(232 /* SwitchStatement */);
+        var node = createSynthesizedNode(233 /* SwitchStatement */);
         node.expression = ts.parenthesizeExpressionForList(expression);
         node.caseBlock = caseBlock;
         return node;
@@ -61750,9 +63867,9 @@ var ts;
     }
     ts.updateSwitch = updateSwitch;
     function createLabel(label, statement) {
-        var node = createSynthesizedNode(233 /* LabeledStatement */);
+        var node = createSynthesizedNode(234 /* LabeledStatement */);
         node.label = asName(label);
-        node.statement = statement;
+        node.statement = asEmbeddedStatement(statement);
         return node;
     }
     ts.createLabel = createLabel;
@@ -61764,7 +63881,7 @@ var ts;
     }
     ts.updateLabel = updateLabel;
     function createThrow(expression) {
-        var node = createSynthesizedNode(234 /* ThrowStatement */);
+        var node = createSynthesizedNode(235 /* ThrowStatement */);
         node.expression = expression;
         return node;
     }
@@ -61776,7 +63893,7 @@ var ts;
     }
     ts.updateThrow = updateThrow;
     function createTry(tryBlock, catchClause, finallyBlock) {
-        var node = createSynthesizedNode(235 /* TryStatement */);
+        var node = createSynthesizedNode(236 /* TryStatement */);
         node.tryBlock = tryBlock;
         node.catchClause = catchClause;
         node.finallyBlock = finallyBlock;
@@ -61792,11 +63909,11 @@ var ts;
     }
     ts.updateTry = updateTry;
     function createDebuggerStatement() {
-        return createSynthesizedNode(236 /* DebuggerStatement */);
+        return createSynthesizedNode(237 /* DebuggerStatement */);
     }
     ts.createDebuggerStatement = createDebuggerStatement;
     function createVariableDeclaration(name, type, initializer) {
-        var node = createSynthesizedNode(237 /* VariableDeclaration */);
+        var node = createSynthesizedNode(238 /* VariableDeclaration */);
         node.name = asName(name);
         node.type = type;
         node.initializer = initializer !== undefined ? ts.parenthesizeExpressionForList(initializer) : undefined;
@@ -61813,7 +63930,7 @@ var ts;
     ts.updateVariableDeclaration = updateVariableDeclaration;
     function createVariableDeclarationList(declarations, flags) {
         if (flags === void 0) { flags = 0 /* None */; }
-        var node = createSynthesizedNode(238 /* VariableDeclarationList */);
+        var node = createSynthesizedNode(239 /* VariableDeclarationList */);
         node.flags |= flags & 3 /* BlockScoped */;
         node.declarations = createNodeArray(declarations);
         return node;
@@ -61826,7 +63943,7 @@ var ts;
     }
     ts.updateVariableDeclarationList = updateVariableDeclarationList;
     function createFunctionDeclaration(decorators, modifiers, asteriskToken, name, typeParameters, parameters, type, body) {
-        var node = createSynthesizedNode(239 /* FunctionDeclaration */);
+        var node = createSynthesizedNode(240 /* FunctionDeclaration */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.asteriskToken = asteriskToken;
@@ -61852,7 +63969,7 @@ var ts;
     }
     ts.updateFunctionDeclaration = updateFunctionDeclaration;
     function createClassDeclaration(decorators, modifiers, name, typeParameters, heritageClauses, members) {
-        var node = createSynthesizedNode(240 /* ClassDeclaration */);
+        var node = createSynthesizedNode(241 /* ClassDeclaration */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
@@ -61874,7 +63991,7 @@ var ts;
     }
     ts.updateClassDeclaration = updateClassDeclaration;
     function createInterfaceDeclaration(decorators, modifiers, name, typeParameters, heritageClauses, members) {
-        var node = createSynthesizedNode(241 /* InterfaceDeclaration */);
+        var node = createSynthesizedNode(242 /* InterfaceDeclaration */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
@@ -61896,7 +64013,7 @@ var ts;
     }
     ts.updateInterfaceDeclaration = updateInterfaceDeclaration;
     function createTypeAliasDeclaration(decorators, modifiers, name, typeParameters, type) {
-        var node = createSynthesizedNode(242 /* TypeAliasDeclaration */);
+        var node = createSynthesizedNode(243 /* TypeAliasDeclaration */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
@@ -61916,7 +64033,7 @@ var ts;
     }
     ts.updateTypeAliasDeclaration = updateTypeAliasDeclaration;
     function createEnumDeclaration(decorators, modifiers, name, members) {
-        var node = createSynthesizedNode(243 /* EnumDeclaration */);
+        var node = createSynthesizedNode(244 /* EnumDeclaration */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
@@ -61935,7 +64052,7 @@ var ts;
     ts.updateEnumDeclaration = updateEnumDeclaration;
     function createModuleDeclaration(decorators, modifiers, name, body, flags) {
         if (flags === void 0) { flags = 0 /* None */; }
-        var node = createSynthesizedNode(244 /* ModuleDeclaration */);
+        var node = createSynthesizedNode(245 /* ModuleDeclaration */);
         node.flags |= flags & (16 /* Namespace */ | 4 /* NestedNamespace */ | 512 /* GlobalAugmentation */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
@@ -61954,7 +64071,7 @@ var ts;
     }
     ts.updateModuleDeclaration = updateModuleDeclaration;
     function createModuleBlock(statements) {
-        var node = createSynthesizedNode(245 /* ModuleBlock */);
+        var node = createSynthesizedNode(246 /* ModuleBlock */);
         node.statements = createNodeArray(statements);
         return node;
     }
@@ -61966,7 +64083,7 @@ var ts;
     }
     ts.updateModuleBlock = updateModuleBlock;
     function createCaseBlock(clauses) {
-        var node = createSynthesizedNode(246 /* CaseBlock */);
+        var node = createSynthesizedNode(247 /* CaseBlock */);
         node.clauses = createNodeArray(clauses);
         return node;
     }
@@ -61978,7 +64095,7 @@ var ts;
     }
     ts.updateCaseBlock = updateCaseBlock;
     function createNamespaceExportDeclaration(name) {
-        var node = createSynthesizedNode(247 /* NamespaceExportDeclaration */);
+        var node = createSynthesizedNode(248 /* NamespaceExportDeclaration */);
         node.name = asName(name);
         return node;
     }
@@ -61990,7 +64107,7 @@ var ts;
     }
     ts.updateNamespaceExportDeclaration = updateNamespaceExportDeclaration;
     function createImportEqualsDeclaration(decorators, modifiers, name, moduleReference) {
-        var node = createSynthesizedNode(248 /* ImportEqualsDeclaration */);
+        var node = createSynthesizedNode(249 /* ImportEqualsDeclaration */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
@@ -62008,7 +64125,7 @@ var ts;
     }
     ts.updateImportEqualsDeclaration = updateImportEqualsDeclaration;
     function createImportDeclaration(decorators, modifiers, importClause, moduleSpecifier) {
-        var node = createSynthesizedNode(249 /* ImportDeclaration */);
+        var node = createSynthesizedNode(250 /* ImportDeclaration */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.importClause = importClause;
@@ -62026,7 +64143,7 @@ var ts;
     }
     ts.updateImportDeclaration = updateImportDeclaration;
     function createImportClause(name, namedBindings) {
-        var node = createSynthesizedNode(250 /* ImportClause */);
+        var node = createSynthesizedNode(251 /* ImportClause */);
         node.name = name;
         node.namedBindings = namedBindings;
         return node;
@@ -62040,7 +64157,7 @@ var ts;
     }
     ts.updateImportClause = updateImportClause;
     function createNamespaceImport(name) {
-        var node = createSynthesizedNode(251 /* NamespaceImport */);
+        var node = createSynthesizedNode(252 /* NamespaceImport */);
         node.name = name;
         return node;
     }
@@ -62052,7 +64169,7 @@ var ts;
     }
     ts.updateNamespaceImport = updateNamespaceImport;
     function createNamedImports(elements) {
-        var node = createSynthesizedNode(252 /* NamedImports */);
+        var node = createSynthesizedNode(253 /* NamedImports */);
         node.elements = createNodeArray(elements);
         return node;
     }
@@ -62064,7 +64181,7 @@ var ts;
     }
     ts.updateNamedImports = updateNamedImports;
     function createImportSpecifier(propertyName, name) {
-        var node = createSynthesizedNode(253 /* ImportSpecifier */);
+        var node = createSynthesizedNode(254 /* ImportSpecifier */);
         node.propertyName = propertyName;
         node.name = name;
         return node;
@@ -62078,11 +64195,11 @@ var ts;
     }
     ts.updateImportSpecifier = updateImportSpecifier;
     function createExportAssignment(decorators, modifiers, isExportEquals, expression) {
-        var node = createSynthesizedNode(254 /* ExportAssignment */);
+        var node = createSynthesizedNode(255 /* ExportAssignment */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.isExportEquals = isExportEquals;
-        node.expression = isExportEquals ? ts.parenthesizeBinaryOperand(59 /* EqualsToken */, expression, /*isLeftSideOfBinary*/ false, /*leftOperand*/ undefined) : ts.parenthesizeDefaultExpression(expression);
+        node.expression = isExportEquals ? ts.parenthesizeBinaryOperand(60 /* EqualsToken */, expression, /*isLeftSideOfBinary*/ false, /*leftOperand*/ undefined) : ts.parenthesizeDefaultExpression(expression);
         return node;
     }
     ts.createExportAssignment = createExportAssignment;
@@ -62095,7 +64212,7 @@ var ts;
     }
     ts.updateExportAssignment = updateExportAssignment;
     function createExportDeclaration(decorators, modifiers, exportClause, moduleSpecifier) {
-        var node = createSynthesizedNode(255 /* ExportDeclaration */);
+        var node = createSynthesizedNode(256 /* ExportDeclaration */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.exportClause = exportClause;
@@ -62113,7 +64230,7 @@ var ts;
     }
     ts.updateExportDeclaration = updateExportDeclaration;
     function createNamedExports(elements) {
-        var node = createSynthesizedNode(256 /* NamedExports */);
+        var node = createSynthesizedNode(257 /* NamedExports */);
         node.elements = createNodeArray(elements);
         return node;
     }
@@ -62125,7 +64242,7 @@ var ts;
     }
     ts.updateNamedExports = updateNamedExports;
     function createExportSpecifier(propertyName, name) {
-        var node = createSynthesizedNode(257 /* ExportSpecifier */);
+        var node = createSynthesizedNode(258 /* ExportSpecifier */);
         node.propertyName = asName(propertyName);
         node.name = asName(name);
         return node;
@@ -62140,7 +64257,7 @@ var ts;
     ts.updateExportSpecifier = updateExportSpecifier;
     // Module references
     function createExternalModuleReference(expression) {
-        var node = createSynthesizedNode(259 /* ExternalModuleReference */);
+        var node = createSynthesizedNode(260 /* ExternalModuleReference */);
         node.expression = expression;
         return node;
     }
@@ -62154,14 +64271,14 @@ var ts;
     // JSDoc
     /* @internal */
     function createJSDocTypeExpression(type) {
-        var node = createSynthesizedNode(288 /* JSDocTypeExpression */);
+        var node = createSynthesizedNode(289 /* JSDocTypeExpression */);
         node.type = type;
         return node;
     }
     ts.createJSDocTypeExpression = createJSDocTypeExpression;
     /* @internal */
     function createJSDocTypeTag(typeExpression, comment) {
-        var tag = createJSDocTag(307 /* JSDocTypeTag */, "type");
+        var tag = createJSDocTag(309 /* JSDocTypeTag */, "type");
         tag.typeExpression = typeExpression;
         tag.comment = comment;
         return tag;
@@ -62169,15 +64286,22 @@ var ts;
     ts.createJSDocTypeTag = createJSDocTypeTag;
     /* @internal */
     function createJSDocReturnTag(typeExpression, comment) {
-        var tag = createJSDocTag(305 /* JSDocReturnTag */, "returns");
+        var tag = createJSDocTag(307 /* JSDocReturnTag */, "returns");
         tag.typeExpression = typeExpression;
         tag.comment = comment;
         return tag;
     }
     ts.createJSDocReturnTag = createJSDocReturnTag;
+    /** @internal */
+    function createJSDocThisTag(typeExpression) {
+        var tag = createJSDocTag(308 /* JSDocThisTag */, "this");
+        tag.typeExpression = typeExpression;
+        return tag;
+    }
+    ts.createJSDocThisTag = createJSDocThisTag;
     /* @internal */
     function createJSDocParamTag(name, isBracketed, typeExpression, comment) {
-        var tag = createJSDocTag(304 /* JSDocParameterTag */, "param");
+        var tag = createJSDocTag(306 /* JSDocParameterTag */, "param");
         tag.typeExpression = typeExpression;
         tag.name = name;
         tag.isBracketed = isBracketed;
@@ -62187,7 +64311,7 @@ var ts;
     ts.createJSDocParamTag = createJSDocParamTag;
     /* @internal */
     function createJSDocComment(comment, tags) {
-        var node = createSynthesizedNode(296 /* JSDocComment */);
+        var node = createSynthesizedNode(297 /* JSDocComment */);
         node.comment = comment;
         node.tags = tags;
         return node;
@@ -62201,7 +64325,7 @@ var ts;
     }
     // JSX
     function createJsxElement(openingElement, children, closingElement) {
-        var node = createSynthesizedNode(260 /* JsxElement */);
+        var node = createSynthesizedNode(261 /* JsxElement */);
         node.openingElement = openingElement;
         node.children = createNodeArray(children);
         node.closingElement = closingElement;
@@ -62217,7 +64341,7 @@ var ts;
     }
     ts.updateJsxElement = updateJsxElement;
     function createJsxSelfClosingElement(tagName, typeArguments, attributes) {
-        var node = createSynthesizedNode(261 /* JsxSelfClosingElement */);
+        var node = createSynthesizedNode(262 /* JsxSelfClosingElement */);
         node.tagName = tagName;
         node.typeArguments = asNodeArray(typeArguments);
         node.attributes = attributes;
@@ -62233,7 +64357,7 @@ var ts;
     }
     ts.updateJsxSelfClosingElement = updateJsxSelfClosingElement;
     function createJsxOpeningElement(tagName, typeArguments, attributes) {
-        var node = createSynthesizedNode(262 /* JsxOpeningElement */);
+        var node = createSynthesizedNode(263 /* JsxOpeningElement */);
         node.tagName = tagName;
         node.typeArguments = asNodeArray(typeArguments);
         node.attributes = attributes;
@@ -62249,7 +64373,7 @@ var ts;
     }
     ts.updateJsxOpeningElement = updateJsxOpeningElement;
     function createJsxClosingElement(tagName) {
-        var node = createSynthesizedNode(263 /* JsxClosingElement */);
+        var node = createSynthesizedNode(264 /* JsxClosingElement */);
         node.tagName = tagName;
         return node;
     }
@@ -62261,13 +64385,35 @@ var ts;
     }
     ts.updateJsxClosingElement = updateJsxClosingElement;
     function createJsxFragment(openingFragment, children, closingFragment) {
-        var node = createSynthesizedNode(264 /* JsxFragment */);
+        var node = createSynthesizedNode(265 /* JsxFragment */);
         node.openingFragment = openingFragment;
         node.children = createNodeArray(children);
         node.closingFragment = closingFragment;
         return node;
     }
     ts.createJsxFragment = createJsxFragment;
+    function createJsxText(text, containsOnlyTriviaWhiteSpaces) {
+        var node = createSynthesizedNode(11 /* JsxText */);
+        node.text = text;
+        node.containsOnlyTriviaWhiteSpaces = !!containsOnlyTriviaWhiteSpaces;
+        return node;
+    }
+    ts.createJsxText = createJsxText;
+    function updateJsxText(node, text, containsOnlyTriviaWhiteSpaces) {
+        return node.text !== text
+            || node.containsOnlyTriviaWhiteSpaces !== containsOnlyTriviaWhiteSpaces
+            ? updateNode(createJsxText(text, containsOnlyTriviaWhiteSpaces), node)
+            : node;
+    }
+    ts.updateJsxText = updateJsxText;
+    function createJsxOpeningFragment() {
+        return createSynthesizedNode(266 /* JsxOpeningFragment */);
+    }
+    ts.createJsxOpeningFragment = createJsxOpeningFragment;
+    function createJsxJsxClosingFragment() {
+        return createSynthesizedNode(267 /* JsxClosingFragment */);
+    }
+    ts.createJsxJsxClosingFragment = createJsxJsxClosingFragment;
     function updateJsxFragment(node, openingFragment, children, closingFragment) {
         return node.openingFragment !== openingFragment
             || node.children !== children
@@ -62277,7 +64423,7 @@ var ts;
     }
     ts.updateJsxFragment = updateJsxFragment;
     function createJsxAttribute(name, initializer) {
-        var node = createSynthesizedNode(267 /* JsxAttribute */);
+        var node = createSynthesizedNode(268 /* JsxAttribute */);
         node.name = name;
         node.initializer = initializer;
         return node;
@@ -62291,7 +64437,7 @@ var ts;
     }
     ts.updateJsxAttribute = updateJsxAttribute;
     function createJsxAttributes(properties) {
-        var node = createSynthesizedNode(268 /* JsxAttributes */);
+        var node = createSynthesizedNode(269 /* JsxAttributes */);
         node.properties = createNodeArray(properties);
         return node;
     }
@@ -62303,7 +64449,7 @@ var ts;
     }
     ts.updateJsxAttributes = updateJsxAttributes;
     function createJsxSpreadAttribute(expression) {
-        var node = createSynthesizedNode(269 /* JsxSpreadAttribute */);
+        var node = createSynthesizedNode(270 /* JsxSpreadAttribute */);
         node.expression = expression;
         return node;
     }
@@ -62315,7 +64461,7 @@ var ts;
     }
     ts.updateJsxSpreadAttribute = updateJsxSpreadAttribute;
     function createJsxExpression(dotDotDotToken, expression) {
-        var node = createSynthesizedNode(270 /* JsxExpression */);
+        var node = createSynthesizedNode(271 /* JsxExpression */);
         node.dotDotDotToken = dotDotDotToken;
         node.expression = expression;
         return node;
@@ -62329,7 +64475,7 @@ var ts;
     ts.updateJsxExpression = updateJsxExpression;
     // Clauses
     function createCaseClause(expression, statements) {
-        var node = createSynthesizedNode(271 /* CaseClause */);
+        var node = createSynthesizedNode(272 /* CaseClause */);
         node.expression = ts.parenthesizeExpressionForList(expression);
         node.statements = createNodeArray(statements);
         return node;
@@ -62343,7 +64489,7 @@ var ts;
     }
     ts.updateCaseClause = updateCaseClause;
     function createDefaultClause(statements) {
-        var node = createSynthesizedNode(272 /* DefaultClause */);
+        var node = createSynthesizedNode(273 /* DefaultClause */);
         node.statements = createNodeArray(statements);
         return node;
     }
@@ -62355,7 +64501,7 @@ var ts;
     }
     ts.updateDefaultClause = updateDefaultClause;
     function createHeritageClause(token, types) {
-        var node = createSynthesizedNode(273 /* HeritageClause */);
+        var node = createSynthesizedNode(274 /* HeritageClause */);
         node.token = token;
         node.types = createNodeArray(types);
         return node;
@@ -62368,7 +64514,7 @@ var ts;
     }
     ts.updateHeritageClause = updateHeritageClause;
     function createCatchClause(variableDeclaration, block) {
-        var node = createSynthesizedNode(274 /* CatchClause */);
+        var node = createSynthesizedNode(275 /* CatchClause */);
         node.variableDeclaration = ts.isString(variableDeclaration) ? createVariableDeclaration(variableDeclaration) : variableDeclaration;
         node.block = block;
         return node;
@@ -62383,7 +64529,7 @@ var ts;
     ts.updateCatchClause = updateCatchClause;
     // Property assignments
     function createPropertyAssignment(name, initializer) {
-        var node = createSynthesizedNode(275 /* PropertyAssignment */);
+        var node = createSynthesizedNode(276 /* PropertyAssignment */);
         node.name = asName(name);
         node.questionToken = undefined;
         node.initializer = ts.parenthesizeExpressionForList(initializer);
@@ -62398,7 +64544,7 @@ var ts;
     }
     ts.updatePropertyAssignment = updatePropertyAssignment;
     function createShorthandPropertyAssignment(name, objectAssignmentInitializer) {
-        var node = createSynthesizedNode(276 /* ShorthandPropertyAssignment */);
+        var node = createSynthesizedNode(277 /* ShorthandPropertyAssignment */);
         node.name = asName(name);
         node.objectAssignmentInitializer = objectAssignmentInitializer !== undefined ? ts.parenthesizeExpressionForList(objectAssignmentInitializer) : undefined;
         return node;
@@ -62412,8 +64558,8 @@ var ts;
     }
     ts.updateShorthandPropertyAssignment = updateShorthandPropertyAssignment;
     function createSpreadAssignment(expression) {
-        var node = createSynthesizedNode(277 /* SpreadAssignment */);
-        node.expression = expression !== undefined ? ts.parenthesizeExpressionForList(expression) : undefined; // TODO: GH#18217
+        var node = createSynthesizedNode(278 /* SpreadAssignment */);
+        node.expression = ts.parenthesizeExpressionForList(expression);
         return node;
     }
     ts.createSpreadAssignment = createSpreadAssignment;
@@ -62425,7 +64571,7 @@ var ts;
     ts.updateSpreadAssignment = updateSpreadAssignment;
     // Enum
     function createEnumMember(name, initializer) {
-        var node = createSynthesizedNode(278 /* EnumMember */);
+        var node = createSynthesizedNode(279 /* EnumMember */);
         node.name = asName(name);
         node.initializer = initializer && ts.parenthesizeExpressionForList(initializer);
         return node;
@@ -62446,7 +64592,7 @@ var ts;
             (typeReferences !== undefined && node.typeReferenceDirectives !== typeReferences) ||
             (libReferences !== undefined && node.libReferenceDirectives !== libReferences) ||
             (hasNoDefaultLib !== undefined && node.hasNoDefaultLib !== hasNoDefaultLib)) {
-            var updated = createSynthesizedNode(284 /* SourceFile */);
+            var updated = createSynthesizedNode(285 /* SourceFile */);
             updated.flags |= node.flags;
             updated.statements = createNodeArray(statements);
             updated.endOfFileToken = node.endOfFileToken;
@@ -62530,7 +64676,7 @@ var ts;
      * @param original The original statement.
      */
     function createNotEmittedStatement(original) {
-        var node = createSynthesizedNode(312 /* NotEmittedStatement */);
+        var node = createSynthesizedNode(314 /* NotEmittedStatement */);
         node.original = original;
         setTextRange(node, original);
         return node;
@@ -62542,7 +64688,7 @@ var ts;
      */
     /* @internal */
     function createEndOfDeclarationMarker(original) {
-        var node = createSynthesizedNode(316 /* EndOfDeclarationMarker */);
+        var node = createSynthesizedNode(318 /* EndOfDeclarationMarker */);
         node.emitNode = {};
         node.original = original;
         return node;
@@ -62554,7 +64700,7 @@ var ts;
      */
     /* @internal */
     function createMergeDeclarationMarker(original) {
-        var node = createSynthesizedNode(315 /* MergeDeclarationMarker */);
+        var node = createSynthesizedNode(317 /* MergeDeclarationMarker */);
         node.emitNode = {};
         node.original = original;
         return node;
@@ -62569,7 +64715,7 @@ var ts;
      * @param location The location for the expression. Defaults to the positions from "original" if provided.
      */
     function createPartiallyEmittedExpression(expression, original) {
-        var node = createSynthesizedNode(313 /* PartiallyEmittedExpression */);
+        var node = createSynthesizedNode(315 /* PartiallyEmittedExpression */);
         node.expression = expression;
         node.original = original;
         setTextRange(node, original);
@@ -62585,7 +64731,7 @@ var ts;
     ts.updatePartiallyEmittedExpression = updatePartiallyEmittedExpression;
     function flattenCommaElements(node) {
         if (ts.nodeIsSynthesized(node) && !ts.isParseTreeNode(node) && !node.original && !node.emitNode && !node.id) {
-            if (node.kind === 314 /* CommaListExpression */) {
+            if (node.kind === 316 /* CommaListExpression */) {
                 return node.elements;
             }
             if (ts.isBinaryExpression(node) && node.operatorToken.kind === 27 /* CommaToken */) {
@@ -62595,7 +64741,7 @@ var ts;
         return node;
     }
     function createCommaList(elements) {
-        var node = createSynthesizedNode(314 /* CommaListExpression */);
+        var node = createSynthesizedNode(316 /* CommaListExpression */);
         node.elements = createNodeArray(ts.sameFlatMap(elements, flattenCommaElements));
         return node;
     }
@@ -62608,7 +64754,7 @@ var ts;
     ts.updateCommaList = updateCommaList;
     function createBundle(sourceFiles, prepends) {
         if (prepends === void 0) { prepends = ts.emptyArray; }
-        var node = ts.createNode(285 /* Bundle */);
+        var node = ts.createNode(286 /* Bundle */);
         node.prepends = prepends;
         node.sourceFiles = sourceFiles;
         return node;
@@ -62620,6 +64766,7 @@ var ts;
             ts.valuesHelper,
             ts.readHelper,
             ts.spreadHelper,
+            ts.spreadArraysHelper,
             ts.restHelper,
             ts.decorateHelper,
             ts.metadataHelper,
@@ -62638,7 +64785,7 @@ var ts;
         ], function (helper) { return helper.name; }));
     }
     function createUnparsedSource() {
-        var node = ts.createNode(286 /* UnparsedSource */);
+        var node = ts.createNode(287 /* UnparsedSource */);
         node.prologues = ts.emptyArray;
         node.referencedFiles = ts.emptyArray;
         node.libReferenceDirectives = ts.emptyArray;
@@ -62770,10 +64917,10 @@ var ts;
     }
     function mapBundleFileSectionKindToSyntaxKind(kind) {
         switch (kind) {
-            case "prologue" /* Prologue */: return 279 /* UnparsedPrologue */;
-            case "prepend" /* Prepend */: return 280 /* UnparsedPrepend */;
-            case "internal" /* Internal */: return 282 /* UnparsedInternalText */;
-            case "text" /* Text */: return 281 /* UnparsedText */;
+            case "prologue" /* Prologue */: return 280 /* UnparsedPrologue */;
+            case "prepend" /* Prepend */: return 281 /* UnparsedPrepend */;
+            case "internal" /* Internal */: return 283 /* UnparsedInternalText */;
+            case "text" /* Text */: return 282 /* UnparsedText */;
             case "emitHelpers" /* EmitHelpers */:
             case "no-default-lib" /* NoDefaultLib */:
             case "reference" /* Reference */:
@@ -62791,14 +64938,14 @@ var ts;
         return node;
     }
     function createUnparsedSyntheticReference(section, parent) {
-        var node = ts.createNode(283 /* UnparsedSyntheticReference */, section.pos, section.end);
+        var node = ts.createNode(284 /* UnparsedSyntheticReference */, section.pos, section.end);
         node.parent = parent;
         node.data = section.data;
         node.section = section;
         return node;
     }
     function createInputFiles(javascriptTextOrReadFileText, declarationTextOrJavascriptPath, javascriptMapPath, javascriptMapTextOrDeclarationPath, declarationMapPath, declarationMapTextOrBuildInfoPath, javascriptPath, declarationPath, buildInfoPath, buildInfo, oldFileOfCurrentEmit) {
-        var node = ts.createNode(287 /* InputFiles */);
+        var node = ts.createNode(288 /* InputFiles */);
         if (!ts.isString(javascriptTextOrReadFileText)) {
             var cache_1 = ts.createMap();
             var textGetter_1 = function (path) {
@@ -62892,7 +65039,7 @@ var ts;
     }
     ts.createLessThan = createLessThan;
     function createAssignment(left, right) {
-        return createBinary(left, 59 /* EqualsToken */, right);
+        return createBinary(left, 60 /* EqualsToken */, right);
     }
     ts.createAssignment = createAssignment;
     function createStrictEquality(left, right) {
@@ -62952,6 +65099,9 @@ var ts;
     function asToken(value) {
         return typeof value === "number" ? createToken(value) : value;
     }
+    function asEmbeddedStatement(statement) {
+        return statement && ts.isNotEmittedStatement(statement) ? setTextRange(setOriginalNode(createEmptyStatement(), statement), statement) : statement;
+    }
     /**
      * Clears any EmitNode entries from parse-tree nodes.
      * @param sourceFile A source file.
@@ -62985,7 +65135,7 @@ var ts;
                 // To avoid holding onto transformation artifacts, we keep track of any
                 // parse tree node we are annotating. This allows us to clean them up after
                 // all transformations have completed.
-                if (node.kind === 284 /* SourceFile */) {
+                if (node.kind === 285 /* SourceFile */) {
                     return node.emitNode = { annotatedNodes: [node] };
                 }
                 var sourceFile = ts.getSourceFileOfNode(ts.getParseTreeNode(ts.getSourceFileOfNode(node)));
@@ -62996,6 +65146,18 @@ var ts;
         return node.emitNode;
     }
     ts.getOrCreateEmitNode = getOrCreateEmitNode;
+    /**
+     * Sets `EmitFlags.NoComments` on a node and removes any leading and trailing synthetic comments.
+     * @internal
+     */
+    function removeAllComments(node) {
+        var emitNode = getOrCreateEmitNode(node);
+        emitNode.flags |= 1536 /* NoComments */;
+        emitNode.leadingComments = undefined;
+        emitNode.trailingComments = undefined;
+        return node;
+    }
+    ts.removeAllComments = removeAllComments;
     function setTextRange(range, location) {
         if (location) {
             range.pos = location.pos;
@@ -63286,7 +65448,7 @@ var ts;
     ts.nullTransformationContext = {
         enableEmitNotification: ts.noop,
         enableSubstitution: ts.noop,
-        endLexicalEnvironment: function () { return undefined; },
+        endLexicalEnvironment: ts.returnUndefined,
         getCompilerOptions: ts.notImplemented,
         getEmitHost: ts.notImplemented,
         getEmitResolver: ts.notImplemented,
@@ -63467,6 +65629,17 @@ var ts;
         /*typeArguments*/ undefined, argumentList), location);
     }
     ts.createSpreadHelper = createSpreadHelper;
+    ts.spreadArraysHelper = {
+        name: "typescript:spreadArrays",
+        scoped: false,
+        text: "\n            var __spreadArrays = (this && this.__spreadArrays) || function () {\n                for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;\n                for (var r = Array(s), k = 0, i = 0; i < il; i++)\n                    for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)\n                        r[k] = a[j];\n                return r;\n            };"
+    };
+    function createSpreadArraysHelper(context, argumentList, location) {
+        context.requestEmitHelper(ts.spreadArraysHelper);
+        return ts.setTextRange(ts.createCall(getHelperName("__spreadArrays"), 
+        /*typeArguments*/ undefined, argumentList), location);
+    }
+    ts.createSpreadArraysHelper = createSpreadArraysHelper;
     // Utilities
     function createForOfBindingStatement(node, boundValue) {
         if (ts.isVariableDeclarationList(node)) {
@@ -63496,7 +65669,7 @@ var ts;
         if (!outermostLabeledStatement) {
             return node;
         }
-        var updated = ts.updateLabel(outermostLabeledStatement, outermostLabeledStatement.label, outermostLabeledStatement.statement.kind === 233 /* LabeledStatement */
+        var updated = ts.updateLabel(outermostLabeledStatement, outermostLabeledStatement.label, outermostLabeledStatement.statement.kind === 234 /* LabeledStatement */
             ? restoreEnclosingLabel(node, outermostLabeledStatement.statement)
             : node);
         if (afterRestoreLabelCallback) {
@@ -63508,20 +65681,20 @@ var ts;
     function shouldBeCapturedInTempVariable(node, cacheIdentifiers) {
         var target = ts.skipParentheses(node);
         switch (target.kind) {
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 return cacheIdentifiers;
-            case 100 /* ThisKeyword */:
+            case 101 /* ThisKeyword */:
             case 8 /* NumericLiteral */:
             case 9 /* BigIntLiteral */:
             case 10 /* StringLiteral */:
                 return false;
-            case 187 /* ArrayLiteralExpression */:
+            case 188 /* ArrayLiteralExpression */:
                 var elements = target.elements;
                 if (elements.length === 0) {
                     return false;
                 }
                 return true;
-            case 188 /* ObjectLiteralExpression */:
+            case 189 /* ObjectLiteralExpression */:
                 return target.properties.length > 0;
             default:
                 return true;
@@ -63536,7 +65709,7 @@ var ts;
             thisArg = ts.createThis();
             target = callee;
         }
-        else if (callee.kind === 98 /* SuperKeyword */) {
+        else if (callee.kind === 99 /* SuperKeyword */) {
             thisArg = ts.createThis();
             target = languageVersion < 2 /* ES2015 */
                 ? ts.setTextRange(ts.createIdentifier("_super"), callee)
@@ -63548,7 +65721,7 @@ var ts;
         }
         else {
             switch (callee.kind) {
-                case 189 /* PropertyAccessExpression */: {
+                case 190 /* PropertyAccessExpression */: {
                     if (shouldBeCapturedInTempVariable(callee.expression, cacheIdentifiers)) {
                         // for `a.b()` target is `(_a = a).b` and thisArg is `_a`
                         thisArg = ts.createTempVariable(recordTempVariable);
@@ -63561,7 +65734,7 @@ var ts;
                     }
                     break;
                 }
-                case 190 /* ElementAccessExpression */: {
+                case 191 /* ElementAccessExpression */: {
                     if (shouldBeCapturedInTempVariable(callee.expression, cacheIdentifiers)) {
                         // for `a[b]()` target is `(_a = a)[b]` and thisArg is `_a`
                         thisArg = ts.createTempVariable(recordTempVariable);
@@ -63618,14 +65791,14 @@ var ts;
     ts.createExpressionForPropertyName = createExpressionForPropertyName;
     function createExpressionForObjectLiteralElementLike(node, property, receiver) {
         switch (property.kind) {
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
                 return createExpressionForAccessorDeclaration(node.properties, property, receiver, !!node.multiLine);
-            case 275 /* PropertyAssignment */:
+            case 276 /* PropertyAssignment */:
                 return createExpressionForPropertyAssignment(property, receiver);
-            case 276 /* ShorthandPropertyAssignment */:
+            case 277 /* ShorthandPropertyAssignment */:
                 return createExpressionForShorthandPropertyAssignment(property, receiver);
-            case 156 /* MethodDeclaration */:
+            case 157 /* MethodDeclaration */:
                 return createExpressionForMethodDeclaration(property, receiver);
         }
     }
@@ -63633,7 +65806,7 @@ var ts;
     function createExpressionForAccessorDeclaration(properties, property, receiver, multiLine) {
         var _a = ts.getAllAccessorDeclarations(properties, property), firstAccessor = _a.firstAccessor, getAccessor = _a.getAccessor, setAccessor = _a.setAccessor;
         if (property === firstAccessor) {
-            var properties_8 = [];
+            var properties_5 = [];
             if (getAccessor) {
                 var getterFunction = ts.createFunctionExpression(getAccessor.modifiers, 
                 /*asteriskToken*/ undefined, 
@@ -63644,7 +65817,7 @@ var ts;
                 ts.setTextRange(getterFunction, getAccessor);
                 ts.setOriginalNode(getterFunction, getAccessor);
                 var getter = ts.createPropertyAssignment("get", getterFunction);
-                properties_8.push(getter);
+                properties_5.push(getter);
             }
             if (setAccessor) {
                 var setterFunction = ts.createFunctionExpression(setAccessor.modifiers, 
@@ -63656,15 +65829,15 @@ var ts;
                 ts.setTextRange(setterFunction, setAccessor);
                 ts.setOriginalNode(setterFunction, setAccessor);
                 var setter = ts.createPropertyAssignment("set", setterFunction);
-                properties_8.push(setter);
+                properties_5.push(setter);
             }
-            properties_8.push(ts.createPropertyAssignment("enumerable", ts.createTrue()));
-            properties_8.push(ts.createPropertyAssignment("configurable", ts.createTrue()));
+            properties_5.push(ts.createPropertyAssignment("enumerable", ts.createTrue()));
+            properties_5.push(ts.createPropertyAssignment("configurable", ts.createTrue()));
             var expression = ts.setTextRange(ts.createCall(ts.createPropertyAccess(ts.createIdentifier("Object"), "defineProperty"), 
             /*typeArguments*/ undefined, [
                 receiver,
                 createExpressionForPropertyName(property.name),
-                ts.createObjectLiteral(properties_8, multiLine)
+                ts.createObjectLiteral(properties_5, multiLine)
             ]), 
             /*location*/ firstAccessor);
             return ts.aggregateTransformFlags(expression);
@@ -63951,7 +66124,7 @@ var ts;
     function parenthesizeBinaryOperand(binaryOperator, operand, isLeftSideOfBinary, leftOperand) {
         var skipped = ts.skipPartiallyEmittedExpressions(operand);
         // If the resulting expression is already parenthesized, we do not need to do any further processing.
-        if (skipped.kind === 195 /* ParenthesizedExpression */) {
+        if (skipped.kind === 196 /* ParenthesizedExpression */) {
             return operand;
         }
         return binaryOperandNeedsParentheses(binaryOperator, operand, isLeftSideOfBinary, leftOperand)
@@ -63985,10 +66158,10 @@ var ts;
         //
         // If `a ** d` is on the left of operator `**`, we need to parenthesize to preserve
         // the intended order of operations: `(a ** b) ** c`
-        var binaryOperatorPrecedence = ts.getOperatorPrecedence(204 /* BinaryExpression */, binaryOperator);
-        var binaryOperatorAssociativity = ts.getOperatorAssociativity(204 /* BinaryExpression */, binaryOperator);
+        var binaryOperatorPrecedence = ts.getOperatorPrecedence(205 /* BinaryExpression */, binaryOperator);
+        var binaryOperatorAssociativity = ts.getOperatorAssociativity(205 /* BinaryExpression */, binaryOperator);
         var emittedOperand = ts.skipPartiallyEmittedExpressions(operand);
-        if (!isLeftSideOfBinary && operand.kind === 197 /* ArrowFunction */ && binaryOperatorPrecedence > 4) {
+        if (!isLeftSideOfBinary && operand.kind === 198 /* ArrowFunction */ && binaryOperatorPrecedence > 4) {
             // We need to parenthesize arrow functions on the right side to avoid it being
             // parsed as parenthesized expression: `a && (() => {})`
             return true;
@@ -64000,7 +66173,7 @@ var ts;
                 // and is a yield expression, then we do not need parentheses.
                 if (!isLeftSideOfBinary
                     && binaryOperatorAssociativity === 1 /* Right */
-                    && operand.kind === 207 /* YieldExpression */) {
+                    && operand.kind === 208 /* YieldExpression */) {
                     return false;
                 }
                 return true;
@@ -64088,7 +66261,7 @@ var ts;
         if (ts.isLiteralKind(node.kind)) {
             return node.kind;
         }
-        if (node.kind === 204 /* BinaryExpression */ && node.operatorToken.kind === 38 /* PlusToken */) {
+        if (node.kind === 205 /* BinaryExpression */ && node.operatorToken.kind === 38 /* PlusToken */) {
             if (node.cachedLiteralKind !== undefined) {
                 return node.cachedLiteralKind;
             }
@@ -64103,7 +66276,7 @@ var ts;
         return 0 /* Unknown */;
     }
     function parenthesizeForConditionalHead(condition) {
-        var conditionalPrecedence = ts.getOperatorPrecedence(205 /* ConditionalExpression */, 56 /* QuestionToken */);
+        var conditionalPrecedence = ts.getOperatorPrecedence(206 /* ConditionalExpression */, 56 /* QuestionToken */);
         var emittedCondition = ts.skipPartiallyEmittedExpressions(condition);
         var conditionPrecedence = ts.getExpressionPrecedence(emittedCondition);
         if (ts.compareValues(conditionPrecedence, conditionalPrecedence) === -1 /* LessThan */) {
@@ -64138,8 +66311,8 @@ var ts;
         var needsParens = isCommaSequence(check);
         if (!needsParens) {
             switch (getLeftmostExpression(check, /*stopAtCallExpression*/ false).kind) {
-                case 209 /* ClassExpression */:
-                case 196 /* FunctionExpression */:
+                case 210 /* ClassExpression */:
+                case 197 /* FunctionExpression */:
                     needsParens = true;
             }
         }
@@ -64155,9 +66328,9 @@ var ts;
     function parenthesizeForNew(expression) {
         var leftmostExpr = getLeftmostExpression(expression, /*stopAtCallExpressions*/ true);
         switch (leftmostExpr.kind) {
-            case 191 /* CallExpression */:
+            case 192 /* CallExpression */:
                 return ts.createParen(expression);
-            case 192 /* NewExpression */:
+            case 193 /* NewExpression */:
                 return !leftmostExpr.arguments
                     ? ts.createParen(expression)
                     : expression;
@@ -64180,7 +66353,7 @@ var ts;
         //
         var emittedExpression = ts.skipPartiallyEmittedExpressions(expression);
         if (ts.isLeftHandSideExpression(emittedExpression)
-            && (emittedExpression.kind !== 192 /* NewExpression */ || emittedExpression.arguments)) {
+            && (emittedExpression.kind !== 193 /* NewExpression */ || emittedExpression.arguments)) {
             return expression;
         }
         return ts.setTextRange(ts.createParen(expression), expression);
@@ -64218,7 +66391,7 @@ var ts;
     function parenthesizeExpressionForList(expression) {
         var emittedExpression = ts.skipPartiallyEmittedExpressions(expression);
         var expressionPrecedence = ts.getExpressionPrecedence(emittedExpression);
-        var commaPrecedence = ts.getOperatorPrecedence(204 /* BinaryExpression */, 27 /* CommaToken */);
+        var commaPrecedence = ts.getOperatorPrecedence(205 /* BinaryExpression */, 27 /* CommaToken */);
         return expressionPrecedence > commaPrecedence
             ? expression
             : ts.setTextRange(ts.createParen(expression), expression);
@@ -64229,29 +66402,29 @@ var ts;
         if (ts.isCallExpression(emittedExpression)) {
             var callee = emittedExpression.expression;
             var kind = ts.skipPartiallyEmittedExpressions(callee).kind;
-            if (kind === 196 /* FunctionExpression */ || kind === 197 /* ArrowFunction */) {
+            if (kind === 197 /* FunctionExpression */ || kind === 198 /* ArrowFunction */) {
                 var mutableCall = ts.getMutableClone(emittedExpression);
                 mutableCall.expression = ts.setTextRange(ts.createParen(callee), callee);
                 return recreateOuterExpressions(expression, mutableCall, 4 /* PartiallyEmittedExpressions */);
             }
         }
         var leftmostExpressionKind = getLeftmostExpression(emittedExpression, /*stopAtCallExpressions*/ false).kind;
-        if (leftmostExpressionKind === 188 /* ObjectLiteralExpression */ || leftmostExpressionKind === 196 /* FunctionExpression */) {
+        if (leftmostExpressionKind === 189 /* ObjectLiteralExpression */ || leftmostExpressionKind === 197 /* FunctionExpression */) {
             return ts.setTextRange(ts.createParen(expression), expression);
         }
         return expression;
     }
     ts.parenthesizeExpressionForExpressionStatement = parenthesizeExpressionForExpressionStatement;
     function parenthesizeConditionalTypeMember(member) {
-        return member.kind === 175 /* ConditionalType */ ? ts.createParenthesizedType(member) : member;
+        return member.kind === 176 /* ConditionalType */ ? ts.createParenthesizedType(member) : member;
     }
     ts.parenthesizeConditionalTypeMember = parenthesizeConditionalTypeMember;
     function parenthesizeElementTypeMember(member) {
         switch (member.kind) {
-            case 173 /* UnionType */:
-            case 174 /* IntersectionType */:
-            case 165 /* FunctionType */:
-            case 166 /* ConstructorType */:
+            case 174 /* UnionType */:
+            case 175 /* IntersectionType */:
+            case 166 /* FunctionType */:
+            case 167 /* ConstructorType */:
                 return ts.createParenthesizedType(member);
         }
         return parenthesizeConditionalTypeMember(member);
@@ -64259,9 +66432,9 @@ var ts;
     ts.parenthesizeElementTypeMember = parenthesizeElementTypeMember;
     function parenthesizeArrayTypeMember(member) {
         switch (member.kind) {
-            case 167 /* TypeQuery */:
-            case 179 /* TypeOperator */:
-            case 176 /* InferType */:
+            case 168 /* TypeQuery */:
+            case 180 /* TypeOperator */:
+            case 177 /* InferType */:
                 return ts.createParenthesizedType(member);
         }
         return parenthesizeElementTypeMember(member);
@@ -64287,44 +66460,45 @@ var ts;
     function getLeftmostExpression(node, stopAtCallExpressions) {
         while (true) {
             switch (node.kind) {
-                case 203 /* PostfixUnaryExpression */:
+                case 204 /* PostfixUnaryExpression */:
                     node = node.operand;
                     continue;
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     node = node.left;
                     continue;
-                case 205 /* ConditionalExpression */:
+                case 206 /* ConditionalExpression */:
                     node = node.condition;
                     continue;
-                case 193 /* TaggedTemplateExpression */:
+                case 194 /* TaggedTemplateExpression */:
                     node = node.tag;
                     continue;
-                case 191 /* CallExpression */:
+                case 192 /* CallExpression */:
                     if (stopAtCallExpressions) {
                         return node;
                     }
                 // falls through
-                case 212 /* AsExpression */:
-                case 190 /* ElementAccessExpression */:
-                case 189 /* PropertyAccessExpression */:
-                case 213 /* NonNullExpression */:
-                case 313 /* PartiallyEmittedExpression */:
+                case 213 /* AsExpression */:
+                case 191 /* ElementAccessExpression */:
+                case 190 /* PropertyAccessExpression */:
+                case 214 /* NonNullExpression */:
+                case 315 /* PartiallyEmittedExpression */:
                     node = node.expression;
                     continue;
             }
             return node;
         }
     }
+    ts.getLeftmostExpression = getLeftmostExpression;
     function parenthesizeConciseBody(body) {
-        if (!ts.isBlock(body) && (isCommaSequence(body) || getLeftmostExpression(body, /*stopAtCallExpressions*/ false).kind === 188 /* ObjectLiteralExpression */)) {
+        if (!ts.isBlock(body) && (isCommaSequence(body) || getLeftmostExpression(body, /*stopAtCallExpressions*/ false).kind === 189 /* ObjectLiteralExpression */)) {
             return ts.setTextRange(ts.createParen(body), body);
         }
         return body;
     }
     ts.parenthesizeConciseBody = parenthesizeConciseBody;
     function isCommaSequence(node) {
-        return node.kind === 204 /* BinaryExpression */ && node.operatorToken.kind === 27 /* CommaToken */ ||
-            node.kind === 314 /* CommaListExpression */;
+        return node.kind === 205 /* BinaryExpression */ && node.operatorToken.kind === 27 /* CommaToken */ ||
+            node.kind === 316 /* CommaListExpression */;
     }
     ts.isCommaSequence = isCommaSequence;
     var OuterExpressionKinds;
@@ -64337,13 +66511,13 @@ var ts;
     function isOuterExpression(node, kinds) {
         if (kinds === void 0) { kinds = 7 /* All */; }
         switch (node.kind) {
-            case 195 /* ParenthesizedExpression */:
+            case 196 /* ParenthesizedExpression */:
                 return (kinds & 1 /* Parentheses */) !== 0;
-            case 194 /* TypeAssertionExpression */:
-            case 212 /* AsExpression */:
-            case 213 /* NonNullExpression */:
+            case 195 /* TypeAssertionExpression */:
+            case 213 /* AsExpression */:
+            case 214 /* NonNullExpression */:
                 return (kinds & 2 /* Assertions */) !== 0;
-            case 313 /* PartiallyEmittedExpression */:
+            case 315 /* PartiallyEmittedExpression */:
                 return (kinds & 4 /* PartiallyEmittedExpressions */) !== 0;
         }
         return false;
@@ -64368,7 +66542,7 @@ var ts;
     }
     ts.skipOuterExpressions = skipOuterExpressions;
     function skipAssertions(node) {
-        while (ts.isAssertionExpression(node) || node.kind === 213 /* NonNullExpression */) {
+        while (ts.isAssertionExpression(node) || node.kind === 214 /* NonNullExpression */) {
             node = node.expression;
         }
         return node;
@@ -64376,11 +66550,11 @@ var ts;
     ts.skipAssertions = skipAssertions;
     function updateOuterExpression(outerExpression, expression) {
         switch (outerExpression.kind) {
-            case 195 /* ParenthesizedExpression */: return ts.updateParen(outerExpression, expression);
-            case 194 /* TypeAssertionExpression */: return ts.updateTypeAssertion(outerExpression, outerExpression.type, expression);
-            case 212 /* AsExpression */: return ts.updateAsExpression(outerExpression, expression, outerExpression.type);
-            case 213 /* NonNullExpression */: return ts.updateNonNullExpression(outerExpression, expression);
-            case 313 /* PartiallyEmittedExpression */: return ts.updatePartiallyEmittedExpression(outerExpression, expression);
+            case 196 /* ParenthesizedExpression */: return ts.updateParen(outerExpression, expression);
+            case 195 /* TypeAssertionExpression */: return ts.updateTypeAssertion(outerExpression, outerExpression.type, expression);
+            case 213 /* AsExpression */: return ts.updateAsExpression(outerExpression, expression, outerExpression.type);
+            case 214 /* NonNullExpression */: return ts.updateNonNullExpression(outerExpression, expression);
+            case 315 /* PartiallyEmittedExpression */: return ts.updatePartiallyEmittedExpression(outerExpression, expression);
         }
     }
     /**
@@ -64398,7 +66572,7 @@ var ts;
      * the containing expression is created/updated.
      */
     function isIgnorableParen(node) {
-        return node.kind === 195 /* ParenthesizedExpression */
+        return node.kind === 196 /* ParenthesizedExpression */
             && ts.nodeIsSynthesized(node)
             && ts.nodeIsSynthesized(ts.getSourceMapRange(node))
             && ts.nodeIsSynthesized(ts.getCommentRange(node))
@@ -64463,10 +66637,10 @@ var ts;
             var name = namespaceDeclaration.name;
             return ts.isGeneratedIdentifier(name) ? name : ts.createIdentifier(ts.getSourceTextOfNodeFromSourceFile(sourceFile, name) || ts.idText(name));
         }
-        if (node.kind === 249 /* ImportDeclaration */ && node.importClause) {
+        if (node.kind === 250 /* ImportDeclaration */ && node.importClause) {
             return ts.getGeneratedNameForNode(node);
         }
-        if (node.kind === 255 /* ExportDeclaration */ && node.moduleSpecifier) {
+        if (node.kind === 256 /* ExportDeclaration */ && node.moduleSpecifier) {
             return ts.getGeneratedNameForNode(node);
         }
         return undefined;
@@ -64585,7 +66759,7 @@ var ts;
         }
         if (ts.isObjectLiteralElementLike(bindingElement)) {
             switch (bindingElement.kind) {
-                case 275 /* PropertyAssignment */:
+                case 276 /* PropertyAssignment */:
                     // `b` in `({ a: b } = ...)`
                     // `b` in `({ a: b = 1 } = ...)`
                     // `{b}` in `({ a: {b} } = ...)`
@@ -64597,11 +66771,11 @@ var ts;
                     // `b[0]` in `({ a: b[0] } = ...)`
                     // `b[0]` in `({ a: b[0] = 1 } = ...)`
                     return getTargetOfBindingOrAssignmentElement(bindingElement.initializer);
-                case 276 /* ShorthandPropertyAssignment */:
+                case 277 /* ShorthandPropertyAssignment */:
                     // `a` in `({ a } = ...)`
                     // `a` in `({ a = 1 } = ...)`
                     return bindingElement.name;
-                case 277 /* SpreadAssignment */:
+                case 278 /* SpreadAssignment */:
                     // `a` in `({ ...a } = ...)`
                     return getTargetOfBindingOrAssignmentElement(bindingElement.expression);
             }
@@ -64633,12 +66807,12 @@ var ts;
      */
     function getRestIndicatorOfBindingOrAssignmentElement(bindingElement) {
         switch (bindingElement.kind) {
-            case 151 /* Parameter */:
-            case 186 /* BindingElement */:
+            case 152 /* Parameter */:
+            case 187 /* BindingElement */:
                 // `...` in `let [...a] = ...`
                 return bindingElement.dotDotDotToken;
-            case 208 /* SpreadElement */:
-            case 277 /* SpreadAssignment */:
+            case 209 /* SpreadElement */:
+            case 278 /* SpreadAssignment */:
                 // `...` in `[...a] = ...`
                 return bindingElement;
         }
@@ -64650,7 +66824,7 @@ var ts;
      */
     function getPropertyNameOfBindingOrAssignmentElement(bindingElement) {
         switch (bindingElement.kind) {
-            case 186 /* BindingElement */:
+            case 187 /* BindingElement */:
                 // `a` in `let { a: b } = ...`
                 // `[a]` in `let { [a]: b } = ...`
                 // `"a"` in `let { "a": b } = ...`
@@ -64662,7 +66836,7 @@ var ts;
                         : propertyName;
                 }
                 break;
-            case 275 /* PropertyAssignment */:
+            case 276 /* PropertyAssignment */:
                 // `a` in `({ a: b } = ...)`
                 // `[a]` in `({ [a]: b } = ...)`
                 // `"a"` in `({ "a": b } = ...)`
@@ -64674,7 +66848,7 @@ var ts;
                         : propertyName;
                 }
                 break;
-            case 277 /* SpreadAssignment */:
+            case 278 /* SpreadAssignment */:
                 // `a` in `({ ...a } = ...)`
                 return bindingElement.name;
         }
@@ -64697,13 +66871,13 @@ var ts;
      */
     function getElementsOfBindingOrAssignmentPattern(name) {
         switch (name.kind) {
-            case 184 /* ObjectBindingPattern */:
-            case 185 /* ArrayBindingPattern */:
-            case 187 /* ArrayLiteralExpression */:
+            case 185 /* ObjectBindingPattern */:
+            case 186 /* ArrayBindingPattern */:
+            case 188 /* ArrayLiteralExpression */:
                 // `a` in `{a}`
                 // `a` in `[a]`
                 return name.elements;
-            case 188 /* ObjectLiteralExpression */:
+            case 189 /* ObjectLiteralExpression */:
                 // `a` in `{a}`
                 return name.properties;
         }
@@ -64743,11 +66917,11 @@ var ts;
     ts.convertToObjectAssignmentElement = convertToObjectAssignmentElement;
     function convertToAssignmentPattern(node) {
         switch (node.kind) {
-            case 185 /* ArrayBindingPattern */:
-            case 187 /* ArrayLiteralExpression */:
+            case 186 /* ArrayBindingPattern */:
+            case 188 /* ArrayLiteralExpression */:
                 return convertToArrayAssignmentPattern(node);
-            case 184 /* ObjectBindingPattern */:
-            case 188 /* ObjectLiteralExpression */:
+            case 185 /* ObjectBindingPattern */:
+            case 189 /* ObjectLiteralExpression */:
                 return convertToObjectAssignmentPattern(node);
         }
     }
@@ -64908,276 +67082,278 @@ var ts;
         }
         var kind = node.kind;
         // No need to visit nodes with no children.
-        if ((kind > 0 /* FirstToken */ && kind <= 147 /* LastToken */) || kind === 178 /* ThisType */) {
+        if ((kind > 0 /* FirstToken */ && kind <= 148 /* LastToken */) || kind === 179 /* ThisType */) {
             return node;
         }
         switch (kind) {
             // Names
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 return ts.updateIdentifier(node, nodesVisitor(node.typeArguments, visitor, isTypeNodeOrTypeParameterDeclaration));
-            case 148 /* QualifiedName */:
+            case 149 /* QualifiedName */:
                 return ts.updateQualifiedName(node, visitNode(node.left, visitor, ts.isEntityName), visitNode(node.right, visitor, ts.isIdentifier));
-            case 149 /* ComputedPropertyName */:
+            case 150 /* ComputedPropertyName */:
                 return ts.updateComputedPropertyName(node, visitNode(node.expression, visitor, ts.isExpression));
             // Signature elements
-            case 150 /* TypeParameter */:
+            case 151 /* TypeParameter */:
                 return ts.updateTypeParameterDeclaration(node, visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.constraint, visitor, ts.isTypeNode), visitNode(node.default, visitor, ts.isTypeNode));
-            case 151 /* Parameter */:
+            case 152 /* Parameter */:
                 return ts.updateParameter(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.dotDotDotToken, tokenVisitor, ts.isToken), visitNode(node.name, visitor, ts.isBindingName), visitNode(node.questionToken, tokenVisitor, ts.isToken), visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.initializer, visitor, ts.isExpression));
-            case 152 /* Decorator */:
+            case 153 /* Decorator */:
                 return ts.updateDecorator(node, visitNode(node.expression, visitor, ts.isExpression));
             // Type elements
-            case 153 /* PropertySignature */:
+            case 154 /* PropertySignature */:
                 return ts.updatePropertySignature(node, nodesVisitor(node.modifiers, visitor, ts.isToken), visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.questionToken, tokenVisitor, ts.isToken), visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.initializer, visitor, ts.isExpression));
-            case 154 /* PropertyDeclaration */:
-                return ts.updateProperty(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.questionToken, tokenVisitor, ts.isToken), visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.initializer, visitor, ts.isExpression));
-            case 155 /* MethodSignature */:
+            case 155 /* PropertyDeclaration */:
+                return ts.updateProperty(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), 
+                // QuestionToken and ExclamationToken is uniqued in Property Declaration and the signature of 'updateProperty' is that too
+                visitNode(node.questionToken || node.exclamationToken, tokenVisitor, ts.isToken), visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.initializer, visitor, ts.isExpression));
+            case 156 /* MethodSignature */:
                 return ts.updateMethodSignature(node, nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.questionToken, tokenVisitor, ts.isToken));
-            case 156 /* MethodDeclaration */:
+            case 157 /* MethodDeclaration */:
                 return ts.updateMethod(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.asteriskToken, tokenVisitor, ts.isToken), visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.questionToken, tokenVisitor, ts.isToken), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitNode(node.type, visitor, ts.isTypeNode), visitFunctionBody(node.body, visitor, context));
-            case 157 /* Constructor */:
+            case 158 /* Constructor */:
                 return ts.updateConstructor(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitFunctionBody(node.body, visitor, context));
-            case 158 /* GetAccessor */:
+            case 159 /* GetAccessor */:
                 return ts.updateGetAccessor(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitNode(node.type, visitor, ts.isTypeNode), visitFunctionBody(node.body, visitor, context));
-            case 159 /* SetAccessor */:
+            case 160 /* SetAccessor */:
                 return ts.updateSetAccessor(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitFunctionBody(node.body, visitor, context));
-            case 160 /* CallSignature */:
+            case 161 /* CallSignature */:
                 return ts.updateCallSignature(node, nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode));
-            case 161 /* ConstructSignature */:
+            case 162 /* ConstructSignature */:
                 return ts.updateConstructSignature(node, nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode));
-            case 162 /* IndexSignature */:
+            case 163 /* IndexSignature */:
                 return ts.updateIndexSignature(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode));
             // Types
-            case 163 /* TypePredicate */:
+            case 164 /* TypePredicate */:
                 return ts.updateTypePredicateNode(node, visitNode(node.parameterName, visitor), visitNode(node.type, visitor, ts.isTypeNode));
-            case 164 /* TypeReference */:
+            case 165 /* TypeReference */:
                 return ts.updateTypeReferenceNode(node, visitNode(node.typeName, visitor, ts.isEntityName), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode));
-            case 165 /* FunctionType */:
+            case 166 /* FunctionType */:
                 return ts.updateFunctionTypeNode(node, nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode));
-            case 166 /* ConstructorType */:
+            case 167 /* ConstructorType */:
                 return ts.updateConstructorTypeNode(node, nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode));
-            case 167 /* TypeQuery */:
+            case 168 /* TypeQuery */:
                 return ts.updateTypeQueryNode(node, visitNode(node.exprName, visitor, ts.isEntityName));
-            case 168 /* TypeLiteral */:
+            case 169 /* TypeLiteral */:
                 return ts.updateTypeLiteralNode(node, nodesVisitor(node.members, visitor, ts.isTypeElement));
-            case 169 /* ArrayType */:
+            case 170 /* ArrayType */:
                 return ts.updateArrayTypeNode(node, visitNode(node.elementType, visitor, ts.isTypeNode));
-            case 170 /* TupleType */:
+            case 171 /* TupleType */:
                 return ts.updateTupleTypeNode(node, nodesVisitor(node.elementTypes, visitor, ts.isTypeNode));
-            case 171 /* OptionalType */:
+            case 172 /* OptionalType */:
                 return ts.updateOptionalTypeNode(node, visitNode(node.type, visitor, ts.isTypeNode));
-            case 172 /* RestType */:
+            case 173 /* RestType */:
                 return ts.updateRestTypeNode(node, visitNode(node.type, visitor, ts.isTypeNode));
-            case 173 /* UnionType */:
+            case 174 /* UnionType */:
                 return ts.updateUnionTypeNode(node, nodesVisitor(node.types, visitor, ts.isTypeNode));
-            case 174 /* IntersectionType */:
+            case 175 /* IntersectionType */:
                 return ts.updateIntersectionTypeNode(node, nodesVisitor(node.types, visitor, ts.isTypeNode));
-            case 175 /* ConditionalType */:
+            case 176 /* ConditionalType */:
                 return ts.updateConditionalTypeNode(node, visitNode(node.checkType, visitor, ts.isTypeNode), visitNode(node.extendsType, visitor, ts.isTypeNode), visitNode(node.trueType, visitor, ts.isTypeNode), visitNode(node.falseType, visitor, ts.isTypeNode));
-            case 176 /* InferType */:
+            case 177 /* InferType */:
                 return ts.updateInferTypeNode(node, visitNode(node.typeParameter, visitor, ts.isTypeParameterDeclaration));
-            case 183 /* ImportType */:
+            case 184 /* ImportType */:
                 return ts.updateImportTypeNode(node, visitNode(node.argument, visitor, ts.isTypeNode), visitNode(node.qualifier, visitor, ts.isEntityName), visitNodes(node.typeArguments, visitor, ts.isTypeNode), node.isTypeOf);
-            case 177 /* ParenthesizedType */:
+            case 178 /* ParenthesizedType */:
                 return ts.updateParenthesizedType(node, visitNode(node.type, visitor, ts.isTypeNode));
-            case 179 /* TypeOperator */:
+            case 180 /* TypeOperator */:
                 return ts.updateTypeOperatorNode(node, visitNode(node.type, visitor, ts.isTypeNode));
-            case 180 /* IndexedAccessType */:
+            case 181 /* IndexedAccessType */:
                 return ts.updateIndexedAccessTypeNode(node, visitNode(node.objectType, visitor, ts.isTypeNode), visitNode(node.indexType, visitor, ts.isTypeNode));
-            case 181 /* MappedType */:
+            case 182 /* MappedType */:
                 return ts.updateMappedTypeNode(node, visitNode(node.readonlyToken, tokenVisitor, ts.isToken), visitNode(node.typeParameter, visitor, ts.isTypeParameterDeclaration), visitNode(node.questionToken, tokenVisitor, ts.isToken), visitNode(node.type, visitor, ts.isTypeNode));
-            case 182 /* LiteralType */:
+            case 183 /* LiteralType */:
                 return ts.updateLiteralTypeNode(node, visitNode(node.literal, visitor, ts.isExpression));
             // Binding patterns
-            case 184 /* ObjectBindingPattern */:
+            case 185 /* ObjectBindingPattern */:
                 return ts.updateObjectBindingPattern(node, nodesVisitor(node.elements, visitor, ts.isBindingElement));
-            case 185 /* ArrayBindingPattern */:
+            case 186 /* ArrayBindingPattern */:
                 return ts.updateArrayBindingPattern(node, nodesVisitor(node.elements, visitor, ts.isArrayBindingElement));
-            case 186 /* BindingElement */:
+            case 187 /* BindingElement */:
                 return ts.updateBindingElement(node, visitNode(node.dotDotDotToken, tokenVisitor, ts.isToken), visitNode(node.propertyName, visitor, ts.isPropertyName), visitNode(node.name, visitor, ts.isBindingName), visitNode(node.initializer, visitor, ts.isExpression));
             // Expression
-            case 187 /* ArrayLiteralExpression */:
+            case 188 /* ArrayLiteralExpression */:
                 return ts.updateArrayLiteral(node, nodesVisitor(node.elements, visitor, ts.isExpression));
-            case 188 /* ObjectLiteralExpression */:
+            case 189 /* ObjectLiteralExpression */:
                 return ts.updateObjectLiteral(node, nodesVisitor(node.properties, visitor, ts.isObjectLiteralElementLike));
-            case 189 /* PropertyAccessExpression */:
+            case 190 /* PropertyAccessExpression */:
                 return ts.updatePropertyAccess(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.name, visitor, ts.isIdentifier));
-            case 190 /* ElementAccessExpression */:
+            case 191 /* ElementAccessExpression */:
                 return ts.updateElementAccess(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.argumentExpression, visitor, ts.isExpression));
-            case 191 /* CallExpression */:
+            case 192 /* CallExpression */:
                 return ts.updateCall(node, visitNode(node.expression, visitor, ts.isExpression), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode), nodesVisitor(node.arguments, visitor, ts.isExpression));
-            case 192 /* NewExpression */:
+            case 193 /* NewExpression */:
                 return ts.updateNew(node, visitNode(node.expression, visitor, ts.isExpression), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode), nodesVisitor(node.arguments, visitor, ts.isExpression));
-            case 193 /* TaggedTemplateExpression */:
+            case 194 /* TaggedTemplateExpression */:
                 return ts.updateTaggedTemplate(node, visitNode(node.tag, visitor, ts.isExpression), visitNodes(node.typeArguments, visitor, ts.isExpression), visitNode(node.template, visitor, ts.isTemplateLiteral));
-            case 194 /* TypeAssertionExpression */:
+            case 195 /* TypeAssertionExpression */:
                 return ts.updateTypeAssertion(node, visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.expression, visitor, ts.isExpression));
-            case 195 /* ParenthesizedExpression */:
+            case 196 /* ParenthesizedExpression */:
                 return ts.updateParen(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 196 /* FunctionExpression */:
+            case 197 /* FunctionExpression */:
                 return ts.updateFunctionExpression(node, nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.asteriskToken, tokenVisitor, ts.isToken), visitNode(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitNode(node.type, visitor, ts.isTypeNode), visitFunctionBody(node.body, visitor, context));
-            case 197 /* ArrowFunction */:
+            case 198 /* ArrowFunction */:
                 return ts.updateArrowFunction(node, nodesVisitor(node.modifiers, visitor, ts.isModifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.equalsGreaterThanToken, visitor, ts.isToken), visitFunctionBody(node.body, visitor, context));
-            case 198 /* DeleteExpression */:
+            case 199 /* DeleteExpression */:
                 return ts.updateDelete(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 199 /* TypeOfExpression */:
+            case 200 /* TypeOfExpression */:
                 return ts.updateTypeOf(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 200 /* VoidExpression */:
+            case 201 /* VoidExpression */:
                 return ts.updateVoid(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 201 /* AwaitExpression */:
+            case 202 /* AwaitExpression */:
                 return ts.updateAwait(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 202 /* PrefixUnaryExpression */:
+            case 203 /* PrefixUnaryExpression */:
                 return ts.updatePrefix(node, visitNode(node.operand, visitor, ts.isExpression));
-            case 203 /* PostfixUnaryExpression */:
+            case 204 /* PostfixUnaryExpression */:
                 return ts.updatePostfix(node, visitNode(node.operand, visitor, ts.isExpression));
-            case 204 /* BinaryExpression */:
+            case 205 /* BinaryExpression */:
                 return ts.updateBinary(node, visitNode(node.left, visitor, ts.isExpression), visitNode(node.right, visitor, ts.isExpression), visitNode(node.operatorToken, visitor, ts.isToken));
-            case 205 /* ConditionalExpression */:
+            case 206 /* ConditionalExpression */:
                 return ts.updateConditional(node, visitNode(node.condition, visitor, ts.isExpression), visitNode(node.questionToken, visitor, ts.isToken), visitNode(node.whenTrue, visitor, ts.isExpression), visitNode(node.colonToken, visitor, ts.isToken), visitNode(node.whenFalse, visitor, ts.isExpression));
-            case 206 /* TemplateExpression */:
+            case 207 /* TemplateExpression */:
                 return ts.updateTemplateExpression(node, visitNode(node.head, visitor, ts.isTemplateHead), nodesVisitor(node.templateSpans, visitor, ts.isTemplateSpan));
-            case 207 /* YieldExpression */:
+            case 208 /* YieldExpression */:
                 return ts.updateYield(node, visitNode(node.asteriskToken, tokenVisitor, ts.isToken), visitNode(node.expression, visitor, ts.isExpression));
-            case 208 /* SpreadElement */:
+            case 209 /* SpreadElement */:
                 return ts.updateSpread(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 209 /* ClassExpression */:
+            case 210 /* ClassExpression */:
                 return ts.updateClassExpression(node, nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.heritageClauses, visitor, ts.isHeritageClause), nodesVisitor(node.members, visitor, ts.isClassElement));
-            case 211 /* ExpressionWithTypeArguments */:
+            case 212 /* ExpressionWithTypeArguments */:
                 return ts.updateExpressionWithTypeArguments(node, nodesVisitor(node.typeArguments, visitor, ts.isTypeNode), visitNode(node.expression, visitor, ts.isExpression));
-            case 212 /* AsExpression */:
+            case 213 /* AsExpression */:
                 return ts.updateAsExpression(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.type, visitor, ts.isTypeNode));
-            case 213 /* NonNullExpression */:
+            case 214 /* NonNullExpression */:
                 return ts.updateNonNullExpression(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 214 /* MetaProperty */:
+            case 215 /* MetaProperty */:
                 return ts.updateMetaProperty(node, visitNode(node.name, visitor, ts.isIdentifier));
             // Misc
-            case 216 /* TemplateSpan */:
+            case 217 /* TemplateSpan */:
                 return ts.updateTemplateSpan(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.literal, visitor, ts.isTemplateMiddleOrTemplateTail));
             // Element
-            case 218 /* Block */:
+            case 219 /* Block */:
                 return ts.updateBlock(node, nodesVisitor(node.statements, visitor, ts.isStatement));
-            case 219 /* VariableStatement */:
+            case 220 /* VariableStatement */:
                 return ts.updateVariableStatement(node, nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.declarationList, visitor, ts.isVariableDeclarationList));
-            case 221 /* ExpressionStatement */:
+            case 222 /* ExpressionStatement */:
                 return ts.updateExpressionStatement(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 222 /* IfStatement */:
+            case 223 /* IfStatement */:
                 return ts.updateIf(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.thenStatement, visitor, ts.isStatement, ts.liftToBlock), visitNode(node.elseStatement, visitor, ts.isStatement, ts.liftToBlock));
-            case 223 /* DoStatement */:
+            case 224 /* DoStatement */:
                 return ts.updateDo(node, visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock), visitNode(node.expression, visitor, ts.isExpression));
-            case 224 /* WhileStatement */:
+            case 225 /* WhileStatement */:
                 return ts.updateWhile(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock));
-            case 225 /* ForStatement */:
+            case 226 /* ForStatement */:
                 return ts.updateFor(node, visitNode(node.initializer, visitor, ts.isForInitializer), visitNode(node.condition, visitor, ts.isExpression), visitNode(node.incrementor, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock));
-            case 226 /* ForInStatement */:
+            case 227 /* ForInStatement */:
                 return ts.updateForIn(node, visitNode(node.initializer, visitor, ts.isForInitializer), visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock));
-            case 227 /* ForOfStatement */:
+            case 228 /* ForOfStatement */:
                 return ts.updateForOf(node, visitNode(node.awaitModifier, visitor, ts.isToken), visitNode(node.initializer, visitor, ts.isForInitializer), visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock));
-            case 228 /* ContinueStatement */:
+            case 229 /* ContinueStatement */:
                 return ts.updateContinue(node, visitNode(node.label, visitor, ts.isIdentifier));
-            case 229 /* BreakStatement */:
+            case 230 /* BreakStatement */:
                 return ts.updateBreak(node, visitNode(node.label, visitor, ts.isIdentifier));
-            case 230 /* ReturnStatement */:
+            case 231 /* ReturnStatement */:
                 return ts.updateReturn(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 231 /* WithStatement */:
+            case 232 /* WithStatement */:
                 return ts.updateWith(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock));
-            case 232 /* SwitchStatement */:
+            case 233 /* SwitchStatement */:
                 return ts.updateSwitch(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.caseBlock, visitor, ts.isCaseBlock));
-            case 233 /* LabeledStatement */:
+            case 234 /* LabeledStatement */:
                 return ts.updateLabel(node, visitNode(node.label, visitor, ts.isIdentifier), visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock));
-            case 234 /* ThrowStatement */:
+            case 235 /* ThrowStatement */:
                 return ts.updateThrow(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 235 /* TryStatement */:
+            case 236 /* TryStatement */:
                 return ts.updateTry(node, visitNode(node.tryBlock, visitor, ts.isBlock), visitNode(node.catchClause, visitor, ts.isCatchClause), visitNode(node.finallyBlock, visitor, ts.isBlock));
-            case 237 /* VariableDeclaration */:
+            case 238 /* VariableDeclaration */:
                 return ts.updateVariableDeclaration(node, visitNode(node.name, visitor, ts.isBindingName), visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.initializer, visitor, ts.isExpression));
-            case 238 /* VariableDeclarationList */:
+            case 239 /* VariableDeclarationList */:
                 return ts.updateVariableDeclarationList(node, nodesVisitor(node.declarations, visitor, ts.isVariableDeclaration));
-            case 239 /* FunctionDeclaration */:
+            case 240 /* FunctionDeclaration */:
                 return ts.updateFunctionDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.asteriskToken, tokenVisitor, ts.isToken), visitNode(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitNode(node.type, visitor, ts.isTypeNode), visitFunctionBody(node.body, visitor, context));
-            case 240 /* ClassDeclaration */:
+            case 241 /* ClassDeclaration */:
                 return ts.updateClassDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.heritageClauses, visitor, ts.isHeritageClause), nodesVisitor(node.members, visitor, ts.isClassElement));
-            case 241 /* InterfaceDeclaration */:
+            case 242 /* InterfaceDeclaration */:
                 return ts.updateInterfaceDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.heritageClauses, visitor, ts.isHeritageClause), nodesVisitor(node.members, visitor, ts.isTypeElement));
-            case 242 /* TypeAliasDeclaration */:
+            case 243 /* TypeAliasDeclaration */:
                 return ts.updateTypeAliasDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode));
-            case 243 /* EnumDeclaration */:
+            case 244 /* EnumDeclaration */:
                 return ts.updateEnumDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier), nodesVisitor(node.members, visitor, ts.isEnumMember));
-            case 244 /* ModuleDeclaration */:
+            case 245 /* ModuleDeclaration */:
                 return ts.updateModuleDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.body, visitor, ts.isModuleBody));
-            case 245 /* ModuleBlock */:
+            case 246 /* ModuleBlock */:
                 return ts.updateModuleBlock(node, nodesVisitor(node.statements, visitor, ts.isStatement));
-            case 246 /* CaseBlock */:
+            case 247 /* CaseBlock */:
                 return ts.updateCaseBlock(node, nodesVisitor(node.clauses, visitor, ts.isCaseOrDefaultClause));
-            case 247 /* NamespaceExportDeclaration */:
+            case 248 /* NamespaceExportDeclaration */:
                 return ts.updateNamespaceExportDeclaration(node, visitNode(node.name, visitor, ts.isIdentifier));
-            case 248 /* ImportEqualsDeclaration */:
+            case 249 /* ImportEqualsDeclaration */:
                 return ts.updateImportEqualsDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.moduleReference, visitor, ts.isModuleReference));
-            case 249 /* ImportDeclaration */:
+            case 250 /* ImportDeclaration */:
                 return ts.updateImportDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.importClause, visitor, ts.isImportClause), visitNode(node.moduleSpecifier, visitor, ts.isExpression));
-            case 250 /* ImportClause */:
+            case 251 /* ImportClause */:
                 return ts.updateImportClause(node, visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.namedBindings, visitor, ts.isNamedImportBindings));
-            case 251 /* NamespaceImport */:
+            case 252 /* NamespaceImport */:
                 return ts.updateNamespaceImport(node, visitNode(node.name, visitor, ts.isIdentifier));
-            case 252 /* NamedImports */:
+            case 253 /* NamedImports */:
                 return ts.updateNamedImports(node, nodesVisitor(node.elements, visitor, ts.isImportSpecifier));
-            case 253 /* ImportSpecifier */:
+            case 254 /* ImportSpecifier */:
                 return ts.updateImportSpecifier(node, visitNode(node.propertyName, visitor, ts.isIdentifier), visitNode(node.name, visitor, ts.isIdentifier));
-            case 254 /* ExportAssignment */:
+            case 255 /* ExportAssignment */:
                 return ts.updateExportAssignment(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.expression, visitor, ts.isExpression));
-            case 255 /* ExportDeclaration */:
+            case 256 /* ExportDeclaration */:
                 return ts.updateExportDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.exportClause, visitor, ts.isNamedExports), visitNode(node.moduleSpecifier, visitor, ts.isExpression));
-            case 256 /* NamedExports */:
+            case 257 /* NamedExports */:
                 return ts.updateNamedExports(node, nodesVisitor(node.elements, visitor, ts.isExportSpecifier));
-            case 257 /* ExportSpecifier */:
+            case 258 /* ExportSpecifier */:
                 return ts.updateExportSpecifier(node, visitNode(node.propertyName, visitor, ts.isIdentifier), visitNode(node.name, visitor, ts.isIdentifier));
             // Module references
-            case 259 /* ExternalModuleReference */:
+            case 260 /* ExternalModuleReference */:
                 return ts.updateExternalModuleReference(node, visitNode(node.expression, visitor, ts.isExpression));
             // JSX
-            case 260 /* JsxElement */:
+            case 261 /* JsxElement */:
                 return ts.updateJsxElement(node, visitNode(node.openingElement, visitor, ts.isJsxOpeningElement), nodesVisitor(node.children, visitor, ts.isJsxChild), visitNode(node.closingElement, visitor, ts.isJsxClosingElement));
-            case 261 /* JsxSelfClosingElement */:
+            case 262 /* JsxSelfClosingElement */:
                 return ts.updateJsxSelfClosingElement(node, visitNode(node.tagName, visitor, ts.isJsxTagNameExpression), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode), visitNode(node.attributes, visitor, ts.isJsxAttributes));
-            case 262 /* JsxOpeningElement */:
+            case 263 /* JsxOpeningElement */:
                 return ts.updateJsxOpeningElement(node, visitNode(node.tagName, visitor, ts.isJsxTagNameExpression), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode), visitNode(node.attributes, visitor, ts.isJsxAttributes));
-            case 263 /* JsxClosingElement */:
+            case 264 /* JsxClosingElement */:
                 return ts.updateJsxClosingElement(node, visitNode(node.tagName, visitor, ts.isJsxTagNameExpression));
-            case 264 /* JsxFragment */:
+            case 265 /* JsxFragment */:
                 return ts.updateJsxFragment(node, visitNode(node.openingFragment, visitor, ts.isJsxOpeningFragment), nodesVisitor(node.children, visitor, ts.isJsxChild), visitNode(node.closingFragment, visitor, ts.isJsxClosingFragment));
-            case 267 /* JsxAttribute */:
+            case 268 /* JsxAttribute */:
                 return ts.updateJsxAttribute(node, visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.initializer, visitor, ts.isStringLiteralOrJsxExpression));
-            case 268 /* JsxAttributes */:
+            case 269 /* JsxAttributes */:
                 return ts.updateJsxAttributes(node, nodesVisitor(node.properties, visitor, ts.isJsxAttributeLike));
-            case 269 /* JsxSpreadAttribute */:
+            case 270 /* JsxSpreadAttribute */:
                 return ts.updateJsxSpreadAttribute(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 270 /* JsxExpression */:
+            case 271 /* JsxExpression */:
                 return ts.updateJsxExpression(node, visitNode(node.expression, visitor, ts.isExpression));
             // Clauses
-            case 271 /* CaseClause */:
+            case 272 /* CaseClause */:
                 return ts.updateCaseClause(node, visitNode(node.expression, visitor, ts.isExpression), nodesVisitor(node.statements, visitor, ts.isStatement));
-            case 272 /* DefaultClause */:
+            case 273 /* DefaultClause */:
                 return ts.updateDefaultClause(node, nodesVisitor(node.statements, visitor, ts.isStatement));
-            case 273 /* HeritageClause */:
+            case 274 /* HeritageClause */:
                 return ts.updateHeritageClause(node, nodesVisitor(node.types, visitor, ts.isExpressionWithTypeArguments));
-            case 274 /* CatchClause */:
+            case 275 /* CatchClause */:
                 return ts.updateCatchClause(node, visitNode(node.variableDeclaration, visitor, ts.isVariableDeclaration), visitNode(node.block, visitor, ts.isBlock));
             // Property assignments
-            case 275 /* PropertyAssignment */:
+            case 276 /* PropertyAssignment */:
                 return ts.updatePropertyAssignment(node, visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.initializer, visitor, ts.isExpression));
-            case 276 /* ShorthandPropertyAssignment */:
+            case 277 /* ShorthandPropertyAssignment */:
                 return ts.updateShorthandPropertyAssignment(node, visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.objectAssignmentInitializer, visitor, ts.isExpression));
-            case 277 /* SpreadAssignment */:
+            case 278 /* SpreadAssignment */:
                 return ts.updateSpreadAssignment(node, visitNode(node.expression, visitor, ts.isExpression));
             // Enum
-            case 278 /* EnumMember */:
+            case 279 /* EnumMember */:
                 return ts.updateEnumMember(node, visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.initializer, visitor, ts.isExpression));
             // Top-level nodes
-            case 284 /* SourceFile */:
+            case 285 /* SourceFile */:
                 return ts.updateSourceFileNode(node, visitLexicalEnvironment(node.statements, visitor, context));
             // Transformation nodes
-            case 313 /* PartiallyEmittedExpression */:
+            case 315 /* PartiallyEmittedExpression */:
                 return ts.updatePartiallyEmittedExpression(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 314 /* CommaListExpression */:
+            case 316 /* CommaListExpression */:
                 return ts.updateCommaList(node, nodesVisitor(node.elements, visitor, ts.isExpression));
             default:
                 // No need to visit nodes with no children.
@@ -65219,58 +67395,58 @@ var ts;
         var cbNodes = cbNodeArray || cbNode;
         var kind = node.kind;
         // No need to visit nodes with no children.
-        if ((kind > 0 /* FirstToken */ && kind <= 147 /* LastToken */)) {
+        if ((kind > 0 /* FirstToken */ && kind <= 148 /* LastToken */)) {
             return initial;
         }
         // We do not yet support types.
-        if ((kind >= 163 /* TypePredicate */ && kind <= 182 /* LiteralType */)) {
+        if ((kind >= 164 /* TypePredicate */ && kind <= 183 /* LiteralType */)) {
             return initial;
         }
         var result = initial;
         switch (node.kind) {
             // Leaf nodes
-            case 217 /* SemicolonClassElement */:
-            case 220 /* EmptyStatement */:
-            case 210 /* OmittedExpression */:
-            case 236 /* DebuggerStatement */:
-            case 312 /* NotEmittedStatement */:
+            case 218 /* SemicolonClassElement */:
+            case 221 /* EmptyStatement */:
+            case 211 /* OmittedExpression */:
+            case 237 /* DebuggerStatement */:
+            case 314 /* NotEmittedStatement */:
                 // No need to visit nodes with no children.
                 break;
             // Names
-            case 148 /* QualifiedName */:
+            case 149 /* QualifiedName */:
                 result = reduceNode(node.left, cbNode, result);
                 result = reduceNode(node.right, cbNode, result);
                 break;
-            case 149 /* ComputedPropertyName */:
+            case 150 /* ComputedPropertyName */:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
             // Signature elements
-            case 151 /* Parameter */:
+            case 152 /* Parameter */:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.type, cbNode, result);
                 result = reduceNode(node.initializer, cbNode, result);
                 break;
-            case 152 /* Decorator */:
+            case 153 /* Decorator */:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
             // Type member
-            case 153 /* PropertySignature */:
+            case 154 /* PropertySignature */:
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.questionToken, cbNode, result);
                 result = reduceNode(node.type, cbNode, result);
                 result = reduceNode(node.initializer, cbNode, result);
                 break;
-            case 154 /* PropertyDeclaration */:
+            case 155 /* PropertyDeclaration */:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.type, cbNode, result);
                 result = reduceNode(node.initializer, cbNode, result);
                 break;
-            case 156 /* MethodDeclaration */:
+            case 157 /* MethodDeclaration */:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
@@ -65279,12 +67455,12 @@ var ts;
                 result = reduceNode(node.type, cbNode, result);
                 result = reduceNode(node.body, cbNode, result);
                 break;
-            case 157 /* Constructor */:
+            case 158 /* Constructor */:
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNodes(node.parameters, cbNodes, result);
                 result = reduceNode(node.body, cbNode, result);
                 break;
-            case 158 /* GetAccessor */:
+            case 159 /* GetAccessor */:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
@@ -65292,7 +67468,7 @@ var ts;
                 result = reduceNode(node.type, cbNode, result);
                 result = reduceNode(node.body, cbNode, result);
                 break;
-            case 159 /* SetAccessor */:
+            case 160 /* SetAccessor */:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
@@ -65300,50 +67476,50 @@ var ts;
                 result = reduceNode(node.body, cbNode, result);
                 break;
             // Binding patterns
-            case 184 /* ObjectBindingPattern */:
-            case 185 /* ArrayBindingPattern */:
+            case 185 /* ObjectBindingPattern */:
+            case 186 /* ArrayBindingPattern */:
                 result = reduceNodes(node.elements, cbNodes, result);
                 break;
-            case 186 /* BindingElement */:
+            case 187 /* BindingElement */:
                 result = reduceNode(node.propertyName, cbNode, result);
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.initializer, cbNode, result);
                 break;
             // Expression
-            case 187 /* ArrayLiteralExpression */:
+            case 188 /* ArrayLiteralExpression */:
                 result = reduceNodes(node.elements, cbNodes, result);
                 break;
-            case 188 /* ObjectLiteralExpression */:
+            case 189 /* ObjectLiteralExpression */:
                 result = reduceNodes(node.properties, cbNodes, result);
                 break;
-            case 189 /* PropertyAccessExpression */:
+            case 190 /* PropertyAccessExpression */:
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNode(node.name, cbNode, result);
                 break;
-            case 190 /* ElementAccessExpression */:
+            case 191 /* ElementAccessExpression */:
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNode(node.argumentExpression, cbNode, result);
                 break;
-            case 191 /* CallExpression */:
+            case 192 /* CallExpression */:
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNodes(node.typeArguments, cbNodes, result);
                 result = reduceNodes(node.arguments, cbNodes, result);
                 break;
-            case 192 /* NewExpression */:
+            case 193 /* NewExpression */:
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNodes(node.typeArguments, cbNodes, result);
                 result = reduceNodes(node.arguments, cbNodes, result);
                 break;
-            case 193 /* TaggedTemplateExpression */:
+            case 194 /* TaggedTemplateExpression */:
                 result = reduceNode(node.tag, cbNode, result);
                 result = reduceNodes(node.typeArguments, cbNodes, result);
                 result = reduceNode(node.template, cbNode, result);
                 break;
-            case 194 /* TypeAssertionExpression */:
+            case 195 /* TypeAssertionExpression */:
                 result = reduceNode(node.type, cbNode, result);
                 result = reduceNode(node.expression, cbNode, result);
                 break;
-            case 196 /* FunctionExpression */:
+            case 197 /* FunctionExpression */:
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNodes(node.typeParameters, cbNodes, result);
@@ -65351,123 +67527,123 @@ var ts;
                 result = reduceNode(node.type, cbNode, result);
                 result = reduceNode(node.body, cbNode, result);
                 break;
-            case 197 /* ArrowFunction */:
+            case 198 /* ArrowFunction */:
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNodes(node.typeParameters, cbNodes, result);
                 result = reduceNodes(node.parameters, cbNodes, result);
                 result = reduceNode(node.type, cbNode, result);
                 result = reduceNode(node.body, cbNode, result);
                 break;
-            case 195 /* ParenthesizedExpression */:
-            case 198 /* DeleteExpression */:
-            case 199 /* TypeOfExpression */:
-            case 200 /* VoidExpression */:
-            case 201 /* AwaitExpression */:
-            case 207 /* YieldExpression */:
-            case 208 /* SpreadElement */:
-            case 213 /* NonNullExpression */:
+            case 196 /* ParenthesizedExpression */:
+            case 199 /* DeleteExpression */:
+            case 200 /* TypeOfExpression */:
+            case 201 /* VoidExpression */:
+            case 202 /* AwaitExpression */:
+            case 208 /* YieldExpression */:
+            case 209 /* SpreadElement */:
+            case 214 /* NonNullExpression */:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
-            case 202 /* PrefixUnaryExpression */:
-            case 203 /* PostfixUnaryExpression */:
+            case 203 /* PrefixUnaryExpression */:
+            case 204 /* PostfixUnaryExpression */:
                 result = reduceNode(node.operand, cbNode, result);
                 break;
-            case 204 /* BinaryExpression */:
+            case 205 /* BinaryExpression */:
                 result = reduceNode(node.left, cbNode, result);
                 result = reduceNode(node.right, cbNode, result);
                 break;
-            case 205 /* ConditionalExpression */:
+            case 206 /* ConditionalExpression */:
                 result = reduceNode(node.condition, cbNode, result);
                 result = reduceNode(node.whenTrue, cbNode, result);
                 result = reduceNode(node.whenFalse, cbNode, result);
                 break;
-            case 206 /* TemplateExpression */:
+            case 207 /* TemplateExpression */:
                 result = reduceNode(node.head, cbNode, result);
                 result = reduceNodes(node.templateSpans, cbNodes, result);
                 break;
-            case 209 /* ClassExpression */:
+            case 210 /* ClassExpression */:
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNodes(node.typeParameters, cbNodes, result);
                 result = reduceNodes(node.heritageClauses, cbNodes, result);
                 result = reduceNodes(node.members, cbNodes, result);
                 break;
-            case 211 /* ExpressionWithTypeArguments */:
+            case 212 /* ExpressionWithTypeArguments */:
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNodes(node.typeArguments, cbNodes, result);
                 break;
-            case 212 /* AsExpression */:
+            case 213 /* AsExpression */:
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNode(node.type, cbNode, result);
                 break;
             // Misc
-            case 216 /* TemplateSpan */:
+            case 217 /* TemplateSpan */:
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNode(node.literal, cbNode, result);
                 break;
             // Element
-            case 218 /* Block */:
+            case 219 /* Block */:
                 result = reduceNodes(node.statements, cbNodes, result);
                 break;
-            case 219 /* VariableStatement */:
+            case 220 /* VariableStatement */:
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.declarationList, cbNode, result);
                 break;
-            case 221 /* ExpressionStatement */:
+            case 222 /* ExpressionStatement */:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
-            case 222 /* IfStatement */:
+            case 223 /* IfStatement */:
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNode(node.thenStatement, cbNode, result);
                 result = reduceNode(node.elseStatement, cbNode, result);
                 break;
-            case 223 /* DoStatement */:
+            case 224 /* DoStatement */:
                 result = reduceNode(node.statement, cbNode, result);
                 result = reduceNode(node.expression, cbNode, result);
                 break;
-            case 224 /* WhileStatement */:
-            case 231 /* WithStatement */:
+            case 225 /* WhileStatement */:
+            case 232 /* WithStatement */:
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNode(node.statement, cbNode, result);
                 break;
-            case 225 /* ForStatement */:
+            case 226 /* ForStatement */:
                 result = reduceNode(node.initializer, cbNode, result);
                 result = reduceNode(node.condition, cbNode, result);
                 result = reduceNode(node.incrementor, cbNode, result);
                 result = reduceNode(node.statement, cbNode, result);
                 break;
-            case 226 /* ForInStatement */:
-            case 227 /* ForOfStatement */:
+            case 227 /* ForInStatement */:
+            case 228 /* ForOfStatement */:
                 result = reduceNode(node.initializer, cbNode, result);
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNode(node.statement, cbNode, result);
                 break;
-            case 230 /* ReturnStatement */:
-            case 234 /* ThrowStatement */:
+            case 231 /* ReturnStatement */:
+            case 235 /* ThrowStatement */:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
-            case 232 /* SwitchStatement */:
+            case 233 /* SwitchStatement */:
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNode(node.caseBlock, cbNode, result);
                 break;
-            case 233 /* LabeledStatement */:
+            case 234 /* LabeledStatement */:
                 result = reduceNode(node.label, cbNode, result);
                 result = reduceNode(node.statement, cbNode, result);
                 break;
-            case 235 /* TryStatement */:
+            case 236 /* TryStatement */:
                 result = reduceNode(node.tryBlock, cbNode, result);
                 result = reduceNode(node.catchClause, cbNode, result);
                 result = reduceNode(node.finallyBlock, cbNode, result);
                 break;
-            case 237 /* VariableDeclaration */:
+            case 238 /* VariableDeclaration */:
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.type, cbNode, result);
                 result = reduceNode(node.initializer, cbNode, result);
                 break;
-            case 238 /* VariableDeclarationList */:
+            case 239 /* VariableDeclarationList */:
                 result = reduceNodes(node.declarations, cbNodes, result);
                 break;
-            case 239 /* FunctionDeclaration */:
+            case 240 /* FunctionDeclaration */:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
@@ -65476,7 +67652,7 @@ var ts;
                 result = reduceNode(node.type, cbNode, result);
                 result = reduceNode(node.body, cbNode, result);
                 break;
-            case 240 /* ClassDeclaration */:
+            case 241 /* ClassDeclaration */:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
@@ -65484,140 +67660,140 @@ var ts;
                 result = reduceNodes(node.heritageClauses, cbNodes, result);
                 result = reduceNodes(node.members, cbNodes, result);
                 break;
-            case 243 /* EnumDeclaration */:
+            case 244 /* EnumDeclaration */:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNodes(node.members, cbNodes, result);
                 break;
-            case 244 /* ModuleDeclaration */:
+            case 245 /* ModuleDeclaration */:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.body, cbNode, result);
                 break;
-            case 245 /* ModuleBlock */:
+            case 246 /* ModuleBlock */:
                 result = reduceNodes(node.statements, cbNodes, result);
                 break;
-            case 246 /* CaseBlock */:
+            case 247 /* CaseBlock */:
                 result = reduceNodes(node.clauses, cbNodes, result);
                 break;
-            case 248 /* ImportEqualsDeclaration */:
+            case 249 /* ImportEqualsDeclaration */:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.moduleReference, cbNode, result);
                 break;
-            case 249 /* ImportDeclaration */:
+            case 250 /* ImportDeclaration */:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.importClause, cbNode, result);
                 result = reduceNode(node.moduleSpecifier, cbNode, result);
                 break;
-            case 250 /* ImportClause */:
+            case 251 /* ImportClause */:
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.namedBindings, cbNode, result);
                 break;
-            case 251 /* NamespaceImport */:
+            case 252 /* NamespaceImport */:
                 result = reduceNode(node.name, cbNode, result);
                 break;
-            case 252 /* NamedImports */:
-            case 256 /* NamedExports */:
+            case 253 /* NamedImports */:
+            case 257 /* NamedExports */:
                 result = reduceNodes(node.elements, cbNodes, result);
                 break;
-            case 253 /* ImportSpecifier */:
-            case 257 /* ExportSpecifier */:
+            case 254 /* ImportSpecifier */:
+            case 258 /* ExportSpecifier */:
                 result = reduceNode(node.propertyName, cbNode, result);
                 result = reduceNode(node.name, cbNode, result);
                 break;
-            case 254 /* ExportAssignment */:
+            case 255 /* ExportAssignment */:
                 result = ts.reduceLeft(node.decorators, cbNode, result);
                 result = ts.reduceLeft(node.modifiers, cbNode, result);
                 result = reduceNode(node.expression, cbNode, result);
                 break;
-            case 255 /* ExportDeclaration */:
+            case 256 /* ExportDeclaration */:
                 result = ts.reduceLeft(node.decorators, cbNode, result);
                 result = ts.reduceLeft(node.modifiers, cbNode, result);
                 result = reduceNode(node.exportClause, cbNode, result);
                 result = reduceNode(node.moduleSpecifier, cbNode, result);
                 break;
             // Module references
-            case 259 /* ExternalModuleReference */:
+            case 260 /* ExternalModuleReference */:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
             // JSX
-            case 260 /* JsxElement */:
+            case 261 /* JsxElement */:
                 result = reduceNode(node.openingElement, cbNode, result);
                 result = ts.reduceLeft(node.children, cbNode, result);
                 result = reduceNode(node.closingElement, cbNode, result);
                 break;
-            case 264 /* JsxFragment */:
+            case 265 /* JsxFragment */:
                 result = reduceNode(node.openingFragment, cbNode, result);
                 result = ts.reduceLeft(node.children, cbNode, result);
                 result = reduceNode(node.closingFragment, cbNode, result);
                 break;
-            case 261 /* JsxSelfClosingElement */:
-            case 262 /* JsxOpeningElement */:
+            case 262 /* JsxSelfClosingElement */:
+            case 263 /* JsxOpeningElement */:
                 result = reduceNode(node.tagName, cbNode, result);
                 result = reduceNodes(node.typeArguments, cbNode, result);
                 result = reduceNode(node.attributes, cbNode, result);
                 break;
-            case 268 /* JsxAttributes */:
+            case 269 /* JsxAttributes */:
                 result = reduceNodes(node.properties, cbNodes, result);
                 break;
-            case 263 /* JsxClosingElement */:
+            case 264 /* JsxClosingElement */:
                 result = reduceNode(node.tagName, cbNode, result);
                 break;
-            case 267 /* JsxAttribute */:
+            case 268 /* JsxAttribute */:
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.initializer, cbNode, result);
                 break;
-            case 269 /* JsxSpreadAttribute */:
+            case 270 /* JsxSpreadAttribute */:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
-            case 270 /* JsxExpression */:
+            case 271 /* JsxExpression */:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
             // Clauses
-            case 271 /* CaseClause */:
+            case 272 /* CaseClause */:
                 result = reduceNode(node.expression, cbNode, result);
             // falls through
-            case 272 /* DefaultClause */:
+            case 273 /* DefaultClause */:
                 result = reduceNodes(node.statements, cbNodes, result);
                 break;
-            case 273 /* HeritageClause */:
+            case 274 /* HeritageClause */:
                 result = reduceNodes(node.types, cbNodes, result);
                 break;
-            case 274 /* CatchClause */:
+            case 275 /* CatchClause */:
                 result = reduceNode(node.variableDeclaration, cbNode, result);
                 result = reduceNode(node.block, cbNode, result);
                 break;
             // Property assignments
-            case 275 /* PropertyAssignment */:
+            case 276 /* PropertyAssignment */:
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.initializer, cbNode, result);
                 break;
-            case 276 /* ShorthandPropertyAssignment */:
+            case 277 /* ShorthandPropertyAssignment */:
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.objectAssignmentInitializer, cbNode, result);
                 break;
-            case 277 /* SpreadAssignment */:
+            case 278 /* SpreadAssignment */:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
             // Enum
-            case 278 /* EnumMember */:
+            case 279 /* EnumMember */:
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.initializer, cbNode, result);
                 break;
             // Top-level nodes
-            case 284 /* SourceFile */:
+            case 285 /* SourceFile */:
                 result = reduceNodes(node.statements, cbNodes, result);
                 break;
             // Transformation nodes
-            case 313 /* PartiallyEmittedExpression */:
+            case 315 /* PartiallyEmittedExpression */:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
-            case 314 /* CommaListExpression */:
+            case 316 /* CommaListExpression */:
                 result = reduceNodes(node.elements, cbNodes, result);
                 break;
             default:
@@ -65641,7 +67817,7 @@ var ts;
      * @param nodes The NodeArray.
      */
     function liftToBlock(nodes) {
-        Debug.assert(ts.every(nodes, ts.isStatement), "Cannot lift nodes to a Block.");
+        ts.Debug.assert(ts.every(nodes, ts.isStatement), "Cannot lift nodes to a Block.");
         return ts.singleOrUndefined(nodes) || ts.createBlock(nodes);
     }
     ts.liftToBlock = liftToBlock;
@@ -65690,7 +67866,7 @@ var ts;
     function aggregateTransformFlagsForSubtree(node) {
         // We do not transform ambient declarations or types, so there is no need to
         // recursively aggregate transform flags.
-        if (ts.hasModifier(node, 2 /* Ambient */) || (ts.isTypeNode(node) && node.kind !== 211 /* ExpressionWithTypeArguments */)) {
+        if (ts.hasModifier(node, 2 /* Ambient */) || (ts.isTypeNode(node) && node.kind !== 212 /* ExpressionWithTypeArguments */)) {
             return 0 /* None */;
         }
         // Aggregate the transform flags of each child.
@@ -65706,73 +67882,6 @@ var ts;
     function aggregateTransformFlagsForChildNodes(transformFlags, nodes) {
         return transformFlags | aggregateTransformFlagsForNodeArray(nodes);
     }
-    var Debug;
-    (function (Debug) {
-        var isDebugInfoEnabled = false;
-        function failBadSyntaxKind(node, message) {
-            return Debug.fail((message || "Unexpected node.") + "\r\nNode " + ts.formatSyntaxKind(node.kind) + " was unexpected.", failBadSyntaxKind);
-        }
-        Debug.failBadSyntaxKind = failBadSyntaxKind;
-        Debug.assertEachNode = Debug.shouldAssert(1 /* Normal */)
-            ? function (nodes, test, message) { return Debug.assert(test === undefined || ts.every(nodes, test), message || "Unexpected node.", function () { return "Node array did not pass test '" + Debug.getFunctionName(test) + "'."; }, Debug.assertEachNode); }
-            : ts.noop;
-        Debug.assertNode = Debug.shouldAssert(1 /* Normal */)
-            ? function (node, test, message) { return Debug.assert(test === undefined || test(node), message || "Unexpected node.", function () { return "Node " + ts.formatSyntaxKind(node.kind) + " did not pass test '" + Debug.getFunctionName(test) + "'."; }, Debug.assertNode); }
-            : ts.noop;
-        Debug.assertOptionalNode = Debug.shouldAssert(1 /* Normal */)
-            ? function (node, test, message) { return Debug.assert(test === undefined || node === undefined || test(node), message || "Unexpected node.", function () { return "Node " + ts.formatSyntaxKind(node.kind) + " did not pass test '" + Debug.getFunctionName(test) + "'."; }, Debug.assertOptionalNode); }
-            : ts.noop;
-        Debug.assertOptionalToken = Debug.shouldAssert(1 /* Normal */)
-            ? function (node, kind, message) { return Debug.assert(kind === undefined || node === undefined || node.kind === kind, message || "Unexpected node.", function () { return "Node " + ts.formatSyntaxKind(node.kind) + " was not a '" + ts.formatSyntaxKind(kind) + "' token."; }, Debug.assertOptionalToken); }
-            : ts.noop;
-        Debug.assertMissingNode = Debug.shouldAssert(1 /* Normal */)
-            ? function (node, message) { return Debug.assert(node === undefined, message || "Unexpected node.", function () { return "Node " + ts.formatSyntaxKind(node.kind) + " was unexpected'."; }, Debug.assertMissingNode); }
-            : ts.noop;
-        /**
-         * Injects debug information into frequently used types.
-         */
-        function enableDebugInfo() {
-            if (isDebugInfoEnabled)
-                return;
-            // Add additional properties in debug mode to assist with debugging.
-            Object.defineProperties(ts.objectAllocator.getSymbolConstructor().prototype, {
-                __debugFlags: { get: function () { return ts.formatSymbolFlags(this.flags); } }
-            });
-            Object.defineProperties(ts.objectAllocator.getTypeConstructor().prototype, {
-                __debugFlags: { get: function () { return ts.formatTypeFlags(this.flags); } },
-                __debugObjectFlags: { get: function () { return this.flags & 524288 /* Object */ ? ts.formatObjectFlags(this.objectFlags) : ""; } },
-                __debugTypeToString: { value: function () { return this.checker.typeToString(this); } },
-            });
-            var nodeConstructors = [
-                ts.objectAllocator.getNodeConstructor(),
-                ts.objectAllocator.getIdentifierConstructor(),
-                ts.objectAllocator.getTokenConstructor(),
-                ts.objectAllocator.getSourceFileConstructor()
-            ];
-            for (var _i = 0, nodeConstructors_1 = nodeConstructors; _i < nodeConstructors_1.length; _i++) {
-                var ctor = nodeConstructors_1[_i];
-                if (!ctor.prototype.hasOwnProperty("__debugKind")) {
-                    Object.defineProperties(ctor.prototype, {
-                        __debugKind: { get: function () { return ts.formatSyntaxKind(this.kind); } },
-                        __debugModifierFlags: { get: function () { return ts.formatModifierFlags(ts.getModifierFlagsNoCache(this)); } },
-                        __debugTransformFlags: { get: function () { return ts.formatTransformFlags(this.transformFlags); } },
-                        __debugEmitFlags: { get: function () { return ts.formatEmitFlags(ts.getEmitFlags(this)); } },
-                        __debugGetText: {
-                            value: function (includeTrivia) {
-                                if (ts.nodeIsSynthesized(this))
-                                    return "";
-                                var parseNode = ts.getParseTreeNode(this);
-                                var sourceFile = parseNode && ts.getSourceFileOfNode(parseNode);
-                                return sourceFile ? ts.getSourceTextOfNodeFromSourceFile(sourceFile, parseNode, includeTrivia) : "";
-                            }
-                        }
-                    });
-                }
-            }
-            isDebugInfoEnabled = true;
-        }
-        Debug.enableDebugInfo = enableDebugInfo;
-    })(Debug = ts.Debug || (ts.Debug = {}));
 })(ts || (ts = {}));
 /* @internal */
 var ts;
@@ -65899,7 +68008,6 @@ var ts;
             exit();
         }
         function appendSourceMap(generatedLine, generatedCharacter, map, sourceMapPath, start, end) {
-            var _a;
             ts.Debug.assert(generatedLine >= pendingGeneratedLine, "generatedLine cannot backtrack");
             ts.Debug.assert(generatedCharacter >= 0, "generatedCharacter cannot be negative");
             enter();
@@ -65907,7 +68015,8 @@ var ts;
             var sourceIndexToNewSourceIndexMap = [];
             var nameIndexToNewNameIndexMap;
             var mappingIterator = decodeMappings(map.mappings);
-            for (var _b = mappingIterator.next(), raw = _b.value, done = _b.done; !done; _a = mappingIterator.next(), raw = _a.value, done = _a.done, _a) {
+            for (var iterResult = mappingIterator.next(); !iterResult.done; iterResult = mappingIterator.next()) {
+                var raw = iterResult.value;
                 if (end && (raw.generatedLine > end.line ||
                     (raw.generatedLine === end.line && raw.generatedCharacter > end.character))) {
                     break;
@@ -66430,7 +68539,7 @@ var ts;
     function chainBundle(transformSourceFile) {
         return transformSourceFileOrBundle;
         function transformSourceFileOrBundle(node) {
-            return node.kind === 284 /* SourceFile */ ? transformSourceFile(node) : transformBundle(node);
+            return node.kind === 285 /* SourceFile */ ? transformSourceFile(node) : transformBundle(node);
         }
         function transformBundle(node) {
             return ts.createBundle(ts.map(node.sourceFiles, transformSourceFile), node.prepends);
@@ -66476,7 +68585,7 @@ var ts;
         for (var _i = 0, _a = sourceFile.statements; _i < _a.length; _i++) {
             var node = _a[_i];
             switch (node.kind) {
-                case 249 /* ImportDeclaration */:
+                case 250 /* ImportDeclaration */:
                     // import "mod"
                     // import x from "mod"
                     // import * as x from "mod"
@@ -66484,13 +68593,13 @@ var ts;
                     externalImports.push(node);
                     hasImportStarOrImportDefault = hasImportStarOrImportDefault || getImportNeedsImportStarHelper(node) || getImportNeedsImportDefaultHelper(node);
                     break;
-                case 248 /* ImportEqualsDeclaration */:
-                    if (node.moduleReference.kind === 259 /* ExternalModuleReference */) {
+                case 249 /* ImportEqualsDeclaration */:
+                    if (node.moduleReference.kind === 260 /* ExternalModuleReference */) {
                         // import x = require("mod")
                         externalImports.push(node);
                     }
                     break;
-                case 255 /* ExportDeclaration */:
+                case 256 /* ExportDeclaration */:
                     if (node.moduleSpecifier) {
                         if (!node.exportClause) {
                             // export * from "mod"
@@ -66520,13 +68629,13 @@ var ts;
                         }
                     }
                     break;
-                case 254 /* ExportAssignment */:
+                case 255 /* ExportAssignment */:
                     if (node.isExportEquals && !exportEquals) {
                         // export = x
                         exportEquals = node;
                     }
                     break;
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     if (ts.hasModifier(node, 1 /* Export */)) {
                         for (var _d = 0, _e = node.declarationList.declarations; _d < _e.length; _d++) {
                             var decl = _e[_d];
@@ -66534,7 +68643,7 @@ var ts;
                         }
                     }
                     break;
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     if (ts.hasModifier(node, 1 /* Export */)) {
                         if (ts.hasModifier(node, 512 /* Default */)) {
                             // export default function() { }
@@ -66554,7 +68663,7 @@ var ts;
                         }
                     }
                     break;
-                case 240 /* ClassDeclaration */:
+                case 241 /* ClassDeclaration */:
                     if (ts.hasModifier(node, 1 /* Export */)) {
                         if (ts.hasModifier(node, 512 /* Default */)) {
                             // export default class { }
@@ -66628,6 +68737,43 @@ var ts;
             ts.isIdentifier(expression);
     }
     ts.isSimpleCopiableExpression = isSimpleCopiableExpression;
+    /**
+     * A simple inlinable expression is an expression which can be copied into multiple locations
+     * without risk of repeating any sideeffects and whose value could not possibly change between
+     * any such locations
+     */
+    function isSimpleInlineableExpression(expression) {
+        return !ts.isIdentifier(expression) && isSimpleCopiableExpression(expression) ||
+            ts.isWellKnownSymbolSyntactically(expression);
+    }
+    ts.isSimpleInlineableExpression = isSimpleInlineableExpression;
+    /**
+     * Adds super call and preceding prologue directives into the list of statements.
+     *
+     * @param ctor The constructor node.
+     * @param result The list of statements.
+     * @param visitor The visitor to apply to each node added to the result array.
+     * @returns index of the statement that follows super call
+     */
+    function addPrologueDirectivesAndInitialSuperCall(ctor, result, visitor) {
+        if (ctor.body) {
+            var statements = ctor.body.statements;
+            // add prologue directives to the list (if any)
+            var index = ts.addPrologue(result, statements, /*ensureUseStrict*/ false, visitor);
+            if (index === statements.length) {
+                // list contains nothing but prologue directives (or empty) - exit
+                return index;
+            }
+            var statement = statements[index];
+            if (statement.kind === 222 /* ExpressionStatement */ && ts.isSuperCall(statement.expression)) {
+                result.push(ts.visitNode(statement, visitor, ts.isStatement));
+                return index + 1;
+            }
+            return index;
+        }
+        return 0;
+    }
+    ts.addPrologueDirectivesAndInitialSuperCall = addPrologueDirectivesAndInitialSuperCall;
     /**
      * @param input Template string input strings
      * @param args Names which need to be made file-level unique
@@ -66648,6 +68794,45 @@ var ts;
         };
     }
     ts.helperString = helperString;
+    /**
+     * Gets all property declarations with initializers on either the static or instance side of a class.
+     *
+     * @param node The class node.
+     * @param isStatic A value indicating whether to get properties from the static or instance side of the class.
+     */
+    function getInitializedProperties(node, isStatic) {
+        return ts.filter(node.members, isStatic ? isStaticInitializedProperty : isInstanceInitializedProperty);
+    }
+    ts.getInitializedProperties = getInitializedProperties;
+    /**
+     * Gets a value indicating whether a class element is a static property declaration with an initializer.
+     *
+     * @param member The class element node.
+     */
+    function isStaticInitializedProperty(member) {
+        return isInitializedProperty(member) && ts.hasStaticModifier(member);
+    }
+    ts.isStaticInitializedProperty = isStaticInitializedProperty;
+    /**
+     * Gets a value indicating whether a class element is an instance property declaration with an initializer.
+     *
+     * @param member The class element node.
+     */
+    function isInstanceInitializedProperty(member) {
+        return isInitializedProperty(member) && !ts.hasStaticModifier(member);
+    }
+    ts.isInstanceInitializedProperty = isInstanceInitializedProperty;
+    /**
+     * Gets a value indicating whether a class element is either a static or an instance property declaration with an initializer.
+     *
+     * @param member The class element node.
+     * @param isStatic A value indicating whether the member should be a static or instance member.
+     */
+    function isInitializedProperty(member) {
+        return member.kind === 155 /* PropertyDeclaration */
+            && member.initializer !== undefined;
+    }
+    ts.isInitializedProperty = isInitializedProperty;
 })(ts || (ts = {}));
 /*@internal*/
 var ts;
@@ -67094,7 +69279,7 @@ var ts;
     ts.restHelper = {
         name: "typescript:rest",
         scoped: false,
-        text: "\n            var __rest = (this && this.__rest) || function (s, e) {\n                var t = {};\n                for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)\n                    t[p] = s[p];\n                if (s != null && typeof Object.getOwnPropertySymbols === \"function\")\n                    for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)\n                        t[p[i]] = s[p[i]];\n                return t;\n            };"
+        text: "\n            var __rest = (this && this.__rest) || function (s, e) {\n                var t = {};\n                for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)\n                    t[p] = s[p];\n                if (s != null && typeof Object.getOwnPropertySymbols === \"function\")\n                    for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {\n                        if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))\n                            t[p[i]] = s[p[i]];\n                    }\n                return t;\n            };"
     };
     /** Given value: o, propName: p, pattern: { a, b, ...p } from the original statement
      * `{ a, b, ...p } = o`, create `p = __rest(o, ["a", "b"]);`
@@ -67170,8 +69355,8 @@ var ts;
         context.onEmitNode = onEmitNode;
         context.onSubstituteNode = onSubstituteNode;
         // Enable substitution for property/element access to emit const enum values.
-        context.enableSubstitution(189 /* PropertyAccessExpression */);
-        context.enableSubstitution(190 /* ElementAccessExpression */);
+        context.enableSubstitution(190 /* PropertyAccessExpression */);
+        context.enableSubstitution(191 /* ElementAccessExpression */);
         // These variables contain state that changes as we descend into the tree.
         var currentSourceFile;
         var currentNamespace;
@@ -67179,6 +69364,7 @@ var ts;
         var currentLexicalScope;
         var currentNameScope;
         var currentScopeFirstDeclarationsOfName;
+        var currentClassHasParameterProperties;
         /**
          * Keeps track of whether expression substitution has been enabled for specific edge cases.
          * They are persisted between each SourceFile transformation and should not be reset.
@@ -67194,21 +69380,16 @@ var ts;
          * just-in-time substitution while printing an expression identifier.
          */
         var applicableSubstitutions;
-        /**
-         * Tracks what computed name expressions originating from elided names must be inlined
-         * at the next execution site, in document order
-         */
-        var pendingExpressions;
         return transformSourceFileOrBundle;
         function transformSourceFileOrBundle(node) {
-            if (node.kind === 285 /* Bundle */) {
+            if (node.kind === 286 /* Bundle */) {
                 return transformBundle(node);
             }
             return transformSourceFile(node);
         }
         function transformBundle(node) {
             return ts.createBundle(node.sourceFiles.map(transformSourceFile), ts.mapDefined(node.prepends, function (prepend) {
-                if (prepend.kind === 287 /* InputFiles */) {
+                if (prepend.kind === 288 /* InputFiles */) {
                     return ts.createUnparsedSourceFile(prepend, "js");
                 }
                 return prepend;
@@ -67239,6 +69420,7 @@ var ts;
             var savedCurrentScope = currentLexicalScope;
             var savedCurrentNameScope = currentNameScope;
             var savedCurrentScopeFirstDeclarationsOfName = currentScopeFirstDeclarationsOfName;
+            var savedCurrentClassHasParameterProperties = currentClassHasParameterProperties;
             // Handle state changes before visiting a node.
             onBeforeVisitNode(node);
             var visited = f(node);
@@ -67248,6 +69430,7 @@ var ts;
             }
             currentLexicalScope = savedCurrentScope;
             currentNameScope = savedCurrentNameScope;
+            currentClassHasParameterProperties = savedCurrentClassHasParameterProperties;
             return visited;
         }
         /**
@@ -67257,16 +69440,16 @@ var ts;
          */
         function onBeforeVisitNode(node) {
             switch (node.kind) {
-                case 284 /* SourceFile */:
-                case 246 /* CaseBlock */:
-                case 245 /* ModuleBlock */:
-                case 218 /* Block */:
+                case 285 /* SourceFile */:
+                case 247 /* CaseBlock */:
+                case 246 /* ModuleBlock */:
+                case 219 /* Block */:
                     currentLexicalScope = node;
                     currentNameScope = undefined;
                     currentScopeFirstDeclarationsOfName = undefined;
                     break;
-                case 240 /* ClassDeclaration */:
-                case 239 /* FunctionDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     if (ts.hasModifier(node, 2 /* Ambient */)) {
                         break;
                     }
@@ -67278,7 +69461,7 @@ var ts;
                         // These nodes should always have names unless they are default-exports;
                         // however, class declaration parsing allows for undefined names, so syntactically invalid
                         // programs may also have an undefined name.
-                        ts.Debug.assert(node.kind === 240 /* ClassDeclaration */ || ts.hasModifier(node, 512 /* Default */));
+                        ts.Debug.assert(node.kind === 241 /* ClassDeclaration */ || ts.hasModifier(node, 512 /* Default */));
                     }
                     if (ts.isClassDeclaration(node)) {
                         // XXX: should probably also cover interfaces and type aliases that can have type variables?
@@ -67321,10 +69504,10 @@ var ts;
          */
         function sourceElementVisitorWorker(node) {
             switch (node.kind) {
-                case 249 /* ImportDeclaration */:
-                case 248 /* ImportEqualsDeclaration */:
-                case 254 /* ExportAssignment */:
-                case 255 /* ExportDeclaration */:
+                case 250 /* ImportDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
+                case 255 /* ExportAssignment */:
+                case 256 /* ExportDeclaration */:
                     return visitEllidableStatement(node);
                 default:
                     return visitorWorker(node);
@@ -67345,13 +69528,13 @@ var ts;
                 return node;
             }
             switch (node.kind) {
-                case 249 /* ImportDeclaration */:
+                case 250 /* ImportDeclaration */:
                     return visitImportDeclaration(node);
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return visitImportEqualsDeclaration(node);
-                case 254 /* ExportAssignment */:
+                case 255 /* ExportAssignment */:
                     return visitExportAssignment(node);
-                case 255 /* ExportDeclaration */:
+                case 256 /* ExportDeclaration */:
                     return visitExportDeclaration(node);
                 default:
                     ts.Debug.fail("Unhandled ellided statement");
@@ -67371,11 +69554,11 @@ var ts;
          * @param node The node to visit.
          */
         function namespaceElementVisitorWorker(node) {
-            if (node.kind === 255 /* ExportDeclaration */ ||
-                node.kind === 249 /* ImportDeclaration */ ||
-                node.kind === 250 /* ImportClause */ ||
-                (node.kind === 248 /* ImportEqualsDeclaration */ &&
-                    node.moduleReference.kind === 259 /* ExternalModuleReference */)) {
+            if (node.kind === 256 /* ExportDeclaration */ ||
+                node.kind === 250 /* ImportDeclaration */ ||
+                node.kind === 251 /* ImportClause */ ||
+                (node.kind === 249 /* ImportEqualsDeclaration */ &&
+                    node.moduleReference.kind === 260 /* ExternalModuleReference */)) {
                 // do not emit ES6 imports and exports since they are illegal inside a namespace
                 return undefined;
             }
@@ -67399,19 +69582,19 @@ var ts;
          */
         function classElementVisitorWorker(node) {
             switch (node.kind) {
-                case 157 /* Constructor */:
-                    // TypeScript constructors are transformed in `visitClassDeclaration`.
-                    // We elide them here as `visitorWorker` checks transform flags, which could
-                    // erronously include an ES6 constructor without TypeScript syntax.
-                    return undefined;
-                case 154 /* PropertyDeclaration */:
-                case 162 /* IndexSignature */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
-                case 156 /* MethodDeclaration */:
+                case 158 /* Constructor */:
+                    return visitConstructor(node);
+                case 155 /* PropertyDeclaration */:
+                    // Property declarations are not TypeScript syntax, but they must be visited
+                    // for the decorator transformation.
+                    return visitPropertyDeclaration(node);
+                case 163 /* IndexSignature */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
+                case 157 /* MethodDeclaration */:
                     // Fallback to the default visit behavior.
                     return visitorWorker(node);
-                case 217 /* SemicolonClassElement */:
+                case 218 /* SemicolonClassElement */:
                     return node;
                 default:
                     return ts.Debug.failBadSyntaxKind(node);
@@ -67421,7 +69604,7 @@ var ts;
             if (ts.modifierToFlag(node.kind) & 2270 /* TypeScriptModifier */) {
                 return undefined;
             }
-            else if (currentNamespace && node.kind === 85 /* ExportKeyword */) {
+            else if (currentNamespace && node.kind === 86 /* ExportKeyword */) {
                 return undefined;
             }
             return node;
@@ -67438,117 +69621,115 @@ var ts;
                 return ts.createNotEmittedStatement(node);
             }
             switch (node.kind) {
-                case 85 /* ExportKeyword */:
-                case 80 /* DefaultKeyword */:
+                case 86 /* ExportKeyword */:
+                case 81 /* DefaultKeyword */:
                     // ES6 export and default modifiers are elided when inside a namespace.
                     return currentNamespace ? undefined : node;
-                case 115 /* PublicKeyword */:
-                case 113 /* PrivateKeyword */:
-                case 114 /* ProtectedKeyword */:
-                case 118 /* AbstractKeyword */:
-                case 77 /* ConstKeyword */:
-                case 125 /* DeclareKeyword */:
-                case 133 /* ReadonlyKeyword */:
+                case 116 /* PublicKeyword */:
+                case 114 /* PrivateKeyword */:
+                case 115 /* ProtectedKeyword */:
+                case 119 /* AbstractKeyword */:
+                case 78 /* ConstKeyword */:
+                case 126 /* DeclareKeyword */:
+                case 134 /* ReadonlyKeyword */:
                 // TypeScript accessibility and readonly modifiers are elided.
-                case 169 /* ArrayType */:
-                case 170 /* TupleType */:
-                case 171 /* OptionalType */:
-                case 172 /* RestType */:
-                case 168 /* TypeLiteral */:
-                case 163 /* TypePredicate */:
-                case 150 /* TypeParameter */:
-                case 120 /* AnyKeyword */:
-                case 143 /* UnknownKeyword */:
-                case 123 /* BooleanKeyword */:
-                case 138 /* StringKeyword */:
-                case 135 /* NumberKeyword */:
-                case 132 /* NeverKeyword */:
-                case 106 /* VoidKeyword */:
-                case 139 /* SymbolKeyword */:
-                case 166 /* ConstructorType */:
-                case 165 /* FunctionType */:
-                case 167 /* TypeQuery */:
-                case 164 /* TypeReference */:
-                case 173 /* UnionType */:
-                case 174 /* IntersectionType */:
-                case 175 /* ConditionalType */:
-                case 177 /* ParenthesizedType */:
-                case 178 /* ThisType */:
-                case 179 /* TypeOperator */:
-                case 180 /* IndexedAccessType */:
-                case 181 /* MappedType */:
-                case 182 /* LiteralType */:
+                case 170 /* ArrayType */:
+                case 171 /* TupleType */:
+                case 172 /* OptionalType */:
+                case 173 /* RestType */:
+                case 169 /* TypeLiteral */:
+                case 164 /* TypePredicate */:
+                case 151 /* TypeParameter */:
+                case 121 /* AnyKeyword */:
+                case 144 /* UnknownKeyword */:
+                case 124 /* BooleanKeyword */:
+                case 139 /* StringKeyword */:
+                case 136 /* NumberKeyword */:
+                case 133 /* NeverKeyword */:
+                case 107 /* VoidKeyword */:
+                case 140 /* SymbolKeyword */:
+                case 167 /* ConstructorType */:
+                case 166 /* FunctionType */:
+                case 168 /* TypeQuery */:
+                case 165 /* TypeReference */:
+                case 174 /* UnionType */:
+                case 175 /* IntersectionType */:
+                case 176 /* ConditionalType */:
+                case 178 /* ParenthesizedType */:
+                case 179 /* ThisType */:
+                case 180 /* TypeOperator */:
+                case 181 /* IndexedAccessType */:
+                case 182 /* MappedType */:
+                case 183 /* LiteralType */:
                 // TypeScript type nodes are elided.
-                case 162 /* IndexSignature */:
+                case 163 /* IndexSignature */:
                 // TypeScript index signatures are elided.
-                case 152 /* Decorator */:
+                case 153 /* Decorator */:
                 // TypeScript decorators are elided. They will be emitted as part of visitClassDeclaration.
-                case 242 /* TypeAliasDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
                     // TypeScript type-only declarations are elided.
                     return undefined;
-                case 154 /* PropertyDeclaration */:
+                case 155 /* PropertyDeclaration */:
                     // TypeScript property declarations are elided. However their names are still visited, and can potentially be retained if they could have sideeffects
                     return visitPropertyDeclaration(node);
-                case 247 /* NamespaceExportDeclaration */:
+                case 248 /* NamespaceExportDeclaration */:
                     // TypeScript namespace export declarations are elided.
                     return undefined;
-                case 157 /* Constructor */:
+                case 158 /* Constructor */:
                     return visitConstructor(node);
-                case 241 /* InterfaceDeclaration */:
+                case 242 /* InterfaceDeclaration */:
                     // TypeScript interfaces are elided, but some comments may be preserved.
                     // See the implementation of `getLeadingComments` in comments.ts for more details.
                     return ts.createNotEmittedStatement(node);
-                case 240 /* ClassDeclaration */:
+                case 241 /* ClassDeclaration */:
                     // This may be a class declaration with TypeScript syntax extensions.
                     //
                     // TypeScript class syntax extensions include:
                     // - decorators
                     // - optional `implements` heritage clause
                     // - parameter property assignments in the constructor
-                    // - property declarations
                     // - index signatures
                     // - method overload signatures
                     return visitClassDeclaration(node);
-                case 209 /* ClassExpression */:
+                case 210 /* ClassExpression */:
                     // This may be a class expression with TypeScript syntax extensions.
                     //
                     // TypeScript class syntax extensions include:
                     // - decorators
                     // - optional `implements` heritage clause
                     // - parameter property assignments in the constructor
-                    // - property declarations
                     // - index signatures
                     // - method overload signatures
                     return visitClassExpression(node);
-                case 273 /* HeritageClause */:
+                case 274 /* HeritageClause */:
                     // This may be a heritage clause with TypeScript syntax extensions.
                     //
                     // TypeScript heritage clause extensions include:
                     // - `implements` clause
                     return visitHeritageClause(node);
-                case 211 /* ExpressionWithTypeArguments */:
+                case 212 /* ExpressionWithTypeArguments */:
                     // TypeScript supports type arguments on an expression in an `extends` heritage clause.
                     return visitExpressionWithTypeArguments(node);
-                case 156 /* MethodDeclaration */:
+                case 157 /* MethodDeclaration */:
                     // TypeScript method declarations may have decorators, modifiers
                     // or type annotations.
                     return visitMethodDeclaration(node);
-                case 158 /* GetAccessor */:
+                case 159 /* GetAccessor */:
                     // Get Accessors can have TypeScript modifiers, decorators, and type annotations.
                     return visitGetAccessor(node);
-                case 159 /* SetAccessor */:
+                case 160 /* SetAccessor */:
                     // Set Accessors can have TypeScript modifiers and type annotations.
                     return visitSetAccessor(node);
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     // Typescript function declarations can have modifiers, decorators, and type annotations.
                     return visitFunctionDeclaration(node);
-                case 196 /* FunctionExpression */:
+                case 197 /* FunctionExpression */:
                     // TypeScript function expressions can have modifiers and type annotations.
                     return visitFunctionExpression(node);
-                case 197 /* ArrowFunction */:
+                case 198 /* ArrowFunction */:
                     // TypeScript arrow functions can have modifiers and type annotations.
                     return visitArrowFunction(node);
-                case 151 /* Parameter */:
+                case 152 /* Parameter */:
                     // This may be a parameter declaration with TypeScript syntax extensions.
                     //
                     // TypeScript parameter declaration syntax extensions include:
@@ -67558,35 +69739,35 @@ var ts;
                     // - type annotations
                     // - this parameters
                     return visitParameter(node);
-                case 195 /* ParenthesizedExpression */:
+                case 196 /* ParenthesizedExpression */:
                     // ParenthesizedExpressions are TypeScript if their expression is a
                     // TypeAssertion or AsExpression
                     return visitParenthesizedExpression(node);
-                case 194 /* TypeAssertionExpression */:
-                case 212 /* AsExpression */:
+                case 195 /* TypeAssertionExpression */:
+                case 213 /* AsExpression */:
                     // TypeScript type assertions are removed, but their subtrees are preserved.
                     return visitAssertionExpression(node);
-                case 191 /* CallExpression */:
+                case 192 /* CallExpression */:
                     return visitCallExpression(node);
-                case 192 /* NewExpression */:
+                case 193 /* NewExpression */:
                     return visitNewExpression(node);
-                case 193 /* TaggedTemplateExpression */:
+                case 194 /* TaggedTemplateExpression */:
                     return visitTaggedTemplateExpression(node);
-                case 213 /* NonNullExpression */:
+                case 214 /* NonNullExpression */:
                     // TypeScript non-null expressions are removed, but their subtrees are preserved.
                     return visitNonNullExpression(node);
-                case 243 /* EnumDeclaration */:
+                case 244 /* EnumDeclaration */:
                     // TypeScript enum declarations do not exist in ES6 and must be rewritten.
                     return visitEnumDeclaration(node);
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     // TypeScript namespace exports for variable statements must be transformed.
                     return visitVariableStatement(node);
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     return visitVariableDeclaration(node);
-                case 244 /* ModuleDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     // TypeScript namespace declarations must be transformed.
                     return visitModuleDeclaration(node);
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     // TypeScript namespace or external module import.
                     return visitImportEqualsDeclaration(node);
                 default:
@@ -67624,7 +69805,7 @@ var ts;
             if (ts.some(staticProperties))
                 facts |= 1 /* HasStaticInitializedProperties */;
             var extendsClauseElement = ts.getEffectiveBaseTypeNode(node);
-            if (extendsClauseElement && ts.skipOuterExpressions(extendsClauseElement.expression).kind !== 96 /* NullKeyword */)
+            if (extendsClauseElement && ts.skipOuterExpressions(extendsClauseElement.expression).kind !== 97 /* NullKeyword */)
                 facts |= 64 /* IsDerivedClass */;
             if (shouldEmitDecorateCallForClass(node))
                 facts |= 2 /* HasConstructorDecorators */;
@@ -67653,31 +69834,16 @@ var ts;
             if (!isClassLikeDeclarationWithTypeScriptSyntax(node) && !(currentNamespace && ts.hasModifier(node, 1 /* Export */))) {
                 return ts.visitEachChild(node, visitor, context);
             }
-            var savedPendingExpressions = pendingExpressions;
-            pendingExpressions = undefined;
-            var staticProperties = getInitializedProperties(node, /*isStatic*/ true);
+            var staticProperties = ts.getInitializedProperties(node, /*isStatic*/ true);
             var facts = getClassFacts(node, staticProperties);
             if (facts & 128 /* UseImmediatelyInvokedFunctionExpression */) {
                 context.startLexicalEnvironment();
             }
             var name = node.name || (facts & 5 /* NeedsName */ ? ts.getGeneratedNameForNode(node) : undefined);
             var classStatement = facts & 2 /* HasConstructorDecorators */
-                ? createClassDeclarationHeadWithDecorators(node, name, facts)
+                ? createClassDeclarationHeadWithDecorators(node, name)
                 : createClassDeclarationHeadWithoutDecorators(node, name, facts);
             var statements = [classStatement];
-            // Write any pending expressions from elided or moved computed property names
-            if (ts.some(pendingExpressions)) {
-                statements.push(ts.createExpressionStatement(ts.inlineExpressions(pendingExpressions)));
-            }
-            pendingExpressions = savedPendingExpressions;
-            // Emit static property assignment. Because classDeclaration is lexically evaluated,
-            // it is safe to emit static property assignment after classDeclaration
-            // From ES6 specification:
-            //      HasLexicalDeclaration (N) : Determines if the argument identifier has a binding in this environment record that was created using
-            //                                  a lexical declaration such as a LexicalDeclaration or a ClassDeclaration.
-            if (facts & 1 /* HasStaticInitializedProperties */) {
-                addInitializedPropertyStatements(statements, staticProperties, facts & 128 /* UseImmediatelyInvokedFunctionExpression */ ? ts.getInternalName(node) : ts.getLocalName(node));
-            }
             // Write any decorators of the node.
             addClassElementDecorationStatements(statements, node, /*isStatic*/ false);
             addClassElementDecorationStatements(statements, node, /*isStatic*/ true);
@@ -67757,13 +69923,14 @@ var ts;
                 : undefined;
             var classDeclaration = ts.createClassDeclaration(
             /*decorators*/ undefined, modifiers, name, 
-            /*typeParameters*/ undefined, ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), transformClassMembers(node, (facts & 64 /* IsDerivedClass */) !== 0));
+            /*typeParameters*/ undefined, ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), transformClassMembers(node));
             // To better align with the old emitter, we should not emit a trailing source map
             // entry if the class has static properties.
             var emitFlags = ts.getEmitFlags(node);
             if (facts & 1 /* HasStaticInitializedProperties */) {
                 emitFlags |= 32 /* NoTrailingSourceMap */;
             }
+            ts.aggregateTransformFlags(classDeclaration);
             ts.setTextRange(classDeclaration, node);
             ts.setOriginalNode(classDeclaration, node);
             ts.setEmitFlags(classDeclaration, emitFlags);
@@ -67773,7 +69940,7 @@ var ts;
          * Transforms a decorated class declaration and appends the resulting statements. If
          * the class requires an alias to avoid issues with double-binding, the alias is returned.
          */
-        function createClassDeclarationHeadWithDecorators(node, name, facts) {
+        function createClassDeclarationHeadWithDecorators(node, name) {
             // When we emit an ES6 class that has a class decorator, we must tailor the
             // emit to certain specific cases.
             //
@@ -67866,8 +70033,9 @@ var ts;
             //      ${members}
             //  }
             var heritageClauses = ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause);
-            var members = transformClassMembers(node, (facts & 64 /* IsDerivedClass */) !== 0);
+            var members = transformClassMembers(node);
             var classExpression = ts.createClassExpression(/*modifiers*/ undefined, name, /*typeParameters*/ undefined, heritageClauses, members);
+            ts.aggregateTransformFlags(classExpression);
             ts.setOriginalNode(classExpression, node);
             ts.setTextRange(classExpression, location);
             //  let ${name} = ${classExpression} where name is either declaredName if the class doesn't contain self-reference
@@ -67886,311 +70054,40 @@ var ts;
             if (!isClassLikeDeclarationWithTypeScriptSyntax(node)) {
                 return ts.visitEachChild(node, visitor, context);
             }
-            var savedPendingExpressions = pendingExpressions;
-            pendingExpressions = undefined;
-            var staticProperties = getInitializedProperties(node, /*isStatic*/ true);
-            var heritageClauses = ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause);
-            var members = transformClassMembers(node, ts.some(heritageClauses, function (c) { return c.token === 86 /* ExtendsKeyword */; }));
             var classExpression = ts.createClassExpression(
             /*modifiers*/ undefined, node.name, 
-            /*typeParameters*/ undefined, heritageClauses, members);
+            /*typeParameters*/ undefined, ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), transformClassMembers(node));
+            ts.aggregateTransformFlags(classExpression);
             ts.setOriginalNode(classExpression, node);
             ts.setTextRange(classExpression, node);
-            if (ts.some(staticProperties) || ts.some(pendingExpressions)) {
-                var expressions = [];
-                var isClassWithConstructorReference = resolver.getNodeCheckFlags(node) & 16777216 /* ClassWithConstructorReference */;
-                var temp = ts.createTempVariable(hoistVariableDeclaration, !!isClassWithConstructorReference);
-                if (isClassWithConstructorReference) {
-                    // record an alias as the class name is not in scope for statics.
-                    enableSubstitutionForClassAliases();
-                    var alias = ts.getSynthesizedClone(temp);
-                    alias.autoGenerateFlags &= ~8 /* ReservedInNestedScopes */;
-                    classAliases[ts.getOriginalNodeId(node)] = alias;
-                }
-                // To preserve the behavior of the old emitter, we explicitly indent
-                // the body of a class with static initializers.
-                ts.setEmitFlags(classExpression, 65536 /* Indented */ | ts.getEmitFlags(classExpression));
-                expressions.push(ts.startOnNewLine(ts.createAssignment(temp, classExpression)));
-                // Add any pending expressions leftover from elided or relocated computed property names
-                ts.addRange(expressions, ts.map(pendingExpressions, ts.startOnNewLine));
-                pendingExpressions = savedPendingExpressions;
-                ts.addRange(expressions, generateInitializedPropertyExpressions(staticProperties, temp));
-                expressions.push(ts.startOnNewLine(temp));
-                return ts.inlineExpressions(expressions);
-            }
-            pendingExpressions = savedPendingExpressions;
             return classExpression;
         }
         /**
          * Transforms the members of a class.
          *
          * @param node The current class.
-         * @param isDerivedClass A value indicating whether the class has an extends clause that does not extend 'null'.
          */
-        function transformClassMembers(node, isDerivedClass) {
+        function transformClassMembers(node) {
             var members = [];
-            var constructor = transformConstructor(node, isDerivedClass);
-            if (constructor) {
-                members.push(constructor);
+            var constructor = ts.getFirstConstructorWithBody(node);
+            var parametersWithPropertyAssignments = constructor &&
+                ts.filter(constructor.parameters, ts.isParameterPropertyDeclaration);
+            if (parametersWithPropertyAssignments) {
+                for (var _i = 0, parametersWithPropertyAssignments_1 = parametersWithPropertyAssignments; _i < parametersWithPropertyAssignments_1.length; _i++) {
+                    var parameter = parametersWithPropertyAssignments_1[_i];
+                    if (ts.isIdentifier(parameter.name)) {
+                        members.push(ts.aggregateTransformFlags(ts.createProperty(
+                        /*decorators*/ undefined, 
+                        /*modifiers*/ undefined, parameter.name, 
+                        /*questionOrExclamationToken*/ undefined, 
+                        /*type*/ undefined, 
+                        /*initializer*/ undefined)));
+                    }
+                }
             }
             ts.addRange(members, ts.visitNodes(node.members, classElementVisitor, ts.isClassElement));
             return ts.setTextRange(ts.createNodeArray(members), /*location*/ node.members);
         }
-        /**
-         * Transforms (or creates) a constructor for a class.
-         *
-         * @param node The current class.
-         * @param isDerivedClass A value indicating whether the class has an extends clause that does not extend 'null'.
-         */
-        function transformConstructor(node, isDerivedClass) {
-            // Check if we have property assignment inside class declaration.
-            // If there is a property assignment, we need to emit constructor whether users define it or not
-            // If there is no property assignment, we can omit constructor if users do not define it
-            var constructor = ts.getFirstConstructorWithBody(node);
-            var hasInstancePropertyWithInitializer = ts.forEach(node.members, isInstanceInitializedProperty);
-            var hasParameterPropertyAssignments = constructor &&
-                constructor.transformFlags & 1024 /* ContainsTypeScriptClassSyntax */ &&
-                ts.forEach(constructor.parameters, isParameterWithPropertyAssignment);
-            // If the class does not contain nodes that require a synthesized constructor,
-            // accept the current constructor if it exists.
-            if (!hasInstancePropertyWithInitializer && !hasParameterPropertyAssignments) {
-                return ts.visitEachChild(constructor, visitor, context);
-            }
-            var parameters = transformConstructorParameters(constructor);
-            var body = transformConstructorBody(node, constructor, isDerivedClass);
-            //  constructor(${parameters}) {
-            //      ${body}
-            //  }
-            return ts.startOnNewLine(ts.setOriginalNode(ts.setTextRange(ts.createConstructor(
-            /*decorators*/ undefined, 
-            /*modifiers*/ undefined, parameters, body), constructor || node), constructor));
-        }
-        /**
-         * Transforms (or creates) the parameters for the constructor of a class with
-         * parameter property assignments or instance property initializers.
-         *
-         * @param constructor The constructor declaration.
-         */
-        function transformConstructorParameters(constructor) {
-            // The ES2015 spec specifies in 14.5.14. Runtime Semantics: ClassDefinitionEvaluation:
-            // If constructor is empty, then
-            //     If ClassHeritag_eopt is present and protoParent is not null, then
-            //          Let constructor be the result of parsing the source text
-            //              constructor(...args) { super (...args);}
-            //          using the syntactic grammar with the goal symbol MethodDefinition[~Yield].
-            //      Else,
-            //           Let constructor be the result of parsing the source text
-            //               constructor( ){ }
-            //           using the syntactic grammar with the goal symbol MethodDefinition[~Yield].
-            //
-            // While we could emit the '...args' rest parameter, certain later tools in the pipeline might
-            // downlevel the '...args' portion less efficiently by naively copying the contents of 'arguments' to an array.
-            // Instead, we'll avoid using a rest parameter and spread into the super call as
-            // 'super(...arguments)' instead of 'super(...args)', as you can see in "transformConstructorBody".
-            return ts.visitParameterList(constructor && constructor.parameters, visitor, context)
-                || [];
-        }
-        /**
-         * Transforms (or creates) a constructor body for a class with parameter property
-         * assignments or instance property initializers.
-         *
-         * @param node The current class.
-         * @param constructor The current class constructor.
-         * @param isDerivedClass A value indicating whether the class has an extends clause that does not extend 'null'.
-         */
-        function transformConstructorBody(node, constructor, isDerivedClass) {
-            var statements = [];
-            var indexOfFirstStatement = 0;
-            resumeLexicalEnvironment();
-            if (constructor) {
-                indexOfFirstStatement = addPrologueDirectivesAndInitialSuperCall(constructor, statements);
-                // Add parameters with property assignments. Transforms this:
-                //
-                //  constructor (public x, public y) {
-                //  }
-                //
-                // Into this:
-                //
-                //  constructor (x, y) {
-                //      this.x = x;
-                //      this.y = y;
-                //  }
-                //
-                var propertyAssignments = getParametersWithPropertyAssignments(constructor);
-                ts.addRange(statements, ts.map(propertyAssignments, transformParameterWithPropertyAssignment));
-            }
-            else if (isDerivedClass) {
-                // Add a synthetic `super` call:
-                //
-                //  super(...arguments);
-                //
-                statements.push(ts.createExpressionStatement(ts.createCall(ts.createSuper(), 
-                /*typeArguments*/ undefined, [ts.createSpread(ts.createIdentifier("arguments"))])));
-            }
-            // Add the property initializers. Transforms this:
-            //
-            //  public x = 1;
-            //
-            // Into this:
-            //
-            //  constructor() {
-            //      this.x = 1;
-            //  }
-            //
-            var properties = getInitializedProperties(node, /*isStatic*/ false);
-            addInitializedPropertyStatements(statements, properties, ts.createThis());
-            if (constructor) {
-                // The class already had a constructor, so we should add the existing statements, skipping the initial super call.
-                ts.addRange(statements, ts.visitNodes(constructor.body.statements, visitor, ts.isStatement, indexOfFirstStatement));
-            }
-            // End the lexical environment.
-            statements = ts.mergeLexicalEnvironment(statements, endLexicalEnvironment());
-            return ts.setTextRange(ts.createBlock(ts.setTextRange(ts.createNodeArray(statements), 
-            /*location*/ constructor ? constructor.body.statements : node.members), 
-            /*multiLine*/ true), 
-            /*location*/ constructor ? constructor.body : undefined);
-        }
-        /**
-         * Adds super call and preceding prologue directives into the list of statements.
-         *
-         * @param ctor The constructor node.
-         * @returns index of the statement that follows super call
-         */
-        function addPrologueDirectivesAndInitialSuperCall(ctor, result) {
-            if (ctor.body) {
-                var statements = ctor.body.statements;
-                // add prologue directives to the list (if any)
-                var index = ts.addPrologue(result, statements, /*ensureUseStrict*/ false, visitor);
-                if (index === statements.length) {
-                    // list contains nothing but prologue directives (or empty) - exit
-                    return index;
-                }
-                var statement = statements[index];
-                if (statement.kind === 221 /* ExpressionStatement */ && ts.isSuperCall(statement.expression)) {
-                    result.push(ts.visitNode(statement, visitor, ts.isStatement));
-                    return index + 1;
-                }
-                return index;
-            }
-            return 0;
-        }
-        /**
-         * Gets all parameters of a constructor that should be transformed into property assignments.
-         *
-         * @param node The constructor node.
-         */
-        function getParametersWithPropertyAssignments(node) {
-            return ts.filter(node.parameters, isParameterWithPropertyAssignment);
-        }
-        /**
-         * Determines whether a parameter should be transformed into a property assignment.
-         *
-         * @param parameter The parameter node.
-         */
-        function isParameterWithPropertyAssignment(parameter) {
-            return ts.hasModifier(parameter, 92 /* ParameterPropertyModifier */)
-                && ts.isIdentifier(parameter.name);
-        }
-        /**
-         * Transforms a parameter into a property assignment statement.
-         *
-         * @param node The parameter declaration.
-         */
-        function transformParameterWithPropertyAssignment(node) {
-            ts.Debug.assert(ts.isIdentifier(node.name));
-            var name = node.name;
-            var propertyName = ts.getMutableClone(name);
-            ts.setEmitFlags(propertyName, 1536 /* NoComments */ | 48 /* NoSourceMap */);
-            var localName = ts.getMutableClone(name);
-            ts.setEmitFlags(localName, 1536 /* NoComments */);
-            return ts.startOnNewLine(ts.setEmitFlags(ts.setTextRange(ts.createExpressionStatement(ts.createAssignment(ts.setTextRange(ts.createPropertyAccess(ts.createThis(), propertyName), node.name), localName)), ts.moveRangePos(node, -1)), 1536 /* NoComments */));
-        }
-        /**
-         * Gets all property declarations with initializers on either the static or instance side of a class.
-         *
-         * @param node The class node.
-         * @param isStatic A value indicating whether to get properties from the static or instance side of the class.
-         */
-        function getInitializedProperties(node, isStatic) {
-            return ts.filter(node.members, isStatic ? isStaticInitializedProperty : isInstanceInitializedProperty);
-        }
-        /**
-         * Gets a value indicating whether a class element is a static property declaration with an initializer.
-         *
-         * @param member The class element node.
-         */
-        function isStaticInitializedProperty(member) {
-            return isInitializedProperty(member, /*isStatic*/ true);
-        }
-        /**
-         * Gets a value indicating whether a class element is an instance property declaration with an initializer.
-         *
-         * @param member The class element node.
-         */
-        function isInstanceInitializedProperty(member) {
-            return isInitializedProperty(member, /*isStatic*/ false);
-        }
-        /**
-         * Gets a value indicating whether a class element is either a static or an instance property declaration with an initializer.
-         *
-         * @param member The class element node.
-         * @param isStatic A value indicating whether the member should be a static or instance member.
-         */
-        function isInitializedProperty(member, isStatic) {
-            return member.kind === 154 /* PropertyDeclaration */
-                && isStatic === ts.hasModifier(member, 32 /* Static */)
-                && member.initializer !== undefined;
-        }
-        /**
-         * Generates assignment statements for property initializers.
-         *
-         * @param properties An array of property declarations to transform.
-         * @param receiver The receiver on which each property should be assigned.
-         */
-        function addInitializedPropertyStatements(statements, properties, receiver) {
-            for (var _i = 0, properties_9 = properties; _i < properties_9.length; _i++) {
-                var property = properties_9[_i];
-                var statement = ts.createExpressionStatement(transformInitializedProperty(property, receiver));
-                ts.setSourceMapRange(statement, ts.moveRangePastModifiers(property));
-                ts.setCommentRange(statement, property);
-                ts.setOriginalNode(statement, property);
-                statements.push(statement);
-            }
-        }
-        /**
-         * Generates assignment expressions for property initializers.
-         *
-         * @param properties An array of property declarations to transform.
-         * @param receiver The receiver on which each property should be assigned.
-         */
-        function generateInitializedPropertyExpressions(properties, receiver) {
-            var expressions = [];
-            for (var _i = 0, properties_10 = properties; _i < properties_10.length; _i++) {
-                var property = properties_10[_i];
-                var expression = transformInitializedProperty(property, receiver);
-                ts.startOnNewLine(expression);
-                ts.setSourceMapRange(expression, ts.moveRangePastModifiers(property));
-                ts.setCommentRange(expression, property);
-                ts.setOriginalNode(expression, property);
-                expressions.push(expression);
-            }
-            return expressions;
-        }
-        /**
-         * Transforms a property initializer into an assignment statement.
-         *
-         * @param property The property declaration.
-         * @param receiver The object receiving the property assignment.
-         */
-        function transformInitializedProperty(property, receiver) {
-            // We generate a name here in order to reuse the value cached by the relocated computed name expression (which uses the same generated name)
-            var propertyName = ts.isComputedPropertyName(property.name) && !isSimpleInlineableExpression(property.name.expression)
-                ? ts.updateComputedPropertyName(property.name, ts.getGeneratedNameForNode(property.name))
-                : property.name;
-            var initializer = ts.visitNode(property.initializer, visitor, ts.isExpression);
-            var memberAccess = ts.createMemberAccessForPropertyName(receiver, propertyName, /*location*/ propertyName);
-            return ts.createAssignment(memberAccess, initializer);
-        }
         /**
          * Gets either the static or instance members of a class that are decorated, or have
          * parameters that are decorated.
@@ -68240,11 +70137,14 @@ var ts;
             var decorators;
             if (node) {
                 var parameters = node.parameters;
-                for (var i = 0; i < parameters.length; i++) {
-                    var parameter = parameters[i];
+                var firstParameterIsThis = parameters.length > 0 && ts.parameterIsThisKeyword(parameters[0]);
+                var firstParameterOffset = firstParameterIsThis ? 1 : 0;
+                var numParameters = firstParameterIsThis ? parameters.length - 1 : parameters.length;
+                for (var i = 0; i < numParameters; i++) {
+                    var parameter = parameters[i + firstParameterOffset];
                     if (decorators || parameter.decorators) {
                         if (!decorators) {
-                            decorators = new Array(parameters.length);
+                            decorators = new Array(numParameters);
                         }
                         decorators[i] = parameter.decorators;
                     }
@@ -68277,12 +70177,12 @@ var ts;
          */
         function getAllDecoratorsOfClassElement(node, member) {
             switch (member.kind) {
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     return getAllDecoratorsOfAccessors(node, member);
-                case 156 /* MethodDeclaration */:
+                case 157 /* MethodDeclaration */:
                     return getAllDecoratorsOfMethod(member);
-                case 154 /* PropertyDeclaration */:
+                case 155 /* PropertyDeclaration */:
                     return getAllDecoratorsOfProperty(member);
                 default:
                     return undefined;
@@ -68435,7 +70335,7 @@ var ts;
             var prefix = getClassMemberPrefix(node, member);
             var memberName = getExpressionForPropertyName(member, /*generateNameForComputedPropertyName*/ true);
             var descriptor = languageVersion > 0 /* ES3 */
-                ? member.kind === 154 /* PropertyDeclaration */
+                ? member.kind === 155 /* PropertyDeclaration */
                     // We emit `void 0` here to indicate to `__decorate` that it can invoke `Object.defineProperty` directly, but that it
                     // should not invoke `Object.getOwnPropertyDescriptor`.
                     ? ts.createVoidZero()
@@ -68558,10 +70458,10 @@ var ts;
          */
         function shouldAddTypeMetadata(node) {
             var kind = node.kind;
-            return kind === 156 /* MethodDeclaration */
-                || kind === 158 /* GetAccessor */
-                || kind === 159 /* SetAccessor */
-                || kind === 154 /* PropertyDeclaration */;
+            return kind === 157 /* MethodDeclaration */
+                || kind === 159 /* GetAccessor */
+                || kind === 160 /* SetAccessor */
+                || kind === 155 /* PropertyDeclaration */;
         }
         /**
          * Determines whether to emit the "design:returntype" metadata based on the node's kind.
@@ -68571,7 +70471,7 @@ var ts;
          * @param node The node to test.
          */
         function shouldAddReturnTypeMetadata(node) {
-            return node.kind === 156 /* MethodDeclaration */;
+            return node.kind === 157 /* MethodDeclaration */;
         }
         /**
          * Determines whether to emit the "design:paramtypes" metadata based on the node's kind.
@@ -68582,12 +70482,12 @@ var ts;
          */
         function shouldAddParamTypesMetadata(node) {
             switch (node.kind) {
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
                     return ts.getFirstConstructorWithBody(node) !== undefined;
-                case 156 /* MethodDeclaration */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 157 /* MethodDeclaration */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     return true;
             }
             return false;
@@ -68604,15 +70504,15 @@ var ts;
          */
         function serializeTypeOfNode(node) {
             switch (node.kind) {
-                case 154 /* PropertyDeclaration */:
-                case 151 /* Parameter */:
+                case 155 /* PropertyDeclaration */:
+                case 152 /* Parameter */:
                     return serializeTypeNode(node.type);
-                case 159 /* SetAccessor */:
-                case 158 /* GetAccessor */:
+                case 160 /* SetAccessor */:
+                case 159 /* GetAccessor */:
                     return serializeTypeNode(getAccessorTypeNode(node));
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
-                case 156 /* MethodDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
+                case 157 /* MethodDeclaration */:
                     return ts.createIdentifier("Function");
                 default:
                     return ts.createVoidZero();
@@ -68649,7 +70549,7 @@ var ts;
             return ts.createArrayLiteral(expressions);
         }
         function getParametersOfDecoratedDeclaration(node, container) {
-            if (container && node.kind === 158 /* GetAccessor */) {
+            if (container && node.kind === 159 /* GetAccessor */) {
                 var setAccessor = ts.getAllAccessorDeclarations(container.members, node).setAccessor;
                 if (setAccessor) {
                     return setAccessor.parameters;
@@ -68694,69 +70594,69 @@ var ts;
                 return ts.createIdentifier("Object");
             }
             switch (node.kind) {
-                case 106 /* VoidKeyword */:
-                case 141 /* UndefinedKeyword */:
-                case 96 /* NullKeyword */:
-                case 132 /* NeverKeyword */:
+                case 107 /* VoidKeyword */:
+                case 142 /* UndefinedKeyword */:
+                case 97 /* NullKeyword */:
+                case 133 /* NeverKeyword */:
                     return ts.createVoidZero();
-                case 177 /* ParenthesizedType */:
+                case 178 /* ParenthesizedType */:
                     return serializeTypeNode(node.type);
-                case 165 /* FunctionType */:
-                case 166 /* ConstructorType */:
+                case 166 /* FunctionType */:
+                case 167 /* ConstructorType */:
                     return ts.createIdentifier("Function");
-                case 169 /* ArrayType */:
-                case 170 /* TupleType */:
+                case 170 /* ArrayType */:
+                case 171 /* TupleType */:
                     return ts.createIdentifier("Array");
-                case 163 /* TypePredicate */:
-                case 123 /* BooleanKeyword */:
+                case 164 /* TypePredicate */:
+                case 124 /* BooleanKeyword */:
                     return ts.createIdentifier("Boolean");
-                case 138 /* StringKeyword */:
+                case 139 /* StringKeyword */:
                     return ts.createIdentifier("String");
-                case 136 /* ObjectKeyword */:
+                case 137 /* ObjectKeyword */:
                     return ts.createIdentifier("Object");
-                case 182 /* LiteralType */:
+                case 183 /* LiteralType */:
                     switch (node.literal.kind) {
                         case 10 /* StringLiteral */:
                             return ts.createIdentifier("String");
-                        case 202 /* PrefixUnaryExpression */:
+                        case 203 /* PrefixUnaryExpression */:
                         case 8 /* NumericLiteral */:
                             return ts.createIdentifier("Number");
                         case 9 /* BigIntLiteral */:
                             return getGlobalBigIntNameWithFallback();
-                        case 102 /* TrueKeyword */:
-                        case 87 /* FalseKeyword */:
+                        case 103 /* TrueKeyword */:
+                        case 88 /* FalseKeyword */:
                             return ts.createIdentifier("Boolean");
                         default:
                             return ts.Debug.failBadSyntaxKind(node.literal);
                     }
-                case 135 /* NumberKeyword */:
+                case 136 /* NumberKeyword */:
                     return ts.createIdentifier("Number");
-                case 146 /* BigIntKeyword */:
+                case 147 /* BigIntKeyword */:
                     return getGlobalBigIntNameWithFallback();
-                case 139 /* SymbolKeyword */:
+                case 140 /* SymbolKeyword */:
                     return languageVersion < 2 /* ES2015 */
                         ? getGlobalSymbolNameWithFallback()
                         : ts.createIdentifier("Symbol");
-                case 164 /* TypeReference */:
+                case 165 /* TypeReference */:
                     return serializeTypeReferenceNode(node);
-                case 174 /* IntersectionType */:
-                case 173 /* UnionType */:
+                case 175 /* IntersectionType */:
+                case 174 /* UnionType */:
                     return serializeTypeList(node.types);
-                case 175 /* ConditionalType */:
+                case 176 /* ConditionalType */:
                     return serializeTypeList([node.trueType, node.falseType]);
-                case 179 /* TypeOperator */:
-                    if (node.operator === 133 /* ReadonlyKeyword */) {
+                case 180 /* TypeOperator */:
+                    if (node.operator === 134 /* ReadonlyKeyword */) {
                         return serializeTypeNode(node.type);
                     }
                     break;
-                case 167 /* TypeQuery */:
-                case 180 /* IndexedAccessType */:
-                case 181 /* MappedType */:
-                case 168 /* TypeLiteral */:
-                case 120 /* AnyKeyword */:
-                case 143 /* UnknownKeyword */:
-                case 178 /* ThisType */:
-                case 183 /* ImportType */:
+                case 168 /* TypeQuery */:
+                case 181 /* IndexedAccessType */:
+                case 182 /* MappedType */:
+                case 169 /* TypeLiteral */:
+                case 121 /* AnyKeyword */:
+                case 144 /* UnknownKeyword */:
+                case 179 /* ThisType */:
+                case 184 /* ImportType */:
                     break;
                 default:
                     return ts.Debug.failBadSyntaxKind(node);
@@ -68769,13 +70669,13 @@ var ts;
             var serializedUnion;
             for (var _i = 0, types_18 = types; _i < types_18.length; _i++) {
                 var typeNode = types_18[_i];
-                while (typeNode.kind === 177 /* ParenthesizedType */) {
+                while (typeNode.kind === 178 /* ParenthesizedType */) {
                     typeNode = typeNode.type; // Skip parens if need be
                 }
-                if (typeNode.kind === 132 /* NeverKeyword */) {
+                if (typeNode.kind === 133 /* NeverKeyword */) {
                     continue; // Always elide `never` from the union/intersection if possible
                 }
-                if (!strictNullChecks && (typeNode.kind === 96 /* NullKeyword */ || typeNode.kind === 141 /* UndefinedKeyword */)) {
+                if (!strictNullChecks && (typeNode.kind === 97 /* NullKeyword */ || typeNode.kind === 142 /* UndefinedKeyword */)) {
                     continue; // Elide null and undefined from unions for metadata, just like what we did prior to the implementation of strict null checks
                 }
                 var serializedIndividual = serializeTypeNode(typeNode);
@@ -68855,12 +70755,12 @@ var ts;
          * @param node The entity name to serialize.
          */
         function serializeEntityNameAsExpressionFallback(node) {
-            if (node.kind === 72 /* Identifier */) {
+            if (node.kind === 73 /* Identifier */) {
                 // A -> typeof A !== undefined && A
                 var copied = serializeEntityNameAsExpression(node);
                 return createCheckedValue(copied, copied);
             }
-            if (node.left.kind === 72 /* Identifier */) {
+            if (node.left.kind === 73 /* Identifier */) {
                 // A.B -> typeof A !== undefined && A.B
                 return createCheckedValue(serializeEntityNameAsExpression(node.left), serializeEntityNameAsExpression(node));
             }
@@ -68876,7 +70776,7 @@ var ts;
          */
         function serializeEntityNameAsExpression(node) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     // Create a clone of the name with a new parent, and treat it as if it were
                     // a source tree node for the purposes of the checker.
                     var name = ts.getMutableClone(node);
@@ -68884,7 +70784,7 @@ var ts;
                     name.original = undefined;
                     name.parent = ts.getParseTreeNode(currentLexicalScope); // ensure the parent is set to a parse tree node.
                     return name;
-                case 148 /* QualifiedName */:
+                case 149 /* QualifiedName */:
                     return serializeQualifiedNameAsExpression(node);
             }
         }
@@ -68910,19 +70810,10 @@ var ts;
          * available.
          */
         function getGlobalBigIntNameWithFallback() {
-            return languageVersion < 7 /* ESNext */
+            return languageVersion < 99 /* ESNext */
                 ? ts.createConditional(ts.createTypeCheck(ts.createIdentifier("BigInt"), "function"), ts.createIdentifier("BigInt"), ts.createIdentifier("Object"))
                 : ts.createIdentifier("BigInt");
         }
-        /**
-         * A simple inlinable expression is an expression which can be copied into multiple locations
-         * without risk of repeating any sideeffects and whose value could not possibly change between
-         * any such locations
-         */
-        function isSimpleInlineableExpression(expression) {
-            return !ts.isIdentifier(expression) && ts.isSimpleCopiableExpression(expression) ||
-                ts.isWellKnownSymbolSyntactically(expression);
-        }
         /**
          * Gets an expression that represents a property name. For a computed property, a
          * name is generated for the node.
@@ -68932,7 +70823,7 @@ var ts;
         function getExpressionForPropertyName(member, generateNameForComputedPropertyName) {
             var name = member.name;
             if (ts.isComputedPropertyName(name)) {
-                return generateNameForComputedPropertyName && !isSimpleInlineableExpression(name.expression)
+                return generateNameForComputedPropertyName && !ts.isSimpleInlineableExpression(name.expression)
                     ? ts.getGeneratedNameForNode(name)
                     : name.expression;
             }
@@ -68943,25 +70834,6 @@ var ts;
                 return ts.getSynthesizedClone(name);
             }
         }
-        /**
-         * If the name is a computed property, this function transforms it, then either returns an expression which caches the
-         * value of the result or the expression itself if the value is either unused or safe to inline into multiple locations
-         * @param shouldHoist Does the expression need to be reused? (ie, for an initializer or a decorator)
-         * @param omitSimple Should expressions with no observable side-effects be elided? (ie, the expression is not hoisted for a decorator or initializer and is a literal)
-         */
-        function getPropertyNameExpressionIfNeeded(name, shouldHoist, omitSimple) {
-            if (ts.isComputedPropertyName(name)) {
-                var expression = ts.visitNode(name.expression, visitor, ts.isExpression);
-                var innerExpression = ts.skipPartiallyEmittedExpressions(expression);
-                var inlinable = isSimpleInlineableExpression(innerExpression);
-                if (!inlinable && shouldHoist) {
-                    var generatedName = ts.getGeneratedNameForNode(name);
-                    hoistVariableDeclaration(generatedName);
-                    return ts.createAssignment(generatedName, expression);
-                }
-                return (omitSimple && (inlinable || ts.isIdentifier(innerExpression))) ? undefined : expression;
-            }
-        }
         /**
          * Visits the property name of a class element, for use when emitting property
          * initializers. For a computed property on a node with decorators, a temporary
@@ -68971,18 +70843,20 @@ var ts;
          */
         function visitPropertyNameOfClassElement(member) {
             var name = member.name;
-            var expr = getPropertyNameExpressionIfNeeded(name, ts.some(member.decorators), /*omitSimple*/ false);
-            if (expr) { // expr only exists if `name` is a computed property name
-                // Inline any pending expressions from previous elided or relocated computed property name expressions in order to preserve execution order
-                if (ts.some(pendingExpressions)) {
-                    expr = ts.inlineExpressions(pendingExpressions.concat([expr]));
-                    pendingExpressions.length = 0;
+            // Computed property names need to be transformed into a hoisted variable when they are used more than once.
+            // The names are used more than once when:
+            //   - the property is non-static and its initializer is moved to the constructor (when there are parameter property assignments).
+            //   - the property has a decorator.
+            if (ts.isComputedPropertyName(name) && ((!ts.hasStaticModifier(member) && currentClassHasParameterProperties) || ts.some(member.decorators))) {
+                var expression = ts.visitNode(name.expression, visitor, ts.isExpression);
+                var innerExpression = ts.skipPartiallyEmittedExpressions(expression);
+                if (!ts.isSimpleInlineableExpression(innerExpression)) {
+                    var generatedName = ts.getGeneratedNameForNode(name);
+                    hoistVariableDeclaration(generatedName);
+                    return ts.updateComputedPropertyName(name, ts.createAssignment(generatedName, expression));
                 }
-                return ts.updateComputedPropertyName(name, expr);
-            }
-            else {
-                return name;
             }
+            return ts.visitNode(name, visitor, ts.isPropertyName);
         }
         /**
          * Transforms a HeritageClause with TypeScript syntax.
@@ -68994,7 +70868,7 @@ var ts;
          * @param node The HeritageClause to transform.
          */
         function visitHeritageClause(node) {
-            if (node.token === 109 /* ImplementsKeyword */) {
+            if (node.token === 110 /* ImplementsKeyword */) {
                 // implements clauses are elided
                 return undefined;
             }
@@ -69022,17 +70896,73 @@ var ts;
             return !ts.nodeIsMissing(node.body);
         }
         function visitPropertyDeclaration(node) {
-            var expr = getPropertyNameExpressionIfNeeded(node.name, ts.some(node.decorators) || !!node.initializer, /*omitSimple*/ true);
-            if (expr && !isSimpleInlineableExpression(expr)) {
-                (pendingExpressions || (pendingExpressions = [])).push(expr);
+            var updated = ts.updateProperty(node, 
+            /*decorators*/ undefined, ts.visitNodes(node.modifiers, visitor, ts.isModifier), visitPropertyNameOfClassElement(node), 
+            /*questionOrExclamationToken*/ undefined, 
+            /*type*/ undefined, ts.visitNode(node.initializer, visitor));
+            if (updated !== node) {
+                // While we emit the source map for the node after skipping decorators and modifiers,
+                // we need to emit the comments for the original range.
+                ts.setCommentRange(updated, node);
+                ts.setSourceMapRange(updated, ts.moveRangePastDecorators(node));
             }
-            return undefined;
+            return updated;
         }
         function visitConstructor(node) {
             if (!shouldEmitFunctionLikeDeclaration(node)) {
                 return undefined;
             }
-            return ts.updateConstructor(node, ts.visitNodes(node.decorators, visitor, ts.isDecorator), ts.visitNodes(node.modifiers, visitor, ts.isModifier), ts.visitParameterList(node.parameters, visitor, context), ts.visitFunctionBody(node.body, visitor, context));
+            return ts.updateConstructor(node, 
+            /*decorators*/ undefined, 
+            /*modifiers*/ undefined, ts.visitParameterList(node.parameters, visitor, context), transformConstructorBody(node.body, node));
+        }
+        function transformConstructorBody(body, constructor) {
+            var parametersWithPropertyAssignments = constructor &&
+                ts.filter(constructor.parameters, ts.isParameterPropertyDeclaration);
+            if (!ts.some(parametersWithPropertyAssignments)) {
+                return ts.visitFunctionBody(body, visitor, context);
+            }
+            var statements = [];
+            var indexOfFirstStatement = 0;
+            resumeLexicalEnvironment();
+            indexOfFirstStatement = ts.addPrologueDirectivesAndInitialSuperCall(constructor, statements, visitor);
+            // Add parameters with property assignments. Transforms this:
+            //
+            //  constructor (public x, public y) {
+            //  }
+            //
+            // Into this:
+            //
+            //  constructor (x, y) {
+            //      this.x = x;
+            //      this.y = y;
+            //  }
+            //
+            ts.addRange(statements, ts.map(parametersWithPropertyAssignments, transformParameterWithPropertyAssignment));
+            // Add the existing statements, skipping the initial super call.
+            ts.addRange(statements, ts.visitNodes(body.statements, visitor, ts.isStatement, indexOfFirstStatement));
+            // End the lexical environment.
+            statements = ts.mergeLexicalEnvironment(statements, endLexicalEnvironment());
+            var block = ts.createBlock(ts.setTextRange(ts.createNodeArray(statements), body.statements), /*multiLine*/ true);
+            ts.setTextRange(block, /*location*/ body);
+            ts.setOriginalNode(block, body);
+            return block;
+        }
+        /**
+         * Transforms a parameter into a property assignment statement.
+         *
+         * @param node The parameter declaration.
+         */
+        function transformParameterWithPropertyAssignment(node) {
+            var name = node.name;
+            if (!ts.isIdentifier(name)) {
+                return undefined;
+            }
+            var propertyName = ts.getMutableClone(name);
+            ts.setEmitFlags(propertyName, 1536 /* NoComments */ | 48 /* NoSourceMap */);
+            var localName = ts.getMutableClone(name);
+            ts.setEmitFlags(localName, 1536 /* NoComments */);
+            return ts.startOnNewLine(ts.removeAllComments(ts.setTextRange(ts.setOriginalNode(ts.createExpressionStatement(ts.createAssignment(ts.setTextRange(ts.createPropertyAccess(ts.createThis(), propertyName), node.name), localName)), node), ts.moveRangePos(node, -1))));
         }
         function visitMethodDeclaration(node) {
             if (!shouldEmitFunctionLikeDeclaration(node)) {
@@ -69233,7 +71163,7 @@ var ts;
          */
         function visitEnumDeclaration(node) {
             if (!shouldEmitEnumDeclaration(node)) {
-                return undefined;
+                return ts.createNotEmittedStatement(node);
             }
             var statements = [];
             // We request to be advised when the printer is about to print this node. This allows
@@ -69401,12 +71331,12 @@ var ts;
             // enums in any other scope are emitted as a `let` declaration.
             var statement = ts.createVariableStatement(ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), ts.createVariableDeclarationList([
                 ts.createVariableDeclaration(ts.getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true))
-            ], currentLexicalScope.kind === 284 /* SourceFile */ ? 0 /* None */ : 1 /* Let */));
+            ], currentLexicalScope.kind === 285 /* SourceFile */ ? 0 /* None */ : 1 /* Let */));
             ts.setOriginalNode(statement, node);
             recordEmittedDeclarationInScope(node);
             if (isFirstEmittedDeclarationInScope(node)) {
                 // Adjust the source map emit to match the old emitter.
-                if (node.kind === 243 /* EnumDeclaration */) {
+                if (node.kind === 244 /* EnumDeclaration */) {
                     ts.setSourceMapRange(statement.declarationList, node);
                 }
                 else {
@@ -69531,7 +71461,7 @@ var ts;
             var statementsLocation;
             var blockLocation;
             var body = node.body;
-            if (body.kind === 245 /* ModuleBlock */) {
+            if (body.kind === 246 /* ModuleBlock */) {
                 saveStateAndInvoke(body, function (body) { return ts.addRange(statements, ts.visitNodes(body.statements, namespaceElementVisitor, ts.isStatement)); });
                 statementsLocation = body.statements;
                 blockLocation = body;
@@ -69577,13 +71507,13 @@ var ts;
             //     })(hi = hello.hi || (hello.hi = {}));
             // })(hello || (hello = {}));
             // We only want to emit comment on the namespace which contains block body itself, not the containing namespaces.
-            if (body.kind !== 245 /* ModuleBlock */) {
+            if (body.kind !== 246 /* ModuleBlock */) {
                 ts.setEmitFlags(block, ts.getEmitFlags(block) | 1536 /* NoComments */);
             }
             return block;
         }
         function getInnerMostModuleDeclarationFromDottedModule(moduleDeclaration) {
-            if (moduleDeclaration.body.kind === 244 /* ModuleDeclaration */) {
+            if (moduleDeclaration.body.kind === 245 /* ModuleDeclaration */) {
                 var recursiveInnerModule = getInnerMostModuleDeclarationFromDottedModule(moduleDeclaration.body);
                 return recursiveInnerModule || moduleDeclaration.body;
             }
@@ -69624,7 +71554,7 @@ var ts;
          * @param node The named import bindings node.
          */
         function visitNamedImportBindings(node) {
-            if (node.kind === 251 /* NamespaceImport */) {
+            if (node.kind === 252 /* NamespaceImport */) {
                 // Elide a namespace import if it is not referenced.
                 return resolver.isReferencedAliasDeclaration(node) ? node : undefined;
             }
@@ -69837,7 +71767,7 @@ var ts;
         function enableSubstitutionForNonQualifiedEnumMembers() {
             if ((enabledSubstitutions & 8 /* NonQualifiedEnumMembers */) === 0) {
                 enabledSubstitutions |= 8 /* NonQualifiedEnumMembers */;
-                context.enableSubstitution(72 /* Identifier */);
+                context.enableSubstitution(73 /* Identifier */);
             }
         }
         function enableSubstitutionForClassAliases() {
@@ -69845,7 +71775,7 @@ var ts;
                 enabledSubstitutions |= 1 /* ClassAliases */;
                 // We need to enable substitutions for identifiers. This allows us to
                 // substitute class names inside of a class declaration.
-                context.enableSubstitution(72 /* Identifier */);
+                context.enableSubstitution(73 /* Identifier */);
                 // Keep track of class aliases.
                 classAliases = [];
             }
@@ -69855,17 +71785,17 @@ var ts;
                 enabledSubstitutions |= 2 /* NamespaceExports */;
                 // We need to enable substitutions for identifiers and shorthand property assignments. This allows us to
                 // substitute the names of exported members of a namespace.
-                context.enableSubstitution(72 /* Identifier */);
-                context.enableSubstitution(276 /* ShorthandPropertyAssignment */);
+                context.enableSubstitution(73 /* Identifier */);
+                context.enableSubstitution(277 /* ShorthandPropertyAssignment */);
                 // We need to be notified when entering and exiting namespaces.
-                context.enableEmitNotification(244 /* ModuleDeclaration */);
+                context.enableEmitNotification(245 /* ModuleDeclaration */);
             }
         }
         function isTransformedModuleDeclaration(node) {
-            return ts.getOriginalNode(node).kind === 244 /* ModuleDeclaration */;
+            return ts.getOriginalNode(node).kind === 245 /* ModuleDeclaration */;
         }
         function isTransformedEnumDeclaration(node) {
-            return ts.getOriginalNode(node).kind === 243 /* EnumDeclaration */;
+            return ts.getOriginalNode(node).kind === 244 /* EnumDeclaration */;
         }
         /**
          * Hook for node emit.
@@ -69924,11 +71854,11 @@ var ts;
         }
         function substituteExpression(node) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return substituteExpressionIdentifier(node);
-                case 189 /* PropertyAccessExpression */:
+                case 190 /* PropertyAccessExpression */:
                     return substitutePropertyAccessExpression(node);
-                case 190 /* ElementAccessExpression */:
+                case 191 /* ElementAccessExpression */:
                     return substituteElementAccessExpression(node);
             }
             return node;
@@ -69966,9 +71896,9 @@ var ts;
                 // If we are nested within a namespace declaration, we may need to qualifiy
                 // an identifier that is exported from a merged namespace.
                 var container = resolver.getReferencedExportContainer(node, /*prefixLocals*/ false);
-                if (container && container.kind !== 284 /* SourceFile */) {
-                    var substitute = (applicableSubstitutions & 2 /* NamespaceExports */ && container.kind === 244 /* ModuleDeclaration */) ||
-                        (applicableSubstitutions & 8 /* NonQualifiedEnumMembers */ && container.kind === 243 /* EnumDeclaration */);
+                if (container && container.kind !== 285 /* SourceFile */) {
+                    var substitute = (applicableSubstitutions & 2 /* NamespaceExports */ && container.kind === 245 /* ModuleDeclaration */) ||
+                        (applicableSubstitutions & 8 /* NonQualifiedEnumMembers */ && container.kind === 244 /* EnumDeclaration */);
                     if (substitute) {
                         return ts.setTextRange(ts.createPropertyAccess(ts.getGeneratedNameForNode(container), node), 
                         /*location*/ node);
@@ -70058,6 +71988,413 @@ var ts;
 })(ts || (ts = {}));
 /*@internal*/
 var ts;
+(function (ts) {
+    var ClassPropertySubstitutionFlags;
+    (function (ClassPropertySubstitutionFlags) {
+        /**
+         * Enables substitutions for class expressions with static fields
+         * which have initializers that reference the class name.
+         */
+        ClassPropertySubstitutionFlags[ClassPropertySubstitutionFlags["ClassAliases"] = 1] = "ClassAliases";
+    })(ClassPropertySubstitutionFlags || (ClassPropertySubstitutionFlags = {}));
+    /**
+     * Transforms ECMAScript Class Syntax.
+     * TypeScript parameter property syntax is transformed in the TypeScript transformer.
+     * For now, this transforms public field declarations using TypeScript class semantics
+     * (where the declarations get elided and initializers are transformed as assignments in the constructor).
+     * Eventually, this transform will change to the ECMAScript semantics (with Object.defineProperty).
+     */
+    function transformClassFields(context) {
+        var hoistVariableDeclaration = context.hoistVariableDeclaration, endLexicalEnvironment = context.endLexicalEnvironment, resumeLexicalEnvironment = context.resumeLexicalEnvironment;
+        var resolver = context.getEmitResolver();
+        var previousOnSubstituteNode = context.onSubstituteNode;
+        context.onSubstituteNode = onSubstituteNode;
+        var enabledSubstitutions;
+        var classAliases;
+        /**
+         * Tracks what computed name expressions originating from elided names must be inlined
+         * at the next execution site, in document order
+         */
+        var pendingExpressions;
+        /**
+         * Tracks what computed name expression statements and static property initializers must be
+         * emitted at the next execution site, in document order (for decorated classes).
+         */
+        var pendingStatements;
+        return ts.chainBundle(transformSourceFile);
+        function transformSourceFile(node) {
+            if (node.isDeclarationFile) {
+                return node;
+            }
+            var visited = ts.visitEachChild(node, visitor, context);
+            ts.addEmitHelpers(visited, context.readEmitHelpers());
+            return visited;
+        }
+        function visitor(node) {
+            if (!(node.transformFlags & 1048576 /* ContainsClassFields */))
+                return node;
+            switch (node.kind) {
+                case 210 /* ClassExpression */:
+                    return visitClassExpression(node);
+                case 241 /* ClassDeclaration */:
+                    return visitClassDeclaration(node);
+                case 220 /* VariableStatement */:
+                    return visitVariableStatement(node);
+            }
+            return ts.visitEachChild(node, visitor, context);
+        }
+        /**
+         * Visits the members of a class that has fields.
+         *
+         * @param node The node to visit.
+         */
+        function classElementVisitor(node) {
+            switch (node.kind) {
+                case 158 /* Constructor */:
+                    // Constructors for classes using class fields are transformed in
+                    // `visitClassDeclaration` or `visitClassExpression`.
+                    return undefined;
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
+                case 157 /* MethodDeclaration */:
+                    // Visit the name of the member (if it's a computed property name).
+                    return ts.visitEachChild(node, classElementVisitor, context);
+                case 155 /* PropertyDeclaration */:
+                    return visitPropertyDeclaration(node);
+                case 150 /* ComputedPropertyName */:
+                    return visitComputedPropertyName(node);
+                case 218 /* SemicolonClassElement */:
+                    return node;
+                default:
+                    return visitor(node);
+            }
+        }
+        function visitVariableStatement(node) {
+            var savedPendingStatements = pendingStatements;
+            pendingStatements = [];
+            var visitedNode = ts.visitEachChild(node, visitor, context);
+            var statement = ts.some(pendingStatements) ? [visitedNode].concat(pendingStatements) :
+                visitedNode;
+            pendingStatements = savedPendingStatements;
+            return statement;
+        }
+        function visitComputedPropertyName(name) {
+            var node = ts.visitEachChild(name, visitor, context);
+            if (ts.some(pendingExpressions)) {
+                var expressions = pendingExpressions;
+                expressions.push(name.expression);
+                pendingExpressions = [];
+                node = ts.updateComputedPropertyName(node, ts.inlineExpressions(expressions));
+            }
+            return node;
+        }
+        function visitPropertyDeclaration(node) {
+            ts.Debug.assert(!ts.some(node.decorators));
+            // Create a temporary variable to store a computed property name (if necessary).
+            // If it's not inlineable, then we emit an expression after the class which assigns
+            // the property name to the temporary variable.
+            var expr = getPropertyNameExpressionIfNeeded(node.name, !!node.initializer);
+            if (expr && !ts.isSimpleInlineableExpression(expr)) {
+                (pendingExpressions || (pendingExpressions = [])).push(expr);
+            }
+            return undefined;
+        }
+        function visitClassDeclaration(node) {
+            if (!ts.forEach(node.members, ts.isPropertyDeclaration)) {
+                return ts.visitEachChild(node, visitor, context);
+            }
+            var savedPendingExpressions = pendingExpressions;
+            pendingExpressions = undefined;
+            var extendsClauseElement = ts.getEffectiveBaseTypeNode(node);
+            var isDerivedClass = !!(extendsClauseElement && ts.skipOuterExpressions(extendsClauseElement.expression).kind !== 97 /* NullKeyword */);
+            var statements = [
+                ts.updateClassDeclaration(node, 
+                /*decorators*/ undefined, node.modifiers, node.name, 
+                /*typeParameters*/ undefined, ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), transformClassMembers(node, isDerivedClass))
+            ];
+            // Write any pending expressions from elided or moved computed property names
+            if (ts.some(pendingExpressions)) {
+                statements.push(ts.createExpressionStatement(ts.inlineExpressions(pendingExpressions)));
+            }
+            pendingExpressions = savedPendingExpressions;
+            // Emit static property assignment. Because classDeclaration is lexically evaluated,
+            // it is safe to emit static property assignment after classDeclaration
+            // From ES6 specification:
+            //      HasLexicalDeclaration (N) : Determines if the argument identifier has a binding in this environment record that was created using
+            //                                  a lexical declaration such as a LexicalDeclaration or a ClassDeclaration.
+            var staticProperties = ts.getInitializedProperties(node, /*isStatic*/ true);
+            if (ts.some(staticProperties)) {
+                addInitializedPropertyStatements(statements, staticProperties, ts.getInternalName(node));
+            }
+            return statements;
+        }
+        function visitClassExpression(node) {
+            if (!ts.forEach(node.members, ts.isPropertyDeclaration)) {
+                return ts.visitEachChild(node, visitor, context);
+            }
+            var savedPendingExpressions = pendingExpressions;
+            pendingExpressions = undefined;
+            // If this class expression is a transformation of a decorated class declaration,
+            // then we want to output the pendingExpressions as statements, not as inlined
+            // expressions with the class statement.
+            //
+            // In this case, we use pendingStatements to produce the same output as the
+            // class declaration transformation. The VariableStatement visitor will insert
+            // these statements after the class expression variable statement.
+            var isDecoratedClassDeclaration = ts.isClassDeclaration(ts.getOriginalNode(node));
+            var staticProperties = ts.getInitializedProperties(node, /*isStatic*/ true);
+            var extendsClauseElement = ts.getEffectiveBaseTypeNode(node);
+            var isDerivedClass = !!(extendsClauseElement && ts.skipOuterExpressions(extendsClauseElement.expression).kind !== 97 /* NullKeyword */);
+            var classExpression = ts.updateClassExpression(node, node.modifiers, node.name, 
+            /*typeParameters*/ undefined, ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), transformClassMembers(node, isDerivedClass));
+            if (ts.some(staticProperties) || ts.some(pendingExpressions)) {
+                if (isDecoratedClassDeclaration) {
+                    ts.Debug.assertDefined(pendingStatements, "Decorated classes transformed by TypeScript are expected to be within a variable declaration.");
+                    // Write any pending expressions from elided or moved computed property names
+                    if (pendingStatements && pendingExpressions && ts.some(pendingExpressions)) {
+                        pendingStatements.push(ts.createExpressionStatement(ts.inlineExpressions(pendingExpressions)));
+                    }
+                    pendingExpressions = savedPendingExpressions;
+                    if (pendingStatements && ts.some(staticProperties)) {
+                        addInitializedPropertyStatements(pendingStatements, staticProperties, ts.getInternalName(node));
+                    }
+                    return classExpression;
+                }
+                else {
+                    var expressions = [];
+                    var isClassWithConstructorReference = resolver.getNodeCheckFlags(node) & 16777216 /* ClassWithConstructorReference */;
+                    var temp = ts.createTempVariable(hoistVariableDeclaration, !!isClassWithConstructorReference);
+                    if (isClassWithConstructorReference) {
+                        // record an alias as the class name is not in scope for statics.
+                        enableSubstitutionForClassAliases();
+                        var alias = ts.getSynthesizedClone(temp);
+                        alias.autoGenerateFlags &= ~8 /* ReservedInNestedScopes */;
+                        classAliases[ts.getOriginalNodeId(node)] = alias;
+                    }
+                    // To preserve the behavior of the old emitter, we explicitly indent
+                    // the body of a class with static initializers.
+                    ts.setEmitFlags(classExpression, 65536 /* Indented */ | ts.getEmitFlags(classExpression));
+                    expressions.push(ts.startOnNewLine(ts.createAssignment(temp, classExpression)));
+                    // Add any pending expressions leftover from elided or relocated computed property names
+                    ts.addRange(expressions, ts.map(pendingExpressions, ts.startOnNewLine));
+                    ts.addRange(expressions, generateInitializedPropertyExpressions(staticProperties, temp));
+                    expressions.push(ts.startOnNewLine(temp));
+                    pendingExpressions = savedPendingExpressions;
+                    return ts.inlineExpressions(expressions);
+                }
+            }
+            pendingExpressions = savedPendingExpressions;
+            return classExpression;
+        }
+        function transformClassMembers(node, isDerivedClass) {
+            var members = [];
+            var constructor = transformConstructor(node, isDerivedClass);
+            if (constructor) {
+                members.push(constructor);
+            }
+            ts.addRange(members, ts.visitNodes(node.members, classElementVisitor, ts.isClassElement));
+            return ts.setTextRange(ts.createNodeArray(members), /*location*/ node.members);
+        }
+        function transformConstructor(node, isDerivedClass) {
+            var constructor = ts.visitNode(ts.getFirstConstructorWithBody(node), visitor, ts.isConstructorDeclaration);
+            var containsPropertyInitializer = ts.forEach(node.members, ts.isInitializedProperty);
+            if (!containsPropertyInitializer) {
+                return constructor;
+            }
+            var parameters = ts.visitParameterList(constructor ? constructor.parameters : undefined, visitor, context);
+            var body = transformConstructorBody(node, constructor, isDerivedClass);
+            if (!body) {
+                return undefined;
+            }
+            return ts.startOnNewLine(ts.setOriginalNode(ts.setTextRange(ts.createConstructor(
+            /*decorators*/ undefined, 
+            /*modifiers*/ undefined, parameters, body), constructor || node), constructor));
+        }
+        function transformConstructorBody(node, constructor, isDerivedClass) {
+            var properties = ts.getInitializedProperties(node, /*isStatic*/ false);
+            // Only generate synthetic constructor when there are property initializers to move.
+            if (!constructor && !ts.some(properties)) {
+                return ts.visitFunctionBody(/*node*/ undefined, visitor, context);
+            }
+            resumeLexicalEnvironment();
+            var indexOfFirstStatement = 0;
+            var statements = [];
+            if (!constructor && isDerivedClass) {
+                // Add a synthetic `super` call:
+                //
+                //  super(...arguments);
+                //
+                statements.push(ts.createExpressionStatement(ts.createCall(ts.createSuper(), 
+                /*typeArguments*/ undefined, [ts.createSpread(ts.createIdentifier("arguments"))])));
+            }
+            if (constructor) {
+                indexOfFirstStatement = ts.addPrologueDirectivesAndInitialSuperCall(constructor, statements, visitor);
+            }
+            // Add the property initializers. Transforms this:
+            //
+            //  public x = 1;
+            //
+            // Into this:
+            //
+            //  constructor() {
+            //      this.x = 1;
+            //  }
+            //
+            if (constructor && constructor.body) {
+                var parameterPropertyDeclarationCount = 0;
+                for (var i = indexOfFirstStatement; i < constructor.body.statements.length; i++) {
+                    if (ts.isParameterPropertyDeclaration(ts.getOriginalNode(constructor.body.statements[i]))) {
+                        parameterPropertyDeclarationCount++;
+                    }
+                    else {
+                        break;
+                    }
+                }
+                if (parameterPropertyDeclarationCount > 0) {
+                    ts.addRange(statements, ts.visitNodes(constructor.body.statements, visitor, ts.isStatement, indexOfFirstStatement, parameterPropertyDeclarationCount));
+                    indexOfFirstStatement += parameterPropertyDeclarationCount;
+                }
+            }
+            addInitializedPropertyStatements(statements, properties, ts.createThis());
+            // Add existing statements, skipping the initial super call.
+            if (constructor) {
+                ts.addRange(statements, ts.visitNodes(constructor.body.statements, visitor, ts.isStatement, indexOfFirstStatement));
+            }
+            statements = ts.mergeLexicalEnvironment(statements, endLexicalEnvironment());
+            return ts.setTextRange(ts.createBlock(ts.setTextRange(ts.createNodeArray(statements), 
+            /*location*/ constructor ? constructor.body.statements : node.members), 
+            /*multiLine*/ true), 
+            /*location*/ constructor ? constructor.body : undefined);
+        }
+        /**
+         * Generates assignment statements for property initializers.
+         *
+         * @param properties An array of property declarations to transform.
+         * @param receiver The receiver on which each property should be assigned.
+         */
+        function addInitializedPropertyStatements(statements, properties, receiver) {
+            for (var _i = 0, properties_6 = properties; _i < properties_6.length; _i++) {
+                var property = properties_6[_i];
+                var statement = ts.createExpressionStatement(transformInitializedProperty(property, receiver));
+                ts.setSourceMapRange(statement, ts.moveRangePastModifiers(property));
+                ts.setCommentRange(statement, property);
+                ts.setOriginalNode(statement, property);
+                statements.push(statement);
+            }
+        }
+        /**
+         * Generates assignment expressions for property initializers.
+         *
+         * @param properties An array of property declarations to transform.
+         * @param receiver The receiver on which each property should be assigned.
+         */
+        function generateInitializedPropertyExpressions(properties, receiver) {
+            var expressions = [];
+            for (var _i = 0, properties_7 = properties; _i < properties_7.length; _i++) {
+                var property = properties_7[_i];
+                var expression = transformInitializedProperty(property, receiver);
+                ts.startOnNewLine(expression);
+                ts.setSourceMapRange(expression, ts.moveRangePastModifiers(property));
+                ts.setCommentRange(expression, property);
+                ts.setOriginalNode(expression, property);
+                expressions.push(expression);
+            }
+            return expressions;
+        }
+        /**
+         * Transforms a property initializer into an assignment statement.
+         *
+         * @param property The property declaration.
+         * @param receiver The object receiving the property assignment.
+         */
+        function transformInitializedProperty(property, receiver) {
+            // We generate a name here in order to reuse the value cached by the relocated computed name expression (which uses the same generated name)
+            var propertyName = ts.isComputedPropertyName(property.name) && !ts.isSimpleInlineableExpression(property.name.expression)
+                ? ts.updateComputedPropertyName(property.name, ts.getGeneratedNameForNode(property.name))
+                : property.name;
+            var initializer = ts.visitNode(property.initializer, visitor, ts.isExpression);
+            var memberAccess = ts.createMemberAccessForPropertyName(receiver, propertyName, /*location*/ propertyName);
+            return ts.createAssignment(memberAccess, initializer);
+        }
+        function enableSubstitutionForClassAliases() {
+            if ((enabledSubstitutions & 1 /* ClassAliases */) === 0) {
+                enabledSubstitutions |= 1 /* ClassAliases */;
+                // We need to enable substitutions for identifiers. This allows us to
+                // substitute class names inside of a class declaration.
+                context.enableSubstitution(73 /* Identifier */);
+                // Keep track of class aliases.
+                classAliases = [];
+            }
+        }
+        /**
+         * Hooks node substitutions.
+         *
+         * @param hint The context for the emitter.
+         * @param node The node to substitute.
+         */
+        function onSubstituteNode(hint, node) {
+            node = previousOnSubstituteNode(hint, node);
+            if (hint === 1 /* Expression */) {
+                return substituteExpression(node);
+            }
+            return node;
+        }
+        function substituteExpression(node) {
+            switch (node.kind) {
+                case 73 /* Identifier */:
+                    return substituteExpressionIdentifier(node);
+            }
+            return node;
+        }
+        function substituteExpressionIdentifier(node) {
+            return trySubstituteClassAlias(node) || node;
+        }
+        function trySubstituteClassAlias(node) {
+            if (enabledSubstitutions & 1 /* ClassAliases */) {
+                if (resolver.getNodeCheckFlags(node) & 33554432 /* ConstructorReferenceInClass */) {
+                    // Due to the emit for class decorators, any reference to the class from inside of the class body
+                    // must instead be rewritten to point to a temporary variable to avoid issues with the double-bind
+                    // behavior of class names in ES6.
+                    // Also, when emitting statics for class expressions, we must substitute a class alias for
+                    // constructor references in static property initializers.
+                    var declaration = resolver.getReferencedValueDeclaration(node);
+                    if (declaration) {
+                        var classAlias = classAliases[declaration.id]; // TODO: GH#18217
+                        if (classAlias) {
+                            var clone_2 = ts.getSynthesizedClone(classAlias);
+                            ts.setSourceMapRange(clone_2, node);
+                            ts.setCommentRange(clone_2, node);
+                            return clone_2;
+                        }
+                    }
+                }
+            }
+            return undefined;
+        }
+        /**
+         * If the name is a computed property, this function transforms it, then either returns an expression which caches the
+         * value of the result or the expression itself if the value is either unused or safe to inline into multiple locations
+         * @param shouldHoist Does the expression need to be reused? (ie, for an initializer or a decorator)
+         */
+        function getPropertyNameExpressionIfNeeded(name, shouldHoist) {
+            if (ts.isComputedPropertyName(name)) {
+                var expression = ts.visitNode(name.expression, visitor, ts.isExpression);
+                var innerExpression = ts.skipPartiallyEmittedExpressions(expression);
+                var inlinable = ts.isSimpleInlineableExpression(innerExpression);
+                var alreadyTransformed = ts.isAssignmentExpression(innerExpression) && ts.isGeneratedIdentifier(innerExpression.left);
+                if (!alreadyTransformed && !inlinable && shouldHoist) {
+                    var generatedName = ts.getGeneratedNameForNode(name);
+                    hoistVariableDeclaration(generatedName);
+                    return ts.createAssignment(generatedName, expression);
+                }
+                return (inlinable || ts.isIdentifier(innerExpression)) ? undefined : expression;
+            }
+        }
+    }
+    ts.transformClassFields = transformClassFields;
+})(ts || (ts = {}));
+/*@internal*/
+var ts;
 (function (ts) {
     var ES2017SubstitutionFlags;
     (function (ES2017SubstitutionFlags) {
@@ -70108,26 +72445,26 @@ var ts;
                 return node;
             }
             switch (node.kind) {
-                case 121 /* AsyncKeyword */:
+                case 122 /* AsyncKeyword */:
                     // ES2017 async modifier should be elided for targets < ES2017
                     return undefined;
-                case 201 /* AwaitExpression */:
+                case 202 /* AwaitExpression */:
                     return visitAwaitExpression(node);
-                case 156 /* MethodDeclaration */:
+                case 157 /* MethodDeclaration */:
                     return visitMethodDeclaration(node);
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     return visitFunctionDeclaration(node);
-                case 196 /* FunctionExpression */:
+                case 197 /* FunctionExpression */:
                     return visitFunctionExpression(node);
-                case 197 /* ArrowFunction */:
+                case 198 /* ArrowFunction */:
                     return visitArrowFunction(node);
-                case 189 /* PropertyAccessExpression */:
-                    if (capturedSuperProperties && ts.isPropertyAccessExpression(node) && node.expression.kind === 98 /* SuperKeyword */) {
+                case 190 /* PropertyAccessExpression */:
+                    if (capturedSuperProperties && ts.isPropertyAccessExpression(node) && node.expression.kind === 99 /* SuperKeyword */) {
                         capturedSuperProperties.set(node.name.escapedText, true);
                     }
                     return ts.visitEachChild(node, visitor, context);
-                case 190 /* ElementAccessExpression */:
-                    if (capturedSuperProperties && node.expression.kind === 98 /* SuperKeyword */) {
+                case 191 /* ElementAccessExpression */:
+                    if (capturedSuperProperties && node.expression.kind === 99 /* SuperKeyword */) {
                         hasSuperElementAccess = true;
                     }
                     return ts.visitEachChild(node, visitor, context);
@@ -70138,27 +72475,27 @@ var ts;
         function asyncBodyVisitor(node) {
             if (ts.isNodeWithPossibleHoistedDeclaration(node)) {
                 switch (node.kind) {
-                    case 219 /* VariableStatement */:
+                    case 220 /* VariableStatement */:
                         return visitVariableStatementInAsyncBody(node);
-                    case 225 /* ForStatement */:
+                    case 226 /* ForStatement */:
                         return visitForStatementInAsyncBody(node);
-                    case 226 /* ForInStatement */:
+                    case 227 /* ForInStatement */:
                         return visitForInStatementInAsyncBody(node);
-                    case 227 /* ForOfStatement */:
+                    case 228 /* ForOfStatement */:
                         return visitForOfStatementInAsyncBody(node);
-                    case 274 /* CatchClause */:
+                    case 275 /* CatchClause */:
                         return visitCatchClauseInAsyncBody(node);
-                    case 218 /* Block */:
-                    case 232 /* SwitchStatement */:
-                    case 246 /* CaseBlock */:
-                    case 271 /* CaseClause */:
-                    case 272 /* DefaultClause */:
-                    case 235 /* TryStatement */:
-                    case 223 /* DoStatement */:
-                    case 224 /* WhileStatement */:
-                    case 222 /* IfStatement */:
-                    case 231 /* WithStatement */:
-                    case 233 /* LabeledStatement */:
+                    case 219 /* Block */:
+                    case 233 /* SwitchStatement */:
+                    case 247 /* CaseBlock */:
+                    case 272 /* CaseClause */:
+                    case 273 /* DefaultClause */:
+                    case 236 /* TryStatement */:
+                    case 224 /* DoStatement */:
+                    case 225 /* WhileStatement */:
+                    case 223 /* IfStatement */:
+                    case 232 /* WithStatement */:
+                    case 234 /* LabeledStatement */:
                         return ts.visitEachChild(node, asyncBodyVisitor, context);
                     default:
                         return ts.Debug.assertNever(node, "Unhandled node.");
@@ -70359,7 +72696,7 @@ var ts;
             var original = ts.getOriginalNode(node, ts.isFunctionLike);
             var nodeType = original.type;
             var promiseConstructor = languageVersion < 2 /* ES2015 */ ? getPromiseConstructor(nodeType) : undefined;
-            var isArrowFunction = node.kind === 197 /* ArrowFunction */;
+            var isArrowFunction = node.kind === 198 /* ArrowFunction */;
             var hasLexicalArguments = (resolver.getNodeCheckFlags(node) & 8192 /* CaptureArguments */) !== 0;
             // An async function is emit as an outer function that calls an inner
             // generator function. To preserve lexical bindings, we pass the current
@@ -70374,8 +72711,10 @@ var ts;
             }
             var savedCapturedSuperProperties = capturedSuperProperties;
             var savedHasSuperElementAccess = hasSuperElementAccess;
-            capturedSuperProperties = ts.createUnderscoreEscapedMap();
-            hasSuperElementAccess = false;
+            if (!isArrowFunction) {
+                capturedSuperProperties = ts.createUnderscoreEscapedMap();
+                hasSuperElementAccess = false;
+            }
             var result;
             if (!isArrowFunction) {
                 var statements = [];
@@ -70387,9 +72726,11 @@ var ts;
                 var emitSuperHelpers = languageVersion >= 2 /* ES2015 */ && resolver.getNodeCheckFlags(node) & (4096 /* AsyncMethodWithSuperBinding */ | 2048 /* AsyncMethodWithSuper */);
                 if (emitSuperHelpers) {
                     enableSubstitutionForAsyncMethodsWithSuper();
-                    var variableStatement = createSuperAccessVariableStatement(resolver, node, capturedSuperProperties);
-                    substitutedSuperAccessors[ts.getNodeId(variableStatement)] = true;
-                    ts.insertStatementsAfterStandardPrologue(statements, [variableStatement]);
+                    if (ts.hasEntries(capturedSuperProperties)) {
+                        var variableStatement = createSuperAccessVariableStatement(resolver, node, capturedSuperProperties);
+                        substitutedSuperAccessors[ts.getNodeId(variableStatement)] = true;
+                        ts.insertStatementsAfterStandardPrologue(statements, [variableStatement]);
+                    }
                 }
                 var block = ts.createBlock(statements, /*multiLine*/ true);
                 ts.setTextRange(block, node.body);
@@ -70416,8 +72757,10 @@ var ts;
                 }
             }
             enclosingFunctionParameterNames = savedEnclosingFunctionParameterNames;
-            capturedSuperProperties = savedCapturedSuperProperties;
-            hasSuperElementAccess = savedHasSuperElementAccess;
+            if (!isArrowFunction) {
+                capturedSuperProperties = savedCapturedSuperProperties;
+                hasSuperElementAccess = savedHasSuperElementAccess;
+            }
             return result;
         }
         function transformAsyncFunctionBodyWorker(body, start) {
@@ -70444,17 +72787,17 @@ var ts;
                 enabledSubstitutions |= 1 /* AsyncMethodsWithSuper */;
                 // We need to enable substitutions for call, property access, and element access
                 // if we need to rewrite super calls.
-                context.enableSubstitution(191 /* CallExpression */);
-                context.enableSubstitution(189 /* PropertyAccessExpression */);
-                context.enableSubstitution(190 /* ElementAccessExpression */);
+                context.enableSubstitution(192 /* CallExpression */);
+                context.enableSubstitution(190 /* PropertyAccessExpression */);
+                context.enableSubstitution(191 /* ElementAccessExpression */);
                 // We need to be notified when entering and exiting declarations that bind super.
-                context.enableEmitNotification(240 /* ClassDeclaration */);
-                context.enableEmitNotification(156 /* MethodDeclaration */);
-                context.enableEmitNotification(158 /* GetAccessor */);
-                context.enableEmitNotification(159 /* SetAccessor */);
-                context.enableEmitNotification(157 /* Constructor */);
+                context.enableEmitNotification(241 /* ClassDeclaration */);
+                context.enableEmitNotification(157 /* MethodDeclaration */);
+                context.enableEmitNotification(159 /* GetAccessor */);
+                context.enableEmitNotification(160 /* SetAccessor */);
+                context.enableEmitNotification(158 /* Constructor */);
                 // We need to be notified when entering the generated accessor arrow functions.
-                context.enableEmitNotification(219 /* VariableStatement */);
+                context.enableEmitNotification(220 /* VariableStatement */);
             }
         }
         /**
@@ -70502,23 +72845,23 @@ var ts;
         }
         function substituteExpression(node) {
             switch (node.kind) {
-                case 189 /* PropertyAccessExpression */:
+                case 190 /* PropertyAccessExpression */:
                     return substitutePropertyAccessExpression(node);
-                case 190 /* ElementAccessExpression */:
+                case 191 /* ElementAccessExpression */:
                     return substituteElementAccessExpression(node);
-                case 191 /* CallExpression */:
+                case 192 /* CallExpression */:
                     return substituteCallExpression(node);
             }
             return node;
         }
         function substitutePropertyAccessExpression(node) {
-            if (node.expression.kind === 98 /* SuperKeyword */) {
+            if (node.expression.kind === 99 /* SuperKeyword */) {
                 return ts.setTextRange(ts.createPropertyAccess(ts.createFileLevelUniqueName("_super"), node.name), node);
             }
             return node;
         }
         function substituteElementAccessExpression(node) {
-            if (node.expression.kind === 98 /* SuperKeyword */) {
+            if (node.expression.kind === 99 /* SuperKeyword */) {
                 return createSuperElementAccessInAsyncMethod(node.argumentExpression, node);
             }
             return node;
@@ -70538,11 +72881,11 @@ var ts;
         }
         function isSuperContainer(node) {
             var kind = node.kind;
-            return kind === 240 /* ClassDeclaration */
-                || kind === 157 /* Constructor */
-                || kind === 156 /* MethodDeclaration */
-                || kind === 158 /* GetAccessor */
-                || kind === 159 /* SetAccessor */;
+            return kind === 241 /* ClassDeclaration */
+                || kind === 158 /* Constructor */
+                || kind === 157 /* MethodDeclaration */
+                || kind === 159 /* GetAccessor */
+                || kind === 160 /* SetAccessor */;
         }
         function createSuperElementAccessInAsyncMethod(argumentExpression, location) {
             if (enclosingSuperContainerFlags & 4096 /* AsyncMethodWithSuperBinding */) {
@@ -70570,7 +72913,7 @@ var ts;
             /* typeParameters */ undefined, 
             /* parameters */ [], 
             /* type */ undefined, 
-            /* equalsGreaterThanToken */ undefined, ts.createPropertyAccess(ts.createSuper(), name))));
+            /* equalsGreaterThanToken */ undefined, ts.setEmitFlags(ts.createPropertyAccess(ts.setEmitFlags(ts.createSuper(), 4 /* NoSubstitution */), name), 4 /* NoSubstitution */))));
             if (hasBinding) {
                 getterAndSetter.push(ts.createPropertyAssignment("set", ts.createArrowFunction(
                 /* modifiers */ undefined, 
@@ -70585,7 +72928,7 @@ var ts;
                     /* initializer */ undefined)
                 ], 
                 /* type */ undefined, 
-                /* equalsGreaterThanToken */ undefined, ts.createAssignment(ts.createPropertyAccess(ts.createSuper(), name), ts.createIdentifier("v")))));
+                /* equalsGreaterThanToken */ undefined, ts.createAssignment(ts.setEmitFlags(ts.createPropertyAccess(ts.setEmitFlags(ts.createSuper(), 4 /* NoSubstitution */), name), 4 /* NoSubstitution */), ts.createIdentifier("v")))));
             }
             accessors.push(ts.createPropertyAssignment(name, ts.createObjectLiteral(getterAndSetter)));
         });
@@ -70604,7 +72947,7 @@ var ts;
         name: "typescript:awaiter",
         scoped: false,
         priority: 5,
-        text: "\n            var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {\n                return new (P || (P = Promise))(function (resolve, reject) {\n                    function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }\n                    function rejected(value) { try { step(generator[\"throw\"](value)); } catch (e) { reject(e); } }\n                    function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }\n                    step((generator = generator.apply(thisArg, _arguments || [])).next());\n                });\n            };"
+        text: "\n            var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {\n                function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }\n                return new (P || (P = Promise))(function (resolve, reject) {\n                    function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }\n                    function rejected(value) { try { step(generator[\"throw\"](value)); } catch (e) { reject(e); } }\n                    function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }\n                    step((generator = generator.apply(thisArg, _arguments || [])).next());\n                });\n            };"
     };
     function createAwaiterHelper(context, hasLexicalArguments, promiseConstructor, body) {
         context.requestEmitHelper(ts.awaiterHelper);
@@ -70677,7 +73020,7 @@ var ts;
             return visitorWorker(node, /*noDestructuringValue*/ true);
         }
         function visitorNoAsyncModifier(node) {
-            if (node.kind === 121 /* AsyncKeyword */) {
+            if (node.kind === 122 /* AsyncKeyword */) {
                 return undefined;
             }
             return node;
@@ -70687,53 +73030,55 @@ var ts;
                 return node;
             }
             switch (node.kind) {
-                case 201 /* AwaitExpression */:
+                case 202 /* AwaitExpression */:
                     return visitAwaitExpression(node);
-                case 207 /* YieldExpression */:
+                case 208 /* YieldExpression */:
                     return visitYieldExpression(node);
-                case 230 /* ReturnStatement */:
+                case 231 /* ReturnStatement */:
                     return visitReturnStatement(node);
-                case 233 /* LabeledStatement */:
+                case 234 /* LabeledStatement */:
                     return visitLabeledStatement(node);
-                case 188 /* ObjectLiteralExpression */:
+                case 189 /* ObjectLiteralExpression */:
                     return visitObjectLiteralExpression(node);
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return visitBinaryExpression(node, noDestructuringValue);
-                case 237 /* VariableDeclaration */:
+                case 275 /* CatchClause */:
+                    return visitCatchClause(node);
+                case 238 /* VariableDeclaration */:
                     return visitVariableDeclaration(node);
-                case 227 /* ForOfStatement */:
+                case 228 /* ForOfStatement */:
                     return visitForOfStatement(node, /*outermostLabeledStatement*/ undefined);
-                case 225 /* ForStatement */:
+                case 226 /* ForStatement */:
                     return visitForStatement(node);
-                case 200 /* VoidExpression */:
+                case 201 /* VoidExpression */:
                     return visitVoidExpression(node);
-                case 157 /* Constructor */:
+                case 158 /* Constructor */:
                     return visitConstructorDeclaration(node);
-                case 156 /* MethodDeclaration */:
+                case 157 /* MethodDeclaration */:
                     return visitMethodDeclaration(node);
-                case 158 /* GetAccessor */:
+                case 159 /* GetAccessor */:
                     return visitGetAccessorDeclaration(node);
-                case 159 /* SetAccessor */:
+                case 160 /* SetAccessor */:
                     return visitSetAccessorDeclaration(node);
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     return visitFunctionDeclaration(node);
-                case 196 /* FunctionExpression */:
+                case 197 /* FunctionExpression */:
                     return visitFunctionExpression(node);
-                case 197 /* ArrowFunction */:
+                case 198 /* ArrowFunction */:
                     return visitArrowFunction(node);
-                case 151 /* Parameter */:
+                case 152 /* Parameter */:
                     return visitParameter(node);
-                case 221 /* ExpressionStatement */:
+                case 222 /* ExpressionStatement */:
                     return visitExpressionStatement(node);
-                case 195 /* ParenthesizedExpression */:
+                case 196 /* ParenthesizedExpression */:
                     return visitParenthesizedExpression(node, noDestructuringValue);
-                case 189 /* PropertyAccessExpression */:
-                    if (capturedSuperProperties && ts.isPropertyAccessExpression(node) && node.expression.kind === 98 /* SuperKeyword */) {
+                case 190 /* PropertyAccessExpression */:
+                    if (capturedSuperProperties && ts.isPropertyAccessExpression(node) && node.expression.kind === 99 /* SuperKeyword */) {
                         capturedSuperProperties.set(node.name.escapedText, true);
                     }
                     return ts.visitEachChild(node, visitor, context);
-                case 190 /* ElementAccessExpression */:
-                    if (capturedSuperProperties && node.expression.kind === 98 /* SuperKeyword */) {
+                case 191 /* ElementAccessExpression */:
+                    if (capturedSuperProperties && node.expression.kind === 99 /* SuperKeyword */) {
                         hasSuperElementAccess = true;
                     }
                     return ts.visitEachChild(node, visitor, context);
@@ -70769,7 +73114,7 @@ var ts;
         function visitLabeledStatement(node) {
             if (enclosingFunctionFlags & 2 /* Async */) {
                 var statement = ts.unwrapInnermostStatementOfLabel(node);
-                if (statement.kind === 227 /* ForOfStatement */ && statement.awaitModifier) {
+                if (statement.kind === 228 /* ForOfStatement */ && statement.awaitModifier) {
                     return visitForOfStatement(statement, node);
                 }
                 return ts.restoreEnclosingLabel(ts.visitEachChild(statement, visitor, context), node);
@@ -70781,7 +73126,7 @@ var ts;
             var objects = [];
             for (var _i = 0, elements_4 = elements; _i < elements_4.length; _i++) {
                 var e = elements_4[_i];
-                if (e.kind === 277 /* SpreadAssignment */) {
+                if (e.kind === 278 /* SpreadAssignment */) {
                     if (chunkObject) {
                         objects.push(ts.createObjectLiteral(chunkObject));
                         chunkObject = undefined;
@@ -70790,7 +73135,7 @@ var ts;
                     objects.push(ts.visitNode(target, visitor, ts.isExpression));
                 }
                 else {
-                    chunkObject = ts.append(chunkObject, e.kind === 275 /* PropertyAssignment */
+                    chunkObject = ts.append(chunkObject, e.kind === 276 /* PropertyAssignment */
                         ? ts.createPropertyAssignment(e.name, ts.visitNode(e.initializer, visitor, ts.isExpression))
                         : ts.visitNode(e, visitor, ts.isObjectLiteralElementLike));
                 }
@@ -70804,14 +73149,39 @@ var ts;
             if (node.transformFlags & 8192 /* ContainsObjectRestOrSpread */) {
                 // spread elements emit like so:
                 // non-spread elements are chunked together into object literals, and then all are passed to __assign:
-                //     { a, ...o, b } => __assign({a}, o, {b});
+                //     { a, ...o, b } => __assign(__assign({a}, o), {b});
                 // If the first element is a spread element, then the first argument to __assign is {}:
-                //     { ...o, a, b, ...o2 } => __assign({}, o, {a, b}, o2)
+                //     { ...o, a, b, ...o2 } => __assign(__assign(__assign({}, o), {a, b}), o2)
+                //
+                // We cannot call __assign with more than two elements, since any element could cause side effects. For
+                // example:
+                //      var k = { a: 1, b: 2 };
+                //      var o = { a: 3, ...k, b: k.a++ };
+                //      // expected: { a: 1, b: 1 }
+                // If we translate the above to `__assign({ a: 3 }, k, { b: k.a++ })`, the `k.a++` will evaluate before
+                // `k` is spread and we end up with `{ a: 2, b: 1 }`.
+                //
+                // This also occurs for spread elements, not just property assignments:
+                //      var k = { a: 1, get b() { l = { z: 9 }; return 2; } };
+                //      var l = { c: 3 };
+                //      var o = { ...k, ...l };
+                //      // expected: { a: 1, b: 2, z: 9 }
+                // If we translate the above to `__assign({}, k, l)`, the `l` will evaluate before `k` is spread and we
+                // end up with `{ a: 1, b: 2, c: 3 }`
                 var objects = chunkObjectLiteralElements(node.properties);
-                if (objects.length && objects[0].kind !== 188 /* ObjectLiteralExpression */) {
+                if (objects.length && objects[0].kind !== 189 /* ObjectLiteralExpression */) {
                     objects.unshift(ts.createObjectLiteral());
                 }
-                return createAssignHelper(context, objects);
+                var expression = objects[0];
+                if (objects.length > 1) {
+                    for (var i = 1; i < objects.length; i++) {
+                        expression = createAssignHelper(context, [expression, objects[i]]);
+                    }
+                    return expression;
+                }
+                else {
+                    return createAssignHelper(context, objects);
+                }
             }
             return ts.visitEachChild(node, visitor, context);
         }
@@ -70835,6 +73205,23 @@ var ts;
             }
             return ts.visitEachChild(node, visitor, context);
         }
+        function visitCatchClause(node) {
+            if (node.variableDeclaration &&
+                ts.isBindingPattern(node.variableDeclaration.name) &&
+                node.variableDeclaration.name.transformFlags & 8192 /* ContainsObjectRestOrSpread */) {
+                var name = ts.getGeneratedNameForNode(node.variableDeclaration.name);
+                var updatedDecl = ts.updateVariableDeclaration(node.variableDeclaration, node.variableDeclaration.name, /*type*/ undefined, name);
+                var visitedBindings = ts.flattenDestructuringBinding(updatedDecl, visitor, context, 1 /* ObjectRest */);
+                var block = ts.visitNode(node.block, visitor, ts.isBlock);
+                if (ts.some(visitedBindings)) {
+                    block = ts.updateBlock(block, [
+                        ts.createVariableStatement(/*modifiers*/ undefined, visitedBindings)
+                    ].concat(block.statements));
+                }
+                return ts.updateCatchClause(node, ts.updateVariableDeclaration(node.variableDeclaration, name, /*type*/ undefined, /*initializer*/ undefined), block);
+            }
+            return ts.visitEachChild(node, visitor, context);
+        }
         /**
          * Visits a VariableDeclaration node with a binding pattern.
          *
@@ -71127,17 +73514,17 @@ var ts;
                 enabledSubstitutions |= 1 /* AsyncMethodsWithSuper */;
                 // We need to enable substitutions for call, property access, and element access
                 // if we need to rewrite super calls.
-                context.enableSubstitution(191 /* CallExpression */);
-                context.enableSubstitution(189 /* PropertyAccessExpression */);
-                context.enableSubstitution(190 /* ElementAccessExpression */);
+                context.enableSubstitution(192 /* CallExpression */);
+                context.enableSubstitution(190 /* PropertyAccessExpression */);
+                context.enableSubstitution(191 /* ElementAccessExpression */);
                 // We need to be notified when entering and exiting declarations that bind super.
-                context.enableEmitNotification(240 /* ClassDeclaration */);
-                context.enableEmitNotification(156 /* MethodDeclaration */);
-                context.enableEmitNotification(158 /* GetAccessor */);
-                context.enableEmitNotification(159 /* SetAccessor */);
-                context.enableEmitNotification(157 /* Constructor */);
+                context.enableEmitNotification(241 /* ClassDeclaration */);
+                context.enableEmitNotification(157 /* MethodDeclaration */);
+                context.enableEmitNotification(159 /* GetAccessor */);
+                context.enableEmitNotification(160 /* SetAccessor */);
+                context.enableEmitNotification(158 /* Constructor */);
                 // We need to be notified when entering the generated accessor arrow functions.
-                context.enableEmitNotification(219 /* VariableStatement */);
+                context.enableEmitNotification(220 /* VariableStatement */);
             }
         }
         /**
@@ -71185,23 +73572,23 @@ var ts;
         }
         function substituteExpression(node) {
             switch (node.kind) {
-                case 189 /* PropertyAccessExpression */:
+                case 190 /* PropertyAccessExpression */:
                     return substitutePropertyAccessExpression(node);
-                case 190 /* ElementAccessExpression */:
+                case 191 /* ElementAccessExpression */:
                     return substituteElementAccessExpression(node);
-                case 191 /* CallExpression */:
+                case 192 /* CallExpression */:
                     return substituteCallExpression(node);
             }
             return node;
         }
         function substitutePropertyAccessExpression(node) {
-            if (node.expression.kind === 98 /* SuperKeyword */) {
+            if (node.expression.kind === 99 /* SuperKeyword */) {
                 return ts.setTextRange(ts.createPropertyAccess(ts.createFileLevelUniqueName("_super"), node.name), node);
             }
             return node;
         }
         function substituteElementAccessExpression(node) {
-            if (node.expression.kind === 98 /* SuperKeyword */) {
+            if (node.expression.kind === 99 /* SuperKeyword */) {
                 return createSuperElementAccessInAsyncMethod(node.argumentExpression, node);
             }
             return node;
@@ -71221,11 +73608,11 @@ var ts;
         }
         function isSuperContainer(node) {
             var kind = node.kind;
-            return kind === 240 /* ClassDeclaration */
-                || kind === 157 /* Constructor */
-                || kind === 156 /* MethodDeclaration */
-                || kind === 158 /* GetAccessor */
-                || kind === 159 /* SetAccessor */;
+            return kind === 241 /* ClassDeclaration */
+                || kind === 158 /* Constructor */
+                || kind === 157 /* MethodDeclaration */
+                || kind === 159 /* GetAccessor */
+                || kind === 160 /* SetAccessor */;
         }
         function createSuperElementAccessInAsyncMethod(argumentExpression, location) {
             if (enclosingSuperContainerFlags & 4096 /* AsyncMethodWithSuperBinding */) {
@@ -71319,7 +73706,7 @@ var ts;
                 return node;
             }
             switch (node.kind) {
-                case 274 /* CatchClause */:
+                case 275 /* CatchClause */:
                     return visitCatchClause(node);
                 default:
                     return ts.visitEachChild(node, visitor, context);
@@ -71388,13 +73775,13 @@ var ts;
         }
         function visitorWorker(node) {
             switch (node.kind) {
-                case 260 /* JsxElement */:
+                case 261 /* JsxElement */:
                     return visitJsxElement(node, /*isChild*/ false);
-                case 261 /* JsxSelfClosingElement */:
+                case 262 /* JsxSelfClosingElement */:
                     return visitJsxSelfClosingElement(node, /*isChild*/ false);
-                case 264 /* JsxFragment */:
+                case 265 /* JsxFragment */:
                     return visitJsxFragment(node, /*isChild*/ false);
-                case 270 /* JsxExpression */:
+                case 271 /* JsxExpression */:
                     return visitJsxExpression(node);
                 default:
                     return ts.visitEachChild(node, visitor, context);
@@ -71404,13 +73791,13 @@ var ts;
             switch (node.kind) {
                 case 11 /* JsxText */:
                     return visitJsxText(node);
-                case 270 /* JsxExpression */:
+                case 271 /* JsxExpression */:
                     return visitJsxExpression(node);
-                case 260 /* JsxElement */:
+                case 261 /* JsxElement */:
                     return visitJsxElement(node, /*isChild*/ true);
-                case 261 /* JsxSelfClosingElement */:
+                case 262 /* JsxSelfClosingElement */:
                     return visitJsxSelfClosingElement(node, /*isChild*/ true);
-                case 264 /* JsxFragment */:
+                case 265 /* JsxFragment */:
                     return visitJsxFragment(node, /*isChild*/ true);
                 default:
                     return ts.Debug.failBadSyntaxKind(node);
@@ -71485,7 +73872,7 @@ var ts;
                 literal.singleQuote = node.singleQuote !== undefined ? node.singleQuote : !ts.isStringDoubleQuoted(node, currentSourceFile);
                 return ts.setTextRange(literal, node);
             }
-            else if (node.kind === 270 /* JsxExpression */) {
+            else if (node.kind === 271 /* JsxExpression */) {
                 if (node.expression === undefined) {
                     return ts.createTrue();
                 }
@@ -71496,7 +73883,7 @@ var ts;
             }
         }
         function visitJsxText(node) {
-            var fixed = fixupWhitespaceAndDecodeEntities(ts.getTextOfNode(node, /*includeTrivia*/ true));
+            var fixed = fixupWhitespaceAndDecodeEntities(node.text);
             return fixed === undefined ? undefined : ts.createLiteral(fixed);
         }
         /**
@@ -71579,7 +73966,7 @@ var ts;
             return decoded === text ? undefined : decoded;
         }
         function getTagName(node) {
-            if (node.kind === 260 /* JsxElement */) {
+            if (node.kind === 261 /* JsxElement */) {
                 return getTagName(node.openingElement);
             }
             else {
@@ -71885,7 +74272,7 @@ var ts;
                 return node;
             }
             switch (node.kind) {
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return visitBinaryExpression(node);
                 default:
                     return ts.visitEachChild(node, visitor, context);
@@ -71893,7 +74280,7 @@ var ts;
         }
         function visitBinaryExpression(node) {
             switch (node.operatorToken.kind) {
-                case 63 /* AsteriskAsteriskEqualsToken */:
+                case 64 /* AsteriskAsteriskEqualsToken */:
                     return visitExponentiationAssignmentExpression(node);
                 case 41 /* AsteriskAsteriskToken */:
                     return visitExponentiationExpression(node);
@@ -71978,62 +74365,63 @@ var ts;
         HierarchyFacts[HierarchyFacts["Block"] = 128] = "Block";
         HierarchyFacts[HierarchyFacts["IterationStatement"] = 256] = "IterationStatement";
         HierarchyFacts[HierarchyFacts["IterationStatementBlock"] = 512] = "IterationStatementBlock";
-        HierarchyFacts[HierarchyFacts["ForStatement"] = 1024] = "ForStatement";
-        HierarchyFacts[HierarchyFacts["ForInOrForOfStatement"] = 2048] = "ForInOrForOfStatement";
-        HierarchyFacts[HierarchyFacts["ConstructorWithCapturedSuper"] = 4096] = "ConstructorWithCapturedSuper";
+        HierarchyFacts[HierarchyFacts["IterationContainer"] = 1024] = "IterationContainer";
+        HierarchyFacts[HierarchyFacts["ForStatement"] = 2048] = "ForStatement";
+        HierarchyFacts[HierarchyFacts["ForInOrForOfStatement"] = 4096] = "ForInOrForOfStatement";
+        HierarchyFacts[HierarchyFacts["ConstructorWithCapturedSuper"] = 8192] = "ConstructorWithCapturedSuper";
         // NOTE: do not add more ancestor flags without also updating AncestorFactsMask below.
         // NOTE: when adding a new ancestor flag, be sure to update the subtree flags below.
         //
         // Ancestor masks
         //
-        HierarchyFacts[HierarchyFacts["AncestorFactsMask"] = 8191] = "AncestorFactsMask";
+        HierarchyFacts[HierarchyFacts["AncestorFactsMask"] = 16383] = "AncestorFactsMask";
         // We are always in *some* kind of block scope, but only specific block-scope containers are
         // top-level or Blocks.
         HierarchyFacts[HierarchyFacts["BlockScopeIncludes"] = 0] = "BlockScopeIncludes";
-        HierarchyFacts[HierarchyFacts["BlockScopeExcludes"] = 4032] = "BlockScopeExcludes";
+        HierarchyFacts[HierarchyFacts["BlockScopeExcludes"] = 7104] = "BlockScopeExcludes";
         // A source file is a top-level block scope.
         HierarchyFacts[HierarchyFacts["SourceFileIncludes"] = 64] = "SourceFileIncludes";
-        HierarchyFacts[HierarchyFacts["SourceFileExcludes"] = 3968] = "SourceFileExcludes";
+        HierarchyFacts[HierarchyFacts["SourceFileExcludes"] = 8064] = "SourceFileExcludes";
         // Functions, methods, and accessors are both new lexical scopes and new block scopes.
         HierarchyFacts[HierarchyFacts["FunctionIncludes"] = 65] = "FunctionIncludes";
-        HierarchyFacts[HierarchyFacts["FunctionExcludes"] = 8094] = "FunctionExcludes";
+        HierarchyFacts[HierarchyFacts["FunctionExcludes"] = 16286] = "FunctionExcludes";
         HierarchyFacts[HierarchyFacts["AsyncFunctionBodyIncludes"] = 69] = "AsyncFunctionBodyIncludes";
-        HierarchyFacts[HierarchyFacts["AsyncFunctionBodyExcludes"] = 8086] = "AsyncFunctionBodyExcludes";
+        HierarchyFacts[HierarchyFacts["AsyncFunctionBodyExcludes"] = 16278] = "AsyncFunctionBodyExcludes";
         // Arrow functions are lexically scoped to their container, but are new block scopes.
         HierarchyFacts[HierarchyFacts["ArrowFunctionIncludes"] = 66] = "ArrowFunctionIncludes";
-        HierarchyFacts[HierarchyFacts["ArrowFunctionExcludes"] = 8064] = "ArrowFunctionExcludes";
+        HierarchyFacts[HierarchyFacts["ArrowFunctionExcludes"] = 15232] = "ArrowFunctionExcludes";
         // Constructors are both new lexical scopes and new block scopes. Constructors are also
         // always considered non-static members of a class.
         HierarchyFacts[HierarchyFacts["ConstructorIncludes"] = 73] = "ConstructorIncludes";
-        HierarchyFacts[HierarchyFacts["ConstructorExcludes"] = 8086] = "ConstructorExcludes";
+        HierarchyFacts[HierarchyFacts["ConstructorExcludes"] = 16278] = "ConstructorExcludes";
         // 'do' and 'while' statements are not block scopes. We track that the subtree is contained
         // within an IterationStatement to indicate whether the embedded statement is an
         // IterationStatementBlock.
-        HierarchyFacts[HierarchyFacts["DoOrWhileStatementIncludes"] = 256] = "DoOrWhileStatementIncludes";
+        HierarchyFacts[HierarchyFacts["DoOrWhileStatementIncludes"] = 1280] = "DoOrWhileStatementIncludes";
         HierarchyFacts[HierarchyFacts["DoOrWhileStatementExcludes"] = 0] = "DoOrWhileStatementExcludes";
         // 'for' statements are new block scopes and have special handling for 'let' declarations.
-        HierarchyFacts[HierarchyFacts["ForStatementIncludes"] = 1280] = "ForStatementIncludes";
-        HierarchyFacts[HierarchyFacts["ForStatementExcludes"] = 3008] = "ForStatementExcludes";
+        HierarchyFacts[HierarchyFacts["ForStatementIncludes"] = 3328] = "ForStatementIncludes";
+        HierarchyFacts[HierarchyFacts["ForStatementExcludes"] = 5056] = "ForStatementExcludes";
         // 'for-in' and 'for-of' statements are new block scopes and have special handling for
         // 'let' declarations.
-        HierarchyFacts[HierarchyFacts["ForInOrForOfStatementIncludes"] = 2304] = "ForInOrForOfStatementIncludes";
-        HierarchyFacts[HierarchyFacts["ForInOrForOfStatementExcludes"] = 1984] = "ForInOrForOfStatementExcludes";
+        HierarchyFacts[HierarchyFacts["ForInOrForOfStatementIncludes"] = 5376] = "ForInOrForOfStatementIncludes";
+        HierarchyFacts[HierarchyFacts["ForInOrForOfStatementExcludes"] = 3008] = "ForInOrForOfStatementExcludes";
         // Blocks (other than function bodies) are new block scopes.
         HierarchyFacts[HierarchyFacts["BlockIncludes"] = 128] = "BlockIncludes";
-        HierarchyFacts[HierarchyFacts["BlockExcludes"] = 3904] = "BlockExcludes";
+        HierarchyFacts[HierarchyFacts["BlockExcludes"] = 6976] = "BlockExcludes";
         HierarchyFacts[HierarchyFacts["IterationStatementBlockIncludes"] = 512] = "IterationStatementBlockIncludes";
-        HierarchyFacts[HierarchyFacts["IterationStatementBlockExcludes"] = 4032] = "IterationStatementBlockExcludes";
+        HierarchyFacts[HierarchyFacts["IterationStatementBlockExcludes"] = 7104] = "IterationStatementBlockExcludes";
         //
         // Subtree facts
         //
-        HierarchyFacts[HierarchyFacts["NewTarget"] = 8192] = "NewTarget";
-        HierarchyFacts[HierarchyFacts["CapturedLexicalThis"] = 16384] = "CapturedLexicalThis";
+        HierarchyFacts[HierarchyFacts["NewTarget"] = 16384] = "NewTarget";
+        HierarchyFacts[HierarchyFacts["CapturedLexicalThis"] = 32768] = "CapturedLexicalThis";
         //
         // Subtree masks
         //
-        HierarchyFacts[HierarchyFacts["SubtreeFactsMask"] = -8192] = "SubtreeFactsMask";
+        HierarchyFacts[HierarchyFacts["SubtreeFactsMask"] = -16384] = "SubtreeFactsMask";
         HierarchyFacts[HierarchyFacts["ArrowFunctionSubtreeExcludes"] = 0] = "ArrowFunctionSubtreeExcludes";
-        HierarchyFacts[HierarchyFacts["FunctionSubtreeExcludes"] = 24576] = "FunctionSubtreeExcludes";
+        HierarchyFacts[HierarchyFacts["FunctionSubtreeExcludes"] = 49152] = "FunctionSubtreeExcludes";
     })(HierarchyFacts || (HierarchyFacts = {}));
     function transformES2015(context) {
         var startLexicalEnvironment = context.startLexicalEnvironment, resumeLexicalEnvironment = context.resumeLexicalEnvironment, endLexicalEnvironment = context.endLexicalEnvironment, hoistVariableDeclaration = context.hoistVariableDeclaration;
@@ -72082,7 +74470,7 @@ var ts;
          */
         function enterSubtree(excludeFacts, includeFacts) {
             var ancestorFacts = hierarchyFacts;
-            hierarchyFacts = (hierarchyFacts & ~excludeFacts | includeFacts) & 8191 /* AncestorFactsMask */;
+            hierarchyFacts = (hierarchyFacts & ~excludeFacts | includeFacts) & 16383 /* AncestorFactsMask */;
             return ancestorFacts;
         }
         /**
@@ -72093,17 +74481,17 @@ var ts;
          * @param includeFacts The new `HierarchyFacts` of the subtree that should be propagated.
          */
         function exitSubtree(ancestorFacts, excludeFacts, includeFacts) {
-            hierarchyFacts = (hierarchyFacts & ~excludeFacts | includeFacts) & -8192 /* SubtreeFactsMask */ | ancestorFacts;
+            hierarchyFacts = (hierarchyFacts & ~excludeFacts | includeFacts) & -16384 /* SubtreeFactsMask */ | ancestorFacts;
         }
         function isReturnVoidStatementInConstructorWithCapturedSuper(node) {
-            return (hierarchyFacts & 4096 /* ConstructorWithCapturedSuper */) !== 0
-                && node.kind === 230 /* ReturnStatement */
+            return (hierarchyFacts & 8192 /* ConstructorWithCapturedSuper */) !== 0
+                && node.kind === 231 /* ReturnStatement */
                 && !node.expression;
         }
         function shouldVisitNode(node) {
             return (node.transformFlags & 128 /* ContainsES2015 */) !== 0
                 || convertedLoopState !== undefined
-                || (hierarchyFacts & 4096 /* ConstructorWithCapturedSuper */ && (ts.isStatement(node) || (node.kind === 218 /* Block */)))
+                || (hierarchyFacts & 8192 /* ConstructorWithCapturedSuper */ && (ts.isStatement(node) || (node.kind === 219 /* Block */)))
                 || (ts.isIterationStatement(node, /*lookInLabeledStatements*/ false) && shouldConvertIterationStatement(node))
                 || (ts.getEmitFlags(node) & 33554432 /* TypeScriptClassWrapper */) !== 0;
         }
@@ -72116,72 +74504,72 @@ var ts;
             }
         }
         function callExpressionVisitor(node) {
-            if (node.kind === 98 /* SuperKeyword */) {
+            if (node.kind === 99 /* SuperKeyword */) {
                 return visitSuperKeyword(/*isExpressionOfCall*/ true);
             }
             return visitor(node);
         }
         function visitJavaScript(node) {
             switch (node.kind) {
-                case 116 /* StaticKeyword */:
+                case 117 /* StaticKeyword */:
                     return undefined; // elide static keyword
-                case 240 /* ClassDeclaration */:
+                case 241 /* ClassDeclaration */:
                     return visitClassDeclaration(node);
-                case 209 /* ClassExpression */:
+                case 210 /* ClassExpression */:
                     return visitClassExpression(node);
-                case 151 /* Parameter */:
+                case 152 /* Parameter */:
                     return visitParameter(node);
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     return visitFunctionDeclaration(node);
-                case 197 /* ArrowFunction */:
+                case 198 /* ArrowFunction */:
                     return visitArrowFunction(node);
-                case 196 /* FunctionExpression */:
+                case 197 /* FunctionExpression */:
                     return visitFunctionExpression(node);
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     return visitVariableDeclaration(node);
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return visitIdentifier(node);
-                case 238 /* VariableDeclarationList */:
+                case 239 /* VariableDeclarationList */:
                     return visitVariableDeclarationList(node);
-                case 232 /* SwitchStatement */:
+                case 233 /* SwitchStatement */:
                     return visitSwitchStatement(node);
-                case 246 /* CaseBlock */:
+                case 247 /* CaseBlock */:
                     return visitCaseBlock(node);
-                case 218 /* Block */:
+                case 219 /* Block */:
                     return visitBlock(node, /*isFunctionBody*/ false);
-                case 229 /* BreakStatement */:
-                case 228 /* ContinueStatement */:
+                case 230 /* BreakStatement */:
+                case 229 /* ContinueStatement */:
                     return visitBreakOrContinueStatement(node);
-                case 233 /* LabeledStatement */:
+                case 234 /* LabeledStatement */:
                     return visitLabeledStatement(node);
-                case 223 /* DoStatement */:
-                case 224 /* WhileStatement */:
+                case 224 /* DoStatement */:
+                case 225 /* WhileStatement */:
                     return visitDoOrWhileStatement(node, /*outermostLabeledStatement*/ undefined);
-                case 225 /* ForStatement */:
+                case 226 /* ForStatement */:
                     return visitForStatement(node, /*outermostLabeledStatement*/ undefined);
-                case 226 /* ForInStatement */:
+                case 227 /* ForInStatement */:
                     return visitForInStatement(node, /*outermostLabeledStatement*/ undefined);
-                case 227 /* ForOfStatement */:
+                case 228 /* ForOfStatement */:
                     return visitForOfStatement(node, /*outermostLabeledStatement*/ undefined);
-                case 221 /* ExpressionStatement */:
+                case 222 /* ExpressionStatement */:
                     return visitExpressionStatement(node);
-                case 188 /* ObjectLiteralExpression */:
+                case 189 /* ObjectLiteralExpression */:
                     return visitObjectLiteralExpression(node);
-                case 274 /* CatchClause */:
+                case 275 /* CatchClause */:
                     return visitCatchClause(node);
-                case 276 /* ShorthandPropertyAssignment */:
+                case 277 /* ShorthandPropertyAssignment */:
                     return visitShorthandPropertyAssignment(node);
-                case 149 /* ComputedPropertyName */:
+                case 150 /* ComputedPropertyName */:
                     return visitComputedPropertyName(node);
-                case 187 /* ArrayLiteralExpression */:
+                case 188 /* ArrayLiteralExpression */:
                     return visitArrayLiteralExpression(node);
-                case 191 /* CallExpression */:
+                case 192 /* CallExpression */:
                     return visitCallExpression(node);
-                case 192 /* NewExpression */:
+                case 193 /* NewExpression */:
                     return visitNewExpression(node);
-                case 195 /* ParenthesizedExpression */:
+                case 196 /* ParenthesizedExpression */:
                     return visitParenthesizedExpression(node, /*needsDestructuringValue*/ true);
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return visitBinaryExpression(node, /*needsDestructuringValue*/ true);
                 case 14 /* NoSubstitutionTemplateLiteral */:
                 case 15 /* TemplateHead */:
@@ -72192,35 +74580,35 @@ var ts;
                     return visitStringLiteral(node);
                 case 8 /* NumericLiteral */:
                     return visitNumericLiteral(node);
-                case 193 /* TaggedTemplateExpression */:
+                case 194 /* TaggedTemplateExpression */:
                     return visitTaggedTemplateExpression(node);
-                case 206 /* TemplateExpression */:
+                case 207 /* TemplateExpression */:
                     return visitTemplateExpression(node);
-                case 207 /* YieldExpression */:
+                case 208 /* YieldExpression */:
                     return visitYieldExpression(node);
-                case 208 /* SpreadElement */:
+                case 209 /* SpreadElement */:
                     return visitSpreadElement(node);
-                case 98 /* SuperKeyword */:
+                case 99 /* SuperKeyword */:
                     return visitSuperKeyword(/*isExpressionOfCall*/ false);
-                case 100 /* ThisKeyword */:
+                case 101 /* ThisKeyword */:
                     return visitThisKeyword(node);
-                case 214 /* MetaProperty */:
+                case 215 /* MetaProperty */:
                     return visitMetaProperty(node);
-                case 156 /* MethodDeclaration */:
+                case 157 /* MethodDeclaration */:
                     return visitMethodDeclaration(node);
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     return visitAccessorDeclaration(node);
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     return visitVariableStatement(node);
-                case 230 /* ReturnStatement */:
+                case 231 /* ReturnStatement */:
                     return visitReturnStatement(node);
                 default:
                     return ts.visitEachChild(node, visitor, context);
             }
         }
         function visitSourceFile(node) {
-            var ancestorFacts = enterSubtree(3968 /* SourceFileExcludes */, 64 /* SourceFileIncludes */);
+            var ancestorFacts = enterSubtree(8064 /* SourceFileExcludes */, 64 /* SourceFileIncludes */);
             var prologue = [];
             var statements = [];
             startLexicalEnvironment();
@@ -72247,7 +74635,7 @@ var ts;
             return ts.visitEachChild(node, visitor, context);
         }
         function visitCaseBlock(node) {
-            var ancestorFacts = enterSubtree(4032 /* BlockScopeExcludes */, 0 /* BlockScopeIncludes */);
+            var ancestorFacts = enterSubtree(7104 /* BlockScopeExcludes */, 0 /* BlockScopeIncludes */);
             var updated = ts.visitEachChild(node, visitor, context);
             exitSubtree(ancestorFacts, 0 /* None */, 0 /* None */);
             return updated;
@@ -72274,7 +74662,7 @@ var ts;
         }
         function visitThisKeyword(node) {
             if (hierarchyFacts & 2 /* ArrowFunction */) {
-                hierarchyFacts |= 16384 /* CapturedLexicalThis */;
+                hierarchyFacts |= 32768 /* CapturedLexicalThis */;
             }
             if (convertedLoopState) {
                 if (hierarchyFacts & 2 /* ArrowFunction */) {
@@ -72304,14 +74692,14 @@ var ts;
                 // it is possible if either
                 //   - break/continue is labeled and label is located inside the converted loop
                 //   - break/continue is non-labeled and located in non-converted loop/switch statement
-                var jump = node.kind === 229 /* BreakStatement */ ? 2 /* Break */ : 4 /* Continue */;
+                var jump = node.kind === 230 /* BreakStatement */ ? 2 /* Break */ : 4 /* Continue */;
                 var canUseBreakOrContinue = (node.label && convertedLoopState.labels && convertedLoopState.labels.get(ts.idText(node.label))) ||
                     (!node.label && (convertedLoopState.allowedNonLabeledJumps & jump));
                 if (!canUseBreakOrContinue) {
                     var labelMarker = void 0;
                     var label = node.label;
                     if (!label) {
-                        if (node.kind === 229 /* BreakStatement */) {
+                        if (node.kind === 230 /* BreakStatement */) {
                             convertedLoopState.nonLocalJumps |= 2 /* Break */;
                             labelMarker = "break";
                         }
@@ -72322,7 +74710,7 @@ var ts;
                         }
                     }
                     else {
-                        if (node.kind === 229 /* BreakStatement */) {
+                        if (node.kind === 230 /* BreakStatement */) {
                             labelMarker = "break-" + label.escapedText;
                             setLabeledJump(convertedLoopState, /*isBreak*/ true, ts.idText(label), labelMarker);
                         }
@@ -72517,7 +74905,7 @@ var ts;
         function addConstructor(statements, node, extendsClauseElement) {
             var savedConvertedLoopState = convertedLoopState;
             convertedLoopState = undefined;
-            var ancestorFacts = enterSubtree(8086 /* ConstructorExcludes */, 73 /* ConstructorIncludes */);
+            var ancestorFacts = enterSubtree(16278 /* ConstructorExcludes */, 73 /* ConstructorIncludes */);
             var constructor = ts.getFirstConstructorWithBody(node);
             var hasSynthesizedSuper = hasSynthesizedDefaultSuperCall(constructor, extendsClauseElement !== undefined);
             var constructorFunction = ts.createFunctionDeclaration(
@@ -72531,7 +74919,7 @@ var ts;
                 ts.setEmitFlags(constructorFunction, 8 /* CapturesThis */);
             }
             statements.push(constructorFunction);
-            exitSubtree(ancestorFacts, 24576 /* FunctionSubtreeExcludes */, 0 /* None */);
+            exitSubtree(ancestorFacts, 49152 /* FunctionSubtreeExcludes */, 0 /* None */);
             convertedLoopState = savedConvertedLoopState;
         }
         /**
@@ -72580,7 +74968,7 @@ var ts;
         function transformConstructorBody(constructor, node, extendsClauseElement, hasSynthesizedSuper) {
             // determine whether the class is known syntactically to be a derived class (e.g. a
             // class that extends a value that is not syntactically known to be `null`).
-            var isDerivedClass = !!extendsClauseElement && ts.skipOuterExpressions(extendsClauseElement.expression).kind !== 96 /* NullKeyword */;
+            var isDerivedClass = !!extendsClauseElement && ts.skipOuterExpressions(extendsClauseElement.expression).kind !== 97 /* NullKeyword */;
             // When the subclass does not have a constructor, we synthesize a *default* constructor using the following
             // representation:
             //
@@ -72624,7 +75012,7 @@ var ts;
                 }
             }
             if (superCallExpression) {
-                hierarchyFacts |= 4096 /* ConstructorWithCapturedSuper */;
+                hierarchyFacts |= 8192 /* ConstructorWithCapturedSuper */;
                 statementOffset++; // skip this statement, we will add it after visiting the rest of the body.
             }
             // visit the remaining statements
@@ -72718,11 +75106,11 @@ var ts;
          */
         function isSufficientlyCoveredByReturnStatements(statement) {
             // A return statement is considered covered.
-            if (statement.kind === 230 /* ReturnStatement */) {
+            if (statement.kind === 231 /* ReturnStatement */) {
                 return true;
             }
             // An if-statement with two covered branches is covered.
-            else if (statement.kind === 222 /* IfStatement */) {
+            else if (statement.kind === 223 /* IfStatement */) {
                 var ifStatement = statement;
                 if (ifStatement.elseStatement) {
                     return isSufficientlyCoveredByReturnStatements(ifStatement.thenStatement) &&
@@ -72730,7 +75118,7 @@ var ts;
                 }
             }
             // A block is covered if it has a last statement which is covered.
-            else if (statement.kind === 218 /* Block */) {
+            else if (statement.kind === 219 /* Block */) {
                 var lastStatement = ts.lastOrUndefined(statement.statements);
                 if (lastStatement && isSufficientlyCoveredByReturnStatements(lastStatement)) {
                     return true;
@@ -72885,10 +75273,10 @@ var ts;
                 return false;
             }
             // `declarationName` is the name of the local declaration for the parameter.
-            var declarationName = parameter.name.kind === 72 /* Identifier */ ? ts.getMutableClone(parameter.name) : ts.createTempVariable(/*recordTempVariable*/ undefined);
+            var declarationName = parameter.name.kind === 73 /* Identifier */ ? ts.getMutableClone(parameter.name) : ts.createTempVariable(/*recordTempVariable*/ undefined);
             ts.setEmitFlags(declarationName, 48 /* NoSourceMap */);
             // `expressionName` is the name of the parameter used in expressions.
-            var expressionName = parameter.name.kind === 72 /* Identifier */ ? ts.getSynthesizedClone(parameter.name) : declarationName;
+            var expressionName = parameter.name.kind === 73 /* Identifier */ ? ts.getSynthesizedClone(parameter.name) : declarationName;
             var restIndex = node.parameters.length - 1;
             var temp = ts.createLoopVariable();
             // var param = [];
@@ -72912,7 +75300,7 @@ var ts;
             ts.setEmitFlags(forStatement, 1048576 /* CustomPrologue */);
             ts.startOnNewLine(forStatement);
             prologueStatements.push(forStatement);
-            if (parameter.name.kind !== 72 /* Identifier */) {
+            if (parameter.name.kind !== 73 /* Identifier */) {
                 // do the actual destructuring of the rest parameter if necessary
                 prologueStatements.push(ts.setEmitFlags(ts.setTextRange(ts.createVariableStatement(
                 /*modifiers*/ undefined, ts.createVariableDeclarationList(ts.flattenDestructuringBinding(parameter, visitor, context, 0 /* All */, expressionName))), parameter), 1048576 /* CustomPrologue */));
@@ -72928,7 +75316,7 @@ var ts;
          * @param node A node.
          */
         function insertCaptureThisForNodeIfNeeded(statements, node) {
-            if (hierarchyFacts & 16384 /* CapturedLexicalThis */ && node.kind !== 197 /* ArrowFunction */) {
+            if (hierarchyFacts & 32768 /* CapturedLexicalThis */ && node.kind !== 198 /* ArrowFunction */) {
                 insertCaptureThisForNode(statements, node, ts.createThis());
                 return true;
             }
@@ -72946,28 +75334,28 @@ var ts;
             ts.insertStatementAfterCustomPrologue(statements, captureThisStatement);
         }
         function insertCaptureNewTargetIfNeeded(statements, node, copyOnWrite) {
-            if (hierarchyFacts & 8192 /* NewTarget */) {
+            if (hierarchyFacts & 16384 /* NewTarget */) {
                 var newTarget = void 0;
                 switch (node.kind) {
-                    case 197 /* ArrowFunction */:
+                    case 198 /* ArrowFunction */:
                         return statements;
-                    case 156 /* MethodDeclaration */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
+                    case 157 /* MethodDeclaration */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
                         // Methods and accessors cannot be constructors, so 'new.target' will
                         // always return 'undefined'.
                         newTarget = ts.createVoidZero();
                         break;
-                    case 157 /* Constructor */:
+                    case 158 /* Constructor */:
                         // Class constructors can only be called with `new`, so `this.constructor`
                         // should be relatively safe to use.
                         newTarget = ts.createPropertyAccess(ts.setEmitFlags(ts.createThis(), 4 /* NoSubstitution */), "constructor");
                         break;
-                    case 239 /* FunctionDeclaration */:
-                    case 196 /* FunctionExpression */:
+                    case 240 /* FunctionDeclaration */:
+                    case 197 /* FunctionExpression */:
                         // Functions can be called or constructed, and may have a `this` due to
                         // being a member or when calling an imported function via `other_1.f()`.
-                        newTarget = ts.createConditional(ts.createLogicalAnd(ts.setEmitFlags(ts.createThis(), 4 /* NoSubstitution */), ts.createBinary(ts.setEmitFlags(ts.createThis(), 4 /* NoSubstitution */), 94 /* InstanceOfKeyword */, ts.getLocalName(node))), ts.createPropertyAccess(ts.setEmitFlags(ts.createThis(), 4 /* NoSubstitution */), "constructor"), ts.createVoidZero());
+                        newTarget = ts.createConditional(ts.createLogicalAnd(ts.setEmitFlags(ts.createThis(), 4 /* NoSubstitution */), ts.createBinary(ts.setEmitFlags(ts.createThis(), 4 /* NoSubstitution */), 95 /* InstanceOfKeyword */, ts.getLocalName(node))), ts.createPropertyAccess(ts.setEmitFlags(ts.createThis(), 4 /* NoSubstitution */), "constructor"), ts.createVoidZero());
                         break;
                     default:
                         return ts.Debug.failBadSyntaxKind(node);
@@ -72996,24 +75384,24 @@ var ts;
             for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                 var member = _a[_i];
                 switch (member.kind) {
-                    case 217 /* SemicolonClassElement */:
+                    case 218 /* SemicolonClassElement */:
                         statements.push(transformSemicolonClassElementToStatement(member));
                         break;
-                    case 156 /* MethodDeclaration */:
+                    case 157 /* MethodDeclaration */:
                         statements.push(transformClassMethodDeclarationToStatement(getClassMemberPrefix(node, member), member, node));
                         break;
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
                         var accessors = ts.getAllAccessorDeclarations(node.members, member);
                         if (member === accessors.firstAccessor) {
                             statements.push(transformAccessorsToStatement(getClassMemberPrefix(node, member), accessors, node));
                         }
                         break;
-                    case 157 /* Constructor */:
+                    case 158 /* Constructor */:
                         // Constructors are handled in visitClassExpression/visitClassDeclaration
                         break;
                     default:
-                        ts.Debug.failBadSyntaxKind(node);
+                        ts.Debug.failBadSyntaxKind(member, currentSourceFile && currentSourceFile.fileName);
                         break;
                 }
             }
@@ -73076,7 +75464,7 @@ var ts;
             // arguments are both mapped contiguously to the accessor name.
             var target = ts.getMutableClone(receiver);
             ts.setEmitFlags(target, 1536 /* NoComments */ | 32 /* NoTrailingSourceMap */);
-            ts.setSourceMapRange(target, firstAccessor.name); // TODO: GH#18217
+            ts.setSourceMapRange(target, firstAccessor.name);
             var propertyName = ts.createExpressionForPropertyName(ts.visitNode(firstAccessor.name, visitor, ts.isPropertyName));
             ts.setEmitFlags(propertyName, 1536 /* NoComments */ | 16 /* NoLeadingSourceMap */);
             ts.setSourceMapRange(propertyName, firstAccessor.name);
@@ -73116,11 +75504,11 @@ var ts;
          */
         function visitArrowFunction(node) {
             if (node.transformFlags & 2048 /* ContainsLexicalThis */) {
-                hierarchyFacts |= 16384 /* CapturedLexicalThis */;
+                hierarchyFacts |= 32768 /* CapturedLexicalThis */;
             }
             var savedConvertedLoopState = convertedLoopState;
             convertedLoopState = undefined;
-            var ancestorFacts = enterSubtree(8064 /* ArrowFunctionExcludes */, 66 /* ArrowFunctionIncludes */);
+            var ancestorFacts = enterSubtree(15232 /* ArrowFunctionExcludes */, 66 /* ArrowFunctionIncludes */);
             var func = ts.createFunctionExpression(
             /*modifiers*/ undefined, 
             /*asteriskToken*/ undefined, 
@@ -73130,7 +75518,7 @@ var ts;
             ts.setTextRange(func, node);
             ts.setOriginalNode(func, node);
             ts.setEmitFlags(func, 8 /* CapturesThis */);
-            if (hierarchyFacts & 16384 /* CapturedLexicalThis */) {
+            if (hierarchyFacts & 32768 /* CapturedLexicalThis */) {
                 enableSubstitutionsForCapturedThis();
             }
             // If an arrow function contains
@@ -73145,16 +75533,16 @@ var ts;
          */
         function visitFunctionExpression(node) {
             var ancestorFacts = ts.getEmitFlags(node) & 262144 /* AsyncFunctionBody */
-                ? enterSubtree(8086 /* AsyncFunctionBodyExcludes */, 69 /* AsyncFunctionBodyIncludes */)
-                : enterSubtree(8094 /* FunctionExcludes */, 65 /* FunctionIncludes */);
+                ? enterSubtree(16278 /* AsyncFunctionBodyExcludes */, 69 /* AsyncFunctionBodyIncludes */)
+                : enterSubtree(16286 /* FunctionExcludes */, 65 /* FunctionIncludes */);
             var savedConvertedLoopState = convertedLoopState;
             convertedLoopState = undefined;
             var parameters = ts.visitParameterList(node.parameters, visitor, context);
             var body = transformFunctionBody(node);
-            var name = hierarchyFacts & 8192 /* NewTarget */
+            var name = hierarchyFacts & 16384 /* NewTarget */
                 ? ts.getLocalName(node)
                 : node.name;
-            exitSubtree(ancestorFacts, 24576 /* FunctionSubtreeExcludes */, 0 /* None */);
+            exitSubtree(ancestorFacts, 49152 /* FunctionSubtreeExcludes */, 0 /* None */);
             convertedLoopState = savedConvertedLoopState;
             return ts.updateFunctionExpression(node, 
             /*modifiers*/ undefined, node.asteriskToken, name, 
@@ -73169,13 +75557,13 @@ var ts;
         function visitFunctionDeclaration(node) {
             var savedConvertedLoopState = convertedLoopState;
             convertedLoopState = undefined;
-            var ancestorFacts = enterSubtree(8094 /* FunctionExcludes */, 65 /* FunctionIncludes */);
+            var ancestorFacts = enterSubtree(16286 /* FunctionExcludes */, 65 /* FunctionIncludes */);
             var parameters = ts.visitParameterList(node.parameters, visitor, context);
             var body = transformFunctionBody(node);
-            var name = hierarchyFacts & 8192 /* NewTarget */
+            var name = hierarchyFacts & 16384 /* NewTarget */
                 ? ts.getLocalName(node)
                 : node.name;
-            exitSubtree(ancestorFacts, 24576 /* FunctionSubtreeExcludes */, 0 /* None */);
+            exitSubtree(ancestorFacts, 49152 /* FunctionSubtreeExcludes */, 0 /* None */);
             convertedLoopState = savedConvertedLoopState;
             return ts.updateFunctionDeclaration(node, 
             /*decorators*/ undefined, ts.visitNodes(node.modifiers, visitor, ts.isModifier), node.asteriskToken, name, 
@@ -73193,14 +75581,14 @@ var ts;
             var savedConvertedLoopState = convertedLoopState;
             convertedLoopState = undefined;
             var ancestorFacts = container && ts.isClassLike(container) && !ts.hasModifier(node, 32 /* Static */)
-                ? enterSubtree(8094 /* FunctionExcludes */, 65 /* FunctionIncludes */ | 8 /* NonStaticClassElement */)
-                : enterSubtree(8094 /* FunctionExcludes */, 65 /* FunctionIncludes */);
+                ? enterSubtree(16286 /* FunctionExcludes */, 65 /* FunctionIncludes */ | 8 /* NonStaticClassElement */)
+                : enterSubtree(16286 /* FunctionExcludes */, 65 /* FunctionIncludes */);
             var parameters = ts.visitParameterList(node.parameters, visitor, context);
             var body = transformFunctionBody(node);
-            if (hierarchyFacts & 8192 /* NewTarget */ && !name && (node.kind === 239 /* FunctionDeclaration */ || node.kind === 196 /* FunctionExpression */)) {
+            if (hierarchyFacts & 16384 /* NewTarget */ && !name && (node.kind === 240 /* FunctionDeclaration */ || node.kind === 197 /* FunctionExpression */)) {
                 name = ts.getGeneratedNameForNode(node);
             }
-            exitSubtree(ancestorFacts, 24576 /* FunctionSubtreeExcludes */, 0 /* None */);
+            exitSubtree(ancestorFacts, 49152 /* FunctionSubtreeExcludes */, 0 /* None */);
             convertedLoopState = savedConvertedLoopState;
             return ts.setOriginalNode(ts.setTextRange(ts.createFunctionExpression(
             /*modifiers*/ undefined, node.asteriskToken, name, 
@@ -73241,7 +75629,7 @@ var ts;
                 }
             }
             else {
-                ts.Debug.assert(node.kind === 197 /* ArrowFunction */);
+                ts.Debug.assert(node.kind === 198 /* ArrowFunction */);
                 // To align with the old emitter, we use a synthetic end position on the location
                 // for the statement list we synthesize when we down-level an arrow function with
                 // an expression function body. This prevents both comments and source maps from
@@ -73295,8 +75683,8 @@ var ts;
                 return ts.visitEachChild(node, visitor, context);
             }
             var ancestorFacts = hierarchyFacts & 256 /* IterationStatement */
-                ? enterSubtree(4032 /* IterationStatementBlockExcludes */, 512 /* IterationStatementBlockIncludes */)
-                : enterSubtree(3904 /* BlockExcludes */, 128 /* BlockIncludes */);
+                ? enterSubtree(7104 /* IterationStatementBlockExcludes */, 512 /* IterationStatementBlockIncludes */)
+                : enterSubtree(6976 /* BlockExcludes */, 128 /* BlockIncludes */);
             var updated = ts.visitEachChild(node, visitor, context);
             exitSubtree(ancestorFacts, 0 /* None */, 0 /* None */);
             return updated;
@@ -73309,9 +75697,9 @@ var ts;
         function visitExpressionStatement(node) {
             // If we are here it is most likely because our expression is a destructuring assignment.
             switch (node.expression.kind) {
-                case 195 /* ParenthesizedExpression */:
+                case 196 /* ParenthesizedExpression */:
                     return ts.updateExpressionStatement(node, visitParenthesizedExpression(node.expression, /*needsDestructuringValue*/ false));
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return ts.updateExpressionStatement(node, visitBinaryExpression(node.expression, /*needsDestructuringValue*/ false));
             }
             return ts.visitEachChild(node, visitor, context);
@@ -73330,9 +75718,9 @@ var ts;
                 // expression. If we are in a state where we do not need the destructuring value,
                 // we pass that information along to the children that care about it.
                 switch (node.expression.kind) {
-                    case 195 /* ParenthesizedExpression */:
+                    case 196 /* ParenthesizedExpression */:
                         return ts.updateParen(node, visitParenthesizedExpression(node.expression, /*needsDestructuringValue*/ false));
-                    case 204 /* BinaryExpression */:
+                    case 205 /* BinaryExpression */:
                         return ts.updateParen(node, visitBinaryExpression(node.expression, /*needsDestructuringValue*/ false));
                 }
             }
@@ -73367,7 +75755,7 @@ var ts;
                             assignment = ts.flattenDestructuringAssignment(decl, visitor, context, 0 /* All */);
                         }
                         else {
-                            assignment = ts.createBinary(decl.name, 59 /* EqualsToken */, ts.visitNode(decl.initializer, visitor, ts.isExpression));
+                            assignment = ts.createBinary(decl.name, 60 /* EqualsToken */, ts.visitNode(decl.initializer, visitor, ts.isExpression));
                             ts.setTextRange(assignment, decl);
                         }
                         assignments = ts.append(assignments, assignment);
@@ -73479,11 +75867,11 @@ var ts;
                     && isDeclaredInLoop
                     && (hierarchyFacts & 512 /* IterationStatementBlock */) !== 0);
             var emitExplicitInitializer = !emittedAsTopLevel
-                && (hierarchyFacts & 2048 /* ForInOrForOfStatement */) === 0
+                && (hierarchyFacts & 4096 /* ForInOrForOfStatement */) === 0
                 && (!resolver.isDeclarationWithCollidingName(node)
                     || (isDeclaredInLoop
                         && !isCapturedInFunction
-                        && (hierarchyFacts & (1024 /* ForStatement */ | 2048 /* ForInOrForOfStatement */)) === 0));
+                        && (hierarchyFacts & (2048 /* ForStatement */ | 4096 /* ForInOrForOfStatement */)) === 0));
             return emitExplicitInitializer;
         }
         /**
@@ -73500,9 +75888,9 @@ var ts;
                 return visitVariableDeclaration(node);
             }
             if (!node.initializer && shouldEmitExplicitInitializerForLetDeclaration(node)) {
-                var clone_2 = ts.getMutableClone(node);
-                clone_2.initializer = ts.createVoidZero();
-                return clone_2;
+                var clone_3 = ts.getMutableClone(node);
+                clone_3.initializer = ts.createVoidZero();
+                return clone_3;
             }
             return ts.visitEachChild(node, visitor, context);
         }
@@ -73541,34 +75929,34 @@ var ts;
         }
         function visitIterationStatement(node, outermostLabeledStatement) {
             switch (node.kind) {
-                case 223 /* DoStatement */:
-                case 224 /* WhileStatement */:
+                case 224 /* DoStatement */:
+                case 225 /* WhileStatement */:
                     return visitDoOrWhileStatement(node, outermostLabeledStatement);
-                case 225 /* ForStatement */:
+                case 226 /* ForStatement */:
                     return visitForStatement(node, outermostLabeledStatement);
-                case 226 /* ForInStatement */:
+                case 227 /* ForInStatement */:
                     return visitForInStatement(node, outermostLabeledStatement);
-                case 227 /* ForOfStatement */:
+                case 228 /* ForOfStatement */:
                     return visitForOfStatement(node, outermostLabeledStatement);
             }
         }
         function visitIterationStatementWithFacts(excludeFacts, includeFacts, node, outermostLabeledStatement, convert) {
             var ancestorFacts = enterSubtree(excludeFacts, includeFacts);
-            var updated = convertIterationStatementBodyIfNecessary(node, outermostLabeledStatement, convert);
+            var updated = convertIterationStatementBodyIfNecessary(node, outermostLabeledStatement, ancestorFacts, convert);
             exitSubtree(ancestorFacts, 0 /* None */, 0 /* None */);
             return updated;
         }
         function visitDoOrWhileStatement(node, outermostLabeledStatement) {
-            return visitIterationStatementWithFacts(0 /* DoOrWhileStatementExcludes */, 256 /* DoOrWhileStatementIncludes */, node, outermostLabeledStatement);
+            return visitIterationStatementWithFacts(0 /* DoOrWhileStatementExcludes */, 1280 /* DoOrWhileStatementIncludes */, node, outermostLabeledStatement);
         }
         function visitForStatement(node, outermostLabeledStatement) {
-            return visitIterationStatementWithFacts(3008 /* ForStatementExcludes */, 1280 /* ForStatementIncludes */, node, outermostLabeledStatement);
+            return visitIterationStatementWithFacts(5056 /* ForStatementExcludes */, 3328 /* ForStatementIncludes */, node, outermostLabeledStatement);
         }
         function visitForInStatement(node, outermostLabeledStatement) {
-            return visitIterationStatementWithFacts(1984 /* ForInOrForOfStatementExcludes */, 2304 /* ForInOrForOfStatementIncludes */, node, outermostLabeledStatement);
+            return visitIterationStatementWithFacts(3008 /* ForInOrForOfStatementExcludes */, 5376 /* ForInOrForOfStatementIncludes */, node, outermostLabeledStatement);
         }
         function visitForOfStatement(node, outermostLabeledStatement) {
-            return visitIterationStatementWithFacts(1984 /* ForInOrForOfStatementExcludes */, 2304 /* ForInOrForOfStatementIncludes */, node, outermostLabeledStatement, compilerOptions.downlevelIteration ? convertForOfStatementForIterable : convertForOfStatementForArray);
+            return visitIterationStatementWithFacts(3008 /* ForInOrForOfStatementExcludes */, 5376 /* ForInOrForOfStatementIncludes */, node, outermostLabeledStatement, compilerOptions.downlevelIteration ? convertForOfStatementForIterable : convertForOfStatementForArray);
         }
         function convertForOfStatementHead(node, boundValue, convertedLoopBodyStatements) {
             var statements = [];
@@ -73676,7 +76064,7 @@ var ts;
             ts.setTextRange(forStatement, node);
             return ts.restoreEnclosingLabel(forStatement, outermostLabeledStatement, convertedLoopState && resetLabel);
         }
-        function convertForOfStatementForIterable(node, outermostLabeledStatement, convertedLoopBodyStatements) {
+        function convertForOfStatementForIterable(node, outermostLabeledStatement, convertedLoopBodyStatements, ancestorFacts) {
             var expression = ts.visitNode(node.expression, visitor, ts.isExpression);
             var iterator = ts.isIdentifier(expression) ? ts.getGeneratedNameForNode(expression) : ts.createTempVariable(/*recordTempVariable*/ undefined);
             var result = ts.isIdentifier(expression) ? ts.getGeneratedNameForNode(iterator) : ts.createTempVariable(/*recordTempVariable*/ undefined);
@@ -73687,9 +76075,13 @@ var ts;
             var next = ts.createCall(ts.createPropertyAccess(iterator, "next"), /*typeArguments*/ undefined, []);
             hoistVariableDeclaration(errorRecord);
             hoistVariableDeclaration(returnMethod);
+            // if we are enclosed in an outer loop ensure we reset 'errorRecord' per each iteration
+            var initializer = ancestorFacts & 1024 /* IterationContainer */
+                ? ts.inlineExpressions([ts.createAssignment(errorRecord, ts.createVoidZero()), values])
+                : values;
             var forStatement = ts.setEmitFlags(ts.setTextRange(ts.createFor(
             /*initializer*/ ts.setEmitFlags(ts.setTextRange(ts.createVariableDeclarationList([
-                ts.setTextRange(ts.createVariableDeclaration(iterator, /*type*/ undefined, values), node.expression),
+                ts.setTextRange(ts.createVariableDeclaration(iterator, /*type*/ undefined, initializer), node.expression),
                 ts.createVariableDeclaration(result, /*type*/ undefined, next)
             ]), node.expression), 2097152 /* NoHoisting */), 
             /*condition*/ ts.createLogicalNot(ts.createPropertyAccess(result, "done")), 
@@ -73732,7 +76124,7 @@ var ts;
                     && i < numInitialPropertiesWithoutYield) {
                     numInitialPropertiesWithoutYield = i;
                 }
-                if (property.name.kind === 149 /* ComputedPropertyName */) {
+                if (property.name.kind === 150 /* ComputedPropertyName */) {
                     numInitialProperties = i;
                     break;
                 }
@@ -73787,7 +76179,7 @@ var ts;
             }
             visit(node.name);
             function visit(node) {
-                if (node.kind === 72 /* Identifier */) {
+                if (node.kind === 73 /* Identifier */) {
                     state.hoistedLocalVariables.push(node);
                 }
                 else {
@@ -73800,7 +76192,7 @@ var ts;
                 }
             }
         }
-        function convertIterationStatementBodyIfNecessary(node, outermostLabeledStatement, convert) {
+        function convertIterationStatementBodyIfNecessary(node, outermostLabeledStatement, ancestorFacts, convert) {
             if (!shouldConvertIterationStatement(node)) {
                 var saveAllowedNonLabeledJumps = void 0;
                 if (convertedLoopState) {
@@ -73810,7 +76202,7 @@ var ts;
                     convertedLoopState.allowedNonLabeledJumps = 2 /* Break */ | 4 /* Continue */;
                 }
                 var result = convert
-                    ? convert(node, outermostLabeledStatement, /*convertedLoopBodyStatements*/ undefined)
+                    ? convert(node, outermostLabeledStatement, /*convertedLoopBodyStatements*/ undefined, ancestorFacts)
                     : ts.restoreEnclosingLabel(ts.visitEachChild(node, visitor, context), outermostLabeledStatement, convertedLoopState && resetLabel);
                 if (convertedLoopState) {
                     convertedLoopState.allowedNonLabeledJumps = saveAllowedNonLabeledJumps;
@@ -73835,29 +76227,29 @@ var ts;
             var loop;
             if (bodyFunction) {
                 if (convert) {
-                    loop = convert(node, outermostLabeledStatement, bodyFunction.part);
+                    loop = convert(node, outermostLabeledStatement, bodyFunction.part, ancestorFacts);
                 }
                 else {
-                    var clone_3 = convertIterationStatementCore(node, initializerFunction, ts.createBlock(bodyFunction.part, /*multiLine*/ true));
-                    ts.aggregateTransformFlags(clone_3);
-                    loop = ts.restoreEnclosingLabel(clone_3, outermostLabeledStatement, convertedLoopState && resetLabel);
+                    var clone_4 = convertIterationStatementCore(node, initializerFunction, ts.createBlock(bodyFunction.part, /*multiLine*/ true));
+                    ts.aggregateTransformFlags(clone_4);
+                    loop = ts.restoreEnclosingLabel(clone_4, outermostLabeledStatement, convertedLoopState && resetLabel);
                 }
             }
             else {
-                var clone_4 = convertIterationStatementCore(node, initializerFunction, ts.visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock));
-                ts.aggregateTransformFlags(clone_4);
-                loop = ts.restoreEnclosingLabel(clone_4, outermostLabeledStatement, convertedLoopState && resetLabel);
+                var clone_5 = convertIterationStatementCore(node, initializerFunction, ts.visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock));
+                ts.aggregateTransformFlags(clone_5);
+                loop = ts.restoreEnclosingLabel(clone_5, outermostLabeledStatement, convertedLoopState && resetLabel);
             }
             statements.push(loop);
             return statements;
         }
         function convertIterationStatementCore(node, initializerFunction, convertedLoopBody) {
             switch (node.kind) {
-                case 225 /* ForStatement */: return convertForStatement(node, initializerFunction, convertedLoopBody);
-                case 226 /* ForInStatement */: return convertForInStatement(node, convertedLoopBody);
-                case 227 /* ForOfStatement */: return convertForOfStatement(node, convertedLoopBody);
-                case 223 /* DoStatement */: return convertDoStatement(node, convertedLoopBody);
-                case 224 /* WhileStatement */: return convertWhileStatement(node, convertedLoopBody);
+                case 226 /* ForStatement */: return convertForStatement(node, initializerFunction, convertedLoopBody);
+                case 227 /* ForInStatement */: return convertForInStatement(node, convertedLoopBody);
+                case 228 /* ForOfStatement */: return convertForOfStatement(node, convertedLoopBody);
+                case 224 /* DoStatement */: return convertDoStatement(node, convertedLoopBody);
+                case 225 /* WhileStatement */: return convertWhileStatement(node, convertedLoopBody);
                 default: return ts.Debug.failBadSyntaxKind(node, "IterationStatement expected");
             }
         }
@@ -73882,11 +76274,11 @@ var ts;
         function createConvertedLoopState(node) {
             var loopInitializer;
             switch (node.kind) {
-                case 225 /* ForStatement */:
-                case 226 /* ForInStatement */:
-                case 227 /* ForOfStatement */:
+                case 226 /* ForStatement */:
+                case 227 /* ForInStatement */:
+                case 228 /* ForOfStatement */:
                     var initializer = node.initializer;
-                    if (initializer && initializer.kind === 238 /* VariableDeclarationList */) {
+                    if (initializer && initializer.kind === 239 /* VariableDeclarationList */) {
                         loopInitializer = initializer;
                     }
                     break;
@@ -74148,7 +76540,7 @@ var ts;
         function copyOutParameter(outParam, copyDirection) {
             var source = copyDirection === 0 /* ToOriginal */ ? outParam.outParamName : outParam.originalName;
             var target = copyDirection === 0 /* ToOriginal */ ? outParam.originalName : outParam.outParamName;
-            return ts.createBinary(target, 59 /* EqualsToken */, source);
+            return ts.createBinary(target, 60 /* EqualsToken */, source);
         }
         function copyOutParameters(outParams, partFlags, copyDirection, statements) {
             for (var _i = 0, outParams_1 = outParams; _i < outParams_1.length; _i++) {
@@ -74285,20 +76677,20 @@ var ts;
             for (var i = start; i < numProperties; i++) {
                 var property = properties[i];
                 switch (property.kind) {
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
                         var accessors = ts.getAllAccessorDeclarations(node.properties, property);
                         if (property === accessors.firstAccessor) {
                             expressions.push(transformAccessorsToExpression(receiver, accessors, node, !!node.multiLine));
                         }
                         break;
-                    case 156 /* MethodDeclaration */:
+                    case 157 /* MethodDeclaration */:
                         expressions.push(transformObjectLiteralMethodDeclarationToExpression(property, receiver, node, node.multiLine));
                         break;
-                    case 275 /* PropertyAssignment */:
+                    case 276 /* PropertyAssignment */:
                         expressions.push(transformPropertyAssignmentToExpression(property, receiver, node.multiLine));
                         break;
-                    case 276 /* ShorthandPropertyAssignment */:
+                    case 277 /* ShorthandPropertyAssignment */:
                         expressions.push(transformShorthandPropertyAssignmentToExpression(property, receiver, node.multiLine));
                         break;
                     default:
@@ -74353,7 +76745,7 @@ var ts;
             return expression;
         }
         function visitCatchClause(node) {
-            var ancestorFacts = enterSubtree(4032 /* BlockScopeExcludes */, 0 /* BlockScopeIncludes */);
+            var ancestorFacts = enterSubtree(7104 /* BlockScopeExcludes */, 0 /* BlockScopeIncludes */);
             var updated;
             ts.Debug.assert(!!node.variableDeclaration, "Catch clause variable should always be present when downleveling ES2015.");
             if (ts.isBindingPattern(node.variableDeclaration.name)) {
@@ -74401,17 +76793,17 @@ var ts;
             ts.Debug.assert(!ts.isComputedPropertyName(node.name));
             var savedConvertedLoopState = convertedLoopState;
             convertedLoopState = undefined;
-            var ancestorFacts = enterSubtree(8094 /* FunctionExcludes */, 65 /* FunctionIncludes */);
+            var ancestorFacts = enterSubtree(16286 /* FunctionExcludes */, 65 /* FunctionIncludes */);
             var updated;
             var parameters = ts.visitParameterList(node.parameters, visitor, context);
             var body = transformFunctionBody(node);
-            if (node.kind === 158 /* GetAccessor */) {
+            if (node.kind === 159 /* GetAccessor */) {
                 updated = ts.updateGetAccessor(node, node.decorators, node.modifiers, node.name, parameters, node.type, body);
             }
             else {
                 updated = ts.updateSetAccessor(node, node.decorators, node.modifiers, node.name, parameters, body);
             }
-            exitSubtree(ancestorFacts, 24576 /* FunctionSubtreeExcludes */, 0 /* None */);
+            exitSubtree(ancestorFacts, 49152 /* FunctionSubtreeExcludes */, 0 /* None */);
             convertedLoopState = savedConvertedLoopState;
             return updated;
         }
@@ -74458,7 +76850,7 @@ var ts;
                 return visitTypeScriptClassWrapper(node);
             }
             var expression = ts.skipOuterExpressions(node.expression);
-            if (expression.kind === 98 /* SuperKeyword */ ||
+            if (expression.kind === 99 /* SuperKeyword */ ||
                 ts.isSuperProperty(expression) ||
                 ts.some(node.arguments, ts.isSpreadElement)) {
                 return visitCallExpressionWithPotentialCapturedThisAssignment(node, /*assignToCapturedThis*/ true);
@@ -74582,10 +76974,10 @@ var ts;
             // We are here either because SuperKeyword was used somewhere in the expression, or
             // because we contain a SpreadElementExpression.
             if (node.transformFlags & 4096 /* ContainsRestOrSpread */ ||
-                node.expression.kind === 98 /* SuperKeyword */ ||
+                node.expression.kind === 99 /* SuperKeyword */ ||
                 ts.isSuperProperty(ts.skipOuterExpressions(node.expression))) {
                 var _a = ts.createCallBinding(node.expression, hoistVariableDeclaration), target = _a.target, thisArg = _a.thisArg;
-                if (node.expression.kind === 98 /* SuperKeyword */) {
+                if (node.expression.kind === 99 /* SuperKeyword */) {
                     ts.setEmitFlags(thisArg, 4 /* NoSubstitution */);
                 }
                 var resultingCall = void 0;
@@ -74603,7 +76995,7 @@ var ts;
                     //      _super.apply(this, a.concat([b]))
                     //      _super.m.apply(this, a.concat([b]))
                     //      _super.prototype.m.apply(this, a.concat([b]))
-                    resultingCall = ts.createFunctionApply(ts.visitNode(target, callExpressionVisitor, ts.isExpression), node.expression.kind === 98 /* SuperKeyword */ ? thisArg : ts.visitNode(thisArg, visitor, ts.isExpression), transformAndSpreadElements(node.arguments, /*needsUniqueCopy*/ false, /*multiLine*/ false, /*hasTrailingComma*/ false));
+                    resultingCall = ts.createFunctionApply(ts.visitNode(target, callExpressionVisitor, ts.isExpression), node.expression.kind === 99 /* SuperKeyword */ ? thisArg : ts.visitNode(thisArg, visitor, ts.isExpression), transformAndSpreadElements(node.arguments, /*needsUniqueCopy*/ false, /*multiLine*/ false, /*hasTrailingComma*/ false));
                 }
                 else {
                     // [source]
@@ -74615,10 +77007,10 @@ var ts;
                     //      _super.call(this, a)
                     //      _super.m.call(this, a)
                     //      _super.prototype.m.call(this, a)
-                    resultingCall = ts.createFunctionCall(ts.visitNode(target, callExpressionVisitor, ts.isExpression), node.expression.kind === 98 /* SuperKeyword */ ? thisArg : ts.visitNode(thisArg, visitor, ts.isExpression), ts.visitNodes(node.arguments, visitor, ts.isExpression), 
+                    resultingCall = ts.createFunctionCall(ts.visitNode(target, callExpressionVisitor, ts.isExpression), node.expression.kind === 99 /* SuperKeyword */ ? thisArg : ts.visitNode(thisArg, visitor, ts.isExpression), ts.visitNodes(node.arguments, visitor, ts.isExpression), 
                     /*location*/ node);
                 }
-                if (node.expression.kind === 98 /* SuperKeyword */) {
+                if (node.expression.kind === 99 /* SuperKeyword */) {
                     var initializer = ts.createLogicalOr(resultingCall, createActualThis());
                     resultingCall = assignToCapturedThis
                         ? ts.createAssignment(ts.createFileLevelUniqueName("_this"), initializer)
@@ -74658,8 +77050,11 @@ var ts;
             // [source]
             //      [a, ...b, c]
             //
+            // [output (downlevelIteration)]
+            //      __spread([a], b, [c])
+            //
             // [output]
-            //      [a].concat(b, [c])
+            //      __spreadArrays([a], b, [c])
             // Map spans of spread expressions into their expressions and spans of other
             // expressions into an array literal.
             var numElements = elements.length;
@@ -74669,10 +77064,7 @@ var ts;
             if (compilerOptions.downlevelIteration) {
                 if (segments.length === 1) {
                     var firstSegment = segments[0];
-                    if (ts.isCallExpression(firstSegment)
-                        && ts.isIdentifier(firstSegment.expression)
-                        && (ts.getEmitFlags(firstSegment.expression) & 4096 /* HelperName */)
-                        && firstSegment.expression.escapedText === "___spread") {
+                    if (isCallToHelper(firstSegment, "___spread")) {
                         return segments[0];
                     }
                 }
@@ -74680,15 +77072,28 @@ var ts;
             }
             else {
                 if (segments.length === 1) {
-                    var firstElement = elements[0];
-                    return needsUniqueCopy && ts.isSpreadElement(firstElement) && firstElement.expression.kind !== 187 /* ArrayLiteralExpression */
-                        ? ts.createArraySlice(segments[0])
-                        : segments[0];
+                    var firstSegment = segments[0];
+                    if (!needsUniqueCopy
+                        || isPackedArrayLiteral(firstSegment)
+                        || isCallToHelper(firstSegment, "___spreadArrays")) {
+                        return segments[0];
+                    }
                 }
-                // Rewrite using the pattern <segment0>.concat(<segment1>, <segment2>, ...)
-                return ts.createArrayConcat(segments.shift(), segments);
+                return ts.createSpreadArraysHelper(context, segments);
             }
         }
+        function isPackedElement(node) {
+            return !ts.isOmittedExpression(node);
+        }
+        function isPackedArrayLiteral(node) {
+            return ts.isArrayLiteralExpression(node) && ts.every(node.elements, isPackedElement);
+        }
+        function isCallToHelper(firstSegment, helperName) {
+            return ts.isCallExpression(firstSegment)
+                && ts.isIdentifier(firstSegment.expression)
+                && (ts.getEmitFlags(firstSegment.expression) & 4096 /* HelperName */)
+                && firstSegment.expression.escapedText === helperName;
+        }
         function partitionSpread(node) {
             return ts.isSpreadElement(node)
                 ? visitSpanOfSpreads
@@ -74896,8 +77301,8 @@ var ts;
                 : ts.createFileLevelUniqueName("_super");
         }
         function visitMetaProperty(node) {
-            if (node.keywordToken === 95 /* NewKeyword */ && node.name.escapedText === "target") {
-                hierarchyFacts |= 8192 /* NewTarget */;
+            if (node.keywordToken === 96 /* NewKeyword */ && node.name.escapedText === "target") {
+                hierarchyFacts |= 16384 /* NewTarget */;
                 return ts.createFileLevelUniqueName("_newTarget");
             }
             return node;
@@ -74912,7 +77317,7 @@ var ts;
         function onEmitNode(hint, node, emitCallback) {
             if (enabledSubstitutions & 1 /* CapturedThis */ && ts.isFunctionLike(node)) {
                 // If we are tracking a captured `this`, keep track of the enclosing function.
-                var ancestorFacts = enterSubtree(8094 /* FunctionExcludes */, ts.getEmitFlags(node) & 8 /* CapturesThis */
+                var ancestorFacts = enterSubtree(16286 /* FunctionExcludes */, ts.getEmitFlags(node) & 8 /* CapturesThis */
                     ? 65 /* FunctionIncludes */ | 16 /* CapturesThis */
                     : 65 /* FunctionIncludes */);
                 previousOnEmitNode(hint, node, emitCallback);
@@ -74928,7 +77333,7 @@ var ts;
         function enableSubstitutionsForBlockScopedBindings() {
             if ((enabledSubstitutions & 2 /* BlockScopedBindings */) === 0) {
                 enabledSubstitutions |= 2 /* BlockScopedBindings */;
-                context.enableSubstitution(72 /* Identifier */);
+                context.enableSubstitution(73 /* Identifier */);
             }
         }
         /**
@@ -74938,14 +77343,14 @@ var ts;
         function enableSubstitutionsForCapturedThis() {
             if ((enabledSubstitutions & 1 /* CapturedThis */) === 0) {
                 enabledSubstitutions |= 1 /* CapturedThis */;
-                context.enableSubstitution(100 /* ThisKeyword */);
-                context.enableEmitNotification(157 /* Constructor */);
-                context.enableEmitNotification(156 /* MethodDeclaration */);
-                context.enableEmitNotification(158 /* GetAccessor */);
-                context.enableEmitNotification(159 /* SetAccessor */);
-                context.enableEmitNotification(197 /* ArrowFunction */);
-                context.enableEmitNotification(196 /* FunctionExpression */);
-                context.enableEmitNotification(239 /* FunctionDeclaration */);
+                context.enableSubstitution(101 /* ThisKeyword */);
+                context.enableEmitNotification(158 /* Constructor */);
+                context.enableEmitNotification(157 /* MethodDeclaration */);
+                context.enableEmitNotification(159 /* GetAccessor */);
+                context.enableEmitNotification(160 /* SetAccessor */);
+                context.enableEmitNotification(198 /* ArrowFunction */);
+                context.enableEmitNotification(197 /* FunctionExpression */);
+                context.enableEmitNotification(240 /* FunctionDeclaration */);
             }
         }
         /**
@@ -74986,10 +77391,10 @@ var ts;
          */
         function isNameOfDeclarationWithCollidingName(node) {
             switch (node.parent.kind) {
-                case 186 /* BindingElement */:
-                case 240 /* ClassDeclaration */:
-                case 243 /* EnumDeclaration */:
-                case 237 /* VariableDeclaration */:
+                case 187 /* BindingElement */:
+                case 241 /* ClassDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 238 /* VariableDeclaration */:
                     return node.parent.name === node
                         && resolver.isDeclarationWithCollidingName(node.parent);
             }
@@ -75002,9 +77407,9 @@ var ts;
          */
         function substituteExpression(node) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return substituteExpressionIdentifier(node);
-                case 100 /* ThisKeyword */:
+                case 101 /* ThisKeyword */:
                     return substituteThisKeyword(node);
             }
             return node;
@@ -75071,19 +77476,19 @@ var ts;
                 return false;
             }
             var statement = ts.firstOrUndefined(constructor.body.statements);
-            if (!statement || !ts.nodeIsSynthesized(statement) || statement.kind !== 221 /* ExpressionStatement */) {
+            if (!statement || !ts.nodeIsSynthesized(statement) || statement.kind !== 222 /* ExpressionStatement */) {
                 return false;
             }
             var statementExpression = statement.expression;
-            if (!ts.nodeIsSynthesized(statementExpression) || statementExpression.kind !== 191 /* CallExpression */) {
+            if (!ts.nodeIsSynthesized(statementExpression) || statementExpression.kind !== 192 /* CallExpression */) {
                 return false;
             }
             var callTarget = statementExpression.expression;
-            if (!ts.nodeIsSynthesized(callTarget) || callTarget.kind !== 98 /* SuperKeyword */) {
+            if (!ts.nodeIsSynthesized(callTarget) || callTarget.kind !== 99 /* SuperKeyword */) {
                 return false;
             }
             var callArgument = ts.singleOrUndefined(statementExpression.arguments);
-            if (!callArgument || !ts.nodeIsSynthesized(callArgument) || callArgument.kind !== 208 /* SpreadElement */) {
+            if (!callArgument || !ts.nodeIsSynthesized(callArgument) || callArgument.kind !== 209 /* SpreadElement */) {
                 return false;
             }
             var expression = callArgument.expression;
@@ -75136,15 +77541,15 @@ var ts;
         if (compilerOptions.jsx === 1 /* Preserve */ || compilerOptions.jsx === 3 /* ReactNative */) {
             previousOnEmitNode = context.onEmitNode;
             context.onEmitNode = onEmitNode;
-            context.enableEmitNotification(262 /* JsxOpeningElement */);
-            context.enableEmitNotification(263 /* JsxClosingElement */);
-            context.enableEmitNotification(261 /* JsxSelfClosingElement */);
+            context.enableEmitNotification(263 /* JsxOpeningElement */);
+            context.enableEmitNotification(264 /* JsxClosingElement */);
+            context.enableEmitNotification(262 /* JsxSelfClosingElement */);
             noSubstitution = [];
         }
         var previousOnSubstituteNode = context.onSubstituteNode;
         context.onSubstituteNode = onSubstituteNode;
-        context.enableSubstitution(189 /* PropertyAccessExpression */);
-        context.enableSubstitution(275 /* PropertyAssignment */);
+        context.enableSubstitution(190 /* PropertyAccessExpression */);
+        context.enableSubstitution(276 /* PropertyAssignment */);
         return ts.chainBundle(transformSourceFile);
         /**
          * Transforms an ES5 source file to ES3.
@@ -75163,9 +77568,9 @@ var ts;
          */
         function onEmitNode(hint, node, emitCallback) {
             switch (node.kind) {
-                case 262 /* JsxOpeningElement */:
-                case 263 /* JsxClosingElement */:
-                case 261 /* JsxSelfClosingElement */:
+                case 263 /* JsxOpeningElement */:
+                case 264 /* JsxClosingElement */:
+                case 262 /* JsxSelfClosingElement */:
                     var tagName = node.tagName;
                     noSubstitution[ts.getOriginalNodeId(tagName)] = true;
                     break;
@@ -75222,7 +77627,7 @@ var ts;
          */
         function trySubstituteReservedName(name) {
             var token = name.originalKeywordKind || (ts.nodeIsSynthesized(name) ? ts.stringToToken(ts.idText(name)) : undefined);
-            if (token !== undefined && token >= 73 /* FirstReservedWord */ && token <= 108 /* LastReservedWord */) {
+            if (token !== undefined && token >= 74 /* FirstReservedWord */ && token <= 109 /* LastReservedWord */) {
                 return ts.setTextRange(ts.createLiteral(name), name);
             }
             return undefined;
@@ -75497,13 +77902,13 @@ var ts;
          */
         function visitJavaScriptInStatementContainingYield(node) {
             switch (node.kind) {
-                case 223 /* DoStatement */:
+                case 224 /* DoStatement */:
                     return visitDoStatement(node);
-                case 224 /* WhileStatement */:
+                case 225 /* WhileStatement */:
                     return visitWhileStatement(node);
-                case 232 /* SwitchStatement */:
+                case 233 /* SwitchStatement */:
                     return visitSwitchStatement(node);
-                case 233 /* LabeledStatement */:
+                case 234 /* LabeledStatement */:
                     return visitLabeledStatement(node);
                 default:
                     return visitJavaScriptInGeneratorFunctionBody(node);
@@ -75516,24 +77921,24 @@ var ts;
          */
         function visitJavaScriptInGeneratorFunctionBody(node) {
             switch (node.kind) {
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     return visitFunctionDeclaration(node);
-                case 196 /* FunctionExpression */:
+                case 197 /* FunctionExpression */:
                     return visitFunctionExpression(node);
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     return visitAccessorDeclaration(node);
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     return visitVariableStatement(node);
-                case 225 /* ForStatement */:
+                case 226 /* ForStatement */:
                     return visitForStatement(node);
-                case 226 /* ForInStatement */:
+                case 227 /* ForInStatement */:
                     return visitForInStatement(node);
-                case 229 /* BreakStatement */:
+                case 230 /* BreakStatement */:
                     return visitBreakStatement(node);
-                case 228 /* ContinueStatement */:
+                case 229 /* ContinueStatement */:
                     return visitContinueStatement(node);
-                case 230 /* ReturnStatement */:
+                case 231 /* ReturnStatement */:
                     return visitReturnStatement(node);
                 default:
                     if (node.transformFlags & 131072 /* ContainsYield */) {
@@ -75554,21 +77959,21 @@ var ts;
          */
         function visitJavaScriptContainingYield(node) {
             switch (node.kind) {
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return visitBinaryExpression(node);
-                case 205 /* ConditionalExpression */:
+                case 206 /* ConditionalExpression */:
                     return visitConditionalExpression(node);
-                case 207 /* YieldExpression */:
+                case 208 /* YieldExpression */:
                     return visitYieldExpression(node);
-                case 187 /* ArrayLiteralExpression */:
+                case 188 /* ArrayLiteralExpression */:
                     return visitArrayLiteralExpression(node);
-                case 188 /* ObjectLiteralExpression */:
+                case 189 /* ObjectLiteralExpression */:
                     return visitObjectLiteralExpression(node);
-                case 190 /* ElementAccessExpression */:
+                case 191 /* ElementAccessExpression */:
                     return visitElementAccessExpression(node);
-                case 191 /* CallExpression */:
+                case 192 /* CallExpression */:
                     return visitCallExpression(node);
-                case 192 /* NewExpression */:
+                case 193 /* NewExpression */:
                     return visitNewExpression(node);
                 default:
                     return ts.visitEachChild(node, visitor, context);
@@ -75581,9 +77986,9 @@ var ts;
          */
         function visitGenerator(node) {
             switch (node.kind) {
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     return visitFunctionDeclaration(node);
-                case 196 /* FunctionExpression */:
+                case 197 /* FunctionExpression */:
                     return visitFunctionExpression(node);
                 default:
                     return ts.Debug.failBadSyntaxKind(node);
@@ -75782,23 +78187,23 @@ var ts;
             }
         }
         function isCompoundAssignment(kind) {
-            return kind >= 60 /* FirstCompoundAssignment */
-                && kind <= 71 /* LastCompoundAssignment */;
+            return kind >= 61 /* FirstCompoundAssignment */
+                && kind <= 72 /* LastCompoundAssignment */;
         }
         function getOperatorForCompoundAssignment(kind) {
             switch (kind) {
-                case 60 /* PlusEqualsToken */: return 38 /* PlusToken */;
-                case 61 /* MinusEqualsToken */: return 39 /* MinusToken */;
-                case 62 /* AsteriskEqualsToken */: return 40 /* AsteriskToken */;
-                case 63 /* AsteriskAsteriskEqualsToken */: return 41 /* AsteriskAsteriskToken */;
-                case 64 /* SlashEqualsToken */: return 42 /* SlashToken */;
-                case 65 /* PercentEqualsToken */: return 43 /* PercentToken */;
-                case 66 /* LessThanLessThanEqualsToken */: return 46 /* LessThanLessThanToken */;
-                case 67 /* GreaterThanGreaterThanEqualsToken */: return 47 /* GreaterThanGreaterThanToken */;
-                case 68 /* GreaterThanGreaterThanGreaterThanEqualsToken */: return 48 /* GreaterThanGreaterThanGreaterThanToken */;
-                case 69 /* AmpersandEqualsToken */: return 49 /* AmpersandToken */;
-                case 70 /* BarEqualsToken */: return 50 /* BarToken */;
-                case 71 /* CaretEqualsToken */: return 51 /* CaretToken */;
+                case 61 /* PlusEqualsToken */: return 38 /* PlusToken */;
+                case 62 /* MinusEqualsToken */: return 39 /* MinusToken */;
+                case 63 /* AsteriskEqualsToken */: return 40 /* AsteriskToken */;
+                case 64 /* AsteriskAsteriskEqualsToken */: return 41 /* AsteriskAsteriskToken */;
+                case 65 /* SlashEqualsToken */: return 42 /* SlashToken */;
+                case 66 /* PercentEqualsToken */: return 43 /* PercentToken */;
+                case 67 /* LessThanLessThanEqualsToken */: return 46 /* LessThanLessThanToken */;
+                case 68 /* GreaterThanGreaterThanEqualsToken */: return 47 /* GreaterThanGreaterThanToken */;
+                case 69 /* GreaterThanGreaterThanGreaterThanEqualsToken */: return 48 /* GreaterThanGreaterThanGreaterThanToken */;
+                case 70 /* AmpersandEqualsToken */: return 49 /* AmpersandToken */;
+                case 71 /* BarEqualsToken */: return 50 /* BarToken */;
+                case 72 /* CaretEqualsToken */: return 51 /* CaretToken */;
             }
         }
         /**
@@ -75811,7 +78216,7 @@ var ts;
             if (containsYield(right)) {
                 var target = void 0;
                 switch (left.kind) {
-                    case 189 /* PropertyAccessExpression */:
+                    case 190 /* PropertyAccessExpression */:
                         // [source]
                         //      a.b = yield;
                         //
@@ -75823,7 +78228,7 @@ var ts;
                         //      _a.b = %sent%;
                         target = ts.updatePropertyAccess(left, cacheExpression(ts.visitNode(left.expression, visitor, ts.isLeftHandSideExpression)), left.name);
                         break;
-                    case 190 /* ElementAccessExpression */:
+                    case 191 /* ElementAccessExpression */:
                         // [source]
                         //      a[b] = yield;
                         //
@@ -75866,10 +78271,10 @@ var ts;
                 //      _a = a();
                 //  .yield resumeLabel
                 //      _a + %sent% + c()
-                var clone_5 = ts.getMutableClone(node);
-                clone_5.left = cacheExpression(ts.visitNode(node.left, visitor, ts.isExpression));
-                clone_5.right = ts.visitNode(node.right, visitor, ts.isExpression);
-                return clone_5;
+                var clone_6 = ts.getMutableClone(node);
+                clone_6.left = cacheExpression(ts.visitNode(node.left, visitor, ts.isExpression));
+                clone_6.right = ts.visitNode(node.right, visitor, ts.isExpression);
+                return clone_6;
             }
             return ts.visitEachChild(node, visitor, context);
         }
@@ -76130,10 +78535,10 @@ var ts;
                 //  .yield resumeLabel
                 //  .mark resumeLabel
                 //      a = _a[%sent%]
-                var clone_6 = ts.getMutableClone(node);
-                clone_6.expression = cacheExpression(ts.visitNode(node.expression, visitor, ts.isLeftHandSideExpression));
-                clone_6.argumentExpression = ts.visitNode(node.argumentExpression, visitor, ts.isExpression);
-                return clone_6;
+                var clone_7 = ts.getMutableClone(node);
+                clone_7.expression = cacheExpression(ts.visitNode(node.expression, visitor, ts.isLeftHandSideExpression));
+                clone_7.argumentExpression = ts.visitNode(node.argumentExpression, visitor, ts.isExpression);
+                return clone_7;
             }
             return ts.visitEachChild(node, visitor, context);
         }
@@ -76199,35 +78604,35 @@ var ts;
         }
         function transformAndEmitStatementWorker(node) {
             switch (node.kind) {
-                case 218 /* Block */:
+                case 219 /* Block */:
                     return transformAndEmitBlock(node);
-                case 221 /* ExpressionStatement */:
+                case 222 /* ExpressionStatement */:
                     return transformAndEmitExpressionStatement(node);
-                case 222 /* IfStatement */:
+                case 223 /* IfStatement */:
                     return transformAndEmitIfStatement(node);
-                case 223 /* DoStatement */:
+                case 224 /* DoStatement */:
                     return transformAndEmitDoStatement(node);
-                case 224 /* WhileStatement */:
+                case 225 /* WhileStatement */:
                     return transformAndEmitWhileStatement(node);
-                case 225 /* ForStatement */:
+                case 226 /* ForStatement */:
                     return transformAndEmitForStatement(node);
-                case 226 /* ForInStatement */:
+                case 227 /* ForInStatement */:
                     return transformAndEmitForInStatement(node);
-                case 228 /* ContinueStatement */:
+                case 229 /* ContinueStatement */:
                     return transformAndEmitContinueStatement(node);
-                case 229 /* BreakStatement */:
+                case 230 /* BreakStatement */:
                     return transformAndEmitBreakStatement(node);
-                case 230 /* ReturnStatement */:
+                case 231 /* ReturnStatement */:
                     return transformAndEmitReturnStatement(node);
-                case 231 /* WithStatement */:
+                case 232 /* WithStatement */:
                     return transformAndEmitWithStatement(node);
-                case 232 /* SwitchStatement */:
+                case 233 /* SwitchStatement */:
                     return transformAndEmitSwitchStatement(node);
-                case 233 /* LabeledStatement */:
+                case 234 /* LabeledStatement */:
                     return transformAndEmitLabeledStatement(node);
-                case 234 /* ThrowStatement */:
+                case 235 /* ThrowStatement */:
                     return transformAndEmitThrowStatement(node);
-                case 235 /* TryStatement */:
+                case 236 /* TryStatement */:
                     return transformAndEmitTryStatement(node);
                 default:
                     return emitStatement(ts.visitNode(node, visitor, ts.isStatement));
@@ -76657,7 +79062,7 @@ var ts;
                 for (var i = 0; i < numClauses; i++) {
                     var clause = caseBlock.clauses[i];
                     clauseLabels.push(defineLabel());
-                    if (clause.kind === 272 /* DefaultClause */ && defaultClauseIndex === -1) {
+                    if (clause.kind === 273 /* DefaultClause */ && defaultClauseIndex === -1) {
                         defaultClauseIndex = i;
                     }
                 }
@@ -76670,7 +79075,7 @@ var ts;
                     var defaultClausesSkipped = 0;
                     for (var i = clausesWritten; i < numClauses; i++) {
                         var clause = caseBlock.clauses[i];
-                        if (clause.kind === 271 /* CaseClause */) {
+                        if (clause.kind === 272 /* CaseClause */) {
                             if (containsYield(clause.expression) && pendingClauses.length > 0) {
                                 break;
                             }
@@ -76832,10 +79237,10 @@ var ts;
                     if (declaration) {
                         var name = renamedCatchVariableDeclarations[ts.getOriginalNodeId(declaration)];
                         if (name) {
-                            var clone_7 = ts.getMutableClone(name);
-                            ts.setSourceMapRange(clone_7, node);
-                            ts.setCommentRange(clone_7, node);
-                            return clone_7;
+                            var clone_8 = ts.getMutableClone(name);
+                            ts.setSourceMapRange(clone_8, node);
+                            ts.setCommentRange(clone_8, node);
+                            return clone_8;
                         }
                     }
                 }
@@ -76982,7 +79387,7 @@ var ts;
                 if (!renamedCatchVariables) {
                     renamedCatchVariables = ts.createMap();
                     renamedCatchVariableDeclarations = [];
-                    context.enableSubstitution(72 /* Identifier */);
+                    context.enableSubstitution(73 /* Identifier */);
                 }
                 renamedCatchVariables.set(text, true);
                 renamedCatchVariableDeclarations[ts.getOriginalNodeId(variable)] = name;
@@ -77898,12 +80303,12 @@ var ts;
         var previousOnEmitNode = context.onEmitNode;
         context.onSubstituteNode = onSubstituteNode;
         context.onEmitNode = onEmitNode;
-        context.enableSubstitution(72 /* Identifier */); // Substitutes expression identifiers with imported/exported symbols.
-        context.enableSubstitution(204 /* BinaryExpression */); // Substitutes assignments to exported symbols.
-        context.enableSubstitution(202 /* PrefixUnaryExpression */); // Substitutes updates to exported symbols.
-        context.enableSubstitution(203 /* PostfixUnaryExpression */); // Substitutes updates to exported symbols.
-        context.enableSubstitution(276 /* ShorthandPropertyAssignment */); // Substitutes shorthand property assignments for imported/exported symbols.
-        context.enableEmitNotification(284 /* SourceFile */); // Restore state when substituting nodes in a file.
+        context.enableSubstitution(73 /* Identifier */); // Substitutes expression identifiers with imported/exported symbols.
+        context.enableSubstitution(205 /* BinaryExpression */); // Substitutes assignments to exported symbols.
+        context.enableSubstitution(203 /* PrefixUnaryExpression */); // Substitutes updates to exported symbols.
+        context.enableSubstitution(204 /* PostfixUnaryExpression */); // Substitutes updates to exported symbols.
+        context.enableSubstitution(277 /* ShorthandPropertyAssignment */); // Substitutes shorthand property assignments for imported/exported symbols.
+        context.enableEmitNotification(285 /* SourceFile */); // Restore state when substituting nodes in a file.
         var moduleInfoMap = []; // The ExternalModuleInfo for each file.
         var deferredExports = []; // Exports to defer until an EndOfDeclarationMarker is found.
         var currentSourceFile; // The current file.
@@ -78231,23 +80636,23 @@ var ts;
          */
         function sourceElementVisitor(node) {
             switch (node.kind) {
-                case 249 /* ImportDeclaration */:
+                case 250 /* ImportDeclaration */:
                     return visitImportDeclaration(node);
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return visitImportEqualsDeclaration(node);
-                case 255 /* ExportDeclaration */:
+                case 256 /* ExportDeclaration */:
                     return visitExportDeclaration(node);
-                case 254 /* ExportAssignment */:
+                case 255 /* ExportAssignment */:
                     return visitExportAssignment(node);
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     return visitVariableStatement(node);
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     return visitFunctionDeclaration(node);
-                case 240 /* ClassDeclaration */:
+                case 241 /* ClassDeclaration */:
                     return visitClassDeclaration(node);
-                case 315 /* MergeDeclarationMarker */:
+                case 317 /* MergeDeclarationMarker */:
                     return visitMergeDeclarationMarker(node);
-                case 316 /* EndOfDeclarationMarker */:
+                case 318 /* EndOfDeclarationMarker */:
                     return visitEndOfDeclarationMarker(node);
                 default:
                     return ts.visitEachChild(node, moduleExpressionElementVisitor, context);
@@ -78274,24 +80679,24 @@ var ts;
                 for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
                     var elem = _a[_i];
                     switch (elem.kind) {
-                        case 275 /* PropertyAssignment */:
+                        case 276 /* PropertyAssignment */:
                             if (destructuringNeedsFlattening(elem.initializer)) {
                                 return true;
                             }
                             break;
-                        case 276 /* ShorthandPropertyAssignment */:
+                        case 277 /* ShorthandPropertyAssignment */:
                             if (destructuringNeedsFlattening(elem.name)) {
                                 return true;
                             }
                             break;
-                        case 277 /* SpreadAssignment */:
+                        case 278 /* SpreadAssignment */:
                             if (destructuringNeedsFlattening(elem.expression)) {
                                 return true;
                             }
                             break;
-                        case 156 /* MethodDeclaration */:
-                        case 158 /* GetAccessor */:
-                        case 159 /* SetAccessor */:
+                        case 157 /* MethodDeclaration */:
+                        case 159 /* GetAccessor */:
+                        case 160 /* SetAccessor */:
                             return false;
                         default: ts.Debug.assertNever(elem, "Unhandled object member kind");
                     }
@@ -78769,7 +81174,7 @@ var ts;
             //
             // To balance the declaration, add the exports of the elided variable
             // statement.
-            if (hasAssociatedEndOfDeclarationMarker(node) && node.original.kind === 219 /* VariableStatement */) {
+            if (hasAssociatedEndOfDeclarationMarker(node) && node.original.kind === 220 /* VariableStatement */) {
                 var id = ts.getOriginalNodeId(node);
                 deferredExports[id] = appendExportsOfVariableStatement(deferredExports[id], node.original);
             }
@@ -78824,10 +81229,10 @@ var ts;
             var namedBindings = importClause.namedBindings;
             if (namedBindings) {
                 switch (namedBindings.kind) {
-                    case 251 /* NamespaceImport */:
+                    case 252 /* NamespaceImport */:
                         statements = appendExportsOfDeclaration(statements, namedBindings);
                         break;
-                    case 252 /* NamedImports */:
+                    case 253 /* NamedImports */:
                         for (var _i = 0, _a = namedBindings.elements; _i < _a.length; _i++) {
                             var importBinding = _a[_i];
                             statements = appendExportsOfDeclaration(statements, importBinding);
@@ -79009,8 +81414,8 @@ var ts;
         function modifierVisitor(node) {
             // Elide module-specific modifiers.
             switch (node.kind) {
-                case 85 /* ExportKeyword */:
-                case 80 /* DefaultKeyword */:
+                case 86 /* ExportKeyword */:
+                case 81 /* DefaultKeyword */:
                     return undefined;
             }
             return node;
@@ -79026,7 +81431,7 @@ var ts;
          * @param emit A callback used to emit the node in the printer.
          */
         function onEmitNode(hint, node, emitCallback) {
-            if (node.kind === 284 /* SourceFile */) {
+            if (node.kind === 285 /* SourceFile */) {
                 currentSourceFile = node;
                 currentModuleInfo = moduleInfoMap[ts.getOriginalNodeId(currentSourceFile)];
                 noSubstitution = [];
@@ -79088,12 +81493,12 @@ var ts;
          */
         function substituteExpression(node) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return substituteExpressionIdentifier(node);
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return substituteBinaryExpression(node);
-                case 203 /* PostfixUnaryExpression */:
-                case 202 /* PrefixUnaryExpression */:
+                case 204 /* PostfixUnaryExpression */:
+                case 203 /* PrefixUnaryExpression */:
                     return substituteUnaryExpression(node);
             }
             return node;
@@ -79114,7 +81519,7 @@ var ts;
             }
             if (!ts.isGeneratedIdentifier(node) && !ts.isLocalName(node)) {
                 var exportContainer = resolver.getReferencedExportContainer(node, ts.isExportName(node));
-                if (exportContainer && exportContainer.kind === 284 /* SourceFile */) {
+                if (exportContainer && exportContainer.kind === 285 /* SourceFile */) {
                     return ts.setTextRange(ts.createPropertyAccess(ts.createIdentifier("exports"), ts.getSynthesizedClone(node)), 
                     /*location*/ node);
                 }
@@ -79189,8 +81594,8 @@ var ts;
                 && !ts.isDeclarationNameOfEnumOrNamespace(node.operand)) {
                 var exportedNames = getExports(node.operand);
                 if (exportedNames) {
-                    var expression = node.kind === 203 /* PostfixUnaryExpression */
-                        ? ts.setTextRange(ts.createBinary(node.operand, ts.createToken(node.operator === 44 /* PlusPlusToken */ ? 60 /* PlusEqualsToken */ : 61 /* MinusEqualsToken */), ts.createLiteral(1)), 
+                    var expression = node.kind === 204 /* PostfixUnaryExpression */
+                        ? ts.setTextRange(ts.createBinary(node.operand, ts.createToken(node.operator === 44 /* PlusPlusToken */ ? 61 /* PlusEqualsToken */ : 62 /* MinusEqualsToken */), ts.createLiteral(1)), 
                         /*location*/ node)
                         : node;
                     for (var _i = 0, exportedNames_3 = exportedNames; _i < exportedNames_3.length; _i++) {
@@ -79264,12 +81669,12 @@ var ts;
         var previousOnEmitNode = context.onEmitNode;
         context.onSubstituteNode = onSubstituteNode;
         context.onEmitNode = onEmitNode;
-        context.enableSubstitution(72 /* Identifier */); // Substitutes expression identifiers for imported symbols.
-        context.enableSubstitution(276 /* ShorthandPropertyAssignment */); // Substitutes expression identifiers for imported symbols
-        context.enableSubstitution(204 /* BinaryExpression */); // Substitutes assignments to exported symbols.
-        context.enableSubstitution(202 /* PrefixUnaryExpression */); // Substitutes updates to exported symbols.
-        context.enableSubstitution(203 /* PostfixUnaryExpression */); // Substitutes updates to exported symbols.
-        context.enableEmitNotification(284 /* SourceFile */); // Restore state when substituting nodes in a file.
+        context.enableSubstitution(73 /* Identifier */); // Substitutes expression identifiers for imported symbols.
+        context.enableSubstitution(277 /* ShorthandPropertyAssignment */); // Substitutes expression identifiers for imported symbols
+        context.enableSubstitution(205 /* BinaryExpression */); // Substitutes assignments to exported symbols.
+        context.enableSubstitution(203 /* PrefixUnaryExpression */); // Substitutes updates to exported symbols.
+        context.enableSubstitution(204 /* PostfixUnaryExpression */); // Substitutes updates to exported symbols.
+        context.enableEmitNotification(285 /* SourceFile */); // Restore state when substituting nodes in a file.
         var moduleInfoMap = []; // The ExternalModuleInfo for each file.
         var deferredExports = []; // Exports to defer until an EndOfDeclarationMarker is found.
         var exportFunctionsMap = []; // The export function associated with a source file.
@@ -79490,7 +81895,7 @@ var ts;
                 var hasExportDeclarationWithExportClause = false;
                 for (var _i = 0, _a = moduleInfo.externalImports; _i < _a.length; _i++) {
                     var externalImport = _a[_i];
-                    if (externalImport.kind === 255 /* ExportDeclaration */ && externalImport.exportClause) {
+                    if (externalImport.kind === 256 /* ExportDeclaration */ && externalImport.exportClause) {
                         hasExportDeclarationWithExportClause = true;
                         break;
                     }
@@ -79515,7 +81920,7 @@ var ts;
             }
             for (var _d = 0, _e = moduleInfo.externalImports; _d < _e.length; _d++) {
                 var externalImport = _e[_d];
-                if (externalImport.kind !== 255 /* ExportDeclaration */) {
+                if (externalImport.kind !== 256 /* ExportDeclaration */) {
                     continue;
                 }
                 if (!externalImport.exportClause) {
@@ -79593,19 +81998,19 @@ var ts;
                     var entry = _b[_a];
                     var importVariableName = ts.getLocalNameForExternalImport(entry, currentSourceFile); // TODO: GH#18217
                     switch (entry.kind) {
-                        case 249 /* ImportDeclaration */:
+                        case 250 /* ImportDeclaration */:
                             if (!entry.importClause) {
                                 // 'import "..."' case
                                 // module is imported only for side-effects, no emit required
                                 break;
                             }
                         // falls through
-                        case 248 /* ImportEqualsDeclaration */:
+                        case 249 /* ImportEqualsDeclaration */:
                             ts.Debug.assert(importVariableName !== undefined);
                             // save import into the local
                             statements.push(ts.createExpressionStatement(ts.createAssignment(importVariableName, parameterName)));
                             break;
-                        case 255 /* ExportDeclaration */:
+                        case 256 /* ExportDeclaration */:
                             ts.Debug.assert(importVariableName !== undefined);
                             if (entry.exportClause) {
                                 //  export {a, b as c} from 'foo'
@@ -79655,15 +82060,15 @@ var ts;
          */
         function sourceElementVisitor(node) {
             switch (node.kind) {
-                case 249 /* ImportDeclaration */:
+                case 250 /* ImportDeclaration */:
                     return visitImportDeclaration(node);
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return visitImportEqualsDeclaration(node);
-                case 255 /* ExportDeclaration */:
+                case 256 /* ExportDeclaration */:
                     // ExportDeclarations are elided as they are handled via
                     // `appendExportsOfDeclaration`.
                     return undefined;
-                case 254 /* ExportAssignment */:
+                case 255 /* ExportAssignment */:
                     return visitExportAssignment(node);
                 default:
                     return nestedElementVisitor(node);
@@ -79839,7 +82244,7 @@ var ts;
         function shouldHoistVariableDeclarationList(node) {
             // hoist only non-block scoped declarations or block scoped declarations parented by source file
             return (ts.getEmitFlags(node) & 2097152 /* NoHoisting */) === 0
-                && (enclosingBlockScopedContainer.kind === 284 /* SourceFile */
+                && (enclosingBlockScopedContainer.kind === 285 /* SourceFile */
                     || (ts.getOriginalNode(node).flags & 3 /* BlockScoped */) === 0);
         }
         /**
@@ -79903,7 +82308,7 @@ var ts;
             //
             // To balance the declaration, we defer the exports of the elided variable
             // statement until we visit this declaration's `EndOfDeclarationMarker`.
-            if (hasAssociatedEndOfDeclarationMarker(node) && node.original.kind === 219 /* VariableStatement */) {
+            if (hasAssociatedEndOfDeclarationMarker(node) && node.original.kind === 220 /* VariableStatement */) {
                 var id = ts.getOriginalNodeId(node);
                 var isExportedDeclaration = ts.hasModifier(node.original, 1 /* Export */);
                 deferredExports[id] = appendExportsOfVariableStatement(deferredExports[id], node.original, isExportedDeclaration);
@@ -79965,10 +82370,10 @@ var ts;
             var namedBindings = importClause.namedBindings;
             if (namedBindings) {
                 switch (namedBindings.kind) {
-                    case 251 /* NamespaceImport */:
+                    case 252 /* NamespaceImport */:
                         statements = appendExportsOfDeclaration(statements, namedBindings);
                         break;
-                    case 252 /* NamedImports */:
+                    case 253 /* NamedImports */:
                         for (var _i = 0, _a = namedBindings.elements; _i < _a.length; _i++) {
                             var importBinding = _a[_i];
                             statements = appendExportsOfDeclaration(statements, importBinding);
@@ -80148,43 +82553,43 @@ var ts;
          */
         function nestedElementVisitor(node) {
             switch (node.kind) {
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     return visitVariableStatement(node);
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     return visitFunctionDeclaration(node);
-                case 240 /* ClassDeclaration */:
+                case 241 /* ClassDeclaration */:
                     return visitClassDeclaration(node);
-                case 225 /* ForStatement */:
+                case 226 /* ForStatement */:
                     return visitForStatement(node);
-                case 226 /* ForInStatement */:
+                case 227 /* ForInStatement */:
                     return visitForInStatement(node);
-                case 227 /* ForOfStatement */:
+                case 228 /* ForOfStatement */:
                     return visitForOfStatement(node);
-                case 223 /* DoStatement */:
+                case 224 /* DoStatement */:
                     return visitDoStatement(node);
-                case 224 /* WhileStatement */:
+                case 225 /* WhileStatement */:
                     return visitWhileStatement(node);
-                case 233 /* LabeledStatement */:
+                case 234 /* LabeledStatement */:
                     return visitLabeledStatement(node);
-                case 231 /* WithStatement */:
+                case 232 /* WithStatement */:
                     return visitWithStatement(node);
-                case 232 /* SwitchStatement */:
+                case 233 /* SwitchStatement */:
                     return visitSwitchStatement(node);
-                case 246 /* CaseBlock */:
+                case 247 /* CaseBlock */:
                     return visitCaseBlock(node);
-                case 271 /* CaseClause */:
+                case 272 /* CaseClause */:
                     return visitCaseClause(node);
-                case 272 /* DefaultClause */:
+                case 273 /* DefaultClause */:
                     return visitDefaultClause(node);
-                case 235 /* TryStatement */:
+                case 236 /* TryStatement */:
                     return visitTryStatement(node);
-                case 274 /* CatchClause */:
+                case 275 /* CatchClause */:
                     return visitCatchClause(node);
-                case 218 /* Block */:
+                case 219 /* Block */:
                     return visitBlock(node);
-                case 315 /* MergeDeclarationMarker */:
+                case 317 /* MergeDeclarationMarker */:
                     return visitMergeDeclarationMarker(node);
-                case 316 /* EndOfDeclarationMarker */:
+                case 318 /* EndOfDeclarationMarker */:
                     return visitEndOfDeclarationMarker(node);
                 default:
                     return destructuringAndImportCallVisitor(node);
@@ -80431,7 +82836,7 @@ var ts;
             }
             else if (ts.isIdentifier(node)) {
                 var container = resolver.getReferencedExportContainer(node);
-                return container !== undefined && container.kind === 284 /* SourceFile */;
+                return container !== undefined && container.kind === 285 /* SourceFile */;
             }
             else {
                 return false;
@@ -80447,8 +82852,8 @@ var ts;
          */
         function modifierVisitor(node) {
             switch (node.kind) {
-                case 85 /* ExportKeyword */:
-                case 80 /* DefaultKeyword */:
+                case 86 /* ExportKeyword */:
+                case 81 /* DefaultKeyword */:
                     return undefined;
             }
             return node;
@@ -80464,7 +82869,7 @@ var ts;
          * @param emitCallback A callback used to emit the node in the printer.
          */
         function onEmitNode(hint, node, emitCallback) {
-            if (node.kind === 284 /* SourceFile */) {
+            if (node.kind === 285 /* SourceFile */) {
                 var id = ts.getOriginalNodeId(node);
                 currentSourceFile = node;
                 moduleInfo = moduleInfoMap[id];
@@ -80512,7 +82917,7 @@ var ts;
          */
         function substituteUnspecified(node) {
             switch (node.kind) {
-                case 276 /* ShorthandPropertyAssignment */:
+                case 277 /* ShorthandPropertyAssignment */:
                     return substituteShorthandPropertyAssignment(node);
             }
             return node;
@@ -80546,12 +82951,12 @@ var ts;
          */
         function substituteExpression(node) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return substituteExpressionIdentifier(node);
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return substituteBinaryExpression(node);
-                case 202 /* PrefixUnaryExpression */:
-                case 203 /* PostfixUnaryExpression */:
+                case 203 /* PrefixUnaryExpression */:
+                case 204 /* PostfixUnaryExpression */:
                     return substituteUnaryExpression(node);
             }
             return node;
@@ -80644,14 +83049,14 @@ var ts;
                 && !ts.isDeclarationNameOfEnumOrNamespace(node.operand)) {
                 var exportedNames = getExports(node.operand);
                 if (exportedNames) {
-                    var expression = node.kind === 203 /* PostfixUnaryExpression */
+                    var expression = node.kind === 204 /* PostfixUnaryExpression */
                         ? ts.setTextRange(ts.createPrefix(node.operator, node.operand), node)
                         : node;
                     for (var _i = 0, exportedNames_5 = exportedNames; _i < exportedNames_5.length; _i++) {
                         var exportName = exportedNames_5[_i];
                         expression = createExportExpression(exportName, preventSubstitution(expression));
                     }
-                    if (node.kind === 203 /* PostfixUnaryExpression */) {
+                    if (node.kind === 204 /* PostfixUnaryExpression */) {
                         expression = node.operator === 44 /* PlusPlusToken */
                             ? ts.createSubtract(preventSubstitution(expression), ts.createLiteral(1))
                             : ts.createAdd(preventSubstitution(expression), ts.createLiteral(1));
@@ -80673,7 +83078,7 @@ var ts;
                     || resolver.getReferencedValueDeclaration(name);
                 if (valueDeclaration) {
                     var exportContainer = resolver.getReferencedExportContainer(name, /*prefixLocals*/ false);
-                    if (exportContainer && exportContainer.kind === 284 /* SourceFile */) {
+                    if (exportContainer && exportContainer.kind === 285 /* SourceFile */) {
                         exportedNames = ts.append(exportedNames, ts.getDeclarationName(valueDeclaration));
                     }
                     exportedNames = ts.addRange(exportedNames, moduleInfo && moduleInfo.exportedBindings[ts.getOriginalNodeId(valueDeclaration)]);
@@ -80712,8 +83117,8 @@ var ts;
         var previousOnSubstituteNode = context.onSubstituteNode;
         context.onEmitNode = onEmitNode;
         context.onSubstituteNode = onSubstituteNode;
-        context.enableEmitNotification(284 /* SourceFile */);
-        context.enableSubstitution(72 /* Identifier */);
+        context.enableEmitNotification(285 /* SourceFile */);
+        context.enableSubstitution(73 /* Identifier */);
         var currentSourceFile;
         return ts.chainBundle(transformSourceFile);
         function transformSourceFile(node) {
@@ -80741,10 +83146,10 @@ var ts;
         }
         function visitor(node) {
             switch (node.kind) {
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     // Elide `import=` as it is not legal with --module ES6
                     return undefined;
-                case 254 /* ExportAssignment */:
+                case 255 /* ExportAssignment */:
                     return visitExportAssignment(node);
             }
             return node;
@@ -80852,7 +83257,7 @@ var ts;
                         ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 :
                     ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_private_name_1;
             }
-            else if (node.parent.kind === 240 /* ClassDeclaration */) {
+            else if (node.parent.kind === 241 /* ClassDeclaration */) {
                 return symbolAccessibilityResult.errorModuleName ?
                     symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                         ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
@@ -80881,7 +83286,7 @@ var ts;
                         ts.Diagnostics.Public_static_method_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 :
                     ts.Diagnostics.Public_static_method_0_of_exported_class_has_or_is_using_private_name_1;
             }
-            else if (node.parent.kind === 240 /* ClassDeclaration */) {
+            else if (node.parent.kind === 241 /* ClassDeclaration */) {
                 return symbolAccessibilityResult.errorModuleName ?
                     symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                         ts.Diagnostics.Public_method_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
@@ -80928,7 +83333,7 @@ var ts;
             return ts.Debug.assertNever(node, "Attempted to set a declaration diagnostic context for unhandled node kind: " + ts.SyntaxKind[node.kind]);
         }
         function getVariableDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult) {
-            if (node.kind === 237 /* VariableDeclaration */ || node.kind === 186 /* BindingElement */) {
+            if (node.kind === 238 /* VariableDeclaration */ || node.kind === 187 /* BindingElement */) {
                 return symbolAccessibilityResult.errorModuleName ?
                     symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                         ts.Diagnostics.Exported_variable_0_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
@@ -80937,8 +83342,8 @@ var ts;
             }
             // This check is to ensure we don't report error on constructor parameter property as that error would be reported during parameter emit
             // The only exception here is if the constructor was marked as private. we are not emitting the constructor parameters at all.
-            else if (node.kind === 154 /* PropertyDeclaration */ || node.kind === 189 /* PropertyAccessExpression */ || node.kind === 153 /* PropertySignature */ ||
-                (node.kind === 151 /* Parameter */ && ts.hasModifier(node.parent, 8 /* Private */))) {
+            else if (node.kind === 155 /* PropertyDeclaration */ || node.kind === 190 /* PropertyAccessExpression */ || node.kind === 154 /* PropertySignature */ ||
+                (node.kind === 152 /* Parameter */ && ts.hasModifier(node.parent, 8 /* Private */))) {
                 // TODO(jfreeman): Deal with computed properties in error reporting.
                 if (ts.hasModifier(node, 32 /* Static */)) {
                     return symbolAccessibilityResult.errorModuleName ?
@@ -80947,7 +83352,7 @@ var ts;
                             ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 :
                         ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_private_name_1;
                 }
-                else if (node.parent.kind === 240 /* ClassDeclaration */ || node.kind === 151 /* Parameter */) {
+                else if (node.parent.kind === 241 /* ClassDeclaration */ || node.kind === 152 /* Parameter */) {
                     return symbolAccessibilityResult.errorModuleName ?
                         symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                             ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
@@ -80972,7 +83377,7 @@ var ts;
         }
         function getAccessorDeclarationTypeVisibilityError(symbolAccessibilityResult) {
             var diagnosticMessage;
-            if (node.kind === 159 /* SetAccessor */) {
+            if (node.kind === 160 /* SetAccessor */) {
                 // Getters can infer the return type from the returned expression, but setters cannot, so the
                 // "_from_external_module_1_but_cannot_be_named" case cannot occur.
                 if (ts.hasModifier(node, 32 /* Static */)) {
@@ -81011,26 +83416,26 @@ var ts;
         function getReturnTypeVisibilityError(symbolAccessibilityResult) {
             var diagnosticMessage;
             switch (node.kind) {
-                case 161 /* ConstructSignature */:
+                case 162 /* ConstructSignature */:
                     // Interfaces cannot have return types that cannot be named
                     diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                         ts.Diagnostics.Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 :
                         ts.Diagnostics.Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_0;
                     break;
-                case 160 /* CallSignature */:
+                case 161 /* CallSignature */:
                     // Interfaces cannot have return types that cannot be named
                     diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                         ts.Diagnostics.Return_type_of_call_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 :
                         ts.Diagnostics.Return_type_of_call_signature_from_exported_interface_has_or_is_using_private_name_0;
                     break;
-                case 162 /* IndexSignature */:
+                case 163 /* IndexSignature */:
                     // Interfaces cannot have return types that cannot be named
                     diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                         ts.Diagnostics.Return_type_of_index_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 :
                         ts.Diagnostics.Return_type_of_index_signature_from_exported_interface_has_or_is_using_private_name_0;
                     break;
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
                     if (ts.hasModifier(node, 32 /* Static */)) {
                         diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                             symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
@@ -81038,7 +83443,7 @@ var ts;
                                 ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_private_module_1 :
                             ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_private_name_0;
                     }
-                    else if (node.parent.kind === 240 /* ClassDeclaration */) {
+                    else if (node.parent.kind === 241 /* ClassDeclaration */) {
                         diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                             symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                                 ts.Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named :
@@ -81052,7 +83457,7 @@ var ts;
                             ts.Diagnostics.Return_type_of_method_from_exported_interface_has_or_is_using_private_name_0;
                     }
                     break;
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                         symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                             ts.Diagnostics.Return_type_of_exported_function_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named :
@@ -81077,30 +83482,30 @@ var ts;
         }
         function getParameterDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult) {
             switch (node.parent.kind) {
-                case 157 /* Constructor */:
+                case 158 /* Constructor */:
                     return symbolAccessibilityResult.errorModuleName ?
                         symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                             ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
                             ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
                         ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_private_name_1;
-                case 161 /* ConstructSignature */:
-                case 166 /* ConstructorType */:
+                case 162 /* ConstructSignature */:
+                case 167 /* ConstructorType */:
                     // Interfaces cannot have parameter types that cannot be named
                     return symbolAccessibilityResult.errorModuleName ?
                         ts.Diagnostics.Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 :
                         ts.Diagnostics.Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1;
-                case 160 /* CallSignature */:
+                case 161 /* CallSignature */:
                     // Interfaces cannot have parameter types that cannot be named
                     return symbolAccessibilityResult.errorModuleName ?
                         ts.Diagnostics.Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 :
                         ts.Diagnostics.Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1;
-                case 162 /* IndexSignature */:
+                case 163 /* IndexSignature */:
                     // Interfaces cannot have parameter types that cannot be named
                     return symbolAccessibilityResult.errorModuleName ?
                         ts.Diagnostics.Parameter_0_of_index_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 :
                         ts.Diagnostics.Parameter_0_of_index_signature_from_exported_interface_has_or_is_using_private_name_1;
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
                     if (ts.hasModifier(node.parent, 32 /* Static */)) {
                         return symbolAccessibilityResult.errorModuleName ?
                             symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
@@ -81108,7 +83513,7 @@ var ts;
                                 ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
                             ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1;
                     }
-                    else if (node.parent.parent.kind === 240 /* ClassDeclaration */) {
+                    else if (node.parent.parent.kind === 241 /* ClassDeclaration */) {
                         return symbolAccessibilityResult.errorModuleName ?
                             symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                                 ts.Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
@@ -81121,8 +83526,8 @@ var ts;
                             ts.Diagnostics.Parameter_0_of_method_from_exported_interface_has_or_is_using_name_1_from_private_module_2 :
                             ts.Diagnostics.Parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1;
                     }
-                case 239 /* FunctionDeclaration */:
-                case 165 /* FunctionType */:
+                case 240 /* FunctionDeclaration */:
+                case 166 /* FunctionType */:
                     return symbolAccessibilityResult.errorModuleName ?
                         symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                             ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
@@ -81136,39 +83541,39 @@ var ts;
             // Type parameter constraints are named by user so we should always be able to name it
             var diagnosticMessage;
             switch (node.parent.kind) {
-                case 240 /* ClassDeclaration */:
+                case 241 /* ClassDeclaration */:
                     diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_class_has_or_is_using_private_name_1;
                     break;
-                case 241 /* InterfaceDeclaration */:
+                case 242 /* InterfaceDeclaration */:
                     diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1;
                     break;
-                case 181 /* MappedType */:
+                case 182 /* MappedType */:
                     diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_mapped_object_type_is_using_private_name_1;
                     break;
-                case 166 /* ConstructorType */:
-                case 161 /* ConstructSignature */:
+                case 167 /* ConstructorType */:
+                case 162 /* ConstructSignature */:
                     diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1;
                     break;
-                case 160 /* CallSignature */:
+                case 161 /* CallSignature */:
                     diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1;
                     break;
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
                     if (ts.hasModifier(node.parent, 32 /* Static */)) {
                         diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1;
                     }
-                    else if (node.parent.parent.kind === 240 /* ClassDeclaration */) {
+                    else if (node.parent.parent.kind === 241 /* ClassDeclaration */) {
                         diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1;
                     }
                     else {
                         diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1;
                     }
                     break;
-                case 165 /* FunctionType */:
-                case 239 /* FunctionDeclaration */:
+                case 166 /* FunctionType */:
+                case 240 /* FunctionDeclaration */:
                     diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_function_has_or_is_using_private_name_1;
                     break;
-                case 242 /* TypeAliasDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
                     diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_type_alias_has_or_is_using_private_name_1;
                     break;
                 default:
@@ -81183,9 +83588,9 @@ var ts;
         function getHeritageClauseVisibilityError() {
             var diagnosticMessage;
             // Heritage clause is written by user so it can always be named
-            if (node.parent.parent.kind === 240 /* ClassDeclaration */) {
+            if (node.parent.parent.kind === 241 /* ClassDeclaration */) {
                 // Class or Interface implemented/extended is inaccessible
-                diagnosticMessage = ts.isHeritageClause(node.parent) && node.parent.token === 109 /* ImplementsKeyword */ ?
+                diagnosticMessage = ts.isHeritageClause(node.parent) && node.parent.token === 110 /* ImplementsKeyword */ ?
                     ts.Diagnostics.Implements_clause_of_exported_class_0_has_or_is_using_private_name_1 :
                     ts.Diagnostics.extends_clause_of_exported_class_0_has_or_is_using_private_name_1;
             }
@@ -81228,12 +83633,28 @@ var ts;
         return result.diagnostics;
     }
     ts.getDeclarationDiagnostics = getDeclarationDiagnostics;
+    function hasInternalAnnotation(range, currentSourceFile) {
+        var comment = currentSourceFile.text.substring(range.pos, range.end);
+        return ts.stringContains(comment, "@internal");
+    }
     function isInternalDeclaration(node, currentSourceFile) {
         var parseTreeNode = ts.getParseTreeNode(node);
+        if (parseTreeNode && parseTreeNode.kind === 152 /* Parameter */) {
+            var paramIdx = parseTreeNode.parent.parameters.indexOf(parseTreeNode);
+            var previousSibling = paramIdx > 0 ? parseTreeNode.parent.parameters[paramIdx - 1] : undefined;
+            var text = currentSourceFile.text;
+            var commentRanges = previousSibling
+                ? ts.concatenate(
+                // to handle
+                // ... parameters, /* @internal */
+                // public param: string
+                ts.getTrailingCommentRanges(text, ts.skipTrivia(text, previousSibling.end + 1, /* stopAfterLineBreak */ false, /* stopAtComments */ true)), ts.getLeadingCommentRanges(text, node.pos))
+                : ts.getTrailingCommentRanges(text, ts.skipTrivia(text, node.pos, /* stopAfterLineBreak */ false, /* stopAtComments */ true));
+            return commentRanges && commentRanges.length && hasInternalAnnotation(ts.last(commentRanges), currentSourceFile);
+        }
         var leadingCommentRanges = parseTreeNode && ts.getLeadingCommentRangesOfNode(parseTreeNode, currentSourceFile);
         return !!ts.forEach(leadingCommentRanges, function (range) {
-            var comment = currentSourceFile.text.substring(range.pos, range.end);
-            return ts.stringContains(comment, "@internal");
+            return hasInternalAnnotation(range, currentSourceFile);
         });
     }
     ts.isInternalDeclaration = isInternalDeclaration;
@@ -81364,11 +83785,14 @@ var ts;
                 context.addDiagnostic(ts.createDiagnosticForNode(errorNameNode, ts.Diagnostics.The_inferred_type_of_0_cannot_be_named_without_a_reference_to_1_This_is_likely_not_portable_A_type_annotation_is_necessary, ts.declarationNameToString(errorNameNode), specifier));
             }
         }
+        function createEmptyExports() {
+            return ts.createExportDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, ts.createNamedExports([]), /*moduleSpecifier*/ undefined);
+        }
         function transformRoot(node) {
-            if (node.kind === 284 /* SourceFile */ && (node.isDeclarationFile || ts.isSourceFileJS(node))) {
+            if (node.kind === 285 /* SourceFile */ && (node.isDeclarationFile || ts.isSourceFileJS(node))) {
                 return node;
             }
-            if (node.kind === 285 /* Bundle */) {
+            if (node.kind === 286 /* Bundle */) {
                 isBundledEmit = true;
                 refs = ts.createMap();
                 libs = ts.createMap();
@@ -81391,14 +83815,14 @@ var ts;
                         resultHasExternalModuleIndicator = false; // unused in external module bundle emit (all external modules are within module blocks, therefore are known to be modules)
                         needsDeclare = false;
                         var statements_4 = ts.visitNodes(sourceFile.statements, visitDeclarationStatements);
-                        var newFile = ts.updateSourceFileNode(sourceFile, [ts.createModuleDeclaration([], [ts.createModifier(125 /* DeclareKeyword */)], ts.createLiteral(ts.getResolvedExternalModuleName(context.getEmitHost(), sourceFile)), ts.createModuleBlock(ts.setTextRange(ts.createNodeArray(transformAndReplaceLatePaintedStatements(statements_4)), sourceFile.statements)))], /*isDeclarationFile*/ true, /*referencedFiles*/ [], /*typeReferences*/ [], /*hasNoDefaultLib*/ false, /*libReferences*/ []);
+                        var newFile = ts.updateSourceFileNode(sourceFile, [ts.createModuleDeclaration([], [ts.createModifier(126 /* DeclareKeyword */)], ts.createLiteral(ts.getResolvedExternalModuleName(context.getEmitHost(), sourceFile)), ts.createModuleBlock(ts.setTextRange(ts.createNodeArray(transformAndReplaceLatePaintedStatements(statements_4)), sourceFile.statements)))], /*isDeclarationFile*/ true, /*referencedFiles*/ [], /*typeReferences*/ [], /*hasNoDefaultLib*/ false, /*libReferences*/ []);
                         return newFile;
                     }
                     needsDeclare = true;
                     var updated = ts.visitNodes(sourceFile.statements, visitDeclarationStatements);
                     return ts.updateSourceFileNode(sourceFile, transformAndReplaceLatePaintedStatements(updated), /*isDeclarationFile*/ true, /*referencedFiles*/ [], /*typeReferences*/ [], /*hasNoDefaultLib*/ false, /*libReferences*/ []);
                 }), ts.mapDefined(node.prepends, function (prepend) {
-                    if (prepend.kind === 287 /* InputFiles */) {
+                    if (prepend.kind === 288 /* InputFiles */) {
                         var sourceFile = ts.createUnparsedSourceFile(prepend, "dts", stripInternal);
                         hasNoDefaultLib_1 = hasNoDefaultLib_1 || !!sourceFile.hasNoDefaultLib;
                         collectReferences(sourceFile, refs);
@@ -81440,7 +83864,7 @@ var ts;
             refs.forEach(referenceVisitor);
             var emittedImports = ts.filter(combinedStatements, ts.isAnyImportSyntax);
             if (ts.isExternalModule(node) && (!resultHasExternalModuleIndicator || (needsScopeFixMarker && !resultHasScopeMarker))) {
-                combinedStatements = ts.setTextRange(ts.createNodeArray(combinedStatements.concat([ts.createExportDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, ts.createNamedExports([]), /*moduleSpecifier*/ undefined)])), combinedStatements);
+                combinedStatements = ts.setTextRange(ts.createNodeArray(combinedStatements.concat([createEmptyExports()])), combinedStatements);
             }
             var updated = ts.updateSourceFileNode(node, combinedStatements, /*isDeclarationFile*/ true, references, getFileReferencesForUsedTypeReferences(), node.hasNoDefaultLib, getLibReferences());
             updated.exportedModulesFromDeclarationEmit = exportedModulesFromDeclarationEmit;
@@ -81501,7 +83925,7 @@ var ts;
             if (noResolve || (!ts.isUnparsedSource(sourceFile) && ts.isSourceFileJS(sourceFile)))
                 return ret;
             ts.forEach(sourceFile.referencedFiles, function (f) {
-                var elem = ts.tryResolveScriptReference(host, sourceFile, f);
+                var elem = host.getSourceFileFromReference(sourceFile, f);
                 if (elem) {
                     ret.set("" + ts.getOriginalNodeId(elem), elem);
                 }
@@ -81518,11 +83942,11 @@ var ts;
             return ret;
         }
         function filterBindingPatternInitializers(name) {
-            if (name.kind === 72 /* Identifier */) {
+            if (name.kind === 73 /* Identifier */) {
                 return name;
             }
             else {
-                if (name.kind === 185 /* ArrayBindingPattern */) {
+                if (name.kind === 186 /* ArrayBindingPattern */) {
                     return ts.updateArrayBindingPattern(name, ts.visitNodes(name.elements, visitBindingElement));
                 }
                 else {
@@ -81530,7 +83954,7 @@ var ts;
                 }
             }
             function visitBindingElement(elem) {
-                if (elem.kind === 210 /* OmittedExpression */) {
+                if (elem.kind === 211 /* OmittedExpression */) {
                     return elem;
                 }
                 return ts.updateBindingElement(elem, elem.dotDotDotToken, elem.propertyName, filterBindingPatternInitializers(elem.name), shouldPrintWithInitializer(elem) ? elem.initializer : undefined);
@@ -81568,19 +83992,19 @@ var ts;
                 // Literal const declarations will have an initializer ensured rather than a type
                 return;
             }
-            var shouldUseResolverType = node.kind === 151 /* Parameter */ &&
+            var shouldUseResolverType = node.kind === 152 /* Parameter */ &&
                 (resolver.isRequiredInitializedParameter(node) ||
                     resolver.isOptionalUninitializedParameterProperty(node));
             if (type && !shouldUseResolverType) {
                 return ts.visitNode(type, visitDeclarationSubtree);
             }
             if (!ts.getParseTreeNode(node)) {
-                return type ? ts.visitNode(type, visitDeclarationSubtree) : ts.createKeywordTypeNode(120 /* AnyKeyword */);
+                return type ? ts.visitNode(type, visitDeclarationSubtree) : ts.createKeywordTypeNode(121 /* AnyKeyword */);
             }
-            if (node.kind === 159 /* SetAccessor */) {
+            if (node.kind === 160 /* SetAccessor */) {
                 // Set accessors with no associated type node (from it's param or get accessor return) are `any` since they are never contextually typed right now
                 // (The inferred type here will be void, but the old declaration emitter printed `any`, so this replicates that)
-                return ts.createKeywordTypeNode(120 /* AnyKeyword */);
+                return ts.createKeywordTypeNode(121 /* AnyKeyword */);
             }
             errorNameNode = node.name;
             var oldDiag;
@@ -81588,12 +84012,12 @@ var ts;
                 oldDiag = getSymbolAccessibilityDiagnostic;
                 getSymbolAccessibilityDiagnostic = ts.createGetSymbolAccessibilityDiagnosticForNode(node);
             }
-            if (node.kind === 237 /* VariableDeclaration */ || node.kind === 186 /* BindingElement */) {
+            if (node.kind === 238 /* VariableDeclaration */ || node.kind === 187 /* BindingElement */) {
                 return cleanup(resolver.createTypeOfDeclaration(node, enclosingDeclaration, declarationEmitNodeBuilderFlags, symbolTracker));
             }
-            if (node.kind === 151 /* Parameter */
-                || node.kind === 154 /* PropertyDeclaration */
-                || node.kind === 153 /* PropertySignature */) {
+            if (node.kind === 152 /* Parameter */
+                || node.kind === 155 /* PropertyDeclaration */
+                || node.kind === 154 /* PropertySignature */) {
                 if (!node.initializer)
                     return cleanup(resolver.createTypeOfDeclaration(node, enclosingDeclaration, declarationEmitNodeBuilderFlags, symbolTracker, shouldUseResolverType));
                 return cleanup(resolver.createTypeOfDeclaration(node, enclosingDeclaration, declarationEmitNodeBuilderFlags, symbolTracker, shouldUseResolverType) || resolver.createTypeOfExpression(node.initializer, enclosingDeclaration, declarationEmitNodeBuilderFlags, symbolTracker));
@@ -81604,26 +84028,26 @@ var ts;
                 if (!suppressNewDiagnosticContexts) {
                     getSymbolAccessibilityDiagnostic = oldDiag;
                 }
-                return returnValue || ts.createKeywordTypeNode(120 /* AnyKeyword */);
+                return returnValue || ts.createKeywordTypeNode(121 /* AnyKeyword */);
             }
         }
         function isDeclarationAndNotVisible(node) {
             node = ts.getParseTreeNode(node);
             switch (node.kind) {
-                case 239 /* FunctionDeclaration */:
-                case 244 /* ModuleDeclaration */:
-                case 241 /* InterfaceDeclaration */:
-                case 240 /* ClassDeclaration */:
-                case 242 /* TypeAliasDeclaration */:
-                case 243 /* EnumDeclaration */:
+                case 240 /* FunctionDeclaration */:
+                case 245 /* ModuleDeclaration */:
+                case 242 /* InterfaceDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
+                case 244 /* EnumDeclaration */:
                     return !resolver.isDeclarationVisible(node);
                 // The following should be doing their own visibility checks based on filtering their members
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     return !getBindingNameVisible(node);
-                case 248 /* ImportEqualsDeclaration */:
-                case 249 /* ImportDeclaration */:
-                case 255 /* ExportDeclaration */:
-                case 254 /* ExportAssignment */:
+                case 249 /* ImportEqualsDeclaration */:
+                case 250 /* ImportDeclaration */:
+                case 256 /* ExportDeclaration */:
+                case 255 /* ExportAssignment */:
                     return false;
             }
             return false;
@@ -81677,7 +84101,7 @@ var ts;
         function rewriteModuleSpecifier(parent, input) {
             if (!input)
                 return undefined; // TODO: GH#18217
-            resultHasExternalModuleIndicator = resultHasExternalModuleIndicator || (parent.kind !== 244 /* ModuleDeclaration */ && parent.kind !== 183 /* ImportType */);
+            resultHasExternalModuleIndicator = resultHasExternalModuleIndicator || (parent.kind !== 245 /* ModuleDeclaration */ && parent.kind !== 184 /* ImportType */);
             if (ts.isStringLiteralLike(input)) {
                 if (isBundledEmit) {
                     var newName = ts.getExternalModuleNameFromDeclaration(context.getEmitHost(), resolver, parent);
@@ -81697,7 +84121,7 @@ var ts;
         function transformImportEqualsDeclaration(decl) {
             if (!resolver.isDeclarationVisible(decl))
                 return;
-            if (decl.moduleReference.kind === 259 /* ExternalModuleReference */) {
+            if (decl.moduleReference.kind === 260 /* ExternalModuleReference */) {
                 // Rewrite external module names if necessary
                 var specifier = ts.getExternalModuleImportEqualsDeclarationExpression(decl);
                 return ts.updateImportEqualsDeclaration(decl, 
@@ -81724,7 +84148,7 @@ var ts;
                 return visibleDefaultBinding && ts.updateImportDeclaration(decl, /*decorators*/ undefined, decl.modifiers, ts.updateImportClause(decl.importClause, visibleDefaultBinding, 
                 /*namedBindings*/ undefined), rewriteModuleSpecifier(decl, decl.moduleSpecifier));
             }
-            if (decl.importClause.namedBindings.kind === 251 /* NamespaceImport */) {
+            if (decl.importClause.namedBindings.kind === 252 /* NamespaceImport */) {
                 // Namespace import (optionally with visible default)
                 var namedBindings = resolver.isDeclarationVisible(decl.importClause.namedBindings) ? decl.importClause.namedBindings : /*namedBindings*/ undefined;
                 return visibleDefaultBinding || namedBindings ? ts.updateImportDeclaration(decl, /*decorators*/ undefined, decl.modifiers, ts.updateImportClause(decl.importClause, visibleDefaultBinding, namedBindings), rewriteModuleSpecifier(decl, decl.moduleSpecifier)) : undefined;
@@ -81759,7 +84183,7 @@ var ts;
                 }
                 var priorNeedsDeclare = needsDeclare;
                 needsDeclare = i.parent && ts.isSourceFile(i.parent) && !(ts.isExternalModule(i.parent) && isBundledEmit);
-                var result = transformTopLevelDeclaration(i, /*privateDeclaration*/ true);
+                var result = transformTopLevelDeclaration(i);
                 needsDeclare = priorNeedsDeclare;
                 lateStatementReplacementMap.set("" + ts.getOriginalNodeId(i), result);
             }
@@ -81772,12 +84196,12 @@ var ts;
                     if (lateStatementReplacementMap.has(key)) {
                         var result = lateStatementReplacementMap.get(key);
                         lateStatementReplacementMap.delete(key);
-                        if (result && ts.isSourceFile(statement.parent)) {
+                        if (result) {
                             if (ts.isArray(result) ? ts.some(result, needsScopeMarker) : needsScopeMarker(result)) {
                                 // Top-level declarations in .d.ts files are always considered exported even without a modifier unless there's an export assignment or specifier
                                 needsScopeFixMarker = true;
                             }
-                            if (ts.isArray(result) ? ts.some(result, isExternalModuleIndicator) : isExternalModuleIndicator(result)) {
+                            if (ts.isSourceFile(statement.parent) && (ts.isArray(result) ? ts.some(result, isExternalModuleIndicator) : isExternalModuleIndicator(result))) {
                                 resultHasExternalModuleIndicator = true;
                             }
                         }
@@ -81832,68 +84256,68 @@ var ts;
                 checkEntityNameVisibility(input.exprName, enclosingDeclaration);
             }
             var oldWithinObjectLiteralType = suppressNewDiagnosticContexts;
-            var shouldEnterSuppressNewDiagnosticsContextContext = ((input.kind === 168 /* TypeLiteral */ || input.kind === 181 /* MappedType */) && input.parent.kind !== 242 /* TypeAliasDeclaration */);
+            var shouldEnterSuppressNewDiagnosticsContextContext = ((input.kind === 169 /* TypeLiteral */ || input.kind === 182 /* MappedType */) && input.parent.kind !== 243 /* TypeAliasDeclaration */);
             if (shouldEnterSuppressNewDiagnosticsContextContext) {
                 // We stop making new diagnostic contexts within object literal types. Unless it's an object type on the RHS of a type alias declaration. Then we do.
                 suppressNewDiagnosticContexts = true;
             }
             if (isProcessedComponent(input)) {
                 switch (input.kind) {
-                    case 211 /* ExpressionWithTypeArguments */: {
+                    case 212 /* ExpressionWithTypeArguments */: {
                         if ((ts.isEntityName(input.expression) || ts.isEntityNameExpression(input.expression))) {
                             checkEntityNameVisibility(input.expression, enclosingDeclaration);
                         }
                         var node = ts.visitEachChild(input, visitDeclarationSubtree, context);
                         return cleanup(ts.updateExpressionWithTypeArguments(node, ts.parenthesizeTypeParameters(node.typeArguments), node.expression));
                     }
-                    case 164 /* TypeReference */: {
+                    case 165 /* TypeReference */: {
                         checkEntityNameVisibility(input.typeName, enclosingDeclaration);
                         var node = ts.visitEachChild(input, visitDeclarationSubtree, context);
                         return cleanup(ts.updateTypeReferenceNode(node, node.typeName, ts.parenthesizeTypeParameters(node.typeArguments)));
                     }
-                    case 161 /* ConstructSignature */:
+                    case 162 /* ConstructSignature */:
                         return cleanup(ts.updateConstructSignature(input, ensureTypeParams(input, input.typeParameters), updateParamsList(input, input.parameters), ensureType(input, input.type)));
-                    case 157 /* Constructor */: {
+                    case 158 /* Constructor */: {
                         var isPrivate = ts.hasModifier(input, 8 /* Private */);
                         // A constructor declaration may not have a type annotation
-                        var ctor = ts.createSignatureDeclaration(157 /* Constructor */, isPrivate ? undefined : ensureTypeParams(input, input.typeParameters), 
+                        var ctor = ts.createSignatureDeclaration(158 /* Constructor */, isPrivate ? undefined : ensureTypeParams(input, input.typeParameters), 
                         // TODO: GH#18217
                         isPrivate ? undefined : updateParamsList(input, input.parameters, 0 /* None */), 
                         /*type*/ undefined);
                         ctor.modifiers = ts.createNodeArray(ensureModifiers(input));
                         return cleanup(ctor);
                     }
-                    case 156 /* MethodDeclaration */: {
-                        var sig = ts.createSignatureDeclaration(155 /* MethodSignature */, ensureTypeParams(input, input.typeParameters), updateParamsList(input, input.parameters), ensureType(input, input.type));
+                    case 157 /* MethodDeclaration */: {
+                        var sig = ts.createSignatureDeclaration(156 /* MethodSignature */, ensureTypeParams(input, input.typeParameters), updateParamsList(input, input.parameters), ensureType(input, input.type));
                         sig.name = input.name;
                         sig.modifiers = ts.createNodeArray(ensureModifiers(input));
                         sig.questionToken = input.questionToken;
                         return cleanup(sig);
                     }
-                    case 158 /* GetAccessor */: {
+                    case 159 /* GetAccessor */: {
                         var newNode = ensureAccessor(input);
                         return cleanup(newNode);
                     }
-                    case 159 /* SetAccessor */: {
+                    case 160 /* SetAccessor */: {
                         var newNode = ensureAccessor(input);
                         return cleanup(newNode);
                     }
-                    case 154 /* PropertyDeclaration */:
+                    case 155 /* PropertyDeclaration */:
                         return cleanup(ts.updateProperty(input, 
                         /*decorators*/ undefined, ensureModifiers(input), input.name, input.questionToken, !ts.hasModifier(input, 8 /* Private */) ? ensureType(input, input.type) : undefined, ensureNoInitializer(input)));
-                    case 153 /* PropertySignature */:
+                    case 154 /* PropertySignature */:
                         return cleanup(ts.updatePropertySignature(input, ensureModifiers(input), input.name, input.questionToken, !ts.hasModifier(input, 8 /* Private */) ? ensureType(input, input.type) : undefined, ensureNoInitializer(input)));
-                    case 155 /* MethodSignature */: {
+                    case 156 /* MethodSignature */: {
                         return cleanup(ts.updateMethodSignature(input, ensureTypeParams(input, input.typeParameters), updateParamsList(input, input.parameters), ensureType(input, input.type), input.name, input.questionToken));
                     }
-                    case 160 /* CallSignature */: {
+                    case 161 /* CallSignature */: {
                         return cleanup(ts.updateCallSignature(input, ensureTypeParams(input, input.typeParameters), updateParamsList(input, input.parameters), ensureType(input, input.type)));
                     }
-                    case 162 /* IndexSignature */: {
+                    case 163 /* IndexSignature */: {
                         return cleanup(ts.updateIndexSignature(input, 
-                        /*decorators*/ undefined, ensureModifiers(input), updateParamsList(input, input.parameters), ts.visitNode(input.type, visitDeclarationSubtree) || ts.createKeywordTypeNode(120 /* AnyKeyword */)));
+                        /*decorators*/ undefined, ensureModifiers(input), updateParamsList(input, input.parameters), ts.visitNode(input.type, visitDeclarationSubtree) || ts.createKeywordTypeNode(121 /* AnyKeyword */)));
                     }
-                    case 237 /* VariableDeclaration */: {
+                    case 238 /* VariableDeclaration */: {
                         if (ts.isBindingPattern(input.name)) {
                             return recreateBindingPattern(input.name);
                         }
@@ -81901,13 +84325,13 @@ var ts;
                         suppressNewDiagnosticContexts = true; // Variable declaration types also suppress new diagnostic contexts, provided the contexts wouldn't be made for binding pattern types
                         return cleanup(ts.updateVariableDeclaration(input, input.name, ensureType(input, input.type), ensureNoInitializer(input)));
                     }
-                    case 150 /* TypeParameter */: {
+                    case 151 /* TypeParameter */: {
                         if (isPrivateMethodTypeParameter(input) && (input.default || input.constraint)) {
                             return cleanup(ts.updateTypeParameterDeclaration(input, input.name, /*constraint*/ undefined, /*defaultType*/ undefined));
                         }
                         return cleanup(ts.visitEachChild(input, visitDeclarationSubtree, context));
                     }
-                    case 175 /* ConditionalType */: {
+                    case 176 /* ConditionalType */: {
                         // We have to process conditional types in a special way because for visibility purposes we need to push a new enclosingDeclaration
                         // just for the `infer` types in the true branch. It's an implicit declaration scope that only applies to _part_ of the type.
                         var checkType = ts.visitNode(input.checkType, visitDeclarationSubtree);
@@ -81919,13 +84343,13 @@ var ts;
                         var falseType = ts.visitNode(input.falseType, visitDeclarationSubtree);
                         return cleanup(ts.updateConditionalTypeNode(input, checkType, extendsType, trueType, falseType));
                     }
-                    case 165 /* FunctionType */: {
+                    case 166 /* FunctionType */: {
                         return cleanup(ts.updateFunctionTypeNode(input, ts.visitNodes(input.typeParameters, visitDeclarationSubtree), updateParamsList(input, input.parameters), ts.visitNode(input.type, visitDeclarationSubtree)));
                     }
-                    case 166 /* ConstructorType */: {
+                    case 167 /* ConstructorType */: {
                         return cleanup(ts.updateConstructorTypeNode(input, ts.visitNodes(input.typeParameters, visitDeclarationSubtree), updateParamsList(input, input.parameters), ts.visitNode(input.type, visitDeclarationSubtree)));
                     }
-                    case 183 /* ImportType */: {
+                    case 184 /* ImportType */: {
                         if (!ts.isLiteralImportTypeNode(input))
                             return cleanup(input);
                         return cleanup(ts.updateImportTypeNode(input, ts.updateLiteralTypeNode(input.argument, rewriteModuleSpecifier(input, input.argument.literal)), input.qualifier, ts.visitNodes(input.typeArguments, visitDeclarationSubtree, ts.isTypeNode), input.isTypeOf));
@@ -81954,7 +84378,7 @@ var ts;
             }
         }
         function isPrivateMethodTypeParameter(node) {
-            return node.parent.kind === 156 /* MethodDeclaration */ && ts.hasModifier(node.parent, 8 /* Private */);
+            return node.parent.kind === 157 /* MethodDeclaration */ && ts.hasModifier(node.parent, 8 /* Private */);
         }
         function visitDeclarationStatements(input) {
             if (!isPreservedDeclarationStatement(input)) {
@@ -81964,22 +84388,22 @@ var ts;
             if (shouldStripInternal(input))
                 return;
             switch (input.kind) {
-                case 255 /* ExportDeclaration */: {
+                case 256 /* ExportDeclaration */: {
                     if (ts.isSourceFile(input.parent)) {
                         resultHasExternalModuleIndicator = true;
-                        resultHasScopeMarker = true;
                     }
+                    resultHasScopeMarker = true;
                     // Always visible if the parent node isn't dropped for being not visible
                     // Rewrite external module names if necessary
                     return ts.updateExportDeclaration(input, /*decorators*/ undefined, input.modifiers, input.exportClause, rewriteModuleSpecifier(input, input.moduleSpecifier));
                 }
-                case 254 /* ExportAssignment */: {
+                case 255 /* ExportAssignment */: {
                     // Always visible if the parent node isn't dropped for being not visible
                     if (ts.isSourceFile(input.parent)) {
                         resultHasExternalModuleIndicator = true;
-                        resultHasScopeMarker = true;
                     }
-                    if (input.expression.kind === 72 /* Identifier */) {
+                    resultHasScopeMarker = true;
+                    if (input.expression.kind === 73 /* Identifier */) {
                         return input;
                     }
                     else {
@@ -81989,7 +84413,7 @@ var ts;
                             errorNode: input
                         }); };
                         var varDecl = ts.createVariableDeclaration(newId, resolver.createTypeOfExpression(input.expression, input, declarationEmitNodeBuilderFlags, symbolTracker), /*initializer*/ undefined);
-                        var statement = ts.createVariableStatement(needsDeclare ? [ts.createModifier(125 /* DeclareKeyword */)] : [], ts.createVariableDeclarationList([varDecl], 2 /* Const */));
+                        var statement = ts.createVariableStatement(needsDeclare ? [ts.createModifier(126 /* DeclareKeyword */)] : [], ts.createVariableDeclarationList([varDecl], 2 /* Const */));
                         return [statement, ts.updateExportAssignment(input, input.decorators, input.modifiers, newId)];
                     }
                 }
@@ -81999,14 +84423,25 @@ var ts;
             lateStatementReplacementMap.set("" + ts.getOriginalNodeId(input), result);
             return input;
         }
-        function transformTopLevelDeclaration(input, isPrivate) {
+        function stripExportModifiers(statement) {
+            if (ts.isImportEqualsDeclaration(statement) || ts.hasModifier(statement, 512 /* Default */)) {
+                // `export import` statements should remain as-is, as imports are _not_ implicitly exported in an ambient namespace
+                // Likewise, `export default` classes and the like and just be `default`, so we preserve their `export` modifiers, too
+                return statement;
+            }
+            var clone = ts.getMutableClone(statement);
+            var modifiers = ts.createModifiersFromModifierFlags(ts.getModifierFlags(statement) & (3071 /* All */ ^ 1 /* Export */));
+            clone.modifiers = modifiers.length ? ts.createNodeArray(modifiers) : undefined;
+            return clone;
+        }
+        function transformTopLevelDeclaration(input) {
             if (shouldStripInternal(input))
                 return;
             switch (input.kind) {
-                case 248 /* ImportEqualsDeclaration */: {
+                case 249 /* ImportEqualsDeclaration */: {
                     return transformImportEqualsDeclaration(input);
                 }
-                case 249 /* ImportDeclaration */: {
+                case 250 /* ImportDeclaration */: {
                     return transformImportDeclaration(input);
                 }
             }
@@ -82027,51 +84462,97 @@ var ts;
             }
             var previousNeedsDeclare = needsDeclare;
             switch (input.kind) {
-                case 242 /* TypeAliasDeclaration */: // Type aliases get `declare`d if need be (for legacy support), but that's all
+                case 243 /* TypeAliasDeclaration */: // Type aliases get `declare`d if need be (for legacy support), but that's all
                     return cleanup(ts.updateTypeAliasDeclaration(input, 
-                    /*decorators*/ undefined, ensureModifiers(input, isPrivate), input.name, ts.visitNodes(input.typeParameters, visitDeclarationSubtree, ts.isTypeParameterDeclaration), ts.visitNode(input.type, visitDeclarationSubtree, ts.isTypeNode)));
-                case 241 /* InterfaceDeclaration */: {
+                    /*decorators*/ undefined, ensureModifiers(input), input.name, ts.visitNodes(input.typeParameters, visitDeclarationSubtree, ts.isTypeParameterDeclaration), ts.visitNode(input.type, visitDeclarationSubtree, ts.isTypeNode)));
+                case 242 /* InterfaceDeclaration */: {
                     return cleanup(ts.updateInterfaceDeclaration(input, 
-                    /*decorators*/ undefined, ensureModifiers(input, isPrivate), input.name, ensureTypeParams(input, input.typeParameters), transformHeritageClauses(input.heritageClauses), ts.visitNodes(input.members, visitDeclarationSubtree)));
+                    /*decorators*/ undefined, ensureModifiers(input), input.name, ensureTypeParams(input, input.typeParameters), transformHeritageClauses(input.heritageClauses), ts.visitNodes(input.members, visitDeclarationSubtree)));
                 }
-                case 239 /* FunctionDeclaration */: {
+                case 240 /* FunctionDeclaration */: {
                     // Generators lose their generator-ness, excepting their return type
                     var clean = cleanup(ts.updateFunctionDeclaration(input, 
-                    /*decorators*/ undefined, ensureModifiers(input, isPrivate), 
+                    /*decorators*/ undefined, ensureModifiers(input), 
                     /*asteriskToken*/ undefined, input.name, ensureTypeParams(input, input.typeParameters), updateParamsList(input, input.parameters), ensureType(input, input.type), 
                     /*body*/ undefined));
                     if (clean && resolver.isExpandoFunctionDeclaration(input)) {
-                        var declarations = ts.mapDefined(resolver.getPropertiesOfContainerFunction(input), function (p) {
+                        var props = resolver.getPropertiesOfContainerFunction(input);
+                        var fakespace_1 = ts.createModuleDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, clean.name || ts.createIdentifier("_default"), ts.createModuleBlock([]), 16 /* Namespace */);
+                        fakespace_1.flags ^= 8 /* Synthesized */; // unset synthesized so it is usable as an enclosing declaration
+                        fakespace_1.parent = enclosingDeclaration;
+                        fakespace_1.locals = ts.createSymbolTable(props);
+                        fakespace_1.symbol = props[0].parent;
+                        var declarations = ts.mapDefined(props, function (p) {
                             if (!ts.isPropertyAccessExpression(p.valueDeclaration)) {
                                 return undefined;
                             }
                             getSymbolAccessibilityDiagnostic = ts.createGetSymbolAccessibilityDiagnosticForNode(p.valueDeclaration);
-                            var type = resolver.createTypeOfDeclaration(p.valueDeclaration, enclosingDeclaration, declarationEmitNodeBuilderFlags, symbolTracker);
+                            var type = resolver.createTypeOfDeclaration(p.valueDeclaration, fakespace_1, declarationEmitNodeBuilderFlags, symbolTracker);
                             getSymbolAccessibilityDiagnostic = oldDiag;
                             var varDecl = ts.createVariableDeclaration(ts.unescapeLeadingUnderscores(p.escapedName), type, /*initializer*/ undefined);
                             return ts.createVariableStatement(/*modifiers*/ undefined, ts.createVariableDeclarationList([varDecl]));
                         });
-                        var namespaceDecl = ts.createModuleDeclaration(/*decorators*/ undefined, ensureModifiers(input, isPrivate), input.name, ts.createModuleBlock(declarations), 16 /* Namespace */);
-                        return [clean, namespaceDecl];
+                        var namespaceDecl = ts.createModuleDeclaration(/*decorators*/ undefined, ensureModifiers(input), input.name, ts.createModuleBlock(declarations), 16 /* Namespace */);
+                        if (!ts.hasModifier(clean, 512 /* Default */)) {
+                            return [clean, namespaceDecl];
+                        }
+                        var modifiers = ts.createModifiersFromModifierFlags((ts.getModifierFlags(clean) & ~513 /* ExportDefault */) | 2 /* Ambient */);
+                        var cleanDeclaration = ts.updateFunctionDeclaration(clean, 
+                        /*decorators*/ undefined, modifiers, 
+                        /*asteriskToken*/ undefined, clean.name, clean.typeParameters, clean.parameters, clean.type, 
+                        /*body*/ undefined);
+                        var namespaceDeclaration = ts.updateModuleDeclaration(namespaceDecl, 
+                        /*decorators*/ undefined, modifiers, namespaceDecl.name, namespaceDecl.body);
+                        var exportDefaultDeclaration = ts.createExportAssignment(
+                        /*decorators*/ undefined, 
+                        /*modifiers*/ undefined, 
+                        /*isExportEquals*/ false, namespaceDecl.name);
+                        if (ts.isSourceFile(input.parent)) {
+                            resultHasExternalModuleIndicator = true;
+                        }
+                        resultHasScopeMarker = true;
+                        return [cleanDeclaration, namespaceDeclaration, exportDefaultDeclaration];
                     }
                     else {
                         return clean;
                     }
                 }
-                case 244 /* ModuleDeclaration */: {
+                case 245 /* ModuleDeclaration */: {
                     needsDeclare = false;
                     var inner = input.body;
-                    if (inner && inner.kind === 245 /* ModuleBlock */) {
+                    if (inner && inner.kind === 246 /* ModuleBlock */) {
+                        var oldNeedsScopeFix = needsScopeFixMarker;
+                        var oldHasScopeFix = resultHasScopeMarker;
+                        resultHasScopeMarker = false;
+                        needsScopeFixMarker = false;
                         var statements = ts.visitNodes(inner.statements, visitDeclarationStatements);
-                        var body = ts.updateModuleBlock(inner, transformAndReplaceLatePaintedStatements(statements));
+                        var lateStatements = transformAndReplaceLatePaintedStatements(statements);
+                        if (input.flags & 4194304 /* Ambient */) {
+                            needsScopeFixMarker = false; // If it was `declare`'d everything is implicitly exported already, ignore late printed "privates"
+                        }
+                        // With the final list of statements, there are 3 possibilities:
+                        // 1. There's an export assignment or export declaration in the namespace - do nothing
+                        // 2. Everything is exported and there are no export assignments or export declarations - strip all export modifiers
+                        // 3. Some things are exported, some are not, and there's no marker - add an empty marker
+                        if (!ts.isGlobalScopeAugmentation(input) && !hasScopeMarker(lateStatements) && !resultHasScopeMarker) {
+                            if (needsScopeFixMarker) {
+                                lateStatements = ts.createNodeArray(lateStatements.concat([createEmptyExports()]));
+                            }
+                            else {
+                                lateStatements = ts.visitNodes(lateStatements, stripExportModifiers);
+                            }
+                        }
+                        var body = ts.updateModuleBlock(inner, lateStatements);
                         needsDeclare = previousNeedsDeclare;
-                        var mods = ensureModifiers(input, isPrivate);
+                        needsScopeFixMarker = oldNeedsScopeFix;
+                        resultHasScopeMarker = oldHasScopeFix;
+                        var mods = ensureModifiers(input);
                         return cleanup(ts.updateModuleDeclaration(input, 
                         /*decorators*/ undefined, mods, ts.isExternalModuleAugmentation(input) ? rewriteModuleSpecifier(input, input.name) : input.name, body));
                     }
                     else {
                         needsDeclare = previousNeedsDeclare;
-                        var mods = ensureModifiers(input, isPrivate);
+                        var mods = ensureModifiers(input);
                         needsDeclare = false;
                         ts.visitNode(inner, visitDeclarationStatements);
                         // eagerly transform nested namespaces (the nesting doesn't need any elision or painting done)
@@ -82082,18 +84563,18 @@ var ts;
                         /*decorators*/ undefined, mods, input.name, body));
                     }
                 }
-                case 240 /* ClassDeclaration */: {
-                    var modifiers = ts.createNodeArray(ensureModifiers(input, isPrivate));
+                case 241 /* ClassDeclaration */: {
+                    var modifiers = ts.createNodeArray(ensureModifiers(input));
                     var typeParameters = ensureTypeParams(input, input.typeParameters);
                     var ctor = ts.getFirstConstructorWithBody(input);
                     var parameterProperties = void 0;
                     if (ctor) {
                         var oldDiag_1 = getSymbolAccessibilityDiagnostic;
                         parameterProperties = ts.compact(ts.flatMap(ctor.parameters, function (param) {
-                            if (!ts.hasModifier(param, 92 /* ParameterPropertyModifier */))
+                            if (!ts.hasModifier(param, 92 /* ParameterPropertyModifier */) || shouldStripInternal(param))
                                 return;
                             getSymbolAccessibilityDiagnostic = ts.createGetSymbolAccessibilityDiagnosticForNode(param);
-                            if (param.name.kind === 72 /* Identifier */) {
+                            if (param.name.kind === 73 /* Identifier */) {
                                 return preserveJsDoc(ts.createProperty(
                                 /*decorators*/ undefined, ensureModifiers(param), param.name, param.questionToken, ensureType(param, param.type), ensureNoInitializer(param)), param);
                             }
@@ -82123,7 +84604,7 @@ var ts;
                     }
                     var members = ts.createNodeArray(ts.concatenate(parameterProperties, ts.visitNodes(input.members, visitDeclarationSubtree)));
                     var extendsClause_1 = ts.getEffectiveBaseTypeNode(input);
-                    if (extendsClause_1 && !ts.isEntityNameExpression(extendsClause_1.expression) && extendsClause_1.expression.kind !== 96 /* NullKeyword */) {
+                    if (extendsClause_1 && !ts.isEntityNameExpression(extendsClause_1.expression) && extendsClause_1.expression.kind !== 97 /* NullKeyword */) {
                         // We must add a temporary declaration for the extends clause expression
                         var oldId = input.name ? ts.unescapeLeadingUnderscores(input.name.escapedText) : "default";
                         var newId_1 = ts.createOptimisticUniqueName(oldId + "_base");
@@ -82133,16 +84614,16 @@ var ts;
                             typeName: input.name
                         }); };
                         var varDecl = ts.createVariableDeclaration(newId_1, resolver.createTypeOfExpression(extendsClause_1.expression, input, declarationEmitNodeBuilderFlags, symbolTracker), /*initializer*/ undefined);
-                        var statement = ts.createVariableStatement(needsDeclare ? [ts.createModifier(125 /* DeclareKeyword */)] : [], ts.createVariableDeclarationList([varDecl], 2 /* Const */));
+                        var statement = ts.createVariableStatement(needsDeclare ? [ts.createModifier(126 /* DeclareKeyword */)] : [], ts.createVariableDeclarationList([varDecl], 2 /* Const */));
                         var heritageClauses = ts.createNodeArray(ts.map(input.heritageClauses, function (clause) {
-                            if (clause.token === 86 /* ExtendsKeyword */) {
+                            if (clause.token === 87 /* ExtendsKeyword */) {
                                 var oldDiag_2 = getSymbolAccessibilityDiagnostic;
                                 getSymbolAccessibilityDiagnostic = ts.createGetSymbolAccessibilityDiagnosticForNode(clause.types[0]);
                                 var newClause = ts.updateHeritageClause(clause, ts.map(clause.types, function (t) { return ts.updateExpressionWithTypeArguments(t, ts.visitNodes(t.typeArguments, visitDeclarationSubtree), newId_1); }));
                                 getSymbolAccessibilityDiagnostic = oldDiag_2;
                                 return newClause;
                             }
-                            return ts.updateHeritageClause(clause, ts.visitNodes(ts.createNodeArray(ts.filter(clause.types, function (t) { return ts.isEntityNameExpression(t.expression) || t.expression.kind === 96 /* NullKeyword */; })), visitDeclarationSubtree));
+                            return ts.updateHeritageClause(clause, ts.visitNodes(ts.createNodeArray(ts.filter(clause.types, function (t) { return ts.isEntityNameExpression(t.expression) || t.expression.kind === 97 /* NullKeyword */; })), visitDeclarationSubtree));
                         }));
                         return [statement, cleanup(ts.updateClassDeclaration(input, 
                             /*decorators*/ undefined, modifiers, input.name, typeParameters, heritageClauses, members))]; // TODO: GH#18217
@@ -82153,11 +84634,11 @@ var ts;
                         /*decorators*/ undefined, modifiers, input.name, typeParameters, heritageClauses, members));
                     }
                 }
-                case 219 /* VariableStatement */: {
-                    return cleanup(transformVariableStatement(input, isPrivate));
+                case 220 /* VariableStatement */: {
+                    return cleanup(transformVariableStatement(input));
                 }
-                case 243 /* EnumDeclaration */: {
-                    return cleanup(ts.updateEnumDeclaration(input, /*decorators*/ undefined, ts.createNodeArray(ensureModifiers(input, isPrivate)), input.name, ts.createNodeArray(ts.mapDefined(input.members, function (m) {
+                case 244 /* EnumDeclaration */: {
+                    return cleanup(ts.updateEnumDeclaration(input, /*decorators*/ undefined, ts.createNodeArray(ensureModifiers(input)), input.name, ts.createNodeArray(ts.mapDefined(input.members, function (m) {
                         if (shouldStripInternal(m))
                             return;
                         // Rewrite enum values to their constants, if available
@@ -82175,7 +84656,7 @@ var ts;
                 if (canProdiceDiagnostic) {
                     getSymbolAccessibilityDiagnostic = oldDiag;
                 }
-                if (input.kind === 244 /* ModuleDeclaration */) {
+                if (input.kind === 245 /* ModuleDeclaration */) {
                     needsDeclare = previousNeedsDeclare;
                 }
                 if (node === input) {
@@ -82184,19 +84665,19 @@ var ts;
                 return node && ts.setOriginalNode(preserveJsDoc(node, input), input);
             }
         }
-        function transformVariableStatement(input, privateDeclaration) {
+        function transformVariableStatement(input) {
             if (!ts.forEach(input.declarationList.declarations, getBindingNameVisible))
                 return;
             var nodes = ts.visitNodes(input.declarationList.declarations, visitDeclarationSubtree);
             if (!ts.length(nodes))
                 return;
-            return ts.updateVariableStatement(input, ts.createNodeArray(ensureModifiers(input, privateDeclaration)), ts.updateVariableDeclarationList(input.declarationList, nodes));
+            return ts.updateVariableStatement(input, ts.createNodeArray(ensureModifiers(input)), ts.updateVariableDeclarationList(input.declarationList, nodes));
         }
         function recreateBindingPattern(d) {
             return ts.flatten(ts.mapDefined(d.elements, function (e) { return recreateBindingElement(e); }));
         }
         function recreateBindingElement(e) {
-            if (e.kind === 210 /* OmittedExpression */) {
+            if (e.kind === 211 /* OmittedExpression */) {
                 return;
             }
             if (e.name) {
@@ -82232,26 +84713,23 @@ var ts;
         function isScopeMarker(node) {
             return ts.isExportAssignment(node) || ts.isExportDeclaration(node);
         }
-        function hasScopeMarker(node) {
-            if (ts.isModuleBlock(node)) {
-                return ts.some(node.statements, isScopeMarker);
-            }
-            return false;
+        function hasScopeMarker(statements) {
+            return ts.some(statements, isScopeMarker);
         }
-        function ensureModifiers(node, privateDeclaration) {
+        function ensureModifiers(node) {
             var currentFlags = ts.getModifierFlags(node);
-            var newFlags = ensureModifierFlags(node, privateDeclaration);
+            var newFlags = ensureModifierFlags(node);
             if (currentFlags === newFlags) {
                 return node.modifiers;
             }
             return ts.createModifiersFromModifierFlags(newFlags);
         }
-        function ensureModifierFlags(node, privateDeclaration) {
+        function ensureModifierFlags(node) {
             var mask = 3071 /* All */ ^ (4 /* Public */ | 256 /* Async */); // No async modifiers in declaration files
             var additions = (needsDeclare && !isAlwaysType(node)) ? 2 /* Ambient */ : 0 /* None */;
-            var parentIsFile = node.parent.kind === 284 /* SourceFile */;
+            var parentIsFile = node.parent.kind === 285 /* SourceFile */;
             if (!parentIsFile || (isBundledEmit && parentIsFile && ts.isExternalModule(node.parent))) {
-                mask ^= ((privateDeclaration || (isBundledEmit && parentIsFile) || hasScopeMarker(node.parent) ? 0 : 1 /* Export */) | 2 /* Ambient */);
+                mask ^= 2 /* Ambient */;
                 additions = 0 /* None */;
             }
             return maskModifierFlags(node, mask, additions);
@@ -82270,7 +84748,7 @@ var ts;
             var prop = ts.createProperty(/*decorators*/ undefined, maskModifiers(node, /*mask*/ undefined, (!accessors.setAccessor) ? 64 /* Readonly */ : 0 /* None */), node.name, node.questionToken, ensureType(node, accessorType), /*initializer*/ undefined);
             var leadingsSyntheticCommentRanges = accessors.secondAccessor && ts.getLeadingCommentRangesOfNode(accessors.secondAccessor, currentSourceFile);
             if (leadingsSyntheticCommentRanges) {
-                var _loop_10 = function (range) {
+                var _loop_15 = function (range) {
                     if (range.kind === 3 /* MultiLineCommentTrivia */) {
                         var text = currentSourceFile.text.slice(range.pos + 2, range.end - 2);
                         var lines = text.split(/\r\n?|\n/g);
@@ -82284,20 +84762,20 @@ var ts;
                 };
                 for (var _i = 0, leadingsSyntheticCommentRanges_1 = leadingsSyntheticCommentRanges; _i < leadingsSyntheticCommentRanges_1.length; _i++) {
                     var range = leadingsSyntheticCommentRanges_1[_i];
-                    _loop_10(range);
+                    _loop_15(range);
                 }
             }
             return prop;
         }
         function transformHeritageClauses(nodes) {
             return ts.createNodeArray(ts.filter(ts.map(nodes, function (clause) { return ts.updateHeritageClause(clause, ts.visitNodes(ts.createNodeArray(ts.filter(clause.types, function (t) {
-                return ts.isEntityNameExpression(t.expression) || (clause.token === 86 /* ExtendsKeyword */ && t.expression.kind === 96 /* NullKeyword */);
+                return ts.isEntityNameExpression(t.expression) || (clause.token === 87 /* ExtendsKeyword */ && t.expression.kind === 97 /* NullKeyword */);
             })), visitDeclarationSubtree)); }), function (clause) { return clause.types && !!clause.types.length; }));
         }
     }
     ts.transformDeclarations = transformDeclarations;
     function isAlwaysType(node) {
-        if (node.kind === 241 /* InterfaceDeclaration */) {
+        if (node.kind === 242 /* InterfaceDeclaration */) {
             return true;
         }
         return false;
@@ -82322,7 +84800,7 @@ var ts;
     }
     function getTypeAnnotationFromAccessor(accessor) {
         if (accessor) {
-            return accessor.kind === 158 /* GetAccessor */
+            return accessor.kind === 159 /* GetAccessor */
                 ? accessor.type // Getter - return type
                 : accessor.parameters.length > 0
                     ? accessor.parameters[0].type // Setter parameter type
@@ -82331,52 +84809,52 @@ var ts;
     }
     function canHaveLiteralInitializer(node) {
         switch (node.kind) {
-            case 154 /* PropertyDeclaration */:
-            case 153 /* PropertySignature */:
+            case 155 /* PropertyDeclaration */:
+            case 154 /* PropertySignature */:
                 return !ts.hasModifier(node, 8 /* Private */);
-            case 151 /* Parameter */:
-            case 237 /* VariableDeclaration */:
+            case 152 /* Parameter */:
+            case 238 /* VariableDeclaration */:
                 return true;
         }
         return false;
     }
     function isPreservedDeclarationStatement(node) {
         switch (node.kind) {
-            case 239 /* FunctionDeclaration */:
-            case 244 /* ModuleDeclaration */:
-            case 248 /* ImportEqualsDeclaration */:
-            case 241 /* InterfaceDeclaration */:
-            case 240 /* ClassDeclaration */:
-            case 242 /* TypeAliasDeclaration */:
-            case 243 /* EnumDeclaration */:
-            case 219 /* VariableStatement */:
-            case 249 /* ImportDeclaration */:
-            case 255 /* ExportDeclaration */:
-            case 254 /* ExportAssignment */:
+            case 240 /* FunctionDeclaration */:
+            case 245 /* ModuleDeclaration */:
+            case 249 /* ImportEqualsDeclaration */:
+            case 242 /* InterfaceDeclaration */:
+            case 241 /* ClassDeclaration */:
+            case 243 /* TypeAliasDeclaration */:
+            case 244 /* EnumDeclaration */:
+            case 220 /* VariableStatement */:
+            case 250 /* ImportDeclaration */:
+            case 256 /* ExportDeclaration */:
+            case 255 /* ExportAssignment */:
                 return true;
         }
         return false;
     }
     function isProcessedComponent(node) {
         switch (node.kind) {
-            case 161 /* ConstructSignature */:
-            case 157 /* Constructor */:
-            case 156 /* MethodDeclaration */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
-            case 154 /* PropertyDeclaration */:
-            case 153 /* PropertySignature */:
-            case 155 /* MethodSignature */:
-            case 160 /* CallSignature */:
-            case 162 /* IndexSignature */:
-            case 237 /* VariableDeclaration */:
-            case 150 /* TypeParameter */:
-            case 211 /* ExpressionWithTypeArguments */:
-            case 164 /* TypeReference */:
-            case 175 /* ConditionalType */:
-            case 165 /* FunctionType */:
-            case 166 /* ConstructorType */:
-            case 183 /* ImportType */:
+            case 162 /* ConstructSignature */:
+            case 158 /* Constructor */:
+            case 157 /* MethodDeclaration */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
+            case 155 /* PropertyDeclaration */:
+            case 154 /* PropertySignature */:
+            case 156 /* MethodSignature */:
+            case 161 /* CallSignature */:
+            case 163 /* IndexSignature */:
+            case 238 /* VariableDeclaration */:
+            case 151 /* TypeParameter */:
+            case 212 /* ExpressionWithTypeArguments */:
+            case 165 /* TypeReference */:
+            case 176 /* ConditionalType */:
+            case 166 /* FunctionType */:
+            case 167 /* ConstructorType */:
+            case 184 /* ImportType */:
                 return true;
         }
         return false;
@@ -82408,17 +84886,28 @@ var ts;
         SyntaxKindFeatureFlags[SyntaxKindFeatureFlags["Substitution"] = 1] = "Substitution";
         SyntaxKindFeatureFlags[SyntaxKindFeatureFlags["EmitNotifications"] = 2] = "EmitNotifications";
     })(SyntaxKindFeatureFlags || (SyntaxKindFeatureFlags = {}));
-    function getTransformers(compilerOptions, customTransformers) {
+    ts.noTransformers = { scriptTransformers: ts.emptyArray, declarationTransformers: ts.emptyArray };
+    function getTransformers(compilerOptions, customTransformers, emitOnlyDtsFiles) {
+        return {
+            scriptTransformers: getScriptTransformers(compilerOptions, customTransformers, emitOnlyDtsFiles),
+            declarationTransformers: getDeclarationTransformers(customTransformers),
+        };
+    }
+    ts.getTransformers = getTransformers;
+    function getScriptTransformers(compilerOptions, customTransformers, emitOnlyDtsFiles) {
+        if (emitOnlyDtsFiles)
+            return ts.emptyArray;
         var jsx = compilerOptions.jsx;
         var languageVersion = ts.getEmitScriptTarget(compilerOptions);
         var moduleKind = ts.getEmitModuleKind(compilerOptions);
         var transformers = [];
-        ts.addRange(transformers, customTransformers && customTransformers.before);
+        ts.addRange(transformers, customTransformers && ts.map(customTransformers.before, wrapScriptTransformerFactory));
         transformers.push(ts.transformTypeScript);
+        transformers.push(ts.transformClassFields);
         if (jsx === 2 /* React */) {
             transformers.push(ts.transformJsx);
         }
-        if (languageVersion < 7 /* ESNext */) {
+        if (languageVersion < 99 /* ESNext */) {
             transformers.push(ts.transformESNext);
         }
         if (languageVersion < 6 /* ES2019 */) {
@@ -82443,10 +84932,38 @@ var ts;
         if (languageVersion < 1 /* ES5 */) {
             transformers.push(ts.transformES5);
         }
-        ts.addRange(transformers, customTransformers && customTransformers.after);
+        ts.addRange(transformers, customTransformers && ts.map(customTransformers.after, wrapScriptTransformerFactory));
         return transformers;
     }
-    ts.getTransformers = getTransformers;
+    function getDeclarationTransformers(customTransformers) {
+        var transformers = [];
+        transformers.push(ts.transformDeclarations);
+        ts.addRange(transformers, customTransformers && ts.map(customTransformers.afterDeclarations, wrapDeclarationTransformerFactory));
+        return transformers;
+    }
+    /**
+     * Wrap a custom script or declaration transformer object in a `Transformer` callback with fallback support for transforming bundles.
+     */
+    function wrapCustomTransformer(transformer) {
+        return function (node) { return ts.isBundle(node) ? transformer.transformBundle(node) : transformer.transformSourceFile(node); };
+    }
+    /**
+     * Wrap a transformer factory that may return a custom script or declaration transformer object.
+     */
+    function wrapCustomTransformerFactory(transformer, handleDefault) {
+        return function (context) {
+            var customTransformer = transformer(context);
+            return typeof customTransformer === "function"
+                ? handleDefault(customTransformer)
+                : wrapCustomTransformer(customTransformer);
+        };
+    }
+    function wrapScriptTransformerFactory(transformer) {
+        return wrapCustomTransformerFactory(transformer, ts.chainBundle);
+    }
+    function wrapDeclarationTransformerFactory(transformer) {
+        return wrapCustomTransformerFactory(transformer, ts.identity);
+    }
     function noEmitSubstitution(_hint, node) {
         return node;
     }
@@ -82466,7 +84983,7 @@ var ts;
      * @param allowDtsFiles A value indicating whether to allow the transformation of .d.ts files.
      */
     function transformNodes(resolver, host, options, nodes, transformers, allowDtsFiles) {
-        var enabledSyntaxKindFeatures = new Array(317 /* Count */);
+        var enabledSyntaxKindFeatures = new Array(319 /* Count */);
         var lexicalEnvironmentVariableDeclarations;
         var lexicalEnvironmentFunctionDeclarations;
         var lexicalEnvironmentVariableDeclarationsStack = [];
@@ -82519,7 +85036,14 @@ var ts;
         }
         ts.performance.mark("beforeTransform");
         // Chain together and initialize each transformer.
-        var transformation = ts.chain.apply(void 0, transformers)(context);
+        var transformersWithContext = transformers.map(function (t) { return t(context); });
+        var transformation = function (node) {
+            for (var _i = 0, transformersWithContext_1 = transformersWithContext; _i < transformersWithContext_1.length; _i++) {
+                var transform = transformersWithContext_1[_i];
+                node = transform(node);
+            }
+            return node;
+        };
         // prevent modification of transformation hooks.
         state = 1 /* Initialized */;
         // Transform each node.
@@ -82671,6 +85195,7 @@ var ts;
                 if (lexicalEnvironmentVariableDeclarations) {
                     var statement = ts.createVariableStatement(
                     /*modifiers*/ undefined, ts.createVariableDeclarationList(lexicalEnvironmentVariableDeclarations));
+                    ts.setEmitFlags(statement, 1048576 /* CustomPrologue */);
                     if (!statements) {
                         statements = [statement];
                     }
@@ -82778,7 +85303,7 @@ var ts;
     /*@internal*/
     function getOutputPathForBuildInfo(options) {
         var configFile = options.configFilePath;
-        if (!configFile || !ts.isIncrementalCompilation(options))
+        if (!ts.isIncrementalCompilation(options))
             return undefined;
         if (options.tsBuildInfoFile)
             return options.tsBuildInfoFile;
@@ -82788,6 +85313,8 @@ var ts;
             buildInfoExtensionLess = ts.removeFileExtension(outPath);
         }
         else {
+            if (!configFile)
+                return undefined;
             var configFileExtensionLess = ts.removeFileExtension(configFile);
             buildInfoExtensionLess = options.outDir ?
                 options.rootDir ?
@@ -82812,7 +85339,7 @@ var ts;
     /*@internal*/
     function getOutputPathsFor(sourceFile, host, forceDtsPaths) {
         var options = host.getCompilerOptions();
-        if (sourceFile.kind === 285 /* Bundle */) {
+        if (sourceFile.kind === 286 /* Bundle */) {
             return getOutputPathsForBundle(options, forceDtsPaths);
         }
         else {
@@ -82855,16 +85382,99 @@ var ts;
         return ".js" /* Js */;
     }
     ts.getOutputExtension = getOutputExtension;
+    function rootDirOfOptions(configFile) {
+        return configFile.options.rootDir || ts.getDirectoryPath(ts.Debug.assertDefined(configFile.options.configFilePath));
+    }
+    function getOutputPathWithoutChangingExt(inputFileName, configFile, ignoreCase, outputDir) {
+        return outputDir ?
+            ts.resolvePath(outputDir, ts.getRelativePathFromDirectory(rootDirOfOptions(configFile), inputFileName, ignoreCase)) :
+            inputFileName;
+    }
+    /* @internal */
+    function getOutputDeclarationFileName(inputFileName, configFile, ignoreCase) {
+        ts.Debug.assert(!ts.fileExtensionIs(inputFileName, ".d.ts" /* Dts */) && ts.hasTSFileExtension(inputFileName));
+        return ts.changeExtension(getOutputPathWithoutChangingExt(inputFileName, configFile, ignoreCase, configFile.options.declarationDir || configFile.options.outDir), ".d.ts" /* Dts */);
+    }
+    ts.getOutputDeclarationFileName = getOutputDeclarationFileName;
+    function getOutputJSFileName(inputFileName, configFile, ignoreCase) {
+        var isJsonFile = ts.fileExtensionIs(inputFileName, ".json" /* Json */);
+        var outputFileName = ts.changeExtension(getOutputPathWithoutChangingExt(inputFileName, configFile, ignoreCase, configFile.options.outDir), isJsonFile ?
+            ".json" /* Json */ :
+            ts.fileExtensionIs(inputFileName, ".tsx" /* Tsx */) && configFile.options.jsx === 1 /* Preserve */ ?
+                ".jsx" /* Jsx */ :
+                ".js" /* Js */);
+        return !isJsonFile || ts.comparePaths(inputFileName, outputFileName, ts.Debug.assertDefined(configFile.options.configFilePath), ignoreCase) !== 0 /* EqualTo */ ?
+            outputFileName :
+            undefined;
+    }
+    /*@internal*/
+    function getAllProjectOutputs(configFile, ignoreCase) {
+        var outputs;
+        var addOutput = function (path) { return path && (outputs || (outputs = [])).push(path); };
+        if (configFile.options.outFile || configFile.options.out) {
+            var _a = getOutputPathsForBundle(configFile.options, /*forceDtsPaths*/ false), jsFilePath = _a.jsFilePath, sourceMapFilePath = _a.sourceMapFilePath, declarationFilePath = _a.declarationFilePath, declarationMapPath = _a.declarationMapPath, buildInfoPath = _a.buildInfoPath;
+            addOutput(jsFilePath);
+            addOutput(sourceMapFilePath);
+            addOutput(declarationFilePath);
+            addOutput(declarationMapPath);
+            addOutput(buildInfoPath);
+        }
+        else {
+            for (var _b = 0, _c = configFile.fileNames; _b < _c.length; _b++) {
+                var inputFileName = _c[_b];
+                if (ts.fileExtensionIs(inputFileName, ".d.ts" /* Dts */))
+                    continue;
+                var js = getOutputJSFileName(inputFileName, configFile, ignoreCase);
+                addOutput(js);
+                if (ts.fileExtensionIs(inputFileName, ".json" /* Json */))
+                    continue;
+                if (configFile.options.sourceMap) {
+                    addOutput(js + ".map");
+                }
+                if (ts.getEmitDeclarations(configFile.options) && ts.hasTSFileExtension(inputFileName)) {
+                    var dts = getOutputDeclarationFileName(inputFileName, configFile, ignoreCase);
+                    addOutput(dts);
+                    if (configFile.options.declarationMap) {
+                        addOutput(dts + ".map");
+                    }
+                }
+            }
+            addOutput(getOutputPathForBuildInfo(configFile.options));
+        }
+        return outputs || ts.emptyArray;
+    }
+    ts.getAllProjectOutputs = getAllProjectOutputs;
+    /*@internal*/
+    function getFirstProjectOutput(configFile, ignoreCase) {
+        if (configFile.options.outFile || configFile.options.out) {
+            var jsFilePath = getOutputPathsForBundle(configFile.options, /*forceDtsPaths*/ false).jsFilePath;
+            return ts.Debug.assertDefined(jsFilePath, "project " + configFile.options.configFilePath + " expected to have at least one output");
+        }
+        for (var _a = 0, _b = configFile.fileNames; _a < _b.length; _a++) {
+            var inputFileName = _b[_a];
+            if (ts.fileExtensionIs(inputFileName, ".d.ts" /* Dts */))
+                continue;
+            var jsFilePath = getOutputJSFileName(inputFileName, configFile, ignoreCase);
+            if (jsFilePath)
+                return jsFilePath;
+        }
+        var buildInfoPath = getOutputPathForBuildInfo(configFile.options);
+        if (buildInfoPath)
+            return buildInfoPath;
+        return ts.Debug.fail("project " + configFile.options.configFilePath + " expected to have at least one output");
+    }
+    ts.getFirstProjectOutput = getFirstProjectOutput;
     /*@internal*/
     // targetSourceFile is when users only want one file in entire project to be emitted. This is used in compileOnSave feature
-    function emitFiles(resolver, host, targetSourceFile, emitOnlyDtsFiles, transformers, declarationTransformers, onlyBuildInfo) {
+    function emitFiles(resolver, host, targetSourceFile, _a, emitOnlyDtsFiles, onlyBuildInfo) {
+        var scriptTransformers = _a.scriptTransformers, declarationTransformers = _a.declarationTransformers;
         var compilerOptions = host.getCompilerOptions();
         var sourceMapDataList = (compilerOptions.sourceMap || compilerOptions.inlineSourceMap || ts.getAreDeclarationMapsEnabled(compilerOptions)) ? [] : undefined;
         var emittedFilesList = compilerOptions.listEmittedFiles ? [] : undefined;
         var emitterDiagnostics = ts.createDiagnosticCollection();
         var newLine = ts.getNewLineCharacter(compilerOptions, function () { return host.getNewLine(); });
         var writer = ts.createTextWriter(newLine);
-        var _a = ts.performance.createTimer("printTime", "beforePrint", "afterPrint"), enter = _a.enter, exit = _a.exit;
+        var _b = ts.performance.createTimer("printTime", "beforePrint", "afterPrint"), enter = _b.enter, exit = _b.exit;
         var bundleBuildInfo;
         var emitSkipped = false;
         var exportedModulesFromDeclarationEmit;
@@ -82881,14 +85491,16 @@ var ts;
         };
         function emitSourceFileOrBundle(_a, sourceFileOrBundle) {
             var jsFilePath = _a.jsFilePath, sourceMapFilePath = _a.sourceMapFilePath, declarationFilePath = _a.declarationFilePath, declarationMapPath = _a.declarationMapPath, buildInfoPath = _a.buildInfoPath;
+            var buildInfoDirectory;
             if (buildInfoPath && sourceFileOrBundle && ts.isBundle(sourceFileOrBundle)) {
+                buildInfoDirectory = ts.getDirectoryPath(ts.getNormalizedAbsolutePath(buildInfoPath, host.getCurrentDirectory()));
                 bundleBuildInfo = {
-                    commonSourceDirectory: host.getCommonSourceDirectory(),
-                    sourceFiles: sourceFileOrBundle.sourceFiles.map(function (file) { return file.fileName; })
+                    commonSourceDirectory: relativeToBuildInfo(host.getCommonSourceDirectory()),
+                    sourceFiles: sourceFileOrBundle.sourceFiles.map(function (file) { return relativeToBuildInfo(ts.getNormalizedAbsolutePath(file.fileName, host.getCurrentDirectory())); })
                 };
             }
-            emitJsFileOrBundle(sourceFileOrBundle, jsFilePath, sourceMapFilePath);
-            emitDeclarationFileOrBundle(sourceFileOrBundle, declarationFilePath, declarationMapPath);
+            emitJsFileOrBundle(sourceFileOrBundle, jsFilePath, sourceMapFilePath, relativeToBuildInfo);
+            emitDeclarationFileOrBundle(sourceFileOrBundle, declarationFilePath, declarationMapPath, relativeToBuildInfo);
             emitBuildInfo(bundleBuildInfo, buildInfoPath);
             if (!emitSkipped && emittedFilesList) {
                 if (!emitOnlyDtsFiles) {
@@ -82909,21 +85521,22 @@ var ts;
                     emittedFilesList.push(declarationMapPath);
                 }
             }
+            function relativeToBuildInfo(path) {
+                return ts.ensurePathIsNonModuleName(ts.getRelativePathFromDirectory(buildInfoDirectory, path, host.getCanonicalFileName));
+            }
         }
         function emitBuildInfo(bundle, buildInfoPath) {
             // Write build information if applicable
             if (!buildInfoPath || targetSourceFile || emitSkipped)
                 return;
             var program = host.getProgramBuildInfo();
-            if (!bundle && !program)
-                return;
             if (host.isEmitBlocked(buildInfoPath) || compilerOptions.noEmit) {
                 emitSkipped = true;
                 return;
             }
             ts.writeFile(host, emitterDiagnostics, buildInfoPath, getBuildInfoText({ bundle: bundle, program: program, version: ts.version }), /*writeByteOrderMark*/ false);
         }
-        function emitJsFileOrBundle(sourceFileOrBundle, jsFilePath, sourceMapFilePath) {
+        function emitJsFileOrBundle(sourceFileOrBundle, jsFilePath, sourceMapFilePath, relativeToBuildInfo) {
             if (!sourceFileOrBundle || emitOnlyDtsFiles || !jsFilePath) {
                 return;
             }
@@ -82933,7 +85546,7 @@ var ts;
                 return;
             }
             // Transform the source files
-            var transform = ts.transformNodes(resolver, host, compilerOptions, [sourceFileOrBundle], transformers, /*allowDtsFiles*/ false);
+            var transform = ts.transformNodes(resolver, host, compilerOptions, [sourceFileOrBundle], scriptTransformers, /*allowDtsFiles*/ false);
             var printerOptions = {
                 removeComments: compilerOptions.removeComments,
                 newLine: compilerOptions.newLine,
@@ -82944,7 +85557,8 @@ var ts;
                 inlineSourceMap: compilerOptions.inlineSourceMap,
                 inlineSources: compilerOptions.inlineSources,
                 extendedDiagnostics: compilerOptions.extendedDiagnostics,
-                writeBundleFileInfo: !!bundleBuildInfo
+                writeBundleFileInfo: !!bundleBuildInfo,
+                relativeToBuildInfo: relativeToBuildInfo
             };
             // Create a printer to print the nodes
             var printer = createPrinter(printerOptions, {
@@ -82961,7 +85575,7 @@ var ts;
             if (bundleBuildInfo)
                 bundleBuildInfo.js = printer.bundleFileInfo;
         }
-        function emitDeclarationFileOrBundle(sourceFileOrBundle, declarationFilePath, declarationMapPath) {
+        function emitDeclarationFileOrBundle(sourceFileOrBundle, declarationFilePath, declarationMapPath, relativeToBuildInfo) {
             if (!sourceFileOrBundle || !(declarationFilePath && !ts.isInJSFile(sourceFileOrBundle))) {
                 return;
             }
@@ -82974,7 +85588,7 @@ var ts;
                 // Do that here when emitting only dts files
                 nonJsFiles.forEach(collectLinkedAliases);
             }
-            var declarationTransform = ts.transformNodes(resolver, host, compilerOptions, inputListOrBundle, ts.concatenate([ts.transformDeclarations], declarationTransformers), /*allowDtsFiles*/ false);
+            var declarationTransform = ts.transformNodes(resolver, host, compilerOptions, inputListOrBundle, declarationTransformers, /*allowDtsFiles*/ false);
             if (ts.length(declarationTransform.diagnostics)) {
                 for (var _a = 0, _b = declarationTransform.diagnostics; _a < _b.length; _a++) {
                     var diagnostic = _b[_a];
@@ -82992,7 +85606,8 @@ var ts;
                 extendedDiagnostics: compilerOptions.extendedDiagnostics,
                 onlyPrintJsDocStyle: true,
                 writeBundleFileInfo: !!bundleBuildInfo,
-                recordInternalSection: !!bundleBuildInfo
+                recordInternalSection: !!bundleBuildInfo,
+                relativeToBuildInfo: relativeToBuildInfo
             };
             var declarationPrinter = createPrinter(printerOptions, {
                 // resolver hooks
@@ -83011,8 +85626,12 @@ var ts;
                     mapRoot: compilerOptions.mapRoot,
                     extendedDiagnostics: compilerOptions.extendedDiagnostics,
                 });
-                if (emitOnlyDtsFiles && declarationTransform.transformed[0].kind === 284 /* SourceFile */) {
-                    var sourceFile = declarationTransform.transformed[0];
+                if (emitOnlyDtsFiles && declarationTransform.transformed[0].kind === 285 /* SourceFile */) {
+                    // Improved narrowing in master/3.6 makes this cast unnecessary, triggering a lint rule.
+                    // But at the same time, the LKG (3.5) necessitates it because it doesn’t narrow.
+                    // Once the LKG is updated to 3.6, this comment, the cast to `SourceFile`, and the
+                    // tslint directive can be all be removed.
+                    var sourceFile = declarationTransform.transformed[0]; // tslint:disable-line
                     exportedModulesFromDeclarationEmit = sourceFile.exportedModulesFromDeclarationEmit;
                 }
             }
@@ -83022,7 +85641,7 @@ var ts;
         }
         function collectLinkedAliases(node) {
             if (ts.isExportAssignment(node)) {
-                if (node.expression.kind === 72 /* Identifier */) {
+                if (node.expression.kind === 73 /* Identifier */) {
                     resolver.collectLinkedAliases(node.expression, /*setVisibility*/ true);
                 }
                 return;
@@ -83034,8 +85653,8 @@ var ts;
             ts.forEachChild(node, collectLinkedAliases);
         }
         function printSourceFileOrBundle(jsFilePath, sourceMapFilePath, sourceFileOrBundle, printer, mapOptions) {
-            var bundle = sourceFileOrBundle.kind === 285 /* Bundle */ ? sourceFileOrBundle : undefined;
-            var sourceFile = sourceFileOrBundle.kind === 284 /* SourceFile */ ? sourceFileOrBundle : undefined;
+            var bundle = sourceFileOrBundle.kind === 286 /* Bundle */ ? sourceFileOrBundle : undefined;
+            var sourceFile = sourceFileOrBundle.kind === 285 /* SourceFile */ ? sourceFileOrBundle : undefined;
             var sourceFiles = bundle ? bundle.sourceFiles : [sourceFile];
             var sourceMapGenerator;
             if (shouldEmitSourceMaps(mapOptions, sourceFileOrBundle)) {
@@ -83076,7 +85695,7 @@ var ts;
         }
         function shouldEmitSourceMaps(mapOptions, sourceFileOrBundle) {
             return (mapOptions.sourceMap || mapOptions.inlineSourceMap)
-                && (sourceFileOrBundle.kind !== 284 /* SourceFile */ || !ts.fileExtensionIs(sourceFileOrBundle.fileName, ".json" /* Json */));
+                && (sourceFileOrBundle.kind !== 285 /* SourceFile */ || !ts.fileExtensionIs(sourceFileOrBundle.fileName, ".json" /* Json */));
         }
         function getSourceRoot(mapOptions) {
             // Normalize source root and make sure it has trailing "/" so that it can be used to combine paths with the
@@ -83184,10 +85803,10 @@ var ts;
         getSymbolOfExternalModuleSpecifier: ts.notImplemented,
         isBindingCapturedByNode: ts.notImplemented,
     };
-    function createSourceFilesFromBundleBuildInfo(bundle) {
+    function createSourceFilesFromBundleBuildInfo(bundle, buildInfoDirectory, host) {
         var sourceFiles = bundle.sourceFiles.map(function (fileName) {
-            var sourceFile = ts.createNode(284 /* SourceFile */, 0, 0);
-            sourceFile.fileName = fileName;
+            var sourceFile = ts.createNode(285 /* SourceFile */, 0, 0);
+            sourceFile.fileName = ts.getRelativePathFromDirectory(host.getCurrentDirectory(), ts.getNormalizedAbsolutePath(fileName, buildInfoDirectory), !host.useCaseSensitiveFileNames());
             sourceFile.text = "";
             sourceFile.statements = ts.createNodeArray();
             return sourceFile;
@@ -83198,7 +85817,7 @@ var ts;
             sourceFile.text = prologueInfo.text;
             sourceFile.end = prologueInfo.text.length;
             sourceFile.statements = ts.createNodeArray(prologueInfo.directives.map(function (directive) {
-                var statement = ts.createNode(221 /* ExpressionStatement */, directive.pos, directive.end);
+                var statement = ts.createNode(222 /* ExpressionStatement */, directive.pos, directive.end);
                 statement.expression = ts.createNode(10 /* StringLiteral */, directive.expression.pos, directive.expression.end);
                 statement.expression.text = directive.expression.text;
                 return statement;
@@ -83207,7 +85826,7 @@ var ts;
         return sourceFiles;
     }
     /*@internal*/
-    function emitUsingBuildInfo(config, host, getCommandLine) {
+    function emitUsingBuildInfo(config, host, getCommandLine, customTransformers) {
         var _a = getOutputPathsForBundle(config.options, /*forceDtsPaths*/ false), buildInfoPath = _a.buildInfoPath, jsFilePath = _a.jsFilePath, sourceMapFilePath = _a.sourceMapFilePath, declarationFilePath = _a.declarationFilePath, declarationMapPath = _a.declarationMapPath;
         var buildInfoText = host.readFile(ts.Debug.assertDefined(buildInfoPath));
         if (!buildInfoText)
@@ -83230,23 +85849,25 @@ var ts;
         var buildInfo = getBuildInfo(buildInfoText);
         if (!buildInfo.bundle || !buildInfo.bundle.js || (declarationText && !buildInfo.bundle.dts))
             return buildInfoPath;
+        var buildInfoDirectory = ts.getDirectoryPath(ts.getNormalizedAbsolutePath(buildInfoPath, host.getCurrentDirectory()));
         var ownPrependInput = ts.createInputFiles(jsFileText, declarationText, sourceMapFilePath, sourceMapText, declarationMapPath, declarationMapText, jsFilePath, declarationFilePath, buildInfoPath, buildInfo, 
         /*onlyOwnText*/ true);
         var outputFiles = [];
         var prependNodes = ts.createPrependNodes(config.projectReferences, getCommandLine, function (f) { return host.readFile(f); });
-        var sourceFilesForJsEmit = createSourceFilesFromBundleBuildInfo(buildInfo.bundle);
+        var sourceFilesForJsEmit = createSourceFilesFromBundleBuildInfo(buildInfo.bundle, buildInfoDirectory, host);
         var emitHost = {
             getPrependNodes: ts.memoize(function () { return prependNodes.concat([ownPrependInput]); }),
             getCanonicalFileName: host.getCanonicalFileName,
-            getCommonSourceDirectory: function () { return buildInfo.bundle.commonSourceDirectory; },
+            getCommonSourceDirectory: function () { return ts.getNormalizedAbsolutePath(buildInfo.bundle.commonSourceDirectory, buildInfoDirectory); },
             getCompilerOptions: function () { return config.options; },
             getCurrentDirectory: function () { return host.getCurrentDirectory(); },
             getNewLine: function () { return host.getNewLine(); },
-            getSourceFile: function () { return undefined; },
-            getSourceFileByPath: function () { return undefined; },
+            getSourceFile: ts.returnUndefined,
+            getSourceFileByPath: ts.returnUndefined,
             getSourceFiles: function () { return sourceFilesForJsEmit; },
             getLibFileFromReference: ts.notImplemented,
             isSourceFileFromExternalLibrary: ts.returnFalse,
+            getResolvedProjectReferenceToRedirect: ts.returnUndefined,
             writeFile: function (name, text, writeByteOrderMark) {
                 switch (name) {
                     case jsFilePath:
@@ -83287,9 +85908,11 @@ var ts;
             fileExists: function (f) { return host.fileExists(f); },
             directoryExists: host.directoryExists && (function (f) { return host.directoryExists(f); }),
             useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); },
-            getProgramBuildInfo: function () { return undefined; }
+            getProgramBuildInfo: ts.returnUndefined,
+            getSourceFileFromReference: ts.returnUndefined,
         };
-        emitFiles(ts.notImplementedResolver, emitHost, /*targetSourceFile*/ undefined, /*emitOnlyDtsFiles*/ false, ts.getTransformers(config.options));
+        emitFiles(ts.notImplementedResolver, emitHost, 
+        /*targetSourceFile*/ undefined, ts.getTransformers(config.options, customTransformers));
         return outputFiles;
     }
     ts.emitUsingBuildInfo = emitUsingBuildInfo;
@@ -83322,6 +85945,7 @@ var ts;
         var write = writeBase;
         var isOwnFileEmit;
         var bundleFileInfo = printerOptions.writeBundleFileInfo ? { sections: [] } : undefined;
+        var relativeToBuildInfo = bundleFileInfo ? ts.Debug.assertDefined(printerOptions.relativeToBuildInfo) : undefined;
         var recordInternalSection = printerOptions.recordInternalSection;
         var sourceFileTextPos = 0;
         var sourceFileTextKind = "text" /* Text */;
@@ -83366,9 +85990,9 @@ var ts;
                     break;
             }
             switch (node.kind) {
-                case 284 /* SourceFile */: return printFile(node);
-                case 285 /* Bundle */: return printBundle(node);
-                case 286 /* UnparsedSource */: return printUnparsedSource(node);
+                case 285 /* SourceFile */: return printFile(node);
+                case 286 /* Bundle */: return printBundle(node);
+                case 287 /* UnparsedSource */: return printUnparsedSource(node);
             }
             writeNode(hint, node, sourceFile, beginPrint());
             return endPrint();
@@ -83471,7 +86095,13 @@ var ts;
                         (_a = bundleFileInfo.sections).push.apply(_a, newSections);
                     else {
                         newSections.forEach(function (section) { return ts.Debug.assert(ts.isBundleFileTextLike(section)); });
-                        bundleFileInfo.sections.push({ pos: pos, end: writer.getTextPos(), kind: "prepend" /* Prepend */, data: prepend.fileName, texts: newSections });
+                        bundleFileInfo.sections.push({
+                            pos: pos,
+                            end: writer.getTextPos(),
+                            kind: "prepend" /* Prepend */,
+                            data: relativeToBuildInfo(prepend.fileName),
+                            texts: newSections
+                        });
                     }
                 }
             }
@@ -83598,12 +86228,12 @@ var ts;
                     }
                 // falls through
                 case 2 /* Comments */:
-                    if (!commentsDisabled && node.kind !== 284 /* SourceFile */) {
+                    if (!commentsDisabled && node.kind !== 285 /* SourceFile */) {
                         return pipelineEmitWithComments;
                     }
                 // falls through
                 case 3 /* SourceMaps */:
-                    if (!sourceMapsDisabled && node.kind !== 284 /* SourceFile */ && !ts.isInJsonFile(node)) {
+                    if (!sourceMapsDisabled && node.kind !== 285 /* SourceFile */ && !ts.isInJsonFile(node)) {
                         return pipelineEmitWithSourceMap;
                     }
                 // falls through
@@ -83640,272 +86270,272 @@ var ts;
                     case 16 /* TemplateMiddle */:
                     case 17 /* TemplateTail */:
                         return emitLiteral(node);
-                    case 286 /* UnparsedSource */:
-                    case 280 /* UnparsedPrepend */:
+                    case 287 /* UnparsedSource */:
+                    case 281 /* UnparsedPrepend */:
                         return emitUnparsedSourceOrPrepend(node);
-                    case 279 /* UnparsedPrologue */:
+                    case 280 /* UnparsedPrologue */:
                         return writeUnparsedNode(node);
-                    case 281 /* UnparsedText */:
-                    case 282 /* UnparsedInternalText */:
+                    case 282 /* UnparsedText */:
+                    case 283 /* UnparsedInternalText */:
                         return emitUnparsedTextLike(node);
-                    case 283 /* UnparsedSyntheticReference */:
+                    case 284 /* UnparsedSyntheticReference */:
                         return emitUnparsedSyntheticReference(node);
                     // Identifiers
-                    case 72 /* Identifier */:
+                    case 73 /* Identifier */:
                         return emitIdentifier(node);
                     // Parse tree nodes
                     // Names
-                    case 148 /* QualifiedName */:
+                    case 149 /* QualifiedName */:
                         return emitQualifiedName(node);
-                    case 149 /* ComputedPropertyName */:
+                    case 150 /* ComputedPropertyName */:
                         return emitComputedPropertyName(node);
                     // Signature elements
-                    case 150 /* TypeParameter */:
+                    case 151 /* TypeParameter */:
                         return emitTypeParameter(node);
-                    case 151 /* Parameter */:
+                    case 152 /* Parameter */:
                         return emitParameter(node);
-                    case 152 /* Decorator */:
+                    case 153 /* Decorator */:
                         return emitDecorator(node);
                     // Type members
-                    case 153 /* PropertySignature */:
+                    case 154 /* PropertySignature */:
                         return emitPropertySignature(node);
-                    case 154 /* PropertyDeclaration */:
+                    case 155 /* PropertyDeclaration */:
                         return emitPropertyDeclaration(node);
-                    case 155 /* MethodSignature */:
+                    case 156 /* MethodSignature */:
                         return emitMethodSignature(node);
-                    case 156 /* MethodDeclaration */:
+                    case 157 /* MethodDeclaration */:
                         return emitMethodDeclaration(node);
-                    case 157 /* Constructor */:
+                    case 158 /* Constructor */:
                         return emitConstructor(node);
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
                         return emitAccessorDeclaration(node);
-                    case 160 /* CallSignature */:
+                    case 161 /* CallSignature */:
                         return emitCallSignature(node);
-                    case 161 /* ConstructSignature */:
+                    case 162 /* ConstructSignature */:
                         return emitConstructSignature(node);
-                    case 162 /* IndexSignature */:
+                    case 163 /* IndexSignature */:
                         return emitIndexSignature(node);
                     // Types
-                    case 163 /* TypePredicate */:
+                    case 164 /* TypePredicate */:
                         return emitTypePredicate(node);
-                    case 164 /* TypeReference */:
+                    case 165 /* TypeReference */:
                         return emitTypeReference(node);
-                    case 165 /* FunctionType */:
+                    case 166 /* FunctionType */:
                         return emitFunctionType(node);
-                    case 294 /* JSDocFunctionType */:
+                    case 295 /* JSDocFunctionType */:
                         return emitJSDocFunctionType(node);
-                    case 166 /* ConstructorType */:
+                    case 167 /* ConstructorType */:
                         return emitConstructorType(node);
-                    case 167 /* TypeQuery */:
+                    case 168 /* TypeQuery */:
                         return emitTypeQuery(node);
-                    case 168 /* TypeLiteral */:
+                    case 169 /* TypeLiteral */:
                         return emitTypeLiteral(node);
-                    case 169 /* ArrayType */:
+                    case 170 /* ArrayType */:
                         return emitArrayType(node);
-                    case 170 /* TupleType */:
+                    case 171 /* TupleType */:
                         return emitTupleType(node);
-                    case 171 /* OptionalType */:
+                    case 172 /* OptionalType */:
                         return emitOptionalType(node);
-                    case 173 /* UnionType */:
+                    case 174 /* UnionType */:
                         return emitUnionType(node);
-                    case 174 /* IntersectionType */:
+                    case 175 /* IntersectionType */:
                         return emitIntersectionType(node);
-                    case 175 /* ConditionalType */:
+                    case 176 /* ConditionalType */:
                         return emitConditionalType(node);
-                    case 176 /* InferType */:
+                    case 177 /* InferType */:
                         return emitInferType(node);
-                    case 177 /* ParenthesizedType */:
+                    case 178 /* ParenthesizedType */:
                         return emitParenthesizedType(node);
-                    case 211 /* ExpressionWithTypeArguments */:
+                    case 212 /* ExpressionWithTypeArguments */:
                         return emitExpressionWithTypeArguments(node);
-                    case 178 /* ThisType */:
+                    case 179 /* ThisType */:
                         return emitThisType();
-                    case 179 /* TypeOperator */:
+                    case 180 /* TypeOperator */:
                         return emitTypeOperator(node);
-                    case 180 /* IndexedAccessType */:
+                    case 181 /* IndexedAccessType */:
                         return emitIndexedAccessType(node);
-                    case 181 /* MappedType */:
+                    case 182 /* MappedType */:
                         return emitMappedType(node);
-                    case 182 /* LiteralType */:
+                    case 183 /* LiteralType */:
                         return emitLiteralType(node);
-                    case 183 /* ImportType */:
+                    case 184 /* ImportType */:
                         return emitImportTypeNode(node);
-                    case 289 /* JSDocAllType */:
+                    case 290 /* JSDocAllType */:
                         writePunctuation("*");
                         return;
-                    case 290 /* JSDocUnknownType */:
+                    case 291 /* JSDocUnknownType */:
                         writePunctuation("?");
                         return;
-                    case 291 /* JSDocNullableType */:
+                    case 292 /* JSDocNullableType */:
                         return emitJSDocNullableType(node);
-                    case 292 /* JSDocNonNullableType */:
+                    case 293 /* JSDocNonNullableType */:
                         return emitJSDocNonNullableType(node);
-                    case 293 /* JSDocOptionalType */:
+                    case 294 /* JSDocOptionalType */:
                         return emitJSDocOptionalType(node);
-                    case 172 /* RestType */:
-                    case 295 /* JSDocVariadicType */:
+                    case 173 /* RestType */:
+                    case 296 /* JSDocVariadicType */:
                         return emitRestOrJSDocVariadicType(node);
                     // Binding patterns
-                    case 184 /* ObjectBindingPattern */:
+                    case 185 /* ObjectBindingPattern */:
                         return emitObjectBindingPattern(node);
-                    case 185 /* ArrayBindingPattern */:
+                    case 186 /* ArrayBindingPattern */:
                         return emitArrayBindingPattern(node);
-                    case 186 /* BindingElement */:
+                    case 187 /* BindingElement */:
                         return emitBindingElement(node);
                     // Misc
-                    case 216 /* TemplateSpan */:
+                    case 217 /* TemplateSpan */:
                         return emitTemplateSpan(node);
-                    case 217 /* SemicolonClassElement */:
+                    case 218 /* SemicolonClassElement */:
                         return emitSemicolonClassElement();
                     // Statements
-                    case 218 /* Block */:
+                    case 219 /* Block */:
                         return emitBlock(node);
-                    case 219 /* VariableStatement */:
+                    case 220 /* VariableStatement */:
                         return emitVariableStatement(node);
-                    case 220 /* EmptyStatement */:
+                    case 221 /* EmptyStatement */:
                         return emitEmptyStatement(/*isEmbeddedStatement*/ false);
-                    case 221 /* ExpressionStatement */:
+                    case 222 /* ExpressionStatement */:
                         return emitExpressionStatement(node);
-                    case 222 /* IfStatement */:
+                    case 223 /* IfStatement */:
                         return emitIfStatement(node);
-                    case 223 /* DoStatement */:
+                    case 224 /* DoStatement */:
                         return emitDoStatement(node);
-                    case 224 /* WhileStatement */:
+                    case 225 /* WhileStatement */:
                         return emitWhileStatement(node);
-                    case 225 /* ForStatement */:
+                    case 226 /* ForStatement */:
                         return emitForStatement(node);
-                    case 226 /* ForInStatement */:
+                    case 227 /* ForInStatement */:
                         return emitForInStatement(node);
-                    case 227 /* ForOfStatement */:
+                    case 228 /* ForOfStatement */:
                         return emitForOfStatement(node);
-                    case 228 /* ContinueStatement */:
+                    case 229 /* ContinueStatement */:
                         return emitContinueStatement(node);
-                    case 229 /* BreakStatement */:
+                    case 230 /* BreakStatement */:
                         return emitBreakStatement(node);
-                    case 230 /* ReturnStatement */:
+                    case 231 /* ReturnStatement */:
                         return emitReturnStatement(node);
-                    case 231 /* WithStatement */:
+                    case 232 /* WithStatement */:
                         return emitWithStatement(node);
-                    case 232 /* SwitchStatement */:
+                    case 233 /* SwitchStatement */:
                         return emitSwitchStatement(node);
-                    case 233 /* LabeledStatement */:
+                    case 234 /* LabeledStatement */:
                         return emitLabeledStatement(node);
-                    case 234 /* ThrowStatement */:
+                    case 235 /* ThrowStatement */:
                         return emitThrowStatement(node);
-                    case 235 /* TryStatement */:
+                    case 236 /* TryStatement */:
                         return emitTryStatement(node);
-                    case 236 /* DebuggerStatement */:
+                    case 237 /* DebuggerStatement */:
                         return emitDebuggerStatement(node);
                     // Declarations
-                    case 237 /* VariableDeclaration */:
+                    case 238 /* VariableDeclaration */:
                         return emitVariableDeclaration(node);
-                    case 238 /* VariableDeclarationList */:
+                    case 239 /* VariableDeclarationList */:
                         return emitVariableDeclarationList(node);
-                    case 239 /* FunctionDeclaration */:
+                    case 240 /* FunctionDeclaration */:
                         return emitFunctionDeclaration(node);
-                    case 240 /* ClassDeclaration */:
+                    case 241 /* ClassDeclaration */:
                         return emitClassDeclaration(node);
-                    case 241 /* InterfaceDeclaration */:
+                    case 242 /* InterfaceDeclaration */:
                         return emitInterfaceDeclaration(node);
-                    case 242 /* TypeAliasDeclaration */:
+                    case 243 /* TypeAliasDeclaration */:
                         return emitTypeAliasDeclaration(node);
-                    case 243 /* EnumDeclaration */:
+                    case 244 /* EnumDeclaration */:
                         return emitEnumDeclaration(node);
-                    case 244 /* ModuleDeclaration */:
+                    case 245 /* ModuleDeclaration */:
                         return emitModuleDeclaration(node);
-                    case 245 /* ModuleBlock */:
+                    case 246 /* ModuleBlock */:
                         return emitModuleBlock(node);
-                    case 246 /* CaseBlock */:
+                    case 247 /* CaseBlock */:
                         return emitCaseBlock(node);
-                    case 247 /* NamespaceExportDeclaration */:
+                    case 248 /* NamespaceExportDeclaration */:
                         return emitNamespaceExportDeclaration(node);
-                    case 248 /* ImportEqualsDeclaration */:
+                    case 249 /* ImportEqualsDeclaration */:
                         return emitImportEqualsDeclaration(node);
-                    case 249 /* ImportDeclaration */:
+                    case 250 /* ImportDeclaration */:
                         return emitImportDeclaration(node);
-                    case 250 /* ImportClause */:
+                    case 251 /* ImportClause */:
                         return emitImportClause(node);
-                    case 251 /* NamespaceImport */:
+                    case 252 /* NamespaceImport */:
                         return emitNamespaceImport(node);
-                    case 252 /* NamedImports */:
+                    case 253 /* NamedImports */:
                         return emitNamedImports(node);
-                    case 253 /* ImportSpecifier */:
+                    case 254 /* ImportSpecifier */:
                         return emitImportSpecifier(node);
-                    case 254 /* ExportAssignment */:
+                    case 255 /* ExportAssignment */:
                         return emitExportAssignment(node);
-                    case 255 /* ExportDeclaration */:
+                    case 256 /* ExportDeclaration */:
                         return emitExportDeclaration(node);
-                    case 256 /* NamedExports */:
+                    case 257 /* NamedExports */:
                         return emitNamedExports(node);
-                    case 257 /* ExportSpecifier */:
+                    case 258 /* ExportSpecifier */:
                         return emitExportSpecifier(node);
-                    case 258 /* MissingDeclaration */:
+                    case 259 /* MissingDeclaration */:
                         return;
                     // Module references
-                    case 259 /* ExternalModuleReference */:
+                    case 260 /* ExternalModuleReference */:
                         return emitExternalModuleReference(node);
                     // JSX (non-expression)
                     case 11 /* JsxText */:
                         return emitJsxText(node);
-                    case 262 /* JsxOpeningElement */:
-                    case 265 /* JsxOpeningFragment */:
+                    case 263 /* JsxOpeningElement */:
+                    case 266 /* JsxOpeningFragment */:
                         return emitJsxOpeningElementOrFragment(node);
-                    case 263 /* JsxClosingElement */:
-                    case 266 /* JsxClosingFragment */:
+                    case 264 /* JsxClosingElement */:
+                    case 267 /* JsxClosingFragment */:
                         return emitJsxClosingElementOrFragment(node);
-                    case 267 /* JsxAttribute */:
+                    case 268 /* JsxAttribute */:
                         return emitJsxAttribute(node);
-                    case 268 /* JsxAttributes */:
+                    case 269 /* JsxAttributes */:
                         return emitJsxAttributes(node);
-                    case 269 /* JsxSpreadAttribute */:
+                    case 270 /* JsxSpreadAttribute */:
                         return emitJsxSpreadAttribute(node);
-                    case 270 /* JsxExpression */:
+                    case 271 /* JsxExpression */:
                         return emitJsxExpression(node);
                     // Clauses
-                    case 271 /* CaseClause */:
+                    case 272 /* CaseClause */:
                         return emitCaseClause(node);
-                    case 272 /* DefaultClause */:
+                    case 273 /* DefaultClause */:
                         return emitDefaultClause(node);
-                    case 273 /* HeritageClause */:
+                    case 274 /* HeritageClause */:
                         return emitHeritageClause(node);
-                    case 274 /* CatchClause */:
+                    case 275 /* CatchClause */:
                         return emitCatchClause(node);
                     // Property assignments
-                    case 275 /* PropertyAssignment */:
+                    case 276 /* PropertyAssignment */:
                         return emitPropertyAssignment(node);
-                    case 276 /* ShorthandPropertyAssignment */:
+                    case 277 /* ShorthandPropertyAssignment */:
                         return emitShorthandPropertyAssignment(node);
-                    case 277 /* SpreadAssignment */:
+                    case 278 /* SpreadAssignment */:
                         return emitSpreadAssignment(node);
                     // Enum
-                    case 278 /* EnumMember */:
+                    case 279 /* EnumMember */:
                         return emitEnumMember(node);
                     // JSDoc nodes (only used in codefixes currently)
-                    case 304 /* JSDocParameterTag */:
-                    case 310 /* JSDocPropertyTag */:
+                    case 306 /* JSDocParameterTag */:
+                    case 312 /* JSDocPropertyTag */:
                         return emitJSDocPropertyLikeTag(node);
-                    case 305 /* JSDocReturnTag */:
-                    case 307 /* JSDocTypeTag */:
-                    case 306 /* JSDocThisTag */:
-                    case 303 /* JSDocEnumTag */:
+                    case 307 /* JSDocReturnTag */:
+                    case 309 /* JSDocTypeTag */:
+                    case 308 /* JSDocThisTag */:
+                    case 305 /* JSDocEnumTag */:
                         return emitJSDocSimpleTypedTag(node);
-                    case 300 /* JSDocAugmentsTag */:
+                    case 301 /* JSDocAugmentsTag */:
                         return emitJSDocAugmentsTag(node);
-                    case 308 /* JSDocTemplateTag */:
+                    case 310 /* JSDocTemplateTag */:
                         return emitJSDocTemplateTag(node);
-                    case 309 /* JSDocTypedefTag */:
+                    case 311 /* JSDocTypedefTag */:
                         return emitJSDocTypedefTag(node);
-                    case 302 /* JSDocCallbackTag */:
+                    case 304 /* JSDocCallbackTag */:
                         return emitJSDocCallbackTag(node);
-                    case 298 /* JSDocSignature */:
+                    case 299 /* JSDocSignature */:
                         return emitJSDocSignature(node);
-                    case 297 /* JSDocTypeLiteral */:
+                    case 298 /* JSDocTypeLiteral */:
                         return emitJSDocTypeLiteral(node);
-                    case 301 /* JSDocClassTag */:
-                    case 299 /* JSDocTag */:
+                    case 303 /* JSDocClassTag */:
+                    case 300 /* JSDocTag */:
                         return emitJSDocSimpleTag(node);
-                    case 296 /* JSDocComment */:
+                    case 297 /* JSDocComment */:
                         return emitJSDoc(node);
                     // Transformation nodes (ignored)
                 }
@@ -83930,83 +86560,83 @@ var ts;
                     case 14 /* NoSubstitutionTemplateLiteral */:
                         return emitLiteral(node);
                     // Identifiers
-                    case 72 /* Identifier */:
+                    case 73 /* Identifier */:
                         return emitIdentifier(node);
                     // Reserved words
-                    case 87 /* FalseKeyword */:
-                    case 96 /* NullKeyword */:
-                    case 98 /* SuperKeyword */:
-                    case 102 /* TrueKeyword */:
-                    case 100 /* ThisKeyword */:
-                    case 92 /* ImportKeyword */:
+                    case 88 /* FalseKeyword */:
+                    case 97 /* NullKeyword */:
+                    case 99 /* SuperKeyword */:
+                    case 103 /* TrueKeyword */:
+                    case 101 /* ThisKeyword */:
+                    case 93 /* ImportKeyword */:
                         writeTokenNode(node, writeKeyword);
                         return;
                     // Expressions
-                    case 187 /* ArrayLiteralExpression */:
+                    case 188 /* ArrayLiteralExpression */:
                         return emitArrayLiteralExpression(node);
-                    case 188 /* ObjectLiteralExpression */:
+                    case 189 /* ObjectLiteralExpression */:
                         return emitObjectLiteralExpression(node);
-                    case 189 /* PropertyAccessExpression */:
+                    case 190 /* PropertyAccessExpression */:
                         return emitPropertyAccessExpression(node);
-                    case 190 /* ElementAccessExpression */:
+                    case 191 /* ElementAccessExpression */:
                         return emitElementAccessExpression(node);
-                    case 191 /* CallExpression */:
+                    case 192 /* CallExpression */:
                         return emitCallExpression(node);
-                    case 192 /* NewExpression */:
+                    case 193 /* NewExpression */:
                         return emitNewExpression(node);
-                    case 193 /* TaggedTemplateExpression */:
+                    case 194 /* TaggedTemplateExpression */:
                         return emitTaggedTemplateExpression(node);
-                    case 194 /* TypeAssertionExpression */:
+                    case 195 /* TypeAssertionExpression */:
                         return emitTypeAssertionExpression(node);
-                    case 195 /* ParenthesizedExpression */:
+                    case 196 /* ParenthesizedExpression */:
                         return emitParenthesizedExpression(node);
-                    case 196 /* FunctionExpression */:
+                    case 197 /* FunctionExpression */:
                         return emitFunctionExpression(node);
-                    case 197 /* ArrowFunction */:
+                    case 198 /* ArrowFunction */:
                         return emitArrowFunction(node);
-                    case 198 /* DeleteExpression */:
+                    case 199 /* DeleteExpression */:
                         return emitDeleteExpression(node);
-                    case 199 /* TypeOfExpression */:
+                    case 200 /* TypeOfExpression */:
                         return emitTypeOfExpression(node);
-                    case 200 /* VoidExpression */:
+                    case 201 /* VoidExpression */:
                         return emitVoidExpression(node);
-                    case 201 /* AwaitExpression */:
+                    case 202 /* AwaitExpression */:
                         return emitAwaitExpression(node);
-                    case 202 /* PrefixUnaryExpression */:
+                    case 203 /* PrefixUnaryExpression */:
                         return emitPrefixUnaryExpression(node);
-                    case 203 /* PostfixUnaryExpression */:
+                    case 204 /* PostfixUnaryExpression */:
                         return emitPostfixUnaryExpression(node);
-                    case 204 /* BinaryExpression */:
+                    case 205 /* BinaryExpression */:
                         return emitBinaryExpression(node);
-                    case 205 /* ConditionalExpression */:
+                    case 206 /* ConditionalExpression */:
                         return emitConditionalExpression(node);
-                    case 206 /* TemplateExpression */:
+                    case 207 /* TemplateExpression */:
                         return emitTemplateExpression(node);
-                    case 207 /* YieldExpression */:
+                    case 208 /* YieldExpression */:
                         return emitYieldExpression(node);
-                    case 208 /* SpreadElement */:
+                    case 209 /* SpreadElement */:
                         return emitSpreadExpression(node);
-                    case 209 /* ClassExpression */:
+                    case 210 /* ClassExpression */:
                         return emitClassExpression(node);
-                    case 210 /* OmittedExpression */:
+                    case 211 /* OmittedExpression */:
                         return;
-                    case 212 /* AsExpression */:
+                    case 213 /* AsExpression */:
                         return emitAsExpression(node);
-                    case 213 /* NonNullExpression */:
+                    case 214 /* NonNullExpression */:
                         return emitNonNullExpression(node);
-                    case 214 /* MetaProperty */:
+                    case 215 /* MetaProperty */:
                         return emitMetaProperty(node);
                     // JSX
-                    case 260 /* JsxElement */:
+                    case 261 /* JsxElement */:
                         return emitJsxElement(node);
-                    case 261 /* JsxSelfClosingElement */:
+                    case 262 /* JsxSelfClosingElement */:
                         return emitJsxSelfClosingElement(node);
-                    case 264 /* JsxFragment */:
+                    case 265 /* JsxFragment */:
                         return emitJsxFragment(node);
                     // Transformation nodes
-                    case 313 /* PartiallyEmittedExpression */:
+                    case 315 /* PartiallyEmittedExpression */:
                         return emitPartiallyEmittedExpression(node);
-                    case 314 /* CommaListExpression */:
+                    case 316 /* CommaListExpression */:
                         return emitCommaList(node);
                 }
             }
@@ -84046,7 +86676,7 @@ var ts;
         }
         function emitHelpers(node) {
             var helpersEmitted = false;
-            var bundle = node.kind === 285 /* Bundle */ ? node : undefined;
+            var bundle = node.kind === 286 /* Bundle */ ? node : undefined;
             if (bundle && moduleKind === ts.ModuleKind.None) {
                 return;
             }
@@ -84146,7 +86776,7 @@ var ts;
             var pos = getTextPosWithWriteLine();
             writeUnparsedNode(unparsed);
             if (bundleFileInfo) {
-                updateOrPushBundleFileTextLike(pos, writer.getTextPos(), unparsed.kind === 281 /* UnparsedText */ ?
+                updateOrPushBundleFileTextLike(pos, writer.getTextPos(), unparsed.kind === 282 /* UnparsedText */ ?
                     "text" /* Text */ :
                     "internal" /* Internal */);
             }
@@ -84179,7 +86809,7 @@ var ts;
             emit(node.right);
         }
         function emitEntityName(node) {
-            if (node.kind === 72 /* Identifier */) {
+            if (node.kind === 73 /* Identifier */) {
                 emitExpression(node);
             }
             else {
@@ -84215,7 +86845,7 @@ var ts;
             emit(node.dotDotDotToken);
             emitNodeWithWriter(node.name, writeParameter);
             emit(node.questionToken);
-            if (node.parent && node.parent.kind === 294 /* JSDocFunctionType */ && !node.name) {
+            if (node.parent && node.parent.kind === 295 /* JSDocFunctionType */ && !node.name) {
                 emit(node.type);
             }
             else {
@@ -84277,7 +86907,7 @@ var ts;
         function emitAccessorDeclaration(node) {
             emitDecorators(node, node.decorators);
             emitModifiers(node, node.modifiers);
-            writeKeyword(node.kind === 158 /* GetAccessor */ ? "get" : "set");
+            writeKeyword(node.kind === 159 /* GetAccessor */ ? "get" : "set");
             writeSpace();
             emit(node.name);
             emitSignatureAndBody(node, emitSignatureHead);
@@ -84454,7 +87084,7 @@ var ts;
             }
             if (node.readonlyToken) {
                 emit(node.readonlyToken);
-                if (node.readonlyToken.kind !== 133 /* ReadonlyKeyword */) {
+                if (node.readonlyToken.kind !== 134 /* ReadonlyKeyword */) {
                     writeKeyword("readonly");
                 }
                 writeSpace();
@@ -84604,7 +87234,7 @@ var ts;
             emitExpressionList(node, node.arguments, 2576 /* CallExpressionArguments */);
         }
         function emitNewExpression(node) {
-            emitTokenWithComment(95 /* NewKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(96 /* NewKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emitExpression(node.expression);
             emitTypeArguments(node, node.typeArguments);
@@ -84644,22 +87274,22 @@ var ts;
             emit(node.equalsGreaterThanToken);
         }
         function emitDeleteExpression(node) {
-            emitTokenWithComment(81 /* DeleteKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(82 /* DeleteKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emitExpression(node.expression);
         }
         function emitTypeOfExpression(node) {
-            emitTokenWithComment(104 /* TypeOfKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(105 /* TypeOfKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emitExpression(node.expression);
         }
         function emitVoidExpression(node) {
-            emitTokenWithComment(106 /* VoidKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(107 /* VoidKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emitExpression(node.expression);
         }
         function emitAwaitExpression(node) {
-            emitTokenWithComment(122 /* AwaitKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(123 /* AwaitKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emitExpression(node.expression);
         }
@@ -84684,7 +87314,7 @@ var ts;
             // expression a prefix increment whose operand is a plus expression - (++(+x))
             // The same is true of minus of course.
             var operand = node.operand;
-            return operand.kind === 202 /* PrefixUnaryExpression */
+            return operand.kind === 203 /* PrefixUnaryExpression */
                 && ((node.operator === 38 /* PlusToken */ && (operand.operator === 38 /* PlusToken */ || operand.operator === 44 /* PlusPlusToken */))
                     || (node.operator === 39 /* MinusToken */ && (operand.operator === 39 /* MinusToken */ || operand.operator === 45 /* MinusMinusToken */)));
         }
@@ -84699,7 +87329,7 @@ var ts;
             emitExpression(node.left);
             increaseIndentIf(indentBeforeOperator, isCommaOperator);
             emitLeadingCommentsOfPosition(node.operatorToken.pos);
-            writeTokenNode(node.operatorToken, node.operatorToken.kind === 93 /* InKeyword */ ? writeKeyword : writeOperator);
+            writeTokenNode(node.operatorToken, node.operatorToken.kind === 94 /* InKeyword */ ? writeKeyword : writeOperator);
             emitTrailingCommentsOfPosition(node.operatorToken.end, /*prefixSpace*/ true); // Binary operators should have a space before the comment starts
             increaseIndentIf(indentAfterOperator, /*writeSpaceIfNotIndenting*/ true);
             emitExpression(node.right);
@@ -84727,7 +87357,7 @@ var ts;
             emitList(node, node.templateSpans, 262144 /* TemplateExpressionSpans */);
         }
         function emitYieldExpression(node) {
-            emitTokenWithComment(117 /* YieldKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(118 /* YieldKeyword */, node.pos, writeKeyword, node);
             emit(node.asteriskToken);
             emitExpressionWithLeadingSpace(node.expression);
         }
@@ -84804,7 +87434,7 @@ var ts;
             }
         }
         function emitIfStatement(node) {
-            var openParenPos = emitTokenWithComment(91 /* IfKeyword */, node.pos, writeKeyword, node);
+            var openParenPos = emitTokenWithComment(92 /* IfKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emitTokenWithComment(20 /* OpenParenToken */, openParenPos, writePunctuation, node);
             emitExpression(node.expression);
@@ -84812,8 +87442,8 @@ var ts;
             emitEmbeddedStatement(node, node.thenStatement);
             if (node.elseStatement) {
                 writeLineOrSpace(node);
-                emitTokenWithComment(83 /* ElseKeyword */, node.thenStatement.end, writeKeyword, node);
-                if (node.elseStatement.kind === 222 /* IfStatement */) {
+                emitTokenWithComment(84 /* ElseKeyword */, node.thenStatement.end, writeKeyword, node);
+                if (node.elseStatement.kind === 223 /* IfStatement */) {
                     writeSpace();
                     emit(node.elseStatement);
                 }
@@ -84823,14 +87453,14 @@ var ts;
             }
         }
         function emitWhileClause(node, startPos) {
-            var openParenPos = emitTokenWithComment(107 /* WhileKeyword */, startPos, writeKeyword, node);
+            var openParenPos = emitTokenWithComment(108 /* WhileKeyword */, startPos, writeKeyword, node);
             writeSpace();
             emitTokenWithComment(20 /* OpenParenToken */, openParenPos, writePunctuation, node);
             emitExpression(node.expression);
             emitTokenWithComment(21 /* CloseParenToken */, node.expression.end, writePunctuation, node);
         }
         function emitDoStatement(node) {
-            emitTokenWithComment(82 /* DoKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(83 /* DoKeyword */, node.pos, writeKeyword, node);
             emitEmbeddedStatement(node, node.statement);
             if (ts.isBlock(node.statement)) {
                 writeSpace();
@@ -84846,7 +87476,7 @@ var ts;
             emitEmbeddedStatement(node, node.statement);
         }
         function emitForStatement(node) {
-            var openParenPos = emitTokenWithComment(89 /* ForKeyword */, node.pos, writeKeyword, node);
+            var openParenPos = emitTokenWithComment(90 /* ForKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             var pos = emitTokenWithComment(20 /* OpenParenToken */, openParenPos, writePunctuation, /*contextNode*/ node);
             emitForBinding(node.initializer);
@@ -84858,25 +87488,25 @@ var ts;
             emitEmbeddedStatement(node, node.statement);
         }
         function emitForInStatement(node) {
-            var openParenPos = emitTokenWithComment(89 /* ForKeyword */, node.pos, writeKeyword, node);
+            var openParenPos = emitTokenWithComment(90 /* ForKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emitTokenWithComment(20 /* OpenParenToken */, openParenPos, writePunctuation, node);
             emitForBinding(node.initializer);
             writeSpace();
-            emitTokenWithComment(93 /* InKeyword */, node.initializer.end, writeKeyword, node);
+            emitTokenWithComment(94 /* InKeyword */, node.initializer.end, writeKeyword, node);
             writeSpace();
             emitExpression(node.expression);
             emitTokenWithComment(21 /* CloseParenToken */, node.expression.end, writePunctuation, node);
             emitEmbeddedStatement(node, node.statement);
         }
         function emitForOfStatement(node) {
-            var openParenPos = emitTokenWithComment(89 /* ForKeyword */, node.pos, writeKeyword, node);
+            var openParenPos = emitTokenWithComment(90 /* ForKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emitWithTrailingSpace(node.awaitModifier);
             emitTokenWithComment(20 /* OpenParenToken */, openParenPos, writePunctuation, node);
             emitForBinding(node.initializer);
             writeSpace();
-            emitTokenWithComment(147 /* OfKeyword */, node.initializer.end, writeKeyword, node);
+            emitTokenWithComment(148 /* OfKeyword */, node.initializer.end, writeKeyword, node);
             writeSpace();
             emitExpression(node.expression);
             emitTokenWithComment(21 /* CloseParenToken */, node.expression.end, writePunctuation, node);
@@ -84884,7 +87514,7 @@ var ts;
         }
         function emitForBinding(node) {
             if (node !== undefined) {
-                if (node.kind === 238 /* VariableDeclarationList */) {
+                if (node.kind === 239 /* VariableDeclarationList */) {
                     emit(node);
                 }
                 else {
@@ -84893,12 +87523,12 @@ var ts;
             }
         }
         function emitContinueStatement(node) {
-            emitTokenWithComment(78 /* ContinueKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(79 /* ContinueKeyword */, node.pos, writeKeyword, node);
             emitWithLeadingSpace(node.label);
             writeTrailingSemicolon();
         }
         function emitBreakStatement(node) {
-            emitTokenWithComment(73 /* BreakKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(74 /* BreakKeyword */, node.pos, writeKeyword, node);
             emitWithLeadingSpace(node.label);
             writeTrailingSemicolon();
         }
@@ -84926,12 +87556,12 @@ var ts;
             return pos;
         }
         function emitReturnStatement(node) {
-            emitTokenWithComment(97 /* ReturnKeyword */, node.pos, writeKeyword, /*contextNode*/ node);
+            emitTokenWithComment(98 /* ReturnKeyword */, node.pos, writeKeyword, /*contextNode*/ node);
             emitExpressionWithLeadingSpace(node.expression);
             writeTrailingSemicolon();
         }
         function emitWithStatement(node) {
-            var openParenPos = emitTokenWithComment(108 /* WithKeyword */, node.pos, writeKeyword, node);
+            var openParenPos = emitTokenWithComment(109 /* WithKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emitTokenWithComment(20 /* OpenParenToken */, openParenPos, writePunctuation, node);
             emitExpression(node.expression);
@@ -84939,7 +87569,7 @@ var ts;
             emitEmbeddedStatement(node, node.statement);
         }
         function emitSwitchStatement(node) {
-            var openParenPos = emitTokenWithComment(99 /* SwitchKeyword */, node.pos, writeKeyword, node);
+            var openParenPos = emitTokenWithComment(100 /* SwitchKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emitTokenWithComment(20 /* OpenParenToken */, openParenPos, writePunctuation, node);
             emitExpression(node.expression);
@@ -84954,12 +87584,12 @@ var ts;
             emit(node.statement);
         }
         function emitThrowStatement(node) {
-            emitTokenWithComment(101 /* ThrowKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(102 /* ThrowKeyword */, node.pos, writeKeyword, node);
             emitExpressionWithLeadingSpace(node.expression);
             writeTrailingSemicolon();
         }
         function emitTryStatement(node) {
-            emitTokenWithComment(103 /* TryKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(104 /* TryKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emit(node.tryBlock);
             if (node.catchClause) {
@@ -84968,13 +87598,13 @@ var ts;
             }
             if (node.finallyBlock) {
                 writeLineOrSpace(node);
-                emitTokenWithComment(88 /* FinallyKeyword */, (node.catchClause || node.tryBlock).end, writeKeyword, node);
+                emitTokenWithComment(89 /* FinallyKeyword */, (node.catchClause || node.tryBlock).end, writeKeyword, node);
                 writeSpace();
                 emit(node.finallyBlock);
             }
         }
         function emitDebuggerStatement(node) {
-            writeToken(79 /* DebuggerKeyword */, node.pos, writeKeyword);
+            writeToken(80 /* DebuggerKeyword */, node.pos, writeKeyword);
             writeTrailingSemicolon();
         }
         //
@@ -85179,7 +87809,7 @@ var ts;
             var body = node.body;
             if (!body)
                 return writeTrailingSemicolon();
-            while (body.kind === 244 /* ModuleDeclaration */) {
+            while (body.kind === 245 /* ModuleDeclaration */) {
                 writePunctuation(".");
                 emit(body.name);
                 body = body.body;
@@ -85200,17 +87830,17 @@ var ts;
         }
         function emitImportEqualsDeclaration(node) {
             emitModifiers(node, node.modifiers);
-            emitTokenWithComment(92 /* ImportKeyword */, node.modifiers ? node.modifiers.end : node.pos, writeKeyword, node);
+            emitTokenWithComment(93 /* ImportKeyword */, node.modifiers ? node.modifiers.end : node.pos, writeKeyword, node);
             writeSpace();
             emit(node.name);
             writeSpace();
-            emitTokenWithComment(59 /* EqualsToken */, node.name.end, writePunctuation, node);
+            emitTokenWithComment(60 /* EqualsToken */, node.name.end, writePunctuation, node);
             writeSpace();
             emitModuleReference(node.moduleReference);
             writeTrailingSemicolon();
         }
         function emitModuleReference(node) {
-            if (node.kind === 72 /* Identifier */) {
+            if (node.kind === 73 /* Identifier */) {
                 emitExpression(node);
             }
             else {
@@ -85219,12 +87849,12 @@ var ts;
         }
         function emitImportDeclaration(node) {
             emitModifiers(node, node.modifiers);
-            emitTokenWithComment(92 /* ImportKeyword */, node.modifiers ? node.modifiers.end : node.pos, writeKeyword, node);
+            emitTokenWithComment(93 /* ImportKeyword */, node.modifiers ? node.modifiers.end : node.pos, writeKeyword, node);
             writeSpace();
             if (node.importClause) {
                 emit(node.importClause);
                 writeSpace();
-                emitTokenWithComment(144 /* FromKeyword */, node.importClause.end, writeKeyword, node);
+                emitTokenWithComment(145 /* FromKeyword */, node.importClause.end, writeKeyword, node);
                 writeSpace();
             }
             emitExpression(node.moduleSpecifier);
@@ -85241,7 +87871,7 @@ var ts;
         function emitNamespaceImport(node) {
             var asPos = emitTokenWithComment(40 /* AsteriskToken */, node.pos, writePunctuation, node);
             writeSpace();
-            emitTokenWithComment(119 /* AsKeyword */, asPos, writeKeyword, node);
+            emitTokenWithComment(120 /* AsKeyword */, asPos, writeKeyword, node);
             writeSpace();
             emit(node.name);
         }
@@ -85252,20 +87882,20 @@ var ts;
             emitImportOrExportSpecifier(node);
         }
         function emitExportAssignment(node) {
-            var nextPos = emitTokenWithComment(85 /* ExportKeyword */, node.pos, writeKeyword, node);
+            var nextPos = emitTokenWithComment(86 /* ExportKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             if (node.isExportEquals) {
-                emitTokenWithComment(59 /* EqualsToken */, nextPos, writeOperator, node);
+                emitTokenWithComment(60 /* EqualsToken */, nextPos, writeOperator, node);
             }
             else {
-                emitTokenWithComment(80 /* DefaultKeyword */, nextPos, writeKeyword, node);
+                emitTokenWithComment(81 /* DefaultKeyword */, nextPos, writeKeyword, node);
             }
             writeSpace();
             emitExpression(node.expression);
             writeTrailingSemicolon();
         }
         function emitExportDeclaration(node) {
-            var nextPos = emitTokenWithComment(85 /* ExportKeyword */, node.pos, writeKeyword, node);
+            var nextPos = emitTokenWithComment(86 /* ExportKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             if (node.exportClause) {
                 emit(node.exportClause);
@@ -85276,18 +87906,18 @@ var ts;
             if (node.moduleSpecifier) {
                 writeSpace();
                 var fromPos = node.exportClause ? node.exportClause.end : nextPos;
-                emitTokenWithComment(144 /* FromKeyword */, fromPos, writeKeyword, node);
+                emitTokenWithComment(145 /* FromKeyword */, fromPos, writeKeyword, node);
                 writeSpace();
                 emitExpression(node.moduleSpecifier);
             }
             writeTrailingSemicolon();
         }
         function emitNamespaceExportDeclaration(node) {
-            var nextPos = emitTokenWithComment(85 /* ExportKeyword */, node.pos, writeKeyword, node);
+            var nextPos = emitTokenWithComment(86 /* ExportKeyword */, node.pos, writeKeyword, node);
             writeSpace();
-            nextPos = emitTokenWithComment(119 /* AsKeyword */, nextPos, writeKeyword, node);
+            nextPos = emitTokenWithComment(120 /* AsKeyword */, nextPos, writeKeyword, node);
             writeSpace();
-            nextPos = emitTokenWithComment(131 /* NamespaceKeyword */, nextPos, writeKeyword, node);
+            nextPos = emitTokenWithComment(132 /* NamespaceKeyword */, nextPos, writeKeyword, node);
             writeSpace();
             emit(node.name);
             writeTrailingSemicolon();
@@ -85307,7 +87937,7 @@ var ts;
             if (node.propertyName) {
                 emit(node.propertyName);
                 writeSpace();
-                emitTokenWithComment(119 /* AsKeyword */, node.propertyName.end, writeKeyword, node);
+                emitTokenWithComment(120 /* AsKeyword */, node.propertyName.end, writeKeyword, node);
                 writeSpace();
             }
             emit(node.name);
@@ -85355,7 +87985,7 @@ var ts;
             writePunctuation(">");
         }
         function emitJsxText(node) {
-            writer.writeLiteral(getTextOfNode(node, /*includeTrivia*/ true));
+            writer.writeLiteral(node.text);
         }
         function emitJsxClosingElementOrFragment(node) {
             writePunctuation("</");
@@ -85385,7 +88015,7 @@ var ts;
             }
         }
         function emitJsxTagName(node) {
-            if (node.kind === 72 /* Identifier */) {
+            if (node.kind === 73 /* Identifier */) {
                 emitExpression(node);
             }
             else {
@@ -85396,13 +88026,13 @@ var ts;
         // Clauses
         //
         function emitCaseClause(node) {
-            emitTokenWithComment(74 /* CaseKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(75 /* CaseKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emitExpression(node.expression);
             emitCaseOrDefaultClauseRest(node, node.statements, node.expression.end);
         }
         function emitDefaultClause(node) {
-            var pos = emitTokenWithComment(80 /* DefaultKeyword */, node.pos, writeKeyword, node);
+            var pos = emitTokenWithComment(81 /* DefaultKeyword */, node.pos, writeKeyword, node);
             emitCaseOrDefaultClauseRest(node, node.statements, pos);
         }
         function emitCaseOrDefaultClauseRest(parentNode, statements, colonPos) {
@@ -85430,7 +88060,7 @@ var ts;
             emitList(node, node.types, 528 /* HeritageClauseTypes */);
         }
         function emitCatchClause(node) {
-            var openParenPos = emitTokenWithComment(75 /* CatchKeyword */, node.pos, writeKeyword, node);
+            var openParenPos = emitTokenWithComment(76 /* CatchKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             if (node.variableDeclaration) {
                 emitTokenWithComment(20 /* OpenParenToken */, openParenPos, writePunctuation, node);
@@ -85500,7 +88130,7 @@ var ts;
                 }
             }
             if (node.tags) {
-                if (node.tags.length === 1 && node.tags[0].kind === 307 /* JSDocTypeTag */ && !node.comment) {
+                if (node.tags.length === 1 && node.tags[0].kind === 309 /* JSDocTypeTag */ && !node.comment) {
                     writeSpace();
                     emit(node.tags[0]);
                 }
@@ -85534,7 +88164,7 @@ var ts;
         function emitJSDocTypedefTag(tag) {
             emitJSDocTagName(tag.tagName);
             if (tag.typeExpression) {
-                if (tag.typeExpression.kind === 288 /* JSDocTypeExpression */) {
+                if (tag.typeExpression.kind === 289 /* JSDocTypeExpression */) {
                     emitJSDocTypeExpression(tag.typeExpression);
                 }
                 else {
@@ -85553,7 +88183,7 @@ var ts;
                 emit(tag.fullName);
             }
             emitJSDocComment(tag.comment);
-            if (tag.typeExpression && tag.typeExpression.kind === 297 /* JSDocTypeLiteral */) {
+            if (tag.typeExpression && tag.typeExpression.kind === 298 /* JSDocTypeLiteral */) {
                 emitJSDocTypeLiteral(tag.typeExpression);
             }
         }
@@ -85868,7 +88498,7 @@ var ts;
         function emitInitializer(node, equalCommentStartPos, container) {
             if (node) {
                 writeSpace();
-                emitTokenWithComment(59 /* EqualsToken */, equalCommentStartPos, writeOperator, container);
+                emitTokenWithComment(60 /* EqualsToken */, equalCommentStartPos, writeOperator, container);
                 writeSpace();
                 emitExpression(node);
             }
@@ -86331,7 +88961,7 @@ var ts;
                 && ts.rangeEndIsOnSameLineAsRangeStart(block, block, currentSourceFile);
         }
         function skipSynthesizedParentheses(node) {
-            while (node.kind === 195 /* ParenthesizedExpression */ && ts.nodeIsSynthesized(node)) {
+            while (node.kind === 196 /* ParenthesizedExpression */ && ts.nodeIsSynthesized(node)) {
                 node = node.expression;
             }
             return node;
@@ -86396,81 +89026,81 @@ var ts;
             if (!node)
                 return;
             switch (node.kind) {
-                case 218 /* Block */:
+                case 219 /* Block */:
                     ts.forEach(node.statements, generateNames);
                     break;
-                case 233 /* LabeledStatement */:
-                case 231 /* WithStatement */:
-                case 223 /* DoStatement */:
-                case 224 /* WhileStatement */:
+                case 234 /* LabeledStatement */:
+                case 232 /* WithStatement */:
+                case 224 /* DoStatement */:
+                case 225 /* WhileStatement */:
                     generateNames(node.statement);
                     break;
-                case 222 /* IfStatement */:
+                case 223 /* IfStatement */:
                     generateNames(node.thenStatement);
                     generateNames(node.elseStatement);
                     break;
-                case 225 /* ForStatement */:
-                case 227 /* ForOfStatement */:
-                case 226 /* ForInStatement */:
+                case 226 /* ForStatement */:
+                case 228 /* ForOfStatement */:
+                case 227 /* ForInStatement */:
                     generateNames(node.initializer);
                     generateNames(node.statement);
                     break;
-                case 232 /* SwitchStatement */:
+                case 233 /* SwitchStatement */:
                     generateNames(node.caseBlock);
                     break;
-                case 246 /* CaseBlock */:
+                case 247 /* CaseBlock */:
                     ts.forEach(node.clauses, generateNames);
                     break;
-                case 271 /* CaseClause */:
-                case 272 /* DefaultClause */:
+                case 272 /* CaseClause */:
+                case 273 /* DefaultClause */:
                     ts.forEach(node.statements, generateNames);
                     break;
-                case 235 /* TryStatement */:
+                case 236 /* TryStatement */:
                     generateNames(node.tryBlock);
                     generateNames(node.catchClause);
                     generateNames(node.finallyBlock);
                     break;
-                case 274 /* CatchClause */:
+                case 275 /* CatchClause */:
                     generateNames(node.variableDeclaration);
                     generateNames(node.block);
                     break;
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     generateNames(node.declarationList);
                     break;
-                case 238 /* VariableDeclarationList */:
+                case 239 /* VariableDeclarationList */:
                     ts.forEach(node.declarations, generateNames);
                     break;
-                case 237 /* VariableDeclaration */:
-                case 151 /* Parameter */:
-                case 186 /* BindingElement */:
-                case 240 /* ClassDeclaration */:
+                case 238 /* VariableDeclaration */:
+                case 152 /* Parameter */:
+                case 187 /* BindingElement */:
+                case 241 /* ClassDeclaration */:
                     generateNameIfNeeded(node.name);
                     break;
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     generateNameIfNeeded(node.name);
                     if (ts.getEmitFlags(node) & 524288 /* ReuseTempVariableScope */) {
                         ts.forEach(node.parameters, generateNames);
                         generateNames(node.body);
                     }
                     break;
-                case 184 /* ObjectBindingPattern */:
-                case 185 /* ArrayBindingPattern */:
+                case 185 /* ObjectBindingPattern */:
+                case 186 /* ArrayBindingPattern */:
                     ts.forEach(node.elements, generateNames);
                     break;
-                case 249 /* ImportDeclaration */:
+                case 250 /* ImportDeclaration */:
                     generateNames(node.importClause);
                     break;
-                case 250 /* ImportClause */:
+                case 251 /* ImportClause */:
                     generateNameIfNeeded(node.name);
                     generateNames(node.namedBindings);
                     break;
-                case 251 /* NamespaceImport */:
+                case 252 /* NamespaceImport */:
                     generateNameIfNeeded(node.name);
                     break;
-                case 252 /* NamedImports */:
+                case 253 /* NamedImports */:
                     ts.forEach(node.elements, generateNames);
                     break;
-                case 253 /* ImportSpecifier */:
+                case 254 /* ImportSpecifier */:
                     generateNameIfNeeded(node.propertyName || node.name);
                     break;
             }
@@ -86479,12 +89109,12 @@ var ts;
             if (!node)
                 return;
             switch (node.kind) {
-                case 275 /* PropertyAssignment */:
-                case 276 /* ShorthandPropertyAssignment */:
-                case 154 /* PropertyDeclaration */:
-                case 156 /* MethodDeclaration */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 276 /* PropertyAssignment */:
+                case 277 /* ShorthandPropertyAssignment */:
+                case 155 /* PropertyDeclaration */:
+                case 157 /* MethodDeclaration */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     generateNameIfNeeded(node.name);
                     break;
             }
@@ -86664,24 +89294,26 @@ var ts;
          */
         function generateNameForNode(node, flags) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return makeUniqueName(getTextOfNode(node), isUniqueName, !!(flags & 16 /* Optimistic */), !!(flags & 8 /* ReservedInNestedScopes */));
-                case 244 /* ModuleDeclaration */:
-                case 243 /* EnumDeclaration */:
+                case 245 /* ModuleDeclaration */:
+                case 244 /* EnumDeclaration */:
                     return generateNameForModuleOrEnum(node);
-                case 249 /* ImportDeclaration */:
-                case 255 /* ExportDeclaration */:
+                case 250 /* ImportDeclaration */:
+                case 256 /* ExportDeclaration */:
                     return generateNameForImportOrExportDeclaration(node);
-                case 239 /* FunctionDeclaration */:
-                case 240 /* ClassDeclaration */:
-                case 254 /* ExportAssignment */:
+                case 240 /* FunctionDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 255 /* ExportAssignment */:
                     return generateNameForExportDefault();
-                case 209 /* ClassExpression */:
+                case 210 /* ClassExpression */:
                     return generateNameForClassExpression();
-                case 156 /* MethodDeclaration */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 157 /* MethodDeclaration */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     return generateNameForMethodOrAccessor(node);
+                case 150 /* ComputedPropertyName */:
+                    return makeTempVariableName(0 /* Auto */, /*reserveInNestedScopes*/ true);
                 default:
                     return makeTempVariableName(0 /* Auto */);
             }
@@ -86727,7 +89359,7 @@ var ts;
             hasWrittenComment = false;
             var emitFlags = ts.getEmitFlags(node);
             var _a = ts.getCommentRange(node), pos = _a.pos, end = _a.end;
-            var isEmittedNode = node.kind !== 312 /* NotEmittedStatement */;
+            var isEmittedNode = node.kind !== 314 /* NotEmittedStatement */;
             // We have to explicitly check that the node is JsxText because if the compilerOptions.jsx is "preserve" we will not do any transformation.
             // It is expensive to walk entire tree just to set one kind of node to have no comments.
             var skipLeadingComments = pos < 0 || (emitFlags & 512 /* NoLeadingComments */) !== 0 || node.kind === 11 /* JsxText */;
@@ -86751,7 +89383,7 @@ var ts;
                     containerEnd = end;
                     // To avoid invalid comment emit in a down-level binding pattern, we
                     // keep track of the last declaration list container's end
-                    if (node.kind === 238 /* VariableDeclarationList */) {
+                    if (node.kind === 239 /* VariableDeclarationList */) {
                         declarationListContainerEnd = end;
                     }
                 }
@@ -87008,7 +89640,7 @@ var ts;
             else {
                 var _a = ts.getSourceMapRange(node), pos = _a.pos, end = _a.end, _b = _a.source, source = _b === void 0 ? sourceMapSource : _b;
                 var emitFlags = ts.getEmitFlags(node);
-                if (node.kind !== 312 /* NotEmittedStatement */
+                if (node.kind !== 314 /* NotEmittedStatement */
                     && (emitFlags & 16 /* NoLeadingSourceMap */) === 0
                     && pos >= 0) {
                     emitSourcePos(source, skipSourceTrivia(source, pos));
@@ -87021,7 +89653,7 @@ var ts;
                 else {
                     pipelinePhase(hint, node);
                 }
-                if (node.kind !== 312 /* NotEmittedStatement */
+                if (node.kind !== 314 /* NotEmittedStatement */
                     && (emitFlags & 32 /* NoTrailingSourceMap */) === 0
                     && end >= 0) {
                     emitSourcePos(source, end);
@@ -87149,7 +89781,8 @@ var ts;
             writeFile: host.writeFile && writeFile,
             addOrDeleteFileOrDirectory: addOrDeleteFileOrDirectory,
             addOrDeleteFile: addOrDeleteFile,
-            clearCache: clearCache
+            clearCache: clearCache,
+            realpath: host.realpath && realpath
         };
         function toPath(fileName) {
             return ts.toPath(fileName, currentDirectory, getCanonicalFileName);
@@ -87246,7 +89879,7 @@ var ts;
             var rootDirPath = toPath(rootDir);
             var result = tryReadDirectory(rootDir, rootDirPath);
             if (result) {
-                return ts.matchFiles(rootDir, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory, depth, getFileSystemEntries);
+                return ts.matchFiles(rootDir, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory, depth, getFileSystemEntries, realpath);
             }
             return host.readDirectory(rootDir, extensions, excludes, includes, depth);
             function getFileSystemEntries(dir) {
@@ -87257,6 +89890,9 @@ var ts;
                 return tryReadDirectory(dir, path) || ts.emptyFileSystemEntries;
             }
         }
+        function realpath(s) {
+            return host.realpath ? host.realpath(s) : s;
+        }
         function addOrDeleteFileOrDirectory(fileOrDirectory, fileOrDirectoryPath) {
             var existingResult = getCachedFileSystemEntries(fileOrDirectoryPath);
             if (existingResult) {
@@ -87527,11 +90163,7 @@ var ts;
     function createCompilerHostWorker(options, setParentNodes, system) {
         if (system === void 0) { system = ts.sys; }
         var existingDirectories = ts.createMap();
-        function getCanonicalFileName(fileName) {
-            // if underlying system can distinguish between two files whose names differs only in cases then file name already in canonical form.
-            // otherwise use toLowerCase as a canonical form.
-            return system.useCaseSensitiveFileNames ? fileName : fileName.toLowerCase();
-        }
+        var getCanonicalFileName = ts.createGetCanonicalFileName(system.useCaseSensitiveFileNames);
         function getSourceFile(fileName, languageVersion, onError) {
             var text;
             try {
@@ -87636,7 +90268,8 @@ var ts;
             getDirectories: function (path) { return system.getDirectories(path); },
             realpath: realpath,
             readDirectory: function (path, extensions, include, exclude, depth) { return system.readDirectory(path, extensions, include, exclude, depth); },
-            createDirectory: function (d) { return system.createDirectory(d); }
+            createDirectory: function (d) { return system.createDirectory(d); },
+            createHash: ts.maybeBind(system, system.createHash)
         };
         return compilerHost;
     }
@@ -87883,11 +90516,11 @@ var ts;
                 if (diagnostic.relatedInformation) {
                     output += host.getNewLine();
                     for (var _a = 0, _b = diagnostic.relatedInformation; _a < _b.length; _a++) {
-                        var _c = _b[_a], file = _c.file, start = _c.start, length_4 = _c.length, messageText = _c.messageText;
+                        var _c = _b[_a], file = _c.file, start = _c.start, length_7 = _c.length, messageText = _c.messageText;
                         if (file) {
                             output += host.getNewLine();
                             output += halfIndent + formatLocation(file, start, host); // TODO: GH#18217
-                            output += formatCodeSpan(file, start, length_4, indent, ForegroundColorEscapeSequences.Cyan, host); // TODO: GH#18217
+                            output += formatCodeSpan(file, start, length_7, indent, ForegroundColorEscapeSequences.Cyan, host); // TODO: GH#18217
                         }
                         output += host.getNewLine();
                         output += indent + flattenDiagnosticMessageText(messageText, host.getNewLine());
@@ -87899,29 +90532,33 @@ var ts;
         return output;
     }
     ts.formatDiagnosticsWithColorAndContext = formatDiagnosticsWithColorAndContext;
-    function flattenDiagnosticMessageText(messageText, newLine) {
-        if (ts.isString(messageText)) {
-            return messageText;
+    function flattenDiagnosticMessageText(diag, newLine, indent) {
+        if (indent === void 0) { indent = 0; }
+        if (ts.isString(diag)) {
+            return diag;
         }
-        else {
-            var diagnosticChain = messageText;
-            var result = "";
-            var indent_1 = 0;
-            while (diagnosticChain) {
-                if (indent_1) {
-                    result += newLine;
-                    for (var i = 0; i < indent_1; i++) {
-                        result += "  ";
-                    }
-                }
-                result += diagnosticChain.messageText;
-                indent_1++;
-                diagnosticChain = diagnosticChain.next;
+        else if (diag === undefined) {
+            return "";
+        }
+        var result = "";
+        if (indent) {
+            result += newLine;
+            for (var i = 0; i < indent; i++) {
+                result += "  ";
             }
-            return result;
         }
+        result += diag.messageText;
+        indent++;
+        if (diag.next) {
+            for (var _i = 0, _a = diag.next; _i < _a.length; _i++) {
+                var kid = _a[_i];
+                result += flattenDiagnosticMessageText(kid, newLine, indent);
+            }
+        }
+        return result;
     }
     ts.flattenDiagnosticMessageText = flattenDiagnosticMessageText;
+    /* @internal */
     function loadWithLocalCache(names, containingFile, redirectedReference, loader) {
         if (names.length === 0) {
             return [];
@@ -87941,6 +90578,7 @@ var ts;
         }
         return resolutions;
     }
+    ts.loadWithLocalCache = loadWithLocalCache;
     /**
      * Determines if program structure is upto date or needs to be recreated
      */
@@ -88100,7 +90738,7 @@ var ts;
             }); };
         }
         else {
-            moduleResolutionCache = ts.createModuleResolutionCache(currentDirectory, function (x) { return host.getCanonicalFileName(x); });
+            moduleResolutionCache = ts.createModuleResolutionCache(currentDirectory, function (x) { return host.getCanonicalFileName(x); }, options);
             var loader_1 = function (moduleName, containingFile, redirectedReference) { return ts.resolveModuleName(moduleName, containingFile, options, host, moduleResolutionCache, redirectedReference).resolvedModule; }; // TODO: GH#18217
             resolveModuleNamesWorker = function (moduleNames, containingFile, _reusedNames, redirectedReference) { return loadWithLocalCache(ts.Debug.assertEachDefined(moduleNames), containingFile, redirectedReference, loader_1); };
         }
@@ -88147,11 +90785,18 @@ var ts;
                 if (rootNames.length) {
                     for (var _i = 0, resolvedProjectReferences_1 = resolvedProjectReferences; _i < resolvedProjectReferences_1.length; _i++) {
                         var parsedRef = resolvedProjectReferences_1[_i];
-                        if (parsedRef) {
-                            var out = parsedRef.commandLine.options.outFile || parsedRef.commandLine.options.out;
-                            if (out) {
-                                var dtsOutfile = ts.changeExtension(out, ".d.ts");
-                                processSourceFile(dtsOutfile, /*isDefaultLib*/ false, /*ignoreNoDefaultLib*/ false, /*packageId*/ undefined);
+                        if (!parsedRef)
+                            continue;
+                        var out = parsedRef.commandLine.options.outFile || parsedRef.commandLine.options.out;
+                        if (out) {
+                            processSourceFile(ts.changeExtension(out, ".d.ts"), /*isDefaultLib*/ false, /*ignoreNoDefaultLib*/ false, /*packageId*/ undefined);
+                        }
+                        else if (ts.getEmitModuleKind(parsedRef.commandLine.options) === ts.ModuleKind.None) {
+                            for (var _a = 0, _b = parsedRef.commandLine.fileNames; _a < _b.length; _a++) {
+                                var fileName = _b[_a];
+                                if (!ts.fileExtensionIs(fileName, ".d.ts" /* Dts */) && ts.hasTSFileExtension(fileName)) {
+                                    processSourceFile(ts.getOutputDeclarationFileName(fileName, parsedRef.commandLine, !host.useCaseSensitiveFileNames()), /*isDefaultLib*/ false, /*ignoreNoDefaultLib*/ false, /*packageId*/ undefined);
+                                }
                             }
                         }
                     }
@@ -88199,8 +90844,8 @@ var ts;
         // not part of the new program.
         if (oldProgram && host.onReleaseOldSourceFile) {
             var oldSourceFiles = oldProgram.getSourceFiles();
-            for (var _a = 0, oldSourceFiles_1 = oldSourceFiles; _a < oldSourceFiles_1.length; _a++) {
-                var oldSourceFile = oldSourceFiles_1[_a];
+            for (var _c = 0, oldSourceFiles_1 = oldSourceFiles; _c < oldSourceFiles_1.length; _c++) {
+                var oldSourceFile = oldSourceFiles_1[_c];
                 var newFile = getSourceFileByPath(oldSourceFile.resolvedPath);
                 if (shouldCreateNewSourceFile || !newFile ||
                     // old file wasnt redirect but new file is
@@ -88239,6 +90884,7 @@ var ts;
             getIdentifierCount: function () { return getDiagnosticsProducingTypeChecker().getIdentifierCount(); },
             getSymbolCount: function () { return getDiagnosticsProducingTypeChecker().getSymbolCount(); },
             getTypeCount: function () { return getDiagnosticsProducingTypeChecker().getTypeCount(); },
+            getRelationCacheSizes: function () { return getDiagnosticsProducingTypeChecker().getRelationCacheSizes(); },
             getFileProcessingDiagnostics: function () { return fileProcessingDiagnostics; },
             getResolvedTypeReferenceDirectives: function () { return resolvedTypeReferenceDirectives; },
             isSourceFileFromExternalLibrary: isSourceFileFromExternalLibrary,
@@ -88286,7 +90932,7 @@ var ts;
         }
         function getCommonSourceDirectory() {
             if (commonSourceDirectory === undefined) {
-                var emittedFiles = ts.filter(files, function (file) { return ts.sourceFileMayBeEmitted(file, options, isSourceFileFromExternalLibrary); });
+                var emittedFiles = ts.filter(files, function (file) { return ts.sourceFileMayBeEmitted(file, options, isSourceFileFromExternalLibrary, getResolvedProjectReferenceToRedirect); });
                 if (options.rootDir && checkSourceFilesBelongToPath(emittedFiles, options.rootDir)) {
                     // If a rootDir is specified use it as the commonSourceDirectory
                     commonSourceDirectory = ts.getNormalizedAbsolutePath(options.rootDir, currentDirectory);
@@ -88336,13 +90982,13 @@ var ts;
                 // which per above occurred during the current program creation.
                 // Since we assume the filesystem does not change during program creation,
                 // it is safe to reuse resolutions from the earlier call.
-                var result_6 = [];
+                var result_9 = [];
                 for (var _i = 0, moduleNames_1 = moduleNames; _i < moduleNames_1.length; _i++) {
                     var moduleName = moduleNames_1[_i];
                     var resolvedModule = file.resolvedModules.get(moduleName);
-                    result_6.push(resolvedModule);
+                    result_9.push(resolvedModule);
                 }
-                return result_6;
+                return result_9;
             }
             // At this point, we know at least one of the following hold:
             // - file has local declarations for ambient modules
@@ -88429,7 +91075,7 @@ var ts;
             function moduleNameResolvesToAmbientModuleInNonModifiedFile(moduleName) {
                 var resolutionToFile = ts.getResolvedModule(oldSourceFile, moduleName);
                 var resolvedFile = resolutionToFile && oldProgram.getSourceFile(resolutionToFile.resolvedFileName);
-                if (resolutionToFile && resolvedFile && !resolvedFile.externalModuleIndicator) {
+                if (resolutionToFile && resolvedFile) {
                     // In the old program, we resolved to an ambient module that was in the same
                     //   place as we expected to find an actual module file.
                     // We actually need to return 'false' here even though this seems like a 'true' case
@@ -88658,7 +91304,7 @@ var ts;
                 var filePath = newSourceFile.path;
                 addFileToFilesByName(newSourceFile, filePath, newSourceFile.resolvedPath);
                 // Set the file as found during node modules search if it was found that way in old progra,
-                if (oldProgram.isSourceFileFromExternalLibrary(oldProgram.getSourceFileByPath(filePath))) {
+                if (oldProgram.isSourceFileFromExternalLibrary(oldProgram.getSourceFileByPath(newSourceFile.resolvedPath))) {
                     sourceFilesFoundSearchingNodeModules.set(filePath, true);
                 }
             }
@@ -88675,7 +91321,8 @@ var ts;
         }
         function getEmitHost(writeFileCallback) {
             return __assign({ getPrependNodes: getPrependNodes,
-                getCanonicalFileName: getCanonicalFileName, getCommonSourceDirectory: program.getCommonSourceDirectory, getCompilerOptions: program.getCompilerOptions, getCurrentDirectory: function () { return currentDirectory; }, getNewLine: function () { return host.getNewLine(); }, getSourceFile: program.getSourceFile, getSourceFileByPath: program.getSourceFileByPath, getSourceFiles: program.getSourceFiles, getLibFileFromReference: program.getLibFileFromReference, isSourceFileFromExternalLibrary: isSourceFileFromExternalLibrary, writeFile: writeFileCallback || (function (fileName, data, writeByteOrderMark, onError, sourceFiles) { return host.writeFile(fileName, data, writeByteOrderMark, onError, sourceFiles); }), isEmitBlocked: isEmitBlocked, readFile: function (f) { return host.readFile(f); }, fileExists: function (f) {
+                getCanonicalFileName: getCanonicalFileName, getCommonSourceDirectory: program.getCommonSourceDirectory, getCompilerOptions: program.getCompilerOptions, getCurrentDirectory: function () { return currentDirectory; }, getNewLine: function () { return host.getNewLine(); }, getSourceFile: program.getSourceFile, getSourceFileByPath: program.getSourceFileByPath, getSourceFiles: program.getSourceFiles, getLibFileFromReference: program.getLibFileFromReference, isSourceFileFromExternalLibrary: isSourceFileFromExternalLibrary,
+                getResolvedProjectReferenceToRedirect: getResolvedProjectReferenceToRedirect, writeFile: writeFileCallback || (function (fileName, data, writeByteOrderMark, onError, sourceFiles) { return host.writeFile(fileName, data, writeByteOrderMark, onError, sourceFiles); }), isEmitBlocked: isEmitBlocked, readFile: function (f) { return host.readFile(f); }, fileExists: function (f) {
                     // Use local caches
                     var path = toPath(f);
                     if (getSourceFileByPath(path))
@@ -88684,16 +91331,15 @@ var ts;
                         return false;
                     // Before falling back to the host
                     return host.fileExists(f);
-                } }, (host.directoryExists ? { directoryExists: function (f) { return host.directoryExists(f); } } : {}), { useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); }, getProgramBuildInfo: function () { return program.getProgramBuildInfo && program.getProgramBuildInfo(); } });
+                } }, (host.directoryExists ? { directoryExists: function (f) { return host.directoryExists(f); } } : {}), { useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); }, getProgramBuildInfo: function () { return program.getProgramBuildInfo && program.getProgramBuildInfo(); }, getSourceFileFromReference: function (file, ref) { return program.getSourceFileFromReference(file, ref); } });
         }
         function emitBuildInfo(writeFileCallback) {
             ts.Debug.assert(!options.out && !options.outFile);
             ts.performance.mark("beforeEmit");
             var emitResult = ts.emitFiles(ts.notImplementedResolver, getEmitHost(writeFileCallback), 
             /*targetSourceFile*/ undefined, 
+            /*transformers*/ ts.noTransformers, 
             /*emitOnlyDtsFiles*/ false, 
-            /*transformers*/ undefined, 
-            /*declaraitonTransformers*/ undefined, 
             /*onlyBuildInfo*/ true);
             ts.performance.mark("afterEmit");
             ts.performance.measure("Emit", "beforeEmit", "afterEmit");
@@ -88781,8 +91427,7 @@ var ts;
             // checked is to not pass the file to getEmitResolver.
             var emitResolver = getDiagnosticsProducingTypeChecker().getEmitResolver((options.outFile || options.out) ? undefined : sourceFile, cancellationToken);
             ts.performance.mark("beforeEmit");
-            var transformers = emitOnlyDtsFiles ? [] : ts.getTransformers(options, customTransformers);
-            var emitResult = ts.emitFiles(emitResolver, getEmitHost(writeFileCallback), sourceFile, emitOnlyDtsFiles, transformers, customTransformers && customTransformers.afterDeclarations);
+            var emitResult = ts.emitFiles(emitResolver, getEmitHost(writeFileCallback), sourceFile, ts.getTransformers(options, customTransformers, emitOnlyDtsFiles), emitOnlyDtsFiles);
             ts.performance.mark("afterEmit");
             ts.performance.measure("Emit", "beforeEmit", "afterEmit");
             return emitResult;
@@ -88874,8 +91519,8 @@ var ts;
                 for (var _i = 0, _a = [bindDiagnostics, checkDiagnostics, fileProcessingDiagnosticsInFile, programDiagnosticsInFile, isCheckJs ? sourceFile.jsDocDiagnostics : undefined]; _i < _a.length; _i++) {
                     var diags = _a[_i];
                     if (diags) {
-                        for (var _b = 0, diags_1 = diags; _b < diags_1.length; _b++) {
-                            var diag = diags_1[_b];
+                        for (var _b = 0, diags_4 = diags; _b < diags_4.length; _b++) {
+                            var diag = diags_4[_b];
                             if (shouldReportDiagnostic(diag)) {
                                 diagnostics = ts.append(diagnostics, diag);
                             }
@@ -88924,22 +91569,22 @@ var ts;
                     // Return directly from the case if the given node doesnt want to visit each child
                     // Otherwise break to visit each child
                     switch (parent.kind) {
-                        case 151 /* Parameter */:
-                        case 154 /* PropertyDeclaration */:
+                        case 152 /* Parameter */:
+                        case 155 /* PropertyDeclaration */:
                             if (parent.questionToken === node) {
                                 diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics._0_can_only_be_used_in_a_ts_file, "?"));
                                 return;
                             }
                         // falls through
-                        case 156 /* MethodDeclaration */:
-                        case 155 /* MethodSignature */:
-                        case 157 /* Constructor */:
-                        case 158 /* GetAccessor */:
-                        case 159 /* SetAccessor */:
-                        case 196 /* FunctionExpression */:
-                        case 239 /* FunctionDeclaration */:
-                        case 197 /* ArrowFunction */:
-                        case 237 /* VariableDeclaration */:
+                        case 157 /* MethodDeclaration */:
+                        case 156 /* MethodSignature */:
+                        case 158 /* Constructor */:
+                        case 159 /* GetAccessor */:
+                        case 160 /* SetAccessor */:
+                        case 197 /* FunctionExpression */:
+                        case 240 /* FunctionDeclaration */:
+                        case 198 /* ArrowFunction */:
+                        case 238 /* VariableDeclaration */:
                             // type annotation
                             if (parent.type === node) {
                                 diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.types_can_only_be_used_in_a_ts_file));
@@ -88947,41 +91592,41 @@ var ts;
                             }
                     }
                     switch (node.kind) {
-                        case 248 /* ImportEqualsDeclaration */:
+                        case 249 /* ImportEqualsDeclaration */:
                             diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.import_can_only_be_used_in_a_ts_file));
                             return;
-                        case 254 /* ExportAssignment */:
+                        case 255 /* ExportAssignment */:
                             if (node.isExportEquals) {
                                 diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.export_can_only_be_used_in_a_ts_file));
                                 return;
                             }
                             break;
-                        case 273 /* HeritageClause */:
+                        case 274 /* HeritageClause */:
                             var heritageClause = node;
-                            if (heritageClause.token === 109 /* ImplementsKeyword */) {
+                            if (heritageClause.token === 110 /* ImplementsKeyword */) {
                                 diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.implements_clauses_can_only_be_used_in_a_ts_file));
                                 return;
                             }
                             break;
-                        case 241 /* InterfaceDeclaration */:
+                        case 242 /* InterfaceDeclaration */:
                             diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.interface_declarations_can_only_be_used_in_a_ts_file));
                             return;
-                        case 244 /* ModuleDeclaration */:
+                        case 245 /* ModuleDeclaration */:
                             diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.module_declarations_can_only_be_used_in_a_ts_file));
                             return;
-                        case 242 /* TypeAliasDeclaration */:
+                        case 243 /* TypeAliasDeclaration */:
                             diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.type_aliases_can_only_be_used_in_a_ts_file));
                             return;
-                        case 243 /* EnumDeclaration */:
+                        case 244 /* EnumDeclaration */:
                             diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.enum_declarations_can_only_be_used_in_a_ts_file));
                             return;
-                        case 213 /* NonNullExpression */:
+                        case 214 /* NonNullExpression */:
                             diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.non_null_assertions_can_only_be_used_in_a_ts_file));
                             return;
-                        case 212 /* AsExpression */:
+                        case 213 /* AsExpression */:
                             diagnostics.push(createDiagnosticForNode(node.type, ts.Diagnostics.type_assertion_expressions_can_only_be_used_in_a_ts_file));
                             return;
-                        case 194 /* TypeAssertionExpression */:
+                        case 195 /* TypeAssertionExpression */:
                             ts.Debug.fail(); // Won't parse these in a JS file anyway, as they are interpreted as JSX.
                     }
                     var prevParent = parent;
@@ -88991,54 +91636,54 @@ var ts;
                 }
                 function walkArray(nodes) {
                     if (parent.decorators === nodes && !options.experimentalDecorators) {
-                        diagnostics.push(createDiagnosticForNode(parent, ts.Diagnostics.Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_to_remove_this_warning));
+                        diagnostics.push(createDiagnosticForNode(parent, ts.Diagnostics.Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_in_your_tsconfig_or_jsconfig_to_remove_this_warning));
                     }
                     switch (parent.kind) {
-                        case 240 /* ClassDeclaration */:
-                        case 156 /* MethodDeclaration */:
-                        case 155 /* MethodSignature */:
-                        case 157 /* Constructor */:
-                        case 158 /* GetAccessor */:
-                        case 159 /* SetAccessor */:
-                        case 196 /* FunctionExpression */:
-                        case 239 /* FunctionDeclaration */:
-                        case 197 /* ArrowFunction */:
+                        case 241 /* ClassDeclaration */:
+                        case 157 /* MethodDeclaration */:
+                        case 156 /* MethodSignature */:
+                        case 158 /* Constructor */:
+                        case 159 /* GetAccessor */:
+                        case 160 /* SetAccessor */:
+                        case 197 /* FunctionExpression */:
+                        case 240 /* FunctionDeclaration */:
+                        case 198 /* ArrowFunction */:
                             // Check type parameters
                             if (nodes === parent.typeParameters) {
                                 diagnostics.push(createDiagnosticForNodeArray(nodes, ts.Diagnostics.type_parameter_declarations_can_only_be_used_in_a_ts_file));
                                 return;
                             }
                         // falls through
-                        case 219 /* VariableStatement */:
+                        case 220 /* VariableStatement */:
                             // Check modifiers
                             if (nodes === parent.modifiers) {
-                                return checkModifiers(nodes, parent.kind === 219 /* VariableStatement */);
+                                return checkModifiers(nodes, parent.kind === 220 /* VariableStatement */);
                             }
                             break;
-                        case 154 /* PropertyDeclaration */:
+                        case 155 /* PropertyDeclaration */:
                             // Check modifiers of property declaration
                             if (nodes === parent.modifiers) {
                                 for (var _i = 0, _a = nodes; _i < _a.length; _i++) {
                                     var modifier = _a[_i];
-                                    if (modifier.kind !== 116 /* StaticKeyword */) {
+                                    if (modifier.kind !== 117 /* StaticKeyword */) {
                                         diagnostics.push(createDiagnosticForNode(modifier, ts.Diagnostics._0_can_only_be_used_in_a_ts_file, ts.tokenToString(modifier.kind)));
                                     }
                                 }
                                 return;
                             }
                             break;
-                        case 151 /* Parameter */:
+                        case 152 /* Parameter */:
                             // Check modifiers of parameter declaration
                             if (nodes === parent.modifiers) {
                                 diagnostics.push(createDiagnosticForNodeArray(nodes, ts.Diagnostics.parameter_modifiers_can_only_be_used_in_a_ts_file));
                                 return;
                             }
                             break;
-                        case 191 /* CallExpression */:
-                        case 192 /* NewExpression */:
-                        case 211 /* ExpressionWithTypeArguments */:
-                        case 261 /* JsxSelfClosingElement */:
-                        case 262 /* JsxOpeningElement */:
+                        case 192 /* CallExpression */:
+                        case 193 /* NewExpression */:
+                        case 212 /* ExpressionWithTypeArguments */:
+                        case 262 /* JsxSelfClosingElement */:
+                        case 263 /* JsxOpeningElement */:
                             // Check type arguments
                             if (nodes === parent.typeArguments) {
                                 diagnostics.push(createDiagnosticForNodeArray(nodes, ts.Diagnostics.type_arguments_can_only_be_used_in_a_ts_file));
@@ -89055,24 +91700,24 @@ var ts;
                     for (var _i = 0, modifiers_1 = modifiers; _i < modifiers_1.length; _i++) {
                         var modifier = modifiers_1[_i];
                         switch (modifier.kind) {
-                            case 77 /* ConstKeyword */:
+                            case 78 /* ConstKeyword */:
                                 if (isConstValid) {
                                     continue;
                                 }
                             // to report error,
                             // falls through
-                            case 115 /* PublicKeyword */:
-                            case 113 /* PrivateKeyword */:
-                            case 114 /* ProtectedKeyword */:
-                            case 133 /* ReadonlyKeyword */:
-                            case 125 /* DeclareKeyword */:
-                            case 118 /* AbstractKeyword */:
+                            case 116 /* PublicKeyword */:
+                            case 114 /* PrivateKeyword */:
+                            case 115 /* ProtectedKeyword */:
+                            case 134 /* ReadonlyKeyword */:
+                            case 126 /* DeclareKeyword */:
+                            case 119 /* AbstractKeyword */:
                                 diagnostics.push(createDiagnosticForNode(modifier, ts.Diagnostics._0_can_only_be_used_in_a_ts_file, ts.tokenToString(modifier.kind)));
                                 break;
                             // These are all legal modifiers.
-                            case 116 /* StaticKeyword */:
-                            case 85 /* ExportKeyword */:
-                            case 80 /* DefaultKeyword */:
+                            case 117 /* StaticKeyword */:
+                            case 86 /* ExportKeyword */:
+                            case 81 /* DefaultKeyword */:
                         }
                     }
                 }
@@ -89147,8 +91792,8 @@ var ts;
             return a.fileName === b.fileName;
         }
         function moduleNameIsEqualTo(a, b) {
-            return a.kind === 72 /* Identifier */
-                ? b.kind === 72 /* Identifier */ && a.escapedText === b.escapedText
+            return a.kind === 73 /* Identifier */
+                ? b.kind === 73 /* Identifier */ && a.escapedText === b.escapedText
                 : b.kind === 10 /* StringLiteral */ && a.text === b.text;
         }
         function collectExternalModuleReferences(file) {
@@ -89363,7 +92008,10 @@ var ts;
                     if (isRedirect) {
                         inputName = getProjectReferenceRedirect(fileName) || fileName;
                     }
-                    if (ts.getNormalizedAbsolutePath(checkedName, currentDirectory) !== ts.getNormalizedAbsolutePath(inputName, currentDirectory)) {
+                    // Check if it differs only in drive letters its ok to ignore that error:
+                    var checkedAbsolutePath = ts.getNormalizedAbsolutePathWithoutRoot(checkedName, currentDirectory);
+                    var inputAbsolutePath = ts.getNormalizedAbsolutePathWithoutRoot(inputName, currentDirectory);
+                    if (checkedAbsolutePath !== inputAbsolutePath) {
                         reportFileNamesDifferOnlyInCasingError(inputName, checkedName, refFile, refPos, refEnd);
                     }
                 }
@@ -89392,9 +92040,13 @@ var ts;
             }
             var redirectedPath;
             if (refFile) {
-                var redirect = getProjectReferenceRedirect(fileName);
-                if (redirect) {
-                    (refFile.redirectedReferences || (refFile.redirectedReferences = [])).push(fileName);
+                var redirectProject = getProjectReferenceRedirectProject(fileName);
+                if (redirectProject) {
+                    if (redirectProject.commandLine.options.outFile || redirectProject.commandLine.options.out) {
+                        // Shouldnt create many to 1 mapping file in --out scenario
+                        return undefined;
+                    }
+                    var redirect = getProjectReferenceOutputName(redirectProject, fileName);
                     fileName = redirect;
                     // Once we start redirecting to a file, we can potentially come back to it
                     // via a back-reference from another file in the .d.ts folder. If that happens we'll
@@ -89478,20 +92130,23 @@ var ts;
             }
         }
         function getProjectReferenceRedirect(fileName) {
+            var referencedProject = getProjectReferenceRedirectProject(fileName);
+            return referencedProject && getProjectReferenceOutputName(referencedProject, fileName);
+        }
+        function getProjectReferenceRedirectProject(fileName) {
             // Ignore dts or any of the non ts files
             if (!resolvedProjectReferences || !resolvedProjectReferences.length || ts.fileExtensionIs(fileName, ".d.ts" /* Dts */) || !ts.fileExtensionIsOneOf(fileName, ts.supportedTSExtensions)) {
                 return undefined;
             }
             // If this file is produced by a referenced project, we need to rewrite it to
             // look in the output folder of the referenced project rather than the input
-            var referencedProject = getResolvedProjectReferenceToRedirect(fileName);
-            if (!referencedProject) {
-                return undefined;
-            }
+            return getResolvedProjectReferenceToRedirect(fileName);
+        }
+        function getProjectReferenceOutputName(referencedProject, fileName) {
             var out = referencedProject.commandLine.options.outFile || referencedProject.commandLine.options.out;
             return out ?
                 ts.changeExtension(out, ".d.ts" /* Dts */) :
-                ts.getOutputDeclarationFileName(fileName, referencedProject.commandLine);
+                ts.getOutputDeclarationFileName(fileName, referencedProject.commandLine, !host.useCaseSensitiveFileNames());
         }
         /**
          * Get the referenced project if the file is input file from that reference project
@@ -89732,18 +92387,33 @@ var ts;
             if (fromCache !== undefined) {
                 return fromCache || undefined;
             }
-            // An absolute path pointing to the containing directory of the config file
-            var basePath = ts.getNormalizedAbsolutePath(ts.getDirectoryPath(refPath), host.getCurrentDirectory());
-            var sourceFile = host.getSourceFile(refPath, 100 /* JSON */);
-            addFileToFilesByName(sourceFile, sourceFilePath, /*redirectedPath*/ undefined);
-            if (sourceFile === undefined) {
-                projectReferenceRedirects.set(sourceFilePath, false);
-                return undefined;
+            var commandLine;
+            var sourceFile;
+            if (host.getParsedCommandLine) {
+                commandLine = host.getParsedCommandLine(refPath);
+                if (!commandLine) {
+                    addFileToFilesByName(/*sourceFile*/ undefined, sourceFilePath, /*redirectedPath*/ undefined);
+                    projectReferenceRedirects.set(sourceFilePath, false);
+                    return undefined;
+                }
+                sourceFile = ts.Debug.assertDefined(commandLine.options.configFile);
+                ts.Debug.assert(!sourceFile.path || sourceFile.path === sourceFilePath);
+                addFileToFilesByName(sourceFile, sourceFilePath, /*redirectedPath*/ undefined);
+            }
+            else {
+                // An absolute path pointing to the containing directory of the config file
+                var basePath = ts.getNormalizedAbsolutePath(ts.getDirectoryPath(refPath), host.getCurrentDirectory());
+                sourceFile = host.getSourceFile(refPath, 100 /* JSON */);
+                addFileToFilesByName(sourceFile, sourceFilePath, /*redirectedPath*/ undefined);
+                if (sourceFile === undefined) {
+                    projectReferenceRedirects.set(sourceFilePath, false);
+                    return undefined;
+                }
+                commandLine = ts.parseJsonSourceFileConfigFileContent(sourceFile, configParsingHost, basePath, /*existingOptions*/ undefined, refPath);
             }
             sourceFile.path = sourceFilePath;
             sourceFile.resolvedPath = sourceFilePath;
             sourceFile.originalFileName = refPath;
-            var commandLine = ts.parseJsonSourceFileConfigFileContent(sourceFile, configParsingHost, basePath, /*existingOptions*/ undefined, refPath);
             var resolvedRef = { commandLine: commandLine, sourceFile: sourceFile };
             projectReferenceRedirects.set(sourceFilePath, resolvedRef);
             if (commandLine.projectReferences) {
@@ -89759,9 +92429,6 @@ var ts;
                 if (ts.getEmitDeclarations(options)) {
                     createDiagnosticForOptionName(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, getEmitDeclarationOptionName(options), "isolatedModules");
                 }
-                if (options.noEmitOnError) {
-                    createDiagnosticForOptionName(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "noEmitOnError", "isolatedModules");
-                }
                 if (options.out) {
                     createDiagnosticForOptionName(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "out", "isolatedModules");
                 }
@@ -89793,17 +92460,20 @@ var ts;
                     createDiagnosticForOptionName(ts.Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1_or_option_2, "tsBuildInfoFile", "incremental", "composite");
                 }
             }
+            else if (options.incremental && !options.outFile && !options.out && !options.configFilePath) {
+                programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_incremental_can_only_be_specified_using_tsconfig_emitting_to_single_file_or_when_option_tsBuildInfoFile_is_specified));
+            }
             verifyProjectReferences();
             // List of collected files is complete; validate exhautiveness if this is a project with a file list
             if (options.composite) {
-                var sourceFiles = files.filter(function (f) { return !f.isDeclarationFile; });
-                if (rootNames.length < sourceFiles.length) {
-                    var normalizedRootNames = rootNames.map(function (r) { return ts.normalizePath(r).toLowerCase(); });
-                    for (var _i = 0, _a = sourceFiles.map(function (f) { return ts.normalizePath(f.path).toLowerCase(); }); _i < _a.length; _i++) {
-                        var file = _a[_i];
-                        if (normalizedRootNames.indexOf(file) === -1) {
-                            programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.File_0_is_not_in_project_file_list_Projects_must_list_all_files_or_use_an_include_pattern, file));
-                        }
+                var rootPaths = rootNames.map(toPath);
+                for (var _i = 0, files_3 = files; _i < files_3.length; _i++) {
+                    var file = files_3[_i];
+                    // Ignore file that is not emitted
+                    if (!ts.sourceFileMayBeEmitted(file, options, isSourceFileFromExternalLibrary, getResolvedProjectReferenceToRedirect))
+                        continue;
+                    if (rootPaths.indexOf(file.path) === -1) {
+                        programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.File_0_is_not_listed_within_the_file_list_of_project_1_Projects_must_list_all_files_or_use_an_include_pattern, file.fileName, options.configFilePath || ""));
                     }
                 }
             }
@@ -89877,10 +92547,10 @@ var ts;
                 if (options.module === ts.ModuleKind.None && languageVersion < 2 /* ES2015 */) {
                     createDiagnosticForOptionName(ts.Diagnostics.Option_isolatedModules_can_only_be_used_when_either_option_module_is_provided_or_option_target_is_ES2015_or_higher, "isolatedModules", "target");
                 }
-                var firstNonExternalModuleSourceFile = ts.find(files, function (f) { return !ts.isExternalModule(f) && !f.isDeclarationFile && f.scriptKind !== 6 /* JSON */; });
+                var firstNonExternalModuleSourceFile = ts.find(files, function (f) { return !ts.isExternalModule(f) && !ts.isSourceFileJS(f) && !f.isDeclarationFile && f.scriptKind !== 6 /* JSON */; });
                 if (firstNonExternalModuleSourceFile) {
                     var span = ts.getErrorSpanForNode(firstNonExternalModuleSourceFile, firstNonExternalModuleSourceFile);
-                    programDiagnostics.add(ts.createFileDiagnostic(firstNonExternalModuleSourceFile, span.start, span.length, ts.Diagnostics.Cannot_compile_namespaces_when_the_isolatedModules_flag_is_provided));
+                    programDiagnostics.add(ts.createFileDiagnostic(firstNonExternalModuleSourceFile, span.start, span.length, ts.Diagnostics.All_files_must_be_modules_when_the_isolatedModules_flag_is_provided));
                 }
             }
             else if (firstNonAmbientExternalModuleSourceFile && languageVersion < 2 /* ES2015 */ && options.module === ts.ModuleKind.None) {
@@ -89965,13 +92635,13 @@ var ts;
                     var emitFilePath = toPath(emitFileName);
                     // Report error if the output overwrites input file
                     if (filesByName.has(emitFilePath)) {
-                        var chain_2;
+                        var chain = void 0;
                         if (!options.configFilePath) {
                             // The program is from either an inferred project or an external project
-                            chain_2 = ts.chainDiagnosticMessages(/*details*/ undefined, ts.Diagnostics.Adding_a_tsconfig_json_file_will_help_organize_projects_that_contain_both_TypeScript_and_JavaScript_files_Learn_more_at_https_Colon_Slash_Slashaka_ms_Slashtsconfig);
+                            chain = ts.chainDiagnosticMessages(/*details*/ undefined, ts.Diagnostics.Adding_a_tsconfig_json_file_will_help_organize_projects_that_contain_both_TypeScript_and_JavaScript_files_Learn_more_at_https_Colon_Slash_Slashaka_ms_Slashtsconfig);
                         }
-                        chain_2 = ts.chainDiagnosticMessages(chain_2, ts.Diagnostics.Cannot_write_file_0_because_it_would_overwrite_input_file, emitFileName);
-                        blockEmittingOfFile(emitFileName, ts.createCompilerDiagnosticFromMessageChain(chain_2));
+                        chain = ts.chainDiagnosticMessages(chain, ts.Diagnostics.Cannot_write_file_0_because_it_would_overwrite_input_file, emitFileName);
+                        blockEmittingOfFile(emitFileName, ts.createCompilerDiagnosticFromMessageChain(chain));
                     }
                     var emitFileKey = !host.useCaseSensitiveFileNames() ? emitFilePath.toLocaleLowerCase() : emitFilePath;
                     // Report error if multiple files write into same file
@@ -90161,7 +92831,7 @@ var ts;
             readFile: function (f) { return directoryStructureHost.readFile(f); },
             useCaseSensitiveFileNames: host.useCaseSensitiveFileNames(),
             getCurrentDirectory: function () { return host.getCurrentDirectory(); },
-            onUnRecoverableConfigFileDiagnostic: host.onUnRecoverableConfigFileDiagnostic || (function () { return undefined; }),
+            onUnRecoverableConfigFileDiagnostic: host.onUnRecoverableConfigFileDiagnostic || ts.returnUndefined,
             trace: host.trace ? function (s) { return host.trace(s); } : undefined
         };
     }
@@ -90383,7 +93053,7 @@ var ts;
             // Create the reference map, and set the file infos
             for (var _i = 0, _a = newProgram.getSourceFiles(); _i < _a.length; _i++) {
                 var sourceFile = _a[_i];
-                var version_1 = sourceFile.version;
+                var version_1 = ts.Debug.assertDefined(sourceFile.version, "Program intended to be used with Builder should have source files with versions set");
                 var oldInfo = useOldState ? oldState.fileInfos.get(sourceFile.path) : undefined;
                 if (referencedMap) {
                     var newReferences = getReferencedFiles(newProgram, sourceFile, getCanonicalFileName);
@@ -90506,6 +93176,7 @@ var ts;
             cacheToUpdateSignature.set(sourceFile.path, latestSignature);
             return !prevSignature || latestSignature !== prevSignature;
         }
+        BuilderState.updateShapeSignature = updateShapeSignature;
         /**
          * Coverts the declaration emit result into exported modules map
          */
@@ -90548,7 +93219,6 @@ var ts;
          * Get all the dependencies of the sourceFile
          */
         function getAllDependencies(state, programOfThisState, sourceFile) {
-            var _a;
             var compilerOptions = programOfThisState.getCompilerOptions();
             // With --out or --outFile all outputs go into single file, all files depend on each other
             if (compilerOptions.outFile || compilerOptions.out) {
@@ -90568,8 +93238,8 @@ var ts;
                     var references = state.referencedMap.get(path);
                     if (references) {
                         var iterator = references.keys();
-                        for (var _b = iterator.next(), value = _b.value, done = _b.done; !done; _a = iterator.next(), value = _a.value, done = _a.done, _a) {
-                            queue.push(value);
+                        for (var iterResult = iterator.next(); !iterResult.done; iterResult = iterator.next()) {
+                            queue.push(iterResult.value);
                         }
                     }
                 }
@@ -90775,7 +93445,7 @@ var ts;
                 // Unchanged file copy diagnostics
                 var diagnostics = oldState.semanticDiagnosticsPerFile.get(sourceFilePath);
                 if (diagnostics) {
-                    state.semanticDiagnosticsPerFile.set(sourceFilePath, oldState.hasReusableDiagnostic ? convertToDiagnostics(diagnostics, newProgram) : diagnostics);
+                    state.semanticDiagnosticsPerFile.set(sourceFilePath, oldState.hasReusableDiagnostic ? convertToDiagnostics(diagnostics, newProgram, getCanonicalFileName) : diagnostics);
                     if (!state.semanticDiagnosticsFromOldState) {
                         state.semanticDiagnosticsFromOldState = ts.createMap();
                     }
@@ -90783,44 +93453,37 @@ var ts;
                 }
             }
         });
-        if (oldCompilerOptions &&
-            (oldCompilerOptions.outDir !== compilerOptions.outDir ||
-                oldCompilerOptions.declarationDir !== compilerOptions.declarationDir ||
-                (oldCompilerOptions.outFile || oldCompilerOptions.out) !== (compilerOptions.outFile || compilerOptions.out))) {
+        if (oldCompilerOptions && ts.compilerOptionsAffectEmit(compilerOptions, oldCompilerOptions)) {
             // Add all files to affectedFilesPendingEmit since emit changed
-            state.affectedFilesPendingEmit = ts.concatenate(state.affectedFilesPendingEmit, newProgram.getSourceFiles().map(function (f) { return f.path; }));
-            if (state.affectedFilesPendingEmitIndex === undefined) {
-                state.affectedFilesPendingEmitIndex = 0;
-            }
+            addToAffectedFilesPendingEmit(state, newProgram.getSourceFiles().map(function (f) { return f.path; }));
             ts.Debug.assert(state.seenAffectedFiles === undefined);
             state.seenAffectedFiles = ts.createMap();
         }
         return state;
     }
-    function convertToDiagnostics(diagnostics, newProgram) {
+    function convertToDiagnostics(diagnostics, newProgram, getCanonicalFileName) {
         if (!diagnostics.length)
             return ts.emptyArray;
+        var buildInfoDirectory = ts.getDirectoryPath(ts.getNormalizedAbsolutePath(ts.getOutputPathForBuildInfo(newProgram.getCompilerOptions()), newProgram.getCurrentDirectory()));
         return diagnostics.map(function (diagnostic) {
-            var result = convertToDiagnosticRelatedInformation(diagnostic, newProgram);
+            var result = convertToDiagnosticRelatedInformation(diagnostic, newProgram, toPath);
             result.reportsUnnecessary = diagnostic.reportsUnnecessary;
             result.source = diagnostic.source;
             var relatedInformation = diagnostic.relatedInformation;
             result.relatedInformation = relatedInformation ?
                 relatedInformation.length ?
-                    relatedInformation.map(function (r) { return convertToDiagnosticRelatedInformation(r, newProgram); }) :
+                    relatedInformation.map(function (r) { return convertToDiagnosticRelatedInformation(r, newProgram, toPath); }) :
                     ts.emptyArray :
                 undefined;
             return result;
         });
+        function toPath(path) {
+            return ts.toPath(path, buildInfoDirectory, getCanonicalFileName);
+        }
     }
-    function convertToDiagnosticRelatedInformation(diagnostic, newProgram) {
-        var file = diagnostic.file, messageText = diagnostic.messageText;
-        return __assign({}, diagnostic, { file: file && newProgram.getSourceFileByPath(file), messageText: messageText === undefined || ts.isString(messageText) ?
-                messageText :
-                convertToDiagnosticMessageChain(messageText, newProgram) });
-    }
-    function convertToDiagnosticMessageChain(diagnostic, newProgram) {
-        return __assign({}, diagnostic, { next: diagnostic.next && convertToDiagnosticMessageChain(diagnostic.next, newProgram) });
+    function convertToDiagnosticRelatedInformation(diagnostic, newProgram, toPath) {
+        var file = diagnostic.file;
+        return __assign({}, diagnostic, { file: file ? newProgram.getSourceFileByPath(toPath(file)) : undefined });
     }
     /**
      * Releases program and other related not needed properties
@@ -90875,7 +93538,7 @@ var ts;
                     if (!seenAffectedFiles.has(affectedFile.path)) {
                         // Set the next affected file as seen and remove the cached semantic diagnostics
                         state.affectedFilesIndex = affectedFilesIndex;
-                        cleanSemanticDiagnosticsOfAffectedFile(state, affectedFile);
+                        handleDtsMayChangeOfAffectedFile(state, affectedFile, cancellationToken, computeHash);
                         return affectedFile;
                     }
                     seenAffectedFiles.set(affectedFile.path, true);
@@ -90936,94 +93599,49 @@ var ts;
         return undefined;
     }
     /**
-     * Remove the semantic diagnostics cached from old state for affected File and the files that are referencing modules that export entities from affected file
+     *  Handles semantic diagnostics and dts emit for affectedFile and files, that are referencing modules that export entities from affected file
+     *  This is because even though js emit doesnt change, dts emit / type used can change resulting in need for dts emit and js change
      */
-    function cleanSemanticDiagnosticsOfAffectedFile(state, affectedFile) {
-        if (removeSemanticDiagnosticsOf(state, affectedFile.path)) {
-            // If there are no more diagnostics from old cache, done
+    function handleDtsMayChangeOfAffectedFile(state, affectedFile, cancellationToken, computeHash) {
+        removeSemanticDiagnosticsOf(state, affectedFile.path);
+        // If affected files is everything except default library, then nothing more to do
+        if (state.allFilesExcludingDefaultLibraryFile === state.affectedFiles) {
+            if (!state.cleanedDiagnosticsOfLibFiles) {
+                state.cleanedDiagnosticsOfLibFiles = true;
+                var program_1 = ts.Debug.assertDefined(state.program);
+                var options_2 = program_1.getCompilerOptions();
+                ts.forEach(program_1.getSourceFiles(), function (f) {
+                    return program_1.isSourceFileDefaultLibrary(f) &&
+                        !ts.skipTypeChecking(f, options_2) &&
+                        removeSemanticDiagnosticsOf(state, f.path);
+                });
+            }
             return;
         }
-        // Clean lib file diagnostics if its all files excluding default files to emit
-        if (state.allFilesExcludingDefaultLibraryFile === state.affectedFiles && !state.cleanedDiagnosticsOfLibFiles) {
-            state.cleanedDiagnosticsOfLibFiles = true;
-            var program_1 = ts.Debug.assertDefined(state.program);
-            var options_2 = program_1.getCompilerOptions();
-            if (ts.forEach(program_1.getSourceFiles(), function (f) {
-                return program_1.isSourceFileDefaultLibrary(f) &&
-                    !ts.skipTypeChecking(f, options_2) &&
-                    removeSemanticDiagnosticsOf(state, f.path);
-            })) {
-                return;
+        forEachReferencingModulesOfExportOfAffectedFile(state, affectedFile, function (state, path) { return handleDtsMayChangeOf(state, path, cancellationToken, computeHash); });
+    }
+    /**
+     * Handle the dts may change, so they need to be added to pending emit if dts emit is enabled,
+     * Also we need to make sure signature is updated for these files
+     */
+    function handleDtsMayChangeOf(state, path, cancellationToken, computeHash) {
+        removeSemanticDiagnosticsOf(state, path);
+        if (!state.changedFilesSet.has(path)) {
+            var program = ts.Debug.assertDefined(state.program);
+            var sourceFile = program.getSourceFileByPath(path);
+            if (sourceFile) {
+                // Even though the js emit doesnt change and we are already handling dts emit and semantic diagnostics
+                // we need to update the signature to reflect correctness of the signature(which is output d.ts emit) of this file
+                // This ensures that we dont later during incremental builds considering wrong signature.
+                // Eg where this also is needed to ensure that .tsbuildinfo generated by incremental build should be same as if it was first fresh build
+                ts.BuilderState.updateShapeSignature(state, program, sourceFile, ts.Debug.assertDefined(state.currentAffectedFilesSignatures), cancellationToken, computeHash, state.currentAffectedFilesExportedModulesMap);
+                // If not dts emit, nothing more to do
+                if (ts.getEmitDeclarations(state.compilerOptions)) {
+                    addToAffectedFilesPendingEmit(state, [path]);
+                }
             }
         }
-        // If there was change in signature for the changed file,
-        // then delete the semantic diagnostics for files that are affected by using exports of this module
-        if (!state.exportedModulesMap || state.affectedFiles.length === 1 || !state.changedFilesSet.has(affectedFile.path)) {
-            return;
-        }
-        ts.Debug.assert(!!state.currentAffectedFilesExportedModulesMap);
-        var seenFileAndExportsOfFile = ts.createMap();
-        // Go through exported modules from cache first
-        // If exported modules has path, all files referencing file exported from are affected
-        if (ts.forEachEntry(state.currentAffectedFilesExportedModulesMap, function (exportedModules, exportedFromPath) {
-            return exportedModules &&
-                exportedModules.has(affectedFile.path) &&
-                removeSemanticDiagnosticsOfFilesReferencingPath(state, exportedFromPath, seenFileAndExportsOfFile);
-        })) {
-            return;
-        }
-        // If exported from path is not from cache and exported modules has path, all files referencing file exported from are affected
-        ts.forEachEntry(state.exportedModulesMap, function (exportedModules, exportedFromPath) {
-            return !state.currentAffectedFilesExportedModulesMap.has(exportedFromPath) && // If we already iterated this through cache, ignore it
-                exportedModules.has(affectedFile.path) &&
-                removeSemanticDiagnosticsOfFilesReferencingPath(state, exportedFromPath, seenFileAndExportsOfFile);
-        });
-    }
-    /**
-     * removes the semantic diagnostics of files referencing referencedPath and
-     * returns true if there are no more semantic diagnostics from old state
-     */
-    function removeSemanticDiagnosticsOfFilesReferencingPath(state, referencedPath, seenFileAndExportsOfFile) {
-        return ts.forEachEntry(state.referencedMap, function (referencesInFile, filePath) {
-            return referencesInFile.has(referencedPath) && removeSemanticDiagnosticsOfFileAndExportsOfFile(state, filePath, seenFileAndExportsOfFile);
-        });
-    }
-    /**
-     * Removes semantic diagnostics of file and anything that exports this file
-     */
-    function removeSemanticDiagnosticsOfFileAndExportsOfFile(state, filePath, seenFileAndExportsOfFile) {
-        if (!ts.addToSeen(seenFileAndExportsOfFile, filePath)) {
-            return false;
-        }
-        if (removeSemanticDiagnosticsOf(state, filePath)) {
-            // If there are no more diagnostics from old cache, done
-            return true;
-        }
-        ts.Debug.assert(!!state.currentAffectedFilesExportedModulesMap);
-        // Go through exported modules from cache first
-        // If exported modules has path, all files referencing file exported from are affected
-        if (ts.forEachEntry(state.currentAffectedFilesExportedModulesMap, function (exportedModules, exportedFromPath) {
-            return exportedModules &&
-                exportedModules.has(filePath) &&
-                removeSemanticDiagnosticsOfFileAndExportsOfFile(state, exportedFromPath, seenFileAndExportsOfFile);
-        })) {
-            return true;
-        }
-        // If exported from path is not from cache and exported modules has path, all files referencing file exported from are affected
-        if (ts.forEachEntry(state.exportedModulesMap, function (exportedModules, exportedFromPath) {
-            return !state.currentAffectedFilesExportedModulesMap.has(exportedFromPath) && // If we already iterated this through cache, ignore it
-                exportedModules.has(filePath) &&
-                removeSemanticDiagnosticsOfFileAndExportsOfFile(state, exportedFromPath, seenFileAndExportsOfFile);
-        })) {
-            return true;
-        }
-        // Remove diagnostics of files that import this file (without going to exports of referencing files)
-        return !!ts.forEachEntry(state.referencedMap, function (referencesInFile, referencingFilePath) {
-            return referencesInFile.has(filePath) &&
-                !seenFileAndExportsOfFile.has(referencingFilePath) && // Not already removed diagnostic file
-                removeSemanticDiagnosticsOf(state, referencingFilePath);
-        } // Dont add to seen since this is not yet done with the export removal
-        );
+        return false;
     }
     /**
      * Removes semantic diagnostics for path and
@@ -91037,6 +93655,78 @@ var ts;
         state.semanticDiagnosticsPerFile.delete(path);
         return !state.semanticDiagnosticsFromOldState.size;
     }
+    /**
+     * Iterate on referencing modules that export entities from affected file
+     */
+    function forEachReferencingModulesOfExportOfAffectedFile(state, affectedFile, fn) {
+        // If there was change in signature (dts output) for the changed file,
+        // then only we need to handle pending file emit
+        if (!state.exportedModulesMap || state.affectedFiles.length === 1 || !state.changedFilesSet.has(affectedFile.path)) {
+            return;
+        }
+        ts.Debug.assert(!!state.currentAffectedFilesExportedModulesMap);
+        var seenFileAndExportsOfFile = ts.createMap();
+        // Go through exported modules from cache first
+        // If exported modules has path, all files referencing file exported from are affected
+        if (ts.forEachEntry(state.currentAffectedFilesExportedModulesMap, function (exportedModules, exportedFromPath) {
+            return exportedModules &&
+                exportedModules.has(affectedFile.path) &&
+                forEachFilesReferencingPath(state, exportedFromPath, seenFileAndExportsOfFile, fn);
+        })) {
+            return;
+        }
+        // If exported from path is not from cache and exported modules has path, all files referencing file exported from are affected
+        ts.forEachEntry(state.exportedModulesMap, function (exportedModules, exportedFromPath) {
+            return !state.currentAffectedFilesExportedModulesMap.has(exportedFromPath) && // If we already iterated this through cache, ignore it
+                exportedModules.has(affectedFile.path) &&
+                forEachFilesReferencingPath(state, exportedFromPath, seenFileAndExportsOfFile, fn);
+        });
+    }
+    /**
+     * Iterate on files referencing referencedPath
+     */
+    function forEachFilesReferencingPath(state, referencedPath, seenFileAndExportsOfFile, fn) {
+        return ts.forEachEntry(state.referencedMap, function (referencesInFile, filePath) {
+            return referencesInFile.has(referencedPath) && forEachFileAndExportsOfFile(state, filePath, seenFileAndExportsOfFile, fn);
+        });
+    }
+    /**
+     * fn on file and iterate on anything that exports this file
+     */
+    function forEachFileAndExportsOfFile(state, filePath, seenFileAndExportsOfFile, fn) {
+        if (!ts.addToSeen(seenFileAndExportsOfFile, filePath)) {
+            return false;
+        }
+        if (fn(state, filePath)) {
+            // If there are no more diagnostics from old cache, done
+            return true;
+        }
+        ts.Debug.assert(!!state.currentAffectedFilesExportedModulesMap);
+        // Go through exported modules from cache first
+        // If exported modules has path, all files referencing file exported from are affected
+        if (ts.forEachEntry(state.currentAffectedFilesExportedModulesMap, function (exportedModules, exportedFromPath) {
+            return exportedModules &&
+                exportedModules.has(filePath) &&
+                forEachFileAndExportsOfFile(state, exportedFromPath, seenFileAndExportsOfFile, fn);
+        })) {
+            return true;
+        }
+        // If exported from path is not from cache and exported modules has path, all files referencing file exported from are affected
+        if (ts.forEachEntry(state.exportedModulesMap, function (exportedModules, exportedFromPath) {
+            return !state.currentAffectedFilesExportedModulesMap.has(exportedFromPath) && // If we already iterated this through cache, ignore it
+                exportedModules.has(filePath) &&
+                forEachFileAndExportsOfFile(state, exportedFromPath, seenFileAndExportsOfFile, fn);
+        })) {
+            return true;
+        }
+        // Remove diagnostics of files that import this file (without going to exports of referencing files)
+        return !!ts.forEachEntry(state.referencedMap, function (referencesInFile, referencingFilePath) {
+            return referencesInFile.has(filePath) &&
+                !seenFileAndExportsOfFile.has(referencingFilePath) && // Not already removed diagnostic file
+                fn(state, referencingFilePath);
+        } // Dont add to seen since this is not yet done with the export removal
+        );
+    }
     /**
      * This is called after completing operation on the next affected file.
      * The operations here are postponed to ensure that cancellation during the iteration is handled correctly
@@ -91089,19 +93779,24 @@ var ts;
     /**
      * Gets the program information to be emitted in buildInfo so that we can use it to create new program
      */
-    function getProgramBuildInfo(state) {
+    function getProgramBuildInfo(state, getCanonicalFileName) {
         if (state.compilerOptions.outFile || state.compilerOptions.out)
             return undefined;
+        var currentDirectory = ts.Debug.assertDefined(state.program).getCurrentDirectory();
+        var buildInfoDirectory = ts.getDirectoryPath(ts.getNormalizedAbsolutePath(ts.getOutputPathForBuildInfo(state.compilerOptions), currentDirectory));
         var fileInfos = {};
         state.fileInfos.forEach(function (value, key) {
             var signature = state.currentAffectedFilesSignatures && state.currentAffectedFilesSignatures.get(key);
-            fileInfos[key] = signature === undefined ? value : { version: value.version, signature: signature };
+            fileInfos[relativeToBuildInfo(key)] = signature === undefined ? value : { version: value.version, signature: signature };
         });
-        var result = { fileInfos: fileInfos, options: state.compilerOptions };
+        var result = {
+            fileInfos: fileInfos,
+            options: convertToReusableCompilerOptions(state.compilerOptions, relativeToBuildInfoEnsuringAbsolutePath)
+        };
         if (state.referencedMap) {
             var referencedMap_1 = {};
             state.referencedMap.forEach(function (value, key) {
-                referencedMap_1[key] = ts.arrayFrom(value.keys());
+                referencedMap_1[relativeToBuildInfo(key)] = ts.arrayFrom(value.keys(), relativeToBuildInfo);
             });
             result.referencedMap = referencedMap_1;
         }
@@ -91111,10 +93806,10 @@ var ts;
                 var newValue = state.currentAffectedFilesExportedModulesMap && state.currentAffectedFilesExportedModulesMap.get(key);
                 // Not in temporary cache, use existing value
                 if (newValue === undefined)
-                    exportedModulesMap_1[key] = ts.arrayFrom(value.keys());
+                    exportedModulesMap_1[relativeToBuildInfo(key)] = ts.arrayFrom(value.keys(), relativeToBuildInfo);
                 // Value in cache and has updated value map, use that
                 else if (newValue)
-                    exportedModulesMap_1[key] = ts.arrayFrom(newValue.keys());
+                    exportedModulesMap_1[relativeToBuildInfo(key)] = ts.arrayFrom(newValue.keys(), relativeToBuildInfo);
             });
             result.exportedModulesMap = exportedModulesMap_1;
         }
@@ -91123,39 +93818,67 @@ var ts;
             // Currently not recording actual errors since those mean no emit for tsc --build
             state.semanticDiagnosticsPerFile.forEach(function (value, key) { return semanticDiagnosticsPerFile_1.push(value.length ?
                 [
-                    key,
+                    relativeToBuildInfo(key),
                     state.hasReusableDiagnostic ?
                         value :
-                        convertToReusableDiagnostics(value)
+                        convertToReusableDiagnostics(value, relativeToBuildInfo)
                 ] :
-                key); });
+                relativeToBuildInfo(key)); });
             result.semanticDiagnosticsPerFile = semanticDiagnosticsPerFile_1;
         }
         return result;
+        function relativeToBuildInfoEnsuringAbsolutePath(path) {
+            return relativeToBuildInfo(ts.getNormalizedAbsolutePath(path, currentDirectory));
+        }
+        function relativeToBuildInfo(path) {
+            return ts.ensurePathIsNonModuleName(ts.getRelativePathFromDirectory(buildInfoDirectory, path, getCanonicalFileName));
+        }
     }
-    function convertToReusableDiagnostics(diagnostics) {
+    function convertToReusableCompilerOptions(options, relativeToBuildInfo) {
+        var result = {};
+        var optionsNameMap = ts.getOptionNameMap().optionNameMap;
+        for (var name in options) {
+            if (ts.hasProperty(options, name)) {
+                result[name] = convertToReusableCompilerOptionValue(optionsNameMap.get(name.toLowerCase()), options[name], relativeToBuildInfo);
+            }
+        }
+        if (result.configFilePath) {
+            result.configFilePath = relativeToBuildInfo(result.configFilePath);
+        }
+        return result;
+    }
+    function convertToReusableCompilerOptionValue(option, value, relativeToBuildInfo) {
+        if (option) {
+            if (option.type === "list") {
+                var values = value;
+                if (option.element.isFilePath && values.length) {
+                    return values.map(relativeToBuildInfo);
+                }
+            }
+            else if (option.isFilePath) {
+                return relativeToBuildInfo(value);
+            }
+        }
+        return value;
+    }
+    function convertToReusableDiagnostics(diagnostics, relativeToBuildInfo) {
         ts.Debug.assert(!!diagnostics.length);
         return diagnostics.map(function (diagnostic) {
-            var result = convertToReusableDiagnosticRelatedInformation(diagnostic);
+            var result = convertToReusableDiagnosticRelatedInformation(diagnostic, relativeToBuildInfo);
             result.reportsUnnecessary = diagnostic.reportsUnnecessary;
             result.source = diagnostic.source;
             var relatedInformation = diagnostic.relatedInformation;
             result.relatedInformation = relatedInformation ?
                 relatedInformation.length ?
-                    relatedInformation.map(function (r) { return convertToReusableDiagnosticRelatedInformation(r); }) :
+                    relatedInformation.map(function (r) { return convertToReusableDiagnosticRelatedInformation(r, relativeToBuildInfo); }) :
                     ts.emptyArray :
                 undefined;
             return result;
         });
     }
-    function convertToReusableDiagnosticRelatedInformation(diagnostic) {
-        var file = diagnostic.file, messageText = diagnostic.messageText;
-        return __assign({}, diagnostic, { file: file && file.path, messageText: messageText === undefined || ts.isString(messageText) ?
-                messageText :
-                convertToReusableDiagnosticMessageChain(messageText) });
-    }
-    function convertToReusableDiagnosticMessageChain(diagnostic) {
-        return __assign({}, diagnostic, { next: diagnostic.next && convertToReusableDiagnosticMessageChain(diagnostic.next) });
+    function convertToReusableDiagnosticRelatedInformation(diagnostic, relativeToBuildInfo) {
+        var file = diagnostic.file;
+        return __assign({}, diagnostic, { file: file ? relativeToBuildInfo(file.path) : undefined });
     }
     var BuilderProgramKind;
     (function (BuilderProgramKind) {
@@ -91213,7 +93936,7 @@ var ts;
         var computeHash = host.createHash || ts.generateDjb2Hash;
         var state = createBuilderProgramState(newProgram, getCanonicalFileName, oldState);
         var backupState;
-        newProgram.getProgramBuildInfo = function () { return getProgramBuildInfo(state); };
+        newProgram.getProgramBuildInfo = function () { return getProgramBuildInfo(state, getCanonicalFileName); };
         // To ensure that we arent storing any references to old program or new program without state
         newProgram = undefined; // TODO: GH#18217
         oldProgram = undefined;
@@ -91239,6 +93962,7 @@ var ts;
             result.getSemanticDiagnosticsOfNextAffectedFile = getSemanticDiagnosticsOfNextAffectedFile;
         }
         else if (kind === BuilderProgramKind.EmitAndSemanticDiagnosticsBuilderProgram) {
+            result.getSemanticDiagnosticsOfNextAffectedFile = getSemanticDiagnosticsOfNextAffectedFile;
             result.emitNextAffectedFile = emitNextAffectedFile;
         }
         else {
@@ -91264,7 +93988,7 @@ var ts;
                         return toAffectedFileResult(state, 
                         // When whole program is affected, do emit only once (eg when --out or --outFile is specified)
                         // Otherwise just affected file
-                        affected_1.emitBuildInfo(writeFile || host.writeFile, cancellationToken), affected_1, 
+                        affected_1.emitBuildInfo(writeFile || ts.maybeBind(host, host.writeFile), cancellationToken), affected_1, 
                         /*isPendingEmitFile*/ false, 
                         /*isBuildInfoEmit*/ true);
                     }
@@ -91280,14 +94004,10 @@ var ts;
                     affected = program;
                 }
             }
-            // Mark seen emitted files if there are pending files to be emitted
-            if (state.affectedFilesPendingEmit && state.program !== affected) {
-                (state.seenEmittedFiles || (state.seenEmittedFiles = ts.createMap())).set(affected.path, true);
-            }
             return toAffectedFileResult(state, 
             // When whole program is affected, do emit only once (eg when --out or --outFile is specified)
             // Otherwise just affected file
-            ts.Debug.assertDefined(state.program).emit(affected === state.program ? undefined : affected, writeFile || host.writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers), affected, isPendingEmitFile);
+            ts.Debug.assertDefined(state.program).emit(affected === state.program ? undefined : affected, writeFile || ts.maybeBind(host, host.writeFile), cancellationToken, emitOnlyDtsFiles, customTransformers), affected, isPendingEmitFile);
         }
         /**
          * Emits the JavaScript and declaration files.
@@ -91324,7 +94044,7 @@ var ts;
                     };
                 }
             }
-            return ts.Debug.assertDefined(state.program).emit(targetSourceFile, writeFile || host.writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers);
+            return ts.Debug.assertDefined(state.program).emit(targetSourceFile, writeFile || ts.maybeBind(host, host.writeFile), cancellationToken, emitOnlyDtsFiles, customTransformers);
         }
         /**
          * Return the semantic diagnostics for the next affected file or undefined if iteration is complete
@@ -91341,6 +94061,10 @@ var ts;
                     // When whole program is affected, get all semantic diagnostics (eg when --out or --outFile is specified)
                     return toAffectedFileResult(state, state.program.getSemanticDiagnostics(/*targetSourceFile*/ undefined, cancellationToken), affected);
                 }
+                // Add file to affected file pending emit to handle for later emit time
+                if (kind === BuilderProgramKind.EmitAndSemanticDiagnosticsBuilderProgram) {
+                    addToAffectedFilesPendingEmit(state, [affected.path]);
+                }
                 // Get diagnostics for the affected file if its not ignored
                 if (ignoreSourceFile && ignoreSourceFile(affected)) {
                     // Get next affected file
@@ -91371,35 +94095,29 @@ var ts;
             }
             // When semantic builder asks for diagnostics of the whole program,
             // ensure that all the affected files are handled
-            var affected;
-            var affectedFilesPendingEmit;
-            while (affected = getNextAffectedFile(state, cancellationToken, computeHash)) {
-                if (affected !== state.program && kind === BuilderProgramKind.EmitAndSemanticDiagnosticsBuilderProgram) {
-                    (affectedFilesPendingEmit || (affectedFilesPendingEmit = [])).push(affected.path);
-                }
-                doneWithAffectedFile(state, affected);
-            }
-            // In case of emit builder, cache the files to be emitted
-            if (affectedFilesPendingEmit) {
-                state.affectedFilesPendingEmit = ts.concatenate(state.affectedFilesPendingEmit, affectedFilesPendingEmit);
-                // affectedFilesPendingEmitIndex === undefined
-                // - means the emit state.affectedFilesPendingEmit was undefined before adding current affected files
-                //   so start from 0 as array would be affectedFilesPendingEmit
-                // else, continue to iterate from existing index, the current set is appended to existing files
-                if (state.affectedFilesPendingEmitIndex === undefined) {
-                    state.affectedFilesPendingEmitIndex = 0;
-                }
+            // tslint:disable-next-line no-empty
+            while (getSemanticDiagnosticsOfNextAffectedFile(cancellationToken)) {
             }
             var diagnostics;
             for (var _i = 0, _a = ts.Debug.assertDefined(state.program).getSourceFiles(); _i < _a.length; _i++) {
-                var sourceFile_2 = _a[_i];
-                diagnostics = ts.addRange(diagnostics, getSemanticDiagnosticsOfFile(state, sourceFile_2, cancellationToken));
+                var sourceFile_1 = _a[_i];
+                diagnostics = ts.addRange(diagnostics, getSemanticDiagnosticsOfFile(state, sourceFile_1, cancellationToken));
             }
             return diagnostics || ts.emptyArray;
         }
     }
     ts.createBuilderProgram = createBuilderProgram;
-    function getMapOfReferencedSet(mapLike) {
+    function addToAffectedFilesPendingEmit(state, affectedFilesPendingEmit) {
+        state.affectedFilesPendingEmit = ts.concatenate(state.affectedFilesPendingEmit, affectedFilesPendingEmit);
+        // affectedFilesPendingEmitIndex === undefined
+        // - means the emit state.affectedFilesPendingEmit was undefined before adding current affected files
+        //   so start from 0 as array would be affectedFilesPendingEmit
+        // else, continue to iterate from existing index, the current set is appended to existing files
+        if (state.affectedFilesPendingEmitIndex === undefined) {
+            state.affectedFilesPendingEmitIndex = 0;
+        }
+    }
+    function getMapOfReferencedSet(mapLike, toPath) {
         if (!mapLike)
             return undefined;
         var map = ts.createMap();
@@ -91407,18 +94125,25 @@ var ts;
         // template is undefined, and instead will just exit the loop.
         for (var key in mapLike) {
             if (ts.hasProperty(mapLike, key)) {
-                map.set(key, ts.arrayToSet(mapLike[key]));
+                map.set(toPath(key), ts.arrayToSet(mapLike[key], toPath));
             }
         }
         return map;
     }
-    function createBuildProgramUsingProgramBuildInfo(program) {
-        var fileInfos = ts.createMapFromTemplate(program.fileInfos);
+    function createBuildProgramUsingProgramBuildInfo(program, buildInfoPath, host) {
+        var buildInfoDirectory = ts.getDirectoryPath(ts.getNormalizedAbsolutePath(buildInfoPath, host.getCurrentDirectory()));
+        var getCanonicalFileName = ts.createGetCanonicalFileName(host.useCaseSensitiveFileNames());
+        var fileInfos = ts.createMap();
+        for (var key in program.fileInfos) {
+            if (ts.hasProperty(program.fileInfos, key)) {
+                fileInfos.set(toPath(key), program.fileInfos[key]);
+            }
+        }
         var state = {
             fileInfos: fileInfos,
-            compilerOptions: program.options,
-            referencedMap: getMapOfReferencedSet(program.referencedMap),
-            exportedModulesMap: getMapOfReferencedSet(program.exportedModulesMap),
+            compilerOptions: convertFromReusableCompilerOptions(program.options, toAbsolutePath),
+            referencedMap: getMapOfReferencedSet(program.referencedMap, toPath),
+            exportedModulesMap: getMapOfReferencedSet(program.exportedModulesMap, toPath),
             semanticDiagnosticsPerFile: program.semanticDiagnosticsPerFile && ts.arrayToMap(program.semanticDiagnosticsPerFile, function (value) { return ts.isString(value) ? value : value[0]; }, function (value) { return ts.isString(value) ? ts.emptyArray : value[1]; }),
             hasReusableDiagnostic: true
         };
@@ -91427,7 +94152,7 @@ var ts;
             backupState: ts.noop,
             restoreState: ts.noop,
             getProgram: ts.notImplemented,
-            getProgramOrUndefined: function () { return undefined; },
+            getProgramOrUndefined: ts.returnUndefined,
             releaseProgram: ts.noop,
             getCompilerOptions: function () { return state.compilerOptions; },
             getSourceFile: ts.notImplemented,
@@ -91444,8 +94169,41 @@ var ts;
             emitNextAffectedFile: ts.notImplemented,
             getSemanticDiagnosticsOfNextAffectedFile: ts.notImplemented,
         };
+        function toPath(path) {
+            return ts.toPath(path, buildInfoDirectory, getCanonicalFileName);
+        }
+        function toAbsolutePath(path) {
+            return ts.getNormalizedAbsolutePath(path, buildInfoDirectory);
+        }
     }
     ts.createBuildProgramUsingProgramBuildInfo = createBuildProgramUsingProgramBuildInfo;
+    function convertFromReusableCompilerOptions(options, toAbsolutePath) {
+        var result = {};
+        var optionsNameMap = ts.getOptionNameMap().optionNameMap;
+        for (var name in options) {
+            if (ts.hasProperty(options, name)) {
+                result[name] = convertFromReusableCompilerOptionValue(optionsNameMap.get(name.toLowerCase()), options[name], toAbsolutePath);
+            }
+        }
+        if (result.configFilePath) {
+            result.configFilePath = toAbsolutePath(result.configFilePath);
+        }
+        return result;
+    }
+    function convertFromReusableCompilerOptionValue(option, value, toAbsolutePath) {
+        if (option) {
+            if (option.type === "list") {
+                var values = value;
+                if (option.element.isFilePath && values.length) {
+                    return values.map(toAbsolutePath);
+                }
+            }
+            else if (option.isFilePath) {
+                return toAbsolutePath(value);
+            }
+        }
+        return value;
+    }
     function createRedirectedBuilderProgram(state, configFileParsingDiagnostics) {
         return {
             getState: ts.notImplemented,
@@ -91495,6 +94253,38 @@ var ts;
         return ts.some(ts.ignoredPaths, function (searchPath) { return ts.stringContains(path, searchPath); });
     }
     ts.isPathIgnored = isPathIgnored;
+    /**
+     * Filter out paths like
+     * "/", "/user", "/user/username", "/user/username/folderAtRoot",
+     * "c:/", "c:/users", "c:/users/username", "c:/users/username/folderAtRoot", "c:/folderAtRoot"
+     * @param dirPath
+     */
+    function canWatchDirectory(dirPath) {
+        var rootLength = ts.getRootLength(dirPath);
+        if (dirPath.length === rootLength) {
+            // Ignore "/", "c:/"
+            return false;
+        }
+        var nextDirectorySeparator = dirPath.indexOf(ts.directorySeparator, rootLength);
+        if (nextDirectorySeparator === -1) {
+            // ignore "/user", "c:/users" or "c:/folderAtRoot"
+            return false;
+        }
+        if (dirPath.charCodeAt(0) !== 47 /* slash */ &&
+            dirPath.substr(rootLength, nextDirectorySeparator).search(/users/i) === -1) {
+            // Paths like c:/folderAtRoot/subFolder are allowed
+            return true;
+        }
+        for (var searchIndex = nextDirectorySeparator + 1, searchLevels = 2; searchLevels > 0; searchLevels--) {
+            searchIndex = dirPath.indexOf(ts.directorySeparator, searchIndex) + 1;
+            if (searchIndex === 0) {
+                // Folder isnt at expected minimun levels
+                return false;
+            }
+        }
+        return true;
+    }
+    ts.canWatchDirectory = canWatchDirectory;
     ts.maxNumberOfFilesToIterateForInvalidation = 256;
     function createResolutionCache(resolutionHost, rootDirForResolution, logChangesWhenResolvingModule) {
         var filesWithChangedSetOfUnresolvedImports;
@@ -91625,7 +94415,7 @@ var ts;
             if (globalCache !== undefined && !ts.isExternalModuleNameRelative(moduleName) && !(primaryResult.resolvedModule && ts.extensionIsTS(primaryResult.resolvedModule.extension))) {
                 // create different collection of failed lookup locations for second pass
                 // if it will fail and we've already found something during the first pass - we don't want to pollute its results
-                var _a = ts.loadModuleFromGlobalCache(moduleName, resolutionHost.projectName, compilerOptions, host, globalCache), resolvedModule = _a.resolvedModule, failedLookupLocations = _a.failedLookupLocations;
+                var _a = ts.loadModuleFromGlobalCache(ts.Debug.assertDefined(resolutionHost.globalCacheResolutionModuleName)(moduleName), resolutionHost.projectName, compilerOptions, host, globalCache), resolvedModule = _a.resolvedModule, failedLookupLocations = _a.failedLookupLocations;
                 if (resolvedModule) {
                     return { resolvedModule: resolvedModule, failedLookupLocations: ts.addRange(primaryResult.failedLookupLocations, failedLookupLocations) };
                 }
@@ -91730,37 +94520,6 @@ var ts;
         function isNodeModulesAtTypesDirectory(dirPath) {
             return ts.endsWith(dirPath, "/node_modules/@types");
         }
-        /**
-         * Filter out paths like
-         * "/", "/user", "/user/username", "/user/username/folderAtRoot",
-         * "c:/", "c:/users", "c:/users/username", "c:/users/username/folderAtRoot", "c:/folderAtRoot"
-         * @param dirPath
-         */
-        function canWatchDirectory(dirPath) {
-            var rootLength = ts.getRootLength(dirPath);
-            if (dirPath.length === rootLength) {
-                // Ignore "/", "c:/"
-                return false;
-            }
-            var nextDirectorySeparator = dirPath.indexOf(ts.directorySeparator, rootLength);
-            if (nextDirectorySeparator === -1) {
-                // ignore "/user", "c:/users" or "c:/folderAtRoot"
-                return false;
-            }
-            if (dirPath.charCodeAt(0) !== 47 /* slash */ &&
-                dirPath.substr(rootLength, nextDirectorySeparator).search(/users/i) === -1) {
-                // Paths like c:/folderAtRoot/subFolder are allowed
-                return true;
-            }
-            for (var searchIndex = nextDirectorySeparator + 1, searchLevels = 2; searchLevels > 0; searchLevels--) {
-                searchIndex = dirPath.indexOf(ts.directorySeparator, searchIndex) + 1;
-                if (searchIndex === 0) {
-                    // Folder isnt at expected minimun levels
-                    return false;
-                }
-            }
-            return true;
-        }
         function getDirectoryToWatchFailedLookupLocation(failedLookupLocation, failedLookupLocationPath) {
             if (isInDirectoryPath(rootPath, failedLookupLocationPath)) {
                 // Ensure failed look up is normalized path
@@ -92018,6 +94777,10 @@ var ts;
                 // If something to do with folder/file starting with "." in node_modules folder, skip it
                 if (isPathIgnored(fileOrDirectoryPath))
                     return false;
+                // prevent saving an open file from over-eagerly triggering invalidation
+                if (resolutionHost.fileIsOpen(fileOrDirectoryPath)) {
+                    return false;
+                }
                 // Some file or directory in the watching directory is created
                 // Return early if it does not have any of the watching extension or not the custom failed lookup path
                 var dirOfFileOrDirectory = ts.getDirectoryPath(fileOrDirectoryPath);
@@ -92260,11 +95023,11 @@ var ts;
         }
         function discoverProbableSymlinks(files, getCanonicalFileName, cwd) {
             var result = ts.createMap();
-            var symlinks = ts.mapDefined(files, function (sf) {
-                return sf.resolvedModules && ts.firstDefinedIterator(sf.resolvedModules.values(), function (res) {
+            var symlinks = ts.flatten(ts.mapDefined(files, function (sf) {
+                return sf.resolvedModules && ts.compact(ts.arrayFrom(ts.mapIterator(sf.resolvedModules.values(), function (res) {
                     return res && res.originalPath && res.resolvedFileName !== res.originalPath ? [res.resolvedFileName, res.originalPath] : undefined;
-                });
-            });
+                })));
+            }));
             for (var _i = 0, symlinks_1 = symlinks; _i < symlinks_1.length; _i++) {
                 var _a = symlinks_1[_i], resolvedPath = _a[0], originalPath = _a[1];
                 var _b = guessDirectorySymlink(resolvedPath, originalPath, cwd, getCanonicalFileName), commonResolved = _b[0], commonOriginal = _b[1];
@@ -92607,25 +95370,34 @@ var ts;
         return "" + newLine + ts.flattenDiagnosticMessageText(d.messageText, newLine) + newLine + newLine;
     }
     ts.getErrorSummaryText = getErrorSummaryText;
+    function listFiles(program, writeFileName) {
+        if (program.getCompilerOptions().listFiles) {
+            ts.forEach(program.getSourceFiles(), function (file) {
+                writeFileName(file.fileName);
+            });
+        }
+    }
+    ts.listFiles = listFiles;
     /**
      * Helper that emit files, report diagnostics and lists emitted and/or source files depending on compiler options
      */
-    function emitFilesAndReportErrors(program, reportDiagnostic, writeFileName, reportSummary, writeFile) {
+    function emitFilesAndReportErrors(program, reportDiagnostic, writeFileName, reportSummary, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers) {
         // First get and report any syntactic errors.
         var diagnostics = program.getConfigFileParsingDiagnostics().slice();
         var configFileParsingDiagnosticsLength = diagnostics.length;
-        ts.addRange(diagnostics, program.getSyntacticDiagnostics());
+        ts.addRange(diagnostics, program.getSyntacticDiagnostics(/*sourceFile*/ undefined, cancellationToken));
         // If we didn't have any syntactic errors, then also try getting the global and
         // semantic errors.
         if (diagnostics.length === configFileParsingDiagnosticsLength) {
-            ts.addRange(diagnostics, program.getOptionsDiagnostics());
-            ts.addRange(diagnostics, program.getGlobalDiagnostics());
+            ts.addRange(diagnostics, program.getOptionsDiagnostics(cancellationToken));
+            ts.addRange(diagnostics, program.getGlobalDiagnostics(cancellationToken));
             if (diagnostics.length === configFileParsingDiagnosticsLength) {
-                ts.addRange(diagnostics, program.getSemanticDiagnostics());
+                ts.addRange(diagnostics, program.getSemanticDiagnostics(/*sourceFile*/ undefined, cancellationToken));
             }
         }
         // Emit and report any errors we ran into.
-        var _a = program.emit(/*targetSourceFile*/ undefined, writeFile), emittedFiles = _a.emittedFiles, emitSkipped = _a.emitSkipped, emitDiagnostics = _a.diagnostics;
+        var emitResult = program.emit(/*targetSourceFile*/ undefined, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers);
+        var emittedFiles = emitResult.emittedFiles, emitDiagnostics = emitResult.diagnostics;
         ts.addRange(diagnostics, emitDiagnostics);
         ts.sortAndDeduplicateDiagnostics(diagnostics).forEach(reportDiagnostic);
         if (writeFileName) {
@@ -92634,16 +95406,20 @@ var ts;
                 var filepath = ts.getNormalizedAbsolutePath(file, currentDir_1);
                 writeFileName("TSFILE: " + filepath);
             });
-            if (program.getCompilerOptions().listFiles) {
-                ts.forEach(program.getSourceFiles(), function (file) {
-                    writeFileName(file.fileName);
-                });
-            }
+            listFiles(program, writeFileName);
         }
         if (reportSummary) {
             reportSummary(getErrorCountForSummary(diagnostics));
         }
-        if (emitSkipped && diagnostics.length > 0) {
+        return {
+            emitResult: emitResult,
+            diagnostics: diagnostics,
+        };
+    }
+    ts.emitFilesAndReportErrors = emitFilesAndReportErrors;
+    function emitFilesAndReportErrorsAndGetExitStatus(program, reportDiagnostic, writeFileName, reportSummary, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers) {
+        var _a = emitFilesAndReportErrors(program, reportDiagnostic, writeFileName, reportSummary, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers), emitResult = _a.emitResult, diagnostics = _a.diagnostics;
+        if (emitResult.emitSkipped && diagnostics.length > 0) {
             // If the emitter didn't emit anything, then pass that value along.
             return ts.ExitStatus.DiagnosticsPresent_OutputsSkipped;
         }
@@ -92654,15 +95430,15 @@ var ts;
         }
         return ts.ExitStatus.Success;
     }
-    ts.emitFilesAndReportErrors = emitFilesAndReportErrors;
-    var noopFileWatcher = { close: ts.noop };
+    ts.emitFilesAndReportErrorsAndGetExitStatus = emitFilesAndReportErrorsAndGetExitStatus;
+    ts.noopFileWatcher = { close: ts.noop };
     function createWatchHost(system, reportWatchStatus) {
         if (system === void 0) { system = ts.sys; }
         var onWatchStatusChange = reportWatchStatus || createWatchStatusReporter(system);
         return {
             onWatchStatusChange: onWatchStatusChange,
-            watchFile: ts.maybeBind(system, system.watchFile) || (function () { return noopFileWatcher; }),
-            watchDirectory: ts.maybeBind(system, system.watchDirectory) || (function () { return noopFileWatcher; }),
+            watchFile: ts.maybeBind(system, system.watchFile) || (function () { return ts.noopFileWatcher; }),
+            watchDirectory: ts.maybeBind(system, system.watchDirectory) || (function () { return ts.noopFileWatcher; }),
             setTimeout: ts.maybeBind(system, system.setTimeout) || ts.noop,
             clearTimeout: ts.maybeBind(system, system.clearTimeout) || ts.noop
         };
@@ -92747,7 +95523,7 @@ var ts;
         }
     }
     ts.createCompilerHostFromProgramHost = createCompilerHostFromProgramHost;
-    function setCreateSourceFileAsHashVersioned(compilerHost, host) {
+    function setGetSourceFileAsHashVersioned(compilerHost, host) {
         var originalGetSourceFile = compilerHost.getSourceFile;
         var computeHash = host.createHash || ts.generateDjb2Hash;
         compilerHost.getSourceFile = function () {
@@ -92762,7 +95538,7 @@ var ts;
             return result;
         };
     }
-    ts.setCreateSourceFileAsHashVersioned = setCreateSourceFileAsHashVersioned;
+    ts.setGetSourceFileAsHashVersioned = setGetSourceFileAsHashVersioned;
     /**
      * Creates the watch compiler host that can be extended with config file or root file names and options host
      */
@@ -92837,13 +95613,25 @@ var ts;
         return host;
     }
     ts.createWatchCompilerHostOfFilesAndCompilerOptions = createWatchCompilerHostOfFilesAndCompilerOptions;
-    function readBuilderProgram(compilerOptions, readFile) {
+    function performIncrementalCompilation(input) {
+        var system = input.system || ts.sys;
+        var host = input.host || (input.host = ts.createIncrementalCompilerHost(input.options, system));
+        var builderProgram = ts.createIncrementalProgram(input);
+        var exitStatus = emitFilesAndReportErrorsAndGetExitStatus(builderProgram, input.reportDiagnostic || createDiagnosticReporter(system), function (s) { return host.trace && host.trace(s); }, input.reportErrorSummary || input.options.pretty ? function (errorCount) { return system.write(getErrorSummaryText(errorCount, system.newLine)); } : undefined);
+        if (input.afterProgramEmitAndDiagnostics)
+            input.afterProgramEmitAndDiagnostics(builderProgram);
+        return exitStatus;
+    }
+    ts.performIncrementalCompilation = performIncrementalCompilation;
+})(ts || (ts = {}));
+(function (ts) {
+    function readBuilderProgram(compilerOptions, host) {
         if (compilerOptions.out || compilerOptions.outFile)
             return undefined;
         var buildInfoPath = ts.getOutputPathForBuildInfo(compilerOptions);
         if (!buildInfoPath)
             return undefined;
-        var content = readFile(buildInfoPath);
+        var content = host.readFile(buildInfoPath);
         if (!content)
             return undefined;
         var buildInfo = ts.getBuildInfo(content);
@@ -92851,11 +95639,26 @@ var ts;
             return undefined;
         if (!buildInfo.program)
             return undefined;
-        return ts.createBuildProgramUsingProgramBuildInfo(buildInfo.program);
+        return ts.createBuildProgramUsingProgramBuildInfo(buildInfo.program, buildInfoPath, host);
     }
     ts.readBuilderProgram = readBuilderProgram;
-})(ts || (ts = {}));
-(function (ts) {
+    function createIncrementalCompilerHost(options, system) {
+        if (system === void 0) { system = ts.sys; }
+        var host = ts.createCompilerHostWorker(options, /*setParentNodes*/ undefined, system);
+        host.createHash = ts.maybeBind(system, system.createHash);
+        ts.setGetSourceFileAsHashVersioned(host, system);
+        ts.changeCompilerHostLikeToUseCache(host, function (fileName) { return ts.toPath(fileName, host.getCurrentDirectory(), host.getCanonicalFileName); });
+        return host;
+    }
+    ts.createIncrementalCompilerHost = createIncrementalCompilerHost;
+    function createIncrementalProgram(_a) {
+        var rootNames = _a.rootNames, options = _a.options, configFileParsingDiagnostics = _a.configFileParsingDiagnostics, projectReferences = _a.projectReferences, host = _a.host, createProgram = _a.createProgram;
+        host = host || createIncrementalCompilerHost(options);
+        createProgram = createProgram || ts.createEmitAndSemanticDiagnosticsBuilderProgram;
+        var oldProgram = readBuilderProgram(options, host);
+        return createProgram(rootNames, options, host, oldProgram, configFileParsingDiagnostics, projectReferences);
+    }
+    ts.createIncrementalProgram = createIncrementalProgram;
     function createWatchCompilerHost(rootFilesOrConfigFileName, options, system, createProgram, reportDiagnostic, reportWatchStatus, projectReferences) {
         if (ts.isArray(rootFilesOrConfigFileName)) {
             return ts.createWatchCompilerHostOfFilesAndCompilerOptions(rootFilesOrConfigFileName, options, system, createProgram, reportDiagnostic, reportWatchStatus, projectReferences); // TODO: GH#18217
@@ -92910,7 +95713,7 @@ var ts;
             configFileWatcher = watchFile(host, configFileName, scheduleProgramReload, ts.PollingInterval.High, "Config file" /* ConfigFile */);
         }
         var compilerHost = ts.createCompilerHostFromProgramHost(host, function () { return compilerOptions; }, directoryStructureHost);
-        ts.setCreateSourceFileAsHashVersioned(compilerHost, host);
+        ts.setGetSourceFileAsHashVersioned(compilerHost, host);
         // Members for CompilerHost
         var getNewSourceFile = compilerHost.getSourceFile;
         compilerHost.getSourceFile = function (fileName) {
@@ -92935,6 +95738,7 @@ var ts;
             hasChangedAutomaticTypeDirectiveNames = true;
             scheduleProgramUpdate();
         };
+        compilerHost.fileIsOpen = ts.returnFalse;
         compilerHost.maxNumberOfFilesToIterateForInvalidation = host.maxNumberOfFilesToIterateForInvalidation;
         compilerHost.getCurrentProgram = getCurrentProgram;
         compilerHost.writeLog = writeLog;
@@ -92951,7 +95755,7 @@ var ts;
             (function (typeDirectiveNames, containingFile, redirectedReference) { return host.resolveTypeReferenceDirectives(typeDirectiveNames, containingFile, redirectedReference); }) :
             (function (typeDirectiveNames, containingFile, redirectedReference) { return resolutionCache.resolveTypeReferenceDirectives(typeDirectiveNames, containingFile, redirectedReference); });
         var userProvidedResolution = !!host.resolveModuleNames || !!host.resolveTypeReferenceDirectives;
-        builderProgram = ts.readBuilderProgram(compilerOptions, function (path) { return compilerHost.readFile(path); });
+        builderProgram = readBuilderProgram(compilerOptions, compilerHost);
         synchronizeProgram();
         // Update the wild card directory watch
         watchConfigFileWildCardDirectories();
@@ -93282,31 +96086,9 @@ var ts;
     }
     ts.createWatchProgram = createWatchProgram;
 })(ts || (ts = {}));
-// Currently we do not want to expose API for build, we should work out the API, and then expose it just like we did for builder/watch
 /*@internal*/
 var ts;
 (function (ts) {
-    var minimumDate = new Date(-8640000000000000);
-    var maximumDate = new Date(8640000000000000);
-    var BuildResultFlags;
-    (function (BuildResultFlags) {
-        BuildResultFlags[BuildResultFlags["None"] = 0] = "None";
-        /**
-         * No errors of any kind occurred during build
-         */
-        BuildResultFlags[BuildResultFlags["Success"] = 1] = "Success";
-        /**
-         * None of the .d.ts files emitted by this build were
-         * different from the existing files on disk
-         */
-        BuildResultFlags[BuildResultFlags["DeclarationOutputUnchanged"] = 2] = "DeclarationOutputUnchanged";
-        BuildResultFlags[BuildResultFlags["ConfigFileErrors"] = 4] = "ConfigFileErrors";
-        BuildResultFlags[BuildResultFlags["SyntaxErrors"] = 8] = "SyntaxErrors";
-        BuildResultFlags[BuildResultFlags["TypeErrors"] = 16] = "TypeErrors";
-        BuildResultFlags[BuildResultFlags["DeclarationEmitErrors"] = 32] = "DeclarationEmitErrors";
-        BuildResultFlags[BuildResultFlags["EmitErrors"] = 64] = "EmitErrors";
-        BuildResultFlags[BuildResultFlags["AnyErrors"] = 124] = "AnyErrors";
-    })(BuildResultFlags || (BuildResultFlags = {}));
     var UpToDateStatusType;
     (function (UpToDateStatusType) {
         UpToDateStatusType[UpToDateStatusType["Unbuildable"] = 0] = "Unbuildable";
@@ -93335,101 +96117,51 @@ var ts;
          */
         UpToDateStatusType[UpToDateStatusType["ContainerOnly"] = 11] = "ContainerOnly";
     })(UpToDateStatusType = ts.UpToDateStatusType || (ts.UpToDateStatusType = {}));
-    function createFileMap(toPath) {
-        // tslint:disable-next-line:no-null-keyword
-        var lookup = ts.createMap();
-        return {
-            setValue: setValue,
-            getValue: getValue,
-            removeKey: removeKey,
-            forEach: forEach,
-            hasKey: hasKey,
-            getSize: getSize,
-            clear: clear
-        };
-        function forEach(action) {
-            lookup.forEach(action);
-        }
-        function hasKey(fileName) {
-            return lookup.has(toPath(fileName));
-        }
-        function removeKey(fileName) {
-            lookup.delete(toPath(fileName));
-        }
-        function setValue(fileName, value) {
-            lookup.set(toPath(fileName), value);
-        }
-        function getValue(fileName) {
-            return lookup.get(toPath(fileName));
-        }
-        function getSize() {
-            return lookup.size;
-        }
-        function clear() {
-            lookup.clear();
+    function resolveConfigFileProjectName(project) {
+        if (ts.fileExtensionIs(project, ".json" /* Json */)) {
+            return project;
         }
+        return ts.combinePaths(project, "tsconfig.json");
+    }
+    ts.resolveConfigFileProjectName = resolveConfigFileProjectName;
+})(ts || (ts = {}));
+(function (ts) {
+    var minimumDate = new Date(-8640000000000000);
+    var maximumDate = new Date(8640000000000000);
+    var BuildResultFlags;
+    (function (BuildResultFlags) {
+        BuildResultFlags[BuildResultFlags["None"] = 0] = "None";
+        /**
+         * No errors of any kind occurred during build
+         */
+        BuildResultFlags[BuildResultFlags["Success"] = 1] = "Success";
+        /**
+         * None of the .d.ts files emitted by this build were
+         * different from the existing files on disk
+         */
+        BuildResultFlags[BuildResultFlags["DeclarationOutputUnchanged"] = 2] = "DeclarationOutputUnchanged";
+        BuildResultFlags[BuildResultFlags["ConfigFileErrors"] = 4] = "ConfigFileErrors";
+        BuildResultFlags[BuildResultFlags["SyntaxErrors"] = 8] = "SyntaxErrors";
+        BuildResultFlags[BuildResultFlags["TypeErrors"] = 16] = "TypeErrors";
+        BuildResultFlags[BuildResultFlags["DeclarationEmitErrors"] = 32] = "DeclarationEmitErrors";
+        BuildResultFlags[BuildResultFlags["EmitErrors"] = 64] = "EmitErrors";
+        BuildResultFlags[BuildResultFlags["AnyErrors"] = 124] = "AnyErrors";
+    })(BuildResultFlags || (BuildResultFlags = {}));
+    function createConfigFileMap() {
+        return ts.createMap();
     }
     function getOrCreateValueFromConfigFileMap(configFileMap, resolved, createT) {
-        var existingValue = configFileMap.getValue(resolved);
+        var existingValue = configFileMap.get(resolved);
         var newValue;
         if (!existingValue) {
             newValue = createT();
-            configFileMap.setValue(resolved, newValue);
+            configFileMap.set(resolved, newValue);
         }
         return existingValue || newValue;
     }
     function getOrCreateValueMapFromConfigFileMap(configFileMap, resolved) {
         return getOrCreateValueFromConfigFileMap(configFileMap, resolved, ts.createMap);
     }
-    function getOutputDeclarationFileName(inputFileName, configFile) {
-        var relativePath = ts.getRelativePathFromDirectory(rootDirOfOptions(configFile.options, configFile.options.configFilePath), inputFileName, /*ignoreCase*/ true);
-        var outputPath = ts.resolvePath(configFile.options.declarationDir || configFile.options.outDir || ts.getDirectoryPath(configFile.options.configFilePath), relativePath);
-        return ts.changeExtension(outputPath, ".d.ts" /* Dts */);
-    }
-    ts.getOutputDeclarationFileName = getOutputDeclarationFileName;
-    function getOutputJSFileName(inputFileName, configFile) {
-        var relativePath = ts.getRelativePathFromDirectory(rootDirOfOptions(configFile.options, configFile.options.configFilePath), inputFileName, /*ignoreCase*/ true);
-        var outputPath = ts.resolvePath(configFile.options.outDir || ts.getDirectoryPath(configFile.options.configFilePath), relativePath);
-        var newExtension = ts.fileExtensionIs(inputFileName, ".json" /* Json */) ? ".json" /* Json */ :
-            ts.fileExtensionIs(inputFileName, ".tsx" /* Tsx */) && configFile.options.jsx === 1 /* Preserve */ ? ".jsx" /* Jsx */ : ".js" /* Js */;
-        return ts.changeExtension(outputPath, newExtension);
-    }
-    function getOutputFileNames(inputFileName, configFile) {
-        // outFile is handled elsewhere; .d.ts files don't generate outputs
-        if (configFile.options.outFile || configFile.options.out || ts.fileExtensionIs(inputFileName, ".d.ts" /* Dts */)) {
-            return ts.emptyArray;
-        }
-        var outputs = [];
-        var js = getOutputJSFileName(inputFileName, configFile);
-        outputs.push(js);
-        if (configFile.options.sourceMap) {
-            outputs.push(js + ".map");
-        }
-        if (ts.getEmitDeclarations(configFile.options) && !ts.fileExtensionIs(inputFileName, ".json" /* Json */)) {
-            var dts = getOutputDeclarationFileName(inputFileName, configFile);
-            outputs.push(dts);
-            if (configFile.options.declarationMap) {
-                outputs.push(dts + ".map");
-            }
-        }
-        return outputs;
-    }
-    function getOutFileOutputs(project, ignoreBuildInfo) {
-        ts.Debug.assert(!!project.options.outFile || !!project.options.out, "outFile must be set");
-        var _a = ts.getOutputPathsForBundle(project.options, /*forceDtsPaths*/ false), jsFilePath = _a.jsFilePath, sourceMapFilePath = _a.sourceMapFilePath, declarationFilePath = _a.declarationFilePath, declarationMapPath = _a.declarationMapPath, buildInfoPath = _a.buildInfoPath;
-        var outputs = [];
-        var addOutput = function (path) { return path && (outputs || (outputs = [])).push(path); };
-        addOutput(jsFilePath);
-        addOutput(sourceMapFilePath);
-        addOutput(declarationFilePath);
-        addOutput(declarationMapPath);
-        if (!ignoreBuildInfo)
-            addOutput(buildInfoPath);
-        return outputs || ts.emptyArray;
-    }
-    function rootDirOfOptions(opts, configFileName) {
-        return opts.rootDir || ts.getDirectoryPath(configFileName);
-    }
     function newer(date1, date2) {
         return date2 > date1 ? date2 : date1;
     }
@@ -93449,7 +96181,7 @@ var ts;
     ts.createBuilderStatusReporter = createBuilderStatusReporter;
     function createSolutionBuilderHostBase(system, createProgram, reportDiagnostic, reportSolutionBuilderStatus) {
         var host = ts.createProgramHost(system, createProgram);
-        host.getModifiedTime = system.getModifiedTime ? function (path) { return system.getModifiedTime(path); } : function () { return undefined; };
+        host.getModifiedTime = system.getModifiedTime ? function (path) { return system.getModifiedTime(path); } : ts.returnUndefined;
         host.setModifiedTime = system.setModifiedTime ? function (path, date) { return system.setModifiedTime(path, date); } : ts.noop;
         host.deleteFile = system.deleteFile ? function (path) { return system.deleteFile(path); } : ts.noop;
         host.reportDiagnostic = reportDiagnostic || ts.createDiagnosticReporter(system);
@@ -93474,644 +96206,459 @@ var ts;
     function getCompilerOptionsOfBuildOptions(buildOptions) {
         var result = {};
         ts.commonOptionsWithBuild.forEach(function (option) {
-            result[option.name] = buildOptions[option.name];
+            if (ts.hasProperty(buildOptions, option.name))
+                result[option.name] = buildOptions[option.name];
         });
         return result;
     }
     function createSolutionBuilder(host, rootNames, defaultOptions) {
-        var hostWithWatch = host;
+        return createSolutionBuilderWorker(/*watch*/ false, host, rootNames, defaultOptions);
+    }
+    ts.createSolutionBuilder = createSolutionBuilder;
+    function createSolutionBuilderWithWatch(host, rootNames, defaultOptions) {
+        return createSolutionBuilderWorker(/*watch*/ true, host, rootNames, defaultOptions);
+    }
+    ts.createSolutionBuilderWithWatch = createSolutionBuilderWithWatch;
+    function createSolutionBuilderState(watch, hostOrHostWithWatch, rootNames, options) {
+        var host = hostOrHostWithWatch;
+        var hostWithWatch = hostOrHostWithWatch;
         var currentDirectory = host.getCurrentDirectory();
         var getCanonicalFileName = ts.createGetCanonicalFileName(host.useCaseSensitiveFileNames());
-        var parseConfigFileHost = ts.parseConfigHostFromCompilerHostLike(host);
         // State of the solution
-        var options = defaultOptions;
         var baseCompilerOptions = getCompilerOptionsOfBuildOptions(options);
-        var configFileCache = createFileMap(toPath);
-        /** Map from output file name to its pre-build timestamp */
-        var unchangedOutputs = createFileMap(toPath);
-        /** Map from config file name to up-to-date status */
-        var projectStatus = createFileMap(toPath);
-        var missingRoots = ts.createMap();
-        var globalDependencyGraph;
-        var writeFileName = function (s) { return host.trace && host.trace(s); };
-        var readFileWithCache = function (f) { return host.readFile(f); };
-        var projectCompilerOptions = baseCompilerOptions;
-        var compilerHost = ts.createCompilerHostFromProgramHost(host, function () { return projectCompilerOptions; });
-        ts.setCreateSourceFileAsHashVersioned(compilerHost, host);
-        var buildInfoChecked = createFileMap(toPath);
-        // Watch state
-        var builderPrograms = createFileMap(toPath);
-        var diagnostics = createFileMap(toPath);
-        var projectPendingBuild = createFileMap(toPath);
-        var projectErrorsReported = createFileMap(toPath);
-        var invalidatedProjectQueue = [];
-        var nextProjectToBuild = 0;
-        var timerToBuildInvalidatedProject;
-        var reportFileChangeDetected = false;
-        var _a = ts.createWatchFactory(host, options), watchFile = _a.watchFile, watchFilePath = _a.watchFilePath, watchDirectory = _a.watchDirectory, writeLog = _a.writeLog;
-        // Watches for the solution
-        var allWatchedWildcardDirectories = createFileMap(toPath);
-        var allWatchedInputFiles = createFileMap(toPath);
-        var allWatchedConfigFiles = createFileMap(toPath);
-        return {
-            buildAllProjects: buildAllProjects,
-            getUpToDateStatusOfFile: getUpToDateStatusOfFile,
-            cleanAllProjects: cleanAllProjects,
-            resetBuildContext: resetBuildContext,
-            getBuildGraph: getBuildGraph,
-            invalidateProject: invalidateProject,
-            buildInvalidatedProject: buildInvalidatedProject,
-            resolveProjectName: resolveProjectName,
-            startWatching: startWatching
+        var compilerHost = ts.createCompilerHostFromProgramHost(host, function () { return state.projectCompilerOptions; });
+        ts.setGetSourceFileAsHashVersioned(compilerHost, host);
+        compilerHost.getParsedCommandLine = function (fileName) { return parseConfigFile(state, fileName, toResolvedConfigFilePath(state, fileName)); };
+        compilerHost.resolveModuleNames = ts.maybeBind(host, host.resolveModuleNames);
+        compilerHost.resolveTypeReferenceDirectives = ts.maybeBind(host, host.resolveTypeReferenceDirectives);
+        var moduleResolutionCache = !compilerHost.resolveModuleNames ? ts.createModuleResolutionCache(currentDirectory, getCanonicalFileName) : undefined;
+        if (!compilerHost.resolveModuleNames) {
+            var loader_3 = function (moduleName, containingFile, redirectedReference) { return ts.resolveModuleName(moduleName, containingFile, state.projectCompilerOptions, compilerHost, moduleResolutionCache, redirectedReference).resolvedModule; };
+            compilerHost.resolveModuleNames = function (moduleNames, containingFile, _reusedNames, redirectedReference) {
+                return ts.loadWithLocalCache(ts.Debug.assertEachDefined(moduleNames), containingFile, redirectedReference, loader_3);
+            };
+        }
+        var _a = ts.createWatchFactory(hostWithWatch, options), watchFile = _a.watchFile, watchFilePath = _a.watchFilePath, watchDirectory = _a.watchDirectory, writeLog = _a.writeLog;
+        var state = {
+            host: host,
+            hostWithWatch: hostWithWatch,
+            currentDirectory: currentDirectory,
+            getCanonicalFileName: getCanonicalFileName,
+            parseConfigFileHost: ts.parseConfigHostFromCompilerHostLike(host),
+            writeFileName: host.trace ? function (s) { return host.trace(s); } : undefined,
+            // State of solution
+            options: options,
+            baseCompilerOptions: baseCompilerOptions,
+            rootNames: rootNames,
+            resolvedConfigFilePaths: ts.createMap(),
+            configFileCache: createConfigFileMap(),
+            projectStatus: createConfigFileMap(),
+            buildInfoChecked: createConfigFileMap(),
+            extendedConfigCache: ts.createMap(),
+            builderPrograms: createConfigFileMap(),
+            diagnostics: createConfigFileMap(),
+            projectPendingBuild: createConfigFileMap(),
+            projectErrorsReported: createConfigFileMap(),
+            compilerHost: compilerHost,
+            moduleResolutionCache: moduleResolutionCache,
+            // Mutable state
+            buildOrder: undefined,
+            readFileWithCache: function (f) { return host.readFile(f); },
+            projectCompilerOptions: baseCompilerOptions,
+            cache: undefined,
+            allProjectBuildPending: true,
+            needsSummary: true,
+            watchAllProjectsPending: watch,
+            currentInvalidatedProject: undefined,
+            // Watch state
+            watch: watch,
+            allWatchedWildcardDirectories: createConfigFileMap(),
+            allWatchedInputFiles: createConfigFileMap(),
+            allWatchedConfigFiles: createConfigFileMap(),
+            timerToBuildInvalidatedProject: undefined,
+            reportFileChangeDetected: false,
+            watchFile: watchFile,
+            watchFilePath: watchFilePath,
+            watchDirectory: watchDirectory,
+            writeLog: writeLog,
         };
-        function toPath(fileName) {
-            return ts.toPath(fileName, currentDirectory, getCanonicalFileName);
+        return state;
+    }
+    function toPath(state, fileName) {
+        return ts.toPath(fileName, state.currentDirectory, state.getCanonicalFileName);
+    }
+    function toResolvedConfigFilePath(state, fileName) {
+        var resolvedConfigFilePaths = state.resolvedConfigFilePaths;
+        var path = resolvedConfigFilePaths.get(fileName);
+        if (path !== undefined)
+            return path;
+        var resolvedPath = toPath(state, fileName);
+        resolvedConfigFilePaths.set(fileName, resolvedPath);
+        return resolvedPath;
+    }
+    function isParsedCommandLine(entry) {
+        return !!entry.options;
+    }
+    function parseConfigFile(state, configFileName, configFilePath) {
+        var configFileCache = state.configFileCache;
+        var value = configFileCache.get(configFilePath);
+        if (value) {
+            return isParsedCommandLine(value) ? value : undefined;
         }
-        function resetBuildContext(opts) {
-            if (opts === void 0) { opts = defaultOptions; }
-            options = opts;
-            baseCompilerOptions = getCompilerOptionsOfBuildOptions(options);
-            configFileCache.clear();
-            unchangedOutputs.clear();
-            projectStatus.clear();
-            missingRoots.clear();
-            globalDependencyGraph = undefined;
-            buildInfoChecked.clear();
-            diagnostics.clear();
-            projectPendingBuild.clear();
-            projectErrorsReported.clear();
-            invalidatedProjectQueue.length = 0;
-            nextProjectToBuild = 0;
-            if (timerToBuildInvalidatedProject) {
-                clearTimeout(timerToBuildInvalidatedProject);
-                timerToBuildInvalidatedProject = undefined;
-            }
-            reportFileChangeDetected = false;
-            ts.clearMap(allWatchedWildcardDirectories, function (wildCardWatches) { return ts.clearMap(wildCardWatches, ts.closeFileWatcherOf); });
-            ts.clearMap(allWatchedInputFiles, function (inputFileWatches) { return ts.clearMap(inputFileWatches, ts.closeFileWatcher); });
-            ts.clearMap(allWatchedConfigFiles, ts.closeFileWatcher);
-            builderPrograms.clear();
+        var diagnostic;
+        var parseConfigFileHost = state.parseConfigFileHost, baseCompilerOptions = state.baseCompilerOptions, extendedConfigCache = state.extendedConfigCache, host = state.host;
+        var parsed;
+        if (host.getParsedCommandLine) {
+            parsed = host.getParsedCommandLine(configFileName);
+            if (!parsed)
+                diagnostic = ts.createCompilerDiagnostic(ts.Diagnostics.File_0_not_found, configFileName);
         }
-        function isParsedCommandLine(entry) {
-            return !!entry.options;
-        }
-        function parseConfigFile(configFilePath) {
-            var value = configFileCache.getValue(configFilePath);
-            if (value) {
-                return isParsedCommandLine(value) ? value : undefined;
-            }
-            var diagnostic;
+        else {
             parseConfigFileHost.onUnRecoverableConfigFileDiagnostic = function (d) { return diagnostic = d; };
-            var parsed = ts.getParsedCommandLineOfConfigFile(configFilePath, baseCompilerOptions, parseConfigFileHost);
+            parsed = ts.getParsedCommandLineOfConfigFile(configFileName, baseCompilerOptions, parseConfigFileHost, extendedConfigCache);
             parseConfigFileHost.onUnRecoverableConfigFileDiagnostic = ts.noop;
-            configFileCache.setValue(configFilePath, parsed || diagnostic);
-            return parsed;
         }
-        function reportStatus(message) {
+        configFileCache.set(configFilePath, parsed || diagnostic);
+        return parsed;
+    }
+    function resolveProjectName(state, name) {
+        return ts.resolveConfigFileProjectName(ts.resolvePath(state.currentDirectory, name));
+    }
+    function createBuildOrder(state, roots) {
+        var temporaryMarks = ts.createMap();
+        var permanentMarks = ts.createMap();
+        var circularityReportStack = [];
+        var buildOrder;
+        for (var _i = 0, roots_1 = roots; _i < roots_1.length; _i++) {
+            var root = roots_1[_i];
+            visit(root);
+        }
+        return buildOrder || ts.emptyArray;
+        function visit(configFileName, inCircularContext) {
+            var projPath = toResolvedConfigFilePath(state, configFileName);
+            // Already visited
+            if (permanentMarks.has(projPath))
+                return;
+            // Circular
+            if (temporaryMarks.has(projPath)) {
+                if (!inCircularContext) {
+                    // TODO:: Do we report this as error?
+                    reportStatus(state, ts.Diagnostics.Project_references_may_not_form_a_circular_graph_Cycle_detected_Colon_0, circularityReportStack.join("\r\n"));
+                }
+                return;
+            }
+            temporaryMarks.set(projPath, true);
+            circularityReportStack.push(configFileName);
+            var parsed = parseConfigFile(state, configFileName, projPath);
+            if (parsed && parsed.projectReferences) {
+                for (var _i = 0, _a = parsed.projectReferences; _i < _a.length; _i++) {
+                    var ref = _a[_i];
+                    var resolvedRefPath = resolveProjectName(state, ref.path);
+                    visit(resolvedRefPath, inCircularContext || ref.circular);
+                }
+            }
+            circularityReportStack.pop();
+            permanentMarks.set(projPath, true);
+            (buildOrder || (buildOrder = [])).push(configFileName);
+        }
+    }
+    function getBuildOrder(state) {
+        return state.buildOrder ||
+            (state.buildOrder = createBuildOrder(state, state.rootNames.map(function (f) { return resolveProjectName(state, f); })));
+    }
+    function getBuildOrderFor(state, project, onlyReferences) {
+        var resolvedProject = project && resolveProjectName(state, project);
+        var buildOrderFromState = getBuildOrder(state);
+        if (resolvedProject) {
+            var projectPath_1 = toResolvedConfigFilePath(state, resolvedProject);
+            var projectIndex = ts.findIndex(buildOrderFromState, function (configFileName) { return toResolvedConfigFilePath(state, configFileName) === projectPath_1; });
+            if (projectIndex === -1)
+                return undefined;
+        }
+        var buildOrder = resolvedProject ? createBuildOrder(state, [resolvedProject]) : buildOrderFromState;
+        ts.Debug.assert(!onlyReferences || resolvedProject !== undefined);
+        ts.Debug.assert(!onlyReferences || buildOrder[buildOrder.length - 1] === resolvedProject);
+        return onlyReferences ? buildOrder.slice(0, buildOrder.length - 1) : buildOrder;
+    }
+    function enableCache(state) {
+        if (state.cache) {
+            disableCache(state);
+        }
+        var compilerHost = state.compilerHost, host = state.host;
+        var originalReadFileWithCache = state.readFileWithCache;
+        var originalGetSourceFile = compilerHost.getSourceFile;
+        var _a = ts.changeCompilerHostLikeToUseCache(host, function (fileName) { return toPath(state, fileName); }, function () {
             var args = [];
-            for (var _i = 1; _i < arguments.length; _i++) {
-                args[_i - 1] = arguments[_i];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                args[_i] = arguments[_i];
             }
-            host.reportSolutionBuilderStatus(ts.createCompilerDiagnostic.apply(void 0, [message].concat(args)));
+            return originalGetSourceFile.call.apply(originalGetSourceFile, [compilerHost].concat(args));
+        }), originalReadFile = _a.originalReadFile, originalFileExists = _a.originalFileExists, originalDirectoryExists = _a.originalDirectoryExists, originalCreateDirectory = _a.originalCreateDirectory, originalWriteFile = _a.originalWriteFile, getSourceFileWithCache = _a.getSourceFileWithCache, readFileWithCache = _a.readFileWithCache;
+        state.readFileWithCache = readFileWithCache;
+        compilerHost.getSourceFile = getSourceFileWithCache;
+        state.cache = {
+            originalReadFile: originalReadFile,
+            originalFileExists: originalFileExists,
+            originalDirectoryExists: originalDirectoryExists,
+            originalCreateDirectory: originalCreateDirectory,
+            originalWriteFile: originalWriteFile,
+            originalReadFileWithCache: originalReadFileWithCache,
+            originalGetSourceFile: originalGetSourceFile,
+        };
+    }
+    function disableCache(state) {
+        if (!state.cache)
+            return;
+        var cache = state.cache, host = state.host, compilerHost = state.compilerHost, extendedConfigCache = state.extendedConfigCache, moduleResolutionCache = state.moduleResolutionCache;
+        host.readFile = cache.originalReadFile;
+        host.fileExists = cache.originalFileExists;
+        host.directoryExists = cache.originalDirectoryExists;
+        host.createDirectory = cache.originalCreateDirectory;
+        host.writeFile = cache.originalWriteFile;
+        compilerHost.getSourceFile = cache.originalGetSourceFile;
+        state.readFileWithCache = cache.originalReadFileWithCache;
+        extendedConfigCache.clear();
+        if (moduleResolutionCache) {
+            moduleResolutionCache.directoryToModuleNameMap.clear();
+            moduleResolutionCache.moduleNameToDirectoryMap.clear();
         }
-        function reportWatchStatus(message) {
-            var args = [];
-            for (var _i = 1; _i < arguments.length; _i++) {
-                args[_i - 1] = arguments[_i];
-            }
-            if (hostWithWatch.onWatchStatusChange) {
-                hostWithWatch.onWatchStatusChange(ts.createCompilerDiagnostic.apply(void 0, [message].concat(args)), host.getNewLine(), baseCompilerOptions);
-            }
+        state.cache = undefined;
+    }
+    function clearProjectStatus(state, resolved) {
+        state.projectStatus.delete(resolved);
+        state.diagnostics.delete(resolved);
+    }
+    function addProjToQueue(_a, proj, reloadLevel) {
+        var projectPendingBuild = _a.projectPendingBuild;
+        var value = projectPendingBuild.get(proj);
+        if (value === undefined) {
+            projectPendingBuild.set(proj, reloadLevel);
         }
-        function startWatching() {
-            var graph = getGlobalDependencyGraph();
-            for (var _i = 0, _a = graph.buildQueue; _i < _a.length; _i++) {
-                var resolved = _a[_i];
-                // Watch this file
-                watchConfigFile(resolved);
-                var cfg = parseConfigFile(resolved);
-                if (cfg) {
-                    // Update watchers for wildcard directories
-                    watchWildCardDirectories(resolved, cfg);
-                    // Watch input files
-                    watchInputFiles(resolved, cfg);
+        else if (value < reloadLevel) {
+            projectPendingBuild.set(proj, reloadLevel);
+        }
+    }
+    function setupInitialBuild(state, cancellationToken) {
+        // Set initial build if not already built
+        if (!state.allProjectBuildPending)
+            return;
+        state.allProjectBuildPending = false;
+        if (state.options.watch) {
+            reportWatchStatus(state, ts.Diagnostics.Starting_compilation_in_watch_mode);
+        }
+        enableCache(state);
+        var buildOrder = getBuildOrder(state);
+        buildOrder.forEach(function (configFileName) {
+            return state.projectPendingBuild.set(toResolvedConfigFilePath(state, configFileName), ts.ConfigFileProgramReloadLevel.None);
+        });
+        if (cancellationToken) {
+            cancellationToken.throwIfCancellationRequested();
+        }
+    }
+    var InvalidatedProjectKind;
+    (function (InvalidatedProjectKind) {
+        InvalidatedProjectKind[InvalidatedProjectKind["Build"] = 0] = "Build";
+        InvalidatedProjectKind[InvalidatedProjectKind["UpdateBundle"] = 1] = "UpdateBundle";
+        InvalidatedProjectKind[InvalidatedProjectKind["UpdateOutputFileStamps"] = 2] = "UpdateOutputFileStamps";
+    })(InvalidatedProjectKind = ts.InvalidatedProjectKind || (ts.InvalidatedProjectKind = {}));
+    function doneInvalidatedProject(state, projectPath) {
+        state.projectPendingBuild.delete(projectPath);
+        state.currentInvalidatedProject = undefined;
+        return state.diagnostics.has(projectPath) ?
+            ts.ExitStatus.DiagnosticsPresent_OutputsSkipped :
+            ts.ExitStatus.Success;
+    }
+    function createUpdateOutputFileStampsProject(state, project, projectPath, config, buildOrder) {
+        var updateOutputFileStampsPending = true;
+        return {
+            kind: InvalidatedProjectKind.UpdateOutputFileStamps,
+            project: project,
+            projectPath: projectPath,
+            buildOrder: buildOrder,
+            getCompilerOptions: function () { return config.options; },
+            getCurrentDirectory: function () { return state.currentDirectory; },
+            updateOutputFileStatmps: function () {
+                updateOutputTimestamps(state, config, projectPath);
+                updateOutputFileStampsPending = false;
+            },
+            done: function () {
+                if (updateOutputFileStampsPending) {
+                    updateOutputTimestamps(state, config, projectPath);
                 }
+                return doneInvalidatedProject(state, projectPath);
             }
-        }
-        function watchConfigFile(resolved) {
-            if (options.watch && !allWatchedConfigFiles.hasKey(resolved)) {
-                allWatchedConfigFiles.setValue(resolved, watchFile(hostWithWatch, resolved, function () {
-                    invalidateProjectAndScheduleBuilds(resolved, ts.ConfigFileProgramReloadLevel.Full);
-                }, ts.PollingInterval.High, "Config file" /* ConfigFile */, resolved));
-            }
-        }
-        function watchWildCardDirectories(resolved, parsed) {
-            if (!options.watch)
-                return;
-            ts.updateWatchingWildcardDirectories(getOrCreateValueMapFromConfigFileMap(allWatchedWildcardDirectories, resolved), ts.createMapFromTemplate(parsed.configFileSpecs.wildcardDirectories), function (dir, flags) {
-                return watchDirectory(hostWithWatch, dir, function (fileOrDirectory) {
-                    var fileOrDirectoryPath = toPath(fileOrDirectory);
-                    if (fileOrDirectoryPath !== toPath(dir) && ts.hasExtension(fileOrDirectoryPath) && !ts.isSupportedSourceFileName(fileOrDirectory, parsed.options)) {
-                        writeLog("Project: " + resolved + " Detected file add/remove of non supported extension: " + fileOrDirectory);
-                        return;
+        };
+    }
+    function createBuildOrUpdateInvalidedProject(kind, state, project, projectPath, projectIndex, config, buildOrder) {
+        var Step;
+        (function (Step) {
+            Step[Step["CreateProgram"] = 0] = "CreateProgram";
+            Step[Step["SyntaxDiagnostics"] = 1] = "SyntaxDiagnostics";
+            Step[Step["SemanticDiagnostics"] = 2] = "SemanticDiagnostics";
+            Step[Step["Emit"] = 3] = "Emit";
+            Step[Step["EmitBundle"] = 4] = "EmitBundle";
+            Step[Step["BuildInvalidatedProjectOfBundle"] = 5] = "BuildInvalidatedProjectOfBundle";
+            Step[Step["QueueReferencingProjects"] = 6] = "QueueReferencingProjects";
+            Step[Step["Done"] = 7] = "Done";
+        })(Step || (Step = {}));
+        var step = kind === InvalidatedProjectKind.Build ? Step.CreateProgram : Step.EmitBundle;
+        var program;
+        var buildResult;
+        var invalidatedProjectOfBundle;
+        return kind === InvalidatedProjectKind.Build ?
+            {
+                kind: kind,
+                project: project,
+                projectPath: projectPath,
+                buildOrder: buildOrder,
+                getCompilerOptions: function () { return config.options; },
+                getCurrentDirectory: function () { return state.currentDirectory; },
+                getBuilderProgram: function () { return withProgramOrUndefined(ts.identity); },
+                getProgram: function () {
+                    return withProgramOrUndefined(function (program) { return program.getProgramOrUndefined(); });
+                },
+                getSourceFile: function (fileName) {
+                    return withProgramOrUndefined(function (program) { return program.getSourceFile(fileName); });
+                },
+                getSourceFiles: function () {
+                    return withProgramOrEmptyArray(function (program) { return program.getSourceFiles(); });
+                },
+                getOptionsDiagnostics: function (cancellationToken) {
+                    return withProgramOrEmptyArray(function (program) { return program.getOptionsDiagnostics(cancellationToken); });
+                },
+                getGlobalDiagnostics: function (cancellationToken) {
+                    return withProgramOrEmptyArray(function (program) { return program.getGlobalDiagnostics(cancellationToken); });
+                },
+                getConfigFileParsingDiagnostics: function () {
+                    return withProgramOrEmptyArray(function (program) { return program.getConfigFileParsingDiagnostics(); });
+                },
+                getSyntacticDiagnostics: function (sourceFile, cancellationToken) {
+                    return withProgramOrEmptyArray(function (program) { return program.getSyntacticDiagnostics(sourceFile, cancellationToken); });
+                },
+                getAllDependencies: function (sourceFile) {
+                    return withProgramOrEmptyArray(function (program) { return program.getAllDependencies(sourceFile); });
+                },
+                getSemanticDiagnostics: function (sourceFile, cancellationToken) {
+                    return withProgramOrEmptyArray(function (program) { return program.getSemanticDiagnostics(sourceFile, cancellationToken); });
+                },
+                getSemanticDiagnosticsOfNextAffectedFile: function (cancellationToken, ignoreSourceFile) {
+                    return withProgramOrUndefined(function (program) {
+                        return (program.getSemanticDiagnosticsOfNextAffectedFile) &&
+                            program.getSemanticDiagnosticsOfNextAffectedFile(cancellationToken, ignoreSourceFile);
+                    });
+                },
+                emit: function (targetSourceFile, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers) {
+                    if (targetSourceFile || emitOnlyDtsFiles) {
+                        return withProgramOrUndefined(function (program) { return program.emit(targetSourceFile, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers); });
                     }
-                    if (isOutputFile(fileOrDirectory, parsed)) {
-                        writeLog(fileOrDirectory + " is output file");
-                        return;
-                    }
-                    invalidateProjectAndScheduleBuilds(resolved, ts.ConfigFileProgramReloadLevel.Partial);
-                }, flags, "Wild card directory" /* WildcardDirectory */, resolved);
-            });
-        }
-        function watchInputFiles(resolved, parsed) {
-            if (!options.watch)
-                return;
-            ts.mutateMap(getOrCreateValueMapFromConfigFileMap(allWatchedInputFiles, resolved), ts.arrayToMap(parsed.fileNames, toPath), {
-                createNewValue: function (path, input) { return watchFilePath(hostWithWatch, input, function () { return invalidateProjectAndScheduleBuilds(resolved, ts.ConfigFileProgramReloadLevel.None); }, ts.PollingInterval.Low, path, "Source file" /* SourceFile */, resolved); },
-                onDeleteValue: ts.closeFileWatcher,
-            });
-        }
-        function isOutputFile(fileName, configFile) {
-            if (configFile.options.noEmit)
-                return false;
-            // ts or tsx files are not output
-            if (!ts.fileExtensionIs(fileName, ".d.ts" /* Dts */) &&
-                (ts.fileExtensionIs(fileName, ".ts" /* Ts */) || ts.fileExtensionIs(fileName, ".tsx" /* Tsx */))) {
-                return false;
-            }
-            // If options have --outFile or --out, check if its that
-            var out = configFile.options.outFile || configFile.options.out;
-            if (out && (isSameFile(fileName, out) || isSameFile(fileName, ts.removeFileExtension(out) + ".d.ts" /* Dts */))) {
-                return true;
-            }
-            // If declarationDir is specified, return if its a file in that directory
-            if (configFile.options.declarationDir && ts.containsPath(configFile.options.declarationDir, fileName, currentDirectory, !host.useCaseSensitiveFileNames())) {
-                return true;
-            }
-            // If --outDir, check if file is in that directory
-            if (configFile.options.outDir && ts.containsPath(configFile.options.outDir, fileName, currentDirectory, !host.useCaseSensitiveFileNames())) {
-                return true;
-            }
-            return !ts.forEach(configFile.fileNames, function (inputFile) { return isSameFile(fileName, inputFile); });
-        }
-        function isSameFile(file1, file2) {
-            return ts.comparePaths(file1, file2, currentDirectory, !host.useCaseSensitiveFileNames()) === 0 /* EqualTo */;
-        }
-        function invalidateProjectAndScheduleBuilds(resolved, reloadLevel) {
-            reportFileChangeDetected = true;
-            invalidateResolvedProject(resolved, reloadLevel);
-            scheduleBuildInvalidatedProject();
-        }
-        function getUpToDateStatusOfFile(configFileName) {
-            return getUpToDateStatus(parseConfigFile(configFileName));
-        }
-        function getBuildGraph(configFileNames) {
-            return createDependencyGraph(resolveProjectNames(configFileNames));
-        }
-        function getGlobalDependencyGraph() {
-            return globalDependencyGraph || (globalDependencyGraph = getBuildGraph(rootNames));
-        }
-        function getUpToDateStatus(project) {
-            if (project === undefined) {
-                return { type: UpToDateStatusType.Unbuildable, reason: "File deleted mid-build" };
-            }
-            var prior = projectStatus.getValue(project.options.configFilePath);
-            if (prior !== undefined) {
-                return prior;
-            }
-            var actual = getUpToDateStatusWorker(project);
-            projectStatus.setValue(project.options.configFilePath, actual);
-            return actual;
-        }
-        function getUpToDateStatusWorker(project) {
-            var newestInputFileName = undefined;
-            var newestInputFileTime = minimumDate;
-            // Get timestamps of input files
-            for (var _i = 0, _a = project.fileNames; _i < _a.length; _i++) {
-                var inputFile = _a[_i];
-                if (!host.fileExists(inputFile)) {
-                    return {
-                        type: UpToDateStatusType.Unbuildable,
-                        reason: inputFile + " does not exist"
-                    };
-                }
-                var inputTime = host.getModifiedTime(inputFile) || ts.missingFileModifiedTime;
-                if (inputTime > newestInputFileTime) {
-                    newestInputFileName = inputFile;
-                    newestInputFileTime = inputTime;
-                }
-            }
-            // Collect the expected outputs of this project
-            var outputs = getAllProjectOutputs(project);
-            if (outputs.length === 0) {
-                return {
-                    type: UpToDateStatusType.ContainerOnly
-                };
-            }
-            // Now see if all outputs are newer than the newest input
-            var oldestOutputFileName = "(none)";
-            var oldestOutputFileTime = maximumDate;
-            var newestOutputFileName = "(none)";
-            var newestOutputFileTime = minimumDate;
-            var missingOutputFileName;
-            var newestDeclarationFileContentChangedTime = minimumDate;
-            var isOutOfDateWithInputs = false;
-            for (var _b = 0, outputs_1 = outputs; _b < outputs_1.length; _b++) {
-                var output = outputs_1[_b];
-                // Output is missing; can stop checking
-                // Don't immediately return because we can still be upstream-blocked, which is a higher-priority status
-                if (!host.fileExists(output)) {
-                    missingOutputFileName = output;
-                    break;
-                }
-                var outputTime = host.getModifiedTime(output) || ts.missingFileModifiedTime;
-                if (outputTime < oldestOutputFileTime) {
-                    oldestOutputFileTime = outputTime;
-                    oldestOutputFileName = output;
-                }
-                // If an output is older than the newest input, we can stop checking
-                // Don't immediately return because we can still be upstream-blocked, which is a higher-priority status
-                if (outputTime < newestInputFileTime) {
-                    isOutOfDateWithInputs = true;
-                    break;
-                }
-                if (outputTime > newestOutputFileTime) {
-                    newestOutputFileTime = outputTime;
-                    newestOutputFileName = output;
-                }
-                // Keep track of when the most recent time a .d.ts file was changed.
-                // In addition to file timestamps, we also keep track of when a .d.ts file
-                // had its file touched but not had its contents changed - this allows us
-                // to skip a downstream typecheck
-                if (isDeclarationFile(output)) {
-                    var unchangedTime = unchangedOutputs.getValue(output);
-                    if (unchangedTime !== undefined) {
-                        newestDeclarationFileContentChangedTime = newer(unchangedTime, newestDeclarationFileContentChangedTime);
-                    }
-                    else {
-                        var outputModifiedTime = host.getModifiedTime(output) || ts.missingFileModifiedTime;
-                        newestDeclarationFileContentChangedTime = newer(newestDeclarationFileContentChangedTime, outputModifiedTime);
-                    }
-                }
-            }
-            var pseudoUpToDate = false;
-            var usesPrepend = false;
-            var upstreamChangedProject;
-            if (project.projectReferences) {
-                projectStatus.setValue(project.options.configFilePath, { type: UpToDateStatusType.ComputingUpstream });
-                for (var _c = 0, _d = project.projectReferences; _c < _d.length; _c++) {
-                    var ref = _d[_c];
-                    usesPrepend = usesPrepend || !!(ref.prepend);
-                    var resolvedRef = ts.resolveProjectReferencePath(ref);
-                    var refStatus = getUpToDateStatus(parseConfigFile(resolvedRef));
-                    // Its a circular reference ignore the status of this project
-                    if (refStatus.type === UpToDateStatusType.ComputingUpstream) {
-                        continue;
-                    }
-                    // An upstream project is blocked
-                    if (refStatus.type === UpToDateStatusType.Unbuildable) {
-                        return {
-                            type: UpToDateStatusType.UpstreamBlocked,
-                            upstreamProjectName: ref.path
-                        };
-                    }
-                    // If the upstream project is out of date, then so are we (someone shouldn't have asked, though?)
-                    if (refStatus.type !== UpToDateStatusType.UpToDate) {
-                        return {
-                            type: UpToDateStatusType.UpstreamOutOfDate,
-                            upstreamProjectName: ref.path
-                        };
-                    }
-                    // Check oldest output file name only if there is no missing output file name
-                    if (!missingOutputFileName) {
-                        // If the upstream project's newest file is older than our oldest output, we
-                        // can't be out of date because of it
-                        if (refStatus.newestInputFileTime && refStatus.newestInputFileTime <= oldestOutputFileTime) {
-                            continue;
-                        }
-                        // If the upstream project has only change .d.ts files, and we've built
-                        // *after* those files, then we're "psuedo up to date" and eligible for a fast rebuild
-                        if (refStatus.newestDeclarationFileContentChangedTime && refStatus.newestDeclarationFileContentChangedTime <= oldestOutputFileTime) {
-                            pseudoUpToDate = true;
-                            upstreamChangedProject = ref.path;
-                            continue;
-                        }
-                        // We have an output older than an upstream output - we are out of date
-                        ts.Debug.assert(oldestOutputFileName !== undefined, "Should have an oldest output filename here");
-                        return {
-                            type: UpToDateStatusType.OutOfDateWithUpstream,
-                            outOfDateOutputFileName: oldestOutputFileName,
-                            newerProjectName: ref.path
-                        };
-                    }
-                }
-            }
-            if (missingOutputFileName !== undefined) {
-                return {
-                    type: UpToDateStatusType.OutputMissing,
-                    missingOutputFileName: missingOutputFileName
-                };
-            }
-            if (isOutOfDateWithInputs) {
-                return {
-                    type: UpToDateStatusType.OutOfDateWithSelf,
-                    outOfDateOutputFileName: oldestOutputFileName,
-                    newerInputFileName: newestInputFileName
-                };
-            }
-            if (!buildInfoChecked.hasKey(project.options.configFilePath)) {
-                buildInfoChecked.setValue(project.options.configFilePath, true);
-                var buildInfoPath = ts.getOutputPathForBuildInfo(project.options);
-                if (buildInfoPath) {
-                    var value = readFileWithCache(buildInfoPath);
-                    var buildInfo = value && ts.getBuildInfo(value);
-                    if (buildInfo && buildInfo.version !== ts.version) {
-                        return {
-                            type: UpToDateStatusType.TsVersionOutputOfDate,
-                            version: buildInfo.version
-                        };
-                    }
-                }
-            }
-            if (usesPrepend && pseudoUpToDate) {
-                return {
-                    type: UpToDateStatusType.OutOfDateWithPrepend,
-                    outOfDateOutputFileName: oldestOutputFileName,
-                    newerProjectName: upstreamChangedProject
-                };
-            }
-            // Up to date
-            return {
-                type: pseudoUpToDate ? UpToDateStatusType.UpToDateWithUpstreamTypes : UpToDateStatusType.UpToDate,
-                newestDeclarationFileContentChangedTime: newestDeclarationFileContentChangedTime,
-                newestInputFileTime: newestInputFileTime,
-                newestOutputFileTime: newestOutputFileTime,
-                newestInputFileName: newestInputFileName,
-                newestOutputFileName: newestOutputFileName,
-                oldestOutputFileName: oldestOutputFileName
+                    executeSteps(Step.SemanticDiagnostics, cancellationToken);
+                    if (step !== Step.Emit)
+                        return undefined;
+                    return emit(writeFile, cancellationToken, customTransformers);
+                },
+                done: done
+            } :
+            {
+                kind: kind,
+                project: project,
+                projectPath: projectPath,
+                buildOrder: buildOrder,
+                getCompilerOptions: function () { return config.options; },
+                getCurrentDirectory: function () { return state.currentDirectory; },
+                emit: function (writeFile, customTransformers) {
+                    if (step !== Step.EmitBundle)
+                        return invalidatedProjectOfBundle;
+                    return emitBundle(writeFile, customTransformers);
+                },
+                done: done,
             };
+        function done(cancellationToken, writeFile, customTransformers) {
+            executeSteps(Step.Done, cancellationToken, writeFile, customTransformers);
+            return doneInvalidatedProject(state, projectPath);
         }
-        function invalidateProject(configFileName, reloadLevel) {
-            invalidateResolvedProject(resolveProjectName(configFileName), reloadLevel);
+        function withProgramOrUndefined(action) {
+            executeSteps(Step.CreateProgram);
+            return program && action(program);
         }
-        function invalidateResolvedProject(resolved, reloadLevel) {
-            if (reloadLevel === ts.ConfigFileProgramReloadLevel.Full) {
-                configFileCache.removeKey(resolved);
-                globalDependencyGraph = undefined;
-            }
-            projectStatus.removeKey(resolved);
-            diagnostics.removeKey(resolved);
-            addProjToQueue(resolved, reloadLevel);
+        function withProgramOrEmptyArray(action) {
+            return withProgramOrUndefined(action) || ts.emptyArray;
         }
-        /**
-         * return true if new addition
-         */
-        function addProjToQueue(proj, reloadLevel) {
-            var value = projectPendingBuild.getValue(proj);
-            if (value === undefined) {
-                projectPendingBuild.setValue(proj, reloadLevel || ts.ConfigFileProgramReloadLevel.None);
-                invalidatedProjectQueue.push(proj);
-            }
-            else if (value < (reloadLevel || ts.ConfigFileProgramReloadLevel.None)) {
-                projectPendingBuild.setValue(proj, reloadLevel || ts.ConfigFileProgramReloadLevel.None);
-            }
-        }
-        function getNextInvalidatedProject() {
-            if (nextProjectToBuild < invalidatedProjectQueue.length) {
-                var project = invalidatedProjectQueue[nextProjectToBuild];
-                nextProjectToBuild++;
-                var reloadLevel = projectPendingBuild.getValue(project);
-                projectPendingBuild.removeKey(project);
-                if (!projectPendingBuild.getSize()) {
-                    invalidatedProjectQueue.length = 0;
-                    nextProjectToBuild = 0;
-                }
-                return { project: project, reloadLevel: reloadLevel };
-            }
-        }
-        function hasPendingInvalidatedProjects() {
-            return !!projectPendingBuild.getSize();
-        }
-        function scheduleBuildInvalidatedProject() {
-            if (!hostWithWatch.setTimeout || !hostWithWatch.clearTimeout) {
+        function createProgram() {
+            ts.Debug.assert(program === undefined);
+            if (state.options.dry) {
+                reportStatus(state, ts.Diagnostics.A_non_dry_build_would_build_project_0, project);
+                buildResult = BuildResultFlags.Success;
+                step = Step.QueueReferencingProjects;
                 return;
             }
-            if (timerToBuildInvalidatedProject) {
-                hostWithWatch.clearTimeout(timerToBuildInvalidatedProject);
-            }
-            timerToBuildInvalidatedProject = hostWithWatch.setTimeout(buildInvalidatedProject, 250);
-        }
-        function buildInvalidatedProject() {
-            timerToBuildInvalidatedProject = undefined;
-            if (reportFileChangeDetected) {
-                reportFileChangeDetected = false;
-                projectErrorsReported.clear();
-                reportWatchStatus(ts.Diagnostics.File_change_detected_Starting_incremental_compilation);
-            }
-            var buildProject = getNextInvalidatedProject();
-            if (buildProject) {
-                buildSingleInvalidatedProject(buildProject.project, buildProject.reloadLevel);
-                if (hasPendingInvalidatedProjects()) {
-                    if (options.watch && !timerToBuildInvalidatedProject) {
-                        scheduleBuildInvalidatedProject();
-                    }
-                }
-                else {
-                    reportErrorSummary();
-                }
-            }
-        }
-        function reportErrorSummary() {
-            if (options.watch || host.reportErrorSummary) {
-                // Report errors from the other projects
-                getGlobalDependencyGraph().buildQueue.forEach(function (project) {
-                    if (!projectErrorsReported.hasKey(project)) {
-                        reportErrors(diagnostics.getValue(project) || ts.emptyArray);
-                    }
-                });
-                var totalErrors_1 = 0;
-                diagnostics.forEach(function (singleProjectErrors) { return totalErrors_1 += ts.getErrorCountForSummary(singleProjectErrors); });
-                if (options.watch) {
-                    reportWatchStatus(ts.getWatchErrorSummaryDiagnosticMessage(totalErrors_1), totalErrors_1);
-                }
-                else {
-                    host.reportErrorSummary(totalErrors_1);
-                }
-            }
-        }
-        function buildSingleInvalidatedProject(resolved, reloadLevel) {
-            var proj = parseConfigFile(resolved);
-            if (!proj) {
-                reportParseConfigFileDiagnostic(resolved);
-                return;
-            }
-            if (reloadLevel === ts.ConfigFileProgramReloadLevel.Full) {
-                watchConfigFile(resolved);
-                watchWildCardDirectories(resolved, proj);
-                watchInputFiles(resolved, proj);
-            }
-            else if (reloadLevel === ts.ConfigFileProgramReloadLevel.Partial) {
-                // Update file names
-                var result = ts.getFileNamesFromConfigSpecs(proj.configFileSpecs, ts.getDirectoryPath(resolved), proj.options, parseConfigFileHost);
-                ts.updateErrorForNoInputFiles(result, resolved, proj.configFileSpecs, proj.errors, ts.canJsonReportNoInutFiles(proj.raw));
-                proj.fileNames = result.fileNames;
-                watchInputFiles(resolved, proj);
-            }
-            var status = getUpToDateStatus(proj);
-            verboseReportProjectStatus(resolved, status);
-            if (status.type === UpToDateStatusType.UpstreamBlocked) {
-                if (options.verbose)
-                    reportStatus(ts.Diagnostics.Skipping_build_of_project_0_because_its_dependency_1_has_errors, resolved, status.upstreamProjectName);
-                return;
-            }
-            if (status.type === UpToDateStatusType.UpToDateWithUpstreamTypes) {
-                // Fake that files have been built by updating output file stamps
-                updateOutputTimestamps(proj);
-                return;
-            }
-            var buildResult = status.type === UpToDateStatusType.OutOfDateWithPrepend ?
-                updateBundle(resolved) : // Fake that files have been built by manipulating prepend and existing output
-                buildSingleProject(resolved); // Actual build
-            if (buildResult & BuildResultFlags.AnyErrors)
-                return;
-            var _a = getGlobalDependencyGraph(), referencingProjectsMap = _a.referencingProjectsMap, buildQueue = _a.buildQueue;
-            var referencingProjects = referencingProjectsMap.getValue(resolved);
-            if (!referencingProjects)
-                return;
-            // Always use build order to queue projects
-            for (var index = buildQueue.indexOf(resolved) + 1; index < buildQueue.length; index++) {
-                var project = buildQueue[index];
-                var prepend = referencingProjects.getValue(project);
-                if (prepend !== undefined) {
-                    // If the project is referenced with prepend, always build downstream projects,
-                    // If declaration output is changed, build the project
-                    // otherwise mark the project UpToDateWithUpstreamTypes so it updates output time stamps
-                    var status_1 = projectStatus.getValue(project);
-                    if (!(buildResult & BuildResultFlags.DeclarationOutputUnchanged)) {
-                        if (status_1 && (status_1.type === UpToDateStatusType.UpToDate || status_1.type === UpToDateStatusType.UpToDateWithUpstreamTypes || status_1.type === UpToDateStatusType.OutOfDateWithPrepend)) {
-                            projectStatus.setValue(project, {
-                                type: UpToDateStatusType.OutOfDateWithUpstream,
-                                outOfDateOutputFileName: status_1.type === UpToDateStatusType.OutOfDateWithPrepend ? status_1.outOfDateOutputFileName : status_1.oldestOutputFileName,
-                                newerProjectName: resolved
-                            });
-                        }
-                    }
-                    else if (status_1 && status_1.type === UpToDateStatusType.UpToDate) {
-                        if (prepend) {
-                            projectStatus.setValue(project, {
-                                type: UpToDateStatusType.OutOfDateWithPrepend,
-                                outOfDateOutputFileName: status_1.oldestOutputFileName,
-                                newerProjectName: resolved
-                            });
-                        }
-                        else {
-                            status_1.type = UpToDateStatusType.UpToDateWithUpstreamTypes;
-                        }
-                    }
-                    addProjToQueue(project);
-                }
-            }
-        }
-        function createDependencyGraph(roots) {
-            var temporaryMarks = createFileMap(toPath);
-            var permanentMarks = createFileMap(toPath);
-            var circularityReportStack = [];
-            var buildOrder = [];
-            var referencingProjectsMap = createFileMap(toPath);
-            for (var _i = 0, roots_1 = roots; _i < roots_1.length; _i++) {
-                var root = roots_1[_i];
-                visit(root);
-            }
-            return {
-                buildQueue: buildOrder,
-                referencingProjectsMap: referencingProjectsMap
-            };
-            function visit(projPath, inCircularContext) {
-                // Already visited
-                if (permanentMarks.hasKey(projPath))
-                    return;
-                // Circular
-                if (temporaryMarks.hasKey(projPath)) {
-                    if (!inCircularContext) {
-                        // TODO:: Do we report this as error?
-                        reportStatus(ts.Diagnostics.Project_references_may_not_form_a_circular_graph_Cycle_detected_Colon_0, circularityReportStack.join("\r\n"));
-                    }
-                    return;
-                }
-                temporaryMarks.setValue(projPath, true);
-                circularityReportStack.push(projPath);
-                var parsed = parseConfigFile(projPath);
-                if (parsed && parsed.projectReferences) {
-                    for (var _i = 0, _a = parsed.projectReferences; _i < _a.length; _i++) {
-                        var ref = _a[_i];
-                        var resolvedRefPath = resolveProjectName(ref.path);
-                        visit(resolvedRefPath, inCircularContext || ref.circular);
-                        // Get projects referencing resolvedRefPath and add projPath to it
-                        var referencingProjects = getOrCreateValueFromConfigFileMap(referencingProjectsMap, resolvedRefPath, function () { return createFileMap(toPath); });
-                        referencingProjects.setValue(projPath, !!ref.prepend);
-                    }
-                }
-                circularityReportStack.pop();
-                permanentMarks.setValue(projPath, true);
-                buildOrder.push(projPath);
-            }
-        }
-        function buildSingleProject(proj) {
-            if (options.dry) {
-                reportStatus(ts.Diagnostics.A_non_dry_build_would_build_project_0, proj);
-                return BuildResultFlags.Success;
-            }
-            if (options.verbose)
-                reportStatus(ts.Diagnostics.Building_project_0, proj);
-            var resultFlags = BuildResultFlags.DeclarationOutputUnchanged;
-            var configFile = parseConfigFile(proj);
-            if (!configFile) {
-                // Failed to read the config file
-                resultFlags |= BuildResultFlags.ConfigFileErrors;
-                reportParseConfigFileDiagnostic(proj);
-                projectStatus.setValue(proj, { type: UpToDateStatusType.Unbuildable, reason: "Config file errors" });
-                return resultFlags;
-            }
-            if (configFile.fileNames.length === 0) {
-                reportAndStoreErrors(proj, configFile.errors);
+            if (state.options.verbose)
+                reportStatus(state, ts.Diagnostics.Building_project_0, project);
+            if (config.fileNames.length === 0) {
+                reportAndStoreErrors(state, projectPath, config.errors);
                 // Nothing to build - must be a solution file, basically
-                return BuildResultFlags.None;
+                buildResult = BuildResultFlags.None;
+                step = Step.QueueReferencingProjects;
+                return;
             }
-            // TODO: handle resolve module name to cache result in project reference redirect
-            projectCompilerOptions = configFile.options;
-            var program = host.createProgram(configFile.fileNames, configFile.options, compilerHost, getOldProgram(proj, configFile), configFile.errors, configFile.projectReferences);
-            // Don't emit anything in the presence of syntactic errors or options diagnostics
-            var syntaxDiagnostics = program.getConfigFileParsingDiagnostics().concat(program.getOptionsDiagnostics(), program.getGlobalDiagnostics(), program.getSyntacticDiagnostics());
-            if (syntaxDiagnostics.length) {
-                return buildErrors(syntaxDiagnostics, BuildResultFlags.SyntaxErrors, "Syntactic");
+            var host = state.host, compilerHost = state.compilerHost;
+            state.projectCompilerOptions = config.options;
+            // Update module resolution cache if needed
+            updateModuleResolutionCache(state, project, config);
+            // Create program
+            program = host.createProgram(config.fileNames, config.options, compilerHost, getOldProgram(state, projectPath, config), config.errors, config.projectReferences);
+            step++;
+        }
+        function handleDiagnostics(diagnostics, errorFlags, errorType) {
+            if (diagnostics.length) {
+                buildResult = buildErrors(state, projectPath, program, diagnostics, errorFlags, errorType);
+                step = Step.QueueReferencingProjects;
             }
-            // Same as above but now for semantic diagnostics
-            var semanticDiagnostics = program.getSemanticDiagnostics();
-            if (semanticDiagnostics.length) {
-                return buildErrors(semanticDiagnostics, BuildResultFlags.TypeErrors, "Semantic");
+            else {
+                step++;
             }
+        }
+        function getSyntaxDiagnostics(cancellationToken) {
+            ts.Debug.assertDefined(program);
+            handleDiagnostics(program.getConfigFileParsingDiagnostics().concat(program.getOptionsDiagnostics(cancellationToken), program.getGlobalDiagnostics(cancellationToken), program.getSyntacticDiagnostics(/*sourceFile*/ undefined, cancellationToken)), BuildResultFlags.SyntaxErrors, "Syntactic");
+        }
+        function getSemanticDiagnostics(cancellationToken) {
+            handleDiagnostics(ts.Debug.assertDefined(program).getSemanticDiagnostics(/*sourceFile*/ undefined, cancellationToken), BuildResultFlags.TypeErrors, "Semantic");
+        }
+        function emit(writeFileCallback, cancellationToken, customTransformers) {
+            ts.Debug.assertDefined(program);
+            ts.Debug.assert(step === Step.Emit);
             // Before emitting lets backup state, so we can revert it back if there are declaration errors to handle emit and declaration errors correctly
             program.backupState();
-            var newestDeclarationFileContentChangedTime = minimumDate;
-            var anyDtsChanged = false;
             var declDiagnostics;
             var reportDeclarationDiagnostics = function (d) { return (declDiagnostics || (declDiagnostics = [])).push(d); };
             var outputFiles = [];
-            ts.emitFilesAndReportErrors(program, reportDeclarationDiagnostics, writeFileName, /*reportSummary*/ undefined, function (name, text, writeByteOrderMark) { return outputFiles.push({ name: name, text: text, writeByteOrderMark: writeByteOrderMark }); });
+            var emitResult = ts.emitFilesAndReportErrors(program, reportDeclarationDiagnostics, 
+            /*writeFileName*/ undefined, 
+            /*reportSummary*/ undefined, function (name, text, writeByteOrderMark) { return outputFiles.push({ name: name, text: text, writeByteOrderMark: writeByteOrderMark }); }, cancellationToken, 
+            /*emitOnlyDts*/ false, customTransformers).emitResult;
             // Don't emit .d.ts if there are decl file errors
             if (declDiagnostics) {
                 program.restoreState();
-                return buildErrors(declDiagnostics, BuildResultFlags.DeclarationEmitErrors, "Declaration file");
+                buildResult = buildErrors(state, projectPath, program, declDiagnostics, BuildResultFlags.DeclarationEmitErrors, "Declaration file");
+                step = Step.QueueReferencingProjects;
+                return {
+                    emitSkipped: true,
+                    diagnostics: emitResult.diagnostics
+                };
             }
             // Actual Emit
+            var host = state.host, compilerHost = state.compilerHost;
+            var resultFlags = BuildResultFlags.DeclarationOutputUnchanged;
+            var newestDeclarationFileContentChangedTime = minimumDate;
+            var anyDtsChanged = false;
             var emitterDiagnostics = ts.createDiagnosticCollection();
-            var emittedOutputs = createFileMap(toPath);
+            var emittedOutputs = ts.createMap();
             outputFiles.forEach(function (_a) {
                 var name = _a.name, text = _a.text, writeByteOrderMark = _a.writeByteOrderMark;
                 var priorChangeTime;
                 if (!anyDtsChanged && isDeclarationFile(name)) {
                     // Check for unchanged .d.ts files
-                    if (host.fileExists(name) && readFileWithCache(name) === text) {
+                    if (host.fileExists(name) && state.readFileWithCache(name) === text) {
                         priorChangeTime = host.getModifiedTime(name);
                     }
                     else {
@@ -94119,481 +96666,872 @@ var ts;
                         anyDtsChanged = true;
                     }
                 }
-                emittedOutputs.setValue(name, true);
-                ts.writeFile(compilerHost, emitterDiagnostics, name, text, writeByteOrderMark);
+                emittedOutputs.set(toPath(state, name), name);
+                ts.writeFile(writeFileCallback ? { writeFile: writeFileCallback } : compilerHost, emitterDiagnostics, name, text, writeByteOrderMark);
                 if (priorChangeTime !== undefined) {
                     newestDeclarationFileContentChangedTime = newer(priorChangeTime, newestDeclarationFileContentChangedTime);
-                    unchangedOutputs.setValue(name, priorChangeTime);
                 }
             });
+            finishEmit(emitterDiagnostics, emittedOutputs, newestDeclarationFileContentChangedTime, 
+            /*newestDeclarationFileContentChangedTimeIsMaximumDate*/ anyDtsChanged, outputFiles.length ? outputFiles[0].name : ts.getFirstProjectOutput(config, !host.useCaseSensitiveFileNames()), resultFlags);
+            return emitResult;
+        }
+        function finishEmit(emitterDiagnostics, emittedOutputs, priorNewestUpdateTime, newestDeclarationFileContentChangedTimeIsMaximumDate, oldestOutputFileName, resultFlags) {
             var emitDiagnostics = emitterDiagnostics.getDiagnostics();
             if (emitDiagnostics.length) {
-                return buildErrors(emitDiagnostics, BuildResultFlags.EmitErrors, "Emit");
+                buildResult = buildErrors(state, projectPath, program, emitDiagnostics, BuildResultFlags.EmitErrors, "Emit");
+                step = Step.QueueReferencingProjects;
+                return emitDiagnostics;
+            }
+            if (state.writeFileName) {
+                emittedOutputs.forEach(function (name) { return listEmittedFile(state, config, name); });
+                if (program)
+                    ts.listFiles(program, state.writeFileName);
             }
             // Update time stamps for rest of the outputs
-            newestDeclarationFileContentChangedTime = updateOutputTimestampsWorker(configFile, newestDeclarationFileContentChangedTime, ts.Diagnostics.Updating_unchanged_output_timestamps_of_project_0, emittedOutputs);
-            var status = {
-                type: UpToDateStatusType.UpToDate,
-                newestDeclarationFileContentChangedTime: anyDtsChanged ? maximumDate : newestDeclarationFileContentChangedTime,
-                oldestOutputFileName: outputFiles.length ? outputFiles[0].name : getFirstProjectOutput(configFile)
-            };
-            diagnostics.removeKey(proj);
-            projectStatus.setValue(proj, status);
-            afterProgramCreate(proj, program);
-            projectCompilerOptions = baseCompilerOptions;
-            return resultFlags;
-            function buildErrors(diagnostics, errorFlags, errorType) {
-                resultFlags |= errorFlags;
-                reportAndStoreErrors(proj, diagnostics);
-                projectStatus.setValue(proj, { type: UpToDateStatusType.Unbuildable, reason: errorType + " errors" });
-                afterProgramCreate(proj, program);
-                projectCompilerOptions = baseCompilerOptions;
-                return resultFlags;
-            }
+            var newestDeclarationFileContentChangedTime = updateOutputTimestampsWorker(state, config, priorNewestUpdateTime, ts.Diagnostics.Updating_unchanged_output_timestamps_of_project_0, emittedOutputs);
+            state.diagnostics.delete(projectPath);
+            state.projectStatus.set(projectPath, {
+                type: ts.UpToDateStatusType.UpToDate,
+                newestDeclarationFileContentChangedTime: newestDeclarationFileContentChangedTimeIsMaximumDate ?
+                    maximumDate :
+                    newestDeclarationFileContentChangedTime,
+                oldestOutputFileName: oldestOutputFileName
+            });
+            if (program)
+                afterProgramCreate(state, projectPath, program);
+            state.projectCompilerOptions = state.baseCompilerOptions;
+            step = Step.QueueReferencingProjects;
+            buildResult = resultFlags;
+            return emitDiagnostics;
         }
-        function afterProgramCreate(proj, program) {
-            if (host.afterProgramEmitAndDiagnostics) {
-                host.afterProgramEmitAndDiagnostics(program);
+        function emitBundle(writeFileCallback, customTransformers) {
+            ts.Debug.assert(kind === InvalidatedProjectKind.UpdateBundle);
+            if (state.options.dry) {
+                reportStatus(state, ts.Diagnostics.A_non_dry_build_would_update_output_of_project_0, project);
+                buildResult = BuildResultFlags.Success;
+                step = Step.QueueReferencingProjects;
+                return undefined;
             }
-            if (options.watch) {
-                program.releaseProgram();
-                builderPrograms.setValue(proj, program);
-            }
-        }
-        function getOldProgram(proj, parsed) {
-            var value = builderPrograms.getValue(proj);
-            if (value)
-                return value;
-            return ts.readBuilderProgram(parsed.options, readFileWithCache);
-        }
-        function updateBundle(proj) {
-            if (options.dry) {
-                reportStatus(ts.Diagnostics.A_non_dry_build_would_update_output_of_project_0, proj);
-                return BuildResultFlags.Success;
-            }
-            if (options.verbose)
-                reportStatus(ts.Diagnostics.Updating_output_of_project_0, proj);
+            if (state.options.verbose)
+                reportStatus(state, ts.Diagnostics.Updating_output_of_project_0, project);
             // Update js, and source map
-            var config = ts.Debug.assertDefined(parseConfigFile(proj));
-            projectCompilerOptions = config.options;
-            var outputFiles = ts.emitUsingBuildInfo(config, compilerHost, function (ref) { return parseConfigFile(resolveProjectName(ref.path)); });
+            var compilerHost = state.compilerHost;
+            state.projectCompilerOptions = config.options;
+            var outputFiles = ts.emitUsingBuildInfo(config, compilerHost, function (ref) {
+                var refName = resolveProjectName(state, ref.path);
+                return parseConfigFile(state, refName, toResolvedConfigFilePath(state, refName));
+            }, customTransformers);
             if (ts.isString(outputFiles)) {
-                reportStatus(ts.Diagnostics.Cannot_update_output_of_project_0_because_there_was_error_reading_file_1, proj, relName(outputFiles));
-                return buildSingleProject(proj);
+                reportStatus(state, ts.Diagnostics.Cannot_update_output_of_project_0_because_there_was_error_reading_file_1, project, relName(state, outputFiles));
+                step = Step.BuildInvalidatedProjectOfBundle;
+                return invalidatedProjectOfBundle = createBuildOrUpdateInvalidedProject(InvalidatedProjectKind.Build, state, project, projectPath, projectIndex, config, buildOrder);
             }
             // Actual Emit
             ts.Debug.assert(!!outputFiles.length);
             var emitterDiagnostics = ts.createDiagnosticCollection();
-            var emittedOutputs = createFileMap(toPath);
+            var emittedOutputs = ts.createMap();
             outputFiles.forEach(function (_a) {
                 var name = _a.name, text = _a.text, writeByteOrderMark = _a.writeByteOrderMark;
-                emittedOutputs.setValue(name, true);
-                ts.writeFile(compilerHost, emitterDiagnostics, name, text, writeByteOrderMark);
+                emittedOutputs.set(toPath(state, name), name);
+                ts.writeFile(writeFileCallback ? { writeFile: writeFileCallback } : compilerHost, emitterDiagnostics, name, text, writeByteOrderMark);
             });
-            var emitDiagnostics = emitterDiagnostics.getDiagnostics();
-            if (emitDiagnostics.length) {
-                reportAndStoreErrors(proj, emitDiagnostics);
-                projectStatus.setValue(proj, { type: UpToDateStatusType.Unbuildable, reason: "Emit errors" });
-                projectCompilerOptions = baseCompilerOptions;
-                return BuildResultFlags.DeclarationOutputUnchanged | BuildResultFlags.EmitErrors;
-            }
-            // Update timestamps for dts
-            var newestDeclarationFileContentChangedTime = updateOutputTimestampsWorker(config, minimumDate, ts.Diagnostics.Updating_unchanged_output_timestamps_of_project_0, emittedOutputs);
-            var status = {
-                type: UpToDateStatusType.UpToDate,
-                newestDeclarationFileContentChangedTime: newestDeclarationFileContentChangedTime,
-                oldestOutputFileName: outputFiles[0].name
-            };
-            diagnostics.removeKey(proj);
-            projectStatus.setValue(proj, status);
-            projectCompilerOptions = baseCompilerOptions;
-            return BuildResultFlags.DeclarationOutputUnchanged;
+            var emitDiagnostics = finishEmit(emitterDiagnostics, emittedOutputs, minimumDate, 
+            /*newestDeclarationFileContentChangedTimeIsMaximumDate*/ false, outputFiles[0].name, BuildResultFlags.DeclarationOutputUnchanged);
+            return { emitSkipped: false, diagnostics: emitDiagnostics };
         }
-        function updateOutputTimestamps(proj) {
-            if (options.dry) {
-                return reportStatus(ts.Diagnostics.A_non_dry_build_would_update_timestamps_for_output_of_project_0, proj.options.configFilePath);
-            }
-            var priorNewestUpdateTime = updateOutputTimestampsWorker(proj, minimumDate, ts.Diagnostics.Updating_output_timestamps_of_project_0);
-            projectStatus.setValue(proj.options.configFilePath, { type: UpToDateStatusType.UpToDate, newestDeclarationFileContentChangedTime: priorNewestUpdateTime });
-        }
-        function updateOutputTimestampsWorker(proj, priorNewestUpdateTime, verboseMessage, skipOutputs) {
-            var outputs = getAllProjectOutputs(proj);
-            if (!skipOutputs || outputs.length !== skipOutputs.getSize()) {
-                if (options.verbose) {
-                    reportStatus(verboseMessage, proj.options.configFilePath);
-                }
-                var now = host.now ? host.now() : new Date();
-                for (var _i = 0, outputs_2 = outputs; _i < outputs_2.length; _i++) {
-                    var file = outputs_2[_i];
-                    if (skipOutputs && skipOutputs.hasKey(file)) {
-                        continue;
-                    }
-                    if (isDeclarationFile(file)) {
-                        priorNewestUpdateTime = newer(priorNewestUpdateTime, host.getModifiedTime(file) || ts.missingFileModifiedTime);
-                    }
-                    host.setModifiedTime(file, now);
-                    if (proj.options.listEmittedFiles) {
-                        writeFileName("TSFILE: " + file);
-                    }
+        function executeSteps(till, cancellationToken, writeFile, customTransformers) {
+            while (step <= till && step < Step.Done) {
+                var currentStep = step;
+                switch (step) {
+                    case Step.CreateProgram:
+                        createProgram();
+                        break;
+                    case Step.SyntaxDiagnostics:
+                        getSyntaxDiagnostics(cancellationToken);
+                        break;
+                    case Step.SemanticDiagnostics:
+                        getSemanticDiagnostics(cancellationToken);
+                        break;
+                    case Step.Emit:
+                        emit(writeFile, cancellationToken, customTransformers);
+                        break;
+                    case Step.EmitBundle:
+                        emitBundle(writeFile, customTransformers);
+                        break;
+                    case Step.BuildInvalidatedProjectOfBundle:
+                        ts.Debug.assertDefined(invalidatedProjectOfBundle).done(cancellationToken);
+                        step = Step.Done;
+                        break;
+                    case Step.QueueReferencingProjects:
+                        queueReferencingProjects(state, project, projectPath, projectIndex, config, buildOrder, ts.Debug.assertDefined(buildResult));
+                        step++;
+                        break;
+                    // Should never be done
+                    case Step.Done:
+                    default:
+                        ts.assertType(step);
                 }
+                ts.Debug.assert(step > currentStep);
             }
-            return priorNewestUpdateTime;
         }
-        function getFilesToClean() {
-            // Get the same graph for cleaning we'd use for building
-            var graph = getGlobalDependencyGraph();
-            var filesToDelete = [];
-            for (var _i = 0, _a = graph.buildQueue; _i < _a.length; _i++) {
-                var proj = _a[_i];
-                var parsed = parseConfigFile(proj);
-                if (parsed === undefined) {
-                    // File has gone missing; fine to ignore here
-                    reportParseConfigFileDiagnostic(proj);
-                    continue;
-                }
-                var outputs = getAllProjectOutputs(parsed);
-                for (var _b = 0, outputs_3 = outputs; _b < outputs_3.length; _b++) {
-                    var output = outputs_3[_b];
-                    if (host.fileExists(output)) {
-                        filesToDelete.push(output);
-                    }
-                }
+    }
+    function needsBuild(_a, status, config) {
+        var options = _a.options;
+        if (status.type !== ts.UpToDateStatusType.OutOfDateWithPrepend || options.force)
+            return true;
+        return config.fileNames.length === 0 ||
+            !!config.errors.length ||
+            !ts.isIncrementalCompilation(config.options);
+    }
+    function getNextInvalidatedProject(state, buildOrder, reportQueue) {
+        if (!state.projectPendingBuild.size)
+            return undefined;
+        if (state.currentInvalidatedProject) {
+            // Only if same buildOrder the currentInvalidated project can be sent again
+            return ts.arrayIsEqualTo(state.currentInvalidatedProject.buildOrder, buildOrder) ?
+                state.currentInvalidatedProject :
+                undefined;
+        }
+        var options = state.options, projectPendingBuild = state.projectPendingBuild;
+        for (var projectIndex = 0; projectIndex < buildOrder.length; projectIndex++) {
+            var project = buildOrder[projectIndex];
+            var projectPath = toResolvedConfigFilePath(state, project);
+            var reloadLevel = state.projectPendingBuild.get(projectPath);
+            if (reloadLevel === undefined)
+                continue;
+            if (reportQueue) {
+                reportQueue = false;
+                reportBuildQueue(state, buildOrder);
             }
-            return filesToDelete;
-        }
-        function cleanAllProjects() {
-            var filesToDelete = getFilesToClean();
-            if (options.dry) {
-                reportStatus(ts.Diagnostics.A_non_dry_build_would_delete_the_following_files_Colon_0, filesToDelete.map(function (f) { return "\r\n * " + f; }).join(""));
-                return ts.ExitStatus.Success;
+            var config = parseConfigFile(state, project, projectPath);
+            if (!config) {
+                reportParseConfigFileDiagnostic(state, projectPath);
+                projectPendingBuild.delete(projectPath);
+                continue;
             }
-            for (var _i = 0, filesToDelete_1 = filesToDelete; _i < filesToDelete_1.length; _i++) {
-                var output = filesToDelete_1[_i];
-                host.deleteFile(output);
+            if (reloadLevel === ts.ConfigFileProgramReloadLevel.Full) {
+                watchConfigFile(state, project, projectPath);
+                watchWildCardDirectories(state, project, projectPath, config);
+                watchInputFiles(state, project, projectPath, config);
             }
-            return ts.ExitStatus.Success;
-        }
-        function resolveProjectName(name) {
-            return resolveConfigFileProjectName(ts.resolvePath(host.getCurrentDirectory(), name));
-        }
-        function resolveProjectNames(configFileNames) {
-            return configFileNames.map(resolveProjectName);
-        }
-        function buildAllProjects() {
-            if (options.watch) {
-                reportWatchStatus(ts.Diagnostics.Starting_compilation_in_watch_mode);
+            else if (reloadLevel === ts.ConfigFileProgramReloadLevel.Partial) {
+                // Update file names
+                var result = ts.getFileNamesFromConfigSpecs(config.configFileSpecs, ts.getDirectoryPath(project), config.options, state.parseConfigFileHost);
+                ts.updateErrorForNoInputFiles(result, project, config.configFileSpecs, config.errors, ts.canJsonReportNoInutFiles(config.raw));
+                config.fileNames = result.fileNames;
+                watchInputFiles(state, project, projectPath, config);
             }
-            // TODO:: In watch mode as well to use caches for incremental build once we can invalidate caches correctly and have right api
-            // Override readFile for json files and output .d.ts to cache the text
-            var savedReadFileWithCache = readFileWithCache;
-            var savedGetSourceFile = compilerHost.getSourceFile;
-            var _a = ts.changeCompilerHostLikeToUseCache(host, toPath, function () {
-                var args = [];
-                for (var _i = 0; _i < arguments.length; _i++) {
-                    args[_i] = arguments[_i];
-                }
-                return savedGetSourceFile.call.apply(savedGetSourceFile, [compilerHost].concat(args));
-            }), originalReadFile = _a.originalReadFile, originalFileExists = _a.originalFileExists, originalDirectoryExists = _a.originalDirectoryExists, originalCreateDirectory = _a.originalCreateDirectory, originalWriteFile = _a.originalWriteFile, getSourceFileWithCache = _a.getSourceFileWithCache, newReadFileWithCache = _a.readFileWithCache;
-            readFileWithCache = newReadFileWithCache;
-            compilerHost.getSourceFile = getSourceFileWithCache;
-            var graph = getGlobalDependencyGraph();
-            reportBuildQueue(graph);
-            var anyFailed = false;
-            for (var _i = 0, _b = graph.buildQueue; _i < _b.length; _i++) {
-                var next = _b[_i];
-                var proj = parseConfigFile(next);
-                if (proj === undefined) {
-                    reportParseConfigFileDiagnostic(next);
-                    anyFailed = true;
-                    break;
-                }
-                // report errors early when using continue or break statements
-                var errors = proj.errors;
-                var status = getUpToDateStatus(proj);
-                verboseReportProjectStatus(next, status);
-                var projName = proj.options.configFilePath;
-                if (status.type === UpToDateStatusType.UpToDate && !options.force) {
-                    reportAndStoreErrors(next, errors);
+            var status = getUpToDateStatus(state, config, projectPath);
+            verboseReportProjectStatus(state, project, status);
+            if (!options.force) {
+                if (status.type === ts.UpToDateStatusType.UpToDate) {
+                    reportAndStoreErrors(state, projectPath, config.errors);
+                    projectPendingBuild.delete(projectPath);
                     // Up to date, skip
-                    if (defaultOptions.dry) {
+                    if (options.dry) {
                         // In a dry build, inform the user of this fact
-                        reportStatus(ts.Diagnostics.Project_0_is_up_to_date, projName);
+                        reportStatus(state, ts.Diagnostics.Project_0_is_up_to_date, project);
                     }
                     continue;
                 }
-                if (status.type === UpToDateStatusType.UpToDateWithUpstreamTypes && !options.force) {
-                    reportAndStoreErrors(next, errors);
-                    // Fake build
-                    updateOutputTimestamps(proj);
-                    continue;
+                if (status.type === ts.UpToDateStatusType.UpToDateWithUpstreamTypes) {
+                    reportAndStoreErrors(state, projectPath, config.errors);
+                    return createUpdateOutputFileStampsProject(state, project, projectPath, config, buildOrder);
                 }
-                if (status.type === UpToDateStatusType.UpstreamBlocked) {
-                    reportAndStoreErrors(next, errors);
-                    if (options.verbose)
-                        reportStatus(ts.Diagnostics.Skipping_build_of_project_0_because_its_dependency_1_has_errors, projName, status.upstreamProjectName);
-                    continue;
-                }
-                if (status.type === UpToDateStatusType.ContainerOnly) {
-                    reportAndStoreErrors(next, errors);
-                    // Do nothing
-                    continue;
-                }
-                var buildResult = status.type === UpToDateStatusType.OutOfDateWithPrepend && !options.force ?
-                    updateBundle(next) : // Fake that files have been built by manipulating prepend and existing output
-                    buildSingleProject(next); // Actual build
-                anyFailed = anyFailed || !!(buildResult & BuildResultFlags.AnyErrors);
             }
-            reportErrorSummary();
-            host.readFile = originalReadFile;
-            host.fileExists = originalFileExists;
-            host.directoryExists = originalDirectoryExists;
-            host.createDirectory = originalCreateDirectory;
-            host.writeFile = originalWriteFile;
-            compilerHost.getSourceFile = savedGetSourceFile;
-            readFileWithCache = savedReadFileWithCache;
-            return anyFailed ? ts.ExitStatus.DiagnosticsPresent_OutputsSkipped : ts.ExitStatus.Success;
-        }
-        function reportParseConfigFileDiagnostic(proj) {
-            reportAndStoreErrors(proj, [configFileCache.getValue(proj)]);
-        }
-        function reportAndStoreErrors(proj, errors) {
-            reportErrors(errors);
-            projectErrorsReported.setValue(proj, true);
-            diagnostics.setValue(proj, errors);
-        }
-        function reportErrors(errors) {
-            errors.forEach(function (err) { return host.reportDiagnostic(err); });
-        }
-        /**
-         * Report the build ordering inferred from the current project graph if we're in verbose mode
-         */
-        function reportBuildQueue(graph) {
-            if (options.verbose) {
-                reportStatus(ts.Diagnostics.Projects_in_this_build_Colon_0, graph.buildQueue.map(function (s) { return "\r\n    * " + relName(s); }).join(""));
+            if (status.type === ts.UpToDateStatusType.UpstreamBlocked) {
+                reportAndStoreErrors(state, projectPath, config.errors);
+                projectPendingBuild.delete(projectPath);
+                if (options.verbose)
+                    reportStatus(state, ts.Diagnostics.Skipping_build_of_project_0_because_its_dependency_1_has_errors, project, status.upstreamProjectName);
+                continue;
             }
+            if (status.type === ts.UpToDateStatusType.ContainerOnly) {
+                reportAndStoreErrors(state, projectPath, config.errors);
+                projectPendingBuild.delete(projectPath);
+                // Do nothing
+                continue;
+            }
+            return createBuildOrUpdateInvalidedProject(needsBuild(state, status, config) ?
+                InvalidatedProjectKind.Build :
+                InvalidatedProjectKind.UpdateBundle, state, project, projectPath, projectIndex, config, buildOrder);
         }
-        function relName(path) {
-            return ts.convertToRelativePath(path, host.getCurrentDirectory(), function (f) { return compilerHost.getCanonicalFileName(f); });
-        }
-        /**
-         * Report the up-to-date status of a project if we're in verbose mode
-         */
-        function verboseReportProjectStatus(configFileName, status) {
-            if (!options.verbose)
-                return;
-            return formatUpToDateStatus(configFileName, status, relName, reportStatus);
+        return undefined;
+    }
+    function listEmittedFile(_a, proj, file) {
+        var writeFileName = _a.writeFileName;
+        if (writeFileName && proj.options.listEmittedFiles) {
+            writeFileName("TSFILE: " + file);
         }
     }
-    ts.createSolutionBuilder = createSolutionBuilder;
-    function resolveConfigFileProjectName(project) {
-        if (ts.fileExtensionIs(project, ".json" /* Json */)) {
-            return project;
-        }
-        return ts.combinePaths(project, "tsconfig.json");
+    function getOldProgram(_a, proj, parsed) {
+        var options = _a.options, builderPrograms = _a.builderPrograms, compilerHost = _a.compilerHost;
+        if (options.force)
+            return undefined;
+        var value = builderPrograms.get(proj);
+        if (value)
+            return value;
+        return ts.readBuilderProgram(parsed.options, compilerHost);
     }
-    ts.resolveConfigFileProjectName = resolveConfigFileProjectName;
-    function getAllProjectOutputs(project) {
-        if (project.options.outFile || project.options.out) {
-            return getOutFileOutputs(project);
+    function afterProgramCreate(_a, proj, program) {
+        var host = _a.host, watch = _a.watch, builderPrograms = _a.builderPrograms;
+        if (host.afterProgramEmitAndDiagnostics) {
+            host.afterProgramEmitAndDiagnostics(program);
+        }
+        if (watch) {
+            program.releaseProgram();
+            builderPrograms.set(proj, program);
+        }
+    }
+    function buildErrors(state, resolvedPath, program, diagnostics, errorFlags, errorType) {
+        reportAndStoreErrors(state, resolvedPath, diagnostics);
+        // List files if any other build error using program (emit errors already report files)
+        if (program && state.writeFileName)
+            ts.listFiles(program, state.writeFileName);
+        state.projectStatus.set(resolvedPath, { type: ts.UpToDateStatusType.Unbuildable, reason: errorType + " errors" });
+        if (program)
+            afterProgramCreate(state, resolvedPath, program);
+        state.projectCompilerOptions = state.baseCompilerOptions;
+        return errorFlags;
+    }
+    function updateModuleResolutionCache(state, proj, config) {
+        if (!state.moduleResolutionCache)
+            return;
+        // Update module resolution cache if needed
+        var moduleResolutionCache = state.moduleResolutionCache;
+        var projPath = toPath(state, proj);
+        if (moduleResolutionCache.directoryToModuleNameMap.redirectsMap.size === 0) {
+            // The own map will be for projectCompilerOptions
+            ts.Debug.assert(moduleResolutionCache.moduleNameToDirectoryMap.redirectsMap.size === 0);
+            moduleResolutionCache.directoryToModuleNameMap.redirectsMap.set(projPath, moduleResolutionCache.directoryToModuleNameMap.ownMap);
+            moduleResolutionCache.moduleNameToDirectoryMap.redirectsMap.set(projPath, moduleResolutionCache.moduleNameToDirectoryMap.ownMap);
         }
         else {
-            var outputs = [];
-            for (var _i = 0, _a = project.fileNames; _i < _a.length; _i++) {
-                var inputFile = _a[_i];
-                outputs.push.apply(outputs, getOutputFileNames(inputFile, project));
-            }
-            var buildInfoPath = ts.getOutputPathForBuildInfo(project.options);
-            if (buildInfoPath)
-                outputs.push(buildInfoPath);
-            return outputs;
+            // Set correct own map
+            ts.Debug.assert(moduleResolutionCache.moduleNameToDirectoryMap.redirectsMap.size > 0);
+            var ref = {
+                sourceFile: config.options.configFile,
+                commandLine: config
+            };
+            moduleResolutionCache.directoryToModuleNameMap.setOwnMap(moduleResolutionCache.directoryToModuleNameMap.getOrCreateMapOfCacheRedirects(ref));
+            moduleResolutionCache.moduleNameToDirectoryMap.setOwnMap(moduleResolutionCache.moduleNameToDirectoryMap.getOrCreateMapOfCacheRedirects(ref));
+        }
+        moduleResolutionCache.directoryToModuleNameMap.setOwnOptions(config.options);
+        moduleResolutionCache.moduleNameToDirectoryMap.setOwnOptions(config.options);
+    }
+    function checkConfigFileUpToDateStatus(state, configFile, oldestOutputFileTime, oldestOutputFileName) {
+        // Check tsconfig time
+        var tsconfigTime = state.host.getModifiedTime(configFile) || ts.missingFileModifiedTime;
+        if (oldestOutputFileTime < tsconfigTime) {
+            return {
+                type: ts.UpToDateStatusType.OutOfDateWithSelf,
+                outOfDateOutputFileName: oldestOutputFileName,
+                newerInputFileName: configFile
+            };
         }
     }
-    ts.getAllProjectOutputs = getAllProjectOutputs;
-    function getFirstProjectOutput(project) {
-        if (project.options.outFile || project.options.out) {
-            return ts.first(getOutFileOutputs(project));
-        }
+    function getUpToDateStatusWorker(state, project, resolvedPath) {
+        var newestInputFileName = undefined;
+        var newestInputFileTime = minimumDate;
+        var host = state.host;
+        // Get timestamps of input files
         for (var _i = 0, _a = project.fileNames; _i < _a.length; _i++) {
             var inputFile = _a[_i];
-            var outputs = getOutputFileNames(inputFile, project);
-            if (outputs.length) {
-                return ts.first(outputs);
+            if (!host.fileExists(inputFile)) {
+                return {
+                    type: ts.UpToDateStatusType.Unbuildable,
+                    reason: inputFile + " does not exist"
+                };
+            }
+            var inputTime = host.getModifiedTime(inputFile) || ts.missingFileModifiedTime;
+            if (inputTime > newestInputFileTime) {
+                newestInputFileName = inputFile;
+                newestInputFileTime = inputTime;
             }
         }
-        return ts.Debug.fail("project " + project.options.configFilePath + " expected to have at least one output");
+        // Container if no files are specified in the project
+        if (!project.fileNames.length && !ts.canJsonReportNoInutFiles(project.raw)) {
+            return {
+                type: ts.UpToDateStatusType.ContainerOnly
+            };
+        }
+        // Collect the expected outputs of this project
+        var outputs = ts.getAllProjectOutputs(project, !host.useCaseSensitiveFileNames());
+        // Now see if all outputs are newer than the newest input
+        var oldestOutputFileName = "(none)";
+        var oldestOutputFileTime = maximumDate;
+        var newestOutputFileName = "(none)";
+        var newestOutputFileTime = minimumDate;
+        var missingOutputFileName;
+        var newestDeclarationFileContentChangedTime = minimumDate;
+        var isOutOfDateWithInputs = false;
+        for (var _b = 0, outputs_1 = outputs; _b < outputs_1.length; _b++) {
+            var output = outputs_1[_b];
+            // Output is missing; can stop checking
+            // Don't immediately return because we can still be upstream-blocked, which is a higher-priority status
+            if (!host.fileExists(output)) {
+                missingOutputFileName = output;
+                break;
+            }
+            var outputTime = host.getModifiedTime(output) || ts.missingFileModifiedTime;
+            if (outputTime < oldestOutputFileTime) {
+                oldestOutputFileTime = outputTime;
+                oldestOutputFileName = output;
+            }
+            // If an output is older than the newest input, we can stop checking
+            // Don't immediately return because we can still be upstream-blocked, which is a higher-priority status
+            if (outputTime < newestInputFileTime) {
+                isOutOfDateWithInputs = true;
+                break;
+            }
+            if (outputTime > newestOutputFileTime) {
+                newestOutputFileTime = outputTime;
+                newestOutputFileName = output;
+            }
+            // Keep track of when the most recent time a .d.ts file was changed.
+            // In addition to file timestamps, we also keep track of when a .d.ts file
+            // had its file touched but not had its contents changed - this allows us
+            // to skip a downstream typecheck
+            if (isDeclarationFile(output)) {
+                var outputModifiedTime = host.getModifiedTime(output) || ts.missingFileModifiedTime;
+                newestDeclarationFileContentChangedTime = newer(newestDeclarationFileContentChangedTime, outputModifiedTime);
+            }
+        }
+        var pseudoUpToDate = false;
+        var usesPrepend = false;
+        var upstreamChangedProject;
+        if (project.projectReferences) {
+            state.projectStatus.set(resolvedPath, { type: ts.UpToDateStatusType.ComputingUpstream });
+            for (var _c = 0, _d = project.projectReferences; _c < _d.length; _c++) {
+                var ref = _d[_c];
+                usesPrepend = usesPrepend || !!(ref.prepend);
+                var resolvedRef = ts.resolveProjectReferencePath(ref);
+                var resolvedRefPath = toResolvedConfigFilePath(state, resolvedRef);
+                var refStatus = getUpToDateStatus(state, parseConfigFile(state, resolvedRef, resolvedRefPath), resolvedRefPath);
+                // Its a circular reference ignore the status of this project
+                if (refStatus.type === ts.UpToDateStatusType.ComputingUpstream ||
+                    refStatus.type === ts.UpToDateStatusType.ContainerOnly) { // Container only ignore this project
+                    continue;
+                }
+                // An upstream project is blocked
+                if (refStatus.type === ts.UpToDateStatusType.Unbuildable) {
+                    return {
+                        type: ts.UpToDateStatusType.UpstreamBlocked,
+                        upstreamProjectName: ref.path
+                    };
+                }
+                // If the upstream project is out of date, then so are we (someone shouldn't have asked, though?)
+                if (refStatus.type !== ts.UpToDateStatusType.UpToDate) {
+                    return {
+                        type: ts.UpToDateStatusType.UpstreamOutOfDate,
+                        upstreamProjectName: ref.path
+                    };
+                }
+                // Check oldest output file name only if there is no missing output file name
+                if (!missingOutputFileName) {
+                    // If the upstream project's newest file is older than our oldest output, we
+                    // can't be out of date because of it
+                    if (refStatus.newestInputFileTime && refStatus.newestInputFileTime <= oldestOutputFileTime) {
+                        continue;
+                    }
+                    // If the upstream project has only change .d.ts files, and we've built
+                    // *after* those files, then we're "psuedo up to date" and eligible for a fast rebuild
+                    if (refStatus.newestDeclarationFileContentChangedTime && refStatus.newestDeclarationFileContentChangedTime <= oldestOutputFileTime) {
+                        pseudoUpToDate = true;
+                        upstreamChangedProject = ref.path;
+                        continue;
+                    }
+                    // We have an output older than an upstream output - we are out of date
+                    ts.Debug.assert(oldestOutputFileName !== undefined, "Should have an oldest output filename here");
+                    return {
+                        type: ts.UpToDateStatusType.OutOfDateWithUpstream,
+                        outOfDateOutputFileName: oldestOutputFileName,
+                        newerProjectName: ref.path
+                    };
+                }
+            }
+        }
+        if (missingOutputFileName !== undefined) {
+            return {
+                type: ts.UpToDateStatusType.OutputMissing,
+                missingOutputFileName: missingOutputFileName
+            };
+        }
+        if (isOutOfDateWithInputs) {
+            return {
+                type: ts.UpToDateStatusType.OutOfDateWithSelf,
+                outOfDateOutputFileName: oldestOutputFileName,
+                newerInputFileName: newestInputFileName
+            };
+        }
+        else {
+            // Check tsconfig time
+            var configStatus = checkConfigFileUpToDateStatus(state, project.options.configFilePath, oldestOutputFileTime, oldestOutputFileName);
+            if (configStatus)
+                return configStatus;
+            // Check extended config time
+            var extendedConfigStatus = ts.forEach(project.options.configFile.extendedSourceFiles || ts.emptyArray, function (configFile) { return checkConfigFileUpToDateStatus(state, configFile, oldestOutputFileTime, oldestOutputFileName); });
+            if (extendedConfigStatus)
+                return extendedConfigStatus;
+        }
+        if (!state.buildInfoChecked.has(resolvedPath)) {
+            state.buildInfoChecked.set(resolvedPath, true);
+            var buildInfoPath = ts.getOutputPathForBuildInfo(project.options);
+            if (buildInfoPath) {
+                var value = state.readFileWithCache(buildInfoPath);
+                var buildInfo = value && ts.getBuildInfo(value);
+                if (buildInfo && (buildInfo.bundle || buildInfo.program) && buildInfo.version !== ts.version) {
+                    return {
+                        type: ts.UpToDateStatusType.TsVersionOutputOfDate,
+                        version: buildInfo.version
+                    };
+                }
+            }
+        }
+        if (usesPrepend && pseudoUpToDate) {
+            return {
+                type: ts.UpToDateStatusType.OutOfDateWithPrepend,
+                outOfDateOutputFileName: oldestOutputFileName,
+                newerProjectName: upstreamChangedProject
+            };
+        }
+        // Up to date
+        return {
+            type: pseudoUpToDate ? ts.UpToDateStatusType.UpToDateWithUpstreamTypes : ts.UpToDateStatusType.UpToDate,
+            newestDeclarationFileContentChangedTime: newestDeclarationFileContentChangedTime,
+            newestInputFileTime: newestInputFileTime,
+            newestOutputFileTime: newestOutputFileTime,
+            newestInputFileName: newestInputFileName,
+            newestOutputFileName: newestOutputFileName,
+            oldestOutputFileName: oldestOutputFileName
+        };
     }
-    function formatUpToDateStatus(configFileName, status, relName, formatMessage) {
+    function getUpToDateStatus(state, project, resolvedPath) {
+        if (project === undefined) {
+            return { type: ts.UpToDateStatusType.Unbuildable, reason: "File deleted mid-build" };
+        }
+        var prior = state.projectStatus.get(resolvedPath);
+        if (prior !== undefined) {
+            return prior;
+        }
+        var actual = getUpToDateStatusWorker(state, project, resolvedPath);
+        state.projectStatus.set(resolvedPath, actual);
+        return actual;
+    }
+    function updateOutputTimestampsWorker(state, proj, priorNewestUpdateTime, verboseMessage, skipOutputs) {
+        var host = state.host;
+        var outputs = ts.getAllProjectOutputs(proj, !host.useCaseSensitiveFileNames());
+        if (!skipOutputs || outputs.length !== skipOutputs.size) {
+            var reportVerbose = !!state.options.verbose;
+            var now = host.now ? host.now() : new Date();
+            for (var _i = 0, outputs_2 = outputs; _i < outputs_2.length; _i++) {
+                var file = outputs_2[_i];
+                if (skipOutputs && skipOutputs.has(toPath(state, file))) {
+                    continue;
+                }
+                if (reportVerbose) {
+                    reportVerbose = false;
+                    reportStatus(state, verboseMessage, proj.options.configFilePath);
+                }
+                if (isDeclarationFile(file)) {
+                    priorNewestUpdateTime = newer(priorNewestUpdateTime, host.getModifiedTime(file) || ts.missingFileModifiedTime);
+                }
+                host.setModifiedTime(file, now);
+                listEmittedFile(state, proj, file);
+            }
+        }
+        return priorNewestUpdateTime;
+    }
+    function updateOutputTimestamps(state, proj, resolvedPath) {
+        if (state.options.dry) {
+            return reportStatus(state, ts.Diagnostics.A_non_dry_build_would_update_timestamps_for_output_of_project_0, proj.options.configFilePath);
+        }
+        var priorNewestUpdateTime = updateOutputTimestampsWorker(state, proj, minimumDate, ts.Diagnostics.Updating_output_timestamps_of_project_0);
+        state.projectStatus.set(resolvedPath, {
+            type: ts.UpToDateStatusType.UpToDate,
+            newestDeclarationFileContentChangedTime: priorNewestUpdateTime,
+            oldestOutputFileName: ts.getFirstProjectOutput(proj, !state.host.useCaseSensitiveFileNames())
+        });
+    }
+    function queueReferencingProjects(state, project, projectPath, projectIndex, config, buildOrder, buildResult) {
+        // Queue only if there are no errors
+        if (buildResult & BuildResultFlags.AnyErrors)
+            return;
+        // Only composite projects can be referenced by other projects
+        if (!config.options.composite)
+            return;
+        // Always use build order to queue projects
+        for (var index = projectIndex + 1; index < buildOrder.length; index++) {
+            var nextProject = buildOrder[index];
+            var nextProjectPath = toResolvedConfigFilePath(state, nextProject);
+            if (state.projectPendingBuild.has(nextProjectPath))
+                continue;
+            var nextProjectConfig = parseConfigFile(state, nextProject, nextProjectPath);
+            if (!nextProjectConfig || !nextProjectConfig.projectReferences)
+                continue;
+            for (var _i = 0, _a = nextProjectConfig.projectReferences; _i < _a.length; _i++) {
+                var ref = _a[_i];
+                var resolvedRefPath = resolveProjectName(state, ref.path);
+                if (toResolvedConfigFilePath(state, resolvedRefPath) !== projectPath)
+                    continue;
+                // If the project is referenced with prepend, always build downstream projects,
+                // If declaration output is changed, build the project
+                // otherwise mark the project UpToDateWithUpstreamTypes so it updates output time stamps
+                var status = state.projectStatus.get(nextProjectPath);
+                if (status) {
+                    switch (status.type) {
+                        case ts.UpToDateStatusType.UpToDate:
+                            if (buildResult & BuildResultFlags.DeclarationOutputUnchanged) {
+                                if (ref.prepend) {
+                                    state.projectStatus.set(nextProjectPath, {
+                                        type: ts.UpToDateStatusType.OutOfDateWithPrepend,
+                                        outOfDateOutputFileName: status.oldestOutputFileName,
+                                        newerProjectName: project
+                                    });
+                                }
+                                else {
+                                    status.type = ts.UpToDateStatusType.UpToDateWithUpstreamTypes;
+                                }
+                                break;
+                            }
+                        // falls through
+                        case ts.UpToDateStatusType.UpToDateWithUpstreamTypes:
+                        case ts.UpToDateStatusType.OutOfDateWithPrepend:
+                            if (!(buildResult & BuildResultFlags.DeclarationOutputUnchanged)) {
+                                state.projectStatus.set(nextProjectPath, {
+                                    type: ts.UpToDateStatusType.OutOfDateWithUpstream,
+                                    outOfDateOutputFileName: status.type === ts.UpToDateStatusType.OutOfDateWithPrepend ? status.outOfDateOutputFileName : status.oldestOutputFileName,
+                                    newerProjectName: project
+                                });
+                            }
+                            break;
+                        case ts.UpToDateStatusType.UpstreamBlocked:
+                            if (toResolvedConfigFilePath(state, resolveProjectName(state, status.upstreamProjectName)) === projectPath) {
+                                clearProjectStatus(state, nextProjectPath);
+                            }
+                            break;
+                    }
+                }
+                addProjToQueue(state, nextProjectPath, ts.ConfigFileProgramReloadLevel.None);
+                break;
+            }
+        }
+    }
+    function build(state, project, cancellationToken, onlyReferences) {
+        var buildOrder = getBuildOrderFor(state, project, onlyReferences);
+        if (!buildOrder)
+            return ts.ExitStatus.InvalidProject_OutputsSkipped;
+        setupInitialBuild(state, cancellationToken);
+        var reportQueue = true;
+        var successfulProjects = 0;
+        var errorProjects = 0;
+        while (true) {
+            var invalidatedProject = getNextInvalidatedProject(state, buildOrder, reportQueue);
+            if (!invalidatedProject)
+                break;
+            reportQueue = false;
+            invalidatedProject.done(cancellationToken);
+            if (state.diagnostics.has(invalidatedProject.projectPath)) {
+                errorProjects++;
+            }
+            else {
+                successfulProjects++;
+            }
+        }
+        disableCache(state);
+        reportErrorSummary(state, buildOrder);
+        startWatching(state, buildOrder);
+        return errorProjects ?
+            successfulProjects ?
+                ts.ExitStatus.DiagnosticsPresent_OutputsGenerated :
+                ts.ExitStatus.DiagnosticsPresent_OutputsSkipped :
+            ts.ExitStatus.Success;
+    }
+    function clean(state, project, onlyReferences) {
+        var buildOrder = getBuildOrderFor(state, project, onlyReferences);
+        if (!buildOrder)
+            return ts.ExitStatus.InvalidProject_OutputsSkipped;
+        var options = state.options, host = state.host;
+        var filesToDelete = options.dry ? [] : undefined;
+        for (var _i = 0, buildOrder_1 = buildOrder; _i < buildOrder_1.length; _i++) {
+            var proj = buildOrder_1[_i];
+            var resolvedPath = toResolvedConfigFilePath(state, proj);
+            var parsed = parseConfigFile(state, proj, resolvedPath);
+            if (parsed === undefined) {
+                // File has gone missing; fine to ignore here
+                reportParseConfigFileDiagnostic(state, resolvedPath);
+                continue;
+            }
+            var outputs = ts.getAllProjectOutputs(parsed, !host.useCaseSensitiveFileNames());
+            for (var _a = 0, outputs_3 = outputs; _a < outputs_3.length; _a++) {
+                var output = outputs_3[_a];
+                if (host.fileExists(output)) {
+                    if (filesToDelete) {
+                        filesToDelete.push(output);
+                    }
+                    else {
+                        host.deleteFile(output);
+                        invalidateProject(state, resolvedPath, ts.ConfigFileProgramReloadLevel.None);
+                    }
+                }
+            }
+        }
+        if (filesToDelete) {
+            reportStatus(state, ts.Diagnostics.A_non_dry_build_would_delete_the_following_files_Colon_0, filesToDelete.map(function (f) { return "\r\n * " + f; }).join(""));
+        }
+        return ts.ExitStatus.Success;
+    }
+    function invalidateProject(state, resolved, reloadLevel) {
+        // If host implements getParsedCommandLine, we cant get list of files from parseConfigFileHost
+        if (state.host.getParsedCommandLine && reloadLevel === ts.ConfigFileProgramReloadLevel.Partial) {
+            reloadLevel = ts.ConfigFileProgramReloadLevel.Full;
+        }
+        if (reloadLevel === ts.ConfigFileProgramReloadLevel.Full) {
+            state.configFileCache.delete(resolved);
+            state.buildOrder = undefined;
+        }
+        state.needsSummary = true;
+        clearProjectStatus(state, resolved);
+        addProjToQueue(state, resolved, reloadLevel);
+        enableCache(state);
+    }
+    function invalidateProjectAndScheduleBuilds(state, resolvedPath, reloadLevel) {
+        state.reportFileChangeDetected = true;
+        invalidateProject(state, resolvedPath, reloadLevel);
+        scheduleBuildInvalidatedProject(state);
+    }
+    function scheduleBuildInvalidatedProject(state) {
+        var hostWithWatch = state.hostWithWatch;
+        if (!hostWithWatch.setTimeout || !hostWithWatch.clearTimeout) {
+            return;
+        }
+        if (state.timerToBuildInvalidatedProject) {
+            hostWithWatch.clearTimeout(state.timerToBuildInvalidatedProject);
+        }
+        state.timerToBuildInvalidatedProject = hostWithWatch.setTimeout(buildNextInvalidatedProject, 250, state);
+    }
+    function buildNextInvalidatedProject(state) {
+        state.timerToBuildInvalidatedProject = undefined;
+        if (state.reportFileChangeDetected) {
+            state.reportFileChangeDetected = false;
+            state.projectErrorsReported.clear();
+            reportWatchStatus(state, ts.Diagnostics.File_change_detected_Starting_incremental_compilation);
+        }
+        var buildOrder = getBuildOrder(state);
+        var invalidatedProject = getNextInvalidatedProject(state, buildOrder, /*reportQueue*/ false);
+        if (invalidatedProject) {
+            invalidatedProject.done();
+            if (state.projectPendingBuild.size) {
+                // Schedule next project for build
+                if (state.watch && !state.timerToBuildInvalidatedProject) {
+                    scheduleBuildInvalidatedProject(state);
+                }
+                return;
+            }
+        }
+        disableCache(state);
+        reportErrorSummary(state, buildOrder);
+    }
+    function watchConfigFile(state, resolved, resolvedPath) {
+        if (!state.watch || state.allWatchedConfigFiles.has(resolvedPath))
+            return;
+        state.allWatchedConfigFiles.set(resolvedPath, state.watchFile(state.hostWithWatch, resolved, function () {
+            invalidateProjectAndScheduleBuilds(state, resolvedPath, ts.ConfigFileProgramReloadLevel.Full);
+        }, ts.PollingInterval.High, "Config file" /* ConfigFile */, resolved));
+    }
+    function isSameFile(state, file1, file2) {
+        return ts.comparePaths(file1, file2, state.currentDirectory, !state.host.useCaseSensitiveFileNames()) === 0 /* EqualTo */;
+    }
+    function isOutputFile(state, fileName, configFile) {
+        if (configFile.options.noEmit)
+            return false;
+        // ts or tsx files are not output
+        if (!ts.fileExtensionIs(fileName, ".d.ts" /* Dts */) &&
+            (ts.fileExtensionIs(fileName, ".ts" /* Ts */) || ts.fileExtensionIs(fileName, ".tsx" /* Tsx */))) {
+            return false;
+        }
+        // If options have --outFile or --out, check if its that
+        var out = configFile.options.outFile || configFile.options.out;
+        if (out && (isSameFile(state, fileName, out) || isSameFile(state, fileName, ts.removeFileExtension(out) + ".d.ts" /* Dts */))) {
+            return true;
+        }
+        // If declarationDir is specified, return if its a file in that directory
+        if (configFile.options.declarationDir && ts.containsPath(configFile.options.declarationDir, fileName, state.currentDirectory, !state.host.useCaseSensitiveFileNames())) {
+            return true;
+        }
+        // If --outDir, check if file is in that directory
+        if (configFile.options.outDir && ts.containsPath(configFile.options.outDir, fileName, state.currentDirectory, !state.host.useCaseSensitiveFileNames())) {
+            return true;
+        }
+        return !ts.forEach(configFile.fileNames, function (inputFile) { return isSameFile(state, fileName, inputFile); });
+    }
+    function watchWildCardDirectories(state, resolved, resolvedPath, parsed) {
+        if (!state.watch)
+            return;
+        ts.updateWatchingWildcardDirectories(getOrCreateValueMapFromConfigFileMap(state.allWatchedWildcardDirectories, resolvedPath), ts.createMapFromTemplate(parsed.configFileSpecs.wildcardDirectories), function (dir, flags) { return state.watchDirectory(state.hostWithWatch, dir, function (fileOrDirectory) {
+            var fileOrDirectoryPath = toPath(state, fileOrDirectory);
+            if (fileOrDirectoryPath !== toPath(state, dir) && ts.hasExtension(fileOrDirectoryPath) && !ts.isSupportedSourceFileName(fileOrDirectory, parsed.options)) {
+                state.writeLog("Project: " + resolved + " Detected file add/remove of non supported extension: " + fileOrDirectory);
+                return;
+            }
+            if (isOutputFile(state, fileOrDirectory, parsed)) {
+                state.writeLog(fileOrDirectory + " is output file");
+                return;
+            }
+            invalidateProjectAndScheduleBuilds(state, resolvedPath, ts.ConfigFileProgramReloadLevel.Partial);
+        }, flags, "Wild card directory" /* WildcardDirectory */, resolved); });
+    }
+    function watchInputFiles(state, resolved, resolvedPath, parsed) {
+        if (!state.watch)
+            return;
+        ts.mutateMap(getOrCreateValueMapFromConfigFileMap(state.allWatchedInputFiles, resolvedPath), ts.arrayToMap(parsed.fileNames, function (fileName) { return toPath(state, fileName); }), {
+            createNewValue: function (path, input) { return state.watchFilePath(state.hostWithWatch, input, function () { return invalidateProjectAndScheduleBuilds(state, resolvedPath, ts.ConfigFileProgramReloadLevel.None); }, ts.PollingInterval.Low, path, "Source file" /* SourceFile */, resolved); },
+            onDeleteValue: ts.closeFileWatcher,
+        });
+    }
+    function startWatching(state, buildOrder) {
+        if (!state.watchAllProjectsPending)
+            return;
+        state.watchAllProjectsPending = false;
+        for (var _i = 0, buildOrder_2 = buildOrder; _i < buildOrder_2.length; _i++) {
+            var resolved = buildOrder_2[_i];
+            var resolvedPath = toResolvedConfigFilePath(state, resolved);
+            // Watch this file
+            watchConfigFile(state, resolved, resolvedPath);
+            var cfg = parseConfigFile(state, resolved, resolvedPath);
+            if (cfg) {
+                // Update watchers for wildcard directories
+                watchWildCardDirectories(state, resolved, resolvedPath, cfg);
+                // Watch input files
+                watchInputFiles(state, resolved, resolvedPath, cfg);
+            }
+        }
+    }
+    function createSolutionBuilderWorker(watch, hostOrHostWithWatch, rootNames, options) {
+        var state = createSolutionBuilderState(watch, hostOrHostWithWatch, rootNames, options);
+        return {
+            build: function (project, cancellationToken) { return build(state, project, cancellationToken); },
+            clean: function (project) { return clean(state, project); },
+            buildReferences: function (project, cancellationToken) { return build(state, project, cancellationToken, /*onlyReferences*/ true); },
+            cleanReferences: function (project) { return clean(state, project, /*onlyReferences*/ true); },
+            getNextInvalidatedProject: function (cancellationToken) {
+                setupInitialBuild(state, cancellationToken);
+                return getNextInvalidatedProject(state, getBuildOrder(state), /*reportQueue*/ false);
+            },
+            getBuildOrder: function () { return getBuildOrder(state); },
+            getUpToDateStatusOfProject: function (project) {
+                var configFileName = resolveProjectName(state, project);
+                var configFilePath = toResolvedConfigFilePath(state, configFileName);
+                return getUpToDateStatus(state, parseConfigFile(state, configFileName, configFilePath), configFilePath);
+            },
+            invalidateProject: function (configFilePath, reloadLevel) { return invalidateProject(state, configFilePath, reloadLevel || ts.ConfigFileProgramReloadLevel.None); },
+            buildNextInvalidatedProject: function () { return buildNextInvalidatedProject(state); },
+        };
+    }
+    function relName(state, path) {
+        return ts.convertToRelativePath(path, state.currentDirectory, function (f) { return state.getCanonicalFileName(f); });
+    }
+    function reportStatus(state, message) {
+        var args = [];
+        for (var _i = 2; _i < arguments.length; _i++) {
+            args[_i - 2] = arguments[_i];
+        }
+        state.host.reportSolutionBuilderStatus(ts.createCompilerDiagnostic.apply(void 0, [message].concat(args)));
+    }
+    function reportWatchStatus(state, message) {
+        var args = [];
+        for (var _i = 2; _i < arguments.length; _i++) {
+            args[_i - 2] = arguments[_i];
+        }
+        if (state.hostWithWatch.onWatchStatusChange) {
+            state.hostWithWatch.onWatchStatusChange(ts.createCompilerDiagnostic.apply(void 0, [message].concat(args)), state.host.getNewLine(), state.baseCompilerOptions);
+        }
+    }
+    function reportErrors(_a, errors) {
+        var host = _a.host;
+        errors.forEach(function (err) { return host.reportDiagnostic(err); });
+    }
+    function reportAndStoreErrors(state, proj, errors) {
+        reportErrors(state, errors);
+        state.projectErrorsReported.set(proj, true);
+        if (errors.length) {
+            state.diagnostics.set(proj, errors);
+        }
+    }
+    function reportParseConfigFileDiagnostic(state, proj) {
+        reportAndStoreErrors(state, proj, [state.configFileCache.get(proj)]);
+    }
+    function reportErrorSummary(state, buildOrder) {
+        if (!state.needsSummary || (!state.watch && !state.host.reportErrorSummary))
+            return;
+        state.needsSummary = false;
+        var diagnostics = state.diagnostics;
+        // Report errors from the other projects
+        buildOrder.forEach(function (project) {
+            var projectPath = toResolvedConfigFilePath(state, project);
+            if (!state.projectErrorsReported.has(projectPath)) {
+                reportErrors(state, diagnostics.get(projectPath) || ts.emptyArray);
+            }
+        });
+        var totalErrors = 0;
+        diagnostics.forEach(function (singleProjectErrors) { return totalErrors += ts.getErrorCountForSummary(singleProjectErrors); });
+        if (state.watch) {
+            reportWatchStatus(state, ts.getWatchErrorSummaryDiagnosticMessage(totalErrors), totalErrors);
+        }
+        else {
+            state.host.reportErrorSummary(totalErrors);
+        }
+    }
+    /**
+     * Report the build ordering inferred from the current project graph if we're in verbose mode
+     */
+    function reportBuildQueue(state, buildQueue) {
+        if (state.options.verbose) {
+            reportStatus(state, ts.Diagnostics.Projects_in_this_build_Colon_0, buildQueue.map(function (s) { return "\r\n    * " + relName(state, s); }).join(""));
+        }
+    }
+    function reportUpToDateStatus(state, configFileName, status) {
         switch (status.type) {
-            case UpToDateStatusType.OutOfDateWithSelf:
-                return formatMessage(ts.Diagnostics.Project_0_is_out_of_date_because_oldest_output_1_is_older_than_newest_input_2, relName(configFileName), relName(status.outOfDateOutputFileName), relName(status.newerInputFileName));
-            case UpToDateStatusType.OutOfDateWithUpstream:
-                return formatMessage(ts.Diagnostics.Project_0_is_out_of_date_because_oldest_output_1_is_older_than_newest_input_2, relName(configFileName), relName(status.outOfDateOutputFileName), relName(status.newerProjectName));
-            case UpToDateStatusType.OutputMissing:
-                return formatMessage(ts.Diagnostics.Project_0_is_out_of_date_because_output_file_1_does_not_exist, relName(configFileName), relName(status.missingOutputFileName));
-            case UpToDateStatusType.UpToDate:
+            case ts.UpToDateStatusType.OutOfDateWithSelf:
+                return reportStatus(state, ts.Diagnostics.Project_0_is_out_of_date_because_oldest_output_1_is_older_than_newest_input_2, relName(state, configFileName), relName(state, status.outOfDateOutputFileName), relName(state, status.newerInputFileName));
+            case ts.UpToDateStatusType.OutOfDateWithUpstream:
+                return reportStatus(state, ts.Diagnostics.Project_0_is_out_of_date_because_oldest_output_1_is_older_than_newest_input_2, relName(state, configFileName), relName(state, status.outOfDateOutputFileName), relName(state, status.newerProjectName));
+            case ts.UpToDateStatusType.OutputMissing:
+                return reportStatus(state, ts.Diagnostics.Project_0_is_out_of_date_because_output_file_1_does_not_exist, relName(state, configFileName), relName(state, status.missingOutputFileName));
+            case ts.UpToDateStatusType.UpToDate:
                 if (status.newestInputFileTime !== undefined) {
-                    return formatMessage(ts.Diagnostics.Project_0_is_up_to_date_because_newest_input_1_is_older_than_oldest_output_2, relName(configFileName), relName(status.newestInputFileName || ""), relName(status.oldestOutputFileName || ""));
+                    return reportStatus(state, ts.Diagnostics.Project_0_is_up_to_date_because_newest_input_1_is_older_than_oldest_output_2, relName(state, configFileName), relName(state, status.newestInputFileName || ""), relName(state, status.oldestOutputFileName || ""));
                 }
                 // Don't report anything for "up to date because it was already built" -- too verbose
                 break;
-            case UpToDateStatusType.OutOfDateWithPrepend:
-                return formatMessage(ts.Diagnostics.Project_0_is_out_of_date_because_output_of_its_dependency_1_has_changed, relName(configFileName), relName(status.newerProjectName));
-            case UpToDateStatusType.UpToDateWithUpstreamTypes:
-                return formatMessage(ts.Diagnostics.Project_0_is_up_to_date_with_d_ts_files_from_its_dependencies, relName(configFileName));
-            case UpToDateStatusType.UpstreamOutOfDate:
-                return formatMessage(ts.Diagnostics.Project_0_is_out_of_date_because_its_dependency_1_is_out_of_date, relName(configFileName), relName(status.upstreamProjectName));
-            case UpToDateStatusType.UpstreamBlocked:
-                return formatMessage(ts.Diagnostics.Project_0_can_t_be_built_because_its_dependency_1_has_errors, relName(configFileName), relName(status.upstreamProjectName));
-            case UpToDateStatusType.Unbuildable:
-                return formatMessage(ts.Diagnostics.Failed_to_parse_file_0_Colon_1, relName(configFileName), status.reason);
-            case UpToDateStatusType.TsVersionOutputOfDate:
-                return formatMessage(ts.Diagnostics.Project_0_is_out_of_date_because_output_for_it_was_generated_with_version_1_that_differs_with_current_version_2, relName(configFileName), status.version, ts.version);
-            case UpToDateStatusType.ContainerOnly:
+            case ts.UpToDateStatusType.OutOfDateWithPrepend:
+                return reportStatus(state, ts.Diagnostics.Project_0_is_out_of_date_because_output_of_its_dependency_1_has_changed, relName(state, configFileName), relName(state, status.newerProjectName));
+            case ts.UpToDateStatusType.UpToDateWithUpstreamTypes:
+                return reportStatus(state, ts.Diagnostics.Project_0_is_up_to_date_with_d_ts_files_from_its_dependencies, relName(state, configFileName));
+            case ts.UpToDateStatusType.UpstreamOutOfDate:
+                return reportStatus(state, ts.Diagnostics.Project_0_is_out_of_date_because_its_dependency_1_is_out_of_date, relName(state, configFileName), relName(state, status.upstreamProjectName));
+            case ts.UpToDateStatusType.UpstreamBlocked:
+                return reportStatus(state, ts.Diagnostics.Project_0_can_t_be_built_because_its_dependency_1_has_errors, relName(state, configFileName), relName(state, status.upstreamProjectName));
+            case ts.UpToDateStatusType.Unbuildable:
+                return reportStatus(state, ts.Diagnostics.Failed_to_parse_file_0_Colon_1, relName(state, configFileName), status.reason);
+            case ts.UpToDateStatusType.TsVersionOutputOfDate:
+                return reportStatus(state, ts.Diagnostics.Project_0_is_out_of_date_because_output_for_it_was_generated_with_version_1_that_differs_with_current_version_2, relName(state, configFileName), status.version, ts.version);
+            case ts.UpToDateStatusType.ContainerOnly:
             // Don't report status on "solution" projects
-            case UpToDateStatusType.ComputingUpstream:
+            case ts.UpToDateStatusType.ComputingUpstream:
                 // Should never leak from getUptoDateStatusWorker
                 break;
             default:
                 ts.assertType(status);
         }
     }
-    ts.formatUpToDateStatus = formatUpToDateStatus;
-})(ts || (ts = {}));
-/* @internal */
-var ts;
-(function (ts) {
-    var ValueKind;
-    (function (ValueKind) {
-        ValueKind[ValueKind["Const"] = 0] = "Const";
-        ValueKind[ValueKind["Array"] = 1] = "Array";
-        ValueKind[ValueKind["FunctionOrClass"] = 2] = "FunctionOrClass";
-        ValueKind[ValueKind["Object"] = 3] = "Object";
-    })(ValueKind = ts.ValueKind || (ts.ValueKind = {}));
-    function inspectModule(fileNameToRequire) {
-        return inspectValue(ts.removeFileExtension(ts.getBaseFileName(fileNameToRequire)), tryRequire(fileNameToRequire));
-    }
-    ts.inspectModule = inspectModule;
-    function inspectValue(name, value) {
-        return getValueInfo(name, value, getRecurser());
-    }
-    ts.inspectValue = inspectValue;
-    function getRecurser() {
-        var seen = [];
-        var nameStack = [];
-        return function (obj, name, cbOk, cbFail) {
-            if (seen.indexOf(obj) !== -1 || nameStack.length > 4) {
-                return cbFail(seen.indexOf(obj) !== -1, nameStack);
-            }
-            seen.push(obj);
-            nameStack.push(name);
-            var res = cbOk();
-            nameStack.pop();
-            seen.pop();
-            return res;
-        };
-    }
-    function getValueInfo(name, value, recurser) {
-        return recurser(value, name, function () {
-            if (typeof value === "function")
-                return getFunctionOrClassInfo(value, name, recurser);
-            if (typeof value === "object") {
-                var builtin = getBuiltinType(name, value, recurser);
-                if (builtin !== undefined)
-                    return builtin;
-                var entries = getEntriesOfObject(value);
-                var hasNontrivialPrototype = Object.getPrototypeOf(value) !== Object.prototype;
-                var members = ts.flatMap(entries, function (_a) {
-                    var key = _a.key, value = _a.value;
-                    return getValueInfo(key, value, recurser);
-                });
-                return { kind: 3 /* Object */, name: name, hasNontrivialPrototype: hasNontrivialPrototype, members: members };
-            }
-            return { kind: 0 /* Const */, name: name, typeName: isNullOrUndefined(value) ? "any" : typeof value };
-        }, function (isCircularReference, keyStack) { return anyValue(name, " " + (isCircularReference ? "Circular reference" : "Too-deep object hierarchy") + " from " + keyStack.join(".")); });
-    }
-    function getFunctionOrClassInfo(fn, name, recurser) {
-        var prototypeMembers = getPrototypeMembers(fn, recurser);
-        var namespaceMembers = ts.flatMap(getEntriesOfObject(fn), function (_a) {
-            var key = _a.key, value = _a.value;
-            return getValueInfo(key, value, recurser);
-        });
-        var toString = ts.cast(Function.prototype.toString.call(fn), ts.isString);
-        var source = ts.stringContains(toString, "{ [native code] }") ? getFunctionLength(fn) : toString;
-        return { kind: 2 /* FunctionOrClass */, name: name, source: source, namespaceMembers: namespaceMembers, prototypeMembers: prototypeMembers };
-    }
-    var builtins = ts.memoize(function () {
-        var map = ts.createMap();
-        for (var _i = 0, _a = getEntriesOfObject(global); _i < _a.length; _i++) {
-            var _b = _a[_i], key = _b.key, value = _b.value;
-            if (typeof value === "function" && typeof value.prototype === "object" && value !== Object) {
-                map.set(key, value);
-            }
-        }
-        return map;
-    });
-    function getBuiltinType(name, value, recurser) {
-        return ts.isArray(value)
-            ? { name: name, kind: 1 /* Array */, inner: value.length && getValueInfo("element", ts.first(value), recurser) || anyValue(name) }
-            : ts.forEachEntry(builtins(), function (builtin, builtinName) {
-                return value instanceof builtin ? { kind: 0 /* Const */, name: name, typeName: builtinName } : undefined;
-            });
-    }
-    function getPrototypeMembers(fn, recurser) {
-        var prototype = fn.prototype;
-        // tslint:disable-next-line no-unnecessary-type-assertion (TODO: update LKG and it will really be unnecessary)
-        return typeof prototype !== "object" || prototype === null ? ts.emptyArray : ts.mapDefined(getEntriesOfObject(prototype), function (_a) {
-            var key = _a.key, value = _a.value;
-            return key === "constructor" ? undefined : getValueInfo(key, value, recurser);
-        });
-    }
-    var ignoredProperties = ["arguments", "caller", "constructor", "eval", "super_"];
-    var reservedFunctionProperties = Object.getOwnPropertyNames(ts.noop);
-    function getEntriesOfObject(obj) {
-        var seen = ts.createMap();
-        var entries = [];
-        var chain = obj;
-        while (!isNullOrUndefined(chain) && chain !== Object.prototype && chain !== Function.prototype) {
-            for (var _i = 0, _a = Object.getOwnPropertyNames(chain); _i < _a.length; _i++) {
-                var key = _a[_i];
-                if (!isJsPrivate(key) &&
-                    ignoredProperties.indexOf(key) === -1 &&
-                    (typeof obj !== "function" || reservedFunctionProperties.indexOf(key) === -1) &&
-                    // Don't add property from a higher prototype if it already exists in a lower one
-                    ts.addToSeen(seen, key)) {
-                    var value = safeGetPropertyOfObject(chain, key);
-                    // Don't repeat "toString" that matches signature from Object.prototype
-                    if (!(key === "toString" && typeof value === "function" && value.length === 0)) {
-                        entries.push({ key: key, value: value });
-                    }
-                }
-            }
-            chain = Object.getPrototypeOf(chain);
-        }
-        return entries.sort(function (e1, e2) { return ts.compareStringsCaseSensitive(e1.key, e2.key); });
-    }
-    function getFunctionLength(fn) {
-        return ts.tryCast(safeGetPropertyOfObject(fn, "length"), ts.isNumber) || 0;
-    }
-    function safeGetPropertyOfObject(obj, key) {
-        var desc = Object.getOwnPropertyDescriptor(obj, key);
-        return desc && desc.value;
-    }
-    function isNullOrUndefined(value) {
-        return value == null; // tslint:disable-line
-    }
-    function anyValue(name, comment) {
-        return { kind: 0 /* Const */, name: name, typeName: "any", comment: comment };
-    }
-    function isJsPrivate(name) {
-        return ts.startsWith(name, "_");
-    }
-    ts.isJsPrivate = isJsPrivate;
-    function tryRequire(fileNameToRequire) {
-        try {
-            return require(fileNameToRequire);
-        }
-        catch (_a) {
-            return undefined;
+    /**
+     * Report the up-to-date status of a project if we're in verbose mode
+     */
+    function verboseReportProjectStatus(state, configFileName, status) {
+        if (state.options.verbose) {
+            reportUpToDateStatus(state, configFileName, status);
         }
     }
 })(ts || (ts = {}));
@@ -94606,7 +97544,6 @@ var ts;
         server.ActionSet = "action::set";
         server.ActionInvalidate = "action::invalidate";
         server.ActionPackageInstalled = "action::packageInstalled";
-        server.ActionValueInspected = "action::valueInspected";
         server.EventTypesRegistry = "event::typesRegistry";
         server.EventBeginInstallTypes = "event::beginInstallTypes";
         server.EventEndInstallTypes = "event::endInstallTypes";
@@ -94623,6 +97560,11 @@ var ts;
              * typingsInstaller will run the command with `${npmLocation} install ...`.
              */
             Arguments.NpmLocation = "--npmLocation";
+            /**
+             * Flag indicating that the typings installer should try to validate the default npm location.
+             * If the default npm is not found when this flag is enabled, fallback to `npm install`
+             */
+            Arguments.ValidateDefaultNpmLocation = "--validateDefaultNpmLocation";
         })(Arguments = server.Arguments || (server.Arguments = {}));
         function hasArgument(argumentName) {
             return ts.sys.args.indexOf(argumentName) >= 0;
@@ -94692,6 +97634,10 @@ var ts;
             "zlib"
         ];
         JsTyping.nodeCoreModules = ts.arrayToSet(JsTyping.nodeCoreModuleList);
+        function nonRelativeModuleNameForTypingCache(moduleName) {
+            return JsTyping.nodeCoreModules.has(moduleName) ? "node" : moduleName;
+        }
+        JsTyping.nonRelativeModuleNameForTypingCache = nonRelativeModuleNameForTypingCache;
         function loadSafeList(host, safeListPath) {
             var result = ts.readConfigFile(safeListPath, function (path) { return host.readFile(path); });
             return ts.createMapFromTemplate(result.config);
@@ -94747,7 +97693,7 @@ var ts;
             getTypingNamesFromSourceFileNames(fileNames);
             // add typings for unresolved imports
             if (unresolvedImports) {
-                var module_1 = ts.deduplicate(unresolvedImports.map(function (moduleId) { return JsTyping.nodeCoreModules.has(moduleId) ? "node" : moduleId; }), ts.equateStringsCaseSensitive, ts.compareStringsCaseSensitive);
+                var module_1 = ts.deduplicate(unresolvedImports.map(nonRelativeModuleNameForTypingCache), ts.equateStringsCaseSensitive, ts.compareStringsCaseSensitive);
                 addInferredTypings(module_1, "Inferred typings from unresolved imports");
             }
             // Add the cached typing locations for inferred typings that are already installed
@@ -94875,66 +97821,82 @@ var ts;
             }
         }
         JsTyping.discoverTypings = discoverTypings;
-        var PackageNameValidationResult;
-        (function (PackageNameValidationResult) {
-            PackageNameValidationResult[PackageNameValidationResult["Ok"] = 0] = "Ok";
-            PackageNameValidationResult[PackageNameValidationResult["ScopedPackagesNotSupported"] = 1] = "ScopedPackagesNotSupported";
-            PackageNameValidationResult[PackageNameValidationResult["EmptyName"] = 2] = "EmptyName";
-            PackageNameValidationResult[PackageNameValidationResult["NameTooLong"] = 3] = "NameTooLong";
-            PackageNameValidationResult[PackageNameValidationResult["NameStartsWithDot"] = 4] = "NameStartsWithDot";
-            PackageNameValidationResult[PackageNameValidationResult["NameStartsWithUnderscore"] = 5] = "NameStartsWithUnderscore";
-            PackageNameValidationResult[PackageNameValidationResult["NameContainsNonURISafeCharacters"] = 6] = "NameContainsNonURISafeCharacters";
-        })(PackageNameValidationResult = JsTyping.PackageNameValidationResult || (JsTyping.PackageNameValidationResult = {}));
+        var NameValidationResult;
+        (function (NameValidationResult) {
+            NameValidationResult[NameValidationResult["Ok"] = 0] = "Ok";
+            NameValidationResult[NameValidationResult["EmptyName"] = 1] = "EmptyName";
+            NameValidationResult[NameValidationResult["NameTooLong"] = 2] = "NameTooLong";
+            NameValidationResult[NameValidationResult["NameStartsWithDot"] = 3] = "NameStartsWithDot";
+            NameValidationResult[NameValidationResult["NameStartsWithUnderscore"] = 4] = "NameStartsWithUnderscore";
+            NameValidationResult[NameValidationResult["NameContainsNonURISafeCharacters"] = 5] = "NameContainsNonURISafeCharacters";
+        })(NameValidationResult = JsTyping.NameValidationResult || (JsTyping.NameValidationResult = {}));
         var maxPackageNameLength = 214;
         /**
          * Validates package name using rules defined at https://docs.npmjs.com/files/package.json
          */
         function validatePackageName(packageName) {
+            return validatePackageNameWorker(packageName, /*supportScopedPackage*/ true);
+        }
+        JsTyping.validatePackageName = validatePackageName;
+        function validatePackageNameWorker(packageName, supportScopedPackage) {
             if (!packageName) {
-                return 2 /* EmptyName */;
+                return 1 /* EmptyName */;
             }
             if (packageName.length > maxPackageNameLength) {
-                return 3 /* NameTooLong */;
+                return 2 /* NameTooLong */;
             }
             if (packageName.charCodeAt(0) === 46 /* dot */) {
-                return 4 /* NameStartsWithDot */;
+                return 3 /* NameStartsWithDot */;
             }
             if (packageName.charCodeAt(0) === 95 /* _ */) {
-                return 5 /* NameStartsWithUnderscore */;
+                return 4 /* NameStartsWithUnderscore */;
             }
             // check if name is scope package like: starts with @ and has one '/' in the middle
             // scoped packages are not currently supported
-            // TODO: when support will be added we'll need to split and check both scope and package name
-            if (/^@[^/]+\/[^/]+$/.test(packageName)) {
-                return 1 /* ScopedPackagesNotSupported */;
+            if (supportScopedPackage) {
+                var matches = /^@([^/]+)\/([^/]+)$/.exec(packageName);
+                if (matches) {
+                    var scopeResult = validatePackageNameWorker(matches[1], /*supportScopedPackage*/ false);
+                    if (scopeResult !== 0 /* Ok */) {
+                        return { name: matches[1], isScopeName: true, result: scopeResult };
+                    }
+                    var packageResult = validatePackageNameWorker(matches[2], /*supportScopedPackage*/ false);
+                    if (packageResult !== 0 /* Ok */) {
+                        return { name: matches[2], isScopeName: false, result: packageResult };
+                    }
+                    return 0 /* Ok */;
+                }
             }
             if (encodeURIComponent(packageName) !== packageName) {
-                return 6 /* NameContainsNonURISafeCharacters */;
+                return 5 /* NameContainsNonURISafeCharacters */;
             }
             return 0 /* Ok */;
         }
-        JsTyping.validatePackageName = validatePackageName;
         function renderPackageNameValidationFailure(result, typing) {
+            return typeof result === "object" ?
+                renderPackageNameValidationFailureWorker(typing, result.result, result.name, result.isScopeName) :
+                renderPackageNameValidationFailureWorker(typing, result, typing, /*isScopeName*/ false);
+        }
+        JsTyping.renderPackageNameValidationFailure = renderPackageNameValidationFailure;
+        function renderPackageNameValidationFailureWorker(typing, result, name, isScopeName) {
+            var kind = isScopeName ? "Scope" : "Package";
             switch (result) {
-                case 2 /* EmptyName */:
-                    return "Package name '" + typing + "' cannot be empty";
-                case 3 /* NameTooLong */:
-                    return "Package name '" + typing + "' should be less than " + maxPackageNameLength + " characters";
-                case 4 /* NameStartsWithDot */:
-                    return "Package name '" + typing + "' cannot start with '.'";
-                case 5 /* NameStartsWithUnderscore */:
-                    return "Package name '" + typing + "' cannot start with '_'";
-                case 1 /* ScopedPackagesNotSupported */:
-                    return "Package '" + typing + "' is scoped and currently is not supported";
-                case 6 /* NameContainsNonURISafeCharacters */:
-                    return "Package name '" + typing + "' contains non URI safe characters";
+                case 1 /* EmptyName */:
+                    return "'" + typing + "':: " + kind + " name '" + name + "' cannot be empty";
+                case 2 /* NameTooLong */:
+                    return "'" + typing + "':: " + kind + " name '" + name + "' should be less than " + maxPackageNameLength + " characters";
+                case 3 /* NameStartsWithDot */:
+                    return "'" + typing + "':: " + kind + " name '" + name + "' cannot start with '.'";
+                case 4 /* NameStartsWithUnderscore */:
+                    return "'" + typing + "':: " + kind + " name '" + name + "' cannot start with '_'";
+                case 5 /* NameContainsNonURISafeCharacters */:
+                    return "'" + typing + "':: " + kind + " name '" + name + "' contains non URI safe characters";
                 case 0 /* Ok */:
                     return ts.Debug.fail(); // Shouldn't have called this.
                 default:
                     throw ts.Debug.assertNever(result);
             }
         }
-        JsTyping.renderPackageNameValidationFailure = renderPackageNameValidationFailure;
     })(JsTyping = ts.JsTyping || (ts.JsTyping = {}));
 })(ts || (ts = {}));
 var ts;
@@ -95219,7 +98181,7 @@ var ts;
 /* @internal */
 var ts;
 (function (ts) {
-    ts.scanner = ts.createScanner(7 /* Latest */, /*skipTrivia*/ true);
+    ts.scanner = ts.createScanner(99 /* Latest */, /*skipTrivia*/ true);
     var SemanticMeaning;
     (function (SemanticMeaning) {
         SemanticMeaning[SemanticMeaning["None"] = 0] = "None";
@@ -95230,37 +98192,37 @@ var ts;
     })(SemanticMeaning = ts.SemanticMeaning || (ts.SemanticMeaning = {}));
     function getMeaningFromDeclaration(node) {
         switch (node.kind) {
-            case 237 /* VariableDeclaration */:
+            case 238 /* VariableDeclaration */:
                 return ts.isInJSFile(node) && ts.getJSDocEnumTag(node) ? 7 /* All */ : 1 /* Value */;
-            case 151 /* Parameter */:
-            case 186 /* BindingElement */:
-            case 154 /* PropertyDeclaration */:
-            case 153 /* PropertySignature */:
-            case 275 /* PropertyAssignment */:
-            case 276 /* ShorthandPropertyAssignment */:
-            case 156 /* MethodDeclaration */:
-            case 155 /* MethodSignature */:
-            case 157 /* Constructor */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
-            case 239 /* FunctionDeclaration */:
-            case 196 /* FunctionExpression */:
-            case 197 /* ArrowFunction */:
-            case 274 /* CatchClause */:
-            case 267 /* JsxAttribute */:
+            case 152 /* Parameter */:
+            case 187 /* BindingElement */:
+            case 155 /* PropertyDeclaration */:
+            case 154 /* PropertySignature */:
+            case 276 /* PropertyAssignment */:
+            case 277 /* ShorthandPropertyAssignment */:
+            case 157 /* MethodDeclaration */:
+            case 156 /* MethodSignature */:
+            case 158 /* Constructor */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
+            case 240 /* FunctionDeclaration */:
+            case 197 /* FunctionExpression */:
+            case 198 /* ArrowFunction */:
+            case 275 /* CatchClause */:
+            case 268 /* JsxAttribute */:
                 return 1 /* Value */;
-            case 150 /* TypeParameter */:
-            case 241 /* InterfaceDeclaration */:
-            case 242 /* TypeAliasDeclaration */:
-            case 168 /* TypeLiteral */:
+            case 151 /* TypeParameter */:
+            case 242 /* InterfaceDeclaration */:
+            case 243 /* TypeAliasDeclaration */:
+            case 169 /* TypeLiteral */:
                 return 2 /* Type */;
-            case 309 /* JSDocTypedefTag */:
+            case 311 /* JSDocTypedefTag */:
                 // If it has no name node, it shares the name with the value declaration below it.
                 return node.name === undefined ? 1 /* Value */ | 2 /* Type */ : 2 /* Type */;
-            case 278 /* EnumMember */:
-            case 240 /* ClassDeclaration */:
+            case 279 /* EnumMember */:
+            case 241 /* ClassDeclaration */:
                 return 1 /* Value */ | 2 /* Type */;
-            case 244 /* ModuleDeclaration */:
+            case 245 /* ModuleDeclaration */:
                 if (ts.isAmbientModule(node)) {
                     return 4 /* Namespace */ | 1 /* Value */;
                 }
@@ -95270,26 +98232,26 @@ var ts;
                 else {
                     return 4 /* Namespace */;
                 }
-            case 243 /* EnumDeclaration */:
-            case 252 /* NamedImports */:
-            case 253 /* ImportSpecifier */:
-            case 248 /* ImportEqualsDeclaration */:
-            case 249 /* ImportDeclaration */:
-            case 254 /* ExportAssignment */:
-            case 255 /* ExportDeclaration */:
+            case 244 /* EnumDeclaration */:
+            case 253 /* NamedImports */:
+            case 254 /* ImportSpecifier */:
+            case 249 /* ImportEqualsDeclaration */:
+            case 250 /* ImportDeclaration */:
+            case 255 /* ExportAssignment */:
+            case 256 /* ExportDeclaration */:
                 return 7 /* All */;
             // An external module can be a Value
-            case 284 /* SourceFile */:
+            case 285 /* SourceFile */:
                 return 4 /* Namespace */ | 1 /* Value */;
         }
         return 7 /* All */;
     }
     ts.getMeaningFromDeclaration = getMeaningFromDeclaration;
     function getMeaningFromLocation(node) {
-        if (node.kind === 284 /* SourceFile */) {
+        if (node.kind === 285 /* SourceFile */) {
             return 1 /* Value */;
         }
-        else if (node.parent.kind === 254 /* ExportAssignment */ || node.parent.kind === 259 /* ExternalModuleReference */) {
+        else if (node.parent.kind === 255 /* ExportAssignment */ || node.parent.kind === 260 /* ExternalModuleReference */) {
             return 7 /* All */;
         }
         else if (isInRightSideOfInternalImportEqualsDeclaration(node)) {
@@ -95321,11 +98283,11 @@ var ts;
         //     import a = |b|; // Namespace
         //     import a = |b.c|; // Value, type, namespace
         //     import a = |b.c|.d; // Namespace
-        var name = node.kind === 148 /* QualifiedName */ ? node : ts.isQualifiedName(node.parent) && node.parent.right === node ? node.parent : undefined;
-        return name && name.parent.kind === 248 /* ImportEqualsDeclaration */ ? 7 /* All */ : 4 /* Namespace */;
+        var name = node.kind === 149 /* QualifiedName */ ? node : ts.isQualifiedName(node.parent) && node.parent.right === node ? node.parent : undefined;
+        return name && name.parent.kind === 249 /* ImportEqualsDeclaration */ ? 7 /* All */ : 4 /* Namespace */;
     }
     function isInRightSideOfInternalImportEqualsDeclaration(node) {
-        while (node.parent.kind === 148 /* QualifiedName */) {
+        while (node.parent.kind === 149 /* QualifiedName */) {
             node = node.parent;
         }
         return ts.isInternalModuleImportEqualsDeclaration(node.parent) && node.parent.moduleReference === node;
@@ -95337,27 +98299,27 @@ var ts;
     function isQualifiedNameNamespaceReference(node) {
         var root = node;
         var isLastClause = true;
-        if (root.parent.kind === 148 /* QualifiedName */) {
-            while (root.parent && root.parent.kind === 148 /* QualifiedName */) {
+        if (root.parent.kind === 149 /* QualifiedName */) {
+            while (root.parent && root.parent.kind === 149 /* QualifiedName */) {
                 root = root.parent;
             }
             isLastClause = root.right === node;
         }
-        return root.parent.kind === 164 /* TypeReference */ && !isLastClause;
+        return root.parent.kind === 165 /* TypeReference */ && !isLastClause;
     }
     function isPropertyAccessNamespaceReference(node) {
         var root = node;
         var isLastClause = true;
-        if (root.parent.kind === 189 /* PropertyAccessExpression */) {
-            while (root.parent && root.parent.kind === 189 /* PropertyAccessExpression */) {
+        if (root.parent.kind === 190 /* PropertyAccessExpression */) {
+            while (root.parent && root.parent.kind === 190 /* PropertyAccessExpression */) {
                 root = root.parent;
             }
             isLastClause = root.name === node;
         }
-        if (!isLastClause && root.parent.kind === 211 /* ExpressionWithTypeArguments */ && root.parent.parent.kind === 273 /* HeritageClause */) {
+        if (!isLastClause && root.parent.kind === 212 /* ExpressionWithTypeArguments */ && root.parent.parent.kind === 274 /* HeritageClause */) {
             var decl = root.parent.parent.parent;
-            return (decl.kind === 240 /* ClassDeclaration */ && root.parent.parent.token === 109 /* ImplementsKeyword */) ||
-                (decl.kind === 241 /* InterfaceDeclaration */ && root.parent.parent.token === 86 /* ExtendsKeyword */);
+            return (decl.kind === 241 /* ClassDeclaration */ && root.parent.parent.token === 110 /* ImplementsKeyword */) ||
+                (decl.kind === 242 /* InterfaceDeclaration */ && root.parent.parent.token === 87 /* ExtendsKeyword */);
         }
         return false;
     }
@@ -95366,17 +98328,17 @@ var ts;
             node = node.parent;
         }
         switch (node.kind) {
-            case 100 /* ThisKeyword */:
+            case 101 /* ThisKeyword */:
                 return !ts.isExpressionNode(node);
-            case 178 /* ThisType */:
+            case 179 /* ThisType */:
                 return true;
         }
         switch (node.parent.kind) {
-            case 164 /* TypeReference */:
+            case 165 /* TypeReference */:
                 return true;
-            case 183 /* ImportType */:
+            case 184 /* ImportType */:
                 return !node.parent.isTypeOf;
-            case 211 /* ExpressionWithTypeArguments */:
+            case 212 /* ExpressionWithTypeArguments */:
                 return !ts.isExpressionWithTypeArgumentsInClassExtendsClause(node.parent);
         }
         return false;
@@ -95403,7 +98365,7 @@ var ts;
     ts.climbPastPropertyAccess = climbPastPropertyAccess;
     function getTargetLabel(referenceNode, labelName) {
         while (referenceNode) {
-            if (referenceNode.kind === 233 /* LabeledStatement */ && referenceNode.label.escapedText === labelName) {
+            if (referenceNode.kind === 234 /* LabeledStatement */ && referenceNode.label.escapedText === labelName) {
                 return referenceNode.label;
             }
             referenceNode = referenceNode.parent;
@@ -95419,11 +98381,11 @@ var ts;
     }
     ts.hasPropertyAccessExpressionWithName = hasPropertyAccessExpressionWithName;
     function isJumpStatementTarget(node) {
-        return node.kind === 72 /* Identifier */ && ts.isBreakOrContinueStatement(node.parent) && node.parent.label === node;
+        return node.kind === 73 /* Identifier */ && ts.isBreakOrContinueStatement(node.parent) && node.parent.label === node;
     }
     ts.isJumpStatementTarget = isJumpStatementTarget;
     function isLabelOfLabeledStatement(node) {
-        return node.kind === 72 /* Identifier */ && ts.isLabeledStatement(node.parent) && node.parent.label === node;
+        return node.kind === 73 /* Identifier */ && ts.isLabeledStatement(node.parent) && node.parent.label === node;
     }
     ts.isLabelOfLabeledStatement = isLabelOfLabeledStatement;
     function isLabelName(node) {
@@ -95435,40 +98397,40 @@ var ts;
     }
     ts.isTagName = isTagName;
     function isRightSideOfQualifiedName(node) {
-        return node.parent.kind === 148 /* QualifiedName */ && node.parent.right === node;
+        return node.parent.kind === 149 /* QualifiedName */ && node.parent.right === node;
     }
     ts.isRightSideOfQualifiedName = isRightSideOfQualifiedName;
     function isRightSideOfPropertyAccess(node) {
-        return node && node.parent && node.parent.kind === 189 /* PropertyAccessExpression */ && node.parent.name === node;
+        return node && node.parent && node.parent.kind === 190 /* PropertyAccessExpression */ && node.parent.name === node;
     }
     ts.isRightSideOfPropertyAccess = isRightSideOfPropertyAccess;
     function isNameOfModuleDeclaration(node) {
-        return node.parent.kind === 244 /* ModuleDeclaration */ && node.parent.name === node;
+        return node.parent.kind === 245 /* ModuleDeclaration */ && node.parent.name === node;
     }
     ts.isNameOfModuleDeclaration = isNameOfModuleDeclaration;
     function isNameOfFunctionDeclaration(node) {
-        return node.kind === 72 /* Identifier */ &&
+        return node.kind === 73 /* Identifier */ &&
             ts.isFunctionLike(node.parent) && node.parent.name === node;
     }
     ts.isNameOfFunctionDeclaration = isNameOfFunctionDeclaration;
     function isLiteralNameOfPropertyDeclarationOrIndexAccess(node) {
         switch (node.parent.kind) {
-            case 154 /* PropertyDeclaration */:
-            case 153 /* PropertySignature */:
-            case 275 /* PropertyAssignment */:
-            case 278 /* EnumMember */:
-            case 156 /* MethodDeclaration */:
-            case 155 /* MethodSignature */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
-            case 244 /* ModuleDeclaration */:
+            case 155 /* PropertyDeclaration */:
+            case 154 /* PropertySignature */:
+            case 276 /* PropertyAssignment */:
+            case 279 /* EnumMember */:
+            case 157 /* MethodDeclaration */:
+            case 156 /* MethodSignature */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
+            case 245 /* ModuleDeclaration */:
                 return ts.getNameOfDeclaration(node.parent) === node;
-            case 190 /* ElementAccessExpression */:
+            case 191 /* ElementAccessExpression */:
                 return node.parent.argumentExpression === node;
-            case 149 /* ComputedPropertyName */:
+            case 150 /* ComputedPropertyName */:
                 return true;
-            case 182 /* LiteralType */:
-                return node.parent.parent.kind === 180 /* IndexedAccessType */;
+            case 183 /* LiteralType */:
+                return node.parent.parent.kind === 181 /* IndexedAccessType */;
             default:
                 return false;
         }
@@ -95492,17 +98454,17 @@ var ts;
                 return undefined;
             }
             switch (node.kind) {
-                case 284 /* SourceFile */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
-                case 240 /* ClassDeclaration */:
-                case 241 /* InterfaceDeclaration */:
-                case 243 /* EnumDeclaration */:
-                case 244 /* ModuleDeclaration */:
+                case 285 /* SourceFile */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
+                case 241 /* ClassDeclaration */:
+                case 242 /* InterfaceDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     return node;
             }
         }
@@ -95510,48 +98472,48 @@ var ts;
     ts.getContainerNode = getContainerNode;
     function getNodeKind(node) {
         switch (node.kind) {
-            case 284 /* SourceFile */:
+            case 285 /* SourceFile */:
                 return ts.isExternalModule(node) ? "module" /* moduleElement */ : "script" /* scriptElement */;
-            case 244 /* ModuleDeclaration */:
+            case 245 /* ModuleDeclaration */:
                 return "module" /* moduleElement */;
-            case 240 /* ClassDeclaration */:
-            case 209 /* ClassExpression */:
+            case 241 /* ClassDeclaration */:
+            case 210 /* ClassExpression */:
                 return "class" /* classElement */;
-            case 241 /* InterfaceDeclaration */: return "interface" /* interfaceElement */;
-            case 242 /* TypeAliasDeclaration */:
-            case 302 /* JSDocCallbackTag */:
-            case 309 /* JSDocTypedefTag */:
+            case 242 /* InterfaceDeclaration */: return "interface" /* interfaceElement */;
+            case 243 /* TypeAliasDeclaration */:
+            case 304 /* JSDocCallbackTag */:
+            case 311 /* JSDocTypedefTag */:
                 return "type" /* typeElement */;
-            case 243 /* EnumDeclaration */: return "enum" /* enumElement */;
-            case 237 /* VariableDeclaration */:
+            case 244 /* EnumDeclaration */: return "enum" /* enumElement */;
+            case 238 /* VariableDeclaration */:
                 return getKindOfVariableDeclaration(node);
-            case 186 /* BindingElement */:
+            case 187 /* BindingElement */:
                 return getKindOfVariableDeclaration(ts.getRootDeclaration(node));
-            case 197 /* ArrowFunction */:
-            case 239 /* FunctionDeclaration */:
-            case 196 /* FunctionExpression */:
+            case 198 /* ArrowFunction */:
+            case 240 /* FunctionDeclaration */:
+            case 197 /* FunctionExpression */:
                 return "function" /* functionElement */;
-            case 158 /* GetAccessor */: return "getter" /* memberGetAccessorElement */;
-            case 159 /* SetAccessor */: return "setter" /* memberSetAccessorElement */;
-            case 156 /* MethodDeclaration */:
-            case 155 /* MethodSignature */:
+            case 159 /* GetAccessor */: return "getter" /* memberGetAccessorElement */;
+            case 160 /* SetAccessor */: return "setter" /* memberSetAccessorElement */;
+            case 157 /* MethodDeclaration */:
+            case 156 /* MethodSignature */:
                 return "method" /* memberFunctionElement */;
-            case 154 /* PropertyDeclaration */:
-            case 153 /* PropertySignature */:
+            case 155 /* PropertyDeclaration */:
+            case 154 /* PropertySignature */:
                 return "property" /* memberVariableElement */;
-            case 162 /* IndexSignature */: return "index" /* indexSignatureElement */;
-            case 161 /* ConstructSignature */: return "construct" /* constructSignatureElement */;
-            case 160 /* CallSignature */: return "call" /* callSignatureElement */;
-            case 157 /* Constructor */: return "constructor" /* constructorImplementationElement */;
-            case 150 /* TypeParameter */: return "type parameter" /* typeParameterElement */;
-            case 278 /* EnumMember */: return "enum member" /* enumMemberElement */;
-            case 151 /* Parameter */: return ts.hasModifier(node, 92 /* ParameterPropertyModifier */) ? "property" /* memberVariableElement */ : "parameter" /* parameterElement */;
-            case 248 /* ImportEqualsDeclaration */:
-            case 253 /* ImportSpecifier */:
-            case 257 /* ExportSpecifier */:
-            case 251 /* NamespaceImport */:
+            case 163 /* IndexSignature */: return "index" /* indexSignatureElement */;
+            case 162 /* ConstructSignature */: return "construct" /* constructSignatureElement */;
+            case 161 /* CallSignature */: return "call" /* callSignatureElement */;
+            case 158 /* Constructor */: return "constructor" /* constructorImplementationElement */;
+            case 151 /* TypeParameter */: return "type parameter" /* typeParameterElement */;
+            case 279 /* EnumMember */: return "enum member" /* enumMemberElement */;
+            case 152 /* Parameter */: return ts.hasModifier(node, 92 /* ParameterPropertyModifier */) ? "property" /* memberVariableElement */ : "parameter" /* parameterElement */;
+            case 249 /* ImportEqualsDeclaration */:
+            case 254 /* ImportSpecifier */:
+            case 258 /* ExportSpecifier */:
+            case 252 /* NamespaceImport */:
                 return "alias" /* alias */;
-            case 204 /* BinaryExpression */:
+            case 205 /* BinaryExpression */:
                 var kind = ts.getAssignmentDeclarationKind(node);
                 var right = node.right;
                 switch (kind) {
@@ -95578,7 +98540,7 @@ var ts;
                         return "" /* unknown */;
                     }
                 }
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 return ts.isImportClause(node.parent) ? "alias" /* alias */ : "" /* unknown */;
             default:
                 return "" /* unknown */;
@@ -95594,12 +98556,12 @@ var ts;
     ts.getNodeKind = getNodeKind;
     function isThis(node) {
         switch (node.kind) {
-            case 100 /* ThisKeyword */:
+            case 101 /* ThisKeyword */:
                 // case SyntaxKind.ThisType: TODO: GH#9267
                 return true;
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 // 'this' as a parameter
-                return ts.identifierIsThisKeyword(node) && node.parent.kind === 151 /* Parameter */;
+                return ts.identifierIsThisKeyword(node) && node.parent.kind === 152 /* Parameter */;
             default:
                 return false;
         }
@@ -95664,42 +98626,42 @@ var ts;
             return false;
         }
         switch (n.kind) {
-            case 240 /* ClassDeclaration */:
-            case 241 /* InterfaceDeclaration */:
-            case 243 /* EnumDeclaration */:
-            case 188 /* ObjectLiteralExpression */:
-            case 184 /* ObjectBindingPattern */:
-            case 168 /* TypeLiteral */:
-            case 218 /* Block */:
-            case 245 /* ModuleBlock */:
-            case 246 /* CaseBlock */:
-            case 252 /* NamedImports */:
-            case 256 /* NamedExports */:
+            case 241 /* ClassDeclaration */:
+            case 242 /* InterfaceDeclaration */:
+            case 244 /* EnumDeclaration */:
+            case 189 /* ObjectLiteralExpression */:
+            case 185 /* ObjectBindingPattern */:
+            case 169 /* TypeLiteral */:
+            case 219 /* Block */:
+            case 246 /* ModuleBlock */:
+            case 247 /* CaseBlock */:
+            case 253 /* NamedImports */:
+            case 257 /* NamedExports */:
                 return nodeEndsWith(n, 19 /* CloseBraceToken */, sourceFile);
-            case 274 /* CatchClause */:
+            case 275 /* CatchClause */:
                 return isCompletedNode(n.block, sourceFile);
-            case 192 /* NewExpression */:
+            case 193 /* NewExpression */:
                 if (!n.arguments) {
                     return true;
                 }
             // falls through
-            case 191 /* CallExpression */:
-            case 195 /* ParenthesizedExpression */:
-            case 177 /* ParenthesizedType */:
+            case 192 /* CallExpression */:
+            case 196 /* ParenthesizedExpression */:
+            case 178 /* ParenthesizedType */:
                 return nodeEndsWith(n, 21 /* CloseParenToken */, sourceFile);
-            case 165 /* FunctionType */:
-            case 166 /* ConstructorType */:
+            case 166 /* FunctionType */:
+            case 167 /* ConstructorType */:
                 return isCompletedNode(n.type, sourceFile);
-            case 157 /* Constructor */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
-            case 239 /* FunctionDeclaration */:
-            case 196 /* FunctionExpression */:
-            case 156 /* MethodDeclaration */:
-            case 155 /* MethodSignature */:
-            case 161 /* ConstructSignature */:
-            case 160 /* CallSignature */:
-            case 197 /* ArrowFunction */:
+            case 158 /* Constructor */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
+            case 240 /* FunctionDeclaration */:
+            case 197 /* FunctionExpression */:
+            case 157 /* MethodDeclaration */:
+            case 156 /* MethodSignature */:
+            case 162 /* ConstructSignature */:
+            case 161 /* CallSignature */:
+            case 198 /* ArrowFunction */:
                 if (n.body) {
                     return isCompletedNode(n.body, sourceFile);
                 }
@@ -95709,65 +98671,65 @@ var ts;
                 // Even though type parameters can be unclosed, we can get away with
                 // having at least a closing paren.
                 return hasChildOfKind(n, 21 /* CloseParenToken */, sourceFile);
-            case 244 /* ModuleDeclaration */:
+            case 245 /* ModuleDeclaration */:
                 return !!n.body && isCompletedNode(n.body, sourceFile);
-            case 222 /* IfStatement */:
+            case 223 /* IfStatement */:
                 if (n.elseStatement) {
                     return isCompletedNode(n.elseStatement, sourceFile);
                 }
                 return isCompletedNode(n.thenStatement, sourceFile);
-            case 221 /* ExpressionStatement */:
+            case 222 /* ExpressionStatement */:
                 return isCompletedNode(n.expression, sourceFile) ||
                     hasChildOfKind(n, 26 /* SemicolonToken */, sourceFile);
-            case 187 /* ArrayLiteralExpression */:
-            case 185 /* ArrayBindingPattern */:
-            case 190 /* ElementAccessExpression */:
-            case 149 /* ComputedPropertyName */:
-            case 170 /* TupleType */:
+            case 188 /* ArrayLiteralExpression */:
+            case 186 /* ArrayBindingPattern */:
+            case 191 /* ElementAccessExpression */:
+            case 150 /* ComputedPropertyName */:
+            case 171 /* TupleType */:
                 return nodeEndsWith(n, 23 /* CloseBracketToken */, sourceFile);
-            case 162 /* IndexSignature */:
+            case 163 /* IndexSignature */:
                 if (n.type) {
                     return isCompletedNode(n.type, sourceFile);
                 }
                 return hasChildOfKind(n, 23 /* CloseBracketToken */, sourceFile);
-            case 271 /* CaseClause */:
-            case 272 /* DefaultClause */:
+            case 272 /* CaseClause */:
+            case 273 /* DefaultClause */:
                 // there is no such thing as terminator token for CaseClause/DefaultClause so for simplicity always consider them non-completed
                 return false;
-            case 225 /* ForStatement */:
-            case 226 /* ForInStatement */:
-            case 227 /* ForOfStatement */:
-            case 224 /* WhileStatement */:
+            case 226 /* ForStatement */:
+            case 227 /* ForInStatement */:
+            case 228 /* ForOfStatement */:
+            case 225 /* WhileStatement */:
                 return isCompletedNode(n.statement, sourceFile);
-            case 223 /* DoStatement */:
+            case 224 /* DoStatement */:
                 // rough approximation: if DoStatement has While keyword - then if node is completed is checking the presence of ')';
-                return hasChildOfKind(n, 107 /* WhileKeyword */, sourceFile)
+                return hasChildOfKind(n, 108 /* WhileKeyword */, sourceFile)
                     ? nodeEndsWith(n, 21 /* CloseParenToken */, sourceFile)
                     : isCompletedNode(n.statement, sourceFile);
-            case 167 /* TypeQuery */:
+            case 168 /* TypeQuery */:
                 return isCompletedNode(n.exprName, sourceFile);
-            case 199 /* TypeOfExpression */:
-            case 198 /* DeleteExpression */:
-            case 200 /* VoidExpression */:
-            case 207 /* YieldExpression */:
-            case 208 /* SpreadElement */:
+            case 200 /* TypeOfExpression */:
+            case 199 /* DeleteExpression */:
+            case 201 /* VoidExpression */:
+            case 208 /* YieldExpression */:
+            case 209 /* SpreadElement */:
                 var unaryWordExpression = n;
                 return isCompletedNode(unaryWordExpression.expression, sourceFile);
-            case 193 /* TaggedTemplateExpression */:
+            case 194 /* TaggedTemplateExpression */:
                 return isCompletedNode(n.template, sourceFile);
-            case 206 /* TemplateExpression */:
+            case 207 /* TemplateExpression */:
                 var lastSpan = ts.lastOrUndefined(n.templateSpans);
                 return isCompletedNode(lastSpan, sourceFile);
-            case 216 /* TemplateSpan */:
+            case 217 /* TemplateSpan */:
                 return ts.nodeIsPresent(n.literal);
-            case 255 /* ExportDeclaration */:
-            case 249 /* ImportDeclaration */:
+            case 256 /* ExportDeclaration */:
+            case 250 /* ImportDeclaration */:
                 return ts.nodeIsPresent(n.moduleSpecifier);
-            case 202 /* PrefixUnaryExpression */:
+            case 203 /* PrefixUnaryExpression */:
                 return isCompletedNode(n.operand, sourceFile);
-            case 204 /* BinaryExpression */:
+            case 205 /* BinaryExpression */:
                 return isCompletedNode(n.right, sourceFile);
-            case 205 /* ConditionalExpression */:
+            case 206 /* ConditionalExpression */:
                 return isCompletedNode(n.whenFalse, sourceFile);
             default:
                 return true;
@@ -95946,7 +98908,7 @@ var ts;
                     }
                 }
             }
-            ts.Debug.assert(startNode !== undefined || n.kind === 284 /* SourceFile */ || n.kind === 1 /* EndOfFileToken */ || ts.isJSDocCommentContainingNode(n));
+            ts.Debug.assert(startNode !== undefined || n.kind === 285 /* SourceFile */ || n.kind === 1 /* EndOfFileToken */ || ts.isJSDocCommentContainingNode(n));
             // Here we know that none of child token nodes embrace the position,
             // the only known case is when position is at the end of the file.
             // Try to find the rightmost token in the file without filtering.
@@ -96016,24 +98978,24 @@ var ts;
             return true;
         }
         // <div> { | </div> or <div a={| </div>
-        if (token.kind === 28 /* LessThanToken */ && token.parent.kind === 270 /* JsxExpression */) {
+        if (token.kind === 28 /* LessThanToken */ && token.parent.kind === 271 /* JsxExpression */) {
             return true;
         }
         // <div> {
         // |
         // } < /div>
-        if (token && token.kind === 19 /* CloseBraceToken */ && token.parent.kind === 270 /* JsxExpression */) {
+        if (token && token.kind === 19 /* CloseBraceToken */ && token.parent.kind === 271 /* JsxExpression */) {
             return true;
         }
         // <div>|</div>
-        if (token.kind === 28 /* LessThanToken */ && token.parent.kind === 263 /* JsxClosingElement */) {
+        if (token.kind === 28 /* LessThanToken */ && token.parent.kind === 264 /* JsxClosingElement */) {
             return true;
         }
         return false;
     }
     ts.isInsideJsxElementOrAttribute = isInsideJsxElementOrAttribute;
     function isWhiteSpaceOnlyJsxText(node) {
-        return ts.isJsxText(node) && node.containsOnlyWhiteSpaces;
+        return ts.isJsxText(node) && node.containsOnlyTriviaWhiteSpaces;
     }
     function isInTemplateString(sourceFile, position) {
         var token = getTokenAtPosition(sourceFile, position);
@@ -96145,15 +99107,15 @@ var ts;
                     nTypeArguments++;
                     break;
                 case 37 /* EqualsGreaterThanToken */:
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                 case 10 /* StringLiteral */:
                 case 8 /* NumericLiteral */:
                 case 9 /* BigIntLiteral */:
-                case 102 /* TrueKeyword */:
-                case 87 /* FalseKeyword */:
-                case 104 /* TypeOfKeyword */:
-                case 86 /* ExtendsKeyword */:
-                case 129 /* KeyOfKeyword */:
+                case 103 /* TrueKeyword */:
+                case 88 /* FalseKeyword */:
+                case 105 /* TypeOfKeyword */:
+                case 87 /* ExtendsKeyword */:
+                case 130 /* KeyOfKeyword */:
                 case 24 /* DotToken */:
                 case 50 /* BarToken */:
                 case 56 /* QuestionToken */:
@@ -96212,10 +99174,10 @@ var ts;
     }
     ts.getNodeModifiers = getNodeModifiers;
     function getTypeArgumentOrTypeParameterList(node) {
-        if (node.kind === 164 /* TypeReference */ || node.kind === 191 /* CallExpression */) {
+        if (node.kind === 165 /* TypeReference */ || node.kind === 192 /* CallExpression */) {
             return node.typeArguments;
         }
-        if (ts.isFunctionLike(node) || node.kind === 240 /* ClassDeclaration */ || node.kind === 241 /* InterfaceDeclaration */) {
+        if (ts.isFunctionLike(node) || node.kind === 241 /* ClassDeclaration */ || node.kind === 242 /* InterfaceDeclaration */) {
             return node.typeParameters;
         }
         return undefined;
@@ -96235,7 +99197,7 @@ var ts;
     }
     ts.isStringOrRegularExpressionOrTemplateLiteral = isStringOrRegularExpressionOrTemplateLiteral;
     function isPunctuation(kind) {
-        return 18 /* FirstPunctuation */ <= kind && kind <= 71 /* LastPunctuation */;
+        return 18 /* FirstPunctuation */ <= kind && kind <= 72 /* LastPunctuation */;
     }
     ts.isPunctuation = isPunctuation;
     function isInsideTemplateLiteral(node, position, sourceFile) {
@@ -96245,9 +99207,9 @@ var ts;
     ts.isInsideTemplateLiteral = isInsideTemplateLiteral;
     function isAccessibilityModifier(kind) {
         switch (kind) {
-            case 115 /* PublicKeyword */:
-            case 113 /* PrivateKeyword */:
-            case 114 /* ProtectedKeyword */:
+            case 116 /* PublicKeyword */:
+            case 114 /* PrivateKeyword */:
+            case 115 /* ProtectedKeyword */:
                 return true;
         }
         return false;
@@ -96260,18 +99222,18 @@ var ts;
     }
     ts.cloneCompilerOptions = cloneCompilerOptions;
     function isArrayLiteralOrObjectLiteralDestructuringPattern(node) {
-        if (node.kind === 187 /* ArrayLiteralExpression */ ||
-            node.kind === 188 /* ObjectLiteralExpression */) {
+        if (node.kind === 188 /* ArrayLiteralExpression */ ||
+            node.kind === 189 /* ObjectLiteralExpression */) {
             // [a,b,c] from:
             // [a, b, c] = someExpression;
-            if (node.parent.kind === 204 /* BinaryExpression */ &&
+            if (node.parent.kind === 205 /* BinaryExpression */ &&
                 node.parent.left === node &&
-                node.parent.operatorToken.kind === 59 /* EqualsToken */) {
+                node.parent.operatorToken.kind === 60 /* EqualsToken */) {
                 return true;
             }
             // [a, b, c] from:
             // for([a, b, c] of expression)
-            if (node.parent.kind === 227 /* ForOfStatement */ &&
+            if (node.parent.kind === 228 /* ForOfStatement */ &&
                 node.parent.initializer === node) {
                 return true;
             }
@@ -96279,7 +99241,7 @@ var ts;
             // [x, [a, b, c] ] = someExpression
             // or
             // {x, a: {a, b, c} } = someExpression
-            if (isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent.kind === 275 /* PropertyAssignment */ ? node.parent.parent : node.parent)) {
+            if (isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent.kind === 276 /* PropertyAssignment */ ? node.parent.parent : node.parent)) {
                 return true;
             }
         }
@@ -96298,8 +99260,8 @@ var ts;
         var range = isInComment(sourceFile, position, /*tokenAtPosition*/ undefined);
         return !!range && shouldBeReference === tripleSlashDirectivePrefixRegex.test(sourceFile.text.substring(range.pos, range.end));
     }
-    function createTextSpanFromNode(node, sourceFile) {
-        return ts.createTextSpanFromBounds(node.getStart(sourceFile), node.getEnd());
+    function createTextSpanFromNode(node, sourceFile, endNode) {
+        return ts.createTextSpanFromBounds(node.getStart(sourceFile), (endNode || node).getEnd());
     }
     ts.createTextSpanFromNode = createTextSpanFromNode;
     function createTextRangeFromNode(node, sourceFile) {
@@ -96323,22 +99285,23 @@ var ts;
     }
     ts.createTextChange = createTextChange;
     ts.typeKeywords = [
-        120 /* AnyKeyword */,
-        146 /* BigIntKeyword */,
-        123 /* BooleanKeyword */,
-        87 /* FalseKeyword */,
-        129 /* KeyOfKeyword */,
-        132 /* NeverKeyword */,
-        96 /* NullKeyword */,
-        135 /* NumberKeyword */,
-        136 /* ObjectKeyword */,
-        138 /* StringKeyword */,
-        139 /* SymbolKeyword */,
-        102 /* TrueKeyword */,
-        106 /* VoidKeyword */,
-        141 /* UndefinedKeyword */,
-        142 /* UniqueKeyword */,
-        143 /* UnknownKeyword */,
+        121 /* AnyKeyword */,
+        147 /* BigIntKeyword */,
+        124 /* BooleanKeyword */,
+        88 /* FalseKeyword */,
+        130 /* KeyOfKeyword */,
+        133 /* NeverKeyword */,
+        97 /* NullKeyword */,
+        136 /* NumberKeyword */,
+        137 /* ObjectKeyword */,
+        134 /* ReadonlyKeyword */,
+        139 /* StringKeyword */,
+        140 /* SymbolKeyword */,
+        103 /* TrueKeyword */,
+        107 /* VoidKeyword */,
+        142 /* UndefinedKeyword */,
+        143 /* UniqueKeyword */,
+        144 /* UnknownKeyword */,
     ];
     function isTypeKeyword(kind) {
         return ts.contains(ts.typeKeywords, kind);
@@ -96374,7 +99337,7 @@ var ts;
     }
     ts.skipConstraint = skipConstraint;
     function getNameFromPropertyName(name) {
-        return name.kind === 149 /* ComputedPropertyName */
+        return name.kind === 150 /* ComputedPropertyName */
             // treat computed property names where expression is string/numeric literal as just string/numeric literal
             ? ts.isStringOrNumericLiteralLike(name.expression) ? name.expression.text : undefined
             : ts.getTextOfIdentifierOrLiteral(name);
@@ -96450,7 +99413,7 @@ var ts;
         }
         return ts.firstDefined(symbol.declarations, function (decl) {
             var name = ts.getNameOfDeclaration(decl);
-            return name && name.kind === 72 /* Identifier */ ? name.escapedText : undefined;
+            return name && name.kind === 73 /* Identifier */ ? name.escapedText : undefined;
         });
     }
     ts.symbolEscapedNameNoDefault = symbolEscapedNameNoDefault;
@@ -96539,7 +99502,7 @@ var ts;
 /* @internal */
 (function (ts) {
     function isFirstDeclarationOfSymbolParameter(symbol) {
-        return symbol.declarations && symbol.declarations.length > 0 && symbol.declarations[0].kind === 151 /* Parameter */;
+        return symbol.declarations && symbol.declarations.length > 0 && symbol.declarations[0].kind === 152 /* Parameter */;
     }
     ts.isFirstDeclarationOfSymbolParameter = isFirstDeclarationOfSymbolParameter;
     var displayPartWriter = getDisplayPartWriter();
@@ -96761,23 +99724,6 @@ var ts;
         return !!location.parent && ts.isImportOrExportSpecifier(location.parent) && location.parent.propertyName === location;
     }
     ts.isImportOrExportSpecifierName = isImportOrExportSpecifierName;
-    /**
-     * Strip off existed single quotes or double quotes from a given string
-     *
-     * @return non-quoted string
-     */
-    function stripQuotes(name) {
-        var length = name.length;
-        if (length >= 2 && name.charCodeAt(0) === name.charCodeAt(length - 1) && startsWithQuote(name)) {
-            return name.substring(1, length - 1);
-        }
-        return name;
-    }
-    ts.stripQuotes = stripQuotes;
-    function startsWithQuote(name) {
-        return ts.isSingleOrDoubleQuote(name.charCodeAt(0));
-    }
-    ts.startsWithQuote = startsWithQuote;
     function scriptKindIs(fileName, host) {
         var scriptKinds = [];
         for (var _i = 2; _i < arguments.length; _i++) {
@@ -96793,10 +99739,15 @@ var ts;
         return ts.ensureScriptKind(fileName, host && host.getScriptKind && host.getScriptKind(fileName));
     }
     ts.getScriptKind = getScriptKind;
-    function getSymbolTarget(symbol) {
+    function getSymbolTarget(symbol, checker) {
         var next = symbol;
-        while (isTransientSymbol(next) && next.target) {
-            next = next.target;
+        while (isAliasSymbol(next) || (isTransientSymbol(next) && next.target)) {
+            if (isTransientSymbol(next) && next.target) {
+                next = next.target;
+            }
+            else {
+                next = ts.skipAlias(next, checker);
+            }
         }
         return next;
     }
@@ -96804,6 +99755,9 @@ var ts;
     function isTransientSymbol(symbol) {
         return (symbol.flags & 33554432 /* Transient */) !== 0;
     }
+    function isAliasSymbol(symbol) {
+        return (symbol.flags & 2097152 /* Alias */) !== 0;
+    }
     function getUniqueSymbolId(symbol, checker) {
         return ts.getSymbolId(ts.skipAlias(symbol, checker));
     }
@@ -96839,7 +99793,14 @@ var ts;
     function getSynthesizedDeepCloneWithRenames(node, includeTrivia, renameMap, checker, callback) {
         if (includeTrivia === void 0) { includeTrivia = true; }
         var clone;
-        if (ts.isIdentifier(node) && renameMap && checker) {
+        if (renameMap && checker && ts.isBindingElement(node) && ts.isIdentifier(node.name) && ts.isObjectBindingPattern(node.parent)) {
+            var symbol = checker.getSymbolAtLocation(node.name);
+            var renameInfo = symbol && renameMap.get(String(ts.getSymbolId(symbol)));
+            if (renameInfo && renameInfo.text !== (node.name || node.propertyName).getText()) {
+                clone = ts.createBindingElement(node.dotDotDotToken, node.propertyName || node.name, renameInfo, node.initializer);
+            }
+        }
+        else if (renameMap && checker && ts.isIdentifier(node)) {
             var symbol = checker.getSymbolAtLocation(node);
             var renameInfo = symbol && renameMap.get(String(ts.getSymbolId(symbol)));
             if (renameInfo) {
@@ -97003,15 +99964,15 @@ var ts;
     function getContextualTypeFromParent(node, checker) {
         var parent = node.parent;
         switch (parent.kind) {
-            case 192 /* NewExpression */:
+            case 193 /* NewExpression */:
                 return checker.getContextualType(parent);
-            case 204 /* BinaryExpression */: {
+            case 205 /* BinaryExpression */: {
                 var _a = parent, left = _a.left, operatorToken = _a.operatorToken, right = _a.right;
                 return isEqualityOperatorKind(operatorToken.kind)
                     ? checker.getTypeAtLocation(node === right ? left : right)
                     : checker.getContextualType(node);
             }
-            case 271 /* CaseClause */:
+            case 272 /* CaseClause */:
                 return parent.expression === node ? getSwitchedType(parent, checker) : undefined;
             default:
                 return checker.getContextualType(node);
@@ -97031,7 +99992,7 @@ var ts;
             case "double":
                 return quoted;
             case "single":
-                return "'" + stripQuotes(quoted).replace("'", "\\'").replace('\\"', '"') + "'";
+                return "'" + ts.stripQuotes(quoted).replace("'", "\\'").replace('\\"', '"') + "'";
             default:
                 return ts.Debug.assertNever(quotePreference);
         }
@@ -97053,8 +100014,8 @@ var ts;
         switch (node.kind) {
             case 10 /* StringLiteral */:
             case 14 /* NoSubstitutionTemplateLiteral */:
-            case 206 /* TemplateExpression */:
-            case 193 /* TaggedTemplateExpression */:
+            case 207 /* TemplateExpression */:
+            case 194 /* TaggedTemplateExpression */:
                 return true;
             default:
                 return false;
@@ -97093,11 +100054,55 @@ var ts;
         return typeIsAccessible ? res : undefined;
     }
     ts.getTypeNodeIfAccessible = getTypeNodeIfAccessible;
+    function syntaxUsuallyHasTrailingSemicolon(kind) {
+        return kind === 220 /* VariableStatement */
+            || kind === 222 /* ExpressionStatement */
+            || kind === 224 /* DoStatement */
+            || kind === 229 /* ContinueStatement */
+            || kind === 230 /* BreakStatement */
+            || kind === 231 /* ReturnStatement */
+            || kind === 235 /* ThrowStatement */
+            || kind === 237 /* DebuggerStatement */
+            || kind === 155 /* PropertyDeclaration */
+            || kind === 243 /* TypeAliasDeclaration */
+            || kind === 250 /* ImportDeclaration */
+            || kind === 249 /* ImportEqualsDeclaration */
+            || kind === 256 /* ExportDeclaration */;
+    }
+    ts.syntaxUsuallyHasTrailingSemicolon = syntaxUsuallyHasTrailingSemicolon;
+    function probablyUsesSemicolons(sourceFile) {
+        var withSemicolon = 0;
+        var withoutSemicolon = 0;
+        var nStatementsToObserve = 5;
+        ts.forEachChild(sourceFile, function visit(node) {
+            if (syntaxUsuallyHasTrailingSemicolon(node.kind)) {
+                var lastToken = node.getLastToken(sourceFile);
+                if (lastToken && lastToken.kind === 26 /* SemicolonToken */) {
+                    withSemicolon++;
+                }
+                else {
+                    withoutSemicolon++;
+                }
+            }
+            if (withSemicolon + withoutSemicolon >= nStatementsToObserve) {
+                return true;
+            }
+            return ts.forEachChild(node, visit);
+        });
+        // One statement missing a semicolon isn’t sufficient evidence to say the user
+        // doesn’t want semicolons, because they may not even be done writing that statement.
+        if (withSemicolon === 0 && withoutSemicolon <= 1) {
+            return true;
+        }
+        // If even 2/5 places have a semicolon, the user probably wants semicolons
+        return withSemicolon / withoutSemicolon > 1 / nStatementsToObserve;
+    }
+    ts.probablyUsesSemicolons = probablyUsesSemicolons;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
     function createClassifier() {
-        var scanner = ts.createScanner(7 /* Latest */, /*skipTrivia*/ false);
+        var scanner = ts.createScanner(99 /* Latest */, /*skipTrivia*/ false);
         function getClassificationsForLine(text, lexState, syntacticClassifierAbsent) {
             return convertClassificationsToResult(getEncodedLexicalClassifications(text, lexState, syntacticClassifierAbsent), text);
         }
@@ -97174,13 +100179,13 @@ var ts;
             function handleToken() {
                 switch (token) {
                     case 42 /* SlashToken */:
-                    case 64 /* SlashEqualsToken */:
+                    case 65 /* SlashEqualsToken */:
                         if (!noRegexTable[lastNonTriviaToken] && scanner.reScanSlashToken() === 13 /* RegularExpressionLiteral */) {
                             token = 13 /* RegularExpressionLiteral */;
                         }
                         break;
                     case 28 /* LessThanToken */:
-                        if (lastNonTriviaToken === 72 /* Identifier */) {
+                        if (lastNonTriviaToken === 73 /* Identifier */) {
                             // Could be the start of something generic.  Keep track of that by bumping
                             // up the current count of generic contexts we may be in.
                             angleBracketStack++;
@@ -97193,16 +100198,16 @@ var ts;
                             angleBracketStack--;
                         }
                         break;
-                    case 120 /* AnyKeyword */:
-                    case 138 /* StringKeyword */:
-                    case 135 /* NumberKeyword */:
-                    case 123 /* BooleanKeyword */:
-                    case 139 /* SymbolKeyword */:
+                    case 121 /* AnyKeyword */:
+                    case 139 /* StringKeyword */:
+                    case 136 /* NumberKeyword */:
+                    case 124 /* BooleanKeyword */:
+                    case 140 /* SymbolKeyword */:
                         if (angleBracketStack > 0 && !syntacticClassifierAbsent) {
                             // If it looks like we're could be in something generic, don't classify this
                             // as a keyword.  We may just get overwritten by the syntactic classifier,
                             // causing a noisy experience for the user.
-                            token = 72 /* Identifier */;
+                            token = 73 /* Identifier */;
                         }
                         break;
                     case 15 /* TemplateHead */:
@@ -97241,14 +100246,14 @@ var ts;
                             break;
                         }
                         if (lastNonTriviaToken === 24 /* DotToken */) {
-                            token = 72 /* Identifier */;
+                            token = 73 /* Identifier */;
                         }
                         else if (ts.isKeyword(lastNonTriviaToken) && ts.isKeyword(token) && !canFollow(lastNonTriviaToken, token)) {
                             // We have two keywords in a row.  Only treat the second as a keyword if
                             // it's a sequence that could legally occur in the language.  Otherwise
                             // treat it as an identifier.  This way, if someone writes "private var"
                             // we recognize that 'var' is actually an identifier here.
-                            token = 72 /* Identifier */;
+                            token = 73 /* Identifier */;
                         }
                 }
             }
@@ -97262,19 +100267,19 @@ var ts;
     /// we have a series of divide operator. this list allows us to be more accurate by ruling out
     /// locations where a regexp cannot exist.
     var noRegexTable = ts.arrayToNumericMap([
-        72 /* Identifier */,
+        73 /* Identifier */,
         10 /* StringLiteral */,
         8 /* NumericLiteral */,
         9 /* BigIntLiteral */,
         13 /* RegularExpressionLiteral */,
-        100 /* ThisKeyword */,
+        101 /* ThisKeyword */,
         44 /* PlusPlusToken */,
         45 /* MinusMinusToken */,
         21 /* CloseParenToken */,
         23 /* CloseBracketToken */,
         19 /* CloseBraceToken */,
-        102 /* TrueKeyword */,
-        87 /* FalseKeyword */,
+        103 /* TrueKeyword */,
+        88 /* FalseKeyword */,
     ], function (token) { return token; }, function () { return true; });
     function getNewEndOfLineState(scanner, token, lastOnTemplateStack) {
         switch (token) {
@@ -97386,10 +100391,10 @@ var ts;
             return true;
         }
         switch (keyword2) {
-            case 126 /* GetKeyword */:
-            case 137 /* SetKeyword */:
-            case 124 /* ConstructorKeyword */:
-            case 116 /* StaticKeyword */:
+            case 127 /* GetKeyword */:
+            case 138 /* SetKeyword */:
+            case 125 /* ConstructorKeyword */:
+            case 117 /* StaticKeyword */:
                 return true; // Allow things like "public get", "public constructor" and "public static".
             default:
                 return false; // Any other keyword following "public" is actually an identifier, not a real keyword.
@@ -97434,9 +100439,9 @@ var ts;
             case 30 /* GreaterThanToken */:
             case 31 /* LessThanEqualsToken */:
             case 32 /* GreaterThanEqualsToken */:
-            case 94 /* InstanceOfKeyword */:
-            case 93 /* InKeyword */:
-            case 119 /* AsKeyword */:
+            case 95 /* InstanceOfKeyword */:
+            case 94 /* InKeyword */:
+            case 120 /* AsKeyword */:
             case 33 /* EqualsEqualsToken */:
             case 34 /* ExclamationEqualsToken */:
             case 35 /* EqualsEqualsEqualsToken */:
@@ -97446,18 +100451,18 @@ var ts;
             case 50 /* BarToken */:
             case 54 /* AmpersandAmpersandToken */:
             case 55 /* BarBarToken */:
-            case 70 /* BarEqualsToken */:
-            case 69 /* AmpersandEqualsToken */:
-            case 71 /* CaretEqualsToken */:
-            case 66 /* LessThanLessThanEqualsToken */:
-            case 67 /* GreaterThanGreaterThanEqualsToken */:
-            case 68 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
-            case 60 /* PlusEqualsToken */:
-            case 61 /* MinusEqualsToken */:
-            case 62 /* AsteriskEqualsToken */:
-            case 64 /* SlashEqualsToken */:
-            case 65 /* PercentEqualsToken */:
-            case 59 /* EqualsToken */:
+            case 71 /* BarEqualsToken */:
+            case 70 /* AmpersandEqualsToken */:
+            case 72 /* CaretEqualsToken */:
+            case 67 /* LessThanLessThanEqualsToken */:
+            case 68 /* GreaterThanGreaterThanEqualsToken */:
+            case 69 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
+            case 61 /* PlusEqualsToken */:
+            case 62 /* MinusEqualsToken */:
+            case 63 /* AsteriskEqualsToken */:
+            case 65 /* SlashEqualsToken */:
+            case 66 /* PercentEqualsToken */:
+            case 60 /* EqualsToken */:
             case 27 /* CommaToken */:
                 return true;
             default:
@@ -97484,7 +100489,7 @@ var ts;
         else if (isBinaryExpressionOperatorToken(token) || isPrefixUnaryExpressionOperatorToken(token)) {
             return 5 /* operator */;
         }
-        else if (token >= 18 /* FirstPunctuation */ && token <= 71 /* LastPunctuation */) {
+        else if (token >= 18 /* FirstPunctuation */ && token <= 72 /* LastPunctuation */) {
             return 10 /* punctuation */;
         }
         switch (token) {
@@ -97503,7 +100508,7 @@ var ts;
             case 5 /* WhitespaceTrivia */:
             case 4 /* NewLineTrivia */:
                 return 8 /* whiteSpace */;
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
             default:
                 if (ts.isTemplateLiteralKind(token)) {
                     return 6 /* stringLiteral */;
@@ -97528,10 +100533,10 @@ var ts;
         // That means we're calling back into the host around every 1.2k of the file we process.
         // Lib.d.ts has similar numbers.
         switch (kind) {
-            case 244 /* ModuleDeclaration */:
-            case 240 /* ClassDeclaration */:
-            case 241 /* InterfaceDeclaration */:
-            case 239 /* FunctionDeclaration */:
+            case 245 /* ModuleDeclaration */:
+            case 241 /* ClassDeclaration */:
+            case 242 /* InterfaceDeclaration */:
+            case 240 /* FunctionDeclaration */:
                 cancellationToken.throwIfCancellationRequested();
         }
     }
@@ -97651,8 +100656,8 @@ var ts;
         var spanStart = span.start;
         var spanLength = span.length;
         // Make a scanner we can get trivia from.
-        var triviaScanner = ts.createScanner(7 /* Latest */, /*skipTrivia*/ false, sourceFile.languageVariant, sourceFile.text);
-        var mergeConflictScanner = ts.createScanner(7 /* Latest */, /*skipTrivia*/ false, sourceFile.languageVariant, sourceFile.text);
+        var triviaScanner = ts.createScanner(99 /* Latest */, /*skipTrivia*/ false, sourceFile.languageVariant, sourceFile.text);
+        var mergeConflictScanner = ts.createScanner(99 /* Latest */, /*skipTrivia*/ false, sourceFile.languageVariant, sourceFile.text);
         var result = [];
         processElement(sourceFile);
         return { spans: result, endOfLineState: 0 /* None */ };
@@ -97744,18 +100749,18 @@ var ts;
                     pushClassification(tag.tagName.pos, tag.tagName.end - tag.tagName.pos, 18 /* docCommentTagName */); // e.g. "param"
                     pos = tag.tagName.end;
                     switch (tag.kind) {
-                        case 304 /* JSDocParameterTag */:
+                        case 306 /* JSDocParameterTag */:
                             processJSDocParameterTag(tag);
                             break;
-                        case 308 /* JSDocTemplateTag */:
+                        case 310 /* JSDocTemplateTag */:
                             processJSDocTemplateTag(tag);
                             pos = tag.end;
                             break;
-                        case 307 /* JSDocTypeTag */:
+                        case 309 /* JSDocTypeTag */:
                             processElement(tag.typeExpression);
                             pos = tag.end;
                             break;
-                        case 305 /* JSDocReturnTag */:
+                        case 307 /* JSDocReturnTag */:
                             processElement(tag.typeExpression);
                             pos = tag.end;
                             break;
@@ -97842,22 +100847,22 @@ var ts;
         }
         function tryClassifyJsxElementName(token) {
             switch (token.parent && token.parent.kind) {
-                case 262 /* JsxOpeningElement */:
+                case 263 /* JsxOpeningElement */:
                     if (token.parent.tagName === token) {
                         return 19 /* jsxOpenTagName */;
                     }
                     break;
-                case 263 /* JsxClosingElement */:
+                case 264 /* JsxClosingElement */:
                     if (token.parent.tagName === token) {
                         return 20 /* jsxCloseTagName */;
                     }
                     break;
-                case 261 /* JsxSelfClosingElement */:
+                case 262 /* JsxSelfClosingElement */:
                     if (token.parent.tagName === token) {
                         return 21 /* jsxSelfClosingTagName */;
                     }
                     break;
-                case 267 /* JsxAttribute */:
+                case 268 /* JsxAttribute */:
                     if (token.parent.name === token) {
                         return 22 /* jsxAttribute */;
                     }
@@ -97884,19 +100889,19 @@ var ts;
             if (ts.isPunctuation(tokenKind)) {
                 if (token) {
                     var parent = token.parent;
-                    if (tokenKind === 59 /* EqualsToken */) {
+                    if (tokenKind === 60 /* EqualsToken */) {
                         // the '=' in a variable declaration is special cased here.
-                        if (parent.kind === 237 /* VariableDeclaration */ ||
-                            parent.kind === 154 /* PropertyDeclaration */ ||
-                            parent.kind === 151 /* Parameter */ ||
-                            parent.kind === 267 /* JsxAttribute */) {
+                        if (parent.kind === 238 /* VariableDeclaration */ ||
+                            parent.kind === 155 /* PropertyDeclaration */ ||
+                            parent.kind === 152 /* Parameter */ ||
+                            parent.kind === 268 /* JsxAttribute */) {
                             return 5 /* operator */;
                         }
                     }
-                    if (parent.kind === 204 /* BinaryExpression */ ||
-                        parent.kind === 202 /* PrefixUnaryExpression */ ||
-                        parent.kind === 203 /* PostfixUnaryExpression */ ||
-                        parent.kind === 205 /* ConditionalExpression */) {
+                    if (parent.kind === 205 /* BinaryExpression */ ||
+                        parent.kind === 203 /* PrefixUnaryExpression */ ||
+                        parent.kind === 204 /* PostfixUnaryExpression */ ||
+                        parent.kind === 206 /* ConditionalExpression */) {
                         return 5 /* operator */;
                     }
                 }
@@ -97910,7 +100915,7 @@ var ts;
             }
             else if (tokenKind === 10 /* StringLiteral */) {
                 // TODO: GH#18217
-                return token.parent.kind === 267 /* JsxAttribute */ ? 24 /* jsxAttributeStringLiteralValue */ : 6 /* stringLiteral */;
+                return token.parent.kind === 268 /* JsxAttribute */ ? 24 /* jsxAttributeStringLiteralValue */ : 6 /* stringLiteral */;
             }
             else if (tokenKind === 13 /* RegularExpressionLiteral */) {
                 // TODO: we should get another classification type for these literals.
@@ -97923,35 +100928,35 @@ var ts;
             else if (tokenKind === 11 /* JsxText */) {
                 return 23 /* jsxText */;
             }
-            else if (tokenKind === 72 /* Identifier */) {
+            else if (tokenKind === 73 /* Identifier */) {
                 if (token) {
                     switch (token.parent.kind) {
-                        case 240 /* ClassDeclaration */:
+                        case 241 /* ClassDeclaration */:
                             if (token.parent.name === token) {
                                 return 11 /* className */;
                             }
                             return;
-                        case 150 /* TypeParameter */:
+                        case 151 /* TypeParameter */:
                             if (token.parent.name === token) {
                                 return 15 /* typeParameterName */;
                             }
                             return;
-                        case 241 /* InterfaceDeclaration */:
+                        case 242 /* InterfaceDeclaration */:
                             if (token.parent.name === token) {
                                 return 13 /* interfaceName */;
                             }
                             return;
-                        case 243 /* EnumDeclaration */:
+                        case 244 /* EnumDeclaration */:
                             if (token.parent.name === token) {
                                 return 12 /* enumName */;
                             }
                             return;
-                        case 244 /* ModuleDeclaration */:
+                        case 245 /* ModuleDeclaration */:
                             if (token.parent.name === token) {
                                 return 14 /* moduleName */;
                             }
                             return;
-                        case 151 /* Parameter */:
+                        case 152 /* Parameter */:
                             if (token.parent.name === token) {
                                 return ts.isThisIdentifier(token) ? 3 /* keyword */ : 17 /* parameterName */;
                             }
@@ -98008,7 +101013,7 @@ var ts;
                         return convertPathCompletions(completion.paths);
                     case 1 /* Properties */: {
                         var entries = [];
-                        Completions.getCompletionEntriesFromSymbols(completion.symbols, entries, sourceFile, sourceFile, checker, 7 /* ESNext */, log, 4 /* String */, preferences); // Target will not be used, so arbitrary
+                        Completions.getCompletionEntriesFromSymbols(completion.symbols, entries, sourceFile, sourceFile, checker, 99 /* ESNext */, log, 4 /* String */, preferences); // Target will not be used, so arbitrary
                         return { isGlobalCompletion: false, isMemberCompletion: true, isNewIdentifierLocation: completion.hasIndexSignature, entries: entries };
                     }
                     case 2 /* Types */: {
@@ -98047,7 +101052,7 @@ var ts;
                 var isNewIdentifierLocation = true; // The user may type in a path that doesn't yet exist, creating a "new identifier" with respect to the collection of identifiers the server is aware of.
                 var entries = pathCompletions.map(function (_a) {
                     var name = _a.name, kind = _a.kind, span = _a.span, extension = _a.extension;
-                    return ({ name: name, kind: kind, kindModifiers: kindModifiersFromExtension(extension), sortText: "0", replacementSpan: span });
+                    return ({ name: name, kind: kind, kindModifiers: kindModifiersFromExtension(extension), sortText: Completions.SortText.LocationPriority, replacementSpan: span });
                 });
                 return { isGlobalCompletion: isGlobalCompletion, isMemberCompletion: false, isNewIdentifierLocation: isNewIdentifierLocation, entries: entries };
             }
@@ -98074,11 +101079,11 @@ var ts;
             function getStringLiteralCompletionEntries(sourceFile, node, position, typeChecker, compilerOptions, host) {
                 var parent = node.parent;
                 switch (parent.kind) {
-                    case 182 /* LiteralType */:
+                    case 183 /* LiteralType */:
                         switch (parent.parent.kind) {
-                            case 164 /* TypeReference */:
+                            case 165 /* TypeReference */:
                                 return { kind: 2 /* Types */, types: getStringLiteralTypes(typeChecker.getTypeArgumentConstraint(parent)), isNewIdentifier: false };
-                            case 180 /* IndexedAccessType */:
+                            case 181 /* IndexedAccessType */:
                                 // Get all apparent property names
                                 // i.e. interface Foo {
                                 //          foo: string;
@@ -98086,9 +101091,9 @@ var ts;
                                 //      }
                                 //      let x: Foo["/*completion position*/"]
                                 return stringLiteralCompletionsFromProperties(typeChecker.getTypeFromTypeNode(parent.parent.objectType));
-                            case 183 /* ImportType */:
+                            case 184 /* ImportType */:
                                 return { kind: 0 /* Paths */, paths: getStringLiteralCompletionsFromModuleNames(sourceFile, node, compilerOptions, host, typeChecker) };
-                            case 173 /* UnionType */: {
+                            case 174 /* UnionType */: {
                                 if (!ts.isTypeReferenceNode(parent.parent.parent))
                                     return undefined;
                                 var alreadyUsedTypes_1 = getAlreadyUsedTypesInStringLiteralUnion(parent.parent, parent);
@@ -98098,7 +101103,7 @@ var ts;
                             default:
                                 return undefined;
                         }
-                    case 275 /* PropertyAssignment */:
+                    case 276 /* PropertyAssignment */:
                         if (ts.isObjectLiteralExpression(parent.parent) && parent.name === node) {
                             // Get quoted name of properties of the object literal expression
                             // i.e. interface ConfigFiles {
@@ -98115,7 +101120,7 @@ var ts;
                             return stringLiteralCompletionsFromProperties(typeChecker.getContextualType(parent.parent));
                         }
                         return fromContextualType();
-                    case 190 /* ElementAccessExpression */: {
+                    case 191 /* ElementAccessExpression */: {
                         var _a = parent, expression = _a.expression, argumentExpression = _a.argumentExpression;
                         if (node === argumentExpression) {
                             // Get all names of properties on the expression
@@ -98128,8 +101133,8 @@ var ts;
                         }
                         return undefined;
                     }
-                    case 191 /* CallExpression */:
-                    case 192 /* NewExpression */:
+                    case 192 /* CallExpression */:
+                    case 193 /* NewExpression */:
                         if (!ts.isRequireCall(parent, /*checkArgumentIsStringLiteralLike*/ false) && !ts.isImportCall(parent)) {
                             var argumentInfo = ts.SignatureHelp.getArgumentInfoForCompletions(node, position, sourceFile);
                             // Get string literal completions from specialized signatures of the target
@@ -98138,9 +101143,9 @@ var ts;
                             return argumentInfo ? getStringLiteralCompletionsFromSignature(argumentInfo, typeChecker) : fromContextualType();
                         }
                     // falls through (is `require("")` or `import("")`)
-                    case 249 /* ImportDeclaration */:
-                    case 255 /* ExportDeclaration */:
-                    case 259 /* ExternalModuleReference */:
+                    case 250 /* ImportDeclaration */:
+                    case 256 /* ExportDeclaration */:
+                    case 260 /* ExternalModuleReference */:
                         // Get all known external module names or complete a path to a module
                         // i.e. import * as ns from "/*completion position*/";
                         //      var y = import("/*completion position*/");
@@ -98587,7 +101592,7 @@ var ts;
                 var offset = index !== -1 ? index + 1 : 0;
                 // If the range is an identifier, span is unnecessary.
                 var length = text.length - offset;
-                return length === 0 || ts.isIdentifierText(text.substr(offset, length), 7 /* ESNext */) ? undefined : ts.createTextSpan(textStart + offset, length);
+                return length === 0 || ts.isIdentifierText(text.substr(offset, length), 99 /* ESNext */) ? undefined : ts.createTextSpan(textStart + offset, length);
             }
             // Returns true if the path is explicitly relative to the script (i.e. relative to . or ..)
             function isPathRelativeToScript(path) {
@@ -98650,6 +101655,14 @@ var ts;
 (function (ts) {
     var Completions;
     (function (Completions) {
+        var SortText;
+        (function (SortText) {
+            SortText["LocationPriority"] = "0";
+            SortText["SuggestedClassMembers"] = "1";
+            SortText["GlobalsOrKeywords"] = "2";
+            SortText["AutoImportSuggestions"] = "3";
+            SortText["JavascriptIdentifiers"] = "4";
+        })(SortText = Completions.SortText || (Completions.SortText = {}));
         var SymbolOriginInfoKind;
         (function (SymbolOriginInfoKind) {
             SymbolOriginInfoKind[SymbolOriginInfoKind["ThisType"] = 0] = "ThisType";
@@ -98671,7 +101684,9 @@ var ts;
             KeywordCompletionFilters[KeywordCompletionFilters["InterfaceElementKeywords"] = 3] = "InterfaceElementKeywords";
             KeywordCompletionFilters[KeywordCompletionFilters["ConstructorParameterKeywords"] = 4] = "ConstructorParameterKeywords";
             KeywordCompletionFilters[KeywordCompletionFilters["FunctionLikeBodyKeywords"] = 5] = "FunctionLikeBodyKeywords";
-            KeywordCompletionFilters[KeywordCompletionFilters["TypeKeywords"] = 6] = "TypeKeywords";
+            KeywordCompletionFilters[KeywordCompletionFilters["TypeAssertionKeywords"] = 6] = "TypeAssertionKeywords";
+            KeywordCompletionFilters[KeywordCompletionFilters["TypeKeywords"] = 7] = "TypeKeywords";
+            KeywordCompletionFilters[KeywordCompletionFilters["Last"] = 7] = "Last";
         })(KeywordCompletionFilters || (KeywordCompletionFilters = {}));
         var GlobalsSearch;
         (function (GlobalsSearch) {
@@ -98683,14 +101698,15 @@ var ts;
             var typeChecker = program.getTypeChecker();
             var compilerOptions = program.getCompilerOptions();
             var contextToken = ts.findPrecedingToken(position, sourceFile);
-            if (triggerCharacter && !isValidTrigger(sourceFile, triggerCharacter, contextToken, position))
+            if (triggerCharacter && !ts.isInString(sourceFile, position, contextToken) && !isValidTrigger(sourceFile, triggerCharacter, contextToken, position)) {
                 return undefined;
+            }
             var stringCompletions = Completions.StringCompletions.getStringLiteralCompletions(sourceFile, position, contextToken, typeChecker, compilerOptions, host, log, preferences);
             if (stringCompletions) {
                 return stringCompletions;
             }
             if (contextToken && ts.isBreakOrContinueStatement(contextToken.parent)
-                && (contextToken.kind === 73 /* BreakKeyword */ || contextToken.kind === 78 /* ContinueKeyword */ || contextToken.kind === 72 /* Identifier */)) {
+                && (contextToken.kind === 74 /* BreakKeyword */ || contextToken.kind === 79 /* ContinueKeyword */ || contextToken.kind === 73 /* Identifier */)) {
                 return getLabelCompletionAtPosition(contextToken.parent);
             }
             var completionData = getCompletionData(program, log, sourceFile, isUncheckedFile(sourceFile, compilerOptions), position, preferences, /*detailsEntryId*/ undefined);
@@ -98717,7 +101733,7 @@ var ts;
             return { isGlobalCompletion: false, isMemberCompletion: false, isNewIdentifierLocation: false, entries: entries };
         }
         function completionInfoFromData(sourceFile, typeChecker, compilerOptions, log, completionData, preferences) {
-            var symbols = completionData.symbols, completionKind = completionData.completionKind, isInSnippetScope = completionData.isInSnippetScope, isNewIdentifierLocation = completionData.isNewIdentifierLocation, location = completionData.location, propertyAccessToConvert = completionData.propertyAccessToConvert, keywordFilters = completionData.keywordFilters, literals = completionData.literals, symbolToOriginInfoMap = completionData.symbolToOriginInfoMap, recommendedCompletion = completionData.recommendedCompletion, isJsxInitializer = completionData.isJsxInitializer;
+            var symbols = completionData.symbols, completionKind = completionData.completionKind, isInSnippetScope = completionData.isInSnippetScope, isNewIdentifierLocation = completionData.isNewIdentifierLocation, location = completionData.location, propertyAccessToConvert = completionData.propertyAccessToConvert, keywordFilters = completionData.keywordFilters, literals = completionData.literals, symbolToOriginInfoMap = completionData.symbolToOriginInfoMap, recommendedCompletion = completionData.recommendedCompletion, isJsxInitializer = completionData.isJsxInitializer, insideJsDocTagTypeExpression = completionData.insideJsDocTagTypeExpression, symbolToSortTextMap = completionData.symbolToSortTextMap;
             if (location && location.parent && ts.isJsxClosingElement(location.parent)) {
                 // In the TypeScript JSX element, if such element is not defined. When users query for completion at closing tag,
                 // instead of simply giving unknown value, the completion will return the tag-name of an associated opening-element.
@@ -98731,24 +101747,24 @@ var ts;
                     name: tagName.getFullText(sourceFile) + (hasClosingAngleBracket ? "" : ">"),
                     kind: "class" /* classElement */,
                     kindModifiers: undefined,
-                    sortText: "0",
+                    sortText: SortText.LocationPriority,
                 };
                 return { isGlobalCompletion: false, isMemberCompletion: true, isNewIdentifierLocation: false, entries: [entry] };
             }
             var entries = [];
             if (isUncheckedFile(sourceFile, compilerOptions)) {
-                var uniqueNames = getCompletionEntriesFromSymbols(symbols, entries, location, sourceFile, typeChecker, compilerOptions.target, log, completionKind, preferences, propertyAccessToConvert, isJsxInitializer, recommendedCompletion, symbolToOriginInfoMap);
+                var uniqueNames = getCompletionEntriesFromSymbols(symbols, entries, location, sourceFile, typeChecker, compilerOptions.target, log, completionKind, preferences, propertyAccessToConvert, isJsxInitializer, recommendedCompletion, symbolToOriginInfoMap, symbolToSortTextMap);
                 getJSCompletionEntries(sourceFile, location.pos, uniqueNames, compilerOptions.target, entries); // TODO: GH#18217
             }
             else {
                 if (!isNewIdentifierLocation && (!symbols || symbols.length === 0) && keywordFilters === 0 /* None */) {
                     return undefined;
                 }
-                getCompletionEntriesFromSymbols(symbols, entries, location, sourceFile, typeChecker, compilerOptions.target, log, completionKind, preferences, propertyAccessToConvert, isJsxInitializer, recommendedCompletion, symbolToOriginInfoMap);
+                getCompletionEntriesFromSymbols(symbols, entries, location, sourceFile, typeChecker, compilerOptions.target, log, completionKind, preferences, propertyAccessToConvert, isJsxInitializer, recommendedCompletion, symbolToOriginInfoMap, symbolToSortTextMap);
             }
             if (keywordFilters !== 0 /* None */) {
                 var entryNames = ts.arrayToSet(entries, function (e) { return e.name; });
-                for (var _i = 0, _a = getKeywordCompletions(keywordFilters); _i < _a.length; _i++) {
+                for (var _i = 0, _a = getKeywordCompletions(keywordFilters, !insideJsDocTagTypeExpression && ts.isSourceFileJS(sourceFile)); _i < _a.length; _i++) {
                     var keywordEntry = _a[_i];
                     if (!entryNames.has(keywordEntry.name)) {
                         entries.push(keywordEntry);
@@ -98786,7 +101802,7 @@ var ts;
                         name: realName,
                         kind: "warning" /* warning */,
                         kindModifiers: "",
-                        sortText: "1"
+                        sortText: SortText.JavascriptIdentifiers
                     });
                 }
             });
@@ -98795,14 +101811,9 @@ var ts;
             return typeof literal === "object" ? ts.pseudoBigIntToString(literal) + "n" : JSON.stringify(literal);
         };
         function createCompletionEntryForLiteral(literal) {
-            return { name: completionNameForLiteral(literal), kind: "string" /* string */, kindModifiers: "" /* none */, sortText: "0" };
+            return { name: completionNameForLiteral(literal), kind: "string" /* string */, kindModifiers: "" /* none */, sortText: SortText.LocationPriority };
         }
-        function createCompletionEntry(symbol, location, sourceFile, typeChecker, target, kind, origin, recommendedCompletion, propertyAccessToConvert, isJsxInitializer, preferences) {
-            var info = getCompletionEntryDisplayNameForSymbol(symbol, target, origin, kind);
-            if (!info) {
-                return undefined;
-            }
-            var name = info.name, needsConvertPropertyAccess = info.needsConvertPropertyAccess;
+        function createCompletionEntry(symbol, sortText, location, sourceFile, typeChecker, name, needsConvertPropertyAccess, origin, recommendedCompletion, propertyAccessToConvert, isJsxInitializer, preferences) {
             var insertText;
             var replacementSpan;
             if (origin && origin.kind === 0 /* ThisType */) {
@@ -98839,7 +101850,7 @@ var ts;
                 name: name,
                 kind: ts.SymbolDisplay.getSymbolKind(typeChecker, symbol, location),
                 kindModifiers: ts.SymbolDisplay.getSymbolModifiers(symbol),
-                sortText: "0",
+                sortText: sortText,
                 source: getSourceFromOrigin(origin),
                 hasAction: trueOrUndefined(!!origin && originIsExport(origin)),
                 isRecommended: trueOrUndefined(isRecommendedCompletionMatch(symbol, recommendedCompletion, typeChecker)),
@@ -98857,7 +101868,7 @@ var ts;
         function getSourceFromOrigin(origin) {
             return origin && originIsExport(origin) ? ts.stripQuotes(origin.moduleSymbol.name) : undefined;
         }
-        function getCompletionEntriesFromSymbols(symbols, entries, location, sourceFile, typeChecker, target, log, kind, preferences, propertyAccessToConvert, isJsxInitializer, recommendedCompletion, symbolToOriginInfoMap) {
+        function getCompletionEntriesFromSymbols(symbols, entries, location, sourceFile, typeChecker, target, log, kind, preferences, propertyAccessToConvert, isJsxInitializer, recommendedCompletion, symbolToOriginInfoMap, symbolToSortTextMap) {
             var start = ts.timestamp();
             // Tracks unique names.
             // We don't set this for global variables or completions from external module exports, because we can have multiple of those.
@@ -98867,14 +101878,18 @@ var ts;
             for (var _i = 0, symbols_1 = symbols; _i < symbols_1.length; _i++) {
                 var symbol = symbols_1[_i];
                 var origin = symbolToOriginInfoMap ? symbolToOriginInfoMap[ts.getSymbolId(symbol)] : undefined;
-                var entry = createCompletionEntry(symbol, location, sourceFile, typeChecker, target, kind, origin, recommendedCompletion, propertyAccessToConvert, isJsxInitializer, preferences);
-                if (!entry) {
+                var info = getCompletionEntryDisplayNameForSymbol(symbol, target, origin, kind);
+                if (!info) {
                     continue;
                 }
-                var name = entry.name;
+                var name = info.name, needsConvertPropertyAccess = info.needsConvertPropertyAccess;
                 if (uniques.has(name)) {
                     continue;
                 }
+                var entry = createCompletionEntry(symbol, symbolToSortTextMap && symbolToSortTextMap[ts.getSymbolId(symbol)] || SortText.LocationPriority, location, sourceFile, typeChecker, name, needsConvertPropertyAccess, origin, recommendedCompletion, propertyAccessToConvert, isJsxInitializer, preferences);
+                if (!entry) {
+                    continue;
+                }
                 // Latter case tests whether this is a global variable.
                 if (!origin && !(symbol.parent === undefined && !ts.some(symbol.declarations, function (d) { return d.getSourceFile() === location.getSourceFile(); }))) { // TODO: GH#18217
                     uniques.set(name, true);
@@ -98907,7 +101922,7 @@ var ts;
                             name: name,
                             kindModifiers: "" /* none */,
                             kind: "label" /* label */,
-                            sortText: "0"
+                            sortText: SortText.LocationPriority
                         });
                     }
                 }
@@ -99047,25 +102062,25 @@ var ts;
         function getContextualType(previousToken, position, sourceFile, checker) {
             var parent = previousToken.parent;
             switch (previousToken.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return ts.getContextualTypeFromParent(previousToken, checker);
-                case 59 /* EqualsToken */:
+                case 60 /* EqualsToken */:
                     switch (parent.kind) {
-                        case 237 /* VariableDeclaration */:
+                        case 238 /* VariableDeclaration */:
                             return checker.getContextualType(parent.initializer); // TODO: GH#18217
-                        case 204 /* BinaryExpression */:
+                        case 205 /* BinaryExpression */:
                             return checker.getTypeAtLocation(parent.left);
-                        case 267 /* JsxAttribute */:
+                        case 268 /* JsxAttribute */:
                             return checker.getContextualTypeForJsxAttribute(parent);
                         default:
                             return undefined;
                     }
-                case 95 /* NewKeyword */:
+                case 96 /* NewKeyword */:
                     return checker.getContextualType(parent);
-                case 74 /* CaseKeyword */:
+                case 75 /* CaseKeyword */:
                     return ts.getSwitchedType(ts.cast(parent, ts.isCaseClause), checker);
                 case 18 /* OpenBraceToken */:
-                    return ts.isJsxExpression(parent) && parent.parent.kind !== 260 /* JsxElement */ ? checker.getContextualTypeForJsxAttribute(parent.parent) : undefined;
+                    return ts.isJsxExpression(parent) && parent.parent.kind !== 261 /* JsxElement */ ? checker.getContextualTypeForJsxAttribute(parent.parent) : undefined;
                 default:
                     var argInfo = ts.SignatureHelp.getArgumentInfoForCompletions(previousToken, position, sourceFile);
                     return argInfo
@@ -99084,7 +102099,7 @@ var ts;
             return symbol.parent && (isModuleSymbol(symbol.parent) ? symbol : getFirstSymbolInChain(symbol.parent, enclosingDeclaration, checker));
         }
         function isModuleSymbol(symbol) {
-            return symbol.declarations.some(function (d) { return d.kind === 284 /* SourceFile */; });
+            return symbol.declarations.some(function (d) { return d.kind === 285 /* SourceFile */; });
         }
         function getCompletionData(program, log, sourceFile, isUncheckedFile, position, preferences, detailsEntryId) {
             var typeChecker = program.getTypeChecker();
@@ -99135,11 +102150,11 @@ var ts;
                     if (tag.tagName.pos <= position && position <= tag.tagName.end) {
                         return { kind: 1 /* JsDocTagName */ };
                     }
-                    if (isTagWithTypeExpression(tag) && tag.typeExpression && tag.typeExpression.kind === 288 /* JSDocTypeExpression */) {
+                    if (isTagWithTypeExpression(tag) && tag.typeExpression && tag.typeExpression.kind === 289 /* JSDocTypeExpression */) {
                         currentToken = ts.getTokenAtPosition(sourceFile, position);
                         if (!currentToken ||
                             (!ts.isDeclarationName(currentToken) &&
-                                (currentToken.parent.kind !== 310 /* JSDocPropertyTag */ ||
+                                (currentToken.parent.kind !== 312 /* JSDocPropertyTag */ ||
                                     currentToken.parent.name !== currentToken))) {
                             // Use as type location if inside tag's type expression
                             insideJsDocTagTypeExpression = isCurrentlyEditingNode(tag.typeExpression);
@@ -99189,18 +102204,26 @@ var ts;
                 if (contextToken.kind === 24 /* DotToken */) {
                     isRightOfDot = true;
                     switch (parent.kind) {
-                        case 189 /* PropertyAccessExpression */:
+                        case 190 /* PropertyAccessExpression */:
                             propertyAccessToConvert = parent;
                             node = propertyAccessToConvert.expression;
+                            if (node.end === contextToken.pos &&
+                                ts.isCallExpression(node) &&
+                                node.getChildCount(sourceFile) &&
+                                ts.last(node.getChildren(sourceFile)).kind !== 21 /* CloseParenToken */) {
+                                // This is likely dot from incorrectly parsed call expression and user is starting to write spread
+                                // eg: Math.min(./**/)
+                                return undefined;
+                            }
                             break;
-                        case 148 /* QualifiedName */:
+                        case 149 /* QualifiedName */:
                             node = parent.left;
                             break;
-                        case 244 /* ModuleDeclaration */:
+                        case 245 /* ModuleDeclaration */:
                             node = parent.name;
                             break;
-                        case 183 /* ImportType */:
-                        case 214 /* MetaProperty */:
+                        case 184 /* ImportType */:
+                        case 215 /* MetaProperty */:
                             node = parent;
                             break;
                         default:
@@ -99213,7 +102236,7 @@ var ts;
                     // <UI.Test /* completion position */ />
                     // If the tagname is a property access expression, we will then walk up to the top most of property access expression.
                     // Then, try to get a JSX container and its associated attributes type.
-                    if (parent && parent.kind === 189 /* PropertyAccessExpression */) {
+                    if (parent && parent.kind === 190 /* PropertyAccessExpression */) {
                         contextToken = parent;
                         parent = parent.parent;
                     }
@@ -99221,48 +102244,48 @@ var ts;
                     if (currentToken.parent === location) {
                         switch (currentToken.kind) {
                             case 30 /* GreaterThanToken */:
-                                if (currentToken.parent.kind === 260 /* JsxElement */ || currentToken.parent.kind === 262 /* JsxOpeningElement */) {
+                                if (currentToken.parent.kind === 261 /* JsxElement */ || currentToken.parent.kind === 263 /* JsxOpeningElement */) {
                                     location = currentToken;
                                 }
                                 break;
                             case 42 /* SlashToken */:
-                                if (currentToken.parent.kind === 261 /* JsxSelfClosingElement */) {
+                                if (currentToken.parent.kind === 262 /* JsxSelfClosingElement */) {
                                     location = currentToken;
                                 }
                                 break;
                         }
                     }
                     switch (parent.kind) {
-                        case 263 /* JsxClosingElement */:
+                        case 264 /* JsxClosingElement */:
                             if (contextToken.kind === 42 /* SlashToken */) {
                                 isStartingCloseTag = true;
                                 location = contextToken;
                             }
                             break;
-                        case 204 /* BinaryExpression */:
+                        case 205 /* BinaryExpression */:
                             if (!binaryExpressionMayBeOpenTag(parent)) {
                                 break;
                             }
                         // falls through
-                        case 261 /* JsxSelfClosingElement */:
-                        case 260 /* JsxElement */:
-                        case 262 /* JsxOpeningElement */:
+                        case 262 /* JsxSelfClosingElement */:
+                        case 261 /* JsxElement */:
+                        case 263 /* JsxOpeningElement */:
                             if (contextToken.kind === 28 /* LessThanToken */) {
                                 isRightOfOpenTag = true;
                                 location = contextToken;
                             }
                             break;
-                        case 267 /* JsxAttribute */:
+                        case 268 /* JsxAttribute */:
                             switch (previousToken.kind) {
-                                case 59 /* EqualsToken */:
+                                case 60 /* EqualsToken */:
                                     isJsxInitializer = true;
                                     break;
-                                case 72 /* Identifier */:
+                                case 73 /* Identifier */:
                                     // For `<div x=[|f/**/|]`, `parent` will be `x` and `previousToken.parent` will be `f` (which is its own JsxAttribute)
                                     // Note for `<div someBool f>` we don't want to treat this as a jsx inializer, instead it's the attribute name.
                                     if (parent !== previousToken.parent &&
                                         !parent.initializer &&
-                                        ts.findChildOfKind(parent, 59 /* EqualsToken */, sourceFile)) {
+                                        ts.findChildOfKind(parent, 60 /* EqualsToken */, sourceFile)) {
                                         isJsxInitializer = previousToken;
                                     }
                             }
@@ -99276,6 +102299,7 @@ var ts;
             var keywordFilters = 0 /* None */;
             var symbols = [];
             var symbolToOriginInfoMap = [];
+            var symbolToSortTextMap = [];
             if (isRightOfDot) {
                 getTypeScriptMemberSymbols();
             }
@@ -99307,14 +102331,30 @@ var ts;
             var contextualType = previousToken && getContextualType(previousToken, position, sourceFile, typeChecker);
             var literals = ts.mapDefined(contextualType && (contextualType.isUnion() ? contextualType.types : [contextualType]), function (t) { return t.isLiteral() ? t.value : undefined; });
             var recommendedCompletion = previousToken && contextualType && getRecommendedCompletion(previousToken, contextualType, typeChecker);
-            return { kind: 0 /* Data */, symbols: symbols, completionKind: completionKind, isInSnippetScope: isInSnippetScope, propertyAccessToConvert: propertyAccessToConvert, isNewIdentifierLocation: isNewIdentifierLocation, location: location, keywordFilters: keywordFilters, literals: literals, symbolToOriginInfoMap: symbolToOriginInfoMap, recommendedCompletion: recommendedCompletion, previousToken: previousToken, isJsxInitializer: isJsxInitializer };
+            return {
+                kind: 0 /* Data */,
+                symbols: symbols,
+                completionKind: completionKind,
+                isInSnippetScope: isInSnippetScope,
+                propertyAccessToConvert: propertyAccessToConvert,
+                isNewIdentifierLocation: isNewIdentifierLocation,
+                location: location,
+                keywordFilters: keywordFilters,
+                literals: literals,
+                symbolToOriginInfoMap: symbolToOriginInfoMap,
+                recommendedCompletion: recommendedCompletion,
+                previousToken: previousToken,
+                isJsxInitializer: isJsxInitializer,
+                insideJsDocTagTypeExpression: insideJsDocTagTypeExpression,
+                symbolToSortTextMap: symbolToSortTextMap
+            };
             function isTagWithTypeExpression(tag) {
                 switch (tag.kind) {
-                    case 304 /* JSDocParameterTag */:
-                    case 310 /* JSDocPropertyTag */:
-                    case 305 /* JSDocReturnTag */:
-                    case 307 /* JSDocTypeTag */:
-                    case 309 /* JSDocTypedefTag */:
+                    case 306 /* JSDocParameterTag */:
+                    case 312 /* JSDocPropertyTag */:
+                    case 307 /* JSDocReturnTag */:
+                    case 309 /* JSDocTypeTag */:
+                    case 311 /* JSDocTypedefTag */:
                         return true;
                     default:
                         return false;
@@ -99323,11 +102363,13 @@ var ts;
             function getTypeScriptMemberSymbols() {
                 // Right of dot member completion list
                 completionKind = 2 /* PropertyAccess */;
-                // Since this is qualified name check its a type node location
+                // Since this is qualified name check it's a type node location
                 var isImportType = ts.isLiteralImportTypeNode(node);
-                var isTypeLocation = insideJsDocTagTypeExpression || (isImportType && !node.isTypeOf) || ts.isPartOfTypeNode(node.parent);
+                var isTypeLocation = insideJsDocTagTypeExpression
+                    || (isImportType && !node.isTypeOf)
+                    || ts.isPartOfTypeNode(node.parent)
+                    || ts.isPossiblyTypeArgumentPosition(contextToken, sourceFile, typeChecker);
                 var isRhsOfImportDeclaration = ts.isInRightSideOfInternalImportEqualsDeclaration(node);
-                var allowTypeOrValue = isRhsOfImportDeclaration || (!isTypeLocation && ts.isPossiblyTypeArgumentPosition(contextToken, sourceFile, typeChecker));
                 if (ts.isEntityName(node) || isImportType) {
                     var isNamespaceName = ts.isModuleDeclaration(node.parent);
                     if (isNamespaceName)
@@ -99343,7 +102385,7 @@ var ts;
                             var isValidAccess = isNamespaceName
                                 // At `namespace N.M/**/`, if this is the only declaration of `M`, don't include `M` as a completion.
                                 ? function (symbol) { return !!(symbol.flags & 1920 /* Namespace */) && !symbol.declarations.every(function (d) { return d.parent === node.parent; }); }
-                                : allowTypeOrValue ?
+                                : isRhsOfImportDeclaration ?
                                     // Any kind is allowed when dotting off namespace in internal import equals declaration
                                     function (symbol) { return isValidTypeAccess_1(symbol) || isValidValueAccess_1(symbol); } :
                                     isTypeLocation ? isValidTypeAccess_1 : isValidValueAccess_1;
@@ -99354,15 +102396,17 @@ var ts;
                                 }
                             }
                             // If the module is merged with a value, we must get the type of the class and add its propertes (for inherited static methods).
-                            if (!isTypeLocation && symbol.declarations.some(function (d) { return d.kind !== 284 /* SourceFile */ && d.kind !== 244 /* ModuleDeclaration */ && d.kind !== 243 /* EnumDeclaration */; })) {
+                            if (!isTypeLocation &&
+                                symbol.declarations &&
+                                symbol.declarations.some(function (d) { return d.kind !== 285 /* SourceFile */ && d.kind !== 245 /* ModuleDeclaration */ && d.kind !== 244 /* EnumDeclaration */; })) {
                                 addTypeProperties(typeChecker.getTypeOfSymbolAtLocation(symbol, node));
                             }
                             return;
                         }
                     }
                 }
-                if (ts.isMetaProperty(node) && (node.keywordToken === 95 /* NewKeyword */ || node.keywordToken === 92 /* ImportKeyword */)) {
-                    var completion = (node.keywordToken === 95 /* NewKeyword */) ? "target" : "meta";
+                if (ts.isMetaProperty(node) && (node.keywordToken === 96 /* NewKeyword */ || node.keywordToken === 93 /* ImportKeyword */)) {
+                    var completion = (node.keywordToken === 96 /* NewKeyword */) ? "target" : "meta";
                     symbols.push(typeChecker.createSymbol(4 /* Property */, ts.escapeLeadingUnderscores(completion)));
                     return;
                 }
@@ -99383,7 +102427,7 @@ var ts;
                 else {
                     for (var _i = 0, _a = type.getApparentProperties(); _i < _a.length; _i++) {
                         var symbol = _a[_i];
-                        if (typeChecker.isValidPropertyAccessForCompletions(node.kind === 183 /* ImportType */ ? node : node.parent, type, symbol)) {
+                        if (typeChecker.isValidPropertyAccessForCompletions(node.kind === 184 /* ImportType */ ? node : node.parent, type, symbol)) {
                             addPropertySymbol(symbol);
                         }
                     }
@@ -99405,6 +102449,9 @@ var ts;
                         symbolToOriginInfoMap[ts.getSymbolId(firstAccessibleSymbol)] =
                             !moduleSymbol || !ts.isExternalModuleSymbol(moduleSymbol) ? { kind: 1 /* SymbolMemberNoExport */ } : { kind: 2 /* SymbolMemberExport */, moduleSymbol: moduleSymbol, isDefaultExport: false };
                     }
+                    else if (preferences.includeCompletionsWithInsertText) {
+                        symbols.push(symbol);
+                    }
                 }
                 else {
                     symbols.push(symbol);
@@ -99486,14 +102533,22 @@ var ts;
                 var isTypeOnly = isTypeOnlyCompletion();
                 var symbolMeanings = (isTypeOnly ? 0 /* None */ : 67220415 /* Value */) | 67897832 /* Type */ | 1920 /* Namespace */ | 2097152 /* Alias */;
                 symbols = ts.Debug.assertEachDefined(typeChecker.getSymbolsInScope(scopeNode, symbolMeanings), "getSymbolsInScope() should all be defined");
+                for (var _i = 0, symbols_2 = symbols; _i < symbols_2.length; _i++) {
+                    var symbol = symbols_2[_i];
+                    if (!typeChecker.isArgumentsSymbol(symbol) &&
+                        !ts.some(symbol.declarations, function (d) { return d.getSourceFile() === sourceFile; })) {
+                        symbolToSortTextMap[ts.getSymbolId(symbol)] = SortText.GlobalsOrKeywords;
+                    }
+                }
                 // Need to insert 'this.' before properties of `this` type, so only do that if `includeInsertTextCompletions`
-                if (preferences.includeCompletionsWithInsertText && scopeNode.kind !== 284 /* SourceFile */) {
+                if (preferences.includeCompletionsWithInsertText && scopeNode.kind !== 285 /* SourceFile */) {
                     var thisType = typeChecker.tryGetThisTypeAt(scopeNode, /*includeGlobalThis*/ false);
                     if (thisType) {
-                        for (var _i = 0, _a = getPropertiesForCompletion(thisType, typeChecker); _i < _a.length; _i++) {
-                            var symbol = _a[_i];
+                        for (var _a = 0, _b = getPropertiesForCompletion(thisType, typeChecker); _a < _b.length; _a++) {
+                            var symbol = _b[_a];
                             symbolToOriginInfoMap[ts.getSymbolId(symbol)] = { kind: 0 /* ThisType */ };
                             symbols.push(symbol);
+                            symbolToSortTextMap[ts.getSymbolId(symbol)] = SortText.SuggestedClassMembers;
                         }
                     }
                 }
@@ -99520,10 +102575,10 @@ var ts;
             }
             function isSnippetScope(scopeNode) {
                 switch (scopeNode.kind) {
-                    case 284 /* SourceFile */:
-                    case 206 /* TemplateExpression */:
-                    case 270 /* JsxExpression */:
-                    case 218 /* Block */:
+                    case 285 /* SourceFile */:
+                    case 207 /* TemplateExpression */:
+                    case 271 /* JsxExpression */:
+                    case 219 /* Block */:
                         return true;
                     default:
                         return ts.isStatement(scopeNode);
@@ -99531,9 +102586,11 @@ var ts;
             }
             function filterGlobalCompletion(symbols) {
                 var isTypeOnly = isTypeOnlyCompletion();
-                var allowTypes = isTypeOnly || !isContextTokenValueLocation(contextToken) && ts.isPossiblyTypeArgumentPosition(contextToken, sourceFile, typeChecker);
-                if (isTypeOnly)
-                    keywordFilters = 6 /* TypeKeywords */;
+                if (isTypeOnly) {
+                    keywordFilters = isTypeAssertion()
+                        ? 6 /* TypeAssertionKeywords */
+                        : 7 /* TypeKeywords */;
+                }
                 ts.filterMutate(symbols, function (symbol) {
                     if (!ts.isSourceFile(location)) {
                         // export = /**/ here we want to get all meanings, so any symbol is ok
@@ -99545,40 +102602,49 @@ var ts;
                         if (ts.isInRightSideOfInternalImportEqualsDeclaration(location)) {
                             return !!(symbol.flags & 1920 /* Namespace */);
                         }
-                        if (allowTypes) {
-                            // Its a type, but you can reach it by namespace.type as well
-                            var symbolAllowedAsType = symbolCanBeReferencedAtTypeLocation(symbol);
-                            if (symbolAllowedAsType || isTypeOnly) {
-                                return symbolAllowedAsType;
-                            }
+                        if (isTypeOnly) {
+                            // It's a type, but you can reach it by namespace.type as well
+                            return symbolCanBeReferencedAtTypeLocation(symbol);
                         }
                     }
                     // expressions are value space (which includes the value namespaces)
                     return !!(ts.getCombinedLocalAndExportSymbolFlags(symbol) & 67220415 /* Value */);
                 });
             }
+            function isTypeAssertion() {
+                return ts.isAssertionExpression(contextToken.parent);
+            }
             function isTypeOnlyCompletion() {
-                return insideJsDocTagTypeExpression || !isContextTokenValueLocation(contextToken) && (ts.isPartOfTypeNode(location) || isContextTokenTypeLocation(contextToken));
+                return insideJsDocTagTypeExpression
+                    || !isContextTokenValueLocation(contextToken) &&
+                        (ts.isPossiblyTypeArgumentPosition(contextToken, sourceFile, typeChecker)
+                            || ts.isPartOfTypeNode(location)
+                            || isContextTokenTypeLocation(contextToken));
             }
             function isContextTokenValueLocation(contextToken) {
                 return contextToken &&
-                    contextToken.kind === 104 /* TypeOfKeyword */ &&
-                    (contextToken.parent.kind === 167 /* TypeQuery */ || ts.isTypeOfExpression(contextToken.parent));
+                    contextToken.kind === 105 /* TypeOfKeyword */ &&
+                    (contextToken.parent.kind === 168 /* TypeQuery */ || ts.isTypeOfExpression(contextToken.parent));
             }
             function isContextTokenTypeLocation(contextToken) {
                 if (contextToken) {
                     var parentKind = contextToken.parent.kind;
                     switch (contextToken.kind) {
                         case 57 /* ColonToken */:
-                            return parentKind === 154 /* PropertyDeclaration */ ||
-                                parentKind === 153 /* PropertySignature */ ||
-                                parentKind === 151 /* Parameter */ ||
-                                parentKind === 237 /* VariableDeclaration */ ||
+                            return parentKind === 155 /* PropertyDeclaration */ ||
+                                parentKind === 154 /* PropertySignature */ ||
+                                parentKind === 152 /* Parameter */ ||
+                                parentKind === 238 /* VariableDeclaration */ ||
                                 ts.isFunctionLikeKind(parentKind);
-                        case 59 /* EqualsToken */:
-                            return parentKind === 242 /* TypeAliasDeclaration */;
-                        case 119 /* AsKeyword */:
-                            return parentKind === 212 /* AsExpression */;
+                        case 60 /* EqualsToken */:
+                            return parentKind === 243 /* TypeAliasDeclaration */;
+                        case 120 /* AsKeyword */:
+                            return parentKind === 213 /* AsExpression */;
+                        case 28 /* LessThanToken */:
+                            return parentKind === 165 /* TypeReference */ ||
+                                parentKind === 195 /* TypeAssertionExpression */;
+                        case 87 /* ExtendsKeyword */:
+                            return parentKind === 151 /* TypeParameter */;
                     }
                 }
                 return false;
@@ -99610,6 +102676,7 @@ var ts;
                         // So in `declare namespace foo {} declare module "foo" { export = foo; }`, there will just be the global completion for `foo`.
                         ts.some(resolvedModuleSymbol.declarations, function (d) { return !!d.getSourceFile().externalModuleIndicator; })) {
                         symbols.push(resolvedModuleSymbol);
+                        symbolToSortTextMap[ts.getSymbolId(resolvedModuleSymbol)] = SortText.AutoImportSuggestions;
                         symbolToOriginInfoMap[ts.getSymbolId(resolvedModuleSymbol)] = { kind: 3 /* Export */, moduleSymbol: moduleSymbol, isDefaultExport: false };
                     }
                     for (var _i = 0, _a = typeChecker.getExportsOfModule(moduleSymbol); _i < _a.length; _i++) {
@@ -99634,6 +102701,7 @@ var ts;
                         var origin = { kind: 3 /* Export */, moduleSymbol: moduleSymbol, isDefaultExport: isDefaultExport };
                         if (detailsEntryId || stringContainsCharactersInOrder(getSymbolName(symbol, origin, target).toLowerCase(), tokenTextLowerCase)) {
                             symbols.push(symbol);
+                            symbolToSortTextMap[ts.getSymbolId(symbol)] = SortText.AutoImportSuggestions;
                             symbolToOriginInfoMap[ts.getSymbolId(symbol)] = origin;
                         }
                     }
@@ -99685,11 +102753,11 @@ var ts;
                     return true;
                 }
                 if (contextToken.kind === 30 /* GreaterThanToken */ && contextToken.parent) {
-                    if (contextToken.parent.kind === 262 /* JsxOpeningElement */) {
+                    if (contextToken.parent.kind === 263 /* JsxOpeningElement */) {
                         return true;
                     }
-                    if (contextToken.parent.kind === 263 /* JsxClosingElement */ || contextToken.parent.kind === 261 /* JsxSelfClosingElement */) {
-                        return !!contextToken.parent.parent && contextToken.parent.parent.kind === 260 /* JsxElement */;
+                    if (contextToken.parent.kind === 264 /* JsxClosingElement */ || contextToken.parent.kind === 262 /* JsxSelfClosingElement */) {
+                        return !!contextToken.parent.parent && contextToken.parent.parent.kind === 261 /* JsxElement */;
                     }
                 }
                 return false;
@@ -99700,40 +102768,40 @@ var ts;
                     // Previous token may have been a keyword that was converted to an identifier.
                     switch (keywordForNode(previousToken)) {
                         case 27 /* CommaToken */:
-                            return containingNodeKind === 191 /* CallExpression */ // func( a, |
-                                || containingNodeKind === 157 /* Constructor */ // constructor( a, |   /* public, protected, private keywords are allowed here, so show completion */
-                                || containingNodeKind === 192 /* NewExpression */ // new C(a, |
-                                || containingNodeKind === 187 /* ArrayLiteralExpression */ // [a, |
-                                || containingNodeKind === 204 /* BinaryExpression */ // const x = (a, |
-                                || containingNodeKind === 165 /* FunctionType */; // var x: (s: string, list|
+                            return containingNodeKind === 192 /* CallExpression */ // func( a, |
+                                || containingNodeKind === 158 /* Constructor */ // constructor( a, |   /* public, protected, private keywords are allowed here, so show completion */
+                                || containingNodeKind === 193 /* NewExpression */ // new C(a, |
+                                || containingNodeKind === 188 /* ArrayLiteralExpression */ // [a, |
+                                || containingNodeKind === 205 /* BinaryExpression */ // const x = (a, |
+                                || containingNodeKind === 166 /* FunctionType */; // var x: (s: string, list|
                         case 20 /* OpenParenToken */:
-                            return containingNodeKind === 191 /* CallExpression */ // func( |
-                                || containingNodeKind === 157 /* Constructor */ // constructor( |
-                                || containingNodeKind === 192 /* NewExpression */ // new C(a|
-                                || containingNodeKind === 195 /* ParenthesizedExpression */ // const x = (a|
-                                || containingNodeKind === 177 /* ParenthesizedType */; // function F(pred: (a| /* this can become an arrow function, where 'a' is the argument */
+                            return containingNodeKind === 192 /* CallExpression */ // func( |
+                                || containingNodeKind === 158 /* Constructor */ // constructor( |
+                                || containingNodeKind === 193 /* NewExpression */ // new C(a|
+                                || containingNodeKind === 196 /* ParenthesizedExpression */ // const x = (a|
+                                || containingNodeKind === 178 /* ParenthesizedType */; // function F(pred: (a| /* this can become an arrow function, where 'a' is the argument */
                         case 22 /* OpenBracketToken */:
-                            return containingNodeKind === 187 /* ArrayLiteralExpression */ // [ |
-                                || containingNodeKind === 162 /* IndexSignature */ // [ | : string ]
-                                || containingNodeKind === 149 /* ComputedPropertyName */; // [ |    /* this can become an index signature */
-                        case 130 /* ModuleKeyword */: // module |
-                        case 131 /* NamespaceKeyword */: // namespace |
+                            return containingNodeKind === 188 /* ArrayLiteralExpression */ // [ |
+                                || containingNodeKind === 163 /* IndexSignature */ // [ | : string ]
+                                || containingNodeKind === 150 /* ComputedPropertyName */; // [ |    /* this can become an index signature */
+                        case 131 /* ModuleKeyword */: // module |
+                        case 132 /* NamespaceKeyword */: // namespace |
                             return true;
                         case 24 /* DotToken */:
-                            return containingNodeKind === 244 /* ModuleDeclaration */; // module A.|
+                            return containingNodeKind === 245 /* ModuleDeclaration */; // module A.|
                         case 18 /* OpenBraceToken */:
-                            return containingNodeKind === 240 /* ClassDeclaration */; // class A{ |
-                        case 59 /* EqualsToken */:
-                            return containingNodeKind === 237 /* VariableDeclaration */ // const x = a|
-                                || containingNodeKind === 204 /* BinaryExpression */; // x = a|
+                            return containingNodeKind === 241 /* ClassDeclaration */; // class A{ |
+                        case 60 /* EqualsToken */:
+                            return containingNodeKind === 238 /* VariableDeclaration */ // const x = a|
+                                || containingNodeKind === 205 /* BinaryExpression */; // x = a|
                         case 15 /* TemplateHead */:
-                            return containingNodeKind === 206 /* TemplateExpression */; // `aa ${|
+                            return containingNodeKind === 207 /* TemplateExpression */; // `aa ${|
                         case 16 /* TemplateMiddle */:
-                            return containingNodeKind === 216 /* TemplateSpan */; // `aa ${10} dd ${|
-                        case 115 /* PublicKeyword */:
-                        case 113 /* PrivateKeyword */:
-                        case 114 /* ProtectedKeyword */:
-                            return containingNodeKind === 154 /* PropertyDeclaration */; // class A{ public |
+                            return containingNodeKind === 217 /* TemplateSpan */; // `aa ${10} dd ${|
+                        case 116 /* PublicKeyword */:
+                        case 114 /* PrivateKeyword */:
+                        case 115 /* ProtectedKeyword */:
+                            return containingNodeKind === 155 /* PropertyDeclaration */; // class A{ public |
                     }
                 }
                 return false;
@@ -99760,7 +102828,7 @@ var ts;
                 completionKind = 0 /* ObjectPropertyDeclaration */;
                 var typeMembers;
                 var existingMembers;
-                if (objectLikeContainer.kind === 188 /* ObjectLiteralExpression */) {
+                if (objectLikeContainer.kind === 189 /* ObjectLiteralExpression */) {
                     var typeForObject = typeChecker.getContextualType(objectLikeContainer);
                     if (!typeForObject)
                         return 2 /* Fail */;
@@ -99769,7 +102837,7 @@ var ts;
                     existingMembers = objectLikeContainer.properties;
                 }
                 else {
-                    ts.Debug.assert(objectLikeContainer.kind === 184 /* ObjectBindingPattern */);
+                    ts.Debug.assert(objectLikeContainer.kind === 185 /* ObjectBindingPattern */);
                     // We are *only* completing on properties from the type being destructured.
                     isNewIdentifierLocation = false;
                     var rootDeclaration = ts.getRootDeclaration(objectLikeContainer.parent);
@@ -99780,12 +102848,12 @@ var ts;
                     // through type declaration or inference.
                     // Also proceed if rootDeclaration is a parameter and if its containing function expression/arrow function is contextually typed -
                     // type of parameter will flow in from the contextual type of the function
-                    var canGetType = ts.hasInitializer(rootDeclaration) || ts.hasType(rootDeclaration) || rootDeclaration.parent.parent.kind === 227 /* ForOfStatement */;
-                    if (!canGetType && rootDeclaration.kind === 151 /* Parameter */) {
+                    var canGetType = ts.hasInitializer(rootDeclaration) || ts.hasType(rootDeclaration) || rootDeclaration.parent.parent.kind === 228 /* ForOfStatement */;
+                    if (!canGetType && rootDeclaration.kind === 152 /* Parameter */) {
                         if (ts.isExpression(rootDeclaration.parent)) {
                             canGetType = !!typeChecker.getContextualType(rootDeclaration.parent);
                         }
-                        else if (rootDeclaration.parent.kind === 156 /* MethodDeclaration */ || rootDeclaration.parent.kind === 159 /* SetAccessor */) {
+                        else if (rootDeclaration.parent.kind === 157 /* MethodDeclaration */ || rootDeclaration.parent.kind === 160 /* SetAccessor */) {
                             canGetType = ts.isExpression(rootDeclaration.parent.parent) && !!typeChecker.getContextualType(rootDeclaration.parent.parent);
                         }
                     }
@@ -99827,7 +102895,7 @@ var ts;
                     return 0 /* Continue */;
                 // cursor is in an import clause
                 // try to show exported member for imported module
-                var moduleSpecifier = (namedImportsOrExports.kind === 252 /* NamedImports */ ? namedImportsOrExports.parent.parent : namedImportsOrExports.parent).moduleSpecifier;
+                var moduleSpecifier = (namedImportsOrExports.kind === 253 /* NamedImports */ ? namedImportsOrExports.parent.parent : namedImportsOrExports.parent).moduleSpecifier;
                 var moduleSpecifierSymbol = typeChecker.getSymbolAtLocation(moduleSpecifier); // TODO: GH#18217
                 if (!moduleSpecifierSymbol)
                     return 2 /* Fail */;
@@ -99843,7 +102911,7 @@ var ts;
              * Relevant symbols are stored in the captured 'symbols' variable.
              */
             function tryGetClassLikeCompletionSymbols() {
-                var decl = tryGetObjectTypeDeclarationCompletionContainer(sourceFile, contextToken, location);
+                var decl = tryGetObjectTypeDeclarationCompletionContainer(sourceFile, contextToken, location, position);
                 if (!decl)
                     return 0 /* Continue */;
                 // We're looking up possible property names from parent type.
@@ -99858,7 +102926,7 @@ var ts;
                 var classElement = contextToken.parent;
                 var classElementModifierFlags = ts.isClassElement(classElement) ? ts.getModifierFlags(classElement) : 0 /* None */;
                 // If this is context token is not something we are editing now, consider if this would lead to be modifier
-                if (contextToken.kind === 72 /* Identifier */ && !isCurrentlyEditingNode(contextToken)) {
+                if (contextToken.kind === 73 /* Identifier */ && !isCurrentlyEditingNode(contextToken)) {
                     switch (contextToken.getText()) {
                         case "private":
                             classElementModifierFlags = classElementModifierFlags | 8 /* Private */;
@@ -99895,7 +102963,7 @@ var ts;
                             break;
                         case 40 /* AsteriskToken */:
                             return ts.isMethodDeclaration(parent) ? ts.tryCast(parent.parent, ts.isObjectLiteralExpression) : undefined;
-                        case 72 /* Identifier */:
+                        case 73 /* Identifier */:
                             return contextToken.text === "async" && ts.isShorthandPropertyAssignment(contextToken.parent)
                                 ? contextToken.parent.parent : undefined;
                     }
@@ -99948,12 +103016,12 @@ var ts;
                         case 30 /* GreaterThanToken */: // End of a type argument list
                         case 29 /* LessThanSlashToken */:
                         case 42 /* SlashToken */:
-                        case 72 /* Identifier */:
-                        case 189 /* PropertyAccessExpression */:
-                        case 268 /* JsxAttributes */:
-                        case 267 /* JsxAttribute */:
-                        case 269 /* JsxSpreadAttribute */:
-                            if (parent && (parent.kind === 261 /* JsxSelfClosingElement */ || parent.kind === 262 /* JsxOpeningElement */)) {
+                        case 73 /* Identifier */:
+                        case 190 /* PropertyAccessExpression */:
+                        case 269 /* JsxAttributes */:
+                        case 268 /* JsxAttribute */:
+                        case 270 /* JsxSpreadAttribute */:
+                            if (parent && (parent.kind === 262 /* JsxSelfClosingElement */ || parent.kind === 263 /* JsxOpeningElement */)) {
                                 if (contextToken.kind === 30 /* GreaterThanToken */) {
                                     var precedingToken = ts.findPrecedingToken(contextToken.pos, sourceFile, /*startNode*/ undefined);
                                     if (!parent.typeArguments || (precedingToken && precedingToken.kind === 42 /* SlashToken */))
@@ -99961,7 +103029,7 @@ var ts;
                                 }
                                 return parent;
                             }
-                            else if (parent.kind === 267 /* JsxAttribute */) {
+                            else if (parent.kind === 268 /* JsxAttribute */) {
                                 // Currently we parse JsxOpeningLikeElement as:
                                 //      JsxOpeningLikeElement
                                 //          attributes: JsxAttributes
@@ -99973,7 +103041,7 @@ var ts;
                         // its parent is a JsxExpression, whose parent is a JsxAttribute,
                         // whose parent is a JsxOpeningLikeElement
                         case 10 /* StringLiteral */:
-                            if (parent && ((parent.kind === 267 /* JsxAttribute */) || (parent.kind === 269 /* JsxSpreadAttribute */))) {
+                            if (parent && ((parent.kind === 268 /* JsxAttribute */) || (parent.kind === 270 /* JsxSpreadAttribute */))) {
                                 // Currently we parse JsxOpeningLikeElement as:
                                 //      JsxOpeningLikeElement
                                 //          attributes: JsxAttributes
@@ -99983,8 +103051,8 @@ var ts;
                             break;
                         case 19 /* CloseBraceToken */:
                             if (parent &&
-                                parent.kind === 270 /* JsxExpression */ &&
-                                parent.parent && parent.parent.kind === 267 /* JsxAttribute */) {
+                                parent.kind === 271 /* JsxExpression */ &&
+                                parent.parent && parent.parent.kind === 268 /* JsxAttribute */) {
                                 // Currently we parse JsxOpeningLikeElement as:
                                 //      JsxOpeningLikeElement
                                 //          attributes: JsxAttributes
@@ -99992,7 +103060,7 @@ var ts;
                                 //                  each JsxAttribute can have initializer as JsxExpression
                                 return parent.parent.parent.parent;
                             }
-                            if (parent && parent.kind === 269 /* JsxSpreadAttribute */) {
+                            if (parent && parent.kind === 270 /* JsxSpreadAttribute */) {
                                 // Currently we parse JsxOpeningLikeElement as:
                                 //      JsxOpeningLikeElement
                                 //          attributes: JsxAttributes
@@ -100012,62 +103080,62 @@ var ts;
                 var containingNodeKind = parent.kind;
                 switch (contextToken.kind) {
                     case 27 /* CommaToken */:
-                        return containingNodeKind === 237 /* VariableDeclaration */ ||
-                            containingNodeKind === 238 /* VariableDeclarationList */ ||
-                            containingNodeKind === 219 /* VariableStatement */ ||
-                            containingNodeKind === 243 /* EnumDeclaration */ || // enum a { foo, |
+                        return containingNodeKind === 238 /* VariableDeclaration */ ||
+                            containingNodeKind === 239 /* VariableDeclarationList */ ||
+                            containingNodeKind === 220 /* VariableStatement */ ||
+                            containingNodeKind === 244 /* EnumDeclaration */ || // enum a { foo, |
                             isFunctionLikeButNotConstructor(containingNodeKind) ||
-                            containingNodeKind === 241 /* InterfaceDeclaration */ || // interface A<T, |
-                            containingNodeKind === 185 /* ArrayBindingPattern */ || // var [x, y|
-                            containingNodeKind === 242 /* TypeAliasDeclaration */ || // type Map, K, |
+                            containingNodeKind === 242 /* InterfaceDeclaration */ || // interface A<T, |
+                            containingNodeKind === 186 /* ArrayBindingPattern */ || // var [x, y|
+                            containingNodeKind === 243 /* TypeAliasDeclaration */ || // type Map, K, |
                             // class A<T, |
                             // var C = class D<T, |
                             (ts.isClassLike(parent) &&
                                 !!parent.typeParameters &&
                                 parent.typeParameters.end >= contextToken.pos);
                     case 24 /* DotToken */:
-                        return containingNodeKind === 185 /* ArrayBindingPattern */; // var [.|
+                        return containingNodeKind === 186 /* ArrayBindingPattern */; // var [.|
                     case 57 /* ColonToken */:
-                        return containingNodeKind === 186 /* BindingElement */; // var {x :html|
+                        return containingNodeKind === 187 /* BindingElement */; // var {x :html|
                     case 22 /* OpenBracketToken */:
-                        return containingNodeKind === 185 /* ArrayBindingPattern */; // var [x|
+                        return containingNodeKind === 186 /* ArrayBindingPattern */; // var [x|
                     case 20 /* OpenParenToken */:
-                        return containingNodeKind === 274 /* CatchClause */ ||
+                        return containingNodeKind === 275 /* CatchClause */ ||
                             isFunctionLikeButNotConstructor(containingNodeKind);
                     case 18 /* OpenBraceToken */:
-                        return containingNodeKind === 243 /* EnumDeclaration */; // enum a { |
+                        return containingNodeKind === 244 /* EnumDeclaration */; // enum a { |
                     case 28 /* LessThanToken */:
-                        return containingNodeKind === 240 /* ClassDeclaration */ || // class A< |
-                            containingNodeKind === 209 /* ClassExpression */ || // var C = class D< |
-                            containingNodeKind === 241 /* InterfaceDeclaration */ || // interface A< |
-                            containingNodeKind === 242 /* TypeAliasDeclaration */ || // type List< |
+                        return containingNodeKind === 241 /* ClassDeclaration */ || // class A< |
+                            containingNodeKind === 210 /* ClassExpression */ || // var C = class D< |
+                            containingNodeKind === 242 /* InterfaceDeclaration */ || // interface A< |
+                            containingNodeKind === 243 /* TypeAliasDeclaration */ || // type List< |
                             ts.isFunctionLikeKind(containingNodeKind);
-                    case 116 /* StaticKeyword */:
-                        return containingNodeKind === 154 /* PropertyDeclaration */ && !ts.isClassLike(parent.parent);
+                    case 117 /* StaticKeyword */:
+                        return containingNodeKind === 155 /* PropertyDeclaration */ && !ts.isClassLike(parent.parent);
                     case 25 /* DotDotDotToken */:
-                        return containingNodeKind === 151 /* Parameter */ ||
-                            (!!parent.parent && parent.parent.kind === 185 /* ArrayBindingPattern */); // var [...z|
-                    case 115 /* PublicKeyword */:
-                    case 113 /* PrivateKeyword */:
-                    case 114 /* ProtectedKeyword */:
-                        return containingNodeKind === 151 /* Parameter */ && !ts.isConstructorDeclaration(parent.parent);
-                    case 119 /* AsKeyword */:
-                        return containingNodeKind === 253 /* ImportSpecifier */ ||
-                            containingNodeKind === 257 /* ExportSpecifier */ ||
-                            containingNodeKind === 251 /* NamespaceImport */;
-                    case 126 /* GetKeyword */:
-                    case 137 /* SetKeyword */:
+                        return containingNodeKind === 152 /* Parameter */ ||
+                            (!!parent.parent && parent.parent.kind === 186 /* ArrayBindingPattern */); // var [...z|
+                    case 116 /* PublicKeyword */:
+                    case 114 /* PrivateKeyword */:
+                    case 115 /* ProtectedKeyword */:
+                        return containingNodeKind === 152 /* Parameter */ && !ts.isConstructorDeclaration(parent.parent);
+                    case 120 /* AsKeyword */:
+                        return containingNodeKind === 254 /* ImportSpecifier */ ||
+                            containingNodeKind === 258 /* ExportSpecifier */ ||
+                            containingNodeKind === 252 /* NamespaceImport */;
+                    case 127 /* GetKeyword */:
+                    case 138 /* SetKeyword */:
                         return !isFromObjectTypeDeclaration(contextToken);
-                    case 76 /* ClassKeyword */:
-                    case 84 /* EnumKeyword */:
-                    case 110 /* InterfaceKeyword */:
-                    case 90 /* FunctionKeyword */:
-                    case 105 /* VarKeyword */:
-                    case 92 /* ImportKeyword */:
-                    case 111 /* LetKeyword */:
-                    case 77 /* ConstKeyword */:
-                    case 117 /* YieldKeyword */:
-                    case 140 /* TypeKeyword */: // type htm|
+                    case 77 /* ClassKeyword */:
+                    case 85 /* EnumKeyword */:
+                    case 111 /* InterfaceKeyword */:
+                    case 91 /* FunctionKeyword */:
+                    case 106 /* VarKeyword */:
+                    case 93 /* ImportKeyword */:
+                    case 112 /* LetKeyword */:
+                    case 78 /* ConstKeyword */:
+                    case 118 /* YieldKeyword */:
+                    case 141 /* TypeKeyword */: // type htm|
                         return true;
                     case 40 /* AsteriskToken */:
                         return ts.isFunctionLike(contextToken.parent) && !ts.isMethodDeclaration(contextToken.parent);
@@ -100090,22 +103158,22 @@ var ts;
                 }
                 // Previous token may have been a keyword that was converted to an identifier.
                 switch (keywordForNode(contextToken)) {
-                    case 118 /* AbstractKeyword */:
-                    case 76 /* ClassKeyword */:
-                    case 77 /* ConstKeyword */:
-                    case 125 /* DeclareKeyword */:
-                    case 84 /* EnumKeyword */:
-                    case 90 /* FunctionKeyword */:
-                    case 110 /* InterfaceKeyword */:
-                    case 111 /* LetKeyword */:
-                    case 113 /* PrivateKeyword */:
-                    case 114 /* ProtectedKeyword */:
-                    case 115 /* PublicKeyword */:
-                    case 116 /* StaticKeyword */:
-                    case 105 /* VarKeyword */:
-                    case 117 /* YieldKeyword */:
+                    case 119 /* AbstractKeyword */:
+                    case 77 /* ClassKeyword */:
+                    case 78 /* ConstKeyword */:
+                    case 126 /* DeclareKeyword */:
+                    case 85 /* EnumKeyword */:
+                    case 91 /* FunctionKeyword */:
+                    case 111 /* InterfaceKeyword */:
+                    case 112 /* LetKeyword */:
+                    case 114 /* PrivateKeyword */:
+                    case 115 /* ProtectedKeyword */:
+                    case 116 /* PublicKeyword */:
+                    case 117 /* StaticKeyword */:
+                    case 106 /* VarKeyword */:
+                    case 118 /* YieldKeyword */:
                         return true;
-                    case 121 /* AsyncKeyword */:
+                    case 122 /* AsyncKeyword */:
                         return ts.isPropertyDeclaration(contextToken.parent);
                 }
                 return ts.isDeclarationName(contextToken)
@@ -100115,7 +103183,7 @@ var ts;
                     && !(ts.isClassLike(contextToken.parent) && (contextToken !== previousToken || position > previousToken.end));
             }
             function isFunctionLikeButNotConstructor(kind) {
-                return ts.isFunctionLikeKind(kind) && kind !== 157 /* Constructor */;
+                return ts.isFunctionLikeKind(kind) && kind !== 158 /* Constructor */;
             }
             function isDotOfNumericLiteral(contextToken) {
                 if (contextToken.kind === 8 /* NumericLiteral */) {
@@ -100138,12 +103206,12 @@ var ts;
                 for (var _i = 0, existingMembers_1 = existingMembers; _i < existingMembers_1.length; _i++) {
                     var m = existingMembers_1[_i];
                     // Ignore omitted expressions for missing members
-                    if (m.kind !== 275 /* PropertyAssignment */ &&
-                        m.kind !== 276 /* ShorthandPropertyAssignment */ &&
-                        m.kind !== 186 /* BindingElement */ &&
-                        m.kind !== 156 /* MethodDeclaration */ &&
-                        m.kind !== 158 /* GetAccessor */ &&
-                        m.kind !== 159 /* SetAccessor */) {
+                    if (m.kind !== 276 /* PropertyAssignment */ &&
+                        m.kind !== 277 /* ShorthandPropertyAssignment */ &&
+                        m.kind !== 187 /* BindingElement */ &&
+                        m.kind !== 157 /* MethodDeclaration */ &&
+                        m.kind !== 159 /* GetAccessor */ &&
+                        m.kind !== 160 /* SetAccessor */) {
                         continue;
                     }
                     // If this is the current item we are editing right now, do not filter it out
@@ -100153,7 +103221,7 @@ var ts;
                     var existingName = void 0;
                     if (ts.isBindingElement(m) && m.propertyName) {
                         // include only identifiers in completion list
-                        if (m.propertyName.kind === 72 /* Identifier */) {
+                        if (m.propertyName.kind === 73 /* Identifier */) {
                             existingName = m.propertyName.escapedText;
                         }
                     }
@@ -100178,10 +103246,10 @@ var ts;
                 for (var _i = 0, existingMembers_2 = existingMembers; _i < existingMembers_2.length; _i++) {
                     var m = existingMembers_2[_i];
                     // Ignore omitted expressions for missing members
-                    if (m.kind !== 154 /* PropertyDeclaration */ &&
-                        m.kind !== 156 /* MethodDeclaration */ &&
-                        m.kind !== 158 /* GetAccessor */ &&
-                        m.kind !== 159 /* SetAccessor */) {
+                    if (m.kind !== 155 /* PropertyDeclaration */ &&
+                        m.kind !== 157 /* MethodDeclaration */ &&
+                        m.kind !== 159 /* GetAccessor */ &&
+                        m.kind !== 160 /* SetAccessor */) {
                         continue;
                     }
                     // If this is the current item we are editing right now, do not filter it out
@@ -100221,7 +103289,7 @@ var ts;
                     if (isCurrentlyEditingNode(attr)) {
                         continue;
                     }
-                    if (attr.kind === 267 /* JsxAttribute */) {
+                    if (attr.kind === 268 /* JsxAttribute */) {
                         seenNames.set(attr.name.escapedText, true);
                     }
                 }
@@ -100265,57 +103333,104 @@ var ts;
         var _keywordCompletions = [];
         var allKeywordsCompletions = ts.memoize(function () {
             var res = [];
-            for (var i = 73 /* FirstKeyword */; i <= 147 /* LastKeyword */; i++) {
+            for (var i = 74 /* FirstKeyword */; i <= 148 /* LastKeyword */; i++) {
                 res.push({
                     name: ts.tokenToString(i),
                     kind: "keyword" /* keyword */,
                     kindModifiers: "" /* none */,
-                    sortText: "0"
+                    sortText: SortText.GlobalsOrKeywords
                 });
             }
             return res;
         });
-        function getKeywordCompletions(keywordFilter) {
+        function getKeywordCompletions(keywordFilter, filterOutTsOnlyKeywords) {
+            if (!filterOutTsOnlyKeywords)
+                return getTypescriptKeywordCompletions(keywordFilter);
+            var index = keywordFilter + 7 /* Last */ + 1;
+            return _keywordCompletions[index] ||
+                (_keywordCompletions[index] = getTypescriptKeywordCompletions(keywordFilter)
+                    .filter(function (entry) { return !isTypeScriptOnlyKeyword(ts.stringToToken(entry.name)); }));
+        }
+        function getTypescriptKeywordCompletions(keywordFilter) {
             return _keywordCompletions[keywordFilter] || (_keywordCompletions[keywordFilter] = allKeywordsCompletions().filter(function (entry) {
                 var kind = ts.stringToToken(entry.name);
                 switch (keywordFilter) {
                     case 0 /* None */:
                         return false;
                     case 1 /* All */:
-                        return kind === 121 /* AsyncKeyword */ || 122 /* AwaitKeyword */ || !ts.isContextualKeyword(kind) && !isClassMemberCompletionKeyword(kind) || kind === 125 /* DeclareKeyword */ || kind === 130 /* ModuleKeyword */
-                            || ts.isTypeKeyword(kind) && kind !== 141 /* UndefinedKeyword */;
+                        return isFunctionLikeBodyKeyword(kind)
+                            || kind === 126 /* DeclareKeyword */
+                            || kind === 131 /* ModuleKeyword */
+                            || ts.isTypeKeyword(kind) && kind !== 142 /* UndefinedKeyword */;
+                    case 5 /* FunctionLikeBodyKeywords */:
+                        return isFunctionLikeBodyKeyword(kind);
                     case 2 /* ClassElementKeywords */:
                         return isClassMemberCompletionKeyword(kind);
                     case 3 /* InterfaceElementKeywords */:
                         return isInterfaceOrTypeLiteralCompletionKeyword(kind);
                     case 4 /* ConstructorParameterKeywords */:
                         return ts.isParameterPropertyModifier(kind);
-                    case 5 /* FunctionLikeBodyKeywords */:
-                        return isFunctionLikeBodyKeyword(kind);
-                    case 6 /* TypeKeywords */:
+                    case 6 /* TypeAssertionKeywords */:
+                        return ts.isTypeKeyword(kind) || kind === 78 /* ConstKeyword */;
+                    case 7 /* TypeKeywords */:
                         return ts.isTypeKeyword(kind);
                     default:
                         return ts.Debug.assertNever(keywordFilter);
                 }
             }));
         }
+        function isTypeScriptOnlyKeyword(kind) {
+            switch (kind) {
+                case 119 /* AbstractKeyword */:
+                case 121 /* AnyKeyword */:
+                case 147 /* BigIntKeyword */:
+                case 124 /* BooleanKeyword */:
+                case 126 /* DeclareKeyword */:
+                case 85 /* EnumKeyword */:
+                case 146 /* GlobalKeyword */:
+                case 110 /* ImplementsKeyword */:
+                case 128 /* InferKeyword */:
+                case 111 /* InterfaceKeyword */:
+                case 129 /* IsKeyword */:
+                case 130 /* KeyOfKeyword */:
+                case 131 /* ModuleKeyword */:
+                case 132 /* NamespaceKeyword */:
+                case 133 /* NeverKeyword */:
+                case 136 /* NumberKeyword */:
+                case 137 /* ObjectKeyword */:
+                case 114 /* PrivateKeyword */:
+                case 115 /* ProtectedKeyword */:
+                case 116 /* PublicKeyword */:
+                case 134 /* ReadonlyKeyword */:
+                case 139 /* StringKeyword */:
+                case 140 /* SymbolKeyword */:
+                case 141 /* TypeKeyword */:
+                case 143 /* UniqueKeyword */:
+                case 144 /* UnknownKeyword */:
+                    return true;
+                default:
+                    return false;
+            }
+        }
         function isInterfaceOrTypeLiteralCompletionKeyword(kind) {
-            return kind === 133 /* ReadonlyKeyword */;
+            return kind === 134 /* ReadonlyKeyword */;
         }
         function isClassMemberCompletionKeyword(kind) {
             switch (kind) {
-                case 118 /* AbstractKeyword */:
-                case 124 /* ConstructorKeyword */:
-                case 126 /* GetKeyword */:
-                case 137 /* SetKeyword */:
-                case 121 /* AsyncKeyword */:
+                case 119 /* AbstractKeyword */:
+                case 125 /* ConstructorKeyword */:
+                case 127 /* GetKeyword */:
+                case 138 /* SetKeyword */:
+                case 122 /* AsyncKeyword */:
                     return true;
                 default:
                     return ts.isClassMemberModifier(kind);
             }
         }
         function isFunctionLikeBodyKeyword(kind) {
-            return kind === 121 /* AsyncKeyword */ || kind === 122 /* AwaitKeyword */ || !ts.isContextualKeyword(kind) && !isClassMemberCompletionKeyword(kind);
+            return kind === 122 /* AsyncKeyword */
+                || kind === 123 /* AwaitKeyword */
+                || !ts.isContextualKeyword(kind) && !isClassMemberCompletionKeyword(kind);
         }
         function keywordForNode(node) {
             return ts.isIdentifier(node) ? node.originalKeywordKind || 0 /* Unknown */ : node.kind;
@@ -100349,16 +103464,21 @@ var ts;
          * Returns the immediate owning class declaration of a context token,
          * on the condition that one exists and that the context implies completion should be given.
          */
-        function tryGetObjectTypeDeclarationCompletionContainer(sourceFile, contextToken, location) {
+        function tryGetObjectTypeDeclarationCompletionContainer(sourceFile, contextToken, location, position) {
             // class c { method() { } | method2() { } }
             switch (location.kind) {
-                case 311 /* SyntaxList */:
+                case 313 /* SyntaxList */:
                     return ts.tryCast(location.parent, ts.isObjectTypeDeclaration);
                 case 1 /* EndOfFileToken */:
                     var cls = ts.tryCast(ts.lastOrUndefined(ts.cast(location.parent, ts.isSourceFile).statements), ts.isObjectTypeDeclaration);
                     if (cls && !ts.findChildOfKind(cls, 19 /* CloseBraceToken */, sourceFile)) {
                         return cls;
                     }
+                    break;
+                case 73 /* Identifier */: // class c extends React.Component { a: () => 1\n compon| }
+                    if (isFromObjectTypeDeclaration(location)) {
+                        return ts.findAncestor(location, ts.isObjectTypeDeclaration);
+                    }
             }
             if (!contextToken)
                 return undefined;
@@ -100373,8 +103493,13 @@ var ts;
                 case 27 /* CommaToken */: // class c {getValue(): number, | }
                     return ts.tryCast(contextToken.parent, ts.isObjectTypeDeclaration);
                 default:
-                    if (!isFromObjectTypeDeclaration(contextToken))
+                    if (!isFromObjectTypeDeclaration(contextToken)) {
+                        // class c extends React.Component { a: () => 1\n| }
+                        if (ts.getLineAndCharacterOfPosition(sourceFile, contextToken.getEnd()).line !== ts.getLineAndCharacterOfPosition(sourceFile, position).line && ts.isObjectTypeDeclaration(location)) {
+                            return location;
+                        }
                         return undefined;
+                    }
                     var isValidKeyword = ts.isClassLike(contextToken.parent.parent) ? isClassMemberCompletionKeyword : isInterfaceOrTypeLiteralCompletionKeyword;
                     return (isValidKeyword(contextToken.kind) || contextToken.kind === 40 /* AsteriskToken */ || ts.isIdentifier(contextToken) && isValidKeyword(ts.stringToToken(contextToken.text))) // TODO: GH#18217
                         ? contextToken.parent.parent : undefined;
@@ -100461,40 +103586,40 @@ var ts;
         }
         function getHighlightSpans(node, sourceFile) {
             switch (node.kind) {
-                case 91 /* IfKeyword */:
-                case 83 /* ElseKeyword */:
+                case 92 /* IfKeyword */:
+                case 84 /* ElseKeyword */:
                     return ts.isIfStatement(node.parent) ? getIfElseOccurrences(node.parent, sourceFile) : undefined;
-                case 97 /* ReturnKeyword */:
+                case 98 /* ReturnKeyword */:
                     return useParent(node.parent, ts.isReturnStatement, getReturnOccurrences);
-                case 101 /* ThrowKeyword */:
+                case 102 /* ThrowKeyword */:
                     return useParent(node.parent, ts.isThrowStatement, getThrowOccurrences);
-                case 103 /* TryKeyword */:
-                case 75 /* CatchKeyword */:
-                case 88 /* FinallyKeyword */:
-                    var tryStatement = node.kind === 75 /* CatchKeyword */ ? node.parent.parent : node.parent;
+                case 104 /* TryKeyword */:
+                case 76 /* CatchKeyword */:
+                case 89 /* FinallyKeyword */:
+                    var tryStatement = node.kind === 76 /* CatchKeyword */ ? node.parent.parent : node.parent;
                     return useParent(tryStatement, ts.isTryStatement, getTryCatchFinallyOccurrences);
-                case 99 /* SwitchKeyword */:
+                case 100 /* SwitchKeyword */:
                     return useParent(node.parent, ts.isSwitchStatement, getSwitchCaseDefaultOccurrences);
-                case 74 /* CaseKeyword */:
-                case 80 /* DefaultKeyword */:
+                case 75 /* CaseKeyword */:
+                case 81 /* DefaultKeyword */:
                     return useParent(node.parent.parent.parent, ts.isSwitchStatement, getSwitchCaseDefaultOccurrences);
-                case 73 /* BreakKeyword */:
-                case 78 /* ContinueKeyword */:
+                case 74 /* BreakKeyword */:
+                case 79 /* ContinueKeyword */:
                     return useParent(node.parent, ts.isBreakOrContinueStatement, getBreakOrContinueStatementOccurrences);
-                case 89 /* ForKeyword */:
-                case 107 /* WhileKeyword */:
-                case 82 /* DoKeyword */:
+                case 90 /* ForKeyword */:
+                case 108 /* WhileKeyword */:
+                case 83 /* DoKeyword */:
                     return useParent(node.parent, function (n) { return ts.isIterationStatement(n, /*lookInLabeledStatements*/ true); }, getLoopBreakContinueOccurrences);
-                case 124 /* ConstructorKeyword */:
-                    return getFromAllDeclarations(ts.isConstructorDeclaration, [124 /* ConstructorKeyword */]);
-                case 126 /* GetKeyword */:
-                case 137 /* SetKeyword */:
-                    return getFromAllDeclarations(ts.isAccessor, [126 /* GetKeyword */, 137 /* SetKeyword */]);
-                case 122 /* AwaitKeyword */:
+                case 125 /* ConstructorKeyword */:
+                    return getFromAllDeclarations(ts.isConstructorDeclaration, [125 /* ConstructorKeyword */]);
+                case 127 /* GetKeyword */:
+                case 138 /* SetKeyword */:
+                    return getFromAllDeclarations(ts.isAccessor, [127 /* GetKeyword */, 138 /* SetKeyword */]);
+                case 123 /* AwaitKeyword */:
                     return useParent(node.parent, ts.isAwaitExpression, getAsyncAndAwaitOccurrences);
-                case 121 /* AsyncKeyword */:
+                case 122 /* AsyncKeyword */:
                     return highlightSpans(getAsyncAndAwaitOccurrences(node));
-                case 117 /* YieldKeyword */:
+                case 118 /* YieldKeyword */:
                     return highlightSpans(getYieldOccurrences(node));
                 default:
                     return ts.isModifierKind(node.kind) && (ts.isDeclaration(node.parent) || ts.isVariableStatement(node.parent))
@@ -100537,7 +103662,7 @@ var ts;
             var child = throwStatement;
             while (child.parent) {
                 var parent = child.parent;
-                if (ts.isFunctionBlock(parent) || parent.kind === 284 /* SourceFile */) {
+                if (ts.isFunctionBlock(parent) || parent.kind === 285 /* SourceFile */) {
                     return parent;
                 }
                 // A throw-statement is only owned by a try-statement if the try-statement has
@@ -100569,16 +103694,16 @@ var ts;
         function getBreakOrContinueOwner(statement) {
             return ts.findAncestor(statement, function (node) {
                 switch (node.kind) {
-                    case 232 /* SwitchStatement */:
-                        if (statement.kind === 228 /* ContinueStatement */) {
+                    case 233 /* SwitchStatement */:
+                        if (statement.kind === 229 /* ContinueStatement */) {
                             return false;
                         }
                     // falls through
-                    case 225 /* ForStatement */:
-                    case 226 /* ForInStatement */:
-                    case 227 /* ForOfStatement */:
-                    case 224 /* WhileStatement */:
-                    case 223 /* DoStatement */:
+                    case 226 /* ForStatement */:
+                    case 227 /* ForInStatement */:
+                    case 228 /* ForOfStatement */:
+                    case 225 /* WhileStatement */:
+                    case 224 /* DoStatement */:
                         return !statement.label || isLabeledBy(node, statement.label.escapedText);
                     default:
                         // Don't cross function boundaries.
@@ -100594,11 +103719,11 @@ var ts;
             // Types of node whose children might have modifiers.
             var container = declaration.parent;
             switch (container.kind) {
-                case 245 /* ModuleBlock */:
-                case 284 /* SourceFile */:
-                case 218 /* Block */:
-                case 271 /* CaseClause */:
-                case 272 /* DefaultClause */:
+                case 246 /* ModuleBlock */:
+                case 285 /* SourceFile */:
+                case 219 /* Block */:
+                case 272 /* CaseClause */:
+                case 273 /* DefaultClause */:
                     // Container is either a class declaration or the declaration is a classDeclaration
                     if (modifierFlag & 128 /* Abstract */ && ts.isClassDeclaration(declaration)) {
                         return declaration.members.concat([declaration]);
@@ -100606,12 +103731,12 @@ var ts;
                     else {
                         return container.statements;
                     }
-                case 157 /* Constructor */:
-                case 156 /* MethodDeclaration */:
-                case 239 /* FunctionDeclaration */:
+                case 158 /* Constructor */:
+                case 157 /* MethodDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     return container.parameters.concat((ts.isClassLike(container.parent) ? container.parent.members : []));
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
                     var nodes = container.members;
                     // If we're an accessibility modifier, we're in an instance member and should search
                     // the constructor's parameter list for instance members as well.
@@ -100642,12 +103767,12 @@ var ts;
         }
         function getLoopBreakContinueOccurrences(loopNode) {
             var keywords = [];
-            if (pushKeywordIf(keywords, loopNode.getFirstToken(), 89 /* ForKeyword */, 107 /* WhileKeyword */, 82 /* DoKeyword */)) {
+            if (pushKeywordIf(keywords, loopNode.getFirstToken(), 90 /* ForKeyword */, 108 /* WhileKeyword */, 83 /* DoKeyword */)) {
                 // If we succeeded and got a do-while loop, then start looking for a 'while' keyword.
-                if (loopNode.kind === 223 /* DoStatement */) {
+                if (loopNode.kind === 224 /* DoStatement */) {
                     var loopTokens = loopNode.getChildren();
                     for (var i = loopTokens.length - 1; i >= 0; i--) {
-                        if (pushKeywordIf(keywords, loopTokens[i], 107 /* WhileKeyword */)) {
+                        if (pushKeywordIf(keywords, loopTokens[i], 108 /* WhileKeyword */)) {
                             break;
                         }
                     }
@@ -100655,7 +103780,7 @@ var ts;
             }
             ts.forEach(aggregateAllBreakAndContinueStatements(loopNode.statement), function (statement) {
                 if (ownsBreakOrContinueStatement(loopNode, statement)) {
-                    pushKeywordIf(keywords, statement.getFirstToken(), 73 /* BreakKeyword */, 78 /* ContinueKeyword */);
+                    pushKeywordIf(keywords, statement.getFirstToken(), 74 /* BreakKeyword */, 79 /* ContinueKeyword */);
                 }
             });
             return keywords;
@@ -100664,13 +103789,13 @@ var ts;
             var owner = getBreakOrContinueOwner(breakOrContinueStatement);
             if (owner) {
                 switch (owner.kind) {
-                    case 225 /* ForStatement */:
-                    case 226 /* ForInStatement */:
-                    case 227 /* ForOfStatement */:
-                    case 223 /* DoStatement */:
-                    case 224 /* WhileStatement */:
+                    case 226 /* ForStatement */:
+                    case 227 /* ForInStatement */:
+                    case 228 /* ForOfStatement */:
+                    case 224 /* DoStatement */:
+                    case 225 /* WhileStatement */:
                         return getLoopBreakContinueOccurrences(owner);
-                    case 232 /* SwitchStatement */:
+                    case 233 /* SwitchStatement */:
                         return getSwitchCaseDefaultOccurrences(owner);
                 }
             }
@@ -100678,13 +103803,13 @@ var ts;
         }
         function getSwitchCaseDefaultOccurrences(switchStatement) {
             var keywords = [];
-            pushKeywordIf(keywords, switchStatement.getFirstToken(), 99 /* SwitchKeyword */);
+            pushKeywordIf(keywords, switchStatement.getFirstToken(), 100 /* SwitchKeyword */);
             // Go through each clause in the switch statement, collecting the 'case'/'default' keywords.
             ts.forEach(switchStatement.caseBlock.clauses, function (clause) {
-                pushKeywordIf(keywords, clause.getFirstToken(), 74 /* CaseKeyword */, 80 /* DefaultKeyword */);
+                pushKeywordIf(keywords, clause.getFirstToken(), 75 /* CaseKeyword */, 81 /* DefaultKeyword */);
                 ts.forEach(aggregateAllBreakAndContinueStatements(clause), function (statement) {
                     if (ownsBreakOrContinueStatement(switchStatement, statement)) {
-                        pushKeywordIf(keywords, statement.getFirstToken(), 73 /* BreakKeyword */);
+                        pushKeywordIf(keywords, statement.getFirstToken(), 74 /* BreakKeyword */);
                     }
                 });
             });
@@ -100692,13 +103817,13 @@ var ts;
         }
         function getTryCatchFinallyOccurrences(tryStatement, sourceFile) {
             var keywords = [];
-            pushKeywordIf(keywords, tryStatement.getFirstToken(), 103 /* TryKeyword */);
+            pushKeywordIf(keywords, tryStatement.getFirstToken(), 104 /* TryKeyword */);
             if (tryStatement.catchClause) {
-                pushKeywordIf(keywords, tryStatement.catchClause.getFirstToken(), 75 /* CatchKeyword */);
+                pushKeywordIf(keywords, tryStatement.catchClause.getFirstToken(), 76 /* CatchKeyword */);
             }
             if (tryStatement.finallyBlock) {
-                var finallyKeyword = ts.findChildOfKind(tryStatement, 88 /* FinallyKeyword */, sourceFile);
-                pushKeywordIf(keywords, finallyKeyword, 88 /* FinallyKeyword */);
+                var finallyKeyword = ts.findChildOfKind(tryStatement, 89 /* FinallyKeyword */, sourceFile);
+                pushKeywordIf(keywords, finallyKeyword, 89 /* FinallyKeyword */);
             }
             return keywords;
         }
@@ -100709,13 +103834,13 @@ var ts;
             }
             var keywords = [];
             ts.forEach(aggregateOwnedThrowStatements(owner), function (throwStatement) {
-                keywords.push(ts.findChildOfKind(throwStatement, 101 /* ThrowKeyword */, sourceFile));
+                keywords.push(ts.findChildOfKind(throwStatement, 102 /* ThrowKeyword */, sourceFile));
             });
             // If the "owner" is a function, then we equate 'return' and 'throw' statements in their
             // ability to "jump out" of the function, and include occurrences for both.
             if (ts.isFunctionBlock(owner)) {
                 ts.forEachReturnStatement(owner, function (returnStatement) {
-                    keywords.push(ts.findChildOfKind(returnStatement, 97 /* ReturnKeyword */, sourceFile));
+                    keywords.push(ts.findChildOfKind(returnStatement, 98 /* ReturnKeyword */, sourceFile));
                 });
             }
             return keywords;
@@ -100727,11 +103852,11 @@ var ts;
             }
             var keywords = [];
             ts.forEachReturnStatement(ts.cast(func.body, ts.isBlock), function (returnStatement) {
-                keywords.push(ts.findChildOfKind(returnStatement, 97 /* ReturnKeyword */, sourceFile));
+                keywords.push(ts.findChildOfKind(returnStatement, 98 /* ReturnKeyword */, sourceFile));
             });
             // Include 'throw' statements that do not occur within a try block.
             ts.forEach(aggregateOwnedThrowStatements(func.body), function (throwStatement) {
-                keywords.push(ts.findChildOfKind(throwStatement, 101 /* ThrowKeyword */, sourceFile));
+                keywords.push(ts.findChildOfKind(throwStatement, 102 /* ThrowKeyword */, sourceFile));
             });
             return keywords;
         }
@@ -100743,13 +103868,13 @@ var ts;
             var keywords = [];
             if (func.modifiers) {
                 func.modifiers.forEach(function (modifier) {
-                    pushKeywordIf(keywords, modifier, 121 /* AsyncKeyword */);
+                    pushKeywordIf(keywords, modifier, 122 /* AsyncKeyword */);
                 });
             }
             ts.forEachChild(func, function (child) {
                 traverseWithoutCrossingFunction(child, function (node) {
                     if (ts.isAwaitExpression(node)) {
-                        pushKeywordIf(keywords, node.getFirstToken(), 122 /* AwaitKeyword */);
+                        pushKeywordIf(keywords, node.getFirstToken(), 123 /* AwaitKeyword */);
                     }
                 });
             });
@@ -100764,7 +103889,7 @@ var ts;
             ts.forEachChild(func, function (child) {
                 traverseWithoutCrossingFunction(child, function (node) {
                     if (ts.isYieldExpression(node)) {
-                        pushKeywordIf(keywords, node.getFirstToken(), 117 /* YieldKeyword */);
+                        pushKeywordIf(keywords, node.getFirstToken(), 118 /* YieldKeyword */);
                     }
                 });
             });
@@ -100783,7 +103908,7 @@ var ts;
             // We'd like to highlight else/ifs together if they are only separated by whitespace
             // (i.e. the keywords are separated by no comments, no newlines).
             for (var i = 0; i < keywords.length; i++) {
-                if (keywords[i].kind === 83 /* ElseKeyword */ && i < keywords.length - 1) {
+                if (keywords[i].kind === 84 /* ElseKeyword */ && i < keywords.length - 1) {
                     var elseKeyword = keywords[i];
                     var ifKeyword = keywords[i + 1]; // this *should* always be an 'if' keyword.
                     var shouldCombineElseAndIf = true;
@@ -100818,10 +103943,10 @@ var ts;
             // Now traverse back down through the else branches, aggregating if/else keywords of if-statements.
             while (true) {
                 var children = ifStatement.getChildren(sourceFile);
-                pushKeywordIf(keywords, children[0], 91 /* IfKeyword */);
+                pushKeywordIf(keywords, children[0], 92 /* IfKeyword */);
                 // Generally the 'else' keyword is second-to-last, so we traverse backwards.
                 for (var i = children.length - 1; i >= 0; i--) {
-                    if (pushKeywordIf(keywords, children[i], 83 /* ElseKeyword */)) {
+                    if (pushKeywordIf(keywords, children[i], 84 /* ElseKeyword */)) {
                         break;
                     }
                 }
@@ -101037,12 +104162,12 @@ var ts;
                         if (cancellationToken)
                             cancellationToken.throwIfCancellationRequested();
                         switch (direct.kind) {
-                            case 191 /* CallExpression */:
+                            case 192 /* CallExpression */:
                                 if (!isAvailableThroughGlobal) {
                                     var parent = direct.parent;
-                                    if (exportKind === 2 /* ExportEquals */ && parent.kind === 237 /* VariableDeclaration */) {
+                                    if (exportKind === 2 /* ExportEquals */ && parent.kind === 238 /* VariableDeclaration */) {
                                         var name = parent.name;
-                                        if (name.kind === 72 /* Identifier */) {
+                                        if (name.kind === 73 /* Identifier */) {
                                             directImports.push(name);
                                             break;
                                         }
@@ -101051,22 +104176,22 @@ var ts;
                                     addIndirectUser(direct.getSourceFile());
                                 }
                                 break;
-                            case 72 /* Identifier */: // for 'const x = require("y");
+                            case 73 /* Identifier */: // for 'const x = require("y");
                                 break; // TODO: GH#23879
-                            case 248 /* ImportEqualsDeclaration */:
+                            case 249 /* ImportEqualsDeclaration */:
                                 handleNamespaceImport(direct, direct.name, ts.hasModifier(direct, 1 /* Export */), /*alreadyAddedDirect*/ false);
                                 break;
-                            case 249 /* ImportDeclaration */:
+                            case 250 /* ImportDeclaration */:
                                 directImports.push(direct);
                                 var namedBindings = direct.importClause && direct.importClause.namedBindings;
-                                if (namedBindings && namedBindings.kind === 251 /* NamespaceImport */) {
+                                if (namedBindings && namedBindings.kind === 252 /* NamespaceImport */) {
                                     handleNamespaceImport(direct, namedBindings.name, /*isReExport*/ false, /*alreadyAddedDirect*/ true);
                                 }
                                 else if (!isAvailableThroughGlobal && ts.isDefaultImport(direct)) {
                                     addIndirectUser(getSourceFileLikeForImportDeclaration(direct)); // Add a check for indirect uses to handle synthetic default imports
                                 }
                                 break;
-                            case 255 /* ExportDeclaration */:
+                            case 256 /* ExportDeclaration */:
                                 if (!direct.exportClause) {
                                     // This is `export * from "foo"`, so imports of this module may import the export too.
                                     handleDirectImports(getContainingModuleSymbol(direct, checker));
@@ -101076,11 +104201,11 @@ var ts;
                                     directImports.push(direct);
                                 }
                                 break;
-                            case 183 /* ImportType */:
+                            case 184 /* ImportType */:
                                 directImports.push(direct);
                                 break;
                             default:
-                                ts.Debug.assertNever(direct, "Unexpected import kind: " + ts.Debug.showSyntaxKind(direct));
+                                ts.Debug.failBadSyntaxKind(direct, "Unexpected import kind.");
                         }
                     }
                 }
@@ -101093,7 +104218,7 @@ var ts;
                 }
                 else if (!isAvailableThroughGlobal) {
                     var sourceFileLike = getSourceFileLikeForImportDeclaration(importDeclaration);
-                    ts.Debug.assert(sourceFileLike.kind === 284 /* SourceFile */ || sourceFileLike.kind === 244 /* ModuleDeclaration */);
+                    ts.Debug.assert(sourceFileLike.kind === 285 /* SourceFile */ || sourceFileLike.kind === 245 /* ModuleDeclaration */);
                     if (isReExport || findNamespaceReExports(sourceFileLike, name, checker)) {
                         addIndirectUsers(sourceFileLike);
                     }
@@ -101148,17 +104273,17 @@ var ts;
             }
             return { importSearches: importSearches, singleReferences: singleReferences };
             function handleImport(decl) {
-                if (decl.kind === 248 /* ImportEqualsDeclaration */) {
+                if (decl.kind === 249 /* ImportEqualsDeclaration */) {
                     if (isExternalModuleImportEquals(decl)) {
                         handleNamespaceImportLike(decl.name);
                     }
                     return;
                 }
-                if (decl.kind === 72 /* Identifier */) {
+                if (decl.kind === 73 /* Identifier */) {
                     handleNamespaceImportLike(decl);
                     return;
                 }
-                if (decl.kind === 183 /* ImportType */) {
+                if (decl.kind === 184 /* ImportType */) {
                     if (decl.qualifier) {
                         if (ts.isIdentifier(decl.qualifier) && decl.qualifier.escapedText === ts.symbolName(exportSymbol)) {
                             singleReferences.push(decl.qualifier);
@@ -101173,17 +104298,17 @@ var ts;
                 if (decl.moduleSpecifier.kind !== 10 /* StringLiteral */) {
                     return;
                 }
-                if (decl.kind === 255 /* ExportDeclaration */) {
+                if (decl.kind === 256 /* ExportDeclaration */) {
                     searchForNamedImport(decl.exportClause);
                     return;
                 }
                 var _a = decl.importClause || { name: undefined, namedBindings: undefined }, name = _a.name, namedBindings = _a.namedBindings;
                 if (namedBindings) {
                     switch (namedBindings.kind) {
-                        case 251 /* NamespaceImport */:
+                        case 252 /* NamespaceImport */:
                             handleNamespaceImportLike(namedBindings.name);
                             break;
-                        case 252 /* NamedImports */:
+                        case 253 /* NamedImports */:
                             // 'default' might be accessed as a named import `{ default as foo }`.
                             if (exportKind === 0 /* Named */ || exportKind === 1 /* Default */) {
                                 searchForNamedImport(namedBindings);
@@ -101202,7 +104327,7 @@ var ts;
                 }
             }
             /**
-             * `import x = require("./x") or `import * as x from "./x"`.
+             * `import x = require("./x")` or `import * as x from "./x"`.
              * An `export =` may be imported by this syntax, so it may be a direct import.
              * If it's not a direct import, it will be in `indirectUsers`, so we don't have to do anything here.
              */
@@ -101233,7 +104358,7 @@ var ts;
                         }
                     }
                     else {
-                        var localSymbol = element.kind === 257 /* ExportSpecifier */ && element.propertyName
+                        var localSymbol = element.kind === 258 /* ExportSpecifier */ && element.propertyName
                             ? checker.getExportSpecifierLocalTargetSymbol(element) // For re-exporting under a different name, we want to get the re-exported symbol.
                             : checker.getSymbolAtLocation(name);
                         addSearch(name, localSymbol);
@@ -101262,7 +104387,7 @@ var ts;
             for (var _i = 0, sourceFiles_1 = sourceFiles; _i < sourceFiles_1.length; _i++) {
                 var referencingFile = sourceFiles_1[_i];
                 var searchSourceFile = searchModuleSymbol.valueDeclaration;
-                if (searchSourceFile.kind === 284 /* SourceFile */) {
+                if (searchSourceFile.kind === 285 /* SourceFile */) {
                     for (var _a = 0, _b = referencingFile.referencedFiles; _a < _b.length; _a++) {
                         var ref = _b[_a];
                         if (program.getSourceFileFromReference(referencingFile, ref) === searchSourceFile) {
@@ -101310,7 +104435,7 @@ var ts;
         }
         /** Iterates over all statements at the top level or in module declarations. Returns the first truthy result. */
         function forEachPossibleImportOrExportStatement(sourceFileLike, action) {
-            return ts.forEach(sourceFileLike.kind === 284 /* SourceFile */ ? sourceFileLike.statements : sourceFileLike.body.statements, function (statement) {
+            return ts.forEach(sourceFileLike.kind === 285 /* SourceFile */ ? sourceFileLike.statements : sourceFileLike.body.statements, function (statement) {
                 return action(statement) || (isAmbientModuleDeclaration(statement) && ts.forEach(statement.body && statement.body.statements, action));
             });
         }
@@ -101325,15 +104450,15 @@ var ts;
             else {
                 forEachPossibleImportOrExportStatement(sourceFile, function (statement) {
                     switch (statement.kind) {
-                        case 255 /* ExportDeclaration */:
-                        case 249 /* ImportDeclaration */: {
+                        case 256 /* ExportDeclaration */:
+                        case 250 /* ImportDeclaration */: {
                             var decl = statement;
                             if (decl.moduleSpecifier && ts.isStringLiteral(decl.moduleSpecifier)) {
                                 action(decl, decl.moduleSpecifier);
                             }
                             break;
                         }
-                        case 248 /* ImportEqualsDeclaration */: {
+                        case 249 /* ImportEqualsDeclaration */: {
                             var decl = statement;
                             if (isExternalModuleImportEquals(decl)) {
                                 action(decl, decl.moduleReference.expression);
@@ -101357,7 +104482,7 @@ var ts;
                 var parent = node.parent;
                 var grandParent = parent.parent;
                 if (symbol.exportSymbol) {
-                    if (parent.kind === 189 /* PropertyAccessExpression */) {
+                    if (parent.kind === 190 /* PropertyAccessExpression */) {
                         // When accessing an export of a JS module, there's no alias. The symbol will still be flagged as an export even though we're at the use.
                         // So check that we are at the declaration.
                         return symbol.declarations.some(function (d) { return d === parent; }) && ts.isBinaryExpression(grandParent)
@@ -101423,7 +104548,7 @@ var ts;
                     var sym = useLhsSymbol ? checker.getSymbolAtLocation(ts.cast(node.left, ts.isPropertyAccessExpression).name) : symbol;
                     // Better detection for GH#20803
                     if (sym && !(checker.getMergedSymbol(sym.parent).flags & 1536 /* Module */)) {
-                        ts.Debug.fail("Special property assignment kind does not have a module as its parent. Assignment is " + ts.Debug.showSymbol(sym) + ", parent is " + ts.Debug.showSymbol(sym.parent));
+                        ts.Debug.fail("Special property assignment kind does not have a module as its parent. Assignment is " + ts.Debug.formatSymbol(sym) + ", parent is " + ts.Debug.formatSymbol(sym.parent));
                     }
                     return sym && exportInfo(sym, kind);
                 }
@@ -101479,10 +104604,10 @@ var ts;
         // If a reference is a class expression, the exported node would be its parent.
         // If a reference is a variable declaration, the exported node would be the variable statement.
         function getExportNode(parent, node) {
-            if (parent.kind === 237 /* VariableDeclaration */) {
+            if (parent.kind === 238 /* VariableDeclaration */) {
                 var p = parent;
                 return p.name !== node ? undefined :
-                    p.parent.kind === 274 /* CatchClause */ ? undefined : p.parent.parent.kind === 219 /* VariableStatement */ ? p.parent.parent : undefined;
+                    p.parent.kind === 275 /* CatchClause */ ? undefined : p.parent.parent.kind === 220 /* VariableStatement */ ? p.parent.parent : undefined;
             }
             else {
                 return parent;
@@ -101491,13 +104616,13 @@ var ts;
         function isNodeImport(node) {
             var parent = node.parent;
             switch (parent.kind) {
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return parent.name === node && isExternalModuleImportEquals(parent);
-                case 253 /* ImportSpecifier */:
+                case 254 /* ImportSpecifier */:
                     // For a rename import `{ foo as bar }`, don't search for the imported symbol. Just find local uses of `bar`.
                     return !parent.propertyName;
-                case 250 /* ImportClause */:
-                case 251 /* NamespaceImport */:
+                case 251 /* ImportClause */:
+                case 252 /* NamespaceImport */:
                     ts.Debug.assert(parent.name === node);
                     return true;
                 default:
@@ -101530,21 +104655,21 @@ var ts;
             return checker.getMergedSymbol(getSourceFileLikeForImportDeclaration(importer).symbol);
         }
         function getSourceFileLikeForImportDeclaration(node) {
-            if (node.kind === 191 /* CallExpression */) {
+            if (node.kind === 192 /* CallExpression */) {
                 return node.getSourceFile();
             }
             var parent = node.parent;
-            if (parent.kind === 284 /* SourceFile */) {
+            if (parent.kind === 285 /* SourceFile */) {
                 return parent;
             }
-            ts.Debug.assert(parent.kind === 245 /* ModuleBlock */);
+            ts.Debug.assert(parent.kind === 246 /* ModuleBlock */);
             return ts.cast(parent.parent, isAmbientModuleDeclaration);
         }
         function isAmbientModuleDeclaration(node) {
-            return node.kind === 244 /* ModuleDeclaration */ && node.name.kind === 10 /* StringLiteral */;
+            return node.kind === 245 /* ModuleDeclaration */ && node.name.kind === 10 /* StringLiteral */;
         }
         function isExternalModuleImportEquals(eq) {
-            return eq.moduleReference.kind === 259 /* ExternalModuleReference */ && eq.moduleReference.expression.kind === 10 /* StringLiteral */;
+            return eq.moduleReference.kind === 260 /* ExternalModuleReference */ && eq.moduleReference.expression.kind === 10 /* StringLiteral */;
         }
     })(FindAllReferences = ts.FindAllReferences || (ts.FindAllReferences = {}));
 })(ts || (ts = {}));
@@ -101571,9 +104696,131 @@ var ts;
         })(EntryKind = FindAllReferences.EntryKind || (FindAllReferences.EntryKind = {}));
         function nodeEntry(node, kind) {
             if (kind === void 0) { kind = 1 /* Node */; }
-            return { kind: kind, node: node.name || node };
+            return {
+                kind: kind,
+                node: node.name || node,
+                context: getContextNodeForNodeEntry(node)
+            };
         }
         FindAllReferences.nodeEntry = nodeEntry;
+        function isContextWithStartAndEndNode(node) {
+            return node && node.kind === undefined;
+        }
+        FindAllReferences.isContextWithStartAndEndNode = isContextWithStartAndEndNode;
+        function getContextNodeForNodeEntry(node) {
+            if (ts.isDeclaration(node)) {
+                return getContextNode(node);
+            }
+            if (!node.parent)
+                return undefined;
+            if (!ts.isDeclaration(node.parent) && !ts.isExportAssignment(node.parent)) {
+                // Special property assignment in javascript
+                if (ts.isInJSFile(node)) {
+                    var binaryExpression = ts.isBinaryExpression(node.parent) ?
+                        node.parent :
+                        ts.isPropertyAccessExpression(node.parent) &&
+                            ts.isBinaryExpression(node.parent.parent) &&
+                            node.parent.parent.left === node.parent ?
+                            node.parent.parent :
+                            undefined;
+                    if (binaryExpression && ts.getAssignmentDeclarationKind(binaryExpression) !== 0 /* None */) {
+                        return getContextNode(binaryExpression);
+                    }
+                }
+                // Jsx Tags
+                if (ts.isJsxOpeningElement(node.parent) || ts.isJsxClosingElement(node.parent)) {
+                    return node.parent.parent;
+                }
+                else if (ts.isJsxSelfClosingElement(node.parent) ||
+                    ts.isLabeledStatement(node.parent) ||
+                    ts.isBreakOrContinueStatement(node.parent)) {
+                    return node.parent;
+                }
+                else if (ts.isStringLiteralLike(node)) {
+                    var validImport = ts.tryGetImportFromModuleSpecifier(node);
+                    if (validImport) {
+                        var declOrStatement = ts.findAncestor(validImport, function (node) {
+                            return ts.isDeclaration(node) ||
+                                ts.isStatement(node) ||
+                                ts.isJSDocTag(node);
+                        });
+                        return ts.isDeclaration(declOrStatement) ?
+                            getContextNode(declOrStatement) :
+                            declOrStatement;
+                    }
+                }
+                // Handle computed property name
+                var propertyName = ts.findAncestor(node, ts.isComputedPropertyName);
+                return propertyName ?
+                    getContextNode(propertyName.parent) :
+                    undefined;
+            }
+            if (node.parent.name === node || // node is name of declaration, use parent
+                ts.isConstructorDeclaration(node.parent) ||
+                ts.isExportAssignment(node.parent) ||
+                // Property name of the import export specifier or binding pattern, use parent
+                ((ts.isImportOrExportSpecifier(node.parent) || ts.isBindingElement(node.parent))
+                    && node.parent.propertyName === node) ||
+                // Is default export
+                (node.kind === 81 /* DefaultKeyword */ && ts.hasModifier(node.parent, 513 /* ExportDefault */))) {
+                return getContextNode(node.parent);
+            }
+            return undefined;
+        }
+        function getContextNode(node) {
+            if (!node)
+                return undefined;
+            switch (node.kind) {
+                case 238 /* VariableDeclaration */:
+                    return !ts.isVariableDeclarationList(node.parent) || node.parent.declarations.length !== 1 ?
+                        node :
+                        ts.isVariableStatement(node.parent.parent) ?
+                            node.parent.parent :
+                            ts.isForInOrOfStatement(node.parent.parent) ?
+                                getContextNode(node.parent.parent) :
+                                node.parent;
+                case 187 /* BindingElement */:
+                    return getContextNode(node.parent.parent);
+                case 254 /* ImportSpecifier */:
+                    return node.parent.parent.parent;
+                case 258 /* ExportSpecifier */:
+                case 252 /* NamespaceImport */:
+                    return node.parent.parent;
+                case 251 /* ImportClause */:
+                    return node.parent;
+                case 205 /* BinaryExpression */:
+                    return ts.isExpressionStatement(node.parent) ?
+                        node.parent :
+                        node;
+                case 228 /* ForOfStatement */:
+                case 227 /* ForInStatement */:
+                    return {
+                        start: node.initializer,
+                        end: node.expression
+                    };
+                case 276 /* PropertyAssignment */:
+                case 277 /* ShorthandPropertyAssignment */:
+                    return ts.isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent) ?
+                        getContextNode(ts.findAncestor(node.parent, function (node) {
+                            return ts.isBinaryExpression(node) || ts.isForInOrOfStatement(node);
+                        })) :
+                        node;
+                default:
+                    return node;
+            }
+        }
+        FindAllReferences.getContextNode = getContextNode;
+        function toContextSpan(textSpan, sourceFile, context) {
+            if (!context)
+                return undefined;
+            var contextSpan = isContextWithStartAndEndNode(context) ?
+                getTextSpan(context.start, sourceFile, context.end) :
+                getTextSpan(context, sourceFile);
+            return contextSpan.start !== textSpan.start || contextSpan.length !== textSpan.length ?
+                { contextSpan: contextSpan } :
+                undefined;
+        }
+        FindAllReferences.toContextSpan = toContextSpan;
         function findReferencedSymbols(program, cancellationToken, sourceFiles, sourceFile, position) {
             var node = ts.getTouchingPropertyName(sourceFile, position);
             var referencedSymbols = FindAllReferences.Core.getReferencedSymbolsForNode(position, node, program, sourceFiles, cancellationToken);
@@ -101596,18 +104843,18 @@ var ts;
         }
         FindAllReferences.getImplementationsAtPosition = getImplementationsAtPosition;
         function getImplementationReferenceEntries(program, cancellationToken, sourceFiles, node, position) {
-            if (node.kind === 284 /* SourceFile */) {
+            if (node.kind === 285 /* SourceFile */) {
                 return undefined;
             }
             var checker = program.getTypeChecker();
             // If invoked directly on a shorthand property assignment, then return
             // the declaration of the symbol being assigned (not the symbol being assigned to).
-            if (node.parent.kind === 276 /* ShorthandPropertyAssignment */) {
+            if (node.parent.kind === 277 /* ShorthandPropertyAssignment */) {
                 var result_1 = [];
                 FindAllReferences.Core.getReferenceEntriesForShorthandPropertyAssignment(node, checker, function (node) { return result_1.push(nodeEntry(node)); });
                 return result_1;
             }
-            else if (node.kind === 98 /* SuperKeyword */ || ts.isSuperProperty(node.parent)) {
+            else if (node.kind === 99 /* SuperKeyword */ || ts.isSuperProperty(node.parent)) {
                 // References to and accesses on the super keyword only have one possible implementation, so no
                 // need to "Find all References"
                 var symbol = checker.getSymbolAtLocation(node);
@@ -101638,7 +104885,16 @@ var ts;
                         var symbol = def.symbol;
                         var _a = getDefinitionKindAndDisplayParts(symbol, checker, originalNode), displayParts_1 = _a.displayParts, kind_1 = _a.kind;
                         var name_1 = displayParts_1.map(function (p) { return p.text; }).join("");
-                        return { node: symbol.declarations ? ts.getNameOfDeclaration(ts.first(symbol.declarations)) || ts.first(symbol.declarations) : originalNode, name: name_1, kind: kind_1, displayParts: displayParts_1 };
+                        var declaration = symbol.declarations ? ts.first(symbol.declarations) : undefined;
+                        return {
+                            node: declaration ?
+                                ts.getNameOfDeclaration(declaration) || declaration :
+                                originalNode,
+                            name: name_1,
+                            kind: kind_1,
+                            displayParts: displayParts_1,
+                            context: getContextNode(declaration)
+                        };
                     }
                     case 1 /* Label */: {
                         var node_1 = def.node;
@@ -101663,9 +104919,13 @@ var ts;
                         return ts.Debug.assertNever(def);
                 }
             })();
-            var node = info.node, name = info.name, kind = info.kind, displayParts = info.displayParts;
+            var node = info.node, name = info.name, kind = info.kind, displayParts = info.displayParts, context = info.context;
             var sourceFile = node.getSourceFile();
-            return { containerKind: "" /* unknown */, containerName: "", fileName: sourceFile.fileName, kind: kind, name: name, textSpan: getTextSpan(ts.isComputedPropertyName(node) ? node.expression : node, sourceFile), displayParts: displayParts };
+            var textSpan = getTextSpan(ts.isComputedPropertyName(node) ? node.expression : node, sourceFile);
+            return __assign({ containerKind: "" /* unknown */, containerName: "", fileName: sourceFile.fileName, kind: kind,
+                name: name,
+                textSpan: textSpan,
+                displayParts: displayParts }, toContextSpan(textSpan, sourceFile, context));
         }
         function getDefinitionKindAndDisplayParts(symbol, checker, node) {
             var meaning = FindAllReferences.Core.getIntersectingMeaningFromDeclarations(node, symbol);
@@ -101678,20 +104938,14 @@ var ts;
         }
         FindAllReferences.toRenameLocation = toRenameLocation;
         function toReferenceEntry(entry) {
-            var _a = entryToDocumentSpan(entry), textSpan = _a.textSpan, fileName = _a.fileName;
+            var documentSpan = entryToDocumentSpan(entry);
             if (entry.kind === 0 /* Span */) {
-                return { textSpan: textSpan, fileName: fileName, isWriteAccess: false, isDefinition: false };
+                return __assign({}, documentSpan, { isWriteAccess: false, isDefinition: false });
             }
             var kind = entry.kind, node = entry.node;
-            return {
-                textSpan: textSpan,
-                fileName: fileName,
-                isWriteAccess: isWriteAccessForReference(node),
-                isDefinition: node.kind === 80 /* DefaultKeyword */
+            return __assign({}, documentSpan, { isWriteAccess: isWriteAccessForReference(node), isDefinition: node.kind === 81 /* DefaultKeyword */
                     || !!ts.getDeclarationFromName(node)
-                    || ts.isLiteralComputedPropertyDeclarationName(node),
-                isInString: kind === 2 /* StringLiteral */ ? true : undefined,
-            };
+                    || ts.isLiteralComputedPropertyDeclarationName(node), isInString: kind === 2 /* StringLiteral */ ? true : undefined });
         }
         FindAllReferences.toReferenceEntry = toReferenceEntry;
         function entryToDocumentSpan(entry) {
@@ -101700,7 +104954,8 @@ var ts;
             }
             else {
                 var sourceFile = entry.node.getSourceFile();
-                return { textSpan: getTextSpan(entry.node, sourceFile), fileName: sourceFile.fileName };
+                var textSpan = getTextSpan(entry.node, sourceFile);
+                return __assign({ textSpan: textSpan, fileName: sourceFile.fileName }, toContextSpan(textSpan, sourceFile, entry.context));
             }
         }
         function getPrefixAndSuffixText(entry, originalNode, checker) {
@@ -101729,14 +104984,13 @@ var ts;
             return ts.emptyOptions;
         }
         function toImplementationLocation(entry, checker) {
+            var documentSpan = entryToDocumentSpan(entry);
             if (entry.kind !== 0 /* Span */) {
                 var node = entry.node;
-                var sourceFile = node.getSourceFile();
-                return __assign({ textSpan: getTextSpan(node, sourceFile), fileName: sourceFile.fileName }, implementationKindDisplayParts(node, checker));
+                return __assign({}, documentSpan, implementationKindDisplayParts(node, checker));
             }
             else {
-                var textSpan = entry.textSpan, fileName = entry.fileName;
-                return { textSpan: textSpan, fileName: fileName, kind: "" /* unknown */, displayParts: [] };
+                return __assign({}, documentSpan, { kind: "" /* unknown */, displayParts: [] });
             }
         }
         function implementationKindDisplayParts(node, checker) {
@@ -101744,13 +104998,13 @@ var ts;
             if (symbol) {
                 return getDefinitionKindAndDisplayParts(symbol, checker, node);
             }
-            else if (node.kind === 188 /* ObjectLiteralExpression */) {
+            else if (node.kind === 189 /* ObjectLiteralExpression */) {
                 return {
                     kind: "interface" /* interfaceElement */,
                     displayParts: [ts.punctuationPart(20 /* OpenParenToken */), ts.textPart("object literal"), ts.punctuationPart(21 /* CloseParenToken */)]
                 };
             }
-            else if (node.kind === 209 /* ClassExpression */) {
+            else if (node.kind === 210 /* ClassExpression */) {
                 return {
                     kind: "local class" /* localClassElement */,
                     displayParts: [ts.punctuationPart(20 /* OpenParenToken */), ts.textPart("anonymous local class"), ts.punctuationPart(21 /* CloseParenToken */)]
@@ -101761,25 +105015,26 @@ var ts;
             }
         }
         function toHighlightSpan(entry) {
+            var documentSpan = entryToDocumentSpan(entry);
             if (entry.kind === 0 /* Span */) {
-                var fileName = entry.fileName, textSpan = entry.textSpan;
-                return { fileName: fileName, span: { textSpan: textSpan, kind: "reference" /* reference */ } };
+                return {
+                    fileName: documentSpan.fileName,
+                    span: {
+                        textSpan: documentSpan.textSpan,
+                        kind: "reference" /* reference */
+                    }
+                };
             }
-            var node = entry.node, kind = entry.kind;
-            var sourceFile = node.getSourceFile();
-            var writeAccess = isWriteAccessForReference(node);
-            var span = {
-                textSpan: getTextSpan(node, sourceFile),
-                kind: writeAccess ? "writtenReference" /* writtenReference */ : "reference" /* reference */,
-                isInString: kind === 2 /* StringLiteral */ ? true : undefined,
-            };
-            return { fileName: sourceFile.fileName, span: span };
+            var writeAccess = isWriteAccessForReference(entry.node);
+            var span = __assign({ textSpan: documentSpan.textSpan, kind: writeAccess ? "writtenReference" /* writtenReference */ : "reference" /* reference */, isInString: entry.kind === 2 /* StringLiteral */ ? true : undefined }, documentSpan.contextSpan && { contextSpan: documentSpan.contextSpan });
+            return { fileName: documentSpan.fileName, span: span };
         }
         FindAllReferences.toHighlightSpan = toHighlightSpan;
-        function getTextSpan(node, sourceFile) {
+        function getTextSpan(node, sourceFile, endNode) {
             var start = node.getStart(sourceFile);
-            var end = node.getEnd();
+            var end = (endNode || node).getEnd();
             if (node.kind === 10 /* StringLiteral */) {
+                ts.Debug.assert(endNode === undefined);
                 start += 1;
                 end -= 1;
             }
@@ -101793,7 +105048,7 @@ var ts;
         /** A node is considered a writeAccess iff it is a name of a declaration or a target of an assignment */
         function isWriteAccessForReference(node) {
             var decl = ts.getDeclarationFromName(node);
-            return !!decl && declarationIsWriteAccess(decl) || node.kind === 80 /* DefaultKeyword */ || ts.isWriteAccess(node);
+            return !!decl && declarationIsWriteAccess(decl) || node.kind === 81 /* DefaultKeyword */ || ts.isWriteAccess(node);
         }
         /**
          * True if 'decl' provides a value, as in `function f() {}`;
@@ -101804,46 +105059,46 @@ var ts;
             if (!!(decl.flags & 4194304 /* Ambient */))
                 return true;
             switch (decl.kind) {
-                case 204 /* BinaryExpression */:
-                case 186 /* BindingElement */:
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
-                case 80 /* DefaultKeyword */:
-                case 243 /* EnumDeclaration */:
-                case 278 /* EnumMember */:
-                case 257 /* ExportSpecifier */:
-                case 250 /* ImportClause */: // default import
-                case 248 /* ImportEqualsDeclaration */:
-                case 253 /* ImportSpecifier */:
-                case 241 /* InterfaceDeclaration */:
-                case 302 /* JSDocCallbackTag */:
-                case 309 /* JSDocTypedefTag */:
-                case 267 /* JsxAttribute */:
-                case 244 /* ModuleDeclaration */:
-                case 247 /* NamespaceExportDeclaration */:
-                case 251 /* NamespaceImport */:
-                case 151 /* Parameter */:
-                case 276 /* ShorthandPropertyAssignment */:
-                case 242 /* TypeAliasDeclaration */:
-                case 150 /* TypeParameter */:
+                case 205 /* BinaryExpression */:
+                case 187 /* BindingElement */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
+                case 81 /* DefaultKeyword */:
+                case 244 /* EnumDeclaration */:
+                case 279 /* EnumMember */:
+                case 258 /* ExportSpecifier */:
+                case 251 /* ImportClause */: // default import
+                case 249 /* ImportEqualsDeclaration */:
+                case 254 /* ImportSpecifier */:
+                case 242 /* InterfaceDeclaration */:
+                case 304 /* JSDocCallbackTag */:
+                case 311 /* JSDocTypedefTag */:
+                case 268 /* JsxAttribute */:
+                case 245 /* ModuleDeclaration */:
+                case 248 /* NamespaceExportDeclaration */:
+                case 252 /* NamespaceImport */:
+                case 152 /* Parameter */:
+                case 277 /* ShorthandPropertyAssignment */:
+                case 243 /* TypeAliasDeclaration */:
+                case 151 /* TypeParameter */:
                     return true;
-                case 275 /* PropertyAssignment */:
+                case 276 /* PropertyAssignment */:
                     // In `({ x: y } = 0);`, `x` is not a write access. (Won't call this function for `y`.)
                     return !ts.isArrayLiteralOrObjectLiteralDestructuringPattern(decl.parent);
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
-                case 157 /* Constructor */:
-                case 156 /* MethodDeclaration */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 158 /* Constructor */:
+                case 157 /* MethodDeclaration */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     return !!decl.body;
-                case 237 /* VariableDeclaration */:
-                case 154 /* PropertyDeclaration */:
+                case 238 /* VariableDeclaration */:
+                case 155 /* PropertyDeclaration */:
                     return !!decl.initializer || ts.isCatchClause(decl.parent);
-                case 155 /* MethodSignature */:
-                case 153 /* PropertySignature */:
-                case 310 /* JSDocPropertyTag */:
-                case 304 /* JSDocParameterTag */:
+                case 156 /* MethodSignature */:
+                case 154 /* PropertySignature */:
+                case 312 /* JSDocPropertyTag */:
+                case 306 /* JSDocParameterTag */:
                     return false;
                 default:
                     return ts.Debug.failBadSyntaxKind(decl);
@@ -102003,10 +105258,10 @@ var ts;
                 for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                     var decl = _a[_i];
                     switch (decl.kind) {
-                        case 284 /* SourceFile */:
+                        case 285 /* SourceFile */:
                             // Don't include the source file itself. (This may not be ideal behavior, but awkward to include an entire file as a reference.)
                             break;
-                        case 244 /* ModuleDeclaration */:
+                        case 245 /* ModuleDeclaration */:
                             if (sourceFilesSet.has(decl.getSourceFile().fileName)) {
                                 references.push(FindAllReferences.nodeEntry(decl.name));
                             }
@@ -102026,7 +105281,7 @@ var ts;
                             var node = ts.isBinaryExpression(decl) && ts.isPropertyAccessExpression(decl.left)
                                 ? decl.left.expression
                                 : ts.isExportAssignment(decl)
-                                    ? ts.Debug.assertDefined(ts.findChildOfKind(decl, 85 /* ExportKeyword */, sourceFile))
+                                    ? ts.Debug.assertDefined(ts.findChildOfKind(decl, 86 /* ExportKeyword */, sourceFile))
                                     : ts.getNameOfDeclaration(decl) || decl;
                             references.push(FindAllReferences.nodeEntry(node));
                         }
@@ -102053,7 +105308,7 @@ var ts;
                 if (ts.isThis(node)) {
                     return getReferencesForThisKeyword(node, sourceFiles, cancellationToken);
                 }
-                if (node.kind === 98 /* SuperKeyword */) {
+                if (node.kind === 99 /* SuperKeyword */) {
                     return getReferencesForSuperKeyword(node);
                 }
                 return undefined;
@@ -102070,34 +105325,37 @@ var ts;
                     // When renaming at an export specifier, rename the export and not the thing being exported.
                     getReferencesAtExportSpecifier(exportSpecifier.name, symbol, exportSpecifier, state.createSearch(node, originalSymbol, /*comingFrom*/ undefined), state, /*addReferencesHere*/ true, /*alwaysGetReferences*/ true);
                 }
-                else if (node && node.kind === 80 /* DefaultKeyword */) {
+                else if (node && node.kind === 81 /* DefaultKeyword */) {
                     addReference(node, symbol, state);
                     searchForImportsOfExport(node, symbol, { exportingModuleSymbol: ts.Debug.assertDefined(symbol.parent, "Expected export symbol to have a parent"), exportKind: 1 /* Default */ }, state);
                 }
                 else {
                     var search = state.createSearch(node, symbol, /*comingFrom*/ undefined, { allSearchSymbols: node ? populateSearchSymbolSet(symbol, node, checker, !!options.isForRename, !!options.providePrefixAndSuffixTextForRename, !!options.implementations) : [symbol] });
-                    // Try to get the smallest valid scope that we can limit our search to;
-                    // otherwise we'll need to search globally (i.e. include each file).
-                    var scope = getSymbolScope(symbol);
-                    if (scope) {
-                        getReferencesInContainer(scope, scope.getSourceFile(), search, state, /*addReferencesHere*/ !(ts.isSourceFile(scope) && !ts.contains(sourceFiles, scope)));
-                    }
-                    else {
-                        // Global search
-                        for (var _i = 0, _a = state.sourceFiles; _i < _a.length; _i++) {
-                            var sourceFile = _a[_i];
-                            state.cancellationToken.throwIfCancellationRequested();
-                            searchForName(sourceFile, search, state);
-                        }
-                    }
+                    getReferencesInContainerOrFiles(symbol, state, search);
                 }
                 return result;
             }
+            function getReferencesInContainerOrFiles(symbol, state, search) {
+                // Try to get the smallest valid scope that we can limit our search to;
+                // otherwise we'll need to search globally (i.e. include each file).
+                var scope = getSymbolScope(symbol);
+                if (scope) {
+                    getReferencesInContainer(scope, scope.getSourceFile(), search, state, /*addReferencesHere*/ !(ts.isSourceFile(scope) && !ts.contains(state.sourceFiles, scope)));
+                }
+                else {
+                    // Global search
+                    for (var _i = 0, _a = state.sourceFiles; _i < _a.length; _i++) {
+                        var sourceFile = _a[_i];
+                        state.cancellationToken.throwIfCancellationRequested();
+                        searchForName(sourceFile, search, state);
+                    }
+                }
+            }
             function getSpecialSearchKind(node) {
                 switch (node.kind) {
-                    case 124 /* ConstructorKeyword */:
+                    case 125 /* ConstructorKeyword */:
                         return 1 /* Constructor */;
-                    case 72 /* Identifier */:
+                    case 73 /* Identifier */:
                         if (ts.isClassLike(node.parent)) {
                             ts.Debug.assert(node.parent.name === node);
                             return 2 /* Class */;
@@ -102120,7 +105378,7 @@ var ts;
                         if (symbol.flags & 33554432 /* Transient */)
                             return undefined;
                         // Assertions for GH#21814. We should be handling SourceFile symbols in `getReferencedSymbolsForModule` instead of getting here.
-                        ts.Debug.fail("Unexpected symbol at " + ts.Debug.showSyntaxKind(node) + ": " + ts.Debug.showSymbol(symbol));
+                        ts.Debug.fail("Unexpected symbol at " + ts.Debug.formatSyntaxKind(node.kind) + ": " + ts.Debug.formatSymbol(symbol));
                     }
                     return ts.isTypeLiteralNode(decl.parent) && ts.isUnionTypeNode(decl.parent.parent)
                         ? checker.getPropertyOfType(checker.getTypeFromTypeNode(decl.parent.parent), symbol.name)
@@ -102144,9 +105402,7 @@ var ts;
              * Unlike `Search`, there is only one `State`.
              */
             var State = /** @class */ (function () {
-                function State(sourceFiles, sourceFilesSet, 
-                /** True if we're searching for constructor references. */
-                specialSearchKind, checker, cancellationToken, searchMeaning, options, result) {
+                function State(sourceFiles, sourceFilesSet, specialSearchKind, checker, cancellationToken, searchMeaning, options, result) {
                     this.sourceFiles = sourceFiles;
                     this.sourceFilesSet = sourceFilesSet;
                     this.specialSearchKind = specialSearchKind;
@@ -102227,8 +105483,8 @@ var ts;
                     var sourceId = ts.getNodeId(sourceFile);
                     var seenSymbols = this.sourceFileToSeenSymbols[sourceId] || (this.sourceFileToSeenSymbols[sourceId] = ts.createMap());
                     var anyNewSymbols = false;
-                    for (var _i = 0, symbols_2 = symbols; _i < symbols_2.length; _i++) {
-                        var sym = symbols_2[_i];
+                    for (var _i = 0, symbols_3 = symbols; _i < symbols_3.length; _i++) {
+                        var sym = symbols_3[_i];
                         anyNewSymbols = ts.addToSeen(seenSymbols, ts.getSymbolId(sym)) || anyNewSymbols;
                     }
                     return anyNewSymbols;
@@ -102335,7 +105591,7 @@ var ts;
                 // If this is the symbol of a named function expression or named class expression,
                 // then named references are limited to its own scope.
                 var declarations = symbol.declarations, flags = symbol.flags, parent = symbol.parent, valueDeclaration = symbol.valueDeclaration;
-                if (valueDeclaration && (valueDeclaration.kind === 196 /* FunctionExpression */ || valueDeclaration.kind === 209 /* ClassExpression */)) {
+                if (valueDeclaration && (valueDeclaration.kind === 197 /* FunctionExpression */ || valueDeclaration.kind === 210 /* ClassExpression */)) {
                     return valueDeclaration;
                 }
                 if (!declarations) {
@@ -102345,7 +105601,7 @@ var ts;
                 if (flags & (4 /* Property */ | 8192 /* Method */)) {
                     var privateDeclaration = ts.find(declarations, function (d) { return ts.hasModifier(d, 8 /* Private */); });
                     if (privateDeclaration) {
-                        return ts.getAncestor(privateDeclaration, 240 /* ClassDeclaration */);
+                        return ts.getAncestor(privateDeclaration, 241 /* ClassDeclaration */);
                     }
                     // Else this is a public property and could be accessed from anywhere.
                     return undefined;
@@ -102374,7 +105630,7 @@ var ts;
                         // Different declarations have different containers, bail out
                         return undefined;
                     }
-                    if (!container || container.kind === 284 /* SourceFile */ && !ts.isExternalOrCommonJsModule(container)) {
+                    if (!container || container.kind === 285 /* SourceFile */ && !ts.isExternalOrCommonJsModule(container)) {
                         // This is a global variable and not an external module, any declaration defined
                         // within this scope is visible outside the file
                         return undefined;
@@ -102461,8 +105717,8 @@ var ts;
                     // We found a match.  Make sure it's not part of a larger word (i.e. the char
                     // before and after it have to be a non-identifier char).
                     var endPosition = position + symbolNameLength;
-                    if ((position === 0 || !ts.isIdentifierPart(text.charCodeAt(position - 1), 7 /* Latest */)) &&
-                        (endPosition === sourceLength || !ts.isIdentifierPart(text.charCodeAt(endPosition), 7 /* Latest */))) {
+                    if ((position === 0 || !ts.isIdentifierPart(text.charCodeAt(position - 1), 99 /* Latest */)) &&
+                        (endPosition === sourceLength || !ts.isIdentifierPart(text.charCodeAt(endPosition), 99 /* Latest */))) {
                         // Found a real match.  Keep searching.
                         positions.push(position);
                     }
@@ -102482,7 +105738,7 @@ var ts;
             function isValidReferencePosition(node, searchSymbolName) {
                 // Compare the length so we filter out strict superstrings of the symbol we are looking for
                 switch (node.kind) {
-                    case 72 /* Identifier */:
+                    case 73 /* Identifier */:
                         return node.text.length === searchSymbolName.length;
                     case 10 /* StringLiteral */: {
                         var str = node;
@@ -102491,7 +105747,7 @@ var ts;
                     }
                     case 8 /* NumericLiteral */:
                         return ts.isLiteralNameOfPropertyDeclarationOrIndexAccess(node) && node.text.length === searchSymbolName.length;
-                    case 80 /* DefaultKeyword */:
+                    case 81 /* DefaultKeyword */:
                         return "default".length === searchSymbolName.length;
                     default:
                         return false;
@@ -102555,7 +105811,7 @@ var ts;
                     return;
                 }
                 if (ts.isExportSpecifier(parent)) {
-                    ts.Debug.assert(referenceLocation.kind === 72 /* Identifier */);
+                    ts.Debug.assert(referenceLocation.kind === 73 /* Identifier */);
                     getReferencesAtExportSpecifier(referenceLocation, referenceSymbol, parent, search, state, addReferencesHere);
                     return;
                 }
@@ -102611,7 +105867,9 @@ var ts;
                 }
                 // For `export { foo as bar }`, rename `foo`, but not `bar`.
                 if (!isForRenameWithPrefixAndSuffixText(state.options) || alwaysGetReferences) {
-                    var exportKind = referenceLocation.originalKeywordKind === 80 /* DefaultKeyword */ ? 1 /* Default */ : 0 /* Named */;
+                    var isDefaultExport = referenceLocation.originalKeywordKind === 81 /* DefaultKeyword */
+                        || exportSpecifier.name.originalKeywordKind === 81 /* DefaultKeyword */;
+                    var exportKind = isDefaultExport ? 1 /* Default */ : 0 /* Named */;
                     var exportSymbol = ts.Debug.assertDefined(exportSpecifier.symbol);
                     var exportInfo = ts.Debug.assertDefined(FindAllReferences.getExportInfo(exportSymbol, exportKind, state.checker));
                     searchForImportsOfExport(referenceLocation, exportSymbol, exportInfo, state);
@@ -102689,7 +105947,7 @@ var ts;
                 }
                 var pusher = function () { return state.referenceAdder(search.symbol); };
                 if (ts.isClassLike(referenceLocation.parent)) {
-                    ts.Debug.assert(referenceLocation.kind === 80 /* DefaultKeyword */ || referenceLocation.parent.name === referenceLocation);
+                    ts.Debug.assert(referenceLocation.kind === 81 /* DefaultKeyword */ || referenceLocation.parent.name === referenceLocation);
                     // This is the class declaration containing the constructor.
                     findOwnConstructorReferences(search.symbol, sourceFile, pusher());
                 }
@@ -102698,6 +105956,7 @@ var ts;
                     var classExtending = tryGetClassByExtendingIdentifier(referenceLocation);
                     if (classExtending) {
                         findSuperConstructorAccesses(classExtending, pusher());
+                        findInheritedConstructorReferences(classExtending, state);
                     }
                 }
             }
@@ -102715,7 +105974,7 @@ var ts;
                     }
                     if (member.body) {
                         member.body.forEachChild(function cb(node) {
-                            if (node.kind === 100 /* ThisKeyword */) {
+                            if (node.kind === 101 /* ThisKeyword */) {
                                 addRef(node);
                             }
                             else if (!ts.isFunctionLike(node) && !ts.isClassLike(node)) {
@@ -102730,38 +105989,46 @@ var ts;
              * Reference the constructor and all calls to `new this()`.
              */
             function findOwnConstructorReferences(classSymbol, sourceFile, addNode) {
-                for (var _i = 0, _a = classSymbol.members.get("__constructor" /* Constructor */).declarations; _i < _a.length; _i++) {
-                    var decl = _a[_i];
-                    var ctrKeyword = ts.findChildOfKind(decl, 124 /* ConstructorKeyword */, sourceFile);
-                    ts.Debug.assert(decl.kind === 157 /* Constructor */ && !!ctrKeyword);
-                    addNode(ctrKeyword);
-                }
-                classSymbol.exports.forEach(function (member) {
-                    var decl = member.valueDeclaration;
-                    if (decl && decl.kind === 156 /* MethodDeclaration */) {
-                        var body = decl.body;
-                        if (body) {
-                            forEachDescendantOfKind(body, 100 /* ThisKeyword */, function (thisKeyword) {
-                                if (ts.isNewExpressionTarget(thisKeyword)) {
-                                    addNode(thisKeyword);
-                                }
-                            });
-                        }
+                var constructorSymbol = getClassConstructorSymbol(classSymbol);
+                if (constructorSymbol) {
+                    for (var _i = 0, _a = constructorSymbol.declarations; _i < _a.length; _i++) {
+                        var decl = _a[_i];
+                        var ctrKeyword = ts.findChildOfKind(decl, 125 /* ConstructorKeyword */, sourceFile);
+                        ts.Debug.assert(decl.kind === 158 /* Constructor */ && !!ctrKeyword);
+                        addNode(ctrKeyword);
                     }
-                });
+                }
+                if (classSymbol.exports) {
+                    classSymbol.exports.forEach(function (member) {
+                        var decl = member.valueDeclaration;
+                        if (decl && decl.kind === 157 /* MethodDeclaration */) {
+                            var body = decl.body;
+                            if (body) {
+                                forEachDescendantOfKind(body, 101 /* ThisKeyword */, function (thisKeyword) {
+                                    if (ts.isNewExpressionTarget(thisKeyword)) {
+                                        addNode(thisKeyword);
+                                    }
+                                });
+                            }
+                        }
+                    });
+                }
+            }
+            function getClassConstructorSymbol(classSymbol) {
+                return classSymbol.members && classSymbol.members.get("__constructor" /* Constructor */);
             }
             /** Find references to `super` in the constructor of an extending class.  */
-            function findSuperConstructorAccesses(cls, addNode) {
-                var ctr = cls.symbol.members.get("__constructor" /* Constructor */);
-                if (!ctr) {
+            function findSuperConstructorAccesses(classDeclaration, addNode) {
+                var constructor = getClassConstructorSymbol(classDeclaration.symbol);
+                if (!constructor) {
                     return;
                 }
-                for (var _i = 0, _a = ctr.declarations; _i < _a.length; _i++) {
+                for (var _i = 0, _a = constructor.declarations; _i < _a.length; _i++) {
                     var decl = _a[_i];
-                    ts.Debug.assert(decl.kind === 157 /* Constructor */);
+                    ts.Debug.assert(decl.kind === 158 /* Constructor */);
                     var body = decl.body;
                     if (body) {
-                        forEachDescendantOfKind(body, 98 /* SuperKeyword */, function (node) {
+                        forEachDescendantOfKind(body, 99 /* SuperKeyword */, function (node) {
                             if (ts.isCallExpressionTarget(node)) {
                                 addNode(node);
                             }
@@ -102769,16 +106036,26 @@ var ts;
                     }
                 }
             }
+            function hasOwnConstructor(classDeclaration) {
+                return !!getClassConstructorSymbol(classDeclaration.symbol);
+            }
+            function findInheritedConstructorReferences(classDeclaration, state) {
+                if (hasOwnConstructor(classDeclaration))
+                    return;
+                var classSymbol = classDeclaration.symbol;
+                var search = state.createSearch(/*location*/ undefined, classSymbol, /*comingFrom*/ undefined);
+                getReferencesInContainerOrFiles(classSymbol, state, search);
+            }
             function addImplementationReferences(refNode, addReference, state) {
                 // Check if we found a function/propertyAssignment/method with an implementation or initializer
                 if (ts.isDeclarationName(refNode) && isImplementation(refNode.parent)) {
                     addReference(refNode);
                     return;
                 }
-                if (refNode.kind !== 72 /* Identifier */) {
+                if (refNode.kind !== 73 /* Identifier */) {
                     return;
                 }
-                if (refNode.parent.kind === 276 /* ShorthandPropertyAssignment */) {
+                if (refNode.parent.kind === 277 /* ShorthandPropertyAssignment */) {
                     // Go ahead and dereference the shorthand assignment by going to its definition
                     getReferenceEntriesForShorthandPropertyAssignment(refNode, state.checker, addReference);
                 }
@@ -102798,7 +106075,7 @@ var ts;
                     }
                     else if (ts.isFunctionLike(typeHavingNode) && typeHavingNode.body) {
                         var body = typeHavingNode.body;
-                        if (body.kind === 218 /* Block */) {
+                        if (body.kind === 219 /* Block */) {
                             ts.forEachReturnStatement(body, function (returnStatement) {
                                 if (returnStatement.expression)
                                     addIfImplementation(returnStatement.expression);
@@ -102826,13 +106103,13 @@ var ts;
              */
             function isImplementationExpression(node) {
                 switch (node.kind) {
-                    case 195 /* ParenthesizedExpression */:
+                    case 196 /* ParenthesizedExpression */:
                         return isImplementationExpression(node.expression);
-                    case 197 /* ArrowFunction */:
-                    case 196 /* FunctionExpression */:
-                    case 188 /* ObjectLiteralExpression */:
-                    case 209 /* ClassExpression */:
-                    case 187 /* ArrayLiteralExpression */:
+                    case 198 /* ArrowFunction */:
+                    case 197 /* FunctionExpression */:
+                    case 189 /* ObjectLiteralExpression */:
+                    case 210 /* ClassExpression */:
+                    case 188 /* ArrayLiteralExpression */:
                         return true;
                     default:
                         return false;
@@ -102885,13 +106162,13 @@ var ts;
                 // Whether 'super' occurs in a static context within a class.
                 var staticFlag = 32 /* Static */;
                 switch (searchSpaceNode.kind) {
-                    case 154 /* PropertyDeclaration */:
-                    case 153 /* PropertySignature */:
-                    case 156 /* MethodDeclaration */:
-                    case 155 /* MethodSignature */:
-                    case 157 /* Constructor */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
+                    case 155 /* PropertyDeclaration */:
+                    case 154 /* PropertySignature */:
+                    case 157 /* MethodDeclaration */:
+                    case 156 /* MethodSignature */:
+                    case 158 /* Constructor */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
                         staticFlag &= ts.getModifierFlags(searchSpaceNode);
                         searchSpaceNode = searchSpaceNode.parent; // re-assign to be the owning class
                         break;
@@ -102900,7 +106177,7 @@ var ts;
                 }
                 var sourceFile = searchSpaceNode.getSourceFile();
                 var references = ts.mapDefined(getPossibleSymbolReferenceNodes(sourceFile, "super", searchSpaceNode), function (node) {
-                    if (node.kind !== 98 /* SuperKeyword */) {
+                    if (node.kind !== 99 /* SuperKeyword */) {
                         return;
                     }
                     var container = ts.getSuperContainer(node, /*stopOnFunctions*/ false);
@@ -102912,41 +106189,41 @@ var ts;
                 return [{ definition: { type: 0 /* Symbol */, symbol: searchSpaceNode.symbol }, references: references }];
             }
             function isParameterName(node) {
-                return node.kind === 72 /* Identifier */ && node.parent.kind === 151 /* Parameter */ && node.parent.name === node;
+                return node.kind === 73 /* Identifier */ && node.parent.kind === 152 /* Parameter */ && node.parent.name === node;
             }
             function getReferencesForThisKeyword(thisOrSuperKeyword, sourceFiles, cancellationToken) {
                 var searchSpaceNode = ts.getThisContainer(thisOrSuperKeyword, /* includeArrowFunctions */ false);
                 // Whether 'this' occurs in a static context within a class.
                 var staticFlag = 32 /* Static */;
                 switch (searchSpaceNode.kind) {
-                    case 156 /* MethodDeclaration */:
-                    case 155 /* MethodSignature */:
+                    case 157 /* MethodDeclaration */:
+                    case 156 /* MethodSignature */:
                         if (ts.isObjectLiteralMethod(searchSpaceNode)) {
                             break;
                         }
                     // falls through
-                    case 154 /* PropertyDeclaration */:
-                    case 153 /* PropertySignature */:
-                    case 157 /* Constructor */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
+                    case 155 /* PropertyDeclaration */:
+                    case 154 /* PropertySignature */:
+                    case 158 /* Constructor */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
                         staticFlag &= ts.getModifierFlags(searchSpaceNode);
                         searchSpaceNode = searchSpaceNode.parent; // re-assign to be the owning class
                         break;
-                    case 284 /* SourceFile */:
+                    case 285 /* SourceFile */:
                         if (ts.isExternalModule(searchSpaceNode) || isParameterName(thisOrSuperKeyword)) {
                             return undefined;
                         }
                     // falls through
-                    case 239 /* FunctionDeclaration */:
-                    case 196 /* FunctionExpression */:
+                    case 240 /* FunctionDeclaration */:
+                    case 197 /* FunctionExpression */:
                         break;
                     // Computed properties in classes are not handled here because references to this are illegal,
                     // so there is no point finding references to them.
                     default:
                         return undefined;
                 }
-                var references = ts.flatMap(searchSpaceNode.kind === 284 /* SourceFile */ ? sourceFiles : [searchSpaceNode.getSourceFile()], function (sourceFile) {
+                var references = ts.flatMap(searchSpaceNode.kind === 285 /* SourceFile */ ? sourceFiles : [searchSpaceNode.getSourceFile()], function (sourceFile) {
                     cancellationToken.throwIfCancellationRequested();
                     return getPossibleSymbolReferenceNodes(sourceFile, "this", ts.isSourceFile(searchSpaceNode) ? sourceFile : searchSpaceNode).filter(function (node) {
                         if (!ts.isThis(node)) {
@@ -102954,19 +106231,19 @@ var ts;
                         }
                         var container = ts.getThisContainer(node, /* includeArrowFunctions */ false);
                         switch (searchSpaceNode.kind) {
-                            case 196 /* FunctionExpression */:
-                            case 239 /* FunctionDeclaration */:
+                            case 197 /* FunctionExpression */:
+                            case 240 /* FunctionDeclaration */:
                                 return searchSpaceNode.symbol === container.symbol;
-                            case 156 /* MethodDeclaration */:
-                            case 155 /* MethodSignature */:
+                            case 157 /* MethodDeclaration */:
+                            case 156 /* MethodSignature */:
                                 return ts.isObjectLiteralMethod(searchSpaceNode) && searchSpaceNode.symbol === container.symbol;
-                            case 209 /* ClassExpression */:
-                            case 240 /* ClassDeclaration */:
+                            case 210 /* ClassExpression */:
+                            case 241 /* ClassDeclaration */:
                                 // Make sure the container belongs to the same class
                                 // and has the appropriate static modifier from the original container.
                                 return container.parent && searchSpaceNode.symbol === container.parent.symbol && (ts.getModifierFlags(container) & 32 /* Static */) === staticFlag;
-                            case 284 /* SourceFile */:
-                                return container.kind === 284 /* SourceFile */ && !ts.isExternalModule(container) && !isParameterName(node);
+                            case 285 /* SourceFile */:
+                                return container.kind === 285 /* SourceFile */ && !ts.isExternalModule(container) && !isParameterName(node);
                         }
                     });
                 }).map(function (n) { return FindAllReferences.nodeEntry(n); });
@@ -103085,7 +106362,7 @@ var ts;
                     });
                 }
                 function getPropertySymbolOfObjectBindingPatternWithoutPropertyName(symbol, checker) {
-                    var bindingElement = ts.getDeclarationOfKind(symbol, 186 /* BindingElement */);
+                    var bindingElement = ts.getDeclarationOfKind(symbol, 187 /* BindingElement */);
                     if (bindingElement && ts.isObjectBindingElementWithoutPropertyName(bindingElement)) {
                         return ts.getPropertySymbolFromBindingElement(checker, bindingElement);
                     }
@@ -103444,7 +106721,7 @@ var ts;
                 else {
                     var defs = getDefinitionFromSymbol(typeChecker, symbol, node) || ts.emptyArray;
                     // For a 'super()' call, put the signature first, else put the variable first.
-                    return node.kind === 98 /* SuperKeyword */ ? [sigInfo].concat(defs) : defs.concat([sigInfo]);
+                    return node.kind === 99 /* SuperKeyword */ ? [sigInfo].concat(defs) : defs.concat([sigInfo]);
                 }
             }
             // Because name in short-hand property assignment has two different meanings: property name and property value,
@@ -103452,7 +106729,7 @@ var ts;
             // go to the declaration of the property name (in this case stay at the same position). However, if go-to-definition
             // is performed at the location of property access, we would like to go to definition of the property in the short-hand
             // assignment. This case and others are handled by the following code.
-            if (node.parent.kind === 276 /* ShorthandPropertyAssignment */) {
+            if (node.parent.kind === 277 /* ShorthandPropertyAssignment */) {
                 var shorthandSymbol_1 = typeChecker.getShorthandAssignmentValueSymbol(symbol.valueDeclaration);
                 return shorthandSymbol_1 ? shorthandSymbol_1.declarations.map(function (decl) { return createDefinitionInfo(decl, typeChecker, shorthandSymbol_1, node); }) : [];
             }
@@ -103508,7 +106785,7 @@ var ts;
         function getReferenceAtPosition(sourceFile, position, program) {
             var referencePath = findReferenceInPosition(sourceFile.referencedFiles, position);
             if (referencePath) {
-                var file = ts.tryResolveScriptReference(program, sourceFile, referencePath);
+                var file = program.getSourceFileFromReference(sourceFile, referencePath);
                 return file && { fileName: referencePath.fileName, file: file };
             }
             var typeReferenceDirective = findReferenceInPosition(sourceFile.typeReferenceDirectives, position);
@@ -103605,18 +106882,18 @@ var ts;
         //   (2) when the aliased symbol is originating from an import.
         //
         function shouldSkipAlias(node, declaration) {
-            if (node.kind !== 72 /* Identifier */) {
+            if (node.kind !== 73 /* Identifier */) {
                 return false;
             }
             if (node.parent === declaration) {
                 return true;
             }
             switch (declaration.kind) {
-                case 250 /* ImportClause */:
-                case 248 /* ImportEqualsDeclaration */:
+                case 251 /* ImportClause */:
+                case 249 /* ImportEqualsDeclaration */:
                     return true;
-                case 253 /* ImportSpecifier */:
-                    return declaration.parent.kind === 252 /* NamedImports */;
+                case 254 /* ImportSpecifier */:
+                    return declaration.parent.kind === 253 /* NamedImports */;
                 default:
                     return false;
             }
@@ -103626,7 +106903,7 @@ var ts;
             function getConstructSignatureDefinition() {
                 // Applicable only if we are in a new expression, or we are on a constructor declaration
                 // and in either case the symbol has a construct signature definition, i.e. class
-                if (symbol.flags & 32 /* Class */ && (ts.isNewExpressionTarget(node) || node.kind === 124 /* ConstructorKeyword */)) {
+                if (symbol.flags & 32 /* Class */ && (ts.isNewExpressionTarget(node) || node.kind === 125 /* ConstructorKeyword */)) {
                     var cls = ts.find(symbol.declarations, ts.isClassLike) || ts.Debug.fail("Expected declaration to have at least one class-like declaration");
                     return getSignatureDefinition(cls.members, /*selectConstructors*/ true);
                 }
@@ -103657,14 +106934,9 @@ var ts;
         function createDefinitionInfoFromName(declaration, symbolKind, symbolName, containerName) {
             var name = ts.getNameOfDeclaration(declaration) || declaration;
             var sourceFile = name.getSourceFile();
-            return {
-                fileName: sourceFile.fileName,
-                textSpan: ts.createTextSpanFromNode(name, sourceFile),
-                kind: symbolKind,
-                name: symbolName,
-                containerKind: undefined,
-                containerName: containerName
-            };
+            var textSpan = ts.createTextSpanFromNode(name, sourceFile);
+            return __assign({ fileName: sourceFile.fileName, textSpan: textSpan, kind: symbolKind, name: symbolName, containerKind: undefined, // TODO: GH#18217
+                containerName: containerName }, ts.FindAllReferences.toContextSpan(textSpan, sourceFile, ts.FindAllReferences.getContextNode(declaration)));
         }
         function createDefinitionFromSignatureDeclaration(typeChecker, decl) {
             return createDefinitionInfo(decl, typeChecker, decl.symbol, decl);
@@ -103700,9 +106972,9 @@ var ts;
         }
         function isConstructorLike(node) {
             switch (node.kind) {
-                case 157 /* Constructor */:
-                case 166 /* ConstructorType */:
-                case 161 /* ConstructSignature */:
+                case 158 /* Constructor */:
+                case 167 /* ConstructorType */:
+                case 162 /* ConstructSignature */:
                     return true;
                 default:
                     return false;
@@ -103820,11 +107092,11 @@ var ts;
         JsDoc.getJsDocCommentsFromDeclarations = getJsDocCommentsFromDeclarations;
         function getCommentHavingNodes(declaration) {
             switch (declaration.kind) {
-                case 304 /* JSDocParameterTag */:
-                case 310 /* JSDocPropertyTag */:
+                case 306 /* JSDocParameterTag */:
+                case 312 /* JSDocPropertyTag */:
                     return [declaration];
-                case 302 /* JSDocCallbackTag */:
-                case 309 /* JSDocTypedefTag */:
+                case 304 /* JSDocCallbackTag */:
+                case 311 /* JSDocTypedefTag */:
                     return [declaration, declaration.parent];
                 default:
                     return ts.getJSDocCommentsAndTags(declaration);
@@ -103845,16 +107117,16 @@ var ts;
         function getCommentText(tag) {
             var comment = tag.comment;
             switch (tag.kind) {
-                case 300 /* JSDocAugmentsTag */:
+                case 301 /* JSDocAugmentsTag */:
                     return withNode(tag.class);
-                case 308 /* JSDocTemplateTag */:
+                case 310 /* JSDocTemplateTag */:
                     return withList(tag.typeParameters);
-                case 307 /* JSDocTypeTag */:
+                case 309 /* JSDocTypeTag */:
                     return withNode(tag.typeExpression);
-                case 309 /* JSDocTypedefTag */:
-                case 302 /* JSDocCallbackTag */:
-                case 310 /* JSDocPropertyTag */:
-                case 304 /* JSDocParameterTag */:
+                case 311 /* JSDocTypedefTag */:
+                case 304 /* JSDocCallbackTag */:
+                case 312 /* JSDocPropertyTag */:
+                case 306 /* JSDocParameterTag */:
                     var name = tag.name;
                     return name ? withNode(name) : comment;
                 default:
@@ -104031,7 +107303,7 @@ var ts;
         function parameterDocComments(parameters, isJavaScriptFile, indentationStr, newLine) {
             return parameters.map(function (_a, i) {
                 var name = _a.name, dotDotDotToken = _a.dotDotDotToken;
-                var paramName = name.kind === 72 /* Identifier */ ? name.text : "param" + i;
+                var paramName = name.kind === 73 /* Identifier */ ? name.text : "param" + i;
                 var type = isJavaScriptFile ? (dotDotDotToken ? "{...any} " : "{any} ") : "";
                 return indentationStr + " * @param " + type + paramName + newLine;
             }).join("");
@@ -104041,23 +107313,23 @@ var ts;
         }
         function getCommentOwnerInfoWorker(commentOwner) {
             switch (commentOwner.kind) {
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
-                case 156 /* MethodDeclaration */:
-                case 157 /* Constructor */:
-                case 155 /* MethodSignature */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 157 /* MethodDeclaration */:
+                case 158 /* Constructor */:
+                case 156 /* MethodSignature */:
                     var parameters = commentOwner.parameters;
                     return { commentOwner: commentOwner, parameters: parameters };
-                case 275 /* PropertyAssignment */:
+                case 276 /* PropertyAssignment */:
                     return getCommentOwnerInfoWorker(commentOwner.initializer);
-                case 240 /* ClassDeclaration */:
-                case 241 /* InterfaceDeclaration */:
-                case 153 /* PropertySignature */:
-                case 243 /* EnumDeclaration */:
-                case 278 /* EnumMember */:
-                case 242 /* TypeAliasDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 242 /* InterfaceDeclaration */:
+                case 154 /* PropertySignature */:
+                case 244 /* EnumDeclaration */:
+                case 279 /* EnumMember */:
+                case 243 /* TypeAliasDeclaration */:
                     return { commentOwner: commentOwner };
-                case 219 /* VariableStatement */: {
+                case 220 /* VariableStatement */: {
                     var varStatement = commentOwner;
                     var varDeclarations = varStatement.declarationList.declarations;
                     var parameters_1 = varDeclarations.length === 1 && varDeclarations[0].initializer
@@ -104065,14 +107337,14 @@ var ts;
                         : undefined;
                     return { commentOwner: commentOwner, parameters: parameters_1 };
                 }
-                case 284 /* SourceFile */:
+                case 285 /* SourceFile */:
                     return "quit";
-                case 244 /* ModuleDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     // If in walking up the tree, we hit a a nested namespace declaration,
                     // then we must be somewhere within a dotted namespace name; however we don't
                     // want to give back a JSDoc template for the 'b' or 'c' in 'namespace a.b.c { }'.
-                    return commentOwner.parent.kind === 244 /* ModuleDeclaration */ ? undefined : { commentOwner: commentOwner };
-                case 204 /* BinaryExpression */: {
+                    return commentOwner.parent.kind === 245 /* ModuleDeclaration */ ? undefined : { commentOwner: commentOwner };
+                case 205 /* BinaryExpression */: {
                     var be = commentOwner;
                     if (ts.getAssignmentDeclarationKind(be) === 0 /* None */) {
                         return "quit";
@@ -104091,14 +107363,14 @@ var ts;
          * @returns the parameters of a signature found on the RHS if one exists; otherwise 'emptyArray'.
          */
         function getParametersFromRightHandSideOfAssignment(rightHandSide) {
-            while (rightHandSide.kind === 195 /* ParenthesizedExpression */) {
+            while (rightHandSide.kind === 196 /* ParenthesizedExpression */) {
                 rightHandSide = rightHandSide.expression;
             }
             switch (rightHandSide.kind) {
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
                     return rightHandSide.parameters;
-                case 209 /* ClassExpression */: {
+                case 210 /* ClassExpression */: {
                     var ctr = ts.find(rightHandSide.members, ts.isConstructorDeclaration);
                     return ctr ? ctr.parameters : ts.emptyArray;
                 }
@@ -104160,9 +107432,9 @@ var ts;
         }
         function shouldKeepItem(declaration, checker) {
             switch (declaration.kind) {
-                case 250 /* ImportClause */:
-                case 253 /* ImportSpecifier */:
-                case 248 /* ImportEqualsDeclaration */:
+                case 251 /* ImportClause */:
+                case 254 /* ImportSpecifier */:
+                case 249 /* ImportEqualsDeclaration */:
                     var importer = checker.getSymbolAtLocation(declaration.name); // TODO: GH#18217
                     var imported = checker.getAliasedSymbol(importer);
                     return importer.escapedName !== imported.escapedName;
@@ -104172,7 +107444,7 @@ var ts;
         }
         function tryAddSingleDeclarationName(declaration, containers) {
             var name = ts.getNameOfDeclaration(declaration);
-            return !!name && (pushLiteral(name, containers) || name.kind === 149 /* ComputedPropertyName */ && tryAddComputedPropertyName(name.expression, containers));
+            return !!name && (pushLiteral(name, containers) || name.kind === 150 /* ComputedPropertyName */ && tryAddComputedPropertyName(name.expression, containers));
         }
         // Only added the names of computed properties if they're simple dotted expressions, like:
         //
@@ -104189,7 +107461,7 @@ var ts;
             // First, if we started with a computed property name, then add all but the last
             // portion into the container array.
             var name = ts.getNameOfDeclaration(declaration);
-            if (name && name.kind === 149 /* ComputedPropertyName */ && !tryAddComputedPropertyName(name.expression, containers)) {
+            if (name && name.kind === 150 /* ComputedPropertyName */ && !tryAddComputedPropertyName(name.expression, containers)) {
                 return ts.emptyArray;
             }
             // Don't include the last portion.
@@ -104358,7 +107630,7 @@ var ts;
                 return;
             }
             switch (node.kind) {
-                case 157 /* Constructor */:
+                case 158 /* Constructor */:
                     // Get parameter properties, and treat them as being on the *same* level as the constructor, not under it.
                     var ctr = node;
                     addNodeWithRecursiveChild(ctr, ctr.body);
@@ -104370,21 +107642,21 @@ var ts;
                         }
                     }
                     break;
-                case 156 /* MethodDeclaration */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
-                case 155 /* MethodSignature */:
+                case 157 /* MethodDeclaration */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
+                case 156 /* MethodSignature */:
                     if (!ts.hasDynamicName(node)) {
                         addNodeWithRecursiveChild(node, node.body);
                     }
                     break;
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
                     if (!ts.hasDynamicName(node)) {
                         addLeafNode(node);
                     }
                     break;
-                case 250 /* ImportClause */:
+                case 251 /* ImportClause */:
                     var importClause = node;
                     // Handle default import case e.g.:
                     //    import d from "mod";
@@ -104396,7 +107668,7 @@ var ts;
                     //    import {a, b as B} from "mod";
                     var namedBindings = importClause.namedBindings;
                     if (namedBindings) {
-                        if (namedBindings.kind === 251 /* NamespaceImport */) {
+                        if (namedBindings.kind === 252 /* NamespaceImport */) {
                             addLeafNode(namedBindings);
                         }
                         else {
@@ -104407,8 +107679,8 @@ var ts;
                         }
                     }
                     break;
-                case 186 /* BindingElement */:
-                case 237 /* VariableDeclaration */:
+                case 187 /* BindingElement */:
+                case 238 /* VariableDeclaration */:
                     var _d = node, name = _d.name, initializer = _d.initializer;
                     if (ts.isBindingPattern(name)) {
                         addChildrenRecursively(name);
@@ -104429,12 +107701,12 @@ var ts;
                         addNodeWithRecursiveChild(node, initializer);
                     }
                     break;
-                case 197 /* ArrowFunction */:
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
                     addNodeWithRecursiveChild(node, node.body);
                     break;
-                case 243 /* EnumDeclaration */:
+                case 244 /* EnumDeclaration */:
                     startNode(node);
                     for (var _e = 0, _f = node.members; _e < _f.length; _e++) {
                         var member = _f[_e];
@@ -104444,9 +107716,9 @@ var ts;
                     }
                     endNode();
                     break;
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
-                case 241 /* InterfaceDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
+                case 242 /* InterfaceDeclaration */:
                     startNode(node);
                     for (var _g = 0, _h = node.members; _g < _h.length; _g++) {
                         var member = _h[_g];
@@ -104454,18 +107726,18 @@ var ts;
                     }
                     endNode();
                     break;
-                case 244 /* ModuleDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     addNodeWithRecursiveChild(node, getInteriorModule(node).body);
                     break;
-                case 257 /* ExportSpecifier */:
-                case 248 /* ImportEqualsDeclaration */:
-                case 162 /* IndexSignature */:
-                case 160 /* CallSignature */:
-                case 161 /* ConstructSignature */:
-                case 242 /* TypeAliasDeclaration */:
+                case 258 /* ExportSpecifier */:
+                case 249 /* ImportEqualsDeclaration */:
+                case 163 /* IndexSignature */:
+                case 161 /* CallSignature */:
+                case 162 /* ConstructSignature */:
+                case 243 /* TypeAliasDeclaration */:
                     addLeafNode(node);
                     break;
-                case 204 /* BinaryExpression */: {
+                case 205 /* BinaryExpression */: {
                     var special = ts.getAssignmentDeclarationKind(node);
                     switch (special) {
                         case 1 /* ExportsProperty */:
@@ -104547,12 +107819,12 @@ var ts;
                 return false;
             }
             switch (a.kind) {
-                case 154 /* PropertyDeclaration */:
-                case 156 /* MethodDeclaration */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 155 /* PropertyDeclaration */:
+                case 157 /* MethodDeclaration */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     return ts.hasModifier(a, 32 /* Static */) === ts.hasModifier(b, 32 /* Static */);
-                case 244 /* ModuleDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     return areSameModule(a, b);
                 default:
                     return true;
@@ -104568,7 +107840,7 @@ var ts;
         // Only merge module nodes that have the same chain. Don't merge 'A.B.C' with 'A'!
         function areSameModule(a, b) {
             // TODO: GH#18217
-            return a.body.kind === b.body.kind && (a.body.kind !== 244 /* ModuleDeclaration */ || areSameModule(a.body, b.body));
+            return a.body.kind === b.body.kind && (a.body.kind !== 245 /* ModuleDeclaration */ || areSameModule(a.body, b.body));
         }
         /** Merge source into target. Source should be thrown away after this is called. */
         function merge(target, source) {
@@ -104598,7 +107870,7 @@ var ts;
          * So `new()` can still come before an `aardvark` method.
          */
         function tryGetName(node) {
-            if (node.kind === 244 /* ModuleDeclaration */) {
+            if (node.kind === 245 /* ModuleDeclaration */) {
                 return getModuleName(node);
             }
             var declName = ts.getNameOfDeclaration(node);
@@ -104606,16 +107878,16 @@ var ts;
                 return ts.unescapeLeadingUnderscores(ts.getPropertyNameForPropertyNameNode(declName)); // TODO: GH#18217
             }
             switch (node.kind) {
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
-                case 209 /* ClassExpression */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
+                case 210 /* ClassExpression */:
                     return getFunctionOrClassName(node);
                 default:
                     return undefined;
             }
         }
         function getItemName(node, name) {
-            if (node.kind === 244 /* ModuleDeclaration */) {
+            if (node.kind === 245 /* ModuleDeclaration */) {
                 return getModuleName(node);
             }
             if (name) {
@@ -104625,16 +107897,16 @@ var ts;
                 }
             }
             switch (node.kind) {
-                case 284 /* SourceFile */:
+                case 285 /* SourceFile */:
                     var sourceFile = node;
                     return ts.isExternalModule(sourceFile)
                         ? "\"" + ts.escapeString(ts.getBaseFileName(ts.removeFileExtension(ts.normalizePath(sourceFile.fileName)))) + "\""
                         : "<global>";
-                case 197 /* ArrowFunction */:
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
+                case 198 /* ArrowFunction */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
                     if (ts.getModifierFlags(node) & 512 /* Default */) {
                         return "default";
                     }
@@ -104642,13 +107914,13 @@ var ts;
                     // (eg: "app\n.onactivated"), so we should remove the whitespace for readabiltiy in the
                     // navigation bar.
                     return getFunctionOrClassName(node);
-                case 157 /* Constructor */:
+                case 158 /* Constructor */:
                     return "constructor";
-                case 161 /* ConstructSignature */:
+                case 162 /* ConstructSignature */:
                     return "new()";
-                case 160 /* CallSignature */:
+                case 161 /* CallSignature */:
                     return "()";
-                case 162 /* IndexSignature */:
+                case 163 /* IndexSignature */:
                     return "[]";
                 default:
                     return "<unknown>";
@@ -104672,25 +107944,25 @@ var ts;
             return topLevel;
             function isTopLevel(item) {
                 switch (navigationBarNodeKind(item)) {
-                    case 240 /* ClassDeclaration */:
-                    case 209 /* ClassExpression */:
-                    case 243 /* EnumDeclaration */:
-                    case 241 /* InterfaceDeclaration */:
-                    case 244 /* ModuleDeclaration */:
-                    case 284 /* SourceFile */:
-                    case 242 /* TypeAliasDeclaration */:
-                    case 309 /* JSDocTypedefTag */:
-                    case 302 /* JSDocCallbackTag */:
+                    case 241 /* ClassDeclaration */:
+                    case 210 /* ClassExpression */:
+                    case 244 /* EnumDeclaration */:
+                    case 242 /* InterfaceDeclaration */:
+                    case 245 /* ModuleDeclaration */:
+                    case 285 /* SourceFile */:
+                    case 243 /* TypeAliasDeclaration */:
+                    case 311 /* JSDocTypedefTag */:
+                    case 304 /* JSDocCallbackTag */:
                         return true;
-                    case 157 /* Constructor */:
-                    case 156 /* MethodDeclaration */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
-                    case 237 /* VariableDeclaration */:
+                    case 158 /* Constructor */:
+                    case 157 /* MethodDeclaration */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
+                    case 238 /* VariableDeclaration */:
                         return hasSomeImportantChild(item);
-                    case 197 /* ArrowFunction */:
-                    case 239 /* FunctionDeclaration */:
-                    case 196 /* FunctionExpression */:
+                    case 198 /* ArrowFunction */:
+                    case 240 /* FunctionDeclaration */:
+                    case 197 /* FunctionExpression */:
                         return isTopLevelFunctionDeclaration(item);
                     default:
                         return false;
@@ -104700,10 +107972,10 @@ var ts;
                         return false;
                     }
                     switch (navigationBarNodeKind(item.parent)) {
-                        case 245 /* ModuleBlock */:
-                        case 284 /* SourceFile */:
-                        case 156 /* MethodDeclaration */:
-                        case 157 /* Constructor */:
+                        case 246 /* ModuleBlock */:
+                        case 285 /* SourceFile */:
+                        case 157 /* MethodDeclaration */:
+                        case 158 /* Constructor */:
                             return true;
                         default:
                             return hasSomeImportantChild(item);
@@ -104712,7 +107984,7 @@ var ts;
                 function hasSomeImportantChild(item) {
                     return ts.some(item.children, function (child) {
                         var childKind = navigationBarNodeKind(child);
-                        return childKind !== 237 /* VariableDeclaration */ && childKind !== 186 /* BindingElement */;
+                        return childKind !== 238 /* VariableDeclaration */ && childKind !== 187 /* BindingElement */;
                     });
                 }
             }
@@ -104769,7 +108041,7 @@ var ts;
             // Otherwise, we need to aggregate each identifier to build up the qualified name.
             var result = [];
             result.push(ts.getTextOfIdentifierOrLiteral(moduleDeclaration.name));
-            while (moduleDeclaration.body && moduleDeclaration.body.kind === 244 /* ModuleDeclaration */) {
+            while (moduleDeclaration.body && moduleDeclaration.body.kind === 245 /* ModuleDeclaration */) {
                 moduleDeclaration = moduleDeclaration.body;
                 result.push(ts.getTextOfIdentifierOrLiteral(moduleDeclaration.name));
             }
@@ -104783,13 +108055,13 @@ var ts;
             return decl.body && ts.isModuleDeclaration(decl.body) ? getInteriorModule(decl.body) : decl;
         }
         function isComputedProperty(member) {
-            return !member.name || member.name.kind === 149 /* ComputedPropertyName */;
+            return !member.name || member.name.kind === 150 /* ComputedPropertyName */;
         }
         function getNodeSpan(node) {
-            return node.kind === 284 /* SourceFile */ ? ts.createTextSpanFromRange(node) : ts.createTextSpanFromNode(node, curSourceFile);
+            return node.kind === 285 /* SourceFile */ ? ts.createTextSpanFromRange(node) : ts.createTextSpanFromNode(node, curSourceFile);
         }
         function getModifiers(node) {
-            if (node.parent && node.parent.kind === 237 /* VariableDeclaration */) {
+            if (node.parent && node.parent.kind === 238 /* VariableDeclaration */) {
                 node = node.parent;
             }
             return ts.getNodeModifiers(node);
@@ -104804,7 +108076,7 @@ var ts;
                 return ts.declarationNameToString(parent.name);
             }
             // See if it is of the form "<expr> = function(){...}". If so, use the text from the left-hand side.
-            else if (ts.isBinaryExpression(parent) && parent.operatorToken.kind === 59 /* EqualsToken */) {
+            else if (ts.isBinaryExpression(parent) && parent.operatorToken.kind === 60 /* EqualsToken */) {
                 return nodeText(parent.left).replace(whiteSpaceRegex, "");
             }
             // See if it is a property assignment, and if so use the property name
@@ -104842,9 +108114,9 @@ var ts;
         }
         function isFunctionOrClassExpression(node) {
             switch (node.kind) {
-                case 197 /* ArrowFunction */:
-                case 196 /* FunctionExpression */:
-                case 209 /* ClassExpression */:
+                case 198 /* ArrowFunction */:
+                case 197 /* FunctionExpression */:
+                case 210 /* ClassExpression */:
                     return true;
                 default:
                     return false;
@@ -104926,7 +108198,7 @@ var ts;
             var usedImports = [];
             for (var _i = 0, oldImports_1 = oldImports; _i < oldImports_1.length; _i++) {
                 var importDecl = oldImports_1[_i];
-                var importClause = importDecl.importClause;
+                var importClause = importDecl.importClause, moduleSpecifier = importDecl.moduleSpecifier;
                 if (!importClause) {
                     // Imports without import clauses are assumed to be included for their side effects and are not removed.
                     usedImports.push(importDecl);
@@ -104957,6 +108229,20 @@ var ts;
                 if (name || namedBindings) {
                     usedImports.push(updateImportDeclarationAndClause(importDecl, name, namedBindings));
                 }
+                // If a module is imported to be augmented, it’s used
+                else if (hasModuleDeclarationMatchingSpecifier(sourceFile, moduleSpecifier)) {
+                    // If we’re in a declaration file, it’s safe to remove the import clause from it
+                    if (sourceFile.isDeclarationFile) {
+                        usedImports.push(ts.createImportDeclaration(importDecl.decorators, importDecl.modifiers, 
+                        /*importClause*/ undefined, moduleSpecifier));
+                    }
+                    // If we’re not in a declaration file, we can’t remove the import clause even though
+                    // the imported symbols are unused, because removing them makes it look like the import
+                    // declaration has side effects, which will cause it to be preserved in the JS emit.
+                    else {
+                        usedImports.push(importDecl);
+                    }
+                }
             }
             return usedImports;
             function isDeclarationUsed(identifier) {
@@ -104964,6 +108250,13 @@ var ts;
                 return jsxElementsPresent && (identifier.text === jsxNamespace) || ts.FindAllReferences.Core.isSymbolReferencedInFile(identifier, typeChecker, sourceFile);
             }
         }
+        function hasModuleDeclarationMatchingSpecifier(sourceFile, moduleSpecifier) {
+            var moduleSpecifierText = ts.isStringLiteral(moduleSpecifier) && moduleSpecifier.text;
+            return ts.isString(moduleSpecifierText) && ts.some(sourceFile.moduleAugmentations, function (moduleName) {
+                return ts.isStringLiteral(moduleName)
+                    && moduleName.text === moduleSpecifierText;
+            });
+        }
         function getExternalModuleName(specifier) {
             return specifier !== undefined && ts.isStringLiteralLike(specifier)
                 ? specifier.text
@@ -105171,7 +108464,7 @@ var ts;
                 }
                 var lastImport = current - 1;
                 if (lastImport !== firstImport) {
-                    out.push(createOutliningSpanFromBounds(ts.findChildOfKind(statements[firstImport], 92 /* ImportKeyword */, sourceFile).getStart(sourceFile), statements[lastImport].getEnd(), "imports" /* Imports */));
+                    out.push(createOutliningSpanFromBounds(ts.findChildOfKind(statements[firstImport], 93 /* ImportKeyword */, sourceFile).getStart(sourceFile), statements[lastImport].getEnd(), "imports" /* Imports */));
                 }
             }
             function visitNonImportNode(n) {
@@ -105212,9 +108505,9 @@ var ts;
         function addRegionOutliningSpans(sourceFile, out) {
             var regions = [];
             var lineStarts = sourceFile.getLineStarts();
-            for (var i = 0; i < lineStarts.length; i++) {
-                var currentLineStart = lineStarts[i];
-                var lineEnd = i + 1 === lineStarts.length ? sourceFile.getEnd() : lineStarts[i + 1] - 1;
+            for (var _i = 0, lineStarts_1 = lineStarts; _i < lineStarts_1.length; _i++) {
+                var currentLineStart = lineStarts_1[_i];
+                var lineEnd = sourceFile.getLineEndOfPosition(currentLineStart);
                 var lineText = sourceFile.text.substring(currentLineStart, lineEnd);
                 var result = isRegionDelimiter(lineText);
                 if (!result || ts.isInComment(sourceFile, currentLineStart)) {
@@ -105288,31 +108581,31 @@ var ts;
         }
         function getOutliningSpanForNode(n, sourceFile) {
             switch (n.kind) {
-                case 218 /* Block */:
-                    if (ts.isFunctionBlock(n)) {
-                        return spanForNode(n.parent, /*autoCollapse*/ n.parent.kind !== 197 /* ArrowFunction */);
+                case 219 /* Block */:
+                    if (ts.isFunctionLike(n.parent)) {
+                        return functionSpan(n.parent, n, sourceFile);
                     }
                     // Check if the block is standalone, or 'attached' to some parent statement.
                     // If the latter, we want to collapse the block, but consider its hint span
                     // to be the entire span of the parent.
                     switch (n.parent.kind) {
-                        case 223 /* DoStatement */:
-                        case 226 /* ForInStatement */:
-                        case 227 /* ForOfStatement */:
-                        case 225 /* ForStatement */:
-                        case 222 /* IfStatement */:
-                        case 224 /* WhileStatement */:
-                        case 231 /* WithStatement */:
-                        case 274 /* CatchClause */:
+                        case 224 /* DoStatement */:
+                        case 227 /* ForInStatement */:
+                        case 228 /* ForOfStatement */:
+                        case 226 /* ForStatement */:
+                        case 223 /* IfStatement */:
+                        case 225 /* WhileStatement */:
+                        case 232 /* WithStatement */:
+                        case 275 /* CatchClause */:
                             return spanForNode(n.parent);
-                        case 235 /* TryStatement */:
+                        case 236 /* TryStatement */:
                             // Could be the try-block, or the finally-block.
                             var tryStatement = n.parent;
                             if (tryStatement.tryBlock === n) {
                                 return spanForNode(n.parent);
                             }
                             else if (tryStatement.finallyBlock === n) {
-                                return spanForNode(ts.findChildOfKind(tryStatement, 88 /* FinallyKeyword */, sourceFile));
+                                return spanForNode(ts.findChildOfKind(tryStatement, 89 /* FinallyKeyword */, sourceFile));
                             }
                         // falls through
                         default:
@@ -105320,22 +108613,24 @@ var ts;
                             // the span of the block, independent of any parent span.
                             return createOutliningSpan(ts.createTextSpanFromNode(n, sourceFile), "code" /* Code */);
                     }
-                case 245 /* ModuleBlock */:
+                case 246 /* ModuleBlock */:
                     return spanForNode(n.parent);
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
-                case 241 /* InterfaceDeclaration */:
-                case 243 /* EnumDeclaration */:
-                case 246 /* CaseBlock */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
+                case 242 /* InterfaceDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 247 /* CaseBlock */:
                     return spanForNode(n);
-                case 188 /* ObjectLiteralExpression */:
+                case 189 /* ObjectLiteralExpression */:
                     return spanForObjectOrArrayLiteral(n);
-                case 187 /* ArrayLiteralExpression */:
+                case 188 /* ArrayLiteralExpression */:
                     return spanForObjectOrArrayLiteral(n, 22 /* OpenBracketToken */);
-                case 260 /* JsxElement */:
+                case 261 /* JsxElement */:
                     return spanForJSXElement(n);
-                case 261 /* JsxSelfClosingElement */:
-                case 262 /* JsxOpeningElement */:
+                case 265 /* JsxFragment */:
+                    return spanForJSXFragment(n);
+                case 262 /* JsxSelfClosingElement */:
+                case 263 /* JsxOpeningElement */:
                     return spanForJSXAttributes(n.attributes);
             }
             function spanForJSXElement(node) {
@@ -105344,6 +108639,11 @@ var ts;
                 var bannerText = "<" + tagName + ">...</" + tagName + ">";
                 return createOutliningSpan(textSpan, "code" /* Code */, textSpan, /*autoCollapse*/ false, bannerText);
             }
+            function spanForJSXFragment(node) {
+                var textSpan = ts.createTextSpanFromBounds(node.openingFragment.getStart(sourceFile), node.closingFragment.getEnd());
+                var bannerText = "<>...</>";
+                return createOutliningSpan(textSpan, "code" /* Code */, textSpan, /*autoCollapse*/ false, bannerText);
+            }
             function spanForJSXAttributes(node) {
                 if (node.properties.length === 0) {
                     return undefined;
@@ -105357,20 +108657,29 @@ var ts;
                 // Otherwise, the collapsed section will include the end of the previous line.
                 return spanForNode(node, /*autoCollapse*/ false, /*useFullStart*/ !ts.isArrayLiteralExpression(node.parent) && !ts.isCallExpression(node.parent), open);
             }
-            function spanForNode(hintSpanNode, autoCollapse, useFullStart, open) {
+            function spanForNode(hintSpanNode, autoCollapse, useFullStart, open, close) {
                 if (autoCollapse === void 0) { autoCollapse = false; }
                 if (useFullStart === void 0) { useFullStart = true; }
                 if (open === void 0) { open = 18 /* OpenBraceToken */; }
+                if (close === void 0) { close = open === 18 /* OpenBraceToken */ ? 19 /* CloseBraceToken */ : 23 /* CloseBracketToken */; }
                 var openToken = ts.findChildOfKind(n, open, sourceFile);
-                var close = open === 18 /* OpenBraceToken */ ? 19 /* CloseBraceToken */ : 23 /* CloseBracketToken */;
                 var closeToken = ts.findChildOfKind(n, close, sourceFile);
-                if (!openToken || !closeToken) {
-                    return undefined;
-                }
-                var textSpan = ts.createTextSpanFromBounds(useFullStart ? openToken.getFullStart() : openToken.getStart(sourceFile), closeToken.getEnd());
-                return createOutliningSpan(textSpan, "code" /* Code */, ts.createTextSpanFromNode(hintSpanNode, sourceFile), autoCollapse);
+                return openToken && closeToken && spanBetweenTokens(openToken, closeToken, hintSpanNode, sourceFile, autoCollapse, useFullStart);
             }
         }
+        function functionSpan(node, body, sourceFile) {
+            var openToken = ts.isNodeArrayMultiLine(node.parameters, sourceFile)
+                ? ts.findChildOfKind(node, 20 /* OpenParenToken */, sourceFile)
+                : ts.findChildOfKind(body, 18 /* OpenBraceToken */, sourceFile);
+            var closeToken = ts.findChildOfKind(body, 19 /* CloseBraceToken */, sourceFile);
+            return openToken && closeToken && spanBetweenTokens(openToken, closeToken, node, sourceFile, /*autoCollapse*/ node.kind !== 198 /* ArrowFunction */);
+        }
+        function spanBetweenTokens(openToken, closeToken, hintSpanNode, sourceFile, autoCollapse, useFullStart) {
+            if (autoCollapse === void 0) { autoCollapse = false; }
+            if (useFullStart === void 0) { useFullStart = true; }
+            var textSpan = ts.createTextSpanFromBounds(useFullStart ? openToken.getFullStart() : openToken.getStart(sourceFile), closeToken.getEnd());
+            return createOutliningSpan(textSpan, "code" /* Code */, ts.createTextSpanFromNode(hintSpanNode, sourceFile), autoCollapse);
+        }
         function createOutliningSpan(textSpan, kind, hintSpan, autoCollapse, bannerText) {
             if (hintSpan === void 0) { hintSpan = textSpan; }
             if (autoCollapse === void 0) { autoCollapse = false; }
@@ -105633,7 +108942,7 @@ var ts;
         if (ch >= 65 /* A */ && ch <= 90 /* Z */) {
             return true;
         }
-        if (ch < 127 /* maxAsciiCharacter */ || !ts.isUnicodeIdentifierStart(ch, 7 /* Latest */)) {
+        if (ch < 127 /* maxAsciiCharacter */ || !ts.isUnicodeIdentifierStart(ch, 99 /* Latest */)) {
             return false;
         }
         // TODO: find a way to determine this for any unicode characters in a
@@ -105646,7 +108955,7 @@ var ts;
         if (ch >= 97 /* a */ && ch <= 122 /* z */) {
             return true;
         }
-        if (ch < 127 /* maxAsciiCharacter */ || !ts.isUnicodeIdentifierStart(ch, 7 /* Latest */)) {
+        if (ch < 127 /* maxAsciiCharacter */ || !ts.isUnicodeIdentifierStart(ch, 99 /* Latest */)) {
             return false;
         }
         // TODO: find a way to determine this for any unicode characters in a
@@ -105898,10 +109207,10 @@ var ts;
          */
         function tryConsumeDeclare() {
             var token = ts.scanner.getToken();
-            if (token === 125 /* DeclareKeyword */) {
+            if (token === 126 /* DeclareKeyword */) {
                 // declare module "mod"
                 token = nextToken();
-                if (token === 130 /* ModuleKeyword */) {
+                if (token === 131 /* ModuleKeyword */) {
                     token = nextToken();
                     if (token === 10 /* StringLiteral */) {
                         recordAmbientExternalModule();
@@ -105919,7 +109228,7 @@ var ts;
                 return false;
             }
             var token = ts.scanner.getToken();
-            if (token === 92 /* ImportKeyword */) {
+            if (token === 93 /* ImportKeyword */) {
                 token = nextToken();
                 if (token === 20 /* OpenParenToken */) {
                     token = nextToken();
@@ -105935,9 +109244,9 @@ var ts;
                     return true;
                 }
                 else {
-                    if (token === 72 /* Identifier */ || ts.isKeyword(token)) {
+                    if (token === 73 /* Identifier */ || ts.isKeyword(token)) {
                         token = nextToken();
-                        if (token === 144 /* FromKeyword */) {
+                        if (token === 145 /* FromKeyword */) {
                             token = nextToken();
                             if (token === 10 /* StringLiteral */) {
                                 // import d from "mod";
@@ -105945,7 +109254,7 @@ var ts;
                                 return true;
                             }
                         }
-                        else if (token === 59 /* EqualsToken */) {
+                        else if (token === 60 /* EqualsToken */) {
                             if (tryConsumeRequireCall(/*skipCurrentToken*/ true)) {
                                 return true;
                             }
@@ -105968,7 +109277,7 @@ var ts;
                         }
                         if (token === 19 /* CloseBraceToken */) {
                             token = nextToken();
-                            if (token === 144 /* FromKeyword */) {
+                            if (token === 145 /* FromKeyword */) {
                                 token = nextToken();
                                 if (token === 10 /* StringLiteral */) {
                                     // import {a as A} from "mod";
@@ -105980,11 +109289,11 @@ var ts;
                     }
                     else if (token === 40 /* AsteriskToken */) {
                         token = nextToken();
-                        if (token === 119 /* AsKeyword */) {
+                        if (token === 120 /* AsKeyword */) {
                             token = nextToken();
-                            if (token === 72 /* Identifier */ || ts.isKeyword(token)) {
+                            if (token === 73 /* Identifier */ || ts.isKeyword(token)) {
                                 token = nextToken();
-                                if (token === 144 /* FromKeyword */) {
+                                if (token === 145 /* FromKeyword */) {
                                     token = nextToken();
                                     if (token === 10 /* StringLiteral */) {
                                         // import * as NS from "mod"
@@ -106002,7 +109311,7 @@ var ts;
         }
         function tryConsumeExport() {
             var token = ts.scanner.getToken();
-            if (token === 85 /* ExportKeyword */) {
+            if (token === 86 /* ExportKeyword */) {
                 markAsExternalModuleIfTopLevel();
                 token = nextToken();
                 if (token === 18 /* OpenBraceToken */) {
@@ -106014,7 +109323,7 @@ var ts;
                     }
                     if (token === 19 /* CloseBraceToken */) {
                         token = nextToken();
-                        if (token === 144 /* FromKeyword */) {
+                        if (token === 145 /* FromKeyword */) {
                             token = nextToken();
                             if (token === 10 /* StringLiteral */) {
                                 // export {a as A} from "mod";
@@ -106026,7 +109335,7 @@ var ts;
                 }
                 else if (token === 40 /* AsteriskToken */) {
                     token = nextToken();
-                    if (token === 144 /* FromKeyword */) {
+                    if (token === 145 /* FromKeyword */) {
                         token = nextToken();
                         if (token === 10 /* StringLiteral */) {
                             // export * from "mod"
@@ -106034,11 +109343,11 @@ var ts;
                         }
                     }
                 }
-                else if (token === 92 /* ImportKeyword */) {
+                else if (token === 93 /* ImportKeyword */) {
                     token = nextToken();
-                    if (token === 72 /* Identifier */ || ts.isKeyword(token)) {
+                    if (token === 73 /* Identifier */ || ts.isKeyword(token)) {
                         token = nextToken();
-                        if (token === 59 /* EqualsToken */) {
+                        if (token === 60 /* EqualsToken */) {
                             if (tryConsumeRequireCall(/*skipCurrentToken*/ true)) {
                                 return true;
                             }
@@ -106051,7 +109360,7 @@ var ts;
         }
         function tryConsumeRequireCall(skipCurrentToken) {
             var token = skipCurrentToken ? nextToken() : ts.scanner.getToken();
-            if (token === 134 /* RequireKeyword */) {
+            if (token === 135 /* RequireKeyword */) {
                 token = nextToken();
                 if (token === 20 /* OpenParenToken */) {
                     token = nextToken();
@@ -106066,7 +109375,7 @@ var ts;
         }
         function tryConsumeDefine() {
             var token = ts.scanner.getToken();
-            if (token === 72 /* Identifier */ && ts.scanner.getTokenValue() === "define") {
+            if (token === 73 /* Identifier */ && ts.scanner.getTokenValue() === "define") {
                 token = nextToken();
                 if (token !== 20 /* OpenParenToken */) {
                     return true;
@@ -106200,14 +109509,14 @@ var ts;
                 return getRenameInfoError(ts.Diagnostics.You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library);
             }
             // Cannot rename `default` as in `import { default as foo } from "./someModule";
-            if (ts.isIdentifier(node) && node.originalKeywordKind === 80 /* DefaultKeyword */ && symbol.parent.flags & 1536 /* Module */) {
+            if (ts.isIdentifier(node) && node.originalKeywordKind === 81 /* DefaultKeyword */ && symbol.parent.flags & 1536 /* Module */) {
                 return undefined;
             }
             if (ts.isStringLiteralLike(node) && ts.tryGetImportFromModuleSpecifier(node)) {
                 return options && options.allowRenameOfImportPath ? getRenameInfoForModule(node, sourceFile, symbol) : undefined;
             }
             var kind = ts.SymbolDisplay.getSymbolKind(typeChecker, symbol, node);
-            var specifierName = (ts.isImportOrExportSpecifierName(node) || ts.isStringOrNumericLiteralLike(node) && node.parent.kind === 149 /* ComputedPropertyName */)
+            var specifierName = (ts.isImportOrExportSpecifierName(node) || ts.isStringOrNumericLiteralLike(node) && node.parent.kind === 150 /* ComputedPropertyName */)
                 ? ts.stripQuotes(ts.getTextOfIdentifierOrLiteral(node))
                 : undefined;
             var displayName = specifierName || typeChecker.symbolToString(symbol);
@@ -106263,9 +109572,9 @@ var ts;
         }
         function nodeIsEligibleForRename(node) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                 case 10 /* StringLiteral */:
-                case 100 /* ThisKeyword */:
+                case 101 /* ThisKeyword */:
                     return true;
                 case 8 /* NumericLiteral */:
                     return ts.isLiteralNameOfPropertyDeclarationOrIndexAccess(node);
@@ -106277,6 +109586,284 @@ var ts;
 })(ts || (ts = {}));
 /* @internal */
 var ts;
+(function (ts) {
+    var SmartSelectionRange;
+    (function (SmartSelectionRange) {
+        function getSmartSelectionRange(pos, sourceFile) {
+            var selectionRange = {
+                textSpan: ts.createTextSpanFromBounds(sourceFile.getFullStart(), sourceFile.getEnd())
+            };
+            var parentNode = sourceFile;
+            outer: while (true) {
+                var children = getSelectionChildren(parentNode);
+                if (!children.length)
+                    break;
+                for (var i = 0; i < children.length; i++) {
+                    var prevNode = children[i - 1];
+                    var node = children[i];
+                    var nextNode = children[i + 1];
+                    if (node.getStart(sourceFile) > pos) {
+                        break outer;
+                    }
+                    if (positionShouldSnapToNode(pos, node, nextNode)) {
+                        // 1. Blocks are effectively redundant with SyntaxLists.
+                        // 2. TemplateSpans, along with the SyntaxLists containing them, are a somewhat unintuitive grouping
+                        //    of things that should be considered independently.
+                        // 3. A VariableStatement’s children are just a VaraiableDeclarationList and a semicolon.
+                        // 4. A lone VariableDeclaration in a VaraibleDeclaration feels redundant with the VariableStatement.
+                        //
+                        // Dive in without pushing a selection range.
+                        if (ts.isBlock(node)
+                            || ts.isTemplateSpan(node) || ts.isTemplateHead(node)
+                            || prevNode && ts.isTemplateHead(prevNode)
+                            || ts.isVariableDeclarationList(node) && ts.isVariableStatement(parentNode)
+                            || ts.isSyntaxList(node) && ts.isVariableDeclarationList(parentNode)
+                            || ts.isVariableDeclaration(node) && ts.isSyntaxList(parentNode) && children.length === 1) {
+                            parentNode = node;
+                            break;
+                        }
+                        // Synthesize a stop for '${ ... }' since '${' and '}' actually belong to siblings.
+                        if (ts.isTemplateSpan(parentNode) && nextNode && ts.isTemplateMiddleOrTemplateTail(nextNode)) {
+                            var start_2 = node.getFullStart() - "${".length;
+                            var end_2 = nextNode.getStart() + "}".length;
+                            pushSelectionRange(start_2, end_2);
+                        }
+                        // Blocks with braces, brackets, parens, or JSX tags on separate lines should be
+                        // selected from open to close, including whitespace but not including the braces/etc. themselves.
+                        var isBetweenMultiLineBookends = ts.isSyntaxList(node)
+                            && isListOpener(prevNode)
+                            && isListCloser(nextNode)
+                            && !ts.positionsAreOnSameLine(prevNode.getStart(), nextNode.getStart(), sourceFile);
+                        var jsDocCommentStart = ts.hasJSDocNodes(node) && node.jsDoc[0].getStart();
+                        var start = isBetweenMultiLineBookends ? prevNode.getEnd() : node.getStart();
+                        var end = isBetweenMultiLineBookends ? nextNode.getStart() : node.getEnd();
+                        if (ts.isNumber(jsDocCommentStart)) {
+                            pushSelectionRange(jsDocCommentStart, end);
+                        }
+                        pushSelectionRange(start, end);
+                        // String literals should have a stop both inside and outside their quotes.
+                        if (ts.isStringLiteral(node) || ts.isTemplateLiteral(node)) {
+                            pushSelectionRange(start + 1, end - 1);
+                        }
+                        parentNode = node;
+                        break;
+                    }
+                    // If we made it to the end of the for loop, we’re done.
+                    // In practice, I’ve only seen this happen at the very end
+                    // of a SourceFile.
+                    if (i === children.length - 1) {
+                        break outer;
+                    }
+                }
+            }
+            return selectionRange;
+            function pushSelectionRange(start, end) {
+                // Skip empty ranges
+                if (start !== end) {
+                    var textSpan = ts.createTextSpanFromBounds(start, end);
+                    if (!selectionRange || (
+                    // Skip ranges that are identical to the parent
+                    !ts.textSpansEqual(textSpan, selectionRange.textSpan) &&
+                        // Skip ranges that don’t contain the original position
+                        ts.textSpanIntersectsWithPosition(textSpan, pos))) {
+                        selectionRange = __assign({ textSpan: textSpan }, selectionRange && { parent: selectionRange });
+                    }
+                }
+            }
+        }
+        SmartSelectionRange.getSmartSelectionRange = getSmartSelectionRange;
+        /**
+         * Like `ts.positionBelongsToNode`, except positions immediately after nodes
+         * count too, unless that position belongs to the next node. In effect, makes
+         * selections able to snap to preceding tokens when the cursor is on the tail
+         * end of them with only whitespace ahead.
+         * @param pos The position to check.
+         * @param node The candidate node to snap to.
+         * @param nextNode The next sibling node in the tree.
+         * @param sourceFile The source file containing the nodes.
+         */
+        function positionShouldSnapToNode(pos, node, nextNode) {
+            // Can’t use 'ts.positionBelongsToNode()' here because it cleverly accounts
+            // for missing nodes, which can’t really be considered when deciding what
+            // to select.
+            ts.Debug.assert(node.pos <= pos);
+            if (pos < node.end) {
+                return true;
+            }
+            var nodeEnd = node.getEnd();
+            var nextNodeStart = nextNode && nextNode.getStart();
+            if (nodeEnd === pos) {
+                return pos !== nextNodeStart;
+            }
+            return false;
+        }
+        var isImport = ts.or(ts.isImportDeclaration, ts.isImportEqualsDeclaration);
+        /**
+         * Gets the children of a node to be considered for selection ranging,
+         * transforming them into an artificial tree according to their intuitive
+         * grouping where no grouping actually exists in the parse tree. For example,
+         * top-level imports are grouped into their own SyntaxList so they can be
+         * selected all together, even though in the AST they’re just siblings of each
+         * other as well as of other top-level statements and declarations.
+         */
+        function getSelectionChildren(node) {
+            // Group top-level imports
+            if (ts.isSourceFile(node)) {
+                return groupChildren(node.getChildAt(0).getChildren(), isImport);
+            }
+            // Mapped types _look_ like ObjectTypes with a single member,
+            // but in fact don’t contain a SyntaxList or a node containing
+            // the “key/value” pair like ObjectTypes do, but it seems intuitive
+            // that the selection would snap to those points. The philosophy
+            // of choosing a selection range is not so much about what the
+            // syntax currently _is_ as what the syntax might easily become
+            // if the user is making a selection; e.g., we synthesize a selection
+            // around the “key/value” pair not because there’s a node there, but
+            // because it allows the mapped type to become an object type with a
+            // few keystrokes.
+            if (ts.isMappedTypeNode(node)) {
+                var _a = node.getChildren(), openBraceToken = _a[0], children = _a.slice(1);
+                var closeBraceToken = ts.Debug.assertDefined(children.pop());
+                ts.Debug.assertEqual(openBraceToken.kind, 18 /* OpenBraceToken */);
+                ts.Debug.assertEqual(closeBraceToken.kind, 19 /* CloseBraceToken */);
+                // Group `-/+readonly` and `-/+?`
+                var groupedWithPlusMinusTokens = groupChildren(children, function (child) {
+                    return child === node.readonlyToken || child.kind === 134 /* ReadonlyKeyword */ ||
+                        child === node.questionToken || child.kind === 56 /* QuestionToken */;
+                });
+                // Group type parameter with surrounding brackets
+                var groupedWithBrackets = groupChildren(groupedWithPlusMinusTokens, function (_a) {
+                    var kind = _a.kind;
+                    return kind === 22 /* OpenBracketToken */ ||
+                        kind === 151 /* TypeParameter */ ||
+                        kind === 23 /* CloseBracketToken */;
+                });
+                return [
+                    openBraceToken,
+                    // Pivot on `:`
+                    createSyntaxList(splitChildren(groupedWithBrackets, function (_a) {
+                        var kind = _a.kind;
+                        return kind === 57 /* ColonToken */;
+                    })),
+                    closeBraceToken,
+                ];
+            }
+            // Group modifiers and property name, then pivot on `:`.
+            if (ts.isPropertySignature(node)) {
+                var children = groupChildren(node.getChildren(), function (child) {
+                    return child === node.name || ts.contains(node.modifiers, child);
+                });
+                return splitChildren(children, function (_a) {
+                    var kind = _a.kind;
+                    return kind === 57 /* ColonToken */;
+                });
+            }
+            // Group the parameter name with its `...`, then that group with its `?`, then pivot on `=`.
+            if (ts.isParameter(node)) {
+                var groupedDotDotDotAndName_1 = groupChildren(node.getChildren(), function (child) {
+                    return child === node.dotDotDotToken || child === node.name;
+                });
+                var groupedWithQuestionToken = groupChildren(groupedDotDotDotAndName_1, function (child) {
+                    return child === groupedDotDotDotAndName_1[0] || child === node.questionToken;
+                });
+                return splitChildren(groupedWithQuestionToken, function (_a) {
+                    var kind = _a.kind;
+                    return kind === 60 /* EqualsToken */;
+                });
+            }
+            // Pivot on '='
+            if (ts.isBindingElement(node)) {
+                return splitChildren(node.getChildren(), function (_a) {
+                    var kind = _a.kind;
+                    return kind === 60 /* EqualsToken */;
+                });
+            }
+            return node.getChildren();
+        }
+        /**
+         * Groups sibling nodes together into their own SyntaxList if they
+         * a) are adjacent, AND b) match a predicate function.
+         */
+        function groupChildren(children, groupOn) {
+            var result = [];
+            var group;
+            for (var _i = 0, children_1 = children; _i < children_1.length; _i++) {
+                var child = children_1[_i];
+                if (groupOn(child)) {
+                    group = group || [];
+                    group.push(child);
+                }
+                else {
+                    if (group) {
+                        result.push(createSyntaxList(group));
+                        group = undefined;
+                    }
+                    result.push(child);
+                }
+            }
+            if (group) {
+                result.push(createSyntaxList(group));
+            }
+            return result;
+        }
+        /**
+         * Splits sibling nodes into up to four partitions:
+         * 1) everything left of the first node matched by `pivotOn`,
+         * 2) the first node matched by `pivotOn`,
+         * 3) everything right of the first node matched by `pivotOn`,
+         * 4) a trailing semicolon, if `separateTrailingSemicolon` is enabled.
+         * The left and right groups, if not empty, will each be grouped into their own containing SyntaxList.
+         * @param children The sibling nodes to split.
+         * @param pivotOn The predicate function to match the node to be the pivot. The first node that matches
+         * the predicate will be used; any others that may match will be included into the right-hand group.
+         * @param separateTrailingSemicolon If the last token is a semicolon, it will be returned as a separate
+         * child rather than be included in the right-hand group.
+         */
+        function splitChildren(children, pivotOn, separateTrailingSemicolon) {
+            if (separateTrailingSemicolon === void 0) { separateTrailingSemicolon = true; }
+            if (children.length < 2) {
+                return children;
+            }
+            var splitTokenIndex = ts.findIndex(children, pivotOn);
+            if (splitTokenIndex === -1) {
+                return children;
+            }
+            var leftChildren = children.slice(0, splitTokenIndex);
+            var splitToken = children[splitTokenIndex];
+            var lastToken = ts.last(children);
+            var separateLastToken = separateTrailingSemicolon && lastToken.kind === 26 /* SemicolonToken */;
+            var rightChildren = children.slice(splitTokenIndex + 1, separateLastToken ? children.length - 1 : undefined);
+            var result = ts.compact([
+                leftChildren.length ? createSyntaxList(leftChildren) : undefined,
+                splitToken,
+                rightChildren.length ? createSyntaxList(rightChildren) : undefined,
+            ]);
+            return separateLastToken ? result.concat(lastToken) : result;
+        }
+        function createSyntaxList(children) {
+            ts.Debug.assertGreaterThanOrEqual(children.length, 1);
+            var syntaxList = ts.createNode(313 /* SyntaxList */, children[0].pos, ts.last(children).end);
+            syntaxList._children = children;
+            return syntaxList;
+        }
+        function isListOpener(token) {
+            var kind = token && token.kind;
+            return kind === 18 /* OpenBraceToken */
+                || kind === 22 /* OpenBracketToken */
+                || kind === 20 /* OpenParenToken */
+                || kind === 263 /* JsxOpeningElement */;
+        }
+        function isListCloser(token) {
+            var kind = token && token.kind;
+            return kind === 19 /* CloseBraceToken */
+                || kind === 23 /* CloseBracketToken */
+                || kind === 21 /* CloseParenToken */
+                || kind === 264 /* JsxClosingElement */;
+        }
+    })(SmartSelectionRange = ts.SmartSelectionRange || (ts.SmartSelectionRange = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
 (function (ts) {
     var SignatureHelp;
     (function (SignatureHelp) {
@@ -106388,8 +109975,21 @@ var ts;
             });
         }
         function containsPrecedingToken(startingToken, sourceFile, container) {
-            var precedingToken = ts.Debug.assertDefined(ts.findPrecedingToken(startingToken.getFullStart(), sourceFile, startingToken.parent, /*excludeJsdoc*/ true));
-            return ts.rangeContainsRange(container, precedingToken);
+            var pos = startingToken.getFullStart();
+            // There’s a possibility that `startingToken.parent` contains only `startingToken` and
+            // missing nodes, none of which are valid to be returned by `findPrecedingToken`. In that
+            // case, the preceding token we want is actually higher up the tree—almost definitely the
+            // next parent, but theoretically the situation with missing nodes might be happening on
+            // multiple nested levels.
+            var currentParent = startingToken.parent;
+            while (currentParent) {
+                var precedingToken = ts.findPrecedingToken(pos, sourceFile, currentParent, /*excludeJsdoc*/ true);
+                if (precedingToken) {
+                    return ts.rangeContainsRange(container, precedingToken);
+                }
+                currentParent = currentParent.parent;
+            }
+            return ts.Debug.fail("Could not find preceding token");
         }
         function getArgumentInfoForCompletions(node, position, sourceFile) {
             var info = getImmediatelyContainingArgumentInfo(node, position, sourceFile);
@@ -106463,10 +110063,10 @@ var ts;
                 }
                 return undefined;
             }
-            else if (ts.isTemplateHead(node) && parent.parent.kind === 193 /* TaggedTemplateExpression */) {
+            else if (ts.isTemplateHead(node) && parent.parent.kind === 194 /* TaggedTemplateExpression */) {
                 var templateExpression = parent;
                 var tagExpression = templateExpression.parent;
-                ts.Debug.assert(templateExpression.kind === 206 /* TemplateExpression */);
+                ts.Debug.assert(templateExpression.kind === 207 /* TemplateExpression */);
                 var argumentIndex = ts.isInsideTemplateLiteral(node, position, sourceFile) ? 0 : 1;
                 return getArgumentListInfoForTemplate(tagExpression, argumentIndex, sourceFile);
             }
@@ -106533,17 +110133,17 @@ var ts;
                 return undefined;
             var parent = startingToken.parent;
             switch (parent.kind) {
-                case 195 /* ParenthesizedExpression */:
-                case 156 /* MethodDeclaration */:
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
+                case 196 /* ParenthesizedExpression */:
+                case 157 /* MethodDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
                     var info = getArgumentOrParameterListInfo(startingToken, sourceFile);
                     if (!info)
                         return undefined;
                     var argumentIndex = info.argumentIndex, argumentCount = info.argumentCount, argumentsSpan = info.argumentsSpan;
                     var contextualType = ts.isMethodDeclaration(parent) ? checker.getContextualTypeForObjectLiteralElement(parent) : checker.getContextualType(parent);
                     return contextualType && { contextualType: contextualType, argumentIndex: argumentIndex, argumentCount: argumentCount, argumentsSpan: argumentsSpan };
-                case 204 /* BinaryExpression */: {
+                case 205 /* BinaryExpression */: {
                     var highestBinary = getHighestBinary(parent);
                     var contextualType_1 = checker.getContextualType(highestBinary);
                     var argumentIndex_1 = startingToken.kind === 20 /* OpenParenToken */ ? 0 : countBinaryExpressionParameters(parent) - 1;
@@ -106667,7 +110267,7 @@ var ts;
             //       |       |
             // This is because a Missing node has no width. However, what we actually want is to include trivia
             // leading up to the next token in case the user is about to type in a TemplateMiddle or TemplateTail.
-            if (template.kind === 206 /* TemplateExpression */) {
+            if (template.kind === 207 /* TemplateExpression */) {
                 var lastSpan = ts.last(template.templateSpans);
                 if (lastSpan.literal.getFullWidth() === 0) {
                     applicableSpanEnd = ts.skipTrivia(sourceFile.text, applicableSpanEnd, /*stopAfterLineBreak*/ false);
@@ -106679,7 +110279,7 @@ var ts;
             var _loop_7 = function (n) {
                 // If the node is not a subspan of its parent, this is a big problem.
                 // There have been crashes that might be caused by this violation.
-                ts.Debug.assert(ts.rangeContainsRange(n.parent, n), "Not a subspan", function () { return "Child: " + ts.Debug.showSyntaxKind(n) + ", parent: " + ts.Debug.showSyntaxKind(n.parent); });
+                ts.Debug.assert(ts.rangeContainsRange(n.parent, n), "Not a subspan", function () { return "Child: " + ts.Debug.formatSyntaxKind(n.kind) + ", parent: " + ts.Debug.formatSyntaxKind(n.parent.kind); });
                 var argumentInfo = getImmediatelyContainingArgumentOrContextualParameterInfo(n, position, sourceFile, checker);
                 if (argumentInfo) {
                     return { value: argumentInfo };
@@ -106763,13 +110363,13 @@ var ts;
             var parameters = (typeParameters || ts.emptyArray).map(function (t) { return createSignatureHelpParameterForTypeParameter(t, checker, enclosingDeclaration, sourceFile, printer); });
             var parameterParts = ts.mapToDisplayParts(function (writer) {
                 var thisParameter = candidateSignature.thisParameter ? [checker.symbolToParameterDeclaration(candidateSignature.thisParameter, enclosingDeclaration, signatureHelpNodeBuilderFlags)] : [];
-                var params = ts.createNodeArray(thisParameter.concat(candidateSignature.parameters.map(function (param) { return checker.symbolToParameterDeclaration(param, enclosingDeclaration, signatureHelpNodeBuilderFlags); })));
+                var params = ts.createNodeArray(thisParameter.concat(checker.getExpandedParameters(candidateSignature).map(function (param) { return checker.symbolToParameterDeclaration(param, enclosingDeclaration, signatureHelpNodeBuilderFlags); })));
                 printer.writeList(2576 /* CallExpressionArguments */, params, sourceFile, writer);
             });
             return { isVariadic: false, parameters: parameters, prefix: [ts.punctuationPart(28 /* LessThanToken */)], suffix: [ts.punctuationPart(30 /* GreaterThanToken */)].concat(parameterParts) };
         }
         function itemInfoForParameters(candidateSignature, checker, enclosingDeclaration, sourceFile) {
-            var isVariadic = candidateSignature.hasRestParameter;
+            var isVariadic = checker.hasEffectiveRestParameter(candidateSignature);
             var printer = ts.createPrinter({ removeComments: true });
             var typeParameterParts = ts.mapToDisplayParts(function (writer) {
                 if (candidateSignature.typeParameters && candidateSignature.typeParameters.length) {
@@ -106777,7 +110377,7 @@ var ts;
                     printer.writeList(53776 /* TypeParameters */, args, sourceFile, writer);
                 }
             });
-            var parameters = candidateSignature.parameters.map(function (p) { return createSignatureHelpParameterForParameter(p, checker, enclosingDeclaration, sourceFile, printer); });
+            var parameters = checker.getExpandedParameters(candidateSignature).map(function (p) { return createSignatureHelpParameterForParameter(p, checker, enclosingDeclaration, sourceFile, printer); });
             return { isVariadic: isVariadic, parameters: parameters, prefix: typeParameterParts.concat([ts.punctuationPart(20 /* OpenParenToken */)]), suffix: [ts.punctuationPart(21 /* CloseParenToken */)] };
         }
         function createSignatureHelpParameterForParameter(parameter, checker, enclosingDeclaration, sourceFile, printer) {
@@ -106979,7 +110579,7 @@ var ts;
         function check(node) {
             if (isJsFile) {
                 switch (node.kind) {
-                    case 196 /* FunctionExpression */:
+                    case 197 /* FunctionExpression */:
                         var decl = ts.getDeclarationOfExpando(node);
                         if (decl) {
                             var symbol_1 = decl.symbol;
@@ -106989,7 +110589,7 @@ var ts;
                             }
                         }
                     // falls through if no diagnostic was created
-                    case 239 /* FunctionDeclaration */:
+                    case 240 /* FunctionDeclaration */:
                         var symbol = node.symbol;
                         if (symbol.members && (symbol.members.size > 0)) {
                             diags.push(ts.createDiagnosticForNode(ts.isVariableDeclaration(node.parent) ? node.parent.name : node, ts.Diagnostics.This_constructor_function_may_be_converted_to_a_class_declaration));
@@ -107022,11 +110622,11 @@ var ts;
     function containsTopLevelCommonjs(sourceFile) {
         return sourceFile.statements.some(function (statement) {
             switch (statement.kind) {
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     return statement.declarationList.declarations.some(function (decl) {
                         return !!decl.initializer && ts.isRequireCall(propertyAccessLeftHandSide(decl.initializer), /*checkArgumentIsStringLiteralLike*/ true);
                     });
-                case 221 /* ExpressionStatement */: {
+                case 222 /* ExpressionStatement */: {
                     var expression = statement.expression;
                     if (!ts.isBinaryExpression(expression))
                         return ts.isRequireCall(expression, /*checkArgumentIsStringLiteralLike*/ true);
@@ -107043,12 +110643,12 @@ var ts;
     }
     function importNameForConvertToDefaultImport(node) {
         switch (node.kind) {
-            case 249 /* ImportDeclaration */:
+            case 250 /* ImportDeclaration */:
                 var importClause = node.importClause, moduleSpecifier = node.moduleSpecifier;
-                return importClause && !importClause.name && importClause.namedBindings && importClause.namedBindings.kind === 251 /* NamespaceImport */ && ts.isStringLiteral(moduleSpecifier)
+                return importClause && !importClause.name && importClause.namedBindings && importClause.namedBindings.kind === 252 /* NamespaceImport */ && ts.isStringLiteral(moduleSpecifier)
                     ? importClause.namedBindings.name
                     : undefined;
-            case 248 /* ImportEqualsDeclaration */:
+            case 249 /* ImportEqualsDeclaration */:
                 return node.name;
             default:
                 return undefined;
@@ -107106,13 +110706,13 @@ var ts;
     // should be kept up to date with getTransformationBody in convertToAsyncFunction.ts
     function isFixablePromiseArgument(arg) {
         switch (arg.kind) {
-            case 239 /* FunctionDeclaration */:
-            case 196 /* FunctionExpression */:
-            case 197 /* ArrowFunction */:
+            case 240 /* FunctionDeclaration */:
+            case 197 /* FunctionExpression */:
+            case 198 /* ArrowFunction */:
                 visitedNestedConvertibleFunctions.set(getKeyFromNode(arg), true);
             /* falls through */
-            case 96 /* NullKeyword */:
-            case 72 /* Identifier */: // identifier includes undefined
+            case 97 /* NullKeyword */:
+            case 73 /* Identifier */: // identifier includes undefined
                 return true;
             default:
                 return false;
@@ -107135,7 +110735,7 @@ var ts;
             }
             var flags = ts.getCombinedLocalAndExportSymbolFlags(symbol);
             if (flags & 32 /* Class */) {
-                return ts.getDeclarationOfKind(symbol, 209 /* ClassExpression */) ?
+                return ts.getDeclarationOfKind(symbol, 210 /* ClassExpression */) ?
                     "local class" /* localClassElement */ : "class" /* classElement */;
             }
             if (flags & 384 /* Enum */)
@@ -107172,7 +110772,7 @@ var ts;
             if (typeChecker.isArgumentsSymbol(symbol)) {
                 return "local var" /* localVariableElement */;
             }
-            if (location.kind === 100 /* ThisKeyword */ && ts.isExpression(location)) {
+            if (location.kind === 101 /* ThisKeyword */ && ts.isExpression(location)) {
                 return "parameter" /* parameterElement */;
             }
             var flags = ts.getCombinedLocalAndExportSymbolFlags(symbol);
@@ -107223,11 +110823,11 @@ var ts;
                 // If we requested completions after `x.` at the top-level, we may be at a source file location.
                 switch (location.parent && location.parent.kind) {
                     // If we've typed a character of the attribute name, will be 'JsxAttribute', else will be 'JsxOpeningElement'.
-                    case 262 /* JsxOpeningElement */:
-                    case 260 /* JsxElement */:
-                    case 261 /* JsxSelfClosingElement */:
-                        return location.kind === 72 /* Identifier */ ? "property" /* memberVariableElement */ : "JSX attribute" /* jsxAttribute */;
-                    case 267 /* JsxAttribute */:
+                    case 263 /* JsxOpeningElement */:
+                    case 261 /* JsxElement */:
+                    case 262 /* JsxSelfClosingElement */:
+                        return location.kind === 73 /* Identifier */ ? "property" /* memberVariableElement */ : "JSX attribute" /* jsxAttribute */;
+                    case 268 /* JsxAttribute */:
                         return "JSX attribute" /* jsxAttribute */;
                     default:
                         return "property" /* memberVariableElement */;
@@ -107254,13 +110854,13 @@ var ts;
             var symbolFlags = ts.getCombinedLocalAndExportSymbolFlags(symbol);
             var symbolKind = semanticMeaning & 1 /* Value */ ? getSymbolKindOfConstructorPropertyMethodAccessorFunctionOrVar(typeChecker, symbol, location) : "" /* unknown */;
             var hasAddedSymbolInfo = false;
-            var isThisExpression = location.kind === 100 /* ThisKeyword */ && ts.isInExpressionContext(location);
+            var isThisExpression = location.kind === 101 /* ThisKeyword */ && ts.isInExpressionContext(location);
             var type;
             var printer;
             var documentationFromAlias;
             var tagsFromAlias;
-            if (location.kind === 100 /* ThisKeyword */ && !isThisExpression) {
-                return { displayParts: [ts.keywordPart(100 /* ThisKeyword */)], documentation: [], symbolKind: "primitive type" /* primitiveType */, tags: undefined };
+            if (location.kind === 101 /* ThisKeyword */ && !isThisExpression) {
+                return { displayParts: [ts.keywordPart(101 /* ThisKeyword */)], documentation: [], symbolKind: "primitive type" /* primitiveType */, tags: undefined };
             }
             // Class at constructor site need to be shown as constructor apart from property,method, vars
             if (symbolKind !== "" /* unknown */ || symbolFlags & 32 /* Class */ || symbolFlags & 2097152 /* Alias */) {
@@ -107270,7 +110870,7 @@ var ts;
                 }
                 var signature = void 0;
                 type = isThisExpression ? typeChecker.getTypeAtLocation(location) : typeChecker.getTypeOfSymbolAtLocation(symbol.exportSymbol || symbol, location);
-                if (location.parent && location.parent.kind === 189 /* PropertyAccessExpression */) {
+                if (location.parent && location.parent.kind === 190 /* PropertyAccessExpression */) {
                     var right = location.parent.name;
                     // Either the location is on the right of a property access, or on the left and the right is missing
                     if (right === location || (right && right.getFullWidth() === 0)) {
@@ -107289,9 +110889,8 @@ var ts;
                     callExpressionLike = location.parent;
                 }
                 if (callExpressionLike) {
-                    var candidateSignatures = [];
-                    signature = typeChecker.getResolvedSignature(callExpressionLike, candidateSignatures); // TODO: GH#18217
-                    var useConstructSignatures = callExpressionLike.kind === 192 /* NewExpression */ || (ts.isCallExpression(callExpressionLike) && callExpressionLike.expression.kind === 98 /* SuperKeyword */);
+                    signature = typeChecker.getResolvedSignature(callExpressionLike); // TODO: GH#18217
+                    var useConstructSignatures = callExpressionLike.kind === 193 /* NewExpression */ || (ts.isCallExpression(callExpressionLike) && callExpressionLike.expression.kind === 99 /* SuperKeyword */);
                     var allSignatures = useConstructSignatures ? type.getConstructSignatures() : type.getCallSignatures();
                     if (!ts.contains(allSignatures, signature.target) && !ts.contains(allSignatures, signature)) {
                         // Get the first signature if there is one -- allSignatures may contain
@@ -107309,7 +110908,7 @@ var ts;
                             pushSymbolKind(symbolKind);
                             displayParts.push(ts.spacePart());
                             if (useConstructSignatures) {
-                                displayParts.push(ts.keywordPart(95 /* NewKeyword */));
+                                displayParts.push(ts.keywordPart(96 /* NewKeyword */));
                                 displayParts.push(ts.spacePart());
                             }
                             addFullSymbolName(symbol);
@@ -107333,7 +110932,7 @@ var ts;
                                     displayParts.push(ts.lineBreakPart());
                                 }
                                 if (useConstructSignatures) {
-                                    displayParts.push(ts.keywordPart(95 /* NewKeyword */));
+                                    displayParts.push(ts.keywordPart(96 /* NewKeyword */));
                                     displayParts.push(ts.spacePart());
                                 }
                                 addSignatureDisplayParts(signature, allSignatures, 262144 /* WriteArrowStyleSignature */);
@@ -107346,29 +110945,29 @@ var ts;
                     }
                 }
                 else if ((ts.isNameOfFunctionDeclaration(location) && !(symbolFlags & 98304 /* Accessor */)) || // name of function declaration
-                    (location.kind === 124 /* ConstructorKeyword */ && location.parent.kind === 157 /* Constructor */)) { // At constructor keyword of constructor declaration
+                    (location.kind === 125 /* ConstructorKeyword */ && location.parent.kind === 158 /* Constructor */)) { // At constructor keyword of constructor declaration
                     // get the signature from the declaration and write it
                     var functionDeclaration_1 = location.parent;
                     // Use function declaration to write the signatures only if the symbol corresponding to this declaration
                     var locationIsSymbolDeclaration = ts.find(symbol.declarations, function (declaration) {
-                        return declaration === (location.kind === 124 /* ConstructorKeyword */ ? functionDeclaration_1.parent : functionDeclaration_1);
+                        return declaration === (location.kind === 125 /* ConstructorKeyword */ ? functionDeclaration_1.parent : functionDeclaration_1);
                     });
                     if (locationIsSymbolDeclaration) {
-                        var allSignatures = functionDeclaration_1.kind === 157 /* Constructor */ ? type.getNonNullableType().getConstructSignatures() : type.getNonNullableType().getCallSignatures();
+                        var allSignatures = functionDeclaration_1.kind === 158 /* Constructor */ ? type.getNonNullableType().getConstructSignatures() : type.getNonNullableType().getCallSignatures();
                         if (!typeChecker.isImplementationOfOverload(functionDeclaration_1)) {
                             signature = typeChecker.getSignatureFromDeclaration(functionDeclaration_1); // TODO: GH#18217
                         }
                         else {
                             signature = allSignatures[0];
                         }
-                        if (functionDeclaration_1.kind === 157 /* Constructor */) {
+                        if (functionDeclaration_1.kind === 158 /* Constructor */) {
                             // show (constructor) Type(...) signature
                             symbolKind = "constructor" /* constructorImplementationElement */;
                             addPrefixForAnyFunctionOrVar(type.symbol, symbolKind);
                         }
                         else {
                             // (function/method) symbol(..signature)
-                            addPrefixForAnyFunctionOrVar(functionDeclaration_1.kind === 160 /* CallSignature */ &&
+                            addPrefixForAnyFunctionOrVar(functionDeclaration_1.kind === 161 /* CallSignature */ &&
                                 !(type.symbol.flags & 2048 /* TypeLiteral */ || type.symbol.flags & 4096 /* ObjectLiteral */) ? type.symbol : symbol, symbolKind);
                         }
                         addSignatureDisplayParts(signature, allSignatures);
@@ -107378,7 +110977,7 @@ var ts;
             }
             if (symbolFlags & 32 /* Class */ && !hasAddedSymbolInfo && !isThisExpression) {
                 addAliasPrefixIfNecessary();
-                if (ts.getDeclarationOfKind(symbol, 209 /* ClassExpression */)) {
+                if (ts.getDeclarationOfKind(symbol, 210 /* ClassExpression */)) {
                     // Special case for class expressions because we would like to indicate that
                     // the class name is local to the class body (similar to function expression)
                     //      (local class) class <className>
@@ -107386,7 +110985,7 @@ var ts;
                 }
                 else {
                     // Class declaration has name which is not local.
-                    displayParts.push(ts.keywordPart(76 /* ClassKeyword */));
+                    displayParts.push(ts.keywordPart(77 /* ClassKeyword */));
                 }
                 displayParts.push(ts.spacePart());
                 addFullSymbolName(symbol);
@@ -107394,37 +110993,37 @@ var ts;
             }
             if ((symbolFlags & 64 /* Interface */) && (semanticMeaning & 2 /* Type */)) {
                 prefixNextMeaning();
-                displayParts.push(ts.keywordPart(110 /* InterfaceKeyword */));
+                displayParts.push(ts.keywordPart(111 /* InterfaceKeyword */));
                 displayParts.push(ts.spacePart());
                 addFullSymbolName(symbol);
                 writeTypeParametersOfSymbol(symbol, sourceFile);
             }
             if ((symbolFlags & 524288 /* TypeAlias */) && (semanticMeaning & 2 /* Type */)) {
                 prefixNextMeaning();
-                displayParts.push(ts.keywordPart(140 /* TypeKeyword */));
+                displayParts.push(ts.keywordPart(141 /* TypeKeyword */));
                 displayParts.push(ts.spacePart());
                 addFullSymbolName(symbol);
                 writeTypeParametersOfSymbol(symbol, sourceFile);
                 displayParts.push(ts.spacePart());
-                displayParts.push(ts.operatorPart(59 /* EqualsToken */));
+                displayParts.push(ts.operatorPart(60 /* EqualsToken */));
                 displayParts.push(ts.spacePart());
                 ts.addRange(displayParts, ts.typeToDisplayParts(typeChecker, typeChecker.getDeclaredTypeOfSymbol(symbol), enclosingDeclaration, 8388608 /* InTypeAlias */));
             }
             if (symbolFlags & 384 /* Enum */) {
                 prefixNextMeaning();
                 if (ts.some(symbol.declarations, function (d) { return ts.isEnumDeclaration(d) && ts.isEnumConst(d); })) {
-                    displayParts.push(ts.keywordPart(77 /* ConstKeyword */));
+                    displayParts.push(ts.keywordPart(78 /* ConstKeyword */));
                     displayParts.push(ts.spacePart());
                 }
-                displayParts.push(ts.keywordPart(84 /* EnumKeyword */));
+                displayParts.push(ts.keywordPart(85 /* EnumKeyword */));
                 displayParts.push(ts.spacePart());
                 addFullSymbolName(symbol);
             }
             if (symbolFlags & 1536 /* Module */ && !isThisExpression) {
                 prefixNextMeaning();
-                var declaration = ts.getDeclarationOfKind(symbol, 244 /* ModuleDeclaration */);
-                var isNamespace = declaration && declaration.name && declaration.name.kind === 72 /* Identifier */;
-                displayParts.push(ts.keywordPart(isNamespace ? 131 /* NamespaceKeyword */ : 130 /* ModuleKeyword */));
+                var declaration = ts.getDeclarationOfKind(symbol, 245 /* ModuleDeclaration */);
+                var isNamespace = declaration && declaration.name && declaration.name.kind === 73 /* Identifier */;
+                displayParts.push(ts.keywordPart(isNamespace ? 132 /* NamespaceKeyword */ : 131 /* ModuleKeyword */));
                 displayParts.push(ts.spacePart());
                 addFullSymbolName(symbol);
             }
@@ -107443,7 +111042,7 @@ var ts;
                 }
                 else {
                     // Method/function type parameter
-                    var decl = ts.getDeclarationOfKind(symbol, 150 /* TypeParameter */);
+                    var decl = ts.getDeclarationOfKind(symbol, 151 /* TypeParameter */);
                     if (decl === undefined)
                         return ts.Debug.fail();
                     var declaration = decl.parent;
@@ -107451,21 +111050,21 @@ var ts;
                         if (ts.isFunctionLikeKind(declaration.kind)) {
                             addInPrefix();
                             var signature = typeChecker.getSignatureFromDeclaration(declaration); // TODO: GH#18217
-                            if (declaration.kind === 161 /* ConstructSignature */) {
-                                displayParts.push(ts.keywordPart(95 /* NewKeyword */));
+                            if (declaration.kind === 162 /* ConstructSignature */) {
+                                displayParts.push(ts.keywordPart(96 /* NewKeyword */));
                                 displayParts.push(ts.spacePart());
                             }
-                            else if (declaration.kind !== 160 /* CallSignature */ && declaration.name) {
+                            else if (declaration.kind !== 161 /* CallSignature */ && declaration.name) {
                                 addFullSymbolName(declaration.symbol);
                             }
                             ts.addRange(displayParts, ts.signatureToDisplayParts(typeChecker, signature, sourceFile, 32 /* WriteTypeArgumentsOfSignature */));
                         }
-                        else if (declaration.kind === 242 /* TypeAliasDeclaration */) {
+                        else if (declaration.kind === 243 /* TypeAliasDeclaration */) {
                             // Type alias type parameter
                             // For example
                             //      type list<T> = T[]; // Both T will go through same code path
                             addInPrefix();
-                            displayParts.push(ts.keywordPart(140 /* TypeKeyword */));
+                            displayParts.push(ts.keywordPart(141 /* TypeKeyword */));
                             displayParts.push(ts.spacePart());
                             addFullSymbolName(declaration.symbol);
                             writeTypeParametersOfSymbol(declaration.symbol, sourceFile);
@@ -107477,11 +111076,11 @@ var ts;
                 symbolKind = "enum member" /* enumMemberElement */;
                 addPrefixForAnyFunctionOrVar(symbol, "enum member");
                 var declaration = symbol.declarations[0];
-                if (declaration.kind === 278 /* EnumMember */) {
+                if (declaration.kind === 279 /* EnumMember */) {
                     var constantValue = typeChecker.getConstantValue(declaration);
                     if (constantValue !== undefined) {
                         displayParts.push(ts.spacePart());
-                        displayParts.push(ts.operatorPart(59 /* EqualsToken */));
+                        displayParts.push(ts.operatorPart(60 /* EqualsToken */));
                         displayParts.push(ts.spacePart());
                         displayParts.push(ts.displayPart(ts.getTextOfConstantValue(constantValue), typeof constantValue === "number" ? ts.SymbolDisplayPartKind.numericLiteral : ts.SymbolDisplayPartKind.stringLiteral));
                     }
@@ -107507,32 +111106,32 @@ var ts;
                     }
                 }
                 switch (symbol.declarations[0].kind) {
-                    case 247 /* NamespaceExportDeclaration */:
-                        displayParts.push(ts.keywordPart(85 /* ExportKeyword */));
+                    case 248 /* NamespaceExportDeclaration */:
+                        displayParts.push(ts.keywordPart(86 /* ExportKeyword */));
                         displayParts.push(ts.spacePart());
-                        displayParts.push(ts.keywordPart(131 /* NamespaceKeyword */));
+                        displayParts.push(ts.keywordPart(132 /* NamespaceKeyword */));
                         break;
-                    case 254 /* ExportAssignment */:
-                        displayParts.push(ts.keywordPart(85 /* ExportKeyword */));
+                    case 255 /* ExportAssignment */:
+                        displayParts.push(ts.keywordPart(86 /* ExportKeyword */));
                         displayParts.push(ts.spacePart());
-                        displayParts.push(ts.keywordPart(symbol.declarations[0].isExportEquals ? 59 /* EqualsToken */ : 80 /* DefaultKeyword */));
+                        displayParts.push(ts.keywordPart(symbol.declarations[0].isExportEquals ? 60 /* EqualsToken */ : 81 /* DefaultKeyword */));
                         break;
-                    case 257 /* ExportSpecifier */:
-                        displayParts.push(ts.keywordPart(85 /* ExportKeyword */));
+                    case 258 /* ExportSpecifier */:
+                        displayParts.push(ts.keywordPart(86 /* ExportKeyword */));
                         break;
                     default:
-                        displayParts.push(ts.keywordPart(92 /* ImportKeyword */));
+                        displayParts.push(ts.keywordPart(93 /* ImportKeyword */));
                 }
                 displayParts.push(ts.spacePart());
                 addFullSymbolName(symbol);
                 ts.forEach(symbol.declarations, function (declaration) {
-                    if (declaration.kind === 248 /* ImportEqualsDeclaration */) {
+                    if (declaration.kind === 249 /* ImportEqualsDeclaration */) {
                         var importEqualsDeclaration = declaration;
                         if (ts.isExternalModuleImportEqualsDeclaration(importEqualsDeclaration)) {
                             displayParts.push(ts.spacePart());
-                            displayParts.push(ts.operatorPart(59 /* EqualsToken */));
+                            displayParts.push(ts.operatorPart(60 /* EqualsToken */));
                             displayParts.push(ts.spacePart());
-                            displayParts.push(ts.keywordPart(134 /* RequireKeyword */));
+                            displayParts.push(ts.keywordPart(135 /* RequireKeyword */));
                             displayParts.push(ts.punctuationPart(20 /* OpenParenToken */));
                             displayParts.push(ts.displayPart(ts.getTextOfNode(ts.getExternalModuleImportEqualsDeclarationExpression(importEqualsDeclaration)), ts.SymbolDisplayPartKind.stringLiteral));
                             displayParts.push(ts.punctuationPart(21 /* CloseParenToken */));
@@ -107541,7 +111140,7 @@ var ts;
                             var internalAliasSymbol = typeChecker.getSymbolAtLocation(importEqualsDeclaration.moduleReference);
                             if (internalAliasSymbol) {
                                 displayParts.push(ts.spacePart());
-                                displayParts.push(ts.operatorPart(59 /* EqualsToken */));
+                                displayParts.push(ts.operatorPart(60 /* EqualsToken */));
                                 displayParts.push(ts.spacePart());
                                 addFullSymbolName(internalAliasSymbol, enclosingDeclaration);
                             }
@@ -107555,7 +111154,7 @@ var ts;
                     if (type) {
                         if (isThisExpression) {
                             prefixNextMeaning();
-                            displayParts.push(ts.keywordPart(100 /* ThisKeyword */));
+                            displayParts.push(ts.keywordPart(101 /* ThisKeyword */));
                         }
                         else {
                             addPrefixForAnyFunctionOrVar(symbol, symbolKind);
@@ -107604,10 +111203,10 @@ var ts;
                     // For some special property access expressions like `exports.foo = foo` or `module.exports.foo = foo`
                     // there documentation comments might be attached to the right hand side symbol of their declarations.
                     // The pattern of such special property access is that the parent symbol is the symbol of the file.
-                    if (symbol.parent && ts.forEach(symbol.parent.declarations, function (declaration) { return declaration.kind === 284 /* SourceFile */; })) {
+                    if (symbol.parent && ts.forEach(symbol.parent.declarations, function (declaration) { return declaration.kind === 285 /* SourceFile */; })) {
                         for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                             var declaration = _a[_i];
-                            if (!declaration.parent || declaration.parent.kind !== 204 /* BinaryExpression */) {
+                            if (!declaration.parent || declaration.parent.kind !== 205 /* BinaryExpression */) {
                                 continue;
                             }
                             var rhsSymbol = typeChecker.getSymbolAtLocation(declaration.parent.right);
@@ -107650,7 +111249,7 @@ var ts;
             }
             function addInPrefix() {
                 displayParts.push(ts.spacePart());
-                displayParts.push(ts.keywordPart(93 /* InKeyword */));
+                displayParts.push(ts.keywordPart(94 /* InKeyword */));
                 displayParts.push(ts.spacePart());
             }
             function addFullSymbolName(symbolToDisplay, enclosingDeclaration) {
@@ -107720,16 +111319,16 @@ var ts;
             }
             return ts.forEach(symbol.declarations, function (declaration) {
                 // Function expressions are local
-                if (declaration.kind === 196 /* FunctionExpression */) {
+                if (declaration.kind === 197 /* FunctionExpression */) {
                     return true;
                 }
-                if (declaration.kind !== 237 /* VariableDeclaration */ && declaration.kind !== 239 /* FunctionDeclaration */) {
+                if (declaration.kind !== 238 /* VariableDeclaration */ && declaration.kind !== 240 /* FunctionDeclaration */) {
                     return false;
                 }
                 // If the parent is not sourceFile or module block it is local variable
                 for (var parent = declaration.parent; !ts.isFunctionBlock(parent); parent = parent.parent) {
                     // Reached source file or module block
-                    if (parent.kind === 284 /* SourceFile */ || parent.kind === 245 /* ModuleBlock */) {
+                    if (parent.kind === 285 /* SourceFile */ || parent.kind === 246 /* ModuleBlock */) {
                         return false;
                     }
                 }
@@ -107958,8 +111557,8 @@ var ts;
 (function (ts) {
     var formatting;
     (function (formatting) {
-        var standardScanner = ts.createScanner(7 /* Latest */, /*skipTrivia*/ false, 0 /* Standard */);
-        var jsxScanner = ts.createScanner(7 /* Latest */, /*skipTrivia*/ false, 1 /* JSX */);
+        var standardScanner = ts.createScanner(99 /* Latest */, /*skipTrivia*/ false, 0 /* Standard */);
+        var jsxScanner = ts.createScanner(99 /* Latest */, /*skipTrivia*/ false, 1 /* JSX */);
         var ScanAction;
         (function (ScanAction) {
             ScanAction[ScanAction["Scan"] = 0] = "Scan";
@@ -108023,8 +111622,8 @@ var ts;
             function shouldRescanGreaterThanToken(node) {
                 switch (node.kind) {
                     case 32 /* GreaterThanEqualsToken */:
-                    case 67 /* GreaterThanGreaterThanEqualsToken */:
-                    case 68 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
+                    case 68 /* GreaterThanGreaterThanEqualsToken */:
+                    case 69 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
                     case 48 /* GreaterThanGreaterThanGreaterThanToken */:
                     case 47 /* GreaterThanGreaterThanToken */:
                         return true;
@@ -108034,12 +111633,12 @@ var ts;
             function shouldRescanJsxIdentifier(node) {
                 if (node.parent) {
                     switch (node.parent.kind) {
-                        case 267 /* JsxAttribute */:
-                        case 262 /* JsxOpeningElement */:
-                        case 263 /* JsxClosingElement */:
-                        case 261 /* JsxSelfClosingElement */:
+                        case 268 /* JsxAttribute */:
+                        case 263 /* JsxOpeningElement */:
+                        case 264 /* JsxClosingElement */:
+                        case 262 /* JsxSelfClosingElement */:
                             // May parse an identifier like `module-layout`; that will be scanned as a keyword at first, but we should parse the whole thing to get an identifier.
-                            return ts.isKeyword(node.kind) || node.kind === 72 /* Identifier */;
+                            return ts.isKeyword(node.kind) || node.kind === 73 /* Identifier */;
                     }
                 }
                 return false;
@@ -108055,7 +111654,7 @@ var ts;
                     container.kind === 17 /* TemplateTail */;
             }
             function startsWithSlashToken(t) {
-                return t === 42 /* SlashToken */ || t === 64 /* SlashEqualsToken */;
+                return t === 42 /* SlashToken */ || t === 65 /* SlashEqualsToken */;
             }
             function readTokenInfo(n) {
                 ts.Debug.assert(isOnToken());
@@ -108214,7 +111813,7 @@ var ts;
     (function (formatting) {
         function getAllRules() {
             var allTokens = [];
-            for (var token = 0 /* FirstToken */; token <= 147 /* LastToken */; token++) {
+            for (var token = 0 /* FirstToken */; token <= 148 /* LastToken */; token++) {
                 allTokens.push(token);
             }
             function anyTokenExcept() {
@@ -108226,27 +111825,27 @@ var ts;
             }
             var anyToken = { tokens: allTokens, isSpecific: false };
             var anyTokenIncludingMultilineComments = tokenRangeFrom(allTokens.concat([3 /* MultiLineCommentTrivia */]));
-            var keywords = tokenRangeFromRange(73 /* FirstKeyword */, 147 /* LastKeyword */);
-            var binaryOperators = tokenRangeFromRange(28 /* FirstBinaryOperator */, 71 /* LastBinaryOperator */);
-            var binaryKeywordOperators = [93 /* InKeyword */, 94 /* InstanceOfKeyword */, 147 /* OfKeyword */, 119 /* AsKeyword */, 128 /* IsKeyword */];
+            var keywords = tokenRangeFromRange(74 /* FirstKeyword */, 148 /* LastKeyword */);
+            var binaryOperators = tokenRangeFromRange(28 /* FirstBinaryOperator */, 72 /* LastBinaryOperator */);
+            var binaryKeywordOperators = [94 /* InKeyword */, 95 /* InstanceOfKeyword */, 148 /* OfKeyword */, 120 /* AsKeyword */, 129 /* IsKeyword */];
             var unaryPrefixOperators = [44 /* PlusPlusToken */, 45 /* MinusMinusToken */, 53 /* TildeToken */, 52 /* ExclamationToken */];
             var unaryPrefixExpressions = [
-                8 /* NumericLiteral */, 9 /* BigIntLiteral */, 72 /* Identifier */, 20 /* OpenParenToken */,
-                22 /* OpenBracketToken */, 18 /* OpenBraceToken */, 100 /* ThisKeyword */, 95 /* NewKeyword */
+                8 /* NumericLiteral */, 9 /* BigIntLiteral */, 73 /* Identifier */, 20 /* OpenParenToken */,
+                22 /* OpenBracketToken */, 18 /* OpenBraceToken */, 101 /* ThisKeyword */, 96 /* NewKeyword */
             ];
-            var unaryPreincrementExpressions = [72 /* Identifier */, 20 /* OpenParenToken */, 100 /* ThisKeyword */, 95 /* NewKeyword */];
-            var unaryPostincrementExpressions = [72 /* Identifier */, 21 /* CloseParenToken */, 23 /* CloseBracketToken */, 95 /* NewKeyword */];
-            var unaryPredecrementExpressions = [72 /* Identifier */, 20 /* OpenParenToken */, 100 /* ThisKeyword */, 95 /* NewKeyword */];
-            var unaryPostdecrementExpressions = [72 /* Identifier */, 21 /* CloseParenToken */, 23 /* CloseBracketToken */, 95 /* NewKeyword */];
+            var unaryPreincrementExpressions = [73 /* Identifier */, 20 /* OpenParenToken */, 101 /* ThisKeyword */, 96 /* NewKeyword */];
+            var unaryPostincrementExpressions = [73 /* Identifier */, 21 /* CloseParenToken */, 23 /* CloseBracketToken */, 96 /* NewKeyword */];
+            var unaryPredecrementExpressions = [73 /* Identifier */, 20 /* OpenParenToken */, 101 /* ThisKeyword */, 96 /* NewKeyword */];
+            var unaryPostdecrementExpressions = [73 /* Identifier */, 21 /* CloseParenToken */, 23 /* CloseBracketToken */, 96 /* NewKeyword */];
             var comments = [2 /* SingleLineCommentTrivia */, 3 /* MultiLineCommentTrivia */];
-            var typeNames = [72 /* Identifier */].concat(ts.typeKeywords);
+            var typeNames = [73 /* Identifier */].concat(ts.typeKeywords);
             // Place a space before open brace in a function declaration
             // TypeScript: Function can have return types, which can be made of tons of different token kinds
             var functionOpenBraceLeftTokenRange = anyTokenIncludingMultilineComments;
             // Place a space before open brace in a TypeScript declaration that has braces as children (class, module, enum, etc)
-            var typeScriptOpenBraceLeftTokenRange = tokenRangeFrom([72 /* Identifier */, 3 /* MultiLineCommentTrivia */, 76 /* ClassKeyword */, 85 /* ExportKeyword */, 92 /* ImportKeyword */]);
+            var typeScriptOpenBraceLeftTokenRange = tokenRangeFrom([73 /* Identifier */, 3 /* MultiLineCommentTrivia */, 77 /* ClassKeyword */, 86 /* ExportKeyword */, 93 /* ImportKeyword */]);
             // Place a space before open brace in a control flow construct
-            var controlOpenBraceLeftTokenRange = tokenRangeFrom([21 /* CloseParenToken */, 3 /* MultiLineCommentTrivia */, 82 /* DoKeyword */, 103 /* TryKeyword */, 88 /* FinallyKeyword */, 83 /* ElseKeyword */]);
+            var controlOpenBraceLeftTokenRange = tokenRangeFrom([21 /* CloseParenToken */, 3 /* MultiLineCommentTrivia */, 83 /* DoKeyword */, 104 /* TryKeyword */, 89 /* FinallyKeyword */, 84 /* ElseKeyword */]);
             // These rules are higher in priority than user-configurable
             var highPriorityCommonRules = [
                 // Leave comments alone
@@ -108261,7 +111860,7 @@ var ts;
                 rule("NoSpaceAfterQuestionMark", 56 /* QuestionToken */, anyToken, [isNonJsxSameLineTokenContext], 8 /* Delete */),
                 rule("NoSpaceBeforeDot", anyToken, 24 /* DotToken */, [isNonJsxSameLineTokenContext], 8 /* Delete */),
                 rule("NoSpaceAfterDot", 24 /* DotToken */, anyToken, [isNonJsxSameLineTokenContext], 8 /* Delete */),
-                rule("NoSpaceBetweenImportParenInImportType", 92 /* ImportKeyword */, 20 /* OpenParenToken */, [isNonJsxSameLineTokenContext, isImportTypeContext], 8 /* Delete */),
+                rule("NoSpaceBetweenImportParenInImportType", 93 /* ImportKeyword */, 20 /* OpenParenToken */, [isNonJsxSameLineTokenContext, isImportTypeContext], 8 /* Delete */),
                 // Special handling of unary operators.
                 // Prefix operators generally shouldn't have a space between
                 // them and their target unary expression.
@@ -108288,79 +111887,79 @@ var ts;
                 rule("SpaceAfterCloseBrace", 19 /* CloseBraceToken */, anyTokenExcept(21 /* CloseParenToken */), [isNonJsxSameLineTokenContext, isAfterCodeBlockContext], 2 /* Space */),
                 // Special case for (}, else) and (}, while) since else & while tokens are not part of the tree which makes SpaceAfterCloseBrace rule not applied
                 // Also should not apply to })
-                rule("SpaceBetweenCloseBraceAndElse", 19 /* CloseBraceToken */, 83 /* ElseKeyword */, [isNonJsxSameLineTokenContext], 2 /* Space */),
-                rule("SpaceBetweenCloseBraceAndWhile", 19 /* CloseBraceToken */, 107 /* WhileKeyword */, [isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("SpaceBetweenCloseBraceAndElse", 19 /* CloseBraceToken */, 84 /* ElseKeyword */, [isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("SpaceBetweenCloseBraceAndWhile", 19 /* CloseBraceToken */, 108 /* WhileKeyword */, [isNonJsxSameLineTokenContext], 2 /* Space */),
                 rule("NoSpaceBetweenEmptyBraceBrackets", 18 /* OpenBraceToken */, 19 /* CloseBraceToken */, [isNonJsxSameLineTokenContext, isObjectContext], 8 /* Delete */),
                 // Add a space after control dec context if the next character is an open bracket ex: 'if (false)[a, b] = [1, 2];' -> 'if (false) [a, b] = [1, 2];'
                 rule("SpaceAfterConditionalClosingParen", 21 /* CloseParenToken */, 22 /* OpenBracketToken */, [isControlDeclContext], 2 /* Space */),
-                rule("NoSpaceBetweenFunctionKeywordAndStar", 90 /* FunctionKeyword */, 40 /* AsteriskToken */, [isFunctionDeclarationOrFunctionExpressionContext], 8 /* Delete */),
-                rule("SpaceAfterStarInGeneratorDeclaration", 40 /* AsteriskToken */, [72 /* Identifier */, 20 /* OpenParenToken */], [isFunctionDeclarationOrFunctionExpressionContext], 2 /* Space */),
-                rule("SpaceAfterFunctionInFuncDecl", 90 /* FunctionKeyword */, anyToken, [isFunctionDeclContext], 2 /* Space */),
+                rule("NoSpaceBetweenFunctionKeywordAndStar", 91 /* FunctionKeyword */, 40 /* AsteriskToken */, [isFunctionDeclarationOrFunctionExpressionContext], 8 /* Delete */),
+                rule("SpaceAfterStarInGeneratorDeclaration", 40 /* AsteriskToken */, 73 /* Identifier */, [isFunctionDeclarationOrFunctionExpressionContext], 2 /* Space */),
+                rule("SpaceAfterFunctionInFuncDecl", 91 /* FunctionKeyword */, anyToken, [isFunctionDeclContext], 2 /* Space */),
                 // Insert new line after { and before } in multi-line contexts.
                 rule("NewLineAfterOpenBraceInBlockContext", 18 /* OpenBraceToken */, anyToken, [isMultilineBlockContext], 4 /* NewLine */),
                 // For get/set members, we check for (identifier,identifier) since get/set don't have tokens and they are represented as just an identifier token.
                 // Though, we do extra check on the context to make sure we are dealing with get/set node. Example:
                 //      get x() {}
                 //      set x(val) {}
-                rule("SpaceAfterGetSetInMember", [126 /* GetKeyword */, 137 /* SetKeyword */], 72 /* Identifier */, [isFunctionDeclContext], 2 /* Space */),
-                rule("NoSpaceBetweenYieldKeywordAndStar", 117 /* YieldKeyword */, 40 /* AsteriskToken */, [isNonJsxSameLineTokenContext, isYieldOrYieldStarWithOperand], 8 /* Delete */),
-                rule("SpaceBetweenYieldOrYieldStarAndOperand", [117 /* YieldKeyword */, 40 /* AsteriskToken */], anyToken, [isNonJsxSameLineTokenContext, isYieldOrYieldStarWithOperand], 2 /* Space */),
-                rule("NoSpaceBetweenReturnAndSemicolon", 97 /* ReturnKeyword */, 26 /* SemicolonToken */, [isNonJsxSameLineTokenContext], 8 /* Delete */),
-                rule("SpaceAfterCertainKeywords", [105 /* VarKeyword */, 101 /* ThrowKeyword */, 95 /* NewKeyword */, 81 /* DeleteKeyword */, 97 /* ReturnKeyword */, 104 /* TypeOfKeyword */, 122 /* AwaitKeyword */], anyToken, [isNonJsxSameLineTokenContext], 2 /* Space */),
-                rule("SpaceAfterLetConstInVariableDeclaration", [111 /* LetKeyword */, 77 /* ConstKeyword */], anyToken, [isNonJsxSameLineTokenContext, isStartOfVariableDeclarationList], 2 /* Space */),
+                rule("SpaceAfterGetSetInMember", [127 /* GetKeyword */, 138 /* SetKeyword */], 73 /* Identifier */, [isFunctionDeclContext], 2 /* Space */),
+                rule("NoSpaceBetweenYieldKeywordAndStar", 118 /* YieldKeyword */, 40 /* AsteriskToken */, [isNonJsxSameLineTokenContext, isYieldOrYieldStarWithOperand], 8 /* Delete */),
+                rule("SpaceBetweenYieldOrYieldStarAndOperand", [118 /* YieldKeyword */, 40 /* AsteriskToken */], anyToken, [isNonJsxSameLineTokenContext, isYieldOrYieldStarWithOperand], 2 /* Space */),
+                rule("NoSpaceBetweenReturnAndSemicolon", 98 /* ReturnKeyword */, 26 /* SemicolonToken */, [isNonJsxSameLineTokenContext], 8 /* Delete */),
+                rule("SpaceAfterCertainKeywords", [106 /* VarKeyword */, 102 /* ThrowKeyword */, 96 /* NewKeyword */, 82 /* DeleteKeyword */, 98 /* ReturnKeyword */, 105 /* TypeOfKeyword */, 123 /* AwaitKeyword */], anyToken, [isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("SpaceAfterLetConstInVariableDeclaration", [112 /* LetKeyword */, 78 /* ConstKeyword */], anyToken, [isNonJsxSameLineTokenContext, isStartOfVariableDeclarationList], 2 /* Space */),
                 rule("NoSpaceBeforeOpenParenInFuncCall", anyToken, 20 /* OpenParenToken */, [isNonJsxSameLineTokenContext, isFunctionCallOrNewContext, isPreviousTokenNotComma], 8 /* Delete */),
                 // Special case for binary operators (that are keywords). For these we have to add a space and shouldn't follow any user options.
                 rule("SpaceBeforeBinaryKeywordOperator", anyToken, binaryKeywordOperators, [isNonJsxSameLineTokenContext, isBinaryOpContext], 2 /* Space */),
                 rule("SpaceAfterBinaryKeywordOperator", binaryKeywordOperators, anyToken, [isNonJsxSameLineTokenContext, isBinaryOpContext], 2 /* Space */),
-                rule("SpaceAfterVoidOperator", 106 /* VoidKeyword */, anyToken, [isNonJsxSameLineTokenContext, isVoidOpContext], 2 /* Space */),
+                rule("SpaceAfterVoidOperator", 107 /* VoidKeyword */, anyToken, [isNonJsxSameLineTokenContext, isVoidOpContext], 2 /* Space */),
                 // Async-await
-                rule("SpaceBetweenAsyncAndOpenParen", 121 /* AsyncKeyword */, 20 /* OpenParenToken */, [isArrowFunctionContext, isNonJsxSameLineTokenContext], 2 /* Space */),
-                rule("SpaceBetweenAsyncAndFunctionKeyword", 121 /* AsyncKeyword */, 90 /* FunctionKeyword */, [isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("SpaceBetweenAsyncAndOpenParen", 122 /* AsyncKeyword */, 20 /* OpenParenToken */, [isArrowFunctionContext, isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("SpaceBetweenAsyncAndFunctionKeyword", 122 /* AsyncKeyword */, 91 /* FunctionKeyword */, [isNonJsxSameLineTokenContext], 2 /* Space */),
                 // Template string
-                rule("NoSpaceBetweenTagAndTemplateString", [72 /* Identifier */, 21 /* CloseParenToken */], [14 /* NoSubstitutionTemplateLiteral */, 15 /* TemplateHead */], [isNonJsxSameLineTokenContext], 8 /* Delete */),
+                rule("NoSpaceBetweenTagAndTemplateString", [73 /* Identifier */, 21 /* CloseParenToken */], [14 /* NoSubstitutionTemplateLiteral */, 15 /* TemplateHead */], [isNonJsxSameLineTokenContext], 8 /* Delete */),
                 // JSX opening elements
-                rule("SpaceBeforeJsxAttribute", anyToken, 72 /* Identifier */, [isNextTokenParentJsxAttribute, isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("SpaceBeforeJsxAttribute", anyToken, 73 /* Identifier */, [isNextTokenParentJsxAttribute, isNonJsxSameLineTokenContext], 2 /* Space */),
                 rule("SpaceBeforeSlashInJsxOpeningElement", anyToken, 42 /* SlashToken */, [isJsxSelfClosingElementContext, isNonJsxSameLineTokenContext], 2 /* Space */),
                 rule("NoSpaceBeforeGreaterThanTokenInJsxOpeningElement", 42 /* SlashToken */, 30 /* GreaterThanToken */, [isJsxSelfClosingElementContext, isNonJsxSameLineTokenContext], 8 /* Delete */),
-                rule("NoSpaceBeforeEqualInJsxAttribute", anyToken, 59 /* EqualsToken */, [isJsxAttributeContext, isNonJsxSameLineTokenContext], 8 /* Delete */),
-                rule("NoSpaceAfterEqualInJsxAttribute", 59 /* EqualsToken */, anyToken, [isJsxAttributeContext, isNonJsxSameLineTokenContext], 8 /* Delete */),
+                rule("NoSpaceBeforeEqualInJsxAttribute", anyToken, 60 /* EqualsToken */, [isJsxAttributeContext, isNonJsxSameLineTokenContext], 8 /* Delete */),
+                rule("NoSpaceAfterEqualInJsxAttribute", 60 /* EqualsToken */, anyToken, [isJsxAttributeContext, isNonJsxSameLineTokenContext], 8 /* Delete */),
                 // TypeScript-specific rules
                 // Use of module as a function call. e.g.: import m2 = module("m2");
-                rule("NoSpaceAfterModuleImport", [130 /* ModuleKeyword */, 134 /* RequireKeyword */], 20 /* OpenParenToken */, [isNonJsxSameLineTokenContext], 8 /* Delete */),
+                rule("NoSpaceAfterModuleImport", [131 /* ModuleKeyword */, 135 /* RequireKeyword */], 20 /* OpenParenToken */, [isNonJsxSameLineTokenContext], 8 /* Delete */),
                 // Add a space around certain TypeScript keywords
                 rule("SpaceAfterCertainTypeScriptKeywords", [
-                    118 /* AbstractKeyword */,
-                    76 /* ClassKeyword */,
-                    125 /* DeclareKeyword */,
-                    80 /* DefaultKeyword */,
-                    84 /* EnumKeyword */,
-                    85 /* ExportKeyword */,
-                    86 /* ExtendsKeyword */,
-                    126 /* GetKeyword */,
-                    109 /* ImplementsKeyword */,
-                    92 /* ImportKeyword */,
-                    110 /* InterfaceKeyword */,
-                    130 /* ModuleKeyword */,
-                    131 /* NamespaceKeyword */,
-                    113 /* PrivateKeyword */,
-                    115 /* PublicKeyword */,
-                    114 /* ProtectedKeyword */,
-                    133 /* ReadonlyKeyword */,
-                    137 /* SetKeyword */,
-                    116 /* StaticKeyword */,
-                    140 /* TypeKeyword */,
-                    144 /* FromKeyword */,
-                    129 /* KeyOfKeyword */,
-                    127 /* InferKeyword */,
+                    119 /* AbstractKeyword */,
+                    77 /* ClassKeyword */,
+                    126 /* DeclareKeyword */,
+                    81 /* DefaultKeyword */,
+                    85 /* EnumKeyword */,
+                    86 /* ExportKeyword */,
+                    87 /* ExtendsKeyword */,
+                    127 /* GetKeyword */,
+                    110 /* ImplementsKeyword */,
+                    93 /* ImportKeyword */,
+                    111 /* InterfaceKeyword */,
+                    131 /* ModuleKeyword */,
+                    132 /* NamespaceKeyword */,
+                    114 /* PrivateKeyword */,
+                    116 /* PublicKeyword */,
+                    115 /* ProtectedKeyword */,
+                    134 /* ReadonlyKeyword */,
+                    138 /* SetKeyword */,
+                    117 /* StaticKeyword */,
+                    141 /* TypeKeyword */,
+                    145 /* FromKeyword */,
+                    130 /* KeyOfKeyword */,
+                    128 /* InferKeyword */,
                 ], anyToken, [isNonJsxSameLineTokenContext], 2 /* Space */),
-                rule("SpaceBeforeCertainTypeScriptKeywords", anyToken, [86 /* ExtendsKeyword */, 109 /* ImplementsKeyword */, 144 /* FromKeyword */], [isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("SpaceBeforeCertainTypeScriptKeywords", anyToken, [87 /* ExtendsKeyword */, 110 /* ImplementsKeyword */, 145 /* FromKeyword */], [isNonJsxSameLineTokenContext], 2 /* Space */),
                 // Treat string literals in module names as identifiers, and add a space between the literal and the opening Brace braces, e.g.: module "m2" {
                 rule("SpaceAfterModuleName", 10 /* StringLiteral */, 18 /* OpenBraceToken */, [isModuleDeclContext], 2 /* Space */),
                 // Lambda expressions
                 rule("SpaceBeforeArrow", anyToken, 37 /* EqualsGreaterThanToken */, [isNonJsxSameLineTokenContext], 2 /* Space */),
                 rule("SpaceAfterArrow", 37 /* EqualsGreaterThanToken */, anyToken, [isNonJsxSameLineTokenContext], 2 /* Space */),
                 // Optional parameters and let args
-                rule("NoSpaceAfterEllipsis", 25 /* DotDotDotToken */, 72 /* Identifier */, [isNonJsxSameLineTokenContext], 8 /* Delete */),
+                rule("NoSpaceAfterEllipsis", 25 /* DotDotDotToken */, 73 /* Identifier */, [isNonJsxSameLineTokenContext], 8 /* Delete */),
                 rule("NoSpaceAfterOptionalParameters", 56 /* QuestionToken */, [21 /* CloseParenToken */, 27 /* CommaToken */], [isNonJsxSameLineTokenContext, isNotBinaryOpContext], 8 /* Delete */),
                 // Remove spaces in empty interface literals. e.g.: x: {}
                 rule("NoSpaceBetweenEmptyInterfaceBraceBrackets", 18 /* OpenBraceToken */, 19 /* CloseBraceToken */, [isNonJsxSameLineTokenContext, isObjectTypeContext], 8 /* Delete */),
@@ -108371,37 +111970,38 @@ var ts;
                 rule("NoSpaceBeforeCloseAngularBracket", anyToken, 30 /* GreaterThanToken */, [isNonJsxSameLineTokenContext, isTypeArgumentOrParameterOrAssertionContext], 8 /* Delete */),
                 rule("NoSpaceAfterCloseAngularBracket", 30 /* GreaterThanToken */, [20 /* OpenParenToken */, 22 /* OpenBracketToken */, 30 /* GreaterThanToken */, 27 /* CommaToken */], [isNonJsxSameLineTokenContext, isTypeArgumentOrParameterOrAssertionContext, isNotFunctionDeclContext /*To prevent an interference with the SpaceBeforeOpenParenInFuncDecl rule*/], 8 /* Delete */),
                 // decorators
-                rule("SpaceBeforeAt", [21 /* CloseParenToken */, 72 /* Identifier */], 58 /* AtToken */, [isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("SpaceBeforeAt", [21 /* CloseParenToken */, 73 /* Identifier */], 58 /* AtToken */, [isNonJsxSameLineTokenContext], 2 /* Space */),
                 rule("NoSpaceAfterAt", 58 /* AtToken */, anyToken, [isNonJsxSameLineTokenContext], 8 /* Delete */),
                 // Insert space after @ in decorator
                 rule("SpaceAfterDecorator", anyToken, [
-                    118 /* AbstractKeyword */,
-                    72 /* Identifier */,
-                    85 /* ExportKeyword */,
-                    80 /* DefaultKeyword */,
-                    76 /* ClassKeyword */,
-                    116 /* StaticKeyword */,
-                    115 /* PublicKeyword */,
-                    113 /* PrivateKeyword */,
-                    114 /* ProtectedKeyword */,
-                    126 /* GetKeyword */,
-                    137 /* SetKeyword */,
+                    119 /* AbstractKeyword */,
+                    73 /* Identifier */,
+                    86 /* ExportKeyword */,
+                    81 /* DefaultKeyword */,
+                    77 /* ClassKeyword */,
+                    117 /* StaticKeyword */,
+                    116 /* PublicKeyword */,
+                    114 /* PrivateKeyword */,
+                    115 /* ProtectedKeyword */,
+                    127 /* GetKeyword */,
+                    138 /* SetKeyword */,
                     22 /* OpenBracketToken */,
                     40 /* AsteriskToken */,
                 ], [isEndOfDecoratorContextOnSameLine], 2 /* Space */),
                 rule("NoSpaceBeforeNonNullAssertionOperator", anyToken, 52 /* ExclamationToken */, [isNonJsxSameLineTokenContext, isNonNullAssertionContext], 8 /* Delete */),
-                rule("NoSpaceAfterNewKeywordOnConstructorSignature", 95 /* NewKeyword */, 20 /* OpenParenToken */, [isNonJsxSameLineTokenContext, isConstructorSignatureContext], 8 /* Delete */),
+                rule("NoSpaceAfterNewKeywordOnConstructorSignature", 96 /* NewKeyword */, 20 /* OpenParenToken */, [isNonJsxSameLineTokenContext, isConstructorSignatureContext], 8 /* Delete */),
+                rule("SpaceLessThanAndNonJSXTypeAnnotation", 28 /* LessThanToken */, 28 /* LessThanToken */, [isNonJsxSameLineTokenContext], 2 /* Space */),
             ];
             // These rules are applied after high priority
             var userConfigurableRules = [
                 // Treat constructor as an identifier in a function declaration, and remove spaces between constructor and following left parentheses
-                rule("SpaceAfterConstructor", 124 /* ConstructorKeyword */, 20 /* OpenParenToken */, [isOptionEnabled("insertSpaceAfterConstructor"), isNonJsxSameLineTokenContext], 2 /* Space */),
-                rule("NoSpaceAfterConstructor", 124 /* ConstructorKeyword */, 20 /* OpenParenToken */, [isOptionDisabledOrUndefined("insertSpaceAfterConstructor"), isNonJsxSameLineTokenContext], 8 /* Delete */),
+                rule("SpaceAfterConstructor", 125 /* ConstructorKeyword */, 20 /* OpenParenToken */, [isOptionEnabled("insertSpaceAfterConstructor"), isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("NoSpaceAfterConstructor", 125 /* ConstructorKeyword */, 20 /* OpenParenToken */, [isOptionDisabledOrUndefined("insertSpaceAfterConstructor"), isNonJsxSameLineTokenContext], 8 /* Delete */),
                 rule("SpaceAfterComma", 27 /* CommaToken */, anyToken, [isOptionEnabled("insertSpaceAfterCommaDelimiter"), isNonJsxSameLineTokenContext, isNonJsxElementOrFragmentContext, isNextTokenNotCloseBracket], 2 /* Space */),
                 rule("NoSpaceAfterComma", 27 /* CommaToken */, anyToken, [isOptionDisabledOrUndefined("insertSpaceAfterCommaDelimiter"), isNonJsxSameLineTokenContext, isNonJsxElementOrFragmentContext], 8 /* Delete */),
                 // Insert space after function keyword for anonymous functions
-                rule("SpaceAfterAnonymousFunctionKeyword", 90 /* FunctionKeyword */, 20 /* OpenParenToken */, [isOptionEnabled("insertSpaceAfterFunctionKeywordForAnonymousFunctions"), isFunctionDeclContext], 2 /* Space */),
-                rule("NoSpaceAfterAnonymousFunctionKeyword", 90 /* FunctionKeyword */, 20 /* OpenParenToken */, [isOptionDisabledOrUndefined("insertSpaceAfterFunctionKeywordForAnonymousFunctions"), isFunctionDeclContext], 8 /* Delete */),
+                rule("SpaceAfterAnonymousFunctionKeyword", [91 /* FunctionKeyword */, 40 /* AsteriskToken */], 20 /* OpenParenToken */, [isOptionEnabled("insertSpaceAfterFunctionKeywordForAnonymousFunctions"), isFunctionDeclContext], 2 /* Space */),
+                rule("NoSpaceAfterAnonymousFunctionKeyword", [91 /* FunctionKeyword */, 40 /* AsteriskToken */], 20 /* OpenParenToken */, [isOptionDisabledOrUndefined("insertSpaceAfterFunctionKeywordForAnonymousFunctions"), isFunctionDeclContext], 8 /* Delete */),
                 // Insert space after keywords in control flow statements
                 rule("SpaceAfterKeywordInControl", keywords, 20 /* OpenParenToken */, [isOptionEnabled("insertSpaceAfterKeywordsInControlFlowStatements"), isControlDeclContext], 2 /* Space */),
                 rule("NoSpaceAfterKeywordInControl", keywords, 20 /* OpenParenToken */, [isOptionDisabledOrUndefined("insertSpaceAfterKeywordsInControlFlowStatements"), isControlDeclContext], 8 /* Delete */),
@@ -108465,20 +112065,32 @@ var ts;
                 rule("SpaceBeforeOpenBraceInTypeScriptDeclWithBlock", typeScriptOpenBraceLeftTokenRange, 18 /* OpenBraceToken */, [isOptionDisabledOrUndefinedOrTokensOnSameLine("placeOpenBraceOnNewLineForFunctions"), isTypeScriptDeclWithBlockContext, isNotFormatOnEnter, isSameLineTokenOrBeforeBlockContext], 2 /* Space */, 1 /* CanDeleteNewLines */),
                 rule("NoSpaceBeforeComma", anyToken, 27 /* CommaToken */, [isNonJsxSameLineTokenContext], 8 /* Delete */),
                 // No space before and after indexer `x[]`
-                rule("NoSpaceBeforeOpenBracket", anyTokenExcept(121 /* AsyncKeyword */, 74 /* CaseKeyword */), 22 /* OpenBracketToken */, [isNonJsxSameLineTokenContext], 8 /* Delete */),
+                rule("NoSpaceBeforeOpenBracket", anyTokenExcept(122 /* AsyncKeyword */, 75 /* CaseKeyword */), 22 /* OpenBracketToken */, [isNonJsxSameLineTokenContext], 8 /* Delete */),
                 rule("NoSpaceAfterCloseBracket", 23 /* CloseBracketToken */, anyToken, [isNonJsxSameLineTokenContext, isNotBeforeBlockInFunctionDeclarationContext], 8 /* Delete */),
                 rule("SpaceAfterSemicolon", 26 /* SemicolonToken */, anyToken, [isNonJsxSameLineTokenContext], 2 /* Space */),
                 // Remove extra space between for and await
-                rule("SpaceBetweenForAndAwaitKeyword", 89 /* ForKeyword */, 122 /* AwaitKeyword */, [isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("SpaceBetweenForAndAwaitKeyword", 90 /* ForKeyword */, 123 /* AwaitKeyword */, [isNonJsxSameLineTokenContext], 2 /* Space */),
                 // Add a space between statements. All keywords except (do,else,case) has open/close parens after them.
                 // So, we have a rule to add a space for [),Any], [do,Any], [else,Any], and [case,Any]
-                rule("SpaceBetweenStatements", [21 /* CloseParenToken */, 82 /* DoKeyword */, 83 /* ElseKeyword */, 74 /* CaseKeyword */], anyToken, [isNonJsxSameLineTokenContext, isNonJsxElementOrFragmentContext, isNotForContext], 2 /* Space */),
+                rule("SpaceBetweenStatements", [21 /* CloseParenToken */, 83 /* DoKeyword */, 84 /* ElseKeyword */, 75 /* CaseKeyword */], anyToken, [isNonJsxSameLineTokenContext, isNonJsxElementOrFragmentContext, isNotForContext], 2 /* Space */),
                 // This low-pri rule takes care of "try {" and "finally {" in case the rule SpaceBeforeOpenBraceInControl didn't execute on FormatOnEnter.
-                rule("SpaceAfterTryFinally", [103 /* TryKeyword */, 88 /* FinallyKeyword */], 18 /* OpenBraceToken */, [isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("SpaceAfterTryFinally", [104 /* TryKeyword */, 89 /* FinallyKeyword */], 18 /* OpenBraceToken */, [isNonJsxSameLineTokenContext], 2 /* Space */),
             ];
             return highPriorityCommonRules.concat(userConfigurableRules, lowPriorityCommonRules);
         }
         formatting.getAllRules = getAllRules;
+        /**
+         * A rule takes a two tokens (left/right) and a particular context
+         * for which you're meant to look at them. You then declare what should the
+         * whitespace annotation be between these tokens via the action param.
+         *
+         * @param debugName Name to print
+         * @param left The left side of the comparison
+         * @param right The right side of the comparison
+         * @param context A set of filters to narrow down the space in which this formatter rule applies
+         * @param action a declaration of the expected whitespace
+         * @param flags whether the rule deletes a line or not, defaults to no-op
+         */
         function rule(debugName, left, right, context, action, flags) {
             if (flags === void 0) { flags = 0 /* None */; }
             return { leftTokenRange: toTokenRange(left), rightTokenRange: toTokenRange(right), rule: { debugName: debugName, context: context, action: action, flags: flags } };
@@ -108518,45 +112130,45 @@ var ts;
             return function (context) { return !context.options || !context.options.hasOwnProperty(optionName) || !!context.options[optionName]; };
         }
         function isForContext(context) {
-            return context.contextNode.kind === 225 /* ForStatement */;
+            return context.contextNode.kind === 226 /* ForStatement */;
         }
         function isNotForContext(context) {
             return !isForContext(context);
         }
         function isBinaryOpContext(context) {
             switch (context.contextNode.kind) {
-                case 204 /* BinaryExpression */:
-                case 205 /* ConditionalExpression */:
-                case 175 /* ConditionalType */:
-                case 212 /* AsExpression */:
-                case 257 /* ExportSpecifier */:
-                case 253 /* ImportSpecifier */:
-                case 163 /* TypePredicate */:
-                case 173 /* UnionType */:
-                case 174 /* IntersectionType */:
+                case 205 /* BinaryExpression */:
+                case 206 /* ConditionalExpression */:
+                case 176 /* ConditionalType */:
+                case 213 /* AsExpression */:
+                case 258 /* ExportSpecifier */:
+                case 254 /* ImportSpecifier */:
+                case 164 /* TypePredicate */:
+                case 174 /* UnionType */:
+                case 175 /* IntersectionType */:
                     return true;
                 // equals in binding elements: function foo([[x, y] = [1, 2]])
-                case 186 /* BindingElement */:
+                case 187 /* BindingElement */:
                 // equals in type X = ...
-                case 242 /* TypeAliasDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
                 // equal in import a = module('a');
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                 // equal in let a = 0;
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                 // equal in p = 0;
-                case 151 /* Parameter */:
-                case 278 /* EnumMember */:
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
-                    return context.currentTokenSpan.kind === 59 /* EqualsToken */ || context.nextTokenSpan.kind === 59 /* EqualsToken */;
+                case 152 /* Parameter */:
+                case 279 /* EnumMember */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
+                    return context.currentTokenSpan.kind === 60 /* EqualsToken */ || context.nextTokenSpan.kind === 60 /* EqualsToken */;
                 // "in" keyword in for (let x in []) { }
-                case 226 /* ForInStatement */:
+                case 227 /* ForInStatement */:
                 // "in" keyword in [P in keyof T]: T[P]
-                case 150 /* TypeParameter */:
-                    return context.currentTokenSpan.kind === 93 /* InKeyword */ || context.nextTokenSpan.kind === 93 /* InKeyword */ || context.currentTokenSpan.kind === 59 /* EqualsToken */ || context.nextTokenSpan.kind === 59 /* EqualsToken */;
+                case 151 /* TypeParameter */:
+                    return context.currentTokenSpan.kind === 94 /* InKeyword */ || context.nextTokenSpan.kind === 94 /* InKeyword */ || context.currentTokenSpan.kind === 60 /* EqualsToken */ || context.nextTokenSpan.kind === 60 /* EqualsToken */;
                 // Technically, "of" is not a binary operator, but format it the same way as "in"
-                case 227 /* ForOfStatement */:
-                    return context.currentTokenSpan.kind === 147 /* OfKeyword */ || context.nextTokenSpan.kind === 147 /* OfKeyword */;
+                case 228 /* ForOfStatement */:
+                    return context.currentTokenSpan.kind === 148 /* OfKeyword */ || context.nextTokenSpan.kind === 148 /* OfKeyword */;
             }
             return false;
         }
@@ -108568,22 +112180,22 @@ var ts;
         }
         function isTypeAnnotationContext(context) {
             var contextKind = context.contextNode.kind;
-            return contextKind === 154 /* PropertyDeclaration */ ||
-                contextKind === 153 /* PropertySignature */ ||
-                contextKind === 151 /* Parameter */ ||
-                contextKind === 237 /* VariableDeclaration */ ||
+            return contextKind === 155 /* PropertyDeclaration */ ||
+                contextKind === 154 /* PropertySignature */ ||
+                contextKind === 152 /* Parameter */ ||
+                contextKind === 238 /* VariableDeclaration */ ||
                 ts.isFunctionLikeKind(contextKind);
         }
         function isConditionalOperatorContext(context) {
-            return context.contextNode.kind === 205 /* ConditionalExpression */ ||
-                context.contextNode.kind === 175 /* ConditionalType */;
+            return context.contextNode.kind === 206 /* ConditionalExpression */ ||
+                context.contextNode.kind === 176 /* ConditionalType */;
         }
         function isSameLineTokenOrBeforeBlockContext(context) {
             return context.TokensAreOnSameLine() || isBeforeBlockContext(context);
         }
         function isBraceWrappedContext(context) {
-            return context.contextNode.kind === 184 /* ObjectBindingPattern */ ||
-                context.contextNode.kind === 181 /* MappedType */ ||
+            return context.contextNode.kind === 185 /* ObjectBindingPattern */ ||
+                context.contextNode.kind === 182 /* MappedType */ ||
                 isSingleLineBlockContext(context);
         }
         // This check is done before an open brace in a control construct, a function, or a typescript block declaration
@@ -108609,31 +112221,31 @@ var ts;
                 return true;
             }
             switch (node.kind) {
-                case 218 /* Block */:
-                case 246 /* CaseBlock */:
-                case 188 /* ObjectLiteralExpression */:
-                case 245 /* ModuleBlock */:
+                case 219 /* Block */:
+                case 247 /* CaseBlock */:
+                case 189 /* ObjectLiteralExpression */:
+                case 246 /* ModuleBlock */:
                     return true;
             }
             return false;
         }
         function isFunctionDeclContext(context) {
             switch (context.contextNode.kind) {
-                case 239 /* FunctionDeclaration */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
+                case 240 /* FunctionDeclaration */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
                 // case SyntaxKind.MemberFunctionDeclaration:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                 // case SyntaxKind.MethodSignature:
-                case 160 /* CallSignature */:
-                case 196 /* FunctionExpression */:
-                case 157 /* Constructor */:
-                case 197 /* ArrowFunction */:
+                case 161 /* CallSignature */:
+                case 197 /* FunctionExpression */:
+                case 158 /* Constructor */:
+                case 198 /* ArrowFunction */:
                 // case SyntaxKind.ConstructorDeclaration:
                 // case SyntaxKind.SimpleArrowFunctionExpression:
                 // case SyntaxKind.ParenthesizedArrowFunctionExpression:
-                case 241 /* InterfaceDeclaration */: // This one is not truly a function, but for formatting purposes, it acts just like one
+                case 242 /* InterfaceDeclaration */: // This one is not truly a function, but for formatting purposes, it acts just like one
                     return true;
             }
             return false;
@@ -108642,40 +112254,40 @@ var ts;
             return !isFunctionDeclContext(context);
         }
         function isFunctionDeclarationOrFunctionExpressionContext(context) {
-            return context.contextNode.kind === 239 /* FunctionDeclaration */ || context.contextNode.kind === 196 /* FunctionExpression */;
+            return context.contextNode.kind === 240 /* FunctionDeclaration */ || context.contextNode.kind === 197 /* FunctionExpression */;
         }
         function isTypeScriptDeclWithBlockContext(context) {
             return nodeIsTypeScriptDeclWithBlockContext(context.contextNode);
         }
         function nodeIsTypeScriptDeclWithBlockContext(node) {
             switch (node.kind) {
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
-                case 241 /* InterfaceDeclaration */:
-                case 243 /* EnumDeclaration */:
-                case 168 /* TypeLiteral */:
-                case 244 /* ModuleDeclaration */:
-                case 255 /* ExportDeclaration */:
-                case 256 /* NamedExports */:
-                case 249 /* ImportDeclaration */:
-                case 252 /* NamedImports */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
+                case 242 /* InterfaceDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 169 /* TypeLiteral */:
+                case 245 /* ModuleDeclaration */:
+                case 256 /* ExportDeclaration */:
+                case 257 /* NamedExports */:
+                case 250 /* ImportDeclaration */:
+                case 253 /* NamedImports */:
                     return true;
             }
             return false;
         }
         function isAfterCodeBlockContext(context) {
             switch (context.currentTokenParent.kind) {
-                case 240 /* ClassDeclaration */:
-                case 244 /* ModuleDeclaration */:
-                case 243 /* EnumDeclaration */:
-                case 274 /* CatchClause */:
-                case 245 /* ModuleBlock */:
-                case 232 /* SwitchStatement */:
+                case 241 /* ClassDeclaration */:
+                case 245 /* ModuleDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 275 /* CatchClause */:
+                case 246 /* ModuleBlock */:
+                case 233 /* SwitchStatement */:
                     return true;
-                case 218 /* Block */: {
+                case 219 /* Block */: {
                     var blockParent = context.currentTokenParent.parent;
                     // In a codefix scenario, we can't rely on parents being set. So just always return true.
-                    if (!blockParent || blockParent.kind !== 197 /* ArrowFunction */ && blockParent.kind !== 196 /* FunctionExpression */) {
+                    if (!blockParent || blockParent.kind !== 198 /* ArrowFunction */ && blockParent.kind !== 197 /* FunctionExpression */) {
                         return true;
                     }
                 }
@@ -108684,31 +112296,31 @@ var ts;
         }
         function isControlDeclContext(context) {
             switch (context.contextNode.kind) {
-                case 222 /* IfStatement */:
-                case 232 /* SwitchStatement */:
-                case 225 /* ForStatement */:
-                case 226 /* ForInStatement */:
-                case 227 /* ForOfStatement */:
-                case 224 /* WhileStatement */:
-                case 235 /* TryStatement */:
-                case 223 /* DoStatement */:
-                case 231 /* WithStatement */:
+                case 223 /* IfStatement */:
+                case 233 /* SwitchStatement */:
+                case 226 /* ForStatement */:
+                case 227 /* ForInStatement */:
+                case 228 /* ForOfStatement */:
+                case 225 /* WhileStatement */:
+                case 236 /* TryStatement */:
+                case 224 /* DoStatement */:
+                case 232 /* WithStatement */:
                 // TODO
                 // case SyntaxKind.ElseClause:
-                case 274 /* CatchClause */:
+                case 275 /* CatchClause */:
                     return true;
                 default:
                     return false;
             }
         }
         function isObjectContext(context) {
-            return context.contextNode.kind === 188 /* ObjectLiteralExpression */;
+            return context.contextNode.kind === 189 /* ObjectLiteralExpression */;
         }
         function isFunctionCallContext(context) {
-            return context.contextNode.kind === 191 /* CallExpression */;
+            return context.contextNode.kind === 192 /* CallExpression */;
         }
         function isNewContext(context) {
-            return context.contextNode.kind === 192 /* NewExpression */;
+            return context.contextNode.kind === 193 /* NewExpression */;
         }
         function isFunctionCallOrNewContext(context) {
             return isFunctionCallContext(context) || isNewContext(context);
@@ -108720,28 +112332,28 @@ var ts;
             return context.nextTokenSpan.kind !== 23 /* CloseBracketToken */;
         }
         function isArrowFunctionContext(context) {
-            return context.contextNode.kind === 197 /* ArrowFunction */;
+            return context.contextNode.kind === 198 /* ArrowFunction */;
         }
         function isImportTypeContext(context) {
-            return context.contextNode.kind === 183 /* ImportType */;
+            return context.contextNode.kind === 184 /* ImportType */;
         }
         function isNonJsxSameLineTokenContext(context) {
             return context.TokensAreOnSameLine() && context.contextNode.kind !== 11 /* JsxText */;
         }
         function isNonJsxElementOrFragmentContext(context) {
-            return context.contextNode.kind !== 260 /* JsxElement */ && context.contextNode.kind !== 264 /* JsxFragment */;
+            return context.contextNode.kind !== 261 /* JsxElement */ && context.contextNode.kind !== 265 /* JsxFragment */;
         }
         function isJsxExpressionContext(context) {
-            return context.contextNode.kind === 270 /* JsxExpression */ || context.contextNode.kind === 269 /* JsxSpreadAttribute */;
+            return context.contextNode.kind === 271 /* JsxExpression */ || context.contextNode.kind === 270 /* JsxSpreadAttribute */;
         }
         function isNextTokenParentJsxAttribute(context) {
-            return context.nextTokenParent.kind === 267 /* JsxAttribute */;
+            return context.nextTokenParent.kind === 268 /* JsxAttribute */;
         }
         function isJsxAttributeContext(context) {
-            return context.contextNode.kind === 267 /* JsxAttribute */;
+            return context.contextNode.kind === 268 /* JsxAttribute */;
         }
         function isJsxSelfClosingElementContext(context) {
-            return context.contextNode.kind === 261 /* JsxSelfClosingElement */;
+            return context.contextNode.kind === 262 /* JsxSelfClosingElement */;
         }
         function isNotBeforeBlockInFunctionDeclarationContext(context) {
             return !isFunctionDeclContext(context) && !isBeforeBlockContext(context);
@@ -108756,45 +112368,45 @@ var ts;
             while (ts.isExpressionNode(node)) {
                 node = node.parent;
             }
-            return node.kind === 152 /* Decorator */;
+            return node.kind === 153 /* Decorator */;
         }
         function isStartOfVariableDeclarationList(context) {
-            return context.currentTokenParent.kind === 238 /* VariableDeclarationList */ &&
+            return context.currentTokenParent.kind === 239 /* VariableDeclarationList */ &&
                 context.currentTokenParent.getStart(context.sourceFile) === context.currentTokenSpan.pos;
         }
         function isNotFormatOnEnter(context) {
             return context.formattingRequestKind !== 2 /* FormatOnEnter */;
         }
         function isModuleDeclContext(context) {
-            return context.contextNode.kind === 244 /* ModuleDeclaration */;
+            return context.contextNode.kind === 245 /* ModuleDeclaration */;
         }
         function isObjectTypeContext(context) {
-            return context.contextNode.kind === 168 /* TypeLiteral */; // && context.contextNode.parent.kind !== SyntaxKind.InterfaceDeclaration;
+            return context.contextNode.kind === 169 /* TypeLiteral */; // && context.contextNode.parent.kind !== SyntaxKind.InterfaceDeclaration;
         }
         function isConstructorSignatureContext(context) {
-            return context.contextNode.kind === 161 /* ConstructSignature */;
+            return context.contextNode.kind === 162 /* ConstructSignature */;
         }
         function isTypeArgumentOrParameterOrAssertion(token, parent) {
             if (token.kind !== 28 /* LessThanToken */ && token.kind !== 30 /* GreaterThanToken */) {
                 return false;
             }
             switch (parent.kind) {
-                case 164 /* TypeReference */:
-                case 194 /* TypeAssertionExpression */:
-                case 242 /* TypeAliasDeclaration */:
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
-                case 241 /* InterfaceDeclaration */:
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
-                case 160 /* CallSignature */:
-                case 161 /* ConstructSignature */:
-                case 191 /* CallExpression */:
-                case 192 /* NewExpression */:
-                case 211 /* ExpressionWithTypeArguments */:
+                case 165 /* TypeReference */:
+                case 195 /* TypeAssertionExpression */:
+                case 243 /* TypeAliasDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
+                case 242 /* InterfaceDeclaration */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
+                case 161 /* CallSignature */:
+                case 162 /* ConstructSignature */:
+                case 192 /* CallExpression */:
+                case 193 /* NewExpression */:
+                case 212 /* ExpressionWithTypeArguments */:
                     return true;
                 default:
                     return false;
@@ -108805,16 +112417,16 @@ var ts;
                 isTypeArgumentOrParameterOrAssertion(context.nextTokenSpan, context.nextTokenParent);
         }
         function isTypeAssertionContext(context) {
-            return context.contextNode.kind === 194 /* TypeAssertionExpression */;
+            return context.contextNode.kind === 195 /* TypeAssertionExpression */;
         }
         function isVoidOpContext(context) {
-            return context.currentTokenSpan.kind === 106 /* VoidKeyword */ && context.currentTokenParent.kind === 200 /* VoidExpression */;
+            return context.currentTokenSpan.kind === 107 /* VoidKeyword */ && context.currentTokenParent.kind === 201 /* VoidExpression */;
         }
         function isYieldOrYieldStarWithOperand(context) {
-            return context.contextNode.kind === 207 /* YieldExpression */ && context.contextNode.expression !== undefined;
+            return context.contextNode.kind === 208 /* YieldExpression */ && context.contextNode.expression !== undefined;
         }
         function isNonNullAssertionContext(context) {
-            return context.contextNode.kind === 213 /* NonNullExpression */;
+            return context.contextNode.kind === 214 /* NonNullExpression */;
         }
     })(formatting = ts.formatting || (ts.formatting = {}));
 })(ts || (ts = {}));
@@ -108865,12 +112477,12 @@ var ts;
             return map;
         }
         function getRuleBucketIndex(row, column) {
-            ts.Debug.assert(row <= 147 /* LastKeyword */ && column <= 147 /* LastKeyword */, "Must compute formatting context from tokens");
+            ts.Debug.assert(row <= 148 /* LastKeyword */ && column <= 148 /* LastKeyword */, "Must compute formatting context from tokens");
             return (row * mapRowLength) + column;
         }
         var maskBitSize = 5;
         var mask = 31; // MaskBitSize bits
-        var mapRowLength = 147 /* LastToken */ + 1;
+        var mapRowLength = 148 /* LastToken */ + 1;
         var RulesPosition;
         (function (RulesPosition) {
             RulesPosition[RulesPosition["IgnoreRulesSpecific"] = 0] = "IgnoreRulesSpecific";
@@ -109048,17 +112660,17 @@ var ts;
         // i.e. parent is class declaration with the list of members and node is one of members.
         function isListElement(parent, node) {
             switch (parent.kind) {
-                case 240 /* ClassDeclaration */:
-                case 241 /* InterfaceDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 242 /* InterfaceDeclaration */:
                     return ts.rangeContainsRange(parent.members, node);
-                case 244 /* ModuleDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     var body = parent.body;
-                    return !!body && body.kind === 245 /* ModuleBlock */ && ts.rangeContainsRange(body.statements, node);
-                case 284 /* SourceFile */:
-                case 218 /* Block */:
-                case 245 /* ModuleBlock */:
+                    return !!body && body.kind === 246 /* ModuleBlock */ && ts.rangeContainsRange(body.statements, node);
+                case 285 /* SourceFile */:
+                case 219 /* Block */:
+                case 246 /* ModuleBlock */:
                     return ts.rangeContainsRange(parent.statements, node);
-                case 274 /* CatchClause */:
+                case 275 /* CatchClause */:
                     return ts.rangeContainsRange(parent.block.statements, node);
             }
             return false;
@@ -109267,6 +112879,9 @@ var ts;
                     else if (formatting.SmartIndenter.childStartsOnTheSameLineWithElseInIfStatement(parent, node, startLine, sourceFile)) {
                         return { indentation: parentDynamicIndentation.getIndentation(), delta: delta };
                     }
+                    else if (formatting.SmartIndenter.argumentStartsOnSameLineAsPreviousArgument(parent, node, startLine, sourceFile)) {
+                        return { indentation: parentDynamicIndentation.getIndentation(), delta: delta };
+                    }
                     else {
                         return { indentation: parentDynamicIndentation.getIndentation() + parentDynamicIndentation.getDelta(node), delta: delta };
                     }
@@ -109280,19 +112895,19 @@ var ts;
                     return node.modifiers[0].kind;
                 }
                 switch (node.kind) {
-                    case 240 /* ClassDeclaration */: return 76 /* ClassKeyword */;
-                    case 241 /* InterfaceDeclaration */: return 110 /* InterfaceKeyword */;
-                    case 239 /* FunctionDeclaration */: return 90 /* FunctionKeyword */;
-                    case 243 /* EnumDeclaration */: return 243 /* EnumDeclaration */;
-                    case 158 /* GetAccessor */: return 126 /* GetKeyword */;
-                    case 159 /* SetAccessor */: return 137 /* SetKeyword */;
-                    case 156 /* MethodDeclaration */:
+                    case 241 /* ClassDeclaration */: return 77 /* ClassKeyword */;
+                    case 242 /* InterfaceDeclaration */: return 111 /* InterfaceKeyword */;
+                    case 240 /* FunctionDeclaration */: return 91 /* FunctionKeyword */;
+                    case 244 /* EnumDeclaration */: return 244 /* EnumDeclaration */;
+                    case 159 /* GetAccessor */: return 127 /* GetKeyword */;
+                    case 160 /* SetAccessor */: return 138 /* SetKeyword */;
+                    case 157 /* MethodDeclaration */:
                         if (node.asteriskToken) {
                             return 40 /* AsteriskToken */;
                         }
                     // falls through
-                    case 154 /* PropertyDeclaration */:
-                    case 151 /* Parameter */:
+                    case 155 /* PropertyDeclaration */:
+                    case 152 /* Parameter */:
                         var name = ts.getNameOfDeclaration(node);
                         if (name) {
                             return name.kind;
@@ -109342,22 +112957,22 @@ var ts;
                         case 18 /* OpenBraceToken */:
                         case 19 /* CloseBraceToken */:
                         case 21 /* CloseParenToken */:
-                        case 83 /* ElseKeyword */:
-                        case 107 /* WhileKeyword */:
+                        case 84 /* ElseKeyword */:
+                        case 108 /* WhileKeyword */:
                         case 58 /* AtToken */:
                             return false;
                         case 42 /* SlashToken */:
                         case 30 /* GreaterThanToken */:
                             switch (container.kind) {
-                                case 262 /* JsxOpeningElement */:
-                                case 263 /* JsxClosingElement */:
-                                case 261 /* JsxSelfClosingElement */:
+                                case 263 /* JsxOpeningElement */:
+                                case 264 /* JsxClosingElement */:
+                                case 262 /* JsxSelfClosingElement */:
                                     return false;
                             }
                             break;
                         case 22 /* OpenBracketToken */:
                         case 23 /* CloseBracketToken */:
-                            if (container.kind !== 181 /* MappedType */) {
+                            if (container.kind !== 182 /* MappedType */) {
                                 return false;
                             }
                             break;
@@ -109449,7 +113064,7 @@ var ts;
                         consumeTokenAndAdvanceScanner(tokenInfo, node, parentDynamicIndentation, child);
                         return inheritedIndentation;
                     }
-                    var effectiveParentStartLine = child.kind === 152 /* Decorator */ ? childStartLine : undecoratedParentStartLine;
+                    var effectiveParentStartLine = child.kind === 153 /* Decorator */ ? childStartLine : undecoratedParentStartLine;
                     var childIndentation = computeIndentation(child, childStartLine, childIndentationAmount, node, parentDynamicIndentation, effectiveParentStartLine);
                     processNode(child, childContextNode, childStartLine, undecoratedChildStartLine, childIndentation.indentation, childIndentation.delta);
                     if (child.kind === 11 /* JsxText */) {
@@ -109457,7 +113072,7 @@ var ts;
                         indentMultilineCommentOrJsxText(range, childIndentation.indentation, /*firstLineIsIndented*/ true, /*indentFinalLine*/ false);
                     }
                     childContextNode = node;
-                    if (isFirstListItem && parent.kind === 187 /* ArrayLiteralExpression */ && inheritedIndentation === -1 /* Unknown */) {
+                    if (isFirstListItem && parent.kind === 188 /* ArrayLiteralExpression */ && inheritedIndentation === -1 /* Unknown */) {
                         inheritedIndentation = childIndentation.indentation;
                     }
                     return inheritedIndentation;
@@ -109875,12 +113490,12 @@ var ts;
         formatting.getRangeOfEnclosingComment = getRangeOfEnclosingComment;
         function getOpenTokenForList(node, list) {
             switch (node.kind) {
-                case 157 /* Constructor */:
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
-                case 197 /* ArrowFunction */:
+                case 158 /* Constructor */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
+                case 198 /* ArrowFunction */:
                     if (node.typeParameters === list) {
                         return 28 /* LessThanToken */;
                     }
@@ -109888,8 +113503,8 @@ var ts;
                         return 20 /* OpenParenToken */;
                     }
                     break;
-                case 191 /* CallExpression */:
-                case 192 /* NewExpression */:
+                case 192 /* CallExpression */:
+                case 193 /* NewExpression */:
                     if (node.typeArguments === list) {
                         return 28 /* LessThanToken */;
                     }
@@ -109897,12 +113512,12 @@ var ts;
                         return 20 /* OpenParenToken */;
                     }
                     break;
-                case 164 /* TypeReference */:
+                case 165 /* TypeReference */:
                     if (node.typeArguments === list) {
                         return 28 /* LessThanToken */;
                     }
                     break;
-                case 168 /* TypeLiteral */:
+                case 169 /* TypeLiteral */:
                     return 18 /* OpenBraceToken */;
             }
             return 0 /* Unknown */;
@@ -110019,7 +113634,7 @@ var ts;
                 if (options.indentStyle === ts.IndentStyle.Block) {
                     return getBlockIndent(sourceFile, position, options);
                 }
-                if (precedingToken.kind === 27 /* CommaToken */ && precedingToken.parent.kind !== 204 /* BinaryExpression */) {
+                if (precedingToken.kind === 27 /* CommaToken */ && precedingToken.parent.kind !== 205 /* BinaryExpression */) {
                     // previous token is comma that separates items in list - find the previous item and try to derive indentation from it
                     var actualIndentation = getActualIndentationForListItemBeforeComma(precedingToken, sourceFile, options);
                     if (actualIndentation !== -1 /* Unknown */) {
@@ -110173,7 +113788,7 @@ var ts;
                 // - parent is SourceFile - by default immediate children of SourceFile are not indented except when user indents them manually
                 // - parent and child are not on the same line
                 var useActualIndentation = (ts.isDeclaration(current) || ts.isStatementButNotDeclaration(current)) &&
-                    (parent.kind === 284 /* SourceFile */ || !parentAndChildShareLine);
+                    (parent.kind === 285 /* SourceFile */ || !parentAndChildShareLine);
                 if (!useActualIndentation) {
                     return -1 /* Unknown */;
                 }
@@ -110221,8 +113836,8 @@ var ts;
             }
             SmartIndenter.isArgumentAndStartLineOverlapsExpressionBeingCalled = isArgumentAndStartLineOverlapsExpressionBeingCalled;
             function childStartsOnTheSameLineWithElseInIfStatement(parent, child, childStartLine, sourceFile) {
-                if (parent.kind === 222 /* IfStatement */ && parent.elseStatement === child) {
-                    var elseKeyword = ts.findChildOfKind(parent, 83 /* ElseKeyword */, sourceFile);
+                if (parent.kind === 223 /* IfStatement */ && parent.elseStatement === child) {
+                    var elseKeyword = ts.findChildOfKind(parent, 84 /* ElseKeyword */, sourceFile);
                     ts.Debug.assert(elseKeyword !== undefined);
                     var elseKeywordStartLine = getStartLineAndCharacterForNode(elseKeyword, sourceFile).line;
                     return elseKeywordStartLine === childStartLine;
@@ -110230,6 +113845,23 @@ var ts;
                 return false;
             }
             SmartIndenter.childStartsOnTheSameLineWithElseInIfStatement = childStartsOnTheSameLineWithElseInIfStatement;
+            function argumentStartsOnSameLineAsPreviousArgument(parent, child, childStartLine, sourceFile) {
+                if (ts.isCallOrNewExpression(parent)) {
+                    if (!parent.arguments)
+                        return false;
+                    var currentNode = ts.Debug.assertDefined(ts.find(parent.arguments, function (arg) { return arg.pos === child.pos; }));
+                    var currentIndex = parent.arguments.indexOf(currentNode);
+                    if (currentIndex === 0)
+                        return false; // Can't look at previous node if first
+                    var previousNode = parent.arguments[currentIndex - 1];
+                    var lineOfPreviousNode = ts.getLineAndCharacterOfPosition(sourceFile, previousNode.getEnd()).line;
+                    if (childStartLine === lineOfPreviousNode) {
+                        return true;
+                    }
+                }
+                return false;
+            }
+            SmartIndenter.argumentStartsOnSameLineAsPreviousArgument = argumentStartsOnSameLineAsPreviousArgument;
             function getContainingList(node, sourceFile) {
                 return node.parent && getListByRange(node.getStart(sourceFile), node.getEnd(), node.parent, sourceFile);
             }
@@ -110239,40 +113871,40 @@ var ts;
             }
             function getListByRange(start, end, node, sourceFile) {
                 switch (node.kind) {
-                    case 164 /* TypeReference */:
+                    case 165 /* TypeReference */:
                         return getList(node.typeArguments);
-                    case 188 /* ObjectLiteralExpression */:
+                    case 189 /* ObjectLiteralExpression */:
                         return getList(node.properties);
-                    case 187 /* ArrayLiteralExpression */:
+                    case 188 /* ArrayLiteralExpression */:
                         return getList(node.elements);
-                    case 168 /* TypeLiteral */:
+                    case 169 /* TypeLiteral */:
                         return getList(node.members);
-                    case 239 /* FunctionDeclaration */:
-                    case 196 /* FunctionExpression */:
-                    case 197 /* ArrowFunction */:
-                    case 156 /* MethodDeclaration */:
-                    case 155 /* MethodSignature */:
-                    case 160 /* CallSignature */:
-                    case 157 /* Constructor */:
-                    case 166 /* ConstructorType */:
-                    case 161 /* ConstructSignature */:
+                    case 240 /* FunctionDeclaration */:
+                    case 197 /* FunctionExpression */:
+                    case 198 /* ArrowFunction */:
+                    case 157 /* MethodDeclaration */:
+                    case 156 /* MethodSignature */:
+                    case 161 /* CallSignature */:
+                    case 158 /* Constructor */:
+                    case 167 /* ConstructorType */:
+                    case 162 /* ConstructSignature */:
                         return getList(node.typeParameters) || getList(node.parameters);
-                    case 240 /* ClassDeclaration */:
-                    case 209 /* ClassExpression */:
-                    case 241 /* InterfaceDeclaration */:
-                    case 242 /* TypeAliasDeclaration */:
-                    case 308 /* JSDocTemplateTag */:
+                    case 241 /* ClassDeclaration */:
+                    case 210 /* ClassExpression */:
+                    case 242 /* InterfaceDeclaration */:
+                    case 243 /* TypeAliasDeclaration */:
+                    case 310 /* JSDocTemplateTag */:
                         return getList(node.typeParameters);
-                    case 192 /* NewExpression */:
-                    case 191 /* CallExpression */:
+                    case 193 /* NewExpression */:
+                    case 192 /* CallExpression */:
                         return getList(node.typeArguments) || getList(node.arguments);
-                    case 238 /* VariableDeclarationList */:
+                    case 239 /* VariableDeclarationList */:
                         return getList(node.declarations);
-                    case 252 /* NamedImports */:
-                    case 256 /* NamedExports */:
+                    case 253 /* NamedImports */:
+                    case 257 /* NamedExports */:
                         return getList(node.elements);
-                    case 184 /* ObjectBindingPattern */:
-                    case 185 /* ArrayBindingPattern */:
+                    case 185 /* ObjectBindingPattern */:
+                    case 186 /* ArrayBindingPattern */:
                         return getList(node.elements);
                 }
                 function getList(list) {
@@ -110295,7 +113927,7 @@ var ts;
                 return findColumnForFirstNonWhitespaceCharacterInLine(sourceFile.getLineAndCharacterOfPosition(list.pos), sourceFile, options);
             }
             function getActualIndentationForListItem(node, sourceFile, options, listIndentsChild) {
-                if (node.parent && node.parent.kind === 238 /* VariableDeclarationList */) {
+                if (node.parent && node.parent.kind === 239 /* VariableDeclarationList */) {
                     // VariableDeclarationList has no wrapping tokens
                     return -1 /* Unknown */;
                 }
@@ -110368,83 +114000,83 @@ var ts;
             function nodeWillIndentChild(settings, parent, child, sourceFile, indentByDefault) {
                 var childKind = child ? child.kind : 0 /* Unknown */;
                 switch (parent.kind) {
-                    case 221 /* ExpressionStatement */:
-                    case 240 /* ClassDeclaration */:
-                    case 209 /* ClassExpression */:
-                    case 241 /* InterfaceDeclaration */:
-                    case 243 /* EnumDeclaration */:
-                    case 242 /* TypeAliasDeclaration */:
-                    case 187 /* ArrayLiteralExpression */:
-                    case 218 /* Block */:
-                    case 245 /* ModuleBlock */:
-                    case 188 /* ObjectLiteralExpression */:
-                    case 168 /* TypeLiteral */:
-                    case 181 /* MappedType */:
-                    case 170 /* TupleType */:
-                    case 246 /* CaseBlock */:
-                    case 272 /* DefaultClause */:
-                    case 271 /* CaseClause */:
-                    case 195 /* ParenthesizedExpression */:
-                    case 189 /* PropertyAccessExpression */:
-                    case 191 /* CallExpression */:
-                    case 192 /* NewExpression */:
-                    case 219 /* VariableStatement */:
-                    case 254 /* ExportAssignment */:
-                    case 230 /* ReturnStatement */:
-                    case 205 /* ConditionalExpression */:
-                    case 185 /* ArrayBindingPattern */:
-                    case 184 /* ObjectBindingPattern */:
-                    case 262 /* JsxOpeningElement */:
-                    case 265 /* JsxOpeningFragment */:
-                    case 261 /* JsxSelfClosingElement */:
-                    case 270 /* JsxExpression */:
-                    case 155 /* MethodSignature */:
-                    case 160 /* CallSignature */:
-                    case 161 /* ConstructSignature */:
-                    case 151 /* Parameter */:
-                    case 165 /* FunctionType */:
-                    case 166 /* ConstructorType */:
-                    case 177 /* ParenthesizedType */:
-                    case 193 /* TaggedTemplateExpression */:
-                    case 201 /* AwaitExpression */:
-                    case 256 /* NamedExports */:
-                    case 252 /* NamedImports */:
-                    case 257 /* ExportSpecifier */:
-                    case 253 /* ImportSpecifier */:
-                    case 154 /* PropertyDeclaration */:
+                    case 222 /* ExpressionStatement */:
+                    case 241 /* ClassDeclaration */:
+                    case 210 /* ClassExpression */:
+                    case 242 /* InterfaceDeclaration */:
+                    case 244 /* EnumDeclaration */:
+                    case 243 /* TypeAliasDeclaration */:
+                    case 188 /* ArrayLiteralExpression */:
+                    case 219 /* Block */:
+                    case 246 /* ModuleBlock */:
+                    case 189 /* ObjectLiteralExpression */:
+                    case 169 /* TypeLiteral */:
+                    case 182 /* MappedType */:
+                    case 171 /* TupleType */:
+                    case 247 /* CaseBlock */:
+                    case 273 /* DefaultClause */:
+                    case 272 /* CaseClause */:
+                    case 196 /* ParenthesizedExpression */:
+                    case 190 /* PropertyAccessExpression */:
+                    case 192 /* CallExpression */:
+                    case 193 /* NewExpression */:
+                    case 220 /* VariableStatement */:
+                    case 255 /* ExportAssignment */:
+                    case 231 /* ReturnStatement */:
+                    case 206 /* ConditionalExpression */:
+                    case 186 /* ArrayBindingPattern */:
+                    case 185 /* ObjectBindingPattern */:
+                    case 263 /* JsxOpeningElement */:
+                    case 266 /* JsxOpeningFragment */:
+                    case 262 /* JsxSelfClosingElement */:
+                    case 271 /* JsxExpression */:
+                    case 156 /* MethodSignature */:
+                    case 161 /* CallSignature */:
+                    case 162 /* ConstructSignature */:
+                    case 152 /* Parameter */:
+                    case 166 /* FunctionType */:
+                    case 167 /* ConstructorType */:
+                    case 178 /* ParenthesizedType */:
+                    case 194 /* TaggedTemplateExpression */:
+                    case 202 /* AwaitExpression */:
+                    case 257 /* NamedExports */:
+                    case 253 /* NamedImports */:
+                    case 258 /* ExportSpecifier */:
+                    case 254 /* ImportSpecifier */:
+                    case 155 /* PropertyDeclaration */:
                         return true;
-                    case 237 /* VariableDeclaration */:
-                    case 275 /* PropertyAssignment */:
-                        if (!settings.indentMultiLineObjectLiteralBeginningOnBlankLine && sourceFile && childKind === 188 /* ObjectLiteralExpression */) { // TODO: GH#18217
+                    case 238 /* VariableDeclaration */:
+                    case 276 /* PropertyAssignment */:
+                        if (!settings.indentMultiLineObjectLiteralBeginningOnBlankLine && sourceFile && childKind === 189 /* ObjectLiteralExpression */) { // TODO: GH#18217
                             return rangeIsOnOneLine(sourceFile, child);
                         }
                         return true;
-                    case 223 /* DoStatement */:
-                    case 224 /* WhileStatement */:
-                    case 226 /* ForInStatement */:
-                    case 227 /* ForOfStatement */:
-                    case 225 /* ForStatement */:
-                    case 222 /* IfStatement */:
-                    case 239 /* FunctionDeclaration */:
-                    case 196 /* FunctionExpression */:
-                    case 156 /* MethodDeclaration */:
-                    case 197 /* ArrowFunction */:
-                    case 157 /* Constructor */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
-                        return childKind !== 218 /* Block */;
-                    case 255 /* ExportDeclaration */:
-                        return childKind !== 256 /* NamedExports */;
-                    case 249 /* ImportDeclaration */:
-                        return childKind !== 250 /* ImportClause */ ||
-                            (!!child.namedBindings && child.namedBindings.kind !== 252 /* NamedImports */);
-                    case 260 /* JsxElement */:
-                        return childKind !== 263 /* JsxClosingElement */;
-                    case 264 /* JsxFragment */:
-                        return childKind !== 266 /* JsxClosingFragment */;
-                    case 174 /* IntersectionType */:
-                    case 173 /* UnionType */:
-                        if (childKind === 168 /* TypeLiteral */) {
+                    case 224 /* DoStatement */:
+                    case 225 /* WhileStatement */:
+                    case 227 /* ForInStatement */:
+                    case 228 /* ForOfStatement */:
+                    case 226 /* ForStatement */:
+                    case 223 /* IfStatement */:
+                    case 240 /* FunctionDeclaration */:
+                    case 197 /* FunctionExpression */:
+                    case 157 /* MethodDeclaration */:
+                    case 198 /* ArrowFunction */:
+                    case 158 /* Constructor */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
+                        return childKind !== 219 /* Block */;
+                    case 256 /* ExportDeclaration */:
+                        return childKind !== 257 /* NamedExports */;
+                    case 250 /* ImportDeclaration */:
+                        return childKind !== 251 /* ImportClause */ ||
+                            (!!child.namedBindings && child.namedBindings.kind !== 253 /* NamedImports */);
+                    case 261 /* JsxElement */:
+                        return childKind !== 264 /* JsxClosingElement */;
+                    case 265 /* JsxFragment */:
+                        return childKind !== 267 /* JsxClosingFragment */;
+                    case 175 /* IntersectionType */:
+                    case 174 /* UnionType */:
+                        if (childKind === 169 /* TypeLiteral */) {
                             return false;
                         }
                     // falls through
@@ -110455,11 +114087,11 @@ var ts;
             SmartIndenter.nodeWillIndentChild = nodeWillIndentChild;
             function isControlFlowEndingStatement(kind, parent) {
                 switch (kind) {
-                    case 230 /* ReturnStatement */:
-                    case 234 /* ThrowStatement */:
-                    case 228 /* ContinueStatement */:
-                    case 229 /* BreakStatement */:
-                        return parent.kind !== 218 /* Block */;
+                    case 231 /* ReturnStatement */:
+                    case 235 /* ThrowStatement */:
+                    case 229 /* ContinueStatement */:
+                    case 230 /* BreakStatement */:
+                        return parent.kind !== 219 /* Block */;
                     default:
                         return false;
                 }
@@ -110601,7 +114233,7 @@ var ts;
          * Checks if 'candidate' argument is a legal separator in the list that contains 'node' as an element
          */
         function isSeparator(node, candidate) {
-            return !!candidate && !!node.parent && (candidate.kind === 27 /* CommaToken */ || (candidate.kind === 26 /* SemicolonToken */ && node.parent.kind === 188 /* ObjectLiteralExpression */));
+            return !!candidate && !!node.parent && (candidate.kind === 27 /* CommaToken */ || (candidate.kind === 26 /* SemicolonToken */ && node.parent.kind === 189 /* ObjectLiteralExpression */));
         }
         function spaces(count) {
             var s = "";
@@ -110610,6 +114242,10 @@ var ts;
             }
             return s;
         }
+        function isThisTypeAnnotatable(containingFunction) {
+            return ts.isFunctionExpression(containingFunction) || ts.isFunctionDeclaration(containingFunction);
+        }
+        textChanges_3.isThisTypeAnnotatable = isThisTypeAnnotatable;
         var ChangeTracker = /** @class */ (function () {
             /** Public for tests only. Other callers should use `ChangeTracker.with`. */
             function ChangeTracker(newLineCharacter, formatContext) {
@@ -110762,10 +114398,15 @@ var ts;
                     }
                 }
                 else {
-                    endNode = node.kind !== 237 /* VariableDeclaration */ && node.questionToken ? node.questionToken : node.name;
+                    endNode = node.kind !== 238 /* VariableDeclaration */ && node.questionToken ? node.questionToken : node.name;
                 }
                 this.insertNodeAt(sourceFile, endNode.end, type, { prefix: ": " });
             };
+            ChangeTracker.prototype.tryInsertThisTypeAnnotation = function (sourceFile, node, type) {
+                var start = ts.findChildOfKind(node, 20 /* OpenParenToken */, sourceFile).getStart(sourceFile) + 1;
+                var suffix = node.parameters.length ? ", " : "";
+                this.insertNodeAt(sourceFile, start, type, { prefix: "this: ", suffix: suffix });
+            };
             ChangeTracker.prototype.insertTypeParameters = function (sourceFile, node, typeParameters) {
                 // If no `(`, is an arrow function `x => x`, so use the pos of the first parameter
                 var start = (ts.findChildOfKind(node, 20 /* OpenParenToken */, sourceFile) || ts.first(node.parameters)).getStart(sourceFile);
@@ -110874,18 +114515,18 @@ var ts;
             };
             ChangeTracker.prototype.getInsertNodeAfterOptionsWorker = function (node) {
                 switch (node.kind) {
-                    case 240 /* ClassDeclaration */:
-                    case 244 /* ModuleDeclaration */:
+                    case 241 /* ClassDeclaration */:
+                    case 245 /* ModuleDeclaration */:
                         return { prefix: this.newLineCharacter, suffix: this.newLineCharacter };
-                    case 237 /* VariableDeclaration */:
+                    case 238 /* VariableDeclaration */:
                     case 10 /* StringLiteral */:
-                    case 72 /* Identifier */:
+                    case 73 /* Identifier */:
                         return { prefix: ", " };
-                    case 275 /* PropertyAssignment */:
+                    case 276 /* PropertyAssignment */:
                         return { suffix: "," + this.newLineCharacter };
-                    case 85 /* ExportKeyword */:
+                    case 86 /* ExportKeyword */:
                         return { prefix: " " };
-                    case 151 /* Parameter */:
+                    case 152 /* Parameter */:
                         return {};
                     default:
                         ts.Debug.assert(ts.isStatement(node) || ts.isClassOrTypeElement(node)); // Else we haven't handled this kind of node yet -- add it
@@ -110894,12 +114535,12 @@ var ts;
             };
             ChangeTracker.prototype.insertName = function (sourceFile, node, name) {
                 ts.Debug.assert(!node.name);
-                if (node.kind === 197 /* ArrowFunction */) {
+                if (node.kind === 198 /* ArrowFunction */) {
                     var arrow = ts.findChildOfKind(node, 37 /* EqualsGreaterThanToken */, sourceFile);
                     var lparen = ts.findChildOfKind(node, 20 /* OpenParenToken */, sourceFile);
                     if (lparen) {
                         // `() => {}` --> `function f() {}`
-                        this.insertNodesAt(sourceFile, lparen.getStart(sourceFile), [ts.createToken(90 /* FunctionKeyword */), ts.createIdentifier(name)], { joiner: " " });
+                        this.insertNodesAt(sourceFile, lparen.getStart(sourceFile), [ts.createToken(91 /* FunctionKeyword */), ts.createIdentifier(name)], { joiner: " " });
                         deleteNode(this, sourceFile, arrow);
                     }
                     else {
@@ -110908,14 +114549,14 @@ var ts;
                         // Replacing full range of arrow to get rid of the leading space -- replace ` =>` with `)`
                         this.replaceRange(sourceFile, arrow, ts.createToken(21 /* CloseParenToken */));
                     }
-                    if (node.body.kind !== 218 /* Block */) {
+                    if (node.body.kind !== 219 /* Block */) {
                         // `() => 0` => `function f() { return 0; }`
-                        this.insertNodesAt(sourceFile, node.body.getStart(sourceFile), [ts.createToken(18 /* OpenBraceToken */), ts.createToken(97 /* ReturnKeyword */)], { joiner: " ", suffix: " " });
+                        this.insertNodesAt(sourceFile, node.body.getStart(sourceFile), [ts.createToken(18 /* OpenBraceToken */), ts.createToken(98 /* ReturnKeyword */)], { joiner: " ", suffix: " " });
                         this.insertNodesAt(sourceFile, node.body.end, [ts.createToken(26 /* SemicolonToken */), ts.createToken(19 /* CloseBraceToken */)], { joiner: " " });
                     }
                 }
                 else {
-                    var pos = ts.findChildOfKind(node, node.kind === 196 /* FunctionExpression */ ? 90 /* FunctionKeyword */ : 76 /* ClassKeyword */, sourceFile).end;
+                    var pos = ts.findChildOfKind(node, node.kind === 197 /* FunctionExpression */ ? 91 /* FunctionKeyword */ : 77 /* ClassKeyword */, sourceFile).end;
                     this.insertNodeAt(sourceFile, pos, ts.createIdentifier(name), { prefix: " " });
                 }
             };
@@ -111034,6 +114675,9 @@ var ts;
                     }
                 }
             };
+            ChangeTracker.prototype.parenthesizeExpression = function (sourceFile, expression) {
+                this.replaceRange(sourceFile, ts.rangeOfNode(expression), ts.createParen(expression));
+            };
             ChangeTracker.prototype.finishClassesWithNodesInsertedAtStart = function () {
                 var _this = this;
                 this.classesWithNodesInsertedAtStart.forEach(function (_a) {
@@ -111142,7 +114786,7 @@ var ts;
             function newFileChangesWorker(oldFile, scriptKind, statements, newLineCharacter, formatContext) {
                 // TODO: this emits the file, parses it back, then formats it that -- may be a less roundabout way to do this
                 var nonFormattedText = statements.map(function (s) { return getNonformattedText(s, oldFile, newLineCharacter).text; }).join(newLineCharacter);
-                var sourceFile = ts.createSourceFile("any file name", nonFormattedText, 7 /* ESNext */, /*setParentNodes*/ true, scriptKind);
+                var sourceFile = ts.createSourceFile("any file name", nonFormattedText, 99 /* ESNext */, /*setParentNodes*/ true, scriptKind);
                 var changes = ts.formatting.formatDocument(sourceFile, formatContext);
                 return applyChanges(nonFormattedText, changes) + newLineCharacter;
             }
@@ -111182,9 +114826,10 @@ var ts;
             }
             /** Note: output node may be mutated input node. */
             function getNonformattedText(node, sourceFile, newLineCharacter) {
-                var writer = new Writer(newLineCharacter);
+                var omitTrailingSemicolon = !!sourceFile && !ts.probablyUsesSemicolons(sourceFile);
+                var writer = createWriter(newLineCharacter, omitTrailingSemicolon);
                 var newLine = newLineCharacter === "\n" ? 1 /* LineFeed */ : 0 /* CarriageReturnLineFeed */;
-                ts.createPrinter({ newLine: newLine, neverAsciiEscape: true }, writer).writeNode(4 /* Unspecified */, node, sourceFile, writer);
+                ts.createPrinter({ newLine: newLine, neverAsciiEscape: true, omitTrailingSemicolon: omitTrailingSemicolon }, writer).writeNode(4 /* Unspecified */, node, sourceFile, writer);
                 return { text: writer.getText(), node: assignPositionsToNode(node) };
             }
             changesToText.getNonformattedText = getNonformattedText;
@@ -111219,136 +114864,162 @@ var ts;
             nodeArray.end = getEnd(nodes);
             return nodeArray;
         }
-        var Writer = /** @class */ (function () {
-            function Writer(newLine) {
-                var _this = this;
-                this.lastNonTriviaPosition = 0;
-                this.writer = ts.createTextWriter(newLine);
-                this.onEmitNode = function (hint, node, printCallback) {
-                    if (node) {
-                        setPos(node, _this.lastNonTriviaPosition);
-                    }
-                    printCallback(hint, node);
-                    if (node) {
-                        setEnd(node, _this.lastNonTriviaPosition);
-                    }
-                };
-                this.onBeforeEmitNodeArray = function (nodes) {
-                    if (nodes) {
-                        setPos(nodes, _this.lastNonTriviaPosition);
-                    }
-                };
-                this.onAfterEmitNodeArray = function (nodes) {
-                    if (nodes) {
-                        setEnd(nodes, _this.lastNonTriviaPosition);
-                    }
-                };
-                this.onBeforeEmitToken = function (node) {
-                    if (node) {
-                        setPos(node, _this.lastNonTriviaPosition);
-                    }
-                };
-                this.onAfterEmitToken = function (node) {
-                    if (node) {
-                        setEnd(node, _this.lastNonTriviaPosition);
-                    }
-                };
-            }
-            Writer.prototype.setLastNonTriviaPosition = function (s, force) {
+        function createWriter(newLine, omitTrailingSemicolon) {
+            var lastNonTriviaPosition = 0;
+            var writer = omitTrailingSemicolon ? ts.getTrailingSemicolonOmittingWriter(ts.createTextWriter(newLine)) : ts.createTextWriter(newLine);
+            var onEmitNode = function (hint, node, printCallback) {
+                if (node) {
+                    setPos(node, lastNonTriviaPosition);
+                }
+                printCallback(hint, node);
+                if (node) {
+                    setEnd(node, lastNonTriviaPosition);
+                }
+            };
+            var onBeforeEmitNodeArray = function (nodes) {
+                if (nodes) {
+                    setPos(nodes, lastNonTriviaPosition);
+                }
+            };
+            var onAfterEmitNodeArray = function (nodes) {
+                if (nodes) {
+                    setEnd(nodes, lastNonTriviaPosition);
+                }
+            };
+            var onBeforeEmitToken = function (node) {
+                if (node) {
+                    setPos(node, lastNonTriviaPosition);
+                }
+            };
+            var onAfterEmitToken = function (node) {
+                if (node) {
+                    setEnd(node, lastNonTriviaPosition);
+                }
+            };
+            function setLastNonTriviaPosition(s, force) {
                 if (force || !isTrivia(s)) {
-                    this.lastNonTriviaPosition = this.writer.getTextPos();
+                    lastNonTriviaPosition = writer.getTextPos();
                     var i = 0;
                     while (ts.isWhiteSpaceLike(s.charCodeAt(s.length - i - 1))) {
                         i++;
                     }
                     // trim trailing whitespaces
-                    this.lastNonTriviaPosition -= i;
+                    lastNonTriviaPosition -= i;
                 }
+            }
+            function write(s) {
+                writer.write(s);
+                setLastNonTriviaPosition(s, /*force*/ false);
+            }
+            function writeComment(s) {
+                writer.writeComment(s);
+            }
+            function writeKeyword(s) {
+                writer.writeKeyword(s);
+                setLastNonTriviaPosition(s, /*force*/ false);
+            }
+            function writeOperator(s) {
+                writer.writeOperator(s);
+                setLastNonTriviaPosition(s, /*force*/ false);
+            }
+            function writePunctuation(s) {
+                writer.writePunctuation(s);
+                setLastNonTriviaPosition(s, /*force*/ false);
+            }
+            function writeTrailingSemicolon(s) {
+                writer.writeTrailingSemicolon(s);
+                setLastNonTriviaPosition(s, /*force*/ false);
+            }
+            function writeParameter(s) {
+                writer.writeParameter(s);
+                setLastNonTriviaPosition(s, /*force*/ false);
+            }
+            function writeProperty(s) {
+                writer.writeProperty(s);
+                setLastNonTriviaPosition(s, /*force*/ false);
+            }
+            function writeSpace(s) {
+                writer.writeSpace(s);
+                setLastNonTriviaPosition(s, /*force*/ false);
+            }
+            function writeStringLiteral(s) {
+                writer.writeStringLiteral(s);
+                setLastNonTriviaPosition(s, /*force*/ false);
+            }
+            function writeSymbol(s, sym) {
+                writer.writeSymbol(s, sym);
+                setLastNonTriviaPosition(s, /*force*/ false);
+            }
+            function writeLine() {
+                writer.writeLine();
+            }
+            function increaseIndent() {
+                writer.increaseIndent();
+            }
+            function decreaseIndent() {
+                writer.decreaseIndent();
+            }
+            function getText() {
+                return writer.getText();
+            }
+            function rawWrite(s) {
+                writer.rawWrite(s);
+                setLastNonTriviaPosition(s, /*force*/ false);
+            }
+            function writeLiteral(s) {
+                writer.writeLiteral(s);
+                setLastNonTriviaPosition(s, /*force*/ true);
+            }
+            function getTextPos() {
+                return writer.getTextPos();
+            }
+            function getLine() {
+                return writer.getLine();
+            }
+            function getColumn() {
+                return writer.getColumn();
+            }
+            function getIndent() {
+                return writer.getIndent();
+            }
+            function isAtStartOfLine() {
+                return writer.isAtStartOfLine();
+            }
+            function clear() {
+                writer.clear();
+                lastNonTriviaPosition = 0;
+            }
+            return {
+                onEmitNode: onEmitNode,
+                onBeforeEmitNodeArray: onBeforeEmitNodeArray,
+                onAfterEmitNodeArray: onAfterEmitNodeArray,
+                onBeforeEmitToken: onBeforeEmitToken,
+                onAfterEmitToken: onAfterEmitToken,
+                write: write,
+                writeComment: writeComment,
+                writeKeyword: writeKeyword,
+                writeOperator: writeOperator,
+                writePunctuation: writePunctuation,
+                writeTrailingSemicolon: writeTrailingSemicolon,
+                writeParameter: writeParameter,
+                writeProperty: writeProperty,
+                writeSpace: writeSpace,
+                writeStringLiteral: writeStringLiteral,
+                writeSymbol: writeSymbol,
+                writeLine: writeLine,
+                increaseIndent: increaseIndent,
+                decreaseIndent: decreaseIndent,
+                getText: getText,
+                rawWrite: rawWrite,
+                writeLiteral: writeLiteral,
+                getTextPos: getTextPos,
+                getLine: getLine,
+                getColumn: getColumn,
+                getIndent: getIndent,
+                isAtStartOfLine: isAtStartOfLine,
+                clear: clear
             };
-            Writer.prototype.write = function (s) {
-                this.writer.write(s);
-                this.setLastNonTriviaPosition(s, /*force*/ false);
-            };
-            Writer.prototype.writeComment = function (s) {
-                this.writer.writeComment(s);
-            };
-            Writer.prototype.writeKeyword = function (s) {
-                this.writer.writeKeyword(s);
-                this.setLastNonTriviaPosition(s, /*force*/ false);
-            };
-            Writer.prototype.writeOperator = function (s) {
-                this.writer.writeOperator(s);
-                this.setLastNonTriviaPosition(s, /*force*/ false);
-            };
-            Writer.prototype.writePunctuation = function (s) {
-                this.writer.writePunctuation(s);
-                this.setLastNonTriviaPosition(s, /*force*/ false);
-            };
-            Writer.prototype.writeTrailingSemicolon = function (s) {
-                this.writer.writeTrailingSemicolon(s);
-                this.setLastNonTriviaPosition(s, /*force*/ false);
-            };
-            Writer.prototype.writeParameter = function (s) {
-                this.writer.writeParameter(s);
-                this.setLastNonTriviaPosition(s, /*force*/ false);
-            };
-            Writer.prototype.writeProperty = function (s) {
-                this.writer.writeProperty(s);
-                this.setLastNonTriviaPosition(s, /*force*/ false);
-            };
-            Writer.prototype.writeSpace = function (s) {
-                this.writer.writeSpace(s);
-                this.setLastNonTriviaPosition(s, /*force*/ false);
-            };
-            Writer.prototype.writeStringLiteral = function (s) {
-                this.writer.writeStringLiteral(s);
-                this.setLastNonTriviaPosition(s, /*force*/ false);
-            };
-            Writer.prototype.writeSymbol = function (s, sym) {
-                this.writer.writeSymbol(s, sym);
-                this.setLastNonTriviaPosition(s, /*force*/ false);
-            };
-            Writer.prototype.writeLine = function () {
-                this.writer.writeLine();
-            };
-            Writer.prototype.increaseIndent = function () {
-                this.writer.increaseIndent();
-            };
-            Writer.prototype.decreaseIndent = function () {
-                this.writer.decreaseIndent();
-            };
-            Writer.prototype.getText = function () {
-                return this.writer.getText();
-            };
-            Writer.prototype.rawWrite = function (s) {
-                this.writer.rawWrite(s);
-                this.setLastNonTriviaPosition(s, /*force*/ false);
-            };
-            Writer.prototype.writeLiteral = function (s) {
-                this.writer.writeLiteral(s);
-                this.setLastNonTriviaPosition(s, /*force*/ true);
-            };
-            Writer.prototype.getTextPos = function () {
-                return this.writer.getTextPos();
-            };
-            Writer.prototype.getLine = function () {
-                return this.writer.getLine();
-            };
-            Writer.prototype.getColumn = function () {
-                return this.writer.getColumn();
-            };
-            Writer.prototype.getIndent = function () {
-                return this.writer.getIndent();
-            };
-            Writer.prototype.isAtStartOfLine = function () {
-                return this.writer.isAtStartOfLine();
-            };
-            Writer.prototype.clear = function () {
-                this.writer.clear();
-                this.lastNonTriviaPosition = 0;
-            };
-            return Writer;
-        }());
+        }
         function getInsertionPositionAtSourceFileTop(sourceFile) {
             var lastPrologue;
             for (var _i = 0, _a = sourceFile.statements; _i < _a.length; _i++) {
@@ -111410,14 +115081,14 @@ var ts;
         }
         textChanges_3.isValidLocationToAddComment = isValidLocationToAddComment;
         function needSemicolonBetween(a, b) {
-            return (ts.isPropertySignature(a) || ts.isPropertyDeclaration(a)) && ts.isClassOrTypeElement(b) && b.name.kind === 149 /* ComputedPropertyName */
+            return (ts.isPropertySignature(a) || ts.isPropertyDeclaration(a)) && ts.isClassOrTypeElement(b) && b.name.kind === 150 /* ComputedPropertyName */
                 || ts.isStatementButNotDeclaration(a) && ts.isStatementButNotDeclaration(b); // TODO: only if b would start with a `(` or `[`
         }
         var deleteDeclaration;
         (function (deleteDeclaration_1) {
             function deleteDeclaration(changes, deletedNodesInLists, sourceFile, node) {
                 switch (node.kind) {
-                    case 151 /* Parameter */: {
+                    case 152 /* Parameter */: {
                         var oldFunction = node.parent;
                         if (ts.isArrowFunction(oldFunction) &&
                             oldFunction.parameters.length === 1 &&
@@ -111432,14 +115103,14 @@ var ts;
                         }
                         break;
                     }
-                    case 249 /* ImportDeclaration */:
+                    case 250 /* ImportDeclaration */:
                         deleteNode(changes, sourceFile, node, 
                         // For first import, leave header comment in place
                         node === sourceFile.imports[0].parent ? { leadingTriviaOption: LeadingTriviaOption.Exclude } : undefined);
                         break;
-                    case 186 /* BindingElement */:
+                    case 187 /* BindingElement */:
                         var pattern = node.parent;
-                        var preserveComma = pattern.kind === 185 /* ArrayBindingPattern */ && node !== ts.last(pattern.elements);
+                        var preserveComma = pattern.kind === 186 /* ArrayBindingPattern */ && node !== ts.last(pattern.elements);
                         if (preserveComma) {
                             deleteNode(changes, sourceFile, node);
                         }
@@ -111447,13 +115118,13 @@ var ts;
                             deleteNodeInList(changes, deletedNodesInLists, sourceFile, node);
                         }
                         break;
-                    case 237 /* VariableDeclaration */:
+                    case 238 /* VariableDeclaration */:
                         deleteVariableDeclaration(changes, deletedNodesInLists, sourceFile, node);
                         break;
-                    case 150 /* TypeParameter */:
+                    case 151 /* TypeParameter */:
                         deleteNodeInList(changes, deletedNodesInLists, sourceFile, node);
                         break;
-                    case 253 /* ImportSpecifier */:
+                    case 254 /* ImportSpecifier */:
                         var namedImports = node.parent;
                         if (namedImports.elements.length === 1) {
                             deleteImportBinding(changes, sourceFile, namedImports);
@@ -111462,7 +115133,7 @@ var ts;
                             deleteNodeInList(changes, deletedNodesInLists, sourceFile, node);
                         }
                         break;
-                    case 251 /* NamespaceImport */:
+                    case 252 /* NamespaceImport */:
                         deleteImportBinding(changes, sourceFile, node);
                         break;
                     default:
@@ -111509,13 +115180,13 @@ var ts;
                     // Delete the entire import declaration
                     // |import * as ns from './file'|
                     // |import { a } from './file'|
-                    var importDecl = ts.getAncestor(node, 249 /* ImportDeclaration */);
+                    var importDecl = ts.getAncestor(node, 250 /* ImportDeclaration */);
                     deleteNode(changes, sourceFile, importDecl);
                 }
             }
             function deleteVariableDeclaration(changes, deletedNodesInLists, sourceFile, node) {
                 var parent = node.parent;
-                if (parent.kind === 274 /* CatchClause */) {
+                if (parent.kind === 275 /* CatchClause */) {
                     // TODO: There's currently no unused diagnostic for this, could be a suggestion
                     changes.deleteNodeRange(sourceFile, ts.findChildOfKind(parent, 20 /* OpenParenToken */, sourceFile), ts.findChildOfKind(parent, 21 /* CloseParenToken */, sourceFile));
                     return;
@@ -111526,14 +115197,14 @@ var ts;
                 }
                 var gp = parent.parent;
                 switch (gp.kind) {
-                    case 227 /* ForOfStatement */:
-                    case 226 /* ForInStatement */:
+                    case 228 /* ForOfStatement */:
+                    case 227 /* ForInStatement */:
                         changes.replaceNode(sourceFile, node, ts.createObjectLiteral());
                         break;
-                    case 225 /* ForStatement */:
+                    case 226 /* ForStatement */:
                         deleteNode(changes, sourceFile, parent);
                         break;
-                    case 219 /* VariableStatement */:
+                    case 220 /* VariableStatement */:
                         deleteNode(changes, sourceFile, gp);
                         break;
                     default:
@@ -111696,14 +115367,270 @@ var ts;
             var token = ts.getTokenAtPosition(sourceFile, pos);
             var assertion = ts.Debug.assertDefined(ts.findAncestor(token, function (n) { return ts.isAsExpression(n) || ts.isTypeAssertion(n); }));
             var replacement = ts.isAsExpression(assertion)
-                ? ts.createAsExpression(assertion.expression, ts.createKeywordTypeNode(143 /* UnknownKeyword */))
-                : ts.createTypeAssertion(ts.createKeywordTypeNode(143 /* UnknownKeyword */), assertion.expression);
+                ? ts.createAsExpression(assertion.expression, ts.createKeywordTypeNode(144 /* UnknownKeyword */))
+                : ts.createTypeAssertion(ts.createKeywordTypeNode(144 /* UnknownKeyword */), assertion.expression);
             changeTracker.replaceNode(sourceFile, assertion.expression, replacement);
         }
     })(codefix = ts.codefix || (ts.codefix = {}));
 })(ts || (ts = {}));
 /* @internal */
 var ts;
+(function (ts) {
+    var codefix;
+    (function (codefix) {
+        var fixId = "addMissingAwait";
+        var propertyAccessCode = ts.Diagnostics.Property_0_does_not_exist_on_type_1.code;
+        var callableConstructableErrorCodes = [
+            ts.Diagnostics.This_expression_is_not_callable.code,
+            ts.Diagnostics.This_expression_is_not_constructable.code,
+        ];
+        var errorCodes = [
+            ts.Diagnostics.An_arithmetic_operand_must_be_of_type_any_number_bigint_or_an_enum_type.code,
+            ts.Diagnostics.The_left_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_bigint_or_an_enum_type.code,
+            ts.Diagnostics.The_right_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_bigint_or_an_enum_type.code,
+            ts.Diagnostics.Operator_0_cannot_be_applied_to_type_1.code,
+            ts.Diagnostics.Operator_0_cannot_be_applied_to_types_1_and_2.code,
+            ts.Diagnostics.This_condition_will_always_return_0_since_the_types_1_and_2_have_no_overlap.code,
+            ts.Diagnostics.Type_0_is_not_an_array_type.code,
+            ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type.code,
+            ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type_Use_compiler_option_downlevelIteration_to_allow_iterating_of_iterators.code,
+            ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type_or_does_not_have_a_Symbol_iterator_method_that_returns_an_iterator.code,
+            ts.Diagnostics.Type_0_is_not_an_array_type_or_does_not_have_a_Symbol_iterator_method_that_returns_an_iterator.code,
+            ts.Diagnostics.Type_0_must_have_a_Symbol_iterator_method_that_returns_an_iterator.code,
+            ts.Diagnostics.Type_0_must_have_a_Symbol_asyncIterator_method_that_returns_an_async_iterator.code,
+            ts.Diagnostics.Argument_of_type_0_is_not_assignable_to_parameter_of_type_1.code,
+            propertyAccessCode
+        ].concat(callableConstructableErrorCodes);
+        codefix.registerCodeFix({
+            fixIds: [fixId],
+            errorCodes: errorCodes,
+            getCodeActions: function (context) {
+                var sourceFile = context.sourceFile, errorCode = context.errorCode, span = context.span, cancellationToken = context.cancellationToken, program = context.program;
+                var expression = getAwaitableExpression(sourceFile, errorCode, span, cancellationToken, program);
+                if (!expression) {
+                    return;
+                }
+                var checker = context.program.getTypeChecker();
+                var trackChanges = function (cb) { return ts.textChanges.ChangeTracker.with(context, cb); };
+                return ts.compact([
+                    getDeclarationSiteFix(context, expression, errorCode, checker, trackChanges),
+                    getUseSiteFix(context, expression, errorCode, checker, trackChanges)
+                ]);
+            },
+            getAllCodeActions: function (context) {
+                var sourceFile = context.sourceFile, program = context.program, cancellationToken = context.cancellationToken;
+                var checker = context.program.getTypeChecker();
+                return codefix.codeFixAll(context, errorCodes, function (t, diagnostic) {
+                    var expression = getAwaitableExpression(sourceFile, diagnostic.code, diagnostic, cancellationToken, program);
+                    if (!expression) {
+                        return;
+                    }
+                    var trackChanges = function (cb) { return (cb(t), []); };
+                    return getDeclarationSiteFix(context, expression, diagnostic.code, checker, trackChanges)
+                        || getUseSiteFix(context, expression, diagnostic.code, checker, trackChanges);
+                });
+            },
+        });
+        function getDeclarationSiteFix(context, expression, errorCode, checker, trackChanges) {
+            var sourceFile = context.sourceFile;
+            var awaitableInitializer = findAwaitableInitializer(expression, sourceFile, checker);
+            if (awaitableInitializer) {
+                var initializerChanges = trackChanges(function (t) { return makeChange(t, errorCode, sourceFile, checker, awaitableInitializer); });
+                return codefix.createCodeFixActionNoFixId("addMissingAwaitToInitializer", initializerChanges, [ts.Diagnostics.Add_await_to_initializer_for_0, expression.getText(sourceFile)]);
+            }
+        }
+        function getUseSiteFix(context, expression, errorCode, checker, trackChanges) {
+            var changes = trackChanges(function (t) { return makeChange(t, errorCode, context.sourceFile, checker, expression); });
+            return codefix.createCodeFixAction(fixId, changes, ts.Diagnostics.Add_await, fixId, ts.Diagnostics.Fix_all_expressions_possibly_missing_await);
+        }
+        function isMissingAwaitError(sourceFile, errorCode, span, cancellationToken, program) {
+            var checker = program.getDiagnosticsProducingTypeChecker();
+            var diagnostics = checker.getDiagnostics(sourceFile, cancellationToken);
+            return ts.some(diagnostics, function (_a) {
+                var start = _a.start, length = _a.length, relatedInformation = _a.relatedInformation, code = _a.code;
+                return ts.isNumber(start) && ts.isNumber(length) && ts.textSpansEqual({ start: start, length: length }, span) &&
+                    code === errorCode &&
+                    !!relatedInformation &&
+                    ts.some(relatedInformation, function (related) { return related.code === ts.Diagnostics.Did_you_forget_to_use_await.code; });
+            });
+        }
+        function getAwaitableExpression(sourceFile, errorCode, span, cancellationToken, program) {
+            var token = ts.getTokenAtPosition(sourceFile, span.start);
+            // Checker has already done work to determine that await might be possible, and has attached
+            // related info to the node, so start by finding the expression that exactly matches up
+            // with the diagnostic range.
+            var expression = ts.findAncestor(token, function (node) {
+                if (node.getStart(sourceFile) < span.start || node.getEnd() > ts.textSpanEnd(span)) {
+                    return "quit";
+                }
+                return ts.isExpression(node) && ts.textSpansEqual(span, ts.createTextSpanFromNode(node, sourceFile));
+            });
+            return expression
+                && isMissingAwaitError(sourceFile, errorCode, span, cancellationToken, program)
+                && isInsideAwaitableBody(expression)
+                ? expression
+                : undefined;
+        }
+        function findAwaitableInitializer(expression, sourceFile, checker) {
+            if (!ts.isIdentifier(expression)) {
+                return;
+            }
+            var symbol = checker.getSymbolAtLocation(expression);
+            if (!symbol) {
+                return;
+            }
+            var declaration = ts.tryCast(symbol.valueDeclaration, ts.isVariableDeclaration);
+            var variableName = ts.tryCast(declaration && declaration.name, ts.isIdentifier);
+            var variableStatement = ts.getAncestor(declaration, 220 /* VariableStatement */);
+            if (!declaration || !variableStatement ||
+                declaration.type ||
+                !declaration.initializer ||
+                variableStatement.getSourceFile() !== sourceFile ||
+                ts.hasModifier(variableStatement, 1 /* Export */) ||
+                !variableName ||
+                !isInsideAwaitableBody(declaration.initializer)) {
+                return;
+            }
+            var isUsedElsewhere = ts.FindAllReferences.Core.eachSymbolReferenceInFile(variableName, checker, sourceFile, function (identifier) {
+                return identifier !== expression;
+            });
+            if (isUsedElsewhere) {
+                return;
+            }
+            return declaration.initializer;
+        }
+        function isInsideAwaitableBody(node) {
+            return node.kind & 16384 /* AwaitContext */ || !!ts.findAncestor(node, function (ancestor) {
+                return ancestor.parent && ts.isArrowFunction(ancestor.parent) && ancestor.parent.body === ancestor ||
+                    ts.isBlock(ancestor) && (ancestor.parent.kind === 240 /* FunctionDeclaration */ ||
+                        ancestor.parent.kind === 197 /* FunctionExpression */ ||
+                        ancestor.parent.kind === 198 /* ArrowFunction */ ||
+                        ancestor.parent.kind === 157 /* MethodDeclaration */);
+            });
+        }
+        function makeChange(changeTracker, errorCode, sourceFile, checker, insertionSite) {
+            if (ts.isBinaryExpression(insertionSite)) {
+                var left = insertionSite.left, right = insertionSite.right;
+                var leftType = checker.getTypeAtLocation(left);
+                var rightType = checker.getTypeAtLocation(right);
+                var newLeft = checker.getPromisedTypeOfPromise(leftType) ? ts.createAwait(left) : left;
+                var newRight = checker.getPromisedTypeOfPromise(rightType) ? ts.createAwait(right) : right;
+                changeTracker.replaceNode(sourceFile, left, newLeft);
+                changeTracker.replaceNode(sourceFile, right, newRight);
+            }
+            else if (errorCode === propertyAccessCode && ts.isPropertyAccessExpression(insertionSite.parent)) {
+                changeTracker.replaceNode(sourceFile, insertionSite.parent.expression, ts.createParen(ts.createAwait(insertionSite.parent.expression)));
+            }
+            else if (ts.contains(callableConstructableErrorCodes, errorCode) && ts.isCallOrNewExpression(insertionSite.parent)) {
+                changeTracker.replaceNode(sourceFile, insertionSite, ts.createParen(ts.createAwait(insertionSite)));
+            }
+            else {
+                changeTracker.replaceNode(sourceFile, insertionSite, ts.createAwait(insertionSite));
+            }
+        }
+    })(codefix = ts.codefix || (ts.codefix = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var codefix;
+    (function (codefix) {
+        var fixId = "addMissingConst";
+        var errorCodes = [
+            ts.Diagnostics.Cannot_find_name_0.code,
+            ts.Diagnostics.No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer.code
+        ];
+        codefix.registerCodeFix({
+            errorCodes: errorCodes,
+            getCodeActions: function (context) {
+                var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return makeChange(t, context.sourceFile, context.span.start, context.program); });
+                if (changes.length > 0) {
+                    return [codefix.createCodeFixAction(fixId, changes, ts.Diagnostics.Add_const_to_unresolved_variable, fixId, ts.Diagnostics.Add_const_to_all_unresolved_variables)];
+                }
+            },
+            fixIds: [fixId],
+            getAllCodeActions: function (context) {
+                var fixedNodes = new ts.NodeSet();
+                return codefix.codeFixAll(context, errorCodes, function (changes, diag) { return makeChange(changes, diag.file, diag.start, context.program, fixedNodes); });
+            },
+        });
+        function makeChange(changeTracker, sourceFile, pos, program, fixedNodes) {
+            var token = ts.getTokenAtPosition(sourceFile, pos);
+            var forInitializer = ts.findAncestor(token, function (node) {
+                return ts.isForInOrOfStatement(node.parent) ? node.parent.initializer === node :
+                    isPossiblyPartOfDestructuring(node) ? false : "quit";
+            });
+            if (forInitializer)
+                return applyChange(changeTracker, forInitializer, sourceFile, fixedNodes);
+            var parent = token.parent;
+            if (ts.isBinaryExpression(parent) && ts.isExpressionStatement(parent.parent)) {
+                return applyChange(changeTracker, token, sourceFile, fixedNodes);
+            }
+            if (ts.isArrayLiteralExpression(parent)) {
+                var checker_1 = program.getTypeChecker();
+                if (!ts.every(parent.elements, function (element) { return arrayElementCouldBeVariableDeclaration(element, checker_1); })) {
+                    return;
+                }
+                return applyChange(changeTracker, parent, sourceFile, fixedNodes);
+            }
+            var commaExpression = ts.findAncestor(token, function (node) {
+                return ts.isExpressionStatement(node.parent) ? true :
+                    isPossiblyPartOfCommaSeperatedInitializer(node) ? false : "quit";
+            });
+            if (commaExpression) {
+                var checker = program.getTypeChecker();
+                if (!expressionCouldBeVariableDeclaration(commaExpression, checker)) {
+                    return;
+                }
+                return applyChange(changeTracker, commaExpression, sourceFile, fixedNodes);
+            }
+        }
+        function applyChange(changeTracker, initializer, sourceFile, fixedNodes) {
+            if (!fixedNodes || fixedNodes.tryAdd(initializer)) {
+                changeTracker.insertModifierBefore(sourceFile, 78 /* ConstKeyword */, initializer);
+            }
+        }
+        function isPossiblyPartOfDestructuring(node) {
+            switch (node.kind) {
+                case 73 /* Identifier */:
+                case 188 /* ArrayLiteralExpression */:
+                case 189 /* ObjectLiteralExpression */:
+                case 276 /* PropertyAssignment */:
+                case 277 /* ShorthandPropertyAssignment */:
+                    return true;
+                default:
+                    return false;
+            }
+        }
+        function arrayElementCouldBeVariableDeclaration(expression, checker) {
+            var identifier = ts.isIdentifier(expression) ? expression :
+                ts.isAssignmentExpression(expression, /*excludeCompoundAssignment*/ true) && ts.isIdentifier(expression.left) ? expression.left :
+                    undefined;
+            return !!identifier && !checker.getSymbolAtLocation(identifier);
+        }
+        function isPossiblyPartOfCommaSeperatedInitializer(node) {
+            switch (node.kind) {
+                case 73 /* Identifier */:
+                case 205 /* BinaryExpression */:
+                case 27 /* CommaToken */:
+                    return true;
+                default:
+                    return false;
+            }
+        }
+        function expressionCouldBeVariableDeclaration(expression, checker) {
+            if (!ts.isBinaryExpression(expression)) {
+                return false;
+            }
+            if (expression.operatorToken.kind === 27 /* CommaToken */) {
+                return ts.every([expression.left, expression.right], function (expression) { return expressionCouldBeVariableDeclaration(expression, checker); });
+            }
+            return ts.isIdentifier(expression.left) && !checker.getSymbolAtLocation(expression.left);
+        }
+    })(codefix = ts.codefix || (ts.codefix = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
 (function (ts) {
     var codefix;
     (function (codefix) {
@@ -111746,11 +115673,11 @@ var ts;
         function makeChange(changeTracker, sourceFile, pos) {
             var token = ts.getTokenAtPosition(sourceFile, pos);
             if (!ts.isIdentifier(token)) {
-                return ts.Debug.fail("add-name-to-nameless-parameter operates on identifiers, but got a " + ts.formatSyntaxKind(token.kind));
+                return ts.Debug.fail("add-name-to-nameless-parameter operates on identifiers, but got a " + ts.Debug.formatSyntaxKind(token.kind));
             }
             var param = token.parent;
             if (!ts.isParameter(param)) {
-                return ts.Debug.fail("Tried to add a parameter name to a non-parameter: " + ts.formatSyntaxKind(token.kind));
+                return ts.Debug.fail("Tried to add a parameter name to a non-parameter: " + ts.Debug.formatSyntaxKind(token.kind));
             }
             var i = param.parent.parameters.indexOf(param);
             ts.Debug.assert(!param.type, "Tried to add a parameter name to a parameter that already had one.");
@@ -111832,26 +115759,26 @@ var ts;
         }
         function isDeclarationWithType(node) {
             return ts.isFunctionLikeDeclaration(node) ||
-                node.kind === 237 /* VariableDeclaration */ ||
-                node.kind === 153 /* PropertySignature */ ||
-                node.kind === 154 /* PropertyDeclaration */;
+                node.kind === 238 /* VariableDeclaration */ ||
+                node.kind === 154 /* PropertySignature */ ||
+                node.kind === 155 /* PropertyDeclaration */;
         }
         function transformJSDocType(node) {
             switch (node.kind) {
-                case 289 /* JSDocAllType */:
-                case 290 /* JSDocUnknownType */:
+                case 290 /* JSDocAllType */:
+                case 291 /* JSDocUnknownType */:
                     return ts.createTypeReferenceNode("any", ts.emptyArray);
-                case 293 /* JSDocOptionalType */:
+                case 294 /* JSDocOptionalType */:
                     return transformJSDocOptionalType(node);
-                case 292 /* JSDocNonNullableType */:
+                case 293 /* JSDocNonNullableType */:
                     return transformJSDocType(node.type);
-                case 291 /* JSDocNullableType */:
+                case 292 /* JSDocNullableType */:
                     return transformJSDocNullableType(node);
-                case 295 /* JSDocVariadicType */:
+                case 296 /* JSDocVariadicType */:
                     return transformJSDocVariadicType(node);
-                case 294 /* JSDocFunctionType */:
+                case 295 /* JSDocFunctionType */:
                     return transformJSDocFunctionType(node);
-                case 164 /* TypeReference */:
+                case 165 /* TypeReference */:
                     return transformJSDocTypeReference(node);
                 default:
                     var visited = ts.visitEachChild(node, transformJSDocType, /*context*/ undefined); // TODO: GH#18217
@@ -111873,7 +115800,7 @@ var ts;
         }
         function transformJSDocParameter(node) {
             var index = node.parent.parameters.indexOf(node);
-            var isRest = node.type.kind === 295 /* JSDocVariadicType */ && index === node.parent.parameters.length - 1; // TODO: GH#18217
+            var isRest = node.type.kind === 296 /* JSDocVariadicType */ && index === node.parent.parameters.length - 1; // TODO: GH#18217
             var name = node.name || (isRest ? "rest" : "arg" + index);
             var dotdotdot = isRest ? ts.createToken(25 /* DotDotDotToken */) : node.dotDotDotToken;
             return ts.createParameter(node.decorators, node.modifiers, dotdotdot, name, node.questionToken, ts.visitNode(node.type, transformJSDocType), node.initializer);
@@ -111913,8 +115840,8 @@ var ts;
             var index = ts.createParameter(
             /*decorators*/ undefined, 
             /*modifiers*/ undefined, 
-            /*dotDotDotToken*/ undefined, node.typeArguments[0].kind === 135 /* NumberKeyword */ ? "n" : "s", 
-            /*questionToken*/ undefined, ts.createTypeReferenceNode(node.typeArguments[0].kind === 135 /* NumberKeyword */ ? "number" : "string", []), 
+            /*dotDotDotToken*/ undefined, node.typeArguments[0].kind === 136 /* NumberKeyword */ ? "n" : "s", 
+            /*questionToken*/ undefined, ts.createTypeReferenceNode(node.typeArguments[0].kind === 136 /* NumberKeyword */ ? "number" : "string", []), 
             /*initializer*/ undefined);
             var indexSignature = ts.createTypeLiteralNode([ts.createIndexSignature(/*decorators*/ undefined, /*modifiers*/ undefined, [index], node.typeArguments[1])]);
             ts.setEmitFlags(indexSignature, 1 /* SingleLine */);
@@ -111958,6 +115885,8 @@ var ts;
             ts.Diagnostics.Property_0_implicitly_has_type_any_but_a_better_type_for_its_set_accessor_may_be_inferred_from_usage.code,
             // Property declarations
             ts.Diagnostics.Member_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage.code,
+            // Function expressions and declarations
+            ts.Diagnostics.this_implicitly_has_type_any_because_it_does_not_have_a_type_annotation.code,
         ];
         codefix.registerCodeFix({
             errorCodes: errorCodes,
@@ -111987,6 +115916,8 @@ var ts;
                 case ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type.code:
                 case ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type_but_a_better_type_may_be_inferred_from_usage.code:
                     return ts.Diagnostics.Infer_parameter_types_from_usage;
+                case ts.Diagnostics.this_implicitly_has_type_any_because_it_does_not_have_a_type_annotation.code:
+                    return ts.Diagnostics.Infer_this_type_of_0_from_usage;
                 default:
                     return ts.Diagnostics.Infer_type_of_0_from_usage;
             }
@@ -112014,7 +115945,7 @@ var ts;
             return errorCode;
         }
         function doChange(changes, sourceFile, token, errorCode, program, cancellationToken, markSeen, host) {
-            if (!ts.isParameterPropertyModifier(token.kind) && token.kind !== 72 /* Identifier */ && token.kind !== 25 /* DotDotDotToken */ && token.kind !== 100 /* ThisKeyword */) {
+            if (!ts.isParameterPropertyModifier(token.kind) && token.kind !== 73 /* Identifier */ && token.kind !== 25 /* DotDotDotToken */ && token.kind !== 101 /* ThisKeyword */) {
                 return undefined;
             }
             var parent = token.parent;
@@ -112081,6 +116012,13 @@ var ts;
                         return containingFunction;
                     }
                     return undefined;
+                // Function 'this'
+                case ts.Diagnostics.this_implicitly_has_type_any_because_it_does_not_have_a_type_annotation.code:
+                    if (ts.textChanges.isThisTypeAnnotatable(containingFunction) && markSeen(containingFunction)) {
+                        annotateThis(changes, sourceFile, containingFunction, program, host, cancellationToken);
+                        return containingFunction;
+                    }
+                    return undefined;
                 default:
                     return ts.Debug.fail(String(errorCode));
             }
@@ -112094,7 +116032,8 @@ var ts;
             if (!ts.isIdentifier(parameterDeclaration.name)) {
                 return;
             }
-            var parameterInferences = inferTypeForParametersFromUsage(containingFunction, sourceFile, program, cancellationToken) ||
+            var references = inferFunctionReferencesFromUsage(containingFunction, sourceFile, program, cancellationToken);
+            var parameterInferences = InferFromReference.inferTypeForParametersFromReferences(references, containingFunction, program, cancellationToken) ||
                 containingFunction.parameters.map(function (p) { return ({
                     declaration: p,
                     type: ts.isIdentifier(p.name) ? inferTypeForVariableFromUsage(p.name, program, cancellationToken) : program.getTypeChecker().getAnyType()
@@ -112117,6 +116056,31 @@ var ts;
                     changes.insertNodeAfter(sourceFile, ts.last(containingFunction.parameters), ts.createToken(21 /* CloseParenToken */));
             }
         }
+        function annotateThis(changes, sourceFile, containingFunction, program, host, cancellationToken) {
+            var references = inferFunctionReferencesFromUsage(containingFunction, sourceFile, program, cancellationToken);
+            if (!references) {
+                return;
+            }
+            var thisInference = InferFromReference.inferTypeForThisFromReferences(references, program, cancellationToken);
+            if (!thisInference) {
+                return;
+            }
+            var typeNode = ts.getTypeNodeIfAccessible(thisInference, containingFunction, program, host);
+            if (!typeNode) {
+                return;
+            }
+            if (ts.isInJSFile(containingFunction)) {
+                annotateJSDocThis(changes, sourceFile, containingFunction, typeNode);
+            }
+            else {
+                changes.tryInsertThisTypeAnnotation(sourceFile, containingFunction, typeNode);
+            }
+        }
+        function annotateJSDocThis(changes, sourceFile, containingFunction, typeNode) {
+            addJSDocTags(changes, sourceFile, containingFunction, [
+                ts.createJSDocThisTag(ts.createJSDocTypeExpression(typeNode)),
+            ]);
+        }
         function annotateSetAccessor(changes, sourceFile, setAccessorDeclaration, program, host, cancellationToken) {
             var param = ts.firstOrUndefined(setAccessorDeclaration.parameters);
             if (param && ts.isIdentifier(setAccessorDeclaration.name) && ts.isIdentifier(param.name)) {
@@ -112135,7 +116099,7 @@ var ts;
         function annotate(changes, sourceFile, declaration, type, program, host) {
             var typeNode = ts.getTypeNodeIfAccessible(type, declaration, program, host);
             if (typeNode) {
-                if (ts.isInJSFile(sourceFile) && declaration.kind !== 153 /* PropertySignature */) {
+                if (ts.isInJSFile(sourceFile) && declaration.kind !== 154 /* PropertySignature */) {
                     var parent = ts.isVariableDeclaration(declaration) ? ts.tryCast(declaration.parent.parent, ts.isVariableStatement) : declaration;
                     if (!parent) {
                         return;
@@ -112176,13 +116140,13 @@ var ts;
                 return !!merged;
             }); });
             var tag = ts.createJSDocComment(comments.join("\n"), ts.createNodeArray((oldTags || ts.emptyArray).concat(unmergedNewTags)));
-            var jsDocNode = parent.kind === 197 /* ArrowFunction */ ? getJsDocNodeForArrowFunction(parent) : parent;
+            var jsDocNode = parent.kind === 198 /* ArrowFunction */ ? getJsDocNodeForArrowFunction(parent) : parent;
             jsDocNode.jsDoc = parent.jsDoc;
             jsDocNode.jsDocCache = parent.jsDocCache;
             changes.insertJsdocCommentBefore(sourceFile, jsDocNode, tag);
         }
         function getJsDocNodeForArrowFunction(signature) {
-            if (signature.parent.kind === 154 /* PropertyDeclaration */) {
+            if (signature.parent.kind === 155 /* PropertyDeclaration */) {
                 return signature.parent;
             }
             return signature.parent.parent;
@@ -112192,14 +116156,14 @@ var ts;
                 return undefined;
             }
             switch (oldTag.kind) {
-                case 304 /* JSDocParameterTag */: {
+                case 306 /* JSDocParameterTag */: {
                     var oldParam = oldTag;
                     var newParam = newTag;
                     return ts.isIdentifier(oldParam.name) && ts.isIdentifier(newParam.name) && oldParam.name.escapedText === newParam.name.escapedText
                         ? ts.createJSDocParamTag(newParam.name, newParam.isBracketed, newParam.typeExpression, oldParam.comment)
                         : undefined;
                 }
-                case 305 /* JSDocReturnTag */:
+                case 307 /* JSDocReturnTag */:
                     return ts.createJSDocReturnTag(newTag.typeExpression, oldTag.comment);
             }
         }
@@ -112215,27 +116179,28 @@ var ts;
             var types = InferFromReference.inferTypesFromReferences(references, checker, cancellationToken);
             return InferFromReference.unifyFromContext(types, checker);
         }
-        function inferTypeForParametersFromUsage(containingFunction, sourceFile, program, cancellationToken) {
+        function inferFunctionReferencesFromUsage(containingFunction, sourceFile, program, cancellationToken) {
             var searchToken;
             switch (containingFunction.kind) {
-                case 157 /* Constructor */:
-                    searchToken = ts.findChildOfKind(containingFunction, 124 /* ConstructorKeyword */, sourceFile);
+                case 158 /* Constructor */:
+                    searchToken = ts.findChildOfKind(containingFunction, 125 /* ConstructorKeyword */, sourceFile);
                     break;
-                case 197 /* ArrowFunction */:
-                case 196 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
+                case 197 /* FunctionExpression */:
                     var parent = containingFunction.parent;
                     searchToken = ts.isVariableDeclaration(parent) && ts.isIdentifier(parent.name) ?
                         parent.name :
                         containingFunction.name;
                     break;
-                case 239 /* FunctionDeclaration */:
-                case 156 /* MethodDeclaration */:
+                case 240 /* FunctionDeclaration */:
+                case 157 /* MethodDeclaration */:
                     searchToken = containingFunction.name;
                     break;
             }
-            if (searchToken) {
-                return InferFromReference.inferTypeForParametersFromReferences(getReferences(searchToken, program, cancellationToken), containingFunction, program, cancellationToken);
+            if (!searchToken) {
+                return undefined;
             }
+            return getReferences(searchToken, program, cancellationToken);
         }
         var InferFromReference;
         (function (InferFromReference) {
@@ -112250,13 +116215,10 @@ var ts;
             }
             InferFromReference.inferTypesFromReferences = inferTypesFromReferences;
             function inferTypeForParametersFromReferences(references, declaration, program, cancellationToken) {
+                if (references === undefined || references.length === 0 || !declaration.parameters) {
+                    return undefined;
+                }
                 var checker = program.getTypeChecker();
-                if (references.length === 0) {
-                    return undefined;
-                }
-                if (!declaration.parameters) {
-                    return undefined;
-                }
                 var usageContext = {};
                 for (var _i = 0, references_3 = references; _i < references_3.length; _i++) {
                     var reference = references_3[_i];
@@ -112296,26 +116258,40 @@ var ts;
                 });
             }
             InferFromReference.inferTypeForParametersFromReferences = inferTypeForParametersFromReferences;
+            function inferTypeForThisFromReferences(references, program, cancellationToken) {
+                if (references.length === 0) {
+                    return undefined;
+                }
+                var checker = program.getTypeChecker();
+                var usageContext = {};
+                for (var _i = 0, references_4 = references; _i < references_4.length; _i++) {
+                    var reference = references_4[_i];
+                    cancellationToken.throwIfCancellationRequested();
+                    inferTypeFromContext(reference, checker, usageContext);
+                }
+                return unifyFromContext(usageContext.candidateThisTypes || ts.emptyArray, checker);
+            }
+            InferFromReference.inferTypeForThisFromReferences = inferTypeForThisFromReferences;
             function inferTypeFromContext(node, checker, usageContext) {
                 while (ts.isRightSideOfQualifiedNameOrPropertyAccess(node)) {
                     node = node.parent;
                 }
                 switch (node.parent.kind) {
-                    case 203 /* PostfixUnaryExpression */:
+                    case 204 /* PostfixUnaryExpression */:
                         usageContext.isNumber = true;
                         break;
-                    case 202 /* PrefixUnaryExpression */:
+                    case 203 /* PrefixUnaryExpression */:
                         inferTypeFromPrefixUnaryExpressionContext(node.parent, usageContext);
                         break;
-                    case 204 /* BinaryExpression */:
+                    case 205 /* BinaryExpression */:
                         inferTypeFromBinaryExpressionContext(node, node.parent, checker, usageContext);
                         break;
-                    case 271 /* CaseClause */:
-                    case 272 /* DefaultClause */:
+                    case 272 /* CaseClause */:
+                    case 273 /* DefaultClause */:
                         inferTypeFromSwitchStatementLabelContext(node.parent, checker, usageContext);
                         break;
-                    case 191 /* CallExpression */:
-                    case 192 /* NewExpression */:
+                    case 192 /* CallExpression */:
+                    case 193 /* NewExpression */:
                         if (node.parent.expression === node) {
                             inferTypeFromCallExpressionContext(node.parent, checker, usageContext);
                         }
@@ -112323,13 +116299,20 @@ var ts;
                             inferTypeFromContextualType(node, checker, usageContext);
                         }
                         break;
-                    case 189 /* PropertyAccessExpression */:
+                    case 190 /* PropertyAccessExpression */:
                         inferTypeFromPropertyAccessExpressionContext(node.parent, checker, usageContext);
                         break;
-                    case 190 /* ElementAccessExpression */:
+                    case 191 /* ElementAccessExpression */:
                         inferTypeFromPropertyElementExpressionContext(node.parent, node, checker, usageContext);
                         break;
-                    case 237 /* VariableDeclaration */: {
+                    case 276 /* PropertyAssignment */:
+                    case 277 /* ShorthandPropertyAssignment */:
+                        inferTypeFromPropertyAssignment(node.parent, checker, usageContext);
+                        break;
+                    case 155 /* PropertyDeclaration */:
+                        inferTypeFromPropertyDeclaration(node.parent, checker, usageContext);
+                        break;
+                    case 238 /* VariableDeclaration */: {
                         var _a = node.parent, name = _a.name, initializer = _a.initializer;
                         if (node === name) {
                             if (initializer) { // This can happen for `let x = null;` which still has an implicit-any error.
@@ -112380,17 +116363,17 @@ var ts;
                     case 50 /* BarToken */:
                     case 51 /* CaretToken */:
                     // CompoundAssignmentOperator
-                    case 61 /* MinusEqualsToken */:
-                    case 63 /* AsteriskAsteriskEqualsToken */:
-                    case 62 /* AsteriskEqualsToken */:
-                    case 64 /* SlashEqualsToken */:
-                    case 65 /* PercentEqualsToken */:
-                    case 69 /* AmpersandEqualsToken */:
-                    case 70 /* BarEqualsToken */:
-                    case 71 /* CaretEqualsToken */:
-                    case 66 /* LessThanLessThanEqualsToken */:
-                    case 68 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
-                    case 67 /* GreaterThanGreaterThanEqualsToken */:
+                    case 62 /* MinusEqualsToken */:
+                    case 64 /* AsteriskAsteriskEqualsToken */:
+                    case 63 /* AsteriskEqualsToken */:
+                    case 65 /* SlashEqualsToken */:
+                    case 66 /* PercentEqualsToken */:
+                    case 70 /* AmpersandEqualsToken */:
+                    case 71 /* BarEqualsToken */:
+                    case 72 /* CaretEqualsToken */:
+                    case 67 /* LessThanLessThanEqualsToken */:
+                    case 69 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
+                    case 68 /* GreaterThanGreaterThanEqualsToken */:
                     // AdditiveOperator
                     case 39 /* MinusToken */:
                     // RelationalOperator
@@ -112406,7 +116389,7 @@ var ts;
                             usageContext.isNumber = true;
                         }
                         break;
-                    case 60 /* PlusEqualsToken */:
+                    case 61 /* PlusEqualsToken */:
                     case 38 /* PlusToken */:
                         var otherOperandType = checker.getTypeAtLocation(parent.left === node ? parent.right : parent.left);
                         if (otherOperandType.flags & 1056 /* EnumLike */) {
@@ -112423,14 +116406,14 @@ var ts;
                         }
                         break;
                     //  AssignmentOperators
-                    case 59 /* EqualsToken */:
+                    case 60 /* EqualsToken */:
                     case 33 /* EqualsEqualsToken */:
                     case 35 /* EqualsEqualsEqualsToken */:
                     case 36 /* ExclamationEqualsEqualsToken */:
                     case 34 /* ExclamationEqualsToken */:
                         addCandidateType(usageContext, checker.getTypeAtLocation(parent.left === node ? parent.right : parent.left));
                         break;
-                    case 93 /* InKeyword */:
+                    case 94 /* InKeyword */:
                         if (node === parent.left) {
                             usageContext.isString = true;
                         }
@@ -112438,7 +116421,7 @@ var ts;
                     // LogicalOperator
                     case 55 /* BarBarToken */:
                         if (node === parent.left &&
-                            (node.parent.parent.kind === 237 /* VariableDeclaration */ || ts.isAssignmentExpression(node.parent.parent, /*excludeCompoundAssignment*/ true))) {
+                            (node.parent.parent.kind === 238 /* VariableDeclaration */ || ts.isAssignmentExpression(node.parent.parent, /*excludeCompoundAssignment*/ true))) {
                             // var x = x || {};
                             // TODO: use getFalsyflagsOfType
                             addCandidateType(usageContext, checker.getTypeAtLocation(parent.right));
@@ -112446,7 +116429,7 @@ var ts;
                         break;
                     case 54 /* AmpersandAmpersandToken */:
                     case 27 /* CommaToken */:
-                    case 94 /* InstanceOfKeyword */:
+                    case 95 /* InstanceOfKeyword */:
                         // nothing to infer here
                         break;
                 }
@@ -112466,7 +116449,7 @@ var ts;
                     }
                 }
                 inferTypeFromContext(parent, checker, callContext.returnType);
-                if (parent.kind === 191 /* CallExpression */) {
+                if (parent.kind === 192 /* CallExpression */) {
                     (usageContext.callContexts || (usageContext.callContexts = [])).push(callContext);
                 }
                 else {
@@ -112499,6 +116482,18 @@ var ts;
                     }
                 }
             }
+            function inferTypeFromPropertyAssignment(assignment, checker, usageContext) {
+                var objectLiteral = ts.isShorthandPropertyAssignment(assignment) ?
+                    assignment.parent :
+                    assignment.parent.parent;
+                var nodeWithRealType = ts.isVariableDeclaration(objectLiteral.parent) ?
+                    objectLiteral.parent :
+                    objectLiteral;
+                addCandidateThisType(usageContext, checker.getTypeAtLocation(nodeWithRealType));
+            }
+            function inferTypeFromPropertyDeclaration(declaration, checker, usageContext) {
+                addCandidateThisType(usageContext, checker.getTypeAtLocation(declaration.parent));
+            }
             function removeLowPriorityInferences(inferences, priorities) {
                 var toRemove = [];
                 for (var _i = 0, inferences_1 = inferences; _i < inferences_1.length; _i++) {
@@ -112674,6 +116669,11 @@ var ts;
                     (context.candidateTypes || (context.candidateTypes = [])).push(type);
                 }
             }
+            function addCandidateThisType(context, type) {
+                if (type && !(type.flags & 1 /* Any */) && !(type.flags & 131072 /* Never */)) {
+                    (context.candidateThisTypes || (context.candidateThisTypes = [])).push(type);
+                }
+            }
             function hasCallContext(usageContext) {
                 return !!usageContext && !!usageContext.callContexts;
             }
@@ -112706,12 +116706,12 @@ var ts;
             var precedingNode;
             var newClassDeclaration;
             switch (ctorDeclaration.kind) {
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     precedingNode = ctorDeclaration;
                     changes.delete(sourceFile, ctorDeclaration);
                     newClassDeclaration = createClassFromFunctionDeclaration(ctorDeclaration);
                     break;
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     precedingNode = ctorDeclaration.parent.parent;
                     newClassDeclaration = createClassFromVariableDeclaration(ctorDeclaration);
                     if (ctorDeclaration.parent.declarations.length === 1) {
@@ -112743,7 +116743,7 @@ var ts;
                 // all static members are stored in the "exports" array of symbol
                 if (symbol.exports) {
                     symbol.exports.forEach(function (member) {
-                        var memberElement = createClassElement(member, [ts.createToken(116 /* StaticKeyword */)]);
+                        var memberElement = createClassElement(member, [ts.createToken(117 /* StaticKeyword */)]);
                         if (memberElement) {
                             memberElements.push(memberElement);
                         }
@@ -112766,7 +116766,7 @@ var ts;
                         return;
                     }
                     // delete the entire statement if this expression is the sole expression to take care of the semicolon at the end
-                    var nodeToDelete = assignmentBinaryExpression.parent && assignmentBinaryExpression.parent.kind === 221 /* ExpressionStatement */
+                    var nodeToDelete = assignmentBinaryExpression.parent && assignmentBinaryExpression.parent.kind === 222 /* ExpressionStatement */
                         ? assignmentBinaryExpression.parent : assignmentBinaryExpression;
                     changes.delete(sourceFile, nodeToDelete);
                     if (!assignmentBinaryExpression.right) {
@@ -112774,27 +116774,27 @@ var ts;
                         /*type*/ undefined, /*initializer*/ undefined);
                     }
                     switch (assignmentBinaryExpression.right.kind) {
-                        case 196 /* FunctionExpression */: {
+                        case 197 /* FunctionExpression */: {
                             var functionExpression = assignmentBinaryExpression.right;
-                            var fullModifiers = ts.concatenate(modifiers, getModifierKindFromSource(functionExpression, 121 /* AsyncKeyword */));
+                            var fullModifiers = ts.concatenate(modifiers, getModifierKindFromSource(functionExpression, 122 /* AsyncKeyword */));
                             var method = ts.createMethod(/*decorators*/ undefined, fullModifiers, /*asteriskToken*/ undefined, memberDeclaration.name, /*questionToken*/ undefined, 
                             /*typeParameters*/ undefined, functionExpression.parameters, /*type*/ undefined, functionExpression.body);
                             ts.copyLeadingComments(assignmentBinaryExpression, method, sourceFile);
                             return method;
                         }
-                        case 197 /* ArrowFunction */: {
+                        case 198 /* ArrowFunction */: {
                             var arrowFunction = assignmentBinaryExpression.right;
                             var arrowFunctionBody = arrowFunction.body;
                             var bodyBlock = void 0;
                             // case 1: () => { return [1,2,3] }
-                            if (arrowFunctionBody.kind === 218 /* Block */) {
+                            if (arrowFunctionBody.kind === 219 /* Block */) {
                                 bodyBlock = arrowFunctionBody;
                             }
                             // case 2: () => [1,2,3]
                             else {
                                 bodyBlock = ts.createBlock([ts.createReturn(arrowFunctionBody)]);
                             }
-                            var fullModifiers = ts.concatenate(modifiers, getModifierKindFromSource(arrowFunction, 121 /* AsyncKeyword */));
+                            var fullModifiers = ts.concatenate(modifiers, getModifierKindFromSource(arrowFunction, 122 /* AsyncKeyword */));
                             var method = ts.createMethod(/*decorators*/ undefined, fullModifiers, /*asteriskToken*/ undefined, memberDeclaration.name, /*questionToken*/ undefined, 
                             /*typeParameters*/ undefined, arrowFunction.parameters, /*type*/ undefined, bodyBlock);
                             ts.copyLeadingComments(assignmentBinaryExpression, method, sourceFile);
@@ -112815,17 +116815,17 @@ var ts;
             }
             function createClassFromVariableDeclaration(node) {
                 var initializer = node.initializer;
-                if (!initializer || initializer.kind !== 196 /* FunctionExpression */) {
+                if (!initializer || initializer.kind !== 197 /* FunctionExpression */) {
                     return undefined;
                 }
-                if (node.name.kind !== 72 /* Identifier */) {
+                if (node.name.kind !== 73 /* Identifier */) {
                     return undefined;
                 }
                 var memberElements = createClassElementsFromSymbol(node.symbol);
                 if (initializer.body) {
                     memberElements.unshift(ts.createConstructor(/*decorators*/ undefined, /*modifiers*/ undefined, initializer.parameters, initializer.body));
                 }
-                var modifiers = getModifierKindFromSource(precedingNode, 85 /* ExportKeyword */);
+                var modifiers = getModifierKindFromSource(precedingNode, 86 /* ExportKeyword */);
                 var cls = ts.createClassDeclaration(/*decorators*/ undefined, modifiers, node.name, 
                 /*typeParameters*/ undefined, /*heritageClauses*/ undefined, memberElements);
                 // Don't call copyComments here because we'll already leave them in place
@@ -112836,7 +116836,7 @@ var ts;
                 if (node.body) {
                     memberElements.unshift(ts.createConstructor(/*decorators*/ undefined, /*modifiers*/ undefined, node.parameters, node.body));
                 }
-                var modifiers = getModifierKindFromSource(node, 85 /* ExportKeyword */);
+                var modifiers = getModifierKindFromSource(node, 86 /* ExportKeyword */);
                 var cls = ts.createClassDeclaration(/*decorators*/ undefined, modifiers, node.name, 
                 /*typeParameters*/ undefined, /*heritageClauses*/ undefined, memberElements);
                 // Don't call copyComments here because we'll already leave them in place
@@ -112866,6 +116866,11 @@ var ts;
             fixIds: [fixId],
             getAllCodeActions: function (context) { return codefix.codeFixAll(context, errorCodes, function (changes, err) { return convertToAsyncFunction(changes, err.file, err.start, context.program.getTypeChecker(), context); }); },
         });
+        var SynthBindingNameKind;
+        (function (SynthBindingNameKind) {
+            SynthBindingNameKind[SynthBindingNameKind["Identifier"] = 0] = "Identifier";
+            SynthBindingNameKind[SynthBindingNameKind["BindingPattern"] = 1] = "BindingPattern";
+        })(SynthBindingNameKind || (SynthBindingNameKind = {}));
         function convertToAsyncFunction(changes, sourceFile, position, checker, context) {
             // get the function declaration - returns a promise
             var tokenAtPosition = ts.getTokenAtPosition(sourceFile, position);
@@ -112894,7 +116899,7 @@ var ts;
                 return;
             }
             // add the async keyword
-            changes.insertLastModifierBefore(sourceFile, 121 /* AsyncKeyword */, functionToConvert);
+            changes.insertLastModifierBefore(sourceFile, 122 /* AsyncKeyword */, functionToConvert);
             function startTransformation(node, nodeToReplace) {
                 var newNodes = transformExpression(node, transformer, node);
                 changes.replaceNodeWithNodes(sourceFile, nodeToReplace, newNodes);
@@ -113002,8 +117007,8 @@ var ts;
                         allVarNames.push({ identifier: synthName.identifier, symbol: symbol });
                         addNameToFrequencyMap(collidingSymbolMap, ident.text, symbol);
                     }
-                    // we only care about identifiers that are parameters and declarations (don't care about other uses)
-                    else if (node.parent && (ts.isParameter(node.parent) || ts.isVariableDeclaration(node.parent))) {
+                    // we only care about identifiers that are parameters, declarations, or binding elements (don't care about other uses)
+                    else if (node.parent && (ts.isParameter(node.parent) || ts.isVariableDeclaration(node.parent) || ts.isBindingElement(node.parent))) {
                         var originalName = node.text;
                         var collidingSymbols = collidingSymbolMap.get(originalName);
                         // if the identifier name conflicts with a different identifier that we've already seen
@@ -113017,7 +117022,7 @@ var ts;
                         else {
                             var identifier = ts.getSynthesizedDeepClone(node);
                             identsToRenameMap.set(symbolIdString, identifier);
-                            synthNamesMap.set(symbolIdString, { identifier: identifier, types: [], numberOfAssignmentsOriginal: allVarNames.filter(function (elem) { return elem.identifier.text === node.text; }).length /*, numberOfAssignmentsSynthesized: 0*/ });
+                            synthNamesMap.set(symbolIdString, createSynthIdentifier(identifier, [], allVarNames.filter(function (elem) { return elem.identifier.text === node.text; }).length /*, numberOfAssignmentsSynthesized: 0*/));
                             if ((ts.isParameter(node.parent) && isExpressionOrCallOnTypePromise(node.parent.parent)) || ts.isVariableDeclaration(node.parent)) {
                                 allVarNames.push({ identifier: identifier, symbol: symbol });
                                 addNameToFrequencyMap(collidingSymbolMap, originalName, symbol);
@@ -113065,7 +117070,7 @@ var ts;
             var numVarsSameName = (originalNames.get(name.text) || ts.emptyArray).length;
             var numberOfAssignmentsOriginal = 0;
             var identifier = numVarsSameName === 0 ? name : ts.createIdentifier(name.text + "_" + numVarsSameName);
-            return { identifier: identifier, types: [], numberOfAssignmentsOriginal: numberOfAssignmentsOriginal };
+            return createSynthIdentifier(identifier, [], numberOfAssignmentsOriginal);
         }
         // dispatch function to recursively build the refactoring
         // should be kept up to date with isFixablePromiseHandler in suggestionDiagnostics.ts
@@ -113092,68 +117097,90 @@ var ts;
         }
         function transformCatch(node, transformer, prevArgName) {
             var func = node.arguments[0];
-            var argName = getArgName(func, transformer);
+            var argName = getArgBindingName(func, transformer);
             var shouldReturn = transformer.setOfExpressionsToReturn.get(ts.getNodeId(node).toString());
+            var possibleNameForVarDecl;
             /*
                 If there is another call in the chain after the .catch() we are transforming, we will need to save the result of both paths (try block and catch block)
                 To do this, we will need to synthesize a variable that we were not aware of while we were adding identifiers to the synthNamesMap
                 We will use the prevArgName and then update the synthNamesMap with a new variable name for the next transformation step
             */
             if (prevArgName && !shouldReturn) {
-                prevArgName.numberOfAssignmentsOriginal = 2; // Try block and catch block
-                transformer.synthNamesMap.forEach(function (val, key) {
-                    if (val.identifier.text === prevArgName.identifier.text) {
-                        var newSynthName = createUniqueSynthName(prevArgName);
-                        transformer.synthNamesMap.set(key, newSynthName);
-                    }
-                });
+                if (isSynthIdentifier(prevArgName)) {
+                    possibleNameForVarDecl = prevArgName;
+                    transformer.synthNamesMap.forEach(function (val, key) {
+                        if (val.identifier.text === prevArgName.identifier.text) {
+                            var newSynthName = createUniqueSynthName(prevArgName);
+                            transformer.synthNamesMap.set(key, newSynthName);
+                        }
+                    });
+                }
+                else {
+                    possibleNameForVarDecl = createSynthIdentifier(ts.createOptimisticUniqueName("result"), prevArgName.types);
+                }
+                possibleNameForVarDecl.numberOfAssignmentsOriginal = 2; // Try block and catch block
                 // update the constIdentifiers list
-                if (transformer.constIdentifiers.some(function (elem) { return elem.text === prevArgName.identifier.text; })) {
-                    transformer.constIdentifiers.push(createUniqueSynthName(prevArgName).identifier);
+                if (transformer.constIdentifiers.some(function (elem) { return elem.text === possibleNameForVarDecl.identifier.text; })) {
+                    transformer.constIdentifiers.push(createUniqueSynthName(possibleNameForVarDecl).identifier);
                 }
             }
-            var tryBlock = ts.createBlock(transformExpression(node.expression, transformer, node, prevArgName));
-            var transformationBody = getTransformationBody(func, prevArgName, argName, node, transformer);
-            var catchArg = argName ? argName.identifier.text : "e";
-            var catchClause = ts.createCatchClause(catchArg, ts.createBlock(transformationBody));
+            var tryBlock = ts.createBlock(transformExpression(node.expression, transformer, node, possibleNameForVarDecl));
+            var transformationBody = getTransformationBody(func, possibleNameForVarDecl, argName, node, transformer);
+            var catchArg = argName ? isSynthIdentifier(argName) ? argName.identifier.text : argName.bindingPattern : "e";
+            var catchVariableDeclaration = ts.createVariableDeclaration(catchArg);
+            var catchClause = ts.createCatchClause(catchVariableDeclaration, ts.createBlock(transformationBody));
             /*
                 In order to avoid an implicit any, we will synthesize a type for the declaration using the unions of the types of both paths (try block and catch block)
             */
             var varDeclList;
-            if (prevArgName && !shouldReturn) {
-                var typeArray = prevArgName.types;
+            var varDeclIdentifier;
+            if (possibleNameForVarDecl && !shouldReturn) {
+                varDeclIdentifier = ts.getSynthesizedDeepClone(possibleNameForVarDecl.identifier);
+                var typeArray = possibleNameForVarDecl.types;
                 var unionType = transformer.checker.getUnionType(typeArray, 2 /* Subtype */);
                 var unionTypeNode = transformer.isInJSFile ? undefined : transformer.checker.typeToTypeNode(unionType);
-                var varDecl = [ts.createVariableDeclaration(ts.getSynthesizedDeepClone(prevArgName.identifier), unionTypeNode)];
+                var varDecl = [ts.createVariableDeclaration(varDeclIdentifier, unionTypeNode)];
                 varDeclList = ts.createVariableStatement(/*modifiers*/ undefined, ts.createVariableDeclarationList(varDecl, 1 /* Let */));
             }
             var tryStatement = ts.createTry(tryBlock, catchClause, /*finallyBlock*/ undefined);
-            return varDeclList ? [varDeclList, tryStatement] : [tryStatement];
+            var destructuredResult = prevArgName && varDeclIdentifier && isSynthBindingPattern(prevArgName)
+                && ts.createVariableStatement(/* modifiers */ undefined, ts.createVariableDeclarationList([ts.createVariableDeclaration(ts.getSynthesizedDeepCloneWithRenames(prevArgName.bindingPattern), /* type */ undefined, varDeclIdentifier)], 2 /* Const */));
+            return ts.compact([varDeclList, tryStatement, destructuredResult]);
+        }
+        function getIdentifierTextsFromBindingName(bindingName) {
+            if (ts.isIdentifier(bindingName))
+                return [bindingName.text];
+            return ts.flatMap(bindingName.elements, function (element) {
+                if (ts.isOmittedExpression(element))
+                    return [];
+                return getIdentifierTextsFromBindingName(element.name);
+            });
         }
         function createUniqueSynthName(prevArgName) {
             var renamedPrevArg = ts.createOptimisticUniqueName(prevArgName.identifier.text);
-            var newSynthName = { identifier: renamedPrevArg, types: [], numberOfAssignmentsOriginal: 0 };
-            return newSynthName;
+            return createSynthIdentifier(renamedPrevArg);
         }
         function transformThen(node, transformer, outermostParent, prevArgName) {
             var _a = node.arguments, res = _a[0], rej = _a[1];
             if (!res) {
                 return transformExpression(node.expression, transformer, outermostParent);
             }
-            var argNameRes = getArgName(res, transformer);
+            var argNameRes = getArgBindingName(res, transformer);
             var transformationBody = getTransformationBody(res, prevArgName, argNameRes, node, transformer);
             if (rej) {
-                var argNameRej = getArgName(rej, transformer);
+                var argNameRej = getArgBindingName(rej, transformer);
                 var tryBlock = ts.createBlock(transformExpression(node.expression, transformer, node, argNameRes).concat(transformationBody));
                 var transformationBody2 = getTransformationBody(rej, prevArgName, argNameRej, node, transformer);
-                var catchArg = argNameRej ? argNameRej.identifier.text : "e";
-                var catchClause = ts.createCatchClause(catchArg, ts.createBlock(transformationBody2));
+                var catchArg = argNameRej ? isSynthIdentifier(argNameRej) ? argNameRej.identifier.text : argNameRej.bindingPattern : "e";
+                var catchVariableDeclaration = ts.createVariableDeclaration(catchArg);
+                var catchClause = ts.createCatchClause(catchVariableDeclaration, ts.createBlock(transformationBody2));
                 return [ts.createTry(tryBlock, catchClause, /* finallyBlock */ undefined)];
             }
             return transformExpression(node.expression, transformer, node, argNameRes).concat(transformationBody);
         }
-        function getFlagOfIdentifier(node, constIdentifiers) {
-            var inArr = constIdentifiers.some(function (elem) { return elem.text === node.text; });
+        function getFlagOfBindingName(bindingName, constIdentifiers) {
+            var identifiers = getIdentifierTextsFromBindingName(getNode(bindingName));
+            var inArr = constIdentifiers.some(function (elem) { return ts.contains(identifiers, elem.text); });
             return inArr ? 2 /* Const */ : 1 /* Let */;
         }
         function transformPromiseCall(node, transformer, prevArgName) {
@@ -113169,29 +117196,29 @@ var ts;
             return [ts.createReturn(ts.getSynthesizedDeepClone(node))];
         }
         function createTransformedStatement(prevArgName, rightHandSide, transformer) {
-            if (!prevArgName || prevArgName.identifier.text.length === 0) {
+            if (!prevArgName || isEmpty(prevArgName)) {
                 // if there's no argName to assign to, there still might be side effects
                 return [ts.createStatement(rightHandSide)];
             }
-            if (prevArgName.types.length < prevArgName.numberOfAssignmentsOriginal) {
+            if (isSynthIdentifier(prevArgName) && prevArgName.types.length < prevArgName.numberOfAssignmentsOriginal) {
                 // if the variable has already been declared, we don't need "let" or "const"
                 return [ts.createStatement(ts.createAssignment(ts.getSynthesizedDeepClone(prevArgName.identifier), rightHandSide))];
             }
-            return [ts.createVariableStatement(/*modifiers*/ undefined, (ts.createVariableDeclarationList([ts.createVariableDeclaration(ts.getSynthesizedDeepClone(prevArgName.identifier), /*type*/ undefined, rightHandSide)], getFlagOfIdentifier(prevArgName.identifier, transformer.constIdentifiers))))];
+            return [ts.createVariableStatement(/*modifiers*/ undefined, (ts.createVariableDeclarationList([ts.createVariableDeclaration(ts.getSynthesizedDeepClone(getNode(prevArgName)), /*type*/ undefined, rightHandSide)], getFlagOfBindingName(prevArgName, transformer.constIdentifiers))))];
         }
         // should be kept up to date with isFixablePromiseArgument in suggestionDiagnostics.ts
         function getTransformationBody(func, prevArgName, argName, parent, transformer) {
             var shouldReturn = transformer.setOfExpressionsToReturn.get(ts.getNodeId(parent).toString());
             switch (func.kind) {
-                case 96 /* NullKeyword */:
+                case 97 /* NullKeyword */:
                     // do not produce a transformed statement for a null argument
                     break;
-                case 72 /* Identifier */: // identifier includes undefined
+                case 73 /* Identifier */: // identifier includes undefined
                     if (!argName) {
                         // undefined was argument passed to promise handler
                         break;
                     }
-                    var synthCall = ts.createCall(ts.getSynthesizedDeepClone(func), /*typeArguments*/ undefined, [argName.identifier]);
+                    var synthCall = ts.createCall(ts.getSynthesizedDeepClone(func), /*typeArguments*/ undefined, isSynthIdentifier(argName) ? [argName.identifier] : []);
                     if (shouldReturn) {
                         return [ts.createReturn(synthCall)];
                     }
@@ -113208,8 +117235,8 @@ var ts;
                         prevArgName.types.push(returnType);
                     }
                     return varDeclOrAssignment;
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */: {
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */: {
                     var funcBody = func.body;
                     // Arrow functions with block bodies { } will enter this control flow
                     if (ts.isBlock(funcBody)) {
@@ -113228,7 +117255,7 @@ var ts;
                             }
                         }
                         return shouldReturn ? refactoredStmts.map(function (s) { return ts.getSynthesizedDeepClone(s); }) :
-                            removeReturns(refactoredStmts, prevArgName === undefined ? undefined : prevArgName.identifier, transformer, seenReturnStatement);
+                            removeReturns(refactoredStmts, prevArgName, transformer, seenReturnStatement);
                     }
                     else {
                         var innerRetStmts = ts.isFixablePromiseHandler(funcBody) ? [ts.createReturn(funcBody)] : ts.emptyArray;
@@ -113274,7 +117301,7 @@ var ts;
                             ret.push(ts.createExpressionStatement(possiblyAwaitedExpression));
                         }
                         else {
-                            ret.push(ts.createVariableStatement(/*modifiers*/ undefined, (ts.createVariableDeclarationList([ts.createVariableDeclaration(prevArgName, /*type*/ undefined, possiblyAwaitedExpression)], getFlagOfIdentifier(prevArgName, transformer.constIdentifiers)))));
+                            ret.push(ts.createVariableStatement(/*modifiers*/ undefined, (ts.createVariableDeclarationList([ts.createVariableDeclaration(getNode(prevArgName), /*type*/ undefined, possiblyAwaitedExpression)], getFlagOfBindingName(prevArgName, transformer.constIdentifiers)))));
                         }
                     }
                 }
@@ -113284,7 +117311,7 @@ var ts;
             }
             // if block has no return statement, need to define prevArgName as undefined to prevent undeclared variables
             if (!seenReturnStatement && prevArgName !== undefined) {
-                ret.push(ts.createVariableStatement(/*modifiers*/ undefined, (ts.createVariableDeclarationList([ts.createVariableDeclaration(prevArgName, /*type*/ undefined, ts.createIdentifier("undefined"))], getFlagOfIdentifier(prevArgName, transformer.constIdentifiers)))));
+                ret.push(ts.createVariableStatement(/*modifiers*/ undefined, (ts.createVariableDeclarationList([ts.createVariableDeclaration(getNode(prevArgName), /*type*/ undefined, ts.createIdentifier("undefined"))], getFlagOfBindingName(prevArgName, transformer.constIdentifiers)))));
             }
             return ret;
         }
@@ -113307,32 +117334,42 @@ var ts;
             }
             return innerCbBody;
         }
-        function getArgName(funcNode, transformer) {
+        function getArgBindingName(funcNode, transformer) {
             var numberOfAssignmentsOriginal = 0;
             var types = [];
             var name;
             if (ts.isFunctionLikeDeclaration(funcNode)) {
                 if (funcNode.parameters.length > 0) {
                     var param = funcNode.parameters[0].name;
-                    name = getMapEntryOrDefault(param);
+                    name = getMappedBindingNameOrDefault(param);
                 }
             }
             else if (ts.isIdentifier(funcNode)) {
                 name = getMapEntryOrDefault(funcNode);
             }
             // return undefined argName when arg is null or undefined
-            if (!name || name.identifier.text === "undefined") {
+            if (!name || "identifier" in name && name.identifier.text === "undefined") {
                 return undefined;
             }
             return name;
+            function getMappedBindingNameOrDefault(bindingName) {
+                if (ts.isIdentifier(bindingName))
+                    return getMapEntryOrDefault(bindingName);
+                var elements = ts.flatMap(bindingName.elements, function (element) {
+                    if (ts.isOmittedExpression(element))
+                        return [];
+                    return [getMappedBindingNameOrDefault(element.name)];
+                });
+                return createSynthBindingPattern(bindingName, elements);
+            }
             function getMapEntryOrDefault(identifier) {
                 var originalNode = getOriginalNode(identifier);
                 var symbol = getSymbol(originalNode);
                 if (!symbol) {
-                    return { identifier: identifier, types: types, numberOfAssignmentsOriginal: numberOfAssignmentsOriginal };
+                    return createSynthIdentifier(identifier, types, numberOfAssignmentsOriginal);
                 }
                 var mapEntry = transformer.synthNamesMap.get(ts.getSymbolId(symbol).toString());
-                return mapEntry || { identifier: identifier, types: types, numberOfAssignmentsOriginal: numberOfAssignmentsOriginal };
+                return mapEntry || createSynthIdentifier(identifier, types, numberOfAssignmentsOriginal);
             }
             function getSymbol(node) {
                 return node.symbol ? node.symbol : transformer.checker.getSymbolAtLocation(node);
@@ -113341,6 +117378,34 @@ var ts;
                 return node.original ? node.original : node;
             }
         }
+        function isEmpty(bindingName) {
+            if (!bindingName) {
+                return true;
+            }
+            if (isSynthIdentifier(bindingName)) {
+                return !bindingName.identifier.text;
+            }
+            return ts.every(bindingName.elements, isEmpty);
+        }
+        function getNode(bindingName) {
+            return isSynthIdentifier(bindingName) ? bindingName.identifier : bindingName.bindingPattern;
+        }
+        function createSynthIdentifier(identifier, types, numberOfAssignmentsOriginal) {
+            if (types === void 0) { types = []; }
+            if (numberOfAssignmentsOriginal === void 0) { numberOfAssignmentsOriginal = 0; }
+            return { kind: 0 /* Identifier */, identifier: identifier, types: types, numberOfAssignmentsOriginal: numberOfAssignmentsOriginal };
+        }
+        function createSynthBindingPattern(bindingPattern, elements, types) {
+            if (elements === void 0) { elements = ts.emptyArray; }
+            if (types === void 0) { types = []; }
+            return { kind: 1 /* BindingPattern */, bindingPattern: bindingPattern, elements: elements, types: types };
+        }
+        function isSynthIdentifier(bindingName) {
+            return bindingName.kind === 0 /* Identifier */;
+        }
+        function isSynthBindingPattern(bindingName) {
+            return bindingName.kind === 1 /* BindingPattern */;
+        }
     })(codefix = ts.codefix || (ts.codefix = {}));
 })(ts || (ts = {}));
 /* @internal */
@@ -113374,10 +117439,10 @@ var ts;
                 }
                 var importNode = ts.importFromModuleSpecifier(moduleSpecifier);
                 switch (importNode.kind) {
-                    case 248 /* ImportEqualsDeclaration */:
+                    case 249 /* ImportEqualsDeclaration */:
                         changes.replaceNode(importingFile, importNode, ts.makeImport(importNode.name, /*namedImports*/ undefined, moduleSpecifier, quotePreference));
                         break;
-                    case 191 /* CallExpression */:
+                    case 192 /* CallExpression */:
                         if (ts.isRequireCall(importNode, /*checkArgumentIsStringLiteralLike*/ false)) {
                             changes.replaceNode(importingFile, importNode, ts.createPropertyAccess(ts.getSynthesizedDeepClone(importNode), "default"));
                         }
@@ -113423,29 +117488,29 @@ var ts;
             sourceFile.forEachChild(function recur(node) {
                 if (ts.isPropertyAccessExpression(node) && ts.isExportsOrModuleExportsOrAlias(sourceFile, node.expression)) {
                     var parent = node.parent;
-                    cb(node, ts.isBinaryExpression(parent) && parent.left === node && parent.operatorToken.kind === 59 /* EqualsToken */);
+                    cb(node, ts.isBinaryExpression(parent) && parent.left === node && parent.operatorToken.kind === 60 /* EqualsToken */);
                 }
                 node.forEachChild(recur);
             });
         }
         function convertStatement(sourceFile, statement, checker, changes, identifiers, target, exports, quotePreference) {
             switch (statement.kind) {
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     convertVariableStatement(sourceFile, statement, changes, checker, identifiers, target, quotePreference);
                     return false;
-                case 221 /* ExpressionStatement */: {
+                case 222 /* ExpressionStatement */: {
                     var expression = statement.expression;
                     switch (expression.kind) {
-                        case 191 /* CallExpression */: {
+                        case 192 /* CallExpression */: {
                             if (ts.isRequireCall(expression, /*checkArgumentIsStringLiteralLike*/ true)) {
                                 // For side-effecting require() call, just make a side-effecting import.
                                 changes.replaceNode(sourceFile, statement, ts.makeImport(/*name*/ undefined, /*namedImports*/ undefined, expression.arguments[0], quotePreference));
                             }
                             return false;
                         }
-                        case 204 /* BinaryExpression */: {
+                        case 205 /* BinaryExpression */: {
                             var operatorToken = expression.operatorToken;
-                            return operatorToken.kind === 59 /* EqualsToken */ && convertAssignment(sourceFile, checker, expression, changes, exports);
+                            return operatorToken.kind === 60 /* EqualsToken */ && convertAssignment(sourceFile, checker, expression, changes, exports);
                         }
                     }
                 }
@@ -113485,8 +117550,8 @@ var ts;
         /** Converts `const name = require("moduleSpecifier").propertyName` */
         function convertPropertyAccessImport(name, propertyName, moduleSpecifier, identifiers, quotePreference) {
             switch (name.kind) {
-                case 184 /* ObjectBindingPattern */:
-                case 185 /* ArrayBindingPattern */: {
+                case 185 /* ObjectBindingPattern */:
+                case 186 /* ArrayBindingPattern */: {
                     // `const [a, b] = require("c").d` --> `import { d } from "c"; const [a, b] = d;`
                     var tmp = makeUniqueName(propertyName, identifiers);
                     return [
@@ -113494,7 +117559,7 @@ var ts;
                         makeConst(/*modifiers*/ undefined, name, ts.createIdentifier(tmp)),
                     ];
                 }
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     // `const a = require("b").c` --> `import { c as a } from "./b";
                     return [makeSingleImport(name.text, propertyName, moduleSpecifier, quotePreference)];
                 default:
@@ -113537,16 +117602,16 @@ var ts;
         function tryChangeModuleExportsObject(object) {
             var statements = ts.mapAllOrFail(object.properties, function (prop) {
                 switch (prop.kind) {
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
                     // TODO: Maybe we should handle this? See fourslash test `refactorConvertToEs6Module_export_object_shorthand.ts`.
-                    case 276 /* ShorthandPropertyAssignment */:
-                    case 277 /* SpreadAssignment */:
+                    case 277 /* ShorthandPropertyAssignment */:
+                    case 278 /* SpreadAssignment */:
                         return undefined;
-                    case 275 /* PropertyAssignment */:
+                    case 276 /* PropertyAssignment */:
                         return !ts.isIdentifier(prop.name) ? undefined : convertExportsDotXEquals_replaceNode(prop.name.text, prop.initializer);
-                    case 156 /* MethodDeclaration */:
-                        return !ts.isIdentifier(prop.name) ? undefined : functionExpressionToDeclaration(prop.name.text, [ts.createToken(85 /* ExportKeyword */)], prop);
+                    case 157 /* MethodDeclaration */:
+                        return !ts.isIdentifier(prop.name) ? undefined : functionExpressionToDeclaration(prop.name.text, [ts.createToken(86 /* ExportKeyword */)], prop);
                     default:
                         ts.Debug.assertNever(prop);
                 }
@@ -113595,7 +117660,7 @@ var ts;
             var name = left.name.text;
             if ((ts.isFunctionExpression(right) || ts.isArrowFunction(right) || ts.isClassExpression(right)) && (!right.name || right.name.text === name)) {
                 // `exports.f = function() {}` -> `export function f() {}` -- Replace `exports.f = ` with `export `, and insert the name after `function`.
-                changes.replaceRange(sourceFile, { pos: left.getStart(sourceFile), end: right.getStart(sourceFile) }, ts.createToken(85 /* ExportKeyword */), { suffix: " " });
+                changes.replaceRange(sourceFile, { pos: left.getStart(sourceFile), end: right.getStart(sourceFile) }, ts.createToken(86 /* ExportKeyword */), { suffix: " " });
                 if (!right.name)
                     changes.insertName(sourceFile, right, name);
                 var semi = ts.findChildOfKind(parent, 26 /* SemicolonToken */, sourceFile);
@@ -113604,14 +117669,14 @@ var ts;
             }
             else {
                 // `exports.f = function g() {}` -> `export const f = function g() {}` -- just replace `exports.` with `export const `
-                changes.replaceNodeRangeWithNodes(sourceFile, left.expression, ts.findChildOfKind(left, 24 /* DotToken */, sourceFile), [ts.createToken(85 /* ExportKeyword */), ts.createToken(77 /* ConstKeyword */)], { joiner: " ", suffix: " " });
+                changes.replaceNodeRangeWithNodes(sourceFile, left.expression, ts.findChildOfKind(left, 24 /* DotToken */, sourceFile), [ts.createToken(86 /* ExportKeyword */), ts.createToken(78 /* ConstKeyword */)], { joiner: " ", suffix: " " });
             }
         }
         // TODO: GH#22492 this will cause an error if a change has been made inside the body of the node.
         function convertExportsDotXEquals_replaceNode(name, exported) {
-            var modifiers = [ts.createToken(85 /* ExportKeyword */)];
+            var modifiers = [ts.createToken(86 /* ExportKeyword */)];
             switch (exported.kind) {
-                case 196 /* FunctionExpression */: {
+                case 197 /* FunctionExpression */: {
                     var expressionName = exported.name;
                     if (expressionName && expressionName.text !== name) {
                         // `exports.f = function g() {}` -> `export const f = function g() {}`
@@ -113619,10 +117684,10 @@ var ts;
                     }
                 }
                 // falls through
-                case 197 /* ArrowFunction */:
+                case 198 /* ArrowFunction */:
                     // `exports.f = function() {}` --> `export function f() {}`
                     return functionExpressionToDeclaration(name, modifiers, exported);
-                case 209 /* ClassExpression */:
+                case 210 /* ClassExpression */:
                     // `exports.C = class {}` --> `export class C {}`
                     return classExpressionToDeclaration(name, modifiers, exported);
                 default:
@@ -113640,7 +117705,7 @@ var ts;
          */
         function convertSingleImport(file, name, moduleSpecifier, changes, checker, identifiers, target, quotePreference) {
             switch (name.kind) {
-                case 184 /* ObjectBindingPattern */: {
+                case 185 /* ObjectBindingPattern */: {
                     var importSpecifiers = ts.mapAllOrFail(name.elements, function (e) {
                         return e.dotDotDotToken || e.initializer || e.propertyName && !ts.isIdentifier(e.propertyName) || !ts.isIdentifier(e.name)
                             ? undefined
@@ -113651,7 +117716,7 @@ var ts;
                     }
                 }
                 // falls through -- object destructuring has an interesting pattern and must be a variable declaration
-                case 185 /* ArrayBindingPattern */: {
+                case 186 /* ArrayBindingPattern */: {
                     /*
                     import x from "x";
                     const [a, b, c] = x;
@@ -113662,7 +117727,7 @@ var ts;
                         makeConst(/*modifiers*/ undefined, ts.getSynthesizedDeepClone(name), ts.createIdentifier(tmp)),
                     ];
                 }
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return convertSingleIdentifierImport(file, name, moduleSpecifier, changes, checker, identifiers, quotePreference);
                 default:
                     return ts.Debug.assertNever(name);
@@ -113734,11 +117799,11 @@ var ts;
         function isFreeIdentifier(node) {
             var parent = node.parent;
             switch (parent.kind) {
-                case 189 /* PropertyAccessExpression */:
+                case 190 /* PropertyAccessExpression */:
                     return parent.name !== node;
-                case 186 /* BindingElement */:
+                case 187 /* BindingElement */:
                     return parent.propertyName !== node;
-                case 253 /* ImportSpecifier */:
+                case 254 /* ImportSpecifier */:
                     return parent.propertyName !== node;
                 default:
                     return true;
@@ -114077,21 +118142,21 @@ var ts;
         function tryAddToExistingImport(existingImports) {
             return ts.firstDefined(existingImports, function (_a) {
                 var declaration = _a.declaration, importKind = _a.importKind;
-                if (declaration.kind !== 249 /* ImportDeclaration */)
+                if (declaration.kind !== 250 /* ImportDeclaration */)
                     return undefined;
                 var importClause = declaration.importClause;
                 if (!importClause)
                     return undefined;
                 var name = importClause.name, namedBindings = importClause.namedBindings;
-                return importKind === 1 /* Default */ && !name || importKind === 0 /* Named */ && (!namedBindings || namedBindings.kind === 252 /* NamedImports */)
+                return importKind === 1 /* Default */ && !name || importKind === 0 /* Named */ && (!namedBindings || namedBindings.kind === 253 /* NamedImports */)
                     ? { kind: 2 /* AddToExisting */, importClause: importClause, importKind: importKind }
                     : undefined;
             });
         }
         function getNamespaceImportName(declaration) {
-            if (declaration.kind === 249 /* ImportDeclaration */) {
+            if (declaration.kind === 250 /* ImportDeclaration */) {
                 var namedBindings = declaration.importClause && ts.isImportClause(declaration.importClause) && declaration.importClause.namedBindings;
-                return namedBindings && namedBindings.kind === 251 /* NamespaceImport */ ? namedBindings.name : undefined;
+                return namedBindings && namedBindings.kind === 252 /* NamespaceImport */ ? namedBindings.name : undefined;
             }
             else {
                 return declaration.name;
@@ -114102,7 +118167,7 @@ var ts;
             // Can't use an es6 import for a type in JS.
             return exportedSymbolIsTypeOnly && ts.isSourceFileJS(sourceFile) ? ts.emptyArray : ts.mapDefined(sourceFile.imports, function (moduleSpecifier) {
                 var i = ts.importFromModuleSpecifier(moduleSpecifier);
-                return (i.kind === 249 /* ImportDeclaration */ || i.kind === 248 /* ImportEqualsDeclaration */)
+                return (i.kind === 250 /* ImportDeclaration */ || i.kind === 249 /* ImportEqualsDeclaration */)
                     && checker.getSymbolAtLocation(moduleSpecifier) === moduleSymbol ? { declaration: i, importKind: importKind } : undefined;
             });
         }
@@ -114125,9 +118190,9 @@ var ts;
         }
         function newImportInfoFromExistingSpecifier(_a) {
             var declaration = _a.declaration, importKind = _a.importKind;
-            var expression = declaration.kind === 249 /* ImportDeclaration */
+            var expression = declaration.kind === 250 /* ImportDeclaration */
                 ? declaration.moduleSpecifier
-                : declaration.moduleReference.kind === 259 /* ExternalModuleReference */
+                : declaration.moduleReference.kind === 260 /* ExternalModuleReference */
                     ? declaration.moduleReference.expression
                     : undefined;
             return expression && ts.isStringLiteral(expression) ? { kind: 3 /* AddNew */, moduleSpecifier: expression.text, importKind: importKind } : undefined;
@@ -114249,9 +118314,11 @@ var ts;
                 var aliased = checker.getImmediateAliasedSymbol(defaultExport);
                 return aliased && getDefaultExportInfoWorker(aliased, ts.Debug.assertDefined(aliased.parent), checker, compilerOptions);
             }
-            else {
-                return { symbolForMeaning: defaultExport, name: moduleSymbolToValidIdentifier(moduleSymbol, compilerOptions.target) };
+            if (defaultExport.escapedName !== "default" /* Default */ &&
+                defaultExport.escapedName !== "export=" /* ExportEquals */) {
+                return { symbolForMeaning: defaultExport, name: defaultExport.getName() };
             }
+            return { symbolForMeaning: defaultExport, name: moduleSymbolToValidIdentifier(moduleSymbol, compilerOptions.target) };
         }
         function getNameForExportDefault(symbol) {
             return symbol.declarations && ts.firstDefined(symbol.declarations, function (declaration) {
@@ -114455,12 +118522,12 @@ var ts;
             var checker = context.program.getTypeChecker();
             var suggestion;
             if (ts.isPropertyAccessExpression(node.parent) && node.parent.name === node) {
-                ts.Debug.assert(node.kind === 72 /* Identifier */);
+                ts.Debug.assert(node.kind === 73 /* Identifier */);
                 var containingType = checker.getTypeAtLocation(node.parent.expression);
                 suggestion = checker.getSuggestionForNonexistentProperty(node, containingType);
             }
             else if (ts.isImportSpecifier(node.parent) && node.parent.name === node) {
-                ts.Debug.assert(node.kind === 72 /* Identifier */);
+                ts.Debug.assert(node.kind === 73 /* Identifier */);
                 var importDeclaration = ts.findAncestor(node, ts.isImportDeclaration);
                 var resolvedSourceFile = getResolvedSourceFileFromImportDeclaration(sourceFile, context, importDeclaration);
                 if (resolvedSourceFile && resolvedSourceFile.symbol) {
@@ -114523,7 +118590,7 @@ var ts;
         codefix.registerCodeFix({
             errorCodes: errorCodes,
             getCodeActions: function (context) {
-                var info = getInfo(context.sourceFile, context.span.start, context.program.getTypeChecker());
+                var info = getInfo(context.sourceFile, context.span.start, context.program.getTypeChecker(), context.program);
                 if (!info)
                     return undefined;
                 if (info.kind === 0 /* Enum */) {
@@ -114546,7 +118613,7 @@ var ts;
                 var typeDeclToMembers = new ts.NodeMap();
                 return codefix.createCombinedCodeActions(ts.textChanges.ChangeTracker.with(context, function (changes) {
                     codefix.eachDiagnostic(context, errorCodes, function (diag) {
-                        var info = getInfo(diag.file, diag.start, checker);
+                        var info = getInfo(diag.file, diag.start, checker, context.program);
                         if (!info || !ts.addToSeen(seen, ts.getNodeId(info.parentDeclaration) + "#" + info.token.text)) {
                             return;
                         }
@@ -114614,7 +118681,7 @@ var ts;
             InfoKind[InfoKind["Enum"] = 0] = "Enum";
             InfoKind[InfoKind["ClassOrInterface"] = 1] = "ClassOrInterface";
         })(InfoKind || (InfoKind = {}));
-        function getInfo(tokenSourceFile, tokenPos, checker) {
+        function getInfo(tokenSourceFile, tokenPos, checker, program) {
             // The identifier of the missing property. eg:
             // this.missing = 1;
             //      ^^^^^^^
@@ -114631,7 +118698,7 @@ var ts;
                 return undefined;
             // Prefer to change the class instead of the interface if they are merged
             var classOrInterface = ts.find(symbol.declarations, ts.isClassLike) || ts.find(symbol.declarations, ts.isInterfaceDeclaration);
-            if (classOrInterface) {
+            if (classOrInterface && !program.isSourceFileFromExternalLibrary(classOrInterface.getSourceFile())) {
                 var makeStatic = (leftExpressionType.target || leftExpressionType) !== checker.getDeclaredTypeOfSymbol(symbol);
                 var declSourceFile = classOrInterface.getSourceFile();
                 var inJs = ts.isSourceFileJS(declSourceFile);
@@ -114639,7 +118706,7 @@ var ts;
                 return { kind: 1 /* ClassOrInterface */, token: token, parentDeclaration: classOrInterface, makeStatic: makeStatic, declSourceFile: declSourceFile, inJs: inJs, call: call };
             }
             var enumDeclaration = ts.find(symbol.declarations, ts.isEnumDeclaration);
-            if (enumDeclaration) {
+            if (enumDeclaration && !program.isSourceFileFromExternalLibrary(enumDeclaration.getSourceFile())) {
                 return { kind: 0 /* Enum */, token: token, parentDeclaration: enumDeclaration };
             }
             return undefined;
@@ -114651,7 +118718,7 @@ var ts;
         }
         function addMissingMemberInJs(changeTracker, declSourceFile, classDeclaration, tokenName, makeStatic) {
             if (makeStatic) {
-                if (classDeclaration.kind === 209 /* ClassExpression */) {
+                if (classDeclaration.kind === 210 /* ClassExpression */) {
                     return;
                 }
                 var className = classDeclaration.name.getText();
@@ -114677,7 +118744,7 @@ var ts;
         }
         function getTypeNode(checker, classDeclaration, token) {
             var typeNode;
-            if (token.parent.parent.kind === 204 /* BinaryExpression */) {
+            if (token.parent.parent.kind === 205 /* BinaryExpression */) {
                 var binaryExpression = token.parent.parent;
                 var otherExpression = token.parent === binaryExpression.left ? binaryExpression.right : binaryExpression.left;
                 var widenedType = checker.getWidenedType(checker.getBaseTypeOfLiteralType(checker.getTypeAtLocation(otherExpression)));
@@ -114687,7 +118754,7 @@ var ts;
                 var contextualType = checker.getContextualType(token.parent);
                 typeNode = contextualType ? checker.typeToTypeNode(contextualType) : undefined;
             }
-            return typeNode || ts.createKeywordTypeNode(120 /* AnyKeyword */);
+            return typeNode || ts.createKeywordTypeNode(121 /* AnyKeyword */);
         }
         function createAddPropertyDeclarationAction(context, declSourceFile, classDeclaration, makeStatic, tokenName, typeNode) {
             var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return addPropertyDeclaration(t, declSourceFile, classDeclaration, tokenName, typeNode, makeStatic); });
@@ -114696,7 +118763,7 @@ var ts;
         function addPropertyDeclaration(changeTracker, declSourceFile, classDeclaration, tokenName, typeNode, makeStatic) {
             var property = ts.createProperty(
             /*decorators*/ undefined, 
-            /*modifiers*/ makeStatic ? [ts.createToken(116 /* StaticKeyword */)] : undefined, tokenName, 
+            /*modifiers*/ makeStatic ? [ts.createToken(117 /* StaticKeyword */)] : undefined, tokenName, 
             /*questionToken*/ undefined, typeNode, 
             /*initializer*/ undefined);
             var lastProp = getNodeToInsertPropertyAfter(classDeclaration);
@@ -114720,7 +118787,7 @@ var ts;
         }
         function createAddIndexSignatureAction(context, declSourceFile, classDeclaration, tokenName, typeNode) {
             // Index signatures cannot have the static modifier.
-            var stringTypeNode = ts.createKeywordTypeNode(138 /* StringKeyword */);
+            var stringTypeNode = ts.createKeywordTypeNode(139 /* StringKeyword */);
             var indexingParameter = ts.createParameter(
             /*decorators*/ undefined, 
             /*modifiers*/ undefined, 
@@ -114740,7 +118807,7 @@ var ts;
         }
         function addMethodDeclaration(context, changeTracker, declSourceFile, typeDecl, token, callExpression, makeStatic, inJs, preferences) {
             var methodDeclaration = codefix.createMethodFromCallExpression(context, callExpression, token.text, inJs, makeStatic, preferences, typeDecl);
-            var containingMethodDeclaration = ts.getAncestor(callExpression, 156 /* MethodDeclaration */);
+            var containingMethodDeclaration = ts.getAncestor(callExpression, 157 /* MethodDeclaration */);
             if (containingMethodDeclaration && containingMethodDeclaration.parent === typeDecl) {
                 changeTracker.insertNodeAfter(declSourceFile, containingMethodDeclaration, methodDeclaration);
             }
@@ -114804,7 +118871,6 @@ var ts;
     (function (codefix) {
         var fixName = "fixCannotFindModule";
         var fixIdInstallTypesPackage = "installTypesPackage";
-        var fixIdGenerateTypes = "generateTypes";
         var errorCodeCannotFindModule = ts.Diagnostics.Cannot_find_module_0.code;
         var errorCodes = [
             errorCodeCannotFindModule,
@@ -114819,13 +118885,12 @@ var ts;
                     return undefined;
                 var typesPackageName = getTypesPackageNameToInstall(packageName, host, context.errorCode);
                 return typesPackageName === undefined
-                    ? ts.singleElementArray(tryGetGenerateTypesAction(context, packageName))
+                    ? []
                     : [codefix.createCodeFixAction(fixName, /*changes*/ [], [ts.Diagnostics.Install_0, typesPackageName], fixIdInstallTypesPackage, ts.Diagnostics.Install_all_missing_types_packages, getInstallCommand(sourceFile.fileName, typesPackageName))];
             },
-            fixIds: [fixIdInstallTypesPackage, fixIdGenerateTypes],
+            fixIds: [fixIdInstallTypesPackage],
             getAllCodeActions: function (context) {
-                var savedTypesDir = null; // tslint:disable-line no-null-keyword
-                return codefix.codeFixAll(context, errorCodes, function (changes, diag, commands) {
+                return codefix.codeFixAll(context, errorCodes, function (_changes, diag, commands) {
                     var packageName = tryGetImportedPackageName(diag.file, diag.start);
                     if (packageName === undefined)
                         return undefined;
@@ -114837,96 +118902,12 @@ var ts;
                             }
                             break;
                         }
-                        case fixIdGenerateTypes: {
-                            var typesDir = savedTypesDir !== null ? savedTypesDir : savedTypesDir = getOrCreateTypesDirectory(changes, context);
-                            var command = typesDir === undefined ? undefined : tryGenerateTypes(typesDir, packageName, context);
-                            if (command)
-                                commands.push(command);
-                            break;
-                        }
                         default:
                             ts.Debug.fail("Bad fixId: " + context.fixId);
                     }
                 });
             },
         });
-        function tryGetGenerateTypesAction(context, packageName) {
-            var command;
-            var changes = ts.textChanges.ChangeTracker.with(context, function (t) {
-                var typesDir = getOrCreateTypesDirectory(t, context);
-                command = typesDir === undefined ? undefined : tryGenerateTypes(typesDir, packageName, context);
-            });
-            return command && codefix.createCodeFixAction(fixName, changes, [ts.Diagnostics.Generate_types_for_0, packageName], fixIdGenerateTypes, ts.Diagnostics.Generate_types_for_all_packages_without_types, command);
-        }
-        function tryGenerateTypes(typesDir, packageName, context) {
-            var file = context.sourceFile.fileName;
-            var fileToGenerateTypesFor = ts.tryResolveJSModule(packageName, ts.getDirectoryPath(file), context.host); // TODO: GH#18217
-            if (fileToGenerateTypesFor === undefined)
-                return undefined;
-            var outputFileName = ts.resolvePath(ts.getDirectoryPath(context.program.getCompilerOptions().configFile.fileName), typesDir, packageName + ".d.ts");
-            if (context.host.fileExists(outputFileName))
-                return undefined;
-            return { type: "generate types", file: file, fileToGenerateTypesFor: fileToGenerateTypesFor, outputFileName: outputFileName };
-        }
-        // If no types directory exists yet, adds it to tsconfig.json
-        function getOrCreateTypesDirectory(changes, context) {
-            var configFile = context.program.getCompilerOptions().configFile;
-            if (!configFile)
-                return undefined;
-            var tsconfigObjectLiteral = ts.getTsConfigObjectLiteralExpression(configFile);
-            if (!tsconfigObjectLiteral)
-                return undefined;
-            var compilerOptionsProperty = codefix.findJsonProperty(tsconfigObjectLiteral, "compilerOptions");
-            if (!compilerOptionsProperty) {
-                var newCompilerOptions = ts.createObjectLiteral([makeDefaultBaseUrl(), makeDefaultPaths()]);
-                changes.insertNodeAtObjectStart(configFile, tsconfigObjectLiteral, codefix.createJsonPropertyAssignment("compilerOptions", newCompilerOptions));
-                return defaultTypesDirectoryName;
-            }
-            var compilerOptions = compilerOptionsProperty.initializer;
-            if (!ts.isObjectLiteralExpression(compilerOptions))
-                return defaultTypesDirectoryName;
-            var baseUrl = getOrAddBaseUrl(changes, configFile, compilerOptions);
-            var typesDirectoryFromPathMapping = getOrAddPathMapping(changes, configFile, compilerOptions);
-            return ts.combinePaths(baseUrl, typesDirectoryFromPathMapping);
-        }
-        var defaultBaseUrl = ".";
-        function makeDefaultBaseUrl() {
-            return codefix.createJsonPropertyAssignment("baseUrl", ts.createStringLiteral(defaultBaseUrl));
-        }
-        function getOrAddBaseUrl(changes, tsconfig, compilerOptions) {
-            var baseUrlProp = codefix.findJsonProperty(compilerOptions, "baseUrl");
-            if (baseUrlProp) {
-                return ts.isStringLiteral(baseUrlProp.initializer) ? baseUrlProp.initializer.text : defaultBaseUrl;
-            }
-            else {
-                changes.insertNodeAtObjectStart(tsconfig, compilerOptions, makeDefaultBaseUrl());
-                return defaultBaseUrl;
-            }
-        }
-        var defaultTypesDirectoryName = "types";
-        function makeDefaultPathMapping() {
-            return codefix.createJsonPropertyAssignment("*", ts.createArrayLiteral([ts.createStringLiteral(defaultTypesDirectoryName + "/*")]));
-        }
-        function makeDefaultPaths() {
-            return codefix.createJsonPropertyAssignment("paths", ts.createObjectLiteral([makeDefaultPathMapping()]));
-        }
-        function getOrAddPathMapping(changes, tsconfig, compilerOptions) {
-            var paths = codefix.findJsonProperty(compilerOptions, "paths");
-            if (!paths || !ts.isObjectLiteralExpression(paths.initializer)) {
-                changes.insertNodeAtObjectStart(tsconfig, compilerOptions, makeDefaultPaths());
-                return defaultTypesDirectoryName;
-            }
-            // Look for an existing path mapping. Should look like `"*": "foo/*"`.
-            var existing = ts.firstDefined(paths.initializer.properties, function (prop) {
-                return ts.isPropertyAssignment(prop) && ts.isStringLiteral(prop.name) && prop.name.text === "*" && ts.isArrayLiteralExpression(prop.initializer)
-                    ? ts.firstDefined(prop.initializer.elements, function (value) { return ts.isStringLiteral(value) ? ts.tryRemoveSuffix(value.text, "/*") : undefined; })
-                    : undefined;
-            });
-            if (existing)
-                return existing;
-            changes.insertNodeAtObjectStart(tsconfig, paths.initializer, makeDefaultPathMapping());
-            return defaultTypesDirectoryName;
-        }
         function getInstallCommand(fileName, packageName) {
             return { type: "install package", file: fileName, packageName: packageName };
         }
@@ -115034,7 +119015,7 @@ var ts;
         }
         function getNodes(sourceFile, pos) {
             var token = ts.getTokenAtPosition(sourceFile, pos);
-            if (token.kind !== 100 /* ThisKeyword */)
+            if (token.kind !== 101 /* ThisKeyword */)
                 return undefined;
             var constructor = ts.getContainingFunction(token);
             var superCall = findSuperCall(constructor.body);
@@ -115073,7 +119054,7 @@ var ts;
         });
         function getNode(sourceFile, pos) {
             var token = ts.getTokenAtPosition(sourceFile, pos);
-            ts.Debug.assert(token.kind === 124 /* ConstructorKeyword */);
+            ts.Debug.assert(token.kind === 125 /* ConstructorKeyword */);
             return token.parent;
         }
         function doChange(changes, sourceFile, ctr) {
@@ -115089,7 +119070,7 @@ var ts;
     (function (codefix) {
         var fixId = "enableExperimentalDecorators";
         var errorCodes = [
-            ts.Diagnostics.Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_to_remove_this_warning.code
+            ts.Diagnostics.Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_in_your_tsconfig_or_jsconfig_to_remove_this_warning.code
         ];
         codefix.registerCodeFix({
             errorCodes: errorCodes,
@@ -115098,12 +119079,19 @@ var ts;
                 if (configFile === undefined) {
                     return undefined;
                 }
-                var changes = ts.textChanges.ChangeTracker.with(context, function (changeTracker) { return makeChange(changeTracker, configFile); });
+                var changes = ts.textChanges.ChangeTracker.with(context, function (changeTracker) { return doChange(changeTracker, configFile); });
                 return [codefix.createCodeFixActionNoFixId(fixId, changes, ts.Diagnostics.Enable_the_experimentalDecorators_option_in_your_configuration_file)];
             },
             fixIds: [fixId],
+            getAllCodeActions: function (context) { return codefix.codeFixAll(context, errorCodes, function (changes) {
+                var configFile = context.program.getCompilerOptions().configFile;
+                if (configFile === undefined) {
+                    return undefined;
+                }
+                doChange(changes, configFile);
+            }); },
         });
-        function makeChange(changeTracker, configFile) {
+        function doChange(changeTracker, configFile) {
             codefix.setJsonCompilerOptionValue(changeTracker, configFile, "experimentalDecorators", ts.createTrue());
         }
     })(codefix = ts.codefix || (ts.codefix = {}));
@@ -115137,14 +119125,14 @@ var ts;
             var token = ts.getTokenAtPosition(sourceFile, pos);
             var heritageClauses = ts.getContainingClass(token).heritageClauses;
             var extendsToken = heritageClauses[0].getFirstToken();
-            return extendsToken.kind === 86 /* ExtendsKeyword */ ? { extendsToken: extendsToken, heritageClauses: heritageClauses } : undefined;
+            return extendsToken.kind === 87 /* ExtendsKeyword */ ? { extendsToken: extendsToken, heritageClauses: heritageClauses } : undefined;
         }
         function doChanges(changes, sourceFile, extendsToken, heritageClauses) {
-            changes.replaceNode(sourceFile, extendsToken, ts.createToken(109 /* ImplementsKeyword */));
+            changes.replaceNode(sourceFile, extendsToken, ts.createToken(110 /* ImplementsKeyword */));
             // If there is already an implements clause, replace the implements keyword with a comma.
             if (heritageClauses.length === 2 &&
-                heritageClauses[0].token === 86 /* ExtendsKeyword */ &&
-                heritageClauses[1].token === 109 /* ImplementsKeyword */) {
+                heritageClauses[0].token === 87 /* ExtendsKeyword */ &&
+                heritageClauses[1].token === 110 /* ImplementsKeyword */) {
                 var implementsToken = heritageClauses[1].getFirstToken();
                 var implementsFullStart = implementsToken.getFullStart();
                 changes.replaceRange(sourceFile, { pos: implementsFullStart, end: implementsFullStart }, ts.createToken(27 /* CommaToken */));
@@ -115251,7 +119239,7 @@ var ts;
                     return [createDeleteFix(delVar, ts.Diagnostics.Remove_variable_statement)];
                 }
                 var result = [];
-                if (token.kind === 127 /* InferKeyword */) {
+                if (token.kind === 128 /* InferKeyword */) {
                     var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return changeInferToUnknown(t, sourceFile, token); });
                     var name = ts.cast(token.parent, ts.isInferTypeNode).typeParameter.name.text;
                     result.push(codefix.createCodeFixAction(fixName, changes, [ts.Diagnostics.Replace_infer_0_with_unknown, name], fixIdInfer, ts.Diagnostics.Replace_all_unused_infer_with_unknown));
@@ -115283,7 +119271,7 @@ var ts;
                             tryPrefixDeclaration(changes, diag.code, sourceFile, token);
                             break;
                         case fixIdDelete: {
-                            if (token.kind === 127 /* InferKeyword */)
+                            if (token.kind === 128 /* InferKeyword */)
                                 break; // Can't delete
                             var importDecl = tryGetFullImport(token);
                             if (importDecl) {
@@ -115302,7 +119290,7 @@ var ts;
                             break;
                         }
                         case fixIdInfer:
-                            if (token.kind === 127 /* InferKeyword */) {
+                            if (token.kind === 128 /* InferKeyword */) {
                                 changeInferToUnknown(changes, sourceFile, token);
                             }
                             break;
@@ -115313,7 +119301,7 @@ var ts;
             },
         });
         function changeInferToUnknown(changes, sourceFile, token) {
-            changes.replaceNode(sourceFile, token.parent, ts.createKeywordTypeNode(143 /* UnknownKeyword */));
+            changes.replaceNode(sourceFile, token.parent, ts.createKeywordTypeNode(144 /* UnknownKeyword */));
         }
         function createDeleteFix(changes, diag) {
             return codefix.createCodeFixAction(fixName, changes, diag, fixIdDelete, ts.Diagnostics.Delete_all_unused_declarations);
@@ -115323,13 +119311,13 @@ var ts;
         }
         // Sometimes the diagnostic span is an entire ImportDeclaration, so we should remove the whole thing.
         function tryGetFullImport(token) {
-            return token.kind === 92 /* ImportKeyword */ ? ts.tryCast(token.parent, ts.isImportDeclaration) : undefined;
+            return token.kind === 93 /* ImportKeyword */ ? ts.tryCast(token.parent, ts.isImportDeclaration) : undefined;
         }
         function tryDeleteFullDestructure(token, changes, sourceFile, checker, sourceFiles, isFixAll) {
             if (token.kind !== 18 /* OpenBraceToken */ || !ts.isObjectBindingPattern(token.parent))
                 return false;
             var decl = token.parent.parent;
-            if (decl.kind === 151 /* Parameter */) {
+            if (decl.kind === 152 /* Parameter */) {
                 tryDeleteParameter(changes, sourceFile, decl, checker, sourceFiles, isFixAll);
             }
             else {
@@ -115340,7 +119328,7 @@ var ts;
         function tryDeleteFullVariableStatement(sourceFile, token, changes) {
             var declarationList = ts.tryCast(token.parent, ts.isVariableDeclarationList);
             if (declarationList && declarationList.getChildren(sourceFile)[0] === token) {
-                changes.delete(sourceFile, declarationList.parent.kind === 219 /* VariableStatement */ ? declarationList.parent : declarationList);
+                changes.delete(sourceFile, declarationList.parent.kind === 220 /* VariableStatement */ ? declarationList.parent : declarationList);
                 return true;
             }
             return false;
@@ -115349,7 +119337,7 @@ var ts;
             // Don't offer to prefix a property.
             if (errorCode === ts.Diagnostics.Property_0_is_declared_but_its_value_is_never_read.code)
                 return;
-            if (token.kind === 127 /* InferKeyword */) {
+            if (token.kind === 128 /* InferKeyword */) {
                 token = ts.cast(token.parent, ts.isInferTypeNode).typeParameter.name;
             }
             if (ts.isIdentifier(token) && canPrefix(token)) {
@@ -115358,14 +119346,14 @@ var ts;
         }
         function canPrefix(token) {
             switch (token.parent.kind) {
-                case 151 /* Parameter */:
-                case 150 /* TypeParameter */:
+                case 152 /* Parameter */:
+                case 151 /* TypeParameter */:
                     return true;
-                case 237 /* VariableDeclaration */: {
+                case 238 /* VariableDeclaration */: {
                     var varDecl = token.parent;
                     switch (varDecl.parent.parent.kind) {
-                        case 227 /* ForOfStatement */:
-                        case 226 /* ForInStatement */:
+                        case 228 /* ForOfStatement */:
+                        case 227 /* ForInStatement */:
                             return true;
                     }
                 }
@@ -115412,26 +119400,26 @@ var ts;
         function mayDeleteParameter(p, checker, isFixAll) {
             var parent = p.parent;
             switch (parent.kind) {
-                case 156 /* MethodDeclaration */:
+                case 157 /* MethodDeclaration */:
                     // Don't remove a parameter if this overrides something.
                     var symbol = checker.getSymbolAtLocation(parent.name);
                     if (ts.isMemberSymbolInBaseType(symbol, checker))
                         return false;
                 // falls through
-                case 157 /* Constructor */:
-                case 239 /* FunctionDeclaration */:
+                case 158 /* Constructor */:
+                case 240 /* FunctionDeclaration */:
                     return true;
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */: {
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */: {
                     // Can't remove a non-last parameter in a callback. Can remove a parameter in code-fix-all if future parameters are also unused.
                     var parameters = parent.parameters;
                     var index = parameters.indexOf(p);
                     ts.Debug.assert(index !== -1);
                     return isFixAll
-                        ? parameters.slice(index + 1).every(function (p) { return p.name.kind === 72 /* Identifier */ && !p.symbol.isReferenced; })
+                        ? parameters.slice(index + 1).every(function (p) { return p.name.kind === 73 /* Identifier */ && !p.symbol.isReferenced; })
                         : index === parameters.length - 1;
                 }
-                case 159 /* SetAccessor */:
+                case 160 /* SetAccessor */:
                     // Setter must have a parameter
                     return false;
                 default:
@@ -115471,7 +119459,7 @@ var ts;
             var container = (ts.isBlock(statement.parent) ? statement.parent : statement).parent;
             if (!ts.isBlock(statement.parent) || statement === ts.first(statement.parent.statements)) {
                 switch (container.kind) {
-                    case 222 /* IfStatement */:
+                    case 223 /* IfStatement */:
                         if (container.elseStatement) {
                             if (ts.isBlock(statement.parent)) {
                                 break;
@@ -115482,15 +119470,15 @@ var ts;
                             return;
                         }
                     // falls through
-                    case 224 /* WhileStatement */:
-                    case 225 /* ForStatement */:
+                    case 225 /* WhileStatement */:
+                    case 226 /* ForStatement */:
                         changes.delete(sourceFile, container);
                         return;
                 }
             }
             if (ts.isBlock(statement.parent)) {
-                var end_2 = start + length;
-                var lastStatement = ts.Debug.assertDefined(lastWhere(ts.sliceAfter(statement.parent.statements, statement), function (s) { return s.pos < end_2; }));
+                var end_3 = start + length;
+                var lastStatement = ts.Debug.assertDefined(lastWhere(ts.sliceAfter(statement.parent.statements, statement), function (s) { return s.pos < end_3; }));
                 changes.deleteNodeRange(sourceFile, statement, lastStatement);
             }
             else {
@@ -115556,7 +119544,7 @@ var ts;
                 var typeNode = info.typeNode, type = info.type;
                 var original = typeNode.getText(sourceFile);
                 var actions = [fix(type, fixIdPlain, ts.Diagnostics.Change_all_jsdoc_style_types_to_TypeScript)];
-                if (typeNode.kind === 291 /* JSDocNullableType */) {
+                if (typeNode.kind === 292 /* JSDocNullableType */) {
                     // for nullable types, suggest the flow-compatible `T | null | undefined`
                     // in addition to the jsdoc/closure-compatible `T | null`
                     actions.push(fix(checker.getNullableType(type, 32768 /* Undefined */), fixIdNullable, ts.Diagnostics.Change_all_jsdoc_style_types_to_TypeScript_and_add_undefined_to_nullable_types));
@@ -115576,7 +119564,7 @@ var ts;
                     if (!info)
                         return;
                     var typeNode = info.typeNode, type = info.type;
-                    var fixedType = typeNode.kind === 291 /* JSDocNullableType */ && fixId === fixIdNullable ? checker.getNullableType(type, 32768 /* Undefined */) : type;
+                    var fixedType = typeNode.kind === 292 /* JSDocNullableType */ && fixId === fixIdNullable ? checker.getNullableType(type, 32768 /* Undefined */) : type;
                     doChange(changes, sourceFile, typeNode, fixedType, checker);
                 });
             }
@@ -115593,22 +119581,22 @@ var ts;
             // NOTE: Some locations are not handled yet:
             // MappedTypeNode.typeParameters and SignatureDeclaration.typeParameters, as well as CallExpression.typeArguments
             switch (node.kind) {
-                case 212 /* AsExpression */:
-                case 160 /* CallSignature */:
-                case 161 /* ConstructSignature */:
-                case 239 /* FunctionDeclaration */:
-                case 158 /* GetAccessor */:
-                case 162 /* IndexSignature */:
-                case 181 /* MappedType */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
-                case 151 /* Parameter */:
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
-                case 159 /* SetAccessor */:
-                case 242 /* TypeAliasDeclaration */:
-                case 194 /* TypeAssertionExpression */:
-                case 237 /* VariableDeclaration */:
+                case 213 /* AsExpression */:
+                case 161 /* CallSignature */:
+                case 162 /* ConstructSignature */:
+                case 240 /* FunctionDeclaration */:
+                case 159 /* GetAccessor */:
+                case 163 /* IndexSignature */:
+                case 182 /* MappedType */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
+                case 152 /* Parameter */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
+                case 160 /* SetAccessor */:
+                case 243 /* TypeAliasDeclaration */:
+                case 195 /* TypeAssertionExpression */:
+                case 238 /* VariableDeclaration */:
                     return true;
                 default:
                     return false;
@@ -115662,14 +119650,14 @@ var ts;
             }
             var insertBefore;
             switch (containingFunction.kind) {
-                case 156 /* MethodDeclaration */:
+                case 157 /* MethodDeclaration */:
                     insertBefore = containingFunction.name;
                     break;
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
-                    insertBefore = ts.findChildOfKind(containingFunction, 90 /* FunctionKeyword */, sourceFile);
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
+                    insertBefore = ts.findChildOfKind(containingFunction, 91 /* FunctionKeyword */, sourceFile);
                     break;
-                case 197 /* ArrowFunction */:
+                case 198 /* ArrowFunction */:
                     insertBefore = ts.findChildOfKind(containingFunction, 20 /* OpenParenToken */, sourceFile) || ts.first(containingFunction.parameters);
                     break;
                 default:
@@ -115684,11 +119672,11 @@ var ts;
             var insertBefore = _a.insertBefore, returnType = _a.returnType;
             if (returnType) {
                 var entityName = ts.getEntityNameFromTypeNode(returnType);
-                if (!entityName || entityName.kind !== 72 /* Identifier */ || entityName.text !== "Promise") {
+                if (!entityName || entityName.kind !== 73 /* Identifier */ || entityName.text !== "Promise") {
                     changes.replaceNode(sourceFile, returnType, ts.createTypeReferenceNode("Promise", ts.createNodeArray([returnType])));
                 }
             }
-            changes.insertModifierBefore(sourceFile, 121 /* AsyncKeyword */, insertBefore);
+            changes.insertModifierBefore(sourceFile, 122 /* AsyncKeyword */, insertBefore);
         }
     })(codefix = ts.codefix || (ts.codefix = {}));
 })(ts || (ts = {}));
@@ -115797,17 +119785,17 @@ var ts;
             var type = checker.getWidenedType(checker.getTypeOfSymbolAtLocation(symbol, enclosingDeclaration));
             var optional = !!(symbol.flags & 16777216 /* Optional */);
             switch (declaration.kind) {
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
-                case 153 /* PropertySignature */:
-                case 154 /* PropertyDeclaration */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
+                case 154 /* PropertySignature */:
+                case 155 /* PropertyDeclaration */:
                     var typeNode = checker.typeToTypeNode(type, enclosingDeclaration, /*flags*/ undefined, getNoopSymbolTrackerWithResolver(context));
                     out(ts.createProperty(
                     /*decorators*/ undefined, modifiers, name, optional ? ts.createToken(56 /* QuestionToken */) : undefined, typeNode, 
                     /*initializer*/ undefined));
                     break;
-                case 155 /* MethodSignature */:
-                case 156 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
+                case 157 /* MethodDeclaration */:
                     // The signature for the implementation appears as an entry in `signatures` iff
                     // there is only one signature.
                     // If there are overloads and an implementation signature, it appears as an
@@ -115848,7 +119836,7 @@ var ts;
         }
         function signatureToMethodDeclaration(context, signature, enclosingDeclaration, modifiers, name, optional, body) {
             var program = context.program;
-            var signatureDeclaration = program.getTypeChecker().signatureToSignatureDeclaration(signature, 156 /* MethodDeclaration */, enclosingDeclaration, 1 /* NoTruncation */ | 256 /* SuppressAnyReturnType */, getNoopSymbolTrackerWithResolver(context));
+            var signatureDeclaration = program.getTypeChecker().signatureToSignatureDeclaration(signature, 157 /* MethodDeclaration */, enclosingDeclaration, 1 /* NoTruncation */ | 256 /* SuppressAnyReturnType */, getNoopSymbolTrackerWithResolver(context));
             if (!signatureDeclaration) {
                 return undefined;
             }
@@ -115876,7 +119864,7 @@ var ts;
             var returnType = (inJs || !contextualType) ? undefined : checker.typeToTypeNode(contextualType, contextNode, /*flags*/ undefined, tracker);
             return ts.createMethod(
             /*decorators*/ undefined, 
-            /*modifiers*/ makeStatic ? [ts.createToken(116 /* StaticKeyword */)] : undefined, 
+            /*modifiers*/ makeStatic ? [ts.createToken(117 /* StaticKeyword */)] : undefined, 
             /*asteriskToken*/ ts.isYieldExpression(parent) ? ts.createToken(40 /* AsteriskToken */) : undefined, methodName, 
             /*questionToken*/ undefined, 
             /*typeParameters*/ inJs ? undefined : ts.map(typeArguments, function (_, i) {
@@ -115895,7 +119883,7 @@ var ts;
                 /*dotDotDotToken*/ undefined, 
                 /*name*/ names && names[i] || "arg" + i, 
                 /*questionToken*/ minArgumentCount !== undefined && i >= minArgumentCount ? ts.createToken(56 /* QuestionToken */) : undefined, 
-                /*type*/ inJs ? undefined : types && types[i] || ts.createKeywordTypeNode(120 /* AnyKeyword */), 
+                /*type*/ inJs ? undefined : types && types[i] || ts.createKeywordTypeNode(121 /* AnyKeyword */), 
                 /*initializer*/ undefined);
                 parameters.push(newParameter);
             }
@@ -115923,7 +119911,7 @@ var ts;
             var maxArgsParameterSymbolNames = maxArgsSignature.parameters.map(function (symbol) { return symbol.name; });
             var parameters = createDummyParameters(maxNonRestArgs, maxArgsParameterSymbolNames, /* types */ undefined, minArgumentCount, /*inJs*/ false);
             if (someSigHasRestParameter) {
-                var anyArrayType = ts.createArrayTypeNode(ts.createKeywordTypeNode(120 /* AnyKeyword */));
+                var anyArrayType = ts.createArrayTypeNode(ts.createKeywordTypeNode(121 /* AnyKeyword */));
                 var restParameter = ts.createParameter(
                 /*decorators*/ undefined, 
                 /*modifiers*/ undefined, ts.createToken(25 /* DotDotDotToken */), maxArgsParameterSymbolNames[maxNonRestArgs] || "rest", 
@@ -115949,10 +119937,10 @@ var ts;
         }
         function createVisibilityModifier(flags) {
             if (flags & 4 /* Public */) {
-                return ts.createToken(115 /* PublicKeyword */);
+                return ts.createToken(116 /* PublicKeyword */);
             }
             else if (flags & 16 /* Protected */) {
-                return ts.createToken(114 /* ProtectedKeyword */);
+                return ts.createToken(115 /* ProtectedKeyword */);
             }
             return undefined;
         }
@@ -116017,15 +120005,15 @@ var ts;
         }
         codefix.registerCodeFix({
             errorCodes: [
-                ts.Diagnostics.Cannot_invoke_an_expression_whose_type_lacks_a_call_signature_Type_0_has_no_compatible_call_signatures.code,
-                ts.Diagnostics.Cannot_use_new_with_an_expression_whose_type_lacks_a_call_or_construct_signature.code,
+                ts.Diagnostics.This_expression_is_not_callable.code,
+                ts.Diagnostics.This_expression_is_not_constructable.code,
             ],
             getCodeActions: getActionsForUsageOfInvalidImport
         });
         function getActionsForUsageOfInvalidImport(context) {
             var sourceFile = context.sourceFile;
-            var targetKind = ts.Diagnostics.Cannot_invoke_an_expression_whose_type_lacks_a_call_signature_Type_0_has_no_compatible_call_signatures.code === context.errorCode ? 191 /* CallExpression */ : 192 /* NewExpression */;
-            var node = ts.findAncestor(ts.getTokenAtPosition(sourceFile, context.span.start), function (a) { return a.kind === targetKind && a.getStart() === context.span.start && a.getEnd() === (context.span.start + context.span.length); });
+            var targetKind = ts.Diagnostics.This_expression_is_not_callable.code === context.errorCode ? 192 /* CallExpression */ : 193 /* NewExpression */;
+            var node = ts.findAncestor(ts.getTokenAtPosition(sourceFile, context.span.start), function (a) { return a.kind === targetKind; });
             if (!node) {
                 return [];
             }
@@ -116143,7 +120131,7 @@ var ts;
             return codefix.createCodeFixAction(fixName, changes, [ts.Diagnostics.Add_undefined_type_to_property_0, propertyDeclaration.name.getText()], fixIdAddUndefinedType, ts.Diagnostics.Add_undefined_type_to_all_uninitialized_properties);
         }
         function addUndefinedType(changeTracker, propertyDeclarationSourceFile, propertyDeclaration) {
-            var undefinedTypeNode = ts.createKeywordTypeNode(141 /* UndefinedKeyword */);
+            var undefinedTypeNode = ts.createKeywordTypeNode(142 /* UndefinedKeyword */);
             var type = propertyDeclaration.type; // TODO: GH#18217
             var types = ts.isUnionTypeNode(type) ? type.types.concat(undefinedTypeNode) : [type, undefinedTypeNode];
             changeTracker.replaceNode(propertyDeclarationSourceFile, type, ts.createUnionTypeNode(types));
@@ -116189,235 +120177,6 @@ var ts;
         }
     })(codefix = ts.codefix || (ts.codefix = {}));
 })(ts || (ts = {}));
-var ts;
-(function (ts) {
-    function generateTypesForModule(name, moduleValue, formatSettings) {
-        return generateTypesForModuleOrGlobal(name, moduleValue, formatSettings, 0 /* ExportEquals */);
-    }
-    ts.generateTypesForModule = generateTypesForModule;
-    function generateTypesForGlobal(name, globalValue, formatSettings) {
-        return generateTypesForModuleOrGlobal(name, globalValue, formatSettings, 3 /* Global */);
-    }
-    ts.generateTypesForGlobal = generateTypesForGlobal;
-    function generateTypesForModuleOrGlobal(name, globalValue, formatSettings, outputKind) {
-        return valueInfoToDeclarationFileText(ts.inspectValue(name, globalValue), formatSettings, outputKind);
-    }
-    /* @internal */
-    function valueInfoToDeclarationFileText(valueInfo, formatSettings, outputKind) {
-        if (outputKind === void 0) { outputKind = 0 /* ExportEquals */; }
-        return ts.textChanges.getNewFileText(toStatements(valueInfo, outputKind), 3 /* TS */, formatSettings.newLineCharacter || "\n", ts.formatting.getFormatContext(formatSettings));
-    }
-    ts.valueInfoToDeclarationFileText = valueInfoToDeclarationFileText;
-    /* @internal */
-    var OutputKind;
-    (function (OutputKind) {
-        OutputKind[OutputKind["ExportEquals"] = 0] = "ExportEquals";
-        OutputKind[OutputKind["NamedExport"] = 1] = "NamedExport";
-        OutputKind[OutputKind["NamespaceMember"] = 2] = "NamespaceMember";
-        OutputKind[OutputKind["Global"] = 3] = "Global";
-    })(OutputKind || (OutputKind = {}));
-    function toNamespaceMemberStatements(info) {
-        return toStatements(info, 2 /* NamespaceMember */);
-    }
-    function toStatements(info, kind) {
-        var isDefault = info.name === "default" /* Default */;
-        var name = isDefault ? "_default" : info.name;
-        if (!isValidIdentifier(name) || isDefault && kind !== 1 /* NamedExport */)
-            return ts.emptyArray;
-        var modifiers = isDefault && info.kind === 2 /* FunctionOrClass */ ? [ts.createModifier(85 /* ExportKeyword */), ts.createModifier(80 /* DefaultKeyword */)]
-            : kind === 3 /* Global */ || kind === 0 /* ExportEquals */ ? [ts.createModifier(125 /* DeclareKeyword */)]
-                : kind === 1 /* NamedExport */ ? [ts.createModifier(85 /* ExportKeyword */)]
-                    : undefined;
-        var exportEquals = function () { return kind === 0 /* ExportEquals */ ? [exportEqualsOrDefault(info.name, /*isExportEquals*/ true)] : ts.emptyArray; };
-        var exportDefault = function () { return isDefault ? [exportEqualsOrDefault("_default", /*isExportEquals*/ false)] : ts.emptyArray; };
-        switch (info.kind) {
-            case 2 /* FunctionOrClass */:
-                return exportEquals().concat(functionOrClassToStatements(modifiers, name, info));
-            case 3 /* Object */:
-                var members = info.members, hasNontrivialPrototype = info.hasNontrivialPrototype;
-                if (!hasNontrivialPrototype) {
-                    if (kind === 0 /* ExportEquals */) {
-                        return ts.flatMap(members, function (v) { return toStatements(v, 1 /* NamedExport */); });
-                    }
-                    if (members.some(function (m) { return m.kind === 2 /* FunctionOrClass */; })) {
-                        // If some member is a function, use a namespace so it gets a FunctionDeclaration or ClassDeclaration.
-                        return exportDefault().concat([createNamespace(modifiers, name, ts.flatMap(members, toNamespaceMemberStatements))]);
-                    }
-                }
-            // falls through
-            case 0 /* Const */:
-            case 1 /* Array */: {
-                var comment = info.kind === 0 /* Const */ ? info.comment : undefined;
-                var constVar = ts.createVariableStatement(modifiers, ts.createVariableDeclarationList([ts.createVariableDeclaration(name, toType(info))], 2 /* Const */));
-                return exportEquals().concat(exportDefault(), [addComment(constVar, comment)]);
-            }
-            default:
-                return ts.Debug.assertNever(info);
-        }
-    }
-    function exportEqualsOrDefault(name, isExportEquals) {
-        return ts.createExportAssignment(/*decorators*/ undefined, /*modifiers*/ undefined, isExportEquals, ts.createIdentifier(name));
-    }
-    function functionOrClassToStatements(modifiers, name, _a) {
-        var source = _a.source, prototypeMembers = _a.prototypeMembers, namespaceMembers = _a.namespaceMembers;
-        var fnAst = parseClassOrFunctionBody(source);
-        var _b = fnAst === undefined ? { parameters: ts.emptyArray, returnType: anyType() } : getParametersAndReturnType(fnAst), parameters = _b.parameters, returnType = _b.returnType;
-        var protoOrInstanceMembers = ts.createMap();
-        if (typeof fnAst === "object")
-            getConstructorFunctionInstanceProperties(fnAst, protoOrInstanceMembers);
-        for (var _i = 0, prototypeMembers_1 = prototypeMembers; _i < prototypeMembers_1.length; _i++) {
-            var p = prototypeMembers_1[_i];
-            // ignore non-functions on the prototype
-            if (p.kind === 2 /* FunctionOrClass */) {
-                var m = tryGetMethod(p);
-                if (m) {
-                    protoOrInstanceMembers.set(p.name, m);
-                }
-            }
-        }
-        var classStaticMembers = protoOrInstanceMembers.size !== 0 || fnAst === undefined || typeof fnAst !== "number" && fnAst.kind === 157 /* Constructor */ ? [] : undefined;
-        var namespaceStatements = ts.flatMap(namespaceMembers, function (info) {
-            if (!isValidIdentifier(info.name))
-                return undefined;
-            if (classStaticMembers) {
-                switch (info.kind) {
-                    case 3 /* Object */:
-                        if (info.members.some(function (m) { return m.kind === 2 /* FunctionOrClass */; })) {
-                            break;
-                        }
-                    // falls through
-                    case 1 /* Array */:
-                    case 0 /* Const */:
-                        classStaticMembers.push(addComment(ts.createProperty(/*decorators*/ undefined, [ts.createModifier(116 /* StaticKeyword */)], info.name, /*questionOrExclamationToken*/ undefined, toType(info), /*initializer*/ undefined), info.kind === 0 /* Const */ ? info.comment : undefined));
-                        return undefined;
-                    case 2 /* FunctionOrClass */:
-                        if (!info.namespaceMembers.length) { // Else, can't merge a static method with a namespace. Must make it a function on the namespace.
-                            var sig = tryGetMethod(info, [ts.createModifier(116 /* StaticKeyword */)]);
-                            if (sig) {
-                                classStaticMembers.push(sig);
-                                return undefined;
-                            }
-                        }
-                        break;
-                    default:
-                        ts.Debug.assertNever(info);
-                }
-            }
-            return toStatements(info, 2 /* NamespaceMember */);
-        });
-        var decl = classStaticMembers
-            ? ts.createClassDeclaration(
-            /*decorators*/ undefined, modifiers, name, 
-            /*typeParameters*/ undefined, 
-            /*heritageClauses*/ undefined, classStaticMembers.concat((parameters.length ? [ts.createConstructor(/*decorators*/ undefined, /*modifiers*/ undefined, parameters, /*body*/ undefined)] : ts.emptyArray), ts.arrayFrom(protoOrInstanceMembers.values())))
-            : ts.createFunctionDeclaration(/*decorators*/ undefined, modifiers, /*asteriskToken*/ undefined, name, /*typeParameters*/ undefined, parameters, returnType, /*body*/ undefined);
-        return [decl].concat((namespaceStatements.length === 0 ? ts.emptyArray : [createNamespace(modifiers && modifiers.map(function (m) { return ts.getSynthesizedDeepClone(m); }), name, namespaceStatements)]));
-    }
-    function tryGetMethod(_a, modifiers) {
-        var name = _a.name, source = _a.source;
-        if (!isValidIdentifier(name))
-            return undefined;
-        var fnAst = parseClassOrFunctionBody(source);
-        if (fnAst === undefined || (typeof fnAst !== "number" && fnAst.kind === 157 /* Constructor */))
-            return undefined;
-        var sig = getParametersAndReturnType(fnAst);
-        return sig && ts.createMethod(
-        /*decorators*/ undefined, modifiers, 
-        /*asteriskToken*/ undefined, name, 
-        /*questionToken*/ undefined, 
-        /*typeParameters*/ undefined, sig.parameters, sig.returnType, 
-        /*body*/ undefined);
-    }
-    function toType(info) {
-        switch (info.kind) {
-            case 0 /* Const */:
-                return ts.createTypeReferenceNode(info.typeName, /*typeArguments*/ undefined);
-            case 1 /* Array */:
-                return ts.createArrayTypeNode(toType(info.inner));
-            case 2 /* FunctionOrClass */:
-                return ts.createTypeReferenceNode("Function", /*typeArguments*/ undefined); // Normally we create a FunctionDeclaration, but this can happen for a function in an array.
-            case 3 /* Object */:
-                return ts.createTypeLiteralNode(info.members.map(function (m) { return ts.createPropertySignature(/*modifiers*/ undefined, toPropertyName(m.name), /*questionToken*/ undefined, toType(m), /*initializer*/ undefined); }));
-            default:
-                return ts.Debug.assertNever(info);
-        }
-    }
-    function toPropertyName(name) {
-        return ts.isIdentifierText(name, 7 /* ESNext */) ? ts.createIdentifier(name) : ts.createStringLiteral(name);
-    }
-    // Parses assignments to "this.x" in the constructor into class property declarations
-    function getConstructorFunctionInstanceProperties(fnAst, members) {
-        forEachOwnNodeOfFunction(fnAst, function (node) {
-            if (ts.isAssignmentExpression(node, /*excludeCompoundAssignment*/ true) &&
-                ts.isPropertyAccessExpression(node.left) && node.left.expression.kind === 100 /* ThisKeyword */) {
-                var name_4 = node.left.name.text;
-                if (!ts.isJsPrivate(name_4)) {
-                    ts.getOrUpdate(members, name_4, function () { return ts.createProperty(/*decorators*/ undefined, /*modifiers*/ undefined, name_4, /*questionOrExclamationToken*/ undefined, anyType(), /*initializer*/ undefined); });
-                }
-            }
-        });
-    }
-    function getParametersAndReturnType(fnAst) {
-        if (typeof fnAst === "number") {
-            return { parameters: ts.fill(fnAst, function (i) { return makeParameter("p" + i, anyType()); }), returnType: anyType() };
-        }
-        var usedArguments = false, hasReturn = false;
-        forEachOwnNodeOfFunction(fnAst, function (node) {
-            usedArguments = usedArguments || ts.isIdentifier(node) && node.text === "arguments";
-            hasReturn = hasReturn || ts.isReturnStatement(node) && !!node.expression && node.expression.kind !== 200 /* VoidExpression */;
-        });
-        var parameters = fnAst.parameters.map(function (p) { return makeParameter("" + p.name.getText(), inferParameterType(fnAst, p)); }).concat((usedArguments ? [makeRestParameter()] : ts.emptyArray));
-        return { parameters: parameters, returnType: hasReturn ? anyType() : ts.createKeywordTypeNode(106 /* VoidKeyword */) };
-    }
-    function makeParameter(name, type) {
-        return ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, name, /*questionToken*/ undefined, type);
-    }
-    function makeRestParameter() {
-        return ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, ts.createToken(25 /* DotDotDotToken */), "args", /*questionToken*/ undefined, ts.createArrayTypeNode(anyType()));
-    }
-    /** Returns 'undefined' for class with no declared constructor */
-    function parseClassOrFunctionBody(source) {
-        if (typeof source === "number")
-            return source;
-        var classOrFunction = ts.tryCast(parseExpression(source), function (node) { return ts.isFunctionExpression(node) || ts.isArrowFunction(node) || ts.isClassExpression(node); });
-        return classOrFunction
-            ? ts.isClassExpression(classOrFunction) ? ts.find(classOrFunction.members, ts.isConstructorDeclaration) : classOrFunction
-            // If that didn't parse, it's a method `m() {}`. Parse again inside of an object literal.
-            : ts.cast(ts.first(ts.cast(parseExpression("{ " + source + " }"), ts.isObjectLiteralExpression).properties), ts.isMethodDeclaration);
-    }
-    function parseExpression(expr) {
-        var text = "const _ = " + expr;
-        var srcFile = ts.createSourceFile("test.ts", text, 7 /* Latest */, /*setParentNodes*/ true);
-        return ts.first(ts.cast(ts.first(srcFile.statements), ts.isVariableStatement).declarationList.declarations).initializer;
-    }
-    function inferParameterType(_fn, _param) {
-        // TODO: Inspect function body for clues (see inferFromUsage.ts)
-        return anyType();
-    }
-    // Descends through all nodes in a function, but not in nested functions.
-    function forEachOwnNodeOfFunction(fnAst, cb) {
-        fnAst.body.forEachChild(function recur(node) {
-            cb(node);
-            if (!ts.isFunctionLike(node))
-                node.forEachChild(recur);
-        });
-    }
-    function isValidIdentifier(name) {
-        var keyword = ts.stringToToken(name);
-        return !(keyword && ts.isNonContextualKeyword(keyword)) && ts.isIdentifierText(name, 7 /* ESNext */);
-    }
-    function addComment(node, comment) {
-        if (comment !== undefined)
-            ts.addSyntheticLeadingComment(node, 2 /* SingleLineCommentTrivia */, comment);
-        return node;
-    }
-    function anyType() {
-        return ts.createKeywordTypeNode(120 /* AnyKeyword */);
-    }
-    function createNamespace(modifiers, name, statements) {
-        return ts.createModuleDeclaration(/*decorators*/ undefined, modifiers, ts.createIdentifier(name), ts.createModuleBlock(statements), 16 /* Namespace */);
-    }
-})(ts || (ts = {}));
 /* @internal */
 var ts;
 (function (ts) {
@@ -116514,8 +120273,8 @@ var ts;
         });
         function getImportTypeNode(sourceFile, pos) {
             var token = ts.getTokenAtPosition(sourceFile, pos);
-            ts.Debug.assert(token.kind === 92 /* ImportKeyword */);
-            ts.Debug.assert(token.parent.kind === 183 /* ImportType */);
+            ts.Debug.assert(token.kind === 93 /* ImportKeyword */);
+            ts.Debug.assert(token.parent.kind === 184 /* ImportType */);
             return token.parent;
         }
         function doChange(changes, sourceFile, importType) {
@@ -116567,7 +120326,7 @@ var ts;
             var otherMembers = members.filter(function (member) { return !ts.isIndexSignatureDeclaration(member); });
             var parameter = ts.first(indexSignature.parameters);
             var mappedTypeParameter = ts.createTypeParameterDeclaration(ts.cast(parameter.name, ts.isIdentifier), parameter.type);
-            var mappedIntersectionType = ts.createMappedTypeNode(ts.hasReadonlyModifier(indexSignature) ? ts.createModifier(133 /* ReadonlyKeyword */) : undefined, mappedTypeParameter, indexSignature.questionToken, indexSignature.type);
+            var mappedIntersectionType = ts.createMappedTypeNode(ts.hasReadonlyModifier(indexSignature) ? ts.createModifier(134 /* ReadonlyKeyword */) : undefined, mappedTypeParameter, indexSignature.questionToken, indexSignature.type);
             var intersectionType = ts.createIntersectionTypeNode(ts.getAllSuperTypeNodes(container).concat([
                 mappedIntersectionType
             ], (otherMembers.length ? [ts.createTypeLiteralNode(otherMembers)] : ts.emptyArray)));
@@ -116577,6 +120336,49 @@ var ts;
 })(ts || (ts = {}));
 /* @internal */
 var ts;
+(function (ts) {
+    var codefix;
+    (function (codefix) {
+        var fixId = "removeUnnecessaryAwait";
+        var errorCodes = [
+            ts.Diagnostics.await_has_no_effect_on_the_type_of_this_expression.code,
+        ];
+        codefix.registerCodeFix({
+            errorCodes: errorCodes,
+            getCodeActions: function (context) {
+                var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return makeChange(t, context.sourceFile, context.span); });
+                if (changes.length > 0) {
+                    return [codefix.createCodeFixAction(fixId, changes, ts.Diagnostics.Remove_unnecessary_await, fixId, ts.Diagnostics.Remove_all_unnecessary_uses_of_await)];
+                }
+            },
+            fixIds: [fixId],
+            getAllCodeActions: function (context) {
+                return codefix.codeFixAll(context, errorCodes, function (changes, diag) { return makeChange(changes, diag.file, diag); });
+            },
+        });
+        function makeChange(changeTracker, sourceFile, span) {
+            var awaitKeyword = ts.tryCast(ts.getTokenAtPosition(sourceFile, span.start), function (node) { return node.kind === 123 /* AwaitKeyword */; });
+            var awaitExpression = awaitKeyword && ts.tryCast(awaitKeyword.parent, ts.isAwaitExpression);
+            if (!awaitExpression) {
+                return;
+            }
+            var expressionToReplace = awaitExpression;
+            var hasSurroundingParens = ts.isParenthesizedExpression(awaitExpression.parent);
+            if (hasSurroundingParens) {
+                var leftMostExpression = ts.getLeftmostExpression(awaitExpression.expression, /*stopAtCallExpressions*/ false);
+                if (ts.isIdentifier(leftMostExpression)) {
+                    var precedingToken = ts.findPrecedingToken(awaitExpression.parent.pos, sourceFile);
+                    if (precedingToken && precedingToken.kind !== 96 /* NewKeyword */) {
+                        expressionToReplace = awaitExpression.parent;
+                    }
+                }
+            }
+            changeTracker.replaceNode(sourceFile, expressionToReplace, awaitExpression.expression);
+        }
+    })(codefix = ts.codefix || (ts.codefix = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
 (function (ts) {
     var refactor;
     (function (refactor) {
@@ -116614,16 +120416,16 @@ var ts;
                 return undefined;
             }
             switch (exportNode.kind) {
-                case 239 /* FunctionDeclaration */:
-                case 240 /* ClassDeclaration */:
-                case 241 /* InterfaceDeclaration */:
-                case 243 /* EnumDeclaration */:
-                case 242 /* TypeAliasDeclaration */:
-                case 244 /* ModuleDeclaration */: {
+                case 240 /* FunctionDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 242 /* InterfaceDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
+                case 245 /* ModuleDeclaration */: {
                     var node = exportNode;
                     return node.name && ts.isIdentifier(node.name) ? { exportNode: node, exportName: node.name, wasDefault: wasDefault, exportingModuleSymbol: exportingModuleSymbol } : undefined;
                 }
-                case 219 /* VariableStatement */: {
+                case 220 /* VariableStatement */: {
                     var vs = exportNode;
                     // Must be `export const x = something;`.
                     if (!(vs.declarationList.flags & 2 /* Const */) || vs.declarationList.declarations.length !== 1) {
@@ -116646,17 +120448,17 @@ var ts;
         function changeExport(exportingSourceFile, _a, changes, checker) {
             var wasDefault = _a.wasDefault, exportNode = _a.exportNode, exportName = _a.exportName;
             if (wasDefault) {
-                changes.delete(exportingSourceFile, ts.Debug.assertDefined(ts.findModifier(exportNode, 80 /* DefaultKeyword */)));
+                changes.delete(exportingSourceFile, ts.Debug.assertDefined(ts.findModifier(exportNode, 81 /* DefaultKeyword */)));
             }
             else {
-                var exportKeyword = ts.Debug.assertDefined(ts.findModifier(exportNode, 85 /* ExportKeyword */));
+                var exportKeyword = ts.Debug.assertDefined(ts.findModifier(exportNode, 86 /* ExportKeyword */));
                 switch (exportNode.kind) {
-                    case 239 /* FunctionDeclaration */:
-                    case 240 /* ClassDeclaration */:
-                    case 241 /* InterfaceDeclaration */:
-                        changes.insertNodeAfter(exportingSourceFile, exportKeyword, ts.createToken(80 /* DefaultKeyword */));
+                    case 240 /* FunctionDeclaration */:
+                    case 241 /* ClassDeclaration */:
+                    case 242 /* InterfaceDeclaration */:
+                        changes.insertNodeAfter(exportingSourceFile, exportKeyword, ts.createToken(81 /* DefaultKeyword */));
                         break;
-                    case 219 /* VariableStatement */:
+                    case 220 /* VariableStatement */:
                         // If 'x' isn't used in this file, `export const x = 0;` --> `export default 0;`
                         if (!ts.FindAllReferences.Core.isSymbolReferencedInFile(exportName, checker, exportingSourceFile)) {
                             // We checked in `getInfo` that an initializer exists.
@@ -116664,9 +120466,9 @@ var ts;
                             break;
                         }
                     // falls through
-                    case 243 /* EnumDeclaration */:
-                    case 242 /* TypeAliasDeclaration */:
-                    case 244 /* ModuleDeclaration */:
+                    case 244 /* EnumDeclaration */:
+                    case 243 /* TypeAliasDeclaration */:
+                    case 245 /* ModuleDeclaration */:
                         // `export type T = number;` -> `type T = number; export default T;`
                         changes.deleteModifier(exportingSourceFile, exportKeyword);
                         changes.insertNodeAfter(exportingSourceFile, exportNode, ts.createExportDefault(ts.createIdentifier(exportName.text)));
@@ -116693,18 +120495,18 @@ var ts;
         function changeDefaultToNamedImport(importingSourceFile, ref, changes, exportName) {
             var parent = ref.parent;
             switch (parent.kind) {
-                case 189 /* PropertyAccessExpression */:
+                case 190 /* PropertyAccessExpression */:
                     // `a.default` --> `a.foo`
                     changes.replaceNode(importingSourceFile, ref, ts.createIdentifier(exportName));
                     break;
-                case 253 /* ImportSpecifier */:
-                case 257 /* ExportSpecifier */: {
+                case 254 /* ImportSpecifier */:
+                case 258 /* ExportSpecifier */: {
                     var spec = parent;
                     // `default as foo` --> `foo`, `default as bar` --> `foo as bar`
                     changes.replaceNode(importingSourceFile, spec, makeImportSpecifier(exportName, spec.name.text));
                     break;
                 }
-                case 250 /* ImportClause */: {
+                case 251 /* ImportClause */: {
                     var clause = parent;
                     ts.Debug.assert(clause.name === ref);
                     var spec = makeImportSpecifier(exportName, ref.text);
@@ -116713,7 +120515,7 @@ var ts;
                         // `import foo from "./a";` --> `import { foo } from "./a";`
                         changes.replaceNode(importingSourceFile, ref, ts.createNamedImports([spec]));
                     }
-                    else if (namedBindings.kind === 251 /* NamespaceImport */) {
+                    else if (namedBindings.kind === 252 /* NamespaceImport */) {
                         // `import foo, * as a from "./a";` --> `import * as a from ".a/"; import { foo } from "./a";`
                         changes.deleteRange(importingSourceFile, { pos: ref.getStart(importingSourceFile), end: namedBindings.getStart(importingSourceFile) });
                         var quotePreference = ts.isStringLiteral(clause.parent.moduleSpecifier) ? ts.quotePreferenceFromString(clause.parent.moduleSpecifier, importingSourceFile) : 1 /* Double */;
@@ -116734,11 +120536,11 @@ var ts;
         function changeNamedToDefaultImport(importingSourceFile, ref, changes) {
             var parent = ref.parent;
             switch (parent.kind) {
-                case 189 /* PropertyAccessExpression */:
+                case 190 /* PropertyAccessExpression */:
                     // `a.foo` --> `a.default`
                     changes.replaceNode(importingSourceFile, ref, ts.createIdentifier("default"));
                     break;
-                case 253 /* ImportSpecifier */: {
+                case 254 /* ImportSpecifier */: {
                     // `import { foo } from "./a";` --> `import foo from "./a";`
                     // `import { foo as bar } from "./a";` --> `import bar from "./a";`
                     var defaultImport = ts.createIdentifier(parent.name.text);
@@ -116751,7 +120553,7 @@ var ts;
                     }
                     break;
                 }
-                case 257 /* ExportSpecifier */: {
+                case 258 /* ExportSpecifier */: {
                     // `export { foo } from "./a";` --> `export { default as foo } from "./a";`
                     // `export { foo as bar } from "./a";` --> `export { default as bar } from "./a";`
                     // `export { foo as default } from "./a";` --> `export { default } from "./a";`
@@ -116784,8 +120586,8 @@ var ts;
                 var i = getImportToConvert(context);
                 if (!i)
                     return ts.emptyArray;
-                var description = i.kind === 251 /* NamespaceImport */ ? ts.Diagnostics.Convert_namespace_import_to_named_imports.message : ts.Diagnostics.Convert_named_imports_to_namespace_import.message;
-                var actionName = i.kind === 251 /* NamespaceImport */ ? actionNameNamespaceToNamed : actionNameNamedToNamespace;
+                var description = i.kind === 252 /* NamespaceImport */ ? ts.Diagnostics.Convert_namespace_import_to_named_imports.message : ts.Diagnostics.Convert_named_imports_to_namespace_import.message;
+                var actionName = i.kind === 252 /* NamespaceImport */ ? actionNameNamespaceToNamed : actionNameNamedToNamespace;
                 return [{ name: refactorName, description: description, actions: [{ name: actionName, description: description }] }];
             },
             getEditsForAction: function (context, actionName) {
@@ -116807,7 +120609,7 @@ var ts;
         }
         function doChange(sourceFile, program, changes, toConvert) {
             var checker = program.getTypeChecker();
-            if (toConvert.kind === 251 /* NamespaceImport */) {
+            if (toConvert.kind === 252 /* NamespaceImport */) {
                 doChangeNamespaceToNamed(sourceFile, checker, changes, toConvert, ts.getAllowSyntheticDefaultImports(program.getCompilerOptions()));
             }
             else {
@@ -116859,7 +120661,7 @@ var ts;
         function doChangeNamedToNamespace(sourceFile, checker, changes, toConvert) {
             var importDecl = toConvert.parent.parent;
             var moduleSpecifier = importDecl.moduleSpecifier;
-            var preferredName = moduleSpecifier && ts.isStringLiteral(moduleSpecifier) ? ts.codefix.moduleSpecifierToValidIdentifier(moduleSpecifier.text, 7 /* ESNext */) : "module";
+            var preferredName = moduleSpecifier && ts.isStringLiteral(moduleSpecifier) ? ts.codefix.moduleSpecifierToValidIdentifier(moduleSpecifier.text, 99 /* ESNext */) : "module";
             var namespaceNameConflicts = toConvert.elements.some(function (element) {
                 return ts.FindAllReferences.Core.eachSymbolReferenceInFile(element.name, checker, sourceFile, function (id) {
                     return !!checker.resolveName(preferredName, id, 67108863 /* All */, /*excludeGlobals*/ true);
@@ -117150,20 +120952,20 @@ var ts;
                 function checkForStaticContext(nodeToCheck, containingClass) {
                     var current = nodeToCheck;
                     while (current !== containingClass) {
-                        if (current.kind === 154 /* PropertyDeclaration */) {
+                        if (current.kind === 155 /* PropertyDeclaration */) {
                             if (ts.hasModifier(current, 32 /* Static */)) {
                                 rangeFacts |= RangeFacts.InStaticRegion;
                             }
                             break;
                         }
-                        else if (current.kind === 151 /* Parameter */) {
+                        else if (current.kind === 152 /* Parameter */) {
                             var ctorOrMethod = ts.getContainingFunction(current);
-                            if (ctorOrMethod.kind === 157 /* Constructor */) {
+                            if (ctorOrMethod.kind === 158 /* Constructor */) {
                                 rangeFacts |= RangeFacts.InStaticRegion;
                             }
                             break;
                         }
-                        else if (current.kind === 156 /* MethodDeclaration */) {
+                        else if (current.kind === 157 /* MethodDeclaration */) {
                             if (ts.hasModifier(current, 32 /* Static */)) {
                                 rangeFacts |= RangeFacts.InStaticRegion;
                             }
@@ -117206,7 +121008,7 @@ var ts;
                             return true;
                         }
                         if (ts.isDeclaration(node)) {
-                            var declaringNode = (node.kind === 237 /* VariableDeclaration */) ? node.parent.parent : node;
+                            var declaringNode = (node.kind === 238 /* VariableDeclaration */) ? node.parent.parent : node;
                             if (ts.hasModifier(declaringNode, 1 /* Export */)) {
                                 // TODO: GH#18217 Silly to use `errors ||` since it's definitely not defined (see top of `visit`)
                                 // Also, if we're only pushing one error, just use `let error: Diagnostic | undefined`!
@@ -117218,13 +121020,13 @@ var ts;
                         }
                         // Some things can't be extracted in certain situations
                         switch (node.kind) {
-                            case 249 /* ImportDeclaration */:
+                            case 250 /* ImportDeclaration */:
                                 (errors || (errors = [])).push(ts.createDiagnosticForNode(node, Messages.cannotExtractImport));
                                 return true;
-                            case 98 /* SuperKeyword */:
+                            case 99 /* SuperKeyword */:
                                 // For a super *constructor call*, we have to be extracting the entire class,
                                 // but a super *method call* simply implies a 'this' reference
-                                if (node.parent.kind === 191 /* CallExpression */) {
+                                if (node.parent.kind === 192 /* CallExpression */) {
                                     // Super constructor call
                                     var containingClass_1 = ts.getContainingClass(node); // TODO:GH#18217
                                     if (containingClass_1.pos < span.start || containingClass_1.end >= (span.start + span.length)) {
@@ -117239,8 +121041,8 @@ var ts;
                         }
                         if (ts.isFunctionLikeDeclaration(node) || ts.isClassLike(node)) {
                             switch (node.kind) {
-                                case 239 /* FunctionDeclaration */:
-                                case 240 /* ClassDeclaration */:
+                                case 240 /* FunctionDeclaration */:
+                                case 241 /* ClassDeclaration */:
                                     if (ts.isSourceFile(node.parent) && node.parent.externalModuleIndicator === undefined) {
                                         // You cannot extract global declarations
                                         (errors || (errors = [])).push(ts.createDiagnosticForNode(node, Messages.functionWillNotBeVisibleInTheNewScope));
@@ -117252,20 +121054,20 @@ var ts;
                         }
                         var savedPermittedJumps = permittedJumps;
                         switch (node.kind) {
-                            case 222 /* IfStatement */:
+                            case 223 /* IfStatement */:
                                 permittedJumps = 0 /* None */;
                                 break;
-                            case 235 /* TryStatement */:
+                            case 236 /* TryStatement */:
                                 // forbid all jumps inside try blocks
                                 permittedJumps = 0 /* None */;
                                 break;
-                            case 218 /* Block */:
-                                if (node.parent && node.parent.kind === 235 /* TryStatement */ && node.parent.finallyBlock === node) {
+                            case 219 /* Block */:
+                                if (node.parent && node.parent.kind === 236 /* TryStatement */ && node.parent.finallyBlock === node) {
                                     // allow unconditional returns from finally blocks
                                     permittedJumps = 4 /* Return */;
                                 }
                                 break;
-                            case 271 /* CaseClause */:
+                            case 272 /* CaseClause */:
                                 // allow unlabeled break inside case clauses
                                 permittedJumps |= 1 /* Break */;
                                 break;
@@ -117277,19 +121079,19 @@ var ts;
                                 break;
                         }
                         switch (node.kind) {
-                            case 178 /* ThisType */:
-                            case 100 /* ThisKeyword */:
+                            case 179 /* ThisType */:
+                            case 101 /* ThisKeyword */:
                                 rangeFacts |= RangeFacts.UsesThis;
                                 break;
-                            case 233 /* LabeledStatement */: {
+                            case 234 /* LabeledStatement */: {
                                 var label = node.label;
                                 (seenLabels || (seenLabels = [])).push(label.escapedText);
                                 ts.forEachChild(node, visit);
                                 seenLabels.pop();
                                 break;
                             }
-                            case 229 /* BreakStatement */:
-                            case 228 /* ContinueStatement */: {
+                            case 230 /* BreakStatement */:
+                            case 229 /* ContinueStatement */: {
                                 var label = node.label;
                                 if (label) {
                                     if (!ts.contains(seenLabels, label.escapedText)) {
@@ -117298,20 +121100,20 @@ var ts;
                                     }
                                 }
                                 else {
-                                    if (!(permittedJumps & (node.kind === 229 /* BreakStatement */ ? 1 /* Break */ : 2 /* Continue */))) {
+                                    if (!(permittedJumps & (node.kind === 230 /* BreakStatement */ ? 1 /* Break */ : 2 /* Continue */))) {
                                         // attempt to break or continue in a forbidden context
                                         (errors || (errors = [])).push(ts.createDiagnosticForNode(node, Messages.cannotExtractRangeContainingConditionalBreakOrContinueStatements));
                                     }
                                 }
                                 break;
                             }
-                            case 201 /* AwaitExpression */:
+                            case 202 /* AwaitExpression */:
                                 rangeFacts |= RangeFacts.IsAsyncFunction;
                                 break;
-                            case 207 /* YieldExpression */:
+                            case 208 /* YieldExpression */:
                                 rangeFacts |= RangeFacts.IsGenerator;
                                 break;
-                            case 230 /* ReturnStatement */:
+                            case 231 /* ReturnStatement */:
                                 if (permittedJumps & 4 /* Return */) {
                                     rangeFacts |= RangeFacts.HasReturn;
                                 }
@@ -117365,7 +121167,7 @@ var ts;
                 while (true) {
                     current = current.parent;
                     // A function parameter's initializer is actually in the outer scope, not the function declaration
-                    if (current.kind === 151 /* Parameter */) {
+                    if (current.kind === 152 /* Parameter */) {
                         // Skip all the way to the outer scope of the function that declared this parameter
                         current = ts.findAncestor(current, function (parent) { return ts.isFunctionLikeDeclaration(parent); }).parent;
                     }
@@ -117376,7 +121178,7 @@ var ts;
                     //  * Module/namespace or source file
                     if (isScope(current)) {
                         scopes.push(current);
-                        if (current.kind === 284 /* SourceFile */) {
+                        if (current.kind === 285 /* SourceFile */) {
                             return scopes;
                         }
                     }
@@ -117466,32 +121268,32 @@ var ts;
             }
             function getDescriptionForFunctionLikeDeclaration(scope) {
                 switch (scope.kind) {
-                    case 157 /* Constructor */:
+                    case 158 /* Constructor */:
                         return "constructor";
-                    case 196 /* FunctionExpression */:
-                    case 239 /* FunctionDeclaration */:
+                    case 197 /* FunctionExpression */:
+                    case 240 /* FunctionDeclaration */:
                         return scope.name
                             ? "function '" + scope.name.text + "'"
                             : "anonymous function";
-                    case 197 /* ArrowFunction */:
+                    case 198 /* ArrowFunction */:
                         return "arrow function";
-                    case 156 /* MethodDeclaration */:
+                    case 157 /* MethodDeclaration */:
                         return "method '" + scope.name.getText() + "'";
-                    case 158 /* GetAccessor */:
+                    case 159 /* GetAccessor */:
                         return "'get " + scope.name.getText() + "'";
-                    case 159 /* SetAccessor */:
+                    case 160 /* SetAccessor */:
                         return "'set " + scope.name.getText() + "'";
                     default:
                         throw ts.Debug.assertNever(scope);
                 }
             }
             function getDescriptionForClassLikeDeclaration(scope) {
-                return scope.kind === 240 /* ClassDeclaration */
+                return scope.kind === 241 /* ClassDeclaration */
                     ? scope.name ? "class '" + scope.name.text + "'" : "anonymous class declaration"
                     : scope.name ? "class expression '" + scope.name.text + "'" : "anonymous class expression";
             }
             function getDescriptionForModuleLikeDeclaration(scope) {
-                return scope.kind === 245 /* ModuleBlock */
+                return scope.kind === 246 /* ModuleBlock */
                     ? "namespace '" + scope.parent.name.getText() + "'"
                     : scope.externalModuleIndicator ? 0 /* Module */ : 1 /* Global */;
             }
@@ -117557,12 +121359,12 @@ var ts;
                 var newFunction;
                 if (ts.isClassLike(scope)) {
                     // always create private method in TypeScript files
-                    var modifiers = isJS ? [] : [ts.createToken(113 /* PrivateKeyword */)];
+                    var modifiers = isJS ? [] : [ts.createToken(114 /* PrivateKeyword */)];
                     if (range.facts & RangeFacts.InStaticRegion) {
-                        modifiers.push(ts.createToken(116 /* StaticKeyword */));
+                        modifiers.push(ts.createToken(117 /* StaticKeyword */));
                     }
                     if (range.facts & RangeFacts.IsAsyncFunction) {
-                        modifiers.push(ts.createToken(121 /* AsyncKeyword */));
+                        modifiers.push(ts.createToken(122 /* AsyncKeyword */));
                     }
                     newFunction = ts.createMethod(
                     /*decorators*/ undefined, modifiers.length ? modifiers : undefined, range.facts & RangeFacts.IsGenerator ? ts.createToken(40 /* AsteriskToken */) : undefined, functionName, 
@@ -117570,7 +121372,7 @@ var ts;
                 }
                 else {
                     newFunction = ts.createFunctionDeclaration(
-                    /*decorators*/ undefined, range.facts & RangeFacts.IsAsyncFunction ? [ts.createToken(121 /* AsyncKeyword */)] : undefined, range.facts & RangeFacts.IsGenerator ? ts.createToken(40 /* AsteriskToken */) : undefined, functionName, typeParameters, parameters, returnType, body);
+                    /*decorators*/ undefined, range.facts & RangeFacts.IsAsyncFunction ? [ts.createToken(122 /* AsyncKeyword */)] : undefined, range.facts & RangeFacts.IsGenerator ? ts.createToken(40 /* AsteriskToken */) : undefined, functionName, typeParameters, parameters, returnType, body);
                 }
                 var changeTracker = ts.textChanges.ChangeTracker.fromContext(context);
                 var minInsertionPos = (isReadonlyArray(range.range) ? ts.last(range.range) : range.range).end;
@@ -117711,9 +121513,9 @@ var ts;
                     while (ts.isParenthesizedTypeNode(withoutParens)) {
                         withoutParens = withoutParens.type;
                     }
-                    return ts.isUnionTypeNode(withoutParens) && ts.find(withoutParens.types, function (t) { return t.kind === 141 /* UndefinedKeyword */; })
+                    return ts.isUnionTypeNode(withoutParens) && ts.find(withoutParens.types, function (t) { return t.kind === 142 /* UndefinedKeyword */; })
                         ? clone
-                        : ts.createUnionTypeNode([clone, ts.createKeywordTypeNode(141 /* UndefinedKeyword */)]);
+                        : ts.createUnionTypeNode([clone, ts.createKeywordTypeNode(142 /* UndefinedKeyword */)]);
                 }
             }
             /**
@@ -117736,11 +121538,11 @@ var ts;
                 if (ts.isClassLike(scope)) {
                     ts.Debug.assert(!isJS); // See CannotExtractToJSClass
                     var modifiers = [];
-                    modifiers.push(ts.createToken(113 /* PrivateKeyword */));
+                    modifiers.push(ts.createToken(114 /* PrivateKeyword */));
                     if (rangeFacts & RangeFacts.InStaticRegion) {
-                        modifiers.push(ts.createToken(116 /* StaticKeyword */));
+                        modifiers.push(ts.createToken(117 /* StaticKeyword */));
                     }
-                    modifiers.push(ts.createToken(133 /* ReadonlyKeyword */));
+                    modifiers.push(ts.createToken(134 /* ReadonlyKeyword */));
                     var newVariable = ts.createProperty(
                     /*decorators*/ undefined, modifiers, localNameText, 
                     /*questionToken*/ undefined, variableType, initializer);
@@ -117769,7 +121571,7 @@ var ts;
                         var localReference = ts.createIdentifier(localNameText);
                         changeTracker.replaceNode(context.file, node, localReference);
                     }
-                    else if (node.parent.kind === 221 /* ExpressionStatement */ && scope === ts.findAncestor(node, isScope)) {
+                    else if (node.parent.kind === 222 /* ExpressionStatement */ && scope === ts.findAncestor(node, isScope)) {
                         // If the parent is an expression statement and the target scope is the immediately enclosing one,
                         // replace the statement with the declaration.
                         var newVariableStatement = ts.createVariableStatement(
@@ -117788,7 +121590,7 @@ var ts;
                             changeTracker.insertNodeBefore(context.file, nodeToInsertBefore, newVariableStatement, /*blankLineBetween*/ false);
                         }
                         // Consume
-                        if (node.parent.kind === 221 /* ExpressionStatement */) {
+                        if (node.parent.kind === 222 /* ExpressionStatement */) {
                             // If the parent is an expression statement, delete it.
                             changeTracker.delete(context.file, node.parent);
                         }
@@ -117875,7 +121677,7 @@ var ts;
                     return { body: ts.createBlock(statements, /*multiLine*/ true), returnValueProperty: undefined };
                 }
                 function visitor(node) {
-                    if (!ignoreReturns && node.kind === 230 /* ReturnStatement */ && hasWritesOrVariableDeclarations) {
+                    if (!ignoreReturns && node.kind === 231 /* ReturnStatement */ && hasWritesOrVariableDeclarations) {
                         var assignments = getPropertyAssignmentsForWritesAndVariableDeclarations(exposedVariableDeclarations, writes);
                         if (node.expression) {
                             if (!returnValueProperty) {
@@ -118053,7 +121855,7 @@ var ts;
                     var scope = scopes_1[_i];
                     usagesPerScope.push({ usages: ts.createMap(), typeParameterUsages: ts.createMap(), substitutions: ts.createMap() });
                     substitutionsPerScope.push(ts.createMap());
-                    functionErrorsPerScope.push(ts.isFunctionLikeDeclaration(scope) && scope.kind !== 239 /* FunctionDeclaration */
+                    functionErrorsPerScope.push(ts.isFunctionLikeDeclaration(scope) && scope.kind !== 240 /* FunctionDeclaration */
                         ? [ts.createDiagnosticForNode(scope, Messages.cannotExtractToOtherFunctionLike)]
                         : []);
                     var constantErrors = [];
@@ -118369,30 +122171,30 @@ var ts;
             function isExtractableExpression(node) {
                 var parent = node.parent;
                 switch (parent.kind) {
-                    case 278 /* EnumMember */:
+                    case 279 /* EnumMember */:
                         return false;
                 }
                 switch (node.kind) {
                     case 10 /* StringLiteral */:
-                        return parent.kind !== 249 /* ImportDeclaration */ &&
-                            parent.kind !== 253 /* ImportSpecifier */;
-                    case 208 /* SpreadElement */:
-                    case 184 /* ObjectBindingPattern */:
-                    case 186 /* BindingElement */:
+                        return parent.kind !== 250 /* ImportDeclaration */ &&
+                            parent.kind !== 254 /* ImportSpecifier */;
+                    case 209 /* SpreadElement */:
+                    case 185 /* ObjectBindingPattern */:
+                    case 187 /* BindingElement */:
                         return false;
-                    case 72 /* Identifier */:
-                        return parent.kind !== 186 /* BindingElement */ &&
-                            parent.kind !== 253 /* ImportSpecifier */ &&
-                            parent.kind !== 257 /* ExportSpecifier */;
+                    case 73 /* Identifier */:
+                        return parent.kind !== 187 /* BindingElement */ &&
+                            parent.kind !== 254 /* ImportSpecifier */ &&
+                            parent.kind !== 258 /* ExportSpecifier */;
                 }
                 return true;
             }
             function isBlockLike(node) {
                 switch (node.kind) {
-                    case 218 /* Block */:
-                    case 284 /* SourceFile */:
-                    case 245 /* ModuleBlock */:
-                    case 271 /* CaseClause */:
+                    case 219 /* Block */:
+                    case 285 /* SourceFile */:
+                    case 246 /* ModuleBlock */:
+                    case 272 /* CaseClause */:
                         return true;
                     default:
                         return false;
@@ -118403,6 +122205,136 @@ var ts;
 })(ts || (ts = {}));
 /* @internal */
 var ts;
+(function (ts) {
+    var refactor;
+    (function (refactor) {
+        var refactorName = "Extract type";
+        var extractToTypeAlias = "Extract to type alias";
+        var extractToTypeDef = "Extract to typedef";
+        refactor.registerRefactor(refactorName, {
+            getAvailableActions: function (context) {
+                var info = getRangeToExtract(context);
+                if (!info)
+                    return ts.emptyArray;
+                return [{
+                        name: refactorName,
+                        description: ts.getLocaleSpecificMessage(ts.Diagnostics.Extract_type),
+                        actions: [info.isJS ? {
+                                name: extractToTypeDef, description: ts.getLocaleSpecificMessage(ts.Diagnostics.Extract_to_typedef)
+                            } : {
+                                name: extractToTypeAlias, description: ts.getLocaleSpecificMessage(ts.Diagnostics.Extract_to_type_alias)
+                            }]
+                    }];
+            },
+            getEditsForAction: function (context, actionName) {
+                ts.Debug.assert(actionName === extractToTypeAlias || actionName === extractToTypeDef);
+                var file = context.file;
+                var info = ts.Debug.assertDefined(getRangeToExtract(context));
+                ts.Debug.assert(actionName === extractToTypeAlias && !info.isJS || actionName === extractToTypeDef && info.isJS);
+                var name = ts.getUniqueName("NewType", file);
+                var edits = ts.textChanges.ChangeTracker.with(context, function (changes) { return info.isJS ?
+                    doTypedefChange(changes, file, name, info.firstStatement, info.selection, info.typeParameters) :
+                    doTypeAliasChange(changes, file, name, info.firstStatement, info.selection, info.typeParameters); });
+                var renameFilename = file.fileName;
+                var renameLocation = ts.getRenameLocation(edits, renameFilename, name, /*preferLastLocation*/ false);
+                return { edits: edits, renameFilename: renameFilename, renameLocation: renameLocation };
+            }
+        });
+        function getRangeToExtract(context) {
+            var file = context.file, startPosition = context.startPosition;
+            var isJS = ts.isSourceFileJS(file);
+            var current = ts.getTokenAtPosition(file, startPosition);
+            var range = ts.createTextRangeFromSpan(ts.getRefactorContextSpan(context));
+            var selection = ts.findAncestor(current, (function (node) { return node.parent && rangeContainsSkipTrivia(range, node, file) && !rangeContainsSkipTrivia(range, node.parent, file); }));
+            if (!selection || !ts.isTypeNode(selection))
+                return undefined;
+            var checker = context.program.getTypeChecker();
+            var firstStatement = ts.Debug.assertDefined(isJS ? ts.findAncestor(selection, isStatementAndHasJSDoc) : ts.findAncestor(selection, ts.isStatement));
+            var typeParameters = collectTypeParameters(checker, selection, firstStatement, file);
+            if (!typeParameters)
+                return undefined;
+            return { isJS: isJS, selection: selection, firstStatement: firstStatement, typeParameters: typeParameters };
+        }
+        function isStatementAndHasJSDoc(n) {
+            return ts.isStatement(n) && ts.hasJSDocNodes(n);
+        }
+        function rangeContainsSkipTrivia(r1, node, file) {
+            return ts.rangeContainsStartEnd(r1, ts.skipTrivia(file.text, node.pos), node.end);
+        }
+        function collectTypeParameters(checker, selection, statement, file) {
+            var result = [];
+            return visitor(selection) ? undefined : result;
+            function visitor(node) {
+                if (ts.isTypeReferenceNode(node)) {
+                    if (ts.isIdentifier(node.typeName)) {
+                        var symbol = checker.resolveName(node.typeName.text, node.typeName, 262144 /* TypeParameter */, /* excludeGlobals */ true);
+                        if (symbol) {
+                            var declaration = ts.cast(ts.first(symbol.declarations), ts.isTypeParameterDeclaration);
+                            if (rangeContainsSkipTrivia(statement, declaration, file) && !rangeContainsSkipTrivia(selection, declaration, file)) {
+                                result.push(declaration);
+                            }
+                        }
+                    }
+                }
+                else if (ts.isInferTypeNode(node)) {
+                    var conditionalTypeNode = ts.findAncestor(node, function (n) { return ts.isConditionalTypeNode(n) && rangeContainsSkipTrivia(n.extendsType, node, file); });
+                    if (!conditionalTypeNode || !rangeContainsSkipTrivia(selection, conditionalTypeNode, file)) {
+                        return true;
+                    }
+                }
+                else if ((ts.isTypePredicateNode(node) || ts.isThisTypeNode(node))) {
+                    var functionLikeNode = ts.findAncestor(node.parent, ts.isFunctionLike);
+                    if (functionLikeNode && functionLikeNode.type && rangeContainsSkipTrivia(functionLikeNode.type, node, file) && !rangeContainsSkipTrivia(selection, functionLikeNode, file)) {
+                        return true;
+                    }
+                }
+                else if (ts.isTypeQueryNode(node)) {
+                    if (ts.isIdentifier(node.exprName)) {
+                        var symbol = checker.resolveName(node.exprName.text, node.exprName, 67220415 /* Value */, /* excludeGlobals */ false);
+                        if (symbol && rangeContainsSkipTrivia(statement, symbol.valueDeclaration, file) && !rangeContainsSkipTrivia(selection, symbol.valueDeclaration, file)) {
+                            return true;
+                        }
+                    }
+                    else {
+                        if (ts.isThisIdentifier(node.exprName.left) && !rangeContainsSkipTrivia(selection, node.parent, file)) {
+                            return true;
+                        }
+                    }
+                }
+                return ts.forEachChild(node, visitor);
+            }
+        }
+        function doTypeAliasChange(changes, file, name, firstStatement, selection, typeParameters) {
+            var newTypeNode = ts.createTypeAliasDeclaration(
+            /* decorators */ undefined, 
+            /* modifiers */ undefined, name, typeParameters.map(function (id) { return ts.updateTypeParameterDeclaration(id, id.name, id.constraint, /* defaultType */ undefined); }), selection);
+            changes.insertNodeBefore(file, firstStatement, newTypeNode, /* blankLineBetween */ true);
+            changes.replaceNode(file, selection, ts.createTypeReferenceNode(name, typeParameters.map(function (id) { return ts.createTypeReferenceNode(id.name, /* typeArguments */ undefined); })));
+        }
+        function doTypedefChange(changes, file, name, firstStatement, selection, typeParameters) {
+            var node = ts.createNode(311 /* JSDocTypedefTag */);
+            node.tagName = ts.createIdentifier("typedef"); // TODO: jsdoc factory https://github.com/Microsoft/TypeScript/pull/29539
+            node.fullName = ts.createIdentifier(name);
+            node.name = node.fullName;
+            node.typeExpression = ts.createJSDocTypeExpression(selection);
+            var templates = [];
+            ts.forEach(typeParameters, function (typeParameter) {
+                var constraint = ts.getEffectiveConstraintOfTypeParameter(typeParameter);
+                var template = ts.createNode(310 /* JSDocTemplateTag */);
+                template.tagName = ts.createIdentifier("template");
+                template.constraint = constraint && ts.cast(constraint, ts.isJSDocTypeExpression);
+                var parameter = ts.createNode(151 /* TypeParameter */);
+                parameter.name = typeParameter.name;
+                template.typeParameters = ts.createNodeArray([parameter]);
+                templates.push(template);
+            });
+            changes.insertNodeBefore(file, firstStatement, ts.createJSDocComment(/* comment */ undefined, ts.createNodeArray(ts.concatenate(templates, [node]))), /* blankLineBetween */ true);
+            changes.replaceNode(file, selection, ts.createTypeReferenceNode(name, typeParameters.map(function (id) { return ts.createTypeReferenceNode(id.name, /* typeArguments */ undefined); })));
+        }
+    })(refactor = ts.refactor || (ts.refactor = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
 (function (ts) {
     var refactor;
     (function (refactor) {
@@ -118441,10 +122373,10 @@ var ts;
                 var modifierFlags = ts.getModifierFlags(declaration) & ~64 /* Readonly */;
                 var accessorModifiers = isInClassLike
                     ? !modifierFlags || modifierFlags & 8 /* Private */
-                        ? getModifiers(isJS, isStatic, 115 /* PublicKeyword */)
+                        ? getModifiers(isJS, isStatic, 116 /* PublicKeyword */)
                         : ts.createNodeArray(ts.createModifiersFromModifierFlags(modifierFlags))
                     : undefined;
-                var fieldModifiers = isInClassLike ? getModifiers(isJS, isStatic, 113 /* PrivateKeyword */) : undefined;
+                var fieldModifiers = isInClassLike ? getModifiers(isJS, isStatic, 114 /* PrivateKeyword */) : undefined;
                 updateFieldDeclaration(changeTracker, file, declaration, fieldName, fieldModifiers);
                 var getAccessor = generateGetAccessor(fieldName, accessorName, type, accessorModifiers, isStatic, container);
                 ts.suppressLeadingAndTrailingTrivia(getAccessor);
@@ -118482,7 +122414,7 @@ var ts;
                 return ts.isIdentifier(fieldName) ? ts.createPropertyAccess(leftHead, fieldName) : ts.createElementAccess(leftHead, ts.createLiteral(fieldName));
             }
             function getModifiers(isJS, isStatic, accessModifier) {
-                var modifiers = ts.append(!isJS ? [ts.createToken(accessModifier)] : undefined, isStatic ? ts.createToken(116 /* StaticKeyword */) : undefined);
+                var modifiers = ts.append(!isJS ? [ts.createToken(accessModifier)] : undefined, isStatic ? ts.createToken(117 /* StaticKeyword */) : undefined);
                 return modifiers && ts.createNodeArray(modifiers);
             }
             function startsWithUnderscore(name) {
@@ -118505,7 +122437,7 @@ var ts;
                     isStatic: ts.hasStaticModifier(declaration),
                     isReadonly: ts.hasReadonlyModifier(declaration),
                     type: ts.getTypeAnnotationNode(declaration),
-                    container: declaration.kind === 151 /* Parameter */ ? declaration.parent.parent : declaration.parent,
+                    container: declaration.kind === 152 /* Parameter */ ? declaration.parent.parent : declaration.parent,
                     originalName: declaration.name.text,
                     declaration: declaration,
                     fieldName: fieldName,
@@ -118562,13 +122494,13 @@ var ts;
                     return;
                 constructor.body.forEachChild(function recur(node) {
                     if (ts.isElementAccessExpression(node) &&
-                        node.expression.kind === 100 /* ThisKeyword */ &&
+                        node.expression.kind === 101 /* ThisKeyword */ &&
                         ts.isStringLiteral(node.argumentExpression) &&
                         node.argumentExpression.text === originalName &&
                         ts.isWriteAccess(node)) {
                         changeTracker.replaceNode(file, node.argumentExpression, ts.createStringLiteral(fieldName));
                     }
-                    if (ts.isPropertyAccessExpression(node) && node.expression.kind === 100 /* ThisKeyword */ && node.name.text === originalName && ts.isWriteAccess(node)) {
+                    if (ts.isPropertyAccessExpression(node) && node.expression.kind === 101 /* ThisKeyword */ && node.name.text === originalName && ts.isWriteAccess(node)) {
                         changeTracker.replaceNode(file, node.name, ts.createIdentifier(fieldName));
                     }
                     if (!ts.isFunctionLike(node) && !ts.isClassLike(node)) {
@@ -118650,11 +122582,11 @@ var ts;
         }
         function isPureImport(node) {
             switch (node.kind) {
-                case 249 /* ImportDeclaration */:
+                case 250 /* ImportDeclaration */:
                     return true;
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return !ts.hasModifier(node, 1 /* Export */);
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     return node.declarationList.declarations.every(function (d) { return !!d.initializer && ts.isRequireCall(d.initializer, /*checkArgumentIsStringLiteralLike*/ true); });
                 default:
                     return false;
@@ -118742,19 +122674,19 @@ var ts;
         }
         function getNamespaceLikeImport(node) {
             switch (node.kind) {
-                case 249 /* ImportDeclaration */:
-                    return node.importClause && node.importClause.namedBindings && node.importClause.namedBindings.kind === 251 /* NamespaceImport */ ?
+                case 250 /* ImportDeclaration */:
+                    return node.importClause && node.importClause.namedBindings && node.importClause.namedBindings.kind === 252 /* NamespaceImport */ ?
                         node.importClause.namedBindings.name : undefined;
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return node.name;
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     return ts.tryCast(node.name, ts.isIdentifier);
                 default:
                     return ts.Debug.assertNever(node);
             }
         }
         function updateNamespaceLikeImport(changes, sourceFile, checker, movedSymbols, newModuleName, newModuleSpecifier, oldImportId, oldImportNode) {
-            var preferredNewNamespaceName = ts.codefix.moduleSpecifierToValidIdentifier(newModuleName, 7 /* ESNext */);
+            var preferredNewNamespaceName = ts.codefix.moduleSpecifierToValidIdentifier(newModuleName, 99 /* ESNext */);
             var needUniqueName = false;
             var toChange = [];
             ts.FindAllReferences.Core.eachSymbolReferenceInFile(oldImportId, checker, sourceFile, function (ref) {
@@ -118778,20 +122710,20 @@ var ts;
             var newNamespaceId = ts.createIdentifier(newNamespaceName);
             var newModuleString = ts.createLiteral(newModuleSpecifier);
             switch (node.kind) {
-                case 249 /* ImportDeclaration */:
+                case 250 /* ImportDeclaration */:
                     return ts.createImportDeclaration(
                     /*decorators*/ undefined, /*modifiers*/ undefined, ts.createImportClause(/*name*/ undefined, ts.createNamespaceImport(newNamespaceId)), newModuleString);
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return ts.createImportEqualsDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, newNamespaceId, ts.createExternalModuleReference(newModuleString));
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     return ts.createVariableDeclaration(newNamespaceId, /*type*/ undefined, createRequireCall(newModuleString));
                 default:
                     return ts.Debug.assertNever(node);
             }
         }
         function moduleSpecifierFromImport(i) {
-            return (i.kind === 249 /* ImportDeclaration */ ? i.moduleSpecifier
-                : i.kind === 248 /* ImportEqualsDeclaration */ ? i.moduleReference.expression
+            return (i.kind === 250 /* ImportDeclaration */ ? i.moduleSpecifier
+                : i.kind === 249 /* ImportEqualsDeclaration */ ? i.moduleReference.expression
                     : i.initializer.arguments[0]);
         }
         function forEachImportInStatement(statement, cb) {
@@ -118861,15 +122793,15 @@ var ts;
         }
         function deleteUnusedImports(sourceFile, importDecl, changes, isUnused) {
             switch (importDecl.kind) {
-                case 249 /* ImportDeclaration */:
+                case 250 /* ImportDeclaration */:
                     deleteUnusedImportsInDeclaration(sourceFile, importDecl, changes, isUnused);
                     break;
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     if (isUnused(importDecl.name)) {
                         changes.delete(sourceFile, importDecl);
                     }
                     break;
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     deleteUnusedImportsInVariableDeclaration(sourceFile, importDecl, changes, isUnused);
                     break;
                 default:
@@ -118882,7 +122814,7 @@ var ts;
             var _a = importDecl.importClause, name = _a.name, namedBindings = _a.namedBindings;
             var defaultUnused = !name || isUnused(name);
             var namedBindingsUnused = !namedBindings ||
-                (namedBindings.kind === 251 /* NamespaceImport */ ? isUnused(namedBindings.name) : namedBindings.elements.length !== 0 && namedBindings.elements.every(function (e) { return isUnused(e.name); }));
+                (namedBindings.kind === 252 /* NamespaceImport */ ? isUnused(namedBindings.name) : namedBindings.elements.length !== 0 && namedBindings.elements.every(function (e) { return isUnused(e.name); }));
             if (defaultUnused && namedBindingsUnused) {
                 changes.delete(sourceFile, importDecl);
             }
@@ -118894,7 +122826,7 @@ var ts;
                     if (namedBindingsUnused) {
                         changes.delete(sourceFile, namedBindings);
                     }
-                    else if (namedBindings.kind === 252 /* NamedImports */) {
+                    else if (namedBindings.kind === 253 /* NamedImports */) {
                         for (var _i = 0, _b = namedBindings.elements; _i < _b.length; _i++) {
                             var element = _b[_i];
                             if (isUnused(element.name))
@@ -118907,14 +122839,14 @@ var ts;
         function deleteUnusedImportsInVariableDeclaration(sourceFile, varDecl, changes, isUnused) {
             var name = varDecl.name;
             switch (name.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     if (isUnused(name)) {
                         changes.delete(sourceFile, name);
                     }
                     break;
-                case 185 /* ArrayBindingPattern */:
+                case 186 /* ArrayBindingPattern */:
                     break;
-                case 184 /* ObjectBindingPattern */:
+                case 185 /* ObjectBindingPattern */:
                     if (name.elements.every(function (e) { return ts.isIdentifier(e.name) && isUnused(e.name); })) {
                         changes.delete(sourceFile, ts.isVariableDeclarationList(varDecl.parent) && varDecl.parent.declarations.length === 1 ? varDecl.parent.parent : varDecl);
                     }
@@ -119041,13 +122973,13 @@ var ts;
         // Below should all be utilities
         function isInImport(decl) {
             switch (decl.kind) {
-                case 248 /* ImportEqualsDeclaration */:
-                case 253 /* ImportSpecifier */:
-                case 250 /* ImportClause */:
+                case 249 /* ImportEqualsDeclaration */:
+                case 254 /* ImportSpecifier */:
+                case 251 /* ImportClause */:
                     return true;
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     return isVariableDeclarationInImport(decl);
-                case 186 /* BindingElement */:
+                case 187 /* BindingElement */:
                     return ts.isVariableDeclaration(decl.parent.parent) && isVariableDeclarationInImport(decl.parent.parent);
                 default:
                     return false;
@@ -119059,7 +122991,7 @@ var ts;
         }
         function filterImport(i, moduleSpecifier, keep) {
             switch (i.kind) {
-                case 249 /* ImportDeclaration */: {
+                case 250 /* ImportDeclaration */: {
                     var clause = i.importClause;
                     if (!clause)
                         return undefined;
@@ -119069,9 +123001,9 @@ var ts;
                         ? ts.createImportDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, ts.createImportClause(defaultImport, namedBindings), moduleSpecifier)
                         : undefined;
                 }
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return keep(i.name) ? i : undefined;
-                case 237 /* VariableDeclaration */: {
+                case 238 /* VariableDeclaration */: {
                     var name = filterBindingName(i.name, keep);
                     return name ? makeVariableStatement(name, i.type, createRequireCall(moduleSpecifier), i.parent.flags) : undefined;
                 }
@@ -119080,7 +123012,7 @@ var ts;
             }
         }
         function filterNamedBindings(namedBindings, keep) {
-            if (namedBindings.kind === 251 /* NamespaceImport */) {
+            if (namedBindings.kind === 252 /* NamespaceImport */) {
                 return keep(namedBindings.name) ? namedBindings : undefined;
             }
             else {
@@ -119090,11 +123022,11 @@ var ts;
         }
         function filterBindingName(name, keep) {
             switch (name.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return keep(name) ? name : undefined;
-                case 185 /* ArrayBindingPattern */:
+                case 186 /* ArrayBindingPattern */:
                     return name;
-                case 184 /* ObjectBindingPattern */: {
+                case 185 /* ObjectBindingPattern */: {
                     // We can't handle nested destructurings or property names well here, so just copy them all.
                     var newElements = name.elements.filter(function (prop) { return prop.propertyName || !ts.isIdentifier(prop.name) || keep(prop.name); });
                     return newElements.length ? ts.createObjectBindingPattern(newElements) : undefined;
@@ -119151,13 +123083,13 @@ var ts;
         }
         function isNonVariableTopLevelDeclaration(node) {
             switch (node.kind) {
-                case 239 /* FunctionDeclaration */:
-                case 240 /* ClassDeclaration */:
-                case 244 /* ModuleDeclaration */:
-                case 243 /* EnumDeclaration */:
-                case 242 /* TypeAliasDeclaration */:
-                case 241 /* InterfaceDeclaration */:
-                case 248 /* ImportEqualsDeclaration */:
+                case 240 /* FunctionDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 245 /* ModuleDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
+                case 242 /* InterfaceDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return true;
                 default:
                     return false;
@@ -119165,17 +123097,17 @@ var ts;
         }
         function forEachTopLevelDeclaration(statement, cb) {
             switch (statement.kind) {
-                case 239 /* FunctionDeclaration */:
-                case 240 /* ClassDeclaration */:
-                case 244 /* ModuleDeclaration */:
-                case 243 /* EnumDeclaration */:
-                case 242 /* TypeAliasDeclaration */:
-                case 241 /* InterfaceDeclaration */:
-                case 248 /* ImportEqualsDeclaration */:
+                case 240 /* FunctionDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 245 /* ModuleDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
+                case 242 /* InterfaceDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return cb(statement);
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     return ts.firstDefined(statement.declarationList.declarations, function (decl) { return forEachTopLevelDeclarationInBindingName(decl.name, cb); });
-                case 221 /* ExpressionStatement */: {
+                case 222 /* ExpressionStatement */: {
                     var expression = statement.expression;
                     return ts.isBinaryExpression(expression) && ts.getAssignmentDeclarationKind(expression) === 1 /* ExportsProperty */
                         ? cb(statement)
@@ -119185,10 +123117,10 @@ var ts;
         }
         function forEachTopLevelDeclarationInBindingName(name, cb) {
             switch (name.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return cb(ts.cast(name.parent, function (x) { return ts.isVariableDeclaration(x) || ts.isBindingElement(x); }));
-                case 185 /* ArrayBindingPattern */:
-                case 184 /* ObjectBindingPattern */:
+                case 186 /* ArrayBindingPattern */:
+                case 185 /* ObjectBindingPattern */:
                     return ts.firstDefined(name.elements, function (em) { return ts.isOmittedExpression(em) ? undefined : forEachTopLevelDeclarationInBindingName(em.name, cb); });
                 default:
                     return ts.Debug.assertNever(name);
@@ -119199,9 +123131,9 @@ var ts;
         }
         function getTopLevelDeclarationStatement(d) {
             switch (d.kind) {
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     return d.parent.parent;
-                case 186 /* BindingElement */:
+                case 187 /* BindingElement */:
                     return getTopLevelDeclarationStatement(ts.cast(d.parent.parent, function (p) { return ts.isVariableDeclaration(p) || ts.isBindingElement(p); }));
                 default:
                     return d;
@@ -119232,25 +123164,25 @@ var ts;
             return useEs6Exports ? [addEs6Export(decl)] : addCommonjsExport(decl);
         }
         function addEs6Export(d) {
-            var modifiers = ts.concatenate([ts.createModifier(85 /* ExportKeyword */)], d.modifiers);
+            var modifiers = ts.concatenate([ts.createModifier(86 /* ExportKeyword */)], d.modifiers);
             switch (d.kind) {
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     return ts.updateFunctionDeclaration(d, d.decorators, modifiers, d.asteriskToken, d.name, d.typeParameters, d.parameters, d.type, d.body);
-                case 240 /* ClassDeclaration */:
+                case 241 /* ClassDeclaration */:
                     return ts.updateClassDeclaration(d, d.decorators, modifiers, d.name, d.typeParameters, d.heritageClauses, d.members);
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     return ts.updateVariableStatement(d, modifiers, d.declarationList);
-                case 244 /* ModuleDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     return ts.updateModuleDeclaration(d, d.decorators, modifiers, d.name, d.body);
-                case 243 /* EnumDeclaration */:
+                case 244 /* EnumDeclaration */:
                     return ts.updateEnumDeclaration(d, d.decorators, modifiers, d.name, d.members);
-                case 242 /* TypeAliasDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
                     return ts.updateTypeAliasDeclaration(d, d.decorators, modifiers, d.name, d.typeParameters, d.type);
-                case 241 /* InterfaceDeclaration */:
+                case 242 /* InterfaceDeclaration */:
                     return ts.updateInterfaceDeclaration(d, d.decorators, modifiers, d.name, d.typeParameters, d.heritageClauses, d.members);
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return ts.updateImportEqualsDeclaration(d, d.decorators, modifiers, d.name, d.moduleReference);
-                case 221 /* ExpressionStatement */:
+                case 222 /* ExpressionStatement */:
                     return ts.Debug.fail(); // Shouldn't try to add 'export' keyword to `exports.x = ...`
                 default:
                     return ts.Debug.assertNever(d);
@@ -119261,18 +123193,18 @@ var ts;
         }
         function getNamesToExportInCommonJS(decl) {
             switch (decl.kind) {
-                case 239 /* FunctionDeclaration */:
-                case 240 /* ClassDeclaration */:
+                case 240 /* FunctionDeclaration */:
+                case 241 /* ClassDeclaration */:
                     return [decl.name.text]; // TODO: GH#18217
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     return ts.mapDefined(decl.declarationList.declarations, function (d) { return ts.isIdentifier(d.name) ? d.name.text : undefined; });
-                case 244 /* ModuleDeclaration */:
-                case 243 /* EnumDeclaration */:
-                case 242 /* TypeAliasDeclaration */:
-                case 241 /* InterfaceDeclaration */:
-                case 248 /* ImportEqualsDeclaration */:
+                case 245 /* ModuleDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
+                case 242 /* InterfaceDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return ts.emptyArray;
-                case 221 /* ExpressionStatement */:
+                case 222 /* ExpressionStatement */:
                     return ts.Debug.fail(); // Shouldn't try to add 'export' keyword to `exports.x = ...`
                 default:
                     return ts.Debug.assertNever(decl);
@@ -119280,7 +123212,7 @@ var ts;
         }
         /** Creates `exports.x = x;` */
         function createExportAssignment(name) {
-            return ts.createExpressionStatement(ts.createBinary(ts.createPropertyAccess(ts.createIdentifier("exports"), ts.createIdentifier(name)), 59 /* EqualsToken */, ts.createIdentifier(name)));
+            return ts.createExpressionStatement(ts.createBinary(ts.createPropertyAccess(ts.createIdentifier("exports"), ts.createIdentifier(name)), 60 /* EqualsToken */, ts.createIdentifier(name)));
         }
     })(refactor = ts.refactor || (ts.refactor = {}));
 })(ts || (ts = {}));
@@ -119379,9 +123311,9 @@ var ts;
 (function (ts) {
     var refactor;
     (function (refactor) {
-        var convertToNamedParameters;
-        (function (convertToNamedParameters) {
-            var refactorName = "Convert to named parameters";
+        var convertParamsToDestructuredObject;
+        (function (convertParamsToDestructuredObject) {
+            var refactorName = "Convert parameters to destructured object";
             var minimumParameterLength = 2;
             refactor.registerRefactor(refactorName, { getEditsForAction: getEditsForAction, getAvailableActions: getAvailableActions });
             function getAvailableActions(context) {
@@ -119392,7 +123324,7 @@ var ts;
                 var functionDeclaration = getFunctionDeclarationAtPosition(file, startPosition, context.program.getTypeChecker());
                 if (!functionDeclaration)
                     return ts.emptyArray;
-                var description = ts.getLocaleSpecificMessage(ts.Diagnostics.Convert_to_named_parameters);
+                var description = ts.getLocaleSpecificMessage(ts.Diagnostics.Convert_parameters_to_destructured_object);
                 return [{
                         name: refactorName,
                         description: description,
@@ -119439,15 +123371,15 @@ var ts;
                 var checker = program.getTypeChecker();
                 var references = ts.flatMap(names, /*mapfn*/ function (/*mapfn*/ name) { return ts.FindAllReferences.getReferenceEntriesForNode(-1, name, program, program.getSourceFiles(), cancellationToken); });
                 var groupedReferences = groupReferences(references);
-                if (!ts.every(groupedReferences.declarations, function (decl) { return ts.contains(names, decl); })) {
+                if (!ts.every(groupedReferences.declarations, /*callback*/ function (/*callback*/ decl) { return ts.contains(names, decl); })) {
                     groupedReferences.valid = false;
                 }
                 return groupedReferences;
                 function groupReferences(referenceEntries) {
                     var classReferences = { accessExpressions: [], typeUsages: [] };
                     var groupedReferences = { functionCalls: [], declarations: [], classReferences: classReferences, valid: true };
-                    var functionSymbols = ts.map(functionNames, checker.getSymbolAtLocation);
-                    var classSymbols = ts.map(classNames, checker.getSymbolAtLocation);
+                    var functionSymbols = ts.map(functionNames, getSymbolTargetAtLocation);
+                    var classSymbols = ts.map(classNames, getSymbolTargetAtLocation);
                     var isConstructor = ts.isConstructorDeclaration(functionDeclaration);
                     for (var _i = 0, referenceEntries_1 = referenceEntries; _i < referenceEntries_1.length; _i++) {
                         var entry = referenceEntries_1[_i];
@@ -119455,7 +123387,22 @@ var ts;
                             groupedReferences.valid = false;
                             continue;
                         }
-                        if (ts.contains(functionSymbols, checker.getSymbolAtLocation(entry.node), symbolComparer)) {
+                        /* We compare symbols because in some cases find all references wil return a reference that may or may not be to the refactored function.
+                        Example from the refactorConvertParamsToDestructuredObject_methodCallUnion.ts test:
+                            class A { foo(a: number, b: number) { return a + b; } }
+                            class B { foo(c: number, d: number) { return c + d; } }
+                            declare const ab: A | B;
+                            ab.foo(1, 2);
+                        Find all references will return `ab.foo(1, 2)` as a reference to A's `foo` but we could be calling B's `foo`.
+                        When looking for constructor calls, however, the symbol on the constructor call reference is going to be the corresponding class symbol.
+                        So we need to add a special case for this because when calling a constructor of a class through one of its subclasses,
+                        the symbols are going to be different.
+                        */
+                        if (ts.contains(functionSymbols, getSymbolTargetAtLocation(entry.node)) || ts.isNewExpressionTarget(entry.node)) {
+                            var importOrExportReference = entryToImportOrExport(entry);
+                            if (importOrExportReference) {
+                                continue;
+                            }
                             var decl = entryToDeclaration(entry);
                             if (decl) {
                                 groupedReferences.declarations.push(decl);
@@ -119468,7 +123415,11 @@ var ts;
                             }
                         }
                         // if the refactored function is a constructor, we must also check if the references to its class are valid
-                        if (isConstructor && ts.contains(classSymbols, checker.getSymbolAtLocation(entry.node), symbolComparer)) {
+                        if (isConstructor && ts.contains(classSymbols, getSymbolTargetAtLocation(entry.node))) {
+                            var importOrExportReference = entryToImportOrExport(entry);
+                            if (importOrExportReference) {
+                                continue;
+                            }
                             var decl = entryToDeclaration(entry);
                             if (decl) {
                                 groupedReferences.declarations.push(decl);
@@ -119493,9 +123444,23 @@ var ts;
                     }
                     return groupedReferences;
                 }
+                function getSymbolTargetAtLocation(node) {
+                    var symbol = checker.getSymbolAtLocation(node);
+                    return symbol && ts.getSymbolTarget(symbol, checker);
+                }
             }
-            function symbolComparer(a, b) {
-                return ts.getSymbolTarget(a) === ts.getSymbolTarget(b);
+            function entryToImportOrExport(entry) {
+                var node = entry.node;
+                if (ts.isImportSpecifier(node.parent)
+                    || ts.isImportClause(node.parent)
+                    || ts.isImportEqualsDeclaration(node.parent)
+                    || ts.isNamespaceImport(node.parent)) {
+                    return node;
+                }
+                if (ts.isExportSpecifier(node.parent) || ts.isExportAssignment(node.parent)) {
+                    return node;
+                }
+                return undefined;
             }
             function entryToDeclaration(entry) {
                 if (ts.isDeclaration(entry.node.parent)) {
@@ -119508,37 +123473,31 @@ var ts;
                     var functionReference = entry.node;
                     var parent = functionReference.parent;
                     switch (parent.kind) {
-                        // Function call (foo(...) or super(...))
-                        case 191 /* CallExpression */:
-                            var callExpression = ts.tryCast(parent, ts.isCallExpression);
-                            if (callExpression && callExpression.expression === functionReference) {
-                                return callExpression;
+                        // foo(...) or super(...) or new Foo(...)
+                        case 192 /* CallExpression */:
+                        case 193 /* NewExpression */:
+                            var callOrNewExpression = ts.tryCast(parent, ts.isCallOrNewExpression);
+                            if (callOrNewExpression && callOrNewExpression.expression === functionReference) {
+                                return callOrNewExpression;
                             }
                             break;
-                        // Constructor call (new Foo(...))
-                        case 192 /* NewExpression */:
-                            var newExpression = ts.tryCast(parent, ts.isNewExpression);
-                            if (newExpression && newExpression.expression === functionReference) {
-                                return newExpression;
-                            }
-                            break;
-                        // Method call (x.foo(...))
-                        case 189 /* PropertyAccessExpression */:
+                        // x.foo(...)
+                        case 190 /* PropertyAccessExpression */:
                             var propertyAccessExpression = ts.tryCast(parent, ts.isPropertyAccessExpression);
                             if (propertyAccessExpression && propertyAccessExpression.parent && propertyAccessExpression.name === functionReference) {
-                                var callExpression_1 = ts.tryCast(propertyAccessExpression.parent, ts.isCallExpression);
-                                if (callExpression_1 && callExpression_1.expression === propertyAccessExpression) {
-                                    return callExpression_1;
+                                var callOrNewExpression_1 = ts.tryCast(propertyAccessExpression.parent, ts.isCallOrNewExpression);
+                                if (callOrNewExpression_1 && callOrNewExpression_1.expression === propertyAccessExpression) {
+                                    return callOrNewExpression_1;
                                 }
                             }
                             break;
-                        // Method call (x["foo"](...))
-                        case 190 /* ElementAccessExpression */:
+                        // x["foo"](...)
+                        case 191 /* ElementAccessExpression */:
                             var elementAccessExpression = ts.tryCast(parent, ts.isElementAccessExpression);
                             if (elementAccessExpression && elementAccessExpression.parent && elementAccessExpression.argumentExpression === functionReference) {
-                                var callExpression_2 = ts.tryCast(elementAccessExpression.parent, ts.isCallExpression);
-                                if (callExpression_2 && callExpression_2.expression === elementAccessExpression) {
-                                    return callExpression_2;
+                                var callOrNewExpression_2 = ts.tryCast(elementAccessExpression.parent, ts.isCallOrNewExpression);
+                                if (callOrNewExpression_2 && callOrNewExpression_2.expression === elementAccessExpression) {
+                                    return callOrNewExpression_2;
                                 }
                             }
                             break;
@@ -119552,14 +123511,14 @@ var ts;
                     var parent = reference.parent;
                     switch (parent.kind) {
                         // `C.foo`
-                        case 189 /* PropertyAccessExpression */:
+                        case 190 /* PropertyAccessExpression */:
                             var propertyAccessExpression = ts.tryCast(parent, ts.isPropertyAccessExpression);
                             if (propertyAccessExpression && propertyAccessExpression.expression === reference) {
                                 return propertyAccessExpression;
                             }
                             break;
                         // `C["foo"]`
-                        case 190 /* ElementAccessExpression */:
+                        case 191 /* ElementAccessExpression */:
                             var elementAccessExpression = ts.tryCast(parent, ts.isElementAccessExpression);
                             if (elementAccessExpression && elementAccessExpression.expression === reference) {
                                 return elementAccessExpression;
@@ -119578,7 +123537,10 @@ var ts;
             }
             function getFunctionDeclarationAtPosition(file, startPosition, checker) {
                 var node = ts.getTouchingToken(file, startPosition);
-                var functionDeclaration = ts.getContainingFunction(node);
+                var functionDeclaration = ts.getContainingFunctionDeclaration(node);
+                // don't offer refactor on top-level JSDoc
+                if (isTopLevelJSDoc(node))
+                    return undefined;
                 if (functionDeclaration
                     && isValidFunctionDeclaration(functionDeclaration, checker)
                     && ts.rangeContainsRange(functionDeclaration, node)
@@ -119586,31 +123548,57 @@ var ts;
                     return functionDeclaration;
                 return undefined;
             }
+            function isTopLevelJSDoc(node) {
+                var containingJSDoc = ts.findAncestor(node, ts.isJSDocNode);
+                if (containingJSDoc) {
+                    var containingNonJSDoc = ts.findAncestor(containingJSDoc, function (n) { return !ts.isJSDocNode(n); });
+                    return !!containingNonJSDoc && ts.isFunctionLikeDeclaration(containingNonJSDoc);
+                }
+                return false;
+            }
             function isValidFunctionDeclaration(functionDeclaration, checker) {
-                if (!isValidParameterNodeArray(functionDeclaration.parameters))
+                if (!isValidParameterNodeArray(functionDeclaration.parameters, checker))
                     return false;
                 switch (functionDeclaration.kind) {
-                    case 239 /* FunctionDeclaration */:
-                    case 156 /* MethodDeclaration */:
-                        return !!functionDeclaration.name && !!functionDeclaration.body && !checker.isImplementationOfOverload(functionDeclaration);
-                    case 157 /* Constructor */:
+                    case 240 /* FunctionDeclaration */:
+                        return hasNameOrDefault(functionDeclaration) && isSingleImplementation(functionDeclaration, checker);
+                    case 157 /* MethodDeclaration */:
+                        return isSingleImplementation(functionDeclaration, checker);
+                    case 158 /* Constructor */:
                         if (ts.isClassDeclaration(functionDeclaration.parent)) {
-                            return !!functionDeclaration.body && !!functionDeclaration.parent.name && !checker.isImplementationOfOverload(functionDeclaration);
+                            return hasNameOrDefault(functionDeclaration.parent) && isSingleImplementation(functionDeclaration, checker);
                         }
                         else {
-                            return isValidVariableDeclaration(functionDeclaration.parent.parent) && !!functionDeclaration.body && !checker.isImplementationOfOverload(functionDeclaration);
+                            return isValidVariableDeclaration(functionDeclaration.parent.parent)
+                                && isSingleImplementation(functionDeclaration, checker);
                         }
-                    case 196 /* FunctionExpression */:
-                    case 197 /* ArrowFunction */:
+                    case 197 /* FunctionExpression */:
+                    case 198 /* ArrowFunction */:
                         return isValidVariableDeclaration(functionDeclaration.parent);
                 }
                 return false;
             }
-            function isValidParameterNodeArray(parameters) {
-                return getRefactorableParametersLength(parameters) >= minimumParameterLength && ts.every(parameters, isValidParameterDeclaration);
+            function isSingleImplementation(functionDeclaration, checker) {
+                return !!functionDeclaration.body && !checker.isImplementationOfOverload(functionDeclaration);
             }
-            function isValidParameterDeclaration(paramDeclaration) {
-                return !paramDeclaration.modifiers && !paramDeclaration.decorators && ts.isIdentifier(paramDeclaration.name);
+            function hasNameOrDefault(functionOrClassDeclaration) {
+                if (!functionOrClassDeclaration.name) {
+                    var defaultKeyword = ts.findModifier(functionOrClassDeclaration, 81 /* DefaultKeyword */);
+                    return !!defaultKeyword;
+                }
+                return true;
+            }
+            function isValidParameterNodeArray(parameters, checker) {
+                return getRefactorableParametersLength(parameters) >= minimumParameterLength
+                    && ts.every(parameters, /*callback*/ function (/*callback*/ paramDecl) { return isValidParameterDeclaration(paramDecl, checker); });
+            }
+            function isValidParameterDeclaration(parameterDeclaration, checker) {
+                if (ts.isRestParameter(parameterDeclaration)) {
+                    var type = checker.getTypeAtLocation(parameterDeclaration);
+                    if (!checker.isArrayType(type) && !checker.isTupleType(type))
+                        return false;
+                }
+                return !parameterDeclaration.modifiers && !parameterDeclaration.decorators && ts.isIdentifier(parameterDeclaration.name);
             }
             function isValidVariableDeclaration(node) {
                 return ts.isVariableDeclaration(node) && ts.isVarConst(node) && ts.isIdentifier(node.name) && !node.type; // TODO: GH#30113
@@ -119630,13 +123618,22 @@ var ts;
                 }
                 return parameters;
             }
+            function createPropertyOrShorthandAssignment(name, initializer) {
+                if (ts.isIdentifier(initializer) && ts.getTextOfIdentifierOrLiteral(initializer) === name) {
+                    return ts.createShorthandPropertyAssignment(name);
+                }
+                return ts.createPropertyAssignment(name, initializer);
+            }
             function createNewArgument(functionDeclaration, functionArguments) {
                 var parameters = getRefactorableParameters(functionDeclaration.parameters);
                 var hasRestParameter = ts.isRestParameter(ts.last(parameters));
                 var nonRestArguments = hasRestParameter ? functionArguments.slice(0, parameters.length - 1) : functionArguments;
                 var properties = ts.map(nonRestArguments, function (arg, i) {
-                    var property = ts.createPropertyAssignment(getParameterName(parameters[i]), arg);
-                    ts.suppressLeadingAndTrailingTrivia(property.initializer);
+                    var parameterName = getParameterName(parameters[i]);
+                    var property = createPropertyOrShorthandAssignment(parameterName, arg);
+                    ts.suppressLeadingAndTrailingTrivia(property.name);
+                    if (ts.isPropertyAssignment(property))
+                        ts.suppressLeadingAndTrailingTrivia(property.initializer);
                     copyComments(arg, property);
                     return property;
                 });
@@ -119649,14 +123646,14 @@ var ts;
                 return objectLiteral;
             }
             function createNewParameters(functionDeclaration, program, host) {
+                var checker = program.getTypeChecker();
                 var refactorableParameters = getRefactorableParameters(functionDeclaration.parameters);
                 var bindingElements = ts.map(refactorableParameters, createBindingElementFromParameterDeclaration);
                 var objectParameterName = ts.createObjectBindingPattern(bindingElements);
                 var objectParameterType = createParameterTypeNode(refactorableParameters);
-                var checker = program.getTypeChecker();
                 var objectInitializer;
                 // If every parameter in the original function was optional, add an empty object initializer to the new object parameter
-                if (ts.every(refactorableParameters, checker.isOptionalParameter)) {
+                if (ts.every(refactorableParameters, isOptionalParameter)) {
                     objectInitializer = ts.createObjectLiteral();
                 }
                 var objectParameter = ts.createParameter(
@@ -119680,6 +123677,16 @@ var ts;
                     return ts.createNodeArray([newThisParameter, objectParameter]);
                 }
                 return ts.createNodeArray([objectParameter]);
+                function createBindingElementFromParameterDeclaration(parameterDeclaration) {
+                    var element = ts.createBindingElement(
+                    /*dotDotDotToken*/ undefined, 
+                    /*propertyName*/ undefined, getParameterName(parameterDeclaration), ts.isRestParameter(parameterDeclaration) && isOptionalParameter(parameterDeclaration) ? ts.createArrayLiteral() : parameterDeclaration.initializer);
+                    ts.suppressLeadingAndTrailingTrivia(element);
+                    if (parameterDeclaration.initializer && element.initializer) {
+                        copyComments(parameterDeclaration.initializer, element.initializer);
+                    }
+                    return element;
+                }
                 function createParameterTypeNode(parameters) {
                     var members = ts.map(parameters, createPropertySignatureFromParameterDeclaration);
                     var typeNode = ts.addEmitFlags(ts.createTypeLiteralNode(members), 1 /* SingleLine */);
@@ -119691,7 +123698,7 @@ var ts;
                         parameterType = getTypeNode(parameterDeclaration);
                     }
                     var propertySignature = ts.createPropertySignature(
-                    /*modifiers*/ undefined, getParameterName(parameterDeclaration), parameterDeclaration.initializer || ts.isRestParameter(parameterDeclaration) ? ts.createToken(56 /* QuestionToken */) : parameterDeclaration.questionToken, parameterType, 
+                    /*modifiers*/ undefined, getParameterName(parameterDeclaration), isOptionalParameter(parameterDeclaration) ? ts.createToken(56 /* QuestionToken */) : parameterDeclaration.questionToken, parameterType, 
                     /*initializer*/ undefined);
                     ts.suppressLeadingAndTrailingTrivia(propertySignature);
                     copyComments(parameterDeclaration.name, propertySignature.name);
@@ -119701,20 +123708,16 @@ var ts;
                     return propertySignature;
                 }
                 function getTypeNode(node) {
-                    var checker = program.getTypeChecker();
                     var type = checker.getTypeAtLocation(node);
                     return ts.getTypeNodeIfAccessible(type, node, program, host);
                 }
-            }
-            function createBindingElementFromParameterDeclaration(parameterDeclaration) {
-                var element = ts.createBindingElement(
-                /*dotDotDotToken*/ undefined, 
-                /*propertyName*/ undefined, getParameterName(parameterDeclaration), ts.isRestParameter(parameterDeclaration) ? ts.createArrayLiteral() : parameterDeclaration.initializer);
-                ts.suppressLeadingAndTrailingTrivia(element);
-                if (parameterDeclaration.initializer && element.initializer) {
-                    copyComments(parameterDeclaration.initializer, element.initializer);
+                function isOptionalParameter(parameterDeclaration) {
+                    if (ts.isRestParameter(parameterDeclaration)) {
+                        var type = checker.getTypeAtLocation(parameterDeclaration);
+                        return !checker.isTupleType(type);
+                    }
+                    return checker.isOptionalParameter(parameterDeclaration);
                 }
-                return element;
             }
             function copyComments(sourceNode, targetNode) {
                 var sourceFile = sourceNode.getSourceFile();
@@ -119741,10 +123744,15 @@ var ts;
             }
             function getClassNames(constructorDeclaration) {
                 switch (constructorDeclaration.parent.kind) {
-                    case 240 /* ClassDeclaration */:
+                    case 241 /* ClassDeclaration */:
                         var classDeclaration = constructorDeclaration.parent;
-                        return [classDeclaration.name];
-                    case 209 /* ClassExpression */:
+                        if (classDeclaration.name)
+                            return [classDeclaration.name];
+                        // If the class declaration doesn't have a name, it should have a default modifier.
+                        // We validated this in `isValidFunctionDeclaration` through `hasNameOrDefault`
+                        var defaultModifier = ts.Debug.assertDefined(ts.findModifier(classDeclaration, 81 /* DefaultKeyword */), "Nameless class declaration should be a default export");
+                        return [defaultModifier];
+                    case 210 /* ClassExpression */:
                         var classExpression = constructorDeclaration.parent;
                         var variableDeclaration = constructorDeclaration.parent.parent;
                         var className = classExpression.name;
@@ -119755,19 +123763,25 @@ var ts;
             }
             function getFunctionNames(functionDeclaration) {
                 switch (functionDeclaration.kind) {
-                    case 239 /* FunctionDeclaration */:
-                    case 156 /* MethodDeclaration */:
+                    case 240 /* FunctionDeclaration */:
+                        if (functionDeclaration.name)
+                            return [functionDeclaration.name];
+                        // If the function declaration doesn't have a name, it should have a default modifier.
+                        // We validated this in `isValidFunctionDeclaration` through `hasNameOrDefault`
+                        var defaultModifier = ts.Debug.assertDefined(ts.findModifier(functionDeclaration, 81 /* DefaultKeyword */), "Nameless function declaration should be a default export");
+                        return [defaultModifier];
+                    case 157 /* MethodDeclaration */:
                         return [functionDeclaration.name];
-                    case 157 /* Constructor */:
-                        var ctrKeyword = ts.findChildOfKind(functionDeclaration, 124 /* ConstructorKeyword */, functionDeclaration.getSourceFile());
-                        if (functionDeclaration.parent.kind === 209 /* ClassExpression */) {
+                    case 158 /* Constructor */:
+                        var ctrKeyword = ts.Debug.assertDefined(ts.findChildOfKind(functionDeclaration, 125 /* ConstructorKeyword */, functionDeclaration.getSourceFile()), "Constructor declaration should have constructor keyword");
+                        if (functionDeclaration.parent.kind === 210 /* ClassExpression */) {
                             var variableDeclaration = functionDeclaration.parent.parent;
                             return [variableDeclaration.name, ctrKeyword];
                         }
                         return [ctrKeyword];
-                    case 197 /* ArrowFunction */:
+                    case 198 /* ArrowFunction */:
                         return [functionDeclaration.parent.name];
-                    case 196 /* FunctionExpression */:
+                    case 197 /* FunctionExpression */:
                         if (functionDeclaration.name)
                             return [functionDeclaration.name, functionDeclaration.parent.name];
                         return [functionDeclaration.parent.name];
@@ -119775,7 +123789,7 @@ var ts;
                         return ts.Debug.assertNever(functionDeclaration);
                 }
             }
-        })(convertToNamedParameters = refactor.convertToNamedParameters || (refactor.convertToNamedParameters = {}));
+        })(convertParamsToDestructuredObject = refactor.convertParamsToDestructuredObject || (refactor.convertParamsToDestructuredObject = {}));
     })(refactor = ts.refactor || (ts.refactor = {}));
 })(ts || (ts = {}));
 var ts;
@@ -119784,7 +123798,7 @@ var ts;
     ts.servicesVersion = "0.8";
     function createNode(kind, pos, end, parent) {
         var node = ts.isNodeKind(kind) ? new NodeObject(kind, pos, end) :
-            kind === 72 /* Identifier */ ? new IdentifierObject(72 /* Identifier */, pos, end) :
+            kind === 73 /* Identifier */ ? new IdentifierObject(73 /* Identifier */, pos, end) :
                 new TokenObject(kind, pos, end);
         node.parent = parent;
         node.flags = parent.flags & 12679168 /* ContextFlags */;
@@ -119858,8 +123872,8 @@ var ts;
             if (!children.length) {
                 return undefined;
             }
-            var child = ts.find(children, function (kid) { return kid.kind < 288 /* FirstJSDocNode */ || kid.kind > 310 /* LastJSDocNode */; });
-            return child.kind < 148 /* FirstNode */ ?
+            var child = ts.find(children, function (kid) { return kid.kind < 289 /* FirstJSDocNode */ || kid.kind > 312 /* LastJSDocNode */; });
+            return child.kind < 149 /* FirstNode */ ?
                 child :
                 child.getFirstToken(sourceFile);
         };
@@ -119870,7 +123884,7 @@ var ts;
             if (!child) {
                 return undefined;
             }
-            return child.kind < 148 /* FirstNode */ ? child : child.getLastToken(sourceFile);
+            return child.kind < 149 /* FirstNode */ ? child : child.getLastToken(sourceFile);
         };
         NodeObject.prototype.forEachChild = function (cbNode, cbNodeArray) {
             return ts.forEachChild(this, cbNode, cbNodeArray);
@@ -119916,8 +123930,8 @@ var ts;
             var token = ts.scanner.scan();
             var textPos = ts.scanner.getTextPos();
             if (textPos <= end) {
-                if (token === 72 /* Identifier */) {
-                    ts.Debug.fail("Did not expect " + ts.Debug.showSyntaxKind(parent) + " to have an Identifier in its trivia");
+                if (token === 73 /* Identifier */) {
+                    ts.Debug.fail("Did not expect " + ts.Debug.formatSyntaxKind(parent.kind) + " to have an Identifier in its trivia");
                 }
                 nodes.push(createNode(token, pos, textPos, parent));
             }
@@ -119928,7 +123942,7 @@ var ts;
         }
     }
     function createSyntaxList(nodes, parent) {
-        var list = createNode(311 /* SyntaxList */, nodes.pos, nodes.end, parent);
+        var list = createNode(313 /* SyntaxList */, nodes.pos, nodes.end, parent);
         list._children = [];
         var pos = nodes.pos;
         for (var _i = 0, nodes_1 = nodes; _i < nodes_1.length; _i++) {
@@ -120062,7 +124076,7 @@ var ts;
         });
         return IdentifierObject;
     }(TokenOrIdentifierObject));
-    IdentifierObject.prototype.kind = 72 /* Identifier */;
+    IdentifierObject.prototype.kind = 73 /* Identifier */;
     var TypeObject = /** @class */ (function () {
         function TypeObject(checker, flags) {
             this.checker = checker;
@@ -120263,10 +124277,10 @@ var ts;
             }
             function visit(node) {
                 switch (node.kind) {
-                    case 239 /* FunctionDeclaration */:
-                    case 196 /* FunctionExpression */:
-                    case 156 /* MethodDeclaration */:
-                    case 155 /* MethodSignature */:
+                    case 240 /* FunctionDeclaration */:
+                    case 197 /* FunctionExpression */:
+                    case 157 /* MethodDeclaration */:
+                    case 156 /* MethodSignature */:
                         var functionDeclaration = node;
                         var declarationName = getDeclarationName(functionDeclaration);
                         if (declarationName) {
@@ -120286,31 +124300,31 @@ var ts;
                         }
                         ts.forEachChild(node, visit);
                         break;
-                    case 240 /* ClassDeclaration */:
-                    case 209 /* ClassExpression */:
-                    case 241 /* InterfaceDeclaration */:
-                    case 242 /* TypeAliasDeclaration */:
-                    case 243 /* EnumDeclaration */:
-                    case 244 /* ModuleDeclaration */:
-                    case 248 /* ImportEqualsDeclaration */:
-                    case 257 /* ExportSpecifier */:
-                    case 253 /* ImportSpecifier */:
-                    case 250 /* ImportClause */:
-                    case 251 /* NamespaceImport */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
-                    case 168 /* TypeLiteral */:
+                    case 241 /* ClassDeclaration */:
+                    case 210 /* ClassExpression */:
+                    case 242 /* InterfaceDeclaration */:
+                    case 243 /* TypeAliasDeclaration */:
+                    case 244 /* EnumDeclaration */:
+                    case 245 /* ModuleDeclaration */:
+                    case 249 /* ImportEqualsDeclaration */:
+                    case 258 /* ExportSpecifier */:
+                    case 254 /* ImportSpecifier */:
+                    case 251 /* ImportClause */:
+                    case 252 /* NamespaceImport */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
+                    case 169 /* TypeLiteral */:
                         addDeclaration(node);
                         ts.forEachChild(node, visit);
                         break;
-                    case 151 /* Parameter */:
+                    case 152 /* Parameter */:
                         // Only consider parameter properties
                         if (!ts.hasModifier(node, 92 /* ParameterPropertyModifier */)) {
                             break;
                         }
                     // falls through
-                    case 237 /* VariableDeclaration */:
-                    case 186 /* BindingElement */: {
+                    case 238 /* VariableDeclaration */:
+                    case 187 /* BindingElement */: {
                         var decl = node;
                         if (ts.isBindingPattern(decl.name)) {
                             ts.forEachChild(decl.name, visit);
@@ -120321,19 +124335,19 @@ var ts;
                         }
                     }
                     // falls through
-                    case 278 /* EnumMember */:
-                    case 154 /* PropertyDeclaration */:
-                    case 153 /* PropertySignature */:
+                    case 279 /* EnumMember */:
+                    case 155 /* PropertyDeclaration */:
+                    case 154 /* PropertySignature */:
                         addDeclaration(node);
                         break;
-                    case 255 /* ExportDeclaration */:
+                    case 256 /* ExportDeclaration */:
                         // Handle named exports case e.g.:
                         //    export {a, b as B} from "mod";
                         if (node.exportClause) {
                             ts.forEach(node.exportClause.elements, visit);
                         }
                         break;
-                    case 249 /* ImportDeclaration */:
+                    case 250 /* ImportDeclaration */:
                         var importClause = node.importClause;
                         if (importClause) {
                             // Handle default import case e.g.:
@@ -120345,7 +124359,7 @@ var ts;
                             //    import * as NS from "mod";
                             //    import {a, b as B} from "mod";
                             if (importClause.namedBindings) {
-                                if (importClause.namedBindings.kind === 251 /* NamespaceImport */) {
+                                if (importClause.namedBindings.kind === 252 /* NamespaceImport */) {
                                     addDeclaration(importClause.namedBindings);
                                 }
                                 else {
@@ -120354,7 +124368,7 @@ var ts;
                             }
                         }
                         break;
-                    case 204 /* BinaryExpression */:
+                    case 205 /* BinaryExpression */:
                         if (ts.getAssignmentDeclarationKind(node) !== 0 /* None */) {
                             addDeclaration(node);
                         }
@@ -120523,7 +124537,7 @@ var ts;
             var sourceFile;
             if (this.currentFileName !== fileName) {
                 // This is a new file, just parse it
-                sourceFile = createLanguageServiceSourceFile(fileName, scriptSnapshot, 7 /* Latest */, version, /*setNodeParents*/ true, scriptKind);
+                sourceFile = createLanguageServiceSourceFile(fileName, scriptSnapshot, 99 /* Latest */, version, /*setNodeParents*/ true, scriptKind);
             }
             else if (this.currentFileVersion !== version) {
                 // This is the same file, just a newer version. Incrementally parse the file.
@@ -120647,9 +124661,9 @@ var ts;
     }());
     ts.ThrottledCancellationToken = ThrottledCancellationToken;
     function createLanguageService(host, documentRegistry, syntaxOnly) {
+        var _a;
         if (documentRegistry === void 0) { documentRegistry = ts.createDocumentRegistry(host.useCaseSensitiveFileNames && host.useCaseSensitiveFileNames(), host.getCurrentDirectory()); }
         if (syntaxOnly === void 0) { syntaxOnly = false; }
-        var _a;
         var syntaxTreeCache = new SyntaxTreeCache(host);
         var program;
         var lastProjectVersion;
@@ -120680,7 +124694,7 @@ var ts;
         function getValidSourceFile(fileName) {
             var sourceFile = program.getSourceFile(fileName);
             if (!sourceFile) {
-                throw new Error("Could not find file: '" + fileName + "'.");
+                throw new Error("Could not find sourceFile: '" + fileName + "' in " + (program && JSON.stringify(program.getSourceFiles().map(function (f) { return f.fileName; }))) + ".");
             }
             return sourceFile;
         }
@@ -120927,41 +124941,48 @@ var ts;
                 return undefined;
             }
             var typeChecker = program.getTypeChecker();
-            var symbol = getSymbolAtLocationForQuickInfo(node, typeChecker);
+            var nodeForQuickInfo = getNodeForQuickInfo(node);
+            var symbol = getSymbolAtLocationForQuickInfo(nodeForQuickInfo, typeChecker);
             if (!symbol || typeChecker.isUnknownSymbol(symbol)) {
-                var type_2 = shouldGetType(sourceFile, node, position) ? typeChecker.getTypeAtLocation(node) : undefined;
+                var type_2 = shouldGetType(sourceFile, nodeForQuickInfo, position) ? typeChecker.getTypeAtLocation(nodeForQuickInfo) : undefined;
                 return type_2 && {
                     kind: "" /* unknown */,
                     kindModifiers: "" /* none */,
-                    textSpan: ts.createTextSpanFromNode(node, sourceFile),
-                    displayParts: typeChecker.runWithCancellationToken(cancellationToken, function (typeChecker) { return ts.typeToDisplayParts(typeChecker, type_2, ts.getContainerNode(node)); }),
+                    textSpan: ts.createTextSpanFromNode(nodeForQuickInfo, sourceFile),
+                    displayParts: typeChecker.runWithCancellationToken(cancellationToken, function (typeChecker) { return ts.typeToDisplayParts(typeChecker, type_2, ts.getContainerNode(nodeForQuickInfo)); }),
                     documentation: type_2.symbol ? type_2.symbol.getDocumentationComment(typeChecker) : undefined,
                     tags: type_2.symbol ? type_2.symbol.getJsDocTags() : undefined
                 };
             }
             var _a = typeChecker.runWithCancellationToken(cancellationToken, function (typeChecker) {
-                return ts.SymbolDisplay.getSymbolDisplayPartsDocumentationAndSymbolKind(typeChecker, symbol, sourceFile, ts.getContainerNode(node), node);
+                return ts.SymbolDisplay.getSymbolDisplayPartsDocumentationAndSymbolKind(typeChecker, symbol, sourceFile, ts.getContainerNode(nodeForQuickInfo), nodeForQuickInfo);
             }), symbolKind = _a.symbolKind, displayParts = _a.displayParts, documentation = _a.documentation, tags = _a.tags;
             return {
                 kind: symbolKind,
                 kindModifiers: ts.SymbolDisplay.getSymbolModifiers(symbol),
-                textSpan: ts.createTextSpanFromNode(node, sourceFile),
+                textSpan: ts.createTextSpanFromNode(nodeForQuickInfo, sourceFile),
                 displayParts: displayParts,
                 documentation: documentation,
                 tags: tags,
             };
         }
+        function getNodeForQuickInfo(node) {
+            if (ts.isNewExpression(node.parent) && node.pos === node.parent.pos) {
+                return node.parent.expression;
+            }
+            return node;
+        }
         function shouldGetType(sourceFile, node, position) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return !ts.isLabelName(node) && !ts.isTagName(node);
-                case 189 /* PropertyAccessExpression */:
-                case 148 /* QualifiedName */:
+                case 190 /* PropertyAccessExpression */:
+                case 149 /* QualifiedName */:
                     // Don't return quickInfo if inside the comment in `a/**/.b`
                     return !ts.isInComment(sourceFile, position);
-                case 100 /* ThisKeyword */:
-                case 178 /* ThisType */:
-                case 98 /* SuperKeyword */:
+                case 101 /* ThisKeyword */:
+                case 179 /* ThisType */:
+                case 99 /* SuperKeyword */:
                     return true;
                 default:
                     return false;
@@ -120987,13 +125008,7 @@ var ts;
         }
         /// References and Occurrences
         function getOccurrencesAtPosition(fileName, position) {
-            return ts.flatMap(getDocumentHighlights(fileName, position, [fileName]), function (entry) { return entry.highlightSpans.map(function (highlightSpan) { return ({
-                fileName: entry.fileName,
-                textSpan: highlightSpan.textSpan,
-                isWriteAccess: highlightSpan.kind === "writtenReference" /* writtenReference */,
-                isDefinition: false,
-                isInString: highlightSpan.isInString,
-            }); }); });
+            return ts.flatMap(getDocumentHighlights(fileName, position, [fileName]), function (entry) { return entry.highlightSpans.map(function (highlightSpan) { return (__assign({ fileName: entry.fileName, textSpan: highlightSpan.textSpan, isWriteAccess: highlightSpan.kind === "writtenReference" /* writtenReference */, isDefinition: false }, highlightSpan.isInString && { isInString: true }, highlightSpan.contextSpan && { contextSpan: highlightSpan.contextSpan })); }); });
         }
         function getDocumentHighlights(fileName, position, filesToSearch) {
             var normalizedFileName = ts.normalizePath(fileName);
@@ -121010,7 +125025,8 @@ var ts;
             if (ts.isIdentifier(node) && (ts.isJsxOpeningElement(node.parent) || ts.isJsxClosingElement(node.parent)) && ts.isIntrinsicJsxName(node.escapedText)) {
                 var _a = node.parent.parent, openingElement = _a.openingElement, closingElement = _a.closingElement;
                 return [openingElement, closingElement].map(function (node) {
-                    return ({ fileName: sourceFile.fileName, textSpan: ts.createTextSpanFromNode(node.tagName, sourceFile) });
+                    var textSpan = ts.createTextSpanFromNode(node.tagName, sourceFile);
+                    return __assign({ fileName: sourceFile.fileName, textSpan: textSpan }, ts.FindAllReferences.toContextSpan(textSpan, sourceFile, node.parent));
                 });
             }
             else {
@@ -121068,16 +125084,16 @@ var ts;
                 return undefined;
             }
             switch (node.kind) {
-                case 189 /* PropertyAccessExpression */:
-                case 148 /* QualifiedName */:
+                case 190 /* PropertyAccessExpression */:
+                case 149 /* QualifiedName */:
                 case 10 /* StringLiteral */:
-                case 87 /* FalseKeyword */:
-                case 102 /* TrueKeyword */:
-                case 96 /* NullKeyword */:
-                case 98 /* SuperKeyword */:
-                case 100 /* ThisKeyword */:
-                case 178 /* ThisType */:
-                case 72 /* Identifier */:
+                case 88 /* FalseKeyword */:
+                case 103 /* TrueKeyword */:
+                case 97 /* NullKeyword */:
+                case 99 /* SuperKeyword */:
+                case 101 /* ThisKeyword */:
+                case 179 /* ThisType */:
+                case 73 /* Identifier */:
                     break;
                 // Cant create the text span
                 default:
@@ -121093,7 +125109,7 @@ var ts;
                     // If this is name of a module declarations, check if this is right side of dotted module name
                     // If parent of the module declaration which is parent of this node is module declaration and its body is the module declaration that this node is name of
                     // Then this name is name from dotted module
-                    if (nodeForStartPos.parent.parent.kind === 244 /* ModuleDeclaration */ &&
+                    if (nodeForStartPos.parent.parent.kind === 245 /* ModuleDeclaration */ &&
                         nodeForStartPos.parent.parent.body === nodeForStartPos.parent) {
                         // Use parent module declarations name for start pos
                         nodeForStartPos = nodeForStartPos.parent.parent.name;
@@ -121236,30 +125252,14 @@ var ts;
         }
         function applyCodeActionCommand(fileName, actionOrFormatSettingsOrUndefined) {
             var action = typeof fileName === "string" ? actionOrFormatSettingsOrUndefined : fileName;
-            var formatSettings = typeof fileName !== "string" ? actionOrFormatSettingsOrUndefined : undefined;
-            return ts.isArray(action) ? Promise.all(action.map(function (a) { return applySingleCodeActionCommand(a, formatSettings); })) : applySingleCodeActionCommand(action, formatSettings);
+            return ts.isArray(action) ? Promise.all(action.map(function (a) { return applySingleCodeActionCommand(a); })) : applySingleCodeActionCommand(action);
         }
-        function applySingleCodeActionCommand(action, formatSettings) {
+        function applySingleCodeActionCommand(action) {
             var getPath = function (path) { return ts.toPath(path, currentDirectory, getCanonicalFileName); };
-            switch (action.type) {
-                case "install package":
-                    return host.installPackage
-                        ? host.installPackage({ fileName: getPath(action.file), packageName: action.packageName })
-                        : Promise.reject("Host does not implement `installPackage`");
-                case "generate types": {
-                    var fileToGenerateTypesFor = action.fileToGenerateTypesFor, outputFileName_1 = action.outputFileName;
-                    if (!host.inspectValue)
-                        return Promise.reject("Host does not implement `installPackage`");
-                    var valueInfoPromise = host.inspectValue({ fileNameToRequire: fileToGenerateTypesFor });
-                    return valueInfoPromise.then(function (valueInfo) {
-                        var fullOut = getPath(outputFileName_1);
-                        host.writeFile(fullOut, ts.valueInfoToDeclarationFileText(valueInfo, formatSettings || ts.testFormatSettings)); // TODO: GH#18217
-                        return { successMessage: "Wrote types to '" + fullOut + "'" };
-                    });
-                }
-                default:
-                    return ts.Debug.assertNever(action);
-            }
+            ts.Debug.assertEqual(action.type, "install package");
+            return host.installPackage
+                ? host.installPackage({ fileName: getPath(action.file), packageName: action.packageName })
+                : Promise.reject("Host does not implement `installPackage`");
         }
         function getDocCommentTemplateAtPosition(fileName, position) {
             return ts.JsDoc.getDocCommentTemplateAtPosition(ts.getNewLineOrDefaultFromHost(host), syntaxTreeCache.getCurrentSourceFile(fileName), position);
@@ -121455,6 +125455,9 @@ var ts;
                 preferences: preferences,
             };
         }
+        function getSmartSelectionRange(fileName, position) {
+            return ts.SmartSelectionRange.getSmartSelectionRange(position, syntaxTreeCache.getCurrentSourceFile(fileName));
+        }
         function getApplicableRefactors(fileName, positionOrRange, preferences) {
             if (preferences === void 0) { preferences = ts.emptyOptions; }
             synchronizeHostData();
@@ -121495,6 +125498,7 @@ var ts;
             getBreakpointStatementAtPosition: getBreakpointStatementAtPosition,
             getNavigateToItems: getNavigateToItems,
             getRenameInfo: getRenameInfo,
+            getSmartSelectionRange: getSmartSelectionRange,
             findRenameLocations: findRenameLocations,
             getNavigationBarItems: getNavigationBarItems,
             getNavigationTree: getNavigationTree,
@@ -121557,7 +125561,7 @@ var ts;
      */
     function literalIsName(node) {
         return ts.isDeclarationName(node) ||
-            node.parent.kind === 259 /* ExternalModuleReference */ ||
+            node.parent.kind === 260 /* ExternalModuleReference */ ||
             isArgumentOfElementAccessExpression(node) ||
             ts.isLiteralComputedPropertyDeclarationName(node);
     }
@@ -121574,13 +125578,13 @@ var ts;
         switch (node.kind) {
             case 10 /* StringLiteral */:
             case 8 /* NumericLiteral */:
-                if (node.parent.kind === 149 /* ComputedPropertyName */) {
+                if (node.parent.kind === 150 /* ComputedPropertyName */) {
                     return ts.isObjectLiteralElement(node.parent.parent) ? node.parent.parent : undefined;
                 }
             // falls through
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 return ts.isObjectLiteralElement(node.parent) &&
-                    (node.parent.parent.kind === 188 /* ObjectLiteralExpression */ || node.parent.parent.kind === 268 /* JsxAttributes */) &&
+                    (node.parent.parent.kind === 189 /* ObjectLiteralExpression */ || node.parent.parent.kind === 269 /* JsxAttributes */) &&
                     node.parent.name === node ? node.parent : undefined;
         }
         return undefined;
@@ -121622,7 +125626,7 @@ var ts;
     function isArgumentOfElementAccessExpression(node) {
         return node &&
             node.parent &&
-            node.parent.kind === 190 /* ElementAccessExpression */ &&
+            node.parent.kind === 191 /* ElementAccessExpression */ &&
             node.parent.argumentExpression === node;
     }
     /**
@@ -121702,114 +125706,114 @@ var ts;
                 if (node) {
                     var parent = node.parent;
                     switch (node.kind) {
-                        case 219 /* VariableStatement */:
+                        case 220 /* VariableStatement */:
                             // Span on first variable declaration
                             return spanInVariableDeclaration(node.declarationList.declarations[0]);
-                        case 237 /* VariableDeclaration */:
-                        case 154 /* PropertyDeclaration */:
-                        case 153 /* PropertySignature */:
+                        case 238 /* VariableDeclaration */:
+                        case 155 /* PropertyDeclaration */:
+                        case 154 /* PropertySignature */:
                             return spanInVariableDeclaration(node);
-                        case 151 /* Parameter */:
+                        case 152 /* Parameter */:
                             return spanInParameterDeclaration(node);
-                        case 239 /* FunctionDeclaration */:
-                        case 156 /* MethodDeclaration */:
-                        case 155 /* MethodSignature */:
-                        case 158 /* GetAccessor */:
-                        case 159 /* SetAccessor */:
-                        case 157 /* Constructor */:
-                        case 196 /* FunctionExpression */:
-                        case 197 /* ArrowFunction */:
+                        case 240 /* FunctionDeclaration */:
+                        case 157 /* MethodDeclaration */:
+                        case 156 /* MethodSignature */:
+                        case 159 /* GetAccessor */:
+                        case 160 /* SetAccessor */:
+                        case 158 /* Constructor */:
+                        case 197 /* FunctionExpression */:
+                        case 198 /* ArrowFunction */:
                             return spanInFunctionDeclaration(node);
-                        case 218 /* Block */:
+                        case 219 /* Block */:
                             if (ts.isFunctionBlock(node)) {
                                 return spanInFunctionBlock(node);
                             }
                         // falls through
-                        case 245 /* ModuleBlock */:
+                        case 246 /* ModuleBlock */:
                             return spanInBlock(node);
-                        case 274 /* CatchClause */:
+                        case 275 /* CatchClause */:
                             return spanInBlock(node.block);
-                        case 221 /* ExpressionStatement */:
+                        case 222 /* ExpressionStatement */:
                             // span on the expression
                             return textSpan(node.expression);
-                        case 230 /* ReturnStatement */:
+                        case 231 /* ReturnStatement */:
                             // span on return keyword and expression if present
                             return textSpan(node.getChildAt(0), node.expression);
-                        case 224 /* WhileStatement */:
+                        case 225 /* WhileStatement */:
                             // Span on while(...)
                             return textSpanEndingAtNextToken(node, node.expression);
-                        case 223 /* DoStatement */:
+                        case 224 /* DoStatement */:
                             // span in statement of the do statement
                             return spanInNode(node.statement);
-                        case 236 /* DebuggerStatement */:
+                        case 237 /* DebuggerStatement */:
                             // span on debugger keyword
                             return textSpan(node.getChildAt(0));
-                        case 222 /* IfStatement */:
+                        case 223 /* IfStatement */:
                             // set on if(..) span
                             return textSpanEndingAtNextToken(node, node.expression);
-                        case 233 /* LabeledStatement */:
+                        case 234 /* LabeledStatement */:
                             // span in statement
                             return spanInNode(node.statement);
-                        case 229 /* BreakStatement */:
-                        case 228 /* ContinueStatement */:
+                        case 230 /* BreakStatement */:
+                        case 229 /* ContinueStatement */:
                             // On break or continue keyword and label if present
                             return textSpan(node.getChildAt(0), node.label);
-                        case 225 /* ForStatement */:
+                        case 226 /* ForStatement */:
                             return spanInForStatement(node);
-                        case 226 /* ForInStatement */:
+                        case 227 /* ForInStatement */:
                             // span of for (a in ...)
                             return textSpanEndingAtNextToken(node, node.expression);
-                        case 227 /* ForOfStatement */:
+                        case 228 /* ForOfStatement */:
                             // span in initializer
                             return spanInInitializerOfForLike(node);
-                        case 232 /* SwitchStatement */:
+                        case 233 /* SwitchStatement */:
                             // span on switch(...)
                             return textSpanEndingAtNextToken(node, node.expression);
-                        case 271 /* CaseClause */:
-                        case 272 /* DefaultClause */:
+                        case 272 /* CaseClause */:
+                        case 273 /* DefaultClause */:
                             // span in first statement of the clause
                             return spanInNode(node.statements[0]);
-                        case 235 /* TryStatement */:
+                        case 236 /* TryStatement */:
                             // span in try block
                             return spanInBlock(node.tryBlock);
-                        case 234 /* ThrowStatement */:
+                        case 235 /* ThrowStatement */:
                             // span in throw ...
                             return textSpan(node, node.expression);
-                        case 254 /* ExportAssignment */:
+                        case 255 /* ExportAssignment */:
                             // span on export = id
                             return textSpan(node, node.expression);
-                        case 248 /* ImportEqualsDeclaration */:
+                        case 249 /* ImportEqualsDeclaration */:
                             // import statement without including semicolon
                             return textSpan(node, node.moduleReference);
-                        case 249 /* ImportDeclaration */:
+                        case 250 /* ImportDeclaration */:
                             // import statement without including semicolon
                             return textSpan(node, node.moduleSpecifier);
-                        case 255 /* ExportDeclaration */:
+                        case 256 /* ExportDeclaration */:
                             // import statement without including semicolon
                             return textSpan(node, node.moduleSpecifier);
-                        case 244 /* ModuleDeclaration */:
+                        case 245 /* ModuleDeclaration */:
                             // span on complete module if it is instantiated
                             if (ts.getModuleInstanceState(node) !== 1 /* Instantiated */) {
                                 return undefined;
                             }
                         // falls through
-                        case 240 /* ClassDeclaration */:
-                        case 243 /* EnumDeclaration */:
-                        case 278 /* EnumMember */:
-                        case 186 /* BindingElement */:
+                        case 241 /* ClassDeclaration */:
+                        case 244 /* EnumDeclaration */:
+                        case 279 /* EnumMember */:
+                        case 187 /* BindingElement */:
                             // span on complete node
                             return textSpan(node);
-                        case 231 /* WithStatement */:
+                        case 232 /* WithStatement */:
                             // span in statement
                             return spanInNode(node.statement);
-                        case 152 /* Decorator */:
+                        case 153 /* Decorator */:
                             return spanInNodeArray(parent.decorators);
-                        case 184 /* ObjectBindingPattern */:
-                        case 185 /* ArrayBindingPattern */:
+                        case 185 /* ObjectBindingPattern */:
+                        case 186 /* ArrayBindingPattern */:
                             return spanInBindingPattern(node);
                         // No breakpoint in interface, type alias
-                        case 241 /* InterfaceDeclaration */:
-                        case 242 /* TypeAliasDeclaration */:
+                        case 242 /* InterfaceDeclaration */:
+                        case 243 /* TypeAliasDeclaration */:
                             return undefined;
                         // Tokens:
                         case 26 /* SemicolonToken */:
@@ -121833,13 +125837,13 @@ var ts;
                         case 28 /* LessThanToken */:
                             return spanInGreaterThanOrLessThanToken(node);
                         // Keywords:
-                        case 107 /* WhileKeyword */:
+                        case 108 /* WhileKeyword */:
                             return spanInWhileKeyword(node);
-                        case 83 /* ElseKeyword */:
-                        case 75 /* CatchKeyword */:
-                        case 88 /* FinallyKeyword */:
+                        case 84 /* ElseKeyword */:
+                        case 76 /* CatchKeyword */:
+                        case 89 /* FinallyKeyword */:
                             return spanInNextNode(node);
-                        case 147 /* OfKeyword */:
+                        case 148 /* OfKeyword */:
                             return spanInOfKeyword(node);
                         default:
                             // Destructuring pattern in destructuring assignment
@@ -121851,14 +125855,14 @@ var ts;
                             // Set breakpoint on identifier element of destructuring pattern
                             // `a` or `...c` or `d: x` from
                             // `[a, b, ...c]` or `{ a, b }` or `{ d: x }` from destructuring pattern
-                            if ((node.kind === 72 /* Identifier */ ||
-                                node.kind === 208 /* SpreadElement */ ||
-                                node.kind === 275 /* PropertyAssignment */ ||
-                                node.kind === 276 /* ShorthandPropertyAssignment */) &&
+                            if ((node.kind === 73 /* Identifier */ ||
+                                node.kind === 209 /* SpreadElement */ ||
+                                node.kind === 276 /* PropertyAssignment */ ||
+                                node.kind === 277 /* ShorthandPropertyAssignment */) &&
                                 ts.isArrayLiteralOrObjectLiteralDestructuringPattern(parent)) {
                                 return textSpan(node);
                             }
-                            if (node.kind === 204 /* BinaryExpression */) {
+                            if (node.kind === 205 /* BinaryExpression */) {
                                 var _a = node, left = _a.left, operatorToken = _a.operatorToken;
                                 // Set breakpoint in destructuring pattern if its destructuring assignment
                                 // [a, b, c] or {a, b, c} of
@@ -121867,7 +125871,7 @@ var ts;
                                 if (ts.isArrayLiteralOrObjectLiteralDestructuringPattern(left)) {
                                     return spanInArrayLiteralOrObjectLiteralDestructuringPattern(left);
                                 }
-                                if (operatorToken.kind === 59 /* EqualsToken */ && ts.isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent)) {
+                                if (operatorToken.kind === 60 /* EqualsToken */ && ts.isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent)) {
                                     // Set breakpoint on assignment expression element of destructuring pattern
                                     // a = expression of
                                     // [a = expression, b, c] = someExpression or
@@ -121880,22 +125884,22 @@ var ts;
                             }
                             if (ts.isExpressionNode(node)) {
                                 switch (parent.kind) {
-                                    case 223 /* DoStatement */:
+                                    case 224 /* DoStatement */:
                                         // Set span as if on while keyword
                                         return spanInPreviousNode(node);
-                                    case 152 /* Decorator */:
+                                    case 153 /* Decorator */:
                                         // Set breakpoint on the decorator emit
                                         return spanInNode(node.parent);
-                                    case 225 /* ForStatement */:
-                                    case 227 /* ForOfStatement */:
+                                    case 226 /* ForStatement */:
+                                    case 228 /* ForOfStatement */:
                                         return textSpan(node);
-                                    case 204 /* BinaryExpression */:
+                                    case 205 /* BinaryExpression */:
                                         if (node.parent.operatorToken.kind === 27 /* CommaToken */) {
                                             // If this is a comma expression, the breakpoint is possible in this expression
                                             return textSpan(node);
                                         }
                                         break;
-                                    case 197 /* ArrowFunction */:
+                                    case 198 /* ArrowFunction */:
                                         if (node.parent.body === node) {
                                             // If this is body of arrow function, it is allowed to have the breakpoint
                                             return textSpan(node);
@@ -121904,21 +125908,21 @@ var ts;
                                 }
                             }
                             switch (node.parent.kind) {
-                                case 275 /* PropertyAssignment */:
+                                case 276 /* PropertyAssignment */:
                                     // If this is name of property assignment, set breakpoint in the initializer
                                     if (node.parent.name === node &&
                                         !ts.isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent.parent)) {
                                         return spanInNode(node.parent.initializer);
                                     }
                                     break;
-                                case 194 /* TypeAssertionExpression */:
+                                case 195 /* TypeAssertionExpression */:
                                     // Breakpoint in type assertion goes to its operand
                                     if (node.parent.type === node) {
                                         return spanInNextNode(node.parent.type);
                                     }
                                     break;
-                                case 237 /* VariableDeclaration */:
-                                case 151 /* Parameter */: {
+                                case 238 /* VariableDeclaration */:
+                                case 152 /* Parameter */: {
                                     // initializer of variable/parameter declaration go to previous node
                                     var _b = node.parent, initializer = _b.initializer, type = _b.type;
                                     if (initializer === node || type === node || ts.isAssignmentOperator(node.kind)) {
@@ -121926,7 +125930,7 @@ var ts;
                                     }
                                     break;
                                 }
-                                case 204 /* BinaryExpression */: {
+                                case 205 /* BinaryExpression */: {
                                     var left = node.parent.left;
                                     if (ts.isArrayLiteralOrObjectLiteralDestructuringPattern(left) && node !== left) {
                                         // If initializer of destructuring assignment move to previous token
@@ -121956,7 +125960,7 @@ var ts;
                 }
                 function spanInVariableDeclaration(variableDeclaration) {
                     // If declaration of for in statement, just set the span in parent
-                    if (variableDeclaration.parent.parent.kind === 226 /* ForInStatement */) {
+                    if (variableDeclaration.parent.parent.kind === 227 /* ForInStatement */) {
                         return spanInNode(variableDeclaration.parent.parent);
                     }
                     var parent = variableDeclaration.parent;
@@ -121968,7 +125972,7 @@ var ts;
                     // or its declaration from 'for of'
                     if (variableDeclaration.initializer ||
                         ts.hasModifier(variableDeclaration, 1 /* Export */) ||
-                        parent.parent.kind === 227 /* ForOfStatement */) {
+                        parent.parent.kind === 228 /* ForOfStatement */) {
                         return textSpanFromVariableDeclaration(variableDeclaration);
                     }
                     if (ts.isVariableDeclarationList(variableDeclaration.parent) &&
@@ -122009,7 +126013,7 @@ var ts;
                 }
                 function canFunctionHaveSpanInWholeDeclaration(functionDeclaration) {
                     return ts.hasModifier(functionDeclaration, 1 /* Export */) ||
-                        (functionDeclaration.parent.kind === 240 /* ClassDeclaration */ && functionDeclaration.kind !== 157 /* Constructor */);
+                        (functionDeclaration.parent.kind === 241 /* ClassDeclaration */ && functionDeclaration.kind !== 158 /* Constructor */);
                 }
                 function spanInFunctionDeclaration(functionDeclaration) {
                     // No breakpoints in the function signature
@@ -122032,26 +126036,26 @@ var ts;
                 }
                 function spanInBlock(block) {
                     switch (block.parent.kind) {
-                        case 244 /* ModuleDeclaration */:
+                        case 245 /* ModuleDeclaration */:
                             if (ts.getModuleInstanceState(block.parent) !== 1 /* Instantiated */) {
                                 return undefined;
                             }
                         // falls through
                         // Set on parent if on same line otherwise on first statement
-                        case 224 /* WhileStatement */:
-                        case 222 /* IfStatement */:
-                        case 226 /* ForInStatement */:
+                        case 225 /* WhileStatement */:
+                        case 223 /* IfStatement */:
+                        case 227 /* ForInStatement */:
                             return spanInNodeIfStartsOnSameLine(block.parent, block.statements[0]);
                         // Set span on previous token if it starts on same line otherwise on the first statement of the block
-                        case 225 /* ForStatement */:
-                        case 227 /* ForOfStatement */:
+                        case 226 /* ForStatement */:
+                        case 228 /* ForOfStatement */:
                             return spanInNodeIfStartsOnSameLine(ts.findPrecedingToken(block.pos, sourceFile, block.parent), block.statements[0]);
                     }
                     // Default action is to set on first statement
                     return spanInNode(block.statements[0]);
                 }
                 function spanInInitializerOfForLike(forLikeStatement) {
-                    if (forLikeStatement.initializer.kind === 238 /* VariableDeclarationList */) {
+                    if (forLikeStatement.initializer.kind === 239 /* VariableDeclarationList */) {
                         // Declaration list - set breakpoint in first declaration
                         var variableDeclarationList = forLikeStatement.initializer;
                         if (variableDeclarationList.declarations.length > 0) {
@@ -122076,21 +126080,21 @@ var ts;
                 }
                 function spanInBindingPattern(bindingPattern) {
                     // Set breakpoint in first binding element
-                    var firstBindingElement = ts.forEach(bindingPattern.elements, function (element) { return element.kind !== 210 /* OmittedExpression */ ? element : undefined; });
+                    var firstBindingElement = ts.forEach(bindingPattern.elements, function (element) { return element.kind !== 211 /* OmittedExpression */ ? element : undefined; });
                     if (firstBindingElement) {
                         return spanInNode(firstBindingElement);
                     }
                     // Empty binding pattern of binding element, set breakpoint on binding element
-                    if (bindingPattern.parent.kind === 186 /* BindingElement */) {
+                    if (bindingPattern.parent.kind === 187 /* BindingElement */) {
                         return textSpan(bindingPattern.parent);
                     }
                     // Variable declaration is used as the span
                     return textSpanFromVariableDeclaration(bindingPattern.parent);
                 }
                 function spanInArrayLiteralOrObjectLiteralDestructuringPattern(node) {
-                    ts.Debug.assert(node.kind !== 185 /* ArrayBindingPattern */ && node.kind !== 184 /* ObjectBindingPattern */);
-                    var elements = node.kind === 187 /* ArrayLiteralExpression */ ? node.elements : node.properties;
-                    var firstBindingElement = ts.forEach(elements, function (element) { return element.kind !== 210 /* OmittedExpression */ ? element : undefined; });
+                    ts.Debug.assert(node.kind !== 186 /* ArrayBindingPattern */ && node.kind !== 185 /* ObjectBindingPattern */);
+                    var elements = node.kind === 188 /* ArrayLiteralExpression */ ? node.elements : node.properties;
+                    var firstBindingElement = ts.forEach(elements, function (element) { return element.kind !== 211 /* OmittedExpression */ ? element : undefined; });
                     if (firstBindingElement) {
                         return spanInNode(firstBindingElement);
                     }
@@ -122098,18 +126102,18 @@ var ts;
                     // just nested element in another destructuring assignment
                     // set breakpoint on assignment when parent is destructuring assignment
                     // Otherwise set breakpoint for this element
-                    return textSpan(node.parent.kind === 204 /* BinaryExpression */ ? node.parent : node);
+                    return textSpan(node.parent.kind === 205 /* BinaryExpression */ ? node.parent : node);
                 }
                 // Tokens:
                 function spanInOpenBraceToken(node) {
                     switch (node.parent.kind) {
-                        case 243 /* EnumDeclaration */:
+                        case 244 /* EnumDeclaration */:
                             var enumDeclaration = node.parent;
                             return spanInNodeIfStartsOnSameLine(ts.findPrecedingToken(node.pos, sourceFile, node.parent), enumDeclaration.members.length ? enumDeclaration.members[0] : enumDeclaration.getLastToken(sourceFile));
-                        case 240 /* ClassDeclaration */:
+                        case 241 /* ClassDeclaration */:
                             var classDeclaration = node.parent;
                             return spanInNodeIfStartsOnSameLine(ts.findPrecedingToken(node.pos, sourceFile, node.parent), classDeclaration.members.length ? classDeclaration.members[0] : classDeclaration.getLastToken(sourceFile));
-                        case 246 /* CaseBlock */:
+                        case 247 /* CaseBlock */:
                             return spanInNodeIfStartsOnSameLine(node.parent.parent, node.parent.clauses[0]);
                     }
                     // Default to parent node
@@ -122117,25 +126121,25 @@ var ts;
                 }
                 function spanInCloseBraceToken(node) {
                     switch (node.parent.kind) {
-                        case 245 /* ModuleBlock */:
+                        case 246 /* ModuleBlock */:
                             // If this is not an instantiated module block, no bp span
                             if (ts.getModuleInstanceState(node.parent.parent) !== 1 /* Instantiated */) {
                                 return undefined;
                             }
                         // falls through
-                        case 243 /* EnumDeclaration */:
-                        case 240 /* ClassDeclaration */:
+                        case 244 /* EnumDeclaration */:
+                        case 241 /* ClassDeclaration */:
                             // Span on close brace token
                             return textSpan(node);
-                        case 218 /* Block */:
+                        case 219 /* Block */:
                             if (ts.isFunctionBlock(node.parent)) {
                                 // Span on close brace token
                                 return textSpan(node);
                             }
                         // falls through
-                        case 274 /* CatchClause */:
+                        case 275 /* CatchClause */:
                             return spanInNode(ts.lastOrUndefined(node.parent.statements));
-                        case 246 /* CaseBlock */:
+                        case 247 /* CaseBlock */:
                             // breakpoint in last statement of the last clause
                             var caseBlock = node.parent;
                             var lastClause = ts.lastOrUndefined(caseBlock.clauses);
@@ -122143,7 +126147,7 @@ var ts;
                                 return spanInNode(ts.lastOrUndefined(lastClause.statements));
                             }
                             return undefined;
-                        case 184 /* ObjectBindingPattern */:
+                        case 185 /* ObjectBindingPattern */:
                             // Breakpoint in last binding element or binding pattern if it contains no elements
                             var bindingPattern = node.parent;
                             return spanInNode(ts.lastOrUndefined(bindingPattern.elements) || bindingPattern);
@@ -122159,7 +126163,7 @@ var ts;
                 }
                 function spanInCloseBracketToken(node) {
                     switch (node.parent.kind) {
-                        case 185 /* ArrayBindingPattern */:
+                        case 186 /* ArrayBindingPattern */:
                             // Breakpoint in last binding element or binding pattern if it contains no elements
                             var bindingPattern = node.parent;
                             return textSpan(ts.lastOrUndefined(bindingPattern.elements) || bindingPattern);
@@ -122174,12 +126178,12 @@ var ts;
                     }
                 }
                 function spanInOpenParenToken(node) {
-                    if (node.parent.kind === 223 /* DoStatement */ || // Go to while keyword and do action instead
-                        node.parent.kind === 191 /* CallExpression */ ||
-                        node.parent.kind === 192 /* NewExpression */) {
+                    if (node.parent.kind === 224 /* DoStatement */ || // Go to while keyword and do action instead
+                        node.parent.kind === 192 /* CallExpression */ ||
+                        node.parent.kind === 193 /* NewExpression */) {
                         return spanInPreviousNode(node);
                     }
-                    if (node.parent.kind === 195 /* ParenthesizedExpression */) {
+                    if (node.parent.kind === 196 /* ParenthesizedExpression */) {
                         return spanInNextNode(node);
                     }
                     // Default to parent node
@@ -122188,21 +126192,21 @@ var ts;
                 function spanInCloseParenToken(node) {
                     // Is this close paren token of parameter list, set span in previous token
                     switch (node.parent.kind) {
-                        case 196 /* FunctionExpression */:
-                        case 239 /* FunctionDeclaration */:
-                        case 197 /* ArrowFunction */:
-                        case 156 /* MethodDeclaration */:
-                        case 155 /* MethodSignature */:
-                        case 158 /* GetAccessor */:
-                        case 159 /* SetAccessor */:
-                        case 157 /* Constructor */:
-                        case 224 /* WhileStatement */:
-                        case 223 /* DoStatement */:
-                        case 225 /* ForStatement */:
-                        case 227 /* ForOfStatement */:
-                        case 191 /* CallExpression */:
-                        case 192 /* NewExpression */:
-                        case 195 /* ParenthesizedExpression */:
+                        case 197 /* FunctionExpression */:
+                        case 240 /* FunctionDeclaration */:
+                        case 198 /* ArrowFunction */:
+                        case 157 /* MethodDeclaration */:
+                        case 156 /* MethodSignature */:
+                        case 159 /* GetAccessor */:
+                        case 160 /* SetAccessor */:
+                        case 158 /* Constructor */:
+                        case 225 /* WhileStatement */:
+                        case 224 /* DoStatement */:
+                        case 226 /* ForStatement */:
+                        case 228 /* ForOfStatement */:
+                        case 192 /* CallExpression */:
+                        case 193 /* NewExpression */:
+                        case 196 /* ParenthesizedExpression */:
                             return spanInPreviousNode(node);
                         // Default to parent node
                         default:
@@ -122212,20 +126216,20 @@ var ts;
                 function spanInColonToken(node) {
                     // Is this : specifying return annotation of the function declaration
                     if (ts.isFunctionLike(node.parent) ||
-                        node.parent.kind === 275 /* PropertyAssignment */ ||
-                        node.parent.kind === 151 /* Parameter */) {
+                        node.parent.kind === 276 /* PropertyAssignment */ ||
+                        node.parent.kind === 152 /* Parameter */) {
                         return spanInPreviousNode(node);
                     }
                     return spanInNode(node.parent);
                 }
                 function spanInGreaterThanOrLessThanToken(node) {
-                    if (node.parent.kind === 194 /* TypeAssertionExpression */) {
+                    if (node.parent.kind === 195 /* TypeAssertionExpression */) {
                         return spanInNextNode(node);
                     }
                     return spanInNode(node.parent);
                 }
                 function spanInWhileKeyword(node) {
-                    if (node.parent.kind === 223 /* DoStatement */) {
+                    if (node.parent.kind === 224 /* DoStatement */) {
                         // Set span on while expression
                         return textSpanEndingAtNextToken(node, node.parent.expression);
                     }
@@ -122233,7 +126237,7 @@ var ts;
                     return spanInNode(node.parent);
                 }
                 function spanInOfKeyword(node) {
-                    if (node.parent.kind === 227 /* ForOfStatement */) {
+                    if (node.parent.kind === 228 /* ForOfStatement */) {
                         // Set using next token
                         return spanInNextNode(node);
                     }
@@ -122702,6 +126706,10 @@ var ts;
             var _this = this;
             return this.forwardJSONCall("getRenameInfo('" + fileName + "', " + position + ")", function () { return _this.languageService.getRenameInfo(fileName, position, options); });
         };
+        LanguageServiceShimObject.prototype.getSmartSelectionRange = function (fileName, position) {
+            var _this = this;
+            return this.forwardJSONCall("getSmartSelectionRange('" + fileName + "', " + position + ")", function () { return _this.languageService.getSmartSelectionRange(fileName, position); });
+        };
         LanguageServiceShimObject.prototype.findRenameLocations = function (fileName, position, findInStrings, findInComments, providePrefixAndSuffixTextForRename) {
             var _this = this;
             return this.forwardJSONCall("findRenameLocations('" + fileName + "', " + position + ", " + findInStrings + ", " + findInComments + ", " + providePrefixAndSuffixTextForRename + ")", function () { return _this.languageService.findRenameLocations(fileName, position, findInStrings, findInComments, providePrefixAndSuffixTextForRename); });
diff --git a/lib/typescriptServices.d.ts b/lib/typescriptServices.d.ts
index 64211e8254d..e47b92d5fec 100644
--- a/lib/typescriptServices.d.ts
+++ b/lib/typescriptServices.d.ts
@@ -14,7 +14,7 @@ and limitations under the License.
 ***************************************************************************** */
 
 declare namespace ts {
-    const versionMajorMinor = "3.4";
+    const versionMajorMinor = "3.6";
     /** The version of the TypeScript compiler release */
     const version: string;
 }
@@ -53,7 +53,7 @@ declare namespace ts {
     interface Iterator<T> {
         next(): {
             value: T;
-            done: false;
+            done?: false;
         } | {
             value: never;
             done: true;
@@ -72,7 +72,7 @@ declare namespace ts {
         pos: number;
         end: number;
     }
-    type JsDocSyntaxKind = SyntaxKind.EndOfFileToken | SyntaxKind.WhitespaceTrivia | SyntaxKind.AtToken | SyntaxKind.NewLineTrivia | SyntaxKind.AsteriskToken | SyntaxKind.OpenBraceToken | SyntaxKind.CloseBraceToken | SyntaxKind.LessThanToken | SyntaxKind.OpenBracketToken | SyntaxKind.CloseBracketToken | SyntaxKind.EqualsToken | SyntaxKind.CommaToken | SyntaxKind.DotToken | SyntaxKind.Identifier | SyntaxKind.NoSubstitutionTemplateLiteral | SyntaxKind.Unknown | KeywordSyntaxKind;
+    type JSDocSyntaxKind = SyntaxKind.EndOfFileToken | SyntaxKind.WhitespaceTrivia | SyntaxKind.AtToken | SyntaxKind.NewLineTrivia | SyntaxKind.AsteriskToken | SyntaxKind.OpenBraceToken | SyntaxKind.CloseBraceToken | SyntaxKind.LessThanToken | SyntaxKind.GreaterThanToken | SyntaxKind.OpenBracketToken | SyntaxKind.CloseBracketToken | SyntaxKind.EqualsToken | SyntaxKind.CommaToken | SyntaxKind.DotToken | SyntaxKind.Identifier | SyntaxKind.BacktickToken | SyntaxKind.Unknown | KeywordSyntaxKind;
     type KeywordSyntaxKind = SyntaxKind.AbstractKeyword | SyntaxKind.AnyKeyword | SyntaxKind.AsKeyword | SyntaxKind.BigIntKeyword | SyntaxKind.BooleanKeyword | SyntaxKind.BreakKeyword | SyntaxKind.CaseKeyword | SyntaxKind.CatchKeyword | SyntaxKind.ClassKeyword | SyntaxKind.ContinueKeyword | SyntaxKind.ConstKeyword | SyntaxKind.ConstructorKeyword | SyntaxKind.DebuggerKeyword | SyntaxKind.DeclareKeyword | SyntaxKind.DefaultKeyword | SyntaxKind.DeleteKeyword | SyntaxKind.DoKeyword | SyntaxKind.ElseKeyword | SyntaxKind.EnumKeyword | SyntaxKind.ExportKeyword | SyntaxKind.ExtendsKeyword | SyntaxKind.FalseKeyword | SyntaxKind.FinallyKeyword | SyntaxKind.ForKeyword | SyntaxKind.FromKeyword | SyntaxKind.FunctionKeyword | SyntaxKind.GetKeyword | SyntaxKind.IfKeyword | SyntaxKind.ImplementsKeyword | SyntaxKind.ImportKeyword | SyntaxKind.InKeyword | SyntaxKind.InferKeyword | SyntaxKind.InstanceOfKeyword | SyntaxKind.InterfaceKeyword | SyntaxKind.IsKeyword | SyntaxKind.KeyOfKeyword | SyntaxKind.LetKeyword | SyntaxKind.ModuleKeyword | SyntaxKind.NamespaceKeyword | SyntaxKind.NeverKeyword | SyntaxKind.NewKeyword | SyntaxKind.NullKeyword | SyntaxKind.NumberKeyword | SyntaxKind.ObjectKeyword | SyntaxKind.PackageKeyword | SyntaxKind.PrivateKeyword | SyntaxKind.ProtectedKeyword | SyntaxKind.PublicKeyword | SyntaxKind.ReadonlyKeyword | SyntaxKind.RequireKeyword | SyntaxKind.GlobalKeyword | SyntaxKind.ReturnKeyword | SyntaxKind.SetKeyword | SyntaxKind.StaticKeyword | SyntaxKind.StringKeyword | SyntaxKind.SuperKeyword | SyntaxKind.SwitchKeyword | SyntaxKind.SymbolKeyword | SyntaxKind.ThisKeyword | SyntaxKind.ThrowKeyword | SyntaxKind.TrueKeyword | SyntaxKind.TryKeyword | SyntaxKind.TypeKeyword | SyntaxKind.TypeOfKeyword | SyntaxKind.UndefinedKeyword | SyntaxKind.UniqueKeyword | SyntaxKind.UnknownKeyword | SyntaxKind.VarKeyword | SyntaxKind.VoidKeyword | SyntaxKind.WhileKeyword | SyntaxKind.WithKeyword | SyntaxKind.YieldKeyword | SyntaxKind.AsyncKeyword | SyntaxKind.AwaitKeyword | SyntaxKind.OfKeyword;
     type JsxTokenSyntaxKind = SyntaxKind.LessThanSlashToken | SyntaxKind.EndOfFileToken | SyntaxKind.ConflictMarkerTrivia | SyntaxKind.JsxText | SyntaxKind.JsxTextAllWhiteSpaces | SyntaxKind.OpenBraceToken | SyntaxKind.LessThanToken;
     enum SyntaxKind {
@@ -135,281 +135,284 @@ declare namespace ts {
         QuestionToken = 56,
         ColonToken = 57,
         AtToken = 58,
-        EqualsToken = 59,
-        PlusEqualsToken = 60,
-        MinusEqualsToken = 61,
-        AsteriskEqualsToken = 62,
-        AsteriskAsteriskEqualsToken = 63,
-        SlashEqualsToken = 64,
-        PercentEqualsToken = 65,
-        LessThanLessThanEqualsToken = 66,
-        GreaterThanGreaterThanEqualsToken = 67,
-        GreaterThanGreaterThanGreaterThanEqualsToken = 68,
-        AmpersandEqualsToken = 69,
-        BarEqualsToken = 70,
-        CaretEqualsToken = 71,
-        Identifier = 72,
-        BreakKeyword = 73,
-        CaseKeyword = 74,
-        CatchKeyword = 75,
-        ClassKeyword = 76,
-        ConstKeyword = 77,
-        ContinueKeyword = 78,
-        DebuggerKeyword = 79,
-        DefaultKeyword = 80,
-        DeleteKeyword = 81,
-        DoKeyword = 82,
-        ElseKeyword = 83,
-        EnumKeyword = 84,
-        ExportKeyword = 85,
-        ExtendsKeyword = 86,
-        FalseKeyword = 87,
-        FinallyKeyword = 88,
-        ForKeyword = 89,
-        FunctionKeyword = 90,
-        IfKeyword = 91,
-        ImportKeyword = 92,
-        InKeyword = 93,
-        InstanceOfKeyword = 94,
-        NewKeyword = 95,
-        NullKeyword = 96,
-        ReturnKeyword = 97,
-        SuperKeyword = 98,
-        SwitchKeyword = 99,
-        ThisKeyword = 100,
-        ThrowKeyword = 101,
-        TrueKeyword = 102,
-        TryKeyword = 103,
-        TypeOfKeyword = 104,
-        VarKeyword = 105,
-        VoidKeyword = 106,
-        WhileKeyword = 107,
-        WithKeyword = 108,
-        ImplementsKeyword = 109,
-        InterfaceKeyword = 110,
-        LetKeyword = 111,
-        PackageKeyword = 112,
-        PrivateKeyword = 113,
-        ProtectedKeyword = 114,
-        PublicKeyword = 115,
-        StaticKeyword = 116,
-        YieldKeyword = 117,
-        AbstractKeyword = 118,
-        AsKeyword = 119,
-        AnyKeyword = 120,
-        AsyncKeyword = 121,
-        AwaitKeyword = 122,
-        BooleanKeyword = 123,
-        ConstructorKeyword = 124,
-        DeclareKeyword = 125,
-        GetKeyword = 126,
-        InferKeyword = 127,
-        IsKeyword = 128,
-        KeyOfKeyword = 129,
-        ModuleKeyword = 130,
-        NamespaceKeyword = 131,
-        NeverKeyword = 132,
-        ReadonlyKeyword = 133,
-        RequireKeyword = 134,
-        NumberKeyword = 135,
-        ObjectKeyword = 136,
-        SetKeyword = 137,
-        StringKeyword = 138,
-        SymbolKeyword = 139,
-        TypeKeyword = 140,
-        UndefinedKeyword = 141,
-        UniqueKeyword = 142,
-        UnknownKeyword = 143,
-        FromKeyword = 144,
-        GlobalKeyword = 145,
-        BigIntKeyword = 146,
-        OfKeyword = 147,
-        QualifiedName = 148,
-        ComputedPropertyName = 149,
-        TypeParameter = 150,
-        Parameter = 151,
-        Decorator = 152,
-        PropertySignature = 153,
-        PropertyDeclaration = 154,
-        MethodSignature = 155,
-        MethodDeclaration = 156,
-        Constructor = 157,
-        GetAccessor = 158,
-        SetAccessor = 159,
-        CallSignature = 160,
-        ConstructSignature = 161,
-        IndexSignature = 162,
-        TypePredicate = 163,
-        TypeReference = 164,
-        FunctionType = 165,
-        ConstructorType = 166,
-        TypeQuery = 167,
-        TypeLiteral = 168,
-        ArrayType = 169,
-        TupleType = 170,
-        OptionalType = 171,
-        RestType = 172,
-        UnionType = 173,
-        IntersectionType = 174,
-        ConditionalType = 175,
-        InferType = 176,
-        ParenthesizedType = 177,
-        ThisType = 178,
-        TypeOperator = 179,
-        IndexedAccessType = 180,
-        MappedType = 181,
-        LiteralType = 182,
-        ImportType = 183,
-        ObjectBindingPattern = 184,
-        ArrayBindingPattern = 185,
-        BindingElement = 186,
-        ArrayLiteralExpression = 187,
-        ObjectLiteralExpression = 188,
-        PropertyAccessExpression = 189,
-        ElementAccessExpression = 190,
-        CallExpression = 191,
-        NewExpression = 192,
-        TaggedTemplateExpression = 193,
-        TypeAssertionExpression = 194,
-        ParenthesizedExpression = 195,
-        FunctionExpression = 196,
-        ArrowFunction = 197,
-        DeleteExpression = 198,
-        TypeOfExpression = 199,
-        VoidExpression = 200,
-        AwaitExpression = 201,
-        PrefixUnaryExpression = 202,
-        PostfixUnaryExpression = 203,
-        BinaryExpression = 204,
-        ConditionalExpression = 205,
-        TemplateExpression = 206,
-        YieldExpression = 207,
-        SpreadElement = 208,
-        ClassExpression = 209,
-        OmittedExpression = 210,
-        ExpressionWithTypeArguments = 211,
-        AsExpression = 212,
-        NonNullExpression = 213,
-        MetaProperty = 214,
-        SyntheticExpression = 215,
-        TemplateSpan = 216,
-        SemicolonClassElement = 217,
-        Block = 218,
-        VariableStatement = 219,
-        EmptyStatement = 220,
-        ExpressionStatement = 221,
-        IfStatement = 222,
-        DoStatement = 223,
-        WhileStatement = 224,
-        ForStatement = 225,
-        ForInStatement = 226,
-        ForOfStatement = 227,
-        ContinueStatement = 228,
-        BreakStatement = 229,
-        ReturnStatement = 230,
-        WithStatement = 231,
-        SwitchStatement = 232,
-        LabeledStatement = 233,
-        ThrowStatement = 234,
-        TryStatement = 235,
-        DebuggerStatement = 236,
-        VariableDeclaration = 237,
-        VariableDeclarationList = 238,
-        FunctionDeclaration = 239,
-        ClassDeclaration = 240,
-        InterfaceDeclaration = 241,
-        TypeAliasDeclaration = 242,
-        EnumDeclaration = 243,
-        ModuleDeclaration = 244,
-        ModuleBlock = 245,
-        CaseBlock = 246,
-        NamespaceExportDeclaration = 247,
-        ImportEqualsDeclaration = 248,
-        ImportDeclaration = 249,
-        ImportClause = 250,
-        NamespaceImport = 251,
-        NamedImports = 252,
-        ImportSpecifier = 253,
-        ExportAssignment = 254,
-        ExportDeclaration = 255,
-        NamedExports = 256,
-        ExportSpecifier = 257,
-        MissingDeclaration = 258,
-        ExternalModuleReference = 259,
-        JsxElement = 260,
-        JsxSelfClosingElement = 261,
-        JsxOpeningElement = 262,
-        JsxClosingElement = 263,
-        JsxFragment = 264,
-        JsxOpeningFragment = 265,
-        JsxClosingFragment = 266,
-        JsxAttribute = 267,
-        JsxAttributes = 268,
-        JsxSpreadAttribute = 269,
-        JsxExpression = 270,
-        CaseClause = 271,
-        DefaultClause = 272,
-        HeritageClause = 273,
-        CatchClause = 274,
-        PropertyAssignment = 275,
-        ShorthandPropertyAssignment = 276,
-        SpreadAssignment = 277,
-        EnumMember = 278,
-        UnparsedPrologue = 279,
-        UnparsedPrepend = 280,
-        UnparsedText = 281,
-        UnparsedInternalText = 282,
-        UnparsedSyntheticReference = 283,
-        SourceFile = 284,
-        Bundle = 285,
-        UnparsedSource = 286,
-        InputFiles = 287,
-        JSDocTypeExpression = 288,
-        JSDocAllType = 289,
-        JSDocUnknownType = 290,
-        JSDocNullableType = 291,
-        JSDocNonNullableType = 292,
-        JSDocOptionalType = 293,
-        JSDocFunctionType = 294,
-        JSDocVariadicType = 295,
-        JSDocComment = 296,
-        JSDocTypeLiteral = 297,
-        JSDocSignature = 298,
-        JSDocTag = 299,
-        JSDocAugmentsTag = 300,
-        JSDocClassTag = 301,
-        JSDocCallbackTag = 302,
-        JSDocEnumTag = 303,
-        JSDocParameterTag = 304,
-        JSDocReturnTag = 305,
-        JSDocThisTag = 306,
-        JSDocTypeTag = 307,
-        JSDocTemplateTag = 308,
-        JSDocTypedefTag = 309,
-        JSDocPropertyTag = 310,
-        SyntaxList = 311,
-        NotEmittedStatement = 312,
-        PartiallyEmittedExpression = 313,
-        CommaListExpression = 314,
-        MergeDeclarationMarker = 315,
-        EndOfDeclarationMarker = 316,
-        Count = 317,
-        FirstAssignment = 59,
-        LastAssignment = 71,
-        FirstCompoundAssignment = 60,
-        LastCompoundAssignment = 71,
-        FirstReservedWord = 73,
-        LastReservedWord = 108,
-        FirstKeyword = 73,
-        LastKeyword = 147,
-        FirstFutureReservedWord = 109,
-        LastFutureReservedWord = 117,
-        FirstTypeNode = 163,
-        LastTypeNode = 183,
+        /** Only the JSDoc scanner produces BacktickToken. The normal scanner produces NoSubstitutionTemplateLiteral and related kinds. */
+        BacktickToken = 59,
+        EqualsToken = 60,
+        PlusEqualsToken = 61,
+        MinusEqualsToken = 62,
+        AsteriskEqualsToken = 63,
+        AsteriskAsteriskEqualsToken = 64,
+        SlashEqualsToken = 65,
+        PercentEqualsToken = 66,
+        LessThanLessThanEqualsToken = 67,
+        GreaterThanGreaterThanEqualsToken = 68,
+        GreaterThanGreaterThanGreaterThanEqualsToken = 69,
+        AmpersandEqualsToken = 70,
+        BarEqualsToken = 71,
+        CaretEqualsToken = 72,
+        Identifier = 73,
+        BreakKeyword = 74,
+        CaseKeyword = 75,
+        CatchKeyword = 76,
+        ClassKeyword = 77,
+        ConstKeyword = 78,
+        ContinueKeyword = 79,
+        DebuggerKeyword = 80,
+        DefaultKeyword = 81,
+        DeleteKeyword = 82,
+        DoKeyword = 83,
+        ElseKeyword = 84,
+        EnumKeyword = 85,
+        ExportKeyword = 86,
+        ExtendsKeyword = 87,
+        FalseKeyword = 88,
+        FinallyKeyword = 89,
+        ForKeyword = 90,
+        FunctionKeyword = 91,
+        IfKeyword = 92,
+        ImportKeyword = 93,
+        InKeyword = 94,
+        InstanceOfKeyword = 95,
+        NewKeyword = 96,
+        NullKeyword = 97,
+        ReturnKeyword = 98,
+        SuperKeyword = 99,
+        SwitchKeyword = 100,
+        ThisKeyword = 101,
+        ThrowKeyword = 102,
+        TrueKeyword = 103,
+        TryKeyword = 104,
+        TypeOfKeyword = 105,
+        VarKeyword = 106,
+        VoidKeyword = 107,
+        WhileKeyword = 108,
+        WithKeyword = 109,
+        ImplementsKeyword = 110,
+        InterfaceKeyword = 111,
+        LetKeyword = 112,
+        PackageKeyword = 113,
+        PrivateKeyword = 114,
+        ProtectedKeyword = 115,
+        PublicKeyword = 116,
+        StaticKeyword = 117,
+        YieldKeyword = 118,
+        AbstractKeyword = 119,
+        AsKeyword = 120,
+        AnyKeyword = 121,
+        AsyncKeyword = 122,
+        AwaitKeyword = 123,
+        BooleanKeyword = 124,
+        ConstructorKeyword = 125,
+        DeclareKeyword = 126,
+        GetKeyword = 127,
+        InferKeyword = 128,
+        IsKeyword = 129,
+        KeyOfKeyword = 130,
+        ModuleKeyword = 131,
+        NamespaceKeyword = 132,
+        NeverKeyword = 133,
+        ReadonlyKeyword = 134,
+        RequireKeyword = 135,
+        NumberKeyword = 136,
+        ObjectKeyword = 137,
+        SetKeyword = 138,
+        StringKeyword = 139,
+        SymbolKeyword = 140,
+        TypeKeyword = 141,
+        UndefinedKeyword = 142,
+        UniqueKeyword = 143,
+        UnknownKeyword = 144,
+        FromKeyword = 145,
+        GlobalKeyword = 146,
+        BigIntKeyword = 147,
+        OfKeyword = 148,
+        QualifiedName = 149,
+        ComputedPropertyName = 150,
+        TypeParameter = 151,
+        Parameter = 152,
+        Decorator = 153,
+        PropertySignature = 154,
+        PropertyDeclaration = 155,
+        MethodSignature = 156,
+        MethodDeclaration = 157,
+        Constructor = 158,
+        GetAccessor = 159,
+        SetAccessor = 160,
+        CallSignature = 161,
+        ConstructSignature = 162,
+        IndexSignature = 163,
+        TypePredicate = 164,
+        TypeReference = 165,
+        FunctionType = 166,
+        ConstructorType = 167,
+        TypeQuery = 168,
+        TypeLiteral = 169,
+        ArrayType = 170,
+        TupleType = 171,
+        OptionalType = 172,
+        RestType = 173,
+        UnionType = 174,
+        IntersectionType = 175,
+        ConditionalType = 176,
+        InferType = 177,
+        ParenthesizedType = 178,
+        ThisType = 179,
+        TypeOperator = 180,
+        IndexedAccessType = 181,
+        MappedType = 182,
+        LiteralType = 183,
+        ImportType = 184,
+        ObjectBindingPattern = 185,
+        ArrayBindingPattern = 186,
+        BindingElement = 187,
+        ArrayLiteralExpression = 188,
+        ObjectLiteralExpression = 189,
+        PropertyAccessExpression = 190,
+        ElementAccessExpression = 191,
+        CallExpression = 192,
+        NewExpression = 193,
+        TaggedTemplateExpression = 194,
+        TypeAssertionExpression = 195,
+        ParenthesizedExpression = 196,
+        FunctionExpression = 197,
+        ArrowFunction = 198,
+        DeleteExpression = 199,
+        TypeOfExpression = 200,
+        VoidExpression = 201,
+        AwaitExpression = 202,
+        PrefixUnaryExpression = 203,
+        PostfixUnaryExpression = 204,
+        BinaryExpression = 205,
+        ConditionalExpression = 206,
+        TemplateExpression = 207,
+        YieldExpression = 208,
+        SpreadElement = 209,
+        ClassExpression = 210,
+        OmittedExpression = 211,
+        ExpressionWithTypeArguments = 212,
+        AsExpression = 213,
+        NonNullExpression = 214,
+        MetaProperty = 215,
+        SyntheticExpression = 216,
+        TemplateSpan = 217,
+        SemicolonClassElement = 218,
+        Block = 219,
+        VariableStatement = 220,
+        EmptyStatement = 221,
+        ExpressionStatement = 222,
+        IfStatement = 223,
+        DoStatement = 224,
+        WhileStatement = 225,
+        ForStatement = 226,
+        ForInStatement = 227,
+        ForOfStatement = 228,
+        ContinueStatement = 229,
+        BreakStatement = 230,
+        ReturnStatement = 231,
+        WithStatement = 232,
+        SwitchStatement = 233,
+        LabeledStatement = 234,
+        ThrowStatement = 235,
+        TryStatement = 236,
+        DebuggerStatement = 237,
+        VariableDeclaration = 238,
+        VariableDeclarationList = 239,
+        FunctionDeclaration = 240,
+        ClassDeclaration = 241,
+        InterfaceDeclaration = 242,
+        TypeAliasDeclaration = 243,
+        EnumDeclaration = 244,
+        ModuleDeclaration = 245,
+        ModuleBlock = 246,
+        CaseBlock = 247,
+        NamespaceExportDeclaration = 248,
+        ImportEqualsDeclaration = 249,
+        ImportDeclaration = 250,
+        ImportClause = 251,
+        NamespaceImport = 252,
+        NamedImports = 253,
+        ImportSpecifier = 254,
+        ExportAssignment = 255,
+        ExportDeclaration = 256,
+        NamedExports = 257,
+        ExportSpecifier = 258,
+        MissingDeclaration = 259,
+        ExternalModuleReference = 260,
+        JsxElement = 261,
+        JsxSelfClosingElement = 262,
+        JsxOpeningElement = 263,
+        JsxClosingElement = 264,
+        JsxFragment = 265,
+        JsxOpeningFragment = 266,
+        JsxClosingFragment = 267,
+        JsxAttribute = 268,
+        JsxAttributes = 269,
+        JsxSpreadAttribute = 270,
+        JsxExpression = 271,
+        CaseClause = 272,
+        DefaultClause = 273,
+        HeritageClause = 274,
+        CatchClause = 275,
+        PropertyAssignment = 276,
+        ShorthandPropertyAssignment = 277,
+        SpreadAssignment = 278,
+        EnumMember = 279,
+        UnparsedPrologue = 280,
+        UnparsedPrepend = 281,
+        UnparsedText = 282,
+        UnparsedInternalText = 283,
+        UnparsedSyntheticReference = 284,
+        SourceFile = 285,
+        Bundle = 286,
+        UnparsedSource = 287,
+        InputFiles = 288,
+        JSDocTypeExpression = 289,
+        JSDocAllType = 290,
+        JSDocUnknownType = 291,
+        JSDocNullableType = 292,
+        JSDocNonNullableType = 293,
+        JSDocOptionalType = 294,
+        JSDocFunctionType = 295,
+        JSDocVariadicType = 296,
+        JSDocComment = 297,
+        JSDocTypeLiteral = 298,
+        JSDocSignature = 299,
+        JSDocTag = 300,
+        JSDocAugmentsTag = 301,
+        JSDocAuthorTag = 302,
+        JSDocClassTag = 303,
+        JSDocCallbackTag = 304,
+        JSDocEnumTag = 305,
+        JSDocParameterTag = 306,
+        JSDocReturnTag = 307,
+        JSDocThisTag = 308,
+        JSDocTypeTag = 309,
+        JSDocTemplateTag = 310,
+        JSDocTypedefTag = 311,
+        JSDocPropertyTag = 312,
+        SyntaxList = 313,
+        NotEmittedStatement = 314,
+        PartiallyEmittedExpression = 315,
+        CommaListExpression = 316,
+        MergeDeclarationMarker = 317,
+        EndOfDeclarationMarker = 318,
+        Count = 319,
+        FirstAssignment = 60,
+        LastAssignment = 72,
+        FirstCompoundAssignment = 61,
+        LastCompoundAssignment = 72,
+        FirstReservedWord = 74,
+        LastReservedWord = 109,
+        FirstKeyword = 74,
+        LastKeyword = 148,
+        FirstFutureReservedWord = 110,
+        LastFutureReservedWord = 118,
+        FirstTypeNode = 164,
+        LastTypeNode = 184,
         FirstPunctuation = 18,
-        LastPunctuation = 71,
+        LastPunctuation = 72,
         FirstToken = 0,
-        LastToken = 147,
+        LastToken = 148,
         FirstTriviaToken = 2,
         LastTriviaToken = 7,
         FirstLiteralToken = 8,
@@ -417,12 +420,12 @@ declare namespace ts {
         FirstTemplateToken = 14,
         LastTemplateToken = 17,
         FirstBinaryOperator = 28,
-        LastBinaryOperator = 71,
-        FirstNode = 148,
-        FirstJSDocNode = 288,
-        LastJSDocNode = 310,
-        FirstJSDocTagNode = 299,
-        LastJSDocTagNode = 310,
+        LastBinaryOperator = 72,
+        FirstNode = 149,
+        FirstJSDocNode = 289,
+        LastJSDocNode = 312,
+        FirstJSDocTagNode = 300,
+        LastJSDocTagNode = 312,
     }
     enum NodeFlags {
         None = 0,
@@ -1152,6 +1155,7 @@ declare namespace ts {
         expression: JsxTagNameExpression;
     }
     interface JsxAttributes extends ObjectLiteralExpressionBase<JsxAttributeLike> {
+        kind: SyntaxKind.JsxAttributes;
         parent: JsxOpeningLikeElement;
     }
     interface JsxOpeningElement extends Expression {
@@ -1203,9 +1207,9 @@ declare namespace ts {
         dotDotDotToken?: Token<SyntaxKind.DotDotDotToken>;
         expression?: Expression;
     }
-    interface JsxText extends Node {
+    interface JsxText extends LiteralLikeNode {
         kind: SyntaxKind.JsxText;
-        containsOnlyWhiteSpaces: boolean;
+        containsOnlyTriviaWhiteSpaces: boolean;
         parent: JsxElement;
     }
     type JsxChild = JsxText | JsxExpression | JsxElement | JsxSelfClosingElement | JsxFragment;
@@ -1579,6 +1583,9 @@ declare namespace ts {
             expression: Identifier | PropertyAccessEntityNameExpression;
         };
     }
+    interface JSDocAuthorTag extends JSDocTag {
+        kind: SyntaxKind.JSDocAuthorTag;
+    }
     interface JSDocClassTag extends JSDocTag {
         kind: SyntaxKind.JSDocClassTag;
     }
@@ -1601,7 +1608,7 @@ declare namespace ts {
     }
     interface JSDocTypeTag extends JSDocTag {
         kind: SyntaxKind.JSDocTypeTag;
-        typeExpression?: JSDocTypeExpression;
+        typeExpression: JSDocTypeExpression;
     }
     interface JSDocTypedefTag extends JSDocTag, NamedDeclaration {
         parent: JSDoc;
@@ -1877,13 +1884,18 @@ declare namespace ts {
         sourceFile: SourceFile;
         references?: ReadonlyArray<ResolvedProjectReference | undefined>;
     }
+    type CustomTransformerFactory = (context: TransformationContext) => CustomTransformer;
+    interface CustomTransformer {
+        transformSourceFile(node: SourceFile): SourceFile;
+        transformBundle(node: Bundle): Bundle;
+    }
     interface CustomTransformers {
         /** Custom transformers to evaluate before built-in .js transformations. */
-        before?: TransformerFactory<SourceFile>[];
+        before?: (TransformerFactory<SourceFile> | CustomTransformerFactory)[];
         /** Custom transformers to evaluate after built-in .js transformations. */
-        after?: TransformerFactory<SourceFile>[];
+        after?: (TransformerFactory<SourceFile> | CustomTransformerFactory)[];
         /** Custom transformers to evaluate after built-in .d.ts transformations. */
-        afterDeclarations?: TransformerFactory<Bundle | SourceFile>[];
+        afterDeclarations?: (TransformerFactory<Bundle | SourceFile> | CustomTransformerFactory)[];
     }
     interface SourceMapSpan {
         /** Line number in the .js file. */
@@ -1903,7 +1915,8 @@ declare namespace ts {
     enum ExitStatus {
         Success = 0,
         DiagnosticsPresent_OutputsSkipped = 1,
-        DiagnosticsPresent_OutputsGenerated = 2
+        DiagnosticsPresent_OutputsGenerated = 2,
+        InvalidProject_OutputsSkipped = 3
     }
     interface EmitResult {
         emitSkipped: boolean;
@@ -1962,6 +1975,7 @@ declare namespace ts {
          */
         getExportSymbolOfSymbol(symbol: Symbol): Symbol;
         getPropertySymbolOfDestructuringAssignment(location: Identifier): Symbol | undefined;
+        getTypeOfAssignmentPattern(pattern: AssignmentPattern): Type;
         getTypeAtLocation(node: Node): Type;
         getTypeFromTypeNode(node: TypeNode): Type;
         signatureToString(signature: Signature, enclosingDeclaration?: Node, flags?: TypeFormatFlags, kind?: SignatureKind): string;
@@ -2294,6 +2308,7 @@ declare namespace ts {
         MarkerType = 8192,
         JSLiteral = 16384,
         FreshLiteral = 32768,
+        ArrayLiteral = 65536,
         ClassOrInterface = 3,
     }
     interface ObjectType extends Type {
@@ -2359,7 +2374,8 @@ declare namespace ts {
         objectType: Type;
         indexType: Type;
         constraint?: Type;
-        simplified?: Type;
+        simplifiedForReading?: Type;
+        simplifiedForWriting?: Type;
     }
     type TypeVariable = TypeParameter | IndexedAccessType;
     interface IndexType extends InstantiableType {
@@ -2382,8 +2398,8 @@ declare namespace ts {
         root: ConditionalRoot;
         checkType: Type;
         extendsType: Type;
-        resolvedTrueType?: Type;
-        resolvedFalseType?: Type;
+        resolvedTrueType: Type;
+        resolvedFalseType: Type;
     }
     interface SubstitutionType extends InstantiableType {
         typeVariable: TypeVariable;
@@ -2410,12 +2426,13 @@ declare namespace ts {
     enum InferencePriority {
         NakedTypeVariable = 1,
         HomomorphicMappedType = 2,
-        MappedTypeConstraint = 4,
-        ReturnType = 8,
-        LiteralKeyof = 16,
-        NoConstraints = 32,
-        AlwaysStrict = 64,
-        PriorityImpliesCombination = 28
+        PartialHomomorphicMappedType = 4,
+        MappedTypeConstraint = 8,
+        ReturnType = 16,
+        LiteralKeyof = 32,
+        NoConstraints = 64,
+        AlwaysStrict = 128,
+        PriorityImpliesCombination = 56
     }
     /** @deprecated Use FileExtensionInfo instead. */
     type JsFileExtensionInfo = FileExtensionInfo;
@@ -2441,7 +2458,7 @@ declare namespace ts {
         messageText: string;
         category: DiagnosticCategory;
         code: number;
-        next?: DiagnosticMessageChain;
+        next?: DiagnosticMessageChain[];
     }
     interface Diagnostic extends DiagnosticRelatedInformation {
         /** May store more in future. For now, this will simply be `true` to indicate when a diagnostic is an unused-identifier diagnostic. */
@@ -2489,6 +2506,7 @@ declare namespace ts {
     interface CompilerOptions {
         allowJs?: boolean;
         allowSyntheticDefaultImports?: boolean;
+        allowUmdGlobalAccess?: boolean;
         allowUnreachableCode?: boolean;
         allowUnusedLabels?: boolean;
         alwaysStrict?: boolean;
@@ -2582,7 +2600,7 @@ declare namespace ts {
         UMD = 3,
         System = 4,
         ES2015 = 5,
-        ESNext = 6
+        ESNext = 99
     }
     enum JsxEmit {
         None = 0,
@@ -2621,9 +2639,10 @@ declare namespace ts {
         ES2017 = 4,
         ES2018 = 5,
         ES2019 = 6,
-        ESNext = 7,
+        ES2020 = 7,
+        ESNext = 99,
         JSON = 100,
-        Latest = 7
+        Latest = 99
     }
     enum LanguageVariant {
         Standard = 0,
@@ -2756,6 +2775,7 @@ declare namespace ts {
         resolveTypeReferenceDirectives?(typeReferenceDirectiveNames: string[], containingFile: string, redirectedReference?: ResolvedProjectReference): (ResolvedTypeReferenceDirective | undefined)[];
         getEnvironmentVariable?(name: string): string | undefined;
         createHash?(data: string): string;
+        getParsedCommandLine?(fileName: string): ParsedCommandLine | undefined;
     }
     interface SourceMapRange extends TextRange {
         source?: SourceMapSource;
@@ -3159,7 +3179,7 @@ declare namespace ts {
         reScanJsxToken(): JsxTokenSyntaxKind;
         reScanLessThanToken(): SyntaxKind;
         scanJsxToken(): JsxTokenSyntaxKind;
-        scanJSDocToken(): JsDocSyntaxKind;
+        scanJsDocToken(): JSDocSyntaxKind;
         scan(): SyntaxKind;
         getText(): string;
         setText(text: string | undefined, start?: number, length?: number): void;
@@ -3517,6 +3537,7 @@ declare namespace ts {
     function isJSDocFunctionType(node: Node): node is JSDocFunctionType;
     function isJSDocVariadicType(node: Node): node is JSDocVariadicType;
     function isJSDoc(node: Node): node is JSDoc;
+    function isJSDocAuthorTag(node: Node): node is JSDocAuthorTag;
     function isJSDocAugmentsTag(node: Node): node is JSDocAugmentsTag;
     function isJSDocClassTag(node: Node): node is JSDocClassTag;
     function isJSDocEnumTag(node: Node): node is JSDocEnumTag;
@@ -3627,7 +3648,7 @@ declare namespace ts {
     /**
      * Reads the config file, reports errors if any and exits if the config file cannot be found
      */
-    function getParsedCommandLineOfConfigFile(configFileName: string, optionsToExtend: CompilerOptions, host: ParseConfigFileHost): ParsedCommandLine | undefined;
+    function getParsedCommandLineOfConfigFile(configFileName: string, optionsToExtend: CompilerOptions, host: ParseConfigFileHost, extendedConfigCache?: Map<ExtendedConfigCacheEntry>): ParsedCommandLine | undefined;
     /**
      * Read tsconfig.json file
      * @param fileName The path to the config file
@@ -3661,7 +3682,7 @@ declare namespace ts {
      * @param basePath A root directory to resolve relative path entries in the config
      *    file to. e.g. outDir
      */
-    function parseJsonConfigFileContent(json: any, host: ParseConfigHost, basePath: string, existingOptions?: CompilerOptions, configFileName?: string, resolutionStack?: Path[], extraFileExtensions?: ReadonlyArray<FileExtensionInfo>): ParsedCommandLine;
+    function parseJsonConfigFileContent(json: any, host: ParseConfigHost, basePath: string, existingOptions?: CompilerOptions, configFileName?: string, resolutionStack?: Path[], extraFileExtensions?: ReadonlyArray<FileExtensionInfo>, extendedConfigCache?: Map<ExtendedConfigCacheEntry>): ParsedCommandLine;
     /**
      * Parse the contents of a config file (tsconfig.json).
      * @param jsonNode The contents of the config file to parse
@@ -3669,7 +3690,20 @@ declare namespace ts {
      * @param basePath A root directory to resolve relative path entries in the config
      *    file to. e.g. outDir
      */
-    function parseJsonSourceFileConfigFileContent(sourceFile: TsConfigSourceFile, host: ParseConfigHost, basePath: string, existingOptions?: CompilerOptions, configFileName?: string, resolutionStack?: Path[], extraFileExtensions?: ReadonlyArray<FileExtensionInfo>): ParsedCommandLine;
+    function parseJsonSourceFileConfigFileContent(sourceFile: TsConfigSourceFile, host: ParseConfigHost, basePath: string, existingOptions?: CompilerOptions, configFileName?: string, resolutionStack?: Path[], extraFileExtensions?: ReadonlyArray<FileExtensionInfo>, extendedConfigCache?: Map<ExtendedConfigCacheEntry>): ParsedCommandLine;
+    interface ParsedTsconfig {
+        raw: any;
+        options?: CompilerOptions;
+        typeAcquisition?: TypeAcquisition;
+        /**
+         * Note that the case of the config path has not yet been normalized, as no files have been imported into the project yet
+         */
+        extendedConfigPath?: string;
+    }
+    interface ExtendedConfigCacheEntry {
+        extendedResult: TsConfigSourceFile;
+        extendedConfig: ParsedTsconfig | undefined;
+    }
     function convertCompilerOptionsFromJson(jsonOptions: any, basePath: string, configFileName?: string): {
         options: CompilerOptions;
         errors: Diagnostic[];
@@ -3714,7 +3748,7 @@ declare namespace ts {
         get(directory: string): ResolvedModuleWithFailedLookupLocations | undefined;
         set(directory: string, result: ResolvedModuleWithFailedLookupLocations): void;
     }
-    function createModuleResolutionCache(currentDirectory: string, getCanonicalFileName: (s: string) => string): ModuleResolutionCache;
+    function createModuleResolutionCache(currentDirectory: string, getCanonicalFileName: (s: string) => string, options?: CompilerOptions): ModuleResolutionCache;
     function resolveModuleNameFromCache(moduleName: string, containingFile: string, cache: ModuleResolutionCache): ResolvedModuleWithFailedLookupLocations | undefined;
     function resolveModuleName(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost, cache?: ModuleResolutionCache, redirectedReference?: ResolvedProjectReference): ResolvedModuleWithFailedLookupLocations;
     function nodeModuleNameResolver(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost, cache?: ModuleResolutionCache, redirectedReference?: ResolvedProjectReference): ResolvedModuleWithFailedLookupLocations;
@@ -3837,7 +3871,7 @@ declare namespace ts {
     function updateArrayLiteral(node: ArrayLiteralExpression, elements: ReadonlyArray<Expression>): ArrayLiteralExpression;
     function createObjectLiteral(properties?: ReadonlyArray<ObjectLiteralElementLike>, multiLine?: boolean): ObjectLiteralExpression;
     function updateObjectLiteral(node: ObjectLiteralExpression, properties: ReadonlyArray<ObjectLiteralElementLike>): ObjectLiteralExpression;
-    function createPropertyAccess(expression: Expression, name: string | Identifier | undefined): PropertyAccessExpression;
+    function createPropertyAccess(expression: Expression, name: string | Identifier): PropertyAccessExpression;
     function updatePropertyAccess(node: PropertyAccessExpression, expression: Expression, name: Identifier): PropertyAccessExpression;
     function createElementAccess(expression: Expression, index: number | Expression): ElementAccessExpression;
     function updateElementAccess(node: ElementAccessExpression, expression: Expression, argumentExpression: Expression): ElementAccessExpression;
@@ -3992,6 +4026,10 @@ declare namespace ts {
     function createJsxClosingElement(tagName: JsxTagNameExpression): JsxClosingElement;
     function updateJsxClosingElement(node: JsxClosingElement, tagName: JsxTagNameExpression): JsxClosingElement;
     function createJsxFragment(openingFragment: JsxOpeningFragment, children: ReadonlyArray<JsxChild>, closingFragment: JsxClosingFragment): JsxFragment;
+    function createJsxText(text: string, containsOnlyTriviaWhiteSpaces?: boolean): JsxText;
+    function updateJsxText(node: JsxText, text: string, containsOnlyTriviaWhiteSpaces?: boolean): JsxText;
+    function createJsxOpeningFragment(): JsxOpeningFragment;
+    function createJsxJsxClosingFragment(): JsxClosingFragment;
     function updateJsxFragment(node: JsxFragment, openingFragment: JsxOpeningFragment, children: ReadonlyArray<JsxChild>, closingFragment: JsxClosingFragment): JsxFragment;
     function createJsxAttribute(name: Identifier, initializer: StringLiteral | JsxExpression): JsxAttribute;
     function updateJsxAttribute(node: JsxAttribute, name: Identifier, initializer: StringLiteral | JsxExpression): JsxAttribute;
@@ -4048,7 +4086,7 @@ declare namespace ts {
     function createInputFiles(javascriptText: string, declarationText: string): InputFiles;
     function createInputFiles(readFileText: (path: string) => string | undefined, javascriptPath: string, javascriptMapPath: string | undefined, declarationPath: string, declarationMapPath: string | undefined, buildInfoPath: string | undefined): InputFiles;
     function createInputFiles(javascriptText: string, declarationText: string, javascriptMapPath: string | undefined, javascriptMapText: string | undefined, declarationMapPath: string | undefined, declarationMapText: string | undefined): InputFiles;
-    function updateBundle(node: Bundle, sourceFiles: ReadonlyArray<SourceFile>, prepends?: ReadonlyArray<UnparsedSource>): Bundle;
+    function updateBundle(node: Bundle, sourceFiles: ReadonlyArray<SourceFile>, prepends?: ReadonlyArray<UnparsedSource | InputFiles>): Bundle;
     function createImmediatelyInvokedFunctionExpression(statements: ReadonlyArray<Statement>): CallExpression;
     function createImmediatelyInvokedFunctionExpression(statements: ReadonlyArray<Statement>, param: ParameterDeclaration, paramValue: Expression): CallExpression;
     function createImmediatelyInvokedArrowFunction(statements: ReadonlyArray<Statement>): CallExpression;
@@ -4240,7 +4278,7 @@ declare namespace ts {
     function formatDiagnostics(diagnostics: ReadonlyArray<Diagnostic>, host: FormatDiagnosticsHost): string;
     function formatDiagnostic(diagnostic: Diagnostic, host: FormatDiagnosticsHost): string;
     function formatDiagnosticsWithColorAndContext(diagnostics: ReadonlyArray<Diagnostic>, host: FormatDiagnosticsHost): string;
-    function flattenDiagnosticMessageText(messageText: string | DiagnosticMessageChain | undefined, newLine: string): string;
+    function flattenDiagnosticMessageText(diag: string | DiagnosticMessageChain | undefined, newLine: string, indent?: number): string;
     function getConfigFileParsingDiagnostics(configFileParseResult: ParsedCommandLine): ReadonlyArray<Diagnostic>;
     /**
      * Create a new 'Program' instance. A Program is an immutable collection of 'SourceFile's and a 'CompilerOptions'
@@ -4393,7 +4431,7 @@ declare namespace ts {
      * The builder that can handle the changes in program and iterate through changed file to emit the files
      * The semantic diagnostics are cached per file and managed by clearing for the changed/affected files
      */
-    interface EmitAndSemanticDiagnosticsBuilderProgram extends BuilderProgram {
+    interface EmitAndSemanticDiagnosticsBuilderProgram extends SemanticDiagnosticsBuilderProgram {
         /**
          * Emits the next affected file's emit result (EmitResult and sourceFiles emitted) or returns undefined if iteration is complete
          * The first of writeFile if provided, writeFile of BuilderProgramHost if provided, writeFile of compiler host
@@ -4419,6 +4457,22 @@ declare namespace ts {
     function createAbstractBuilder(rootNames: ReadonlyArray<string> | undefined, options: CompilerOptions | undefined, host?: CompilerHost, oldProgram?: BuilderProgram, configFileParsingDiagnostics?: ReadonlyArray<Diagnostic>, projectReferences?: ReadonlyArray<ProjectReference>): BuilderProgram;
 }
 declare namespace ts {
+    interface ReadBuildProgramHost {
+        useCaseSensitiveFileNames(): boolean;
+        getCurrentDirectory(): string;
+        readFile(fileName: string): string | undefined;
+    }
+    function readBuilderProgram(compilerOptions: CompilerOptions, host: ReadBuildProgramHost): EmitAndSemanticDiagnosticsBuilderProgram | undefined;
+    function createIncrementalCompilerHost(options: CompilerOptions, system?: System): CompilerHost;
+    interface IncrementalProgramOptions<T extends BuilderProgram> {
+        rootNames: ReadonlyArray<string>;
+        options: CompilerOptions;
+        configFileParsingDiagnostics?: ReadonlyArray<Diagnostic>;
+        projectReferences?: ReadonlyArray<ProjectReference>;
+        host?: CompilerHost;
+        createProgram?: CreateProgram<T>;
+    }
+    function createIncrementalProgram<T extends BuilderProgram = EmitAndSemanticDiagnosticsBuilderProgram>({ rootNames, options, configFileParsingDiagnostics, projectReferences, host, createProgram }: IncrementalProgramOptions<T>): T;
     type WatchStatusReporter = (diagnostic: Diagnostic, newLine: string, options: CompilerOptions) => void;
     /** Create the program with rootNames and options, if they are undefined, oldProgram and new configFile diagnostics create new program */
     type CreateProgram<T extends BuilderProgram> = (rootNames: ReadonlyArray<string> | undefined, options: CompilerOptions | undefined, host?: CompilerHost, oldProgram?: T, configFileParsingDiagnostics?: ReadonlyArray<Diagnostic>, projectReferences?: ReadonlyArray<ProjectReference> | undefined) => T;
@@ -4505,6 +4559,8 @@ declare namespace ts {
     interface Watch<T> {
         /** Synchronize with host and get updated program */
         getProgram(): T;
+        /** Closes the watch */
+        close(): void;
     }
     /**
      * Creates the watch what generates program using the config file
@@ -4532,17 +4588,101 @@ declare namespace ts {
      */
     function createWatchProgram<T extends BuilderProgram>(host: WatchCompilerHostOfConfigFile<T>): WatchOfConfigFile<T>;
 }
+declare namespace ts {
+    interface BuildOptions {
+        dry?: boolean;
+        force?: boolean;
+        verbose?: boolean;
+        incremental?: boolean;
+        traceResolution?: boolean;
+        [option: string]: CompilerOptionsValue | undefined;
+    }
+    type ReportEmitErrorSummary = (errorCount: number) => void;
+    interface SolutionBuilderHostBase<T extends BuilderProgram> extends ProgramHost<T> {
+        createDirectory?(path: string): void;
+        /**
+         * Should provide create directory and writeFile if done of invalidatedProjects is not invoked with
+         * writeFileCallback
+         */
+        writeFile?(path: string, data: string, writeByteOrderMark?: boolean): void;
+        getModifiedTime(fileName: string): Date | undefined;
+        setModifiedTime(fileName: string, date: Date): void;
+        deleteFile(fileName: string): void;
+        getParsedCommandLine?(fileName: string): ParsedCommandLine | undefined;
+        reportDiagnostic: DiagnosticReporter;
+        reportSolutionBuilderStatus: DiagnosticReporter;
+        afterProgramEmitAndDiagnostics?(program: T): void;
+    }
+    interface SolutionBuilderHost<T extends BuilderProgram> extends SolutionBuilderHostBase<T> {
+        reportErrorSummary?: ReportEmitErrorSummary;
+    }
+    interface SolutionBuilderWithWatchHost<T extends BuilderProgram> extends SolutionBuilderHostBase<T>, WatchHost {
+    }
+    interface SolutionBuilder<T extends BuilderProgram> {
+        build(project?: string, cancellationToken?: CancellationToken): ExitStatus;
+        clean(project?: string): ExitStatus;
+        buildReferences(project: string, cancellationToken?: CancellationToken): ExitStatus;
+        cleanReferences(project?: string): ExitStatus;
+        getNextInvalidatedProject(cancellationToken?: CancellationToken): InvalidatedProject<T> | undefined;
+    }
+    /**
+     * Create a function that reports watch status by writing to the system and handles the formating of the diagnostic
+     */
+    function createBuilderStatusReporter(system: System, pretty?: boolean): DiagnosticReporter;
+    function createSolutionBuilderHost<T extends BuilderProgram = EmitAndSemanticDiagnosticsBuilderProgram>(system?: System, createProgram?: CreateProgram<T>, reportDiagnostic?: DiagnosticReporter, reportSolutionBuilderStatus?: DiagnosticReporter, reportErrorSummary?: ReportEmitErrorSummary): SolutionBuilderHost<T>;
+    function createSolutionBuilderWithWatchHost<T extends BuilderProgram = EmitAndSemanticDiagnosticsBuilderProgram>(system?: System, createProgram?: CreateProgram<T>, reportDiagnostic?: DiagnosticReporter, reportSolutionBuilderStatus?: DiagnosticReporter, reportWatchStatus?: WatchStatusReporter): SolutionBuilderWithWatchHost<T>;
+    function createSolutionBuilder<T extends BuilderProgram>(host: SolutionBuilderHost<T>, rootNames: ReadonlyArray<string>, defaultOptions: BuildOptions): SolutionBuilder<T>;
+    function createSolutionBuilderWithWatch<T extends BuilderProgram>(host: SolutionBuilderWithWatchHost<T>, rootNames: ReadonlyArray<string>, defaultOptions: BuildOptions): SolutionBuilder<T>;
+    enum InvalidatedProjectKind {
+        Build = 0,
+        UpdateBundle = 1,
+        UpdateOutputFileStamps = 2
+    }
+    interface InvalidatedProjectBase {
+        readonly kind: InvalidatedProjectKind;
+        readonly project: ResolvedConfigFileName;
+        /**
+         *  To dispose this project and ensure that all the necessary actions are taken and state is updated accordingly
+         */
+        done(cancellationToken?: CancellationToken, writeFile?: WriteFileCallback, customTransformers?: CustomTransformers): ExitStatus;
+        getCompilerOptions(): CompilerOptions;
+        getCurrentDirectory(): string;
+    }
+    interface UpdateOutputFileStampsProject extends InvalidatedProjectBase {
+        readonly kind: InvalidatedProjectKind.UpdateOutputFileStamps;
+        updateOutputFileStatmps(): void;
+    }
+    interface BuildInvalidedProject<T extends BuilderProgram> extends InvalidatedProjectBase {
+        readonly kind: InvalidatedProjectKind.Build;
+        getBuilderProgram(): T | undefined;
+        getProgram(): Program | undefined;
+        getSourceFile(fileName: string): SourceFile | undefined;
+        getSourceFiles(): ReadonlyArray<SourceFile>;
+        getOptionsDiagnostics(cancellationToken?: CancellationToken): ReadonlyArray<Diagnostic>;
+        getGlobalDiagnostics(cancellationToken?: CancellationToken): ReadonlyArray<Diagnostic>;
+        getConfigFileParsingDiagnostics(): ReadonlyArray<Diagnostic>;
+        getSyntacticDiagnostics(sourceFile?: SourceFile, cancellationToken?: CancellationToken): ReadonlyArray<Diagnostic>;
+        getAllDependencies(sourceFile: SourceFile): ReadonlyArray<string>;
+        getSemanticDiagnostics(sourceFile?: SourceFile, cancellationToken?: CancellationToken): ReadonlyArray<Diagnostic>;
+        getSemanticDiagnosticsOfNextAffectedFile(cancellationToken?: CancellationToken, ignoreSourceFile?: (sourceFile: SourceFile) => boolean): AffectedFileResult<ReadonlyArray<Diagnostic>>;
+        emit(targetSourceFile?: SourceFile, writeFile?: WriteFileCallback, cancellationToken?: CancellationToken, emitOnlyDtsFiles?: boolean, customTransformers?: CustomTransformers): EmitResult | undefined;
+    }
+    interface UpdateBundleProject<T extends BuilderProgram> extends InvalidatedProjectBase {
+        readonly kind: InvalidatedProjectKind.UpdateBundle;
+        emit(writeFile?: WriteFileCallback, customTransformers?: CustomTransformers): EmitResult | BuildInvalidedProject<T> | undefined;
+    }
+    type InvalidatedProject<T extends BuilderProgram> = UpdateOutputFileStampsProject | BuildInvalidedProject<T> | UpdateBundleProject<T>;
+}
 declare namespace ts.server {
     type ActionSet = "action::set";
     type ActionInvalidate = "action::invalidate";
     type ActionPackageInstalled = "action::packageInstalled";
-    type ActionValueInspected = "action::valueInspected";
     type EventTypesRegistry = "event::typesRegistry";
     type EventBeginInstallTypes = "event::beginInstallTypes";
     type EventEndInstallTypes = "event::endInstallTypes";
     type EventInitializationFailed = "event::initializationFailed";
     interface TypingInstallerResponse {
-        readonly kind: ActionSet | ActionInvalidate | EventTypesRegistry | ActionPackageInstalled | ActionValueInspected | EventBeginInstallTypes | EventEndInstallTypes | EventInitializationFailed;
+        readonly kind: ActionSet | ActionInvalidate | EventTypesRegistry | ActionPackageInstalled | EventBeginInstallTypes | EventEndInstallTypes | EventInitializationFailed;
     }
     interface TypingInstallerRequestWithProjectName {
         readonly projectName: string;
@@ -4781,6 +4921,7 @@ declare namespace ts {
         getSignatureHelpItems(fileName: string, position: number, options: SignatureHelpItemsOptions | undefined): SignatureHelpItems | undefined;
         getRenameInfo(fileName: string, position: number, options?: RenameInfoOptions): RenameInfo;
         findRenameLocations(fileName: string, position: number, findInStrings: boolean, findInComments: boolean, providePrefixAndSuffixTextForRename?: boolean): ReadonlyArray<RenameLocation> | undefined;
+        getSmartSelectionRange(fileName: string, position: number): SelectionRange;
         getDefinitionAtPosition(fileName: string, position: number): ReadonlyArray<DefinitionInfo> | undefined;
         getDefinitionAndBoundSpan(fileName: string, position: number): DefinitionInfoAndBoundSpan | undefined;
         getTypeDefinitionAtPosition(fileName: string, position: number): ReadonlyArray<DefinitionInfo> | undefined;
@@ -4975,16 +5116,9 @@ declare namespace ts {
         changes: ReadonlyArray<FileTextChanges>;
         commands?: ReadonlyArray<CodeActionCommand>;
     }
-    type CodeActionCommand = InstallPackageAction | GenerateTypesAction;
+    type CodeActionCommand = InstallPackageAction;
     interface InstallPackageAction {
     }
-    interface GenerateTypesAction extends GenerateTypesOptions {
-    }
-    interface GenerateTypesOptions {
-        readonly file: string;
-        readonly fileToGenerateTypesFor: string;
-        readonly outputFileName: string;
-    }
     /**
      * A set of one or more available refactoring actions, grouped under a parent refactoring.
      */
@@ -5048,6 +5182,12 @@ declare namespace ts {
          */
         originalTextSpan?: TextSpan;
         originalFileName?: string;
+        /**
+         * If DocumentSpan.textSpan is the span for name of the declaration,
+         * then this is the span for relevant declaration
+         */
+        contextSpan?: TextSpan;
+        originalContextSpan?: TextSpan;
     }
     interface RenameLocation extends DocumentSpan {
         readonly prefixText?: string;
@@ -5076,6 +5216,7 @@ declare namespace ts {
         fileName?: string;
         isInString?: true;
         textSpan: TextSpan;
+        contextSpan?: TextSpan;
         kind: HighlightSpanKind;
     }
     interface NavigateToItem {
@@ -5232,6 +5373,10 @@ declare namespace ts {
         displayParts: SymbolDisplayPart[];
         isOptional: boolean;
     }
+    interface SelectionRange {
+        textSpan: TextSpan;
+        parent?: SelectionRange;
+    }
     /**
      * Represents a single signature to show in signature help.
      * The id is used for subsequent calls into the language service to ask questions about the
@@ -5259,7 +5404,7 @@ declare namespace ts {
         argumentCount: number;
     }
     interface CompletionInfo {
-        /** Not true for all glboal completions. This will be true if the enclosing scope matches a few syntax kinds. See `isSnippetScope`. */
+        /** Not true for all global completions. This will be true if the enclosing scope matches a few syntax kinds. See `isSnippetScope`. */
         isGlobalCompletion: boolean;
         isMemberCompletion: boolean;
         /**
@@ -5608,10 +5753,6 @@ declare namespace ts {
     function transpileModule(input: string, transpileOptions: TranspileOptions): TranspileOutput;
     function transpile(input: string, compilerOptions?: CompilerOptions, fileName?: string, diagnostics?: Diagnostic[], moduleName?: string): string;
 }
-declare namespace ts {
-    function generateTypesForModule(name: string, moduleValue: unknown, formatSettings: FormatCodeSettings): string;
-    function generateTypesForGlobal(name: string, globalValue: unknown, formatSettings: FormatCodeSettings): string;
-}
 declare namespace ts {
     /** The version of the language service API */
     const servicesVersion = "0.8";
diff --git a/lib/typescriptServices.js b/lib/typescriptServices.js
index ce8b2938f03..cc593ef2db3 100644
--- a/lib/typescriptServices.js
+++ b/lib/typescriptServices.js
@@ -73,7 +73,7 @@ var ts;
 (function (ts) {
     // WARNING: The script `configureNightly.ts` uses a regexp to parse out these values.
     // If changing the text in this section, be sure to test `configureNightly` too.
-    ts.versionMajorMinor = "3.4";
+    ts.versionMajorMinor = "3.6";
     /** The version of the TypeScript compiler release */
     ts.version = ts.versionMajorMinor + ".0-dev";
 })(ts || (ts = {}));
@@ -205,7 +205,7 @@ var ts;
                         entry.nextEntry.previousEntry = previousEntry;
                     }
                     // When the deleted entry was the last one, we need to
-                    // adust the lastEntry reference.
+                    // adjust the lastEntry reference.
                     if (this.lastEntry === entry) {
                         this.lastEntry = previousEntry;
                     }
@@ -254,11 +254,12 @@ var ts;
             class_1.prototype.forEach = function (action) {
                 var iterator = this.entries();
                 while (true) {
-                    var _a = iterator.next(), entry = _a.value, done = _a.done;
-                    if (done) {
+                    var iterResult = iterator.next();
+                    if (iterResult.done) {
                         break;
                     }
-                    action(entry[1], entry[0]);
+                    var _a = iterResult.value, key = _a[0], value = _a[1];
+                    action(value, key);
                 }
             };
             return class_1;
@@ -302,11 +303,11 @@ var ts;
     ts.firstDefined = firstDefined;
     function firstDefinedIterator(iter, callback) {
         while (true) {
-            var _a = iter.next(), value = _a.value, done = _a.done;
-            if (done) {
+            var iterResult = iter.next();
+            if (iterResult.done) {
                 return undefined;
             }
-            var result = callback(value);
+            var result = callback(iterResult.value);
             if (result !== undefined) {
                 return result;
             }
@@ -315,7 +316,7 @@ var ts;
     ts.firstDefinedIterator = firstDefinedIterator;
     function zipWith(arrayA, arrayB, callback) {
         var result = [];
-        Debug.assertEqual(arrayA.length, arrayB.length);
+        ts.Debug.assertEqual(arrayA.length, arrayB.length);
         for (var i = 0; i < arrayA.length; i++) {
             result.push(callback(arrayA[i], arrayB[i], i));
         }
@@ -323,7 +324,7 @@ var ts;
     }
     ts.zipWith = zipWith;
     function zipToIterator(arrayA, arrayB) {
-        Debug.assertEqual(arrayA.length, arrayB.length);
+        ts.Debug.assertEqual(arrayA.length, arrayB.length);
         var i = 0;
         return {
             next: function () {
@@ -337,7 +338,7 @@ var ts;
     }
     ts.zipToIterator = zipToIterator;
     function zipToMap(keys, values) {
-        Debug.assert(keys.length === values.length);
+        ts.Debug.assert(keys.length === values.length);
         var map = createMap();
         for (var i = 0; i < keys.length; ++i) {
             map.set(keys[i], values[i]);
@@ -411,7 +412,7 @@ var ts;
                 return result;
             }
         }
-        return Debug.fail();
+        return ts.Debug.fail();
     }
     ts.findMap = findMap;
     function contains(array, value, equalityComparer) {
@@ -529,19 +530,21 @@ var ts;
         return array;
     }
     ts.sameMap = sameMap;
+    /**
+     * Flattens an array containing a mix of array or non-array elements.
+     *
+     * @param array The array to flatten.
+     */
     function flatten(array) {
-        var result;
-        if (array) {
-            result = [];
-            for (var _i = 0, array_2 = array; _i < array_2.length; _i++) {
-                var v = array_2[_i];
-                if (v) {
-                    if (isArray(v)) {
-                        addRange(result, v);
-                    }
-                    else {
-                        result.push(v);
-                    }
+        var result = [];
+        for (var _i = 0, array_2 = array; _i < array_2.length; _i++) {
+            var v = array_2[_i];
+            if (v) {
+                if (isArray(v)) {
+                    addRange(result, v);
+                }
+                else {
+                    result.push(v);
                 }
             }
         }
@@ -841,7 +844,7 @@ var ts;
                     continue;
                 case -1 /* LessThan */:
                     // If `array` is sorted, `next` should **never** be less than `last`.
-                    return Debug.fail("Array is unsorted.");
+                    return ts.Debug.fail("Array is unsorted.");
             }
             deduplicated.push(last = next);
         }
@@ -908,13 +911,13 @@ var ts;
         loopB: for (var offsetA = 0, offsetB = 0; offsetB < arrayB.length; offsetB++) {
             if (offsetB > 0) {
                 // Ensure `arrayB` is properly sorted.
-                Debug.assertGreaterThanOrEqual(comparer(arrayB[offsetB], arrayB[offsetB - 1]), 0 /* EqualTo */);
+                ts.Debug.assertGreaterThanOrEqual(comparer(arrayB[offsetB], arrayB[offsetB - 1]), 0 /* EqualTo */);
             }
             loopA: for (var startA = offsetA; offsetA < arrayA.length; offsetA++) {
                 if (offsetA > startA) {
                     // Ensure `arrayA` is properly sorted. We only need to perform this check if
                     // `offsetA` has changed since we entered the loop.
-                    Debug.assertGreaterThanOrEqual(comparer(arrayA[offsetA], arrayA[offsetA - 1]), 0 /* EqualTo */);
+                    ts.Debug.assertGreaterThanOrEqual(comparer(arrayA[offsetA], arrayA[offsetA - 1]), 0 /* EqualTo */);
                 }
                 switch (comparer(arrayB[offsetB], arrayA[offsetA])) {
                     case -1 /* LessThan */:
@@ -1084,7 +1087,7 @@ var ts;
     }
     ts.firstOrUndefined = firstOrUndefined;
     function first(array) {
-        Debug.assert(array.length !== 0);
+        ts.Debug.assert(array.length !== 0);
         return array[0];
     }
     ts.first = first;
@@ -1096,7 +1099,7 @@ var ts;
     }
     ts.lastOrUndefined = lastOrUndefined;
     function last(array) {
-        Debug.assert(array.length !== 0);
+        ts.Debug.assert(array.length !== 0);
         return array[array.length - 1];
     }
     ts.last = last;
@@ -1238,10 +1241,9 @@ var ts;
     }
     ts.getOwnValues = getOwnValues;
     function arrayFrom(iterator, map) {
-        var _a;
         var result = [];
-        for (var _b = iterator.next(), value = _b.value, done = _b.done; !done; _a = iterator.next(), value = _a.value, done = _a.done, _a) {
-            result.push(map ? map(value) : value);
+        for (var iterResult = iterator.next(); !iterResult.done; iterResult = iterator.next()) {
+            result.push(map ? map(iterResult.value) : iterResult.value);
         }
         return result;
     }
@@ -1421,7 +1423,7 @@ var ts;
     function cast(value, test) {
         if (value !== undefined && test(value))
             return value;
-        return Debug.fail("Invalid cast. The supplied value " + value + " did not pass the test '" + Debug.getFunctionName(test) + "'.");
+        return ts.Debug.fail("Invalid cast. The supplied value " + value + " did not pass the test '" + ts.Debug.getFunctionName(test) + "'.");
     }
     ts.cast = cast;
     /** Does nothing. */
@@ -1433,6 +1435,9 @@ var ts;
     /** Do nothing and return true */
     function returnTrue() { return true; }
     ts.returnTrue = returnTrue;
+    /** Do nothing and return undefined */
+    function returnUndefined() { return undefined; }
+    ts.returnUndefined = returnUndefined;
     /** Returns its argument. */
     function identity(x) { return x; }
     ts.identity = identity;
@@ -1455,38 +1460,13 @@ var ts;
         };
     }
     ts.memoize = memoize;
-    function chain(a, b, c, d, e) {
+    function compose(a, b, c, d, e) {
         if (e) {
             var args_2 = [];
             for (var i = 0; i < arguments.length; i++) {
                 args_2[i] = arguments[i];
             }
-            return function (t) { return compose.apply(void 0, map(args_2, function (f) { return f(t); })); };
-        }
-        else if (d) {
-            return function (t) { return compose(a(t), b(t), c(t), d(t)); };
-        }
-        else if (c) {
-            return function (t) { return compose(a(t), b(t), c(t)); };
-        }
-        else if (b) {
-            return function (t) { return compose(a(t), b(t)); };
-        }
-        else if (a) {
-            return function (t) { return compose(a(t)); };
-        }
-        else {
-            return function (_) { return function (u) { return u; }; };
-        }
-    }
-    ts.chain = chain;
-    function compose(a, b, c, d, e) {
-        if (e) {
-            var args_3 = [];
-            for (var i = 0; i < arguments.length; i++) {
-                args_3[i] = arguments[i];
-            }
-            return function (t) { return reduceLeft(args_3, function (u, f) { return f(u); }, t); };
+            return function (t) { return reduceLeft(args_2, function (u, f) { return f(u); }, t); };
         }
         else if (d) {
             return function (t) { return d(c(b(a(t)))); };
@@ -1512,92 +1492,6 @@ var ts;
         AssertionLevel[AssertionLevel["Aggressive"] = 2] = "Aggressive";
         AssertionLevel[AssertionLevel["VeryAggressive"] = 3] = "VeryAggressive";
     })(AssertionLevel = ts.AssertionLevel || (ts.AssertionLevel = {}));
-    var Debug;
-    (function (Debug) {
-        Debug.currentAssertionLevel = 0 /* None */;
-        Debug.isDebugging = false;
-        function shouldAssert(level) {
-            return Debug.currentAssertionLevel >= level;
-        }
-        Debug.shouldAssert = shouldAssert;
-        function assert(expression, message, verboseDebugInfo, stackCrawlMark) {
-            if (!expression) {
-                if (verboseDebugInfo) {
-                    message += "\r\nVerbose Debug Information: " + (typeof verboseDebugInfo === "string" ? verboseDebugInfo : verboseDebugInfo());
-                }
-                fail(message ? "False expression: " + message : "False expression.", stackCrawlMark || assert);
-            }
-        }
-        Debug.assert = assert;
-        function assertEqual(a, b, msg, msg2) {
-            if (a !== b) {
-                var message = msg ? msg2 ? msg + " " + msg2 : msg : "";
-                fail("Expected " + a + " === " + b + ". " + message);
-            }
-        }
-        Debug.assertEqual = assertEqual;
-        function assertLessThan(a, b, msg) {
-            if (a >= b) {
-                fail("Expected " + a + " < " + b + ". " + (msg || ""));
-            }
-        }
-        Debug.assertLessThan = assertLessThan;
-        function assertLessThanOrEqual(a, b) {
-            if (a > b) {
-                fail("Expected " + a + " <= " + b);
-            }
-        }
-        Debug.assertLessThanOrEqual = assertLessThanOrEqual;
-        function assertGreaterThanOrEqual(a, b) {
-            if (a < b) {
-                fail("Expected " + a + " >= " + b);
-            }
-        }
-        Debug.assertGreaterThanOrEqual = assertGreaterThanOrEqual;
-        function fail(message, stackCrawlMark) {
-            debugger;
-            var e = new Error(message ? "Debug Failure. " + message : "Debug Failure.");
-            if (Error.captureStackTrace) {
-                Error.captureStackTrace(e, stackCrawlMark || fail);
-            }
-            throw e;
-        }
-        Debug.fail = fail;
-        function assertDefined(value, message) {
-            if (value === undefined || value === null)
-                return fail(message);
-            return value;
-        }
-        Debug.assertDefined = assertDefined;
-        function assertEachDefined(value, message) {
-            for (var _i = 0, value_1 = value; _i < value_1.length; _i++) {
-                var v = value_1[_i];
-                assertDefined(v, message);
-            }
-            return value;
-        }
-        Debug.assertEachDefined = assertEachDefined;
-        function assertNever(member, message, stackCrawlMark) {
-            if (message === void 0) { message = "Illegal value:"; }
-            var detail = typeof member === "object" && "kind" in member && "pos" in member ? "SyntaxKind: " + Debug.showSyntaxKind(member) : JSON.stringify(member);
-            return fail(message + " " + detail, stackCrawlMark || assertNever);
-        }
-        Debug.assertNever = assertNever;
-        function getFunctionName(func) {
-            if (typeof func !== "function") {
-                return "";
-            }
-            else if (func.hasOwnProperty("name")) {
-                return func.name;
-            }
-            else {
-                var text = Function.prototype.toString.call(func);
-                var match = /^function\s+([\w\$]+)\s*\(/.exec(text);
-                return match ? match[1] : "";
-            }
-        }
-        Debug.getFunctionName = getFunctionName;
-    })(Debug = ts.Debug || (ts.Debug = {}));
     function equateValues(a, b) {
         return a === b;
     }
@@ -1854,7 +1748,7 @@ var ts;
                     bestCandidate = candidate;
                 }
                 else {
-                    Debug.assert(distance < bestDistance); // Else `levenshteinWithMax` should return undefined
+                    ts.Debug.assert(distance < bestDistance); // Else `levenshteinWithMax` should return undefined
                     bestDistance = distance;
                     bestCandidate = candidate;
                 }
@@ -1998,7 +1892,7 @@ var ts;
      * E.g.: matchedText(tryParsePattern("foo*baz"), "foobarbaz") === "bar"
      */
     function matchedText(pattern, candidate) {
-        Debug.assert(isPatternMatch(pattern, candidate));
+        ts.Debug.assert(isPatternMatch(pattern, candidate));
         return candidate.substring(pattern.prefix.length, candidate.length - pattern.suffix.length);
     }
     ts.matchedText = matchedText;
@@ -2091,6 +1985,267 @@ var ts;
         return result;
     }
     ts.fill = fill;
+    function cartesianProduct(arrays) {
+        var result = [];
+        cartesianProductWorker(arrays, result, /*outer*/ undefined, 0);
+        return result;
+    }
+    ts.cartesianProduct = cartesianProduct;
+    function cartesianProductWorker(arrays, result, outer, index) {
+        for (var _i = 0, _a = arrays[index]; _i < _a.length; _i++) {
+            var element = _a[_i];
+            var inner = void 0;
+            if (outer) {
+                inner = outer.slice();
+                inner.push(element);
+            }
+            else {
+                inner = [element];
+            }
+            if (index === arrays.length - 1) {
+                result.push(inner);
+            }
+            else {
+                cartesianProductWorker(arrays, result, inner, index + 1);
+            }
+        }
+    }
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var Debug;
+    (function (Debug) {
+        Debug.currentAssertionLevel = 0 /* None */;
+        Debug.isDebugging = false;
+        function shouldAssert(level) {
+            return Debug.currentAssertionLevel >= level;
+        }
+        Debug.shouldAssert = shouldAssert;
+        function assert(expression, message, verboseDebugInfo, stackCrawlMark) {
+            if (!expression) {
+                if (verboseDebugInfo) {
+                    message += "\r\nVerbose Debug Information: " + (typeof verboseDebugInfo === "string" ? verboseDebugInfo : verboseDebugInfo());
+                }
+                fail(message ? "False expression: " + message : "False expression.", stackCrawlMark || assert);
+            }
+        }
+        Debug.assert = assert;
+        function assertEqual(a, b, msg, msg2) {
+            if (a !== b) {
+                var message = msg ? msg2 ? msg + " " + msg2 : msg : "";
+                fail("Expected " + a + " === " + b + ". " + message);
+            }
+        }
+        Debug.assertEqual = assertEqual;
+        function assertLessThan(a, b, msg) {
+            if (a >= b) {
+                fail("Expected " + a + " < " + b + ". " + (msg || ""));
+            }
+        }
+        Debug.assertLessThan = assertLessThan;
+        function assertLessThanOrEqual(a, b) {
+            if (a > b) {
+                fail("Expected " + a + " <= " + b);
+            }
+        }
+        Debug.assertLessThanOrEqual = assertLessThanOrEqual;
+        function assertGreaterThanOrEqual(a, b) {
+            if (a < b) {
+                fail("Expected " + a + " >= " + b);
+            }
+        }
+        Debug.assertGreaterThanOrEqual = assertGreaterThanOrEqual;
+        function fail(message, stackCrawlMark) {
+            debugger;
+            var e = new Error(message ? "Debug Failure. " + message : "Debug Failure.");
+            if (Error.captureStackTrace) {
+                Error.captureStackTrace(e, stackCrawlMark || fail);
+            }
+            throw e;
+        }
+        Debug.fail = fail;
+        function assertDefined(value, message) {
+            if (value === undefined || value === null)
+                return fail(message);
+            return value;
+        }
+        Debug.assertDefined = assertDefined;
+        function assertEachDefined(value, message) {
+            for (var _i = 0, value_1 = value; _i < value_1.length; _i++) {
+                var v = value_1[_i];
+                assertDefined(v, message);
+            }
+            return value;
+        }
+        Debug.assertEachDefined = assertEachDefined;
+        function assertNever(member, message, stackCrawlMark) {
+            if (message === void 0) { message = "Illegal value:"; }
+            var detail = typeof member === "object" && "kind" in member && "pos" in member && formatSyntaxKind ? "SyntaxKind: " + formatSyntaxKind(member.kind) : JSON.stringify(member);
+            return fail(message + " " + detail, stackCrawlMark || assertNever);
+        }
+        Debug.assertNever = assertNever;
+        function getFunctionName(func) {
+            if (typeof func !== "function") {
+                return "";
+            }
+            else if (func.hasOwnProperty("name")) {
+                return func.name;
+            }
+            else {
+                var text = Function.prototype.toString.call(func);
+                var match = /^function\s+([\w\$]+)\s*\(/.exec(text);
+                return match ? match[1] : "";
+            }
+        }
+        Debug.getFunctionName = getFunctionName;
+        function formatSymbol(symbol) {
+            return "{ name: " + ts.unescapeLeadingUnderscores(symbol.escapedName) + "; flags: " + formatSymbolFlags(symbol.flags) + "; declarations: " + ts.map(symbol.declarations, function (node) { return formatSyntaxKind(node.kind); }) + " }";
+        }
+        Debug.formatSymbol = formatSymbol;
+        /**
+         * Formats an enum value as a string for debugging and debug assertions.
+         */
+        function formatEnum(value, enumObject, isFlags) {
+            if (value === void 0) { value = 0; }
+            var members = getEnumMembers(enumObject);
+            if (value === 0) {
+                return members.length > 0 && members[0][0] === 0 ? members[0][1] : "0";
+            }
+            if (isFlags) {
+                var result = "";
+                var remainingFlags = value;
+                for (var i = members.length - 1; i >= 0 && remainingFlags !== 0; i--) {
+                    var _a = members[i], enumValue = _a[0], enumName = _a[1];
+                    if (enumValue !== 0 && (remainingFlags & enumValue) === enumValue) {
+                        remainingFlags &= ~enumValue;
+                        result = "" + enumName + (result ? "|" : "") + result;
+                    }
+                }
+                if (remainingFlags === 0) {
+                    return result;
+                }
+            }
+            else {
+                for (var _i = 0, members_1 = members; _i < members_1.length; _i++) {
+                    var _b = members_1[_i], enumValue = _b[0], enumName = _b[1];
+                    if (enumValue === value) {
+                        return enumName;
+                    }
+                }
+            }
+            return value.toString();
+        }
+        Debug.formatEnum = formatEnum;
+        function getEnumMembers(enumObject) {
+            var result = [];
+            for (var name in enumObject) {
+                var value = enumObject[name];
+                if (typeof value === "number") {
+                    result.push([value, name]);
+                }
+            }
+            return ts.stableSort(result, function (x, y) { return ts.compareValues(x[0], y[0]); });
+        }
+        function formatSyntaxKind(kind) {
+            return formatEnum(kind, ts.SyntaxKind, /*isFlags*/ false);
+        }
+        Debug.formatSyntaxKind = formatSyntaxKind;
+        function formatNodeFlags(flags) {
+            return formatEnum(flags, ts.NodeFlags, /*isFlags*/ true);
+        }
+        Debug.formatNodeFlags = formatNodeFlags;
+        function formatModifierFlags(flags) {
+            return formatEnum(flags, ts.ModifierFlags, /*isFlags*/ true);
+        }
+        Debug.formatModifierFlags = formatModifierFlags;
+        function formatTransformFlags(flags) {
+            return formatEnum(flags, ts.TransformFlags, /*isFlags*/ true);
+        }
+        Debug.formatTransformFlags = formatTransformFlags;
+        function formatEmitFlags(flags) {
+            return formatEnum(flags, ts.EmitFlags, /*isFlags*/ true);
+        }
+        Debug.formatEmitFlags = formatEmitFlags;
+        function formatSymbolFlags(flags) {
+            return formatEnum(flags, ts.SymbolFlags, /*isFlags*/ true);
+        }
+        Debug.formatSymbolFlags = formatSymbolFlags;
+        function formatTypeFlags(flags) {
+            return formatEnum(flags, ts.TypeFlags, /*isFlags*/ true);
+        }
+        Debug.formatTypeFlags = formatTypeFlags;
+        function formatObjectFlags(flags) {
+            return formatEnum(flags, ts.ObjectFlags, /*isFlags*/ true);
+        }
+        Debug.formatObjectFlags = formatObjectFlags;
+        function failBadSyntaxKind(node, message) {
+            return fail((message || "Unexpected node.") + "\r\nNode " + formatSyntaxKind(node.kind) + " was unexpected.", failBadSyntaxKind);
+        }
+        Debug.failBadSyntaxKind = failBadSyntaxKind;
+        Debug.assertEachNode = shouldAssert(1 /* Normal */)
+            ? function (nodes, test, message) { return assert(test === undefined || ts.every(nodes, test), message || "Unexpected node.", function () { return "Node array did not pass test '" + getFunctionName(test) + "'."; }, Debug.assertEachNode); }
+            : ts.noop;
+        Debug.assertNode = shouldAssert(1 /* Normal */)
+            ? function (node, test, message) { return assert(test === undefined || test(node), message || "Unexpected node.", function () { return "Node " + formatSyntaxKind(node.kind) + " did not pass test '" + getFunctionName(test) + "'."; }, Debug.assertNode); }
+            : ts.noop;
+        Debug.assertOptionalNode = shouldAssert(1 /* Normal */)
+            ? function (node, test, message) { return assert(test === undefined || node === undefined || test(node), message || "Unexpected node.", function () { return "Node " + formatSyntaxKind(node.kind) + " did not pass test '" + getFunctionName(test) + "'."; }, Debug.assertOptionalNode); }
+            : ts.noop;
+        Debug.assertOptionalToken = shouldAssert(1 /* Normal */)
+            ? function (node, kind, message) { return assert(kind === undefined || node === undefined || node.kind === kind, message || "Unexpected node.", function () { return "Node " + formatSyntaxKind(node.kind) + " was not a '" + formatSyntaxKind(kind) + "' token."; }, Debug.assertOptionalToken); }
+            : ts.noop;
+        Debug.assertMissingNode = shouldAssert(1 /* Normal */)
+            ? function (node, message) { return assert(node === undefined, message || "Unexpected node.", function () { return "Node " + formatSyntaxKind(node.kind) + " was unexpected'."; }, Debug.assertMissingNode); }
+            : ts.noop;
+        var isDebugInfoEnabled = false;
+        /**
+         * Injects debug information into frequently used types.
+         */
+        function enableDebugInfo() {
+            if (isDebugInfoEnabled)
+                return;
+            // Add additional properties in debug mode to assist with debugging.
+            Object.defineProperties(ts.objectAllocator.getSymbolConstructor().prototype, {
+                __debugFlags: { get: function () { return formatSymbolFlags(this.flags); } }
+            });
+            Object.defineProperties(ts.objectAllocator.getTypeConstructor().prototype, {
+                __debugFlags: { get: function () { return formatTypeFlags(this.flags); } },
+                __debugObjectFlags: { get: function () { return this.flags & 524288 /* Object */ ? formatObjectFlags(this.objectFlags) : ""; } },
+                __debugTypeToString: { value: function () { return this.checker.typeToString(this); } },
+            });
+            var nodeConstructors = [
+                ts.objectAllocator.getNodeConstructor(),
+                ts.objectAllocator.getIdentifierConstructor(),
+                ts.objectAllocator.getTokenConstructor(),
+                ts.objectAllocator.getSourceFileConstructor()
+            ];
+            for (var _i = 0, nodeConstructors_1 = nodeConstructors; _i < nodeConstructors_1.length; _i++) {
+                var ctor = nodeConstructors_1[_i];
+                if (!ctor.prototype.hasOwnProperty("__debugKind")) {
+                    Object.defineProperties(ctor.prototype, {
+                        __debugKind: { get: function () { return formatSyntaxKind(this.kind); } },
+                        __debugNodeFlags: { get: function () { return formatNodeFlags(this.flags); } },
+                        __debugModifierFlags: { get: function () { return formatModifierFlags(ts.getModifierFlagsNoCache(this)); } },
+                        __debugTransformFlags: { get: function () { return formatTransformFlags(this.transformFlags); } },
+                        __debugIsParseTreeNode: { get: function () { return ts.isParseTreeNode(this); } },
+                        __debugEmitFlags: { get: function () { return formatEmitFlags(ts.getEmitFlags(this)); } },
+                        __debugGetText: {
+                            value: function (includeTrivia) {
+                                if (ts.nodeIsSynthesized(this))
+                                    return "";
+                                var parseNode = ts.getParseTreeNode(this);
+                                var sourceFile = parseNode && ts.getSourceFileOfNode(parseNode);
+                                return sourceFile ? ts.getSourceTextOfNodeFromSourceFile(sourceFile, parseNode, includeTrivia) : "";
+                            }
+                        }
+                    });
+                }
+            }
+            isDebugInfoEnabled = true;
+        }
+        Debug.enableDebugInfo = enableDebugInfo;
+    })(Debug = ts.Debug || (ts.Debug = {}));
 })(ts || (ts = {}));
 /*@internal*/
 var ts;
@@ -2643,309 +2798,312 @@ var ts;
         SyntaxKind[SyntaxKind["QuestionToken"] = 56] = "QuestionToken";
         SyntaxKind[SyntaxKind["ColonToken"] = 57] = "ColonToken";
         SyntaxKind[SyntaxKind["AtToken"] = 58] = "AtToken";
+        /** Only the JSDoc scanner produces BacktickToken. The normal scanner produces NoSubstitutionTemplateLiteral and related kinds. */
+        SyntaxKind[SyntaxKind["BacktickToken"] = 59] = "BacktickToken";
         // Assignments
-        SyntaxKind[SyntaxKind["EqualsToken"] = 59] = "EqualsToken";
-        SyntaxKind[SyntaxKind["PlusEqualsToken"] = 60] = "PlusEqualsToken";
-        SyntaxKind[SyntaxKind["MinusEqualsToken"] = 61] = "MinusEqualsToken";
-        SyntaxKind[SyntaxKind["AsteriskEqualsToken"] = 62] = "AsteriskEqualsToken";
-        SyntaxKind[SyntaxKind["AsteriskAsteriskEqualsToken"] = 63] = "AsteriskAsteriskEqualsToken";
-        SyntaxKind[SyntaxKind["SlashEqualsToken"] = 64] = "SlashEqualsToken";
-        SyntaxKind[SyntaxKind["PercentEqualsToken"] = 65] = "PercentEqualsToken";
-        SyntaxKind[SyntaxKind["LessThanLessThanEqualsToken"] = 66] = "LessThanLessThanEqualsToken";
-        SyntaxKind[SyntaxKind["GreaterThanGreaterThanEqualsToken"] = 67] = "GreaterThanGreaterThanEqualsToken";
-        SyntaxKind[SyntaxKind["GreaterThanGreaterThanGreaterThanEqualsToken"] = 68] = "GreaterThanGreaterThanGreaterThanEqualsToken";
-        SyntaxKind[SyntaxKind["AmpersandEqualsToken"] = 69] = "AmpersandEqualsToken";
-        SyntaxKind[SyntaxKind["BarEqualsToken"] = 70] = "BarEqualsToken";
-        SyntaxKind[SyntaxKind["CaretEqualsToken"] = 71] = "CaretEqualsToken";
+        SyntaxKind[SyntaxKind["EqualsToken"] = 60] = "EqualsToken";
+        SyntaxKind[SyntaxKind["PlusEqualsToken"] = 61] = "PlusEqualsToken";
+        SyntaxKind[SyntaxKind["MinusEqualsToken"] = 62] = "MinusEqualsToken";
+        SyntaxKind[SyntaxKind["AsteriskEqualsToken"] = 63] = "AsteriskEqualsToken";
+        SyntaxKind[SyntaxKind["AsteriskAsteriskEqualsToken"] = 64] = "AsteriskAsteriskEqualsToken";
+        SyntaxKind[SyntaxKind["SlashEqualsToken"] = 65] = "SlashEqualsToken";
+        SyntaxKind[SyntaxKind["PercentEqualsToken"] = 66] = "PercentEqualsToken";
+        SyntaxKind[SyntaxKind["LessThanLessThanEqualsToken"] = 67] = "LessThanLessThanEqualsToken";
+        SyntaxKind[SyntaxKind["GreaterThanGreaterThanEqualsToken"] = 68] = "GreaterThanGreaterThanEqualsToken";
+        SyntaxKind[SyntaxKind["GreaterThanGreaterThanGreaterThanEqualsToken"] = 69] = "GreaterThanGreaterThanGreaterThanEqualsToken";
+        SyntaxKind[SyntaxKind["AmpersandEqualsToken"] = 70] = "AmpersandEqualsToken";
+        SyntaxKind[SyntaxKind["BarEqualsToken"] = 71] = "BarEqualsToken";
+        SyntaxKind[SyntaxKind["CaretEqualsToken"] = 72] = "CaretEqualsToken";
         // Identifiers
-        SyntaxKind[SyntaxKind["Identifier"] = 72] = "Identifier";
+        SyntaxKind[SyntaxKind["Identifier"] = 73] = "Identifier";
         // Reserved words
-        SyntaxKind[SyntaxKind["BreakKeyword"] = 73] = "BreakKeyword";
-        SyntaxKind[SyntaxKind["CaseKeyword"] = 74] = "CaseKeyword";
-        SyntaxKind[SyntaxKind["CatchKeyword"] = 75] = "CatchKeyword";
-        SyntaxKind[SyntaxKind["ClassKeyword"] = 76] = "ClassKeyword";
-        SyntaxKind[SyntaxKind["ConstKeyword"] = 77] = "ConstKeyword";
-        SyntaxKind[SyntaxKind["ContinueKeyword"] = 78] = "ContinueKeyword";
-        SyntaxKind[SyntaxKind["DebuggerKeyword"] = 79] = "DebuggerKeyword";
-        SyntaxKind[SyntaxKind["DefaultKeyword"] = 80] = "DefaultKeyword";
-        SyntaxKind[SyntaxKind["DeleteKeyword"] = 81] = "DeleteKeyword";
-        SyntaxKind[SyntaxKind["DoKeyword"] = 82] = "DoKeyword";
-        SyntaxKind[SyntaxKind["ElseKeyword"] = 83] = "ElseKeyword";
-        SyntaxKind[SyntaxKind["EnumKeyword"] = 84] = "EnumKeyword";
-        SyntaxKind[SyntaxKind["ExportKeyword"] = 85] = "ExportKeyword";
-        SyntaxKind[SyntaxKind["ExtendsKeyword"] = 86] = "ExtendsKeyword";
-        SyntaxKind[SyntaxKind["FalseKeyword"] = 87] = "FalseKeyword";
-        SyntaxKind[SyntaxKind["FinallyKeyword"] = 88] = "FinallyKeyword";
-        SyntaxKind[SyntaxKind["ForKeyword"] = 89] = "ForKeyword";
-        SyntaxKind[SyntaxKind["FunctionKeyword"] = 90] = "FunctionKeyword";
-        SyntaxKind[SyntaxKind["IfKeyword"] = 91] = "IfKeyword";
-        SyntaxKind[SyntaxKind["ImportKeyword"] = 92] = "ImportKeyword";
-        SyntaxKind[SyntaxKind["InKeyword"] = 93] = "InKeyword";
-        SyntaxKind[SyntaxKind["InstanceOfKeyword"] = 94] = "InstanceOfKeyword";
-        SyntaxKind[SyntaxKind["NewKeyword"] = 95] = "NewKeyword";
-        SyntaxKind[SyntaxKind["NullKeyword"] = 96] = "NullKeyword";
-        SyntaxKind[SyntaxKind["ReturnKeyword"] = 97] = "ReturnKeyword";
-        SyntaxKind[SyntaxKind["SuperKeyword"] = 98] = "SuperKeyword";
-        SyntaxKind[SyntaxKind["SwitchKeyword"] = 99] = "SwitchKeyword";
-        SyntaxKind[SyntaxKind["ThisKeyword"] = 100] = "ThisKeyword";
-        SyntaxKind[SyntaxKind["ThrowKeyword"] = 101] = "ThrowKeyword";
-        SyntaxKind[SyntaxKind["TrueKeyword"] = 102] = "TrueKeyword";
-        SyntaxKind[SyntaxKind["TryKeyword"] = 103] = "TryKeyword";
-        SyntaxKind[SyntaxKind["TypeOfKeyword"] = 104] = "TypeOfKeyword";
-        SyntaxKind[SyntaxKind["VarKeyword"] = 105] = "VarKeyword";
-        SyntaxKind[SyntaxKind["VoidKeyword"] = 106] = "VoidKeyword";
-        SyntaxKind[SyntaxKind["WhileKeyword"] = 107] = "WhileKeyword";
-        SyntaxKind[SyntaxKind["WithKeyword"] = 108] = "WithKeyword";
+        SyntaxKind[SyntaxKind["BreakKeyword"] = 74] = "BreakKeyword";
+        SyntaxKind[SyntaxKind["CaseKeyword"] = 75] = "CaseKeyword";
+        SyntaxKind[SyntaxKind["CatchKeyword"] = 76] = "CatchKeyword";
+        SyntaxKind[SyntaxKind["ClassKeyword"] = 77] = "ClassKeyword";
+        SyntaxKind[SyntaxKind["ConstKeyword"] = 78] = "ConstKeyword";
+        SyntaxKind[SyntaxKind["ContinueKeyword"] = 79] = "ContinueKeyword";
+        SyntaxKind[SyntaxKind["DebuggerKeyword"] = 80] = "DebuggerKeyword";
+        SyntaxKind[SyntaxKind["DefaultKeyword"] = 81] = "DefaultKeyword";
+        SyntaxKind[SyntaxKind["DeleteKeyword"] = 82] = "DeleteKeyword";
+        SyntaxKind[SyntaxKind["DoKeyword"] = 83] = "DoKeyword";
+        SyntaxKind[SyntaxKind["ElseKeyword"] = 84] = "ElseKeyword";
+        SyntaxKind[SyntaxKind["EnumKeyword"] = 85] = "EnumKeyword";
+        SyntaxKind[SyntaxKind["ExportKeyword"] = 86] = "ExportKeyword";
+        SyntaxKind[SyntaxKind["ExtendsKeyword"] = 87] = "ExtendsKeyword";
+        SyntaxKind[SyntaxKind["FalseKeyword"] = 88] = "FalseKeyword";
+        SyntaxKind[SyntaxKind["FinallyKeyword"] = 89] = "FinallyKeyword";
+        SyntaxKind[SyntaxKind["ForKeyword"] = 90] = "ForKeyword";
+        SyntaxKind[SyntaxKind["FunctionKeyword"] = 91] = "FunctionKeyword";
+        SyntaxKind[SyntaxKind["IfKeyword"] = 92] = "IfKeyword";
+        SyntaxKind[SyntaxKind["ImportKeyword"] = 93] = "ImportKeyword";
+        SyntaxKind[SyntaxKind["InKeyword"] = 94] = "InKeyword";
+        SyntaxKind[SyntaxKind["InstanceOfKeyword"] = 95] = "InstanceOfKeyword";
+        SyntaxKind[SyntaxKind["NewKeyword"] = 96] = "NewKeyword";
+        SyntaxKind[SyntaxKind["NullKeyword"] = 97] = "NullKeyword";
+        SyntaxKind[SyntaxKind["ReturnKeyword"] = 98] = "ReturnKeyword";
+        SyntaxKind[SyntaxKind["SuperKeyword"] = 99] = "SuperKeyword";
+        SyntaxKind[SyntaxKind["SwitchKeyword"] = 100] = "SwitchKeyword";
+        SyntaxKind[SyntaxKind["ThisKeyword"] = 101] = "ThisKeyword";
+        SyntaxKind[SyntaxKind["ThrowKeyword"] = 102] = "ThrowKeyword";
+        SyntaxKind[SyntaxKind["TrueKeyword"] = 103] = "TrueKeyword";
+        SyntaxKind[SyntaxKind["TryKeyword"] = 104] = "TryKeyword";
+        SyntaxKind[SyntaxKind["TypeOfKeyword"] = 105] = "TypeOfKeyword";
+        SyntaxKind[SyntaxKind["VarKeyword"] = 106] = "VarKeyword";
+        SyntaxKind[SyntaxKind["VoidKeyword"] = 107] = "VoidKeyword";
+        SyntaxKind[SyntaxKind["WhileKeyword"] = 108] = "WhileKeyword";
+        SyntaxKind[SyntaxKind["WithKeyword"] = 109] = "WithKeyword";
         // Strict mode reserved words
-        SyntaxKind[SyntaxKind["ImplementsKeyword"] = 109] = "ImplementsKeyword";
-        SyntaxKind[SyntaxKind["InterfaceKeyword"] = 110] = "InterfaceKeyword";
-        SyntaxKind[SyntaxKind["LetKeyword"] = 111] = "LetKeyword";
-        SyntaxKind[SyntaxKind["PackageKeyword"] = 112] = "PackageKeyword";
-        SyntaxKind[SyntaxKind["PrivateKeyword"] = 113] = "PrivateKeyword";
-        SyntaxKind[SyntaxKind["ProtectedKeyword"] = 114] = "ProtectedKeyword";
-        SyntaxKind[SyntaxKind["PublicKeyword"] = 115] = "PublicKeyword";
-        SyntaxKind[SyntaxKind["StaticKeyword"] = 116] = "StaticKeyword";
-        SyntaxKind[SyntaxKind["YieldKeyword"] = 117] = "YieldKeyword";
+        SyntaxKind[SyntaxKind["ImplementsKeyword"] = 110] = "ImplementsKeyword";
+        SyntaxKind[SyntaxKind["InterfaceKeyword"] = 111] = "InterfaceKeyword";
+        SyntaxKind[SyntaxKind["LetKeyword"] = 112] = "LetKeyword";
+        SyntaxKind[SyntaxKind["PackageKeyword"] = 113] = "PackageKeyword";
+        SyntaxKind[SyntaxKind["PrivateKeyword"] = 114] = "PrivateKeyword";
+        SyntaxKind[SyntaxKind["ProtectedKeyword"] = 115] = "ProtectedKeyword";
+        SyntaxKind[SyntaxKind["PublicKeyword"] = 116] = "PublicKeyword";
+        SyntaxKind[SyntaxKind["StaticKeyword"] = 117] = "StaticKeyword";
+        SyntaxKind[SyntaxKind["YieldKeyword"] = 118] = "YieldKeyword";
         // Contextual keywords
-        SyntaxKind[SyntaxKind["AbstractKeyword"] = 118] = "AbstractKeyword";
-        SyntaxKind[SyntaxKind["AsKeyword"] = 119] = "AsKeyword";
-        SyntaxKind[SyntaxKind["AnyKeyword"] = 120] = "AnyKeyword";
-        SyntaxKind[SyntaxKind["AsyncKeyword"] = 121] = "AsyncKeyword";
-        SyntaxKind[SyntaxKind["AwaitKeyword"] = 122] = "AwaitKeyword";
-        SyntaxKind[SyntaxKind["BooleanKeyword"] = 123] = "BooleanKeyword";
-        SyntaxKind[SyntaxKind["ConstructorKeyword"] = 124] = "ConstructorKeyword";
-        SyntaxKind[SyntaxKind["DeclareKeyword"] = 125] = "DeclareKeyword";
-        SyntaxKind[SyntaxKind["GetKeyword"] = 126] = "GetKeyword";
-        SyntaxKind[SyntaxKind["InferKeyword"] = 127] = "InferKeyword";
-        SyntaxKind[SyntaxKind["IsKeyword"] = 128] = "IsKeyword";
-        SyntaxKind[SyntaxKind["KeyOfKeyword"] = 129] = "KeyOfKeyword";
-        SyntaxKind[SyntaxKind["ModuleKeyword"] = 130] = "ModuleKeyword";
-        SyntaxKind[SyntaxKind["NamespaceKeyword"] = 131] = "NamespaceKeyword";
-        SyntaxKind[SyntaxKind["NeverKeyword"] = 132] = "NeverKeyword";
-        SyntaxKind[SyntaxKind["ReadonlyKeyword"] = 133] = "ReadonlyKeyword";
-        SyntaxKind[SyntaxKind["RequireKeyword"] = 134] = "RequireKeyword";
-        SyntaxKind[SyntaxKind["NumberKeyword"] = 135] = "NumberKeyword";
-        SyntaxKind[SyntaxKind["ObjectKeyword"] = 136] = "ObjectKeyword";
-        SyntaxKind[SyntaxKind["SetKeyword"] = 137] = "SetKeyword";
-        SyntaxKind[SyntaxKind["StringKeyword"] = 138] = "StringKeyword";
-        SyntaxKind[SyntaxKind["SymbolKeyword"] = 139] = "SymbolKeyword";
-        SyntaxKind[SyntaxKind["TypeKeyword"] = 140] = "TypeKeyword";
-        SyntaxKind[SyntaxKind["UndefinedKeyword"] = 141] = "UndefinedKeyword";
-        SyntaxKind[SyntaxKind["UniqueKeyword"] = 142] = "UniqueKeyword";
-        SyntaxKind[SyntaxKind["UnknownKeyword"] = 143] = "UnknownKeyword";
-        SyntaxKind[SyntaxKind["FromKeyword"] = 144] = "FromKeyword";
-        SyntaxKind[SyntaxKind["GlobalKeyword"] = 145] = "GlobalKeyword";
-        SyntaxKind[SyntaxKind["BigIntKeyword"] = 146] = "BigIntKeyword";
-        SyntaxKind[SyntaxKind["OfKeyword"] = 147] = "OfKeyword";
+        SyntaxKind[SyntaxKind["AbstractKeyword"] = 119] = "AbstractKeyword";
+        SyntaxKind[SyntaxKind["AsKeyword"] = 120] = "AsKeyword";
+        SyntaxKind[SyntaxKind["AnyKeyword"] = 121] = "AnyKeyword";
+        SyntaxKind[SyntaxKind["AsyncKeyword"] = 122] = "AsyncKeyword";
+        SyntaxKind[SyntaxKind["AwaitKeyword"] = 123] = "AwaitKeyword";
+        SyntaxKind[SyntaxKind["BooleanKeyword"] = 124] = "BooleanKeyword";
+        SyntaxKind[SyntaxKind["ConstructorKeyword"] = 125] = "ConstructorKeyword";
+        SyntaxKind[SyntaxKind["DeclareKeyword"] = 126] = "DeclareKeyword";
+        SyntaxKind[SyntaxKind["GetKeyword"] = 127] = "GetKeyword";
+        SyntaxKind[SyntaxKind["InferKeyword"] = 128] = "InferKeyword";
+        SyntaxKind[SyntaxKind["IsKeyword"] = 129] = "IsKeyword";
+        SyntaxKind[SyntaxKind["KeyOfKeyword"] = 130] = "KeyOfKeyword";
+        SyntaxKind[SyntaxKind["ModuleKeyword"] = 131] = "ModuleKeyword";
+        SyntaxKind[SyntaxKind["NamespaceKeyword"] = 132] = "NamespaceKeyword";
+        SyntaxKind[SyntaxKind["NeverKeyword"] = 133] = "NeverKeyword";
+        SyntaxKind[SyntaxKind["ReadonlyKeyword"] = 134] = "ReadonlyKeyword";
+        SyntaxKind[SyntaxKind["RequireKeyword"] = 135] = "RequireKeyword";
+        SyntaxKind[SyntaxKind["NumberKeyword"] = 136] = "NumberKeyword";
+        SyntaxKind[SyntaxKind["ObjectKeyword"] = 137] = "ObjectKeyword";
+        SyntaxKind[SyntaxKind["SetKeyword"] = 138] = "SetKeyword";
+        SyntaxKind[SyntaxKind["StringKeyword"] = 139] = "StringKeyword";
+        SyntaxKind[SyntaxKind["SymbolKeyword"] = 140] = "SymbolKeyword";
+        SyntaxKind[SyntaxKind["TypeKeyword"] = 141] = "TypeKeyword";
+        SyntaxKind[SyntaxKind["UndefinedKeyword"] = 142] = "UndefinedKeyword";
+        SyntaxKind[SyntaxKind["UniqueKeyword"] = 143] = "UniqueKeyword";
+        SyntaxKind[SyntaxKind["UnknownKeyword"] = 144] = "UnknownKeyword";
+        SyntaxKind[SyntaxKind["FromKeyword"] = 145] = "FromKeyword";
+        SyntaxKind[SyntaxKind["GlobalKeyword"] = 146] = "GlobalKeyword";
+        SyntaxKind[SyntaxKind["BigIntKeyword"] = 147] = "BigIntKeyword";
+        SyntaxKind[SyntaxKind["OfKeyword"] = 148] = "OfKeyword";
         // Parse tree nodes
         // Names
-        SyntaxKind[SyntaxKind["QualifiedName"] = 148] = "QualifiedName";
-        SyntaxKind[SyntaxKind["ComputedPropertyName"] = 149] = "ComputedPropertyName";
+        SyntaxKind[SyntaxKind["QualifiedName"] = 149] = "QualifiedName";
+        SyntaxKind[SyntaxKind["ComputedPropertyName"] = 150] = "ComputedPropertyName";
         // Signature elements
-        SyntaxKind[SyntaxKind["TypeParameter"] = 150] = "TypeParameter";
-        SyntaxKind[SyntaxKind["Parameter"] = 151] = "Parameter";
-        SyntaxKind[SyntaxKind["Decorator"] = 152] = "Decorator";
+        SyntaxKind[SyntaxKind["TypeParameter"] = 151] = "TypeParameter";
+        SyntaxKind[SyntaxKind["Parameter"] = 152] = "Parameter";
+        SyntaxKind[SyntaxKind["Decorator"] = 153] = "Decorator";
         // TypeMember
-        SyntaxKind[SyntaxKind["PropertySignature"] = 153] = "PropertySignature";
-        SyntaxKind[SyntaxKind["PropertyDeclaration"] = 154] = "PropertyDeclaration";
-        SyntaxKind[SyntaxKind["MethodSignature"] = 155] = "MethodSignature";
-        SyntaxKind[SyntaxKind["MethodDeclaration"] = 156] = "MethodDeclaration";
-        SyntaxKind[SyntaxKind["Constructor"] = 157] = "Constructor";
-        SyntaxKind[SyntaxKind["GetAccessor"] = 158] = "GetAccessor";
-        SyntaxKind[SyntaxKind["SetAccessor"] = 159] = "SetAccessor";
-        SyntaxKind[SyntaxKind["CallSignature"] = 160] = "CallSignature";
-        SyntaxKind[SyntaxKind["ConstructSignature"] = 161] = "ConstructSignature";
-        SyntaxKind[SyntaxKind["IndexSignature"] = 162] = "IndexSignature";
+        SyntaxKind[SyntaxKind["PropertySignature"] = 154] = "PropertySignature";
+        SyntaxKind[SyntaxKind["PropertyDeclaration"] = 155] = "PropertyDeclaration";
+        SyntaxKind[SyntaxKind["MethodSignature"] = 156] = "MethodSignature";
+        SyntaxKind[SyntaxKind["MethodDeclaration"] = 157] = "MethodDeclaration";
+        SyntaxKind[SyntaxKind["Constructor"] = 158] = "Constructor";
+        SyntaxKind[SyntaxKind["GetAccessor"] = 159] = "GetAccessor";
+        SyntaxKind[SyntaxKind["SetAccessor"] = 160] = "SetAccessor";
+        SyntaxKind[SyntaxKind["CallSignature"] = 161] = "CallSignature";
+        SyntaxKind[SyntaxKind["ConstructSignature"] = 162] = "ConstructSignature";
+        SyntaxKind[SyntaxKind["IndexSignature"] = 163] = "IndexSignature";
         // Type
-        SyntaxKind[SyntaxKind["TypePredicate"] = 163] = "TypePredicate";
-        SyntaxKind[SyntaxKind["TypeReference"] = 164] = "TypeReference";
-        SyntaxKind[SyntaxKind["FunctionType"] = 165] = "FunctionType";
-        SyntaxKind[SyntaxKind["ConstructorType"] = 166] = "ConstructorType";
-        SyntaxKind[SyntaxKind["TypeQuery"] = 167] = "TypeQuery";
-        SyntaxKind[SyntaxKind["TypeLiteral"] = 168] = "TypeLiteral";
-        SyntaxKind[SyntaxKind["ArrayType"] = 169] = "ArrayType";
-        SyntaxKind[SyntaxKind["TupleType"] = 170] = "TupleType";
-        SyntaxKind[SyntaxKind["OptionalType"] = 171] = "OptionalType";
-        SyntaxKind[SyntaxKind["RestType"] = 172] = "RestType";
-        SyntaxKind[SyntaxKind["UnionType"] = 173] = "UnionType";
-        SyntaxKind[SyntaxKind["IntersectionType"] = 174] = "IntersectionType";
-        SyntaxKind[SyntaxKind["ConditionalType"] = 175] = "ConditionalType";
-        SyntaxKind[SyntaxKind["InferType"] = 176] = "InferType";
-        SyntaxKind[SyntaxKind["ParenthesizedType"] = 177] = "ParenthesizedType";
-        SyntaxKind[SyntaxKind["ThisType"] = 178] = "ThisType";
-        SyntaxKind[SyntaxKind["TypeOperator"] = 179] = "TypeOperator";
-        SyntaxKind[SyntaxKind["IndexedAccessType"] = 180] = "IndexedAccessType";
-        SyntaxKind[SyntaxKind["MappedType"] = 181] = "MappedType";
-        SyntaxKind[SyntaxKind["LiteralType"] = 182] = "LiteralType";
-        SyntaxKind[SyntaxKind["ImportType"] = 183] = "ImportType";
+        SyntaxKind[SyntaxKind["TypePredicate"] = 164] = "TypePredicate";
+        SyntaxKind[SyntaxKind["TypeReference"] = 165] = "TypeReference";
+        SyntaxKind[SyntaxKind["FunctionType"] = 166] = "FunctionType";
+        SyntaxKind[SyntaxKind["ConstructorType"] = 167] = "ConstructorType";
+        SyntaxKind[SyntaxKind["TypeQuery"] = 168] = "TypeQuery";
+        SyntaxKind[SyntaxKind["TypeLiteral"] = 169] = "TypeLiteral";
+        SyntaxKind[SyntaxKind["ArrayType"] = 170] = "ArrayType";
+        SyntaxKind[SyntaxKind["TupleType"] = 171] = "TupleType";
+        SyntaxKind[SyntaxKind["OptionalType"] = 172] = "OptionalType";
+        SyntaxKind[SyntaxKind["RestType"] = 173] = "RestType";
+        SyntaxKind[SyntaxKind["UnionType"] = 174] = "UnionType";
+        SyntaxKind[SyntaxKind["IntersectionType"] = 175] = "IntersectionType";
+        SyntaxKind[SyntaxKind["ConditionalType"] = 176] = "ConditionalType";
+        SyntaxKind[SyntaxKind["InferType"] = 177] = "InferType";
+        SyntaxKind[SyntaxKind["ParenthesizedType"] = 178] = "ParenthesizedType";
+        SyntaxKind[SyntaxKind["ThisType"] = 179] = "ThisType";
+        SyntaxKind[SyntaxKind["TypeOperator"] = 180] = "TypeOperator";
+        SyntaxKind[SyntaxKind["IndexedAccessType"] = 181] = "IndexedAccessType";
+        SyntaxKind[SyntaxKind["MappedType"] = 182] = "MappedType";
+        SyntaxKind[SyntaxKind["LiteralType"] = 183] = "LiteralType";
+        SyntaxKind[SyntaxKind["ImportType"] = 184] = "ImportType";
         // Binding patterns
-        SyntaxKind[SyntaxKind["ObjectBindingPattern"] = 184] = "ObjectBindingPattern";
-        SyntaxKind[SyntaxKind["ArrayBindingPattern"] = 185] = "ArrayBindingPattern";
-        SyntaxKind[SyntaxKind["BindingElement"] = 186] = "BindingElement";
+        SyntaxKind[SyntaxKind["ObjectBindingPattern"] = 185] = "ObjectBindingPattern";
+        SyntaxKind[SyntaxKind["ArrayBindingPattern"] = 186] = "ArrayBindingPattern";
+        SyntaxKind[SyntaxKind["BindingElement"] = 187] = "BindingElement";
         // Expression
-        SyntaxKind[SyntaxKind["ArrayLiteralExpression"] = 187] = "ArrayLiteralExpression";
-        SyntaxKind[SyntaxKind["ObjectLiteralExpression"] = 188] = "ObjectLiteralExpression";
-        SyntaxKind[SyntaxKind["PropertyAccessExpression"] = 189] = "PropertyAccessExpression";
-        SyntaxKind[SyntaxKind["ElementAccessExpression"] = 190] = "ElementAccessExpression";
-        SyntaxKind[SyntaxKind["CallExpression"] = 191] = "CallExpression";
-        SyntaxKind[SyntaxKind["NewExpression"] = 192] = "NewExpression";
-        SyntaxKind[SyntaxKind["TaggedTemplateExpression"] = 193] = "TaggedTemplateExpression";
-        SyntaxKind[SyntaxKind["TypeAssertionExpression"] = 194] = "TypeAssertionExpression";
-        SyntaxKind[SyntaxKind["ParenthesizedExpression"] = 195] = "ParenthesizedExpression";
-        SyntaxKind[SyntaxKind["FunctionExpression"] = 196] = "FunctionExpression";
-        SyntaxKind[SyntaxKind["ArrowFunction"] = 197] = "ArrowFunction";
-        SyntaxKind[SyntaxKind["DeleteExpression"] = 198] = "DeleteExpression";
-        SyntaxKind[SyntaxKind["TypeOfExpression"] = 199] = "TypeOfExpression";
-        SyntaxKind[SyntaxKind["VoidExpression"] = 200] = "VoidExpression";
-        SyntaxKind[SyntaxKind["AwaitExpression"] = 201] = "AwaitExpression";
-        SyntaxKind[SyntaxKind["PrefixUnaryExpression"] = 202] = "PrefixUnaryExpression";
-        SyntaxKind[SyntaxKind["PostfixUnaryExpression"] = 203] = "PostfixUnaryExpression";
-        SyntaxKind[SyntaxKind["BinaryExpression"] = 204] = "BinaryExpression";
-        SyntaxKind[SyntaxKind["ConditionalExpression"] = 205] = "ConditionalExpression";
-        SyntaxKind[SyntaxKind["TemplateExpression"] = 206] = "TemplateExpression";
-        SyntaxKind[SyntaxKind["YieldExpression"] = 207] = "YieldExpression";
-        SyntaxKind[SyntaxKind["SpreadElement"] = 208] = "SpreadElement";
-        SyntaxKind[SyntaxKind["ClassExpression"] = 209] = "ClassExpression";
-        SyntaxKind[SyntaxKind["OmittedExpression"] = 210] = "OmittedExpression";
-        SyntaxKind[SyntaxKind["ExpressionWithTypeArguments"] = 211] = "ExpressionWithTypeArguments";
-        SyntaxKind[SyntaxKind["AsExpression"] = 212] = "AsExpression";
-        SyntaxKind[SyntaxKind["NonNullExpression"] = 213] = "NonNullExpression";
-        SyntaxKind[SyntaxKind["MetaProperty"] = 214] = "MetaProperty";
-        SyntaxKind[SyntaxKind["SyntheticExpression"] = 215] = "SyntheticExpression";
+        SyntaxKind[SyntaxKind["ArrayLiteralExpression"] = 188] = "ArrayLiteralExpression";
+        SyntaxKind[SyntaxKind["ObjectLiteralExpression"] = 189] = "ObjectLiteralExpression";
+        SyntaxKind[SyntaxKind["PropertyAccessExpression"] = 190] = "PropertyAccessExpression";
+        SyntaxKind[SyntaxKind["ElementAccessExpression"] = 191] = "ElementAccessExpression";
+        SyntaxKind[SyntaxKind["CallExpression"] = 192] = "CallExpression";
+        SyntaxKind[SyntaxKind["NewExpression"] = 193] = "NewExpression";
+        SyntaxKind[SyntaxKind["TaggedTemplateExpression"] = 194] = "TaggedTemplateExpression";
+        SyntaxKind[SyntaxKind["TypeAssertionExpression"] = 195] = "TypeAssertionExpression";
+        SyntaxKind[SyntaxKind["ParenthesizedExpression"] = 196] = "ParenthesizedExpression";
+        SyntaxKind[SyntaxKind["FunctionExpression"] = 197] = "FunctionExpression";
+        SyntaxKind[SyntaxKind["ArrowFunction"] = 198] = "ArrowFunction";
+        SyntaxKind[SyntaxKind["DeleteExpression"] = 199] = "DeleteExpression";
+        SyntaxKind[SyntaxKind["TypeOfExpression"] = 200] = "TypeOfExpression";
+        SyntaxKind[SyntaxKind["VoidExpression"] = 201] = "VoidExpression";
+        SyntaxKind[SyntaxKind["AwaitExpression"] = 202] = "AwaitExpression";
+        SyntaxKind[SyntaxKind["PrefixUnaryExpression"] = 203] = "PrefixUnaryExpression";
+        SyntaxKind[SyntaxKind["PostfixUnaryExpression"] = 204] = "PostfixUnaryExpression";
+        SyntaxKind[SyntaxKind["BinaryExpression"] = 205] = "BinaryExpression";
+        SyntaxKind[SyntaxKind["ConditionalExpression"] = 206] = "ConditionalExpression";
+        SyntaxKind[SyntaxKind["TemplateExpression"] = 207] = "TemplateExpression";
+        SyntaxKind[SyntaxKind["YieldExpression"] = 208] = "YieldExpression";
+        SyntaxKind[SyntaxKind["SpreadElement"] = 209] = "SpreadElement";
+        SyntaxKind[SyntaxKind["ClassExpression"] = 210] = "ClassExpression";
+        SyntaxKind[SyntaxKind["OmittedExpression"] = 211] = "OmittedExpression";
+        SyntaxKind[SyntaxKind["ExpressionWithTypeArguments"] = 212] = "ExpressionWithTypeArguments";
+        SyntaxKind[SyntaxKind["AsExpression"] = 213] = "AsExpression";
+        SyntaxKind[SyntaxKind["NonNullExpression"] = 214] = "NonNullExpression";
+        SyntaxKind[SyntaxKind["MetaProperty"] = 215] = "MetaProperty";
+        SyntaxKind[SyntaxKind["SyntheticExpression"] = 216] = "SyntheticExpression";
         // Misc
-        SyntaxKind[SyntaxKind["TemplateSpan"] = 216] = "TemplateSpan";
-        SyntaxKind[SyntaxKind["SemicolonClassElement"] = 217] = "SemicolonClassElement";
+        SyntaxKind[SyntaxKind["TemplateSpan"] = 217] = "TemplateSpan";
+        SyntaxKind[SyntaxKind["SemicolonClassElement"] = 218] = "SemicolonClassElement";
         // Element
-        SyntaxKind[SyntaxKind["Block"] = 218] = "Block";
-        SyntaxKind[SyntaxKind["VariableStatement"] = 219] = "VariableStatement";
-        SyntaxKind[SyntaxKind["EmptyStatement"] = 220] = "EmptyStatement";
-        SyntaxKind[SyntaxKind["ExpressionStatement"] = 221] = "ExpressionStatement";
-        SyntaxKind[SyntaxKind["IfStatement"] = 222] = "IfStatement";
-        SyntaxKind[SyntaxKind["DoStatement"] = 223] = "DoStatement";
-        SyntaxKind[SyntaxKind["WhileStatement"] = 224] = "WhileStatement";
-        SyntaxKind[SyntaxKind["ForStatement"] = 225] = "ForStatement";
-        SyntaxKind[SyntaxKind["ForInStatement"] = 226] = "ForInStatement";
-        SyntaxKind[SyntaxKind["ForOfStatement"] = 227] = "ForOfStatement";
-        SyntaxKind[SyntaxKind["ContinueStatement"] = 228] = "ContinueStatement";
-        SyntaxKind[SyntaxKind["BreakStatement"] = 229] = "BreakStatement";
-        SyntaxKind[SyntaxKind["ReturnStatement"] = 230] = "ReturnStatement";
-        SyntaxKind[SyntaxKind["WithStatement"] = 231] = "WithStatement";
-        SyntaxKind[SyntaxKind["SwitchStatement"] = 232] = "SwitchStatement";
-        SyntaxKind[SyntaxKind["LabeledStatement"] = 233] = "LabeledStatement";
-        SyntaxKind[SyntaxKind["ThrowStatement"] = 234] = "ThrowStatement";
-        SyntaxKind[SyntaxKind["TryStatement"] = 235] = "TryStatement";
-        SyntaxKind[SyntaxKind["DebuggerStatement"] = 236] = "DebuggerStatement";
-        SyntaxKind[SyntaxKind["VariableDeclaration"] = 237] = "VariableDeclaration";
-        SyntaxKind[SyntaxKind["VariableDeclarationList"] = 238] = "VariableDeclarationList";
-        SyntaxKind[SyntaxKind["FunctionDeclaration"] = 239] = "FunctionDeclaration";
-        SyntaxKind[SyntaxKind["ClassDeclaration"] = 240] = "ClassDeclaration";
-        SyntaxKind[SyntaxKind["InterfaceDeclaration"] = 241] = "InterfaceDeclaration";
-        SyntaxKind[SyntaxKind["TypeAliasDeclaration"] = 242] = "TypeAliasDeclaration";
-        SyntaxKind[SyntaxKind["EnumDeclaration"] = 243] = "EnumDeclaration";
-        SyntaxKind[SyntaxKind["ModuleDeclaration"] = 244] = "ModuleDeclaration";
-        SyntaxKind[SyntaxKind["ModuleBlock"] = 245] = "ModuleBlock";
-        SyntaxKind[SyntaxKind["CaseBlock"] = 246] = "CaseBlock";
-        SyntaxKind[SyntaxKind["NamespaceExportDeclaration"] = 247] = "NamespaceExportDeclaration";
-        SyntaxKind[SyntaxKind["ImportEqualsDeclaration"] = 248] = "ImportEqualsDeclaration";
-        SyntaxKind[SyntaxKind["ImportDeclaration"] = 249] = "ImportDeclaration";
-        SyntaxKind[SyntaxKind["ImportClause"] = 250] = "ImportClause";
-        SyntaxKind[SyntaxKind["NamespaceImport"] = 251] = "NamespaceImport";
-        SyntaxKind[SyntaxKind["NamedImports"] = 252] = "NamedImports";
-        SyntaxKind[SyntaxKind["ImportSpecifier"] = 253] = "ImportSpecifier";
-        SyntaxKind[SyntaxKind["ExportAssignment"] = 254] = "ExportAssignment";
-        SyntaxKind[SyntaxKind["ExportDeclaration"] = 255] = "ExportDeclaration";
-        SyntaxKind[SyntaxKind["NamedExports"] = 256] = "NamedExports";
-        SyntaxKind[SyntaxKind["ExportSpecifier"] = 257] = "ExportSpecifier";
-        SyntaxKind[SyntaxKind["MissingDeclaration"] = 258] = "MissingDeclaration";
+        SyntaxKind[SyntaxKind["Block"] = 219] = "Block";
+        SyntaxKind[SyntaxKind["VariableStatement"] = 220] = "VariableStatement";
+        SyntaxKind[SyntaxKind["EmptyStatement"] = 221] = "EmptyStatement";
+        SyntaxKind[SyntaxKind["ExpressionStatement"] = 222] = "ExpressionStatement";
+        SyntaxKind[SyntaxKind["IfStatement"] = 223] = "IfStatement";
+        SyntaxKind[SyntaxKind["DoStatement"] = 224] = "DoStatement";
+        SyntaxKind[SyntaxKind["WhileStatement"] = 225] = "WhileStatement";
+        SyntaxKind[SyntaxKind["ForStatement"] = 226] = "ForStatement";
+        SyntaxKind[SyntaxKind["ForInStatement"] = 227] = "ForInStatement";
+        SyntaxKind[SyntaxKind["ForOfStatement"] = 228] = "ForOfStatement";
+        SyntaxKind[SyntaxKind["ContinueStatement"] = 229] = "ContinueStatement";
+        SyntaxKind[SyntaxKind["BreakStatement"] = 230] = "BreakStatement";
+        SyntaxKind[SyntaxKind["ReturnStatement"] = 231] = "ReturnStatement";
+        SyntaxKind[SyntaxKind["WithStatement"] = 232] = "WithStatement";
+        SyntaxKind[SyntaxKind["SwitchStatement"] = 233] = "SwitchStatement";
+        SyntaxKind[SyntaxKind["LabeledStatement"] = 234] = "LabeledStatement";
+        SyntaxKind[SyntaxKind["ThrowStatement"] = 235] = "ThrowStatement";
+        SyntaxKind[SyntaxKind["TryStatement"] = 236] = "TryStatement";
+        SyntaxKind[SyntaxKind["DebuggerStatement"] = 237] = "DebuggerStatement";
+        SyntaxKind[SyntaxKind["VariableDeclaration"] = 238] = "VariableDeclaration";
+        SyntaxKind[SyntaxKind["VariableDeclarationList"] = 239] = "VariableDeclarationList";
+        SyntaxKind[SyntaxKind["FunctionDeclaration"] = 240] = "FunctionDeclaration";
+        SyntaxKind[SyntaxKind["ClassDeclaration"] = 241] = "ClassDeclaration";
+        SyntaxKind[SyntaxKind["InterfaceDeclaration"] = 242] = "InterfaceDeclaration";
+        SyntaxKind[SyntaxKind["TypeAliasDeclaration"] = 243] = "TypeAliasDeclaration";
+        SyntaxKind[SyntaxKind["EnumDeclaration"] = 244] = "EnumDeclaration";
+        SyntaxKind[SyntaxKind["ModuleDeclaration"] = 245] = "ModuleDeclaration";
+        SyntaxKind[SyntaxKind["ModuleBlock"] = 246] = "ModuleBlock";
+        SyntaxKind[SyntaxKind["CaseBlock"] = 247] = "CaseBlock";
+        SyntaxKind[SyntaxKind["NamespaceExportDeclaration"] = 248] = "NamespaceExportDeclaration";
+        SyntaxKind[SyntaxKind["ImportEqualsDeclaration"] = 249] = "ImportEqualsDeclaration";
+        SyntaxKind[SyntaxKind["ImportDeclaration"] = 250] = "ImportDeclaration";
+        SyntaxKind[SyntaxKind["ImportClause"] = 251] = "ImportClause";
+        SyntaxKind[SyntaxKind["NamespaceImport"] = 252] = "NamespaceImport";
+        SyntaxKind[SyntaxKind["NamedImports"] = 253] = "NamedImports";
+        SyntaxKind[SyntaxKind["ImportSpecifier"] = 254] = "ImportSpecifier";
+        SyntaxKind[SyntaxKind["ExportAssignment"] = 255] = "ExportAssignment";
+        SyntaxKind[SyntaxKind["ExportDeclaration"] = 256] = "ExportDeclaration";
+        SyntaxKind[SyntaxKind["NamedExports"] = 257] = "NamedExports";
+        SyntaxKind[SyntaxKind["ExportSpecifier"] = 258] = "ExportSpecifier";
+        SyntaxKind[SyntaxKind["MissingDeclaration"] = 259] = "MissingDeclaration";
         // Module references
-        SyntaxKind[SyntaxKind["ExternalModuleReference"] = 259] = "ExternalModuleReference";
+        SyntaxKind[SyntaxKind["ExternalModuleReference"] = 260] = "ExternalModuleReference";
         // JSX
-        SyntaxKind[SyntaxKind["JsxElement"] = 260] = "JsxElement";
-        SyntaxKind[SyntaxKind["JsxSelfClosingElement"] = 261] = "JsxSelfClosingElement";
-        SyntaxKind[SyntaxKind["JsxOpeningElement"] = 262] = "JsxOpeningElement";
-        SyntaxKind[SyntaxKind["JsxClosingElement"] = 263] = "JsxClosingElement";
-        SyntaxKind[SyntaxKind["JsxFragment"] = 264] = "JsxFragment";
-        SyntaxKind[SyntaxKind["JsxOpeningFragment"] = 265] = "JsxOpeningFragment";
-        SyntaxKind[SyntaxKind["JsxClosingFragment"] = 266] = "JsxClosingFragment";
-        SyntaxKind[SyntaxKind["JsxAttribute"] = 267] = "JsxAttribute";
-        SyntaxKind[SyntaxKind["JsxAttributes"] = 268] = "JsxAttributes";
-        SyntaxKind[SyntaxKind["JsxSpreadAttribute"] = 269] = "JsxSpreadAttribute";
-        SyntaxKind[SyntaxKind["JsxExpression"] = 270] = "JsxExpression";
+        SyntaxKind[SyntaxKind["JsxElement"] = 261] = "JsxElement";
+        SyntaxKind[SyntaxKind["JsxSelfClosingElement"] = 262] = "JsxSelfClosingElement";
+        SyntaxKind[SyntaxKind["JsxOpeningElement"] = 263] = "JsxOpeningElement";
+        SyntaxKind[SyntaxKind["JsxClosingElement"] = 264] = "JsxClosingElement";
+        SyntaxKind[SyntaxKind["JsxFragment"] = 265] = "JsxFragment";
+        SyntaxKind[SyntaxKind["JsxOpeningFragment"] = 266] = "JsxOpeningFragment";
+        SyntaxKind[SyntaxKind["JsxClosingFragment"] = 267] = "JsxClosingFragment";
+        SyntaxKind[SyntaxKind["JsxAttribute"] = 268] = "JsxAttribute";
+        SyntaxKind[SyntaxKind["JsxAttributes"] = 269] = "JsxAttributes";
+        SyntaxKind[SyntaxKind["JsxSpreadAttribute"] = 270] = "JsxSpreadAttribute";
+        SyntaxKind[SyntaxKind["JsxExpression"] = 271] = "JsxExpression";
         // Clauses
-        SyntaxKind[SyntaxKind["CaseClause"] = 271] = "CaseClause";
-        SyntaxKind[SyntaxKind["DefaultClause"] = 272] = "DefaultClause";
-        SyntaxKind[SyntaxKind["HeritageClause"] = 273] = "HeritageClause";
-        SyntaxKind[SyntaxKind["CatchClause"] = 274] = "CatchClause";
+        SyntaxKind[SyntaxKind["CaseClause"] = 272] = "CaseClause";
+        SyntaxKind[SyntaxKind["DefaultClause"] = 273] = "DefaultClause";
+        SyntaxKind[SyntaxKind["HeritageClause"] = 274] = "HeritageClause";
+        SyntaxKind[SyntaxKind["CatchClause"] = 275] = "CatchClause";
         // Property assignments
-        SyntaxKind[SyntaxKind["PropertyAssignment"] = 275] = "PropertyAssignment";
-        SyntaxKind[SyntaxKind["ShorthandPropertyAssignment"] = 276] = "ShorthandPropertyAssignment";
-        SyntaxKind[SyntaxKind["SpreadAssignment"] = 277] = "SpreadAssignment";
+        SyntaxKind[SyntaxKind["PropertyAssignment"] = 276] = "PropertyAssignment";
+        SyntaxKind[SyntaxKind["ShorthandPropertyAssignment"] = 277] = "ShorthandPropertyAssignment";
+        SyntaxKind[SyntaxKind["SpreadAssignment"] = 278] = "SpreadAssignment";
         // Enum
-        SyntaxKind[SyntaxKind["EnumMember"] = 278] = "EnumMember";
+        SyntaxKind[SyntaxKind["EnumMember"] = 279] = "EnumMember";
         // Unparsed
-        SyntaxKind[SyntaxKind["UnparsedPrologue"] = 279] = "UnparsedPrologue";
-        SyntaxKind[SyntaxKind["UnparsedPrepend"] = 280] = "UnparsedPrepend";
-        SyntaxKind[SyntaxKind["UnparsedText"] = 281] = "UnparsedText";
-        SyntaxKind[SyntaxKind["UnparsedInternalText"] = 282] = "UnparsedInternalText";
-        SyntaxKind[SyntaxKind["UnparsedSyntheticReference"] = 283] = "UnparsedSyntheticReference";
+        SyntaxKind[SyntaxKind["UnparsedPrologue"] = 280] = "UnparsedPrologue";
+        SyntaxKind[SyntaxKind["UnparsedPrepend"] = 281] = "UnparsedPrepend";
+        SyntaxKind[SyntaxKind["UnparsedText"] = 282] = "UnparsedText";
+        SyntaxKind[SyntaxKind["UnparsedInternalText"] = 283] = "UnparsedInternalText";
+        SyntaxKind[SyntaxKind["UnparsedSyntheticReference"] = 284] = "UnparsedSyntheticReference";
         // Top-level nodes
-        SyntaxKind[SyntaxKind["SourceFile"] = 284] = "SourceFile";
-        SyntaxKind[SyntaxKind["Bundle"] = 285] = "Bundle";
-        SyntaxKind[SyntaxKind["UnparsedSource"] = 286] = "UnparsedSource";
-        SyntaxKind[SyntaxKind["InputFiles"] = 287] = "InputFiles";
+        SyntaxKind[SyntaxKind["SourceFile"] = 285] = "SourceFile";
+        SyntaxKind[SyntaxKind["Bundle"] = 286] = "Bundle";
+        SyntaxKind[SyntaxKind["UnparsedSource"] = 287] = "UnparsedSource";
+        SyntaxKind[SyntaxKind["InputFiles"] = 288] = "InputFiles";
         // JSDoc nodes
-        SyntaxKind[SyntaxKind["JSDocTypeExpression"] = 288] = "JSDocTypeExpression";
+        SyntaxKind[SyntaxKind["JSDocTypeExpression"] = 289] = "JSDocTypeExpression";
         // The * type
-        SyntaxKind[SyntaxKind["JSDocAllType"] = 289] = "JSDocAllType";
+        SyntaxKind[SyntaxKind["JSDocAllType"] = 290] = "JSDocAllType";
         // The ? type
-        SyntaxKind[SyntaxKind["JSDocUnknownType"] = 290] = "JSDocUnknownType";
-        SyntaxKind[SyntaxKind["JSDocNullableType"] = 291] = "JSDocNullableType";
-        SyntaxKind[SyntaxKind["JSDocNonNullableType"] = 292] = "JSDocNonNullableType";
-        SyntaxKind[SyntaxKind["JSDocOptionalType"] = 293] = "JSDocOptionalType";
-        SyntaxKind[SyntaxKind["JSDocFunctionType"] = 294] = "JSDocFunctionType";
-        SyntaxKind[SyntaxKind["JSDocVariadicType"] = 295] = "JSDocVariadicType";
-        SyntaxKind[SyntaxKind["JSDocComment"] = 296] = "JSDocComment";
-        SyntaxKind[SyntaxKind["JSDocTypeLiteral"] = 297] = "JSDocTypeLiteral";
-        SyntaxKind[SyntaxKind["JSDocSignature"] = 298] = "JSDocSignature";
-        SyntaxKind[SyntaxKind["JSDocTag"] = 299] = "JSDocTag";
-        SyntaxKind[SyntaxKind["JSDocAugmentsTag"] = 300] = "JSDocAugmentsTag";
-        SyntaxKind[SyntaxKind["JSDocClassTag"] = 301] = "JSDocClassTag";
-        SyntaxKind[SyntaxKind["JSDocCallbackTag"] = 302] = "JSDocCallbackTag";
-        SyntaxKind[SyntaxKind["JSDocEnumTag"] = 303] = "JSDocEnumTag";
-        SyntaxKind[SyntaxKind["JSDocParameterTag"] = 304] = "JSDocParameterTag";
-        SyntaxKind[SyntaxKind["JSDocReturnTag"] = 305] = "JSDocReturnTag";
-        SyntaxKind[SyntaxKind["JSDocThisTag"] = 306] = "JSDocThisTag";
-        SyntaxKind[SyntaxKind["JSDocTypeTag"] = 307] = "JSDocTypeTag";
-        SyntaxKind[SyntaxKind["JSDocTemplateTag"] = 308] = "JSDocTemplateTag";
-        SyntaxKind[SyntaxKind["JSDocTypedefTag"] = 309] = "JSDocTypedefTag";
-        SyntaxKind[SyntaxKind["JSDocPropertyTag"] = 310] = "JSDocPropertyTag";
+        SyntaxKind[SyntaxKind["JSDocUnknownType"] = 291] = "JSDocUnknownType";
+        SyntaxKind[SyntaxKind["JSDocNullableType"] = 292] = "JSDocNullableType";
+        SyntaxKind[SyntaxKind["JSDocNonNullableType"] = 293] = "JSDocNonNullableType";
+        SyntaxKind[SyntaxKind["JSDocOptionalType"] = 294] = "JSDocOptionalType";
+        SyntaxKind[SyntaxKind["JSDocFunctionType"] = 295] = "JSDocFunctionType";
+        SyntaxKind[SyntaxKind["JSDocVariadicType"] = 296] = "JSDocVariadicType";
+        SyntaxKind[SyntaxKind["JSDocComment"] = 297] = "JSDocComment";
+        SyntaxKind[SyntaxKind["JSDocTypeLiteral"] = 298] = "JSDocTypeLiteral";
+        SyntaxKind[SyntaxKind["JSDocSignature"] = 299] = "JSDocSignature";
+        SyntaxKind[SyntaxKind["JSDocTag"] = 300] = "JSDocTag";
+        SyntaxKind[SyntaxKind["JSDocAugmentsTag"] = 301] = "JSDocAugmentsTag";
+        SyntaxKind[SyntaxKind["JSDocAuthorTag"] = 302] = "JSDocAuthorTag";
+        SyntaxKind[SyntaxKind["JSDocClassTag"] = 303] = "JSDocClassTag";
+        SyntaxKind[SyntaxKind["JSDocCallbackTag"] = 304] = "JSDocCallbackTag";
+        SyntaxKind[SyntaxKind["JSDocEnumTag"] = 305] = "JSDocEnumTag";
+        SyntaxKind[SyntaxKind["JSDocParameterTag"] = 306] = "JSDocParameterTag";
+        SyntaxKind[SyntaxKind["JSDocReturnTag"] = 307] = "JSDocReturnTag";
+        SyntaxKind[SyntaxKind["JSDocThisTag"] = 308] = "JSDocThisTag";
+        SyntaxKind[SyntaxKind["JSDocTypeTag"] = 309] = "JSDocTypeTag";
+        SyntaxKind[SyntaxKind["JSDocTemplateTag"] = 310] = "JSDocTemplateTag";
+        SyntaxKind[SyntaxKind["JSDocTypedefTag"] = 311] = "JSDocTypedefTag";
+        SyntaxKind[SyntaxKind["JSDocPropertyTag"] = 312] = "JSDocPropertyTag";
         // Synthesized list
-        SyntaxKind[SyntaxKind["SyntaxList"] = 311] = "SyntaxList";
+        SyntaxKind[SyntaxKind["SyntaxList"] = 313] = "SyntaxList";
         // Transformation nodes
-        SyntaxKind[SyntaxKind["NotEmittedStatement"] = 312] = "NotEmittedStatement";
-        SyntaxKind[SyntaxKind["PartiallyEmittedExpression"] = 313] = "PartiallyEmittedExpression";
-        SyntaxKind[SyntaxKind["CommaListExpression"] = 314] = "CommaListExpression";
-        SyntaxKind[SyntaxKind["MergeDeclarationMarker"] = 315] = "MergeDeclarationMarker";
-        SyntaxKind[SyntaxKind["EndOfDeclarationMarker"] = 316] = "EndOfDeclarationMarker";
+        SyntaxKind[SyntaxKind["NotEmittedStatement"] = 314] = "NotEmittedStatement";
+        SyntaxKind[SyntaxKind["PartiallyEmittedExpression"] = 315] = "PartiallyEmittedExpression";
+        SyntaxKind[SyntaxKind["CommaListExpression"] = 316] = "CommaListExpression";
+        SyntaxKind[SyntaxKind["MergeDeclarationMarker"] = 317] = "MergeDeclarationMarker";
+        SyntaxKind[SyntaxKind["EndOfDeclarationMarker"] = 318] = "EndOfDeclarationMarker";
         // Enum value count
-        SyntaxKind[SyntaxKind["Count"] = 317] = "Count";
+        SyntaxKind[SyntaxKind["Count"] = 319] = "Count";
         // Markers
-        SyntaxKind[SyntaxKind["FirstAssignment"] = 59] = "FirstAssignment";
-        SyntaxKind[SyntaxKind["LastAssignment"] = 71] = "LastAssignment";
-        SyntaxKind[SyntaxKind["FirstCompoundAssignment"] = 60] = "FirstCompoundAssignment";
-        SyntaxKind[SyntaxKind["LastCompoundAssignment"] = 71] = "LastCompoundAssignment";
-        SyntaxKind[SyntaxKind["FirstReservedWord"] = 73] = "FirstReservedWord";
-        SyntaxKind[SyntaxKind["LastReservedWord"] = 108] = "LastReservedWord";
-        SyntaxKind[SyntaxKind["FirstKeyword"] = 73] = "FirstKeyword";
-        SyntaxKind[SyntaxKind["LastKeyword"] = 147] = "LastKeyword";
-        SyntaxKind[SyntaxKind["FirstFutureReservedWord"] = 109] = "FirstFutureReservedWord";
-        SyntaxKind[SyntaxKind["LastFutureReservedWord"] = 117] = "LastFutureReservedWord";
-        SyntaxKind[SyntaxKind["FirstTypeNode"] = 163] = "FirstTypeNode";
-        SyntaxKind[SyntaxKind["LastTypeNode"] = 183] = "LastTypeNode";
+        SyntaxKind[SyntaxKind["FirstAssignment"] = 60] = "FirstAssignment";
+        SyntaxKind[SyntaxKind["LastAssignment"] = 72] = "LastAssignment";
+        SyntaxKind[SyntaxKind["FirstCompoundAssignment"] = 61] = "FirstCompoundAssignment";
+        SyntaxKind[SyntaxKind["LastCompoundAssignment"] = 72] = "LastCompoundAssignment";
+        SyntaxKind[SyntaxKind["FirstReservedWord"] = 74] = "FirstReservedWord";
+        SyntaxKind[SyntaxKind["LastReservedWord"] = 109] = "LastReservedWord";
+        SyntaxKind[SyntaxKind["FirstKeyword"] = 74] = "FirstKeyword";
+        SyntaxKind[SyntaxKind["LastKeyword"] = 148] = "LastKeyword";
+        SyntaxKind[SyntaxKind["FirstFutureReservedWord"] = 110] = "FirstFutureReservedWord";
+        SyntaxKind[SyntaxKind["LastFutureReservedWord"] = 118] = "LastFutureReservedWord";
+        SyntaxKind[SyntaxKind["FirstTypeNode"] = 164] = "FirstTypeNode";
+        SyntaxKind[SyntaxKind["LastTypeNode"] = 184] = "LastTypeNode";
         SyntaxKind[SyntaxKind["FirstPunctuation"] = 18] = "FirstPunctuation";
-        SyntaxKind[SyntaxKind["LastPunctuation"] = 71] = "LastPunctuation";
+        SyntaxKind[SyntaxKind["LastPunctuation"] = 72] = "LastPunctuation";
         SyntaxKind[SyntaxKind["FirstToken"] = 0] = "FirstToken";
-        SyntaxKind[SyntaxKind["LastToken"] = 147] = "LastToken";
+        SyntaxKind[SyntaxKind["LastToken"] = 148] = "LastToken";
         SyntaxKind[SyntaxKind["FirstTriviaToken"] = 2] = "FirstTriviaToken";
         SyntaxKind[SyntaxKind["LastTriviaToken"] = 7] = "LastTriviaToken";
         SyntaxKind[SyntaxKind["FirstLiteralToken"] = 8] = "FirstLiteralToken";
@@ -2953,14 +3111,14 @@ var ts;
         SyntaxKind[SyntaxKind["FirstTemplateToken"] = 14] = "FirstTemplateToken";
         SyntaxKind[SyntaxKind["LastTemplateToken"] = 17] = "LastTemplateToken";
         SyntaxKind[SyntaxKind["FirstBinaryOperator"] = 28] = "FirstBinaryOperator";
-        SyntaxKind[SyntaxKind["LastBinaryOperator"] = 71] = "LastBinaryOperator";
-        SyntaxKind[SyntaxKind["FirstNode"] = 148] = "FirstNode";
-        SyntaxKind[SyntaxKind["FirstJSDocNode"] = 288] = "FirstJSDocNode";
-        SyntaxKind[SyntaxKind["LastJSDocNode"] = 310] = "LastJSDocNode";
-        SyntaxKind[SyntaxKind["FirstJSDocTagNode"] = 299] = "FirstJSDocTagNode";
-        SyntaxKind[SyntaxKind["LastJSDocTagNode"] = 310] = "LastJSDocTagNode";
-        /* @internal */ SyntaxKind[SyntaxKind["FirstContextualKeyword"] = 118] = "FirstContextualKeyword";
-        /* @internal */ SyntaxKind[SyntaxKind["LastContextualKeyword"] = 147] = "LastContextualKeyword";
+        SyntaxKind[SyntaxKind["LastBinaryOperator"] = 72] = "LastBinaryOperator";
+        SyntaxKind[SyntaxKind["FirstNode"] = 149] = "FirstNode";
+        SyntaxKind[SyntaxKind["FirstJSDocNode"] = 289] = "FirstJSDocNode";
+        SyntaxKind[SyntaxKind["LastJSDocNode"] = 312] = "LastJSDocNode";
+        SyntaxKind[SyntaxKind["FirstJSDocTagNode"] = 300] = "FirstJSDocTagNode";
+        SyntaxKind[SyntaxKind["LastJSDocTagNode"] = 312] = "LastJSDocTagNode";
+        /* @internal */ SyntaxKind[SyntaxKind["FirstContextualKeyword"] = 119] = "FirstContextualKeyword";
+        /* @internal */ SyntaxKind[SyntaxKind["LastContextualKeyword"] = 148] = "LastContextualKeyword";
     })(SyntaxKind = ts.SyntaxKind || (ts.SyntaxKind = {}));
     var NodeFlags;
     (function (NodeFlags) {
@@ -3103,6 +3261,8 @@ var ts;
         FlowFlags[FlowFlags["Shared"] = 1024] = "Shared";
         FlowFlags[FlowFlags["PreFinally"] = 2048] = "PreFinally";
         FlowFlags[FlowFlags["AfterFinally"] = 4096] = "AfterFinally";
+        /** @internal */
+        FlowFlags[FlowFlags["Cached"] = 8192] = "Cached";
         FlowFlags[FlowFlags["Label"] = 12] = "Label";
         FlowFlags[FlowFlags["Condition"] = 96] = "Condition";
     })(FlowFlags = ts.FlowFlags || (ts.FlowFlags = {}));
@@ -3130,6 +3290,8 @@ var ts;
         ExitStatus[ExitStatus["DiagnosticsPresent_OutputsSkipped"] = 1] = "DiagnosticsPresent_OutputsSkipped";
         // Diagnostics were produced and outputs were generated in spite of them.
         ExitStatus[ExitStatus["DiagnosticsPresent_OutputsGenerated"] = 2] = "DiagnosticsPresent_OutputsGenerated";
+        // When build skipped because passed in project is invalid
+        ExitStatus[ExitStatus["InvalidProject_OutputsSkipped"] = 3] = "InvalidProject_OutputsSkipped";
     })(ExitStatus = ts.ExitStatus || (ts.ExitStatus = {}));
     /* @internal */
     var UnionReduction;
@@ -3355,19 +3517,22 @@ var ts;
         CheckFlags[CheckFlags["SyntheticProperty"] = 2] = "SyntheticProperty";
         CheckFlags[CheckFlags["SyntheticMethod"] = 4] = "SyntheticMethod";
         CheckFlags[CheckFlags["Readonly"] = 8] = "Readonly";
-        CheckFlags[CheckFlags["Partial"] = 16] = "Partial";
-        CheckFlags[CheckFlags["HasNonUniformType"] = 32] = "HasNonUniformType";
-        CheckFlags[CheckFlags["HasLiteralType"] = 64] = "HasLiteralType";
-        CheckFlags[CheckFlags["ContainsPublic"] = 128] = "ContainsPublic";
-        CheckFlags[CheckFlags["ContainsProtected"] = 256] = "ContainsProtected";
-        CheckFlags[CheckFlags["ContainsPrivate"] = 512] = "ContainsPrivate";
-        CheckFlags[CheckFlags["ContainsStatic"] = 1024] = "ContainsStatic";
-        CheckFlags[CheckFlags["Late"] = 2048] = "Late";
-        CheckFlags[CheckFlags["ReverseMapped"] = 4096] = "ReverseMapped";
-        CheckFlags[CheckFlags["OptionalParameter"] = 8192] = "OptionalParameter";
-        CheckFlags[CheckFlags["RestParameter"] = 16384] = "RestParameter";
+        CheckFlags[CheckFlags["ReadPartial"] = 16] = "ReadPartial";
+        CheckFlags[CheckFlags["WritePartial"] = 32] = "WritePartial";
+        CheckFlags[CheckFlags["HasNonUniformType"] = 64] = "HasNonUniformType";
+        CheckFlags[CheckFlags["HasLiteralType"] = 128] = "HasLiteralType";
+        CheckFlags[CheckFlags["ContainsPublic"] = 256] = "ContainsPublic";
+        CheckFlags[CheckFlags["ContainsProtected"] = 512] = "ContainsProtected";
+        CheckFlags[CheckFlags["ContainsPrivate"] = 1024] = "ContainsPrivate";
+        CheckFlags[CheckFlags["ContainsStatic"] = 2048] = "ContainsStatic";
+        CheckFlags[CheckFlags["Late"] = 4096] = "Late";
+        CheckFlags[CheckFlags["ReverseMapped"] = 8192] = "ReverseMapped";
+        CheckFlags[CheckFlags["OptionalParameter"] = 16384] = "OptionalParameter";
+        CheckFlags[CheckFlags["RestParameter"] = 32768] = "RestParameter";
+        CheckFlags[CheckFlags["DeferredType"] = 65536] = "DeferredType";
         CheckFlags[CheckFlags["Synthetic"] = 6] = "Synthetic";
-        CheckFlags[CheckFlags["Discriminant"] = 96] = "Discriminant";
+        CheckFlags[CheckFlags["Discriminant"] = 192] = "Discriminant";
+        CheckFlags[CheckFlags["Partial"] = 48] = "Partial";
     })(CheckFlags = ts.CheckFlags || (ts.CheckFlags = {}));
     var InternalSymbolName;
     (function (InternalSymbolName) {
@@ -3477,7 +3642,9 @@ var ts;
         TypeFlags[TypeFlags["Instantiable"] = 63176704] = "Instantiable";
         TypeFlags[TypeFlags["StructuredOrInstantiable"] = 66846720] = "StructuredOrInstantiable";
         /* @internal */
-        TypeFlags[TypeFlags["ObjectFlagsType"] = 3768320] = "ObjectFlagsType";
+        TypeFlags[TypeFlags["ObjectFlagsType"] = 3899392] = "ObjectFlagsType";
+        /* @internal */
+        TypeFlags[TypeFlags["Simplifiable"] = 25165824] = "Simplifiable";
         // 'Narrowable' types are types where narrowing actually narrows.
         // This *should* be every type other than null, undefined, void, and never
         TypeFlags[TypeFlags["Narrowable"] = 133970943] = "Narrowable";
@@ -3486,7 +3653,7 @@ var ts;
         TypeFlags[TypeFlags["NotPrimitiveUnion"] = 66994211] = "NotPrimitiveUnion";
         // The following flags are aggregated during union and intersection type construction
         /* @internal */
-        TypeFlags[TypeFlags["IncludesMask"] = 1835007] = "IncludesMask";
+        TypeFlags[TypeFlags["IncludesMask"] = 68943871] = "IncludesMask";
         // The following flags are used for different purposes during union and intersection type construction
         /* @internal */
         TypeFlags[TypeFlags["IncludesStructuredOrInstantiable"] = 262144] = "IncludesStructuredOrInstantiable";
@@ -3518,29 +3685,34 @@ var ts;
         ObjectFlags[ObjectFlags["MarkerType"] = 8192] = "MarkerType";
         ObjectFlags[ObjectFlags["JSLiteral"] = 16384] = "JSLiteral";
         ObjectFlags[ObjectFlags["FreshLiteral"] = 32768] = "FreshLiteral";
+        ObjectFlags[ObjectFlags["ArrayLiteral"] = 65536] = "ArrayLiteral";
         /* @internal */
-        ObjectFlags[ObjectFlags["PrimitiveUnion"] = 65536] = "PrimitiveUnion";
+        ObjectFlags[ObjectFlags["PrimitiveUnion"] = 131072] = "PrimitiveUnion";
         /* @internal */
-        ObjectFlags[ObjectFlags["ContainsWideningType"] = 131072] = "ContainsWideningType";
+        ObjectFlags[ObjectFlags["ContainsWideningType"] = 262144] = "ContainsWideningType";
         /* @internal */
-        ObjectFlags[ObjectFlags["ContainsObjectLiteral"] = 262144] = "ContainsObjectLiteral";
+        ObjectFlags[ObjectFlags["ContainsObjectOrArrayLiteral"] = 524288] = "ContainsObjectOrArrayLiteral";
         /* @internal */
-        ObjectFlags[ObjectFlags["ContainsAnyFunctionType"] = 524288] = "ContainsAnyFunctionType";
+        ObjectFlags[ObjectFlags["NonInferrableType"] = 1048576] = "NonInferrableType";
         ObjectFlags[ObjectFlags["ClassOrInterface"] = 3] = "ClassOrInterface";
         /* @internal */
-        ObjectFlags[ObjectFlags["RequiresWidening"] = 393216] = "RequiresWidening";
+        ObjectFlags[ObjectFlags["RequiresWidening"] = 786432] = "RequiresWidening";
         /* @internal */
-        ObjectFlags[ObjectFlags["PropagatingFlags"] = 917504] = "PropagatingFlags";
+        ObjectFlags[ObjectFlags["PropagatingFlags"] = 1835008] = "PropagatingFlags";
     })(ObjectFlags = ts.ObjectFlags || (ts.ObjectFlags = {}));
     /* @internal */
-    var Variance;
-    (function (Variance) {
-        Variance[Variance["Invariant"] = 0] = "Invariant";
-        Variance[Variance["Covariant"] = 1] = "Covariant";
-        Variance[Variance["Contravariant"] = 2] = "Contravariant";
-        Variance[Variance["Bivariant"] = 3] = "Bivariant";
-        Variance[Variance["Independent"] = 4] = "Independent";
-    })(Variance = ts.Variance || (ts.Variance = {}));
+    var VarianceFlags;
+    (function (VarianceFlags) {
+        VarianceFlags[VarianceFlags["Invariant"] = 0] = "Invariant";
+        VarianceFlags[VarianceFlags["Covariant"] = 1] = "Covariant";
+        VarianceFlags[VarianceFlags["Contravariant"] = 2] = "Contravariant";
+        VarianceFlags[VarianceFlags["Bivariant"] = 3] = "Bivariant";
+        VarianceFlags[VarianceFlags["Independent"] = 4] = "Independent";
+        VarianceFlags[VarianceFlags["VarianceMask"] = 7] = "VarianceMask";
+        VarianceFlags[VarianceFlags["Unmeasurable"] = 8] = "Unmeasurable";
+        VarianceFlags[VarianceFlags["Unreliable"] = 16] = "Unreliable";
+        VarianceFlags[VarianceFlags["AllowsStructuralFallback"] = 24] = "AllowsStructuralFallback";
+    })(VarianceFlags = ts.VarianceFlags || (ts.VarianceFlags = {}));
     /* @internal */
     var JsxReferenceKind;
     (function (JsxReferenceKind) {
@@ -3562,12 +3734,13 @@ var ts;
     (function (InferencePriority) {
         InferencePriority[InferencePriority["NakedTypeVariable"] = 1] = "NakedTypeVariable";
         InferencePriority[InferencePriority["HomomorphicMappedType"] = 2] = "HomomorphicMappedType";
-        InferencePriority[InferencePriority["MappedTypeConstraint"] = 4] = "MappedTypeConstraint";
-        InferencePriority[InferencePriority["ReturnType"] = 8] = "ReturnType";
-        InferencePriority[InferencePriority["LiteralKeyof"] = 16] = "LiteralKeyof";
-        InferencePriority[InferencePriority["NoConstraints"] = 32] = "NoConstraints";
-        InferencePriority[InferencePriority["AlwaysStrict"] = 64] = "AlwaysStrict";
-        InferencePriority[InferencePriority["PriorityImpliesCombination"] = 28] = "PriorityImpliesCombination";
+        InferencePriority[InferencePriority["PartialHomomorphicMappedType"] = 4] = "PartialHomomorphicMappedType";
+        InferencePriority[InferencePriority["MappedTypeConstraint"] = 8] = "MappedTypeConstraint";
+        InferencePriority[InferencePriority["ReturnType"] = 16] = "ReturnType";
+        InferencePriority[InferencePriority["LiteralKeyof"] = 32] = "LiteralKeyof";
+        InferencePriority[InferencePriority["NoConstraints"] = 64] = "NoConstraints";
+        InferencePriority[InferencePriority["AlwaysStrict"] = 128] = "AlwaysStrict";
+        InferencePriority[InferencePriority["PriorityImpliesCombination"] = 56] = "PriorityImpliesCombination";
     })(InferencePriority = ts.InferencePriority || (ts.InferencePriority = {}));
     /* @internal */
     var InferenceFlags;
@@ -3575,8 +3748,7 @@ var ts;
         InferenceFlags[InferenceFlags["None"] = 0] = "None";
         InferenceFlags[InferenceFlags["NoDefault"] = 1] = "NoDefault";
         InferenceFlags[InferenceFlags["AnyDefault"] = 2] = "AnyDefault";
-        InferenceFlags[InferenceFlags["NoFixing"] = 4] = "NoFixing";
-        InferenceFlags[InferenceFlags["SkippedGenericFunction"] = 8] = "SkippedGenericFunction";
+        InferenceFlags[InferenceFlags["SkippedGenericFunction"] = 4] = "SkippedGenericFunction";
     })(InferenceFlags = ts.InferenceFlags || (ts.InferenceFlags = {}));
     /**
      * Ternary values are defined such that
@@ -3647,7 +3819,7 @@ var ts;
         ModuleKind[ModuleKind["UMD"] = 3] = "UMD";
         ModuleKind[ModuleKind["System"] = 4] = "System";
         ModuleKind[ModuleKind["ES2015"] = 5] = "ES2015";
-        ModuleKind[ModuleKind["ESNext"] = 6] = "ESNext";
+        ModuleKind[ModuleKind["ESNext"] = 99] = "ESNext";
     })(ModuleKind = ts.ModuleKind || (ts.ModuleKind = {}));
     var JsxEmit;
     (function (JsxEmit) {
@@ -3685,9 +3857,10 @@ var ts;
         ScriptTarget[ScriptTarget["ES2017"] = 4] = "ES2017";
         ScriptTarget[ScriptTarget["ES2018"] = 5] = "ES2018";
         ScriptTarget[ScriptTarget["ES2019"] = 6] = "ES2019";
-        ScriptTarget[ScriptTarget["ESNext"] = 7] = "ESNext";
+        ScriptTarget[ScriptTarget["ES2020"] = 7] = "ES2020";
+        ScriptTarget[ScriptTarget["ESNext"] = 99] = "ESNext";
         ScriptTarget[ScriptTarget["JSON"] = 100] = "JSON";
-        ScriptTarget[ScriptTarget["Latest"] = 7] = "Latest";
+        ScriptTarget[ScriptTarget["Latest"] = 99] = "Latest";
     })(ScriptTarget = ts.ScriptTarget || (ts.ScriptTarget = {}));
     var LanguageVariant;
     (function (LanguageVariant) {
@@ -3866,6 +4039,7 @@ var ts;
         TransformFlags[TransformFlags["ContainsYield"] = 131072] = "ContainsYield";
         TransformFlags[TransformFlags["ContainsHoistedDeclarationOrCompletion"] = 262144] = "ContainsHoistedDeclarationOrCompletion";
         TransformFlags[TransformFlags["ContainsDynamicImport"] = 524288] = "ContainsDynamicImport";
+        TransformFlags[TransformFlags["ContainsClassFields"] = 1048576] = "ContainsClassFields";
         // Please leave this as 1 << 29.
         // It is the maximum bit we can set before we outgrow the size of a v8 small integer (SMI) on an x86 system.
         // It is a good reminder of how much room we have left
@@ -3960,22 +4134,23 @@ var ts;
         ExternalEmitHelpers[ExternalEmitHelpers["Values"] = 256] = "Values";
         ExternalEmitHelpers[ExternalEmitHelpers["Read"] = 512] = "Read";
         ExternalEmitHelpers[ExternalEmitHelpers["Spread"] = 1024] = "Spread";
-        ExternalEmitHelpers[ExternalEmitHelpers["Await"] = 2048] = "Await";
-        ExternalEmitHelpers[ExternalEmitHelpers["AsyncGenerator"] = 4096] = "AsyncGenerator";
-        ExternalEmitHelpers[ExternalEmitHelpers["AsyncDelegator"] = 8192] = "AsyncDelegator";
-        ExternalEmitHelpers[ExternalEmitHelpers["AsyncValues"] = 16384] = "AsyncValues";
-        ExternalEmitHelpers[ExternalEmitHelpers["ExportStar"] = 32768] = "ExportStar";
-        ExternalEmitHelpers[ExternalEmitHelpers["MakeTemplateObject"] = 65536] = "MakeTemplateObject";
+        ExternalEmitHelpers[ExternalEmitHelpers["SpreadArrays"] = 2048] = "SpreadArrays";
+        ExternalEmitHelpers[ExternalEmitHelpers["Await"] = 4096] = "Await";
+        ExternalEmitHelpers[ExternalEmitHelpers["AsyncGenerator"] = 8192] = "AsyncGenerator";
+        ExternalEmitHelpers[ExternalEmitHelpers["AsyncDelegator"] = 16384] = "AsyncDelegator";
+        ExternalEmitHelpers[ExternalEmitHelpers["AsyncValues"] = 32768] = "AsyncValues";
+        ExternalEmitHelpers[ExternalEmitHelpers["ExportStar"] = 65536] = "ExportStar";
+        ExternalEmitHelpers[ExternalEmitHelpers["MakeTemplateObject"] = 131072] = "MakeTemplateObject";
         ExternalEmitHelpers[ExternalEmitHelpers["FirstEmitHelper"] = 1] = "FirstEmitHelper";
-        ExternalEmitHelpers[ExternalEmitHelpers["LastEmitHelper"] = 65536] = "LastEmitHelper";
+        ExternalEmitHelpers[ExternalEmitHelpers["LastEmitHelper"] = 131072] = "LastEmitHelper";
         // Helpers included by ES2015 for..of
         ExternalEmitHelpers[ExternalEmitHelpers["ForOfIncludes"] = 256] = "ForOfIncludes";
         // Helpers included by ES2017 for..await..of
-        ExternalEmitHelpers[ExternalEmitHelpers["ForAwaitOfIncludes"] = 16384] = "ForAwaitOfIncludes";
+        ExternalEmitHelpers[ExternalEmitHelpers["ForAwaitOfIncludes"] = 32768] = "ForAwaitOfIncludes";
         // Helpers included by ES2017 async generators
-        ExternalEmitHelpers[ExternalEmitHelpers["AsyncGeneratorIncludes"] = 6144] = "AsyncGeneratorIncludes";
+        ExternalEmitHelpers[ExternalEmitHelpers["AsyncGeneratorIncludes"] = 12288] = "AsyncGeneratorIncludes";
         // Helpers included by yield* in ES2017 async generators
-        ExternalEmitHelpers[ExternalEmitHelpers["AsyncDelegatorIncludes"] = 26624] = "AsyncDelegatorIncludes";
+        ExternalEmitHelpers[ExternalEmitHelpers["AsyncDelegatorIncludes"] = 53248] = "AsyncDelegatorIncludes";
         // Helpers included by ES2015 spread
         ExternalEmitHelpers[ExternalEmitHelpers["SpreadIncludes"] = 1536] = "SpreadIncludes";
     })(ExternalEmitHelpers = ts.ExternalEmitHelpers || (ts.ExternalEmitHelpers = {}));
@@ -4100,17 +4275,10 @@ var ts;
         PragmaKindFlags[PragmaKindFlags["All"] = 7] = "All";
         PragmaKindFlags[PragmaKindFlags["Default"] = 7] = "Default";
     })(PragmaKindFlags = ts.PragmaKindFlags || (ts.PragmaKindFlags = {}));
-    /**
-     * This function only exists to cause exact types to be inferred for all the literals within `commentPragmas`
-     */
-    /* @internal */
-    function _contextuallyTypePragmas(args) {
-        return args;
-    }
     // While not strictly a type, this is here because `PragmaMap` needs to be here to be used with `SourceFile`, and we don't
     //  fancy effectively defining it twice, once in value-space and once in type-space
     /* @internal */
-    ts.commentPragmas = _contextuallyTypePragmas({
+    ts.commentPragmas = {
         "reference": {
             args: [
                 { name: "types", optional: true, captureSpan: true },
@@ -4138,7 +4306,7 @@ var ts;
             args: [{ name: "factory" }],
             kind: 4 /* MultiLine */
         },
-    });
+    };
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
@@ -4148,8 +4316,11 @@ var ts;
      */
     /* @internal */
     function generateDjb2Hash(data) {
-        var chars = data.split("").map(function (str) { return str.charCodeAt(0); });
-        return "" + chars.reduce(function (prev, curr) { return ((prev << 5) + prev) + curr; }, 5381);
+        var acc = 5381;
+        for (var i = 0; i < data.length; i++) {
+            acc = ((acc << 5) + acc) + data.charCodeAt(i);
+        }
+        return acc.toString();
     }
     ts.generateDjb2Hash = generateDjb2Hash;
     /**
@@ -4410,7 +4581,7 @@ var ts;
     }
     ts.getFileWatcherEventKind = getFileWatcherEventKind;
     /*@internal*/
-    ts.ignoredPaths = ["/node_modules/.", "/.git"];
+    ts.ignoredPaths = ["/node_modules/.", "/.git", "/.#"];
     /**
      * Watch the directory recursively using host provided method to watch child directories
      * that means if this is recursive watcher, watch the children directories as well
@@ -4996,7 +5167,7 @@ var ts;
                 }
             }
             function readDirectory(path, extensions, excludes, includes, depth) {
-                return ts.matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, process.cwd(), depth, getAccessibleFileSystemEntries);
+                return ts.matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, process.cwd(), depth, getAccessibleFileSystemEntries, realpath);
             }
             function fileSystemEntryExists(path, entryKind) {
                 try {
@@ -5182,7 +5353,7 @@ var ts;
         _0_modifier_cannot_appear_on_a_data_property: diag(1043, ts.DiagnosticCategory.Error, "_0_modifier_cannot_appear_on_a_data_property_1043", "'{0}' modifier cannot appear on a data property."),
         _0_modifier_cannot_appear_on_a_module_or_namespace_element: diag(1044, ts.DiagnosticCategory.Error, "_0_modifier_cannot_appear_on_a_module_or_namespace_element_1044", "'{0}' modifier cannot appear on a module or namespace element."),
         A_0_modifier_cannot_be_used_with_an_interface_declaration: diag(1045, ts.DiagnosticCategory.Error, "A_0_modifier_cannot_be_used_with_an_interface_declaration_1045", "A '{0}' modifier cannot be used with an interface declaration."),
-        A_declare_modifier_is_required_for_a_top_level_declaration_in_a_d_ts_file: diag(1046, ts.DiagnosticCategory.Error, "A_declare_modifier_is_required_for_a_top_level_declaration_in_a_d_ts_file_1046", "A 'declare' modifier is required for a top level declaration in a .d.ts file."),
+        Top_level_declarations_in_d_ts_files_must_start_with_either_a_declare_or_export_modifier: diag(1046, ts.DiagnosticCategory.Error, "Top_level_declarations_in_d_ts_files_must_start_with_either_a_declare_or_export_modifier_1046", "Top-level declarations in .d.ts files must start with either a 'declare' or 'export' modifier."),
         A_rest_parameter_cannot_be_optional: diag(1047, ts.DiagnosticCategory.Error, "A_rest_parameter_cannot_be_optional_1047", "A rest parameter cannot be optional."),
         A_rest_parameter_cannot_have_an_initializer: diag(1048, ts.DiagnosticCategory.Error, "A_rest_parameter_cannot_have_an_initializer_1048", "A rest parameter cannot have an initializer."),
         A_set_accessor_must_have_exactly_one_parameter: diag(1049, ts.DiagnosticCategory.Error, "A_set_accessor_must_have_exactly_one_parameter_1049", "A 'set' accessor must have exactly one parameter."),
@@ -5311,7 +5482,7 @@ var ts;
         Cannot_re_export_a_type_when_the_isolatedModules_flag_is_provided: diag(1205, ts.DiagnosticCategory.Error, "Cannot_re_export_a_type_when_the_isolatedModules_flag_is_provided_1205", "Cannot re-export a type when the '--isolatedModules' flag is provided."),
         Decorators_are_not_valid_here: diag(1206, ts.DiagnosticCategory.Error, "Decorators_are_not_valid_here_1206", "Decorators are not valid here."),
         Decorators_cannot_be_applied_to_multiple_get_Slashset_accessors_of_the_same_name: diag(1207, ts.DiagnosticCategory.Error, "Decorators_cannot_be_applied_to_multiple_get_Slashset_accessors_of_the_same_name_1207", "Decorators cannot be applied to multiple get/set accessors of the same name."),
-        Cannot_compile_namespaces_when_the_isolatedModules_flag_is_provided: diag(1208, ts.DiagnosticCategory.Error, "Cannot_compile_namespaces_when_the_isolatedModules_flag_is_provided_1208", "Cannot compile namespaces when the '--isolatedModules' flag is provided."),
+        All_files_must_be_modules_when_the_isolatedModules_flag_is_provided: diag(1208, ts.DiagnosticCategory.Error, "All_files_must_be_modules_when_the_isolatedModules_flag_is_provided_1208", "All files must be modules when the '--isolatedModules' flag is provided."),
         Invalid_use_of_0_Class_definitions_are_automatically_in_strict_mode: diag(1210, ts.DiagnosticCategory.Error, "Invalid_use_of_0_Class_definitions_are_automatically_in_strict_mode_1210", "Invalid use of '{0}'. Class definitions are automatically in strict mode."),
         A_class_declaration_without_the_default_modifier_must_have_a_name: diag(1211, ts.DiagnosticCategory.Error, "A_class_declaration_without_the_default_modifier_must_have_a_name_1211", "A class declaration without the 'default' modifier must have a name."),
         Identifier_expected_0_is_a_reserved_word_in_strict_mode: diag(1212, ts.DiagnosticCategory.Error, "Identifier_expected_0_is_a_reserved_word_in_strict_mode_1212", "Identifier expected. '{0}' is a reserved word in strict mode."),
@@ -5320,7 +5491,7 @@ var ts;
         Invalid_use_of_0_Modules_are_automatically_in_strict_mode: diag(1215, ts.DiagnosticCategory.Error, "Invalid_use_of_0_Modules_are_automatically_in_strict_mode_1215", "Invalid use of '{0}'. Modules are automatically in strict mode."),
         Identifier_expected_esModule_is_reserved_as_an_exported_marker_when_transforming_ECMAScript_modules: diag(1216, ts.DiagnosticCategory.Error, "Identifier_expected_esModule_is_reserved_as_an_exported_marker_when_transforming_ECMAScript_modules_1216", "Identifier expected. '__esModule' is reserved as an exported marker when transforming ECMAScript modules."),
         Export_assignment_is_not_supported_when_module_flag_is_system: diag(1218, ts.DiagnosticCategory.Error, "Export_assignment_is_not_supported_when_module_flag_is_system_1218", "Export assignment is not supported when '--module' flag is 'system'."),
-        Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_to_remove_this_warning: diag(1219, ts.DiagnosticCategory.Error, "Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_t_1219", "Experimental support for decorators is a feature that is subject to change in a future release. Set the 'experimentalDecorators' option to remove this warning."),
+        Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_in_your_tsconfig_or_jsconfig_to_remove_this_warning: diag(1219, ts.DiagnosticCategory.Error, "Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_t_1219", "Experimental support for decorators is a feature that is subject to change in a future release. Set the 'experimentalDecorators' option in your 'tsconfig' or 'jsconfig' to remove this warning."),
         Generators_are_only_available_when_targeting_ECMAScript_2015_or_higher: diag(1220, ts.DiagnosticCategory.Error, "Generators_are_only_available_when_targeting_ECMAScript_2015_or_higher_1220", "Generators are only available when targeting ECMAScript 2015 or higher."),
         Generators_are_not_allowed_in_an_ambient_context: diag(1221, ts.DiagnosticCategory.Error, "Generators_are_not_allowed_in_an_ambient_context_1221", "Generators are not allowed in an ambient context."),
         An_overload_signature_cannot_be_declared_as_a_generator: diag(1222, ts.DiagnosticCategory.Error, "An_overload_signature_cannot_be_declared_as_a_generator_1222", "An overload signature cannot be declared as a generator."),
@@ -5359,6 +5530,8 @@ var ts;
         A_definite_assignment_assertion_is_not_permitted_in_this_context: diag(1255, ts.DiagnosticCategory.Error, "A_definite_assignment_assertion_is_not_permitted_in_this_context_1255", "A definite assignment assertion '!' is not permitted in this context."),
         A_rest_element_must_be_last_in_a_tuple_type: diag(1256, ts.DiagnosticCategory.Error, "A_rest_element_must_be_last_in_a_tuple_type_1256", "A rest element must be last in a tuple type."),
         A_required_element_cannot_follow_an_optional_element: diag(1257, ts.DiagnosticCategory.Error, "A_required_element_cannot_follow_an_optional_element_1257", "A required element cannot follow an optional element."),
+        Definite_assignment_assertions_can_only_be_used_along_with_a_type_annotation: diag(1258, ts.DiagnosticCategory.Error, "Definite_assignment_assertions_can_only_be_used_along_with_a_type_annotation_1258", "Definite assignment assertions can only be used along with a type annotation."),
+        Module_0_can_only_be_default_imported_using_the_1_flag: diag(1259, ts.DiagnosticCategory.Error, "Module_0_can_only_be_default_imported_using_the_1_flag_1259", "Module '{0}' can only be default-imported using the '{1}' flag"),
         with_statements_are_not_allowed_in_an_async_function_block: diag(1300, ts.DiagnosticCategory.Error, "with_statements_are_not_allowed_in_an_async_function_block_1300", "'with' statements are not allowed in an async function block."),
         await_expression_is_only_allowed_within_an_async_function: diag(1308, ts.DiagnosticCategory.Error, "await_expression_is_only_allowed_within_an_async_function_1308", "'await' expression is only allowed within an async function."),
         can_only_be_used_in_an_object_literal_property_inside_a_destructuring_assignment: diag(1312, ts.DiagnosticCategory.Error, "can_only_be_used_in_an_object_literal_property_inside_a_destructuring_assignment_1312", "'=' can only be used in an object literal property inside a destructuring assignment."),
@@ -5403,7 +5576,8 @@ var ts;
         A_bigint_literal_cannot_use_exponential_notation: diag(1352, ts.DiagnosticCategory.Error, "A_bigint_literal_cannot_use_exponential_notation_1352", "A bigint literal cannot use exponential notation."),
         A_bigint_literal_must_be_an_integer: diag(1353, ts.DiagnosticCategory.Error, "A_bigint_literal_must_be_an_integer_1353", "A bigint literal must be an integer."),
         readonly_type_modifier_is_only_permitted_on_array_and_tuple_literal_types: diag(1354, ts.DiagnosticCategory.Error, "readonly_type_modifier_is_only_permitted_on_array_and_tuple_literal_types_1354", "'readonly' type modifier is only permitted on array and tuple literal types."),
-        A_const_assertion_can_only_be_applied_to_a_string_number_boolean_array_or_object_literal: diag(1355, ts.DiagnosticCategory.Error, "A_const_assertion_can_only_be_applied_to_a_string_number_boolean_array_or_object_literal_1355", "A 'const' assertion can only be applied to a string, number, boolean, array, or object literal."),
+        A_const_assertions_can_only_be_applied_to_references_to_enum_members_or_string_number_boolean_array_or_object_literals: diag(1355, ts.DiagnosticCategory.Error, "A_const_assertions_can_only_be_applied_to_references_to_enum_members_or_string_number_boolean_array__1355", "A 'const' assertions can only be applied to references to enum members, or string, number, boolean, array, or object literals."),
+        Did_you_mean_to_mark_this_function_as_async: diag(1356, ts.DiagnosticCategory.Error, "Did_you_mean_to_mark_this_function_as_async_1356", "Did you mean to mark this function as 'async'?"),
         Duplicate_identifier_0: diag(2300, ts.DiagnosticCategory.Error, "Duplicate_identifier_0_2300", "Duplicate identifier '{0}'."),
         Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor: diag(2301, ts.DiagnosticCategory.Error, "Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor_2301", "Initializer of instance member variable '{0}' cannot reference identifier '{1}' declared in the constructor."),
         Static_members_cannot_reference_class_type_parameters: diag(2302, ts.DiagnosticCategory.Error, "Static_members_cannot_reference_class_type_parameters_2302", "Static members cannot reference class type parameters."),
@@ -5453,9 +5627,9 @@ var ts;
         Call_target_does_not_contain_any_signatures: diag(2346, ts.DiagnosticCategory.Error, "Call_target_does_not_contain_any_signatures_2346", "Call target does not contain any signatures."),
         Untyped_function_calls_may_not_accept_type_arguments: diag(2347, ts.DiagnosticCategory.Error, "Untyped_function_calls_may_not_accept_type_arguments_2347", "Untyped function calls may not accept type arguments."),
         Value_of_type_0_is_not_callable_Did_you_mean_to_include_new: diag(2348, ts.DiagnosticCategory.Error, "Value_of_type_0_is_not_callable_Did_you_mean_to_include_new_2348", "Value of type '{0}' is not callable. Did you mean to include 'new'?"),
-        Cannot_invoke_an_expression_whose_type_lacks_a_call_signature_Type_0_has_no_compatible_call_signatures: diag(2349, ts.DiagnosticCategory.Error, "Cannot_invoke_an_expression_whose_type_lacks_a_call_signature_Type_0_has_no_compatible_call_signatur_2349", "Cannot invoke an expression whose type lacks a call signature. Type '{0}' has no compatible call signatures."),
+        This_expression_is_not_callable: diag(2349, ts.DiagnosticCategory.Error, "This_expression_is_not_callable_2349", "This expression is not callable."),
         Only_a_void_function_can_be_called_with_the_new_keyword: diag(2350, ts.DiagnosticCategory.Error, "Only_a_void_function_can_be_called_with_the_new_keyword_2350", "Only a void function can be called with the 'new' keyword."),
-        Cannot_use_new_with_an_expression_whose_type_lacks_a_call_or_construct_signature: diag(2351, ts.DiagnosticCategory.Error, "Cannot_use_new_with_an_expression_whose_type_lacks_a_call_or_construct_signature_2351", "Cannot use 'new' with an expression whose type lacks a call or construct signature."),
+        This_expression_is_not_constructable: diag(2351, ts.DiagnosticCategory.Error, "This_expression_is_not_constructable_2351", "This expression is not constructable."),
         Conversion_of_type_0_to_type_1_may_be_a_mistake_because_neither_type_sufficiently_overlaps_with_the_other_If_this_was_intentional_convert_the_expression_to_unknown_first: diag(2352, ts.DiagnosticCategory.Error, "Conversion_of_type_0_to_type_1_may_be_a_mistake_because_neither_type_sufficiently_overlaps_with_the__2352", "Conversion of type '{0}' to type '{1}' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first."),
         Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1: diag(2353, ts.DiagnosticCategory.Error, "Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1_2353", "Object literal may only specify known properties, and '{0}' does not exist in type '{1}'."),
         This_syntax_requires_an_imported_helper_but_module_0_cannot_be_found: diag(2354, ts.DiagnosticCategory.Error, "This_syntax_requires_an_imported_helper_but_module_0_cannot_be_found_2354", "This syntax requires an imported helper but module '{0}' cannot be found."),
@@ -5585,7 +5759,7 @@ var ts;
         The_left_hand_side_of_a_for_of_statement_must_be_a_variable_or_a_property_access: diag(2487, ts.DiagnosticCategory.Error, "The_left_hand_side_of_a_for_of_statement_must_be_a_variable_or_a_property_access_2487", "The left-hand side of a 'for...of' statement must be a variable or a property access."),
         Type_0_must_have_a_Symbol_iterator_method_that_returns_an_iterator: diag(2488, ts.DiagnosticCategory.Error, "Type_0_must_have_a_Symbol_iterator_method_that_returns_an_iterator_2488", "Type '{0}' must have a '[Symbol.iterator]()' method that returns an iterator."),
         An_iterator_must_have_a_next_method: diag(2489, ts.DiagnosticCategory.Error, "An_iterator_must_have_a_next_method_2489", "An iterator must have a 'next()' method."),
-        The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property: diag(2490, ts.DiagnosticCategory.Error, "The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property_2490", "The type returned by the 'next()' method of an iterator must have a 'value' property."),
+        The_type_returned_by_the_0_method_of_an_iterator_must_have_a_value_property: diag(2490, ts.DiagnosticCategory.Error, "The_type_returned_by_the_0_method_of_an_iterator_must_have_a_value_property_2490", "The type returned by the '{0}()' method of an iterator must have a 'value' property."),
         The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern: diag(2491, ts.DiagnosticCategory.Error, "The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern_2491", "The left-hand side of a 'for...in' statement cannot be a destructuring pattern."),
         Cannot_redeclare_identifier_0_in_catch_clause: diag(2492, ts.DiagnosticCategory.Error, "Cannot_redeclare_identifier_0_in_catch_clause_2492", "Cannot redeclare identifier '{0}' in catch clause."),
         Tuple_type_0_of_length_1_has_no_element_at_index_2: diag(2493, ts.DiagnosticCategory.Error, "Tuple_type_0_of_length_1_has_no_element_at_index_2_2493", "Tuple type '{0}' of length '{1}' has no element at index '{2}'."),
@@ -5642,7 +5816,7 @@ var ts;
         Expression_resolves_to_variable_declaration_newTarget_that_compiler_uses_to_capture_new_target_meta_property_reference: diag(2544, ts.DiagnosticCategory.Error, "Expression_resolves_to_variable_declaration_newTarget_that_compiler_uses_to_capture_new_target_meta__2544", "Expression resolves to variable declaration '_newTarget' that compiler uses to capture 'new.target' meta-property reference."),
         A_mixin_class_must_have_a_constructor_with_a_single_rest_parameter_of_type_any: diag(2545, ts.DiagnosticCategory.Error, "A_mixin_class_must_have_a_constructor_with_a_single_rest_parameter_of_type_any_2545", "A mixin class must have a constructor with a single rest parameter of type 'any[]'."),
         Property_0_has_conflicting_declarations_and_is_inaccessible_in_type_1: diag(2546, ts.DiagnosticCategory.Error, "Property_0_has_conflicting_declarations_and_is_inaccessible_in_type_1_2546", "Property '{0}' has conflicting declarations and is inaccessible in type '{1}'."),
-        The_type_returned_by_the_next_method_of_an_async_iterator_must_be_a_promise_for_a_type_with_a_value_property: diag(2547, ts.DiagnosticCategory.Error, "The_type_returned_by_the_next_method_of_an_async_iterator_must_be_a_promise_for_a_type_with_a_value__2547", "The type returned by the 'next()' method of an async iterator must be a promise for a type with a 'value' property."),
+        The_type_returned_by_the_0_method_of_an_async_iterator_must_be_a_promise_for_a_type_with_a_value_property: diag(2547, ts.DiagnosticCategory.Error, "The_type_returned_by_the_0_method_of_an_async_iterator_must_be_a_promise_for_a_type_with_a_value_pro_2547", "The type returned by the '{0}()' method of an async iterator must be a promise for a type with a 'value' property."),
         Type_0_is_not_an_array_type_or_does_not_have_a_Symbol_iterator_method_that_returns_an_iterator: diag(2548, ts.DiagnosticCategory.Error, "Type_0_is_not_an_array_type_or_does_not_have_a_Symbol_iterator_method_that_returns_an_iterator_2548", "Type '{0}' is not an array type or does not have a '[Symbol.iterator]()' method that returns an iterator."),
         Type_0_is_not_an_array_type_or_a_string_type_or_does_not_have_a_Symbol_iterator_method_that_returns_an_iterator: diag(2549, ts.DiagnosticCategory.Error, "Type_0_is_not_an_array_type_or_a_string_type_or_does_not_have_a_Symbol_iterator_method_that_returns__2549", "Type '{0}' is not an array type or a string type or does not have a '[Symbol.iterator]()' method that returns an iterator."),
         Property_0_does_not_exist_on_type_1_Did_you_mean_2: diag(2551, ts.DiagnosticCategory.Error, "Property_0_does_not_exist_on_type_1_Did_you_mean_2_2551", "Property '{0}' does not exist on type '{1}'. Did you mean '{2}'?"),
@@ -5663,7 +5837,6 @@ var ts;
         A_rest_element_cannot_have_a_property_name: diag(2566, ts.DiagnosticCategory.Error, "A_rest_element_cannot_have_a_property_name_2566", "A rest element cannot have a property name."),
         Enum_declarations_can_only_merge_with_namespace_or_other_enum_declarations: diag(2567, ts.DiagnosticCategory.Error, "Enum_declarations_can_only_merge_with_namespace_or_other_enum_declarations_2567", "Enum declarations can only merge with namespace or other enum declarations."),
         Type_0_is_not_an_array_type_or_a_string_type_Use_compiler_option_downlevelIteration_to_allow_iterating_of_iterators: diag(2569, ts.DiagnosticCategory.Error, "Type_0_is_not_an_array_type_or_a_string_type_Use_compiler_option_downlevelIteration_to_allow_iterati_2569", "Type '{0}' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators."),
-        Property_0_does_not_exist_on_type_1_Did_you_forget_to_use_await: diag(2570, ts.DiagnosticCategory.Error, "Property_0_does_not_exist_on_type_1_Did_you_forget_to_use_await_2570", "Property '{0}' does not exist on type '{1}'. Did you forget to use 'await'?"),
         Object_is_of_type_unknown: diag(2571, ts.DiagnosticCategory.Error, "Object_is_of_type_unknown_2571", "Object is of type 'unknown'."),
         Rest_signatures_are_incompatible: diag(2572, ts.DiagnosticCategory.Error, "Rest_signatures_are_incompatible_2572", "Rest signatures are incompatible."),
         Property_0_is_incompatible_with_rest_element_type: diag(2573, ts.DiagnosticCategory.Error, "Property_0_is_incompatible_with_rest_element_type_2573", "Property '{0}' is incompatible with rest element type."),
@@ -5685,6 +5858,7 @@ var ts;
         Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_node_Try_npm_i_types_Slashnode_and_then_add_node_to_the_types_field_in_your_tsconfig: diag(2591, ts.DiagnosticCategory.Error, "Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_node_Try_npm_i_types_Slashnode_and_th_2591", "Cannot find name '{0}'. Do you need to install type definitions for node? Try `npm i @types/node` and then add `node` to the types field in your tsconfig."),
         Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_jQuery_Try_npm_i_types_Slashjquery_and_then_add_jquery_to_the_types_field_in_your_tsconfig: diag(2592, ts.DiagnosticCategory.Error, "Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_jQuery_Try_npm_i_types_Slashjquery_an_2592", "Cannot find name '{0}'. Do you need to install type definitions for jQuery? Try `npm i @types/jquery` and then add `jquery` to the types field in your tsconfig."),
         Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_a_test_runner_Try_npm_i_types_Slashjest_or_npm_i_types_Slashmocha_and_then_add_jest_or_mocha_to_the_types_field_in_your_tsconfig: diag(2593, ts.DiagnosticCategory.Error, "Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_a_test_runner_Try_npm_i_types_Slashje_2593", "Cannot find name '{0}'. Do you need to install type definitions for a test runner? Try `npm i @types/jest` or `npm i @types/mocha` and then add `jest` or `mocha` to the types field in your tsconfig."),
+        This_module_is_declared_with_using_export_and_can_only_be_used_with_a_default_import_when_using_the_0_flag: diag(2594, ts.DiagnosticCategory.Error, "This_module_is_declared_with_using_export_and_can_only_be_used_with_a_default_import_when_using_the__2594", "This module is declared with using 'export =', and can only be used with a default import when using the '{0}' flag."),
         JSX_element_attributes_type_0_may_not_be_a_union_type: diag(2600, ts.DiagnosticCategory.Error, "JSX_element_attributes_type_0_may_not_be_a_union_type_2600", "JSX element attributes type '{0}' may not be a union type."),
         The_return_type_of_a_JSX_element_constructor_must_return_an_object_type: diag(2601, ts.DiagnosticCategory.Error, "The_return_type_of_a_JSX_element_constructor_must_return_an_object_type_2601", "The return type of a JSX element constructor must return an object type."),
         JSX_element_implicitly_has_type_any_because_the_global_type_JSX_Element_does_not_exist: diag(2602, ts.DiagnosticCategory.Error, "JSX_element_implicitly_has_type_any_because_the_global_type_JSX_Element_does_not_exist_2602", "JSX element implicitly has type 'any' because the global type 'JSX.Element' does not exist."),
@@ -5795,6 +5969,28 @@ var ts;
         _0_refers_to_a_value_but_is_being_used_as_a_type_here: diag(2749, ts.DiagnosticCategory.Error, "_0_refers_to_a_value_but_is_being_used_as_a_type_here_2749", "'{0}' refers to a value, but is being used as a type here."),
         The_implementation_signature_is_declared_here: diag(2750, ts.DiagnosticCategory.Error, "The_implementation_signature_is_declared_here_2750", "The implementation signature is declared here."),
         Circularity_originates_in_type_at_this_location: diag(2751, ts.DiagnosticCategory.Error, "Circularity_originates_in_type_at_this_location_2751", "Circularity originates in type at this location."),
+        The_first_export_default_is_here: diag(2752, ts.DiagnosticCategory.Error, "The_first_export_default_is_here_2752", "The first export default is here."),
+        Another_export_default_is_here: diag(2753, ts.DiagnosticCategory.Error, "Another_export_default_is_here_2753", "Another export default is here."),
+        super_may_not_use_type_arguments: diag(2754, ts.DiagnosticCategory.Error, "super_may_not_use_type_arguments_2754", "'super' may not use type arguments."),
+        No_constituent_of_type_0_is_callable: diag(2755, ts.DiagnosticCategory.Error, "No_constituent_of_type_0_is_callable_2755", "No constituent of type '{0}' is callable."),
+        Not_all_constituents_of_type_0_are_callable: diag(2756, ts.DiagnosticCategory.Error, "Not_all_constituents_of_type_0_are_callable_2756", "Not all constituents of type '{0}' are callable."),
+        Type_0_has_no_call_signatures: diag(2757, ts.DiagnosticCategory.Error, "Type_0_has_no_call_signatures_2757", "Type '{0}' has no call signatures."),
+        Each_member_of_the_union_type_0_has_signatures_but_none_of_those_signatures_are_compatible_with_each_other: diag(2758, ts.DiagnosticCategory.Error, "Each_member_of_the_union_type_0_has_signatures_but_none_of_those_signatures_are_compatible_with_each_2758", "Each member of the union type '{0}' has signatures, but none of those signatures are compatible with each other."),
+        No_constituent_of_type_0_is_constructable: diag(2759, ts.DiagnosticCategory.Error, "No_constituent_of_type_0_is_constructable_2759", "No constituent of type '{0}' is constructable."),
+        Not_all_constituents_of_type_0_are_constructable: diag(2760, ts.DiagnosticCategory.Error, "Not_all_constituents_of_type_0_are_constructable_2760", "Not all constituents of type '{0}' are constructable."),
+        Type_0_has_no_construct_signatures: diag(2761, ts.DiagnosticCategory.Error, "Type_0_has_no_construct_signatures_2761", "Type '{0}' has no construct signatures."),
+        Each_member_of_the_union_type_0_has_construct_signatures_but_none_of_those_signatures_are_compatible_with_each_other: diag(2762, ts.DiagnosticCategory.Error, "Each_member_of_the_union_type_0_has_construct_signatures_but_none_of_those_signatures_are_compatible_2762", "Each member of the union type '{0}' has construct signatures, but none of those signatures are compatible with each other."),
+        Cannot_iterate_value_because_the_next_method_of_its_iterator_expects_type_1_but_for_of_will_always_send_0: diag(2763, ts.DiagnosticCategory.Error, "Cannot_iterate_value_because_the_next_method_of_its_iterator_expects_type_1_but_for_of_will_always_s_2763", "Cannot iterate value because the 'next' method of its iterator expects type '{1}', but for-of will always send '{0}'."),
+        Cannot_iterate_value_because_the_next_method_of_its_iterator_expects_type_1_but_array_spread_will_always_send_0: diag(2764, ts.DiagnosticCategory.Error, "Cannot_iterate_value_because_the_next_method_of_its_iterator_expects_type_1_but_array_spread_will_al_2764", "Cannot iterate value because the 'next' method of its iterator expects type '{1}', but array spread will always send '{0}'."),
+        Cannot_iterate_value_because_the_next_method_of_its_iterator_expects_type_1_but_array_destructuring_will_always_send_0: diag(2765, ts.DiagnosticCategory.Error, "Cannot_iterate_value_because_the_next_method_of_its_iterator_expects_type_1_but_array_destructuring__2765", "Cannot iterate value because the 'next' method of its iterator expects type '{1}', but array destructuring will always send '{0}'."),
+        Cannot_delegate_iteration_to_value_because_the_next_method_of_its_iterator_expects_type_1_but_the_containing_generator_will_always_send_0: diag(2766, ts.DiagnosticCategory.Error, "Cannot_delegate_iteration_to_value_because_the_next_method_of_its_iterator_expects_type_1_but_the_co_2766", "Cannot delegate iteration to value because the 'next' method of its iterator expects type '{1}', but the containing generator will always send '{0}'."),
+        The_0_property_of_an_iterator_must_be_a_method: diag(2767, ts.DiagnosticCategory.Error, "The_0_property_of_an_iterator_must_be_a_method_2767", "The '{0}' property of an iterator must be a method."),
+        The_0_property_of_an_async_iterator_must_be_a_method: diag(2768, ts.DiagnosticCategory.Error, "The_0_property_of_an_async_iterator_must_be_a_method_2768", "The '{0}' property of an async iterator must be a method."),
+        No_overload_matches_this_call: diag(2769, ts.DiagnosticCategory.Error, "No_overload_matches_this_call_2769", "No overload matches this call."),
+        The_last_overload_gave_the_following_error: diag(2770, ts.DiagnosticCategory.Error, "The_last_overload_gave_the_following_error_2770", "The last overload gave the following error."),
+        The_last_overload_is_declared_here: diag(2771, ts.DiagnosticCategory.Error, "The_last_overload_is_declared_here_2771", "The last overload is declared here."),
+        Overload_0_of_1_2_gave_the_following_error: diag(2772, ts.DiagnosticCategory.Error, "Overload_0_of_1_2_gave_the_following_error_2772", "Overload {0} of {1}, '{2}', gave the following error."),
+        Did_you_forget_to_use_await: diag(2773, ts.DiagnosticCategory.Error, "Did_you_forget_to_use_await_2773", "Did you forget to use 'await'?"),
         Import_declaration_0_is_using_private_name_1: diag(4000, ts.DiagnosticCategory.Error, "Import_declaration_0_is_using_private_name_1_4000", "Import declaration '{0}' is using private name '{1}'."),
         Type_parameter_0_of_exported_class_has_or_is_using_private_name_1: diag(4002, ts.DiagnosticCategory.Error, "Type_parameter_0_of_exported_class_has_or_is_using_private_name_1_4002", "Type parameter '{0}' of exported class has or is using private name '{1}'."),
         Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1: diag(4004, ts.DiagnosticCategory.Error, "Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1_4004", "Type parameter '{0}' of exported interface has or is using private name '{1}'."),
@@ -5879,6 +6075,8 @@ var ts;
         Method_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2: diag(4101, ts.DiagnosticCategory.Error, "Method_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2_4101", "Method '{0}' of exported interface has or is using name '{1}' from private module '{2}'."),
         Method_0_of_exported_interface_has_or_is_using_private_name_1: diag(4102, ts.DiagnosticCategory.Error, "Method_0_of_exported_interface_has_or_is_using_private_name_1_4102", "Method '{0}' of exported interface has or is using private name '{1}'."),
         Type_parameter_0_of_exported_mapped_object_type_is_using_private_name_1: diag(4103, ts.DiagnosticCategory.Error, "Type_parameter_0_of_exported_mapped_object_type_is_using_private_name_1_4103", "Type parameter '{0}' of exported mapped object type is using private name '{1}'."),
+        The_type_0_is_readonly_and_cannot_be_assigned_to_the_mutable_type_1: diag(4104, ts.DiagnosticCategory.Error, "The_type_0_is_readonly_and_cannot_be_assigned_to_the_mutable_type_1_4104", "The type '{0}' is 'readonly' and cannot be assigned to the mutable type '{1}'."),
+        Private_or_protected_member_0_cannot_be_accessed_on_a_type_parameter: diag(4105, ts.DiagnosticCategory.Error, "Private_or_protected_member_0_cannot_be_accessed_on_a_type_parameter_4105", "Private or protected member '{0}' cannot be accessed on a type parameter."),
         The_current_host_does_not_support_the_0_option: diag(5001, ts.DiagnosticCategory.Error, "The_current_host_does_not_support_the_0_option_5001", "The current host does not support the '{0}' option."),
         Cannot_find_the_common_subdirectory_path_for_the_input_files: diag(5009, ts.DiagnosticCategory.Error, "Cannot_find_the_common_subdirectory_path_for_the_input_files_5009", "Cannot find the common subdirectory path for the input files."),
         File_specification_cannot_end_in_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0: diag(5010, ts.DiagnosticCategory.Error, "File_specification_cannot_end_in_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0_5010", "File specification cannot end in a recursive directory wildcard ('**'): '{0}'."),
@@ -5912,6 +6110,8 @@ var ts;
         Option_resolveJsonModule_can_only_be_specified_when_module_code_generation_is_commonjs_amd_es2015_or_esNext: diag(5071, ts.DiagnosticCategory.Error, "Option_resolveJsonModule_can_only_be_specified_when_module_code_generation_is_commonjs_amd_es2015_or_5071", "Option '--resolveJsonModule' can only be specified when module code generation is 'commonjs', 'amd', 'es2015' or 'esNext'."),
         Unknown_build_option_0: diag(5072, ts.DiagnosticCategory.Error, "Unknown_build_option_0_5072", "Unknown build option '{0}'."),
         Build_option_0_requires_a_value_of_type_1: diag(5073, ts.DiagnosticCategory.Error, "Build_option_0_requires_a_value_of_type_1_5073", "Build option '{0}' requires a value of type {1}."),
+        Option_incremental_can_only_be_specified_using_tsconfig_emitting_to_single_file_or_when_option_tsBuildInfoFile_is_specified: diag(5074, ts.DiagnosticCategory.Error, "Option_incremental_can_only_be_specified_using_tsconfig_emitting_to_single_file_or_when_option_tsBui_5074", "Option '--incremental' can only be specified using tsconfig, emitting to single file or when option `--tsBuildInfoFile` is specified."),
+        _0_is_assignable_to_the_constraint_of_type_1_but_1_could_be_instantiated_with_a_different_subtype_of_constraint_2: diag(5075, ts.DiagnosticCategory.Error, "_0_is_assignable_to_the_constraint_of_type_1_but_1_could_be_instantiated_with_a_different_subtype_of_5075", "'{0}' is assignable to the constraint of type '{1}', but '{1}' could be instantiated with a different subtype of constraint '{2}'."),
         Generates_a_sourcemap_for_each_corresponding_d_ts_file: diag(6000, ts.DiagnosticCategory.Message, "Generates_a_sourcemap_for_each_corresponding_d_ts_file_6000", "Generates a sourcemap for each corresponding '.d.ts' file."),
         Concatenate_and_emit_output_to_single_file: diag(6001, ts.DiagnosticCategory.Message, "Concatenate_and_emit_output_to_single_file_6001", "Concatenate and emit output to single file."),
         Generates_corresponding_d_ts_file: diag(6002, ts.DiagnosticCategory.Message, "Generates_corresponding_d_ts_file_6002", "Generates corresponding '.d.ts' file."),
@@ -6088,7 +6288,6 @@ var ts;
         Enable_strict_checking_of_property_initialization_in_classes: diag(6187, ts.DiagnosticCategory.Message, "Enable_strict_checking_of_property_initialization_in_classes_6187", "Enable strict checking of property initialization in classes."),
         Numeric_separators_are_not_allowed_here: diag(6188, ts.DiagnosticCategory.Error, "Numeric_separators_are_not_allowed_here_6188", "Numeric separators are not allowed here."),
         Multiple_consecutive_numeric_separators_are_not_permitted: diag(6189, ts.DiagnosticCategory.Error, "Multiple_consecutive_numeric_separators_are_not_permitted_6189", "Multiple consecutive numeric separators are not permitted."),
-        Found_package_json_at_0_Package_ID_is_1: diag(6190, ts.DiagnosticCategory.Message, "Found_package_json_at_0_Package_ID_is_1_6190", "Found 'package.json' at '{0}'. Package ID is '{1}'."),
         Whether_to_keep_outdated_console_output_in_watch_mode_instead_of_clearing_the_screen: diag(6191, ts.DiagnosticCategory.Message, "Whether_to_keep_outdated_console_output_in_watch_mode_instead_of_clearing_the_screen_6191", "Whether to keep outdated console output in watch mode instead of clearing the screen."),
         All_imports_in_import_declaration_are_unused: diag(6192, ts.DiagnosticCategory.Error, "All_imports_in_import_declaration_are_unused_6192", "All imports in import declaration are unused.", /*reportsUnnecessary*/ true),
         Found_1_error_Watching_for_file_changes: diag(6193, ts.DiagnosticCategory.Message, "Found_1_error_Watching_for_file_changes_6193", "Found 1 error. Watching for file changes."),
@@ -6115,13 +6314,16 @@ var ts;
         Using_compiler_options_of_project_reference_redirect_0: diag(6215, ts.DiagnosticCategory.Message, "Using_compiler_options_of_project_reference_redirect_0_6215", "Using compiler options of project reference redirect '{0}'."),
         Found_1_error: diag(6216, ts.DiagnosticCategory.Message, "Found_1_error_6216", "Found 1 error."),
         Found_0_errors: diag(6217, ts.DiagnosticCategory.Message, "Found_0_errors_6217", "Found {0} errors."),
+        Module_name_0_was_successfully_resolved_to_1_with_Package_ID_2: diag(6218, ts.DiagnosticCategory.Message, "Module_name_0_was_successfully_resolved_to_1_with_Package_ID_2_6218", "======== Module name '{0}' was successfully resolved to '{1}' with Package ID '{2}'. ========"),
+        Type_reference_directive_0_was_successfully_resolved_to_1_with_Package_ID_2_primary_Colon_3: diag(6219, ts.DiagnosticCategory.Message, "Type_reference_directive_0_was_successfully_resolved_to_1_with_Package_ID_2_primary_Colon_3_6219", "======== Type reference directive '{0}' was successfully resolved to '{1}' with Package ID '{2}', primary: {3}. ========"),
+        package_json_had_a_falsy_0_field: diag(6220, ts.DiagnosticCategory.Message, "package_json_had_a_falsy_0_field_6220", "'package.json' had a falsy '{0}' field."),
         Projects_to_reference: diag(6300, ts.DiagnosticCategory.Message, "Projects_to_reference_6300", "Projects to reference"),
         Enable_project_compilation: diag(6302, ts.DiagnosticCategory.Message, "Enable_project_compilation_6302", "Enable project compilation"),
         Project_references_may_not_form_a_circular_graph_Cycle_detected_Colon_0: diag(6202, ts.DiagnosticCategory.Error, "Project_references_may_not_form_a_circular_graph_Cycle_detected_Colon_0_6202", "Project references may not form a circular graph. Cycle detected: {0}"),
         Composite_projects_may_not_disable_declaration_emit: diag(6304, ts.DiagnosticCategory.Error, "Composite_projects_may_not_disable_declaration_emit_6304", "Composite projects may not disable declaration emit."),
         Output_file_0_has_not_been_built_from_source_file_1: diag(6305, ts.DiagnosticCategory.Error, "Output_file_0_has_not_been_built_from_source_file_1_6305", "Output file '{0}' has not been built from source file '{1}'."),
         Referenced_project_0_must_have_setting_composite_Colon_true: diag(6306, ts.DiagnosticCategory.Error, "Referenced_project_0_must_have_setting_composite_Colon_true_6306", "Referenced project '{0}' must have setting \"composite\": true."),
-        File_0_is_not_in_project_file_list_Projects_must_list_all_files_or_use_an_include_pattern: diag(6307, ts.DiagnosticCategory.Error, "File_0_is_not_in_project_file_list_Projects_must_list_all_files_or_use_an_include_pattern_6307", "File '{0}' is not in project file list. Projects must list all files or use an 'include' pattern."),
+        File_0_is_not_listed_within_the_file_list_of_project_1_Projects_must_list_all_files_or_use_an_include_pattern: diag(6307, ts.DiagnosticCategory.Error, "File_0_is_not_listed_within_the_file_list_of_project_1_Projects_must_list_all_files_or_use_an_includ_6307", "File '{0}' is not listed within the file list of project '{1}'. Projects must list all files or use an 'include' pattern."),
         Cannot_prepend_project_0_because_it_does_not_have_outFile_set: diag(6308, ts.DiagnosticCategory.Error, "Cannot_prepend_project_0_because_it_does_not_have_outFile_set_6308", "Cannot prepend project '{0}' because it does not have 'outFile' set"),
         Output_file_0_from_project_1_does_not_exist: diag(6309, ts.DiagnosticCategory.Error, "Output_file_0_from_project_1_does_not_exist_6309", "Output file '{0}' from project '{1}' does not exist"),
         Project_0_is_out_of_date_because_oldest_output_1_is_older_than_newest_input_2: diag(6350, ts.DiagnosticCategory.Message, "Project_0_is_out_of_date_because_oldest_output_1_is_older_than_newest_input_2_6350", "Project '{0}' is out of date because oldest output '{1}' is older than newest input '{2}'"),
@@ -6176,7 +6378,7 @@ var ts;
         _0_implicitly_has_type_any_because_it_does_not_have_a_type_annotation_and_is_referenced_directly_or_indirectly_in_its_own_initializer: diag(7022, ts.DiagnosticCategory.Error, "_0_implicitly_has_type_any_because_it_does_not_have_a_type_annotation_and_is_referenced_directly_or__7022", "'{0}' implicitly has type 'any' because it does not have a type annotation and is referenced directly or indirectly in its own initializer."),
         _0_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions: diag(7023, ts.DiagnosticCategory.Error, "_0_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_reference_7023", "'{0}' implicitly has return type 'any' because it does not have a return type annotation and is referenced directly or indirectly in one of its return expressions."),
         Function_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions: diag(7024, ts.DiagnosticCategory.Error, "Function_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_ref_7024", "Function implicitly has return type 'any' because it does not have a return type annotation and is referenced directly or indirectly in one of its return expressions."),
-        Generator_implicitly_has_type_0_because_it_does_not_yield_any_values_Consider_supplying_a_return_type: diag(7025, ts.DiagnosticCategory.Error, "Generator_implicitly_has_type_0_because_it_does_not_yield_any_values_Consider_supplying_a_return_typ_7025", "Generator implicitly has type '{0}' because it does not yield any values. Consider supplying a return type."),
+        Generator_implicitly_has_yield_type_0_because_it_does_not_yield_any_values_Consider_supplying_a_return_type_annotation: diag(7025, ts.DiagnosticCategory.Error, "Generator_implicitly_has_yield_type_0_because_it_does_not_yield_any_values_Consider_supplying_a_retu_7025", "Generator implicitly has yield type '{0}' because it does not yield any values. Consider supplying a return type annotation."),
         JSX_element_implicitly_has_type_any_because_no_interface_JSX_0_exists: diag(7026, ts.DiagnosticCategory.Error, "JSX_element_implicitly_has_type_any_because_no_interface_JSX_0_exists_7026", "JSX element implicitly has type 'any' because no interface 'JSX.{0}' exists."),
         Unreachable_code_detected: diag(7027, ts.DiagnosticCategory.Error, "Unreachable_code_detected_7027", "Unreachable code detected.", /*reportsUnnecessary*/ true),
         Unused_label: diag(7028, ts.DiagnosticCategory.Error, "Unused_label_7028", "Unused label.", /*reportsUnnecessary*/ true),
@@ -6203,6 +6405,10 @@ var ts;
         Property_0_implicitly_has_type_any_but_a_better_type_for_its_set_accessor_may_be_inferred_from_usage: diag(7049, ts.DiagnosticCategory.Suggestion, "Property_0_implicitly_has_type_any_but_a_better_type_for_its_set_accessor_may_be_inferred_from_usage_7049", "Property '{0}' implicitly has type 'any', but a better type for its set accessor may be inferred from usage."),
         _0_implicitly_has_an_1_return_type_but_a_better_type_may_be_inferred_from_usage: diag(7050, ts.DiagnosticCategory.Suggestion, "_0_implicitly_has_an_1_return_type_but_a_better_type_may_be_inferred_from_usage_7050", "'{0}' implicitly has an '{1}' return type, but a better type may be inferred from usage."),
         Parameter_has_a_name_but_no_type_Did_you_mean_0_Colon_1: diag(7051, ts.DiagnosticCategory.Error, "Parameter_has_a_name_but_no_type_Did_you_mean_0_Colon_1_7051", "Parameter has a name but no type. Did you mean '{0}: {1}'?"),
+        Element_implicitly_has_an_any_type_because_type_0_has_no_index_signature_Did_you_mean_to_call_1: diag(7052, ts.DiagnosticCategory.Error, "Element_implicitly_has_an_any_type_because_type_0_has_no_index_signature_Did_you_mean_to_call_1_7052", "Element implicitly has an 'any' type because type '{0}' has no index signature. Did you mean to call '{1}' ?"),
+        Element_implicitly_has_an_any_type_because_expression_of_type_0_can_t_be_used_to_index_type_1: diag(7053, ts.DiagnosticCategory.Error, "Element_implicitly_has_an_any_type_because_expression_of_type_0_can_t_be_used_to_index_type_1_7053", "Element implicitly has an 'any' type because expression of type '{0}' can't be used to index type '{1}'."),
+        No_index_signature_with_a_parameter_of_type_0_was_found_on_type_1: diag(7054, ts.DiagnosticCategory.Error, "No_index_signature_with_a_parameter_of_type_0_was_found_on_type_1_7054", "No index signature with a parameter of type '{0}' was found on type '{1}'."),
+        _0_which_lacks_return_type_annotation_implicitly_has_an_1_yield_type: diag(7055, ts.DiagnosticCategory.Error, "_0_which_lacks_return_type_annotation_implicitly_has_an_1_yield_type_7055", "'{0}', which lacks return-type annotation, implicitly has an '{1}' yield type."),
         You_cannot_rename_this_element: diag(8000, ts.DiagnosticCategory.Error, "You_cannot_rename_this_element_8000", "You cannot rename this element."),
         You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library: diag(8001, ts.DiagnosticCategory.Error, "You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library_8001", "You cannot rename elements that are defined in the standard TypeScript library."),
         import_can_only_be_used_in_a_ts_file: diag(8002, ts.DiagnosticCategory.Error, "import_can_only_be_used_in_a_ts_file_8002", "'import ... =' can only be used in a .ts file."),
@@ -6266,6 +6472,7 @@ var ts;
         JSDoc_types_may_be_moved_to_TypeScript_types: diag(80004, ts.DiagnosticCategory.Suggestion, "JSDoc_types_may_be_moved_to_TypeScript_types_80004", "JSDoc types may be moved to TypeScript types."),
         require_call_may_be_converted_to_an_import: diag(80005, ts.DiagnosticCategory.Suggestion, "require_call_may_be_converted_to_an_import_80005", "'require' call may be converted to an import."),
         This_may_be_converted_to_an_async_function: diag(80006, ts.DiagnosticCategory.Suggestion, "This_may_be_converted_to_an_async_function_80006", "This may be converted to an async function."),
+        await_has_no_effect_on_the_type_of_this_expression: diag(80007, ts.DiagnosticCategory.Suggestion, "await_has_no_effect_on_the_type_of_this_expression_80007", "'await' has no effect on the type of this expression."),
         Add_missing_super_call: diag(90001, ts.DiagnosticCategory.Message, "Add_missing_super_call_90001", "Add missing 'super()' call"),
         Make_super_call_the_first_statement_in_the_constructor: diag(90002, ts.DiagnosticCategory.Message, "Make_super_call_the_first_statement_in_the_constructor_90002", "Make 'super()' call the first statement in the constructor"),
         Change_extends_to_implements: diag(90003, ts.DiagnosticCategory.Message, "Change_extends_to_implements_90003", "Change 'extends' to 'implements'"),
@@ -6364,15 +6571,28 @@ var ts;
         Add_all_missing_imports: diag(95064, ts.DiagnosticCategory.Message, "Add_all_missing_imports_95064", "Add all missing imports"),
         Convert_to_async_function: diag(95065, ts.DiagnosticCategory.Message, "Convert_to_async_function_95065", "Convert to async function"),
         Convert_all_to_async_functions: diag(95066, ts.DiagnosticCategory.Message, "Convert_all_to_async_functions_95066", "Convert all to async functions"),
-        Generate_types_for_0: diag(95067, ts.DiagnosticCategory.Message, "Generate_types_for_0_95067", "Generate types for '{0}'"),
-        Generate_types_for_all_packages_without_types: diag(95068, ts.DiagnosticCategory.Message, "Generate_types_for_all_packages_without_types_95068", "Generate types for all packages without types"),
         Add_unknown_conversion_for_non_overlapping_types: diag(95069, ts.DiagnosticCategory.Message, "Add_unknown_conversion_for_non_overlapping_types_95069", "Add 'unknown' conversion for non-overlapping types"),
         Add_unknown_to_all_conversions_of_non_overlapping_types: diag(95070, ts.DiagnosticCategory.Message, "Add_unknown_to_all_conversions_of_non_overlapping_types_95070", "Add 'unknown' to all conversions of non-overlapping types"),
         Add_missing_new_operator_to_call: diag(95071, ts.DiagnosticCategory.Message, "Add_missing_new_operator_to_call_95071", "Add missing 'new' operator to call"),
         Add_missing_new_operator_to_all_calls: diag(95072, ts.DiagnosticCategory.Message, "Add_missing_new_operator_to_all_calls_95072", "Add missing 'new' operator to all calls"),
         Add_names_to_all_parameters_without_names: diag(95073, ts.DiagnosticCategory.Message, "Add_names_to_all_parameters_without_names_95073", "Add names to all parameters without names"),
         Enable_the_experimentalDecorators_option_in_your_configuration_file: diag(95074, ts.DiagnosticCategory.Message, "Enable_the_experimentalDecorators_option_in_your_configuration_file_95074", "Enable the 'experimentalDecorators' option in your configuration file"),
-        Convert_to_named_parameters: diag(95075, ts.DiagnosticCategory.Message, "Convert_to_named_parameters_95075", "Convert to named parameters"),
+        Convert_parameters_to_destructured_object: diag(95075, ts.DiagnosticCategory.Message, "Convert_parameters_to_destructured_object_95075", "Convert parameters to destructured object"),
+        Allow_accessing_UMD_globals_from_modules: diag(95076, ts.DiagnosticCategory.Message, "Allow_accessing_UMD_globals_from_modules_95076", "Allow accessing UMD globals from modules."),
+        Extract_type: diag(95077, ts.DiagnosticCategory.Message, "Extract_type_95077", "Extract type"),
+        Extract_to_type_alias: diag(95078, ts.DiagnosticCategory.Message, "Extract_to_type_alias_95078", "Extract to type alias"),
+        Extract_to_typedef: diag(95079, ts.DiagnosticCategory.Message, "Extract_to_typedef_95079", "Extract to typedef"),
+        Infer_this_type_of_0_from_usage: diag(95080, ts.DiagnosticCategory.Message, "Infer_this_type_of_0_from_usage_95080", "Infer 'this' type of '{0}' from usage"),
+        Add_const_to_unresolved_variable: diag(95081, ts.DiagnosticCategory.Message, "Add_const_to_unresolved_variable_95081", "Add 'const' to unresolved variable"),
+        Add_const_to_all_unresolved_variables: diag(95082, ts.DiagnosticCategory.Message, "Add_const_to_all_unresolved_variables_95082", "Add 'const' to all unresolved variables"),
+        Add_await: diag(95083, ts.DiagnosticCategory.Message, "Add_await_95083", "Add 'await'"),
+        Add_await_to_initializer_for_0: diag(95084, ts.DiagnosticCategory.Message, "Add_await_to_initializer_for_0_95084", "Add 'await' to initializer for '{0}'"),
+        Fix_all_expressions_possibly_missing_await: diag(95085, ts.DiagnosticCategory.Message, "Fix_all_expressions_possibly_missing_await_95085", "Fix all expressions possibly missing 'await'"),
+        Remove_unnecessary_await: diag(95086, ts.DiagnosticCategory.Message, "Remove_unnecessary_await_95086", "Remove unnecessary 'await'"),
+        Remove_all_unnecessary_uses_of_await: diag(95087, ts.DiagnosticCategory.Message, "Remove_all_unnecessary_uses_of_await_95087", "Remove all unnecessary uses of 'await'"),
+        No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer: diag(18004, ts.DiagnosticCategory.Error, "No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer_18004", "No value exists in scope for the shorthand property '{0}'. Either declare one or provide an initializer."),
+        Classes_may_not_have_a_field_named_constructor: diag(18006, ts.DiagnosticCategory.Error, "Classes_may_not_have_a_field_named_constructor_18006", "Classes may not have a field named 'constructor'."),
+        JSX_expressions_may_not_use_the_comma_operator_Did_you_mean_to_write_an_array: diag(18007, ts.DiagnosticCategory.Error, "JSX_expressions_may_not_use_the_comma_operator_Did_you_mean_to_write_an_array_18007", "JSX expressions may not use the comma operator. Did you mean to write an array?"),
     };
 })(ts || (ts = {}));
 var ts;
@@ -6380,7 +6600,7 @@ var ts;
     var _a;
     /* @internal */
     function tokenIsIdentifierOrKeyword(token) {
-        return token >= 72 /* Identifier */;
+        return token >= 73 /* Identifier */;
     }
     ts.tokenIsIdentifierOrKeyword = tokenIsIdentifierOrKeyword;
     /* @internal */
@@ -6389,85 +6609,85 @@ var ts;
     }
     ts.tokenIsIdentifierOrKeywordOrGreaterThan = tokenIsIdentifierOrKeywordOrGreaterThan;
     var textToKeywordObj = (_a = {
-            abstract: 118 /* AbstractKeyword */,
-            any: 120 /* AnyKeyword */,
-            as: 119 /* AsKeyword */,
-            bigint: 146 /* BigIntKeyword */,
-            boolean: 123 /* BooleanKeyword */,
-            break: 73 /* BreakKeyword */,
-            case: 74 /* CaseKeyword */,
-            catch: 75 /* CatchKeyword */,
-            class: 76 /* ClassKeyword */,
-            continue: 78 /* ContinueKeyword */,
-            const: 77 /* ConstKeyword */
+            abstract: 119 /* AbstractKeyword */,
+            any: 121 /* AnyKeyword */,
+            as: 120 /* AsKeyword */,
+            bigint: 147 /* BigIntKeyword */,
+            boolean: 124 /* BooleanKeyword */,
+            break: 74 /* BreakKeyword */,
+            case: 75 /* CaseKeyword */,
+            catch: 76 /* CatchKeyword */,
+            class: 77 /* ClassKeyword */,
+            continue: 79 /* ContinueKeyword */,
+            const: 78 /* ConstKeyword */
         },
-        _a["" + "constructor"] = 124 /* ConstructorKeyword */,
-        _a.debugger = 79 /* DebuggerKeyword */,
-        _a.declare = 125 /* DeclareKeyword */,
-        _a.default = 80 /* DefaultKeyword */,
-        _a.delete = 81 /* DeleteKeyword */,
-        _a.do = 82 /* DoKeyword */,
-        _a.else = 83 /* ElseKeyword */,
-        _a.enum = 84 /* EnumKeyword */,
-        _a.export = 85 /* ExportKeyword */,
-        _a.extends = 86 /* ExtendsKeyword */,
-        _a.false = 87 /* FalseKeyword */,
-        _a.finally = 88 /* FinallyKeyword */,
-        _a.for = 89 /* ForKeyword */,
-        _a.from = 144 /* FromKeyword */,
-        _a.function = 90 /* FunctionKeyword */,
-        _a.get = 126 /* GetKeyword */,
-        _a.if = 91 /* IfKeyword */,
-        _a.implements = 109 /* ImplementsKeyword */,
-        _a.import = 92 /* ImportKeyword */,
-        _a.in = 93 /* InKeyword */,
-        _a.infer = 127 /* InferKeyword */,
-        _a.instanceof = 94 /* InstanceOfKeyword */,
-        _a.interface = 110 /* InterfaceKeyword */,
-        _a.is = 128 /* IsKeyword */,
-        _a.keyof = 129 /* KeyOfKeyword */,
-        _a.let = 111 /* LetKeyword */,
-        _a.module = 130 /* ModuleKeyword */,
-        _a.namespace = 131 /* NamespaceKeyword */,
-        _a.never = 132 /* NeverKeyword */,
-        _a.new = 95 /* NewKeyword */,
-        _a.null = 96 /* NullKeyword */,
-        _a.number = 135 /* NumberKeyword */,
-        _a.object = 136 /* ObjectKeyword */,
-        _a.package = 112 /* PackageKeyword */,
-        _a.private = 113 /* PrivateKeyword */,
-        _a.protected = 114 /* ProtectedKeyword */,
-        _a.public = 115 /* PublicKeyword */,
-        _a.readonly = 133 /* ReadonlyKeyword */,
-        _a.require = 134 /* RequireKeyword */,
-        _a.global = 145 /* GlobalKeyword */,
-        _a.return = 97 /* ReturnKeyword */,
-        _a.set = 137 /* SetKeyword */,
-        _a.static = 116 /* StaticKeyword */,
-        _a.string = 138 /* StringKeyword */,
-        _a.super = 98 /* SuperKeyword */,
-        _a.switch = 99 /* SwitchKeyword */,
-        _a.symbol = 139 /* SymbolKeyword */,
-        _a.this = 100 /* ThisKeyword */,
-        _a.throw = 101 /* ThrowKeyword */,
-        _a.true = 102 /* TrueKeyword */,
-        _a.try = 103 /* TryKeyword */,
-        _a.type = 140 /* TypeKeyword */,
-        _a.typeof = 104 /* TypeOfKeyword */,
-        _a.undefined = 141 /* UndefinedKeyword */,
-        _a.unique = 142 /* UniqueKeyword */,
-        _a.unknown = 143 /* UnknownKeyword */,
-        _a.var = 105 /* VarKeyword */,
-        _a.void = 106 /* VoidKeyword */,
-        _a.while = 107 /* WhileKeyword */,
-        _a.with = 108 /* WithKeyword */,
-        _a.yield = 117 /* YieldKeyword */,
-        _a.async = 121 /* AsyncKeyword */,
-        _a.await = 122 /* AwaitKeyword */,
-        _a.of = 147 /* OfKeyword */,
+        _a["" + "constructor"] = 125 /* ConstructorKeyword */,
+        _a.debugger = 80 /* DebuggerKeyword */,
+        _a.declare = 126 /* DeclareKeyword */,
+        _a.default = 81 /* DefaultKeyword */,
+        _a.delete = 82 /* DeleteKeyword */,
+        _a.do = 83 /* DoKeyword */,
+        _a.else = 84 /* ElseKeyword */,
+        _a.enum = 85 /* EnumKeyword */,
+        _a.export = 86 /* ExportKeyword */,
+        _a.extends = 87 /* ExtendsKeyword */,
+        _a.false = 88 /* FalseKeyword */,
+        _a.finally = 89 /* FinallyKeyword */,
+        _a.for = 90 /* ForKeyword */,
+        _a.from = 145 /* FromKeyword */,
+        _a.function = 91 /* FunctionKeyword */,
+        _a.get = 127 /* GetKeyword */,
+        _a.if = 92 /* IfKeyword */,
+        _a.implements = 110 /* ImplementsKeyword */,
+        _a.import = 93 /* ImportKeyword */,
+        _a.in = 94 /* InKeyword */,
+        _a.infer = 128 /* InferKeyword */,
+        _a.instanceof = 95 /* InstanceOfKeyword */,
+        _a.interface = 111 /* InterfaceKeyword */,
+        _a.is = 129 /* IsKeyword */,
+        _a.keyof = 130 /* KeyOfKeyword */,
+        _a.let = 112 /* LetKeyword */,
+        _a.module = 131 /* ModuleKeyword */,
+        _a.namespace = 132 /* NamespaceKeyword */,
+        _a.never = 133 /* NeverKeyword */,
+        _a.new = 96 /* NewKeyword */,
+        _a.null = 97 /* NullKeyword */,
+        _a.number = 136 /* NumberKeyword */,
+        _a.object = 137 /* ObjectKeyword */,
+        _a.package = 113 /* PackageKeyword */,
+        _a.private = 114 /* PrivateKeyword */,
+        _a.protected = 115 /* ProtectedKeyword */,
+        _a.public = 116 /* PublicKeyword */,
+        _a.readonly = 134 /* ReadonlyKeyword */,
+        _a.require = 135 /* RequireKeyword */,
+        _a.global = 146 /* GlobalKeyword */,
+        _a.return = 98 /* ReturnKeyword */,
+        _a.set = 138 /* SetKeyword */,
+        _a.static = 117 /* StaticKeyword */,
+        _a.string = 139 /* StringKeyword */,
+        _a.super = 99 /* SuperKeyword */,
+        _a.switch = 100 /* SwitchKeyword */,
+        _a.symbol = 140 /* SymbolKeyword */,
+        _a.this = 101 /* ThisKeyword */,
+        _a.throw = 102 /* ThrowKeyword */,
+        _a.true = 103 /* TrueKeyword */,
+        _a.try = 104 /* TryKeyword */,
+        _a.type = 141 /* TypeKeyword */,
+        _a.typeof = 105 /* TypeOfKeyword */,
+        _a.undefined = 142 /* UndefinedKeyword */,
+        _a.unique = 143 /* UniqueKeyword */,
+        _a.unknown = 144 /* UnknownKeyword */,
+        _a.var = 106 /* VarKeyword */,
+        _a.void = 107 /* VoidKeyword */,
+        _a.while = 108 /* WhileKeyword */,
+        _a.with = 109 /* WithKeyword */,
+        _a.yield = 118 /* YieldKeyword */,
+        _a.async = 122 /* AsyncKeyword */,
+        _a.await = 123 /* AwaitKeyword */,
+        _a.of = 148 /* OfKeyword */,
         _a);
     var textToKeyword = ts.createMapFromTemplate(textToKeywordObj);
-    var textToToken = ts.createMapFromTemplate(__assign({}, textToKeywordObj, { "{": 18 /* OpenBraceToken */, "}": 19 /* CloseBraceToken */, "(": 20 /* OpenParenToken */, ")": 21 /* CloseParenToken */, "[": 22 /* OpenBracketToken */, "]": 23 /* CloseBracketToken */, ".": 24 /* DotToken */, "...": 25 /* DotDotDotToken */, ";": 26 /* SemicolonToken */, ",": 27 /* CommaToken */, "<": 28 /* LessThanToken */, ">": 30 /* GreaterThanToken */, "<=": 31 /* LessThanEqualsToken */, ">=": 32 /* GreaterThanEqualsToken */, "==": 33 /* EqualsEqualsToken */, "!=": 34 /* ExclamationEqualsToken */, "===": 35 /* EqualsEqualsEqualsToken */, "!==": 36 /* ExclamationEqualsEqualsToken */, "=>": 37 /* EqualsGreaterThanToken */, "+": 38 /* PlusToken */, "-": 39 /* MinusToken */, "**": 41 /* AsteriskAsteriskToken */, "*": 40 /* AsteriskToken */, "/": 42 /* SlashToken */, "%": 43 /* PercentToken */, "++": 44 /* PlusPlusToken */, "--": 45 /* MinusMinusToken */, "<<": 46 /* LessThanLessThanToken */, "</": 29 /* LessThanSlashToken */, ">>": 47 /* GreaterThanGreaterThanToken */, ">>>": 48 /* GreaterThanGreaterThanGreaterThanToken */, "&": 49 /* AmpersandToken */, "|": 50 /* BarToken */, "^": 51 /* CaretToken */, "!": 52 /* ExclamationToken */, "~": 53 /* TildeToken */, "&&": 54 /* AmpersandAmpersandToken */, "||": 55 /* BarBarToken */, "?": 56 /* QuestionToken */, ":": 57 /* ColonToken */, "=": 59 /* EqualsToken */, "+=": 60 /* PlusEqualsToken */, "-=": 61 /* MinusEqualsToken */, "*=": 62 /* AsteriskEqualsToken */, "**=": 63 /* AsteriskAsteriskEqualsToken */, "/=": 64 /* SlashEqualsToken */, "%=": 65 /* PercentEqualsToken */, "<<=": 66 /* LessThanLessThanEqualsToken */, ">>=": 67 /* GreaterThanGreaterThanEqualsToken */, ">>>=": 68 /* GreaterThanGreaterThanGreaterThanEqualsToken */, "&=": 69 /* AmpersandEqualsToken */, "|=": 70 /* BarEqualsToken */, "^=": 71 /* CaretEqualsToken */, "@": 58 /* AtToken */ }));
+    var textToToken = ts.createMapFromTemplate(__assign({}, textToKeywordObj, { "{": 18 /* OpenBraceToken */, "}": 19 /* CloseBraceToken */, "(": 20 /* OpenParenToken */, ")": 21 /* CloseParenToken */, "[": 22 /* OpenBracketToken */, "]": 23 /* CloseBracketToken */, ".": 24 /* DotToken */, "...": 25 /* DotDotDotToken */, ";": 26 /* SemicolonToken */, ",": 27 /* CommaToken */, "<": 28 /* LessThanToken */, ">": 30 /* GreaterThanToken */, "<=": 31 /* LessThanEqualsToken */, ">=": 32 /* GreaterThanEqualsToken */, "==": 33 /* EqualsEqualsToken */, "!=": 34 /* ExclamationEqualsToken */, "===": 35 /* EqualsEqualsEqualsToken */, "!==": 36 /* ExclamationEqualsEqualsToken */, "=>": 37 /* EqualsGreaterThanToken */, "+": 38 /* PlusToken */, "-": 39 /* MinusToken */, "**": 41 /* AsteriskAsteriskToken */, "*": 40 /* AsteriskToken */, "/": 42 /* SlashToken */, "%": 43 /* PercentToken */, "++": 44 /* PlusPlusToken */, "--": 45 /* MinusMinusToken */, "<<": 46 /* LessThanLessThanToken */, "</": 29 /* LessThanSlashToken */, ">>": 47 /* GreaterThanGreaterThanToken */, ">>>": 48 /* GreaterThanGreaterThanGreaterThanToken */, "&": 49 /* AmpersandToken */, "|": 50 /* BarToken */, "^": 51 /* CaretToken */, "!": 52 /* ExclamationToken */, "~": 53 /* TildeToken */, "&&": 54 /* AmpersandAmpersandToken */, "||": 55 /* BarBarToken */, "?": 56 /* QuestionToken */, ":": 57 /* ColonToken */, "=": 60 /* EqualsToken */, "+=": 61 /* PlusEqualsToken */, "-=": 62 /* MinusEqualsToken */, "*=": 63 /* AsteriskEqualsToken */, "**=": 64 /* AsteriskAsteriskEqualsToken */, "/=": 65 /* SlashEqualsToken */, "%=": 66 /* PercentEqualsToken */, "<<=": 67 /* LessThanLessThanEqualsToken */, ">>=": 68 /* GreaterThanGreaterThanEqualsToken */, ">>>=": 69 /* GreaterThanGreaterThanGreaterThanEqualsToken */, "&=": 70 /* AmpersandEqualsToken */, "|=": 71 /* BarEqualsToken */, "^=": 72 /* CaretEqualsToken */, "@": 58 /* AtToken */, "`": 59 /* BacktickToken */ }));
     /*
         As per ECMAScript Language Specification 3th Edition, Section 7.6: Identifiers
         IdentifierStart ::
@@ -7081,8 +7301,8 @@ var ts;
             getTokenValue: function () { return tokenValue; },
             hasExtendedUnicodeEscape: function () { return (tokenFlags & 8 /* ExtendedUnicodeEscape */) !== 0; },
             hasPrecedingLineBreak: function () { return (tokenFlags & 1 /* PrecedingLineBreak */) !== 0; },
-            isIdentifier: function () { return token === 72 /* Identifier */ || token > 108 /* LastReservedWord */; },
-            isReservedWord: function () { return token >= 73 /* FirstReservedWord */ && token <= 108 /* LastReservedWord */; },
+            isIdentifier: function () { return token === 73 /* Identifier */ || token > 109 /* LastReservedWord */; },
+            isReservedWord: function () { return token >= 74 /* FirstReservedWord */ && token <= 109 /* LastReservedWord */; },
             isUnterminated: function () { return (tokenFlags & 4 /* Unterminated */) !== 0; },
             getTokenFlags: function () { return tokenFlags; },
             reScanGreaterToken: reScanGreaterToken,
@@ -7093,7 +7313,7 @@ var ts;
             reScanJsxToken: reScanJsxToken,
             reScanLessThanToken: reScanLessThanToken,
             scanJsxToken: scanJsxToken,
-            scanJSDocToken: scanJSDocToken,
+            scanJsDocToken: scanJsDocToken,
             scan: scan,
             getText: getText,
             setText: setText,
@@ -7533,7 +7753,7 @@ var ts;
                     }
                 }
             }
-            return token = 72 /* Identifier */;
+            return token = 73 /* Identifier */;
         }
         function scanBinaryOrOctalDigits(base) {
             var value = "";
@@ -7682,7 +7902,7 @@ var ts;
                         return token = scanTemplateAndSetTokenValue();
                     case 37 /* percent */:
                         if (text.charCodeAt(pos + 1) === 61 /* equals */) {
-                            return pos += 2, token = 65 /* PercentEqualsToken */;
+                            return pos += 2, token = 66 /* PercentEqualsToken */;
                         }
                         pos++;
                         return token = 43 /* PercentToken */;
@@ -7691,7 +7911,7 @@ var ts;
                             return pos += 2, token = 54 /* AmpersandAmpersandToken */;
                         }
                         if (text.charCodeAt(pos + 1) === 61 /* equals */) {
-                            return pos += 2, token = 69 /* AmpersandEqualsToken */;
+                            return pos += 2, token = 70 /* AmpersandEqualsToken */;
                         }
                         pos++;
                         return token = 49 /* AmpersandToken */;
@@ -7703,11 +7923,11 @@ var ts;
                         return token = 21 /* CloseParenToken */;
                     case 42 /* asterisk */:
                         if (text.charCodeAt(pos + 1) === 61 /* equals */) {
-                            return pos += 2, token = 62 /* AsteriskEqualsToken */;
+                            return pos += 2, token = 63 /* AsteriskEqualsToken */;
                         }
                         if (text.charCodeAt(pos + 1) === 42 /* asterisk */) {
                             if (text.charCodeAt(pos + 2) === 61 /* equals */) {
-                                return pos += 3, token = 63 /* AsteriskAsteriskEqualsToken */;
+                                return pos += 3, token = 64 /* AsteriskAsteriskEqualsToken */;
                             }
                             return pos += 2, token = 41 /* AsteriskAsteriskToken */;
                         }
@@ -7723,7 +7943,7 @@ var ts;
                             return pos += 2, token = 44 /* PlusPlusToken */;
                         }
                         if (text.charCodeAt(pos + 1) === 61 /* equals */) {
-                            return pos += 2, token = 60 /* PlusEqualsToken */;
+                            return pos += 2, token = 61 /* PlusEqualsToken */;
                         }
                         pos++;
                         return token = 38 /* PlusToken */;
@@ -7735,7 +7955,7 @@ var ts;
                             return pos += 2, token = 45 /* MinusMinusToken */;
                         }
                         if (text.charCodeAt(pos + 1) === 61 /* equals */) {
-                            return pos += 2, token = 61 /* MinusEqualsToken */;
+                            return pos += 2, token = 62 /* MinusEqualsToken */;
                         }
                         pos++;
                         return token = 39 /* MinusToken */;
@@ -7799,7 +8019,7 @@ var ts;
                             }
                         }
                         if (text.charCodeAt(pos + 1) === 61 /* equals */) {
-                            return pos += 2, token = 64 /* SlashEqualsToken */;
+                            return pos += 2, token = 65 /* SlashEqualsToken */;
                         }
                         pos++;
                         return token = 42 /* SlashToken */;
@@ -7876,7 +8096,7 @@ var ts;
                         }
                         if (text.charCodeAt(pos + 1) === 60 /* lessThan */) {
                             if (text.charCodeAt(pos + 2) === 61 /* equals */) {
-                                return pos += 3, token = 66 /* LessThanLessThanEqualsToken */;
+                                return pos += 3, token = 67 /* LessThanLessThanEqualsToken */;
                             }
                             return pos += 2, token = 46 /* LessThanLessThanToken */;
                         }
@@ -7910,7 +8130,7 @@ var ts;
                             return pos += 2, token = 37 /* EqualsGreaterThanToken */;
                         }
                         pos++;
-                        return token = 59 /* EqualsToken */;
+                        return token = 60 /* EqualsToken */;
                     case 62 /* greaterThan */:
                         if (isConflictMarkerTrivia(text, pos)) {
                             pos = scanConflictMarkerTrivia(text, pos, error);
@@ -7934,7 +8154,7 @@ var ts;
                         return token = 23 /* CloseBracketToken */;
                     case 94 /* caret */:
                         if (text.charCodeAt(pos + 1) === 61 /* equals */) {
-                            return pos += 2, token = 71 /* CaretEqualsToken */;
+                            return pos += 2, token = 72 /* CaretEqualsToken */;
                         }
                         pos++;
                         return token = 51 /* CaretToken */;
@@ -7955,7 +8175,7 @@ var ts;
                             return pos += 2, token = 55 /* BarBarToken */;
                         }
                         if (text.charCodeAt(pos + 1) === 61 /* equals */) {
-                            return pos += 2, token = 70 /* BarEqualsToken */;
+                            return pos += 2, token = 71 /* BarEqualsToken */;
                         }
                         pos++;
                         return token = 50 /* BarToken */;
@@ -8009,12 +8229,12 @@ var ts;
                 if (text.charCodeAt(pos) === 62 /* greaterThan */) {
                     if (text.charCodeAt(pos + 1) === 62 /* greaterThan */) {
                         if (text.charCodeAt(pos + 2) === 61 /* equals */) {
-                            return pos += 3, token = 68 /* GreaterThanGreaterThanGreaterThanEqualsToken */;
+                            return pos += 3, token = 69 /* GreaterThanGreaterThanGreaterThanEqualsToken */;
                         }
                         return pos += 2, token = 48 /* GreaterThanGreaterThanGreaterThanToken */;
                     }
                     if (text.charCodeAt(pos + 1) === 61 /* equals */) {
-                        return pos += 2, token = 67 /* GreaterThanGreaterThanEqualsToken */;
+                        return pos += 2, token = 68 /* GreaterThanGreaterThanEqualsToken */;
                     }
                     pos++;
                     return token = 47 /* GreaterThanGreaterThanToken */;
@@ -8027,7 +8247,7 @@ var ts;
             return token;
         }
         function reScanSlashToken() {
-            if (token === 42 /* SlashToken */ || token === 64 /* SlashEqualsToken */) {
+            if (token === 42 /* SlashToken */ || token === 65 /* SlashEqualsToken */) {
                 var p = tokenPos + 1;
                 var inEscape = false;
                 var inCharacterClass = false;
@@ -8143,6 +8363,7 @@ var ts;
                 }
                 pos++;
             }
+            tokenValue = text.substring(startPos, pos);
             return firstNonWhitespace === -1 ? 12 /* JsxTextAllWhiteSpaces */ : 11 /* JsxText */;
         }
         // Scans a JSX identifier; these differ from normal identifiers in that
@@ -8175,7 +8396,7 @@ var ts;
                     return scan();
             }
         }
-        function scanJSDocToken() {
+        function scanJsDocToken() {
             startPos = tokenPos = pos;
             tokenFlags = 0;
             if (pos >= end) {
@@ -8210,22 +8431,19 @@ var ts;
                     return token = 23 /* CloseBracketToken */;
                 case 60 /* lessThan */:
                     return token = 28 /* LessThanToken */;
+                case 62 /* greaterThan */:
+                    return token = 30 /* GreaterThanToken */;
                 case 61 /* equals */:
-                    return token = 59 /* EqualsToken */;
+                    return token = 60 /* EqualsToken */;
                 case 44 /* comma */:
                     return token = 27 /* CommaToken */;
                 case 46 /* dot */:
                     return token = 24 /* DotToken */;
                 case 96 /* backtick */:
-                    while (pos < end && text.charCodeAt(pos) !== 96 /* backtick */) {
-                        pos++;
-                    }
-                    tokenValue = text.substring(tokenPos + 1, pos);
-                    pos++;
-                    return token = 14 /* NoSubstitutionTemplateLiteral */;
+                    return token = 59 /* BacktickToken */;
             }
-            if (isIdentifierStart(ch, 7 /* Latest */)) {
-                while (isIdentifierPart(text.charCodeAt(pos), 7 /* Latest */) && pos < end) {
+            if (isIdentifierStart(ch, 99 /* Latest */)) {
+                while (isIdentifierPart(text.charCodeAt(pos), 99 /* Latest */) && pos < end) {
                     pos++;
                 }
                 tokenValue = text.substring(tokenPos, pos);
@@ -8410,11 +8628,16 @@ var ts;
     }
     ts.toPath = toPath;
     function changesAffectModuleResolution(oldOptions, newOptions) {
-        return oldOptions.configFilePath !== newOptions.configFilePath || ts.moduleResolutionOptionDeclarations.some(function (o) {
+        return oldOptions.configFilePath !== newOptions.configFilePath ||
+            optionsHaveModuleResolutionChanges(oldOptions, newOptions);
+    }
+    ts.changesAffectModuleResolution = changesAffectModuleResolution;
+    function optionsHaveModuleResolutionChanges(oldOptions, newOptions) {
+        return ts.moduleResolutionOptionDeclarations.some(function (o) {
             return !ts.isJsonEqual(ts.getCompilerOptionValue(oldOptions, o), ts.getCompilerOptionValue(newOptions, o));
         });
     }
-    ts.changesAffectModuleResolution = changesAffectModuleResolution;
+    ts.optionsHaveModuleResolutionChanges = optionsHaveModuleResolutionChanges;
     function findAncestor(node, callback) {
         while (node) {
             var result = callback(node);
@@ -8443,10 +8666,9 @@ var ts;
     }
     ts.forEachAncestor = forEachAncestor;
     function forEachEntry(map, callback) {
-        var _a;
         var iterator = map.entries();
-        for (var _b = iterator.next(), pair = _b.value, done = _b.done; !done; _a = iterator.next(), pair = _a.value, done = _a.done, _a) {
-            var key = pair[0], value = pair[1];
+        for (var iterResult = iterator.next(); !iterResult.done; iterResult = iterator.next()) {
+            var _a = iterResult.value, key = _a[0], value = _a[1];
             var result = callback(value, key);
             if (result) {
                 return result;
@@ -8456,10 +8678,9 @@ var ts;
     }
     ts.forEachEntry = forEachEntry;
     function forEachKey(map, callback) {
-        var _a;
         var iterator = map.keys();
-        for (var _b = iterator.next(), key = _b.value, done = _b.done; !done; _a = iterator.next(), key = _a.value, done = _a.done, _a) {
-            var result = callback(key);
+        for (var iterResult = iterator.next(); !iterResult.done; iterResult = iterator.next()) {
+            var result = callback(iterResult.value);
             if (result) {
                 return result;
             }
@@ -8583,7 +8804,7 @@ var ts;
         }
     }
     function getSourceFileOfNode(node) {
-        while (node && node.kind !== 284 /* SourceFile */) {
+        while (node && node.kind !== 285 /* SourceFile */) {
             node = node.parent;
         }
         return node;
@@ -8591,11 +8812,11 @@ var ts;
     ts.getSourceFileOfNode = getSourceFileOfNode;
     function isStatementWithLocals(node) {
         switch (node.kind) {
-            case 218 /* Block */:
-            case 246 /* CaseBlock */:
-            case 225 /* ForStatement */:
-            case 226 /* ForInStatement */:
-            case 227 /* ForOfStatement */:
+            case 219 /* Block */:
+            case 247 /* CaseBlock */:
+            case 226 /* ForStatement */:
+            case 227 /* ForInStatement */:
+            case 228 /* ForOfStatement */:
                 return true;
         }
         return false;
@@ -8763,7 +8984,7 @@ var ts;
         // the syntax list itself considers them as normal trivia. Therefore if we simply skip
         // trivia for the list, we may have skipped the JSDocComment as well. So we should process its
         // first child to determine the actual position of its first token.
-        if (node.kind === 311 /* SyntaxList */ && node._children.length > 0) {
+        if (node.kind === 313 /* SyntaxList */ && node._children.length > 0) {
             return getTokenPosOfNode(node._children[0], sourceFile, includeJsDoc);
         }
         return ts.skipTrivia((sourceFile || getSourceFileOfNode(node)).text, node.pos);
@@ -8782,7 +9003,7 @@ var ts;
     }
     ts.getSourceTextOfNodeFromSourceFile = getSourceTextOfNodeFromSourceFile;
     function isJSDocTypeExpressionOrChild(node) {
-        return node.kind === 288 /* JSDocTypeExpression */ || (node.parent && isJSDocTypeExpressionOrChild(node.parent));
+        return node.kind === 289 /* JSDocTypeExpression */ || (node.parent && isJSDocTypeExpressionOrChild(node.parent));
     }
     function getTextOfNodeFromSourceText(sourceText, node, includeTrivia) {
         if (includeTrivia === void 0) { includeTrivia = false; }
@@ -8874,7 +9095,7 @@ var ts;
     ts.isBlockOrCatchScoped = isBlockOrCatchScoped;
     function isCatchClauseVariableDeclarationOrBindingElement(declaration) {
         var node = getRootDeclaration(declaration);
-        return node.kind === 237 /* VariableDeclaration */ && node.parent.kind === 274 /* CatchClause */;
+        return node.kind === 238 /* VariableDeclaration */ && node.parent.kind === 275 /* CatchClause */;
     }
     ts.isCatchClauseVariableDeclarationOrBindingElement = isCatchClauseVariableDeclarationOrBindingElement;
     function isAmbientModule(node) {
@@ -8906,11 +9127,11 @@ var ts;
     ts.isShorthandAmbientModuleSymbol = isShorthandAmbientModuleSymbol;
     function isShorthandAmbientModule(node) {
         // The only kind of module that can be missing a body is a shorthand ambient module.
-        return node && node.kind === 244 /* ModuleDeclaration */ && (!node.body);
+        return node && node.kind === 245 /* ModuleDeclaration */ && (!node.body);
     }
     function isBlockScopedContainerTopLevel(node) {
-        return node.kind === 284 /* SourceFile */ ||
-            node.kind === 244 /* ModuleDeclaration */ ||
+        return node.kind === 285 /* SourceFile */ ||
+            node.kind === 245 /* ModuleDeclaration */ ||
             ts.isFunctionLike(node);
     }
     ts.isBlockScopedContainerTopLevel = isBlockScopedContainerTopLevel;
@@ -8927,9 +9148,9 @@ var ts;
         // - defined in the top level scope and source file is an external module
         // - defined inside ambient module declaration located in the top level scope and source file not an external module
         switch (node.parent.kind) {
-            case 284 /* SourceFile */:
+            case 285 /* SourceFile */:
                 return ts.isExternalModule(node.parent);
-            case 245 /* ModuleBlock */:
+            case 246 /* ModuleBlock */:
                 return isAmbientModule(node.parent.parent) && ts.isSourceFile(node.parent.parent.parent) && !ts.isExternalModule(node.parent.parent.parent);
         }
         return false;
@@ -8945,22 +9166,22 @@ var ts;
     ts.isEffectiveExternalModule = isEffectiveExternalModule;
     function isBlockScope(node, parentNode) {
         switch (node.kind) {
-            case 284 /* SourceFile */:
-            case 246 /* CaseBlock */:
-            case 274 /* CatchClause */:
-            case 244 /* ModuleDeclaration */:
-            case 225 /* ForStatement */:
-            case 226 /* ForInStatement */:
-            case 227 /* ForOfStatement */:
-            case 157 /* Constructor */:
-            case 156 /* MethodDeclaration */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
-            case 239 /* FunctionDeclaration */:
-            case 196 /* FunctionExpression */:
-            case 197 /* ArrowFunction */:
+            case 285 /* SourceFile */:
+            case 247 /* CaseBlock */:
+            case 275 /* CatchClause */:
+            case 245 /* ModuleDeclaration */:
+            case 226 /* ForStatement */:
+            case 227 /* ForInStatement */:
+            case 228 /* ForOfStatement */:
+            case 158 /* Constructor */:
+            case 157 /* MethodDeclaration */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
+            case 240 /* FunctionDeclaration */:
+            case 197 /* FunctionExpression */:
+            case 198 /* ArrowFunction */:
                 return true;
-            case 218 /* Block */:
+            case 219 /* Block */:
                 // function block is not considered block-scope container
                 // see comment in binder.ts: bind(...), case for SyntaxKind.Block
                 return !ts.isFunctionLike(parentNode);
@@ -8970,9 +9191,9 @@ var ts;
     ts.isBlockScope = isBlockScope;
     function isDeclarationWithTypeParameters(node) {
         switch (node.kind) {
-            case 302 /* JSDocCallbackTag */:
-            case 309 /* JSDocTypedefTag */:
-            case 298 /* JSDocSignature */:
+            case 304 /* JSDocCallbackTag */:
+            case 311 /* JSDocTypedefTag */:
+            case 299 /* JSDocSignature */:
                 return true;
             default:
                 ts.assertType(node);
@@ -8982,25 +9203,25 @@ var ts;
     ts.isDeclarationWithTypeParameters = isDeclarationWithTypeParameters;
     function isDeclarationWithTypeParameterChildren(node) {
         switch (node.kind) {
-            case 160 /* CallSignature */:
-            case 161 /* ConstructSignature */:
-            case 155 /* MethodSignature */:
-            case 162 /* IndexSignature */:
-            case 165 /* FunctionType */:
-            case 166 /* ConstructorType */:
-            case 294 /* JSDocFunctionType */:
-            case 240 /* ClassDeclaration */:
-            case 209 /* ClassExpression */:
-            case 241 /* InterfaceDeclaration */:
-            case 242 /* TypeAliasDeclaration */:
-            case 308 /* JSDocTemplateTag */:
-            case 239 /* FunctionDeclaration */:
-            case 156 /* MethodDeclaration */:
-            case 157 /* Constructor */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
-            case 196 /* FunctionExpression */:
-            case 197 /* ArrowFunction */:
+            case 161 /* CallSignature */:
+            case 162 /* ConstructSignature */:
+            case 156 /* MethodSignature */:
+            case 163 /* IndexSignature */:
+            case 166 /* FunctionType */:
+            case 167 /* ConstructorType */:
+            case 295 /* JSDocFunctionType */:
+            case 241 /* ClassDeclaration */:
+            case 210 /* ClassExpression */:
+            case 242 /* InterfaceDeclaration */:
+            case 243 /* TypeAliasDeclaration */:
+            case 310 /* JSDocTemplateTag */:
+            case 240 /* FunctionDeclaration */:
+            case 157 /* MethodDeclaration */:
+            case 158 /* Constructor */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
+            case 197 /* FunctionExpression */:
+            case 198 /* ArrowFunction */:
                 return true;
             default:
                 ts.assertType(node);
@@ -9010,8 +9231,8 @@ var ts;
     ts.isDeclarationWithTypeParameterChildren = isDeclarationWithTypeParameterChildren;
     function isAnyImportSyntax(node) {
         switch (node.kind) {
-            case 249 /* ImportDeclaration */:
-            case 248 /* ImportEqualsDeclaration */:
+            case 250 /* ImportDeclaration */:
+            case 249 /* ImportEqualsDeclaration */:
                 return true;
             default:
                 return false;
@@ -9020,15 +9241,15 @@ var ts;
     ts.isAnyImportSyntax = isAnyImportSyntax;
     function isLateVisibilityPaintedStatement(node) {
         switch (node.kind) {
-            case 249 /* ImportDeclaration */:
-            case 248 /* ImportEqualsDeclaration */:
-            case 219 /* VariableStatement */:
-            case 240 /* ClassDeclaration */:
-            case 239 /* FunctionDeclaration */:
-            case 244 /* ModuleDeclaration */:
-            case 242 /* TypeAliasDeclaration */:
-            case 241 /* InterfaceDeclaration */:
-            case 243 /* EnumDeclaration */:
+            case 250 /* ImportDeclaration */:
+            case 249 /* ImportEqualsDeclaration */:
+            case 220 /* VariableStatement */:
+            case 241 /* ClassDeclaration */:
+            case 240 /* FunctionDeclaration */:
+            case 245 /* ModuleDeclaration */:
+            case 243 /* TypeAliasDeclaration */:
+            case 242 /* InterfaceDeclaration */:
+            case 244 /* EnumDeclaration */:
                 return true;
             default:
                 return false;
@@ -9058,13 +9279,13 @@ var ts;
     ts.getNameFromIndexInfo = getNameFromIndexInfo;
     function getTextOfPropertyName(name) {
         switch (name.kind) {
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 return name.escapedText;
             case 10 /* StringLiteral */:
             case 8 /* NumericLiteral */:
             case 14 /* NoSubstitutionTemplateLiteral */:
                 return ts.escapeLeadingUnderscores(name.text);
-            case 149 /* ComputedPropertyName */:
+            case 150 /* ComputedPropertyName */:
                 if (isStringOrNumericLiteralLike(name.expression))
                     return ts.escapeLeadingUnderscores(name.expression.text);
                 return ts.Debug.fail("Text of property name cannot be read from non-literal-valued ComputedPropertyNames");
@@ -9075,11 +9296,11 @@ var ts;
     ts.getTextOfPropertyName = getTextOfPropertyName;
     function entityNameToString(name) {
         switch (name.kind) {
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 return getFullWidth(name) === 0 ? ts.idText(name) : getTextOfNode(name);
-            case 148 /* QualifiedName */:
+            case 149 /* QualifiedName */:
                 return entityNameToString(name.left) + "." + entityNameToString(name.right);
-            case 189 /* PropertyAccessExpression */:
+            case 190 /* PropertyAccessExpression */:
                 return entityNameToString(name.expression) + "." + entityNameToString(name.name);
             default:
                 throw ts.Debug.assertNever(name);
@@ -9124,7 +9345,7 @@ var ts;
     ts.getSpanOfTokenAtPosition = getSpanOfTokenAtPosition;
     function getErrorSpanForArrowFunction(sourceFile, node) {
         var pos = ts.skipTrivia(sourceFile.text, node.pos);
-        if (node.body && node.body.kind === 218 /* Block */) {
+        if (node.body && node.body.kind === 219 /* Block */) {
             var startLine = ts.getLineAndCharacterOfPosition(sourceFile, node.body.pos).line;
             var endLine = ts.getLineAndCharacterOfPosition(sourceFile, node.body.end).line;
             if (startLine < endLine) {
@@ -9138,7 +9359,7 @@ var ts;
     function getErrorSpanForNode(sourceFile, node) {
         var errorNode = node;
         switch (node.kind) {
-            case 284 /* SourceFile */:
+            case 285 /* SourceFile */:
                 var pos_1 = ts.skipTrivia(sourceFile.text, 0, /*stopAfterLineBreak*/ false);
                 if (pos_1 === sourceFile.text.length) {
                     // file is empty - return span for the beginning of the file
@@ -9147,25 +9368,25 @@ var ts;
                 return getSpanOfTokenAtPosition(sourceFile, pos_1);
             // This list is a work in progress. Add missing node kinds to improve their error
             // spans.
-            case 237 /* VariableDeclaration */:
-            case 186 /* BindingElement */:
-            case 240 /* ClassDeclaration */:
-            case 209 /* ClassExpression */:
-            case 241 /* InterfaceDeclaration */:
-            case 244 /* ModuleDeclaration */:
-            case 243 /* EnumDeclaration */:
-            case 278 /* EnumMember */:
-            case 239 /* FunctionDeclaration */:
-            case 196 /* FunctionExpression */:
-            case 156 /* MethodDeclaration */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
-            case 242 /* TypeAliasDeclaration */:
-            case 154 /* PropertyDeclaration */:
-            case 153 /* PropertySignature */:
+            case 238 /* VariableDeclaration */:
+            case 187 /* BindingElement */:
+            case 241 /* ClassDeclaration */:
+            case 210 /* ClassExpression */:
+            case 242 /* InterfaceDeclaration */:
+            case 245 /* ModuleDeclaration */:
+            case 244 /* EnumDeclaration */:
+            case 279 /* EnumMember */:
+            case 240 /* FunctionDeclaration */:
+            case 197 /* FunctionExpression */:
+            case 157 /* MethodDeclaration */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
+            case 243 /* TypeAliasDeclaration */:
+            case 155 /* PropertyDeclaration */:
+            case 154 /* PropertySignature */:
                 errorNode = node.name;
                 break;
-            case 197 /* ArrowFunction */:
+            case 198 /* ArrowFunction */:
                 return getErrorSpanForArrowFunction(sourceFile, node);
         }
         if (errorNode === undefined) {
@@ -9214,11 +9435,11 @@ var ts;
     }
     ts.isLet = isLet;
     function isSuperCall(n) {
-        return n.kind === 191 /* CallExpression */ && n.expression.kind === 98 /* SuperKeyword */;
+        return n.kind === 192 /* CallExpression */ && n.expression.kind === 99 /* SuperKeyword */;
     }
     ts.isSuperCall = isSuperCall;
     function isImportCall(n) {
-        return n.kind === 191 /* CallExpression */ && n.expression.kind === 92 /* ImportKeyword */;
+        return n.kind === 192 /* CallExpression */ && n.expression.kind === 93 /* ImportKeyword */;
     }
     ts.isImportCall = isImportCall;
     function isLiteralImportTypeNode(n) {
@@ -9226,7 +9447,7 @@ var ts;
     }
     ts.isLiteralImportTypeNode = isLiteralImportTypeNode;
     function isPrologueDirective(node) {
-        return node.kind === 221 /* ExpressionStatement */
+        return node.kind === 222 /* ExpressionStatement */
             && node.expression.kind === 10 /* StringLiteral */;
     }
     ts.isPrologueDirective = isPrologueDirective;
@@ -9235,11 +9456,11 @@ var ts;
     }
     ts.getLeadingCommentRangesOfNode = getLeadingCommentRangesOfNode;
     function getJSDocCommentRanges(node, text) {
-        var commentRanges = (node.kind === 151 /* Parameter */ ||
-            node.kind === 150 /* TypeParameter */ ||
-            node.kind === 196 /* FunctionExpression */ ||
-            node.kind === 197 /* ArrowFunction */ ||
-            node.kind === 195 /* ParenthesizedExpression */) ?
+        var commentRanges = (node.kind === 152 /* Parameter */ ||
+            node.kind === 151 /* TypeParameter */ ||
+            node.kind === 197 /* FunctionExpression */ ||
+            node.kind === 198 /* ArrowFunction */ ||
+            node.kind === 196 /* ParenthesizedExpression */) ?
             ts.concatenate(ts.getTrailingCommentRanges(text, node.pos), ts.getLeadingCommentRanges(text, node.pos)) :
             ts.getLeadingCommentRanges(text, node.pos);
         // True if the comment starts with '/**' but not if it is '/**/'
@@ -9255,48 +9476,48 @@ var ts;
     ts.fullTripleSlashAMDReferencePathRegEx = /^(\/\/\/\s*<amd-dependency\s+path\s*=\s*)('|")(.+?)\2.*?\/>/;
     var defaultLibReferenceRegEx = /^(\/\/\/\s*<reference\s+no-default-lib\s*=\s*)('|")(.+?)\2\s*\/>/;
     function isPartOfTypeNode(node) {
-        if (163 /* FirstTypeNode */ <= node.kind && node.kind <= 183 /* LastTypeNode */) {
+        if (164 /* FirstTypeNode */ <= node.kind && node.kind <= 184 /* LastTypeNode */) {
             return true;
         }
         switch (node.kind) {
-            case 120 /* AnyKeyword */:
-            case 143 /* UnknownKeyword */:
-            case 135 /* NumberKeyword */:
-            case 146 /* BigIntKeyword */:
-            case 138 /* StringKeyword */:
-            case 123 /* BooleanKeyword */:
-            case 139 /* SymbolKeyword */:
-            case 136 /* ObjectKeyword */:
-            case 141 /* UndefinedKeyword */:
-            case 132 /* NeverKeyword */:
+            case 121 /* AnyKeyword */:
+            case 144 /* UnknownKeyword */:
+            case 136 /* NumberKeyword */:
+            case 147 /* BigIntKeyword */:
+            case 139 /* StringKeyword */:
+            case 124 /* BooleanKeyword */:
+            case 140 /* SymbolKeyword */:
+            case 137 /* ObjectKeyword */:
+            case 142 /* UndefinedKeyword */:
+            case 133 /* NeverKeyword */:
                 return true;
-            case 106 /* VoidKeyword */:
-                return node.parent.kind !== 200 /* VoidExpression */;
-            case 211 /* ExpressionWithTypeArguments */:
+            case 107 /* VoidKeyword */:
+                return node.parent.kind !== 201 /* VoidExpression */;
+            case 212 /* ExpressionWithTypeArguments */:
                 return !isExpressionWithTypeArgumentsInClassExtendsClause(node);
-            case 150 /* TypeParameter */:
-                return node.parent.kind === 181 /* MappedType */ || node.parent.kind === 176 /* InferType */;
+            case 151 /* TypeParameter */:
+                return node.parent.kind === 182 /* MappedType */ || node.parent.kind === 177 /* InferType */;
             // Identifiers and qualified names may be type nodes, depending on their context. Climb
             // above them to find the lowest container
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 // If the identifier is the RHS of a qualified name, then it's a type iff its parent is.
-                if (node.parent.kind === 148 /* QualifiedName */ && node.parent.right === node) {
+                if (node.parent.kind === 149 /* QualifiedName */ && node.parent.right === node) {
                     node = node.parent;
                 }
-                else if (node.parent.kind === 189 /* PropertyAccessExpression */ && node.parent.name === node) {
+                else if (node.parent.kind === 190 /* PropertyAccessExpression */ && node.parent.name === node) {
                     node = node.parent;
                 }
                 // At this point, node is either a qualified name or an identifier
-                ts.Debug.assert(node.kind === 72 /* Identifier */ || node.kind === 148 /* QualifiedName */ || node.kind === 189 /* PropertyAccessExpression */, "'node' was expected to be a qualified name, identifier or property access in 'isPartOfTypeNode'.");
+                ts.Debug.assert(node.kind === 73 /* Identifier */ || node.kind === 149 /* QualifiedName */ || node.kind === 190 /* PropertyAccessExpression */, "'node' was expected to be a qualified name, identifier or property access in 'isPartOfTypeNode'.");
             // falls through
-            case 148 /* QualifiedName */:
-            case 189 /* PropertyAccessExpression */:
-            case 100 /* ThisKeyword */: {
+            case 149 /* QualifiedName */:
+            case 190 /* PropertyAccessExpression */:
+            case 101 /* ThisKeyword */: {
                 var parent = node.parent;
-                if (parent.kind === 167 /* TypeQuery */) {
+                if (parent.kind === 168 /* TypeQuery */) {
                     return false;
                 }
-                if (parent.kind === 183 /* ImportType */) {
+                if (parent.kind === 184 /* ImportType */) {
                     return !parent.isTypeOf;
                 }
                 // Do not recursively call isPartOfTypeNode on the parent. In the example:
@@ -9305,40 +9526,40 @@ var ts;
                 //
                 // Calling isPartOfTypeNode would consider the qualified name A.B a type node.
                 // Only C and A.B.C are type nodes.
-                if (163 /* FirstTypeNode */ <= parent.kind && parent.kind <= 183 /* LastTypeNode */) {
+                if (164 /* FirstTypeNode */ <= parent.kind && parent.kind <= 184 /* LastTypeNode */) {
                     return true;
                 }
                 switch (parent.kind) {
-                    case 211 /* ExpressionWithTypeArguments */:
+                    case 212 /* ExpressionWithTypeArguments */:
                         return !isExpressionWithTypeArgumentsInClassExtendsClause(parent);
-                    case 150 /* TypeParameter */:
+                    case 151 /* TypeParameter */:
                         return node === parent.constraint;
-                    case 308 /* JSDocTemplateTag */:
+                    case 310 /* JSDocTemplateTag */:
                         return node === parent.constraint;
-                    case 154 /* PropertyDeclaration */:
-                    case 153 /* PropertySignature */:
-                    case 151 /* Parameter */:
-                    case 237 /* VariableDeclaration */:
+                    case 155 /* PropertyDeclaration */:
+                    case 154 /* PropertySignature */:
+                    case 152 /* Parameter */:
+                    case 238 /* VariableDeclaration */:
                         return node === parent.type;
-                    case 239 /* FunctionDeclaration */:
-                    case 196 /* FunctionExpression */:
-                    case 197 /* ArrowFunction */:
-                    case 157 /* Constructor */:
-                    case 156 /* MethodDeclaration */:
-                    case 155 /* MethodSignature */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
+                    case 240 /* FunctionDeclaration */:
+                    case 197 /* FunctionExpression */:
+                    case 198 /* ArrowFunction */:
+                    case 158 /* Constructor */:
+                    case 157 /* MethodDeclaration */:
+                    case 156 /* MethodSignature */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
                         return node === parent.type;
-                    case 160 /* CallSignature */:
-                    case 161 /* ConstructSignature */:
-                    case 162 /* IndexSignature */:
+                    case 161 /* CallSignature */:
+                    case 162 /* ConstructSignature */:
+                    case 163 /* IndexSignature */:
                         return node === parent.type;
-                    case 194 /* TypeAssertionExpression */:
+                    case 195 /* TypeAssertionExpression */:
                         return node === parent.type;
-                    case 191 /* CallExpression */:
-                    case 192 /* NewExpression */:
+                    case 192 /* CallExpression */:
+                    case 193 /* NewExpression */:
                         return ts.contains(parent.typeArguments, node);
-                    case 193 /* TaggedTemplateExpression */:
+                    case 194 /* TaggedTemplateExpression */:
                         // TODO (drosen): TaggedTemplateExpressions may eventually support type arguments.
                         return false;
                 }
@@ -9363,23 +9584,23 @@ var ts;
         return traverse(body);
         function traverse(node) {
             switch (node.kind) {
-                case 230 /* ReturnStatement */:
+                case 231 /* ReturnStatement */:
                     return visitor(node);
-                case 246 /* CaseBlock */:
-                case 218 /* Block */:
-                case 222 /* IfStatement */:
-                case 223 /* DoStatement */:
-                case 224 /* WhileStatement */:
-                case 225 /* ForStatement */:
-                case 226 /* ForInStatement */:
-                case 227 /* ForOfStatement */:
-                case 231 /* WithStatement */:
-                case 232 /* SwitchStatement */:
-                case 271 /* CaseClause */:
-                case 272 /* DefaultClause */:
-                case 233 /* LabeledStatement */:
-                case 235 /* TryStatement */:
-                case 274 /* CatchClause */:
+                case 247 /* CaseBlock */:
+                case 219 /* Block */:
+                case 223 /* IfStatement */:
+                case 224 /* DoStatement */:
+                case 225 /* WhileStatement */:
+                case 226 /* ForStatement */:
+                case 227 /* ForInStatement */:
+                case 228 /* ForOfStatement */:
+                case 232 /* WithStatement */:
+                case 233 /* SwitchStatement */:
+                case 272 /* CaseClause */:
+                case 273 /* DefaultClause */:
+                case 234 /* LabeledStatement */:
+                case 236 /* TryStatement */:
+                case 275 /* CatchClause */:
                     return ts.forEachChild(node, traverse);
             }
         }
@@ -9389,26 +9610,26 @@ var ts;
         return traverse(body);
         function traverse(node) {
             switch (node.kind) {
-                case 207 /* YieldExpression */:
+                case 208 /* YieldExpression */:
                     visitor(node);
                     var operand = node.expression;
                     if (operand) {
                         traverse(operand);
                     }
                     return;
-                case 243 /* EnumDeclaration */:
-                case 241 /* InterfaceDeclaration */:
-                case 244 /* ModuleDeclaration */:
-                case 242 /* TypeAliasDeclaration */:
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
+                case 244 /* EnumDeclaration */:
+                case 242 /* InterfaceDeclaration */:
+                case 245 /* ModuleDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
                     // These are not allowed inside a generator now, but eventually they may be allowed
                     // as local types. Regardless, any yield statements contained within them should be
                     // skipped in this traversal.
                     return;
                 default:
                     if (ts.isFunctionLike(node)) {
-                        if (node.name && node.name.kind === 149 /* ComputedPropertyName */) {
+                        if (node.name && node.name.kind === 150 /* ComputedPropertyName */) {
                             // Note that we will not include methods/accessors of a class because they would require
                             // first descending into the class. This is by design.
                             traverse(node.name.expression);
@@ -9431,10 +9652,10 @@ var ts;
      * @param node The type node.
      */
     function getRestParameterElementType(node) {
-        if (node && node.kind === 169 /* ArrayType */) {
+        if (node && node.kind === 170 /* ArrayType */) {
             return node.elementType;
         }
-        else if (node && node.kind === 164 /* TypeReference */) {
+        else if (node && node.kind === 165 /* TypeReference */) {
             return ts.singleOrUndefined(node.typeArguments);
         }
         else {
@@ -9444,12 +9665,12 @@ var ts;
     ts.getRestParameterElementType = getRestParameterElementType;
     function getMembersOfDeclaration(node) {
         switch (node.kind) {
-            case 241 /* InterfaceDeclaration */:
-            case 240 /* ClassDeclaration */:
-            case 209 /* ClassExpression */:
-            case 168 /* TypeLiteral */:
+            case 242 /* InterfaceDeclaration */:
+            case 241 /* ClassDeclaration */:
+            case 210 /* ClassExpression */:
+            case 169 /* TypeLiteral */:
                 return node.members;
-            case 188 /* ObjectLiteralExpression */:
+            case 189 /* ObjectLiteralExpression */:
                 return node.properties;
         }
     }
@@ -9457,14 +9678,14 @@ var ts;
     function isVariableLike(node) {
         if (node) {
             switch (node.kind) {
-                case 186 /* BindingElement */:
-                case 278 /* EnumMember */:
-                case 151 /* Parameter */:
-                case 275 /* PropertyAssignment */:
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
-                case 276 /* ShorthandPropertyAssignment */:
-                case 237 /* VariableDeclaration */:
+                case 187 /* BindingElement */:
+                case 279 /* EnumMember */:
+                case 152 /* Parameter */:
+                case 276 /* PropertyAssignment */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
+                case 277 /* ShorthandPropertyAssignment */:
+                case 238 /* VariableDeclaration */:
                     return true;
             }
         }
@@ -9476,8 +9697,8 @@ var ts;
     }
     ts.isVariableLikeOrAccessor = isVariableLikeOrAccessor;
     function isVariableDeclarationInVariableStatement(node) {
-        return node.parent.kind === 238 /* VariableDeclarationList */
-            && node.parent.parent.kind === 219 /* VariableStatement */;
+        return node.parent.kind === 239 /* VariableDeclarationList */
+            && node.parent.parent.kind === 220 /* VariableStatement */;
     }
     ts.isVariableDeclarationInVariableStatement = isVariableDeclarationInVariableStatement;
     function isValidESSymbolDeclaration(node) {
@@ -9488,13 +9709,13 @@ var ts;
     ts.isValidESSymbolDeclaration = isValidESSymbolDeclaration;
     function introducesArgumentsExoticObject(node) {
         switch (node.kind) {
-            case 156 /* MethodDeclaration */:
-            case 155 /* MethodSignature */:
-            case 157 /* Constructor */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
-            case 239 /* FunctionDeclaration */:
-            case 196 /* FunctionExpression */:
+            case 157 /* MethodDeclaration */:
+            case 156 /* MethodSignature */:
+            case 158 /* Constructor */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
+            case 240 /* FunctionDeclaration */:
+            case 197 /* FunctionExpression */:
                 return true;
         }
         return false;
@@ -9505,7 +9726,7 @@ var ts;
             if (beforeUnwrapLabelCallback) {
                 beforeUnwrapLabelCallback(node);
             }
-            if (node.statement.kind !== 233 /* LabeledStatement */) {
+            if (node.statement.kind !== 234 /* LabeledStatement */) {
                 return node.statement;
             }
             node = node.statement;
@@ -9513,17 +9734,17 @@ var ts;
     }
     ts.unwrapInnermostStatementOfLabel = unwrapInnermostStatementOfLabel;
     function isFunctionBlock(node) {
-        return node && node.kind === 218 /* Block */ && ts.isFunctionLike(node.parent);
+        return node && node.kind === 219 /* Block */ && ts.isFunctionLike(node.parent);
     }
     ts.isFunctionBlock = isFunctionBlock;
     function isObjectLiteralMethod(node) {
-        return node && node.kind === 156 /* MethodDeclaration */ && node.parent.kind === 188 /* ObjectLiteralExpression */;
+        return node && node.kind === 157 /* MethodDeclaration */ && node.parent.kind === 189 /* ObjectLiteralExpression */;
     }
     ts.isObjectLiteralMethod = isObjectLiteralMethod;
     function isObjectLiteralOrClassExpressionMethod(node) {
-        return node.kind === 156 /* MethodDeclaration */ &&
-            (node.parent.kind === 188 /* ObjectLiteralExpression */ ||
-                node.parent.kind === 209 /* ClassExpression */);
+        return node.kind === 157 /* MethodDeclaration */ &&
+            (node.parent.kind === 189 /* ObjectLiteralExpression */ ||
+                node.parent.kind === 210 /* ClassExpression */);
     }
     ts.isObjectLiteralOrClassExpressionMethod = isObjectLiteralOrClassExpressionMethod;
     function isIdentifierTypePredicate(predicate) {
@@ -9536,7 +9757,7 @@ var ts;
     ts.isThisTypePredicate = isThisTypePredicate;
     function getPropertyAssignment(objectLiteral, key, key2) {
         return objectLiteral.properties.filter(function (property) {
-            if (property.kind === 275 /* PropertyAssignment */) {
+            if (property.kind === 276 /* PropertyAssignment */) {
                 var propName = getTextOfPropertyName(property.name);
                 return key === propName || (!!key2 && key2 === propName);
             }
@@ -9568,19 +9789,23 @@ var ts;
         return findAncestor(node.parent, ts.isFunctionLike);
     }
     ts.getContainingFunction = getContainingFunction;
+    function getContainingFunctionDeclaration(node) {
+        return findAncestor(node.parent, ts.isFunctionLikeDeclaration);
+    }
+    ts.getContainingFunctionDeclaration = getContainingFunctionDeclaration;
     function getContainingClass(node) {
         return findAncestor(node.parent, ts.isClassLike);
     }
     ts.getContainingClass = getContainingClass;
     function getThisContainer(node, includeArrowFunctions) {
-        ts.Debug.assert(node.kind !== 284 /* SourceFile */);
+        ts.Debug.assert(node.kind !== 285 /* SourceFile */);
         while (true) {
             node = node.parent;
             if (!node) {
                 return ts.Debug.fail(); // If we never pass in a SourceFile, this should be unreachable, since we'll stop when we reach that.
             }
             switch (node.kind) {
-                case 149 /* ComputedPropertyName */:
+                case 150 /* ComputedPropertyName */:
                     // If the grandparent node is an object literal (as opposed to a class),
                     // then the computed property is not a 'this' container.
                     // A computed property name in a class needs to be a this container
@@ -9595,9 +9820,9 @@ var ts;
                     // the *body* of the container.
                     node = node.parent;
                     break;
-                case 152 /* Decorator */:
+                case 153 /* Decorator */:
                     // Decorators are always applied outside of the body of a class or method.
-                    if (node.parent.kind === 151 /* Parameter */ && ts.isClassElement(node.parent.parent)) {
+                    if (node.parent.kind === 152 /* Parameter */ && ts.isClassElement(node.parent.parent)) {
                         // If the decorator's parent is a Parameter, we resolve the this container from
                         // the grandparent class declaration.
                         node = node.parent.parent;
@@ -9608,26 +9833,26 @@ var ts;
                         node = node.parent;
                     }
                     break;
-                case 197 /* ArrowFunction */:
+                case 198 /* ArrowFunction */:
                     if (!includeArrowFunctions) {
                         continue;
                     }
                 // falls through
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
-                case 244 /* ModuleDeclaration */:
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
-                case 157 /* Constructor */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
-                case 160 /* CallSignature */:
-                case 161 /* ConstructSignature */:
-                case 162 /* IndexSignature */:
-                case 243 /* EnumDeclaration */:
-                case 284 /* SourceFile */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 245 /* ModuleDeclaration */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
+                case 158 /* Constructor */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
+                case 161 /* CallSignature */:
+                case 162 /* ConstructSignature */:
+                case 163 /* IndexSignature */:
+                case 244 /* EnumDeclaration */:
+                case 285 /* SourceFile */:
                     return node;
             }
         }
@@ -9637,9 +9862,9 @@ var ts;
         var container = getThisContainer(node, /*includeArrowFunctions*/ false);
         if (container) {
             switch (container.kind) {
-                case 157 /* Constructor */:
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
+                case 158 /* Constructor */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
                     return container;
             }
         }
@@ -9661,27 +9886,27 @@ var ts;
                 return node;
             }
             switch (node.kind) {
-                case 149 /* ComputedPropertyName */:
+                case 150 /* ComputedPropertyName */:
                     node = node.parent;
                     break;
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
                     if (!stopOnFunctions) {
                         continue;
                     }
                 // falls through
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
-                case 157 /* Constructor */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
+                case 158 /* Constructor */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     return node;
-                case 152 /* Decorator */:
+                case 153 /* Decorator */:
                     // Decorators are always applied outside of the body of a class or method.
-                    if (node.parent.kind === 151 /* Parameter */ && ts.isClassElement(node.parent.parent)) {
+                    if (node.parent.kind === 152 /* Parameter */ && ts.isClassElement(node.parent.parent)) {
                         // If the decorator's parent is a Parameter, we resolve the this container from
                         // the grandparent class declaration.
                         node = node.parent.parent;
@@ -9697,21 +9922,21 @@ var ts;
     }
     ts.getSuperContainer = getSuperContainer;
     function getImmediatelyInvokedFunctionExpression(func) {
-        if (func.kind === 196 /* FunctionExpression */ || func.kind === 197 /* ArrowFunction */) {
+        if (func.kind === 197 /* FunctionExpression */ || func.kind === 198 /* ArrowFunction */) {
             var prev = func;
             var parent = func.parent;
-            while (parent.kind === 195 /* ParenthesizedExpression */) {
+            while (parent.kind === 196 /* ParenthesizedExpression */) {
                 prev = parent;
                 parent = parent.parent;
             }
-            if (parent.kind === 191 /* CallExpression */ && parent.expression === prev) {
+            if (parent.kind === 192 /* CallExpression */ && parent.expression === prev) {
                 return parent;
             }
         }
     }
     ts.getImmediatelyInvokedFunctionExpression = getImmediatelyInvokedFunctionExpression;
     function isSuperOrSuperProperty(node) {
-        return node.kind === 98 /* SuperKeyword */
+        return node.kind === 99 /* SuperKeyword */
             || isSuperProperty(node);
     }
     ts.isSuperOrSuperProperty = isSuperOrSuperProperty;
@@ -9720,8 +9945,8 @@ var ts;
      */
     function isSuperProperty(node) {
         var kind = node.kind;
-        return (kind === 189 /* PropertyAccessExpression */ || kind === 190 /* ElementAccessExpression */)
-            && node.expression.kind === 98 /* SuperKeyword */;
+        return (kind === 190 /* PropertyAccessExpression */ || kind === 191 /* ElementAccessExpression */)
+            && node.expression.kind === 99 /* SuperKeyword */;
     }
     ts.isSuperProperty = isSuperProperty;
     /**
@@ -9729,20 +9954,20 @@ var ts;
      */
     function isThisProperty(node) {
         var kind = node.kind;
-        return (kind === 189 /* PropertyAccessExpression */ || kind === 190 /* ElementAccessExpression */)
-            && node.expression.kind === 100 /* ThisKeyword */;
+        return (kind === 190 /* PropertyAccessExpression */ || kind === 191 /* ElementAccessExpression */)
+            && node.expression.kind === 101 /* ThisKeyword */;
     }
     ts.isThisProperty = isThisProperty;
     function getEntityNameFromTypeNode(node) {
         switch (node.kind) {
-            case 164 /* TypeReference */:
+            case 165 /* TypeReference */:
                 return node.typeName;
-            case 211 /* ExpressionWithTypeArguments */:
+            case 212 /* ExpressionWithTypeArguments */:
                 return isEntityNameExpression(node.expression)
                     ? node.expression
                     : undefined;
-            case 72 /* Identifier */:
-            case 148 /* QualifiedName */:
+            case 73 /* Identifier */:
+            case 149 /* QualifiedName */:
                 return node;
         }
         return undefined;
@@ -9750,10 +9975,10 @@ var ts;
     ts.getEntityNameFromTypeNode = getEntityNameFromTypeNode;
     function getInvokedExpression(node) {
         switch (node.kind) {
-            case 193 /* TaggedTemplateExpression */:
+            case 194 /* TaggedTemplateExpression */:
                 return node.tag;
-            case 262 /* JsxOpeningElement */:
-            case 261 /* JsxSelfClosingElement */:
+            case 263 /* JsxOpeningElement */:
+            case 262 /* JsxSelfClosingElement */:
                 return node.tagName;
             default:
                 return node.expression;
@@ -9762,25 +9987,25 @@ var ts;
     ts.getInvokedExpression = getInvokedExpression;
     function nodeCanBeDecorated(node, parent, grandparent) {
         switch (node.kind) {
-            case 240 /* ClassDeclaration */:
+            case 241 /* ClassDeclaration */:
                 // classes are valid targets
                 return true;
-            case 154 /* PropertyDeclaration */:
+            case 155 /* PropertyDeclaration */:
                 // property declarations are valid if their parent is a class declaration.
-                return parent.kind === 240 /* ClassDeclaration */;
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
-            case 156 /* MethodDeclaration */:
+                return parent.kind === 241 /* ClassDeclaration */;
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
+            case 157 /* MethodDeclaration */:
                 // if this method has a body and its parent is a class declaration, this is a valid target.
                 return node.body !== undefined
-                    && parent.kind === 240 /* ClassDeclaration */;
-            case 151 /* Parameter */:
+                    && parent.kind === 241 /* ClassDeclaration */;
+            case 152 /* Parameter */:
                 // if the parameter's parent has a body and its grandparent is a class declaration, this is a valid target;
                 return parent.body !== undefined
-                    && (parent.kind === 157 /* Constructor */
-                        || parent.kind === 156 /* MethodDeclaration */
-                        || parent.kind === 159 /* SetAccessor */)
-                    && grandparent.kind === 240 /* ClassDeclaration */;
+                    && (parent.kind === 158 /* Constructor */
+                        || parent.kind === 157 /* MethodDeclaration */
+                        || parent.kind === 160 /* SetAccessor */)
+                    && grandparent.kind === 241 /* ClassDeclaration */;
         }
         return false;
     }
@@ -9796,10 +10021,10 @@ var ts;
     ts.nodeOrChildIsDecorated = nodeOrChildIsDecorated;
     function childIsDecorated(node, parent) {
         switch (node.kind) {
-            case 240 /* ClassDeclaration */:
+            case 241 /* ClassDeclaration */:
                 return ts.some(node.members, function (m) { return nodeOrChildIsDecorated(m, node, parent); }); // TODO: GH#18217
-            case 156 /* MethodDeclaration */:
-            case 159 /* SetAccessor */:
+            case 157 /* MethodDeclaration */:
+            case 160 /* SetAccessor */:
                 return ts.some(node.parameters, function (p) { return nodeIsDecorated(p, node, parent); }); // TODO: GH#18217
             default:
                 return false;
@@ -9808,9 +10033,9 @@ var ts;
     ts.childIsDecorated = childIsDecorated;
     function isJSXTagName(node) {
         var parent = node.parent;
-        if (parent.kind === 262 /* JsxOpeningElement */ ||
-            parent.kind === 261 /* JsxSelfClosingElement */ ||
-            parent.kind === 263 /* JsxClosingElement */) {
+        if (parent.kind === 263 /* JsxOpeningElement */ ||
+            parent.kind === 262 /* JsxSelfClosingElement */ ||
+            parent.kind === 264 /* JsxClosingElement */) {
             return parent.tagName === node;
         }
         return false;
@@ -9818,57 +10043,57 @@ var ts;
     ts.isJSXTagName = isJSXTagName;
     function isExpressionNode(node) {
         switch (node.kind) {
-            case 98 /* SuperKeyword */:
-            case 96 /* NullKeyword */:
-            case 102 /* TrueKeyword */:
-            case 87 /* FalseKeyword */:
+            case 99 /* SuperKeyword */:
+            case 97 /* NullKeyword */:
+            case 103 /* TrueKeyword */:
+            case 88 /* FalseKeyword */:
             case 13 /* RegularExpressionLiteral */:
-            case 187 /* ArrayLiteralExpression */:
-            case 188 /* ObjectLiteralExpression */:
-            case 189 /* PropertyAccessExpression */:
-            case 190 /* ElementAccessExpression */:
-            case 191 /* CallExpression */:
-            case 192 /* NewExpression */:
-            case 193 /* TaggedTemplateExpression */:
-            case 212 /* AsExpression */:
-            case 194 /* TypeAssertionExpression */:
-            case 213 /* NonNullExpression */:
-            case 195 /* ParenthesizedExpression */:
-            case 196 /* FunctionExpression */:
-            case 209 /* ClassExpression */:
-            case 197 /* ArrowFunction */:
-            case 200 /* VoidExpression */:
-            case 198 /* DeleteExpression */:
-            case 199 /* TypeOfExpression */:
-            case 202 /* PrefixUnaryExpression */:
-            case 203 /* PostfixUnaryExpression */:
-            case 204 /* BinaryExpression */:
-            case 205 /* ConditionalExpression */:
-            case 208 /* SpreadElement */:
-            case 206 /* TemplateExpression */:
+            case 188 /* ArrayLiteralExpression */:
+            case 189 /* ObjectLiteralExpression */:
+            case 190 /* PropertyAccessExpression */:
+            case 191 /* ElementAccessExpression */:
+            case 192 /* CallExpression */:
+            case 193 /* NewExpression */:
+            case 194 /* TaggedTemplateExpression */:
+            case 213 /* AsExpression */:
+            case 195 /* TypeAssertionExpression */:
+            case 214 /* NonNullExpression */:
+            case 196 /* ParenthesizedExpression */:
+            case 197 /* FunctionExpression */:
+            case 210 /* ClassExpression */:
+            case 198 /* ArrowFunction */:
+            case 201 /* VoidExpression */:
+            case 199 /* DeleteExpression */:
+            case 200 /* TypeOfExpression */:
+            case 203 /* PrefixUnaryExpression */:
+            case 204 /* PostfixUnaryExpression */:
+            case 205 /* BinaryExpression */:
+            case 206 /* ConditionalExpression */:
+            case 209 /* SpreadElement */:
+            case 207 /* TemplateExpression */:
             case 14 /* NoSubstitutionTemplateLiteral */:
-            case 210 /* OmittedExpression */:
-            case 260 /* JsxElement */:
-            case 261 /* JsxSelfClosingElement */:
-            case 264 /* JsxFragment */:
-            case 207 /* YieldExpression */:
-            case 201 /* AwaitExpression */:
-            case 214 /* MetaProperty */:
+            case 211 /* OmittedExpression */:
+            case 261 /* JsxElement */:
+            case 262 /* JsxSelfClosingElement */:
+            case 265 /* JsxFragment */:
+            case 208 /* YieldExpression */:
+            case 202 /* AwaitExpression */:
+            case 215 /* MetaProperty */:
                 return true;
-            case 148 /* QualifiedName */:
-                while (node.parent.kind === 148 /* QualifiedName */) {
+            case 149 /* QualifiedName */:
+                while (node.parent.kind === 149 /* QualifiedName */) {
                     node = node.parent;
                 }
-                return node.parent.kind === 167 /* TypeQuery */ || isJSXTagName(node);
-            case 72 /* Identifier */:
-                if (node.parent.kind === 167 /* TypeQuery */ || isJSXTagName(node)) {
+                return node.parent.kind === 168 /* TypeQuery */ || isJSXTagName(node);
+            case 73 /* Identifier */:
+                if (node.parent.kind === 168 /* TypeQuery */ || isJSXTagName(node)) {
                     return true;
                 }
             // falls through
             case 8 /* NumericLiteral */:
             case 9 /* BigIntLiteral */:
             case 10 /* StringLiteral */:
-            case 100 /* ThisKeyword */:
+            case 101 /* ThisKeyword */:
                 return isInExpressionContext(node);
             default:
                 return false;
@@ -9878,49 +10103,49 @@ var ts;
     function isInExpressionContext(node) {
         var parent = node.parent;
         switch (parent.kind) {
-            case 237 /* VariableDeclaration */:
-            case 151 /* Parameter */:
-            case 154 /* PropertyDeclaration */:
-            case 153 /* PropertySignature */:
-            case 278 /* EnumMember */:
-            case 275 /* PropertyAssignment */:
-            case 186 /* BindingElement */:
+            case 238 /* VariableDeclaration */:
+            case 152 /* Parameter */:
+            case 155 /* PropertyDeclaration */:
+            case 154 /* PropertySignature */:
+            case 279 /* EnumMember */:
+            case 276 /* PropertyAssignment */:
+            case 187 /* BindingElement */:
                 return parent.initializer === node;
-            case 221 /* ExpressionStatement */:
-            case 222 /* IfStatement */:
-            case 223 /* DoStatement */:
-            case 224 /* WhileStatement */:
-            case 230 /* ReturnStatement */:
-            case 231 /* WithStatement */:
-            case 232 /* SwitchStatement */:
-            case 271 /* CaseClause */:
-            case 234 /* ThrowStatement */:
+            case 222 /* ExpressionStatement */:
+            case 223 /* IfStatement */:
+            case 224 /* DoStatement */:
+            case 225 /* WhileStatement */:
+            case 231 /* ReturnStatement */:
+            case 232 /* WithStatement */:
+            case 233 /* SwitchStatement */:
+            case 272 /* CaseClause */:
+            case 235 /* ThrowStatement */:
                 return parent.expression === node;
-            case 225 /* ForStatement */:
+            case 226 /* ForStatement */:
                 var forStatement = parent;
-                return (forStatement.initializer === node && forStatement.initializer.kind !== 238 /* VariableDeclarationList */) ||
+                return (forStatement.initializer === node && forStatement.initializer.kind !== 239 /* VariableDeclarationList */) ||
                     forStatement.condition === node ||
                     forStatement.incrementor === node;
-            case 226 /* ForInStatement */:
-            case 227 /* ForOfStatement */:
+            case 227 /* ForInStatement */:
+            case 228 /* ForOfStatement */:
                 var forInStatement = parent;
-                return (forInStatement.initializer === node && forInStatement.initializer.kind !== 238 /* VariableDeclarationList */) ||
+                return (forInStatement.initializer === node && forInStatement.initializer.kind !== 239 /* VariableDeclarationList */) ||
                     forInStatement.expression === node;
-            case 194 /* TypeAssertionExpression */:
-            case 212 /* AsExpression */:
+            case 195 /* TypeAssertionExpression */:
+            case 213 /* AsExpression */:
                 return node === parent.expression;
-            case 216 /* TemplateSpan */:
+            case 217 /* TemplateSpan */:
                 return node === parent.expression;
-            case 149 /* ComputedPropertyName */:
+            case 150 /* ComputedPropertyName */:
                 return node === parent.expression;
-            case 152 /* Decorator */:
-            case 270 /* JsxExpression */:
-            case 269 /* JsxSpreadAttribute */:
-            case 277 /* SpreadAssignment */:
+            case 153 /* Decorator */:
+            case 271 /* JsxExpression */:
+            case 270 /* JsxSpreadAttribute */:
+            case 278 /* SpreadAssignment */:
                 return true;
-            case 211 /* ExpressionWithTypeArguments */:
+            case 212 /* ExpressionWithTypeArguments */:
                 return parent.expression === node && isExpressionWithTypeArgumentsInClassExtendsClause(parent);
-            case 276 /* ShorthandPropertyAssignment */:
+            case 277 /* ShorthandPropertyAssignment */:
                 return parent.objectAssignmentInitializer === node;
             default:
                 return isExpressionNode(parent);
@@ -9928,7 +10153,7 @@ var ts;
     }
     ts.isInExpressionContext = isInExpressionContext;
     function isExternalModuleImportEqualsDeclaration(node) {
-        return node.kind === 248 /* ImportEqualsDeclaration */ && node.moduleReference.kind === 259 /* ExternalModuleReference */;
+        return node.kind === 249 /* ImportEqualsDeclaration */ && node.moduleReference.kind === 260 /* ExternalModuleReference */;
     }
     ts.isExternalModuleImportEqualsDeclaration = isExternalModuleImportEqualsDeclaration;
     function getExternalModuleImportEqualsDeclarationExpression(node) {
@@ -9937,7 +10162,7 @@ var ts;
     }
     ts.getExternalModuleImportEqualsDeclarationExpression = getExternalModuleImportEqualsDeclarationExpression;
     function isInternalModuleImportEqualsDeclaration(node) {
-        return node.kind === 248 /* ImportEqualsDeclaration */ && node.moduleReference.kind !== 259 /* ExternalModuleReference */;
+        return node.kind === 249 /* ImportEqualsDeclaration */ && node.moduleReference.kind !== 260 /* ExternalModuleReference */;
     }
     ts.isInternalModuleImportEqualsDeclaration = isInternalModuleImportEqualsDeclaration;
     function isSourceFileJS(file) {
@@ -9965,15 +10190,15 @@ var ts;
             ts.isIdentifier(node.typeName) &&
             node.typeName.escapedText === "Object" &&
             node.typeArguments && node.typeArguments.length === 2 &&
-            (node.typeArguments[0].kind === 138 /* StringKeyword */ || node.typeArguments[0].kind === 135 /* NumberKeyword */);
+            (node.typeArguments[0].kind === 139 /* StringKeyword */ || node.typeArguments[0].kind === 136 /* NumberKeyword */);
     }
     ts.isJSDocIndexSignature = isJSDocIndexSignature;
     function isRequireCall(callExpression, checkArgumentIsStringLiteralLike) {
-        if (callExpression.kind !== 191 /* CallExpression */) {
+        if (callExpression.kind !== 192 /* CallExpression */) {
             return false;
         }
         var _a = callExpression, expression = _a.expression, args = _a.arguments;
-        if (expression.kind !== 72 /* Identifier */ || expression.escapedText !== "require") {
+        if (expression.kind !== 73 /* Identifier */ || expression.escapedText !== "require") {
             return false;
         }
         if (args.length !== 1) {
@@ -10004,7 +10229,7 @@ var ts;
             name = node.parent.name;
             decl = node.parent;
         }
-        else if (ts.isBinaryExpression(node.parent) && node.parent.operatorToken.kind === 59 /* EqualsToken */ && node.parent.right === node) {
+        else if (ts.isBinaryExpression(node.parent) && node.parent.operatorToken.kind === 60 /* EqualsToken */ && node.parent.right === node) {
             name = node.parent.left;
             decl = name;
         }
@@ -10013,7 +10238,7 @@ var ts;
                 name = node.parent.parent.name;
                 decl = node.parent.parent;
             }
-            else if (ts.isBinaryExpression(node.parent.parent) && node.parent.parent.operatorToken.kind === 59 /* EqualsToken */ && node.parent.parent.right === node.parent) {
+            else if (ts.isBinaryExpression(node.parent.parent) && node.parent.parent.operatorToken.kind === 60 /* EqualsToken */ && node.parent.parent.right === node.parent) {
                 name = node.parent.parent.left;
                 decl = name;
             }
@@ -10055,7 +10280,7 @@ var ts;
      * We treat the right hand side of assignments with container-like initalizers as declarations.
      */
     function getAssignedExpandoInitializer(node) {
-        if (node && node.parent && ts.isBinaryExpression(node.parent) && node.parent.operatorToken.kind === 59 /* EqualsToken */) {
+        if (node && node.parent && ts.isBinaryExpression(node.parent) && node.parent.operatorToken.kind === 60 /* EqualsToken */) {
             var isPrototypeAssignment = isPrototypeAccess(node.parent.left);
             return getExpandoInitializer(node.parent.right, isPrototypeAssignment) ||
                 getDefaultedExpandoInitializer(node.parent.left, node.parent.right, isPrototypeAssignment);
@@ -10081,11 +10306,11 @@ var ts;
     function getExpandoInitializer(initializer, isPrototypeAssignment) {
         if (ts.isCallExpression(initializer)) {
             var e = skipParentheses(initializer.expression);
-            return e.kind === 196 /* FunctionExpression */ || e.kind === 197 /* ArrowFunction */ ? initializer : undefined;
+            return e.kind === 197 /* FunctionExpression */ || e.kind === 198 /* ArrowFunction */ ? initializer : undefined;
         }
-        if (initializer.kind === 196 /* FunctionExpression */ ||
-            initializer.kind === 209 /* ClassExpression */ ||
-            initializer.kind === 197 /* ArrowFunction */) {
+        if (initializer.kind === 197 /* FunctionExpression */ ||
+            initializer.kind === 210 /* ClassExpression */ ||
+            initializer.kind === 198 /* ArrowFunction */) {
             return initializer;
         }
         if (ts.isObjectLiteralExpression(initializer) && (initializer.properties.length === 0 || isPrototypeAssignment)) {
@@ -10109,7 +10334,7 @@ var ts;
     }
     function isDefaultedExpandoInitializer(node) {
         var name = ts.isVariableDeclaration(node.parent) ? node.parent.name :
-            ts.isBinaryExpression(node.parent) && node.parent.operatorToken.kind === 59 /* EqualsToken */ ? node.parent.left :
+            ts.isBinaryExpression(node.parent) && node.parent.operatorToken.kind === 60 /* EqualsToken */ ? node.parent.left :
                 undefined;
         return name && getExpandoInitializer(node.right, isPrototypeAccess(name)) && isEntityNameExpression(name) && isSameEntityName(name, node.left);
     }
@@ -10118,7 +10343,7 @@ var ts;
     function getNameOfExpando(node) {
         if (ts.isBinaryExpression(node.parent)) {
             var parent = (node.parent.operatorToken.kind === 55 /* BarBarToken */ && ts.isBinaryExpression(node.parent.parent)) ? node.parent.parent : node.parent;
-            if (parent.operatorToken.kind === 59 /* EqualsToken */ && ts.isIdentifier(parent.left)) {
+            if (parent.operatorToken.kind === 60 /* EqualsToken */ && ts.isIdentifier(parent.left)) {
                 return parent.left;
             }
         }
@@ -10141,7 +10366,7 @@ var ts;
             return name.escapedText === initializer.escapedText;
         }
         if (ts.isIdentifier(name) && ts.isPropertyAccessExpression(initializer)) {
-            return (initializer.expression.kind === 100 /* ThisKeyword */ ||
+            return (initializer.expression.kind === 101 /* ThisKeyword */ ||
                 ts.isIdentifier(initializer.expression) &&
                     (initializer.expression.escapedText === "window" ||
                         initializer.expression.escapedText === "self" ||
@@ -10199,7 +10424,7 @@ var ts;
             }
             return 7 /* ObjectDefinePropertyValue */;
         }
-        if (expr.operatorToken.kind !== 59 /* EqualsToken */ ||
+        if (expr.operatorToken.kind !== 60 /* EqualsToken */ ||
             !ts.isPropertyAccessExpression(expr.left)) {
             return 0 /* None */;
         }
@@ -10211,7 +10436,7 @@ var ts;
         return getAssignmentDeclarationPropertyAccessKind(lhs);
     }
     function getAssignmentDeclarationPropertyAccessKind(lhs) {
-        if (lhs.expression.kind === 100 /* ThisKeyword */) {
+        if (lhs.expression.kind === 101 /* ThisKeyword */) {
             return 4 /* ThisProperty */;
         }
         else if (isModuleExportsPropertyAccessExpression(lhs)) {
@@ -10253,7 +10478,7 @@ var ts;
     ts.isPrototypePropertyAssignment = isPrototypePropertyAssignment;
     function isSpecialPropertyDeclaration(expr) {
         return isInJSFile(expr) &&
-            expr.parent && expr.parent.kind === 221 /* ExpressionStatement */ &&
+            expr.parent && expr.parent.kind === 222 /* ExpressionStatement */ &&
             !!ts.getJSDocTypeTag(expr.parent);
     }
     ts.isSpecialPropertyDeclaration = isSpecialPropertyDeclaration;
@@ -10262,23 +10487,23 @@ var ts;
             return false;
         }
         var decl = symbol.valueDeclaration;
-        return decl.kind === 239 /* FunctionDeclaration */ || ts.isVariableDeclaration(decl) && decl.initializer && ts.isFunctionLike(decl.initializer);
+        return decl.kind === 240 /* FunctionDeclaration */ || ts.isVariableDeclaration(decl) && decl.initializer && ts.isFunctionLike(decl.initializer);
     }
     ts.isFunctionSymbol = isFunctionSymbol;
     function importFromModuleSpecifier(node) {
-        return tryGetImportFromModuleSpecifier(node) || ts.Debug.fail(ts.Debug.showSyntaxKind(node.parent));
+        return tryGetImportFromModuleSpecifier(node) || ts.Debug.failBadSyntaxKind(node.parent);
     }
     ts.importFromModuleSpecifier = importFromModuleSpecifier;
     function tryGetImportFromModuleSpecifier(node) {
         switch (node.parent.kind) {
-            case 249 /* ImportDeclaration */:
-            case 255 /* ExportDeclaration */:
+            case 250 /* ImportDeclaration */:
+            case 256 /* ExportDeclaration */:
                 return node.parent;
-            case 259 /* ExternalModuleReference */:
+            case 260 /* ExternalModuleReference */:
                 return node.parent.parent;
-            case 191 /* CallExpression */:
+            case 192 /* CallExpression */:
                 return isImportCall(node.parent) || isRequireCall(node.parent, /*checkArg*/ false) ? node.parent : undefined;
-            case 182 /* LiteralType */:
+            case 183 /* LiteralType */:
                 ts.Debug.assert(ts.isStringLiteral(node));
                 return ts.tryCast(node.parent.parent, ts.isImportTypeNode);
             default:
@@ -10288,12 +10513,12 @@ var ts;
     ts.tryGetImportFromModuleSpecifier = tryGetImportFromModuleSpecifier;
     function getExternalModuleName(node) {
         switch (node.kind) {
-            case 249 /* ImportDeclaration */:
-            case 255 /* ExportDeclaration */:
+            case 250 /* ImportDeclaration */:
+            case 256 /* ExportDeclaration */:
                 return node.moduleSpecifier;
-            case 248 /* ImportEqualsDeclaration */:
-                return node.moduleReference.kind === 259 /* ExternalModuleReference */ ? node.moduleReference.expression : undefined;
-            case 183 /* ImportType */:
+            case 249 /* ImportEqualsDeclaration */:
+                return node.moduleReference.kind === 260 /* ExternalModuleReference */ ? node.moduleReference.expression : undefined;
+            case 184 /* ImportType */:
                 return isLiteralImportTypeNode(node) ? node.argument.literal : undefined;
             default:
                 return ts.Debug.assertNever(node);
@@ -10302,11 +10527,11 @@ var ts;
     ts.getExternalModuleName = getExternalModuleName;
     function getNamespaceDeclarationNode(node) {
         switch (node.kind) {
-            case 249 /* ImportDeclaration */:
+            case 250 /* ImportDeclaration */:
                 return node.importClause && ts.tryCast(node.importClause.namedBindings, ts.isNamespaceImport);
-            case 248 /* ImportEqualsDeclaration */:
+            case 249 /* ImportEqualsDeclaration */:
                 return node;
-            case 255 /* ExportDeclaration */:
+            case 256 /* ExportDeclaration */:
                 return undefined;
             default:
                 return ts.Debug.assertNever(node);
@@ -10314,19 +10539,19 @@ var ts;
     }
     ts.getNamespaceDeclarationNode = getNamespaceDeclarationNode;
     function isDefaultImport(node) {
-        return node.kind === 249 /* ImportDeclaration */ && !!node.importClause && !!node.importClause.name;
+        return node.kind === 250 /* ImportDeclaration */ && !!node.importClause && !!node.importClause.name;
     }
     ts.isDefaultImport = isDefaultImport;
     function hasQuestionToken(node) {
         if (node) {
             switch (node.kind) {
-                case 151 /* Parameter */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
-                case 276 /* ShorthandPropertyAssignment */:
-                case 275 /* PropertyAssignment */:
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
+                case 152 /* Parameter */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
+                case 277 /* ShorthandPropertyAssignment */:
+                case 276 /* PropertyAssignment */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
                     return node.questionToken !== undefined;
             }
         }
@@ -10340,7 +10565,7 @@ var ts;
     }
     ts.isJSDocConstructSignature = isJSDocConstructSignature;
     function isJSDocTypeAlias(node) {
-        return node.kind === 309 /* JSDocTypedefTag */ || node.kind === 302 /* JSDocCallbackTag */;
+        return node.kind === 311 /* JSDocTypedefTag */ || node.kind === 304 /* JSDocCallbackTag */;
     }
     ts.isJSDocTypeAlias = isJSDocTypeAlias;
     function isTypeAlias(node) {
@@ -10350,7 +10575,7 @@ var ts;
     function getSourceOfAssignment(node) {
         return ts.isExpressionStatement(node) &&
             node.expression && ts.isBinaryExpression(node.expression) &&
-            node.expression.operatorToken.kind === 59 /* EqualsToken */
+            node.expression.operatorToken.kind === 60 /* EqualsToken */
             ? node.expression.right
             : undefined;
     }
@@ -10365,12 +10590,12 @@ var ts;
     }
     function getSingleInitializerOfVariableStatementOrPropertyDeclaration(node) {
         switch (node.kind) {
-            case 219 /* VariableStatement */:
+            case 220 /* VariableStatement */:
                 var v = getSingleVariableOfVariableStatement(node);
                 return v && v.initializer;
-            case 154 /* PropertyDeclaration */:
+            case 155 /* PropertyDeclaration */:
                 return node.initializer;
-            case 275 /* PropertyAssignment */:
+            case 276 /* PropertyAssignment */:
                 return node.initializer;
         }
     }
@@ -10381,7 +10606,7 @@ var ts;
     function getNestedModuleDeclaration(node) {
         return ts.isModuleDeclaration(node) &&
             node.body &&
-            node.body.kind === 244 /* ModuleDeclaration */
+            node.body.kind === 245 /* ModuleDeclaration */
             ? node.body
             : undefined;
     }
@@ -10389,18 +10614,18 @@ var ts;
         var result;
         // Pull parameter comments from declaring function as well
         if (isVariableLike(hostNode) && ts.hasInitializer(hostNode) && ts.hasJSDocNodes(hostNode.initializer)) {
-            result = ts.addRange(result, hostNode.initializer.jsDoc);
+            result = ts.append(result, ts.last(hostNode.initializer.jsDoc));
         }
         var node = hostNode;
         while (node && node.parent) {
             if (ts.hasJSDocNodes(node)) {
-                result = ts.addRange(result, node.jsDoc);
+                result = ts.append(result, ts.last(node.jsDoc));
             }
-            if (node.kind === 151 /* Parameter */) {
+            if (node.kind === 152 /* Parameter */) {
                 result = ts.addRange(result, ts.getJSDocParameterTags(node));
                 break;
             }
-            if (node.kind === 150 /* TypeParameter */) {
+            if (node.kind === 151 /* TypeParameter */) {
                 result = ts.addRange(result, ts.getJSDocTypeParameterTags(node));
                 break;
             }
@@ -10411,11 +10636,12 @@ var ts;
     ts.getJSDocCommentsAndTags = getJSDocCommentsAndTags;
     function getNextJSDocCommentLocation(node) {
         var parent = node.parent;
-        if (parent.kind === 275 /* PropertyAssignment */ ||
-            parent.kind === 154 /* PropertyDeclaration */ ||
-            parent.kind === 221 /* ExpressionStatement */ && node.kind === 189 /* PropertyAccessExpression */ ||
+        if (parent.kind === 276 /* PropertyAssignment */ ||
+            parent.kind === 255 /* ExportAssignment */ ||
+            parent.kind === 155 /* PropertyDeclaration */ ||
+            parent.kind === 222 /* ExpressionStatement */ && node.kind === 190 /* PropertyAccessExpression */ ||
             getNestedModuleDeclaration(parent) ||
-            ts.isBinaryExpression(node) && node.operatorToken.kind === 59 /* EqualsToken */) {
+            ts.isBinaryExpression(node) && node.operatorToken.kind === 60 /* EqualsToken */) {
             return parent;
         }
         // Try to recognize this pattern when node is initializer of variable declaration and JSDoc comments are on containing variable statement.
@@ -10426,7 +10652,7 @@ var ts;
         // var x = function(name) { return name.length; }
         else if (parent.parent &&
             (getSingleVariableOfVariableStatement(parent.parent) === node ||
-                ts.isBinaryExpression(parent) && parent.operatorToken.kind === 59 /* EqualsToken */)) {
+                ts.isBinaryExpression(parent) && parent.operatorToken.kind === 60 /* EqualsToken */)) {
             return parent.parent;
         }
         else if (parent.parent && parent.parent.parent &&
@@ -10449,7 +10675,7 @@ var ts;
         if (!decl) {
             return undefined;
         }
-        var parameter = ts.find(decl.parameters, function (p) { return p.name.kind === 72 /* Identifier */ && p.name.escapedText === name; });
+        var parameter = ts.find(decl.parameters, function (p) { return p.name.kind === 73 /* Identifier */ && p.name.escapedText === name; });
         return parameter && parameter.symbol;
     }
     ts.getParameterSymbolFromJSDoc = getParameterSymbolFromJSDoc;
@@ -10484,7 +10710,7 @@ var ts;
     ts.hasRestParameter = hasRestParameter;
     function isRestParameter(node) {
         var type = ts.isJSDocParameterTag(node) ? (node.typeExpression && node.typeExpression.type) : node.type;
-        return node.dotDotDotToken !== undefined || !!type && type.kind === 295 /* JSDocVariadicType */;
+        return node.dotDotDotToken !== undefined || !!type && type.kind === 296 /* JSDocVariadicType */;
     }
     ts.isRestParameter = isRestParameter;
     var AssignmentKind;
@@ -10497,31 +10723,31 @@ var ts;
         var parent = node.parent;
         while (true) {
             switch (parent.kind) {
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     var binaryOperator = parent.operatorToken.kind;
                     return isAssignmentOperator(binaryOperator) && parent.left === node ?
-                        binaryOperator === 59 /* EqualsToken */ ? 1 /* Definite */ : 2 /* Compound */ :
+                        binaryOperator === 60 /* EqualsToken */ ? 1 /* Definite */ : 2 /* Compound */ :
                         0 /* None */;
-                case 202 /* PrefixUnaryExpression */:
-                case 203 /* PostfixUnaryExpression */:
+                case 203 /* PrefixUnaryExpression */:
+                case 204 /* PostfixUnaryExpression */:
                     var unaryOperator = parent.operator;
                     return unaryOperator === 44 /* PlusPlusToken */ || unaryOperator === 45 /* MinusMinusToken */ ? 2 /* Compound */ : 0 /* None */;
-                case 226 /* ForInStatement */:
-                case 227 /* ForOfStatement */:
+                case 227 /* ForInStatement */:
+                case 228 /* ForOfStatement */:
                     return parent.initializer === node ? 1 /* Definite */ : 0 /* None */;
-                case 195 /* ParenthesizedExpression */:
-                case 187 /* ArrayLiteralExpression */:
-                case 208 /* SpreadElement */:
-                case 213 /* NonNullExpression */:
+                case 196 /* ParenthesizedExpression */:
+                case 188 /* ArrayLiteralExpression */:
+                case 209 /* SpreadElement */:
+                case 214 /* NonNullExpression */:
                     node = parent;
                     break;
-                case 276 /* ShorthandPropertyAssignment */:
+                case 277 /* ShorthandPropertyAssignment */:
                     if (parent.name !== node) {
                         return 0 /* None */;
                     }
                     node = parent.parent;
                     break;
-                case 275 /* PropertyAssignment */:
+                case 276 /* PropertyAssignment */:
                     if (parent.name === node) {
                         return 0 /* None */;
                     }
@@ -10548,22 +10774,22 @@ var ts;
      */
     function isNodeWithPossibleHoistedDeclaration(node) {
         switch (node.kind) {
-            case 218 /* Block */:
-            case 219 /* VariableStatement */:
-            case 231 /* WithStatement */:
-            case 222 /* IfStatement */:
-            case 232 /* SwitchStatement */:
-            case 246 /* CaseBlock */:
-            case 271 /* CaseClause */:
-            case 272 /* DefaultClause */:
-            case 233 /* LabeledStatement */:
-            case 225 /* ForStatement */:
-            case 226 /* ForInStatement */:
-            case 227 /* ForOfStatement */:
-            case 223 /* DoStatement */:
-            case 224 /* WhileStatement */:
-            case 235 /* TryStatement */:
-            case 274 /* CatchClause */:
+            case 219 /* Block */:
+            case 220 /* VariableStatement */:
+            case 232 /* WithStatement */:
+            case 223 /* IfStatement */:
+            case 233 /* SwitchStatement */:
+            case 247 /* CaseBlock */:
+            case 272 /* CaseClause */:
+            case 273 /* DefaultClause */:
+            case 234 /* LabeledStatement */:
+            case 226 /* ForStatement */:
+            case 227 /* ForInStatement */:
+            case 228 /* ForOfStatement */:
+            case 224 /* DoStatement */:
+            case 225 /* WhileStatement */:
+            case 236 /* TryStatement */:
+            case 275 /* CatchClause */:
                 return true;
         }
         return false;
@@ -10580,33 +10806,33 @@ var ts;
         return node;
     }
     function walkUpParenthesizedTypes(node) {
-        return walkUp(node, 177 /* ParenthesizedType */);
+        return walkUp(node, 178 /* ParenthesizedType */);
     }
     ts.walkUpParenthesizedTypes = walkUpParenthesizedTypes;
     function walkUpParenthesizedExpressions(node) {
-        return walkUp(node, 195 /* ParenthesizedExpression */);
+        return walkUp(node, 196 /* ParenthesizedExpression */);
     }
     ts.walkUpParenthesizedExpressions = walkUpParenthesizedExpressions;
     function skipParentheses(node) {
-        while (node.kind === 195 /* ParenthesizedExpression */) {
+        while (node.kind === 196 /* ParenthesizedExpression */) {
             node = node.expression;
         }
         return node;
     }
     ts.skipParentheses = skipParentheses;
     function skipParenthesesUp(node) {
-        while (node.kind === 195 /* ParenthesizedExpression */) {
+        while (node.kind === 196 /* ParenthesizedExpression */) {
             node = node.parent;
         }
         return node;
     }
     // a node is delete target iff. it is PropertyAccessExpression/ElementAccessExpression with parentheses skipped
     function isDeleteTarget(node) {
-        if (node.kind !== 189 /* PropertyAccessExpression */ && node.kind !== 190 /* ElementAccessExpression */) {
+        if (node.kind !== 190 /* PropertyAccessExpression */ && node.kind !== 191 /* ElementAccessExpression */) {
             return false;
         }
         node = walkUpParenthesizedExpressions(node.parent);
-        return node && node.kind === 198 /* DeleteExpression */;
+        return node && node.kind === 199 /* DeleteExpression */;
     }
     ts.isDeleteTarget = isDeleteTarget;
     function isNodeDescendantOf(node, ancestor) {
@@ -10632,7 +10858,7 @@ var ts;
                 if (ts.isComputedPropertyName(parent))
                     return parent.parent;
             // falls through
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 if (ts.isDeclaration(parent)) {
                     return parent.name === name ? parent : undefined;
                 }
@@ -10656,7 +10882,7 @@ var ts;
     ts.getDeclarationFromName = getDeclarationFromName;
     function isLiteralComputedPropertyDeclarationName(node) {
         return (node.kind === 10 /* StringLiteral */ || node.kind === 8 /* NumericLiteral */) &&
-            node.parent.kind === 149 /* ComputedPropertyName */ &&
+            node.parent.kind === 150 /* ComputedPropertyName */ &&
             ts.isDeclaration(node.parent.parent);
     }
     ts.isLiteralComputedPropertyDeclarationName = isLiteralComputedPropertyDeclarationName;
@@ -10664,32 +10890,32 @@ var ts;
     function isIdentifierName(node) {
         var parent = node.parent;
         switch (parent.kind) {
-            case 154 /* PropertyDeclaration */:
-            case 153 /* PropertySignature */:
-            case 156 /* MethodDeclaration */:
-            case 155 /* MethodSignature */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
-            case 278 /* EnumMember */:
-            case 275 /* PropertyAssignment */:
-            case 189 /* PropertyAccessExpression */:
+            case 155 /* PropertyDeclaration */:
+            case 154 /* PropertySignature */:
+            case 157 /* MethodDeclaration */:
+            case 156 /* MethodSignature */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
+            case 279 /* EnumMember */:
+            case 276 /* PropertyAssignment */:
+            case 190 /* PropertyAccessExpression */:
                 // Name in member declaration or property name in property access
                 return parent.name === node;
-            case 148 /* QualifiedName */:
+            case 149 /* QualifiedName */:
                 // Name on right hand side of dot in a type query or type reference
                 if (parent.right === node) {
-                    while (parent.kind === 148 /* QualifiedName */) {
+                    while (parent.kind === 149 /* QualifiedName */) {
                         parent = parent.parent;
                     }
-                    return parent.kind === 167 /* TypeQuery */ || parent.kind === 164 /* TypeReference */;
+                    return parent.kind === 168 /* TypeQuery */ || parent.kind === 165 /* TypeReference */;
                 }
                 return false;
-            case 186 /* BindingElement */:
-            case 253 /* ImportSpecifier */:
+            case 187 /* BindingElement */:
+            case 254 /* ImportSpecifier */:
                 // Property name in binding element or import specifier
                 return parent.propertyName === node;
-            case 257 /* ExportSpecifier */:
-            case 267 /* JsxAttribute */:
+            case 258 /* ExportSpecifier */:
+            case 268 /* JsxAttribute */:
                 // Any name in an export specifier or JSX Attribute
                 return true;
         }
@@ -10706,13 +10932,13 @@ var ts;
     // export default <EntityNameExpression>
     // module.exports = <EntityNameExpression>
     function isAliasSymbolDeclaration(node) {
-        return node.kind === 248 /* ImportEqualsDeclaration */ ||
-            node.kind === 247 /* NamespaceExportDeclaration */ ||
-            node.kind === 250 /* ImportClause */ && !!node.name ||
-            node.kind === 251 /* NamespaceImport */ ||
-            node.kind === 253 /* ImportSpecifier */ ||
-            node.kind === 257 /* ExportSpecifier */ ||
-            node.kind === 254 /* ExportAssignment */ && exportAssignmentIsAlias(node) ||
+        return node.kind === 249 /* ImportEqualsDeclaration */ ||
+            node.kind === 248 /* NamespaceExportDeclaration */ ||
+            node.kind === 251 /* ImportClause */ && !!node.name ||
+            node.kind === 252 /* NamespaceImport */ ||
+            node.kind === 254 /* ImportSpecifier */ ||
+            node.kind === 258 /* ExportSpecifier */ ||
+            node.kind === 255 /* ExportAssignment */ && exportAssignmentIsAlias(node) ||
             ts.isBinaryExpression(node) && getAssignmentDeclarationKind(node) === 2 /* ModuleExports */ && exportAssignmentIsAlias(node);
     }
     ts.isAliasSymbolDeclaration = isAliasSymbolDeclaration;
@@ -10734,12 +10960,12 @@ var ts;
     }
     ts.getEffectiveBaseTypeNode = getEffectiveBaseTypeNode;
     function getClassExtendsHeritageElement(node) {
-        var heritageClause = getHeritageClause(node.heritageClauses, 86 /* ExtendsKeyword */);
+        var heritageClause = getHeritageClause(node.heritageClauses, 87 /* ExtendsKeyword */);
         return heritageClause && heritageClause.types.length > 0 ? heritageClause.types[0] : undefined;
     }
     ts.getClassExtendsHeritageElement = getClassExtendsHeritageElement;
     function getClassImplementsHeritageClauseElements(node) {
-        var heritageClause = getHeritageClause(node.heritageClauses, 109 /* ImplementsKeyword */);
+        var heritageClause = getHeritageClause(node.heritageClauses, 110 /* ImplementsKeyword */);
         return heritageClause ? heritageClause.types : undefined;
     }
     ts.getClassImplementsHeritageClauseElements = getClassImplementsHeritageClauseElements;
@@ -10751,7 +10977,7 @@ var ts;
     }
     ts.getAllSuperTypeNodes = getAllSuperTypeNodes;
     function getInterfaceBaseTypeNodes(node) {
-        var heritageClause = getHeritageClause(node.heritageClauses, 86 /* ExtendsKeyword */);
+        var heritageClause = getHeritageClause(node.heritageClauses, 87 /* ExtendsKeyword */);
         return heritageClause ? heritageClause.types : undefined;
     }
     ts.getInterfaceBaseTypeNodes = getInterfaceBaseTypeNodes;
@@ -10767,13 +10993,6 @@ var ts;
         return undefined;
     }
     ts.getHeritageClause = getHeritageClause;
-    function tryResolveScriptReference(host, sourceFile, reference) {
-        if (!host.getCompilerOptions().noResolve) {
-            var referenceFileName = ts.isRootedDiskPath(reference.fileName) ? reference.fileName : ts.combinePaths(ts.getDirectoryPath(sourceFile.fileName), reference.fileName);
-            return host.getSourceFile(referenceFileName);
-        }
-    }
-    ts.tryResolveScriptReference = tryResolveScriptReference;
     function getAncestor(node, kind) {
         while (node) {
             if (node.kind === kind) {
@@ -10785,11 +11004,11 @@ var ts;
     }
     ts.getAncestor = getAncestor;
     function isKeyword(token) {
-        return 73 /* FirstKeyword */ <= token && token <= 147 /* LastKeyword */;
+        return 74 /* FirstKeyword */ <= token && token <= 148 /* LastKeyword */;
     }
     ts.isKeyword = isKeyword;
     function isContextualKeyword(token) {
-        return 118 /* FirstContextualKeyword */ <= token && token <= 147 /* LastContextualKeyword */;
+        return 119 /* FirstContextualKeyword */ <= token && token <= 148 /* LastContextualKeyword */;
     }
     ts.isContextualKeyword = isContextualKeyword;
     function isNonContextualKeyword(token) {
@@ -10824,14 +11043,14 @@ var ts;
         }
         var flags = 0 /* Normal */;
         switch (node.kind) {
-            case 239 /* FunctionDeclaration */:
-            case 196 /* FunctionExpression */:
-            case 156 /* MethodDeclaration */:
+            case 240 /* FunctionDeclaration */:
+            case 197 /* FunctionExpression */:
+            case 157 /* MethodDeclaration */:
                 if (node.asteriskToken) {
                     flags |= 1 /* Generator */;
                 }
             // falls through
-            case 197 /* ArrowFunction */:
+            case 198 /* ArrowFunction */:
                 if (hasModifier(node, 256 /* Async */)) {
                     flags |= 2 /* Async */;
                 }
@@ -10845,10 +11064,10 @@ var ts;
     ts.getFunctionFlags = getFunctionFlags;
     function isAsyncFunction(node) {
         switch (node.kind) {
-            case 239 /* FunctionDeclaration */:
-            case 196 /* FunctionExpression */:
-            case 197 /* ArrowFunction */:
-            case 156 /* MethodDeclaration */:
+            case 240 /* FunctionDeclaration */:
+            case 197 /* FunctionExpression */:
+            case 198 /* ArrowFunction */:
+            case 157 /* MethodDeclaration */:
                 return node.body !== undefined
                     && node.asteriskToken === undefined
                     && hasModifier(node, 256 /* Async */);
@@ -10860,11 +11079,19 @@ var ts;
         return ts.isStringLiteralLike(node) || ts.isNumericLiteral(node);
     }
     ts.isStringOrNumericLiteralLike = isStringOrNumericLiteralLike;
+    function isSignedNumericLiteral(node) {
+        return ts.isPrefixUnaryExpression(node) && (node.operator === 38 /* PlusToken */ || node.operator === 39 /* MinusToken */) && ts.isNumericLiteral(node.operand);
+    }
+    ts.isSignedNumericLiteral = isSignedNumericLiteral;
     /**
-     * A declaration has a dynamic name if both of the following are true:
-     *   1. The declaration has a computed property name
-     *   2. The computed name is *not* expressed as Symbol.<name>, where name
-     *      is a property of the Symbol constructor that denotes a built in
+     * A declaration has a dynamic name if all of the following are true:
+     *   1. The declaration has a computed property name.
+     *   2. The computed name is *not* expressed as a StringLiteral.
+     *   3. The computed name is *not* expressed as a NumericLiteral.
+     *   4. The computed name is *not* expressed as a PlusToken or MinusToken
+     *      immediately followed by a NumericLiteral.
+     *   5. The computed name is *not* expressed as `Symbol.<name>`, where `<name>`
+     *      is a property of the Symbol constructor that denotes a built-in
      *      Symbol.
      */
     function hasDynamicName(declaration) {
@@ -10873,8 +11100,9 @@ var ts;
     }
     ts.hasDynamicName = hasDynamicName;
     function isDynamicName(name) {
-        return name.kind === 149 /* ComputedPropertyName */ &&
+        return name.kind === 150 /* ComputedPropertyName */ &&
             !isStringOrNumericLiteralLike(name.expression) &&
+            !isSignedNumericLiteral(name.expression) &&
             !isWellKnownSymbolSyntactically(name.expression);
     }
     ts.isDynamicName = isDynamicName;
@@ -10889,12 +11117,12 @@ var ts;
     ts.isWellKnownSymbolSyntactically = isWellKnownSymbolSyntactically;
     function getPropertyNameForPropertyNameNode(name) {
         switch (name.kind) {
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 return name.escapedText;
             case 10 /* StringLiteral */:
             case 8 /* NumericLiteral */:
                 return ts.escapeLeadingUnderscores(name.text);
-            case 149 /* ComputedPropertyName */:
+            case 150 /* ComputedPropertyName */:
                 var nameExpression = name.expression;
                 if (isWellKnownSymbolSyntactically(nameExpression)) {
                     return getPropertyNameForKnownSymbolName(ts.idText(nameExpression.name));
@@ -10910,7 +11138,7 @@ var ts;
     ts.getPropertyNameForPropertyNameNode = getPropertyNameForPropertyNameNode;
     function isPropertyNameLiteral(node) {
         switch (node.kind) {
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
             case 10 /* StringLiteral */:
             case 14 /* NoSubstitutionTemplateLiteral */:
             case 8 /* NumericLiteral */:
@@ -10921,11 +11149,11 @@ var ts;
     }
     ts.isPropertyNameLiteral = isPropertyNameLiteral;
     function getTextOfIdentifierOrLiteral(node) {
-        return node.kind === 72 /* Identifier */ ? ts.idText(node) : node.text;
+        return node.kind === 73 /* Identifier */ ? ts.idText(node) : node.text;
     }
     ts.getTextOfIdentifierOrLiteral = getTextOfIdentifierOrLiteral;
     function getEscapedTextOfIdentifierOrLiteral(node) {
-        return node.kind === 72 /* Identifier */ ? node.escapedText : ts.escapeLeadingUnderscores(node.text);
+        return node.kind === 73 /* Identifier */ ? node.escapedText : ts.escapeLeadingUnderscores(node.text);
     }
     ts.getEscapedTextOfIdentifierOrLiteral = getEscapedTextOfIdentifierOrLiteral;
     function getPropertyNameForKnownSymbolName(symbolName) {
@@ -10940,7 +11168,7 @@ var ts;
      * Includes the word "Symbol" with unicode escapes
      */
     function isESSymbolIdentifier(node) {
-        return node.kind === 72 /* Identifier */ && node.escapedText === "Symbol";
+        return node.kind === 73 /* Identifier */ && node.escapedText === "Symbol";
     }
     ts.isESSymbolIdentifier = isESSymbolIdentifier;
     function isPushOrUnshiftIdentifier(node) {
@@ -10949,11 +11177,11 @@ var ts;
     ts.isPushOrUnshiftIdentifier = isPushOrUnshiftIdentifier;
     function isParameterDeclaration(node) {
         var root = getRootDeclaration(node);
-        return root.kind === 151 /* Parameter */;
+        return root.kind === 152 /* Parameter */;
     }
     ts.isParameterDeclaration = isParameterDeclaration;
     function getRootDeclaration(node) {
-        while (node.kind === 186 /* BindingElement */) {
+        while (node.kind === 187 /* BindingElement */) {
             node = node.parent.parent;
         }
         return node;
@@ -10961,15 +11189,15 @@ var ts;
     ts.getRootDeclaration = getRootDeclaration;
     function nodeStartsNewLexicalEnvironment(node) {
         var kind = node.kind;
-        return kind === 157 /* Constructor */
-            || kind === 196 /* FunctionExpression */
-            || kind === 239 /* FunctionDeclaration */
-            || kind === 197 /* ArrowFunction */
-            || kind === 156 /* MethodDeclaration */
-            || kind === 158 /* GetAccessor */
-            || kind === 159 /* SetAccessor */
-            || kind === 244 /* ModuleDeclaration */
-            || kind === 284 /* SourceFile */;
+        return kind === 158 /* Constructor */
+            || kind === 197 /* FunctionExpression */
+            || kind === 240 /* FunctionDeclaration */
+            || kind === 198 /* ArrowFunction */
+            || kind === 157 /* MethodDeclaration */
+            || kind === 159 /* GetAccessor */
+            || kind === 160 /* SetAccessor */
+            || kind === 245 /* ModuleDeclaration */
+            || kind === 285 /* SourceFile */;
     }
     ts.nodeStartsNewLexicalEnvironment = nodeStartsNewLexicalEnvironment;
     function nodeIsSynthesized(range) {
@@ -10988,38 +11216,38 @@ var ts;
     })(Associativity = ts.Associativity || (ts.Associativity = {}));
     function getExpressionAssociativity(expression) {
         var operator = getOperator(expression);
-        var hasArguments = expression.kind === 192 /* NewExpression */ && expression.arguments !== undefined;
+        var hasArguments = expression.kind === 193 /* NewExpression */ && expression.arguments !== undefined;
         return getOperatorAssociativity(expression.kind, operator, hasArguments);
     }
     ts.getExpressionAssociativity = getExpressionAssociativity;
     function getOperatorAssociativity(kind, operator, hasArguments) {
         switch (kind) {
-            case 192 /* NewExpression */:
+            case 193 /* NewExpression */:
                 return hasArguments ? 0 /* Left */ : 1 /* Right */;
-            case 202 /* PrefixUnaryExpression */:
-            case 199 /* TypeOfExpression */:
-            case 200 /* VoidExpression */:
-            case 198 /* DeleteExpression */:
-            case 201 /* AwaitExpression */:
-            case 205 /* ConditionalExpression */:
-            case 207 /* YieldExpression */:
+            case 203 /* PrefixUnaryExpression */:
+            case 200 /* TypeOfExpression */:
+            case 201 /* VoidExpression */:
+            case 199 /* DeleteExpression */:
+            case 202 /* AwaitExpression */:
+            case 206 /* ConditionalExpression */:
+            case 208 /* YieldExpression */:
                 return 1 /* Right */;
-            case 204 /* BinaryExpression */:
+            case 205 /* BinaryExpression */:
                 switch (operator) {
                     case 41 /* AsteriskAsteriskToken */:
-                    case 59 /* EqualsToken */:
-                    case 60 /* PlusEqualsToken */:
-                    case 61 /* MinusEqualsToken */:
-                    case 63 /* AsteriskAsteriskEqualsToken */:
-                    case 62 /* AsteriskEqualsToken */:
-                    case 64 /* SlashEqualsToken */:
-                    case 65 /* PercentEqualsToken */:
-                    case 66 /* LessThanLessThanEqualsToken */:
-                    case 67 /* GreaterThanGreaterThanEqualsToken */:
-                    case 68 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
-                    case 69 /* AmpersandEqualsToken */:
-                    case 71 /* CaretEqualsToken */:
-                    case 70 /* BarEqualsToken */:
+                    case 60 /* EqualsToken */:
+                    case 61 /* PlusEqualsToken */:
+                    case 62 /* MinusEqualsToken */:
+                    case 64 /* AsteriskAsteriskEqualsToken */:
+                    case 63 /* AsteriskEqualsToken */:
+                    case 65 /* SlashEqualsToken */:
+                    case 66 /* PercentEqualsToken */:
+                    case 67 /* LessThanLessThanEqualsToken */:
+                    case 68 /* GreaterThanGreaterThanEqualsToken */:
+                    case 69 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
+                    case 70 /* AmpersandEqualsToken */:
+                    case 72 /* CaretEqualsToken */:
+                    case 71 /* BarEqualsToken */:
                         return 1 /* Right */;
                 }
         }
@@ -11028,15 +11256,15 @@ var ts;
     ts.getOperatorAssociativity = getOperatorAssociativity;
     function getExpressionPrecedence(expression) {
         var operator = getOperator(expression);
-        var hasArguments = expression.kind === 192 /* NewExpression */ && expression.arguments !== undefined;
+        var hasArguments = expression.kind === 193 /* NewExpression */ && expression.arguments !== undefined;
         return getOperatorPrecedence(expression.kind, operator, hasArguments);
     }
     ts.getExpressionPrecedence = getExpressionPrecedence;
     function getOperator(expression) {
-        if (expression.kind === 204 /* BinaryExpression */) {
+        if (expression.kind === 205 /* BinaryExpression */) {
             return expression.operatorToken.kind;
         }
-        else if (expression.kind === 202 /* PrefixUnaryExpression */ || expression.kind === 203 /* PostfixUnaryExpression */) {
+        else if (expression.kind === 203 /* PrefixUnaryExpression */ || expression.kind === 204 /* PostfixUnaryExpression */) {
             return expression.operator;
         }
         else {
@@ -11046,73 +11274,73 @@ var ts;
     ts.getOperator = getOperator;
     function getOperatorPrecedence(nodeKind, operatorKind, hasArguments) {
         switch (nodeKind) {
-            case 314 /* CommaListExpression */:
+            case 316 /* CommaListExpression */:
                 return 0;
-            case 208 /* SpreadElement */:
+            case 209 /* SpreadElement */:
                 return 1;
-            case 207 /* YieldExpression */:
+            case 208 /* YieldExpression */:
                 return 2;
-            case 205 /* ConditionalExpression */:
+            case 206 /* ConditionalExpression */:
                 return 4;
-            case 204 /* BinaryExpression */:
+            case 205 /* BinaryExpression */:
                 switch (operatorKind) {
                     case 27 /* CommaToken */:
                         return 0;
-                    case 59 /* EqualsToken */:
-                    case 60 /* PlusEqualsToken */:
-                    case 61 /* MinusEqualsToken */:
-                    case 63 /* AsteriskAsteriskEqualsToken */:
-                    case 62 /* AsteriskEqualsToken */:
-                    case 64 /* SlashEqualsToken */:
-                    case 65 /* PercentEqualsToken */:
-                    case 66 /* LessThanLessThanEqualsToken */:
-                    case 67 /* GreaterThanGreaterThanEqualsToken */:
-                    case 68 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
-                    case 69 /* AmpersandEqualsToken */:
-                    case 71 /* CaretEqualsToken */:
-                    case 70 /* BarEqualsToken */:
+                    case 60 /* EqualsToken */:
+                    case 61 /* PlusEqualsToken */:
+                    case 62 /* MinusEqualsToken */:
+                    case 64 /* AsteriskAsteriskEqualsToken */:
+                    case 63 /* AsteriskEqualsToken */:
+                    case 65 /* SlashEqualsToken */:
+                    case 66 /* PercentEqualsToken */:
+                    case 67 /* LessThanLessThanEqualsToken */:
+                    case 68 /* GreaterThanGreaterThanEqualsToken */:
+                    case 69 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
+                    case 70 /* AmpersandEqualsToken */:
+                    case 72 /* CaretEqualsToken */:
+                    case 71 /* BarEqualsToken */:
                         return 3;
                     default:
                         return getBinaryOperatorPrecedence(operatorKind);
                 }
-            case 202 /* PrefixUnaryExpression */:
-            case 199 /* TypeOfExpression */:
-            case 200 /* VoidExpression */:
-            case 198 /* DeleteExpression */:
-            case 201 /* AwaitExpression */:
+            case 203 /* PrefixUnaryExpression */:
+            case 200 /* TypeOfExpression */:
+            case 201 /* VoidExpression */:
+            case 199 /* DeleteExpression */:
+            case 202 /* AwaitExpression */:
                 return 16;
-            case 203 /* PostfixUnaryExpression */:
+            case 204 /* PostfixUnaryExpression */:
                 return 17;
-            case 191 /* CallExpression */:
+            case 192 /* CallExpression */:
                 return 18;
-            case 192 /* NewExpression */:
+            case 193 /* NewExpression */:
                 return hasArguments ? 19 : 18;
-            case 193 /* TaggedTemplateExpression */:
-            case 189 /* PropertyAccessExpression */:
-            case 190 /* ElementAccessExpression */:
+            case 194 /* TaggedTemplateExpression */:
+            case 190 /* PropertyAccessExpression */:
+            case 191 /* ElementAccessExpression */:
                 return 19;
-            case 100 /* ThisKeyword */:
-            case 98 /* SuperKeyword */:
-            case 72 /* Identifier */:
-            case 96 /* NullKeyword */:
-            case 102 /* TrueKeyword */:
-            case 87 /* FalseKeyword */:
+            case 101 /* ThisKeyword */:
+            case 99 /* SuperKeyword */:
+            case 73 /* Identifier */:
+            case 97 /* NullKeyword */:
+            case 103 /* TrueKeyword */:
+            case 88 /* FalseKeyword */:
             case 8 /* NumericLiteral */:
             case 9 /* BigIntLiteral */:
             case 10 /* StringLiteral */:
-            case 187 /* ArrayLiteralExpression */:
-            case 188 /* ObjectLiteralExpression */:
-            case 196 /* FunctionExpression */:
-            case 197 /* ArrowFunction */:
-            case 209 /* ClassExpression */:
-            case 260 /* JsxElement */:
-            case 261 /* JsxSelfClosingElement */:
-            case 264 /* JsxFragment */:
+            case 188 /* ArrayLiteralExpression */:
+            case 189 /* ObjectLiteralExpression */:
+            case 197 /* FunctionExpression */:
+            case 198 /* ArrowFunction */:
+            case 210 /* ClassExpression */:
+            case 261 /* JsxElement */:
+            case 262 /* JsxSelfClosingElement */:
+            case 265 /* JsxFragment */:
             case 13 /* RegularExpressionLiteral */:
             case 14 /* NoSubstitutionTemplateLiteral */:
-            case 206 /* TemplateExpression */:
-            case 195 /* ParenthesizedExpression */:
-            case 210 /* OmittedExpression */:
+            case 207 /* TemplateExpression */:
+            case 196 /* ParenthesizedExpression */:
+            case 211 /* OmittedExpression */:
                 return 20;
             default:
                 return -1;
@@ -11140,9 +11368,9 @@ var ts;
             case 30 /* GreaterThanToken */:
             case 31 /* LessThanEqualsToken */:
             case 32 /* GreaterThanEqualsToken */:
-            case 94 /* InstanceOfKeyword */:
-            case 93 /* InKeyword */:
-            case 119 /* AsKeyword */:
+            case 95 /* InstanceOfKeyword */:
+            case 94 /* InKeyword */:
+            case 120 /* AsKeyword */:
                 return 11;
             case 46 /* LessThanLessThanToken */:
             case 47 /* GreaterThanGreaterThanToken */:
@@ -11267,6 +11495,23 @@ var ts;
         return s.replace(escapedCharsRegExp, getReplacement);
     }
     ts.escapeString = escapeString;
+    /**
+     * Strip off existed single quotes or double quotes from a given string
+     *
+     * @return non-quoted string
+     */
+    function stripQuotes(name) {
+        var length = name.length;
+        if (length >= 2 && name.charCodeAt(0) === name.charCodeAt(length - 1) && startsWithQuote(name)) {
+            return name.substring(1, length - 1);
+        }
+        return name;
+    }
+    ts.stripQuotes = stripQuotes;
+    function startsWithQuote(name) {
+        return isSingleOrDoubleQuote(name.charCodeAt(0));
+    }
+    ts.startsWithQuote = startsWithQuote;
     function getReplacement(c, offset, input) {
         if (c.charCodeAt(0) === 0 /* nullCharacter */) {
             var lookAhead = input.charCodeAt(offset + c.length);
@@ -11525,23 +11770,27 @@ var ts;
     function getSourceFilesToEmit(host, targetSourceFile) {
         var options = host.getCompilerOptions();
         var isSourceFileFromExternalLibrary = function (file) { return host.isSourceFileFromExternalLibrary(file); };
+        var getResolvedProjectReferenceToRedirect = function (fileName) { return host.getResolvedProjectReferenceToRedirect(fileName); };
         if (options.outFile || options.out) {
             var moduleKind = ts.getEmitModuleKind(options);
             var moduleEmitEnabled_1 = options.emitDeclarationOnly || moduleKind === ts.ModuleKind.AMD || moduleKind === ts.ModuleKind.System;
             // Can emit only sources that are not declaration file and are either non module code or module with --module or --target es6 specified
             return ts.filter(host.getSourceFiles(), function (sourceFile) {
-                return (moduleEmitEnabled_1 || !ts.isExternalModule(sourceFile)) && sourceFileMayBeEmitted(sourceFile, options, isSourceFileFromExternalLibrary);
+                return (moduleEmitEnabled_1 || !ts.isExternalModule(sourceFile)) && sourceFileMayBeEmitted(sourceFile, options, isSourceFileFromExternalLibrary, getResolvedProjectReferenceToRedirect);
             });
         }
         else {
             var sourceFiles = targetSourceFile === undefined ? host.getSourceFiles() : [targetSourceFile];
-            return ts.filter(sourceFiles, function (sourceFile) { return sourceFileMayBeEmitted(sourceFile, options, isSourceFileFromExternalLibrary); });
+            return ts.filter(sourceFiles, function (sourceFile) { return sourceFileMayBeEmitted(sourceFile, options, isSourceFileFromExternalLibrary, getResolvedProjectReferenceToRedirect); });
         }
     }
     ts.getSourceFilesToEmit = getSourceFilesToEmit;
     /** Don't call this for `--outFile`, just for `--outDir` or plain emit. `--outFile` needs additional checks. */
-    function sourceFileMayBeEmitted(sourceFile, options, isSourceFileFromExternalLibrary) {
-        return !(options.noEmitForJsFiles && isSourceFileJS(sourceFile)) && !sourceFile.isDeclarationFile && !isSourceFileFromExternalLibrary(sourceFile);
+    function sourceFileMayBeEmitted(sourceFile, options, isSourceFileFromExternalLibrary, getResolvedProjectReferenceToRedirect) {
+        return !(options.noEmitForJsFiles && isSourceFileJS(sourceFile)) &&
+            !sourceFile.isDeclarationFile &&
+            !isSourceFileFromExternalLibrary(sourceFile) &&
+            !(isJsonSourceFile(sourceFile) && getResolvedProjectReferenceToRedirect(sourceFile.fileName));
     }
     ts.sourceFileMayBeEmitted = sourceFileMayBeEmitted;
     function getSourceFilePathInNewDir(fileName, host, newDirPath) {
@@ -11600,11 +11849,11 @@ var ts;
     }
     ts.parameterIsThisKeyword = parameterIsThisKeyword;
     function isThisIdentifier(node) {
-        return !!node && node.kind === 72 /* Identifier */ && identifierIsThisKeyword(node);
+        return !!node && node.kind === 73 /* Identifier */ && identifierIsThisKeyword(node);
     }
     ts.isThisIdentifier = isThisIdentifier;
     function identifierIsThisKeyword(id) {
-        return id.originalKeywordKind === 100 /* ThisKeyword */;
+        return id.originalKeywordKind === 101 /* ThisKeyword */;
     }
     ts.identifierIsThisKeyword = identifierIsThisKeyword;
     function getAllAccessorDeclarations(declarations, accessor) {
@@ -11615,10 +11864,10 @@ var ts;
         var setAccessor;
         if (hasDynamicName(accessor)) {
             firstAccessor = accessor;
-            if (accessor.kind === 158 /* GetAccessor */) {
+            if (accessor.kind === 159 /* GetAccessor */) {
                 getAccessor = accessor;
             }
-            else if (accessor.kind === 159 /* SetAccessor */) {
+            else if (accessor.kind === 160 /* SetAccessor */) {
                 setAccessor = accessor;
             }
             else {
@@ -11638,10 +11887,10 @@ var ts;
                         else if (!secondAccessor) {
                             secondAccessor = member;
                         }
-                        if (member.kind === 158 /* GetAccessor */ && !getAccessor) {
+                        if (member.kind === 159 /* GetAccessor */ && !getAccessor) {
                             getAccessor = member;
                         }
-                        if (member.kind === 159 /* SetAccessor */ && !setAccessor) {
+                        if (member.kind === 160 /* SetAccessor */ && !setAccessor) {
                             setAccessor = member;
                         }
                     }
@@ -11687,7 +11936,7 @@ var ts;
     ts.getJSDocTypeParameterDeclarations = getJSDocTypeParameterDeclarations;
     /** template tags are only available when a typedef isn't already using them */
     function isNonTypeAliasTemplate(tag) {
-        return ts.isJSDocTemplateTag(tag) && !(tag.parent.kind === 296 /* JSDocComment */ && tag.parent.tags.some(isJSDocTypeAlias));
+        return ts.isJSDocTemplateTag(tag) && !(tag.parent.kind === 297 /* JSDocComment */ && tag.parent.tags.some(isJSDocTypeAlias));
     }
     /**
      * Gets the effective type annotation of the value parameter of a set accessor. If the node
@@ -11927,7 +12176,7 @@ var ts;
                 flags |= modifierToFlag(modifier.kind);
             }
         }
-        if (node.flags & 4 /* NestedNamespace */ || (node.kind === 72 /* Identifier */ && node.isInJSDocNamespace)) {
+        if (node.flags & 4 /* NestedNamespace */ || (node.kind === 73 /* Identifier */ && node.isInJSDocNamespace)) {
             flags |= 1 /* Export */;
         }
         return flags;
@@ -11935,17 +12184,17 @@ var ts;
     ts.getModifierFlagsNoCache = getModifierFlagsNoCache;
     function modifierToFlag(token) {
         switch (token) {
-            case 116 /* StaticKeyword */: return 32 /* Static */;
-            case 115 /* PublicKeyword */: return 4 /* Public */;
-            case 114 /* ProtectedKeyword */: return 16 /* Protected */;
-            case 113 /* PrivateKeyword */: return 8 /* Private */;
-            case 118 /* AbstractKeyword */: return 128 /* Abstract */;
-            case 85 /* ExportKeyword */: return 1 /* Export */;
-            case 125 /* DeclareKeyword */: return 2 /* Ambient */;
-            case 77 /* ConstKeyword */: return 2048 /* Const */;
-            case 80 /* DefaultKeyword */: return 512 /* Default */;
-            case 121 /* AsyncKeyword */: return 256 /* Async */;
-            case 133 /* ReadonlyKeyword */: return 64 /* Readonly */;
+            case 117 /* StaticKeyword */: return 32 /* Static */;
+            case 116 /* PublicKeyword */: return 4 /* Public */;
+            case 115 /* ProtectedKeyword */: return 16 /* Protected */;
+            case 114 /* PrivateKeyword */: return 8 /* Private */;
+            case 119 /* AbstractKeyword */: return 128 /* Abstract */;
+            case 86 /* ExportKeyword */: return 1 /* Export */;
+            case 126 /* DeclareKeyword */: return 2 /* Ambient */;
+            case 78 /* ConstKeyword */: return 2048 /* Const */;
+            case 81 /* DefaultKeyword */: return 512 /* Default */;
+            case 122 /* AsyncKeyword */: return 256 /* Async */;
+            case 134 /* ReadonlyKeyword */: return 64 /* Readonly */;
         }
         return 0 /* None */;
     }
@@ -11957,7 +12206,7 @@ var ts;
     }
     ts.isLogicalOperator = isLogicalOperator;
     function isAssignmentOperator(token) {
-        return token >= 59 /* FirstAssignment */ && token <= 71 /* LastAssignment */;
+        return token >= 60 /* FirstAssignment */ && token <= 72 /* LastAssignment */;
     }
     ts.isAssignmentOperator = isAssignmentOperator;
     /** Get `C` given `N` if `N` is in the position `class C extends N` where `N` is an ExpressionWithTypeArguments. */
@@ -11970,14 +12219,14 @@ var ts;
         return ts.isExpressionWithTypeArguments(node)
             && ts.isHeritageClause(node.parent)
             && ts.isClassLike(node.parent.parent)
-            ? { class: node.parent.parent, isImplements: node.parent.token === 109 /* ImplementsKeyword */ }
+            ? { class: node.parent.parent, isImplements: node.parent.token === 110 /* ImplementsKeyword */ }
             : undefined;
     }
     ts.tryGetClassImplementingOrExtendingExpressionWithTypeArguments = tryGetClassImplementingOrExtendingExpressionWithTypeArguments;
     function isAssignmentExpression(node, excludeCompoundAssignment) {
         return ts.isBinaryExpression(node)
             && (excludeCompoundAssignment
-                ? node.operatorToken.kind === 59 /* EqualsToken */
+                ? node.operatorToken.kind === 60 /* EqualsToken */
                 : isAssignmentOperator(node.operatorToken.kind))
             && ts.isLeftHandSideExpression(node.left);
     }
@@ -11985,8 +12234,8 @@ var ts;
     function isDestructuringAssignment(node) {
         if (isAssignmentExpression(node, /*excludeCompoundAssignment*/ true)) {
             var kind = node.left.kind;
-            return kind === 188 /* ObjectLiteralExpression */
-                || kind === 187 /* ArrayLiteralExpression */;
+            return kind === 189 /* ObjectLiteralExpression */
+                || kind === 188 /* ArrayLiteralExpression */;
         }
         return false;
     }
@@ -11996,29 +12245,39 @@ var ts;
     }
     ts.isExpressionWithTypeArgumentsInClassExtendsClause = isExpressionWithTypeArgumentsInClassExtendsClause;
     function isEntityNameExpression(node) {
-        return node.kind === 72 /* Identifier */ || isPropertyAccessEntityNameExpression(node);
+        return node.kind === 73 /* Identifier */ || isPropertyAccessEntityNameExpression(node);
     }
     ts.isEntityNameExpression = isEntityNameExpression;
     function isPropertyAccessEntityNameExpression(node) {
         return ts.isPropertyAccessExpression(node) && isEntityNameExpression(node.expression);
     }
     ts.isPropertyAccessEntityNameExpression = isPropertyAccessEntityNameExpression;
+    function tryGetPropertyAccessOrIdentifierToString(expr) {
+        if (ts.isPropertyAccessExpression(expr)) {
+            return tryGetPropertyAccessOrIdentifierToString(expr.expression) + "." + expr.name;
+        }
+        if (ts.isIdentifier(expr)) {
+            return ts.unescapeLeadingUnderscores(expr.escapedText);
+        }
+        return undefined;
+    }
+    ts.tryGetPropertyAccessOrIdentifierToString = tryGetPropertyAccessOrIdentifierToString;
     function isPrototypeAccess(node) {
         return ts.isPropertyAccessExpression(node) && node.name.escapedText === "prototype";
     }
     ts.isPrototypeAccess = isPrototypeAccess;
     function isRightSideOfQualifiedNameOrPropertyAccess(node) {
-        return (node.parent.kind === 148 /* QualifiedName */ && node.parent.right === node) ||
-            (node.parent.kind === 189 /* PropertyAccessExpression */ && node.parent.name === node);
+        return (node.parent.kind === 149 /* QualifiedName */ && node.parent.right === node) ||
+            (node.parent.kind === 190 /* PropertyAccessExpression */ && node.parent.name === node);
     }
     ts.isRightSideOfQualifiedNameOrPropertyAccess = isRightSideOfQualifiedNameOrPropertyAccess;
     function isEmptyObjectLiteral(expression) {
-        return expression.kind === 188 /* ObjectLiteralExpression */ &&
+        return expression.kind === 189 /* ObjectLiteralExpression */ &&
             expression.properties.length === 0;
     }
     ts.isEmptyObjectLiteral = isEmptyObjectLiteral;
     function isEmptyArrayLiteral(expression) {
-        return expression.kind === 187 /* ArrayLiteralExpression */ &&
+        return expression.kind === 188 /* ArrayLiteralExpression */ &&
             expression.elements.length === 0;
     }
     ts.isEmptyArrayLiteral = isEmptyArrayLiteral;
@@ -12206,77 +12465,6 @@ var ts;
         return getNewLine ? getNewLine() : ts.sys ? ts.sys.newLine : carriageReturnLineFeed;
     }
     ts.getNewLineCharacter = getNewLineCharacter;
-    /**
-     * Formats an enum value as a string for debugging and debug assertions.
-     */
-    function formatEnum(value, enumObject, isFlags) {
-        if (value === void 0) { value = 0; }
-        var members = getEnumMembers(enumObject);
-        if (value === 0) {
-            return members.length > 0 && members[0][0] === 0 ? members[0][1] : "0";
-        }
-        if (isFlags) {
-            var result = "";
-            var remainingFlags = value;
-            for (var i = members.length - 1; i >= 0 && remainingFlags !== 0; i--) {
-                var _a = members[i], enumValue = _a[0], enumName = _a[1];
-                if (enumValue !== 0 && (remainingFlags & enumValue) === enumValue) {
-                    remainingFlags &= ~enumValue;
-                    result = "" + enumName + (result ? ", " : "") + result;
-                }
-            }
-            if (remainingFlags === 0) {
-                return result;
-            }
-        }
-        else {
-            for (var _i = 0, members_1 = members; _i < members_1.length; _i++) {
-                var _b = members_1[_i], enumValue = _b[0], enumName = _b[1];
-                if (enumValue === value) {
-                    return enumName;
-                }
-            }
-        }
-        return value.toString();
-    }
-    function getEnumMembers(enumObject) {
-        var result = [];
-        for (var name in enumObject) {
-            var value = enumObject[name];
-            if (typeof value === "number") {
-                result.push([value, name]);
-            }
-        }
-        return ts.stableSort(result, function (x, y) { return ts.compareValues(x[0], y[0]); });
-    }
-    function formatSyntaxKind(kind) {
-        return formatEnum(kind, ts.SyntaxKind, /*isFlags*/ false);
-    }
-    ts.formatSyntaxKind = formatSyntaxKind;
-    function formatModifierFlags(flags) {
-        return formatEnum(flags, ts.ModifierFlags, /*isFlags*/ true);
-    }
-    ts.formatModifierFlags = formatModifierFlags;
-    function formatTransformFlags(flags) {
-        return formatEnum(flags, ts.TransformFlags, /*isFlags*/ true);
-    }
-    ts.formatTransformFlags = formatTransformFlags;
-    function formatEmitFlags(flags) {
-        return formatEnum(flags, ts.EmitFlags, /*isFlags*/ true);
-    }
-    ts.formatEmitFlags = formatEmitFlags;
-    function formatSymbolFlags(flags) {
-        return formatEnum(flags, ts.SymbolFlags, /*isFlags*/ true);
-    }
-    ts.formatSymbolFlags = formatSymbolFlags;
-    function formatTypeFlags(flags) {
-        return formatEnum(flags, ts.TypeFlags, /*isFlags*/ true);
-    }
-    ts.formatTypeFlags = formatTypeFlags;
-    function formatObjectFlags(flags) {
-        return formatEnum(flags, ts.ObjectFlags, /*isFlags*/ true);
-    }
-    ts.formatObjectFlags = formatObjectFlags;
     /**
      * Creates a new TextRange from the provided pos and end.
      *
@@ -12366,6 +12554,10 @@ var ts;
         return positionsAreOnSameLine(range1.end, getStartPositionOfRange(range2, sourceFile), sourceFile);
     }
     ts.rangeEndIsOnSameLineAsRangeStart = rangeEndIsOnSameLineAsRangeStart;
+    function isNodeArrayMultiLine(list, sourceFile) {
+        return !positionsAreOnSameLine(list.pos, list.end, sourceFile);
+    }
+    ts.isNodeArrayMultiLine = isNodeArrayMultiLine;
     function positionsAreOnSameLine(pos1, pos2, sourceFile) {
         return pos1 === pos2 ||
             getLineOfLocalPosition(sourceFile, pos1) === getLineOfLocalPosition(sourceFile, pos2);
@@ -12383,8 +12575,8 @@ var ts;
         var parseNode = ts.getParseTreeNode(node);
         if (parseNode) {
             switch (parseNode.parent.kind) {
-                case 243 /* EnumDeclaration */:
-                case 244 /* ModuleDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     return parseNode === parseNode.parent.name;
             }
         }
@@ -12418,10 +12610,10 @@ var ts;
         }
         if (getCheckFlags(s) & 6 /* Synthetic */) {
             var checkFlags = s.checkFlags;
-            var accessModifier = checkFlags & 512 /* ContainsPrivate */ ? 8 /* Private */ :
-                checkFlags & 128 /* ContainsPublic */ ? 4 /* Public */ :
+            var accessModifier = checkFlags & 1024 /* ContainsPrivate */ ? 8 /* Private */ :
+                checkFlags & 256 /* ContainsPublic */ ? 4 /* Public */ :
                     16 /* Protected */;
-            var staticModifier = checkFlags & 1024 /* ContainsStatic */ ? 32 /* Static */ : 0;
+            var staticModifier = checkFlags & 2048 /* ContainsStatic */ ? 32 /* Static */ : 0;
             return accessModifier | staticModifier;
         }
         if (s.flags & 4194304 /* Prototype */) {
@@ -12461,35 +12653,35 @@ var ts;
         if (!parent)
             return 0 /* Read */;
         switch (parent.kind) {
-            case 195 /* ParenthesizedExpression */:
+            case 196 /* ParenthesizedExpression */:
                 return accessKind(parent);
-            case 203 /* PostfixUnaryExpression */:
-            case 202 /* PrefixUnaryExpression */:
+            case 204 /* PostfixUnaryExpression */:
+            case 203 /* PrefixUnaryExpression */:
                 var operator = parent.operator;
                 return operator === 44 /* PlusPlusToken */ || operator === 45 /* MinusMinusToken */ ? writeOrReadWrite() : 0 /* Read */;
-            case 204 /* BinaryExpression */:
+            case 205 /* BinaryExpression */:
                 var _a = parent, left = _a.left, operatorToken = _a.operatorToken;
                 return left === node && isAssignmentOperator(operatorToken.kind) ?
-                    operatorToken.kind === 59 /* EqualsToken */ ? 1 /* Write */ : writeOrReadWrite()
+                    operatorToken.kind === 60 /* EqualsToken */ ? 1 /* Write */ : writeOrReadWrite()
                     : 0 /* Read */;
-            case 189 /* PropertyAccessExpression */:
+            case 190 /* PropertyAccessExpression */:
                 return parent.name !== node ? 0 /* Read */ : accessKind(parent);
-            case 275 /* PropertyAssignment */: {
+            case 276 /* PropertyAssignment */: {
                 var parentAccess = accessKind(parent.parent);
                 // In `({ x: varname }) = { x: 1 }`, the left `x` is a read, the right `x` is a write.
                 return node === parent.name ? reverseAccessKind(parentAccess) : parentAccess;
             }
-            case 276 /* ShorthandPropertyAssignment */:
+            case 277 /* ShorthandPropertyAssignment */:
                 // Assume it's the local variable being accessed, since we don't check public properties for --noUnusedLocals.
                 return node === parent.objectAssignmentInitializer ? 0 /* Read */ : accessKind(parent.parent);
-            case 187 /* ArrayLiteralExpression */:
+            case 188 /* ArrayLiteralExpression */:
                 return accessKind(parent);
             default:
                 return 0 /* Read */;
         }
         function writeOrReadWrite() {
             // If grandparent is not an ExpressionStatement, this is used as an expression in addition to having a side effect.
-            return parent.parent && skipParenthesesUp(parent.parent).kind === 221 /* ExpressionStatement */ ? 1 /* Write */ : 2 /* ReadWrite */;
+            return parent.parent && skipParenthesesUp(parent.parent).kind === 222 /* ExpressionStatement */ ? 1 /* Write */ : 2 /* ReadWrite */;
         }
     }
     function reverseAccessKind(a) {
@@ -12592,7 +12784,7 @@ var ts;
     }
     ts.getClassLikeDeclarationOfSymbol = getClassLikeDeclarationOfSymbol;
     function getObjectFlags(type) {
-        return type.flags & 3768320 /* ObjectFlagsType */ ? type.objectFlags : 0;
+        return type.flags & 3899392 /* ObjectFlagsType */ ? type.objectFlags : 0;
     }
     ts.getObjectFlags = getObjectFlags;
     function typeHasCallOrConstructSignatures(type, checker) {
@@ -12644,32 +12836,32 @@ var ts;
     }
     ts.isObjectTypeDeclaration = isObjectTypeDeclaration;
     function isTypeNodeKind(kind) {
-        return (kind >= 163 /* FirstTypeNode */ && kind <= 183 /* LastTypeNode */)
-            || kind === 120 /* AnyKeyword */
-            || kind === 143 /* UnknownKeyword */
-            || kind === 135 /* NumberKeyword */
-            || kind === 146 /* BigIntKeyword */
-            || kind === 136 /* ObjectKeyword */
-            || kind === 123 /* BooleanKeyword */
-            || kind === 138 /* StringKeyword */
-            || kind === 139 /* SymbolKeyword */
-            || kind === 100 /* ThisKeyword */
-            || kind === 106 /* VoidKeyword */
-            || kind === 141 /* UndefinedKeyword */
-            || kind === 96 /* NullKeyword */
-            || kind === 132 /* NeverKeyword */
-            || kind === 211 /* ExpressionWithTypeArguments */
-            || kind === 289 /* JSDocAllType */
-            || kind === 290 /* JSDocUnknownType */
-            || kind === 291 /* JSDocNullableType */
-            || kind === 292 /* JSDocNonNullableType */
-            || kind === 293 /* JSDocOptionalType */
-            || kind === 294 /* JSDocFunctionType */
-            || kind === 295 /* JSDocVariadicType */;
+        return (kind >= 164 /* FirstTypeNode */ && kind <= 184 /* LastTypeNode */)
+            || kind === 121 /* AnyKeyword */
+            || kind === 144 /* UnknownKeyword */
+            || kind === 136 /* NumberKeyword */
+            || kind === 147 /* BigIntKeyword */
+            || kind === 137 /* ObjectKeyword */
+            || kind === 124 /* BooleanKeyword */
+            || kind === 139 /* StringKeyword */
+            || kind === 140 /* SymbolKeyword */
+            || kind === 101 /* ThisKeyword */
+            || kind === 107 /* VoidKeyword */
+            || kind === 142 /* UndefinedKeyword */
+            || kind === 97 /* NullKeyword */
+            || kind === 133 /* NeverKeyword */
+            || kind === 212 /* ExpressionWithTypeArguments */
+            || kind === 290 /* JSDocAllType */
+            || kind === 291 /* JSDocUnknownType */
+            || kind === 292 /* JSDocNullableType */
+            || kind === 293 /* JSDocNonNullableType */
+            || kind === 294 /* JSDocOptionalType */
+            || kind === 295 /* JSDocFunctionType */
+            || kind === 296 /* JSDocVariadicType */;
     }
     ts.isTypeNodeKind = isTypeNodeKind;
     function isAccessExpression(node) {
-        return node.kind === 189 /* PropertyAccessExpression */ || node.kind === 190 /* ElementAccessExpression */;
+        return node.kind === 190 /* PropertyAccessExpression */ || node.kind === 191 /* ElementAccessExpression */;
     }
     ts.isAccessExpression = isAccessExpression;
     function isBundleFileTextLike(section) {
@@ -12686,8 +12878,10 @@ var ts;
 (function (ts) {
     function getDefaultLibFileName(options) {
         switch (options.target) {
-            case 7 /* ESNext */:
+            case 99 /* ESNext */:
                 return "lib.esnext.full.d.ts";
+            case 7 /* ES2020 */:
+                return "lib.es2020.full.d.ts";
             case 6 /* ES2019 */:
                 return "lib.es2019.full.d.ts";
             case 5 /* ES2018 */:
@@ -12904,9 +13098,9 @@ var ts;
     }
     ts.collapseTextChangeRangesAcrossMultipleVersions = collapseTextChangeRangesAcrossMultipleVersions;
     function getTypeParameterOwner(d) {
-        if (d && d.kind === 150 /* TypeParameter */) {
+        if (d && d.kind === 151 /* TypeParameter */) {
             for (var current = d; current; current = current.parent) {
-                if (ts.isFunctionLike(current) || ts.isClassLike(current) || current.kind === 241 /* InterfaceDeclaration */) {
+                if (ts.isFunctionLike(current) || ts.isClassLike(current) || current.kind === 242 /* InterfaceDeclaration */) {
                     return current;
                 }
             }
@@ -12914,7 +13108,7 @@ var ts;
     }
     ts.getTypeParameterOwner = getTypeParameterOwner;
     function isParameterPropertyDeclaration(node) {
-        return ts.hasModifier(node, 92 /* ParameterPropertyModifier */) && node.parent.kind === 157 /* Constructor */;
+        return ts.hasModifier(node, 92 /* ParameterPropertyModifier */) && node.parent.kind === 158 /* Constructor */;
     }
     ts.isParameterPropertyDeclaration = isParameterPropertyDeclaration;
     function isEmptyBindingPattern(node) {
@@ -12944,14 +13138,14 @@ var ts;
             node = walkUpBindingElementsAndPatterns(node);
         }
         var flags = getFlags(node);
-        if (node.kind === 237 /* VariableDeclaration */) {
+        if (node.kind === 238 /* VariableDeclaration */) {
             node = node.parent;
         }
-        if (node && node.kind === 238 /* VariableDeclarationList */) {
+        if (node && node.kind === 239 /* VariableDeclarationList */) {
             flags |= getFlags(node);
             node = node.parent;
         }
-        if (node && node.kind === 219 /* VariableStatement */) {
+        if (node && node.kind === 220 /* VariableStatement */) {
             flags |= getFlags(node);
         }
         return flags;
@@ -13097,27 +13291,27 @@ var ts;
         }
         // Covers remaining cases (returning undefined if none match).
         switch (hostNode.kind) {
-            case 219 /* VariableStatement */:
+            case 220 /* VariableStatement */:
                 if (hostNode.declarationList && hostNode.declarationList.declarations[0]) {
                     return getDeclarationIdentifier(hostNode.declarationList.declarations[0]);
                 }
                 break;
-            case 221 /* ExpressionStatement */:
+            case 222 /* ExpressionStatement */:
                 var expr = hostNode.expression;
                 switch (expr.kind) {
-                    case 189 /* PropertyAccessExpression */:
+                    case 190 /* PropertyAccessExpression */:
                         return expr.name;
-                    case 190 /* ElementAccessExpression */:
+                    case 191 /* ElementAccessExpression */:
                         var arg = expr.argumentExpression;
                         if (ts.isIdentifier(arg)) {
                             return arg;
                         }
                 }
                 break;
-            case 195 /* ParenthesizedExpression */: {
+            case 196 /* ParenthesizedExpression */: {
                 return getDeclarationIdentifier(hostNode.expression);
             }
-            case 233 /* LabeledStatement */: {
+            case 234 /* LabeledStatement */: {
                 if (ts.isDeclaration(hostNode.statement) || ts.isExpression(hostNode.statement)) {
                     return getDeclarationIdentifier(hostNode.statement);
                 }
@@ -13141,18 +13335,18 @@ var ts;
     /** @internal */
     function getNonAssignedNameOfDeclaration(declaration) {
         switch (declaration.kind) {
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 return declaration;
-            case 310 /* JSDocPropertyTag */:
-            case 304 /* JSDocParameterTag */: {
+            case 312 /* JSDocPropertyTag */:
+            case 306 /* JSDocParameterTag */: {
                 var name = declaration.name;
-                if (name.kind === 148 /* QualifiedName */) {
+                if (name.kind === 149 /* QualifiedName */) {
                     return name.right;
                 }
                 break;
             }
-            case 191 /* CallExpression */:
-            case 204 /* BinaryExpression */: {
+            case 192 /* CallExpression */:
+            case 205 /* BinaryExpression */: {
                 var expr = declaration;
                 switch (ts.getAssignmentDeclarationKind(expr)) {
                     case 1 /* ExportsProperty */:
@@ -13168,9 +13362,9 @@ var ts;
                         return undefined;
                 }
             }
-            case 309 /* JSDocTypedefTag */:
+            case 311 /* JSDocTypedefTag */:
                 return getNameOfJSDocTypedef(declaration);
-            case 254 /* ExportAssignment */: {
+            case 255 /* ExportAssignment */: {
                 var expression = declaration.expression;
                 return ts.isIdentifier(expression) ? expression : undefined;
             }
@@ -13200,6 +13394,9 @@ var ts;
                 return node.parent.left.name;
             }
         }
+        else if (ts.isVariableDeclaration(node.parent) && ts.isIdentifier(node.parent.name)) {
+            return node.parent.name;
+        }
     }
     /**
      * Gets the JSDoc parameter tags for the node if present.
@@ -13372,7 +13569,7 @@ var ts;
             return ts.emptyArray;
         }
         if (ts.isJSDocTypeAlias(node)) {
-            ts.Debug.assert(node.parent.kind === 296 /* JSDocComment */);
+            ts.Debug.assert(node.parent.kind === 297 /* JSDocComment */);
             return ts.flatMap(node.parent.tags, function (tag) { return ts.isJSDocTemplateTag(tag) ? tag.typeParameters : undefined; });
         }
         if (node.typeParameters) {
@@ -13440,198 +13637,198 @@ var ts;
     }
     ts.isTemplateTail = isTemplateTail;
     function isIdentifier(node) {
-        return node.kind === 72 /* Identifier */;
+        return node.kind === 73 /* Identifier */;
     }
     ts.isIdentifier = isIdentifier;
     // Names
     function isQualifiedName(node) {
-        return node.kind === 148 /* QualifiedName */;
+        return node.kind === 149 /* QualifiedName */;
     }
     ts.isQualifiedName = isQualifiedName;
     function isComputedPropertyName(node) {
-        return node.kind === 149 /* ComputedPropertyName */;
+        return node.kind === 150 /* ComputedPropertyName */;
     }
     ts.isComputedPropertyName = isComputedPropertyName;
     // Signature elements
     function isTypeParameterDeclaration(node) {
-        return node.kind === 150 /* TypeParameter */;
+        return node.kind === 151 /* TypeParameter */;
     }
     ts.isTypeParameterDeclaration = isTypeParameterDeclaration;
     function isParameter(node) {
-        return node.kind === 151 /* Parameter */;
+        return node.kind === 152 /* Parameter */;
     }
     ts.isParameter = isParameter;
     function isDecorator(node) {
-        return node.kind === 152 /* Decorator */;
+        return node.kind === 153 /* Decorator */;
     }
     ts.isDecorator = isDecorator;
     // TypeMember
     function isPropertySignature(node) {
-        return node.kind === 153 /* PropertySignature */;
+        return node.kind === 154 /* PropertySignature */;
     }
     ts.isPropertySignature = isPropertySignature;
     function isPropertyDeclaration(node) {
-        return node.kind === 154 /* PropertyDeclaration */;
+        return node.kind === 155 /* PropertyDeclaration */;
     }
     ts.isPropertyDeclaration = isPropertyDeclaration;
     function isMethodSignature(node) {
-        return node.kind === 155 /* MethodSignature */;
+        return node.kind === 156 /* MethodSignature */;
     }
     ts.isMethodSignature = isMethodSignature;
     function isMethodDeclaration(node) {
-        return node.kind === 156 /* MethodDeclaration */;
+        return node.kind === 157 /* MethodDeclaration */;
     }
     ts.isMethodDeclaration = isMethodDeclaration;
     function isConstructorDeclaration(node) {
-        return node.kind === 157 /* Constructor */;
+        return node.kind === 158 /* Constructor */;
     }
     ts.isConstructorDeclaration = isConstructorDeclaration;
     function isGetAccessorDeclaration(node) {
-        return node.kind === 158 /* GetAccessor */;
+        return node.kind === 159 /* GetAccessor */;
     }
     ts.isGetAccessorDeclaration = isGetAccessorDeclaration;
     function isSetAccessorDeclaration(node) {
-        return node.kind === 159 /* SetAccessor */;
+        return node.kind === 160 /* SetAccessor */;
     }
     ts.isSetAccessorDeclaration = isSetAccessorDeclaration;
     function isCallSignatureDeclaration(node) {
-        return node.kind === 160 /* CallSignature */;
+        return node.kind === 161 /* CallSignature */;
     }
     ts.isCallSignatureDeclaration = isCallSignatureDeclaration;
     function isConstructSignatureDeclaration(node) {
-        return node.kind === 161 /* ConstructSignature */;
+        return node.kind === 162 /* ConstructSignature */;
     }
     ts.isConstructSignatureDeclaration = isConstructSignatureDeclaration;
     function isIndexSignatureDeclaration(node) {
-        return node.kind === 162 /* IndexSignature */;
+        return node.kind === 163 /* IndexSignature */;
     }
     ts.isIndexSignatureDeclaration = isIndexSignatureDeclaration;
     /* @internal */
     function isGetOrSetAccessorDeclaration(node) {
-        return node.kind === 159 /* SetAccessor */ || node.kind === 158 /* GetAccessor */;
+        return node.kind === 160 /* SetAccessor */ || node.kind === 159 /* GetAccessor */;
     }
     ts.isGetOrSetAccessorDeclaration = isGetOrSetAccessorDeclaration;
     // Type
     function isTypePredicateNode(node) {
-        return node.kind === 163 /* TypePredicate */;
+        return node.kind === 164 /* TypePredicate */;
     }
     ts.isTypePredicateNode = isTypePredicateNode;
     function isTypeReferenceNode(node) {
-        return node.kind === 164 /* TypeReference */;
+        return node.kind === 165 /* TypeReference */;
     }
     ts.isTypeReferenceNode = isTypeReferenceNode;
     function isFunctionTypeNode(node) {
-        return node.kind === 165 /* FunctionType */;
+        return node.kind === 166 /* FunctionType */;
     }
     ts.isFunctionTypeNode = isFunctionTypeNode;
     function isConstructorTypeNode(node) {
-        return node.kind === 166 /* ConstructorType */;
+        return node.kind === 167 /* ConstructorType */;
     }
     ts.isConstructorTypeNode = isConstructorTypeNode;
     function isTypeQueryNode(node) {
-        return node.kind === 167 /* TypeQuery */;
+        return node.kind === 168 /* TypeQuery */;
     }
     ts.isTypeQueryNode = isTypeQueryNode;
     function isTypeLiteralNode(node) {
-        return node.kind === 168 /* TypeLiteral */;
+        return node.kind === 169 /* TypeLiteral */;
     }
     ts.isTypeLiteralNode = isTypeLiteralNode;
     function isArrayTypeNode(node) {
-        return node.kind === 169 /* ArrayType */;
+        return node.kind === 170 /* ArrayType */;
     }
     ts.isArrayTypeNode = isArrayTypeNode;
     function isTupleTypeNode(node) {
-        return node.kind === 170 /* TupleType */;
+        return node.kind === 171 /* TupleType */;
     }
     ts.isTupleTypeNode = isTupleTypeNode;
     function isUnionTypeNode(node) {
-        return node.kind === 173 /* UnionType */;
+        return node.kind === 174 /* UnionType */;
     }
     ts.isUnionTypeNode = isUnionTypeNode;
     function isIntersectionTypeNode(node) {
-        return node.kind === 174 /* IntersectionType */;
+        return node.kind === 175 /* IntersectionType */;
     }
     ts.isIntersectionTypeNode = isIntersectionTypeNode;
     function isConditionalTypeNode(node) {
-        return node.kind === 175 /* ConditionalType */;
+        return node.kind === 176 /* ConditionalType */;
     }
     ts.isConditionalTypeNode = isConditionalTypeNode;
     function isInferTypeNode(node) {
-        return node.kind === 176 /* InferType */;
+        return node.kind === 177 /* InferType */;
     }
     ts.isInferTypeNode = isInferTypeNode;
     function isParenthesizedTypeNode(node) {
-        return node.kind === 177 /* ParenthesizedType */;
+        return node.kind === 178 /* ParenthesizedType */;
     }
     ts.isParenthesizedTypeNode = isParenthesizedTypeNode;
     function isThisTypeNode(node) {
-        return node.kind === 178 /* ThisType */;
+        return node.kind === 179 /* ThisType */;
     }
     ts.isThisTypeNode = isThisTypeNode;
     function isTypeOperatorNode(node) {
-        return node.kind === 179 /* TypeOperator */;
+        return node.kind === 180 /* TypeOperator */;
     }
     ts.isTypeOperatorNode = isTypeOperatorNode;
     function isIndexedAccessTypeNode(node) {
-        return node.kind === 180 /* IndexedAccessType */;
+        return node.kind === 181 /* IndexedAccessType */;
     }
     ts.isIndexedAccessTypeNode = isIndexedAccessTypeNode;
     function isMappedTypeNode(node) {
-        return node.kind === 181 /* MappedType */;
+        return node.kind === 182 /* MappedType */;
     }
     ts.isMappedTypeNode = isMappedTypeNode;
     function isLiteralTypeNode(node) {
-        return node.kind === 182 /* LiteralType */;
+        return node.kind === 183 /* LiteralType */;
     }
     ts.isLiteralTypeNode = isLiteralTypeNode;
     function isImportTypeNode(node) {
-        return node.kind === 183 /* ImportType */;
+        return node.kind === 184 /* ImportType */;
     }
     ts.isImportTypeNode = isImportTypeNode;
     // Binding patterns
     function isObjectBindingPattern(node) {
-        return node.kind === 184 /* ObjectBindingPattern */;
+        return node.kind === 185 /* ObjectBindingPattern */;
     }
     ts.isObjectBindingPattern = isObjectBindingPattern;
     function isArrayBindingPattern(node) {
-        return node.kind === 185 /* ArrayBindingPattern */;
+        return node.kind === 186 /* ArrayBindingPattern */;
     }
     ts.isArrayBindingPattern = isArrayBindingPattern;
     function isBindingElement(node) {
-        return node.kind === 186 /* BindingElement */;
+        return node.kind === 187 /* BindingElement */;
     }
     ts.isBindingElement = isBindingElement;
     // Expression
     function isArrayLiteralExpression(node) {
-        return node.kind === 187 /* ArrayLiteralExpression */;
+        return node.kind === 188 /* ArrayLiteralExpression */;
     }
     ts.isArrayLiteralExpression = isArrayLiteralExpression;
     function isObjectLiteralExpression(node) {
-        return node.kind === 188 /* ObjectLiteralExpression */;
+        return node.kind === 189 /* ObjectLiteralExpression */;
     }
     ts.isObjectLiteralExpression = isObjectLiteralExpression;
     function isPropertyAccessExpression(node) {
-        return node.kind === 189 /* PropertyAccessExpression */;
+        return node.kind === 190 /* PropertyAccessExpression */;
     }
     ts.isPropertyAccessExpression = isPropertyAccessExpression;
     function isElementAccessExpression(node) {
-        return node.kind === 190 /* ElementAccessExpression */;
+        return node.kind === 191 /* ElementAccessExpression */;
     }
     ts.isElementAccessExpression = isElementAccessExpression;
     function isCallExpression(node) {
-        return node.kind === 191 /* CallExpression */;
+        return node.kind === 192 /* CallExpression */;
     }
     ts.isCallExpression = isCallExpression;
     function isNewExpression(node) {
-        return node.kind === 192 /* NewExpression */;
+        return node.kind === 193 /* NewExpression */;
     }
     ts.isNewExpression = isNewExpression;
     function isTaggedTemplateExpression(node) {
-        return node.kind === 193 /* TaggedTemplateExpression */;
+        return node.kind === 194 /* TaggedTemplateExpression */;
     }
     ts.isTaggedTemplateExpression = isTaggedTemplateExpression;
     function isTypeAssertion(node) {
-        return node.kind === 194 /* TypeAssertionExpression */;
+        return node.kind === 195 /* TypeAssertionExpression */;
     }
     ts.isTypeAssertion = isTypeAssertion;
     function isConstTypeReference(node) {
@@ -13640,376 +13837,376 @@ var ts;
     }
     ts.isConstTypeReference = isConstTypeReference;
     function isParenthesizedExpression(node) {
-        return node.kind === 195 /* ParenthesizedExpression */;
+        return node.kind === 196 /* ParenthesizedExpression */;
     }
     ts.isParenthesizedExpression = isParenthesizedExpression;
     function skipPartiallyEmittedExpressions(node) {
-        while (node.kind === 313 /* PartiallyEmittedExpression */) {
+        while (node.kind === 315 /* PartiallyEmittedExpression */) {
             node = node.expression;
         }
         return node;
     }
     ts.skipPartiallyEmittedExpressions = skipPartiallyEmittedExpressions;
     function isFunctionExpression(node) {
-        return node.kind === 196 /* FunctionExpression */;
+        return node.kind === 197 /* FunctionExpression */;
     }
     ts.isFunctionExpression = isFunctionExpression;
     function isArrowFunction(node) {
-        return node.kind === 197 /* ArrowFunction */;
+        return node.kind === 198 /* ArrowFunction */;
     }
     ts.isArrowFunction = isArrowFunction;
     function isDeleteExpression(node) {
-        return node.kind === 198 /* DeleteExpression */;
+        return node.kind === 199 /* DeleteExpression */;
     }
     ts.isDeleteExpression = isDeleteExpression;
     function isTypeOfExpression(node) {
-        return node.kind === 199 /* TypeOfExpression */;
+        return node.kind === 200 /* TypeOfExpression */;
     }
     ts.isTypeOfExpression = isTypeOfExpression;
     function isVoidExpression(node) {
-        return node.kind === 200 /* VoidExpression */;
+        return node.kind === 201 /* VoidExpression */;
     }
     ts.isVoidExpression = isVoidExpression;
     function isAwaitExpression(node) {
-        return node.kind === 201 /* AwaitExpression */;
+        return node.kind === 202 /* AwaitExpression */;
     }
     ts.isAwaitExpression = isAwaitExpression;
     function isPrefixUnaryExpression(node) {
-        return node.kind === 202 /* PrefixUnaryExpression */;
+        return node.kind === 203 /* PrefixUnaryExpression */;
     }
     ts.isPrefixUnaryExpression = isPrefixUnaryExpression;
     function isPostfixUnaryExpression(node) {
-        return node.kind === 203 /* PostfixUnaryExpression */;
+        return node.kind === 204 /* PostfixUnaryExpression */;
     }
     ts.isPostfixUnaryExpression = isPostfixUnaryExpression;
     function isBinaryExpression(node) {
-        return node.kind === 204 /* BinaryExpression */;
+        return node.kind === 205 /* BinaryExpression */;
     }
     ts.isBinaryExpression = isBinaryExpression;
     function isConditionalExpression(node) {
-        return node.kind === 205 /* ConditionalExpression */;
+        return node.kind === 206 /* ConditionalExpression */;
     }
     ts.isConditionalExpression = isConditionalExpression;
     function isTemplateExpression(node) {
-        return node.kind === 206 /* TemplateExpression */;
+        return node.kind === 207 /* TemplateExpression */;
     }
     ts.isTemplateExpression = isTemplateExpression;
     function isYieldExpression(node) {
-        return node.kind === 207 /* YieldExpression */;
+        return node.kind === 208 /* YieldExpression */;
     }
     ts.isYieldExpression = isYieldExpression;
     function isSpreadElement(node) {
-        return node.kind === 208 /* SpreadElement */;
+        return node.kind === 209 /* SpreadElement */;
     }
     ts.isSpreadElement = isSpreadElement;
     function isClassExpression(node) {
-        return node.kind === 209 /* ClassExpression */;
+        return node.kind === 210 /* ClassExpression */;
     }
     ts.isClassExpression = isClassExpression;
     function isOmittedExpression(node) {
-        return node.kind === 210 /* OmittedExpression */;
+        return node.kind === 211 /* OmittedExpression */;
     }
     ts.isOmittedExpression = isOmittedExpression;
     function isExpressionWithTypeArguments(node) {
-        return node.kind === 211 /* ExpressionWithTypeArguments */;
+        return node.kind === 212 /* ExpressionWithTypeArguments */;
     }
     ts.isExpressionWithTypeArguments = isExpressionWithTypeArguments;
     function isAsExpression(node) {
-        return node.kind === 212 /* AsExpression */;
+        return node.kind === 213 /* AsExpression */;
     }
     ts.isAsExpression = isAsExpression;
     function isNonNullExpression(node) {
-        return node.kind === 213 /* NonNullExpression */;
+        return node.kind === 214 /* NonNullExpression */;
     }
     ts.isNonNullExpression = isNonNullExpression;
     function isMetaProperty(node) {
-        return node.kind === 214 /* MetaProperty */;
+        return node.kind === 215 /* MetaProperty */;
     }
     ts.isMetaProperty = isMetaProperty;
     // Misc
     function isTemplateSpan(node) {
-        return node.kind === 216 /* TemplateSpan */;
+        return node.kind === 217 /* TemplateSpan */;
     }
     ts.isTemplateSpan = isTemplateSpan;
     function isSemicolonClassElement(node) {
-        return node.kind === 217 /* SemicolonClassElement */;
+        return node.kind === 218 /* SemicolonClassElement */;
     }
     ts.isSemicolonClassElement = isSemicolonClassElement;
     // Block
     function isBlock(node) {
-        return node.kind === 218 /* Block */;
+        return node.kind === 219 /* Block */;
     }
     ts.isBlock = isBlock;
     function isVariableStatement(node) {
-        return node.kind === 219 /* VariableStatement */;
+        return node.kind === 220 /* VariableStatement */;
     }
     ts.isVariableStatement = isVariableStatement;
     function isEmptyStatement(node) {
-        return node.kind === 220 /* EmptyStatement */;
+        return node.kind === 221 /* EmptyStatement */;
     }
     ts.isEmptyStatement = isEmptyStatement;
     function isExpressionStatement(node) {
-        return node.kind === 221 /* ExpressionStatement */;
+        return node.kind === 222 /* ExpressionStatement */;
     }
     ts.isExpressionStatement = isExpressionStatement;
     function isIfStatement(node) {
-        return node.kind === 222 /* IfStatement */;
+        return node.kind === 223 /* IfStatement */;
     }
     ts.isIfStatement = isIfStatement;
     function isDoStatement(node) {
-        return node.kind === 223 /* DoStatement */;
+        return node.kind === 224 /* DoStatement */;
     }
     ts.isDoStatement = isDoStatement;
     function isWhileStatement(node) {
-        return node.kind === 224 /* WhileStatement */;
+        return node.kind === 225 /* WhileStatement */;
     }
     ts.isWhileStatement = isWhileStatement;
     function isForStatement(node) {
-        return node.kind === 225 /* ForStatement */;
+        return node.kind === 226 /* ForStatement */;
     }
     ts.isForStatement = isForStatement;
     function isForInStatement(node) {
-        return node.kind === 226 /* ForInStatement */;
+        return node.kind === 227 /* ForInStatement */;
     }
     ts.isForInStatement = isForInStatement;
     function isForOfStatement(node) {
-        return node.kind === 227 /* ForOfStatement */;
+        return node.kind === 228 /* ForOfStatement */;
     }
     ts.isForOfStatement = isForOfStatement;
     function isContinueStatement(node) {
-        return node.kind === 228 /* ContinueStatement */;
+        return node.kind === 229 /* ContinueStatement */;
     }
     ts.isContinueStatement = isContinueStatement;
     function isBreakStatement(node) {
-        return node.kind === 229 /* BreakStatement */;
+        return node.kind === 230 /* BreakStatement */;
     }
     ts.isBreakStatement = isBreakStatement;
     function isBreakOrContinueStatement(node) {
-        return node.kind === 229 /* BreakStatement */ || node.kind === 228 /* ContinueStatement */;
+        return node.kind === 230 /* BreakStatement */ || node.kind === 229 /* ContinueStatement */;
     }
     ts.isBreakOrContinueStatement = isBreakOrContinueStatement;
     function isReturnStatement(node) {
-        return node.kind === 230 /* ReturnStatement */;
+        return node.kind === 231 /* ReturnStatement */;
     }
     ts.isReturnStatement = isReturnStatement;
     function isWithStatement(node) {
-        return node.kind === 231 /* WithStatement */;
+        return node.kind === 232 /* WithStatement */;
     }
     ts.isWithStatement = isWithStatement;
     function isSwitchStatement(node) {
-        return node.kind === 232 /* SwitchStatement */;
+        return node.kind === 233 /* SwitchStatement */;
     }
     ts.isSwitchStatement = isSwitchStatement;
     function isLabeledStatement(node) {
-        return node.kind === 233 /* LabeledStatement */;
+        return node.kind === 234 /* LabeledStatement */;
     }
     ts.isLabeledStatement = isLabeledStatement;
     function isThrowStatement(node) {
-        return node.kind === 234 /* ThrowStatement */;
+        return node.kind === 235 /* ThrowStatement */;
     }
     ts.isThrowStatement = isThrowStatement;
     function isTryStatement(node) {
-        return node.kind === 235 /* TryStatement */;
+        return node.kind === 236 /* TryStatement */;
     }
     ts.isTryStatement = isTryStatement;
     function isDebuggerStatement(node) {
-        return node.kind === 236 /* DebuggerStatement */;
+        return node.kind === 237 /* DebuggerStatement */;
     }
     ts.isDebuggerStatement = isDebuggerStatement;
     function isVariableDeclaration(node) {
-        return node.kind === 237 /* VariableDeclaration */;
+        return node.kind === 238 /* VariableDeclaration */;
     }
     ts.isVariableDeclaration = isVariableDeclaration;
     function isVariableDeclarationList(node) {
-        return node.kind === 238 /* VariableDeclarationList */;
+        return node.kind === 239 /* VariableDeclarationList */;
     }
     ts.isVariableDeclarationList = isVariableDeclarationList;
     function isFunctionDeclaration(node) {
-        return node.kind === 239 /* FunctionDeclaration */;
+        return node.kind === 240 /* FunctionDeclaration */;
     }
     ts.isFunctionDeclaration = isFunctionDeclaration;
     function isClassDeclaration(node) {
-        return node.kind === 240 /* ClassDeclaration */;
+        return node.kind === 241 /* ClassDeclaration */;
     }
     ts.isClassDeclaration = isClassDeclaration;
     function isInterfaceDeclaration(node) {
-        return node.kind === 241 /* InterfaceDeclaration */;
+        return node.kind === 242 /* InterfaceDeclaration */;
     }
     ts.isInterfaceDeclaration = isInterfaceDeclaration;
     function isTypeAliasDeclaration(node) {
-        return node.kind === 242 /* TypeAliasDeclaration */;
+        return node.kind === 243 /* TypeAliasDeclaration */;
     }
     ts.isTypeAliasDeclaration = isTypeAliasDeclaration;
     function isEnumDeclaration(node) {
-        return node.kind === 243 /* EnumDeclaration */;
+        return node.kind === 244 /* EnumDeclaration */;
     }
     ts.isEnumDeclaration = isEnumDeclaration;
     function isModuleDeclaration(node) {
-        return node.kind === 244 /* ModuleDeclaration */;
+        return node.kind === 245 /* ModuleDeclaration */;
     }
     ts.isModuleDeclaration = isModuleDeclaration;
     function isModuleBlock(node) {
-        return node.kind === 245 /* ModuleBlock */;
+        return node.kind === 246 /* ModuleBlock */;
     }
     ts.isModuleBlock = isModuleBlock;
     function isCaseBlock(node) {
-        return node.kind === 246 /* CaseBlock */;
+        return node.kind === 247 /* CaseBlock */;
     }
     ts.isCaseBlock = isCaseBlock;
     function isNamespaceExportDeclaration(node) {
-        return node.kind === 247 /* NamespaceExportDeclaration */;
+        return node.kind === 248 /* NamespaceExportDeclaration */;
     }
     ts.isNamespaceExportDeclaration = isNamespaceExportDeclaration;
     function isImportEqualsDeclaration(node) {
-        return node.kind === 248 /* ImportEqualsDeclaration */;
+        return node.kind === 249 /* ImportEqualsDeclaration */;
     }
     ts.isImportEqualsDeclaration = isImportEqualsDeclaration;
     function isImportDeclaration(node) {
-        return node.kind === 249 /* ImportDeclaration */;
+        return node.kind === 250 /* ImportDeclaration */;
     }
     ts.isImportDeclaration = isImportDeclaration;
     function isImportClause(node) {
-        return node.kind === 250 /* ImportClause */;
+        return node.kind === 251 /* ImportClause */;
     }
     ts.isImportClause = isImportClause;
     function isNamespaceImport(node) {
-        return node.kind === 251 /* NamespaceImport */;
+        return node.kind === 252 /* NamespaceImport */;
     }
     ts.isNamespaceImport = isNamespaceImport;
     function isNamedImports(node) {
-        return node.kind === 252 /* NamedImports */;
+        return node.kind === 253 /* NamedImports */;
     }
     ts.isNamedImports = isNamedImports;
     function isImportSpecifier(node) {
-        return node.kind === 253 /* ImportSpecifier */;
+        return node.kind === 254 /* ImportSpecifier */;
     }
     ts.isImportSpecifier = isImportSpecifier;
     function isExportAssignment(node) {
-        return node.kind === 254 /* ExportAssignment */;
+        return node.kind === 255 /* ExportAssignment */;
     }
     ts.isExportAssignment = isExportAssignment;
     function isExportDeclaration(node) {
-        return node.kind === 255 /* ExportDeclaration */;
+        return node.kind === 256 /* ExportDeclaration */;
     }
     ts.isExportDeclaration = isExportDeclaration;
     function isNamedExports(node) {
-        return node.kind === 256 /* NamedExports */;
+        return node.kind === 257 /* NamedExports */;
     }
     ts.isNamedExports = isNamedExports;
     function isExportSpecifier(node) {
-        return node.kind === 257 /* ExportSpecifier */;
+        return node.kind === 258 /* ExportSpecifier */;
     }
     ts.isExportSpecifier = isExportSpecifier;
     function isMissingDeclaration(node) {
-        return node.kind === 258 /* MissingDeclaration */;
+        return node.kind === 259 /* MissingDeclaration */;
     }
     ts.isMissingDeclaration = isMissingDeclaration;
     // Module References
     function isExternalModuleReference(node) {
-        return node.kind === 259 /* ExternalModuleReference */;
+        return node.kind === 260 /* ExternalModuleReference */;
     }
     ts.isExternalModuleReference = isExternalModuleReference;
     // JSX
     function isJsxElement(node) {
-        return node.kind === 260 /* JsxElement */;
+        return node.kind === 261 /* JsxElement */;
     }
     ts.isJsxElement = isJsxElement;
     function isJsxSelfClosingElement(node) {
-        return node.kind === 261 /* JsxSelfClosingElement */;
+        return node.kind === 262 /* JsxSelfClosingElement */;
     }
     ts.isJsxSelfClosingElement = isJsxSelfClosingElement;
     function isJsxOpeningElement(node) {
-        return node.kind === 262 /* JsxOpeningElement */;
+        return node.kind === 263 /* JsxOpeningElement */;
     }
     ts.isJsxOpeningElement = isJsxOpeningElement;
     function isJsxClosingElement(node) {
-        return node.kind === 263 /* JsxClosingElement */;
+        return node.kind === 264 /* JsxClosingElement */;
     }
     ts.isJsxClosingElement = isJsxClosingElement;
     function isJsxFragment(node) {
-        return node.kind === 264 /* JsxFragment */;
+        return node.kind === 265 /* JsxFragment */;
     }
     ts.isJsxFragment = isJsxFragment;
     function isJsxOpeningFragment(node) {
-        return node.kind === 265 /* JsxOpeningFragment */;
+        return node.kind === 266 /* JsxOpeningFragment */;
     }
     ts.isJsxOpeningFragment = isJsxOpeningFragment;
     function isJsxClosingFragment(node) {
-        return node.kind === 266 /* JsxClosingFragment */;
+        return node.kind === 267 /* JsxClosingFragment */;
     }
     ts.isJsxClosingFragment = isJsxClosingFragment;
     function isJsxAttribute(node) {
-        return node.kind === 267 /* JsxAttribute */;
+        return node.kind === 268 /* JsxAttribute */;
     }
     ts.isJsxAttribute = isJsxAttribute;
     function isJsxAttributes(node) {
-        return node.kind === 268 /* JsxAttributes */;
+        return node.kind === 269 /* JsxAttributes */;
     }
     ts.isJsxAttributes = isJsxAttributes;
     function isJsxSpreadAttribute(node) {
-        return node.kind === 269 /* JsxSpreadAttribute */;
+        return node.kind === 270 /* JsxSpreadAttribute */;
     }
     ts.isJsxSpreadAttribute = isJsxSpreadAttribute;
     function isJsxExpression(node) {
-        return node.kind === 270 /* JsxExpression */;
+        return node.kind === 271 /* JsxExpression */;
     }
     ts.isJsxExpression = isJsxExpression;
     // Clauses
     function isCaseClause(node) {
-        return node.kind === 271 /* CaseClause */;
+        return node.kind === 272 /* CaseClause */;
     }
     ts.isCaseClause = isCaseClause;
     function isDefaultClause(node) {
-        return node.kind === 272 /* DefaultClause */;
+        return node.kind === 273 /* DefaultClause */;
     }
     ts.isDefaultClause = isDefaultClause;
     function isHeritageClause(node) {
-        return node.kind === 273 /* HeritageClause */;
+        return node.kind === 274 /* HeritageClause */;
     }
     ts.isHeritageClause = isHeritageClause;
     function isCatchClause(node) {
-        return node.kind === 274 /* CatchClause */;
+        return node.kind === 275 /* CatchClause */;
     }
     ts.isCatchClause = isCatchClause;
     // Property assignments
     function isPropertyAssignment(node) {
-        return node.kind === 275 /* PropertyAssignment */;
+        return node.kind === 276 /* PropertyAssignment */;
     }
     ts.isPropertyAssignment = isPropertyAssignment;
     function isShorthandPropertyAssignment(node) {
-        return node.kind === 276 /* ShorthandPropertyAssignment */;
+        return node.kind === 277 /* ShorthandPropertyAssignment */;
     }
     ts.isShorthandPropertyAssignment = isShorthandPropertyAssignment;
     function isSpreadAssignment(node) {
-        return node.kind === 277 /* SpreadAssignment */;
+        return node.kind === 278 /* SpreadAssignment */;
     }
     ts.isSpreadAssignment = isSpreadAssignment;
     // Enum
     function isEnumMember(node) {
-        return node.kind === 278 /* EnumMember */;
+        return node.kind === 279 /* EnumMember */;
     }
     ts.isEnumMember = isEnumMember;
     // Top-level nodes
     function isSourceFile(node) {
-        return node.kind === 284 /* SourceFile */;
+        return node.kind === 285 /* SourceFile */;
     }
     ts.isSourceFile = isSourceFile;
     function isBundle(node) {
-        return node.kind === 285 /* Bundle */;
+        return node.kind === 286 /* Bundle */;
     }
     ts.isBundle = isBundle;
     function isUnparsedSource(node) {
-        return node.kind === 286 /* UnparsedSource */;
+        return node.kind === 287 /* UnparsedSource */;
     }
     ts.isUnparsedSource = isUnparsedSource;
     function isUnparsedPrepend(node) {
-        return node.kind === 280 /* UnparsedPrepend */;
+        return node.kind === 281 /* UnparsedPrepend */;
     }
     ts.isUnparsedPrepend = isUnparsedPrepend;
     function isUnparsedTextLike(node) {
         switch (node.kind) {
-            case 281 /* UnparsedText */:
-            case 282 /* UnparsedInternalText */:
+            case 282 /* UnparsedText */:
+            case 283 /* UnparsedInternalText */:
                 return true;
             default:
                 return false;
@@ -14018,101 +14215,105 @@ var ts;
     ts.isUnparsedTextLike = isUnparsedTextLike;
     function isUnparsedNode(node) {
         return isUnparsedTextLike(node) ||
-            node.kind === 279 /* UnparsedPrologue */ ||
-            node.kind === 283 /* UnparsedSyntheticReference */;
+            node.kind === 280 /* UnparsedPrologue */ ||
+            node.kind === 284 /* UnparsedSyntheticReference */;
     }
     ts.isUnparsedNode = isUnparsedNode;
     // JSDoc
     function isJSDocTypeExpression(node) {
-        return node.kind === 288 /* JSDocTypeExpression */;
+        return node.kind === 289 /* JSDocTypeExpression */;
     }
     ts.isJSDocTypeExpression = isJSDocTypeExpression;
     function isJSDocAllType(node) {
-        return node.kind === 289 /* JSDocAllType */;
+        return node.kind === 290 /* JSDocAllType */;
     }
     ts.isJSDocAllType = isJSDocAllType;
     function isJSDocUnknownType(node) {
-        return node.kind === 290 /* JSDocUnknownType */;
+        return node.kind === 291 /* JSDocUnknownType */;
     }
     ts.isJSDocUnknownType = isJSDocUnknownType;
     function isJSDocNullableType(node) {
-        return node.kind === 291 /* JSDocNullableType */;
+        return node.kind === 292 /* JSDocNullableType */;
     }
     ts.isJSDocNullableType = isJSDocNullableType;
     function isJSDocNonNullableType(node) {
-        return node.kind === 292 /* JSDocNonNullableType */;
+        return node.kind === 293 /* JSDocNonNullableType */;
     }
     ts.isJSDocNonNullableType = isJSDocNonNullableType;
     function isJSDocOptionalType(node) {
-        return node.kind === 293 /* JSDocOptionalType */;
+        return node.kind === 294 /* JSDocOptionalType */;
     }
     ts.isJSDocOptionalType = isJSDocOptionalType;
     function isJSDocFunctionType(node) {
-        return node.kind === 294 /* JSDocFunctionType */;
+        return node.kind === 295 /* JSDocFunctionType */;
     }
     ts.isJSDocFunctionType = isJSDocFunctionType;
     function isJSDocVariadicType(node) {
-        return node.kind === 295 /* JSDocVariadicType */;
+        return node.kind === 296 /* JSDocVariadicType */;
     }
     ts.isJSDocVariadicType = isJSDocVariadicType;
     function isJSDoc(node) {
-        return node.kind === 296 /* JSDocComment */;
+        return node.kind === 297 /* JSDocComment */;
     }
     ts.isJSDoc = isJSDoc;
+    function isJSDocAuthorTag(node) {
+        return node.kind === 302 /* JSDocAuthorTag */;
+    }
+    ts.isJSDocAuthorTag = isJSDocAuthorTag;
     function isJSDocAugmentsTag(node) {
-        return node.kind === 300 /* JSDocAugmentsTag */;
+        return node.kind === 301 /* JSDocAugmentsTag */;
     }
     ts.isJSDocAugmentsTag = isJSDocAugmentsTag;
     function isJSDocClassTag(node) {
-        return node.kind === 301 /* JSDocClassTag */;
+        return node.kind === 303 /* JSDocClassTag */;
     }
     ts.isJSDocClassTag = isJSDocClassTag;
     function isJSDocEnumTag(node) {
-        return node.kind === 303 /* JSDocEnumTag */;
+        return node.kind === 305 /* JSDocEnumTag */;
     }
     ts.isJSDocEnumTag = isJSDocEnumTag;
     function isJSDocThisTag(node) {
-        return node.kind === 306 /* JSDocThisTag */;
+        return node.kind === 308 /* JSDocThisTag */;
     }
     ts.isJSDocThisTag = isJSDocThisTag;
     function isJSDocParameterTag(node) {
-        return node.kind === 304 /* JSDocParameterTag */;
+        return node.kind === 306 /* JSDocParameterTag */;
     }
     ts.isJSDocParameterTag = isJSDocParameterTag;
     function isJSDocReturnTag(node) {
-        return node.kind === 305 /* JSDocReturnTag */;
+        return node.kind === 307 /* JSDocReturnTag */;
     }
     ts.isJSDocReturnTag = isJSDocReturnTag;
     function isJSDocTypeTag(node) {
-        return node.kind === 307 /* JSDocTypeTag */;
+        return node.kind === 309 /* JSDocTypeTag */;
     }
     ts.isJSDocTypeTag = isJSDocTypeTag;
     function isJSDocTemplateTag(node) {
-        return node.kind === 308 /* JSDocTemplateTag */;
+        return node.kind === 310 /* JSDocTemplateTag */;
     }
     ts.isJSDocTemplateTag = isJSDocTemplateTag;
     function isJSDocTypedefTag(node) {
-        return node.kind === 309 /* JSDocTypedefTag */;
+        return node.kind === 311 /* JSDocTypedefTag */;
     }
     ts.isJSDocTypedefTag = isJSDocTypedefTag;
     function isJSDocPropertyTag(node) {
-        return node.kind === 310 /* JSDocPropertyTag */;
+        return node.kind === 312 /* JSDocPropertyTag */;
     }
     ts.isJSDocPropertyTag = isJSDocPropertyTag;
     function isJSDocPropertyLikeTag(node) {
-        return node.kind === 310 /* JSDocPropertyTag */ || node.kind === 304 /* JSDocParameterTag */;
+        return node.kind === 312 /* JSDocPropertyTag */ || node.kind === 306 /* JSDocParameterTag */;
     }
     ts.isJSDocPropertyLikeTag = isJSDocPropertyLikeTag;
     function isJSDocTypeLiteral(node) {
-        return node.kind === 297 /* JSDocTypeLiteral */;
+        return node.kind === 298 /* JSDocTypeLiteral */;
     }
     ts.isJSDocTypeLiteral = isJSDocTypeLiteral;
     function isJSDocCallbackTag(node) {
-        return node.kind === 302 /* JSDocCallbackTag */;
+        return node.kind === 304 /* JSDocCallbackTag */;
     }
     ts.isJSDocCallbackTag = isJSDocCallbackTag;
     function isJSDocSignature(node) {
-        return node.kind === 298 /* JSDocSignature */;
+        return node.kind === 299 /* JSDocSignature */;
     }
     ts.isJSDocSignature = isJSDocSignature;
 })(ts || (ts = {}));
@@ -14123,7 +14324,7 @@ var ts;
 (function (ts) {
     /* @internal */
     function isSyntaxList(n) {
-        return n.kind === 311 /* SyntaxList */;
+        return n.kind === 313 /* SyntaxList */;
     }
     ts.isSyntaxList = isSyntaxList;
     /* @internal */
@@ -14133,7 +14334,7 @@ var ts;
     ts.isNode = isNode;
     /* @internal */
     function isNodeKind(kind) {
-        return kind >= 148 /* FirstNode */;
+        return kind >= 149 /* FirstNode */;
     }
     ts.isNodeKind = isNodeKind;
     /**
@@ -14142,7 +14343,7 @@ var ts;
      * Literals are considered tokens, except TemplateLiteral, but does include TemplateHead/Middle/Tail.
      */
     function isToken(n) {
-        return n.kind >= 0 /* FirstToken */ && n.kind <= 147 /* LastToken */;
+        return n.kind >= 0 /* FirstToken */ && n.kind <= 148 /* LastToken */;
     }
     ts.isToken = isToken;
     // Node Arrays
@@ -14195,17 +14396,17 @@ var ts;
     /* @internal */
     function isModifierKind(token) {
         switch (token) {
-            case 118 /* AbstractKeyword */:
-            case 121 /* AsyncKeyword */:
-            case 77 /* ConstKeyword */:
-            case 125 /* DeclareKeyword */:
-            case 80 /* DefaultKeyword */:
-            case 85 /* ExportKeyword */:
-            case 115 /* PublicKeyword */:
-            case 113 /* PrivateKeyword */:
-            case 114 /* ProtectedKeyword */:
-            case 133 /* ReadonlyKeyword */:
-            case 116 /* StaticKeyword */:
+            case 119 /* AbstractKeyword */:
+            case 122 /* AsyncKeyword */:
+            case 78 /* ConstKeyword */:
+            case 126 /* DeclareKeyword */:
+            case 81 /* DefaultKeyword */:
+            case 86 /* ExportKeyword */:
+            case 116 /* PublicKeyword */:
+            case 114 /* PrivateKeyword */:
+            case 115 /* ProtectedKeyword */:
+            case 134 /* ReadonlyKeyword */:
+            case 117 /* StaticKeyword */:
                 return true;
         }
         return false;
@@ -14218,7 +14419,7 @@ var ts;
     ts.isParameterPropertyModifier = isParameterPropertyModifier;
     /* @internal */
     function isClassMemberModifier(idToken) {
-        return isParameterPropertyModifier(idToken) || idToken === 116 /* StaticKeyword */;
+        return isParameterPropertyModifier(idToken) || idToken === 117 /* StaticKeyword */;
     }
     ts.isClassMemberModifier = isClassMemberModifier;
     function isModifier(node) {
@@ -14227,23 +14428,23 @@ var ts;
     ts.isModifier = isModifier;
     function isEntityName(node) {
         var kind = node.kind;
-        return kind === 148 /* QualifiedName */
-            || kind === 72 /* Identifier */;
+        return kind === 149 /* QualifiedName */
+            || kind === 73 /* Identifier */;
     }
     ts.isEntityName = isEntityName;
     function isPropertyName(node) {
         var kind = node.kind;
-        return kind === 72 /* Identifier */
+        return kind === 73 /* Identifier */
             || kind === 10 /* StringLiteral */
             || kind === 8 /* NumericLiteral */
-            || kind === 149 /* ComputedPropertyName */;
+            || kind === 150 /* ComputedPropertyName */;
     }
     ts.isPropertyName = isPropertyName;
     function isBindingName(node) {
         var kind = node.kind;
-        return kind === 72 /* Identifier */
-            || kind === 184 /* ObjectBindingPattern */
-            || kind === 185 /* ArrayBindingPattern */;
+        return kind === 73 /* Identifier */
+            || kind === 185 /* ObjectBindingPattern */
+            || kind === 186 /* ArrayBindingPattern */;
     }
     ts.isBindingName = isBindingName;
     // Functions
@@ -14258,13 +14459,13 @@ var ts;
     ts.isFunctionLikeDeclaration = isFunctionLikeDeclaration;
     function isFunctionLikeDeclarationKind(kind) {
         switch (kind) {
-            case 239 /* FunctionDeclaration */:
-            case 156 /* MethodDeclaration */:
-            case 157 /* Constructor */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
-            case 196 /* FunctionExpression */:
-            case 197 /* ArrowFunction */:
+            case 240 /* FunctionDeclaration */:
+            case 157 /* MethodDeclaration */:
+            case 158 /* Constructor */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
+            case 197 /* FunctionExpression */:
+            case 198 /* ArrowFunction */:
                 return true;
             default:
                 return false;
@@ -14273,14 +14474,14 @@ var ts;
     /* @internal */
     function isFunctionLikeKind(kind) {
         switch (kind) {
-            case 155 /* MethodSignature */:
-            case 160 /* CallSignature */:
-            case 298 /* JSDocSignature */:
-            case 161 /* ConstructSignature */:
-            case 162 /* IndexSignature */:
-            case 165 /* FunctionType */:
-            case 294 /* JSDocFunctionType */:
-            case 166 /* ConstructorType */:
+            case 156 /* MethodSignature */:
+            case 161 /* CallSignature */:
+            case 299 /* JSDocSignature */:
+            case 162 /* ConstructSignature */:
+            case 163 /* IndexSignature */:
+            case 166 /* FunctionType */:
+            case 295 /* JSDocFunctionType */:
+            case 167 /* ConstructorType */:
                 return true;
             default:
                 return isFunctionLikeDeclarationKind(kind);
@@ -14295,29 +14496,29 @@ var ts;
     // Classes
     function isClassElement(node) {
         var kind = node.kind;
-        return kind === 157 /* Constructor */
-            || kind === 154 /* PropertyDeclaration */
-            || kind === 156 /* MethodDeclaration */
-            || kind === 158 /* GetAccessor */
-            || kind === 159 /* SetAccessor */
-            || kind === 162 /* IndexSignature */
-            || kind === 217 /* SemicolonClassElement */;
+        return kind === 158 /* Constructor */
+            || kind === 155 /* PropertyDeclaration */
+            || kind === 157 /* MethodDeclaration */
+            || kind === 159 /* GetAccessor */
+            || kind === 160 /* SetAccessor */
+            || kind === 163 /* IndexSignature */
+            || kind === 218 /* SemicolonClassElement */;
     }
     ts.isClassElement = isClassElement;
     function isClassLike(node) {
-        return node && (node.kind === 240 /* ClassDeclaration */ || node.kind === 209 /* ClassExpression */);
+        return node && (node.kind === 241 /* ClassDeclaration */ || node.kind === 210 /* ClassExpression */);
     }
     ts.isClassLike = isClassLike;
     function isAccessor(node) {
-        return node && (node.kind === 158 /* GetAccessor */ || node.kind === 159 /* SetAccessor */);
+        return node && (node.kind === 159 /* GetAccessor */ || node.kind === 160 /* SetAccessor */);
     }
     ts.isAccessor = isAccessor;
     /* @internal */
     function isMethodOrAccessor(node) {
         switch (node.kind) {
-            case 156 /* MethodDeclaration */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
+            case 157 /* MethodDeclaration */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
                 return true;
             default:
                 return false;
@@ -14327,11 +14528,11 @@ var ts;
     // Type members
     function isTypeElement(node) {
         var kind = node.kind;
-        return kind === 161 /* ConstructSignature */
-            || kind === 160 /* CallSignature */
-            || kind === 153 /* PropertySignature */
-            || kind === 155 /* MethodSignature */
-            || kind === 162 /* IndexSignature */;
+        return kind === 162 /* ConstructSignature */
+            || kind === 161 /* CallSignature */
+            || kind === 154 /* PropertySignature */
+            || kind === 156 /* MethodSignature */
+            || kind === 163 /* IndexSignature */;
     }
     ts.isTypeElement = isTypeElement;
     function isClassOrTypeElement(node) {
@@ -14340,12 +14541,12 @@ var ts;
     ts.isClassOrTypeElement = isClassOrTypeElement;
     function isObjectLiteralElementLike(node) {
         var kind = node.kind;
-        return kind === 275 /* PropertyAssignment */
-            || kind === 276 /* ShorthandPropertyAssignment */
-            || kind === 277 /* SpreadAssignment */
-            || kind === 156 /* MethodDeclaration */
-            || kind === 158 /* GetAccessor */
-            || kind === 159 /* SetAccessor */;
+        return kind === 276 /* PropertyAssignment */
+            || kind === 277 /* ShorthandPropertyAssignment */
+            || kind === 278 /* SpreadAssignment */
+            || kind === 157 /* MethodDeclaration */
+            || kind === 159 /* GetAccessor */
+            || kind === 160 /* SetAccessor */;
     }
     ts.isObjectLiteralElementLike = isObjectLiteralElementLike;
     // Type
@@ -14360,8 +14561,8 @@ var ts;
     ts.isTypeNode = isTypeNode;
     function isFunctionOrConstructorTypeNode(node) {
         switch (node.kind) {
-            case 165 /* FunctionType */:
-            case 166 /* ConstructorType */:
+            case 166 /* FunctionType */:
+            case 167 /* ConstructorType */:
                 return true;
         }
         return false;
@@ -14372,8 +14573,8 @@ var ts;
     function isBindingPattern(node) {
         if (node) {
             var kind = node.kind;
-            return kind === 185 /* ArrayBindingPattern */
-                || kind === 184 /* ObjectBindingPattern */;
+            return kind === 186 /* ArrayBindingPattern */
+                || kind === 185 /* ObjectBindingPattern */;
         }
         return false;
     }
@@ -14381,15 +14582,15 @@ var ts;
     /* @internal */
     function isAssignmentPattern(node) {
         var kind = node.kind;
-        return kind === 187 /* ArrayLiteralExpression */
-            || kind === 188 /* ObjectLiteralExpression */;
+        return kind === 188 /* ArrayLiteralExpression */
+            || kind === 189 /* ObjectLiteralExpression */;
     }
     ts.isAssignmentPattern = isAssignmentPattern;
     /* @internal */
     function isArrayBindingElement(node) {
         var kind = node.kind;
-        return kind === 186 /* BindingElement */
-            || kind === 210 /* OmittedExpression */;
+        return kind === 187 /* BindingElement */
+            || kind === 211 /* OmittedExpression */;
     }
     ts.isArrayBindingElement = isArrayBindingElement;
     /**
@@ -14398,9 +14599,9 @@ var ts;
     /* @internal */
     function isDeclarationBindingElement(bindingElement) {
         switch (bindingElement.kind) {
-            case 237 /* VariableDeclaration */:
-            case 151 /* Parameter */:
-            case 186 /* BindingElement */:
+            case 238 /* VariableDeclaration */:
+            case 152 /* Parameter */:
+            case 187 /* BindingElement */:
                 return true;
         }
         return false;
@@ -14421,8 +14622,8 @@ var ts;
     /* @internal */
     function isObjectBindingOrAssignmentPattern(node) {
         switch (node.kind) {
-            case 184 /* ObjectBindingPattern */:
-            case 188 /* ObjectLiteralExpression */:
+            case 185 /* ObjectBindingPattern */:
+            case 189 /* ObjectLiteralExpression */:
                 return true;
         }
         return false;
@@ -14434,8 +14635,8 @@ var ts;
     /* @internal */
     function isArrayBindingOrAssignmentPattern(node) {
         switch (node.kind) {
-            case 185 /* ArrayBindingPattern */:
-            case 187 /* ArrayLiteralExpression */:
+            case 186 /* ArrayBindingPattern */:
+            case 188 /* ArrayLiteralExpression */:
                 return true;
         }
         return false;
@@ -14444,26 +14645,26 @@ var ts;
     /* @internal */
     function isPropertyAccessOrQualifiedNameOrImportTypeNode(node) {
         var kind = node.kind;
-        return kind === 189 /* PropertyAccessExpression */
-            || kind === 148 /* QualifiedName */
-            || kind === 183 /* ImportType */;
+        return kind === 190 /* PropertyAccessExpression */
+            || kind === 149 /* QualifiedName */
+            || kind === 184 /* ImportType */;
     }
     ts.isPropertyAccessOrQualifiedNameOrImportTypeNode = isPropertyAccessOrQualifiedNameOrImportTypeNode;
     // Expression
     function isPropertyAccessOrQualifiedName(node) {
         var kind = node.kind;
-        return kind === 189 /* PropertyAccessExpression */
-            || kind === 148 /* QualifiedName */;
+        return kind === 190 /* PropertyAccessExpression */
+            || kind === 149 /* QualifiedName */;
     }
     ts.isPropertyAccessOrQualifiedName = isPropertyAccessOrQualifiedName;
     function isCallLikeExpression(node) {
         switch (node.kind) {
-            case 262 /* JsxOpeningElement */:
-            case 261 /* JsxSelfClosingElement */:
-            case 191 /* CallExpression */:
-            case 192 /* NewExpression */:
-            case 193 /* TaggedTemplateExpression */:
-            case 152 /* Decorator */:
+            case 263 /* JsxOpeningElement */:
+            case 262 /* JsxSelfClosingElement */:
+            case 192 /* CallExpression */:
+            case 193 /* NewExpression */:
+            case 194 /* TaggedTemplateExpression */:
+            case 153 /* Decorator */:
                 return true;
             default:
                 return false;
@@ -14471,12 +14672,12 @@ var ts;
     }
     ts.isCallLikeExpression = isCallLikeExpression;
     function isCallOrNewExpression(node) {
-        return node.kind === 191 /* CallExpression */ || node.kind === 192 /* NewExpression */;
+        return node.kind === 192 /* CallExpression */ || node.kind === 193 /* NewExpression */;
     }
     ts.isCallOrNewExpression = isCallOrNewExpression;
     function isTemplateLiteral(node) {
         var kind = node.kind;
-        return kind === 206 /* TemplateExpression */
+        return kind === 207 /* TemplateExpression */
             || kind === 14 /* NoSubstitutionTemplateLiteral */;
     }
     ts.isTemplateLiteral = isTemplateLiteral;
@@ -14487,34 +14688,34 @@ var ts;
     ts.isLeftHandSideExpression = isLeftHandSideExpression;
     function isLeftHandSideExpressionKind(kind) {
         switch (kind) {
-            case 189 /* PropertyAccessExpression */:
-            case 190 /* ElementAccessExpression */:
-            case 192 /* NewExpression */:
-            case 191 /* CallExpression */:
-            case 260 /* JsxElement */:
-            case 261 /* JsxSelfClosingElement */:
-            case 264 /* JsxFragment */:
-            case 193 /* TaggedTemplateExpression */:
-            case 187 /* ArrayLiteralExpression */:
-            case 195 /* ParenthesizedExpression */:
-            case 188 /* ObjectLiteralExpression */:
-            case 209 /* ClassExpression */:
-            case 196 /* FunctionExpression */:
-            case 72 /* Identifier */:
+            case 190 /* PropertyAccessExpression */:
+            case 191 /* ElementAccessExpression */:
+            case 193 /* NewExpression */:
+            case 192 /* CallExpression */:
+            case 261 /* JsxElement */:
+            case 262 /* JsxSelfClosingElement */:
+            case 265 /* JsxFragment */:
+            case 194 /* TaggedTemplateExpression */:
+            case 188 /* ArrayLiteralExpression */:
+            case 196 /* ParenthesizedExpression */:
+            case 189 /* ObjectLiteralExpression */:
+            case 210 /* ClassExpression */:
+            case 197 /* FunctionExpression */:
+            case 73 /* Identifier */:
             case 13 /* RegularExpressionLiteral */:
             case 8 /* NumericLiteral */:
             case 9 /* BigIntLiteral */:
             case 10 /* StringLiteral */:
             case 14 /* NoSubstitutionTemplateLiteral */:
-            case 206 /* TemplateExpression */:
-            case 87 /* FalseKeyword */:
-            case 96 /* NullKeyword */:
-            case 100 /* ThisKeyword */:
-            case 102 /* TrueKeyword */:
-            case 98 /* SuperKeyword */:
-            case 213 /* NonNullExpression */:
-            case 214 /* MetaProperty */:
-            case 92 /* ImportKeyword */: // technically this is only an Expression if it's in a CallExpression
+            case 207 /* TemplateExpression */:
+            case 88 /* FalseKeyword */:
+            case 97 /* NullKeyword */:
+            case 101 /* ThisKeyword */:
+            case 103 /* TrueKeyword */:
+            case 99 /* SuperKeyword */:
+            case 214 /* NonNullExpression */:
+            case 215 /* MetaProperty */:
+            case 93 /* ImportKeyword */: // technically this is only an Expression if it's in a CallExpression
                 return true;
             default:
                 return false;
@@ -14527,13 +14728,13 @@ var ts;
     ts.isUnaryExpression = isUnaryExpression;
     function isUnaryExpressionKind(kind) {
         switch (kind) {
-            case 202 /* PrefixUnaryExpression */:
-            case 203 /* PostfixUnaryExpression */:
-            case 198 /* DeleteExpression */:
-            case 199 /* TypeOfExpression */:
-            case 200 /* VoidExpression */:
-            case 201 /* AwaitExpression */:
-            case 194 /* TypeAssertionExpression */:
+            case 203 /* PrefixUnaryExpression */:
+            case 204 /* PostfixUnaryExpression */:
+            case 199 /* DeleteExpression */:
+            case 200 /* TypeOfExpression */:
+            case 201 /* VoidExpression */:
+            case 202 /* AwaitExpression */:
+            case 195 /* TypeAssertionExpression */:
                 return true;
             default:
                 return isLeftHandSideExpressionKind(kind);
@@ -14542,9 +14743,9 @@ var ts;
     /* @internal */
     function isUnaryExpressionWithWrite(expr) {
         switch (expr.kind) {
-            case 203 /* PostfixUnaryExpression */:
+            case 204 /* PostfixUnaryExpression */:
                 return true;
-            case 202 /* PrefixUnaryExpression */:
+            case 203 /* PrefixUnaryExpression */:
                 return expr.operator === 44 /* PlusPlusToken */ ||
                     expr.operator === 45 /* MinusMinusToken */;
             default:
@@ -14563,15 +14764,15 @@ var ts;
     ts.isExpression = isExpression;
     function isExpressionKind(kind) {
         switch (kind) {
-            case 205 /* ConditionalExpression */:
-            case 207 /* YieldExpression */:
-            case 197 /* ArrowFunction */:
-            case 204 /* BinaryExpression */:
-            case 208 /* SpreadElement */:
-            case 212 /* AsExpression */:
-            case 210 /* OmittedExpression */:
-            case 314 /* CommaListExpression */:
-            case 313 /* PartiallyEmittedExpression */:
+            case 206 /* ConditionalExpression */:
+            case 208 /* YieldExpression */:
+            case 198 /* ArrowFunction */:
+            case 205 /* BinaryExpression */:
+            case 209 /* SpreadElement */:
+            case 213 /* AsExpression */:
+            case 211 /* OmittedExpression */:
+            case 316 /* CommaListExpression */:
+            case 315 /* PartiallyEmittedExpression */:
                 return true;
             default:
                 return isUnaryExpressionKind(kind);
@@ -14579,18 +14780,18 @@ var ts;
     }
     function isAssertionExpression(node) {
         var kind = node.kind;
-        return kind === 194 /* TypeAssertionExpression */
-            || kind === 212 /* AsExpression */;
+        return kind === 195 /* TypeAssertionExpression */
+            || kind === 213 /* AsExpression */;
     }
     ts.isAssertionExpression = isAssertionExpression;
     /* @internal */
     function isPartiallyEmittedExpression(node) {
-        return node.kind === 313 /* PartiallyEmittedExpression */;
+        return node.kind === 315 /* PartiallyEmittedExpression */;
     }
     ts.isPartiallyEmittedExpression = isPartiallyEmittedExpression;
     /* @internal */
     function isNotEmittedStatement(node) {
-        return node.kind === 312 /* NotEmittedStatement */;
+        return node.kind === 314 /* NotEmittedStatement */;
     }
     ts.isNotEmittedStatement = isNotEmittedStatement;
     /* @internal */
@@ -14601,13 +14802,13 @@ var ts;
     ts.isNotEmittedOrPartiallyEmittedNode = isNotEmittedOrPartiallyEmittedNode;
     function isIterationStatement(node, lookInLabeledStatements) {
         switch (node.kind) {
-            case 225 /* ForStatement */:
-            case 226 /* ForInStatement */:
-            case 227 /* ForOfStatement */:
-            case 223 /* DoStatement */:
-            case 224 /* WhileStatement */:
+            case 226 /* ForStatement */:
+            case 227 /* ForInStatement */:
+            case 228 /* ForOfStatement */:
+            case 224 /* DoStatement */:
+            case 225 /* WhileStatement */:
                 return true;
-            case 233 /* LabeledStatement */:
+            case 234 /* LabeledStatement */:
                 return lookInLabeledStatements && isIterationStatement(node.statement, lookInLabeledStatements);
         }
         return false;
@@ -14615,7 +14816,7 @@ var ts;
     ts.isIterationStatement = isIterationStatement;
     /* @internal */
     function isForInOrOfStatement(node) {
-        return node.kind === 226 /* ForInStatement */ || node.kind === 227 /* ForOfStatement */;
+        return node.kind === 227 /* ForInStatement */ || node.kind === 228 /* ForOfStatement */;
     }
     ts.isForInOrOfStatement = isForInOrOfStatement;
     // Element
@@ -14639,113 +14840,113 @@ var ts;
     /* @internal */
     function isModuleBody(node) {
         var kind = node.kind;
-        return kind === 245 /* ModuleBlock */
-            || kind === 244 /* ModuleDeclaration */
-            || kind === 72 /* Identifier */;
+        return kind === 246 /* ModuleBlock */
+            || kind === 245 /* ModuleDeclaration */
+            || kind === 73 /* Identifier */;
     }
     ts.isModuleBody = isModuleBody;
     /* @internal */
     function isNamespaceBody(node) {
         var kind = node.kind;
-        return kind === 245 /* ModuleBlock */
-            || kind === 244 /* ModuleDeclaration */;
+        return kind === 246 /* ModuleBlock */
+            || kind === 245 /* ModuleDeclaration */;
     }
     ts.isNamespaceBody = isNamespaceBody;
     /* @internal */
     function isJSDocNamespaceBody(node) {
         var kind = node.kind;
-        return kind === 72 /* Identifier */
-            || kind === 244 /* ModuleDeclaration */;
+        return kind === 73 /* Identifier */
+            || kind === 245 /* ModuleDeclaration */;
     }
     ts.isJSDocNamespaceBody = isJSDocNamespaceBody;
     /* @internal */
     function isNamedImportBindings(node) {
         var kind = node.kind;
-        return kind === 252 /* NamedImports */
-            || kind === 251 /* NamespaceImport */;
+        return kind === 253 /* NamedImports */
+            || kind === 252 /* NamespaceImport */;
     }
     ts.isNamedImportBindings = isNamedImportBindings;
     /* @internal */
     function isModuleOrEnumDeclaration(node) {
-        return node.kind === 244 /* ModuleDeclaration */ || node.kind === 243 /* EnumDeclaration */;
+        return node.kind === 245 /* ModuleDeclaration */ || node.kind === 244 /* EnumDeclaration */;
     }
     ts.isModuleOrEnumDeclaration = isModuleOrEnumDeclaration;
     function isDeclarationKind(kind) {
-        return kind === 197 /* ArrowFunction */
-            || kind === 186 /* BindingElement */
-            || kind === 240 /* ClassDeclaration */
-            || kind === 209 /* ClassExpression */
-            || kind === 157 /* Constructor */
-            || kind === 243 /* EnumDeclaration */
-            || kind === 278 /* EnumMember */
-            || kind === 257 /* ExportSpecifier */
-            || kind === 239 /* FunctionDeclaration */
-            || kind === 196 /* FunctionExpression */
-            || kind === 158 /* GetAccessor */
-            || kind === 250 /* ImportClause */
-            || kind === 248 /* ImportEqualsDeclaration */
-            || kind === 253 /* ImportSpecifier */
-            || kind === 241 /* InterfaceDeclaration */
-            || kind === 267 /* JsxAttribute */
-            || kind === 156 /* MethodDeclaration */
-            || kind === 155 /* MethodSignature */
-            || kind === 244 /* ModuleDeclaration */
-            || kind === 247 /* NamespaceExportDeclaration */
-            || kind === 251 /* NamespaceImport */
-            || kind === 151 /* Parameter */
-            || kind === 275 /* PropertyAssignment */
-            || kind === 154 /* PropertyDeclaration */
-            || kind === 153 /* PropertySignature */
-            || kind === 159 /* SetAccessor */
-            || kind === 276 /* ShorthandPropertyAssignment */
-            || kind === 242 /* TypeAliasDeclaration */
-            || kind === 150 /* TypeParameter */
-            || kind === 237 /* VariableDeclaration */
-            || kind === 309 /* JSDocTypedefTag */
-            || kind === 302 /* JSDocCallbackTag */
-            || kind === 310 /* JSDocPropertyTag */;
+        return kind === 198 /* ArrowFunction */
+            || kind === 187 /* BindingElement */
+            || kind === 241 /* ClassDeclaration */
+            || kind === 210 /* ClassExpression */
+            || kind === 158 /* Constructor */
+            || kind === 244 /* EnumDeclaration */
+            || kind === 279 /* EnumMember */
+            || kind === 258 /* ExportSpecifier */
+            || kind === 240 /* FunctionDeclaration */
+            || kind === 197 /* FunctionExpression */
+            || kind === 159 /* GetAccessor */
+            || kind === 251 /* ImportClause */
+            || kind === 249 /* ImportEqualsDeclaration */
+            || kind === 254 /* ImportSpecifier */
+            || kind === 242 /* InterfaceDeclaration */
+            || kind === 268 /* JsxAttribute */
+            || kind === 157 /* MethodDeclaration */
+            || kind === 156 /* MethodSignature */
+            || kind === 245 /* ModuleDeclaration */
+            || kind === 248 /* NamespaceExportDeclaration */
+            || kind === 252 /* NamespaceImport */
+            || kind === 152 /* Parameter */
+            || kind === 276 /* PropertyAssignment */
+            || kind === 155 /* PropertyDeclaration */
+            || kind === 154 /* PropertySignature */
+            || kind === 160 /* SetAccessor */
+            || kind === 277 /* ShorthandPropertyAssignment */
+            || kind === 243 /* TypeAliasDeclaration */
+            || kind === 151 /* TypeParameter */
+            || kind === 238 /* VariableDeclaration */
+            || kind === 311 /* JSDocTypedefTag */
+            || kind === 304 /* JSDocCallbackTag */
+            || kind === 312 /* JSDocPropertyTag */;
     }
     function isDeclarationStatementKind(kind) {
-        return kind === 239 /* FunctionDeclaration */
-            || kind === 258 /* MissingDeclaration */
-            || kind === 240 /* ClassDeclaration */
-            || kind === 241 /* InterfaceDeclaration */
-            || kind === 242 /* TypeAliasDeclaration */
-            || kind === 243 /* EnumDeclaration */
-            || kind === 244 /* ModuleDeclaration */
-            || kind === 249 /* ImportDeclaration */
-            || kind === 248 /* ImportEqualsDeclaration */
-            || kind === 255 /* ExportDeclaration */
-            || kind === 254 /* ExportAssignment */
-            || kind === 247 /* NamespaceExportDeclaration */;
+        return kind === 240 /* FunctionDeclaration */
+            || kind === 259 /* MissingDeclaration */
+            || kind === 241 /* ClassDeclaration */
+            || kind === 242 /* InterfaceDeclaration */
+            || kind === 243 /* TypeAliasDeclaration */
+            || kind === 244 /* EnumDeclaration */
+            || kind === 245 /* ModuleDeclaration */
+            || kind === 250 /* ImportDeclaration */
+            || kind === 249 /* ImportEqualsDeclaration */
+            || kind === 256 /* ExportDeclaration */
+            || kind === 255 /* ExportAssignment */
+            || kind === 248 /* NamespaceExportDeclaration */;
     }
     function isStatementKindButNotDeclarationKind(kind) {
-        return kind === 229 /* BreakStatement */
-            || kind === 228 /* ContinueStatement */
-            || kind === 236 /* DebuggerStatement */
-            || kind === 223 /* DoStatement */
-            || kind === 221 /* ExpressionStatement */
-            || kind === 220 /* EmptyStatement */
-            || kind === 226 /* ForInStatement */
-            || kind === 227 /* ForOfStatement */
-            || kind === 225 /* ForStatement */
-            || kind === 222 /* IfStatement */
-            || kind === 233 /* LabeledStatement */
-            || kind === 230 /* ReturnStatement */
-            || kind === 232 /* SwitchStatement */
-            || kind === 234 /* ThrowStatement */
-            || kind === 235 /* TryStatement */
-            || kind === 219 /* VariableStatement */
-            || kind === 224 /* WhileStatement */
-            || kind === 231 /* WithStatement */
-            || kind === 312 /* NotEmittedStatement */
-            || kind === 316 /* EndOfDeclarationMarker */
-            || kind === 315 /* MergeDeclarationMarker */;
+        return kind === 230 /* BreakStatement */
+            || kind === 229 /* ContinueStatement */
+            || kind === 237 /* DebuggerStatement */
+            || kind === 224 /* DoStatement */
+            || kind === 222 /* ExpressionStatement */
+            || kind === 221 /* EmptyStatement */
+            || kind === 227 /* ForInStatement */
+            || kind === 228 /* ForOfStatement */
+            || kind === 226 /* ForStatement */
+            || kind === 223 /* IfStatement */
+            || kind === 234 /* LabeledStatement */
+            || kind === 231 /* ReturnStatement */
+            || kind === 233 /* SwitchStatement */
+            || kind === 235 /* ThrowStatement */
+            || kind === 236 /* TryStatement */
+            || kind === 220 /* VariableStatement */
+            || kind === 225 /* WhileStatement */
+            || kind === 232 /* WithStatement */
+            || kind === 314 /* NotEmittedStatement */
+            || kind === 318 /* EndOfDeclarationMarker */
+            || kind === 317 /* MergeDeclarationMarker */;
     }
     /* @internal */
     function isDeclaration(node) {
-        if (node.kind === 150 /* TypeParameter */) {
-            return (node.parent && node.parent.kind !== 308 /* JSDocTemplateTag */) || ts.isInJSFile(node);
+        if (node.kind === 151 /* TypeParameter */) {
+            return (node.parent && node.parent.kind !== 310 /* JSDocTemplateTag */) || ts.isInJSFile(node);
         }
         return isDeclarationKind(node.kind);
     }
@@ -14772,10 +14973,10 @@ var ts;
     }
     ts.isStatement = isStatement;
     function isBlockStatement(node) {
-        if (node.kind !== 218 /* Block */)
+        if (node.kind !== 219 /* Block */)
             return false;
         if (node.parent !== undefined) {
-            if (node.parent.kind === 235 /* TryStatement */ || node.parent.kind === 274 /* CatchClause */) {
+            if (node.parent.kind === 236 /* TryStatement */ || node.parent.kind === 275 /* CatchClause */) {
                 return false;
             }
         }
@@ -14785,81 +14986,81 @@ var ts;
     /* @internal */
     function isModuleReference(node) {
         var kind = node.kind;
-        return kind === 259 /* ExternalModuleReference */
-            || kind === 148 /* QualifiedName */
-            || kind === 72 /* Identifier */;
+        return kind === 260 /* ExternalModuleReference */
+            || kind === 149 /* QualifiedName */
+            || kind === 73 /* Identifier */;
     }
     ts.isModuleReference = isModuleReference;
     // JSX
     /* @internal */
     function isJsxTagNameExpression(node) {
         var kind = node.kind;
-        return kind === 100 /* ThisKeyword */
-            || kind === 72 /* Identifier */
-            || kind === 189 /* PropertyAccessExpression */;
+        return kind === 101 /* ThisKeyword */
+            || kind === 73 /* Identifier */
+            || kind === 190 /* PropertyAccessExpression */;
     }
     ts.isJsxTagNameExpression = isJsxTagNameExpression;
     /* @internal */
     function isJsxChild(node) {
         var kind = node.kind;
-        return kind === 260 /* JsxElement */
-            || kind === 270 /* JsxExpression */
-            || kind === 261 /* JsxSelfClosingElement */
+        return kind === 261 /* JsxElement */
+            || kind === 271 /* JsxExpression */
+            || kind === 262 /* JsxSelfClosingElement */
             || kind === 11 /* JsxText */
-            || kind === 264 /* JsxFragment */;
+            || kind === 265 /* JsxFragment */;
     }
     ts.isJsxChild = isJsxChild;
     /* @internal */
     function isJsxAttributeLike(node) {
         var kind = node.kind;
-        return kind === 267 /* JsxAttribute */
-            || kind === 269 /* JsxSpreadAttribute */;
+        return kind === 268 /* JsxAttribute */
+            || kind === 270 /* JsxSpreadAttribute */;
     }
     ts.isJsxAttributeLike = isJsxAttributeLike;
     /* @internal */
     function isStringLiteralOrJsxExpression(node) {
         var kind = node.kind;
         return kind === 10 /* StringLiteral */
-            || kind === 270 /* JsxExpression */;
+            || kind === 271 /* JsxExpression */;
     }
     ts.isStringLiteralOrJsxExpression = isStringLiteralOrJsxExpression;
     function isJsxOpeningLikeElement(node) {
         var kind = node.kind;
-        return kind === 262 /* JsxOpeningElement */
-            || kind === 261 /* JsxSelfClosingElement */;
+        return kind === 263 /* JsxOpeningElement */
+            || kind === 262 /* JsxSelfClosingElement */;
     }
     ts.isJsxOpeningLikeElement = isJsxOpeningLikeElement;
     // Clauses
     function isCaseOrDefaultClause(node) {
         var kind = node.kind;
-        return kind === 271 /* CaseClause */
-            || kind === 272 /* DefaultClause */;
+        return kind === 272 /* CaseClause */
+            || kind === 273 /* DefaultClause */;
     }
     ts.isCaseOrDefaultClause = isCaseOrDefaultClause;
     // JSDoc
     /** True if node is of some JSDoc syntax kind. */
     /* @internal */
     function isJSDocNode(node) {
-        return node.kind >= 288 /* FirstJSDocNode */ && node.kind <= 310 /* LastJSDocNode */;
+        return node.kind >= 289 /* FirstJSDocNode */ && node.kind <= 312 /* LastJSDocNode */;
     }
     ts.isJSDocNode = isJSDocNode;
     /** True if node is of a kind that may contain comment text. */
     function isJSDocCommentContainingNode(node) {
-        return node.kind === 296 /* JSDocComment */ || isJSDocTag(node) || ts.isJSDocTypeLiteral(node) || ts.isJSDocSignature(node);
+        return node.kind === 297 /* JSDocComment */ || isJSDocTag(node) || ts.isJSDocTypeLiteral(node) || ts.isJSDocSignature(node);
     }
     ts.isJSDocCommentContainingNode = isJSDocCommentContainingNode;
     // TODO: determine what this does before making it public.
     /* @internal */
     function isJSDocTag(node) {
-        return node.kind >= 299 /* FirstJSDocTagNode */ && node.kind <= 310 /* LastJSDocTagNode */;
+        return node.kind >= 300 /* FirstJSDocTagNode */ && node.kind <= 312 /* LastJSDocTagNode */;
     }
     ts.isJSDocTag = isJSDocTag;
     function isSetAccessor(node) {
-        return node.kind === 159 /* SetAccessor */;
+        return node.kind === 160 /* SetAccessor */;
     }
     ts.isSetAccessor = isSetAccessor;
     function isGetAccessor(node) {
-        return node.kind === 158 /* GetAccessor */;
+        return node.kind === 159 /* GetAccessor */;
     }
     ts.isGetAccessor = isGetAccessor;
     /** True if has jsdoc nodes attached to it. */
@@ -14889,12 +15090,12 @@ var ts;
     }
     ts.hasOnlyExpressionInitializer = hasOnlyExpressionInitializer;
     function isObjectLiteralElement(node) {
-        return node.kind === 267 /* JsxAttribute */ || node.kind === 269 /* JsxSpreadAttribute */ || isObjectLiteralElementLike(node);
+        return node.kind === 268 /* JsxAttribute */ || node.kind === 270 /* JsxSpreadAttribute */ || isObjectLiteralElementLike(node);
     }
     ts.isObjectLiteralElement = isObjectLiteralElement;
     /* @internal */
     function isTypeReferenceType(node) {
-        return node.kind === 164 /* TypeReference */ || node.kind === 211 /* ExpressionWithTypeArguments */;
+        return node.kind === 165 /* TypeReference */ || node.kind === 212 /* ExpressionWithTypeArguments */;
     }
     ts.isTypeReferenceType = isTypeReferenceType;
     var MAX_SMI_X86 = 1073741823;
@@ -14930,7 +15131,7 @@ var ts;
 /* @internal */
 (function (ts) {
     function isNamedImportsOrExports(node) {
-        return node.kind === 252 /* NamedImports */ || node.kind === 256 /* NamedExports */;
+        return node.kind === 253 /* NamedImports */ || node.kind === 257 /* NamedExports */;
     }
     ts.isNamedImportsOrExports = isNamedImportsOrExports;
     function Symbol(flags, name) {
@@ -15050,17 +15251,16 @@ var ts;
             messageText: text,
             category: message.category,
             code: message.code,
-            next: details
+            next: details === undefined || Array.isArray(details) ? details : [details]
         };
     }
     ts.chainDiagnosticMessages = chainDiagnosticMessages;
     function concatenateDiagnosticMessageChains(headChain, tailChain) {
         var lastChain = headChain;
         while (lastChain.next) {
-            lastChain = lastChain.next;
+            lastChain = lastChain.next[0];
         }
-        lastChain.next = tailChain;
-        return headChain;
+        lastChain.next = [tailChain];
     }
     ts.concatenateDiagnosticMessageChains = concatenateDiagnosticMessageChains;
     function getDiagnosticFilePath(diagnostic) {
@@ -15094,25 +15294,42 @@ var ts;
         return d1.relatedInformation ? -1 /* LessThan */ : 1 /* GreaterThan */;
     }
     function compareMessageText(t1, t2) {
-        var text1 = t1;
-        var text2 = t2;
-        while (text1 && text2) {
-            // We still have both chains.
-            var string1 = ts.isString(text1) ? text1 : text1.messageText;
-            var string2 = ts.isString(text2) ? text2 : text2.messageText;
-            var res = ts.compareStringsCaseSensitive(string1, string2);
+        if (typeof t1 === "string" && typeof t2 === "string") {
+            return ts.compareStringsCaseSensitive(t1, t2);
+        }
+        else if (typeof t1 === "string") {
+            return -1 /* LessThan */;
+        }
+        else if (typeof t2 === "string") {
+            return 1 /* GreaterThan */;
+        }
+        var res = ts.compareStringsCaseSensitive(t1.messageText, t2.messageText);
+        if (res) {
+            return res;
+        }
+        if (!t1.next && !t2.next) {
+            return 0 /* EqualTo */;
+        }
+        if (!t1.next) {
+            return -1 /* LessThan */;
+        }
+        if (!t2.next) {
+            return 1 /* GreaterThan */;
+        }
+        var len = Math.min(t1.next.length, t2.next.length);
+        for (var i = 0; i < len; i++) {
+            res = compareMessageText(t1.next[i], t2.next[i]);
             if (res) {
                 return res;
             }
-            text1 = ts.isString(text1) ? undefined : text1.next;
-            text2 = ts.isString(text2) ? undefined : text2.next;
         }
-        if (!text1 && !text2) {
-            // if the chains are done, then these messages are the same.
-            return 0 /* EqualTo */;
+        if (t1.next.length < t2.next.length) {
+            return -1 /* LessThan */;
         }
-        // We still have one chain remaining.  The shorter chain should come first.
-        return text1 ? 1 /* GreaterThan */ : -1 /* LessThan */;
+        else if (t1.next.length > t2.next.length) {
+            return 1 /* GreaterThan */;
+        }
+        return 0 /* EqualTo */;
     }
     function getEmitScriptTarget(compilerOptions) {
         return compilerOptions.target || 0 /* ES3 */;
@@ -15181,6 +15398,11 @@ var ts;
             ts.semanticDiagnosticsOptionDeclarations.some(function (option) { return !ts.isJsonEqual(getCompilerOptionValue(oldOptions, option), getCompilerOptionValue(newOptions, option)); });
     }
     ts.compilerOptionsAffectSemanticDiagnostics = compilerOptionsAffectSemanticDiagnostics;
+    function compilerOptionsAffectEmit(newOptions, oldOptions) {
+        return oldOptions !== newOptions &&
+            ts.affectsEmitOptionDeclarations.some(function (option) { return !ts.isJsonEqual(getCompilerOptionValue(oldOptions, option), getCompilerOptionValue(newOptions, option)); });
+    }
+    ts.compilerOptionsAffectEmit = compilerOptionsAffectEmit;
     function getCompilerOptionValue(options, option) {
         return option.strictFlag ? getStrictOptionValue(options, option.name) : options[option.name];
     }
@@ -15459,6 +15681,15 @@ var ts;
         return root + pathComponents.slice(1).join(ts.directorySeparator);
     }
     ts.getPathFromPathComponents = getPathFromPathComponents;
+    function getNormalizedAbsolutePathWithoutRoot(fileName, currentDirectory) {
+        return getPathWithoutRoot(getNormalizedPathComponents(fileName, currentDirectory));
+    }
+    ts.getNormalizedAbsolutePathWithoutRoot = getNormalizedAbsolutePathWithoutRoot;
+    function getPathWithoutRoot(pathComponents) {
+        if (pathComponents.length === 0)
+            return "";
+        return pathComponents.slice(1).join(ts.directorySeparator);
+    }
 })(ts || (ts = {}));
 /* @internal */
 (function (ts) {
@@ -15489,7 +15720,7 @@ var ts;
     }
     ts.getRelativePathFromFile = getRelativePathFromFile;
     function getRelativePathFromDirectory(fromDirectory, to, getCanonicalFileNameOrIgnoreCase) {
-        Debug.assert((ts.getRootLength(fromDirectory) > 0) === (ts.getRootLength(to) > 0), "Paths must either both be absolute or both be relative");
+        ts.Debug.assert((ts.getRootLength(fromDirectory) > 0) === (ts.getRootLength(to) > 0), "Paths must either both be absolute or both be relative");
         var getCanonicalFileName = typeof getCanonicalFileNameOrIgnoreCase === "function" ? getCanonicalFileNameOrIgnoreCase : ts.identity;
         var ignoreCase = typeof getCanonicalFileNameOrIgnoreCase === "boolean" ? getCanonicalFileNameOrIgnoreCase : false;
         var pathComponents = getPathComponentsRelativeTo(fromDirectory, to, ignoreCase ? ts.equateStringsCaseInsensitive : ts.equateStringsCaseSensitive, getCanonicalFileName);
@@ -15859,7 +16090,7 @@ var ts;
     }
     ts.getRegexFromPattern = getRegexFromPattern;
     /** @param path directory of the tsconfig.json */
-    function matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory, depth, getFileSystemEntries) {
+    function matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory, depth, getFileSystemEntries, realpath) {
         path = ts.normalizePath(path);
         currentDirectory = ts.normalizePath(currentDirectory);
         var patterns = getFileMatcherPatterns(path, excludes, includes, useCaseSensitiveFileNames, currentDirectory);
@@ -15869,12 +16100,18 @@ var ts;
         // Associate an array of results with each include regex. This keeps results in order of the "include" order.
         // If there are no "includes", then just put everything in results[0].
         var results = includeFileRegexes ? includeFileRegexes.map(function () { return []; }) : [[]];
+        var visited = ts.createMap();
+        var toCanonical = ts.createGetCanonicalFileName(useCaseSensitiveFileNames);
         for (var _i = 0, _a = patterns.basePaths; _i < _a.length; _i++) {
             var basePath = _a[_i];
             visitDirectory(basePath, combinePaths(currentDirectory, basePath), depth);
         }
         return ts.flatten(results);
         function visitDirectory(path, absolutePath, depth) {
+            var canonicalPath = toCanonical(realpath(absolutePath));
+            if (visited.has(canonicalPath))
+                return;
+            visited.set(canonicalPath, true);
             var _a = getFileSystemEntries(path), files = _a.files, directories = _a.directories;
             var _loop_1 = function (current) {
                 var name = combinePaths(path, current);
@@ -16127,32 +16364,9 @@ var ts;
         return pathext ? path.slice(0, path.length - pathext.length) + (ts.startsWith(ext, ".") ? ext : "." + ext) : path;
     }
     ts.changeAnyExtension = changeAnyExtension;
-    var Debug;
-    (function (Debug) {
-        function showSymbol(symbol) {
-            var symbolFlags = ts.SymbolFlags;
-            return "{ flags: " + (symbolFlags ? showFlags(symbol.flags, symbolFlags) : symbol.flags) + "; declarations: " + ts.map(symbol.declarations, showSyntaxKind) + " }";
-        }
-        Debug.showSymbol = showSymbol;
-        function showFlags(flags, flagsEnum) {
-            var out = [];
-            for (var pow = 0; pow <= 30; pow++) {
-                var n = 1 << pow;
-                if (flags & n) {
-                    out.push(flagsEnum[n]);
-                }
-            }
-            return out.join("|");
-        }
-        function showSyntaxKind(node) {
-            var syntaxKind = ts.SyntaxKind;
-            return syntaxKind ? syntaxKind[node.kind] : node.kind.toString();
-        }
-        Debug.showSyntaxKind = showSyntaxKind;
-    })(Debug = ts.Debug || (ts.Debug = {}));
     function tryParsePattern(pattern) {
         // This should be verified outside of here and a proper error thrown.
-        Debug.assert(ts.hasZeroOrOneAsteriskCharacter(pattern));
+        ts.Debug.assert(ts.hasZeroOrOneAsteriskCharacter(pattern));
         var indexOfStar = pattern.indexOf("*");
         return indexOfStar === -1 ? undefined : {
             prefix: pattern.substr(0, indexOfStar),
@@ -16181,7 +16395,7 @@ var ts;
      */
     function extensionFromPath(path) {
         var ext = tryGetExtensionFromPath(path);
-        return ext !== undefined ? ext : Debug.fail("File " + path + " has unknown extension.");
+        return ext !== undefined ? ext : ts.Debug.fail("File " + path + " has unknown extension.");
     }
     ts.extensionFromPath = extensionFromPath;
     function isAnySupportedFileExtension(path) {
@@ -16253,12 +16467,25 @@ var ts;
     ts.matchPatternOrExact = matchPatternOrExact;
     function sliceAfter(arr, value) {
         var index = arr.indexOf(value);
-        Debug.assert(index !== -1);
+        ts.Debug.assert(index !== -1);
         return arr.slice(index);
     }
     ts.sliceAfter = sliceAfter;
+    function addRelatedInfo(diagnostic) {
+        var _a;
+        var relatedInformation = [];
+        for (var _i = 1; _i < arguments.length; _i++) {
+            relatedInformation[_i - 1] = arguments[_i];
+        }
+        if (!diagnostic.relatedInformation) {
+            diagnostic.relatedInformation = [];
+        }
+        (_a = diagnostic.relatedInformation).push.apply(_a, relatedInformation);
+        return diagnostic;
+    }
+    ts.addRelatedInfo = addRelatedInfo;
     function minAndMax(arr, getValue) {
-        Debug.assert(arr.length !== 0);
+        ts.Debug.assert(arr.length !== 0);
         var min = getValue(arr[0]);
         var max = min;
         for (var i = 1; i < arr.length; i++) {
@@ -16456,10 +16683,10 @@ var ts;
     var SourceFileConstructor;
     // tslint:enable variable-name
     function createNode(kind, pos, end) {
-        if (kind === 284 /* SourceFile */) {
+        if (kind === 285 /* SourceFile */) {
             return new (SourceFileConstructor || (SourceFileConstructor = ts.objectAllocator.getSourceFileConstructor()))(kind, pos, end);
         }
-        else if (kind === 72 /* Identifier */) {
+        else if (kind === 73 /* Identifier */) {
             return new (IdentifierConstructor || (IdentifierConstructor = ts.objectAllocator.getIdentifierConstructor()))(kind, pos, end);
         }
         else if (!ts.isNodeKind(kind)) {
@@ -16508,19 +16735,19 @@ var ts;
      * that they appear in the source code. The language service depends on this property to locate nodes by position.
      */
     function forEachChild(node, cbNode, cbNodes) {
-        if (!node || node.kind <= 147 /* LastToken */) {
+        if (!node || node.kind <= 148 /* LastToken */) {
             return;
         }
         switch (node.kind) {
-            case 148 /* QualifiedName */:
+            case 149 /* QualifiedName */:
                 return visitNode(cbNode, node.left) ||
                     visitNode(cbNode, node.right);
-            case 150 /* TypeParameter */:
+            case 151 /* TypeParameter */:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.constraint) ||
                     visitNode(cbNode, node.default) ||
                     visitNode(cbNode, node.expression);
-            case 276 /* ShorthandPropertyAssignment */:
+            case 277 /* ShorthandPropertyAssignment */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
@@ -16528,9 +16755,9 @@ var ts;
                     visitNode(cbNode, node.exclamationToken) ||
                     visitNode(cbNode, node.equalsToken) ||
                     visitNode(cbNode, node.objectAssignmentInitializer);
-            case 277 /* SpreadAssignment */:
+            case 278 /* SpreadAssignment */:
                 return visitNode(cbNode, node.expression);
-            case 151 /* Parameter */:
+            case 152 /* Parameter */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.dotDotDotToken) ||
@@ -16538,7 +16765,7 @@ var ts;
                     visitNode(cbNode, node.questionToken) ||
                     visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.initializer);
-            case 154 /* PropertyDeclaration */:
+            case 155 /* PropertyDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
@@ -16546,51 +16773,51 @@ var ts;
                     visitNode(cbNode, node.exclamationToken) ||
                     visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.initializer);
-            case 153 /* PropertySignature */:
+            case 154 /* PropertySignature */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.questionToken) ||
                     visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.initializer);
-            case 275 /* PropertyAssignment */:
+            case 276 /* PropertyAssignment */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.questionToken) ||
                     visitNode(cbNode, node.initializer);
-            case 237 /* VariableDeclaration */:
+            case 238 /* VariableDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.exclamationToken) ||
                     visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.initializer);
-            case 186 /* BindingElement */:
+            case 187 /* BindingElement */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.dotDotDotToken) ||
                     visitNode(cbNode, node.propertyName) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.initializer);
-            case 165 /* FunctionType */:
-            case 166 /* ConstructorType */:
-            case 160 /* CallSignature */:
-            case 161 /* ConstructSignature */:
-            case 162 /* IndexSignature */:
+            case 166 /* FunctionType */:
+            case 167 /* ConstructorType */:
+            case 161 /* CallSignature */:
+            case 162 /* ConstructSignature */:
+            case 163 /* IndexSignature */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNodes(cbNode, cbNodes, node.typeParameters) ||
                     visitNodes(cbNode, cbNodes, node.parameters) ||
                     visitNode(cbNode, node.type);
-            case 156 /* MethodDeclaration */:
-            case 155 /* MethodSignature */:
-            case 157 /* Constructor */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
-            case 196 /* FunctionExpression */:
-            case 239 /* FunctionDeclaration */:
-            case 197 /* ArrowFunction */:
+            case 157 /* MethodDeclaration */:
+            case 156 /* MethodSignature */:
+            case 158 /* Constructor */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
+            case 197 /* FunctionExpression */:
+            case 240 /* FunctionDeclaration */:
+            case 198 /* ArrowFunction */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.asteriskToken) ||
@@ -16602,343 +16829,345 @@ var ts;
                     visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.equalsGreaterThanToken) ||
                     visitNode(cbNode, node.body);
-            case 164 /* TypeReference */:
+            case 165 /* TypeReference */:
                 return visitNode(cbNode, node.typeName) ||
                     visitNodes(cbNode, cbNodes, node.typeArguments);
-            case 163 /* TypePredicate */:
+            case 164 /* TypePredicate */:
                 return visitNode(cbNode, node.parameterName) ||
                     visitNode(cbNode, node.type);
-            case 167 /* TypeQuery */:
+            case 168 /* TypeQuery */:
                 return visitNode(cbNode, node.exprName);
-            case 168 /* TypeLiteral */:
+            case 169 /* TypeLiteral */:
                 return visitNodes(cbNode, cbNodes, node.members);
-            case 169 /* ArrayType */:
+            case 170 /* ArrayType */:
                 return visitNode(cbNode, node.elementType);
-            case 170 /* TupleType */:
+            case 171 /* TupleType */:
                 return visitNodes(cbNode, cbNodes, node.elementTypes);
-            case 173 /* UnionType */:
-            case 174 /* IntersectionType */:
+            case 174 /* UnionType */:
+            case 175 /* IntersectionType */:
                 return visitNodes(cbNode, cbNodes, node.types);
-            case 175 /* ConditionalType */:
+            case 176 /* ConditionalType */:
                 return visitNode(cbNode, node.checkType) ||
                     visitNode(cbNode, node.extendsType) ||
                     visitNode(cbNode, node.trueType) ||
                     visitNode(cbNode, node.falseType);
-            case 176 /* InferType */:
+            case 177 /* InferType */:
                 return visitNode(cbNode, node.typeParameter);
-            case 183 /* ImportType */:
+            case 184 /* ImportType */:
                 return visitNode(cbNode, node.argument) ||
                     visitNode(cbNode, node.qualifier) ||
                     visitNodes(cbNode, cbNodes, node.typeArguments);
-            case 177 /* ParenthesizedType */:
-            case 179 /* TypeOperator */:
+            case 178 /* ParenthesizedType */:
+            case 180 /* TypeOperator */:
                 return visitNode(cbNode, node.type);
-            case 180 /* IndexedAccessType */:
+            case 181 /* IndexedAccessType */:
                 return visitNode(cbNode, node.objectType) ||
                     visitNode(cbNode, node.indexType);
-            case 181 /* MappedType */:
+            case 182 /* MappedType */:
                 return visitNode(cbNode, node.readonlyToken) ||
                     visitNode(cbNode, node.typeParameter) ||
                     visitNode(cbNode, node.questionToken) ||
                     visitNode(cbNode, node.type);
-            case 182 /* LiteralType */:
+            case 183 /* LiteralType */:
                 return visitNode(cbNode, node.literal);
-            case 184 /* ObjectBindingPattern */:
-            case 185 /* ArrayBindingPattern */:
+            case 185 /* ObjectBindingPattern */:
+            case 186 /* ArrayBindingPattern */:
                 return visitNodes(cbNode, cbNodes, node.elements);
-            case 187 /* ArrayLiteralExpression */:
+            case 188 /* ArrayLiteralExpression */:
                 return visitNodes(cbNode, cbNodes, node.elements);
-            case 188 /* ObjectLiteralExpression */:
+            case 189 /* ObjectLiteralExpression */:
                 return visitNodes(cbNode, cbNodes, node.properties);
-            case 189 /* PropertyAccessExpression */:
+            case 190 /* PropertyAccessExpression */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.name);
-            case 190 /* ElementAccessExpression */:
+            case 191 /* ElementAccessExpression */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.argumentExpression);
-            case 191 /* CallExpression */:
-            case 192 /* NewExpression */:
+            case 192 /* CallExpression */:
+            case 193 /* NewExpression */:
                 return visitNode(cbNode, node.expression) ||
                     visitNodes(cbNode, cbNodes, node.typeArguments) ||
                     visitNodes(cbNode, cbNodes, node.arguments);
-            case 193 /* TaggedTemplateExpression */:
+            case 194 /* TaggedTemplateExpression */:
                 return visitNode(cbNode, node.tag) ||
                     visitNodes(cbNode, cbNodes, node.typeArguments) ||
                     visitNode(cbNode, node.template);
-            case 194 /* TypeAssertionExpression */:
+            case 195 /* TypeAssertionExpression */:
                 return visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.expression);
-            case 195 /* ParenthesizedExpression */:
+            case 196 /* ParenthesizedExpression */:
                 return visitNode(cbNode, node.expression);
-            case 198 /* DeleteExpression */:
+            case 199 /* DeleteExpression */:
                 return visitNode(cbNode, node.expression);
-            case 199 /* TypeOfExpression */:
+            case 200 /* TypeOfExpression */:
                 return visitNode(cbNode, node.expression);
-            case 200 /* VoidExpression */:
+            case 201 /* VoidExpression */:
                 return visitNode(cbNode, node.expression);
-            case 202 /* PrefixUnaryExpression */:
+            case 203 /* PrefixUnaryExpression */:
                 return visitNode(cbNode, node.operand);
-            case 207 /* YieldExpression */:
+            case 208 /* YieldExpression */:
                 return visitNode(cbNode, node.asteriskToken) ||
                     visitNode(cbNode, node.expression);
-            case 201 /* AwaitExpression */:
+            case 202 /* AwaitExpression */:
                 return visitNode(cbNode, node.expression);
-            case 203 /* PostfixUnaryExpression */:
+            case 204 /* PostfixUnaryExpression */:
                 return visitNode(cbNode, node.operand);
-            case 204 /* BinaryExpression */:
+            case 205 /* BinaryExpression */:
                 return visitNode(cbNode, node.left) ||
                     visitNode(cbNode, node.operatorToken) ||
                     visitNode(cbNode, node.right);
-            case 212 /* AsExpression */:
+            case 213 /* AsExpression */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.type);
-            case 213 /* NonNullExpression */:
+            case 214 /* NonNullExpression */:
                 return visitNode(cbNode, node.expression);
-            case 214 /* MetaProperty */:
+            case 215 /* MetaProperty */:
                 return visitNode(cbNode, node.name);
-            case 205 /* ConditionalExpression */:
+            case 206 /* ConditionalExpression */:
                 return visitNode(cbNode, node.condition) ||
                     visitNode(cbNode, node.questionToken) ||
                     visitNode(cbNode, node.whenTrue) ||
                     visitNode(cbNode, node.colonToken) ||
                     visitNode(cbNode, node.whenFalse);
-            case 208 /* SpreadElement */:
+            case 209 /* SpreadElement */:
                 return visitNode(cbNode, node.expression);
-            case 218 /* Block */:
-            case 245 /* ModuleBlock */:
+            case 219 /* Block */:
+            case 246 /* ModuleBlock */:
                 return visitNodes(cbNode, cbNodes, node.statements);
-            case 284 /* SourceFile */:
+            case 285 /* SourceFile */:
                 return visitNodes(cbNode, cbNodes, node.statements) ||
                     visitNode(cbNode, node.endOfFileToken);
-            case 219 /* VariableStatement */:
+            case 220 /* VariableStatement */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.declarationList);
-            case 238 /* VariableDeclarationList */:
+            case 239 /* VariableDeclarationList */:
                 return visitNodes(cbNode, cbNodes, node.declarations);
-            case 221 /* ExpressionStatement */:
+            case 222 /* ExpressionStatement */:
                 return visitNode(cbNode, node.expression);
-            case 222 /* IfStatement */:
+            case 223 /* IfStatement */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.thenStatement) ||
                     visitNode(cbNode, node.elseStatement);
-            case 223 /* DoStatement */:
+            case 224 /* DoStatement */:
                 return visitNode(cbNode, node.statement) ||
                     visitNode(cbNode, node.expression);
-            case 224 /* WhileStatement */:
+            case 225 /* WhileStatement */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.statement);
-            case 225 /* ForStatement */:
+            case 226 /* ForStatement */:
                 return visitNode(cbNode, node.initializer) ||
                     visitNode(cbNode, node.condition) ||
                     visitNode(cbNode, node.incrementor) ||
                     visitNode(cbNode, node.statement);
-            case 226 /* ForInStatement */:
+            case 227 /* ForInStatement */:
                 return visitNode(cbNode, node.initializer) ||
                     visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.statement);
-            case 227 /* ForOfStatement */:
+            case 228 /* ForOfStatement */:
                 return visitNode(cbNode, node.awaitModifier) ||
                     visitNode(cbNode, node.initializer) ||
                     visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.statement);
-            case 228 /* ContinueStatement */:
-            case 229 /* BreakStatement */:
+            case 229 /* ContinueStatement */:
+            case 230 /* BreakStatement */:
                 return visitNode(cbNode, node.label);
-            case 230 /* ReturnStatement */:
+            case 231 /* ReturnStatement */:
                 return visitNode(cbNode, node.expression);
-            case 231 /* WithStatement */:
+            case 232 /* WithStatement */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.statement);
-            case 232 /* SwitchStatement */:
+            case 233 /* SwitchStatement */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.caseBlock);
-            case 246 /* CaseBlock */:
+            case 247 /* CaseBlock */:
                 return visitNodes(cbNode, cbNodes, node.clauses);
-            case 271 /* CaseClause */:
+            case 272 /* CaseClause */:
                 return visitNode(cbNode, node.expression) ||
                     visitNodes(cbNode, cbNodes, node.statements);
-            case 272 /* DefaultClause */:
+            case 273 /* DefaultClause */:
                 return visitNodes(cbNode, cbNodes, node.statements);
-            case 233 /* LabeledStatement */:
+            case 234 /* LabeledStatement */:
                 return visitNode(cbNode, node.label) ||
                     visitNode(cbNode, node.statement);
-            case 234 /* ThrowStatement */:
+            case 235 /* ThrowStatement */:
                 return visitNode(cbNode, node.expression);
-            case 235 /* TryStatement */:
+            case 236 /* TryStatement */:
                 return visitNode(cbNode, node.tryBlock) ||
                     visitNode(cbNode, node.catchClause) ||
                     visitNode(cbNode, node.finallyBlock);
-            case 274 /* CatchClause */:
+            case 275 /* CatchClause */:
                 return visitNode(cbNode, node.variableDeclaration) ||
                     visitNode(cbNode, node.block);
-            case 152 /* Decorator */:
+            case 153 /* Decorator */:
                 return visitNode(cbNode, node.expression);
-            case 240 /* ClassDeclaration */:
-            case 209 /* ClassExpression */:
+            case 241 /* ClassDeclaration */:
+            case 210 /* ClassExpression */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNodes(cbNode, cbNodes, node.typeParameters) ||
                     visitNodes(cbNode, cbNodes, node.heritageClauses) ||
                     visitNodes(cbNode, cbNodes, node.members);
-            case 241 /* InterfaceDeclaration */:
+            case 242 /* InterfaceDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNodes(cbNode, cbNodes, node.typeParameters) ||
                     visitNodes(cbNode, cbNodes, node.heritageClauses) ||
                     visitNodes(cbNode, cbNodes, node.members);
-            case 242 /* TypeAliasDeclaration */:
+            case 243 /* TypeAliasDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNodes(cbNode, cbNodes, node.typeParameters) ||
                     visitNode(cbNode, node.type);
-            case 243 /* EnumDeclaration */:
+            case 244 /* EnumDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNodes(cbNode, cbNodes, node.members);
-            case 278 /* EnumMember */:
+            case 279 /* EnumMember */:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.initializer);
-            case 244 /* ModuleDeclaration */:
+            case 245 /* ModuleDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.body);
-            case 248 /* ImportEqualsDeclaration */:
+            case 249 /* ImportEqualsDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.moduleReference);
-            case 249 /* ImportDeclaration */:
+            case 250 /* ImportDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.importClause) ||
                     visitNode(cbNode, node.moduleSpecifier);
-            case 250 /* ImportClause */:
+            case 251 /* ImportClause */:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.namedBindings);
-            case 247 /* NamespaceExportDeclaration */:
+            case 248 /* NamespaceExportDeclaration */:
                 return visitNode(cbNode, node.name);
-            case 251 /* NamespaceImport */:
+            case 252 /* NamespaceImport */:
                 return visitNode(cbNode, node.name);
-            case 252 /* NamedImports */:
-            case 256 /* NamedExports */:
+            case 253 /* NamedImports */:
+            case 257 /* NamedExports */:
                 return visitNodes(cbNode, cbNodes, node.elements);
-            case 255 /* ExportDeclaration */:
+            case 256 /* ExportDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.exportClause) ||
                     visitNode(cbNode, node.moduleSpecifier);
-            case 253 /* ImportSpecifier */:
-            case 257 /* ExportSpecifier */:
+            case 254 /* ImportSpecifier */:
+            case 258 /* ExportSpecifier */:
                 return visitNode(cbNode, node.propertyName) ||
                     visitNode(cbNode, node.name);
-            case 254 /* ExportAssignment */:
+            case 255 /* ExportAssignment */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.expression);
-            case 206 /* TemplateExpression */:
+            case 207 /* TemplateExpression */:
                 return visitNode(cbNode, node.head) || visitNodes(cbNode, cbNodes, node.templateSpans);
-            case 216 /* TemplateSpan */:
+            case 217 /* TemplateSpan */:
                 return visitNode(cbNode, node.expression) || visitNode(cbNode, node.literal);
-            case 149 /* ComputedPropertyName */:
+            case 150 /* ComputedPropertyName */:
                 return visitNode(cbNode, node.expression);
-            case 273 /* HeritageClause */:
+            case 274 /* HeritageClause */:
                 return visitNodes(cbNode, cbNodes, node.types);
-            case 211 /* ExpressionWithTypeArguments */:
+            case 212 /* ExpressionWithTypeArguments */:
                 return visitNode(cbNode, node.expression) ||
                     visitNodes(cbNode, cbNodes, node.typeArguments);
-            case 259 /* ExternalModuleReference */:
+            case 260 /* ExternalModuleReference */:
                 return visitNode(cbNode, node.expression);
-            case 258 /* MissingDeclaration */:
+            case 259 /* MissingDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators);
-            case 314 /* CommaListExpression */:
+            case 316 /* CommaListExpression */:
                 return visitNodes(cbNode, cbNodes, node.elements);
-            case 260 /* JsxElement */:
+            case 261 /* JsxElement */:
                 return visitNode(cbNode, node.openingElement) ||
                     visitNodes(cbNode, cbNodes, node.children) ||
                     visitNode(cbNode, node.closingElement);
-            case 264 /* JsxFragment */:
+            case 265 /* JsxFragment */:
                 return visitNode(cbNode, node.openingFragment) ||
                     visitNodes(cbNode, cbNodes, node.children) ||
                     visitNode(cbNode, node.closingFragment);
-            case 261 /* JsxSelfClosingElement */:
-            case 262 /* JsxOpeningElement */:
+            case 262 /* JsxSelfClosingElement */:
+            case 263 /* JsxOpeningElement */:
                 return visitNode(cbNode, node.tagName) ||
                     visitNodes(cbNode, cbNodes, node.typeArguments) ||
                     visitNode(cbNode, node.attributes);
-            case 268 /* JsxAttributes */:
+            case 269 /* JsxAttributes */:
                 return visitNodes(cbNode, cbNodes, node.properties);
-            case 267 /* JsxAttribute */:
+            case 268 /* JsxAttribute */:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.initializer);
-            case 269 /* JsxSpreadAttribute */:
+            case 270 /* JsxSpreadAttribute */:
                 return visitNode(cbNode, node.expression);
-            case 270 /* JsxExpression */:
+            case 271 /* JsxExpression */:
                 return visitNode(cbNode, node.dotDotDotToken) ||
                     visitNode(cbNode, node.expression);
-            case 263 /* JsxClosingElement */:
+            case 264 /* JsxClosingElement */:
                 return visitNode(cbNode, node.tagName);
-            case 171 /* OptionalType */:
-            case 172 /* RestType */:
-            case 288 /* JSDocTypeExpression */:
-            case 292 /* JSDocNonNullableType */:
-            case 291 /* JSDocNullableType */:
-            case 293 /* JSDocOptionalType */:
-            case 295 /* JSDocVariadicType */:
+            case 172 /* OptionalType */:
+            case 173 /* RestType */:
+            case 289 /* JSDocTypeExpression */:
+            case 293 /* JSDocNonNullableType */:
+            case 292 /* JSDocNullableType */:
+            case 294 /* JSDocOptionalType */:
+            case 296 /* JSDocVariadicType */:
                 return visitNode(cbNode, node.type);
-            case 294 /* JSDocFunctionType */:
+            case 295 /* JSDocFunctionType */:
                 return visitNodes(cbNode, cbNodes, node.parameters) ||
                     visitNode(cbNode, node.type);
-            case 296 /* JSDocComment */:
+            case 297 /* JSDocComment */:
                 return visitNodes(cbNode, cbNodes, node.tags);
-            case 304 /* JSDocParameterTag */:
-            case 310 /* JSDocPropertyTag */:
+            case 306 /* JSDocParameterTag */:
+            case 312 /* JSDocPropertyTag */:
                 return visitNode(cbNode, node.tagName) ||
                     (node.isNameFirst
                         ? visitNode(cbNode, node.name) ||
                             visitNode(cbNode, node.typeExpression)
                         : visitNode(cbNode, node.typeExpression) ||
                             visitNode(cbNode, node.name));
-            case 300 /* JSDocAugmentsTag */:
+            case 302 /* JSDocAuthorTag */:
+                return visitNode(cbNode, node.tagName);
+            case 301 /* JSDocAugmentsTag */:
                 return visitNode(cbNode, node.tagName) ||
                     visitNode(cbNode, node.class);
-            case 308 /* JSDocTemplateTag */:
+            case 310 /* JSDocTemplateTag */:
                 return visitNode(cbNode, node.tagName) ||
                     visitNode(cbNode, node.constraint) ||
                     visitNodes(cbNode, cbNodes, node.typeParameters);
-            case 309 /* JSDocTypedefTag */:
+            case 311 /* JSDocTypedefTag */:
                 return visitNode(cbNode, node.tagName) ||
                     (node.typeExpression &&
-                        node.typeExpression.kind === 288 /* JSDocTypeExpression */
+                        node.typeExpression.kind === 289 /* JSDocTypeExpression */
                         ? visitNode(cbNode, node.typeExpression) ||
                             visitNode(cbNode, node.fullName)
                         : visitNode(cbNode, node.fullName) ||
                             visitNode(cbNode, node.typeExpression));
-            case 302 /* JSDocCallbackTag */:
+            case 304 /* JSDocCallbackTag */:
                 return visitNode(cbNode, node.tagName) ||
                     visitNode(cbNode, node.fullName) ||
                     visitNode(cbNode, node.typeExpression);
-            case 305 /* JSDocReturnTag */:
-            case 307 /* JSDocTypeTag */:
-            case 306 /* JSDocThisTag */:
-            case 303 /* JSDocEnumTag */:
+            case 307 /* JSDocReturnTag */:
+            case 309 /* JSDocTypeTag */:
+            case 308 /* JSDocThisTag */:
+            case 305 /* JSDocEnumTag */:
                 return visitNode(cbNode, node.tagName) ||
                     visitNode(cbNode, node.typeExpression);
-            case 298 /* JSDocSignature */:
+            case 299 /* JSDocSignature */:
                 return ts.forEach(node.typeParameters, cbNode) ||
                     ts.forEach(node.parameters, cbNode) ||
                     visitNode(cbNode, node.type);
-            case 297 /* JSDocTypeLiteral */:
+            case 298 /* JSDocTypeLiteral */:
                 return ts.forEach(node.jsDocPropertyTags, cbNode);
-            case 299 /* JSDocTag */:
-            case 301 /* JSDocClassTag */:
+            case 300 /* JSDocTag */:
+            case 303 /* JSDocClassTag */:
                 return visitNode(cbNode, node.tagName);
-            case 313 /* PartiallyEmittedExpression */:
+            case 315 /* PartiallyEmittedExpression */:
                 return visitNode(cbNode, node.expression);
         }
     }
@@ -17018,7 +17247,7 @@ var ts;
     (function (Parser) {
         // Share a single scanner across all calls to parse a source file.  This helps speed things
         // up by avoiding the cost of creating/compiling scanners over and over again.
-        var scanner = ts.createScanner(7 /* Latest */, /*skipTrivia*/ true);
+        var scanner = ts.createScanner(99 /* Latest */, /*skipTrivia*/ true);
         var disallowInAndDecoratorContext = 2048 /* DisallowInContext */ | 8192 /* DecoratorContext */;
         // capture constructors in 'initializeState' to avoid null checks
         // tslint:disable variable-name
@@ -17156,14 +17385,14 @@ var ts;
                 sourceFile.endOfFileToken = parseTokenNode();
             }
             else {
-                var statement = createNode(221 /* ExpressionStatement */);
+                var statement = createNode(222 /* ExpressionStatement */);
                 switch (token()) {
                     case 22 /* OpenBracketToken */:
                         statement.expression = parseArrayLiteralExpression();
                         break;
-                    case 102 /* TrueKeyword */:
-                    case 87 /* FalseKeyword */:
-                    case 96 /* NullKeyword */:
+                    case 103 /* TrueKeyword */:
+                    case 88 /* FalseKeyword */:
+                    case 97 /* NullKeyword */:
                         statement.expression = parseTokenNode();
                         break;
                     case 39 /* MinusToken */:
@@ -17312,7 +17541,7 @@ var ts;
         function createSourceFile(fileName, languageVersion, scriptKind, isDeclarationFile) {
             // code from createNode is inlined here so createNode won't have to deal with special case of creating source files
             // this is quite rare comparing to other nodes and createNode should be as fast as possible
-            var sourceFile = new SourceFileConstructor(284 /* SourceFile */, /*pos*/ 0, /* end */ sourceText.length);
+            var sourceFile = new SourceFileConstructor(285 /* SourceFile */, /*pos*/ 0, /* end */ sourceText.length);
             nodeCount++;
             sourceFile.text = sourceText;
             sourceFile.bindDiagnostics = [];
@@ -17455,6 +17684,9 @@ var ts;
         function nextToken() {
             return currentToken = scanner.scan();
         }
+        function nextTokenJSDoc() {
+            return currentToken = scanner.scanJsDocToken();
+        }
         function reScanGreaterToken() {
             return currentToken = scanner.reScanGreaterToken();
         }
@@ -17520,20 +17752,20 @@ var ts;
         }
         // Ignore strict mode flag because we will report an error in type checker instead.
         function isIdentifier() {
-            if (token() === 72 /* Identifier */) {
+            if (token() === 73 /* Identifier */) {
                 return true;
             }
             // If we have a 'yield' keyword, and we're in the [yield] context, then 'yield' is
             // considered a keyword and is not an identifier.
-            if (token() === 117 /* YieldKeyword */ && inYieldContext()) {
+            if (token() === 118 /* YieldKeyword */ && inYieldContext()) {
                 return false;
             }
             // If we have a 'await' keyword, and we're in the [Await] context, then 'await' is
             // considered a keyword and is not an identifier.
-            if (token() === 122 /* AwaitKeyword */ && inAwaitContext()) {
+            if (token() === 123 /* AwaitKeyword */ && inAwaitContext()) {
                 return false;
             }
-            return token() > 108 /* LastReservedWord */;
+            return token() > 109 /* LastReservedWord */;
         }
         function parseExpected(kind, diagnosticMessage, shouldAdvance) {
             if (shouldAdvance === void 0) { shouldAdvance = true; }
@@ -17552,6 +17784,14 @@ var ts;
             }
             return false;
         }
+        function parseExpectedJSDoc(kind) {
+            if (token() === kind) {
+                nextTokenJSDoc();
+                return true;
+            }
+            parseErrorAtCurrentToken(ts.Diagnostics._0_expected, ts.tokenToString(kind));
+            return false;
+        }
         function parseOptional(t) {
             if (token() === t) {
                 nextToken();
@@ -17565,15 +17805,30 @@ var ts;
             }
             return undefined;
         }
+        function parseOptionalTokenJSDoc(t) {
+            if (token() === t) {
+                return parseTokenNodeJSDoc();
+            }
+            return undefined;
+        }
         function parseExpectedToken(t, diagnosticMessage, arg0) {
             return parseOptionalToken(t) ||
                 createMissingNode(t, /*reportAtCurrentPosition*/ false, diagnosticMessage || ts.Diagnostics._0_expected, arg0 || ts.tokenToString(t));
         }
+        function parseExpectedTokenJSDoc(t) {
+            return parseOptionalTokenJSDoc(t) ||
+                createMissingNode(t, /*reportAtCurrentPosition*/ false, ts.Diagnostics._0_expected, ts.tokenToString(t));
+        }
         function parseTokenNode() {
             var node = createNode(token());
             nextToken();
             return finishNode(node);
         }
+        function parseTokenNodeJSDoc() {
+            var node = createNode(token());
+            nextTokenJSDoc();
+            return finishNode(node);
+        }
         function canParseSemicolon() {
             // If there's a real semicolon, then we can always parse it out.
             if (token() === 26 /* SemicolonToken */) {
@@ -17598,7 +17853,7 @@ var ts;
             nodeCount++;
             var p = pos >= 0 ? pos : scanner.getStartPos();
             return ts.isNodeKind(kind) || kind === 0 /* Unknown */ ? new NodeConstructor(kind, p, p) :
-                kind === 72 /* Identifier */ ? new IdentifierConstructor(kind, p, p) :
+                kind === 73 /* Identifier */ ? new IdentifierConstructor(kind, p, p) :
                     new TokenConstructor(kind, p, p);
         }
         function createNodeWithJSDoc(kind, pos) {
@@ -17640,7 +17895,7 @@ var ts;
                 parseErrorAtCurrentToken(diagnosticMessage, arg0);
             }
             var result = createNode(kind);
-            if (kind === 72 /* Identifier */) {
+            if (kind === 73 /* Identifier */) {
                 result.escapedText = "";
             }
             else if (ts.isLiteralKind(kind) || ts.isTemplateLiteralKind(kind)) {
@@ -17661,9 +17916,9 @@ var ts;
         function createIdentifier(isIdentifier, diagnosticMessage) {
             identifierCount++;
             if (isIdentifier) {
-                var node = createNode(72 /* Identifier */);
+                var node = createNode(73 /* Identifier */);
                 // Store original token kind if it is not just an Identifier so we can report appropriate error later in type checker
-                if (token() !== 72 /* Identifier */) {
+                if (token() !== 73 /* Identifier */) {
                     node.originalKeywordKind = token();
                 }
                 node.escapedText = ts.escapeLeadingUnderscores(internIdentifier(scanner.getTokenValue()));
@@ -17672,7 +17927,7 @@ var ts;
             }
             // Only for end of file because the error gets reported incorrectly on embedded script tags.
             var reportAtCurrentPosition = token() === 1 /* EndOfFileToken */;
-            return createMissingNode(72 /* Identifier */, reportAtCurrentPosition, diagnosticMessage || ts.Diagnostics.Identifier_expected);
+            return createMissingNode(73 /* Identifier */, reportAtCurrentPosition, diagnosticMessage || ts.Diagnostics.Identifier_expected);
         }
         function parseIdentifier(diagnosticMessage) {
             return createIdentifier(isIdentifier(), diagnosticMessage);
@@ -17703,7 +17958,7 @@ var ts;
             // PropertyName [Yield]:
             //      LiteralPropertyName
             //      ComputedPropertyName[?Yield]
-            var node = createNode(149 /* ComputedPropertyName */);
+            var node = createNode(150 /* ComputedPropertyName */);
             parseExpected(22 /* OpenBracketToken */);
             // We parse any expression (including a comma expression). But the grammar
             // says that only an assignment expression is allowed, so the grammar checker
@@ -17724,20 +17979,20 @@ var ts;
         }
         function nextTokenCanFollowModifier() {
             switch (token()) {
-                case 77 /* ConstKeyword */:
+                case 78 /* ConstKeyword */:
                     // 'const' is only a modifier if followed by 'enum'.
-                    return nextToken() === 84 /* EnumKeyword */;
-                case 85 /* ExportKeyword */:
+                    return nextToken() === 85 /* EnumKeyword */;
+                case 86 /* ExportKeyword */:
                     nextToken();
-                    if (token() === 80 /* DefaultKeyword */) {
+                    if (token() === 81 /* DefaultKeyword */) {
                         return lookAhead(nextTokenCanFollowDefaultKeyword);
                     }
-                    return token() !== 40 /* AsteriskToken */ && token() !== 119 /* AsKeyword */ && token() !== 18 /* OpenBraceToken */ && canFollowModifier();
-                case 80 /* DefaultKeyword */:
+                    return token() !== 40 /* AsteriskToken */ && token() !== 120 /* AsKeyword */ && token() !== 18 /* OpenBraceToken */ && canFollowModifier();
+                case 81 /* DefaultKeyword */:
                     return nextTokenCanFollowDefaultKeyword();
-                case 116 /* StaticKeyword */:
-                case 126 /* GetKeyword */:
-                case 137 /* SetKeyword */:
+                case 117 /* StaticKeyword */:
+                case 127 /* GetKeyword */:
+                case 138 /* SetKeyword */:
                     nextToken();
                     return canFollowModifier();
                 default:
@@ -17756,10 +18011,10 @@ var ts;
         }
         function nextTokenCanFollowDefaultKeyword() {
             nextToken();
-            return token() === 76 /* ClassKeyword */ || token() === 90 /* FunctionKeyword */ ||
-                token() === 110 /* InterfaceKeyword */ ||
-                (token() === 118 /* AbstractKeyword */ && lookAhead(nextTokenIsClassKeywordOnSameLine)) ||
-                (token() === 121 /* AsyncKeyword */ && lookAhead(nextTokenIsFunctionKeywordOnSameLine));
+            return token() === 77 /* ClassKeyword */ || token() === 91 /* FunctionKeyword */ ||
+                token() === 111 /* InterfaceKeyword */ ||
+                (token() === 119 /* AbstractKeyword */ && lookAhead(nextTokenIsClassKeywordOnSameLine)) ||
+                (token() === 122 /* AsyncKeyword */ && lookAhead(nextTokenIsFunctionKeywordOnSameLine));
         }
         // True if positioned at the start of a list element
         function isListElement(parsingContext, inErrorRecovery) {
@@ -17779,7 +18034,7 @@ var ts;
                     // outer module.  We just want to consume and move on.
                     return !(token() === 26 /* SemicolonToken */ && inErrorRecovery) && isStartOfStatement();
                 case 2 /* SwitchClauses */:
-                    return token() === 74 /* CaseKeyword */ || token() === 80 /* DefaultKeyword */;
+                    return token() === 75 /* CaseKeyword */ || token() === 81 /* DefaultKeyword */;
                 case 4 /* TypeMembers */:
                     return lookAhead(isTypeMemberStart);
                 case 5 /* ClassMembers */:
@@ -17865,7 +18120,7 @@ var ts;
                 //      extends {} extends
                 //      extends {} implements
                 var next = nextToken();
-                return next === 27 /* CommaToken */ || next === 18 /* OpenBraceToken */ || next === 86 /* ExtendsKeyword */ || next === 109 /* ImplementsKeyword */;
+                return next === 27 /* CommaToken */ || next === 18 /* OpenBraceToken */ || next === 87 /* ExtendsKeyword */ || next === 110 /* ImplementsKeyword */;
             }
             return true;
         }
@@ -17882,8 +18137,8 @@ var ts;
             return ts.tokenIsIdentifierOrKeywordOrGreaterThan(token());
         }
         function isHeritageClauseExtendsOrImplementsKeyword() {
-            if (token() === 109 /* ImplementsKeyword */ ||
-                token() === 86 /* ExtendsKeyword */) {
+            if (token() === 110 /* ImplementsKeyword */ ||
+                token() === 87 /* ExtendsKeyword */) {
                 return lookAhead(nextTokenIsStartOfExpression);
             }
             return false;
@@ -17913,14 +18168,14 @@ var ts;
                 case 23 /* ImportOrExportSpecifiers */:
                     return token() === 19 /* CloseBraceToken */;
                 case 3 /* SwitchClauseStatements */:
-                    return token() === 19 /* CloseBraceToken */ || token() === 74 /* CaseKeyword */ || token() === 80 /* DefaultKeyword */;
+                    return token() === 19 /* CloseBraceToken */ || token() === 75 /* CaseKeyword */ || token() === 81 /* DefaultKeyword */;
                 case 7 /* HeritageClauseElement */:
-                    return token() === 18 /* OpenBraceToken */ || token() === 86 /* ExtendsKeyword */ || token() === 109 /* ImplementsKeyword */;
+                    return token() === 18 /* OpenBraceToken */ || token() === 87 /* ExtendsKeyword */ || token() === 110 /* ImplementsKeyword */;
                 case 8 /* VariableDeclarations */:
                     return isVariableDeclaratorListTerminator();
                 case 19 /* TypeParameters */:
                     // Tokens other than '>' are here for better error recovery
-                    return token() === 30 /* GreaterThanToken */ || token() === 20 /* OpenParenToken */ || token() === 18 /* OpenBraceToken */ || token() === 86 /* ExtendsKeyword */ || token() === 109 /* ImplementsKeyword */;
+                    return token() === 30 /* GreaterThanToken */ || token() === 20 /* OpenParenToken */ || token() === 18 /* OpenBraceToken */ || token() === 87 /* ExtendsKeyword */ || token() === 110 /* ImplementsKeyword */;
                 case 11 /* ArgumentExpressions */:
                     // Tokens other than ')' are here for better error recovery
                     return token() === 21 /* CloseParenToken */ || token() === 26 /* SemicolonToken */;
@@ -18137,20 +18392,20 @@ var ts;
         function isReusableClassMember(node) {
             if (node) {
                 switch (node.kind) {
-                    case 157 /* Constructor */:
-                    case 162 /* IndexSignature */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
-                    case 154 /* PropertyDeclaration */:
-                    case 217 /* SemicolonClassElement */:
+                    case 158 /* Constructor */:
+                    case 163 /* IndexSignature */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
+                    case 155 /* PropertyDeclaration */:
+                    case 218 /* SemicolonClassElement */:
                         return true;
-                    case 156 /* MethodDeclaration */:
+                    case 157 /* MethodDeclaration */:
                         // Method declarations are not necessarily reusable.  An object-literal
                         // may have a method calls "constructor(...)" and we must reparse that
                         // into an actual .ConstructorDeclaration.
                         var methodDeclaration = node;
-                        var nameIsConstructor = methodDeclaration.name.kind === 72 /* Identifier */ &&
-                            methodDeclaration.name.originalKeywordKind === 124 /* ConstructorKeyword */;
+                        var nameIsConstructor = methodDeclaration.name.kind === 73 /* Identifier */ &&
+                            methodDeclaration.name.originalKeywordKind === 125 /* ConstructorKeyword */;
                         return !nameIsConstructor;
                 }
             }
@@ -18159,8 +18414,8 @@ var ts;
         function isReusableSwitchClause(node) {
             if (node) {
                 switch (node.kind) {
-                    case 271 /* CaseClause */:
-                    case 272 /* DefaultClause */:
+                    case 272 /* CaseClause */:
+                    case 273 /* DefaultClause */:
                         return true;
                 }
             }
@@ -18169,58 +18424,58 @@ var ts;
         function isReusableStatement(node) {
             if (node) {
                 switch (node.kind) {
-                    case 239 /* FunctionDeclaration */:
-                    case 219 /* VariableStatement */:
-                    case 218 /* Block */:
-                    case 222 /* IfStatement */:
-                    case 221 /* ExpressionStatement */:
-                    case 234 /* ThrowStatement */:
-                    case 230 /* ReturnStatement */:
-                    case 232 /* SwitchStatement */:
-                    case 229 /* BreakStatement */:
-                    case 228 /* ContinueStatement */:
-                    case 226 /* ForInStatement */:
-                    case 227 /* ForOfStatement */:
-                    case 225 /* ForStatement */:
-                    case 224 /* WhileStatement */:
-                    case 231 /* WithStatement */:
-                    case 220 /* EmptyStatement */:
-                    case 235 /* TryStatement */:
-                    case 233 /* LabeledStatement */:
-                    case 223 /* DoStatement */:
-                    case 236 /* DebuggerStatement */:
-                    case 249 /* ImportDeclaration */:
-                    case 248 /* ImportEqualsDeclaration */:
-                    case 255 /* ExportDeclaration */:
-                    case 254 /* ExportAssignment */:
-                    case 244 /* ModuleDeclaration */:
-                    case 240 /* ClassDeclaration */:
-                    case 241 /* InterfaceDeclaration */:
-                    case 243 /* EnumDeclaration */:
-                    case 242 /* TypeAliasDeclaration */:
+                    case 240 /* FunctionDeclaration */:
+                    case 220 /* VariableStatement */:
+                    case 219 /* Block */:
+                    case 223 /* IfStatement */:
+                    case 222 /* ExpressionStatement */:
+                    case 235 /* ThrowStatement */:
+                    case 231 /* ReturnStatement */:
+                    case 233 /* SwitchStatement */:
+                    case 230 /* BreakStatement */:
+                    case 229 /* ContinueStatement */:
+                    case 227 /* ForInStatement */:
+                    case 228 /* ForOfStatement */:
+                    case 226 /* ForStatement */:
+                    case 225 /* WhileStatement */:
+                    case 232 /* WithStatement */:
+                    case 221 /* EmptyStatement */:
+                    case 236 /* TryStatement */:
+                    case 234 /* LabeledStatement */:
+                    case 224 /* DoStatement */:
+                    case 237 /* DebuggerStatement */:
+                    case 250 /* ImportDeclaration */:
+                    case 249 /* ImportEqualsDeclaration */:
+                    case 256 /* ExportDeclaration */:
+                    case 255 /* ExportAssignment */:
+                    case 245 /* ModuleDeclaration */:
+                    case 241 /* ClassDeclaration */:
+                    case 242 /* InterfaceDeclaration */:
+                    case 244 /* EnumDeclaration */:
+                    case 243 /* TypeAliasDeclaration */:
                         return true;
                 }
             }
             return false;
         }
         function isReusableEnumMember(node) {
-            return node.kind === 278 /* EnumMember */;
+            return node.kind === 279 /* EnumMember */;
         }
         function isReusableTypeMember(node) {
             if (node) {
                 switch (node.kind) {
-                    case 161 /* ConstructSignature */:
-                    case 155 /* MethodSignature */:
-                    case 162 /* IndexSignature */:
-                    case 153 /* PropertySignature */:
-                    case 160 /* CallSignature */:
+                    case 162 /* ConstructSignature */:
+                    case 156 /* MethodSignature */:
+                    case 163 /* IndexSignature */:
+                    case 154 /* PropertySignature */:
+                    case 161 /* CallSignature */:
                         return true;
                 }
             }
             return false;
         }
         function isReusableVariableDeclaration(node) {
-            if (node.kind !== 237 /* VariableDeclaration */) {
+            if (node.kind !== 238 /* VariableDeclaration */) {
                 return false;
             }
             // Very subtle incremental parsing bug.  Consider the following code:
@@ -18241,7 +18496,7 @@ var ts;
             return variableDeclarator.initializer === undefined;
         }
         function isReusableParameter(node) {
-            if (node.kind !== 151 /* Parameter */) {
+            if (node.kind !== 152 /* Parameter */) {
                 return false;
             }
             // See the comment in isReusableVariableDeclaration for why we do this.
@@ -18377,7 +18632,7 @@ var ts;
             return entity;
         }
         function createQualifiedName(entity, name) {
-            var node = createNode(148 /* QualifiedName */, entity.pos);
+            var node = createNode(149 /* QualifiedName */, entity.pos);
             node.left = entity;
             node.right = name;
             return finishNode(node);
@@ -18408,13 +18663,13 @@ var ts;
                     // Report that we need an identifier.  However, report it right after the dot,
                     // and not on the next token.  This is because the next token might actually
                     // be an identifier and the error would be quite confusing.
-                    return createMissingNode(72 /* Identifier */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Identifier_expected);
+                    return createMissingNode(73 /* Identifier */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Identifier_expected);
                 }
             }
             return allowIdentifierNames ? parseIdentifierName() : parseIdentifier();
         }
         function parseTemplateExpression() {
-            var template = createNode(206 /* TemplateExpression */);
+            var template = createNode(207 /* TemplateExpression */);
             template.head = parseTemplateHead();
             ts.Debug.assert(template.head.kind === 15 /* TemplateHead */, "Template head has wrong token kind");
             var list = [];
@@ -18426,7 +18681,7 @@ var ts;
             return finishNode(template);
         }
         function parseTemplateSpan() {
-            var span = createNode(216 /* TemplateSpan */);
+            var span = createNode(217 /* TemplateSpan */);
             span.expression = allowInAnd(parseExpression);
             var literal;
             if (token() === 19 /* CloseBraceToken */) {
@@ -18476,7 +18731,7 @@ var ts;
         }
         // TYPES
         function parseTypeReference() {
-            var node = createNode(164 /* TypeReference */);
+            var node = createNode(165 /* TypeReference */);
             node.typeName = parseEntityName(/*allowReservedWords*/ true, ts.Diagnostics.Type_expected);
             if (!scanner.hasPrecedingLineBreak() && reScanLessThanToken() === 28 /* LessThanToken */) {
                 node.typeArguments = parseBracketedList(20 /* TypeArguments */, parseType, 28 /* LessThanToken */, 30 /* GreaterThanToken */);
@@ -18486,14 +18741,14 @@ var ts;
         // If true, we should abort parsing an error function.
         function typeHasArrowFunctionBlockingParseError(node) {
             switch (node.kind) {
-                case 164 /* TypeReference */:
+                case 165 /* TypeReference */:
                     return ts.nodeIsMissing(node.typeName);
-                case 165 /* FunctionType */:
-                case 166 /* ConstructorType */: {
+                case 166 /* FunctionType */:
+                case 167 /* ConstructorType */: {
                     var _a = node, parameters = _a.parameters, type = _a.type;
                     return isMissingList(parameters) || typeHasArrowFunctionBlockingParseError(type);
                 }
-                case 177 /* ParenthesizedType */:
+                case 178 /* ParenthesizedType */:
                     return typeHasArrowFunctionBlockingParseError(node.type);
                 default:
                     return false;
@@ -18501,20 +18756,20 @@ var ts;
         }
         function parseThisTypePredicate(lhs) {
             nextToken();
-            var node = createNode(163 /* TypePredicate */, lhs.pos);
+            var node = createNode(164 /* TypePredicate */, lhs.pos);
             node.parameterName = lhs;
             node.type = parseType();
             return finishNode(node);
         }
         function parseThisTypeNode() {
-            var node = createNode(178 /* ThisType */);
+            var node = createNode(179 /* ThisType */);
             nextToken();
             return finishNode(node);
         }
         function parseJSDocAllType(postFixEquals) {
-            var result = createNode(289 /* JSDocAllType */);
+            var result = createNode(290 /* JSDocAllType */);
             if (postFixEquals) {
-                return createPostfixType(293 /* JSDocOptionalType */, result);
+                return createPostfixType(294 /* JSDocOptionalType */, result);
             }
             else {
                 nextToken();
@@ -18522,7 +18777,7 @@ var ts;
             return finishNode(result);
         }
         function parseJSDocNonNullableType() {
-            var result = createNode(292 /* JSDocNonNullableType */);
+            var result = createNode(293 /* JSDocNonNullableType */);
             nextToken();
             result.type = parseNonArrayType();
             return finishNode(result);
@@ -18544,31 +18799,31 @@ var ts;
                 token() === 19 /* CloseBraceToken */ ||
                 token() === 21 /* CloseParenToken */ ||
                 token() === 30 /* GreaterThanToken */ ||
-                token() === 59 /* EqualsToken */ ||
+                token() === 60 /* EqualsToken */ ||
                 token() === 50 /* BarToken */) {
-                var result = createNode(290 /* JSDocUnknownType */, pos);
+                var result = createNode(291 /* JSDocUnknownType */, pos);
                 return finishNode(result);
             }
             else {
-                var result = createNode(291 /* JSDocNullableType */, pos);
+                var result = createNode(292 /* JSDocNullableType */, pos);
                 result.type = parseType();
                 return finishNode(result);
             }
         }
         function parseJSDocFunctionType() {
             if (lookAhead(nextTokenIsOpenParen)) {
-                var result = createNodeWithJSDoc(294 /* JSDocFunctionType */);
+                var result = createNodeWithJSDoc(295 /* JSDocFunctionType */);
                 nextToken();
                 fillSignature(57 /* ColonToken */, 4 /* Type */ | 32 /* JSDoc */, result);
                 return finishNode(result);
             }
-            var node = createNode(164 /* TypeReference */);
+            var node = createNode(165 /* TypeReference */);
             node.typeName = parseIdentifierName();
             return finishNode(node);
         }
         function parseJSDocParameter() {
-            var parameter = createNode(151 /* Parameter */);
-            if (token() === 100 /* ThisKeyword */ || token() === 95 /* NewKeyword */) {
+            var parameter = createNode(152 /* Parameter */);
+            if (token() === 101 /* ThisKeyword */ || token() === 96 /* NewKeyword */) {
                 parameter.name = parseIdentifierName();
                 parseExpected(57 /* ColonToken */);
             }
@@ -18581,25 +18836,25 @@ var ts;
             var type = parseTypeOrTypePredicate();
             scanner.setInJSDocType(false);
             if (dotdotdot) {
-                var variadic = createNode(295 /* JSDocVariadicType */, dotdotdot.pos);
+                var variadic = createNode(296 /* JSDocVariadicType */, dotdotdot.pos);
                 variadic.type = type;
                 type = finishNode(variadic);
             }
-            if (token() === 59 /* EqualsToken */) {
-                return createPostfixType(293 /* JSDocOptionalType */, type);
+            if (token() === 60 /* EqualsToken */) {
+                return createPostfixType(294 /* JSDocOptionalType */, type);
             }
             return type;
         }
         function parseTypeQuery() {
-            var node = createNode(167 /* TypeQuery */);
-            parseExpected(104 /* TypeOfKeyword */);
+            var node = createNode(168 /* TypeQuery */);
+            parseExpected(105 /* TypeOfKeyword */);
             node.exprName = parseEntityName(/*allowReservedWords*/ true);
             return finishNode(node);
         }
         function parseTypeParameter() {
-            var node = createNode(150 /* TypeParameter */);
+            var node = createNode(151 /* TypeParameter */);
             node.name = parseIdentifier();
-            if (parseOptional(86 /* ExtendsKeyword */)) {
+            if (parseOptional(87 /* ExtendsKeyword */)) {
                 // It's not uncommon for people to write improper constraints to a generic.  If the
                 // user writes a constraint that is an expression and not an actual type, then parse
                 // it out as an expression (so we can recover well), but report that a type is needed
@@ -18618,7 +18873,7 @@ var ts;
                     node.expression = parseUnaryExpressionOrHigher();
                 }
             }
-            if (parseOptional(59 /* EqualsToken */)) {
+            if (parseOptional(60 /* EqualsToken */)) {
                 node.default = parseType();
             }
             return finishNode(node);
@@ -18642,8 +18897,8 @@ var ts;
                 isStartOfType(/*inStartOfParameter*/ !isJSDocParameter);
         }
         function parseParameter() {
-            var node = createNodeWithJSDoc(151 /* Parameter */);
-            if (token() === 100 /* ThisKeyword */) {
+            var node = createNodeWithJSDoc(152 /* Parameter */);
+            if (token() === 101 /* ThisKeyword */) {
                 node.name = createIdentifier(/*isIdentifier*/ true);
                 node.type = parseParameterType();
                 return finishNode(node);
@@ -18743,8 +18998,8 @@ var ts;
         }
         function parseSignatureMember(kind) {
             var node = createNodeWithJSDoc(kind);
-            if (kind === 161 /* ConstructSignature */) {
-                parseExpected(95 /* NewKeyword */);
+            if (kind === 162 /* ConstructSignature */) {
+                parseExpected(96 /* NewKeyword */);
             }
             fillSignature(57 /* ColonToken */, 4 /* Type */, node);
             parseTypeMemberSemicolon();
@@ -18804,7 +19059,7 @@ var ts;
             return token() === 57 /* ColonToken */ || token() === 27 /* CommaToken */ || token() === 23 /* CloseBracketToken */;
         }
         function parseIndexSignatureDeclaration(node) {
-            node.kind = 162 /* IndexSignature */;
+            node.kind = 163 /* IndexSignature */;
             node.parameters = parseBracketedList(16 /* Parameters */, parseParameter, 22 /* OpenBracketToken */, 23 /* CloseBracketToken */);
             node.type = parseTypeAnnotation();
             parseTypeMemberSemicolon();
@@ -18814,15 +19069,15 @@ var ts;
             node.name = parsePropertyName();
             node.questionToken = parseOptionalToken(56 /* QuestionToken */);
             if (token() === 20 /* OpenParenToken */ || token() === 28 /* LessThanToken */) {
-                node.kind = 155 /* MethodSignature */;
+                node.kind = 156 /* MethodSignature */;
                 // Method signatures don't exist in expression contexts.  So they have neither
                 // [Yield] nor [Await]
                 fillSignature(57 /* ColonToken */, 4 /* Type */, node);
             }
             else {
-                node.kind = 153 /* PropertySignature */;
+                node.kind = 154 /* PropertySignature */;
                 node.type = parseTypeAnnotation();
-                if (token() === 59 /* EqualsToken */) {
+                if (token() === 60 /* EqualsToken */) {
                     // Although type literal properties cannot not have initializers, we attempt
                     // to parse an initializer so we can report in the checker that an interface
                     // property or type literal property cannot have an initializer.
@@ -18866,10 +19121,10 @@ var ts;
         }
         function parseTypeMember() {
             if (token() === 20 /* OpenParenToken */ || token() === 28 /* LessThanToken */) {
-                return parseSignatureMember(160 /* CallSignature */);
+                return parseSignatureMember(161 /* CallSignature */);
             }
-            if (token() === 95 /* NewKeyword */ && lookAhead(nextTokenIsOpenParenOrLessThan)) {
-                return parseSignatureMember(161 /* ConstructSignature */);
+            if (token() === 96 /* NewKeyword */ && lookAhead(nextTokenIsOpenParenOrLessThan)) {
+                return parseSignatureMember(162 /* ConstructSignature */);
             }
             var node = createNodeWithJSDoc(0 /* Unknown */);
             node.modifiers = parseModifiers();
@@ -18895,7 +19150,7 @@ var ts;
             return false;
         }
         function parseTypeLiteral() {
-            var node = createNode(168 /* TypeLiteral */);
+            var node = createNode(169 /* TypeLiteral */);
             node.members = parseObjectTypeMembers();
             return finishNode(node);
         }
@@ -18913,27 +19168,27 @@ var ts;
         function isStartOfMappedType() {
             nextToken();
             if (token() === 38 /* PlusToken */ || token() === 39 /* MinusToken */) {
-                return nextToken() === 133 /* ReadonlyKeyword */;
+                return nextToken() === 134 /* ReadonlyKeyword */;
             }
-            if (token() === 133 /* ReadonlyKeyword */) {
+            if (token() === 134 /* ReadonlyKeyword */) {
                 nextToken();
             }
-            return token() === 22 /* OpenBracketToken */ && nextTokenIsIdentifier() && nextToken() === 93 /* InKeyword */;
+            return token() === 22 /* OpenBracketToken */ && nextTokenIsIdentifier() && nextToken() === 94 /* InKeyword */;
         }
         function parseMappedTypeParameter() {
-            var node = createNode(150 /* TypeParameter */);
+            var node = createNode(151 /* TypeParameter */);
             node.name = parseIdentifier();
-            parseExpected(93 /* InKeyword */);
+            parseExpected(94 /* InKeyword */);
             node.constraint = parseType();
             return finishNode(node);
         }
         function parseMappedType() {
-            var node = createNode(181 /* MappedType */);
+            var node = createNode(182 /* MappedType */);
             parseExpected(18 /* OpenBraceToken */);
-            if (token() === 133 /* ReadonlyKeyword */ || token() === 38 /* PlusToken */ || token() === 39 /* MinusToken */) {
+            if (token() === 134 /* ReadonlyKeyword */ || token() === 38 /* PlusToken */ || token() === 39 /* MinusToken */) {
                 node.readonlyToken = parseTokenNode();
-                if (node.readonlyToken.kind !== 133 /* ReadonlyKeyword */) {
-                    parseExpectedToken(133 /* ReadonlyKeyword */);
+                if (node.readonlyToken.kind !== 134 /* ReadonlyKeyword */) {
+                    parseExpectedToken(134 /* ReadonlyKeyword */);
                 }
             }
             parseExpected(22 /* OpenBracketToken */);
@@ -18953,23 +19208,23 @@ var ts;
         function parseTupleElementType() {
             var pos = getNodePos();
             if (parseOptional(25 /* DotDotDotToken */)) {
-                var node = createNode(172 /* RestType */, pos);
+                var node = createNode(173 /* RestType */, pos);
                 node.type = parseType();
                 return finishNode(node);
             }
             var type = parseType();
-            if (!(contextFlags & 2097152 /* JSDoc */) && type.kind === 291 /* JSDocNullableType */ && type.pos === type.type.pos) {
-                type.kind = 171 /* OptionalType */;
+            if (!(contextFlags & 2097152 /* JSDoc */) && type.kind === 292 /* JSDocNullableType */ && type.pos === type.type.pos) {
+                type.kind = 172 /* OptionalType */;
             }
             return type;
         }
         function parseTupleType() {
-            var node = createNode(170 /* TupleType */);
+            var node = createNode(171 /* TupleType */);
             node.elementTypes = parseBracketedList(21 /* TupleElementTypes */, parseTupleElementType, 22 /* OpenBracketToken */, 23 /* CloseBracketToken */);
             return finishNode(node);
         }
         function parseParenthesizedType() {
-            var node = createNode(177 /* ParenthesizedType */);
+            var node = createNode(178 /* ParenthesizedType */);
             parseExpected(20 /* OpenParenToken */);
             node.type = parseType();
             parseExpected(21 /* CloseParenToken */);
@@ -18977,7 +19232,7 @@ var ts;
         }
         function parseFunctionOrConstructorType() {
             var pos = getNodePos();
-            var kind = parseOptional(95 /* NewKeyword */) ? 166 /* ConstructorType */ : 165 /* FunctionType */;
+            var kind = parseOptional(96 /* NewKeyword */) ? 167 /* ConstructorType */ : 166 /* FunctionType */;
             var node = createNodeWithJSDoc(kind, pos);
             fillSignature(37 /* EqualsGreaterThanToken */, 4 /* Type */, node);
             return finishNode(node);
@@ -18987,14 +19242,14 @@ var ts;
             return token() === 24 /* DotToken */ ? undefined : node;
         }
         function parseLiteralTypeNode(negative) {
-            var node = createNode(182 /* LiteralType */);
+            var node = createNode(183 /* LiteralType */);
             var unaryMinusExpression;
             if (negative) {
-                unaryMinusExpression = createNode(202 /* PrefixUnaryExpression */);
+                unaryMinusExpression = createNode(203 /* PrefixUnaryExpression */);
                 unaryMinusExpression.operator = 39 /* MinusToken */;
                 nextToken();
             }
-            var expression = token() === 102 /* TrueKeyword */ || token() === 87 /* FalseKeyword */
+            var expression = token() === 103 /* TrueKeyword */ || token() === 88 /* FalseKeyword */
                 ? parseTokenNode()
                 : parseLiteralLikeNode(token());
             if (negative) {
@@ -19007,22 +19262,24 @@ var ts;
         }
         function isStartOfTypeOfImportType() {
             nextToken();
-            return token() === 92 /* ImportKeyword */;
+            return token() === 93 /* ImportKeyword */;
         }
         function parseImportType() {
             sourceFile.flags |= 524288 /* PossiblyContainsDynamicImport */;
-            var node = createNode(183 /* ImportType */);
-            if (parseOptional(104 /* TypeOfKeyword */)) {
+            var node = createNode(184 /* ImportType */);
+            if (parseOptional(105 /* TypeOfKeyword */)) {
                 node.isTypeOf = true;
             }
-            parseExpected(92 /* ImportKeyword */);
+            parseExpected(93 /* ImportKeyword */);
             parseExpected(20 /* OpenParenToken */);
             node.argument = parseType();
             parseExpected(21 /* CloseParenToken */);
             if (parseOptional(24 /* DotToken */)) {
                 node.qualifier = parseEntityName(/*allowReservedWords*/ true, ts.Diagnostics.Type_expected);
             }
-            node.typeArguments = tryParseTypeArguments();
+            if (!scanner.hasPrecedingLineBreak() && reScanLessThanToken() === 28 /* LessThanToken */) {
+                node.typeArguments = parseBracketedList(20 /* TypeArguments */, parseType, 28 /* LessThanToken */, 30 /* GreaterThanToken */);
+            }
             return finishNode(node);
         }
         function nextTokenIsNumericOrBigIntLiteral() {
@@ -19031,25 +19288,25 @@ var ts;
         }
         function parseNonArrayType() {
             switch (token()) {
-                case 120 /* AnyKeyword */:
-                case 143 /* UnknownKeyword */:
-                case 138 /* StringKeyword */:
-                case 135 /* NumberKeyword */:
-                case 146 /* BigIntKeyword */:
-                case 139 /* SymbolKeyword */:
-                case 123 /* BooleanKeyword */:
-                case 141 /* UndefinedKeyword */:
-                case 132 /* NeverKeyword */:
-                case 136 /* ObjectKeyword */:
+                case 121 /* AnyKeyword */:
+                case 144 /* UnknownKeyword */:
+                case 139 /* StringKeyword */:
+                case 136 /* NumberKeyword */:
+                case 147 /* BigIntKeyword */:
+                case 140 /* SymbolKeyword */:
+                case 124 /* BooleanKeyword */:
+                case 142 /* UndefinedKeyword */:
+                case 133 /* NeverKeyword */:
+                case 137 /* ObjectKeyword */:
                     // If these are followed by a dot, then parse these out as a dotted type reference instead.
                     return tryParse(parseKeywordAndNoDot) || parseTypeReference();
                 case 40 /* AsteriskToken */:
                     return parseJSDocAllType(/*postfixEquals*/ false);
-                case 62 /* AsteriskEqualsToken */:
+                case 63 /* AsteriskEqualsToken */:
                     return parseJSDocAllType(/*postfixEquals*/ true);
                 case 56 /* QuestionToken */:
                     return parseJSDocUnknownOrNullableType();
-                case 90 /* FunctionKeyword */:
+                case 91 /* FunctionKeyword */:
                     return parseJSDocFunctionType();
                 case 52 /* ExclamationToken */:
                     return parseJSDocNonNullableType();
@@ -19057,24 +19314,24 @@ var ts;
                 case 10 /* StringLiteral */:
                 case 8 /* NumericLiteral */:
                 case 9 /* BigIntLiteral */:
-                case 102 /* TrueKeyword */:
-                case 87 /* FalseKeyword */:
+                case 103 /* TrueKeyword */:
+                case 88 /* FalseKeyword */:
                     return parseLiteralTypeNode();
                 case 39 /* MinusToken */:
                     return lookAhead(nextTokenIsNumericOrBigIntLiteral) ? parseLiteralTypeNode(/*negative*/ true) : parseTypeReference();
-                case 106 /* VoidKeyword */:
-                case 96 /* NullKeyword */:
+                case 107 /* VoidKeyword */:
+                case 97 /* NullKeyword */:
                     return parseTokenNode();
-                case 100 /* ThisKeyword */: {
+                case 101 /* ThisKeyword */: {
                     var thisKeyword = parseThisTypeNode();
-                    if (token() === 128 /* IsKeyword */ && !scanner.hasPrecedingLineBreak()) {
+                    if (token() === 129 /* IsKeyword */ && !scanner.hasPrecedingLineBreak()) {
                         return parseThisTypePredicate(thisKeyword);
                     }
                     else {
                         return thisKeyword;
                     }
                 }
-                case 104 /* TypeOfKeyword */:
+                case 105 /* TypeOfKeyword */:
                     return lookAhead(isStartOfTypeOfImportType) ? parseImportType() : parseTypeQuery();
                 case 18 /* OpenBraceToken */:
                     return lookAhead(isStartOfMappedType) ? parseMappedType() : parseTypeLiteral();
@@ -19082,7 +19339,7 @@ var ts;
                     return parseTupleType();
                 case 20 /* OpenParenToken */:
                     return parseParenthesizedType();
-                case 92 /* ImportKeyword */:
+                case 93 /* ImportKeyword */:
                     return parseImportType();
                 default:
                     return parseTypeReference();
@@ -19090,41 +19347,41 @@ var ts;
         }
         function isStartOfType(inStartOfParameter) {
             switch (token()) {
-                case 120 /* AnyKeyword */:
-                case 143 /* UnknownKeyword */:
-                case 138 /* StringKeyword */:
-                case 135 /* NumberKeyword */:
-                case 146 /* BigIntKeyword */:
-                case 123 /* BooleanKeyword */:
-                case 133 /* ReadonlyKeyword */:
-                case 139 /* SymbolKeyword */:
-                case 142 /* UniqueKeyword */:
-                case 106 /* VoidKeyword */:
-                case 141 /* UndefinedKeyword */:
-                case 96 /* NullKeyword */:
-                case 100 /* ThisKeyword */:
-                case 104 /* TypeOfKeyword */:
-                case 132 /* NeverKeyword */:
+                case 121 /* AnyKeyword */:
+                case 144 /* UnknownKeyword */:
+                case 139 /* StringKeyword */:
+                case 136 /* NumberKeyword */:
+                case 147 /* BigIntKeyword */:
+                case 124 /* BooleanKeyword */:
+                case 134 /* ReadonlyKeyword */:
+                case 140 /* SymbolKeyword */:
+                case 143 /* UniqueKeyword */:
+                case 107 /* VoidKeyword */:
+                case 142 /* UndefinedKeyword */:
+                case 97 /* NullKeyword */:
+                case 101 /* ThisKeyword */:
+                case 105 /* TypeOfKeyword */:
+                case 133 /* NeverKeyword */:
                 case 18 /* OpenBraceToken */:
                 case 22 /* OpenBracketToken */:
                 case 28 /* LessThanToken */:
                 case 50 /* BarToken */:
                 case 49 /* AmpersandToken */:
-                case 95 /* NewKeyword */:
+                case 96 /* NewKeyword */:
                 case 10 /* StringLiteral */:
                 case 8 /* NumericLiteral */:
                 case 9 /* BigIntLiteral */:
-                case 102 /* TrueKeyword */:
-                case 87 /* FalseKeyword */:
-                case 136 /* ObjectKeyword */:
+                case 103 /* TrueKeyword */:
+                case 88 /* FalseKeyword */:
+                case 137 /* ObjectKeyword */:
                 case 40 /* AsteriskToken */:
                 case 56 /* QuestionToken */:
                 case 52 /* ExclamationToken */:
                 case 25 /* DotDotDotToken */:
-                case 127 /* InferKeyword */:
-                case 92 /* ImportKeyword */:
+                case 128 /* InferKeyword */:
+                case 93 /* ImportKeyword */:
                     return true;
-                case 90 /* FunctionKeyword */:
+                case 91 /* FunctionKeyword */:
                     return !inStartOfParameter;
                 case 39 /* MinusToken */:
                     return !inStartOfParameter && lookAhead(nextTokenIsNumericOrBigIntLiteral);
@@ -19145,26 +19402,26 @@ var ts;
             while (!scanner.hasPrecedingLineBreak()) {
                 switch (token()) {
                     case 52 /* ExclamationToken */:
-                        type = createPostfixType(292 /* JSDocNonNullableType */, type);
+                        type = createPostfixType(293 /* JSDocNonNullableType */, type);
                         break;
                     case 56 /* QuestionToken */:
                         // If not in JSDoc and next token is start of a type we have a conditional type
                         if (!(contextFlags & 2097152 /* JSDoc */) && lookAhead(nextTokenIsStartOfType)) {
                             return type;
                         }
-                        type = createPostfixType(291 /* JSDocNullableType */, type);
+                        type = createPostfixType(292 /* JSDocNullableType */, type);
                         break;
                     case 22 /* OpenBracketToken */:
                         parseExpected(22 /* OpenBracketToken */);
                         if (isStartOfType()) {
-                            var node = createNode(180 /* IndexedAccessType */, type.pos);
+                            var node = createNode(181 /* IndexedAccessType */, type.pos);
                             node.objectType = type;
                             node.indexType = parseType();
                             parseExpected(23 /* CloseBracketToken */);
                             type = finishNode(node);
                         }
                         else {
-                            var node = createNode(169 /* ArrayType */, type.pos);
+                            var node = createNode(170 /* ArrayType */, type.pos);
                             node.elementType = type;
                             parseExpected(23 /* CloseBracketToken */);
                             type = finishNode(node);
@@ -19183,16 +19440,16 @@ var ts;
             return finishNode(postfix);
         }
         function parseTypeOperator(operator) {
-            var node = createNode(179 /* TypeOperator */);
+            var node = createNode(180 /* TypeOperator */);
             parseExpected(operator);
             node.operator = operator;
             node.type = parseTypeOperatorOrHigher();
             return finishNode(node);
         }
         function parseInferType() {
-            var node = createNode(176 /* InferType */);
-            parseExpected(127 /* InferKeyword */);
-            var typeParameter = createNode(150 /* TypeParameter */);
+            var node = createNode(177 /* InferType */);
+            parseExpected(128 /* InferKeyword */);
+            var typeParameter = createNode(151 /* TypeParameter */);
             typeParameter.name = parseIdentifier();
             node.typeParameter = finishNode(typeParameter);
             return finishNode(node);
@@ -19200,34 +19457,35 @@ var ts;
         function parseTypeOperatorOrHigher() {
             var operator = token();
             switch (operator) {
-                case 129 /* KeyOfKeyword */:
-                case 142 /* UniqueKeyword */:
-                case 133 /* ReadonlyKeyword */:
+                case 130 /* KeyOfKeyword */:
+                case 143 /* UniqueKeyword */:
+                case 134 /* ReadonlyKeyword */:
                     return parseTypeOperator(operator);
-                case 127 /* InferKeyword */:
+                case 128 /* InferKeyword */:
                     return parseInferType();
             }
             return parsePostfixTypeOrHigher();
         }
         function parseUnionOrIntersectionType(kind, parseConstituentType, operator) {
-            parseOptional(operator);
+            var start = scanner.getStartPos();
+            var hasLeadingOperator = parseOptional(operator);
             var type = parseConstituentType();
-            if (token() === operator) {
+            if (token() === operator || hasLeadingOperator) {
                 var types = [type];
                 while (parseOptional(operator)) {
                     types.push(parseConstituentType());
                 }
-                var node = createNode(kind, type.pos);
-                node.types = createNodeArray(types, type.pos);
+                var node = createNode(kind, start);
+                node.types = createNodeArray(types, start);
                 type = finishNode(node);
             }
             return type;
         }
         function parseIntersectionTypeOrHigher() {
-            return parseUnionOrIntersectionType(174 /* IntersectionType */, parseTypeOperatorOrHigher, 49 /* AmpersandToken */);
+            return parseUnionOrIntersectionType(175 /* IntersectionType */, parseTypeOperatorOrHigher, 49 /* AmpersandToken */);
         }
         function parseUnionTypeOrHigher() {
-            return parseUnionOrIntersectionType(173 /* UnionType */, parseIntersectionTypeOrHigher, 50 /* BarToken */);
+            return parseUnionOrIntersectionType(174 /* UnionType */, parseIntersectionTypeOrHigher, 50 /* BarToken */);
         }
         function isStartOfFunctionType() {
             if (token() === 28 /* LessThanToken */) {
@@ -19240,7 +19498,7 @@ var ts;
                 // Skip modifiers
                 parseModifiers();
             }
-            if (isIdentifier() || token() === 100 /* ThisKeyword */) {
+            if (isIdentifier() || token() === 101 /* ThisKeyword */) {
                 nextToken();
                 return true;
             }
@@ -19263,7 +19521,7 @@ var ts;
                 // We successfully skipped modifiers (if any) and an identifier or binding pattern,
                 // now see if we have something that indicates a parameter declaration
                 if (token() === 57 /* ColonToken */ || token() === 27 /* CommaToken */ ||
-                    token() === 56 /* QuestionToken */ || token() === 59 /* EqualsToken */) {
+                    token() === 56 /* QuestionToken */ || token() === 60 /* EqualsToken */) {
                     // ( xxx :
                     // ( xxx ,
                     // ( xxx ?
@@ -19284,7 +19542,7 @@ var ts;
             var typePredicateVariable = isIdentifier() && tryParse(parseTypePredicatePrefix);
             var type = parseType();
             if (typePredicateVariable) {
-                var node = createNode(163 /* TypePredicate */, typePredicateVariable.pos);
+                var node = createNode(164 /* TypePredicate */, typePredicateVariable.pos);
                 node.parameterName = typePredicateVariable;
                 node.type = type;
                 return finishNode(node);
@@ -19295,7 +19553,7 @@ var ts;
         }
         function parseTypePredicatePrefix() {
             var id = parseIdentifier();
-            if (token() === 128 /* IsKeyword */ && !scanner.hasPrecedingLineBreak()) {
+            if (token() === 129 /* IsKeyword */ && !scanner.hasPrecedingLineBreak()) {
                 nextToken();
                 return id;
             }
@@ -19306,12 +19564,12 @@ var ts;
             return doOutsideOfContext(20480 /* TypeExcludesFlags */, parseTypeWorker);
         }
         function parseTypeWorker(noConditionalTypes) {
-            if (isStartOfFunctionType() || token() === 95 /* NewKeyword */) {
+            if (isStartOfFunctionType() || token() === 96 /* NewKeyword */) {
                 return parseFunctionOrConstructorType();
             }
             var type = parseUnionTypeOrHigher();
-            if (!noConditionalTypes && !scanner.hasPrecedingLineBreak() && parseOptional(86 /* ExtendsKeyword */)) {
-                var node = createNode(175 /* ConditionalType */, type.pos);
+            if (!noConditionalTypes && !scanner.hasPrecedingLineBreak() && parseOptional(87 /* ExtendsKeyword */)) {
+                var node = createNode(176 /* ConditionalType */, type.pos);
                 node.checkType = type;
                 // The type following 'extends' is not permitted to be another conditional type
                 node.extendsType = parseTypeWorker(/*noConditionalTypes*/ true);
@@ -19329,11 +19587,11 @@ var ts;
         // EXPRESSIONS
         function isStartOfLeftHandSideExpression() {
             switch (token()) {
-                case 100 /* ThisKeyword */:
-                case 98 /* SuperKeyword */:
-                case 96 /* NullKeyword */:
-                case 102 /* TrueKeyword */:
-                case 87 /* FalseKeyword */:
+                case 101 /* ThisKeyword */:
+                case 99 /* SuperKeyword */:
+                case 97 /* NullKeyword */:
+                case 103 /* TrueKeyword */:
+                case 88 /* FalseKeyword */:
                 case 8 /* NumericLiteral */:
                 case 9 /* BigIntLiteral */:
                 case 10 /* StringLiteral */:
@@ -19342,14 +19600,14 @@ var ts;
                 case 20 /* OpenParenToken */:
                 case 22 /* OpenBracketToken */:
                 case 18 /* OpenBraceToken */:
-                case 90 /* FunctionKeyword */:
-                case 76 /* ClassKeyword */:
-                case 95 /* NewKeyword */:
+                case 91 /* FunctionKeyword */:
+                case 77 /* ClassKeyword */:
+                case 96 /* NewKeyword */:
                 case 42 /* SlashToken */:
-                case 64 /* SlashEqualsToken */:
-                case 72 /* Identifier */:
+                case 65 /* SlashEqualsToken */:
+                case 73 /* Identifier */:
                     return true;
-                case 92 /* ImportKeyword */:
+                case 93 /* ImportKeyword */:
                     return lookAhead(nextTokenIsOpenParenOrLessThanOrDot);
                 default:
                     return isIdentifier();
@@ -19364,14 +19622,14 @@ var ts;
                 case 39 /* MinusToken */:
                 case 53 /* TildeToken */:
                 case 52 /* ExclamationToken */:
-                case 81 /* DeleteKeyword */:
-                case 104 /* TypeOfKeyword */:
-                case 106 /* VoidKeyword */:
+                case 82 /* DeleteKeyword */:
+                case 105 /* TypeOfKeyword */:
+                case 107 /* VoidKeyword */:
                 case 44 /* PlusPlusToken */:
                 case 45 /* MinusMinusToken */:
                 case 28 /* LessThanToken */:
-                case 122 /* AwaitKeyword */:
-                case 117 /* YieldKeyword */:
+                case 123 /* AwaitKeyword */:
+                case 118 /* YieldKeyword */:
                     // Yield/await always starts an expression.  Either it is an identifier (in which case
                     // it is definitely an expression).  Or it's a keyword (either because we're in
                     // a generator or async function, or in strict mode (or both)) and it started a yield or await expression.
@@ -19390,8 +19648,8 @@ var ts;
         function isStartOfExpressionStatement() {
             // As per the grammar, none of '{' or 'function' or 'class' can start an expression statement.
             return token() !== 18 /* OpenBraceToken */ &&
-                token() !== 90 /* FunctionKeyword */ &&
-                token() !== 76 /* ClassKeyword */ &&
+                token() !== 91 /* FunctionKeyword */ &&
+                token() !== 77 /* ClassKeyword */ &&
                 token() !== 58 /* AtToken */ &&
                 isStartOfExpression();
         }
@@ -19415,7 +19673,7 @@ var ts;
             return expr;
         }
         function parseInitializer() {
-            return parseOptional(59 /* EqualsToken */) ? parseAssignmentExpressionOrHigher() : undefined;
+            return parseOptional(60 /* EqualsToken */) ? parseAssignmentExpressionOrHigher() : undefined;
         }
         function parseAssignmentExpressionOrHigher() {
             //  AssignmentExpression[in,yield]:
@@ -19460,7 +19718,7 @@ var ts;
             // To avoid a look-ahead, we did not handle the case of an arrow function with a single un-parenthesized
             // parameter ('x => ...') above. We handle it here by checking if the parsed expression was a single
             // identifier and the current token is an arrow.
-            if (expr.kind === 72 /* Identifier */ && token() === 37 /* EqualsGreaterThanToken */) {
+            if (expr.kind === 73 /* Identifier */ && token() === 37 /* EqualsGreaterThanToken */) {
                 return parseSimpleArrowFunctionExpression(expr);
             }
             // Now see if we might be in cases '2' or '3'.
@@ -19476,7 +19734,7 @@ var ts;
             return parseConditionalExpressionRest(expr);
         }
         function isYieldExpression() {
-            if (token() === 117 /* YieldKeyword */) {
+            if (token() === 118 /* YieldKeyword */) {
                 // If we have a 'yield' keyword, and this is a context where yield expressions are
                 // allowed, then definitely parse out a yield expression.
                 if (inYieldContext()) {
@@ -19505,7 +19763,7 @@ var ts;
             return !scanner.hasPrecedingLineBreak() && isIdentifier();
         }
         function parseYieldExpression() {
-            var node = createNode(207 /* YieldExpression */);
+            var node = createNode(208 /* YieldExpression */);
             // YieldExpression[In] :
             //      yield
             //      yield [no LineTerminator here] [Lexical goal InputElementRegExp]AssignmentExpression[?In, Yield]
@@ -19527,13 +19785,13 @@ var ts;
             ts.Debug.assert(token() === 37 /* EqualsGreaterThanToken */, "parseSimpleArrowFunctionExpression should only have been called if we had a =>");
             var node;
             if (asyncModifier) {
-                node = createNode(197 /* ArrowFunction */, asyncModifier.pos);
+                node = createNode(198 /* ArrowFunction */, asyncModifier.pos);
                 node.modifiers = asyncModifier;
             }
             else {
-                node = createNode(197 /* ArrowFunction */, identifier.pos);
+                node = createNode(198 /* ArrowFunction */, identifier.pos);
             }
-            var parameter = createNode(151 /* Parameter */, identifier.pos);
+            var parameter = createNode(152 /* Parameter */, identifier.pos);
             parameter.name = identifier;
             finishNode(parameter);
             node.parameters = createNodeArray([parameter], parameter.pos, parameter.end);
@@ -19573,7 +19831,7 @@ var ts;
         //  Unknown     -> There *might* be a parenthesized arrow function here.
         //                 Speculatively look ahead to be sure, and rollback if not.
         function isParenthesizedArrowFunctionExpression() {
-            if (token() === 20 /* OpenParenToken */ || token() === 28 /* LessThanToken */ || token() === 121 /* AsyncKeyword */) {
+            if (token() === 20 /* OpenParenToken */ || token() === 28 /* LessThanToken */ || token() === 122 /* AsyncKeyword */) {
                 return lookAhead(isParenthesizedArrowFunctionExpressionWorker);
             }
             if (token() === 37 /* EqualsGreaterThanToken */) {
@@ -19586,7 +19844,7 @@ var ts;
             return 0 /* False */;
         }
         function isParenthesizedArrowFunctionExpressionWorker() {
-            if (token() === 121 /* AsyncKeyword */) {
+            if (token() === 122 /* AsyncKeyword */) {
                 nextToken();
                 if (scanner.hasPrecedingLineBreak()) {
                     return 0 /* False */;
@@ -19630,13 +19888,13 @@ var ts;
                 // Check for "(xxx yyy", where xxx is a modifier and yyy is an identifier. This
                 // isn't actually allowed, but we want to treat it as a lambda so we can provide
                 // a good error message.
-                if (ts.isModifierKind(second) && second !== 121 /* AsyncKeyword */ && lookAhead(nextTokenIsIdentifier)) {
+                if (ts.isModifierKind(second) && second !== 122 /* AsyncKeyword */ && lookAhead(nextTokenIsIdentifier)) {
                     return 1 /* True */;
                 }
                 // If we had "(" followed by something that's not an identifier,
                 // then this definitely doesn't look like a lambda.  "this" is not
                 // valid, but we want to parse it and then give a semantic error.
-                if (!isIdentifier() && second !== 100 /* ThisKeyword */) {
+                if (!isIdentifier() && second !== 101 /* ThisKeyword */) {
                     return 0 /* False */;
                 }
                 switch (nextToken()) {
@@ -19647,13 +19905,13 @@ var ts;
                     case 56 /* QuestionToken */:
                         nextToken();
                         // If we have "(a?:" or "(a?," or "(a?=" or "(a?)" then it is definitely a lambda.
-                        if (token() === 57 /* ColonToken */ || token() === 27 /* CommaToken */ || token() === 59 /* EqualsToken */ || token() === 21 /* CloseParenToken */) {
+                        if (token() === 57 /* ColonToken */ || token() === 27 /* CommaToken */ || token() === 60 /* EqualsToken */ || token() === 21 /* CloseParenToken */) {
                             return 1 /* True */;
                         }
                         // Otherwise it is definitely not a lambda.
                         return 0 /* False */;
                     case 27 /* CommaToken */:
-                    case 59 /* EqualsToken */:
+                    case 60 /* EqualsToken */:
                     case 21 /* CloseParenToken */:
                         // If we have "(a," or "(a=" or "(a)" this *could* be an arrow function
                         return 2 /* Unknown */;
@@ -19672,10 +19930,10 @@ var ts;
                 if (sourceFile.languageVariant === 1 /* JSX */) {
                     var isArrowFunctionInJsx = lookAhead(function () {
                         var third = nextToken();
-                        if (third === 86 /* ExtendsKeyword */) {
+                        if (third === 87 /* ExtendsKeyword */) {
                             var fourth = nextToken();
                             switch (fourth) {
-                                case 59 /* EqualsToken */:
+                                case 60 /* EqualsToken */:
                                 case 30 /* GreaterThanToken */:
                                     return false;
                                 default:
@@ -19701,7 +19959,7 @@ var ts;
         }
         function tryParseAsyncSimpleArrowFunctionExpression() {
             // We do a check here so that we won't be doing unnecessarily call to "lookAhead"
-            if (token() === 121 /* AsyncKeyword */) {
+            if (token() === 122 /* AsyncKeyword */) {
                 if (lookAhead(isUnParenthesizedAsyncArrowFunctionWorker) === 1 /* True */) {
                     var asyncModifier = parseModifiersForArrowFunction();
                     var expr = parseBinaryExpressionOrHigher(/*precedence*/ 0);
@@ -19714,7 +19972,7 @@ var ts;
             // AsyncArrowFunctionExpression:
             //      1) async[no LineTerminator here]AsyncArrowBindingIdentifier[?Yield][no LineTerminator here]=>AsyncConciseBody[?In]
             //      2) CoverCallExpressionAndAsyncArrowHead[?Yield, ?Await][no LineTerminator here]=>AsyncConciseBody[?In]
-            if (token() === 121 /* AsyncKeyword */) {
+            if (token() === 122 /* AsyncKeyword */) {
                 nextToken();
                 // If the "async" is followed by "=>" token then it is not a beginning of an async arrow-function
                 // but instead a simple arrow-function which will be parsed inside "parseAssignmentExpressionOrHigher"
@@ -19723,14 +19981,14 @@ var ts;
                 }
                 // Check for un-parenthesized AsyncArrowFunction
                 var expr = parseBinaryExpressionOrHigher(/*precedence*/ 0);
-                if (!scanner.hasPrecedingLineBreak() && expr.kind === 72 /* Identifier */ && token() === 37 /* EqualsGreaterThanToken */) {
+                if (!scanner.hasPrecedingLineBreak() && expr.kind === 73 /* Identifier */ && token() === 37 /* EqualsGreaterThanToken */) {
                     return 1 /* True */;
                 }
             }
             return 0 /* False */;
         }
         function parseParenthesizedArrowFunctionExpressionHead(allowAmbiguity) {
-            var node = createNodeWithJSDoc(197 /* ArrowFunction */);
+            var node = createNodeWithJSDoc(198 /* ArrowFunction */);
             node.modifiers = parseModifiersForArrowFunction();
             var isAsync = ts.hasModifier(node, 256 /* Async */) ? 2 /* Await */ : 0 /* None */;
             // Arrow functions are never generators.
@@ -19749,9 +20007,11 @@ var ts;
             //  - "(x = 10)" is an assignment expression parsed as a signature with a default parameter value.
             //  - "(x,y)" is a comma expression parsed as a signature with two parameters.
             //  - "a ? (b): c" will have "(b):" parsed as a signature with a return type annotation.
+            //  - "a ? (b): function() {}" will too, since function() is a valid JSDoc function type.
             //
             // So we need just a bit of lookahead to ensure that it can only be a signature.
-            if (!allowAmbiguity && token() !== 37 /* EqualsGreaterThanToken */ && token() !== 18 /* OpenBraceToken */) {
+            var hasJSDocFunctionType = node.type && ts.isJSDocFunctionType(node.type);
+            if (!allowAmbiguity && token() !== 37 /* EqualsGreaterThanToken */ && (hasJSDocFunctionType || token() !== 18 /* OpenBraceToken */)) {
                 // Returning undefined here will cause our caller to rewind to where we started from.
                 return undefined;
             }
@@ -19762,8 +20022,8 @@ var ts;
                 return parseFunctionBlock(isAsync ? 2 /* Await */ : 0 /* None */);
             }
             if (token() !== 26 /* SemicolonToken */ &&
-                token() !== 90 /* FunctionKeyword */ &&
-                token() !== 76 /* ClassKeyword */ &&
+                token() !== 91 /* FunctionKeyword */ &&
+                token() !== 77 /* ClassKeyword */ &&
                 isStartOfStatement() &&
                 !isStartOfExpressionStatement()) {
                 // Check if we got a plain statement (i.e. no expression-statements, no function/class expressions/declarations)
@@ -19794,14 +20054,14 @@ var ts;
             }
             // Note: we explicitly 'allowIn' in the whenTrue part of the condition expression, and
             // we do not that for the 'whenFalse' part.
-            var node = createNode(205 /* ConditionalExpression */, leftOperand.pos);
+            var node = createNode(206 /* ConditionalExpression */, leftOperand.pos);
             node.condition = leftOperand;
             node.questionToken = questionToken;
             node.whenTrue = doOutsideOfContext(disallowInAndDecoratorContext, parseAssignmentExpressionOrHigher);
             node.colonToken = parseExpectedToken(57 /* ColonToken */);
             node.whenFalse = ts.nodeIsPresent(node.colonToken)
                 ? parseAssignmentExpressionOrHigher()
-                : createMissingNode(72 /* Identifier */, /*reportAtCurrentPosition*/ false, ts.Diagnostics._0_expected, ts.tokenToString(57 /* ColonToken */));
+                : createMissingNode(73 /* Identifier */, /*reportAtCurrentPosition*/ false, ts.Diagnostics._0_expected, ts.tokenToString(57 /* ColonToken */));
             return finishNode(node);
         }
         function parseBinaryExpressionOrHigher(precedence) {
@@ -19809,7 +20069,7 @@ var ts;
             return parseBinaryExpressionRest(precedence, leftOperand);
         }
         function isInOrOfKeyword(t) {
-            return t === 93 /* InKeyword */ || t === 147 /* OfKeyword */;
+            return t === 94 /* InKeyword */ || t === 148 /* OfKeyword */;
         }
         function parseBinaryExpressionRest(precedence, leftOperand) {
             while (true) {
@@ -19844,10 +20104,10 @@ var ts;
                 if (!consumeCurrentOperator) {
                     break;
                 }
-                if (token() === 93 /* InKeyword */ && inDisallowInContext()) {
+                if (token() === 94 /* InKeyword */ && inDisallowInContext()) {
                     break;
                 }
-                if (token() === 119 /* AsKeyword */) {
+                if (token() === 120 /* AsKeyword */) {
                     // Make sure we *do* perform ASI for constructs like this:
                     //    var x = foo
                     //    as (Bar)
@@ -19868,51 +20128,51 @@ var ts;
             return leftOperand;
         }
         function isBinaryOperator() {
-            if (inDisallowInContext() && token() === 93 /* InKeyword */) {
+            if (inDisallowInContext() && token() === 94 /* InKeyword */) {
                 return false;
             }
             return ts.getBinaryOperatorPrecedence(token()) > 0;
         }
         function makeBinaryExpression(left, operatorToken, right) {
-            var node = createNode(204 /* BinaryExpression */, left.pos);
+            var node = createNode(205 /* BinaryExpression */, left.pos);
             node.left = left;
             node.operatorToken = operatorToken;
             node.right = right;
             return finishNode(node);
         }
         function makeAsExpression(left, right) {
-            var node = createNode(212 /* AsExpression */, left.pos);
+            var node = createNode(213 /* AsExpression */, left.pos);
             node.expression = left;
             node.type = right;
             return finishNode(node);
         }
         function parsePrefixUnaryExpression() {
-            var node = createNode(202 /* PrefixUnaryExpression */);
+            var node = createNode(203 /* PrefixUnaryExpression */);
             node.operator = token();
             nextToken();
             node.operand = parseSimpleUnaryExpression();
             return finishNode(node);
         }
         function parseDeleteExpression() {
-            var node = createNode(198 /* DeleteExpression */);
+            var node = createNode(199 /* DeleteExpression */);
             nextToken();
             node.expression = parseSimpleUnaryExpression();
             return finishNode(node);
         }
         function parseTypeOfExpression() {
-            var node = createNode(199 /* TypeOfExpression */);
+            var node = createNode(200 /* TypeOfExpression */);
             nextToken();
             node.expression = parseSimpleUnaryExpression();
             return finishNode(node);
         }
         function parseVoidExpression() {
-            var node = createNode(200 /* VoidExpression */);
+            var node = createNode(201 /* VoidExpression */);
             nextToken();
             node.expression = parseSimpleUnaryExpression();
             return finishNode(node);
         }
         function isAwaitExpression() {
-            if (token() === 122 /* AwaitKeyword */) {
+            if (token() === 123 /* AwaitKeyword */) {
                 if (inAwaitContext()) {
                     return true;
                 }
@@ -19922,7 +20182,7 @@ var ts;
             return false;
         }
         function parseAwaitExpression() {
-            var node = createNode(201 /* AwaitExpression */);
+            var node = createNode(202 /* AwaitExpression */);
             nextToken();
             node.expression = parseSimpleUnaryExpression();
             return finishNode(node);
@@ -19966,7 +20226,7 @@ var ts;
             if (token() === 41 /* AsteriskAsteriskToken */) {
                 var pos = ts.skipTrivia(sourceText, simpleUnaryExpression.pos);
                 var end = simpleUnaryExpression.end;
-                if (simpleUnaryExpression.kind === 194 /* TypeAssertionExpression */) {
+                if (simpleUnaryExpression.kind === 195 /* TypeAssertionExpression */) {
                     parseErrorAt(pos, end, ts.Diagnostics.A_type_assertion_expression_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Consider_enclosing_the_expression_in_parentheses);
                 }
                 else {
@@ -19996,18 +20256,18 @@ var ts;
                 case 53 /* TildeToken */:
                 case 52 /* ExclamationToken */:
                     return parsePrefixUnaryExpression();
-                case 81 /* DeleteKeyword */:
+                case 82 /* DeleteKeyword */:
                     return parseDeleteExpression();
-                case 104 /* TypeOfKeyword */:
+                case 105 /* TypeOfKeyword */:
                     return parseTypeOfExpression();
-                case 106 /* VoidKeyword */:
+                case 107 /* VoidKeyword */:
                     return parseVoidExpression();
                 case 28 /* LessThanToken */:
                     // This is modified UnaryExpression grammar in TypeScript
                     //  UnaryExpression (modified):
                     //      < type > UnaryExpression
                     return parseTypeAssertion();
-                case 122 /* AwaitKeyword */:
+                case 123 /* AwaitKeyword */:
                     if (isAwaitExpression()) {
                         return parseAwaitExpression();
                     }
@@ -20034,10 +20294,10 @@ var ts;
                 case 39 /* MinusToken */:
                 case 53 /* TildeToken */:
                 case 52 /* ExclamationToken */:
-                case 81 /* DeleteKeyword */:
-                case 104 /* TypeOfKeyword */:
-                case 106 /* VoidKeyword */:
-                case 122 /* AwaitKeyword */:
+                case 82 /* DeleteKeyword */:
+                case 105 /* TypeOfKeyword */:
+                case 107 /* VoidKeyword */:
+                case 123 /* AwaitKeyword */:
                     return false;
                 case 28 /* LessThanToken */:
                     // If we are not in JSX context, we are parsing TypeAssertion which is an UnaryExpression
@@ -20063,7 +20323,7 @@ var ts;
          */
         function parseUpdateExpression() {
             if (token() === 44 /* PlusPlusToken */ || token() === 45 /* MinusMinusToken */) {
-                var node = createNode(202 /* PrefixUnaryExpression */);
+                var node = createNode(203 /* PrefixUnaryExpression */);
                 node.operator = token();
                 nextToken();
                 node.operand = parseLeftHandSideExpressionOrHigher();
@@ -20076,7 +20336,7 @@ var ts;
             var expression = parseLeftHandSideExpressionOrHigher();
             ts.Debug.assert(ts.isLeftHandSideExpression(expression));
             if ((token() === 44 /* PlusPlusToken */ || token() === 45 /* MinusMinusToken */) && !scanner.hasPrecedingLineBreak()) {
-                var node = createNode(203 /* PostfixUnaryExpression */, expression.pos);
+                var node = createNode(204 /* PostfixUnaryExpression */, expression.pos);
                 node.operand = expression;
                 node.operator = token();
                 nextToken();
@@ -20117,7 +20377,7 @@ var ts;
             // 3)we have a MemberExpression which either completes the LeftHandSideExpression,
             // or starts the beginning of the first four CallExpression productions.
             var expression;
-            if (token() === 92 /* ImportKeyword */) {
+            if (token() === 93 /* ImportKeyword */) {
                 if (lookAhead(nextTokenIsOpenParenOrLessThan)) {
                     // We don't want to eagerly consume all import keyword as import call expression so we look ahead to find "("
                     // For example:
@@ -20132,8 +20392,8 @@ var ts;
                     var fullStart = scanner.getStartPos();
                     nextToken(); // advance past the 'import'
                     nextToken(); // advance past the dot
-                    var node = createNode(214 /* MetaProperty */, fullStart);
-                    node.keywordToken = 92 /* ImportKeyword */;
+                    var node = createNode(215 /* MetaProperty */, fullStart);
+                    node.keywordToken = 93 /* ImportKeyword */;
                     node.name = parseIdentifierName();
                     expression = finishNode(node);
                     sourceFile.flags |= 1048576 /* PossiblyContainsImportMeta */;
@@ -20143,7 +20403,7 @@ var ts;
                 }
             }
             else {
-                expression = token() === 98 /* SuperKeyword */ ? parseSuperExpression() : parseMemberExpressionOrHigher();
+                expression = token() === 99 /* SuperKeyword */ ? parseSuperExpression() : parseMemberExpressionOrHigher();
             }
             // Now, we *may* be complete.  However, we might have consumed the start of a
             // CallExpression.  As such, we need to consume the rest of it here to be complete.
@@ -20202,12 +20462,19 @@ var ts;
         }
         function parseSuperExpression() {
             var expression = parseTokenNode();
+            if (token() === 28 /* LessThanToken */) {
+                var startPos = getNodePos();
+                var typeArguments = tryParse(parseTypeArgumentsInExpression);
+                if (typeArguments !== undefined) {
+                    parseErrorAt(startPos, getNodePos(), ts.Diagnostics.super_may_not_use_type_arguments);
+                }
+            }
             if (token() === 20 /* OpenParenToken */ || token() === 24 /* DotToken */ || token() === 22 /* OpenBracketToken */) {
                 return expression;
             }
             // If we have seen "super" it must be followed by '(' or '.'.
             // If it wasn't then just try to parse out a '.' and report an error.
-            var node = createNode(189 /* PropertyAccessExpression */, expression.pos);
+            var node = createNode(190 /* PropertyAccessExpression */, expression.pos);
             node.expression = expression;
             parseExpectedToken(24 /* DotToken */, ts.Diagnostics.super_must_be_followed_by_an_argument_list_or_member_access);
             node.name = parseRightSideOfDot(/*allowIdentifierNames*/ true);
@@ -20216,8 +20483,8 @@ var ts;
         function parseJsxElementOrSelfClosingElementOrFragment(inExpressionContext) {
             var opening = parseJsxOpeningOrSelfClosingElementOrOpeningFragment(inExpressionContext);
             var result;
-            if (opening.kind === 262 /* JsxOpeningElement */) {
-                var node = createNode(260 /* JsxElement */, opening.pos);
+            if (opening.kind === 263 /* JsxOpeningElement */) {
+                var node = createNode(261 /* JsxElement */, opening.pos);
                 node.openingElement = opening;
                 node.children = parseJsxChildren(node.openingElement);
                 node.closingElement = parseJsxClosingElement(inExpressionContext);
@@ -20226,15 +20493,15 @@ var ts;
                 }
                 result = finishNode(node);
             }
-            else if (opening.kind === 265 /* JsxOpeningFragment */) {
-                var node = createNode(264 /* JsxFragment */, opening.pos);
+            else if (opening.kind === 266 /* JsxOpeningFragment */) {
+                var node = createNode(265 /* JsxFragment */, opening.pos);
                 node.openingFragment = opening;
                 node.children = parseJsxChildren(node.openingFragment);
                 node.closingFragment = parseJsxClosingFragment(inExpressionContext);
                 result = finishNode(node);
             }
             else {
-                ts.Debug.assert(opening.kind === 261 /* JsxSelfClosingElement */);
+                ts.Debug.assert(opening.kind === 262 /* JsxSelfClosingElement */);
                 // Nothing else to do for self-closing elements
                 result = opening;
             }
@@ -20249,11 +20516,11 @@ var ts;
                 var invalidElement = tryParse(function () { return parseJsxElementOrSelfClosingElementOrFragment(/*inExpressionContext*/ true); });
                 if (invalidElement) {
                     parseErrorAtCurrentToken(ts.Diagnostics.JSX_expressions_must_have_one_parent_element);
-                    var badNode = createNode(204 /* BinaryExpression */, result.pos);
+                    var badNode = createNode(205 /* BinaryExpression */, result.pos);
                     badNode.end = invalidElement.end;
                     badNode.left = result;
                     badNode.right = invalidElement;
-                    badNode.operatorToken = createMissingNode(27 /* CommaToken */, /*reportAtCurrentPosition*/ false, /*diagnosticMessage*/ undefined); // TODO: GH#18217
+                    badNode.operatorToken = createMissingNode(27 /* CommaToken */, /*reportAtCurrentPosition*/ false);
                     badNode.operatorToken.pos = badNode.operatorToken.end = badNode.right.pos;
                     return badNode;
                 }
@@ -20262,7 +20529,8 @@ var ts;
         }
         function parseJsxText() {
             var node = createNode(11 /* JsxText */);
-            node.containsOnlyWhiteSpaces = currentToken === 12 /* JsxTextAllWhiteSpaces */;
+            node.text = scanner.getTokenValue();
+            node.containsOnlyTriviaWhiteSpaces = currentToken === 12 /* JsxTextAllWhiteSpaces */;
             currentToken = scanner.scanJsxToken();
             return finishNode(node);
         }
@@ -20307,7 +20575,7 @@ var ts;
             return createNodeArray(list, listPos);
         }
         function parseJsxAttributes() {
-            var jsxAttributes = createNode(268 /* JsxAttributes */);
+            var jsxAttributes = createNode(269 /* JsxAttributes */);
             jsxAttributes.properties = parseList(13 /* JsxAttributes */, parseJsxAttribute);
             return finishNode(jsxAttributes);
         }
@@ -20316,7 +20584,7 @@ var ts;
             parseExpected(28 /* LessThanToken */);
             if (token() === 30 /* GreaterThanToken */) {
                 // See below for explanation of scanJsxText
-                var node_1 = createNode(265 /* JsxOpeningFragment */, fullStart);
+                var node_1 = createNode(266 /* JsxOpeningFragment */, fullStart);
                 scanJsxText();
                 return finishNode(node_1);
             }
@@ -20328,7 +20596,7 @@ var ts;
                 // Closing tag, so scan the immediately-following text with the JSX scanning instead
                 // of regular scanning to avoid treating illegal characters (e.g. '#') as immediate
                 // scanning errors
-                node = createNode(262 /* JsxOpeningElement */, fullStart);
+                node = createNode(263 /* JsxOpeningElement */, fullStart);
                 scanJsxText();
             }
             else {
@@ -20340,7 +20608,7 @@ var ts;
                     parseExpected(30 /* GreaterThanToken */, /*diagnostic*/ undefined, /*shouldAdvance*/ false);
                     scanJsxText();
                 }
-                node = createNode(261 /* JsxSelfClosingElement */, fullStart);
+                node = createNode(262 /* JsxSelfClosingElement */, fullStart);
             }
             node.tagName = tagName;
             node.typeArguments = typeArguments;
@@ -20354,10 +20622,10 @@ var ts;
             //      primaryExpression in the form of an identifier and "this" keyword
             // We can't just simply use parseLeftHandSideExpressionOrHigher because then we will start consider class,function etc as a keyword
             // We only want to consider "this" as a primaryExpression
-            var expression = token() === 100 /* ThisKeyword */ ?
+            var expression = token() === 101 /* ThisKeyword */ ?
                 parseTokenNode() : parseIdentifierName();
             while (parseOptional(24 /* DotToken */)) {
-                var propertyAccess = createNode(189 /* PropertyAccessExpression */, expression.pos);
+                var propertyAccess = createNode(190 /* PropertyAccessExpression */, expression.pos);
                 propertyAccess.expression = expression;
                 propertyAccess.name = parseRightSideOfDot(/*allowIdentifierNames*/ true);
                 expression = finishNode(propertyAccess);
@@ -20365,20 +20633,24 @@ var ts;
             return expression;
         }
         function parseJsxExpression(inExpressionContext) {
-            var node = createNode(270 /* JsxExpression */);
+            var node = createNode(271 /* JsxExpression */);
             if (!parseExpected(18 /* OpenBraceToken */)) {
                 return undefined;
             }
             if (token() !== 19 /* CloseBraceToken */) {
                 node.dotDotDotToken = parseOptionalToken(25 /* DotDotDotToken */);
-                node.expression = parseAssignmentExpressionOrHigher();
+                // Only an AssignmentExpression is valid here per the JSX spec,
+                // but we can unambiguously parse a comma sequence and provide
+                // a better error message in grammar checking.
+                node.expression = parseExpression();
             }
             if (inExpressionContext) {
                 parseExpected(19 /* CloseBraceToken */);
             }
             else {
-                parseExpected(19 /* CloseBraceToken */, /*message*/ undefined, /*shouldAdvance*/ false);
-                scanJsxText();
+                if (parseExpected(19 /* CloseBraceToken */, /*message*/ undefined, /*shouldAdvance*/ false)) {
+                    scanJsxText();
+                }
             }
             return finishNode(node);
         }
@@ -20387,9 +20659,9 @@ var ts;
                 return parseJsxSpreadAttribute();
             }
             scanJsxIdentifier();
-            var node = createNode(267 /* JsxAttribute */);
+            var node = createNode(268 /* JsxAttribute */);
             node.name = parseIdentifierName();
-            if (token() === 59 /* EqualsToken */) {
+            if (token() === 60 /* EqualsToken */) {
                 switch (scanJsxAttributeValue()) {
                     case 10 /* StringLiteral */:
                         node.initializer = parseLiteralNode();
@@ -20402,7 +20674,7 @@ var ts;
             return finishNode(node);
         }
         function parseJsxSpreadAttribute() {
-            var node = createNode(269 /* JsxSpreadAttribute */);
+            var node = createNode(270 /* JsxSpreadAttribute */);
             parseExpected(18 /* OpenBraceToken */);
             parseExpected(25 /* DotDotDotToken */);
             node.expression = parseExpression();
@@ -20410,7 +20682,7 @@ var ts;
             return finishNode(node);
         }
         function parseJsxClosingElement(inExpressionContext) {
-            var node = createNode(263 /* JsxClosingElement */);
+            var node = createNode(264 /* JsxClosingElement */);
             parseExpected(29 /* LessThanSlashToken */);
             node.tagName = parseJsxElementName();
             if (inExpressionContext) {
@@ -20423,7 +20695,7 @@ var ts;
             return finishNode(node);
         }
         function parseJsxClosingFragment(inExpressionContext) {
-            var node = createNode(266 /* JsxClosingFragment */);
+            var node = createNode(267 /* JsxClosingFragment */);
             parseExpected(29 /* LessThanSlashToken */);
             if (ts.tokenIsIdentifierOrKeyword(token())) {
                 parseErrorAtRange(parseJsxElementName(), ts.Diagnostics.Expected_corresponding_closing_tag_for_JSX_fragment);
@@ -20438,7 +20710,7 @@ var ts;
             return finishNode(node);
         }
         function parseTypeAssertion() {
-            var node = createNode(194 /* TypeAssertionExpression */);
+            var node = createNode(195 /* TypeAssertionExpression */);
             parseExpected(28 /* LessThanToken */);
             node.type = parseType();
             parseExpected(30 /* GreaterThanToken */);
@@ -20449,7 +20721,7 @@ var ts;
             while (true) {
                 var dotToken = parseOptionalToken(24 /* DotToken */);
                 if (dotToken) {
-                    var propertyAccess = createNode(189 /* PropertyAccessExpression */, expression.pos);
+                    var propertyAccess = createNode(190 /* PropertyAccessExpression */, expression.pos);
                     propertyAccess.expression = expression;
                     propertyAccess.name = parseRightSideOfDot(/*allowIdentifierNames*/ true);
                     expression = finishNode(propertyAccess);
@@ -20457,17 +20729,17 @@ var ts;
                 }
                 if (token() === 52 /* ExclamationToken */ && !scanner.hasPrecedingLineBreak()) {
                     nextToken();
-                    var nonNullExpression = createNode(213 /* NonNullExpression */, expression.pos);
+                    var nonNullExpression = createNode(214 /* NonNullExpression */, expression.pos);
                     nonNullExpression.expression = expression;
                     expression = finishNode(nonNullExpression);
                     continue;
                 }
                 // when in the [Decorator] context, we do not parse ElementAccess as it could be part of a ComputedPropertyName
                 if (!inDecoratorContext() && parseOptional(22 /* OpenBracketToken */)) {
-                    var indexedAccess = createNode(190 /* ElementAccessExpression */, expression.pos);
+                    var indexedAccess = createNode(191 /* ElementAccessExpression */, expression.pos);
                     indexedAccess.expression = expression;
                     if (token() === 23 /* CloseBracketToken */) {
-                        indexedAccess.argumentExpression = createMissingNode(72 /* Identifier */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.An_element_access_expression_should_take_an_argument);
+                        indexedAccess.argumentExpression = createMissingNode(73 /* Identifier */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.An_element_access_expression_should_take_an_argument);
                     }
                     else {
                         var argument = allowInAnd(parseExpression);
@@ -20491,7 +20763,7 @@ var ts;
             return token() === 14 /* NoSubstitutionTemplateLiteral */ || token() === 15 /* TemplateHead */;
         }
         function parseTaggedTemplateRest(tag, typeArguments) {
-            var tagExpression = createNode(193 /* TaggedTemplateExpression */, tag.pos);
+            var tagExpression = createNode(194 /* TaggedTemplateExpression */, tag.pos);
             tagExpression.tag = tag;
             tagExpression.typeArguments = typeArguments;
             tagExpression.template = token() === 14 /* NoSubstitutionTemplateLiteral */
@@ -20516,7 +20788,7 @@ var ts;
                         expression = parseTaggedTemplateRest(expression, typeArguments);
                         continue;
                     }
-                    var callExpr = createNode(191 /* CallExpression */, expression.pos);
+                    var callExpr = createNode(192 /* CallExpression */, expression.pos);
                     callExpr.expression = expression;
                     callExpr.typeArguments = typeArguments;
                     callExpr.arguments = parseArgumentList();
@@ -20524,7 +20796,7 @@ var ts;
                     continue;
                 }
                 else if (token() === 20 /* OpenParenToken */) {
-                    var callExpr = createNode(191 /* CallExpression */, expression.pos);
+                    var callExpr = createNode(192 /* CallExpression */, expression.pos);
                     callExpr.expression = expression;
                     callExpr.arguments = parseArgumentList();
                     expression = finishNode(callExpr);
@@ -20600,11 +20872,11 @@ var ts;
                 case 10 /* StringLiteral */:
                 case 14 /* NoSubstitutionTemplateLiteral */:
                     return parseLiteralNode();
-                case 100 /* ThisKeyword */:
-                case 98 /* SuperKeyword */:
-                case 96 /* NullKeyword */:
-                case 102 /* TrueKeyword */:
-                case 87 /* FalseKeyword */:
+                case 101 /* ThisKeyword */:
+                case 99 /* SuperKeyword */:
+                case 97 /* NullKeyword */:
+                case 103 /* TrueKeyword */:
+                case 88 /* FalseKeyword */:
                     return parseTokenNode();
                 case 20 /* OpenParenToken */:
                     return parseParenthesizedExpression();
@@ -20612,7 +20884,7 @@ var ts;
                     return parseArrayLiteralExpression();
                 case 18 /* OpenBraceToken */:
                     return parseObjectLiteralExpression();
-                case 121 /* AsyncKeyword */:
+                case 122 /* AsyncKeyword */:
                     // Async arrow functions are parsed earlier in parseAssignmentExpressionOrHigher.
                     // If we encounter `async [no LineTerminator here] function` then this is an async
                     // function; otherwise, its an identifier.
@@ -20620,14 +20892,14 @@ var ts;
                         break;
                     }
                     return parseFunctionExpression();
-                case 76 /* ClassKeyword */:
+                case 77 /* ClassKeyword */:
                     return parseClassExpression();
-                case 90 /* FunctionKeyword */:
+                case 91 /* FunctionKeyword */:
                     return parseFunctionExpression();
-                case 95 /* NewKeyword */:
+                case 96 /* NewKeyword */:
                     return parseNewExpressionOrNewDotTarget();
                 case 42 /* SlashToken */:
-                case 64 /* SlashEqualsToken */:
+                case 65 /* SlashEqualsToken */:
                     if (reScanSlashToken() === 13 /* RegularExpressionLiteral */) {
                         return parseLiteralNode();
                     }
@@ -20638,28 +20910,28 @@ var ts;
             return parseIdentifier(ts.Diagnostics.Expression_expected);
         }
         function parseParenthesizedExpression() {
-            var node = createNodeWithJSDoc(195 /* ParenthesizedExpression */);
+            var node = createNodeWithJSDoc(196 /* ParenthesizedExpression */);
             parseExpected(20 /* OpenParenToken */);
             node.expression = allowInAnd(parseExpression);
             parseExpected(21 /* CloseParenToken */);
             return finishNode(node);
         }
         function parseSpreadElement() {
-            var node = createNode(208 /* SpreadElement */);
+            var node = createNode(209 /* SpreadElement */);
             parseExpected(25 /* DotDotDotToken */);
             node.expression = parseAssignmentExpressionOrHigher();
             return finishNode(node);
         }
         function parseArgumentOrArrayLiteralElement() {
             return token() === 25 /* DotDotDotToken */ ? parseSpreadElement() :
-                token() === 27 /* CommaToken */ ? createNode(210 /* OmittedExpression */) :
+                token() === 27 /* CommaToken */ ? createNode(211 /* OmittedExpression */) :
                     parseAssignmentExpressionOrHigher();
         }
         function parseArgumentExpression() {
             return doOutsideOfContext(disallowInAndDecoratorContext, parseArgumentOrArrayLiteralElement);
         }
         function parseArrayLiteralExpression() {
-            var node = createNode(187 /* ArrayLiteralExpression */);
+            var node = createNode(188 /* ArrayLiteralExpression */);
             parseExpected(22 /* OpenBracketToken */);
             if (scanner.hasPrecedingLineBreak()) {
                 node.multiLine = true;
@@ -20671,17 +20943,17 @@ var ts;
         function parseObjectLiteralElement() {
             var node = createNodeWithJSDoc(0 /* Unknown */);
             if (parseOptionalToken(25 /* DotDotDotToken */)) {
-                node.kind = 277 /* SpreadAssignment */;
+                node.kind = 278 /* SpreadAssignment */;
                 node.expression = parseAssignmentExpressionOrHigher();
                 return finishNode(node);
             }
             node.decorators = parseDecorators();
             node.modifiers = parseModifiers();
-            if (parseContextualModifier(126 /* GetKeyword */)) {
-                return parseAccessorDeclaration(node, 158 /* GetAccessor */);
+            if (parseContextualModifier(127 /* GetKeyword */)) {
+                return parseAccessorDeclaration(node, 159 /* GetAccessor */);
             }
-            if (parseContextualModifier(137 /* SetKeyword */)) {
-                return parseAccessorDeclaration(node, 159 /* SetAccessor */);
+            if (parseContextualModifier(138 /* SetKeyword */)) {
+                return parseAccessorDeclaration(node, 160 /* SetAccessor */);
             }
             var asteriskToken = parseOptionalToken(40 /* AsteriskToken */);
             var tokenIsIdentifier = isIdentifier();
@@ -20699,22 +20971,22 @@ var ts;
             // this is necessary because ObjectLiteral productions are also used to cover grammar for ObjectAssignmentPattern
             var isShorthandPropertyAssignment = tokenIsIdentifier && (token() !== 57 /* ColonToken */);
             if (isShorthandPropertyAssignment) {
-                node.kind = 276 /* ShorthandPropertyAssignment */;
-                var equalsToken = parseOptionalToken(59 /* EqualsToken */);
+                node.kind = 277 /* ShorthandPropertyAssignment */;
+                var equalsToken = parseOptionalToken(60 /* EqualsToken */);
                 if (equalsToken) {
                     node.equalsToken = equalsToken;
                     node.objectAssignmentInitializer = allowInAnd(parseAssignmentExpressionOrHigher);
                 }
             }
             else {
-                node.kind = 275 /* PropertyAssignment */;
+                node.kind = 276 /* PropertyAssignment */;
                 parseExpected(57 /* ColonToken */);
                 node.initializer = allowInAnd(parseAssignmentExpressionOrHigher);
             }
             return finishNode(node);
         }
         function parseObjectLiteralExpression() {
-            var node = createNode(188 /* ObjectLiteralExpression */);
+            var node = createNode(189 /* ObjectLiteralExpression */);
             parseExpected(18 /* OpenBraceToken */);
             if (scanner.hasPrecedingLineBreak()) {
                 node.multiLine = true;
@@ -20733,9 +21005,9 @@ var ts;
             if (saveDecoratorContext) {
                 setDecoratorContext(/*val*/ false);
             }
-            var node = createNodeWithJSDoc(196 /* FunctionExpression */);
+            var node = createNodeWithJSDoc(197 /* FunctionExpression */);
             node.modifiers = parseModifiers();
-            parseExpected(90 /* FunctionKeyword */);
+            parseExpected(91 /* FunctionKeyword */);
             node.asteriskToken = parseOptionalToken(40 /* AsteriskToken */);
             var isGenerator = node.asteriskToken ? 1 /* Yield */ : 0 /* None */;
             var isAsync = ts.hasModifier(node, 256 /* Async */) ? 2 /* Await */ : 0 /* None */;
@@ -20756,10 +21028,10 @@ var ts;
         }
         function parseNewExpressionOrNewDotTarget() {
             var fullStart = scanner.getStartPos();
-            parseExpected(95 /* NewKeyword */);
+            parseExpected(96 /* NewKeyword */);
             if (parseOptional(24 /* DotToken */)) {
-                var node_2 = createNode(214 /* MetaProperty */, fullStart);
-                node_2.keywordToken = 95 /* NewKeyword */;
+                var node_2 = createNode(215 /* MetaProperty */, fullStart);
+                node_2.keywordToken = 96 /* NewKeyword */;
                 node_2.name = parseIdentifierName();
                 return finishNode(node_2);
             }
@@ -20775,7 +21047,7 @@ var ts;
                 }
                 break;
             }
-            var node = createNode(192 /* NewExpression */, fullStart);
+            var node = createNode(193 /* NewExpression */, fullStart);
             node.expression = expression;
             node.typeArguments = typeArguments;
             if (node.typeArguments || token() === 20 /* OpenParenToken */) {
@@ -20785,7 +21057,7 @@ var ts;
         }
         // STATEMENTS
         function parseBlock(ignoreMissingOpenBrace, diagnosticMessage) {
-            var node = createNode(218 /* Block */);
+            var node = createNode(219 /* Block */);
             if (parseExpected(18 /* OpenBraceToken */, diagnosticMessage) || ignoreMissingOpenBrace) {
                 if (scanner.hasPrecedingLineBreak()) {
                     node.multiLine = true;
@@ -20818,25 +21090,25 @@ var ts;
             return block;
         }
         function parseEmptyStatement() {
-            var node = createNode(220 /* EmptyStatement */);
+            var node = createNode(221 /* EmptyStatement */);
             parseExpected(26 /* SemicolonToken */);
             return finishNode(node);
         }
         function parseIfStatement() {
-            var node = createNode(222 /* IfStatement */);
-            parseExpected(91 /* IfKeyword */);
+            var node = createNode(223 /* IfStatement */);
+            parseExpected(92 /* IfKeyword */);
             parseExpected(20 /* OpenParenToken */);
             node.expression = allowInAnd(parseExpression);
             parseExpected(21 /* CloseParenToken */);
             node.thenStatement = parseStatement();
-            node.elseStatement = parseOptional(83 /* ElseKeyword */) ? parseStatement() : undefined;
+            node.elseStatement = parseOptional(84 /* ElseKeyword */) ? parseStatement() : undefined;
             return finishNode(node);
         }
         function parseDoStatement() {
-            var node = createNode(223 /* DoStatement */);
-            parseExpected(82 /* DoKeyword */);
+            var node = createNode(224 /* DoStatement */);
+            parseExpected(83 /* DoKeyword */);
             node.statement = parseStatement();
-            parseExpected(107 /* WhileKeyword */);
+            parseExpected(108 /* WhileKeyword */);
             parseExpected(20 /* OpenParenToken */);
             node.expression = allowInAnd(parseExpression);
             parseExpected(21 /* CloseParenToken */);
@@ -20848,8 +21120,8 @@ var ts;
             return finishNode(node);
         }
         function parseWhileStatement() {
-            var node = createNode(224 /* WhileStatement */);
-            parseExpected(107 /* WhileKeyword */);
+            var node = createNode(225 /* WhileStatement */);
+            parseExpected(108 /* WhileKeyword */);
             parseExpected(20 /* OpenParenToken */);
             node.expression = allowInAnd(parseExpression);
             parseExpected(21 /* CloseParenToken */);
@@ -20858,12 +21130,12 @@ var ts;
         }
         function parseForOrForInOrForOfStatement() {
             var pos = getNodePos();
-            parseExpected(89 /* ForKeyword */);
-            var awaitToken = parseOptionalToken(122 /* AwaitKeyword */);
+            parseExpected(90 /* ForKeyword */);
+            var awaitToken = parseOptionalToken(123 /* AwaitKeyword */);
             parseExpected(20 /* OpenParenToken */);
             var initializer;
             if (token() !== 26 /* SemicolonToken */) {
-                if (token() === 105 /* VarKeyword */ || token() === 111 /* LetKeyword */ || token() === 77 /* ConstKeyword */) {
+                if (token() === 106 /* VarKeyword */ || token() === 112 /* LetKeyword */ || token() === 78 /* ConstKeyword */) {
                     initializer = parseVariableDeclarationList(/*inForStatementInitializer*/ true);
                 }
                 else {
@@ -20871,23 +21143,23 @@ var ts;
                 }
             }
             var forOrForInOrForOfStatement;
-            if (awaitToken ? parseExpected(147 /* OfKeyword */) : parseOptional(147 /* OfKeyword */)) {
-                var forOfStatement = createNode(227 /* ForOfStatement */, pos);
+            if (awaitToken ? parseExpected(148 /* OfKeyword */) : parseOptional(148 /* OfKeyword */)) {
+                var forOfStatement = createNode(228 /* ForOfStatement */, pos);
                 forOfStatement.awaitModifier = awaitToken;
                 forOfStatement.initializer = initializer;
                 forOfStatement.expression = allowInAnd(parseAssignmentExpressionOrHigher);
                 parseExpected(21 /* CloseParenToken */);
                 forOrForInOrForOfStatement = forOfStatement;
             }
-            else if (parseOptional(93 /* InKeyword */)) {
-                var forInStatement = createNode(226 /* ForInStatement */, pos);
+            else if (parseOptional(94 /* InKeyword */)) {
+                var forInStatement = createNode(227 /* ForInStatement */, pos);
                 forInStatement.initializer = initializer;
                 forInStatement.expression = allowInAnd(parseExpression);
                 parseExpected(21 /* CloseParenToken */);
                 forOrForInOrForOfStatement = forInStatement;
             }
             else {
-                var forStatement = createNode(225 /* ForStatement */, pos);
+                var forStatement = createNode(226 /* ForStatement */, pos);
                 forStatement.initializer = initializer;
                 parseExpected(26 /* SemicolonToken */);
                 if (token() !== 26 /* SemicolonToken */ && token() !== 21 /* CloseParenToken */) {
@@ -20905,7 +21177,7 @@ var ts;
         }
         function parseBreakOrContinueStatement(kind) {
             var node = createNode(kind);
-            parseExpected(kind === 229 /* BreakStatement */ ? 73 /* BreakKeyword */ : 78 /* ContinueKeyword */);
+            parseExpected(kind === 230 /* BreakStatement */ ? 74 /* BreakKeyword */ : 79 /* ContinueKeyword */);
             if (!canParseSemicolon()) {
                 node.label = parseIdentifier();
             }
@@ -20913,8 +21185,8 @@ var ts;
             return finishNode(node);
         }
         function parseReturnStatement() {
-            var node = createNode(230 /* ReturnStatement */);
-            parseExpected(97 /* ReturnKeyword */);
+            var node = createNode(231 /* ReturnStatement */);
+            parseExpected(98 /* ReturnKeyword */);
             if (!canParseSemicolon()) {
                 node.expression = allowInAnd(parseExpression);
             }
@@ -20922,8 +21194,8 @@ var ts;
             return finishNode(node);
         }
         function parseWithStatement() {
-            var node = createNode(231 /* WithStatement */);
-            parseExpected(108 /* WithKeyword */);
+            var node = createNode(232 /* WithStatement */);
+            parseExpected(109 /* WithKeyword */);
             parseExpected(20 /* OpenParenToken */);
             node.expression = allowInAnd(parseExpression);
             parseExpected(21 /* CloseParenToken */);
@@ -20931,30 +21203,30 @@ var ts;
             return finishNode(node);
         }
         function parseCaseClause() {
-            var node = createNode(271 /* CaseClause */);
-            parseExpected(74 /* CaseKeyword */);
+            var node = createNode(272 /* CaseClause */);
+            parseExpected(75 /* CaseKeyword */);
             node.expression = allowInAnd(parseExpression);
             parseExpected(57 /* ColonToken */);
             node.statements = parseList(3 /* SwitchClauseStatements */, parseStatement);
             return finishNode(node);
         }
         function parseDefaultClause() {
-            var node = createNode(272 /* DefaultClause */);
-            parseExpected(80 /* DefaultKeyword */);
+            var node = createNode(273 /* DefaultClause */);
+            parseExpected(81 /* DefaultKeyword */);
             parseExpected(57 /* ColonToken */);
             node.statements = parseList(3 /* SwitchClauseStatements */, parseStatement);
             return finishNode(node);
         }
         function parseCaseOrDefaultClause() {
-            return token() === 74 /* CaseKeyword */ ? parseCaseClause() : parseDefaultClause();
+            return token() === 75 /* CaseKeyword */ ? parseCaseClause() : parseDefaultClause();
         }
         function parseSwitchStatement() {
-            var node = createNode(232 /* SwitchStatement */);
-            parseExpected(99 /* SwitchKeyword */);
+            var node = createNode(233 /* SwitchStatement */);
+            parseExpected(100 /* SwitchKeyword */);
             parseExpected(20 /* OpenParenToken */);
             node.expression = allowInAnd(parseExpression);
             parseExpected(21 /* CloseParenToken */);
-            var caseBlock = createNode(246 /* CaseBlock */);
+            var caseBlock = createNode(247 /* CaseBlock */);
             parseExpected(18 /* OpenBraceToken */);
             caseBlock.clauses = parseList(2 /* SwitchClauses */, parseCaseOrDefaultClause);
             parseExpected(19 /* CloseBraceToken */);
@@ -20969,29 +21241,29 @@ var ts;
             // directly as that might consume an expression on the following line.
             // We just return 'undefined' in that case.  The actual error will be reported in the
             // grammar walker.
-            var node = createNode(234 /* ThrowStatement */);
-            parseExpected(101 /* ThrowKeyword */);
+            var node = createNode(235 /* ThrowStatement */);
+            parseExpected(102 /* ThrowKeyword */);
             node.expression = scanner.hasPrecedingLineBreak() ? undefined : allowInAnd(parseExpression);
             parseSemicolon();
             return finishNode(node);
         }
         // TODO: Review for error recovery
         function parseTryStatement() {
-            var node = createNode(235 /* TryStatement */);
-            parseExpected(103 /* TryKeyword */);
+            var node = createNode(236 /* TryStatement */);
+            parseExpected(104 /* TryKeyword */);
             node.tryBlock = parseBlock(/*ignoreMissingOpenBrace*/ false);
-            node.catchClause = token() === 75 /* CatchKeyword */ ? parseCatchClause() : undefined;
+            node.catchClause = token() === 76 /* CatchKeyword */ ? parseCatchClause() : undefined;
             // If we don't have a catch clause, then we must have a finally clause.  Try to parse
             // one out no matter what.
-            if (!node.catchClause || token() === 88 /* FinallyKeyword */) {
-                parseExpected(88 /* FinallyKeyword */);
+            if (!node.catchClause || token() === 89 /* FinallyKeyword */) {
+                parseExpected(89 /* FinallyKeyword */);
                 node.finallyBlock = parseBlock(/*ignoreMissingOpenBrace*/ false);
             }
             return finishNode(node);
         }
         function parseCatchClause() {
-            var result = createNode(274 /* CatchClause */);
-            parseExpected(75 /* CatchKeyword */);
+            var result = createNode(275 /* CatchClause */);
+            parseExpected(76 /* CatchKeyword */);
             if (parseOptional(20 /* OpenParenToken */)) {
                 result.variableDeclaration = parseVariableDeclaration();
                 parseExpected(21 /* CloseParenToken */);
@@ -21004,8 +21276,8 @@ var ts;
             return finishNode(result);
         }
         function parseDebuggerStatement() {
-            var node = createNode(236 /* DebuggerStatement */);
-            parseExpected(79 /* DebuggerKeyword */);
+            var node = createNode(237 /* DebuggerStatement */);
+            parseExpected(80 /* DebuggerKeyword */);
             parseSemicolon();
             return finishNode(node);
         }
@@ -21015,13 +21287,13 @@ var ts;
             // a colon.
             var node = createNodeWithJSDoc(0 /* Unknown */);
             var expression = allowInAnd(parseExpression);
-            if (expression.kind === 72 /* Identifier */ && parseOptional(57 /* ColonToken */)) {
-                node.kind = 233 /* LabeledStatement */;
+            if (expression.kind === 73 /* Identifier */ && parseOptional(57 /* ColonToken */)) {
+                node.kind = 234 /* LabeledStatement */;
                 node.label = expression;
                 node.statement = parseStatement();
             }
             else {
-                node.kind = 221 /* ExpressionStatement */;
+                node.kind = 222 /* ExpressionStatement */;
                 node.expression = expression;
                 parseSemicolon();
             }
@@ -21033,11 +21305,11 @@ var ts;
         }
         function nextTokenIsClassKeywordOnSameLine() {
             nextToken();
-            return token() === 76 /* ClassKeyword */ && !scanner.hasPrecedingLineBreak();
+            return token() === 77 /* ClassKeyword */ && !scanner.hasPrecedingLineBreak();
         }
         function nextTokenIsFunctionKeywordOnSameLine() {
             nextToken();
-            return token() === 90 /* FunctionKeyword */ && !scanner.hasPrecedingLineBreak();
+            return token() === 91 /* FunctionKeyword */ && !scanner.hasPrecedingLineBreak();
         }
         function nextTokenIsIdentifierOrKeywordOrLiteralOnSameLine() {
             nextToken();
@@ -21046,12 +21318,12 @@ var ts;
         function isDeclaration() {
             while (true) {
                 switch (token()) {
-                    case 105 /* VarKeyword */:
-                    case 111 /* LetKeyword */:
-                    case 77 /* ConstKeyword */:
-                    case 90 /* FunctionKeyword */:
-                    case 76 /* ClassKeyword */:
-                    case 84 /* EnumKeyword */:
+                    case 106 /* VarKeyword */:
+                    case 112 /* LetKeyword */:
+                    case 78 /* ConstKeyword */:
+                    case 91 /* FunctionKeyword */:
+                    case 77 /* ClassKeyword */:
+                    case 85 /* EnumKeyword */:
                         return true;
                     // 'declare', 'module', 'namespace', 'interface'* and 'type' are all legal JavaScript identifiers;
                     // however, an identifier cannot be followed by another identifier on the same line. This is what we
@@ -21074,41 +21346,41 @@ var ts;
                     //   I {}
                     //
                     // could be legal, it would add complexity for very little gain.
-                    case 110 /* InterfaceKeyword */:
-                    case 140 /* TypeKeyword */:
+                    case 111 /* InterfaceKeyword */:
+                    case 141 /* TypeKeyword */:
                         return nextTokenIsIdentifierOnSameLine();
-                    case 130 /* ModuleKeyword */:
-                    case 131 /* NamespaceKeyword */:
+                    case 131 /* ModuleKeyword */:
+                    case 132 /* NamespaceKeyword */:
                         return nextTokenIsIdentifierOrStringLiteralOnSameLine();
-                    case 118 /* AbstractKeyword */:
-                    case 121 /* AsyncKeyword */:
-                    case 125 /* DeclareKeyword */:
-                    case 113 /* PrivateKeyword */:
-                    case 114 /* ProtectedKeyword */:
-                    case 115 /* PublicKeyword */:
-                    case 133 /* ReadonlyKeyword */:
+                    case 119 /* AbstractKeyword */:
+                    case 122 /* AsyncKeyword */:
+                    case 126 /* DeclareKeyword */:
+                    case 114 /* PrivateKeyword */:
+                    case 115 /* ProtectedKeyword */:
+                    case 116 /* PublicKeyword */:
+                    case 134 /* ReadonlyKeyword */:
                         nextToken();
                         // ASI takes effect for this modifier.
                         if (scanner.hasPrecedingLineBreak()) {
                             return false;
                         }
                         continue;
-                    case 145 /* GlobalKeyword */:
+                    case 146 /* GlobalKeyword */:
                         nextToken();
-                        return token() === 18 /* OpenBraceToken */ || token() === 72 /* Identifier */ || token() === 85 /* ExportKeyword */;
-                    case 92 /* ImportKeyword */:
+                        return token() === 18 /* OpenBraceToken */ || token() === 73 /* Identifier */ || token() === 86 /* ExportKeyword */;
+                    case 93 /* ImportKeyword */:
                         nextToken();
                         return token() === 10 /* StringLiteral */ || token() === 40 /* AsteriskToken */ ||
                             token() === 18 /* OpenBraceToken */ || ts.tokenIsIdentifierOrKeyword(token());
-                    case 85 /* ExportKeyword */:
+                    case 86 /* ExportKeyword */:
                         nextToken();
-                        if (token() === 59 /* EqualsToken */ || token() === 40 /* AsteriskToken */ ||
-                            token() === 18 /* OpenBraceToken */ || token() === 80 /* DefaultKeyword */ ||
-                            token() === 119 /* AsKeyword */) {
+                        if (token() === 60 /* EqualsToken */ || token() === 40 /* AsteriskToken */ ||
+                            token() === 18 /* OpenBraceToken */ || token() === 81 /* DefaultKeyword */ ||
+                            token() === 120 /* AsKeyword */) {
                             return true;
                         }
                         continue;
-                    case 116 /* StaticKeyword */:
+                    case 117 /* StaticKeyword */:
                         nextToken();
                         continue;
                     default:
@@ -21124,47 +21396,47 @@ var ts;
                 case 58 /* AtToken */:
                 case 26 /* SemicolonToken */:
                 case 18 /* OpenBraceToken */:
-                case 105 /* VarKeyword */:
-                case 111 /* LetKeyword */:
-                case 90 /* FunctionKeyword */:
-                case 76 /* ClassKeyword */:
-                case 84 /* EnumKeyword */:
-                case 91 /* IfKeyword */:
-                case 82 /* DoKeyword */:
-                case 107 /* WhileKeyword */:
-                case 89 /* ForKeyword */:
-                case 78 /* ContinueKeyword */:
-                case 73 /* BreakKeyword */:
-                case 97 /* ReturnKeyword */:
-                case 108 /* WithKeyword */:
-                case 99 /* SwitchKeyword */:
-                case 101 /* ThrowKeyword */:
-                case 103 /* TryKeyword */:
-                case 79 /* DebuggerKeyword */:
+                case 106 /* VarKeyword */:
+                case 112 /* LetKeyword */:
+                case 91 /* FunctionKeyword */:
+                case 77 /* ClassKeyword */:
+                case 85 /* EnumKeyword */:
+                case 92 /* IfKeyword */:
+                case 83 /* DoKeyword */:
+                case 108 /* WhileKeyword */:
+                case 90 /* ForKeyword */:
+                case 79 /* ContinueKeyword */:
+                case 74 /* BreakKeyword */:
+                case 98 /* ReturnKeyword */:
+                case 109 /* WithKeyword */:
+                case 100 /* SwitchKeyword */:
+                case 102 /* ThrowKeyword */:
+                case 104 /* TryKeyword */:
+                case 80 /* DebuggerKeyword */:
                 // 'catch' and 'finally' do not actually indicate that the code is part of a statement,
                 // however, we say they are here so that we may gracefully parse them and error later.
-                case 75 /* CatchKeyword */:
-                case 88 /* FinallyKeyword */:
+                case 76 /* CatchKeyword */:
+                case 89 /* FinallyKeyword */:
                     return true;
-                case 92 /* ImportKeyword */:
+                case 93 /* ImportKeyword */:
                     return isStartOfDeclaration() || lookAhead(nextTokenIsOpenParenOrLessThanOrDot);
-                case 77 /* ConstKeyword */:
-                case 85 /* ExportKeyword */:
+                case 78 /* ConstKeyword */:
+                case 86 /* ExportKeyword */:
                     return isStartOfDeclaration();
-                case 121 /* AsyncKeyword */:
-                case 125 /* DeclareKeyword */:
-                case 110 /* InterfaceKeyword */:
-                case 130 /* ModuleKeyword */:
-                case 131 /* NamespaceKeyword */:
-                case 140 /* TypeKeyword */:
-                case 145 /* GlobalKeyword */:
+                case 122 /* AsyncKeyword */:
+                case 126 /* DeclareKeyword */:
+                case 111 /* InterfaceKeyword */:
+                case 131 /* ModuleKeyword */:
+                case 132 /* NamespaceKeyword */:
+                case 141 /* TypeKeyword */:
+                case 146 /* GlobalKeyword */:
                     // When these don't start a declaration, they're an identifier in an expression statement
                     return true;
-                case 115 /* PublicKeyword */:
-                case 113 /* PrivateKeyword */:
-                case 114 /* ProtectedKeyword */:
-                case 116 /* StaticKeyword */:
-                case 133 /* ReadonlyKeyword */:
+                case 116 /* PublicKeyword */:
+                case 114 /* PrivateKeyword */:
+                case 115 /* ProtectedKeyword */:
+                case 117 /* StaticKeyword */:
+                case 134 /* ReadonlyKeyword */:
                     // When these don't start a declaration, they may be the start of a class member if an identifier
                     // immediately follows. Otherwise they're an identifier in an expression statement.
                     return isStartOfDeclaration() || !lookAhead(nextTokenIsIdentifierOrKeywordOnSameLine);
@@ -21187,63 +21459,63 @@ var ts;
                     return parseEmptyStatement();
                 case 18 /* OpenBraceToken */:
                     return parseBlock(/*ignoreMissingOpenBrace*/ false);
-                case 105 /* VarKeyword */:
-                    return parseVariableStatement(createNodeWithJSDoc(237 /* VariableDeclaration */));
-                case 111 /* LetKeyword */:
+                case 106 /* VarKeyword */:
+                    return parseVariableStatement(createNodeWithJSDoc(238 /* VariableDeclaration */));
+                case 112 /* LetKeyword */:
                     if (isLetDeclaration()) {
-                        return parseVariableStatement(createNodeWithJSDoc(237 /* VariableDeclaration */));
+                        return parseVariableStatement(createNodeWithJSDoc(238 /* VariableDeclaration */));
                     }
                     break;
-                case 90 /* FunctionKeyword */:
-                    return parseFunctionDeclaration(createNodeWithJSDoc(239 /* FunctionDeclaration */));
-                case 76 /* ClassKeyword */:
-                    return parseClassDeclaration(createNodeWithJSDoc(240 /* ClassDeclaration */));
-                case 91 /* IfKeyword */:
+                case 91 /* FunctionKeyword */:
+                    return parseFunctionDeclaration(createNodeWithJSDoc(240 /* FunctionDeclaration */));
+                case 77 /* ClassKeyword */:
+                    return parseClassDeclaration(createNodeWithJSDoc(241 /* ClassDeclaration */));
+                case 92 /* IfKeyword */:
                     return parseIfStatement();
-                case 82 /* DoKeyword */:
+                case 83 /* DoKeyword */:
                     return parseDoStatement();
-                case 107 /* WhileKeyword */:
+                case 108 /* WhileKeyword */:
                     return parseWhileStatement();
-                case 89 /* ForKeyword */:
+                case 90 /* ForKeyword */:
                     return parseForOrForInOrForOfStatement();
-                case 78 /* ContinueKeyword */:
-                    return parseBreakOrContinueStatement(228 /* ContinueStatement */);
-                case 73 /* BreakKeyword */:
-                    return parseBreakOrContinueStatement(229 /* BreakStatement */);
-                case 97 /* ReturnKeyword */:
+                case 79 /* ContinueKeyword */:
+                    return parseBreakOrContinueStatement(229 /* ContinueStatement */);
+                case 74 /* BreakKeyword */:
+                    return parseBreakOrContinueStatement(230 /* BreakStatement */);
+                case 98 /* ReturnKeyword */:
                     return parseReturnStatement();
-                case 108 /* WithKeyword */:
+                case 109 /* WithKeyword */:
                     return parseWithStatement();
-                case 99 /* SwitchKeyword */:
+                case 100 /* SwitchKeyword */:
                     return parseSwitchStatement();
-                case 101 /* ThrowKeyword */:
+                case 102 /* ThrowKeyword */:
                     return parseThrowStatement();
-                case 103 /* TryKeyword */:
+                case 104 /* TryKeyword */:
                 // Include 'catch' and 'finally' for error recovery.
-                case 75 /* CatchKeyword */:
-                case 88 /* FinallyKeyword */:
+                case 76 /* CatchKeyword */:
+                case 89 /* FinallyKeyword */:
                     return parseTryStatement();
-                case 79 /* DebuggerKeyword */:
+                case 80 /* DebuggerKeyword */:
                     return parseDebuggerStatement();
                 case 58 /* AtToken */:
                     return parseDeclaration();
-                case 121 /* AsyncKeyword */:
-                case 110 /* InterfaceKeyword */:
-                case 140 /* TypeKeyword */:
-                case 130 /* ModuleKeyword */:
-                case 131 /* NamespaceKeyword */:
-                case 125 /* DeclareKeyword */:
-                case 77 /* ConstKeyword */:
-                case 84 /* EnumKeyword */:
-                case 85 /* ExportKeyword */:
-                case 92 /* ImportKeyword */:
-                case 113 /* PrivateKeyword */:
-                case 114 /* ProtectedKeyword */:
-                case 115 /* PublicKeyword */:
-                case 118 /* AbstractKeyword */:
-                case 116 /* StaticKeyword */:
-                case 133 /* ReadonlyKeyword */:
-                case 145 /* GlobalKeyword */:
+                case 122 /* AsyncKeyword */:
+                case 111 /* InterfaceKeyword */:
+                case 141 /* TypeKeyword */:
+                case 131 /* ModuleKeyword */:
+                case 132 /* NamespaceKeyword */:
+                case 126 /* DeclareKeyword */:
+                case 78 /* ConstKeyword */:
+                case 85 /* EnumKeyword */:
+                case 86 /* ExportKeyword */:
+                case 93 /* ImportKeyword */:
+                case 114 /* PrivateKeyword */:
+                case 115 /* ProtectedKeyword */:
+                case 116 /* PublicKeyword */:
+                case 119 /* AbstractKeyword */:
+                case 117 /* StaticKeyword */:
+                case 134 /* ReadonlyKeyword */:
+                case 146 /* GlobalKeyword */:
                     if (isStartOfDeclaration()) {
                         return parseDeclaration();
                     }
@@ -21252,7 +21524,7 @@ var ts;
             return parseExpressionOrLabeledStatement();
         }
         function isDeclareModifier(modifier) {
-            return modifier.kind === 125 /* DeclareKeyword */;
+            return modifier.kind === 126 /* DeclareKeyword */;
         }
         function parseDeclaration() {
             var node = createNodeWithJSDoc(0 /* Unknown */);
@@ -21271,33 +21543,33 @@ var ts;
         }
         function parseDeclarationWorker(node) {
             switch (token()) {
-                case 105 /* VarKeyword */:
-                case 111 /* LetKeyword */:
-                case 77 /* ConstKeyword */:
+                case 106 /* VarKeyword */:
+                case 112 /* LetKeyword */:
+                case 78 /* ConstKeyword */:
                     return parseVariableStatement(node);
-                case 90 /* FunctionKeyword */:
+                case 91 /* FunctionKeyword */:
                     return parseFunctionDeclaration(node);
-                case 76 /* ClassKeyword */:
+                case 77 /* ClassKeyword */:
                     return parseClassDeclaration(node);
-                case 110 /* InterfaceKeyword */:
+                case 111 /* InterfaceKeyword */:
                     return parseInterfaceDeclaration(node);
-                case 140 /* TypeKeyword */:
+                case 141 /* TypeKeyword */:
                     return parseTypeAliasDeclaration(node);
-                case 84 /* EnumKeyword */:
+                case 85 /* EnumKeyword */:
                     return parseEnumDeclaration(node);
-                case 145 /* GlobalKeyword */:
-                case 130 /* ModuleKeyword */:
-                case 131 /* NamespaceKeyword */:
+                case 146 /* GlobalKeyword */:
+                case 131 /* ModuleKeyword */:
+                case 132 /* NamespaceKeyword */:
                     return parseModuleDeclaration(node);
-                case 92 /* ImportKeyword */:
+                case 93 /* ImportKeyword */:
                     return parseImportDeclarationOrImportEqualsDeclaration(node);
-                case 85 /* ExportKeyword */:
+                case 86 /* ExportKeyword */:
                     nextToken();
                     switch (token()) {
-                        case 80 /* DefaultKeyword */:
-                        case 59 /* EqualsToken */:
+                        case 81 /* DefaultKeyword */:
+                        case 60 /* EqualsToken */:
                             return parseExportAssignment(node);
-                        case 119 /* AsKeyword */:
+                        case 120 /* AsKeyword */:
                             return parseNamespaceExportDeclaration(node);
                         default:
                             return parseExportDeclaration(node);
@@ -21306,7 +21578,7 @@ var ts;
                     if (node.decorators || node.modifiers) {
                         // We reached this point because we encountered decorators and/or modifiers and assumed a declaration
                         // would follow. For recovery and error reporting purposes, return an incomplete declaration.
-                        var missing = createMissingNode(258 /* MissingDeclaration */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Declaration_expected);
+                        var missing = createMissingNode(259 /* MissingDeclaration */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Declaration_expected);
                         missing.pos = node.pos;
                         missing.decorators = node.decorators;
                         missing.modifiers = node.modifiers;
@@ -21329,16 +21601,16 @@ var ts;
         // DECLARATIONS
         function parseArrayBindingElement() {
             if (token() === 27 /* CommaToken */) {
-                return createNode(210 /* OmittedExpression */);
+                return createNode(211 /* OmittedExpression */);
             }
-            var node = createNode(186 /* BindingElement */);
+            var node = createNode(187 /* BindingElement */);
             node.dotDotDotToken = parseOptionalToken(25 /* DotDotDotToken */);
             node.name = parseIdentifierOrPattern();
             node.initializer = parseInitializer();
             return finishNode(node);
         }
         function parseObjectBindingElement() {
-            var node = createNode(186 /* BindingElement */);
+            var node = createNode(187 /* BindingElement */);
             node.dotDotDotToken = parseOptionalToken(25 /* DotDotDotToken */);
             var tokenIsIdentifier = isIdentifier();
             var propertyName = parsePropertyName();
@@ -21354,14 +21626,14 @@ var ts;
             return finishNode(node);
         }
         function parseObjectBindingPattern() {
-            var node = createNode(184 /* ObjectBindingPattern */);
+            var node = createNode(185 /* ObjectBindingPattern */);
             parseExpected(18 /* OpenBraceToken */);
             node.elements = parseDelimitedList(9 /* ObjectBindingElements */, parseObjectBindingElement);
             parseExpected(19 /* CloseBraceToken */);
             return finishNode(node);
         }
         function parseArrayBindingPattern() {
-            var node = createNode(185 /* ArrayBindingPattern */);
+            var node = createNode(186 /* ArrayBindingPattern */);
             parseExpected(22 /* OpenBracketToken */);
             node.elements = parseDelimitedList(10 /* ArrayBindingElements */, parseArrayBindingElement);
             parseExpected(23 /* CloseBracketToken */);
@@ -21383,9 +21655,9 @@ var ts;
             return parseVariableDeclaration(/*allowExclamation*/ true);
         }
         function parseVariableDeclaration(allowExclamation) {
-            var node = createNode(237 /* VariableDeclaration */);
+            var node = createNode(238 /* VariableDeclaration */);
             node.name = parseIdentifierOrPattern();
-            if (allowExclamation && node.name.kind === 72 /* Identifier */ &&
+            if (allowExclamation && node.name.kind === 73 /* Identifier */ &&
                 token() === 52 /* ExclamationToken */ && !scanner.hasPrecedingLineBreak()) {
                 node.exclamationToken = parseTokenNode();
             }
@@ -21396,14 +21668,14 @@ var ts;
             return finishNode(node);
         }
         function parseVariableDeclarationList(inForStatementInitializer) {
-            var node = createNode(238 /* VariableDeclarationList */);
+            var node = createNode(239 /* VariableDeclarationList */);
             switch (token()) {
-                case 105 /* VarKeyword */:
+                case 106 /* VarKeyword */:
                     break;
-                case 111 /* LetKeyword */:
+                case 112 /* LetKeyword */:
                     node.flags |= 1 /* Let */;
                     break;
-                case 77 /* ConstKeyword */:
+                case 78 /* ConstKeyword */:
                     node.flags |= 2 /* Const */;
                     break;
                 default:
@@ -21419,7 +21691,7 @@ var ts;
             // So we need to look ahead to determine if 'of' should be treated as a keyword in
             // this context.
             // The checker will then give an error that there is an empty declaration list.
-            if (token() === 147 /* OfKeyword */ && lookAhead(canFollowContextualOfKeyword)) {
+            if (token() === 148 /* OfKeyword */ && lookAhead(canFollowContextualOfKeyword)) {
                 node.declarations = createMissingList();
             }
             else {
@@ -21434,14 +21706,14 @@ var ts;
             return nextTokenIsIdentifier() && nextToken() === 21 /* CloseParenToken */;
         }
         function parseVariableStatement(node) {
-            node.kind = 219 /* VariableStatement */;
+            node.kind = 220 /* VariableStatement */;
             node.declarationList = parseVariableDeclarationList(/*inForStatementInitializer*/ false);
             parseSemicolon();
             return finishNode(node);
         }
         function parseFunctionDeclaration(node) {
-            node.kind = 239 /* FunctionDeclaration */;
-            parseExpected(90 /* FunctionKeyword */);
+            node.kind = 240 /* FunctionDeclaration */;
+            parseExpected(91 /* FunctionKeyword */);
             node.asteriskToken = parseOptionalToken(40 /* AsteriskToken */);
             node.name = ts.hasModifier(node, 512 /* Default */) ? parseOptionalIdentifier() : parseIdentifier();
             var isGenerator = node.asteriskToken ? 1 /* Yield */ : 0 /* None */;
@@ -21450,15 +21722,29 @@ var ts;
             node.body = parseFunctionBlockOrSemicolon(isGenerator | isAsync, ts.Diagnostics.or_expected);
             return finishNode(node);
         }
-        function parseConstructorDeclaration(node) {
-            node.kind = 157 /* Constructor */;
-            parseExpected(124 /* ConstructorKeyword */);
-            fillSignature(57 /* ColonToken */, 0 /* None */, node);
-            node.body = parseFunctionBlockOrSemicolon(0 /* None */, ts.Diagnostics.or_expected);
-            return finishNode(node);
+        function parseConstructorName() {
+            if (token() === 125 /* ConstructorKeyword */) {
+                return parseExpected(125 /* ConstructorKeyword */);
+            }
+            if (token() === 10 /* StringLiteral */ && lookAhead(nextToken) === 20 /* OpenParenToken */) {
+                return tryParse(function () {
+                    var literalNode = parseLiteralNode();
+                    return literalNode.text === "constructor" ? literalNode : undefined;
+                });
+            }
+        }
+        function tryParseConstructorDeclaration(node) {
+            return tryParse(function () {
+                if (parseConstructorName()) {
+                    node.kind = 158 /* Constructor */;
+                    fillSignature(57 /* ColonToken */, 0 /* None */, node);
+                    node.body = parseFunctionBlockOrSemicolon(0 /* None */, ts.Diagnostics.or_expected);
+                    return finishNode(node);
+                }
+            });
         }
         function parseMethodDeclaration(node, asteriskToken, diagnosticMessage) {
-            node.kind = 156 /* MethodDeclaration */;
+            node.kind = 157 /* MethodDeclaration */;
             node.asteriskToken = asteriskToken;
             var isGenerator = asteriskToken ? 1 /* Yield */ : 0 /* None */;
             var isAsync = ts.hasModifier(node, 256 /* Async */) ? 2 /* Await */ : 0 /* None */;
@@ -21467,7 +21753,7 @@ var ts;
             return finishNode(node);
         }
         function parsePropertyDeclaration(node) {
-            node.kind = 154 /* PropertyDeclaration */;
+            node.kind = 155 /* PropertyDeclaration */;
             if (!node.questionToken && token() === 52 /* ExclamationToken */ && !scanner.hasPrecedingLineBreak()) {
                 node.exclamationToken = parseTokenNode();
             }
@@ -21540,7 +21826,7 @@ var ts;
             // If we were able to get any potential identifier...
             if (idToken !== undefined) {
                 // If we have a non-keyword identifier, or if we have an accessor, then it's safe to parse.
-                if (!ts.isKeyword(idToken) || idToken === 137 /* SetKeyword */ || idToken === 126 /* GetKeyword */) {
+                if (!ts.isKeyword(idToken) || idToken === 138 /* SetKeyword */ || idToken === 127 /* GetKeyword */) {
                     return true;
                 }
                 // If it *is* a keyword, but not an accessor, check a little farther along
@@ -21550,7 +21836,7 @@ var ts;
                     case 28 /* LessThanToken */: // Generic Method declaration
                     case 52 /* ExclamationToken */: // Non-null assertion on property name
                     case 57 /* ColonToken */: // Type Annotation for declaration
-                    case 59 /* EqualsToken */: // Initializer for declaration
+                    case 60 /* EqualsToken */: // Initializer for declaration
                     case 56 /* QuestionToken */: // Not valid, but permitted so that it gets caught later on.
                         return true;
                     default:
@@ -21572,7 +21858,7 @@ var ts;
                 if (!parseOptional(58 /* AtToken */)) {
                     break;
                 }
-                var decorator = createNode(152 /* Decorator */, decoratorStart);
+                var decorator = createNode(153 /* Decorator */, decoratorStart);
                 decorator.expression = doInDecoratorContext(parseLeftHandSideExpressionOrHigher);
                 finishNode(decorator);
                 (list || (list = [])).push(decorator);
@@ -21592,7 +21878,7 @@ var ts;
             while (true) {
                 var modifierStart = scanner.getStartPos();
                 var modifierKind = token();
-                if (token() === 77 /* ConstKeyword */ && permitInvalidConstAsModifier) {
+                if (token() === 78 /* ConstKeyword */ && permitInvalidConstAsModifier) {
                     // We need to ensure that any subsequent modifiers appear on the same line
                     // so that when 'const' is a standalone declaration, we don't issue an error.
                     if (!tryParse(nextTokenIsOnSameLineAndCanFollowModifier)) {
@@ -21611,7 +21897,7 @@ var ts;
         }
         function parseModifiersForArrowFunction() {
             var modifiers;
-            if (token() === 121 /* AsyncKeyword */) {
+            if (token() === 122 /* AsyncKeyword */) {
                 var modifierStart = scanner.getStartPos();
                 var modifierKind = token();
                 nextToken();
@@ -21622,21 +21908,24 @@ var ts;
         }
         function parseClassElement() {
             if (token() === 26 /* SemicolonToken */) {
-                var result = createNode(217 /* SemicolonClassElement */);
+                var result = createNode(218 /* SemicolonClassElement */);
                 nextToken();
                 return finishNode(result);
             }
             var node = createNodeWithJSDoc(0 /* Unknown */);
             node.decorators = parseDecorators();
             node.modifiers = parseModifiers(/*permitInvalidConstAsModifier*/ true);
-            if (parseContextualModifier(126 /* GetKeyword */)) {
-                return parseAccessorDeclaration(node, 158 /* GetAccessor */);
+            if (parseContextualModifier(127 /* GetKeyword */)) {
+                return parseAccessorDeclaration(node, 159 /* GetAccessor */);
             }
-            if (parseContextualModifier(137 /* SetKeyword */)) {
-                return parseAccessorDeclaration(node, 159 /* SetAccessor */);
+            if (parseContextualModifier(138 /* SetKeyword */)) {
+                return parseAccessorDeclaration(node, 160 /* SetAccessor */);
             }
-            if (token() === 124 /* ConstructorKeyword */) {
-                return parseConstructorDeclaration(node);
+            if (token() === 125 /* ConstructorKeyword */ || token() === 10 /* StringLiteral */) {
+                var constructorDeclaration = tryParseConstructorDeclaration(node);
+                if (constructorDeclaration) {
+                    return constructorDeclaration;
+                }
             }
             if (isIndexSignature()) {
                 return parseIndexSignatureDeclaration(node);
@@ -21652,21 +21941,21 @@ var ts;
             }
             if (node.decorators || node.modifiers) {
                 // treat this as a property declaration with a missing name.
-                node.name = createMissingNode(72 /* Identifier */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Declaration_expected);
+                node.name = createMissingNode(73 /* Identifier */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Declaration_expected);
                 return parsePropertyDeclaration(node);
             }
             // 'isClassMemberStart' should have hinted not to attempt parsing.
             return ts.Debug.fail("Should not have attempted to parse class member declaration.");
         }
         function parseClassExpression() {
-            return parseClassDeclarationOrExpression(createNodeWithJSDoc(0 /* Unknown */), 209 /* ClassExpression */);
+            return parseClassDeclarationOrExpression(createNodeWithJSDoc(0 /* Unknown */), 210 /* ClassExpression */);
         }
         function parseClassDeclaration(node) {
-            return parseClassDeclarationOrExpression(node, 240 /* ClassDeclaration */);
+            return parseClassDeclarationOrExpression(node, 241 /* ClassDeclaration */);
         }
         function parseClassDeclarationOrExpression(node, kind) {
             node.kind = kind;
-            parseExpected(76 /* ClassKeyword */);
+            parseExpected(77 /* ClassKeyword */);
             node.name = parseNameOfClassDeclarationOrExpression();
             node.typeParameters = parseTypeParameters();
             node.heritageClauses = parseHeritageClauses();
@@ -21692,7 +21981,7 @@ var ts;
                 : undefined;
         }
         function isImplementsClause() {
-            return token() === 109 /* ImplementsKeyword */ && lookAhead(nextTokenIsIdentifierOrKeyword);
+            return token() === 110 /* ImplementsKeyword */ && lookAhead(nextTokenIsIdentifierOrKeyword);
         }
         function parseHeritageClauses() {
             // ClassTail[Yield,Await] : (Modified) See 14.5
@@ -21704,15 +21993,15 @@ var ts;
         }
         function parseHeritageClause() {
             var tok = token();
-            ts.Debug.assert(tok === 86 /* ExtendsKeyword */ || tok === 109 /* ImplementsKeyword */); // isListElement() should ensure this.
-            var node = createNode(273 /* HeritageClause */);
+            ts.Debug.assert(tok === 87 /* ExtendsKeyword */ || tok === 110 /* ImplementsKeyword */); // isListElement() should ensure this.
+            var node = createNode(274 /* HeritageClause */);
             node.token = tok;
             nextToken();
             node.types = parseDelimitedList(7 /* HeritageClauseElement */, parseExpressionWithTypeArguments);
             return finishNode(node);
         }
         function parseExpressionWithTypeArguments() {
-            var node = createNode(211 /* ExpressionWithTypeArguments */);
+            var node = createNode(212 /* ExpressionWithTypeArguments */);
             node.expression = parseLeftHandSideExpressionOrHigher();
             node.typeArguments = tryParseTypeArguments();
             return finishNode(node);
@@ -21723,14 +22012,14 @@ var ts;
                 : undefined;
         }
         function isHeritageClause() {
-            return token() === 86 /* ExtendsKeyword */ || token() === 109 /* ImplementsKeyword */;
+            return token() === 87 /* ExtendsKeyword */ || token() === 110 /* ImplementsKeyword */;
         }
         function parseClassMembers() {
             return parseList(5 /* ClassMembers */, parseClassElement);
         }
         function parseInterfaceDeclaration(node) {
-            node.kind = 241 /* InterfaceDeclaration */;
-            parseExpected(110 /* InterfaceKeyword */);
+            node.kind = 242 /* InterfaceDeclaration */;
+            parseExpected(111 /* InterfaceKeyword */);
             node.name = parseIdentifier();
             node.typeParameters = parseTypeParameters();
             node.heritageClauses = parseHeritageClauses();
@@ -21738,11 +22027,11 @@ var ts;
             return finishNode(node);
         }
         function parseTypeAliasDeclaration(node) {
-            node.kind = 242 /* TypeAliasDeclaration */;
-            parseExpected(140 /* TypeKeyword */);
+            node.kind = 243 /* TypeAliasDeclaration */;
+            parseExpected(141 /* TypeKeyword */);
             node.name = parseIdentifier();
             node.typeParameters = parseTypeParameters();
-            parseExpected(59 /* EqualsToken */);
+            parseExpected(60 /* EqualsToken */);
             node.type = parseType();
             parseSemicolon();
             return finishNode(node);
@@ -21752,14 +22041,14 @@ var ts;
         // ConstantEnumMemberSection, which starts at the beginning of an enum declaration
         // or any time an integer literal initializer is encountered.
         function parseEnumMember() {
-            var node = createNodeWithJSDoc(278 /* EnumMember */);
+            var node = createNodeWithJSDoc(279 /* EnumMember */);
             node.name = parsePropertyName();
             node.initializer = allowInAnd(parseInitializer);
             return finishNode(node);
         }
         function parseEnumDeclaration(node) {
-            node.kind = 243 /* EnumDeclaration */;
-            parseExpected(84 /* EnumKeyword */);
+            node.kind = 244 /* EnumDeclaration */;
+            parseExpected(85 /* EnumKeyword */);
             node.name = parseIdentifier();
             if (parseExpected(18 /* OpenBraceToken */)) {
                 node.members = parseDelimitedList(6 /* EnumMembers */, parseEnumMember);
@@ -21771,7 +22060,7 @@ var ts;
             return finishNode(node);
         }
         function parseModuleBlock() {
-            var node = createNode(245 /* ModuleBlock */);
+            var node = createNode(246 /* ModuleBlock */);
             if (parseExpected(18 /* OpenBraceToken */)) {
                 node.statements = parseList(1 /* BlockStatements */, parseStatement);
                 parseExpected(19 /* CloseBraceToken */);
@@ -21782,7 +22071,7 @@ var ts;
             return finishNode(node);
         }
         function parseModuleOrNamespaceDeclaration(node, flags) {
-            node.kind = 244 /* ModuleDeclaration */;
+            node.kind = 245 /* ModuleDeclaration */;
             // If we are parsing a dotted namespace name, we want to
             // propagate the 'Namespace' flag across the names if set.
             var namespaceFlag = flags & 16 /* Namespace */;
@@ -21794,8 +22083,8 @@ var ts;
             return finishNode(node);
         }
         function parseAmbientExternalModuleDeclaration(node) {
-            node.kind = 244 /* ModuleDeclaration */;
-            if (token() === 145 /* GlobalKeyword */) {
+            node.kind = 245 /* ModuleDeclaration */;
+            if (token() === 146 /* GlobalKeyword */) {
                 // parse 'global' as name of global scope augmentation
                 node.name = parseIdentifier();
                 node.flags |= 512 /* GlobalAugmentation */;
@@ -21814,15 +22103,15 @@ var ts;
         }
         function parseModuleDeclaration(node) {
             var flags = 0;
-            if (token() === 145 /* GlobalKeyword */) {
+            if (token() === 146 /* GlobalKeyword */) {
                 // global augmentation
                 return parseAmbientExternalModuleDeclaration(node);
             }
-            else if (parseOptional(131 /* NamespaceKeyword */)) {
+            else if (parseOptional(132 /* NamespaceKeyword */)) {
                 flags |= 16 /* Namespace */;
             }
             else {
-                parseExpected(130 /* ModuleKeyword */);
+                parseExpected(131 /* ModuleKeyword */);
                 if (token() === 10 /* StringLiteral */) {
                     return parseAmbientExternalModuleDeclaration(node);
                 }
@@ -21830,7 +22119,7 @@ var ts;
             return parseModuleOrNamespaceDeclaration(node, flags);
         }
         function isExternalModuleReference() {
-            return token() === 134 /* RequireKeyword */ &&
+            return token() === 135 /* RequireKeyword */ &&
                 lookAhead(nextTokenIsOpenParen);
         }
         function nextTokenIsOpenParen() {
@@ -21840,25 +22129,25 @@ var ts;
             return nextToken() === 42 /* SlashToken */;
         }
         function parseNamespaceExportDeclaration(node) {
-            node.kind = 247 /* NamespaceExportDeclaration */;
-            parseExpected(119 /* AsKeyword */);
-            parseExpected(131 /* NamespaceKeyword */);
+            node.kind = 248 /* NamespaceExportDeclaration */;
+            parseExpected(120 /* AsKeyword */);
+            parseExpected(132 /* NamespaceKeyword */);
             node.name = parseIdentifier();
             parseSemicolon();
             return finishNode(node);
         }
         function parseImportDeclarationOrImportEqualsDeclaration(node) {
-            parseExpected(92 /* ImportKeyword */);
+            parseExpected(93 /* ImportKeyword */);
             var afterImportPos = scanner.getStartPos();
             var identifier;
             if (isIdentifier()) {
                 identifier = parseIdentifier();
-                if (token() !== 27 /* CommaToken */ && token() !== 144 /* FromKeyword */) {
+                if (token() !== 27 /* CommaToken */ && token() !== 145 /* FromKeyword */) {
                     return parseImportEqualsDeclaration(node, identifier);
                 }
             }
             // Import statement
-            node.kind = 249 /* ImportDeclaration */;
+            node.kind = 250 /* ImportDeclaration */;
             // ImportDeclaration:
             //  import ImportClause from ModuleSpecifier ;
             //  import ModuleSpecifier;
@@ -21866,16 +22155,16 @@ var ts;
                 token() === 40 /* AsteriskToken */ || // import *
                 token() === 18 /* OpenBraceToken */) { // import {
                 node.importClause = parseImportClause(identifier, afterImportPos);
-                parseExpected(144 /* FromKeyword */);
+                parseExpected(145 /* FromKeyword */);
             }
             node.moduleSpecifier = parseModuleSpecifier();
             parseSemicolon();
             return finishNode(node);
         }
         function parseImportEqualsDeclaration(node, identifier) {
-            node.kind = 248 /* ImportEqualsDeclaration */;
+            node.kind = 249 /* ImportEqualsDeclaration */;
             node.name = identifier;
-            parseExpected(59 /* EqualsToken */);
+            parseExpected(60 /* EqualsToken */);
             node.moduleReference = parseModuleReference();
             parseSemicolon();
             return finishNode(node);
@@ -21887,7 +22176,7 @@ var ts;
             //  NamedImports
             //  ImportedDefaultBinding, NameSpaceImport
             //  ImportedDefaultBinding, NamedImports
-            var importClause = createNode(250 /* ImportClause */, fullStart);
+            var importClause = createNode(251 /* ImportClause */, fullStart);
             if (identifier) {
                 // ImportedDefaultBinding:
                 //  ImportedBinding
@@ -21897,7 +22186,7 @@ var ts;
             // parse namespace or named imports
             if (!importClause.name ||
                 parseOptional(27 /* CommaToken */)) {
-                importClause.namedBindings = token() === 40 /* AsteriskToken */ ? parseNamespaceImport() : parseNamedImportsOrExports(252 /* NamedImports */);
+                importClause.namedBindings = token() === 40 /* AsteriskToken */ ? parseNamespaceImport() : parseNamedImportsOrExports(253 /* NamedImports */);
             }
             return finishNode(importClause);
         }
@@ -21907,8 +22196,8 @@ var ts;
                 : parseEntityName(/*allowReservedWords*/ false);
         }
         function parseExternalModuleReference() {
-            var node = createNode(259 /* ExternalModuleReference */);
-            parseExpected(134 /* RequireKeyword */);
+            var node = createNode(260 /* ExternalModuleReference */);
+            parseExpected(135 /* RequireKeyword */);
             parseExpected(20 /* OpenParenToken */);
             node.expression = parseModuleSpecifier();
             parseExpected(21 /* CloseParenToken */);
@@ -21930,9 +22219,9 @@ var ts;
         function parseNamespaceImport() {
             // NameSpaceImport:
             //  * as ImportedBinding
-            var namespaceImport = createNode(251 /* NamespaceImport */);
+            var namespaceImport = createNode(252 /* NamespaceImport */);
             parseExpected(40 /* AsteriskToken */);
-            parseExpected(119 /* AsKeyword */);
+            parseExpected(120 /* AsKeyword */);
             namespaceImport.name = parseIdentifier();
             return finishNode(namespaceImport);
         }
@@ -21945,14 +22234,14 @@ var ts;
             // ImportsList:
             //  ImportSpecifier
             //  ImportsList, ImportSpecifier
-            node.elements = parseBracketedList(23 /* ImportOrExportSpecifiers */, kind === 252 /* NamedImports */ ? parseImportSpecifier : parseExportSpecifier, 18 /* OpenBraceToken */, 19 /* CloseBraceToken */);
+            node.elements = parseBracketedList(23 /* ImportOrExportSpecifiers */, kind === 253 /* NamedImports */ ? parseImportSpecifier : parseExportSpecifier, 18 /* OpenBraceToken */, 19 /* CloseBraceToken */);
             return finishNode(node);
         }
         function parseExportSpecifier() {
-            return parseImportOrExportSpecifier(257 /* ExportSpecifier */);
+            return parseImportOrExportSpecifier(258 /* ExportSpecifier */);
         }
         function parseImportSpecifier() {
-            return parseImportOrExportSpecifier(253 /* ImportSpecifier */);
+            return parseImportOrExportSpecifier(254 /* ImportSpecifier */);
         }
         function parseImportOrExportSpecifier(kind) {
             var node = createNode(kind);
@@ -21966,9 +22255,9 @@ var ts;
             var checkIdentifierStart = scanner.getTokenPos();
             var checkIdentifierEnd = scanner.getTextPos();
             var identifierName = parseIdentifierName();
-            if (token() === 119 /* AsKeyword */) {
+            if (token() === 120 /* AsKeyword */) {
                 node.propertyName = identifierName;
-                parseExpected(119 /* AsKeyword */);
+                parseExpected(120 /* AsKeyword */);
                 checkIdentifierIsKeyword = ts.isKeyword(token()) && !isIdentifier();
                 checkIdentifierStart = scanner.getTokenPos();
                 checkIdentifierEnd = scanner.getTextPos();
@@ -21977,24 +22266,24 @@ var ts;
             else {
                 node.name = identifierName;
             }
-            if (kind === 253 /* ImportSpecifier */ && checkIdentifierIsKeyword) {
+            if (kind === 254 /* ImportSpecifier */ && checkIdentifierIsKeyword) {
                 parseErrorAt(checkIdentifierStart, checkIdentifierEnd, ts.Diagnostics.Identifier_expected);
             }
             return finishNode(node);
         }
         function parseExportDeclaration(node) {
-            node.kind = 255 /* ExportDeclaration */;
+            node.kind = 256 /* ExportDeclaration */;
             if (parseOptional(40 /* AsteriskToken */)) {
-                parseExpected(144 /* FromKeyword */);
+                parseExpected(145 /* FromKeyword */);
                 node.moduleSpecifier = parseModuleSpecifier();
             }
             else {
-                node.exportClause = parseNamedImportsOrExports(256 /* NamedExports */);
+                node.exportClause = parseNamedImportsOrExports(257 /* NamedExports */);
                 // It is not uncommon to accidentally omit the 'from' keyword. Additionally, in editing scenarios,
                 // the 'from' keyword can be parsed as a named export when the export clause is unterminated (i.e. `export { from "moduleName";`)
                 // If we don't have a 'from' keyword, see if we have a string literal such that ASI won't take effect.
-                if (token() === 144 /* FromKeyword */ || (token() === 10 /* StringLiteral */ && !scanner.hasPrecedingLineBreak())) {
-                    parseExpected(144 /* FromKeyword */);
+                if (token() === 145 /* FromKeyword */ || (token() === 10 /* StringLiteral */ && !scanner.hasPrecedingLineBreak())) {
+                    parseExpected(145 /* FromKeyword */);
                     node.moduleSpecifier = parseModuleSpecifier();
                 }
             }
@@ -22002,12 +22291,12 @@ var ts;
             return finishNode(node);
         }
         function parseExportAssignment(node) {
-            node.kind = 254 /* ExportAssignment */;
-            if (parseOptional(59 /* EqualsToken */)) {
+            node.kind = 255 /* ExportAssignment */;
+            if (parseOptional(60 /* EqualsToken */)) {
                 node.isExportEquals = true;
             }
             else {
-                parseExpected(80 /* DefaultKeyword */);
+                parseExpected(81 /* DefaultKeyword */);
             }
             node.expression = parseAssignmentExpressionOrHigher();
             parseSemicolon();
@@ -22022,10 +22311,10 @@ var ts;
         }
         function isAnExternalModuleIndicatorNode(node) {
             return ts.hasModifier(node, 1 /* Export */)
-                || node.kind === 248 /* ImportEqualsDeclaration */ && node.moduleReference.kind === 259 /* ExternalModuleReference */
-                || node.kind === 249 /* ImportDeclaration */
-                || node.kind === 254 /* ExportAssignment */
-                || node.kind === 255 /* ExportDeclaration */
+                || node.kind === 249 /* ImportEqualsDeclaration */ && node.moduleReference.kind === 260 /* ExternalModuleReference */
+                || node.kind === 250 /* ImportDeclaration */
+                || node.kind === 255 /* ExportAssignment */
+                || node.kind === 256 /* ExportDeclaration */
                 ? node
                 : undefined;
         }
@@ -22038,7 +22327,7 @@ var ts;
             return isImportMeta(node) ? node : forEachChild(node, walkTreeForExternalModuleIndicators);
         }
         function isImportMeta(node) {
-            return ts.isMetaProperty(node) && node.keywordToken === 92 /* ImportKeyword */ && node.name.escapedText === "meta";
+            return ts.isMetaProperty(node) && node.keywordToken === 93 /* ImportKeyword */ && node.name.escapedText === "meta";
         }
         var ParsingContext;
         (function (ParsingContext) {
@@ -22077,8 +22366,8 @@ var ts;
         var JSDocParser;
         (function (JSDocParser) {
             function parseJSDocTypeExpressionForTests(content, start, length) {
-                initializeState(content, 7 /* Latest */, /*_syntaxCursor:*/ undefined, 1 /* JS */);
-                sourceFile = createSourceFile("file.js", 7 /* Latest */, 1 /* JS */, /*isDeclarationFile*/ false);
+                initializeState(content, 99 /* Latest */, /*_syntaxCursor:*/ undefined, 1 /* JS */);
+                sourceFile = createSourceFile("file.js", 99 /* Latest */, 1 /* JS */, /*isDeclarationFile*/ false);
                 scanner.setText(content, start, length);
                 currentToken = scanner.scan();
                 var jsDocTypeExpression = parseJSDocTypeExpression();
@@ -22089,18 +22378,18 @@ var ts;
             JSDocParser.parseJSDocTypeExpressionForTests = parseJSDocTypeExpressionForTests;
             // Parses out a JSDoc type expression.
             function parseJSDocTypeExpression(mayOmitBraces) {
-                var result = createNode(288 /* JSDocTypeExpression */);
+                var result = createNode(289 /* JSDocTypeExpression */);
                 var hasBrace = (mayOmitBraces ? parseOptional : parseExpected)(18 /* OpenBraceToken */);
                 result.type = doInsideOfContext(2097152 /* JSDoc */, parseJSDocType);
                 if (!mayOmitBraces || hasBrace) {
-                    parseExpected(19 /* CloseBraceToken */);
+                    parseExpectedJSDoc(19 /* CloseBraceToken */);
                 }
                 fixupParentReferences(result);
                 return finishNode(result);
             }
             JSDocParser.parseJSDocTypeExpression = parseJSDocTypeExpression;
             function parseIsolatedJSDocComment(content, start, length) {
-                initializeState(content, 7 /* Latest */, /*_syntaxCursor:*/ undefined, 1 /* JS */);
+                initializeState(content, 99 /* Latest */, /*_syntaxCursor:*/ undefined, 1 /* JS */);
                 sourceFile = { languageVariant: 0 /* Standard */, text: content }; // tslint:disable-line no-object-literal-type-assertion
                 var jsDoc = parseJSDocCommentWorker(start, length);
                 var diagnostics = parseDiagnostics;
@@ -22134,6 +22423,7 @@ var ts;
                 JSDocState[JSDocState["BeginningOfLine"] = 0] = "BeginningOfLine";
                 JSDocState[JSDocState["SawAsterisk"] = 1] = "SawAsterisk";
                 JSDocState[JSDocState["SavingComments"] = 2] = "SavingComments";
+                JSDocState[JSDocState["SavingBackticks"] = 3] = "SavingBackticks";
             })(JSDocState || (JSDocState = {}));
             var PropertyLikeParse;
             (function (PropertyLikeParse) {
@@ -22172,7 +22462,7 @@ var ts;
                         comments.push(text);
                         indent += text.length;
                     }
-                    nextJSDocToken();
+                    nextTokenJSDoc();
                     while (parseOptionalJsdoc(5 /* WhitespaceTrivia */))
                         ;
                     if (parseOptionalJsdoc(4 /* NewLineTrivia */)) {
@@ -22190,7 +22480,6 @@ var ts;
                                     // for malformed examples like `/** @param {string} x @returns {number} the length */`
                                     state = 0 /* BeginningOfLine */;
                                     margin = undefined;
-                                    indent++;
                                 }
                                 else {
                                     pushComment(scanner.getTokenText());
@@ -22235,7 +22524,7 @@ var ts;
                                 pushComment(scanner.getTokenText());
                                 break;
                         }
-                        nextJSDocToken();
+                        nextTokenJSDoc();
                     }
                     removeLeadingNewlines(comments);
                     removeTrailingWhitespace(comments);
@@ -22252,7 +22541,7 @@ var ts;
                     }
                 }
                 function createJSDocComment() {
-                    var result = createNode(296 /* JSDocComment */, start);
+                    var result = createNode(297 /* JSDocComment */, start);
                     result.tags = tags && createNodeArray(tags, tagsPos, tagsEnd);
                     result.comment = comments.length ? comments.join("") : undefined;
                     return finishNode(result, end);
@@ -22260,7 +22549,7 @@ var ts;
                 function isNextNonwhitespaceTokenEndOfFile() {
                     // We must use infinite lookahead, as there could be any number of newlines :(
                     while (true) {
-                        nextJSDocToken();
+                        nextTokenJSDoc();
                         if (token() === 1 /* EndOfFileToken */) {
                             return true;
                         }
@@ -22276,34 +22565,43 @@ var ts;
                         }
                     }
                     while (token() === 5 /* WhitespaceTrivia */ || token() === 4 /* NewLineTrivia */) {
-                        nextJSDocToken();
+                        nextTokenJSDoc();
                     }
                 }
                 function skipWhitespaceOrAsterisk() {
                     if (token() === 5 /* WhitespaceTrivia */ || token() === 4 /* NewLineTrivia */) {
                         if (lookAhead(isNextNonwhitespaceTokenEndOfFile)) {
-                            return; // Don't skip whitespace prior to EoF (or end of comment) - that shouldn't be included in any node's range
+                            return ""; // Don't skip whitespace prior to EoF (or end of comment) - that shouldn't be included in any node's range
                         }
                     }
                     var precedingLineBreak = scanner.hasPrecedingLineBreak();
+                    var seenLineBreak = false;
+                    var indentText = "";
                     while ((precedingLineBreak && token() === 40 /* AsteriskToken */) || token() === 5 /* WhitespaceTrivia */ || token() === 4 /* NewLineTrivia */) {
+                        indentText += scanner.getTokenText();
                         if (token() === 4 /* NewLineTrivia */) {
                             precedingLineBreak = true;
+                            seenLineBreak = true;
+                            indentText = "";
                         }
                         else if (token() === 40 /* AsteriskToken */) {
                             precedingLineBreak = false;
                         }
-                        nextJSDocToken();
+                        nextTokenJSDoc();
                     }
+                    return seenLineBreak ? indentText : "";
                 }
-                function parseTag(indent) {
+                function parseTag(margin) {
                     ts.Debug.assert(token() === 58 /* AtToken */);
                     var start = scanner.getTokenPos();
-                    nextJSDocToken();
+                    nextTokenJSDoc();
                     var tagName = parseJSDocIdentifierName(/*message*/ undefined);
-                    skipWhitespaceOrAsterisk();
+                    var indentText = skipWhitespaceOrAsterisk();
                     var tag;
                     switch (tagName.escapedText) {
+                        case "author":
+                            tag = parseAuthorTag(start, tagName, margin);
+                            break;
                         case "augments":
                         case "extends":
                             tag = parseAugmentsTag(start, tagName);
@@ -22321,7 +22619,7 @@ var ts;
                         case "arg":
                         case "argument":
                         case "param":
-                            return parseParameterOrPropertyTag(start, tagName, 2 /* Parameter */, indent);
+                            return parseParameterOrPropertyTag(start, tagName, 2 /* Parameter */, margin);
                         case "return":
                         case "returns":
                             tag = parseReturnTag(start, tagName);
@@ -22333,10 +22631,10 @@ var ts;
                             tag = parseTypeTag(start, tagName);
                             break;
                         case "typedef":
-                            tag = parseTypedefTag(start, tagName, indent);
+                            tag = parseTypedefTag(start, tagName, margin);
                             break;
                         case "callback":
-                            tag = parseCallbackTag(start, tagName, indent);
+                            tag = parseCallbackTag(start, tagName, margin);
                             break;
                         default:
                             tag = parseUnknownTag(start, tagName);
@@ -22344,11 +22642,14 @@ var ts;
                     }
                     if (!tag.comment) {
                         // some tags, like typedef and callback, have already parsed their comments earlier
-                        tag.comment = parseTagComments(indent + tag.end - tag.pos);
+                        if (!indentText) {
+                            margin += tag.end - tag.pos;
+                        }
+                        tag.comment = parseTagComments(margin, indentText.slice(margin));
                     }
                     return tag;
                 }
-                function parseTagComments(indent) {
+                function parseTagComments(indent, initialMargin) {
                     var comments = [];
                     var state = 0 /* BeginningOfLine */;
                     var margin;
@@ -22359,42 +22660,61 @@ var ts;
                         comments.push(text);
                         indent += text.length;
                     }
+                    if (initialMargin) {
+                        // jump straight to saving comments if there is some initial indentation
+                        pushComment(initialMargin);
+                        state = 2 /* SavingComments */;
+                    }
                     var tok = token();
                     loop: while (true) {
                         switch (tok) {
                             case 4 /* NewLineTrivia */:
                                 if (state >= 1 /* SawAsterisk */) {
                                     state = 0 /* BeginningOfLine */;
+                                    // don't use pushComment here because we want to keep the margin unchanged
                                     comments.push(scanner.getTokenText());
                                 }
                                 indent = 0;
                                 break;
                             case 58 /* AtToken */:
+                                if (state === 3 /* SavingBackticks */) {
+                                    comments.push(scanner.getTokenText());
+                                    break;
+                                }
                                 scanner.setTextPos(scanner.getTextPos() - 1);
                             // falls through
                             case 1 /* EndOfFileToken */:
                                 // Done
                                 break loop;
                             case 5 /* WhitespaceTrivia */:
-                                if (state === 2 /* SavingComments */) {
+                                if (state === 2 /* SavingComments */ || state === 3 /* SavingBackticks */) {
                                     pushComment(scanner.getTokenText());
                                 }
                                 else {
                                     var whitespace = scanner.getTokenText();
                                     // if the whitespace crosses the margin, take only the whitespace that passes the margin
                                     if (margin !== undefined && indent + whitespace.length > margin) {
-                                        comments.push(whitespace.slice(margin - indent - 1));
+                                        comments.push(whitespace.slice(margin - indent));
                                     }
                                     indent += whitespace.length;
                                 }
                                 break;
                             case 18 /* OpenBraceToken */:
                                 state = 2 /* SavingComments */;
-                                if (lookAhead(function () { return nextJSDocToken() === 58 /* AtToken */ && ts.tokenIsIdentifierOrKeyword(nextJSDocToken()) && scanner.getTokenText() === "link"; })) {
+                                if (lookAhead(function () { return nextTokenJSDoc() === 58 /* AtToken */ && ts.tokenIsIdentifierOrKeyword(nextTokenJSDoc()) && scanner.getTokenText() === "link"; })) {
                                     pushComment(scanner.getTokenText());
-                                    nextJSDocToken();
+                                    nextTokenJSDoc();
                                     pushComment(scanner.getTokenText());
-                                    nextJSDocToken();
+                                    nextTokenJSDoc();
+                                }
+                                pushComment(scanner.getTokenText());
+                                break;
+                            case 59 /* BacktickToken */:
+                                if (state === 3 /* SavingBackticks */) {
+                                    state = 2 /* SavingComments */;
+                                }
+                                else {
+                                    state = 3 /* SavingBackticks */;
                                 }
                                 pushComment(scanner.getTokenText());
                                 break;
@@ -22408,18 +22728,20 @@ var ts;
                             // record the * as a comment
                             // falls through
                             default:
-                                state = 2 /* SavingComments */; // leading identifiers start recording as well
+                                if (state !== 3 /* SavingBackticks */) {
+                                    state = 2 /* SavingComments */; // leading identifiers start recording as well
+                                }
                                 pushComment(scanner.getTokenText());
                                 break;
                         }
-                        tok = nextJSDocToken();
+                        tok = nextTokenJSDoc();
                     }
                     removeLeadingNewlines(comments);
                     removeTrailingWhitespace(comments);
                     return comments.length === 0 ? undefined : comments.join("");
                 }
                 function parseUnknownTag(start, tagName) {
-                    var result = createNode(299 /* JSDocTag */, start);
+                    var result = createNode(300 /* JSDocTag */, start);
                     result.tagName = tagName;
                     return finishNode(result);
                 }
@@ -22441,17 +22763,21 @@ var ts;
                     return token() === 18 /* OpenBraceToken */ ? parseJSDocTypeExpression() : undefined;
                 }
                 function parseBracketNameInPropertyAndParamTag() {
-                    if (token() === 14 /* NoSubstitutionTemplateLiteral */) {
-                        // a markdown-quoted name: `arg` is not legal jsdoc, but occurs in the wild
-                        return { name: createIdentifier(/*isIdentifier*/ true), isBracketed: false };
-                    }
                     // Looking for something like '[foo]', 'foo', '[foo.bar]' or 'foo.bar'
-                    var isBracketed = parseOptional(22 /* OpenBracketToken */);
+                    var isBracketed = parseOptionalJsdoc(22 /* OpenBracketToken */);
+                    if (isBracketed) {
+                        skipWhitespace();
+                    }
+                    // a markdown-quoted name: `arg` is not legal jsdoc, but occurs in the wild
+                    var isBackquoted = parseOptionalJsdoc(59 /* BacktickToken */);
                     var name = parseJSDocEntityName();
+                    if (isBackquoted) {
+                        parseExpectedTokenJSDoc(59 /* BacktickToken */);
+                    }
                     if (isBracketed) {
                         skipWhitespace();
                         // May have an optional default, e.g. '[foo = 42]'
-                        if (parseOptionalToken(59 /* EqualsToken */)) {
+                        if (parseOptionalToken(60 /* EqualsToken */)) {
                             parseExpression();
                         }
                         parseExpected(23 /* CloseBracketToken */);
@@ -22460,9 +22786,9 @@ var ts;
                 }
                 function isObjectOrObjectArrayTypeReference(node) {
                     switch (node.kind) {
-                        case 136 /* ObjectKeyword */:
+                        case 137 /* ObjectKeyword */:
                             return true;
-                        case 169 /* ArrayType */:
+                        case 170 /* ArrayType */:
                             return isObjectOrObjectArrayTypeReference(node.elementType);
                         default:
                             return ts.isTypeReferenceNode(node) && ts.isIdentifier(node.typeName) && node.typeName.escapedText === "Object";
@@ -22478,8 +22804,8 @@ var ts;
                         typeExpression = tryParseTypeExpression();
                     }
                     var result = target === 1 /* Property */ ?
-                        createNode(310 /* JSDocPropertyTag */, start) :
-                        createNode(304 /* JSDocParameterTag */, start);
+                        createNode(312 /* JSDocPropertyTag */, start) :
+                        createNode(306 /* JSDocParameterTag */, start);
                     var comment = parseTagComments(indent + scanner.getStartPos() - start);
                     var nestedTypeLiteral = target !== 4 /* CallbackParameter */ && parseNestedTypeLiteral(typeExpression, name, target, indent);
                     if (nestedTypeLiteral) {
@@ -22496,20 +22822,20 @@ var ts;
                 }
                 function parseNestedTypeLiteral(typeExpression, name, target, indent) {
                     if (typeExpression && isObjectOrObjectArrayTypeReference(typeExpression.type)) {
-                        var typeLiteralExpression = createNode(288 /* JSDocTypeExpression */, scanner.getTokenPos());
+                        var typeLiteralExpression = createNode(289 /* JSDocTypeExpression */, scanner.getTokenPos());
                         var child = void 0;
                         var jsdocTypeLiteral = void 0;
                         var start_2 = scanner.getStartPos();
                         var children = void 0;
                         while (child = tryParse(function () { return parseChildParameterOrPropertyTag(target, indent, name); })) {
-                            if (child.kind === 304 /* JSDocParameterTag */ || child.kind === 310 /* JSDocPropertyTag */) {
+                            if (child.kind === 306 /* JSDocParameterTag */ || child.kind === 312 /* JSDocPropertyTag */) {
                                 children = ts.append(children, child);
                             }
                         }
                         if (children) {
-                            jsdocTypeLiteral = createNode(297 /* JSDocTypeLiteral */, start_2);
+                            jsdocTypeLiteral = createNode(298 /* JSDocTypeLiteral */, start_2);
                             jsdocTypeLiteral.jsDocPropertyTags = children;
-                            if (typeExpression.type.kind === 169 /* ArrayType */) {
+                            if (typeExpression.type.kind === 170 /* ArrayType */) {
                                 jsdocTypeLiteral.isArrayType = true;
                             }
                             typeLiteralExpression.type = finishNode(jsdocTypeLiteral);
@@ -22518,32 +22844,86 @@ var ts;
                     }
                 }
                 function parseReturnTag(start, tagName) {
-                    if (ts.forEach(tags, function (t) { return t.kind === 305 /* JSDocReturnTag */; })) {
+                    if (ts.some(tags, ts.isJSDocReturnTag)) {
                         parseErrorAt(tagName.pos, scanner.getTokenPos(), ts.Diagnostics._0_tag_already_specified, tagName.escapedText);
                     }
-                    var result = createNode(305 /* JSDocReturnTag */, start);
+                    var result = createNode(307 /* JSDocReturnTag */, start);
                     result.tagName = tagName;
                     result.typeExpression = tryParseTypeExpression();
                     return finishNode(result);
                 }
                 function parseTypeTag(start, tagName) {
-                    if (ts.forEach(tags, function (t) { return t.kind === 307 /* JSDocTypeTag */; })) {
+                    if (ts.some(tags, ts.isJSDocTypeTag)) {
                         parseErrorAt(tagName.pos, scanner.getTokenPos(), ts.Diagnostics._0_tag_already_specified, tagName.escapedText);
                     }
-                    var result = createNode(307 /* JSDocTypeTag */, start);
+                    var result = createNode(309 /* JSDocTypeTag */, start);
                     result.tagName = tagName;
                     result.typeExpression = parseJSDocTypeExpression(/*mayOmitBraces*/ true);
                     return finishNode(result);
                 }
+                function parseAuthorTag(start, tagName, indent) {
+                    var result = createNode(302 /* JSDocAuthorTag */, start);
+                    result.tagName = tagName;
+                    var authorInfoWithEmail = tryParse(function () { return tryParseAuthorNameAndEmail(); });
+                    if (!authorInfoWithEmail) {
+                        return finishNode(result);
+                    }
+                    result.comment = authorInfoWithEmail;
+                    if (lookAhead(function () { return nextToken() !== 4 /* NewLineTrivia */; })) {
+                        var comment = parseTagComments(indent);
+                        if (comment) {
+                            result.comment += comment;
+                        }
+                    }
+                    return finishNode(result);
+                }
+                function tryParseAuthorNameAndEmail() {
+                    var comments = [];
+                    var seenLessThan = false;
+                    var seenGreaterThan = false;
+                    var token = scanner.getToken();
+                    loop: while (true) {
+                        switch (token) {
+                            case 73 /* Identifier */:
+                            case 5 /* WhitespaceTrivia */:
+                            case 24 /* DotToken */:
+                            case 58 /* AtToken */:
+                                comments.push(scanner.getTokenText());
+                                break;
+                            case 28 /* LessThanToken */:
+                                if (seenLessThan || seenGreaterThan) {
+                                    return;
+                                }
+                                seenLessThan = true;
+                                comments.push(scanner.getTokenText());
+                                break;
+                            case 30 /* GreaterThanToken */:
+                                if (!seenLessThan || seenGreaterThan) {
+                                    return;
+                                }
+                                seenGreaterThan = true;
+                                comments.push(scanner.getTokenText());
+                                scanner.setTextPos(scanner.getTokenPos() + 1);
+                                break loop;
+                            case 4 /* NewLineTrivia */:
+                            case 1 /* EndOfFileToken */:
+                                break loop;
+                        }
+                        token = nextTokenJSDoc();
+                    }
+                    if (seenLessThan && seenGreaterThan) {
+                        return comments.length === 0 ? undefined : comments.join("");
+                    }
+                }
                 function parseAugmentsTag(start, tagName) {
-                    var result = createNode(300 /* JSDocAugmentsTag */, start);
+                    var result = createNode(301 /* JSDocAugmentsTag */, start);
                     result.tagName = tagName;
                     result.class = parseExpressionWithTypeArgumentsForAugments();
                     return finishNode(result);
                 }
                 function parseExpressionWithTypeArgumentsForAugments() {
                     var usedBrace = parseOptional(18 /* OpenBraceToken */);
-                    var node = createNode(211 /* ExpressionWithTypeArguments */);
+                    var node = createNode(212 /* ExpressionWithTypeArguments */);
                     node.expression = parsePropertyAccessEntityNameExpression();
                     node.typeArguments = tryParseTypeArguments();
                     var res = finishNode(node);
@@ -22555,7 +22935,7 @@ var ts;
                 function parsePropertyAccessEntityNameExpression() {
                     var node = parseJSDocIdentifierName();
                     while (parseOptional(24 /* DotToken */)) {
-                        var prop = createNode(189 /* PropertyAccessExpression */, node.pos);
+                        var prop = createNode(190 /* PropertyAccessExpression */, node.pos);
                         prop.expression = node;
                         prop.name = parseJSDocIdentifierName();
                         node = finishNode(prop);
@@ -22563,19 +22943,19 @@ var ts;
                     return node;
                 }
                 function parseClassTag(start, tagName) {
-                    var tag = createNode(301 /* JSDocClassTag */, start);
+                    var tag = createNode(303 /* JSDocClassTag */, start);
                     tag.tagName = tagName;
                     return finishNode(tag);
                 }
                 function parseThisTag(start, tagName) {
-                    var tag = createNode(306 /* JSDocThisTag */, start);
+                    var tag = createNode(308 /* JSDocThisTag */, start);
                     tag.tagName = tagName;
                     tag.typeExpression = parseJSDocTypeExpression(/*mayOmitBraces*/ true);
                     skipWhitespace();
                     return finishNode(tag);
                 }
                 function parseEnumTag(start, tagName) {
-                    var tag = createNode(303 /* JSDocEnumTag */, start);
+                    var tag = createNode(305 /* JSDocEnumTag */, start);
                     tag.tagName = tagName;
                     tag.typeExpression = parseJSDocTypeExpression(/*mayOmitBraces*/ true);
                     skipWhitespace();
@@ -22584,7 +22964,7 @@ var ts;
                 function parseTypedefTag(start, tagName, indent) {
                     var typeExpression = tryParseTypeExpression();
                     skipWhitespaceOrAsterisk();
-                    var typedefTag = createNode(309 /* JSDocTypedefTag */, start);
+                    var typedefTag = createNode(311 /* JSDocTypedefTag */, start);
                     typedefTag.tagName = tagName;
                     typedefTag.fullName = parseJSDocTypeNameWithNamespace();
                     typedefTag.name = getJSDocTypeAliasName(typedefTag.fullName);
@@ -22598,9 +22978,9 @@ var ts;
                         var childTypeTag = void 0;
                         while (child = tryParse(function () { return parseChildPropertyTag(indent); })) {
                             if (!jsdocTypeLiteral) {
-                                jsdocTypeLiteral = createNode(297 /* JSDocTypeLiteral */, start);
+                                jsdocTypeLiteral = createNode(298 /* JSDocTypeLiteral */, start);
                             }
-                            if (child.kind === 307 /* JSDocTypeTag */) {
+                            if (child.kind === 309 /* JSDocTypeTag */) {
                                 if (childTypeTag) {
                                     break;
                                 }
@@ -22613,7 +22993,7 @@ var ts;
                             }
                         }
                         if (jsdocTypeLiteral) {
-                            if (typeExpression && typeExpression.type.kind === 169 /* ArrayType */) {
+                            if (typeExpression && typeExpression.type.kind === 170 /* ArrayType */) {
                                 jsdocTypeLiteral.isArrayType = true;
                             }
                             typedefTag.typeExpression = childTypeTag && childTypeTag.typeExpression && !isObjectOrObjectArrayTypeReference(childTypeTag.typeExpression.type) ?
@@ -22632,7 +23012,7 @@ var ts;
                     }
                     var typeNameOrNamespaceName = parseJSDocIdentifierName();
                     if (parseOptional(24 /* DotToken */)) {
-                        var jsDocNamespaceNode = createNode(244 /* ModuleDeclaration */, pos);
+                        var jsDocNamespaceNode = createNode(245 /* ModuleDeclaration */, pos);
                         if (nested) {
                             jsDocNamespaceNode.flags |= 4 /* NestedNamespace */;
                         }
@@ -22646,14 +23026,14 @@ var ts;
                     return typeNameOrNamespaceName;
                 }
                 function parseCallbackTag(start, tagName, indent) {
-                    var callbackTag = createNode(302 /* JSDocCallbackTag */, start);
+                    var callbackTag = createNode(304 /* JSDocCallbackTag */, start);
                     callbackTag.tagName = tagName;
                     callbackTag.fullName = parseJSDocTypeNameWithNamespace();
                     callbackTag.name = getJSDocTypeAliasName(callbackTag.fullName);
                     skipWhitespace();
                     callbackTag.comment = parseTagComments(indent);
                     var child;
-                    var jsdocSignature = createNode(298 /* JSDocSignature */, start);
+                    var jsdocSignature = createNode(299 /* JSDocSignature */, start);
                     jsdocSignature.parameters = [];
                     while (child = tryParse(function () { return parseChildParameterOrPropertyTag(4 /* CallbackParameter */, indent); })) {
                         jsdocSignature.parameters = ts.append(jsdocSignature.parameters, child);
@@ -22661,7 +23041,7 @@ var ts;
                     var returnTag = tryParse(function () {
                         if (parseOptionalJsdoc(58 /* AtToken */)) {
                             var tag = parseTag(indent);
-                            if (tag && tag.kind === 305 /* JSDocReturnTag */) {
+                            if (tag && tag.kind === 307 /* JSDocReturnTag */) {
                                 return tag;
                             }
                         }
@@ -22702,11 +23082,11 @@ var ts;
                     var canParseTag = true;
                     var seenAsterisk = false;
                     while (true) {
-                        switch (nextJSDocToken()) {
+                        switch (nextTokenJSDoc()) {
                             case 58 /* AtToken */:
                                 if (canParseTag) {
                                     var child = tryParseChildTag(target, indent);
-                                    if (child && (child.kind === 304 /* JSDocParameterTag */ || child.kind === 310 /* JSDocPropertyTag */) &&
+                                    if (child && (child.kind === 306 /* JSDocParameterTag */ || child.kind === 312 /* JSDocPropertyTag */) &&
                                         target !== 4 /* CallbackParameter */ &&
                                         name && (ts.isIdentifier(child.name) || !escapedTextsEqual(name, child.name.left))) {
                                         return false;
@@ -22725,7 +23105,7 @@ var ts;
                                 }
                                 seenAsterisk = true;
                                 break;
-                            case 72 /* Identifier */:
+                            case 73 /* Identifier */:
                                 canParseTag = false;
                                 break;
                             case 1 /* EndOfFileToken */:
@@ -22736,7 +23116,7 @@ var ts;
                 function tryParseChildTag(target, indent) {
                     ts.Debug.assert(token() === 58 /* AtToken */);
                     var start = scanner.getStartPos();
-                    nextJSDocToken();
+                    nextTokenJSDoc();
                     var tagName = parseJSDocIdentifierName();
                     skipWhitespace();
                     var t;
@@ -22770,25 +23150,22 @@ var ts;
                     var typeParametersPos = getNodePos();
                     do {
                         skipWhitespace();
-                        var typeParameter = createNode(150 /* TypeParameter */);
+                        var typeParameter = createNode(151 /* TypeParameter */);
                         typeParameter.name = parseJSDocIdentifierName(ts.Diagnostics.Unexpected_token_A_type_parameter_name_was_expected_without_curly_braces);
                         finishNode(typeParameter);
                         skipWhitespace();
                         typeParameters.push(typeParameter);
                     } while (parseOptionalJsdoc(27 /* CommaToken */));
-                    var result = createNode(308 /* JSDocTemplateTag */, start);
+                    var result = createNode(310 /* JSDocTemplateTag */, start);
                     result.tagName = tagName;
                     result.constraint = constraint;
                     result.typeParameters = createNodeArray(typeParameters, typeParametersPos);
                     finishNode(result);
                     return result;
                 }
-                function nextJSDocToken() {
-                    return currentToken = scanner.scanJSDocToken();
-                }
                 function parseOptionalJsdoc(t) {
                     if (token() === t) {
-                        nextJSDocToken();
+                        nextTokenJSDoc();
                         return true;
                     }
                     return false;
@@ -22812,14 +23189,14 @@ var ts;
                 }
                 function parseJSDocIdentifierName(message) {
                     if (!ts.tokenIsIdentifierOrKeyword(token())) {
-                        return createMissingNode(72 /* Identifier */, /*reportAtCurrentPosition*/ !message, message || ts.Diagnostics.Identifier_expected);
+                        return createMissingNode(73 /* Identifier */, /*reportAtCurrentPosition*/ !message, message || ts.Diagnostics.Identifier_expected);
                     }
                     var pos = scanner.getTokenPos();
                     var end = scanner.getTextPos();
-                    var result = createNode(72 /* Identifier */, pos);
+                    var result = createNode(73 /* Identifier */, pos);
                     result.escapedText = ts.escapeLeadingUnderscores(scanner.getTokenText());
                     finishNode(result, end);
-                    nextJSDocToken();
+                    nextTokenJSDoc();
                     return result;
                 }
             }
@@ -22944,7 +23321,7 @@ var ts;
             switch (node.kind) {
                 case 10 /* StringLiteral */:
                 case 8 /* NumericLiteral */:
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return true;
             }
             return false;
@@ -23311,28 +23688,16 @@ var ts;
     ts.isDeclarationFileName = isDeclarationFileName;
     /*@internal*/
     function processCommentPragmas(context, sourceText) {
-        var triviaScanner = ts.createScanner(context.languageVersion, /*skipTrivia*/ false, 0 /* Standard */, sourceText);
         var pragmas = [];
-        // Keep scanning all the leading trivia in the file until we get to something that
-        // isn't trivia.  Any single line comment will be analyzed to see if it is a
-        // reference comment.
-        while (true) {
-            var kind = triviaScanner.scan();
-            if (!ts.isTrivia(kind)) {
-                break;
-            }
-            var range = {
-                kind: triviaScanner.getToken(),
-                pos: triviaScanner.getTokenPos(),
-                end: triviaScanner.getTextPos(),
-            };
+        for (var _i = 0, _a = ts.getLeadingCommentRanges(sourceText, 0) || ts.emptyArray; _i < _a.length; _i++) {
+            var range = _a[_i];
             var comment = sourceText.substring(range.pos, range.end);
             extractPragmas(pragmas, range, comment);
         }
         context.pragmas = ts.createMap();
-        for (var _i = 0, pragmas_1 = pragmas; _i < pragmas_1.length; _i++) {
-            var pragma = pragmas_1[_i];
-            if (context.pragmas.has(pragma.name)) { // TODO: GH#18217
+        for (var _b = 0, pragmas_1 = pragmas; _b < pragmas_1.length; _b++) {
+            var pragma = pragmas_1[_b];
+            if (context.pragmas.has(pragma.name)) {
                 var currentValue = context.pragmas.get(pragma.name);
                 if (currentValue instanceof Array) {
                     currentValue.push(pragma.args);
@@ -23363,7 +23728,6 @@ var ts;
                     var typeReferenceDirectives_1 = context.typeReferenceDirectives;
                     var libReferenceDirectives_1 = context.libReferenceDirectives;
                     ts.forEach(ts.toArray(entryOrList), function (arg) {
-                        // TODO: GH#18217
                         var _a = arg.arguments, types = _a.types, lib = _a.lib, path = _a.path;
                         if (arg.arguments["no-default-lib"]) {
                             context.hasNoDefaultLib = true;
@@ -23384,7 +23748,7 @@ var ts;
                     break;
                 }
                 case "amd-dependency": {
-                    context.amdDependencies = ts.map(ts.toArray(entryOrList), function (x) { return ({ name: x.arguments.name, path: x.arguments.path }); }); // TODO: GH#18217
+                    context.amdDependencies = ts.map(ts.toArray(entryOrList), function (x) { return ({ name: x.arguments.name, path: x.arguments.path }); });
                     break;
                 }
                 case "amd-module": {
@@ -23407,7 +23771,7 @@ var ts;
                 case "ts-check": {
                     // _last_ of either nocheck or check in a file is the "winner"
                     ts.forEach(ts.toArray(entryOrList), function (entry) {
-                        if (!context.checkJsDirective || entry.range.pos > context.checkJsDirective.pos) { // TODO: GH#18217
+                        if (!context.checkJsDirective || entry.range.pos > context.checkJsDirective.pos) {
                             context.checkJsDirective = {
                                 enabled: key === "ts-check",
                                 end: entry.range.end,
@@ -23523,10 +23887,10 @@ var ts;
         if (lhs.kind !== rhs.kind) {
             return false;
         }
-        if (lhs.kind === 72 /* Identifier */) {
+        if (lhs.kind === 73 /* Identifier */) {
             return lhs.escapedText === rhs.escapedText;
         }
-        if (lhs.kind === 100 /* ThisKeyword */) {
+        if (lhs.kind === 101 /* ThisKeyword */) {
             return true;
         }
         // If we are at this statement then we must have PropertyAccessExpression and because tag name in Jsx element can only
@@ -23555,6 +23919,7 @@ var ts;
         ["es2017", "lib.es2017.d.ts"],
         ["es2018", "lib.es2018.d.ts"],
         ["es2019", "lib.es2019.d.ts"],
+        ["es2020", "lib.es2020.d.ts"],
         ["esnext", "lib.esnext.d.ts"],
         // Host only
         ["dom", "lib.dom.d.ts"],
@@ -23578,13 +23943,17 @@ var ts;
         ["es2017.string", "lib.es2017.string.d.ts"],
         ["es2017.intl", "lib.es2017.intl.d.ts"],
         ["es2017.typedarrays", "lib.es2017.typedarrays.d.ts"],
+        ["es2018.asyncgenerator", "lib.es2018.asyncgenerator.d.ts"],
         ["es2018.asynciterable", "lib.es2018.asynciterable.d.ts"],
         ["es2018.intl", "lib.es2018.intl.d.ts"],
         ["es2018.promise", "lib.es2018.promise.d.ts"],
         ["es2018.regexp", "lib.es2018.regexp.d.ts"],
         ["es2019.array", "lib.es2019.array.d.ts"],
+        ["es2019.object", "lib.es2019.object.d.ts"],
         ["es2019.string", "lib.es2019.string.d.ts"],
         ["es2019.symbol", "lib.es2019.symbol.d.ts"],
+        ["es2020.string", "lib.es2020.string.d.ts"],
+        ["es2020.symbol.wellknown", "lib.es2020.symbol.wellknown.d.ts"],
         ["esnext.array", "lib.es2019.array.d.ts"],
         ["esnext.symbol", "lib.es2019.symbol.d.ts"],
         ["esnext.asynciterable", "lib.es2018.asynciterable.d.ts"],
@@ -23671,6 +24040,19 @@ var ts;
             category: ts.Diagnostics.Advanced_Options,
             description: ts.Diagnostics.Show_verbose_diagnostic_information
         },
+        {
+            name: "incremental",
+            shortName: "i",
+            type: "boolean",
+            category: ts.Diagnostics.Basic_Options,
+            description: ts.Diagnostics.Enable_incremental_compilation,
+        },
+        {
+            name: "locale",
+            type: "string",
+            category: ts.Diagnostics.Advanced_Options,
+            description: ts.Diagnostics.The_locale_used_when_displaying_messages_to_the_user_e_g_en_us
+        },
     ];
     /* @internal */
     ts.optionDeclarations = ts.commonOptionsWithBuild.concat([
@@ -23734,10 +24116,12 @@ var ts;
                 es2017: 4 /* ES2017 */,
                 es2018: 5 /* ES2018 */,
                 es2019: 6 /* ES2019 */,
-                esnext: 7 /* ESNext */,
+                es2020: 7 /* ES2020 */,
+                esnext: 99 /* ESNext */,
             }),
             affectsSourceFile: true,
             affectsModuleResolution: true,
+            affectsEmit: true,
             paramType: ts.Diagnostics.VERSION,
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Basic_Options,
@@ -23757,6 +24141,7 @@ var ts;
                 esnext: ts.ModuleKind.ESNext
             }),
             affectsModuleResolution: true,
+            affectsEmit: true,
             paramType: ts.Diagnostics.KIND,
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Basic_Options,
@@ -23805,6 +24190,7 @@ var ts;
             name: "declaration",
             shortName: "d",
             type: "boolean",
+            affectsEmit: true,
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Basic_Options,
             description: ts.Diagnostics.Generates_corresponding_d_ts_file,
@@ -23812,6 +24198,7 @@ var ts;
         {
             name: "declarationMap",
             type: "boolean",
+            affectsEmit: true,
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Basic_Options,
             description: ts.Diagnostics.Generates_a_sourcemap_for_each_corresponding_d_ts_file,
@@ -23819,12 +24206,14 @@ var ts;
         {
             name: "emitDeclarationOnly",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Advanced_Options,
             description: ts.Diagnostics.Only_emit_d_ts_declaration_files,
         },
         {
             name: "sourceMap",
             type: "boolean",
+            affectsEmit: true,
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Basic_Options,
             description: ts.Diagnostics.Generates_corresponding_map_file,
@@ -23832,6 +24221,7 @@ var ts;
         {
             name: "outFile",
             type: "string",
+            affectsEmit: true,
             isFilePath: true,
             paramType: ts.Diagnostics.FILE,
             showInSimplifiedHelpView: true,
@@ -23841,6 +24231,7 @@ var ts;
         {
             name: "outDir",
             type: "string",
+            affectsEmit: true,
             isFilePath: true,
             paramType: ts.Diagnostics.DIRECTORY,
             showInSimplifiedHelpView: true,
@@ -23850,6 +24241,7 @@ var ts;
         {
             name: "rootDir",
             type: "string",
+            affectsEmit: true,
             isFilePath: true,
             paramType: ts.Diagnostics.LOCATION,
             category: ts.Diagnostics.Basic_Options,
@@ -23858,29 +24250,24 @@ var ts;
         {
             name: "composite",
             type: "boolean",
+            affectsEmit: true,
             isTSConfigOnly: true,
             category: ts.Diagnostics.Basic_Options,
             description: ts.Diagnostics.Enable_project_compilation,
         },
-        {
-            name: "incremental",
-            type: "boolean",
-            isTSConfigOnly: true,
-            category: ts.Diagnostics.Basic_Options,
-            description: ts.Diagnostics.Enable_incremental_compilation,
-        },
         {
             name: "tsBuildInfoFile",
             type: "string",
+            affectsEmit: true,
             isFilePath: true,
             paramType: ts.Diagnostics.FILE,
-            isTSConfigOnly: true,
             category: ts.Diagnostics.Basic_Options,
             description: ts.Diagnostics.Specify_file_to_store_incremental_compilation_information,
         },
         {
             name: "removeComments",
             type: "boolean",
+            affectsEmit: true,
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Basic_Options,
             description: ts.Diagnostics.Do_not_emit_comments_to_output,
@@ -23888,6 +24275,7 @@ var ts;
         {
             name: "noEmit",
             type: "boolean",
+            affectsEmit: true,
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Basic_Options,
             description: ts.Diagnostics.Do_not_emit_outputs,
@@ -23895,12 +24283,14 @@ var ts;
         {
             name: "importHelpers",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Basic_Options,
             description: ts.Diagnostics.Import_emit_helpers_from_tslib
         },
         {
             name: "downlevelIteration",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Basic_Options,
             description: ts.Diagnostics.Provide_full_support_for_iterables_in_for_of_spread_and_destructuring_when_targeting_ES5_or_ES3
         },
@@ -24094,6 +24484,7 @@ var ts;
             name: "esModuleInterop",
             type: "boolean",
             affectsSemanticDiagnostics: true,
+            affectsEmit: true,
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Module_Resolution_Options,
             description: ts.Diagnostics.Enables_emit_interoperability_between_CommonJS_and_ES_Modules_via_creation_of_namespace_objects_for_all_imports_Implies_allowSyntheticDefaultImports
@@ -24104,10 +24495,18 @@ var ts;
             category: ts.Diagnostics.Module_Resolution_Options,
             description: ts.Diagnostics.Do_not_resolve_the_real_path_of_symlinks,
         },
+        {
+            name: "allowUmdGlobalAccess",
+            type: "boolean",
+            affectsSemanticDiagnostics: true,
+            category: ts.Diagnostics.Module_Resolution_Options,
+            description: ts.Diagnostics.Allow_accessing_UMD_globals_from_modules,
+        },
         // Source Maps
         {
             name: "sourceRoot",
             type: "string",
+            affectsEmit: true,
             paramType: ts.Diagnostics.LOCATION,
             category: ts.Diagnostics.Source_Map_Options,
             description: ts.Diagnostics.Specify_the_location_where_debugger_should_locate_TypeScript_files_instead_of_source_locations,
@@ -24115,6 +24514,7 @@ var ts;
         {
             name: "mapRoot",
             type: "string",
+            affectsEmit: true,
             paramType: ts.Diagnostics.LOCATION,
             category: ts.Diagnostics.Source_Map_Options,
             description: ts.Diagnostics.Specify_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations,
@@ -24122,12 +24522,14 @@ var ts;
         {
             name: "inlineSourceMap",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Source_Map_Options,
             description: ts.Diagnostics.Emit_a_single_file_with_source_maps_instead_of_having_a_separate_file
         },
         {
             name: "inlineSources",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Source_Map_Options,
             description: ts.Diagnostics.Emit_the_source_alongside_the_sourcemaps_within_a_single_file_requires_inlineSourceMap_or_sourceMap_to_be_set
         },
@@ -24160,6 +24562,7 @@ var ts;
         {
             name: "out",
             type: "string",
+            affectsEmit: true,
             isFilePath: false,
             // for correct behaviour, please use outFile
             category: ts.Diagnostics.Advanced_Options,
@@ -24169,6 +24572,7 @@ var ts;
         {
             name: "reactNamespace",
             type: "string",
+            affectsEmit: true,
             category: ts.Diagnostics.Advanced_Options,
             description: ts.Diagnostics.Deprecated_Use_jsxFactory_instead_Specify_the_object_invoked_for_createElement_when_targeting_react_JSX_emit
         },
@@ -24187,21 +24591,17 @@ var ts;
         {
             name: "emitBOM",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Advanced_Options,
             description: ts.Diagnostics.Emit_a_UTF_8_Byte_Order_Mark_BOM_in_the_beginning_of_output_files
         },
-        {
-            name: "locale",
-            type: "string",
-            category: ts.Diagnostics.Advanced_Options,
-            description: ts.Diagnostics.The_locale_used_when_displaying_messages_to_the_user_e_g_en_us
-        },
         {
             name: "newLine",
             type: ts.createMapFromTemplate({
                 crlf: 0 /* CarriageReturnLineFeed */,
                 lf: 1 /* LineFeed */
             }),
+            affectsEmit: true,
             paramType: ts.Diagnostics.NEWLINE,
             category: ts.Diagnostics.Advanced_Options,
             description: ts.Diagnostics.Specify_the_end_of_line_sequence_to_be_used_when_emitting_files_Colon_CRLF_dos_or_LF_unix,
@@ -24229,6 +24629,7 @@ var ts;
         {
             name: "stripInternal",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Advanced_Options,
             description: ts.Diagnostics.Do_not_emit_declarations_for_code_that_has_an_internal_annotation,
         },
@@ -24249,24 +24650,28 @@ var ts;
         {
             name: "noEmitHelpers",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Advanced_Options,
             description: ts.Diagnostics.Do_not_generate_custom_helper_functions_like_extends_in_compiled_output
         },
         {
             name: "noEmitOnError",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Advanced_Options,
             description: ts.Diagnostics.Do_not_emit_outputs_if_any_errors_were_reported,
         },
         {
             name: "preserveConstEnums",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Advanced_Options,
             description: ts.Diagnostics.Do_not_erase_const_enum_declarations_in_generated_code
         },
         {
             name: "declarationDir",
             type: "string",
+            affectsEmit: true,
             isFilePath: true,
             paramType: ts.Diagnostics.DIRECTORY,
             category: ts.Diagnostics.Advanced_Options,
@@ -24349,6 +24754,8 @@ var ts;
     /* @internal */
     ts.semanticDiagnosticsOptionDeclarations = ts.optionDeclarations.filter(function (option) { return !!option.affectsSemanticDiagnostics; });
     /* @internal */
+    ts.affectsEmitOptionDeclarations = ts.optionDeclarations.filter(function (option) { return !!option.affectsEmit; });
+    /* @internal */
     ts.moduleResolutionOptionDeclarations = ts.optionDeclarations.filter(function (option) { return !!option.affectsModuleResolution; });
     /* @internal */
     ts.sourceFileAffectingCompilerOptions = ts.optionDeclarations.filter(function (option) {
@@ -24435,9 +24842,11 @@ var ts;
         return typeAcquisition;
     }
     ts.convertEnableAutoDiscoveryToEnable = convertEnableAutoDiscoveryToEnable;
+    /* @internal */
     function getOptionNameMap() {
         return optionNameMapCache || (optionNameMapCache = createOptionNameMap(ts.optionDeclarations));
     }
+    ts.getOptionNameMap = getOptionNameMap;
     /*@internal*/
     function createOptionNameMap(optionDeclarations) {
         var optionNameMap = ts.createMap();
@@ -24756,7 +25165,7 @@ var ts;
     /**
      * Reads the config file, reports errors if any and exits if the config file cannot be found
      */
-    function getParsedCommandLineOfConfigFile(configFileName, optionsToExtend, host) {
+    function getParsedCommandLineOfConfigFile(configFileName, optionsToExtend, host, extendedConfigCache) {
         var configFileText;
         try {
             configFileText = host.readFile(configFileName);
@@ -24776,7 +25185,9 @@ var ts;
         result.path = ts.toPath(configFileName, cwd, ts.createGetCanonicalFileName(host.useCaseSensitiveFileNames));
         result.resolvedPath = result.path;
         result.originalFileName = result.fileName;
-        return parseJsonSourceFileConfigFileContent(result, host, ts.getNormalizedAbsolutePath(ts.getDirectoryPath(configFileName), cwd), optionsToExtend, ts.getNormalizedAbsolutePath(configFileName, cwd));
+        return parseJsonSourceFileConfigFileContent(result, host, ts.getNormalizedAbsolutePath(ts.getDirectoryPath(configFileName), cwd), optionsToExtend, ts.getNormalizedAbsolutePath(configFileName, cwd), 
+        /*resolutionStack*/ undefined, 
+        /*extraFileExtension*/ undefined, extendedConfigCache);
     }
     ts.getParsedCommandLineOfConfigFile = getParsedCommandLineOfConfigFile;
     /**
@@ -24915,7 +25326,7 @@ var ts;
             var result = returnValue ? {} : undefined;
             for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
                 var element = _a[_i];
-                if (element.kind !== 275 /* PropertyAssignment */) {
+                if (element.kind !== 276 /* PropertyAssignment */) {
                     errors.push(ts.createDiagnosticForNodeInSourceFile(sourceFile, element, ts.Diagnostics.Property_assignment_expected));
                     continue;
                 }
@@ -24971,13 +25382,13 @@ var ts;
         }
         function convertPropertyValueToJson(valueExpression, option) {
             switch (valueExpression.kind) {
-                case 102 /* TrueKeyword */:
+                case 103 /* TrueKeyword */:
                     reportInvalidOptionValue(option && option.type !== "boolean");
                     return true;
-                case 87 /* FalseKeyword */:
+                case 88 /* FalseKeyword */:
                     reportInvalidOptionValue(option && option.type !== "boolean");
                     return false;
-                case 96 /* NullKeyword */:
+                case 97 /* NullKeyword */:
                     reportInvalidOptionValue(option && option.name === "extends"); // "extends" is the only option we don't allow null/undefined for
                     return null; // tslint:disable-line:no-null-keyword
                 case 10 /* StringLiteral */:
@@ -24997,13 +25408,13 @@ var ts;
                 case 8 /* NumericLiteral */:
                     reportInvalidOptionValue(option && option.type !== "number");
                     return Number(valueExpression.text);
-                case 202 /* PrefixUnaryExpression */:
+                case 203 /* PrefixUnaryExpression */:
                     if (valueExpression.operator !== 39 /* MinusToken */ || valueExpression.operand.kind !== 8 /* NumericLiteral */) {
                         break; // not valid JSON syntax
                     }
                     reportInvalidOptionValue(option && option.type !== "number");
                     return -Number(valueExpression.operand.text);
-                case 188 /* ObjectLiteralExpression */:
+                case 189 /* ObjectLiteralExpression */:
                     reportInvalidOptionValue(option && option.type !== "object");
                     var objectLiteralExpression = valueExpression;
                     // Currently having element option declaration in the tsconfig with type "object"
@@ -25020,7 +25431,7 @@ var ts;
                         return convertObjectLiteralExpressionToJson(objectLiteralExpression, /* knownOptions*/ undefined, 
                         /*extraKeyDiagnosticMessage */ undefined, /*parentOption*/ undefined);
                     }
-                case 187 /* ArrayLiteralExpression */:
+                case 188 /* ArrayLiteralExpression */:
                     reportInvalidOptionValue(option && option.type !== "list");
                     return convertArrayLiteralExpressionToJson(valueExpression.elements, option && option.element);
             }
@@ -25192,7 +25603,10 @@ var ts;
                 case "object":
                     return {};
                 default:
-                    return option.type.keys().next().value;
+                    var iterResult = option.type.keys().next();
+                    if (!iterResult.done)
+                        return iterResult.value;
+                    return ts.Debug.fail("Expected 'option.type' to have entries.");
             }
         }
         function makePadding(paddingLength) {
@@ -25276,8 +25690,8 @@ var ts;
      * @param basePath A root directory to resolve relative path entries in the config
      *    file to. e.g. outDir
      */
-    function parseJsonConfigFileContent(json, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions) {
-        return parseJsonConfigFileContentWorker(json, /*sourceFile*/ undefined, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions);
+    function parseJsonConfigFileContent(json, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions, extendedConfigCache) {
+        return parseJsonConfigFileContentWorker(json, /*sourceFile*/ undefined, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions, extendedConfigCache);
     }
     ts.parseJsonConfigFileContent = parseJsonConfigFileContent;
     /**
@@ -25287,8 +25701,8 @@ var ts;
      * @param basePath A root directory to resolve relative path entries in the config
      *    file to. e.g. outDir
      */
-    function parseJsonSourceFileConfigFileContent(sourceFile, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions) {
-        return parseJsonConfigFileContentWorker(/*json*/ undefined, sourceFile, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions);
+    function parseJsonSourceFileConfigFileContent(sourceFile, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions, extendedConfigCache) {
+        return parseJsonConfigFileContentWorker(/*json*/ undefined, sourceFile, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions, extendedConfigCache);
     }
     ts.parseJsonSourceFileConfigFileContent = parseJsonSourceFileConfigFileContent;
     /*@internal*/
@@ -25316,13 +25730,13 @@ var ts;
      *    file to. e.g. outDir
      * @param resolutionStack Only present for backwards-compatibility. Should be empty.
      */
-    function parseJsonConfigFileContentWorker(json, sourceFile, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions) {
+    function parseJsonConfigFileContentWorker(json, sourceFile, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions, extendedConfigCache) {
         if (existingOptions === void 0) { existingOptions = {}; }
         if (resolutionStack === void 0) { resolutionStack = []; }
         if (extraFileExtensions === void 0) { extraFileExtensions = []; }
         ts.Debug.assert((json === undefined && sourceFile !== undefined) || (json !== undefined && sourceFile === undefined));
         var errors = [];
-        var parsedConfig = parseConfig(json, sourceFile, host, basePath, configFileName, resolutionStack, errors);
+        var parsedConfig = parseConfig(json, sourceFile, host, basePath, configFileName, resolutionStack, errors, extendedConfigCache);
         var raw = parsedConfig.raw;
         var options = ts.extend(existingOptions, parsedConfig.options || {});
         options.configFilePath = configFileName && ts.normalizeSlashes(configFileName);
@@ -25462,7 +25876,7 @@ var ts;
      * This *just* extracts options/include/exclude/files out of a config file.
      * It does *not* resolve the included files.
      */
-    function parseConfig(json, sourceFile, host, basePath, configFileName, resolutionStack, errors) {
+    function parseConfig(json, sourceFile, host, basePath, configFileName, resolutionStack, errors, extendedConfigCache) {
         basePath = ts.normalizeSlashes(basePath);
         var resolvedPath = ts.getNormalizedAbsolutePath(configFileName || "", basePath);
         if (resolutionStack.indexOf(resolvedPath) >= 0) {
@@ -25475,7 +25889,7 @@ var ts;
         if (ownConfig.extendedConfigPath) {
             // copy the resolution stack so it is never reused between branches in potential diamond-problem scenarios.
             resolutionStack = resolutionStack.concat([resolvedPath]);
-            var extendedConfig = getExtendedConfig(sourceFile, ownConfig.extendedConfigPath, host, basePath, resolutionStack, errors);
+            var extendedConfig = getExtendedConfig(sourceFile, ownConfig.extendedConfigPath, host, basePath, resolutionStack, errors, extendedConfigCache);
             if (extendedConfig && isSuccessfulParsedTsconfig(extendedConfig)) {
                 var baseRaw_1 = extendedConfig.raw;
                 var raw_1 = ownConfig.raw;
@@ -25572,7 +25986,7 @@ var ts;
             if (!host.fileExists(extendedConfigPath) && !ts.endsWith(extendedConfigPath, ".json" /* Json */)) {
                 extendedConfigPath = extendedConfigPath + ".json";
                 if (!host.fileExists(extendedConfigPath)) {
-                    errors.push(createDiagnostic(ts.Diagnostics.File_0_does_not_exist, extendedConfig));
+                    errors.push(createDiagnostic(ts.Diagnostics.File_0_not_found, extendedConfig));
                     return undefined;
                 }
             }
@@ -25583,38 +25997,52 @@ var ts;
         if (resolved.resolvedModule) {
             return resolved.resolvedModule.resolvedFileName;
         }
-        errors.push(createDiagnostic(ts.Diagnostics.File_0_does_not_exist, extendedConfig));
+        errors.push(createDiagnostic(ts.Diagnostics.File_0_not_found, extendedConfig));
         return undefined;
     }
-    function getExtendedConfig(sourceFile, extendedConfigPath, host, basePath, resolutionStack, errors) {
+    function getExtendedConfig(sourceFile, extendedConfigPath, host, basePath, resolutionStack, errors, extendedConfigCache) {
         var _a;
-        var extendedResult = readJsonConfigFile(extendedConfigPath, function (path) { return host.readFile(path); });
+        var path = host.useCaseSensitiveFileNames ? extendedConfigPath : ts.toLowerCase(extendedConfigPath);
+        var value;
+        var extendedResult;
+        var extendedConfig;
+        if (extendedConfigCache && (value = extendedConfigCache.get(path))) {
+            (extendedResult = value.extendedResult, extendedConfig = value.extendedConfig);
+        }
+        else {
+            extendedResult = readJsonConfigFile(extendedConfigPath, function (path) { return host.readFile(path); });
+            if (!extendedResult.parseDiagnostics.length) {
+                var extendedDirname = ts.getDirectoryPath(extendedConfigPath);
+                extendedConfig = parseConfig(/*json*/ undefined, extendedResult, host, extendedDirname, ts.getBaseFileName(extendedConfigPath), resolutionStack, errors, extendedConfigCache);
+                if (isSuccessfulParsedTsconfig(extendedConfig)) {
+                    // Update the paths to reflect base path
+                    var relativeDifference_1 = ts.convertToRelativePath(extendedDirname, basePath, ts.identity);
+                    var updatePath_1 = function (path) { return ts.isRootedDiskPath(path) ? path : ts.combinePaths(relativeDifference_1, path); };
+                    var mapPropertiesInRawIfNotUndefined = function (propertyName) {
+                        if (raw_2[propertyName]) {
+                            raw_2[propertyName] = ts.map(raw_2[propertyName], updatePath_1);
+                        }
+                    };
+                    var raw_2 = extendedConfig.raw;
+                    mapPropertiesInRawIfNotUndefined("include");
+                    mapPropertiesInRawIfNotUndefined("exclude");
+                    mapPropertiesInRawIfNotUndefined("files");
+                }
+            }
+            if (extendedConfigCache) {
+                extendedConfigCache.set(path, { extendedResult: extendedResult, extendedConfig: extendedConfig });
+            }
+        }
         if (sourceFile) {
             sourceFile.extendedSourceFiles = [extendedResult.fileName];
+            if (extendedResult.extendedSourceFiles) {
+                (_a = sourceFile.extendedSourceFiles).push.apply(_a, extendedResult.extendedSourceFiles);
+            }
         }
         if (extendedResult.parseDiagnostics.length) {
             errors.push.apply(errors, extendedResult.parseDiagnostics);
             return undefined;
         }
-        var extendedDirname = ts.getDirectoryPath(extendedConfigPath);
-        var extendedConfig = parseConfig(/*json*/ undefined, extendedResult, host, extendedDirname, ts.getBaseFileName(extendedConfigPath), resolutionStack, errors);
-        if (sourceFile && extendedResult.extendedSourceFiles) {
-            (_a = sourceFile.extendedSourceFiles).push.apply(_a, extendedResult.extendedSourceFiles);
-        }
-        if (isSuccessfulParsedTsconfig(extendedConfig)) {
-            // Update the paths to reflect base path
-            var relativeDifference_1 = ts.convertToRelativePath(extendedDirname, basePath, ts.identity);
-            var updatePath_1 = function (path) { return ts.isRootedDiskPath(path) ? path : ts.combinePaths(relativeDifference_1, path); };
-            var mapPropertiesInRawIfNotUndefined = function (propertyName) {
-                if (raw_2[propertyName]) {
-                    raw_2[propertyName] = ts.map(raw_2[propertyName], updatePath_1);
-                }
-            };
-            var raw_2 = extendedConfig.raw;
-            mapPropertiesInRawIfNotUndefined("include");
-            mapPropertiesInRawIfNotUndefined("exclude");
-            mapPropertiesInRawIfNotUndefined("files");
-        }
         return extendedConfig;
     }
     function convertCompileOnSaveOptionFromJson(jsonOption, basePath, errors) {
@@ -26084,11 +26512,22 @@ var ts;
         return !!compilerOptions.traceResolution && host.trace !== undefined;
     }
     ts.isTraceEnabled = isTraceEnabled;
-    function withPackageId(packageId, r) {
+    function withPackageId(packageInfo, r) {
+        var packageId;
+        if (r && packageInfo) {
+            var packageJsonContent = packageInfo.packageJsonContent;
+            if (typeof packageJsonContent.name === "string" && typeof packageJsonContent.version === "string") {
+                packageId = {
+                    name: packageJsonContent.name,
+                    subModuleName: r.path.slice(packageInfo.packageDirectory.length + ts.directorySeparator.length),
+                    version: packageJsonContent.version
+                };
+            }
+        }
         return r && { path: r.path, extension: r.ext, packageId: packageId };
     }
     function noPackageId(r) {
-        return withPackageId(/*packageId*/ undefined, r);
+        return withPackageId(/*packageInfo*/ undefined, r);
     }
     function removeIgnoredPackageId(r) {
         if (r) {
@@ -26140,8 +26579,15 @@ var ts;
     }
     function readPackageJsonPathField(jsonContent, fieldName, baseDirectory, state) {
         var fileName = readPackageJsonField(jsonContent, fieldName, "string", state);
-        if (fileName === undefined)
+        if (fileName === undefined) {
             return;
+        }
+        if (!fileName) {
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.package_json_had_a_falsy_0_field, fieldName);
+            }
+            return;
+        }
         var path = ts.normalizePath(ts.combinePaths(baseDirectory, fileName));
         if (state.traceEnabled) {
             trace(state.host, ts.Diagnostics.package_json_has_0_field_1_that_references_2, fieldName, fileName, path);
@@ -26294,7 +26740,12 @@ var ts;
             var fileName = resolved.fileName, packageId = resolved.packageId;
             var resolvedFileName = options.preserveSymlinks ? fileName : realPath(fileName, host, traceEnabled);
             if (traceEnabled) {
-                trace(host, ts.Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2, typeReferenceDirectiveName, resolvedFileName, primary);
+                if (packageId) {
+                    trace(host, ts.Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_with_Package_ID_2_primary_Colon_3, typeReferenceDirectiveName, resolvedFileName, ts.packageIdToString(packageId), primary);
+                }
+                else {
+                    trace(host, ts.Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2, typeReferenceDirectiveName, resolvedFileName, primary);
+                }
             }
             resolvedTypeReferenceDirective = { primary: primary, resolvedFileName: resolvedFileName, packageId: packageId, isExternalLibraryImport: pathContainsNodeModules(fileName) };
         }
@@ -26396,20 +26847,28 @@ var ts;
         return result;
     }
     ts.getAutomaticTypeDirectiveNames = getAutomaticTypeDirectiveNames;
-    function createModuleResolutionCache(currentDirectory, getCanonicalFileName) {
-        return createModuleResolutionCacheWithMaps(createCacheWithRedirects(), createCacheWithRedirects(), currentDirectory, getCanonicalFileName);
+    function createModuleResolutionCache(currentDirectory, getCanonicalFileName, options) {
+        return createModuleResolutionCacheWithMaps(createCacheWithRedirects(options), createCacheWithRedirects(options), currentDirectory, getCanonicalFileName);
     }
     ts.createModuleResolutionCache = createModuleResolutionCache;
     /*@internal*/
-    function createCacheWithRedirects() {
+    function createCacheWithRedirects(options) {
         var ownMap = ts.createMap();
         var redirectsMap = ts.createMap();
         return {
             ownMap: ownMap,
             redirectsMap: redirectsMap,
             getOrCreateMapOfCacheRedirects: getOrCreateMapOfCacheRedirects,
-            clear: clear
+            clear: clear,
+            setOwnOptions: setOwnOptions,
+            setOwnMap: setOwnMap
         };
+        function setOwnOptions(newOptions) {
+            options = newOptions;
+        }
+        function setOwnMap(newOwnMap) {
+            ownMap = newOwnMap;
+        }
         function getOrCreateMapOfCacheRedirects(redirectedReference) {
             if (!redirectedReference) {
                 return ownMap;
@@ -26417,7 +26876,8 @@ var ts;
             var path = redirectedReference.sourceFile.path;
             var redirects = redirectsMap.get(path);
             if (!redirects) {
-                redirects = ts.createMap();
+                // Reuse map if redirected reference map uses same resolution
+                redirects = !options || ts.optionsHaveModuleResolutionChanges(options, redirectedReference.commandLine.options) ? ts.createMap() : ownMap;
                 redirectsMap.set(path, redirects);
             }
             return redirects;
@@ -26430,7 +26890,7 @@ var ts;
     ts.createCacheWithRedirects = createCacheWithRedirects;
     /*@internal*/
     function createModuleResolutionCacheWithMaps(directoryToModuleNameMap, moduleNameToDirectoryMap, currentDirectory, getCanonicalFileName) {
-        return { getOrCreateCacheForDirectory: getOrCreateCacheForDirectory, getOrCreateCacheForModuleName: getOrCreateCacheForModuleName };
+        return { getOrCreateCacheForDirectory: getOrCreateCacheForDirectory, getOrCreateCacheForModuleName: getOrCreateCacheForModuleName, directoryToModuleNameMap: directoryToModuleNameMap, moduleNameToDirectoryMap: moduleNameToDirectoryMap };
         function getOrCreateCacheForDirectory(directoryName, redirectedReference) {
             var path = ts.toPath(directoryName, currentDirectory, getCanonicalFileName);
             return getOrCreateCache(directoryToModuleNameMap, redirectedReference, path, ts.createMap);
@@ -26573,7 +27033,12 @@ var ts;
         }
         if (traceEnabled) {
             if (result.resolvedModule) {
-                trace(host, ts.Diagnostics.Module_name_0_was_successfully_resolved_to_1, moduleName, result.resolvedModule.resolvedFileName);
+                if (result.resolvedModule.packageId) {
+                    trace(host, ts.Diagnostics.Module_name_0_was_successfully_resolved_to_1_with_Package_ID_2, moduleName, result.resolvedModule.resolvedFileName, ts.packageIdToString(result.resolvedModule.packageId));
+                }
+                else {
+                    trace(host, ts.Diagnostics.Module_name_0_was_successfully_resolved_to_1, moduleName, result.resolvedModule.resolvedFileName);
+                }
             }
             else {
                 trace(host, ts.Diagnostics.Module_name_0_was_not_resolved, moduleName);
@@ -26843,10 +27308,9 @@ var ts;
             }
             var resolvedFromFile = loadModuleFromFile(extensions, candidate, onlyRecordFailures, state);
             if (resolvedFromFile) {
-                var nm = considerPackageJson ? parseNodeModuleFromPath(resolvedFromFile) : undefined;
-                var packageInfo = nm && getPackageJsonInfo(nm.packageDirectory, nm.subModuleName, /*onlyRecordFailures*/ false, state);
-                var packageId = packageInfo && packageInfo.packageId;
-                return withPackageId(packageId, resolvedFromFile);
+                var packageDirectory = considerPackageJson ? parseNodeModuleFromPath(resolvedFromFile) : undefined;
+                var packageInfo = packageDirectory ? getPackageJsonInfo(packageDirectory, /*onlyRecordFailures*/ false, state) : undefined;
+                return withPackageId(packageInfo, resolvedFromFile);
             }
         }
         if (!onlyRecordFailures) {
@@ -26872,11 +27336,10 @@ var ts;
      * (Not neeeded for `loadModuleFromNodeModules` as that looks up the `package.json` as part of resolution.)
      *
      * packageDirectory is the directory of the package itself.
-     * subModuleName is the path within the package.
-     *   For `blah/node_modules/foo/index.d.ts` this is { packageDirectory: "foo", subModuleName: "index.d.ts" }. (Part before "/node_modules/" is ignored.)
-     *   For `/node_modules/foo/bar.d.ts` this is { packageDirectory: "foo", subModuleName": "bar/index.d.ts" }.
-     *   For `/node_modules/@types/foo/bar/index.d.ts` this is { packageDirectory: "@types/foo", subModuleName: "bar/index.d.ts" }.
-     *   For `/node_modules/foo/bar/index.d.ts` this is { packageDirectory: "foo", subModuleName": "bar/index.d.ts" }.
+     *   For `blah/node_modules/foo/index.d.ts` this is packageDirectory: "foo"
+     *   For `/node_modules/foo/bar.d.ts` this is packageDirectory: "foo"
+     *   For `/node_modules/@types/foo/bar/index.d.ts` this is packageDirectory: "@types/foo"
+     *   For `/node_modules/foo/bar/index.d.ts` this is packageDirectory: "foo"
      */
     function parseNodeModuleFromPath(resolved) {
         var path = ts.normalizePath(resolved.path);
@@ -26889,26 +27352,12 @@ var ts;
         if (path.charCodeAt(indexAfterNodeModules) === 64 /* at */) {
             indexAfterPackageName = moveToNextDirectorySeparatorIfAvailable(path, indexAfterPackageName);
         }
-        var packageDirectory = path.slice(0, indexAfterPackageName);
-        var subModuleName = ts.removeExtension(path.slice(indexAfterPackageName + 1), resolved.ext) + ".d.ts" /* Dts */;
-        return { packageDirectory: packageDirectory, subModuleName: subModuleName };
+        return path.slice(0, indexAfterPackageName);
     }
     function moveToNextDirectorySeparatorIfAvailable(path, prevSeparatorIndex) {
         var nextSeparatorIndex = path.indexOf(ts.directorySeparator, prevSeparatorIndex + 1);
         return nextSeparatorIndex === -1 ? prevSeparatorIndex : nextSeparatorIndex;
     }
-    function addExtensionAndIndex(path) {
-        if (path === "") {
-            return "index.d.ts";
-        }
-        if (ts.endsWith(path, ".d.ts")) {
-            return path;
-        }
-        if (path === "index" || ts.endsWith(path, "/index")) {
-            return path + ".d.ts";
-        }
-        return path + "/index.d.ts";
-    }
     function loadModuleFromFileNoPackageId(extensions, candidate, onlyRecordFailures, state) {
         return noPackageId(loadModuleFromFile(extensions, candidate, onlyRecordFailures, state));
     }
@@ -26982,52 +27431,22 @@ var ts;
     }
     function loadNodeModuleFromDirectory(extensions, candidate, onlyRecordFailures, state, considerPackageJson) {
         if (considerPackageJson === void 0) { considerPackageJson = true; }
-        var packageInfo = considerPackageJson ? getPackageJsonInfo(candidate, "", onlyRecordFailures, state) : undefined;
-        var packageId = packageInfo && packageInfo.packageId;
+        var packageInfo = considerPackageJson ? getPackageJsonInfo(candidate, onlyRecordFailures, state) : undefined;
         var packageJsonContent = packageInfo && packageInfo.packageJsonContent;
-        var versionPaths = packageJsonContent && readPackageJsonTypesVersionPaths(packageJsonContent, state);
-        return withPackageId(packageId, loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageJsonContent, versionPaths));
+        var versionPaths = packageInfo && packageInfo.versionPaths;
+        return withPackageId(packageInfo, loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageJsonContent, versionPaths));
     }
-    function getPackageJsonInfo(packageDirectory, subModuleName, onlyRecordFailures, state) {
+    function getPackageJsonInfo(packageDirectory, onlyRecordFailures, state) {
         var host = state.host, traceEnabled = state.traceEnabled;
         var directoryExists = !onlyRecordFailures && ts.directoryProbablyExists(packageDirectory, host);
         var packageJsonPath = ts.combinePaths(packageDirectory, "package.json");
         if (directoryExists && host.fileExists(packageJsonPath)) {
             var packageJsonContent = ts.readJson(packageJsonPath, host);
-            if (subModuleName === "") { // looking up the root - need to handle types/typings/main redirects for subModuleName
-                var path = readPackageJsonTypesFields(packageJsonContent, packageDirectory, state);
-                if (typeof path === "string") {
-                    subModuleName = addExtensionAndIndex(path.substring(packageDirectory.length + 1));
-                }
-                else {
-                    var jsPath = readPackageJsonMainField(packageJsonContent, packageDirectory, state);
-                    if (typeof jsPath === "string" && jsPath.length > packageDirectory.length) {
-                        var potentialSubModule_1 = jsPath.substring(packageDirectory.length + 1);
-                        subModuleName = (ts.forEach(ts.supportedJSExtensions, function (extension) {
-                            return ts.tryRemoveExtension(potentialSubModule_1, extension);
-                        }) || potentialSubModule_1) + ".d.ts" /* Dts */;
-                    }
-                    else {
-                        subModuleName = "index.d.ts";
-                    }
-                }
-            }
-            if (!ts.endsWith(subModuleName, ".d.ts" /* Dts */)) {
-                subModuleName = addExtensionAndIndex(subModuleName);
+            if (traceEnabled) {
+                trace(host, ts.Diagnostics.Found_package_json_at_0, packageJsonPath);
             }
             var versionPaths = readPackageJsonTypesVersionPaths(packageJsonContent, state);
-            var packageId = typeof packageJsonContent.name === "string" && typeof packageJsonContent.version === "string"
-                ? { name: packageJsonContent.name, subModuleName: subModuleName, version: packageJsonContent.version }
-                : undefined;
-            if (traceEnabled) {
-                if (packageId) {
-                    trace(host, ts.Diagnostics.Found_package_json_at_0_Package_ID_is_1, packageJsonPath, ts.packageIdToString(packageId));
-                }
-                else {
-                    trace(host, ts.Diagnostics.Found_package_json_at_0, packageJsonPath);
-                }
-            }
-            return { packageJsonContent: packageJsonContent, packageId: packageId, versionPaths: versionPaths };
+            return { packageDirectory: packageDirectory, packageJsonContent: packageJsonContent, versionPaths: versionPaths };
         }
         else {
             if (directoryExists && traceEnabled) {
@@ -27166,37 +27585,31 @@ var ts;
     function loadModuleFromSpecificNodeModulesDirectory(extensions, moduleName, nodeModulesDirectory, nodeModulesDirectoryExists, state) {
         var candidate = ts.normalizePath(ts.combinePaths(nodeModulesDirectory, moduleName));
         // First look for a nested package.json, as in `node_modules/foo/bar/package.json`.
-        var packageJsonContent;
-        var packageId;
-        var versionPaths;
-        var packageInfo = getPackageJsonInfo(candidate, "", !nodeModulesDirectoryExists, state);
+        var packageInfo = getPackageJsonInfo(candidate, !nodeModulesDirectoryExists, state);
         if (packageInfo) {
-            (packageJsonContent = packageInfo.packageJsonContent, packageId = packageInfo.packageId, versionPaths = packageInfo.versionPaths);
             var fromFile = loadModuleFromFile(extensions, candidate, !nodeModulesDirectoryExists, state);
             if (fromFile) {
                 return noPackageId(fromFile);
             }
-            var fromDirectory = loadNodeModuleFromDirectoryWorker(extensions, candidate, !nodeModulesDirectoryExists, state, packageJsonContent, versionPaths);
-            return withPackageId(packageId, fromDirectory);
+            var fromDirectory = loadNodeModuleFromDirectoryWorker(extensions, candidate, !nodeModulesDirectoryExists, state, packageInfo.packageJsonContent, packageInfo.versionPaths);
+            return withPackageId(packageInfo, fromDirectory);
         }
         var loader = function (extensions, candidate, onlyRecordFailures, state) {
             var pathAndExtension = loadModuleFromFile(extensions, candidate, onlyRecordFailures, state) ||
-                loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageJsonContent, versionPaths);
-            return withPackageId(packageId, pathAndExtension);
+                loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageInfo && packageInfo.packageJsonContent, packageInfo && packageInfo.versionPaths);
+            return withPackageId(packageInfo, pathAndExtension);
         };
         var _a = parsePackageName(moduleName), packageName = _a.packageName, rest = _a.rest;
         if (rest !== "") { // If "rest" is empty, we just did this search above.
             var packageDirectory = ts.combinePaths(nodeModulesDirectory, packageName);
             // Don't use a "types" or "main" from here because we're not loading the root, but a subdirectory -- just here for the packageId and path mappings.
-            var packageInfo_1 = getPackageJsonInfo(packageDirectory, rest, !nodeModulesDirectoryExists, state);
-            if (packageInfo_1)
-                (packageId = packageInfo_1.packageId, versionPaths = packageInfo_1.versionPaths);
-            if (versionPaths) {
+            packageInfo = getPackageJsonInfo(packageDirectory, !nodeModulesDirectoryExists, state);
+            if (packageInfo && packageInfo.versionPaths) {
                 if (state.traceEnabled) {
-                    trace(state.host, ts.Diagnostics.package_json_has_a_typesVersions_entry_0_that_matches_compiler_version_1_looking_for_a_pattern_to_match_module_name_2, versionPaths.version, ts.version, rest);
+                    trace(state.host, ts.Diagnostics.package_json_has_a_typesVersions_entry_0_that_matches_compiler_version_1_looking_for_a_pattern_to_match_module_name_2, packageInfo.versionPaths.version, ts.version, rest);
                 }
                 var packageDirectoryExists = nodeModulesDirectoryExists && ts.directoryProbablyExists(packageDirectory, state.host);
-                var fromPaths = tryLoadModuleUsingPaths(extensions, rest, packageDirectory, versionPaths.paths, loader, !packageDirectoryExists, state);
+                var fromPaths = tryLoadModuleUsingPaths(extensions, rest, packageDirectory, packageInfo.versionPaths.paths, loader, !packageDirectoryExists, state);
                 if (fromPaths) {
                     return fromPaths.value;
                 }
@@ -27324,8 +27737,8 @@ var ts;
     }
     ts.classicNameResolver = classicNameResolver;
     /**
-     * LSHost may load a module from a global cache of typings.
-     * This is the minumum code needed to expose that functionality; the rest is in LSHost.
+     * A host may load a module from a global cache of typings.
+     * This is the minumum code needed to expose that functionality; the rest is in the host.
      */
     /* @internal */
     function loadModuleFromGlobalCache(moduleName, projectName, compilerOptions, host, globalCache) {
@@ -27364,24 +27777,24 @@ var ts;
         // A module is uninstantiated if it contains only
         switch (node.kind) {
             // 1. interface declarations, type alias declarations
-            case 241 /* InterfaceDeclaration */:
-            case 242 /* TypeAliasDeclaration */:
+            case 242 /* InterfaceDeclaration */:
+            case 243 /* TypeAliasDeclaration */:
                 return 0 /* NonInstantiated */;
             // 2. const enum declarations
-            case 243 /* EnumDeclaration */:
+            case 244 /* EnumDeclaration */:
                 if (ts.isEnumConst(node)) {
                     return 2 /* ConstEnumOnly */;
                 }
                 break;
             // 3. non-exported import declarations
-            case 249 /* ImportDeclaration */:
-            case 248 /* ImportEqualsDeclaration */:
+            case 250 /* ImportDeclaration */:
+            case 249 /* ImportEqualsDeclaration */:
                 if (!(ts.hasModifier(node, 1 /* Export */))) {
                     return 0 /* NonInstantiated */;
                 }
                 break;
             // 4. other uninstantiated module declarations.
-            case 245 /* ModuleBlock */: {
+            case 246 /* ModuleBlock */: {
                 var state_1 = 0 /* NonInstantiated */;
                 ts.forEachChild(node, function (n) {
                     var childState = getModuleInstanceStateWorker(n);
@@ -27403,9 +27816,9 @@ var ts;
                 });
                 return state_1;
             }
-            case 244 /* ModuleDeclaration */:
+            case 245 /* ModuleDeclaration */:
                 return getModuleInstanceState(node);
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 // Only jsdoc typedef definition can exist in jsdoc namespace, and it should
                 // be considered the same as type alias
                 if (node.isInJSDocNamespace) {
@@ -27571,7 +27984,7 @@ var ts;
         // Should not be called on a declaration with a computed property name,
         // unless it is a well known Symbol.
         function getDeclarationName(node) {
-            if (node.kind === 254 /* ExportAssignment */) {
+            if (node.kind === 255 /* ExportAssignment */) {
                 return node.isExportEquals ? "export=" /* ExportEquals */ : "default" /* Default */;
             }
             var name = ts.getNameOfDeclaration(node);
@@ -27580,48 +27993,51 @@ var ts;
                     var moduleName = ts.getTextOfIdentifierOrLiteral(name);
                     return (ts.isGlobalScopeAugmentation(node) ? "__global" : "\"" + moduleName + "\"");
                 }
-                if (name.kind === 149 /* ComputedPropertyName */) {
+                if (name.kind === 150 /* ComputedPropertyName */) {
                     var nameExpression = name.expression;
                     // treat computed property names where expression is string/numeric literal as just string/numeric literal
                     if (ts.isStringOrNumericLiteralLike(nameExpression)) {
                         return ts.escapeLeadingUnderscores(nameExpression.text);
                     }
+                    if (ts.isSignedNumericLiteral(nameExpression)) {
+                        return ts.tokenToString(nameExpression.operator) + nameExpression.operand.text;
+                    }
                     ts.Debug.assert(ts.isWellKnownSymbolSyntactically(nameExpression));
                     return ts.getPropertyNameForKnownSymbolName(ts.idText(nameExpression.name));
                 }
                 return ts.isPropertyNameLiteral(name) ? ts.getEscapedTextOfIdentifierOrLiteral(name) : undefined;
             }
             switch (node.kind) {
-                case 157 /* Constructor */:
+                case 158 /* Constructor */:
                     return "__constructor" /* Constructor */;
-                case 165 /* FunctionType */:
-                case 160 /* CallSignature */:
-                case 298 /* JSDocSignature */:
+                case 166 /* FunctionType */:
+                case 161 /* CallSignature */:
+                case 299 /* JSDocSignature */:
                     return "__call" /* Call */;
-                case 166 /* ConstructorType */:
-                case 161 /* ConstructSignature */:
+                case 167 /* ConstructorType */:
+                case 162 /* ConstructSignature */:
                     return "__new" /* New */;
-                case 162 /* IndexSignature */:
+                case 163 /* IndexSignature */:
                     return "__index" /* Index */;
-                case 255 /* ExportDeclaration */:
+                case 256 /* ExportDeclaration */:
                     return "__export" /* ExportStar */;
-                case 284 /* SourceFile */:
+                case 285 /* SourceFile */:
                     // json file should behave as
                     // module.exports = ...
                     return "export=" /* ExportEquals */;
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     if (ts.getAssignmentDeclarationKind(node) === 2 /* ModuleExports */) {
                         // module.exports = ...
                         return "export=" /* ExportEquals */;
                     }
                     ts.Debug.fail("Unknown binary declaration kind");
                     break;
-                case 294 /* JSDocFunctionType */:
+                case 295 /* JSDocFunctionType */:
                     return (ts.isJSDocConstructSignature(node) ? "__new" /* New */ : "__call" /* Call */);
-                case 151 /* Parameter */:
+                case 152 /* Parameter */:
                     // Parameters with names are handled at the top of this function.  Parameters
                     // without names can only come from JSDocFunctionTypes.
-                    ts.Debug.assert(node.parent.kind === 294 /* JSDocFunctionType */, "Impossible parameter parent kind", function () { return "parent is: " + (ts.SyntaxKind ? ts.SyntaxKind[node.parent.kind] : node.parent.kind) + ", expected JSDocFunctionType"; });
+                    ts.Debug.assert(node.parent.kind === 295 /* JSDocFunctionType */, "Impossible parameter parent kind", function () { return "parent is: " + (ts.SyntaxKind ? ts.SyntaxKind[node.parent.kind] : node.parent.kind) + ", expected JSDocFunctionType"; });
                     var functionType = node.parent;
                     var index = functionType.parameters.indexOf(node);
                     return "arg" + index;
@@ -27705,13 +28121,15 @@ var ts;
                             message_1 = ts.Diagnostics.Enum_declarations_can_only_merge_with_namespace_or_other_enum_declarations;
                             messageNeedsName_1 = false;
                         }
-                        if (symbol.declarations && symbol.declarations.length) {
+                        var multipleDefaultExports_1 = false;
+                        if (ts.length(symbol.declarations)) {
                             // If the current node is a default export of some sort, then check if
                             // there are any other default exports that we need to error on.
                             // We'll know whether we have other default exports depending on if `symbol` already has a declaration list set.
                             if (isDefaultExport) {
                                 message_1 = ts.Diagnostics.A_module_cannot_have_multiple_default_exports;
                                 messageNeedsName_1 = false;
+                                multipleDefaultExports_1 = true;
                             }
                             else {
                                 // This is to properly report an error in the case "export default { }" is after export default of class declaration or function declaration.
@@ -27719,17 +28137,25 @@ var ts;
                                 // 1. multiple export default of class declaration or function declaration by checking NodeFlags.Default
                                 // 2. multiple export default of export assignment. This one doesn't have NodeFlags.Default on (as export default doesn't considered as modifiers)
                                 if (symbol.declarations && symbol.declarations.length &&
-                                    (node.kind === 254 /* ExportAssignment */ && !node.isExportEquals)) {
+                                    (node.kind === 255 /* ExportAssignment */ && !node.isExportEquals)) {
                                     message_1 = ts.Diagnostics.A_module_cannot_have_multiple_default_exports;
                                     messageNeedsName_1 = false;
+                                    multipleDefaultExports_1 = true;
                                 }
                             }
                         }
-                        var addError = function (decl) {
-                            file.bindDiagnostics.push(createDiagnosticForNode(ts.getNameOfDeclaration(decl) || decl, message_1, messageNeedsName_1 ? getDisplayName(decl) : undefined));
-                        };
-                        ts.forEach(symbol.declarations, addError);
-                        addError(node);
+                        var declarationName_1 = ts.getNameOfDeclaration(node) || node;
+                        var relatedInformation_1 = [];
+                        ts.forEach(symbol.declarations, function (declaration, index) {
+                            var decl = ts.getNameOfDeclaration(declaration) || declaration;
+                            var diag = createDiagnosticForNode(decl, message_1, messageNeedsName_1 ? getDisplayName(declaration) : undefined);
+                            file.bindDiagnostics.push(multipleDefaultExports_1 ? ts.addRelatedInfo(diag, createDiagnosticForNode(declarationName_1, index === 0 ? ts.Diagnostics.Another_export_default_is_here : ts.Diagnostics.and_here)) : diag);
+                            if (multipleDefaultExports_1) {
+                                relatedInformation_1.push(createDiagnosticForNode(decl, ts.Diagnostics.The_first_export_default_is_here));
+                            }
+                        });
+                        var diag = createDiagnosticForNode(declarationName_1, message_1, messageNeedsName_1 ? getDisplayName(node) : undefined);
+                        file.bindDiagnostics.push(multipleDefaultExports_1 ? ts.addRelatedInfo.apply(void 0, [diag].concat(relatedInformation_1)) : diag);
                         symbol = createSymbol(0 /* None */, name);
                     }
                 }
@@ -27746,7 +28172,7 @@ var ts;
         function declareModuleMember(node, symbolFlags, symbolExcludes) {
             var hasExportModifier = ts.getCombinedModifierFlags(node) & 1 /* Export */;
             if (symbolFlags & 2097152 /* Alias */) {
-                if (node.kind === 257 /* ExportSpecifier */ || (node.kind === 248 /* ImportEqualsDeclaration */ && hasExportModifier)) {
+                if (node.kind === 258 /* ExportSpecifier */ || (node.kind === 249 /* ImportEqualsDeclaration */ && hasExportModifier)) {
                     return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);
                 }
                 else {
@@ -27813,7 +28239,7 @@ var ts;
             // for it.  We must clear this so we don't accidentally move any stale data forward from
             // a previous compilation.
             if (containerFlags & 1 /* IsContainer */) {
-                if (node.kind !== 197 /* ArrowFunction */) {
+                if (node.kind !== 198 /* ArrowFunction */) {
                     thisParentContainer = container;
                 }
                 container = blockScopeContainer = node;
@@ -27846,7 +28272,7 @@ var ts;
                 }
                 // We create a return control flow graph for IIFEs and constructors. For constructors
                 // we use the return control flow graph in strict property initialization checks.
-                currentReturnTarget = isIIFE || node.kind === 157 /* Constructor */ ? createBranchLabel() : undefined;
+                currentReturnTarget = isIIFE || node.kind === 158 /* Constructor */ ? createBranchLabel() : undefined;
                 currentBreakTarget = undefined;
                 currentContinueTarget = undefined;
                 activeLabels = undefined;
@@ -27860,13 +28286,13 @@ var ts;
                     if (hasExplicitReturn)
                         node.flags |= 256 /* HasExplicitReturn */;
                 }
-                if (node.kind === 284 /* SourceFile */) {
+                if (node.kind === 285 /* SourceFile */) {
                     node.flags |= emitFlags;
                 }
                 if (currentReturnTarget) {
                     addAntecedent(currentReturnTarget, currentFlow);
                     currentFlow = finishFlowLabel(currentReturnTarget);
-                    if (node.kind === 157 /* Constructor */) {
+                    if (node.kind === 158 /* Constructor */) {
                         node.returnFlowNode = currentFlow;
                     }
                 }
@@ -27910,8 +28336,8 @@ var ts;
             }
         }
         function bindEachFunctionsFirst(nodes) {
-            bindEach(nodes, function (n) { return n.kind === 239 /* FunctionDeclaration */ ? bind(n) : undefined; });
-            bindEach(nodes, function (n) { return n.kind !== 239 /* FunctionDeclaration */ ? bind(n) : undefined; });
+            bindEach(nodes, function (n) { return n.kind === 240 /* FunctionDeclaration */ ? bind(n) : undefined; });
+            bindEach(nodes, function (n) { return n.kind !== 240 /* FunctionDeclaration */ ? bind(n) : undefined; });
         }
         function bindEach(nodes, bindFunction) {
             if (bindFunction === void 0) { bindFunction = bind; }
@@ -27944,78 +28370,78 @@ var ts;
                 return;
             }
             switch (node.kind) {
-                case 224 /* WhileStatement */:
+                case 225 /* WhileStatement */:
                     bindWhileStatement(node);
                     break;
-                case 223 /* DoStatement */:
+                case 224 /* DoStatement */:
                     bindDoStatement(node);
                     break;
-                case 225 /* ForStatement */:
+                case 226 /* ForStatement */:
                     bindForStatement(node);
                     break;
-                case 226 /* ForInStatement */:
-                case 227 /* ForOfStatement */:
+                case 227 /* ForInStatement */:
+                case 228 /* ForOfStatement */:
                     bindForInOrForOfStatement(node);
                     break;
-                case 222 /* IfStatement */:
+                case 223 /* IfStatement */:
                     bindIfStatement(node);
                     break;
-                case 230 /* ReturnStatement */:
-                case 234 /* ThrowStatement */:
+                case 231 /* ReturnStatement */:
+                case 235 /* ThrowStatement */:
                     bindReturnOrThrow(node);
                     break;
-                case 229 /* BreakStatement */:
-                case 228 /* ContinueStatement */:
+                case 230 /* BreakStatement */:
+                case 229 /* ContinueStatement */:
                     bindBreakOrContinueStatement(node);
                     break;
-                case 235 /* TryStatement */:
+                case 236 /* TryStatement */:
                     bindTryStatement(node);
                     break;
-                case 232 /* SwitchStatement */:
+                case 233 /* SwitchStatement */:
                     bindSwitchStatement(node);
                     break;
-                case 246 /* CaseBlock */:
+                case 247 /* CaseBlock */:
                     bindCaseBlock(node);
                     break;
-                case 271 /* CaseClause */:
+                case 272 /* CaseClause */:
                     bindCaseClause(node);
                     break;
-                case 233 /* LabeledStatement */:
+                case 234 /* LabeledStatement */:
                     bindLabeledStatement(node);
                     break;
-                case 202 /* PrefixUnaryExpression */:
+                case 203 /* PrefixUnaryExpression */:
                     bindPrefixUnaryExpressionFlow(node);
                     break;
-                case 203 /* PostfixUnaryExpression */:
+                case 204 /* PostfixUnaryExpression */:
                     bindPostfixUnaryExpressionFlow(node);
                     break;
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     bindBinaryExpressionFlow(node);
                     break;
-                case 198 /* DeleteExpression */:
+                case 199 /* DeleteExpression */:
                     bindDeleteExpressionFlow(node);
                     break;
-                case 205 /* ConditionalExpression */:
+                case 206 /* ConditionalExpression */:
                     bindConditionalExpressionFlow(node);
                     break;
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     bindVariableDeclarationFlow(node);
                     break;
-                case 191 /* CallExpression */:
+                case 192 /* CallExpression */:
                     bindCallExpressionFlow(node);
                     break;
-                case 309 /* JSDocTypedefTag */:
-                case 302 /* JSDocCallbackTag */:
+                case 311 /* JSDocTypedefTag */:
+                case 304 /* JSDocCallbackTag */:
                     bindJSDocTypeAlias(node);
                     break;
                 // In source files and blocks, bind functions first to match hoisting that occurs at runtime
-                case 284 /* SourceFile */: {
+                case 285 /* SourceFile */: {
                     bindEachFunctionsFirst(node.statements);
                     bind(node.endOfFileToken);
                     break;
                 }
-                case 218 /* Block */:
-                case 245 /* ModuleBlock */:
+                case 219 /* Block */:
+                case 246 /* ModuleBlock */:
                     bindEachFunctionsFirst(node.statements);
                     break;
                 default:
@@ -28026,26 +28452,26 @@ var ts;
         }
         function isNarrowingExpression(expr) {
             switch (expr.kind) {
-                case 72 /* Identifier */:
-                case 100 /* ThisKeyword */:
-                case 189 /* PropertyAccessExpression */:
-                case 190 /* ElementAccessExpression */:
+                case 73 /* Identifier */:
+                case 101 /* ThisKeyword */:
+                case 190 /* PropertyAccessExpression */:
+                case 191 /* ElementAccessExpression */:
                     return isNarrowableReference(expr);
-                case 191 /* CallExpression */:
+                case 192 /* CallExpression */:
                     return hasNarrowableArgument(expr);
-                case 195 /* ParenthesizedExpression */:
+                case 196 /* ParenthesizedExpression */:
                     return isNarrowingExpression(expr.expression);
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return isNarrowingBinaryExpression(expr);
-                case 202 /* PrefixUnaryExpression */:
+                case 203 /* PrefixUnaryExpression */:
                     return expr.operator === 52 /* ExclamationToken */ && isNarrowingExpression(expr.operand);
-                case 199 /* TypeOfExpression */:
+                case 200 /* TypeOfExpression */:
                     return isNarrowingExpression(expr.expression);
             }
             return false;
         }
         function isNarrowableReference(expr) {
-            return expr.kind === 72 /* Identifier */ || expr.kind === 100 /* ThisKeyword */ || expr.kind === 98 /* SuperKeyword */ ||
+            return expr.kind === 73 /* Identifier */ || expr.kind === 101 /* ThisKeyword */ || expr.kind === 99 /* SuperKeyword */ ||
                 (ts.isPropertyAccessExpression(expr) || ts.isNonNullExpression(expr) || ts.isParenthesizedExpression(expr)) && isNarrowableReference(expr.expression) ||
                 ts.isElementAccessExpression(expr) && expr.argumentExpression &&
                     (ts.isStringLiteral(expr.argumentExpression) || ts.isNumericLiteral(expr.argumentExpression)) &&
@@ -28060,7 +28486,7 @@ var ts;
                     }
                 }
             }
-            if (expr.expression.kind === 189 /* PropertyAccessExpression */ &&
+            if (expr.expression.kind === 190 /* PropertyAccessExpression */ &&
                 isNarrowableReference(expr.expression.expression)) {
                 return true;
             }
@@ -28074,7 +28500,7 @@ var ts;
         }
         function isNarrowingBinaryExpression(expr) {
             switch (expr.operatorToken.kind) {
-                case 59 /* EqualsToken */:
+                case 60 /* EqualsToken */:
                     return isNarrowableReference(expr.left);
                 case 33 /* EqualsEqualsToken */:
                 case 34 /* ExclamationEqualsToken */:
@@ -28082,9 +28508,9 @@ var ts;
                 case 36 /* ExclamationEqualsEqualsToken */:
                     return isNarrowableOperand(expr.left) || isNarrowableOperand(expr.right) ||
                         isNarrowingTypeofOperands(expr.right, expr.left) || isNarrowingTypeofOperands(expr.left, expr.right);
-                case 94 /* InstanceOfKeyword */:
+                case 95 /* InstanceOfKeyword */:
                     return isNarrowableOperand(expr.left);
-                case 93 /* InKeyword */:
+                case 94 /* InKeyword */:
                     return isNarrowableInOperands(expr.left, expr.right);
                 case 27 /* CommaToken */:
                     return isNarrowingExpression(expr.right);
@@ -28093,11 +28519,11 @@ var ts;
         }
         function isNarrowableOperand(expr) {
             switch (expr.kind) {
-                case 195 /* ParenthesizedExpression */:
+                case 196 /* ParenthesizedExpression */:
                     return isNarrowableOperand(expr.expression);
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     switch (expr.operatorToken.kind) {
-                        case 59 /* EqualsToken */:
+                        case 60 /* EqualsToken */:
                             return isNarrowableOperand(expr.left);
                         case 27 /* CommaToken */:
                             return isNarrowableOperand(expr.right);
@@ -28134,8 +28560,8 @@ var ts;
             if (!expression) {
                 return flags & 32 /* TrueCondition */ ? antecedent : unreachableFlow;
             }
-            if (expression.kind === 102 /* TrueKeyword */ && flags & 64 /* FalseCondition */ ||
-                expression.kind === 87 /* FalseKeyword */ && flags & 32 /* TrueCondition */) {
+            if (expression.kind === 103 /* TrueKeyword */ && flags & 64 /* FalseCondition */ ||
+                expression.kind === 88 /* FalseKeyword */ && flags & 32 /* TrueCondition */) {
                 return unreachableFlow;
             }
             if (!isNarrowingExpression(expression)) {
@@ -28173,33 +28599,33 @@ var ts;
         function isStatementCondition(node) {
             var parent = node.parent;
             switch (parent.kind) {
-                case 222 /* IfStatement */:
-                case 224 /* WhileStatement */:
-                case 223 /* DoStatement */:
+                case 223 /* IfStatement */:
+                case 225 /* WhileStatement */:
+                case 224 /* DoStatement */:
                     return parent.expression === node;
-                case 225 /* ForStatement */:
-                case 205 /* ConditionalExpression */:
+                case 226 /* ForStatement */:
+                case 206 /* ConditionalExpression */:
                     return parent.condition === node;
             }
             return false;
         }
         function isLogicalExpression(node) {
             while (true) {
-                if (node.kind === 195 /* ParenthesizedExpression */) {
+                if (node.kind === 196 /* ParenthesizedExpression */) {
                     node = node.expression;
                 }
-                else if (node.kind === 202 /* PrefixUnaryExpression */ && node.operator === 52 /* ExclamationToken */) {
+                else if (node.kind === 203 /* PrefixUnaryExpression */ && node.operator === 52 /* ExclamationToken */) {
                     node = node.operand;
                 }
                 else {
-                    return node.kind === 204 /* BinaryExpression */ && (node.operatorToken.kind === 54 /* AmpersandAmpersandToken */ ||
+                    return node.kind === 205 /* BinaryExpression */ && (node.operatorToken.kind === 54 /* AmpersandAmpersandToken */ ||
                         node.operatorToken.kind === 55 /* BarBarToken */);
                 }
             }
         }
         function isTopLevelLogicalExpression(node) {
-            while (node.parent.kind === 195 /* ParenthesizedExpression */ ||
-                node.parent.kind === 202 /* PrefixUnaryExpression */ &&
+            while (node.parent.kind === 196 /* ParenthesizedExpression */ ||
+                node.parent.kind === 203 /* PrefixUnaryExpression */ &&
                     node.parent.operator === 52 /* ExclamationToken */) {
                 node = node.parent;
             }
@@ -28241,7 +28667,7 @@ var ts;
         }
         function bindDoStatement(node) {
             var preDoLabel = createLoopLabel();
-            var enclosingLabeledStatement = node.parent.kind === 233 /* LabeledStatement */
+            var enclosingLabeledStatement = node.parent.kind === 234 /* LabeledStatement */
                 ? ts.lastOrUndefined(activeLabels)
                 : undefined;
             // if do statement is wrapped in labeled statement then target labels for break/continue with or without
@@ -28275,13 +28701,13 @@ var ts;
             var postLoopLabel = createBranchLabel();
             addAntecedent(preLoopLabel, currentFlow);
             currentFlow = preLoopLabel;
-            if (node.kind === 227 /* ForOfStatement */) {
+            if (node.kind === 228 /* ForOfStatement */) {
                 bind(node.awaitModifier);
             }
             bind(node.expression);
             addAntecedent(postLoopLabel, currentFlow);
             bind(node.initializer);
-            if (node.initializer.kind !== 238 /* VariableDeclarationList */) {
+            if (node.initializer.kind !== 239 /* VariableDeclarationList */) {
                 bindAssignmentTargetFlow(node.initializer);
             }
             bindIterativeStatement(node.statement, postLoopLabel, preLoopLabel);
@@ -28303,7 +28729,7 @@ var ts;
         }
         function bindReturnOrThrow(node) {
             bind(node.expression);
-            if (node.kind === 230 /* ReturnStatement */) {
+            if (node.kind === 231 /* ReturnStatement */) {
                 hasExplicitReturn = true;
                 if (currentReturnTarget) {
                     addAntecedent(currentReturnTarget, currentFlow);
@@ -28323,7 +28749,7 @@ var ts;
             return undefined;
         }
         function bindBreakOrContinueFlow(node, breakTarget, continueTarget) {
-            var flowLabel = node.kind === 229 /* BreakStatement */ ? breakTarget : continueTarget;
+            var flowLabel = node.kind === 230 /* BreakStatement */ ? breakTarget : continueTarget;
             if (flowLabel) {
                 addAntecedent(flowLabel, currentFlow);
                 currentFlow = unreachableFlow;
@@ -28451,7 +28877,7 @@ var ts;
             preSwitchCaseFlow = currentFlow;
             bind(node.caseBlock);
             addAntecedent(postSwitchLabel, currentFlow);
-            var hasDefault = ts.forEach(node.caseBlock.clauses, function (c) { return c.kind === 272 /* DefaultClause */; });
+            var hasDefault = ts.forEach(node.caseBlock.clauses, function (c) { return c.kind === 273 /* DefaultClause */; });
             // We mark a switch statement as possibly exhaustive if it has no default clause and if all
             // case clauses have unreachable end points (e.g. they all return).
             node.possiblyExhaustive = !hasDefault && !postSwitchLabel.antecedents;
@@ -28518,14 +28944,14 @@ var ts;
             if (!activeLabel.referenced && !options.allowUnusedLabels) {
                 errorOrSuggestionOnNode(ts.unusedLabelIsError(options), node.label, ts.Diagnostics.Unused_label);
             }
-            if (!node.statement || node.statement.kind !== 223 /* DoStatement */) {
+            if (!node.statement || node.statement.kind !== 224 /* DoStatement */) {
                 // do statement sets current flow inside bindDoStatement
                 addAntecedent(postStatementLabel, currentFlow);
                 currentFlow = finishFlowLabel(postStatementLabel);
             }
         }
         function bindDestructuringTargetFlow(node) {
-            if (node.kind === 204 /* BinaryExpression */ && node.operatorToken.kind === 59 /* EqualsToken */) {
+            if (node.kind === 205 /* BinaryExpression */ && node.operatorToken.kind === 60 /* EqualsToken */) {
                 bindAssignmentTargetFlow(node.left);
             }
             else {
@@ -28536,10 +28962,10 @@ var ts;
             if (isNarrowableReference(node)) {
                 currentFlow = createFlowAssignment(currentFlow, node);
             }
-            else if (node.kind === 187 /* ArrayLiteralExpression */) {
+            else if (node.kind === 188 /* ArrayLiteralExpression */) {
                 for (var _i = 0, _a = node.elements; _i < _a.length; _i++) {
                     var e = _a[_i];
-                    if (e.kind === 208 /* SpreadElement */) {
+                    if (e.kind === 209 /* SpreadElement */) {
                         bindAssignmentTargetFlow(e.expression);
                     }
                     else {
@@ -28547,16 +28973,16 @@ var ts;
                     }
                 }
             }
-            else if (node.kind === 188 /* ObjectLiteralExpression */) {
+            else if (node.kind === 189 /* ObjectLiteralExpression */) {
                 for (var _b = 0, _c = node.properties; _b < _c.length; _b++) {
                     var p = _c[_b];
-                    if (p.kind === 275 /* PropertyAssignment */) {
+                    if (p.kind === 276 /* PropertyAssignment */) {
                         bindDestructuringTargetFlow(p.initializer);
                     }
-                    else if (p.kind === 276 /* ShorthandPropertyAssignment */) {
+                    else if (p.kind === 277 /* ShorthandPropertyAssignment */) {
                         bindAssignmentTargetFlow(p.name);
                     }
-                    else if (p.kind === 277 /* SpreadAssignment */) {
+                    else if (p.kind === 278 /* SpreadAssignment */) {
                         bindAssignmentTargetFlow(p.expression);
                     }
                 }
@@ -28612,7 +29038,7 @@ var ts;
                 bindEachChild(node);
                 if (ts.isAssignmentOperator(operator) && !ts.isAssignmentTarget(node)) {
                     bindAssignmentTargetFlow(node.left);
-                    if (operator === 59 /* EqualsToken */ && node.left.kind === 190 /* ElementAccessExpression */) {
+                    if (operator === 60 /* EqualsToken */ && node.left.kind === 191 /* ElementAccessExpression */) {
                         var elementAccess = node.left;
                         if (isNarrowableOperand(elementAccess.expression)) {
                             currentFlow = createFlowArrayMutation(currentFlow, node);
@@ -28623,7 +29049,7 @@ var ts;
         }
         function bindDeleteExpressionFlow(node) {
             bindEachChild(node);
-            if (node.expression.kind === 189 /* PropertyAccessExpression */) {
+            if (node.expression.kind === 190 /* PropertyAccessExpression */) {
                 bindAssignmentTargetFlow(node.expression);
             }
         }
@@ -28671,10 +29097,10 @@ var ts;
             // an immediately invoked function expression (IIFE). Initialize the flowNode property to
             // the current control flow (which includes evaluation of the IIFE arguments).
             var expr = node.expression;
-            while (expr.kind === 195 /* ParenthesizedExpression */) {
+            while (expr.kind === 196 /* ParenthesizedExpression */) {
                 expr = expr.expression;
             }
-            if (expr.kind === 196 /* FunctionExpression */ || expr.kind === 197 /* ArrowFunction */) {
+            if (expr.kind === 197 /* FunctionExpression */ || expr.kind === 198 /* ArrowFunction */) {
                 bindEach(node.typeArguments);
                 bindEach(node.arguments);
                 bind(node.expression);
@@ -28682,7 +29108,7 @@ var ts;
             else {
                 bindEachChild(node);
             }
-            if (node.expression.kind === 189 /* PropertyAccessExpression */) {
+            if (node.expression.kind === 190 /* PropertyAccessExpression */) {
                 var propertyAccess = node.expression;
                 if (isNarrowableOperand(propertyAccess.expression) && ts.isPushOrUnshiftIdentifier(propertyAccess.name)) {
                     currentFlow = createFlowArrayMutation(currentFlow, node);
@@ -28691,54 +29117,54 @@ var ts;
         }
         function getContainerFlags(node) {
             switch (node.kind) {
-                case 209 /* ClassExpression */:
-                case 240 /* ClassDeclaration */:
-                case 243 /* EnumDeclaration */:
-                case 188 /* ObjectLiteralExpression */:
-                case 168 /* TypeLiteral */:
-                case 297 /* JSDocTypeLiteral */:
-                case 268 /* JsxAttributes */:
+                case 210 /* ClassExpression */:
+                case 241 /* ClassDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 189 /* ObjectLiteralExpression */:
+                case 169 /* TypeLiteral */:
+                case 298 /* JSDocTypeLiteral */:
+                case 269 /* JsxAttributes */:
                     return 1 /* IsContainer */;
-                case 241 /* InterfaceDeclaration */:
+                case 242 /* InterfaceDeclaration */:
                     return 1 /* IsContainer */ | 64 /* IsInterface */;
-                case 244 /* ModuleDeclaration */:
-                case 242 /* TypeAliasDeclaration */:
-                case 181 /* MappedType */:
+                case 245 /* ModuleDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
+                case 182 /* MappedType */:
                     return 1 /* IsContainer */ | 32 /* HasLocals */;
-                case 284 /* SourceFile */:
+                case 285 /* SourceFile */:
                     return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */;
-                case 156 /* MethodDeclaration */:
+                case 157 /* MethodDeclaration */:
                     if (ts.isObjectLiteralOrClassExpressionMethod(node)) {
                         return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */ | 8 /* IsFunctionLike */ | 128 /* IsObjectLiteralOrClassExpressionMethod */;
                     }
                 // falls through
-                case 157 /* Constructor */:
-                case 239 /* FunctionDeclaration */:
-                case 155 /* MethodSignature */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
-                case 160 /* CallSignature */:
-                case 298 /* JSDocSignature */:
-                case 294 /* JSDocFunctionType */:
-                case 165 /* FunctionType */:
-                case 161 /* ConstructSignature */:
-                case 162 /* IndexSignature */:
-                case 166 /* ConstructorType */:
+                case 158 /* Constructor */:
+                case 240 /* FunctionDeclaration */:
+                case 156 /* MethodSignature */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
+                case 161 /* CallSignature */:
+                case 299 /* JSDocSignature */:
+                case 295 /* JSDocFunctionType */:
+                case 166 /* FunctionType */:
+                case 162 /* ConstructSignature */:
+                case 163 /* IndexSignature */:
+                case 167 /* ConstructorType */:
                     return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */ | 8 /* IsFunctionLike */;
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
                     return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */ | 8 /* IsFunctionLike */ | 16 /* IsFunctionExpression */;
-                case 245 /* ModuleBlock */:
+                case 246 /* ModuleBlock */:
                     return 4 /* IsControlFlowContainer */;
-                case 154 /* PropertyDeclaration */:
+                case 155 /* PropertyDeclaration */:
                     return node.initializer ? 4 /* IsControlFlowContainer */ : 0;
-                case 274 /* CatchClause */:
-                case 225 /* ForStatement */:
-                case 226 /* ForInStatement */:
-                case 227 /* ForOfStatement */:
-                case 246 /* CaseBlock */:
+                case 275 /* CatchClause */:
+                case 226 /* ForStatement */:
+                case 227 /* ForInStatement */:
+                case 228 /* ForOfStatement */:
+                case 247 /* CaseBlock */:
                     return 2 /* IsBlockScopedContainer */;
-                case 218 /* Block */:
+                case 219 /* Block */:
                     // do not treat blocks directly inside a function as a block-scoped-container.
                     // Locals that reside in this block should go to the function locals. Otherwise 'x'
                     // would not appear to be a redeclaration of a block scoped local in the following
@@ -28771,45 +29197,45 @@ var ts;
                 // members are declared (for example, a member of a class will go into a specific
                 // symbol table depending on if it is static or not). We defer to specialized
                 // handlers to take care of declaring these child members.
-                case 244 /* ModuleDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     return declareModuleMember(node, symbolFlags, symbolExcludes);
-                case 284 /* SourceFile */:
+                case 285 /* SourceFile */:
                     return declareSourceFileMember(node, symbolFlags, symbolExcludes);
-                case 209 /* ClassExpression */:
-                case 240 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
+                case 241 /* ClassDeclaration */:
                     return declareClassMember(node, symbolFlags, symbolExcludes);
-                case 243 /* EnumDeclaration */:
+                case 244 /* EnumDeclaration */:
                     return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);
-                case 168 /* TypeLiteral */:
-                case 297 /* JSDocTypeLiteral */:
-                case 188 /* ObjectLiteralExpression */:
-                case 241 /* InterfaceDeclaration */:
-                case 268 /* JsxAttributes */:
+                case 169 /* TypeLiteral */:
+                case 298 /* JSDocTypeLiteral */:
+                case 189 /* ObjectLiteralExpression */:
+                case 242 /* InterfaceDeclaration */:
+                case 269 /* JsxAttributes */:
                     // Interface/Object-types always have their children added to the 'members' of
                     // their container. They are only accessible through an instance of their
                     // container, and are never in scope otherwise (even inside the body of the
                     // object / type / interface declaring them). An exception is type parameters,
                     // which are in scope without qualification (similar to 'locals').
                     return declareSymbol(container.symbol.members, container.symbol, node, symbolFlags, symbolExcludes);
-                case 165 /* FunctionType */:
-                case 166 /* ConstructorType */:
-                case 160 /* CallSignature */:
-                case 161 /* ConstructSignature */:
-                case 298 /* JSDocSignature */:
-                case 162 /* IndexSignature */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
-                case 157 /* Constructor */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
-                case 294 /* JSDocFunctionType */:
-                case 309 /* JSDocTypedefTag */:
-                case 302 /* JSDocCallbackTag */:
-                case 242 /* TypeAliasDeclaration */:
-                case 181 /* MappedType */:
+                case 166 /* FunctionType */:
+                case 167 /* ConstructorType */:
+                case 161 /* CallSignature */:
+                case 162 /* ConstructSignature */:
+                case 299 /* JSDocSignature */:
+                case 163 /* IndexSignature */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
+                case 158 /* Constructor */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
+                case 295 /* JSDocFunctionType */:
+                case 311 /* JSDocTypedefTag */:
+                case 304 /* JSDocCallbackTag */:
+                case 243 /* TypeAliasDeclaration */:
+                case 182 /* MappedType */:
                     // All the children of these container types are never visible through another
                     // symbol (i.e. through another symbol's 'exports' or 'members').  Instead,
                     // they're only accessed 'lexically' (i.e. from code that exists underneath
@@ -28830,16 +29256,8 @@ var ts;
                 : declareSymbol(file.locals, /*parent*/ undefined, node, symbolFlags, symbolExcludes);
         }
         function hasExportDeclarations(node) {
-            var body = node.kind === 284 /* SourceFile */ ? node : node.body;
-            if (body && (body.kind === 284 /* SourceFile */ || body.kind === 245 /* ModuleBlock */)) {
-                for (var _i = 0, _a = body.statements; _i < _a.length; _i++) {
-                    var stat = _a[_i];
-                    if (stat.kind === 255 /* ExportDeclaration */ || stat.kind === 254 /* ExportAssignment */) {
-                        return true;
-                    }
-                }
-            }
-            return false;
+            var body = ts.isSourceFile(node) ? node : ts.tryCast(node.body, ts.isModuleBlock);
+            return !!body && body.statements.some(function (s) { return ts.isExportDeclaration(s) || ts.isExportAssignment(s); });
         }
         function setExportContextFlag(node) {
             // A declaration source file or ambient module declaration that contains no export declarations (but possibly regular
@@ -28918,7 +29336,7 @@ var ts;
                 var seen = ts.createUnderscoreEscapedMap();
                 for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
                     var prop = _a[_i];
-                    if (prop.kind === 277 /* SpreadAssignment */ || prop.name.kind !== 72 /* Identifier */) {
+                    if (prop.kind === 278 /* SpreadAssignment */ || prop.name.kind !== 73 /* Identifier */) {
                         continue;
                     }
                     var identifier = prop.name;
@@ -28930,7 +29348,7 @@ var ts;
                     //    c.IsAccessorDescriptor(previous) is true and IsDataDescriptor(propId.descriptor) is true.
                     //    d.IsAccessorDescriptor(previous) is true and IsAccessorDescriptor(propId.descriptor) is true
                     // and either both previous and propId.descriptor have[[Get]] fields or both previous and propId.descriptor have[[Set]] fields
-                    var currentKind = prop.kind === 275 /* PropertyAssignment */ || prop.kind === 276 /* ShorthandPropertyAssignment */ || prop.kind === 156 /* MethodDeclaration */
+                    var currentKind = prop.kind === 276 /* PropertyAssignment */ || prop.kind === 277 /* ShorthandPropertyAssignment */ || prop.kind === 157 /* MethodDeclaration */
                         ? 1 /* Property */
                         : 2 /* Accessor */;
                     var existingKind = seen.get(identifier.escapedText);
@@ -28962,10 +29380,10 @@ var ts;
         }
         function bindBlockScopedDeclaration(node, symbolFlags, symbolExcludes) {
             switch (blockScopeContainer.kind) {
-                case 244 /* ModuleDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     declareModuleMember(node, symbolFlags, symbolExcludes);
                     break;
-                case 284 /* SourceFile */:
+                case 285 /* SourceFile */:
                     if (ts.isExternalOrCommonJsModule(container)) {
                         declareModuleMember(node, symbolFlags, symbolExcludes);
                         break;
@@ -28996,7 +29414,7 @@ var ts;
                 currentFlow = { flags: 2 /* Start */ };
                 parent = typeAlias;
                 bind(typeAlias.typeExpression);
-                if (!typeAlias.fullName || typeAlias.fullName.kind === 72 /* Identifier */) {
+                if (!typeAlias.fullName || typeAlias.fullName.kind === 73 /* Identifier */) {
                     parent = typeAlias.parent;
                     bindBlockScopedDeclaration(typeAlias, 524288 /* TypeAlias */, 67897832 /* TypeAliasExcludes */);
                 }
@@ -29014,8 +29432,8 @@ var ts;
         // check for reserved words used as identifiers in strict mode code.
         function checkStrictModeIdentifier(node) {
             if (inStrictMode &&
-                node.originalKeywordKind >= 109 /* FirstFutureReservedWord */ &&
-                node.originalKeywordKind <= 117 /* LastFutureReservedWord */ &&
+                node.originalKeywordKind >= 110 /* FirstFutureReservedWord */ &&
+                node.originalKeywordKind <= 118 /* LastFutureReservedWord */ &&
                 !ts.isIdentifierName(node) &&
                 !(node.flags & 4194304 /* Ambient */)) {
                 // Report error only if there are no parse errors in file
@@ -29051,7 +29469,7 @@ var ts;
         }
         function checkStrictModeDeleteExpression(node) {
             // Grammar checking
-            if (inStrictMode && node.expression.kind === 72 /* Identifier */) {
+            if (inStrictMode && node.expression.kind === 73 /* Identifier */) {
                 // When a delete operator occurs within strict mode code, a SyntaxError is thrown if its
                 // UnaryExpression is a direct reference to a variable, function argument, or function name
                 var span = ts.getErrorSpanForNode(file, node.expression);
@@ -29062,7 +29480,7 @@ var ts;
             return ts.isIdentifier(node) && (node.escapedText === "eval" || node.escapedText === "arguments");
         }
         function checkStrictModeEvalOrArguments(contextNode, name) {
-            if (name && name.kind === 72 /* Identifier */) {
+            if (name && name.kind === 73 /* Identifier */) {
                 var identifier = name;
                 if (isEvalOrArgumentsIdentifier(identifier)) {
                     // We check first if the name is inside class declaration or class expression; if so give explicit message
@@ -29103,8 +29521,8 @@ var ts;
         function checkStrictModeFunctionDeclaration(node) {
             if (languageVersion < 2 /* ES2015 */) {
                 // Report error if function is not top level function declaration
-                if (blockScopeContainer.kind !== 284 /* SourceFile */ &&
-                    blockScopeContainer.kind !== 244 /* ModuleDeclaration */ &&
+                if (blockScopeContainer.kind !== 285 /* SourceFile */ &&
+                    blockScopeContainer.kind !== 245 /* ModuleDeclaration */ &&
                     !ts.isFunctionLike(blockScopeContainer)) {
                     // We check first if the name is inside class declaration or class expression; if so give explicit message
                     // otherwise report generic error message.
@@ -29199,7 +29617,7 @@ var ts;
             // the current 'container' node when it changes. This helps us know which symbol table
             // a local should go into for example. Since terminal nodes are known not to have
             // children, as an optimization we don't process those.
-            if (node.kind > 147 /* LastToken */) {
+            if (node.kind > 148 /* LastToken */) {
                 var saveParent = parent;
                 parent = node;
                 var containerFlags = getContainerFlags(node);
@@ -29261,7 +29679,7 @@ var ts;
         function bindWorker(node) {
             switch (node.kind) {
                 /* Strict mode checks */
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     // for typedef type names with namespaces, bind the new jsdoc type symbol here
                     // because it requires all containing namespaces to be in effect, namely the
                     // current "blockScopeContainer" needs to be set to its immediate namespace parent.
@@ -29274,13 +29692,13 @@ var ts;
                         break;
                     }
                 // falls through
-                case 100 /* ThisKeyword */:
-                    if (currentFlow && (ts.isExpression(node) || parent.kind === 276 /* ShorthandPropertyAssignment */)) {
+                case 101 /* ThisKeyword */:
+                    if (currentFlow && (ts.isExpression(node) || parent.kind === 277 /* ShorthandPropertyAssignment */)) {
                         node.flowNode = currentFlow;
                     }
                     return checkStrictModeIdentifier(node);
-                case 189 /* PropertyAccessExpression */:
-                case 190 /* ElementAccessExpression */:
+                case 190 /* PropertyAccessExpression */:
+                case 191 /* ElementAccessExpression */:
                     if (currentFlow && isNarrowableReference(node)) {
                         node.flowNode = currentFlow;
                     }
@@ -29294,7 +29712,7 @@ var ts;
                         declareSymbol(file.locals, /*parent*/ undefined, node.expression, 1 /* FunctionScopedVariable */ | 134217728 /* ModuleExports */, 67220414 /* FunctionScopedVariableExcludes */);
                     }
                     break;
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     var specialKind = ts.getAssignmentDeclarationKind(node);
                     switch (specialKind) {
                         case 1 /* ExportsProperty */:
@@ -29322,76 +29740,76 @@ var ts;
                             ts.Debug.fail("Unknown binary expression special property assignment kind");
                     }
                     return checkStrictModeBinaryExpression(node);
-                case 274 /* CatchClause */:
+                case 275 /* CatchClause */:
                     return checkStrictModeCatchClause(node);
-                case 198 /* DeleteExpression */:
+                case 199 /* DeleteExpression */:
                     return checkStrictModeDeleteExpression(node);
                 case 8 /* NumericLiteral */:
                     return checkStrictModeNumericLiteral(node);
-                case 203 /* PostfixUnaryExpression */:
+                case 204 /* PostfixUnaryExpression */:
                     return checkStrictModePostfixUnaryExpression(node);
-                case 202 /* PrefixUnaryExpression */:
+                case 203 /* PrefixUnaryExpression */:
                     return checkStrictModePrefixUnaryExpression(node);
-                case 231 /* WithStatement */:
+                case 232 /* WithStatement */:
                     return checkStrictModeWithStatement(node);
-                case 233 /* LabeledStatement */:
+                case 234 /* LabeledStatement */:
                     return checkStrictModeLabeledStatement(node);
-                case 178 /* ThisType */:
+                case 179 /* ThisType */:
                     seenThisKeyword = true;
                     return;
-                case 163 /* TypePredicate */:
+                case 164 /* TypePredicate */:
                     break; // Binding the children will handle everything
-                case 150 /* TypeParameter */:
+                case 151 /* TypeParameter */:
                     return bindTypeParameter(node);
-                case 151 /* Parameter */:
+                case 152 /* Parameter */:
                     return bindParameter(node);
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     return bindVariableDeclarationOrBindingElement(node);
-                case 186 /* BindingElement */:
+                case 187 /* BindingElement */:
                     node.flowNode = currentFlow;
                     return bindVariableDeclarationOrBindingElement(node);
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
                     return bindPropertyWorker(node);
-                case 275 /* PropertyAssignment */:
-                case 276 /* ShorthandPropertyAssignment */:
+                case 276 /* PropertyAssignment */:
+                case 277 /* ShorthandPropertyAssignment */:
                     return bindPropertyOrMethodOrAccessor(node, 4 /* Property */, 0 /* PropertyExcludes */);
-                case 278 /* EnumMember */:
+                case 279 /* EnumMember */:
                     return bindPropertyOrMethodOrAccessor(node, 8 /* EnumMember */, 68008959 /* EnumMemberExcludes */);
-                case 160 /* CallSignature */:
-                case 161 /* ConstructSignature */:
-                case 162 /* IndexSignature */:
+                case 161 /* CallSignature */:
+                case 162 /* ConstructSignature */:
+                case 163 /* IndexSignature */:
                     return declareSymbolAndAddToSymbolTable(node, 131072 /* Signature */, 0 /* None */);
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
                     // If this is an ObjectLiteralExpression method, then it sits in the same space
                     // as other properties in the object literal.  So we use SymbolFlags.PropertyExcludes
                     // so that it will conflict with any other object literal members with the same
                     // name.
                     return bindPropertyOrMethodOrAccessor(node, 8192 /* Method */ | (node.questionToken ? 16777216 /* Optional */ : 0 /* None */), ts.isObjectLiteralMethod(node) ? 0 /* PropertyExcludes */ : 67212223 /* MethodExcludes */);
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     return bindFunctionDeclaration(node);
-                case 157 /* Constructor */:
+                case 158 /* Constructor */:
                     return declareSymbolAndAddToSymbolTable(node, 16384 /* Constructor */, /*symbolExcludes:*/ 0 /* None */);
-                case 158 /* GetAccessor */:
+                case 159 /* GetAccessor */:
                     return bindPropertyOrMethodOrAccessor(node, 32768 /* GetAccessor */, 67154879 /* GetAccessorExcludes */);
-                case 159 /* SetAccessor */:
+                case 160 /* SetAccessor */:
                     return bindPropertyOrMethodOrAccessor(node, 65536 /* SetAccessor */, 67187647 /* SetAccessorExcludes */);
-                case 165 /* FunctionType */:
-                case 294 /* JSDocFunctionType */:
-                case 298 /* JSDocSignature */:
-                case 166 /* ConstructorType */:
+                case 166 /* FunctionType */:
+                case 295 /* JSDocFunctionType */:
+                case 299 /* JSDocSignature */:
+                case 167 /* ConstructorType */:
                     return bindFunctionOrConstructorType(node);
-                case 168 /* TypeLiteral */:
-                case 297 /* JSDocTypeLiteral */:
-                case 181 /* MappedType */:
+                case 169 /* TypeLiteral */:
+                case 298 /* JSDocTypeLiteral */:
+                case 182 /* MappedType */:
                     return bindAnonymousTypeWorker(node);
-                case 188 /* ObjectLiteralExpression */:
+                case 189 /* ObjectLiteralExpression */:
                     return bindObjectLiteralExpression(node);
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
                     return bindFunctionExpression(node);
-                case 191 /* CallExpression */:
+                case 192 /* CallExpression */:
                     var assignmentKind = ts.getAssignmentDeclarationKind(node);
                     switch (assignmentKind) {
                         case 7 /* ObjectDefinePropertyValue */:
@@ -29410,64 +29828,64 @@ var ts;
                     }
                     break;
                 // Members of classes, interfaces, and modules
-                case 209 /* ClassExpression */:
-                case 240 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
+                case 241 /* ClassDeclaration */:
                     // All classes are automatically in strict mode in ES6.
                     inStrictMode = true;
                     return bindClassLikeDeclaration(node);
-                case 241 /* InterfaceDeclaration */:
+                case 242 /* InterfaceDeclaration */:
                     return bindBlockScopedDeclaration(node, 64 /* Interface */, 67897736 /* InterfaceExcludes */);
-                case 242 /* TypeAliasDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
                     return bindBlockScopedDeclaration(node, 524288 /* TypeAlias */, 67897832 /* TypeAliasExcludes */);
-                case 243 /* EnumDeclaration */:
+                case 244 /* EnumDeclaration */:
                     return bindEnumDeclaration(node);
-                case 244 /* ModuleDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     return bindModuleDeclaration(node);
                 // Jsx-attributes
-                case 268 /* JsxAttributes */:
+                case 269 /* JsxAttributes */:
                     return bindJsxAttributes(node);
-                case 267 /* JsxAttribute */:
+                case 268 /* JsxAttribute */:
                     return bindJsxAttribute(node, 4 /* Property */, 0 /* PropertyExcludes */);
                 // Imports and exports
-                case 248 /* ImportEqualsDeclaration */:
-                case 251 /* NamespaceImport */:
-                case 253 /* ImportSpecifier */:
-                case 257 /* ExportSpecifier */:
+                case 249 /* ImportEqualsDeclaration */:
+                case 252 /* NamespaceImport */:
+                case 254 /* ImportSpecifier */:
+                case 258 /* ExportSpecifier */:
                     return declareSymbolAndAddToSymbolTable(node, 2097152 /* Alias */, 2097152 /* AliasExcludes */);
-                case 247 /* NamespaceExportDeclaration */:
+                case 248 /* NamespaceExportDeclaration */:
                     return bindNamespaceExportDeclaration(node);
-                case 250 /* ImportClause */:
+                case 251 /* ImportClause */:
                     return bindImportClause(node);
-                case 255 /* ExportDeclaration */:
+                case 256 /* ExportDeclaration */:
                     return bindExportDeclaration(node);
-                case 254 /* ExportAssignment */:
+                case 255 /* ExportAssignment */:
                     return bindExportAssignment(node);
-                case 284 /* SourceFile */:
+                case 285 /* SourceFile */:
                     updateStrictModeStatementList(node.statements);
                     return bindSourceFileIfExternalModule();
-                case 218 /* Block */:
+                case 219 /* Block */:
                     if (!ts.isFunctionLike(node.parent)) {
                         return;
                     }
                 // falls through
-                case 245 /* ModuleBlock */:
+                case 246 /* ModuleBlock */:
                     return updateStrictModeStatementList(node.statements);
-                case 304 /* JSDocParameterTag */:
-                    if (node.parent.kind === 298 /* JSDocSignature */) {
+                case 306 /* JSDocParameterTag */:
+                    if (node.parent.kind === 299 /* JSDocSignature */) {
                         return bindParameter(node);
                     }
-                    if (node.parent.kind !== 297 /* JSDocTypeLiteral */) {
+                    if (node.parent.kind !== 298 /* JSDocTypeLiteral */) {
                         break;
                     }
                 // falls through
-                case 310 /* JSDocPropertyTag */:
+                case 312 /* JSDocPropertyTag */:
                     var propTag = node;
-                    var flags = propTag.isBracketed || propTag.typeExpression && propTag.typeExpression.type.kind === 293 /* JSDocOptionalType */ ?
+                    var flags = propTag.isBracketed || propTag.typeExpression && propTag.typeExpression.type.kind === 294 /* JSDocOptionalType */ ?
                         4 /* Property */ | 16777216 /* Optional */ :
                         4 /* Property */;
                     return declareSymbolAndAddToSymbolTable(propTag, flags, 0 /* PropertyExcludes */);
-                case 309 /* JSDocTypedefTag */:
-                case 302 /* JSDocCallbackTag */:
+                case 311 /* JSDocTypedefTag */:
+                case 304 /* JSDocCallbackTag */:
                     return (delayedTypeAliases || (delayedTypeAliases = [])).push(node);
             }
         }
@@ -29611,11 +30029,11 @@ var ts;
             ts.Debug.assert(ts.isInJSFile(node));
             var thisContainer = ts.getThisContainer(node, /*includeArrowFunctions*/ false);
             switch (thisContainer.kind) {
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
                     var constructorSymbol = thisContainer.symbol;
                     // For `f.prototype.m = function() { this.x = 0; }`, `this.x = 0` should modify `f`'s members, not the function expression.
-                    if (ts.isBinaryExpression(thisContainer.parent) && thisContainer.parent.operatorToken.kind === 59 /* EqualsToken */) {
+                    if (ts.isBinaryExpression(thisContainer.parent) && thisContainer.parent.operatorToken.kind === 60 /* EqualsToken */) {
                         var l = thisContainer.parent.left;
                         if (ts.isPropertyAccessEntityNameExpression(l) && ts.isPrototypeAccess(l.expression)) {
                             constructorSymbol = lookupSymbolForPropertyAccess(l.expression.expression, thisParentContainer);
@@ -29628,18 +30046,18 @@ var ts;
                         declareSymbol(constructorSymbol.members, constructorSymbol, node, 4 /* Property */, 0 /* PropertyExcludes */ & ~4 /* Property */);
                     }
                     break;
-                case 157 /* Constructor */:
-                case 154 /* PropertyDeclaration */:
-                case 156 /* MethodDeclaration */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 158 /* Constructor */:
+                case 155 /* PropertyDeclaration */:
+                case 157 /* MethodDeclaration */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     // this.foo assignment in a JavaScript class
                     // Bind this property to the containing class
                     var containingClass = thisContainer.parent;
                     var symbolTable = ts.hasModifier(thisContainer, 32 /* Static */) ? containingClass.symbol.exports : containingClass.symbol.members;
                     declareSymbol(symbolTable, containingClass.symbol, node, 4 /* Property */, 0 /* None */, /*isReplaceableByMethod*/ true);
                     break;
-                case 284 /* SourceFile */:
+                case 285 /* SourceFile */:
                     // this.property = assignment in a source file -- declare symbol in exports for a module, in locals for a script
                     if (thisContainer.commonJsModuleIndicator) {
                         declareSymbol(thisContainer.symbol.exports, thisContainer.symbol, node, 4 /* Property */ | 1048576 /* ExportValue */, 0 /* None */);
@@ -29649,14 +30067,14 @@ var ts;
                     }
                     break;
                 default:
-                    ts.Debug.fail(ts.Debug.showSyntaxKind(thisContainer));
+                    ts.Debug.failBadSyntaxKind(thisContainer);
             }
         }
         function bindSpecialPropertyDeclaration(node) {
-            if (node.expression.kind === 100 /* ThisKeyword */) {
+            if (node.expression.kind === 101 /* ThisKeyword */) {
                 bindThisPropertyAssignment(node);
             }
-            else if (ts.isPropertyAccessEntityNameExpression(node) && node.parent.parent.kind === 284 /* SourceFile */) {
+            else if (ts.isPropertyAccessEntityNameExpression(node) && node.parent.parent.kind === 285 /* SourceFile */) {
                 if (ts.isPrototypeAccess(node.expression)) {
                     bindPrototypePropertyAssignment(node, node.parent);
                 }
@@ -29693,7 +30111,7 @@ var ts;
         }
         function bindObjectDefinePropertyAssignment(node) {
             var namespaceSymbol = lookupSymbolForPropertyAccess(node.arguments[0]);
-            var isToplevel = node.parent.parent.kind === 284 /* SourceFile */;
+            var isToplevel = node.parent.parent.kind === 285 /* SourceFile */;
             namespaceSymbol = bindPotentiallyMissingNamespaces(namespaceSymbol, node.arguments[0], isToplevel, /*isPrototypeProperty*/ false);
             bindPotentiallyNewExpandoMemberToNamespace(node, namespaceSymbol, /*isPrototypeProperty*/ false);
         }
@@ -29707,7 +30125,7 @@ var ts;
             // Fix up parent pointers since we're going to use these nodes before we bind into them
             node.left.parent = node;
             node.right.parent = node;
-            if (ts.isIdentifier(lhs.expression) && container === file && isNameOfExportsOrModuleExportsAliasDeclaration(file, lhs.expression)) {
+            if (ts.isIdentifier(lhs.expression) && container === file && isExportsOrModuleExportsOrAlias(file, lhs.expression)) {
                 // This can be an alias for the 'exports' or 'module.exports' names, e.g.
                 //    var util = module.exports;
                 //    util.property = function ...
@@ -29760,8 +30178,8 @@ var ts;
         function bindPropertyAssignment(name, propertyAccess, isPrototypeProperty) {
             var namespaceSymbol = lookupSymbolForPropertyAccess(name);
             var isToplevel = ts.isBinaryExpression(propertyAccess.parent)
-                ? getParentOfBinaryExpression(propertyAccess.parent).parent.kind === 284 /* SourceFile */
-                : propertyAccess.parent.parent.kind === 284 /* SourceFile */;
+                ? getParentOfBinaryExpression(propertyAccess.parent).parent.kind === 285 /* SourceFile */
+                : propertyAccess.parent.parent.kind === 285 /* SourceFile */;
             namespaceSymbol = bindPotentiallyMissingNamespaces(namespaceSymbol, propertyAccess.expression, isToplevel, isPrototypeProperty);
             bindPotentiallyNewExpandoMemberToNamespace(propertyAccess, namespaceSymbol, isPrototypeProperty);
         }
@@ -29820,9 +30238,7 @@ var ts;
             }
             else {
                 var s = forEachIdentifierInEntityName(e.expression, parent, action);
-                if (!s || !s.exports)
-                    return ts.Debug.fail();
-                return action(e.name, s.exports.get(e.name.escapedText), s);
+                return action(e.name, s && s.exports && s.exports.get(e.name.escapedText), s);
             }
         }
         function bindCallExpression(node) {
@@ -29833,7 +30249,7 @@ var ts;
             }
         }
         function bindClassLikeDeclaration(node) {
-            if (node.kind === 240 /* ClassDeclaration */) {
+            if (node.kind === 241 /* ClassDeclaration */) {
                 bindBlockScopedDeclaration(node, 32 /* Class */, 68008383 /* ClassExcludes */);
             }
             else {
@@ -29899,7 +30315,7 @@ var ts;
             }
         }
         function bindParameter(node) {
-            if (node.kind === 304 /* JSDocParameterTag */ && container.kind !== 298 /* JSDocSignature */) {
+            if (node.kind === 306 /* JSDocParameterTag */ && container.kind !== 299 /* JSDocSignature */) {
                 return;
             }
             if (inStrictMode && !(node.flags & 4194304 /* Ambient */)) {
@@ -29976,7 +30392,7 @@ var ts;
                     declareSymbolAndAddToSymbolTable(node, 262144 /* TypeParameter */, 67635688 /* TypeParameterExcludes */);
                 }
             }
-            else if (node.parent.kind === 176 /* InferType */) {
+            else if (node.parent.kind === 177 /* InferType */) {
                 var container_2 = getInferTypeContainer(node.parent);
                 if (container_2) {
                     if (!container_2.locals) {
@@ -30004,11 +30420,11 @@ var ts;
             if (currentFlow === unreachableFlow) {
                 var reportError = 
                 // report error on all statements except empty ones
-                (ts.isStatementButNotDeclaration(node) && node.kind !== 220 /* EmptyStatement */) ||
+                (ts.isStatementButNotDeclaration(node) && node.kind !== 221 /* EmptyStatement */) ||
                     // report error on class declarations
-                    node.kind === 240 /* ClassDeclaration */ ||
+                    node.kind === 241 /* ClassDeclaration */ ||
                     // report error on instantiated modules or const-enums only modules if preserveConstEnums is set
-                    (node.kind === 244 /* ModuleDeclaration */ && shouldReportErrorOnModuleDeclaration(node));
+                    (node.kind === 245 /* ModuleDeclaration */ && shouldReportErrorOnModuleDeclaration(node));
                 if (reportError) {
                     currentFlow = reportedUnreachableFlow;
                     if (!options.allowUnreachableCode) {
@@ -30052,32 +30468,41 @@ var ts;
     }
     function isPurelyTypeDeclaration(s) {
         switch (s.kind) {
-            case 241 /* InterfaceDeclaration */:
-            case 242 /* TypeAliasDeclaration */:
+            case 242 /* InterfaceDeclaration */:
+            case 243 /* TypeAliasDeclaration */:
                 return true;
-            case 244 /* ModuleDeclaration */:
+            case 245 /* ModuleDeclaration */:
                 return getModuleInstanceState(s) !== 1 /* Instantiated */;
-            case 243 /* EnumDeclaration */:
+            case 244 /* EnumDeclaration */:
                 return ts.hasModifier(s, 2048 /* Const */);
             default:
                 return false;
         }
     }
     function isExportsOrModuleExportsOrAlias(sourceFile, node) {
-        return ts.isExportsIdentifier(node) ||
-            ts.isModuleExportsPropertyAccessExpression(node) ||
-            ts.isIdentifier(node) && isNameOfExportsOrModuleExportsAliasDeclaration(sourceFile, node);
+        var i = 0;
+        var q = [node];
+        while (q.length && i < 100) {
+            i++;
+            node = q.shift();
+            if (ts.isExportsIdentifier(node) || ts.isModuleExportsPropertyAccessExpression(node)) {
+                return true;
+            }
+            else if (ts.isIdentifier(node)) {
+                var symbol = lookupSymbolForNameWorker(sourceFile, node.escapedText);
+                if (!!symbol && !!symbol.valueDeclaration && ts.isVariableDeclaration(symbol.valueDeclaration) && !!symbol.valueDeclaration.initializer) {
+                    var init = symbol.valueDeclaration.initializer;
+                    q.push(init);
+                    if (ts.isAssignmentExpression(init, /*excludeCompoundAssignment*/ true)) {
+                        q.push(init.left);
+                        q.push(init.right);
+                    }
+                }
+            }
+        }
+        return false;
     }
     ts.isExportsOrModuleExportsOrAlias = isExportsOrModuleExportsOrAlias;
-    function isNameOfExportsOrModuleExportsAliasDeclaration(sourceFile, node) {
-        var symbol = lookupSymbolForNameWorker(sourceFile, node.escapedText);
-        return !!symbol && !!symbol.valueDeclaration && ts.isVariableDeclaration(symbol.valueDeclaration) &&
-            !!symbol.valueDeclaration.initializer && isExportsOrModuleExportsOrAliasOrAssignment(sourceFile, symbol.valueDeclaration.initializer);
-    }
-    function isExportsOrModuleExportsOrAliasOrAssignment(sourceFile, node) {
-        return isExportsOrModuleExportsOrAlias(sourceFile, node) ||
-            (ts.isAssignmentExpression(node, /*excludeCompoundAssignment*/ true) && (isExportsOrModuleExportsOrAliasOrAssignment(sourceFile, node.left) || isExportsOrModuleExportsOrAliasOrAssignment(sourceFile, node.right)));
-    }
     function lookupSymbolForNameWorker(container, name) {
         var local = container.locals && container.locals.get(name);
         if (local) {
@@ -30097,58 +30522,58 @@ var ts;
     function computeTransformFlagsForNode(node, subtreeFlags) {
         var kind = node.kind;
         switch (kind) {
-            case 191 /* CallExpression */:
+            case 192 /* CallExpression */:
                 return computeCallExpression(node, subtreeFlags);
-            case 192 /* NewExpression */:
+            case 193 /* NewExpression */:
                 return computeNewExpression(node, subtreeFlags);
-            case 244 /* ModuleDeclaration */:
+            case 245 /* ModuleDeclaration */:
                 return computeModuleDeclaration(node, subtreeFlags);
-            case 195 /* ParenthesizedExpression */:
+            case 196 /* ParenthesizedExpression */:
                 return computeParenthesizedExpression(node, subtreeFlags);
-            case 204 /* BinaryExpression */:
+            case 205 /* BinaryExpression */:
                 return computeBinaryExpression(node, subtreeFlags);
-            case 221 /* ExpressionStatement */:
+            case 222 /* ExpressionStatement */:
                 return computeExpressionStatement(node, subtreeFlags);
-            case 151 /* Parameter */:
+            case 152 /* Parameter */:
                 return computeParameter(node, subtreeFlags);
-            case 197 /* ArrowFunction */:
+            case 198 /* ArrowFunction */:
                 return computeArrowFunction(node, subtreeFlags);
-            case 196 /* FunctionExpression */:
+            case 197 /* FunctionExpression */:
                 return computeFunctionExpression(node, subtreeFlags);
-            case 239 /* FunctionDeclaration */:
+            case 240 /* FunctionDeclaration */:
                 return computeFunctionDeclaration(node, subtreeFlags);
-            case 237 /* VariableDeclaration */:
+            case 238 /* VariableDeclaration */:
                 return computeVariableDeclaration(node, subtreeFlags);
-            case 238 /* VariableDeclarationList */:
+            case 239 /* VariableDeclarationList */:
                 return computeVariableDeclarationList(node, subtreeFlags);
-            case 219 /* VariableStatement */:
+            case 220 /* VariableStatement */:
                 return computeVariableStatement(node, subtreeFlags);
-            case 233 /* LabeledStatement */:
+            case 234 /* LabeledStatement */:
                 return computeLabeledStatement(node, subtreeFlags);
-            case 240 /* ClassDeclaration */:
+            case 241 /* ClassDeclaration */:
                 return computeClassDeclaration(node, subtreeFlags);
-            case 209 /* ClassExpression */:
+            case 210 /* ClassExpression */:
                 return computeClassExpression(node, subtreeFlags);
-            case 273 /* HeritageClause */:
+            case 274 /* HeritageClause */:
                 return computeHeritageClause(node, subtreeFlags);
-            case 274 /* CatchClause */:
+            case 275 /* CatchClause */:
                 return computeCatchClause(node, subtreeFlags);
-            case 211 /* ExpressionWithTypeArguments */:
+            case 212 /* ExpressionWithTypeArguments */:
                 return computeExpressionWithTypeArguments(node, subtreeFlags);
-            case 157 /* Constructor */:
+            case 158 /* Constructor */:
                 return computeConstructor(node, subtreeFlags);
-            case 154 /* PropertyDeclaration */:
+            case 155 /* PropertyDeclaration */:
                 return computePropertyDeclaration(node, subtreeFlags);
-            case 156 /* MethodDeclaration */:
+            case 157 /* MethodDeclaration */:
                 return computeMethod(node, subtreeFlags);
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
                 return computeAccessor(node, subtreeFlags);
-            case 248 /* ImportEqualsDeclaration */:
+            case 249 /* ImportEqualsDeclaration */:
                 return computeImportEquals(node, subtreeFlags);
-            case 189 /* PropertyAccessExpression */:
+            case 190 /* PropertyAccessExpression */:
                 return computePropertyAccess(node, subtreeFlags);
-            case 190 /* ElementAccessExpression */:
+            case 191 /* ElementAccessExpression */:
                 return computeElementAccess(node, subtreeFlags);
             default:
                 return computeOther(node, kind, subtreeFlags);
@@ -30170,7 +30595,7 @@ var ts;
                 transformFlags |= 2048 /* ContainsLexicalThis */;
             }
         }
-        if (expression.kind === 92 /* ImportKeyword */) {
+        if (expression.kind === 93 /* ImportKeyword */) {
             transformFlags |= 524288 /* ContainsDynamicImport */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
@@ -30193,17 +30618,17 @@ var ts;
         var transformFlags = subtreeFlags;
         var operatorTokenKind = node.operatorToken.kind;
         var leftKind = node.left.kind;
-        if (operatorTokenKind === 59 /* EqualsToken */ && leftKind === 188 /* ObjectLiteralExpression */) {
+        if (operatorTokenKind === 60 /* EqualsToken */ && leftKind === 189 /* ObjectLiteralExpression */) {
             // Destructuring object assignments with are ES2015 syntax
             // and possibly ES2018 if they contain rest
             transformFlags |= 16 /* AssertES2018 */ | 128 /* AssertES2015 */ | 512 /* AssertDestructuringAssignment */;
         }
-        else if (operatorTokenKind === 59 /* EqualsToken */ && leftKind === 187 /* ArrayLiteralExpression */) {
+        else if (operatorTokenKind === 60 /* EqualsToken */ && leftKind === 188 /* ArrayLiteralExpression */) {
             // Destructuring assignments are ES2015 syntax.
             transformFlags |= 128 /* AssertES2015 */ | 512 /* AssertDestructuringAssignment */;
         }
         else if (operatorTokenKind === 41 /* AsteriskAsteriskToken */
-            || operatorTokenKind === 63 /* AsteriskAsteriskEqualsToken */) {
+            || operatorTokenKind === 64 /* AsteriskAsteriskEqualsToken */) {
             // Exponentiation is ES2016 syntax.
             transformFlags |= 64 /* AssertES2016 */;
         }
@@ -30246,8 +30671,8 @@ var ts;
         // If the node is synthesized, it means the emitter put the parentheses there,
         // not the user. If we didn't want them, the emitter would not have put them
         // there.
-        if (expressionKind === 212 /* AsExpression */
-            || expressionKind === 194 /* TypeAssertionExpression */) {
+        if (expressionKind === 213 /* AsExpression */
+            || expressionKind === 195 /* TypeAssertionExpression */) {
             transformFlags |= 1 /* AssertTypeScript */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
@@ -30262,8 +30687,7 @@ var ts;
         else {
             // A ClassDeclaration is ES6 syntax.
             transformFlags = subtreeFlags | 128 /* AssertES2015 */;
-            // A class with a parameter property assignment, property initializer, computed property name, or decorator is
-            // TypeScript syntax.
+            // A class with a parameter property assignment or decorator is TypeScript syntax.
             // An exported declaration may be TypeScript syntax, but is handled by the visitor
             // for a namespace declaration.
             if ((subtreeFlags & 1024 /* ContainsTypeScriptClassSyntax */)
@@ -30277,8 +30701,7 @@ var ts;
     function computeClassExpression(node, subtreeFlags) {
         // A ClassExpression is ES6 syntax.
         var transformFlags = subtreeFlags | 128 /* AssertES2015 */;
-        // A class with a parameter property assignment, property initializer, or decorator is
-        // TypeScript syntax.
+        // A class with a parameter property assignment or decorator is TypeScript syntax.
         if (subtreeFlags & 1024 /* ContainsTypeScriptClassSyntax */
             || node.typeParameters) {
             transformFlags |= 1 /* AssertTypeScript */;
@@ -30289,11 +30712,11 @@ var ts;
     function computeHeritageClause(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
         switch (node.token) {
-            case 86 /* ExtendsKeyword */:
+            case 87 /* ExtendsKeyword */:
                 // An `extends` HeritageClause is ES6 syntax.
                 transformFlags |= 128 /* AssertES2015 */;
                 break;
-            case 109 /* ImplementsKeyword */:
+            case 110 /* ImplementsKeyword */:
                 // An `implements` HeritageClause is TypeScript syntax.
                 transformFlags |= 1 /* AssertTypeScript */;
                 break;
@@ -30350,7 +30773,6 @@ var ts;
             || ts.hasModifier(node, 2270 /* TypeScriptModifier */)
             || node.typeParameters
             || node.type
-            || (node.name && ts.isComputedPropertyName(node.name)) // While computed method names aren't typescript, the TS transform must visit them to emit property declarations correctly
             || !node.body) {
             transformFlags |= 1 /* AssertTypeScript */;
         }
@@ -30375,7 +30797,6 @@ var ts;
         if (node.decorators
             || ts.hasModifier(node, 2270 /* TypeScriptModifier */)
             || node.type
-            || (node.name && ts.isComputedPropertyName(node.name)) // While computed accessor names aren't typescript, the TS transform must visit them to emit property declarations correctly
             || !node.body) {
             transformFlags |= 1 /* AssertTypeScript */;
         }
@@ -30387,11 +30808,13 @@ var ts;
         return propagatePropertyNameFlags(node.name, transformFlags & ~537372672 /* MethodOrAccessorExcludes */);
     }
     function computePropertyDeclaration(node, subtreeFlags) {
-        // A PropertyDeclaration is TypeScript syntax.
-        var transformFlags = subtreeFlags | 1 /* AssertTypeScript */;
-        // If the PropertyDeclaration has an initializer or a computed name, we need to inform its ancestor
-        // so that it handle the transformation.
-        if (node.initializer || ts.isComputedPropertyName(node.name)) {
+        var transformFlags = subtreeFlags | 1048576 /* ContainsClassFields */;
+        // Decorators, TypeScript-specific modifiers, and type annotations are TypeScript syntax.
+        if (ts.some(node.decorators) || ts.hasModifier(node, 2270 /* TypeScriptModifier */) || node.type) {
+            transformFlags |= 1 /* AssertTypeScript */;
+        }
+        // Hoisted variables related to class properties should live within the TypeScript class wrapper.
+        if (ts.isComputedPropertyName(node.name) || (ts.hasStaticModifier(node) && node.initializer)) {
             transformFlags |= 1024 /* ContainsTypeScriptClassSyntax */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
@@ -30486,7 +30909,7 @@ var ts;
         var transformFlags = subtreeFlags;
         // If a PropertyAccessExpression starts with a super keyword, then it is
         // ES6 syntax, and requires a lexical `this` binding.
-        if (node.expression.kind === 98 /* SuperKeyword */) {
+        if (node.expression.kind === 99 /* SuperKeyword */) {
             // super inside of an async function requires hoisting the super access (ES2017).
             // same for super inside of an async generator, which is ES2018.
             transformFlags |= 32 /* ContainsES2017 */ | 16 /* ContainsES2018 */;
@@ -30498,7 +30921,7 @@ var ts;
         var transformFlags = subtreeFlags;
         // If an ElementAccessExpression starts with a super keyword, then it is
         // ES6 syntax, and requires a lexical `this` binding.
-        if (node.expression.kind === 98 /* SuperKeyword */) {
+        if (node.expression.kind === 99 /* SuperKeyword */) {
             // super inside of an async function requires hoisting the super access (ES2017).
             // same for super inside of an async generator, which is ES2018.
             transformFlags |= 32 /* ContainsES2017 */ | 16 /* ContainsES2018 */;
@@ -30586,43 +31009,43 @@ var ts;
         var transformFlags = subtreeFlags;
         var excludeFlags = 536870912 /* NodeExcludes */;
         switch (kind) {
-            case 121 /* AsyncKeyword */:
-            case 201 /* AwaitExpression */:
+            case 122 /* AsyncKeyword */:
+            case 202 /* AwaitExpression */:
                 // async/await is ES2017 syntax, but may be ES2018 syntax (for async generators)
                 transformFlags |= 16 /* AssertES2018 */ | 32 /* AssertES2017 */;
                 break;
-            case 194 /* TypeAssertionExpression */:
-            case 212 /* AsExpression */:
-            case 313 /* PartiallyEmittedExpression */:
+            case 195 /* TypeAssertionExpression */:
+            case 213 /* AsExpression */:
+            case 315 /* PartiallyEmittedExpression */:
                 // These nodes are TypeScript syntax.
                 transformFlags |= 1 /* AssertTypeScript */;
                 excludeFlags = 536870912 /* OuterExpressionExcludes */;
                 break;
-            case 115 /* PublicKeyword */:
-            case 113 /* PrivateKeyword */:
-            case 114 /* ProtectedKeyword */:
-            case 118 /* AbstractKeyword */:
-            case 125 /* DeclareKeyword */:
-            case 77 /* ConstKeyword */:
-            case 243 /* EnumDeclaration */:
-            case 278 /* EnumMember */:
-            case 213 /* NonNullExpression */:
-            case 133 /* ReadonlyKeyword */:
+            case 116 /* PublicKeyword */:
+            case 114 /* PrivateKeyword */:
+            case 115 /* ProtectedKeyword */:
+            case 119 /* AbstractKeyword */:
+            case 126 /* DeclareKeyword */:
+            case 78 /* ConstKeyword */:
+            case 244 /* EnumDeclaration */:
+            case 279 /* EnumMember */:
+            case 214 /* NonNullExpression */:
+            case 134 /* ReadonlyKeyword */:
                 // These nodes are TypeScript syntax.
                 transformFlags |= 1 /* AssertTypeScript */;
                 break;
-            case 260 /* JsxElement */:
-            case 261 /* JsxSelfClosingElement */:
-            case 262 /* JsxOpeningElement */:
+            case 261 /* JsxElement */:
+            case 262 /* JsxSelfClosingElement */:
+            case 263 /* JsxOpeningElement */:
             case 11 /* JsxText */:
-            case 263 /* JsxClosingElement */:
-            case 264 /* JsxFragment */:
-            case 265 /* JsxOpeningFragment */:
-            case 266 /* JsxClosingFragment */:
-            case 267 /* JsxAttribute */:
-            case 268 /* JsxAttributes */:
-            case 269 /* JsxSpreadAttribute */:
-            case 270 /* JsxExpression */:
+            case 264 /* JsxClosingElement */:
+            case 265 /* JsxFragment */:
+            case 266 /* JsxOpeningFragment */:
+            case 267 /* JsxClosingFragment */:
+            case 268 /* JsxAttribute */:
+            case 269 /* JsxAttributes */:
+            case 270 /* JsxSpreadAttribute */:
+            case 271 /* JsxExpression */:
                 // These nodes are Jsx syntax.
                 transformFlags |= 2 /* AssertJsx */;
                 break;
@@ -30630,11 +31053,11 @@ var ts;
             case 15 /* TemplateHead */:
             case 16 /* TemplateMiddle */:
             case 17 /* TemplateTail */:
-            case 206 /* TemplateExpression */:
-            case 193 /* TaggedTemplateExpression */:
-            case 276 /* ShorthandPropertyAssignment */:
-            case 116 /* StaticKeyword */:
-            case 214 /* MetaProperty */:
+            case 207 /* TemplateExpression */:
+            case 194 /* TaggedTemplateExpression */:
+            case 277 /* ShorthandPropertyAssignment */:
+            case 117 /* StaticKeyword */:
+            case 215 /* MetaProperty */:
                 // These nodes are ES6 syntax.
                 transformFlags |= 128 /* AssertES2015 */;
                 break;
@@ -30651,103 +31074,103 @@ var ts;
             case 9 /* BigIntLiteral */:
                 transformFlags |= 4 /* AssertESNext */;
                 break;
-            case 227 /* ForOfStatement */:
+            case 228 /* ForOfStatement */:
                 // This node is either ES2015 syntax or ES2017 syntax (if it is a for-await-of).
                 if (node.awaitModifier) {
                     transformFlags |= 16 /* AssertES2018 */;
                 }
                 transformFlags |= 128 /* AssertES2015 */;
                 break;
-            case 207 /* YieldExpression */:
+            case 208 /* YieldExpression */:
                 // This node is either ES2015 syntax (in a generator) or ES2017 syntax (in an async
                 // generator).
                 transformFlags |= 16 /* AssertES2018 */ | 128 /* AssertES2015 */ | 131072 /* ContainsYield */;
                 break;
-            case 120 /* AnyKeyword */:
-            case 135 /* NumberKeyword */:
-            case 146 /* BigIntKeyword */:
-            case 132 /* NeverKeyword */:
-            case 136 /* ObjectKeyword */:
-            case 138 /* StringKeyword */:
-            case 123 /* BooleanKeyword */:
-            case 139 /* SymbolKeyword */:
-            case 106 /* VoidKeyword */:
-            case 150 /* TypeParameter */:
-            case 153 /* PropertySignature */:
-            case 155 /* MethodSignature */:
-            case 160 /* CallSignature */:
-            case 161 /* ConstructSignature */:
-            case 162 /* IndexSignature */:
-            case 163 /* TypePredicate */:
-            case 164 /* TypeReference */:
-            case 165 /* FunctionType */:
-            case 166 /* ConstructorType */:
-            case 167 /* TypeQuery */:
-            case 168 /* TypeLiteral */:
-            case 169 /* ArrayType */:
-            case 170 /* TupleType */:
-            case 171 /* OptionalType */:
-            case 172 /* RestType */:
-            case 173 /* UnionType */:
-            case 174 /* IntersectionType */:
-            case 175 /* ConditionalType */:
-            case 176 /* InferType */:
-            case 177 /* ParenthesizedType */:
-            case 241 /* InterfaceDeclaration */:
-            case 242 /* TypeAliasDeclaration */:
-            case 178 /* ThisType */:
-            case 179 /* TypeOperator */:
-            case 180 /* IndexedAccessType */:
-            case 181 /* MappedType */:
-            case 182 /* LiteralType */:
-            case 247 /* NamespaceExportDeclaration */:
+            case 121 /* AnyKeyword */:
+            case 136 /* NumberKeyword */:
+            case 147 /* BigIntKeyword */:
+            case 133 /* NeverKeyword */:
+            case 137 /* ObjectKeyword */:
+            case 139 /* StringKeyword */:
+            case 124 /* BooleanKeyword */:
+            case 140 /* SymbolKeyword */:
+            case 107 /* VoidKeyword */:
+            case 151 /* TypeParameter */:
+            case 154 /* PropertySignature */:
+            case 156 /* MethodSignature */:
+            case 161 /* CallSignature */:
+            case 162 /* ConstructSignature */:
+            case 163 /* IndexSignature */:
+            case 164 /* TypePredicate */:
+            case 165 /* TypeReference */:
+            case 166 /* FunctionType */:
+            case 167 /* ConstructorType */:
+            case 168 /* TypeQuery */:
+            case 169 /* TypeLiteral */:
+            case 170 /* ArrayType */:
+            case 171 /* TupleType */:
+            case 172 /* OptionalType */:
+            case 173 /* RestType */:
+            case 174 /* UnionType */:
+            case 175 /* IntersectionType */:
+            case 176 /* ConditionalType */:
+            case 177 /* InferType */:
+            case 178 /* ParenthesizedType */:
+            case 242 /* InterfaceDeclaration */:
+            case 243 /* TypeAliasDeclaration */:
+            case 179 /* ThisType */:
+            case 180 /* TypeOperator */:
+            case 181 /* IndexedAccessType */:
+            case 182 /* MappedType */:
+            case 183 /* LiteralType */:
+            case 248 /* NamespaceExportDeclaration */:
                 // Types and signatures are TypeScript syntax, and exclude all other facts.
                 transformFlags = 1 /* AssertTypeScript */;
                 excludeFlags = -2 /* TypeExcludes */;
                 break;
-            case 149 /* ComputedPropertyName */:
+            case 150 /* ComputedPropertyName */:
                 // Even though computed property names are ES6, we don't treat them as such.
                 // This is so that they can flow through PropertyName transforms unaffected.
                 // Instead, we mark the container as ES6, so that it can properly handle the transform.
                 transformFlags |= 16384 /* ContainsComputedPropertyName */;
                 break;
-            case 208 /* SpreadElement */:
+            case 209 /* SpreadElement */:
                 transformFlags |= 128 /* AssertES2015 */ | 4096 /* ContainsRestOrSpread */;
                 break;
-            case 277 /* SpreadAssignment */:
+            case 278 /* SpreadAssignment */:
                 transformFlags |= 16 /* AssertES2018 */ | 8192 /* ContainsObjectRestOrSpread */;
                 break;
-            case 98 /* SuperKeyword */:
+            case 99 /* SuperKeyword */:
                 // This node is ES6 syntax.
                 transformFlags |= 128 /* AssertES2015 */;
                 excludeFlags = 536870912 /* OuterExpressionExcludes */; // must be set to persist `Super`
                 break;
-            case 100 /* ThisKeyword */:
+            case 101 /* ThisKeyword */:
                 // Mark this node and its ancestors as containing a lexical `this` keyword.
                 transformFlags |= 2048 /* ContainsLexicalThis */;
                 break;
-            case 184 /* ObjectBindingPattern */:
+            case 185 /* ObjectBindingPattern */:
                 transformFlags |= 128 /* AssertES2015 */ | 65536 /* ContainsBindingPattern */;
                 if (subtreeFlags & 4096 /* ContainsRestOrSpread */) {
                     transformFlags |= 16 /* AssertES2018 */ | 8192 /* ContainsObjectRestOrSpread */;
                 }
                 excludeFlags = 536875008 /* BindingPatternExcludes */;
                 break;
-            case 185 /* ArrayBindingPattern */:
+            case 186 /* ArrayBindingPattern */:
                 transformFlags |= 128 /* AssertES2015 */ | 65536 /* ContainsBindingPattern */;
                 excludeFlags = 536875008 /* BindingPatternExcludes */;
                 break;
-            case 186 /* BindingElement */:
+            case 187 /* BindingElement */:
                 transformFlags |= 128 /* AssertES2015 */;
                 if (node.dotDotDotToken) {
                     transformFlags |= 4096 /* ContainsRestOrSpread */;
                 }
                 break;
-            case 152 /* Decorator */:
+            case 153 /* Decorator */:
                 // This node is TypeScript syntax, and marks its container as also being TypeScript syntax.
                 transformFlags |= 1 /* AssertTypeScript */ | 1024 /* ContainsTypeScriptClassSyntax */;
                 break;
-            case 188 /* ObjectLiteralExpression */:
+            case 189 /* ObjectLiteralExpression */:
                 excludeFlags = 536896512 /* ObjectLiteralExcludes */;
                 if (subtreeFlags & 16384 /* ContainsComputedPropertyName */) {
                     // If an ObjectLiteralExpression contains a ComputedPropertyName, then it
@@ -30760,26 +31183,26 @@ var ts;
                     transformFlags |= 16 /* AssertES2018 */;
                 }
                 break;
-            case 187 /* ArrayLiteralExpression */:
+            case 188 /* ArrayLiteralExpression */:
                 excludeFlags = 536875008 /* ArrayLiteralOrCallOrNewExcludes */;
                 break;
-            case 223 /* DoStatement */:
-            case 224 /* WhileStatement */:
-            case 225 /* ForStatement */:
-            case 226 /* ForInStatement */:
+            case 224 /* DoStatement */:
+            case 225 /* WhileStatement */:
+            case 226 /* ForStatement */:
+            case 227 /* ForInStatement */:
                 // A loop containing a block scoped binding *may* need to be transformed from ES6.
                 if (subtreeFlags & 32768 /* ContainsBlockScopedBinding */) {
                     transformFlags |= 128 /* AssertES2015 */;
                 }
                 break;
-            case 284 /* SourceFile */:
+            case 285 /* SourceFile */:
                 break;
-            case 230 /* ReturnStatement */:
+            case 231 /* ReturnStatement */:
                 // Return statements may require an `await` in ES2018.
                 transformFlags |= 262144 /* ContainsHoistedDeclarationOrCompletion */ | 16 /* AssertES2018 */;
                 break;
-            case 228 /* ContinueStatement */:
-            case 229 /* BreakStatement */:
+            case 229 /* ContinueStatement */:
+            case 230 /* BreakStatement */:
                 transformFlags |= 262144 /* ContainsHoistedDeclarationOrCompletion */;
                 break;
         }
@@ -30797,67 +31220,67 @@ var ts;
      *       than calling this function.
      */
     function getTransformFlagsSubtreeExclusions(kind) {
-        if (kind >= 163 /* FirstTypeNode */ && kind <= 183 /* LastTypeNode */) {
+        if (kind >= 164 /* FirstTypeNode */ && kind <= 184 /* LastTypeNode */) {
             return -2 /* TypeExcludes */;
         }
         switch (kind) {
-            case 191 /* CallExpression */:
-            case 192 /* NewExpression */:
-            case 187 /* ArrayLiteralExpression */:
+            case 192 /* CallExpression */:
+            case 193 /* NewExpression */:
+            case 188 /* ArrayLiteralExpression */:
                 return 536875008 /* ArrayLiteralOrCallOrNewExcludes */;
-            case 244 /* ModuleDeclaration */:
+            case 245 /* ModuleDeclaration */:
                 return 537168896 /* ModuleExcludes */;
-            case 151 /* Parameter */:
+            case 152 /* Parameter */:
                 return 536870912 /* ParameterExcludes */;
-            case 197 /* ArrowFunction */:
+            case 198 /* ArrowFunction */:
                 return 537371648 /* ArrowFunctionExcludes */;
-            case 196 /* FunctionExpression */:
-            case 239 /* FunctionDeclaration */:
+            case 197 /* FunctionExpression */:
+            case 240 /* FunctionDeclaration */:
                 return 537373696 /* FunctionExcludes */;
-            case 238 /* VariableDeclarationList */:
+            case 239 /* VariableDeclarationList */:
                 return 536944640 /* VariableDeclarationListExcludes */;
-            case 240 /* ClassDeclaration */:
-            case 209 /* ClassExpression */:
+            case 241 /* ClassDeclaration */:
+            case 210 /* ClassExpression */:
                 return 536888320 /* ClassExcludes */;
-            case 157 /* Constructor */:
+            case 158 /* Constructor */:
                 return 537372672 /* ConstructorExcludes */;
-            case 156 /* MethodDeclaration */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
+            case 157 /* MethodDeclaration */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
                 return 537372672 /* MethodOrAccessorExcludes */;
-            case 120 /* AnyKeyword */:
-            case 135 /* NumberKeyword */:
-            case 146 /* BigIntKeyword */:
-            case 132 /* NeverKeyword */:
-            case 138 /* StringKeyword */:
-            case 136 /* ObjectKeyword */:
-            case 123 /* BooleanKeyword */:
-            case 139 /* SymbolKeyword */:
-            case 106 /* VoidKeyword */:
-            case 150 /* TypeParameter */:
-            case 153 /* PropertySignature */:
-            case 155 /* MethodSignature */:
-            case 160 /* CallSignature */:
-            case 161 /* ConstructSignature */:
-            case 162 /* IndexSignature */:
-            case 241 /* InterfaceDeclaration */:
-            case 242 /* TypeAliasDeclaration */:
+            case 121 /* AnyKeyword */:
+            case 136 /* NumberKeyword */:
+            case 147 /* BigIntKeyword */:
+            case 133 /* NeverKeyword */:
+            case 139 /* StringKeyword */:
+            case 137 /* ObjectKeyword */:
+            case 124 /* BooleanKeyword */:
+            case 140 /* SymbolKeyword */:
+            case 107 /* VoidKeyword */:
+            case 151 /* TypeParameter */:
+            case 154 /* PropertySignature */:
+            case 156 /* MethodSignature */:
+            case 161 /* CallSignature */:
+            case 162 /* ConstructSignature */:
+            case 163 /* IndexSignature */:
+            case 242 /* InterfaceDeclaration */:
+            case 243 /* TypeAliasDeclaration */:
                 return -2 /* TypeExcludes */;
-            case 188 /* ObjectLiteralExpression */:
+            case 189 /* ObjectLiteralExpression */:
                 return 536896512 /* ObjectLiteralExcludes */;
-            case 274 /* CatchClause */:
+            case 275 /* CatchClause */:
                 return 536879104 /* CatchClauseExcludes */;
-            case 184 /* ObjectBindingPattern */:
-            case 185 /* ArrayBindingPattern */:
+            case 185 /* ObjectBindingPattern */:
+            case 186 /* ArrayBindingPattern */:
                 return 536875008 /* BindingPatternExcludes */;
-            case 194 /* TypeAssertionExpression */:
-            case 212 /* AsExpression */:
-            case 313 /* PartiallyEmittedExpression */:
-            case 195 /* ParenthesizedExpression */:
-            case 98 /* SuperKeyword */:
+            case 195 /* TypeAssertionExpression */:
+            case 213 /* AsExpression */:
+            case 315 /* PartiallyEmittedExpression */:
+            case 196 /* ParenthesizedExpression */:
+            case 99 /* SuperKeyword */:
                 return 536870912 /* OuterExpressionExcludes */;
-            case 189 /* PropertyAccessExpression */:
-            case 190 /* ElementAccessExpression */:
+            case 190 /* PropertyAccessExpression */:
+            case 191 /* ElementAccessExpression */:
                 return 536870912 /* PropertyAccessExcludes */;
             default:
                 return 536870912 /* NodeExcludes */;
@@ -31032,7 +31455,7 @@ var ts;
                     //  (their type resolved directly to the member deeply referenced)
                     // So to get the intervening symbols, we need to check if there's a type
                     // query node on any of the symbol's declarations and get symbols there
-                    if (d.type && d.type.kind === 167 /* TypeQuery */) {
+                    if (d.type && d.type.kind === 168 /* TypeQuery */) {
                         var query = d.type;
                         var entity = getResolvedSymbol(getFirstIdentifier(query.exprName));
                         visitSymbol(entity);
@@ -31052,6 +31475,37 @@ var ts;
     var nextNodeId = 1;
     var nextMergeId = 1;
     var nextFlowId = 1;
+    var IterationUse;
+    (function (IterationUse) {
+        IterationUse[IterationUse["AllowsSyncIterablesFlag"] = 1] = "AllowsSyncIterablesFlag";
+        IterationUse[IterationUse["AllowsAsyncIterablesFlag"] = 2] = "AllowsAsyncIterablesFlag";
+        IterationUse[IterationUse["AllowsStringInputFlag"] = 4] = "AllowsStringInputFlag";
+        IterationUse[IterationUse["ForOfFlag"] = 8] = "ForOfFlag";
+        IterationUse[IterationUse["YieldStarFlag"] = 16] = "YieldStarFlag";
+        IterationUse[IterationUse["SpreadFlag"] = 32] = "SpreadFlag";
+        IterationUse[IterationUse["DestructuringFlag"] = 64] = "DestructuringFlag";
+        // Spread, Destructuring, Array element assignment
+        IterationUse[IterationUse["Element"] = 1] = "Element";
+        IterationUse[IterationUse["Spread"] = 33] = "Spread";
+        IterationUse[IterationUse["Destructuring"] = 65] = "Destructuring";
+        IterationUse[IterationUse["ForOf"] = 13] = "ForOf";
+        IterationUse[IterationUse["ForAwaitOf"] = 15] = "ForAwaitOf";
+        IterationUse[IterationUse["YieldStar"] = 17] = "YieldStar";
+        IterationUse[IterationUse["AsyncYieldStar"] = 19] = "AsyncYieldStar";
+        IterationUse[IterationUse["GeneratorReturnType"] = 1] = "GeneratorReturnType";
+        IterationUse[IterationUse["AsyncGeneratorReturnType"] = 2] = "AsyncGeneratorReturnType";
+    })(IterationUse || (IterationUse = {}));
+    var IterationTypeKind;
+    (function (IterationTypeKind) {
+        IterationTypeKind[IterationTypeKind["Yield"] = 0] = "Yield";
+        IterationTypeKind[IterationTypeKind["Return"] = 1] = "Return";
+        IterationTypeKind[IterationTypeKind["Next"] = 2] = "Next";
+    })(IterationTypeKind || (IterationTypeKind = {}));
+    var WideningKind;
+    (function (WideningKind) {
+        WideningKind[WideningKind["Normal"] = 0] = "Normal";
+        WideningKind[WideningKind["GeneratorYield"] = 1] = "GeneratorYield";
+    })(WideningKind || (WideningKind = {}));
     function getNodeId(node) {
         if (!node.id) {
             node.id = nextNodeId;
@@ -31107,6 +31561,7 @@ var ts;
         var typeCount = 0;
         var symbolCount = 0;
         var enumCount = 0;
+        var instantiationCount = 0;
         var instantiationDepth = 0;
         var constraintDepth = 0;
         var currentNode;
@@ -31131,8 +31586,6 @@ var ts;
         undefinedSymbol.declarations = [];
         var globalThisSymbol = createSymbol(1536 /* Module */, "globalThis", 8 /* Readonly */);
         globalThisSymbol.exports = globals;
-        globalThisSymbol.valueDeclaration = ts.createNode(72 /* Identifier */);
-        globalThisSymbol.valueDeclaration.escapedText = "globalThis";
         globals.set(globalThisSymbol.escapedName, globalThisSymbol);
         var argumentsSymbol = createSymbol(4 /* Property */, "arguments");
         var requireSymbol = createSymbol(4 /* Property */, "require");
@@ -31148,6 +31601,11 @@ var ts;
             getIdentifierCount: function () { return ts.sum(host.getSourceFiles(), "identifierCount"); },
             getSymbolCount: function () { return ts.sum(host.getSourceFiles(), "symbolCount") + symbolCount; },
             getTypeCount: function () { return typeCount; },
+            getRelationCacheSizes: function () { return ({
+                assignable: assignableRelation.size,
+                identity: identityRelation.size,
+                subtype: subtypeRelation.size,
+            }); },
             isUndefinedSymbol: function (symbol) { return symbol === undefinedSymbol; },
             isArgumentsSymbol: function (symbol) { return symbol === argumentsSymbol; },
             isUnknownSymbol: function (symbol) { return symbol === unknownSymbol; },
@@ -31214,6 +31672,10 @@ var ts;
                 node = ts.getParseTreeNode(node);
                 return node ? getTypeOfNode(node) : errorType;
             },
+            getTypeOfAssignmentPattern: function (nodeIn) {
+                var node = ts.getParseTreeNode(nodeIn, ts.isAssignmentPattern);
+                return node && getTypeOfAssignmentPattern(node) || errorType;
+            },
             getPropertySymbolOfDestructuringAssignment: function (locationIn) {
                 var location = ts.getParseTreeNode(locationIn, ts.isIdentifier);
                 return location ? getPropertySymbolOfDestructuringAssignment(location) : undefined;
@@ -31262,12 +31724,14 @@ var ts;
             },
             isContextSensitive: isContextSensitive,
             getFullyQualifiedName: getFullyQualifiedName,
-            getResolvedSignature: function (node, candidatesOutArray, agumentCount) {
-                return getResolvedSignatureWorker(node, candidatesOutArray, agumentCount, 0 /* Normal */);
+            getResolvedSignature: function (node, candidatesOutArray, argumentCount) {
+                return getResolvedSignatureWorker(node, candidatesOutArray, argumentCount, 0 /* Normal */);
             },
-            getResolvedSignatureForSignatureHelp: function (node, candidatesOutArray, agumentCount) {
-                return getResolvedSignatureWorker(node, candidatesOutArray, agumentCount, 16 /* IsForSignatureHelp */);
+            getResolvedSignatureForSignatureHelp: function (node, candidatesOutArray, argumentCount) {
+                return getResolvedSignatureWorker(node, candidatesOutArray, argumentCount, 16 /* IsForSignatureHelp */);
             },
+            getExpandedParameters: getExpandedParameters,
+            hasEffectiveRestParameter: hasEffectiveRestParameter,
             getConstantValue: function (nodeIn) {
                 var node = ts.getParseTreeNode(nodeIn, canHaveConstantValue);
                 return node ? getConstantValue(node) : undefined;
@@ -31329,6 +31793,8 @@ var ts;
             getNeverType: function () { return neverType; },
             isSymbolAccessible: isSymbolAccessible,
             getObjectFlags: ts.getObjectFlags,
+            isArrayType: isArrayType,
+            isTupleType: isTupleType,
             isArrayLikeType: isArrayLikeType,
             isTypeInvalidDueToUnionDiscriminant: isTypeInvalidDueToUnionDiscriminant,
             getAllPossiblePropertiesOfTypes: getAllPossiblePropertiesOfTypes,
@@ -31405,7 +31871,7 @@ var ts;
         var intersectionTypes = ts.createMap();
         var literalTypes = ts.createMap();
         var indexedAccessTypes = ts.createMap();
-        var conditionalTypes = ts.createMap();
+        var substitutionTypes = ts.createMap();
         var evolvingArrayTypes = [];
         var undefinedProperties = ts.createMap();
         var unknownSymbol = createSymbol(4 /* Property */, "unknown");
@@ -31415,10 +31881,10 @@ var ts;
         var wildcardType = createIntrinsicType(1 /* Any */, "any");
         var errorType = createIntrinsicType(1 /* Any */, "error");
         var unknownType = createIntrinsicType(2 /* Unknown */, "unknown");
-        var undefinedType = createNullableType(32768 /* Undefined */, "undefined", 0);
-        var undefinedWideningType = strictNullChecks ? undefinedType : createNullableType(32768 /* Undefined */, "undefined", 131072 /* ContainsWideningType */);
-        var nullType = createNullableType(65536 /* Null */, "null", 0);
-        var nullWideningType = strictNullChecks ? nullType : createNullableType(65536 /* Null */, "null", 131072 /* ContainsWideningType */);
+        var undefinedType = createIntrinsicType(32768 /* Undefined */, "undefined");
+        var undefinedWideningType = strictNullChecks ? undefinedType : createIntrinsicType(32768 /* Undefined */, "undefined", 262144 /* ContainsWideningType */);
+        var nullType = createIntrinsicType(65536 /* Null */, "null");
+        var nullWideningType = strictNullChecks ? nullType : createIntrinsicType(65536 /* Null */, "null", 262144 /* ContainsWideningType */);
         var stringType = createIntrinsicType(4 /* String */, "string");
         var numberType = createIntrinsicType(8 /* Number */, "number");
         var bigintType = createIntrinsicType(64 /* BigInt */, "bigint");
@@ -31444,6 +31910,7 @@ var ts;
         var voidType = createIntrinsicType(16384 /* Void */, "void");
         var neverType = createIntrinsicType(131072 /* Never */, "never");
         var silentNeverType = createIntrinsicType(131072 /* Never */, "never");
+        var nonInferrableType = createIntrinsicType(131072 /* Never */, "never", 1048576 /* NonInferrableType */);
         var implicitNeverType = createIntrinsicType(131072 /* Never */, "never");
         var nonPrimitiveType = createIntrinsicType(67108864 /* NonPrimitive */, "object");
         var stringNumberSymbolType = getUnionType([stringType, numberType, esSymbolType]);
@@ -31460,7 +31927,7 @@ var ts;
         var anyFunctionType = createAnonymousType(undefined, emptySymbols, ts.emptyArray, ts.emptyArray, undefined, undefined);
         // The anyFunctionType contains the anyFunctionType by definition. The flag is further propagated
         // in getPropagatingFlagsOfTypes, and it is checked in inferFromTypes.
-        anyFunctionType.objectFlags |= 524288 /* ContainsAnyFunctionType */;
+        anyFunctionType.objectFlags |= 1048576 /* NonInferrableType */;
         var noConstraintType = createAnonymousType(undefined, emptySymbols, ts.emptyArray, ts.emptyArray, undefined, undefined);
         var circularConstraintType = createAnonymousType(undefined, emptySymbols, ts.emptyArray, ts.emptyArray, undefined, undefined);
         var resolvingDefaultType = createAnonymousType(undefined, emptySymbols, ts.emptyArray, ts.emptyArray, undefined, undefined);
@@ -31474,6 +31941,41 @@ var ts;
         var resolvingSignature = createSignature(undefined, undefined, undefined, ts.emptyArray, anyType, /*resolvedTypePredicate*/ undefined, 0, /*hasRestParameter*/ false, /*hasLiteralTypes*/ false);
         var silentNeverSignature = createSignature(undefined, undefined, undefined, ts.emptyArray, silentNeverType, /*resolvedTypePredicate*/ undefined, 0, /*hasRestParameter*/ false, /*hasLiteralTypes*/ false);
         var enumNumberIndexInfo = createIndexInfo(stringType, /*isReadonly*/ true);
+        var iterationTypesCache = ts.createMap(); // cache for common IterationTypes instances
+        var noIterationTypes = {
+            get yieldType() { throw new Error("Not supported"); },
+            get returnType() { throw new Error("Not supported"); },
+            get nextType() { throw new Error("Not supported"); },
+        };
+        var anyIterationTypes = createIterationTypes(anyType, anyType, anyType);
+        var anyIterationTypesExceptNext = createIterationTypes(anyType, anyType, unknownType);
+        var defaultIterationTypes = createIterationTypes(neverType, anyType, undefinedType); // default iteration types for `Iterator`.
+        var asyncIterationTypesResolver = {
+            iterableCacheKey: "iterationTypesOfAsyncIterable",
+            iteratorCacheKey: "iterationTypesOfAsyncIterator",
+            iteratorSymbolName: "asyncIterator",
+            getGlobalIteratorType: getGlobalAsyncIteratorType,
+            getGlobalIterableType: getGlobalAsyncIterableType,
+            getGlobalIterableIteratorType: getGlobalAsyncIterableIteratorType,
+            getGlobalGeneratorType: getGlobalAsyncGeneratorType,
+            resolveIterationType: getAwaitedType,
+            mustHaveANextMethodDiagnostic: ts.Diagnostics.An_async_iterator_must_have_a_next_method,
+            mustBeAMethodDiagnostic: ts.Diagnostics.The_0_property_of_an_async_iterator_must_be_a_method,
+            mustHaveAValueDiagnostic: ts.Diagnostics.The_type_returned_by_the_0_method_of_an_async_iterator_must_be_a_promise_for_a_type_with_a_value_property,
+        };
+        var syncIterationTypesResolver = {
+            iterableCacheKey: "iterationTypesOfIterable",
+            iteratorCacheKey: "iterationTypesOfIterator",
+            iteratorSymbolName: "iterator",
+            getGlobalIteratorType: getGlobalIteratorType,
+            getGlobalIterableType: getGlobalIterableType,
+            getGlobalIterableIteratorType: getGlobalIterableIteratorType,
+            getGlobalGeneratorType: getGlobalGeneratorType,
+            resolveIterationType: function (type, _errorNode) { return type; },
+            mustHaveANextMethodDiagnostic: ts.Diagnostics.An_iterator_must_have_a_next_method,
+            mustBeAMethodDiagnostic: ts.Diagnostics.The_0_property_of_an_iterator_must_be_a_method,
+            mustHaveAValueDiagnostic: ts.Diagnostics.The_type_returned_by_the_0_method_of_an_iterator_must_have_a_value_property,
+        };
         /** Key is "/path/to/a.ts|/path/to/b.ts". */
         var amalgamatedDuplicates;
         var reverseMappedCache = ts.createMap();
@@ -31484,6 +31986,7 @@ var ts;
          * This is only used if there is no exact match.
          */
         var patternAmbientModules;
+        var patternAmbientModuleAugmentations;
         var globalObjectType;
         var globalFunctionType;
         var globalCallableFunctionType;
@@ -31512,14 +32015,17 @@ var ts;
         var deferredGlobalIterableType;
         var deferredGlobalIteratorType;
         var deferredGlobalIterableIteratorType;
+        var deferredGlobalGeneratorType;
+        var deferredGlobalIteratorYieldResultType;
+        var deferredGlobalIteratorReturnResultType;
         var deferredGlobalAsyncIterableType;
         var deferredGlobalAsyncIteratorType;
         var deferredGlobalAsyncIterableIteratorType;
+        var deferredGlobalAsyncGeneratorType;
         var deferredGlobalTemplateStringsArrayType;
         var deferredGlobalImportMetaType;
         var deferredGlobalExtractSymbol;
-        var deferredGlobalExcludeSymbol;
-        var deferredGlobalPickSymbol;
+        var deferredGlobalOmitSymbol;
         var deferredGlobalBigIntType;
         var allPotentiallyUnusedIdentifiers = ts.createMap(); // key is file name
         var flowLoopStart = 0;
@@ -31538,6 +32044,8 @@ var ts;
         var symbolLinks = [];
         var nodeLinks = [];
         var flowLoopCaches = [];
+        var flowAssignmentKeys = [];
+        var flowAssignmentTypes = [];
         var flowLoopNodes = [];
         var flowLoopKeys = [];
         var flowLoopTypes = [];
@@ -31654,6 +32162,7 @@ var ts;
         var typeofType = createTypeofType();
         var _jsxNamespace;
         var _jsxFactoryEntity;
+        var outofbandVarianceMarkerHandler;
         var subtypeRelation = ts.createMap();
         var assignableRelation = ts.createMap();
         var comparableRelation = ts.createMap();
@@ -31678,6 +32187,19 @@ var ts;
             CheckMode[CheckMode["SkipGenericFunctions"] = 8] = "SkipGenericFunctions";
             CheckMode[CheckMode["IsForSignatureHelp"] = 16] = "IsForSignatureHelp";
         })(CheckMode || (CheckMode = {}));
+        var ContextFlags;
+        (function (ContextFlags) {
+            ContextFlags[ContextFlags["None"] = 0] = "None";
+            ContextFlags[ContextFlags["Signature"] = 1] = "Signature";
+        })(ContextFlags || (ContextFlags = {}));
+        var AccessFlags;
+        (function (AccessFlags) {
+            AccessFlags[AccessFlags["None"] = 0] = "None";
+            AccessFlags[AccessFlags["NoIndexSignatures"] = 1] = "NoIndexSignatures";
+            AccessFlags[AccessFlags["Writing"] = 2] = "Writing";
+            AccessFlags[AccessFlags["CacheSymbol"] = 4] = "CacheSymbol";
+            AccessFlags[AccessFlags["NoTupleBoundsCheck"] = 8] = "NoTupleBoundsCheck";
+        })(AccessFlags || (AccessFlags = {}));
         var CallbackCheck;
         (function (CallbackCheck) {
             CallbackCheck[CallbackCheck["None"] = 0] = "None";
@@ -31763,18 +32285,6 @@ var ts;
                 return diagnostic;
             }
         }
-        function addRelatedInfo(diagnostic) {
-            var relatedInformation = [];
-            for (var _i = 1; _i < arguments.length; _i++) {
-                relatedInformation[_i - 1] = arguments[_i];
-            }
-            var _a;
-            if (!diagnostic.relatedInformation) {
-                diagnostic.relatedInformation = [];
-            }
-            (_a = diagnostic.relatedInformation).push.apply(_a, relatedInformation);
-            return diagnostic;
-        }
         function error(location, message, arg0, arg1, arg2, arg3) {
             var diagnostic = location
                 ? ts.createDiagnosticForNode(location, message, arg0, arg1, arg2, arg3)
@@ -31793,6 +32303,14 @@ var ts;
         function errorOrSuggestion(isError, location, message, arg0, arg1, arg2, arg3) {
             addErrorOrSuggestion(isError, "message" in message ? ts.createDiagnosticForNode(location, message, arg0, arg1, arg2, arg3) : ts.createDiagnosticForNodeFromMessageChain(location, message));
         }
+        function errorAndMaybeSuggestAwait(location, maybeMissingAwait, message, arg0, arg1, arg2, arg3) {
+            var diagnostic = error(location, message, arg0, arg1, arg2, arg3);
+            if (maybeMissingAwait) {
+                var related = ts.createDiagnosticForNode(location, ts.Diagnostics.Did_you_forget_to_use_await);
+                ts.addRelatedInfo(diagnostic, related);
+            }
+            return diagnostic;
+        }
         function createSymbol(flags, name, checkFlags) {
             symbolCount++;
             var symbol = (new Symbol(flags | 33554432 /* Transient */, name));
@@ -31864,7 +32382,8 @@ var ts;
          * Note: if target is transient, then it is mutable, and mergeSymbol with both mutate and return it.
          * If target is not transient, mergeSymbol will produce a transient clone, mutate that and return it.
          */
-        function mergeSymbol(target, source) {
+        function mergeSymbol(target, source, unidirectional) {
+            if (unidirectional === void 0) { unidirectional = false; }
             if (!(target.flags & getExcludedSymbolFlags(source.flags)) ||
                 (source.flags | target.flags) & 67108864 /* Assignment */) {
                 ts.Debug.assert(source !== target);
@@ -31892,17 +32411,24 @@ var ts;
                 if (source.members) {
                     if (!target.members)
                         target.members = ts.createSymbolTable();
-                    mergeSymbolTable(target.members, source.members);
+                    mergeSymbolTable(target.members, source.members, unidirectional);
                 }
                 if (source.exports) {
                     if (!target.exports)
                         target.exports = ts.createSymbolTable();
-                    mergeSymbolTable(target.exports, source.exports);
+                    mergeSymbolTable(target.exports, source.exports, unidirectional);
+                }
+                if (!unidirectional) {
+                    recordMergedSymbol(target, source);
                 }
-                recordMergedSymbol(target, source);
             }
             else if (target.flags & 1024 /* NamespaceModule */) {
-                error(ts.getNameOfDeclaration(source.declarations[0]), ts.Diagnostics.Cannot_augment_module_0_with_value_exports_because_it_resolves_to_a_non_module_entity, symbolToString(target));
+                // Do not report an error when merging `var globalThis` with the built-in `globalThis`,
+                // as we will already report a "Declaration name conflicts..." error, and this error
+                // won't make much sense.
+                if (target !== globalThisSymbol) {
+                    error(ts.getNameOfDeclaration(source.declarations[0]), ts.Diagnostics.Cannot_augment_module_0_with_value_exports_because_it_resolves_to_a_non_module_entity, symbolToString(target));
+                }
             }
             else { // error
                 var isEitherEnum = !!(target.flags & 384 /* Enum */ || source.flags & 384 /* Enum */);
@@ -31954,7 +32480,7 @@ var ts;
                 err.relatedInformation = err.relatedInformation || [];
                 if (ts.length(err.relatedInformation) >= 5)
                     continue;
-                addRelatedInfo(err, !ts.length(err.relatedInformation) ? ts.createDiagnosticForNode(relatedNode, ts.Diagnostics._0_was_also_declared_here, symbolName) : ts.createDiagnosticForNode(relatedNode, ts.Diagnostics.and_here));
+                ts.addRelatedInfo(err, !ts.length(err.relatedInformation) ? ts.createDiagnosticForNode(relatedNode, ts.Diagnostics._0_was_also_declared_here, symbolName) : ts.createDiagnosticForNode(relatedNode, ts.Diagnostics.and_here));
             }
         }
         function combineSymbolTables(first, second) {
@@ -31967,10 +32493,11 @@ var ts;
             mergeSymbolTable(combined, second);
             return combined;
         }
-        function mergeSymbolTable(target, source) {
+        function mergeSymbolTable(target, source, unidirectional) {
+            if (unidirectional === void 0) { unidirectional = false; }
             source.forEach(function (sourceSymbol, id) {
                 var targetSymbol = target.get(id);
-                target.set(id, targetSymbol ? mergeSymbol(targetSymbol, sourceSymbol) : sourceSymbol);
+                target.set(id, targetSymbol ? mergeSymbol(targetSymbol, sourceSymbol, unidirectional) : sourceSymbol);
             });
         }
         function mergeModuleAugmentation(moduleName) {
@@ -31991,14 +32518,29 @@ var ts;
                 var moduleNotFoundError = !(moduleName.parent.parent.flags & 4194304 /* Ambient */)
                     ? ts.Diagnostics.Invalid_module_name_in_augmentation_module_0_cannot_be_found
                     : undefined;
-                var mainModule = resolveExternalModuleNameWorker(moduleName, moduleName, moduleNotFoundError, /*isForAugmentation*/ true);
-                if (!mainModule) {
+                var mainModule_1 = resolveExternalModuleNameWorker(moduleName, moduleName, moduleNotFoundError, /*isForAugmentation*/ true);
+                if (!mainModule_1) {
                     return;
                 }
                 // obtain item referenced by 'export='
-                mainModule = resolveExternalModuleSymbol(mainModule);
-                if (mainModule.flags & 1920 /* Namespace */) {
-                    mainModule = mergeSymbol(mainModule, moduleAugmentation.symbol);
+                mainModule_1 = resolveExternalModuleSymbol(mainModule_1);
+                if (mainModule_1.flags & 1920 /* Namespace */) {
+                    // If we’re merging an augmentation to a pattern ambient module, we want to
+                    // perform the merge unidirectionally from the augmentation ('a.foo') to
+                    // the pattern ('*.foo'), so that 'getMergedSymbol()' on a.foo gives you
+                    // all the exports both from the pattern and from the augmentation, but
+                    // 'getMergedSymbol()' on *.foo only gives you exports from *.foo.
+                    if (ts.some(patternAmbientModules, function (module) { return mainModule_1 === module.symbol; })) {
+                        var merged = mergeSymbol(moduleAugmentation.symbol, mainModule_1, /*unidirectional*/ true);
+                        if (!patternAmbientModuleAugmentations) {
+                            patternAmbientModuleAugmentations = ts.createMap();
+                        }
+                        // moduleName will be a StringLiteral since this is not `declare global`.
+                        patternAmbientModuleAugmentations.set(moduleName.text, merged);
+                    }
+                    else {
+                        mergeSymbol(mainModule_1, moduleAugmentation.symbol);
+                    }
                 }
                 else {
                     // moduleName will be a StringLiteral since this is not `declare global`.
@@ -32032,7 +32574,7 @@ var ts;
             return nodeLinks[nodeId] || (nodeLinks[nodeId] = { flags: 0 });
         }
         function isGlobalSourceFile(node) {
-            return node.kind === 284 /* SourceFile */ && !ts.isExternalOrCommonJsModule(node);
+            return node.kind === 285 /* SourceFile */ && !ts.isExternalOrCommonJsModule(node);
         }
         function getSymbol(symbols, name, meaning) {
             if (meaning) {
@@ -32090,17 +32632,17 @@ var ts;
             }
             if (declaration.pos <= usage.pos) {
                 // declaration is before usage
-                if (declaration.kind === 186 /* BindingElement */) {
+                if (declaration.kind === 187 /* BindingElement */) {
                     // still might be illegal if declaration and usage are both binding elements (eg var [a = b, b = b] = [1, 2])
-                    var errorBindingElement = ts.getAncestor(usage, 186 /* BindingElement */);
+                    var errorBindingElement = ts.getAncestor(usage, 187 /* BindingElement */);
                     if (errorBindingElement) {
                         return ts.findAncestor(errorBindingElement, ts.isBindingElement) !== ts.findAncestor(declaration, ts.isBindingElement) ||
                             declaration.pos < errorBindingElement.pos;
                     }
                     // or it might be illegal if usage happens before parent variable is declared (eg var [a] = a)
-                    return isBlockScopedNameDeclaredBeforeUse(ts.getAncestor(declaration, 237 /* VariableDeclaration */), usage);
+                    return isBlockScopedNameDeclaredBeforeUse(ts.getAncestor(declaration, 238 /* VariableDeclaration */), usage);
                 }
-                else if (declaration.kind === 237 /* VariableDeclaration */) {
+                else if (declaration.kind === 238 /* VariableDeclaration */) {
                     // still might be illegal if usage is in the initializer of the variable declaration (eg var a = a)
                     return !isImmediatelyUsedInInitializerOfBlockScopedVariable(declaration, usage);
                 }
@@ -32108,6 +32650,10 @@ var ts;
                     // still might be illegal if the usage is within a computed property name in the class (eg class A { static p = "a"; [A.p]() {} })
                     return !ts.findAncestor(usage, function (n) { return ts.isComputedPropertyName(n) && n.parent.parent === declaration; });
                 }
+                else if (ts.isPropertyDeclaration(declaration)) {
+                    // still might be illegal if a self-referencing property initializer (eg private x = this.x)
+                    return !isPropertyImmediatelyReferencedWithinDeclaration(declaration, usage);
+                }
                 return true;
             }
             // declaration is after usage, but it can still be legal if usage is deferred:
@@ -32119,12 +32665,12 @@ var ts;
             // or if usage is in a type context:
             // 1. inside a type query (typeof in type position)
             // 2. inside a jsdoc comment
-            if (usage.parent.kind === 257 /* ExportSpecifier */ || (usage.parent.kind === 254 /* ExportAssignment */ && usage.parent.isExportEquals)) {
+            if (usage.parent.kind === 258 /* ExportSpecifier */ || (usage.parent.kind === 255 /* ExportAssignment */ && usage.parent.isExportEquals)) {
                 // export specifiers do not use the variable, they only make it available for use
                 return true;
             }
             // When resolving symbols for exports, the `usage` location passed in can be the export site directly
-            if (usage.kind === 254 /* ExportAssignment */ && usage.isExportEquals) {
+            if (usage.kind === 255 /* ExportAssignment */ && usage.isExportEquals) {
                 return true;
             }
             var container = ts.getEnclosingBlockScopeContainer(declaration);
@@ -32132,9 +32678,9 @@ var ts;
             function isImmediatelyUsedInInitializerOfBlockScopedVariable(declaration, usage) {
                 var container = ts.getEnclosingBlockScopeContainer(declaration);
                 switch (declaration.parent.parent.kind) {
-                    case 219 /* VariableStatement */:
-                    case 225 /* ForStatement */:
-                    case 227 /* ForOfStatement */:
+                    case 220 /* VariableStatement */:
+                    case 226 /* ForStatement */:
+                    case 228 /* ForOfStatement */:
                         // variable statement/for/for-of statement case,
                         // use site should not be inside variable declaration (initializer of declaration or binding element)
                         if (isSameScopeDescendentOf(usage, declaration, container)) {
@@ -32155,16 +32701,16 @@ var ts;
                         return true;
                     }
                     var initializerOfProperty = current.parent &&
-                        current.parent.kind === 154 /* PropertyDeclaration */ &&
+                        current.parent.kind === 155 /* PropertyDeclaration */ &&
                         current.parent.initializer === current;
                     if (initializerOfProperty) {
                         if (ts.hasModifier(current.parent, 32 /* Static */)) {
-                            if (declaration.kind === 156 /* MethodDeclaration */) {
+                            if (declaration.kind === 157 /* MethodDeclaration */) {
                                 return true;
                             }
                         }
                         else {
-                            var isDeclarationInstanceProperty = declaration.kind === 154 /* PropertyDeclaration */ && !ts.hasModifier(declaration, 32 /* Static */);
+                            var isDeclarationInstanceProperty = declaration.kind === 155 /* PropertyDeclaration */ && !ts.hasModifier(declaration, 32 /* Static */);
                             if (!isDeclarationInstanceProperty || ts.getContainingClass(usage) !== ts.getContainingClass(declaration)) {
                                 return true;
                             }
@@ -32173,6 +32719,36 @@ var ts;
                     return false;
                 });
             }
+            function isPropertyImmediatelyReferencedWithinDeclaration(declaration, usage) {
+                // always legal if usage is after declaration
+                if (usage.end > declaration.end) {
+                    return false;
+                }
+                // still might be legal if usage is deferred (e.g. x: any = () => this.x)
+                // otherwise illegal if immediately referenced within the declaration (e.g. x: any = this.x)
+                var ancestorChangingReferenceScope = ts.findAncestor(usage, function (node) {
+                    if (node === declaration) {
+                        return "quit";
+                    }
+                    switch (node.kind) {
+                        case 198 /* ArrowFunction */:
+                        case 155 /* PropertyDeclaration */:
+                            return true;
+                        case 219 /* Block */:
+                            switch (node.parent.kind) {
+                                case 159 /* GetAccessor */:
+                                case 157 /* MethodDeclaration */:
+                                case 160 /* SetAccessor */:
+                                    return true;
+                                default:
+                                    return false;
+                            }
+                        default:
+                            return false;
+                    }
+                });
+                return ancestorChangingReferenceScope === undefined;
+            }
         }
         /**
          * Resolve a given name for a given meaning at a given location. An error is reported if the name was not found and
@@ -32191,6 +32767,8 @@ var ts;
             var lastLocation;
             var lastSelfReferenceLocation;
             var propertyWithInvalidInitializer;
+            var associatedDeclarationForContainingInitializer;
+            var withinDeferredContext = false;
             var errorLocation = location;
             var grandparent;
             var isInExternalModule = false;
@@ -32206,12 +32784,12 @@ var ts;
                             // - parameters are only in the scope of function body
                             // This restriction does not apply to JSDoc comment types because they are parented
                             // at a higher level than type parameters would normally be
-                            if (meaning & result.flags & 67897832 /* Type */ && lastLocation.kind !== 296 /* JSDocComment */) {
+                            if (meaning & result.flags & 67897832 /* Type */ && lastLocation.kind !== 297 /* JSDocComment */) {
                                 useResult = result.flags & 262144 /* TypeParameter */
                                     // type parameters are visible in parameter list, return type and type parameter list
                                     ? lastLocation === location.type ||
-                                        lastLocation.kind === 151 /* Parameter */ ||
-                                        lastLocation.kind === 150 /* TypeParameter */
+                                        lastLocation.kind === 152 /* Parameter */ ||
+                                        lastLocation.kind === 151 /* TypeParameter */
                                     // local types not visible outside the function body
                                     : false;
                             }
@@ -32228,13 +32806,13 @@ var ts;
                                     // however it is detected separately when checking initializers of parameters
                                     // to make sure that they reference no variables declared after them.
                                     useResult =
-                                        lastLocation.kind === 151 /* Parameter */ ||
+                                        lastLocation.kind === 152 /* Parameter */ ||
                                             (lastLocation === location.type &&
                                                 !!ts.findAncestor(result.valueDeclaration, ts.isParameter));
                                 }
                             }
                         }
-                        else if (location.kind === 175 /* ConditionalType */) {
+                        else if (location.kind === 176 /* ConditionalType */) {
                             // A type parameter declared using 'infer T' in a conditional type is visible only in
                             // the true branch of the conditional type.
                             useResult = lastLocation === location.trueType;
@@ -32247,15 +32825,16 @@ var ts;
                         }
                     }
                 }
+                withinDeferredContext = withinDeferredContext || getIsDeferredContext(location, lastLocation);
                 switch (location.kind) {
-                    case 284 /* SourceFile */:
+                    case 285 /* SourceFile */:
                         if (!ts.isExternalOrCommonJsModule(location))
                             break;
                         isInExternalModule = true;
                     // falls through
-                    case 244 /* ModuleDeclaration */:
+                    case 245 /* ModuleDeclaration */:
                         var moduleExports = getSymbolOfNode(location).exports;
-                        if (location.kind === 284 /* SourceFile */ || ts.isAmbientModule(location)) {
+                        if (location.kind === 285 /* SourceFile */ || ts.isAmbientModule(location)) {
                             // It's an external module. First see if the module has an export default and if the local
                             // name of that export default matches.
                             if (result = moduleExports.get("default" /* Default */)) {
@@ -32279,7 +32858,7 @@ var ts;
                             var moduleExport = moduleExports.get(name);
                             if (moduleExport &&
                                 moduleExport.flags === 2097152 /* Alias */ &&
-                                ts.getDeclarationOfKind(moduleExport, 257 /* ExportSpecifier */)) {
+                                ts.getDeclarationOfKind(moduleExport, 258 /* ExportSpecifier */)) {
                                 break;
                             }
                         }
@@ -32293,20 +32872,19 @@ var ts;
                             }
                         }
                         break;
-                    case 243 /* EnumDeclaration */:
+                    case 244 /* EnumDeclaration */:
                         if (result = lookup(getSymbolOfNode(location).exports, name, meaning & 8 /* EnumMember */)) {
                             break loop;
                         }
                         break;
-                    case 154 /* PropertyDeclaration */:
-                    case 153 /* PropertySignature */:
+                    case 155 /* PropertyDeclaration */:
                         // TypeScript 1.0 spec (April 2014): 8.4.1
                         // Initializer expressions for instance member variables are evaluated in the scope
                         // of the class constructor body but are not permitted to reference parameters or
                         // local variables of the constructor. This effectively means that entities from outer scopes
                         // by the same name as a constructor parameter or local variable are inaccessible
                         // in initializer expressions for instance member variables.
-                        if (ts.isClassLike(location.parent) && !ts.hasModifier(location, 32 /* Static */)) {
+                        if (!ts.hasModifier(location, 32 /* Static */)) {
                             var ctor = findConstructorDeclaration(location.parent);
                             if (ctor && ctor.locals) {
                                 if (lookup(ctor.locals, name, meaning & 67220415 /* Value */)) {
@@ -32316,9 +32894,9 @@ var ts;
                             }
                         }
                         break;
-                    case 240 /* ClassDeclaration */:
-                    case 209 /* ClassExpression */:
-                    case 241 /* InterfaceDeclaration */:
+                    case 241 /* ClassDeclaration */:
+                    case 210 /* ClassExpression */:
+                    case 242 /* InterfaceDeclaration */:
                         // The below is used to lookup type parameters within a class or interface, as they are added to the class/interface locals
                         // These can never be latebound, so the symbol's raw members are sufficient. `getMembersOfNode` cannot be used, as it would
                         // trigger resolving late-bound names, which we may already be in the process of doing while we're here!
@@ -32337,7 +32915,7 @@ var ts;
                             }
                             break loop;
                         }
-                        if (location.kind === 209 /* ClassExpression */ && meaning & 32 /* Class */) {
+                        if (location.kind === 210 /* ClassExpression */ && meaning & 32 /* Class */) {
                             var className = location.name;
                             if (className && name === className.escapedText) {
                                 result = location.symbol;
@@ -32345,9 +32923,9 @@ var ts;
                             }
                         }
                         break;
-                    case 211 /* ExpressionWithTypeArguments */:
+                    case 212 /* ExpressionWithTypeArguments */:
                         // The type parameters of a class are not in scope in the base class expression.
-                        if (lastLocation === location.expression && location.parent.token === 86 /* ExtendsKeyword */) {
+                        if (lastLocation === location.expression && location.parent.token === 87 /* ExtendsKeyword */) {
                             var container = location.parent.parent;
                             if (ts.isClassLike(container) && (result = lookup(getSymbolOfNode(container).members, name, meaning & 67897832 /* Type */))) {
                                 if (nameNotFoundMessage) {
@@ -32365,9 +32943,9 @@ var ts;
                     //       [foo<T>()]() { } // <-- Reference to T from class's own computed property
                     //   }
                     //
-                    case 149 /* ComputedPropertyName */:
+                    case 150 /* ComputedPropertyName */:
                         grandparent = location.parent.parent;
-                        if (ts.isClassLike(grandparent) || grandparent.kind === 241 /* InterfaceDeclaration */) {
+                        if (ts.isClassLike(grandparent) || grandparent.kind === 242 /* InterfaceDeclaration */) {
                             // A reference to this grandparent's type parameters would be an error
                             if (result = lookup(getSymbolOfNode(grandparent).members, name, meaning & 67897832 /* Type */)) {
                                 error(errorLocation, ts.Diagnostics.A_computed_property_name_cannot_reference_a_type_parameter_from_its_containing_type);
@@ -32375,24 +32953,24 @@ var ts;
                             }
                         }
                         break;
-                    case 197 /* ArrowFunction */:
+                    case 198 /* ArrowFunction */:
                         // when targeting ES6 or higher there is no 'arguments' in an arrow function
                         // for lower compile targets the resolved symbol is used to emit an error
                         if (compilerOptions.target >= 2 /* ES2015 */) {
                             break;
                         }
                     // falls through
-                    case 156 /* MethodDeclaration */:
-                    case 157 /* Constructor */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
-                    case 239 /* FunctionDeclaration */:
+                    case 157 /* MethodDeclaration */:
+                    case 158 /* Constructor */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
+                    case 240 /* FunctionDeclaration */:
                         if (meaning & 3 /* Variable */ && name === "arguments") {
                             result = argumentsSymbol;
                             break loop;
                         }
                         break;
-                    case 196 /* FunctionExpression */:
+                    case 197 /* FunctionExpression */:
                         if (meaning & 3 /* Variable */ && name === "arguments") {
                             result = argumentsSymbol;
                             break loop;
@@ -32405,7 +32983,7 @@ var ts;
                             }
                         }
                         break;
-                    case 152 /* Decorator */:
+                    case 153 /* Decorator */:
                         // Decorators are resolved at the class declaration. Resolving at the parameter
                         // or member would result in looking up locals in the method.
                         //
@@ -32414,7 +32992,7 @@ var ts;
                         //       method(@y x, y) {} // <-- decorator y should be resolved at the class declaration, not the parameter.
                         //   }
                         //
-                        if (location.parent && location.parent.kind === 151 /* Parameter */) {
+                        if (location.parent && location.parent.kind === 152 /* Parameter */) {
                             location = location.parent;
                         }
                         //
@@ -32423,15 +33001,34 @@ var ts;
                         //       @y method(x, y) {} // <-- decorator y should be resolved at the class declaration, not the method.
                         //   }
                         //
-                        if (location.parent && ts.isClassElement(location.parent)) {
+                        // class Decorators are resolved outside of the class to avoid referencing type parameters of that class.
+                        //
+                        //   type T = number;
+                        //   declare function y(x: T): any;
+                        //   @param(1 as T) // <-- T should resolve to the type alias outside of class C
+                        //   class C<T> {}
+                        if (location.parent && (ts.isClassElement(location.parent) || location.parent.kind === 241 /* ClassDeclaration */)) {
                             location = location.parent;
                         }
                         break;
-                    case 309 /* JSDocTypedefTag */:
-                    case 302 /* JSDocCallbackTag */:
+                    case 311 /* JSDocTypedefTag */:
+                    case 304 /* JSDocCallbackTag */:
                         // js type aliases do not resolve names from their host, so skip past it
                         location = ts.getJSDocHost(location);
                         break;
+                    case 152 /* Parameter */:
+                        if (lastLocation && lastLocation === location.initializer) {
+                            associatedDeclarationForContainingInitializer = location;
+                        }
+                        break;
+                    case 187 /* BindingElement */:
+                        if (lastLocation && lastLocation === location.initializer) {
+                            var root = ts.getRootDeclaration(location);
+                            if (root.kind === 152 /* Parameter */) {
+                                associatedDeclarationForContainingInitializer = location;
+                            }
+                        }
+                        break;
                 }
                 if (isSelfReferenceLocation(location)) {
                     lastSelfReferenceLocation = location;
@@ -32447,7 +33044,7 @@ var ts;
             }
             if (!result) {
                 if (lastLocation) {
-                    ts.Debug.assert(lastLocation.kind === 284 /* SourceFile */);
+                    ts.Debug.assert(lastLocation.kind === 285 /* SourceFile */);
                     if (lastLocation.commonJsModuleIndicator && name === "exports" && meaning & lastLocation.symbol.flags) {
                         return lastLocation.symbol;
                     }
@@ -32479,7 +33076,7 @@ var ts;
                                 var suggestionName = symbolToString(suggestion);
                                 var diagnostic = error(errorLocation, suggestedNameNotFoundMessage, diagnosticName(nameArg), suggestionName);
                                 if (suggestion.valueDeclaration) {
-                                    addRelatedInfo(diagnostic, ts.createDiagnosticForNode(suggestion.valueDeclaration, ts.Diagnostics._0_is_declared_here, suggestionName));
+                                    ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(suggestion.valueDeclaration, ts.Diagnostics._0_is_declared_here, suggestionName));
                                 }
                             }
                         }
@@ -32523,20 +33120,48 @@ var ts;
                 if (result && isInExternalModule && (meaning & 67220415 /* Value */) === 67220415 /* Value */ && !(originalLocation.flags & 2097152 /* JSDoc */)) {
                     var merged = getMergedSymbol(result);
                     if (ts.length(merged.declarations) && ts.every(merged.declarations, function (d) { return ts.isNamespaceExportDeclaration(d) || ts.isSourceFile(d) && !!d.symbol.globalExports; })) {
-                        error(errorLocation, ts.Diagnostics._0_refers_to_a_UMD_global_but_the_current_file_is_a_module_Consider_adding_an_import_instead, ts.unescapeLeadingUnderscores(name)); // TODO: GH#18217
+                        errorOrSuggestion(!compilerOptions.allowUmdGlobalAccess, errorLocation, ts.Diagnostics._0_refers_to_a_UMD_global_but_the_current_file_is_a_module_Consider_adding_an_import_instead, ts.unescapeLeadingUnderscores(name));
+                    }
+                }
+                // If we're in a parameter initializer, we can't reference the values of the parameter whose initializer we're within or parameters to the right
+                if (result && associatedDeclarationForContainingInitializer && !withinDeferredContext && (meaning & 67220415 /* Value */) === 67220415 /* Value */) {
+                    var candidate = getMergedSymbol(getLateBoundSymbol(result));
+                    var root = ts.getRootDeclaration(associatedDeclarationForContainingInitializer);
+                    // A parameter initializer or binding pattern initializer within a parameter cannot refer to itself
+                    if (candidate === getSymbolOfNode(associatedDeclarationForContainingInitializer)) {
+                        error(errorLocation, ts.Diagnostics.Parameter_0_cannot_be_referenced_in_its_initializer, ts.declarationNameToString(associatedDeclarationForContainingInitializer.name));
+                    }
+                    // And it cannot refer to any declarations which come after it
+                    else if (candidate.valueDeclaration && candidate.valueDeclaration.pos > associatedDeclarationForContainingInitializer.pos && root.parent.locals && lookup(root.parent.locals, candidate.escapedName, meaning) === candidate) {
+                        error(errorLocation, ts.Diagnostics.Initializer_of_parameter_0_cannot_reference_identifier_1_declared_after_it, ts.declarationNameToString(associatedDeclarationForContainingInitializer.name), ts.declarationNameToString(errorLocation));
                     }
                 }
             }
             return result;
         }
+        function getIsDeferredContext(location, lastLocation) {
+            if (location.kind !== 198 /* ArrowFunction */ && location.kind !== 197 /* FunctionExpression */) {
+                // initializers in instance property declaration of class like entities are executed in constructor and thus deferred
+                return ts.isTypeQueryNode(location) || ((ts.isFunctionLikeDeclaration(location) ||
+                    (location.kind === 155 /* PropertyDeclaration */ && !ts.hasModifier(location, 32 /* Static */))) && (!lastLocation || lastLocation !== location.name)); // A name is evaluated within the enclosing scope - so it shouldn't count as deferred
+            }
+            if (lastLocation && lastLocation === location.name) {
+                return false;
+            }
+            // generator functions and async functions are not inlined in control flow when immediately invoked
+            if (location.asteriskToken || ts.hasModifier(location, 256 /* Async */)) {
+                return true;
+            }
+            return !ts.getImmediatelyInvokedFunctionExpression(location);
+        }
         function isSelfReferenceLocation(node) {
             switch (node.kind) {
-                case 239 /* FunctionDeclaration */:
-                case 240 /* ClassDeclaration */:
-                case 241 /* InterfaceDeclaration */:
-                case 243 /* EnumDeclaration */:
-                case 242 /* TypeAliasDeclaration */:
-                case 244 /* ModuleDeclaration */: // For `namespace N { N; }`
+                case 240 /* FunctionDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 242 /* InterfaceDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
+                case 245 /* ModuleDeclaration */: // For `namespace N { N; }`
                     return true;
                 default:
                     return false;
@@ -32548,7 +33173,7 @@ var ts;
         function isTypeParameterSymbolDeclaredInContainer(symbol, container) {
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var decl = _a[_i];
-                if (decl.kind === 150 /* TypeParameter */) {
+                if (decl.kind === 151 /* TypeParameter */) {
                     var parent = ts.isJSDocTemplateTag(decl.parent) ? ts.getJSDocHost(decl.parent) : decl.parent;
                     if (parent === container) {
                         return !(ts.isJSDocTemplateTag(decl.parent) && ts.find(decl.parent.parent.tags, ts.isJSDocTypeAlias)); // TODO: GH#18217
@@ -32603,10 +33228,10 @@ var ts;
          */
         function getEntityNameForExtendingInterface(node) {
             switch (node.kind) {
-                case 72 /* Identifier */:
-                case 189 /* PropertyAccessExpression */:
+                case 73 /* Identifier */:
+                case 190 /* PropertyAccessExpression */:
                     return node.parent ? getEntityNameForExtendingInterface(node.parent) : undefined;
-                case 211 /* ExpressionWithTypeArguments */:
+                case 212 /* ExpressionWithTypeArguments */:
                     if (ts.isEntityNameExpression(node.expression)) {
                         return node.expression;
                     }
@@ -32695,7 +33320,7 @@ var ts;
         function checkResolvedBlockScopedVariable(result, errorLocation) {
             ts.Debug.assert(!!(result.flags & 2 /* BlockScopedVariable */ || result.flags & 32 /* Class */ || result.flags & 384 /* Enum */));
             // Block-scoped variables cannot be used before their definition
-            var declaration = ts.find(result.declarations, function (d) { return ts.isBlockOrCatchScoped(d) || ts.isClassLike(d) || (d.kind === 243 /* EnumDeclaration */) || ts.isInJSFile(d) && !!ts.getJSDocEnumTag(d); });
+            var declaration = ts.find(result.declarations, function (d) { return ts.isBlockOrCatchScoped(d) || ts.isClassLike(d) || (d.kind === 244 /* EnumDeclaration */) || ts.isInJSFile(d) && !!ts.getJSDocEnumTag(d); });
             if (declaration === undefined)
                 return ts.Debug.fail("Declaration to checkResolvedBlockScopedVariable is undefined");
             if (!(declaration.flags & 4194304 /* Ambient */) && !isBlockScopedNameDeclaredBeforeUse(declaration, errorLocation)) {
@@ -32717,7 +33342,7 @@ var ts;
                     }
                 }
                 if (diagnosticMessage) {
-                    addRelatedInfo(diagnosticMessage, ts.createDiagnosticForNode(declaration, ts.Diagnostics._0_is_declared_here, declarationName));
+                    ts.addRelatedInfo(diagnosticMessage, ts.createDiagnosticForNode(declaration, ts.Diagnostics._0_is_declared_here, declarationName));
                 }
             }
         }
@@ -32730,13 +33355,13 @@ var ts;
         }
         function getAnyImportSyntax(node) {
             switch (node.kind) {
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return node;
-                case 250 /* ImportClause */:
+                case 251 /* ImportClause */:
                     return node.parent;
-                case 251 /* NamespaceImport */:
+                case 252 /* NamespaceImport */:
                     return node.parent.parent;
-                case 253 /* ImportSpecifier */:
+                case 254 /* ImportSpecifier */:
                     return node.parent.parent.parent;
                 default:
                     return undefined;
@@ -32746,7 +33371,7 @@ var ts;
             return ts.find(symbol.declarations, ts.isAliasSymbolDeclaration);
         }
         function getTargetOfImportEqualsDeclaration(node, dontResolveAlias) {
-            if (node.moduleReference.kind === 259 /* ExternalModuleReference */) {
+            if (node.moduleReference.kind === 260 /* ExternalModuleReference */) {
                 return resolveExternalModuleSymbol(resolveExternalModuleName(node, ts.getExternalModuleImportEqualsDeclarationExpression(node)));
             }
             return getSymbolOfPartOfRightHandSideOfImportEquals(node.moduleReference, dontResolveAlias);
@@ -32803,7 +33428,16 @@ var ts;
                 var file = ts.find(moduleSymbol.declarations, ts.isSourceFile);
                 var hasSyntheticDefault = canHaveSyntheticDefault(file, moduleSymbol, dontResolveAlias);
                 if (!exportDefaultSymbol && !hasSyntheticDefault) {
-                    error(node.name, ts.Diagnostics.Module_0_has_no_default_export, symbolToString(moduleSymbol));
+                    if (hasExportAssignmentSymbol(moduleSymbol)) {
+                        var compilerOptionName = moduleKind >= ts.ModuleKind.ES2015 ? "allowSyntheticDefaultImports" : "esModuleInterop";
+                        var exportEqualsSymbol = moduleSymbol.exports.get("export=" /* ExportEquals */);
+                        var exportAssignment = exportEqualsSymbol.valueDeclaration;
+                        var err = error(node.name, ts.Diagnostics.Module_0_can_only_be_default_imported_using_the_1_flag, symbolToString(moduleSymbol), compilerOptionName);
+                        ts.addRelatedInfo(err, ts.createDiagnosticForNode(exportAssignment, ts.Diagnostics.This_module_is_declared_with_using_export_and_can_only_be_used_with_a_default_import_when_using_the_0_flag, compilerOptionName));
+                    }
+                    else {
+                        error(node.name, ts.Diagnostics.Module_0_has_no_default_export, symbolToString(moduleSymbol));
+                    }
                 }
                 else if (hasSyntheticDefault) {
                     // per emit behavior, a synthetic default overrides a "real" .default member if `__esModule` is not present
@@ -32901,7 +33535,7 @@ var ts;
                             var suggestionName = symbolToString(suggestion);
                             var diagnostic = error(name, ts.Diagnostics.Module_0_has_no_exported_member_1_Did_you_mean_2, moduleName, declarationName, suggestionName);
                             if (suggestion.valueDeclaration) {
-                                addRelatedInfo(diagnostic, ts.createDiagnosticForNode(suggestion.valueDeclaration, ts.Diagnostics._0_is_declared_here, suggestionName));
+                                ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(suggestion.valueDeclaration, ts.Diagnostics._0_is_declared_here, suggestionName));
                             }
                         }
                         else {
@@ -32938,20 +33572,20 @@ var ts;
         function getTargetOfAliasDeclaration(node, dontRecursivelyResolve) {
             if (dontRecursivelyResolve === void 0) { dontRecursivelyResolve = false; }
             switch (node.kind) {
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return getTargetOfImportEqualsDeclaration(node, dontRecursivelyResolve);
-                case 250 /* ImportClause */:
+                case 251 /* ImportClause */:
                     return getTargetOfImportClause(node, dontRecursivelyResolve);
-                case 251 /* NamespaceImport */:
+                case 252 /* NamespaceImport */:
                     return getTargetOfNamespaceImport(node, dontRecursivelyResolve);
-                case 253 /* ImportSpecifier */:
+                case 254 /* ImportSpecifier */:
                     return getTargetOfImportSpecifier(node, dontRecursivelyResolve);
-                case 257 /* ExportSpecifier */:
+                case 258 /* ExportSpecifier */:
                     return getTargetOfExportSpecifier(node, 67220415 /* Value */ | 67897832 /* Type */ | 1920 /* Namespace */, dontRecursivelyResolve);
-                case 254 /* ExportAssignment */:
-                case 204 /* BinaryExpression */:
+                case 255 /* ExportAssignment */:
+                case 205 /* BinaryExpression */:
                     return getTargetOfExportAssignment(node, dontRecursivelyResolve);
-                case 247 /* NamespaceExportDeclaration */:
+                case 248 /* NamespaceExportDeclaration */:
                     return getTargetOfNamespaceExportDeclaration(node, dontRecursivelyResolve);
                 default:
                     return ts.Debug.fail();
@@ -33012,11 +33646,11 @@ var ts;
                 var node = getDeclarationOfAliasSymbol(symbol);
                 if (!node)
                     return ts.Debug.fail();
-                if (node.kind === 254 /* ExportAssignment */) {
+                if (node.kind === 255 /* ExportAssignment */) {
                     // export default <symbol>
                     checkExpressionCached(node.expression);
                 }
-                else if (node.kind === 257 /* ExportSpecifier */) {
+                else if (node.kind === 258 /* ExportSpecifier */) {
                     // export { <symbol> } or export { <symbol> as foo }
                     checkExpressionCached(node.propertyName || node.name);
                 }
@@ -33034,17 +33668,17 @@ var ts;
             //     import a = |b|; // Namespace
             //     import a = |b.c|; // Value, type, namespace
             //     import a = |b.c|.d; // Namespace
-            if (entityName.kind === 72 /* Identifier */ && ts.isRightSideOfQualifiedNameOrPropertyAccess(entityName)) {
+            if (entityName.kind === 73 /* Identifier */ && ts.isRightSideOfQualifiedNameOrPropertyAccess(entityName)) {
                 entityName = entityName.parent;
             }
             // Check for case 1 and 3 in the above example
-            if (entityName.kind === 72 /* Identifier */ || entityName.parent.kind === 148 /* QualifiedName */) {
+            if (entityName.kind === 73 /* Identifier */ || entityName.parent.kind === 149 /* QualifiedName */) {
                 return resolveEntityName(entityName, 1920 /* Namespace */, /*ignoreErrors*/ false, dontResolveAlias);
             }
             else {
                 // Case 2 in above example
                 // entityName.kind could be a QualifiedName or a Missing identifier
-                ts.Debug.assert(entityName.parent.kind === 248 /* ImportEqualsDeclaration */);
+                ts.Debug.assert(entityName.parent.kind === 249 /* ImportEqualsDeclaration */);
                 return resolveEntityName(entityName, 67220415 /* Value */ | 67897832 /* Type */ | 1920 /* Namespace */, /*ignoreErrors*/ false, dontResolveAlias);
             }
         }
@@ -33060,17 +33694,17 @@ var ts;
             }
             var namespaceMeaning = 1920 /* Namespace */ | (ts.isInJSFile(name) ? meaning & 67220415 /* Value */ : 0);
             var symbol;
-            if (name.kind === 72 /* Identifier */) {
-                var message = meaning === namespaceMeaning ? ts.Diagnostics.Cannot_find_namespace_0 : getCannotFindNameDiagnosticForName(getFirstIdentifier(name).escapedText);
+            if (name.kind === 73 /* Identifier */) {
+                var message = meaning === namespaceMeaning ? ts.Diagnostics.Cannot_find_namespace_0 : getCannotFindNameDiagnosticForName(getFirstIdentifier(name));
                 var symbolFromJSPrototype = ts.isInJSFile(name) ? resolveEntityNameFromAssignmentDeclaration(name, meaning) : undefined;
                 symbol = resolveName(location || name, name.escapedText, meaning, ignoreErrors || symbolFromJSPrototype ? undefined : message, name, /*isUse*/ true);
                 if (!symbol) {
                     return symbolFromJSPrototype;
                 }
             }
-            else if (name.kind === 148 /* QualifiedName */ || name.kind === 189 /* PropertyAccessExpression */) {
-                var left = name.kind === 148 /* QualifiedName */ ? name.left : name.expression;
-                var right = name.kind === 148 /* QualifiedName */ ? name.right : name.name;
+            else if (name.kind === 149 /* QualifiedName */ || name.kind === 190 /* PropertyAccessExpression */) {
+                var left = name.kind === 149 /* QualifiedName */ ? name.left : name.expression;
+                var right = name.kind === 149 /* QualifiedName */ ? name.right : name.name;
                 var namespace = resolveEntityName(left, namespaceMeaning, ignoreErrors, /*dontResolveAlias*/ false, location);
                 if (!namespace || ts.nodeIsMissing(right)) {
                     return undefined;
@@ -33205,6 +33839,14 @@ var ts;
             if (patternAmbientModules) {
                 var pattern = ts.findBestPatternMatch(patternAmbientModules, function (_) { return _.pattern; }, moduleReference);
                 if (pattern) {
+                    // If the module reference matched a pattern ambient module ('*.foo') but there’s also a
+                    // module augmentation by the specific name requested ('a.foo'), we store the merged symbol
+                    // by the augmentation name ('a.foo'), because asking for *.foo should not give you exports
+                    // from a.foo.
+                    var augmentation = patternAmbientModuleAugmentations && patternAmbientModuleAugmentations.get(moduleReference);
+                    if (augmentation) {
+                        return getMergedSymbol(augmentation);
+                    }
                     return getMergedSymbol(pattern.symbol);
                 }
             }
@@ -33221,20 +33863,12 @@ var ts;
                 return undefined;
             }
             if (moduleNotFoundError) {
-                // For relative paths, see if this was possibly a projectReference redirect
-                if (ts.pathIsRelative(moduleReference)) {
-                    var sourceFile_1 = ts.getSourceFileOfNode(location);
-                    var redirects = sourceFile_1.redirectedReferences;
-                    if (redirects) {
-                        var normalizedTargetPath = ts.getNormalizedAbsolutePath(moduleReference, ts.getDirectoryPath(sourceFile_1.fileName));
-                        for (var _i = 0, _a = [".ts" /* Ts */, ".tsx" /* Tsx */]; _i < _a.length; _i++) {
-                            var ext = _a[_i];
-                            var probePath = normalizedTargetPath + ext;
-                            if (redirects.indexOf(probePath) >= 0) {
-                                error(errorNode, ts.Diagnostics.Output_file_0_has_not_been_built_from_source_file_1, moduleReference, probePath);
-                                return undefined;
-                            }
-                        }
+                // See if this was possibly a projectReference redirect
+                if (resolvedModule) {
+                    var redirect = host.getProjectReferenceRedirect(resolvedModule.resolvedFileName);
+                    if (redirect) {
+                        error(errorNode, ts.Diagnostics.Output_file_0_has_not_been_built_from_source_file_1, redirect, resolvedModule.resolvedFileName);
+                        return undefined;
                     }
                 }
                 if (resolutionDiagnostic) {
@@ -33303,7 +33937,7 @@ var ts;
         function resolveESModuleSymbol(moduleSymbol, referencingLocation, dontResolveAlias) {
             var symbol = resolveExternalModuleSymbol(moduleSymbol, dontResolveAlias);
             if (!dontResolveAlias && symbol) {
-                if (!(symbol.flags & (1536 /* Module */ | 3 /* Variable */)) && !ts.getDeclarationOfKind(symbol, 284 /* SourceFile */)) {
+                if (!(symbol.flags & (1536 /* Module */ | 3 /* Variable */)) && !ts.getDeclarationOfKind(symbol, 285 /* SourceFile */)) {
                     var compilerOptionName = moduleKind >= ts.ModuleKind.ES2015
                         ? "allowSyntheticDefaultImports"
                         : "esModuleInterop";
@@ -33565,7 +34199,7 @@ var ts;
             var members = node.members;
             for (var _i = 0, members_2 = members; _i < members_2.length; _i++) {
                 var member = members_2[_i];
-                if (member.kind === 157 /* Constructor */ && ts.nodeIsPresent(member.body)) {
+                if (member.kind === 158 /* Constructor */ && ts.nodeIsPresent(member.body)) {
                     return member;
                 }
             }
@@ -33576,13 +34210,10 @@ var ts;
             result.id = typeCount;
             return result;
         }
-        function createIntrinsicType(kind, intrinsicName) {
+        function createIntrinsicType(kind, intrinsicName, objectFlags) {
+            if (objectFlags === void 0) { objectFlags = 0; }
             var type = createType(kind);
             type.intrinsicName = intrinsicName;
-            return type;
-        }
-        function createNullableType(kind, intrinsicName, objectFlags) {
-            var type = createIntrinsicType(kind, intrinsicName);
             type.objectFlags = objectFlags;
             return type;
         }
@@ -33654,12 +34285,12 @@ var ts;
                     }
                 }
                 switch (location.kind) {
-                    case 284 /* SourceFile */:
+                    case 285 /* SourceFile */:
                         if (!ts.isExternalOrCommonJsModule(location)) {
                             break;
                         }
                     // falls through
-                    case 244 /* ModuleDeclaration */:
+                    case 245 /* ModuleDeclaration */:
                         if (result = callback(getSymbolOfNode(location).exports)) {
                             return result;
                         }
@@ -33723,7 +34354,7 @@ var ts;
                         && (!useOnlyExternalAliasing || ts.some(symbolFromSymbolTable.declarations, ts.isExternalModuleImportEqualsDeclaration))
                         // While exports are generally considered to be in scope, export-specifier declared symbols are _not_
                         // See similar comment in `resolveName` for details
-                        && (ignoreQualification || !ts.getDeclarationOfKind(symbolFromSymbolTable, 257 /* ExportSpecifier */))) {
+                        && (ignoreQualification || !ts.getDeclarationOfKind(symbolFromSymbolTable, 258 /* ExportSpecifier */))) {
                         var resolvedImportedSymbol = resolveAlias(symbolFromSymbolTable);
                         if (isAccessible(symbolFromSymbolTable, resolvedImportedSymbol, ignoreQualification)) {
                             return [symbolFromSymbolTable];
@@ -33759,7 +34390,7 @@ var ts;
                     return true;
                 }
                 // Qualify if the symbol from symbol table has same meaning as expected
-                symbolFromSymbolTable = (symbolFromSymbolTable.flags & 2097152 /* Alias */ && !ts.getDeclarationOfKind(symbolFromSymbolTable, 257 /* ExportSpecifier */)) ? resolveAlias(symbolFromSymbolTable) : symbolFromSymbolTable;
+                symbolFromSymbolTable = (symbolFromSymbolTable.flags & 2097152 /* Alias */ && !ts.getDeclarationOfKind(symbolFromSymbolTable, 258 /* ExportSpecifier */)) ? resolveAlias(symbolFromSymbolTable) : symbolFromSymbolTable;
                 if (symbolFromSymbolTable.flags & meaning) {
                     qualify = true;
                     return true;
@@ -33774,10 +34405,10 @@ var ts;
                 for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                     var declaration = _a[_i];
                     switch (declaration.kind) {
-                        case 154 /* PropertyDeclaration */:
-                        case 156 /* MethodDeclaration */:
-                        case 158 /* GetAccessor */:
-                        case 159 /* SetAccessor */:
+                        case 155 /* PropertyDeclaration */:
+                        case 157 /* MethodDeclaration */:
+                        case 159 /* GetAccessor */:
+                        case 160 /* SetAccessor */:
                             continue;
                         default:
                             return false;
@@ -33833,7 +34464,7 @@ var ts;
                 var containers = getContainersOfSymbol(symbol, enclosingDeclaration);
                 // If we're trying to reference some object literal in, eg `var a = { x: 1 }`, the symbol for the literal, `__object`, is distinct
                 // from the symbol of the declaration it is being assigned to. Since we can use the declaration to refer to the literal, however,
-                // we'd like to make that connection here - potentially causing us to paint the declararation's visibiility, and therefore the literal.
+                // we'd like to make that connection here - potentially causing us to paint the declaration's visibility, and therefore the literal.
                 var firstDecl = ts.first(symbol.declarations);
                 if (!ts.length(containers) && meaning & 67220415 /* Value */ && firstDecl && ts.isObjectLiteralExpression(firstDecl)) {
                     if (firstDecl.parent && ts.isVariableDeclaration(firstDecl.parent) && firstDecl === firstDecl.parent.initializer) {
@@ -33894,14 +34525,14 @@ var ts;
             return node && getSymbolOfNode(node);
         }
         function hasExternalModuleSymbol(declaration) {
-            return ts.isAmbientModule(declaration) || (declaration.kind === 284 /* SourceFile */ && ts.isExternalOrCommonJsModule(declaration));
+            return ts.isAmbientModule(declaration) || (declaration.kind === 285 /* SourceFile */ && ts.isExternalOrCommonJsModule(declaration));
         }
         function hasNonGlobalAugmentationExternalModuleSymbol(declaration) {
-            return ts.isModuleWithStringLiteralName(declaration) || (declaration.kind === 284 /* SourceFile */ && ts.isExternalOrCommonJsModule(declaration));
+            return ts.isModuleWithStringLiteralName(declaration) || (declaration.kind === 285 /* SourceFile */ && ts.isExternalOrCommonJsModule(declaration));
         }
         function hasVisibleDeclarations(symbol, shouldComputeAliasToMakeVisible) {
             var aliasesToMakeVisible;
-            if (!ts.every(symbol.declarations, getIsDeclarationVisible)) {
+            if (!ts.every(ts.filter(symbol.declarations, function (d) { return d.kind !== 73 /* Identifier */; }), getIsDeclarationVisible)) {
                 return undefined;
             }
             return { accessibility: 0 /* Accessible */, aliasesToMakeVisible: aliasesToMakeVisible };
@@ -33944,14 +34575,14 @@ var ts;
         function isEntityNameVisible(entityName, enclosingDeclaration) {
             // get symbol of the first identifier of the entityName
             var meaning;
-            if (entityName.parent.kind === 167 /* TypeQuery */ ||
+            if (entityName.parent.kind === 168 /* TypeQuery */ ||
                 ts.isExpressionWithTypeArgumentsInClassExtendsClause(entityName.parent) ||
-                entityName.parent.kind === 149 /* ComputedPropertyName */) {
+                entityName.parent.kind === 150 /* ComputedPropertyName */) {
                 // Typeof value
                 meaning = 67220415 /* Value */ | 1048576 /* ExportValue */;
             }
-            else if (entityName.kind === 148 /* QualifiedName */ || entityName.kind === 189 /* PropertyAccessExpression */ ||
-                entityName.parent.kind === 248 /* ImportEqualsDeclaration */) {
+            else if (entityName.kind === 149 /* QualifiedName */ || entityName.kind === 190 /* PropertyAccessExpression */ ||
+                entityName.parent.kind === 249 /* ImportEqualsDeclaration */) {
                 // Left identifier from type reference or TypeAlias
                 // Entity name of the import declaration
                 meaning = 1920 /* Namespace */;
@@ -34000,10 +34631,10 @@ var ts;
             function signatureToStringWorker(writer) {
                 var sigOutput;
                 if (flags & 262144 /* WriteArrowStyleSignature */) {
-                    sigOutput = kind === 1 /* Construct */ ? 166 /* ConstructorType */ : 165 /* FunctionType */;
+                    sigOutput = kind === 1 /* Construct */ ? 167 /* ConstructorType */ : 166 /* FunctionType */;
                 }
                 else {
-                    sigOutput = kind === 1 /* Construct */ ? 161 /* ConstructSignature */ : 160 /* CallSignature */;
+                    sigOutput = kind === 1 /* Construct */ ? 162 /* ConstructSignature */ : 161 /* CallSignature */;
                 }
                 var sig = nodeBuilder.signatureToSignatureDeclaration(signature, sigOutput, enclosingDeclaration, toNodeBuilderFlags(flags) | 70221824 /* IgnoreErrors */ | 512 /* WriteTypeParametersInQualifiedName */);
                 var printer = ts.createPrinter({ removeComments: true, omitTrailingSemicolon: true });
@@ -34030,6 +34661,15 @@ var ts;
             }
             return result;
         }
+        function getTypeNamesForErrorDisplay(left, right) {
+            var leftStr = typeToString(left);
+            var rightStr = typeToString(right);
+            if (leftStr === rightStr) {
+                leftStr = typeToString(left, /*enclosingDeclaration*/ undefined, 64 /* UseFullyQualifiedType */);
+                rightStr = typeToString(right, /*enclosingDeclaration*/ undefined, 64 /* UseFullyQualifiedType */);
+            }
+            return [leftStr, rightStr];
+        }
         function toNodeBuilderFlags(flags) {
             if (flags === void 0) { flags = 0 /* None */; }
             return flags & 9469291 /* NodeBuilderFlagsMask */;
@@ -34098,26 +34738,26 @@ var ts;
                 }
                 if (type.flags & 1 /* Any */) {
                     context.approximateLength += 3;
-                    return ts.createKeywordTypeNode(120 /* AnyKeyword */);
+                    return ts.createKeywordTypeNode(121 /* AnyKeyword */);
                 }
                 if (type.flags & 2 /* Unknown */) {
-                    return ts.createKeywordTypeNode(143 /* UnknownKeyword */);
+                    return ts.createKeywordTypeNode(144 /* UnknownKeyword */);
                 }
                 if (type.flags & 4 /* String */) {
                     context.approximateLength += 6;
-                    return ts.createKeywordTypeNode(138 /* StringKeyword */);
+                    return ts.createKeywordTypeNode(139 /* StringKeyword */);
                 }
                 if (type.flags & 8 /* Number */) {
                     context.approximateLength += 6;
-                    return ts.createKeywordTypeNode(135 /* NumberKeyword */);
+                    return ts.createKeywordTypeNode(136 /* NumberKeyword */);
                 }
                 if (type.flags & 64 /* BigInt */) {
                     context.approximateLength += 6;
-                    return ts.createKeywordTypeNode(146 /* BigIntKeyword */);
+                    return ts.createKeywordTypeNode(147 /* BigIntKeyword */);
                 }
                 if (type.flags & 16 /* Boolean */) {
                     context.approximateLength += 7;
-                    return ts.createKeywordTypeNode(123 /* BooleanKeyword */);
+                    return ts.createKeywordTypeNode(124 /* BooleanKeyword */);
                 }
                 if (type.flags & 1024 /* EnumLiteral */ && !(type.flags & 1048576 /* Union */)) {
                     var parentSymbol = getParentOfSymbol(type.symbol);
@@ -34135,8 +34775,9 @@ var ts;
                     return ts.createLiteralTypeNode(ts.setEmitFlags(ts.createLiteral(type.value), 16777216 /* NoAsciiEscaping */));
                 }
                 if (type.flags & 256 /* NumberLiteral */) {
-                    context.approximateLength += (("" + type.value).length);
-                    return ts.createLiteralTypeNode((ts.createLiteral(type.value)));
+                    var value = type.value;
+                    context.approximateLength += ("" + value).length;
+                    return ts.createLiteralTypeNode(value < 0 ? ts.createPrefix(39 /* MinusToken */, ts.createLiteral(-value)) : ts.createLiteral(value));
                 }
                 if (type.flags & 2048 /* BigIntLiteral */) {
                     context.approximateLength += (ts.pseudoBigIntToString(type.value).length) + 1;
@@ -34157,33 +34798,33 @@ var ts;
                         }
                     }
                     context.approximateLength += 13;
-                    return ts.createTypeOperatorNode(142 /* UniqueKeyword */, ts.createKeywordTypeNode(139 /* SymbolKeyword */));
+                    return ts.createTypeOperatorNode(143 /* UniqueKeyword */, ts.createKeywordTypeNode(140 /* SymbolKeyword */));
                 }
                 if (type.flags & 16384 /* Void */) {
                     context.approximateLength += 4;
-                    return ts.createKeywordTypeNode(106 /* VoidKeyword */);
+                    return ts.createKeywordTypeNode(107 /* VoidKeyword */);
                 }
                 if (type.flags & 32768 /* Undefined */) {
                     context.approximateLength += 9;
-                    return ts.createKeywordTypeNode(141 /* UndefinedKeyword */);
+                    return ts.createKeywordTypeNode(142 /* UndefinedKeyword */);
                 }
                 if (type.flags & 65536 /* Null */) {
                     context.approximateLength += 4;
-                    return ts.createKeywordTypeNode(96 /* NullKeyword */);
+                    return ts.createKeywordTypeNode(97 /* NullKeyword */);
                 }
                 if (type.flags & 131072 /* Never */) {
                     context.approximateLength += 5;
-                    return ts.createKeywordTypeNode(132 /* NeverKeyword */);
+                    return ts.createKeywordTypeNode(133 /* NeverKeyword */);
                 }
                 if (type.flags & 4096 /* ESSymbol */) {
                     context.approximateLength += 6;
-                    return ts.createKeywordTypeNode(139 /* SymbolKeyword */);
+                    return ts.createKeywordTypeNode(140 /* SymbolKeyword */);
                 }
                 if (type.flags & 67108864 /* NonPrimitive */) {
                     context.approximateLength += 6;
-                    return ts.createKeywordTypeNode(136 /* ObjectKeyword */);
+                    return ts.createKeywordTypeNode(137 /* ObjectKeyword */);
                 }
-                if (type.flags & 262144 /* TypeParameter */ && type.isThisType) {
+                if (isThisTypeParameter(type)) {
                     if (context.flags & 4194304 /* InObjectTypeLiteral */) {
                         if (!context.encounteredError && !(context.flags & 32768 /* AllowThisInObjectLiteral */)) {
                             context.encounteredError = true;
@@ -34206,14 +34847,10 @@ var ts;
                         return ts.createInferTypeNode(typeParameterToDeclarationWithConstraint(type, context, /*constraintNode*/ undefined));
                     }
                     if (context.flags & 4 /* GenerateNamesForShadowedTypeParams */ &&
-                        type.flags & 262144 /* TypeParameter */ &&
-                        ts.length(type.symbol.declarations) &&
-                        ts.isTypeParameterDeclaration(type.symbol.declarations[0]) &&
-                        typeParameterShadowsNameInScope(type, context) &&
                         !isTypeSymbolAccessible(type.symbol, context.enclosingDeclaration)) {
-                        var name = type.symbol.declarations[0].name;
+                        var name = typeParameterToName(type, context);
                         context.approximateLength += ts.idText(name).length;
-                        return ts.createTypeReferenceNode(ts.getGeneratedNameForNode(name, 16 /* Optimistic */ | 8 /* ReservedInNestedScopes */), /*typeArguments*/ undefined);
+                        return ts.createTypeReferenceNode(ts.createIdentifier(ts.idText(name)), /*typeArguments*/ undefined);
                     }
                     // Ignore constraint/default when creating a usage (as opposed to declaration) of a type parameter.
                     return type.symbol
@@ -34233,7 +34870,7 @@ var ts;
                     }
                     var typeNodes = mapToTypeNodes(types, context, /*isBareList*/ true);
                     if (typeNodes && typeNodes.length > 0) {
-                        var unionOrIntersectionTypeNode = ts.createUnionOrIntersectionTypeNode(type.flags & 1048576 /* Union */ ? 173 /* UnionType */ : 174 /* IntersectionType */, typeNodes);
+                        var unionOrIntersectionTypeNode = ts.createUnionOrIntersectionTypeNode(type.flags & 1048576 /* Union */ ? 174 /* UnionType */ : 175 /* IntersectionType */, typeNodes);
                         return unionOrIntersectionTypeNode;
                     }
                     else {
@@ -34307,7 +34944,7 @@ var ts;
                             return symbolToTypeNode(symbol, context, isInstanceType);
                         }
                         // Always use 'typeof T' for type of class, enum, and module objects
-                        else if (symbol.flags & 32 /* Class */ && !getBaseTypeVariableOfClass(symbol) && !(symbol.valueDeclaration.kind === 209 /* ClassExpression */ && context.flags & 2048 /* WriteClassExpressionAsTypeLiteral */) ||
+                        else if (symbol.flags & 32 /* Class */ && !getBaseTypeVariableOfClass(symbol) && !(symbol.valueDeclaration.kind === 210 /* ClassExpression */ && context.flags & 2048 /* WriteClassExpressionAsTypeLiteral */) ||
                             symbol.flags & (384 /* Enum */ | 512 /* ValueModule */) ||
                             shouldWriteTypeOfFunctionSymbol()) {
                             return symbolToTypeNode(symbol, context, 67220415 /* Value */);
@@ -34354,7 +34991,7 @@ var ts;
                         var isNonLocalFunctionSymbol = !!(symbol.flags & 16 /* Function */) &&
                             (symbol.parent || // is exported function symbol
                                 ts.forEach(symbol.declarations, function (declaration) {
-                                    return declaration.parent.kind === 284 /* SourceFile */ || declaration.parent.kind === 245 /* ModuleBlock */;
+                                    return declaration.parent.kind === 285 /* SourceFile */ || declaration.parent.kind === 246 /* ModuleBlock */;
                                 }));
                         if (isStaticMethodSymbol || isNonLocalFunctionSymbol) {
                             // typeof is allowed only for static/non local functions
@@ -34375,12 +35012,12 @@ var ts;
                         }
                         if (resolved.callSignatures.length === 1 && !resolved.constructSignatures.length) {
                             var signature = resolved.callSignatures[0];
-                            var signatureNode = signatureToSignatureDeclarationHelper(signature, 165 /* FunctionType */, context);
+                            var signatureNode = signatureToSignatureDeclarationHelper(signature, 166 /* FunctionType */, context);
                             return signatureNode;
                         }
                         if (resolved.constructSignatures.length === 1 && !resolved.callSignatures.length) {
                             var signature = resolved.constructSignatures[0];
-                            var signatureNode = signatureToSignatureDeclarationHelper(signature, 166 /* ConstructorType */, context);
+                            var signatureNode = signatureToSignatureDeclarationHelper(signature, 167 /* ConstructorType */, context);
                             return signatureNode;
                         }
                     }
@@ -34401,7 +35038,7 @@ var ts;
                         }
                         var elementType = typeToTypeNodeHelper(typeArguments[0], context);
                         var arrayType = ts.createArrayTypeNode(elementType);
-                        return type.target === globalArrayType ? arrayType : ts.createTypeOperatorNode(133 /* ReadonlyKeyword */, arrayType);
+                        return type.target === globalArrayType ? arrayType : ts.createTypeOperatorNode(134 /* ReadonlyKeyword */, arrayType);
                     }
                     else if (type.target.objectFlags & 8 /* Tuple */) {
                         if (typeArguments.length > 0) {
@@ -34415,12 +35052,12 @@ var ts;
                                         ts.createOptionalTypeNode(tupleConstituentNodes[i]);
                                 }
                                 var tupleTypeNode = ts.createTupleTypeNode(tupleConstituentNodes);
-                                return type.target.readonly ? ts.createTypeOperatorNode(133 /* ReadonlyKeyword */, tupleTypeNode) : tupleTypeNode;
+                                return type.target.readonly ? ts.createTypeOperatorNode(134 /* ReadonlyKeyword */, tupleTypeNode) : tupleTypeNode;
                             }
                         }
                         if (context.encounteredError || (context.flags & 524288 /* AllowEmptyTuple */)) {
                             var tupleTypeNode = ts.createTupleTypeNode([]);
-                            return type.target.readonly ? ts.createTypeOperatorNode(133 /* ReadonlyKeyword */, tupleTypeNode) : tupleTypeNode;
+                            return type.target.readonly ? ts.createTypeOperatorNode(134 /* ReadonlyKeyword */, tupleTypeNode) : tupleTypeNode;
                         }
                         context.encounteredError = true;
                         return undefined; // TODO: GH#18217
@@ -34515,11 +35152,11 @@ var ts;
                     var typeElements = [];
                     for (var _i = 0, _a = resolvedType.callSignatures; _i < _a.length; _i++) {
                         var signature = _a[_i];
-                        typeElements.push(signatureToSignatureDeclarationHelper(signature, 160 /* CallSignature */, context));
+                        typeElements.push(signatureToSignatureDeclarationHelper(signature, 161 /* CallSignature */, context));
                     }
                     for (var _b = 0, _c = resolvedType.constructSignatures; _b < _c.length; _b++) {
                         var signature = _c[_b];
-                        typeElements.push(signatureToSignatureDeclarationHelper(signature, 161 /* ConstructSignature */, context));
+                        typeElements.push(signatureToSignatureDeclarationHelper(signature, 162 /* ConstructSignature */, context));
                     }
                     if (resolvedType.stringIndexInfo) {
                         var indexSignature = void 0;
@@ -34566,15 +35203,15 @@ var ts;
                 if (!(context.flags & 1 /* NoTruncation */)) {
                     return ts.createTypeReferenceNode(ts.createIdentifier("..."), /*typeArguments*/ undefined);
                 }
-                return ts.createKeywordTypeNode(120 /* AnyKeyword */);
+                return ts.createKeywordTypeNode(121 /* AnyKeyword */);
             }
             function addPropertyToElementList(propertySymbol, context, typeElements) {
-                var propertyIsReverseMapped = !!(ts.getCheckFlags(propertySymbol) & 4096 /* ReverseMapped */);
+                var propertyIsReverseMapped = !!(ts.getCheckFlags(propertySymbol) & 8192 /* ReverseMapped */);
                 var propertyType = propertyIsReverseMapped && context.flags & 33554432 /* InReverseMappedType */ ?
                     anyType : getTypeOfSymbol(propertySymbol);
                 var saveEnclosingDeclaration = context.enclosingDeclaration;
                 context.enclosingDeclaration = undefined;
-                if (context.tracker.trackSymbol && ts.getCheckFlags(propertySymbol) & 2048 /* Late */) {
+                if (context.tracker.trackSymbol && ts.getCheckFlags(propertySymbol) & 4096 /* Late */) {
                     var decl = ts.first(propertySymbol.declarations);
                     if (hasLateBindableName(decl)) {
                         trackComputedName(decl.name, saveEnclosingDeclaration, context);
@@ -34585,10 +35222,10 @@ var ts;
                 context.enclosingDeclaration = saveEnclosingDeclaration;
                 var optionalToken = propertySymbol.flags & 16777216 /* Optional */ ? ts.createToken(56 /* QuestionToken */) : undefined;
                 if (propertySymbol.flags & (16 /* Function */ | 8192 /* Method */) && !getPropertiesOfObjectType(propertyType).length && !isReadonlySymbol(propertySymbol)) {
-                    var signatures = getSignaturesOfType(propertyType, 0 /* Call */);
+                    var signatures = getSignaturesOfType(filterType(propertyType, function (t) { return !(t.flags & 32768 /* Undefined */); }), 0 /* Call */);
                     for (var _i = 0, signatures_1 = signatures; _i < signatures_1.length; _i++) {
                         var signature = signatures_1[_i];
-                        var methodDeclaration = signatureToSignatureDeclarationHelper(signature, 155 /* MethodSignature */, context);
+                        var methodDeclaration = signatureToSignatureDeclarationHelper(signature, 156 /* MethodSignature */, context);
                         methodDeclaration.name = propertyName;
                         methodDeclaration.questionToken = optionalToken;
                         if (propertySymbol.valueDeclaration) {
@@ -34606,10 +35243,10 @@ var ts;
                         propertyTypeNode = createElidedInformationPlaceholder(context);
                     }
                     else {
-                        propertyTypeNode = propertyType ? typeToTypeNodeHelper(propertyType, context) : ts.createKeywordTypeNode(120 /* AnyKeyword */);
+                        propertyTypeNode = propertyType ? typeToTypeNodeHelper(propertyType, context) : ts.createKeywordTypeNode(121 /* AnyKeyword */);
                     }
                     context.flags = savedFlags;
-                    var modifiers = isReadonlySymbol(propertySymbol) ? [ts.createToken(133 /* ReadonlyKeyword */)] : undefined;
+                    var modifiers = isReadonlySymbol(propertySymbol) ? [ts.createToken(134 /* ReadonlyKeyword */)] : undefined;
                     if (modifiers) {
                         context.approximateLength += 9;
                     }
@@ -34660,7 +35297,7 @@ var ts;
             }
             function indexInfoToIndexSignatureDeclarationHelper(indexInfo, kind, context) {
                 var name = ts.getNameFromIndexInfo(indexInfo) || "x";
-                var indexerTypeNode = ts.createKeywordTypeNode(kind === 0 /* String */ ? 138 /* StringKeyword */ : 135 /* NumberKeyword */);
+                var indexerTypeNode = ts.createKeywordTypeNode(kind === 0 /* String */ ? 139 /* StringKeyword */ : 136 /* NumberKeyword */);
                 var indexingParameter = ts.createParameter(
                 /*decorators*/ undefined, 
                 /*modifiers*/ undefined, 
@@ -34673,7 +35310,7 @@ var ts;
                 }
                 context.approximateLength += (name.length + 4);
                 return ts.createIndexSignature(
-                /*decorators*/ undefined, indexInfo.isReadonly ? [ts.createToken(133 /* ReadonlyKeyword */)] : undefined, [indexingParameter], typeNode);
+                /*decorators*/ undefined, indexInfo.isReadonly ? [ts.createToken(134 /* ReadonlyKeyword */)] : undefined, [indexingParameter], typeNode);
             }
             function signatureToSignatureDeclarationHelper(signature, kind, context) {
                 var typeParameters;
@@ -34684,7 +35321,7 @@ var ts;
                 else {
                     typeParameters = signature.typeParameters && signature.typeParameters.map(function (parameter) { return typeParameterToDeclaration(parameter, context); });
                 }
-                var parameters = getExpandedParameters(signature).map(function (parameter) { return symbolToParameterDeclaration(parameter, context, kind === 157 /* Constructor */); });
+                var parameters = getExpandedParameters(signature).map(function (parameter) { return symbolToParameterDeclaration(parameter, context, kind === 158 /* Constructor */); });
                 if (signature.thisParameter) {
                     var thisParameter = symbolToParameterDeclaration(signature.thisParameter, context);
                     parameters.unshift(thisParameter);
@@ -34703,29 +35340,20 @@ var ts;
                     returnTypeNode = returnType && typeToTypeNodeHelper(returnType, context);
                 }
                 if (context.flags & 256 /* SuppressAnyReturnType */) {
-                    if (returnTypeNode && returnTypeNode.kind === 120 /* AnyKeyword */) {
+                    if (returnTypeNode && returnTypeNode.kind === 121 /* AnyKeyword */) {
                         returnTypeNode = undefined;
                     }
                 }
                 else if (!returnTypeNode) {
-                    returnTypeNode = ts.createKeywordTypeNode(120 /* AnyKeyword */);
+                    returnTypeNode = ts.createKeywordTypeNode(121 /* AnyKeyword */);
                 }
                 context.approximateLength += 3; // Usually a signature contributes a few more characters than this, but 3 is the minimum
                 return ts.createSignatureDeclaration(kind, typeParameters, parameters, returnTypeNode, typeArguments);
             }
-            function typeParameterShadowsNameInScope(type, context) {
-                return !!resolveName(context.enclosingDeclaration, type.symbol.escapedName, 67897832 /* Type */, /*nameNotFoundArg*/ undefined, type.symbol.escapedName, /*isUse*/ false);
-            }
             function typeParameterToDeclarationWithConstraint(type, context, constraintNode) {
                 var savedContextFlags = context.flags;
                 context.flags &= ~512 /* WriteTypeParametersInQualifiedName */; // Avoids potential infinite loop when building for a claimspace with a generic
-                var shouldUseGeneratedName = context.flags & 4 /* GenerateNamesForShadowedTypeParams */ &&
-                    type.symbol.declarations && type.symbol.declarations[0] &&
-                    ts.isTypeParameterDeclaration(type.symbol.declarations[0]) &&
-                    typeParameterShadowsNameInScope(type, context);
-                var name = shouldUseGeneratedName
-                    ? ts.getGeneratedNameForNode(type.symbol.declarations[0].name, 16 /* Optimistic */ | 8 /* ReservedInNestedScopes */)
-                    : symbolToName(type.symbol, context, 67897832 /* Type */, /*expectsIdentifier*/ true);
+                var name = typeParameterToName(type, context);
                 var defaultParameter = getDefaultFromTypeParameter(type);
                 var defaultParameterNode = defaultParameter && typeToTypeNodeHelper(defaultParameter, context);
                 context.flags = savedContextFlags;
@@ -34737,9 +35365,9 @@ var ts;
                 return typeParameterToDeclarationWithConstraint(type, context, constraintNode);
             }
             function symbolToParameterDeclaration(parameterSymbol, context, preserveModifierFlags) {
-                var parameterDeclaration = ts.getDeclarationOfKind(parameterSymbol, 151 /* Parameter */);
+                var parameterDeclaration = ts.getDeclarationOfKind(parameterSymbol, 152 /* Parameter */);
                 if (!parameterDeclaration && !isTransientSymbol(parameterSymbol)) {
-                    parameterDeclaration = ts.getDeclarationOfKind(parameterSymbol, 304 /* JSDocParameterTag */);
+                    parameterDeclaration = ts.getDeclarationOfKind(parameterSymbol, 306 /* JSDocParameterTag */);
                 }
                 var parameterType = getTypeOfSymbol(parameterSymbol);
                 if (parameterDeclaration && isRequiredInitializedParameter(parameterDeclaration)) {
@@ -34747,16 +35375,16 @@ var ts;
                 }
                 var parameterTypeNode = typeToTypeNodeHelper(parameterType, context);
                 var modifiers = !(context.flags & 8192 /* OmitParameterModifiers */) && preserveModifierFlags && parameterDeclaration && parameterDeclaration.modifiers ? parameterDeclaration.modifiers.map(ts.getSynthesizedClone) : undefined;
-                var isRest = parameterDeclaration && ts.isRestParameter(parameterDeclaration) || ts.getCheckFlags(parameterSymbol) & 16384 /* RestParameter */;
+                var isRest = parameterDeclaration && ts.isRestParameter(parameterDeclaration) || ts.getCheckFlags(parameterSymbol) & 32768 /* RestParameter */;
                 var dotDotDotToken = isRest ? ts.createToken(25 /* DotDotDotToken */) : undefined;
                 var name = parameterDeclaration
                     ? parameterDeclaration.name ?
-                        parameterDeclaration.name.kind === 72 /* Identifier */ ? ts.setEmitFlags(ts.getSynthesizedClone(parameterDeclaration.name), 16777216 /* NoAsciiEscaping */) :
-                            parameterDeclaration.name.kind === 148 /* QualifiedName */ ? ts.setEmitFlags(ts.getSynthesizedClone(parameterDeclaration.name.right), 16777216 /* NoAsciiEscaping */) :
+                        parameterDeclaration.name.kind === 73 /* Identifier */ ? ts.setEmitFlags(ts.getSynthesizedClone(parameterDeclaration.name), 16777216 /* NoAsciiEscaping */) :
+                            parameterDeclaration.name.kind === 149 /* QualifiedName */ ? ts.setEmitFlags(ts.getSynthesizedClone(parameterDeclaration.name.right), 16777216 /* NoAsciiEscaping */) :
                                 cloneBindingName(parameterDeclaration.name) :
                         ts.symbolName(parameterSymbol)
                     : ts.symbolName(parameterSymbol);
-                var isOptional = parameterDeclaration && isOptionalParameter(parameterDeclaration) || ts.getCheckFlags(parameterSymbol) & 8192 /* OptionalParameter */;
+                var isOptional = parameterDeclaration && isOptionalParameter(parameterDeclaration) || ts.getCheckFlags(parameterSymbol) & 16384 /* OptionalParameter */;
                 var questionToken = isOptional ? ts.createToken(56 /* QuestionToken */) : undefined;
                 var parameterNode = ts.createParameter(
                 /*decorators*/ undefined, modifiers, dotDotDotToken, name, questionToken, parameterTypeNode, 
@@ -34771,7 +35399,7 @@ var ts;
                         }
                         var visited = ts.visitEachChild(node, elideInitializerAndSetEmitFlags, ts.nullTransformationContext, /*nodesVisitor*/ undefined, elideInitializerAndSetEmitFlags);
                         var clone = ts.nodeIsSynthesized(visited) ? visited : ts.getSynthesizedClone(visited);
-                        if (clone.kind === 186 /* BindingElement */) {
+                        if (clone.kind === 187 /* BindingElement */) {
                             clone.initializer = undefined;
                         }
                         return ts.setEmitFlags(clone, 1 /* SingleLine */ | 16777216 /* NoAsciiEscaping */);
@@ -34873,6 +35501,11 @@ var ts;
             function lookupTypeParameterNodes(chain, index, context) {
                 ts.Debug.assert(chain && 0 <= index && index < chain.length);
                 var symbol = chain[index];
+                var symbolId = "" + getSymbolId(symbol);
+                if (context.typeParameterSymbolList && context.typeParameterSymbolList.get(symbolId)) {
+                    return undefined;
+                }
+                (context.typeParameterSymbolList || (context.typeParameterSymbolList = ts.createMap())).set(symbolId, true);
                 var typeParameterNodes;
                 if (context.flags & 512 /* WriteTypeParametersInQualifiedName */ && index < (chain.length - 1)) {
                     var parentSymbol = symbol;
@@ -34897,7 +35530,7 @@ var ts;
                 return top;
             }
             function getSpecifierForModuleSymbol(symbol, context) {
-                var file = ts.getDeclarationOfKind(symbol, 284 /* SourceFile */);
+                var file = ts.getDeclarationOfKind(symbol, 285 /* SourceFile */);
                 if (file && file.moduleName !== undefined) {
                     // Use the amd name if it is available
                     return file.moduleName;
@@ -35020,6 +35653,33 @@ var ts;
                     return identifier;
                 }
             }
+            function typeParameterShadowsNameInScope(escapedName, context) {
+                return !!resolveName(context.enclosingDeclaration, escapedName, 67897832 /* Type */, /*nameNotFoundArg*/ undefined, escapedName, /*isUse*/ false);
+            }
+            function typeParameterToName(type, context) {
+                if (context.flags & 4 /* GenerateNamesForShadowedTypeParams */ && context.typeParameterNames) {
+                    var cached = context.typeParameterNames.get("" + getTypeId(type));
+                    if (cached) {
+                        return cached;
+                    }
+                }
+                var result = symbolToName(type.symbol, context, 67897832 /* Type */, /*expectsIdentifier*/ true);
+                if (context.flags & 4 /* GenerateNamesForShadowedTypeParams */) {
+                    var rawtext = result.escapedText;
+                    var i = 0;
+                    var text = rawtext;
+                    while ((context.typeParameterNamesByText && context.typeParameterNamesByText.get(text)) || typeParameterShadowsNameInScope(text, context)) {
+                        i++;
+                        text = rawtext + "_" + i;
+                    }
+                    if (text !== rawtext) {
+                        result = ts.createIdentifier(text, result.typeArguments);
+                    }
+                    (context.typeParameterNames || (context.typeParameterNames = ts.createMap())).set("" + getTypeId(type), result);
+                    (context.typeParameterNamesByText || (context.typeParameterNamesByText = ts.createMap())).set(result.escapedText, true);
+                }
+                return result;
+            }
             function symbolToName(symbol, context, meaning, expectsIdentifier) {
                 var chain = lookupSymbolChain(symbol, context, meaning);
                 if (expectsIdentifier && chain.length !== 1
@@ -35137,8 +35797,8 @@ var ts;
         }
         function getTypeAliasForTypeLiteral(type) {
             if (type.symbol && type.symbol.flags & 2048 /* TypeLiteral */) {
-                var node = ts.findAncestor(type.symbol.declarations[0].parent, function (n) { return n.kind !== 177 /* ParenthesizedType */; });
-                if (node.kind === 242 /* TypeAliasDeclaration */) {
+                var node = ts.findAncestor(type.symbol.declarations[0].parent, function (n) { return n.kind !== 178 /* ParenthesizedType */; });
+                if (node.kind === 243 /* TypeAliasDeclaration */) {
                     return getSymbolOfNode(node);
                 }
             }
@@ -35146,11 +35806,11 @@ var ts;
         }
         function isTopLevelInExternalModuleAugmentation(node) {
             return node && node.parent &&
-                node.parent.kind === 245 /* ModuleBlock */ &&
+                node.parent.kind === 246 /* ModuleBlock */ &&
                 ts.isExternalModuleAugmentation(node.parent.parent);
         }
         function isDefaultBindingContext(location) {
-            return location.kind === 284 /* SourceFile */ || ts.isAmbientModule(location);
+            return location.kind === 285 /* SourceFile */ || ts.isAmbientModule(location);
         }
         function getNameOfSymbolFromNameType(symbol, context) {
             var nameType = symbol.nameType;
@@ -35160,6 +35820,9 @@ var ts;
                     if (!ts.isIdentifierText(name, compilerOptions.target) && !isNumericLiteralName(name)) {
                         return "\"" + ts.escapeString(name, 34 /* doubleQuote */) + "\"";
                     }
+                    if (isNumericLiteralName(name) && ts.startsWith(name, "-")) {
+                        return "[" + name + "]";
+                    }
                     return name;
                 }
                 if (nameType.flags & 8192 /* UniqueESSymbol */) {
@@ -35191,7 +35854,7 @@ var ts;
                     if (ts.isCallExpression(declaration) && ts.isBindableObjectDefinePropertyCall(declaration)) {
                         return ts.symbolName(symbol);
                     }
-                    if (ts.isComputedPropertyName(name_2) && !(ts.getCheckFlags(symbol) & 2048 /* Late */) && symbol.nameType && symbol.nameType.flags & 384 /* StringOrNumberLiteral */) {
+                    if (ts.isComputedPropertyName(name_2) && !(ts.getCheckFlags(symbol) & 4096 /* Late */) && symbol.nameType && symbol.nameType.flags & 384 /* StringOrNumberLiteral */) {
                         // Computed property name isn't late bound, but has a well-known name type - use name type to generate a symbol name
                         var result = getNameOfSymbolFromNameType(symbol, context);
                         if (result !== undefined) {
@@ -35200,17 +35863,17 @@ var ts;
                     }
                     return ts.declarationNameToString(name_2);
                 }
-                if (declaration.parent && declaration.parent.kind === 237 /* VariableDeclaration */) {
+                if (declaration.parent && declaration.parent.kind === 238 /* VariableDeclaration */) {
                     return ts.declarationNameToString(declaration.parent.name);
                 }
                 switch (declaration.kind) {
-                    case 209 /* ClassExpression */:
-                    case 196 /* FunctionExpression */:
-                    case 197 /* ArrowFunction */:
+                    case 210 /* ClassExpression */:
+                    case 197 /* FunctionExpression */:
+                    case 198 /* ArrowFunction */:
                         if (context && !context.encounteredError && !(context.flags & 131072 /* AllowAnonymousIdentifier */)) {
                             context.encounteredError = true;
                         }
-                        return declaration.kind === 209 /* ClassExpression */ ? "(Anonymous class)" : "(Anonymous function)";
+                        return declaration.kind === 210 /* ClassExpression */ ? "(Anonymous class)" : "(Anonymous function)";
                 }
             }
             var name = getNameOfSymbolFromNameType(symbol, context);
@@ -35227,27 +35890,27 @@ var ts;
             return false;
             function determineIfDeclarationIsVisible() {
                 switch (node.kind) {
-                    case 302 /* JSDocCallbackTag */:
-                    case 309 /* JSDocTypedefTag */:
+                    case 304 /* JSDocCallbackTag */:
+                    case 311 /* JSDocTypedefTag */:
                         // Top-level jsdoc type aliases are considered exported
                         // First parent is comment node, second is hosting declaration or token; we only care about those tokens or declarations whose parent is a source file
                         return !!(node.parent && node.parent.parent && node.parent.parent.parent && ts.isSourceFile(node.parent.parent.parent));
-                    case 186 /* BindingElement */:
+                    case 187 /* BindingElement */:
                         return isDeclarationVisible(node.parent.parent);
-                    case 237 /* VariableDeclaration */:
+                    case 238 /* VariableDeclaration */:
                         if (ts.isBindingPattern(node.name) &&
                             !node.name.elements.length) {
                             // If the binding pattern is empty, this variable declaration is not visible
                             return false;
                         }
                     // falls through
-                    case 244 /* ModuleDeclaration */:
-                    case 240 /* ClassDeclaration */:
-                    case 241 /* InterfaceDeclaration */:
-                    case 242 /* TypeAliasDeclaration */:
-                    case 239 /* FunctionDeclaration */:
-                    case 243 /* EnumDeclaration */:
-                    case 248 /* ImportEqualsDeclaration */:
+                    case 245 /* ModuleDeclaration */:
+                    case 241 /* ClassDeclaration */:
+                    case 242 /* InterfaceDeclaration */:
+                    case 243 /* TypeAliasDeclaration */:
+                    case 240 /* FunctionDeclaration */:
+                    case 244 /* EnumDeclaration */:
+                    case 249 /* ImportEqualsDeclaration */:
                         // external module augmentation is always visible
                         if (ts.isExternalModuleAugmentation(node)) {
                             return true;
@@ -35255,53 +35918,53 @@ var ts;
                         var parent = getDeclarationContainer(node);
                         // If the node is not exported or it is not ambient module element (except import declaration)
                         if (!(ts.getCombinedModifierFlags(node) & 1 /* Export */) &&
-                            !(node.kind !== 248 /* ImportEqualsDeclaration */ && parent.kind !== 284 /* SourceFile */ && parent.flags & 4194304 /* Ambient */)) {
+                            !(node.kind !== 249 /* ImportEqualsDeclaration */ && parent.kind !== 285 /* SourceFile */ && parent.flags & 4194304 /* Ambient */)) {
                             return isGlobalSourceFile(parent);
                         }
                         // Exported members/ambient module elements (exception import declaration) are visible if parent is visible
                         return isDeclarationVisible(parent);
-                    case 154 /* PropertyDeclaration */:
-                    case 153 /* PropertySignature */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
-                    case 156 /* MethodDeclaration */:
-                    case 155 /* MethodSignature */:
+                    case 155 /* PropertyDeclaration */:
+                    case 154 /* PropertySignature */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
+                    case 157 /* MethodDeclaration */:
+                    case 156 /* MethodSignature */:
                         if (ts.hasModifier(node, 8 /* Private */ | 16 /* Protected */)) {
                             // Private/protected properties/methods are not visible
                             return false;
                         }
                     // Public properties/methods are visible if its parents are visible, so:
                     // falls through
-                    case 157 /* Constructor */:
-                    case 161 /* ConstructSignature */:
-                    case 160 /* CallSignature */:
-                    case 162 /* IndexSignature */:
-                    case 151 /* Parameter */:
-                    case 245 /* ModuleBlock */:
-                    case 165 /* FunctionType */:
-                    case 166 /* ConstructorType */:
-                    case 168 /* TypeLiteral */:
-                    case 164 /* TypeReference */:
-                    case 169 /* ArrayType */:
-                    case 170 /* TupleType */:
-                    case 173 /* UnionType */:
-                    case 174 /* IntersectionType */:
-                    case 177 /* ParenthesizedType */:
+                    case 158 /* Constructor */:
+                    case 162 /* ConstructSignature */:
+                    case 161 /* CallSignature */:
+                    case 163 /* IndexSignature */:
+                    case 152 /* Parameter */:
+                    case 246 /* ModuleBlock */:
+                    case 166 /* FunctionType */:
+                    case 167 /* ConstructorType */:
+                    case 169 /* TypeLiteral */:
+                    case 165 /* TypeReference */:
+                    case 170 /* ArrayType */:
+                    case 171 /* TupleType */:
+                    case 174 /* UnionType */:
+                    case 175 /* IntersectionType */:
+                    case 178 /* ParenthesizedType */:
                         return isDeclarationVisible(node.parent);
                     // Default binding, import specifier and namespace import is visible
                     // only on demand so by default it is not visible
-                    case 250 /* ImportClause */:
-                    case 251 /* NamespaceImport */:
-                    case 253 /* ImportSpecifier */:
+                    case 251 /* ImportClause */:
+                    case 252 /* NamespaceImport */:
+                    case 254 /* ImportSpecifier */:
                         return false;
                     // Type parameters are always visible
-                    case 150 /* TypeParameter */:
+                    case 151 /* TypeParameter */:
                     // Source file and namespace export are always visible
-                    case 284 /* SourceFile */:
-                    case 247 /* NamespaceExportDeclaration */:
+                    case 285 /* SourceFile */:
+                    case 248 /* NamespaceExportDeclaration */:
                         return true;
                     // Export assignments do not create name bindings outside the module
-                    case 254 /* ExportAssignment */:
+                    case 255 /* ExportAssignment */:
                         return false;
                     default:
                         return false;
@@ -35310,10 +35973,10 @@ var ts;
         }
         function collectLinkedAliases(node, setVisibility) {
             var exportSymbol;
-            if (node.parent && node.parent.kind === 254 /* ExportAssignment */) {
+            if (node.parent && node.parent.kind === 255 /* ExportAssignment */) {
                 exportSymbol = resolveName(node, node.escapedText, 67220415 /* Value */ | 67897832 /* Type */ | 1920 /* Namespace */ | 2097152 /* Alias */, /*nameNotFoundMessage*/ undefined, node, /*isUse*/ false);
             }
-            else if (node.parent.kind === 257 /* ExportSpecifier */) {
+            else if (node.parent.kind === 258 /* ExportSpecifier */) {
                 exportSymbol = getTargetOfExportSpecifier(node.parent, 67220415 /* Value */ | 67897832 /* Type */ | 1920 /* Namespace */ | 2097152 /* Alias */);
             }
             var result;
@@ -35409,12 +36072,12 @@ var ts;
         function getDeclarationContainer(node) {
             return ts.findAncestor(ts.getRootDeclaration(node), function (node) {
                 switch (node.kind) {
-                    case 237 /* VariableDeclaration */:
-                    case 238 /* VariableDeclarationList */:
-                    case 253 /* ImportSpecifier */:
-                    case 252 /* NamedImports */:
-                    case 251 /* NamespaceImport */:
-                    case 250 /* ImportClause */:
+                    case 238 /* VariableDeclaration */:
+                    case 239 /* VariableDeclarationList */:
+                    case 254 /* ImportSpecifier */:
+                    case 253 /* NamedImports */:
+                    case 252 /* NamespaceImport */:
+                    case 251 /* ImportClause */:
                         return false;
                     default:
                         return true;
@@ -35447,7 +36110,7 @@ var ts;
             return symbol && getSymbolLinks(symbol).type || getTypeForVariableLikeDeclaration(node, /*includeOptionality*/ false);
         }
         function isComputedNonLiteralName(name) {
-            return name.kind === 149 /* ComputedPropertyName */ && !ts.isStringOrNumericLiteralLike(name.expression);
+            return name.kind === 150 /* ComputedPropertyName */ && !ts.isStringOrNumericLiteralLike(name.expression);
         }
         function getRestType(source, properties, symbol) {
             source = filterType(source, function (t) { return !(t.flags & 98304 /* Nullable */); });
@@ -35462,13 +36125,11 @@ var ts;
                 if (omitKeyType.flags & 131072 /* Never */) {
                     return source;
                 }
-                var pickTypeAlias = getGlobalPickSymbol();
-                var excludeTypeAlias = getGlobalExcludeSymbol();
-                if (!pickTypeAlias || !excludeTypeAlias) {
+                var omitTypeAlias = getGlobalOmitSymbol();
+                if (!omitTypeAlias) {
                     return errorType;
                 }
-                var pickKeys = getTypeAliasInstantiation(excludeTypeAlias, [getIndexType(source), omitKeyType]);
-                return getTypeAliasInstantiation(pickTypeAlias, [source, pickKeys]);
+                return getTypeAliasInstantiation(omitTypeAlias, [source, omitKeyType]);
             }
             var members = ts.createSymbolTable();
             for (var _i = 0, _a = getPropertiesOfType(source); _i < _a.length; _i++) {
@@ -35501,7 +36162,7 @@ var ts;
             if (parentAccess && parentAccess.flowNode) {
                 var propName = getDestructuringPropertyName(node);
                 if (propName) {
-                    var result = ts.createNode(190 /* ElementAccessExpression */, node.pos, node.end);
+                    var result = ts.createNode(191 /* ElementAccessExpression */, node.pos, node.end);
                     result.parent = node;
                     result.expression = parentAccess;
                     var literal = ts.createNode(10 /* StringLiteral */, node.pos, node.end);
@@ -35516,23 +36177,23 @@ var ts;
         function getParentElementAccess(node) {
             var ancestor = node.parent.parent;
             switch (ancestor.kind) {
-                case 186 /* BindingElement */:
-                case 275 /* PropertyAssignment */:
+                case 187 /* BindingElement */:
+                case 276 /* PropertyAssignment */:
                     return getSyntheticElementAccess(ancestor);
-                case 187 /* ArrayLiteralExpression */:
+                case 188 /* ArrayLiteralExpression */:
                     return getSyntheticElementAccess(node.parent);
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     return ancestor.initializer;
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return ancestor.right;
             }
         }
         function getDestructuringPropertyName(node) {
             var parent = node.parent;
-            if (node.kind === 186 /* BindingElement */ && parent.kind === 184 /* ObjectBindingPattern */) {
+            if (node.kind === 187 /* BindingElement */ && parent.kind === 185 /* ObjectBindingPattern */) {
                 return getLiteralPropertyNameText(node.propertyName || node.name);
             }
-            if (node.kind === 275 /* PropertyAssignment */ || node.kind === 276 /* ShorthandPropertyAssignment */) {
+            if (node.kind === 276 /* PropertyAssignment */ || node.kind === 277 /* ShorthandPropertyAssignment */) {
                 return getLiteralPropertyNameText(node.name);
             }
             return "" + parent.elements.indexOf(node);
@@ -35554,7 +36215,7 @@ var ts;
                 parentType = getNonNullableType(parentType);
             }
             var type;
-            if (pattern.kind === 184 /* ObjectBindingPattern */) {
+            if (pattern.kind === 185 /* ObjectBindingPattern */) {
                 if (declaration.dotDotDotToken) {
                     if (parentType.flags & 2 /* Unknown */ || !isValidSpreadType(parentType)) {
                         error(declaration, ts.Diagnostics.Rest_types_may_only_be_created_from_object_types);
@@ -35581,7 +36242,7 @@ var ts;
                 // This elementType will be used if the specific property corresponding to this index is not
                 // present (aka the tuple element property). This call also checks that the parentType is in
                 // fact an iterable or array (depending on target language).
-                var elementType = checkIteratedTypeOrElementType(parentType, pattern, /*allowStringInput*/ false, /*allowAsyncIterables*/ false);
+                var elementType = checkIteratedTypeOrElementType(65 /* Destructuring */, parentType, undefinedType, pattern);
                 var index_1 = pattern.elements.indexOf(declaration);
                 if (declaration.dotDotDotToken) {
                     // If the parent is a tuple type, the rest element has a tuple type of the
@@ -35593,21 +36254,25 @@ var ts;
                 }
                 else if (isArrayLikeType(parentType)) {
                     var indexType = getLiteralType(index_1);
-                    var declaredType = getConstraintForLocation(getIndexedAccessType(parentType, indexType, declaration.name), declaration.name);
+                    var accessFlags = hasDefaultValue(declaration) ? 8 /* NoTupleBoundsCheck */ : 0;
+                    var declaredType = getConstraintForLocation(getIndexedAccessTypeOrUndefined(parentType, indexType, declaration.name, accessFlags) || errorType, declaration.name);
                     type = getFlowTypeOfDestructuring(declaration, declaredType);
                 }
                 else {
                     type = elementType;
                 }
             }
-            // In strict null checking mode, if a default value of a non-undefined type is specified, remove
-            // undefined from the final type.
-            if (strictNullChecks && declaration.initializer && !(getFalsyFlags(checkDeclarationInitializer(declaration)) & 32768 /* Undefined */)) {
-                type = getTypeWithFacts(type, 524288 /* NEUndefined */);
+            if (!declaration.initializer) {
+                return type;
             }
-            return declaration.initializer && !ts.getEffectiveTypeAnnotationNode(ts.walkUpBindingElementsAndPatterns(declaration)) ?
-                getUnionType([type, checkDeclarationInitializer(declaration)], 2 /* Subtype */) :
-                type;
+            if (ts.getEffectiveTypeAnnotationNode(ts.walkUpBindingElementsAndPatterns(declaration))) {
+                // In strict null checking mode, if a default value of a non-undefined type is specified, remove
+                // undefined from the final type.
+                return strictNullChecks && !(getFalsyFlags(checkDeclarationInitializer(declaration)) & 32768 /* Undefined */) ?
+                    getTypeWithFacts(type, 524288 /* NEUndefined */) :
+                    type;
+            }
+            return getUnionType([getTypeWithFacts(type, 524288 /* NEUndefined */), checkDeclarationInitializer(declaration)], 2 /* Subtype */);
         }
         function getTypeForDeclarationFromJSDocComment(declaration) {
             var jsdocType = ts.getJSDocType(declaration);
@@ -35618,30 +36283,30 @@ var ts;
         }
         function isNullOrUndefined(node) {
             var expr = ts.skipParentheses(node);
-            return expr.kind === 96 /* NullKeyword */ || expr.kind === 72 /* Identifier */ && getResolvedSymbol(expr) === undefinedSymbol;
+            return expr.kind === 97 /* NullKeyword */ || expr.kind === 73 /* Identifier */ && getResolvedSymbol(expr) === undefinedSymbol;
         }
         function isEmptyArrayLiteral(node) {
             var expr = ts.skipParentheses(node);
-            return expr.kind === 187 /* ArrayLiteralExpression */ && expr.elements.length === 0;
+            return expr.kind === 188 /* ArrayLiteralExpression */ && expr.elements.length === 0;
         }
         function addOptionality(type, optional) {
             if (optional === void 0) { optional = true; }
             return strictNullChecks && optional ? getOptionalType(type) : type;
         }
         function isParameterOfContextuallyTypedFunction(node) {
-            return node.kind === 151 /* Parameter */ &&
-                (node.parent.kind === 196 /* FunctionExpression */ || node.parent.kind === 197 /* ArrowFunction */) &&
+            return node.kind === 152 /* Parameter */ &&
+                (node.parent.kind === 197 /* FunctionExpression */ || node.parent.kind === 198 /* ArrowFunction */) &&
                 !!getContextualType(node.parent);
         }
         // Return the inferred type for a variable, parameter, or property declaration
         function getTypeForVariableLikeDeclaration(declaration, includeOptionality) {
             // A variable declared in a for..in statement is of type string, or of type keyof T when the
             // right hand expression is of a type parameter type.
-            if (ts.isVariableDeclaration(declaration) && declaration.parent.parent.kind === 226 /* ForInStatement */) {
+            if (ts.isVariableDeclaration(declaration) && declaration.parent.parent.kind === 227 /* ForInStatement */) {
                 var indexType = getIndexType(getNonNullableTypeIfNeeded(checkExpression(declaration.parent.parent.expression)));
                 return indexType.flags & (262144 /* TypeParameter */ | 4194304 /* Index */) ? getExtractStringType(indexType) : stringType;
             }
-            if (ts.isVariableDeclaration(declaration) && declaration.parent.parent.kind === 227 /* ForOfStatement */) {
+            if (ts.isVariableDeclaration(declaration) && declaration.parent.parent.kind === 228 /* ForOfStatement */) {
                 // checkRightHandSideOfForOf will return undefined if the for-of expression type was
                 // missing properties/signatures required to get its iteratedType (like
                 // [Symbol.iterator] or next). This may be because we accessed properties from anyType,
@@ -35660,7 +36325,7 @@ var ts;
                 return addOptionality(declaredType, isOptional);
             }
             if ((noImplicitAny || ts.isInJSFile(declaration)) &&
-                declaration.kind === 237 /* VariableDeclaration */ && !ts.isBindingPattern(declaration.name) &&
+                declaration.kind === 238 /* VariableDeclaration */ && !ts.isBindingPattern(declaration.name) &&
                 !(ts.getCombinedModifierFlags(declaration) & 1 /* Export */) && !(declaration.flags & 4194304 /* Ambient */)) {
                 // If --noImplicitAny is on or the declaration is in a Javascript file,
                 // use control flow tracked 'any' type for non-ambient, non-exported var or let variables with no
@@ -35674,11 +36339,11 @@ var ts;
                     return autoArrayType;
                 }
             }
-            if (declaration.kind === 151 /* Parameter */) {
+            if (declaration.kind === 152 /* Parameter */) {
                 var func = declaration.parent;
                 // For a parameter of a set accessor, use the type of the get accessor if one is present
-                if (func.kind === 159 /* SetAccessor */ && !hasNonBindableDynamicName(func)) {
-                    var getter = ts.getDeclarationOfKind(getSymbolOfNode(declaration.parent), 158 /* GetAccessor */);
+                if (func.kind === 160 /* SetAccessor */ && !hasNonBindableDynamicName(func)) {
+                    var getter = ts.getDeclarationOfKind(getSymbolOfNode(declaration.parent), 159 /* GetAccessor */);
                     if (getter) {
                         var getterSignature = getSignatureFromDeclaration(getter);
                         var thisParameter = getAccessorThisParameter(func);
@@ -35697,7 +36362,7 @@ var ts;
                     }
                 }
                 // Use contextual parameter type if one is available
-                var type = declaration.symbol.escapedName === "this" /* This */ ? getContextualThisParameterType(func) : getContextuallyTypedParameterType(declaration);
+                var type = declaration.symbol.escapedName === "this" /* This */ ? getContextualThisParameterType(func) : getContextuallyTypedParameterType(declaration, /*forCache*/ true);
                 if (type) {
                     return addOptionality(type, isOptional);
                 }
@@ -35727,7 +36392,7 @@ var ts;
             // No type specified and nothing can be inferred
             return undefined;
         }
-        function getWidenedTypeFromAssignmentDeclaration(symbol, resolvedSymbol) {
+        function getWidenedTypeForAssignmentDeclaration(symbol, resolvedSymbol) {
             // function/class/{} initializers are themselves containers, so they won't merge in the same way as other initializers
             var container = ts.getAssignedExpandoInitializer(symbol.valueDeclaration);
             if (container) {
@@ -35760,7 +36425,7 @@ var ts;
                     }
                 }
                 if (!ts.isCallExpression(expression)) {
-                    jsdocType = getJSDocTypeFromAssignmentDeclaration(jsdocType, expression, symbol, declaration);
+                    jsdocType = getAnnotatedTypeForAssignmentDeclaration(jsdocType, expression, symbol, declaration);
                 }
                 if (!jsdocType) {
                     (types || (types = [])).push((ts.isBinaryExpression(expression) || ts.isCallExpression(expression)) ? getInitializerTypeFromAssignmentDeclaration(symbol, resolvedSymbol, expression, kind) : neverType);
@@ -35807,15 +36472,21 @@ var ts;
             type.objectFlags |= 16384 /* JSLiteral */;
             return type;
         }
-        function getJSDocTypeFromAssignmentDeclaration(declaredType, expression, _symbol, declaration) {
-            var typeNode = ts.getJSDocType(expression.parent);
+        function getAnnotatedTypeForAssignmentDeclaration(declaredType, expression, symbol, declaration) {
+            var typeNode = ts.getEffectiveTypeAnnotationNode(expression.parent);
             if (typeNode) {
                 var type = getWidenedType(getTypeFromTypeNode(typeNode));
                 if (!declaredType) {
                     return type;
                 }
                 else if (declaredType !== errorType && type !== errorType && !isTypeIdenticalTo(declaredType, type)) {
-                    errorNextVariableOrPropertyDeclarationMustHaveSameType(declaredType, declaration, type);
+                    errorNextVariableOrPropertyDeclarationMustHaveSameType(/*firstDeclaration*/ undefined, declaredType, declaration, type);
+                }
+            }
+            if (symbol.parent) {
+                var typeNode_2 = ts.getEffectiveTypeAnnotationNode(symbol.parent.valueDeclaration);
+                if (typeNode_2) {
+                    return getTypeOfPropertyOfType(getTypeFromTypeNode(typeNode_2), symbol.escapedName);
                 }
             }
             return declaredType;
@@ -35882,9 +36553,9 @@ var ts;
             var thisContainer = ts.getThisContainer(expression, /*includeArrowFunctions*/ false);
             // Properties defined in a constructor (or base constructor, or javascript constructor function) don't get undefined added.
             // Function expressions that are assigned to the prototype count as methods.
-            return thisContainer.kind === 157 /* Constructor */ ||
-                thisContainer.kind === 239 /* FunctionDeclaration */ ||
-                (thisContainer.kind === 196 /* FunctionExpression */ && !ts.isPrototypePropertyAssignment(thisContainer.parent));
+            return thisContainer.kind === 158 /* Constructor */ ||
+                thisContainer.kind === 240 /* FunctionDeclaration */ ||
+                (thisContainer.kind === 197 /* FunctionExpression */ && !ts.isPrototypePropertyAssignment(thisContainer.parent));
         }
         function getConstructorDefinedThisAssignmentTypes(types, declarations) {
             ts.Debug.assert(types.length === declarations.length);
@@ -35928,7 +36599,7 @@ var ts;
         function getTypeFromObjectBindingPattern(pattern, includePatternInType, reportErrors) {
             var members = ts.createSymbolTable();
             var stringIndexInfo;
-            var objectFlags = 128 /* ObjectLiteral */ | 262144 /* ContainsObjectLiteral */;
+            var objectFlags = 128 /* ObjectLiteral */ | 524288 /* ContainsObjectOrArrayLiteral */;
             ts.forEach(pattern.elements, function (e) {
                 var name = e.propertyName || e.name;
                 if (e.dotDotDotToken) {
@@ -35959,7 +36630,7 @@ var ts;
         function getTypeFromArrayBindingPattern(pattern, includePatternInType, reportErrors) {
             var elements = pattern.elements;
             var lastElement = ts.lastOrUndefined(elements);
-            var hasRestElement = !!(lastElement && lastElement.kind === 186 /* BindingElement */ && lastElement.dotDotDotToken);
+            var hasRestElement = !!(lastElement && lastElement.kind === 187 /* BindingElement */ && lastElement.dotDotDotToken);
             if (elements.length === 0 || elements.length === 1 && hasRestElement) {
                 return languageVersion >= 2 /* ES2015 */ ? createIterableType(anyType) : anyArrayType;
             }
@@ -35982,7 +36653,7 @@ var ts;
         function getTypeFromBindingPattern(pattern, includePatternInType, reportErrors) {
             if (includePatternInType === void 0) { includePatternInType = false; }
             if (reportErrors === void 0) { reportErrors = false; }
-            return pattern.kind === 184 /* ObjectBindingPattern */
+            return pattern.kind === 185 /* ObjectBindingPattern */
                 ? getTypeFromObjectBindingPattern(pattern, includePatternInType, reportErrors)
                 : getTypeFromArrayBindingPattern(pattern, includePatternInType, reportErrors);
         }
@@ -36021,7 +36692,7 @@ var ts;
         }
         function declarationBelongsToPrivateAmbientMember(declaration) {
             var root = ts.getRootDeclaration(declaration);
-            var memberDeclaration = root.kind === 151 /* Parameter */ ? root.parent : root;
+            var memberDeclaration = root.kind === 152 /* Parameter */ ? root.parent : root;
             return isPrivateWithinAmbient(memberDeclaration);
         }
         function tryGetTypeFromEffectiveTypeNode(declaration) {
@@ -36074,9 +36745,6 @@ var ts;
                 }
                 return type_1;
             }
-            if (declaration.kind === 254 /* ExportAssignment */) {
-                return widenTypeForVariableLikeDeclaration(checkExpressionCached(declaration.expression), declaration);
-            }
             // Handle variable, parameter or property
             if (!pushTypeResolution(symbol, 0 /* Type */)) {
                 // Symbol is property of some kind that is merged with something - should use `getTypeOfFuncClassEnumModule` and not `getTypeOfVariableOrParameterOrProperty`
@@ -36086,9 +36754,12 @@ var ts;
                 return reportCircularityError(symbol);
             }
             var type;
-            if (ts.isInJSFile(declaration) &&
+            if (declaration.kind === 255 /* ExportAssignment */) {
+                type = widenTypeForVariableLikeDeclaration(checkExpressionCached(declaration.expression), declaration);
+            }
+            else if (ts.isInJSFile(declaration) &&
                 (ts.isCallExpression(declaration) || ts.isBinaryExpression(declaration) || ts.isPropertyAccessExpression(declaration) && ts.isBinaryExpression(declaration.parent))) {
-                type = getWidenedTypeFromAssignmentDeclaration(symbol);
+                type = getWidenedTypeForAssignmentDeclaration(symbol);
             }
             else if (ts.isJSDocPropertyLikeTag(declaration)
                 || ts.isPropertyAccessExpression(declaration)
@@ -36103,7 +36774,7 @@ var ts;
                     return getTypeOfFuncClassEnumModule(symbol);
                 }
                 type = ts.isBinaryExpression(declaration.parent) ?
-                    getWidenedTypeFromAssignmentDeclaration(symbol) :
+                    getWidenedTypeForAssignmentDeclaration(symbol) :
                     tryGetTypeFromEffectiveTypeNode(declaration) || anyType;
             }
             else if (ts.isPropertyAssignment(declaration)) {
@@ -36134,7 +36805,7 @@ var ts;
                 type = getTypeOfEnumMember(symbol);
             }
             else {
-                return ts.Debug.fail("Unhandled declaration kind! " + ts.Debug.showSyntaxKind(declaration) + " for " + ts.Debug.showSymbol(symbol));
+                return ts.Debug.fail("Unhandled declaration kind! " + ts.Debug.formatSyntaxKind(declaration.kind) + " for " + ts.Debug.formatSymbol(symbol));
             }
             if (!popTypeResolution()) {
                 // Symbol is property of some kind that is merged with something - should use `getTypeOfFuncClassEnumModule` and not `getTypeOfVariableOrParameterOrProperty`
@@ -36147,7 +36818,7 @@ var ts;
         }
         function getAnnotatedAccessorTypeNode(accessor) {
             if (accessor) {
-                if (accessor.kind === 158 /* GetAccessor */) {
+                if (accessor.kind === 159 /* GetAccessor */) {
                     var getterTypeAnnotation = ts.getEffectiveReturnTypeNode(accessor);
                     return getterTypeAnnotation;
                 }
@@ -36174,8 +36845,8 @@ var ts;
             return links.type || (links.type = getTypeOfAccessorsWorker(symbol));
         }
         function getTypeOfAccessorsWorker(symbol) {
-            var getter = ts.getDeclarationOfKind(symbol, 158 /* GetAccessor */);
-            var setter = ts.getDeclarationOfKind(symbol, 159 /* SetAccessor */);
+            var getter = ts.getDeclarationOfKind(symbol, 159 /* GetAccessor */);
+            var setter = ts.getDeclarationOfKind(symbol, 160 /* SetAccessor */);
             if (getter && ts.isInJSFile(getter)) {
                 var jsDocType = getTypeForDeclarationFromJSDocComment(getter);
                 if (jsDocType) {
@@ -36218,7 +36889,7 @@ var ts;
             if (!popTypeResolution()) {
                 type = anyType;
                 if (noImplicitAny) {
-                    var getter_1 = ts.getDeclarationOfKind(symbol, 158 /* GetAccessor */);
+                    var getter_1 = ts.getDeclarationOfKind(symbol, 159 /* GetAccessor */);
                     error(getter_1, ts.Diagnostics._0_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions, symbolToString(symbol));
                 }
             }
@@ -36258,9 +36929,9 @@ var ts;
             if (symbol.flags & 1536 /* Module */ && ts.isShorthandAmbientModuleSymbol(symbol)) {
                 return anyType;
             }
-            else if (declaration.kind === 204 /* BinaryExpression */ ||
-                declaration.kind === 189 /* PropertyAccessExpression */ && declaration.parent.kind === 204 /* BinaryExpression */) {
-                return getWidenedTypeFromAssignmentDeclaration(symbol);
+            else if (declaration.kind === 205 /* BinaryExpression */ ||
+                declaration.kind === 190 /* PropertyAccessExpression */ && declaration.parent.kind === 205 /* BinaryExpression */) {
+                return getWidenedTypeForAssignmentDeclaration(symbol);
             }
             else if (symbol.flags & 512 /* ValueModule */ && declaration && ts.isSourceFile(declaration) && declaration.commonJsModuleIndicator) {
                 var resolvedModule = resolveExternalModuleSymbol(symbol);
@@ -36269,7 +36940,7 @@ var ts;
                         return errorType;
                     }
                     var exportEquals = getMergedSymbol(symbol.exports.get("export=" /* ExportEquals */));
-                    var type_2 = getWidenedTypeFromAssignmentDeclaration(exportEquals, exportEquals === resolvedModule ? undefined : resolvedModule);
+                    var type_2 = getWidenedTypeForAssignmentDeclaration(exportEquals, exportEquals === resolvedModule ? undefined : resolvedModule);
                     if (!popTypeResolution()) {
                         return reportCircularityError(symbol);
                     }
@@ -36326,7 +36997,7 @@ var ts;
                 return errorType;
             }
             // Check if variable has initializer that circularly references the variable itself
-            if (noImplicitAny && (declaration.kind !== 151 /* Parameter */ || declaration.initializer)) {
+            if (noImplicitAny && (declaration.kind !== 152 /* Parameter */ || declaration.initializer)) {
                 error(symbol.valueDeclaration, ts.Diagnostics._0_implicitly_has_type_any_because_it_does_not_have_a_type_annotation_and_is_referenced_directly_or_indirectly_in_its_own_initializer, symbolToString(symbol));
             }
             // Circularities could also result from parameters in function expressions that end up
@@ -36334,11 +37005,23 @@ var ts;
             // we have already reported an implicit any error so we don't report anything here.
             return anyType;
         }
+        function getTypeOfSymbolWithDeferredType(symbol) {
+            var links = getSymbolLinks(symbol);
+            if (!links.type) {
+                ts.Debug.assertDefined(links.deferralParent);
+                ts.Debug.assertDefined(links.deferralConstituents);
+                links.type = links.deferralParent.flags & 1048576 /* Union */ ? getUnionType(links.deferralConstituents) : getIntersectionType(links.deferralConstituents);
+            }
+            return links.type;
+        }
         function getTypeOfSymbol(symbol) {
+            if (ts.getCheckFlags(symbol) & 65536 /* DeferredType */) {
+                return getTypeOfSymbolWithDeferredType(symbol);
+            }
             if (ts.getCheckFlags(symbol) & 1 /* Instantiated */) {
                 return getTypeOfInstantiatedSymbol(symbol);
             }
-            if (ts.getCheckFlags(symbol) & 4096 /* ReverseMapped */) {
+            if (ts.getCheckFlags(symbol) & 8192 /* ReverseMapped */) {
                 return getTypeOfReverseMappedSymbol(symbol);
             }
             if (symbol.flags & (3 /* Variable */ | 4 /* Property */)) {
@@ -36399,35 +37082,35 @@ var ts;
                     return undefined;
                 }
                 switch (node.kind) {
-                    case 240 /* ClassDeclaration */:
-                    case 209 /* ClassExpression */:
-                    case 241 /* InterfaceDeclaration */:
-                    case 160 /* CallSignature */:
-                    case 161 /* ConstructSignature */:
-                    case 155 /* MethodSignature */:
-                    case 165 /* FunctionType */:
-                    case 166 /* ConstructorType */:
-                    case 294 /* JSDocFunctionType */:
-                    case 239 /* FunctionDeclaration */:
-                    case 156 /* MethodDeclaration */:
-                    case 196 /* FunctionExpression */:
-                    case 197 /* ArrowFunction */:
-                    case 242 /* TypeAliasDeclaration */:
-                    case 308 /* JSDocTemplateTag */:
-                    case 309 /* JSDocTypedefTag */:
-                    case 302 /* JSDocCallbackTag */:
-                    case 181 /* MappedType */:
-                    case 175 /* ConditionalType */:
+                    case 241 /* ClassDeclaration */:
+                    case 210 /* ClassExpression */:
+                    case 242 /* InterfaceDeclaration */:
+                    case 161 /* CallSignature */:
+                    case 162 /* ConstructSignature */:
+                    case 156 /* MethodSignature */:
+                    case 166 /* FunctionType */:
+                    case 167 /* ConstructorType */:
+                    case 295 /* JSDocFunctionType */:
+                    case 240 /* FunctionDeclaration */:
+                    case 157 /* MethodDeclaration */:
+                    case 197 /* FunctionExpression */:
+                    case 198 /* ArrowFunction */:
+                    case 243 /* TypeAliasDeclaration */:
+                    case 310 /* JSDocTemplateTag */:
+                    case 311 /* JSDocTypedefTag */:
+                    case 304 /* JSDocCallbackTag */:
+                    case 182 /* MappedType */:
+                    case 176 /* ConditionalType */:
                         var outerTypeParameters = getOuterTypeParameters(node, includeThisTypes);
-                        if (node.kind === 181 /* MappedType */) {
+                        if (node.kind === 182 /* MappedType */) {
                             return ts.append(outerTypeParameters, getDeclaredTypeOfTypeParameter(getSymbolOfNode(node.typeParameter)));
                         }
-                        else if (node.kind === 175 /* ConditionalType */) {
+                        else if (node.kind === 176 /* ConditionalType */) {
                             return ts.concatenate(outerTypeParameters, getInferTypeParameters(node));
                         }
                         var outerAndOwnTypeParameters = appendTypeParameters(outerTypeParameters, ts.getEffectiveTypeParameterDeclarations(node));
                         var thisType = includeThisTypes &&
-                            (node.kind === 240 /* ClassDeclaration */ || node.kind === 209 /* ClassExpression */ || node.kind === 241 /* InterfaceDeclaration */) &&
+                            (node.kind === 241 /* ClassDeclaration */ || node.kind === 210 /* ClassExpression */ || node.kind === 242 /* InterfaceDeclaration */) &&
                             getDeclaredTypeOfClassOrInterface(getSymbolOfNode(node)).thisType;
                         return thisType ? ts.append(outerAndOwnTypeParameters, thisType) : outerAndOwnTypeParameters;
                 }
@@ -36435,7 +37118,7 @@ var ts;
         }
         // The outer type parameters are those defined by enclosing generic classes, methods, or functions.
         function getOuterTypeParametersOfClassOrInterface(symbol) {
-            var declaration = symbol.flags & 32 /* Class */ ? symbol.valueDeclaration : ts.getDeclarationOfKind(symbol, 241 /* InterfaceDeclaration */);
+            var declaration = symbol.flags & 32 /* Class */ ? symbol.valueDeclaration : ts.getDeclarationOfKind(symbol, 242 /* InterfaceDeclaration */);
             return getOuterTypeParameters(declaration);
         }
         // The local type parameters are the combined set of type parameters from all declarations of the class,
@@ -36444,9 +37127,9 @@ var ts;
             var result;
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var node = _a[_i];
-                if (node.kind === 241 /* InterfaceDeclaration */ ||
-                    node.kind === 240 /* ClassDeclaration */ ||
-                    node.kind === 209 /* ClassExpression */ ||
+                if (node.kind === 242 /* InterfaceDeclaration */ ||
+                    node.kind === 241 /* ClassDeclaration */ ||
+                    node.kind === 210 /* ClassExpression */ ||
                     ts.isTypeAlias(node)) {
                     var declaration = node;
                     result = appendTypeParameters(result, ts.getEffectiveTypeParameterDeclarations(declaration));
@@ -36536,7 +37219,7 @@ var ts;
                                 ctorReturn = getReturnTypeOfSignature(ctorSig[0]);
                             }
                         }
-                        addRelatedInfo(err, ts.createDiagnosticForNode(baseConstructorType.symbol.declarations[0], ts.Diagnostics.Did_you_mean_for_0_to_be_constrained_to_type_new_args_Colon_any_1, symbolToString(baseConstructorType.symbol), typeToString(ctorReturn)));
+                        ts.addRelatedInfo(err, ts.createDiagnosticForNode(baseConstructorType.symbol.declarations[0], ts.Diagnostics.Did_you_mean_for_0_to_be_constrained_to_type_new_args_Colon_any_1, symbolToString(baseConstructorType.symbol), typeToString(ctorReturn)));
                     }
                     return type.resolvedBaseConstructorType = errorType;
                 }
@@ -36640,7 +37323,7 @@ var ts;
             type.resolvedBaseTypes = type.resolvedBaseTypes || ts.emptyArray;
             for (var _i = 0, _a = type.symbol.declarations; _i < _a.length; _i++) {
                 var declaration = _a[_i];
-                if (declaration.kind === 241 /* InterfaceDeclaration */ && ts.getInterfaceBaseTypeNodes(declaration)) {
+                if (declaration.kind === 242 /* InterfaceDeclaration */ && ts.getInterfaceBaseTypeNodes(declaration)) {
                     for (var _b = 0, _c = ts.getInterfaceBaseTypeNodes(declaration); _b < _c.length; _b++) {
                         var node = _c[_b];
                         var baseType = getTypeFromTypeNode(node);
@@ -36676,7 +37359,7 @@ var ts;
         function isThislessInterface(symbol) {
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var declaration = _a[_i];
-                if (declaration.kind === 241 /* InterfaceDeclaration */) {
+                if (declaration.kind === 242 /* InterfaceDeclaration */) {
                     if (declaration.flags & 64 /* ContainsThis */) {
                         return false;
                     }
@@ -36733,7 +37416,7 @@ var ts;
                     return errorType;
                 }
                 var declaration = ts.find(symbol.declarations, function (d) {
-                    return ts.isJSDocTypeAlias(d) || d.kind === 242 /* TypeAliasDeclaration */;
+                    return ts.isJSDocTypeAlias(d) || d.kind === 243 /* TypeAliasDeclaration */;
                 });
                 var typeNode = ts.isJSDocTypeAlias(declaration) ? declaration.typeExpression : declaration.type;
                 // If typeNode is missing, we will error in checkJSDocTypedefTag.
@@ -36760,7 +37443,7 @@ var ts;
             if (expr.kind === 10 /* StringLiteral */) {
                 return true;
             }
-            else if (expr.kind === 204 /* BinaryExpression */) {
+            else if (expr.kind === 205 /* BinaryExpression */) {
                 return isStringConcatExpression(expr.left) && isStringConcatExpression(expr.right);
             }
             return false;
@@ -36774,12 +37457,12 @@ var ts;
                 case 10 /* StringLiteral */:
                 case 8 /* NumericLiteral */:
                     return true;
-                case 202 /* PrefixUnaryExpression */:
+                case 203 /* PrefixUnaryExpression */:
                     return expr.operator === 39 /* MinusToken */ &&
                         expr.operand.kind === 8 /* NumericLiteral */;
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return ts.nodeIsMissing(expr) || !!getSymbolOfNode(member.parent).exports.get(expr.escapedText);
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return isStringConcatExpression(expr);
                 default:
                     return false;
@@ -36793,7 +37476,7 @@ var ts;
             var hasNonLiteralMember = false;
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var declaration = _a[_i];
-                if (declaration.kind === 243 /* EnumDeclaration */) {
+                if (declaration.kind === 244 /* EnumDeclaration */) {
                     for (var _b = 0, _c = declaration.members; _b < _c.length; _b++) {
                         var member = _c[_b];
                         if (member.initializer && member.initializer.kind === 10 /* StringLiteral */) {
@@ -36820,10 +37503,11 @@ var ts;
                 var memberTypeList = [];
                 for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                     var declaration = _a[_i];
-                    if (declaration.kind === 243 /* EnumDeclaration */) {
+                    if (declaration.kind === 244 /* EnumDeclaration */) {
                         for (var _b = 0, _c = declaration.members; _b < _c.length; _b++) {
                             var member = _c[_b];
-                            var memberType = getFreshTypeOfLiteralType(getLiteralType(getEnumMemberValue(member), enumCount, getSymbolOfNode(member))); // TODO: GH#18217
+                            var value = getEnumMemberValue(member);
+                            var memberType = getFreshTypeOfLiteralType(getLiteralType(value !== undefined ? value : 0, enumCount, getSymbolOfNode(member)));
                             getSymbolLinks(getSymbolOfNode(member)).declaredType = memberType;
                             memberTypeList.push(getRegularTypeOfLiteralType(memberType));
                         }
@@ -36891,23 +37575,23 @@ var ts;
          */
         function isThislessType(node) {
             switch (node.kind) {
-                case 120 /* AnyKeyword */:
-                case 143 /* UnknownKeyword */:
-                case 138 /* StringKeyword */:
-                case 135 /* NumberKeyword */:
-                case 146 /* BigIntKeyword */:
-                case 123 /* BooleanKeyword */:
-                case 139 /* SymbolKeyword */:
-                case 136 /* ObjectKeyword */:
-                case 106 /* VoidKeyword */:
-                case 141 /* UndefinedKeyword */:
-                case 96 /* NullKeyword */:
-                case 132 /* NeverKeyword */:
-                case 182 /* LiteralType */:
+                case 121 /* AnyKeyword */:
+                case 144 /* UnknownKeyword */:
+                case 139 /* StringKeyword */:
+                case 136 /* NumberKeyword */:
+                case 147 /* BigIntKeyword */:
+                case 124 /* BooleanKeyword */:
+                case 140 /* SymbolKeyword */:
+                case 137 /* ObjectKeyword */:
+                case 107 /* VoidKeyword */:
+                case 142 /* UndefinedKeyword */:
+                case 97 /* NullKeyword */:
+                case 133 /* NeverKeyword */:
+                case 183 /* LiteralType */:
                     return true;
-                case 169 /* ArrayType */:
+                case 170 /* ArrayType */:
                     return isThislessType(node.elementType);
-                case 164 /* TypeReference */:
+                case 165 /* TypeReference */:
                     return !node.typeArguments || node.typeArguments.every(isThislessType);
             }
             return false;
@@ -36933,7 +37617,7 @@ var ts;
         function isThislessFunctionLikeDeclaration(node) {
             var returnType = ts.getEffectiveReturnTypeNode(node);
             var typeParameters = ts.getEffectiveTypeParameterDeclarations(node);
-            return (node.kind === 157 /* Constructor */ || (!!returnType && isThislessType(returnType))) &&
+            return (node.kind === 158 /* Constructor */ || (!!returnType && isThislessType(returnType))) &&
                 node.parameters.every(isThislessVariableLikeDeclaration) &&
                 typeParameters.every(isThislessTypeParameter);
         }
@@ -36949,14 +37633,14 @@ var ts;
                 var declaration = symbol.declarations[0];
                 if (declaration) {
                     switch (declaration.kind) {
-                        case 154 /* PropertyDeclaration */:
-                        case 153 /* PropertySignature */:
+                        case 155 /* PropertyDeclaration */:
+                        case 154 /* PropertySignature */:
                             return isThislessVariableLikeDeclaration(declaration);
-                        case 156 /* MethodDeclaration */:
-                        case 155 /* MethodSignature */:
-                        case 157 /* Constructor */:
-                        case 158 /* GetAccessor */:
-                        case 159 /* SetAccessor */:
+                        case 157 /* MethodDeclaration */:
+                        case 156 /* MethodSignature */:
+                        case 158 /* Constructor */:
+                        case 159 /* GetAccessor */:
+                        case 160 /* SetAccessor */:
                             return isThislessFunctionLikeDeclaration(declaration);
                     }
                 }
@@ -37057,7 +37741,7 @@ var ts;
          * members.
          */
         function addDeclarationToLateBoundSymbol(symbol, member, symbolFlags) {
-            ts.Debug.assert(!!(ts.getCheckFlags(symbol) & 2048 /* Late */), "Expected a late-bound symbol.");
+            ts.Debug.assert(!!(ts.getCheckFlags(symbol) & 4096 /* Late */), "Expected a late-bound symbol.");
             symbol.flags |= symbolFlags;
             getSymbolLinks(member.symbol).lateSymbol = symbol;
             if (!symbol.declarations) {
@@ -37114,7 +37798,7 @@ var ts;
                     // Get or add a late-bound symbol for the member. This allows us to merge late-bound accessor declarations.
                     var lateSymbol = lateSymbols.get(memberName);
                     if (!lateSymbol)
-                        lateSymbols.set(memberName, lateSymbol = createSymbol(0 /* None */, memberName, 2048 /* Late */));
+                        lateSymbols.set(memberName, lateSymbol = createSymbol(0 /* None */, memberName, 4096 /* Late */));
                     // Report an error if a late-bound member has the same name as an early-bound member,
                     // or if we have another early-bound symbol declaration with the same name and
                     // conflicting flags.
@@ -37126,7 +37810,7 @@ var ts;
                         var name_3 = !(type.flags & 8192 /* UniqueESSymbol */) && ts.unescapeLeadingUnderscores(memberName) || ts.declarationNameToString(decl.name);
                         ts.forEach(declarations, function (declaration) { return error(ts.getNameOfDeclaration(declaration) || declaration, ts.Diagnostics.Property_0_was_also_declared_here, name_3); });
                         error(decl.name || decl, ts.Diagnostics.Duplicate_property_0, name_3);
-                        lateSymbol = createSymbol(0 /* None */, memberName, 2048 /* Late */);
+                        lateSymbol = createSymbol(0 /* None */, memberName, 4096 /* Late */);
                     }
                     lateSymbol.nameType = type;
                     addDeclarationToLateBoundSymbol(lateSymbol, decl, symbolFlags);
@@ -37191,11 +37875,12 @@ var ts;
                 var links = getSymbolLinks(symbol);
                 if (!links.lateSymbol && ts.some(symbol.declarations, hasLateBindableName)) {
                     // force late binding of members/exports. This will set the late-bound symbol
+                    var parent = getMergedSymbol(symbol.parent);
                     if (ts.some(symbol.declarations, ts.hasStaticModifier)) {
-                        getExportsOfSymbol(symbol.parent);
+                        getExportsOfSymbol(parent);
                     }
                     else {
-                        getMembersOfSymbol(symbol.parent);
+                        getMembersOfSymbol(parent);
                     }
                 }
                 return links.lateSymbol || (links.lateSymbol = symbol);
@@ -37288,8 +37973,18 @@ var ts;
             return sig;
         }
         function cloneSignature(sig) {
-            return createSignature(sig.declaration, sig.typeParameters, sig.thisParameter, sig.parameters, /*resolvedReturnType*/ undefined, 
+            var result = createSignature(sig.declaration, sig.typeParameters, sig.thisParameter, sig.parameters, /*resolvedReturnType*/ undefined, 
             /*resolvedTypePredicate*/ undefined, sig.minArgumentCount, sig.hasRestParameter, sig.hasLiteralTypes);
+            result.target = sig.target;
+            result.mapper = sig.mapper;
+            return result;
+        }
+        function createUnionSignature(signature, unionSignatures) {
+            var result = cloneSignature(signature);
+            result.unionSignatures = unionSignatures;
+            result.target = undefined;
+            result.mapper = undefined;
+            return result;
         }
         function getExpandedParameters(sig) {
             if (sig.hasRestParameter) {
@@ -37302,8 +37997,8 @@ var ts;
                     var tupleRestIndex_1 = restType.target.hasRestElement ? elementTypes.length - 1 : -1;
                     var restParams = ts.map(elementTypes, function (t, i) {
                         var name = getParameterNameAtPosition(sig, restIndex_1 + i);
-                        var checkFlags = i === tupleRestIndex_1 ? 16384 /* RestParameter */ :
-                            i >= minLength_1 ? 8192 /* OptionalParameter */ : 0;
+                        var checkFlags = i === tupleRestIndex_1 ? 32768 /* RestParameter */ :
+                            i >= minLength_1 ? 16384 /* OptionalParameter */ : 0;
                         var symbol = createSymbol(1 /* FunctionScopedVariable */, name, checkFlags);
                         symbol.type = i === tupleRestIndex_1 ? createArrayType(t) : t;
                         return symbol;
@@ -37393,14 +38088,13 @@ var ts;
                             // Union the result types when more than one signature matches
                             if (unionSignatures.length > 1) {
                                 var thisParameter = signature.thisParameter;
-                                if (ts.forEach(unionSignatures, function (sig) { return sig.thisParameter; })) {
-                                    // TODO: GH#18217 We tested that *some* has thisParameter and now act as if *all* do
+                                var firstThisParameterOfUnionSignatures = ts.forEach(unionSignatures, function (sig) { return sig.thisParameter; });
+                                if (firstThisParameterOfUnionSignatures) {
                                     var thisType = getUnionType(ts.map(unionSignatures, function (sig) { return sig.thisParameter ? getTypeOfSymbol(sig.thisParameter) : anyType; }), 2 /* Subtype */);
-                                    thisParameter = createSymbolWithType(signature.thisParameter, thisType);
+                                    thisParameter = createSymbolWithType(firstThisParameterOfUnionSignatures, thisType);
                                 }
-                                s = cloneSignature(signature);
+                                s = createUnionSignature(signature, unionSignatures);
                                 s.thisParameter = thisParameter;
-                                s.unionSignatures = unionSignatures;
                             }
                             (result || (result = [])).push(s);
                         }
@@ -37445,9 +38139,11 @@ var ts;
             return createSymbolWithType(left, thisType);
         }
         function combineUnionParameters(left, right) {
-            var longest = getParameterCount(left) >= getParameterCount(right) ? left : right;
+            var leftCount = getParameterCount(left);
+            var rightCount = getParameterCount(right);
+            var longest = leftCount >= rightCount ? left : right;
             var shorter = longest === left ? right : left;
-            var longestCount = getParameterCount(longest);
+            var longestCount = longest === left ? leftCount : rightCount;
             var eitherHasEffectiveRest = (hasEffectiveRestParameter(left) || hasEffectiveRestParameter(right));
             var needsExtraRestElement = eitherHasEffectiveRest && !hasEffectiveRestParameter(longest);
             var params = new Array(longestCount + (needsExtraRestElement ? 1 : 0));
@@ -37457,9 +38153,13 @@ var ts;
                 var unionParamType = getIntersectionType([longestParamType, shorterParamType]);
                 var isRestParam = eitherHasEffectiveRest && !needsExtraRestElement && i === (longestCount - 1);
                 var isOptional = i >= getMinArgumentCount(longest) && i >= getMinArgumentCount(shorter);
-                var leftName = getParameterNameAtPosition(left, i);
-                var rightName = getParameterNameAtPosition(right, i);
-                var paramSymbol = createSymbol(1 /* FunctionScopedVariable */ | (isOptional && !isRestParam ? 16777216 /* Optional */ : 0), leftName === rightName ? leftName : "arg" + i);
+                var leftName = i >= leftCount ? undefined : getParameterNameAtPosition(left, i);
+                var rightName = i >= rightCount ? undefined : getParameterNameAtPosition(right, i);
+                var paramName = leftName === rightName ? leftName :
+                    !leftName ? rightName :
+                        !rightName ? leftName :
+                            undefined;
+                var paramSymbol = createSymbol(1 /* FunctionScopedVariable */ | (isOptional && !isRestParam ? 16777216 /* Optional */ : 0), paramName || "arg" + i);
                 paramSymbol.type = isRestParam ? createArrayType(unionParamType) : unionParamType;
                 params[i] = paramSymbol;
             }
@@ -37515,13 +38215,22 @@ var ts;
         function unionSpreadIndexInfos(info1, info2) {
             return info1 && info2 && createIndexInfo(getUnionType([info1.type, info2.type]), info1.isReadonly || info2.isReadonly);
         }
-        function includeMixinType(type, types, index) {
+        function findMixins(types) {
+            var constructorTypeCount = ts.countWhere(types, function (t) { return getSignaturesOfType(t, 1 /* Construct */).length > 0; });
+            var mixinFlags = ts.map(types, isMixinConstructorType);
+            if (constructorTypeCount > 0 && constructorTypeCount === ts.countWhere(mixinFlags, function (b) { return b; })) {
+                var firstMixinIndex = mixinFlags.indexOf(/*searchElement*/ true);
+                mixinFlags[firstMixinIndex] = false;
+            }
+            return mixinFlags;
+        }
+        function includeMixinType(type, types, mixinFlags, index) {
             var mixedTypes = [];
             for (var i = 0; i < types.length; i++) {
                 if (i === index) {
                     mixedTypes.push(type);
                 }
-                else if (isMixinConstructorType(types[i])) {
+                else if (mixinFlags[i]) {
                     mixedTypes.push(getReturnTypeOfSignature(getSignaturesOfType(types[i], 1 /* Construct */)[0]));
                 }
             }
@@ -37530,12 +38239,13 @@ var ts;
         function resolveIntersectionTypeMembers(type) {
             // The members and properties collections are empty for intersection types. To get all properties of an
             // intersection type use getPropertiesOfType (only the language service uses this).
-            var callSignatures = ts.emptyArray;
-            var constructSignatures = ts.emptyArray;
+            var callSignatures;
+            var constructSignatures;
             var stringIndexInfo;
             var numberIndexInfo;
             var types = type.types;
-            var mixinCount = ts.countWhere(types, isMixinConstructorType);
+            var mixinFlags = findMixins(types);
+            var mixinCount = ts.countWhere(mixinFlags, function (b) { return b; });
             var _loop_6 = function (i) {
                 var t = type.types[i];
                 // When an intersection type contains mixin constructor types, the construct signatures from
@@ -37543,25 +38253,37 @@ var ts;
                 // other construct signatures in the intersection type. For example, the intersection type
                 // '{ new(...args: any[]) => A } & { new(s: string) => B }' has a single construct signature
                 // 'new(s: string) => A & B'.
-                if (mixinCount === 0 || mixinCount === types.length && i === 0 || !isMixinConstructorType(t)) {
+                if (!mixinFlags[i]) {
                     var signatures = getSignaturesOfType(t, 1 /* Construct */);
                     if (signatures.length && mixinCount > 0) {
                         signatures = ts.map(signatures, function (s) {
                             var clone = cloneSignature(s);
-                            clone.resolvedReturnType = includeMixinType(getReturnTypeOfSignature(s), types, i);
+                            clone.resolvedReturnType = includeMixinType(getReturnTypeOfSignature(s), types, mixinFlags, i);
                             return clone;
                         });
                     }
-                    constructSignatures = ts.concatenate(constructSignatures, signatures);
+                    constructSignatures = appendSignatures(constructSignatures, signatures);
                 }
-                callSignatures = ts.concatenate(callSignatures, getSignaturesOfType(t, 0 /* Call */));
+                callSignatures = appendSignatures(callSignatures, getSignaturesOfType(t, 0 /* Call */));
                 stringIndexInfo = intersectIndexInfos(stringIndexInfo, getIndexInfoOfType(t, 0 /* String */));
                 numberIndexInfo = intersectIndexInfos(numberIndexInfo, getIndexInfoOfType(t, 1 /* Number */));
             };
             for (var i = 0; i < types.length; i++) {
                 _loop_6(i);
             }
-            setStructuredTypeMembers(type, emptySymbols, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
+            setStructuredTypeMembers(type, emptySymbols, callSignatures || ts.emptyArray, constructSignatures || ts.emptyArray, stringIndexInfo, numberIndexInfo);
+        }
+        function appendSignatures(signatures, newSignatures) {
+            var _loop_7 = function (sig) {
+                if (!signatures || ts.every(signatures, function (s) { return !compareSignaturesIdentical(s, sig, /*partialMatch*/ false, /*ignoreThisTypes*/ false, /*ignoreReturnTypes*/ false, compareTypesIdentical); })) {
+                    signatures = ts.append(signatures, sig);
+                }
+            };
+            for (var _i = 0, newSignatures_1 = newSignatures; _i < newSignatures_1.length; _i++) {
+                var sig = newSignatures_1[_i];
+                _loop_7(sig);
+            }
+            return signatures;
         }
         /**
          * Converts an AnonymousType to a ResolvedType.
@@ -37592,6 +38314,15 @@ var ts;
                 var stringIndexInfo = void 0;
                 if (symbol.exports) {
                     members = getExportsOfSymbol(symbol);
+                    if (symbol === globalThisSymbol) {
+                        var varsOnly_1 = ts.createMap();
+                        members.forEach(function (p) {
+                            if (!(p.flags & 418 /* BlockScoped */)) {
+                                varsOnly_1.set(p.escapedName, p);
+                            }
+                        });
+                        members = varsOnly_1;
+                    }
                 }
                 setStructuredTypeMembers(type, members, ts.emptyArray, ts.emptyArray, undefined, undefined);
                 if (symbol.flags & 32 /* Class */) {
@@ -37605,7 +38336,8 @@ var ts;
                         stringIndexInfo = createIndexInfo(anyType, /*isReadonly*/ false);
                     }
                 }
-                var numberIndexInfo = symbol.flags & 384 /* Enum */ ? enumNumberIndexInfo : undefined;
+                var numberIndexInfo = symbol.flags & 384 /* Enum */ && (getDeclaredTypeOfSymbol(symbol).flags & 32 /* Enum */ ||
+                    ts.some(type.properties, function (prop) { return !!(getTypeOfSymbol(prop).flags & 296 /* NumberLike */); })) ? enumNumberIndexInfo : undefined;
                 setStructuredTypeMembers(type, members, ts.emptyArray, ts.emptyArray, stringIndexInfo, numberIndexInfo);
                 // We resolve the members before computing the signatures because a signature may use
                 // typeof with a qualified name expression that circularly references the type we are
@@ -37635,7 +38367,7 @@ var ts;
             var members = ts.createSymbolTable();
             for (var _i = 0, _a = getPropertiesOfType(type.source); _i < _a.length; _i++) {
                 var prop = _a[_i];
-                var checkFlags = 4096 /* ReverseMapped */ | (readonlyMask && isReadonlySymbol(prop) ? 8 /* Readonly */ : 0);
+                var checkFlags = 8192 /* ReverseMapped */ | (readonlyMask && isReadonlySymbol(prop) ? 8 /* Readonly */ : 0);
                 var inferredProp = createSymbol(4 /* Property */ | prop.flags & optionalMask, prop.escapedName, checkFlags);
                 inferredProp.declarations = prop.declarations;
                 inferredProp.nameType = prop.nameType;
@@ -37657,7 +38389,15 @@ var ts;
                 return getIndexType(getApparentType(type.type));
             }
             if (type.flags & 16777216 /* Conditional */) {
-                return getLowerBoundOfConditionalType(type);
+                if (type.root.isDistributive) {
+                    var checkType = type.checkType;
+                    var constraint = getLowerBoundOfKeyType(checkType);
+                    if (constraint !== checkType) {
+                        var mapper = makeUnaryTypeMapper(type.root.checkType, constraint);
+                        return getConditionalTypeInstantiation(type, combineTypeMappers(mapper, type.mapper));
+                    }
+                }
+                return type;
             }
             if (type.flags & 1048576 /* Union */) {
                 return getUnionType(ts.sameMap(type.types, getLowerBoundOfKeyType));
@@ -37667,16 +38407,6 @@ var ts;
             }
             return neverType;
         }
-        function getLowerBoundOfConditionalType(type) {
-            if (type.root.isDistributive) {
-                var constraint = getLowerBoundOfKeyType(type.checkType);
-                if (constraint !== type.checkType) {
-                    var mapper = makeUnaryTypeMapper(type.root.checkType, constraint);
-                    return getConditionalTypeInstantiation(type, combineTypeMappers(mapper, type.mapper));
-                }
-            }
-            return type;
-        }
         /** Resolve the members of a mapped type { [P in K]: T } */
         function resolveMappedTypeMembers(type) {
             var members = ts.createSymbolTable();
@@ -37741,8 +38471,8 @@ var ts;
                 else if (t.flags & (1 /* Any */ | 4 /* String */)) {
                     stringIndexInfo = createIndexInfo(propType, !!(templateModifiers & 1 /* IncludeReadonly */));
                 }
-                else if (t.flags & 8 /* Number */) {
-                    numberIndexInfo = createIndexInfo(propType, !!(templateModifiers & 1 /* IncludeReadonly */));
+                else if (t.flags & (8 /* Number */ | 32 /* Enum */)) {
+                    numberIndexInfo = createIndexInfo(numberIndexInfo ? getUnionType([numberIndexInfo.type, propType]) : propType, !!(templateModifiers & 1 /* IncludeReadonly */));
                 }
             }
         }
@@ -37765,8 +38495,8 @@ var ts;
         }
         function isMappedTypeWithKeyofConstraintDeclaration(type) {
             var constraintDeclaration = getConstraintDeclarationForMappedType(type); // TODO: GH#18217
-            return constraintDeclaration.kind === 179 /* TypeOperator */ &&
-                constraintDeclaration.operator === 129 /* KeyOfKeyword */;
+            return constraintDeclaration.kind === 180 /* TypeOperator */ &&
+                constraintDeclaration.operator === 130 /* KeyOfKeyword */;
         }
         function getModifiersTypeFromMappedType(type) {
             if (!type.modifiersType) {
@@ -37783,7 +38513,7 @@ var ts;
                     var declaredType = getTypeFromMappedTypeNode(type.declaration);
                     var constraint = getConstraintTypeFromMappedType(declaredType);
                     var extendedConstraint = constraint && constraint.flags & 262144 /* TypeParameter */ ? getConstraintOfTypeParameter(constraint) : constraint;
-                    type.modifiersType = extendedConstraint && extendedConstraint.flags & 4194304 /* Index */ ? instantiateType(extendedConstraint.type, type.mapper || identityMapper) : emptyObjectType;
+                    type.modifiersType = extendedConstraint && extendedConstraint.flags & 4194304 /* Index */ ? instantiateType(extendedConstraint.type, type.mapper || identityMapper) : unknownType;
                 }
             }
             return type.modifiersType;
@@ -37879,6 +38609,26 @@ var ts;
             }
             return type.resolvedProperties;
         }
+        function getPossiblePropertiesOfUnionType(type) {
+            if (type.possiblePropertyCache) {
+                return type.possiblePropertyCache.size ? ts.arrayFrom(type.possiblePropertyCache.values()) : ts.emptyArray;
+            }
+            type.possiblePropertyCache = ts.createSymbolTable();
+            for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
+                var t = _a[_i];
+                for (var _b = 0, _c = getPropertiesOfType(t); _b < _c.length; _b++) {
+                    var p = _c[_b];
+                    if (!type.possiblePropertyCache.has(p.escapedName)) {
+                        var prop = getUnionOrIntersectionProperty(type, p.escapedName);
+                        if (prop) {
+                            type.possiblePropertyCache.set(p.escapedName, prop);
+                        }
+                    }
+                }
+            }
+            // We can't simply use the normal property cache here, since that will contain cached apparent type members :(
+            return type.possiblePropertyCache.size ? ts.arrayFrom(type.possiblePropertyCache.values()) : ts.emptyArray;
+        }
         function getPropertiesOfType(type) {
             type = getApparentType(type);
             return type.flags & 3145728 /* UnionOrIntersection */ ?
@@ -37924,24 +38674,25 @@ var ts;
             return hasNonCircularBaseConstraint(typeParameter) ? getConstraintFromTypeParameter(typeParameter) : undefined;
         }
         function getConstraintOfIndexedAccess(type) {
-            var objectType = getConstraintOfType(type.objectType) || type.objectType;
-            if (objectType !== type.objectType) {
-                var constraint = getIndexedAccessType(objectType, type.indexType, /*accessNode*/ undefined, errorType);
-                if (constraint && constraint !== errorType) {
-                    return constraint;
+            return hasNonCircularBaseConstraint(type) ? getConstraintFromIndexedAccess(type) : undefined;
+        }
+        function getSimplifiedTypeOrConstraint(type) {
+            var simplified = getSimplifiedType(type, /*writing*/ false);
+            return simplified !== type ? simplified : getConstraintOfType(type);
+        }
+        function getConstraintFromIndexedAccess(type) {
+            var indexConstraint = getSimplifiedTypeOrConstraint(type.indexType);
+            if (indexConstraint && indexConstraint !== type.indexType) {
+                var indexedAccess = getIndexedAccessTypeOrUndefined(type.objectType, indexConstraint);
+                if (indexedAccess) {
+                    return indexedAccess;
                 }
             }
-            var baseConstraint = getBaseConstraintOfType(type);
-            return baseConstraint && baseConstraint !== type ? baseConstraint : undefined;
-        }
-        function getDefaultConstraintOfTrueBranchOfConditionalType(root, combinedMapper, mapper) {
-            var rootTrueType = root.trueType;
-            var rootTrueConstraint = !(rootTrueType.flags & 33554432 /* Substitution */)
-                ? rootTrueType
-                : instantiateType((rootTrueType.substitute), combinedMapper || mapper).flags & 3 /* AnyOrUnknown */
-                    ? rootTrueType.typeVariable
-                    : getIntersectionType([rootTrueType.substitute, rootTrueType.typeVariable]);
-            return instantiateType(rootTrueConstraint, combinedMapper || mapper);
+            var objectConstraint = getSimplifiedTypeOrConstraint(type.objectType);
+            if (objectConstraint && objectConstraint !== type.objectType) {
+                return getIndexedAccessTypeOrUndefined(objectConstraint, type.indexType);
+            }
+            return undefined;
         }
         function getDefaultConstraintOfConditionalType(type) {
             if (!type.resolvedDefaultConstraint) {
@@ -37949,7 +38700,7 @@ var ts;
                 // a conditional type with a single branch of type `any` would be assignable to anything, since it's constraint would simplify to
                 // just `any`. This result is _usually_ unwanted - so instead here we elide an `any` branch from the constraint type,
                 // in effect treating `any` like `never` rather than `unknown` in this location.
-                var trueConstraint = getDefaultConstraintOfTrueBranchOfConditionalType(type.root, type.combinedMapper, type.mapper);
+                var trueConstraint = getInferredTrueTypeFromConditionalType(type);
                 var falseConstraint = getFalseTypeFromConditionalType(type);
                 type.resolvedDefaultConstraint = isTypeAny(trueConstraint) ? falseConstraint : isTypeAny(falseConstraint) ? trueConstraint : getUnionType([trueConstraint, falseConstraint]);
             }
@@ -37968,7 +38719,7 @@ var ts;
             // a union - once negated types exist and are applied to the conditional false branch, this "constraint"
             // likely doesn't need to exist.
             if (type.root.isDistributive && type.restrictiveInstantiation !== type) {
-                var simplified = getSimplifiedType(type.checkType);
+                var simplified = getSimplifiedType(type.checkType, /*writing*/ false);
                 var constraint = simplified === type.checkType ? getConstraintOfType(simplified) : simplified;
                 if (constraint && constraint !== type.checkType) {
                     var mapper = makeUnaryTypeMapper(type.root.checkType, constraint);
@@ -37980,9 +38731,12 @@ var ts;
             }
             return undefined;
         }
-        function getConstraintOfConditionalType(type) {
+        function getConstraintFromConditionalType(type) {
             return getConstraintOfDistributiveConditionalType(type) || getDefaultConstraintOfConditionalType(type);
         }
+        function getConstraintOfConditionalType(type) {
+            return hasNonCircularBaseConstraint(type) ? getConstraintFromConditionalType(type) : undefined;
+        }
         function getUnionConstraintOfIntersection(type, targetIsUnion) {
             var constraints;
             var hasDisjointDomainType = false;
@@ -37996,11 +38750,6 @@ var ts;
                         constraint = getConstraintOfType(constraint);
                     }
                     if (constraint) {
-                        // A constraint that isn't a union type implies that the final type would be a non-union
-                        // type as well. Since non-union constraints are of no interest, we can exit here.
-                        if (!(constraint.flags & 1048576 /* Union */)) {
-                            return undefined;
-                        }
                         constraints = ts.append(constraints, constraint);
                     }
                 }
@@ -38009,10 +38758,10 @@ var ts;
                 }
             }
             // If the target is a union type or if we are intersecting with types belonging to one of the
-            // disjoint domans, we may end up producing a constraint that hasn't been examined before.
+            // disjoint domains, we may end up producing a constraint that hasn't been examined before.
             if (constraints && (targetIsUnion || hasDisjointDomainType)) {
                 if (hasDisjointDomainType) {
-                    // We add any types belong to one of the disjoint domans because they might cause the final
+                    // We add any types belong to one of the disjoint domains because they might cause the final
                     // intersection operation to reduce the union constraints.
                     for (var _b = 0, _c = type.types; _b < _c.length; _b++) {
                         var t = _c[_b];
@@ -38056,9 +38805,9 @@ var ts;
                     if (!pushTypeResolution(t, 4 /* ImmediateBaseConstraint */)) {
                         return circularConstraintType;
                     }
-                    if (constraintDepth === 50) {
+                    if (constraintDepth >= 50) {
                         // We have reached 50 recursive invocations of getImmediateBaseConstraint and there is a
-                        // very high likelyhood we're dealing with an infinite generic type that perpetually generates
+                        // very high likelihood we're dealing with an infinite generic type that perpetually generates
                         // new type identities as we descend into it. We stop the recursion here and mark this type
                         // and the outer types as having circular constraints.
                         error(currentNode, ts.Diagnostics.Type_instantiation_is_excessively_deep_and_possibly_infinite);
@@ -38066,7 +38815,7 @@ var ts;
                         return t.immediateBaseConstraint = noConstraintType;
                     }
                     constraintDepth++;
-                    var result = computeBaseConstraint(getSimplifiedType(t));
+                    var result = computeBaseConstraint(getSimplifiedType(t, /*writing*/ false));
                     constraintDepth--;
                     if (!popTypeResolution()) {
                         if (t.flags & 262144 /* TypeParameter */) {
@@ -38074,7 +38823,7 @@ var ts;
                             if (errorNode) {
                                 var diagnostic = error(errorNode, ts.Diagnostics.Type_parameter_0_has_a_circular_constraint, typeToString(t));
                                 if (currentNode && !ts.isNodeDescendantOf(errorNode, currentNode) && !ts.isNodeDescendantOf(currentNode, errorNode)) {
-                                    addRelatedInfo(diagnostic, ts.createDiagnosticForNode(currentNode, ts.Diagnostics.Circularity_originates_in_type_at_this_location));
+                                    ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(currentNode, ts.Diagnostics.Circularity_originates_in_type_at_this_location));
                                 }
                             }
                         }
@@ -38118,12 +38867,15 @@ var ts;
                 if (t.flags & 8388608 /* IndexedAccess */) {
                     var baseObjectType = getBaseConstraint(t.objectType);
                     var baseIndexType = getBaseConstraint(t.indexType);
-                    var baseIndexedAccess = baseObjectType && baseIndexType ? getIndexedAccessType(baseObjectType, baseIndexType, /*accessNode*/ undefined, errorType) : undefined;
-                    return baseIndexedAccess && baseIndexedAccess !== errorType ? getBaseConstraint(baseIndexedAccess) : undefined;
+                    var baseIndexedAccess = baseObjectType && baseIndexType && getIndexedAccessTypeOrUndefined(baseObjectType, baseIndexType);
+                    return baseIndexedAccess && getBaseConstraint(baseIndexedAccess);
                 }
                 if (t.flags & 16777216 /* Conditional */) {
-                    var constraint = getConstraintOfConditionalType(t);
-                    return constraint && getBaseConstraint(constraint);
+                    var constraint = getConstraintFromConditionalType(t);
+                    constraintDepth++; // Penalize repeating conditional types (this captures the recursion within getConstraintFromConditionalType and carries it forward)
+                    var result = constraint && getBaseConstraint(constraint);
+                    constraintDepth--;
+                    return result;
                 }
                 if (t.flags & 33554432 /* Substitution */) {
                     return getBaseConstraint(t.substitute);
@@ -38197,25 +38949,26 @@ var ts;
          * type itself. Note that the apparent type of a union type is the union type itself.
          */
         function getApparentType(type) {
-            var t = type.flags & 63176704 /* Instantiable */ ? getBaseConstraintOfType(type) || emptyObjectType : type;
+            var t = type.flags & 63176704 /* Instantiable */ ? getBaseConstraintOfType(type) || unknownType : type;
             return ts.getObjectFlags(t) & 32 /* Mapped */ ? getApparentTypeOfMappedType(t) :
                 t.flags & 2097152 /* Intersection */ ? getApparentTypeOfIntersectionType(t) :
                     t.flags & 132 /* StringLike */ ? globalStringType :
                         t.flags & 296 /* NumberLike */ ? globalNumberType :
-                            t.flags & 2112 /* BigIntLike */ ? getGlobalBigIntType(/*reportErrors*/ languageVersion >= 7 /* ESNext */) :
+                            t.flags & 2112 /* BigIntLike */ ? getGlobalBigIntType(/*reportErrors*/ languageVersion >= 99 /* ESNext */) :
                                 t.flags & 528 /* BooleanLike */ ? globalBooleanType :
                                     t.flags & 12288 /* ESSymbolLike */ ? getGlobalESSymbolType(/*reportErrors*/ languageVersion >= 2 /* ES2015 */) :
                                         t.flags & 67108864 /* NonPrimitive */ ? emptyObjectType :
                                             t.flags & 4194304 /* Index */ ? keyofConstraintType :
-                                                t;
+                                                t.flags & 2 /* Unknown */ && !strictNullChecks ? emptyObjectType :
+                                                    t;
         }
         function createUnionOrIntersectionProperty(containingType, name) {
-            var props;
+            var propSet = ts.createMap();
             var indexTypes;
             var isUnion = containingType.flags & 1048576 /* Union */;
             var excludeModifiers = isUnion ? 24 /* NonPublicAccessibilityModifier */ : 0;
             // Flags we want to propagate to the result if they exist in all source symbols
-            var commonFlags = isUnion ? 0 /* None */ : 16777216 /* Optional */;
+            var optionalFlag = isUnion ? 0 /* None */ : 16777216 /* Optional */;
             var syntheticFlag = 4 /* SyntheticMethod */;
             var checkFlags = 0;
             for (var _i = 0, _a = containingType.types; _i < _a.length; _i++) {
@@ -38225,13 +38978,21 @@ var ts;
                     var prop = getPropertyOfType(type, name);
                     var modifiers = prop ? ts.getDeclarationModifierFlagsFromSymbol(prop) : 0;
                     if (prop && !(modifiers & excludeModifiers)) {
-                        commonFlags &= prop.flags;
-                        props = ts.appendIfUnique(props, prop);
+                        if (isUnion) {
+                            optionalFlag |= (prop.flags & 16777216 /* Optional */);
+                        }
+                        else {
+                            optionalFlag &= prop.flags;
+                        }
+                        var id = "" + getSymbolId(prop);
+                        if (!propSet.has(id)) {
+                            propSet.set(id, prop);
+                        }
                         checkFlags |= (isReadonlySymbol(prop) ? 8 /* Readonly */ : 0) |
-                            (!(modifiers & 24 /* NonPublicAccessibilityModifier */) ? 128 /* ContainsPublic */ : 0) |
-                            (modifiers & 16 /* Protected */ ? 256 /* ContainsProtected */ : 0) |
-                            (modifiers & 8 /* Private */ ? 512 /* ContainsPrivate */ : 0) |
-                            (modifiers & 32 /* Static */ ? 1024 /* ContainsStatic */ : 0);
+                            (!(modifiers & 24 /* NonPublicAccessibilityModifier */) ? 256 /* ContainsPublic */ : 0) |
+                            (modifiers & 16 /* Protected */ ? 512 /* ContainsProtected */ : 0) |
+                            (modifiers & 8 /* Private */ ? 1024 /* ContainsPrivate */ : 0) |
+                            (modifiers & 32 /* Static */ ? 2048 /* ContainsStatic */ : 0);
                         if (!isPrototypeProperty(prop)) {
                             syntheticFlag = 2 /* SyntheticProperty */;
                         }
@@ -38239,19 +39000,24 @@ var ts;
                     else if (isUnion) {
                         var indexInfo = !isLateBoundName(name) && (isNumericLiteralName(name) && getIndexInfoOfType(type, 1 /* Number */) || getIndexInfoOfType(type, 0 /* String */));
                         if (indexInfo) {
-                            checkFlags |= indexInfo.isReadonly ? 8 /* Readonly */ : 0;
+                            checkFlags |= 32 /* WritePartial */ | (indexInfo.isReadonly ? 8 /* Readonly */ : 0);
                             indexTypes = ts.append(indexTypes, isTupleType(type) ? getRestTypeOfTupleType(type) || undefinedType : indexInfo.type);
                         }
+                        else if (isObjectLiteralType(type)) {
+                            checkFlags |= 32 /* WritePartial */;
+                            indexTypes = ts.append(indexTypes, undefinedType);
+                        }
                         else {
-                            checkFlags |= 16 /* Partial */;
+                            checkFlags |= 16 /* ReadPartial */;
                         }
                     }
                 }
             }
-            if (!props) {
+            if (!propSet.size) {
                 return undefined;
             }
-            if (props.length === 1 && !(checkFlags & 16 /* Partial */) && !indexTypes) {
+            var props = ts.arrayFrom(propSet.values());
+            if (props.length === 1 && !(checkFlags & 16 /* ReadPartial */) && !indexTypes) {
                 return props[0];
             }
             var declarations;
@@ -38275,15 +39041,15 @@ var ts;
                     nameType = prop.nameType;
                 }
                 else if (type !== firstType) {
-                    checkFlags |= 32 /* HasNonUniformType */;
+                    checkFlags |= 64 /* HasNonUniformType */;
                 }
                 if (isLiteralType(type)) {
-                    checkFlags |= 64 /* HasLiteralType */;
+                    checkFlags |= 128 /* HasLiteralType */;
                 }
                 propTypes.push(type);
             }
             ts.addRange(propTypes, indexTypes);
-            var result = createSymbol(4 /* Property */ | commonFlags, name, syntheticFlag | checkFlags);
+            var result = createSymbol(4 /* Property */ | optionalFlag, name, syntheticFlag | checkFlags);
             result.containingType = containingType;
             if (!hasNonUniformValueDeclaration && firstValueDeclaration) {
                 result.valueDeclaration = firstValueDeclaration;
@@ -38294,7 +39060,15 @@ var ts;
             }
             result.declarations = declarations;
             result.nameType = nameType;
-            result.type = isUnion ? getUnionType(propTypes) : getIntersectionType(propTypes);
+            if (propTypes.length > 2) {
+                // When `propTypes` has the potential to explode in size when normalized, defer normalization until absolutely needed
+                result.checkFlags |= 65536 /* DeferredType */;
+                result.deferralParent = containingType;
+                result.deferralConstituents = propTypes;
+            }
+            else {
+                result.type = isUnion ? getUnionType(propTypes) : getIntersectionType(propTypes);
+            }
             return result;
         }
         // Return the symbol for a given property in a union or intersection type, or undefined if the property
@@ -38316,7 +39090,7 @@ var ts;
         function getPropertyOfUnionOrIntersectionType(type, name) {
             var property = getUnionOrIntersectionProperty(type, name);
             // We need to filter out partial properties in union types
-            return property && !(ts.getCheckFlags(property) & 16 /* Partial */) ? property : undefined;
+            return property && !(ts.getCheckFlags(property) & 16 /* ReadPartial */) ? property : undefined;
         }
         /**
          * Return the symbol for the property with the given name in the given type. Creates synthetic union properties when
@@ -38394,6 +39168,9 @@ var ts;
                         propTypes.push(getTypeOfSymbol(prop));
                     }
                 }
+                if (kind === 0 /* String */) {
+                    ts.append(propTypes, getIndexTypeOfType(type, 1 /* Number */));
+                }
                 if (propTypes.length) {
                     return getUnionType(propTypes, 2 /* Subtype */);
                 }
@@ -38422,10 +39199,10 @@ var ts;
         function isJSDocOptionalParameter(node) {
             return ts.isInJSFile(node) && (
             // node.type should only be a JSDocOptionalType when node is a parameter of a JSDocFunctionType
-            node.type && node.type.kind === 293 /* JSDocOptionalType */
+            node.type && node.type.kind === 294 /* JSDocOptionalType */
                 || ts.getJSDocParameterTags(node).some(function (_a) {
                     var isBracketed = _a.isBracketed, typeExpression = _a.typeExpression;
-                    return isBracketed || !!typeExpression && typeExpression.type.kind === 293 /* JSDocOptionalType */;
+                    return isBracketed || !!typeExpression && typeExpression.type.kind === 294 /* JSDocOptionalType */;
                 }));
         }
         function tryFindAmbientModule(moduleName, withAugmentations) {
@@ -38459,7 +39236,7 @@ var ts;
                 return false;
             }
             var isBracketed = node.isBracketed, typeExpression = node.typeExpression;
-            return isBracketed || !!typeExpression && typeExpression.type.kind === 293 /* JSDocOptionalType */;
+            return isBracketed || !!typeExpression && typeExpression.type.kind === 294 /* JSDocOptionalType */;
         }
         function createIdentifierTypePredicate(parameterName, parameterIndex, type) {
             return { kind: 1 /* Identifier */, parameterName: parameterName, parameterIndex: parameterIndex, type: type };
@@ -38497,7 +39274,7 @@ var ts;
                 var baseDefaultType = getDefaultTypeArgumentType(isJavaScriptImplicitAny);
                 for (var i = numTypeArguments; i < numTypeParameters; i++) {
                     var defaultType = getDefaultFromTypeParameter(typeParameters[i]);
-                    if (isJavaScriptImplicitAny && defaultType && isTypeIdenticalTo(defaultType, emptyObjectType)) {
+                    if (isJavaScriptImplicitAny && defaultType && (isTypeIdenticalTo(defaultType, unknownType) || isTypeIdenticalTo(defaultType, emptyObjectType))) {
                         defaultType = anyType;
                     }
                     result[i] = defaultType ? instantiateType(defaultType, createTypeMapper(typeParameters, result)) : baseDefaultType;
@@ -38541,7 +39318,7 @@ var ts;
                     else {
                         parameters.push(paramSymbol);
                     }
-                    if (type && type.kind === 182 /* LiteralType */) {
+                    if (type && type.kind === 183 /* LiteralType */) {
                         hasLiteralTypes = true;
                     }
                     // Record a new minimum argument count if this is not an optional parameter
@@ -38555,16 +39332,16 @@ var ts;
                     }
                 }
                 // If only one accessor includes a this-type annotation, the other behaves as if it had the same type annotation
-                if ((declaration.kind === 158 /* GetAccessor */ || declaration.kind === 159 /* SetAccessor */) &&
+                if ((declaration.kind === 159 /* GetAccessor */ || declaration.kind === 160 /* SetAccessor */) &&
                     !hasNonBindableDynamicName(declaration) &&
                     (!hasThisParameter || !thisParameter)) {
-                    var otherKind = declaration.kind === 158 /* GetAccessor */ ? 159 /* SetAccessor */ : 158 /* GetAccessor */;
+                    var otherKind = declaration.kind === 159 /* GetAccessor */ ? 160 /* SetAccessor */ : 159 /* GetAccessor */;
                     var other = ts.getDeclarationOfKind(getSymbolOfNode(declaration), otherKind);
                     if (other) {
                         thisParameter = getAnnotatedAccessorThisParameter(other);
                     }
                 }
-                var classType = declaration.kind === 157 /* Constructor */ ?
+                var classType = declaration.kind === 158 /* Constructor */ ?
                     getDeclaredTypeOfClassOrInterface(getMergedSymbol(declaration.parent.symbol))
                     : undefined;
                 var typeParameters = classType ? classType.localTypeParameters : getTypeParametersFromDeclaration(declaration);
@@ -38589,7 +39366,7 @@ var ts;
             var lastParamVariadicType = ts.firstDefined(lastParamTags, function (p) {
                 return p.typeExpression && ts.isJSDocVariadicType(p.typeExpression.type) ? p.typeExpression.type : undefined;
             });
-            var syntheticArgsSymbol = createSymbol(3 /* Variable */, "args", 16384 /* RestParameter */);
+            var syntheticArgsSymbol = createSymbol(3 /* Variable */, "args", 32768 /* RestParameter */);
             syntheticArgsSymbol.type = lastParamVariadicType ? createArrayType(getTypeFromTypeNode(lastParamVariadicType.type)) : anyArrayType;
             if (lastParamVariadicType) {
                 // Replace the last parameter with a rest parameter.
@@ -38622,13 +39399,13 @@ var ts;
                 if (!node)
                     return false;
                 switch (node.kind) {
-                    case 72 /* Identifier */:
+                    case 73 /* Identifier */:
                         return node.escapedText === "arguments" && ts.isExpressionNode(node);
-                    case 154 /* PropertyDeclaration */:
-                    case 156 /* MethodDeclaration */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
-                        return node.name.kind === 149 /* ComputedPropertyName */
+                    case 155 /* PropertyDeclaration */:
+                    case 157 /* MethodDeclaration */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
+                        return node.name.kind === 150 /* ComputedPropertyName */
                             && traverse(node.name);
                     default:
                         return !ts.nodeStartsNewLexicalEnvironment(node) && !ts.isPartOfTypeNode(node) && !!ts.forEachChild(node, traverse);
@@ -38693,32 +39470,23 @@ var ts;
                         }
                     }
                     signature.resolvedTypePredicate = type && ts.isTypePredicateNode(type) ?
-                        createTypePredicateFromTypePredicateNode(type, signature.declaration) :
+                        createTypePredicateFromTypePredicateNode(type, signature) :
                         jsdocPredicate || noTypePredicate;
                 }
                 ts.Debug.assert(!!signature.resolvedTypePredicate);
             }
             return signature.resolvedTypePredicate === noTypePredicate ? undefined : signature.resolvedTypePredicate;
         }
-        function createTypePredicateFromTypePredicateNode(node, func) {
+        function createTypePredicateFromTypePredicateNode(node, signature) {
             var parameterName = node.parameterName;
             var type = getTypeFromTypeNode(node.type);
-            if (parameterName.kind === 72 /* Identifier */) {
-                return createIdentifierTypePredicate(parameterName.escapedText, getTypePredicateParameterIndex(func.parameters, parameterName), type);
+            if (parameterName.kind === 73 /* Identifier */) {
+                return createIdentifierTypePredicate(parameterName.escapedText, ts.findIndex(signature.parameters, function (p) { return p.escapedName === parameterName.escapedText; }), type);
             }
             else {
                 return createThisTypePredicate(type);
             }
         }
-        function getTypePredicateParameterIndex(parameterList, parameter) {
-            for (var i = 0; i < parameterList.length; i++) {
-                var param = parameterList[i];
-                if (param.name.kind === 72 /* Identifier */ && param.name.escapedText === parameter.escapedText) {
-                    return i;
-                }
-            }
-            return -1;
-        }
         function getReturnTypeOfSignature(signature) {
             if (!signature.resolvedReturnType) {
                 if (!pushTypeResolution(signature, 3 /* ResolvedReturnType */)) {
@@ -38753,7 +39521,7 @@ var ts;
             return signature.resolvedReturnType;
         }
         function getReturnTypeFromAnnotation(declaration) {
-            if (declaration.kind === 157 /* Constructor */) {
+            if (declaration.kind === 158 /* Constructor */) {
                 return getDeclaredTypeOfClassOrInterface(getMergedSymbol(declaration.parent.symbol));
             }
             if (ts.isJSDocConstructSignature(declaration)) {
@@ -38763,12 +39531,12 @@ var ts;
             if (typeNode) {
                 return getTypeFromTypeNode(typeNode);
             }
-            if (declaration.kind === 158 /* GetAccessor */ && !hasNonBindableDynamicName(declaration)) {
+            if (declaration.kind === 159 /* GetAccessor */ && !hasNonBindableDynamicName(declaration)) {
                 var jsDocType = ts.isInJSFile(declaration) && getTypeForDeclarationFromJSDocComment(declaration);
                 if (jsDocType) {
                     return jsDocType;
                 }
-                var setter = ts.getDeclarationOfKind(getSymbolOfNode(declaration), 159 /* SetAccessor */);
+                var setter = ts.getDeclarationOfKind(getSymbolOfNode(declaration), 160 /* SetAccessor */);
                 var setterType = getAnnotatedAccessorType(setter);
                 if (setterType) {
                     return setterType;
@@ -38793,12 +39561,10 @@ var ts;
         function getSignatureInstantiation(signature, typeArguments, isJavascript, inferredTypeParameters) {
             var instantiatedSignature = getSignatureInstantiationWithoutFillingInTypeArguments(signature, fillMissingTypeArguments(typeArguments, signature.typeParameters, getMinTypeArgumentCount(signature.typeParameters), isJavascript));
             if (inferredTypeParameters) {
-                var returnSignature = getSingleCallSignature(getReturnTypeOfSignature(instantiatedSignature));
+                var returnSignature = getSingleCallOrConstructSignature(getReturnTypeOfSignature(instantiatedSignature));
                 if (returnSignature) {
                     var newReturnSignature = cloneSignature(returnSignature);
                     newReturnSignature.typeParameters = inferredTypeParameters;
-                    newReturnSignature.target = returnSignature.target;
-                    newReturnSignature.mapper = returnSignature.mapper;
                     var newInstantiatedSignature = cloneSignature(instantiatedSignature);
                     newInstantiatedSignature.resolvedReturnType = getOrCreateTypeFromSignature(newReturnSignature);
                     return newInstantiatedSignature;
@@ -38848,7 +39614,7 @@ var ts;
             var typeParameters = signature.typeParameters;
             if (typeParameters) {
                 var typeEraser_1 = createTypeEraser(typeParameters);
-                var baseConstraints = ts.map(typeParameters, function (tp) { return instantiateType(getBaseConstraintOfType(tp), typeEraser_1) || emptyObjectType; });
+                var baseConstraints = ts.map(typeParameters, function (tp) { return instantiateType(getBaseConstraintOfType(tp), typeEraser_1) || unknownType; });
                 return instantiateSignature(signature, createTypeMapper(typeParameters, baseConstraints), /*eraseTypeParameters*/ true);
             }
             return signature;
@@ -38859,7 +39625,8 @@ var ts;
             // object type literal or interface (using the new keyword). Each way of declaring a constructor
             // will result in a different declaration kind.
             if (!signature.isolatedSignatureType) {
-                var isConstructor = signature.declaration.kind === 157 /* Constructor */ || signature.declaration.kind === 161 /* ConstructSignature */; // TODO: GH#18217
+                var kind = signature.declaration ? signature.declaration.kind : 0 /* Unknown */;
+                var isConstructor = kind === 158 /* Constructor */ || kind === 162 /* ConstructSignature */ || kind === 167 /* ConstructorType */;
                 var type = createObjectType(16 /* Anonymous */);
                 type.members = emptySymbols;
                 type.properties = ts.emptyArray;
@@ -38873,7 +39640,7 @@ var ts;
             return symbol.members.get("__index" /* Index */);
         }
         function getIndexDeclarationOfSymbol(symbol, kind) {
-            var syntaxKind = kind === 1 /* Number */ ? 135 /* NumberKeyword */ : 138 /* StringKeyword */;
+            var syntaxKind = kind === 1 /* Number */ ? 136 /* NumberKeyword */ : 139 /* StringKeyword */;
             var indexSymbol = getIndexSymbol(symbol);
             if (indexSymbol) {
                 for (var _i = 0, _a = indexSymbol.declarations; _i < _a.length; _i++) {
@@ -38900,7 +39667,7 @@ var ts;
             return undefined;
         }
         function getConstraintDeclaration(type) {
-            var decl = type.symbol && ts.getDeclarationOfKind(type.symbol, 150 /* TypeParameter */);
+            var decl = type.symbol && ts.getDeclarationOfKind(type.symbol, 151 /* TypeParameter */);
             return decl && ts.getEffectiveConstraintOfTypeParameter(decl);
         }
         function getInferredTypeParameterConstraint(typeParameter) {
@@ -38908,13 +39675,13 @@ var ts;
             if (typeParameter.symbol) {
                 for (var _i = 0, _a = typeParameter.symbol.declarations; _i < _a.length; _i++) {
                     var declaration = _a[_i];
-                    if (declaration.parent.kind === 176 /* InferType */) {
+                    if (declaration.parent.kind === 177 /* InferType */) {
                         // When an 'infer T' declaration is immediately contained in a type reference node
                         // (such as 'Foo<infer T>'), T's constraint is inferred from the constraint of the
                         // corresponding type parameter in 'Foo'. When multiple 'infer T' declarations are
                         // present, we form an intersection of the inferred constraint types.
                         var grandParent = declaration.parent.parent;
-                        if (grandParent.kind === 164 /* TypeReference */) {
+                        if (grandParent.kind === 165 /* TypeReference */) {
                             var typeReference = grandParent;
                             var typeParameters = getTypeParametersForTypeReference(typeReference);
                             if (typeParameters) {
@@ -38939,7 +39706,7 @@ var ts;
                         }
                         // When an 'infer T' declaration is immediately contained in a rest parameter
                         // declaration, we infer an 'unknown[]' constraint.
-                        else if (grandParent.kind === 151 /* Parameter */ && grandParent.dotDotDotToken) {
+                        else if (grandParent.kind === 152 /* Parameter */ && grandParent.dotDotDotToken) {
                             inferences = ts.append(inferences, createArrayType(unknownType));
                         }
                     }
@@ -38963,7 +39730,7 @@ var ts;
             return typeParameter.constraint === noConstraintType ? undefined : typeParameter.constraint;
         }
         function getParentSymbolOfTypeParameter(typeParameter) {
-            var tp = ts.getDeclarationOfKind(typeParameter.symbol, 150 /* TypeParameter */);
+            var tp = ts.getDeclarationOfKind(typeParameter.symbol, 151 /* TypeParameter */);
             var host = ts.isJSDocTemplateTag(tp.parent) ? ts.getHostSignatureFromJSDoc(tp.parent) : tp.parent;
             return host && getSymbolOfNode(host);
         }
@@ -39002,7 +39769,7 @@ var ts;
                     result |= ts.getObjectFlags(type);
                 }
             }
-            return result & 917504 /* PropagatingFlags */;
+            return result & 1835008 /* PropagatingFlags */;
         }
         function createTypeReference(target, typeArguments) {
             var id = getTypeListId(typeArguments);
@@ -39096,9 +39863,9 @@ var ts;
         }
         function getTypeReferenceName(node) {
             switch (node.kind) {
-                case 164 /* TypeReference */:
+                case 165 /* TypeReference */:
                     return node.typeName;
-                case 211 /* ExpressionWithTypeArguments */:
+                case 212 /* ExpressionWithTypeArguments */:
                     // We only support expressions that are simple qualified names. For other
                     // expressions this produces undefined.
                     var expr = node.expression;
@@ -39197,13 +39964,22 @@ var ts;
             }
         }
         function getSubstitutionType(typeVariable, substitute) {
+            if (substitute.flags & 3 /* AnyOrUnknown */ || substitute === typeVariable) {
+                return typeVariable;
+            }
+            var id = getTypeId(typeVariable) + ">" + getTypeId(substitute);
+            var cached = substitutionTypes.get(id);
+            if (cached) {
+                return cached;
+            }
             var result = createType(33554432 /* Substitution */);
             result.typeVariable = typeVariable;
             result.substitute = substitute;
+            substitutionTypes.set(id, result);
             return result;
         }
         function isUnaryTupleTypeNode(node) {
-            return node.kind === 170 /* TupleType */ && node.elementTypes.length === 1;
+            return node.kind === 171 /* TupleType */ && node.elementTypes.length === 1;
         }
         function getImpliedConstraint(typeVariable, checkNode, extendsNode) {
             return isUnaryTupleTypeNode(checkNode) && isUnaryTupleTypeNode(extendsNode) ? getImpliedConstraint(typeVariable, checkNode.elementTypes[0], extendsNode.elementTypes[0]) :
@@ -39212,9 +39988,9 @@ var ts;
         }
         function getConstrainedTypeVariable(typeVariable, node) {
             var constraints;
-            while (node && !ts.isStatement(node) && node.kind !== 296 /* JSDocComment */) {
+            while (node && !ts.isStatement(node) && node.kind !== 297 /* JSDocComment */) {
                 var parent = node.parent;
-                if (parent.kind === 175 /* ConditionalType */ && node === parent.trueType) {
+                if (parent.kind === 176 /* ConditionalType */ && node === parent.trueType) {
                     var constraint = getImpliedConstraint(typeVariable, parent.checkType, parent.extendsType);
                     if (constraint) {
                         constraints = ts.append(constraints, constraint);
@@ -39225,7 +40001,7 @@ var ts;
             return constraints ? getSubstitutionType(typeVariable, getIntersectionType(ts.append(constraints, typeVariable))) : typeVariable;
         }
         function isJSDocTypeReference(node) {
-            return !!(node.flags & 2097152 /* JSDoc */) && (node.kind === 164 /* TypeReference */ || node.kind === 183 /* ImportType */);
+            return !!(node.flags & 2097152 /* JSDoc */) && (node.kind === 165 /* TypeReference */ || node.kind === 184 /* ImportType */);
         }
         function checkNoTypeArguments(node, symbol) {
             if (node.typeArguments) {
@@ -39326,9 +40102,9 @@ var ts;
                 for (var _i = 0, declarations_3 = declarations; _i < declarations_3.length; _i++) {
                     var declaration = declarations_3[_i];
                     switch (declaration.kind) {
-                        case 240 /* ClassDeclaration */:
-                        case 241 /* InterfaceDeclaration */:
-                        case 243 /* EnumDeclaration */:
+                        case 241 /* ClassDeclaration */:
+                        case 242 /* InterfaceDeclaration */:
+                        case 244 /* EnumDeclaration */:
                             return declaration;
                     }
                 }
@@ -39392,20 +40168,32 @@ var ts;
             return deferredGlobalAsyncIterableType || (deferredGlobalAsyncIterableType = getGlobalType("AsyncIterable", /*arity*/ 1, reportErrors)) || emptyGenericType;
         }
         function getGlobalAsyncIteratorType(reportErrors) {
-            return deferredGlobalAsyncIteratorType || (deferredGlobalAsyncIteratorType = getGlobalType("AsyncIterator", /*arity*/ 1, reportErrors)) || emptyGenericType;
+            return deferredGlobalAsyncIteratorType || (deferredGlobalAsyncIteratorType = getGlobalType("AsyncIterator", /*arity*/ 3, reportErrors)) || emptyGenericType;
         }
         function getGlobalAsyncIterableIteratorType(reportErrors) {
             return deferredGlobalAsyncIterableIteratorType || (deferredGlobalAsyncIterableIteratorType = getGlobalType("AsyncIterableIterator", /*arity*/ 1, reportErrors)) || emptyGenericType;
         }
+        function getGlobalAsyncGeneratorType(reportErrors) {
+            return deferredGlobalAsyncGeneratorType || (deferredGlobalAsyncGeneratorType = getGlobalType("AsyncGenerator", /*arity*/ 3, reportErrors)) || emptyGenericType;
+        }
         function getGlobalIterableType(reportErrors) {
             return deferredGlobalIterableType || (deferredGlobalIterableType = getGlobalType("Iterable", /*arity*/ 1, reportErrors)) || emptyGenericType;
         }
         function getGlobalIteratorType(reportErrors) {
-            return deferredGlobalIteratorType || (deferredGlobalIteratorType = getGlobalType("Iterator", /*arity*/ 1, reportErrors)) || emptyGenericType;
+            return deferredGlobalIteratorType || (deferredGlobalIteratorType = getGlobalType("Iterator", /*arity*/ 3, reportErrors)) || emptyGenericType;
         }
         function getGlobalIterableIteratorType(reportErrors) {
             return deferredGlobalIterableIteratorType || (deferredGlobalIterableIteratorType = getGlobalType("IterableIterator", /*arity*/ 1, reportErrors)) || emptyGenericType;
         }
+        function getGlobalGeneratorType(reportErrors) {
+            return deferredGlobalGeneratorType || (deferredGlobalGeneratorType = getGlobalType("Generator", /*arity*/ 3, reportErrors)) || emptyGenericType;
+        }
+        function getGlobalIteratorYieldResultType(reportErrors) {
+            return deferredGlobalIteratorYieldResultType || (deferredGlobalIteratorYieldResultType = getGlobalType("IteratorYieldResult", /*arity*/ 1, reportErrors)) || emptyGenericType;
+        }
+        function getGlobalIteratorReturnResultType(reportErrors) {
+            return deferredGlobalIteratorReturnResultType || (deferredGlobalIteratorReturnResultType = getGlobalType("IteratorReturnResult", /*arity*/ 1, reportErrors)) || emptyGenericType;
+        }
         function getGlobalTypeOrUndefined(name, arity) {
             if (arity === void 0) { arity = 0; }
             var symbol = getGlobalSymbol(name, 67897832 /* Type */, /*diagnostic*/ undefined);
@@ -39414,11 +40202,8 @@ var ts;
         function getGlobalExtractSymbol() {
             return deferredGlobalExtractSymbol || (deferredGlobalExtractSymbol = getGlobalSymbol("Extract", 524288 /* TypeAlias */, ts.Diagnostics.Cannot_find_global_type_0)); // TODO: GH#18217
         }
-        function getGlobalExcludeSymbol() {
-            return deferredGlobalExcludeSymbol || (deferredGlobalExcludeSymbol = getGlobalSymbol("Exclude", 524288 /* TypeAlias */, ts.Diagnostics.Cannot_find_global_type_0)); // TODO: GH#18217
-        }
-        function getGlobalPickSymbol() {
-            return deferredGlobalPickSymbol || (deferredGlobalPickSymbol = getGlobalSymbol("Pick", 524288 /* TypeAlias */, ts.Diagnostics.Cannot_find_global_type_0)); // TODO: GH#18217
+        function getGlobalOmitSymbol() {
+            return deferredGlobalOmitSymbol || (deferredGlobalOmitSymbol = getGlobalSymbol("Omit", 524288 /* TypeAlias */, ts.Diagnostics.Cannot_find_global_type_0)); // TODO: GH#18217
         }
         function getGlobalBigIntType(reportErrors) {
             return deferredGlobalBigIntType || (deferredGlobalBigIntType = getGlobalType("BigInt", /*arity*/ 0, reportErrors)) || emptyObjectType;
@@ -39432,18 +40217,9 @@ var ts;
         function createTypedPropertyDescriptorType(propertyType) {
             return createTypeFromGenericGlobalType(getGlobalTypedPropertyDescriptorType(), [propertyType]);
         }
-        function createAsyncIterableType(iteratedType) {
-            return createTypeFromGenericGlobalType(getGlobalAsyncIterableType(/*reportErrors*/ true), [iteratedType]);
-        }
-        function createAsyncIterableIteratorType(iteratedType) {
-            return createTypeFromGenericGlobalType(getGlobalAsyncIterableIteratorType(/*reportErrors*/ true), [iteratedType]);
-        }
         function createIterableType(iteratedType) {
             return createTypeFromGenericGlobalType(getGlobalIterableType(/*reportErrors*/ true), [iteratedType]);
         }
-        function createIterableIteratorType(iteratedType) {
-            return createTypeFromGenericGlobalType(getGlobalIterableIteratorType(/*reportErrors*/ true), [iteratedType]);
-        }
         function createArrayType(elementType, readonly) {
             return createTypeFromGenericGlobalType(readonly ? globalReadonlyArrayType : globalArrayType, [elementType]);
         }
@@ -39455,7 +40231,7 @@ var ts;
             return links.resolvedType;
         }
         function isReadonlyTypeOperator(node) {
-            return ts.isTypeOperatorNode(node) && node.operator === 133 /* ReadonlyKeyword */;
+            return ts.isTypeOperatorNode(node) && node.operator === 134 /* ReadonlyKeyword */;
         }
         // We represent tuple types as type references to synthesized generic interface types created by
         // this function. The types are of the form:
@@ -39530,8 +40306,8 @@ var ts;
             var links = getNodeLinks(node);
             if (!links.resolvedType) {
                 var lastElement = ts.lastOrUndefined(node.elementTypes);
-                var restElement_1 = lastElement && lastElement.kind === 172 /* RestType */ ? lastElement : undefined;
-                var minLength = ts.findLastIndex(node.elementTypes, function (n) { return n.kind !== 171 /* OptionalType */ && n !== restElement_1; }) + 1;
+                var restElement_1 = lastElement && lastElement.kind === 173 /* RestType */ ? lastElement : undefined;
+                var minLength = ts.findLastIndex(node.elementTypes, function (n) { return n.kind !== 172 /* OptionalType */ && n !== restElement_1; }) + 1;
                 var elementTypes = ts.map(node.elementTypes, function (n) {
                     var type = getTypeFromTypeNode(n);
                     return n === restElement_1 && getIndexTypeOfType(type, 1 /* Number */) || type;
@@ -39566,51 +40342,20 @@ var ts;
             }
             return false;
         }
-        // Return true if the given intersection type contains
-        // more than one unit type or,
-        // an object type and a nullable type (null or undefined), or
-        // a string-like type and a type known to be non-string-like, or
-        // a number-like type and a type known to be non-number-like, or
-        // a symbol-like type and a type known to be non-symbol-like, or
-        // a void-like type and a type known to be non-void-like, or
-        // a non-primitive type and a type known to be primitive.
-        function isEmptyIntersectionType(type) {
-            var combined = 0;
-            for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
-                var t = _a[_i];
-                if (t.flags & 109440 /* Unit */ && combined & 109440 /* Unit */) {
-                    return true;
-                }
-                combined |= t.flags;
-                if (combined & 98304 /* Nullable */ && combined & (524288 /* Object */ | 67108864 /* NonPrimitive */) ||
-                    combined & 67108864 /* NonPrimitive */ && combined & (67238908 /* DisjointDomains */ & ~67108864 /* NonPrimitive */) ||
-                    combined & 132 /* StringLike */ && combined & (67238908 /* DisjointDomains */ & ~132 /* StringLike */) ||
-                    combined & 296 /* NumberLike */ && combined & (67238908 /* DisjointDomains */ & ~296 /* NumberLike */) ||
-                    combined & 2112 /* BigIntLike */ && combined & (67238908 /* DisjointDomains */ & ~2112 /* BigIntLike */) ||
-                    combined & 12288 /* ESSymbolLike */ && combined & (67238908 /* DisjointDomains */ & ~12288 /* ESSymbolLike */) ||
-                    combined & 49152 /* VoidLike */ && combined & (67238908 /* DisjointDomains */ & ~49152 /* VoidLike */)) {
-                    return true;
-                }
-            }
-            return false;
-        }
         function addTypeToUnion(typeSet, includes, type) {
             var flags = type.flags;
             if (flags & 1048576 /* Union */) {
                 return addTypesToUnion(typeSet, includes, type.types);
             }
-            // We ignore 'never' types in unions. Likewise, we ignore intersections of unit types as they are
-            // another form of 'never' (in that they have an empty value domain). We could in theory turn
-            // intersections of unit types into 'never' upon construction, but deferring the reduction makes it
-            // easier to reason about their origin.
-            if (!(flags & 131072 /* Never */ || flags & 2097152 /* Intersection */ && isEmptyIntersectionType(type))) {
-                includes |= flags & 1835007 /* IncludesMask */;
+            // We ignore 'never' types in unions
+            if (!(flags & 131072 /* Never */)) {
+                includes |= flags & 68943871 /* IncludesMask */;
                 if (flags & 66846720 /* StructuredOrInstantiable */)
                     includes |= 262144 /* IncludesStructuredOrInstantiable */;
                 if (type === wildcardType)
                     includes |= 4194304 /* IncludesWildcard */;
                 if (!strictNullChecks && flags & 98304 /* Nullable */) {
-                    if (!(ts.getObjectFlags(type) & 131072 /* ContainsWideningType */))
+                    if (!(ts.getObjectFlags(type) & 262144 /* ContainsWideningType */))
                         includes |= 2097152 /* IncludesNonWideningType */;
                 }
                 else {
@@ -39737,7 +40482,7 @@ var ts;
                             neverType;
                 }
             }
-            return getUnionTypeFromSortedList(typeSet, includes & 66994211 /* NotPrimitiveUnion */ ? 0 : 65536 /* PrimitiveUnion */, aliasSymbol, aliasTypeArguments);
+            return getUnionTypeFromSortedList(typeSet, includes & 66994211 /* NotPrimitiveUnion */ ? 0 : 131072 /* PrimitiveUnion */, aliasSymbol, aliasTypeArguments);
         }
         function getUnionTypePredicate(signatures) {
             var first;
@@ -39815,18 +40560,23 @@ var ts;
             if (isEmptyAnonymousObjectType(type)) {
                 if (!(includes & 8388608 /* IncludesEmptyObject */)) {
                     includes |= 8388608 /* IncludesEmptyObject */;
-                    typeSet.push(type);
+                    typeSet.set(type.id.toString(), type);
                 }
             }
             else {
-                includes |= flags & 1835007 /* IncludesMask */;
                 if (flags & 3 /* AnyOrUnknown */) {
                     if (type === wildcardType)
                         includes |= 4194304 /* IncludesWildcard */;
                 }
-                else if ((strictNullChecks || !(flags & 98304 /* Nullable */)) && !ts.contains(typeSet, type)) {
-                    typeSet.push(type);
+                else if ((strictNullChecks || !(flags & 98304 /* Nullable */)) && !typeSet.has(type.id.toString())) {
+                    if (type.flags & 109440 /* Unit */ && includes & 109440 /* Unit */) {
+                        // We have seen two distinct unit types which means we should reduce to an
+                        // empty intersection. Adding TypeFlags.NonPrimitive causes that to happen.
+                        includes |= 67108864 /* NonPrimitive */;
+                    }
+                    typeSet.set(type.id.toString(), type);
                 }
+                includes |= flags & 68943871 /* IncludesMask */;
             }
             return includes;
         }
@@ -39877,7 +40627,7 @@ var ts;
         // other unions and return true. Otherwise, do nothing and return false.
         function intersectUnionsOfPrimitiveTypes(types) {
             var unionTypes;
-            var index = ts.findIndex(types, function (t) { return !!(ts.getObjectFlags(t) & 65536 /* PrimitiveUnion */); });
+            var index = ts.findIndex(types, function (t) { return !!(ts.getObjectFlags(t) & 131072 /* PrimitiveUnion */); });
             if (index < 0) {
                 return false;
             }
@@ -39886,7 +40636,7 @@ var ts;
             // the unionTypes array.
             while (i < types.length) {
                 var t = types[i];
-                if (ts.getObjectFlags(t) & 65536 /* PrimitiveUnion */) {
+                if (ts.getObjectFlags(t) & 131072 /* PrimitiveUnion */) {
                     (unionTypes || (unionTypes = [types[index]])).push(t);
                     ts.orderedRemoveItemAt(types, i);
                 }
@@ -39915,9 +40665,17 @@ var ts;
                 }
             }
             // Finally replace the first union with the result
-            types[index] = getUnionTypeFromSortedList(result, 65536 /* PrimitiveUnion */);
+            types[index] = getUnionTypeFromSortedList(result, 131072 /* PrimitiveUnion */);
             return true;
         }
+        function createIntersectionType(types, aliasSymbol, aliasTypeArguments) {
+            var result = createType(2097152 /* Intersection */);
+            result.objectFlags = getPropagatingFlagsOfTypes(types, /*excludeKinds*/ 98304 /* Nullable */);
+            result.types = types;
+            result.aliasSymbol = aliasSymbol; // See comment in `getUnionTypeFromSortedList`.
+            result.aliasTypeArguments = aliasTypeArguments;
+            return result;
+        }
         // We normalize combinations of intersection and union types based on the distributive property of the '&'
         // operator. Specifically, because X & (A | B) is equivalent to X & A | X & B, we can transform intersection
         // types with union type constituents into equivalent union types with intersection type constituents and
@@ -39929,9 +40687,26 @@ var ts;
         // Also, unlike union types, the order of the constituent types is preserved in order that overload resolution
         // for intersections of types with signatures can be deterministic.
         function getIntersectionType(types, aliasSymbol, aliasTypeArguments) {
-            var typeSet = [];
-            var includes = addTypesToIntersection(typeSet, 0, types);
-            if (includes & 131072 /* Never */) {
+            var typeMembershipMap = ts.createMap();
+            var includes = addTypesToIntersection(typeMembershipMap, 0, types);
+            var typeSet = ts.arrayFrom(typeMembershipMap.values());
+            // An intersection type is considered empty if it contains
+            // the type never, or
+            // more than one unit type or,
+            // an object type and a nullable type (null or undefined), or
+            // a string-like type and a type known to be non-string-like, or
+            // a number-like type and a type known to be non-number-like, or
+            // a symbol-like type and a type known to be non-symbol-like, or
+            // a void-like type and a type known to be non-void-like, or
+            // a non-primitive type and a type known to be primitive.
+            if (includes & 131072 /* Never */ ||
+                strictNullChecks && includes & 98304 /* Nullable */ && includes & (524288 /* Object */ | 67108864 /* NonPrimitive */ | 8388608 /* IncludesEmptyObject */) ||
+                includes & 67108864 /* NonPrimitive */ && includes & (67238908 /* DisjointDomains */ & ~67108864 /* NonPrimitive */) ||
+                includes & 132 /* StringLike */ && includes & (67238908 /* DisjointDomains */ & ~132 /* StringLike */) ||
+                includes & 296 /* NumberLike */ && includes & (67238908 /* DisjointDomains */ & ~296 /* NumberLike */) ||
+                includes & 2112 /* BigIntLike */ && includes & (67238908 /* DisjointDomains */ & ~2112 /* BigIntLike */) ||
+                includes & 12288 /* ESSymbolLike */ && includes & (67238908 /* DisjointDomains */ & ~12288 /* ESSymbolLike */) ||
+                includes & 49152 /* VoidLike */ && includes & (67238908 /* DisjointDomains */ & ~49152 /* VoidLike */)) {
                 return neverType;
             }
             if (includes & 1 /* Any */) {
@@ -39955,30 +40730,36 @@ var ts;
             if (typeSet.length === 1) {
                 return typeSet[0];
             }
-            if (includes & 1048576 /* Union */) {
-                if (intersectUnionsOfPrimitiveTypes(typeSet)) {
-                    // When the intersection creates a reduced set (which might mean that *all* union types have
-                    // disappeared), we restart the operation to get a new set of combined flags. Once we have
-                    // reduced we'll never reduce again, so this occurs at most once.
-                    return getIntersectionType(typeSet, aliasSymbol, aliasTypeArguments);
-                }
-                // We are attempting to construct a type of the form X & (A | B) & Y. Transform this into a type of
-                // the form X & A & Y | X & B & Y and recursively reduce until no union type constituents remain.
-                var unionIndex_1 = ts.findIndex(typeSet, function (t) { return (t.flags & 1048576 /* Union */) !== 0; });
-                var unionType = typeSet[unionIndex_1];
-                return getUnionType(ts.map(unionType.types, function (t) { return getIntersectionType(ts.replaceElement(typeSet, unionIndex_1, t)); }), 1 /* Literal */, aliasSymbol, aliasTypeArguments);
-            }
             var id = getTypeListId(typeSet);
-            var type = intersectionTypes.get(id);
-            if (!type) {
-                type = createType(2097152 /* Intersection */);
-                intersectionTypes.set(id, type);
-                type.objectFlags = getPropagatingFlagsOfTypes(typeSet, /*excludeKinds*/ 98304 /* Nullable */);
-                type.types = typeSet;
-                type.aliasSymbol = aliasSymbol; // See comment in `getUnionTypeFromSortedList`.
-                type.aliasTypeArguments = aliasTypeArguments;
+            var result = intersectionTypes.get(id);
+            if (!result) {
+                if (includes & 1048576 /* Union */) {
+                    if (intersectUnionsOfPrimitiveTypes(typeSet)) {
+                        // When the intersection creates a reduced set (which might mean that *all* union types have
+                        // disappeared), we restart the operation to get a new set of combined flags. Once we have
+                        // reduced we'll never reduce again, so this occurs at most once.
+                        result = getIntersectionType(typeSet, aliasSymbol, aliasTypeArguments);
+                    }
+                    else {
+                        // We are attempting to construct a type of the form X & (A | B) & Y. Transform this into a type of
+                        // the form X & A & Y | X & B & Y and recursively reduce until no union type constituents remain.
+                        // If the estimated size of the resulting union type exceeds 100000 constituents, report an error.
+                        var size = ts.reduceLeft(typeSet, function (n, t) { return n * (t.flags & 1048576 /* Union */ ? t.types.length : 1); }, 1);
+                        if (size >= 100000) {
+                            error(currentNode, ts.Diagnostics.Expression_produces_a_union_type_that_is_too_complex_to_represent);
+                            return errorType;
+                        }
+                        var unionIndex_1 = ts.findIndex(typeSet, function (t) { return (t.flags & 1048576 /* Union */) !== 0; });
+                        var unionType = typeSet[unionIndex_1];
+                        result = getUnionType(ts.map(unionType.types, function (t) { return getIntersectionType(ts.replaceElement(typeSet, unionIndex_1, t)); }), 1 /* Literal */, aliasSymbol, aliasTypeArguments);
+                    }
+                }
+                else {
+                    result = createIntersectionType(typeSet, aliasSymbol, aliasTypeArguments);
+                }
+                intersectionTypes.set(id, result);
             }
-            return type;
+            return result;
         }
         function getTypeFromIntersectionTypeNode(node) {
             var links = getNodeLinks(node);
@@ -40034,18 +40815,19 @@ var ts;
             var numberIndexInfo = getIndexInfoOfType(type, 1 /* Number */);
             return numberIndexInfo !== enumNumberIndexInfo ? numberIndexInfo : undefined;
         }
-        function getIndexType(type, stringsOnly) {
+        function getIndexType(type, stringsOnly, noIndexSignatures) {
             if (stringsOnly === void 0) { stringsOnly = keyofStringsOnly; }
-            return type.flags & 1048576 /* Union */ ? getIntersectionType(ts.map(type.types, function (t) { return getIndexType(t, stringsOnly); })) :
-                type.flags & 2097152 /* Intersection */ ? getUnionType(ts.map(type.types, function (t) { return getIndexType(t, stringsOnly); })) :
+            return type.flags & 1048576 /* Union */ ? getIntersectionType(ts.map(type.types, function (t) { return getIndexType(t, stringsOnly, noIndexSignatures); })) :
+                type.flags & 2097152 /* Intersection */ ? getUnionType(ts.map(type.types, function (t) { return getIndexType(t, stringsOnly, noIndexSignatures); })) :
                     maybeTypeOfKind(type, 58982400 /* InstantiableNonPrimitive */) ? getIndexTypeForGenericType(type, stringsOnly) :
-                        ts.getObjectFlags(type) & 32 /* Mapped */ ? getConstraintTypeFromMappedType(type) :
+                        ts.getObjectFlags(type) & 32 /* Mapped */ ? filterType(getConstraintTypeFromMappedType(type), function (t) { return !(noIndexSignatures && t.flags & (1 /* Any */ | 4 /* String */)); }) :
                             type === wildcardType ? wildcardType :
-                                type.flags & 1 /* Any */ ? keyofConstraintType :
-                                    stringsOnly ? getIndexInfoOfType(type, 0 /* String */) ? stringType : getLiteralTypeFromProperties(type, 128 /* StringLiteral */) :
-                                        getIndexInfoOfType(type, 0 /* String */) ? getUnionType([stringType, numberType, getLiteralTypeFromProperties(type, 8192 /* UniqueESSymbol */)]) :
-                                            getNonEnumNumberIndexInfo(type) ? getUnionType([numberType, getLiteralTypeFromProperties(type, 128 /* StringLiteral */ | 8192 /* UniqueESSymbol */)]) :
-                                                getLiteralTypeFromProperties(type, 8576 /* StringOrNumberLiteralOrUnique */);
+                                type.flags & 2 /* Unknown */ ? neverType :
+                                    type.flags & (1 /* Any */ | 131072 /* Never */) ? keyofConstraintType :
+                                        stringsOnly ? !noIndexSignatures && getIndexInfoOfType(type, 0 /* String */) ? stringType : getLiteralTypeFromProperties(type, 128 /* StringLiteral */) :
+                                            !noIndexSignatures && getIndexInfoOfType(type, 0 /* String */) ? getUnionType([stringType, numberType, getLiteralTypeFromProperties(type, 8192 /* UniqueESSymbol */)]) :
+                                                getNonEnumNumberIndexInfo(type) ? getUnionType([numberType, getLiteralTypeFromProperties(type, 128 /* StringLiteral */ | 8192 /* UniqueESSymbol */)]) :
+                                                    getLiteralTypeFromProperties(type, 8576 /* StringOrNumberLiteralOrUnique */);
         }
         function getExtractStringType(type) {
             if (keyofStringsOnly) {
@@ -40062,15 +40844,15 @@ var ts;
             var links = getNodeLinks(node);
             if (!links.resolvedType) {
                 switch (node.operator) {
-                    case 129 /* KeyOfKeyword */:
+                    case 130 /* KeyOfKeyword */:
                         links.resolvedType = getIndexType(getTypeFromTypeNode(node.type));
                         break;
-                    case 142 /* UniqueKeyword */:
-                        links.resolvedType = node.type.kind === 139 /* SymbolKeyword */
+                    case 143 /* UniqueKeyword */:
+                        links.resolvedType = node.type.kind === 140 /* SymbolKeyword */
                             ? getESSymbolLikeTypeForNode(ts.walkUpParenthesizedTypes(node.parent))
                             : errorType;
                         break;
-                    case 133 /* ReadonlyKeyword */:
+                    case 134 /* ReadonlyKeyword */:
                         links.resolvedType = getTypeFromTypeNode(node.type);
                         break;
                 }
@@ -40110,9 +40892,9 @@ var ts;
             }
             return false;
         }
-        function getPropertyTypeForIndexType(objectType, indexType, accessNode, cacheSymbol, missingType) {
-            var accessExpression = accessNode && accessNode.kind === 190 /* ElementAccessExpression */ ? accessNode : undefined;
-            var propName = isTypeUsableAsPropertyName(indexType) ?
+        function getPropertyNameFromIndex(indexType, accessNode) {
+            var accessExpression = accessNode && accessNode.kind === 191 /* ElementAccessExpression */ ? accessNode : undefined;
+            return isTypeUsableAsPropertyName(indexType) ?
                 getPropertyNameFromType(indexType) :
                 accessExpression && checkThatExpressionIsProperSymbolReference(accessExpression.argumentExpression, indexType, /*reportError*/ false) ?
                     ts.getPropertyNameForKnownSymbolName(ts.idText(accessExpression.argumentExpression.name)) :
@@ -40120,16 +40902,20 @@ var ts;
                         // late bound names are handled in the first branch, so here we only need to handle normal names
                         ts.getPropertyNameForPropertyNameNode(accessNode) :
                         undefined;
+        }
+        function getPropertyTypeForIndexType(originalObjectType, objectType, indexType, fullIndexType, suppressNoImplicitAnyError, accessNode, accessFlags) {
+            var accessExpression = accessNode && accessNode.kind === 191 /* ElementAccessExpression */ ? accessNode : undefined;
+            var propName = getPropertyNameFromIndex(indexType, accessNode);
             if (propName !== undefined) {
                 var prop = getPropertyOfType(objectType, propName);
                 if (prop) {
                     if (accessExpression) {
-                        markPropertyAsReferenced(prop, accessExpression, /*isThisAccess*/ accessExpression.expression.kind === 100 /* ThisKeyword */);
+                        markPropertyAsReferenced(prop, accessExpression, /*isThisAccess*/ accessExpression.expression.kind === 101 /* ThisKeyword */);
                         if (ts.isAssignmentTarget(accessExpression) && (isReferenceToReadonlyEntity(accessExpression, prop) || isReferenceThroughNamespaceImport(accessExpression))) {
                             error(accessExpression.argumentExpression, ts.Diagnostics.Cannot_assign_to_0_because_it_is_a_read_only_property, symbolToString(prop));
-                            return missingType;
+                            return undefined;
                         }
-                        if (cacheSymbol) {
+                        if (accessFlags & 4 /* CacheSymbol */) {
                             getNodeLinks(accessNode).resolvedSymbol = prop;
                         }
                     }
@@ -40139,7 +40925,7 @@ var ts;
                         propType;
                 }
                 if (everyType(objectType, isTupleType) && isNumericLiteralName(propName) && +propName >= 0) {
-                    if (accessNode && everyType(objectType, function (t) { return !t.target.hasRestElement; })) {
+                    if (accessNode && everyType(objectType, function (t) { return !t.target.hasRestElement; }) && !(accessFlags & 8 /* NoTupleBoundsCheck */)) {
                         var indexNode = getIndexNodeForAccessExpression(accessNode);
                         if (isTupleType(objectType)) {
                             error(indexNode, ts.Diagnostics.Tuple_type_0_of_length_1_has_no_element_at_index_2, typeToString(objectType), getTypeReferenceArity(objectType), ts.unescapeLeadingUnderscores(propName));
@@ -40148,6 +40934,7 @@ var ts;
                             error(indexNode, ts.Diagnostics.Property_0_does_not_exist_on_type_1, ts.unescapeLeadingUnderscores(propName), typeToString(objectType));
                         }
                     }
+                    errorIfWritingToReadonlyIndex(getIndexInfoOfType(objectType, 1 /* Number */));
                     return mapType(objectType, function (t) { return getRestTypeOfTupleType(t) || undefinedType; });
                 }
             }
@@ -40155,17 +40942,21 @@ var ts;
                 if (objectType.flags & (1 /* Any */ | 131072 /* Never */)) {
                     return objectType;
                 }
-                var indexInfo = isTypeAssignableToKind(indexType, 296 /* NumberLike */) && getIndexInfoOfType(objectType, 1 /* Number */) ||
-                    getIndexInfoOfType(objectType, 0 /* String */) ||
-                    undefined;
+                var stringIndexInfo = getIndexInfoOfType(objectType, 0 /* String */);
+                var indexInfo = isTypeAssignableToKind(indexType, 296 /* NumberLike */) && getIndexInfoOfType(objectType, 1 /* Number */) || stringIndexInfo;
                 if (indexInfo) {
+                    if (accessFlags & 1 /* NoIndexSignatures */ && indexInfo === stringIndexInfo) {
+                        if (accessExpression) {
+                            error(accessExpression, ts.Diagnostics.Type_0_cannot_be_used_to_index_type_1, typeToString(indexType), typeToString(originalObjectType));
+                        }
+                        return undefined;
+                    }
                     if (accessNode && !isTypeAssignableToKind(indexType, 4 /* String */ | 8 /* Number */)) {
                         var indexNode = getIndexNodeForAccessExpression(accessNode);
                         error(indexNode, ts.Diagnostics.Type_0_cannot_be_used_as_an_index_type, typeToString(indexType));
+                        return indexInfo.type;
                     }
-                    else if (accessExpression && indexInfo.isReadonly && (ts.isAssignmentTarget(accessExpression) || ts.isDeleteTarget(accessExpression))) {
-                        error(accessExpression, ts.Diagnostics.Index_signature_in_type_0_only_permits_reading, typeToString(objectType));
-                    }
+                    errorIfWritingToReadonlyIndex(indexInfo);
                     return indexInfo.type;
                 }
                 if (indexType.flags & 131072 /* Never */) {
@@ -40175,7 +40966,10 @@ var ts;
                     return anyType;
                 }
                 if (accessExpression && !isConstEnumObjectType(objectType)) {
-                    if (noImplicitAny && !compilerOptions.suppressImplicitAnyIndexErrors) {
+                    if (objectType.symbol === globalThisSymbol && propName !== undefined && globalThisSymbol.exports.has(propName) && (globalThisSymbol.exports.get(propName).flags & 418 /* BlockScoped */)) {
+                        error(accessExpression, ts.Diagnostics.Property_0_does_not_exist_on_type_1, ts.unescapeLeadingUnderscores(propName), typeToString(objectType));
+                    }
+                    else if (noImplicitAny && !compilerOptions.suppressImplicitAnyIndexErrors && !suppressNoImplicitAnyError) {
                         if (propName !== undefined && typeHasStaticProperty(propName, objectType)) {
                             error(accessExpression, ts.Diagnostics.Property_0_is_a_static_member_of_type_1, propName, typeToString(objectType));
                         }
@@ -40190,11 +40984,35 @@ var ts;
                                 }
                             }
                             else {
-                                error(accessExpression, ts.Diagnostics.Element_implicitly_has_an_any_type_because_type_0_has_no_index_signature, typeToString(objectType));
+                                var suggestion_1 = getSuggestionForNonexistentIndexSignature(objectType, accessExpression);
+                                if (suggestion_1 !== undefined) {
+                                    error(accessExpression, ts.Diagnostics.Element_implicitly_has_an_any_type_because_type_0_has_no_index_signature_Did_you_mean_to_call_1, typeToString(objectType), suggestion_1);
+                                }
+                                else {
+                                    var errorInfo = void 0;
+                                    if (indexType.flags & 1024 /* EnumLiteral */) {
+                                        errorInfo = ts.chainDiagnosticMessages(/* details */ undefined, ts.Diagnostics.Property_0_does_not_exist_on_type_1, "[" + typeToString(indexType) + "]", typeToString(objectType));
+                                    }
+                                    else if (indexType.flags & 8192 /* UniqueESSymbol */) {
+                                        var symbolName_2 = getFullyQualifiedName(indexType.symbol, accessExpression);
+                                        errorInfo = ts.chainDiagnosticMessages(/* details */ undefined, ts.Diagnostics.Property_0_does_not_exist_on_type_1, "[" + symbolName_2 + "]", typeToString(objectType));
+                                    }
+                                    else if (indexType.flags & 128 /* StringLiteral */) {
+                                        errorInfo = ts.chainDiagnosticMessages(/* details */ undefined, ts.Diagnostics.Property_0_does_not_exist_on_type_1, indexType.value, typeToString(objectType));
+                                    }
+                                    else if (indexType.flags & 256 /* NumberLiteral */) {
+                                        errorInfo = ts.chainDiagnosticMessages(/* details */ undefined, ts.Diagnostics.Property_0_does_not_exist_on_type_1, indexType.value, typeToString(objectType));
+                                    }
+                                    else if (indexType.flags & (8 /* Number */ | 4 /* String */)) {
+                                        errorInfo = ts.chainDiagnosticMessages(/* details */ undefined, ts.Diagnostics.No_index_signature_with_a_parameter_of_type_0_was_found_on_type_1, typeToString(indexType), typeToString(objectType));
+                                    }
+                                    errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.Element_implicitly_has_an_any_type_because_expression_of_type_0_can_t_be_used_to_index_type_1, typeToString(fullIndexType), typeToString(objectType));
+                                    diagnostics.add(ts.createDiagnosticForNodeFromMessageChain(accessExpression, errorInfo));
+                                }
                             }
                         }
                     }
-                    return missingType;
+                    return undefined;
                 }
             }
             if (isJSLiteralType(objectType)) {
@@ -40215,14 +41033,19 @@ var ts;
             if (isTypeAny(indexType)) {
                 return indexType;
             }
-            return missingType;
+            return undefined;
+            function errorIfWritingToReadonlyIndex(indexInfo) {
+                if (indexInfo && indexInfo.isReadonly && accessExpression && (ts.isAssignmentTarget(accessExpression) || ts.isDeleteTarget(accessExpression))) {
+                    error(accessExpression, ts.Diagnostics.Index_signature_in_type_0_only_permits_reading, typeToString(objectType));
+                }
+            }
         }
         function getIndexNodeForAccessExpression(accessNode) {
-            return accessNode.kind === 190 /* ElementAccessExpression */
+            return accessNode.kind === 191 /* ElementAccessExpression */
                 ? accessNode.argumentExpression
-                : accessNode.kind === 180 /* IndexedAccessType */
+                : accessNode.kind === 181 /* IndexedAccessType */
                     ? accessNode.indexType
-                    : accessNode.kind === 149 /* ComputedPropertyName */
+                    : accessNode.kind === 150 /* ComputedPropertyName */
                         ? accessNode.expression
                         : accessNode;
         }
@@ -40232,64 +41055,124 @@ var ts;
         function isGenericIndexType(type) {
             return maybeTypeOfKind(type, 58982400 /* InstantiableNonPrimitive */ | 4194304 /* Index */);
         }
-        function getSimplifiedType(type) {
-            return type.flags & 8388608 /* IndexedAccess */ ? getSimplifiedIndexedAccessType(type) : type;
+        function isThisTypeParameter(type) {
+            return !!(type.flags & 262144 /* TypeParameter */ && type.isThisType);
         }
-        function distributeIndexOverObjectType(objectType, indexType) {
-            // (T | U)[K] -> T[K] | U[K]
-            if (objectType.flags & 1048576 /* Union */) {
-                return mapType(objectType, function (t) { return getSimplifiedType(getIndexedAccessType(t, indexType)); });
-            }
+        function getSimplifiedType(type, writing) {
+            return type.flags & 8388608 /* IndexedAccess */ ? getSimplifiedIndexedAccessType(type, writing) :
+                type.flags & 16777216 /* Conditional */ ? getSimplifiedConditionalType(type, writing) :
+                    type;
+        }
+        function distributeIndexOverObjectType(objectType, indexType, writing) {
+            // (T | U)[K] -> T[K] | U[K] (reading)
+            // (T | U)[K] -> T[K] & U[K] (writing)
             // (T & U)[K] -> T[K] & U[K]
-            if (objectType.flags & 2097152 /* Intersection */) {
-                return getIntersectionType(ts.map(objectType.types, function (t) { return getSimplifiedType(getIndexedAccessType(t, indexType)); }));
+            if (objectType.flags & 3145728 /* UnionOrIntersection */) {
+                var types = ts.map(objectType.types, function (t) { return getSimplifiedType(getIndexedAccessType(t, indexType), writing); });
+                return objectType.flags & 2097152 /* Intersection */ || writing ? getIntersectionType(types) : getUnionType(types);
+            }
+        }
+        function distributeObjectOverIndexType(objectType, indexType, writing) {
+            // T[A | B] -> T[A] | T[B] (reading)
+            // T[A | B] -> T[A] & T[B] (writing)
+            if (indexType.flags & 1048576 /* Union */) {
+                var types = ts.map(indexType.types, function (t) { return getSimplifiedType(getIndexedAccessType(objectType, t), writing); });
+                return writing ? getIntersectionType(types) : getUnionType(types);
             }
         }
         // Transform an indexed access to a simpler form, if possible. Return the simpler form, or return
-        // the type itself if no transformation is possible.
-        function getSimplifiedIndexedAccessType(type) {
-            if (type.simplified) {
-                return type.simplified === circularConstraintType ? type : type.simplified;
+        // the type itself if no transformation is possible. The writing flag indicates that the type is
+        // the target of an assignment.
+        function getSimplifiedIndexedAccessType(type, writing) {
+            var cache = writing ? "simplifiedForWriting" : "simplifiedForReading";
+            if (type[cache]) {
+                return type[cache] === circularConstraintType ? type : type[cache];
             }
-            type.simplified = circularConstraintType;
+            type[cache] = circularConstraintType;
             // We recursively simplify the object type as it may in turn be an indexed access type. For example, with
             // '{ [P in T]: { [Q in U]: number } }[T][U]' we want to first simplify the inner indexed access type.
-            var objectType = getSimplifiedType(type.objectType);
-            var indexType = getSimplifiedType(type.indexType);
-            // T[A | B] -> T[A] | T[B]
-            if (indexType.flags & 1048576 /* Union */) {
-                return type.simplified = mapType(indexType, function (t) { return getSimplifiedType(getIndexedAccessType(objectType, t)); });
+            var objectType = getSimplifiedType(type.objectType, writing);
+            var indexType = getSimplifiedType(type.indexType, writing);
+            // T[A | B] -> T[A] | T[B] (reading)
+            // T[A | B] -> T[A] & T[B] (writing)
+            var distributedOverIndex = distributeObjectOverIndexType(objectType, indexType, writing);
+            if (distributedOverIndex) {
+                return type[cache] = distributedOverIndex;
             }
             // Only do the inner distributions if the index can no longer be instantiated to cause index distribution again
             if (!(indexType.flags & 63176704 /* Instantiable */)) {
-                var simplified = distributeIndexOverObjectType(objectType, indexType);
-                if (simplified) {
-                    return type.simplified = simplified;
+                // (T | U)[K] -> T[K] | U[K] (reading)
+                // (T | U)[K] -> T[K] & U[K] (writing)
+                // (T & U)[K] -> T[K] & U[K]
+                var distributedOverObject = distributeIndexOverObjectType(objectType, indexType, writing);
+                if (distributedOverObject) {
+                    return type[cache] = distributedOverObject;
                 }
             }
-            // So ultimately:
+            // So ultimately (reading):
             // ((A & B) | C)[K1 | K2] -> ((A & B) | C)[K1] | ((A & B) | C)[K2] -> (A & B)[K1] | C[K1] | (A & B)[K2] | C[K2] -> (A[K1] & B[K1]) | C[K1] | (A[K2] & B[K2]) | C[K2]
             // If the object type is a mapped type { [P in K]: E }, where K is generic, instantiate E using a mapper
             // that substitutes the index type for P. For example, for an index access { [P in K]: Box<T[P]> }[X], we
             // construct the type Box<T[X]>.
             if (isGenericMappedType(objectType)) {
-                var mapper = createTypeMapper([getTypeParameterFromMappedType(objectType)], [type.indexType]);
-                var templateMapper = combineTypeMappers(objectType.mapper, mapper);
-                return type.simplified = mapType(instantiateType(getTemplateTypeFromMappedType(objectType), templateMapper), getSimplifiedType);
+                return type[cache] = mapType(substituteIndexedMappedType(objectType, type.indexType), function (t) { return getSimplifiedType(t, writing); });
             }
-            return type.simplified = type;
+            return type[cache] = type;
         }
-        function getIndexedAccessType(objectType, indexType, accessNode, missingType) {
-            if (missingType === void 0) { missingType = accessNode ? errorType : unknownType; }
+        function getSimplifiedConditionalType(type, writing) {
+            var checkType = type.checkType;
+            var extendsType = type.extendsType;
+            var trueType = getTrueTypeFromConditionalType(type);
+            var falseType = getFalseTypeFromConditionalType(type);
+            // Simplifications for types of the form `T extends U ? T : never` and `T extends U ? never : T`.
+            if (falseType.flags & 131072 /* Never */ && getActualTypeVariable(trueType) === getActualTypeVariable(checkType)) {
+                if (checkType.flags & 1 /* Any */ || isTypeAssignableTo(getRestrictiveInstantiation(checkType), getRestrictiveInstantiation(extendsType))) { // Always true
+                    return getSimplifiedType(trueType, writing);
+                }
+                else if (isIntersectionEmpty(checkType, extendsType)) { // Always false
+                    return neverType;
+                }
+            }
+            else if (trueType.flags & 131072 /* Never */ && getActualTypeVariable(falseType) === getActualTypeVariable(checkType)) {
+                if (!(checkType.flags & 1 /* Any */) && isTypeAssignableTo(getRestrictiveInstantiation(checkType), getRestrictiveInstantiation(extendsType))) { // Always true
+                    return neverType;
+                }
+                else if (checkType.flags & 1 /* Any */ || isIntersectionEmpty(checkType, extendsType)) { // Always false
+                    return getSimplifiedType(falseType, writing);
+                }
+            }
+            return type;
+        }
+        /**
+         * Invokes union simplification logic to determine if an intersection is considered empty as a union constituent
+         */
+        function isIntersectionEmpty(type1, type2) {
+            return !!(getUnionType([intersectTypes(type1, type2), neverType]).flags & 131072 /* Never */);
+        }
+        function substituteIndexedMappedType(objectType, index) {
+            var mapper = createTypeMapper([getTypeParameterFromMappedType(objectType)], [index]);
+            var templateMapper = combineTypeMappers(objectType.mapper, mapper);
+            return instantiateType(getTemplateTypeFromMappedType(objectType), templateMapper);
+        }
+        function getIndexedAccessType(objectType, indexType, accessNode) {
+            return getIndexedAccessTypeOrUndefined(objectType, indexType, accessNode, 0 /* None */) || (accessNode ? errorType : unknownType);
+        }
+        function getIndexedAccessTypeOrUndefined(objectType, indexType, accessNode, accessFlags) {
+            if (accessFlags === void 0) { accessFlags = 0 /* None */; }
             if (objectType === wildcardType || indexType === wildcardType) {
                 return wildcardType;
             }
+            // If the object type has a string index signature and no other members we know that the result will
+            // always be the type of that index signature and we can simplify accordingly.
+            if (isStringIndexSignatureOnlyType(objectType) && !(indexType.flags & 98304 /* Nullable */) && isTypeAssignableToKind(indexType, 4 /* String */ | 8 /* Number */)) {
+                indexType = stringType;
+            }
             // If the index type is generic, or if the object type is generic and doesn't originate in an expression,
             // we are performing a higher-order index access where we cannot meaningfully access the properties of the
             // object type. Note that for a generic T and a non-generic K, we eagerly resolve T[K] if it originates in
             // an expression. This is to preserve backwards compatibility. For example, an element access 'this["foo"]'
             // has always been resolved eagerly using the constraint type of 'this' at the given location.
-            if (isGenericIndexType(indexType) || !(accessNode && accessNode.kind !== 180 /* IndexedAccessType */) && isGenericObjectType(objectType)) {
+            if (isGenericIndexType(indexType) || !(accessNode && accessNode.kind !== 181 /* IndexedAccessType */) && isGenericObjectType(objectType)) {
                 if (objectType.flags & 3 /* AnyOrUnknown */) {
                     return objectType;
                 }
@@ -40310,25 +41193,25 @@ var ts;
                 var wasMissingProp = false;
                 for (var _i = 0, _a = indexType.types; _i < _a.length; _i++) {
                     var t = _a[_i];
-                    var propType = getPropertyTypeForIndexType(apparentObjectType, t, accessNode, /*cacheSymbol*/ false, missingType);
-                    if (propType === missingType) {
-                        if (!accessNode) {
-                            // If there's no error node, we can immeditely stop, since error reporting is off
-                            return missingType;
-                        }
-                        else {
-                            // Otherwise we set a flag and return at the end of the loop so we still mark all errors
-                            wasMissingProp = true;
-                        }
+                    var propType = getPropertyTypeForIndexType(objectType, apparentObjectType, t, indexType, wasMissingProp, accessNode, accessFlags);
+                    if (propType) {
+                        propTypes.push(propType);
+                    }
+                    else if (!accessNode) {
+                        // If there's no error node, we can immeditely stop, since error reporting is off
+                        return undefined;
+                    }
+                    else {
+                        // Otherwise we set a flag and return at the end of the loop so we still mark all errors
+                        wasMissingProp = true;
                     }
-                    propTypes.push(propType);
                 }
                 if (wasMissingProp) {
-                    return missingType;
+                    return undefined;
                 }
-                return getUnionType(propTypes);
+                return accessFlags & 2 /* Writing */ ? getIntersectionType(propTypes) : getUnionType(propTypes);
             }
-            return getPropertyTypeForIndexType(apparentObjectType, indexType, accessNode, /*cacheSymbol*/ true, missingType);
+            return getPropertyTypeForIndexType(objectType, apparentObjectType, indexType, indexType, /* supressNoImplicitAnyError */ false, accessNode, accessFlags | 4 /* CacheSymbol */);
         }
         function getTypeFromIndexedAccessTypeNode(node) {
             var links = getNodeLinks(node);
@@ -40358,13 +41241,14 @@ var ts;
             return links.resolvedType;
         }
         function getActualTypeVariable(type) {
-            return type.flags & 33554432 /* Substitution */ ? type.typeVariable : type;
-        }
-        /**
-         * Invokes union simplification logic to determine if an intersection is considered empty as a union constituent
-         */
-        function isIntersectionEmpty(type1, type2) {
-            return !!(getUnionType([intersectTypes(type1, type2), neverType]).flags & 131072 /* Never */);
+            if (type.flags & 33554432 /* Substitution */) {
+                return type.typeVariable;
+            }
+            if (type.flags & 8388608 /* IndexedAccess */ && (type.objectType.flags & 33554432 /* Substitution */ ||
+                type.indexType.flags & 33554432 /* Substitution */)) {
+                return getIndexedAccessType(getActualTypeVariable(type.objectType), getActualTypeVariable(type.indexType));
+            }
+            return type;
         }
         function getConditionalType(root, mapper) {
             var checkType = instantiateType(root.checkType, mapper);
@@ -40372,35 +41256,6 @@ var ts;
             if (checkType === wildcardType || extendsType === wildcardType) {
                 return wildcardType;
             }
-            var trueType = instantiateType(root.trueType, mapper);
-            var falseType = instantiateType(root.falseType, mapper);
-            var instantiationId = "" + (root.isDistributive ? "d" : "") + getTypeId(checkType) + ">" + getTypeId(extendsType) + "?" + getTypeId(trueType) + ":" + getTypeId(falseType);
-            var result = conditionalTypes.get(instantiationId);
-            if (result) {
-                return result;
-            }
-            var newResult = getConditionalTypeWorker(root, mapper, checkType, extendsType, trueType, falseType);
-            conditionalTypes.set(instantiationId, newResult);
-            return newResult;
-        }
-        function getConditionalTypeWorker(root, mapper, checkType, extendsType, trueType, falseType) {
-            // Simplifications for types of the form `T extends U ? T : never` and `T extends U ? never : T`.
-            if (falseType.flags & 131072 /* Never */ && isTypeIdenticalTo(getActualTypeVariable(trueType), getActualTypeVariable(checkType))) {
-                if (checkType.flags & 1 /* Any */ || isTypeAssignableTo(getRestrictiveInstantiation(checkType), getRestrictiveInstantiation(extendsType))) { // Always true
-                    return getDefaultConstraintOfTrueBranchOfConditionalType(root, /*combinedMapper*/ undefined, mapper);
-                }
-                else if (isIntersectionEmpty(checkType, extendsType)) { // Always false
-                    return neverType;
-                }
-            }
-            else if (trueType.flags & 131072 /* Never */ && isTypeIdenticalTo(getActualTypeVariable(falseType), getActualTypeVariable(checkType))) {
-                if (!(checkType.flags & 1 /* Any */) && isTypeAssignableTo(getRestrictiveInstantiation(checkType), getRestrictiveInstantiation(extendsType))) { // Always true
-                    return neverType;
-                }
-                else if (checkType.flags & 1 /* Any */ || isIntersectionEmpty(checkType, extendsType)) { // Always false
-                    return falseType; // TODO: Intersect negated `extends` type here
-                }
-            }
             var checkTypeInstantiable = maybeTypeOfKind(checkType, 63176704 /* Instantiable */ | 131072 /* GenericMappedType */);
             var combinedMapper;
             if (root.inferTypeParameters) {
@@ -40409,27 +41264,27 @@ var ts;
                     // We don't want inferences from constraints as they may cause us to eagerly resolve the
                     // conditional type instead of deferring resolution. Also, we always want strict function
                     // types rules (i.e. proper contravariance) for inferences.
-                    inferTypes(context.inferences, checkType, extendsType, 32 /* NoConstraints */ | 64 /* AlwaysStrict */);
+                    inferTypes(context.inferences, checkType, extendsType, 64 /* NoConstraints */ | 128 /* AlwaysStrict */);
                 }
-                combinedMapper = combineTypeMappers(mapper, context);
+                combinedMapper = combineTypeMappers(mapper, context.mapper);
             }
             // Instantiate the extends type including inferences for 'infer T' type parameters
             var inferredExtendsType = combinedMapper ? instantiateType(root.extendsType, combinedMapper) : extendsType;
             // We attempt to resolve the conditional type only when the check and extends types are non-generic
             if (!checkTypeInstantiable && !maybeTypeOfKind(inferredExtendsType, 63176704 /* Instantiable */ | 131072 /* GenericMappedType */)) {
                 if (inferredExtendsType.flags & 3 /* AnyOrUnknown */) {
-                    return trueType;
+                    return instantiateType(root.trueType, combinedMapper || mapper);
                 }
                 // Return union of trueType and falseType for 'any' since it matches anything
                 if (checkType.flags & 1 /* Any */) {
-                    return getUnionType([instantiateType(root.trueType, combinedMapper || mapper), falseType]);
+                    return getUnionType([instantiateType(root.trueType, combinedMapper || mapper), instantiateType(root.falseType, mapper)]);
                 }
                 // Return falseType for a definitely false extends check. We check an instantiations of the two
                 // types with type parameters mapped to the wildcard type, the most permissive instantiations
                 // possible (the wildcard type is assignable to and from all types). If those are not related,
                 // then no instantiations will be and we can just return the false branch type.
                 if (!isTypeAssignableTo(getPermissiveInstantiation(checkType), getPermissiveInstantiation(inferredExtendsType))) {
-                    return falseType;
+                    return instantiateType(root.falseType, mapper);
                 }
                 // Return trueType for a definitely true extends check. We check instantiations of the two
                 // types with type parameters mapped to their restrictive form, i.e. a form of the type parameter
@@ -40448,10 +41303,6 @@ var ts;
             result.extendsType = extendsType;
             result.mapper = mapper;
             result.combinedMapper = combinedMapper;
-            if (!combinedMapper) {
-                result.resolvedTrueType = trueType;
-                result.resolvedFalseType = falseType;
-            }
             result.aliasSymbol = root.aliasSymbol;
             result.aliasTypeArguments = instantiateTypes(root.aliasTypeArguments, mapper); // TODO: GH#18217
             return result;
@@ -40462,6 +41313,9 @@ var ts;
         function getFalseTypeFromConditionalType(type) {
             return type.resolvedFalseType || (type.resolvedFalseType = instantiateType(type.root.falseType, type.mapper));
         }
+        function getInferredTrueTypeFromConditionalType(type) {
+            return type.resolvedInferredTrueType || (type.resolvedInferredTrueType = type.combinedMapper ? instantiateType(type.root.trueType, type.combinedMapper) : getTrueTypeFromConditionalType(type));
+        }
         function getInferTypeParameters(node) {
             var result;
             if (node.locals) {
@@ -40473,20 +41327,6 @@ var ts;
             }
             return result;
         }
-        function isPossiblyReferencedInConditionalType(tp, node) {
-            if (isTypeParameterPossiblyReferenced(tp, node)) {
-                return true;
-            }
-            while (node) {
-                if (node.kind === 175 /* ConditionalType */) {
-                    if (isTypeParameterPossiblyReferenced(tp, node.extendsType)) {
-                        return true;
-                    }
-                }
-                node = node.parent;
-            }
-            return false;
-        }
         function getTypeFromConditionalTypeNode(node) {
             var links = getNodeLinks(node);
             if (!links.resolvedType) {
@@ -40494,7 +41334,7 @@ var ts;
                 var aliasSymbol = getAliasSymbolForTypeNode(node);
                 var aliasTypeArguments = getTypeArgumentsForAliasSymbol(aliasSymbol);
                 var allOuterTypeParameters = getOuterTypeParameters(node, /*includeThisTypes*/ true);
-                var outerTypeParameters = aliasTypeArguments ? allOuterTypeParameters : ts.filter(allOuterTypeParameters, function (tp) { return isPossiblyReferencedInConditionalType(tp, node); });
+                var outerTypeParameters = aliasTypeArguments ? allOuterTypeParameters : ts.filter(allOuterTypeParameters, function (tp) { return isTypeParameterPossiblyReferenced(tp, node); });
                 var root = {
                     node: node,
                     checkType: checkType,
@@ -40714,7 +41554,7 @@ var ts;
                 }
             }
             var spread = createAnonymousType(symbol, members, ts.emptyArray, ts.emptyArray, getIndexInfoWithReadonly(stringIndexInfo, readonly), getIndexInfoWithReadonly(numberIndexInfo, readonly));
-            spread.objectFlags |= 128 /* ObjectLiteral */ | 262144 /* ContainsObjectLiteral */ | 1024 /* ContainsSpread */ | objectFlags;
+            spread.objectFlags |= 128 /* ObjectLiteral */ | 524288 /* ContainsObjectOrArrayLiteral */ | 1024 /* ContainsSpread */ | objectFlags;
             return spread;
         }
         /** We approximate own properties as non-methods plus methods that are inside the object literal */
@@ -40805,9 +41645,9 @@ var ts;
         function getThisType(node) {
             var container = ts.getThisContainer(node, /*includeArrowFunctions*/ false);
             var parent = container && container.parent;
-            if (parent && (ts.isClassLike(parent) || parent.kind === 241 /* InterfaceDeclaration */)) {
+            if (parent && (ts.isClassLike(parent) || parent.kind === 242 /* InterfaceDeclaration */)) {
                 if (!ts.hasModifier(container, 32 /* Static */) &&
-                    (container.kind !== 157 /* Constructor */ || ts.isNodeDescendantOf(node, container.body))) {
+                    (container.kind !== 158 /* Constructor */ || ts.isNodeDescendantOf(node, container.body))) {
                     return getDeclaredTypeOfClassOrInterface(getSymbolOfNode(parent)).thisType;
                 }
             }
@@ -40823,89 +41663,89 @@ var ts;
         }
         function getTypeFromTypeNode(node) {
             switch (node.kind) {
-                case 120 /* AnyKeyword */:
-                case 289 /* JSDocAllType */:
-                case 290 /* JSDocUnknownType */:
+                case 121 /* AnyKeyword */:
+                case 290 /* JSDocAllType */:
+                case 291 /* JSDocUnknownType */:
                     return anyType;
-                case 143 /* UnknownKeyword */:
+                case 144 /* UnknownKeyword */:
                     return unknownType;
-                case 138 /* StringKeyword */:
+                case 139 /* StringKeyword */:
                     return stringType;
-                case 135 /* NumberKeyword */:
+                case 136 /* NumberKeyword */:
                     return numberType;
-                case 146 /* BigIntKeyword */:
+                case 147 /* BigIntKeyword */:
                     return bigintType;
-                case 123 /* BooleanKeyword */:
+                case 124 /* BooleanKeyword */:
                     return booleanType;
-                case 139 /* SymbolKeyword */:
+                case 140 /* SymbolKeyword */:
                     return esSymbolType;
-                case 106 /* VoidKeyword */:
+                case 107 /* VoidKeyword */:
                     return voidType;
-                case 141 /* UndefinedKeyword */:
+                case 142 /* UndefinedKeyword */:
                     return undefinedType;
-                case 96 /* NullKeyword */:
+                case 97 /* NullKeyword */:
                     return nullType;
-                case 132 /* NeverKeyword */:
+                case 133 /* NeverKeyword */:
                     return neverType;
-                case 136 /* ObjectKeyword */:
+                case 137 /* ObjectKeyword */:
                     return node.flags & 65536 /* JavaScriptFile */ ? anyType : nonPrimitiveType;
-                case 178 /* ThisType */:
-                case 100 /* ThisKeyword */:
+                case 179 /* ThisType */:
+                case 101 /* ThisKeyword */:
                     return getTypeFromThisTypeNode(node);
-                case 182 /* LiteralType */:
+                case 183 /* LiteralType */:
                     return getTypeFromLiteralTypeNode(node);
-                case 164 /* TypeReference */:
+                case 165 /* TypeReference */:
                     return getTypeFromTypeReference(node);
-                case 163 /* TypePredicate */:
+                case 164 /* TypePredicate */:
                     return booleanType;
-                case 211 /* ExpressionWithTypeArguments */:
+                case 212 /* ExpressionWithTypeArguments */:
                     return getTypeFromTypeReference(node);
-                case 167 /* TypeQuery */:
+                case 168 /* TypeQuery */:
                     return getTypeFromTypeQueryNode(node);
-                case 169 /* ArrayType */:
+                case 170 /* ArrayType */:
                     return getTypeFromArrayTypeNode(node);
-                case 170 /* TupleType */:
+                case 171 /* TupleType */:
                     return getTypeFromTupleTypeNode(node);
-                case 171 /* OptionalType */:
+                case 172 /* OptionalType */:
                     return getTypeFromOptionalTypeNode(node);
-                case 173 /* UnionType */:
+                case 174 /* UnionType */:
                     return getTypeFromUnionTypeNode(node);
-                case 174 /* IntersectionType */:
+                case 175 /* IntersectionType */:
                     return getTypeFromIntersectionTypeNode(node);
-                case 291 /* JSDocNullableType */:
+                case 292 /* JSDocNullableType */:
                     return getTypeFromJSDocNullableTypeNode(node);
-                case 293 /* JSDocOptionalType */:
+                case 294 /* JSDocOptionalType */:
                     return addOptionality(getTypeFromTypeNode(node.type));
-                case 177 /* ParenthesizedType */:
-                case 172 /* RestType */:
-                case 292 /* JSDocNonNullableType */:
-                case 288 /* JSDocTypeExpression */:
+                case 178 /* ParenthesizedType */:
+                case 173 /* RestType */:
+                case 293 /* JSDocNonNullableType */:
+                case 289 /* JSDocTypeExpression */:
                     return getTypeFromTypeNode(node.type);
-                case 295 /* JSDocVariadicType */:
+                case 296 /* JSDocVariadicType */:
                     return getTypeFromJSDocVariadicType(node);
-                case 165 /* FunctionType */:
-                case 166 /* ConstructorType */:
-                case 168 /* TypeLiteral */:
-                case 297 /* JSDocTypeLiteral */:
-                case 294 /* JSDocFunctionType */:
-                case 298 /* JSDocSignature */:
+                case 166 /* FunctionType */:
+                case 167 /* ConstructorType */:
+                case 169 /* TypeLiteral */:
+                case 298 /* JSDocTypeLiteral */:
+                case 295 /* JSDocFunctionType */:
+                case 299 /* JSDocSignature */:
                     return getTypeFromTypeLiteralOrFunctionOrConstructorTypeNode(node);
-                case 179 /* TypeOperator */:
+                case 180 /* TypeOperator */:
                     return getTypeFromTypeOperatorNode(node);
-                case 180 /* IndexedAccessType */:
+                case 181 /* IndexedAccessType */:
                     return getTypeFromIndexedAccessTypeNode(node);
-                case 181 /* MappedType */:
+                case 182 /* MappedType */:
                     return getTypeFromMappedTypeNode(node);
-                case 175 /* ConditionalType */:
+                case 176 /* ConditionalType */:
                     return getTypeFromConditionalTypeNode(node);
-                case 176 /* InferType */:
+                case 177 /* InferType */:
                     return getTypeFromInferTypeNode(node);
-                case 183 /* ImportType */:
+                case 184 /* ImportType */:
                     return getTypeFromImportTypeNode(node);
                 // This function assumes that an identifier or qualified name is a type expression
                 // Callers should first ensure this by calling isTypeNode
-                case 72 /* Identifier */:
-                case 148 /* QualifiedName */:
+                case 73 /* Identifier */:
+                case 149 /* QualifiedName */:
                     var symbol = getSymbolAtLocation(node);
                     return symbol ? getDeclaredTypeOfSymbol(symbol) : errorType;
                 default:
@@ -40964,33 +41804,8 @@ var ts;
          * Maps forward-references to later types parameters to the empty object type.
          * This is used during inference when instantiating type parameter defaults.
          */
-        function createBackreferenceMapper(typeParameters, index) {
-            return function (t) { return typeParameters.indexOf(t) >= index ? emptyObjectType : t; };
-        }
-        function isInferenceContext(mapper) {
-            return !!mapper.typeParameters;
-        }
-        function cloneTypeMapper(mapper, extraFlags) {
-            if (extraFlags === void 0) { extraFlags = 0; }
-            return mapper && isInferenceContext(mapper) ?
-                createInferenceContext(mapper.typeParameters, mapper.signature, mapper.flags | extraFlags, mapper.compareTypes, mapper.inferences) :
-                mapper;
-        }
-        function cloneInferredPartOfContext(context) {
-            // Filter context to only those parameters which actually have inference candidates
-            var params = [];
-            var inferences = [];
-            for (var i = 0; i < context.typeParameters.length; i++) {
-                var info = context.inferences[i];
-                if (info.candidates || info.contraCandidates) {
-                    params.push(context.typeParameters[i]);
-                    inferences.push(info);
-                }
-            }
-            if (!params.length) {
-                return undefined;
-            }
-            return createInferenceContext(params, context.signature, context.flags | 1 /* NoDefault */, context.compareTypes, inferences);
+        function createBackreferenceMapper(context, index) {
+            return function (t) { return ts.findIndex(context.inferences, function (info) { return info.typeParameter === t; }) >= index ? unknownType : t; };
         }
         function combineTypeMappers(mapper1, mapper2) {
             if (!mapper1)
@@ -41073,7 +41888,7 @@ var ts;
             }
             // Keep the flags from the symbol we're instantiating.  Mark that is instantiated, and
             // also transient so that we can just store data on it directly.
-            var result = createSymbol(symbol.flags, symbol.escapedName, 1 /* Instantiated */ | ts.getCheckFlags(symbol) & (8 /* Readonly */ | 2048 /* Late */ | 8192 /* OptionalParameter */ | 16384 /* RestParameter */));
+            var result = createSymbol(symbol.flags, symbol.escapedName, 1 /* Instantiated */ | ts.getCheckFlags(symbol) & (8 /* Readonly */ | 4096 /* Late */ | 16384 /* OptionalParameter */ | 32768 /* RestParameter */));
             result.declarations = symbol.declarations;
             result.parent = symbol.parent;
             result.target = symbol;
@@ -41139,28 +41954,31 @@ var ts;
             return type;
         }
         function maybeTypeParameterReference(node) {
-            return !(node.kind === 148 /* QualifiedName */ ||
-                node.parent.kind === 164 /* TypeReference */ && node.parent.typeArguments && node === node.parent.typeName);
+            return !(node.kind === 149 /* QualifiedName */ ||
+                node.parent.kind === 165 /* TypeReference */ && node.parent.typeArguments && node === node.parent.typeName);
         }
         function isTypeParameterPossiblyReferenced(tp, node) {
             // If the type parameter doesn't have exactly one declaration, if there are invening statement blocks
             // between the node and the type parameter declaration, if the node contains actual references to the
             // type parameter, or if the node contains type queries, we consider the type parameter possibly referenced.
             if (tp.symbol && tp.symbol.declarations && tp.symbol.declarations.length === 1) {
-                var container_3 = tp.symbol.declarations[0].parent;
-                if (ts.findAncestor(node, function (n) { return n.kind === 218 /* Block */ ? "quit" : n === container_3; })) {
-                    return !!ts.forEachChild(node, containsReference);
+                var container = tp.symbol.declarations[0].parent;
+                for (var n = node; n !== container; n = n.parent) {
+                    if (!n || n.kind === 219 /* Block */ || n.kind === 176 /* ConditionalType */ && ts.forEachChild(n.extendsType, containsReference)) {
+                        return true;
+                    }
                 }
+                return !!ts.forEachChild(node, containsReference);
             }
             return true;
             function containsReference(node) {
                 switch (node.kind) {
-                    case 178 /* ThisType */:
+                    case 179 /* ThisType */:
                         return !!tp.isThisType;
-                    case 72 /* Identifier */:
+                    case 73 /* Identifier */:
                         return !tp.isThisType && ts.isPartOfTypeNode(node) && maybeTypeParameterReference(node) &&
                             getTypeFromTypeNode(node) === tp;
-                    case 167 /* TypeQuery */:
+                    case 168 /* TypeQuery */:
                         return true;
                 }
                 return !!ts.forEachChild(node, containsReference);
@@ -41285,13 +42103,14 @@ var ts;
             if (!type || !mapper || mapper === identityMapper) {
                 return type;
             }
-            if (instantiationDepth === 50) {
+            if (instantiationDepth === 50 || instantiationCount >= 5000000) {
                 // We have reached 50 recursive type instantiations and there is a very high likelyhood we're dealing
                 // with a combination of infinite generic types that perpetually generate new type identities. We stop
                 // the recursion here by yielding the error type.
                 error(currentNode, ts.Diagnostics.Type_instantiation_is_excessively_deep_and_possibly_infinite);
                 return errorType;
             }
+            instantiationCount++;
             instantiationDepth++;
             var result = instantiateTypeWorker(type, mapper);
             instantiationDepth--;
@@ -41308,7 +42127,7 @@ var ts;
                     // If the anonymous type originates in a declaration of a function, method, class, or
                     // interface, in an object type literal, or in an object literal expression, we may need
                     // to instantiate the type because it might reference a type parameter.
-                    return type.symbol && type.symbol.flags & (16 /* Function */ | 8192 /* Method */ | 32 /* Class */ | 2048 /* TypeLiteral */ | 4096 /* ObjectLiteral */) && type.symbol.declarations ?
+                    return couldContainTypeVariables(type) ?
                         getAnonymousTypeInstantiation(type, mapper) : type;
                 }
                 if (objectFlags & 32 /* Mapped */) {
@@ -41346,7 +42165,11 @@ var ts;
                     return getSubstitutionType(maybeVariable, instantiateType(type.substitute, mapper));
                 }
                 else {
-                    return maybeVariable;
+                    var sub = instantiateType(type.substitute, mapper);
+                    if (sub.flags & 3 /* AnyOrUnknown */ || isTypeAssignableTo(getRestrictiveInstantiation(maybeVariable), getRestrictiveInstantiation(sub))) {
+                        return maybeVariable;
+                    }
+                    return sub;
                 }
             }
             return type;
@@ -41377,34 +42200,35 @@ var ts;
         // Returns true if the given expression contains (at any level of nesting) a function or arrow expression
         // that is subject to contextual typing.
         function isContextSensitive(node) {
-            ts.Debug.assert(node.kind !== 156 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 157 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
             switch (node.kind) {
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
-                case 156 /* MethodDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
+                case 157 /* MethodDeclaration */:
+                case 240 /* FunctionDeclaration */: // Function declarations can have context when annotated with a jsdoc @type
                     return isContextSensitiveFunctionLikeDeclaration(node);
-                case 188 /* ObjectLiteralExpression */:
+                case 189 /* ObjectLiteralExpression */:
                     return ts.some(node.properties, isContextSensitive);
-                case 187 /* ArrayLiteralExpression */:
+                case 188 /* ArrayLiteralExpression */:
                     return ts.some(node.elements, isContextSensitive);
-                case 205 /* ConditionalExpression */:
+                case 206 /* ConditionalExpression */:
                     return isContextSensitive(node.whenTrue) ||
                         isContextSensitive(node.whenFalse);
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return node.operatorToken.kind === 55 /* BarBarToken */ &&
                         (isContextSensitive(node.left) || isContextSensitive(node.right));
-                case 275 /* PropertyAssignment */:
+                case 276 /* PropertyAssignment */:
                     return isContextSensitive(node.initializer);
-                case 195 /* ParenthesizedExpression */:
+                case 196 /* ParenthesizedExpression */:
                     return isContextSensitive(node.expression);
-                case 268 /* JsxAttributes */:
+                case 269 /* JsxAttributes */:
                     return ts.some(node.properties, isContextSensitive) || ts.isJsxOpeningElement(node.parent) && ts.some(node.parent.parent.children, isContextSensitive);
-                case 267 /* JsxAttribute */: {
+                case 268 /* JsxAttribute */: {
                     // If there is no initializer, JSX attribute has a boolean value of true which is not context sensitive.
                     var initializer = node.initializer;
                     return !!initializer && isContextSensitive(initializer);
                 }
-                case 270 /* JsxExpression */: {
+                case 271 /* JsxExpression */: {
                     // It is possible to that node.expression is undefined (e.g <div x={} />)
                     var expression = node.expression;
                     return !!expression && isContextSensitive(expression);
@@ -41413,6 +42237,9 @@ var ts;
             return false;
         }
         function isContextSensitiveFunctionLikeDeclaration(node) {
+            if (ts.isFunctionDeclaration(node) && (!ts.isInJSFile(node) || !getTypeForDeclarationFromJSDocComment(node))) {
+                return false;
+            }
             // Functions with type parameters are not context sensitive.
             if (node.typeParameters) {
                 return false;
@@ -41421,7 +42248,7 @@ var ts;
             if (ts.some(node.parameters, function (p) { return !ts.getEffectiveTypeAnnotationNode(p); })) {
                 return true;
             }
-            if (node.kind !== 197 /* ArrowFunction */) {
+            if (node.kind !== 198 /* ArrowFunction */) {
                 // If the first parameter is not an explicit 'this' parameter, then the function has
                 // an implicit 'this' parameter which is subject to contextual typing.
                 var parameter = ts.firstOrUndefined(node.parameters);
@@ -41433,7 +42260,7 @@ var ts;
         }
         function hasContextSensitiveReturnExpression(node) {
             // TODO(anhans): A block should be context-sensitive if it has a context-sensitive return value.
-            return !!node.body && node.body.kind !== 218 /* Block */ && isContextSensitive(node.body);
+            return !!node.body && node.body.kind !== 219 /* Block */ && isContextSensitive(node.body);
         }
         function isContextSensitiveFunctionOrObjectLiteralMethod(func) {
             return (ts.isInJSFile(func) && ts.isFunctionDeclaration(func) || isFunctionExpressionOrArrowFunction(func) || ts.isObjectLiteralMethod(func)) &&
@@ -41486,7 +42313,7 @@ var ts;
         function isTypeDerivedFrom(source, target) {
             return source.flags & 1048576 /* Union */ ? ts.every(source.types, function (t) { return isTypeDerivedFrom(t, target); }) :
                 target.flags & 1048576 /* Union */ ? ts.some(target.types, function (t) { return isTypeDerivedFrom(source, t); }) :
-                    source.flags & 58982400 /* InstantiableNonPrimitive */ ? isTypeDerivedFrom(getBaseConstraintOfType(source) || emptyObjectType, target) :
+                    source.flags & 58982400 /* InstantiableNonPrimitive */ ? isTypeDerivedFrom(getBaseConstraintOfType(source) || unknownType, target) :
                         target === globalObjectType ? !!(source.flags & (524288 /* Object */ | 67108864 /* NonPrimitive */)) :
                             target === globalFunctionType ? !!(source.flags & 524288 /* Object */) && isFunctionObjectType(source) :
                                 hasBaseType(source, getTargetType(target));
@@ -41515,48 +42342,49 @@ var ts;
          * attempt to issue more specific errors on, for example, specific object literal properties or tuple members.
          */
         function checkTypeAssignableToAndOptionallyElaborate(source, target, errorNode, expr, headMessage, containingMessageChain) {
-            return checkTypeRelatedToAndOptionallyElaborate(source, target, assignableRelation, errorNode, expr, headMessage, containingMessageChain);
+            return checkTypeRelatedToAndOptionallyElaborate(source, target, assignableRelation, errorNode, expr, headMessage, containingMessageChain, /*errorOutputContainer*/ undefined);
         }
-        function checkTypeRelatedToAndOptionallyElaborate(source, target, relation, errorNode, expr, headMessage, containingMessageChain) {
+        function checkTypeRelatedToAndOptionallyElaborate(source, target, relation, errorNode, expr, headMessage, containingMessageChain, errorOutputContainer) {
             if (isTypeRelatedTo(source, target, relation))
                 return true;
-            if (!errorNode || !elaborateError(expr, source, target, relation, headMessage)) {
-                return checkTypeRelatedTo(source, target, relation, errorNode, headMessage, containingMessageChain);
+            if (!errorNode || !elaborateError(expr, source, target, relation, headMessage, containingMessageChain, errorOutputContainer)) {
+                return checkTypeRelatedTo(source, target, relation, errorNode, headMessage, containingMessageChain, errorOutputContainer);
             }
             return false;
         }
         function isOrHasGenericConditional(type) {
             return !!(type.flags & 16777216 /* Conditional */ || (type.flags & 2097152 /* Intersection */ && ts.some(type.types, isOrHasGenericConditional)));
         }
-        function elaborateError(node, source, target, relation, headMessage) {
+        function elaborateError(node, source, target, relation, headMessage, containingMessageChain, errorOutputContainer) {
             if (!node || isOrHasGenericConditional(target))
                 return false;
-            if (!checkTypeRelatedTo(source, target, relation, /*errorNode*/ undefined) && elaborateDidYouMeanToCallOrConstruct(node, source, target, relation, headMessage)) {
+            if (!checkTypeRelatedTo(source, target, relation, /*errorNode*/ undefined)
+                && elaborateDidYouMeanToCallOrConstruct(node, source, target, relation, headMessage, containingMessageChain, errorOutputContainer)) {
                 return true;
             }
             switch (node.kind) {
-                case 270 /* JsxExpression */:
-                case 195 /* ParenthesizedExpression */:
-                    return elaborateError(node.expression, source, target, relation, headMessage);
-                case 204 /* BinaryExpression */:
+                case 271 /* JsxExpression */:
+                case 196 /* ParenthesizedExpression */:
+                    return elaborateError(node.expression, source, target, relation, headMessage, containingMessageChain, errorOutputContainer);
+                case 205 /* BinaryExpression */:
                     switch (node.operatorToken.kind) {
-                        case 59 /* EqualsToken */:
+                        case 60 /* EqualsToken */:
                         case 27 /* CommaToken */:
-                            return elaborateError(node.right, source, target, relation, headMessage);
+                            return elaborateError(node.right, source, target, relation, headMessage, containingMessageChain, errorOutputContainer);
                     }
                     break;
-                case 188 /* ObjectLiteralExpression */:
-                    return elaborateObjectLiteral(node, source, target, relation);
-                case 187 /* ArrayLiteralExpression */:
-                    return elaborateArrayLiteral(node, source, target, relation);
-                case 268 /* JsxAttributes */:
-                    return elaborateJsxComponents(node, source, target, relation);
-                case 197 /* ArrowFunction */:
-                    return elaborateArrowFunction(node, source, target, relation);
+                case 189 /* ObjectLiteralExpression */:
+                    return elaborateObjectLiteral(node, source, target, relation, containingMessageChain, errorOutputContainer);
+                case 188 /* ArrayLiteralExpression */:
+                    return elaborateArrayLiteral(node, source, target, relation, containingMessageChain, errorOutputContainer);
+                case 269 /* JsxAttributes */:
+                    return elaborateJsxComponents(node, source, target, relation, containingMessageChain, errorOutputContainer);
+                case 198 /* ArrowFunction */:
+                    return elaborateArrowFunction(node, source, target, relation, containingMessageChain, errorOutputContainer);
             }
             return false;
         }
-        function elaborateDidYouMeanToCallOrConstruct(node, source, target, relation, headMessage) {
+        function elaborateDidYouMeanToCallOrConstruct(node, source, target, relation, headMessage, containingMessageChain, errorOutputContainer) {
             var callSignatures = getSignaturesOfType(source, 0 /* Call */);
             var constructSignatures = getSignaturesOfType(source, 1 /* Construct */);
             for (var _i = 0, _a = [constructSignatures, callSignatures]; _i < _a.length; _i++) {
@@ -41565,16 +42393,16 @@ var ts;
                     var returnType = getReturnTypeOfSignature(s);
                     return !(returnType.flags & (1 /* Any */ | 131072 /* Never */)) && checkTypeRelatedTo(returnType, target, relation, /*errorNode*/ undefined);
                 })) {
-                    var resultObj = {};
-                    checkTypeAssignableTo(source, target, node, headMessage, /*containingChain*/ undefined, resultObj);
-                    var diagnostic = resultObj.error;
-                    addRelatedInfo(diagnostic, ts.createDiagnosticForNode(node, signatures === constructSignatures ? ts.Diagnostics.Did_you_mean_to_use_new_with_this_expression : ts.Diagnostics.Did_you_mean_to_call_this_expression));
+                    var resultObj = errorOutputContainer || {};
+                    checkTypeAssignableTo(source, target, node, headMessage, containingMessageChain, resultObj);
+                    var diagnostic = resultObj.errors[resultObj.errors.length - 1];
+                    ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(node, signatures === constructSignatures ? ts.Diagnostics.Did_you_mean_to_use_new_with_this_expression : ts.Diagnostics.Did_you_mean_to_call_this_expression));
                     return true;
                 }
             }
             return false;
         }
-        function elaborateArrowFunction(node, source, target, relation) {
+        function elaborateArrowFunction(node, source, target, relation, containingMessageChain, errorOutputContainer) {
             // Don't elaborate blocks
             if (ts.isBlock(node.body)) {
                 return false;
@@ -41595,15 +42423,15 @@ var ts;
             var sourceReturn = getReturnTypeOfSignature(sourceSig);
             var targetReturn = getUnionType(ts.map(targetSignatures, getReturnTypeOfSignature));
             if (!checkTypeRelatedTo(sourceReturn, targetReturn, relation, /*errorNode*/ undefined)) {
-                var elaborated = returnExpression && elaborateError(returnExpression, sourceReturn, targetReturn, relation, /*headMessage*/ undefined);
+                var elaborated = returnExpression && elaborateError(returnExpression, sourceReturn, targetReturn, relation, /*headMessage*/ undefined, containingMessageChain, errorOutputContainer);
                 if (elaborated) {
                     return elaborated;
                 }
-                var resultObj = {};
-                checkTypeRelatedTo(sourceReturn, targetReturn, relation, returnExpression, /*message*/ undefined, /*chain*/ undefined, resultObj);
-                if (resultObj.error) {
+                var resultObj = errorOutputContainer || {};
+                checkTypeRelatedTo(sourceReturn, targetReturn, relation, returnExpression, /*message*/ undefined, containingMessageChain, resultObj);
+                if (resultObj.errors) {
                     if (target.symbol && ts.length(target.symbol.declarations)) {
-                        addRelatedInfo(resultObj.error, ts.createDiagnosticForNode(target.symbol.declarations[0], ts.Diagnostics.The_expected_type_comes_from_the_return_type_of_this_signature));
+                        ts.addRelatedInfo(resultObj.errors[resultObj.errors.length - 1], ts.createDiagnosticForNode(target.symbol.declarations[0], ts.Diagnostics.The_expected_type_comes_from_the_return_type_of_this_signature));
                     }
                     return true;
                 }
@@ -41615,32 +42443,32 @@ var ts;
          * If that element would issue an error, we first attempt to dive into that element's inner expression and issue a more specific error by recuring into `elaborateError`
          * Otherwise, we issue an error on _every_ element which fail the assignability check
          */
-        function elaborateElementwise(iterator, source, target, relation) {
+        function elaborateElementwise(iterator, source, target, relation, containingMessageChain, errorOutputContainer) {
             // Assignability failure - check each prop individually, and if that fails, fall back on the bad error span
             var reportedError = false;
             for (var status = iterator.next(); !status.done; status = iterator.next()) {
                 var _a = status.value, prop = _a.errorNode, next = _a.innerExpression, nameType = _a.nameType, errorMessage = _a.errorMessage;
-                var targetPropType = getIndexedAccessType(target, nameType, /*accessNode*/ undefined, errorType);
-                if (targetPropType === errorType || targetPropType.flags & 8388608 /* IndexedAccess */)
+                var targetPropType = getIndexedAccessTypeOrUndefined(target, nameType);
+                if (!targetPropType || targetPropType.flags & 8388608 /* IndexedAccess */)
                     continue; // Don't elaborate on indexes on generic variables
-                var sourcePropType = getIndexedAccessType(source, nameType, /*accessNode*/ undefined, errorType);
-                if (sourcePropType !== errorType && targetPropType !== errorType && !checkTypeRelatedTo(sourcePropType, targetPropType, relation, /*errorNode*/ undefined)) {
-                    var elaborated = next && elaborateError(next, sourcePropType, targetPropType, relation, /*headMessage*/ undefined);
+                var sourcePropType = getIndexedAccessTypeOrUndefined(source, nameType);
+                if (sourcePropType && !checkTypeRelatedTo(sourcePropType, targetPropType, relation, /*errorNode*/ undefined)) {
+                    var elaborated = next && elaborateError(next, sourcePropType, targetPropType, relation, /*headMessage*/ undefined, containingMessageChain, errorOutputContainer);
                     if (elaborated) {
                         reportedError = true;
                     }
                     else {
                         // Issue error on the prop itself, since the prop couldn't elaborate the error
-                        var resultObj = {};
+                        var resultObj = errorOutputContainer || {};
                         // Use the expression type, if available
                         var specificSource = next ? checkExpressionForMutableLocation(next, 0 /* Normal */, sourcePropType) : sourcePropType;
-                        var result = checkTypeRelatedTo(specificSource, targetPropType, relation, prop, errorMessage, /*containingChain*/ undefined, resultObj);
+                        var result = checkTypeRelatedTo(specificSource, targetPropType, relation, prop, errorMessage, containingMessageChain, resultObj);
                         if (result && specificSource !== sourcePropType) {
                             // If for whatever reason the expression type doesn't yield an error, make sure we still issue an error on the sourcePropType
-                            checkTypeRelatedTo(sourcePropType, targetPropType, relation, prop, errorMessage, /*containingChain*/ undefined, resultObj);
+                            checkTypeRelatedTo(sourcePropType, targetPropType, relation, prop, errorMessage, containingMessageChain, resultObj);
                         }
-                        if (resultObj.error) {
-                            var reportedDiag = resultObj.error;
+                        if (resultObj.errors) {
+                            var reportedDiag = resultObj.errors[resultObj.errors.length - 1];
                             var propertyName = isTypeUsableAsPropertyName(nameType) ? getPropertyNameFromType(nameType) : undefined;
                             var targetProp = propertyName !== undefined ? getPropertyOfType(target, propertyName) : undefined;
                             var issuedElaboration = false;
@@ -41650,13 +42478,13 @@ var ts;
                                     undefined;
                                 if (indexInfo && indexInfo.declaration && !ts.getSourceFileOfNode(indexInfo.declaration).hasNoDefaultLib) {
                                     issuedElaboration = true;
-                                    addRelatedInfo(reportedDiag, ts.createDiagnosticForNode(indexInfo.declaration, ts.Diagnostics.The_expected_type_comes_from_this_index_signature));
+                                    ts.addRelatedInfo(reportedDiag, ts.createDiagnosticForNode(indexInfo.declaration, ts.Diagnostics.The_expected_type_comes_from_this_index_signature));
                                 }
                             }
                             if (!issuedElaboration && (targetProp && ts.length(targetProp.declarations) || target.symbol && ts.length(target.symbol.declarations))) {
                                 var targetNode = targetProp && ts.length(targetProp.declarations) ? targetProp.declarations[0] : target.symbol.declarations[0];
                                 if (!ts.getSourceFileOfNode(targetNode).hasNoDefaultLib) {
-                                    addRelatedInfo(reportedDiag, ts.createDiagnosticForNode(targetNode, ts.Diagnostics.The_expected_type_comes_from_property_0_which_is_declared_here_on_type_1, propertyName && !(nameType.flags & 8192 /* UniqueESSymbol */) ? ts.unescapeLeadingUnderscores(propertyName) : typeToString(nameType), typeToString(target)));
+                                    ts.addRelatedInfo(reportedDiag, ts.createDiagnosticForNode(targetNode, ts.Diagnostics.The_expected_type_comes_from_property_0_which_is_declared_here_on_type_1, propertyName && !(nameType.flags & 8192 /* UniqueESSymbol */) ? ts.unescapeLeadingUnderscores(propertyName) : typeToString(nameType), typeToString(target)));
                                 }
                             }
                         }
@@ -41723,26 +42551,29 @@ var ts;
         }
         function getElaborationElementForJsxChild(child, nameType, getInvalidTextDiagnostic) {
             switch (child.kind) {
-                case 270 /* JsxExpression */:
+                case 271 /* JsxExpression */:
                     // child is of the type of the expression
                     return { errorNode: child, innerExpression: child.expression, nameType: nameType };
                 case 11 /* JsxText */:
-                    if (child.containsOnlyWhiteSpaces) {
+                    if (child.containsOnlyTriviaWhiteSpaces) {
                         break; // Whitespace only jsx text isn't real jsx text
                     }
                     // child is a string
                     return { errorNode: child, innerExpression: undefined, nameType: nameType, errorMessage: getInvalidTextDiagnostic() };
-                case 260 /* JsxElement */:
-                case 261 /* JsxSelfClosingElement */:
-                case 264 /* JsxFragment */:
+                case 261 /* JsxElement */:
+                case 262 /* JsxSelfClosingElement */:
+                case 265 /* JsxFragment */:
                     // child is of type JSX.Element
                     return { errorNode: child, innerExpression: child, nameType: nameType };
                 default:
                     return ts.Debug.assertNever(child, "Found invalid jsx child");
             }
         }
-        function elaborateJsxComponents(node, source, target, relation) {
-            var result = elaborateElementwise(generateJsxAttributes(node), source, target, relation);
+        function getSemanticJsxChildren(children) {
+            return ts.filter(children, function (i) { return !ts.isJsxText(i) || !i.containsOnlyTriviaWhiteSpaces; });
+        }
+        function elaborateJsxComponents(node, source, target, relation, containingMessageChain, errorOutputContainer) {
+            var result = elaborateElementwise(generateJsxAttributes(node), source, target, relation, containingMessageChain, errorOutputContainer);
             var invalidTextDiagnostic;
             if (ts.isJsxOpeningElement(node.parent) && ts.isJsxElement(node.parent.parent)) {
                 var containingElement = node.parent.parent;
@@ -41750,7 +42581,7 @@ var ts;
                 var childrenPropName = childPropName === undefined ? "children" : ts.unescapeLeadingUnderscores(childPropName);
                 var childrenNameType = getLiteralType(childrenPropName);
                 var childrenTargetType = getIndexedAccessType(target, childrenNameType);
-                var validChildren = ts.filter(containingElement.children, function (i) { return !ts.isJsxText(i) || !i.containsOnlyWhiteSpaces; });
+                var validChildren = getSemanticJsxChildren(containingElement.children);
                 if (!ts.length(validChildren)) {
                     return result;
                 }
@@ -41760,12 +42591,16 @@ var ts;
                 if (moreThanOneRealChildren) {
                     if (arrayLikeTargetParts !== neverType) {
                         var realSource = createTupleType(checkJsxChildren(containingElement, 0 /* Normal */));
-                        result = elaborateElementwise(generateJsxChildren(containingElement, getInvalidTextualChildDiagnostic), realSource, arrayLikeTargetParts, relation) || result;
+                        var children = generateJsxChildren(containingElement, getInvalidTextualChildDiagnostic);
+                        result = elaborateElementwise(children, realSource, arrayLikeTargetParts, relation, containingMessageChain, errorOutputContainer) || result;
                     }
                     else if (!isTypeRelatedTo(getIndexedAccessType(source, childrenNameType), childrenTargetType, relation)) {
                         // arity mismatch
                         result = true;
-                        error(containingElement.openingElement.tagName, ts.Diagnostics.This_JSX_tag_s_0_prop_expects_a_single_child_of_type_1_but_multiple_children_were_provided, childrenPropName, typeToString(childrenTargetType));
+                        var diag = error(containingElement.openingElement.tagName, ts.Diagnostics.This_JSX_tag_s_0_prop_expects_a_single_child_of_type_1_but_multiple_children_were_provided, childrenPropName, typeToString(childrenTargetType));
+                        if (errorOutputContainer && errorOutputContainer.skipLogging) {
+                            (errorOutputContainer.errors || (errorOutputContainer.errors = [])).push(diag);
+                        }
                     }
                 }
                 else {
@@ -41780,13 +42615,16 @@ var ts;
                                         _a.sent();
                                         return [2 /*return*/];
                                 }
-                            }); })(), source, target, relation) || result;
+                            }); })(), source, target, relation, containingMessageChain, errorOutputContainer) || result;
                         }
                     }
                     else if (!isTypeRelatedTo(getIndexedAccessType(source, childrenNameType), childrenTargetType, relation)) {
                         // arity mismatch
                         result = true;
-                        error(containingElement.openingElement.tagName, ts.Diagnostics.This_JSX_tag_s_0_prop_expects_type_1_which_requires_multiple_children_but_only_a_single_child_was_provided, childrenPropName, typeToString(childrenTargetType));
+                        var diag = error(containingElement.openingElement.tagName, ts.Diagnostics.This_JSX_tag_s_0_prop_expects_type_1_which_requires_multiple_children_but_only_a_single_child_was_provided, childrenPropName, typeToString(childrenTargetType));
+                        if (errorOutputContainer && errorOutputContainer.skipLogging) {
+                            (errorOutputContainer.errors || (errorOutputContainer.errors = [])).push(diag);
+                        }
                     }
                 }
             }
@@ -41833,14 +42671,16 @@ var ts;
                 }
             });
         }
-        function elaborateArrayLiteral(node, source, target, relation) {
+        function elaborateArrayLiteral(node, source, target, relation, containingMessageChain, errorOutputContainer) {
+            if (target.flags & 131068 /* Primitive */)
+                return false;
             if (isTupleLikeType(source)) {
-                return elaborateElementwise(generateLimitedTupleElements(node, target), source, target, relation);
+                return elaborateElementwise(generateLimitedTupleElements(node, target), source, target, relation, containingMessageChain, errorOutputContainer);
             }
             // recreate a tuple from the elements, if possible
             var tupleizedType = checkArrayLiteral(node, 1 /* Contextual */, /*forceTuple*/ true);
             if (isTupleLikeType(tupleizedType)) {
-                return elaborateElementwise(generateLimitedTupleElements(node, target), tupleizedType, target, relation);
+                return elaborateElementwise(generateLimitedTupleElements(node, target), tupleizedType, target, relation, containingMessageChain, errorOutputContainer);
             }
             return false;
         }
@@ -41864,11 +42704,11 @@ var ts;
                         }
                         _b = prop.kind;
                         switch (_b) {
-                            case 159 /* SetAccessor */: return [3 /*break*/, 2];
-                            case 158 /* GetAccessor */: return [3 /*break*/, 2];
-                            case 156 /* MethodDeclaration */: return [3 /*break*/, 2];
-                            case 276 /* ShorthandPropertyAssignment */: return [3 /*break*/, 2];
-                            case 275 /* PropertyAssignment */: return [3 /*break*/, 4];
+                            case 160 /* SetAccessor */: return [3 /*break*/, 2];
+                            case 159 /* GetAccessor */: return [3 /*break*/, 2];
+                            case 157 /* MethodDeclaration */: return [3 /*break*/, 2];
+                            case 277 /* ShorthandPropertyAssignment */: return [3 /*break*/, 2];
+                            case 276 /* PropertyAssignment */: return [3 /*break*/, 4];
                         }
                         return [3 /*break*/, 6];
                     case 2: return [4 /*yield*/, { errorNode: prop.name, innerExpression: undefined, nameType: type }];
@@ -41889,8 +42729,10 @@ var ts;
                 }
             });
         }
-        function elaborateObjectLiteral(node, source, target, relation) {
-            return elaborateElementwise(generateObjectLiteralElements(node), source, target, relation);
+        function elaborateObjectLiteral(node, source, target, relation, containingMessageChain, errorOutputContainer) {
+            if (target.flags & 131068 /* Primitive */)
+                return false;
+            return elaborateElementwise(generateObjectLiteralElements(node), source, target, relation, containingMessageChain, errorOutputContainer);
         }
         /**
          * This is *not* a bi-directional relationship.
@@ -41903,6 +42745,14 @@ var ts;
             return compareSignaturesRelated(source, target, 0 /* None */, ignoreReturnTypes, /*reportErrors*/ false, 
             /*errorReporter*/ undefined, compareTypesAssignable) !== 0 /* False */;
         }
+        /**
+         * Returns true if `s` is `(...args: any[]) => any` or `(this: any, ...args: any[]) => any`
+         */
+        function isAnySignature(s) {
+            return !s.typeParameters && (!s.thisParameter || isTypeAny(getTypeOfParameter(s.thisParameter))) && s.parameters.length === 1 &&
+                s.hasRestParameter && (getTypeOfParameter(s.parameters[0]) === anyArrayType || isTypeAny(getTypeOfParameter(s.parameters[0]))) &&
+                isTypeAny(getReturnTypeOfSignature(s));
+        }
         /**
          * See signatureRelatedTo, compareSignaturesIdentical
          */
@@ -41911,13 +42761,16 @@ var ts;
             if (source === target) {
                 return -1 /* True */;
             }
+            if (isAnySignature(target)) {
+                return -1 /* True */;
+            }
             var targetCount = getParameterCount(target);
             if (!hasEffectiveRestParameter(target) && getMinArgumentCount(source) > targetCount) {
                 return 0 /* False */;
             }
             if (source.typeParameters && source.typeParameters !== target.typeParameters) {
                 target = getCanonicalSignature(target);
-                source = instantiateSignatureInContextOf(source, target, /*contextualMapper*/ undefined, compareTypes);
+                source = instantiateSignatureInContextOf(source, target, /*inferenceContext*/ undefined, compareTypes);
             }
             var sourceCount = getParameterCount(source);
             var sourceRestType = getNonArrayRestType(source);
@@ -41927,8 +42780,8 @@ var ts;
                 return 0 /* False */;
             }
             var kind = target.declaration ? target.declaration.kind : 0 /* Unknown */;
-            var strictVariance = !callbackCheck && strictFunctionTypes && kind !== 156 /* MethodDeclaration */ &&
-                kind !== 155 /* MethodSignature */ && kind !== 157 /* Constructor */;
+            var strictVariance = !callbackCheck && strictFunctionTypes && kind !== 157 /* MethodDeclaration */ &&
+                kind !== 156 /* MethodSignature */ && kind !== 158 /* Constructor */;
             var result = -1 /* True */;
             var sourceThisType = getThisTypeOfSignature(source);
             if (sourceThisType && sourceThisType !== voidType) {
@@ -41976,19 +42829,21 @@ var ts;
                 result &= related;
             }
             if (!ignoreReturnTypes) {
-                var targetReturnType = (target.declaration && isJSConstructor(target.declaration)) ?
+                // If a signature reolution is already in-flight, skip issuing a circularity error
+                // here and just use the `any` type directly
+                var targetReturnType = isResolvingReturnTypeOfSignature(target) ? anyType : (target.declaration && isJSConstructor(target.declaration)) ?
                     getJSClassType(target.declaration.symbol) : getReturnTypeOfSignature(target);
                 if (targetReturnType === voidType) {
                     return result;
                 }
-                var sourceReturnType = (source.declaration && isJSConstructor(source.declaration)) ?
+                var sourceReturnType = isResolvingReturnTypeOfSignature(source) ? anyType : (source.declaration && isJSConstructor(source.declaration)) ?
                     getJSClassType(source.declaration.symbol) : getReturnTypeOfSignature(source);
                 // The following block preserves behavior forbidding boolean returning functions from being assignable to type guard returning functions
                 var targetTypePredicate = getTypePredicateOfSignature(target);
                 if (targetTypePredicate) {
                     var sourceTypePredicate = getTypePredicateOfSignature(source);
                     if (sourceTypePredicate) {
-                        result &= compareTypePredicateRelatedTo(sourceTypePredicate, targetTypePredicate, source.declaration, target.declaration, reportErrors, errorReporter, compareTypes); // TODO: GH#18217
+                        result &= compareTypePredicateRelatedTo(sourceTypePredicate, targetTypePredicate, reportErrors, errorReporter, compareTypes);
                     }
                     else if (ts.isIdentifierTypePredicate(targetTypePredicate)) {
                         if (reportErrors) {
@@ -42007,7 +42862,7 @@ var ts;
             }
             return result;
         }
-        function compareTypePredicateRelatedTo(source, target, sourceDeclaration, targetDeclaration, reportErrors, errorReporter, compareTypes) {
+        function compareTypePredicateRelatedTo(source, target, reportErrors, errorReporter, compareTypes) {
             if (source.kind !== target.kind) {
                 if (reportErrors) {
                     errorReporter(ts.Diagnostics.A_this_based_type_guard_is_not_compatible_with_a_parameter_based_type_guard);
@@ -42016,12 +42871,9 @@ var ts;
                 return 0 /* False */;
             }
             if (source.kind === 1 /* Identifier */) {
-                var targetPredicate = target;
-                var sourceIndex = source.parameterIndex - (ts.getThisParameter(sourceDeclaration) ? 1 : 0);
-                var targetIndex = targetPredicate.parameterIndex - (ts.getThisParameter(targetDeclaration) ? 1 : 0);
-                if (sourceIndex !== targetIndex) {
+                if (source.parameterIndex !== target.parameterIndex) {
                     if (reportErrors) {
-                        errorReporter(ts.Diagnostics.Parameter_0_is_not_in_the_same_position_as_parameter_1, source.parameterName, targetPredicate.parameterName);
+                        errorReporter(ts.Diagnostics.Parameter_0_is_not_in_the_same_position_as_parameter_1, source.parameterName, target.parameterName);
                         errorReporter(ts.Diagnostics.Type_predicate_0_is_not_assignable_to_1, typePredicateToString(source), typePredicateToString(target));
                     }
                     return 0 /* False */;
@@ -42063,6 +42915,11 @@ var ts;
         function isEmptyAnonymousObjectType(type) {
             return !!(ts.getObjectFlags(type) & 16 /* Anonymous */) && isEmptyObjectType(type);
         }
+        function isStringIndexSignatureOnlyType(type) {
+            return type.flags & 524288 /* Object */ && !isGenericMappedType(type) && getPropertiesOfType(type).length === 0 && getIndexInfoOfType(type, 0 /* String */) && !getIndexInfoOfType(type, 1 /* Number */) ||
+                type.flags & 3145728 /* UnionOrIntersection */ && ts.every(type.types, isStringIndexSignatureOnlyType) ||
+                false;
+        }
         function isEnumTypeRelatedTo(sourceSymbol, targetSymbol, errorReporter) {
             if (sourceSymbol === targetSymbol) {
                 return true;
@@ -42171,8 +43028,8 @@ var ts;
             }
             return false;
         }
-        function isIgnoredJsxProperty(source, sourceProp, targetMemberType) {
-            return ts.getObjectFlags(source) & 4096 /* JsxAttributes */ && !(isUnhyphenatedJsxName(sourceProp.escapedName) || targetMemberType);
+        function isIgnoredJsxProperty(source, sourceProp) {
+            return ts.getObjectFlags(source) & 4096 /* JsxAttributes */ && !isUnhyphenatedJsxName(sourceProp.escapedName);
         }
         /**
          * Checks if 'source' is related to 'target' (e.g.: is a assignable to).
@@ -42183,6 +43040,7 @@ var ts;
          * @param errorNode The suggested node upon which all errors will be reported, if defined. This may or may not be the actual node used.
          * @param headMessage If the error chain should be prepended by a head message, then headMessage will be used.
          * @param containingMessageChain A chain of errors to prepend any new errors found.
+         * @param errorOutputContainer Return the diagnostic. Do not log if 'skipLogging' is truthy.
          */
         function checkTypeRelatedTo(source, target, relation, errorNode, headMessage, containingMessageChain, errorOutputContainer) {
             var errorInfo;
@@ -42194,17 +43052,21 @@ var ts;
             var depth = 0;
             var expandingFlags = 0 /* None */;
             var overflow = false;
-            var suppressNextError = false;
+            var overrideNextErrorInfo;
             ts.Debug.assert(relation !== identityRelation || !errorNode, "no error reporting in identity checking");
             var result = isRelatedTo(source, target, /*reportErrors*/ !!errorNode, headMessage);
             if (overflow) {
-                error(errorNode, ts.Diagnostics.Excessive_stack_depth_comparing_types_0_and_1, typeToString(source), typeToString(target));
+                var diag = error(errorNode, ts.Diagnostics.Excessive_stack_depth_comparing_types_0_and_1, typeToString(source), typeToString(target));
+                if (errorOutputContainer) {
+                    (errorOutputContainer.errors || (errorOutputContainer.errors = [])).push(diag);
+                }
             }
             else if (errorInfo) {
                 if (containingMessageChain) {
-                    var chain_1 = containingMessageChain();
-                    if (chain_1) {
-                        errorInfo = ts.concatenateDiagnosticMessageChains(chain_1, errorInfo);
+                    var chain = containingMessageChain();
+                    if (chain) {
+                        ts.concatenateDiagnosticMessageChains(chain, errorInfo);
+                        errorInfo = chain;
                     }
                 }
                 var relatedInformation = void 0;
@@ -42222,12 +43084,17 @@ var ts;
                 }
                 var diag = ts.createDiagnosticForNodeFromMessageChain(errorNode, errorInfo, relatedInformation);
                 if (relatedInfo) {
-                    addRelatedInfo.apply(void 0, [diag].concat(relatedInfo));
+                    ts.addRelatedInfo.apply(void 0, [diag].concat(relatedInfo));
                 }
                 if (errorOutputContainer) {
-                    errorOutputContainer.error = diag;
+                    (errorOutputContainer.errors || (errorOutputContainer.errors = [])).push(diag);
                 }
-                diagnostics.add(diag); // TODO: GH#18217
+                if (!errorOutputContainer || !errorOutputContainer.skipLogging) {
+                    diagnostics.add(diag);
+                }
+            }
+            if (errorNode && errorOutputContainer && errorOutputContainer.skipLogging && result === 0 /* False */) {
+                ts.Debug.assert(!!errorOutputContainer.errors, "missed opportunity to interact with error.");
             }
             return result !== 0 /* False */;
             function reportError(message, arg0, arg1, arg2, arg3) {
@@ -42244,11 +43111,9 @@ var ts;
                 }
             }
             function reportRelationError(message, source, target) {
-                var sourceType = typeToString(source);
-                var targetType = typeToString(target);
-                if (sourceType === targetType) {
-                    sourceType = typeToString(source, /*enclosingDeclaration*/ undefined, 64 /* UseFullyQualifiedType */);
-                    targetType = typeToString(target, /*enclosingDeclaration*/ undefined, 64 /* UseFullyQualifiedType */);
+                var _a = getTypeNamesForErrorDisplay(source, target), sourceType = _a[0], targetType = _a[1];
+                if (target.flags & 262144 /* TypeParameter */ && target.immediateBaseConstraint !== undefined && isTypeAssignableTo(source, target.immediateBaseConstraint)) {
+                    reportError(ts.Diagnostics._0_is_assignable_to_the_constraint_of_type_1_but_1_could_be_instantiated_with_a_different_subtype_of_constraint_2, sourceType, targetType, typeToString(target.immediateBaseConstraint));
                 }
                 if (!message) {
                     if (relation === comparableRelation) {
@@ -42273,24 +43138,38 @@ var ts;
                     reportError(ts.Diagnostics._0_is_a_primitive_but_1_is_a_wrapper_object_Prefer_using_0_when_possible, targetType, sourceType);
                 }
             }
-            function isUnionOrIntersectionTypeWithoutNullableConstituents(type) {
-                if (!(type.flags & 3145728 /* UnionOrIntersection */)) {
+            /**
+             * Try and elaborate array and tuple errors. Returns false
+             * if we have found an elaboration, or we should ignore
+             * any other elaborations when relating the `source` and
+             * `target` types.
+             *
+             * @param source
+             * @param target
+             * @param reportErrors
+             */
+            function tryElaborateArrayLikeErrors(source, target, reportErrors) {
+                if (isTupleLikeType(source)) {
+                    var sourceTuple = source.target;
+                    if (sourceTuple && sourceTuple.readonly && isArrayOrTupleLikeType(target) &&
+                        (!isReadonlyArrayType(target) || isTupleType(target) && !target.target.readonly)) {
+                        if (reportErrors) {
+                            reportError(ts.Diagnostics.The_type_0_is_readonly_and_cannot_be_assigned_to_the_mutable_type_1, typeToString(source), typeToString(target));
+                        }
+                        return false;
+                    }
+                    return isArrayLikeType(target);
+                }
+                if (isTupleLikeType(target)) {
+                    return isArrayLikeType(source);
+                }
+                if (isReadonlyArrayType(source) && isArrayType(target) && !isReadonlyArrayType(target)) {
+                    if (reportErrors) {
+                        reportError(ts.Diagnostics.The_type_0_is_readonly_and_cannot_be_assigned_to_the_mutable_type_1, typeToString(source), typeToString(target));
+                    }
                     return false;
                 }
-                // at this point we know that this is union or intersection type possibly with nullable constituents.
-                // check if we still will have compound type if we ignore nullable components.
-                var seenNonNullable = false;
-                for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
-                    var t = _a[_i];
-                    if (t.flags & 98304 /* Nullable */) {
-                        continue;
-                    }
-                    if (seenNonNullable) {
-                        return true;
-                    }
-                    seenNonNullable = true;
-                }
-                return false;
+                return true;
             }
             /**
              * Compare two types and return
@@ -42312,11 +43191,11 @@ var ts;
                 if (target.flags & 33554432 /* Substitution */) {
                     target = target.typeVariable;
                 }
-                if (source.flags & 8388608 /* IndexedAccess */) {
-                    source = getSimplifiedType(source);
+                if (source.flags & 25165824 /* Simplifiable */) {
+                    source = getSimplifiedType(source, /*writing*/ false);
                 }
-                if (target.flags & 8388608 /* IndexedAccess */) {
-                    target = getSimplifiedType(target);
+                if (target.flags & 25165824 /* Simplifiable */) {
+                    target = getSimplifiedType(target, /*writing*/ true);
                 }
                 // Try to see if we're relating something like `Foo` -> `Bar | null | undefined`.
                 // If so, reporting the `null` and `undefined` in the type is hardly useful.
@@ -42344,7 +43223,8 @@ var ts;
                     isSimpleTypeRelatedTo(source, target, relation, reportErrors ? reportError : undefined))
                     return -1 /* True */;
                 var isComparingJsxAttributes = !!(ts.getObjectFlags(source) & 4096 /* JsxAttributes */);
-                if (isObjectLiteralType(source) && ts.getObjectFlags(source) & 32768 /* FreshLiteral */) {
+                var isPerformingExcessPropertyChecks = (isObjectLiteralType(source) && ts.getObjectFlags(source) & 32768 /* FreshLiteral */);
+                if (isPerformingExcessPropertyChecks) {
                     var discriminantType = target.flags & 1048576 /* Union */ ? findMatchingDiscriminantType(source, target) : undefined;
                     if (hasExcessProperties(source, target, discriminantType, reportErrors)) {
                         if (reportErrors) {
@@ -42352,13 +43232,6 @@ var ts;
                         }
                         return 0 /* False */;
                     }
-                    // Above we check for excess properties with respect to the entire target type. When union
-                    // and intersection types are further deconstructed on the target side, we don't want to
-                    // make the check again (as it might fail for a partial target type). Therefore we obtain
-                    // the regular source type and proceed with that.
-                    if (isUnionOrIntersectionTypeWithoutNullableConstituents(target) && !discriminantType) {
-                        source = getRegularTypeOfObjectLiteral(source);
-                    }
                 }
                 if (relation !== comparableRelation && !isApparentIntersectionConstituent &&
                     source.flags & (131068 /* Primitive */ | 524288 /* Object */ | 2097152 /* Intersection */) && source !== globalObjectType &&
@@ -42391,11 +43264,24 @@ var ts;
                 }
                 else {
                     if (target.flags & 1048576 /* Union */) {
-                        result = typeRelatedToSomeType(source, target, reportErrors && !(source.flags & 131068 /* Primitive */) && !(target.flags & 131068 /* Primitive */));
+                        result = typeRelatedToSomeType(getRegularTypeOfObjectLiteral(source), target, reportErrors && !(source.flags & 131068 /* Primitive */) && !(target.flags & 131068 /* Primitive */));
+                        if (result && isPerformingExcessPropertyChecks) {
+                            // Validate against excess props using the original `source`
+                            var discriminantType = findMatchingDiscriminantType(source, target) || filterPrimitivesIfContainsNonPrimitive(target);
+                            if (!propertiesRelatedTo(source, discriminantType, reportErrors, /*excludedProperties*/ undefined)) {
+                                return 0 /* False */;
+                            }
+                        }
                     }
                     else if (target.flags & 2097152 /* Intersection */) {
                         isIntersectionConstituent = true; // set here to affect the following trio of checks
-                        result = typeRelatedToEachType(source, target, reportErrors);
+                        result = typeRelatedToEachType(getRegularTypeOfObjectLiteral(source), target, reportErrors);
+                        if (result && isPerformingExcessPropertyChecks) {
+                            // Validate against excess props using the original `source`
+                            if (!propertiesRelatedTo(source, target, reportErrors, /*excludedProperties*/ undefined)) {
+                                return 0 /* False */;
+                            }
+                        }
                     }
                     else if (source.flags & 2097152 /* Intersection */) {
                         // Check to see if any constituents of the intersection are immediately related to the target.
@@ -42437,8 +43323,15 @@ var ts;
                     }
                 }
                 if (!result && reportErrors) {
-                    var maybeSuppress = suppressNextError;
-                    suppressNextError = false;
+                    var maybeSuppress = overrideNextErrorInfo;
+                    overrideNextErrorInfo = undefined;
+                    if (source.flags & 524288 /* Object */ && target.flags & 524288 /* Object */) {
+                        var currentError = errorInfo;
+                        tryElaborateArrayLikeErrors(source, target, reportErrors);
+                        if (errorInfo !== currentError) {
+                            maybeSuppress = errorInfo;
+                        }
+                    }
                     if (source.flags & 524288 /* Object */ && target.flags & 131068 /* Primitive */) {
                         tryElaborateErrorsForPrimitivesAndObjects(source, target);
                     }
@@ -42492,7 +43385,7 @@ var ts;
                         // check excess properties against discriminant type only, not the entire union
                         return hasExcessProperties(source, discriminant, /*discriminant*/ undefined, reportErrors);
                     }
-                    var _loop_7 = function (prop) {
+                    var _loop_8 = function (prop) {
                         if (shouldCheckAsExcessProperty(prop, source.symbol) && !isKnownProperty(target, prop.escapedName, isComparingJsxAttributes)) {
                             if (reportErrors) {
                                 // Report error in terms of object types in the target as those are the only ones
@@ -42533,9 +43426,9 @@ var ts;
                             return { value: true };
                         }
                     };
-                    for (var _i = 0, _a = getPropertiesOfObjectType(source); _i < _a.length; _i++) {
+                    for (var _i = 0, _a = getPropertiesOfType(source); _i < _a.length; _i++) {
                         var prop = _a[_i];
-                        var state_3 = _loop_7(prop);
+                        var state_3 = _loop_8(prop);
                         if (typeof state_3 === "object")
                             return state_3.value;
                     }
@@ -42638,10 +43531,19 @@ var ts;
                 }
                 return bestMatch;
             }
+            function filterPrimitivesIfContainsNonPrimitive(type) {
+                if (maybeTypeOfKind(type, 67108864 /* NonPrimitive */)) {
+                    var result_3 = filterType(type, function (t) { return !(t.flags & 131068 /* Primitive */); });
+                    if (!(result_3.flags & 131072 /* Never */)) {
+                        return result_3;
+                    }
+                }
+                return type;
+            }
             // Keep this up-to-date with the same logic within `getApparentTypeOfContextualType`, since they should behave similarly
             function findMatchingDiscriminantType(source, target) {
-                if (target.flags & 1048576 /* Union */) {
-                    var sourceProperties = getPropertiesOfObjectType(source);
+                if (target.flags & 1048576 /* Union */ && source.flags & (2097152 /* Intersection */ | 524288 /* Object */)) {
+                    var sourceProperties = getPropertiesOfType(source);
                     if (sourceProperties) {
                         var sourcePropertiesFiltered = findDiscriminantProperties(sourceProperties, target);
                         if (sourcePropertiesFiltered) {
@@ -42704,13 +43606,20 @@ var ts;
                     // When variance information isn't available we default to covariance. This happens
                     // in the process of computing variance information for recursive types and when
                     // comparing 'this' type arguments.
-                    var variance = i < variances.length ? variances[i] : 1 /* Covariant */;
+                    var varianceFlags = i < variances.length ? variances[i] : 1 /* Covariant */;
+                    var variance = varianceFlags & 7 /* VarianceMask */;
                     // We ignore arguments for independent type parameters (because they're never witnessed).
                     if (variance !== 4 /* Independent */) {
                         var s = sources[i];
                         var t = targets[i];
                         var related = -1 /* True */;
-                        if (variance === 1 /* Covariant */) {
+                        if (varianceFlags & 8 /* Unmeasurable */) {
+                            // Even an `Unmeasurable` variance works out without a structural check if the source and target are _identical_.
+                            // We can't simply assume invariance, because `Unmeasurable` marks nonlinear relations, for example, a relation tained by
+                            // the `-?` modifier in a mapped type (where, no matter how the inputs are related, the outputs still might not be)
+                            related = relation === identityRelation ? isRelatedTo(s, t, /*reportErrors*/ false) : compareTypesIdentical(s, t);
+                        }
+                        else if (variance === 1 /* Covariant */) {
                             related = isRelatedTo(s, t, reportErrors);
                         }
                         else if (variance === 2 /* Contravariant */) {
@@ -42743,6 +43652,17 @@ var ts;
                 }
                 return result;
             }
+            function propagateSidebandVarianceFlags(typeArguments, variances) {
+                for (var i = 0; i < variances.length; i++) {
+                    var v = variances[i];
+                    if (v & 8 /* Unmeasurable */) {
+                        instantiateType(typeArguments[i], reportUnmeasurableMarkers);
+                    }
+                    if (v & 16 /* Unreliable */) {
+                        instantiateType(typeArguments[i], reportUnreliableMarkers);
+                    }
+                }
+            }
             // Determine if possibly recursive types are related. First, check if the result is already available in the global cache.
             // Second, check if we have already started a comparison of the given two types in which case we assume the result to be true.
             // Third, check if both types are part of deeply nested chains of generic type instantiations and if so assume the types are
@@ -42760,6 +43680,16 @@ var ts;
                         // as a failure, and should be updated as a reported failure by the bottom of this function.
                     }
                     else {
+                        if (outofbandVarianceMarkerHandler) {
+                            // We're in the middle of variance checking - integrate any unmeasurable/unreliable flags from this cached component
+                            if (source.flags & (524288 /* Object */ | 16777216 /* Conditional */) && source.aliasSymbol &&
+                                source.aliasTypeArguments && source.aliasSymbol === target.aliasSymbol) {
+                                propagateSidebandVarianceFlags(source.aliasTypeArguments, getAliasVariances(source.aliasSymbol));
+                            }
+                            if (ts.getObjectFlags(source) & 4 /* Reference */ && ts.getObjectFlags(target) & 4 /* Reference */ && source.target === target.target && ts.length(source.typeArguments)) {
+                                propagateSidebandVarianceFlags(source.typeArguments, getVariances(source.target));
+                            }
+                        }
                         return related === 1 /* Succeeded */ ? -1 /* True */ : 0 /* False */;
                     }
                 }
@@ -42817,21 +43747,21 @@ var ts;
                     if (flags & 4194304 /* Index */) {
                         return isRelatedTo(source.type, target.type, /*reportErrors*/ false);
                     }
-                    var result_3 = 0 /* False */;
+                    var result_4 = 0 /* False */;
                     if (flags & 8388608 /* IndexedAccess */) {
-                        if (result_3 = isRelatedTo(source.objectType, target.objectType, /*reportErrors*/ false)) {
-                            if (result_3 &= isRelatedTo(source.indexType, target.indexType, /*reportErrors*/ false)) {
-                                return result_3;
+                        if (result_4 = isRelatedTo(source.objectType, target.objectType, /*reportErrors*/ false)) {
+                            if (result_4 &= isRelatedTo(source.indexType, target.indexType, /*reportErrors*/ false)) {
+                                return result_4;
                             }
                         }
                     }
                     if (flags & 16777216 /* Conditional */) {
                         if (source.root.isDistributive === target.root.isDistributive) {
-                            if (result_3 = isRelatedTo(source.checkType, target.checkType, /*reportErrors*/ false)) {
-                                if (result_3 &= isRelatedTo(source.extendsType, target.extendsType, /*reportErrors*/ false)) {
-                                    if (result_3 &= isRelatedTo(getTrueTypeFromConditionalType(source), getTrueTypeFromConditionalType(target), /*reportErrors*/ false)) {
-                                        if (result_3 &= isRelatedTo(getFalseTypeFromConditionalType(source), getFalseTypeFromConditionalType(target), /*reportErrors*/ false)) {
-                                            return result_3;
+                            if (result_4 = isRelatedTo(source.checkType, target.checkType, /*reportErrors*/ false)) {
+                                if (result_4 &= isRelatedTo(source.extendsType, target.extendsType, /*reportErrors*/ false)) {
+                                    if (result_4 &= isRelatedTo(getTrueTypeFromConditionalType(source), getTrueTypeFromConditionalType(target), /*reportErrors*/ false)) {
+                                        if (result_4 &= isRelatedTo(getFalseTypeFromConditionalType(source), getFalseTypeFromConditionalType(target), /*reportErrors*/ false)) {
+                                            return result_4;
                                         }
                                     }
                                 }
@@ -42880,8 +43810,7 @@ var ts;
                     }
                     // A type S is assignable to keyof T if S is assignable to keyof C, where C is the
                     // simplified form of T or, if T doesn't simplify, the constraint of T.
-                    var simplified = getSimplifiedType(target.type);
-                    var constraint = simplified !== target.type ? simplified : getConstraintOfType(target.type);
+                    var constraint = getSimplifiedTypeOrConstraint(target.type);
                     if (constraint) {
                         // We require Ternary.True here such that circular constraints don't cause
                         // false positives. For example, given 'T extends { [K in keyof T]: string }',
@@ -42893,13 +43822,17 @@ var ts;
                     }
                 }
                 else if (target.flags & 8388608 /* IndexedAccess */) {
-                    // A type S is related to a type T[K], where T and K aren't both type variables, if S is related to C,
-                    // where C is the base constraint of T[K]
-                    if (relation !== identityRelation &&
-                        !(isGenericObjectType(target.objectType) && isGenericIndexType(target.indexType))) {
-                        var constraint = getBaseConstraintOfType(target);
-                        if (constraint && constraint !== target) {
-                            if (result = isRelatedTo(source, constraint, reportErrors)) {
+                    // A type S is related to a type T[K] if S is related to C, where C is the base
+                    // constraint of T[K] for writing.
+                    if (relation !== identityRelation) {
+                        var objectType = target.objectType;
+                        var indexType = target.indexType;
+                        var baseObjectType = getBaseConstraintOfType(objectType) || objectType;
+                        var baseIndexType = getBaseConstraintOfType(indexType) || indexType;
+                        if (!isGenericObjectType(baseObjectType) && !isGenericIndexType(baseIndexType)) {
+                            var accessFlags = 2 /* Writing */ | (baseObjectType !== objectType ? 1 /* NoIndexSignatures */ : 0);
+                            var constraint = getIndexedAccessTypeOrUndefined(baseObjectType, baseIndexType, /*accessNode*/ undefined, accessFlags);
+                            if (constraint && (result = isRelatedTo(source, constraint, reportErrors))) {
                                 return result;
                             }
                         }
@@ -42916,15 +43849,16 @@ var ts;
                         }
                         if (!isGenericMappedType(source)) {
                             var targetConstraint = getConstraintTypeFromMappedType(target);
-                            var sourceKeys_1 = getIndexType(source);
-                            var hasOptionalUnionKeys = modifiers & 4 /* IncludeOptional */ && targetConstraint.flags & 1048576 /* Union */;
-                            var filteredByApplicability = hasOptionalUnionKeys ? filterType(targetConstraint, function (t) { return !!isRelatedTo(t, sourceKeys_1); }) : undefined;
+                            var sourceKeys = getIndexType(source, /*stringsOnly*/ undefined, /*noIndexSignatures*/ true);
+                            var includeOptional = modifiers & 4 /* IncludeOptional */;
+                            var filteredByApplicability = includeOptional ? intersectTypes(targetConstraint, sourceKeys) : undefined;
                             // A source type T is related to a target type { [P in Q]: X } if Q is related to keyof T and T[Q] is related to X.
                             // A source type T is related to a target type { [P in Q]?: X } if some constituent Q' of Q is related to keyof T and T[Q'] is related to X.
-                            if (hasOptionalUnionKeys
+                            if (includeOptional
                                 ? !(filteredByApplicability.flags & 131072 /* Never */)
-                                : isRelatedTo(targetConstraint, sourceKeys_1)) {
-                                var indexingType = hasOptionalUnionKeys ? filteredByApplicability : getTypeParameterFromMappedType(target);
+                                : isRelatedTo(targetConstraint, sourceKeys)) {
+                                var typeParameter = getTypeParameterFromMappedType(target);
+                                var indexingType = filteredByApplicability ? getIntersectionType([filteredByApplicability, typeParameter]) : typeParameter;
                                 var indexedAccessType = getIndexedAccessType(source, indexingType);
                                 var templateType = getTemplateTypeFromMappedType(target);
                                 if (result = isRelatedTo(indexedAccessType, templateType, reportErrors)) {
@@ -42947,23 +43881,25 @@ var ts;
                             return result;
                         }
                     }
-                    var constraint = getConstraintOfType(source);
-                    if (!constraint || (source.flags & 262144 /* TypeParameter */ && constraint.flags & 1 /* Any */)) {
-                        // A type variable with no constraint is not related to the non-primitive object type.
-                        if (result = isRelatedTo(emptyObjectType, extractTypesOfKind(target, ~67108864 /* NonPrimitive */))) {
+                    else {
+                        var constraint = getConstraintOfType(source);
+                        if (!constraint || (source.flags & 262144 /* TypeParameter */ && constraint.flags & 1 /* Any */)) {
+                            // A type variable with no constraint is not related to the non-primitive object type.
+                            if (result = isRelatedTo(emptyObjectType, extractTypesOfKind(target, ~67108864 /* NonPrimitive */))) {
+                                errorInfo = saveErrorInfo;
+                                return result;
+                            }
+                        }
+                        // hi-speed no-this-instantiation check (less accurate, but avoids costly `this`-instantiation when the constraint will suffice), see #28231 for report on why this is needed
+                        else if (result = isRelatedTo(constraint, target, /*reportErrors*/ false, /*headMessage*/ undefined, isIntersectionConstituent)) {
+                            errorInfo = saveErrorInfo;
+                            return result;
+                        }
+                        // slower, fuller, this-instantiated check (necessary when comparing raw `this` types from base classes), see `subclassWithPolymorphicThisIsAssignable.ts` test for example
+                        else if (result = isRelatedTo(getTypeWithThisArgument(constraint, source), target, reportErrors, /*headMessage*/ undefined, isIntersectionConstituent)) {
                             errorInfo = saveErrorInfo;
                             return result;
                         }
-                    }
-                    // hi-speed no-this-instantiation check (less accurate, but avoids costly `this`-instantiation when the constraint will suffice), see #28231 for report on why this is needed
-                    else if (result = isRelatedTo(constraint, target, /*reportErrors*/ false, /*headMessage*/ undefined, isIntersectionConstituent)) {
-                        errorInfo = saveErrorInfo;
-                        return result;
-                    }
-                    // slower, fuller, this-instantiated check (necessary when comparing raw `this` types from base classes), see `subclassWithPolymorphicThisIsAssignable.ts` test for example
-                    else if (result = isRelatedTo(getTypeWithThisArgument(constraint, source), target, reportErrors, /*headMessage*/ undefined, isIntersectionConstituent)) {
-                        errorInfo = saveErrorInfo;
-                        return result;
                     }
                 }
                 else if (source.flags & 4194304 /* Index */) {
@@ -43023,6 +43959,9 @@ var ts;
                     if (relation !== identityRelation) {
                         source = getApparentType(source);
                     }
+                    else if (isGenericMappedType(source)) {
+                        return 0 /* False */;
+                    }
                     if (ts.getObjectFlags(source) & 4 /* Reference */ && ts.getObjectFlags(target) & 4 /* Reference */ && source.target === target.target &&
                         !(ts.getObjectFlags(source) & 8192 /* MarkerType */ || ts.getObjectFlags(target) & 8192 /* MarkerType */)) {
                         // We have type references to the same generic type, and the type references are not marker
@@ -43035,7 +43974,14 @@ var ts;
                         }
                     }
                     else if (isReadonlyArrayType(target) ? isArrayType(source) || isTupleType(source) : isArrayType(target) && isTupleType(source) && !source.target.readonly) {
-                        return isRelatedTo(getIndexTypeOfType(source, 1 /* Number */) || anyType, getIndexTypeOfType(target, 1 /* Number */) || anyType, reportErrors);
+                        if (relation !== identityRelation) {
+                            return isRelatedTo(getIndexTypeOfType(source, 1 /* Number */) || anyType, getIndexTypeOfType(target, 1 /* Number */) || anyType, reportErrors);
+                        }
+                        else {
+                            // By flags alone, we know that the `target` is a readonly array while the source is a normal array or tuple
+                            // or `target` is an array and source is a tuple - in both cases the types cannot be identical, by construction
+                            return 0 /* False */;
+                        }
                     }
                     // Consider a fresh empty object literal type "closed" under the subtype relationship - this way `{} <- {[idx: string]: any} <- fresh({})`
                     // and not `{} <- fresh({}) <- {[idx: string]: any}`
@@ -43050,7 +43996,7 @@ var ts;
                     if (source.flags & (524288 /* Object */ | 2097152 /* Intersection */) && target.flags & 524288 /* Object */) {
                         // Report structural errors only if we haven't reported any errors yet
                         var reportStructuralErrors = reportErrors && errorInfo === saveErrorInfo && !sourceIsPrimitive;
-                        result = propertiesRelatedTo(source, target, reportStructuralErrors);
+                        result = propertiesRelatedTo(source, target, reportStructuralErrors, /*excludedProperties*/ undefined);
                         if (result) {
                             result &= signaturesRelatedTo(source, target, 0 /* Call */, reportStructuralErrors);
                             if (result) {
@@ -43070,22 +44016,35 @@ var ts;
                             return result;
                         }
                     }
+                    // If S is an object type and T is a discriminated union, S may be related to T if
+                    // there exists a constituent of T for every combination of the discriminants of S
+                    // with respect to T. We do not report errors here, as we will use the existing
+                    // error result from checking each constituent of the union.
+                    if (source.flags & (524288 /* Object */ | 2097152 /* Intersection */) && target.flags & 1048576 /* Union */) {
+                        var objectOnlyTarget = extractTypesOfKind(target, 524288 /* Object */);
+                        if (objectOnlyTarget.flags & 1048576 /* Union */) {
+                            var result_5 = typeRelatedToDiscriminatedType(source, objectOnlyTarget);
+                            if (result_5) {
+                                return result_5;
+                            }
+                        }
+                    }
                 }
                 return 0 /* False */;
-                function isNonGeneric(type) {
-                    // If we're already in identity relationship checking, we should use `isRelatedTo`
-                    // to catch the `Maybe` from an excessively deep type (which we then assume means
-                    // that the type could possibly contain a generic)
-                    if (relation === identityRelation) {
-                        return isRelatedTo(type, getPermissiveInstantiation(type)) === -1 /* True */;
-                    }
-                    return isTypeIdenticalTo(type, getPermissiveInstantiation(type));
-                }
                 function relateVariances(sourceTypeArguments, targetTypeArguments, variances) {
                     if (result = typeArgumentsRelatedTo(sourceTypeArguments, targetTypeArguments, variances, reportErrors)) {
                         return result;
                     }
-                    var allowStructuralFallback = (targetTypeArguments && hasCovariantVoidArgument(targetTypeArguments, variances)) || isNonGeneric(source) || isNonGeneric(target);
+                    if (ts.some(variances, function (v) { return !!(v & 24 /* AllowsStructuralFallback */); })) {
+                        // If some type parameter was `Unmeasurable` or `Unreliable`, and we couldn't pass by assuming it was identical, then we
+                        // have to allow a structural fallback check
+                        // We elide the variance-based error elaborations, since those might not be too helpful, since we'll potentially
+                        // be assuming identity of the type parameter.
+                        originalErrorInfo = undefined;
+                        errorInfo = saveErrorInfo;
+                        return undefined;
+                    }
+                    var allowStructuralFallback = targetTypeArguments && hasCovariantVoidArgument(targetTypeArguments, variances);
                     varianceCheckFailed = !allowStructuralFallback;
                     // The type arguments did not relate appropriately, but it may be because we have no variance
                     // information (in which case typeArgumentsRelatedTo defaulted to covariance for all type
@@ -43103,7 +44062,7 @@ var ts;
                         // reveal the reason).
                         // We can switch on `reportErrors` here, since varianceCheckFailed guarantees we return `False`,
                         // we can return `False` early here to skip calculating the structural error message we don't need.
-                        if (varianceCheckFailed && !(reportErrors && ts.some(variances, function (v) { return v === 0 /* Invariant */; }))) {
+                        if (varianceCheckFailed && !(reportErrors && ts.some(variances, function (v) { return (v & 7 /* VarianceMask */) === 0 /* Invariant */; }))) {
                             return 0 /* False */;
                         }
                         // We remember the original error information so we can restore it in case the structural
@@ -43114,6 +44073,18 @@ var ts;
                     }
                 }
             }
+            function reportUnmeasurableMarkers(p) {
+                if (outofbandVarianceMarkerHandler && (p === markerSuperType || p === markerSubType || p === markerOtherType)) {
+                    outofbandVarianceMarkerHandler(/*onlyUnreliable*/ false);
+                }
+                return p;
+            }
+            function reportUnreliableMarkers(p) {
+                if (outofbandVarianceMarkerHandler && (p === markerSuperType || p === markerSubType || p === markerOtherType)) {
+                    outofbandVarianceMarkerHandler(/*onlyUnreliable*/ true);
+                }
+                return p;
+            }
             // A type [P in S]: X is related to a type [Q in T]: Y if T is related to S and X' is
             // related to Y, where X' is an instantiation of X in which P is replaced with Q. Notice
             // that S and T are contra-variant whereas X and Y are co-variant.
@@ -43121,45 +44092,281 @@ var ts;
                 var modifiersRelated = relation === comparableRelation || (relation === identityRelation ? getMappedTypeModifiers(source) === getMappedTypeModifiers(target) :
                     getCombinedMappedTypeOptionality(source) <= getCombinedMappedTypeOptionality(target));
                 if (modifiersRelated) {
-                    var result_4;
-                    if (result_4 = isRelatedTo(getConstraintTypeFromMappedType(target), getConstraintTypeFromMappedType(source), reportErrors)) {
+                    var result_6;
+                    var targetConstraint = getConstraintTypeFromMappedType(target);
+                    var sourceConstraint = instantiateType(getConstraintTypeFromMappedType(source), getCombinedMappedTypeOptionality(source) < 0 ? reportUnmeasurableMarkers : reportUnreliableMarkers);
+                    if (result_6 = isRelatedTo(targetConstraint, sourceConstraint, reportErrors)) {
                         var mapper = createTypeMapper([getTypeParameterFromMappedType(source)], [getTypeParameterFromMappedType(target)]);
-                        return result_4 & isRelatedTo(instantiateType(getTemplateTypeFromMappedType(source), mapper), getTemplateTypeFromMappedType(target), reportErrors);
+                        return result_6 & isRelatedTo(instantiateType(getTemplateTypeFromMappedType(source), mapper), getTemplateTypeFromMappedType(target), reportErrors);
                     }
                 }
                 return 0 /* False */;
             }
-            function propertiesRelatedTo(source, target, reportErrors) {
+            function typeRelatedToDiscriminatedType(source, target) {
+                // 1. Generate the combinations of discriminant properties & types 'source' can satisfy.
+                //    a. If the number of combinations is above a set limit, the comparison is too complex.
+                // 2. Filter 'target' to the subset of types whose discriminants exist in the matrix.
+                //    a. If 'target' does not satisfy all discriminants in the matrix, 'source' is not related.
+                // 3. For each type in the filtered 'target', determine if all non-discriminant properties of
+                //    'target' are related to a property in 'source'.
+                //
+                // NOTE: See ~/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithDiscriminatedUnion.ts
+                //       for examples.
+                var sourceProperties = getPropertiesOfObjectType(source);
+                var sourcePropertiesFiltered = findDiscriminantProperties(sourceProperties, target);
+                if (!sourcePropertiesFiltered)
+                    return 0 /* False */;
+                // Though we could compute the number of combinations as we generate
+                // the matrix, this would incur additional memory overhead due to
+                // array allocations. To reduce this overhead, we first compute
+                // the number of combinations to ensure we will not surpass our
+                // fixed limit before incurring the cost of any allocations:
+                var numCombinations = 1;
+                for (var _i = 0, sourcePropertiesFiltered_1 = sourcePropertiesFiltered; _i < sourcePropertiesFiltered_1.length; _i++) {
+                    var sourceProperty = sourcePropertiesFiltered_1[_i];
+                    numCombinations *= countTypes(getTypeOfSymbol(sourceProperty));
+                    if (numCombinations > 25) {
+                        // We've reached the complexity limit.
+                        return 0 /* False */;
+                    }
+                }
+                // Compute the set of types for each discriminant property.
+                var sourceDiscriminantTypes = new Array(sourcePropertiesFiltered.length);
+                var excludedProperties = ts.createUnderscoreEscapedMap();
+                for (var i = 0; i < sourcePropertiesFiltered.length; i++) {
+                    var sourceProperty = sourcePropertiesFiltered[i];
+                    var sourcePropertyType = getTypeOfSymbol(sourceProperty);
+                    sourceDiscriminantTypes[i] = sourcePropertyType.flags & 1048576 /* Union */
+                        ? sourcePropertyType.types
+                        : [sourcePropertyType];
+                    excludedProperties.set(sourceProperty.escapedName, true);
+                }
+                // Match each combination of the cartesian product of discriminant properties to one or more
+                // constituents of 'target'. If any combination does not have a match then 'source' is not relatable.
+                var discriminantCombinations = ts.cartesianProduct(sourceDiscriminantTypes);
+                var matchingTypes = [];
+                var _loop_9 = function (combination) {
+                    var hasMatch = false;
+                    outer: for (var _i = 0, _a = target.types; _i < _a.length; _i++) {
+                        var type = _a[_i];
+                        var _loop_10 = function (i) {
+                            var sourceProperty = sourcePropertiesFiltered[i];
+                            var targetProperty = getPropertyOfObjectType(type, sourceProperty.escapedName);
+                            if (!targetProperty)
+                                return "continue-outer";
+                            if (sourceProperty === targetProperty)
+                                return "continue";
+                            // We compare the source property to the target in the context of a single discriminant type.
+                            var related = propertyRelatedTo(source, target, sourceProperty, targetProperty, function (_) { return combination[i]; }, /*reportErrors*/ false);
+                            // If the target property could not be found, or if the properties were not related,
+                            // then this constituent is not a match.
+                            if (!related) {
+                                return "continue-outer";
+                            }
+                        };
+                        for (var i = 0; i < sourcePropertiesFiltered.length; i++) {
+                            var state_5 = _loop_10(i);
+                            switch (state_5) {
+                                case "continue-outer": continue outer;
+                            }
+                        }
+                        ts.pushIfUnique(matchingTypes, type, ts.equateValues);
+                        hasMatch = true;
+                    }
+                    if (!hasMatch) {
+                        return { value: 0 /* False */ };
+                    }
+                };
+                for (var _a = 0, discriminantCombinations_1 = discriminantCombinations; _a < discriminantCombinations_1.length; _a++) {
+                    var combination = discriminantCombinations_1[_a];
+                    var state_4 = _loop_9(combination);
+                    if (typeof state_4 === "object")
+                        return state_4.value;
+                }
+                // Compare the remaining non-discriminant properties of each match.
+                var result = -1 /* True */;
+                for (var _b = 0, matchingTypes_1 = matchingTypes; _b < matchingTypes_1.length; _b++) {
+                    var type = matchingTypes_1[_b];
+                    result &= propertiesRelatedTo(source, type, /*reportErrors*/ false, excludedProperties);
+                    if (result) {
+                        result &= signaturesRelatedTo(source, type, 0 /* Call */, /*reportStructuralErrors*/ false);
+                        if (result) {
+                            result &= signaturesRelatedTo(source, type, 1 /* Construct */, /*reportStructuralErrors*/ false);
+                            if (result) {
+                                result &= indexTypesRelatedTo(source, type, 0 /* String */, /*sourceIsPrimitive*/ false, /*reportStructuralErrors*/ false);
+                                if (result) {
+                                    result &= indexTypesRelatedTo(source, type, 1 /* Number */, /*sourceIsPrimitive*/ false, /*reportStructuralErrors*/ false);
+                                }
+                            }
+                        }
+                    }
+                    if (!result) {
+                        return result;
+                    }
+                }
+                return result;
+            }
+            function excludeProperties(properties, excludedProperties) {
+                if (!excludedProperties || properties.length === 0)
+                    return properties;
+                var result;
+                for (var i = 0; i < properties.length; i++) {
+                    if (!excludedProperties.has(properties[i].escapedName)) {
+                        if (result) {
+                            result.push(properties[i]);
+                        }
+                    }
+                    else if (!result) {
+                        result = properties.slice(0, i);
+                    }
+                }
+                return result || properties;
+            }
+            function isPropertySymbolTypeRelated(sourceProp, targetProp, getTypeOfSourceProperty, reportErrors) {
+                var targetIsOptional = strictNullChecks && !!(ts.getCheckFlags(targetProp) & 48 /* Partial */);
+                var source = getTypeOfSourceProperty(sourceProp);
+                if (ts.getCheckFlags(targetProp) & 65536 /* DeferredType */ && !getSymbolLinks(targetProp).type) {
+                    // Rather than resolving (and normalizing) the type, relate constituent-by-constituent without performing normalization or seconadary passes
+                    var links = getSymbolLinks(targetProp);
+                    ts.Debug.assertDefined(links.deferralParent);
+                    ts.Debug.assertDefined(links.deferralConstituents);
+                    var unionParent = !!(links.deferralParent.flags & 1048576 /* Union */);
+                    var result_7 = unionParent ? 0 /* False */ : -1 /* True */;
+                    var targetTypes = links.deferralConstituents;
+                    for (var _i = 0, targetTypes_3 = targetTypes; _i < targetTypes_3.length; _i++) {
+                        var targetType = targetTypes_3[_i];
+                        var related = isRelatedTo(source, targetType, /*reportErrors*/ false, /*headMessage*/ undefined, /*isIntersectionConstituent*/ !unionParent);
+                        if (!unionParent) {
+                            if (!related) {
+                                // Can't assign to a target individually - have to fallback to assigning to the _whole_ intersection (which forces normalization)
+                                return isRelatedTo(source, addOptionality(getTypeOfSymbol(targetProp), targetIsOptional), reportErrors);
+                            }
+                            result_7 &= related;
+                        }
+                        else {
+                            if (related) {
+                                return related;
+                            }
+                        }
+                    }
+                    if (unionParent && !result_7 && targetIsOptional) {
+                        result_7 = isRelatedTo(source, undefinedType);
+                    }
+                    if (unionParent && !result_7 && reportErrors) {
+                        // The easiest way to get the right errors here is to un-defer (which may be costly)
+                        // If it turns out this is too costly too often, we can replicate the error handling logic within
+                        // typeRelatedToSomeType without the discriminatable type branch (as that requires a manifest union
+                        // type on which to hand discriminable properties, which we are expressly trying to avoid here)
+                        return isRelatedTo(source, addOptionality(getTypeOfSymbol(targetProp), targetIsOptional), reportErrors);
+                    }
+                    return result_7;
+                }
+                else {
+                    return isRelatedTo(source, addOptionality(getTypeOfSymbol(targetProp), targetIsOptional), reportErrors);
+                }
+            }
+            function propertyRelatedTo(source, target, sourceProp, targetProp, getTypeOfSourceProperty, reportErrors) {
+                var sourcePropFlags = ts.getDeclarationModifierFlagsFromSymbol(sourceProp);
+                var targetPropFlags = ts.getDeclarationModifierFlagsFromSymbol(targetProp);
+                if (sourcePropFlags & 8 /* Private */ || targetPropFlags & 8 /* Private */) {
+                    var hasDifferingDeclarations = sourceProp.valueDeclaration !== targetProp.valueDeclaration;
+                    if (ts.getCheckFlags(sourceProp) & 1024 /* ContainsPrivate */ && hasDifferingDeclarations) {
+                        if (reportErrors) {
+                            reportError(ts.Diagnostics.Property_0_has_conflicting_declarations_and_is_inaccessible_in_type_1, symbolToString(sourceProp), typeToString(source));
+                        }
+                        return 0 /* False */;
+                    }
+                    if (hasDifferingDeclarations) {
+                        if (reportErrors) {
+                            if (sourcePropFlags & 8 /* Private */ && targetPropFlags & 8 /* Private */) {
+                                reportError(ts.Diagnostics.Types_have_separate_declarations_of_a_private_property_0, symbolToString(targetProp));
+                            }
+                            else {
+                                reportError(ts.Diagnostics.Property_0_is_private_in_type_1_but_not_in_type_2, symbolToString(targetProp), typeToString(sourcePropFlags & 8 /* Private */ ? source : target), typeToString(sourcePropFlags & 8 /* Private */ ? target : source));
+                            }
+                        }
+                        return 0 /* False */;
+                    }
+                }
+                else if (targetPropFlags & 16 /* Protected */) {
+                    if (!isValidOverrideOf(sourceProp, targetProp)) {
+                        if (reportErrors) {
+                            reportError(ts.Diagnostics.Property_0_is_protected_but_type_1_is_not_a_class_derived_from_2, symbolToString(targetProp), typeToString(getDeclaringClass(sourceProp) || source), typeToString(getDeclaringClass(targetProp) || target));
+                        }
+                        return 0 /* False */;
+                    }
+                }
+                else if (sourcePropFlags & 16 /* Protected */) {
+                    if (reportErrors) {
+                        reportError(ts.Diagnostics.Property_0_is_protected_in_type_1_but_public_in_type_2, symbolToString(targetProp), typeToString(source), typeToString(target));
+                    }
+                    return 0 /* False */;
+                }
+                // If the target comes from a partial union prop, allow `undefined` in the target type
+                var related = isPropertySymbolTypeRelated(sourceProp, targetProp, getTypeOfSourceProperty, reportErrors);
+                if (!related) {
+                    if (reportErrors) {
+                        reportError(ts.Diagnostics.Types_of_property_0_are_incompatible, symbolToString(targetProp));
+                    }
+                    return 0 /* False */;
+                }
+                // When checking for comparability, be more lenient with optional properties.
+                if (relation !== comparableRelation && sourceProp.flags & 16777216 /* Optional */ && !(targetProp.flags & 16777216 /* Optional */)) {
+                    // TypeScript 1.0 spec (April 2014): 3.8.3
+                    // S is a subtype of a type T, and T is a supertype of S if ...
+                    // S' and T are object types and, for each member M in T..
+                    // M is a property and S' contains a property N where
+                    // if M is a required property, N is also a required property
+                    // (M - property in T)
+                    // (N - property in S)
+                    if (reportErrors) {
+                        reportError(ts.Diagnostics.Property_0_is_optional_in_type_1_but_required_in_type_2, symbolToString(targetProp), typeToString(source), typeToString(target));
+                    }
+                    return 0 /* False */;
+                }
+                return related;
+            }
+            function propertiesRelatedTo(source, target, reportErrors, excludedProperties) {
                 if (relation === identityRelation) {
-                    return propertiesIdenticalTo(source, target);
+                    return propertiesIdenticalTo(source, target, excludedProperties);
                 }
                 var requireOptionalProperties = relation === subtypeRelation && !isObjectLiteralType(source) && !isEmptyArrayLiteralType(source) && !isTupleType(source);
                 var unmatchedProperty = getUnmatchedProperty(source, target, requireOptionalProperties, /*matchDiscriminantProperties*/ false);
                 if (unmatchedProperty) {
                     if (reportErrors) {
                         var props = ts.arrayFrom(getUnmatchedProperties(source, target, requireOptionalProperties, /*matchDiscriminantProperties*/ false));
+                        var shouldSkipElaboration = false;
                         if (!headMessage || (headMessage.code !== ts.Diagnostics.Class_0_incorrectly_implements_interface_1.code &&
                             headMessage.code !== ts.Diagnostics.Class_0_incorrectly_implements_class_1_Did_you_mean_to_extend_1_and_inherit_its_members_as_a_subclass.code)) {
-                            suppressNextError = true; // Retain top-level error for interface implementing issues, otherwise omit it
+                            shouldSkipElaboration = true; // Retain top-level error for interface implementing issues, otherwise omit it
                         }
                         if (props.length === 1) {
                             var propName = symbolToString(unmatchedProperty);
-                            reportError(ts.Diagnostics.Property_0_is_missing_in_type_1_but_required_in_type_2, propName, typeToString(source), typeToString(target));
+                            reportError.apply(void 0, [ts.Diagnostics.Property_0_is_missing_in_type_1_but_required_in_type_2, propName].concat(getTypeNamesForErrorDisplay(source, target)));
                             if (ts.length(unmatchedProperty.declarations)) {
                                 associateRelatedInfo(ts.createDiagnosticForNode(unmatchedProperty.declarations[0], ts.Diagnostics._0_is_declared_here, propName));
                             }
+                            if (shouldSkipElaboration) {
+                                overrideNextErrorInfo = errorInfo;
+                            }
                         }
-                        else if (props.length > 5) { // arbitrary cutoff for too-long list form
-                            reportError(ts.Diagnostics.Type_0_is_missing_the_following_properties_from_type_1_Colon_2_and_3_more, typeToString(source), typeToString(target), ts.map(props.slice(0, 4), function (p) { return symbolToString(p); }).join(", "), props.length - 4);
-                        }
-                        else {
-                            reportError(ts.Diagnostics.Type_0_is_missing_the_following_properties_from_type_1_Colon_2, typeToString(source), typeToString(target), ts.map(props, function (p) { return symbolToString(p); }).join(", "));
+                        else if (tryElaborateArrayLikeErrors(source, target, /*reportErrors*/ false)) {
+                            if (props.length > 5) { // arbitrary cutoff for too-long list form
+                                reportError(ts.Diagnostics.Type_0_is_missing_the_following_properties_from_type_1_Colon_2_and_3_more, typeToString(source), typeToString(target), ts.map(props.slice(0, 4), function (p) { return symbolToString(p); }).join(", "), props.length - 4);
+                            }
+                            else {
+                                reportError(ts.Diagnostics.Type_0_is_missing_the_following_properties_from_type_1_Colon_2, typeToString(source), typeToString(target), ts.map(props, function (p) { return symbolToString(p); }).join(", "));
+                            }
+                            if (shouldSkipElaboration) {
+                                overrideNextErrorInfo = errorInfo;
+                            }
                         }
+                        // ELSE: No array like or unmatched property error - just issue top level error (errorInfo = undefined)
                     }
                     return 0 /* False */;
                 }
                 if (isObjectLiteralType(target)) {
-                    for (var _i = 0, _a = getPropertiesOfType(source); _i < _a.length; _i++) {
+                    for (var _i = 0, _a = excludeProperties(getPropertiesOfType(source), excludedProperties); _i < _a.length; _i++) {
                         var sourceProp = _a[_i];
                         if (!getPropertyOfObjectType(target, sourceProp.escapedName)) {
                             var sourceType = getTypeOfSymbol(sourceProp);
@@ -43200,84 +44407,30 @@ var ts;
                         }
                     }
                 }
-                var properties = getPropertiesOfObjectType(target);
-                for (var _b = 0, properties_2 = properties; _b < properties_2.length; _b++) {
-                    var targetProp = properties_2[_b];
+                // We only call this for union target types when we're attempting to do excess property checking - in those cases, we want to get _all possible props_
+                // from the target union, across all members
+                var properties = target.flags & 1048576 /* Union */ ? getPossiblePropertiesOfUnionType(target) : getPropertiesOfType(target);
+                for (var _b = 0, _c = excludeProperties(properties, excludedProperties); _b < _c.length; _b++) {
+                    var targetProp = _c[_b];
                     if (!(targetProp.flags & 4194304 /* Prototype */)) {
                         var sourceProp = getPropertyOfType(source, targetProp.escapedName);
                         if (sourceProp && sourceProp !== targetProp) {
-                            if (isIgnoredJsxProperty(source, sourceProp, getTypeOfSymbol(targetProp))) {
-                                continue;
-                            }
-                            var sourcePropFlags = ts.getDeclarationModifierFlagsFromSymbol(sourceProp);
-                            var targetPropFlags = ts.getDeclarationModifierFlagsFromSymbol(targetProp);
-                            if (sourcePropFlags & 8 /* Private */ || targetPropFlags & 8 /* Private */) {
-                                var hasDifferingDeclarations = sourceProp.valueDeclaration !== targetProp.valueDeclaration;
-                                if (ts.getCheckFlags(sourceProp) & 512 /* ContainsPrivate */ && hasDifferingDeclarations) {
-                                    if (reportErrors) {
-                                        reportError(ts.Diagnostics.Property_0_has_conflicting_declarations_and_is_inaccessible_in_type_1, symbolToString(sourceProp), typeToString(source));
-                                    }
-                                    return 0 /* False */;
-                                }
-                                if (hasDifferingDeclarations) {
-                                    if (reportErrors) {
-                                        if (sourcePropFlags & 8 /* Private */ && targetPropFlags & 8 /* Private */) {
-                                            reportError(ts.Diagnostics.Types_have_separate_declarations_of_a_private_property_0, symbolToString(targetProp));
-                                        }
-                                        else {
-                                            reportError(ts.Diagnostics.Property_0_is_private_in_type_1_but_not_in_type_2, symbolToString(targetProp), typeToString(sourcePropFlags & 8 /* Private */ ? source : target), typeToString(sourcePropFlags & 8 /* Private */ ? target : source));
-                                        }
-                                    }
-                                    return 0 /* False */;
-                                }
-                            }
-                            else if (targetPropFlags & 16 /* Protected */) {
-                                if (!isValidOverrideOf(sourceProp, targetProp)) {
-                                    if (reportErrors) {
-                                        reportError(ts.Diagnostics.Property_0_is_protected_but_type_1_is_not_a_class_derived_from_2, symbolToString(targetProp), typeToString(getDeclaringClass(sourceProp) || source), typeToString(getDeclaringClass(targetProp) || target));
-                                    }
-                                    return 0 /* False */;
-                                }
-                            }
-                            else if (sourcePropFlags & 16 /* Protected */) {
-                                if (reportErrors) {
-                                    reportError(ts.Diagnostics.Property_0_is_protected_in_type_1_but_public_in_type_2, symbolToString(targetProp), typeToString(source), typeToString(target));
-                                }
-                                return 0 /* False */;
-                            }
-                            var related = isRelatedTo(getTypeOfSymbol(sourceProp), getTypeOfSymbol(targetProp), reportErrors);
+                            var related = propertyRelatedTo(source, target, sourceProp, targetProp, getTypeOfSymbol, reportErrors);
                             if (!related) {
-                                if (reportErrors) {
-                                    reportError(ts.Diagnostics.Types_of_property_0_are_incompatible, symbolToString(targetProp));
-                                }
                                 return 0 /* False */;
                             }
                             result &= related;
-                            // When checking for comparability, be more lenient with optional properties.
-                            if (relation !== comparableRelation && sourceProp.flags & 16777216 /* Optional */ && !(targetProp.flags & 16777216 /* Optional */)) {
-                                // TypeScript 1.0 spec (April 2014): 3.8.3
-                                // S is a subtype of a type T, and T is a supertype of S if ...
-                                // S' and T are object types and, for each member M in T..
-                                // M is a property and S' contains a property N where
-                                // if M is a required property, N is also a required property
-                                // (M - property in T)
-                                // (N - property in S)
-                                if (reportErrors) {
-                                    reportError(ts.Diagnostics.Property_0_is_optional_in_type_1_but_required_in_type_2, symbolToString(targetProp), typeToString(source), typeToString(target));
-                                }
-                                return 0 /* False */;
-                            }
                         }
                     }
                 }
                 return result;
             }
-            function propertiesIdenticalTo(source, target) {
+            function propertiesIdenticalTo(source, target, excludedProperties) {
                 if (!(source.flags & 524288 /* Object */ && target.flags & 524288 /* Object */)) {
                     return 0 /* False */;
                 }
-                var sourceProperties = getPropertiesOfObjectType(source);
-                var targetProperties = getPropertiesOfObjectType(target);
+                var sourceProperties = excludeProperties(getPropertiesOfObjectType(source), excludedProperties);
+                var targetProperties = excludeProperties(getPropertiesOfObjectType(target), excludedProperties);
                 if (sourceProperties.length !== targetProperties.length) {
                     return 0 /* False */;
                 }
@@ -43397,7 +44550,7 @@ var ts;
                 var result = -1 /* True */;
                 for (var _i = 0, _a = getPropertiesOfObjectType(source); _i < _a.length; _i++) {
                     var prop = _a[_i];
-                    if (isIgnoredJsxProperty(source, prop, /*targetMemberType*/ undefined)) {
+                    if (isIgnoredJsxProperty(source, prop)) {
                         continue;
                     }
                     // Skip over symbol-named members
@@ -43429,7 +44582,7 @@ var ts;
                     return indexTypesIdenticalTo(source, target, kind);
                 }
                 var targetInfo = getIndexInfoOfType(target, kind);
-                if (!targetInfo || targetInfo.type.flags & 3 /* AnyOrUnknown */ && !sourceIsPrimitive) {
+                if (!targetInfo || targetInfo.type.flags & 1 /* Any */ && !sourceIsPrimitive) {
                     // Index signature of type any permits assignment from everything but primitives
                     return -1 /* True */;
                 }
@@ -43569,8 +44722,11 @@ var ts;
                 // The emptyArray singleton is used to signal a recursive invocation.
                 cache.variances = ts.emptyArray;
                 variances = [];
-                for (var _i = 0, typeParameters_1 = typeParameters; _i < typeParameters_1.length; _i++) {
-                    var tp = typeParameters_1[_i];
+                var _loop_11 = function (tp) {
+                    var unmeasurable = false;
+                    var unreliable = false;
+                    var oldHandler = outofbandVarianceMarkerHandler;
+                    outofbandVarianceMarkerHandler = function (onlyUnreliable) { return onlyUnreliable ? unreliable = true : unmeasurable = true; };
                     // We first compare instantiations where the type parameter is replaced with
                     // marker types that have a known subtype relationship. From this we can infer
                     // invariance, covariance, contravariance or bivariance.
@@ -43585,7 +44741,20 @@ var ts;
                     if (variance === 3 /* Bivariant */ && isTypeAssignableTo(createMarkerType(cache, tp, markerOtherType), typeWithSuper)) {
                         variance = 4 /* Independent */;
                     }
+                    outofbandVarianceMarkerHandler = oldHandler;
+                    if (unmeasurable || unreliable) {
+                        if (unmeasurable) {
+                            variance |= 8 /* Unmeasurable */;
+                        }
+                        if (unreliable) {
+                            variance |= 16 /* Unreliable */;
+                        }
+                    }
                     variances.push(variance);
+                };
+                for (var _i = 0, typeParameters_1 = typeParameters; _i < typeParameters_1.length; _i++) {
+                    var tp = typeParameters_1[_i];
+                    _loop_11(tp);
                 }
                 cache.variances = variances;
             }
@@ -43602,7 +44771,7 @@ var ts;
         // See comment at call in recursiveTypeRelatedTo for when this case matters.
         function hasCovariantVoidArgument(typeArguments, variances) {
             for (var i = 0; i < variances.length; i++) {
-                if (variances[i] === 1 /* Covariant */ && typeArguments[i].flags & 16384 /* Void */) {
+                if ((variances[i] & 7 /* VarianceMask */) === 1 /* Covariant */ && typeArguments[i].flags & 16384 /* Void */) {
                     return true;
                 }
             }
@@ -43780,18 +44949,24 @@ var ts;
             if (!(isMatchingSignature(source, target, partialMatch))) {
                 return 0 /* False */;
             }
-            // Check that the two signatures have the same number of type parameters. We might consider
-            // also checking that any type parameter constraints match, but that would require instantiating
-            // the constraints with a common set of type arguments to get relatable entities in places where
-            // type parameters occur in the constraints. The complexity of doing that doesn't seem worthwhile,
-            // particularly as we're comparing erased versions of the signatures below.
+            // Check that the two signatures have the same number of type parameters.
             if (ts.length(source.typeParameters) !== ts.length(target.typeParameters)) {
                 return 0 /* False */;
             }
-            // Spec 1.0 Section 3.8.3 & 3.8.4:
-            // M and N (the signatures) are instantiated using type Any as the type argument for all type parameters declared by M and N
-            source = getErasedSignature(source);
-            target = getErasedSignature(target);
+            // Check that type parameter constraints and defaults match. If they do, instantiate the source
+            // signature with the type parameters of the target signature and continue the comparison.
+            if (target.typeParameters) {
+                var mapper = createTypeMapper(source.typeParameters, target.typeParameters);
+                for (var i = 0; i < target.typeParameters.length; i++) {
+                    var s = source.typeParameters[i];
+                    var t = target.typeParameters[i];
+                    if (!(s === t || compareTypes(instantiateType(getConstraintFromTypeParameter(s), mapper) || unknownType, getConstraintFromTypeParameter(t) || unknownType) &&
+                        compareTypes(instantiateType(getDefaultFromTypeParameter(s), mapper) || unknownType, getDefaultFromTypeParameter(t) || unknownType))) {
+                        return 0 /* False */;
+                    }
+                }
+                source = instantiateSignature(source, mapper, /*eraseTypeParameters*/ true);
+            }
             var result = -1 /* True */;
             if (!ignoreThisTypes) {
                 var sourceThisType = getThisTypeOfSignature(source);
@@ -43893,7 +45068,7 @@ var ts;
             if (propType) {
                 return propType;
             }
-            if (everyType(type, isTupleType) && !everyType(type, function (t) { return !t.target.hasRestElement; })) {
+            if (everyType(type, isTupleType)) {
                 return mapType(type, function (t) { return getRestTypeOfTupleType(t) || undefinedType; });
             }
             return undefined;
@@ -43938,6 +45113,23 @@ var ts;
             }
             return type;
         }
+        function getWidenedLiteralLikeTypeForContextualReturnTypeIfNeeded(type, contextualSignatureReturnType, isAsync) {
+            if (type && isUnitType(type)) {
+                var contextualType = !contextualSignatureReturnType ? undefined :
+                    isAsync ? getPromisedTypeOfPromise(contextualSignatureReturnType) :
+                        contextualSignatureReturnType;
+                type = getWidenedLiteralLikeTypeForContextualType(type, contextualType);
+            }
+            return type;
+        }
+        function getWidenedLiteralLikeTypeForContextualIterationTypeIfNeeded(type, contextualSignatureReturnType, kind, isAsyncGenerator) {
+            if (type && isUnitType(type)) {
+                var contextualType = !contextualSignatureReturnType ? undefined :
+                    getIterationTypeOfGeneratorFunctionReturnType(kind, contextualSignatureReturnType, isAsyncGenerator);
+                type = getWidenedLiteralLikeTypeForContextualType(type, contextualType);
+            }
+            return type;
+        }
         /**
          * Check if a Type was written as a tuple type literal.
          * Prefer using isTupleLikeType() unless the use of `elementTypes` is required.
@@ -44027,16 +45219,40 @@ var ts;
         function getNonNullableType(type) {
             return strictNullChecks ? getGlobalNonNullableTypeInstantiation(type) : type;
         }
+        /**
+         * Is source potentially coercible to target type under `==`.
+         * Assumes that `source` is a constituent of a union, hence
+         * the boolean literal flag on the LHS, but not on the RHS.
+         *
+         * This does not fully replicate the semantics of `==`. The
+         * intention is to catch cases that are clearly not right.
+         *
+         * Comparing (string | number) to number should not remove the
+         * string element.
+         *
+         * Comparing (string | number) to 1 will remove the string
+         * element, though this is not sound. This is a pragmatic
+         * choice.
+         *
+         * @see narrowTypeByEquality
+         *
+         * @param source
+         * @param target
+         */
+        function isCoercibleUnderDoubleEquals(source, target) {
+            return ((source.flags & (8 /* Number */ | 4 /* String */ | 512 /* BooleanLiteral */)) !== 0)
+                && ((target.flags & (8 /* Number */ | 4 /* String */ | 16 /* Boolean */)) !== 0);
+        }
         /**
          * Return true if type was inferred from an object literal, written as an object type literal, or is the shape of a module
          * with no call or construct signatures.
          */
         function isObjectTypeWithInferableIndex(type) {
-            return type.symbol && (type.symbol.flags & (4096 /* ObjectLiteral */ | 2048 /* TypeLiteral */ | 512 /* ValueModule */)) !== 0 &&
+            return type.symbol && (type.symbol.flags & (4096 /* ObjectLiteral */ | 2048 /* TypeLiteral */ | 384 /* Enum */ | 512 /* ValueModule */)) !== 0 &&
                 !typeHasCallOrConstructSignatures(type);
         }
         function createSymbolWithType(source, type) {
-            var symbol = createSymbol(source.flags, source.escapedName);
+            var symbol = createSymbol(source.flags, source.escapedName, ts.getCheckFlags(source) & 8 /* Readonly */);
             symbol.declarations = source.declarations;
             symbol.parent = source.parent;
             symbol.type = type;
@@ -44155,34 +45371,42 @@ var ts;
             var stringIndexInfo = getIndexInfoOfType(type, 0 /* String */);
             var numberIndexInfo = getIndexInfoOfType(type, 1 /* Number */);
             var result = createAnonymousType(type.symbol, members, ts.emptyArray, ts.emptyArray, stringIndexInfo && createIndexInfo(getWidenedType(stringIndexInfo.type), stringIndexInfo.isReadonly), numberIndexInfo && createIndexInfo(getWidenedType(numberIndexInfo.type), numberIndexInfo.isReadonly));
-            result.objectFlags |= (ts.getObjectFlags(type) & 16384 /* JSLiteral */); // Retain js literal flag through widening
+            result.objectFlags |= (ts.getObjectFlags(type) & (16384 /* JSLiteral */ | 1048576 /* NonInferrableType */)); // Retain js literal flag through widening
             return result;
         }
         function getWidenedType(type) {
             return getWidenedTypeWithContext(type, /*context*/ undefined);
         }
         function getWidenedTypeWithContext(type, context) {
-            if (ts.getObjectFlags(type) & 393216 /* RequiresWidening */) {
+            if (ts.getObjectFlags(type) & 786432 /* RequiresWidening */) {
+                if (context === undefined && type.widened) {
+                    return type.widened;
+                }
+                var result = void 0;
                 if (type.flags & 98304 /* Nullable */) {
-                    return anyType;
+                    result = anyType;
                 }
-                if (isObjectLiteralType(type)) {
-                    return getWidenedTypeOfObjectLiteral(type, context);
+                else if (isObjectLiteralType(type)) {
+                    result = getWidenedTypeOfObjectLiteral(type, context);
                 }
-                if (type.flags & 1048576 /* Union */) {
+                else if (type.flags & 1048576 /* Union */) {
                     var unionContext_1 = context || createWideningContext(/*parent*/ undefined, /*propertyName*/ undefined, type.types);
                     var widenedTypes = ts.sameMap(type.types, function (t) { return t.flags & 98304 /* Nullable */ ? t : getWidenedTypeWithContext(t, unionContext_1); });
                     // Widening an empty object literal transitions from a highly restrictive type to
                     // a highly inclusive one. For that reason we perform subtype reduction here if the
                     // union includes empty object types (e.g. reducing {} | string to just {}).
-                    return getUnionType(widenedTypes, ts.some(widenedTypes, isEmptyObjectType) ? 2 /* Subtype */ : 1 /* Literal */);
+                    result = getUnionType(widenedTypes, ts.some(widenedTypes, isEmptyObjectType) ? 2 /* Subtype */ : 1 /* Literal */);
                 }
-                if (type.flags & 2097152 /* Intersection */) {
-                    return getIntersectionType(ts.sameMap(type.types, getWidenedType));
+                else if (type.flags & 2097152 /* Intersection */) {
+                    result = getIntersectionType(ts.sameMap(type.types, getWidenedType));
                 }
-                if (isArrayType(type) || isTupleType(type)) {
-                    return createTypeReference(type.target, ts.sameMap(type.typeArguments, getWidenedType));
+                else if (isArrayType(type) || isTupleType(type)) {
+                    result = createTypeReference(type.target, ts.sameMap(type.typeArguments, getWidenedType));
                 }
+                if (result && context === undefined) {
+                    type.widened = result;
+                }
+                return result || type;
             }
             return type;
         }
@@ -44199,7 +45423,7 @@ var ts;
          */
         function reportWideningErrorsInType(type) {
             var errorReported = false;
-            if (ts.getObjectFlags(type) & 131072 /* ContainsWideningType */) {
+            if (ts.getObjectFlags(type) & 262144 /* ContainsWideningType */) {
                 if (type.flags & 1048576 /* Union */) {
                     if (ts.some(type.types, isEmptyObjectType)) {
                         errorReported = true;
@@ -44225,7 +45449,7 @@ var ts;
                     for (var _d = 0, _e = getPropertiesOfObjectType(type); _d < _e.length; _d++) {
                         var p = _e[_d];
                         var t = getTypeOfSymbol(p);
-                        if (ts.getObjectFlags(t) & 131072 /* ContainsWideningType */) {
+                        if (ts.getObjectFlags(t) & 262144 /* ContainsWideningType */) {
                             if (!reportWideningErrorsInType(t)) {
                                 error(p.valueDeclaration, ts.Diagnostics.Object_literal_s_property_0_implicitly_has_an_1_type, symbolToString(p), typeToString(getWidenedType(t)));
                             }
@@ -44236,7 +45460,7 @@ var ts;
             }
             return errorReported;
         }
-        function reportImplicitAny(declaration, type) {
+        function reportImplicitAny(declaration, type, wideningKind) {
             var typeAsString = typeToString(getWidenedType(type));
             if (ts.isInJSFile(declaration) && !ts.isCheckJsEnabledForFile(ts.getSourceFileOfNode(declaration), compilerOptions)) {
                 // Only report implicit any errors/suggestions in TS and ts-check JS files
@@ -44244,12 +45468,12 @@ var ts;
             }
             var diagnostic;
             switch (declaration.kind) {
-                case 204 /* BinaryExpression */:
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
+                case 205 /* BinaryExpression */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
                     diagnostic = noImplicitAny ? ts.Diagnostics.Member_0_implicitly_has_an_1_type : ts.Diagnostics.Member_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage;
                     break;
-                case 151 /* Parameter */:
+                case 152 /* Parameter */:
                     var param = declaration;
                     if (ts.isIdentifier(param.name) &&
                         (ts.isCallSignatureDeclaration(param.parent) || ts.isMethodSignature(param.parent) || ts.isFunctionTypeNode(param.parent)) &&
@@ -44264,30 +45488,37 @@ var ts;
                         noImplicitAny ? ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type : ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type_but_a_better_type_may_be_inferred_from_usage :
                         noImplicitAny ? ts.Diagnostics.Parameter_0_implicitly_has_an_1_type : ts.Diagnostics.Parameter_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage;
                     break;
-                case 186 /* BindingElement */:
+                case 187 /* BindingElement */:
                     diagnostic = ts.Diagnostics.Binding_element_0_implicitly_has_an_1_type;
                     if (!noImplicitAny) {
                         // Don't issue a suggestion for binding elements since the codefix doesn't yet support them.
                         return;
                     }
                     break;
-                case 294 /* JSDocFunctionType */:
+                case 295 /* JSDocFunctionType */:
                     error(declaration, ts.Diagnostics.Function_type_which_lacks_return_type_annotation_implicitly_has_an_0_return_type, typeAsString);
                     return;
-                case 239 /* FunctionDeclaration */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
+                case 240 /* FunctionDeclaration */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
                     if (noImplicitAny && !declaration.name) {
-                        error(declaration, ts.Diagnostics.Function_expression_which_lacks_return_type_annotation_implicitly_has_an_0_return_type, typeAsString);
+                        if (wideningKind === 1 /* GeneratorYield */) {
+                            error(declaration, ts.Diagnostics.Generator_implicitly_has_yield_type_0_because_it_does_not_yield_any_values_Consider_supplying_a_return_type_annotation, typeAsString);
+                        }
+                        else {
+                            error(declaration, ts.Diagnostics.Function_expression_which_lacks_return_type_annotation_implicitly_has_an_0_return_type, typeAsString);
+                        }
                         return;
                     }
-                    diagnostic = noImplicitAny ? ts.Diagnostics._0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type : ts.Diagnostics._0_implicitly_has_an_1_return_type_but_a_better_type_may_be_inferred_from_usage;
+                    diagnostic = !noImplicitAny ? ts.Diagnostics._0_implicitly_has_an_1_return_type_but_a_better_type_may_be_inferred_from_usage :
+                        wideningKind === 1 /* GeneratorYield */ ? ts.Diagnostics._0_which_lacks_return_type_annotation_implicitly_has_an_1_yield_type :
+                            ts.Diagnostics._0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type;
                     break;
-                case 181 /* MappedType */:
+                case 182 /* MappedType */:
                     if (noImplicitAny) {
                         error(declaration, ts.Diagnostics.Mapped_object_type_implicitly_has_an_any_template_type);
                     }
@@ -44297,15 +45528,15 @@ var ts;
             }
             errorOrSuggestion(noImplicitAny, declaration, diagnostic, ts.declarationNameToString(ts.getNameOfDeclaration(declaration)), typeAsString);
         }
-        function reportErrorsFromWidening(declaration, type) {
-            if (produceDiagnostics && noImplicitAny && ts.getObjectFlags(type) & 131072 /* ContainsWideningType */) {
+        function reportErrorsFromWidening(declaration, type, wideningKind) {
+            if (produceDiagnostics && noImplicitAny && ts.getObjectFlags(type) & 262144 /* ContainsWideningType */) {
                 // Report implicit any error within type if possible, otherwise report error on declaration
                 if (!reportWideningErrorsInType(type)) {
-                    reportImplicitAny(declaration, type);
+                    reportImplicitAny(declaration, type, wideningKind);
                 }
             }
         }
-        function forEachMatchingParameterType(source, target, callback) {
+        function applyToParameterTypes(source, target, callback) {
             var sourceCount = getParameterCount(source);
             var targetCount = getParameterCount(target);
             var sourceRestType = getEffectiveRestType(source);
@@ -44326,25 +45557,55 @@ var ts;
                 callback(getRestTypeAtPosition(source, paramCount), targetRestType);
             }
         }
-        function createInferenceContext(typeParameters, signature, flags, compareTypes, baseInferences) {
-            var inferences = baseInferences ? baseInferences.map(cloneInferenceInfo) : typeParameters.map(createInferenceInfo);
-            var context = mapper;
-            context.typeParameters = typeParameters;
-            context.signature = signature;
-            context.inferences = inferences;
-            context.flags = flags;
-            context.compareTypes = compareTypes || compareTypesAssignable;
+        function applyToReturnTypes(source, target, callback) {
+            var sourceTypePredicate = getTypePredicateOfSignature(source);
+            var targetTypePredicate = getTypePredicateOfSignature(target);
+            if (sourceTypePredicate && targetTypePredicate && sourceTypePredicate.kind === targetTypePredicate.kind &&
+                (sourceTypePredicate.kind === 0 /* This */ || sourceTypePredicate.parameterIndex === targetTypePredicate.parameterIndex)) {
+                callback(sourceTypePredicate.type, targetTypePredicate.type);
+            }
+            else {
+                callback(getReturnTypeOfSignature(source), getReturnTypeOfSignature(target));
+            }
+        }
+        function createInferenceContext(typeParameters, signature, flags, compareTypes) {
+            return createInferenceContextWorker(typeParameters.map(createInferenceInfo), signature, flags, compareTypes || compareTypesAssignable);
+        }
+        function cloneInferenceContext(context, extraFlags) {
+            if (extraFlags === void 0) { extraFlags = 0; }
+            return context && createInferenceContextWorker(ts.map(context.inferences, cloneInferenceInfo), context.signature, context.flags | extraFlags, context.compareTypes);
+        }
+        function createInferenceContextWorker(inferences, signature, flags, compareTypes) {
+            var context = {
+                inferences: inferences,
+                signature: signature,
+                flags: flags,
+                compareTypes: compareTypes,
+                mapper: function (t) { return mapToInferredType(context, t, /*fix*/ true); },
+                nonFixingMapper: function (t) { return mapToInferredType(context, t, /*fix*/ false); },
+            };
             return context;
-            function mapper(t) {
-                for (var i = 0; i < inferences.length; i++) {
-                    if (t === inferences[i].typeParameter) {
-                        if (!(context.flags & 4 /* NoFixing */)) {
-                            inferences[i].isFixed = true;
-                        }
-                        return getInferredType(context, i);
+        }
+        function mapToInferredType(context, t, fix) {
+            var inferences = context.inferences;
+            for (var i = 0; i < inferences.length; i++) {
+                var inference = inferences[i];
+                if (t === inference.typeParameter) {
+                    if (fix && !inference.isFixed) {
+                        clearCachedInferences(inferences);
+                        inference.isFixed = true;
                     }
+                    return getInferredType(context, i);
+                }
+            }
+            return t;
+        }
+        function clearCachedInferences(inferences) {
+            for (var _i = 0, inferences_1 = inferences; _i < inferences_1.length; _i++) {
+                var inference = inferences_1[_i];
+                if (!inference.isFixed) {
+                    inference.inferredType = undefined;
                 }
-                return t;
             }
         }
         function createInferenceInfo(typeParameter) {
@@ -44369,6 +45630,9 @@ var ts;
                 isFixed: inference.isFixed
             };
         }
+        function getMapperFromContext(context) {
+            return context && context.mapper;
+        }
         // Return true if the given type could possibly reference a type parameter for which
         // we perform type inference (i.e. a type parameter of a generic function). We cache
         // results for union and intersection types for performance reasons.
@@ -44376,7 +45640,7 @@ var ts;
             var objectFlags = ts.getObjectFlags(type);
             return !!(type.flags & 63176704 /* Instantiable */ ||
                 objectFlags & 4 /* Reference */ && ts.forEach(type.typeArguments, couldContainTypeVariables) ||
-                objectFlags & 16 /* Anonymous */ && type.symbol && type.symbol.flags & (16 /* Function */ | 8192 /* Method */ | 2048 /* TypeLiteral */ | 32 /* Class */) ||
+                objectFlags & 16 /* Anonymous */ && type.symbol && type.symbol.flags & (16 /* Function */ | 8192 /* Method */ | 32 /* Class */ | 2048 /* TypeLiteral */ | 4096 /* ObjectLiteral */) && type.symbol.declarations ||
                 objectFlags & 32 /* Mapped */ ||
                 type.flags & 3145728 /* UnionOrIntersection */ && couldUnionOrIntersectionContainTypeVariables(type));
         }
@@ -44387,7 +45651,10 @@ var ts;
             return type.couldContainTypeVariables;
         }
         function isTypeParameterAtTopLevel(type, typeParameter) {
-            return type === typeParameter || !!(type.flags & 3145728 /* UnionOrIntersection */) && ts.some(type.types, function (t) { return isTypeParameterAtTopLevel(t, typeParameter); });
+            return !!(type === typeParameter ||
+                type.flags & 3145728 /* UnionOrIntersection */ && ts.some(type.types, function (t) { return isTypeParameterAtTopLevel(t, typeParameter); }) ||
+                type.flags & 16777216 /* Conditional */ && (isTypeParameterAtTopLevel(getTrueTypeFromConditionalType(type), typeParameter) ||
+                    isTypeParameterAtTopLevel(getFalseTypeFromConditionalType(type), typeParameter)));
         }
         /** Create an object with properties named in the string literal type. Every property has type `any` */
         function createEmptyObjectTypeFromStringLiteral(type) {
@@ -44424,19 +45691,20 @@ var ts;
             reverseMappedCache.set(key, type);
             return type;
         }
+        // We consider a type to be partially inferable if it isn't marked non-inferable or if it is
+        // an object literal type with at least one property of an inferable type. For example, an object
+        // literal { a: 123, b: x => true } is marked non-inferable because it contains a context sensitive
+        // arrow function, but is considered partially inferable because property 'a' has an inferable type.
+        function isPartiallyInferableType(type) {
+            return !(ts.getObjectFlags(type) & 1048576 /* NonInferrableType */) ||
+                isObjectLiteralType(type) && ts.some(getPropertiesOfType(type), function (prop) { return isPartiallyInferableType(getTypeOfSymbol(prop)); });
+        }
         function createReverseMappedType(source, target, constraint) {
-            var properties = getPropertiesOfType(source);
-            if (properties.length === 0 && !getIndexInfoOfType(source, 0 /* String */)) {
+            // We consider a source type reverse mappable if it has a string index signature or if
+            // it has one or more properties and is of a partially inferable type.
+            if (!(getIndexInfoOfType(source, 0 /* String */) || getPropertiesOfType(source).length !== 0 && isPartiallyInferableType(source))) {
                 return undefined;
             }
-            // If any property contains context sensitive functions that have been skipped, the source type
-            // is incomplete and we can't infer a meaningful input type.
-            for (var _i = 0, properties_3 = properties; _i < properties_3.length; _i++) {
-                var prop = properties_3[_i];
-                if (ts.getObjectFlags(getTypeOfSymbol(prop)) & 524288 /* ContainsAnyFunctionType */) {
-                    return undefined;
-                }
-            }
             // For arrays and tuples we infer new arrays and tuples where the reverse mapping has been
             // applied to the element type(s).
             if (isArrayType(source)) {
@@ -44464,20 +45732,20 @@ var ts;
             var templateType = getTemplateTypeFromMappedType(target);
             var inference = createInferenceInfo(typeParameter);
             inferTypes([inference], sourceType, templateType);
-            return getTypeFromInference(inference);
+            return getTypeFromInference(inference) || unknownType;
         }
         function getUnmatchedProperties(source, target, requireOptionalProperties, matchDiscriminantProperties) {
-            var properties, _i, properties_4, targetProp, sourceProp, targetType, sourceType;
+            var properties, _i, properties_2, targetProp, sourceProp, targetType, sourceType;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        properties = target.flags & 2097152 /* Intersection */ ? getPropertiesOfUnionOrIntersectionType(target) : getPropertiesOfObjectType(target);
-                        _i = 0, properties_4 = properties;
+                        properties = target.flags & 1048576 /* Union */ ? getPossiblePropertiesOfUnionType(target) : getPropertiesOfType(target);
+                        _i = 0, properties_2 = properties;
                         _a.label = 1;
                     case 1:
-                        if (!(_i < properties_4.length)) return [3 /*break*/, 6];
-                        targetProp = properties_4[_i];
-                        if (!(requireOptionalProperties || !(targetProp.flags & 16777216 /* Optional */))) return [3 /*break*/, 5];
+                        if (!(_i < properties_2.length)) return [3 /*break*/, 6];
+                        targetProp = properties_2[_i];
+                        if (!(requireOptionalProperties || !(targetProp.flags & 16777216 /* Optional */ || ts.getCheckFlags(targetProp) & 48 /* Partial */))) return [3 /*break*/, 5];
                         sourceProp = getPropertyOfType(source, targetProp.escapedName);
                         if (!!sourceProp) return [3 /*break*/, 3];
                         return [4 /*yield*/, targetProp];
@@ -44502,7 +45770,9 @@ var ts;
             });
         }
         function getUnmatchedProperty(source, target, requireOptionalProperties, matchDiscriminantProperties) {
-            return getUnmatchedProperties(source, target, requireOptionalProperties, matchDiscriminantProperties).next().value;
+            var result = getUnmatchedProperties(source, target, requireOptionalProperties, matchDiscriminantProperties).next();
+            if (!result.done)
+                return result.value;
         }
         function tupleTypesDefinitelyUnrelated(source, target) {
             return target.target.minLength > source.target.minLength ||
@@ -44518,15 +45788,17 @@ var ts;
         function getTypeFromInference(inference) {
             return inference.candidates ? getUnionType(inference.candidates, 2 /* Subtype */) :
                 inference.contraCandidates ? getIntersectionType(inference.contraCandidates) :
-                    emptyObjectType;
+                    undefined;
         }
-        function inferTypes(inferences, originalSource, originalTarget, priority) {
+        function inferTypes(inferences, originalSource, originalTarget, priority, contravariant) {
             if (priority === void 0) { priority = 0; }
+            if (contravariant === void 0) { contravariant = false; }
             var symbolStack;
             var visited;
-            var contravariant = false;
             var bivariant = false;
             var propagationType;
+            var inferenceCount = 0;
+            var inferenceIncomplete = false;
             var allowComplexConstraintInference = true;
             inferFromTypes(originalSource, originalTarget);
             function inferFromTypes(source, target) {
@@ -44546,11 +45818,7 @@ var ts;
                 if (source.aliasSymbol && source.aliasTypeArguments && source.aliasSymbol === target.aliasSymbol) {
                     // Source and target are types originating in the same generic type alias declaration.
                     // Simply infer from source type arguments to target type arguments.
-                    var sourceTypes = source.aliasTypeArguments;
-                    var targetTypes = target.aliasTypeArguments;
-                    for (var i = 0; i < sourceTypes.length; i++) {
-                        inferFromTypes(sourceTypes[i], targetTypes[i]);
-                    }
+                    inferFromTypeArguments(source.aliasTypeArguments, target.aliasTypeArguments, getAliasVariances(source.aliasSymbol));
                     return;
                 }
                 if (source.flags & 1048576 /* Union */ && target.flags & 1048576 /* Union */ && !(source.flags & 1024 /* EnumLiteral */ && target.flags & 1024 /* EnumLiteral */) ||
@@ -44573,25 +45841,34 @@ var ts;
                     var matchingTypes = void 0;
                     for (var _b = 0, _c = source.types; _b < _c.length; _b++) {
                         var t = _c[_b];
-                        if (typeIdenticalToSomeType(t, target.types)) {
-                            (matchingTypes || (matchingTypes = [])).push(t);
-                            inferFromTypes(t, t);
-                        }
-                        else if (t.flags & (256 /* NumberLiteral */ | 128 /* StringLiteral */)) {
-                            var b = getBaseTypeOfLiteralType(t);
-                            if (typeIdenticalToSomeType(b, target.types)) {
-                                (matchingTypes || (matchingTypes = [])).push(t, b);
-                            }
+                        var matched = findMatchedType(t, target);
+                        if (matched) {
+                            (matchingTypes || (matchingTypes = [])).push(matched);
+                            inferFromTypes(matched, matched);
                         }
                     }
                     // Next, to improve the quality of inferences, reduce the source and target types by
                     // removing the identically matched constituents. For example, when inferring from
                     // 'string | string[]' to 'string | T' we reduce the types to 'string[]' and 'T'.
                     if (matchingTypes) {
-                        source = removeTypesFromUnionOrIntersection(source, matchingTypes);
-                        target = removeTypesFromUnionOrIntersection(target, matchingTypes);
+                        var s = removeTypesFromUnionOrIntersection(source, matchingTypes);
+                        var t = removeTypesFromUnionOrIntersection(target, matchingTypes);
+                        if (!(s && t))
+                            return;
+                        source = s;
+                        target = t;
                     }
                 }
+                else if (target.flags & 1048576 /* Union */ && !(target.flags & 1024 /* EnumLiteral */) || target.flags & 2097152 /* Intersection */) {
+                    var matched = findMatchedType(source, target);
+                    if (matched) {
+                        inferFromTypes(matched, matched);
+                        return;
+                    }
+                }
+                else if (target.flags & (8388608 /* IndexedAccess */ | 33554432 /* Substitution */)) {
+                    target = getActualTypeVariable(target);
+                }
                 if (target.flags & 8650752 /* TypeVariable */) {
                     // If target is a type parameter, make an inference, unless the source type contains
                     // the anyFunctionType (the wildcard type that's used to avoid contextually typing functions).
@@ -44600,7 +45877,7 @@ var ts;
                     // not contain anyFunctionType when we come back to this argument for its second round
                     // of inference. Also, we exclude inferences for silentNeverType (which is used as a wildcard
                     // when constructing types from type parameters that had no inference candidates).
-                    if (ts.getObjectFlags(source) & 524288 /* ContainsAnyFunctionType */ || source === silentNeverType || (priority & 8 /* ReturnType */ && (source === autoType || source === autoArrayType))) {
+                    if (ts.getObjectFlags(source) & 1048576 /* NonInferrableType */ || source === silentNeverType || (priority & 16 /* ReturnType */ && (source === autoType || source === autoArrayType))) {
                         return;
                     }
                     var inference = getInferenceInfoForType(target);
@@ -44617,54 +45894,46 @@ var ts;
                                 // We make contravariant inferences only if we are in a pure contravariant position,
                                 // i.e. only if we have not descended into a bivariant position.
                                 if (contravariant && !bivariant) {
-                                    inference.contraCandidates = ts.appendIfUnique(inference.contraCandidates, candidate);
+                                    if (!ts.contains(inference.contraCandidates, candidate)) {
+                                        inference.contraCandidates = ts.append(inference.contraCandidates, candidate);
+                                        clearCachedInferences(inferences);
+                                    }
                                 }
-                                else {
-                                    inference.candidates = ts.appendIfUnique(inference.candidates, candidate);
+                                else if (!ts.contains(inference.candidates, candidate)) {
+                                    inference.candidates = ts.append(inference.candidates, candidate);
+                                    clearCachedInferences(inferences);
                                 }
                             }
-                            if (!(priority & 8 /* ReturnType */) && target.flags & 262144 /* TypeParameter */ && !isTypeParameterAtTopLevel(originalTarget, target)) {
+                            if (!(priority & 16 /* ReturnType */) && target.flags & 262144 /* TypeParameter */ && inference.topLevel && !isTypeParameterAtTopLevel(originalTarget, target)) {
                                 inference.topLevel = false;
+                                clearCachedInferences(inferences);
                             }
                         }
+                        inferenceCount++;
                         return;
                     }
                     else {
                         // Infer to the simplified version of an indexed access, if possible, to (hopefully) expose more bare type parameters to the inference engine
-                        var simplified = getSimplifiedType(target);
+                        var simplified = getSimplifiedType(target, /*writing*/ false);
                         if (simplified !== target) {
-                            inferFromTypesOnce(source, simplified);
+                            invokeOnce(source, simplified, inferFromTypes);
                         }
                         else if (target.flags & 8388608 /* IndexedAccess */) {
-                            var indexType = getSimplifiedType(target.indexType);
+                            var indexType = getSimplifiedType(target.indexType, /*writing*/ false);
                             // Generally simplifications of instantiable indexes are avoided to keep relationship checking correct, however if our target is an access, we can consider
                             // that key of that access to be "instantiated", since we're looking to find the infernce goal in any way we can.
                             if (indexType.flags & 63176704 /* Instantiable */) {
-                                var simplified_1 = distributeIndexOverObjectType(getSimplifiedType(target.objectType), indexType);
+                                var simplified_1 = distributeIndexOverObjectType(getSimplifiedType(target.objectType, /*writing*/ false), indexType, /*writing*/ false);
                                 if (simplified_1 && simplified_1 !== target) {
-                                    inferFromTypesOnce(source, simplified_1);
+                                    invokeOnce(source, simplified_1, inferFromTypes);
                                 }
                             }
                         }
                     }
                 }
-                else if (target.flags & 33554432 /* Substitution */) {
-                    inferFromTypes(source, target.typeVariable);
-                }
-                if (ts.getObjectFlags(source) & 4 /* Reference */ && ts.getObjectFlags(target) & 4 /* Reference */ && source.target === target.target) {
+                if (ts.getObjectFlags(source) & 4 /* Reference */ && ts.getObjectFlags(target) & 4 /* Reference */ && (source.target === target.target || isArrayType(source) && isArrayType(target))) {
                     // If source and target are references to the same generic type, infer from type arguments
-                    var sourceTypes = source.typeArguments || ts.emptyArray;
-                    var targetTypes = target.typeArguments || ts.emptyArray;
-                    var count = sourceTypes.length < targetTypes.length ? sourceTypes.length : targetTypes.length;
-                    var variances = getVariances(source.target);
-                    for (var i = 0; i < count; i++) {
-                        if (i < variances.length && variances[i] === 2 /* Contravariant */) {
-                            inferFromContravariantTypes(sourceTypes[i], targetTypes[i]);
-                        }
-                        else {
-                            inferFromTypes(sourceTypes[i], targetTypes[i]);
-                        }
-                    }
+                    inferFromTypeArguments(source.typeArguments || ts.emptyArray, target.typeArguments || ts.emptyArray, getVariances(source.target));
                 }
                 else if (source.flags & 4194304 /* Index */ && target.flags & 4194304 /* Index */) {
                     contravariant = !contravariant;
@@ -44675,7 +45944,7 @@ var ts;
                     var empty = createEmptyObjectTypeFromStringLiteral(source);
                     contravariant = !contravariant;
                     var savePriority = priority;
-                    priority |= 16 /* LiteralKeyof */;
+                    priority |= 32 /* LiteralKeyof */;
                     inferFromTypes(empty, target.type);
                     priority = savePriority;
                     contravariant = !contravariant;
@@ -44690,34 +45959,23 @@ var ts;
                     inferFromTypes(getTrueTypeFromConditionalType(source), getTrueTypeFromConditionalType(target));
                     inferFromTypes(getFalseTypeFromConditionalType(source), getFalseTypeFromConditionalType(target));
                 }
-                else if (target.flags & 16777216 /* Conditional */) {
-                    inferFromTypes(source, getTrueTypeFromConditionalType(target));
-                    inferFromTypes(source, getFalseTypeFromConditionalType(target));
+                else if (target.flags & 16777216 /* Conditional */ && !contravariant) {
+                    var targetTypes = [getTrueTypeFromConditionalType(target), getFalseTypeFromConditionalType(target)];
+                    inferToMultipleTypes(source, targetTypes, target.flags);
                 }
                 else if (target.flags & 3145728 /* UnionOrIntersection */) {
-                    for (var _d = 0, _e = target.types; _d < _e.length; _d++) {
-                        var t = _e[_d];
-                        var savePriority = priority;
-                        // Inferences directly to naked type variables are given lower priority as they are
-                        // less specific. For example, when inferring from Promise<string> to T | Promise<T>,
-                        // we want to infer string for T, not Promise<string> | string.
-                        if (getInferenceInfoForType(t)) {
-                            priority |= 1 /* NakedTypeVariable */;
-                        }
-                        inferFromTypes(source, t);
-                        priority = savePriority;
-                    }
+                    inferToMultipleTypes(source, target.types, target.flags);
                 }
                 else if (source.flags & 1048576 /* Union */) {
                     // Source is a union or intersection type, infer from each constituent type
                     var sourceTypes = source.types;
-                    for (var _f = 0, sourceTypes_3 = sourceTypes; _f < sourceTypes_3.length; _f++) {
-                        var sourceType = sourceTypes_3[_f];
+                    for (var _d = 0, sourceTypes_3 = sourceTypes; _d < sourceTypes_3.length; _d++) {
+                        var sourceType = sourceTypes_3[_d];
                         inferFromTypes(sourceType, target);
                     }
                 }
                 else {
-                    if (!(priority & 32 /* NoConstraints */ && source.flags & (2097152 /* Intersection */ | 63176704 /* Instantiable */))) {
+                    if (!(priority & 64 /* NoConstraints */ && source.flags & (2097152 /* Intersection */ | 63176704 /* Instantiable */))) {
                         var apparentSource = getApparentType(source);
                         // getApparentType can return _any_ type, since an indexed access or conditional may simplify to any other type.
                         // If that occurs and it doesn't simplify to an object or intersection, we'll need to restart `inferFromTypes`
@@ -44736,41 +45994,35 @@ var ts;
                         source = apparentSource;
                     }
                     if (source.flags & (524288 /* Object */ | 2097152 /* Intersection */)) {
-                        var key = source.id + "," + target.id;
-                        if (visited && visited.get(key)) {
-                            return;
-                        }
-                        (visited || (visited = ts.createMap())).set(key, true);
-                        // If we are already processing another target type with the same associated symbol (such as
-                        // an instantiation of the same generic type), we do not explore this target as it would yield
-                        // no further inferences. We exclude the static side of classes from this check since it shares
-                        // its symbol with the instance side which would lead to false positives.
-                        var isNonConstructorObject = target.flags & 524288 /* Object */ &&
-                            !(ts.getObjectFlags(target) & 16 /* Anonymous */ && target.symbol && target.symbol.flags & 32 /* Class */);
-                        var symbol = isNonConstructorObject ? target.symbol : undefined;
-                        if (symbol) {
-                            if (ts.contains(symbolStack, symbol)) {
-                                return;
-                            }
-                            (symbolStack || (symbolStack = [])).push(symbol);
-                            inferFromObjectTypes(source, target);
-                            symbolStack.pop();
-                        }
-                        else {
-                            inferFromObjectTypes(source, target);
-                        }
+                        invokeOnce(source, target, inferFromObjectTypes);
                     }
                 }
-                function inferFromTypesOnce(source, target) {
-                    var key = source.id + "," + target.id;
-                    if (!visited || !visited.get(key)) {
-                        (visited || (visited = ts.createMap())).set(key, true);
-                        inferFromTypes(source, target);
+            }
+            function invokeOnce(source, target, action) {
+                var key = source.id + "," + target.id;
+                var count = visited && visited.get(key);
+                if (count !== undefined) {
+                    inferenceCount += count;
+                    return;
+                }
+                (visited || (visited = ts.createMap())).set(key, 0);
+                var startCount = inferenceCount;
+                action(source, target);
+                visited.set(key, inferenceCount - startCount);
+            }
+            function inferFromTypeArguments(sourceTypes, targetTypes, variances) {
+                var count = sourceTypes.length < targetTypes.length ? sourceTypes.length : targetTypes.length;
+                for (var i = 0; i < count; i++) {
+                    if (i < variances.length && (variances[i] & 7 /* VarianceMask */) === 2 /* Contravariant */) {
+                        inferFromContravariantTypes(sourceTypes[i], targetTypes[i]);
+                    }
+                    else {
+                        inferFromTypes(sourceTypes[i], targetTypes[i]);
                     }
                 }
             }
             function inferFromContravariantTypes(source, target) {
-                if (strictFunctionTypes || priority & 64 /* AlwaysStrict */) {
+                if (strictFunctionTypes || priority & 128 /* AlwaysStrict */) {
                     contravariant = !contravariant;
                     inferFromTypes(source, target);
                     contravariant = !contravariant;
@@ -44781,8 +46033,8 @@ var ts;
             }
             function getInferenceInfoForType(type) {
                 if (type.flags & 8650752 /* TypeVariable */) {
-                    for (var _i = 0, inferences_1 = inferences; _i < inferences_1.length; _i++) {
-                        var inference = inferences_1[_i];
+                    for (var _i = 0, inferences_2 = inferences; _i < inferences_2.length; _i++) {
+                        var inference = inferences_2[_i];
                         if (type === inference.typeParameter) {
                             return inference;
                         }
@@ -44790,6 +46042,74 @@ var ts;
                 }
                 return undefined;
             }
+            function inferToMultipleTypes(source, targets, targetFlags) {
+                var typeVariableCount = 0;
+                if (targetFlags & 1048576 /* Union */) {
+                    var nakedTypeVariable = void 0;
+                    var sources = source.flags & 1048576 /* Union */ ? source.types : [source];
+                    var matched_1 = new Array(sources.length);
+                    var saveInferenceIncomplete = inferenceIncomplete;
+                    inferenceIncomplete = false;
+                    // First infer to types that are not naked type variables. For each source type we
+                    // track whether inferences were made from that particular type to some target.
+                    for (var _i = 0, targets_1 = targets; _i < targets_1.length; _i++) {
+                        var t = targets_1[_i];
+                        if (getInferenceInfoForType(t)) {
+                            nakedTypeVariable = t;
+                            typeVariableCount++;
+                        }
+                        else {
+                            for (var i = 0; i < sources.length; i++) {
+                                var count = inferenceCount;
+                                inferFromTypes(sources[i], t);
+                                if (count !== inferenceCount)
+                                    matched_1[i] = true;
+                            }
+                        }
+                    }
+                    var inferenceComplete = !inferenceIncomplete;
+                    inferenceIncomplete = inferenceIncomplete || saveInferenceIncomplete;
+                    // If the target has a single naked type variable and inference completed (meaning we
+                    // explored the types fully), create a union of the source types from which no inferences
+                    // have been made so far and infer from that union to the naked type variable.
+                    if (typeVariableCount === 1 && inferenceComplete) {
+                        var unmatched = ts.flatMap(sources, function (s, i) { return matched_1[i] ? undefined : s; });
+                        if (unmatched.length) {
+                            inferFromTypes(getUnionType(unmatched), nakedTypeVariable);
+                            return;
+                        }
+                    }
+                }
+                else {
+                    // We infer from types that are not naked type variables first so that inferences we
+                    // make from nested naked type variables and given slightly higher priority by virtue
+                    // of being first in the candidates array.
+                    for (var _a = 0, targets_2 = targets; _a < targets_2.length; _a++) {
+                        var t = targets_2[_a];
+                        if (getInferenceInfoForType(t)) {
+                            typeVariableCount++;
+                        }
+                        else {
+                            inferFromTypes(source, t);
+                        }
+                    }
+                }
+                // Inferences directly to naked type variables are given lower priority as they are
+                // less specific. For example, when inferring from Promise<string> to T | Promise<T>,
+                // we want to infer string for T, not Promise<string> | string. For intersection types
+                // we only infer to single naked type variables.
+                if (targetFlags & 2097152 /* Intersection */ ? typeVariableCount === 1 : typeVariableCount > 0) {
+                    var savePriority = priority;
+                    priority |= 1 /* NakedTypeVariable */;
+                    for (var _b = 0, targets_3 = targets; _b < targets_3.length; _b++) {
+                        var t = targets_3[_b];
+                        if (getInferenceInfoForType(t)) {
+                            inferFromTypes(source, t);
+                        }
+                    }
+                    priority = savePriority;
+                }
+            }
             function inferToMappedType(source, target, constraintType) {
                 if (constraintType.flags & 1048576 /* Union */) {
                     var result = false;
@@ -44809,7 +46129,11 @@ var ts;
                         var inferredType = inferTypeForHomomorphicMappedType(source, target, constraintType);
                         if (inferredType) {
                             var savePriority = priority;
-                            priority |= 2 /* HomomorphicMappedType */;
+                            // We assign a lower priority to inferences made from types containing non-inferrable
+                            // types because we may only have a partial result (i.e. we may have failed to make
+                            // reverse inferences for some properties).
+                            priority |= ts.getObjectFlags(source) & 1048576 /* NonInferrableType */ ?
+                                4 /* PartialHomomorphicMappedType */ : 2 /* HomomorphicMappedType */;
                             inferFromTypes(inferredType, inference.typeParameter);
                             priority = savePriority;
                         }
@@ -44820,7 +46144,7 @@ var ts;
                     // We're inferring from some source type S to a mapped type { [P in K]: X }, where K is a type
                     // parameter. First infer from 'keyof S' to K.
                     var savePriority = priority;
-                    priority |= 4 /* MappedTypeConstraint */;
+                    priority |= 8 /* MappedTypeConstraint */;
                     inferFromTypes(getIndexType(source), constraintType);
                     priority = savePriority;
                     // If K is constrained to a type C, also infer to C. Thus, for a mapped type { [P in K]: X },
@@ -44833,16 +46157,37 @@ var ts;
                     }
                     // If no inferences can be made to K's constraint, infer from a union of the property types
                     // in the source to the template type X.
-                    var valueTypes = ts.compact([
-                        getIndexTypeOfType(source, 0 /* String */),
-                        getIndexTypeOfType(source, 1 /* Number */)
-                    ].concat(ts.map(getPropertiesOfType(source), getTypeOfSymbol)));
-                    inferFromTypes(getUnionType(valueTypes), getTemplateTypeFromMappedType(target));
+                    var propTypes = ts.map(getPropertiesOfType(source), getTypeOfSymbol);
+                    var stringIndexType = getIndexTypeOfType(source, 0 /* String */);
+                    var numberIndexInfo = getNonEnumNumberIndexInfo(source);
+                    var numberIndexType = numberIndexInfo && numberIndexInfo.type;
+                    inferFromTypes(getUnionType(ts.append(ts.append(propTypes, stringIndexType), numberIndexType)), getTemplateTypeFromMappedType(target));
                     return true;
                 }
                 return false;
             }
             function inferFromObjectTypes(source, target) {
+                // If we are already processing another target type with the same associated symbol (such as
+                // an instantiation of the same generic type), we do not explore this target as it would yield
+                // no further inferences. We exclude the static side of classes from this check since it shares
+                // its symbol with the instance side which would lead to false positives.
+                var isNonConstructorObject = target.flags & 524288 /* Object */ &&
+                    !(ts.getObjectFlags(target) & 16 /* Anonymous */ && target.symbol && target.symbol.flags & 32 /* Class */);
+                var symbol = isNonConstructorObject ? target.symbol : undefined;
+                if (symbol) {
+                    if (ts.contains(symbolStack, symbol)) {
+                        inferenceIncomplete = true;
+                        return;
+                    }
+                    (symbolStack || (symbolStack = [])).push(symbol);
+                    inferFromObjectTypesWorker(source, target);
+                    symbolStack.pop();
+                }
+                else {
+                    inferFromObjectTypesWorker(source, target);
+                }
+            }
+            function inferFromObjectTypesWorker(source, target) {
                 if (isGenericMappedType(source) && isGenericMappedType(target)) {
                     // The source and target types are generic types { [P in S]: X } and { [P in T]: Y }, so we infer
                     // from S to T and from X to Y.
@@ -44891,8 +46236,8 @@ var ts;
                     }
                 }
                 var properties = getPropertiesOfObjectType(target);
-                for (var _i = 0, properties_5 = properties; _i < properties_5.length; _i++) {
-                    var targetProp = properties_5[_i];
+                for (var _i = 0, properties_3 = properties; _i < properties_3.length; _i++) {
+                    var targetProp = properties_3[_i];
                     var sourceProp = getPropertyOfType(source, targetProp.escapedName);
                     if (sourceProp) {
                         inferFromTypes(getTypeOfSymbol(sourceProp), getTypeOfSymbol(targetProp));
@@ -44905,7 +46250,7 @@ var ts;
                 var sourceLen = sourceSignatures.length;
                 var targetLen = targetSignatures.length;
                 var len = sourceLen < targetLen ? sourceLen : targetLen;
-                var skipParameters = !!(ts.getObjectFlags(source) & 524288 /* ContainsAnyFunctionType */);
+                var skipParameters = !!(ts.getObjectFlags(source) & 1048576 /* NonInferrableType */);
                 for (var i = 0; i < len; i++) {
                     inferFromSignature(getBaseSignature(sourceSignatures[sourceLen - len + i]), getBaseSignature(targetSignatures[targetLen - len + i]), skipParameters);
                 }
@@ -44915,18 +46260,11 @@ var ts;
                     var saveBivariant = bivariant;
                     var kind = target.declaration ? target.declaration.kind : 0 /* Unknown */;
                     // Once we descend into a bivariant signature we remain bivariant for all nested inferences
-                    bivariant = bivariant || kind === 156 /* MethodDeclaration */ || kind === 155 /* MethodSignature */ || kind === 157 /* Constructor */;
-                    forEachMatchingParameterType(source, target, inferFromContravariantTypes);
+                    bivariant = bivariant || kind === 157 /* MethodDeclaration */ || kind === 156 /* MethodSignature */ || kind === 158 /* Constructor */;
+                    applyToParameterTypes(source, target, inferFromContravariantTypes);
                     bivariant = saveBivariant;
                 }
-                var sourceTypePredicate = getTypePredicateOfSignature(source);
-                var targetTypePredicate = getTypePredicateOfSignature(target);
-                if (sourceTypePredicate && targetTypePredicate && sourceTypePredicate.kind === targetTypePredicate.kind) {
-                    inferFromTypes(sourceTypePredicate.type, targetTypePredicate.type);
-                }
-                else {
-                    inferFromTypes(getReturnTypeOfSignature(source), getReturnTypeOfSignature(target));
-                }
+                applyToReturnTypes(source, target, inferFromTypes);
             }
             function inferFromIndexTypes(source, target) {
                 var targetStringIndexType = getIndexTypeOfType(target, 0 /* String */);
@@ -44948,15 +46286,33 @@ var ts;
                 }
             }
         }
-        function typeIdenticalToSomeType(type, types) {
+        function isMatchableType(type) {
+            // We exclude non-anonymous object types because some frameworks (e.g. Ember) rely on the ability to
+            // infer between types that don't witness their type variables. Such types would otherwise be eliminated
+            // because they appear identical.
+            return !(type.flags & 524288 /* Object */) || !!(ts.getObjectFlags(type) & 16 /* Anonymous */);
+        }
+        function typeMatchedBySomeType(type, types) {
             for (var _i = 0, types_11 = types; _i < types_11.length; _i++) {
                 var t = types_11[_i];
-                if (isTypeIdenticalTo(t, type)) {
+                if (t === type || isMatchableType(t) && isMatchableType(type) && isTypeIdenticalTo(t, type)) {
                     return true;
                 }
             }
             return false;
         }
+        function findMatchedType(type, target) {
+            if (typeMatchedBySomeType(type, target.types)) {
+                return type;
+            }
+            if (type.flags & (256 /* NumberLiteral */ | 128 /* StringLiteral */) && target.flags & 1048576 /* Union */) {
+                var base = getBaseTypeOfLiteralType(type);
+                if (typeMatchedBySomeType(base, target.types)) {
+                    return base;
+                }
+            }
+            return undefined;
+        }
         /**
          * Return a new union or intersection type computed by removing a given set of types
          * from a given union or intersection type.
@@ -44965,11 +46321,11 @@ var ts;
             var reducedTypes = [];
             for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
                 var t = _a[_i];
-                if (!typeIdenticalToSomeType(t, typesToRemove)) {
+                if (!typeMatchedBySomeType(t, typesToRemove)) {
                     reducedTypes.push(t);
                 }
             }
-            return type.flags & 1048576 /* Union */ ? getUnionType(reducedTypes) : getIntersectionType(reducedTypes);
+            return reducedTypes.length ? type.flags & 1048576 /* Union */ ? getUnionType(reducedTypes) : getIntersectionType(reducedTypes) : undefined;
         }
         function hasPrimitiveConstraint(type) {
             var constraint = getConstraintOfTypeParameter(type);
@@ -44978,22 +46334,25 @@ var ts;
         function isObjectLiteralType(type) {
             return !!(ts.getObjectFlags(type) & 128 /* ObjectLiteral */);
         }
-        function widenObjectLiteralCandidates(candidates) {
+        function isObjectOrArrayLiteralType(type) {
+            return !!(ts.getObjectFlags(type) & (128 /* ObjectLiteral */ | 65536 /* ArrayLiteral */));
+        }
+        function unionObjectAndArrayLiteralCandidates(candidates) {
             if (candidates.length > 1) {
-                var objectLiterals = ts.filter(candidates, isObjectLiteralType);
+                var objectLiterals = ts.filter(candidates, isObjectOrArrayLiteralType);
                 if (objectLiterals.length) {
-                    var objectLiteralsType = getWidenedType(getUnionType(objectLiterals, 2 /* Subtype */));
-                    return ts.concatenate(ts.filter(candidates, function (t) { return !isObjectLiteralType(t); }), [objectLiteralsType]);
+                    var literalsType = getUnionType(objectLiterals, 2 /* Subtype */);
+                    return ts.concatenate(ts.filter(candidates, function (t) { return !isObjectOrArrayLiteralType(t); }), [literalsType]);
                 }
             }
             return candidates;
         }
         function getContravariantInference(inference) {
-            return inference.priority & 28 /* PriorityImpliesCombination */ ? getIntersectionType(inference.contraCandidates) : getCommonSubtype(inference.contraCandidates);
+            return inference.priority & 56 /* PriorityImpliesCombination */ ? getIntersectionType(inference.contraCandidates) : getCommonSubtype(inference.contraCandidates);
         }
         function getCovariantInference(inference, signature) {
-            // Extract all object literal types and replace them with a single widened and normalized type.
-            var candidates = widenObjectLiteralCandidates(inference.candidates);
+            // Extract all object and array literal types and replace them with a single widened and normalized type.
+            var candidates = unionObjectAndArrayLiteralCandidates(inference.candidates);
             // We widen inferred literal types if
             // all inferences were made to top-level occurrences of the type parameter, and
             // the type parameter has no constraint or its constraint includes no primitive or literal types, and
@@ -45006,15 +46365,15 @@ var ts;
                     candidates;
             // If all inferences were made from a position that implies a combined result, infer a union type.
             // Otherwise, infer a common supertype.
-            var unwidenedType = inference.priority & 28 /* PriorityImpliesCombination */ ?
+            var unwidenedType = inference.priority & 56 /* PriorityImpliesCombination */ ?
                 getUnionType(baseCandidates, 2 /* Subtype */) :
                 getCommonSupertype(baseCandidates);
             return getWidenedType(unwidenedType);
         }
         function getInferredType(context, index) {
             var inference = context.inferences[index];
-            var inferredType = inference.inferredType;
-            if (!inferredType) {
+            if (!inference.inferredType) {
+                var inferredType = void 0;
                 var signature = context.signature;
                 if (signature) {
                     var inferredCovariantType = inference.candidates ? getCovariantInference(inference, signature) : undefined;
@@ -45043,31 +46402,26 @@ var ts;
                         if (defaultType) {
                             // Instantiate the default type. Any forward reference to a type
                             // parameter should be instantiated to the empty object type.
-                            inferredType = instantiateType(defaultType, combineTypeMappers(createBackreferenceMapper(context.typeParameters, index), context));
-                        }
-                        else {
-                            inferredType = getDefaultTypeArgumentType(!!(context.flags & 2 /* AnyDefault */));
+                            inferredType = instantiateType(defaultType, combineTypeMappers(createBackreferenceMapper(context, index), context.nonFixingMapper));
                         }
                     }
                 }
                 else {
                     inferredType = getTypeFromInference(inference);
                 }
-                inference.inferredType = inferredType;
+                inference.inferredType = inferredType || getDefaultTypeArgumentType(!!(context.flags & 2 /* AnyDefault */));
                 var constraint = getConstraintOfTypeParameter(inference.typeParameter);
                 if (constraint) {
-                    context.flags |= 4 /* NoFixing */;
-                    var instantiatedConstraint = instantiateType(constraint, context);
-                    if (!context.compareTypes(inferredType, getTypeWithThisArgument(instantiatedConstraint, inferredType))) {
+                    var instantiatedConstraint = instantiateType(constraint, context.nonFixingMapper);
+                    if (!inferredType || !context.compareTypes(inferredType, getTypeWithThisArgument(instantiatedConstraint, inferredType))) {
                         inference.inferredType = inferredType = instantiatedConstraint;
                     }
-                    context.flags &= ~4 /* NoFixing */;
                 }
             }
-            return inferredType;
+            return inference.inferredType;
         }
         function getDefaultTypeArgumentType(isInJavaScriptFile) {
-            return isInJavaScriptFile ? anyType : emptyObjectType;
+            return isInJavaScriptFile ? anyType : unknownType;
         }
         function getInferredTypes(context) {
             var result = [];
@@ -45077,8 +46431,8 @@ var ts;
             return result;
         }
         // EXPRESSION TYPE CHECKING
-        function getCannotFindNameDiagnosticForName(name) {
-            switch (name) {
+        function getCannotFindNameDiagnosticForName(node) {
+            switch (node.escapedText) {
                 case "document":
                 case "console":
                     return ts.Diagnostics.Cannot_find_name_0_Do_you_need_to_change_your_target_library_Try_changing_the_lib_compiler_option_to_include_dom;
@@ -45109,14 +46463,20 @@ var ts;
                 case "Iterator":
                 case "AsyncIterator":
                     return ts.Diagnostics.Cannot_find_name_0_Do_you_need_to_change_your_target_library_Try_changing_the_lib_compiler_option_to_es2015_or_later;
-                default: return ts.Diagnostics.Cannot_find_name_0;
+                default:
+                    if (node.parent.kind === 277 /* ShorthandPropertyAssignment */) {
+                        return ts.Diagnostics.No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer;
+                    }
+                    else {
+                        return ts.Diagnostics.Cannot_find_name_0;
+                    }
             }
         }
         function getResolvedSymbol(node) {
             var links = getNodeLinks(node);
             if (!links.resolvedSymbol) {
                 links.resolvedSymbol = !ts.nodeIsMissing(node) &&
-                    resolveName(node, node.escapedText, 67220415 /* Value */ | 1048576 /* ExportValue */, getCannotFindNameDiagnosticForName(node.escapedText), node, !ts.isWriteOnlyAccess(node), 
+                    resolveName(node, node.escapedText, 67220415 /* Value */ | 1048576 /* ExportValue */, getCannotFindNameDiagnosticForName(node), node, !ts.isWriteOnlyAccess(node), 
                     /*excludeGlobals*/ false, ts.Diagnostics.Cannot_find_name_0_Did_you_mean_1) || unknownSymbol;
             }
             return links.resolvedSymbol;
@@ -45125,7 +46485,7 @@ var ts;
             // TypeScript 1.0 spec (April 2014): 3.6.3
             // A type query consists of the keyword typeof followed by an expression.
             // The expression is restricted to a single identifier or a sequence of identifiers separated by periods
-            return !!ts.findAncestor(node, function (n) { return n.kind === 167 /* TypeQuery */ ? true : n.kind === 72 /* Identifier */ || n.kind === 148 /* QualifiedName */ ? false : "quit"; });
+            return !!ts.findAncestor(node, function (n) { return n.kind === 168 /* TypeQuery */ ? true : n.kind === 73 /* Identifier */ || n.kind === 149 /* QualifiedName */ ? false : "quit"; });
         }
         // Return the flow cache key for a "dotted name" (i.e. a sequence of identifiers
         // separated by dots). The key consists of the id of the symbol referenced by the
@@ -45133,21 +46493,21 @@ var ts;
         // The result is undefined if the reference isn't a dotted name. We prefix nodes
         // occurring in an apparent type position with '@' because the control flow type
         // of such nodes may be based on the apparent type instead of the declared type.
-        function getFlowCacheKey(node) {
+        function getFlowCacheKey(node, declaredType, initialType, flowContainer) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     var symbol = getResolvedSymbol(node);
-                    return symbol !== unknownSymbol ? (isConstraintPosition(node) ? "@" : "") + getSymbolId(symbol) : undefined;
-                case 100 /* ThisKeyword */:
+                    return symbol !== unknownSymbol ? (flowContainer ? getNodeId(flowContainer) : "-1") + "|" + getTypeId(declaredType) + "|" + getTypeId(initialType) + "|" + (isConstraintPosition(node) ? "@" : "") + getSymbolId(symbol) : undefined;
+                case 101 /* ThisKeyword */:
                     return "0";
-                case 213 /* NonNullExpression */:
-                case 195 /* ParenthesizedExpression */:
-                    return getFlowCacheKey(node.expression);
-                case 189 /* PropertyAccessExpression */:
-                case 190 /* ElementAccessExpression */:
+                case 214 /* NonNullExpression */:
+                case 196 /* ParenthesizedExpression */:
+                    return getFlowCacheKey(node.expression, declaredType, initialType, flowContainer);
+                case 190 /* PropertyAccessExpression */:
+                case 191 /* ElementAccessExpression */:
                     var propName = getAccessedPropertyName(node);
                     if (propName !== undefined) {
-                        var key = getFlowCacheKey(node.expression);
+                        var key = getFlowCacheKey(node.expression, declaredType, initialType, flowContainer);
                         return key && key + "." + propName;
                     }
             }
@@ -45155,24 +46515,24 @@ var ts;
         }
         function isMatchingReference(source, target) {
             switch (target.kind) {
-                case 195 /* ParenthesizedExpression */:
-                case 213 /* NonNullExpression */:
+                case 196 /* ParenthesizedExpression */:
+                case 214 /* NonNullExpression */:
                     return isMatchingReference(source, target.expression);
             }
             switch (source.kind) {
-                case 72 /* Identifier */:
-                    return target.kind === 72 /* Identifier */ && getResolvedSymbol(source) === getResolvedSymbol(target) ||
-                        (target.kind === 237 /* VariableDeclaration */ || target.kind === 186 /* BindingElement */) &&
+                case 73 /* Identifier */:
+                    return target.kind === 73 /* Identifier */ && getResolvedSymbol(source) === getResolvedSymbol(target) ||
+                        (target.kind === 238 /* VariableDeclaration */ || target.kind === 187 /* BindingElement */) &&
                             getExportSymbolOfValueSymbolIfExported(getResolvedSymbol(source)) === getSymbolOfNode(target);
-                case 100 /* ThisKeyword */:
-                    return target.kind === 100 /* ThisKeyword */;
-                case 98 /* SuperKeyword */:
-                    return target.kind === 98 /* SuperKeyword */;
-                case 213 /* NonNullExpression */:
-                case 195 /* ParenthesizedExpression */:
+                case 101 /* ThisKeyword */:
+                    return target.kind === 101 /* ThisKeyword */;
+                case 99 /* SuperKeyword */:
+                    return target.kind === 99 /* SuperKeyword */;
+                case 214 /* NonNullExpression */:
+                case 196 /* ParenthesizedExpression */:
                     return isMatchingReference(source.expression, target);
-                case 189 /* PropertyAccessExpression */:
-                case 190 /* ElementAccessExpression */:
+                case 190 /* PropertyAccessExpression */:
+                case 191 /* ElementAccessExpression */:
                     return ts.isAccessExpression(target) &&
                         getAccessedPropertyName(source) === getAccessedPropertyName(target) &&
                         isMatchingReference(source.expression, target.expression);
@@ -45180,7 +46540,7 @@ var ts;
             return false;
         }
         function getAccessedPropertyName(access) {
-            return access.kind === 189 /* PropertyAccessExpression */ ? access.name.escapedText :
+            return access.kind === 190 /* PropertyAccessExpression */ ? access.name.escapedText :
                 ts.isStringLiteral(access.argumentExpression) || ts.isNumericLiteral(access.argumentExpression) ? ts.escapeLeadingUnderscores(access.argumentExpression.text) :
                     undefined;
         }
@@ -45205,7 +46565,7 @@ var ts;
                 isDiscriminantProperty(getDeclaredTypeOfReference(target.expression), name);
         }
         function getDeclaredTypeOfReference(expr) {
-            if (expr.kind === 72 /* Identifier */) {
+            if (expr.kind === 73 /* Identifier */) {
                 return getTypeOfSymbol(getResolvedSymbol(expr));
             }
             if (ts.isAccessExpression(expr)) {
@@ -45227,7 +46587,7 @@ var ts;
                 if (prop && ts.getCheckFlags(prop) & 2 /* SyntheticProperty */) {
                     if (prop.isDiscriminantProperty === undefined) {
                         prop.isDiscriminantProperty =
-                            (prop.checkFlags & 96 /* Discriminant */) === 96 /* Discriminant */ &&
+                            (prop.checkFlags & 192 /* Discriminant */) === 192 /* Discriminant */ &&
                                 isDiscriminantType(getTypeOfSymbol(prop));
                     }
                     return !!prop.isDiscriminantProperty;
@@ -45236,7 +46596,7 @@ var ts;
             return false;
         }
         function isSyntheticThisPropertyAccess(expr) {
-            return ts.isAccessExpression(expr) && expr.expression.kind === 100 /* ThisKeyword */ && !!(expr.expression.flags & 8 /* Synthesized */);
+            return ts.isAccessExpression(expr) && expr.expression.kind === 101 /* ThisKeyword */ && !!(expr.expression.flags & 8 /* Synthesized */);
         }
         function findDiscriminantProperties(sourceProperties, target) {
             var result;
@@ -45264,7 +46624,7 @@ var ts;
                     }
                 }
             }
-            if (callExpression.expression.kind === 189 /* PropertyAccessExpression */ &&
+            if (callExpression.expression.kind === 190 /* PropertyAccessExpression */ &&
                 isOrContainsMatchingReference(reference, callExpression.expression.expression)) {
                 return true;
             }
@@ -45383,7 +46743,7 @@ var ts;
                 return strictNullChecks ? 7888800 /* ObjectStrictFacts */ : 16736160 /* ObjectFacts */;
             }
             if (flags & 63176704 /* Instantiable */) {
-                return getTypeFacts(getBaseConstraintOfType(type) || emptyObjectType);
+                return getTypeFacts(getBaseConstraintOfType(type) || unknownType);
             }
             if (flags & 3145728 /* UnionOrIntersection */) {
                 return getTypeFactsOfTypes(type.types);
@@ -45412,22 +46772,22 @@ var ts;
         }
         function getTypeOfDestructuredArrayElement(type, index) {
             return everyType(type, isTupleLikeType) && getTupleElementType(type, index) ||
-                checkIteratedTypeOrElementType(type, /*errorNode*/ undefined, /*allowStringInput*/ false, /*allowAsyncIterables*/ false) ||
+                checkIteratedTypeOrElementType(65 /* Destructuring */, type, undefinedType, /*errorNode*/ undefined) ||
                 errorType;
         }
         function getTypeOfDestructuredSpreadExpression(type) {
-            return createArrayType(checkIteratedTypeOrElementType(type, /*errorNode*/ undefined, /*allowStringInput*/ false, /*allowAsyncIterables*/ false) || errorType);
+            return createArrayType(checkIteratedTypeOrElementType(65 /* Destructuring */, type, undefinedType, /*errorNode*/ undefined) || errorType);
         }
         function getAssignedTypeOfBinaryExpression(node) {
-            var isDestructuringDefaultAssignment = node.parent.kind === 187 /* ArrayLiteralExpression */ && isDestructuringAssignmentTarget(node.parent) ||
-                node.parent.kind === 275 /* PropertyAssignment */ && isDestructuringAssignmentTarget(node.parent.parent);
+            var isDestructuringDefaultAssignment = node.parent.kind === 188 /* ArrayLiteralExpression */ && isDestructuringAssignmentTarget(node.parent) ||
+                node.parent.kind === 276 /* PropertyAssignment */ && isDestructuringAssignmentTarget(node.parent.parent);
             return isDestructuringDefaultAssignment ?
                 getTypeWithDefault(getAssignedType(node), node.right) :
                 getTypeOfExpression(node.right);
         }
         function isDestructuringAssignmentTarget(parent) {
-            return parent.parent.kind === 204 /* BinaryExpression */ && parent.parent.left === parent ||
-                parent.parent.kind === 227 /* ForOfStatement */ && parent.parent.initializer === parent;
+            return parent.parent.kind === 205 /* BinaryExpression */ && parent.parent.left === parent ||
+                parent.parent.kind === 228 /* ForOfStatement */ && parent.parent.initializer === parent;
         }
         function getAssignedTypeOfArrayLiteralElement(node, element) {
             return getTypeOfDestructuredArrayElement(getAssignedType(node), node.elements.indexOf(element));
@@ -45444,21 +46804,21 @@ var ts;
         function getAssignedType(node) {
             var parent = node.parent;
             switch (parent.kind) {
-                case 226 /* ForInStatement */:
+                case 227 /* ForInStatement */:
                     return stringType;
-                case 227 /* ForOfStatement */:
+                case 228 /* ForOfStatement */:
                     return checkRightHandSideOfForOf(parent.expression, parent.awaitModifier) || errorType;
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return getAssignedTypeOfBinaryExpression(parent);
-                case 198 /* DeleteExpression */:
+                case 199 /* DeleteExpression */:
                     return undefinedType;
-                case 187 /* ArrayLiteralExpression */:
+                case 188 /* ArrayLiteralExpression */:
                     return getAssignedTypeOfArrayLiteralElement(parent, node);
-                case 208 /* SpreadElement */:
+                case 209 /* SpreadElement */:
                     return getAssignedTypeOfSpreadExpression(parent);
-                case 275 /* PropertyAssignment */:
+                case 276 /* PropertyAssignment */:
                     return getAssignedTypeOfPropertyAssignment(parent);
-                case 276 /* ShorthandPropertyAssignment */:
+                case 277 /* ShorthandPropertyAssignment */:
                     return getAssignedTypeOfShorthandPropertyAssignment(parent);
             }
             return errorType;
@@ -45466,7 +46826,7 @@ var ts;
         function getInitialTypeOfBindingElement(node) {
             var pattern = node.parent;
             var parentType = getInitialType(pattern.parent);
-            var type = pattern.kind === 184 /* ObjectBindingPattern */ ?
+            var type = pattern.kind === 185 /* ObjectBindingPattern */ ?
                 getTypeOfDestructuredProperty(parentType, node.propertyName || node.name) :
                 !node.dotDotDotToken ?
                     getTypeOfDestructuredArrayElement(parentType, pattern.elements.indexOf(node)) :
@@ -45484,37 +46844,37 @@ var ts;
             if (node.initializer) {
                 return getTypeOfInitializer(node.initializer);
             }
-            if (node.parent.parent.kind === 226 /* ForInStatement */) {
+            if (node.parent.parent.kind === 227 /* ForInStatement */) {
                 return stringType;
             }
-            if (node.parent.parent.kind === 227 /* ForOfStatement */) {
+            if (node.parent.parent.kind === 228 /* ForOfStatement */) {
                 return checkRightHandSideOfForOf(node.parent.parent.expression, node.parent.parent.awaitModifier) || errorType;
             }
             return errorType;
         }
         function getInitialType(node) {
-            return node.kind === 237 /* VariableDeclaration */ ?
+            return node.kind === 238 /* VariableDeclaration */ ?
                 getInitialTypeOfVariableDeclaration(node) :
                 getInitialTypeOfBindingElement(node);
         }
         function getInitialOrAssignedType(node, reference) {
-            return getConstraintForLocation(node.kind === 237 /* VariableDeclaration */ || node.kind === 186 /* BindingElement */ ?
+            return getConstraintForLocation(node.kind === 238 /* VariableDeclaration */ || node.kind === 187 /* BindingElement */ ?
                 getInitialType(node) :
                 getAssignedType(node), reference);
         }
         function isEmptyArrayAssignment(node) {
-            return node.kind === 237 /* VariableDeclaration */ && node.initializer &&
+            return node.kind === 238 /* VariableDeclaration */ && node.initializer &&
                 isEmptyArrayLiteral(node.initializer) ||
-                node.kind !== 186 /* BindingElement */ && node.parent.kind === 204 /* BinaryExpression */ &&
+                node.kind !== 187 /* BindingElement */ && node.parent.kind === 205 /* BinaryExpression */ &&
                     isEmptyArrayLiteral(node.parent.right);
         }
         function getReferenceCandidate(node) {
             switch (node.kind) {
-                case 195 /* ParenthesizedExpression */:
+                case 196 /* ParenthesizedExpression */:
                     return getReferenceCandidate(node.expression);
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     switch (node.operatorToken.kind) {
-                        case 59 /* EqualsToken */:
+                        case 60 /* EqualsToken */:
                             return getReferenceCandidate(node.left);
                         case 27 /* CommaToken */:
                             return getReferenceCandidate(node.right);
@@ -45524,13 +46884,13 @@ var ts;
         }
         function getReferenceRoot(node) {
             var parent = node.parent;
-            return parent.kind === 195 /* ParenthesizedExpression */ ||
-                parent.kind === 204 /* BinaryExpression */ && parent.operatorToken.kind === 59 /* EqualsToken */ && parent.left === node ||
-                parent.kind === 204 /* BinaryExpression */ && parent.operatorToken.kind === 27 /* CommaToken */ && parent.right === node ?
+            return parent.kind === 196 /* ParenthesizedExpression */ ||
+                parent.kind === 205 /* BinaryExpression */ && parent.operatorToken.kind === 60 /* EqualsToken */ && parent.left === node ||
+                parent.kind === 205 /* BinaryExpression */ && parent.operatorToken.kind === 27 /* CommaToken */ && parent.right === node ?
                 getReferenceRoot(parent) : node;
         }
         function getTypeOfSwitchClause(clause) {
-            if (clause.kind === 271 /* CaseClause */) {
+            if (clause.kind === 272 /* CaseClause */) {
                 return getRegularTypeOfLiteralType(getTypeOfExpression(clause.expression));
             }
             return neverType;
@@ -45552,7 +46912,7 @@ var ts;
             var witnesses = [];
             for (var _i = 0, _a = switchStatement.caseBlock.clauses; _i < _a.length; _i++) {
                 var clause = _a[_i];
-                if (clause.kind === 271 /* CaseClause */) {
+                if (clause.kind === 272 /* CaseClause */) {
                     if (clause.expression.kind === 10 /* StringLiteral */) {
                         witnesses.push(clause.expression.text);
                         continue;
@@ -45598,6 +46958,9 @@ var ts;
             }
             return f(type) ? type : neverType;
         }
+        function countTypes(type) {
+            return type.flags & 1048576 /* Union */ ? type.types.length : 1;
+        }
         function mapType(type, mapper, noReductions) {
             if (type.flags & 131072 /* Never */) {
                 return type;
@@ -45605,25 +46968,20 @@ var ts;
             if (!(type.flags & 1048576 /* Union */)) {
                 return mapper(type);
             }
-            var types = type.types;
-            var mappedType;
             var mappedTypes;
-            for (var _i = 0, types_13 = types; _i < types_13.length; _i++) {
-                var current = types_13[_i];
-                var t = mapper(current);
-                if (t) {
-                    if (!mappedType) {
-                        mappedType = t;
-                    }
-                    else if (!mappedTypes) {
-                        mappedTypes = [mappedType, t];
+            for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
+                var t = _a[_i];
+                var mapped = mapper(t);
+                if (mapped) {
+                    if (!mappedTypes) {
+                        mappedTypes = [mapped];
                     }
                     else {
-                        mappedTypes.push(t);
+                        mappedTypes.push(mapped);
                     }
                 }
             }
-            return mappedTypes ? getUnionType(mappedTypes, noReductions ? 0 /* None */ : 1 /* Literal */) : mappedType;
+            return mappedTypes && getUnionType(mappedTypes, noReductions ? 0 /* None */ : 1 /* Literal */);
         }
         function extractTypesOfKind(type, kind) {
             return filterType(type, function (t) { return (t.flags & kind) !== 0; });
@@ -45691,8 +47049,8 @@ var ts;
         }
         function isEvolvingArrayTypeList(types) {
             var hasEvolvingArrayType = false;
-            for (var _i = 0, types_14 = types; _i < types_14.length; _i++) {
-                var t = types_14[_i];
+            for (var _i = 0, types_13 = types; _i < types_13.length; _i++) {
+                var t = types_13[_i];
                 if (!(t.flags & 131072 /* Never */)) {
                     if (!(ts.getObjectFlags(t) & 256 /* EvolvingArray */)) {
                         return false;
@@ -45715,12 +47073,12 @@ var ts;
         function isEvolvingArrayOperationTarget(node) {
             var root = getReferenceRoot(node);
             var parent = root.parent;
-            var isLengthPushOrUnshift = parent.kind === 189 /* PropertyAccessExpression */ && (parent.name.escapedText === "length" ||
-                parent.parent.kind === 191 /* CallExpression */ && ts.isPushOrUnshiftIdentifier(parent.name));
-            var isElementAssignment = parent.kind === 190 /* ElementAccessExpression */ &&
+            var isLengthPushOrUnshift = parent.kind === 190 /* PropertyAccessExpression */ && (parent.name.escapedText === "length" ||
+                parent.parent.kind === 192 /* CallExpression */ && ts.isPushOrUnshiftIdentifier(parent.name));
+            var isElementAssignment = parent.kind === 191 /* ElementAccessExpression */ &&
                 parent.expression === root &&
-                parent.parent.kind === 204 /* BinaryExpression */ &&
-                parent.parent.operatorToken.kind === 59 /* EqualsToken */ &&
+                parent.parent.kind === 205 /* BinaryExpression */ &&
+                parent.parent.operatorToken.kind === 60 /* EqualsToken */ &&
                 parent.parent.left === parent &&
                 !ts.isAssignmentTarget(parent.parent) &&
                 isTypeAssignableToKind(getTypeOfExpression(parent.argumentExpression), 296 /* NumberLike */);
@@ -45734,7 +47092,7 @@ var ts;
             return links.maybeTypePredicate;
         }
         function getMaybeTypePredicate(node) {
-            if (node.expression.kind !== 98 /* SuperKeyword */) {
+            if (node.expression.kind !== 99 /* SuperKeyword */) {
                 var funcType = checkNonNullExpression(node.expression);
                 if (funcType !== silentNeverType) {
                     var apparentType = getApparentType(funcType);
@@ -45752,6 +47110,7 @@ var ts;
         function getFlowTypeOfReference(reference, declaredType, initialType, flowContainer, couldBeUninitialized) {
             if (initialType === void 0) { initialType = declaredType; }
             var key;
+            var keySet = false;
             var flowDepth = 0;
             if (flowAnalysisDisabled) {
                 return errorType;
@@ -45767,10 +47126,17 @@ var ts;
             // on empty arrays are possible without implicit any errors and new element types can be inferred without
             // type mismatch errors.
             var resultType = ts.getObjectFlags(evolvedType) & 256 /* EvolvingArray */ && isEvolvingArrayOperationTarget(reference) ? autoArrayType : finalizeEvolvingArrayType(evolvedType);
-            if (reference.parent && reference.parent.kind === 213 /* NonNullExpression */ && getTypeWithFacts(resultType, 2097152 /* NEUndefinedOrNull */).flags & 131072 /* Never */) {
+            if (reference.parent && reference.parent.kind === 214 /* NonNullExpression */ && getTypeWithFacts(resultType, 2097152 /* NEUndefinedOrNull */).flags & 131072 /* Never */) {
                 return declaredType;
             }
             return resultType;
+            function getOrSetCacheKey() {
+                if (keySet) {
+                    return key;
+                }
+                keySet = true;
+                return key = getFlowCacheKey(reference, declaredType, initialType, flowContainer);
+            }
             function getTypeAtFlowNode(flow) {
                 if (flowDepth === 2000) {
                     // We have made 2000 recursive invocations. To avoid overflowing the call stack we report an error
@@ -45782,6 +47148,15 @@ var ts;
                 flowDepth++;
                 while (true) {
                     var flags = flow.flags;
+                    if (flags & 8192 /* Cached */) {
+                        var key_2 = getOrSetCacheKey();
+                        if (key_2) {
+                            var id = getFlowNodeId(flow);
+                            if (flowAssignmentKeys[id] === key_2) {
+                                return flowAssignmentTypes[id];
+                            }
+                        }
+                    }
                     if (flags & 1024 /* Shared */) {
                         // We cache results of flow type resolution for shared nodes that were previously visited in
                         // the same getFlowTypeOfReference invocation. A node is considered shared when it is the
@@ -45812,6 +47187,15 @@ var ts;
                             flow = flow.antecedent;
                             continue;
                         }
+                        else if (flowLoopCount === flowLoopStart) { // Only cache assignments when not within loop analysis
+                            var key_3 = getOrSetCacheKey();
+                            if (key_3 && !isIncomplete(type)) {
+                                flow.flags |= 8192 /* Cached */;
+                                var id = getFlowNodeId(flow);
+                                flowAssignmentKeys[id] = key_3;
+                                flowAssignmentTypes[id] = type;
+                            }
+                        }
                     }
                     else if (flags & 96 /* Condition */) {
                         type = getTypeAtFlowCondition(flow);
@@ -45839,9 +47223,9 @@ var ts;
                         // Check if we should continue with the control flow of the containing function.
                         var container = flow.container;
                         if (container && container !== flowContainer &&
-                            reference.kind !== 189 /* PropertyAccessExpression */ &&
-                            reference.kind !== 190 /* ElementAccessExpression */ &&
-                            reference.kind !== 100 /* ThisKeyword */) {
+                            reference.kind !== 190 /* PropertyAccessExpression */ &&
+                            reference.kind !== 191 /* ElementAccessExpression */ &&
+                            reference.kind !== 101 /* ThisKeyword */) {
                             flow = container.flowNode;
                             continue;
                         }
@@ -45893,14 +47277,14 @@ var ts;
                     // in which case we continue control flow analysis back to the function's declaration
                     if (ts.isVariableDeclaration(node) && (ts.isInJSFile(node) || ts.isVarConst(node))) {
                         var init = ts.getDeclaredExpandoInitializer(node);
-                        if (init && (init.kind === 196 /* FunctionExpression */ || init.kind === 197 /* ArrowFunction */)) {
+                        if (init && (init.kind === 197 /* FunctionExpression */ || init.kind === 198 /* ArrowFunction */)) {
                             return getTypeAtFlowNode(flow.antecedent);
                         }
                     }
                     return declaredType;
                 }
                 // for (const _ in ref) acts as a nonnull on ref
-                if (ts.isVariableDeclaration(node) && node.parent.parent.kind === 226 /* ForInStatement */ && isMatchingReference(reference, node.parent.parent.expression)) {
+                if (ts.isVariableDeclaration(node) && node.parent.parent.kind === 227 /* ForInStatement */ && isMatchingReference(reference, node.parent.parent.expression)) {
                     return getNonNullableTypeIfNeeded(getTypeFromFlowType(getTypeAtFlowNode(flow.antecedent)));
                 }
                 // Assignment doesn't affect reference
@@ -45909,7 +47293,7 @@ var ts;
             function getTypeAtFlowArrayMutation(flow) {
                 if (declaredType === autoType || declaredType === autoArrayType) {
                     var node = flow.node;
-                    var expr = node.kind === 191 /* CallExpression */ ?
+                    var expr = node.kind === 192 /* CallExpression */ ?
                         node.expression.expression :
                         node.left.expression;
                     if (isMatchingReference(reference, getReferenceCandidate(expr))) {
@@ -45917,7 +47301,7 @@ var ts;
                         var type = getTypeFromFlowType(flowType);
                         if (ts.getObjectFlags(type) & 256 /* EvolvingArray */) {
                             var evolvedType_1 = type;
-                            if (node.kind === 191 /* CallExpression */) {
+                            if (node.kind === 192 /* CallExpression */) {
                                 for (var _i = 0, _a = node.arguments; _i < _a.length; _i++) {
                                     var arg = _a[_i];
                                     evolvedType_1 = addEvolvingArrayElementType(evolvedType_1, arg);
@@ -45970,7 +47354,7 @@ var ts;
                 else if (isMatchingReferenceDiscriminant(expr, type)) {
                     type = narrowTypeByDiscriminant(type, expr, function (t) { return narrowTypeBySwitchOnDiscriminant(t, flow.switchStatement, flow.clauseStart, flow.clauseEnd); });
                 }
-                else if (expr.kind === 199 /* TypeOfExpression */ && isMatchingReference(reference, expr.expression)) {
+                else if (expr.kind === 200 /* TypeOfExpression */ && isMatchingReference(reference, expr.expression)) {
                     type = narrowBySwitchOnTypeOf(type, flow.switchStatement, flow.clauseStart, flow.clauseEnd);
                 }
                 else if (containsMatchingReferenceDiscriminant(reference, expr)) {
@@ -46017,12 +47401,10 @@ var ts;
                 // this flow loop junction, return the cached type.
                 var id = getFlowNodeId(flow);
                 var cache = flowLoopCaches[id] || (flowLoopCaches[id] = ts.createMap());
+                var key = getOrSetCacheKey();
                 if (!key) {
-                    key = getFlowCacheKey(reference);
                     // No cache key is generated when binding patterns are in unnarrowable situations
-                    if (!key) {
-                        return declaredType;
-                    }
+                    return declaredType;
                 }
                 var cached = cache.get(key);
                 if (cached) {
@@ -46130,7 +47512,7 @@ var ts;
                 return !assumeTrue;
             }
             function narrowByInKeyword(type, literal, assumeTrue) {
-                if ((type.flags & (1048576 /* Union */ | 524288 /* Object */)) || (type.flags & 262144 /* TypeParameter */ && type.isThisType)) {
+                if (type.flags & (1048576 /* Union */ | 524288 /* Object */) || isThisTypeParameter(type)) {
                     var propName_1 = ts.escapeLeadingUnderscores(literal.text);
                     return filterType(type, function (t) { return isTypePresencePossible(t, propName_1, assumeTrue); });
                 }
@@ -46138,8 +47520,8 @@ var ts;
             }
             function narrowTypeByBinaryExpression(type, expr, assumeTrue) {
                 switch (expr.operatorToken.kind) {
-                    case 59 /* EqualsToken */:
-                        return narrowTypeByTruthiness(type, expr.left, assumeTrue);
+                    case 60 /* EqualsToken */:
+                        return narrowTypeByTruthiness(narrowType(type, expr.right, assumeTrue), expr.left, assumeTrue);
                     case 33 /* EqualsEqualsToken */:
                     case 34 /* ExclamationEqualsToken */:
                     case 35 /* EqualsEqualsEqualsToken */:
@@ -46147,10 +47529,10 @@ var ts;
                         var operator_1 = expr.operatorToken.kind;
                         var left_1 = getReferenceCandidate(expr.left);
                         var right_1 = getReferenceCandidate(expr.right);
-                        if (left_1.kind === 199 /* TypeOfExpression */ && ts.isStringLiteralLike(right_1)) {
+                        if (left_1.kind === 200 /* TypeOfExpression */ && ts.isStringLiteralLike(right_1)) {
                             return narrowTypeByTypeof(type, left_1, operator_1, right_1, assumeTrue);
                         }
-                        if (right_1.kind === 199 /* TypeOfExpression */ && ts.isStringLiteralLike(left_1)) {
+                        if (right_1.kind === 200 /* TypeOfExpression */ && ts.isStringLiteralLike(left_1)) {
                             return narrowTypeByTypeof(type, right_1, operator_1, left_1, assumeTrue);
                         }
                         if (isMatchingReference(reference, left_1)) {
@@ -46169,9 +47551,9 @@ var ts;
                             return declaredType;
                         }
                         break;
-                    case 94 /* InstanceOfKeyword */:
+                    case 95 /* InstanceOfKeyword */:
                         return narrowTypeByInstanceof(type, expr, assumeTrue);
-                    case 93 /* InKeyword */:
+                    case 94 /* InKeyword */:
                         var target = getReferenceCandidate(expr.right);
                         if (ts.isStringLiteralLike(expr.left) && isMatchingReference(reference, target)) {
                             return narrowByInKeyword(type, expr.left, assumeTrue);
@@ -46215,7 +47597,10 @@ var ts;
                     return type;
                 }
                 if (assumeTrue) {
-                    var narrowedType = filterType(type, function (t) { return areTypesComparable(t, valueType); });
+                    var filterFn = operator === 33 /* EqualsEqualsToken */ ?
+                        (function (t) { return areTypesComparable(t, valueType) || isCoercibleUnderDoubleEquals(t, valueType); }) :
+                        function (t) { return areTypesComparable(t, valueType); };
+                    var narrowedType = filterType(type, filterFn);
                     return narrowedType.flags & 131072 /* Never */ ? type : replacePrimitivesWithLiterals(narrowedType, valueType);
                 }
                 if (isUnitType(valueType)) {
@@ -46476,7 +47861,7 @@ var ts;
                     return type;
                 }
                 if (ts.isIdentifierTypePredicate(predicate)) {
-                    var predicateArgument = callExpression.arguments[predicate.parameterIndex - (signature.thisParameter ? 1 : 0)];
+                    var predicateArgument = callExpression.arguments[predicate.parameterIndex];
                     if (predicateArgument) {
                         if (isMatchingReference(reference, predicateArgument)) {
                             return getNarrowedType(type, predicate.type, assumeTrue, isTypeSubtypeOf);
@@ -46504,19 +47889,19 @@ var ts;
             // will be a subtype or the same type as the argument.
             function narrowType(type, expr, assumeTrue) {
                 switch (expr.kind) {
-                    case 72 /* Identifier */:
-                    case 100 /* ThisKeyword */:
-                    case 98 /* SuperKeyword */:
-                    case 189 /* PropertyAccessExpression */:
-                    case 190 /* ElementAccessExpression */:
+                    case 73 /* Identifier */:
+                    case 101 /* ThisKeyword */:
+                    case 99 /* SuperKeyword */:
+                    case 190 /* PropertyAccessExpression */:
+                    case 191 /* ElementAccessExpression */:
                         return narrowTypeByTruthiness(type, expr, assumeTrue);
-                    case 191 /* CallExpression */:
+                    case 192 /* CallExpression */:
                         return narrowTypeByTypePredicate(type, expr, assumeTrue);
-                    case 195 /* ParenthesizedExpression */:
+                    case 196 /* ParenthesizedExpression */:
                         return narrowType(type, expr.expression, assumeTrue);
-                    case 204 /* BinaryExpression */:
+                    case 205 /* BinaryExpression */:
                         return narrowTypeByBinaryExpression(type, expr, assumeTrue);
-                    case 202 /* PrefixUnaryExpression */:
+                    case 203 /* PrefixUnaryExpression */:
                         if (expr.operator === 52 /* ExclamationToken */) {
                             return narrowType(type, expr.operand, !assumeTrue);
                         }
@@ -46531,7 +47916,7 @@ var ts;
             // an dotted name expression, and if the location is not an assignment target, obtain the type
             // of the expression (which will reflect control flow analysis). If the expression indeed
             // resolved to the given symbol, return the narrowed type.
-            if (location.kind === 72 /* Identifier */) {
+            if (location.kind === 73 /* Identifier */) {
                 if (ts.isRightSideOfQualifiedNameOrPropertyAccess(location)) {
                     location = location.parent;
                 }
@@ -46552,9 +47937,9 @@ var ts;
         function getControlFlowContainer(node) {
             return ts.findAncestor(node.parent, function (node) {
                 return ts.isFunctionLike(node) && !ts.getImmediatelyInvokedFunctionExpression(node) ||
-                    node.kind === 245 /* ModuleBlock */ ||
-                    node.kind === 284 /* SourceFile */ ||
-                    node.kind === 154 /* PropertyDeclaration */;
+                    node.kind === 246 /* ModuleBlock */ ||
+                    node.kind === 285 /* SourceFile */ ||
+                    node.kind === 155 /* PropertyDeclaration */;
             });
         }
         // Check if a parameter is assigned anywhere within its declaring function.
@@ -46573,10 +47958,10 @@ var ts;
             return !!ts.findAncestor(node.parent, function (node) { return ts.isFunctionLike(node) && !!(getNodeLinks(node).flags & 8388608 /* AssignmentsMarked */); });
         }
         function markParameterAssignments(node) {
-            if (node.kind === 72 /* Identifier */) {
+            if (node.kind === 73 /* Identifier */) {
                 if (ts.isAssignmentTarget(node)) {
                     var symbol = getResolvedSymbol(node);
-                    if (symbol.valueDeclaration && ts.getRootDeclaration(symbol.valueDeclaration).kind === 151 /* Parameter */) {
+                    if (symbol.valueDeclaration && ts.getRootDeclaration(symbol.valueDeclaration).kind === 152 /* Parameter */) {
                         symbol.isAssigned = true;
                     }
                 }
@@ -46591,7 +47976,7 @@ var ts;
         /** remove undefined from the annotated type of a parameter when there is an initializer (that doesn't include undefined) */
         function removeOptionalityFromDeclaredType(declaredType, declaration) {
             var annotationIncludesUndefined = strictNullChecks &&
-                declaration.kind === 151 /* Parameter */ &&
+                declaration.kind === 152 /* Parameter */ &&
                 declaration.initializer &&
                 getFalsyFlags(declaredType) & 32768 /* Undefined */ &&
                 !(getFalsyFlags(checkExpression(declaration.initializer)) & 32768 /* Undefined */);
@@ -46599,13 +47984,13 @@ var ts;
         }
         function isConstraintPosition(node) {
             var parent = node.parent;
-            return parent.kind === 189 /* PropertyAccessExpression */ ||
-                parent.kind === 191 /* CallExpression */ && parent.expression === node ||
-                parent.kind === 190 /* ElementAccessExpression */ && parent.expression === node ||
-                parent.kind === 186 /* BindingElement */ && parent.name === node && !!parent.initializer;
+            return parent.kind === 190 /* PropertyAccessExpression */ ||
+                parent.kind === 192 /* CallExpression */ && parent.expression === node ||
+                parent.kind === 191 /* ElementAccessExpression */ && parent.expression === node ||
+                parent.kind === 187 /* BindingElement */ && parent.name === node && !!parent.initializer;
         }
         function typeHasNullableConstraint(type) {
-            return type.flags & 58982400 /* InstantiableNonPrimitive */ && maybeTypeOfKind(getBaseConstraintOfType(type) || emptyObjectType, 98304 /* Nullable */);
+            return type.flags & 58982400 /* InstantiableNonPrimitive */ && maybeTypeOfKind(getBaseConstraintOfType(type) || unknownType, 98304 /* Nullable */);
         }
         function getConstraintForLocation(type, node) {
             // When a node is the left hand expression of a property access, element access, or call expression,
@@ -46636,7 +48021,7 @@ var ts;
             if (symbol === argumentsSymbol) {
                 var container = ts.getContainingFunction(node);
                 if (languageVersion < 2 /* ES2015 */) {
-                    if (container.kind === 197 /* ArrowFunction */) {
+                    if (container.kind === 198 /* ArrowFunction */) {
                         error(node, ts.Diagnostics.The_arguments_object_cannot_be_referenced_in_an_arrow_function_in_ES3_and_ES5_Consider_using_a_standard_function_expression);
                     }
                     else if (ts.hasModifier(container, 256 /* Async */)) {
@@ -46657,7 +48042,7 @@ var ts;
                 // Due to the emit for class decorators, any reference to the class from inside of the class body
                 // must instead be rewritten to point to a temporary variable to avoid issues with the double-bind
                 // behavior of class names in ES6.
-                if (declaration.kind === 240 /* ClassDeclaration */
+                if (declaration.kind === 241 /* ClassDeclaration */
                     && ts.nodeIsDecorated(declaration)) {
                     var container = ts.getContainingClass(node);
                     while (container !== undefined) {
@@ -46669,14 +48054,14 @@ var ts;
                         container = ts.getContainingClass(container);
                     }
                 }
-                else if (declaration.kind === 209 /* ClassExpression */) {
+                else if (declaration.kind === 210 /* ClassExpression */) {
                     // When we emit a class expression with static members that contain a reference
                     // to the constructor in the initializer, we will need to substitute that
                     // binding with an alias as the class name is not in scope.
                     var container = ts.getThisContainer(node, /*includeArrowFunctions*/ false);
-                    while (container.kind !== 284 /* SourceFile */) {
+                    while (container.kind !== 285 /* SourceFile */) {
                         if (container.parent === declaration) {
-                            if (container.kind === 154 /* PropertyDeclaration */ && ts.hasModifier(container, 32 /* Static */)) {
+                            if (container.kind === 155 /* PropertyDeclaration */ && ts.hasModifier(container, 32 /* Static */)) {
                                 getNodeLinks(declaration).flags |= 16777216 /* ClassWithConstructorReference */;
                                 getNodeLinks(node).flags |= 33554432 /* ConstructorReferenceInClass */;
                             }
@@ -46725,7 +48110,7 @@ var ts;
             // The declaration container is the innermost function that encloses the declaration of the variable
             // or parameter. The flow container is the innermost function starting with which we analyze the control
             // flow graph to determine the control flow based type.
-            var isParameter = ts.getRootDeclaration(declaration).kind === 151 /* Parameter */;
+            var isParameter = ts.getRootDeclaration(declaration).kind === 152 /* Parameter */;
             var declarationContainer = getControlFlowContainer(declaration);
             var flowContainer = getControlFlowContainer(node);
             var isOuterVariable = flowContainer !== declarationContainer;
@@ -46734,19 +48119,19 @@ var ts;
             // When the control flow originates in a function expression or arrow function and we are referencing
             // a const variable or parameter from an outer function, we extend the origin of the control flow
             // analysis to include the immediately enclosing function.
-            while (flowContainer !== declarationContainer && (flowContainer.kind === 196 /* FunctionExpression */ ||
-                flowContainer.kind === 197 /* ArrowFunction */ || ts.isObjectLiteralOrClassExpressionMethod(flowContainer)) &&
+            while (flowContainer !== declarationContainer && (flowContainer.kind === 197 /* FunctionExpression */ ||
+                flowContainer.kind === 198 /* ArrowFunction */ || ts.isObjectLiteralOrClassExpressionMethod(flowContainer)) &&
                 (isConstVariable(localOrExportSymbol) || isParameter && !isParameterAssigned(localOrExportSymbol))) {
                 flowContainer = getControlFlowContainer(flowContainer);
             }
             // We only look for uninitialized variables in strict null checking mode, and only when we can analyze
             // the entire control flow graph from the variable's declaration (i.e. when the flow container and
             // declaration container are the same).
-            var assumeInitialized = isParameter || isAlias || isOuterVariable || isSpreadDestructuringAssignmentTarget || isModuleExports ||
+            var assumeInitialized = isParameter || isAlias || isOuterVariable || isSpreadDestructuringAssignmentTarget || isModuleExports || ts.isBindingElement(declaration) ||
                 type !== autoType && type !== autoArrayType && (!strictNullChecks || (type.flags & 3 /* AnyOrUnknown */) !== 0 ||
-                    isInTypeQuery(node) || node.parent.kind === 257 /* ExportSpecifier */) ||
-                node.parent.kind === 213 /* NonNullExpression */ ||
-                declaration.kind === 237 /* VariableDeclaration */ && declaration.exclamationToken ||
+                    isInTypeQuery(node) || node.parent.kind === 258 /* ExportSpecifier */) ||
+                node.parent.kind === 214 /* NonNullExpression */ ||
+                declaration.kind === 238 /* VariableDeclaration */ && declaration.exclamationToken ||
                 declaration.flags & 4194304 /* Ambient */;
             var initialType = assumeInitialized ? (isParameter ? removeOptionalityFromDeclaredType(type, declaration) : type) :
                 type === autoType || type === autoArrayType ? undefinedType :
@@ -46780,7 +48165,8 @@ var ts;
         function checkNestedBlockScopedBinding(node, symbol) {
             if (languageVersion >= 2 /* ES2015 */ ||
                 (symbol.flags & (2 /* BlockScopedVariable */ | 32 /* Class */)) === 0 ||
-                symbol.valueDeclaration.parent.kind === 274 /* CatchClause */) {
+                ts.isSourceFile(symbol.valueDeclaration) ||
+                symbol.valueDeclaration.parent.kind === 275 /* CatchClause */) {
                 return;
             }
             // 1. walk from the use site up to the declaration and check
@@ -46803,7 +48189,7 @@ var ts;
                     // mark iteration statement as containing block-scoped binding captured in some function
                     var capturesBlockScopeBindingInLoopBody = true;
                     if (ts.isForStatement(container) &&
-                        ts.getAncestor(symbol.valueDeclaration, 238 /* VariableDeclarationList */).parent === container) {
+                        ts.getAncestor(symbol.valueDeclaration, 239 /* VariableDeclarationList */).parent === container) {
                         var part = getPartOfForStatementContainingNode(node.parent, container);
                         if (part) {
                             var links = getNodeLinks(part);
@@ -46821,8 +48207,8 @@ var ts;
                 }
                 // mark variables that are declared in loop initializer and reassigned inside the body of ForStatement.
                 // if body of ForStatement will be converted to function then we'll need a extra machinery to propagate reassigned values back.
-                if (container.kind === 225 /* ForStatement */ &&
-                    ts.getAncestor(symbol.valueDeclaration, 238 /* VariableDeclarationList */).parent === container &&
+                if (container.kind === 226 /* ForStatement */ &&
+                    ts.getAncestor(symbol.valueDeclaration, 239 /* VariableDeclarationList */).parent === container &&
                     isAssignedInBodyOfForStatement(node, container)) {
                     getNodeLinks(symbol.valueDeclaration).flags |= 4194304 /* NeedsLoopOutParameter */;
                 }
@@ -46840,7 +48226,7 @@ var ts;
         function isAssignedInBodyOfForStatement(node, container) {
             // skip parenthesized nodes
             var current = node;
-            while (current.parent.kind === 195 /* ParenthesizedExpression */) {
+            while (current.parent.kind === 196 /* ParenthesizedExpression */) {
                 current = current.parent;
             }
             // check if node is used as LHS in some assignment expression
@@ -46848,7 +48234,7 @@ var ts;
             if (ts.isAssignmentTarget(current)) {
                 isAssigned = true;
             }
-            else if ((current.parent.kind === 202 /* PrefixUnaryExpression */ || current.parent.kind === 203 /* PostfixUnaryExpression */)) {
+            else if ((current.parent.kind === 203 /* PrefixUnaryExpression */ || current.parent.kind === 204 /* PostfixUnaryExpression */)) {
                 var expr = current.parent;
                 isAssigned = expr.operator === 44 /* PlusPlusToken */ || expr.operator === 45 /* MinusMinusToken */;
             }
@@ -46861,7 +48247,7 @@ var ts;
         }
         function captureLexicalThis(node, container) {
             getNodeLinks(node).flags |= 2 /* LexicalThis */;
-            if (container.kind === 154 /* PropertyDeclaration */ || container.kind === 157 /* Constructor */) {
+            if (container.kind === 155 /* PropertyDeclaration */ || container.kind === 158 /* Constructor */) {
                 var classNode = container.parent;
                 getNodeLinks(classNode).flags |= 4 /* CaptureThis */;
             }
@@ -46929,37 +48315,37 @@ var ts;
             // tell whether 'this' needs to be captured.
             var container = ts.getThisContainer(node, /* includeArrowFunctions */ true);
             var capturedByArrowFunction = false;
-            if (container.kind === 157 /* Constructor */) {
+            if (container.kind === 158 /* Constructor */) {
                 checkThisBeforeSuper(node, container, ts.Diagnostics.super_must_be_called_before_accessing_this_in_the_constructor_of_a_derived_class);
             }
             // Now skip arrow functions to get the "real" owner of 'this'.
-            if (container.kind === 197 /* ArrowFunction */) {
+            if (container.kind === 198 /* ArrowFunction */) {
                 container = ts.getThisContainer(container, /* includeArrowFunctions */ false);
                 capturedByArrowFunction = true;
             }
             switch (container.kind) {
-                case 244 /* ModuleDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     error(node, ts.Diagnostics.this_cannot_be_referenced_in_a_module_or_namespace_body);
                     // do not return here so in case if lexical this is captured - it will be reflected in flags on NodeLinks
                     break;
-                case 243 /* EnumDeclaration */:
+                case 244 /* EnumDeclaration */:
                     error(node, ts.Diagnostics.this_cannot_be_referenced_in_current_location);
                     // do not return here so in case if lexical this is captured - it will be reflected in flags on NodeLinks
                     break;
-                case 157 /* Constructor */:
+                case 158 /* Constructor */:
                     if (isInConstructorArgumentInitializer(node, container)) {
                         error(node, ts.Diagnostics.this_cannot_be_referenced_in_constructor_arguments);
                         // do not return here so in case if lexical this is captured - it will be reflected in flags on NodeLinks
                     }
                     break;
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
                     if (ts.hasModifier(container, 32 /* Static */)) {
                         error(node, ts.Diagnostics.this_cannot_be_referenced_in_a_static_property_initializer);
                         // do not return here so in case if lexical this is captured - it will be reflected in flags on NodeLinks
                     }
                     break;
-                case 149 /* ComputedPropertyName */:
+                case 150 /* ComputedPropertyName */:
                     error(node, ts.Diagnostics.this_cannot_be_referenced_in_a_computed_property_name);
                     break;
             }
@@ -46979,7 +48365,7 @@ var ts;
                     if (!ts.isSourceFile(container)) {
                         var outsideThis = tryGetThisTypeAt(container);
                         if (outsideThis && outsideThis !== globalThisType_1) {
-                            addRelatedInfo(diag, ts.createDiagnosticForNode(container, ts.Diagnostics.An_outer_value_of_this_is_shadowed_by_this_container));
+                            ts.addRelatedInfo(diag, ts.createDiagnosticForNode(container, ts.Diagnostics.An_outer_value_of_this_is_shadowed_by_this_container));
                         }
                     }
                 }
@@ -47009,7 +48395,7 @@ var ts;
                 //   * /** @constructor */ function [name]() { ... }
                 //   * /** @constructor */ var x = function() { ... }
                 else if (isInJS &&
-                    (container.kind === 196 /* FunctionExpression */ || container.kind === 239 /* FunctionDeclaration */) &&
+                    (container.kind === 197 /* FunctionExpression */ || container.kind === 240 /* FunctionDeclaration */) &&
                     ts.getJSDocClassTag(container)) {
                     var classType = getJSClassType(getMergedSymbol(container.symbol));
                     if (classType) {
@@ -47045,7 +48431,7 @@ var ts;
         }
         function getClassNameFromPrototypeMethod(container) {
             // Check if it's the RHS of a x.prototype.y = function [name]() { .... }
-            if (container.kind === 196 /* FunctionExpression */ &&
+            if (container.kind === 197 /* FunctionExpression */ &&
                 ts.isBinaryExpression(container.parent) &&
                 ts.getAssignmentDeclarationKind(container.parent) === 3 /* PrototypeProperty */) {
                 // Get the 'x' of 'x.prototype.y = container'
@@ -47055,16 +48441,16 @@ var ts;
                     .expression; // x
             }
             // x.prototype = { method() { } }
-            else if (container.kind === 156 /* MethodDeclaration */ &&
-                container.parent.kind === 188 /* ObjectLiteralExpression */ &&
+            else if (container.kind === 157 /* MethodDeclaration */ &&
+                container.parent.kind === 189 /* ObjectLiteralExpression */ &&
                 ts.isBinaryExpression(container.parent.parent) &&
                 ts.getAssignmentDeclarationKind(container.parent.parent) === 6 /* Prototype */) {
                 return container.parent.parent.left.expression;
             }
             // x.prototype = { method: function() { } }
-            else if (container.kind === 196 /* FunctionExpression */ &&
-                container.parent.kind === 275 /* PropertyAssignment */ &&
-                container.parent.parent.kind === 188 /* ObjectLiteralExpression */ &&
+            else if (container.kind === 197 /* FunctionExpression */ &&
+                container.parent.kind === 276 /* PropertyAssignment */ &&
+                container.parent.parent.kind === 189 /* ObjectLiteralExpression */ &&
                 ts.isBinaryExpression(container.parent.parent.parent) &&
                 ts.getAssignmentDeclarationKind(container.parent.parent.parent) === 6 /* Prototype */) {
                 return container.parent.parent.parent.left.expression;
@@ -47072,7 +48458,7 @@ var ts;
             // Object.defineProperty(x, "method", { value: function() { } });
             // Object.defineProperty(x, "method", { set: (x: () => void) => void });
             // Object.defineProperty(x, "method", { get: () => function() { }) });
-            else if (container.kind === 196 /* FunctionExpression */ &&
+            else if (container.kind === 197 /* FunctionExpression */ &&
                 ts.isPropertyAssignment(container.parent) &&
                 ts.isIdentifier(container.parent.name) &&
                 (container.parent.name.escapedText === "value" || container.parent.name.escapedText === "get" || container.parent.name.escapedText === "set") &&
@@ -47097,7 +48483,7 @@ var ts;
         }
         function getTypeForThisExpressionFromJSDoc(node) {
             var jsdocType = ts.getJSDocType(node);
-            if (jsdocType && jsdocType.kind === 294 /* JSDocFunctionType */) {
+            if (jsdocType && jsdocType.kind === 295 /* JSDocFunctionType */) {
                 var jsDocFunctionType = jsdocType;
                 if (jsDocFunctionType.parameters.length > 0 &&
                     jsDocFunctionType.parameters[0].name &&
@@ -47111,15 +48497,15 @@ var ts;
             }
         }
         function isInConstructorArgumentInitializer(node, constructorDecl) {
-            return !!ts.findAncestor(node, function (n) { return ts.isFunctionLikeDeclaration(n) ? "quit" : n.kind === 151 /* Parameter */ && n.parent === constructorDecl; });
+            return !!ts.findAncestor(node, function (n) { return ts.isFunctionLikeDeclaration(n) ? "quit" : n.kind === 152 /* Parameter */ && n.parent === constructorDecl; });
         }
         function checkSuperExpression(node) {
-            var isCallExpression = node.parent.kind === 191 /* CallExpression */ && node.parent.expression === node;
+            var isCallExpression = node.parent.kind === 192 /* CallExpression */ && node.parent.expression === node;
             var container = ts.getSuperContainer(node, /*stopOnFunctions*/ true);
             var needToCaptureLexicalThis = false;
             // adjust the container reference in case if super is used inside arrow functions with arbitrarily deep nesting
             if (!isCallExpression) {
-                while (container && container.kind === 197 /* ArrowFunction */) {
+                while (container && container.kind === 198 /* ArrowFunction */) {
                     container = ts.getSuperContainer(container, /*stopOnFunctions*/ true);
                     needToCaptureLexicalThis = languageVersion < 2 /* ES2015 */;
                 }
@@ -47132,14 +48518,14 @@ var ts;
                 // class B {
                 //     [super.foo()]() {}
                 // }
-                var current = ts.findAncestor(node, function (n) { return n === container ? "quit" : n.kind === 149 /* ComputedPropertyName */; });
-                if (current && current.kind === 149 /* ComputedPropertyName */) {
+                var current = ts.findAncestor(node, function (n) { return n === container ? "quit" : n.kind === 150 /* ComputedPropertyName */; });
+                if (current && current.kind === 150 /* ComputedPropertyName */) {
                     error(node, ts.Diagnostics.super_cannot_be_referenced_in_a_computed_property_name);
                 }
                 else if (isCallExpression) {
                     error(node, ts.Diagnostics.Super_calls_are_not_permitted_outside_constructors_or_in_nested_functions_inside_constructors);
                 }
-                else if (!container || !container.parent || !(ts.isClassLike(container.parent) || container.parent.kind === 188 /* ObjectLiteralExpression */)) {
+                else if (!container || !container.parent || !(ts.isClassLike(container.parent) || container.parent.kind === 189 /* ObjectLiteralExpression */)) {
                     error(node, ts.Diagnostics.super_can_only_be_referenced_in_members_of_derived_classes_or_object_literal_expressions);
                 }
                 else {
@@ -47147,7 +48533,7 @@ var ts;
                 }
                 return errorType;
             }
-            if (!isCallExpression && container.kind === 157 /* Constructor */) {
+            if (!isCallExpression && container.kind === 158 /* Constructor */) {
                 checkThisBeforeSuper(node, container, ts.Diagnostics.super_must_be_called_before_accessing_a_property_of_super_in_the_constructor_of_a_derived_class);
             }
             if (ts.hasModifier(container, 32 /* Static */) || isCallExpression) {
@@ -47216,7 +48602,7 @@ var ts;
             // as a call expression cannot be used as the target of a destructuring assignment while a property access can.
             //
             // For element access expressions (`super[x]`), we emit a generic helper that forwards the element access in both situations.
-            if (container.kind === 156 /* MethodDeclaration */ && ts.hasModifier(container, 256 /* Async */)) {
+            if (container.kind === 157 /* MethodDeclaration */ && ts.hasModifier(container, 256 /* Async */)) {
                 if (ts.isSuperProperty(node.parent) && ts.isAssignmentTarget(node.parent)) {
                     getNodeLinks(container).flags |= 4096 /* AsyncMethodWithSuperBinding */;
                 }
@@ -47230,7 +48616,7 @@ var ts;
                 // in this case they should also use correct lexical this
                 captureLexicalThis(node.parent, container);
             }
-            if (container.parent.kind === 188 /* ObjectLiteralExpression */) {
+            if (container.parent.kind === 189 /* ObjectLiteralExpression */) {
                 if (languageVersion < 2 /* ES2015 */) {
                     error(node, ts.Diagnostics.super_is_only_allowed_in_members_of_object_literal_expressions_when_option_target_is_ES2015_or_higher);
                     return errorType;
@@ -47251,7 +48637,7 @@ var ts;
             if (!baseClassType) {
                 return errorType;
             }
-            if (container.kind === 157 /* Constructor */ && isInConstructorArgumentInitializer(node, container)) {
+            if (container.kind === 158 /* Constructor */ && isInConstructorArgumentInitializer(node, container)) {
                 // issue custom error message for super property access in constructor arguments (to be aligned with old compiler)
                 error(node, ts.Diagnostics.super_cannot_be_referenced_in_constructor_arguments);
                 return errorType;
@@ -47266,7 +48652,7 @@ var ts;
                 if (isCallExpression) {
                     // TS 1.0 SPEC (April 2014): 4.8.1
                     // Super calls are only permitted in constructors of derived classes
-                    return container.kind === 157 /* Constructor */;
+                    return container.kind === 158 /* Constructor */;
                 }
                 else {
                     // TS 1.0 SPEC (April 2014)
@@ -47274,21 +48660,21 @@ var ts;
                     // - In a constructor, instance member function, instance member accessor, or instance member variable initializer where this references a derived class instance
                     // - In a static member function or static member accessor
                     // topmost container must be something that is directly nested in the class declaration\object literal expression
-                    if (ts.isClassLike(container.parent) || container.parent.kind === 188 /* ObjectLiteralExpression */) {
+                    if (ts.isClassLike(container.parent) || container.parent.kind === 189 /* ObjectLiteralExpression */) {
                         if (ts.hasModifier(container, 32 /* Static */)) {
-                            return container.kind === 156 /* MethodDeclaration */ ||
-                                container.kind === 155 /* MethodSignature */ ||
-                                container.kind === 158 /* GetAccessor */ ||
-                                container.kind === 159 /* SetAccessor */;
+                            return container.kind === 157 /* MethodDeclaration */ ||
+                                container.kind === 156 /* MethodSignature */ ||
+                                container.kind === 159 /* GetAccessor */ ||
+                                container.kind === 160 /* SetAccessor */;
                         }
                         else {
-                            return container.kind === 156 /* MethodDeclaration */ ||
-                                container.kind === 155 /* MethodSignature */ ||
-                                container.kind === 158 /* GetAccessor */ ||
-                                container.kind === 159 /* SetAccessor */ ||
-                                container.kind === 154 /* PropertyDeclaration */ ||
-                                container.kind === 153 /* PropertySignature */ ||
-                                container.kind === 157 /* Constructor */;
+                            return container.kind === 157 /* MethodDeclaration */ ||
+                                container.kind === 156 /* MethodSignature */ ||
+                                container.kind === 159 /* GetAccessor */ ||
+                                container.kind === 160 /* SetAccessor */ ||
+                                container.kind === 155 /* PropertyDeclaration */ ||
+                                container.kind === 154 /* PropertySignature */ ||
+                                container.kind === 158 /* Constructor */;
                         }
                     }
                 }
@@ -47296,10 +48682,10 @@ var ts;
             }
         }
         function getContainingObjectLiteral(func) {
-            return (func.kind === 156 /* MethodDeclaration */ ||
-                func.kind === 158 /* GetAccessor */ ||
-                func.kind === 159 /* SetAccessor */) && func.parent.kind === 188 /* ObjectLiteralExpression */ ? func.parent :
-                func.kind === 196 /* FunctionExpression */ && func.parent.kind === 275 /* PropertyAssignment */ ? func.parent.parent :
+            return (func.kind === 157 /* MethodDeclaration */ ||
+                func.kind === 159 /* GetAccessor */ ||
+                func.kind === 160 /* SetAccessor */) && func.parent.kind === 189 /* ObjectLiteralExpression */ ? func.parent :
+                func.kind === 197 /* FunctionExpression */ && func.parent.kind === 276 /* PropertyAssignment */ ? func.parent.parent :
                     undefined;
         }
         function getThisTypeArgument(type) {
@@ -47311,7 +48697,7 @@ var ts;
             });
         }
         function getContextualThisParameterType(func) {
-            if (func.kind === 197 /* ArrowFunction */) {
+            if (func.kind === 198 /* ArrowFunction */) {
                 return undefined;
             }
             if (isContextSensitiveFunctionOrObjectLiteralMethod(func)) {
@@ -47336,9 +48722,9 @@ var ts;
                     while (type) {
                         var thisType = getThisTypeFromContextualType(type);
                         if (thisType) {
-                            return instantiateType(thisType, getContextualMapper(containingLiteral));
+                            return instantiateType(thisType, getMapperFromContext(getInferenceContext(containingLiteral)));
                         }
-                        if (literal.parent.kind !== 275 /* PropertyAssignment */) {
+                        if (literal.parent.kind !== 276 /* PropertyAssignment */) {
                             break;
                         }
                         literal = literal.parent.parent;
@@ -47347,14 +48733,14 @@ var ts;
                     // There was no contextual ThisType<T> for the containing object literal, so the contextual type
                     // for 'this' is the non-null form of the contextual type for the containing object literal or
                     // the type of the object literal itself.
-                    return contextualType ? getNonNullableType(contextualType) : checkExpressionCached(containingLiteral);
+                    return getWidenedType(contextualType ? getNonNullableType(contextualType) : checkExpressionCached(containingLiteral));
                 }
                 // In an assignment of the form 'obj.xxx = function(...)' or 'obj[xxx] = function(...)', the
                 // contextual type for 'this' is 'obj'.
                 var parent = func.parent;
-                if (parent.kind === 204 /* BinaryExpression */ && parent.operatorToken.kind === 59 /* EqualsToken */) {
+                if (parent.kind === 205 /* BinaryExpression */ && parent.operatorToken.kind === 60 /* EqualsToken */) {
                     var target = parent.left;
-                    if (target.kind === 189 /* PropertyAccessExpression */ || target.kind === 190 /* ElementAccessExpression */) {
+                    if (target.kind === 190 /* PropertyAccessExpression */ || target.kind === 191 /* ElementAccessExpression */) {
                         var expression = target.expression;
                         // Don't contextually type `this` as `exports` in `exports.Point = function(x, y) { this.x = x; this.y = y; }`
                         if (inJs && ts.isIdentifier(expression)) {
@@ -47363,14 +48749,14 @@ var ts;
                                 return undefined;
                             }
                         }
-                        return checkExpressionCached(expression);
+                        return getWidenedType(checkExpressionCached(expression));
                     }
                 }
             }
             return undefined;
         }
         // Return contextual type of parameter or undefined if no contextual type is available
-        function getContextuallyTypedParameterType(parameter) {
+        function getContextuallyTypedParameterType(parameter, forCache) {
             var func = parameter.parent;
             if (!isContextSensitiveFunctionOrObjectLiteralMethod(func)) {
                 return undefined;
@@ -47393,6 +48779,19 @@ var ts;
             }
             var contextualSignature = getContextualSignature(func);
             if (contextualSignature) {
+                if (forCache) {
+                    // Calling the below guarantees the types are primed and assigned in the same way
+                    // as when the parameter is reached via `checkFunctionExpressionOrObjectLiteralMethod`.
+                    // This should prevent any uninstantiated inference variables in the contextual signature
+                    // from leaking, and should lock in cached parameter types via `assignContextualParameterTypes`
+                    // which we will then immediately use the results of below.
+                    contextuallyCheckFunctionExpressionOrObjectLiteralMethod(func);
+                    var type = getTypeOfSymbol(getMergedSymbol(func.symbol));
+                    if (isTypeAny(type)) {
+                        return type;
+                    }
+                    contextualSignature = getSignaturesOfType(type, 0 /* Call */)[0];
+                }
                 var index = func.parameters.indexOf(parameter) - (ts.getThisParameter(func) ? 1 : 0);
                 return parameter.dotDotDotToken && ts.lastOrUndefined(func.parameters) === parameter ?
                     getRestTypeAtPosition(contextualSignature, index) :
@@ -47405,9 +48804,9 @@ var ts;
                 return getTypeFromTypeNode(typeNode);
             }
             switch (declaration.kind) {
-                case 151 /* Parameter */:
-                    return getContextuallyTypedParameterType(declaration);
-                case 186 /* BindingElement */:
+                case 152 /* Parameter */:
+                    return getContextuallyTypedParameterType(declaration, /*forCache*/ false);
+                case 187 /* BindingElement */:
                     return getContextualTypeForBindingElement(declaration);
                 // By default, do nothing and return undefined - only parameters and binding elements have context implied by a parent
             }
@@ -47479,7 +48878,7 @@ var ts;
                 if (contextualReturnType) {
                     return node.asteriskToken
                         ? contextualReturnType
-                        : getIteratedTypeOfGenerator(contextualReturnType, (functionFlags & 2 /* Async */) !== 0);
+                        : getIterationTypeOfGeneratorFunctionReturnType(0 /* Yield */, contextualReturnType, (functionFlags & 2 /* Async */) !== 0);
                 }
             }
             return undefined;
@@ -47528,16 +48927,16 @@ var ts;
             return getTypeAtPosition(signature, argIndex);
         }
         function getContextualTypeForSubstitutionExpression(template, substitutionExpression) {
-            if (template.parent.kind === 193 /* TaggedTemplateExpression */) {
+            if (template.parent.kind === 194 /* TaggedTemplateExpression */) {
                 return getContextualTypeForArgument(template.parent, substitutionExpression);
             }
             return undefined;
         }
-        function getContextualTypeForBinaryOperand(node) {
+        function getContextualTypeForBinaryOperand(node, contextFlags) {
             var binaryExpression = node.parent;
             var left = binaryExpression.left, operatorToken = binaryExpression.operatorToken, right = binaryExpression.right;
             switch (operatorToken.kind) {
-                case 59 /* EqualsToken */:
+                case 60 /* EqualsToken */:
                     if (node !== right) {
                         return undefined;
                     }
@@ -47547,15 +48946,17 @@ var ts;
                     }
                     return contextSensitive === true ? getTypeOfExpression(left) : contextSensitive;
                 case 55 /* BarBarToken */:
-                    // When an || expression has a contextual type, the operands are contextually typed by that type. When an ||
-                    // expression has no contextual type, the right operand is contextually typed by the type of the left operand,
-                    // except for the special case of Javascript declarations of the form `namespace.prop = namespace.prop || {}`
-                    var type = getContextualType(binaryExpression);
-                    return !type && node === right && !ts.isDefaultedExpandoInitializer(binaryExpression) ?
+                    // When an || expression has a contextual type, the operands are contextually typed by that type, except
+                    // when that type originates in a binding pattern, the right operand is contextually typed by the type of
+                    // the left operand. When an || expression has no contextual type, the right operand is contextually typed
+                    // by the type of the left operand, except for the special case of Javascript declarations of the form
+                    // `namespace.prop = namespace.prop || {}`.
+                    var type = getContextualType(binaryExpression, contextFlags);
+                    return node === right && (type && type.pattern || !type && !ts.isDefaultedExpandoInitializer(binaryExpression)) ?
                         getTypeOfExpression(left) : type;
                 case 54 /* AmpersandAmpersandToken */:
                 case 27 /* CommaToken */:
-                    return node === right ? getContextualType(binaryExpression) : undefined;
+                    return node === right ? getContextualType(binaryExpression, contextFlags) : undefined;
                 default:
                     return undefined;
             }
@@ -47631,7 +49032,15 @@ var ts;
         }
         function getTypeOfPropertyOfContextualType(type, name) {
             return mapType(type, function (t) {
-                if (t.flags & 3670016 /* StructuredType */) {
+                if (isGenericMappedType(t)) {
+                    var constraint = getConstraintTypeFromMappedType(t);
+                    var constraintOfConstraint = getBaseConstraintOfType(constraint) || constraint;
+                    var propertyNameType = getLiteralType(ts.unescapeLeadingUnderscores(name));
+                    if (isTypeAssignableTo(propertyNameType, constraintOfConstraint)) {
+                        return substituteIndexedMappedType(t, propertyNameType);
+                    }
+                }
+                else if (t.flags & 3670016 /* StructuredType */) {
                     var prop = getPropertyOfType(t, name);
                     if (prop) {
                         return getTypeOfSymbol(prop);
@@ -47654,24 +49063,24 @@ var ts;
         // In an object literal contextually typed by a type T, the contextual type of a property assignment is the type of
         // the matching property in T, if one exists. Otherwise, it is the type of the numeric index signature in T, if one
         // exists. Otherwise, it is the type of the string index signature in T, if one exists.
-        function getContextualTypeForObjectLiteralMethod(node) {
+        function getContextualTypeForObjectLiteralMethod(node, contextFlags) {
             ts.Debug.assert(ts.isObjectLiteralMethod(node));
             if (node.flags & 8388608 /* InWithStatement */) {
                 // We cannot answer semantic questions within a with block, do not proceed any further
                 return undefined;
             }
-            return getContextualTypeForObjectLiteralElement(node);
+            return getContextualTypeForObjectLiteralElement(node, contextFlags);
         }
-        function getContextualTypeForObjectLiteralElement(element) {
+        function getContextualTypeForObjectLiteralElement(element, contextFlags) {
             var objectLiteral = element.parent;
-            var type = getApparentTypeOfContextualType(objectLiteral);
+            var type = getApparentTypeOfContextualType(objectLiteral, contextFlags);
             if (type) {
                 if (!hasNonBindableDynamicName(element)) {
                     // For a (non-symbol) computed property, there is no reason to look up the name
                     // in the type. It will just be "__computed", which does not appear in any
                     // SymbolTable.
-                    var symbolName_2 = getSymbolOfNode(element).escapedName;
-                    var propertyType = getTypeOfPropertyOfContextualType(type, symbolName_2);
+                    var symbolName_3 = getSymbolOfNode(element).escapedName;
+                    var propertyType = getTypeOfPropertyOfContextualType(type, symbolName_3);
                     if (propertyType) {
                         return propertyType;
                     }
@@ -47687,12 +49096,12 @@ var ts;
         // type of T.
         function getContextualTypeForElementExpression(arrayContextualType, index) {
             return arrayContextualType && (getTypeOfPropertyOfContextualType(arrayContextualType, "" + index)
-                || getIteratedTypeOrElementType(arrayContextualType, /*errorNode*/ undefined, /*allowStringInput*/ false, /*allowAsyncIterables*/ false, /*checkAssignability*/ false));
+                || getIteratedTypeOrElementType(1 /* Element */, arrayContextualType, undefinedType, /*errorNode*/ undefined, /*checkAssignability*/ false));
         }
         // In a contextually typed conditional expression, the true/false expressions are contextually typed by the same type.
-        function getContextualTypeForConditionalOperand(node) {
+        function getContextualTypeForConditionalOperand(node, contextFlags) {
             var conditional = node.parent;
-            return node === conditional.whenTrue || node === conditional.whenFalse ? getContextualType(conditional) : undefined;
+            return node === conditional.whenTrue || node === conditional.whenFalse ? getContextualType(conditional, contextFlags) : undefined;
         }
         function getContextualTypeForChildJsxExpression(node, child) {
             var attributesType = getApparentTypeOfContextualType(node.openingElement.tagName);
@@ -47701,16 +49110,17 @@ var ts;
             if (!(attributesType && !isTypeAny(attributesType) && jsxChildrenPropertyName && jsxChildrenPropertyName !== "")) {
                 return undefined;
             }
-            var childIndex = node.children.indexOf(child);
+            var realChildren = getSemanticJsxChildren(node.children);
+            var childIndex = realChildren.indexOf(child);
             var childFieldType = getTypeOfPropertyOfContextualType(attributesType, jsxChildrenPropertyName);
-            return childFieldType && mapType(childFieldType, function (t) {
+            return childFieldType && (realChildren.length === 1 ? childFieldType : mapType(childFieldType, function (t) {
                 if (isArrayLikeType(t)) {
                     return getIndexedAccessType(t, getLiteralType(childIndex));
                 }
                 else {
                     return t;
                 }
-            }, /*noReductions*/ true);
+            }, /*noReductions*/ true));
         }
         function getContextualTypeForJsxExpression(node) {
             var exprParent = node.parent;
@@ -47744,30 +49154,30 @@ var ts;
                 case 8 /* NumericLiteral */:
                 case 9 /* BigIntLiteral */:
                 case 14 /* NoSubstitutionTemplateLiteral */:
-                case 102 /* TrueKeyword */:
-                case 87 /* FalseKeyword */:
-                case 96 /* NullKeyword */:
-                case 72 /* Identifier */:
-                case 141 /* UndefinedKeyword */:
+                case 103 /* TrueKeyword */:
+                case 88 /* FalseKeyword */:
+                case 97 /* NullKeyword */:
+                case 73 /* Identifier */:
+                case 142 /* UndefinedKeyword */:
                     return true;
-                case 189 /* PropertyAccessExpression */:
-                case 195 /* ParenthesizedExpression */:
+                case 190 /* PropertyAccessExpression */:
+                case 196 /* ParenthesizedExpression */:
                     return isPossiblyDiscriminantValue(node.expression);
-                case 270 /* JsxExpression */:
+                case 271 /* JsxExpression */:
                     return !node.expression || isPossiblyDiscriminantValue(node.expression);
             }
             return false;
         }
         function discriminateContextualTypeByObjectMembers(node, contextualType) {
-            return discriminateTypeByDiscriminableItems(contextualType, ts.map(ts.filter(node.properties, function (p) { return !!p.symbol && p.kind === 275 /* PropertyAssignment */ && isPossiblyDiscriminantValue(p.initializer) && isDiscriminantProperty(contextualType, p.symbol.escapedName); }), function (prop) { return [function () { return checkExpression(prop.initializer); }, prop.symbol.escapedName]; }), isTypeAssignableTo, contextualType);
+            return discriminateTypeByDiscriminableItems(contextualType, ts.map(ts.filter(node.properties, function (p) { return !!p.symbol && p.kind === 276 /* PropertyAssignment */ && isPossiblyDiscriminantValue(p.initializer) && isDiscriminantProperty(contextualType, p.symbol.escapedName); }), function (prop) { return [function () { return checkExpression(prop.initializer); }, prop.symbol.escapedName]; }), isTypeAssignableTo, contextualType);
         }
         function discriminateContextualTypeByJSXAttributes(node, contextualType) {
-            return discriminateTypeByDiscriminableItems(contextualType, ts.map(ts.filter(node.properties, function (p) { return !!p.symbol && p.kind === 267 /* JsxAttribute */ && isDiscriminantProperty(contextualType, p.symbol.escapedName) && (!p.initializer || isPossiblyDiscriminantValue(p.initializer)); }), function (prop) { return [!prop.initializer ? (function () { return trueType; }) : (function () { return checkExpression(prop.initializer); }), prop.symbol.escapedName]; }), isTypeAssignableTo, contextualType);
+            return discriminateTypeByDiscriminableItems(contextualType, ts.map(ts.filter(node.properties, function (p) { return !!p.symbol && p.kind === 268 /* JsxAttribute */ && isDiscriminantProperty(contextualType, p.symbol.escapedName) && (!p.initializer || isPossiblyDiscriminantValue(p.initializer)); }), function (prop) { return [!prop.initializer ? (function () { return trueType; }) : (function () { return checkExpression(prop.initializer); }), prop.symbol.escapedName]; }), isTypeAssignableTo, contextualType);
         }
         // Return the contextual type for a given expression node. During overload resolution, a contextual type may temporarily
         // be "pushed" onto a node using the contextualType property.
-        function getApparentTypeOfContextualType(node) {
-            var contextualType = instantiateContextualType(getContextualType(node), node);
+        function getApparentTypeOfContextualType(node, contextFlags) {
+            var contextualType = instantiateContextualType(getContextualType(node, contextFlags), node, contextFlags);
             if (contextualType) {
                 var apparentType = mapType(contextualType, getApparentType, /*noReductions*/ true);
                 if (apparentType.flags & 1048576 /* Union */) {
@@ -47783,11 +49193,22 @@ var ts;
         }
         // If the given contextual type contains instantiable types and if a mapper representing
         // return type inferences is available, instantiate those types using that mapper.
-        function instantiateContextualType(contextualType, node) {
+        function instantiateContextualType(contextualType, node, contextFlags) {
             if (contextualType && maybeTypeOfKind(contextualType, 63176704 /* Instantiable */)) {
-                var returnMapper = getContextualMapper(node).returnMapper;
-                if (returnMapper) {
-                    return instantiateInstantiableTypes(contextualType, returnMapper);
+                var inferenceContext = getInferenceContext(node);
+                // If no inferences have been made, nothing is gained from instantiating as type parameters
+                // would just be replaced with their defaults similar to the apparent type.
+                if (inferenceContext && ts.some(inferenceContext.inferences, hasInferenceCandidates)) {
+                    // For contextual signatures we incorporate all inferences made so far, e.g. from return
+                    // types as well as arguments to the left in a function call.
+                    if (contextFlags && contextFlags & 1 /* Signature */) {
+                        return instantiateInstantiableTypes(contextualType, inferenceContext.nonFixingMapper);
+                    }
+                    // For other purposes (e.g. determining whether to produce literal types) we only
+                    // incorporate inferences made from the return type in a function call.
+                    if (inferenceContext.returnMapper) {
+                        return instantiateInstantiableTypes(contextualType, inferenceContext.returnMapper);
+                    }
                 }
             }
             return contextualType;
@@ -47808,7 +49229,7 @@ var ts;
             return type;
         }
         /**
-         * Woah! Do you really want to use this function?
+         * Whoa! Do you really want to use this function?
          *
          * Unless you're trying to get the *non-apparent* type for a
          * value-literal type or you're authoring relevant portions of this algorithm,
@@ -47824,7 +49245,7 @@ var ts;
          * @param node the expression whose contextual type will be returned.
          * @returns the contextual type of an expression.
          */
-        function getContextualType(node) {
+        function getContextualType(node, contextFlags) {
             if (node.flags & 8388608 /* InWithStatement */) {
                 // We cannot answer semantic questions within a with block, do not proceed any further
                 return undefined;
@@ -47834,61 +49255,65 @@ var ts;
             }
             var parent = node.parent;
             switch (parent.kind) {
-                case 237 /* VariableDeclaration */:
-                case 151 /* Parameter */:
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
-                case 186 /* BindingElement */:
+                case 238 /* VariableDeclaration */:
+                case 152 /* Parameter */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
+                case 187 /* BindingElement */:
                     return getContextualTypeForInitializerExpression(node);
-                case 197 /* ArrowFunction */:
-                case 230 /* ReturnStatement */:
+                case 198 /* ArrowFunction */:
+                case 231 /* ReturnStatement */:
                     return getContextualTypeForReturnExpression(node);
-                case 207 /* YieldExpression */:
+                case 208 /* YieldExpression */:
                     return getContextualTypeForYieldOperand(parent);
-                case 201 /* AwaitExpression */:
+                case 202 /* AwaitExpression */:
                     return getContextualTypeForAwaitOperand(parent);
-                case 191 /* CallExpression */:
-                case 192 /* NewExpression */:
+                case 192 /* CallExpression */:
+                    if (parent.expression.kind === 93 /* ImportKeyword */) {
+                        return stringType;
+                    }
+                /* falls through */
+                case 193 /* NewExpression */:
                     return getContextualTypeForArgument(parent, node);
-                case 194 /* TypeAssertionExpression */:
-                case 212 /* AsExpression */:
+                case 195 /* TypeAssertionExpression */:
+                case 213 /* AsExpression */:
                     return ts.isConstTypeReference(parent.type) ? undefined : getTypeFromTypeNode(parent.type);
-                case 204 /* BinaryExpression */:
-                    return getContextualTypeForBinaryOperand(node);
-                case 275 /* PropertyAssignment */:
-                case 276 /* ShorthandPropertyAssignment */:
-                    return getContextualTypeForObjectLiteralElement(parent);
-                case 277 /* SpreadAssignment */:
-                    return getApparentTypeOfContextualType(parent.parent);
-                case 187 /* ArrayLiteralExpression */: {
+                case 205 /* BinaryExpression */:
+                    return getContextualTypeForBinaryOperand(node, contextFlags);
+                case 276 /* PropertyAssignment */:
+                case 277 /* ShorthandPropertyAssignment */:
+                    return getContextualTypeForObjectLiteralElement(parent, contextFlags);
+                case 278 /* SpreadAssignment */:
+                    return getApparentTypeOfContextualType(parent.parent, contextFlags);
+                case 188 /* ArrayLiteralExpression */: {
                     var arrayLiteral = parent;
-                    var type = getApparentTypeOfContextualType(arrayLiteral);
+                    var type = getApparentTypeOfContextualType(arrayLiteral, contextFlags);
                     return getContextualTypeForElementExpression(type, ts.indexOfNode(arrayLiteral.elements, node));
                 }
-                case 205 /* ConditionalExpression */:
-                    return getContextualTypeForConditionalOperand(node);
-                case 216 /* TemplateSpan */:
-                    ts.Debug.assert(parent.parent.kind === 206 /* TemplateExpression */);
+                case 206 /* ConditionalExpression */:
+                    return getContextualTypeForConditionalOperand(node, contextFlags);
+                case 217 /* TemplateSpan */:
+                    ts.Debug.assert(parent.parent.kind === 207 /* TemplateExpression */);
                     return getContextualTypeForSubstitutionExpression(parent.parent, node);
-                case 195 /* ParenthesizedExpression */: {
+                case 196 /* ParenthesizedExpression */: {
                     // Like in `checkParenthesizedExpression`, an `/** @type {xyz} */` comment before a parenthesized expression acts as a type cast.
                     var tag = ts.isInJSFile(parent) ? ts.getJSDocTypeTag(parent) : undefined;
-                    return tag ? getTypeFromTypeNode(tag.typeExpression.type) : getContextualType(parent);
+                    return tag ? getTypeFromTypeNode(tag.typeExpression.type) : getContextualType(parent, contextFlags);
                 }
-                case 270 /* JsxExpression */:
+                case 271 /* JsxExpression */:
                     return getContextualTypeForJsxExpression(parent);
-                case 267 /* JsxAttribute */:
-                case 269 /* JsxSpreadAttribute */:
+                case 268 /* JsxAttribute */:
+                case 270 /* JsxSpreadAttribute */:
                     return getContextualTypeForJsxAttribute(parent);
-                case 262 /* JsxOpeningElement */:
-                case 261 /* JsxSelfClosingElement */:
+                case 263 /* JsxOpeningElement */:
+                case 262 /* JsxSelfClosingElement */:
                     return getContextualJsxElementAttributesType(parent);
             }
             return undefined;
         }
-        function getContextualMapper(node) {
-            var ancestor = ts.findAncestor(node, function (n) { return !!n.contextualMapper; });
-            return ancestor ? ancestor.contextualMapper : identityMapper;
+        function getInferenceContext(node) {
+            var ancestor = ts.findAncestor(node, function (n) { return !!n.inferenceContext; });
+            return ancestor && ancestor.inferenceContext;
         }
         function getContextualJsxElementAttributesType(node) {
             if (ts.isJsxOpeningElement(node) && node.parent.contextualType) {
@@ -47903,7 +49328,7 @@ var ts;
             return getJsxReferenceKind(node) !== 0 /* Component */ ? getJsxPropsTypeFromCallSignature(signature, node) : getJsxPropsTypeFromClassType(signature, node);
         }
         function getJsxPropsTypeFromCallSignature(sig, context) {
-            var propsType = getTypeOfFirstParameterOfSignatureWithFallback(sig, emptyObjectType);
+            var propsType = getTypeOfFirstParameterOfSignatureWithFallback(sig, unknownType);
             propsType = getJsxManagedAttributesFromLocatedAttributes(context, getJsxNamespaceAt(context), propsType);
             var intrinsicAttribs = getJsxType(JsxNames.IntrinsicAttributes, context);
             if (intrinsicAttribs !== errorType) {
@@ -47974,7 +49399,7 @@ var ts;
             var forcedLookupLocation = getJsxElementPropertiesName(ns);
             var attributesType = forcedLookupLocation === undefined
                 // If there is no type ElementAttributesProperty, return the type of the first parameter of the signature, which should be the props type
-                ? getTypeOfFirstParameterOfSignatureWithFallback(sig, emptyObjectType)
+                ? getTypeOfFirstParameterOfSignatureWithFallback(sig, unknownType)
                 : forcedLookupLocation === ""
                     // If there is no e.g. 'props' member in ElementAttributesProperty, use the element class type instead
                     ? getReturnTypeOfSignature(sig)
@@ -47985,7 +49410,7 @@ var ts;
                 if (!!forcedLookupLocation && !!ts.length(context.attributes.properties)) {
                     error(context, ts.Diagnostics.JSX_element_class_does_not_support_attributes_because_it_does_not_have_a_0_property, ts.unescapeLeadingUnderscores(forcedLookupLocation));
                 }
-                return emptyObjectType;
+                return unknownType;
             }
             attributesType = getJsxManagedAttributesFromLocatedAttributes(context, ns, attributesType);
             if (isTypeAny(attributesType)) {
@@ -48036,7 +49461,7 @@ var ts;
             return !hasEffectiveRestParameter(signature) && getParameterCount(signature) < targetParameterCount;
         }
         function isFunctionExpressionOrArrowFunction(node) {
-            return node.kind === 196 /* FunctionExpression */ || node.kind === 197 /* ArrowFunction */;
+            return node.kind === 197 /* FunctionExpression */ || node.kind === 198 /* ArrowFunction */;
         }
         function getContextualSignatureForFunctionLikeDeclaration(node) {
             // Only function expressions, arrow functions, and object literal methods are contextually typed.
@@ -48044,23 +49469,20 @@ var ts;
                 ? getContextualSignature(node)
                 : undefined;
         }
-        function getContextualTypeForFunctionLikeDeclaration(node) {
-            return ts.isObjectLiteralMethod(node) ?
-                getContextualTypeForObjectLiteralMethod(node) :
-                getApparentTypeOfContextualType(node);
-        }
         // Return the contextual signature for a given expression node. A contextual type provides a
         // contextual signature if it has a single call signature and if that call signature is non-generic.
         // If the contextual type is a union type, get the signature from each type possible and if they are
         // all identical ignoring their return type, the result is same signature but with return type as
         // union type of return types from these signatures
         function getContextualSignature(node) {
-            ts.Debug.assert(node.kind !== 156 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 157 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
             var typeTagSignature = getSignatureOfTypeTag(node);
             if (typeTagSignature) {
                 return typeTagSignature;
             }
-            var type = getContextualTypeForFunctionLikeDeclaration(node);
+            var type = ts.isObjectLiteralMethod(node) ?
+                getContextualTypeForObjectLiteralMethod(node, 1 /* Signature */) :
+                getApparentTypeOfContextualType(node, 1 /* Signature */);
             if (!type) {
                 return undefined;
             }
@@ -48069,8 +49491,8 @@ var ts;
             }
             var signatureList;
             var types = type.types;
-            for (var _i = 0, types_15 = types; _i < types_15.length; _i++) {
-                var current = types_15[_i];
+            for (var _i = 0, types_14 = types; _i < types_14.length; _i++) {
+                var current = types_14[_i];
                 var signature = getContextualCallSignature(current, node);
                 if (signature) {
                     if (!signatureList) {
@@ -48088,23 +49510,20 @@ var ts;
                 }
             }
             // Result is union of signatures collected (return type is union of return types of this signature set)
-            var result;
             if (signatureList) {
-                result = cloneSignature(signatureList[0]);
-                result.unionSignatures = signatureList;
+                return signatureList.length === 1 ? signatureList[0] : createUnionSignature(signatureList[0], signatureList);
             }
-            return result;
         }
         function checkSpreadExpression(node, checkMode) {
-            if (languageVersion < 2 /* ES2015 */ && compilerOptions.downlevelIteration) {
-                checkExternalEmitHelpers(node, 1536 /* SpreadIncludes */);
+            if (languageVersion < 2 /* ES2015 */) {
+                checkExternalEmitHelpers(node, compilerOptions.downlevelIteration ? 1536 /* SpreadIncludes */ : 2048 /* SpreadArrays */);
             }
             var arrayOrIterableType = checkExpression(node.expression, checkMode);
-            return checkIteratedTypeOrElementType(arrayOrIterableType, node.expression, /*allowStringInput*/ false, /*allowAsyncIterables*/ false);
+            return checkIteratedTypeOrElementType(33 /* Spread */, arrayOrIterableType, undefinedType, node.expression);
         }
         function hasDefaultValue(node) {
-            return (node.kind === 186 /* BindingElement */ && !!node.initializer) ||
-                (node.kind === 204 /* BinaryExpression */ && node.operatorToken.kind === 59 /* EqualsToken */);
+            return (node.kind === 187 /* BindingElement */ && !!node.initializer) ||
+                (node.kind === 205 /* BinaryExpression */ && node.operatorToken.kind === 60 /* EqualsToken */);
         }
         function checkArrayLiteral(node, checkMode, forceTuple) {
             var elements = node.elements;
@@ -48116,7 +49535,7 @@ var ts;
             var inConstContext = isConstContext(node);
             for (var index = 0; index < elementCount; index++) {
                 var e = elements[index];
-                if (inDestructuringPattern && e.kind === 208 /* SpreadElement */) {
+                if (inDestructuringPattern && e.kind === 209 /* SpreadElement */) {
                     // Given the following situation:
                     //    var c: {};
                     //    [...c] = ["", 0];
@@ -48131,7 +49550,7 @@ var ts;
                     // if there is no index type / iterated type.
                     var restArrayType = checkExpression(e.expression, checkMode, forceTuple);
                     var restElementType = getIndexTypeOfType(restArrayType, 1 /* Number */) ||
-                        getIteratedTypeOrElementType(restArrayType, /*errorNode*/ undefined, /*allowStringInput*/ false, /*allowAsyncIterables*/ false, /*checkAssignability*/ false);
+                        getIteratedTypeOrElementType(65 /* Destructuring */, restArrayType, undefinedType, /*errorNode*/ undefined, /*checkAssignability*/ false);
                     if (restElementType) {
                         elementTypes.push(restElementType);
                     }
@@ -48141,12 +49560,12 @@ var ts;
                     var type = checkExpressionForMutableLocation(e, checkMode, elementContextualType, forceTuple);
                     elementTypes.push(type);
                 }
-                if (index < elementCount - 1 && e.kind === 208 /* SpreadElement */) {
+                if (index < elementCount - 1 && e.kind === 209 /* SpreadElement */) {
                     hasNonEndingSpreadElement = true;
                 }
             }
             if (!hasNonEndingSpreadElement) {
-                var hasRestElement = elementCount > 0 && elements[elementCount - 1].kind === 208 /* SpreadElement */;
+                var hasRestElement = elementCount > 0 && elements[elementCount - 1].kind === 209 /* SpreadElement */;
                 var minLength = elementCount - (hasRestElement ? 1 : 0);
                 // If array literal is actually a destructuring pattern, mark it as an implied type. We do this such
                 // that we get the same behavior for "var [x, y] = []" and "[x, y] = []".
@@ -48157,48 +49576,40 @@ var ts;
                     return type;
                 }
                 else if (tupleResult = getArrayLiteralTupleTypeIfApplicable(elementTypes, contextualType, hasRestElement, elementCount, inConstContext)) {
-                    return tupleResult;
+                    return createArrayLiteralType(tupleResult);
                 }
                 else if (forceTuple) {
-                    return createTupleType(elementTypes, minLength, hasRestElement);
+                    return createArrayLiteralType(createTupleType(elementTypes, minLength, hasRestElement));
                 }
             }
-            return createArrayType(elementTypes.length ?
+            return createArrayLiteralType(createArrayType(elementTypes.length ?
                 getUnionType(elementTypes, 2 /* Subtype */) :
-                strictNullChecks ? implicitNeverType : undefinedWideningType, inConstContext);
+                strictNullChecks ? implicitNeverType : undefinedWideningType, inConstContext));
+        }
+        function createArrayLiteralType(type) {
+            if (!(ts.getObjectFlags(type) & 4 /* Reference */)) {
+                return type;
+            }
+            var literalType = type.literalType;
+            if (!literalType) {
+                literalType = type.literalType = cloneTypeReference(type);
+                literalType.objectFlags |= 65536 /* ArrayLiteral */ | 524288 /* ContainsObjectOrArrayLiteral */;
+            }
+            return literalType;
         }
         function getArrayLiteralTupleTypeIfApplicable(elementTypes, contextualType, hasRestElement, elementCount, readonly) {
             if (elementCount === void 0) { elementCount = elementTypes.length; }
             if (readonly === void 0) { readonly = false; }
             // Infer a tuple type when the contextual type is or contains a tuple-like type
             if (readonly || (contextualType && forEachType(contextualType, isTupleLikeType))) {
-                var minLength = elementCount - (hasRestElement ? 1 : 0);
-                var pattern = contextualType && contextualType.pattern;
-                // If array literal is contextually typed by a binding pattern or an assignment pattern, pad the resulting
-                // tuple type with the corresponding binding or assignment element types to make the lengths equal.
-                if (!hasRestElement && pattern && (pattern.kind === 185 /* ArrayBindingPattern */ || pattern.kind === 187 /* ArrayLiteralExpression */)) {
-                    var patternElements = pattern.elements;
-                    for (var i = elementCount; i < patternElements.length; i++) {
-                        var e = patternElements[i];
-                        if (hasDefaultValue(e)) {
-                            elementTypes.push(contextualType.typeArguments[i]);
-                        }
-                        else if (i < patternElements.length - 1 || !(e.kind === 186 /* BindingElement */ && e.dotDotDotToken || e.kind === 208 /* SpreadElement */)) {
-                            if (e.kind !== 210 /* OmittedExpression */) {
-                                error(e, ts.Diagnostics.Initializer_provides_no_value_for_this_binding_element_and_the_binding_element_has_no_default_value);
-                            }
-                            elementTypes.push(strictNullChecks ? implicitNeverType : undefinedWideningType);
-                        }
-                    }
-                }
-                return createTupleType(elementTypes, minLength, hasRestElement, readonly);
+                return createTupleType(elementTypes, elementCount - (hasRestElement ? 1 : 0), hasRestElement, readonly);
             }
         }
         function isNumericName(name) {
             switch (name.kind) {
-                case 149 /* ComputedPropertyName */:
+                case 150 /* ComputedPropertyName */:
                     return isNumericComputedName(name);
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return isNumericLiteralName(name.escapedText);
                 case 8 /* NumericLiteral */:
                 case 10 /* StringLiteral */:
@@ -48286,7 +49697,7 @@ var ts;
             var spread = emptyObjectType;
             var contextualType = getApparentTypeOfContextualType(node);
             var contextualTypeHasPattern = contextualType && contextualType.pattern &&
-                (contextualType.pattern.kind === 184 /* ObjectBindingPattern */ || contextualType.pattern.kind === 188 /* ObjectLiteralExpression */);
+                (contextualType.pattern.kind === 185 /* ObjectBindingPattern */ || contextualType.pattern.kind === 189 /* ObjectLiteralExpression */);
             var inConstContext = isConstContext(node);
             var checkFlags = inConstContext ? 8 /* Readonly */ : 0;
             var isInJavascript = ts.isInJSFile(node) && !ts.isInJsonFile(node);
@@ -48301,13 +49712,13 @@ var ts;
             for (var i = 0; i < node.properties.length; i++) {
                 var memberDecl = node.properties[i];
                 var member = getSymbolOfNode(memberDecl);
-                var computedNameType = memberDecl.name && memberDecl.name.kind === 149 /* ComputedPropertyName */ && !ts.isWellKnownSymbolSyntactically(memberDecl.name.expression) ?
+                var computedNameType = memberDecl.name && memberDecl.name.kind === 150 /* ComputedPropertyName */ && !ts.isWellKnownSymbolSyntactically(memberDecl.name.expression) ?
                     checkComputedPropertyName(memberDecl.name) : undefined;
-                if (memberDecl.kind === 275 /* PropertyAssignment */ ||
-                    memberDecl.kind === 276 /* ShorthandPropertyAssignment */ ||
+                if (memberDecl.kind === 276 /* PropertyAssignment */ ||
+                    memberDecl.kind === 277 /* ShorthandPropertyAssignment */ ||
                     ts.isObjectLiteralMethod(memberDecl)) {
-                    var type = memberDecl.kind === 275 /* PropertyAssignment */ ? checkPropertyAssignment(memberDecl, checkMode) :
-                        memberDecl.kind === 276 /* ShorthandPropertyAssignment */ ? checkExpressionForMutableLocation(memberDecl.name, checkMode) :
+                    var type = memberDecl.kind === 276 /* PropertyAssignment */ ? checkPropertyAssignment(memberDecl, checkMode) :
+                        memberDecl.kind === 277 /* ShorthandPropertyAssignment */ ? checkExpressionForMutableLocation(memberDecl.name, checkMode) :
                             checkObjectLiteralMethod(memberDecl, checkMode);
                     if (isInJavascript) {
                         var jsDocType = getTypeForDeclarationFromJSDocComment(memberDecl);
@@ -48319,10 +49730,10 @@ var ts;
                             checkTypeAssignableTo(type, getTypeFromTypeNode(enumTag.typeExpression), memberDecl);
                         }
                     }
-                    objectFlags |= ts.getObjectFlags(type) & 917504 /* PropagatingFlags */;
+                    objectFlags |= ts.getObjectFlags(type) & 1835008 /* PropagatingFlags */;
                     var nameType = computedNameType && isTypeUsableAsPropertyName(computedNameType) ? computedNameType : undefined;
                     var prop = nameType ?
-                        createSymbol(4 /* Property */ | member.flags, getPropertyNameFromType(nameType), checkFlags | 2048 /* Late */) :
+                        createSymbol(4 /* Property */ | member.flags, getPropertyNameFromType(nameType), checkFlags | 4096 /* Late */) :
                         createSymbol(4 /* Property */ | member.flags, member.escapedName, checkFlags);
                     if (nameType) {
                         prop.nameType = nameType;
@@ -48330,8 +49741,8 @@ var ts;
                     if (inDestructuringPattern) {
                         // If object literal is an assignment pattern and if the assignment pattern specifies a default value
                         // for the property, make the property optional.
-                        var isOptional = (memberDecl.kind === 275 /* PropertyAssignment */ && hasDefaultValue(memberDecl.initializer)) ||
-                            (memberDecl.kind === 276 /* ShorthandPropertyAssignment */ && memberDecl.objectAssignmentInitializer);
+                        var isOptional = (memberDecl.kind === 276 /* PropertyAssignment */ && hasDefaultValue(memberDecl.initializer)) ||
+                            (memberDecl.kind === 277 /* ShorthandPropertyAssignment */ && memberDecl.objectAssignmentInitializer);
                         if (isOptional) {
                             prop.flags |= 16777216 /* Optional */;
                         }
@@ -48356,7 +49767,7 @@ var ts;
                     prop.target = member;
                     member = prop;
                 }
-                else if (memberDecl.kind === 277 /* SpreadAssignment */) {
+                else if (memberDecl.kind === 278 /* SpreadAssignment */) {
                     if (languageVersion < 2 /* ES2015 */) {
                         checkExternalEmitHelpers(memberDecl, 2 /* Assign */);
                     }
@@ -48382,7 +49793,7 @@ var ts;
                     // an ordinary function declaration(section 6.1) with no parameters.
                     // A set accessor declaration is processed in the same manner
                     // as an ordinary function declaration with a single parameter and a Void return type.
-                    ts.Debug.assert(memberDecl.kind === 158 /* GetAccessor */ || memberDecl.kind === 159 /* SetAccessor */);
+                    ts.Debug.assert(memberDecl.kind === 159 /* GetAccessor */ || memberDecl.kind === 160 /* SetAccessor */);
                     checkNodeDeferred(memberDecl);
                 }
                 if (computedNameType && !(computedNameType.flags & 8576 /* StringOrNumberLiteralOrUnique */)) {
@@ -48428,7 +49839,7 @@ var ts;
                 var stringIndexInfo = hasComputedStringProperty ? getObjectLiteralIndexInfo(node, offset, propertiesArray, 0 /* String */) : undefined;
                 var numberIndexInfo = hasComputedNumberProperty ? getObjectLiteralIndexInfo(node, offset, propertiesArray, 1 /* Number */) : undefined;
                 var result = createAnonymousType(node.symbol, propertiesTable, ts.emptyArray, ts.emptyArray, stringIndexInfo, numberIndexInfo);
-                result.objectFlags |= objectFlags | 128 /* ObjectLiteral */ | 262144 /* ContainsObjectLiteral */;
+                result.objectFlags |= objectFlags | 128 /* ObjectLiteral */ | 524288 /* ContainsObjectOrArrayLiteral */;
                 if (isJSObjectLiteral) {
                     result.objectFlags |= 16384 /* JSLiteral */;
                 }
@@ -48490,7 +49901,7 @@ var ts;
          * Returns true iff React would emit this tag name as a string rather than an identifier or qualified name
          */
         function isJsxIntrinsicIdentifier(tagName) {
-            return tagName.kind === 72 /* Identifier */ && ts.isIntrinsicJsxName(tagName.escapedText);
+            return tagName.kind === 73 /* Identifier */ && ts.isIntrinsicJsxName(tagName.escapedText);
         }
         function checkJsxAttribute(node, checkMode) {
             return node.initializer
@@ -48520,7 +49931,7 @@ var ts;
                 var member = attributeDecl.symbol;
                 if (ts.isJsxAttribute(attributeDecl)) {
                     var exprType = checkJsxAttribute(attributeDecl, checkMode);
-                    objectFlags |= ts.getObjectFlags(exprType) & 917504 /* PropagatingFlags */;
+                    objectFlags |= ts.getObjectFlags(exprType) & 1835008 /* PropagatingFlags */;
                     var attributeSymbol = createSymbol(4 /* Property */ | 33554432 /* Transient */ | member.flags, member.escapedName);
                     attributeSymbol.declarations = member.declarations;
                     attributeSymbol.parent = member.parent;
@@ -48535,7 +49946,7 @@ var ts;
                     }
                 }
                 else {
-                    ts.Debug.assert(attributeDecl.kind === 269 /* JsxSpreadAttribute */);
+                    ts.Debug.assert(attributeDecl.kind === 270 /* JsxSpreadAttribute */);
                     if (attributesTable.size > 0) {
                         spread = getSpreadType(spread, createJsxAttributesType(), attributes.symbol, objectFlags, /*readonly*/ false);
                         attributesTable = ts.createSymbolTable();
@@ -48558,7 +49969,7 @@ var ts;
                 }
             }
             // Handle children attribute
-            var parent = openingLikeElement.parent.kind === 260 /* JsxElement */ ? openingLikeElement.parent : undefined;
+            var parent = openingLikeElement.parent.kind === 261 /* JsxElement */ ? openingLikeElement.parent : undefined;
             // We have to check that openingElement of the parent is the one we are visiting as this may not be true for selfClosingElement
             if (parent && parent.openingElement === openingLikeElement && parent.children.length > 0) {
                 var childrenTypes = checkJsxChildren(parent, checkMode);
@@ -48600,7 +50011,7 @@ var ts;
             function createJsxAttributesType() {
                 objectFlags |= freshObjectLiteralFlag;
                 var result = createAnonymousType(attributes.symbol, attributesTable, ts.emptyArray, ts.emptyArray, /*stringIndexInfo*/ undefined, /*numberIndexInfo*/ undefined);
-                result.objectFlags |= objectFlags | 128 /* ObjectLiteral */ | 262144 /* ContainsObjectLiteral */;
+                result.objectFlags |= objectFlags | 128 /* ObjectLiteral */ | 524288 /* ContainsObjectOrArrayLiteral */;
                 return result;
             }
         }
@@ -48611,7 +50022,7 @@ var ts;
                 // In React, JSX text that contains only whitespaces will be ignored so we don't want to type-check that
                 // because then type of children property will have constituent of string type.
                 if (child.kind === 11 /* JsxText */) {
-                    if (!child.containsOnlyWhiteSpaces) {
+                    if (!child.containsOnlyTriviaWhiteSpaces) {
                         childrenTypes.push(stringType);
                     }
                 }
@@ -48938,6 +50349,7 @@ var ts;
                 type.flags & 2097152 /* Intersection */ && ts.every(type.types, isExcessPropertyCheckTarget));
         }
         function checkJsxExpression(node, checkMode) {
+            checkGrammarJsxExpression(node);
             if (node.expression) {
                 var type = checkExpression(node.expression, checkMode);
                 if (node.dotDotDotToken && type !== anyType && !isArrayType(type)) {
@@ -48976,8 +50388,8 @@ var ts;
          */
         function checkPropertyAccessibility(node, isSuper, type, prop) {
             var flags = ts.getDeclarationModifierFlagsFromSymbol(prop);
-            var errorNode = node.kind === 148 /* QualifiedName */ ? node.right : node.kind === 183 /* ImportType */ ? node : node.name;
-            if (ts.getCheckFlags(prop) & 512 /* ContainsPrivate */) {
+            var errorNode = node.kind === 149 /* QualifiedName */ ? node.right : node.kind === 184 /* ImportType */ ? node : node.name;
+            if (ts.getCheckFlags(prop) & 1024 /* ContainsPrivate */) {
                 // Synthetic property with private constituent property
                 error(errorNode, ts.Diagnostics.Property_0_has_conflicting_declarations_and_is_inaccessible_in_type_1, symbolToString(prop), typeToString(type));
                 return false;
@@ -49082,7 +50494,7 @@ var ts;
             return type;
         }
         function checkNonNullType(type, node, nullDiagnostic, undefinedDiagnostic, nullOrUndefinedDiagnostic) {
-            if (type.flags & 2 /* Unknown */) {
+            if (strictNullChecks && type.flags & 2 /* Unknown */) {
                 error(node, ts.Diagnostics.Object_is_of_type_unknown);
                 return errorType;
             }
@@ -49097,42 +50509,58 @@ var ts;
             }
             return type;
         }
+        function checkNonNullNonVoidType(type, node) {
+            var nonNullType = checkNonNullType(type, node);
+            if (nonNullType !== errorType && nonNullType.flags & 16384 /* Void */) {
+                error(node, ts.Diagnostics.Object_is_possibly_undefined);
+            }
+            return nonNullType;
+        }
         function checkPropertyAccessExpression(node) {
             return checkPropertyAccessExpressionOrQualifiedName(node, node.expression, node.name);
         }
         function checkQualifiedName(node) {
             return checkPropertyAccessExpressionOrQualifiedName(node, node.left, node.right);
         }
+        function isMethodAccessForCall(node) {
+            while (node.parent.kind === 196 /* ParenthesizedExpression */) {
+                node = node.parent;
+            }
+            return ts.isCallOrNewExpression(node.parent) && node.parent.expression === node;
+        }
         function checkPropertyAccessExpressionOrQualifiedName(node, left, right) {
             var propType;
             var leftType = checkNonNullExpression(left);
             var parentSymbol = getNodeLinks(left).resolvedSymbol;
-            var apparentType = getApparentType(getWidenedType(leftType));
+            var assignmentKind = ts.getAssignmentTargetKind(node);
+            var apparentType = getApparentType(assignmentKind !== 0 /* None */ || isMethodAccessForCall(node) ? getWidenedType(leftType) : leftType);
             if (isTypeAny(apparentType) || apparentType === silentNeverType) {
                 if (ts.isIdentifier(left) && parentSymbol) {
                     markAliasReferenced(parentSymbol, node);
                 }
                 return apparentType;
             }
-            var assignmentKind = ts.getAssignmentTargetKind(node);
             var prop = getPropertyOfType(apparentType, right.escapedText);
             if (ts.isIdentifier(left) && parentSymbol && !(prop && isConstEnumOrConstEnumOnlyModule(prop))) {
                 markAliasReferenced(parentSymbol, node);
             }
             if (!prop) {
-                var indexInfo = getIndexInfoOfType(apparentType, 0 /* String */);
+                var indexInfo = assignmentKind === 0 /* None */ || !isGenericObjectType(leftType) || isThisTypeParameter(leftType) ? getIndexInfoOfType(apparentType, 0 /* String */) : undefined;
                 if (!(indexInfo && indexInfo.type)) {
                     if (isJSLiteralType(leftType)) {
                         return anyType;
                     }
                     if (leftType.symbol === globalThisSymbol) {
-                        if (noImplicitAny) {
+                        if (globalThisSymbol.exports.has(right.escapedText) && (globalThisSymbol.exports.get(right.escapedText).flags & 418 /* BlockScoped */)) {
+                            error(right, ts.Diagnostics.Property_0_does_not_exist_on_type_1, ts.unescapeLeadingUnderscores(right.escapedText), typeToString(leftType));
+                        }
+                        else if (noImplicitAny) {
                             error(right, ts.Diagnostics.Element_implicitly_has_an_any_type_because_type_0_has_no_index_signature, typeToString(leftType));
                         }
                         return anyType;
                     }
                     if (right.escapedText && !checkAndReportErrorForExtendingInterface(node)) {
-                        reportNonexistentProperty(right, leftType.flags & 262144 /* TypeParameter */ && leftType.isThisType ? apparentType : leftType);
+                        reportNonexistentProperty(right, isThisTypeParameter(leftType) ? apparentType : leftType);
                     }
                     return errorType;
                 }
@@ -49143,9 +50571,9 @@ var ts;
             }
             else {
                 checkPropertyNotUsedBeforeDeclaration(prop, node, right);
-                markPropertyAsReferenced(prop, node, left.kind === 100 /* ThisKeyword */);
+                markPropertyAsReferenced(prop, node, left.kind === 101 /* ThisKeyword */);
                 getNodeLinks(node).resolvedSymbol = prop;
-                checkPropertyAccessibility(node, left.kind === 98 /* SuperKeyword */, apparentType, prop);
+                checkPropertyAccessibility(node, left.kind === 99 /* SuperKeyword */, apparentType, prop);
                 if (assignmentKind) {
                     if (isReferenceToReadonlyEntity(node, prop) || isReferenceThroughNamespaceImport(node)) {
                         error(right, ts.Diagnostics.Cannot_assign_to_0_because_it_is_a_read_only_property, ts.idText(right));
@@ -49154,10 +50582,14 @@ var ts;
                 }
                 propType = getConstraintForLocation(getTypeOfSymbol(prop), node);
             }
+            return getFlowTypeOfAccessExpression(node, prop, propType, right);
+        }
+        function getFlowTypeOfAccessExpression(node, prop, propType, errorNode) {
             // Only compute control flow type if this is a property access expression that isn't an
             // assignment target, and the referenced property was declared as a variable, property,
             // accessor, or optional method.
-            if (node.kind !== 189 /* PropertyAccessExpression */ ||
+            var assignmentKind = ts.getAssignmentTargetKind(node);
+            if (node.kind !== 191 /* ElementAccessExpression */ && node.kind !== 190 /* PropertyAccessExpression */ ||
                 assignmentKind === 1 /* Definite */ ||
                 prop && !(prop.flags & (3 /* Variable */ | 4 /* Property */ | 98304 /* Accessor */)) && !(prop.flags & 8192 /* Method */ && propType.flags & 1048576 /* Union */)) {
                 return propType;
@@ -49167,11 +50599,11 @@ var ts;
             // and if we are in a constructor of the same class as the property declaration, assume that
             // the property is uninitialized at the top of the control flow.
             var assumeUninitialized = false;
-            if (strictNullChecks && strictPropertyInitialization && left.kind === 100 /* ThisKeyword */) {
+            if (strictNullChecks && strictPropertyInitialization && node.expression.kind === 101 /* ThisKeyword */) {
                 var declaration = prop && prop.valueDeclaration;
                 if (declaration && isInstancePropertyWithoutInitializer(declaration)) {
                     var flowContainer = getControlFlowContainer(node);
-                    if (flowContainer.kind === 157 /* Constructor */ && flowContainer.parent === declaration.parent) {
+                    if (flowContainer.kind === 158 /* Constructor */ && flowContainer.parent === declaration.parent) {
                         assumeUninitialized = true;
                     }
                 }
@@ -49184,7 +50616,7 @@ var ts;
             }
             var flowType = getFlowTypeOfReference(node, propType, assumeUninitialized ? getOptionalType(propType) : propType);
             if (assumeUninitialized && !(getFalsyFlags(propType) & 32768 /* Undefined */) && getFalsyFlags(flowType) & 32768 /* Undefined */) {
-                error(right, ts.Diagnostics.Property_0_is_used_before_being_assigned, symbolToString(prop)); // TODO: GH#18217
+                error(errorNode, ts.Diagnostics.Property_0_is_used_before_being_assigned, symbolToString(prop)); // TODO: GH#18217
                 // Return the declared type to reduce follow-on errors
                 return propType;
             }
@@ -49202,35 +50634,35 @@ var ts;
                 && !isPropertyDeclaredInAncestorClass(prop)) {
                 diagnosticMessage = error(right, ts.Diagnostics.Property_0_is_used_before_its_initialization, declarationName);
             }
-            else if (valueDeclaration.kind === 240 /* ClassDeclaration */ &&
-                node.parent.kind !== 164 /* TypeReference */ &&
+            else if (valueDeclaration.kind === 241 /* ClassDeclaration */ &&
+                node.parent.kind !== 165 /* TypeReference */ &&
                 !(valueDeclaration.flags & 4194304 /* Ambient */) &&
                 !isBlockScopedNameDeclaredBeforeUse(valueDeclaration, right)) {
                 diagnosticMessage = error(right, ts.Diagnostics.Class_0_used_before_its_declaration, declarationName);
             }
             if (diagnosticMessage) {
-                addRelatedInfo(diagnosticMessage, ts.createDiagnosticForNode(valueDeclaration, ts.Diagnostics._0_is_declared_here, declarationName));
+                ts.addRelatedInfo(diagnosticMessage, ts.createDiagnosticForNode(valueDeclaration, ts.Diagnostics._0_is_declared_here, declarationName));
             }
         }
         function isInPropertyInitializer(node) {
             return !!ts.findAncestor(node, function (node) {
                 switch (node.kind) {
-                    case 154 /* PropertyDeclaration */:
+                    case 155 /* PropertyDeclaration */:
                         return true;
-                    case 275 /* PropertyAssignment */:
-                    case 156 /* MethodDeclaration */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
-                    case 277 /* SpreadAssignment */:
-                    case 149 /* ComputedPropertyName */:
-                    case 216 /* TemplateSpan */:
-                    case 270 /* JsxExpression */:
-                    case 267 /* JsxAttribute */:
-                    case 268 /* JsxAttributes */:
-                    case 269 /* JsxSpreadAttribute */:
-                    case 262 /* JsxOpeningElement */:
-                    case 211 /* ExpressionWithTypeArguments */:
-                    case 273 /* HeritageClause */:
+                    case 276 /* PropertyAssignment */:
+                    case 157 /* MethodDeclaration */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
+                    case 278 /* SpreadAssignment */:
+                    case 150 /* ComputedPropertyName */:
+                    case 217 /* TemplateSpan */:
+                    case 271 /* JsxExpression */:
+                    case 268 /* JsxAttribute */:
+                    case 269 /* JsxAttributes */:
+                    case 270 /* JsxSpreadAttribute */:
+                    case 263 /* JsxOpeningElement */:
+                    case 212 /* ExpressionWithTypeArguments */:
+                    case 274 /* HeritageClause */:
                         return false;
                     default:
                         return ts.isExpressionNode(node) ? false : "quit";
@@ -49282,7 +50714,8 @@ var ts;
             else {
                 var promisedType = getPromisedTypeOfPromise(containingType);
                 if (promisedType && getPropertyOfType(promisedType, propNode.escapedText)) {
-                    errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.Property_0_does_not_exist_on_type_1_Did_you_forget_to_use_await, ts.declarationNameToString(propNode), typeToString(containingType));
+                    errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.Property_0_does_not_exist_on_type_1, ts.declarationNameToString(propNode), typeToString(containingType));
+                    relatedInfo = ts.createDiagnosticForNode(propNode, ts.Diagnostics.Did_you_forget_to_use_await);
                 }
                 else {
                     var suggestion = getSuggestedSymbolForNonexistentProperty(propNode, containingType);
@@ -49298,7 +50731,7 @@ var ts;
             }
             var resultDiagnostic = ts.createDiagnosticForNodeFromMessageChain(propNode, errorInfo);
             if (relatedInfo) {
-                addRelatedInfo(resultDiagnostic, relatedInfo);
+                ts.addRelatedInfo(resultDiagnostic, relatedInfo);
             }
             diagnostics.add(resultDiagnostic);
         }
@@ -49336,6 +50769,32 @@ var ts;
             var suggestion = getSuggestedSymbolForNonexistentModule(name, targetModule);
             return suggestion && ts.symbolName(suggestion);
         }
+        function getSuggestionForNonexistentIndexSignature(objectType, expr) {
+            // check if object type has setter or getter
+            var hasProp = function (name, argCount) {
+                if (argCount === void 0) { argCount = 1; }
+                var prop = getPropertyOfObjectType(objectType, name);
+                if (prop) {
+                    var s = getSingleCallSignature(getTypeOfSymbol(prop));
+                    if (s && getMinArgumentCount(s) === argCount && typeToString(getTypeAtPosition(s, 0)) === "string") {
+                        return true;
+                    }
+                }
+                return false;
+            };
+            var suggestedMethod = ts.isAssignmentTarget(expr) ? "set" : "get";
+            if (!hasProp(suggestedMethod)) {
+                return undefined;
+            }
+            var suggestion = ts.tryGetPropertyAccessOrIdentifierToString(expr);
+            if (suggestion === undefined) {
+                suggestion = suggestedMethod;
+            }
+            else {
+                suggestion += "." + suggestedMethod;
+            }
+            return suggestion;
+        }
         /**
          * Given a name and a list of symbols whose names are *not* equal to the name, return a spelling suggestion if there is one that is close enough.
          * Names less than length 3 only check for case-insensitive equality, not levenshtein distance.
@@ -49376,34 +50835,17 @@ var ts;
         }
         function isValidPropertyAccess(node, propertyName) {
             switch (node.kind) {
-                case 189 /* PropertyAccessExpression */:
-                    return isValidPropertyAccessWithType(node, node.expression.kind === 98 /* SuperKeyword */, propertyName, getWidenedType(checkExpression(node.expression)));
-                case 148 /* QualifiedName */:
+                case 190 /* PropertyAccessExpression */:
+                    return isValidPropertyAccessWithType(node, node.expression.kind === 99 /* SuperKeyword */, propertyName, getWidenedType(checkExpression(node.expression)));
+                case 149 /* QualifiedName */:
                     return isValidPropertyAccessWithType(node, /*isSuper*/ false, propertyName, getWidenedType(checkExpression(node.left)));
-                case 183 /* ImportType */:
+                case 184 /* ImportType */:
                     return isValidPropertyAccessWithType(node, /*isSuper*/ false, propertyName, getTypeFromTypeNode(node));
             }
         }
         function isValidPropertyAccessForCompletions(node, type, property) {
-            return isValidPropertyAccessWithType(node, node.kind === 189 /* PropertyAccessExpression */ && node.expression.kind === 98 /* SuperKeyword */, property.escapedName, type)
-                && (!(property.flags & 8192 /* Method */) || isValidMethodAccess(property, type));
-        }
-        function isValidMethodAccess(method, actualThisType) {
-            var propType = getTypeOfPropertyOfType(actualThisType, method.escapedName);
-            var signatures = getSignaturesOfType(getNonNullableType(propType), 0 /* Call */);
-            ts.Debug.assert(signatures.length !== 0);
-            return signatures.some(function (sig) {
-                var signatureThisType = getThisTypeOfSignature(sig);
-                return !signatureThisType || isTypeAssignableTo(actualThisType, getInstantiatedSignatureThisType(sig, signatureThisType, actualThisType));
-            });
-        }
-        function getInstantiatedSignatureThisType(sig, signatureThisType, actualThisType) {
-            if (!sig.typeParameters) {
-                return signatureThisType;
-            }
-            var context = createInferenceContext(sig.typeParameters, sig, 0 /* None */);
-            inferTypes(context.inferences, actualThisType, signatureThisType);
-            return instantiateType(signatureThisType, createSignatureTypeMapper(sig, getInferredTypes(context)));
+            return isValidPropertyAccessWithType(node, node.kind === 190 /* PropertyAccessExpression */ && node.expression.kind === 99 /* SuperKeyword */, property.escapedName, type);
+            // Previously we validated the 'this' type of methods but this adversely affected performance. See #31377 for more context.
         }
         function isValidPropertyAccessWithType(node, isSuper, propertyName, type) {
             if (type === errorType || isTypeAny(type)) {
@@ -49419,13 +50861,13 @@ var ts;
          */
         function getForInVariableSymbol(node) {
             var initializer = node.initializer;
-            if (initializer.kind === 238 /* VariableDeclarationList */) {
+            if (initializer.kind === 239 /* VariableDeclarationList */) {
                 var variable = initializer.declarations[0];
                 if (variable && !ts.isBindingPattern(variable.name)) {
                     return getSymbolOfNode(variable);
                 }
             }
-            else if (initializer.kind === 72 /* Identifier */) {
+            else if (initializer.kind === 73 /* Identifier */) {
                 return getResolvedSymbol(initializer);
             }
             return undefined;
@@ -49442,13 +50884,13 @@ var ts;
          */
         function isForInVariableForNumericPropertyNames(expr) {
             var e = ts.skipParentheses(expr);
-            if (e.kind === 72 /* Identifier */) {
+            if (e.kind === 73 /* Identifier */) {
                 var symbol = getResolvedSymbol(e);
                 if (symbol.flags & 3 /* Variable */) {
                     var child = expr;
                     var node = expr.parent;
                     while (node) {
-                        if (node.kind === 226 /* ForInStatement */ &&
+                        if (node.kind === 227 /* ForInStatement */ &&
                             child === node.statement &&
                             getForInVariableSymbol(node) === symbol &&
                             hasNumericPropertyNames(getTypeOfExpression(node.expression))) {
@@ -49462,11 +50904,12 @@ var ts;
             return false;
         }
         function checkIndexedAccess(node) {
-            var objectType = checkNonNullExpression(node.expression);
+            var exprType = checkNonNullExpression(node.expression);
+            var objectType = ts.getAssignmentTargetKind(node) !== 0 /* None */ || isMethodAccessForCall(node) ? getWidenedType(exprType) : exprType;
             var indexExpression = node.argumentExpression;
             if (!indexExpression) {
                 var sourceFile = ts.getSourceFileOfNode(node);
-                if (node.parent.kind === 192 /* NewExpression */ && node.parent.expression === node) {
+                if (node.parent.kind === 193 /* NewExpression */ && node.parent.expression === node) {
                     var start = ts.skipTrivia(sourceFile.text, node.expression.end);
                     var end = node.end;
                     grammarErrorAtPos(sourceFile, start, end - start, ts.Diagnostics.new_T_cannot_be_used_to_create_an_array_Use_new_Array_T_instead);
@@ -49486,7 +50929,12 @@ var ts;
                 error(indexExpression, ts.Diagnostics.A_const_enum_member_can_only_be_accessed_using_a_string_literal);
                 return errorType;
             }
-            return checkIndexedAccessIndexType(getIndexedAccessType(objectType, isForInVariableForNumericPropertyNames(indexExpression) ? numberType : indexType, node), node);
+            var effectiveIndexType = isForInVariableForNumericPropertyNames(indexExpression) ? numberType : indexType;
+            var accessFlags = ts.isAssignmentTarget(node) ?
+                2 /* Writing */ | (isGenericObjectType(objectType) && !isThisTypeParameter(objectType) ? 1 /* NoIndexSignatures */ : 0) :
+                0 /* None */;
+            var indexedAccessType = getIndexedAccessTypeOrUndefined(objectType, effectiveIndexType, node, accessFlags) || errorType;
+            return checkIndexedAccessIndexType(getFlowTypeOfAccessExpression(node, indexedAccessType.symbol, indexedAccessType, indexExpression), node);
         }
         function checkThatExpressionIsProperSymbolReference(expression, expressionType, reportError) {
             if (expressionType === errorType) {
@@ -49532,13 +50980,13 @@ var ts;
                 // This gets us diagnostics for the type arguments and marks them as referenced.
                 ts.forEach(node.typeArguments, checkSourceElement);
             }
-            if (node.kind === 193 /* TaggedTemplateExpression */) {
+            if (node.kind === 194 /* TaggedTemplateExpression */) {
                 checkExpression(node.template);
             }
             else if (ts.isJsxOpeningLikeElement(node)) {
                 checkExpression(node.attributes);
             }
-            else if (node.kind !== 152 /* Decorator */) {
+            else if (node.kind !== 153 /* Decorator */) {
                 ts.forEach(node.arguments, function (argument) {
                     checkExpression(argument);
                 });
@@ -49602,7 +51050,7 @@ var ts;
             }
         }
         function isSpreadArgument(arg) {
-            return !!arg && (arg.kind === 208 /* SpreadElement */ || arg.kind === 215 /* SyntheticExpression */ && arg.isSpread);
+            return !!arg && (arg.kind === 209 /* SpreadElement */ || arg.kind === 216 /* SyntheticExpression */ && arg.isSpread);
         }
         function getSpreadArgumentIndex(args) {
             return ts.findIndex(args, isSpreadArgument);
@@ -49616,9 +51064,9 @@ var ts;
             var callIsIncomplete = false; // In incomplete call we want to be lenient when we have too few arguments
             var effectiveParameterCount = getParameterCount(signature);
             var effectiveMinimumArguments = getMinArgumentCount(signature);
-            if (node.kind === 193 /* TaggedTemplateExpression */) {
+            if (node.kind === 194 /* TaggedTemplateExpression */) {
                 argCount = args.length;
-                if (node.template.kind === 206 /* TemplateExpression */) {
+                if (node.template.kind === 207 /* TemplateExpression */) {
                     // If a tagged template expression lacks a tail literal, the call is incomplete.
                     // Specifically, a template only can end in a TemplateTail or a Missing literal.
                     var lastSpan = ts.last(node.template.templateSpans); // we should always have at least one span.
@@ -49633,7 +51081,7 @@ var ts;
                     callIsIncomplete = !!templateLiteral.isUnterminated;
                 }
             }
-            else if (node.kind === 152 /* Decorator */) {
+            else if (node.kind === 153 /* Decorator */) {
                 argCount = getDecoratorArgumentCount(node, signature);
             }
             else if (ts.isJsxOpeningLikeElement(node)) {
@@ -49648,7 +51096,7 @@ var ts;
             else {
                 if (!node.arguments) {
                     // This only happens when we have something of the form: 'new C'
-                    ts.Debug.assert(node.kind === 192 /* NewExpression */);
+                    ts.Debug.assert(node.kind === 193 /* NewExpression */);
                     return getMinArgumentCount(signature) === 0;
                 }
                 argCount = signatureHelpTrailingComma ? args.length + 1 : args.length;
@@ -49687,36 +51135,43 @@ var ts;
         }
         // If type has a single call signature and no other members, return that signature. Otherwise, return undefined.
         function getSingleCallSignature(type) {
+            return getSingleSignature(type, 0 /* Call */, /*allowMembers*/ false);
+        }
+        function getSingleCallOrConstructSignature(type) {
+            return getSingleSignature(type, 0 /* Call */, /*allowMembers*/ false) ||
+                getSingleSignature(type, 1 /* Construct */, /*allowMembers*/ false);
+        }
+        function getSingleSignature(type, kind, allowMembers) {
             if (type.flags & 524288 /* Object */) {
                 var resolved = resolveStructuredTypeMembers(type);
-                if (resolved.callSignatures.length === 1 && resolved.constructSignatures.length === 0 &&
-                    resolved.properties.length === 0 && !resolved.stringIndexInfo && !resolved.numberIndexInfo) {
-                    return resolved.callSignatures[0];
+                if (allowMembers || resolved.properties.length === 0 && !resolved.stringIndexInfo && !resolved.numberIndexInfo) {
+                    if (kind === 0 /* Call */ && resolved.callSignatures.length === 1 && resolved.constructSignatures.length === 0) {
+                        return resolved.callSignatures[0];
+                    }
+                    if (kind === 1 /* Construct */ && resolved.constructSignatures.length === 1 && resolved.callSignatures.length === 0) {
+                        return resolved.constructSignatures[0];
+                    }
                 }
             }
             return undefined;
         }
         // Instantiate a generic signature in the context of a non-generic signature (section 3.8.5 in TypeScript spec)
-        function instantiateSignatureInContextOf(signature, contextualSignature, contextualMapper, compareTypes) {
+        function instantiateSignatureInContextOf(signature, contextualSignature, inferenceContext, compareTypes) {
             var context = createInferenceContext(signature.typeParameters, signature, 0 /* None */, compareTypes);
-            // We clone the contextualMapper to avoid fixing. For example, when the source signature is <T>(x: T) => T[] and
+            // We clone the inferenceContext to avoid fixing. For example, when the source signature is <T>(x: T) => T[] and
             // the contextual signature is (...args: A) => B, we want to infer the element type of A's constraint (say 'any')
             // for T but leave it possible to later infer '[any]' back to A.
             var restType = getEffectiveRestType(contextualSignature);
-            var mapper = contextualMapper && restType && restType.flags & 262144 /* TypeParameter */ ? cloneTypeMapper(contextualMapper) : contextualMapper;
+            var mapper = inferenceContext && (restType && restType.flags & 262144 /* TypeParameter */ ? inferenceContext.nonFixingMapper : inferenceContext.mapper);
             var sourceSignature = mapper ? instantiateSignature(contextualSignature, mapper) : contextualSignature;
-            forEachMatchingParameterType(sourceSignature, signature, function (source, target) {
+            applyToParameterTypes(sourceSignature, signature, function (source, target) {
                 // Type parameters from outer context referenced by source type are fixed by instantiation of the source type
                 inferTypes(context.inferences, source, target);
             });
-            if (!contextualMapper) {
-                inferTypes(context.inferences, getReturnTypeOfSignature(contextualSignature), getReturnTypeOfSignature(signature), 8 /* ReturnType */);
-                var signaturePredicate = getTypePredicateOfSignature(signature);
-                var contextualPredicate = getTypePredicateOfSignature(sourceSignature);
-                if (signaturePredicate && contextualPredicate && signaturePredicate.kind === contextualPredicate.kind &&
-                    (signaturePredicate.kind === 0 /* This */ || signaturePredicate.parameterIndex === contextualPredicate.parameterIndex)) {
-                    inferTypes(context.inferences, contextualPredicate.type, signaturePredicate.type, 8 /* ReturnType */);
-                }
+            if (!inferenceContext) {
+                applyToReturnTypes(contextualSignature, signature, function (source, target) {
+                    inferTypes(context.inferences, source, target, 16 /* ReturnType */);
+                });
             }
             return getSignatureInstantiation(signature, getInferredTypes(context), ts.isInJSFile(contextualSignature.declaration));
         }
@@ -49727,17 +51182,6 @@ var ts;
             return getInferredTypes(context);
         }
         function inferTypeArguments(node, signature, args, checkMode, context) {
-            // Clear out all the inference results from the last time inferTypeArguments was called on this context
-            for (var _i = 0, _a = context.inferences; _i < _a.length; _i++) {
-                var inference = _a[_i];
-                // As an optimization, we don't have to clear (and later recompute) inferred types
-                // for type parameters that have already been fixed on the previous call to inferTypeArguments.
-                // It would be just as correct to reset all of them. But then we'd be repeating the same work
-                // for the type parameters that were fixed, namely the work done by getInferredType.
-                if (!inference.isFixed) {
-                    inference.inferredType = undefined;
-                }
-            }
             if (ts.isJsxOpeningLikeElement(node)) {
                 return inferJsxTypeArguments(node, signature, checkMode, context);
             }
@@ -49745,13 +51189,15 @@ var ts;
             // example, given a 'function wrap<T, U>(cb: (x: T) => U): (x: T) => U' and a call expression
             // 'let f: (x: string) => number = wrap(s => s.length)', we infer from the declared type of 'f' to the
             // return type of 'wrap'.
-            if (node.kind !== 152 /* Decorator */) {
+            if (node.kind !== 153 /* Decorator */) {
                 var contextualType = getContextualType(node);
                 if (contextualType) {
-                    // We clone the contextual mapper to avoid disturbing a resolution in progress for an
+                    // We clone the inference context to avoid disturbing a resolution in progress for an
                     // outer call expression. Effectively we just want a snapshot of whatever has been
                     // inferred for any outer call expression so far.
-                    var instantiatedType = instantiateType(contextualType, cloneTypeMapper(getContextualMapper(node), 1 /* NoDefault */));
+                    var outerContext = getInferenceContext(node);
+                    var outerMapper = getMapperFromContext(cloneInferenceContext(outerContext, 1 /* NoDefault */));
+                    var instantiatedType = instantiateType(contextualType, outerMapper);
                     // If the contextual type is a generic function type with a single call signature, we
                     // instantiate the type with its own type parameters and type arguments. This ensures that
                     // the type parameters are not erased to type any during type inference such that they can
@@ -49765,10 +51211,15 @@ var ts;
                         instantiatedType;
                     var inferenceTargetType = getReturnTypeOfSignature(signature);
                     // Inferences made from return types have lower priority than all other inferences.
-                    inferTypes(context.inferences, inferenceSourceType, inferenceTargetType, 8 /* ReturnType */);
+                    inferTypes(context.inferences, inferenceSourceType, inferenceTargetType, 16 /* ReturnType */);
                     // Create a type mapper for instantiating generic contextual types using the inferences made
-                    // from the return type.
-                    context.returnMapper = cloneInferredPartOfContext(context);
+                    // from the return type. We need a separate inference pass here because (a) instantiation of
+                    // the source type uses the outer context's return mapper (which excludes inferences made from
+                    // outer arguments), and (b) we don't want any further inferences going into this context.
+                    var returnContext = createInferenceContext(signature.typeParameters, signature, context.flags);
+                    var returnSourceType = instantiateType(contextualType, outerContext && outerContext.returnMapper);
+                    inferTypes(returnContext.inferences, returnSourceType, inferenceTargetType);
+                    context.returnMapper = ts.some(returnContext.inferences, hasInferenceCandidates) ? getMapperFromContext(returnContext) : undefined;
                 }
             }
             var thisType = getThisTypeOfSignature(signature);
@@ -49781,7 +51232,7 @@ var ts;
             var argCount = restType ? Math.min(getParameterCount(signature) - 1, args.length) : args.length;
             for (var i = 0; i < argCount; i++) {
                 var arg = args[i];
-                if (arg.kind !== 210 /* OmittedExpression */) {
+                if (arg.kind !== 211 /* OmittedExpression */) {
                     var paramType = getTypeAtPosition(signature, i);
                     var argType = checkExpressionWithContextualType(arg, paramType, context, checkMode);
                     inferTypes(context.inferences, argType, paramType);
@@ -49795,7 +51246,7 @@ var ts;
         }
         function getArrayifiedType(type) {
             if (forEachType(type, function (t) { return !(t.flags & (1 /* Any */ | 63176704 /* Instantiable */) || isArrayType(t) || isTupleType(t)); })) {
-                return createArrayType(getIndexTypeOfType(type, 1 /* Number */) || errorType);
+                return createArrayType(getIndexedAccessType(type, numberType));
             }
             return type;
         }
@@ -49805,20 +51256,20 @@ var ts;
                 if (isSpreadArgument(arg)) {
                     // We are inferring from a spread expression in the last argument position, i.e. both the parameter
                     // and the argument are ...x forms.
-                    return arg.kind === 215 /* SyntheticExpression */ ?
+                    return arg.kind === 216 /* SyntheticExpression */ ?
                         createArrayType(arg.type) :
                         getArrayifiedType(checkExpressionWithContextualType(arg.expression, restType, context, 0 /* Normal */));
                 }
             }
-            var contextualType = getIndexTypeOfType(restType, 1 /* Number */) || anyType;
-            var hasPrimitiveContextualType = maybeTypeOfKind(contextualType, 131068 /* Primitive */ | 4194304 /* Index */);
             var types = [];
             var spreadIndex = -1;
             for (var i = index; i < argCount; i++) {
+                var contextualType = getIndexedAccessType(restType, getLiteralType(i - index));
                 var argType = checkExpressionWithContextualType(args[i], contextualType, context, 0 /* Normal */);
                 if (spreadIndex < 0 && isSpreadArgument(args[i])) {
                     spreadIndex = i - index;
                 }
+                var hasPrimitiveContextualType = maybeTypeOfKind(contextualType, 131068 /* Primitive */ | 4194304 /* Index */);
                 types.push(hasPrimitiveContextualType ? getRegularTypeOfLiteralType(argType) : getWidenedLiteralType(argType));
             }
             return spreadIndex < 0 ?
@@ -49866,20 +51317,26 @@ var ts;
          * @param signature a candidate signature we are trying whether it is a call signature
          * @param relation a relationship to check parameter and argument type
          */
-        function checkApplicableSignatureForJsxOpeningLikeElement(node, signature, relation, checkMode, reportErrors) {
+        function checkApplicableSignatureForJsxOpeningLikeElement(node, signature, relation, checkMode, reportErrors, containingMessageChain, errorOutputContainer) {
             // Stateless function components can have maximum of three arguments: "props", "context", and "updater".
             // However "context" and "updater" are implicit and can't be specify by users. Only the first parameter, props,
             // can be specified by users through attributes property.
             var paramType = getEffectiveFirstArgumentForJsxSignature(signature, node);
-            var attributesType = checkExpressionWithContextualType(node.attributes, paramType, /*contextualMapper*/ undefined, checkMode);
-            return checkTypeRelatedToAndOptionallyElaborate(attributesType, paramType, relation, reportErrors ? node.tagName : undefined, node.attributes);
+            var attributesType = checkExpressionWithContextualType(node.attributes, paramType, /*inferenceContext*/ undefined, checkMode);
+            return checkTypeRelatedToAndOptionallyElaborate(attributesType, paramType, relation, reportErrors ? node.tagName : undefined, node.attributes, 
+            /*headMessage*/ undefined, containingMessageChain, errorOutputContainer);
         }
-        function checkApplicableSignature(node, args, signature, relation, checkMode, reportErrors) {
+        function getSignatureApplicabilityError(node, args, signature, relation, checkMode, reportErrors, containingMessageChain) {
+            var errorOutputContainer = { errors: undefined, skipLogging: true };
             if (ts.isJsxOpeningLikeElement(node)) {
-                return checkApplicableSignatureForJsxOpeningLikeElement(node, signature, relation, checkMode, reportErrors);
+                if (!checkApplicableSignatureForJsxOpeningLikeElement(node, signature, relation, checkMode, reportErrors, containingMessageChain, errorOutputContainer)) {
+                    ts.Debug.assert(!reportErrors || !!errorOutputContainer.errors, "jsx should have errors when reporting errors");
+                    return errorOutputContainer.errors || [];
+                }
+                return undefined;
             }
             var thisType = getThisTypeOfSignature(signature);
-            if (thisType && thisType !== voidType && node.kind !== 192 /* NewExpression */) {
+            if (thisType && thisType !== voidType && node.kind !== 193 /* NewExpression */) {
                 // If the called expression is not of the form `x.f` or `x["f"]`, then sourceType = voidType
                 // If the signature's 'this' type is voidType, then the check is skipped -- anything is compatible.
                 // If the expression is a new expression, then the check is skipped.
@@ -49887,8 +51344,9 @@ var ts;
                 var thisArgumentType = thisArgumentNode ? checkExpression(thisArgumentNode) : voidType;
                 var errorNode = reportErrors ? (thisArgumentNode || node) : undefined;
                 var headMessage_1 = ts.Diagnostics.The_this_context_of_type_0_is_not_assignable_to_method_s_this_of_type_1;
-                if (!checkTypeRelatedTo(thisArgumentType, thisType, relation, errorNode, headMessage_1)) {
-                    return false;
+                if (!checkTypeRelatedTo(thisArgumentType, thisType, relation, errorNode, headMessage_1, containingMessageChain, errorOutputContainer)) {
+                    ts.Debug.assert(!reportErrors || !!errorOutputContainer.errors, "this parameter should have errors when reporting errors");
+                    return errorOutputContainer.errors || [];
                 }
             }
             var headMessage = ts.Diagnostics.Argument_of_type_0_is_not_assignable_to_parameter_of_type_1;
@@ -49896,38 +51354,56 @@ var ts;
             var argCount = restType ? Math.min(getParameterCount(signature) - 1, args.length) : args.length;
             for (var i = 0; i < argCount; i++) {
                 var arg = args[i];
-                if (arg.kind !== 210 /* OmittedExpression */) {
+                if (arg.kind !== 211 /* OmittedExpression */) {
                     var paramType = getTypeAtPosition(signature, i);
-                    var argType = checkExpressionWithContextualType(arg, paramType, /*contextualMapper*/ undefined, checkMode);
+                    var argType = checkExpressionWithContextualType(arg, paramType, /*inferenceContext*/ undefined, checkMode);
                     // If one or more arguments are still excluded (as indicated by CheckMode.SkipContextSensitive),
                     // we obtain the regular type of any object literal arguments because we may not have inferred complete
                     // parameter types yet and therefore excess property checks may yield false positives (see #17041).
                     var checkArgType = checkMode & 4 /* SkipContextSensitive */ ? getRegularTypeOfObjectLiteral(argType) : argType;
-                    if (!checkTypeRelatedToAndOptionallyElaborate(checkArgType, paramType, relation, reportErrors ? arg : undefined, arg, headMessage)) {
-                        return false;
+                    if (!checkTypeRelatedToAndOptionallyElaborate(checkArgType, paramType, relation, reportErrors ? arg : undefined, arg, headMessage, containingMessageChain, errorOutputContainer)) {
+                        ts.Debug.assert(!reportErrors || !!errorOutputContainer.errors, "parameter should have errors when reporting errors");
+                        maybeAddMissingAwaitInfo(arg, checkArgType, paramType);
+                        return errorOutputContainer.errors || [];
                     }
                 }
             }
             if (restType) {
                 var spreadType = getSpreadArgumentType(args, argCount, args.length, restType, /*context*/ undefined);
                 var errorNode = reportErrors ? argCount < args.length ? args[argCount] : node : undefined;
-                return checkTypeRelatedTo(spreadType, restType, relation, errorNode, headMessage);
+                if (!checkTypeRelatedTo(spreadType, restType, relation, errorNode, headMessage, /*containingMessageChain*/ undefined, errorOutputContainer)) {
+                    ts.Debug.assert(!reportErrors || !!errorOutputContainer.errors, "rest parameter should have errors when reporting errors");
+                    maybeAddMissingAwaitInfo(errorNode, spreadType, restType);
+                    return errorOutputContainer.errors || [];
+                }
+            }
+            return undefined;
+            function maybeAddMissingAwaitInfo(errorNode, source, target) {
+                if (errorNode && reportErrors && errorOutputContainer.errors && errorOutputContainer.errors.length) {
+                    // Bail if target is Promise-like---something else is wrong
+                    if (getAwaitedTypeOfPromise(target)) {
+                        return;
+                    }
+                    var awaitedTypeOfSource = getAwaitedTypeOfPromise(source);
+                    if (awaitedTypeOfSource && isTypeRelatedTo(awaitedTypeOfSource, target, relation)) {
+                        ts.addRelatedInfo(errorOutputContainer.errors[0], ts.createDiagnosticForNode(errorNode, ts.Diagnostics.Did_you_forget_to_use_await));
+                    }
+                }
             }
-            return true;
         }
         /**
          * Returns the this argument in calls like x.f(...) and x[f](...). Undefined otherwise.
          */
         function getThisArgumentOfCall(node) {
-            if (node.kind === 191 /* CallExpression */) {
+            if (node.kind === 192 /* CallExpression */) {
                 var callee = ts.skipOuterExpressions(node.expression);
-                if (callee.kind === 189 /* PropertyAccessExpression */ || callee.kind === 190 /* ElementAccessExpression */) {
+                if (callee.kind === 190 /* PropertyAccessExpression */ || callee.kind === 191 /* ElementAccessExpression */) {
                     return callee.expression;
                 }
             }
         }
         function createSyntheticExpression(parent, type, isSpread) {
-            var result = ts.createNode(215 /* SyntheticExpression */, parent.pos, parent.end);
+            var result = ts.createNode(216 /* SyntheticExpression */, parent.pos, parent.end);
             result.parent = parent;
             result.type = type;
             result.isSpread = isSpread || false;
@@ -49937,17 +51413,17 @@ var ts;
          * Returns the effective arguments for an expression that works like a function invocation.
          */
         function getEffectiveCallArguments(node) {
-            if (node.kind === 193 /* TaggedTemplateExpression */) {
+            if (node.kind === 194 /* TaggedTemplateExpression */) {
                 var template = node.template;
-                var args_4 = [createSyntheticExpression(template, getGlobalTemplateStringsArrayType())];
-                if (template.kind === 206 /* TemplateExpression */) {
+                var args_3 = [createSyntheticExpression(template, getGlobalTemplateStringsArrayType())];
+                if (template.kind === 207 /* TemplateExpression */) {
                     ts.forEach(template.templateSpans, function (span) {
-                        args_4.push(span.expression);
+                        args_3.push(span.expression);
                     });
                 }
-                return args_4;
+                return args_3;
             }
-            if (node.kind === 152 /* Decorator */) {
+            if (node.kind === 153 /* Decorator */) {
                 return getEffectiveDecoratorArguments(node);
             }
             if (ts.isJsxOpeningLikeElement(node)) {
@@ -49960,7 +51436,7 @@ var ts;
                 // of the argument is a tuple type, spread the tuple elements into the argument list. We can
                 // call checkExpressionCached because spread expressions never have a contextual type.
                 var spreadArgument_1 = args[length - 1];
-                var type = checkExpressionCached(spreadArgument_1.expression);
+                var type = flowLoopCount ? checkExpression(spreadArgument_1.expression) : checkExpressionCached(spreadArgument_1.expression);
                 if (isTupleType(type)) {
                     var typeArguments = type.typeArguments || ts.emptyArray;
                     var restIndex_2 = type.target.hasRestElement ? typeArguments.length - 1 : -1;
@@ -49977,30 +51453,30 @@ var ts;
             var parent = node.parent;
             var expr = node.expression;
             switch (parent.kind) {
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
                     // For a class decorator, the `target` is the type of the class (e.g. the
                     // "static" or "constructor" side of the class).
                     return [
                         createSyntheticExpression(expr, getTypeOfSymbol(getSymbolOfNode(parent)))
                     ];
-                case 151 /* Parameter */:
+                case 152 /* Parameter */:
                     // A parameter declaration decorator will have three arguments (see
                     // `ParameterDecorator` in core.d.ts).
                     var func = parent.parent;
                     return [
-                        createSyntheticExpression(expr, parent.parent.kind === 157 /* Constructor */ ? getTypeOfSymbol(getSymbolOfNode(func)) : errorType),
+                        createSyntheticExpression(expr, parent.parent.kind === 158 /* Constructor */ ? getTypeOfSymbol(getSymbolOfNode(func)) : errorType),
                         createSyntheticExpression(expr, anyType),
                         createSyntheticExpression(expr, numberType)
                     ];
-                case 154 /* PropertyDeclaration */:
-                case 156 /* MethodDeclaration */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 155 /* PropertyDeclaration */:
+                case 157 /* MethodDeclaration */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     // A method or accessor declaration decorator will have two or three arguments (see
                     // `PropertyDecorator` and `MethodDecorator` in core.d.ts). If we are emitting decorators
                     // for ES3, we will only pass two arguments.
-                    var hasPropDesc = parent.kind !== 154 /* PropertyDeclaration */ && languageVersion !== 0 /* ES3 */;
+                    var hasPropDesc = parent.kind !== 155 /* PropertyDeclaration */ && languageVersion !== 0 /* ES3 */;
                     return [
                         createSyntheticExpression(expr, getParentTypeOfClassElement(parent)),
                         createSyntheticExpression(expr, getClassElementPropertyKeyType(parent)),
@@ -50014,22 +51490,47 @@ var ts;
          */
         function getDecoratorArgumentCount(node, signature) {
             switch (node.parent.kind) {
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
                     return 1;
-                case 154 /* PropertyDeclaration */:
+                case 155 /* PropertyDeclaration */:
                     return 2;
-                case 156 /* MethodDeclaration */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 157 /* MethodDeclaration */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     // For ES3 or decorators with only two parameters we supply only two arguments
                     return languageVersion === 0 /* ES3 */ || signature.parameters.length <= 2 ? 2 : 3;
-                case 151 /* Parameter */:
+                case 152 /* Parameter */:
                     return 3;
                 default:
                     return ts.Debug.fail();
             }
         }
+        function getDiagnosticSpanForCallNode(node, doNotIncludeArguments) {
+            var start;
+            var length;
+            var sourceFile = ts.getSourceFileOfNode(node);
+            if (ts.isPropertyAccessExpression(node.expression)) {
+                var nameSpan = ts.getErrorSpanForNode(sourceFile, node.expression.name);
+                start = nameSpan.start;
+                length = doNotIncludeArguments ? nameSpan.length : node.end - start;
+            }
+            else {
+                var expressionSpan = ts.getErrorSpanForNode(sourceFile, node.expression);
+                start = expressionSpan.start;
+                length = doNotIncludeArguments ? expressionSpan.length : node.end - start;
+            }
+            return { start: start, length: length, sourceFile: sourceFile };
+        }
+        function getDiagnosticForCallNode(node, message, arg0, arg1, arg2, arg3) {
+            if (ts.isCallExpression(node)) {
+                var _a = getDiagnosticSpanForCallNode(node), sourceFile = _a.sourceFile, start = _a.start, length_4 = _a.length;
+                return ts.createFileDiagnostic(sourceFile, start, length_4, message, arg0, arg1, arg2, arg3);
+            }
+            else {
+                return ts.createDiagnosticForNode(node, message, arg0, arg1, arg2, arg3);
+            }
+        }
         function getArgumentArityError(node, signatures, args) {
             var min = Number.POSITIVE_INFINITY;
             var max = Number.NEGATIVE_INFINITY;
@@ -50059,25 +51560,41 @@ var ts;
             if (argCount <= max && hasSpreadArgument) {
                 argCount--;
             }
+            var spanArray;
             var related;
+            var error = hasRestParameter || hasSpreadArgument ? hasRestParameter && hasSpreadArgument ? ts.Diagnostics.Expected_at_least_0_arguments_but_got_1_or_more :
+                hasRestParameter ? ts.Diagnostics.Expected_at_least_0_arguments_but_got_1 :
+                    ts.Diagnostics.Expected_0_arguments_but_got_1_or_more : ts.Diagnostics.Expected_0_arguments_but_got_1;
             if (closestSignature && getMinArgumentCount(closestSignature) > argCount && closestSignature.declaration) {
                 var paramDecl = closestSignature.declaration.parameters[closestSignature.thisParameter ? argCount + 1 : argCount];
                 if (paramDecl) {
                     related = ts.createDiagnosticForNode(paramDecl, ts.isBindingPattern(paramDecl.name) ? ts.Diagnostics.An_argument_matching_this_binding_pattern_was_not_provided : ts.Diagnostics.An_argument_for_0_was_not_provided, !paramDecl.name ? argCount : !ts.isBindingPattern(paramDecl.name) ? ts.idText(getFirstIdentifier(paramDecl.name)) : undefined);
                 }
             }
-            if (hasRestParameter || hasSpreadArgument) {
-                var error_1 = hasRestParameter && hasSpreadArgument ? ts.Diagnostics.Expected_at_least_0_arguments_but_got_1_or_more :
-                    hasRestParameter ? ts.Diagnostics.Expected_at_least_0_arguments_but_got_1 :
-                        ts.Diagnostics.Expected_0_arguments_but_got_1_or_more;
-                var diagnostic_1 = ts.createDiagnosticForNode(node, error_1, paramRange, argCount);
-                return related ? addRelatedInfo(diagnostic_1, related) : diagnostic_1;
-            }
             if (min < argCount && argCount < max) {
-                return ts.createDiagnosticForNode(node, ts.Diagnostics.No_overload_expects_0_arguments_but_overloads_do_exist_that_expect_either_1_or_2_arguments, argCount, belowArgCount, aboveArgCount);
+                return getDiagnosticForCallNode(node, ts.Diagnostics.No_overload_expects_0_arguments_but_overloads_do_exist_that_expect_either_1_or_2_arguments, argCount, belowArgCount, aboveArgCount);
             }
-            var diagnostic = ts.createDiagnosticForNode(node, ts.Diagnostics.Expected_0_arguments_but_got_1, paramRange, argCount);
-            return related ? addRelatedInfo(diagnostic, related) : diagnostic;
+            if (!hasSpreadArgument && argCount < min) {
+                var diagnostic_1 = getDiagnosticForCallNode(node, error, paramRange, argCount);
+                return related ? ts.addRelatedInfo(diagnostic_1, related) : diagnostic_1;
+            }
+            if (hasRestParameter || hasSpreadArgument) {
+                spanArray = ts.createNodeArray(args);
+                if (hasSpreadArgument && argCount) {
+                    var nextArg = ts.elementAt(args, getSpreadArgumentIndex(args) + 1) || undefined;
+                    spanArray = ts.createNodeArray(args.slice(max > argCount && nextArg ? args.indexOf(nextArg) : Math.min(max, args.length - 1)));
+                }
+            }
+            else {
+                spanArray = ts.createNodeArray(args.slice(max));
+            }
+            spanArray.pos = ts.first(spanArray).pos;
+            spanArray.end = ts.last(spanArray).end;
+            if (spanArray.end === spanArray.pos) {
+                spanArray.end++;
+            }
+            var diagnostic = ts.createDiagnosticForNodeArray(ts.getSourceFileOfNode(node), spanArray, error, paramRange, argCount);
+            return related ? ts.addRelatedInfo(diagnostic, related) : diagnostic;
         }
         function getTypeArgumentArityError(node, signatures, typeArguments) {
             var argCount = typeArguments.length;
@@ -50108,15 +51625,15 @@ var ts;
             return ts.createDiagnosticForNodeArray(ts.getSourceFileOfNode(node), typeArguments, ts.Diagnostics.Expected_0_type_arguments_but_got_1, belowArgCount === -Infinity ? aboveArgCount : belowArgCount, argCount);
         }
         function resolveCall(node, signatures, candidatesOutArray, checkMode, fallbackError) {
-            var isTaggedTemplate = node.kind === 193 /* TaggedTemplateExpression */;
-            var isDecorator = node.kind === 152 /* Decorator */;
+            var isTaggedTemplate = node.kind === 194 /* TaggedTemplateExpression */;
+            var isDecorator = node.kind === 153 /* Decorator */;
             var isJsxOpeningOrSelfClosingElement = ts.isJsxOpeningLikeElement(node);
             var reportErrors = !candidatesOutArray;
             var typeArguments;
             if (!isDecorator) {
                 typeArguments = node.typeArguments;
                 // We already perform checking on the type arguments on the class declaration itself.
-                if (isTaggedTemplate || isJsxOpeningOrSelfClosingElement || node.expression.kind !== 98 /* SuperKeyword */) {
+                if (isTaggedTemplate || isJsxOpeningOrSelfClosingElement || node.expression.kind !== 99 /* SuperKeyword */) {
                     ts.forEach(typeArguments, checkSourceElement);
                 }
             }
@@ -50125,7 +51642,7 @@ var ts;
             reorderCandidates(signatures, candidates);
             if (!candidates.length) {
                 if (reportErrors) {
-                    diagnostics.add(ts.createDiagnosticForNode(node, ts.Diagnostics.Call_target_does_not_contain_any_signatures));
+                    diagnostics.add(getDiagnosticForCallNode(node, ts.Diagnostics.Call_target_does_not_contain_any_signatures));
                 }
                 return resolveErrorCall(node);
             }
@@ -50165,13 +51682,13 @@ var ts;
             //     function foo(): void;
             //     foo<number>(0);
             //
-            var candidateForArgumentError;
+            var candidatesForArgumentError;
             var candidateForArgumentArityError;
             var candidateForTypeArgumentError;
             var result;
             // If we are in signature help, a trailing comma indicates that we intend to provide another argument,
             // so we will only accept overloads with arity at least 1 higher than the current number of provided arguments.
-            var signatureHelpTrailingComma = !!(checkMode & 16 /* IsForSignatureHelp */) && node.kind === 191 /* CallExpression */ && node.arguments.hasTrailingComma;
+            var signatureHelpTrailingComma = !!(checkMode & 16 /* IsForSignatureHelp */) && node.kind === 192 /* CallExpression */ && node.arguments.hasTrailingComma;
             // Section 4.12.1:
             // if the candidate list contains one or more signatures for which the type of each argument
             // expression is a subtype of each corresponding parameter type, the return type of the first
@@ -50196,8 +51713,66 @@ var ts;
             // If candidate is undefined, it means that no candidates had a suitable arity. In that case,
             // skip the checkApplicableSignature check.
             if (reportErrors) {
-                if (candidateForArgumentError) {
-                    checkApplicableSignature(node, args, candidateForArgumentError, assignableRelation, 0 /* Normal */, /*reportErrors*/ true);
+                if (candidatesForArgumentError) {
+                    if (candidatesForArgumentError.length === 1 || candidatesForArgumentError.length > 3) {
+                        var last_2 = candidatesForArgumentError[candidatesForArgumentError.length - 1];
+                        var chain_1;
+                        if (candidatesForArgumentError.length > 3) {
+                            chain_1 = ts.chainDiagnosticMessages(chain_1, ts.Diagnostics.The_last_overload_gave_the_following_error);
+                            chain_1 = ts.chainDiagnosticMessages(chain_1, ts.Diagnostics.No_overload_matches_this_call);
+                        }
+                        var diags = getSignatureApplicabilityError(node, args, last_2, assignableRelation, 0 /* Normal */, /*reportErrors*/ true, function () { return chain_1; });
+                        if (diags) {
+                            for (var _i = 0, diags_1 = diags; _i < diags_1.length; _i++) {
+                                var d = diags_1[_i];
+                                if (last_2.declaration && candidatesForArgumentError.length > 3) {
+                                    ts.addRelatedInfo(d, ts.createDiagnosticForNode(last_2.declaration, ts.Diagnostics.The_last_overload_is_declared_here));
+                                }
+                                diagnostics.add(d);
+                            }
+                        }
+                        else {
+                            ts.Debug.fail("No error for last overload signature");
+                        }
+                    }
+                    else {
+                        var allDiagnostics = [];
+                        var max = 0;
+                        var min_3 = Number.MAX_VALUE;
+                        var minIndex = 0;
+                        var i_1 = 0;
+                        var _loop_12 = function (c) {
+                            var chain_2 = function () { return ts.chainDiagnosticMessages(/*details*/ undefined, ts.Diagnostics.Overload_0_of_1_2_gave_the_following_error, i_1 + 1, candidates.length, signatureToString(c)); };
+                            var diags_2 = getSignatureApplicabilityError(node, args, c, assignableRelation, 0 /* Normal */, /*reportErrors*/ true, chain_2);
+                            if (diags_2) {
+                                if (diags_2.length <= min_3) {
+                                    min_3 = diags_2.length;
+                                    minIndex = i_1;
+                                }
+                                max = Math.max(max, diags_2.length);
+                                allDiagnostics.push(diags_2);
+                            }
+                            else {
+                                ts.Debug.fail("No error for 3 or fewer overload signatures");
+                            }
+                            i_1++;
+                        };
+                        for (var _a = 0, candidatesForArgumentError_1 = candidatesForArgumentError; _a < candidatesForArgumentError_1.length; _a++) {
+                            var c = candidatesForArgumentError_1[_a];
+                            _loop_12(c);
+                        }
+                        var diags_3 = max > 1 ? allDiagnostics[minIndex] : ts.flatten(allDiagnostics);
+                        ts.Debug.assert(diags_3.length > 0, "No errors reported for 3 or fewer overload signatures");
+                        var chain = ts.chainDiagnosticMessages(ts.map(diags_3, function (d) { return typeof d.messageText === "string" ? d : d.messageText; }), ts.Diagnostics.No_overload_matches_this_call);
+                        var related = ts.flatMap(diags_3, function (d) { return d.relatedInformation; });
+                        if (ts.every(diags_3, function (d) { return d.start === diags_3[0].start && d.length === diags_3[0].length && d.file === diags_3[0].file; })) {
+                            var _b = diags_3[0], file = _b.file, start = _b.start, length_5 = _b.length;
+                            diagnostics.add({ file: file, start: start, length: length_5, code: chain.code, category: chain.category, messageText: chain, relatedInformation: related });
+                        }
+                        else {
+                            diagnostics.add(ts.createDiagnosticForNodeFromMessageChain(node, chain, related));
+                        }
+                    }
                 }
                 else if (candidateForArgumentArityError) {
                     diagnostics.add(getArgumentArityError(node, [candidateForArgumentArityError], args));
@@ -50214,14 +51789,14 @@ var ts;
                         diagnostics.add(getArgumentArityError(node, signaturesWithCorrectTypeArgumentArity, args));
                     }
                     else if (fallbackError) {
-                        diagnostics.add(ts.createDiagnosticForNode(node, fallbackError));
+                        diagnostics.add(getDiagnosticForCallNode(node, fallbackError));
                     }
                 }
             }
             return produceDiagnostics || !args ? resolveErrorCall(node) : getCandidateForOverloadFailure(node, candidates, args, !!candidatesOutArray);
             function chooseOverload(candidates, relation, signatureHelpTrailingComma) {
                 if (signatureHelpTrailingComma === void 0) { signatureHelpTrailingComma = false; }
-                candidateForArgumentError = undefined;
+                candidatesForArgumentError = undefined;
                 candidateForArgumentArityError = undefined;
                 candidateForTypeArgumentError = undefined;
                 if (isSingleNonGenericCandidate) {
@@ -50229,8 +51804,8 @@ var ts;
                     if (typeArguments || !hasCorrectArity(node, args, candidate, signatureHelpTrailingComma)) {
                         return undefined;
                     }
-                    if (!checkApplicableSignature(node, args, candidate, relation, 0 /* Normal */, /*reportErrors*/ false)) {
-                        candidateForArgumentError = candidate;
+                    if (getSignatureApplicabilityError(node, args, candidate, relation, 0 /* Normal */, /*reportErrors*/ false, /*containingMessageChain*/ undefined)) {
+                        candidatesForArgumentError = [candidate];
                         return undefined;
                     }
                     return candidate;
@@ -50254,7 +51829,7 @@ var ts;
                         else {
                             inferenceContext = createInferenceContext(candidate.typeParameters, candidate, /*flags*/ ts.isInJSFile(node) ? 2 /* AnyDefault */ : 0 /* None */);
                             typeArgumentTypes = inferTypeArguments(node, candidate, args, argCheckMode | 8 /* SkipGenericFunctions */, inferenceContext);
-                            argCheckMode |= inferenceContext.flags & 8 /* SkippedGenericFunction */ ? 8 /* SkipGenericFunctions */ : 0 /* Normal */;
+                            argCheckMode |= inferenceContext.flags & 4 /* SkippedGenericFunction */ ? 8 /* SkipGenericFunctions */ : 0 /* Normal */;
                         }
                         checkCandidate = getSignatureInstantiation(candidate, typeArgumentTypes, ts.isInJSFile(candidate.declaration), inferenceContext && inferenceContext.inferredTypeParameters);
                         // If the original signature has a generic rest type, instantiation may produce a
@@ -50267,11 +51842,9 @@ var ts;
                     else {
                         checkCandidate = candidate;
                     }
-                    if (!checkApplicableSignature(node, args, checkCandidate, relation, argCheckMode, /*reportErrors*/ false)) {
+                    if (getSignatureApplicabilityError(node, args, checkCandidate, relation, argCheckMode, /*reportErrors*/ false, /*containingMessageChain*/ undefined)) {
                         // Give preference to error candidates that have no rest parameters (as they are more specific)
-                        if (!candidateForArgumentError || getEffectiveRestType(candidateForArgumentError) || !getEffectiveRestType(checkCandidate)) {
-                            candidateForArgumentError = checkCandidate;
-                        }
+                        (candidatesForArgumentError || (candidatesForArgumentError = [])).push(checkCandidate);
                         continue;
                     }
                     if (argCheckMode) {
@@ -50289,11 +51862,9 @@ var ts;
                                 continue;
                             }
                         }
-                        if (!checkApplicableSignature(node, args, checkCandidate, relation, argCheckMode, /*reportErrors*/ false)) {
+                        if (getSignatureApplicabilityError(node, args, checkCandidate, relation, argCheckMode, /*reportErrors*/ false, /*containingMessageChain*/ undefined)) {
                             // Give preference to error candidates that have no rest parameters (as they are more specific)
-                            if (!candidateForArgumentError || getEffectiveRestType(candidateForArgumentError) || !getEffectiveRestType(checkCandidate)) {
-                                candidateForArgumentError = checkCandidate;
-                            }
+                            (candidatesForArgumentError || (candidatesForArgumentError = [])).push(checkCandidate);
                             continue;
                         }
                     }
@@ -50322,7 +51893,7 @@ var ts;
             }
             var _a = ts.minAndMax(candidates, getNumNonRestParameters), minArgumentCount = _a.min, maxNonRestParam = _a.max;
             var parameters = [];
-            var _loop_8 = function (i) {
+            var _loop_13 = function (i) {
                 var symbols = ts.mapDefined(candidates, function (_a) {
                     var parameters = _a.parameters, hasRestParameter = _a.hasRestParameter;
                     return hasRestParameter ?
@@ -50333,7 +51904,7 @@ var ts;
                 parameters.push(createCombinedSymbolFromTypes(symbols, ts.mapDefined(candidates, function (candidate) { return tryGetTypeAtPosition(candidate, i); })));
             };
             for (var i = 0; i < maxNonRestParam; i++) {
-                _loop_8(i);
+                _loop_13(i);
             }
             var restParameterSymbols = ts.mapDefined(candidates, function (c) { return c.hasRestParameter ? ts.last(c.parameters) : undefined; });
             var hasRestParameter = restParameterSymbols.length !== 0;
@@ -50411,7 +51982,7 @@ var ts;
             return maxParamsIndex;
         }
         function resolveCallExpression(node, candidatesOutArray, checkMode) {
-            if (node.expression.kind === 98 /* SuperKeyword */) {
+            if (node.expression.kind === 99 /* SuperKeyword */) {
                 var superType = checkSuperExpression(node.expression);
                 if (isTypeAny(superType)) {
                     for (var _i = 0, _a = node.arguments; _i < _a.length; _i++) {
@@ -50472,7 +52043,7 @@ var ts;
                             relatedInformation = ts.createDiagnosticForNode(node.expression, ts.Diagnostics.It_is_highly_likely_that_you_are_missing_a_semicolon);
                         }
                     }
-                    invocationError(node, apparentType, 0 /* Call */, relatedInformation);
+                    invocationError(node.expression, apparentType, 0 /* Call */, relatedInformation);
                 }
                 return resolveErrorCall(node);
             }
@@ -50486,7 +52057,7 @@ var ts;
             // returns a function type, we choose to defer processing. This narrowly permits function composition
             // operators to flow inferences through return types, but otherwise processes calls right away. We
             // use the resolvingSignature singleton to indicate that we deferred processing. This result will be
-            // propagated out and eventually turned into silentNeverType (a type that is assignable to anything and
+            // propagated out and eventually turned into nonInferrableType (a type that is assignable to anything and
             // from which we never make inferences).
             if (checkMode & 8 /* SkipGenericFunctions */ && !node.typeArguments && callSignatures.some(isGenericFunctionReturningFunction)) {
                 skippedGenericFunction(node, checkMode);
@@ -50579,7 +52150,7 @@ var ts;
                 }
                 return signature;
             }
-            invocationError(node, expressionType, 1 /* Construct */);
+            invocationError(node.expression, expressionType, 1 /* Construct */);
             return resolveErrorCall(node);
         }
         function typeHasProtectedAccessibleBase(target, type) {
@@ -50590,13 +52161,12 @@ var ts;
             var firstBase = baseTypes[0];
             if (firstBase.flags & 2097152 /* Intersection */) {
                 var types = firstBase.types;
-                var mixinCount = ts.countWhere(types, isMixinConstructorType);
+                var mixinFlags = findMixins(types);
                 var i = 0;
                 for (var _i = 0, _a = firstBase.types; _i < _a.length; _i++) {
                     var intersectionMember = _a[_i];
-                    i++;
                     // We want to ignore mixin ctors
-                    if (mixinCount === 0 || mixinCount === types.length && i === 0 || !isMixinConstructorType(intersectionMember)) {
+                    if (!mixinFlags[i]) {
                         if (ts.getObjectFlags(intersectionMember) & (1 /* Class */ | 2 /* Interface */)) {
                             if (intersectionMember.symbol === target) {
                                 return true;
@@ -50606,6 +52176,7 @@ var ts;
                             }
                         }
                     }
+                    i++;
                 }
                 return false;
             }
@@ -50645,11 +52216,75 @@ var ts;
             }
             return true;
         }
-        function invocationError(node, apparentType, kind, relatedInformation) {
-            var diagnostic = error(node, (kind === 0 /* Call */ ?
-                ts.Diagnostics.Cannot_invoke_an_expression_whose_type_lacks_a_call_signature_Type_0_has_no_compatible_call_signatures :
-                ts.Diagnostics.Cannot_use_new_with_an_expression_whose_type_lacks_a_call_or_construct_signature), typeToString(apparentType));
-            invocationErrorRecovery(apparentType, kind, relatedInformation ? addRelatedInfo(diagnostic, relatedInformation) : diagnostic);
+        function invocationErrorDetails(apparentType, kind) {
+            var errorInfo;
+            var isCall = kind === 0 /* Call */;
+            var awaitedType = getAwaitedType(apparentType);
+            var maybeMissingAwait = awaitedType && getSignaturesOfType(awaitedType, kind).length > 0;
+            if (apparentType.flags & 1048576 /* Union */) {
+                var types = apparentType.types;
+                var hasSignatures = false;
+                for (var _i = 0, types_15 = types; _i < types_15.length; _i++) {
+                    var constituent = types_15[_i];
+                    var signatures = getSignaturesOfType(constituent, kind);
+                    if (signatures.length !== 0) {
+                        hasSignatures = true;
+                        if (errorInfo) {
+                            // Bail early if we already have an error, no chance of "No constituent of type is callable"
+                            break;
+                        }
+                    }
+                    else {
+                        // Error on the first non callable constituent only
+                        if (!errorInfo) {
+                            errorInfo = ts.chainDiagnosticMessages(errorInfo, isCall ?
+                                ts.Diagnostics.Type_0_has_no_call_signatures :
+                                ts.Diagnostics.Type_0_has_no_construct_signatures, typeToString(constituent));
+                            errorInfo = ts.chainDiagnosticMessages(errorInfo, isCall ?
+                                ts.Diagnostics.Not_all_constituents_of_type_0_are_callable :
+                                ts.Diagnostics.Not_all_constituents_of_type_0_are_constructable, typeToString(apparentType));
+                        }
+                        if (hasSignatures) {
+                            // Bail early if we already found a siganture, no chance of "No constituent of type is callable"
+                            break;
+                        }
+                    }
+                }
+                if (!hasSignatures) {
+                    errorInfo = ts.chainDiagnosticMessages(
+                    /* detials */ undefined, isCall ?
+                        ts.Diagnostics.No_constituent_of_type_0_is_callable :
+                        ts.Diagnostics.No_constituent_of_type_0_is_constructable, typeToString(apparentType));
+                }
+                if (!errorInfo) {
+                    errorInfo = ts.chainDiagnosticMessages(errorInfo, isCall ?
+                        ts.Diagnostics.Each_member_of_the_union_type_0_has_signatures_but_none_of_those_signatures_are_compatible_with_each_other :
+                        ts.Diagnostics.Each_member_of_the_union_type_0_has_construct_signatures_but_none_of_those_signatures_are_compatible_with_each_other, typeToString(apparentType));
+                }
+            }
+            else {
+                errorInfo = ts.chainDiagnosticMessages(errorInfo, isCall ?
+                    ts.Diagnostics.Type_0_has_no_call_signatures :
+                    ts.Diagnostics.Type_0_has_no_construct_signatures, typeToString(apparentType));
+            }
+            return {
+                messageChain: ts.chainDiagnosticMessages(errorInfo, isCall ? ts.Diagnostics.This_expression_is_not_callable : ts.Diagnostics.This_expression_is_not_constructable),
+                relatedMessage: maybeMissingAwait ? ts.Diagnostics.Did_you_forget_to_use_await : undefined,
+            };
+        }
+        function invocationError(errorTarget, apparentType, kind, relatedInformation) {
+            var _a = invocationErrorDetails(apparentType, kind), messageChain = _a.messageChain, relatedInfo = _a.relatedMessage;
+            var diagnostic = ts.createDiagnosticForNodeFromMessageChain(errorTarget, messageChain);
+            if (relatedInfo) {
+                ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(errorTarget, relatedInfo));
+            }
+            if (ts.isCallExpression(errorTarget.parent)) {
+                var _b = getDiagnosticSpanForCallNode(errorTarget.parent, /* doNotIncludeArguments */ true), start = _b.start, length_6 = _b.length;
+                diagnostic.start = start;
+                diagnostic.length = length_6;
+            }
+            diagnostics.add(diagnostic);
+            invocationErrorRecovery(apparentType, kind, relatedInformation ? ts.addRelatedInfo(diagnostic, relatedInformation) : diagnostic);
         }
         function invocationErrorRecovery(apparentType, kind, diagnostic) {
             if (!apparentType.symbol) {
@@ -50662,7 +52297,7 @@ var ts;
                 var sigs = getSignaturesOfType(getTypeOfSymbol(getSymbolLinks(apparentType.symbol).target), kind);
                 if (!sigs || !sigs.length)
                     return;
-                addRelatedInfo(diagnostic, ts.createDiagnosticForNode(importNode, ts.Diagnostics.Type_originates_at_this_import_A_namespace_style_import_cannot_be_called_or_constructed_and_will_cause_a_failure_at_runtime_Consider_using_a_default_import_or_import_require_here_instead));
+                ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(importNode, ts.Diagnostics.Type_originates_at_this_import_A_namespace_style_import_cannot_be_called_or_constructed_and_will_cause_a_failure_at_runtime_Consider_using_a_default_import_or_import_require_here_instead));
             }
         }
         function resolveTaggedTemplateExpression(node, candidatesOutArray, checkMode) {
@@ -50678,7 +52313,7 @@ var ts;
                 return resolveUntypedCall(node);
             }
             if (!callSignatures.length) {
-                invocationError(node, apparentType, 0 /* Call */);
+                invocationError(node.tag, apparentType, 0 /* Call */);
                 return resolveErrorCall(node);
             }
             return resolveCall(node, callSignatures, candidatesOutArray, checkMode);
@@ -50688,16 +52323,16 @@ var ts;
          */
         function getDiagnosticHeadMessageForDecoratorResolution(node) {
             switch (node.parent.kind) {
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_class_decorator_when_called_as_an_expression;
-                case 151 /* Parameter */:
+                case 152 /* Parameter */:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_parameter_decorator_when_called_as_an_expression;
-                case 154 /* PropertyDeclaration */:
+                case 155 /* PropertyDeclaration */:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_property_decorator_when_called_as_an_expression;
-                case 156 /* MethodDeclaration */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 157 /* MethodDeclaration */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_method_decorator_when_called_as_an_expression;
                 default:
                     return ts.Debug.fail();
@@ -50724,9 +52359,12 @@ var ts;
             }
             var headMessage = getDiagnosticHeadMessageForDecoratorResolution(node);
             if (!callSignatures.length) {
-                var errorInfo = ts.chainDiagnosticMessages(/*details*/ undefined, ts.Diagnostics.Cannot_invoke_an_expression_whose_type_lacks_a_call_signature_Type_0_has_no_compatible_call_signatures, typeToString(apparentType));
-                errorInfo = ts.chainDiagnosticMessages(errorInfo, headMessage);
-                var diag = ts.createDiagnosticForNodeFromMessageChain(node, errorInfo);
+                var errorDetails = invocationErrorDetails(apparentType, 0 /* Call */);
+                var messageChain = ts.chainDiagnosticMessages(errorDetails.messageChain, headMessage);
+                var diag = ts.createDiagnosticForNodeFromMessageChain(node.expression, messageChain);
+                if (errorDetails.relatedMessage) {
+                    ts.addRelatedInfo(diag, ts.createDiagnosticForNode(node.expression, errorDetails.relatedMessage));
+                }
                 diagnostics.add(diag);
                 invocationErrorRecovery(apparentType, 0 /* Call */, diag);
                 return resolveErrorCall(node);
@@ -50740,7 +52378,7 @@ var ts;
             // file would probably be preferable.
             var typeSymbol = exports && getSymbol(exports, JsxNames.Element, 67897832 /* Type */);
             var returnNode = typeSymbol && nodeBuilder.symbolToEntityName(typeSymbol, 67897832 /* Type */, node);
-            var declaration = ts.createFunctionTypeNode(/*typeParameters*/ undefined, [ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotdotdot*/ undefined, "props", /*questionMark*/ undefined, nodeBuilder.typeToTypeNode(result, node))], returnNode ? ts.createTypeReferenceNode(returnNode, /*typeArguments*/ undefined) : ts.createKeywordTypeNode(120 /* AnyKeyword */));
+            var declaration = ts.createFunctionTypeNode(/*typeParameters*/ undefined, [ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotdotdot*/ undefined, "props", /*questionMark*/ undefined, nodeBuilder.typeToTypeNode(result, node))], returnNode ? ts.createTypeReferenceNode(returnNode, /*typeArguments*/ undefined) : ts.createKeywordTypeNode(121 /* AnyKeyword */));
             var parameterSymbol = createSymbol(1 /* FunctionScopedVariable */, "props");
             parameterSymbol.type = result;
             return createSignature(declaration, 
@@ -50787,16 +52425,16 @@ var ts;
         }
         function resolveSignature(node, candidatesOutArray, checkMode) {
             switch (node.kind) {
-                case 191 /* CallExpression */:
+                case 192 /* CallExpression */:
                     return resolveCallExpression(node, candidatesOutArray, checkMode);
-                case 192 /* NewExpression */:
+                case 193 /* NewExpression */:
                     return resolveNewExpression(node, candidatesOutArray, checkMode);
-                case 193 /* TaggedTemplateExpression */:
+                case 194 /* TaggedTemplateExpression */:
                     return resolveTaggedTemplateExpression(node, candidatesOutArray, checkMode);
-                case 152 /* Decorator */:
+                case 153 /* Decorator */:
                     return resolveDecorator(node, candidatesOutArray, checkMode);
-                case 262 /* JsxOpeningElement */:
-                case 261 /* JsxSelfClosingElement */:
+                case 263 /* JsxOpeningElement */:
+                case 262 /* JsxSelfClosingElement */:
                     return resolveJsxOpeningLikeElement(node, candidatesOutArray, checkMode);
             }
             throw ts.Debug.assertNever(node, "Branch in 'resolveSignature' should be unreachable.");
@@ -50876,17 +52514,17 @@ var ts;
                     ts.isVariableDeclaration(decl.parent) && getSymbolOfNode(decl.parent));
             var prototype = assignmentSymbol && assignmentSymbol.exports && assignmentSymbol.exports.get("prototype");
             var init = prototype && prototype.valueDeclaration && getAssignedJSPrototype(prototype.valueDeclaration);
-            return init ? checkExpression(init) : undefined;
+            return init ? getWidenedType(checkExpressionCached(init)) : undefined;
         }
         function getAssignedJSPrototype(node) {
             if (!node.parent) {
                 return false;
             }
             var parent = node.parent;
-            while (parent && parent.kind === 189 /* PropertyAccessExpression */) {
+            while (parent && parent.kind === 190 /* PropertyAccessExpression */) {
                 parent = parent.parent;
             }
-            if (parent && ts.isBinaryExpression(parent) && ts.isPrototypeAccess(parent.left) && parent.operatorToken.kind === 59 /* EqualsToken */) {
+            if (parent && ts.isBinaryExpression(parent) && ts.isPrototypeAccess(parent.left) && parent.operatorToken.kind === 60 /* EqualsToken */) {
                 var right = ts.getInitializerOfBinaryExpression(parent);
                 return ts.isObjectLiteralExpression(right) && right;
             }
@@ -50909,18 +52547,18 @@ var ts;
             var signature = getResolvedSignature(node, /*candidatesOutArray*/ undefined, checkMode);
             if (signature === resolvingSignature) {
                 // CheckMode.SkipGenericFunctions is enabled and this is a call to a generic function that
-                // returns a function type. We defer checking and return anyFunctionType.
-                return silentNeverType;
+                // returns a function type. We defer checking and return nonInferrableType.
+                return nonInferrableType;
             }
-            if (node.expression.kind === 98 /* SuperKeyword */) {
+            if (node.expression.kind === 99 /* SuperKeyword */) {
                 return voidType;
             }
-            if (node.kind === 192 /* NewExpression */) {
+            if (node.kind === 193 /* NewExpression */) {
                 var declaration = signature.declaration;
                 if (declaration &&
-                    declaration.kind !== 157 /* Constructor */ &&
-                    declaration.kind !== 161 /* ConstructSignature */ &&
-                    declaration.kind !== 166 /* ConstructorType */ &&
+                    declaration.kind !== 158 /* Constructor */ &&
+                    declaration.kind !== 162 /* ConstructSignature */ &&
+                    declaration.kind !== 167 /* ConstructorType */ &&
                     !ts.isJSDocConstructSignature(declaration) &&
                     !isJSConstructor(declaration)) {
                     // When resolved signature is a call signature (and not a construct signature) the result type is any
@@ -51037,9 +52675,9 @@ var ts;
                 return false;
             }
             var targetDeclarationKind = resolvedRequire.flags & 16 /* Function */
-                ? 239 /* FunctionDeclaration */
+                ? 240 /* FunctionDeclaration */
                 : resolvedRequire.flags & 3 /* Variable */
-                    ? 237 /* VariableDeclaration */
+                    ? 238 /* VariableDeclaration */
                     : 0 /* Unknown */;
             if (targetDeclarationKind !== 0 /* Unknown */) {
                 var decl = ts.getDeclarationOfKind(resolvedRequire, targetDeclarationKind);
@@ -51051,7 +52689,7 @@ var ts;
         function checkTaggedTemplateExpression(node) {
             checkGrammarTypeArguments(node, node.typeArguments);
             if (languageVersion < 2 /* ES2015 */) {
-                checkExternalEmitHelpers(node, 65536 /* MakeTemplateObject */);
+                checkExternalEmitHelpers(node, 131072 /* MakeTemplateObject */);
             }
             return getReturnTypeOfSignature(getResolvedSignature(node));
         }
@@ -51064,18 +52702,28 @@ var ts;
                 case 14 /* NoSubstitutionTemplateLiteral */:
                 case 8 /* NumericLiteral */:
                 case 9 /* BigIntLiteral */:
-                case 102 /* TrueKeyword */:
-                case 87 /* FalseKeyword */:
-                case 187 /* ArrayLiteralExpression */:
-                case 188 /* ObjectLiteralExpression */:
+                case 103 /* TrueKeyword */:
+                case 88 /* FalseKeyword */:
+                case 188 /* ArrayLiteralExpression */:
+                case 189 /* ObjectLiteralExpression */:
                     return true;
-                case 195 /* ParenthesizedExpression */:
+                case 196 /* ParenthesizedExpression */:
                     return isValidConstAssertionArgument(node.expression);
-                case 202 /* PrefixUnaryExpression */:
+                case 203 /* PrefixUnaryExpression */:
                     var op = node.operator;
                     var arg = node.operand;
                     return op === 39 /* MinusToken */ && (arg.kind === 8 /* NumericLiteral */ || arg.kind === 9 /* BigIntLiteral */) ||
                         op === 38 /* PlusToken */ && arg.kind === 8 /* NumericLiteral */;
+                case 190 /* PropertyAccessExpression */:
+                case 191 /* ElementAccessExpression */:
+                    var expr = node.expression;
+                    if (ts.isIdentifier(expr)) {
+                        var symbol = getSymbolAtLocation(expr);
+                        if (symbol && symbol.flags & 2097152 /* Alias */) {
+                            symbol = resolveAlias(symbol);
+                        }
+                        return !!(symbol && (symbol.flags & 384 /* Enum */) && getEnumKind(symbol) === 1 /* Literal */);
+                    }
             }
             return false;
         }
@@ -51083,7 +52731,7 @@ var ts;
             var exprType = checkExpression(expression, checkMode);
             if (ts.isConstTypeReference(type)) {
                 if (!isValidConstAssertionArgument(expression)) {
-                    error(expression, ts.Diagnostics.A_const_assertion_can_only_be_applied_to_a_string_number_boolean_array_or_object_literal);
+                    error(expression, ts.Diagnostics.A_const_assertions_can_only_be_applied_to_references_to_enum_members_or_string_number_boolean_array_or_object_literals);
                 }
                 return getRegularTypeOfLiteralType(exprType);
             }
@@ -51103,10 +52751,10 @@ var ts;
         }
         function checkMetaProperty(node) {
             checkGrammarMetaProperty(node);
-            if (node.keywordToken === 95 /* NewKeyword */) {
+            if (node.keywordToken === 96 /* NewKeyword */) {
                 return checkNewTargetMetaProperty(node);
             }
-            if (node.keywordToken === 92 /* ImportKeyword */) {
+            if (node.keywordToken === 93 /* ImportKeyword */) {
                 return checkImportMetaProperty(node);
             }
             return ts.Debug.assertNever(node.keywordToken);
@@ -51117,7 +52765,7 @@ var ts;
                 error(node, ts.Diagnostics.Meta_property_0_is_only_allowed_in_the_body_of_a_function_declaration_function_expression_or_constructor, "new.target");
                 return errorType;
             }
-            else if (container.kind === 157 /* Constructor */) {
+            else if (container.kind === 158 /* Constructor */) {
                 var symbol = getSymbolOfNode(container.parent);
                 return getTypeOfSymbol(symbol);
             }
@@ -51127,7 +52775,7 @@ var ts;
             }
         }
         function checkImportMetaProperty(node) {
-            if (languageVersion < 7 /* ESNext */ || moduleKind < ts.ModuleKind.ESNext) {
+            if (languageVersion < 99 /* ESNext */ || moduleKind < ts.ModuleKind.ESNext) {
                 error(node, ts.Diagnostics.The_import_meta_meta_property_is_only_allowed_using_ESNext_for_the_target_and_module_compiler_options);
             }
             var file = ts.getSourceFileOfNode(node);
@@ -51168,9 +52816,14 @@ var ts;
                 return getTypeOfParameter(signature.parameters[pos]);
             }
             if (signature.hasRestParameter) {
+                // We want to return the value undefined for an out of bounds parameter position,
+                // so we need to check bounds here before calling getIndexedAccessType (which
+                // otherwise would return the type 'undefined').
                 var restType = getTypeOfSymbol(signature.parameters[paramCount]);
-                var indexType = getLiteralType(pos - paramCount);
-                return getIndexedAccessType(restType, indexType);
+                var index = pos - paramCount;
+                if (!isTupleType(restType) || restType.target.hasRestElement || index < (restType.typeArguments || ts.emptyArray).length) {
+                    return getIndexedAccessType(restType, getLiteralType(index));
+                }
             }
             return undefined;
         }
@@ -51241,14 +52894,14 @@ var ts;
         function getTypeOfFirstParameterOfSignatureWithFallback(signature, fallbackType) {
             return signature.parameters.length > 0 ? getTypeAtPosition(signature, 0) : fallbackType;
         }
-        function inferFromAnnotatedParameters(signature, context, mapper) {
+        function inferFromAnnotatedParameters(signature, context, inferenceContext) {
             var len = signature.parameters.length - (signature.hasRestParameter ? 1 : 0);
             for (var i = 0; i < len; i++) {
                 var declaration = signature.parameters[i].valueDeclaration;
                 if (declaration.type) {
                     var typeNode = ts.getEffectiveTypeAnnotationNode(declaration);
                     if (typeNode) {
-                        inferTypes(mapper.inferences, getTypeFromTypeNode(typeNode), getTypeAtPosition(context, i));
+                        inferTypes(inferenceContext.inferences, getTypeFromTypeNode(typeNode), getTypeAtPosition(context, i));
                     }
                 }
             }
@@ -51256,12 +52909,12 @@ var ts;
             if (restType && restType.flags & 262144 /* TypeParameter */) {
                 // The contextual signature has a generic rest parameter. We first instantiate the contextual
                 // signature (without fixing type parameters) and assign types to contextually typed parameters.
-                var instantiatedContext = instantiateSignature(context, cloneTypeMapper(mapper));
+                var instantiatedContext = instantiateSignature(context, inferenceContext.nonFixingMapper);
                 assignContextualParameterTypes(signature, instantiatedContext);
                 // We then infer from a tuple type representing the parameters that correspond to the contextual
                 // rest parameter.
                 var restPos = getParameterCount(context) - 1;
-                inferTypes(mapper.inferences, getRestTypeAtPosition(signature, restPos), restType);
+                inferTypes(inferenceContext.inferences, getRestTypeAtPosition(signature, restPos), restType);
             }
         }
         function assignContextualParameterTypes(signature, context) {
@@ -51298,7 +52951,7 @@ var ts;
             for (var _i = 0, _a = pattern.elements; _i < _a.length; _i++) {
                 var element = _a[_i];
                 if (!ts.isOmittedExpression(element)) {
-                    if (element.name.kind === 72 /* Identifier */) {
+                    if (element.name.kind === 73 /* Identifier */) {
                         getSymbolLinks(getSymbolOfNode(element)).type = getTypeForBindingElement(element);
                     }
                     else {
@@ -51312,9 +52965,9 @@ var ts;
             if (!links.type) {
                 links.type = contextualType;
                 var decl = parameter.valueDeclaration;
-                if (decl.name.kind !== 72 /* Identifier */) {
+                if (decl.name.kind !== 73 /* Identifier */) {
                     // if inference didn't come up with anything but {}, fall back to the binding pattern if present.
-                    if (links.type === emptyObjectType) {
+                    if (links.type === unknownType) {
                         links.type = getTypeFromBindingPattern(decl.name);
                     }
                     assignBindingElementTypes(decl.name);
@@ -51326,24 +52979,24 @@ var ts;
             var globalPromiseType = getGlobalPromiseType(/*reportErrors*/ true);
             if (globalPromiseType !== emptyGenericType) {
                 // if the promised type is itself a promise, get the underlying type; otherwise, fallback to the promised type
-                promisedType = getAwaitedType(promisedType) || emptyObjectType;
+                promisedType = getAwaitedType(promisedType) || unknownType;
                 return createTypeReference(globalPromiseType, [promisedType]);
             }
-            return emptyObjectType;
+            return unknownType;
         }
         function createPromiseLikeType(promisedType) {
             // creates a `PromiseLike<T>` type where `T` is the promisedType argument
             var globalPromiseLikeType = getGlobalPromiseLikeType(/*reportErrors*/ true);
             if (globalPromiseLikeType !== emptyGenericType) {
                 // if the promised type is itself a promise, get the underlying type; otherwise, fallback to the promised type
-                promisedType = getAwaitedType(promisedType) || emptyObjectType;
+                promisedType = getAwaitedType(promisedType) || unknownType;
                 return createTypeReference(globalPromiseLikeType, [promisedType]);
             }
-            return emptyObjectType;
+            return unknownType;
         }
         function createPromiseReturnType(func, promisedType) {
             var promiseType = createPromiseType(promisedType);
-            if (promiseType === emptyObjectType) {
+            if (promiseType === unknownType) {
                 error(func, ts.isImportCall(func) ?
                     ts.Diagnostics.A_dynamic_import_call_returns_a_Promise_Make_sure_you_have_a_declaration_for_Promise_or_include_ES2015_in_your_lib_option :
                     ts.Diagnostics.An_async_function_or_method_must_return_a_Promise_Make_sure_you_have_a_declaration_for_Promise_or_include_ES2015_in_your_lib_option);
@@ -51361,99 +53014,148 @@ var ts;
                 return errorType;
             }
             var functionFlags = ts.getFunctionFlags(func);
-            var type;
-            if (func.body.kind !== 218 /* Block */) {
-                type = checkExpressionCached(func.body, checkMode && checkMode & ~8 /* SkipGenericFunctions */);
-                if (functionFlags & 2 /* Async */) {
+            var isAsync = (functionFlags & 2 /* Async */) !== 0;
+            var isGenerator = (functionFlags & 1 /* Generator */) !== 0;
+            var returnType;
+            var yieldType;
+            var nextType;
+            var fallbackReturnType = voidType;
+            if (func.body.kind !== 219 /* Block */) { // Async or normal arrow function
+                returnType = checkExpressionCached(func.body, checkMode && checkMode & ~8 /* SkipGenericFunctions */);
+                if (isAsync) {
                     // From within an async function you can return either a non-promise value or a promise. Any
                     // Promise/A+ compatible implementation will always assimilate any foreign promise, so the
                     // return type of the body should be unwrapped to its awaited type, which we will wrap in
                     // the native Promise<T> type later in this function.
-                    type = checkAwaitedType(type, /*errorNode*/ func, ts.Diagnostics.The_return_type_of_an_async_function_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member);
+                    returnType = checkAwaitedType(returnType, /*errorNode*/ func, ts.Diagnostics.The_return_type_of_an_async_function_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member);
                 }
             }
-            else {
-                var types = checkAndAggregateReturnExpressionTypes(func, checkMode);
-                if (functionFlags & 1 /* Generator */) { // Generator or AsyncGenerator function
-                    types = ts.concatenate(checkAndAggregateYieldOperandTypes(func, checkMode), types);
-                    if (!types || types.length === 0) {
-                        var iterableIteratorAny = functionFlags & 2 /* Async */
-                            ? createAsyncIterableIteratorType(anyType) // AsyncGenerator function
-                            : createIterableIteratorType(anyType); // Generator function
-                        if (noImplicitAny) {
-                            error(func.asteriskToken, ts.Diagnostics.Generator_implicitly_has_type_0_because_it_does_not_yield_any_values_Consider_supplying_a_return_type, typeToString(iterableIteratorAny));
-                        }
-                        return iterableIteratorAny;
-                    }
+            else if (isGenerator) { // Generator or AsyncGenerator function
+                var returnTypes = checkAndAggregateReturnExpressionTypes(func, checkMode);
+                if (!returnTypes) {
+                    fallbackReturnType = neverType;
                 }
-                else {
-                    if (!types) {
-                        // For an async function, the return type will not be never, but rather a Promise for never.
-                        return functionFlags & 2 /* Async */
-                            ? createPromiseReturnType(func, neverType) // Async function
-                            : neverType; // Normal function
-                    }
-                    if (types.length === 0) {
-                        // For an async function, the return type will not be void, but rather a Promise for void.
-                        return functionFlags & 2 /* Async */
-                            ? createPromiseReturnType(func, voidType) // Async function
-                            : voidType; // Normal function
-                    }
+                else if (returnTypes.length > 0) {
+                    returnType = getUnionType(returnTypes, 2 /* Subtype */);
+                }
+                var _a = checkAndAggregateYieldOperandTypes(func, checkMode), yieldTypes = _a.yieldTypes, nextTypes = _a.nextTypes;
+                yieldType = ts.some(yieldTypes) ? getUnionType(yieldTypes, 2 /* Subtype */) : undefined;
+                nextType = ts.some(nextTypes) ? getIntersectionType(nextTypes) : undefined;
+            }
+            else { // Async or normal function
+                var types = checkAndAggregateReturnExpressionTypes(func, checkMode);
+                if (!types) {
+                    // For an async function, the return type will not be never, but rather a Promise for never.
+                    return functionFlags & 2 /* Async */
+                        ? createPromiseReturnType(func, neverType) // Async function
+                        : neverType; // Normal function
+                }
+                if (types.length === 0) {
+                    // For an async function, the return type will not be void, but rather a Promise for void.
+                    return functionFlags & 2 /* Async */
+                        ? createPromiseReturnType(func, voidType) // Async function
+                        : voidType; // Normal function
                 }
                 // Return a union of the return expression types.
-                type = getUnionType(types, 2 /* Subtype */);
+                returnType = getUnionType(types, 2 /* Subtype */);
             }
-            var contextualSignature = getContextualSignatureForFunctionLikeDeclaration(func);
-            if (!contextualSignature) {
-                reportErrorsFromWidening(func, type);
-            }
-            if (isUnitType(type)) {
-                var contextualType = !contextualSignature ? undefined :
-                    contextualSignature === getSignatureFromDeclaration(func) ? type :
-                        getReturnTypeOfSignature(contextualSignature);
-                if (contextualType) {
-                    switch (functionFlags & 3 /* AsyncGenerator */) {
-                        case 3 /* AsyncGenerator */:
-                            contextualType = getIteratedTypeOfGenerator(contextualType, /*isAsyncGenerator*/ true);
-                            break;
-                        case 1 /* Generator */:
-                            contextualType = getIteratedTypeOfGenerator(contextualType, /*isAsyncGenerator*/ false);
-                            break;
-                        case 2 /* Async */:
-                            contextualType = getPromisedTypeOfPromise(contextualType);
-                            break;
+            if (returnType || yieldType || nextType) {
+                var contextualSignature = getContextualSignatureForFunctionLikeDeclaration(func);
+                if (!contextualSignature) {
+                    if (yieldType)
+                        reportErrorsFromWidening(func, yieldType, 1 /* GeneratorYield */);
+                    if (returnType)
+                        reportErrorsFromWidening(func, returnType);
+                    if (nextType)
+                        reportErrorsFromWidening(func, nextType);
+                }
+                if (returnType && isUnitType(returnType) ||
+                    yieldType && isUnitType(yieldType) ||
+                    nextType && isUnitType(nextType)) {
+                    var contextualType = !contextualSignature ? undefined :
+                        contextualSignature === getSignatureFromDeclaration(func) ? isGenerator ? undefined : returnType :
+                            instantiateContextualType(getReturnTypeOfSignature(contextualSignature), func);
+                    if (isGenerator) {
+                        yieldType = getWidenedLiteralLikeTypeForContextualIterationTypeIfNeeded(yieldType, contextualType, 0 /* Yield */, isAsync);
+                        returnType = getWidenedLiteralLikeTypeForContextualIterationTypeIfNeeded(returnType, contextualType, 1 /* Return */, isAsync);
+                        nextType = getWidenedLiteralLikeTypeForContextualIterationTypeIfNeeded(nextType, contextualType, 2 /* Next */, isAsync);
+                    }
+                    else {
+                        returnType = getWidenedLiteralLikeTypeForContextualReturnTypeIfNeeded(returnType, contextualType, isAsync);
                     }
                 }
-                type = getWidenedLiteralLikeTypeForContextualType(type, contextualType);
+                if (yieldType)
+                    yieldType = getWidenedType(yieldType);
+                if (returnType)
+                    returnType = getWidenedType(returnType);
+                if (nextType)
+                    nextType = getWidenedType(nextType);
             }
-            var widenedType = getWidenedType(type);
-            switch (functionFlags & 3 /* AsyncGenerator */) {
-                case 3 /* AsyncGenerator */:
-                    return createAsyncIterableIteratorType(widenedType);
-                case 1 /* Generator */:
-                    return createIterableIteratorType(widenedType);
-                case 2 /* Async */:
-                    // From within an async function you can return either a non-promise value or a promise. Any
-                    // Promise/A+ compatible implementation will always assimilate any foreign promise, so the
-                    // return type of the body is awaited type of the body, wrapped in a native Promise<T> type.
-                    return createPromiseType(widenedType);
-                default:
-                    return widenedType;
+            if (isGenerator) {
+                return createGeneratorReturnType(yieldType || neverType, returnType || fallbackReturnType, nextType || unknownType, isAsync);
             }
+            else {
+                // From within an async function you can return either a non-promise value or a promise. Any
+                // Promise/A+ compatible implementation will always assimilate any foreign promise, so the
+                // return type of the body is awaited type of the body, wrapped in a native Promise<T> type.
+                return isAsync
+                    ? createPromiseType(returnType || fallbackReturnType)
+                    : returnType || fallbackReturnType;
+            }
+        }
+        function createGeneratorReturnType(yieldType, returnType, nextType, isAsyncGenerator) {
+            var resolver = isAsyncGenerator ? asyncIterationTypesResolver : syncIterationTypesResolver;
+            var globalGeneratorType = resolver.getGlobalGeneratorType(/*reportErrors*/ false);
+            yieldType = resolver.resolveIterationType(yieldType, /*errorNode*/ undefined) || unknownType;
+            returnType = resolver.resolveIterationType(returnType, /*errorNode*/ undefined) || unknownType;
+            nextType = resolver.resolveIterationType(nextType, /*errorNode*/ undefined) || unknownType;
+            if (globalGeneratorType === emptyGenericType) {
+                // Fall back to the global IterableIterator if returnType is assignable to the expected return iteration
+                // type of IterableIterator, and the expected next iteration type of IterableIterator is assignable to
+                // nextType.
+                var globalType = resolver.getGlobalIterableIteratorType(/*reportErrors*/ false);
+                var iterationTypes = globalType !== emptyGenericType ? getIterationTypesOfGlobalIterableType(globalType, resolver) : undefined;
+                var iterableIteratorReturnType = iterationTypes ? iterationTypes.returnType : anyType;
+                var iterableIteratorNextType = iterationTypes ? iterationTypes.nextType : undefinedType;
+                if (isTypeAssignableTo(returnType, iterableIteratorReturnType) &&
+                    isTypeAssignableTo(iterableIteratorNextType, nextType)) {
+                    if (globalType !== emptyGenericType) {
+                        return createTypeFromGenericGlobalType(globalType, [yieldType]);
+                    }
+                    // The global IterableIterator type doesn't exist, so report an error
+                    resolver.getGlobalIterableIteratorType(/*reportErrors*/ true);
+                    return emptyObjectType;
+                }
+                // The global Generator type doesn't exist, so report an error
+                resolver.getGlobalGeneratorType(/*reportErrors*/ true);
+                return emptyObjectType;
+            }
+            return createTypeFromGenericGlobalType(globalGeneratorType, [yieldType, returnType, nextType]);
         }
         function checkAndAggregateYieldOperandTypes(func, checkMode) {
-            var aggregatedTypes = [];
+            var yieldTypes = [];
+            var nextTypes = [];
             var isAsync = (ts.getFunctionFlags(func) & 2 /* Async */) !== 0;
             ts.forEachYieldExpression(func.body, function (yieldExpression) {
-                ts.pushIfUnique(aggregatedTypes, getYieldedTypeOfYieldExpression(yieldExpression, isAsync, checkMode));
+                var yieldExpressionType = yieldExpression.expression ? checkExpression(yieldExpression.expression, checkMode) : undefinedWideningType;
+                ts.pushIfUnique(yieldTypes, getYieldedTypeOfYieldExpression(yieldExpression, yieldExpressionType, anyType, isAsync));
+                var nextType;
+                if (yieldExpression.asteriskToken) {
+                    var iterationTypes = getIterationTypesOfIterable(yieldExpressionType, isAsync ? 19 /* AsyncYieldStar */ : 17 /* YieldStar */, yieldExpression.expression);
+                    nextType = iterationTypes && iterationTypes.nextType;
+                }
+                else {
+                    nextType = getContextualType(yieldExpression);
+                }
+                if (nextType)
+                    ts.pushIfUnique(nextTypes, nextType);
             });
-            return aggregatedTypes;
+            return { yieldTypes: yieldTypes, nextTypes: nextTypes };
         }
-        function getYieldedTypeOfYieldExpression(node, isAsync, checkMode) {
+        function getYieldedTypeOfYieldExpression(node, expressionType, sentType, isAsync) {
             var errorNode = node.expression || node;
-            var expressionType = node.expression ? checkExpression(node.expression, checkMode) : undefinedWideningType;
             // A `yield*` expression effectively yields everything that its operand yields
-            var yieldedType = node.asteriskToken ? checkIteratedTypeOrElementType(expressionType, errorNode, /*allowStringInput*/ false, isAsync) : expressionType;
+            var yieldedType = node.asteriskToken ? checkIteratedTypeOrElementType(isAsync ? 19 /* AsyncYieldStar */ : 17 /* YieldStar */, expressionType, sentType, errorNode) : expressionType;
             return !isAsync ? yieldedType : getAwaitedType(yieldedType, errorNode, node.asteriskToken
                 ? ts.Diagnostics.Type_of_iterated_elements_of_a_yield_Asterisk_operand_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member
                 : ts.Diagnostics.Type_of_yield_operand_in_an_async_generator_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member);
@@ -51504,7 +53206,7 @@ var ts;
             if (!node.possiblyExhaustive) {
                 return false;
             }
-            if (node.expression.kind === 199 /* TypeOfExpression */) {
+            if (node.expression.kind === 200 /* TypeOfExpression */) {
                 var operandType = getTypeOfExpression(node.expression.expression);
                 // This cast is safe because the switch is possibly exhaustive and does not contain a default case, so there can be no undefined.
                 var witnesses = getSwitchClauseTypeOfWitnesses(node);
@@ -51527,7 +53229,7 @@ var ts;
             if (!(func.flags & 128 /* HasImplicitReturn */)) {
                 return false;
             }
-            if (ts.some(func.body.statements, function (statement) { return statement.kind === 232 /* SwitchStatement */ && isExhaustiveSwitchStatement(statement); })) {
+            if (ts.some(func.body.statements, function (statement) { return statement.kind === 233 /* SwitchStatement */ && isExhaustiveSwitchStatement(statement); })) {
                 return false;
             }
             return true;
@@ -51570,11 +53272,11 @@ var ts;
         }
         function mayReturnNever(func) {
             switch (func.kind) {
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
                     return true;
-                case 156 /* MethodDeclaration */:
-                    return func.parent.kind === 188 /* ObjectLiteralExpression */;
+                case 157 /* MethodDeclaration */:
+                    return func.parent.kind === 189 /* ObjectLiteralExpression */;
                 default:
                     return false;
             }
@@ -51592,30 +53294,32 @@ var ts;
             if (!produceDiagnostics) {
                 return;
             }
+            var functionFlags = ts.getFunctionFlags(func);
+            var type = returnType && getReturnOrPromisedType(returnType, functionFlags);
             // Functions with with an explicitly specified 'void' or 'any' return type don't need any return expressions.
-            if (returnType && maybeTypeOfKind(returnType, 1 /* Any */ | 16384 /* Void */)) {
+            if (type && maybeTypeOfKind(type, 1 /* Any */ | 16384 /* Void */)) {
                 return;
             }
             // If all we have is a function signature, or an arrow function with an expression body, then there is nothing to check.
             // also if HasImplicitReturn flag is not set this means that all codepaths in function body end with return or throw
-            if (func.kind === 155 /* MethodSignature */ || ts.nodeIsMissing(func.body) || func.body.kind !== 218 /* Block */ || !functionHasImplicitReturn(func)) {
+            if (func.kind === 156 /* MethodSignature */ || ts.nodeIsMissing(func.body) || func.body.kind !== 219 /* Block */ || !functionHasImplicitReturn(func)) {
                 return;
             }
             var hasExplicitReturn = func.flags & 256 /* HasExplicitReturn */;
-            if (returnType && returnType.flags & 131072 /* Never */) {
+            if (type && type.flags & 131072 /* Never */) {
                 error(ts.getEffectiveReturnTypeNode(func), ts.Diagnostics.A_function_returning_never_cannot_have_a_reachable_end_point);
             }
-            else if (returnType && !hasExplicitReturn) {
+            else if (type && !hasExplicitReturn) {
                 // minimal check: function has syntactic return type annotation and no explicit return statements in the body
                 // this function does not conform to the specification.
                 // NOTE: having returnType !== undefined is a precondition for entering this branch so func.type will always be present
                 error(ts.getEffectiveReturnTypeNode(func), ts.Diagnostics.A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value);
             }
-            else if (returnType && strictNullChecks && !isTypeAssignableTo(undefinedType, returnType)) {
+            else if (type && strictNullChecks && !isTypeAssignableTo(undefinedType, type)) {
                 error(ts.getEffectiveReturnTypeNode(func), ts.Diagnostics.Function_lacks_ending_return_statement_and_return_type_does_not_include_undefined);
             }
             else if (compilerOptions.noImplicitReturns) {
-                if (!returnType) {
+                if (!type) {
                     // If return type annotation is omitted check if function has any explicit return statements.
                     // If it does not have any - its inferred return type is void - don't do any checks.
                     // Otherwise get inferred return type from function body and report error only if it is not void / anytype
@@ -51631,34 +53335,38 @@ var ts;
             }
         }
         function checkFunctionExpressionOrObjectLiteralMethod(node, checkMode) {
-            ts.Debug.assert(node.kind !== 156 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 157 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
             checkNodeDeferred(node);
             // The identityMapper object is used to indicate that function expressions are wildcards
             if (checkMode && checkMode & 4 /* SkipContextSensitive */ && isContextSensitive(node)) {
                 // Skip parameters, return signature with return type that retains noncontextual parts so inferences can still be drawn in an early stage
                 if (!ts.getEffectiveReturnTypeNode(node) && hasContextSensitiveReturnExpression(node)) {
-                    var links_1 = getNodeLinks(node);
-                    if (links_1.contextFreeType) {
-                        return links_1.contextFreeType;
+                    var links = getNodeLinks(node);
+                    if (links.contextFreeType) {
+                        return links.contextFreeType;
                     }
                     var returnType = getReturnTypeFromBody(node, checkMode);
                     var returnOnlySignature = createSignature(undefined, undefined, undefined, ts.emptyArray, returnType, /*resolvedTypePredicate*/ undefined, 0, /*hasRestParameter*/ false, /*hasLiteralTypes*/ false);
                     var returnOnlyType = createAnonymousType(node.symbol, emptySymbols, [returnOnlySignature], ts.emptyArray, undefined, undefined);
-                    returnOnlyType.objectFlags |= 524288 /* ContainsAnyFunctionType */;
-                    return links_1.contextFreeType = returnOnlyType;
+                    returnOnlyType.objectFlags |= 1048576 /* NonInferrableType */;
+                    return links.contextFreeType = returnOnlyType;
                 }
                 return anyFunctionType;
             }
             // Grammar checking
             var hasGrammarError = checkGrammarFunctionLikeDeclaration(node);
-            if (!hasGrammarError && node.kind === 196 /* FunctionExpression */) {
+            if (!hasGrammarError && node.kind === 197 /* FunctionExpression */) {
                 checkGrammarForGenerator(node);
             }
-            var links = getNodeLinks(node);
             var type = getTypeOfSymbol(getMergedSymbol(node.symbol));
             if (isTypeAny(type)) {
                 return type;
             }
+            contextuallyCheckFunctionExpressionOrObjectLiteralMethod(node, checkMode);
+            return type;
+        }
+        function contextuallyCheckFunctionExpressionOrObjectLiteralMethod(node, checkMode) {
+            var links = getNodeLinks(node);
             // Check if function expression is contextually typed and assign parameter types if so.
             if (!(links.flags & 1024 /* ContextChecked */)) {
                 var contextualSignature = getContextualSignature(node);
@@ -51668,14 +53376,18 @@ var ts;
                 if (!(links.flags & 1024 /* ContextChecked */)) {
                     links.flags |= 1024 /* ContextChecked */;
                     if (contextualSignature) {
+                        var type = getTypeOfSymbol(getMergedSymbol(node.symbol));
+                        if (isTypeAny(type)) {
+                            return;
+                        }
                         var signature = getSignaturesOfType(type, 0 /* Call */)[0];
                         if (isContextSensitive(node)) {
-                            var contextualMapper = getContextualMapper(node);
+                            var inferenceContext = getInferenceContext(node);
                             if (checkMode && checkMode & 2 /* Inferential */) {
-                                inferFromAnnotatedParameters(signature, contextualSignature, contextualMapper);
+                                inferFromAnnotatedParameters(signature, contextualSignature, inferenceContext);
                             }
-                            var instantiatedContextualSignature = contextualMapper === identityMapper ?
-                                contextualSignature : instantiateSignature(contextualSignature, contextualMapper);
+                            var instantiatedContextualSignature = inferenceContext ?
+                                instantiateSignature(contextualSignature, inferenceContext.mapper) : contextualSignature;
                             assignContextualParameterTypes(signature, instantiatedContextualSignature);
                         }
                         if (!getReturnTypeFromAnnotation(node) && !signature.resolvedReturnType) {
@@ -51688,21 +53400,19 @@ var ts;
                     checkSignatureDeclaration(node);
                 }
             }
-            return type;
         }
-        function getReturnOrPromisedType(node, functionFlags) {
-            var type = getReturnTypeFromAnnotation(node);
-            return type && ((functionFlags & 3 /* AsyncGenerator */) === 2 /* Async */) ?
-                getAwaitedType(type) || errorType : type;
+        function getReturnOrPromisedType(type, functionFlags) {
+            var isGenerator = !!(functionFlags & 1 /* Generator */);
+            var isAsync = !!(functionFlags & 2 /* Async */);
+            return type && isGenerator ? getIterationTypeOfGeneratorFunctionReturnType(1 /* Return */, type, isAsync) || errorType :
+                type && isAsync ? getAwaitedType(type) || errorType :
+                    type;
         }
         function checkFunctionExpressionOrObjectLiteralMethodDeferred(node) {
-            ts.Debug.assert(node.kind !== 156 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 157 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
             var functionFlags = ts.getFunctionFlags(node);
-            var returnOrPromisedType = getReturnOrPromisedType(node, functionFlags);
-            if ((functionFlags & 1 /* Generator */) === 0) { // Async function or normal function
-                // return is not necessary in the body of generators
-                checkAllCodePathsInNonVoidFunctionReturnOrThrow(node, returnOrPromisedType);
-            }
+            var returnType = getReturnTypeFromAnnotation(node);
+            checkAllCodePathsInNonVoidFunctionReturnOrThrow(node, returnType);
             if (node.body) {
                 if (!ts.getEffectiveReturnTypeNode(node)) {
                     // There are some checks that are only performed in getReturnTypeFromBody, that may produce errors
@@ -51712,7 +53422,7 @@ var ts;
                     // checkFunctionExpressionBodies). So it must be done now.
                     getReturnTypeOfSignature(getSignatureFromDeclaration(node));
                 }
-                if (node.body.kind === 218 /* Block */) {
+                if (node.body.kind === 219 /* Block */) {
                     checkSourceElement(node.body);
                 }
                 else {
@@ -51722,6 +53432,7 @@ var ts;
                     // check assignability of the awaited type of the expression body against the promised type of
                     // its return type annotation.
                     var exprType = checkExpression(node.body);
+                    var returnOrPromisedType = getReturnOrPromisedType(returnType, functionFlags);
                     if (returnOrPromisedType) {
                         if ((functionFlags & 3 /* AsyncGenerator */) === 2 /* Async */) { // Async function
                             var awaitedType = checkAwaitedType(exprType, node.body, ts.Diagnostics.The_return_type_of_an_async_function_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member);
@@ -51734,9 +53445,11 @@ var ts;
                 }
             }
         }
-        function checkArithmeticOperandType(operand, type, diagnostic) {
+        function checkArithmeticOperandType(operand, type, diagnostic, isAwaitValid) {
+            if (isAwaitValid === void 0) { isAwaitValid = false; }
             if (!isTypeAssignableTo(type, numberOrBigIntType)) {
-                error(operand, diagnostic);
+                var awaitedType = isAwaitValid && getAwaitedTypeOfPromise(type);
+                errorAndMaybeSuggestAwait(operand, !!awaitedType && isTypeAssignableTo(awaitedType, numberOrBigIntType), diagnostic);
                 return false;
             }
             return true;
@@ -51790,11 +53503,11 @@ var ts;
             if (isReadonlySymbol(symbol)) {
                 // Allow assignments to readonly properties within constructors of the same class declaration.
                 if (symbol.flags & 4 /* Property */ &&
-                    (expr.kind === 189 /* PropertyAccessExpression */ || expr.kind === 190 /* ElementAccessExpression */) &&
-                    expr.expression.kind === 100 /* ThisKeyword */) {
+                    (expr.kind === 190 /* PropertyAccessExpression */ || expr.kind === 191 /* ElementAccessExpression */) &&
+                    expr.expression.kind === 101 /* ThisKeyword */) {
                     // Look for if this is the constructor for the class that `symbol` is a property of.
                     var func = ts.getContainingFunction(expr);
-                    if (!(func && func.kind === 157 /* Constructor */)) {
+                    if (!(func && func.kind === 158 /* Constructor */)) {
                         return true;
                     }
                     // If func.parent is a class and symbol is a (readonly) property of that class, or
@@ -51807,13 +53520,13 @@ var ts;
             return false;
         }
         function isReferenceThroughNamespaceImport(expr) {
-            if (expr.kind === 189 /* PropertyAccessExpression */ || expr.kind === 190 /* ElementAccessExpression */) {
+            if (expr.kind === 190 /* PropertyAccessExpression */ || expr.kind === 191 /* ElementAccessExpression */) {
                 var node = ts.skipParentheses(expr.expression);
-                if (node.kind === 72 /* Identifier */) {
+                if (node.kind === 73 /* Identifier */) {
                     var symbol = getNodeLinks(node).resolvedSymbol;
                     if (symbol.flags & 2097152 /* Alias */) {
                         var declaration = getDeclarationOfAliasSymbol(symbol);
-                        return !!declaration && declaration.kind === 251 /* NamespaceImport */;
+                        return !!declaration && declaration.kind === 252 /* NamespaceImport */;
                     }
                 }
             }
@@ -51822,7 +53535,7 @@ var ts;
         function checkReferenceExpression(expr, invalidReferenceMessage) {
             // References are combinations of identifiers, parentheses, and property accesses.
             var node = ts.skipOuterExpressions(expr, 2 /* Assertions */ | 1 /* Parentheses */);
-            if (node.kind !== 72 /* Identifier */ && node.kind !== 189 /* PropertyAccessExpression */ && node.kind !== 190 /* ElementAccessExpression */) {
+            if (node.kind !== 73 /* Identifier */ && node.kind !== 190 /* PropertyAccessExpression */ && node.kind !== 191 /* ElementAccessExpression */) {
                 error(expr, invalidReferenceMessage);
                 return false;
             }
@@ -51831,7 +53544,7 @@ var ts;
         function checkDeleteExpression(node) {
             checkExpression(node.expression);
             var expr = ts.skipParentheses(node.expression);
-            if (expr.kind !== 189 /* PropertyAccessExpression */ && expr.kind !== 190 /* ElementAccessExpression */) {
+            if (expr.kind !== 190 /* PropertyAccessExpression */ && expr.kind !== 191 /* ElementAccessExpression */) {
                 error(expr, ts.Diagnostics.The_operand_of_a_delete_operator_must_be_a_property_reference);
                 return booleanType;
             }
@@ -51854,7 +53567,19 @@ var ts;
             // Grammar checking
             if (produceDiagnostics) {
                 if (!(node.flags & 16384 /* AwaitContext */)) {
-                    grammarErrorOnFirstToken(node, ts.Diagnostics.await_expression_is_only_allowed_within_an_async_function);
+                    // use of 'await' in non-async function
+                    var sourceFile = ts.getSourceFileOfNode(node);
+                    if (!hasParseDiagnostics(sourceFile)) {
+                        var span = ts.getSpanOfTokenAtPosition(sourceFile, node.pos);
+                        var diagnostic = ts.createFileDiagnostic(sourceFile, span.start, span.length, ts.Diagnostics.await_expression_is_only_allowed_within_an_async_function);
+                        var func = ts.getContainingFunction(node);
+                        if (func && func.kind !== 158 /* Constructor */) {
+                            ts.Debug.assert((ts.getFunctionFlags(func) & 2 /* Async */) === 0, "Enclosing function should never be an async function.");
+                            var relatedInfo = ts.createDiagnosticForNode(func, ts.Diagnostics.Did_you_mean_to_mark_this_function_as_async);
+                            ts.addRelatedInfo(diagnostic, relatedInfo);
+                        }
+                        diagnostics.add(diagnostic);
+                    }
                 }
                 if (isInParameterInitializerBeforeContainingFunction(node)) {
                     error(node, ts.Diagnostics.await_expressions_cannot_be_used_in_a_parameter_initializer);
@@ -52026,16 +53751,17 @@ var ts;
             if (strictNullChecks && properties.length === 0) {
                 return checkNonNullType(sourceType, node);
             }
-            for (var _i = 0, properties_6 = properties; _i < properties_6.length; _i++) {
-                var p = properties_6[_i];
-                checkObjectLiteralDestructuringPropertyAssignment(sourceType, p, properties, rightIsThis);
+            for (var i = 0; i < properties.length; i++) {
+                checkObjectLiteralDestructuringPropertyAssignment(node, sourceType, i, properties, rightIsThis);
             }
             return sourceType;
         }
         /** Note: If property cannot be a SpreadAssignment, then allProperties does not need to be provided */
-        function checkObjectLiteralDestructuringPropertyAssignment(objectLiteralType, property, allProperties, rightIsThis) {
+        function checkObjectLiteralDestructuringPropertyAssignment(node, objectLiteralType, propertyIndex, allProperties, rightIsThis) {
             if (rightIsThis === void 0) { rightIsThis = false; }
-            if (property.kind === 275 /* PropertyAssignment */ || property.kind === 276 /* ShorthandPropertyAssignment */) {
+            var properties = node.properties;
+            var property = properties[propertyIndex];
+            if (property.kind === 276 /* PropertyAssignment */ || property.kind === 277 /* ShorthandPropertyAssignment */) {
                 var name = property.name;
                 var exprType = getLiteralTypeFromPropertyName(name);
                 if (isTypeUsableAsPropertyName(exprType)) {
@@ -52048,21 +53774,29 @@ var ts;
                 }
                 var elementType = getIndexedAccessType(objectLiteralType, exprType, name);
                 var type = getFlowTypeOfDestructuring(property, elementType);
-                return checkDestructuringAssignment(property.kind === 276 /* ShorthandPropertyAssignment */ ? property : property.initializer, type);
+                return checkDestructuringAssignment(property.kind === 277 /* ShorthandPropertyAssignment */ ? property : property.initializer, type);
             }
-            else if (property.kind === 277 /* SpreadAssignment */) {
-                if (languageVersion < 7 /* ESNext */) {
-                    checkExternalEmitHelpers(property, 4 /* Rest */);
+            else if (property.kind === 278 /* SpreadAssignment */) {
+                if (propertyIndex < properties.length - 1) {
+                    error(property, ts.Diagnostics.A_rest_element_must_be_last_in_a_destructuring_pattern);
                 }
-                var nonRestNames = [];
-                if (allProperties) {
-                    for (var i = 0; i < allProperties.length - 1; i++) {
-                        nonRestNames.push(allProperties[i].name);
+                else {
+                    if (languageVersion < 99 /* ESNext */) {
+                        checkExternalEmitHelpers(property, 4 /* Rest */);
                     }
+                    var nonRestNames = [];
+                    if (allProperties) {
+                        for (var _i = 0, allProperties_1 = allProperties; _i < allProperties_1.length; _i++) {
+                            var otherProperty = allProperties_1[_i];
+                            if (!ts.isSpreadAssignment(otherProperty)) {
+                                nonRestNames.push(otherProperty.name);
+                            }
+                        }
+                    }
+                    var type = getRestType(objectLiteralType, nonRestNames, objectLiteralType.symbol);
+                    checkGrammarForDisallowedTrailingComma(allProperties, ts.Diagnostics.A_rest_parameter_or_binding_pattern_may_not_have_a_trailing_comma);
+                    return checkDestructuringAssignment(property.expression, type);
                 }
-                var type = getRestType(objectLiteralType, nonRestNames, objectLiteralType.symbol);
-                checkGrammarForDisallowedTrailingComma(allProperties, ts.Diagnostics.A_rest_parameter_or_binding_pattern_may_not_have_a_trailing_comma);
-                return checkDestructuringAssignment(property.expression, type);
             }
             else {
                 error(property, ts.Diagnostics.Property_assignment_expected);
@@ -52076,7 +53810,7 @@ var ts;
             // This elementType will be used if the specific property corresponding to this index is not
             // present (aka the tuple element property). This call also checks that the parentType is in
             // fact an iterable or array (depending on target language).
-            var elementType = checkIteratedTypeOrElementType(sourceType, node, /*allowStringInput*/ false, /*allowAsyncIterables*/ false) || errorType;
+            var elementType = checkIteratedTypeOrElementType(65 /* Destructuring */, sourceType, undefinedType, node) || errorType;
             for (var i = 0; i < elements.length; i++) {
                 checkArrayLiteralDestructuringElementAssignment(node, sourceType, i, elementType, checkMode);
             }
@@ -52085,14 +53819,16 @@ var ts;
         function checkArrayLiteralDestructuringElementAssignment(node, sourceType, elementIndex, elementType, checkMode) {
             var elements = node.elements;
             var element = elements[elementIndex];
-            if (element.kind !== 210 /* OmittedExpression */) {
-                if (element.kind !== 208 /* SpreadElement */) {
+            if (element.kind !== 211 /* OmittedExpression */) {
+                if (element.kind !== 209 /* SpreadElement */) {
                     var indexType = getLiteralType(elementIndex);
                     if (isArrayLikeType(sourceType)) {
                         // We create a synthetic expression so that getIndexedAccessType doesn't get confused
                         // when the element is a SyntaxKind.ElementAccessExpression.
-                        var elementType_2 = getIndexedAccessType(sourceType, indexType, createSyntheticExpression(element, indexType));
-                        var type = getFlowTypeOfDestructuring(element, elementType_2);
+                        var accessFlags = hasDefaultValue(element) ? 8 /* NoTupleBoundsCheck */ : 0;
+                        var elementType_2 = getIndexedAccessTypeOrUndefined(sourceType, indexType, createSyntheticExpression(element, indexType), accessFlags) || errorType;
+                        var assignedType = hasDefaultValue(element) ? getTypeWithFacts(elementType_2, 524288 /* NEUndefined */) : elementType_2;
+                        var type = getFlowTypeOfDestructuring(element, assignedType);
                         return checkDestructuringAssignment(element, type, checkMode);
                     }
                     return checkDestructuringAssignment(element, elementType, checkMode);
@@ -52102,7 +53838,7 @@ var ts;
                 }
                 else {
                     var restExpression = element.expression;
-                    if (restExpression.kind === 204 /* BinaryExpression */ && restExpression.operatorToken.kind === 59 /* EqualsToken */) {
+                    if (restExpression.kind === 205 /* BinaryExpression */ && restExpression.operatorToken.kind === 60 /* EqualsToken */) {
                         error(restExpression.operatorToken, ts.Diagnostics.A_rest_element_cannot_have_an_initializer);
                     }
                     else {
@@ -52118,7 +53854,7 @@ var ts;
         }
         function checkDestructuringAssignment(exprOrAssignment, sourceType, checkMode, rightIsThis) {
             var target;
-            if (exprOrAssignment.kind === 276 /* ShorthandPropertyAssignment */) {
+            if (exprOrAssignment.kind === 277 /* ShorthandPropertyAssignment */) {
                 var prop = exprOrAssignment;
                 if (prop.objectAssignmentInitializer) {
                     // In strict null checking mode, if a default value of a non-undefined type is specified, remove
@@ -52134,21 +53870,21 @@ var ts;
             else {
                 target = exprOrAssignment;
             }
-            if (target.kind === 204 /* BinaryExpression */ && target.operatorToken.kind === 59 /* EqualsToken */) {
+            if (target.kind === 205 /* BinaryExpression */ && target.operatorToken.kind === 60 /* EqualsToken */) {
                 checkBinaryExpression(target, checkMode);
                 target = target.left;
             }
-            if (target.kind === 188 /* ObjectLiteralExpression */) {
+            if (target.kind === 189 /* ObjectLiteralExpression */) {
                 return checkObjectLiteralAssignment(target, sourceType, rightIsThis);
             }
-            if (target.kind === 187 /* ArrayLiteralExpression */) {
+            if (target.kind === 188 /* ArrayLiteralExpression */) {
                 return checkArrayLiteralAssignment(target, sourceType, checkMode);
             }
             return checkReferenceAssignment(target, sourceType, checkMode);
         }
         function checkReferenceAssignment(target, sourceType, checkMode) {
             var targetType = checkExpression(target, checkMode);
-            var error = target.parent.kind === 277 /* SpreadAssignment */ ?
+            var error = target.parent.kind === 278 /* SpreadAssignment */ ?
                 ts.Diagnostics.The_target_of_an_object_rest_assignment_must_be_a_variable_or_a_property_access :
                 ts.Diagnostics.The_left_hand_side_of_an_assignment_expression_must_be_a_variable_or_a_property_access;
             if (checkReferenceExpression(target, error)) {
@@ -52167,39 +53903,39 @@ var ts;
         function isSideEffectFree(node) {
             node = ts.skipParentheses(node);
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                 case 10 /* StringLiteral */:
                 case 13 /* RegularExpressionLiteral */:
-                case 193 /* TaggedTemplateExpression */:
-                case 206 /* TemplateExpression */:
+                case 194 /* TaggedTemplateExpression */:
+                case 207 /* TemplateExpression */:
                 case 14 /* NoSubstitutionTemplateLiteral */:
                 case 8 /* NumericLiteral */:
                 case 9 /* BigIntLiteral */:
-                case 102 /* TrueKeyword */:
-                case 87 /* FalseKeyword */:
-                case 96 /* NullKeyword */:
-                case 141 /* UndefinedKeyword */:
-                case 196 /* FunctionExpression */:
-                case 209 /* ClassExpression */:
-                case 197 /* ArrowFunction */:
-                case 187 /* ArrayLiteralExpression */:
-                case 188 /* ObjectLiteralExpression */:
-                case 199 /* TypeOfExpression */:
-                case 213 /* NonNullExpression */:
-                case 261 /* JsxSelfClosingElement */:
-                case 260 /* JsxElement */:
+                case 103 /* TrueKeyword */:
+                case 88 /* FalseKeyword */:
+                case 97 /* NullKeyword */:
+                case 142 /* UndefinedKeyword */:
+                case 197 /* FunctionExpression */:
+                case 210 /* ClassExpression */:
+                case 198 /* ArrowFunction */:
+                case 188 /* ArrayLiteralExpression */:
+                case 189 /* ObjectLiteralExpression */:
+                case 200 /* TypeOfExpression */:
+                case 214 /* NonNullExpression */:
+                case 262 /* JsxSelfClosingElement */:
+                case 261 /* JsxElement */:
                     return true;
-                case 205 /* ConditionalExpression */:
+                case 206 /* ConditionalExpression */:
                     return isSideEffectFree(node.whenTrue) &&
                         isSideEffectFree(node.whenFalse);
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     if (ts.isAssignmentOperator(node.operatorToken.kind)) {
                         return false;
                     }
                     return isSideEffectFree(node.left) &&
                         isSideEffectFree(node.right);
-                case 202 /* PrefixUnaryExpression */:
-                case 203 /* PostfixUnaryExpression */:
+                case 203 /* PrefixUnaryExpression */:
+                case 204 /* PostfixUnaryExpression */:
                     // Unary operators ~, !, +, and - have no side effects.
                     // The rest do.
                     switch (node.operator) {
@@ -52211,9 +53947,9 @@ var ts;
                     }
                     return false;
                 // Some forms listed here for clarity
-                case 200 /* VoidExpression */: // Explicit opt-out
-                case 194 /* TypeAssertionExpression */: // Not SEF, but can produce useful type warnings
-                case 212 /* AsExpression */: // Not SEF, but can produce useful type warnings
+                case 201 /* VoidExpression */: // Explicit opt-out
+                case 195 /* TypeAssertionExpression */: // Not SEF, but can produce useful type warnings
+                case 213 /* AsExpression */: // Not SEF, but can produce useful type warnings
                 default:
                     return false;
             }
@@ -52229,8 +53965,8 @@ var ts;
         }
         function checkBinaryLikeExpression(left, operatorToken, right, checkMode, errorNode) {
             var operator = operatorToken.kind;
-            if (operator === 59 /* EqualsToken */ && (left.kind === 188 /* ObjectLiteralExpression */ || left.kind === 187 /* ArrayLiteralExpression */)) {
-                return checkDestructuringAssignment(left, checkExpression(right, checkMode), checkMode, right.kind === 100 /* ThisKeyword */);
+            if (operator === 60 /* EqualsToken */ && (left.kind === 189 /* ObjectLiteralExpression */ || left.kind === 188 /* ArrayLiteralExpression */)) {
+                return checkDestructuringAssignment(left, checkExpression(right, checkMode), checkMode, right.kind === 101 /* ThisKeyword */);
             }
             var leftType;
             if (operator === 54 /* AmpersandAmpersandToken */ || operator === 55 /* BarBarToken */) {
@@ -52243,26 +53979,26 @@ var ts;
             switch (operator) {
                 case 40 /* AsteriskToken */:
                 case 41 /* AsteriskAsteriskToken */:
-                case 62 /* AsteriskEqualsToken */:
-                case 63 /* AsteriskAsteriskEqualsToken */:
+                case 63 /* AsteriskEqualsToken */:
+                case 64 /* AsteriskAsteriskEqualsToken */:
                 case 42 /* SlashToken */:
-                case 64 /* SlashEqualsToken */:
+                case 65 /* SlashEqualsToken */:
                 case 43 /* PercentToken */:
-                case 65 /* PercentEqualsToken */:
+                case 66 /* PercentEqualsToken */:
                 case 39 /* MinusToken */:
-                case 61 /* MinusEqualsToken */:
+                case 62 /* MinusEqualsToken */:
                 case 46 /* LessThanLessThanToken */:
-                case 66 /* LessThanLessThanEqualsToken */:
+                case 67 /* LessThanLessThanEqualsToken */:
                 case 47 /* GreaterThanGreaterThanToken */:
-                case 67 /* GreaterThanGreaterThanEqualsToken */:
+                case 68 /* GreaterThanGreaterThanEqualsToken */:
                 case 48 /* GreaterThanGreaterThanGreaterThanToken */:
-                case 68 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
+                case 69 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
                 case 50 /* BarToken */:
-                case 70 /* BarEqualsToken */:
+                case 71 /* BarEqualsToken */:
                 case 51 /* CaretToken */:
-                case 71 /* CaretEqualsToken */:
+                case 72 /* CaretEqualsToken */:
                 case 49 /* AmpersandToken */:
-                case 69 /* AmpersandEqualsToken */:
+                case 70 /* AmpersandEqualsToken */:
                     if (leftType === silentNeverType || rightType === silentNeverType) {
                         return silentNeverType;
                     }
@@ -52279,8 +54015,8 @@ var ts;
                     }
                     else {
                         // otherwise just check each operand separately and report errors as normal
-                        var leftOk = checkArithmeticOperandType(left, leftType, ts.Diagnostics.The_left_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_bigint_or_an_enum_type);
-                        var rightOk = checkArithmeticOperandType(right, rightType, ts.Diagnostics.The_right_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_bigint_or_an_enum_type);
+                        var leftOk = checkArithmeticOperandType(left, leftType, ts.Diagnostics.The_left_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_bigint_or_an_enum_type, /*isAwaitValid*/ true);
+                        var rightOk = checkArithmeticOperandType(right, rightType, ts.Diagnostics.The_right_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_bigint_or_an_enum_type, /*isAwaitValid*/ true);
                         var resultType_1;
                         // If both are any or unknown, allow operation; assume it will resolve to number
                         if ((isTypeAssignableToKind(leftType, 3 /* AnyOrUnknown */) && isTypeAssignableToKind(rightType, 3 /* AnyOrUnknown */)) ||
@@ -52288,17 +54024,18 @@ var ts;
                             !(maybeTypeOfKind(leftType, 2112 /* BigIntLike */) || maybeTypeOfKind(rightType, 2112 /* BigIntLike */))) {
                             resultType_1 = numberType;
                         }
-                        // At least one is assignable to bigint, so both should be only assignable to bigint
+                        // At least one is assignable to bigint, so check that both are
                         else if (isTypeAssignableToKind(leftType, 2112 /* BigIntLike */) && isTypeAssignableToKind(rightType, 2112 /* BigIntLike */)) {
                             switch (operator) {
                                 case 48 /* GreaterThanGreaterThanGreaterThanToken */:
-                                case 68 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
+                                case 69 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
                                     reportOperatorError();
                             }
                             resultType_1 = bigintType;
                         }
+                        // Exactly one of leftType/rightType is assignable to bigint
                         else {
-                            reportOperatorError();
+                            reportOperatorError(function (awaitedLeft, awaitedRight) { return isTypeAssignableToKind(awaitedLeft, 2112 /* BigIntLike */) && isTypeAssignableToKind(awaitedRight, 2112 /* BigIntLike */); });
                             resultType_1 = errorType;
                         }
                         if (leftOk && rightOk) {
@@ -52307,7 +54044,7 @@ var ts;
                         return resultType_1;
                     }
                 case 38 /* PlusToken */:
-                case 60 /* PlusEqualsToken */:
+                case 61 /* PlusEqualsToken */:
                     if (leftType === silentNeverType || rightType === silentNeverType) {
                         return silentNeverType;
                     }
@@ -52339,10 +54076,18 @@ var ts;
                         return resultType;
                     }
                     if (!resultType) {
-                        reportOperatorError();
+                        // Types that have a reasonably good chance of being a valid operand type.
+                        // If both types have an awaited type of one of these, we’ll assume the user
+                        // might be missing an await without doing an exhaustive check that inserting
+                        // await(s) will actually be a completely valid binary expression.
+                        var closeEnoughKind_1 = 296 /* NumberLike */ | 2112 /* BigIntLike */ | 132 /* StringLike */ | 3 /* AnyOrUnknown */;
+                        reportOperatorError(function (awaitedLeft, awaitedRight) {
+                            return isTypeAssignableToKind(awaitedLeft, closeEnoughKind_1) &&
+                                isTypeAssignableToKind(awaitedRight, closeEnoughKind_1);
+                        });
                         return anyType;
                     }
-                    if (operator === 60 /* PlusEqualsToken */) {
+                    if (operator === 61 /* PlusEqualsToken */) {
                         checkAssignmentOperator(resultType);
                     }
                     return resultType;
@@ -52353,29 +54098,20 @@ var ts;
                     if (checkForDisallowedESSymbolOperand(operator)) {
                         leftType = getBaseTypeOfLiteralType(checkNonNullType(leftType, left));
                         rightType = getBaseTypeOfLiteralType(checkNonNullType(rightType, right));
-                        if (!(isTypeComparableTo(leftType, rightType) || isTypeComparableTo(rightType, leftType) ||
-                            (isTypeAssignableTo(leftType, numberOrBigIntType) && isTypeAssignableTo(rightType, numberOrBigIntType)))) {
-                            reportOperatorError();
-                        }
+                        reportOperatorErrorUnless(function (left, right) {
+                            return isTypeComparableTo(left, right) || isTypeComparableTo(right, left) || (isTypeAssignableTo(left, numberOrBigIntType) && isTypeAssignableTo(right, numberOrBigIntType));
+                        });
                     }
                     return booleanType;
                 case 33 /* EqualsEqualsToken */:
                 case 34 /* ExclamationEqualsToken */:
                 case 35 /* EqualsEqualsEqualsToken */:
                 case 36 /* ExclamationEqualsEqualsToken */:
-                    var leftIsLiteral = isLiteralType(leftType);
-                    var rightIsLiteral = isLiteralType(rightType);
-                    if (!leftIsLiteral || !rightIsLiteral) {
-                        leftType = leftIsLiteral ? getBaseTypeOfLiteralType(leftType) : leftType;
-                        rightType = rightIsLiteral ? getBaseTypeOfLiteralType(rightType) : rightType;
-                    }
-                    if (!isTypeEqualityComparableTo(leftType, rightType) && !isTypeEqualityComparableTo(rightType, leftType)) {
-                        reportOperatorError();
-                    }
+                    reportOperatorErrorUnless(function (left, right) { return isTypeEqualityComparableTo(left, right) || isTypeEqualityComparableTo(right, left); });
                     return booleanType;
-                case 94 /* InstanceOfKeyword */:
+                case 95 /* InstanceOfKeyword */:
                     return checkInstanceOfExpression(left, right, leftType, rightType);
-                case 93 /* InKeyword */:
+                case 94 /* InKeyword */:
                     return checkInExpression(left, right, leftType, rightType);
                 case 54 /* AmpersandAmpersandToken */:
                     return getTypeFacts(leftType) & 4194304 /* Truthy */ ?
@@ -52385,7 +54121,7 @@ var ts;
                     return getTypeFacts(leftType) & 8388608 /* Falsy */ ?
                         getUnionType([removeDefinitelyFalsyTypes(leftType), rightType], 2 /* Subtype */) :
                         leftType;
-                case 59 /* EqualsToken */:
+                case 60 /* EqualsToken */:
                     var declKind = ts.isBinaryExpression(left.parent) ? ts.getAssignmentDeclarationKind(left.parent) : 0 /* None */;
                     checkAssignmentDeclaration(declKind, rightType);
                     if (isAssignmentDeclaration(declKind)) {
@@ -52429,7 +54165,7 @@ var ts;
                 }
             }
             function isEvalNode(node) {
-                return node.kind === 72 /* Identifier */ && node.escapedText === "eval";
+                return node.kind === 73 /* Identifier */ && node.escapedText === "eval";
             }
             // Return true if there was no error, false if there was an error.
             function checkForDisallowedESSymbolOperand(operator) {
@@ -52445,13 +54181,13 @@ var ts;
             function getSuggestedBooleanOperator(operator) {
                 switch (operator) {
                     case 50 /* BarToken */:
-                    case 70 /* BarEqualsToken */:
+                    case 71 /* BarEqualsToken */:
                         return 55 /* BarBarToken */;
                     case 51 /* CaretToken */:
-                    case 71 /* CaretEqualsToken */:
+                    case 72 /* CaretEqualsToken */:
                         return 36 /* ExclamationEqualsEqualsToken */;
                     case 49 /* AmpersandToken */:
-                    case 69 /* AmpersandEqualsToken */:
+                    case 70 /* AmpersandEqualsToken */:
                         return 54 /* AmpersandAmpersandToken */;
                     default:
                         return undefined;
@@ -52489,22 +54225,44 @@ var ts;
                         return false;
                 }
             }
-            function reportOperatorError() {
-                var leftStr = typeToString(leftType);
-                var rightStr = typeToString(rightType);
+            /**
+             * Returns true if an error is reported
+             */
+            function reportOperatorErrorUnless(typesAreCompatible) {
+                if (!typesAreCompatible(leftType, rightType)) {
+                    reportOperatorError(typesAreCompatible);
+                    return true;
+                }
+                return false;
+            }
+            function reportOperatorError(awaitedTypesAreCompatible) {
+                var wouldWorkWithAwait = false;
                 var errNode = errorNode || operatorToken;
-                if (!tryGiveBetterPrimaryError(errNode, leftStr, rightStr)) {
-                    error(errNode, ts.Diagnostics.Operator_0_cannot_be_applied_to_types_1_and_2, ts.tokenToString(operatorToken.kind), leftStr, rightStr);
+                var _a = getTypeNamesForErrorDisplay(leftType, rightType), leftStr = _a[0], rightStr = _a[1];
+                if (awaitedTypesAreCompatible) {
+                    var awaitedLeftType = getAwaitedType(leftType);
+                    var awaitedRightType = getAwaitedType(rightType);
+                    wouldWorkWithAwait = !(awaitedLeftType === leftType && awaitedRightType === rightType)
+                        && !!(awaitedLeftType && awaitedRightType)
+                        && awaitedTypesAreCompatible(awaitedLeftType, awaitedRightType);
+                }
+                if (!tryGiveBetterPrimaryError(errNode, wouldWorkWithAwait, leftStr, rightStr)) {
+                    errorAndMaybeSuggestAwait(errNode, wouldWorkWithAwait, ts.Diagnostics.Operator_0_cannot_be_applied_to_types_1_and_2, ts.tokenToString(operatorToken.kind), leftStr, rightStr);
                 }
             }
-            function tryGiveBetterPrimaryError(errNode, leftStr, rightStr) {
+            function tryGiveBetterPrimaryError(errNode, maybeMissingAwait, leftStr, rightStr) {
+                var typeName;
                 switch (operatorToken.kind) {
                     case 35 /* EqualsEqualsEqualsToken */:
                     case 33 /* EqualsEqualsToken */:
-                        return error(errNode, ts.Diagnostics.This_condition_will_always_return_0_since_the_types_1_and_2_have_no_overlap, "false", leftStr, rightStr);
+                        typeName = "false";
+                        break;
                     case 36 /* ExclamationEqualsEqualsToken */:
                     case 34 /* ExclamationEqualsToken */:
-                        return error(errNode, ts.Diagnostics.This_condition_will_always_return_0_since_the_types_1_and_2_have_no_overlap, "true", leftStr, rightStr);
+                        typeName = "true";
+                }
+                if (typeName) {
+                    return errorAndMaybeSuggestAwait(errNode, maybeMissingAwait, ts.Diagnostics.This_condition_will_always_return_0_since_the_types_1_and_2_have_no_overlap, typeName, leftStr, rightStr);
                 }
                 return undefined;
             }
@@ -52542,30 +54300,45 @@ var ts;
                 // If the user's code is syntactically correct, the func should always have a star. After all, we are in a yield context.
                 return anyType;
             }
+            var isAsync = (functionFlags & 2 /* Async */) !== 0;
             if (node.asteriskToken) {
                 // Async generator functions prior to ESNext require the __await, __asyncDelegator,
                 // and __asyncValues helpers
-                if ((functionFlags & 3 /* AsyncGenerator */) === 3 /* AsyncGenerator */ &&
-                    languageVersion < 7 /* ESNext */) {
-                    checkExternalEmitHelpers(node, 26624 /* AsyncDelegatorIncludes */);
+                if (isAsync && languageVersion < 99 /* ESNext */) {
+                    checkExternalEmitHelpers(node, 53248 /* AsyncDelegatorIncludes */);
                 }
                 // Generator functions prior to ES2015 require the __values helper
-                if ((functionFlags & 3 /* AsyncGenerator */) === 1 /* Generator */ &&
-                    languageVersion < 2 /* ES2015 */ && compilerOptions.downlevelIteration) {
+                if (!isAsync && languageVersion < 2 /* ES2015 */ && compilerOptions.downlevelIteration) {
                     checkExternalEmitHelpers(node, 256 /* Values */);
                 }
             }
-            var isAsync = (functionFlags & 2 /* Async */) !== 0;
-            var yieldedType = getYieldedTypeOfYieldExpression(node, isAsync); // TODO: GH#18217
             // There is no point in doing an assignability check if the function
             // has no explicit return type because the return type is directly computed
             // from the yield expressions.
             var returnType = getReturnTypeFromAnnotation(func);
-            if (returnType) {
-                var signatureElementType = getIteratedTypeOfGenerator(returnType, isAsync) || anyType;
-                checkTypeAssignableToAndOptionallyElaborate(yieldedType, signatureElementType, node.expression || node, node.expression);
+            var iterationTypes = returnType && getIterationTypesOfGeneratorFunctionReturnType(returnType, isAsync);
+            var signatureYieldType = iterationTypes && iterationTypes.yieldType || anyType;
+            var signatureNextType = iterationTypes && iterationTypes.nextType || anyType;
+            var resolvedSignatureNextType = isAsync ? getAwaitedType(signatureNextType) || anyType : signatureNextType;
+            var yieldExpressionType = node.expression ? checkExpression(node.expression) : undefinedWideningType;
+            var yieldedType = getYieldedTypeOfYieldExpression(node, yieldExpressionType, resolvedSignatureNextType, isAsync);
+            if (returnType && yieldedType) {
+                checkTypeAssignableToAndOptionallyElaborate(yieldedType, signatureYieldType, node.expression || node, node.expression);
+            }
+            if (node.asteriskToken) {
+                var use = isAsync ? 19 /* AsyncYieldStar */ : 17 /* YieldStar */;
+                return getIterationTypeOfIterable(use, 1 /* Return */, yieldExpressionType, node.expression)
+                    || anyType;
+            }
+            else if (returnType) {
+                return getIterationTypeOfGeneratorFunctionReturnType(2 /* Next */, returnType, isAsync)
+                    || anyType;
+            }
+            var contextualReturnType = getContextualReturnType(func);
+            if (contextualReturnType) {
+                return getIterationTypeOfGeneratorFunctionReturnType(2 /* Next */, contextualReturnType, isAsync)
+                    || anyType;
             }
-            // Both yield and yield* expressions have type 'any'
             return anyType;
         }
         function checkConditionalExpression(node, checkMode) {
@@ -52588,25 +54361,25 @@ var ts;
             return stringType;
         }
         function getContextNode(node) {
-            if (node.kind === 268 /* JsxAttributes */ && !ts.isJsxSelfClosingElement(node.parent)) {
+            if (node.kind === 269 /* JsxAttributes */ && !ts.isJsxSelfClosingElement(node.parent)) {
                 return node.parent.parent; // Needs to be the root JsxElement, so it encompasses the attributes _and_ the children (which are essentially part of the attributes)
             }
             return node;
         }
-        function checkExpressionWithContextualType(node, contextualType, contextualMapper, checkMode) {
+        function checkExpressionWithContextualType(node, contextualType, inferenceContext, checkMode) {
             var context = getContextNode(node);
             var saveContextualType = context.contextualType;
-            var saveContextualMapper = context.contextualMapper;
+            var saveInferenceContext = context.inferenceContext;
             context.contextualType = contextualType;
-            context.contextualMapper = contextualMapper;
-            var type = checkExpression(node, checkMode | 1 /* Contextual */ | (contextualMapper ? 2 /* Inferential */ : 0));
+            context.inferenceContext = inferenceContext;
+            var type = checkExpression(node, checkMode | 1 /* Contextual */ | (inferenceContext ? 2 /* Inferential */ : 0));
             // We strip literal freshness when an appropriate contextual type is present such that contextually typed
             // literals always preserve their literal types (otherwise they might widen during type inference). An alternative
             // here would be to not mark contextually typed literals as fresh in the first place.
             var result = maybeTypeOfKind(type, 2944 /* Literal */) && isLiteralOfContextualType(type, instantiateContextualType(contextualType, node)) ?
                 getRegularTypeOfLiteralType(type) : type;
             context.contextualType = saveContextualType;
-            context.contextualMapper = saveContextualMapper;
+            context.inferenceContext = saveInferenceContext;
             return result;
         }
         function checkExpressionCached(node, checkMode) {
@@ -52627,15 +54400,18 @@ var ts;
         }
         function isTypeAssertion(node) {
             node = ts.skipParentheses(node);
-            return node.kind === 194 /* TypeAssertionExpression */ || node.kind === 212 /* AsExpression */;
+            return node.kind === 195 /* TypeAssertionExpression */ || node.kind === 213 /* AsExpression */;
         }
         function checkDeclarationInitializer(declaration) {
             var initializer = ts.getEffectiveInitializer(declaration);
             var type = getTypeOfExpression(initializer, /*cache*/ true);
+            var padded = ts.isParameter(declaration) && declaration.name.kind === 186 /* ArrayBindingPattern */ &&
+                isTupleType(type) && !type.target.hasRestElement && getTypeReferenceArity(type) < declaration.name.elements.length ?
+                padTupleType(type, declaration.name) : type;
             var widened = ts.getCombinedNodeFlags(declaration) & 2 /* Const */ ||
                 ts.isDeclarationReadonly(declaration) ||
                 isTypeAssertion(initializer) ||
-                isLiteralOfContextualType(type, getContextualType(initializer)) ? type : getWidenedLiteralType(type);
+                isLiteralOfContextualType(padded, getContextualType(initializer)) ? padded : getWidenedLiteralType(padded);
             if (ts.isInJSFile(declaration)) {
                 if (widened.flags & 98304 /* Nullable */) {
                     reportImplicitAny(declaration, anyType);
@@ -52648,6 +54424,21 @@ var ts;
             }
             return widened;
         }
+        function padTupleType(type, pattern) {
+            var patternElements = pattern.elements;
+            var arity = getTypeReferenceArity(type);
+            var elementTypes = arity ? type.typeArguments.slice() : [];
+            for (var i = arity; i < patternElements.length; i++) {
+                var e = patternElements[i];
+                if (i < patternElements.length - 1 || !(e.kind === 187 /* BindingElement */ && e.dotDotDotToken)) {
+                    elementTypes.push(!ts.isOmittedExpression(e) && hasDefaultValue(e) ? getTypeFromBindingElement(e, /*includePatternInType*/ false, /*reportErrors*/ false) : anyType);
+                    if (!ts.isOmittedExpression(e) && !hasDefaultValue(e)) {
+                        reportImplicitAny(e, anyType);
+                    }
+                }
+            }
+            return createTupleType(elementTypes, type.target.minLength, /*hasRestElement*/ false, type.target.readonly);
+        }
         function isLiteralOfContextualType(candidateType, contextualType) {
             if (contextualType) {
                 if (contextualType.flags & 3145728 /* UnionOrIntersection */) {
@@ -52658,7 +54449,7 @@ var ts;
                     // If the contextual type is a type variable constrained to a primitive type, consider
                     // this a literal context for literals of that primitive type. For example, given a
                     // type parameter 'T extends string', infer string literal types for T.
-                    var constraint = getBaseConstraintOfType(contextualType) || emptyObjectType;
+                    var constraint = getBaseConstraintOfType(contextualType) || unknownType;
                     return maybeTypeOfKind(constraint, 4 /* String */) && maybeTypeOfKind(candidateType, 128 /* StringLiteral */) ||
                         maybeTypeOfKind(constraint, 8 /* Number */) && maybeTypeOfKind(candidateType, 256 /* NumberLiteral */) ||
                         maybeTypeOfKind(constraint, 64 /* BigInt */) && maybeTypeOfKind(candidateType, 2048 /* BigIntLiteral */) ||
@@ -52691,7 +54482,7 @@ var ts;
             // Do not use hasDynamicName here, because that returns false for well known symbols.
             // We want to perform checkComputedPropertyName for all computed properties, including
             // well known symbols.
-            if (node.name.kind === 149 /* ComputedPropertyName */) {
+            if (node.name.kind === 150 /* ComputedPropertyName */) {
                 checkComputedPropertyName(node.name);
             }
             return checkExpressionForMutableLocation(node.initializer, checkMode);
@@ -52702,7 +54493,7 @@ var ts;
             // Do not use hasDynamicName here, because that returns false for well known symbols.
             // We want to perform checkComputedPropertyName for all computed properties, including
             // well known symbols.
-            if (node.name.kind === 149 /* ComputedPropertyName */) {
+            if (node.name.kind === 150 /* ComputedPropertyName */) {
                 checkComputedPropertyName(node.name);
             }
             var uninstantiatedType = checkFunctionExpressionOrObjectLiteralMethod(node, checkMode);
@@ -52710,42 +54501,52 @@ var ts;
         }
         function instantiateTypeWithSingleGenericCallSignature(node, type, checkMode) {
             if (checkMode && checkMode & (2 /* Inferential */ | 8 /* SkipGenericFunctions */)) {
-                var signature = getSingleCallSignature(type);
+                var callSignature = getSingleSignature(type, 0 /* Call */, /*allowMembers*/ true);
+                var constructSignature = getSingleSignature(type, 1 /* Construct */, /*allowMembers*/ true);
+                var signature = callSignature || constructSignature;
                 if (signature && signature.typeParameters) {
-                    if (checkMode & 8 /* SkipGenericFunctions */) {
-                        skippedGenericFunction(node, checkMode);
-                        return anyFunctionType;
-                    }
                     var contextualType = getApparentTypeOfContextualType(node);
-                    if (contextualType) {
-                        var contextualSignature = getSingleCallSignature(getNonNullableType(contextualType));
+                    if (contextualType && !isMixinConstructorType(contextualType)) {
+                        var contextualSignature = getSingleSignature(getNonNullableType(contextualType), callSignature ? 0 /* Call */ : 1 /* Construct */, /*allowMembers*/ false);
                         if (contextualSignature && !contextualSignature.typeParameters) {
-                            var context = getContextualMapper(node);
+                            if (checkMode & 8 /* SkipGenericFunctions */) {
+                                skippedGenericFunction(node, checkMode);
+                                return anyFunctionType;
+                            }
+                            var context = getInferenceContext(node);
                             // We have an expression that is an argument of a generic function for which we are performing
                             // type argument inference. The expression is of a function type with a single generic call
                             // signature and a contextual function type with a single non-generic call signature. Now check
                             // if the outer function returns a function type with a single non-generic call signature and
                             // if some of the outer function type parameters have no inferences so far. If so, we can
                             // potentially add inferred type parameters to the outer function return type.
-                            var returnSignature = context.signature && getSingleCallSignature(getReturnTypeOfSignature(context.signature));
+                            var returnType = context.signature && getReturnTypeOfSignature(context.signature);
+                            var returnSignature = returnType && getSingleCallOrConstructSignature(returnType);
                             if (returnSignature && !returnSignature.typeParameters && !ts.every(context.inferences, hasInferenceCandidates)) {
-                                // Instantiate the expression type with its own type parameters as type arguments. This
-                                // ensures that the type parameters are not erased to type any during type inference such
-                                // that they can be inferred as actual types.
+                                // Instantiate the signature with its own type parameters as type arguments, possibly
+                                // renaming the type parameters to ensure they have unique names.
                                 var uniqueTypeParameters = getUniqueTypeParameters(context, signature.typeParameters);
-                                var strippedType = getOrCreateTypeFromSignature(getSignatureInstantiationWithoutFillingInTypeArguments(signature, uniqueTypeParameters));
-                                // Infer from the stripped expression type to the contextual type starting with an empty
-                                // set of inference candidates.
-                                var inferences = ts.map(context.typeParameters, createInferenceInfo);
-                                inferTypes(inferences, strippedType, contextualType);
-                                // If we produced some inference candidates and if the type parameters for which we produced
-                                // candidates do not already have existing inferences, we adopt the new inference candidates and
-                                // add the type parameters of the expression type to the set of inferred type parameters for
-                                // the outer function return type.
-                                if (ts.some(inferences, hasInferenceCandidates) && !hasOverlappingInferences(context.inferences, inferences)) {
-                                    mergeInferences(context.inferences, inferences);
-                                    context.inferredTypeParameters = ts.concatenate(context.inferredTypeParameters, uniqueTypeParameters);
-                                    return strippedType;
+                                var instantiatedSignature = getSignatureInstantiationWithoutFillingInTypeArguments(signature, uniqueTypeParameters);
+                                // Infer from the parameters of the instantiated signature to the parameters of the
+                                // contextual signature starting with an empty set of inference candidates.
+                                var inferences_3 = ts.map(context.inferences, function (info) { return createInferenceInfo(info.typeParameter); });
+                                applyToParameterTypes(instantiatedSignature, contextualSignature, function (source, target) {
+                                    inferTypes(inferences_3, source, target, /*priority*/ 0, /*contravariant*/ true);
+                                });
+                                if (ts.some(inferences_3, hasInferenceCandidates)) {
+                                    // We have inference candidates, indicating that one or more type parameters are referenced
+                                    // in the parameter types of the contextual signature. Now also infer from the return type.
+                                    applyToReturnTypes(instantiatedSignature, contextualSignature, function (source, target) {
+                                        inferTypes(inferences_3, source, target);
+                                    });
+                                    // If the type parameters for which we produced candidates do not have any inferences yet,
+                                    // we adopt the new inference candidates and add the type parameters of the expression type
+                                    // to the set of inferred type parameters for the outer function return type.
+                                    if (!hasOverlappingInferences(context.inferences, inferences_3)) {
+                                        mergeInferences(context.inferences, inferences_3);
+                                        context.inferredTypeParameters = ts.concatenate(context.inferredTypeParameters, uniqueTypeParameters);
+                                        return getOrCreateTypeFromSignature(instantiatedSignature);
+                                    }
                                 }
                             }
                             return getOrCreateTypeFromSignature(instantiateSignatureInContextOf(signature, contextualSignature, context));
@@ -52759,8 +54560,8 @@ var ts;
             if (checkMode & 2 /* Inferential */) {
                 // We have skipped a generic function during inferential typing. Obtain the inference context and
                 // indicate this has occurred such that we know a second pass of inference is be needed.
-                var context = getContextualMapper(node);
-                context.flags |= 8 /* SkippedGenericFunction */;
+                var context = getInferenceContext(node);
+                context.flags |= 4 /* SkippedGenericFunction */;
             }
         }
         function hasInferenceCandidates(info) {
@@ -52835,7 +54636,7 @@ var ts;
             var expr = ts.skipParentheses(node);
             // Optimize for the common case of a call to a function with a single non-generic call
             // signature where we can just fetch the return type without checking the arguments.
-            if (expr.kind === 191 /* CallExpression */ && expr.expression.kind !== 98 /* SuperKeyword */ && !ts.isRequireCall(expr, /*checkArgumentIsStringLiteralLike*/ true) && !isSymbolOrSymbolForCall(expr)) {
+            if (expr.kind === 192 /* CallExpression */ && expr.expression.kind !== 99 /* SuperKeyword */ && !ts.isRequireCall(expr, /*checkArgumentIsStringLiteralLike*/ true) && !isSymbolOrSymbolForCall(expr)) {
                 var funcType = checkNonNullExpression(expr.expression);
                 var signature = getSingleCallSignature(funcType);
                 if (signature && !signature.typeParameters) {
@@ -52868,16 +54669,10 @@ var ts;
             node.contextualType = saveContextualType;
             return type;
         }
-        // Checks an expression and returns its type. The contextualMapper parameter serves two purposes: When
-        // contextualMapper is not undefined and not equal to the identityMapper function object it indicates that the
-        // expression is being inferentially typed (section 4.15.2 in spec) and provides the type mapper to use in
-        // conjunction with the generic contextual type. When contextualMapper is equal to the identityMapper function
-        // object, it serves as an indicator that all contained function and arrow expressions should be considered to
-        // have the wildcard function type; this form of type check is used during overload resolution to exclude
-        // contextually typed function and arrow expressions in the initial phase.
         function checkExpression(node, checkMode, forceTuple) {
             var saveCurrentNode = currentNode;
             currentNode = node;
+            instantiationCount = 0;
             var uninstantiatedType = checkExpressionWorker(node, checkMode, forceTuple);
             var type = instantiateTypeWithSingleGenericCallSignature(node, uninstantiatedType, checkMode);
             if (isConstEnumObjectType(type)) {
@@ -52891,10 +54686,10 @@ var ts;
             // - 'left' in property access
             // - 'object' in indexed access
             // - target in rhs of import statement
-            var ok = (node.parent.kind === 189 /* PropertyAccessExpression */ && node.parent.expression === node) ||
-                (node.parent.kind === 190 /* ElementAccessExpression */ && node.parent.expression === node) ||
-                ((node.kind === 72 /* Identifier */ || node.kind === 148 /* QualifiedName */) && isInRightSideOfImportOrExportAssignment(node) ||
-                    (node.parent.kind === 167 /* TypeQuery */ && node.parent.exprName === node));
+            var ok = (node.parent.kind === 190 /* PropertyAccessExpression */ && node.parent.expression === node) ||
+                (node.parent.kind === 191 /* ElementAccessExpression */ && node.parent.expression === node) ||
+                ((node.kind === 73 /* Identifier */ || node.kind === 149 /* QualifiedName */) && isInRightSideOfImportOrExportAssignment(node) ||
+                    (node.parent.kind === 168 /* TypeQuery */ && node.parent.exprName === node));
             if (!ok) {
                 error(node, ts.Diagnostics.const_enums_can_only_be_used_in_property_or_index_access_expressions_or_the_right_hand_side_of_an_import_declaration_or_export_assignment_or_type_query);
             }
@@ -52915,13 +54710,13 @@ var ts;
         }
         function checkExpressionWorker(node, checkMode, forceTuple) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return checkIdentifier(node);
-                case 100 /* ThisKeyword */:
+                case 101 /* ThisKeyword */:
                     return checkThisExpression(node);
-                case 98 /* SuperKeyword */:
+                case 99 /* SuperKeyword */:
                     return checkSuperExpression(node);
-                case 96 /* NullKeyword */:
+                case 97 /* NullKeyword */:
                     return nullWideningType;
                 case 14 /* NoSubstitutionTemplateLiteral */:
                 case 10 /* StringLiteral */:
@@ -52932,82 +54727,82 @@ var ts;
                 case 9 /* BigIntLiteral */:
                     checkGrammarBigIntLiteral(node);
                     return getFreshTypeOfLiteralType(getBigIntLiteralType(node));
-                case 102 /* TrueKeyword */:
+                case 103 /* TrueKeyword */:
                     return trueType;
-                case 87 /* FalseKeyword */:
+                case 88 /* FalseKeyword */:
                     return falseType;
-                case 206 /* TemplateExpression */:
+                case 207 /* TemplateExpression */:
                     return checkTemplateExpression(node);
                 case 13 /* RegularExpressionLiteral */:
                     return globalRegExpType;
-                case 187 /* ArrayLiteralExpression */:
+                case 188 /* ArrayLiteralExpression */:
                     return checkArrayLiteral(node, checkMode, forceTuple);
-                case 188 /* ObjectLiteralExpression */:
+                case 189 /* ObjectLiteralExpression */:
                     return checkObjectLiteral(node, checkMode);
-                case 189 /* PropertyAccessExpression */:
+                case 190 /* PropertyAccessExpression */:
                     return checkPropertyAccessExpression(node);
-                case 148 /* QualifiedName */:
+                case 149 /* QualifiedName */:
                     return checkQualifiedName(node);
-                case 190 /* ElementAccessExpression */:
+                case 191 /* ElementAccessExpression */:
                     return checkIndexedAccess(node);
-                case 191 /* CallExpression */:
-                    if (node.expression.kind === 92 /* ImportKeyword */) {
+                case 192 /* CallExpression */:
+                    if (node.expression.kind === 93 /* ImportKeyword */) {
                         return checkImportCallExpression(node);
                     }
                 /* falls through */
-                case 192 /* NewExpression */:
+                case 193 /* NewExpression */:
                     return checkCallExpression(node, checkMode);
-                case 193 /* TaggedTemplateExpression */:
+                case 194 /* TaggedTemplateExpression */:
                     return checkTaggedTemplateExpression(node);
-                case 195 /* ParenthesizedExpression */:
+                case 196 /* ParenthesizedExpression */:
                     return checkParenthesizedExpression(node, checkMode);
-                case 209 /* ClassExpression */:
+                case 210 /* ClassExpression */:
                     return checkClassExpression(node);
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
                     return checkFunctionExpressionOrObjectLiteralMethod(node, checkMode);
-                case 199 /* TypeOfExpression */:
+                case 200 /* TypeOfExpression */:
                     return checkTypeOfExpression(node);
-                case 194 /* TypeAssertionExpression */:
-                case 212 /* AsExpression */:
+                case 195 /* TypeAssertionExpression */:
+                case 213 /* AsExpression */:
                     return checkAssertion(node);
-                case 213 /* NonNullExpression */:
+                case 214 /* NonNullExpression */:
                     return checkNonNullAssertion(node);
-                case 214 /* MetaProperty */:
+                case 215 /* MetaProperty */:
                     return checkMetaProperty(node);
-                case 198 /* DeleteExpression */:
+                case 199 /* DeleteExpression */:
                     return checkDeleteExpression(node);
-                case 200 /* VoidExpression */:
+                case 201 /* VoidExpression */:
                     return checkVoidExpression(node);
-                case 201 /* AwaitExpression */:
+                case 202 /* AwaitExpression */:
                     return checkAwaitExpression(node);
-                case 202 /* PrefixUnaryExpression */:
+                case 203 /* PrefixUnaryExpression */:
                     return checkPrefixUnaryExpression(node);
-                case 203 /* PostfixUnaryExpression */:
+                case 204 /* PostfixUnaryExpression */:
                     return checkPostfixUnaryExpression(node);
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return checkBinaryExpression(node, checkMode);
-                case 205 /* ConditionalExpression */:
+                case 206 /* ConditionalExpression */:
                     return checkConditionalExpression(node, checkMode);
-                case 208 /* SpreadElement */:
+                case 209 /* SpreadElement */:
                     return checkSpreadExpression(node, checkMode);
-                case 210 /* OmittedExpression */:
+                case 211 /* OmittedExpression */:
                     return undefinedWideningType;
-                case 207 /* YieldExpression */:
+                case 208 /* YieldExpression */:
                     return checkYieldExpression(node);
-                case 215 /* SyntheticExpression */:
+                case 216 /* SyntheticExpression */:
                     return node.type;
-                case 270 /* JsxExpression */:
+                case 271 /* JsxExpression */:
                     return checkJsxExpression(node, checkMode);
-                case 260 /* JsxElement */:
+                case 261 /* JsxElement */:
                     return checkJsxElement(node, checkMode);
-                case 261 /* JsxSelfClosingElement */:
+                case 262 /* JsxSelfClosingElement */:
                     return checkJsxSelfClosingElement(node, checkMode);
-                case 264 /* JsxFragment */:
+                case 265 /* JsxFragment */:
                     return checkJsxFragment(node);
-                case 268 /* JsxAttributes */:
+                case 269 /* JsxAttributes */:
                     return checkJsxAttributes(node, checkMode);
-                case 262 /* JsxOpeningElement */:
+                case 263 /* JsxOpeningElement */:
                     ts.Debug.fail("Shouldn't ever directly check a JsxOpeningElement");
             }
             return errorType;
@@ -53029,7 +54824,7 @@ var ts;
             var constraintType = getConstraintOfTypeParameter(typeParameter);
             var defaultType = getDefaultFromTypeParameter(typeParameter);
             if (constraintType && defaultType) {
-                checkTypeAssignableTo(defaultType, getTypeWithThisArgument(constraintType, defaultType), node.default, ts.Diagnostics.Type_0_does_not_satisfy_the_constraint_1);
+                checkTypeAssignableTo(defaultType, getTypeWithThisArgument(instantiateType(constraintType, makeUnaryTypeMapper(typeParameter, defaultType)), defaultType), node.default, ts.Diagnostics.Type_0_does_not_satisfy_the_constraint_1);
             }
             if (produceDiagnostics) {
                 checkTypeNameIsReserved(node.name, ts.Diagnostics.Type_parameter_name_cannot_be_0);
@@ -53044,7 +54839,7 @@ var ts;
             checkVariableLikeDeclaration(node);
             var func = ts.getContainingFunction(node);
             if (ts.hasModifier(node, 92 /* ParameterPropertyModifier */)) {
-                if (!(func.kind === 157 /* Constructor */ && ts.nodeIsPresent(func.body))) {
+                if (!(func.kind === 158 /* Constructor */ && ts.nodeIsPresent(func.body))) {
                     error(node, ts.Diagnostics.A_parameter_property_is_only_allowed_in_a_constructor_implementation);
                 }
             }
@@ -53055,10 +54850,10 @@ var ts;
                 if (func.parameters.indexOf(node) !== 0) {
                     error(node, ts.Diagnostics.A_0_parameter_must_be_the_first_parameter, node.name.escapedText);
                 }
-                if (func.kind === 157 /* Constructor */ || func.kind === 161 /* ConstructSignature */ || func.kind === 166 /* ConstructorType */) {
+                if (func.kind === 158 /* Constructor */ || func.kind === 162 /* ConstructSignature */ || func.kind === 167 /* ConstructorType */) {
                     error(node, ts.Diagnostics.A_constructor_cannot_have_a_this_parameter);
                 }
-                if (func.kind === 197 /* ArrowFunction */) {
+                if (func.kind === 198 /* ArrowFunction */) {
                     error(node, ts.Diagnostics.An_arrow_function_cannot_have_a_this_parameter);
                 }
             }
@@ -53075,7 +54870,8 @@ var ts;
                 error(node, ts.Diagnostics.A_type_predicate_is_only_allowed_in_return_type_position_for_functions_and_methods);
                 return;
             }
-            var typePredicate = getTypePredicateOfSignature(getSignatureFromDeclaration(parent));
+            var signature = getSignatureFromDeclaration(parent);
+            var typePredicate = getTypePredicateOfSignature(signature);
             if (!typePredicate) {
                 return;
             }
@@ -53086,12 +54882,12 @@ var ts;
             }
             else {
                 if (typePredicate.parameterIndex >= 0) {
-                    if (parent.parameters[typePredicate.parameterIndex].dotDotDotToken) {
+                    if (signature.hasRestParameter && typePredicate.parameterIndex === signature.parameters.length - 1) {
                         error(parameterName, ts.Diagnostics.A_type_predicate_cannot_reference_a_rest_parameter);
                     }
                     else {
                         var leadingError = function () { return ts.chainDiagnosticMessages(/*details*/ undefined, ts.Diagnostics.A_type_predicate_s_type_must_be_assignable_to_its_parameter_s_type); };
-                        checkTypeAssignableTo(typePredicate.type, getTypeOfNode(parent.parameters[typePredicate.parameterIndex]), node.type, 
+                        checkTypeAssignableTo(typePredicate.type, getTypeOfSymbol(signature.parameters[typePredicate.parameterIndex]), node.type, 
                         /*headMessage*/ undefined, leadingError);
                     }
                 }
@@ -53113,13 +54909,13 @@ var ts;
         }
         function getTypePredicateParent(node) {
             switch (node.parent.kind) {
-                case 197 /* ArrowFunction */:
-                case 160 /* CallSignature */:
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
-                case 165 /* FunctionType */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
+                case 198 /* ArrowFunction */:
+                case 161 /* CallSignature */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 166 /* FunctionType */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
                     var parent = node.parent;
                     if (node === parent.type) {
                         return parent;
@@ -53133,11 +54929,11 @@ var ts;
                     continue;
                 }
                 var name = element.name;
-                if (name.kind === 72 /* Identifier */ && name.escapedText === predicateVariableName) {
+                if (name.kind === 73 /* Identifier */ && name.escapedText === predicateVariableName) {
                     error(predicateVariableNode, ts.Diagnostics.A_type_predicate_cannot_reference_element_0_in_a_binding_pattern, predicateVariableName);
                     return true;
                 }
-                else if (name.kind === 185 /* ArrayBindingPattern */ || name.kind === 184 /* ObjectBindingPattern */) {
+                else if (name.kind === 186 /* ArrayBindingPattern */ || name.kind === 185 /* ObjectBindingPattern */) {
                     if (checkIfTypePredicateVariableIsDeclaredInBindingPattern(name, predicateVariableNode, predicateVariableName)) {
                         return true;
                     }
@@ -53146,20 +54942,20 @@ var ts;
         }
         function checkSignatureDeclaration(node) {
             // Grammar checking
-            if (node.kind === 162 /* IndexSignature */) {
+            if (node.kind === 163 /* IndexSignature */) {
                 checkGrammarIndexSignature(node);
             }
             // TODO (yuisu): Remove this check in else-if when SyntaxKind.Construct is moved and ambient context is handled
-            else if (node.kind === 165 /* FunctionType */ || node.kind === 239 /* FunctionDeclaration */ || node.kind === 166 /* ConstructorType */ ||
-                node.kind === 160 /* CallSignature */ || node.kind === 157 /* Constructor */ ||
-                node.kind === 161 /* ConstructSignature */) {
+            else if (node.kind === 166 /* FunctionType */ || node.kind === 240 /* FunctionDeclaration */ || node.kind === 167 /* ConstructorType */ ||
+                node.kind === 161 /* CallSignature */ || node.kind === 158 /* Constructor */ ||
+                node.kind === 162 /* ConstructSignature */) {
                 checkGrammarFunctionLikeDeclaration(node);
             }
             var functionFlags = ts.getFunctionFlags(node);
             if (!(functionFlags & 4 /* Invalid */)) {
                 // Async generators prior to ESNext require the __await and __asyncGenerator helpers
-                if ((functionFlags & 3 /* AsyncGenerator */) === 3 /* AsyncGenerator */ && languageVersion < 7 /* ESNext */) {
-                    checkExternalEmitHelpers(node, 6144 /* AsyncGeneratorIncludes */);
+                if ((functionFlags & 3 /* AsyncGenerator */) === 3 /* AsyncGenerator */ && languageVersion < 99 /* ESNext */) {
+                    checkExternalEmitHelpers(node, 12288 /* AsyncGeneratorIncludes */);
                 }
                 // Async functions prior to ES2017 require the __awaiter helper
                 if ((functionFlags & 3 /* AsyncGenerator */) === 2 /* Async */ && languageVersion < 4 /* ES2017 */) {
@@ -53182,10 +54978,10 @@ var ts;
                 var returnTypeNode = ts.getEffectiveReturnTypeNode(node);
                 if (noImplicitAny && !returnTypeNode) {
                     switch (node.kind) {
-                        case 161 /* ConstructSignature */:
+                        case 162 /* ConstructSignature */:
                             error(node, ts.Diagnostics.Construct_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type);
                             break;
-                        case 160 /* CallSignature */:
+                        case 161 /* CallSignature */:
                             error(node, ts.Diagnostics.Call_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type);
                             break;
                     }
@@ -53198,24 +54994,24 @@ var ts;
                             error(returnTypeNode, ts.Diagnostics.A_generator_cannot_have_a_void_type_annotation);
                         }
                         else {
-                            var generatorElementType = getIteratedTypeOfGenerator(returnType, (functionFlags_1 & 2 /* Async */) !== 0) || anyType;
-                            var iterableIteratorInstantiation = functionFlags_1 & 2 /* Async */
-                                ? createAsyncIterableIteratorType(generatorElementType) // AsyncGenerator function
-                                : createIterableIteratorType(generatorElementType); // Generator function
-                            // Naively, one could check that IterableIterator<any> is assignable to the return type annotation.
+                            // Naively, one could check that Generator<any, any, any> is assignable to the return type annotation.
                             // However, that would not catch the error in the following case.
                             //
                             //    interface BadGenerator extends Iterable<number>, Iterator<string> { }
                             //    function* g(): BadGenerator { } // Iterable and Iterator have different types!
                             //
-                            checkTypeAssignableTo(iterableIteratorInstantiation, returnType, returnTypeNode);
+                            var generatorYieldType = getIterationTypeOfGeneratorFunctionReturnType(0 /* Yield */, returnType, (functionFlags_1 & 2 /* Async */) !== 0) || anyType;
+                            var generatorReturnType = getIterationTypeOfGeneratorFunctionReturnType(1 /* Return */, returnType, (functionFlags_1 & 2 /* Async */) !== 0) || generatorYieldType;
+                            var generatorNextType = getIterationTypeOfGeneratorFunctionReturnType(2 /* Next */, returnType, (functionFlags_1 & 2 /* Async */) !== 0) || unknownType;
+                            var generatorInstantiation = createGeneratorReturnType(generatorYieldType, generatorReturnType, generatorNextType, !!(functionFlags_1 & 2 /* Async */));
+                            checkTypeAssignableTo(generatorInstantiation, returnType, returnTypeNode);
                         }
                     }
                     else if ((functionFlags_1 & 3 /* AsyncGenerator */) === 2 /* Async */) {
                         checkAsyncFunctionReturnType(node, returnTypeNode);
                     }
                 }
-                if (node.kind !== 162 /* IndexSignature */ && node.kind !== 294 /* JSDocFunctionType */) {
+                if (node.kind !== 163 /* IndexSignature */ && node.kind !== 295 /* JSDocFunctionType */) {
                     registerForUnusedIdentifiersCheck(node);
                 }
             }
@@ -53232,7 +55028,7 @@ var ts;
             var staticNames = ts.createUnderscoreEscapedMap();
             for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                 var member = _a[_i];
-                if (member.kind === 157 /* Constructor */) {
+                if (member.kind === 158 /* Constructor */) {
                     for (var _b = 0, _c = member.parameters; _b < _c.length; _b++) {
                         var param = _c[_b];
                         if (ts.isParameterPropertyDeclaration(param) && !ts.isBindingPattern(param.name)) {
@@ -53247,16 +55043,16 @@ var ts;
                     var memberName = name && ts.getPropertyNameForPropertyNameNode(name);
                     if (name && memberName) {
                         switch (member.kind) {
-                            case 158 /* GetAccessor */:
+                            case 159 /* GetAccessor */:
                                 addName(names, name, memberName, 1 /* Getter */);
                                 break;
-                            case 159 /* SetAccessor */:
+                            case 160 /* SetAccessor */:
                                 addName(names, name, memberName, 2 /* Setter */);
                                 break;
-                            case 154 /* PropertyDeclaration */:
+                            case 155 /* PropertyDeclaration */:
                                 addName(names, name, memberName, 3 /* Property */);
                                 break;
-                            case 156 /* MethodDeclaration */:
+                            case 157 /* MethodDeclaration */:
                                 addName(names, name, memberName, 4 /* Method */);
                                 break;
                         }
@@ -53319,7 +55115,7 @@ var ts;
             var names = ts.createMap();
             for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                 var member = _a[_i];
-                if (member.kind === 153 /* PropertySignature */) {
+                if (member.kind === 154 /* PropertySignature */) {
                     var memberName = void 0;
                     var name = member.name;
                     switch (name.kind) {
@@ -53327,7 +55123,7 @@ var ts;
                         case 8 /* NumericLiteral */:
                             memberName = name.text;
                             break;
-                        case 72 /* Identifier */:
+                        case 73 /* Identifier */:
                             memberName = ts.idText(name);
                             break;
                         default:
@@ -53344,7 +55140,7 @@ var ts;
             }
         }
         function checkTypeForDuplicateIndexSignatures(node) {
-            if (node.kind === 241 /* InterfaceDeclaration */) {
+            if (node.kind === 242 /* InterfaceDeclaration */) {
                 var nodeSymbol = getSymbolOfNode(node);
                 // in case of merging interface declaration it is possible that we'll enter this check procedure several times for every declaration
                 // to prevent this run check only for the first declaration of a given kind
@@ -53364,7 +55160,7 @@ var ts;
                     var declaration = decl;
                     if (declaration.parameters.length === 1 && declaration.parameters[0].type) {
                         switch (declaration.parameters[0].type.kind) {
-                            case 138 /* StringKeyword */:
+                            case 139 /* StringKeyword */:
                                 if (!seenStringIndexer) {
                                     seenStringIndexer = true;
                                 }
@@ -53372,7 +55168,7 @@ var ts;
                                     error(declaration, ts.Diagnostics.Duplicate_string_index_signature);
                                 }
                                 break;
-                            case 135 /* NumberKeyword */:
+                            case 136 /* NumberKeyword */:
                                 if (!seenNumericIndexer) {
                                     seenNumericIndexer = true;
                                 }
@@ -53399,7 +55195,7 @@ var ts;
             checkFunctionOrMethodDeclaration(node);
             // Abstract methods cannot have an implementation.
             // Extra checks are to avoid reporting multiple errors relating to the "abstractness" of the node.
-            if (ts.hasModifier(node, 128 /* Abstract */) && node.kind === 156 /* MethodDeclaration */ && node.body) {
+            if (ts.hasModifier(node, 128 /* Abstract */) && node.kind === 157 /* MethodDeclaration */ && node.body) {
                 error(node, ts.Diagnostics.Method_0_cannot_have_an_implementation_because_it_is_marked_abstract, ts.declarationNameToString(node.name));
             }
         }
@@ -53424,7 +55220,7 @@ var ts;
                 return;
             }
             function isInstancePropertyWithInitializer(n) {
-                return n.kind === 154 /* PropertyDeclaration */ &&
+                return n.kind === 155 /* PropertyDeclaration */ &&
                     !ts.hasModifier(n, 32 /* Static */) &&
                     !!n.initializer;
             }
@@ -53454,7 +55250,7 @@ var ts;
                         var superCallStatement = void 0;
                         for (var _i = 0, statements_2 = statements; _i < statements_2.length; _i++) {
                             var statement = statements_2[_i];
-                            if (statement.kind === 221 /* ExpressionStatement */ && ts.isSuperCall(statement.expression)) {
+                            if (statement.kind === 222 /* ExpressionStatement */ && ts.isSuperCall(statement.expression)) {
                                 superCallStatement = statement;
                                 break;
                             }
@@ -53479,7 +55275,7 @@ var ts;
                     checkGrammarComputedPropertyName(node.name);
                 checkDecorators(node);
                 checkSignatureDeclaration(node);
-                if (node.kind === 158 /* GetAccessor */) {
+                if (node.kind === 159 /* GetAccessor */) {
                     if (!(node.flags & 4194304 /* Ambient */) && ts.nodeIsPresent(node.body) && (node.flags & 128 /* HasImplicitReturn */)) {
                         if (!(node.flags & 256 /* HasExplicitReturn */)) {
                             error(node.name, ts.Diagnostics.A_get_accessor_must_return_a_value);
@@ -53489,13 +55285,13 @@ var ts;
                 // Do not use hasDynamicName here, because that returns false for well known symbols.
                 // We want to perform checkComputedPropertyName for all computed properties, including
                 // well known symbols.
-                if (node.name.kind === 149 /* ComputedPropertyName */) {
+                if (node.name.kind === 150 /* ComputedPropertyName */) {
                     checkComputedPropertyName(node.name);
                 }
                 if (!hasNonBindableDynamicName(node)) {
                     // TypeScript 1.0 spec (April 2014): 8.4.3
                     // Accessors for the same member name must specify the same accessibility.
-                    var otherKind = node.kind === 158 /* GetAccessor */ ? 159 /* SetAccessor */ : 158 /* GetAccessor */;
+                    var otherKind = node.kind === 159 /* GetAccessor */ ? 160 /* SetAccessor */ : 159 /* GetAccessor */;
                     var otherAccessor = ts.getDeclarationOfKind(getSymbolOfNode(node), otherKind);
                     if (otherAccessor) {
                         var nodeFlags = ts.getModifierFlags(node);
@@ -53513,7 +55309,7 @@ var ts;
                     }
                 }
                 var returnType = getTypeOfAccessors(getSymbolOfNode(node));
-                if (node.kind === 158 /* GetAccessor */) {
+                if (node.kind === 159 /* GetAccessor */) {
                     checkAllCodePathsInNonVoidFunctionReturnOrThrow(node, returnType);
                 }
             }
@@ -53561,7 +55357,7 @@ var ts;
         }
         function checkTypeReferenceNode(node) {
             checkGrammarTypeArguments(node, node.typeArguments);
-            if (node.kind === 164 /* TypeReference */ && node.typeName.jsdocDotPos !== undefined && !ts.isInJSFile(node) && !ts.isInJSDoc(node)) {
+            if (node.kind === 165 /* TypeReference */ && node.typeName.jsdocDotPos !== undefined && !ts.isInJSFile(node) && !ts.isInJSDoc(node)) {
                 grammarErrorAtPos(node, node.typeName.jsdocDotPos, 1, ts.Diagnostics.JSDoc_types_can_only_be_used_inside_documentation_comments);
             }
             var type = getTypeFromTypeReference(node);
@@ -53609,7 +55405,7 @@ var ts;
             var seenOptionalElement = false;
             for (var i = 0; i < elementTypes.length; i++) {
                 var e = elementTypes[i];
-                if (e.kind === 172 /* RestType */) {
+                if (e.kind === 173 /* RestType */) {
                     if (i !== elementTypes.length - 1) {
                         grammarErrorOnNode(e, ts.Diagnostics.A_rest_element_must_be_last_in_a_tuple_type);
                         break;
@@ -53618,7 +55414,7 @@ var ts;
                         error(e, ts.Diagnostics.A_rest_element_type_must_be_an_array_type);
                     }
                 }
-                else if (e.kind === 171 /* OptionalType */) {
+                else if (e.kind === 172 /* OptionalType */) {
                     seenOptionalElement = true;
                 }
                 else if (seenOptionalElement) {
@@ -53639,7 +55435,7 @@ var ts;
             var objectType = type.objectType;
             var indexType = type.indexType;
             if (isTypeAssignableTo(indexType, getIndexType(objectType, /*stringsOnly*/ false))) {
-                if (accessNode.kind === 190 /* ElementAccessExpression */ && ts.isAssignmentTarget(accessNode) &&
+                if (accessNode.kind === 191 /* ElementAccessExpression */ && ts.isAssignmentTarget(accessNode) &&
                     ts.getObjectFlags(objectType) & 32 /* Mapped */ && getMappedTypeModifiers(objectType) & 1 /* IncludeReadonly */) {
                     error(accessNode, ts.Diagnostics.Index_signature_in_type_0_only_permits_reading, typeToString(objectType));
                 }
@@ -53647,11 +55443,22 @@ var ts;
             }
             // Check if we're indexing with a numeric type and if either object or index types
             // is a generic type with a constraint that has a numeric index signature.
-            if (getIndexInfoOfType(getApparentType(objectType), 1 /* Number */) && isTypeAssignableToKind(indexType, 296 /* NumberLike */)) {
+            var apparentObjectType = getApparentType(objectType);
+            if (getIndexInfoOfType(apparentObjectType, 1 /* Number */) && isTypeAssignableToKind(indexType, 296 /* NumberLike */)) {
                 return type;
             }
+            if (isGenericObjectType(objectType)) {
+                var propertyName_1 = getPropertyNameFromIndex(indexType, accessNode);
+                if (propertyName_1) {
+                    var propertySymbol = forEachType(apparentObjectType, function (t) { return getPropertyOfType(t, propertyName_1); });
+                    if (propertySymbol && ts.getDeclarationModifierFlagsFromSymbol(propertySymbol) & 24 /* NonPublicAccessibilityModifier */) {
+                        error(accessNode, ts.Diagnostics.Private_or_protected_member_0_cannot_be_accessed_on_a_type_parameter, ts.unescapeLeadingUnderscores(propertyName_1));
+                        return errorType;
+                    }
+                }
+            }
             error(accessNode, ts.Diagnostics.Type_0_cannot_be_used_to_index_type_1, typeToString(indexType), typeToString(objectType));
-            return type;
+            return errorType;
         }
         function checkIndexedAccessType(node) {
             checkSourceElement(node.objectType);
@@ -53679,7 +55486,7 @@ var ts;
             ts.forEachChild(node, checkSourceElement);
         }
         function checkInferType(node) {
-            if (!ts.findAncestor(node, function (n) { return n.parent && n.parent.kind === 175 /* ConditionalType */ && n.parent.extendsType === n; })) {
+            if (!ts.findAncestor(node, function (n) { return n.parent && n.parent.kind === 176 /* ConditionalType */ && n.parent.extendsType === n; })) {
                 grammarErrorOnNode(node, ts.Diagnostics.infer_declarations_are_only_permitted_in_the_extends_clause_of_a_conditional_type);
             }
             checkSourceElement(node.typeParameter);
@@ -53696,9 +55503,9 @@ var ts;
             var flags = ts.getCombinedModifierFlags(n);
             // children of classes (even ambient classes) should not be marked as ambient or export
             // because those flags have no useful semantics there.
-            if (n.parent.kind !== 241 /* InterfaceDeclaration */ &&
-                n.parent.kind !== 240 /* ClassDeclaration */ &&
-                n.parent.kind !== 209 /* ClassExpression */ &&
+            if (n.parent.kind !== 242 /* InterfaceDeclaration */ &&
+                n.parent.kind !== 241 /* ClassDeclaration */ &&
+                n.parent.kind !== 210 /* ClassExpression */ &&
                 n.flags & 4194304 /* Ambient */) {
                 if (!(flags & 2 /* Ambient */) && !(ts.isModuleBlock(n.parent) && ts.isModuleDeclaration(n.parent.parent) && ts.isGlobalScopeAugmentation(n.parent.parent))) {
                     // It is nested in an ambient context, which means it is automatically exported
@@ -53789,7 +55596,7 @@ var ts;
                         if (node.name && subsequentName &&
                             (ts.isComputedPropertyName(node.name) && ts.isComputedPropertyName(subsequentName) ||
                                 !ts.isComputedPropertyName(node.name) && !ts.isComputedPropertyName(subsequentName) && ts.getEscapedTextOfIdentifierOrLiteral(node.name) === ts.getEscapedTextOfIdentifierOrLiteral(subsequentName))) {
-                            var reportError = (node.kind === 156 /* MethodDeclaration */ || node.kind === 155 /* MethodSignature */) &&
+                            var reportError = (node.kind === 157 /* MethodDeclaration */ || node.kind === 156 /* MethodSignature */) &&
                                 ts.hasModifier(node, 32 /* Static */) !== ts.hasModifier(subsequentNode, 32 /* Static */);
                             // we can get here in two cases
                             // 1. mixed static and instance class members
@@ -53828,7 +55635,7 @@ var ts;
                 var current = declarations_4[_i];
                 var node = current;
                 var inAmbientContext = node.flags & 4194304 /* Ambient */;
-                var inAmbientContextOrInterface = node.parent.kind === 241 /* InterfaceDeclaration */ || node.parent.kind === 168 /* TypeLiteral */ || inAmbientContext;
+                var inAmbientContextOrInterface = node.parent.kind === 242 /* InterfaceDeclaration */ || node.parent.kind === 169 /* TypeLiteral */ || inAmbientContext;
                 if (inAmbientContextOrInterface) {
                     // check if declarations are consecutive only if they are non-ambient
                     // 1. ambient declarations can be interleaved
@@ -53839,7 +55646,7 @@ var ts;
                     // 2. mixing ambient and non-ambient declarations is a separate error that will be reported - do not want to report an extra one
                     previousDeclaration = undefined;
                 }
-                if (node.kind === 239 /* FunctionDeclaration */ || node.kind === 156 /* MethodDeclaration */ || node.kind === 155 /* MethodSignature */ || node.kind === 157 /* Constructor */) {
+                if (node.kind === 240 /* FunctionDeclaration */ || node.kind === 157 /* MethodDeclaration */ || node.kind === 156 /* MethodSignature */ || node.kind === 158 /* Constructor */) {
                     var currentNodeFlags = getEffectiveDeclarationFlags(node, flagsToCheck);
                     someNodeFlags |= currentNodeFlags;
                     allNodeFlags &= currentNodeFlags;
@@ -53894,7 +55701,7 @@ var ts;
                     for (var _a = 0, signatures_6 = signatures; _a < signatures_6.length; _a++) {
                         var signature = signatures_6[_a];
                         if (!isImplementationCompatibleWithOverload(bodySignature, signature)) {
-                            addRelatedInfo(error(signature.declaration, ts.Diagnostics.This_overload_signature_is_not_compatible_with_its_implementation_signature), ts.createDiagnosticForNode(bodyDeclaration, ts.Diagnostics.The_implementation_signature_is_declared_here));
+                            ts.addRelatedInfo(error(signature.declaration, ts.Diagnostics.This_overload_signature_is_not_compatible_with_its_implementation_signature), ts.createDiagnosticForNode(bodyDeclaration, ts.Diagnostics.The_implementation_signature_is_declared_here));
                             break;
                         }
                     }
@@ -53968,22 +55775,22 @@ var ts;
             function getDeclarationSpaces(decl) {
                 var d = decl;
                 switch (d.kind) {
-                    case 241 /* InterfaceDeclaration */:
-                    case 242 /* TypeAliasDeclaration */:
+                    case 242 /* InterfaceDeclaration */:
+                    case 243 /* TypeAliasDeclaration */:
                     // A jsdoc typedef and callback are, by definition, type aliases
-                    case 309 /* JSDocTypedefTag */:
-                    case 302 /* JSDocCallbackTag */:
+                    case 311 /* JSDocTypedefTag */:
+                    case 304 /* JSDocCallbackTag */:
                         return 2 /* ExportType */;
-                    case 244 /* ModuleDeclaration */:
+                    case 245 /* ModuleDeclaration */:
                         return ts.isAmbientModule(d) || ts.getModuleInstanceState(d) !== 0 /* NonInstantiated */
                             ? 4 /* ExportNamespace */ | 1 /* ExportValue */
                             : 4 /* ExportNamespace */;
-                    case 240 /* ClassDeclaration */:
-                    case 243 /* EnumDeclaration */:
+                    case 241 /* ClassDeclaration */:
+                    case 244 /* EnumDeclaration */:
                         return 2 /* ExportType */ | 1 /* ExportValue */;
-                    case 284 /* SourceFile */:
+                    case 285 /* SourceFile */:
                         return 2 /* ExportType */ | 1 /* ExportValue */ | 4 /* ExportNamespace */;
-                    case 254 /* ExportAssignment */:
+                    case 255 /* ExportAssignment */:
                         // Export assigned entity name expressions act as aliases and should fall through, otherwise they export values
                         if (!ts.isEntityNameExpression(d.expression)) {
                             return 1 /* ExportValue */;
@@ -53991,26 +55798,26 @@ var ts;
                         d = d.expression;
                     /* falls through */
                     // The below options all declare an Alias, which is allowed to merge with other values within the importing module
-                    case 248 /* ImportEqualsDeclaration */:
-                    case 251 /* NamespaceImport */:
-                    case 250 /* ImportClause */:
-                        var result_5 = 0 /* None */;
+                    case 249 /* ImportEqualsDeclaration */:
+                    case 252 /* NamespaceImport */:
+                    case 251 /* ImportClause */:
+                        var result_8 = 0 /* None */;
                         var target = resolveAlias(getSymbolOfNode(d));
-                        ts.forEach(target.declarations, function (d) { result_5 |= getDeclarationSpaces(d); });
-                        return result_5;
-                    case 237 /* VariableDeclaration */:
-                    case 186 /* BindingElement */:
-                    case 239 /* FunctionDeclaration */:
-                    case 253 /* ImportSpecifier */: // https://github.com/Microsoft/TypeScript/pull/7591
+                        ts.forEach(target.declarations, function (d) { result_8 |= getDeclarationSpaces(d); });
+                        return result_8;
+                    case 238 /* VariableDeclaration */:
+                    case 187 /* BindingElement */:
+                    case 240 /* FunctionDeclaration */:
+                    case 254 /* ImportSpecifier */: // https://github.com/Microsoft/TypeScript/pull/7591
                         return 1 /* ExportValue */;
                     default:
-                        return ts.Debug.fail(ts.Debug.showSyntaxKind(d));
+                        return ts.Debug.failBadSyntaxKind(d);
                 }
             }
         }
-        function getAwaitedTypeOfPromise(type, errorNode, diagnosticMessage) {
+        function getAwaitedTypeOfPromise(type, errorNode, diagnosticMessage, arg0) {
             var promisedType = getPromisedTypeOfPromise(type, errorNode);
-            return promisedType && getAwaitedType(promisedType, errorNode, diagnosticMessage);
+            return promisedType && getAwaitedType(promisedType, errorNode, diagnosticMessage, arg0);
         }
         /**
          * Gets the "promised type" of a promise.
@@ -54068,10 +55875,14 @@ var ts;
          * Promise-like type; otherwise, it is the type of the expression. This is used to reflect
          * The runtime behavior of the `await` keyword.
          */
-        function checkAwaitedType(type, errorNode, diagnosticMessage) {
-            return getAwaitedType(type, errorNode, diagnosticMessage) || errorType;
+        function checkAwaitedType(type, errorNode, diagnosticMessage, arg0) {
+            var awaitedType = getAwaitedType(type, errorNode, diagnosticMessage, arg0);
+            if (awaitedType === type && !(type.flags & 3 /* AnyOrUnknown */)) {
+                addErrorOrSuggestion(/*isError*/ false, ts.createDiagnosticForNode(errorNode, ts.Diagnostics.await_has_no_effect_on_the_type_of_this_expression));
+            }
+            return awaitedType || errorType;
         }
-        function getAwaitedType(type, errorNode, diagnosticMessage) {
+        function getAwaitedType(type, errorNode, diagnosticMessage, arg0) {
             var typeAsAwaitable = type;
             if (typeAsAwaitable.awaitedTypeOfType) {
                 return typeAsAwaitable.awaitedTypeOfType;
@@ -54083,7 +55894,7 @@ var ts;
                 var types = void 0;
                 for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
                     var constituentType = _a[_i];
-                    types = ts.append(types, getAwaitedType(constituentType, errorNode, diagnosticMessage));
+                    types = ts.append(types, getAwaitedType(constituentType, errorNode, diagnosticMessage, arg0));
                 }
                 if (!types) {
                     return undefined;
@@ -54133,7 +55944,7 @@ var ts;
                 // Keep track of the type we're about to unwrap to avoid bad recursive promise types.
                 // See the comments above for more information.
                 awaitedTypeStack.push(type.id);
-                var awaitedType = getAwaitedType(promisedType, errorNode, diagnosticMessage);
+                var awaitedType = getAwaitedType(promisedType, errorNode, diagnosticMessage, arg0);
                 awaitedTypeStack.pop();
                 if (!awaitedType) {
                     return undefined;
@@ -54160,7 +55971,7 @@ var ts;
                 if (errorNode) {
                     if (!diagnosticMessage)
                         return ts.Debug.fail();
-                    error(errorNode, diagnosticMessage);
+                    error(errorNode, diagnosticMessage, arg0);
                 }
                 return undefined;
             }
@@ -54230,7 +56041,7 @@ var ts;
                 var promiseConstructorSymbol = resolveEntityName(promiseConstructorName, 67220415 /* Value */, /*ignoreErrors*/ true);
                 var promiseConstructorType = promiseConstructorSymbol ? getTypeOfSymbol(promiseConstructorSymbol) : errorType;
                 if (promiseConstructorType === errorType) {
-                    if (promiseConstructorName.kind === 72 /* Identifier */ && promiseConstructorName.escapedText === "Promise" && getTargetType(returnType) === getGlobalPromiseType(/*reportErrors*/ false)) {
+                    if (promiseConstructorName.kind === 73 /* Identifier */ && promiseConstructorName.escapedText === "Promise" && getTargetType(returnType) === getGlobalPromiseType(/*reportErrors*/ false)) {
                         error(returnTypeNode, ts.Diagnostics.An_async_function_or_method_in_ES5_SlashES3_requires_the_Promise_constructor_Make_sure_you_have_a_declaration_for_the_Promise_constructor_or_include_ES2015_in_your_lib_option);
                     }
                     else {
@@ -54269,24 +56080,24 @@ var ts;
             var headMessage = getDiagnosticHeadMessageForDecoratorResolution(node);
             var errorInfo;
             switch (node.parent.kind) {
-                case 240 /* ClassDeclaration */:
+                case 241 /* ClassDeclaration */:
                     var classSymbol = getSymbolOfNode(node.parent);
                     var classConstructorType = getTypeOfSymbol(classSymbol);
                     expectedReturnType = getUnionType([classConstructorType, voidType]);
                     break;
-                case 151 /* Parameter */:
+                case 152 /* Parameter */:
                     expectedReturnType = voidType;
                     errorInfo = ts.chainDiagnosticMessages(
                     /*details*/ undefined, ts.Diagnostics.The_return_type_of_a_parameter_decorator_function_must_be_either_void_or_any);
                     break;
-                case 154 /* PropertyDeclaration */:
+                case 155 /* PropertyDeclaration */:
                     expectedReturnType = voidType;
                     errorInfo = ts.chainDiagnosticMessages(
                     /*details*/ undefined, ts.Diagnostics.The_return_type_of_a_property_decorator_function_must_be_either_void_or_any);
                     break;
-                case 156 /* MethodDeclaration */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 157 /* MethodDeclaration */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     var methodType = getTypeOfNode(node.parent);
                     var descriptorType = createTypedPropertyDescriptorType(methodType);
                     expectedReturnType = getUnionType([descriptorType, voidType]);
@@ -54307,7 +56118,7 @@ var ts;
             if (!typeName)
                 return;
             var rootName = getFirstIdentifier(typeName);
-            var meaning = (typeName.kind === 72 /* Identifier */ ? 67897832 /* Type */ : 1920 /* Namespace */) | 2097152 /* Alias */;
+            var meaning = (typeName.kind === 73 /* Identifier */ ? 67897832 /* Type */ : 1920 /* Namespace */) | 2097152 /* Alias */;
             var rootSymbol = resolveName(rootName, rootName.escapedText, meaning, /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined, /*isRefernce*/ true);
             if (rootSymbol
                 && rootSymbol.flags & 2097152 /* Alias */
@@ -54332,14 +56143,14 @@ var ts;
         function getEntityNameForDecoratorMetadata(node) {
             if (node) {
                 switch (node.kind) {
-                    case 174 /* IntersectionType */:
-                    case 173 /* UnionType */:
+                    case 175 /* IntersectionType */:
+                    case 174 /* UnionType */:
                         return getEntityNameForDecoratorMetadataFromTypeList(node.types);
-                    case 175 /* ConditionalType */:
+                    case 176 /* ConditionalType */:
                         return getEntityNameForDecoratorMetadataFromTypeList([node.trueType, node.falseType]);
-                    case 177 /* ParenthesizedType */:
+                    case 178 /* ParenthesizedType */:
                         return getEntityNameForDecoratorMetadata(node.type);
-                    case 164 /* TypeReference */:
+                    case 165 /* TypeReference */:
                         return node.typeName;
                 }
             }
@@ -54348,13 +56159,13 @@ var ts;
             var commonEntityName;
             for (var _i = 0, types_17 = types; _i < types_17.length; _i++) {
                 var typeNode = types_17[_i];
-                while (typeNode.kind === 177 /* ParenthesizedType */) {
+                while (typeNode.kind === 178 /* ParenthesizedType */) {
                     typeNode = typeNode.type; // Skip parens if need be
                 }
-                if (typeNode.kind === 132 /* NeverKeyword */) {
+                if (typeNode.kind === 133 /* NeverKeyword */) {
                     continue; // Always elide `never` from the union/intersection if possible
                 }
-                if (!strictNullChecks && (typeNode.kind === 96 /* NullKeyword */ || typeNode.kind === 141 /* UndefinedKeyword */)) {
+                if (!strictNullChecks && (typeNode.kind === 97 /* NullKeyword */ || typeNode.kind === 142 /* UndefinedKeyword */)) {
                     continue; // Elide null and undefined from unions for metadata, just like what we did prior to the implementation of strict null checks
                 }
                 var individualEntityName = getEntityNameForDecoratorMetadata(typeNode);
@@ -54396,18 +56207,18 @@ var ts;
                 return;
             }
             if (!compilerOptions.experimentalDecorators) {
-                error(node, ts.Diagnostics.Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_to_remove_this_warning);
+                error(node, ts.Diagnostics.Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_in_your_tsconfig_or_jsconfig_to_remove_this_warning);
             }
             var firstDecorator = node.decorators[0];
             checkExternalEmitHelpers(firstDecorator, 8 /* Decorate */);
-            if (node.kind === 151 /* Parameter */) {
+            if (node.kind === 152 /* Parameter */) {
                 checkExternalEmitHelpers(firstDecorator, 32 /* Param */);
             }
             if (compilerOptions.emitDecoratorMetadata) {
                 checkExternalEmitHelpers(firstDecorator, 16 /* Metadata */);
                 // we only need to perform these checks if we are emitting serialized type metadata for the target of a decorator.
                 switch (node.kind) {
-                    case 240 /* ClassDeclaration */:
+                    case 241 /* ClassDeclaration */:
                         var constructor = ts.getFirstConstructorWithBody(node);
                         if (constructor) {
                             for (var _i = 0, _a = constructor.parameters; _i < _a.length; _i++) {
@@ -54416,23 +56227,23 @@ var ts;
                             }
                         }
                         break;
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
-                        var otherKind = node.kind === 158 /* GetAccessor */ ? 159 /* SetAccessor */ : 158 /* GetAccessor */;
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
+                        var otherKind = node.kind === 159 /* GetAccessor */ ? 160 /* SetAccessor */ : 159 /* GetAccessor */;
                         var otherAccessor = ts.getDeclarationOfKind(getSymbolOfNode(node), otherKind);
                         markDecoratorMedataDataTypeNodeAsReferenced(getAnnotatedAccessorTypeNode(node) || otherAccessor && getAnnotatedAccessorTypeNode(otherAccessor));
                         break;
-                    case 156 /* MethodDeclaration */:
+                    case 157 /* MethodDeclaration */:
                         for (var _b = 0, _c = node.parameters; _b < _c.length; _b++) {
                             var parameter = _c[_b];
                             markDecoratorMedataDataTypeNodeAsReferenced(getParameterTypeNodeForDecoratorCheck(parameter));
                         }
                         markDecoratorMedataDataTypeNodeAsReferenced(ts.getEffectiveReturnTypeNode(node));
                         break;
-                    case 154 /* PropertyDeclaration */:
+                    case 155 /* PropertyDeclaration */:
                         markDecoratorMedataDataTypeNodeAsReferenced(ts.getEffectiveTypeAnnotationNode(node));
                         break;
-                    case 151 /* Parameter */:
+                    case 152 /* Parameter */:
                         markDecoratorMedataDataTypeNodeAsReferenced(getParameterTypeNodeForDecoratorCheck(node));
                         var containingSignature = node.parent;
                         for (var _d = 0, _e = containingSignature.parameters; _d < _e.length; _d++) {
@@ -54495,7 +56306,7 @@ var ts;
                     else if (ts.findLast(ts.getJSDocTags(decl), ts.isJSDocParameterTag) === node &&
                         node.typeExpression && node.typeExpression.type &&
                         !isArrayType(getTypeFromTypeNode(node.typeExpression.type))) {
-                        error(node.name, ts.Diagnostics.JSDoc_param_tag_has_name_0_but_there_is_no_parameter_with_that_name_It_would_match_arguments_if_it_had_an_array_type, ts.idText(node.name.kind === 148 /* QualifiedName */ ? node.name.right : node.name));
+                        error(node.name, ts.Diagnostics.JSDoc_param_tag_has_name_0_but_there_is_no_parameter_with_that_name_It_would_match_arguments_if_it_had_an_array_type, ts.idText(node.name.kind === 149 /* QualifiedName */ ? node.name.right : node.name));
                     }
                 }
             }
@@ -54528,9 +56339,9 @@ var ts;
         }
         function getIdentifierFromEntityNameExpression(node) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return node;
-                case 189 /* PropertyAccessExpression */:
+                case 190 /* PropertyAccessExpression */:
                     return node.name;
                 default:
                     return undefined;
@@ -54543,7 +56354,7 @@ var ts;
             // Do not use hasDynamicName here, because that returns false for well known symbols.
             // We want to perform checkComputedPropertyName for all computed properties, including
             // well known symbols.
-            if (node.name && node.name.kind === 149 /* ComputedPropertyName */) {
+            if (node.name && node.name.kind === 150 /* ComputedPropertyName */) {
                 // This check will account for methods in class/interface declarations,
                 // as well as accessors in classes/object literals
                 checkComputedPropertyName(node.name);
@@ -54572,12 +56383,9 @@ var ts;
                     }
                 }
             }
-            var body = node.kind === 155 /* MethodSignature */ ? undefined : node.body;
+            var body = node.kind === 156 /* MethodSignature */ ? undefined : node.body;
             checkSourceElement(body);
-            if ((functionFlags & 1 /* Generator */) === 0) { // Async function or normal function
-                var returnOrPromisedType = getReturnOrPromisedType(node, functionFlags);
-                checkAllCodePathsInNonVoidFunctionReturnOrThrow(node, returnOrPromisedType);
-            }
+            checkAllCodePathsInNonVoidFunctionReturnOrThrow(node, getReturnTypeFromAnnotation(node));
             if (produceDiagnostics && !ts.getEffectiveReturnTypeNode(node)) {
                 // Report an implicit any error if there is no body, no explicit return type, and node is not a private method
                 // in an ambient context
@@ -54617,42 +56425,42 @@ var ts;
             for (var _i = 0, potentiallyUnusedIdentifiers_1 = potentiallyUnusedIdentifiers; _i < potentiallyUnusedIdentifiers_1.length; _i++) {
                 var node = potentiallyUnusedIdentifiers_1[_i];
                 switch (node.kind) {
-                    case 240 /* ClassDeclaration */:
-                    case 209 /* ClassExpression */:
+                    case 241 /* ClassDeclaration */:
+                    case 210 /* ClassExpression */:
                         checkUnusedClassMembers(node, addDiagnostic);
                         checkUnusedTypeParameters(node, addDiagnostic);
                         break;
-                    case 284 /* SourceFile */:
-                    case 244 /* ModuleDeclaration */:
-                    case 218 /* Block */:
-                    case 246 /* CaseBlock */:
-                    case 225 /* ForStatement */:
-                    case 226 /* ForInStatement */:
-                    case 227 /* ForOfStatement */:
+                    case 285 /* SourceFile */:
+                    case 245 /* ModuleDeclaration */:
+                    case 219 /* Block */:
+                    case 247 /* CaseBlock */:
+                    case 226 /* ForStatement */:
+                    case 227 /* ForInStatement */:
+                    case 228 /* ForOfStatement */:
                         checkUnusedLocalsAndParameters(node, addDiagnostic);
                         break;
-                    case 157 /* Constructor */:
-                    case 196 /* FunctionExpression */:
-                    case 239 /* FunctionDeclaration */:
-                    case 197 /* ArrowFunction */:
-                    case 156 /* MethodDeclaration */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
+                    case 158 /* Constructor */:
+                    case 197 /* FunctionExpression */:
+                    case 240 /* FunctionDeclaration */:
+                    case 198 /* ArrowFunction */:
+                    case 157 /* MethodDeclaration */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
                         if (node.body) { // Don't report unused parameters in overloads
                             checkUnusedLocalsAndParameters(node, addDiagnostic);
                         }
                         checkUnusedTypeParameters(node, addDiagnostic);
                         break;
-                    case 155 /* MethodSignature */:
-                    case 160 /* CallSignature */:
-                    case 161 /* ConstructSignature */:
-                    case 165 /* FunctionType */:
-                    case 166 /* ConstructorType */:
-                    case 242 /* TypeAliasDeclaration */:
-                    case 241 /* InterfaceDeclaration */:
+                    case 156 /* MethodSignature */:
+                    case 161 /* CallSignature */:
+                    case 162 /* ConstructSignature */:
+                    case 166 /* FunctionType */:
+                    case 167 /* ConstructorType */:
+                    case 243 /* TypeAliasDeclaration */:
+                    case 242 /* InterfaceDeclaration */:
                         checkUnusedTypeParameters(node, addDiagnostic);
                         break;
-                    case 176 /* InferType */:
+                    case 177 /* InferType */:
                         checkUnusedInferTypeParameter(node, addDiagnostic);
                         break;
                     default:
@@ -54672,11 +56480,11 @@ var ts;
             for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                 var member = _a[_i];
                 switch (member.kind) {
-                    case 156 /* MethodDeclaration */:
-                    case 154 /* PropertyDeclaration */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
-                        if (member.kind === 159 /* SetAccessor */ && member.symbol.flags & 32768 /* GetAccessor */) {
+                    case 157 /* MethodDeclaration */:
+                    case 155 /* PropertyDeclaration */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
+                        if (member.kind === 160 /* SetAccessor */ && member.symbol.flags & 32768 /* GetAccessor */) {
                             // Already would have reported an error on the getter.
                             break;
                         }
@@ -54685,7 +56493,7 @@ var ts;
                             addDiagnostic(member, 0 /* Local */, ts.createDiagnosticForNode(member.name, ts.Diagnostics._0_is_declared_but_its_value_is_never_read, symbolToString(symbol)));
                         }
                         break;
-                    case 157 /* Constructor */:
+                    case 158 /* Constructor */:
                         for (var _b = 0, _c = member.parameters; _b < _c.length; _b++) {
                             var parameter = _c[_b];
                             if (!parameter.symbol.isReferenced && ts.hasModifier(parameter, 8 /* Private */)) {
@@ -54693,8 +56501,8 @@ var ts;
                             }
                         }
                         break;
-                    case 162 /* IndexSignature */:
-                    case 217 /* SemicolonClassElement */:
+                    case 163 /* IndexSignature */:
+                    case 218 /* SemicolonClassElement */:
                         // Can't be private
                         break;
                     default:
@@ -54721,7 +56529,7 @@ var ts;
                     continue;
                 var name = ts.idText(typeParameter.name);
                 var parent = typeParameter.parent;
-                if (parent.kind !== 176 /* InferType */ && parent.typeParameters.every(isTypeParameterUnused)) {
+                if (parent.kind !== 177 /* InferType */ && parent.typeParameters.every(isTypeParameterUnused)) {
                     if (seenParentsWithEveryUnused.tryAdd(parent)) {
                         var range = ts.isJSDocTemplateTag(parent)
                             // Whole @template tag
@@ -54806,7 +56614,7 @@ var ts;
                 var importDecl = importClause.parent;
                 var nDeclarations = (importClause.name ? 1 : 0) +
                     (importClause.namedBindings ?
-                        (importClause.namedBindings.kind === 251 /* NamespaceImport */ ? 1 : importClause.namedBindings.elements.length)
+                        (importClause.namedBindings.kind === 252 /* NamespaceImport */ ? 1 : importClause.namedBindings.elements.length)
                         : 0);
                 if (nDeclarations === unuseds.length) {
                     addDiagnostic(importDecl, 0 /* Local */, unuseds.length === 1
@@ -54824,7 +56632,7 @@ var ts;
                 var bindingPattern = _a[0], bindingElements = _a[1];
                 var kind = tryGetRootParameterDeclaration(bindingPattern.parent) ? 1 /* Parameter */ : 0 /* Local */;
                 if (bindingPattern.elements.length === bindingElements.length) {
-                    if (bindingElements.length === 1 && bindingPattern.parent.kind === 237 /* VariableDeclaration */ && bindingPattern.parent.parent.kind === 238 /* VariableDeclarationList */) {
+                    if (bindingElements.length === 1 && bindingPattern.parent.kind === 238 /* VariableDeclaration */ && bindingPattern.parent.parent.kind === 239 /* VariableDeclarationList */) {
                         addToGroup(unusedVariables, bindingPattern.parent.parent, bindingPattern.parent, getNodeId);
                     }
                     else {
@@ -54845,7 +56653,7 @@ var ts;
                 if (declarationList.declarations.length === declarations.length) {
                     addDiagnostic(declarationList, 0 /* Local */, declarations.length === 1
                         ? ts.createDiagnosticForNode(ts.first(declarations).name, ts.Diagnostics._0_is_declared_but_its_value_is_never_read, bindingNameText(ts.first(declarations).name))
-                        : ts.createDiagnosticForNode(declarationList.parent.kind === 219 /* VariableStatement */ ? declarationList.parent : declarationList, ts.Diagnostics.All_variables_are_unused));
+                        : ts.createDiagnosticForNode(declarationList.parent.kind === 220 /* VariableStatement */ ? declarationList.parent : declarationList, ts.Diagnostics.All_variables_are_unused));
                 }
                 else {
                     for (var _i = 0, declarations_5 = declarations; _i < declarations_5.length; _i++) {
@@ -54857,24 +56665,24 @@ var ts;
         }
         function bindingNameText(name) {
             switch (name.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return ts.idText(name);
-                case 185 /* ArrayBindingPattern */:
-                case 184 /* ObjectBindingPattern */:
+                case 186 /* ArrayBindingPattern */:
+                case 185 /* ObjectBindingPattern */:
                     return bindingNameText(ts.cast(ts.first(name.elements), ts.isBindingElement).name);
                 default:
                     return ts.Debug.assertNever(name);
             }
         }
         function isImportedDeclaration(node) {
-            return node.kind === 250 /* ImportClause */ || node.kind === 253 /* ImportSpecifier */ || node.kind === 251 /* NamespaceImport */;
+            return node.kind === 251 /* ImportClause */ || node.kind === 254 /* ImportSpecifier */ || node.kind === 252 /* NamespaceImport */;
         }
         function importClauseFromImported(decl) {
-            return decl.kind === 250 /* ImportClause */ ? decl : decl.kind === 251 /* NamespaceImport */ ? decl.parent : decl.parent.parent;
+            return decl.kind === 251 /* ImportClause */ ? decl : decl.kind === 252 /* NamespaceImport */ ? decl.parent : decl.parent.parent;
         }
         function checkBlock(node) {
             // Grammar checking for SyntaxKind.Block
-            if (node.kind === 218 /* Block */) {
+            if (node.kind === 219 /* Block */) {
                 checkGrammarStatementInAmbientContext(node);
             }
             if (ts.isFunctionOrModuleBlock(node)) {
@@ -54904,12 +56712,12 @@ var ts;
             if (!(identifier && identifier.escapedText === name)) {
                 return false;
             }
-            if (node.kind === 154 /* PropertyDeclaration */ ||
-                node.kind === 153 /* PropertySignature */ ||
-                node.kind === 156 /* MethodDeclaration */ ||
-                node.kind === 155 /* MethodSignature */ ||
-                node.kind === 158 /* GetAccessor */ ||
-                node.kind === 159 /* SetAccessor */) {
+            if (node.kind === 155 /* PropertyDeclaration */ ||
+                node.kind === 154 /* PropertySignature */ ||
+                node.kind === 157 /* MethodDeclaration */ ||
+                node.kind === 156 /* MethodSignature */ ||
+                node.kind === 159 /* GetAccessor */ ||
+                node.kind === 160 /* SetAccessor */) {
                 // it is ok to have member named '_super' or '_this' - member access is always qualified
                 return false;
             }
@@ -54918,7 +56726,7 @@ var ts;
                 return false;
             }
             var root = ts.getRootDeclaration(node);
-            if (root.kind === 151 /* Parameter */ && ts.nodeIsMissing(root.parent.body)) {
+            if (root.kind === 152 /* Parameter */ && ts.nodeIsMissing(root.parent.body)) {
                 // just an overload - no codegen impact
                 return false;
             }
@@ -54928,7 +56736,7 @@ var ts;
         function checkIfThisIsCapturedInEnclosingScope(node) {
             ts.findAncestor(node, function (current) {
                 if (getNodeCheckFlags(current) & 4 /* CaptureThis */) {
-                    var isDeclaration_1 = node.kind !== 72 /* Identifier */;
+                    var isDeclaration_1 = node.kind !== 73 /* Identifier */;
                     if (isDeclaration_1) {
                         error(ts.getNameOfDeclaration(node), ts.Diagnostics.Duplicate_identifier_this_Compiler_uses_variable_declaration_this_to_capture_this_reference);
                     }
@@ -54943,7 +56751,7 @@ var ts;
         function checkIfNewTargetIsCapturedInEnclosingScope(node) {
             ts.findAncestor(node, function (current) {
                 if (getNodeCheckFlags(current) & 8 /* CaptureNewTarget */) {
-                    var isDeclaration_2 = node.kind !== 72 /* Identifier */;
+                    var isDeclaration_2 = node.kind !== 73 /* Identifier */;
                     if (isDeclaration_2) {
                         error(ts.getNameOfDeclaration(node), ts.Diagnostics.Duplicate_identifier_newTarget_Compiler_uses_variable_declaration_newTarget_to_capture_new_target_meta_property_reference);
                     }
@@ -54969,7 +56777,7 @@ var ts;
             }
             // In case of variable declaration, node.parent is variable statement so look at the variable statement's parent
             var parent = getDeclarationContainer(node);
-            if (parent.kind === 284 /* SourceFile */ && ts.isExternalOrCommonJsModule(parent)) {
+            if (parent.kind === 285 /* SourceFile */ && ts.isExternalOrCommonJsModule(parent)) {
                 // If the declaration happens to be in external module, report error that require and exports are reserved keywords
                 error(name, ts.Diagnostics.Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module, ts.declarationNameToString(name), ts.declarationNameToString(name));
             }
@@ -54984,7 +56792,7 @@ var ts;
             }
             // In case of variable declaration, node.parent is variable statement so look at the variable statement's parent
             var parent = getDeclarationContainer(node);
-            if (parent.kind === 284 /* SourceFile */ && ts.isExternalOrCommonJsModule(parent) && parent.flags & 1024 /* HasAsyncFunctions */) {
+            if (parent.kind === 285 /* SourceFile */ && ts.isExternalOrCommonJsModule(parent) && parent.flags & 1024 /* HasAsyncFunctions */) {
                 // If the declaration happens to be in external module, report error that Promise is a reserved identifier.
                 error(name, ts.Diagnostics.Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module_containing_async_functions, ts.declarationNameToString(name), ts.declarationNameToString(name));
             }
@@ -55019,7 +56827,7 @@ var ts;
             // skip variable declarations that don't have initializers
             // NOTE: in ES6 spec initializer is required in variable declarations where name is binding pattern
             // so we'll always treat binding elements as initialized
-            if (node.kind === 237 /* VariableDeclaration */ && !node.initializer) {
+            if (node.kind === 238 /* VariableDeclaration */ && !node.initializer) {
                 return;
             }
             var symbol = getSymbolOfNode(node);
@@ -55031,17 +56839,17 @@ var ts;
                     localDeclarationSymbol !== symbol &&
                     localDeclarationSymbol.flags & 2 /* BlockScopedVariable */) {
                     if (getDeclarationNodeFlagsFromSymbol(localDeclarationSymbol) & 3 /* BlockScoped */) {
-                        var varDeclList = ts.getAncestor(localDeclarationSymbol.valueDeclaration, 238 /* VariableDeclarationList */);
-                        var container = varDeclList.parent.kind === 219 /* VariableStatement */ && varDeclList.parent.parent
+                        var varDeclList = ts.getAncestor(localDeclarationSymbol.valueDeclaration, 239 /* VariableDeclarationList */);
+                        var container = varDeclList.parent.kind === 220 /* VariableStatement */ && varDeclList.parent.parent
                             ? varDeclList.parent.parent
                             : undefined;
                         // names of block-scoped and function scoped variables can collide only
                         // if block scoped variable is defined in the function\module\source file scope (because of variable hoisting)
                         var namesShareScope = container &&
-                            (container.kind === 218 /* Block */ && ts.isFunctionLike(container.parent) ||
-                                container.kind === 245 /* ModuleBlock */ ||
-                                container.kind === 244 /* ModuleDeclaration */ ||
-                                container.kind === 284 /* SourceFile */);
+                            (container.kind === 219 /* Block */ && ts.isFunctionLike(container.parent) ||
+                                container.kind === 246 /* ModuleBlock */ ||
+                                container.kind === 245 /* ModuleDeclaration */ ||
+                                container.kind === 285 /* SourceFile */);
                         // here we know that function scoped variable is shadowed by block scoped one
                         // if they are defined in the same scope - binder has already reported redeclaration error
                         // otherwise if variable has an initializer - show error that initialization will fail
@@ -55054,69 +56862,6 @@ var ts;
                 }
             }
         }
-        // Check that a parameter initializer contains no references to parameters declared to the right of itself
-        function checkParameterInitializer(node) {
-            if (ts.getRootDeclaration(node).kind !== 151 /* Parameter */) {
-                return;
-            }
-            var func = ts.getContainingFunction(node);
-            visit(node.initializer);
-            function visit(n) {
-                if (ts.isTypeNode(n) || ts.isDeclarationName(n)) {
-                    // do not dive in types
-                    // skip declaration names (i.e. in object literal expressions)
-                    return;
-                }
-                if (n.kind === 189 /* PropertyAccessExpression */) {
-                    // skip property names in property access expression
-                    return visit(n.expression);
-                }
-                else if (n.kind === 72 /* Identifier */) {
-                    // check FunctionLikeDeclaration.locals (stores parameters\function local variable)
-                    // if it contains entry with a specified name
-                    var symbol = resolveName(n, n.escapedText, 67220415 /* Value */ | 2097152 /* Alias */, /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined, /*isUse*/ false);
-                    if (!symbol || symbol === unknownSymbol || !symbol.valueDeclaration) {
-                        return;
-                    }
-                    if (symbol.valueDeclaration === node) {
-                        error(n, ts.Diagnostics.Parameter_0_cannot_be_referenced_in_its_initializer, ts.declarationNameToString(node.name));
-                        return;
-                    }
-                    // locals map for function contain both parameters and function locals
-                    // so we need to do a bit of extra work to check if reference is legal
-                    var enclosingContainer = ts.getEnclosingBlockScopeContainer(symbol.valueDeclaration);
-                    if (enclosingContainer === func) {
-                        if (symbol.valueDeclaration.kind === 151 /* Parameter */ ||
-                            symbol.valueDeclaration.kind === 186 /* BindingElement */) {
-                            // it is ok to reference parameter in initializer if either
-                            // - parameter is located strictly on the left of current parameter declaration
-                            if (symbol.valueDeclaration.pos < node.pos) {
-                                return;
-                            }
-                            // - parameter is wrapped in function-like entity
-                            if (ts.findAncestor(n, function (current) {
-                                if (current === node.initializer) {
-                                    return "quit";
-                                }
-                                return ts.isFunctionLike(current.parent) ||
-                                    // computed property names/initializers in instance property declaration of class like entities
-                                    // are executed in constructor and thus deferred
-                                    (current.parent.kind === 154 /* PropertyDeclaration */ &&
-                                        !(ts.hasModifier(current.parent, 32 /* Static */)) &&
-                                        ts.isClassLike(current.parent.parent));
-                            })) {
-                                return;
-                            }
-                            // fall through to report error
-                        }
-                        error(n, ts.Diagnostics.Initializer_of_parameter_0_cannot_reference_identifier_1_declared_after_it, ts.declarationNameToString(node.name), ts.declarationNameToString(n));
-                    }
-                }
-                else {
-                    return ts.forEachChild(n, visit);
-                }
-            }
-        }
         function convertAutoToAny(type) {
             return type === autoType ? anyType : type === autoArrayType ? anyArrayType : type;
         }
@@ -55134,18 +56879,18 @@ var ts;
             // Do not use hasDynamicName here, because that returns false for well known symbols.
             // We want to perform checkComputedPropertyName for all computed properties, including
             // well known symbols.
-            if (node.name.kind === 149 /* ComputedPropertyName */) {
+            if (node.name.kind === 150 /* ComputedPropertyName */) {
                 checkComputedPropertyName(node.name);
                 if (node.initializer) {
                     checkExpressionCached(node.initializer);
                 }
             }
-            if (node.kind === 186 /* BindingElement */) {
-                if (node.parent.kind === 184 /* ObjectBindingPattern */ && languageVersion < 7 /* ESNext */) {
+            if (node.kind === 187 /* BindingElement */) {
+                if (node.parent.kind === 185 /* ObjectBindingPattern */ && languageVersion < 99 /* ESNext */) {
                     checkExternalEmitHelpers(node, 4 /* Rest */);
                 }
                 // check computed properties inside property names of binding elements
-                if (node.propertyName && node.propertyName.kind === 149 /* ComputedPropertyName */) {
+                if (node.propertyName && node.propertyName.kind === 150 /* ComputedPropertyName */) {
                     checkComputedPropertyName(node.propertyName);
                 }
                 // check private/protected variable access
@@ -55159,35 +56904,48 @@ var ts;
                         var property = getPropertyOfType(parentType, nameText);
                         if (property) {
                             markPropertyAsReferenced(property, /*nodeForCheckWriteOnly*/ undefined, /*isThisAccess*/ false); // A destructuring is never a write-only reference.
-                            checkPropertyAccessibility(parent, !!parent.initializer && parent.initializer.kind === 98 /* SuperKeyword */, parentType, property);
+                            checkPropertyAccessibility(parent, !!parent.initializer && parent.initializer.kind === 99 /* SuperKeyword */, parentType, property);
                         }
                     }
                 }
             }
             // For a binding pattern, check contained binding elements
             if (ts.isBindingPattern(node.name)) {
-                if (node.name.kind === 185 /* ArrayBindingPattern */ && languageVersion < 2 /* ES2015 */ && compilerOptions.downlevelIteration) {
+                if (node.name.kind === 186 /* ArrayBindingPattern */ && languageVersion < 2 /* ES2015 */ && compilerOptions.downlevelIteration) {
                     checkExternalEmitHelpers(node, 512 /* Read */);
                 }
                 ts.forEach(node.name.elements, checkSourceElement);
             }
             // For a parameter declaration with an initializer, error and exit if the containing function doesn't have a body
-            if (node.initializer && ts.getRootDeclaration(node).kind === 151 /* Parameter */ && ts.nodeIsMissing(ts.getContainingFunction(node).body)) {
+            if (node.initializer && ts.getRootDeclaration(node).kind === 152 /* Parameter */ && ts.nodeIsMissing(ts.getContainingFunction(node).body)) {
                 error(node, ts.Diagnostics.A_parameter_initializer_is_only_allowed_in_a_function_or_constructor_implementation);
                 return;
             }
             // For a binding pattern, validate the initializer and exit
             if (ts.isBindingPattern(node.name)) {
-                // Don't validate for-in initializer as it is already an error
-                if (node.initializer && node.parent.parent.kind !== 226 /* ForInStatement */) {
-                    var initializerType = checkExpressionCached(node.initializer);
-                    if (strictNullChecks && node.name.elements.length === 0) {
-                        checkNonNullType(initializerType, node);
+                var needCheckInitializer = node.initializer && node.parent.parent.kind !== 227 /* ForInStatement */;
+                var needCheckWidenedType = node.name.elements.length === 0;
+                if (needCheckInitializer || needCheckWidenedType) {
+                    // Don't validate for-in initializer as it is already an error
+                    var widenedType = getWidenedTypeForVariableLikeDeclaration(node);
+                    if (needCheckInitializer) {
+                        var initializerType = checkExpressionCached(node.initializer);
+                        if (strictNullChecks && needCheckWidenedType) {
+                            checkNonNullNonVoidType(initializerType, node);
+                        }
+                        else {
+                            checkTypeAssignableToAndOptionallyElaborate(initializerType, getWidenedTypeForVariableLikeDeclaration(node), node, node.initializer);
+                        }
                     }
-                    else {
-                        checkTypeAssignableToAndOptionallyElaborate(initializerType, getWidenedTypeForVariableLikeDeclaration(node), node, node.initializer);
+                    // check the binding pattern with empty elements
+                    if (needCheckWidenedType) {
+                        if (ts.isArrayBindingPattern(node.name)) {
+                            checkIteratedTypeOrElementType(65 /* Destructuring */, widenedType, undefinedType, node);
+                        }
+                        else if (strictNullChecks) {
+                            checkNonNullNonVoidType(widenedType, node);
+                        }
                     }
-                    checkParameterInitializer(node);
                 }
                 return;
             }
@@ -55202,9 +56960,8 @@ var ts;
                         ts.isObjectLiteralExpression(initializer) &&
                         (initializer.properties.length === 0 || ts.isPrototypeAccess(node.name)) &&
                         ts.hasEntries(symbol.exports);
-                    if (!isJSObjectLiteralInitializer && node.parent.parent.kind !== 226 /* ForInStatement */) {
+                    if (!isJSObjectLiteralInitializer && node.parent.parent.kind !== 227 /* ForInStatement */) {
                         checkTypeAssignableToAndOptionallyElaborate(checkExpressionCached(initializer), type, node, initializer, /*headMessage*/ undefined);
-                        checkParameterInitializer(node);
                     }
                 }
                 if (symbol.declarations.length > 1) {
@@ -55220,7 +56977,7 @@ var ts;
                 if (type !== errorType && declarationType !== errorType &&
                     !isTypeIdenticalTo(type, declarationType) &&
                     !(symbol.flags & 67108864 /* Assignment */)) {
-                    errorNextVariableOrPropertyDeclarationMustHaveSameType(type, node, declarationType);
+                    errorNextVariableOrPropertyDeclarationMustHaveSameType(symbol.valueDeclaration, type, node, declarationType);
                 }
                 if (node.initializer) {
                     checkTypeAssignableToAndOptionallyElaborate(checkExpressionCached(node.initializer), declarationType, node, node.initializer, /*headMessage*/ undefined);
@@ -55229,26 +56986,30 @@ var ts;
                     error(node.name, ts.Diagnostics.All_declarations_of_0_must_have_identical_modifiers, ts.declarationNameToString(node.name));
                 }
             }
-            if (node.kind !== 154 /* PropertyDeclaration */ && node.kind !== 153 /* PropertySignature */) {
+            if (node.kind !== 155 /* PropertyDeclaration */ && node.kind !== 154 /* PropertySignature */) {
                 // We know we don't have a binding pattern or computed name here
                 checkExportsOnMergedDeclarations(node);
-                if (node.kind === 237 /* VariableDeclaration */ || node.kind === 186 /* BindingElement */) {
+                if (node.kind === 238 /* VariableDeclaration */ || node.kind === 187 /* BindingElement */) {
                     checkVarDeclaredNamesNotShadowed(node);
                 }
                 checkCollisionWithRequireExportsInGeneratedCode(node, node.name);
                 checkCollisionWithGlobalPromiseInGeneratedCode(node, node.name);
             }
         }
-        function errorNextVariableOrPropertyDeclarationMustHaveSameType(firstType, nextDeclaration, nextType) {
+        function errorNextVariableOrPropertyDeclarationMustHaveSameType(firstDeclaration, firstType, nextDeclaration, nextType) {
             var nextDeclarationName = ts.getNameOfDeclaration(nextDeclaration);
-            var message = nextDeclaration.kind === 154 /* PropertyDeclaration */ || nextDeclaration.kind === 153 /* PropertySignature */
+            var message = nextDeclaration.kind === 155 /* PropertyDeclaration */ || nextDeclaration.kind === 154 /* PropertySignature */
                 ? ts.Diagnostics.Subsequent_property_declarations_must_have_the_same_type_Property_0_must_be_of_type_1_but_here_has_type_2
                 : ts.Diagnostics.Subsequent_variable_declarations_must_have_the_same_type_Variable_0_must_be_of_type_1_but_here_has_type_2;
-            error(nextDeclarationName, message, ts.declarationNameToString(nextDeclarationName), typeToString(firstType), typeToString(nextType));
+            var declName = ts.declarationNameToString(nextDeclarationName);
+            var err = error(nextDeclarationName, message, declName, typeToString(firstType), typeToString(nextType));
+            if (firstDeclaration) {
+                ts.addRelatedInfo(err, ts.createDiagnosticForNode(firstDeclaration, ts.Diagnostics._0_was_also_declared_here, declName));
+            }
         }
         function areDeclarationFlagsIdentical(left, right) {
-            if ((left.kind === 151 /* Parameter */ && right.kind === 237 /* VariableDeclaration */) ||
-                (left.kind === 237 /* VariableDeclaration */ && right.kind === 151 /* Parameter */)) {
+            if ((left.kind === 152 /* Parameter */ && right.kind === 238 /* VariableDeclaration */) ||
+                (left.kind === 238 /* VariableDeclaration */ && right.kind === 152 /* Parameter */)) {
                 // Differences in optionality between parameters and variables are allowed.
                 return true;
             }
@@ -55287,7 +57048,7 @@ var ts;
             checkGrammarStatementInAmbientContext(node);
             checkTruthinessExpression(node.expression);
             checkSourceElement(node.thenStatement);
-            if (node.thenStatement.kind === 220 /* EmptyStatement */) {
+            if (node.thenStatement.kind === 221 /* EmptyStatement */) {
                 error(node.thenStatement, ts.Diagnostics.The_body_of_an_if_statement_cannot_be_the_empty_statement);
             }
             checkSourceElement(node.elseStatement);
@@ -55314,12 +57075,12 @@ var ts;
         function checkForStatement(node) {
             // Grammar checking
             if (!checkGrammarStatementInAmbientContext(node)) {
-                if (node.initializer && node.initializer.kind === 238 /* VariableDeclarationList */) {
+                if (node.initializer && node.initializer.kind === 239 /* VariableDeclarationList */) {
                     checkGrammarVariableDeclarationList(node.initializer);
                 }
             }
             if (node.initializer) {
-                if (node.initializer.kind === 238 /* VariableDeclarationList */) {
+                if (node.initializer.kind === 239 /* VariableDeclarationList */) {
                     ts.forEach(node.initializer.declarations, checkVariableDeclaration);
                 }
                 else {
@@ -55339,9 +57100,9 @@ var ts;
             checkGrammarForInOrForOfStatement(node);
             if (node.awaitModifier) {
                 var functionFlags = ts.getFunctionFlags(ts.getContainingFunction(node));
-                if ((functionFlags & (4 /* Invalid */ | 2 /* Async */)) === 2 /* Async */ && languageVersion < 7 /* ESNext */) {
+                if ((functionFlags & (4 /* Invalid */ | 2 /* Async */)) === 2 /* Async */ && languageVersion < 99 /* ESNext */) {
                     // for..await..of in an async function or async generator function prior to ESNext requires the __asyncValues helper
-                    checkExternalEmitHelpers(node, 16384 /* ForAwaitOfIncludes */);
+                    checkExternalEmitHelpers(node, 32768 /* ForAwaitOfIncludes */);
                 }
             }
             else if (compilerOptions.downlevelIteration && languageVersion < 2 /* ES2015 */) {
@@ -55353,14 +57114,14 @@ var ts;
             // via checkRightHandSideOfForOf.
             // If the LHS is an expression, check the LHS, as a destructuring assignment or as a reference.
             // Then check that the RHS is assignable to it.
-            if (node.initializer.kind === 238 /* VariableDeclarationList */) {
+            if (node.initializer.kind === 239 /* VariableDeclarationList */) {
                 checkForInOrForOfVariableDeclaration(node);
             }
             else {
                 var varExpr = node.initializer;
                 var iteratedType = checkRightHandSideOfForOf(node.expression, node.awaitModifier);
                 // There may be a destructuring assignment on the left side
-                if (varExpr.kind === 187 /* ArrayLiteralExpression */ || varExpr.kind === 188 /* ObjectLiteralExpression */) {
+                if (varExpr.kind === 188 /* ArrayLiteralExpression */ || varExpr.kind === 189 /* ObjectLiteralExpression */) {
                     // iteratedType may be undefined. In this case, we still want to check the structure of
                     // varExpr, in particular making sure it's a valid LeftHandSideExpression. But we'd like
                     // to short circuit the type relation checking as much as possible, so we pass the unknownType.
@@ -55392,7 +57153,7 @@ var ts;
             // for (let VarDecl in Expr) Statement
             //   VarDecl must be a variable declaration without a type annotation that declares a variable of type Any,
             //   and Expr must be an expression of type Any, an object type, or a type parameter type.
-            if (node.initializer.kind === 238 /* VariableDeclarationList */) {
+            if (node.initializer.kind === 239 /* VariableDeclarationList */) {
                 var variable = node.initializer.declarations[0];
                 if (variable && ts.isBindingPattern(variable.name)) {
                     error(variable.name, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern);
@@ -55406,7 +57167,7 @@ var ts;
                 //   and Expr must be an expression of type Any, an object type, or a type parameter type.
                 var varExpr = node.initializer;
                 var leftType = checkExpression(varExpr);
-                if (varExpr.kind === 187 /* ArrayLiteralExpression */ || varExpr.kind === 188 /* ObjectLiteralExpression */) {
+                if (varExpr.kind === 188 /* ArrayLiteralExpression */ || varExpr.kind === 189 /* ObjectLiteralExpression */) {
                     error(varExpr, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern);
                 }
                 else if (!isTypeAssignableTo(getIndexTypeOrString(rightType), leftType)) {
@@ -55437,20 +57198,22 @@ var ts;
         }
         function checkRightHandSideOfForOf(rhsExpression, awaitModifier) {
             var expressionType = checkNonNullExpression(rhsExpression);
-            return checkIteratedTypeOrElementType(expressionType, rhsExpression, /*allowStringInput*/ true, awaitModifier !== undefined);
+            var use = awaitModifier ? 15 /* ForAwaitOf */ : 13 /* ForOf */;
+            return checkIteratedTypeOrElementType(use, expressionType, undefinedType, rhsExpression);
         }
-        function checkIteratedTypeOrElementType(inputType, errorNode, allowStringInput, allowAsyncIterables) {
+        function checkIteratedTypeOrElementType(use, inputType, sentType, errorNode) {
             if (isTypeAny(inputType)) {
                 return inputType;
             }
-            return getIteratedTypeOrElementType(inputType, errorNode, allowStringInput, allowAsyncIterables, /*checkAssignability*/ true) || anyType;
+            return getIteratedTypeOrElementType(use, inputType, sentType, errorNode, /*checkAssignability*/ true) || anyType;
         }
         /**
          * When consuming an iterable type in a for..of, spread, or iterator destructuring assignment
          * we want to get the iterated type of an iterable for ES2015 or later, or the iterated type
          * of a iterable (if defined globally) or element type of an array like for ES2015 or earlier.
          */
-        function getIteratedTypeOrElementType(inputType, errorNode, allowStringInput, allowAsyncIterables, checkAssignability) {
+        function getIteratedTypeOrElementType(use, inputType, sentType, errorNode, checkAssignability) {
+            var allowAsyncIterables = (use & 2 /* AllowsAsyncIterablesFlag */) !== 0;
             if (inputType === neverType) {
                 reportTypeNotIterableError(errorNode, inputType, allowAsyncIterables); // TODO: GH#18217
                 return undefined;
@@ -55462,9 +57225,21 @@ var ts;
             // downlevelIteration is requested.
             if (uplevelIteration || downlevelIteration || allowAsyncIterables) {
                 // We only report errors for an invalid iterable type in ES2015 or higher.
-                var iteratedType = getIteratedTypeOfIterable(inputType, uplevelIteration ? errorNode : undefined, allowAsyncIterables, /*allowSyncIterables*/ true, checkAssignability);
-                if (iteratedType || uplevelIteration) {
-                    return iteratedType;
+                var iterationTypes = getIterationTypesOfIterable(inputType, use, uplevelIteration ? errorNode : undefined);
+                if (checkAssignability) {
+                    if (iterationTypes) {
+                        var diagnostic = use & 8 /* ForOfFlag */ ? ts.Diagnostics.Cannot_iterate_value_because_the_next_method_of_its_iterator_expects_type_1_but_for_of_will_always_send_0 :
+                            use & 32 /* SpreadFlag */ ? ts.Diagnostics.Cannot_iterate_value_because_the_next_method_of_its_iterator_expects_type_1_but_array_spread_will_always_send_0 :
+                                use & 64 /* DestructuringFlag */ ? ts.Diagnostics.Cannot_iterate_value_because_the_next_method_of_its_iterator_expects_type_1_but_array_destructuring_will_always_send_0 :
+                                    use & 16 /* YieldStarFlag */ ? ts.Diagnostics.Cannot_delegate_iteration_to_value_because_the_next_method_of_its_iterator_expects_type_1_but_the_containing_generator_will_always_send_0 :
+                                        undefined;
+                        if (diagnostic) {
+                            checkTypeAssignableTo(sentType, iterationTypes.nextType, errorNode, diagnostic);
+                        }
+                    }
+                }
+                if (iterationTypes || uplevelIteration) {
+                    return iterationTypes && iterationTypes.yieldType;
                 }
             }
             var arrayType = inputType;
@@ -55473,7 +57248,7 @@ var ts;
             // If strings are permitted, remove any string-like constituents from the array type.
             // This allows us to find other non-string element types from an array unioned with
             // a string.
-            if (allowStringInput) {
+            if (use & 4 /* AllowsStringInputFlag */) {
                 if (arrayType.flags & 1048576 /* Union */) {
                     // After we remove all types that are StringLike, we will know if there was a string constituent
                     // based on whether the result of filter is a new array.
@@ -55508,19 +57283,19 @@ var ts;
                     // want to say that number is not an array type. But if the input was just
                     // number and string input is allowed, we want to say that number is not an
                     // array type or a string type.
-                    var isIterable = !!getIteratedTypeOfIterable(inputType, /* errorNode */ undefined, allowAsyncIterables, /*allowSyncIterables*/ true, checkAssignability);
-                    var diagnostic = !allowStringInput || hasStringConstituent
+                    var yieldType = getIterationTypeOfIterable(use, 0 /* Yield */, inputType, /*errorNode*/ undefined);
+                    var _a = !(use & 4 /* AllowsStringInputFlag */) || hasStringConstituent
                         ? downlevelIteration
-                            ? ts.Diagnostics.Type_0_is_not_an_array_type_or_does_not_have_a_Symbol_iterator_method_that_returns_an_iterator
-                            : isIterable
-                                ? ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type_Use_compiler_option_downlevelIteration_to_allow_iterating_of_iterators
-                                : ts.Diagnostics.Type_0_is_not_an_array_type
+                            ? [ts.Diagnostics.Type_0_is_not_an_array_type_or_does_not_have_a_Symbol_iterator_method_that_returns_an_iterator, true]
+                            : yieldType
+                                ? [ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type_Use_compiler_option_downlevelIteration_to_allow_iterating_of_iterators, false]
+                                : [ts.Diagnostics.Type_0_is_not_an_array_type, true]
                         : downlevelIteration
-                            ? ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type_or_does_not_have_a_Symbol_iterator_method_that_returns_an_iterator
-                            : isIterable
-                                ? ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type_Use_compiler_option_downlevelIteration_to_allow_iterating_of_iterators
-                                : ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type;
-                    error(errorNode, diagnostic, typeToString(arrayType));
+                            ? [ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type_or_does_not_have_a_Symbol_iterator_method_that_returns_an_iterator, true]
+                            : yieldType
+                                ? [ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type_Use_compiler_option_downlevelIteration_to_allow_iterating_of_iterators, false]
+                                : [ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type, true], defaultDiagnostic = _a[0], maybeMissingAwait = _a[1];
+                    errorAndMaybeSuggestAwait(errorNode, maybeMissingAwait && !!getAwaitedTypeOfPromise(arrayType), defaultDiagnostic, typeToString(arrayType));
                 }
                 return hasStringConstituent ? stringType : undefined;
             }
@@ -55535,33 +57310,78 @@ var ts;
             return arrayElementType;
         }
         /**
-         * We want to treat type as an iterable, and get the type it is an iterable of. The iterable
-         * must have the following structure (annotated with the names of the variables below):
+         * Gets the requested "iteration type" from an `Iterable`-like or `AsyncIterable`-like type.
+         */
+        function getIterationTypeOfIterable(use, typeKind, inputType, errorNode) {
+            if (isTypeAny(inputType)) {
+                return undefined;
+            }
+            var iterationTypes = getIterationTypesOfIterable(inputType, use, errorNode);
+            return iterationTypes && iterationTypes[getIterationTypesKeyFromIterationTypeKind(typeKind)];
+        }
+        function createIterationTypes(yieldType, returnType, nextType) {
+            // `yieldType` and `returnType` are defaulted to `neverType` they each will be combined
+            // via `getUnionType` when merging iteration types. `nextType` is defined as `unknownType`
+            // as it is combined via `getIntersectionType` when merging iteration types.
+            if (yieldType === void 0) { yieldType = neverType; }
+            if (returnType === void 0) { returnType = neverType; }
+            if (nextType === void 0) { nextType = unknownType; }
+            // Use the cache only for intrinsic types to keep it small as they are likely to be
+            // more frequently created (i.e. `Iterator<number, void, unknown>`). Iteration types
+            // are also cached on the type they are requested for, so we shouldn't need to maintain
+            // the cache for less-frequently used types.
+            if (yieldType.flags & 67359327 /* Intrinsic */ &&
+                returnType.flags & (1 /* Any */ | 131072 /* Never */ | 2 /* Unknown */ | 16384 /* Void */ | 32768 /* Undefined */) &&
+                nextType.flags & (1 /* Any */ | 131072 /* Never */ | 2 /* Unknown */ | 16384 /* Void */ | 32768 /* Undefined */)) {
+                var id = getTypeListId([yieldType, returnType, nextType]);
+                var iterationTypes = iterationTypesCache.get(id);
+                if (!iterationTypes) {
+                    iterationTypes = { yieldType: yieldType, returnType: returnType, nextType: nextType };
+                    iterationTypesCache.set(id, iterationTypes);
+                }
+                return iterationTypes;
+            }
+            return { yieldType: yieldType, returnType: returnType, nextType: nextType };
+        }
+        /**
+         * Combines multiple `IterationTypes` records.
          *
-         *     { // iterable
-         *         [Symbol.iterator]: { // iteratorMethod
-         *             (): Iterator<T>
-         *         }
-         *     }
+         * If `array` is empty or all elements are missing or are references to `noIterationTypes`,
+         * then `noIterationTypes` is returned. Otherwise, an `IterationTypes` record is returned
+         * for the combined iteration types.
+         */
+        function combineIterationTypes(array) {
+            var yieldTypes;
+            var returnTypes;
+            var nextTypes;
+            for (var _i = 0, array_10 = array; _i < array_10.length; _i++) {
+                var iterationTypes = array_10[_i];
+                if (iterationTypes === undefined || iterationTypes === noIterationTypes) {
+                    continue;
+                }
+                if (iterationTypes === anyIterationTypes) {
+                    return anyIterationTypes;
+                }
+                yieldTypes = ts.append(yieldTypes, iterationTypes.yieldType);
+                returnTypes = ts.append(returnTypes, iterationTypes.returnType);
+                nextTypes = ts.append(nextTypes, iterationTypes.nextType);
+            }
+            if (yieldTypes || returnTypes || nextTypes) {
+                return createIterationTypes(yieldTypes && getUnionType(yieldTypes), returnTypes && getUnionType(returnTypes), nextTypes && getIntersectionType(nextTypes));
+            }
+            return noIterationTypes;
+        }
+        /**
+         * Gets the *yield*, *return*, and *next* types from an `Iterable`-like or `AsyncIterable`-like type.
          *
-         * For an async iterable, we expect the following structure:
-         *
-         *     { // iterable
-         *         [Symbol.asyncIterator]: { // iteratorMethod
-         *             (): AsyncIterator<T>
-         *         }
-         *     }
-         *
-         * T is the type we are after. At every level that involves analyzing return types
-         * of signatures, we union the return types of all the signatures.
+         * At every level that involves analyzing return types of signatures, we union the return types of all the signatures.
          *
          * Another thing to note is that at any step of this process, we could run into a dead end,
          * meaning either the property is missing, or we run into the anyType. If either of these things
-         * happens, we return undefined to signal that we could not find the iterated type. If a property
-         * is missing, and the previous step did not result in 'any', then we also give an error if the
+         * happens, we return `undefined` to signal that we could not find the iteration type. If a property
+         * is missing, and the previous step did not result in `any`, then we also give an error if the
          * caller requested it. Then the caller can decide what to do in the case where there is no iterated
-         * type. This is different from returning anyType, because that would signify that we have matched the
-         * whole pattern and that T (above) is 'any'.
+         * type.
          *
          * For a **for-of** statement, `yield*` (in a normal generator), spread, array
          * destructuring, or normal generator we will only ever look for a `[Symbol.iterator]()`
@@ -55572,164 +57392,412 @@ var ts;
          * For a **for-await-of** statement or a `yield*` in an async generator we will look for
          * the `[Symbol.asyncIterator]()` method first, and then the `[Symbol.iterator]()` method.
          */
-        function getIteratedTypeOfIterable(type, errorNode, allowAsyncIterables, allowSyncIterables, checkAssignability) {
+        function getIterationTypesOfIterable(type, use, errorNode) {
             if (isTypeAny(type)) {
-                return undefined;
+                return anyIterationTypes;
             }
-            return mapType(type, getIteratedType);
-            function getIteratedType(type) {
-                var typeAsIterable = type;
-                if (allowAsyncIterables) {
-                    if (typeAsIterable.iteratedTypeOfAsyncIterable) {
-                        return typeAsIterable.iteratedTypeOfAsyncIterable;
+            if (!(type.flags & 1048576 /* Union */)) {
+                var iterationTypes_1 = getIterationTypesOfIterableWorker(type, use, errorNode);
+                if (iterationTypes_1 === noIterationTypes) {
+                    if (errorNode) {
+                        reportTypeNotIterableError(errorNode, type, !!(use & 2 /* AllowsAsyncIterablesFlag */));
                     }
-                    // As an optimization, if the type is an instantiation of the global `AsyncIterable<T>`
-                    // or the global `AsyncIterableIterator<T>` then just grab its type argument.
-                    if (isReferenceToType(type, getGlobalAsyncIterableType(/*reportErrors*/ false)) ||
-                        isReferenceToType(type, getGlobalAsyncIterableIteratorType(/*reportErrors*/ false))) {
-                        return typeAsIterable.iteratedTypeOfAsyncIterable = type.typeArguments[0];
-                    }
-                }
-                if (allowSyncIterables) {
-                    if (typeAsIterable.iteratedTypeOfIterable) {
-                        return allowAsyncIterables
-                            ? typeAsIterable.iteratedTypeOfAsyncIterable = getAwaitedType(typeAsIterable.iteratedTypeOfIterable)
-                            : typeAsIterable.iteratedTypeOfIterable;
-                    }
-                    // As an optimization, if the type is an instantiation of the global `Iterable<T>` or
-                    // `IterableIterator<T>` then just grab its type argument.
-                    if (isReferenceToType(type, getGlobalIterableType(/*reportErrors*/ false)) ||
-                        isReferenceToType(type, getGlobalIterableIteratorType(/*reportErrors*/ false))) {
-                        return allowAsyncIterables
-                            ? typeAsIterable.iteratedTypeOfAsyncIterable = getAwaitedType(type.typeArguments[0])
-                            : typeAsIterable.iteratedTypeOfIterable = type.typeArguments[0];
-                    }
-                }
-                var asyncMethodType = allowAsyncIterables && getTypeOfPropertyOfType(type, ts.getPropertyNameForKnownSymbolName("asyncIterator"));
-                var methodType = asyncMethodType || (allowSyncIterables ? getTypeOfPropertyOfType(type, ts.getPropertyNameForKnownSymbolName("iterator")) : undefined);
-                if (isTypeAny(methodType)) {
                     return undefined;
                 }
-                var signatures = methodType ? getSignaturesOfType(methodType, 0 /* Call */) : undefined;
-                if (!ts.some(signatures)) {
+                return iterationTypes_1;
+            }
+            var cacheKey = use & 2 /* AllowsAsyncIterablesFlag */ ? "iterationTypesOfAsyncIterable" : "iterationTypesOfIterable";
+            var cachedTypes = type[cacheKey];
+            if (cachedTypes)
+                return cachedTypes === noIterationTypes ? undefined : cachedTypes;
+            var allIterationTypes;
+            for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
+                var constituent = _a[_i];
+                var iterationTypes_2 = getIterationTypesOfIterableWorker(constituent, use, errorNode);
+                if (iterationTypes_2 === noIterationTypes) {
                     if (errorNode) {
-                        // only report on the first error
-                        reportTypeNotIterableError(errorNode, type, allowAsyncIterables);
+                        reportTypeNotIterableError(errorNode, type, !!(use & 2 /* AllowsAsyncIterablesFlag */));
                         errorNode = undefined;
                     }
-                    return undefined;
                 }
-                var returnType = getUnionType(ts.map(signatures, getReturnTypeOfSignature), 2 /* Subtype */);
-                var iteratedType = getIteratedTypeOfIterator(returnType, errorNode, /*isAsyncIterator*/ !!asyncMethodType);
-                if (checkAssignability && errorNode && iteratedType) {
-                    // If `checkAssignability` was specified, we were called from
-                    // `checkIteratedTypeOrElementType`. As such, we need to validate that
-                    // the type passed in is actually an Iterable.
-                    checkTypeAssignableTo(type, asyncMethodType
-                        ? createAsyncIterableType(iteratedType)
-                        : createIterableType(iteratedType), errorNode);
-                }
-                if (iteratedType) {
-                    return allowAsyncIterables
-                        ? typeAsIterable.iteratedTypeOfAsyncIterable = asyncMethodType ? iteratedType : getAwaitedType(iteratedType)
-                        : typeAsIterable.iteratedTypeOfIterable = iteratedType;
+                else {
+                    allIterationTypes = ts.append(allIterationTypes, iterationTypes_2);
                 }
             }
+            var iterationTypes = allIterationTypes ? combineIterationTypes(allIterationTypes) : noIterationTypes;
+            type[cacheKey] = iterationTypes;
+            return iterationTypes === noIterationTypes ? undefined : iterationTypes;
+        }
+        function getAsyncFromSyncIterationTypes(iterationTypes, errorNode) {
+            if (iterationTypes === noIterationTypes)
+                return noIterationTypes;
+            if (iterationTypes === anyIterationTypes)
+                return anyIterationTypes;
+            var yieldType = iterationTypes.yieldType, returnType = iterationTypes.returnType, nextType = iterationTypes.nextType;
+            return createIterationTypes(getAwaitedType(yieldType, errorNode) || anyType, getAwaitedType(returnType, errorNode) || anyType, nextType);
+        }
+        /**
+         * Gets the *yield*, *return*, and *next* types from a non-union type.
+         *
+         * If we are unable to find the *yield*, *return*, and *next* types, `noIterationTypes` is
+         * returned to indicate to the caller that it should report an error. Otherwise, an
+         * `IterationTypes` record is returned.
+         *
+         * NOTE: You probably don't want to call this directly and should be calling
+         * `getIterationTypesOfIterable` instead.
+         */
+        function getIterationTypesOfIterableWorker(type, use, errorNode) {
+            if (isTypeAny(type)) {
+                return anyIterationTypes;
+            }
+            if (use & 2 /* AllowsAsyncIterablesFlag */) {
+                var iterationTypes = getIterationTypesOfIterableCached(type, asyncIterationTypesResolver) ||
+                    getIterationTypesOfIterableFast(type, asyncIterationTypesResolver);
+                if (iterationTypes) {
+                    return iterationTypes;
+                }
+            }
+            if (use & 1 /* AllowsSyncIterablesFlag */) {
+                var iterationTypes = getIterationTypesOfIterableCached(type, syncIterationTypesResolver) ||
+                    getIterationTypesOfIterableFast(type, syncIterationTypesResolver);
+                if (iterationTypes) {
+                    if (use & 2 /* AllowsAsyncIterablesFlag */) {
+                        // for a sync iterable in an async context, only use the cached types if they are valid.
+                        if (iterationTypes !== noIterationTypes) {
+                            return type.iterationTypesOfAsyncIterable = getAsyncFromSyncIterationTypes(iterationTypes, errorNode);
+                        }
+                    }
+                    else {
+                        return iterationTypes;
+                    }
+                }
+            }
+            if (use & 2 /* AllowsAsyncIterablesFlag */) {
+                var iterationTypes = getIterationTypesOfIterableSlow(type, asyncIterationTypesResolver, errorNode);
+                if (iterationTypes !== noIterationTypes) {
+                    return iterationTypes;
+                }
+            }
+            if (use & 1 /* AllowsSyncIterablesFlag */) {
+                var iterationTypes = getIterationTypesOfIterableSlow(type, syncIterationTypesResolver, errorNode);
+                if (iterationTypes !== noIterationTypes) {
+                    if (use & 2 /* AllowsAsyncIterablesFlag */) {
+                        return type.iterationTypesOfAsyncIterable = iterationTypes
+                            ? getAsyncFromSyncIterationTypes(iterationTypes, errorNode)
+                            : noIterationTypes;
+                    }
+                    else {
+                        return iterationTypes;
+                    }
+                }
+            }
+            return noIterationTypes;
+        }
+        /**
+         * Gets the *yield*, *return*, and *next* types of an `Iterable`-like or
+         * `AsyncIterable`-like type from the cache.
+         *
+         * NOTE: You probably don't want to call this directly and should be calling
+         * `getIterationTypesOfIterable` instead.
+         */
+        function getIterationTypesOfIterableCached(type, resolver) {
+            return type[resolver.iterableCacheKey];
+        }
+        function getIterationTypesOfGlobalIterableType(globalType, resolver) {
+            var globalIterationTypes = getIterationTypesOfIterableCached(globalType, resolver) ||
+                getIterationTypesOfIterableSlow(globalType, resolver, /*errorNode*/ undefined);
+            return globalIterationTypes === noIterationTypes ? defaultIterationTypes : globalIterationTypes;
+        }
+        /**
+         * Gets the *yield*, *return*, and *next* types of an `Iterable`-like or `AsyncIterable`-like
+         * type from from common heuristics.
+         *
+         * If we previously analyzed this type and found no iteration types, `noIterationTypes` is
+         * returned. If we found iteration types, an `IterationTypes` record is returned.
+         * Otherwise, we return `undefined` to indicate to the caller it should perform a more
+         * exhaustive analysis.
+         *
+         * NOTE: You probably don't want to call this directly and should be calling
+         * `getIterationTypesOfIterable` instead.
+         */
+        function getIterationTypesOfIterableFast(type, resolver) {
+            // As an optimization, if the type is an instantiation of one of the following global types, then
+            // just grab its related type argument:
+            // - `Iterable<T>` or `AsyncIterable<T>`
+            // - `IterableIterator<T>` or `AsyncIterableIterator<T>`
+            var globalType;
+            if (isReferenceToType(type, globalType = resolver.getGlobalIterableType(/*reportErrors*/ false)) ||
+                isReferenceToType(type, globalType = resolver.getGlobalIterableIteratorType(/*reportErrors*/ false))) {
+                var yieldType = type.typeArguments[0];
+                // The "return" and "next" types of `Iterable` and `IterableIterator` are defined by the
+                // iteration types of their `[Symbol.iterator]()` method. The same is true for their async cousins.
+                // While we define these as `any` and `undefined` in our libs by default, a custom lib *could* use
+                // different definitions.
+                var _a = getIterationTypesOfGlobalIterableType(globalType, resolver), returnType = _a.returnType, nextType = _a.nextType;
+                return type[resolver.iterableCacheKey] = createIterationTypes(yieldType, returnType, nextType);
+            }
+            // As an optimization, if the type is an instantiation of the following global type, then
+            // just grab its related type arguments:
+            // - `Generator<T, TReturn, TNext>` or `AsyncGenerator<T, TReturn, TNext>`
+            if (isReferenceToType(type, resolver.getGlobalGeneratorType(/*reportErrors*/ false))) {
+                var _b = type.typeArguments, yieldType = _b[0], returnType = _b[1], nextType = _b[2];
+                return type[resolver.iterableCacheKey] = createIterationTypes(yieldType, returnType, nextType);
+            }
+        }
+        /**
+         * Gets the *yield*, *return*, and *next* types of an `Iterable`-like or `AsyncIterable`-like
+         * type from its members.
+         *
+         * If we successfully found the *yield*, *return*, and *next* types, an `IterationTypes`
+         * record is returned. Otherwise, `noIterationTypes` is returned.
+         *
+         * NOTE: You probably don't want to call this directly and should be calling
+         * `getIterationTypesOfIterable` instead.
+         */
+        function getIterationTypesOfIterableSlow(type, resolver, errorNode) {
+            var method = getPropertyOfType(type, ts.getPropertyNameForKnownSymbolName(resolver.iteratorSymbolName));
+            var methodType = method && !(method.flags & 16777216 /* Optional */) ? getTypeOfSymbol(method) : undefined;
+            if (isTypeAny(methodType)) {
+                return type[resolver.iterableCacheKey] = anyIterationTypes;
+            }
+            var signatures = methodType ? getSignaturesOfType(methodType, 0 /* Call */) : undefined;
+            if (!ts.some(signatures)) {
+                return type[resolver.iterableCacheKey] = noIterationTypes;
+            }
+            var iteratorType = getUnionType(ts.map(signatures, getReturnTypeOfSignature), 2 /* Subtype */);
+            var iterationTypes = getIterationTypesOfIterator(iteratorType, resolver, errorNode) || noIterationTypes;
+            return type[resolver.iterableCacheKey] = iterationTypes;
         }
         function reportTypeNotIterableError(errorNode, type, allowAsyncIterables) {
-            error(errorNode, allowAsyncIterables
+            var message = allowAsyncIterables
                 ? ts.Diagnostics.Type_0_must_have_a_Symbol_asyncIterator_method_that_returns_an_async_iterator
-                : ts.Diagnostics.Type_0_must_have_a_Symbol_iterator_method_that_returns_an_iterator, typeToString(type));
+                : ts.Diagnostics.Type_0_must_have_a_Symbol_iterator_method_that_returns_an_iterator;
+            errorAndMaybeSuggestAwait(errorNode, !!getAwaitedTypeOfPromise(type), message, typeToString(type));
         }
         /**
-         * This function has very similar logic as getIteratedTypeOfIterable, except that it operates on
-         * Iterators instead of Iterables. Here is the structure:
+         * Gets the *yield*, *return*, and *next* types from an `Iterator`-like or `AsyncIterator`-like type.
          *
-         *  { // iterator
-         *      next: { // nextMethod
-         *          (): { // nextResult
-         *              value: T // nextValue
-         *          }
-         *      }
-         *  }
-         *
-         * For an async iterator, we expect the following structure:
-         *
-         *  { // iterator
-         *      next: { // nextMethod
-         *          (): PromiseLike<{ // nextResult
-         *              value: T // nextValue
-         *          }>
-         *      }
-         *  }
+         * If we successfully found the *yield*, *return*, and *next* types, an `IterationTypes`
+         * record is returned. Otherwise, `undefined` is returned.
          */
-        function getIteratedTypeOfIterator(type, errorNode, isAsyncIterator) {
+        function getIterationTypesOfIterator(type, resolver, errorNode) {
             if (isTypeAny(type)) {
-                return undefined;
+                return anyIterationTypes;
             }
-            var typeAsIterator = type;
-            if (isAsyncIterator ? typeAsIterator.iteratedTypeOfAsyncIterator : typeAsIterator.iteratedTypeOfIterator) {
-                return isAsyncIterator ? typeAsIterator.iteratedTypeOfAsyncIterator : typeAsIterator.iteratedTypeOfIterator;
-            }
-            // As an optimization, if the type is an instantiation of the global `Iterator<T>` (for
-            // a non-async iterator) or the global `AsyncIterator<T>` (for an async-iterator) then
-            // just grab its type argument.
-            var getIteratorType = isAsyncIterator ? getGlobalAsyncIteratorType : getGlobalIteratorType;
-            if (isReferenceToType(type, getIteratorType(/*reportErrors*/ false))) {
-                return isAsyncIterator
-                    ? typeAsIterator.iteratedTypeOfAsyncIterator = type.typeArguments[0]
-                    : typeAsIterator.iteratedTypeOfIterator = type.typeArguments[0];
-            }
-            // Both async and non-async iterators must have a `next` method.
-            var nextMethod = getTypeOfPropertyOfType(type, "next");
-            if (isTypeAny(nextMethod)) {
-                return undefined;
-            }
-            var nextMethodSignatures = nextMethod ? getSignaturesOfType(nextMethod, 0 /* Call */) : ts.emptyArray;
-            if (nextMethodSignatures.length === 0) {
-                if (errorNode) {
-                    error(errorNode, isAsyncIterator
-                        ? ts.Diagnostics.An_async_iterator_must_have_a_next_method
-                        : ts.Diagnostics.An_iterator_must_have_a_next_method);
-                }
-                return undefined;
-            }
-            var nextResult = getUnionType(ts.map(nextMethodSignatures, getReturnTypeOfSignature), 2 /* Subtype */);
-            if (isTypeAny(nextResult)) {
-                return undefined;
-            }
-            // For an async iterator, we must get the awaited type of the return type.
-            if (isAsyncIterator) {
-                nextResult = getAwaitedTypeOfPromise(nextResult, errorNode, ts.Diagnostics.The_type_returned_by_the_next_method_of_an_async_iterator_must_be_a_promise_for_a_type_with_a_value_property);
-                if (isTypeAny(nextResult)) {
-                    return undefined;
-                }
-            }
-            var nextValue = nextResult && getTypeOfPropertyOfType(nextResult, "value");
-            if (!nextValue) {
-                if (errorNode) {
-                    error(errorNode, isAsyncIterator
-                        ? ts.Diagnostics.The_type_returned_by_the_next_method_of_an_async_iterator_must_be_a_promise_for_a_type_with_a_value_property
-                        : ts.Diagnostics.The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property);
-                }
-                return undefined;
-            }
-            return isAsyncIterator
-                ? typeAsIterator.iteratedTypeOfAsyncIterator = nextValue
-                : typeAsIterator.iteratedTypeOfIterator = nextValue;
+            var iterationTypes = getIterationTypesOfIteratorCached(type, resolver) ||
+                getIterationTypesOfIteratorFast(type, resolver) ||
+                getIterationTypesOfIteratorSlow(type, resolver, errorNode);
+            return iterationTypes === noIterationTypes ? undefined : iterationTypes;
         }
         /**
-         * A generator may have a return type of `Iterator<T>`, `Iterable<T>`, or
-         * `IterableIterator<T>`. An async generator may have a return type of `AsyncIterator<T>`,
-         * `AsyncIterable<T>`, or `AsyncIterableIterator<T>`. This function can be used to extract
-         * the iterated type from this return type for contextual typing and verifying signatures.
+         * Gets the iteration types of an `Iterator`-like or `AsyncIterator`-like type from the
+         * cache.
+         *
+         * NOTE: You probably don't want to call this directly and should be calling
+         * `getIterationTypesOfIterator` instead.
          */
-        function getIteratedTypeOfGenerator(returnType, isAsyncGenerator) {
+        function getIterationTypesOfIteratorCached(type, resolver) {
+            return type[resolver.iteratorCacheKey];
+        }
+        /**
+         * Gets the iteration types of an `Iterator`-like or `AsyncIterator`-like type from the
+         * cache or from common heuristics.
+         *
+         * If we previously analyzed this type and found no iteration types, `noIterationTypes` is
+         * returned. If we found iteration types, an `IterationTypes` record is returned.
+         * Otherwise, we return `undefined` to indicate to the caller it should perform a more
+         * exhaustive analysis.
+         *
+         * NOTE: You probably don't want to call this directly and should be calling
+         * `getIterationTypesOfIterator` instead.
+         */
+        function getIterationTypesOfIteratorFast(type, resolver) {
+            // As an optimization, if the type is an instantiation of one of the following global types,
+            // then just grab its related type argument:
+            // - `IterableIterator<T>` or `AsyncIterableIterator<T>`
+            // - `Iterator<T, TReturn, TNext>` or `AsyncIterator<T, TReturn, TNext>`
+            // - `Generator<T, TReturn, TNext>` or `AsyncGenerator<T, TReturn, TNext>`
+            var globalType = resolver.getGlobalIterableIteratorType(/*reportErrors*/ false);
+            if (isReferenceToType(type, globalType)) {
+                var yieldType = type.typeArguments[0];
+                // The "return" and "next" types of `IterableIterator` and `AsyncIterableIterator` are defined by the
+                // iteration types of their `next`, `return`, and `throw` methods. While we define these as `any`
+                // and `undefined` in our libs by default, a custom lib *could* use different definitions.
+                var globalIterationTypes = getIterationTypesOfIteratorCached(globalType, resolver) ||
+                    getIterationTypesOfIteratorSlow(globalType, resolver, /*errorNode*/ undefined);
+                var _a = globalIterationTypes === noIterationTypes ? defaultIterationTypes : globalIterationTypes, returnType = _a.returnType, nextType = _a.nextType;
+                return type[resolver.iteratorCacheKey] = createIterationTypes(yieldType, returnType, nextType);
+            }
+            if (isReferenceToType(type, resolver.getGlobalIteratorType(/*reportErrors*/ false)) ||
+                isReferenceToType(type, resolver.getGlobalGeneratorType(/*reportErrors*/ false))) {
+                var _b = type.typeArguments, yieldType = _b[0], returnType = _b[1], nextType = _b[2];
+                return type[resolver.iteratorCacheKey] = createIterationTypes(yieldType, returnType, nextType);
+            }
+        }
+        function isIteratorResult(type, kind) {
+            // From https://tc39.github.io/ecma262/#sec-iteratorresult-interface:
+            // > [done] is the result status of an iterator `next` method call. If the end of the iterator was reached `done` is `true`.
+            // > If the end was not reached `done` is `false` and a value is available.
+            // > If a `done` property (either own or inherited) does not exist, it is consider to have the value `false`.
+            var doneType = getTypeOfPropertyOfType(type, "done") || falseType;
+            return isTypeAssignableTo(kind === 0 /* Yield */ ? falseType : trueType, doneType);
+        }
+        function isYieldIteratorResult(type) {
+            return isIteratorResult(type, 0 /* Yield */);
+        }
+        function isReturnIteratorResult(type) {
+            return isIteratorResult(type, 1 /* Return */);
+        }
+        /**
+         * Gets the *yield* and *return* types of an `IteratorResult`-like type.
+         *
+         * If we are unable to determine a *yield* or a *return* type, `noIterationTypes` is
+         * returned to indicate to the caller that it should handle the error. Otherwise, an
+         * `IterationTypes` record is returned.
+         */
+        function getIterationTypesOfIteratorResult(type) {
+            if (isTypeAny(type)) {
+                return anyIterationTypes;
+            }
+            var cachedTypes = type.iterationTypesOfIteratorResult;
+            if (cachedTypes) {
+                return cachedTypes;
+            }
+            // As an optimization, if the type is an instantiation of one of the global `IteratorYieldResult<T>`
+            // or `IteratorReturnResult<TReturn>` types, then just grab its type argument.
+            if (isReferenceToType(type, getGlobalIteratorYieldResultType(/*reportErrors*/ false))) {
+                var yieldType_1 = type.typeArguments[0];
+                return type.iterationTypesOfIteratorResult = createIterationTypes(yieldType_1, /*returnType*/ undefined, /*nextType*/ undefined);
+            }
+            if (isReferenceToType(type, getGlobalIteratorReturnResultType(/*reportErrors*/ false))) {
+                var returnType_1 = type.typeArguments[0];
+                return type.iterationTypesOfIteratorResult = createIterationTypes(/*yieldType*/ undefined, returnType_1, /*nextType*/ undefined);
+            }
+            // Choose any constituents that can produce the requested iteration type.
+            var yieldIteratorResult = filterType(type, isYieldIteratorResult);
+            var yieldType = yieldIteratorResult !== neverType ? getTypeOfPropertyOfType(yieldIteratorResult, "value") : undefined;
+            var returnIteratorResult = filterType(type, isReturnIteratorResult);
+            var returnType = returnIteratorResult !== neverType ? getTypeOfPropertyOfType(returnIteratorResult, "value") : undefined;
+            if (!yieldType && !returnType) {
+                return type.iterationTypesOfIteratorResult = noIterationTypes;
+            }
+            // From https://tc39.github.io/ecma262/#sec-iteratorresult-interface
+            // > ... If the iterator does not have a return value, `value` is `undefined`. In that case, the
+            // > `value` property may be absent from the conforming object if it does not inherit an explicit
+            // > `value` property.
+            return type.iterationTypesOfIteratorResult = createIterationTypes(yieldType, returnType || voidType, /*nextType*/ undefined);
+        }
+        /**
+         * Gets the *yield*, *return*, and *next* types of a the `next()`, `return()`, or
+         * `throw()` method of an `Iterator`-like or `AsyncIterator`-like type.
+         *
+         * If we successfully found the *yield*, *return*, and *next* types, an `IterationTypes`
+         * record is returned. Otherwise, we return `undefined`.
+         */
+        function getIterationTypesOfMethod(type, resolver, methodName, errorNode) {
+            var method = getPropertyOfType(type, methodName);
+            // Ignore 'return' or 'throw' if they are missing.
+            if (!method && methodName !== "next") {
+                return undefined;
+            }
+            var methodType = method && !(methodName === "next" && (method.flags & 16777216 /* Optional */))
+                ? methodName === "next" ? getTypeOfSymbol(method) : getTypeWithFacts(getTypeOfSymbol(method), 2097152 /* NEUndefinedOrNull */)
+                : undefined;
+            if (isTypeAny(methodType)) {
+                // `return()` and `throw()` don't provide a *next* type.
+                return methodName === "next" ? anyIterationTypes : anyIterationTypesExceptNext;
+            }
+            // Both async and non-async iterators *must* have a `next` method.
+            var methodSignatures = methodType ? getSignaturesOfType(methodType, 0 /* Call */) : ts.emptyArray;
+            if (methodSignatures.length === 0) {
+                if (errorNode) {
+                    var diagnostic = methodName === "next"
+                        ? resolver.mustHaveANextMethodDiagnostic
+                        : resolver.mustBeAMethodDiagnostic;
+                    error(errorNode, diagnostic, methodName);
+                }
+                return methodName === "next" ? anyIterationTypes : undefined;
+            }
+            // Extract the first parameter and return type of each signature.
+            var methodParameterTypes;
+            var methodReturnTypes;
+            for (var _i = 0, methodSignatures_1 = methodSignatures; _i < methodSignatures_1.length; _i++) {
+                var signature = methodSignatures_1[_i];
+                if (methodName !== "throw" && ts.some(signature.parameters)) {
+                    methodParameterTypes = ts.append(methodParameterTypes, getTypeAtPosition(signature, 0));
+                }
+                methodReturnTypes = ts.append(methodReturnTypes, getReturnTypeOfSignature(signature));
+            }
+            // Resolve the *next* or *return* type from the first parameter of a `next()` or
+            // `return()` method, respectively.
+            var returnTypes;
+            var nextType;
+            if (methodName !== "throw") {
+                var methodParameterType = methodParameterTypes ? getUnionType(methodParameterTypes) : unknownType;
+                var resolvedMethodParameterType = resolver.resolveIterationType(methodParameterType, errorNode) || anyType;
+                if (methodName === "next") {
+                    nextType = resolvedMethodParameterType;
+                }
+                else if (methodName === "return") {
+                    returnTypes = ts.append(returnTypes, resolvedMethodParameterType);
+                }
+            }
+            // Resolve the *yield* and *return* types from the return type of the method (i.e. `IteratorResult`)
+            var yieldType;
+            var methodReturnType = methodReturnTypes ? getUnionType(methodReturnTypes, 2 /* Subtype */) : neverType;
+            var resolvedMethodReturnType = resolver.resolveIterationType(methodReturnType, errorNode) || anyType;
+            var iterationTypes = getIterationTypesOfIteratorResult(resolvedMethodReturnType);
+            if (iterationTypes === noIterationTypes) {
+                if (errorNode) {
+                    error(errorNode, resolver.mustHaveAValueDiagnostic, methodName);
+                }
+                yieldType = anyType;
+                returnTypes = ts.append(returnTypes, anyType);
+            }
+            else {
+                yieldType = iterationTypes.yieldType;
+                returnTypes = ts.append(returnTypes, iterationTypes.returnType);
+            }
+            return createIterationTypes(yieldType, getUnionType(returnTypes), nextType);
+        }
+        /**
+         * Gets the *yield*, *return*, and *next* types of an `Iterator`-like or `AsyncIterator`-like
+         * type from its members.
+         *
+         * If we successfully found the *yield*, *return*, and *next* types, an `IterationTypes`
+         * record is returned. Otherwise, `noIterationTypes` is returned.
+         *
+         * NOTE: You probably don't want to call this directly and should be calling
+         * `getIterationTypesOfIterator` instead.
+         */
+        function getIterationTypesOfIteratorSlow(type, resolver, errorNode) {
+            var iterationTypes = combineIterationTypes([
+                getIterationTypesOfMethod(type, resolver, "next", errorNode),
+                getIterationTypesOfMethod(type, resolver, "return", errorNode),
+                getIterationTypesOfMethod(type, resolver, "throw", errorNode),
+            ]);
+            return type[resolver.iteratorCacheKey] = iterationTypes;
+        }
+        /**
+         * Gets the requested "iteration type" from a type that is either `Iterable`-like, `Iterator`-like,
+         * `IterableIterator`-like, or `Generator`-like (for a non-async generator); or `AsyncIterable`-like,
+         * `AsyncIterator`-like, `AsyncIterableIterator`-like, or `AsyncGenerator`-like (for an async generator).
+         */
+        function getIterationTypeOfGeneratorFunctionReturnType(kind, returnType, isAsyncGenerator) {
             if (isTypeAny(returnType)) {
                 return undefined;
             }
-            return getIteratedTypeOfIterable(returnType, /*errorNode*/ undefined, /*allowAsyncIterables*/ isAsyncGenerator, /*allowSyncIterables*/ !isAsyncGenerator, /*checkAssignability*/ false)
-                || getIteratedTypeOfIterator(returnType, /*errorNode*/ undefined, isAsyncGenerator);
+            var iterationTypes = getIterationTypesOfGeneratorFunctionReturnType(returnType, isAsyncGenerator);
+            return iterationTypes && iterationTypes[getIterationTypesKeyFromIterationTypeKind(kind)];
+        }
+        function getIterationTypesOfGeneratorFunctionReturnType(type, isAsyncGenerator) {
+            if (isTypeAny(type)) {
+                return anyIterationTypes;
+            }
+            var use = isAsyncGenerator ? 2 /* AsyncGeneratorReturnType */ : 1 /* GeneratorReturnType */;
+            var resolver = isAsyncGenerator ? asyncIterationTypesResolver : syncIterationTypesResolver;
+            return getIterationTypesOfIterable(type, use, /*errorNode*/ undefined) ||
+                getIterationTypesOfIterator(type, resolver, /*errorNode*/ undefined);
         }
         function checkBreakOrContinueStatement(node) {
             // Grammar checking
@@ -55737,10 +57805,15 @@ var ts;
                 checkGrammarBreakOrContinueStatement(node);
             // TODO: Check that target label is valid
         }
+        function unwrapReturnType(returnType, functionFlags) {
+            var isGenerator = !!(functionFlags & 1 /* Generator */);
+            var isAsync = !!(functionFlags & 2 /* Async */);
+            return isGenerator ? getIterationTypeOfGeneratorFunctionReturnType(1 /* Return */, returnType, isAsync) || errorType :
+                isAsync ? getPromisedTypeOfPromise(returnType) || errorType :
+                    returnType;
+        }
         function isUnwrappedReturnTypeVoidOrAny(func, returnType) {
-            var unwrappedReturnType = (ts.getFunctionFlags(func) & 3 /* AsyncGenerator */) === 2 /* Async */
-                ? getPromisedTypeOfPromise(returnType) // Async function
-                : returnType; // AsyncGenerator function, Generator function, or normal function
+            var unwrappedReturnType = unwrapReturnType(returnType, ts.getFunctionFlags(func));
             return !!unwrappedReturnType && maybeTypeOfKind(unwrappedReturnType, 16384 /* Void */ | 3 /* AnyOrUnknown */);
         }
         function checkReturnStatement(node) {
@@ -55756,43 +57829,32 @@ var ts;
             var signature = getSignatureFromDeclaration(func);
             var returnType = getReturnTypeOfSignature(signature);
             var functionFlags = ts.getFunctionFlags(func);
-            var isGenerator = functionFlags & 1 /* Generator */;
             if (strictNullChecks || node.expression || returnType.flags & 131072 /* Never */) {
                 var exprType = node.expression ? checkExpressionCached(node.expression) : undefinedType;
-                if (isGenerator) { // AsyncGenerator function or Generator function
-                    // A generator does not need its return expressions checked against its return type.
-                    // Instead, the yield expressions are checked against the element type.
-                    // TODO: Check return types of generators when return type tracking is added
-                    // for generators.
-                    return;
-                }
-                else if (func.kind === 159 /* SetAccessor */) {
+                if (func.kind === 160 /* SetAccessor */) {
                     if (node.expression) {
                         error(node, ts.Diagnostics.Setters_cannot_return_a_value);
                     }
                 }
-                else if (func.kind === 157 /* Constructor */) {
+                else if (func.kind === 158 /* Constructor */) {
                     if (node.expression && !checkTypeAssignableToAndOptionallyElaborate(exprType, returnType, node, node.expression)) {
                         error(node, ts.Diagnostics.Return_type_of_constructor_signature_must_be_assignable_to_the_instance_type_of_the_class);
                     }
                 }
                 else if (getReturnTypeFromAnnotation(func)) {
-                    if (functionFlags & 2 /* Async */) { // Async function
-                        var promisedType = getPromisedTypeOfPromise(returnType);
-                        var awaitedType = checkAwaitedType(exprType, node, ts.Diagnostics.The_return_type_of_an_async_function_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member);
-                        if (promisedType) {
-                            // If the function has a return type, but promisedType is
-                            // undefined, an error will be reported in checkAsyncFunctionReturnType
-                            // so we don't need to report one here.
-                            checkTypeAssignableTo(awaitedType, promisedType, node);
-                        }
-                    }
-                    else {
-                        checkTypeAssignableToAndOptionallyElaborate(exprType, returnType, node, node.expression);
+                    var unwrappedReturnType = unwrapReturnType(returnType, functionFlags);
+                    var unwrappedExprType = functionFlags & 2 /* Async */
+                        ? checkAwaitedType(exprType, node, ts.Diagnostics.The_return_type_of_an_async_function_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member)
+                        : exprType;
+                    if (unwrappedReturnType) {
+                        // If the function has a return type, but promisedType is
+                        // undefined, an error will be reported in checkAsyncFunctionReturnType
+                        // so we don't need to report one here.
+                        checkTypeAssignableToAndOptionallyElaborate(unwrappedExprType, unwrappedReturnType, node, node.expression);
                     }
                 }
             }
-            else if (func.kind !== 157 /* Constructor */ && compilerOptions.noImplicitReturns && !isUnwrappedReturnTypeVoidOrAny(func, returnType) && !isGenerator) {
+            else if (func.kind !== 158 /* Constructor */ && compilerOptions.noImplicitReturns && !isUnwrappedReturnTypeVoidOrAny(func, returnType)) {
                 // The function has a return type, but the return statement doesn't have an expression.
                 error(node, ts.Diagnostics.Not_all_code_paths_return_a_value);
             }
@@ -55821,7 +57883,7 @@ var ts;
             var expressionIsLiteral = isLiteralType(expressionType);
             ts.forEach(node.caseBlock.clauses, function (clause) {
                 // Grammar check for duplicate default clauses, skip if we already report duplicate default clause
-                if (clause.kind === 272 /* DefaultClause */ && !hasDuplicateDefaultClause) {
+                if (clause.kind === 273 /* DefaultClause */ && !hasDuplicateDefaultClause) {
                     if (firstDefaultClause === undefined) {
                         firstDefaultClause = clause;
                     }
@@ -55833,7 +57895,7 @@ var ts;
                         hasDuplicateDefaultClause = true;
                     }
                 }
-                if (produceDiagnostics && clause.kind === 271 /* CaseClause */) {
+                if (produceDiagnostics && clause.kind === 272 /* CaseClause */) {
                     // TypeScript 1.0 spec (April 2014): 5.9
                     // In a 'switch' statement, each 'case' expression must be of a type that is comparable
                     // to or from the type of the 'switch' expression.
@@ -55862,7 +57924,7 @@ var ts;
                     if (ts.isFunctionLike(current)) {
                         return "quit";
                     }
-                    if (current.kind === 233 /* LabeledStatement */ && current.label.escapedText === node.label.escapedText) {
+                    if (current.kind === 234 /* LabeledStatement */ && current.label.escapedText === node.label.escapedText) {
                         grammarErrorOnNode(node.label, ts.Diagnostics.Duplicate_label_0, ts.getTextOfNode(node.label));
                         return true;
                     }
@@ -55969,8 +58031,8 @@ var ts;
                 // this allows us to rule out cases when both property and indexer are inherited from the base class
                 var errorNode;
                 if (propDeclaration && name &&
-                    (propDeclaration.kind === 204 /* BinaryExpression */ ||
-                        name.kind === 149 /* ComputedPropertyName */ ||
+                    (propDeclaration.kind === 205 /* BinaryExpression */ ||
+                        name.kind === 150 /* ComputedPropertyName */ ||
                         prop.parent === containingType.symbol)) {
                     errorNode = propDeclaration;
                 }
@@ -56047,7 +58109,7 @@ var ts;
         function checkTypeParametersNotReferenced(root, typeParameters, index) {
             visit(root);
             function visit(node) {
-                if (node.kind === 164 /* TypeReference */) {
+                if (node.kind === 165 /* TypeReference */) {
                     var type = getTypeFromTypeReference(node);
                     if (type.flags & 262144 /* TypeParameter */) {
                         for (var i = index; i < typeParameters.length; i++) {
@@ -56169,6 +58231,11 @@ var ts;
                 if (languageVersion < 2 /* ES2015 */) {
                     checkExternalEmitHelpers(baseTypeNode.parent, 1 /* Extends */);
                 }
+                // check both @extends and extends if both are specified.
+                var extendsNode = ts.getClassExtendsHeritageElement(node);
+                if (extendsNode && extendsNode !== baseTypeNode) {
+                    checkExpression(extendsNode.expression);
+                }
                 var baseTypes = getBaseTypes(type);
                 if (baseTypes.length && produceDiagnostics) {
                     var baseType_1 = baseTypes[0];
@@ -56176,10 +58243,6 @@ var ts;
                     var staticBaseType = getApparentType(baseConstructorType);
                     checkBaseTypeAccessibility(staticBaseType, baseTypeNode);
                     checkSourceElement(baseTypeNode.expression);
-                    var extendsNode = ts.getClassExtendsHeritageElement(node);
-                    if (extendsNode && extendsNode !== baseTypeNode) {
-                        checkExpression(extendsNode.expression);
-                    }
                     if (ts.some(baseTypeNode.typeArguments)) {
                         ts.forEach(baseTypeNode.typeArguments, checkSourceElement);
                         for (var _i = 0, _a = getConstructorsForTypeArguments(staticBaseType, baseTypeNode.typeArguments, baseTypeNode); _i < _a.length; _i++) {
@@ -56250,7 +58313,7 @@ var ts;
         function issueMemberSpecificError(node, typeWithThis, baseWithThis, broadDiag) {
             // iterate over all implemented properties and issue errors on each one which isn't compatible, rather than the class as a whole, if possible
             var issuedMemberError = false;
-            var _loop_9 = function (member) {
+            var _loop_14 = function (member) {
                 if (ts.hasStaticModifier(member)) {
                     return "continue";
                 }
@@ -56269,7 +58332,7 @@ var ts;
             };
             for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                 var member = _a[_i];
-                _loop_9(member);
+                _loop_14(member);
             }
             if (!issuedMemberError) {
                 // check again with diagnostics to generate a less-specific error
@@ -56295,7 +58358,7 @@ var ts;
         }
         function getClassOrInterfaceDeclarationsOfSymbol(symbol) {
             return ts.filter(symbol.declarations, function (d) {
-                return d.kind === 240 /* ClassDeclaration */ || d.kind === 241 /* InterfaceDeclaration */;
+                return d.kind === 241 /* ClassDeclaration */ || d.kind === 242 /* InterfaceDeclaration */;
             });
         }
         function checkKindsOfPropertyMemberOverrides(type, baseType) {
@@ -56334,7 +58397,7 @@ var ts;
                         // If there is no declaration for the derived class (as in the case of class expressions),
                         // then the class cannot be declared abstract.
                         if (baseDeclarationFlags & 128 /* Abstract */ && (!derivedClassDecl || !ts.hasModifier(derivedClassDecl, 128 /* Abstract */))) {
-                            if (derivedClassDecl.kind === 209 /* ClassExpression */) {
+                            if (derivedClassDecl.kind === 210 /* ClassExpression */) {
                                 error(derivedClassDecl, ts.Diagnostics.Non_abstract_class_expression_does_not_implement_inherited_abstract_member_0_from_class_1, symbolToString(baseProperty), typeToString(baseType));
                             }
                             else {
@@ -56384,8 +58447,8 @@ var ts;
             for (var _i = 0, baseTypes_2 = baseTypes; _i < baseTypes_2.length; _i++) {
                 var base = baseTypes_2[_i];
                 var properties = getPropertiesOfType(getTypeWithThisArgument(base, type.thisType));
-                for (var _a = 0, properties_7 = properties; _a < properties_7.length; _a++) {
-                    var prop = properties_7[_a];
+                for (var _a = 0, properties_4 = properties; _a < properties_4.length; _a++) {
+                    var prop = properties_4[_a];
                     var existing = seen.get(prop.escapedName);
                     if (!existing) {
                         seen.set(prop.escapedName, { prop: prop, containingType: base });
@@ -56426,7 +58489,7 @@ var ts;
             }
         }
         function isInstancePropertyWithoutInitializer(node) {
-            return node.kind === 154 /* PropertyDeclaration */ &&
+            return node.kind === 155 /* PropertyDeclaration */ &&
                 !ts.hasModifier(node, 32 /* Static */ | 128 /* Abstract */) &&
                 !node.exclamationToken &&
                 !node.initializer;
@@ -56450,7 +58513,7 @@ var ts;
                 var symbol = getSymbolOfNode(node);
                 checkTypeParameterListsIdentical(symbol);
                 // Only check this symbol once
-                var firstInterfaceDecl = ts.getDeclarationOfKind(symbol, 241 /* InterfaceDeclaration */);
+                var firstInterfaceDecl = ts.getDeclarationOfKind(symbol, 242 /* InterfaceDeclaration */);
                 if (node === firstInterfaceDecl) {
                     var type = getDeclaredTypeOfSymbol(symbol);
                     var typeWithThis = getTypeWithThisArgument(type);
@@ -56511,9 +58574,9 @@ var ts;
             if (member.initializer) {
                 return computeConstantValue(member);
             }
-            // In ambient enum declarations that specify no const modifier, enum member declarations that omit
-            // a value are considered computed members (as opposed to having auto-incremented values).
-            if (member.parent.flags & 4194304 /* Ambient */ && !ts.isEnumConst(member.parent)) {
+            // In ambient non-const numeric enum declarations, enum members without initializers are
+            // considered computed members (as opposed to having auto-incremented values).
+            if (member.parent.flags & 4194304 /* Ambient */ && !ts.isEnumConst(member.parent) && getEnumKind(getSymbolOfNode(member.parent)) === 0 /* Numeric */) {
                 return undefined;
             }
             // If the member declaration specifies no value, the member is considered a constant enum member.
@@ -56555,7 +58618,7 @@ var ts;
             return value;
             function evaluate(expr) {
                 switch (expr.kind) {
-                    case 202 /* PrefixUnaryExpression */:
+                    case 203 /* PrefixUnaryExpression */:
                         var value_2 = evaluate(expr.operand);
                         if (typeof value_2 === "number") {
                             switch (expr.operator) {
@@ -56565,7 +58628,7 @@ var ts;
                             }
                         }
                         break;
-                    case 204 /* BinaryExpression */:
+                    case 205 /* BinaryExpression */:
                         var left = evaluate(expr.left);
                         var right = evaluate(expr.right);
                         if (typeof left === "number" && typeof right === "number") {
@@ -56593,22 +58656,22 @@ var ts;
                     case 8 /* NumericLiteral */:
                         checkGrammarNumericLiteral(expr);
                         return +expr.text;
-                    case 195 /* ParenthesizedExpression */:
+                    case 196 /* ParenthesizedExpression */:
                         return evaluate(expr.expression);
-                    case 72 /* Identifier */:
+                    case 73 /* Identifier */:
                         var identifier = expr;
                         if (isInfinityOrNaNString(identifier.escapedText)) {
                             return +(identifier.escapedText);
                         }
                         return ts.nodeIsMissing(expr) ? 0 : evaluateEnumMember(expr, getSymbolOfNode(member.parent), identifier.escapedText);
-                    case 190 /* ElementAccessExpression */:
-                    case 189 /* PropertyAccessExpression */:
+                    case 191 /* ElementAccessExpression */:
+                    case 190 /* PropertyAccessExpression */:
                         var ex = expr;
                         if (isConstantMemberAccess(ex)) {
                             var type = getTypeOfExpression(ex.expression);
                             if (type.symbol && type.symbol.flags & 384 /* Enum */) {
                                 var name = void 0;
-                                if (ex.kind === 189 /* PropertyAccessExpression */) {
+                                if (ex.kind === 190 /* PropertyAccessExpression */) {
                                     name = ex.name.escapedText;
                                 }
                                 else {
@@ -56639,9 +58702,9 @@ var ts;
             }
         }
         function isConstantMemberAccess(node) {
-            return node.kind === 72 /* Identifier */ ||
-                node.kind === 189 /* PropertyAccessExpression */ && isConstantMemberAccess(node.expression) ||
-                node.kind === 190 /* ElementAccessExpression */ && isConstantMemberAccess(node.expression) &&
+            return node.kind === 73 /* Identifier */ ||
+                node.kind === 190 /* PropertyAccessExpression */ && isConstantMemberAccess(node.expression) ||
+                node.kind === 191 /* ElementAccessExpression */ && isConstantMemberAccess(node.expression) &&
                     node.argumentExpression.kind === 10 /* StringLiteral */;
         }
         function checkEnumDeclaration(node) {
@@ -56676,7 +58739,7 @@ var ts;
                 var seenEnumMissingInitialInitializer_1 = false;
                 ts.forEach(enumSymbol.declarations, function (declaration) {
                     // return true if we hit a violation of the rule, false otherwise
-                    if (declaration.kind !== 243 /* EnumDeclaration */) {
+                    if (declaration.kind !== 244 /* EnumDeclaration */) {
                         return false;
                     }
                     var enumDeclaration = declaration;
@@ -56699,8 +58762,8 @@ var ts;
             var declarations = symbol.declarations;
             for (var _i = 0, declarations_8 = declarations; _i < declarations_8.length; _i++) {
                 var declaration = declarations_8[_i];
-                if ((declaration.kind === 240 /* ClassDeclaration */ ||
-                    (declaration.kind === 239 /* FunctionDeclaration */ && ts.nodeIsPresent(declaration.body))) &&
+                if ((declaration.kind === 241 /* ClassDeclaration */ ||
+                    (declaration.kind === 240 /* FunctionDeclaration */ && ts.nodeIsPresent(declaration.body))) &&
                     !(declaration.flags & 4194304 /* Ambient */)) {
                     return declaration;
                 }
@@ -56749,8 +58812,8 @@ var ts;
                 var symbol = getSymbolOfNode(node);
                 // The following checks only apply on a non-ambient instantiated module declaration.
                 if (symbol.flags & 512 /* ValueModule */
-                    && symbol.declarations.length > 1
                     && !inAmbientContext
+                    && symbol.declarations.length > 1
                     && isInstantiatedModule(node, !!compilerOptions.preserveConstEnums || !!compilerOptions.isolatedModules)) {
                     var firstNonAmbientClassOrFunc = getFirstNonAmbientClassOrFunctionDeclaration(symbol);
                     if (firstNonAmbientClassOrFunc) {
@@ -56763,7 +58826,7 @@ var ts;
                     }
                     // if the module merges with a class declaration in the same lexical scope,
                     // we need to track this to ensure the correct emit.
-                    var mergedClass = ts.getDeclarationOfKind(symbol, 240 /* ClassDeclaration */);
+                    var mergedClass = ts.getDeclarationOfKind(symbol, 241 /* ClassDeclaration */);
                     if (mergedClass &&
                         inSameLexicalScope(node, mergedClass)) {
                         getNodeLinks(node).flags |= 32768 /* LexicalModuleMergesWithClass */;
@@ -56813,23 +58876,23 @@ var ts;
         }
         function checkModuleAugmentationElement(node, isGlobalAugmentation) {
             switch (node.kind) {
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     // error each individual name in variable statement instead of marking the entire variable statement
                     for (var _i = 0, _a = node.declarationList.declarations; _i < _a.length; _i++) {
                         var decl = _a[_i];
                         checkModuleAugmentationElement(decl, isGlobalAugmentation);
                     }
                     break;
-                case 254 /* ExportAssignment */:
-                case 255 /* ExportDeclaration */:
+                case 255 /* ExportAssignment */:
+                case 256 /* ExportDeclaration */:
                     grammarErrorOnFirstToken(node, ts.Diagnostics.Exports_and_export_assignments_are_not_permitted_in_module_augmentations);
                     break;
-                case 248 /* ImportEqualsDeclaration */:
-                case 249 /* ImportDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
+                case 250 /* ImportDeclaration */:
                     grammarErrorOnFirstToken(node, ts.Diagnostics.Imports_are_not_permitted_in_module_augmentations_Consider_moving_them_to_the_enclosing_external_module);
                     break;
-                case 186 /* BindingElement */:
-                case 237 /* VariableDeclaration */:
+                case 187 /* BindingElement */:
+                case 238 /* VariableDeclaration */:
                     var name = node.name;
                     if (ts.isBindingPattern(name)) {
                         for (var _b = 0, _c = name.elements; _b < _c.length; _b++) {
@@ -56840,12 +58903,12 @@ var ts;
                         break;
                     }
                 // falls through
-                case 240 /* ClassDeclaration */:
-                case 243 /* EnumDeclaration */:
-                case 239 /* FunctionDeclaration */:
-                case 241 /* InterfaceDeclaration */:
-                case 244 /* ModuleDeclaration */:
-                case 242 /* TypeAliasDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 240 /* FunctionDeclaration */:
+                case 242 /* InterfaceDeclaration */:
+                case 245 /* ModuleDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
                     if (isGlobalAugmentation) {
                         return;
                     }
@@ -56866,17 +58929,17 @@ var ts;
         }
         function getFirstIdentifier(node) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return node;
-                case 148 /* QualifiedName */:
+                case 149 /* QualifiedName */:
                     do {
                         node = node.left;
-                    } while (node.kind !== 72 /* Identifier */);
+                    } while (node.kind !== 73 /* Identifier */);
                     return node;
-                case 189 /* PropertyAccessExpression */:
+                case 190 /* PropertyAccessExpression */:
                     do {
                         node = node.expression;
-                    } while (node.kind !== 72 /* Identifier */);
+                    } while (node.kind !== 73 /* Identifier */);
                     return node;
             }
         }
@@ -56890,9 +58953,9 @@ var ts;
                 error(moduleName, ts.Diagnostics.String_literal_expected);
                 return false;
             }
-            var inAmbientExternalModule = node.parent.kind === 245 /* ModuleBlock */ && ts.isAmbientModule(node.parent.parent);
-            if (node.parent.kind !== 284 /* SourceFile */ && !inAmbientExternalModule) {
-                error(moduleName, node.kind === 255 /* ExportDeclaration */ ?
+            var inAmbientExternalModule = node.parent.kind === 246 /* ModuleBlock */ && ts.isAmbientModule(node.parent.parent);
+            if (node.parent.kind !== 285 /* SourceFile */ && !inAmbientExternalModule) {
+                error(moduleName, node.kind === 256 /* ExportDeclaration */ ?
                     ts.Diagnostics.Export_declarations_are_not_permitted_in_a_namespace :
                     ts.Diagnostics.Import_declarations_in_a_namespace_cannot_reference_a_module);
                 return false;
@@ -56925,14 +58988,14 @@ var ts;
                     (symbol.flags & 67897832 /* Type */ ? 67897832 /* Type */ : 0) |
                     (symbol.flags & 1920 /* Namespace */ ? 1920 /* Namespace */ : 0);
                 if (target.flags & excludedMeanings) {
-                    var message = node.kind === 257 /* ExportSpecifier */ ?
+                    var message = node.kind === 258 /* ExportSpecifier */ ?
                         ts.Diagnostics.Export_declaration_conflicts_with_exported_declaration_of_0 :
                         ts.Diagnostics.Import_declaration_conflicts_with_local_declaration_of_0;
                     error(node, message, symbolToString(symbol));
                 }
                 // Don't allow to re-export something with no value side when `--isolatedModules` is set.
                 if (compilerOptions.isolatedModules
-                    && node.kind === 257 /* ExportSpecifier */
+                    && node.kind === 258 /* ExportSpecifier */
                     && !(target.flags & 67220415 /* Value */)
                     && !(node.flags & 4194304 /* Ambient */)) {
                     error(node, ts.Diagnostics.Cannot_re_export_a_type_when_the_isolatedModules_flag_is_provided);
@@ -56959,7 +59022,7 @@ var ts;
                         checkImportBinding(importClause);
                     }
                     if (importClause.namedBindings) {
-                        if (importClause.namedBindings.kind === 251 /* NamespaceImport */) {
+                        if (importClause.namedBindings.kind === 252 /* NamespaceImport */) {
                             checkImportBinding(importClause.namedBindings);
                         }
                         else {
@@ -56983,7 +59046,7 @@ var ts;
                 if (ts.hasModifier(node, 1 /* Export */)) {
                     markExportAsReferenced(node);
                 }
-                if (node.moduleReference.kind !== 259 /* ExternalModuleReference */) {
+                if (node.moduleReference.kind !== 260 /* ExternalModuleReference */) {
                     var target = resolveAlias(getSymbolOfNode(node));
                     if (target !== unknownSymbol) {
                         if (target.flags & 67220415 /* Value */) {
@@ -57019,10 +59082,10 @@ var ts;
                     // export { x, y }
                     // export { x, y } from "foo"
                     ts.forEach(node.exportClause.elements, checkExportSpecifier);
-                    var inAmbientExternalModule = node.parent.kind === 245 /* ModuleBlock */ && ts.isAmbientModule(node.parent.parent);
-                    var inAmbientNamespaceDeclaration = !inAmbientExternalModule && node.parent.kind === 245 /* ModuleBlock */ &&
+                    var inAmbientExternalModule = node.parent.kind === 246 /* ModuleBlock */ && ts.isAmbientModule(node.parent.parent);
+                    var inAmbientNamespaceDeclaration = !inAmbientExternalModule && node.parent.kind === 246 /* ModuleBlock */ &&
                         !node.moduleSpecifier && node.flags & 4194304 /* Ambient */;
-                    if (node.parent.kind !== 284 /* SourceFile */ && !inAmbientExternalModule && !inAmbientNamespaceDeclaration) {
+                    if (node.parent.kind !== 285 /* SourceFile */ && !inAmbientExternalModule && !inAmbientNamespaceDeclaration) {
                         error(node, ts.Diagnostics.Export_declarations_are_not_permitted_in_a_namespace);
                     }
                 }
@@ -57033,13 +59096,13 @@ var ts;
                         error(node.moduleSpecifier, ts.Diagnostics.Module_0_uses_export_and_cannot_be_used_with_export_Asterisk, symbolToString(moduleSymbol));
                     }
                     if (moduleKind !== ts.ModuleKind.System && moduleKind !== ts.ModuleKind.ES2015 && moduleKind !== ts.ModuleKind.ESNext) {
-                        checkExternalEmitHelpers(node, 32768 /* ExportStar */);
+                        checkExternalEmitHelpers(node, 65536 /* ExportStar */);
                     }
                 }
             }
         }
         function checkGrammarModuleElementContext(node, errorMessage) {
-            var isInAppropriateContext = node.parent.kind === 284 /* SourceFile */ || node.parent.kind === 245 /* ModuleBlock */ || node.parent.kind === 244 /* ModuleDeclaration */;
+            var isInAppropriateContext = node.parent.kind === 285 /* SourceFile */ || node.parent.kind === 246 /* ModuleBlock */ || node.parent.kind === 245 /* ModuleDeclaration */;
             if (!isInAppropriateContext) {
                 grammarErrorOnFirstToken(node, errorMessage);
             }
@@ -57068,8 +59131,8 @@ var ts;
                 // If we hit an export assignment in an illegal context, just bail out to avoid cascading errors.
                 return;
             }
-            var container = node.parent.kind === 284 /* SourceFile */ ? node.parent : node.parent.parent;
-            if (container.kind === 244 /* ModuleDeclaration */ && !ts.isAmbientModule(container)) {
+            var container = node.parent.kind === 285 /* SourceFile */ ? node.parent : node.parent.parent;
+            if (container.kind === 245 /* ModuleDeclaration */ && !ts.isAmbientModule(container)) {
                 if (node.isExportEquals) {
                     error(node, ts.Diagnostics.An_export_assignment_cannot_be_used_in_a_namespace);
                 }
@@ -57082,7 +59145,7 @@ var ts;
             if (!checkGrammarDecoratorsAndModifiers(node) && ts.hasModifiers(node)) {
                 grammarErrorOnFirstToken(node, ts.Diagnostics.An_export_assignment_cannot_have_modifiers);
             }
-            if (node.expression.kind === 72 /* Identifier */) {
+            if (node.expression.kind === 73 /* Identifier */) {
                 markExportAsReferenced(node);
                 if (ts.getEmitDeclarations(compilerOptions)) {
                     collectLinkedAliases(node.expression, /*setVisibility*/ true);
@@ -57157,13 +59220,14 @@ var ts;
             return !ts.isAccessor(declaration);
         }
         function isNotOverload(declaration) {
-            return (declaration.kind !== 239 /* FunctionDeclaration */ && declaration.kind !== 156 /* MethodDeclaration */) ||
+            return (declaration.kind !== 240 /* FunctionDeclaration */ && declaration.kind !== 157 /* MethodDeclaration */) ||
                 !!declaration.body;
         }
         function checkSourceElement(node) {
             if (node) {
                 var saveCurrentNode = currentNode;
                 currentNode = node;
+                instantiationCount = 0;
                 checkSourceElementWorker(node);
                 currentNode = saveCurrentNode;
             }
@@ -57180,158 +59244,158 @@ var ts;
                 // Only bother checking on a few construct kinds.  We don't want to be excessively
                 // hitting the cancellation token on every node we check.
                 switch (kind) {
-                    case 244 /* ModuleDeclaration */:
-                    case 240 /* ClassDeclaration */:
-                    case 241 /* InterfaceDeclaration */:
-                    case 239 /* FunctionDeclaration */:
+                    case 245 /* ModuleDeclaration */:
+                    case 241 /* ClassDeclaration */:
+                    case 242 /* InterfaceDeclaration */:
+                    case 240 /* FunctionDeclaration */:
                         cancellationToken.throwIfCancellationRequested();
                 }
             }
             switch (kind) {
-                case 150 /* TypeParameter */:
+                case 151 /* TypeParameter */:
                     return checkTypeParameter(node);
-                case 151 /* Parameter */:
+                case 152 /* Parameter */:
                     return checkParameter(node);
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
                     return checkPropertyDeclaration(node);
-                case 165 /* FunctionType */:
-                case 166 /* ConstructorType */:
-                case 160 /* CallSignature */:
-                case 161 /* ConstructSignature */:
-                case 162 /* IndexSignature */:
+                case 166 /* FunctionType */:
+                case 167 /* ConstructorType */:
+                case 161 /* CallSignature */:
+                case 162 /* ConstructSignature */:
+                case 163 /* IndexSignature */:
                     return checkSignatureDeclaration(node);
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
                     return checkMethodDeclaration(node);
-                case 157 /* Constructor */:
+                case 158 /* Constructor */:
                     return checkConstructorDeclaration(node);
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     return checkAccessorDeclaration(node);
-                case 164 /* TypeReference */:
+                case 165 /* TypeReference */:
                     return checkTypeReferenceNode(node);
-                case 163 /* TypePredicate */:
+                case 164 /* TypePredicate */:
                     return checkTypePredicate(node);
-                case 167 /* TypeQuery */:
+                case 168 /* TypeQuery */:
                     return checkTypeQuery(node);
-                case 168 /* TypeLiteral */:
+                case 169 /* TypeLiteral */:
                     return checkTypeLiteral(node);
-                case 169 /* ArrayType */:
+                case 170 /* ArrayType */:
                     return checkArrayType(node);
-                case 170 /* TupleType */:
+                case 171 /* TupleType */:
                     return checkTupleType(node);
-                case 173 /* UnionType */:
-                case 174 /* IntersectionType */:
+                case 174 /* UnionType */:
+                case 175 /* IntersectionType */:
                     return checkUnionOrIntersectionType(node);
-                case 177 /* ParenthesizedType */:
-                case 171 /* OptionalType */:
-                case 172 /* RestType */:
+                case 178 /* ParenthesizedType */:
+                case 172 /* OptionalType */:
+                case 173 /* RestType */:
                     return checkSourceElement(node.type);
-                case 178 /* ThisType */:
+                case 179 /* ThisType */:
                     return checkThisType(node);
-                case 179 /* TypeOperator */:
+                case 180 /* TypeOperator */:
                     return checkTypeOperator(node);
-                case 175 /* ConditionalType */:
+                case 176 /* ConditionalType */:
                     return checkConditionalType(node);
-                case 176 /* InferType */:
+                case 177 /* InferType */:
                     return checkInferType(node);
-                case 183 /* ImportType */:
+                case 184 /* ImportType */:
                     return checkImportType(node);
-                case 300 /* JSDocAugmentsTag */:
+                case 301 /* JSDocAugmentsTag */:
                     return checkJSDocAugmentsTag(node);
-                case 309 /* JSDocTypedefTag */:
-                case 302 /* JSDocCallbackTag */:
+                case 311 /* JSDocTypedefTag */:
+                case 304 /* JSDocCallbackTag */:
                     return checkJSDocTypeAliasTag(node);
-                case 308 /* JSDocTemplateTag */:
+                case 310 /* JSDocTemplateTag */:
                     return checkJSDocTemplateTag(node);
-                case 307 /* JSDocTypeTag */:
+                case 309 /* JSDocTypeTag */:
                     return checkJSDocTypeTag(node);
-                case 304 /* JSDocParameterTag */:
+                case 306 /* JSDocParameterTag */:
                     return checkJSDocParameterTag(node);
-                case 294 /* JSDocFunctionType */:
+                case 295 /* JSDocFunctionType */:
                     checkJSDocFunctionType(node);
                 // falls through
-                case 292 /* JSDocNonNullableType */:
-                case 291 /* JSDocNullableType */:
-                case 289 /* JSDocAllType */:
-                case 290 /* JSDocUnknownType */:
-                case 297 /* JSDocTypeLiteral */:
+                case 293 /* JSDocNonNullableType */:
+                case 292 /* JSDocNullableType */:
+                case 290 /* JSDocAllType */:
+                case 291 /* JSDocUnknownType */:
+                case 298 /* JSDocTypeLiteral */:
                     checkJSDocTypeIsInJsFile(node);
                     ts.forEachChild(node, checkSourceElement);
                     return;
-                case 295 /* JSDocVariadicType */:
+                case 296 /* JSDocVariadicType */:
                     checkJSDocVariadicType(node);
                     return;
-                case 288 /* JSDocTypeExpression */:
+                case 289 /* JSDocTypeExpression */:
                     return checkSourceElement(node.type);
-                case 180 /* IndexedAccessType */:
+                case 181 /* IndexedAccessType */:
                     return checkIndexedAccessType(node);
-                case 181 /* MappedType */:
+                case 182 /* MappedType */:
                     return checkMappedType(node);
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     return checkFunctionDeclaration(node);
-                case 218 /* Block */:
-                case 245 /* ModuleBlock */:
+                case 219 /* Block */:
+                case 246 /* ModuleBlock */:
                     return checkBlock(node);
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     return checkVariableStatement(node);
-                case 221 /* ExpressionStatement */:
+                case 222 /* ExpressionStatement */:
                     return checkExpressionStatement(node);
-                case 222 /* IfStatement */:
+                case 223 /* IfStatement */:
                     return checkIfStatement(node);
-                case 223 /* DoStatement */:
+                case 224 /* DoStatement */:
                     return checkDoStatement(node);
-                case 224 /* WhileStatement */:
+                case 225 /* WhileStatement */:
                     return checkWhileStatement(node);
-                case 225 /* ForStatement */:
+                case 226 /* ForStatement */:
                     return checkForStatement(node);
-                case 226 /* ForInStatement */:
+                case 227 /* ForInStatement */:
                     return checkForInStatement(node);
-                case 227 /* ForOfStatement */:
+                case 228 /* ForOfStatement */:
                     return checkForOfStatement(node);
-                case 228 /* ContinueStatement */:
-                case 229 /* BreakStatement */:
+                case 229 /* ContinueStatement */:
+                case 230 /* BreakStatement */:
                     return checkBreakOrContinueStatement(node);
-                case 230 /* ReturnStatement */:
+                case 231 /* ReturnStatement */:
                     return checkReturnStatement(node);
-                case 231 /* WithStatement */:
+                case 232 /* WithStatement */:
                     return checkWithStatement(node);
-                case 232 /* SwitchStatement */:
+                case 233 /* SwitchStatement */:
                     return checkSwitchStatement(node);
-                case 233 /* LabeledStatement */:
+                case 234 /* LabeledStatement */:
                     return checkLabeledStatement(node);
-                case 234 /* ThrowStatement */:
+                case 235 /* ThrowStatement */:
                     return checkThrowStatement(node);
-                case 235 /* TryStatement */:
+                case 236 /* TryStatement */:
                     return checkTryStatement(node);
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     return checkVariableDeclaration(node);
-                case 186 /* BindingElement */:
+                case 187 /* BindingElement */:
                     return checkBindingElement(node);
-                case 240 /* ClassDeclaration */:
+                case 241 /* ClassDeclaration */:
                     return checkClassDeclaration(node);
-                case 241 /* InterfaceDeclaration */:
+                case 242 /* InterfaceDeclaration */:
                     return checkInterfaceDeclaration(node);
-                case 242 /* TypeAliasDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
                     return checkTypeAliasDeclaration(node);
-                case 243 /* EnumDeclaration */:
+                case 244 /* EnumDeclaration */:
                     return checkEnumDeclaration(node);
-                case 244 /* ModuleDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     return checkModuleDeclaration(node);
-                case 249 /* ImportDeclaration */:
+                case 250 /* ImportDeclaration */:
                     return checkImportDeclaration(node);
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return checkImportEqualsDeclaration(node);
-                case 255 /* ExportDeclaration */:
+                case 256 /* ExportDeclaration */:
                     return checkExportDeclaration(node);
-                case 254 /* ExportAssignment */:
+                case 255 /* ExportAssignment */:
                     return checkExportAssignment(node);
-                case 220 /* EmptyStatement */:
-                case 236 /* DebuggerStatement */:
+                case 221 /* EmptyStatement */:
+                case 237 /* DebuggerStatement */:
                     checkGrammarStatementInAmbientContext(node);
                     return;
-                case 258 /* MissingDeclaration */:
+                case 259 /* MissingDeclaration */:
                     return checkMissingDeclaration(node);
             }
         }
@@ -57424,24 +59488,25 @@ var ts;
         function checkDeferredNode(node) {
             var saveCurrentNode = currentNode;
             currentNode = node;
+            instantiationCount = 0;
             switch (node.kind) {
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
                     checkFunctionExpressionOrObjectLiteralMethodDeferred(node);
                     break;
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     checkAccessorDeclaration(node);
                     break;
-                case 209 /* ClassExpression */:
+                case 210 /* ClassExpression */:
                     checkClassExpressionDeferred(node);
                     break;
-                case 261 /* JsxSelfClosingElement */:
+                case 262 /* JsxSelfClosingElement */:
                     checkJsxSelfClosingElementDeferred(node);
                     break;
-                case 260 /* JsxElement */:
+                case 261 /* JsxElement */:
                     checkJsxElementDeferred(node);
                     break;
             }
@@ -57571,17 +59636,17 @@ var ts;
                         copySymbols(location.locals, meaning);
                     }
                     switch (location.kind) {
-                        case 284 /* SourceFile */:
+                        case 285 /* SourceFile */:
                             if (!ts.isExternalOrCommonJsModule(location))
                                 break;
                         // falls through
-                        case 244 /* ModuleDeclaration */:
+                        case 245 /* ModuleDeclaration */:
                             copySymbols(getSymbolOfNode(location).exports, meaning & 2623475 /* ModuleMember */);
                             break;
-                        case 243 /* EnumDeclaration */:
+                        case 244 /* EnumDeclaration */:
                             copySymbols(getSymbolOfNode(location).exports, meaning & 8 /* EnumMember */);
                             break;
-                        case 209 /* ClassExpression */:
+                        case 210 /* ClassExpression */:
                             var className = location.name;
                             if (className) {
                                 copySymbol(location.symbol, meaning);
@@ -57589,8 +59654,8 @@ var ts;
                         // falls through
                         // this fall-through is necessary because we would like to handle
                         // type parameter inside class expression similar to how we handle it in classDeclaration and interface Declaration
-                        case 240 /* ClassDeclaration */:
-                        case 241 /* InterfaceDeclaration */:
+                        case 241 /* ClassDeclaration */:
+                        case 242 /* InterfaceDeclaration */:
                             // If we didn't come from static member of class or interface,
                             // add the type parameters into the symbol table
                             // (type parameters of classDeclaration/classExpression and interface are in member property of the symbol.
@@ -57599,7 +59664,7 @@ var ts;
                                 copySymbols(getMembersOfSymbol(getSymbolOfNode(location)), meaning & 67897832 /* Type */);
                             }
                             break;
-                        case 196 /* FunctionExpression */:
+                        case 197 /* FunctionExpression */:
                             var funcName = location.name;
                             if (funcName) {
                                 copySymbol(location.symbol, meaning);
@@ -57641,17 +59706,17 @@ var ts;
             }
         }
         function isTypeDeclarationName(name) {
-            return name.kind === 72 /* Identifier */ &&
+            return name.kind === 73 /* Identifier */ &&
                 isTypeDeclaration(name.parent) &&
                 name.parent.name === name;
         }
         function isTypeDeclaration(node) {
             switch (node.kind) {
-                case 150 /* TypeParameter */:
-                case 240 /* ClassDeclaration */:
-                case 241 /* InterfaceDeclaration */:
-                case 242 /* TypeAliasDeclaration */:
-                case 243 /* EnumDeclaration */:
+                case 151 /* TypeParameter */:
+                case 241 /* ClassDeclaration */:
+                case 242 /* InterfaceDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
+                case 244 /* EnumDeclaration */:
                     return true;
                 default:
                     return false;
@@ -57659,16 +59724,16 @@ var ts;
         }
         // True if the given identifier is part of a type reference
         function isTypeReferenceIdentifier(node) {
-            while (node.parent.kind === 148 /* QualifiedName */) {
+            while (node.parent.kind === 149 /* QualifiedName */) {
                 node = node.parent;
             }
-            return node.parent.kind === 164 /* TypeReference */;
+            return node.parent.kind === 165 /* TypeReference */;
         }
         function isHeritageClauseElementIdentifier(node) {
-            while (node.parent.kind === 189 /* PropertyAccessExpression */) {
+            while (node.parent.kind === 190 /* PropertyAccessExpression */) {
                 node = node.parent;
             }
-            return node.parent.kind === 211 /* ExpressionWithTypeArguments */;
+            return node.parent.kind === 212 /* ExpressionWithTypeArguments */;
         }
         function forEachEnclosingClass(node, callback) {
             var result;
@@ -57696,13 +59761,13 @@ var ts;
             return !!forEachEnclosingClass(node, function (n) { return n === classDeclaration; });
         }
         function getLeftSideOfImportEqualsOrExportAssignment(nodeOnRightSide) {
-            while (nodeOnRightSide.parent.kind === 148 /* QualifiedName */) {
+            while (nodeOnRightSide.parent.kind === 149 /* QualifiedName */) {
                 nodeOnRightSide = nodeOnRightSide.parent;
             }
-            if (nodeOnRightSide.parent.kind === 248 /* ImportEqualsDeclaration */) {
+            if (nodeOnRightSide.parent.kind === 249 /* ImportEqualsDeclaration */) {
                 return nodeOnRightSide.parent.moduleReference === nodeOnRightSide ? nodeOnRightSide.parent : undefined;
             }
-            if (nodeOnRightSide.parent.kind === 254 /* ExportAssignment */) {
+            if (nodeOnRightSide.parent.kind === 255 /* ExportAssignment */) {
                 return nodeOnRightSide.parent.expression === nodeOnRightSide ? nodeOnRightSide.parent : undefined;
             }
             return undefined;
@@ -57728,7 +59793,7 @@ var ts;
                 node = parent;
                 parent = parent.parent;
             }
-            if (parent && parent.kind === 183 /* ImportType */ && parent.qualifier === node) {
+            if (parent && parent.kind === 184 /* ImportType */ && parent.qualifier === node) {
                 return parent;
             }
             return undefined;
@@ -57738,7 +59803,7 @@ var ts;
                 return getSymbolOfNode(entityName.parent);
             }
             if (ts.isInJSFile(entityName) &&
-                entityName.parent.kind === 189 /* PropertyAccessExpression */ &&
+                entityName.parent.kind === 190 /* PropertyAccessExpression */ &&
                 entityName.parent === entityName.parent.parent.left) {
                 // Check if this is a special property assignment
                 var specialPropertyAssignmentSymbol = getSpecialPropertyAssignmentSymbolFromEntityName(entityName);
@@ -57746,7 +59811,7 @@ var ts;
                     return specialPropertyAssignmentSymbol;
                 }
             }
-            if (entityName.parent.kind === 254 /* ExportAssignment */ && ts.isEntityNameExpression(entityName)) {
+            if (entityName.parent.kind === 255 /* ExportAssignment */ && ts.isEntityNameExpression(entityName)) {
                 // Even an entity name expression that doesn't resolve as an entityname may still typecheck as a property access expression
                 var success = resolveEntityName(entityName, 
                 /*all meanings*/ 67220415 /* Value */ | 67897832 /* Type */ | 1920 /* Namespace */ | 2097152 /* Alias */, /*ignoreErrors*/ true);
@@ -57756,7 +59821,7 @@ var ts;
             }
             else if (!ts.isPropertyAccessExpression(entityName) && isInRightSideOfImportOrExportAssignment(entityName)) {
                 // Since we already checked for ExportAssignment, this really could only be an Import
-                var importEqualsDeclaration = ts.getAncestor(entityName, 248 /* ImportEqualsDeclaration */);
+                var importEqualsDeclaration = ts.getAncestor(entityName, 249 /* ImportEqualsDeclaration */);
                 ts.Debug.assert(importEqualsDeclaration !== undefined);
                 return getSymbolOfPartOfRightHandSideOfImportEquals(entityName, /*dontResolveAlias*/ true);
             }
@@ -57774,7 +59839,7 @@ var ts;
             if (isHeritageClauseElementIdentifier(entityName)) {
                 var meaning = 0 /* None */;
                 // In an interface or class, we're definitely interested in a type.
-                if (entityName.parent.kind === 211 /* ExpressionWithTypeArguments */) {
+                if (entityName.parent.kind === 212 /* ExpressionWithTypeArguments */) {
                     meaning = 67897832 /* Type */;
                     // In a class 'extends' clause we are also looking for a value.
                     if (ts.isExpressionWithTypeArgumentsInClassExtendsClause(entityName.parent)) {
@@ -57790,10 +59855,10 @@ var ts;
                     return entityNameSymbol;
                 }
             }
-            if (entityName.parent.kind === 304 /* JSDocParameterTag */) {
+            if (entityName.parent.kind === 306 /* JSDocParameterTag */) {
                 return ts.getParameterSymbolFromJSDoc(entityName.parent);
             }
-            if (entityName.parent.kind === 150 /* TypeParameter */ && entityName.parent.parent.kind === 308 /* JSDocTemplateTag */) {
+            if (entityName.parent.kind === 151 /* TypeParameter */ && entityName.parent.parent.kind === 310 /* JSDocTemplateTag */) {
                 ts.Debug.assert(!ts.isInJSFile(entityName)); // Otherwise `isDeclarationName` would have been true.
                 var typeParameter = ts.getTypeParameterFromJsDoc(entityName.parent);
                 return typeParameter && typeParameter.symbol;
@@ -57803,19 +59868,19 @@ var ts;
                     // Missing entity name.
                     return undefined;
                 }
-                if (entityName.kind === 72 /* Identifier */) {
+                if (entityName.kind === 73 /* Identifier */) {
                     if (ts.isJSXTagName(entityName) && isJsxIntrinsicIdentifier(entityName)) {
                         var symbol = getIntrinsicTagSymbol(entityName.parent);
                         return symbol === unknownSymbol ? undefined : symbol;
                     }
                     return resolveEntityName(entityName, 67220415 /* Value */, /*ignoreErrors*/ false, /*dontResolveAlias*/ true);
                 }
-                else if (entityName.kind === 189 /* PropertyAccessExpression */ || entityName.kind === 148 /* QualifiedName */) {
+                else if (entityName.kind === 190 /* PropertyAccessExpression */ || entityName.kind === 149 /* QualifiedName */) {
                     var links = getNodeLinks(entityName);
                     if (links.resolvedSymbol) {
                         return links.resolvedSymbol;
                     }
-                    if (entityName.kind === 189 /* PropertyAccessExpression */) {
+                    if (entityName.kind === 190 /* PropertyAccessExpression */) {
                         checkPropertyAccessExpression(entityName);
                     }
                     else {
@@ -57825,17 +59890,17 @@ var ts;
                 }
             }
             else if (isTypeReferenceIdentifier(entityName)) {
-                var meaning = entityName.parent.kind === 164 /* TypeReference */ ? 67897832 /* Type */ : 1920 /* Namespace */;
+                var meaning = entityName.parent.kind === 165 /* TypeReference */ ? 67897832 /* Type */ : 1920 /* Namespace */;
                 return resolveEntityName(entityName, meaning, /*ignoreErrors*/ false, /*dontResolveAlias*/ true);
             }
-            if (entityName.parent.kind === 163 /* TypePredicate */) {
+            if (entityName.parent.kind === 164 /* TypePredicate */) {
                 return resolveEntityName(entityName, /*meaning*/ 1 /* FunctionScopedVariable */);
             }
             // Do we want to return undefined here?
             return undefined;
         }
         function getSymbolAtLocation(node) {
-            if (node.kind === 284 /* SourceFile */) {
+            if (node.kind === 285 /* SourceFile */) {
                 return ts.isExternalModule(node) ? getMergedSymbol(node.symbol) : undefined;
             }
             var parent = node.parent;
@@ -57854,12 +59919,12 @@ var ts;
             else if (ts.isLiteralComputedPropertyDeclarationName(node)) {
                 return getSymbolOfNode(parent.parent);
             }
-            if (node.kind === 72 /* Identifier */) {
+            if (node.kind === 73 /* Identifier */) {
                 if (isInRightSideOfImportOrExportAssignment(node)) {
                     return getSymbolOfEntityNameOrPropertyAccessExpression(node);
                 }
-                else if (parent.kind === 186 /* BindingElement */ &&
-                    grandParent.kind === 184 /* ObjectBindingPattern */ &&
+                else if (parent.kind === 187 /* BindingElement */ &&
+                    grandParent.kind === 185 /* ObjectBindingPattern */ &&
                     node === parent.propertyName) {
                     var typeOfPattern = getTypeOfNode(grandParent);
                     var propertyDeclaration = getPropertyOfType(typeOfPattern, node.escapedText);
@@ -57869,11 +59934,11 @@ var ts;
                 }
             }
             switch (node.kind) {
-                case 72 /* Identifier */:
-                case 189 /* PropertyAccessExpression */:
-                case 148 /* QualifiedName */:
+                case 73 /* Identifier */:
+                case 190 /* PropertyAccessExpression */:
+                case 149 /* QualifiedName */:
                     return getSymbolOfEntityNameOrPropertyAccessExpression(node);
-                case 100 /* ThisKeyword */:
+                case 101 /* ThisKeyword */:
                     var container = ts.getThisContainer(node, /*includeArrowFunctions*/ false);
                     if (ts.isFunctionLike(container)) {
                         var sig = getSignatureFromDeclaration(container);
@@ -57885,14 +59950,14 @@ var ts;
                         return checkExpression(node).symbol;
                     }
                 // falls through
-                case 178 /* ThisType */:
+                case 179 /* ThisType */:
                     return getTypeFromThisTypeNode(node).symbol;
-                case 98 /* SuperKeyword */:
+                case 99 /* SuperKeyword */:
                     return checkExpression(node).symbol;
-                case 124 /* ConstructorKeyword */:
+                case 125 /* ConstructorKeyword */:
                     // constructor keyword for an overload, should take us to the definition if it exist
                     var constructorDeclaration = node.parent;
-                    if (constructorDeclaration && constructorDeclaration.kind === 157 /* Constructor */) {
+                    if (constructorDeclaration && constructorDeclaration.kind === 158 /* Constructor */) {
                         return constructorDeclaration.parent.symbol;
                     }
                     return undefined;
@@ -57903,7 +59968,7 @@ var ts;
                     // 3). Dynamic import call or require in javascript
                     // 4). type A = import("./f/*gotToDefinitionHere*/oo")
                     if ((ts.isExternalModuleImportEqualsDeclaration(node.parent.parent) && ts.getExternalModuleImportEqualsDeclarationExpression(node.parent.parent) === node) ||
-                        ((node.parent.kind === 249 /* ImportDeclaration */ || node.parent.kind === 255 /* ExportDeclaration */) && node.parent.moduleSpecifier === node) ||
+                        ((node.parent.kind === 250 /* ImportDeclaration */ || node.parent.kind === 256 /* ExportDeclaration */) && node.parent.moduleSpecifier === node) ||
                         ((ts.isInJSFile(node) && ts.isRequireCall(node.parent, /*checkArgumentIsStringLiteralLike*/ false)) || ts.isImportCall(node.parent)) ||
                         (ts.isLiteralTypeNode(node.parent) && ts.isLiteralImportTypeNode(node.parent.parent) && node.parent.parent.argument === node.parent)) {
                         return resolveExternalModuleName(node, node);
@@ -57920,21 +59985,21 @@ var ts;
                             ? getTypeFromTypeNode(grandParent.objectType)
                             : undefined;
                     return objectType && getPropertyOfType(objectType, ts.escapeLeadingUnderscores(node.text));
-                case 80 /* DefaultKeyword */:
-                case 90 /* FunctionKeyword */:
+                case 81 /* DefaultKeyword */:
+                case 91 /* FunctionKeyword */:
                 case 37 /* EqualsGreaterThanToken */:
-                case 76 /* ClassKeyword */:
+                case 77 /* ClassKeyword */:
                     return getSymbolOfNode(node.parent);
-                case 183 /* ImportType */:
+                case 184 /* ImportType */:
                     return ts.isLiteralImportTypeNode(node) ? getSymbolAtLocation(node.argument.literal) : undefined;
-                case 85 /* ExportKeyword */:
+                case 86 /* ExportKeyword */:
                     return ts.isExportAssignment(node.parent) ? ts.Debug.assertDefined(node.parent.symbol) : undefined;
                 default:
                     return undefined;
             }
         }
         function getShorthandAssignmentValueSymbol(location) {
-            if (location && location.kind === 276 /* ShorthandPropertyAssignment */) {
+            if (location && location.kind === 277 /* ShorthandPropertyAssignment */) {
                 return resolveEntityName(location.name, 67220415 /* Value */ | 2097152 /* Alias */);
             }
             return undefined;
@@ -58001,33 +60066,35 @@ var ts;
         //     }
         // [ a ] from
         //     [a] = [ some array ...]
-        function getTypeOfArrayLiteralOrObjectLiteralDestructuringAssignment(expr) {
-            ts.Debug.assert(expr.kind === 188 /* ObjectLiteralExpression */ || expr.kind === 187 /* ArrayLiteralExpression */);
+        function getTypeOfAssignmentPattern(expr) {
+            ts.Debug.assert(expr.kind === 189 /* ObjectLiteralExpression */ || expr.kind === 188 /* ArrayLiteralExpression */);
             // If this is from "for of"
             //     for ( { a } of elems) {
             //     }
-            if (expr.parent.kind === 227 /* ForOfStatement */) {
+            if (expr.parent.kind === 228 /* ForOfStatement */) {
                 var iteratedType = checkRightHandSideOfForOf(expr.parent.expression, expr.parent.awaitModifier);
                 return checkDestructuringAssignment(expr, iteratedType || errorType);
             }
             // If this is from "for" initializer
             //     for ({a } = elems[0];.....) { }
-            if (expr.parent.kind === 204 /* BinaryExpression */) {
+            if (expr.parent.kind === 205 /* BinaryExpression */) {
                 var iteratedType = getTypeOfExpression(expr.parent.right);
                 return checkDestructuringAssignment(expr, iteratedType || errorType);
             }
             // If this is from nested object binding pattern
             //     for ({ skills: { primary, secondary } } = multiRobot, i = 0; i < 1; i++) {
-            if (expr.parent.kind === 275 /* PropertyAssignment */) {
-                var typeOfParentObjectLiteral = getTypeOfArrayLiteralOrObjectLiteralDestructuringAssignment(expr.parent.parent);
-                return checkObjectLiteralDestructuringPropertyAssignment(typeOfParentObjectLiteral || errorType, expr.parent); // TODO: GH#18217
+            if (expr.parent.kind === 276 /* PropertyAssignment */) {
+                var node_3 = ts.cast(expr.parent.parent, ts.isObjectLiteralExpression);
+                var typeOfParentObjectLiteral = getTypeOfAssignmentPattern(node_3) || errorType;
+                var propertyIndex = ts.indexOfNode(node_3.properties, expr.parent);
+                return checkObjectLiteralDestructuringPropertyAssignment(node_3, typeOfParentObjectLiteral, propertyIndex);
             }
             // Array literal assignment - array destructuring pattern
-            ts.Debug.assert(expr.parent.kind === 187 /* ArrayLiteralExpression */);
+            var node = ts.cast(expr.parent, ts.isArrayLiteralExpression);
             //    [{ property1: p1, property2 }] = elems;
-            var typeOfArrayLiteral = getTypeOfArrayLiteralOrObjectLiteralDestructuringAssignment(expr.parent);
-            var elementType = checkIteratedTypeOrElementType(typeOfArrayLiteral || errorType, expr.parent, /*allowStringInput*/ false, /*allowAsyncIterables*/ false) || errorType;
-            return checkArrayLiteralDestructuringElementAssignment(expr.parent, typeOfArrayLiteral, expr.parent.elements.indexOf(expr), elementType || errorType); // TODO: GH#18217
+            var typeOfArrayLiteral = getTypeOfAssignmentPattern(node) || errorType;
+            var elementType = checkIteratedTypeOrElementType(65 /* Destructuring */, typeOfArrayLiteral, undefinedType, expr.parent) || errorType;
+            return checkArrayLiteralDestructuringElementAssignment(node, typeOfArrayLiteral, node.elements.indexOf(expr), elementType);
         }
         // Gets the property symbol corresponding to the property in destructuring assignment
         // 'property1' from
@@ -58037,7 +60104,7 @@ var ts;
         //     [a] = [ property1, property2 ]
         function getPropertySymbolOfDestructuringAssignment(location) {
             // Get the type of the object or array literal and then look for property of given name in the type
-            var typeOfObjectLiteral = getTypeOfArrayLiteralOrObjectLiteralDestructuringAssignment(location.parent.parent);
+            var typeOfObjectLiteral = getTypeOfAssignmentPattern(ts.cast(location.parent.parent, ts.isAssignmentPattern));
             return typeOfObjectLiteral && getPropertyOfType(typeOfObjectLiteral, location.escapedText);
         }
         function getRegularTypeOfExpression(expr) {
@@ -58059,12 +60126,12 @@ var ts;
         function getClassElementPropertyKeyType(element) {
             var name = element.name;
             switch (name.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return getLiteralType(ts.idText(name));
                 case 8 /* NumericLiteral */:
                 case 10 /* StringLiteral */:
                     return getLiteralType(name.text);
-                case 149 /* ComputedPropertyName */:
+                case 150 /* ComputedPropertyName */:
                     var nameType = checkComputedPropertyName(name);
                     return isTypeAssignableToKind(nameType, 12288 /* ESSymbolLike */) ? nameType : stringType;
                 default:
@@ -58121,7 +60188,7 @@ var ts;
             if (!ts.isGeneratedIdentifier(nodeIn)) {
                 var node = ts.getParseTreeNode(nodeIn, ts.isIdentifier);
                 if (node) {
-                    var isPropertyName_1 = node.parent.kind === 189 /* PropertyAccessExpression */ && node.parent.name === node;
+                    var isPropertyName_1 = node.parent.kind === 190 /* PropertyAccessExpression */ && node.parent.name === node;
                     return !isPropertyName_1 && getReferencedValueSymbol(node) === argumentsSymbol;
                 }
             }
@@ -58177,7 +60244,7 @@ var ts;
                     }
                     var parentSymbol_1 = getParentOfSymbol(symbol);
                     if (parentSymbol_1) {
-                        if (parentSymbol_1.flags & 512 /* ValueModule */ && parentSymbol_1.valueDeclaration.kind === 284 /* SourceFile */) {
+                        if (parentSymbol_1.flags & 512 /* ValueModule */ && parentSymbol_1.valueDeclaration.kind === 285 /* SourceFile */) {
                             var symbolFile = parentSymbol_1.valueDeclaration;
                             var referenceFile = ts.getSourceFileOfNode(node);
                             // If `node` accesses an export and that export isn't in the same file, then symbol is a namespace export, so return undefined.
@@ -58203,12 +60270,16 @@ var ts;
             }
             return undefined;
         }
+        function isSymbolOfDestructuredElementOfCatchBinding(symbol) {
+            return ts.isBindingElement(symbol.valueDeclaration)
+                && ts.walkUpBindingElementsAndPatterns(symbol.valueDeclaration).parent.kind === 275 /* CatchClause */;
+        }
         function isSymbolOfDeclarationWithCollidingName(symbol) {
-            if (symbol.flags & 418 /* BlockScoped */) {
+            if (symbol.flags & 418 /* BlockScoped */ && !ts.isSourceFile(symbol.valueDeclaration)) {
                 var links = getSymbolLinks(symbol);
                 if (links.isDeclarationWithCollidingName === undefined) {
                     var container = ts.getEnclosingBlockScopeContainer(symbol.valueDeclaration);
-                    if (ts.isStatementWithLocals(container)) {
+                    if (ts.isStatementWithLocals(container) || isSymbolOfDestructuredElementOfCatchBinding(symbol)) {
                         var nodeLinks_1 = getNodeLinks(symbol.valueDeclaration);
                         if (resolveName(container.parent, symbol.escapedName, 67220415 /* Value */, /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined, /*isUse*/ false)) {
                             // redeclaration - always should be renamed
@@ -58232,7 +60303,7 @@ var ts;
                             //       they will not collide with anything
                             var isDeclaredInLoop = nodeLinks_1.flags & 524288 /* BlockScopedBindingInLoop */;
                             var inLoopInitializer = ts.isIterationStatement(container, /*lookInLabeledStatements*/ false);
-                            var inLoopBodyBlock = container.kind === 218 /* Block */ && ts.isIterationStatement(container.parent, /*lookInLabeledStatements*/ false);
+                            var inLoopBodyBlock = container.kind === 219 /* Block */ && ts.isIterationStatement(container.parent, /*lookInLabeledStatements*/ false);
                             links.isDeclarationWithCollidingName = !ts.isBlockScopedContainerTopLevel(container) && (!isDeclaredInLoop || (!inLoopInitializer && !inLoopBodyBlock));
                         }
                         else {
@@ -58273,18 +60344,18 @@ var ts;
         }
         function isValueAliasDeclaration(node) {
             switch (node.kind) {
-                case 248 /* ImportEqualsDeclaration */:
-                case 250 /* ImportClause */:
-                case 251 /* NamespaceImport */:
-                case 253 /* ImportSpecifier */:
-                case 257 /* ExportSpecifier */:
+                case 249 /* ImportEqualsDeclaration */:
+                case 251 /* ImportClause */:
+                case 252 /* NamespaceImport */:
+                case 254 /* ImportSpecifier */:
+                case 258 /* ExportSpecifier */:
                     return isAliasResolvedToValue(getSymbolOfNode(node) || unknownSymbol);
-                case 255 /* ExportDeclaration */:
+                case 256 /* ExportDeclaration */:
                     var exportClause = node.exportClause;
                     return !!exportClause && ts.some(exportClause.elements, isValueAliasDeclaration);
-                case 254 /* ExportAssignment */:
+                case 255 /* ExportAssignment */:
                     return node.expression
-                        && node.expression.kind === 72 /* Identifier */
+                        && node.expression.kind === 73 /* Identifier */
                         ? isAliasResolvedToValue(getSymbolOfNode(node) || unknownSymbol)
                         : true;
             }
@@ -58292,7 +60363,7 @@ var ts;
         }
         function isTopLevelValueImportEqualsWithEntityName(nodeIn) {
             var node = ts.getParseTreeNode(nodeIn, ts.isImportEqualsDeclaration);
-            if (node === undefined || node.parent.kind !== 284 /* SourceFile */ || !ts.isInternalModuleImportEqualsDeclaration(node)) {
+            if (node === undefined || node.parent.kind !== 285 /* SourceFile */ || !ts.isInternalModuleImportEqualsDeclaration(node)) {
                 // parent is not source file or it is not reference to internal module
                 return false;
             }
@@ -58393,15 +60464,15 @@ var ts;
         }
         function canHaveConstantValue(node) {
             switch (node.kind) {
-                case 278 /* EnumMember */:
-                case 189 /* PropertyAccessExpression */:
-                case 190 /* ElementAccessExpression */:
+                case 279 /* EnumMember */:
+                case 190 /* PropertyAccessExpression */:
+                case 191 /* ElementAccessExpression */:
                     return true;
             }
             return false;
         }
         function getConstantValue(node) {
-            if (node.kind === 278 /* EnumMember */) {
+            if (node.kind === 279 /* EnumMember */) {
                 return getEnumMemberValue(node);
             }
             var symbol = getNodeLinks(node).resolvedSymbol;
@@ -58486,7 +60557,7 @@ var ts;
         function createTypeOfDeclaration(declarationIn, enclosingDeclaration, flags, tracker, addUndefined) {
             var declaration = ts.getParseTreeNode(declarationIn, ts.isVariableLikeOrAccessor);
             if (!declaration) {
-                return ts.createToken(120 /* AnyKeyword */);
+                return ts.createToken(121 /* AnyKeyword */);
             }
             // Get type of the symbol if this is the valid symbol otherwise get type at location
             var symbol = getSymbolOfNode(declaration);
@@ -58505,7 +60576,7 @@ var ts;
         function createReturnTypeOfSignatureDeclaration(signatureDeclarationIn, enclosingDeclaration, flags, tracker) {
             var signatureDeclaration = ts.getParseTreeNode(signatureDeclarationIn, ts.isFunctionLike);
             if (!signatureDeclaration) {
-                return ts.createToken(120 /* AnyKeyword */);
+                return ts.createToken(121 /* AnyKeyword */);
             }
             var signature = getSignatureFromDeclaration(signatureDeclaration);
             return nodeBuilder.typeToTypeNode(getReturnTypeOfSignature(signature), enclosingDeclaration, flags | 1024 /* MultilineObjectLiterals */, tracker);
@@ -58513,7 +60584,7 @@ var ts;
         function createTypeOfExpression(exprIn, enclosingDeclaration, flags, tracker) {
             var expr = ts.getParseTreeNode(exprIn, ts.isExpression);
             if (!expr) {
-                return ts.createToken(120 /* AnyKeyword */);
+                return ts.createToken(121 /* AnyKeyword */);
             }
             var type = getWidenedType(getRegularTypeOfExpression(expr));
             return nodeBuilder.typeToTypeNode(type, enclosingDeclaration, flags | 1024 /* MultilineObjectLiterals */, tracker);
@@ -58632,17 +60703,17 @@ var ts;
                 isLateBound: function (nodeIn) {
                     var node = ts.getParseTreeNode(nodeIn, ts.isDeclaration);
                     var symbol = node && getSymbolOfNode(node);
-                    return !!(symbol && ts.getCheckFlags(symbol) & 2048 /* Late */);
+                    return !!(symbol && ts.getCheckFlags(symbol) & 4096 /* Late */);
                 },
                 getJsxFactoryEntity: function (location) { return location ? (getJsxNamespace(location), (ts.getSourceFileOfNode(location).localJsxFactory || _jsxFactoryEntity)) : _jsxFactoryEntity; },
                 getAllAccessorDeclarations: function (accessor) {
                     accessor = ts.getParseTreeNode(accessor, ts.isGetOrSetAccessorDeclaration); // TODO: GH#18217
-                    var otherKind = accessor.kind === 159 /* SetAccessor */ ? 158 /* GetAccessor */ : 159 /* SetAccessor */;
+                    var otherKind = accessor.kind === 160 /* SetAccessor */ ? 159 /* GetAccessor */ : 160 /* SetAccessor */;
                     var otherAccessor = ts.getDeclarationOfKind(getSymbolOfNode(accessor), otherKind);
                     var firstAccessor = otherAccessor && (otherAccessor.pos < accessor.pos) ? otherAccessor : accessor;
                     var secondAccessor = otherAccessor && (otherAccessor.pos < accessor.pos) ? accessor : otherAccessor;
-                    var setAccessor = accessor.kind === 159 /* SetAccessor */ ? accessor : otherAccessor;
-                    var getAccessor = accessor.kind === 158 /* GetAccessor */ ? accessor : otherAccessor;
+                    var setAccessor = accessor.kind === 160 /* SetAccessor */ ? accessor : otherAccessor;
+                    var getAccessor = accessor.kind === 159 /* GetAccessor */ ? accessor : otherAccessor;
                     return {
                         firstAccessor: firstAccessor,
                         secondAccessor: secondAccessor,
@@ -58658,7 +60729,7 @@ var ts;
                 }
             };
             function isInHeritageClause(node) {
-                return node.parent && node.parent.kind === 211 /* ExpressionWithTypeArguments */ && node.parent.parent && node.parent.parent.kind === 273 /* HeritageClause */;
+                return node.parent && node.parent.kind === 212 /* ExpressionWithTypeArguments */ && node.parent.parent && node.parent.parent.kind === 274 /* HeritageClause */;
             }
             // defined here to avoid outer scope pollution
             function getTypeReferenceDirectivesForEntityName(node) {
@@ -58670,7 +60741,7 @@ var ts;
                 // qualified names can only be used as types\namespaces
                 // identifiers are treated as values only if they appear in type queries
                 var meaning = 67897832 /* Type */ | 1920 /* Namespace */;
-                if ((node.kind === 72 /* Identifier */ && isInTypeQuery(node)) || (node.kind === 189 /* PropertyAccessExpression */ && !isInHeritageClause(node))) {
+                if ((node.kind === 73 /* Identifier */ && isInTypeQuery(node)) || (node.kind === 190 /* PropertyAccessExpression */ && !isInHeritageClause(node))) {
                     meaning = 67220415 /* Value */ | 1048576 /* ExportValue */;
                 }
                 var symbol = resolveEntityName(node, meaning, /*ignoreErrors*/ true);
@@ -58721,7 +60792,7 @@ var ts;
                         break;
                     }
                 }
-                if (current.valueDeclaration && current.valueDeclaration.kind === 284 /* SourceFile */ && current.flags & 512 /* ValueModule */) {
+                if (current.valueDeclaration && current.valueDeclaration.kind === 285 /* SourceFile */ && current.flags & 512 /* ValueModule */) {
                     return false;
                 }
                 // check that at least one declaration of top level symbol originates from type declaration file
@@ -58749,12 +60820,12 @@ var ts;
             }
         }
         function getExternalModuleFileFromDeclaration(declaration) {
-            var specifier = declaration.kind === 244 /* ModuleDeclaration */ ? ts.tryCast(declaration.name, ts.isStringLiteral) : ts.getExternalModuleName(declaration);
+            var specifier = declaration.kind === 245 /* ModuleDeclaration */ ? ts.tryCast(declaration.name, ts.isStringLiteral) : ts.getExternalModuleName(declaration);
             var moduleSymbol = resolveExternalModuleNameWorker(specifier, specifier, /*moduleNotFoundError*/ undefined); // TODO: GH#18217
             if (!moduleSymbol) {
                 return undefined;
             }
-            return ts.getDeclarationOfKind(moduleSymbol, 284 /* SourceFile */);
+            return ts.getDeclarationOfKind(moduleSymbol, 285 /* SourceFile */);
         }
         function initializeTypeChecker() {
             // Bind all source files and propagate errors
@@ -58771,6 +60842,15 @@ var ts;
                     continue;
                 }
                 if (!ts.isExternalOrCommonJsModule(file)) {
+                    // It is an error for a non-external-module (i.e. script) to declare its own `globalThis`.
+                    // We can't use `builtinGlobals` for this due to synthetic expando-namespace generation in JS files.
+                    var fileGlobalThisSymbol = file.locals.get("globalThis");
+                    if (fileGlobalThisSymbol) {
+                        for (var _d = 0, _e = fileGlobalThisSymbol.declarations; _d < _e.length; _d++) {
+                            var declaration = _e[_d];
+                            diagnostics.add(ts.createDiagnosticForNode(declaration, ts.Diagnostics.Declaration_name_conflicts_with_built_in_global_identifier_0, "globalThis"));
+                        }
+                    }
                     mergeSymbolTable(globals, file.locals);
                 }
                 if (file.jsGlobalAugmentations) {
@@ -58801,10 +60881,10 @@ var ts;
             if (augmentations) {
                 // merge _global_ module augmentations.
                 // this needs to be done after global symbol table is initialized to make sure that all ambient modules are indexed
-                for (var _d = 0, augmentations_1 = augmentations; _d < augmentations_1.length; _d++) {
-                    var list = augmentations_1[_d];
-                    for (var _e = 0, list_1 = list; _e < list_1.length; _e++) {
-                        var augmentation = list_1[_e];
+                for (var _f = 0, augmentations_1 = augmentations; _f < augmentations_1.length; _f++) {
+                    var list = augmentations_1[_f];
+                    for (var _g = 0, list_1 = list; _g < list_1.length; _g++) {
+                        var augmentation = list_1[_g];
                         if (!ts.isGlobalScopeAugmentation(augmentation.parent))
                             continue;
                         mergeModuleAugmentation(augmentation);
@@ -58816,6 +60896,7 @@ var ts;
             getSymbolLinks(undefinedSymbol).type = undefinedWideningType;
             getSymbolLinks(argumentsSymbol).type = getGlobalType("IArguments", /*arity*/ 0, /*reportErrors*/ true);
             getSymbolLinks(unknownSymbol).type = errorType;
+            getSymbolLinks(globalThisSymbol).type = createObjectType(16 /* Anonymous */, globalThisSymbol);
             // Initialize special types
             globalArrayType = getGlobalType("Array", /*arity*/ 1, /*reportErrors*/ true);
             globalObjectType = getGlobalType("Object", /*arity*/ 0, /*reportErrors*/ true);
@@ -58832,16 +60913,16 @@ var ts;
                 // autoArrayType is used as a marker, so even if global Array type is not defined, it needs to be a unique type
                 autoArrayType = createAnonymousType(undefined, emptySymbols, ts.emptyArray, ts.emptyArray, undefined, undefined);
             }
-            globalReadonlyArrayType = getGlobalTypeOrUndefined("ReadonlyArray", /*arity*/ 1);
+            globalReadonlyArrayType = getGlobalTypeOrUndefined("ReadonlyArray", /*arity*/ 1) || globalArrayType;
             anyReadonlyArrayType = globalReadonlyArrayType ? createTypeFromGenericGlobalType(globalReadonlyArrayType, [anyType]) : anyArrayType;
             globalThisType = getGlobalTypeOrUndefined("ThisType", /*arity*/ 1);
             if (augmentations) {
                 // merge _nonglobal_ module augmentations.
                 // this needs to be done after global symbol table is initialized to make sure that all ambient modules are indexed
-                for (var _f = 0, augmentations_2 = augmentations; _f < augmentations_2.length; _f++) {
-                    var list = augmentations_2[_f];
-                    for (var _g = 0, list_2 = list; _g < list_2.length; _g++) {
-                        var augmentation = list_2[_g];
+                for (var _h = 0, augmentations_2 = augmentations; _h < augmentations_2.length; _h++) {
+                    var list = augmentations_2[_h];
+                    for (var _j = 0, list_2 = list; _j < list_2.length; _j++) {
+                        var augmentation = list_2[_j];
                         if (ts.isGlobalScopeAugmentation(augmentation.parent))
                             continue;
                         mergeModuleAugmentation(augmentation);
@@ -58868,8 +60949,8 @@ var ts;
                 else {
                     // Otherwise issue top-level error since the files appear very identical in terms of what they contain
                     var list = ts.arrayFrom(conflictingSymbols.keys()).join(", ");
-                    diagnostics.add(addRelatedInfo(ts.createDiagnosticForNode(firstFile, ts.Diagnostics.Definitions_of_the_following_identifiers_conflict_with_those_in_another_file_Colon_0, list), ts.createDiagnosticForNode(secondFile, ts.Diagnostics.Conflicts_are_in_this_file)));
-                    diagnostics.add(addRelatedInfo(ts.createDiagnosticForNode(secondFile, ts.Diagnostics.Definitions_of_the_following_identifiers_conflict_with_those_in_another_file_Colon_0, list), ts.createDiagnosticForNode(firstFile, ts.Diagnostics.Conflicts_are_in_this_file)));
+                    diagnostics.add(ts.addRelatedInfo(ts.createDiagnosticForNode(firstFile, ts.Diagnostics.Definitions_of_the_following_identifiers_conflict_with_those_in_another_file_Colon_0, list), ts.createDiagnosticForNode(secondFile, ts.Diagnostics.Conflicts_are_in_this_file)));
+                    diagnostics.add(ts.addRelatedInfo(ts.createDiagnosticForNode(secondFile, ts.Diagnostics.Definitions_of_the_following_identifiers_conflict_with_those_in_another_file_Colon_0, list), ts.createDiagnosticForNode(firstFile, ts.Diagnostics.Conflicts_are_in_this_file)));
                 }
             });
             amalgamatedDuplicates = undefined;
@@ -58881,7 +60962,7 @@ var ts;
                     var helpersModule = resolveHelpersModule(sourceFile, location);
                     if (helpersModule !== unknownSymbol) {
                         var uncheckedHelpers = helpers & ~requestedExternalEmitHelpers;
-                        for (var helper = 1 /* FirstEmitHelper */; helper <= 65536 /* LastEmitHelper */; helper <<= 1) {
+                        for (var helper = 1 /* FirstEmitHelper */; helper <= 131072 /* LastEmitHelper */; helper <<= 1) {
                             if (uncheckedHelpers & helper) {
                                 var name = getHelperName(helper);
                                 var symbol = getSymbol(helpersModule.exports, ts.escapeLeadingUnderscores(name), 67220415 /* Value */);
@@ -58908,12 +60989,13 @@ var ts;
                 case 256 /* Values */: return "__values";
                 case 512 /* Read */: return "__read";
                 case 1024 /* Spread */: return "__spread";
-                case 2048 /* Await */: return "__await";
-                case 4096 /* AsyncGenerator */: return "__asyncGenerator";
-                case 8192 /* AsyncDelegator */: return "__asyncDelegator";
-                case 16384 /* AsyncValues */: return "__asyncValues";
-                case 32768 /* ExportStar */: return "__exportStar";
-                case 65536 /* MakeTemplateObject */: return "__makeTemplateObject";
+                case 2048 /* SpreadArrays */: return "__spreadArrays";
+                case 4096 /* Await */: return "__await";
+                case 8192 /* AsyncGenerator */: return "__asyncGenerator";
+                case 16384 /* AsyncDelegator */: return "__asyncDelegator";
+                case 32768 /* AsyncValues */: return "__asyncValues";
+                case 65536 /* ExportStar */: return "__exportStar";
+                case 131072 /* MakeTemplateObject */: return "__makeTemplateObject";
                 default: return ts.Debug.fail("Unrecognized helper");
             }
         }
@@ -58932,14 +61014,14 @@ var ts;
                 return false;
             }
             if (!ts.nodeCanBeDecorated(node, node.parent, node.parent.parent)) {
-                if (node.kind === 156 /* MethodDeclaration */ && !ts.nodeIsPresent(node.body)) {
+                if (node.kind === 157 /* MethodDeclaration */ && !ts.nodeIsPresent(node.body)) {
                     return grammarErrorOnFirstToken(node, ts.Diagnostics.A_decorator_can_only_decorate_a_method_implementation_not_an_overload);
                 }
                 else {
                     return grammarErrorOnFirstToken(node, ts.Diagnostics.Decorators_are_not_valid_here);
                 }
             }
-            else if (node.kind === 158 /* GetAccessor */ || node.kind === 159 /* SetAccessor */) {
+            else if (node.kind === 159 /* GetAccessor */ || node.kind === 160 /* SetAccessor */) {
                 var accessors = ts.getAllAccessorDeclarations(node.parent.members, node);
                 if (accessors.firstAccessor.decorators && node === accessors.secondAccessor) {
                     return grammarErrorOnFirstToken(node, ts.Diagnostics.Decorators_cannot_be_applied_to_multiple_get_Slashset_accessors_of_the_same_name);
@@ -58956,23 +61038,23 @@ var ts;
             var flags = 0 /* None */;
             for (var _i = 0, _a = node.modifiers; _i < _a.length; _i++) {
                 var modifier = _a[_i];
-                if (modifier.kind !== 133 /* ReadonlyKeyword */) {
-                    if (node.kind === 153 /* PropertySignature */ || node.kind === 155 /* MethodSignature */) {
+                if (modifier.kind !== 134 /* ReadonlyKeyword */) {
+                    if (node.kind === 154 /* PropertySignature */ || node.kind === 156 /* MethodSignature */) {
                         return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_type_member, ts.tokenToString(modifier.kind));
                     }
-                    if (node.kind === 162 /* IndexSignature */) {
+                    if (node.kind === 163 /* IndexSignature */) {
                         return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_an_index_signature, ts.tokenToString(modifier.kind));
                     }
                 }
                 switch (modifier.kind) {
-                    case 77 /* ConstKeyword */:
-                        if (node.kind !== 243 /* EnumDeclaration */) {
-                            return grammarErrorOnNode(node, ts.Diagnostics.A_class_member_cannot_have_the_0_keyword, ts.tokenToString(77 /* ConstKeyword */));
+                    case 78 /* ConstKeyword */:
+                        if (node.kind !== 244 /* EnumDeclaration */) {
+                            return grammarErrorOnNode(node, ts.Diagnostics.A_class_member_cannot_have_the_0_keyword, ts.tokenToString(78 /* ConstKeyword */));
                         }
                         break;
-                    case 115 /* PublicKeyword */:
-                    case 114 /* ProtectedKeyword */:
-                    case 113 /* PrivateKeyword */:
+                    case 116 /* PublicKeyword */:
+                    case 115 /* ProtectedKeyword */:
+                    case 114 /* PrivateKeyword */:
                         var text = visibilityToString(ts.modifierToFlag(modifier.kind));
                         if (flags & 28 /* AccessibilityModifier */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics.Accessibility_modifier_already_seen);
@@ -58986,11 +61068,11 @@ var ts;
                         else if (flags & 256 /* Async */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, text, "async");
                         }
-                        else if (node.parent.kind === 245 /* ModuleBlock */ || node.parent.kind === 284 /* SourceFile */) {
+                        else if (node.parent.kind === 246 /* ModuleBlock */ || node.parent.kind === 285 /* SourceFile */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_module_or_namespace_element, text);
                         }
                         else if (flags & 128 /* Abstract */) {
-                            if (modifier.kind === 113 /* PrivateKeyword */) {
+                            if (modifier.kind === 114 /* PrivateKeyword */) {
                                 return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_with_1_modifier, text, "abstract");
                             }
                             else {
@@ -58999,7 +61081,7 @@ var ts;
                         }
                         flags |= ts.modifierToFlag(modifier.kind);
                         break;
-                    case 116 /* StaticKeyword */:
+                    case 117 /* StaticKeyword */:
                         if (flags & 32 /* Static */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "static");
                         }
@@ -59009,10 +61091,10 @@ var ts;
                         else if (flags & 256 /* Async */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, "static", "async");
                         }
-                        else if (node.parent.kind === 245 /* ModuleBlock */ || node.parent.kind === 284 /* SourceFile */) {
+                        else if (node.parent.kind === 246 /* ModuleBlock */ || node.parent.kind === 285 /* SourceFile */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_module_or_namespace_element, "static");
                         }
-                        else if (node.kind === 151 /* Parameter */) {
+                        else if (node.kind === 152 /* Parameter */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "static");
                         }
                         else if (flags & 128 /* Abstract */) {
@@ -59021,18 +61103,18 @@ var ts;
                         flags |= 32 /* Static */;
                         lastStatic = modifier;
                         break;
-                    case 133 /* ReadonlyKeyword */:
+                    case 134 /* ReadonlyKeyword */:
                         if (flags & 64 /* Readonly */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "readonly");
                         }
-                        else if (node.kind !== 154 /* PropertyDeclaration */ && node.kind !== 153 /* PropertySignature */ && node.kind !== 162 /* IndexSignature */ && node.kind !== 151 /* Parameter */) {
+                        else if (node.kind !== 155 /* PropertyDeclaration */ && node.kind !== 154 /* PropertySignature */ && node.kind !== 163 /* IndexSignature */ && node.kind !== 152 /* Parameter */) {
                             // If node.kind === SyntaxKind.Parameter, checkParameter report an error if it's not a parameter property.
                             return grammarErrorOnNode(modifier, ts.Diagnostics.readonly_modifier_can_only_appear_on_a_property_declaration_or_index_signature);
                         }
                         flags |= 64 /* Readonly */;
                         lastReadonly = modifier;
                         break;
-                    case 85 /* ExportKeyword */:
+                    case 86 /* ExportKeyword */:
                         if (flags & 1 /* Export */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "export");
                         }
@@ -59045,52 +61127,52 @@ var ts;
                         else if (flags & 256 /* Async */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, "export", "async");
                         }
-                        else if (node.parent.kind === 240 /* ClassDeclaration */) {
+                        else if (node.parent.kind === 241 /* ClassDeclaration */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_class_element, "export");
                         }
-                        else if (node.kind === 151 /* Parameter */) {
+                        else if (node.kind === 152 /* Parameter */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "export");
                         }
                         flags |= 1 /* Export */;
                         break;
-                    case 80 /* DefaultKeyword */:
-                        var container = node.parent.kind === 284 /* SourceFile */ ? node.parent : node.parent.parent;
-                        if (container.kind === 244 /* ModuleDeclaration */ && !ts.isAmbientModule(container)) {
+                    case 81 /* DefaultKeyword */:
+                        var container = node.parent.kind === 285 /* SourceFile */ ? node.parent : node.parent.parent;
+                        if (container.kind === 245 /* ModuleDeclaration */ && !ts.isAmbientModule(container)) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics.A_default_export_can_only_be_used_in_an_ECMAScript_style_module);
                         }
                         flags |= 512 /* Default */;
                         break;
-                    case 125 /* DeclareKeyword */:
+                    case 126 /* DeclareKeyword */:
                         if (flags & 2 /* Ambient */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "declare");
                         }
                         else if (flags & 256 /* Async */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_in_an_ambient_context, "async");
                         }
-                        else if (node.parent.kind === 240 /* ClassDeclaration */) {
+                        else if (node.parent.kind === 241 /* ClassDeclaration */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_class_element, "declare");
                         }
-                        else if (node.kind === 151 /* Parameter */) {
+                        else if (node.kind === 152 /* Parameter */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "declare");
                         }
-                        else if ((node.parent.flags & 4194304 /* Ambient */) && node.parent.kind === 245 /* ModuleBlock */) {
+                        else if ((node.parent.flags & 4194304 /* Ambient */) && node.parent.kind === 246 /* ModuleBlock */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics.A_declare_modifier_cannot_be_used_in_an_already_ambient_context);
                         }
                         flags |= 2 /* Ambient */;
                         lastDeclare = modifier;
                         break;
-                    case 118 /* AbstractKeyword */:
+                    case 119 /* AbstractKeyword */:
                         if (flags & 128 /* Abstract */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "abstract");
                         }
-                        if (node.kind !== 240 /* ClassDeclaration */) {
-                            if (node.kind !== 156 /* MethodDeclaration */ &&
-                                node.kind !== 154 /* PropertyDeclaration */ &&
-                                node.kind !== 158 /* GetAccessor */ &&
-                                node.kind !== 159 /* SetAccessor */) {
+                        if (node.kind !== 241 /* ClassDeclaration */) {
+                            if (node.kind !== 157 /* MethodDeclaration */ &&
+                                node.kind !== 155 /* PropertyDeclaration */ &&
+                                node.kind !== 159 /* GetAccessor */ &&
+                                node.kind !== 160 /* SetAccessor */) {
                                 return grammarErrorOnNode(modifier, ts.Diagnostics.abstract_modifier_can_only_appear_on_a_class_method_or_property_declaration);
                             }
-                            if (!(node.parent.kind === 240 /* ClassDeclaration */ && ts.hasModifier(node.parent, 128 /* Abstract */))) {
+                            if (!(node.parent.kind === 241 /* ClassDeclaration */ && ts.hasModifier(node.parent, 128 /* Abstract */))) {
                                 return grammarErrorOnNode(modifier, ts.Diagnostics.Abstract_methods_can_only_appear_within_an_abstract_class);
                             }
                             if (flags & 32 /* Static */) {
@@ -59102,14 +61184,14 @@ var ts;
                         }
                         flags |= 128 /* Abstract */;
                         break;
-                    case 121 /* AsyncKeyword */:
+                    case 122 /* AsyncKeyword */:
                         if (flags & 256 /* Async */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "async");
                         }
                         else if (flags & 2 /* Ambient */ || node.parent.flags & 4194304 /* Ambient */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_in_an_ambient_context, "async");
                         }
-                        else if (node.kind === 151 /* Parameter */) {
+                        else if (node.kind === 152 /* Parameter */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "async");
                         }
                         flags |= 256 /* Async */;
@@ -59117,7 +61199,7 @@ var ts;
                         break;
                 }
             }
-            if (node.kind === 157 /* Constructor */) {
+            if (node.kind === 158 /* Constructor */) {
                 if (flags & 32 /* Static */) {
                     return grammarErrorOnNode(lastStatic, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "static");
                 }
@@ -59132,13 +61214,13 @@ var ts;
                 }
                 return false;
             }
-            else if ((node.kind === 249 /* ImportDeclaration */ || node.kind === 248 /* ImportEqualsDeclaration */) && flags & 2 /* Ambient */) {
+            else if ((node.kind === 250 /* ImportDeclaration */ || node.kind === 249 /* ImportEqualsDeclaration */) && flags & 2 /* Ambient */) {
                 return grammarErrorOnNode(lastDeclare, ts.Diagnostics.A_0_modifier_cannot_be_used_with_an_import_declaration, "declare");
             }
-            else if (node.kind === 151 /* Parameter */ && (flags & 92 /* ParameterPropertyModifier */) && ts.isBindingPattern(node.name)) {
+            else if (node.kind === 152 /* Parameter */ && (flags & 92 /* ParameterPropertyModifier */) && ts.isBindingPattern(node.name)) {
                 return grammarErrorOnNode(node, ts.Diagnostics.A_parameter_property_may_not_be_declared_using_a_binding_pattern);
             }
-            else if (node.kind === 151 /* Parameter */ && (flags & 92 /* ParameterPropertyModifier */) && node.dotDotDotToken) {
+            else if (node.kind === 152 /* Parameter */ && (flags & 92 /* ParameterPropertyModifier */) && node.dotDotDotToken) {
                 return grammarErrorOnNode(node, ts.Diagnostics.A_parameter_property_cannot_be_declared_using_a_rest_parameter);
             }
             if (flags & 256 /* Async */) {
@@ -59159,38 +61241,38 @@ var ts;
         }
         function shouldReportBadModifier(node) {
             switch (node.kind) {
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
-                case 157 /* Constructor */:
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
-                case 162 /* IndexSignature */:
-                case 244 /* ModuleDeclaration */:
-                case 249 /* ImportDeclaration */:
-                case 248 /* ImportEqualsDeclaration */:
-                case 255 /* ExportDeclaration */:
-                case 254 /* ExportAssignment */:
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
-                case 151 /* Parameter */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
+                case 158 /* Constructor */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
+                case 163 /* IndexSignature */:
+                case 245 /* ModuleDeclaration */:
+                case 250 /* ImportDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
+                case 256 /* ExportDeclaration */:
+                case 255 /* ExportAssignment */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
+                case 152 /* Parameter */:
                     return false;
                 default:
-                    if (node.parent.kind === 245 /* ModuleBlock */ || node.parent.kind === 284 /* SourceFile */) {
+                    if (node.parent.kind === 246 /* ModuleBlock */ || node.parent.kind === 285 /* SourceFile */) {
                         return false;
                     }
                     switch (node.kind) {
-                        case 239 /* FunctionDeclaration */:
-                            return nodeHasAnyModifiersExcept(node, 121 /* AsyncKeyword */);
-                        case 240 /* ClassDeclaration */:
-                            return nodeHasAnyModifiersExcept(node, 118 /* AbstractKeyword */);
-                        case 241 /* InterfaceDeclaration */:
-                        case 219 /* VariableStatement */:
-                        case 242 /* TypeAliasDeclaration */:
+                        case 240 /* FunctionDeclaration */:
+                            return nodeHasAnyModifiersExcept(node, 122 /* AsyncKeyword */);
+                        case 241 /* ClassDeclaration */:
+                            return nodeHasAnyModifiersExcept(node, 119 /* AbstractKeyword */);
+                        case 242 /* InterfaceDeclaration */:
+                        case 220 /* VariableStatement */:
+                        case 243 /* TypeAliasDeclaration */:
                             return true;
-                        case 243 /* EnumDeclaration */:
-                            return nodeHasAnyModifiersExcept(node, 77 /* ConstKeyword */);
+                        case 244 /* EnumDeclaration */:
+                            return nodeHasAnyModifiersExcept(node, 78 /* ConstKeyword */);
                         default:
                             ts.Debug.fail();
                             return false;
@@ -59202,10 +61284,10 @@ var ts;
         }
         function checkGrammarAsyncModifier(node, asyncModifier) {
             switch (node.kind) {
-                case 156 /* MethodDeclaration */:
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
+                case 157 /* MethodDeclaration */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
                     return false;
             }
             return grammarErrorOnNode(asyncModifier, ts.Diagnostics._0_modifier_cannot_be_used_here, "async");
@@ -59265,10 +61347,10 @@ var ts;
                     var nonSimpleParameters = getNonSimpleParameters(node.parameters);
                     if (ts.length(nonSimpleParameters)) {
                         ts.forEach(nonSimpleParameters, function (parameter) {
-                            addRelatedInfo(error(parameter, ts.Diagnostics.This_parameter_is_not_allowed_with_use_strict_directive), ts.createDiagnosticForNode(useStrictDirective_1, ts.Diagnostics.use_strict_directive_used_here));
+                            ts.addRelatedInfo(error(parameter, ts.Diagnostics.This_parameter_is_not_allowed_with_use_strict_directive), ts.createDiagnosticForNode(useStrictDirective_1, ts.Diagnostics.use_strict_directive_used_here));
                         });
                         var diagnostics_1 = nonSimpleParameters.map(function (parameter, index) { return (index === 0 ? ts.createDiagnosticForNode(parameter, ts.Diagnostics.Non_simple_parameter_declared_here) : ts.createDiagnosticForNode(parameter, ts.Diagnostics.and_here)); });
-                        addRelatedInfo.apply(void 0, [error(useStrictDirective_1, ts.Diagnostics.use_strict_directive_cannot_be_used_with_non_simple_parameter_list)].concat(diagnostics_1));
+                        ts.addRelatedInfo.apply(void 0, [error(useStrictDirective_1, ts.Diagnostics.use_strict_directive_cannot_be_used_with_non_simple_parameter_list)].concat(diagnostics_1));
                         return true;
                     }
                 }
@@ -59320,10 +61402,10 @@ var ts;
             if (!parameter.type) {
                 return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_must_have_a_type_annotation);
             }
-            if (parameter.type.kind !== 138 /* StringKeyword */ && parameter.type.kind !== 135 /* NumberKeyword */) {
+            if (parameter.type.kind !== 139 /* StringKeyword */ && parameter.type.kind !== 136 /* NumberKeyword */) {
                 var type = getTypeFromTypeNode(parameter.type);
                 if (type.flags & 4 /* String */ || type.flags & 8 /* Number */) {
-                    return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_type_cannot_be_a_type_alias_Consider_writing_0_Colon_1_Colon_2_instead, ts.getTextOfNode(parameter.name), typeToString(type), typeToString(getTypeFromTypeNode(node.type)));
+                    return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_type_cannot_be_a_type_alias_Consider_writing_0_Colon_1_Colon_2_instead, ts.getTextOfNode(parameter.name), typeToString(type), typeToString(node.type ? getTypeFromTypeNode(node.type) : anyType));
                 }
                 if (type.flags & 1048576 /* Union */ && allTypesAssignableToKind(type, 128 /* StringLiteral */, /*strict*/ true)) {
                     return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_type_cannot_be_a_union_type_Consider_using_a_mapped_object_type_instead);
@@ -59354,9 +61436,9 @@ var ts;
         }
         function checkGrammarForOmittedArgument(args) {
             if (args) {
-                for (var _i = 0, args_5 = args; _i < args_5.length; _i++) {
-                    var arg = args_5[_i];
-                    if (arg.kind === 210 /* OmittedExpression */) {
+                for (var _i = 0, args_4 = args; _i < args_4.length; _i++) {
+                    var arg = args_4[_i];
+                    if (arg.kind === 211 /* OmittedExpression */) {
                         return grammarErrorAtPos(arg, arg.pos, 0, ts.Diagnostics.Argument_expression_expected);
                     }
                 }
@@ -59386,7 +61468,7 @@ var ts;
             if (!checkGrammarDecoratorsAndModifiers(node) && node.heritageClauses) {
                 for (var _i = 0, _a = node.heritageClauses; _i < _a.length; _i++) {
                     var heritageClause = _a[_i];
-                    if (heritageClause.token === 86 /* ExtendsKeyword */) {
+                    if (heritageClause.token === 87 /* ExtendsKeyword */) {
                         if (seenExtendsClause) {
                             return grammarErrorOnFirstToken(heritageClause, ts.Diagnostics.extends_clause_already_seen);
                         }
@@ -59399,7 +61481,7 @@ var ts;
                         seenExtendsClause = true;
                     }
                     else {
-                        ts.Debug.assert(heritageClause.token === 109 /* ImplementsKeyword */);
+                        ts.Debug.assert(heritageClause.token === 110 /* ImplementsKeyword */);
                         if (seenImplementsClause) {
                             return grammarErrorOnFirstToken(heritageClause, ts.Diagnostics.implements_clause_already_seen);
                         }
@@ -59415,14 +61497,14 @@ var ts;
             if (node.heritageClauses) {
                 for (var _i = 0, _a = node.heritageClauses; _i < _a.length; _i++) {
                     var heritageClause = _a[_i];
-                    if (heritageClause.token === 86 /* ExtendsKeyword */) {
+                    if (heritageClause.token === 87 /* ExtendsKeyword */) {
                         if (seenExtendsClause) {
                             return grammarErrorOnFirstToken(heritageClause, ts.Diagnostics.extends_clause_already_seen);
                         }
                         seenExtendsClause = true;
                     }
                     else {
-                        ts.Debug.assert(heritageClause.token === 109 /* ImplementsKeyword */);
+                        ts.Debug.assert(heritageClause.token === 110 /* ImplementsKeyword */);
                         return grammarErrorOnFirstToken(heritageClause, ts.Diagnostics.Interface_declaration_cannot_have_implements_clause);
                     }
                     // Grammar checking heritageClause inside class declaration
@@ -59433,20 +61515,20 @@ var ts;
         }
         function checkGrammarComputedPropertyName(node) {
             // If node is not a computedPropertyName, just skip the grammar checking
-            if (node.kind !== 149 /* ComputedPropertyName */) {
+            if (node.kind !== 150 /* ComputedPropertyName */) {
                 return false;
             }
             var computedPropertyName = node;
-            if (computedPropertyName.expression.kind === 204 /* BinaryExpression */ && computedPropertyName.expression.operatorToken.kind === 27 /* CommaToken */) {
+            if (computedPropertyName.expression.kind === 205 /* BinaryExpression */ && computedPropertyName.expression.operatorToken.kind === 27 /* CommaToken */) {
                 return grammarErrorOnNode(computedPropertyName.expression, ts.Diagnostics.A_comma_expression_is_not_allowed_in_a_computed_property_name);
             }
             return false;
         }
         function checkGrammarForGenerator(node) {
             if (node.asteriskToken) {
-                ts.Debug.assert(node.kind === 239 /* FunctionDeclaration */ ||
-                    node.kind === 196 /* FunctionExpression */ ||
-                    node.kind === 156 /* MethodDeclaration */);
+                ts.Debug.assert(node.kind === 240 /* FunctionDeclaration */ ||
+                    node.kind === 197 /* FunctionExpression */ ||
+                    node.kind === 157 /* MethodDeclaration */);
                 if (node.flags & 4194304 /* Ambient */) {
                     return grammarErrorOnNode(node.asteriskToken, ts.Diagnostics.Generators_are_not_allowed_in_an_ambient_context);
                 }
@@ -59472,15 +61554,22 @@ var ts;
             var seen = ts.createUnderscoreEscapedMap();
             for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
                 var prop = _a[_i];
-                if (prop.kind === 277 /* SpreadAssignment */) {
+                if (prop.kind === 278 /* SpreadAssignment */) {
+                    if (inDestructuring) {
+                        // a rest property cannot be destructured any further
+                        var expression = ts.skipParentheses(prop.expression);
+                        if (ts.isArrayLiteralExpression(expression) || ts.isObjectLiteralExpression(expression)) {
+                            return grammarErrorOnNode(prop.expression, ts.Diagnostics.A_rest_element_cannot_contain_a_binding_pattern);
+                        }
+                    }
                     continue;
                 }
                 var name = prop.name;
-                if (name.kind === 149 /* ComputedPropertyName */) {
+                if (name.kind === 150 /* ComputedPropertyName */) {
                     // If the name is not a ComputedPropertyName, the grammar checking will skip it
                     checkGrammarComputedPropertyName(name);
                 }
-                if (prop.kind === 276 /* ShorthandPropertyAssignment */ && !inDestructuring && prop.objectAssignmentInitializer) {
+                if (prop.kind === 277 /* ShorthandPropertyAssignment */ && !inDestructuring && prop.objectAssignmentInitializer) {
                     // having objectAssignmentInitializer is only valid in ObjectAssignmentPattern
                     // outside of destructuring it is a syntax error
                     return grammarErrorOnNode(prop.equalsToken, ts.Diagnostics.can_only_be_used_in_an_object_literal_property_inside_a_destructuring_assignment);
@@ -59489,7 +61578,7 @@ var ts;
                 if (prop.modifiers) {
                     for (var _b = 0, _c = prop.modifiers; _b < _c.length; _b++) { // TODO: GH#19955
                         var mod = _c[_b];
-                        if (mod.kind !== 121 /* AsyncKeyword */ || prop.kind !== 156 /* MethodDeclaration */) {
+                        if (mod.kind !== 122 /* AsyncKeyword */ || prop.kind !== 157 /* MethodDeclaration */) {
                             grammarErrorOnNode(mod, ts.Diagnostics._0_modifier_cannot_be_used_here, ts.getTextOfNode(mod));
                         }
                     }
@@ -59504,23 +61593,23 @@ var ts;
                 // and either both previous and propId.descriptor have[[Get]] fields or both previous and propId.descriptor have[[Set]] fields
                 var currentKind = void 0;
                 switch (prop.kind) {
-                    case 276 /* ShorthandPropertyAssignment */:
+                    case 277 /* ShorthandPropertyAssignment */:
                         checkGrammarForInvalidExclamationToken(prop.exclamationToken, ts.Diagnostics.A_definite_assignment_assertion_is_not_permitted_in_this_context);
                     /* tslint:disable:no-switch-case-fall-through */
-                    case 275 /* PropertyAssignment */:
+                    case 276 /* PropertyAssignment */:
                         // Grammar checking for computedPropertyName and shorthandPropertyAssignment
                         checkGrammarForInvalidQuestionMark(prop.questionToken, ts.Diagnostics.An_object_member_cannot_be_declared_optional);
                         if (name.kind === 8 /* NumericLiteral */) {
                             checkGrammarNumericLiteral(name);
                         }
                     // falls through
-                    case 156 /* MethodDeclaration */:
+                    case 157 /* MethodDeclaration */:
                         currentKind = 1 /* Property */;
                         break;
-                    case 158 /* GetAccessor */:
+                    case 159 /* GetAccessor */:
                         currentKind = 2 /* GetAccessor */;
                         break;
-                    case 159 /* SetAccessor */:
+                    case 160 /* SetAccessor */:
                         currentKind = 4 /* SetAccessor */;
                         break;
                     default:
@@ -59557,7 +61646,7 @@ var ts;
             var seen = ts.createUnderscoreEscapedMap();
             for (var _i = 0, _a = node.attributes.properties; _i < _a.length; _i++) {
                 var attr = _a[_i];
-                if (attr.kind === 269 /* JsxSpreadAttribute */) {
+                if (attr.kind === 270 /* JsxSpreadAttribute */) {
                     continue;
                 }
                 var name = attr.name, initializer = attr.initializer;
@@ -59567,21 +61656,39 @@ var ts;
                 else {
                     return grammarErrorOnNode(name, ts.Diagnostics.JSX_elements_cannot_have_multiple_attributes_with_the_same_name);
                 }
-                if (initializer && initializer.kind === 270 /* JsxExpression */ && !initializer.expression) {
+                if (initializer && initializer.kind === 271 /* JsxExpression */ && !initializer.expression) {
                     return grammarErrorOnNode(initializer, ts.Diagnostics.JSX_attributes_must_only_be_assigned_a_non_empty_expression);
                 }
             }
         }
+        function checkGrammarJsxExpression(node) {
+            if (node.expression && ts.isCommaSequence(node.expression)) {
+                return grammarErrorOnNode(node.expression, ts.Diagnostics.JSX_expressions_may_not_use_the_comma_operator_Did_you_mean_to_write_an_array);
+            }
+        }
         function checkGrammarForInOrForOfStatement(forInOrOfStatement) {
             if (checkGrammarStatementInAmbientContext(forInOrOfStatement)) {
                 return true;
             }
-            if (forInOrOfStatement.kind === 227 /* ForOfStatement */ && forInOrOfStatement.awaitModifier) {
+            if (forInOrOfStatement.kind === 228 /* ForOfStatement */ && forInOrOfStatement.awaitModifier) {
                 if ((forInOrOfStatement.flags & 16384 /* AwaitContext */) === 0 /* None */) {
-                    return grammarErrorOnNode(forInOrOfStatement.awaitModifier, ts.Diagnostics.A_for_await_of_statement_is_only_allowed_within_an_async_function_or_async_generator);
+                    // use of 'for-await-of' in non-async function
+                    var sourceFile = ts.getSourceFileOfNode(forInOrOfStatement);
+                    if (!hasParseDiagnostics(sourceFile)) {
+                        var diagnostic = ts.createDiagnosticForNode(forInOrOfStatement.awaitModifier, ts.Diagnostics.A_for_await_of_statement_is_only_allowed_within_an_async_function_or_async_generator);
+                        var func = ts.getContainingFunction(forInOrOfStatement);
+                        if (func && func.kind !== 158 /* Constructor */) {
+                            ts.Debug.assert((ts.getFunctionFlags(func) & 2 /* Async */) === 0, "Enclosing function should never be an async function.");
+                            var relatedInfo = ts.createDiagnosticForNode(func, ts.Diagnostics.Did_you_mean_to_mark_this_function_as_async);
+                            ts.addRelatedInfo(diagnostic, relatedInfo);
+                        }
+                        diagnostics.add(diagnostic);
+                        return true;
+                    }
+                    return false;
                 }
             }
-            if (forInOrOfStatement.initializer.kind === 238 /* VariableDeclarationList */) {
+            if (forInOrOfStatement.initializer.kind === 239 /* VariableDeclarationList */) {
                 var variableList = forInOrOfStatement.initializer;
                 if (!checkGrammarVariableDeclarationList(variableList)) {
                     var declarations = variableList.declarations;
@@ -59596,20 +61703,20 @@ var ts;
                         return false;
                     }
                     if (declarations.length > 1) {
-                        var diagnostic = forInOrOfStatement.kind === 226 /* ForInStatement */
+                        var diagnostic = forInOrOfStatement.kind === 227 /* ForInStatement */
                             ? ts.Diagnostics.Only_a_single_variable_declaration_is_allowed_in_a_for_in_statement
                             : ts.Diagnostics.Only_a_single_variable_declaration_is_allowed_in_a_for_of_statement;
                         return grammarErrorOnFirstToken(variableList.declarations[1], diagnostic);
                     }
                     var firstDeclaration = declarations[0];
                     if (firstDeclaration.initializer) {
-                        var diagnostic = forInOrOfStatement.kind === 226 /* ForInStatement */
+                        var diagnostic = forInOrOfStatement.kind === 227 /* ForInStatement */
                             ? ts.Diagnostics.The_variable_declaration_of_a_for_in_statement_cannot_have_an_initializer
                             : ts.Diagnostics.The_variable_declaration_of_a_for_of_statement_cannot_have_an_initializer;
                         return grammarErrorOnNode(firstDeclaration.name, diagnostic);
                     }
                     if (firstDeclaration.type) {
-                        var diagnostic = forInOrOfStatement.kind === 226 /* ForInStatement */
+                        var diagnostic = forInOrOfStatement.kind === 227 /* ForInStatement */
                             ? ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_use_a_type_annotation
                             : ts.Diagnostics.The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation;
                         return grammarErrorOnNode(firstDeclaration, diagnostic);
@@ -59636,11 +61743,11 @@ var ts;
                 return grammarErrorOnNode(accessor.name, ts.Diagnostics.An_accessor_cannot_have_type_parameters);
             }
             else if (!doesAccessorHaveCorrectParameterCount(accessor)) {
-                return grammarErrorOnNode(accessor.name, kind === 158 /* GetAccessor */ ?
+                return grammarErrorOnNode(accessor.name, kind === 159 /* GetAccessor */ ?
                     ts.Diagnostics.A_get_accessor_cannot_have_parameters :
                     ts.Diagnostics.A_set_accessor_must_have_exactly_one_parameter);
             }
-            else if (kind === 159 /* SetAccessor */) {
+            else if (kind === 160 /* SetAccessor */) {
                 if (accessor.type) {
                     return grammarErrorOnNode(accessor.name, ts.Diagnostics.A_set_accessor_cannot_have_a_return_type_annotation);
                 }
@@ -59664,23 +61771,23 @@ var ts;
          * A set accessor has one parameter or a `this` parameter and one more parameter.
          */
         function doesAccessorHaveCorrectParameterCount(accessor) {
-            return getAccessorThisParameter(accessor) || accessor.parameters.length === (accessor.kind === 158 /* GetAccessor */ ? 0 : 1);
+            return getAccessorThisParameter(accessor) || accessor.parameters.length === (accessor.kind === 159 /* GetAccessor */ ? 0 : 1);
         }
         function getAccessorThisParameter(accessor) {
-            if (accessor.parameters.length === (accessor.kind === 158 /* GetAccessor */ ? 1 : 2)) {
+            if (accessor.parameters.length === (accessor.kind === 159 /* GetAccessor */ ? 1 : 2)) {
                 return ts.getThisParameter(accessor);
             }
         }
         function checkGrammarTypeOperatorNode(node) {
-            if (node.operator === 142 /* UniqueKeyword */) {
-                if (node.type.kind !== 139 /* SymbolKeyword */) {
-                    return grammarErrorOnNode(node.type, ts.Diagnostics._0_expected, ts.tokenToString(139 /* SymbolKeyword */));
+            if (node.operator === 143 /* UniqueKeyword */) {
+                if (node.type.kind !== 140 /* SymbolKeyword */) {
+                    return grammarErrorOnNode(node.type, ts.Diagnostics._0_expected, ts.tokenToString(140 /* SymbolKeyword */));
                 }
                 var parent = ts.walkUpParenthesizedTypes(node.parent);
                 switch (parent.kind) {
-                    case 237 /* VariableDeclaration */:
+                    case 238 /* VariableDeclaration */:
                         var decl = parent;
-                        if (decl.name.kind !== 72 /* Identifier */) {
+                        if (decl.name.kind !== 73 /* Identifier */) {
                             return grammarErrorOnNode(node, ts.Diagnostics.unique_symbol_types_may_not_be_used_on_a_variable_declaration_with_a_binding_name);
                         }
                         if (!ts.isVariableDeclarationInVariableStatement(decl)) {
@@ -59690,13 +61797,13 @@ var ts;
                             return grammarErrorOnNode(parent.name, ts.Diagnostics.A_variable_whose_type_is_a_unique_symbol_type_must_be_const);
                         }
                         break;
-                    case 154 /* PropertyDeclaration */:
+                    case 155 /* PropertyDeclaration */:
                         if (!ts.hasModifier(parent, 32 /* Static */) ||
                             !ts.hasModifier(parent, 64 /* Readonly */)) {
                             return grammarErrorOnNode(parent.name, ts.Diagnostics.A_property_of_a_class_whose_type_is_a_unique_symbol_type_must_be_both_static_and_readonly);
                         }
                         break;
-                    case 153 /* PropertySignature */:
+                    case 154 /* PropertySignature */:
                         if (!ts.hasModifier(parent, 64 /* Readonly */)) {
                             return grammarErrorOnNode(parent.name, ts.Diagnostics.A_property_of_an_interface_or_type_literal_whose_type_is_a_unique_symbol_type_must_be_readonly);
                         }
@@ -59705,9 +61812,9 @@ var ts;
                         return grammarErrorOnNode(node, ts.Diagnostics.unique_symbol_types_are_not_allowed_here);
                 }
             }
-            else if (node.operator === 133 /* ReadonlyKeyword */) {
-                if (node.type.kind !== 169 /* ArrayType */ && node.type.kind !== 170 /* TupleType */) {
-                    return grammarErrorOnFirstToken(node, ts.Diagnostics.readonly_type_modifier_is_only_permitted_on_array_and_tuple_literal_types, ts.tokenToString(139 /* SymbolKeyword */));
+            else if (node.operator === 134 /* ReadonlyKeyword */) {
+                if (node.type.kind !== 170 /* ArrayType */ && node.type.kind !== 171 /* TupleType */) {
+                    return grammarErrorOnFirstToken(node, ts.Diagnostics.readonly_type_modifier_is_only_permitted_on_array_and_tuple_literal_types, ts.tokenToString(140 /* SymbolKeyword */));
                 }
             }
         }
@@ -59720,10 +61827,10 @@ var ts;
             if (checkGrammarFunctionLikeDeclaration(node)) {
                 return true;
             }
-            if (node.kind === 156 /* MethodDeclaration */) {
-                if (node.parent.kind === 188 /* ObjectLiteralExpression */) {
+            if (node.kind === 157 /* MethodDeclaration */) {
+                if (node.parent.kind === 189 /* ObjectLiteralExpression */) {
                     // We only disallow modifier on a method declaration if it is a property of object-literal-expression
-                    if (node.modifiers && !(node.modifiers.length === 1 && ts.first(node.modifiers).kind === 121 /* AsyncKeyword */)) {
+                    if (node.modifiers && !(node.modifiers.length === 1 && ts.first(node.modifiers).kind === 122 /* AsyncKeyword */)) {
                         return grammarErrorOnFirstToken(node, ts.Diagnostics.Modifiers_cannot_appear_here);
                     }
                     else if (checkGrammarForInvalidQuestionMark(node.questionToken, ts.Diagnostics.An_object_member_cannot_be_declared_optional)) {
@@ -59749,14 +61856,14 @@ var ts;
                 if (node.flags & 4194304 /* Ambient */) {
                     return checkGrammarForInvalidDynamicName(node.name, ts.Diagnostics.A_computed_property_name_in_an_ambient_context_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type);
                 }
-                else if (node.kind === 156 /* MethodDeclaration */ && !node.body) {
+                else if (node.kind === 157 /* MethodDeclaration */ && !node.body) {
                     return checkGrammarForInvalidDynamicName(node.name, ts.Diagnostics.A_computed_property_name_in_a_method_overload_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type);
                 }
             }
-            else if (node.parent.kind === 241 /* InterfaceDeclaration */) {
+            else if (node.parent.kind === 242 /* InterfaceDeclaration */) {
                 return checkGrammarForInvalidDynamicName(node.name, ts.Diagnostics.A_computed_property_name_in_an_interface_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type);
             }
-            else if (node.parent.kind === 168 /* TypeLiteral */) {
+            else if (node.parent.kind === 169 /* TypeLiteral */) {
                 return checkGrammarForInvalidDynamicName(node.name, ts.Diagnostics.A_computed_property_name_in_a_type_literal_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type);
             }
         }
@@ -59767,11 +61874,11 @@ var ts;
                     return grammarErrorOnNode(node, ts.Diagnostics.Jump_target_cannot_cross_function_boundary);
                 }
                 switch (current.kind) {
-                    case 233 /* LabeledStatement */:
+                    case 234 /* LabeledStatement */:
                         if (node.label && current.label.escapedText === node.label.escapedText) {
                             // found matching label - verify that label usage is correct
                             // continue can only target labels that are on iteration statements
-                            var isMisplacedContinueLabel = node.kind === 228 /* ContinueStatement */
+                            var isMisplacedContinueLabel = node.kind === 229 /* ContinueStatement */
                                 && !ts.isIterationStatement(current.statement, /*lookInLabeledStatement*/ true);
                             if (isMisplacedContinueLabel) {
                                 return grammarErrorOnNode(node, ts.Diagnostics.A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement);
@@ -59779,8 +61886,8 @@ var ts;
                             return false;
                         }
                         break;
-                    case 232 /* SwitchStatement */:
-                        if (node.kind === 229 /* BreakStatement */ && !node.label) {
+                    case 233 /* SwitchStatement */:
+                        if (node.kind === 230 /* BreakStatement */ && !node.label) {
                             // unlabeled break within switch statement - ok
                             return false;
                         }
@@ -59795,13 +61902,13 @@ var ts;
                 current = current.parent;
             }
             if (node.label) {
-                var message = node.kind === 229 /* BreakStatement */
+                var message = node.kind === 230 /* BreakStatement */
                     ? ts.Diagnostics.A_break_statement_can_only_jump_to_a_label_of_an_enclosing_statement
                     : ts.Diagnostics.A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement;
                 return grammarErrorOnNode(node, message);
             }
             else {
-                var message = node.kind === 229 /* BreakStatement */
+                var message = node.kind === 230 /* BreakStatement */
                     ? ts.Diagnostics.A_break_statement_can_only_be_used_within_an_enclosing_iteration_or_switch_statement
                     : ts.Diagnostics.A_continue_statement_can_only_be_used_within_an_enclosing_iteration_statement;
                 return grammarErrorOnNode(node, message);
@@ -59825,12 +61932,12 @@ var ts;
         }
         function isStringOrNumberLiteralExpression(expr) {
             return expr.kind === 10 /* StringLiteral */ || expr.kind === 8 /* NumericLiteral */ ||
-                expr.kind === 202 /* PrefixUnaryExpression */ && expr.operator === 39 /* MinusToken */ &&
+                expr.kind === 203 /* PrefixUnaryExpression */ && expr.operator === 39 /* MinusToken */ &&
                     expr.operand.kind === 8 /* NumericLiteral */;
         }
         function isBigIntLiteralExpression(expr) {
             return expr.kind === 9 /* BigIntLiteral */ ||
-                expr.kind === 202 /* PrefixUnaryExpression */ && expr.operator === 39 /* MinusToken */ &&
+                expr.kind === 203 /* PrefixUnaryExpression */ && expr.operator === 39 /* MinusToken */ &&
                     expr.operand.kind === 9 /* BigIntLiteral */;
         }
         function isSimpleLiteralEnumReference(expr) {
@@ -59843,7 +61950,7 @@ var ts;
             if (initializer) {
                 var isInvalidInitializer = !(isStringOrNumberLiteralExpression(initializer) ||
                     isSimpleLiteralEnumReference(initializer) ||
-                    initializer.kind === 102 /* TrueKeyword */ || initializer.kind === 87 /* FalseKeyword */ ||
+                    initializer.kind === 103 /* TrueKeyword */ || initializer.kind === 88 /* FalseKeyword */ ||
                     isBigIntLiteralExpression(initializer));
                 var isConstOrReadonly = ts.isDeclarationReadonly(node) || ts.isVariableDeclaration(node) && ts.isVarConst(node);
                 if (isConstOrReadonly && !node.type) {
@@ -59860,7 +61967,7 @@ var ts;
             }
         }
         function checkGrammarVariableDeclaration(node) {
-            if (node.parent.parent.kind !== 226 /* ForInStatement */ && node.parent.parent.kind !== 227 /* ForOfStatement */) {
+            if (node.parent.parent.kind !== 227 /* ForInStatement */ && node.parent.parent.kind !== 228 /* ForOfStatement */) {
                 if (node.flags & 4194304 /* Ambient */) {
                     checkAmbientInitializer(node);
                 }
@@ -59873,8 +61980,8 @@ var ts;
                     }
                 }
             }
-            if (node.exclamationToken && (node.parent.parent.kind !== 219 /* VariableStatement */ || !node.type || node.initializer || node.flags & 4194304 /* Ambient */)) {
-                return grammarErrorOnNode(node.exclamationToken, ts.Diagnostics.A_definite_assignment_assertion_is_not_permitted_in_this_context);
+            if (node.exclamationToken && (node.parent.parent.kind !== 220 /* VariableStatement */ || !node.type || node.initializer || node.flags & 4194304 /* Ambient */)) {
+                return grammarErrorOnNode(node.exclamationToken, ts.Diagnostics.Definite_assignment_assertions_can_only_be_used_along_with_a_type_annotation);
             }
             if (compilerOptions.module !== ts.ModuleKind.ES2015 && compilerOptions.module !== ts.ModuleKind.ESNext && compilerOptions.module !== ts.ModuleKind.System && !compilerOptions.noEmit &&
                 !(node.parent.parent.flags & 4194304 /* Ambient */) && ts.hasModifier(node.parent.parent, 1 /* Export */)) {
@@ -59890,7 +61997,7 @@ var ts;
             return checkLetConstNames && checkGrammarNameInLetOrConstDeclarations(node.name);
         }
         function checkESModuleMarker(name) {
-            if (name.kind === 72 /* Identifier */) {
+            if (name.kind === 73 /* Identifier */) {
                 if (ts.idText(name) === "__esModule") {
                     return grammarErrorOnNode(name, ts.Diagnostics.Identifier_expected_esModule_is_reserved_as_an_exported_marker_when_transforming_ECMAScript_modules);
                 }
@@ -59907,8 +62014,8 @@ var ts;
             return false;
         }
         function checkGrammarNameInLetOrConstDeclarations(name) {
-            if (name.kind === 72 /* Identifier */) {
-                if (name.originalKeywordKind === 111 /* LetKeyword */) {
+            if (name.kind === 73 /* Identifier */) {
+                if (name.originalKeywordKind === 112 /* LetKeyword */) {
                     return grammarErrorOnNode(name, ts.Diagnostics.let_is_not_allowed_to_be_used_as_a_name_in_let_or_const_declarations);
                 }
             }
@@ -59935,15 +62042,15 @@ var ts;
         }
         function allowLetAndConstDeclarations(parent) {
             switch (parent.kind) {
-                case 222 /* IfStatement */:
-                case 223 /* DoStatement */:
-                case 224 /* WhileStatement */:
-                case 231 /* WithStatement */:
-                case 225 /* ForStatement */:
-                case 226 /* ForInStatement */:
-                case 227 /* ForOfStatement */:
+                case 223 /* IfStatement */:
+                case 224 /* DoStatement */:
+                case 225 /* WhileStatement */:
+                case 232 /* WithStatement */:
+                case 226 /* ForStatement */:
+                case 227 /* ForInStatement */:
+                case 228 /* ForOfStatement */:
                     return false;
-                case 233 /* LabeledStatement */:
+                case 234 /* LabeledStatement */:
                     return allowLetAndConstDeclarations(parent.parent);
             }
             return true;
@@ -59961,12 +62068,12 @@ var ts;
         function checkGrammarMetaProperty(node) {
             var escapedText = node.name.escapedText;
             switch (node.keywordToken) {
-                case 95 /* NewKeyword */:
+                case 96 /* NewKeyword */:
                     if (escapedText !== "target") {
                         return grammarErrorOnNode(node.name, ts.Diagnostics._0_is_not_a_valid_meta_property_for_keyword_1_Did_you_mean_2, node.name.escapedText, ts.tokenToString(node.keywordToken), "target");
                     }
                     break;
-                case 92 /* ImportKeyword */:
+                case 93 /* ImportKeyword */:
                     if (escapedText !== "meta") {
                         return grammarErrorOnNode(node.name, ts.Diagnostics._0_is_not_a_valid_meta_property_for_keyword_1_Did_you_mean_2, node.name.escapedText, ts.tokenToString(node.keywordToken), "meta");
                     }
@@ -60017,11 +62124,14 @@ var ts;
         }
         function checkGrammarProperty(node) {
             if (ts.isClassLike(node.parent)) {
+                if (ts.isStringLiteral(node.name) && node.name.text === "constructor") {
+                    return grammarErrorOnNode(node.name, ts.Diagnostics.Classes_may_not_have_a_field_named_constructor);
+                }
                 if (checkGrammarForInvalidDynamicName(node.name, ts.Diagnostics.A_computed_property_name_in_a_class_property_declaration_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type)) {
                     return true;
                 }
             }
-            else if (node.parent.kind === 241 /* InterfaceDeclaration */) {
+            else if (node.parent.kind === 242 /* InterfaceDeclaration */) {
                 if (checkGrammarForInvalidDynamicName(node.name, ts.Diagnostics.A_computed_property_name_in_an_interface_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type)) {
                     return true;
                 }
@@ -60029,7 +62139,7 @@ var ts;
                     return grammarErrorOnNode(node.initializer, ts.Diagnostics.An_interface_property_cannot_have_an_initializer);
                 }
             }
-            else if (node.parent.kind === 168 /* TypeLiteral */) {
+            else if (node.parent.kind === 169 /* TypeLiteral */) {
                 if (checkGrammarForInvalidDynamicName(node.name, ts.Diagnostics.A_computed_property_name_in_a_type_literal_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type)) {
                     return true;
                 }
@@ -60058,22 +62168,22 @@ var ts;
             //     export_opt   AmbientDeclaration
             //
             // TODO: The spec needs to be amended to reflect this grammar.
-            if (node.kind === 241 /* InterfaceDeclaration */ ||
-                node.kind === 242 /* TypeAliasDeclaration */ ||
-                node.kind === 249 /* ImportDeclaration */ ||
-                node.kind === 248 /* ImportEqualsDeclaration */ ||
-                node.kind === 255 /* ExportDeclaration */ ||
-                node.kind === 254 /* ExportAssignment */ ||
-                node.kind === 247 /* NamespaceExportDeclaration */ ||
+            if (node.kind === 242 /* InterfaceDeclaration */ ||
+                node.kind === 243 /* TypeAliasDeclaration */ ||
+                node.kind === 250 /* ImportDeclaration */ ||
+                node.kind === 249 /* ImportEqualsDeclaration */ ||
+                node.kind === 256 /* ExportDeclaration */ ||
+                node.kind === 255 /* ExportAssignment */ ||
+                node.kind === 248 /* NamespaceExportDeclaration */ ||
                 ts.hasModifier(node, 2 /* Ambient */ | 1 /* Export */ | 512 /* Default */)) {
                 return false;
             }
-            return grammarErrorOnFirstToken(node, ts.Diagnostics.A_declare_modifier_is_required_for_a_top_level_declaration_in_a_d_ts_file);
+            return grammarErrorOnFirstToken(node, ts.Diagnostics.Top_level_declarations_in_d_ts_files_must_start_with_either_a_declare_or_export_modifier);
         }
         function checkGrammarTopLevelElementsForRequiredDeclareModifier(file) {
             for (var _i = 0, _a = file.statements; _i < _a.length; _i++) {
                 var decl = _a[_i];
-                if (ts.isDeclaration(decl) || decl.kind === 219 /* VariableStatement */) {
+                if (ts.isDeclaration(decl) || decl.kind === 220 /* VariableStatement */) {
                     if (checkGrammarTopLevelElementForRequiredDeclareModifier(decl)) {
                         return true;
                     }
@@ -60100,11 +62210,11 @@ var ts;
                 // to prevent noisiness.  So use a bit on the block to indicate if
                 // this has already been reported, and don't report if it has.
                 //
-                if (node.parent.kind === 218 /* Block */ || node.parent.kind === 245 /* ModuleBlock */ || node.parent.kind === 284 /* SourceFile */) {
-                    var links_2 = getNodeLinks(node.parent);
+                if (node.parent.kind === 219 /* Block */ || node.parent.kind === 246 /* ModuleBlock */ || node.parent.kind === 285 /* SourceFile */) {
+                    var links_1 = getNodeLinks(node.parent);
                     // Check if the containing block ever report this error
-                    if (!links_2.hasReportedStatementInAmbientContext) {
-                        return links_2.hasReportedStatementInAmbientContext = grammarErrorOnFirstToken(node, ts.Diagnostics.Statements_are_not_allowed_in_ambient_contexts);
+                    if (!links_1.hasReportedStatementInAmbientContext) {
+                        return links_1.hasReportedStatementInAmbientContext = grammarErrorOnFirstToken(node, ts.Diagnostics.Statements_are_not_allowed_in_ambient_contexts);
                     }
                 }
                 else {
@@ -60122,10 +62232,10 @@ var ts;
                 if (languageVersion >= 1 /* ES5 */) {
                     diagnosticMessage = ts.Diagnostics.Octal_literals_are_not_available_when_targeting_ECMAScript_5_and_higher_Use_the_syntax_0;
                 }
-                else if (ts.isChildOfNodeWithKind(node, 182 /* LiteralType */)) {
+                else if (ts.isChildOfNodeWithKind(node, 183 /* LiteralType */)) {
                     diagnosticMessage = ts.Diagnostics.Octal_literal_types_must_use_ES2015_syntax_Use_the_syntax_0;
                 }
-                else if (ts.isChildOfNodeWithKind(node, 278 /* EnumMember */)) {
+                else if (ts.isChildOfNodeWithKind(node, 279 /* EnumMember */)) {
                     diagnosticMessage = ts.Diagnostics.Octal_literals_are_not_allowed_in_enums_members_initializer_Use_the_syntax_0;
                 }
                 if (diagnosticMessage) {
@@ -60140,7 +62250,7 @@ var ts;
             var literalType = ts.isLiteralTypeNode(node.parent) ||
                 ts.isPrefixUnaryExpression(node.parent) && ts.isLiteralTypeNode(node.parent.parent);
             if (!literalType) {
-                if (languageVersion < 7 /* ESNext */) {
+                if (languageVersion < 99 /* ESNext */) {
                     if (grammarErrorOnNode(node, ts.Diagnostics.BigInt_literals_are_not_available_when_targeting_lower_than_ESNext)) {
                         return true;
                     }
@@ -60193,8 +62303,8 @@ var ts;
     /** Like 'isDeclarationName', but returns true for LHS of `import { x as y }` or `export { x as y }`. */
     function isDeclarationNameOrImportPropertyName(name) {
         switch (name.parent.kind) {
-            case 253 /* ImportSpecifier */:
-            case 257 /* ExportSpecifier */:
+            case 254 /* ImportSpecifier */:
+            case 258 /* ExportSpecifier */:
                 return ts.isIdentifier(name);
             default:
                 return ts.isDeclarationName(name);
@@ -60202,14 +62312,14 @@ var ts;
     }
     function isSomeImportDeclaration(decl) {
         switch (decl.kind) {
-            case 250 /* ImportClause */: // For default import
-            case 248 /* ImportEqualsDeclaration */:
-            case 251 /* NamespaceImport */:
-            case 253 /* ImportSpecifier */: // For rename import `x as y`
+            case 251 /* ImportClause */: // For default import
+            case 249 /* ImportEqualsDeclaration */:
+            case 252 /* NamespaceImport */:
+            case 254 /* ImportSpecifier */: // For rename import `x as y`
                 return true;
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 // For regular import, `decl` is an Identifier under the ImportSpecifier.
-                return decl.parent.kind === 253 /* ImportSpecifier */;
+                return decl.parent.kind === 254 /* ImportSpecifier */;
             default:
                 return false;
         }
@@ -60228,6 +62338,13 @@ var ts;
         JsxNames.LibraryManagedAttributes = "LibraryManagedAttributes";
         // tslint:enable variable-name
     })(JsxNames || (JsxNames = {}));
+    function getIterationTypesKeyFromIterationTypeKind(typeKind) {
+        switch (typeKind) {
+            case 0 /* Yield */: return "yieldType";
+            case 1 /* Return */: return "returnType";
+            case 2 /* Next */: return "nextType";
+        }
+    }
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
@@ -60337,7 +62454,7 @@ var ts;
         return node;
     }
     function createIdentifier(text, typeArguments) {
-        var node = createSynthesizedNode(72 /* Identifier */);
+        var node = createSynthesizedNode(73 /* Identifier */);
         node.escapedText = ts.escapeLeadingUnderscores(text);
         node.originalKeywordKind = text ? ts.stringToToken(text) : 0 /* Unknown */;
         node.autoGenerateFlags = 0 /* None */;
@@ -60418,23 +62535,23 @@ var ts;
     ts.createToken = createToken;
     // Reserved words
     function createSuper() {
-        return createSynthesizedNode(98 /* SuperKeyword */);
+        return createSynthesizedNode(99 /* SuperKeyword */);
     }
     ts.createSuper = createSuper;
     function createThis() {
-        return createSynthesizedNode(100 /* ThisKeyword */);
+        return createSynthesizedNode(101 /* ThisKeyword */);
     }
     ts.createThis = createThis;
     function createNull() {
-        return createSynthesizedNode(96 /* NullKeyword */);
+        return createSynthesizedNode(97 /* NullKeyword */);
     }
     ts.createNull = createNull;
     function createTrue() {
-        return createSynthesizedNode(102 /* TrueKeyword */);
+        return createSynthesizedNode(103 /* TrueKeyword */);
     }
     ts.createTrue = createTrue;
     function createFalse() {
-        return createSynthesizedNode(87 /* FalseKeyword */);
+        return createSynthesizedNode(88 /* FalseKeyword */);
     }
     ts.createFalse = createFalse;
     // Modifiers
@@ -60445,44 +62562,44 @@ var ts;
     function createModifiersFromModifierFlags(flags) {
         var result = [];
         if (flags & 1 /* Export */) {
-            result.push(createModifier(85 /* ExportKeyword */));
+            result.push(createModifier(86 /* ExportKeyword */));
         }
         if (flags & 2 /* Ambient */) {
-            result.push(createModifier(125 /* DeclareKeyword */));
+            result.push(createModifier(126 /* DeclareKeyword */));
         }
         if (flags & 512 /* Default */) {
-            result.push(createModifier(80 /* DefaultKeyword */));
+            result.push(createModifier(81 /* DefaultKeyword */));
         }
         if (flags & 2048 /* Const */) {
-            result.push(createModifier(77 /* ConstKeyword */));
+            result.push(createModifier(78 /* ConstKeyword */));
         }
         if (flags & 4 /* Public */) {
-            result.push(createModifier(115 /* PublicKeyword */));
+            result.push(createModifier(116 /* PublicKeyword */));
         }
         if (flags & 8 /* Private */) {
-            result.push(createModifier(113 /* PrivateKeyword */));
+            result.push(createModifier(114 /* PrivateKeyword */));
         }
         if (flags & 16 /* Protected */) {
-            result.push(createModifier(114 /* ProtectedKeyword */));
+            result.push(createModifier(115 /* ProtectedKeyword */));
         }
         if (flags & 128 /* Abstract */) {
-            result.push(createModifier(118 /* AbstractKeyword */));
+            result.push(createModifier(119 /* AbstractKeyword */));
         }
         if (flags & 32 /* Static */) {
-            result.push(createModifier(116 /* StaticKeyword */));
+            result.push(createModifier(117 /* StaticKeyword */));
         }
         if (flags & 64 /* Readonly */) {
-            result.push(createModifier(133 /* ReadonlyKeyword */));
+            result.push(createModifier(134 /* ReadonlyKeyword */));
         }
         if (flags & 256 /* Async */) {
-            result.push(createModifier(121 /* AsyncKeyword */));
+            result.push(createModifier(122 /* AsyncKeyword */));
         }
         return result;
     }
     ts.createModifiersFromModifierFlags = createModifiersFromModifierFlags;
     // Names
     function createQualifiedName(left, right) {
-        var node = createSynthesizedNode(148 /* QualifiedName */);
+        var node = createSynthesizedNode(149 /* QualifiedName */);
         node.left = left;
         node.right = asName(right);
         return node;
@@ -60501,7 +62618,7 @@ var ts;
             : expression;
     }
     function createComputedPropertyName(expression) {
-        var node = createSynthesizedNode(149 /* ComputedPropertyName */);
+        var node = createSynthesizedNode(150 /* ComputedPropertyName */);
         node.expression = parenthesizeForComputedName(expression);
         return node;
     }
@@ -60514,7 +62631,7 @@ var ts;
     ts.updateComputedPropertyName = updateComputedPropertyName;
     // Signature elements
     function createTypeParameterDeclaration(name, constraint, defaultType) {
-        var node = createSynthesizedNode(150 /* TypeParameter */);
+        var node = createSynthesizedNode(151 /* TypeParameter */);
         node.name = asName(name);
         node.constraint = constraint;
         node.default = defaultType;
@@ -60530,7 +62647,7 @@ var ts;
     }
     ts.updateTypeParameterDeclaration = updateTypeParameterDeclaration;
     function createParameter(decorators, modifiers, dotDotDotToken, name, questionToken, type, initializer) {
-        var node = createSynthesizedNode(151 /* Parameter */);
+        var node = createSynthesizedNode(152 /* Parameter */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.dotDotDotToken = dotDotDotToken;
@@ -60554,7 +62671,7 @@ var ts;
     }
     ts.updateParameter = updateParameter;
     function createDecorator(expression) {
-        var node = createSynthesizedNode(152 /* Decorator */);
+        var node = createSynthesizedNode(153 /* Decorator */);
         node.expression = ts.parenthesizeForAccess(expression);
         return node;
     }
@@ -60567,7 +62684,7 @@ var ts;
     ts.updateDecorator = updateDecorator;
     // Type Elements
     function createPropertySignature(modifiers, name, questionToken, type, initializer) {
-        var node = createSynthesizedNode(153 /* PropertySignature */);
+        var node = createSynthesizedNode(154 /* PropertySignature */);
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
         node.questionToken = questionToken;
@@ -60587,7 +62704,7 @@ var ts;
     }
     ts.updatePropertySignature = updatePropertySignature;
     function createProperty(decorators, modifiers, name, questionOrExclamationToken, type, initializer) {
-        var node = createSynthesizedNode(154 /* PropertyDeclaration */);
+        var node = createSynthesizedNode(155 /* PropertyDeclaration */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
@@ -60611,7 +62728,7 @@ var ts;
     }
     ts.updateProperty = updateProperty;
     function createMethodSignature(typeParameters, parameters, type, name, questionToken) {
-        var node = createSignatureDeclaration(155 /* MethodSignature */, typeParameters, parameters, type);
+        var node = createSignatureDeclaration(156 /* MethodSignature */, typeParameters, parameters, type);
         node.name = asName(name);
         node.questionToken = questionToken;
         return node;
@@ -60628,7 +62745,7 @@ var ts;
     }
     ts.updateMethodSignature = updateMethodSignature;
     function createMethod(decorators, modifiers, asteriskToken, name, questionToken, typeParameters, parameters, type, body) {
-        var node = createSynthesizedNode(156 /* MethodDeclaration */);
+        var node = createSynthesizedNode(157 /* MethodDeclaration */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.asteriskToken = asteriskToken;
@@ -60656,7 +62773,7 @@ var ts;
     }
     ts.updateMethod = updateMethod;
     function createConstructor(decorators, modifiers, parameters, body) {
-        var node = createSynthesizedNode(157 /* Constructor */);
+        var node = createSynthesizedNode(158 /* Constructor */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.typeParameters = undefined;
@@ -60676,7 +62793,7 @@ var ts;
     }
     ts.updateConstructor = updateConstructor;
     function createGetAccessor(decorators, modifiers, name, parameters, type, body) {
-        var node = createSynthesizedNode(158 /* GetAccessor */);
+        var node = createSynthesizedNode(159 /* GetAccessor */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
@@ -60699,7 +62816,7 @@ var ts;
     }
     ts.updateGetAccessor = updateGetAccessor;
     function createSetAccessor(decorators, modifiers, name, parameters, body) {
-        var node = createSynthesizedNode(159 /* SetAccessor */);
+        var node = createSynthesizedNode(160 /* SetAccessor */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
@@ -60720,7 +62837,7 @@ var ts;
     }
     ts.updateSetAccessor = updateSetAccessor;
     function createCallSignature(typeParameters, parameters, type) {
-        return createSignatureDeclaration(160 /* CallSignature */, typeParameters, parameters, type);
+        return createSignatureDeclaration(161 /* CallSignature */, typeParameters, parameters, type);
     }
     ts.createCallSignature = createCallSignature;
     function updateCallSignature(node, typeParameters, parameters, type) {
@@ -60728,7 +62845,7 @@ var ts;
     }
     ts.updateCallSignature = updateCallSignature;
     function createConstructSignature(typeParameters, parameters, type) {
-        return createSignatureDeclaration(161 /* ConstructSignature */, typeParameters, parameters, type);
+        return createSignatureDeclaration(162 /* ConstructSignature */, typeParameters, parameters, type);
     }
     ts.createConstructSignature = createConstructSignature;
     function updateConstructSignature(node, typeParameters, parameters, type) {
@@ -60736,7 +62853,7 @@ var ts;
     }
     ts.updateConstructSignature = updateConstructSignature;
     function createIndexSignature(decorators, modifiers, parameters, type) {
-        var node = createSynthesizedNode(162 /* IndexSignature */);
+        var node = createSynthesizedNode(163 /* IndexSignature */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.parameters = createNodeArray(parameters);
@@ -60776,7 +62893,7 @@ var ts;
     }
     ts.createKeywordTypeNode = createKeywordTypeNode;
     function createTypePredicateNode(parameterName, type) {
-        var node = createSynthesizedNode(163 /* TypePredicate */);
+        var node = createSynthesizedNode(164 /* TypePredicate */);
         node.parameterName = asName(parameterName);
         node.type = type;
         return node;
@@ -60790,7 +62907,7 @@ var ts;
     }
     ts.updateTypePredicateNode = updateTypePredicateNode;
     function createTypeReferenceNode(typeName, typeArguments) {
-        var node = createSynthesizedNode(164 /* TypeReference */);
+        var node = createSynthesizedNode(165 /* TypeReference */);
         node.typeName = asName(typeName);
         node.typeArguments = typeArguments && ts.parenthesizeTypeParameters(typeArguments);
         return node;
@@ -60804,7 +62921,7 @@ var ts;
     }
     ts.updateTypeReferenceNode = updateTypeReferenceNode;
     function createFunctionTypeNode(typeParameters, parameters, type) {
-        return createSignatureDeclaration(165 /* FunctionType */, typeParameters, parameters, type);
+        return createSignatureDeclaration(166 /* FunctionType */, typeParameters, parameters, type);
     }
     ts.createFunctionTypeNode = createFunctionTypeNode;
     function updateFunctionTypeNode(node, typeParameters, parameters, type) {
@@ -60812,7 +62929,7 @@ var ts;
     }
     ts.updateFunctionTypeNode = updateFunctionTypeNode;
     function createConstructorTypeNode(typeParameters, parameters, type) {
-        return createSignatureDeclaration(166 /* ConstructorType */, typeParameters, parameters, type);
+        return createSignatureDeclaration(167 /* ConstructorType */, typeParameters, parameters, type);
     }
     ts.createConstructorTypeNode = createConstructorTypeNode;
     function updateConstructorTypeNode(node, typeParameters, parameters, type) {
@@ -60820,7 +62937,7 @@ var ts;
     }
     ts.updateConstructorTypeNode = updateConstructorTypeNode;
     function createTypeQueryNode(exprName) {
-        var node = createSynthesizedNode(167 /* TypeQuery */);
+        var node = createSynthesizedNode(168 /* TypeQuery */);
         node.exprName = exprName;
         return node;
     }
@@ -60832,7 +62949,7 @@ var ts;
     }
     ts.updateTypeQueryNode = updateTypeQueryNode;
     function createTypeLiteralNode(members) {
-        var node = createSynthesizedNode(168 /* TypeLiteral */);
+        var node = createSynthesizedNode(169 /* TypeLiteral */);
         node.members = createNodeArray(members);
         return node;
     }
@@ -60844,7 +62961,7 @@ var ts;
     }
     ts.updateTypeLiteralNode = updateTypeLiteralNode;
     function createArrayTypeNode(elementType) {
-        var node = createSynthesizedNode(169 /* ArrayType */);
+        var node = createSynthesizedNode(170 /* ArrayType */);
         node.elementType = ts.parenthesizeArrayTypeMember(elementType);
         return node;
     }
@@ -60856,7 +62973,7 @@ var ts;
     }
     ts.updateArrayTypeNode = updateArrayTypeNode;
     function createTupleTypeNode(elementTypes) {
-        var node = createSynthesizedNode(170 /* TupleType */);
+        var node = createSynthesizedNode(171 /* TupleType */);
         node.elementTypes = createNodeArray(elementTypes);
         return node;
     }
@@ -60868,7 +62985,7 @@ var ts;
     }
     ts.updateTupleTypeNode = updateTupleTypeNode;
     function createOptionalTypeNode(type) {
-        var node = createSynthesizedNode(171 /* OptionalType */);
+        var node = createSynthesizedNode(172 /* OptionalType */);
         node.type = ts.parenthesizeArrayTypeMember(type);
         return node;
     }
@@ -60880,7 +62997,7 @@ var ts;
     }
     ts.updateOptionalTypeNode = updateOptionalTypeNode;
     function createRestTypeNode(type) {
-        var node = createSynthesizedNode(172 /* RestType */);
+        var node = createSynthesizedNode(173 /* RestType */);
         node.type = type;
         return node;
     }
@@ -60892,7 +63009,7 @@ var ts;
     }
     ts.updateRestTypeNode = updateRestTypeNode;
     function createUnionTypeNode(types) {
-        return createUnionOrIntersectionTypeNode(173 /* UnionType */, types);
+        return createUnionOrIntersectionTypeNode(174 /* UnionType */, types);
     }
     ts.createUnionTypeNode = createUnionTypeNode;
     function updateUnionTypeNode(node, types) {
@@ -60900,7 +63017,7 @@ var ts;
     }
     ts.updateUnionTypeNode = updateUnionTypeNode;
     function createIntersectionTypeNode(types) {
-        return createUnionOrIntersectionTypeNode(174 /* IntersectionType */, types);
+        return createUnionOrIntersectionTypeNode(175 /* IntersectionType */, types);
     }
     ts.createIntersectionTypeNode = createIntersectionTypeNode;
     function updateIntersectionTypeNode(node, types) {
@@ -60919,7 +63036,7 @@ var ts;
             : node;
     }
     function createConditionalTypeNode(checkType, extendsType, trueType, falseType) {
-        var node = createSynthesizedNode(175 /* ConditionalType */);
+        var node = createSynthesizedNode(176 /* ConditionalType */);
         node.checkType = ts.parenthesizeConditionalTypeMember(checkType);
         node.extendsType = ts.parenthesizeConditionalTypeMember(extendsType);
         node.trueType = trueType;
@@ -60937,7 +63054,7 @@ var ts;
     }
     ts.updateConditionalTypeNode = updateConditionalTypeNode;
     function createInferTypeNode(typeParameter) {
-        var node = createSynthesizedNode(176 /* InferType */);
+        var node = createSynthesizedNode(177 /* InferType */);
         node.typeParameter = typeParameter;
         return node;
     }
@@ -60949,10 +63066,10 @@ var ts;
     }
     ts.updateInferTypeNode = updateInferTypeNode;
     function createImportTypeNode(argument, qualifier, typeArguments, isTypeOf) {
-        var node = createSynthesizedNode(183 /* ImportType */);
+        var node = createSynthesizedNode(184 /* ImportType */);
         node.argument = argument;
         node.qualifier = qualifier;
-        node.typeArguments = asNodeArray(typeArguments);
+        node.typeArguments = ts.parenthesizeTypeParameters(typeArguments);
         node.isTypeOf = isTypeOf;
         return node;
     }
@@ -60967,7 +63084,7 @@ var ts;
     }
     ts.updateImportTypeNode = updateImportTypeNode;
     function createParenthesizedType(type) {
-        var node = createSynthesizedNode(177 /* ParenthesizedType */);
+        var node = createSynthesizedNode(178 /* ParenthesizedType */);
         node.type = type;
         return node;
     }
@@ -60979,12 +63096,12 @@ var ts;
     }
     ts.updateParenthesizedType = updateParenthesizedType;
     function createThisTypeNode() {
-        return createSynthesizedNode(178 /* ThisType */);
+        return createSynthesizedNode(179 /* ThisType */);
     }
     ts.createThisTypeNode = createThisTypeNode;
     function createTypeOperatorNode(operatorOrType, type) {
-        var node = createSynthesizedNode(179 /* TypeOperator */);
-        node.operator = typeof operatorOrType === "number" ? operatorOrType : 129 /* KeyOfKeyword */;
+        var node = createSynthesizedNode(180 /* TypeOperator */);
+        node.operator = typeof operatorOrType === "number" ? operatorOrType : 130 /* KeyOfKeyword */;
         node.type = ts.parenthesizeElementTypeMember(typeof operatorOrType === "number" ? type : operatorOrType);
         return node;
     }
@@ -60994,7 +63111,7 @@ var ts;
     }
     ts.updateTypeOperatorNode = updateTypeOperatorNode;
     function createIndexedAccessTypeNode(objectType, indexType) {
-        var node = createSynthesizedNode(180 /* IndexedAccessType */);
+        var node = createSynthesizedNode(181 /* IndexedAccessType */);
         node.objectType = ts.parenthesizeElementTypeMember(objectType);
         node.indexType = indexType;
         return node;
@@ -61008,7 +63125,7 @@ var ts;
     }
     ts.updateIndexedAccessTypeNode = updateIndexedAccessTypeNode;
     function createMappedTypeNode(readonlyToken, typeParameter, questionToken, type) {
-        var node = createSynthesizedNode(181 /* MappedType */);
+        var node = createSynthesizedNode(182 /* MappedType */);
         node.readonlyToken = readonlyToken;
         node.typeParameter = typeParameter;
         node.questionToken = questionToken;
@@ -61026,7 +63143,7 @@ var ts;
     }
     ts.updateMappedTypeNode = updateMappedTypeNode;
     function createLiteralTypeNode(literal) {
-        var node = createSynthesizedNode(182 /* LiteralType */);
+        var node = createSynthesizedNode(183 /* LiteralType */);
         node.literal = literal;
         return node;
     }
@@ -61039,7 +63156,7 @@ var ts;
     ts.updateLiteralTypeNode = updateLiteralTypeNode;
     // Binding Patterns
     function createObjectBindingPattern(elements) {
-        var node = createSynthesizedNode(184 /* ObjectBindingPattern */);
+        var node = createSynthesizedNode(185 /* ObjectBindingPattern */);
         node.elements = createNodeArray(elements);
         return node;
     }
@@ -61051,7 +63168,7 @@ var ts;
     }
     ts.updateObjectBindingPattern = updateObjectBindingPattern;
     function createArrayBindingPattern(elements) {
-        var node = createSynthesizedNode(185 /* ArrayBindingPattern */);
+        var node = createSynthesizedNode(186 /* ArrayBindingPattern */);
         node.elements = createNodeArray(elements);
         return node;
     }
@@ -61063,7 +63180,7 @@ var ts;
     }
     ts.updateArrayBindingPattern = updateArrayBindingPattern;
     function createBindingElement(dotDotDotToken, propertyName, name, initializer) {
-        var node = createSynthesizedNode(186 /* BindingElement */);
+        var node = createSynthesizedNode(187 /* BindingElement */);
         node.dotDotDotToken = dotDotDotToken;
         node.propertyName = asName(propertyName);
         node.name = asName(name);
@@ -61082,7 +63199,7 @@ var ts;
     ts.updateBindingElement = updateBindingElement;
     // Expression
     function createArrayLiteral(elements, multiLine) {
-        var node = createSynthesizedNode(187 /* ArrayLiteralExpression */);
+        var node = createSynthesizedNode(188 /* ArrayLiteralExpression */);
         node.elements = ts.parenthesizeListElements(createNodeArray(elements));
         if (multiLine)
             node.multiLine = true;
@@ -61096,7 +63213,7 @@ var ts;
     }
     ts.updateArrayLiteral = updateArrayLiteral;
     function createObjectLiteral(properties, multiLine) {
-        var node = createSynthesizedNode(188 /* ObjectLiteralExpression */);
+        var node = createSynthesizedNode(189 /* ObjectLiteralExpression */);
         node.properties = createNodeArray(properties);
         if (multiLine)
             node.multiLine = true;
@@ -61110,9 +63227,9 @@ var ts;
     }
     ts.updateObjectLiteral = updateObjectLiteral;
     function createPropertyAccess(expression, name) {
-        var node = createSynthesizedNode(189 /* PropertyAccessExpression */);
+        var node = createSynthesizedNode(190 /* PropertyAccessExpression */);
         node.expression = ts.parenthesizeForAccess(expression);
-        node.name = asName(name); // TODO: GH#18217
+        node.name = asName(name);
         setEmitFlags(node, 131072 /* NoIndentation */);
         return node;
     }
@@ -61127,7 +63244,7 @@ var ts;
     }
     ts.updatePropertyAccess = updatePropertyAccess;
     function createElementAccess(expression, index) {
-        var node = createSynthesizedNode(190 /* ElementAccessExpression */);
+        var node = createSynthesizedNode(191 /* ElementAccessExpression */);
         node.expression = ts.parenthesizeForAccess(expression);
         node.argumentExpression = asExpression(index);
         return node;
@@ -61141,7 +63258,7 @@ var ts;
     }
     ts.updateElementAccess = updateElementAccess;
     function createCall(expression, typeArguments, argumentsArray) {
-        var node = createSynthesizedNode(191 /* CallExpression */);
+        var node = createSynthesizedNode(192 /* CallExpression */);
         node.expression = ts.parenthesizeForAccess(expression);
         node.typeArguments = asNodeArray(typeArguments);
         node.arguments = ts.parenthesizeListElements(createNodeArray(argumentsArray));
@@ -61157,7 +63274,7 @@ var ts;
     }
     ts.updateCall = updateCall;
     function createNew(expression, typeArguments, argumentsArray) {
-        var node = createSynthesizedNode(192 /* NewExpression */);
+        var node = createSynthesizedNode(193 /* NewExpression */);
         node.expression = ts.parenthesizeForNew(expression);
         node.typeArguments = asNodeArray(typeArguments);
         node.arguments = argumentsArray ? ts.parenthesizeListElements(createNodeArray(argumentsArray)) : undefined;
@@ -61173,7 +63290,7 @@ var ts;
     }
     ts.updateNew = updateNew;
     function createTaggedTemplate(tag, typeArgumentsOrTemplate, template) {
-        var node = createSynthesizedNode(193 /* TaggedTemplateExpression */);
+        var node = createSynthesizedNode(194 /* TaggedTemplateExpression */);
         node.tag = ts.parenthesizeForAccess(tag);
         if (template) {
             node.typeArguments = asNodeArray(typeArgumentsOrTemplate);
@@ -61196,7 +63313,7 @@ var ts;
     }
     ts.updateTaggedTemplate = updateTaggedTemplate;
     function createTypeAssertion(type, expression) {
-        var node = createSynthesizedNode(194 /* TypeAssertionExpression */);
+        var node = createSynthesizedNode(195 /* TypeAssertionExpression */);
         node.type = type;
         node.expression = ts.parenthesizePrefixOperand(expression);
         return node;
@@ -61210,7 +63327,7 @@ var ts;
     }
     ts.updateTypeAssertion = updateTypeAssertion;
     function createParen(expression) {
-        var node = createSynthesizedNode(195 /* ParenthesizedExpression */);
+        var node = createSynthesizedNode(196 /* ParenthesizedExpression */);
         node.expression = expression;
         return node;
     }
@@ -61222,7 +63339,7 @@ var ts;
     }
     ts.updateParen = updateParen;
     function createFunctionExpression(modifiers, asteriskToken, name, typeParameters, parameters, type, body) {
-        var node = createSynthesizedNode(196 /* FunctionExpression */);
+        var node = createSynthesizedNode(197 /* FunctionExpression */);
         node.modifiers = asNodeArray(modifiers);
         node.asteriskToken = asteriskToken;
         node.name = asName(name);
@@ -61246,7 +63363,7 @@ var ts;
     }
     ts.updateFunctionExpression = updateFunctionExpression;
     function createArrowFunction(modifiers, typeParameters, parameters, type, equalsGreaterThanToken, body) {
-        var node = createSynthesizedNode(197 /* ArrowFunction */);
+        var node = createSynthesizedNode(198 /* ArrowFunction */);
         node.modifiers = asNodeArray(modifiers);
         node.typeParameters = asNodeArray(typeParameters);
         node.parameters = createNodeArray(parameters);
@@ -61268,7 +63385,7 @@ var ts;
     }
     ts.updateArrowFunction = updateArrowFunction;
     function createDelete(expression) {
-        var node = createSynthesizedNode(198 /* DeleteExpression */);
+        var node = createSynthesizedNode(199 /* DeleteExpression */);
         node.expression = ts.parenthesizePrefixOperand(expression);
         return node;
     }
@@ -61280,7 +63397,7 @@ var ts;
     }
     ts.updateDelete = updateDelete;
     function createTypeOf(expression) {
-        var node = createSynthesizedNode(199 /* TypeOfExpression */);
+        var node = createSynthesizedNode(200 /* TypeOfExpression */);
         node.expression = ts.parenthesizePrefixOperand(expression);
         return node;
     }
@@ -61292,7 +63409,7 @@ var ts;
     }
     ts.updateTypeOf = updateTypeOf;
     function createVoid(expression) {
-        var node = createSynthesizedNode(200 /* VoidExpression */);
+        var node = createSynthesizedNode(201 /* VoidExpression */);
         node.expression = ts.parenthesizePrefixOperand(expression);
         return node;
     }
@@ -61304,7 +63421,7 @@ var ts;
     }
     ts.updateVoid = updateVoid;
     function createAwait(expression) {
-        var node = createSynthesizedNode(201 /* AwaitExpression */);
+        var node = createSynthesizedNode(202 /* AwaitExpression */);
         node.expression = ts.parenthesizePrefixOperand(expression);
         return node;
     }
@@ -61316,7 +63433,7 @@ var ts;
     }
     ts.updateAwait = updateAwait;
     function createPrefix(operator, operand) {
-        var node = createSynthesizedNode(202 /* PrefixUnaryExpression */);
+        var node = createSynthesizedNode(203 /* PrefixUnaryExpression */);
         node.operator = operator;
         node.operand = ts.parenthesizePrefixOperand(operand);
         return node;
@@ -61329,7 +63446,7 @@ var ts;
     }
     ts.updatePrefix = updatePrefix;
     function createPostfix(operand, operator) {
-        var node = createSynthesizedNode(203 /* PostfixUnaryExpression */);
+        var node = createSynthesizedNode(204 /* PostfixUnaryExpression */);
         node.operand = ts.parenthesizePostfixOperand(operand);
         node.operator = operator;
         return node;
@@ -61342,7 +63459,7 @@ var ts;
     }
     ts.updatePostfix = updatePostfix;
     function createBinary(left, operator, right) {
-        var node = createSynthesizedNode(204 /* BinaryExpression */);
+        var node = createSynthesizedNode(205 /* BinaryExpression */);
         var operatorToken = asToken(operator);
         var operatorKind = operatorToken.kind;
         node.left = ts.parenthesizeBinaryOperand(operatorKind, left, /*isLeftSideOfBinary*/ true, /*leftOperand*/ undefined);
@@ -61359,7 +63476,7 @@ var ts;
     }
     ts.updateBinary = updateBinary;
     function createConditional(condition, questionTokenOrWhenTrue, whenTrueOrWhenFalse, colonToken, whenFalse) {
-        var node = createSynthesizedNode(205 /* ConditionalExpression */);
+        var node = createSynthesizedNode(206 /* ConditionalExpression */);
         node.condition = ts.parenthesizeForConditionalHead(condition);
         node.questionToken = whenFalse ? questionTokenOrWhenTrue : createToken(56 /* QuestionToken */);
         node.whenTrue = ts.parenthesizeSubexpressionOfConditionalExpression(whenFalse ? whenTrueOrWhenFalse : questionTokenOrWhenTrue);
@@ -61379,7 +63496,7 @@ var ts;
     }
     ts.updateConditional = updateConditional;
     function createTemplateExpression(head, templateSpans) {
-        var node = createSynthesizedNode(206 /* TemplateExpression */);
+        var node = createSynthesizedNode(207 /* TemplateExpression */);
         node.head = head;
         node.templateSpans = createNodeArray(templateSpans);
         return node;
@@ -61417,7 +63534,7 @@ var ts;
     }
     ts.createNoSubstitutionTemplateLiteral = createNoSubstitutionTemplateLiteral;
     function createYield(asteriskTokenOrExpression, expression) {
-        var node = createSynthesizedNode(207 /* YieldExpression */);
+        var node = createSynthesizedNode(208 /* YieldExpression */);
         node.asteriskToken = asteriskTokenOrExpression && asteriskTokenOrExpression.kind === 40 /* AsteriskToken */ ? asteriskTokenOrExpression : undefined;
         node.expression = asteriskTokenOrExpression && asteriskTokenOrExpression.kind !== 40 /* AsteriskToken */ ? asteriskTokenOrExpression : expression;
         return node;
@@ -61431,7 +63548,7 @@ var ts;
     }
     ts.updateYield = updateYield;
     function createSpread(expression) {
-        var node = createSynthesizedNode(208 /* SpreadElement */);
+        var node = createSynthesizedNode(209 /* SpreadElement */);
         node.expression = ts.parenthesizeExpressionForList(expression);
         return node;
     }
@@ -61443,7 +63560,7 @@ var ts;
     }
     ts.updateSpread = updateSpread;
     function createClassExpression(modifiers, name, typeParameters, heritageClauses, members) {
-        var node = createSynthesizedNode(209 /* ClassExpression */);
+        var node = createSynthesizedNode(210 /* ClassExpression */);
         node.decorators = undefined;
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
@@ -61464,11 +63581,11 @@ var ts;
     }
     ts.updateClassExpression = updateClassExpression;
     function createOmittedExpression() {
-        return createSynthesizedNode(210 /* OmittedExpression */);
+        return createSynthesizedNode(211 /* OmittedExpression */);
     }
     ts.createOmittedExpression = createOmittedExpression;
     function createExpressionWithTypeArguments(typeArguments, expression) {
-        var node = createSynthesizedNode(211 /* ExpressionWithTypeArguments */);
+        var node = createSynthesizedNode(212 /* ExpressionWithTypeArguments */);
         node.expression = ts.parenthesizeForAccess(expression);
         node.typeArguments = asNodeArray(typeArguments);
         return node;
@@ -61482,7 +63599,7 @@ var ts;
     }
     ts.updateExpressionWithTypeArguments = updateExpressionWithTypeArguments;
     function createAsExpression(expression, type) {
-        var node = createSynthesizedNode(212 /* AsExpression */);
+        var node = createSynthesizedNode(213 /* AsExpression */);
         node.expression = expression;
         node.type = type;
         return node;
@@ -61496,7 +63613,7 @@ var ts;
     }
     ts.updateAsExpression = updateAsExpression;
     function createNonNullExpression(expression) {
-        var node = createSynthesizedNode(213 /* NonNullExpression */);
+        var node = createSynthesizedNode(214 /* NonNullExpression */);
         node.expression = ts.parenthesizeForAccess(expression);
         return node;
     }
@@ -61508,7 +63625,7 @@ var ts;
     }
     ts.updateNonNullExpression = updateNonNullExpression;
     function createMetaProperty(keywordToken, name) {
-        var node = createSynthesizedNode(214 /* MetaProperty */);
+        var node = createSynthesizedNode(215 /* MetaProperty */);
         node.keywordToken = keywordToken;
         node.name = name;
         return node;
@@ -61522,7 +63639,7 @@ var ts;
     ts.updateMetaProperty = updateMetaProperty;
     // Misc
     function createTemplateSpan(expression, literal) {
-        var node = createSynthesizedNode(216 /* TemplateSpan */);
+        var node = createSynthesizedNode(217 /* TemplateSpan */);
         node.expression = expression;
         node.literal = literal;
         return node;
@@ -61536,12 +63653,12 @@ var ts;
     }
     ts.updateTemplateSpan = updateTemplateSpan;
     function createSemicolonClassElement() {
-        return createSynthesizedNode(217 /* SemicolonClassElement */);
+        return createSynthesizedNode(218 /* SemicolonClassElement */);
     }
     ts.createSemicolonClassElement = createSemicolonClassElement;
     // Element
     function createBlock(statements, multiLine) {
-        var block = createSynthesizedNode(218 /* Block */);
+        var block = createSynthesizedNode(219 /* Block */);
         block.statements = createNodeArray(statements);
         if (multiLine)
             block.multiLine = multiLine;
@@ -61555,7 +63672,7 @@ var ts;
     }
     ts.updateBlock = updateBlock;
     function createVariableStatement(modifiers, declarationList) {
-        var node = createSynthesizedNode(219 /* VariableStatement */);
+        var node = createSynthesizedNode(220 /* VariableStatement */);
         node.decorators = undefined;
         node.modifiers = asNodeArray(modifiers);
         node.declarationList = ts.isArray(declarationList) ? createVariableDeclarationList(declarationList) : declarationList;
@@ -61570,11 +63687,11 @@ var ts;
     }
     ts.updateVariableStatement = updateVariableStatement;
     function createEmptyStatement() {
-        return createSynthesizedNode(220 /* EmptyStatement */);
+        return createSynthesizedNode(221 /* EmptyStatement */);
     }
     ts.createEmptyStatement = createEmptyStatement;
     function createExpressionStatement(expression) {
-        var node = createSynthesizedNode(221 /* ExpressionStatement */);
+        var node = createSynthesizedNode(222 /* ExpressionStatement */);
         node.expression = ts.parenthesizeExpressionForExpressionStatement(expression);
         return node;
     }
@@ -61590,10 +63707,10 @@ var ts;
     /** @deprecated Use `updateExpressionStatement` instead.  */
     ts.updateStatement = updateExpressionStatement;
     function createIf(expression, thenStatement, elseStatement) {
-        var node = createSynthesizedNode(222 /* IfStatement */);
+        var node = createSynthesizedNode(223 /* IfStatement */);
         node.expression = expression;
-        node.thenStatement = thenStatement;
-        node.elseStatement = elseStatement;
+        node.thenStatement = asEmbeddedStatement(thenStatement);
+        node.elseStatement = asEmbeddedStatement(elseStatement);
         return node;
     }
     ts.createIf = createIf;
@@ -61606,8 +63723,8 @@ var ts;
     }
     ts.updateIf = updateIf;
     function createDo(statement, expression) {
-        var node = createSynthesizedNode(223 /* DoStatement */);
-        node.statement = statement;
+        var node = createSynthesizedNode(224 /* DoStatement */);
+        node.statement = asEmbeddedStatement(statement);
         node.expression = expression;
         return node;
     }
@@ -61620,9 +63737,9 @@ var ts;
     }
     ts.updateDo = updateDo;
     function createWhile(expression, statement) {
-        var node = createSynthesizedNode(224 /* WhileStatement */);
+        var node = createSynthesizedNode(225 /* WhileStatement */);
         node.expression = expression;
-        node.statement = statement;
+        node.statement = asEmbeddedStatement(statement);
         return node;
     }
     ts.createWhile = createWhile;
@@ -61634,11 +63751,11 @@ var ts;
     }
     ts.updateWhile = updateWhile;
     function createFor(initializer, condition, incrementor, statement) {
-        var node = createSynthesizedNode(225 /* ForStatement */);
+        var node = createSynthesizedNode(226 /* ForStatement */);
         node.initializer = initializer;
         node.condition = condition;
         node.incrementor = incrementor;
-        node.statement = statement;
+        node.statement = asEmbeddedStatement(statement);
         return node;
     }
     ts.createFor = createFor;
@@ -61652,10 +63769,10 @@ var ts;
     }
     ts.updateFor = updateFor;
     function createForIn(initializer, expression, statement) {
-        var node = createSynthesizedNode(226 /* ForInStatement */);
+        var node = createSynthesizedNode(227 /* ForInStatement */);
         node.initializer = initializer;
         node.expression = expression;
-        node.statement = statement;
+        node.statement = asEmbeddedStatement(statement);
         return node;
     }
     ts.createForIn = createForIn;
@@ -61668,11 +63785,11 @@ var ts;
     }
     ts.updateForIn = updateForIn;
     function createForOf(awaitModifier, initializer, expression, statement) {
-        var node = createSynthesizedNode(227 /* ForOfStatement */);
+        var node = createSynthesizedNode(228 /* ForOfStatement */);
         node.awaitModifier = awaitModifier;
         node.initializer = initializer;
         node.expression = expression;
-        node.statement = statement;
+        node.statement = asEmbeddedStatement(statement);
         return node;
     }
     ts.createForOf = createForOf;
@@ -61686,7 +63803,7 @@ var ts;
     }
     ts.updateForOf = updateForOf;
     function createContinue(label) {
-        var node = createSynthesizedNode(228 /* ContinueStatement */);
+        var node = createSynthesizedNode(229 /* ContinueStatement */);
         node.label = asName(label);
         return node;
     }
@@ -61698,7 +63815,7 @@ var ts;
     }
     ts.updateContinue = updateContinue;
     function createBreak(label) {
-        var node = createSynthesizedNode(229 /* BreakStatement */);
+        var node = createSynthesizedNode(230 /* BreakStatement */);
         node.label = asName(label);
         return node;
     }
@@ -61710,7 +63827,7 @@ var ts;
     }
     ts.updateBreak = updateBreak;
     function createReturn(expression) {
-        var node = createSynthesizedNode(230 /* ReturnStatement */);
+        var node = createSynthesizedNode(231 /* ReturnStatement */);
         node.expression = expression;
         return node;
     }
@@ -61722,9 +63839,9 @@ var ts;
     }
     ts.updateReturn = updateReturn;
     function createWith(expression, statement) {
-        var node = createSynthesizedNode(231 /* WithStatement */);
+        var node = createSynthesizedNode(232 /* WithStatement */);
         node.expression = expression;
-        node.statement = statement;
+        node.statement = asEmbeddedStatement(statement);
         return node;
     }
     ts.createWith = createWith;
@@ -61736,7 +63853,7 @@ var ts;
     }
     ts.updateWith = updateWith;
     function createSwitch(expression, caseBlock) {
-        var node = createSynthesizedNode(232 /* SwitchStatement */);
+        var node = createSynthesizedNode(233 /* SwitchStatement */);
         node.expression = ts.parenthesizeExpressionForList(expression);
         node.caseBlock = caseBlock;
         return node;
@@ -61750,9 +63867,9 @@ var ts;
     }
     ts.updateSwitch = updateSwitch;
     function createLabel(label, statement) {
-        var node = createSynthesizedNode(233 /* LabeledStatement */);
+        var node = createSynthesizedNode(234 /* LabeledStatement */);
         node.label = asName(label);
-        node.statement = statement;
+        node.statement = asEmbeddedStatement(statement);
         return node;
     }
     ts.createLabel = createLabel;
@@ -61764,7 +63881,7 @@ var ts;
     }
     ts.updateLabel = updateLabel;
     function createThrow(expression) {
-        var node = createSynthesizedNode(234 /* ThrowStatement */);
+        var node = createSynthesizedNode(235 /* ThrowStatement */);
         node.expression = expression;
         return node;
     }
@@ -61776,7 +63893,7 @@ var ts;
     }
     ts.updateThrow = updateThrow;
     function createTry(tryBlock, catchClause, finallyBlock) {
-        var node = createSynthesizedNode(235 /* TryStatement */);
+        var node = createSynthesizedNode(236 /* TryStatement */);
         node.tryBlock = tryBlock;
         node.catchClause = catchClause;
         node.finallyBlock = finallyBlock;
@@ -61792,11 +63909,11 @@ var ts;
     }
     ts.updateTry = updateTry;
     function createDebuggerStatement() {
-        return createSynthesizedNode(236 /* DebuggerStatement */);
+        return createSynthesizedNode(237 /* DebuggerStatement */);
     }
     ts.createDebuggerStatement = createDebuggerStatement;
     function createVariableDeclaration(name, type, initializer) {
-        var node = createSynthesizedNode(237 /* VariableDeclaration */);
+        var node = createSynthesizedNode(238 /* VariableDeclaration */);
         node.name = asName(name);
         node.type = type;
         node.initializer = initializer !== undefined ? ts.parenthesizeExpressionForList(initializer) : undefined;
@@ -61813,7 +63930,7 @@ var ts;
     ts.updateVariableDeclaration = updateVariableDeclaration;
     function createVariableDeclarationList(declarations, flags) {
         if (flags === void 0) { flags = 0 /* None */; }
-        var node = createSynthesizedNode(238 /* VariableDeclarationList */);
+        var node = createSynthesizedNode(239 /* VariableDeclarationList */);
         node.flags |= flags & 3 /* BlockScoped */;
         node.declarations = createNodeArray(declarations);
         return node;
@@ -61826,7 +63943,7 @@ var ts;
     }
     ts.updateVariableDeclarationList = updateVariableDeclarationList;
     function createFunctionDeclaration(decorators, modifiers, asteriskToken, name, typeParameters, parameters, type, body) {
-        var node = createSynthesizedNode(239 /* FunctionDeclaration */);
+        var node = createSynthesizedNode(240 /* FunctionDeclaration */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.asteriskToken = asteriskToken;
@@ -61852,7 +63969,7 @@ var ts;
     }
     ts.updateFunctionDeclaration = updateFunctionDeclaration;
     function createClassDeclaration(decorators, modifiers, name, typeParameters, heritageClauses, members) {
-        var node = createSynthesizedNode(240 /* ClassDeclaration */);
+        var node = createSynthesizedNode(241 /* ClassDeclaration */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
@@ -61874,7 +63991,7 @@ var ts;
     }
     ts.updateClassDeclaration = updateClassDeclaration;
     function createInterfaceDeclaration(decorators, modifiers, name, typeParameters, heritageClauses, members) {
-        var node = createSynthesizedNode(241 /* InterfaceDeclaration */);
+        var node = createSynthesizedNode(242 /* InterfaceDeclaration */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
@@ -61896,7 +64013,7 @@ var ts;
     }
     ts.updateInterfaceDeclaration = updateInterfaceDeclaration;
     function createTypeAliasDeclaration(decorators, modifiers, name, typeParameters, type) {
-        var node = createSynthesizedNode(242 /* TypeAliasDeclaration */);
+        var node = createSynthesizedNode(243 /* TypeAliasDeclaration */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
@@ -61916,7 +64033,7 @@ var ts;
     }
     ts.updateTypeAliasDeclaration = updateTypeAliasDeclaration;
     function createEnumDeclaration(decorators, modifiers, name, members) {
-        var node = createSynthesizedNode(243 /* EnumDeclaration */);
+        var node = createSynthesizedNode(244 /* EnumDeclaration */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
@@ -61935,7 +64052,7 @@ var ts;
     ts.updateEnumDeclaration = updateEnumDeclaration;
     function createModuleDeclaration(decorators, modifiers, name, body, flags) {
         if (flags === void 0) { flags = 0 /* None */; }
-        var node = createSynthesizedNode(244 /* ModuleDeclaration */);
+        var node = createSynthesizedNode(245 /* ModuleDeclaration */);
         node.flags |= flags & (16 /* Namespace */ | 4 /* NestedNamespace */ | 512 /* GlobalAugmentation */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
@@ -61954,7 +64071,7 @@ var ts;
     }
     ts.updateModuleDeclaration = updateModuleDeclaration;
     function createModuleBlock(statements) {
-        var node = createSynthesizedNode(245 /* ModuleBlock */);
+        var node = createSynthesizedNode(246 /* ModuleBlock */);
         node.statements = createNodeArray(statements);
         return node;
     }
@@ -61966,7 +64083,7 @@ var ts;
     }
     ts.updateModuleBlock = updateModuleBlock;
     function createCaseBlock(clauses) {
-        var node = createSynthesizedNode(246 /* CaseBlock */);
+        var node = createSynthesizedNode(247 /* CaseBlock */);
         node.clauses = createNodeArray(clauses);
         return node;
     }
@@ -61978,7 +64095,7 @@ var ts;
     }
     ts.updateCaseBlock = updateCaseBlock;
     function createNamespaceExportDeclaration(name) {
-        var node = createSynthesizedNode(247 /* NamespaceExportDeclaration */);
+        var node = createSynthesizedNode(248 /* NamespaceExportDeclaration */);
         node.name = asName(name);
         return node;
     }
@@ -61990,7 +64107,7 @@ var ts;
     }
     ts.updateNamespaceExportDeclaration = updateNamespaceExportDeclaration;
     function createImportEqualsDeclaration(decorators, modifiers, name, moduleReference) {
-        var node = createSynthesizedNode(248 /* ImportEqualsDeclaration */);
+        var node = createSynthesizedNode(249 /* ImportEqualsDeclaration */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
@@ -62008,7 +64125,7 @@ var ts;
     }
     ts.updateImportEqualsDeclaration = updateImportEqualsDeclaration;
     function createImportDeclaration(decorators, modifiers, importClause, moduleSpecifier) {
-        var node = createSynthesizedNode(249 /* ImportDeclaration */);
+        var node = createSynthesizedNode(250 /* ImportDeclaration */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.importClause = importClause;
@@ -62026,7 +64143,7 @@ var ts;
     }
     ts.updateImportDeclaration = updateImportDeclaration;
     function createImportClause(name, namedBindings) {
-        var node = createSynthesizedNode(250 /* ImportClause */);
+        var node = createSynthesizedNode(251 /* ImportClause */);
         node.name = name;
         node.namedBindings = namedBindings;
         return node;
@@ -62040,7 +64157,7 @@ var ts;
     }
     ts.updateImportClause = updateImportClause;
     function createNamespaceImport(name) {
-        var node = createSynthesizedNode(251 /* NamespaceImport */);
+        var node = createSynthesizedNode(252 /* NamespaceImport */);
         node.name = name;
         return node;
     }
@@ -62052,7 +64169,7 @@ var ts;
     }
     ts.updateNamespaceImport = updateNamespaceImport;
     function createNamedImports(elements) {
-        var node = createSynthesizedNode(252 /* NamedImports */);
+        var node = createSynthesizedNode(253 /* NamedImports */);
         node.elements = createNodeArray(elements);
         return node;
     }
@@ -62064,7 +64181,7 @@ var ts;
     }
     ts.updateNamedImports = updateNamedImports;
     function createImportSpecifier(propertyName, name) {
-        var node = createSynthesizedNode(253 /* ImportSpecifier */);
+        var node = createSynthesizedNode(254 /* ImportSpecifier */);
         node.propertyName = propertyName;
         node.name = name;
         return node;
@@ -62078,11 +64195,11 @@ var ts;
     }
     ts.updateImportSpecifier = updateImportSpecifier;
     function createExportAssignment(decorators, modifiers, isExportEquals, expression) {
-        var node = createSynthesizedNode(254 /* ExportAssignment */);
+        var node = createSynthesizedNode(255 /* ExportAssignment */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.isExportEquals = isExportEquals;
-        node.expression = isExportEquals ? ts.parenthesizeBinaryOperand(59 /* EqualsToken */, expression, /*isLeftSideOfBinary*/ false, /*leftOperand*/ undefined) : ts.parenthesizeDefaultExpression(expression);
+        node.expression = isExportEquals ? ts.parenthesizeBinaryOperand(60 /* EqualsToken */, expression, /*isLeftSideOfBinary*/ false, /*leftOperand*/ undefined) : ts.parenthesizeDefaultExpression(expression);
         return node;
     }
     ts.createExportAssignment = createExportAssignment;
@@ -62095,7 +64212,7 @@ var ts;
     }
     ts.updateExportAssignment = updateExportAssignment;
     function createExportDeclaration(decorators, modifiers, exportClause, moduleSpecifier) {
-        var node = createSynthesizedNode(255 /* ExportDeclaration */);
+        var node = createSynthesizedNode(256 /* ExportDeclaration */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.exportClause = exportClause;
@@ -62113,7 +64230,7 @@ var ts;
     }
     ts.updateExportDeclaration = updateExportDeclaration;
     function createNamedExports(elements) {
-        var node = createSynthesizedNode(256 /* NamedExports */);
+        var node = createSynthesizedNode(257 /* NamedExports */);
         node.elements = createNodeArray(elements);
         return node;
     }
@@ -62125,7 +64242,7 @@ var ts;
     }
     ts.updateNamedExports = updateNamedExports;
     function createExportSpecifier(propertyName, name) {
-        var node = createSynthesizedNode(257 /* ExportSpecifier */);
+        var node = createSynthesizedNode(258 /* ExportSpecifier */);
         node.propertyName = asName(propertyName);
         node.name = asName(name);
         return node;
@@ -62140,7 +64257,7 @@ var ts;
     ts.updateExportSpecifier = updateExportSpecifier;
     // Module references
     function createExternalModuleReference(expression) {
-        var node = createSynthesizedNode(259 /* ExternalModuleReference */);
+        var node = createSynthesizedNode(260 /* ExternalModuleReference */);
         node.expression = expression;
         return node;
     }
@@ -62154,14 +64271,14 @@ var ts;
     // JSDoc
     /* @internal */
     function createJSDocTypeExpression(type) {
-        var node = createSynthesizedNode(288 /* JSDocTypeExpression */);
+        var node = createSynthesizedNode(289 /* JSDocTypeExpression */);
         node.type = type;
         return node;
     }
     ts.createJSDocTypeExpression = createJSDocTypeExpression;
     /* @internal */
     function createJSDocTypeTag(typeExpression, comment) {
-        var tag = createJSDocTag(307 /* JSDocTypeTag */, "type");
+        var tag = createJSDocTag(309 /* JSDocTypeTag */, "type");
         tag.typeExpression = typeExpression;
         tag.comment = comment;
         return tag;
@@ -62169,15 +64286,22 @@ var ts;
     ts.createJSDocTypeTag = createJSDocTypeTag;
     /* @internal */
     function createJSDocReturnTag(typeExpression, comment) {
-        var tag = createJSDocTag(305 /* JSDocReturnTag */, "returns");
+        var tag = createJSDocTag(307 /* JSDocReturnTag */, "returns");
         tag.typeExpression = typeExpression;
         tag.comment = comment;
         return tag;
     }
     ts.createJSDocReturnTag = createJSDocReturnTag;
+    /** @internal */
+    function createJSDocThisTag(typeExpression) {
+        var tag = createJSDocTag(308 /* JSDocThisTag */, "this");
+        tag.typeExpression = typeExpression;
+        return tag;
+    }
+    ts.createJSDocThisTag = createJSDocThisTag;
     /* @internal */
     function createJSDocParamTag(name, isBracketed, typeExpression, comment) {
-        var tag = createJSDocTag(304 /* JSDocParameterTag */, "param");
+        var tag = createJSDocTag(306 /* JSDocParameterTag */, "param");
         tag.typeExpression = typeExpression;
         tag.name = name;
         tag.isBracketed = isBracketed;
@@ -62187,7 +64311,7 @@ var ts;
     ts.createJSDocParamTag = createJSDocParamTag;
     /* @internal */
     function createJSDocComment(comment, tags) {
-        var node = createSynthesizedNode(296 /* JSDocComment */);
+        var node = createSynthesizedNode(297 /* JSDocComment */);
         node.comment = comment;
         node.tags = tags;
         return node;
@@ -62201,7 +64325,7 @@ var ts;
     }
     // JSX
     function createJsxElement(openingElement, children, closingElement) {
-        var node = createSynthesizedNode(260 /* JsxElement */);
+        var node = createSynthesizedNode(261 /* JsxElement */);
         node.openingElement = openingElement;
         node.children = createNodeArray(children);
         node.closingElement = closingElement;
@@ -62217,7 +64341,7 @@ var ts;
     }
     ts.updateJsxElement = updateJsxElement;
     function createJsxSelfClosingElement(tagName, typeArguments, attributes) {
-        var node = createSynthesizedNode(261 /* JsxSelfClosingElement */);
+        var node = createSynthesizedNode(262 /* JsxSelfClosingElement */);
         node.tagName = tagName;
         node.typeArguments = asNodeArray(typeArguments);
         node.attributes = attributes;
@@ -62233,7 +64357,7 @@ var ts;
     }
     ts.updateJsxSelfClosingElement = updateJsxSelfClosingElement;
     function createJsxOpeningElement(tagName, typeArguments, attributes) {
-        var node = createSynthesizedNode(262 /* JsxOpeningElement */);
+        var node = createSynthesizedNode(263 /* JsxOpeningElement */);
         node.tagName = tagName;
         node.typeArguments = asNodeArray(typeArguments);
         node.attributes = attributes;
@@ -62249,7 +64373,7 @@ var ts;
     }
     ts.updateJsxOpeningElement = updateJsxOpeningElement;
     function createJsxClosingElement(tagName) {
-        var node = createSynthesizedNode(263 /* JsxClosingElement */);
+        var node = createSynthesizedNode(264 /* JsxClosingElement */);
         node.tagName = tagName;
         return node;
     }
@@ -62261,13 +64385,35 @@ var ts;
     }
     ts.updateJsxClosingElement = updateJsxClosingElement;
     function createJsxFragment(openingFragment, children, closingFragment) {
-        var node = createSynthesizedNode(264 /* JsxFragment */);
+        var node = createSynthesizedNode(265 /* JsxFragment */);
         node.openingFragment = openingFragment;
         node.children = createNodeArray(children);
         node.closingFragment = closingFragment;
         return node;
     }
     ts.createJsxFragment = createJsxFragment;
+    function createJsxText(text, containsOnlyTriviaWhiteSpaces) {
+        var node = createSynthesizedNode(11 /* JsxText */);
+        node.text = text;
+        node.containsOnlyTriviaWhiteSpaces = !!containsOnlyTriviaWhiteSpaces;
+        return node;
+    }
+    ts.createJsxText = createJsxText;
+    function updateJsxText(node, text, containsOnlyTriviaWhiteSpaces) {
+        return node.text !== text
+            || node.containsOnlyTriviaWhiteSpaces !== containsOnlyTriviaWhiteSpaces
+            ? updateNode(createJsxText(text, containsOnlyTriviaWhiteSpaces), node)
+            : node;
+    }
+    ts.updateJsxText = updateJsxText;
+    function createJsxOpeningFragment() {
+        return createSynthesizedNode(266 /* JsxOpeningFragment */);
+    }
+    ts.createJsxOpeningFragment = createJsxOpeningFragment;
+    function createJsxJsxClosingFragment() {
+        return createSynthesizedNode(267 /* JsxClosingFragment */);
+    }
+    ts.createJsxJsxClosingFragment = createJsxJsxClosingFragment;
     function updateJsxFragment(node, openingFragment, children, closingFragment) {
         return node.openingFragment !== openingFragment
             || node.children !== children
@@ -62277,7 +64423,7 @@ var ts;
     }
     ts.updateJsxFragment = updateJsxFragment;
     function createJsxAttribute(name, initializer) {
-        var node = createSynthesizedNode(267 /* JsxAttribute */);
+        var node = createSynthesizedNode(268 /* JsxAttribute */);
         node.name = name;
         node.initializer = initializer;
         return node;
@@ -62291,7 +64437,7 @@ var ts;
     }
     ts.updateJsxAttribute = updateJsxAttribute;
     function createJsxAttributes(properties) {
-        var node = createSynthesizedNode(268 /* JsxAttributes */);
+        var node = createSynthesizedNode(269 /* JsxAttributes */);
         node.properties = createNodeArray(properties);
         return node;
     }
@@ -62303,7 +64449,7 @@ var ts;
     }
     ts.updateJsxAttributes = updateJsxAttributes;
     function createJsxSpreadAttribute(expression) {
-        var node = createSynthesizedNode(269 /* JsxSpreadAttribute */);
+        var node = createSynthesizedNode(270 /* JsxSpreadAttribute */);
         node.expression = expression;
         return node;
     }
@@ -62315,7 +64461,7 @@ var ts;
     }
     ts.updateJsxSpreadAttribute = updateJsxSpreadAttribute;
     function createJsxExpression(dotDotDotToken, expression) {
-        var node = createSynthesizedNode(270 /* JsxExpression */);
+        var node = createSynthesizedNode(271 /* JsxExpression */);
         node.dotDotDotToken = dotDotDotToken;
         node.expression = expression;
         return node;
@@ -62329,7 +64475,7 @@ var ts;
     ts.updateJsxExpression = updateJsxExpression;
     // Clauses
     function createCaseClause(expression, statements) {
-        var node = createSynthesizedNode(271 /* CaseClause */);
+        var node = createSynthesizedNode(272 /* CaseClause */);
         node.expression = ts.parenthesizeExpressionForList(expression);
         node.statements = createNodeArray(statements);
         return node;
@@ -62343,7 +64489,7 @@ var ts;
     }
     ts.updateCaseClause = updateCaseClause;
     function createDefaultClause(statements) {
-        var node = createSynthesizedNode(272 /* DefaultClause */);
+        var node = createSynthesizedNode(273 /* DefaultClause */);
         node.statements = createNodeArray(statements);
         return node;
     }
@@ -62355,7 +64501,7 @@ var ts;
     }
     ts.updateDefaultClause = updateDefaultClause;
     function createHeritageClause(token, types) {
-        var node = createSynthesizedNode(273 /* HeritageClause */);
+        var node = createSynthesizedNode(274 /* HeritageClause */);
         node.token = token;
         node.types = createNodeArray(types);
         return node;
@@ -62368,7 +64514,7 @@ var ts;
     }
     ts.updateHeritageClause = updateHeritageClause;
     function createCatchClause(variableDeclaration, block) {
-        var node = createSynthesizedNode(274 /* CatchClause */);
+        var node = createSynthesizedNode(275 /* CatchClause */);
         node.variableDeclaration = ts.isString(variableDeclaration) ? createVariableDeclaration(variableDeclaration) : variableDeclaration;
         node.block = block;
         return node;
@@ -62383,7 +64529,7 @@ var ts;
     ts.updateCatchClause = updateCatchClause;
     // Property assignments
     function createPropertyAssignment(name, initializer) {
-        var node = createSynthesizedNode(275 /* PropertyAssignment */);
+        var node = createSynthesizedNode(276 /* PropertyAssignment */);
         node.name = asName(name);
         node.questionToken = undefined;
         node.initializer = ts.parenthesizeExpressionForList(initializer);
@@ -62398,7 +64544,7 @@ var ts;
     }
     ts.updatePropertyAssignment = updatePropertyAssignment;
     function createShorthandPropertyAssignment(name, objectAssignmentInitializer) {
-        var node = createSynthesizedNode(276 /* ShorthandPropertyAssignment */);
+        var node = createSynthesizedNode(277 /* ShorthandPropertyAssignment */);
         node.name = asName(name);
         node.objectAssignmentInitializer = objectAssignmentInitializer !== undefined ? ts.parenthesizeExpressionForList(objectAssignmentInitializer) : undefined;
         return node;
@@ -62412,8 +64558,8 @@ var ts;
     }
     ts.updateShorthandPropertyAssignment = updateShorthandPropertyAssignment;
     function createSpreadAssignment(expression) {
-        var node = createSynthesizedNode(277 /* SpreadAssignment */);
-        node.expression = expression !== undefined ? ts.parenthesizeExpressionForList(expression) : undefined; // TODO: GH#18217
+        var node = createSynthesizedNode(278 /* SpreadAssignment */);
+        node.expression = ts.parenthesizeExpressionForList(expression);
         return node;
     }
     ts.createSpreadAssignment = createSpreadAssignment;
@@ -62425,7 +64571,7 @@ var ts;
     ts.updateSpreadAssignment = updateSpreadAssignment;
     // Enum
     function createEnumMember(name, initializer) {
-        var node = createSynthesizedNode(278 /* EnumMember */);
+        var node = createSynthesizedNode(279 /* EnumMember */);
         node.name = asName(name);
         node.initializer = initializer && ts.parenthesizeExpressionForList(initializer);
         return node;
@@ -62446,7 +64592,7 @@ var ts;
             (typeReferences !== undefined && node.typeReferenceDirectives !== typeReferences) ||
             (libReferences !== undefined && node.libReferenceDirectives !== libReferences) ||
             (hasNoDefaultLib !== undefined && node.hasNoDefaultLib !== hasNoDefaultLib)) {
-            var updated = createSynthesizedNode(284 /* SourceFile */);
+            var updated = createSynthesizedNode(285 /* SourceFile */);
             updated.flags |= node.flags;
             updated.statements = createNodeArray(statements);
             updated.endOfFileToken = node.endOfFileToken;
@@ -62530,7 +64676,7 @@ var ts;
      * @param original The original statement.
      */
     function createNotEmittedStatement(original) {
-        var node = createSynthesizedNode(312 /* NotEmittedStatement */);
+        var node = createSynthesizedNode(314 /* NotEmittedStatement */);
         node.original = original;
         setTextRange(node, original);
         return node;
@@ -62542,7 +64688,7 @@ var ts;
      */
     /* @internal */
     function createEndOfDeclarationMarker(original) {
-        var node = createSynthesizedNode(316 /* EndOfDeclarationMarker */);
+        var node = createSynthesizedNode(318 /* EndOfDeclarationMarker */);
         node.emitNode = {};
         node.original = original;
         return node;
@@ -62554,7 +64700,7 @@ var ts;
      */
     /* @internal */
     function createMergeDeclarationMarker(original) {
-        var node = createSynthesizedNode(315 /* MergeDeclarationMarker */);
+        var node = createSynthesizedNode(317 /* MergeDeclarationMarker */);
         node.emitNode = {};
         node.original = original;
         return node;
@@ -62569,7 +64715,7 @@ var ts;
      * @param location The location for the expression. Defaults to the positions from "original" if provided.
      */
     function createPartiallyEmittedExpression(expression, original) {
-        var node = createSynthesizedNode(313 /* PartiallyEmittedExpression */);
+        var node = createSynthesizedNode(315 /* PartiallyEmittedExpression */);
         node.expression = expression;
         node.original = original;
         setTextRange(node, original);
@@ -62585,7 +64731,7 @@ var ts;
     ts.updatePartiallyEmittedExpression = updatePartiallyEmittedExpression;
     function flattenCommaElements(node) {
         if (ts.nodeIsSynthesized(node) && !ts.isParseTreeNode(node) && !node.original && !node.emitNode && !node.id) {
-            if (node.kind === 314 /* CommaListExpression */) {
+            if (node.kind === 316 /* CommaListExpression */) {
                 return node.elements;
             }
             if (ts.isBinaryExpression(node) && node.operatorToken.kind === 27 /* CommaToken */) {
@@ -62595,7 +64741,7 @@ var ts;
         return node;
     }
     function createCommaList(elements) {
-        var node = createSynthesizedNode(314 /* CommaListExpression */);
+        var node = createSynthesizedNode(316 /* CommaListExpression */);
         node.elements = createNodeArray(ts.sameFlatMap(elements, flattenCommaElements));
         return node;
     }
@@ -62608,7 +64754,7 @@ var ts;
     ts.updateCommaList = updateCommaList;
     function createBundle(sourceFiles, prepends) {
         if (prepends === void 0) { prepends = ts.emptyArray; }
-        var node = ts.createNode(285 /* Bundle */);
+        var node = ts.createNode(286 /* Bundle */);
         node.prepends = prepends;
         node.sourceFiles = sourceFiles;
         return node;
@@ -62620,6 +64766,7 @@ var ts;
             ts.valuesHelper,
             ts.readHelper,
             ts.spreadHelper,
+            ts.spreadArraysHelper,
             ts.restHelper,
             ts.decorateHelper,
             ts.metadataHelper,
@@ -62638,7 +64785,7 @@ var ts;
         ], function (helper) { return helper.name; }));
     }
     function createUnparsedSource() {
-        var node = ts.createNode(286 /* UnparsedSource */);
+        var node = ts.createNode(287 /* UnparsedSource */);
         node.prologues = ts.emptyArray;
         node.referencedFiles = ts.emptyArray;
         node.libReferenceDirectives = ts.emptyArray;
@@ -62770,10 +64917,10 @@ var ts;
     }
     function mapBundleFileSectionKindToSyntaxKind(kind) {
         switch (kind) {
-            case "prologue" /* Prologue */: return 279 /* UnparsedPrologue */;
-            case "prepend" /* Prepend */: return 280 /* UnparsedPrepend */;
-            case "internal" /* Internal */: return 282 /* UnparsedInternalText */;
-            case "text" /* Text */: return 281 /* UnparsedText */;
+            case "prologue" /* Prologue */: return 280 /* UnparsedPrologue */;
+            case "prepend" /* Prepend */: return 281 /* UnparsedPrepend */;
+            case "internal" /* Internal */: return 283 /* UnparsedInternalText */;
+            case "text" /* Text */: return 282 /* UnparsedText */;
             case "emitHelpers" /* EmitHelpers */:
             case "no-default-lib" /* NoDefaultLib */:
             case "reference" /* Reference */:
@@ -62791,14 +64938,14 @@ var ts;
         return node;
     }
     function createUnparsedSyntheticReference(section, parent) {
-        var node = ts.createNode(283 /* UnparsedSyntheticReference */, section.pos, section.end);
+        var node = ts.createNode(284 /* UnparsedSyntheticReference */, section.pos, section.end);
         node.parent = parent;
         node.data = section.data;
         node.section = section;
         return node;
     }
     function createInputFiles(javascriptTextOrReadFileText, declarationTextOrJavascriptPath, javascriptMapPath, javascriptMapTextOrDeclarationPath, declarationMapPath, declarationMapTextOrBuildInfoPath, javascriptPath, declarationPath, buildInfoPath, buildInfo, oldFileOfCurrentEmit) {
-        var node = ts.createNode(287 /* InputFiles */);
+        var node = ts.createNode(288 /* InputFiles */);
         if (!ts.isString(javascriptTextOrReadFileText)) {
             var cache_1 = ts.createMap();
             var textGetter_1 = function (path) {
@@ -62892,7 +65039,7 @@ var ts;
     }
     ts.createLessThan = createLessThan;
     function createAssignment(left, right) {
-        return createBinary(left, 59 /* EqualsToken */, right);
+        return createBinary(left, 60 /* EqualsToken */, right);
     }
     ts.createAssignment = createAssignment;
     function createStrictEquality(left, right) {
@@ -62952,6 +65099,9 @@ var ts;
     function asToken(value) {
         return typeof value === "number" ? createToken(value) : value;
     }
+    function asEmbeddedStatement(statement) {
+        return statement && ts.isNotEmittedStatement(statement) ? setTextRange(setOriginalNode(createEmptyStatement(), statement), statement) : statement;
+    }
     /**
      * Clears any EmitNode entries from parse-tree nodes.
      * @param sourceFile A source file.
@@ -62985,7 +65135,7 @@ var ts;
                 // To avoid holding onto transformation artifacts, we keep track of any
                 // parse tree node we are annotating. This allows us to clean them up after
                 // all transformations have completed.
-                if (node.kind === 284 /* SourceFile */) {
+                if (node.kind === 285 /* SourceFile */) {
                     return node.emitNode = { annotatedNodes: [node] };
                 }
                 var sourceFile = ts.getSourceFileOfNode(ts.getParseTreeNode(ts.getSourceFileOfNode(node)));
@@ -62996,6 +65146,18 @@ var ts;
         return node.emitNode;
     }
     ts.getOrCreateEmitNode = getOrCreateEmitNode;
+    /**
+     * Sets `EmitFlags.NoComments` on a node and removes any leading and trailing synthetic comments.
+     * @internal
+     */
+    function removeAllComments(node) {
+        var emitNode = getOrCreateEmitNode(node);
+        emitNode.flags |= 1536 /* NoComments */;
+        emitNode.leadingComments = undefined;
+        emitNode.trailingComments = undefined;
+        return node;
+    }
+    ts.removeAllComments = removeAllComments;
     function setTextRange(range, location) {
         if (location) {
             range.pos = location.pos;
@@ -63286,7 +65448,7 @@ var ts;
     ts.nullTransformationContext = {
         enableEmitNotification: ts.noop,
         enableSubstitution: ts.noop,
-        endLexicalEnvironment: function () { return undefined; },
+        endLexicalEnvironment: ts.returnUndefined,
         getCompilerOptions: ts.notImplemented,
         getEmitHost: ts.notImplemented,
         getEmitResolver: ts.notImplemented,
@@ -63467,6 +65629,17 @@ var ts;
         /*typeArguments*/ undefined, argumentList), location);
     }
     ts.createSpreadHelper = createSpreadHelper;
+    ts.spreadArraysHelper = {
+        name: "typescript:spreadArrays",
+        scoped: false,
+        text: "\n            var __spreadArrays = (this && this.__spreadArrays) || function () {\n                for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;\n                for (var r = Array(s), k = 0, i = 0; i < il; i++)\n                    for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)\n                        r[k] = a[j];\n                return r;\n            };"
+    };
+    function createSpreadArraysHelper(context, argumentList, location) {
+        context.requestEmitHelper(ts.spreadArraysHelper);
+        return ts.setTextRange(ts.createCall(getHelperName("__spreadArrays"), 
+        /*typeArguments*/ undefined, argumentList), location);
+    }
+    ts.createSpreadArraysHelper = createSpreadArraysHelper;
     // Utilities
     function createForOfBindingStatement(node, boundValue) {
         if (ts.isVariableDeclarationList(node)) {
@@ -63496,7 +65669,7 @@ var ts;
         if (!outermostLabeledStatement) {
             return node;
         }
-        var updated = ts.updateLabel(outermostLabeledStatement, outermostLabeledStatement.label, outermostLabeledStatement.statement.kind === 233 /* LabeledStatement */
+        var updated = ts.updateLabel(outermostLabeledStatement, outermostLabeledStatement.label, outermostLabeledStatement.statement.kind === 234 /* LabeledStatement */
             ? restoreEnclosingLabel(node, outermostLabeledStatement.statement)
             : node);
         if (afterRestoreLabelCallback) {
@@ -63508,20 +65681,20 @@ var ts;
     function shouldBeCapturedInTempVariable(node, cacheIdentifiers) {
         var target = ts.skipParentheses(node);
         switch (target.kind) {
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 return cacheIdentifiers;
-            case 100 /* ThisKeyword */:
+            case 101 /* ThisKeyword */:
             case 8 /* NumericLiteral */:
             case 9 /* BigIntLiteral */:
             case 10 /* StringLiteral */:
                 return false;
-            case 187 /* ArrayLiteralExpression */:
+            case 188 /* ArrayLiteralExpression */:
                 var elements = target.elements;
                 if (elements.length === 0) {
                     return false;
                 }
                 return true;
-            case 188 /* ObjectLiteralExpression */:
+            case 189 /* ObjectLiteralExpression */:
                 return target.properties.length > 0;
             default:
                 return true;
@@ -63536,7 +65709,7 @@ var ts;
             thisArg = ts.createThis();
             target = callee;
         }
-        else if (callee.kind === 98 /* SuperKeyword */) {
+        else if (callee.kind === 99 /* SuperKeyword */) {
             thisArg = ts.createThis();
             target = languageVersion < 2 /* ES2015 */
                 ? ts.setTextRange(ts.createIdentifier("_super"), callee)
@@ -63548,7 +65721,7 @@ var ts;
         }
         else {
             switch (callee.kind) {
-                case 189 /* PropertyAccessExpression */: {
+                case 190 /* PropertyAccessExpression */: {
                     if (shouldBeCapturedInTempVariable(callee.expression, cacheIdentifiers)) {
                         // for `a.b()` target is `(_a = a).b` and thisArg is `_a`
                         thisArg = ts.createTempVariable(recordTempVariable);
@@ -63561,7 +65734,7 @@ var ts;
                     }
                     break;
                 }
-                case 190 /* ElementAccessExpression */: {
+                case 191 /* ElementAccessExpression */: {
                     if (shouldBeCapturedInTempVariable(callee.expression, cacheIdentifiers)) {
                         // for `a[b]()` target is `(_a = a)[b]` and thisArg is `_a`
                         thisArg = ts.createTempVariable(recordTempVariable);
@@ -63618,14 +65791,14 @@ var ts;
     ts.createExpressionForPropertyName = createExpressionForPropertyName;
     function createExpressionForObjectLiteralElementLike(node, property, receiver) {
         switch (property.kind) {
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
                 return createExpressionForAccessorDeclaration(node.properties, property, receiver, !!node.multiLine);
-            case 275 /* PropertyAssignment */:
+            case 276 /* PropertyAssignment */:
                 return createExpressionForPropertyAssignment(property, receiver);
-            case 276 /* ShorthandPropertyAssignment */:
+            case 277 /* ShorthandPropertyAssignment */:
                 return createExpressionForShorthandPropertyAssignment(property, receiver);
-            case 156 /* MethodDeclaration */:
+            case 157 /* MethodDeclaration */:
                 return createExpressionForMethodDeclaration(property, receiver);
         }
     }
@@ -63633,7 +65806,7 @@ var ts;
     function createExpressionForAccessorDeclaration(properties, property, receiver, multiLine) {
         var _a = ts.getAllAccessorDeclarations(properties, property), firstAccessor = _a.firstAccessor, getAccessor = _a.getAccessor, setAccessor = _a.setAccessor;
         if (property === firstAccessor) {
-            var properties_8 = [];
+            var properties_5 = [];
             if (getAccessor) {
                 var getterFunction = ts.createFunctionExpression(getAccessor.modifiers, 
                 /*asteriskToken*/ undefined, 
@@ -63644,7 +65817,7 @@ var ts;
                 ts.setTextRange(getterFunction, getAccessor);
                 ts.setOriginalNode(getterFunction, getAccessor);
                 var getter = ts.createPropertyAssignment("get", getterFunction);
-                properties_8.push(getter);
+                properties_5.push(getter);
             }
             if (setAccessor) {
                 var setterFunction = ts.createFunctionExpression(setAccessor.modifiers, 
@@ -63656,15 +65829,15 @@ var ts;
                 ts.setTextRange(setterFunction, setAccessor);
                 ts.setOriginalNode(setterFunction, setAccessor);
                 var setter = ts.createPropertyAssignment("set", setterFunction);
-                properties_8.push(setter);
+                properties_5.push(setter);
             }
-            properties_8.push(ts.createPropertyAssignment("enumerable", ts.createTrue()));
-            properties_8.push(ts.createPropertyAssignment("configurable", ts.createTrue()));
+            properties_5.push(ts.createPropertyAssignment("enumerable", ts.createTrue()));
+            properties_5.push(ts.createPropertyAssignment("configurable", ts.createTrue()));
             var expression = ts.setTextRange(ts.createCall(ts.createPropertyAccess(ts.createIdentifier("Object"), "defineProperty"), 
             /*typeArguments*/ undefined, [
                 receiver,
                 createExpressionForPropertyName(property.name),
-                ts.createObjectLiteral(properties_8, multiLine)
+                ts.createObjectLiteral(properties_5, multiLine)
             ]), 
             /*location*/ firstAccessor);
             return ts.aggregateTransformFlags(expression);
@@ -63951,7 +66124,7 @@ var ts;
     function parenthesizeBinaryOperand(binaryOperator, operand, isLeftSideOfBinary, leftOperand) {
         var skipped = ts.skipPartiallyEmittedExpressions(operand);
         // If the resulting expression is already parenthesized, we do not need to do any further processing.
-        if (skipped.kind === 195 /* ParenthesizedExpression */) {
+        if (skipped.kind === 196 /* ParenthesizedExpression */) {
             return operand;
         }
         return binaryOperandNeedsParentheses(binaryOperator, operand, isLeftSideOfBinary, leftOperand)
@@ -63985,10 +66158,10 @@ var ts;
         //
         // If `a ** d` is on the left of operator `**`, we need to parenthesize to preserve
         // the intended order of operations: `(a ** b) ** c`
-        var binaryOperatorPrecedence = ts.getOperatorPrecedence(204 /* BinaryExpression */, binaryOperator);
-        var binaryOperatorAssociativity = ts.getOperatorAssociativity(204 /* BinaryExpression */, binaryOperator);
+        var binaryOperatorPrecedence = ts.getOperatorPrecedence(205 /* BinaryExpression */, binaryOperator);
+        var binaryOperatorAssociativity = ts.getOperatorAssociativity(205 /* BinaryExpression */, binaryOperator);
         var emittedOperand = ts.skipPartiallyEmittedExpressions(operand);
-        if (!isLeftSideOfBinary && operand.kind === 197 /* ArrowFunction */ && binaryOperatorPrecedence > 4) {
+        if (!isLeftSideOfBinary && operand.kind === 198 /* ArrowFunction */ && binaryOperatorPrecedence > 4) {
             // We need to parenthesize arrow functions on the right side to avoid it being
             // parsed as parenthesized expression: `a && (() => {})`
             return true;
@@ -64000,7 +66173,7 @@ var ts;
                 // and is a yield expression, then we do not need parentheses.
                 if (!isLeftSideOfBinary
                     && binaryOperatorAssociativity === 1 /* Right */
-                    && operand.kind === 207 /* YieldExpression */) {
+                    && operand.kind === 208 /* YieldExpression */) {
                     return false;
                 }
                 return true;
@@ -64088,7 +66261,7 @@ var ts;
         if (ts.isLiteralKind(node.kind)) {
             return node.kind;
         }
-        if (node.kind === 204 /* BinaryExpression */ && node.operatorToken.kind === 38 /* PlusToken */) {
+        if (node.kind === 205 /* BinaryExpression */ && node.operatorToken.kind === 38 /* PlusToken */) {
             if (node.cachedLiteralKind !== undefined) {
                 return node.cachedLiteralKind;
             }
@@ -64103,7 +66276,7 @@ var ts;
         return 0 /* Unknown */;
     }
     function parenthesizeForConditionalHead(condition) {
-        var conditionalPrecedence = ts.getOperatorPrecedence(205 /* ConditionalExpression */, 56 /* QuestionToken */);
+        var conditionalPrecedence = ts.getOperatorPrecedence(206 /* ConditionalExpression */, 56 /* QuestionToken */);
         var emittedCondition = ts.skipPartiallyEmittedExpressions(condition);
         var conditionPrecedence = ts.getExpressionPrecedence(emittedCondition);
         if (ts.compareValues(conditionPrecedence, conditionalPrecedence) === -1 /* LessThan */) {
@@ -64138,8 +66311,8 @@ var ts;
         var needsParens = isCommaSequence(check);
         if (!needsParens) {
             switch (getLeftmostExpression(check, /*stopAtCallExpression*/ false).kind) {
-                case 209 /* ClassExpression */:
-                case 196 /* FunctionExpression */:
+                case 210 /* ClassExpression */:
+                case 197 /* FunctionExpression */:
                     needsParens = true;
             }
         }
@@ -64155,9 +66328,9 @@ var ts;
     function parenthesizeForNew(expression) {
         var leftmostExpr = getLeftmostExpression(expression, /*stopAtCallExpressions*/ true);
         switch (leftmostExpr.kind) {
-            case 191 /* CallExpression */:
+            case 192 /* CallExpression */:
                 return ts.createParen(expression);
-            case 192 /* NewExpression */:
+            case 193 /* NewExpression */:
                 return !leftmostExpr.arguments
                     ? ts.createParen(expression)
                     : expression;
@@ -64180,7 +66353,7 @@ var ts;
         //
         var emittedExpression = ts.skipPartiallyEmittedExpressions(expression);
         if (ts.isLeftHandSideExpression(emittedExpression)
-            && (emittedExpression.kind !== 192 /* NewExpression */ || emittedExpression.arguments)) {
+            && (emittedExpression.kind !== 193 /* NewExpression */ || emittedExpression.arguments)) {
             return expression;
         }
         return ts.setTextRange(ts.createParen(expression), expression);
@@ -64218,7 +66391,7 @@ var ts;
     function parenthesizeExpressionForList(expression) {
         var emittedExpression = ts.skipPartiallyEmittedExpressions(expression);
         var expressionPrecedence = ts.getExpressionPrecedence(emittedExpression);
-        var commaPrecedence = ts.getOperatorPrecedence(204 /* BinaryExpression */, 27 /* CommaToken */);
+        var commaPrecedence = ts.getOperatorPrecedence(205 /* BinaryExpression */, 27 /* CommaToken */);
         return expressionPrecedence > commaPrecedence
             ? expression
             : ts.setTextRange(ts.createParen(expression), expression);
@@ -64229,29 +66402,29 @@ var ts;
         if (ts.isCallExpression(emittedExpression)) {
             var callee = emittedExpression.expression;
             var kind = ts.skipPartiallyEmittedExpressions(callee).kind;
-            if (kind === 196 /* FunctionExpression */ || kind === 197 /* ArrowFunction */) {
+            if (kind === 197 /* FunctionExpression */ || kind === 198 /* ArrowFunction */) {
                 var mutableCall = ts.getMutableClone(emittedExpression);
                 mutableCall.expression = ts.setTextRange(ts.createParen(callee), callee);
                 return recreateOuterExpressions(expression, mutableCall, 4 /* PartiallyEmittedExpressions */);
             }
         }
         var leftmostExpressionKind = getLeftmostExpression(emittedExpression, /*stopAtCallExpressions*/ false).kind;
-        if (leftmostExpressionKind === 188 /* ObjectLiteralExpression */ || leftmostExpressionKind === 196 /* FunctionExpression */) {
+        if (leftmostExpressionKind === 189 /* ObjectLiteralExpression */ || leftmostExpressionKind === 197 /* FunctionExpression */) {
             return ts.setTextRange(ts.createParen(expression), expression);
         }
         return expression;
     }
     ts.parenthesizeExpressionForExpressionStatement = parenthesizeExpressionForExpressionStatement;
     function parenthesizeConditionalTypeMember(member) {
-        return member.kind === 175 /* ConditionalType */ ? ts.createParenthesizedType(member) : member;
+        return member.kind === 176 /* ConditionalType */ ? ts.createParenthesizedType(member) : member;
     }
     ts.parenthesizeConditionalTypeMember = parenthesizeConditionalTypeMember;
     function parenthesizeElementTypeMember(member) {
         switch (member.kind) {
-            case 173 /* UnionType */:
-            case 174 /* IntersectionType */:
-            case 165 /* FunctionType */:
-            case 166 /* ConstructorType */:
+            case 174 /* UnionType */:
+            case 175 /* IntersectionType */:
+            case 166 /* FunctionType */:
+            case 167 /* ConstructorType */:
                 return ts.createParenthesizedType(member);
         }
         return parenthesizeConditionalTypeMember(member);
@@ -64259,9 +66432,9 @@ var ts;
     ts.parenthesizeElementTypeMember = parenthesizeElementTypeMember;
     function parenthesizeArrayTypeMember(member) {
         switch (member.kind) {
-            case 167 /* TypeQuery */:
-            case 179 /* TypeOperator */:
-            case 176 /* InferType */:
+            case 168 /* TypeQuery */:
+            case 180 /* TypeOperator */:
+            case 177 /* InferType */:
                 return ts.createParenthesizedType(member);
         }
         return parenthesizeElementTypeMember(member);
@@ -64287,44 +66460,45 @@ var ts;
     function getLeftmostExpression(node, stopAtCallExpressions) {
         while (true) {
             switch (node.kind) {
-                case 203 /* PostfixUnaryExpression */:
+                case 204 /* PostfixUnaryExpression */:
                     node = node.operand;
                     continue;
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     node = node.left;
                     continue;
-                case 205 /* ConditionalExpression */:
+                case 206 /* ConditionalExpression */:
                     node = node.condition;
                     continue;
-                case 193 /* TaggedTemplateExpression */:
+                case 194 /* TaggedTemplateExpression */:
                     node = node.tag;
                     continue;
-                case 191 /* CallExpression */:
+                case 192 /* CallExpression */:
                     if (stopAtCallExpressions) {
                         return node;
                     }
                 // falls through
-                case 212 /* AsExpression */:
-                case 190 /* ElementAccessExpression */:
-                case 189 /* PropertyAccessExpression */:
-                case 213 /* NonNullExpression */:
-                case 313 /* PartiallyEmittedExpression */:
+                case 213 /* AsExpression */:
+                case 191 /* ElementAccessExpression */:
+                case 190 /* PropertyAccessExpression */:
+                case 214 /* NonNullExpression */:
+                case 315 /* PartiallyEmittedExpression */:
                     node = node.expression;
                     continue;
             }
             return node;
         }
     }
+    ts.getLeftmostExpression = getLeftmostExpression;
     function parenthesizeConciseBody(body) {
-        if (!ts.isBlock(body) && (isCommaSequence(body) || getLeftmostExpression(body, /*stopAtCallExpressions*/ false).kind === 188 /* ObjectLiteralExpression */)) {
+        if (!ts.isBlock(body) && (isCommaSequence(body) || getLeftmostExpression(body, /*stopAtCallExpressions*/ false).kind === 189 /* ObjectLiteralExpression */)) {
             return ts.setTextRange(ts.createParen(body), body);
         }
         return body;
     }
     ts.parenthesizeConciseBody = parenthesizeConciseBody;
     function isCommaSequence(node) {
-        return node.kind === 204 /* BinaryExpression */ && node.operatorToken.kind === 27 /* CommaToken */ ||
-            node.kind === 314 /* CommaListExpression */;
+        return node.kind === 205 /* BinaryExpression */ && node.operatorToken.kind === 27 /* CommaToken */ ||
+            node.kind === 316 /* CommaListExpression */;
     }
     ts.isCommaSequence = isCommaSequence;
     var OuterExpressionKinds;
@@ -64337,13 +66511,13 @@ var ts;
     function isOuterExpression(node, kinds) {
         if (kinds === void 0) { kinds = 7 /* All */; }
         switch (node.kind) {
-            case 195 /* ParenthesizedExpression */:
+            case 196 /* ParenthesizedExpression */:
                 return (kinds & 1 /* Parentheses */) !== 0;
-            case 194 /* TypeAssertionExpression */:
-            case 212 /* AsExpression */:
-            case 213 /* NonNullExpression */:
+            case 195 /* TypeAssertionExpression */:
+            case 213 /* AsExpression */:
+            case 214 /* NonNullExpression */:
                 return (kinds & 2 /* Assertions */) !== 0;
-            case 313 /* PartiallyEmittedExpression */:
+            case 315 /* PartiallyEmittedExpression */:
                 return (kinds & 4 /* PartiallyEmittedExpressions */) !== 0;
         }
         return false;
@@ -64368,7 +66542,7 @@ var ts;
     }
     ts.skipOuterExpressions = skipOuterExpressions;
     function skipAssertions(node) {
-        while (ts.isAssertionExpression(node) || node.kind === 213 /* NonNullExpression */) {
+        while (ts.isAssertionExpression(node) || node.kind === 214 /* NonNullExpression */) {
             node = node.expression;
         }
         return node;
@@ -64376,11 +66550,11 @@ var ts;
     ts.skipAssertions = skipAssertions;
     function updateOuterExpression(outerExpression, expression) {
         switch (outerExpression.kind) {
-            case 195 /* ParenthesizedExpression */: return ts.updateParen(outerExpression, expression);
-            case 194 /* TypeAssertionExpression */: return ts.updateTypeAssertion(outerExpression, outerExpression.type, expression);
-            case 212 /* AsExpression */: return ts.updateAsExpression(outerExpression, expression, outerExpression.type);
-            case 213 /* NonNullExpression */: return ts.updateNonNullExpression(outerExpression, expression);
-            case 313 /* PartiallyEmittedExpression */: return ts.updatePartiallyEmittedExpression(outerExpression, expression);
+            case 196 /* ParenthesizedExpression */: return ts.updateParen(outerExpression, expression);
+            case 195 /* TypeAssertionExpression */: return ts.updateTypeAssertion(outerExpression, outerExpression.type, expression);
+            case 213 /* AsExpression */: return ts.updateAsExpression(outerExpression, expression, outerExpression.type);
+            case 214 /* NonNullExpression */: return ts.updateNonNullExpression(outerExpression, expression);
+            case 315 /* PartiallyEmittedExpression */: return ts.updatePartiallyEmittedExpression(outerExpression, expression);
         }
     }
     /**
@@ -64398,7 +66572,7 @@ var ts;
      * the containing expression is created/updated.
      */
     function isIgnorableParen(node) {
-        return node.kind === 195 /* ParenthesizedExpression */
+        return node.kind === 196 /* ParenthesizedExpression */
             && ts.nodeIsSynthesized(node)
             && ts.nodeIsSynthesized(ts.getSourceMapRange(node))
             && ts.nodeIsSynthesized(ts.getCommentRange(node))
@@ -64463,10 +66637,10 @@ var ts;
             var name = namespaceDeclaration.name;
             return ts.isGeneratedIdentifier(name) ? name : ts.createIdentifier(ts.getSourceTextOfNodeFromSourceFile(sourceFile, name) || ts.idText(name));
         }
-        if (node.kind === 249 /* ImportDeclaration */ && node.importClause) {
+        if (node.kind === 250 /* ImportDeclaration */ && node.importClause) {
             return ts.getGeneratedNameForNode(node);
         }
-        if (node.kind === 255 /* ExportDeclaration */ && node.moduleSpecifier) {
+        if (node.kind === 256 /* ExportDeclaration */ && node.moduleSpecifier) {
             return ts.getGeneratedNameForNode(node);
         }
         return undefined;
@@ -64585,7 +66759,7 @@ var ts;
         }
         if (ts.isObjectLiteralElementLike(bindingElement)) {
             switch (bindingElement.kind) {
-                case 275 /* PropertyAssignment */:
+                case 276 /* PropertyAssignment */:
                     // `b` in `({ a: b } = ...)`
                     // `b` in `({ a: b = 1 } = ...)`
                     // `{b}` in `({ a: {b} } = ...)`
@@ -64597,11 +66771,11 @@ var ts;
                     // `b[0]` in `({ a: b[0] } = ...)`
                     // `b[0]` in `({ a: b[0] = 1 } = ...)`
                     return getTargetOfBindingOrAssignmentElement(bindingElement.initializer);
-                case 276 /* ShorthandPropertyAssignment */:
+                case 277 /* ShorthandPropertyAssignment */:
                     // `a` in `({ a } = ...)`
                     // `a` in `({ a = 1 } = ...)`
                     return bindingElement.name;
-                case 277 /* SpreadAssignment */:
+                case 278 /* SpreadAssignment */:
                     // `a` in `({ ...a } = ...)`
                     return getTargetOfBindingOrAssignmentElement(bindingElement.expression);
             }
@@ -64633,12 +66807,12 @@ var ts;
      */
     function getRestIndicatorOfBindingOrAssignmentElement(bindingElement) {
         switch (bindingElement.kind) {
-            case 151 /* Parameter */:
-            case 186 /* BindingElement */:
+            case 152 /* Parameter */:
+            case 187 /* BindingElement */:
                 // `...` in `let [...a] = ...`
                 return bindingElement.dotDotDotToken;
-            case 208 /* SpreadElement */:
-            case 277 /* SpreadAssignment */:
+            case 209 /* SpreadElement */:
+            case 278 /* SpreadAssignment */:
                 // `...` in `[...a] = ...`
                 return bindingElement;
         }
@@ -64650,7 +66824,7 @@ var ts;
      */
     function getPropertyNameOfBindingOrAssignmentElement(bindingElement) {
         switch (bindingElement.kind) {
-            case 186 /* BindingElement */:
+            case 187 /* BindingElement */:
                 // `a` in `let { a: b } = ...`
                 // `[a]` in `let { [a]: b } = ...`
                 // `"a"` in `let { "a": b } = ...`
@@ -64662,7 +66836,7 @@ var ts;
                         : propertyName;
                 }
                 break;
-            case 275 /* PropertyAssignment */:
+            case 276 /* PropertyAssignment */:
                 // `a` in `({ a: b } = ...)`
                 // `[a]` in `({ [a]: b } = ...)`
                 // `"a"` in `({ "a": b } = ...)`
@@ -64674,7 +66848,7 @@ var ts;
                         : propertyName;
                 }
                 break;
-            case 277 /* SpreadAssignment */:
+            case 278 /* SpreadAssignment */:
                 // `a` in `({ ...a } = ...)`
                 return bindingElement.name;
         }
@@ -64697,13 +66871,13 @@ var ts;
      */
     function getElementsOfBindingOrAssignmentPattern(name) {
         switch (name.kind) {
-            case 184 /* ObjectBindingPattern */:
-            case 185 /* ArrayBindingPattern */:
-            case 187 /* ArrayLiteralExpression */:
+            case 185 /* ObjectBindingPattern */:
+            case 186 /* ArrayBindingPattern */:
+            case 188 /* ArrayLiteralExpression */:
                 // `a` in `{a}`
                 // `a` in `[a]`
                 return name.elements;
-            case 188 /* ObjectLiteralExpression */:
+            case 189 /* ObjectLiteralExpression */:
                 // `a` in `{a}`
                 return name.properties;
         }
@@ -64743,11 +66917,11 @@ var ts;
     ts.convertToObjectAssignmentElement = convertToObjectAssignmentElement;
     function convertToAssignmentPattern(node) {
         switch (node.kind) {
-            case 185 /* ArrayBindingPattern */:
-            case 187 /* ArrayLiteralExpression */:
+            case 186 /* ArrayBindingPattern */:
+            case 188 /* ArrayLiteralExpression */:
                 return convertToArrayAssignmentPattern(node);
-            case 184 /* ObjectBindingPattern */:
-            case 188 /* ObjectLiteralExpression */:
+            case 185 /* ObjectBindingPattern */:
+            case 189 /* ObjectLiteralExpression */:
                 return convertToObjectAssignmentPattern(node);
         }
     }
@@ -64908,276 +67082,278 @@ var ts;
         }
         var kind = node.kind;
         // No need to visit nodes with no children.
-        if ((kind > 0 /* FirstToken */ && kind <= 147 /* LastToken */) || kind === 178 /* ThisType */) {
+        if ((kind > 0 /* FirstToken */ && kind <= 148 /* LastToken */) || kind === 179 /* ThisType */) {
             return node;
         }
         switch (kind) {
             // Names
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 return ts.updateIdentifier(node, nodesVisitor(node.typeArguments, visitor, isTypeNodeOrTypeParameterDeclaration));
-            case 148 /* QualifiedName */:
+            case 149 /* QualifiedName */:
                 return ts.updateQualifiedName(node, visitNode(node.left, visitor, ts.isEntityName), visitNode(node.right, visitor, ts.isIdentifier));
-            case 149 /* ComputedPropertyName */:
+            case 150 /* ComputedPropertyName */:
                 return ts.updateComputedPropertyName(node, visitNode(node.expression, visitor, ts.isExpression));
             // Signature elements
-            case 150 /* TypeParameter */:
+            case 151 /* TypeParameter */:
                 return ts.updateTypeParameterDeclaration(node, visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.constraint, visitor, ts.isTypeNode), visitNode(node.default, visitor, ts.isTypeNode));
-            case 151 /* Parameter */:
+            case 152 /* Parameter */:
                 return ts.updateParameter(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.dotDotDotToken, tokenVisitor, ts.isToken), visitNode(node.name, visitor, ts.isBindingName), visitNode(node.questionToken, tokenVisitor, ts.isToken), visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.initializer, visitor, ts.isExpression));
-            case 152 /* Decorator */:
+            case 153 /* Decorator */:
                 return ts.updateDecorator(node, visitNode(node.expression, visitor, ts.isExpression));
             // Type elements
-            case 153 /* PropertySignature */:
+            case 154 /* PropertySignature */:
                 return ts.updatePropertySignature(node, nodesVisitor(node.modifiers, visitor, ts.isToken), visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.questionToken, tokenVisitor, ts.isToken), visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.initializer, visitor, ts.isExpression));
-            case 154 /* PropertyDeclaration */:
-                return ts.updateProperty(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.questionToken, tokenVisitor, ts.isToken), visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.initializer, visitor, ts.isExpression));
-            case 155 /* MethodSignature */:
+            case 155 /* PropertyDeclaration */:
+                return ts.updateProperty(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), 
+                // QuestionToken and ExclamationToken is uniqued in Property Declaration and the signature of 'updateProperty' is that too
+                visitNode(node.questionToken || node.exclamationToken, tokenVisitor, ts.isToken), visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.initializer, visitor, ts.isExpression));
+            case 156 /* MethodSignature */:
                 return ts.updateMethodSignature(node, nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.questionToken, tokenVisitor, ts.isToken));
-            case 156 /* MethodDeclaration */:
+            case 157 /* MethodDeclaration */:
                 return ts.updateMethod(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.asteriskToken, tokenVisitor, ts.isToken), visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.questionToken, tokenVisitor, ts.isToken), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitNode(node.type, visitor, ts.isTypeNode), visitFunctionBody(node.body, visitor, context));
-            case 157 /* Constructor */:
+            case 158 /* Constructor */:
                 return ts.updateConstructor(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitFunctionBody(node.body, visitor, context));
-            case 158 /* GetAccessor */:
+            case 159 /* GetAccessor */:
                 return ts.updateGetAccessor(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitNode(node.type, visitor, ts.isTypeNode), visitFunctionBody(node.body, visitor, context));
-            case 159 /* SetAccessor */:
+            case 160 /* SetAccessor */:
                 return ts.updateSetAccessor(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitFunctionBody(node.body, visitor, context));
-            case 160 /* CallSignature */:
+            case 161 /* CallSignature */:
                 return ts.updateCallSignature(node, nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode));
-            case 161 /* ConstructSignature */:
+            case 162 /* ConstructSignature */:
                 return ts.updateConstructSignature(node, nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode));
-            case 162 /* IndexSignature */:
+            case 163 /* IndexSignature */:
                 return ts.updateIndexSignature(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode));
             // Types
-            case 163 /* TypePredicate */:
+            case 164 /* TypePredicate */:
                 return ts.updateTypePredicateNode(node, visitNode(node.parameterName, visitor), visitNode(node.type, visitor, ts.isTypeNode));
-            case 164 /* TypeReference */:
+            case 165 /* TypeReference */:
                 return ts.updateTypeReferenceNode(node, visitNode(node.typeName, visitor, ts.isEntityName), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode));
-            case 165 /* FunctionType */:
+            case 166 /* FunctionType */:
                 return ts.updateFunctionTypeNode(node, nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode));
-            case 166 /* ConstructorType */:
+            case 167 /* ConstructorType */:
                 return ts.updateConstructorTypeNode(node, nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode));
-            case 167 /* TypeQuery */:
+            case 168 /* TypeQuery */:
                 return ts.updateTypeQueryNode(node, visitNode(node.exprName, visitor, ts.isEntityName));
-            case 168 /* TypeLiteral */:
+            case 169 /* TypeLiteral */:
                 return ts.updateTypeLiteralNode(node, nodesVisitor(node.members, visitor, ts.isTypeElement));
-            case 169 /* ArrayType */:
+            case 170 /* ArrayType */:
                 return ts.updateArrayTypeNode(node, visitNode(node.elementType, visitor, ts.isTypeNode));
-            case 170 /* TupleType */:
+            case 171 /* TupleType */:
                 return ts.updateTupleTypeNode(node, nodesVisitor(node.elementTypes, visitor, ts.isTypeNode));
-            case 171 /* OptionalType */:
+            case 172 /* OptionalType */:
                 return ts.updateOptionalTypeNode(node, visitNode(node.type, visitor, ts.isTypeNode));
-            case 172 /* RestType */:
+            case 173 /* RestType */:
                 return ts.updateRestTypeNode(node, visitNode(node.type, visitor, ts.isTypeNode));
-            case 173 /* UnionType */:
+            case 174 /* UnionType */:
                 return ts.updateUnionTypeNode(node, nodesVisitor(node.types, visitor, ts.isTypeNode));
-            case 174 /* IntersectionType */:
+            case 175 /* IntersectionType */:
                 return ts.updateIntersectionTypeNode(node, nodesVisitor(node.types, visitor, ts.isTypeNode));
-            case 175 /* ConditionalType */:
+            case 176 /* ConditionalType */:
                 return ts.updateConditionalTypeNode(node, visitNode(node.checkType, visitor, ts.isTypeNode), visitNode(node.extendsType, visitor, ts.isTypeNode), visitNode(node.trueType, visitor, ts.isTypeNode), visitNode(node.falseType, visitor, ts.isTypeNode));
-            case 176 /* InferType */:
+            case 177 /* InferType */:
                 return ts.updateInferTypeNode(node, visitNode(node.typeParameter, visitor, ts.isTypeParameterDeclaration));
-            case 183 /* ImportType */:
+            case 184 /* ImportType */:
                 return ts.updateImportTypeNode(node, visitNode(node.argument, visitor, ts.isTypeNode), visitNode(node.qualifier, visitor, ts.isEntityName), visitNodes(node.typeArguments, visitor, ts.isTypeNode), node.isTypeOf);
-            case 177 /* ParenthesizedType */:
+            case 178 /* ParenthesizedType */:
                 return ts.updateParenthesizedType(node, visitNode(node.type, visitor, ts.isTypeNode));
-            case 179 /* TypeOperator */:
+            case 180 /* TypeOperator */:
                 return ts.updateTypeOperatorNode(node, visitNode(node.type, visitor, ts.isTypeNode));
-            case 180 /* IndexedAccessType */:
+            case 181 /* IndexedAccessType */:
                 return ts.updateIndexedAccessTypeNode(node, visitNode(node.objectType, visitor, ts.isTypeNode), visitNode(node.indexType, visitor, ts.isTypeNode));
-            case 181 /* MappedType */:
+            case 182 /* MappedType */:
                 return ts.updateMappedTypeNode(node, visitNode(node.readonlyToken, tokenVisitor, ts.isToken), visitNode(node.typeParameter, visitor, ts.isTypeParameterDeclaration), visitNode(node.questionToken, tokenVisitor, ts.isToken), visitNode(node.type, visitor, ts.isTypeNode));
-            case 182 /* LiteralType */:
+            case 183 /* LiteralType */:
                 return ts.updateLiteralTypeNode(node, visitNode(node.literal, visitor, ts.isExpression));
             // Binding patterns
-            case 184 /* ObjectBindingPattern */:
+            case 185 /* ObjectBindingPattern */:
                 return ts.updateObjectBindingPattern(node, nodesVisitor(node.elements, visitor, ts.isBindingElement));
-            case 185 /* ArrayBindingPattern */:
+            case 186 /* ArrayBindingPattern */:
                 return ts.updateArrayBindingPattern(node, nodesVisitor(node.elements, visitor, ts.isArrayBindingElement));
-            case 186 /* BindingElement */:
+            case 187 /* BindingElement */:
                 return ts.updateBindingElement(node, visitNode(node.dotDotDotToken, tokenVisitor, ts.isToken), visitNode(node.propertyName, visitor, ts.isPropertyName), visitNode(node.name, visitor, ts.isBindingName), visitNode(node.initializer, visitor, ts.isExpression));
             // Expression
-            case 187 /* ArrayLiteralExpression */:
+            case 188 /* ArrayLiteralExpression */:
                 return ts.updateArrayLiteral(node, nodesVisitor(node.elements, visitor, ts.isExpression));
-            case 188 /* ObjectLiteralExpression */:
+            case 189 /* ObjectLiteralExpression */:
                 return ts.updateObjectLiteral(node, nodesVisitor(node.properties, visitor, ts.isObjectLiteralElementLike));
-            case 189 /* PropertyAccessExpression */:
+            case 190 /* PropertyAccessExpression */:
                 return ts.updatePropertyAccess(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.name, visitor, ts.isIdentifier));
-            case 190 /* ElementAccessExpression */:
+            case 191 /* ElementAccessExpression */:
                 return ts.updateElementAccess(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.argumentExpression, visitor, ts.isExpression));
-            case 191 /* CallExpression */:
+            case 192 /* CallExpression */:
                 return ts.updateCall(node, visitNode(node.expression, visitor, ts.isExpression), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode), nodesVisitor(node.arguments, visitor, ts.isExpression));
-            case 192 /* NewExpression */:
+            case 193 /* NewExpression */:
                 return ts.updateNew(node, visitNode(node.expression, visitor, ts.isExpression), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode), nodesVisitor(node.arguments, visitor, ts.isExpression));
-            case 193 /* TaggedTemplateExpression */:
+            case 194 /* TaggedTemplateExpression */:
                 return ts.updateTaggedTemplate(node, visitNode(node.tag, visitor, ts.isExpression), visitNodes(node.typeArguments, visitor, ts.isExpression), visitNode(node.template, visitor, ts.isTemplateLiteral));
-            case 194 /* TypeAssertionExpression */:
+            case 195 /* TypeAssertionExpression */:
                 return ts.updateTypeAssertion(node, visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.expression, visitor, ts.isExpression));
-            case 195 /* ParenthesizedExpression */:
+            case 196 /* ParenthesizedExpression */:
                 return ts.updateParen(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 196 /* FunctionExpression */:
+            case 197 /* FunctionExpression */:
                 return ts.updateFunctionExpression(node, nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.asteriskToken, tokenVisitor, ts.isToken), visitNode(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitNode(node.type, visitor, ts.isTypeNode), visitFunctionBody(node.body, visitor, context));
-            case 197 /* ArrowFunction */:
+            case 198 /* ArrowFunction */:
                 return ts.updateArrowFunction(node, nodesVisitor(node.modifiers, visitor, ts.isModifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.equalsGreaterThanToken, visitor, ts.isToken), visitFunctionBody(node.body, visitor, context));
-            case 198 /* DeleteExpression */:
+            case 199 /* DeleteExpression */:
                 return ts.updateDelete(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 199 /* TypeOfExpression */:
+            case 200 /* TypeOfExpression */:
                 return ts.updateTypeOf(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 200 /* VoidExpression */:
+            case 201 /* VoidExpression */:
                 return ts.updateVoid(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 201 /* AwaitExpression */:
+            case 202 /* AwaitExpression */:
                 return ts.updateAwait(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 202 /* PrefixUnaryExpression */:
+            case 203 /* PrefixUnaryExpression */:
                 return ts.updatePrefix(node, visitNode(node.operand, visitor, ts.isExpression));
-            case 203 /* PostfixUnaryExpression */:
+            case 204 /* PostfixUnaryExpression */:
                 return ts.updatePostfix(node, visitNode(node.operand, visitor, ts.isExpression));
-            case 204 /* BinaryExpression */:
+            case 205 /* BinaryExpression */:
                 return ts.updateBinary(node, visitNode(node.left, visitor, ts.isExpression), visitNode(node.right, visitor, ts.isExpression), visitNode(node.operatorToken, visitor, ts.isToken));
-            case 205 /* ConditionalExpression */:
+            case 206 /* ConditionalExpression */:
                 return ts.updateConditional(node, visitNode(node.condition, visitor, ts.isExpression), visitNode(node.questionToken, visitor, ts.isToken), visitNode(node.whenTrue, visitor, ts.isExpression), visitNode(node.colonToken, visitor, ts.isToken), visitNode(node.whenFalse, visitor, ts.isExpression));
-            case 206 /* TemplateExpression */:
+            case 207 /* TemplateExpression */:
                 return ts.updateTemplateExpression(node, visitNode(node.head, visitor, ts.isTemplateHead), nodesVisitor(node.templateSpans, visitor, ts.isTemplateSpan));
-            case 207 /* YieldExpression */:
+            case 208 /* YieldExpression */:
                 return ts.updateYield(node, visitNode(node.asteriskToken, tokenVisitor, ts.isToken), visitNode(node.expression, visitor, ts.isExpression));
-            case 208 /* SpreadElement */:
+            case 209 /* SpreadElement */:
                 return ts.updateSpread(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 209 /* ClassExpression */:
+            case 210 /* ClassExpression */:
                 return ts.updateClassExpression(node, nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.heritageClauses, visitor, ts.isHeritageClause), nodesVisitor(node.members, visitor, ts.isClassElement));
-            case 211 /* ExpressionWithTypeArguments */:
+            case 212 /* ExpressionWithTypeArguments */:
                 return ts.updateExpressionWithTypeArguments(node, nodesVisitor(node.typeArguments, visitor, ts.isTypeNode), visitNode(node.expression, visitor, ts.isExpression));
-            case 212 /* AsExpression */:
+            case 213 /* AsExpression */:
                 return ts.updateAsExpression(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.type, visitor, ts.isTypeNode));
-            case 213 /* NonNullExpression */:
+            case 214 /* NonNullExpression */:
                 return ts.updateNonNullExpression(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 214 /* MetaProperty */:
+            case 215 /* MetaProperty */:
                 return ts.updateMetaProperty(node, visitNode(node.name, visitor, ts.isIdentifier));
             // Misc
-            case 216 /* TemplateSpan */:
+            case 217 /* TemplateSpan */:
                 return ts.updateTemplateSpan(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.literal, visitor, ts.isTemplateMiddleOrTemplateTail));
             // Element
-            case 218 /* Block */:
+            case 219 /* Block */:
                 return ts.updateBlock(node, nodesVisitor(node.statements, visitor, ts.isStatement));
-            case 219 /* VariableStatement */:
+            case 220 /* VariableStatement */:
                 return ts.updateVariableStatement(node, nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.declarationList, visitor, ts.isVariableDeclarationList));
-            case 221 /* ExpressionStatement */:
+            case 222 /* ExpressionStatement */:
                 return ts.updateExpressionStatement(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 222 /* IfStatement */:
+            case 223 /* IfStatement */:
                 return ts.updateIf(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.thenStatement, visitor, ts.isStatement, ts.liftToBlock), visitNode(node.elseStatement, visitor, ts.isStatement, ts.liftToBlock));
-            case 223 /* DoStatement */:
+            case 224 /* DoStatement */:
                 return ts.updateDo(node, visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock), visitNode(node.expression, visitor, ts.isExpression));
-            case 224 /* WhileStatement */:
+            case 225 /* WhileStatement */:
                 return ts.updateWhile(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock));
-            case 225 /* ForStatement */:
+            case 226 /* ForStatement */:
                 return ts.updateFor(node, visitNode(node.initializer, visitor, ts.isForInitializer), visitNode(node.condition, visitor, ts.isExpression), visitNode(node.incrementor, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock));
-            case 226 /* ForInStatement */:
+            case 227 /* ForInStatement */:
                 return ts.updateForIn(node, visitNode(node.initializer, visitor, ts.isForInitializer), visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock));
-            case 227 /* ForOfStatement */:
+            case 228 /* ForOfStatement */:
                 return ts.updateForOf(node, visitNode(node.awaitModifier, visitor, ts.isToken), visitNode(node.initializer, visitor, ts.isForInitializer), visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock));
-            case 228 /* ContinueStatement */:
+            case 229 /* ContinueStatement */:
                 return ts.updateContinue(node, visitNode(node.label, visitor, ts.isIdentifier));
-            case 229 /* BreakStatement */:
+            case 230 /* BreakStatement */:
                 return ts.updateBreak(node, visitNode(node.label, visitor, ts.isIdentifier));
-            case 230 /* ReturnStatement */:
+            case 231 /* ReturnStatement */:
                 return ts.updateReturn(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 231 /* WithStatement */:
+            case 232 /* WithStatement */:
                 return ts.updateWith(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock));
-            case 232 /* SwitchStatement */:
+            case 233 /* SwitchStatement */:
                 return ts.updateSwitch(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.caseBlock, visitor, ts.isCaseBlock));
-            case 233 /* LabeledStatement */:
+            case 234 /* LabeledStatement */:
                 return ts.updateLabel(node, visitNode(node.label, visitor, ts.isIdentifier), visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock));
-            case 234 /* ThrowStatement */:
+            case 235 /* ThrowStatement */:
                 return ts.updateThrow(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 235 /* TryStatement */:
+            case 236 /* TryStatement */:
                 return ts.updateTry(node, visitNode(node.tryBlock, visitor, ts.isBlock), visitNode(node.catchClause, visitor, ts.isCatchClause), visitNode(node.finallyBlock, visitor, ts.isBlock));
-            case 237 /* VariableDeclaration */:
+            case 238 /* VariableDeclaration */:
                 return ts.updateVariableDeclaration(node, visitNode(node.name, visitor, ts.isBindingName), visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.initializer, visitor, ts.isExpression));
-            case 238 /* VariableDeclarationList */:
+            case 239 /* VariableDeclarationList */:
                 return ts.updateVariableDeclarationList(node, nodesVisitor(node.declarations, visitor, ts.isVariableDeclaration));
-            case 239 /* FunctionDeclaration */:
+            case 240 /* FunctionDeclaration */:
                 return ts.updateFunctionDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.asteriskToken, tokenVisitor, ts.isToken), visitNode(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitNode(node.type, visitor, ts.isTypeNode), visitFunctionBody(node.body, visitor, context));
-            case 240 /* ClassDeclaration */:
+            case 241 /* ClassDeclaration */:
                 return ts.updateClassDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.heritageClauses, visitor, ts.isHeritageClause), nodesVisitor(node.members, visitor, ts.isClassElement));
-            case 241 /* InterfaceDeclaration */:
+            case 242 /* InterfaceDeclaration */:
                 return ts.updateInterfaceDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.heritageClauses, visitor, ts.isHeritageClause), nodesVisitor(node.members, visitor, ts.isTypeElement));
-            case 242 /* TypeAliasDeclaration */:
+            case 243 /* TypeAliasDeclaration */:
                 return ts.updateTypeAliasDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode));
-            case 243 /* EnumDeclaration */:
+            case 244 /* EnumDeclaration */:
                 return ts.updateEnumDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier), nodesVisitor(node.members, visitor, ts.isEnumMember));
-            case 244 /* ModuleDeclaration */:
+            case 245 /* ModuleDeclaration */:
                 return ts.updateModuleDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.body, visitor, ts.isModuleBody));
-            case 245 /* ModuleBlock */:
+            case 246 /* ModuleBlock */:
                 return ts.updateModuleBlock(node, nodesVisitor(node.statements, visitor, ts.isStatement));
-            case 246 /* CaseBlock */:
+            case 247 /* CaseBlock */:
                 return ts.updateCaseBlock(node, nodesVisitor(node.clauses, visitor, ts.isCaseOrDefaultClause));
-            case 247 /* NamespaceExportDeclaration */:
+            case 248 /* NamespaceExportDeclaration */:
                 return ts.updateNamespaceExportDeclaration(node, visitNode(node.name, visitor, ts.isIdentifier));
-            case 248 /* ImportEqualsDeclaration */:
+            case 249 /* ImportEqualsDeclaration */:
                 return ts.updateImportEqualsDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.moduleReference, visitor, ts.isModuleReference));
-            case 249 /* ImportDeclaration */:
+            case 250 /* ImportDeclaration */:
                 return ts.updateImportDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.importClause, visitor, ts.isImportClause), visitNode(node.moduleSpecifier, visitor, ts.isExpression));
-            case 250 /* ImportClause */:
+            case 251 /* ImportClause */:
                 return ts.updateImportClause(node, visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.namedBindings, visitor, ts.isNamedImportBindings));
-            case 251 /* NamespaceImport */:
+            case 252 /* NamespaceImport */:
                 return ts.updateNamespaceImport(node, visitNode(node.name, visitor, ts.isIdentifier));
-            case 252 /* NamedImports */:
+            case 253 /* NamedImports */:
                 return ts.updateNamedImports(node, nodesVisitor(node.elements, visitor, ts.isImportSpecifier));
-            case 253 /* ImportSpecifier */:
+            case 254 /* ImportSpecifier */:
                 return ts.updateImportSpecifier(node, visitNode(node.propertyName, visitor, ts.isIdentifier), visitNode(node.name, visitor, ts.isIdentifier));
-            case 254 /* ExportAssignment */:
+            case 255 /* ExportAssignment */:
                 return ts.updateExportAssignment(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.expression, visitor, ts.isExpression));
-            case 255 /* ExportDeclaration */:
+            case 256 /* ExportDeclaration */:
                 return ts.updateExportDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.exportClause, visitor, ts.isNamedExports), visitNode(node.moduleSpecifier, visitor, ts.isExpression));
-            case 256 /* NamedExports */:
+            case 257 /* NamedExports */:
                 return ts.updateNamedExports(node, nodesVisitor(node.elements, visitor, ts.isExportSpecifier));
-            case 257 /* ExportSpecifier */:
+            case 258 /* ExportSpecifier */:
                 return ts.updateExportSpecifier(node, visitNode(node.propertyName, visitor, ts.isIdentifier), visitNode(node.name, visitor, ts.isIdentifier));
             // Module references
-            case 259 /* ExternalModuleReference */:
+            case 260 /* ExternalModuleReference */:
                 return ts.updateExternalModuleReference(node, visitNode(node.expression, visitor, ts.isExpression));
             // JSX
-            case 260 /* JsxElement */:
+            case 261 /* JsxElement */:
                 return ts.updateJsxElement(node, visitNode(node.openingElement, visitor, ts.isJsxOpeningElement), nodesVisitor(node.children, visitor, ts.isJsxChild), visitNode(node.closingElement, visitor, ts.isJsxClosingElement));
-            case 261 /* JsxSelfClosingElement */:
+            case 262 /* JsxSelfClosingElement */:
                 return ts.updateJsxSelfClosingElement(node, visitNode(node.tagName, visitor, ts.isJsxTagNameExpression), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode), visitNode(node.attributes, visitor, ts.isJsxAttributes));
-            case 262 /* JsxOpeningElement */:
+            case 263 /* JsxOpeningElement */:
                 return ts.updateJsxOpeningElement(node, visitNode(node.tagName, visitor, ts.isJsxTagNameExpression), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode), visitNode(node.attributes, visitor, ts.isJsxAttributes));
-            case 263 /* JsxClosingElement */:
+            case 264 /* JsxClosingElement */:
                 return ts.updateJsxClosingElement(node, visitNode(node.tagName, visitor, ts.isJsxTagNameExpression));
-            case 264 /* JsxFragment */:
+            case 265 /* JsxFragment */:
                 return ts.updateJsxFragment(node, visitNode(node.openingFragment, visitor, ts.isJsxOpeningFragment), nodesVisitor(node.children, visitor, ts.isJsxChild), visitNode(node.closingFragment, visitor, ts.isJsxClosingFragment));
-            case 267 /* JsxAttribute */:
+            case 268 /* JsxAttribute */:
                 return ts.updateJsxAttribute(node, visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.initializer, visitor, ts.isStringLiteralOrJsxExpression));
-            case 268 /* JsxAttributes */:
+            case 269 /* JsxAttributes */:
                 return ts.updateJsxAttributes(node, nodesVisitor(node.properties, visitor, ts.isJsxAttributeLike));
-            case 269 /* JsxSpreadAttribute */:
+            case 270 /* JsxSpreadAttribute */:
                 return ts.updateJsxSpreadAttribute(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 270 /* JsxExpression */:
+            case 271 /* JsxExpression */:
                 return ts.updateJsxExpression(node, visitNode(node.expression, visitor, ts.isExpression));
             // Clauses
-            case 271 /* CaseClause */:
+            case 272 /* CaseClause */:
                 return ts.updateCaseClause(node, visitNode(node.expression, visitor, ts.isExpression), nodesVisitor(node.statements, visitor, ts.isStatement));
-            case 272 /* DefaultClause */:
+            case 273 /* DefaultClause */:
                 return ts.updateDefaultClause(node, nodesVisitor(node.statements, visitor, ts.isStatement));
-            case 273 /* HeritageClause */:
+            case 274 /* HeritageClause */:
                 return ts.updateHeritageClause(node, nodesVisitor(node.types, visitor, ts.isExpressionWithTypeArguments));
-            case 274 /* CatchClause */:
+            case 275 /* CatchClause */:
                 return ts.updateCatchClause(node, visitNode(node.variableDeclaration, visitor, ts.isVariableDeclaration), visitNode(node.block, visitor, ts.isBlock));
             // Property assignments
-            case 275 /* PropertyAssignment */:
+            case 276 /* PropertyAssignment */:
                 return ts.updatePropertyAssignment(node, visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.initializer, visitor, ts.isExpression));
-            case 276 /* ShorthandPropertyAssignment */:
+            case 277 /* ShorthandPropertyAssignment */:
                 return ts.updateShorthandPropertyAssignment(node, visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.objectAssignmentInitializer, visitor, ts.isExpression));
-            case 277 /* SpreadAssignment */:
+            case 278 /* SpreadAssignment */:
                 return ts.updateSpreadAssignment(node, visitNode(node.expression, visitor, ts.isExpression));
             // Enum
-            case 278 /* EnumMember */:
+            case 279 /* EnumMember */:
                 return ts.updateEnumMember(node, visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.initializer, visitor, ts.isExpression));
             // Top-level nodes
-            case 284 /* SourceFile */:
+            case 285 /* SourceFile */:
                 return ts.updateSourceFileNode(node, visitLexicalEnvironment(node.statements, visitor, context));
             // Transformation nodes
-            case 313 /* PartiallyEmittedExpression */:
+            case 315 /* PartiallyEmittedExpression */:
                 return ts.updatePartiallyEmittedExpression(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 314 /* CommaListExpression */:
+            case 316 /* CommaListExpression */:
                 return ts.updateCommaList(node, nodesVisitor(node.elements, visitor, ts.isExpression));
             default:
                 // No need to visit nodes with no children.
@@ -65219,58 +67395,58 @@ var ts;
         var cbNodes = cbNodeArray || cbNode;
         var kind = node.kind;
         // No need to visit nodes with no children.
-        if ((kind > 0 /* FirstToken */ && kind <= 147 /* LastToken */)) {
+        if ((kind > 0 /* FirstToken */ && kind <= 148 /* LastToken */)) {
             return initial;
         }
         // We do not yet support types.
-        if ((kind >= 163 /* TypePredicate */ && kind <= 182 /* LiteralType */)) {
+        if ((kind >= 164 /* TypePredicate */ && kind <= 183 /* LiteralType */)) {
             return initial;
         }
         var result = initial;
         switch (node.kind) {
             // Leaf nodes
-            case 217 /* SemicolonClassElement */:
-            case 220 /* EmptyStatement */:
-            case 210 /* OmittedExpression */:
-            case 236 /* DebuggerStatement */:
-            case 312 /* NotEmittedStatement */:
+            case 218 /* SemicolonClassElement */:
+            case 221 /* EmptyStatement */:
+            case 211 /* OmittedExpression */:
+            case 237 /* DebuggerStatement */:
+            case 314 /* NotEmittedStatement */:
                 // No need to visit nodes with no children.
                 break;
             // Names
-            case 148 /* QualifiedName */:
+            case 149 /* QualifiedName */:
                 result = reduceNode(node.left, cbNode, result);
                 result = reduceNode(node.right, cbNode, result);
                 break;
-            case 149 /* ComputedPropertyName */:
+            case 150 /* ComputedPropertyName */:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
             // Signature elements
-            case 151 /* Parameter */:
+            case 152 /* Parameter */:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.type, cbNode, result);
                 result = reduceNode(node.initializer, cbNode, result);
                 break;
-            case 152 /* Decorator */:
+            case 153 /* Decorator */:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
             // Type member
-            case 153 /* PropertySignature */:
+            case 154 /* PropertySignature */:
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.questionToken, cbNode, result);
                 result = reduceNode(node.type, cbNode, result);
                 result = reduceNode(node.initializer, cbNode, result);
                 break;
-            case 154 /* PropertyDeclaration */:
+            case 155 /* PropertyDeclaration */:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.type, cbNode, result);
                 result = reduceNode(node.initializer, cbNode, result);
                 break;
-            case 156 /* MethodDeclaration */:
+            case 157 /* MethodDeclaration */:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
@@ -65279,12 +67455,12 @@ var ts;
                 result = reduceNode(node.type, cbNode, result);
                 result = reduceNode(node.body, cbNode, result);
                 break;
-            case 157 /* Constructor */:
+            case 158 /* Constructor */:
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNodes(node.parameters, cbNodes, result);
                 result = reduceNode(node.body, cbNode, result);
                 break;
-            case 158 /* GetAccessor */:
+            case 159 /* GetAccessor */:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
@@ -65292,7 +67468,7 @@ var ts;
                 result = reduceNode(node.type, cbNode, result);
                 result = reduceNode(node.body, cbNode, result);
                 break;
-            case 159 /* SetAccessor */:
+            case 160 /* SetAccessor */:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
@@ -65300,50 +67476,50 @@ var ts;
                 result = reduceNode(node.body, cbNode, result);
                 break;
             // Binding patterns
-            case 184 /* ObjectBindingPattern */:
-            case 185 /* ArrayBindingPattern */:
+            case 185 /* ObjectBindingPattern */:
+            case 186 /* ArrayBindingPattern */:
                 result = reduceNodes(node.elements, cbNodes, result);
                 break;
-            case 186 /* BindingElement */:
+            case 187 /* BindingElement */:
                 result = reduceNode(node.propertyName, cbNode, result);
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.initializer, cbNode, result);
                 break;
             // Expression
-            case 187 /* ArrayLiteralExpression */:
+            case 188 /* ArrayLiteralExpression */:
                 result = reduceNodes(node.elements, cbNodes, result);
                 break;
-            case 188 /* ObjectLiteralExpression */:
+            case 189 /* ObjectLiteralExpression */:
                 result = reduceNodes(node.properties, cbNodes, result);
                 break;
-            case 189 /* PropertyAccessExpression */:
+            case 190 /* PropertyAccessExpression */:
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNode(node.name, cbNode, result);
                 break;
-            case 190 /* ElementAccessExpression */:
+            case 191 /* ElementAccessExpression */:
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNode(node.argumentExpression, cbNode, result);
                 break;
-            case 191 /* CallExpression */:
+            case 192 /* CallExpression */:
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNodes(node.typeArguments, cbNodes, result);
                 result = reduceNodes(node.arguments, cbNodes, result);
                 break;
-            case 192 /* NewExpression */:
+            case 193 /* NewExpression */:
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNodes(node.typeArguments, cbNodes, result);
                 result = reduceNodes(node.arguments, cbNodes, result);
                 break;
-            case 193 /* TaggedTemplateExpression */:
+            case 194 /* TaggedTemplateExpression */:
                 result = reduceNode(node.tag, cbNode, result);
                 result = reduceNodes(node.typeArguments, cbNodes, result);
                 result = reduceNode(node.template, cbNode, result);
                 break;
-            case 194 /* TypeAssertionExpression */:
+            case 195 /* TypeAssertionExpression */:
                 result = reduceNode(node.type, cbNode, result);
                 result = reduceNode(node.expression, cbNode, result);
                 break;
-            case 196 /* FunctionExpression */:
+            case 197 /* FunctionExpression */:
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNodes(node.typeParameters, cbNodes, result);
@@ -65351,123 +67527,123 @@ var ts;
                 result = reduceNode(node.type, cbNode, result);
                 result = reduceNode(node.body, cbNode, result);
                 break;
-            case 197 /* ArrowFunction */:
+            case 198 /* ArrowFunction */:
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNodes(node.typeParameters, cbNodes, result);
                 result = reduceNodes(node.parameters, cbNodes, result);
                 result = reduceNode(node.type, cbNode, result);
                 result = reduceNode(node.body, cbNode, result);
                 break;
-            case 195 /* ParenthesizedExpression */:
-            case 198 /* DeleteExpression */:
-            case 199 /* TypeOfExpression */:
-            case 200 /* VoidExpression */:
-            case 201 /* AwaitExpression */:
-            case 207 /* YieldExpression */:
-            case 208 /* SpreadElement */:
-            case 213 /* NonNullExpression */:
+            case 196 /* ParenthesizedExpression */:
+            case 199 /* DeleteExpression */:
+            case 200 /* TypeOfExpression */:
+            case 201 /* VoidExpression */:
+            case 202 /* AwaitExpression */:
+            case 208 /* YieldExpression */:
+            case 209 /* SpreadElement */:
+            case 214 /* NonNullExpression */:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
-            case 202 /* PrefixUnaryExpression */:
-            case 203 /* PostfixUnaryExpression */:
+            case 203 /* PrefixUnaryExpression */:
+            case 204 /* PostfixUnaryExpression */:
                 result = reduceNode(node.operand, cbNode, result);
                 break;
-            case 204 /* BinaryExpression */:
+            case 205 /* BinaryExpression */:
                 result = reduceNode(node.left, cbNode, result);
                 result = reduceNode(node.right, cbNode, result);
                 break;
-            case 205 /* ConditionalExpression */:
+            case 206 /* ConditionalExpression */:
                 result = reduceNode(node.condition, cbNode, result);
                 result = reduceNode(node.whenTrue, cbNode, result);
                 result = reduceNode(node.whenFalse, cbNode, result);
                 break;
-            case 206 /* TemplateExpression */:
+            case 207 /* TemplateExpression */:
                 result = reduceNode(node.head, cbNode, result);
                 result = reduceNodes(node.templateSpans, cbNodes, result);
                 break;
-            case 209 /* ClassExpression */:
+            case 210 /* ClassExpression */:
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNodes(node.typeParameters, cbNodes, result);
                 result = reduceNodes(node.heritageClauses, cbNodes, result);
                 result = reduceNodes(node.members, cbNodes, result);
                 break;
-            case 211 /* ExpressionWithTypeArguments */:
+            case 212 /* ExpressionWithTypeArguments */:
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNodes(node.typeArguments, cbNodes, result);
                 break;
-            case 212 /* AsExpression */:
+            case 213 /* AsExpression */:
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNode(node.type, cbNode, result);
                 break;
             // Misc
-            case 216 /* TemplateSpan */:
+            case 217 /* TemplateSpan */:
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNode(node.literal, cbNode, result);
                 break;
             // Element
-            case 218 /* Block */:
+            case 219 /* Block */:
                 result = reduceNodes(node.statements, cbNodes, result);
                 break;
-            case 219 /* VariableStatement */:
+            case 220 /* VariableStatement */:
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.declarationList, cbNode, result);
                 break;
-            case 221 /* ExpressionStatement */:
+            case 222 /* ExpressionStatement */:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
-            case 222 /* IfStatement */:
+            case 223 /* IfStatement */:
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNode(node.thenStatement, cbNode, result);
                 result = reduceNode(node.elseStatement, cbNode, result);
                 break;
-            case 223 /* DoStatement */:
+            case 224 /* DoStatement */:
                 result = reduceNode(node.statement, cbNode, result);
                 result = reduceNode(node.expression, cbNode, result);
                 break;
-            case 224 /* WhileStatement */:
-            case 231 /* WithStatement */:
+            case 225 /* WhileStatement */:
+            case 232 /* WithStatement */:
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNode(node.statement, cbNode, result);
                 break;
-            case 225 /* ForStatement */:
+            case 226 /* ForStatement */:
                 result = reduceNode(node.initializer, cbNode, result);
                 result = reduceNode(node.condition, cbNode, result);
                 result = reduceNode(node.incrementor, cbNode, result);
                 result = reduceNode(node.statement, cbNode, result);
                 break;
-            case 226 /* ForInStatement */:
-            case 227 /* ForOfStatement */:
+            case 227 /* ForInStatement */:
+            case 228 /* ForOfStatement */:
                 result = reduceNode(node.initializer, cbNode, result);
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNode(node.statement, cbNode, result);
                 break;
-            case 230 /* ReturnStatement */:
-            case 234 /* ThrowStatement */:
+            case 231 /* ReturnStatement */:
+            case 235 /* ThrowStatement */:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
-            case 232 /* SwitchStatement */:
+            case 233 /* SwitchStatement */:
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNode(node.caseBlock, cbNode, result);
                 break;
-            case 233 /* LabeledStatement */:
+            case 234 /* LabeledStatement */:
                 result = reduceNode(node.label, cbNode, result);
                 result = reduceNode(node.statement, cbNode, result);
                 break;
-            case 235 /* TryStatement */:
+            case 236 /* TryStatement */:
                 result = reduceNode(node.tryBlock, cbNode, result);
                 result = reduceNode(node.catchClause, cbNode, result);
                 result = reduceNode(node.finallyBlock, cbNode, result);
                 break;
-            case 237 /* VariableDeclaration */:
+            case 238 /* VariableDeclaration */:
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.type, cbNode, result);
                 result = reduceNode(node.initializer, cbNode, result);
                 break;
-            case 238 /* VariableDeclarationList */:
+            case 239 /* VariableDeclarationList */:
                 result = reduceNodes(node.declarations, cbNodes, result);
                 break;
-            case 239 /* FunctionDeclaration */:
+            case 240 /* FunctionDeclaration */:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
@@ -65476,7 +67652,7 @@ var ts;
                 result = reduceNode(node.type, cbNode, result);
                 result = reduceNode(node.body, cbNode, result);
                 break;
-            case 240 /* ClassDeclaration */:
+            case 241 /* ClassDeclaration */:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
@@ -65484,140 +67660,140 @@ var ts;
                 result = reduceNodes(node.heritageClauses, cbNodes, result);
                 result = reduceNodes(node.members, cbNodes, result);
                 break;
-            case 243 /* EnumDeclaration */:
+            case 244 /* EnumDeclaration */:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNodes(node.members, cbNodes, result);
                 break;
-            case 244 /* ModuleDeclaration */:
+            case 245 /* ModuleDeclaration */:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.body, cbNode, result);
                 break;
-            case 245 /* ModuleBlock */:
+            case 246 /* ModuleBlock */:
                 result = reduceNodes(node.statements, cbNodes, result);
                 break;
-            case 246 /* CaseBlock */:
+            case 247 /* CaseBlock */:
                 result = reduceNodes(node.clauses, cbNodes, result);
                 break;
-            case 248 /* ImportEqualsDeclaration */:
+            case 249 /* ImportEqualsDeclaration */:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.moduleReference, cbNode, result);
                 break;
-            case 249 /* ImportDeclaration */:
+            case 250 /* ImportDeclaration */:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.importClause, cbNode, result);
                 result = reduceNode(node.moduleSpecifier, cbNode, result);
                 break;
-            case 250 /* ImportClause */:
+            case 251 /* ImportClause */:
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.namedBindings, cbNode, result);
                 break;
-            case 251 /* NamespaceImport */:
+            case 252 /* NamespaceImport */:
                 result = reduceNode(node.name, cbNode, result);
                 break;
-            case 252 /* NamedImports */:
-            case 256 /* NamedExports */:
+            case 253 /* NamedImports */:
+            case 257 /* NamedExports */:
                 result = reduceNodes(node.elements, cbNodes, result);
                 break;
-            case 253 /* ImportSpecifier */:
-            case 257 /* ExportSpecifier */:
+            case 254 /* ImportSpecifier */:
+            case 258 /* ExportSpecifier */:
                 result = reduceNode(node.propertyName, cbNode, result);
                 result = reduceNode(node.name, cbNode, result);
                 break;
-            case 254 /* ExportAssignment */:
+            case 255 /* ExportAssignment */:
                 result = ts.reduceLeft(node.decorators, cbNode, result);
                 result = ts.reduceLeft(node.modifiers, cbNode, result);
                 result = reduceNode(node.expression, cbNode, result);
                 break;
-            case 255 /* ExportDeclaration */:
+            case 256 /* ExportDeclaration */:
                 result = ts.reduceLeft(node.decorators, cbNode, result);
                 result = ts.reduceLeft(node.modifiers, cbNode, result);
                 result = reduceNode(node.exportClause, cbNode, result);
                 result = reduceNode(node.moduleSpecifier, cbNode, result);
                 break;
             // Module references
-            case 259 /* ExternalModuleReference */:
+            case 260 /* ExternalModuleReference */:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
             // JSX
-            case 260 /* JsxElement */:
+            case 261 /* JsxElement */:
                 result = reduceNode(node.openingElement, cbNode, result);
                 result = ts.reduceLeft(node.children, cbNode, result);
                 result = reduceNode(node.closingElement, cbNode, result);
                 break;
-            case 264 /* JsxFragment */:
+            case 265 /* JsxFragment */:
                 result = reduceNode(node.openingFragment, cbNode, result);
                 result = ts.reduceLeft(node.children, cbNode, result);
                 result = reduceNode(node.closingFragment, cbNode, result);
                 break;
-            case 261 /* JsxSelfClosingElement */:
-            case 262 /* JsxOpeningElement */:
+            case 262 /* JsxSelfClosingElement */:
+            case 263 /* JsxOpeningElement */:
                 result = reduceNode(node.tagName, cbNode, result);
                 result = reduceNodes(node.typeArguments, cbNode, result);
                 result = reduceNode(node.attributes, cbNode, result);
                 break;
-            case 268 /* JsxAttributes */:
+            case 269 /* JsxAttributes */:
                 result = reduceNodes(node.properties, cbNodes, result);
                 break;
-            case 263 /* JsxClosingElement */:
+            case 264 /* JsxClosingElement */:
                 result = reduceNode(node.tagName, cbNode, result);
                 break;
-            case 267 /* JsxAttribute */:
+            case 268 /* JsxAttribute */:
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.initializer, cbNode, result);
                 break;
-            case 269 /* JsxSpreadAttribute */:
+            case 270 /* JsxSpreadAttribute */:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
-            case 270 /* JsxExpression */:
+            case 271 /* JsxExpression */:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
             // Clauses
-            case 271 /* CaseClause */:
+            case 272 /* CaseClause */:
                 result = reduceNode(node.expression, cbNode, result);
             // falls through
-            case 272 /* DefaultClause */:
+            case 273 /* DefaultClause */:
                 result = reduceNodes(node.statements, cbNodes, result);
                 break;
-            case 273 /* HeritageClause */:
+            case 274 /* HeritageClause */:
                 result = reduceNodes(node.types, cbNodes, result);
                 break;
-            case 274 /* CatchClause */:
+            case 275 /* CatchClause */:
                 result = reduceNode(node.variableDeclaration, cbNode, result);
                 result = reduceNode(node.block, cbNode, result);
                 break;
             // Property assignments
-            case 275 /* PropertyAssignment */:
+            case 276 /* PropertyAssignment */:
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.initializer, cbNode, result);
                 break;
-            case 276 /* ShorthandPropertyAssignment */:
+            case 277 /* ShorthandPropertyAssignment */:
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.objectAssignmentInitializer, cbNode, result);
                 break;
-            case 277 /* SpreadAssignment */:
+            case 278 /* SpreadAssignment */:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
             // Enum
-            case 278 /* EnumMember */:
+            case 279 /* EnumMember */:
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.initializer, cbNode, result);
                 break;
             // Top-level nodes
-            case 284 /* SourceFile */:
+            case 285 /* SourceFile */:
                 result = reduceNodes(node.statements, cbNodes, result);
                 break;
             // Transformation nodes
-            case 313 /* PartiallyEmittedExpression */:
+            case 315 /* PartiallyEmittedExpression */:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
-            case 314 /* CommaListExpression */:
+            case 316 /* CommaListExpression */:
                 result = reduceNodes(node.elements, cbNodes, result);
                 break;
             default:
@@ -65641,7 +67817,7 @@ var ts;
      * @param nodes The NodeArray.
      */
     function liftToBlock(nodes) {
-        Debug.assert(ts.every(nodes, ts.isStatement), "Cannot lift nodes to a Block.");
+        ts.Debug.assert(ts.every(nodes, ts.isStatement), "Cannot lift nodes to a Block.");
         return ts.singleOrUndefined(nodes) || ts.createBlock(nodes);
     }
     ts.liftToBlock = liftToBlock;
@@ -65690,7 +67866,7 @@ var ts;
     function aggregateTransformFlagsForSubtree(node) {
         // We do not transform ambient declarations or types, so there is no need to
         // recursively aggregate transform flags.
-        if (ts.hasModifier(node, 2 /* Ambient */) || (ts.isTypeNode(node) && node.kind !== 211 /* ExpressionWithTypeArguments */)) {
+        if (ts.hasModifier(node, 2 /* Ambient */) || (ts.isTypeNode(node) && node.kind !== 212 /* ExpressionWithTypeArguments */)) {
             return 0 /* None */;
         }
         // Aggregate the transform flags of each child.
@@ -65706,73 +67882,6 @@ var ts;
     function aggregateTransformFlagsForChildNodes(transformFlags, nodes) {
         return transformFlags | aggregateTransformFlagsForNodeArray(nodes);
     }
-    var Debug;
-    (function (Debug) {
-        var isDebugInfoEnabled = false;
-        function failBadSyntaxKind(node, message) {
-            return Debug.fail((message || "Unexpected node.") + "\r\nNode " + ts.formatSyntaxKind(node.kind) + " was unexpected.", failBadSyntaxKind);
-        }
-        Debug.failBadSyntaxKind = failBadSyntaxKind;
-        Debug.assertEachNode = Debug.shouldAssert(1 /* Normal */)
-            ? function (nodes, test, message) { return Debug.assert(test === undefined || ts.every(nodes, test), message || "Unexpected node.", function () { return "Node array did not pass test '" + Debug.getFunctionName(test) + "'."; }, Debug.assertEachNode); }
-            : ts.noop;
-        Debug.assertNode = Debug.shouldAssert(1 /* Normal */)
-            ? function (node, test, message) { return Debug.assert(test === undefined || test(node), message || "Unexpected node.", function () { return "Node " + ts.formatSyntaxKind(node.kind) + " did not pass test '" + Debug.getFunctionName(test) + "'."; }, Debug.assertNode); }
-            : ts.noop;
-        Debug.assertOptionalNode = Debug.shouldAssert(1 /* Normal */)
-            ? function (node, test, message) { return Debug.assert(test === undefined || node === undefined || test(node), message || "Unexpected node.", function () { return "Node " + ts.formatSyntaxKind(node.kind) + " did not pass test '" + Debug.getFunctionName(test) + "'."; }, Debug.assertOptionalNode); }
-            : ts.noop;
-        Debug.assertOptionalToken = Debug.shouldAssert(1 /* Normal */)
-            ? function (node, kind, message) { return Debug.assert(kind === undefined || node === undefined || node.kind === kind, message || "Unexpected node.", function () { return "Node " + ts.formatSyntaxKind(node.kind) + " was not a '" + ts.formatSyntaxKind(kind) + "' token."; }, Debug.assertOptionalToken); }
-            : ts.noop;
-        Debug.assertMissingNode = Debug.shouldAssert(1 /* Normal */)
-            ? function (node, message) { return Debug.assert(node === undefined, message || "Unexpected node.", function () { return "Node " + ts.formatSyntaxKind(node.kind) + " was unexpected'."; }, Debug.assertMissingNode); }
-            : ts.noop;
-        /**
-         * Injects debug information into frequently used types.
-         */
-        function enableDebugInfo() {
-            if (isDebugInfoEnabled)
-                return;
-            // Add additional properties in debug mode to assist with debugging.
-            Object.defineProperties(ts.objectAllocator.getSymbolConstructor().prototype, {
-                __debugFlags: { get: function () { return ts.formatSymbolFlags(this.flags); } }
-            });
-            Object.defineProperties(ts.objectAllocator.getTypeConstructor().prototype, {
-                __debugFlags: { get: function () { return ts.formatTypeFlags(this.flags); } },
-                __debugObjectFlags: { get: function () { return this.flags & 524288 /* Object */ ? ts.formatObjectFlags(this.objectFlags) : ""; } },
-                __debugTypeToString: { value: function () { return this.checker.typeToString(this); } },
-            });
-            var nodeConstructors = [
-                ts.objectAllocator.getNodeConstructor(),
-                ts.objectAllocator.getIdentifierConstructor(),
-                ts.objectAllocator.getTokenConstructor(),
-                ts.objectAllocator.getSourceFileConstructor()
-            ];
-            for (var _i = 0, nodeConstructors_1 = nodeConstructors; _i < nodeConstructors_1.length; _i++) {
-                var ctor = nodeConstructors_1[_i];
-                if (!ctor.prototype.hasOwnProperty("__debugKind")) {
-                    Object.defineProperties(ctor.prototype, {
-                        __debugKind: { get: function () { return ts.formatSyntaxKind(this.kind); } },
-                        __debugModifierFlags: { get: function () { return ts.formatModifierFlags(ts.getModifierFlagsNoCache(this)); } },
-                        __debugTransformFlags: { get: function () { return ts.formatTransformFlags(this.transformFlags); } },
-                        __debugEmitFlags: { get: function () { return ts.formatEmitFlags(ts.getEmitFlags(this)); } },
-                        __debugGetText: {
-                            value: function (includeTrivia) {
-                                if (ts.nodeIsSynthesized(this))
-                                    return "";
-                                var parseNode = ts.getParseTreeNode(this);
-                                var sourceFile = parseNode && ts.getSourceFileOfNode(parseNode);
-                                return sourceFile ? ts.getSourceTextOfNodeFromSourceFile(sourceFile, parseNode, includeTrivia) : "";
-                            }
-                        }
-                    });
-                }
-            }
-            isDebugInfoEnabled = true;
-        }
-        Debug.enableDebugInfo = enableDebugInfo;
-    })(Debug = ts.Debug || (ts.Debug = {}));
 })(ts || (ts = {}));
 /* @internal */
 var ts;
@@ -65899,7 +68008,6 @@ var ts;
             exit();
         }
         function appendSourceMap(generatedLine, generatedCharacter, map, sourceMapPath, start, end) {
-            var _a;
             ts.Debug.assert(generatedLine >= pendingGeneratedLine, "generatedLine cannot backtrack");
             ts.Debug.assert(generatedCharacter >= 0, "generatedCharacter cannot be negative");
             enter();
@@ -65907,7 +68015,8 @@ var ts;
             var sourceIndexToNewSourceIndexMap = [];
             var nameIndexToNewNameIndexMap;
             var mappingIterator = decodeMappings(map.mappings);
-            for (var _b = mappingIterator.next(), raw = _b.value, done = _b.done; !done; _a = mappingIterator.next(), raw = _a.value, done = _a.done, _a) {
+            for (var iterResult = mappingIterator.next(); !iterResult.done; iterResult = mappingIterator.next()) {
+                var raw = iterResult.value;
                 if (end && (raw.generatedLine > end.line ||
                     (raw.generatedLine === end.line && raw.generatedCharacter > end.character))) {
                     break;
@@ -66430,7 +68539,7 @@ var ts;
     function chainBundle(transformSourceFile) {
         return transformSourceFileOrBundle;
         function transformSourceFileOrBundle(node) {
-            return node.kind === 284 /* SourceFile */ ? transformSourceFile(node) : transformBundle(node);
+            return node.kind === 285 /* SourceFile */ ? transformSourceFile(node) : transformBundle(node);
         }
         function transformBundle(node) {
             return ts.createBundle(ts.map(node.sourceFiles, transformSourceFile), node.prepends);
@@ -66476,7 +68585,7 @@ var ts;
         for (var _i = 0, _a = sourceFile.statements; _i < _a.length; _i++) {
             var node = _a[_i];
             switch (node.kind) {
-                case 249 /* ImportDeclaration */:
+                case 250 /* ImportDeclaration */:
                     // import "mod"
                     // import x from "mod"
                     // import * as x from "mod"
@@ -66484,13 +68593,13 @@ var ts;
                     externalImports.push(node);
                     hasImportStarOrImportDefault = hasImportStarOrImportDefault || getImportNeedsImportStarHelper(node) || getImportNeedsImportDefaultHelper(node);
                     break;
-                case 248 /* ImportEqualsDeclaration */:
-                    if (node.moduleReference.kind === 259 /* ExternalModuleReference */) {
+                case 249 /* ImportEqualsDeclaration */:
+                    if (node.moduleReference.kind === 260 /* ExternalModuleReference */) {
                         // import x = require("mod")
                         externalImports.push(node);
                     }
                     break;
-                case 255 /* ExportDeclaration */:
+                case 256 /* ExportDeclaration */:
                     if (node.moduleSpecifier) {
                         if (!node.exportClause) {
                             // export * from "mod"
@@ -66520,13 +68629,13 @@ var ts;
                         }
                     }
                     break;
-                case 254 /* ExportAssignment */:
+                case 255 /* ExportAssignment */:
                     if (node.isExportEquals && !exportEquals) {
                         // export = x
                         exportEquals = node;
                     }
                     break;
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     if (ts.hasModifier(node, 1 /* Export */)) {
                         for (var _d = 0, _e = node.declarationList.declarations; _d < _e.length; _d++) {
                             var decl = _e[_d];
@@ -66534,7 +68643,7 @@ var ts;
                         }
                     }
                     break;
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     if (ts.hasModifier(node, 1 /* Export */)) {
                         if (ts.hasModifier(node, 512 /* Default */)) {
                             // export default function() { }
@@ -66554,7 +68663,7 @@ var ts;
                         }
                     }
                     break;
-                case 240 /* ClassDeclaration */:
+                case 241 /* ClassDeclaration */:
                     if (ts.hasModifier(node, 1 /* Export */)) {
                         if (ts.hasModifier(node, 512 /* Default */)) {
                             // export default class { }
@@ -66628,6 +68737,43 @@ var ts;
             ts.isIdentifier(expression);
     }
     ts.isSimpleCopiableExpression = isSimpleCopiableExpression;
+    /**
+     * A simple inlinable expression is an expression which can be copied into multiple locations
+     * without risk of repeating any sideeffects and whose value could not possibly change between
+     * any such locations
+     */
+    function isSimpleInlineableExpression(expression) {
+        return !ts.isIdentifier(expression) && isSimpleCopiableExpression(expression) ||
+            ts.isWellKnownSymbolSyntactically(expression);
+    }
+    ts.isSimpleInlineableExpression = isSimpleInlineableExpression;
+    /**
+     * Adds super call and preceding prologue directives into the list of statements.
+     *
+     * @param ctor The constructor node.
+     * @param result The list of statements.
+     * @param visitor The visitor to apply to each node added to the result array.
+     * @returns index of the statement that follows super call
+     */
+    function addPrologueDirectivesAndInitialSuperCall(ctor, result, visitor) {
+        if (ctor.body) {
+            var statements = ctor.body.statements;
+            // add prologue directives to the list (if any)
+            var index = ts.addPrologue(result, statements, /*ensureUseStrict*/ false, visitor);
+            if (index === statements.length) {
+                // list contains nothing but prologue directives (or empty) - exit
+                return index;
+            }
+            var statement = statements[index];
+            if (statement.kind === 222 /* ExpressionStatement */ && ts.isSuperCall(statement.expression)) {
+                result.push(ts.visitNode(statement, visitor, ts.isStatement));
+                return index + 1;
+            }
+            return index;
+        }
+        return 0;
+    }
+    ts.addPrologueDirectivesAndInitialSuperCall = addPrologueDirectivesAndInitialSuperCall;
     /**
      * @param input Template string input strings
      * @param args Names which need to be made file-level unique
@@ -66648,6 +68794,45 @@ var ts;
         };
     }
     ts.helperString = helperString;
+    /**
+     * Gets all property declarations with initializers on either the static or instance side of a class.
+     *
+     * @param node The class node.
+     * @param isStatic A value indicating whether to get properties from the static or instance side of the class.
+     */
+    function getInitializedProperties(node, isStatic) {
+        return ts.filter(node.members, isStatic ? isStaticInitializedProperty : isInstanceInitializedProperty);
+    }
+    ts.getInitializedProperties = getInitializedProperties;
+    /**
+     * Gets a value indicating whether a class element is a static property declaration with an initializer.
+     *
+     * @param member The class element node.
+     */
+    function isStaticInitializedProperty(member) {
+        return isInitializedProperty(member) && ts.hasStaticModifier(member);
+    }
+    ts.isStaticInitializedProperty = isStaticInitializedProperty;
+    /**
+     * Gets a value indicating whether a class element is an instance property declaration with an initializer.
+     *
+     * @param member The class element node.
+     */
+    function isInstanceInitializedProperty(member) {
+        return isInitializedProperty(member) && !ts.hasStaticModifier(member);
+    }
+    ts.isInstanceInitializedProperty = isInstanceInitializedProperty;
+    /**
+     * Gets a value indicating whether a class element is either a static or an instance property declaration with an initializer.
+     *
+     * @param member The class element node.
+     * @param isStatic A value indicating whether the member should be a static or instance member.
+     */
+    function isInitializedProperty(member) {
+        return member.kind === 155 /* PropertyDeclaration */
+            && member.initializer !== undefined;
+    }
+    ts.isInitializedProperty = isInitializedProperty;
 })(ts || (ts = {}));
 /*@internal*/
 var ts;
@@ -67094,7 +69279,7 @@ var ts;
     ts.restHelper = {
         name: "typescript:rest",
         scoped: false,
-        text: "\n            var __rest = (this && this.__rest) || function (s, e) {\n                var t = {};\n                for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)\n                    t[p] = s[p];\n                if (s != null && typeof Object.getOwnPropertySymbols === \"function\")\n                    for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)\n                        t[p[i]] = s[p[i]];\n                return t;\n            };"
+        text: "\n            var __rest = (this && this.__rest) || function (s, e) {\n                var t = {};\n                for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)\n                    t[p] = s[p];\n                if (s != null && typeof Object.getOwnPropertySymbols === \"function\")\n                    for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {\n                        if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))\n                            t[p[i]] = s[p[i]];\n                    }\n                return t;\n            };"
     };
     /** Given value: o, propName: p, pattern: { a, b, ...p } from the original statement
      * `{ a, b, ...p } = o`, create `p = __rest(o, ["a", "b"]);`
@@ -67170,8 +69355,8 @@ var ts;
         context.onEmitNode = onEmitNode;
         context.onSubstituteNode = onSubstituteNode;
         // Enable substitution for property/element access to emit const enum values.
-        context.enableSubstitution(189 /* PropertyAccessExpression */);
-        context.enableSubstitution(190 /* ElementAccessExpression */);
+        context.enableSubstitution(190 /* PropertyAccessExpression */);
+        context.enableSubstitution(191 /* ElementAccessExpression */);
         // These variables contain state that changes as we descend into the tree.
         var currentSourceFile;
         var currentNamespace;
@@ -67179,6 +69364,7 @@ var ts;
         var currentLexicalScope;
         var currentNameScope;
         var currentScopeFirstDeclarationsOfName;
+        var currentClassHasParameterProperties;
         /**
          * Keeps track of whether expression substitution has been enabled for specific edge cases.
          * They are persisted between each SourceFile transformation and should not be reset.
@@ -67194,21 +69380,16 @@ var ts;
          * just-in-time substitution while printing an expression identifier.
          */
         var applicableSubstitutions;
-        /**
-         * Tracks what computed name expressions originating from elided names must be inlined
-         * at the next execution site, in document order
-         */
-        var pendingExpressions;
         return transformSourceFileOrBundle;
         function transformSourceFileOrBundle(node) {
-            if (node.kind === 285 /* Bundle */) {
+            if (node.kind === 286 /* Bundle */) {
                 return transformBundle(node);
             }
             return transformSourceFile(node);
         }
         function transformBundle(node) {
             return ts.createBundle(node.sourceFiles.map(transformSourceFile), ts.mapDefined(node.prepends, function (prepend) {
-                if (prepend.kind === 287 /* InputFiles */) {
+                if (prepend.kind === 288 /* InputFiles */) {
                     return ts.createUnparsedSourceFile(prepend, "js");
                 }
                 return prepend;
@@ -67239,6 +69420,7 @@ var ts;
             var savedCurrentScope = currentLexicalScope;
             var savedCurrentNameScope = currentNameScope;
             var savedCurrentScopeFirstDeclarationsOfName = currentScopeFirstDeclarationsOfName;
+            var savedCurrentClassHasParameterProperties = currentClassHasParameterProperties;
             // Handle state changes before visiting a node.
             onBeforeVisitNode(node);
             var visited = f(node);
@@ -67248,6 +69430,7 @@ var ts;
             }
             currentLexicalScope = savedCurrentScope;
             currentNameScope = savedCurrentNameScope;
+            currentClassHasParameterProperties = savedCurrentClassHasParameterProperties;
             return visited;
         }
         /**
@@ -67257,16 +69440,16 @@ var ts;
          */
         function onBeforeVisitNode(node) {
             switch (node.kind) {
-                case 284 /* SourceFile */:
-                case 246 /* CaseBlock */:
-                case 245 /* ModuleBlock */:
-                case 218 /* Block */:
+                case 285 /* SourceFile */:
+                case 247 /* CaseBlock */:
+                case 246 /* ModuleBlock */:
+                case 219 /* Block */:
                     currentLexicalScope = node;
                     currentNameScope = undefined;
                     currentScopeFirstDeclarationsOfName = undefined;
                     break;
-                case 240 /* ClassDeclaration */:
-                case 239 /* FunctionDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     if (ts.hasModifier(node, 2 /* Ambient */)) {
                         break;
                     }
@@ -67278,7 +69461,7 @@ var ts;
                         // These nodes should always have names unless they are default-exports;
                         // however, class declaration parsing allows for undefined names, so syntactically invalid
                         // programs may also have an undefined name.
-                        ts.Debug.assert(node.kind === 240 /* ClassDeclaration */ || ts.hasModifier(node, 512 /* Default */));
+                        ts.Debug.assert(node.kind === 241 /* ClassDeclaration */ || ts.hasModifier(node, 512 /* Default */));
                     }
                     if (ts.isClassDeclaration(node)) {
                         // XXX: should probably also cover interfaces and type aliases that can have type variables?
@@ -67321,10 +69504,10 @@ var ts;
          */
         function sourceElementVisitorWorker(node) {
             switch (node.kind) {
-                case 249 /* ImportDeclaration */:
-                case 248 /* ImportEqualsDeclaration */:
-                case 254 /* ExportAssignment */:
-                case 255 /* ExportDeclaration */:
+                case 250 /* ImportDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
+                case 255 /* ExportAssignment */:
+                case 256 /* ExportDeclaration */:
                     return visitEllidableStatement(node);
                 default:
                     return visitorWorker(node);
@@ -67345,13 +69528,13 @@ var ts;
                 return node;
             }
             switch (node.kind) {
-                case 249 /* ImportDeclaration */:
+                case 250 /* ImportDeclaration */:
                     return visitImportDeclaration(node);
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return visitImportEqualsDeclaration(node);
-                case 254 /* ExportAssignment */:
+                case 255 /* ExportAssignment */:
                     return visitExportAssignment(node);
-                case 255 /* ExportDeclaration */:
+                case 256 /* ExportDeclaration */:
                     return visitExportDeclaration(node);
                 default:
                     ts.Debug.fail("Unhandled ellided statement");
@@ -67371,11 +69554,11 @@ var ts;
          * @param node The node to visit.
          */
         function namespaceElementVisitorWorker(node) {
-            if (node.kind === 255 /* ExportDeclaration */ ||
-                node.kind === 249 /* ImportDeclaration */ ||
-                node.kind === 250 /* ImportClause */ ||
-                (node.kind === 248 /* ImportEqualsDeclaration */ &&
-                    node.moduleReference.kind === 259 /* ExternalModuleReference */)) {
+            if (node.kind === 256 /* ExportDeclaration */ ||
+                node.kind === 250 /* ImportDeclaration */ ||
+                node.kind === 251 /* ImportClause */ ||
+                (node.kind === 249 /* ImportEqualsDeclaration */ &&
+                    node.moduleReference.kind === 260 /* ExternalModuleReference */)) {
                 // do not emit ES6 imports and exports since they are illegal inside a namespace
                 return undefined;
             }
@@ -67399,19 +69582,19 @@ var ts;
          */
         function classElementVisitorWorker(node) {
             switch (node.kind) {
-                case 157 /* Constructor */:
-                    // TypeScript constructors are transformed in `visitClassDeclaration`.
-                    // We elide them here as `visitorWorker` checks transform flags, which could
-                    // erronously include an ES6 constructor without TypeScript syntax.
-                    return undefined;
-                case 154 /* PropertyDeclaration */:
-                case 162 /* IndexSignature */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
-                case 156 /* MethodDeclaration */:
+                case 158 /* Constructor */:
+                    return visitConstructor(node);
+                case 155 /* PropertyDeclaration */:
+                    // Property declarations are not TypeScript syntax, but they must be visited
+                    // for the decorator transformation.
+                    return visitPropertyDeclaration(node);
+                case 163 /* IndexSignature */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
+                case 157 /* MethodDeclaration */:
                     // Fallback to the default visit behavior.
                     return visitorWorker(node);
-                case 217 /* SemicolonClassElement */:
+                case 218 /* SemicolonClassElement */:
                     return node;
                 default:
                     return ts.Debug.failBadSyntaxKind(node);
@@ -67421,7 +69604,7 @@ var ts;
             if (ts.modifierToFlag(node.kind) & 2270 /* TypeScriptModifier */) {
                 return undefined;
             }
-            else if (currentNamespace && node.kind === 85 /* ExportKeyword */) {
+            else if (currentNamespace && node.kind === 86 /* ExportKeyword */) {
                 return undefined;
             }
             return node;
@@ -67438,117 +69621,115 @@ var ts;
                 return ts.createNotEmittedStatement(node);
             }
             switch (node.kind) {
-                case 85 /* ExportKeyword */:
-                case 80 /* DefaultKeyword */:
+                case 86 /* ExportKeyword */:
+                case 81 /* DefaultKeyword */:
                     // ES6 export and default modifiers are elided when inside a namespace.
                     return currentNamespace ? undefined : node;
-                case 115 /* PublicKeyword */:
-                case 113 /* PrivateKeyword */:
-                case 114 /* ProtectedKeyword */:
-                case 118 /* AbstractKeyword */:
-                case 77 /* ConstKeyword */:
-                case 125 /* DeclareKeyword */:
-                case 133 /* ReadonlyKeyword */:
+                case 116 /* PublicKeyword */:
+                case 114 /* PrivateKeyword */:
+                case 115 /* ProtectedKeyword */:
+                case 119 /* AbstractKeyword */:
+                case 78 /* ConstKeyword */:
+                case 126 /* DeclareKeyword */:
+                case 134 /* ReadonlyKeyword */:
                 // TypeScript accessibility and readonly modifiers are elided.
-                case 169 /* ArrayType */:
-                case 170 /* TupleType */:
-                case 171 /* OptionalType */:
-                case 172 /* RestType */:
-                case 168 /* TypeLiteral */:
-                case 163 /* TypePredicate */:
-                case 150 /* TypeParameter */:
-                case 120 /* AnyKeyword */:
-                case 143 /* UnknownKeyword */:
-                case 123 /* BooleanKeyword */:
-                case 138 /* StringKeyword */:
-                case 135 /* NumberKeyword */:
-                case 132 /* NeverKeyword */:
-                case 106 /* VoidKeyword */:
-                case 139 /* SymbolKeyword */:
-                case 166 /* ConstructorType */:
-                case 165 /* FunctionType */:
-                case 167 /* TypeQuery */:
-                case 164 /* TypeReference */:
-                case 173 /* UnionType */:
-                case 174 /* IntersectionType */:
-                case 175 /* ConditionalType */:
-                case 177 /* ParenthesizedType */:
-                case 178 /* ThisType */:
-                case 179 /* TypeOperator */:
-                case 180 /* IndexedAccessType */:
-                case 181 /* MappedType */:
-                case 182 /* LiteralType */:
+                case 170 /* ArrayType */:
+                case 171 /* TupleType */:
+                case 172 /* OptionalType */:
+                case 173 /* RestType */:
+                case 169 /* TypeLiteral */:
+                case 164 /* TypePredicate */:
+                case 151 /* TypeParameter */:
+                case 121 /* AnyKeyword */:
+                case 144 /* UnknownKeyword */:
+                case 124 /* BooleanKeyword */:
+                case 139 /* StringKeyword */:
+                case 136 /* NumberKeyword */:
+                case 133 /* NeverKeyword */:
+                case 107 /* VoidKeyword */:
+                case 140 /* SymbolKeyword */:
+                case 167 /* ConstructorType */:
+                case 166 /* FunctionType */:
+                case 168 /* TypeQuery */:
+                case 165 /* TypeReference */:
+                case 174 /* UnionType */:
+                case 175 /* IntersectionType */:
+                case 176 /* ConditionalType */:
+                case 178 /* ParenthesizedType */:
+                case 179 /* ThisType */:
+                case 180 /* TypeOperator */:
+                case 181 /* IndexedAccessType */:
+                case 182 /* MappedType */:
+                case 183 /* LiteralType */:
                 // TypeScript type nodes are elided.
-                case 162 /* IndexSignature */:
+                case 163 /* IndexSignature */:
                 // TypeScript index signatures are elided.
-                case 152 /* Decorator */:
+                case 153 /* Decorator */:
                 // TypeScript decorators are elided. They will be emitted as part of visitClassDeclaration.
-                case 242 /* TypeAliasDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
                     // TypeScript type-only declarations are elided.
                     return undefined;
-                case 154 /* PropertyDeclaration */:
+                case 155 /* PropertyDeclaration */:
                     // TypeScript property declarations are elided. However their names are still visited, and can potentially be retained if they could have sideeffects
                     return visitPropertyDeclaration(node);
-                case 247 /* NamespaceExportDeclaration */:
+                case 248 /* NamespaceExportDeclaration */:
                     // TypeScript namespace export declarations are elided.
                     return undefined;
-                case 157 /* Constructor */:
+                case 158 /* Constructor */:
                     return visitConstructor(node);
-                case 241 /* InterfaceDeclaration */:
+                case 242 /* InterfaceDeclaration */:
                     // TypeScript interfaces are elided, but some comments may be preserved.
                     // See the implementation of `getLeadingComments` in comments.ts for more details.
                     return ts.createNotEmittedStatement(node);
-                case 240 /* ClassDeclaration */:
+                case 241 /* ClassDeclaration */:
                     // This may be a class declaration with TypeScript syntax extensions.
                     //
                     // TypeScript class syntax extensions include:
                     // - decorators
                     // - optional `implements` heritage clause
                     // - parameter property assignments in the constructor
-                    // - property declarations
                     // - index signatures
                     // - method overload signatures
                     return visitClassDeclaration(node);
-                case 209 /* ClassExpression */:
+                case 210 /* ClassExpression */:
                     // This may be a class expression with TypeScript syntax extensions.
                     //
                     // TypeScript class syntax extensions include:
                     // - decorators
                     // - optional `implements` heritage clause
                     // - parameter property assignments in the constructor
-                    // - property declarations
                     // - index signatures
                     // - method overload signatures
                     return visitClassExpression(node);
-                case 273 /* HeritageClause */:
+                case 274 /* HeritageClause */:
                     // This may be a heritage clause with TypeScript syntax extensions.
                     //
                     // TypeScript heritage clause extensions include:
                     // - `implements` clause
                     return visitHeritageClause(node);
-                case 211 /* ExpressionWithTypeArguments */:
+                case 212 /* ExpressionWithTypeArguments */:
                     // TypeScript supports type arguments on an expression in an `extends` heritage clause.
                     return visitExpressionWithTypeArguments(node);
-                case 156 /* MethodDeclaration */:
+                case 157 /* MethodDeclaration */:
                     // TypeScript method declarations may have decorators, modifiers
                     // or type annotations.
                     return visitMethodDeclaration(node);
-                case 158 /* GetAccessor */:
+                case 159 /* GetAccessor */:
                     // Get Accessors can have TypeScript modifiers, decorators, and type annotations.
                     return visitGetAccessor(node);
-                case 159 /* SetAccessor */:
+                case 160 /* SetAccessor */:
                     // Set Accessors can have TypeScript modifiers and type annotations.
                     return visitSetAccessor(node);
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     // Typescript function declarations can have modifiers, decorators, and type annotations.
                     return visitFunctionDeclaration(node);
-                case 196 /* FunctionExpression */:
+                case 197 /* FunctionExpression */:
                     // TypeScript function expressions can have modifiers and type annotations.
                     return visitFunctionExpression(node);
-                case 197 /* ArrowFunction */:
+                case 198 /* ArrowFunction */:
                     // TypeScript arrow functions can have modifiers and type annotations.
                     return visitArrowFunction(node);
-                case 151 /* Parameter */:
+                case 152 /* Parameter */:
                     // This may be a parameter declaration with TypeScript syntax extensions.
                     //
                     // TypeScript parameter declaration syntax extensions include:
@@ -67558,35 +69739,35 @@ var ts;
                     // - type annotations
                     // - this parameters
                     return visitParameter(node);
-                case 195 /* ParenthesizedExpression */:
+                case 196 /* ParenthesizedExpression */:
                     // ParenthesizedExpressions are TypeScript if their expression is a
                     // TypeAssertion or AsExpression
                     return visitParenthesizedExpression(node);
-                case 194 /* TypeAssertionExpression */:
-                case 212 /* AsExpression */:
+                case 195 /* TypeAssertionExpression */:
+                case 213 /* AsExpression */:
                     // TypeScript type assertions are removed, but their subtrees are preserved.
                     return visitAssertionExpression(node);
-                case 191 /* CallExpression */:
+                case 192 /* CallExpression */:
                     return visitCallExpression(node);
-                case 192 /* NewExpression */:
+                case 193 /* NewExpression */:
                     return visitNewExpression(node);
-                case 193 /* TaggedTemplateExpression */:
+                case 194 /* TaggedTemplateExpression */:
                     return visitTaggedTemplateExpression(node);
-                case 213 /* NonNullExpression */:
+                case 214 /* NonNullExpression */:
                     // TypeScript non-null expressions are removed, but their subtrees are preserved.
                     return visitNonNullExpression(node);
-                case 243 /* EnumDeclaration */:
+                case 244 /* EnumDeclaration */:
                     // TypeScript enum declarations do not exist in ES6 and must be rewritten.
                     return visitEnumDeclaration(node);
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     // TypeScript namespace exports for variable statements must be transformed.
                     return visitVariableStatement(node);
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     return visitVariableDeclaration(node);
-                case 244 /* ModuleDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     // TypeScript namespace declarations must be transformed.
                     return visitModuleDeclaration(node);
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     // TypeScript namespace or external module import.
                     return visitImportEqualsDeclaration(node);
                 default:
@@ -67624,7 +69805,7 @@ var ts;
             if (ts.some(staticProperties))
                 facts |= 1 /* HasStaticInitializedProperties */;
             var extendsClauseElement = ts.getEffectiveBaseTypeNode(node);
-            if (extendsClauseElement && ts.skipOuterExpressions(extendsClauseElement.expression).kind !== 96 /* NullKeyword */)
+            if (extendsClauseElement && ts.skipOuterExpressions(extendsClauseElement.expression).kind !== 97 /* NullKeyword */)
                 facts |= 64 /* IsDerivedClass */;
             if (shouldEmitDecorateCallForClass(node))
                 facts |= 2 /* HasConstructorDecorators */;
@@ -67653,31 +69834,16 @@ var ts;
             if (!isClassLikeDeclarationWithTypeScriptSyntax(node) && !(currentNamespace && ts.hasModifier(node, 1 /* Export */))) {
                 return ts.visitEachChild(node, visitor, context);
             }
-            var savedPendingExpressions = pendingExpressions;
-            pendingExpressions = undefined;
-            var staticProperties = getInitializedProperties(node, /*isStatic*/ true);
+            var staticProperties = ts.getInitializedProperties(node, /*isStatic*/ true);
             var facts = getClassFacts(node, staticProperties);
             if (facts & 128 /* UseImmediatelyInvokedFunctionExpression */) {
                 context.startLexicalEnvironment();
             }
             var name = node.name || (facts & 5 /* NeedsName */ ? ts.getGeneratedNameForNode(node) : undefined);
             var classStatement = facts & 2 /* HasConstructorDecorators */
-                ? createClassDeclarationHeadWithDecorators(node, name, facts)
+                ? createClassDeclarationHeadWithDecorators(node, name)
                 : createClassDeclarationHeadWithoutDecorators(node, name, facts);
             var statements = [classStatement];
-            // Write any pending expressions from elided or moved computed property names
-            if (ts.some(pendingExpressions)) {
-                statements.push(ts.createExpressionStatement(ts.inlineExpressions(pendingExpressions)));
-            }
-            pendingExpressions = savedPendingExpressions;
-            // Emit static property assignment. Because classDeclaration is lexically evaluated,
-            // it is safe to emit static property assignment after classDeclaration
-            // From ES6 specification:
-            //      HasLexicalDeclaration (N) : Determines if the argument identifier has a binding in this environment record that was created using
-            //                                  a lexical declaration such as a LexicalDeclaration or a ClassDeclaration.
-            if (facts & 1 /* HasStaticInitializedProperties */) {
-                addInitializedPropertyStatements(statements, staticProperties, facts & 128 /* UseImmediatelyInvokedFunctionExpression */ ? ts.getInternalName(node) : ts.getLocalName(node));
-            }
             // Write any decorators of the node.
             addClassElementDecorationStatements(statements, node, /*isStatic*/ false);
             addClassElementDecorationStatements(statements, node, /*isStatic*/ true);
@@ -67757,13 +69923,14 @@ var ts;
                 : undefined;
             var classDeclaration = ts.createClassDeclaration(
             /*decorators*/ undefined, modifiers, name, 
-            /*typeParameters*/ undefined, ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), transformClassMembers(node, (facts & 64 /* IsDerivedClass */) !== 0));
+            /*typeParameters*/ undefined, ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), transformClassMembers(node));
             // To better align with the old emitter, we should not emit a trailing source map
             // entry if the class has static properties.
             var emitFlags = ts.getEmitFlags(node);
             if (facts & 1 /* HasStaticInitializedProperties */) {
                 emitFlags |= 32 /* NoTrailingSourceMap */;
             }
+            ts.aggregateTransformFlags(classDeclaration);
             ts.setTextRange(classDeclaration, node);
             ts.setOriginalNode(classDeclaration, node);
             ts.setEmitFlags(classDeclaration, emitFlags);
@@ -67773,7 +69940,7 @@ var ts;
          * Transforms a decorated class declaration and appends the resulting statements. If
          * the class requires an alias to avoid issues with double-binding, the alias is returned.
          */
-        function createClassDeclarationHeadWithDecorators(node, name, facts) {
+        function createClassDeclarationHeadWithDecorators(node, name) {
             // When we emit an ES6 class that has a class decorator, we must tailor the
             // emit to certain specific cases.
             //
@@ -67866,8 +70033,9 @@ var ts;
             //      ${members}
             //  }
             var heritageClauses = ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause);
-            var members = transformClassMembers(node, (facts & 64 /* IsDerivedClass */) !== 0);
+            var members = transformClassMembers(node);
             var classExpression = ts.createClassExpression(/*modifiers*/ undefined, name, /*typeParameters*/ undefined, heritageClauses, members);
+            ts.aggregateTransformFlags(classExpression);
             ts.setOriginalNode(classExpression, node);
             ts.setTextRange(classExpression, location);
             //  let ${name} = ${classExpression} where name is either declaredName if the class doesn't contain self-reference
@@ -67886,311 +70054,40 @@ var ts;
             if (!isClassLikeDeclarationWithTypeScriptSyntax(node)) {
                 return ts.visitEachChild(node, visitor, context);
             }
-            var savedPendingExpressions = pendingExpressions;
-            pendingExpressions = undefined;
-            var staticProperties = getInitializedProperties(node, /*isStatic*/ true);
-            var heritageClauses = ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause);
-            var members = transformClassMembers(node, ts.some(heritageClauses, function (c) { return c.token === 86 /* ExtendsKeyword */; }));
             var classExpression = ts.createClassExpression(
             /*modifiers*/ undefined, node.name, 
-            /*typeParameters*/ undefined, heritageClauses, members);
+            /*typeParameters*/ undefined, ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), transformClassMembers(node));
+            ts.aggregateTransformFlags(classExpression);
             ts.setOriginalNode(classExpression, node);
             ts.setTextRange(classExpression, node);
-            if (ts.some(staticProperties) || ts.some(pendingExpressions)) {
-                var expressions = [];
-                var isClassWithConstructorReference = resolver.getNodeCheckFlags(node) & 16777216 /* ClassWithConstructorReference */;
-                var temp = ts.createTempVariable(hoistVariableDeclaration, !!isClassWithConstructorReference);
-                if (isClassWithConstructorReference) {
-                    // record an alias as the class name is not in scope for statics.
-                    enableSubstitutionForClassAliases();
-                    var alias = ts.getSynthesizedClone(temp);
-                    alias.autoGenerateFlags &= ~8 /* ReservedInNestedScopes */;
-                    classAliases[ts.getOriginalNodeId(node)] = alias;
-                }
-                // To preserve the behavior of the old emitter, we explicitly indent
-                // the body of a class with static initializers.
-                ts.setEmitFlags(classExpression, 65536 /* Indented */ | ts.getEmitFlags(classExpression));
-                expressions.push(ts.startOnNewLine(ts.createAssignment(temp, classExpression)));
-                // Add any pending expressions leftover from elided or relocated computed property names
-                ts.addRange(expressions, ts.map(pendingExpressions, ts.startOnNewLine));
-                pendingExpressions = savedPendingExpressions;
-                ts.addRange(expressions, generateInitializedPropertyExpressions(staticProperties, temp));
-                expressions.push(ts.startOnNewLine(temp));
-                return ts.inlineExpressions(expressions);
-            }
-            pendingExpressions = savedPendingExpressions;
             return classExpression;
         }
         /**
          * Transforms the members of a class.
          *
          * @param node The current class.
-         * @param isDerivedClass A value indicating whether the class has an extends clause that does not extend 'null'.
          */
-        function transformClassMembers(node, isDerivedClass) {
+        function transformClassMembers(node) {
             var members = [];
-            var constructor = transformConstructor(node, isDerivedClass);
-            if (constructor) {
-                members.push(constructor);
+            var constructor = ts.getFirstConstructorWithBody(node);
+            var parametersWithPropertyAssignments = constructor &&
+                ts.filter(constructor.parameters, ts.isParameterPropertyDeclaration);
+            if (parametersWithPropertyAssignments) {
+                for (var _i = 0, parametersWithPropertyAssignments_1 = parametersWithPropertyAssignments; _i < parametersWithPropertyAssignments_1.length; _i++) {
+                    var parameter = parametersWithPropertyAssignments_1[_i];
+                    if (ts.isIdentifier(parameter.name)) {
+                        members.push(ts.aggregateTransformFlags(ts.createProperty(
+                        /*decorators*/ undefined, 
+                        /*modifiers*/ undefined, parameter.name, 
+                        /*questionOrExclamationToken*/ undefined, 
+                        /*type*/ undefined, 
+                        /*initializer*/ undefined)));
+                    }
+                }
             }
             ts.addRange(members, ts.visitNodes(node.members, classElementVisitor, ts.isClassElement));
             return ts.setTextRange(ts.createNodeArray(members), /*location*/ node.members);
         }
-        /**
-         * Transforms (or creates) a constructor for a class.
-         *
-         * @param node The current class.
-         * @param isDerivedClass A value indicating whether the class has an extends clause that does not extend 'null'.
-         */
-        function transformConstructor(node, isDerivedClass) {
-            // Check if we have property assignment inside class declaration.
-            // If there is a property assignment, we need to emit constructor whether users define it or not
-            // If there is no property assignment, we can omit constructor if users do not define it
-            var constructor = ts.getFirstConstructorWithBody(node);
-            var hasInstancePropertyWithInitializer = ts.forEach(node.members, isInstanceInitializedProperty);
-            var hasParameterPropertyAssignments = constructor &&
-                constructor.transformFlags & 1024 /* ContainsTypeScriptClassSyntax */ &&
-                ts.forEach(constructor.parameters, isParameterWithPropertyAssignment);
-            // If the class does not contain nodes that require a synthesized constructor,
-            // accept the current constructor if it exists.
-            if (!hasInstancePropertyWithInitializer && !hasParameterPropertyAssignments) {
-                return ts.visitEachChild(constructor, visitor, context);
-            }
-            var parameters = transformConstructorParameters(constructor);
-            var body = transformConstructorBody(node, constructor, isDerivedClass);
-            //  constructor(${parameters}) {
-            //      ${body}
-            //  }
-            return ts.startOnNewLine(ts.setOriginalNode(ts.setTextRange(ts.createConstructor(
-            /*decorators*/ undefined, 
-            /*modifiers*/ undefined, parameters, body), constructor || node), constructor));
-        }
-        /**
-         * Transforms (or creates) the parameters for the constructor of a class with
-         * parameter property assignments or instance property initializers.
-         *
-         * @param constructor The constructor declaration.
-         */
-        function transformConstructorParameters(constructor) {
-            // The ES2015 spec specifies in 14.5.14. Runtime Semantics: ClassDefinitionEvaluation:
-            // If constructor is empty, then
-            //     If ClassHeritag_eopt is present and protoParent is not null, then
-            //          Let constructor be the result of parsing the source text
-            //              constructor(...args) { super (...args);}
-            //          using the syntactic grammar with the goal symbol MethodDefinition[~Yield].
-            //      Else,
-            //           Let constructor be the result of parsing the source text
-            //               constructor( ){ }
-            //           using the syntactic grammar with the goal symbol MethodDefinition[~Yield].
-            //
-            // While we could emit the '...args' rest parameter, certain later tools in the pipeline might
-            // downlevel the '...args' portion less efficiently by naively copying the contents of 'arguments' to an array.
-            // Instead, we'll avoid using a rest parameter and spread into the super call as
-            // 'super(...arguments)' instead of 'super(...args)', as you can see in "transformConstructorBody".
-            return ts.visitParameterList(constructor && constructor.parameters, visitor, context)
-                || [];
-        }
-        /**
-         * Transforms (or creates) a constructor body for a class with parameter property
-         * assignments or instance property initializers.
-         *
-         * @param node The current class.
-         * @param constructor The current class constructor.
-         * @param isDerivedClass A value indicating whether the class has an extends clause that does not extend 'null'.
-         */
-        function transformConstructorBody(node, constructor, isDerivedClass) {
-            var statements = [];
-            var indexOfFirstStatement = 0;
-            resumeLexicalEnvironment();
-            if (constructor) {
-                indexOfFirstStatement = addPrologueDirectivesAndInitialSuperCall(constructor, statements);
-                // Add parameters with property assignments. Transforms this:
-                //
-                //  constructor (public x, public y) {
-                //  }
-                //
-                // Into this:
-                //
-                //  constructor (x, y) {
-                //      this.x = x;
-                //      this.y = y;
-                //  }
-                //
-                var propertyAssignments = getParametersWithPropertyAssignments(constructor);
-                ts.addRange(statements, ts.map(propertyAssignments, transformParameterWithPropertyAssignment));
-            }
-            else if (isDerivedClass) {
-                // Add a synthetic `super` call:
-                //
-                //  super(...arguments);
-                //
-                statements.push(ts.createExpressionStatement(ts.createCall(ts.createSuper(), 
-                /*typeArguments*/ undefined, [ts.createSpread(ts.createIdentifier("arguments"))])));
-            }
-            // Add the property initializers. Transforms this:
-            //
-            //  public x = 1;
-            //
-            // Into this:
-            //
-            //  constructor() {
-            //      this.x = 1;
-            //  }
-            //
-            var properties = getInitializedProperties(node, /*isStatic*/ false);
-            addInitializedPropertyStatements(statements, properties, ts.createThis());
-            if (constructor) {
-                // The class already had a constructor, so we should add the existing statements, skipping the initial super call.
-                ts.addRange(statements, ts.visitNodes(constructor.body.statements, visitor, ts.isStatement, indexOfFirstStatement));
-            }
-            // End the lexical environment.
-            statements = ts.mergeLexicalEnvironment(statements, endLexicalEnvironment());
-            return ts.setTextRange(ts.createBlock(ts.setTextRange(ts.createNodeArray(statements), 
-            /*location*/ constructor ? constructor.body.statements : node.members), 
-            /*multiLine*/ true), 
-            /*location*/ constructor ? constructor.body : undefined);
-        }
-        /**
-         * Adds super call and preceding prologue directives into the list of statements.
-         *
-         * @param ctor The constructor node.
-         * @returns index of the statement that follows super call
-         */
-        function addPrologueDirectivesAndInitialSuperCall(ctor, result) {
-            if (ctor.body) {
-                var statements = ctor.body.statements;
-                // add prologue directives to the list (if any)
-                var index = ts.addPrologue(result, statements, /*ensureUseStrict*/ false, visitor);
-                if (index === statements.length) {
-                    // list contains nothing but prologue directives (or empty) - exit
-                    return index;
-                }
-                var statement = statements[index];
-                if (statement.kind === 221 /* ExpressionStatement */ && ts.isSuperCall(statement.expression)) {
-                    result.push(ts.visitNode(statement, visitor, ts.isStatement));
-                    return index + 1;
-                }
-                return index;
-            }
-            return 0;
-        }
-        /**
-         * Gets all parameters of a constructor that should be transformed into property assignments.
-         *
-         * @param node The constructor node.
-         */
-        function getParametersWithPropertyAssignments(node) {
-            return ts.filter(node.parameters, isParameterWithPropertyAssignment);
-        }
-        /**
-         * Determines whether a parameter should be transformed into a property assignment.
-         *
-         * @param parameter The parameter node.
-         */
-        function isParameterWithPropertyAssignment(parameter) {
-            return ts.hasModifier(parameter, 92 /* ParameterPropertyModifier */)
-                && ts.isIdentifier(parameter.name);
-        }
-        /**
-         * Transforms a parameter into a property assignment statement.
-         *
-         * @param node The parameter declaration.
-         */
-        function transformParameterWithPropertyAssignment(node) {
-            ts.Debug.assert(ts.isIdentifier(node.name));
-            var name = node.name;
-            var propertyName = ts.getMutableClone(name);
-            ts.setEmitFlags(propertyName, 1536 /* NoComments */ | 48 /* NoSourceMap */);
-            var localName = ts.getMutableClone(name);
-            ts.setEmitFlags(localName, 1536 /* NoComments */);
-            return ts.startOnNewLine(ts.setEmitFlags(ts.setTextRange(ts.createExpressionStatement(ts.createAssignment(ts.setTextRange(ts.createPropertyAccess(ts.createThis(), propertyName), node.name), localName)), ts.moveRangePos(node, -1)), 1536 /* NoComments */));
-        }
-        /**
-         * Gets all property declarations with initializers on either the static or instance side of a class.
-         *
-         * @param node The class node.
-         * @param isStatic A value indicating whether to get properties from the static or instance side of the class.
-         */
-        function getInitializedProperties(node, isStatic) {
-            return ts.filter(node.members, isStatic ? isStaticInitializedProperty : isInstanceInitializedProperty);
-        }
-        /**
-         * Gets a value indicating whether a class element is a static property declaration with an initializer.
-         *
-         * @param member The class element node.
-         */
-        function isStaticInitializedProperty(member) {
-            return isInitializedProperty(member, /*isStatic*/ true);
-        }
-        /**
-         * Gets a value indicating whether a class element is an instance property declaration with an initializer.
-         *
-         * @param member The class element node.
-         */
-        function isInstanceInitializedProperty(member) {
-            return isInitializedProperty(member, /*isStatic*/ false);
-        }
-        /**
-         * Gets a value indicating whether a class element is either a static or an instance property declaration with an initializer.
-         *
-         * @param member The class element node.
-         * @param isStatic A value indicating whether the member should be a static or instance member.
-         */
-        function isInitializedProperty(member, isStatic) {
-            return member.kind === 154 /* PropertyDeclaration */
-                && isStatic === ts.hasModifier(member, 32 /* Static */)
-                && member.initializer !== undefined;
-        }
-        /**
-         * Generates assignment statements for property initializers.
-         *
-         * @param properties An array of property declarations to transform.
-         * @param receiver The receiver on which each property should be assigned.
-         */
-        function addInitializedPropertyStatements(statements, properties, receiver) {
-            for (var _i = 0, properties_9 = properties; _i < properties_9.length; _i++) {
-                var property = properties_9[_i];
-                var statement = ts.createExpressionStatement(transformInitializedProperty(property, receiver));
-                ts.setSourceMapRange(statement, ts.moveRangePastModifiers(property));
-                ts.setCommentRange(statement, property);
-                ts.setOriginalNode(statement, property);
-                statements.push(statement);
-            }
-        }
-        /**
-         * Generates assignment expressions for property initializers.
-         *
-         * @param properties An array of property declarations to transform.
-         * @param receiver The receiver on which each property should be assigned.
-         */
-        function generateInitializedPropertyExpressions(properties, receiver) {
-            var expressions = [];
-            for (var _i = 0, properties_10 = properties; _i < properties_10.length; _i++) {
-                var property = properties_10[_i];
-                var expression = transformInitializedProperty(property, receiver);
-                ts.startOnNewLine(expression);
-                ts.setSourceMapRange(expression, ts.moveRangePastModifiers(property));
-                ts.setCommentRange(expression, property);
-                ts.setOriginalNode(expression, property);
-                expressions.push(expression);
-            }
-            return expressions;
-        }
-        /**
-         * Transforms a property initializer into an assignment statement.
-         *
-         * @param property The property declaration.
-         * @param receiver The object receiving the property assignment.
-         */
-        function transformInitializedProperty(property, receiver) {
-            // We generate a name here in order to reuse the value cached by the relocated computed name expression (which uses the same generated name)
-            var propertyName = ts.isComputedPropertyName(property.name) && !isSimpleInlineableExpression(property.name.expression)
-                ? ts.updateComputedPropertyName(property.name, ts.getGeneratedNameForNode(property.name))
-                : property.name;
-            var initializer = ts.visitNode(property.initializer, visitor, ts.isExpression);
-            var memberAccess = ts.createMemberAccessForPropertyName(receiver, propertyName, /*location*/ propertyName);
-            return ts.createAssignment(memberAccess, initializer);
-        }
         /**
          * Gets either the static or instance members of a class that are decorated, or have
          * parameters that are decorated.
@@ -68240,11 +70137,14 @@ var ts;
             var decorators;
             if (node) {
                 var parameters = node.parameters;
-                for (var i = 0; i < parameters.length; i++) {
-                    var parameter = parameters[i];
+                var firstParameterIsThis = parameters.length > 0 && ts.parameterIsThisKeyword(parameters[0]);
+                var firstParameterOffset = firstParameterIsThis ? 1 : 0;
+                var numParameters = firstParameterIsThis ? parameters.length - 1 : parameters.length;
+                for (var i = 0; i < numParameters; i++) {
+                    var parameter = parameters[i + firstParameterOffset];
                     if (decorators || parameter.decorators) {
                         if (!decorators) {
-                            decorators = new Array(parameters.length);
+                            decorators = new Array(numParameters);
                         }
                         decorators[i] = parameter.decorators;
                     }
@@ -68277,12 +70177,12 @@ var ts;
          */
         function getAllDecoratorsOfClassElement(node, member) {
             switch (member.kind) {
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     return getAllDecoratorsOfAccessors(node, member);
-                case 156 /* MethodDeclaration */:
+                case 157 /* MethodDeclaration */:
                     return getAllDecoratorsOfMethod(member);
-                case 154 /* PropertyDeclaration */:
+                case 155 /* PropertyDeclaration */:
                     return getAllDecoratorsOfProperty(member);
                 default:
                     return undefined;
@@ -68435,7 +70335,7 @@ var ts;
             var prefix = getClassMemberPrefix(node, member);
             var memberName = getExpressionForPropertyName(member, /*generateNameForComputedPropertyName*/ true);
             var descriptor = languageVersion > 0 /* ES3 */
-                ? member.kind === 154 /* PropertyDeclaration */
+                ? member.kind === 155 /* PropertyDeclaration */
                     // We emit `void 0` here to indicate to `__decorate` that it can invoke `Object.defineProperty` directly, but that it
                     // should not invoke `Object.getOwnPropertyDescriptor`.
                     ? ts.createVoidZero()
@@ -68558,10 +70458,10 @@ var ts;
          */
         function shouldAddTypeMetadata(node) {
             var kind = node.kind;
-            return kind === 156 /* MethodDeclaration */
-                || kind === 158 /* GetAccessor */
-                || kind === 159 /* SetAccessor */
-                || kind === 154 /* PropertyDeclaration */;
+            return kind === 157 /* MethodDeclaration */
+                || kind === 159 /* GetAccessor */
+                || kind === 160 /* SetAccessor */
+                || kind === 155 /* PropertyDeclaration */;
         }
         /**
          * Determines whether to emit the "design:returntype" metadata based on the node's kind.
@@ -68571,7 +70471,7 @@ var ts;
          * @param node The node to test.
          */
         function shouldAddReturnTypeMetadata(node) {
-            return node.kind === 156 /* MethodDeclaration */;
+            return node.kind === 157 /* MethodDeclaration */;
         }
         /**
          * Determines whether to emit the "design:paramtypes" metadata based on the node's kind.
@@ -68582,12 +70482,12 @@ var ts;
          */
         function shouldAddParamTypesMetadata(node) {
             switch (node.kind) {
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
                     return ts.getFirstConstructorWithBody(node) !== undefined;
-                case 156 /* MethodDeclaration */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 157 /* MethodDeclaration */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     return true;
             }
             return false;
@@ -68604,15 +70504,15 @@ var ts;
          */
         function serializeTypeOfNode(node) {
             switch (node.kind) {
-                case 154 /* PropertyDeclaration */:
-                case 151 /* Parameter */:
+                case 155 /* PropertyDeclaration */:
+                case 152 /* Parameter */:
                     return serializeTypeNode(node.type);
-                case 159 /* SetAccessor */:
-                case 158 /* GetAccessor */:
+                case 160 /* SetAccessor */:
+                case 159 /* GetAccessor */:
                     return serializeTypeNode(getAccessorTypeNode(node));
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
-                case 156 /* MethodDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
+                case 157 /* MethodDeclaration */:
                     return ts.createIdentifier("Function");
                 default:
                     return ts.createVoidZero();
@@ -68649,7 +70549,7 @@ var ts;
             return ts.createArrayLiteral(expressions);
         }
         function getParametersOfDecoratedDeclaration(node, container) {
-            if (container && node.kind === 158 /* GetAccessor */) {
+            if (container && node.kind === 159 /* GetAccessor */) {
                 var setAccessor = ts.getAllAccessorDeclarations(container.members, node).setAccessor;
                 if (setAccessor) {
                     return setAccessor.parameters;
@@ -68694,69 +70594,69 @@ var ts;
                 return ts.createIdentifier("Object");
             }
             switch (node.kind) {
-                case 106 /* VoidKeyword */:
-                case 141 /* UndefinedKeyword */:
-                case 96 /* NullKeyword */:
-                case 132 /* NeverKeyword */:
+                case 107 /* VoidKeyword */:
+                case 142 /* UndefinedKeyword */:
+                case 97 /* NullKeyword */:
+                case 133 /* NeverKeyword */:
                     return ts.createVoidZero();
-                case 177 /* ParenthesizedType */:
+                case 178 /* ParenthesizedType */:
                     return serializeTypeNode(node.type);
-                case 165 /* FunctionType */:
-                case 166 /* ConstructorType */:
+                case 166 /* FunctionType */:
+                case 167 /* ConstructorType */:
                     return ts.createIdentifier("Function");
-                case 169 /* ArrayType */:
-                case 170 /* TupleType */:
+                case 170 /* ArrayType */:
+                case 171 /* TupleType */:
                     return ts.createIdentifier("Array");
-                case 163 /* TypePredicate */:
-                case 123 /* BooleanKeyword */:
+                case 164 /* TypePredicate */:
+                case 124 /* BooleanKeyword */:
                     return ts.createIdentifier("Boolean");
-                case 138 /* StringKeyword */:
+                case 139 /* StringKeyword */:
                     return ts.createIdentifier("String");
-                case 136 /* ObjectKeyword */:
+                case 137 /* ObjectKeyword */:
                     return ts.createIdentifier("Object");
-                case 182 /* LiteralType */:
+                case 183 /* LiteralType */:
                     switch (node.literal.kind) {
                         case 10 /* StringLiteral */:
                             return ts.createIdentifier("String");
-                        case 202 /* PrefixUnaryExpression */:
+                        case 203 /* PrefixUnaryExpression */:
                         case 8 /* NumericLiteral */:
                             return ts.createIdentifier("Number");
                         case 9 /* BigIntLiteral */:
                             return getGlobalBigIntNameWithFallback();
-                        case 102 /* TrueKeyword */:
-                        case 87 /* FalseKeyword */:
+                        case 103 /* TrueKeyword */:
+                        case 88 /* FalseKeyword */:
                             return ts.createIdentifier("Boolean");
                         default:
                             return ts.Debug.failBadSyntaxKind(node.literal);
                     }
-                case 135 /* NumberKeyword */:
+                case 136 /* NumberKeyword */:
                     return ts.createIdentifier("Number");
-                case 146 /* BigIntKeyword */:
+                case 147 /* BigIntKeyword */:
                     return getGlobalBigIntNameWithFallback();
-                case 139 /* SymbolKeyword */:
+                case 140 /* SymbolKeyword */:
                     return languageVersion < 2 /* ES2015 */
                         ? getGlobalSymbolNameWithFallback()
                         : ts.createIdentifier("Symbol");
-                case 164 /* TypeReference */:
+                case 165 /* TypeReference */:
                     return serializeTypeReferenceNode(node);
-                case 174 /* IntersectionType */:
-                case 173 /* UnionType */:
+                case 175 /* IntersectionType */:
+                case 174 /* UnionType */:
                     return serializeTypeList(node.types);
-                case 175 /* ConditionalType */:
+                case 176 /* ConditionalType */:
                     return serializeTypeList([node.trueType, node.falseType]);
-                case 179 /* TypeOperator */:
-                    if (node.operator === 133 /* ReadonlyKeyword */) {
+                case 180 /* TypeOperator */:
+                    if (node.operator === 134 /* ReadonlyKeyword */) {
                         return serializeTypeNode(node.type);
                     }
                     break;
-                case 167 /* TypeQuery */:
-                case 180 /* IndexedAccessType */:
-                case 181 /* MappedType */:
-                case 168 /* TypeLiteral */:
-                case 120 /* AnyKeyword */:
-                case 143 /* UnknownKeyword */:
-                case 178 /* ThisType */:
-                case 183 /* ImportType */:
+                case 168 /* TypeQuery */:
+                case 181 /* IndexedAccessType */:
+                case 182 /* MappedType */:
+                case 169 /* TypeLiteral */:
+                case 121 /* AnyKeyword */:
+                case 144 /* UnknownKeyword */:
+                case 179 /* ThisType */:
+                case 184 /* ImportType */:
                     break;
                 default:
                     return ts.Debug.failBadSyntaxKind(node);
@@ -68769,13 +70669,13 @@ var ts;
             var serializedUnion;
             for (var _i = 0, types_18 = types; _i < types_18.length; _i++) {
                 var typeNode = types_18[_i];
-                while (typeNode.kind === 177 /* ParenthesizedType */) {
+                while (typeNode.kind === 178 /* ParenthesizedType */) {
                     typeNode = typeNode.type; // Skip parens if need be
                 }
-                if (typeNode.kind === 132 /* NeverKeyword */) {
+                if (typeNode.kind === 133 /* NeverKeyword */) {
                     continue; // Always elide `never` from the union/intersection if possible
                 }
-                if (!strictNullChecks && (typeNode.kind === 96 /* NullKeyword */ || typeNode.kind === 141 /* UndefinedKeyword */)) {
+                if (!strictNullChecks && (typeNode.kind === 97 /* NullKeyword */ || typeNode.kind === 142 /* UndefinedKeyword */)) {
                     continue; // Elide null and undefined from unions for metadata, just like what we did prior to the implementation of strict null checks
                 }
                 var serializedIndividual = serializeTypeNode(typeNode);
@@ -68855,12 +70755,12 @@ var ts;
          * @param node The entity name to serialize.
          */
         function serializeEntityNameAsExpressionFallback(node) {
-            if (node.kind === 72 /* Identifier */) {
+            if (node.kind === 73 /* Identifier */) {
                 // A -> typeof A !== undefined && A
                 var copied = serializeEntityNameAsExpression(node);
                 return createCheckedValue(copied, copied);
             }
-            if (node.left.kind === 72 /* Identifier */) {
+            if (node.left.kind === 73 /* Identifier */) {
                 // A.B -> typeof A !== undefined && A.B
                 return createCheckedValue(serializeEntityNameAsExpression(node.left), serializeEntityNameAsExpression(node));
             }
@@ -68876,7 +70776,7 @@ var ts;
          */
         function serializeEntityNameAsExpression(node) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     // Create a clone of the name with a new parent, and treat it as if it were
                     // a source tree node for the purposes of the checker.
                     var name = ts.getMutableClone(node);
@@ -68884,7 +70784,7 @@ var ts;
                     name.original = undefined;
                     name.parent = ts.getParseTreeNode(currentLexicalScope); // ensure the parent is set to a parse tree node.
                     return name;
-                case 148 /* QualifiedName */:
+                case 149 /* QualifiedName */:
                     return serializeQualifiedNameAsExpression(node);
             }
         }
@@ -68910,19 +70810,10 @@ var ts;
          * available.
          */
         function getGlobalBigIntNameWithFallback() {
-            return languageVersion < 7 /* ESNext */
+            return languageVersion < 99 /* ESNext */
                 ? ts.createConditional(ts.createTypeCheck(ts.createIdentifier("BigInt"), "function"), ts.createIdentifier("BigInt"), ts.createIdentifier("Object"))
                 : ts.createIdentifier("BigInt");
         }
-        /**
-         * A simple inlinable expression is an expression which can be copied into multiple locations
-         * without risk of repeating any sideeffects and whose value could not possibly change between
-         * any such locations
-         */
-        function isSimpleInlineableExpression(expression) {
-            return !ts.isIdentifier(expression) && ts.isSimpleCopiableExpression(expression) ||
-                ts.isWellKnownSymbolSyntactically(expression);
-        }
         /**
          * Gets an expression that represents a property name. For a computed property, a
          * name is generated for the node.
@@ -68932,7 +70823,7 @@ var ts;
         function getExpressionForPropertyName(member, generateNameForComputedPropertyName) {
             var name = member.name;
             if (ts.isComputedPropertyName(name)) {
-                return generateNameForComputedPropertyName && !isSimpleInlineableExpression(name.expression)
+                return generateNameForComputedPropertyName && !ts.isSimpleInlineableExpression(name.expression)
                     ? ts.getGeneratedNameForNode(name)
                     : name.expression;
             }
@@ -68943,25 +70834,6 @@ var ts;
                 return ts.getSynthesizedClone(name);
             }
         }
-        /**
-         * If the name is a computed property, this function transforms it, then either returns an expression which caches the
-         * value of the result or the expression itself if the value is either unused or safe to inline into multiple locations
-         * @param shouldHoist Does the expression need to be reused? (ie, for an initializer or a decorator)
-         * @param omitSimple Should expressions with no observable side-effects be elided? (ie, the expression is not hoisted for a decorator or initializer and is a literal)
-         */
-        function getPropertyNameExpressionIfNeeded(name, shouldHoist, omitSimple) {
-            if (ts.isComputedPropertyName(name)) {
-                var expression = ts.visitNode(name.expression, visitor, ts.isExpression);
-                var innerExpression = ts.skipPartiallyEmittedExpressions(expression);
-                var inlinable = isSimpleInlineableExpression(innerExpression);
-                if (!inlinable && shouldHoist) {
-                    var generatedName = ts.getGeneratedNameForNode(name);
-                    hoistVariableDeclaration(generatedName);
-                    return ts.createAssignment(generatedName, expression);
-                }
-                return (omitSimple && (inlinable || ts.isIdentifier(innerExpression))) ? undefined : expression;
-            }
-        }
         /**
          * Visits the property name of a class element, for use when emitting property
          * initializers. For a computed property on a node with decorators, a temporary
@@ -68971,18 +70843,20 @@ var ts;
          */
         function visitPropertyNameOfClassElement(member) {
             var name = member.name;
-            var expr = getPropertyNameExpressionIfNeeded(name, ts.some(member.decorators), /*omitSimple*/ false);
-            if (expr) { // expr only exists if `name` is a computed property name
-                // Inline any pending expressions from previous elided or relocated computed property name expressions in order to preserve execution order
-                if (ts.some(pendingExpressions)) {
-                    expr = ts.inlineExpressions(pendingExpressions.concat([expr]));
-                    pendingExpressions.length = 0;
+            // Computed property names need to be transformed into a hoisted variable when they are used more than once.
+            // The names are used more than once when:
+            //   - the property is non-static and its initializer is moved to the constructor (when there are parameter property assignments).
+            //   - the property has a decorator.
+            if (ts.isComputedPropertyName(name) && ((!ts.hasStaticModifier(member) && currentClassHasParameterProperties) || ts.some(member.decorators))) {
+                var expression = ts.visitNode(name.expression, visitor, ts.isExpression);
+                var innerExpression = ts.skipPartiallyEmittedExpressions(expression);
+                if (!ts.isSimpleInlineableExpression(innerExpression)) {
+                    var generatedName = ts.getGeneratedNameForNode(name);
+                    hoistVariableDeclaration(generatedName);
+                    return ts.updateComputedPropertyName(name, ts.createAssignment(generatedName, expression));
                 }
-                return ts.updateComputedPropertyName(name, expr);
-            }
-            else {
-                return name;
             }
+            return ts.visitNode(name, visitor, ts.isPropertyName);
         }
         /**
          * Transforms a HeritageClause with TypeScript syntax.
@@ -68994,7 +70868,7 @@ var ts;
          * @param node The HeritageClause to transform.
          */
         function visitHeritageClause(node) {
-            if (node.token === 109 /* ImplementsKeyword */) {
+            if (node.token === 110 /* ImplementsKeyword */) {
                 // implements clauses are elided
                 return undefined;
             }
@@ -69022,17 +70896,73 @@ var ts;
             return !ts.nodeIsMissing(node.body);
         }
         function visitPropertyDeclaration(node) {
-            var expr = getPropertyNameExpressionIfNeeded(node.name, ts.some(node.decorators) || !!node.initializer, /*omitSimple*/ true);
-            if (expr && !isSimpleInlineableExpression(expr)) {
-                (pendingExpressions || (pendingExpressions = [])).push(expr);
+            var updated = ts.updateProperty(node, 
+            /*decorators*/ undefined, ts.visitNodes(node.modifiers, visitor, ts.isModifier), visitPropertyNameOfClassElement(node), 
+            /*questionOrExclamationToken*/ undefined, 
+            /*type*/ undefined, ts.visitNode(node.initializer, visitor));
+            if (updated !== node) {
+                // While we emit the source map for the node after skipping decorators and modifiers,
+                // we need to emit the comments for the original range.
+                ts.setCommentRange(updated, node);
+                ts.setSourceMapRange(updated, ts.moveRangePastDecorators(node));
             }
-            return undefined;
+            return updated;
         }
         function visitConstructor(node) {
             if (!shouldEmitFunctionLikeDeclaration(node)) {
                 return undefined;
             }
-            return ts.updateConstructor(node, ts.visitNodes(node.decorators, visitor, ts.isDecorator), ts.visitNodes(node.modifiers, visitor, ts.isModifier), ts.visitParameterList(node.parameters, visitor, context), ts.visitFunctionBody(node.body, visitor, context));
+            return ts.updateConstructor(node, 
+            /*decorators*/ undefined, 
+            /*modifiers*/ undefined, ts.visitParameterList(node.parameters, visitor, context), transformConstructorBody(node.body, node));
+        }
+        function transformConstructorBody(body, constructor) {
+            var parametersWithPropertyAssignments = constructor &&
+                ts.filter(constructor.parameters, ts.isParameterPropertyDeclaration);
+            if (!ts.some(parametersWithPropertyAssignments)) {
+                return ts.visitFunctionBody(body, visitor, context);
+            }
+            var statements = [];
+            var indexOfFirstStatement = 0;
+            resumeLexicalEnvironment();
+            indexOfFirstStatement = ts.addPrologueDirectivesAndInitialSuperCall(constructor, statements, visitor);
+            // Add parameters with property assignments. Transforms this:
+            //
+            //  constructor (public x, public y) {
+            //  }
+            //
+            // Into this:
+            //
+            //  constructor (x, y) {
+            //      this.x = x;
+            //      this.y = y;
+            //  }
+            //
+            ts.addRange(statements, ts.map(parametersWithPropertyAssignments, transformParameterWithPropertyAssignment));
+            // Add the existing statements, skipping the initial super call.
+            ts.addRange(statements, ts.visitNodes(body.statements, visitor, ts.isStatement, indexOfFirstStatement));
+            // End the lexical environment.
+            statements = ts.mergeLexicalEnvironment(statements, endLexicalEnvironment());
+            var block = ts.createBlock(ts.setTextRange(ts.createNodeArray(statements), body.statements), /*multiLine*/ true);
+            ts.setTextRange(block, /*location*/ body);
+            ts.setOriginalNode(block, body);
+            return block;
+        }
+        /**
+         * Transforms a parameter into a property assignment statement.
+         *
+         * @param node The parameter declaration.
+         */
+        function transformParameterWithPropertyAssignment(node) {
+            var name = node.name;
+            if (!ts.isIdentifier(name)) {
+                return undefined;
+            }
+            var propertyName = ts.getMutableClone(name);
+            ts.setEmitFlags(propertyName, 1536 /* NoComments */ | 48 /* NoSourceMap */);
+            var localName = ts.getMutableClone(name);
+            ts.setEmitFlags(localName, 1536 /* NoComments */);
+            return ts.startOnNewLine(ts.removeAllComments(ts.setTextRange(ts.setOriginalNode(ts.createExpressionStatement(ts.createAssignment(ts.setTextRange(ts.createPropertyAccess(ts.createThis(), propertyName), node.name), localName)), node), ts.moveRangePos(node, -1))));
         }
         function visitMethodDeclaration(node) {
             if (!shouldEmitFunctionLikeDeclaration(node)) {
@@ -69233,7 +71163,7 @@ var ts;
          */
         function visitEnumDeclaration(node) {
             if (!shouldEmitEnumDeclaration(node)) {
-                return undefined;
+                return ts.createNotEmittedStatement(node);
             }
             var statements = [];
             // We request to be advised when the printer is about to print this node. This allows
@@ -69401,12 +71331,12 @@ var ts;
             // enums in any other scope are emitted as a `let` declaration.
             var statement = ts.createVariableStatement(ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), ts.createVariableDeclarationList([
                 ts.createVariableDeclaration(ts.getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true))
-            ], currentLexicalScope.kind === 284 /* SourceFile */ ? 0 /* None */ : 1 /* Let */));
+            ], currentLexicalScope.kind === 285 /* SourceFile */ ? 0 /* None */ : 1 /* Let */));
             ts.setOriginalNode(statement, node);
             recordEmittedDeclarationInScope(node);
             if (isFirstEmittedDeclarationInScope(node)) {
                 // Adjust the source map emit to match the old emitter.
-                if (node.kind === 243 /* EnumDeclaration */) {
+                if (node.kind === 244 /* EnumDeclaration */) {
                     ts.setSourceMapRange(statement.declarationList, node);
                 }
                 else {
@@ -69531,7 +71461,7 @@ var ts;
             var statementsLocation;
             var blockLocation;
             var body = node.body;
-            if (body.kind === 245 /* ModuleBlock */) {
+            if (body.kind === 246 /* ModuleBlock */) {
                 saveStateAndInvoke(body, function (body) { return ts.addRange(statements, ts.visitNodes(body.statements, namespaceElementVisitor, ts.isStatement)); });
                 statementsLocation = body.statements;
                 blockLocation = body;
@@ -69577,13 +71507,13 @@ var ts;
             //     })(hi = hello.hi || (hello.hi = {}));
             // })(hello || (hello = {}));
             // We only want to emit comment on the namespace which contains block body itself, not the containing namespaces.
-            if (body.kind !== 245 /* ModuleBlock */) {
+            if (body.kind !== 246 /* ModuleBlock */) {
                 ts.setEmitFlags(block, ts.getEmitFlags(block) | 1536 /* NoComments */);
             }
             return block;
         }
         function getInnerMostModuleDeclarationFromDottedModule(moduleDeclaration) {
-            if (moduleDeclaration.body.kind === 244 /* ModuleDeclaration */) {
+            if (moduleDeclaration.body.kind === 245 /* ModuleDeclaration */) {
                 var recursiveInnerModule = getInnerMostModuleDeclarationFromDottedModule(moduleDeclaration.body);
                 return recursiveInnerModule || moduleDeclaration.body;
             }
@@ -69624,7 +71554,7 @@ var ts;
          * @param node The named import bindings node.
          */
         function visitNamedImportBindings(node) {
-            if (node.kind === 251 /* NamespaceImport */) {
+            if (node.kind === 252 /* NamespaceImport */) {
                 // Elide a namespace import if it is not referenced.
                 return resolver.isReferencedAliasDeclaration(node) ? node : undefined;
             }
@@ -69837,7 +71767,7 @@ var ts;
         function enableSubstitutionForNonQualifiedEnumMembers() {
             if ((enabledSubstitutions & 8 /* NonQualifiedEnumMembers */) === 0) {
                 enabledSubstitutions |= 8 /* NonQualifiedEnumMembers */;
-                context.enableSubstitution(72 /* Identifier */);
+                context.enableSubstitution(73 /* Identifier */);
             }
         }
         function enableSubstitutionForClassAliases() {
@@ -69845,7 +71775,7 @@ var ts;
                 enabledSubstitutions |= 1 /* ClassAliases */;
                 // We need to enable substitutions for identifiers. This allows us to
                 // substitute class names inside of a class declaration.
-                context.enableSubstitution(72 /* Identifier */);
+                context.enableSubstitution(73 /* Identifier */);
                 // Keep track of class aliases.
                 classAliases = [];
             }
@@ -69855,17 +71785,17 @@ var ts;
                 enabledSubstitutions |= 2 /* NamespaceExports */;
                 // We need to enable substitutions for identifiers and shorthand property assignments. This allows us to
                 // substitute the names of exported members of a namespace.
-                context.enableSubstitution(72 /* Identifier */);
-                context.enableSubstitution(276 /* ShorthandPropertyAssignment */);
+                context.enableSubstitution(73 /* Identifier */);
+                context.enableSubstitution(277 /* ShorthandPropertyAssignment */);
                 // We need to be notified when entering and exiting namespaces.
-                context.enableEmitNotification(244 /* ModuleDeclaration */);
+                context.enableEmitNotification(245 /* ModuleDeclaration */);
             }
         }
         function isTransformedModuleDeclaration(node) {
-            return ts.getOriginalNode(node).kind === 244 /* ModuleDeclaration */;
+            return ts.getOriginalNode(node).kind === 245 /* ModuleDeclaration */;
         }
         function isTransformedEnumDeclaration(node) {
-            return ts.getOriginalNode(node).kind === 243 /* EnumDeclaration */;
+            return ts.getOriginalNode(node).kind === 244 /* EnumDeclaration */;
         }
         /**
          * Hook for node emit.
@@ -69924,11 +71854,11 @@ var ts;
         }
         function substituteExpression(node) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return substituteExpressionIdentifier(node);
-                case 189 /* PropertyAccessExpression */:
+                case 190 /* PropertyAccessExpression */:
                     return substitutePropertyAccessExpression(node);
-                case 190 /* ElementAccessExpression */:
+                case 191 /* ElementAccessExpression */:
                     return substituteElementAccessExpression(node);
             }
             return node;
@@ -69966,9 +71896,9 @@ var ts;
                 // If we are nested within a namespace declaration, we may need to qualifiy
                 // an identifier that is exported from a merged namespace.
                 var container = resolver.getReferencedExportContainer(node, /*prefixLocals*/ false);
-                if (container && container.kind !== 284 /* SourceFile */) {
-                    var substitute = (applicableSubstitutions & 2 /* NamespaceExports */ && container.kind === 244 /* ModuleDeclaration */) ||
-                        (applicableSubstitutions & 8 /* NonQualifiedEnumMembers */ && container.kind === 243 /* EnumDeclaration */);
+                if (container && container.kind !== 285 /* SourceFile */) {
+                    var substitute = (applicableSubstitutions & 2 /* NamespaceExports */ && container.kind === 245 /* ModuleDeclaration */) ||
+                        (applicableSubstitutions & 8 /* NonQualifiedEnumMembers */ && container.kind === 244 /* EnumDeclaration */);
                     if (substitute) {
                         return ts.setTextRange(ts.createPropertyAccess(ts.getGeneratedNameForNode(container), node), 
                         /*location*/ node);
@@ -70058,6 +71988,413 @@ var ts;
 })(ts || (ts = {}));
 /*@internal*/
 var ts;
+(function (ts) {
+    var ClassPropertySubstitutionFlags;
+    (function (ClassPropertySubstitutionFlags) {
+        /**
+         * Enables substitutions for class expressions with static fields
+         * which have initializers that reference the class name.
+         */
+        ClassPropertySubstitutionFlags[ClassPropertySubstitutionFlags["ClassAliases"] = 1] = "ClassAliases";
+    })(ClassPropertySubstitutionFlags || (ClassPropertySubstitutionFlags = {}));
+    /**
+     * Transforms ECMAScript Class Syntax.
+     * TypeScript parameter property syntax is transformed in the TypeScript transformer.
+     * For now, this transforms public field declarations using TypeScript class semantics
+     * (where the declarations get elided and initializers are transformed as assignments in the constructor).
+     * Eventually, this transform will change to the ECMAScript semantics (with Object.defineProperty).
+     */
+    function transformClassFields(context) {
+        var hoistVariableDeclaration = context.hoistVariableDeclaration, endLexicalEnvironment = context.endLexicalEnvironment, resumeLexicalEnvironment = context.resumeLexicalEnvironment;
+        var resolver = context.getEmitResolver();
+        var previousOnSubstituteNode = context.onSubstituteNode;
+        context.onSubstituteNode = onSubstituteNode;
+        var enabledSubstitutions;
+        var classAliases;
+        /**
+         * Tracks what computed name expressions originating from elided names must be inlined
+         * at the next execution site, in document order
+         */
+        var pendingExpressions;
+        /**
+         * Tracks what computed name expression statements and static property initializers must be
+         * emitted at the next execution site, in document order (for decorated classes).
+         */
+        var pendingStatements;
+        return ts.chainBundle(transformSourceFile);
+        function transformSourceFile(node) {
+            if (node.isDeclarationFile) {
+                return node;
+            }
+            var visited = ts.visitEachChild(node, visitor, context);
+            ts.addEmitHelpers(visited, context.readEmitHelpers());
+            return visited;
+        }
+        function visitor(node) {
+            if (!(node.transformFlags & 1048576 /* ContainsClassFields */))
+                return node;
+            switch (node.kind) {
+                case 210 /* ClassExpression */:
+                    return visitClassExpression(node);
+                case 241 /* ClassDeclaration */:
+                    return visitClassDeclaration(node);
+                case 220 /* VariableStatement */:
+                    return visitVariableStatement(node);
+            }
+            return ts.visitEachChild(node, visitor, context);
+        }
+        /**
+         * Visits the members of a class that has fields.
+         *
+         * @param node The node to visit.
+         */
+        function classElementVisitor(node) {
+            switch (node.kind) {
+                case 158 /* Constructor */:
+                    // Constructors for classes using class fields are transformed in
+                    // `visitClassDeclaration` or `visitClassExpression`.
+                    return undefined;
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
+                case 157 /* MethodDeclaration */:
+                    // Visit the name of the member (if it's a computed property name).
+                    return ts.visitEachChild(node, classElementVisitor, context);
+                case 155 /* PropertyDeclaration */:
+                    return visitPropertyDeclaration(node);
+                case 150 /* ComputedPropertyName */:
+                    return visitComputedPropertyName(node);
+                case 218 /* SemicolonClassElement */:
+                    return node;
+                default:
+                    return visitor(node);
+            }
+        }
+        function visitVariableStatement(node) {
+            var savedPendingStatements = pendingStatements;
+            pendingStatements = [];
+            var visitedNode = ts.visitEachChild(node, visitor, context);
+            var statement = ts.some(pendingStatements) ? [visitedNode].concat(pendingStatements) :
+                visitedNode;
+            pendingStatements = savedPendingStatements;
+            return statement;
+        }
+        function visitComputedPropertyName(name) {
+            var node = ts.visitEachChild(name, visitor, context);
+            if (ts.some(pendingExpressions)) {
+                var expressions = pendingExpressions;
+                expressions.push(name.expression);
+                pendingExpressions = [];
+                node = ts.updateComputedPropertyName(node, ts.inlineExpressions(expressions));
+            }
+            return node;
+        }
+        function visitPropertyDeclaration(node) {
+            ts.Debug.assert(!ts.some(node.decorators));
+            // Create a temporary variable to store a computed property name (if necessary).
+            // If it's not inlineable, then we emit an expression after the class which assigns
+            // the property name to the temporary variable.
+            var expr = getPropertyNameExpressionIfNeeded(node.name, !!node.initializer);
+            if (expr && !ts.isSimpleInlineableExpression(expr)) {
+                (pendingExpressions || (pendingExpressions = [])).push(expr);
+            }
+            return undefined;
+        }
+        function visitClassDeclaration(node) {
+            if (!ts.forEach(node.members, ts.isPropertyDeclaration)) {
+                return ts.visitEachChild(node, visitor, context);
+            }
+            var savedPendingExpressions = pendingExpressions;
+            pendingExpressions = undefined;
+            var extendsClauseElement = ts.getEffectiveBaseTypeNode(node);
+            var isDerivedClass = !!(extendsClauseElement && ts.skipOuterExpressions(extendsClauseElement.expression).kind !== 97 /* NullKeyword */);
+            var statements = [
+                ts.updateClassDeclaration(node, 
+                /*decorators*/ undefined, node.modifiers, node.name, 
+                /*typeParameters*/ undefined, ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), transformClassMembers(node, isDerivedClass))
+            ];
+            // Write any pending expressions from elided or moved computed property names
+            if (ts.some(pendingExpressions)) {
+                statements.push(ts.createExpressionStatement(ts.inlineExpressions(pendingExpressions)));
+            }
+            pendingExpressions = savedPendingExpressions;
+            // Emit static property assignment. Because classDeclaration is lexically evaluated,
+            // it is safe to emit static property assignment after classDeclaration
+            // From ES6 specification:
+            //      HasLexicalDeclaration (N) : Determines if the argument identifier has a binding in this environment record that was created using
+            //                                  a lexical declaration such as a LexicalDeclaration or a ClassDeclaration.
+            var staticProperties = ts.getInitializedProperties(node, /*isStatic*/ true);
+            if (ts.some(staticProperties)) {
+                addInitializedPropertyStatements(statements, staticProperties, ts.getInternalName(node));
+            }
+            return statements;
+        }
+        function visitClassExpression(node) {
+            if (!ts.forEach(node.members, ts.isPropertyDeclaration)) {
+                return ts.visitEachChild(node, visitor, context);
+            }
+            var savedPendingExpressions = pendingExpressions;
+            pendingExpressions = undefined;
+            // If this class expression is a transformation of a decorated class declaration,
+            // then we want to output the pendingExpressions as statements, not as inlined
+            // expressions with the class statement.
+            //
+            // In this case, we use pendingStatements to produce the same output as the
+            // class declaration transformation. The VariableStatement visitor will insert
+            // these statements after the class expression variable statement.
+            var isDecoratedClassDeclaration = ts.isClassDeclaration(ts.getOriginalNode(node));
+            var staticProperties = ts.getInitializedProperties(node, /*isStatic*/ true);
+            var extendsClauseElement = ts.getEffectiveBaseTypeNode(node);
+            var isDerivedClass = !!(extendsClauseElement && ts.skipOuterExpressions(extendsClauseElement.expression).kind !== 97 /* NullKeyword */);
+            var classExpression = ts.updateClassExpression(node, node.modifiers, node.name, 
+            /*typeParameters*/ undefined, ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), transformClassMembers(node, isDerivedClass));
+            if (ts.some(staticProperties) || ts.some(pendingExpressions)) {
+                if (isDecoratedClassDeclaration) {
+                    ts.Debug.assertDefined(pendingStatements, "Decorated classes transformed by TypeScript are expected to be within a variable declaration.");
+                    // Write any pending expressions from elided or moved computed property names
+                    if (pendingStatements && pendingExpressions && ts.some(pendingExpressions)) {
+                        pendingStatements.push(ts.createExpressionStatement(ts.inlineExpressions(pendingExpressions)));
+                    }
+                    pendingExpressions = savedPendingExpressions;
+                    if (pendingStatements && ts.some(staticProperties)) {
+                        addInitializedPropertyStatements(pendingStatements, staticProperties, ts.getInternalName(node));
+                    }
+                    return classExpression;
+                }
+                else {
+                    var expressions = [];
+                    var isClassWithConstructorReference = resolver.getNodeCheckFlags(node) & 16777216 /* ClassWithConstructorReference */;
+                    var temp = ts.createTempVariable(hoistVariableDeclaration, !!isClassWithConstructorReference);
+                    if (isClassWithConstructorReference) {
+                        // record an alias as the class name is not in scope for statics.
+                        enableSubstitutionForClassAliases();
+                        var alias = ts.getSynthesizedClone(temp);
+                        alias.autoGenerateFlags &= ~8 /* ReservedInNestedScopes */;
+                        classAliases[ts.getOriginalNodeId(node)] = alias;
+                    }
+                    // To preserve the behavior of the old emitter, we explicitly indent
+                    // the body of a class with static initializers.
+                    ts.setEmitFlags(classExpression, 65536 /* Indented */ | ts.getEmitFlags(classExpression));
+                    expressions.push(ts.startOnNewLine(ts.createAssignment(temp, classExpression)));
+                    // Add any pending expressions leftover from elided or relocated computed property names
+                    ts.addRange(expressions, ts.map(pendingExpressions, ts.startOnNewLine));
+                    ts.addRange(expressions, generateInitializedPropertyExpressions(staticProperties, temp));
+                    expressions.push(ts.startOnNewLine(temp));
+                    pendingExpressions = savedPendingExpressions;
+                    return ts.inlineExpressions(expressions);
+                }
+            }
+            pendingExpressions = savedPendingExpressions;
+            return classExpression;
+        }
+        function transformClassMembers(node, isDerivedClass) {
+            var members = [];
+            var constructor = transformConstructor(node, isDerivedClass);
+            if (constructor) {
+                members.push(constructor);
+            }
+            ts.addRange(members, ts.visitNodes(node.members, classElementVisitor, ts.isClassElement));
+            return ts.setTextRange(ts.createNodeArray(members), /*location*/ node.members);
+        }
+        function transformConstructor(node, isDerivedClass) {
+            var constructor = ts.visitNode(ts.getFirstConstructorWithBody(node), visitor, ts.isConstructorDeclaration);
+            var containsPropertyInitializer = ts.forEach(node.members, ts.isInitializedProperty);
+            if (!containsPropertyInitializer) {
+                return constructor;
+            }
+            var parameters = ts.visitParameterList(constructor ? constructor.parameters : undefined, visitor, context);
+            var body = transformConstructorBody(node, constructor, isDerivedClass);
+            if (!body) {
+                return undefined;
+            }
+            return ts.startOnNewLine(ts.setOriginalNode(ts.setTextRange(ts.createConstructor(
+            /*decorators*/ undefined, 
+            /*modifiers*/ undefined, parameters, body), constructor || node), constructor));
+        }
+        function transformConstructorBody(node, constructor, isDerivedClass) {
+            var properties = ts.getInitializedProperties(node, /*isStatic*/ false);
+            // Only generate synthetic constructor when there are property initializers to move.
+            if (!constructor && !ts.some(properties)) {
+                return ts.visitFunctionBody(/*node*/ undefined, visitor, context);
+            }
+            resumeLexicalEnvironment();
+            var indexOfFirstStatement = 0;
+            var statements = [];
+            if (!constructor && isDerivedClass) {
+                // Add a synthetic `super` call:
+                //
+                //  super(...arguments);
+                //
+                statements.push(ts.createExpressionStatement(ts.createCall(ts.createSuper(), 
+                /*typeArguments*/ undefined, [ts.createSpread(ts.createIdentifier("arguments"))])));
+            }
+            if (constructor) {
+                indexOfFirstStatement = ts.addPrologueDirectivesAndInitialSuperCall(constructor, statements, visitor);
+            }
+            // Add the property initializers. Transforms this:
+            //
+            //  public x = 1;
+            //
+            // Into this:
+            //
+            //  constructor() {
+            //      this.x = 1;
+            //  }
+            //
+            if (constructor && constructor.body) {
+                var parameterPropertyDeclarationCount = 0;
+                for (var i = indexOfFirstStatement; i < constructor.body.statements.length; i++) {
+                    if (ts.isParameterPropertyDeclaration(ts.getOriginalNode(constructor.body.statements[i]))) {
+                        parameterPropertyDeclarationCount++;
+                    }
+                    else {
+                        break;
+                    }
+                }
+                if (parameterPropertyDeclarationCount > 0) {
+                    ts.addRange(statements, ts.visitNodes(constructor.body.statements, visitor, ts.isStatement, indexOfFirstStatement, parameterPropertyDeclarationCount));
+                    indexOfFirstStatement += parameterPropertyDeclarationCount;
+                }
+            }
+            addInitializedPropertyStatements(statements, properties, ts.createThis());
+            // Add existing statements, skipping the initial super call.
+            if (constructor) {
+                ts.addRange(statements, ts.visitNodes(constructor.body.statements, visitor, ts.isStatement, indexOfFirstStatement));
+            }
+            statements = ts.mergeLexicalEnvironment(statements, endLexicalEnvironment());
+            return ts.setTextRange(ts.createBlock(ts.setTextRange(ts.createNodeArray(statements), 
+            /*location*/ constructor ? constructor.body.statements : node.members), 
+            /*multiLine*/ true), 
+            /*location*/ constructor ? constructor.body : undefined);
+        }
+        /**
+         * Generates assignment statements for property initializers.
+         *
+         * @param properties An array of property declarations to transform.
+         * @param receiver The receiver on which each property should be assigned.
+         */
+        function addInitializedPropertyStatements(statements, properties, receiver) {
+            for (var _i = 0, properties_6 = properties; _i < properties_6.length; _i++) {
+                var property = properties_6[_i];
+                var statement = ts.createExpressionStatement(transformInitializedProperty(property, receiver));
+                ts.setSourceMapRange(statement, ts.moveRangePastModifiers(property));
+                ts.setCommentRange(statement, property);
+                ts.setOriginalNode(statement, property);
+                statements.push(statement);
+            }
+        }
+        /**
+         * Generates assignment expressions for property initializers.
+         *
+         * @param properties An array of property declarations to transform.
+         * @param receiver The receiver on which each property should be assigned.
+         */
+        function generateInitializedPropertyExpressions(properties, receiver) {
+            var expressions = [];
+            for (var _i = 0, properties_7 = properties; _i < properties_7.length; _i++) {
+                var property = properties_7[_i];
+                var expression = transformInitializedProperty(property, receiver);
+                ts.startOnNewLine(expression);
+                ts.setSourceMapRange(expression, ts.moveRangePastModifiers(property));
+                ts.setCommentRange(expression, property);
+                ts.setOriginalNode(expression, property);
+                expressions.push(expression);
+            }
+            return expressions;
+        }
+        /**
+         * Transforms a property initializer into an assignment statement.
+         *
+         * @param property The property declaration.
+         * @param receiver The object receiving the property assignment.
+         */
+        function transformInitializedProperty(property, receiver) {
+            // We generate a name here in order to reuse the value cached by the relocated computed name expression (which uses the same generated name)
+            var propertyName = ts.isComputedPropertyName(property.name) && !ts.isSimpleInlineableExpression(property.name.expression)
+                ? ts.updateComputedPropertyName(property.name, ts.getGeneratedNameForNode(property.name))
+                : property.name;
+            var initializer = ts.visitNode(property.initializer, visitor, ts.isExpression);
+            var memberAccess = ts.createMemberAccessForPropertyName(receiver, propertyName, /*location*/ propertyName);
+            return ts.createAssignment(memberAccess, initializer);
+        }
+        function enableSubstitutionForClassAliases() {
+            if ((enabledSubstitutions & 1 /* ClassAliases */) === 0) {
+                enabledSubstitutions |= 1 /* ClassAliases */;
+                // We need to enable substitutions for identifiers. This allows us to
+                // substitute class names inside of a class declaration.
+                context.enableSubstitution(73 /* Identifier */);
+                // Keep track of class aliases.
+                classAliases = [];
+            }
+        }
+        /**
+         * Hooks node substitutions.
+         *
+         * @param hint The context for the emitter.
+         * @param node The node to substitute.
+         */
+        function onSubstituteNode(hint, node) {
+            node = previousOnSubstituteNode(hint, node);
+            if (hint === 1 /* Expression */) {
+                return substituteExpression(node);
+            }
+            return node;
+        }
+        function substituteExpression(node) {
+            switch (node.kind) {
+                case 73 /* Identifier */:
+                    return substituteExpressionIdentifier(node);
+            }
+            return node;
+        }
+        function substituteExpressionIdentifier(node) {
+            return trySubstituteClassAlias(node) || node;
+        }
+        function trySubstituteClassAlias(node) {
+            if (enabledSubstitutions & 1 /* ClassAliases */) {
+                if (resolver.getNodeCheckFlags(node) & 33554432 /* ConstructorReferenceInClass */) {
+                    // Due to the emit for class decorators, any reference to the class from inside of the class body
+                    // must instead be rewritten to point to a temporary variable to avoid issues with the double-bind
+                    // behavior of class names in ES6.
+                    // Also, when emitting statics for class expressions, we must substitute a class alias for
+                    // constructor references in static property initializers.
+                    var declaration = resolver.getReferencedValueDeclaration(node);
+                    if (declaration) {
+                        var classAlias = classAliases[declaration.id]; // TODO: GH#18217
+                        if (classAlias) {
+                            var clone_2 = ts.getSynthesizedClone(classAlias);
+                            ts.setSourceMapRange(clone_2, node);
+                            ts.setCommentRange(clone_2, node);
+                            return clone_2;
+                        }
+                    }
+                }
+            }
+            return undefined;
+        }
+        /**
+         * If the name is a computed property, this function transforms it, then either returns an expression which caches the
+         * value of the result or the expression itself if the value is either unused or safe to inline into multiple locations
+         * @param shouldHoist Does the expression need to be reused? (ie, for an initializer or a decorator)
+         */
+        function getPropertyNameExpressionIfNeeded(name, shouldHoist) {
+            if (ts.isComputedPropertyName(name)) {
+                var expression = ts.visitNode(name.expression, visitor, ts.isExpression);
+                var innerExpression = ts.skipPartiallyEmittedExpressions(expression);
+                var inlinable = ts.isSimpleInlineableExpression(innerExpression);
+                var alreadyTransformed = ts.isAssignmentExpression(innerExpression) && ts.isGeneratedIdentifier(innerExpression.left);
+                if (!alreadyTransformed && !inlinable && shouldHoist) {
+                    var generatedName = ts.getGeneratedNameForNode(name);
+                    hoistVariableDeclaration(generatedName);
+                    return ts.createAssignment(generatedName, expression);
+                }
+                return (inlinable || ts.isIdentifier(innerExpression)) ? undefined : expression;
+            }
+        }
+    }
+    ts.transformClassFields = transformClassFields;
+})(ts || (ts = {}));
+/*@internal*/
+var ts;
 (function (ts) {
     var ES2017SubstitutionFlags;
     (function (ES2017SubstitutionFlags) {
@@ -70108,26 +72445,26 @@ var ts;
                 return node;
             }
             switch (node.kind) {
-                case 121 /* AsyncKeyword */:
+                case 122 /* AsyncKeyword */:
                     // ES2017 async modifier should be elided for targets < ES2017
                     return undefined;
-                case 201 /* AwaitExpression */:
+                case 202 /* AwaitExpression */:
                     return visitAwaitExpression(node);
-                case 156 /* MethodDeclaration */:
+                case 157 /* MethodDeclaration */:
                     return visitMethodDeclaration(node);
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     return visitFunctionDeclaration(node);
-                case 196 /* FunctionExpression */:
+                case 197 /* FunctionExpression */:
                     return visitFunctionExpression(node);
-                case 197 /* ArrowFunction */:
+                case 198 /* ArrowFunction */:
                     return visitArrowFunction(node);
-                case 189 /* PropertyAccessExpression */:
-                    if (capturedSuperProperties && ts.isPropertyAccessExpression(node) && node.expression.kind === 98 /* SuperKeyword */) {
+                case 190 /* PropertyAccessExpression */:
+                    if (capturedSuperProperties && ts.isPropertyAccessExpression(node) && node.expression.kind === 99 /* SuperKeyword */) {
                         capturedSuperProperties.set(node.name.escapedText, true);
                     }
                     return ts.visitEachChild(node, visitor, context);
-                case 190 /* ElementAccessExpression */:
-                    if (capturedSuperProperties && node.expression.kind === 98 /* SuperKeyword */) {
+                case 191 /* ElementAccessExpression */:
+                    if (capturedSuperProperties && node.expression.kind === 99 /* SuperKeyword */) {
                         hasSuperElementAccess = true;
                     }
                     return ts.visitEachChild(node, visitor, context);
@@ -70138,27 +72475,27 @@ var ts;
         function asyncBodyVisitor(node) {
             if (ts.isNodeWithPossibleHoistedDeclaration(node)) {
                 switch (node.kind) {
-                    case 219 /* VariableStatement */:
+                    case 220 /* VariableStatement */:
                         return visitVariableStatementInAsyncBody(node);
-                    case 225 /* ForStatement */:
+                    case 226 /* ForStatement */:
                         return visitForStatementInAsyncBody(node);
-                    case 226 /* ForInStatement */:
+                    case 227 /* ForInStatement */:
                         return visitForInStatementInAsyncBody(node);
-                    case 227 /* ForOfStatement */:
+                    case 228 /* ForOfStatement */:
                         return visitForOfStatementInAsyncBody(node);
-                    case 274 /* CatchClause */:
+                    case 275 /* CatchClause */:
                         return visitCatchClauseInAsyncBody(node);
-                    case 218 /* Block */:
-                    case 232 /* SwitchStatement */:
-                    case 246 /* CaseBlock */:
-                    case 271 /* CaseClause */:
-                    case 272 /* DefaultClause */:
-                    case 235 /* TryStatement */:
-                    case 223 /* DoStatement */:
-                    case 224 /* WhileStatement */:
-                    case 222 /* IfStatement */:
-                    case 231 /* WithStatement */:
-                    case 233 /* LabeledStatement */:
+                    case 219 /* Block */:
+                    case 233 /* SwitchStatement */:
+                    case 247 /* CaseBlock */:
+                    case 272 /* CaseClause */:
+                    case 273 /* DefaultClause */:
+                    case 236 /* TryStatement */:
+                    case 224 /* DoStatement */:
+                    case 225 /* WhileStatement */:
+                    case 223 /* IfStatement */:
+                    case 232 /* WithStatement */:
+                    case 234 /* LabeledStatement */:
                         return ts.visitEachChild(node, asyncBodyVisitor, context);
                     default:
                         return ts.Debug.assertNever(node, "Unhandled node.");
@@ -70359,7 +72696,7 @@ var ts;
             var original = ts.getOriginalNode(node, ts.isFunctionLike);
             var nodeType = original.type;
             var promiseConstructor = languageVersion < 2 /* ES2015 */ ? getPromiseConstructor(nodeType) : undefined;
-            var isArrowFunction = node.kind === 197 /* ArrowFunction */;
+            var isArrowFunction = node.kind === 198 /* ArrowFunction */;
             var hasLexicalArguments = (resolver.getNodeCheckFlags(node) & 8192 /* CaptureArguments */) !== 0;
             // An async function is emit as an outer function that calls an inner
             // generator function. To preserve lexical bindings, we pass the current
@@ -70374,8 +72711,10 @@ var ts;
             }
             var savedCapturedSuperProperties = capturedSuperProperties;
             var savedHasSuperElementAccess = hasSuperElementAccess;
-            capturedSuperProperties = ts.createUnderscoreEscapedMap();
-            hasSuperElementAccess = false;
+            if (!isArrowFunction) {
+                capturedSuperProperties = ts.createUnderscoreEscapedMap();
+                hasSuperElementAccess = false;
+            }
             var result;
             if (!isArrowFunction) {
                 var statements = [];
@@ -70387,9 +72726,11 @@ var ts;
                 var emitSuperHelpers = languageVersion >= 2 /* ES2015 */ && resolver.getNodeCheckFlags(node) & (4096 /* AsyncMethodWithSuperBinding */ | 2048 /* AsyncMethodWithSuper */);
                 if (emitSuperHelpers) {
                     enableSubstitutionForAsyncMethodsWithSuper();
-                    var variableStatement = createSuperAccessVariableStatement(resolver, node, capturedSuperProperties);
-                    substitutedSuperAccessors[ts.getNodeId(variableStatement)] = true;
-                    ts.insertStatementsAfterStandardPrologue(statements, [variableStatement]);
+                    if (ts.hasEntries(capturedSuperProperties)) {
+                        var variableStatement = createSuperAccessVariableStatement(resolver, node, capturedSuperProperties);
+                        substitutedSuperAccessors[ts.getNodeId(variableStatement)] = true;
+                        ts.insertStatementsAfterStandardPrologue(statements, [variableStatement]);
+                    }
                 }
                 var block = ts.createBlock(statements, /*multiLine*/ true);
                 ts.setTextRange(block, node.body);
@@ -70416,8 +72757,10 @@ var ts;
                 }
             }
             enclosingFunctionParameterNames = savedEnclosingFunctionParameterNames;
-            capturedSuperProperties = savedCapturedSuperProperties;
-            hasSuperElementAccess = savedHasSuperElementAccess;
+            if (!isArrowFunction) {
+                capturedSuperProperties = savedCapturedSuperProperties;
+                hasSuperElementAccess = savedHasSuperElementAccess;
+            }
             return result;
         }
         function transformAsyncFunctionBodyWorker(body, start) {
@@ -70444,17 +72787,17 @@ var ts;
                 enabledSubstitutions |= 1 /* AsyncMethodsWithSuper */;
                 // We need to enable substitutions for call, property access, and element access
                 // if we need to rewrite super calls.
-                context.enableSubstitution(191 /* CallExpression */);
-                context.enableSubstitution(189 /* PropertyAccessExpression */);
-                context.enableSubstitution(190 /* ElementAccessExpression */);
+                context.enableSubstitution(192 /* CallExpression */);
+                context.enableSubstitution(190 /* PropertyAccessExpression */);
+                context.enableSubstitution(191 /* ElementAccessExpression */);
                 // We need to be notified when entering and exiting declarations that bind super.
-                context.enableEmitNotification(240 /* ClassDeclaration */);
-                context.enableEmitNotification(156 /* MethodDeclaration */);
-                context.enableEmitNotification(158 /* GetAccessor */);
-                context.enableEmitNotification(159 /* SetAccessor */);
-                context.enableEmitNotification(157 /* Constructor */);
+                context.enableEmitNotification(241 /* ClassDeclaration */);
+                context.enableEmitNotification(157 /* MethodDeclaration */);
+                context.enableEmitNotification(159 /* GetAccessor */);
+                context.enableEmitNotification(160 /* SetAccessor */);
+                context.enableEmitNotification(158 /* Constructor */);
                 // We need to be notified when entering the generated accessor arrow functions.
-                context.enableEmitNotification(219 /* VariableStatement */);
+                context.enableEmitNotification(220 /* VariableStatement */);
             }
         }
         /**
@@ -70502,23 +72845,23 @@ var ts;
         }
         function substituteExpression(node) {
             switch (node.kind) {
-                case 189 /* PropertyAccessExpression */:
+                case 190 /* PropertyAccessExpression */:
                     return substitutePropertyAccessExpression(node);
-                case 190 /* ElementAccessExpression */:
+                case 191 /* ElementAccessExpression */:
                     return substituteElementAccessExpression(node);
-                case 191 /* CallExpression */:
+                case 192 /* CallExpression */:
                     return substituteCallExpression(node);
             }
             return node;
         }
         function substitutePropertyAccessExpression(node) {
-            if (node.expression.kind === 98 /* SuperKeyword */) {
+            if (node.expression.kind === 99 /* SuperKeyword */) {
                 return ts.setTextRange(ts.createPropertyAccess(ts.createFileLevelUniqueName("_super"), node.name), node);
             }
             return node;
         }
         function substituteElementAccessExpression(node) {
-            if (node.expression.kind === 98 /* SuperKeyword */) {
+            if (node.expression.kind === 99 /* SuperKeyword */) {
                 return createSuperElementAccessInAsyncMethod(node.argumentExpression, node);
             }
             return node;
@@ -70538,11 +72881,11 @@ var ts;
         }
         function isSuperContainer(node) {
             var kind = node.kind;
-            return kind === 240 /* ClassDeclaration */
-                || kind === 157 /* Constructor */
-                || kind === 156 /* MethodDeclaration */
-                || kind === 158 /* GetAccessor */
-                || kind === 159 /* SetAccessor */;
+            return kind === 241 /* ClassDeclaration */
+                || kind === 158 /* Constructor */
+                || kind === 157 /* MethodDeclaration */
+                || kind === 159 /* GetAccessor */
+                || kind === 160 /* SetAccessor */;
         }
         function createSuperElementAccessInAsyncMethod(argumentExpression, location) {
             if (enclosingSuperContainerFlags & 4096 /* AsyncMethodWithSuperBinding */) {
@@ -70570,7 +72913,7 @@ var ts;
             /* typeParameters */ undefined, 
             /* parameters */ [], 
             /* type */ undefined, 
-            /* equalsGreaterThanToken */ undefined, ts.createPropertyAccess(ts.createSuper(), name))));
+            /* equalsGreaterThanToken */ undefined, ts.setEmitFlags(ts.createPropertyAccess(ts.setEmitFlags(ts.createSuper(), 4 /* NoSubstitution */), name), 4 /* NoSubstitution */))));
             if (hasBinding) {
                 getterAndSetter.push(ts.createPropertyAssignment("set", ts.createArrowFunction(
                 /* modifiers */ undefined, 
@@ -70585,7 +72928,7 @@ var ts;
                     /* initializer */ undefined)
                 ], 
                 /* type */ undefined, 
-                /* equalsGreaterThanToken */ undefined, ts.createAssignment(ts.createPropertyAccess(ts.createSuper(), name), ts.createIdentifier("v")))));
+                /* equalsGreaterThanToken */ undefined, ts.createAssignment(ts.setEmitFlags(ts.createPropertyAccess(ts.setEmitFlags(ts.createSuper(), 4 /* NoSubstitution */), name), 4 /* NoSubstitution */), ts.createIdentifier("v")))));
             }
             accessors.push(ts.createPropertyAssignment(name, ts.createObjectLiteral(getterAndSetter)));
         });
@@ -70604,7 +72947,7 @@ var ts;
         name: "typescript:awaiter",
         scoped: false,
         priority: 5,
-        text: "\n            var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {\n                return new (P || (P = Promise))(function (resolve, reject) {\n                    function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }\n                    function rejected(value) { try { step(generator[\"throw\"](value)); } catch (e) { reject(e); } }\n                    function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }\n                    step((generator = generator.apply(thisArg, _arguments || [])).next());\n                });\n            };"
+        text: "\n            var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {\n                function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }\n                return new (P || (P = Promise))(function (resolve, reject) {\n                    function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }\n                    function rejected(value) { try { step(generator[\"throw\"](value)); } catch (e) { reject(e); } }\n                    function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }\n                    step((generator = generator.apply(thisArg, _arguments || [])).next());\n                });\n            };"
     };
     function createAwaiterHelper(context, hasLexicalArguments, promiseConstructor, body) {
         context.requestEmitHelper(ts.awaiterHelper);
@@ -70677,7 +73020,7 @@ var ts;
             return visitorWorker(node, /*noDestructuringValue*/ true);
         }
         function visitorNoAsyncModifier(node) {
-            if (node.kind === 121 /* AsyncKeyword */) {
+            if (node.kind === 122 /* AsyncKeyword */) {
                 return undefined;
             }
             return node;
@@ -70687,53 +73030,55 @@ var ts;
                 return node;
             }
             switch (node.kind) {
-                case 201 /* AwaitExpression */:
+                case 202 /* AwaitExpression */:
                     return visitAwaitExpression(node);
-                case 207 /* YieldExpression */:
+                case 208 /* YieldExpression */:
                     return visitYieldExpression(node);
-                case 230 /* ReturnStatement */:
+                case 231 /* ReturnStatement */:
                     return visitReturnStatement(node);
-                case 233 /* LabeledStatement */:
+                case 234 /* LabeledStatement */:
                     return visitLabeledStatement(node);
-                case 188 /* ObjectLiteralExpression */:
+                case 189 /* ObjectLiteralExpression */:
                     return visitObjectLiteralExpression(node);
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return visitBinaryExpression(node, noDestructuringValue);
-                case 237 /* VariableDeclaration */:
+                case 275 /* CatchClause */:
+                    return visitCatchClause(node);
+                case 238 /* VariableDeclaration */:
                     return visitVariableDeclaration(node);
-                case 227 /* ForOfStatement */:
+                case 228 /* ForOfStatement */:
                     return visitForOfStatement(node, /*outermostLabeledStatement*/ undefined);
-                case 225 /* ForStatement */:
+                case 226 /* ForStatement */:
                     return visitForStatement(node);
-                case 200 /* VoidExpression */:
+                case 201 /* VoidExpression */:
                     return visitVoidExpression(node);
-                case 157 /* Constructor */:
+                case 158 /* Constructor */:
                     return visitConstructorDeclaration(node);
-                case 156 /* MethodDeclaration */:
+                case 157 /* MethodDeclaration */:
                     return visitMethodDeclaration(node);
-                case 158 /* GetAccessor */:
+                case 159 /* GetAccessor */:
                     return visitGetAccessorDeclaration(node);
-                case 159 /* SetAccessor */:
+                case 160 /* SetAccessor */:
                     return visitSetAccessorDeclaration(node);
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     return visitFunctionDeclaration(node);
-                case 196 /* FunctionExpression */:
+                case 197 /* FunctionExpression */:
                     return visitFunctionExpression(node);
-                case 197 /* ArrowFunction */:
+                case 198 /* ArrowFunction */:
                     return visitArrowFunction(node);
-                case 151 /* Parameter */:
+                case 152 /* Parameter */:
                     return visitParameter(node);
-                case 221 /* ExpressionStatement */:
+                case 222 /* ExpressionStatement */:
                     return visitExpressionStatement(node);
-                case 195 /* ParenthesizedExpression */:
+                case 196 /* ParenthesizedExpression */:
                     return visitParenthesizedExpression(node, noDestructuringValue);
-                case 189 /* PropertyAccessExpression */:
-                    if (capturedSuperProperties && ts.isPropertyAccessExpression(node) && node.expression.kind === 98 /* SuperKeyword */) {
+                case 190 /* PropertyAccessExpression */:
+                    if (capturedSuperProperties && ts.isPropertyAccessExpression(node) && node.expression.kind === 99 /* SuperKeyword */) {
                         capturedSuperProperties.set(node.name.escapedText, true);
                     }
                     return ts.visitEachChild(node, visitor, context);
-                case 190 /* ElementAccessExpression */:
-                    if (capturedSuperProperties && node.expression.kind === 98 /* SuperKeyword */) {
+                case 191 /* ElementAccessExpression */:
+                    if (capturedSuperProperties && node.expression.kind === 99 /* SuperKeyword */) {
                         hasSuperElementAccess = true;
                     }
                     return ts.visitEachChild(node, visitor, context);
@@ -70769,7 +73114,7 @@ var ts;
         function visitLabeledStatement(node) {
             if (enclosingFunctionFlags & 2 /* Async */) {
                 var statement = ts.unwrapInnermostStatementOfLabel(node);
-                if (statement.kind === 227 /* ForOfStatement */ && statement.awaitModifier) {
+                if (statement.kind === 228 /* ForOfStatement */ && statement.awaitModifier) {
                     return visitForOfStatement(statement, node);
                 }
                 return ts.restoreEnclosingLabel(ts.visitEachChild(statement, visitor, context), node);
@@ -70781,7 +73126,7 @@ var ts;
             var objects = [];
             for (var _i = 0, elements_4 = elements; _i < elements_4.length; _i++) {
                 var e = elements_4[_i];
-                if (e.kind === 277 /* SpreadAssignment */) {
+                if (e.kind === 278 /* SpreadAssignment */) {
                     if (chunkObject) {
                         objects.push(ts.createObjectLiteral(chunkObject));
                         chunkObject = undefined;
@@ -70790,7 +73135,7 @@ var ts;
                     objects.push(ts.visitNode(target, visitor, ts.isExpression));
                 }
                 else {
-                    chunkObject = ts.append(chunkObject, e.kind === 275 /* PropertyAssignment */
+                    chunkObject = ts.append(chunkObject, e.kind === 276 /* PropertyAssignment */
                         ? ts.createPropertyAssignment(e.name, ts.visitNode(e.initializer, visitor, ts.isExpression))
                         : ts.visitNode(e, visitor, ts.isObjectLiteralElementLike));
                 }
@@ -70804,14 +73149,39 @@ var ts;
             if (node.transformFlags & 8192 /* ContainsObjectRestOrSpread */) {
                 // spread elements emit like so:
                 // non-spread elements are chunked together into object literals, and then all are passed to __assign:
-                //     { a, ...o, b } => __assign({a}, o, {b});
+                //     { a, ...o, b } => __assign(__assign({a}, o), {b});
                 // If the first element is a spread element, then the first argument to __assign is {}:
-                //     { ...o, a, b, ...o2 } => __assign({}, o, {a, b}, o2)
+                //     { ...o, a, b, ...o2 } => __assign(__assign(__assign({}, o), {a, b}), o2)
+                //
+                // We cannot call __assign with more than two elements, since any element could cause side effects. For
+                // example:
+                //      var k = { a: 1, b: 2 };
+                //      var o = { a: 3, ...k, b: k.a++ };
+                //      // expected: { a: 1, b: 1 }
+                // If we translate the above to `__assign({ a: 3 }, k, { b: k.a++ })`, the `k.a++` will evaluate before
+                // `k` is spread and we end up with `{ a: 2, b: 1 }`.
+                //
+                // This also occurs for spread elements, not just property assignments:
+                //      var k = { a: 1, get b() { l = { z: 9 }; return 2; } };
+                //      var l = { c: 3 };
+                //      var o = { ...k, ...l };
+                //      // expected: { a: 1, b: 2, z: 9 }
+                // If we translate the above to `__assign({}, k, l)`, the `l` will evaluate before `k` is spread and we
+                // end up with `{ a: 1, b: 2, c: 3 }`
                 var objects = chunkObjectLiteralElements(node.properties);
-                if (objects.length && objects[0].kind !== 188 /* ObjectLiteralExpression */) {
+                if (objects.length && objects[0].kind !== 189 /* ObjectLiteralExpression */) {
                     objects.unshift(ts.createObjectLiteral());
                 }
-                return createAssignHelper(context, objects);
+                var expression = objects[0];
+                if (objects.length > 1) {
+                    for (var i = 1; i < objects.length; i++) {
+                        expression = createAssignHelper(context, [expression, objects[i]]);
+                    }
+                    return expression;
+                }
+                else {
+                    return createAssignHelper(context, objects);
+                }
             }
             return ts.visitEachChild(node, visitor, context);
         }
@@ -70835,6 +73205,23 @@ var ts;
             }
             return ts.visitEachChild(node, visitor, context);
         }
+        function visitCatchClause(node) {
+            if (node.variableDeclaration &&
+                ts.isBindingPattern(node.variableDeclaration.name) &&
+                node.variableDeclaration.name.transformFlags & 8192 /* ContainsObjectRestOrSpread */) {
+                var name = ts.getGeneratedNameForNode(node.variableDeclaration.name);
+                var updatedDecl = ts.updateVariableDeclaration(node.variableDeclaration, node.variableDeclaration.name, /*type*/ undefined, name);
+                var visitedBindings = ts.flattenDestructuringBinding(updatedDecl, visitor, context, 1 /* ObjectRest */);
+                var block = ts.visitNode(node.block, visitor, ts.isBlock);
+                if (ts.some(visitedBindings)) {
+                    block = ts.updateBlock(block, [
+                        ts.createVariableStatement(/*modifiers*/ undefined, visitedBindings)
+                    ].concat(block.statements));
+                }
+                return ts.updateCatchClause(node, ts.updateVariableDeclaration(node.variableDeclaration, name, /*type*/ undefined, /*initializer*/ undefined), block);
+            }
+            return ts.visitEachChild(node, visitor, context);
+        }
         /**
          * Visits a VariableDeclaration node with a binding pattern.
          *
@@ -71127,17 +73514,17 @@ var ts;
                 enabledSubstitutions |= 1 /* AsyncMethodsWithSuper */;
                 // We need to enable substitutions for call, property access, and element access
                 // if we need to rewrite super calls.
-                context.enableSubstitution(191 /* CallExpression */);
-                context.enableSubstitution(189 /* PropertyAccessExpression */);
-                context.enableSubstitution(190 /* ElementAccessExpression */);
+                context.enableSubstitution(192 /* CallExpression */);
+                context.enableSubstitution(190 /* PropertyAccessExpression */);
+                context.enableSubstitution(191 /* ElementAccessExpression */);
                 // We need to be notified when entering and exiting declarations that bind super.
-                context.enableEmitNotification(240 /* ClassDeclaration */);
-                context.enableEmitNotification(156 /* MethodDeclaration */);
-                context.enableEmitNotification(158 /* GetAccessor */);
-                context.enableEmitNotification(159 /* SetAccessor */);
-                context.enableEmitNotification(157 /* Constructor */);
+                context.enableEmitNotification(241 /* ClassDeclaration */);
+                context.enableEmitNotification(157 /* MethodDeclaration */);
+                context.enableEmitNotification(159 /* GetAccessor */);
+                context.enableEmitNotification(160 /* SetAccessor */);
+                context.enableEmitNotification(158 /* Constructor */);
                 // We need to be notified when entering the generated accessor arrow functions.
-                context.enableEmitNotification(219 /* VariableStatement */);
+                context.enableEmitNotification(220 /* VariableStatement */);
             }
         }
         /**
@@ -71185,23 +73572,23 @@ var ts;
         }
         function substituteExpression(node) {
             switch (node.kind) {
-                case 189 /* PropertyAccessExpression */:
+                case 190 /* PropertyAccessExpression */:
                     return substitutePropertyAccessExpression(node);
-                case 190 /* ElementAccessExpression */:
+                case 191 /* ElementAccessExpression */:
                     return substituteElementAccessExpression(node);
-                case 191 /* CallExpression */:
+                case 192 /* CallExpression */:
                     return substituteCallExpression(node);
             }
             return node;
         }
         function substitutePropertyAccessExpression(node) {
-            if (node.expression.kind === 98 /* SuperKeyword */) {
+            if (node.expression.kind === 99 /* SuperKeyword */) {
                 return ts.setTextRange(ts.createPropertyAccess(ts.createFileLevelUniqueName("_super"), node.name), node);
             }
             return node;
         }
         function substituteElementAccessExpression(node) {
-            if (node.expression.kind === 98 /* SuperKeyword */) {
+            if (node.expression.kind === 99 /* SuperKeyword */) {
                 return createSuperElementAccessInAsyncMethod(node.argumentExpression, node);
             }
             return node;
@@ -71221,11 +73608,11 @@ var ts;
         }
         function isSuperContainer(node) {
             var kind = node.kind;
-            return kind === 240 /* ClassDeclaration */
-                || kind === 157 /* Constructor */
-                || kind === 156 /* MethodDeclaration */
-                || kind === 158 /* GetAccessor */
-                || kind === 159 /* SetAccessor */;
+            return kind === 241 /* ClassDeclaration */
+                || kind === 158 /* Constructor */
+                || kind === 157 /* MethodDeclaration */
+                || kind === 159 /* GetAccessor */
+                || kind === 160 /* SetAccessor */;
         }
         function createSuperElementAccessInAsyncMethod(argumentExpression, location) {
             if (enclosingSuperContainerFlags & 4096 /* AsyncMethodWithSuperBinding */) {
@@ -71319,7 +73706,7 @@ var ts;
                 return node;
             }
             switch (node.kind) {
-                case 274 /* CatchClause */:
+                case 275 /* CatchClause */:
                     return visitCatchClause(node);
                 default:
                     return ts.visitEachChild(node, visitor, context);
@@ -71388,13 +73775,13 @@ var ts;
         }
         function visitorWorker(node) {
             switch (node.kind) {
-                case 260 /* JsxElement */:
+                case 261 /* JsxElement */:
                     return visitJsxElement(node, /*isChild*/ false);
-                case 261 /* JsxSelfClosingElement */:
+                case 262 /* JsxSelfClosingElement */:
                     return visitJsxSelfClosingElement(node, /*isChild*/ false);
-                case 264 /* JsxFragment */:
+                case 265 /* JsxFragment */:
                     return visitJsxFragment(node, /*isChild*/ false);
-                case 270 /* JsxExpression */:
+                case 271 /* JsxExpression */:
                     return visitJsxExpression(node);
                 default:
                     return ts.visitEachChild(node, visitor, context);
@@ -71404,13 +73791,13 @@ var ts;
             switch (node.kind) {
                 case 11 /* JsxText */:
                     return visitJsxText(node);
-                case 270 /* JsxExpression */:
+                case 271 /* JsxExpression */:
                     return visitJsxExpression(node);
-                case 260 /* JsxElement */:
+                case 261 /* JsxElement */:
                     return visitJsxElement(node, /*isChild*/ true);
-                case 261 /* JsxSelfClosingElement */:
+                case 262 /* JsxSelfClosingElement */:
                     return visitJsxSelfClosingElement(node, /*isChild*/ true);
-                case 264 /* JsxFragment */:
+                case 265 /* JsxFragment */:
                     return visitJsxFragment(node, /*isChild*/ true);
                 default:
                     return ts.Debug.failBadSyntaxKind(node);
@@ -71485,7 +73872,7 @@ var ts;
                 literal.singleQuote = node.singleQuote !== undefined ? node.singleQuote : !ts.isStringDoubleQuoted(node, currentSourceFile);
                 return ts.setTextRange(literal, node);
             }
-            else if (node.kind === 270 /* JsxExpression */) {
+            else if (node.kind === 271 /* JsxExpression */) {
                 if (node.expression === undefined) {
                     return ts.createTrue();
                 }
@@ -71496,7 +73883,7 @@ var ts;
             }
         }
         function visitJsxText(node) {
-            var fixed = fixupWhitespaceAndDecodeEntities(ts.getTextOfNode(node, /*includeTrivia*/ true));
+            var fixed = fixupWhitespaceAndDecodeEntities(node.text);
             return fixed === undefined ? undefined : ts.createLiteral(fixed);
         }
         /**
@@ -71579,7 +73966,7 @@ var ts;
             return decoded === text ? undefined : decoded;
         }
         function getTagName(node) {
-            if (node.kind === 260 /* JsxElement */) {
+            if (node.kind === 261 /* JsxElement */) {
                 return getTagName(node.openingElement);
             }
             else {
@@ -71885,7 +74272,7 @@ var ts;
                 return node;
             }
             switch (node.kind) {
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return visitBinaryExpression(node);
                 default:
                     return ts.visitEachChild(node, visitor, context);
@@ -71893,7 +74280,7 @@ var ts;
         }
         function visitBinaryExpression(node) {
             switch (node.operatorToken.kind) {
-                case 63 /* AsteriskAsteriskEqualsToken */:
+                case 64 /* AsteriskAsteriskEqualsToken */:
                     return visitExponentiationAssignmentExpression(node);
                 case 41 /* AsteriskAsteriskToken */:
                     return visitExponentiationExpression(node);
@@ -71978,62 +74365,63 @@ var ts;
         HierarchyFacts[HierarchyFacts["Block"] = 128] = "Block";
         HierarchyFacts[HierarchyFacts["IterationStatement"] = 256] = "IterationStatement";
         HierarchyFacts[HierarchyFacts["IterationStatementBlock"] = 512] = "IterationStatementBlock";
-        HierarchyFacts[HierarchyFacts["ForStatement"] = 1024] = "ForStatement";
-        HierarchyFacts[HierarchyFacts["ForInOrForOfStatement"] = 2048] = "ForInOrForOfStatement";
-        HierarchyFacts[HierarchyFacts["ConstructorWithCapturedSuper"] = 4096] = "ConstructorWithCapturedSuper";
+        HierarchyFacts[HierarchyFacts["IterationContainer"] = 1024] = "IterationContainer";
+        HierarchyFacts[HierarchyFacts["ForStatement"] = 2048] = "ForStatement";
+        HierarchyFacts[HierarchyFacts["ForInOrForOfStatement"] = 4096] = "ForInOrForOfStatement";
+        HierarchyFacts[HierarchyFacts["ConstructorWithCapturedSuper"] = 8192] = "ConstructorWithCapturedSuper";
         // NOTE: do not add more ancestor flags without also updating AncestorFactsMask below.
         // NOTE: when adding a new ancestor flag, be sure to update the subtree flags below.
         //
         // Ancestor masks
         //
-        HierarchyFacts[HierarchyFacts["AncestorFactsMask"] = 8191] = "AncestorFactsMask";
+        HierarchyFacts[HierarchyFacts["AncestorFactsMask"] = 16383] = "AncestorFactsMask";
         // We are always in *some* kind of block scope, but only specific block-scope containers are
         // top-level or Blocks.
         HierarchyFacts[HierarchyFacts["BlockScopeIncludes"] = 0] = "BlockScopeIncludes";
-        HierarchyFacts[HierarchyFacts["BlockScopeExcludes"] = 4032] = "BlockScopeExcludes";
+        HierarchyFacts[HierarchyFacts["BlockScopeExcludes"] = 7104] = "BlockScopeExcludes";
         // A source file is a top-level block scope.
         HierarchyFacts[HierarchyFacts["SourceFileIncludes"] = 64] = "SourceFileIncludes";
-        HierarchyFacts[HierarchyFacts["SourceFileExcludes"] = 3968] = "SourceFileExcludes";
+        HierarchyFacts[HierarchyFacts["SourceFileExcludes"] = 8064] = "SourceFileExcludes";
         // Functions, methods, and accessors are both new lexical scopes and new block scopes.
         HierarchyFacts[HierarchyFacts["FunctionIncludes"] = 65] = "FunctionIncludes";
-        HierarchyFacts[HierarchyFacts["FunctionExcludes"] = 8094] = "FunctionExcludes";
+        HierarchyFacts[HierarchyFacts["FunctionExcludes"] = 16286] = "FunctionExcludes";
         HierarchyFacts[HierarchyFacts["AsyncFunctionBodyIncludes"] = 69] = "AsyncFunctionBodyIncludes";
-        HierarchyFacts[HierarchyFacts["AsyncFunctionBodyExcludes"] = 8086] = "AsyncFunctionBodyExcludes";
+        HierarchyFacts[HierarchyFacts["AsyncFunctionBodyExcludes"] = 16278] = "AsyncFunctionBodyExcludes";
         // Arrow functions are lexically scoped to their container, but are new block scopes.
         HierarchyFacts[HierarchyFacts["ArrowFunctionIncludes"] = 66] = "ArrowFunctionIncludes";
-        HierarchyFacts[HierarchyFacts["ArrowFunctionExcludes"] = 8064] = "ArrowFunctionExcludes";
+        HierarchyFacts[HierarchyFacts["ArrowFunctionExcludes"] = 15232] = "ArrowFunctionExcludes";
         // Constructors are both new lexical scopes and new block scopes. Constructors are also
         // always considered non-static members of a class.
         HierarchyFacts[HierarchyFacts["ConstructorIncludes"] = 73] = "ConstructorIncludes";
-        HierarchyFacts[HierarchyFacts["ConstructorExcludes"] = 8086] = "ConstructorExcludes";
+        HierarchyFacts[HierarchyFacts["ConstructorExcludes"] = 16278] = "ConstructorExcludes";
         // 'do' and 'while' statements are not block scopes. We track that the subtree is contained
         // within an IterationStatement to indicate whether the embedded statement is an
         // IterationStatementBlock.
-        HierarchyFacts[HierarchyFacts["DoOrWhileStatementIncludes"] = 256] = "DoOrWhileStatementIncludes";
+        HierarchyFacts[HierarchyFacts["DoOrWhileStatementIncludes"] = 1280] = "DoOrWhileStatementIncludes";
         HierarchyFacts[HierarchyFacts["DoOrWhileStatementExcludes"] = 0] = "DoOrWhileStatementExcludes";
         // 'for' statements are new block scopes and have special handling for 'let' declarations.
-        HierarchyFacts[HierarchyFacts["ForStatementIncludes"] = 1280] = "ForStatementIncludes";
-        HierarchyFacts[HierarchyFacts["ForStatementExcludes"] = 3008] = "ForStatementExcludes";
+        HierarchyFacts[HierarchyFacts["ForStatementIncludes"] = 3328] = "ForStatementIncludes";
+        HierarchyFacts[HierarchyFacts["ForStatementExcludes"] = 5056] = "ForStatementExcludes";
         // 'for-in' and 'for-of' statements are new block scopes and have special handling for
         // 'let' declarations.
-        HierarchyFacts[HierarchyFacts["ForInOrForOfStatementIncludes"] = 2304] = "ForInOrForOfStatementIncludes";
-        HierarchyFacts[HierarchyFacts["ForInOrForOfStatementExcludes"] = 1984] = "ForInOrForOfStatementExcludes";
+        HierarchyFacts[HierarchyFacts["ForInOrForOfStatementIncludes"] = 5376] = "ForInOrForOfStatementIncludes";
+        HierarchyFacts[HierarchyFacts["ForInOrForOfStatementExcludes"] = 3008] = "ForInOrForOfStatementExcludes";
         // Blocks (other than function bodies) are new block scopes.
         HierarchyFacts[HierarchyFacts["BlockIncludes"] = 128] = "BlockIncludes";
-        HierarchyFacts[HierarchyFacts["BlockExcludes"] = 3904] = "BlockExcludes";
+        HierarchyFacts[HierarchyFacts["BlockExcludes"] = 6976] = "BlockExcludes";
         HierarchyFacts[HierarchyFacts["IterationStatementBlockIncludes"] = 512] = "IterationStatementBlockIncludes";
-        HierarchyFacts[HierarchyFacts["IterationStatementBlockExcludes"] = 4032] = "IterationStatementBlockExcludes";
+        HierarchyFacts[HierarchyFacts["IterationStatementBlockExcludes"] = 7104] = "IterationStatementBlockExcludes";
         //
         // Subtree facts
         //
-        HierarchyFacts[HierarchyFacts["NewTarget"] = 8192] = "NewTarget";
-        HierarchyFacts[HierarchyFacts["CapturedLexicalThis"] = 16384] = "CapturedLexicalThis";
+        HierarchyFacts[HierarchyFacts["NewTarget"] = 16384] = "NewTarget";
+        HierarchyFacts[HierarchyFacts["CapturedLexicalThis"] = 32768] = "CapturedLexicalThis";
         //
         // Subtree masks
         //
-        HierarchyFacts[HierarchyFacts["SubtreeFactsMask"] = -8192] = "SubtreeFactsMask";
+        HierarchyFacts[HierarchyFacts["SubtreeFactsMask"] = -16384] = "SubtreeFactsMask";
         HierarchyFacts[HierarchyFacts["ArrowFunctionSubtreeExcludes"] = 0] = "ArrowFunctionSubtreeExcludes";
-        HierarchyFacts[HierarchyFacts["FunctionSubtreeExcludes"] = 24576] = "FunctionSubtreeExcludes";
+        HierarchyFacts[HierarchyFacts["FunctionSubtreeExcludes"] = 49152] = "FunctionSubtreeExcludes";
     })(HierarchyFacts || (HierarchyFacts = {}));
     function transformES2015(context) {
         var startLexicalEnvironment = context.startLexicalEnvironment, resumeLexicalEnvironment = context.resumeLexicalEnvironment, endLexicalEnvironment = context.endLexicalEnvironment, hoistVariableDeclaration = context.hoistVariableDeclaration;
@@ -72082,7 +74470,7 @@ var ts;
          */
         function enterSubtree(excludeFacts, includeFacts) {
             var ancestorFacts = hierarchyFacts;
-            hierarchyFacts = (hierarchyFacts & ~excludeFacts | includeFacts) & 8191 /* AncestorFactsMask */;
+            hierarchyFacts = (hierarchyFacts & ~excludeFacts | includeFacts) & 16383 /* AncestorFactsMask */;
             return ancestorFacts;
         }
         /**
@@ -72093,17 +74481,17 @@ var ts;
          * @param includeFacts The new `HierarchyFacts` of the subtree that should be propagated.
          */
         function exitSubtree(ancestorFacts, excludeFacts, includeFacts) {
-            hierarchyFacts = (hierarchyFacts & ~excludeFacts | includeFacts) & -8192 /* SubtreeFactsMask */ | ancestorFacts;
+            hierarchyFacts = (hierarchyFacts & ~excludeFacts | includeFacts) & -16384 /* SubtreeFactsMask */ | ancestorFacts;
         }
         function isReturnVoidStatementInConstructorWithCapturedSuper(node) {
-            return (hierarchyFacts & 4096 /* ConstructorWithCapturedSuper */) !== 0
-                && node.kind === 230 /* ReturnStatement */
+            return (hierarchyFacts & 8192 /* ConstructorWithCapturedSuper */) !== 0
+                && node.kind === 231 /* ReturnStatement */
                 && !node.expression;
         }
         function shouldVisitNode(node) {
             return (node.transformFlags & 128 /* ContainsES2015 */) !== 0
                 || convertedLoopState !== undefined
-                || (hierarchyFacts & 4096 /* ConstructorWithCapturedSuper */ && (ts.isStatement(node) || (node.kind === 218 /* Block */)))
+                || (hierarchyFacts & 8192 /* ConstructorWithCapturedSuper */ && (ts.isStatement(node) || (node.kind === 219 /* Block */)))
                 || (ts.isIterationStatement(node, /*lookInLabeledStatements*/ false) && shouldConvertIterationStatement(node))
                 || (ts.getEmitFlags(node) & 33554432 /* TypeScriptClassWrapper */) !== 0;
         }
@@ -72116,72 +74504,72 @@ var ts;
             }
         }
         function callExpressionVisitor(node) {
-            if (node.kind === 98 /* SuperKeyword */) {
+            if (node.kind === 99 /* SuperKeyword */) {
                 return visitSuperKeyword(/*isExpressionOfCall*/ true);
             }
             return visitor(node);
         }
         function visitJavaScript(node) {
             switch (node.kind) {
-                case 116 /* StaticKeyword */:
+                case 117 /* StaticKeyword */:
                     return undefined; // elide static keyword
-                case 240 /* ClassDeclaration */:
+                case 241 /* ClassDeclaration */:
                     return visitClassDeclaration(node);
-                case 209 /* ClassExpression */:
+                case 210 /* ClassExpression */:
                     return visitClassExpression(node);
-                case 151 /* Parameter */:
+                case 152 /* Parameter */:
                     return visitParameter(node);
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     return visitFunctionDeclaration(node);
-                case 197 /* ArrowFunction */:
+                case 198 /* ArrowFunction */:
                     return visitArrowFunction(node);
-                case 196 /* FunctionExpression */:
+                case 197 /* FunctionExpression */:
                     return visitFunctionExpression(node);
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     return visitVariableDeclaration(node);
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return visitIdentifier(node);
-                case 238 /* VariableDeclarationList */:
+                case 239 /* VariableDeclarationList */:
                     return visitVariableDeclarationList(node);
-                case 232 /* SwitchStatement */:
+                case 233 /* SwitchStatement */:
                     return visitSwitchStatement(node);
-                case 246 /* CaseBlock */:
+                case 247 /* CaseBlock */:
                     return visitCaseBlock(node);
-                case 218 /* Block */:
+                case 219 /* Block */:
                     return visitBlock(node, /*isFunctionBody*/ false);
-                case 229 /* BreakStatement */:
-                case 228 /* ContinueStatement */:
+                case 230 /* BreakStatement */:
+                case 229 /* ContinueStatement */:
                     return visitBreakOrContinueStatement(node);
-                case 233 /* LabeledStatement */:
+                case 234 /* LabeledStatement */:
                     return visitLabeledStatement(node);
-                case 223 /* DoStatement */:
-                case 224 /* WhileStatement */:
+                case 224 /* DoStatement */:
+                case 225 /* WhileStatement */:
                     return visitDoOrWhileStatement(node, /*outermostLabeledStatement*/ undefined);
-                case 225 /* ForStatement */:
+                case 226 /* ForStatement */:
                     return visitForStatement(node, /*outermostLabeledStatement*/ undefined);
-                case 226 /* ForInStatement */:
+                case 227 /* ForInStatement */:
                     return visitForInStatement(node, /*outermostLabeledStatement*/ undefined);
-                case 227 /* ForOfStatement */:
+                case 228 /* ForOfStatement */:
                     return visitForOfStatement(node, /*outermostLabeledStatement*/ undefined);
-                case 221 /* ExpressionStatement */:
+                case 222 /* ExpressionStatement */:
                     return visitExpressionStatement(node);
-                case 188 /* ObjectLiteralExpression */:
+                case 189 /* ObjectLiteralExpression */:
                     return visitObjectLiteralExpression(node);
-                case 274 /* CatchClause */:
+                case 275 /* CatchClause */:
                     return visitCatchClause(node);
-                case 276 /* ShorthandPropertyAssignment */:
+                case 277 /* ShorthandPropertyAssignment */:
                     return visitShorthandPropertyAssignment(node);
-                case 149 /* ComputedPropertyName */:
+                case 150 /* ComputedPropertyName */:
                     return visitComputedPropertyName(node);
-                case 187 /* ArrayLiteralExpression */:
+                case 188 /* ArrayLiteralExpression */:
                     return visitArrayLiteralExpression(node);
-                case 191 /* CallExpression */:
+                case 192 /* CallExpression */:
                     return visitCallExpression(node);
-                case 192 /* NewExpression */:
+                case 193 /* NewExpression */:
                     return visitNewExpression(node);
-                case 195 /* ParenthesizedExpression */:
+                case 196 /* ParenthesizedExpression */:
                     return visitParenthesizedExpression(node, /*needsDestructuringValue*/ true);
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return visitBinaryExpression(node, /*needsDestructuringValue*/ true);
                 case 14 /* NoSubstitutionTemplateLiteral */:
                 case 15 /* TemplateHead */:
@@ -72192,35 +74580,35 @@ var ts;
                     return visitStringLiteral(node);
                 case 8 /* NumericLiteral */:
                     return visitNumericLiteral(node);
-                case 193 /* TaggedTemplateExpression */:
+                case 194 /* TaggedTemplateExpression */:
                     return visitTaggedTemplateExpression(node);
-                case 206 /* TemplateExpression */:
+                case 207 /* TemplateExpression */:
                     return visitTemplateExpression(node);
-                case 207 /* YieldExpression */:
+                case 208 /* YieldExpression */:
                     return visitYieldExpression(node);
-                case 208 /* SpreadElement */:
+                case 209 /* SpreadElement */:
                     return visitSpreadElement(node);
-                case 98 /* SuperKeyword */:
+                case 99 /* SuperKeyword */:
                     return visitSuperKeyword(/*isExpressionOfCall*/ false);
-                case 100 /* ThisKeyword */:
+                case 101 /* ThisKeyword */:
                     return visitThisKeyword(node);
-                case 214 /* MetaProperty */:
+                case 215 /* MetaProperty */:
                     return visitMetaProperty(node);
-                case 156 /* MethodDeclaration */:
+                case 157 /* MethodDeclaration */:
                     return visitMethodDeclaration(node);
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     return visitAccessorDeclaration(node);
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     return visitVariableStatement(node);
-                case 230 /* ReturnStatement */:
+                case 231 /* ReturnStatement */:
                     return visitReturnStatement(node);
                 default:
                     return ts.visitEachChild(node, visitor, context);
             }
         }
         function visitSourceFile(node) {
-            var ancestorFacts = enterSubtree(3968 /* SourceFileExcludes */, 64 /* SourceFileIncludes */);
+            var ancestorFacts = enterSubtree(8064 /* SourceFileExcludes */, 64 /* SourceFileIncludes */);
             var prologue = [];
             var statements = [];
             startLexicalEnvironment();
@@ -72247,7 +74635,7 @@ var ts;
             return ts.visitEachChild(node, visitor, context);
         }
         function visitCaseBlock(node) {
-            var ancestorFacts = enterSubtree(4032 /* BlockScopeExcludes */, 0 /* BlockScopeIncludes */);
+            var ancestorFacts = enterSubtree(7104 /* BlockScopeExcludes */, 0 /* BlockScopeIncludes */);
             var updated = ts.visitEachChild(node, visitor, context);
             exitSubtree(ancestorFacts, 0 /* None */, 0 /* None */);
             return updated;
@@ -72274,7 +74662,7 @@ var ts;
         }
         function visitThisKeyword(node) {
             if (hierarchyFacts & 2 /* ArrowFunction */) {
-                hierarchyFacts |= 16384 /* CapturedLexicalThis */;
+                hierarchyFacts |= 32768 /* CapturedLexicalThis */;
             }
             if (convertedLoopState) {
                 if (hierarchyFacts & 2 /* ArrowFunction */) {
@@ -72304,14 +74692,14 @@ var ts;
                 // it is possible if either
                 //   - break/continue is labeled and label is located inside the converted loop
                 //   - break/continue is non-labeled and located in non-converted loop/switch statement
-                var jump = node.kind === 229 /* BreakStatement */ ? 2 /* Break */ : 4 /* Continue */;
+                var jump = node.kind === 230 /* BreakStatement */ ? 2 /* Break */ : 4 /* Continue */;
                 var canUseBreakOrContinue = (node.label && convertedLoopState.labels && convertedLoopState.labels.get(ts.idText(node.label))) ||
                     (!node.label && (convertedLoopState.allowedNonLabeledJumps & jump));
                 if (!canUseBreakOrContinue) {
                     var labelMarker = void 0;
                     var label = node.label;
                     if (!label) {
-                        if (node.kind === 229 /* BreakStatement */) {
+                        if (node.kind === 230 /* BreakStatement */) {
                             convertedLoopState.nonLocalJumps |= 2 /* Break */;
                             labelMarker = "break";
                         }
@@ -72322,7 +74710,7 @@ var ts;
                         }
                     }
                     else {
-                        if (node.kind === 229 /* BreakStatement */) {
+                        if (node.kind === 230 /* BreakStatement */) {
                             labelMarker = "break-" + label.escapedText;
                             setLabeledJump(convertedLoopState, /*isBreak*/ true, ts.idText(label), labelMarker);
                         }
@@ -72517,7 +74905,7 @@ var ts;
         function addConstructor(statements, node, extendsClauseElement) {
             var savedConvertedLoopState = convertedLoopState;
             convertedLoopState = undefined;
-            var ancestorFacts = enterSubtree(8086 /* ConstructorExcludes */, 73 /* ConstructorIncludes */);
+            var ancestorFacts = enterSubtree(16278 /* ConstructorExcludes */, 73 /* ConstructorIncludes */);
             var constructor = ts.getFirstConstructorWithBody(node);
             var hasSynthesizedSuper = hasSynthesizedDefaultSuperCall(constructor, extendsClauseElement !== undefined);
             var constructorFunction = ts.createFunctionDeclaration(
@@ -72531,7 +74919,7 @@ var ts;
                 ts.setEmitFlags(constructorFunction, 8 /* CapturesThis */);
             }
             statements.push(constructorFunction);
-            exitSubtree(ancestorFacts, 24576 /* FunctionSubtreeExcludes */, 0 /* None */);
+            exitSubtree(ancestorFacts, 49152 /* FunctionSubtreeExcludes */, 0 /* None */);
             convertedLoopState = savedConvertedLoopState;
         }
         /**
@@ -72580,7 +74968,7 @@ var ts;
         function transformConstructorBody(constructor, node, extendsClauseElement, hasSynthesizedSuper) {
             // determine whether the class is known syntactically to be a derived class (e.g. a
             // class that extends a value that is not syntactically known to be `null`).
-            var isDerivedClass = !!extendsClauseElement && ts.skipOuterExpressions(extendsClauseElement.expression).kind !== 96 /* NullKeyword */;
+            var isDerivedClass = !!extendsClauseElement && ts.skipOuterExpressions(extendsClauseElement.expression).kind !== 97 /* NullKeyword */;
             // When the subclass does not have a constructor, we synthesize a *default* constructor using the following
             // representation:
             //
@@ -72624,7 +75012,7 @@ var ts;
                 }
             }
             if (superCallExpression) {
-                hierarchyFacts |= 4096 /* ConstructorWithCapturedSuper */;
+                hierarchyFacts |= 8192 /* ConstructorWithCapturedSuper */;
                 statementOffset++; // skip this statement, we will add it after visiting the rest of the body.
             }
             // visit the remaining statements
@@ -72718,11 +75106,11 @@ var ts;
          */
         function isSufficientlyCoveredByReturnStatements(statement) {
             // A return statement is considered covered.
-            if (statement.kind === 230 /* ReturnStatement */) {
+            if (statement.kind === 231 /* ReturnStatement */) {
                 return true;
             }
             // An if-statement with two covered branches is covered.
-            else if (statement.kind === 222 /* IfStatement */) {
+            else if (statement.kind === 223 /* IfStatement */) {
                 var ifStatement = statement;
                 if (ifStatement.elseStatement) {
                     return isSufficientlyCoveredByReturnStatements(ifStatement.thenStatement) &&
@@ -72730,7 +75118,7 @@ var ts;
                 }
             }
             // A block is covered if it has a last statement which is covered.
-            else if (statement.kind === 218 /* Block */) {
+            else if (statement.kind === 219 /* Block */) {
                 var lastStatement = ts.lastOrUndefined(statement.statements);
                 if (lastStatement && isSufficientlyCoveredByReturnStatements(lastStatement)) {
                     return true;
@@ -72885,10 +75273,10 @@ var ts;
                 return false;
             }
             // `declarationName` is the name of the local declaration for the parameter.
-            var declarationName = parameter.name.kind === 72 /* Identifier */ ? ts.getMutableClone(parameter.name) : ts.createTempVariable(/*recordTempVariable*/ undefined);
+            var declarationName = parameter.name.kind === 73 /* Identifier */ ? ts.getMutableClone(parameter.name) : ts.createTempVariable(/*recordTempVariable*/ undefined);
             ts.setEmitFlags(declarationName, 48 /* NoSourceMap */);
             // `expressionName` is the name of the parameter used in expressions.
-            var expressionName = parameter.name.kind === 72 /* Identifier */ ? ts.getSynthesizedClone(parameter.name) : declarationName;
+            var expressionName = parameter.name.kind === 73 /* Identifier */ ? ts.getSynthesizedClone(parameter.name) : declarationName;
             var restIndex = node.parameters.length - 1;
             var temp = ts.createLoopVariable();
             // var param = [];
@@ -72912,7 +75300,7 @@ var ts;
             ts.setEmitFlags(forStatement, 1048576 /* CustomPrologue */);
             ts.startOnNewLine(forStatement);
             prologueStatements.push(forStatement);
-            if (parameter.name.kind !== 72 /* Identifier */) {
+            if (parameter.name.kind !== 73 /* Identifier */) {
                 // do the actual destructuring of the rest parameter if necessary
                 prologueStatements.push(ts.setEmitFlags(ts.setTextRange(ts.createVariableStatement(
                 /*modifiers*/ undefined, ts.createVariableDeclarationList(ts.flattenDestructuringBinding(parameter, visitor, context, 0 /* All */, expressionName))), parameter), 1048576 /* CustomPrologue */));
@@ -72928,7 +75316,7 @@ var ts;
          * @param node A node.
          */
         function insertCaptureThisForNodeIfNeeded(statements, node) {
-            if (hierarchyFacts & 16384 /* CapturedLexicalThis */ && node.kind !== 197 /* ArrowFunction */) {
+            if (hierarchyFacts & 32768 /* CapturedLexicalThis */ && node.kind !== 198 /* ArrowFunction */) {
                 insertCaptureThisForNode(statements, node, ts.createThis());
                 return true;
             }
@@ -72946,28 +75334,28 @@ var ts;
             ts.insertStatementAfterCustomPrologue(statements, captureThisStatement);
         }
         function insertCaptureNewTargetIfNeeded(statements, node, copyOnWrite) {
-            if (hierarchyFacts & 8192 /* NewTarget */) {
+            if (hierarchyFacts & 16384 /* NewTarget */) {
                 var newTarget = void 0;
                 switch (node.kind) {
-                    case 197 /* ArrowFunction */:
+                    case 198 /* ArrowFunction */:
                         return statements;
-                    case 156 /* MethodDeclaration */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
+                    case 157 /* MethodDeclaration */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
                         // Methods and accessors cannot be constructors, so 'new.target' will
                         // always return 'undefined'.
                         newTarget = ts.createVoidZero();
                         break;
-                    case 157 /* Constructor */:
+                    case 158 /* Constructor */:
                         // Class constructors can only be called with `new`, so `this.constructor`
                         // should be relatively safe to use.
                         newTarget = ts.createPropertyAccess(ts.setEmitFlags(ts.createThis(), 4 /* NoSubstitution */), "constructor");
                         break;
-                    case 239 /* FunctionDeclaration */:
-                    case 196 /* FunctionExpression */:
+                    case 240 /* FunctionDeclaration */:
+                    case 197 /* FunctionExpression */:
                         // Functions can be called or constructed, and may have a `this` due to
                         // being a member or when calling an imported function via `other_1.f()`.
-                        newTarget = ts.createConditional(ts.createLogicalAnd(ts.setEmitFlags(ts.createThis(), 4 /* NoSubstitution */), ts.createBinary(ts.setEmitFlags(ts.createThis(), 4 /* NoSubstitution */), 94 /* InstanceOfKeyword */, ts.getLocalName(node))), ts.createPropertyAccess(ts.setEmitFlags(ts.createThis(), 4 /* NoSubstitution */), "constructor"), ts.createVoidZero());
+                        newTarget = ts.createConditional(ts.createLogicalAnd(ts.setEmitFlags(ts.createThis(), 4 /* NoSubstitution */), ts.createBinary(ts.setEmitFlags(ts.createThis(), 4 /* NoSubstitution */), 95 /* InstanceOfKeyword */, ts.getLocalName(node))), ts.createPropertyAccess(ts.setEmitFlags(ts.createThis(), 4 /* NoSubstitution */), "constructor"), ts.createVoidZero());
                         break;
                     default:
                         return ts.Debug.failBadSyntaxKind(node);
@@ -72996,24 +75384,24 @@ var ts;
             for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                 var member = _a[_i];
                 switch (member.kind) {
-                    case 217 /* SemicolonClassElement */:
+                    case 218 /* SemicolonClassElement */:
                         statements.push(transformSemicolonClassElementToStatement(member));
                         break;
-                    case 156 /* MethodDeclaration */:
+                    case 157 /* MethodDeclaration */:
                         statements.push(transformClassMethodDeclarationToStatement(getClassMemberPrefix(node, member), member, node));
                         break;
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
                         var accessors = ts.getAllAccessorDeclarations(node.members, member);
                         if (member === accessors.firstAccessor) {
                             statements.push(transformAccessorsToStatement(getClassMemberPrefix(node, member), accessors, node));
                         }
                         break;
-                    case 157 /* Constructor */:
+                    case 158 /* Constructor */:
                         // Constructors are handled in visitClassExpression/visitClassDeclaration
                         break;
                     default:
-                        ts.Debug.failBadSyntaxKind(node);
+                        ts.Debug.failBadSyntaxKind(member, currentSourceFile && currentSourceFile.fileName);
                         break;
                 }
             }
@@ -73076,7 +75464,7 @@ var ts;
             // arguments are both mapped contiguously to the accessor name.
             var target = ts.getMutableClone(receiver);
             ts.setEmitFlags(target, 1536 /* NoComments */ | 32 /* NoTrailingSourceMap */);
-            ts.setSourceMapRange(target, firstAccessor.name); // TODO: GH#18217
+            ts.setSourceMapRange(target, firstAccessor.name);
             var propertyName = ts.createExpressionForPropertyName(ts.visitNode(firstAccessor.name, visitor, ts.isPropertyName));
             ts.setEmitFlags(propertyName, 1536 /* NoComments */ | 16 /* NoLeadingSourceMap */);
             ts.setSourceMapRange(propertyName, firstAccessor.name);
@@ -73116,11 +75504,11 @@ var ts;
          */
         function visitArrowFunction(node) {
             if (node.transformFlags & 2048 /* ContainsLexicalThis */) {
-                hierarchyFacts |= 16384 /* CapturedLexicalThis */;
+                hierarchyFacts |= 32768 /* CapturedLexicalThis */;
             }
             var savedConvertedLoopState = convertedLoopState;
             convertedLoopState = undefined;
-            var ancestorFacts = enterSubtree(8064 /* ArrowFunctionExcludes */, 66 /* ArrowFunctionIncludes */);
+            var ancestorFacts = enterSubtree(15232 /* ArrowFunctionExcludes */, 66 /* ArrowFunctionIncludes */);
             var func = ts.createFunctionExpression(
             /*modifiers*/ undefined, 
             /*asteriskToken*/ undefined, 
@@ -73130,7 +75518,7 @@ var ts;
             ts.setTextRange(func, node);
             ts.setOriginalNode(func, node);
             ts.setEmitFlags(func, 8 /* CapturesThis */);
-            if (hierarchyFacts & 16384 /* CapturedLexicalThis */) {
+            if (hierarchyFacts & 32768 /* CapturedLexicalThis */) {
                 enableSubstitutionsForCapturedThis();
             }
             // If an arrow function contains
@@ -73145,16 +75533,16 @@ var ts;
          */
         function visitFunctionExpression(node) {
             var ancestorFacts = ts.getEmitFlags(node) & 262144 /* AsyncFunctionBody */
-                ? enterSubtree(8086 /* AsyncFunctionBodyExcludes */, 69 /* AsyncFunctionBodyIncludes */)
-                : enterSubtree(8094 /* FunctionExcludes */, 65 /* FunctionIncludes */);
+                ? enterSubtree(16278 /* AsyncFunctionBodyExcludes */, 69 /* AsyncFunctionBodyIncludes */)
+                : enterSubtree(16286 /* FunctionExcludes */, 65 /* FunctionIncludes */);
             var savedConvertedLoopState = convertedLoopState;
             convertedLoopState = undefined;
             var parameters = ts.visitParameterList(node.parameters, visitor, context);
             var body = transformFunctionBody(node);
-            var name = hierarchyFacts & 8192 /* NewTarget */
+            var name = hierarchyFacts & 16384 /* NewTarget */
                 ? ts.getLocalName(node)
                 : node.name;
-            exitSubtree(ancestorFacts, 24576 /* FunctionSubtreeExcludes */, 0 /* None */);
+            exitSubtree(ancestorFacts, 49152 /* FunctionSubtreeExcludes */, 0 /* None */);
             convertedLoopState = savedConvertedLoopState;
             return ts.updateFunctionExpression(node, 
             /*modifiers*/ undefined, node.asteriskToken, name, 
@@ -73169,13 +75557,13 @@ var ts;
         function visitFunctionDeclaration(node) {
             var savedConvertedLoopState = convertedLoopState;
             convertedLoopState = undefined;
-            var ancestorFacts = enterSubtree(8094 /* FunctionExcludes */, 65 /* FunctionIncludes */);
+            var ancestorFacts = enterSubtree(16286 /* FunctionExcludes */, 65 /* FunctionIncludes */);
             var parameters = ts.visitParameterList(node.parameters, visitor, context);
             var body = transformFunctionBody(node);
-            var name = hierarchyFacts & 8192 /* NewTarget */
+            var name = hierarchyFacts & 16384 /* NewTarget */
                 ? ts.getLocalName(node)
                 : node.name;
-            exitSubtree(ancestorFacts, 24576 /* FunctionSubtreeExcludes */, 0 /* None */);
+            exitSubtree(ancestorFacts, 49152 /* FunctionSubtreeExcludes */, 0 /* None */);
             convertedLoopState = savedConvertedLoopState;
             return ts.updateFunctionDeclaration(node, 
             /*decorators*/ undefined, ts.visitNodes(node.modifiers, visitor, ts.isModifier), node.asteriskToken, name, 
@@ -73193,14 +75581,14 @@ var ts;
             var savedConvertedLoopState = convertedLoopState;
             convertedLoopState = undefined;
             var ancestorFacts = container && ts.isClassLike(container) && !ts.hasModifier(node, 32 /* Static */)
-                ? enterSubtree(8094 /* FunctionExcludes */, 65 /* FunctionIncludes */ | 8 /* NonStaticClassElement */)
-                : enterSubtree(8094 /* FunctionExcludes */, 65 /* FunctionIncludes */);
+                ? enterSubtree(16286 /* FunctionExcludes */, 65 /* FunctionIncludes */ | 8 /* NonStaticClassElement */)
+                : enterSubtree(16286 /* FunctionExcludes */, 65 /* FunctionIncludes */);
             var parameters = ts.visitParameterList(node.parameters, visitor, context);
             var body = transformFunctionBody(node);
-            if (hierarchyFacts & 8192 /* NewTarget */ && !name && (node.kind === 239 /* FunctionDeclaration */ || node.kind === 196 /* FunctionExpression */)) {
+            if (hierarchyFacts & 16384 /* NewTarget */ && !name && (node.kind === 240 /* FunctionDeclaration */ || node.kind === 197 /* FunctionExpression */)) {
                 name = ts.getGeneratedNameForNode(node);
             }
-            exitSubtree(ancestorFacts, 24576 /* FunctionSubtreeExcludes */, 0 /* None */);
+            exitSubtree(ancestorFacts, 49152 /* FunctionSubtreeExcludes */, 0 /* None */);
             convertedLoopState = savedConvertedLoopState;
             return ts.setOriginalNode(ts.setTextRange(ts.createFunctionExpression(
             /*modifiers*/ undefined, node.asteriskToken, name, 
@@ -73241,7 +75629,7 @@ var ts;
                 }
             }
             else {
-                ts.Debug.assert(node.kind === 197 /* ArrowFunction */);
+                ts.Debug.assert(node.kind === 198 /* ArrowFunction */);
                 // To align with the old emitter, we use a synthetic end position on the location
                 // for the statement list we synthesize when we down-level an arrow function with
                 // an expression function body. This prevents both comments and source maps from
@@ -73295,8 +75683,8 @@ var ts;
                 return ts.visitEachChild(node, visitor, context);
             }
             var ancestorFacts = hierarchyFacts & 256 /* IterationStatement */
-                ? enterSubtree(4032 /* IterationStatementBlockExcludes */, 512 /* IterationStatementBlockIncludes */)
-                : enterSubtree(3904 /* BlockExcludes */, 128 /* BlockIncludes */);
+                ? enterSubtree(7104 /* IterationStatementBlockExcludes */, 512 /* IterationStatementBlockIncludes */)
+                : enterSubtree(6976 /* BlockExcludes */, 128 /* BlockIncludes */);
             var updated = ts.visitEachChild(node, visitor, context);
             exitSubtree(ancestorFacts, 0 /* None */, 0 /* None */);
             return updated;
@@ -73309,9 +75697,9 @@ var ts;
         function visitExpressionStatement(node) {
             // If we are here it is most likely because our expression is a destructuring assignment.
             switch (node.expression.kind) {
-                case 195 /* ParenthesizedExpression */:
+                case 196 /* ParenthesizedExpression */:
                     return ts.updateExpressionStatement(node, visitParenthesizedExpression(node.expression, /*needsDestructuringValue*/ false));
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return ts.updateExpressionStatement(node, visitBinaryExpression(node.expression, /*needsDestructuringValue*/ false));
             }
             return ts.visitEachChild(node, visitor, context);
@@ -73330,9 +75718,9 @@ var ts;
                 // expression. If we are in a state where we do not need the destructuring value,
                 // we pass that information along to the children that care about it.
                 switch (node.expression.kind) {
-                    case 195 /* ParenthesizedExpression */:
+                    case 196 /* ParenthesizedExpression */:
                         return ts.updateParen(node, visitParenthesizedExpression(node.expression, /*needsDestructuringValue*/ false));
-                    case 204 /* BinaryExpression */:
+                    case 205 /* BinaryExpression */:
                         return ts.updateParen(node, visitBinaryExpression(node.expression, /*needsDestructuringValue*/ false));
                 }
             }
@@ -73367,7 +75755,7 @@ var ts;
                             assignment = ts.flattenDestructuringAssignment(decl, visitor, context, 0 /* All */);
                         }
                         else {
-                            assignment = ts.createBinary(decl.name, 59 /* EqualsToken */, ts.visitNode(decl.initializer, visitor, ts.isExpression));
+                            assignment = ts.createBinary(decl.name, 60 /* EqualsToken */, ts.visitNode(decl.initializer, visitor, ts.isExpression));
                             ts.setTextRange(assignment, decl);
                         }
                         assignments = ts.append(assignments, assignment);
@@ -73479,11 +75867,11 @@ var ts;
                     && isDeclaredInLoop
                     && (hierarchyFacts & 512 /* IterationStatementBlock */) !== 0);
             var emitExplicitInitializer = !emittedAsTopLevel
-                && (hierarchyFacts & 2048 /* ForInOrForOfStatement */) === 0
+                && (hierarchyFacts & 4096 /* ForInOrForOfStatement */) === 0
                 && (!resolver.isDeclarationWithCollidingName(node)
                     || (isDeclaredInLoop
                         && !isCapturedInFunction
-                        && (hierarchyFacts & (1024 /* ForStatement */ | 2048 /* ForInOrForOfStatement */)) === 0));
+                        && (hierarchyFacts & (2048 /* ForStatement */ | 4096 /* ForInOrForOfStatement */)) === 0));
             return emitExplicitInitializer;
         }
         /**
@@ -73500,9 +75888,9 @@ var ts;
                 return visitVariableDeclaration(node);
             }
             if (!node.initializer && shouldEmitExplicitInitializerForLetDeclaration(node)) {
-                var clone_2 = ts.getMutableClone(node);
-                clone_2.initializer = ts.createVoidZero();
-                return clone_2;
+                var clone_3 = ts.getMutableClone(node);
+                clone_3.initializer = ts.createVoidZero();
+                return clone_3;
             }
             return ts.visitEachChild(node, visitor, context);
         }
@@ -73541,34 +75929,34 @@ var ts;
         }
         function visitIterationStatement(node, outermostLabeledStatement) {
             switch (node.kind) {
-                case 223 /* DoStatement */:
-                case 224 /* WhileStatement */:
+                case 224 /* DoStatement */:
+                case 225 /* WhileStatement */:
                     return visitDoOrWhileStatement(node, outermostLabeledStatement);
-                case 225 /* ForStatement */:
+                case 226 /* ForStatement */:
                     return visitForStatement(node, outermostLabeledStatement);
-                case 226 /* ForInStatement */:
+                case 227 /* ForInStatement */:
                     return visitForInStatement(node, outermostLabeledStatement);
-                case 227 /* ForOfStatement */:
+                case 228 /* ForOfStatement */:
                     return visitForOfStatement(node, outermostLabeledStatement);
             }
         }
         function visitIterationStatementWithFacts(excludeFacts, includeFacts, node, outermostLabeledStatement, convert) {
             var ancestorFacts = enterSubtree(excludeFacts, includeFacts);
-            var updated = convertIterationStatementBodyIfNecessary(node, outermostLabeledStatement, convert);
+            var updated = convertIterationStatementBodyIfNecessary(node, outermostLabeledStatement, ancestorFacts, convert);
             exitSubtree(ancestorFacts, 0 /* None */, 0 /* None */);
             return updated;
         }
         function visitDoOrWhileStatement(node, outermostLabeledStatement) {
-            return visitIterationStatementWithFacts(0 /* DoOrWhileStatementExcludes */, 256 /* DoOrWhileStatementIncludes */, node, outermostLabeledStatement);
+            return visitIterationStatementWithFacts(0 /* DoOrWhileStatementExcludes */, 1280 /* DoOrWhileStatementIncludes */, node, outermostLabeledStatement);
         }
         function visitForStatement(node, outermostLabeledStatement) {
-            return visitIterationStatementWithFacts(3008 /* ForStatementExcludes */, 1280 /* ForStatementIncludes */, node, outermostLabeledStatement);
+            return visitIterationStatementWithFacts(5056 /* ForStatementExcludes */, 3328 /* ForStatementIncludes */, node, outermostLabeledStatement);
         }
         function visitForInStatement(node, outermostLabeledStatement) {
-            return visitIterationStatementWithFacts(1984 /* ForInOrForOfStatementExcludes */, 2304 /* ForInOrForOfStatementIncludes */, node, outermostLabeledStatement);
+            return visitIterationStatementWithFacts(3008 /* ForInOrForOfStatementExcludes */, 5376 /* ForInOrForOfStatementIncludes */, node, outermostLabeledStatement);
         }
         function visitForOfStatement(node, outermostLabeledStatement) {
-            return visitIterationStatementWithFacts(1984 /* ForInOrForOfStatementExcludes */, 2304 /* ForInOrForOfStatementIncludes */, node, outermostLabeledStatement, compilerOptions.downlevelIteration ? convertForOfStatementForIterable : convertForOfStatementForArray);
+            return visitIterationStatementWithFacts(3008 /* ForInOrForOfStatementExcludes */, 5376 /* ForInOrForOfStatementIncludes */, node, outermostLabeledStatement, compilerOptions.downlevelIteration ? convertForOfStatementForIterable : convertForOfStatementForArray);
         }
         function convertForOfStatementHead(node, boundValue, convertedLoopBodyStatements) {
             var statements = [];
@@ -73676,7 +76064,7 @@ var ts;
             ts.setTextRange(forStatement, node);
             return ts.restoreEnclosingLabel(forStatement, outermostLabeledStatement, convertedLoopState && resetLabel);
         }
-        function convertForOfStatementForIterable(node, outermostLabeledStatement, convertedLoopBodyStatements) {
+        function convertForOfStatementForIterable(node, outermostLabeledStatement, convertedLoopBodyStatements, ancestorFacts) {
             var expression = ts.visitNode(node.expression, visitor, ts.isExpression);
             var iterator = ts.isIdentifier(expression) ? ts.getGeneratedNameForNode(expression) : ts.createTempVariable(/*recordTempVariable*/ undefined);
             var result = ts.isIdentifier(expression) ? ts.getGeneratedNameForNode(iterator) : ts.createTempVariable(/*recordTempVariable*/ undefined);
@@ -73687,9 +76075,13 @@ var ts;
             var next = ts.createCall(ts.createPropertyAccess(iterator, "next"), /*typeArguments*/ undefined, []);
             hoistVariableDeclaration(errorRecord);
             hoistVariableDeclaration(returnMethod);
+            // if we are enclosed in an outer loop ensure we reset 'errorRecord' per each iteration
+            var initializer = ancestorFacts & 1024 /* IterationContainer */
+                ? ts.inlineExpressions([ts.createAssignment(errorRecord, ts.createVoidZero()), values])
+                : values;
             var forStatement = ts.setEmitFlags(ts.setTextRange(ts.createFor(
             /*initializer*/ ts.setEmitFlags(ts.setTextRange(ts.createVariableDeclarationList([
-                ts.setTextRange(ts.createVariableDeclaration(iterator, /*type*/ undefined, values), node.expression),
+                ts.setTextRange(ts.createVariableDeclaration(iterator, /*type*/ undefined, initializer), node.expression),
                 ts.createVariableDeclaration(result, /*type*/ undefined, next)
             ]), node.expression), 2097152 /* NoHoisting */), 
             /*condition*/ ts.createLogicalNot(ts.createPropertyAccess(result, "done")), 
@@ -73732,7 +76124,7 @@ var ts;
                     && i < numInitialPropertiesWithoutYield) {
                     numInitialPropertiesWithoutYield = i;
                 }
-                if (property.name.kind === 149 /* ComputedPropertyName */) {
+                if (property.name.kind === 150 /* ComputedPropertyName */) {
                     numInitialProperties = i;
                     break;
                 }
@@ -73787,7 +76179,7 @@ var ts;
             }
             visit(node.name);
             function visit(node) {
-                if (node.kind === 72 /* Identifier */) {
+                if (node.kind === 73 /* Identifier */) {
                     state.hoistedLocalVariables.push(node);
                 }
                 else {
@@ -73800,7 +76192,7 @@ var ts;
                 }
             }
         }
-        function convertIterationStatementBodyIfNecessary(node, outermostLabeledStatement, convert) {
+        function convertIterationStatementBodyIfNecessary(node, outermostLabeledStatement, ancestorFacts, convert) {
             if (!shouldConvertIterationStatement(node)) {
                 var saveAllowedNonLabeledJumps = void 0;
                 if (convertedLoopState) {
@@ -73810,7 +76202,7 @@ var ts;
                     convertedLoopState.allowedNonLabeledJumps = 2 /* Break */ | 4 /* Continue */;
                 }
                 var result = convert
-                    ? convert(node, outermostLabeledStatement, /*convertedLoopBodyStatements*/ undefined)
+                    ? convert(node, outermostLabeledStatement, /*convertedLoopBodyStatements*/ undefined, ancestorFacts)
                     : ts.restoreEnclosingLabel(ts.visitEachChild(node, visitor, context), outermostLabeledStatement, convertedLoopState && resetLabel);
                 if (convertedLoopState) {
                     convertedLoopState.allowedNonLabeledJumps = saveAllowedNonLabeledJumps;
@@ -73835,29 +76227,29 @@ var ts;
             var loop;
             if (bodyFunction) {
                 if (convert) {
-                    loop = convert(node, outermostLabeledStatement, bodyFunction.part);
+                    loop = convert(node, outermostLabeledStatement, bodyFunction.part, ancestorFacts);
                 }
                 else {
-                    var clone_3 = convertIterationStatementCore(node, initializerFunction, ts.createBlock(bodyFunction.part, /*multiLine*/ true));
-                    ts.aggregateTransformFlags(clone_3);
-                    loop = ts.restoreEnclosingLabel(clone_3, outermostLabeledStatement, convertedLoopState && resetLabel);
+                    var clone_4 = convertIterationStatementCore(node, initializerFunction, ts.createBlock(bodyFunction.part, /*multiLine*/ true));
+                    ts.aggregateTransformFlags(clone_4);
+                    loop = ts.restoreEnclosingLabel(clone_4, outermostLabeledStatement, convertedLoopState && resetLabel);
                 }
             }
             else {
-                var clone_4 = convertIterationStatementCore(node, initializerFunction, ts.visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock));
-                ts.aggregateTransformFlags(clone_4);
-                loop = ts.restoreEnclosingLabel(clone_4, outermostLabeledStatement, convertedLoopState && resetLabel);
+                var clone_5 = convertIterationStatementCore(node, initializerFunction, ts.visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock));
+                ts.aggregateTransformFlags(clone_5);
+                loop = ts.restoreEnclosingLabel(clone_5, outermostLabeledStatement, convertedLoopState && resetLabel);
             }
             statements.push(loop);
             return statements;
         }
         function convertIterationStatementCore(node, initializerFunction, convertedLoopBody) {
             switch (node.kind) {
-                case 225 /* ForStatement */: return convertForStatement(node, initializerFunction, convertedLoopBody);
-                case 226 /* ForInStatement */: return convertForInStatement(node, convertedLoopBody);
-                case 227 /* ForOfStatement */: return convertForOfStatement(node, convertedLoopBody);
-                case 223 /* DoStatement */: return convertDoStatement(node, convertedLoopBody);
-                case 224 /* WhileStatement */: return convertWhileStatement(node, convertedLoopBody);
+                case 226 /* ForStatement */: return convertForStatement(node, initializerFunction, convertedLoopBody);
+                case 227 /* ForInStatement */: return convertForInStatement(node, convertedLoopBody);
+                case 228 /* ForOfStatement */: return convertForOfStatement(node, convertedLoopBody);
+                case 224 /* DoStatement */: return convertDoStatement(node, convertedLoopBody);
+                case 225 /* WhileStatement */: return convertWhileStatement(node, convertedLoopBody);
                 default: return ts.Debug.failBadSyntaxKind(node, "IterationStatement expected");
             }
         }
@@ -73882,11 +76274,11 @@ var ts;
         function createConvertedLoopState(node) {
             var loopInitializer;
             switch (node.kind) {
-                case 225 /* ForStatement */:
-                case 226 /* ForInStatement */:
-                case 227 /* ForOfStatement */:
+                case 226 /* ForStatement */:
+                case 227 /* ForInStatement */:
+                case 228 /* ForOfStatement */:
                     var initializer = node.initializer;
-                    if (initializer && initializer.kind === 238 /* VariableDeclarationList */) {
+                    if (initializer && initializer.kind === 239 /* VariableDeclarationList */) {
                         loopInitializer = initializer;
                     }
                     break;
@@ -74148,7 +76540,7 @@ var ts;
         function copyOutParameter(outParam, copyDirection) {
             var source = copyDirection === 0 /* ToOriginal */ ? outParam.outParamName : outParam.originalName;
             var target = copyDirection === 0 /* ToOriginal */ ? outParam.originalName : outParam.outParamName;
-            return ts.createBinary(target, 59 /* EqualsToken */, source);
+            return ts.createBinary(target, 60 /* EqualsToken */, source);
         }
         function copyOutParameters(outParams, partFlags, copyDirection, statements) {
             for (var _i = 0, outParams_1 = outParams; _i < outParams_1.length; _i++) {
@@ -74285,20 +76677,20 @@ var ts;
             for (var i = start; i < numProperties; i++) {
                 var property = properties[i];
                 switch (property.kind) {
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
                         var accessors = ts.getAllAccessorDeclarations(node.properties, property);
                         if (property === accessors.firstAccessor) {
                             expressions.push(transformAccessorsToExpression(receiver, accessors, node, !!node.multiLine));
                         }
                         break;
-                    case 156 /* MethodDeclaration */:
+                    case 157 /* MethodDeclaration */:
                         expressions.push(transformObjectLiteralMethodDeclarationToExpression(property, receiver, node, node.multiLine));
                         break;
-                    case 275 /* PropertyAssignment */:
+                    case 276 /* PropertyAssignment */:
                         expressions.push(transformPropertyAssignmentToExpression(property, receiver, node.multiLine));
                         break;
-                    case 276 /* ShorthandPropertyAssignment */:
+                    case 277 /* ShorthandPropertyAssignment */:
                         expressions.push(transformShorthandPropertyAssignmentToExpression(property, receiver, node.multiLine));
                         break;
                     default:
@@ -74353,7 +76745,7 @@ var ts;
             return expression;
         }
         function visitCatchClause(node) {
-            var ancestorFacts = enterSubtree(4032 /* BlockScopeExcludes */, 0 /* BlockScopeIncludes */);
+            var ancestorFacts = enterSubtree(7104 /* BlockScopeExcludes */, 0 /* BlockScopeIncludes */);
             var updated;
             ts.Debug.assert(!!node.variableDeclaration, "Catch clause variable should always be present when downleveling ES2015.");
             if (ts.isBindingPattern(node.variableDeclaration.name)) {
@@ -74401,17 +76793,17 @@ var ts;
             ts.Debug.assert(!ts.isComputedPropertyName(node.name));
             var savedConvertedLoopState = convertedLoopState;
             convertedLoopState = undefined;
-            var ancestorFacts = enterSubtree(8094 /* FunctionExcludes */, 65 /* FunctionIncludes */);
+            var ancestorFacts = enterSubtree(16286 /* FunctionExcludes */, 65 /* FunctionIncludes */);
             var updated;
             var parameters = ts.visitParameterList(node.parameters, visitor, context);
             var body = transformFunctionBody(node);
-            if (node.kind === 158 /* GetAccessor */) {
+            if (node.kind === 159 /* GetAccessor */) {
                 updated = ts.updateGetAccessor(node, node.decorators, node.modifiers, node.name, parameters, node.type, body);
             }
             else {
                 updated = ts.updateSetAccessor(node, node.decorators, node.modifiers, node.name, parameters, body);
             }
-            exitSubtree(ancestorFacts, 24576 /* FunctionSubtreeExcludes */, 0 /* None */);
+            exitSubtree(ancestorFacts, 49152 /* FunctionSubtreeExcludes */, 0 /* None */);
             convertedLoopState = savedConvertedLoopState;
             return updated;
         }
@@ -74458,7 +76850,7 @@ var ts;
                 return visitTypeScriptClassWrapper(node);
             }
             var expression = ts.skipOuterExpressions(node.expression);
-            if (expression.kind === 98 /* SuperKeyword */ ||
+            if (expression.kind === 99 /* SuperKeyword */ ||
                 ts.isSuperProperty(expression) ||
                 ts.some(node.arguments, ts.isSpreadElement)) {
                 return visitCallExpressionWithPotentialCapturedThisAssignment(node, /*assignToCapturedThis*/ true);
@@ -74582,10 +76974,10 @@ var ts;
             // We are here either because SuperKeyword was used somewhere in the expression, or
             // because we contain a SpreadElementExpression.
             if (node.transformFlags & 4096 /* ContainsRestOrSpread */ ||
-                node.expression.kind === 98 /* SuperKeyword */ ||
+                node.expression.kind === 99 /* SuperKeyword */ ||
                 ts.isSuperProperty(ts.skipOuterExpressions(node.expression))) {
                 var _a = ts.createCallBinding(node.expression, hoistVariableDeclaration), target = _a.target, thisArg = _a.thisArg;
-                if (node.expression.kind === 98 /* SuperKeyword */) {
+                if (node.expression.kind === 99 /* SuperKeyword */) {
                     ts.setEmitFlags(thisArg, 4 /* NoSubstitution */);
                 }
                 var resultingCall = void 0;
@@ -74603,7 +76995,7 @@ var ts;
                     //      _super.apply(this, a.concat([b]))
                     //      _super.m.apply(this, a.concat([b]))
                     //      _super.prototype.m.apply(this, a.concat([b]))
-                    resultingCall = ts.createFunctionApply(ts.visitNode(target, callExpressionVisitor, ts.isExpression), node.expression.kind === 98 /* SuperKeyword */ ? thisArg : ts.visitNode(thisArg, visitor, ts.isExpression), transformAndSpreadElements(node.arguments, /*needsUniqueCopy*/ false, /*multiLine*/ false, /*hasTrailingComma*/ false));
+                    resultingCall = ts.createFunctionApply(ts.visitNode(target, callExpressionVisitor, ts.isExpression), node.expression.kind === 99 /* SuperKeyword */ ? thisArg : ts.visitNode(thisArg, visitor, ts.isExpression), transformAndSpreadElements(node.arguments, /*needsUniqueCopy*/ false, /*multiLine*/ false, /*hasTrailingComma*/ false));
                 }
                 else {
                     // [source]
@@ -74615,10 +77007,10 @@ var ts;
                     //      _super.call(this, a)
                     //      _super.m.call(this, a)
                     //      _super.prototype.m.call(this, a)
-                    resultingCall = ts.createFunctionCall(ts.visitNode(target, callExpressionVisitor, ts.isExpression), node.expression.kind === 98 /* SuperKeyword */ ? thisArg : ts.visitNode(thisArg, visitor, ts.isExpression), ts.visitNodes(node.arguments, visitor, ts.isExpression), 
+                    resultingCall = ts.createFunctionCall(ts.visitNode(target, callExpressionVisitor, ts.isExpression), node.expression.kind === 99 /* SuperKeyword */ ? thisArg : ts.visitNode(thisArg, visitor, ts.isExpression), ts.visitNodes(node.arguments, visitor, ts.isExpression), 
                     /*location*/ node);
                 }
-                if (node.expression.kind === 98 /* SuperKeyword */) {
+                if (node.expression.kind === 99 /* SuperKeyword */) {
                     var initializer = ts.createLogicalOr(resultingCall, createActualThis());
                     resultingCall = assignToCapturedThis
                         ? ts.createAssignment(ts.createFileLevelUniqueName("_this"), initializer)
@@ -74658,8 +77050,11 @@ var ts;
             // [source]
             //      [a, ...b, c]
             //
+            // [output (downlevelIteration)]
+            //      __spread([a], b, [c])
+            //
             // [output]
-            //      [a].concat(b, [c])
+            //      __spreadArrays([a], b, [c])
             // Map spans of spread expressions into their expressions and spans of other
             // expressions into an array literal.
             var numElements = elements.length;
@@ -74669,10 +77064,7 @@ var ts;
             if (compilerOptions.downlevelIteration) {
                 if (segments.length === 1) {
                     var firstSegment = segments[0];
-                    if (ts.isCallExpression(firstSegment)
-                        && ts.isIdentifier(firstSegment.expression)
-                        && (ts.getEmitFlags(firstSegment.expression) & 4096 /* HelperName */)
-                        && firstSegment.expression.escapedText === "___spread") {
+                    if (isCallToHelper(firstSegment, "___spread")) {
                         return segments[0];
                     }
                 }
@@ -74680,15 +77072,28 @@ var ts;
             }
             else {
                 if (segments.length === 1) {
-                    var firstElement = elements[0];
-                    return needsUniqueCopy && ts.isSpreadElement(firstElement) && firstElement.expression.kind !== 187 /* ArrayLiteralExpression */
-                        ? ts.createArraySlice(segments[0])
-                        : segments[0];
+                    var firstSegment = segments[0];
+                    if (!needsUniqueCopy
+                        || isPackedArrayLiteral(firstSegment)
+                        || isCallToHelper(firstSegment, "___spreadArrays")) {
+                        return segments[0];
+                    }
                 }
-                // Rewrite using the pattern <segment0>.concat(<segment1>, <segment2>, ...)
-                return ts.createArrayConcat(segments.shift(), segments);
+                return ts.createSpreadArraysHelper(context, segments);
             }
         }
+        function isPackedElement(node) {
+            return !ts.isOmittedExpression(node);
+        }
+        function isPackedArrayLiteral(node) {
+            return ts.isArrayLiteralExpression(node) && ts.every(node.elements, isPackedElement);
+        }
+        function isCallToHelper(firstSegment, helperName) {
+            return ts.isCallExpression(firstSegment)
+                && ts.isIdentifier(firstSegment.expression)
+                && (ts.getEmitFlags(firstSegment.expression) & 4096 /* HelperName */)
+                && firstSegment.expression.escapedText === helperName;
+        }
         function partitionSpread(node) {
             return ts.isSpreadElement(node)
                 ? visitSpanOfSpreads
@@ -74896,8 +77301,8 @@ var ts;
                 : ts.createFileLevelUniqueName("_super");
         }
         function visitMetaProperty(node) {
-            if (node.keywordToken === 95 /* NewKeyword */ && node.name.escapedText === "target") {
-                hierarchyFacts |= 8192 /* NewTarget */;
+            if (node.keywordToken === 96 /* NewKeyword */ && node.name.escapedText === "target") {
+                hierarchyFacts |= 16384 /* NewTarget */;
                 return ts.createFileLevelUniqueName("_newTarget");
             }
             return node;
@@ -74912,7 +77317,7 @@ var ts;
         function onEmitNode(hint, node, emitCallback) {
             if (enabledSubstitutions & 1 /* CapturedThis */ && ts.isFunctionLike(node)) {
                 // If we are tracking a captured `this`, keep track of the enclosing function.
-                var ancestorFacts = enterSubtree(8094 /* FunctionExcludes */, ts.getEmitFlags(node) & 8 /* CapturesThis */
+                var ancestorFacts = enterSubtree(16286 /* FunctionExcludes */, ts.getEmitFlags(node) & 8 /* CapturesThis */
                     ? 65 /* FunctionIncludes */ | 16 /* CapturesThis */
                     : 65 /* FunctionIncludes */);
                 previousOnEmitNode(hint, node, emitCallback);
@@ -74928,7 +77333,7 @@ var ts;
         function enableSubstitutionsForBlockScopedBindings() {
             if ((enabledSubstitutions & 2 /* BlockScopedBindings */) === 0) {
                 enabledSubstitutions |= 2 /* BlockScopedBindings */;
-                context.enableSubstitution(72 /* Identifier */);
+                context.enableSubstitution(73 /* Identifier */);
             }
         }
         /**
@@ -74938,14 +77343,14 @@ var ts;
         function enableSubstitutionsForCapturedThis() {
             if ((enabledSubstitutions & 1 /* CapturedThis */) === 0) {
                 enabledSubstitutions |= 1 /* CapturedThis */;
-                context.enableSubstitution(100 /* ThisKeyword */);
-                context.enableEmitNotification(157 /* Constructor */);
-                context.enableEmitNotification(156 /* MethodDeclaration */);
-                context.enableEmitNotification(158 /* GetAccessor */);
-                context.enableEmitNotification(159 /* SetAccessor */);
-                context.enableEmitNotification(197 /* ArrowFunction */);
-                context.enableEmitNotification(196 /* FunctionExpression */);
-                context.enableEmitNotification(239 /* FunctionDeclaration */);
+                context.enableSubstitution(101 /* ThisKeyword */);
+                context.enableEmitNotification(158 /* Constructor */);
+                context.enableEmitNotification(157 /* MethodDeclaration */);
+                context.enableEmitNotification(159 /* GetAccessor */);
+                context.enableEmitNotification(160 /* SetAccessor */);
+                context.enableEmitNotification(198 /* ArrowFunction */);
+                context.enableEmitNotification(197 /* FunctionExpression */);
+                context.enableEmitNotification(240 /* FunctionDeclaration */);
             }
         }
         /**
@@ -74986,10 +77391,10 @@ var ts;
          */
         function isNameOfDeclarationWithCollidingName(node) {
             switch (node.parent.kind) {
-                case 186 /* BindingElement */:
-                case 240 /* ClassDeclaration */:
-                case 243 /* EnumDeclaration */:
-                case 237 /* VariableDeclaration */:
+                case 187 /* BindingElement */:
+                case 241 /* ClassDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 238 /* VariableDeclaration */:
                     return node.parent.name === node
                         && resolver.isDeclarationWithCollidingName(node.parent);
             }
@@ -75002,9 +77407,9 @@ var ts;
          */
         function substituteExpression(node) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return substituteExpressionIdentifier(node);
-                case 100 /* ThisKeyword */:
+                case 101 /* ThisKeyword */:
                     return substituteThisKeyword(node);
             }
             return node;
@@ -75071,19 +77476,19 @@ var ts;
                 return false;
             }
             var statement = ts.firstOrUndefined(constructor.body.statements);
-            if (!statement || !ts.nodeIsSynthesized(statement) || statement.kind !== 221 /* ExpressionStatement */) {
+            if (!statement || !ts.nodeIsSynthesized(statement) || statement.kind !== 222 /* ExpressionStatement */) {
                 return false;
             }
             var statementExpression = statement.expression;
-            if (!ts.nodeIsSynthesized(statementExpression) || statementExpression.kind !== 191 /* CallExpression */) {
+            if (!ts.nodeIsSynthesized(statementExpression) || statementExpression.kind !== 192 /* CallExpression */) {
                 return false;
             }
             var callTarget = statementExpression.expression;
-            if (!ts.nodeIsSynthesized(callTarget) || callTarget.kind !== 98 /* SuperKeyword */) {
+            if (!ts.nodeIsSynthesized(callTarget) || callTarget.kind !== 99 /* SuperKeyword */) {
                 return false;
             }
             var callArgument = ts.singleOrUndefined(statementExpression.arguments);
-            if (!callArgument || !ts.nodeIsSynthesized(callArgument) || callArgument.kind !== 208 /* SpreadElement */) {
+            if (!callArgument || !ts.nodeIsSynthesized(callArgument) || callArgument.kind !== 209 /* SpreadElement */) {
                 return false;
             }
             var expression = callArgument.expression;
@@ -75136,15 +77541,15 @@ var ts;
         if (compilerOptions.jsx === 1 /* Preserve */ || compilerOptions.jsx === 3 /* ReactNative */) {
             previousOnEmitNode = context.onEmitNode;
             context.onEmitNode = onEmitNode;
-            context.enableEmitNotification(262 /* JsxOpeningElement */);
-            context.enableEmitNotification(263 /* JsxClosingElement */);
-            context.enableEmitNotification(261 /* JsxSelfClosingElement */);
+            context.enableEmitNotification(263 /* JsxOpeningElement */);
+            context.enableEmitNotification(264 /* JsxClosingElement */);
+            context.enableEmitNotification(262 /* JsxSelfClosingElement */);
             noSubstitution = [];
         }
         var previousOnSubstituteNode = context.onSubstituteNode;
         context.onSubstituteNode = onSubstituteNode;
-        context.enableSubstitution(189 /* PropertyAccessExpression */);
-        context.enableSubstitution(275 /* PropertyAssignment */);
+        context.enableSubstitution(190 /* PropertyAccessExpression */);
+        context.enableSubstitution(276 /* PropertyAssignment */);
         return ts.chainBundle(transformSourceFile);
         /**
          * Transforms an ES5 source file to ES3.
@@ -75163,9 +77568,9 @@ var ts;
          */
         function onEmitNode(hint, node, emitCallback) {
             switch (node.kind) {
-                case 262 /* JsxOpeningElement */:
-                case 263 /* JsxClosingElement */:
-                case 261 /* JsxSelfClosingElement */:
+                case 263 /* JsxOpeningElement */:
+                case 264 /* JsxClosingElement */:
+                case 262 /* JsxSelfClosingElement */:
                     var tagName = node.tagName;
                     noSubstitution[ts.getOriginalNodeId(tagName)] = true;
                     break;
@@ -75222,7 +77627,7 @@ var ts;
          */
         function trySubstituteReservedName(name) {
             var token = name.originalKeywordKind || (ts.nodeIsSynthesized(name) ? ts.stringToToken(ts.idText(name)) : undefined);
-            if (token !== undefined && token >= 73 /* FirstReservedWord */ && token <= 108 /* LastReservedWord */) {
+            if (token !== undefined && token >= 74 /* FirstReservedWord */ && token <= 109 /* LastReservedWord */) {
                 return ts.setTextRange(ts.createLiteral(name), name);
             }
             return undefined;
@@ -75497,13 +77902,13 @@ var ts;
          */
         function visitJavaScriptInStatementContainingYield(node) {
             switch (node.kind) {
-                case 223 /* DoStatement */:
+                case 224 /* DoStatement */:
                     return visitDoStatement(node);
-                case 224 /* WhileStatement */:
+                case 225 /* WhileStatement */:
                     return visitWhileStatement(node);
-                case 232 /* SwitchStatement */:
+                case 233 /* SwitchStatement */:
                     return visitSwitchStatement(node);
-                case 233 /* LabeledStatement */:
+                case 234 /* LabeledStatement */:
                     return visitLabeledStatement(node);
                 default:
                     return visitJavaScriptInGeneratorFunctionBody(node);
@@ -75516,24 +77921,24 @@ var ts;
          */
         function visitJavaScriptInGeneratorFunctionBody(node) {
             switch (node.kind) {
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     return visitFunctionDeclaration(node);
-                case 196 /* FunctionExpression */:
+                case 197 /* FunctionExpression */:
                     return visitFunctionExpression(node);
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     return visitAccessorDeclaration(node);
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     return visitVariableStatement(node);
-                case 225 /* ForStatement */:
+                case 226 /* ForStatement */:
                     return visitForStatement(node);
-                case 226 /* ForInStatement */:
+                case 227 /* ForInStatement */:
                     return visitForInStatement(node);
-                case 229 /* BreakStatement */:
+                case 230 /* BreakStatement */:
                     return visitBreakStatement(node);
-                case 228 /* ContinueStatement */:
+                case 229 /* ContinueStatement */:
                     return visitContinueStatement(node);
-                case 230 /* ReturnStatement */:
+                case 231 /* ReturnStatement */:
                     return visitReturnStatement(node);
                 default:
                     if (node.transformFlags & 131072 /* ContainsYield */) {
@@ -75554,21 +77959,21 @@ var ts;
          */
         function visitJavaScriptContainingYield(node) {
             switch (node.kind) {
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return visitBinaryExpression(node);
-                case 205 /* ConditionalExpression */:
+                case 206 /* ConditionalExpression */:
                     return visitConditionalExpression(node);
-                case 207 /* YieldExpression */:
+                case 208 /* YieldExpression */:
                     return visitYieldExpression(node);
-                case 187 /* ArrayLiteralExpression */:
+                case 188 /* ArrayLiteralExpression */:
                     return visitArrayLiteralExpression(node);
-                case 188 /* ObjectLiteralExpression */:
+                case 189 /* ObjectLiteralExpression */:
                     return visitObjectLiteralExpression(node);
-                case 190 /* ElementAccessExpression */:
+                case 191 /* ElementAccessExpression */:
                     return visitElementAccessExpression(node);
-                case 191 /* CallExpression */:
+                case 192 /* CallExpression */:
                     return visitCallExpression(node);
-                case 192 /* NewExpression */:
+                case 193 /* NewExpression */:
                     return visitNewExpression(node);
                 default:
                     return ts.visitEachChild(node, visitor, context);
@@ -75581,9 +77986,9 @@ var ts;
          */
         function visitGenerator(node) {
             switch (node.kind) {
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     return visitFunctionDeclaration(node);
-                case 196 /* FunctionExpression */:
+                case 197 /* FunctionExpression */:
                     return visitFunctionExpression(node);
                 default:
                     return ts.Debug.failBadSyntaxKind(node);
@@ -75782,23 +78187,23 @@ var ts;
             }
         }
         function isCompoundAssignment(kind) {
-            return kind >= 60 /* FirstCompoundAssignment */
-                && kind <= 71 /* LastCompoundAssignment */;
+            return kind >= 61 /* FirstCompoundAssignment */
+                && kind <= 72 /* LastCompoundAssignment */;
         }
         function getOperatorForCompoundAssignment(kind) {
             switch (kind) {
-                case 60 /* PlusEqualsToken */: return 38 /* PlusToken */;
-                case 61 /* MinusEqualsToken */: return 39 /* MinusToken */;
-                case 62 /* AsteriskEqualsToken */: return 40 /* AsteriskToken */;
-                case 63 /* AsteriskAsteriskEqualsToken */: return 41 /* AsteriskAsteriskToken */;
-                case 64 /* SlashEqualsToken */: return 42 /* SlashToken */;
-                case 65 /* PercentEqualsToken */: return 43 /* PercentToken */;
-                case 66 /* LessThanLessThanEqualsToken */: return 46 /* LessThanLessThanToken */;
-                case 67 /* GreaterThanGreaterThanEqualsToken */: return 47 /* GreaterThanGreaterThanToken */;
-                case 68 /* GreaterThanGreaterThanGreaterThanEqualsToken */: return 48 /* GreaterThanGreaterThanGreaterThanToken */;
-                case 69 /* AmpersandEqualsToken */: return 49 /* AmpersandToken */;
-                case 70 /* BarEqualsToken */: return 50 /* BarToken */;
-                case 71 /* CaretEqualsToken */: return 51 /* CaretToken */;
+                case 61 /* PlusEqualsToken */: return 38 /* PlusToken */;
+                case 62 /* MinusEqualsToken */: return 39 /* MinusToken */;
+                case 63 /* AsteriskEqualsToken */: return 40 /* AsteriskToken */;
+                case 64 /* AsteriskAsteriskEqualsToken */: return 41 /* AsteriskAsteriskToken */;
+                case 65 /* SlashEqualsToken */: return 42 /* SlashToken */;
+                case 66 /* PercentEqualsToken */: return 43 /* PercentToken */;
+                case 67 /* LessThanLessThanEqualsToken */: return 46 /* LessThanLessThanToken */;
+                case 68 /* GreaterThanGreaterThanEqualsToken */: return 47 /* GreaterThanGreaterThanToken */;
+                case 69 /* GreaterThanGreaterThanGreaterThanEqualsToken */: return 48 /* GreaterThanGreaterThanGreaterThanToken */;
+                case 70 /* AmpersandEqualsToken */: return 49 /* AmpersandToken */;
+                case 71 /* BarEqualsToken */: return 50 /* BarToken */;
+                case 72 /* CaretEqualsToken */: return 51 /* CaretToken */;
             }
         }
         /**
@@ -75811,7 +78216,7 @@ var ts;
             if (containsYield(right)) {
                 var target = void 0;
                 switch (left.kind) {
-                    case 189 /* PropertyAccessExpression */:
+                    case 190 /* PropertyAccessExpression */:
                         // [source]
                         //      a.b = yield;
                         //
@@ -75823,7 +78228,7 @@ var ts;
                         //      _a.b = %sent%;
                         target = ts.updatePropertyAccess(left, cacheExpression(ts.visitNode(left.expression, visitor, ts.isLeftHandSideExpression)), left.name);
                         break;
-                    case 190 /* ElementAccessExpression */:
+                    case 191 /* ElementAccessExpression */:
                         // [source]
                         //      a[b] = yield;
                         //
@@ -75866,10 +78271,10 @@ var ts;
                 //      _a = a();
                 //  .yield resumeLabel
                 //      _a + %sent% + c()
-                var clone_5 = ts.getMutableClone(node);
-                clone_5.left = cacheExpression(ts.visitNode(node.left, visitor, ts.isExpression));
-                clone_5.right = ts.visitNode(node.right, visitor, ts.isExpression);
-                return clone_5;
+                var clone_6 = ts.getMutableClone(node);
+                clone_6.left = cacheExpression(ts.visitNode(node.left, visitor, ts.isExpression));
+                clone_6.right = ts.visitNode(node.right, visitor, ts.isExpression);
+                return clone_6;
             }
             return ts.visitEachChild(node, visitor, context);
         }
@@ -76130,10 +78535,10 @@ var ts;
                 //  .yield resumeLabel
                 //  .mark resumeLabel
                 //      a = _a[%sent%]
-                var clone_6 = ts.getMutableClone(node);
-                clone_6.expression = cacheExpression(ts.visitNode(node.expression, visitor, ts.isLeftHandSideExpression));
-                clone_6.argumentExpression = ts.visitNode(node.argumentExpression, visitor, ts.isExpression);
-                return clone_6;
+                var clone_7 = ts.getMutableClone(node);
+                clone_7.expression = cacheExpression(ts.visitNode(node.expression, visitor, ts.isLeftHandSideExpression));
+                clone_7.argumentExpression = ts.visitNode(node.argumentExpression, visitor, ts.isExpression);
+                return clone_7;
             }
             return ts.visitEachChild(node, visitor, context);
         }
@@ -76199,35 +78604,35 @@ var ts;
         }
         function transformAndEmitStatementWorker(node) {
             switch (node.kind) {
-                case 218 /* Block */:
+                case 219 /* Block */:
                     return transformAndEmitBlock(node);
-                case 221 /* ExpressionStatement */:
+                case 222 /* ExpressionStatement */:
                     return transformAndEmitExpressionStatement(node);
-                case 222 /* IfStatement */:
+                case 223 /* IfStatement */:
                     return transformAndEmitIfStatement(node);
-                case 223 /* DoStatement */:
+                case 224 /* DoStatement */:
                     return transformAndEmitDoStatement(node);
-                case 224 /* WhileStatement */:
+                case 225 /* WhileStatement */:
                     return transformAndEmitWhileStatement(node);
-                case 225 /* ForStatement */:
+                case 226 /* ForStatement */:
                     return transformAndEmitForStatement(node);
-                case 226 /* ForInStatement */:
+                case 227 /* ForInStatement */:
                     return transformAndEmitForInStatement(node);
-                case 228 /* ContinueStatement */:
+                case 229 /* ContinueStatement */:
                     return transformAndEmitContinueStatement(node);
-                case 229 /* BreakStatement */:
+                case 230 /* BreakStatement */:
                     return transformAndEmitBreakStatement(node);
-                case 230 /* ReturnStatement */:
+                case 231 /* ReturnStatement */:
                     return transformAndEmitReturnStatement(node);
-                case 231 /* WithStatement */:
+                case 232 /* WithStatement */:
                     return transformAndEmitWithStatement(node);
-                case 232 /* SwitchStatement */:
+                case 233 /* SwitchStatement */:
                     return transformAndEmitSwitchStatement(node);
-                case 233 /* LabeledStatement */:
+                case 234 /* LabeledStatement */:
                     return transformAndEmitLabeledStatement(node);
-                case 234 /* ThrowStatement */:
+                case 235 /* ThrowStatement */:
                     return transformAndEmitThrowStatement(node);
-                case 235 /* TryStatement */:
+                case 236 /* TryStatement */:
                     return transformAndEmitTryStatement(node);
                 default:
                     return emitStatement(ts.visitNode(node, visitor, ts.isStatement));
@@ -76657,7 +79062,7 @@ var ts;
                 for (var i = 0; i < numClauses; i++) {
                     var clause = caseBlock.clauses[i];
                     clauseLabels.push(defineLabel());
-                    if (clause.kind === 272 /* DefaultClause */ && defaultClauseIndex === -1) {
+                    if (clause.kind === 273 /* DefaultClause */ && defaultClauseIndex === -1) {
                         defaultClauseIndex = i;
                     }
                 }
@@ -76670,7 +79075,7 @@ var ts;
                     var defaultClausesSkipped = 0;
                     for (var i = clausesWritten; i < numClauses; i++) {
                         var clause = caseBlock.clauses[i];
-                        if (clause.kind === 271 /* CaseClause */) {
+                        if (clause.kind === 272 /* CaseClause */) {
                             if (containsYield(clause.expression) && pendingClauses.length > 0) {
                                 break;
                             }
@@ -76832,10 +79237,10 @@ var ts;
                     if (declaration) {
                         var name = renamedCatchVariableDeclarations[ts.getOriginalNodeId(declaration)];
                         if (name) {
-                            var clone_7 = ts.getMutableClone(name);
-                            ts.setSourceMapRange(clone_7, node);
-                            ts.setCommentRange(clone_7, node);
-                            return clone_7;
+                            var clone_8 = ts.getMutableClone(name);
+                            ts.setSourceMapRange(clone_8, node);
+                            ts.setCommentRange(clone_8, node);
+                            return clone_8;
                         }
                     }
                 }
@@ -76982,7 +79387,7 @@ var ts;
                 if (!renamedCatchVariables) {
                     renamedCatchVariables = ts.createMap();
                     renamedCatchVariableDeclarations = [];
-                    context.enableSubstitution(72 /* Identifier */);
+                    context.enableSubstitution(73 /* Identifier */);
                 }
                 renamedCatchVariables.set(text, true);
                 renamedCatchVariableDeclarations[ts.getOriginalNodeId(variable)] = name;
@@ -77898,12 +80303,12 @@ var ts;
         var previousOnEmitNode = context.onEmitNode;
         context.onSubstituteNode = onSubstituteNode;
         context.onEmitNode = onEmitNode;
-        context.enableSubstitution(72 /* Identifier */); // Substitutes expression identifiers with imported/exported symbols.
-        context.enableSubstitution(204 /* BinaryExpression */); // Substitutes assignments to exported symbols.
-        context.enableSubstitution(202 /* PrefixUnaryExpression */); // Substitutes updates to exported symbols.
-        context.enableSubstitution(203 /* PostfixUnaryExpression */); // Substitutes updates to exported symbols.
-        context.enableSubstitution(276 /* ShorthandPropertyAssignment */); // Substitutes shorthand property assignments for imported/exported symbols.
-        context.enableEmitNotification(284 /* SourceFile */); // Restore state when substituting nodes in a file.
+        context.enableSubstitution(73 /* Identifier */); // Substitutes expression identifiers with imported/exported symbols.
+        context.enableSubstitution(205 /* BinaryExpression */); // Substitutes assignments to exported symbols.
+        context.enableSubstitution(203 /* PrefixUnaryExpression */); // Substitutes updates to exported symbols.
+        context.enableSubstitution(204 /* PostfixUnaryExpression */); // Substitutes updates to exported symbols.
+        context.enableSubstitution(277 /* ShorthandPropertyAssignment */); // Substitutes shorthand property assignments for imported/exported symbols.
+        context.enableEmitNotification(285 /* SourceFile */); // Restore state when substituting nodes in a file.
         var moduleInfoMap = []; // The ExternalModuleInfo for each file.
         var deferredExports = []; // Exports to defer until an EndOfDeclarationMarker is found.
         var currentSourceFile; // The current file.
@@ -78231,23 +80636,23 @@ var ts;
          */
         function sourceElementVisitor(node) {
             switch (node.kind) {
-                case 249 /* ImportDeclaration */:
+                case 250 /* ImportDeclaration */:
                     return visitImportDeclaration(node);
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return visitImportEqualsDeclaration(node);
-                case 255 /* ExportDeclaration */:
+                case 256 /* ExportDeclaration */:
                     return visitExportDeclaration(node);
-                case 254 /* ExportAssignment */:
+                case 255 /* ExportAssignment */:
                     return visitExportAssignment(node);
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     return visitVariableStatement(node);
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     return visitFunctionDeclaration(node);
-                case 240 /* ClassDeclaration */:
+                case 241 /* ClassDeclaration */:
                     return visitClassDeclaration(node);
-                case 315 /* MergeDeclarationMarker */:
+                case 317 /* MergeDeclarationMarker */:
                     return visitMergeDeclarationMarker(node);
-                case 316 /* EndOfDeclarationMarker */:
+                case 318 /* EndOfDeclarationMarker */:
                     return visitEndOfDeclarationMarker(node);
                 default:
                     return ts.visitEachChild(node, moduleExpressionElementVisitor, context);
@@ -78274,24 +80679,24 @@ var ts;
                 for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
                     var elem = _a[_i];
                     switch (elem.kind) {
-                        case 275 /* PropertyAssignment */:
+                        case 276 /* PropertyAssignment */:
                             if (destructuringNeedsFlattening(elem.initializer)) {
                                 return true;
                             }
                             break;
-                        case 276 /* ShorthandPropertyAssignment */:
+                        case 277 /* ShorthandPropertyAssignment */:
                             if (destructuringNeedsFlattening(elem.name)) {
                                 return true;
                             }
                             break;
-                        case 277 /* SpreadAssignment */:
+                        case 278 /* SpreadAssignment */:
                             if (destructuringNeedsFlattening(elem.expression)) {
                                 return true;
                             }
                             break;
-                        case 156 /* MethodDeclaration */:
-                        case 158 /* GetAccessor */:
-                        case 159 /* SetAccessor */:
+                        case 157 /* MethodDeclaration */:
+                        case 159 /* GetAccessor */:
+                        case 160 /* SetAccessor */:
                             return false;
                         default: ts.Debug.assertNever(elem, "Unhandled object member kind");
                     }
@@ -78769,7 +81174,7 @@ var ts;
             //
             // To balance the declaration, add the exports of the elided variable
             // statement.
-            if (hasAssociatedEndOfDeclarationMarker(node) && node.original.kind === 219 /* VariableStatement */) {
+            if (hasAssociatedEndOfDeclarationMarker(node) && node.original.kind === 220 /* VariableStatement */) {
                 var id = ts.getOriginalNodeId(node);
                 deferredExports[id] = appendExportsOfVariableStatement(deferredExports[id], node.original);
             }
@@ -78824,10 +81229,10 @@ var ts;
             var namedBindings = importClause.namedBindings;
             if (namedBindings) {
                 switch (namedBindings.kind) {
-                    case 251 /* NamespaceImport */:
+                    case 252 /* NamespaceImport */:
                         statements = appendExportsOfDeclaration(statements, namedBindings);
                         break;
-                    case 252 /* NamedImports */:
+                    case 253 /* NamedImports */:
                         for (var _i = 0, _a = namedBindings.elements; _i < _a.length; _i++) {
                             var importBinding = _a[_i];
                             statements = appendExportsOfDeclaration(statements, importBinding);
@@ -79009,8 +81414,8 @@ var ts;
         function modifierVisitor(node) {
             // Elide module-specific modifiers.
             switch (node.kind) {
-                case 85 /* ExportKeyword */:
-                case 80 /* DefaultKeyword */:
+                case 86 /* ExportKeyword */:
+                case 81 /* DefaultKeyword */:
                     return undefined;
             }
             return node;
@@ -79026,7 +81431,7 @@ var ts;
          * @param emit A callback used to emit the node in the printer.
          */
         function onEmitNode(hint, node, emitCallback) {
-            if (node.kind === 284 /* SourceFile */) {
+            if (node.kind === 285 /* SourceFile */) {
                 currentSourceFile = node;
                 currentModuleInfo = moduleInfoMap[ts.getOriginalNodeId(currentSourceFile)];
                 noSubstitution = [];
@@ -79088,12 +81493,12 @@ var ts;
          */
         function substituteExpression(node) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return substituteExpressionIdentifier(node);
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return substituteBinaryExpression(node);
-                case 203 /* PostfixUnaryExpression */:
-                case 202 /* PrefixUnaryExpression */:
+                case 204 /* PostfixUnaryExpression */:
+                case 203 /* PrefixUnaryExpression */:
                     return substituteUnaryExpression(node);
             }
             return node;
@@ -79114,7 +81519,7 @@ var ts;
             }
             if (!ts.isGeneratedIdentifier(node) && !ts.isLocalName(node)) {
                 var exportContainer = resolver.getReferencedExportContainer(node, ts.isExportName(node));
-                if (exportContainer && exportContainer.kind === 284 /* SourceFile */) {
+                if (exportContainer && exportContainer.kind === 285 /* SourceFile */) {
                     return ts.setTextRange(ts.createPropertyAccess(ts.createIdentifier("exports"), ts.getSynthesizedClone(node)), 
                     /*location*/ node);
                 }
@@ -79189,8 +81594,8 @@ var ts;
                 && !ts.isDeclarationNameOfEnumOrNamespace(node.operand)) {
                 var exportedNames = getExports(node.operand);
                 if (exportedNames) {
-                    var expression = node.kind === 203 /* PostfixUnaryExpression */
-                        ? ts.setTextRange(ts.createBinary(node.operand, ts.createToken(node.operator === 44 /* PlusPlusToken */ ? 60 /* PlusEqualsToken */ : 61 /* MinusEqualsToken */), ts.createLiteral(1)), 
+                    var expression = node.kind === 204 /* PostfixUnaryExpression */
+                        ? ts.setTextRange(ts.createBinary(node.operand, ts.createToken(node.operator === 44 /* PlusPlusToken */ ? 61 /* PlusEqualsToken */ : 62 /* MinusEqualsToken */), ts.createLiteral(1)), 
                         /*location*/ node)
                         : node;
                     for (var _i = 0, exportedNames_3 = exportedNames; _i < exportedNames_3.length; _i++) {
@@ -79264,12 +81669,12 @@ var ts;
         var previousOnEmitNode = context.onEmitNode;
         context.onSubstituteNode = onSubstituteNode;
         context.onEmitNode = onEmitNode;
-        context.enableSubstitution(72 /* Identifier */); // Substitutes expression identifiers for imported symbols.
-        context.enableSubstitution(276 /* ShorthandPropertyAssignment */); // Substitutes expression identifiers for imported symbols
-        context.enableSubstitution(204 /* BinaryExpression */); // Substitutes assignments to exported symbols.
-        context.enableSubstitution(202 /* PrefixUnaryExpression */); // Substitutes updates to exported symbols.
-        context.enableSubstitution(203 /* PostfixUnaryExpression */); // Substitutes updates to exported symbols.
-        context.enableEmitNotification(284 /* SourceFile */); // Restore state when substituting nodes in a file.
+        context.enableSubstitution(73 /* Identifier */); // Substitutes expression identifiers for imported symbols.
+        context.enableSubstitution(277 /* ShorthandPropertyAssignment */); // Substitutes expression identifiers for imported symbols
+        context.enableSubstitution(205 /* BinaryExpression */); // Substitutes assignments to exported symbols.
+        context.enableSubstitution(203 /* PrefixUnaryExpression */); // Substitutes updates to exported symbols.
+        context.enableSubstitution(204 /* PostfixUnaryExpression */); // Substitutes updates to exported symbols.
+        context.enableEmitNotification(285 /* SourceFile */); // Restore state when substituting nodes in a file.
         var moduleInfoMap = []; // The ExternalModuleInfo for each file.
         var deferredExports = []; // Exports to defer until an EndOfDeclarationMarker is found.
         var exportFunctionsMap = []; // The export function associated with a source file.
@@ -79490,7 +81895,7 @@ var ts;
                 var hasExportDeclarationWithExportClause = false;
                 for (var _i = 0, _a = moduleInfo.externalImports; _i < _a.length; _i++) {
                     var externalImport = _a[_i];
-                    if (externalImport.kind === 255 /* ExportDeclaration */ && externalImport.exportClause) {
+                    if (externalImport.kind === 256 /* ExportDeclaration */ && externalImport.exportClause) {
                         hasExportDeclarationWithExportClause = true;
                         break;
                     }
@@ -79515,7 +81920,7 @@ var ts;
             }
             for (var _d = 0, _e = moduleInfo.externalImports; _d < _e.length; _d++) {
                 var externalImport = _e[_d];
-                if (externalImport.kind !== 255 /* ExportDeclaration */) {
+                if (externalImport.kind !== 256 /* ExportDeclaration */) {
                     continue;
                 }
                 if (!externalImport.exportClause) {
@@ -79593,19 +81998,19 @@ var ts;
                     var entry = _b[_a];
                     var importVariableName = ts.getLocalNameForExternalImport(entry, currentSourceFile); // TODO: GH#18217
                     switch (entry.kind) {
-                        case 249 /* ImportDeclaration */:
+                        case 250 /* ImportDeclaration */:
                             if (!entry.importClause) {
                                 // 'import "..."' case
                                 // module is imported only for side-effects, no emit required
                                 break;
                             }
                         // falls through
-                        case 248 /* ImportEqualsDeclaration */:
+                        case 249 /* ImportEqualsDeclaration */:
                             ts.Debug.assert(importVariableName !== undefined);
                             // save import into the local
                             statements.push(ts.createExpressionStatement(ts.createAssignment(importVariableName, parameterName)));
                             break;
-                        case 255 /* ExportDeclaration */:
+                        case 256 /* ExportDeclaration */:
                             ts.Debug.assert(importVariableName !== undefined);
                             if (entry.exportClause) {
                                 //  export {a, b as c} from 'foo'
@@ -79655,15 +82060,15 @@ var ts;
          */
         function sourceElementVisitor(node) {
             switch (node.kind) {
-                case 249 /* ImportDeclaration */:
+                case 250 /* ImportDeclaration */:
                     return visitImportDeclaration(node);
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return visitImportEqualsDeclaration(node);
-                case 255 /* ExportDeclaration */:
+                case 256 /* ExportDeclaration */:
                     // ExportDeclarations are elided as they are handled via
                     // `appendExportsOfDeclaration`.
                     return undefined;
-                case 254 /* ExportAssignment */:
+                case 255 /* ExportAssignment */:
                     return visitExportAssignment(node);
                 default:
                     return nestedElementVisitor(node);
@@ -79839,7 +82244,7 @@ var ts;
         function shouldHoistVariableDeclarationList(node) {
             // hoist only non-block scoped declarations or block scoped declarations parented by source file
             return (ts.getEmitFlags(node) & 2097152 /* NoHoisting */) === 0
-                && (enclosingBlockScopedContainer.kind === 284 /* SourceFile */
+                && (enclosingBlockScopedContainer.kind === 285 /* SourceFile */
                     || (ts.getOriginalNode(node).flags & 3 /* BlockScoped */) === 0);
         }
         /**
@@ -79903,7 +82308,7 @@ var ts;
             //
             // To balance the declaration, we defer the exports of the elided variable
             // statement until we visit this declaration's `EndOfDeclarationMarker`.
-            if (hasAssociatedEndOfDeclarationMarker(node) && node.original.kind === 219 /* VariableStatement */) {
+            if (hasAssociatedEndOfDeclarationMarker(node) && node.original.kind === 220 /* VariableStatement */) {
                 var id = ts.getOriginalNodeId(node);
                 var isExportedDeclaration = ts.hasModifier(node.original, 1 /* Export */);
                 deferredExports[id] = appendExportsOfVariableStatement(deferredExports[id], node.original, isExportedDeclaration);
@@ -79965,10 +82370,10 @@ var ts;
             var namedBindings = importClause.namedBindings;
             if (namedBindings) {
                 switch (namedBindings.kind) {
-                    case 251 /* NamespaceImport */:
+                    case 252 /* NamespaceImport */:
                         statements = appendExportsOfDeclaration(statements, namedBindings);
                         break;
-                    case 252 /* NamedImports */:
+                    case 253 /* NamedImports */:
                         for (var _i = 0, _a = namedBindings.elements; _i < _a.length; _i++) {
                             var importBinding = _a[_i];
                             statements = appendExportsOfDeclaration(statements, importBinding);
@@ -80148,43 +82553,43 @@ var ts;
          */
         function nestedElementVisitor(node) {
             switch (node.kind) {
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     return visitVariableStatement(node);
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     return visitFunctionDeclaration(node);
-                case 240 /* ClassDeclaration */:
+                case 241 /* ClassDeclaration */:
                     return visitClassDeclaration(node);
-                case 225 /* ForStatement */:
+                case 226 /* ForStatement */:
                     return visitForStatement(node);
-                case 226 /* ForInStatement */:
+                case 227 /* ForInStatement */:
                     return visitForInStatement(node);
-                case 227 /* ForOfStatement */:
+                case 228 /* ForOfStatement */:
                     return visitForOfStatement(node);
-                case 223 /* DoStatement */:
+                case 224 /* DoStatement */:
                     return visitDoStatement(node);
-                case 224 /* WhileStatement */:
+                case 225 /* WhileStatement */:
                     return visitWhileStatement(node);
-                case 233 /* LabeledStatement */:
+                case 234 /* LabeledStatement */:
                     return visitLabeledStatement(node);
-                case 231 /* WithStatement */:
+                case 232 /* WithStatement */:
                     return visitWithStatement(node);
-                case 232 /* SwitchStatement */:
+                case 233 /* SwitchStatement */:
                     return visitSwitchStatement(node);
-                case 246 /* CaseBlock */:
+                case 247 /* CaseBlock */:
                     return visitCaseBlock(node);
-                case 271 /* CaseClause */:
+                case 272 /* CaseClause */:
                     return visitCaseClause(node);
-                case 272 /* DefaultClause */:
+                case 273 /* DefaultClause */:
                     return visitDefaultClause(node);
-                case 235 /* TryStatement */:
+                case 236 /* TryStatement */:
                     return visitTryStatement(node);
-                case 274 /* CatchClause */:
+                case 275 /* CatchClause */:
                     return visitCatchClause(node);
-                case 218 /* Block */:
+                case 219 /* Block */:
                     return visitBlock(node);
-                case 315 /* MergeDeclarationMarker */:
+                case 317 /* MergeDeclarationMarker */:
                     return visitMergeDeclarationMarker(node);
-                case 316 /* EndOfDeclarationMarker */:
+                case 318 /* EndOfDeclarationMarker */:
                     return visitEndOfDeclarationMarker(node);
                 default:
                     return destructuringAndImportCallVisitor(node);
@@ -80431,7 +82836,7 @@ var ts;
             }
             else if (ts.isIdentifier(node)) {
                 var container = resolver.getReferencedExportContainer(node);
-                return container !== undefined && container.kind === 284 /* SourceFile */;
+                return container !== undefined && container.kind === 285 /* SourceFile */;
             }
             else {
                 return false;
@@ -80447,8 +82852,8 @@ var ts;
          */
         function modifierVisitor(node) {
             switch (node.kind) {
-                case 85 /* ExportKeyword */:
-                case 80 /* DefaultKeyword */:
+                case 86 /* ExportKeyword */:
+                case 81 /* DefaultKeyword */:
                     return undefined;
             }
             return node;
@@ -80464,7 +82869,7 @@ var ts;
          * @param emitCallback A callback used to emit the node in the printer.
          */
         function onEmitNode(hint, node, emitCallback) {
-            if (node.kind === 284 /* SourceFile */) {
+            if (node.kind === 285 /* SourceFile */) {
                 var id = ts.getOriginalNodeId(node);
                 currentSourceFile = node;
                 moduleInfo = moduleInfoMap[id];
@@ -80512,7 +82917,7 @@ var ts;
          */
         function substituteUnspecified(node) {
             switch (node.kind) {
-                case 276 /* ShorthandPropertyAssignment */:
+                case 277 /* ShorthandPropertyAssignment */:
                     return substituteShorthandPropertyAssignment(node);
             }
             return node;
@@ -80546,12 +82951,12 @@ var ts;
          */
         function substituteExpression(node) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return substituteExpressionIdentifier(node);
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return substituteBinaryExpression(node);
-                case 202 /* PrefixUnaryExpression */:
-                case 203 /* PostfixUnaryExpression */:
+                case 203 /* PrefixUnaryExpression */:
+                case 204 /* PostfixUnaryExpression */:
                     return substituteUnaryExpression(node);
             }
             return node;
@@ -80644,14 +83049,14 @@ var ts;
                 && !ts.isDeclarationNameOfEnumOrNamespace(node.operand)) {
                 var exportedNames = getExports(node.operand);
                 if (exportedNames) {
-                    var expression = node.kind === 203 /* PostfixUnaryExpression */
+                    var expression = node.kind === 204 /* PostfixUnaryExpression */
                         ? ts.setTextRange(ts.createPrefix(node.operator, node.operand), node)
                         : node;
                     for (var _i = 0, exportedNames_5 = exportedNames; _i < exportedNames_5.length; _i++) {
                         var exportName = exportedNames_5[_i];
                         expression = createExportExpression(exportName, preventSubstitution(expression));
                     }
-                    if (node.kind === 203 /* PostfixUnaryExpression */) {
+                    if (node.kind === 204 /* PostfixUnaryExpression */) {
                         expression = node.operator === 44 /* PlusPlusToken */
                             ? ts.createSubtract(preventSubstitution(expression), ts.createLiteral(1))
                             : ts.createAdd(preventSubstitution(expression), ts.createLiteral(1));
@@ -80673,7 +83078,7 @@ var ts;
                     || resolver.getReferencedValueDeclaration(name);
                 if (valueDeclaration) {
                     var exportContainer = resolver.getReferencedExportContainer(name, /*prefixLocals*/ false);
-                    if (exportContainer && exportContainer.kind === 284 /* SourceFile */) {
+                    if (exportContainer && exportContainer.kind === 285 /* SourceFile */) {
                         exportedNames = ts.append(exportedNames, ts.getDeclarationName(valueDeclaration));
                     }
                     exportedNames = ts.addRange(exportedNames, moduleInfo && moduleInfo.exportedBindings[ts.getOriginalNodeId(valueDeclaration)]);
@@ -80712,8 +83117,8 @@ var ts;
         var previousOnSubstituteNode = context.onSubstituteNode;
         context.onEmitNode = onEmitNode;
         context.onSubstituteNode = onSubstituteNode;
-        context.enableEmitNotification(284 /* SourceFile */);
-        context.enableSubstitution(72 /* Identifier */);
+        context.enableEmitNotification(285 /* SourceFile */);
+        context.enableSubstitution(73 /* Identifier */);
         var currentSourceFile;
         return ts.chainBundle(transformSourceFile);
         function transformSourceFile(node) {
@@ -80741,10 +83146,10 @@ var ts;
         }
         function visitor(node) {
             switch (node.kind) {
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     // Elide `import=` as it is not legal with --module ES6
                     return undefined;
-                case 254 /* ExportAssignment */:
+                case 255 /* ExportAssignment */:
                     return visitExportAssignment(node);
             }
             return node;
@@ -80852,7 +83257,7 @@ var ts;
                         ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 :
                     ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_private_name_1;
             }
-            else if (node.parent.kind === 240 /* ClassDeclaration */) {
+            else if (node.parent.kind === 241 /* ClassDeclaration */) {
                 return symbolAccessibilityResult.errorModuleName ?
                     symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                         ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
@@ -80881,7 +83286,7 @@ var ts;
                         ts.Diagnostics.Public_static_method_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 :
                     ts.Diagnostics.Public_static_method_0_of_exported_class_has_or_is_using_private_name_1;
             }
-            else if (node.parent.kind === 240 /* ClassDeclaration */) {
+            else if (node.parent.kind === 241 /* ClassDeclaration */) {
                 return symbolAccessibilityResult.errorModuleName ?
                     symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                         ts.Diagnostics.Public_method_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
@@ -80928,7 +83333,7 @@ var ts;
             return ts.Debug.assertNever(node, "Attempted to set a declaration diagnostic context for unhandled node kind: " + ts.SyntaxKind[node.kind]);
         }
         function getVariableDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult) {
-            if (node.kind === 237 /* VariableDeclaration */ || node.kind === 186 /* BindingElement */) {
+            if (node.kind === 238 /* VariableDeclaration */ || node.kind === 187 /* BindingElement */) {
                 return symbolAccessibilityResult.errorModuleName ?
                     symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                         ts.Diagnostics.Exported_variable_0_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
@@ -80937,8 +83342,8 @@ var ts;
             }
             // This check is to ensure we don't report error on constructor parameter property as that error would be reported during parameter emit
             // The only exception here is if the constructor was marked as private. we are not emitting the constructor parameters at all.
-            else if (node.kind === 154 /* PropertyDeclaration */ || node.kind === 189 /* PropertyAccessExpression */ || node.kind === 153 /* PropertySignature */ ||
-                (node.kind === 151 /* Parameter */ && ts.hasModifier(node.parent, 8 /* Private */))) {
+            else if (node.kind === 155 /* PropertyDeclaration */ || node.kind === 190 /* PropertyAccessExpression */ || node.kind === 154 /* PropertySignature */ ||
+                (node.kind === 152 /* Parameter */ && ts.hasModifier(node.parent, 8 /* Private */))) {
                 // TODO(jfreeman): Deal with computed properties in error reporting.
                 if (ts.hasModifier(node, 32 /* Static */)) {
                     return symbolAccessibilityResult.errorModuleName ?
@@ -80947,7 +83352,7 @@ var ts;
                             ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 :
                         ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_private_name_1;
                 }
-                else if (node.parent.kind === 240 /* ClassDeclaration */ || node.kind === 151 /* Parameter */) {
+                else if (node.parent.kind === 241 /* ClassDeclaration */ || node.kind === 152 /* Parameter */) {
                     return symbolAccessibilityResult.errorModuleName ?
                         symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                             ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
@@ -80972,7 +83377,7 @@ var ts;
         }
         function getAccessorDeclarationTypeVisibilityError(symbolAccessibilityResult) {
             var diagnosticMessage;
-            if (node.kind === 159 /* SetAccessor */) {
+            if (node.kind === 160 /* SetAccessor */) {
                 // Getters can infer the return type from the returned expression, but setters cannot, so the
                 // "_from_external_module_1_but_cannot_be_named" case cannot occur.
                 if (ts.hasModifier(node, 32 /* Static */)) {
@@ -81011,26 +83416,26 @@ var ts;
         function getReturnTypeVisibilityError(symbolAccessibilityResult) {
             var diagnosticMessage;
             switch (node.kind) {
-                case 161 /* ConstructSignature */:
+                case 162 /* ConstructSignature */:
                     // Interfaces cannot have return types that cannot be named
                     diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                         ts.Diagnostics.Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 :
                         ts.Diagnostics.Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_0;
                     break;
-                case 160 /* CallSignature */:
+                case 161 /* CallSignature */:
                     // Interfaces cannot have return types that cannot be named
                     diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                         ts.Diagnostics.Return_type_of_call_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 :
                         ts.Diagnostics.Return_type_of_call_signature_from_exported_interface_has_or_is_using_private_name_0;
                     break;
-                case 162 /* IndexSignature */:
+                case 163 /* IndexSignature */:
                     // Interfaces cannot have return types that cannot be named
                     diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                         ts.Diagnostics.Return_type_of_index_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 :
                         ts.Diagnostics.Return_type_of_index_signature_from_exported_interface_has_or_is_using_private_name_0;
                     break;
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
                     if (ts.hasModifier(node, 32 /* Static */)) {
                         diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                             symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
@@ -81038,7 +83443,7 @@ var ts;
                                 ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_private_module_1 :
                             ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_private_name_0;
                     }
-                    else if (node.parent.kind === 240 /* ClassDeclaration */) {
+                    else if (node.parent.kind === 241 /* ClassDeclaration */) {
                         diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                             symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                                 ts.Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named :
@@ -81052,7 +83457,7 @@ var ts;
                             ts.Diagnostics.Return_type_of_method_from_exported_interface_has_or_is_using_private_name_0;
                     }
                     break;
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                         symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                             ts.Diagnostics.Return_type_of_exported_function_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named :
@@ -81077,30 +83482,30 @@ var ts;
         }
         function getParameterDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult) {
             switch (node.parent.kind) {
-                case 157 /* Constructor */:
+                case 158 /* Constructor */:
                     return symbolAccessibilityResult.errorModuleName ?
                         symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                             ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
                             ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
                         ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_private_name_1;
-                case 161 /* ConstructSignature */:
-                case 166 /* ConstructorType */:
+                case 162 /* ConstructSignature */:
+                case 167 /* ConstructorType */:
                     // Interfaces cannot have parameter types that cannot be named
                     return symbolAccessibilityResult.errorModuleName ?
                         ts.Diagnostics.Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 :
                         ts.Diagnostics.Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1;
-                case 160 /* CallSignature */:
+                case 161 /* CallSignature */:
                     // Interfaces cannot have parameter types that cannot be named
                     return symbolAccessibilityResult.errorModuleName ?
                         ts.Diagnostics.Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 :
                         ts.Diagnostics.Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1;
-                case 162 /* IndexSignature */:
+                case 163 /* IndexSignature */:
                     // Interfaces cannot have parameter types that cannot be named
                     return symbolAccessibilityResult.errorModuleName ?
                         ts.Diagnostics.Parameter_0_of_index_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 :
                         ts.Diagnostics.Parameter_0_of_index_signature_from_exported_interface_has_or_is_using_private_name_1;
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
                     if (ts.hasModifier(node.parent, 32 /* Static */)) {
                         return symbolAccessibilityResult.errorModuleName ?
                             symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
@@ -81108,7 +83513,7 @@ var ts;
                                 ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
                             ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1;
                     }
-                    else if (node.parent.parent.kind === 240 /* ClassDeclaration */) {
+                    else if (node.parent.parent.kind === 241 /* ClassDeclaration */) {
                         return symbolAccessibilityResult.errorModuleName ?
                             symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                                 ts.Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
@@ -81121,8 +83526,8 @@ var ts;
                             ts.Diagnostics.Parameter_0_of_method_from_exported_interface_has_or_is_using_name_1_from_private_module_2 :
                             ts.Diagnostics.Parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1;
                     }
-                case 239 /* FunctionDeclaration */:
-                case 165 /* FunctionType */:
+                case 240 /* FunctionDeclaration */:
+                case 166 /* FunctionType */:
                     return symbolAccessibilityResult.errorModuleName ?
                         symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                             ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
@@ -81136,39 +83541,39 @@ var ts;
             // Type parameter constraints are named by user so we should always be able to name it
             var diagnosticMessage;
             switch (node.parent.kind) {
-                case 240 /* ClassDeclaration */:
+                case 241 /* ClassDeclaration */:
                     diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_class_has_or_is_using_private_name_1;
                     break;
-                case 241 /* InterfaceDeclaration */:
+                case 242 /* InterfaceDeclaration */:
                     diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1;
                     break;
-                case 181 /* MappedType */:
+                case 182 /* MappedType */:
                     diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_mapped_object_type_is_using_private_name_1;
                     break;
-                case 166 /* ConstructorType */:
-                case 161 /* ConstructSignature */:
+                case 167 /* ConstructorType */:
+                case 162 /* ConstructSignature */:
                     diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1;
                     break;
-                case 160 /* CallSignature */:
+                case 161 /* CallSignature */:
                     diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1;
                     break;
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
                     if (ts.hasModifier(node.parent, 32 /* Static */)) {
                         diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1;
                     }
-                    else if (node.parent.parent.kind === 240 /* ClassDeclaration */) {
+                    else if (node.parent.parent.kind === 241 /* ClassDeclaration */) {
                         diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1;
                     }
                     else {
                         diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1;
                     }
                     break;
-                case 165 /* FunctionType */:
-                case 239 /* FunctionDeclaration */:
+                case 166 /* FunctionType */:
+                case 240 /* FunctionDeclaration */:
                     diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_function_has_or_is_using_private_name_1;
                     break;
-                case 242 /* TypeAliasDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
                     diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_type_alias_has_or_is_using_private_name_1;
                     break;
                 default:
@@ -81183,9 +83588,9 @@ var ts;
         function getHeritageClauseVisibilityError() {
             var diagnosticMessage;
             // Heritage clause is written by user so it can always be named
-            if (node.parent.parent.kind === 240 /* ClassDeclaration */) {
+            if (node.parent.parent.kind === 241 /* ClassDeclaration */) {
                 // Class or Interface implemented/extended is inaccessible
-                diagnosticMessage = ts.isHeritageClause(node.parent) && node.parent.token === 109 /* ImplementsKeyword */ ?
+                diagnosticMessage = ts.isHeritageClause(node.parent) && node.parent.token === 110 /* ImplementsKeyword */ ?
                     ts.Diagnostics.Implements_clause_of_exported_class_0_has_or_is_using_private_name_1 :
                     ts.Diagnostics.extends_clause_of_exported_class_0_has_or_is_using_private_name_1;
             }
@@ -81228,12 +83633,28 @@ var ts;
         return result.diagnostics;
     }
     ts.getDeclarationDiagnostics = getDeclarationDiagnostics;
+    function hasInternalAnnotation(range, currentSourceFile) {
+        var comment = currentSourceFile.text.substring(range.pos, range.end);
+        return ts.stringContains(comment, "@internal");
+    }
     function isInternalDeclaration(node, currentSourceFile) {
         var parseTreeNode = ts.getParseTreeNode(node);
+        if (parseTreeNode && parseTreeNode.kind === 152 /* Parameter */) {
+            var paramIdx = parseTreeNode.parent.parameters.indexOf(parseTreeNode);
+            var previousSibling = paramIdx > 0 ? parseTreeNode.parent.parameters[paramIdx - 1] : undefined;
+            var text = currentSourceFile.text;
+            var commentRanges = previousSibling
+                ? ts.concatenate(
+                // to handle
+                // ... parameters, /* @internal */
+                // public param: string
+                ts.getTrailingCommentRanges(text, ts.skipTrivia(text, previousSibling.end + 1, /* stopAfterLineBreak */ false, /* stopAtComments */ true)), ts.getLeadingCommentRanges(text, node.pos))
+                : ts.getTrailingCommentRanges(text, ts.skipTrivia(text, node.pos, /* stopAfterLineBreak */ false, /* stopAtComments */ true));
+            return commentRanges && commentRanges.length && hasInternalAnnotation(ts.last(commentRanges), currentSourceFile);
+        }
         var leadingCommentRanges = parseTreeNode && ts.getLeadingCommentRangesOfNode(parseTreeNode, currentSourceFile);
         return !!ts.forEach(leadingCommentRanges, function (range) {
-            var comment = currentSourceFile.text.substring(range.pos, range.end);
-            return ts.stringContains(comment, "@internal");
+            return hasInternalAnnotation(range, currentSourceFile);
         });
     }
     ts.isInternalDeclaration = isInternalDeclaration;
@@ -81364,11 +83785,14 @@ var ts;
                 context.addDiagnostic(ts.createDiagnosticForNode(errorNameNode, ts.Diagnostics.The_inferred_type_of_0_cannot_be_named_without_a_reference_to_1_This_is_likely_not_portable_A_type_annotation_is_necessary, ts.declarationNameToString(errorNameNode), specifier));
             }
         }
+        function createEmptyExports() {
+            return ts.createExportDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, ts.createNamedExports([]), /*moduleSpecifier*/ undefined);
+        }
         function transformRoot(node) {
-            if (node.kind === 284 /* SourceFile */ && (node.isDeclarationFile || ts.isSourceFileJS(node))) {
+            if (node.kind === 285 /* SourceFile */ && (node.isDeclarationFile || ts.isSourceFileJS(node))) {
                 return node;
             }
-            if (node.kind === 285 /* Bundle */) {
+            if (node.kind === 286 /* Bundle */) {
                 isBundledEmit = true;
                 refs = ts.createMap();
                 libs = ts.createMap();
@@ -81391,14 +83815,14 @@ var ts;
                         resultHasExternalModuleIndicator = false; // unused in external module bundle emit (all external modules are within module blocks, therefore are known to be modules)
                         needsDeclare = false;
                         var statements_4 = ts.visitNodes(sourceFile.statements, visitDeclarationStatements);
-                        var newFile = ts.updateSourceFileNode(sourceFile, [ts.createModuleDeclaration([], [ts.createModifier(125 /* DeclareKeyword */)], ts.createLiteral(ts.getResolvedExternalModuleName(context.getEmitHost(), sourceFile)), ts.createModuleBlock(ts.setTextRange(ts.createNodeArray(transformAndReplaceLatePaintedStatements(statements_4)), sourceFile.statements)))], /*isDeclarationFile*/ true, /*referencedFiles*/ [], /*typeReferences*/ [], /*hasNoDefaultLib*/ false, /*libReferences*/ []);
+                        var newFile = ts.updateSourceFileNode(sourceFile, [ts.createModuleDeclaration([], [ts.createModifier(126 /* DeclareKeyword */)], ts.createLiteral(ts.getResolvedExternalModuleName(context.getEmitHost(), sourceFile)), ts.createModuleBlock(ts.setTextRange(ts.createNodeArray(transformAndReplaceLatePaintedStatements(statements_4)), sourceFile.statements)))], /*isDeclarationFile*/ true, /*referencedFiles*/ [], /*typeReferences*/ [], /*hasNoDefaultLib*/ false, /*libReferences*/ []);
                         return newFile;
                     }
                     needsDeclare = true;
                     var updated = ts.visitNodes(sourceFile.statements, visitDeclarationStatements);
                     return ts.updateSourceFileNode(sourceFile, transformAndReplaceLatePaintedStatements(updated), /*isDeclarationFile*/ true, /*referencedFiles*/ [], /*typeReferences*/ [], /*hasNoDefaultLib*/ false, /*libReferences*/ []);
                 }), ts.mapDefined(node.prepends, function (prepend) {
-                    if (prepend.kind === 287 /* InputFiles */) {
+                    if (prepend.kind === 288 /* InputFiles */) {
                         var sourceFile = ts.createUnparsedSourceFile(prepend, "dts", stripInternal);
                         hasNoDefaultLib_1 = hasNoDefaultLib_1 || !!sourceFile.hasNoDefaultLib;
                         collectReferences(sourceFile, refs);
@@ -81440,7 +83864,7 @@ var ts;
             refs.forEach(referenceVisitor);
             var emittedImports = ts.filter(combinedStatements, ts.isAnyImportSyntax);
             if (ts.isExternalModule(node) && (!resultHasExternalModuleIndicator || (needsScopeFixMarker && !resultHasScopeMarker))) {
-                combinedStatements = ts.setTextRange(ts.createNodeArray(combinedStatements.concat([ts.createExportDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, ts.createNamedExports([]), /*moduleSpecifier*/ undefined)])), combinedStatements);
+                combinedStatements = ts.setTextRange(ts.createNodeArray(combinedStatements.concat([createEmptyExports()])), combinedStatements);
             }
             var updated = ts.updateSourceFileNode(node, combinedStatements, /*isDeclarationFile*/ true, references, getFileReferencesForUsedTypeReferences(), node.hasNoDefaultLib, getLibReferences());
             updated.exportedModulesFromDeclarationEmit = exportedModulesFromDeclarationEmit;
@@ -81501,7 +83925,7 @@ var ts;
             if (noResolve || (!ts.isUnparsedSource(sourceFile) && ts.isSourceFileJS(sourceFile)))
                 return ret;
             ts.forEach(sourceFile.referencedFiles, function (f) {
-                var elem = ts.tryResolveScriptReference(host, sourceFile, f);
+                var elem = host.getSourceFileFromReference(sourceFile, f);
                 if (elem) {
                     ret.set("" + ts.getOriginalNodeId(elem), elem);
                 }
@@ -81518,11 +83942,11 @@ var ts;
             return ret;
         }
         function filterBindingPatternInitializers(name) {
-            if (name.kind === 72 /* Identifier */) {
+            if (name.kind === 73 /* Identifier */) {
                 return name;
             }
             else {
-                if (name.kind === 185 /* ArrayBindingPattern */) {
+                if (name.kind === 186 /* ArrayBindingPattern */) {
                     return ts.updateArrayBindingPattern(name, ts.visitNodes(name.elements, visitBindingElement));
                 }
                 else {
@@ -81530,7 +83954,7 @@ var ts;
                 }
             }
             function visitBindingElement(elem) {
-                if (elem.kind === 210 /* OmittedExpression */) {
+                if (elem.kind === 211 /* OmittedExpression */) {
                     return elem;
                 }
                 return ts.updateBindingElement(elem, elem.dotDotDotToken, elem.propertyName, filterBindingPatternInitializers(elem.name), shouldPrintWithInitializer(elem) ? elem.initializer : undefined);
@@ -81568,19 +83992,19 @@ var ts;
                 // Literal const declarations will have an initializer ensured rather than a type
                 return;
             }
-            var shouldUseResolverType = node.kind === 151 /* Parameter */ &&
+            var shouldUseResolverType = node.kind === 152 /* Parameter */ &&
                 (resolver.isRequiredInitializedParameter(node) ||
                     resolver.isOptionalUninitializedParameterProperty(node));
             if (type && !shouldUseResolverType) {
                 return ts.visitNode(type, visitDeclarationSubtree);
             }
             if (!ts.getParseTreeNode(node)) {
-                return type ? ts.visitNode(type, visitDeclarationSubtree) : ts.createKeywordTypeNode(120 /* AnyKeyword */);
+                return type ? ts.visitNode(type, visitDeclarationSubtree) : ts.createKeywordTypeNode(121 /* AnyKeyword */);
             }
-            if (node.kind === 159 /* SetAccessor */) {
+            if (node.kind === 160 /* SetAccessor */) {
                 // Set accessors with no associated type node (from it's param or get accessor return) are `any` since they are never contextually typed right now
                 // (The inferred type here will be void, but the old declaration emitter printed `any`, so this replicates that)
-                return ts.createKeywordTypeNode(120 /* AnyKeyword */);
+                return ts.createKeywordTypeNode(121 /* AnyKeyword */);
             }
             errorNameNode = node.name;
             var oldDiag;
@@ -81588,12 +84012,12 @@ var ts;
                 oldDiag = getSymbolAccessibilityDiagnostic;
                 getSymbolAccessibilityDiagnostic = ts.createGetSymbolAccessibilityDiagnosticForNode(node);
             }
-            if (node.kind === 237 /* VariableDeclaration */ || node.kind === 186 /* BindingElement */) {
+            if (node.kind === 238 /* VariableDeclaration */ || node.kind === 187 /* BindingElement */) {
                 return cleanup(resolver.createTypeOfDeclaration(node, enclosingDeclaration, declarationEmitNodeBuilderFlags, symbolTracker));
             }
-            if (node.kind === 151 /* Parameter */
-                || node.kind === 154 /* PropertyDeclaration */
-                || node.kind === 153 /* PropertySignature */) {
+            if (node.kind === 152 /* Parameter */
+                || node.kind === 155 /* PropertyDeclaration */
+                || node.kind === 154 /* PropertySignature */) {
                 if (!node.initializer)
                     return cleanup(resolver.createTypeOfDeclaration(node, enclosingDeclaration, declarationEmitNodeBuilderFlags, symbolTracker, shouldUseResolverType));
                 return cleanup(resolver.createTypeOfDeclaration(node, enclosingDeclaration, declarationEmitNodeBuilderFlags, symbolTracker, shouldUseResolverType) || resolver.createTypeOfExpression(node.initializer, enclosingDeclaration, declarationEmitNodeBuilderFlags, symbolTracker));
@@ -81604,26 +84028,26 @@ var ts;
                 if (!suppressNewDiagnosticContexts) {
                     getSymbolAccessibilityDiagnostic = oldDiag;
                 }
-                return returnValue || ts.createKeywordTypeNode(120 /* AnyKeyword */);
+                return returnValue || ts.createKeywordTypeNode(121 /* AnyKeyword */);
             }
         }
         function isDeclarationAndNotVisible(node) {
             node = ts.getParseTreeNode(node);
             switch (node.kind) {
-                case 239 /* FunctionDeclaration */:
-                case 244 /* ModuleDeclaration */:
-                case 241 /* InterfaceDeclaration */:
-                case 240 /* ClassDeclaration */:
-                case 242 /* TypeAliasDeclaration */:
-                case 243 /* EnumDeclaration */:
+                case 240 /* FunctionDeclaration */:
+                case 245 /* ModuleDeclaration */:
+                case 242 /* InterfaceDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
+                case 244 /* EnumDeclaration */:
                     return !resolver.isDeclarationVisible(node);
                 // The following should be doing their own visibility checks based on filtering their members
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     return !getBindingNameVisible(node);
-                case 248 /* ImportEqualsDeclaration */:
-                case 249 /* ImportDeclaration */:
-                case 255 /* ExportDeclaration */:
-                case 254 /* ExportAssignment */:
+                case 249 /* ImportEqualsDeclaration */:
+                case 250 /* ImportDeclaration */:
+                case 256 /* ExportDeclaration */:
+                case 255 /* ExportAssignment */:
                     return false;
             }
             return false;
@@ -81677,7 +84101,7 @@ var ts;
         function rewriteModuleSpecifier(parent, input) {
             if (!input)
                 return undefined; // TODO: GH#18217
-            resultHasExternalModuleIndicator = resultHasExternalModuleIndicator || (parent.kind !== 244 /* ModuleDeclaration */ && parent.kind !== 183 /* ImportType */);
+            resultHasExternalModuleIndicator = resultHasExternalModuleIndicator || (parent.kind !== 245 /* ModuleDeclaration */ && parent.kind !== 184 /* ImportType */);
             if (ts.isStringLiteralLike(input)) {
                 if (isBundledEmit) {
                     var newName = ts.getExternalModuleNameFromDeclaration(context.getEmitHost(), resolver, parent);
@@ -81697,7 +84121,7 @@ var ts;
         function transformImportEqualsDeclaration(decl) {
             if (!resolver.isDeclarationVisible(decl))
                 return;
-            if (decl.moduleReference.kind === 259 /* ExternalModuleReference */) {
+            if (decl.moduleReference.kind === 260 /* ExternalModuleReference */) {
                 // Rewrite external module names if necessary
                 var specifier = ts.getExternalModuleImportEqualsDeclarationExpression(decl);
                 return ts.updateImportEqualsDeclaration(decl, 
@@ -81724,7 +84148,7 @@ var ts;
                 return visibleDefaultBinding && ts.updateImportDeclaration(decl, /*decorators*/ undefined, decl.modifiers, ts.updateImportClause(decl.importClause, visibleDefaultBinding, 
                 /*namedBindings*/ undefined), rewriteModuleSpecifier(decl, decl.moduleSpecifier));
             }
-            if (decl.importClause.namedBindings.kind === 251 /* NamespaceImport */) {
+            if (decl.importClause.namedBindings.kind === 252 /* NamespaceImport */) {
                 // Namespace import (optionally with visible default)
                 var namedBindings = resolver.isDeclarationVisible(decl.importClause.namedBindings) ? decl.importClause.namedBindings : /*namedBindings*/ undefined;
                 return visibleDefaultBinding || namedBindings ? ts.updateImportDeclaration(decl, /*decorators*/ undefined, decl.modifiers, ts.updateImportClause(decl.importClause, visibleDefaultBinding, namedBindings), rewriteModuleSpecifier(decl, decl.moduleSpecifier)) : undefined;
@@ -81759,7 +84183,7 @@ var ts;
                 }
                 var priorNeedsDeclare = needsDeclare;
                 needsDeclare = i.parent && ts.isSourceFile(i.parent) && !(ts.isExternalModule(i.parent) && isBundledEmit);
-                var result = transformTopLevelDeclaration(i, /*privateDeclaration*/ true);
+                var result = transformTopLevelDeclaration(i);
                 needsDeclare = priorNeedsDeclare;
                 lateStatementReplacementMap.set("" + ts.getOriginalNodeId(i), result);
             }
@@ -81772,12 +84196,12 @@ var ts;
                     if (lateStatementReplacementMap.has(key)) {
                         var result = lateStatementReplacementMap.get(key);
                         lateStatementReplacementMap.delete(key);
-                        if (result && ts.isSourceFile(statement.parent)) {
+                        if (result) {
                             if (ts.isArray(result) ? ts.some(result, needsScopeMarker) : needsScopeMarker(result)) {
                                 // Top-level declarations in .d.ts files are always considered exported even without a modifier unless there's an export assignment or specifier
                                 needsScopeFixMarker = true;
                             }
-                            if (ts.isArray(result) ? ts.some(result, isExternalModuleIndicator) : isExternalModuleIndicator(result)) {
+                            if (ts.isSourceFile(statement.parent) && (ts.isArray(result) ? ts.some(result, isExternalModuleIndicator) : isExternalModuleIndicator(result))) {
                                 resultHasExternalModuleIndicator = true;
                             }
                         }
@@ -81832,68 +84256,68 @@ var ts;
                 checkEntityNameVisibility(input.exprName, enclosingDeclaration);
             }
             var oldWithinObjectLiteralType = suppressNewDiagnosticContexts;
-            var shouldEnterSuppressNewDiagnosticsContextContext = ((input.kind === 168 /* TypeLiteral */ || input.kind === 181 /* MappedType */) && input.parent.kind !== 242 /* TypeAliasDeclaration */);
+            var shouldEnterSuppressNewDiagnosticsContextContext = ((input.kind === 169 /* TypeLiteral */ || input.kind === 182 /* MappedType */) && input.parent.kind !== 243 /* TypeAliasDeclaration */);
             if (shouldEnterSuppressNewDiagnosticsContextContext) {
                 // We stop making new diagnostic contexts within object literal types. Unless it's an object type on the RHS of a type alias declaration. Then we do.
                 suppressNewDiagnosticContexts = true;
             }
             if (isProcessedComponent(input)) {
                 switch (input.kind) {
-                    case 211 /* ExpressionWithTypeArguments */: {
+                    case 212 /* ExpressionWithTypeArguments */: {
                         if ((ts.isEntityName(input.expression) || ts.isEntityNameExpression(input.expression))) {
                             checkEntityNameVisibility(input.expression, enclosingDeclaration);
                         }
                         var node = ts.visitEachChild(input, visitDeclarationSubtree, context);
                         return cleanup(ts.updateExpressionWithTypeArguments(node, ts.parenthesizeTypeParameters(node.typeArguments), node.expression));
                     }
-                    case 164 /* TypeReference */: {
+                    case 165 /* TypeReference */: {
                         checkEntityNameVisibility(input.typeName, enclosingDeclaration);
                         var node = ts.visitEachChild(input, visitDeclarationSubtree, context);
                         return cleanup(ts.updateTypeReferenceNode(node, node.typeName, ts.parenthesizeTypeParameters(node.typeArguments)));
                     }
-                    case 161 /* ConstructSignature */:
+                    case 162 /* ConstructSignature */:
                         return cleanup(ts.updateConstructSignature(input, ensureTypeParams(input, input.typeParameters), updateParamsList(input, input.parameters), ensureType(input, input.type)));
-                    case 157 /* Constructor */: {
+                    case 158 /* Constructor */: {
                         var isPrivate = ts.hasModifier(input, 8 /* Private */);
                         // A constructor declaration may not have a type annotation
-                        var ctor = ts.createSignatureDeclaration(157 /* Constructor */, isPrivate ? undefined : ensureTypeParams(input, input.typeParameters), 
+                        var ctor = ts.createSignatureDeclaration(158 /* Constructor */, isPrivate ? undefined : ensureTypeParams(input, input.typeParameters), 
                         // TODO: GH#18217
                         isPrivate ? undefined : updateParamsList(input, input.parameters, 0 /* None */), 
                         /*type*/ undefined);
                         ctor.modifiers = ts.createNodeArray(ensureModifiers(input));
                         return cleanup(ctor);
                     }
-                    case 156 /* MethodDeclaration */: {
-                        var sig = ts.createSignatureDeclaration(155 /* MethodSignature */, ensureTypeParams(input, input.typeParameters), updateParamsList(input, input.parameters), ensureType(input, input.type));
+                    case 157 /* MethodDeclaration */: {
+                        var sig = ts.createSignatureDeclaration(156 /* MethodSignature */, ensureTypeParams(input, input.typeParameters), updateParamsList(input, input.parameters), ensureType(input, input.type));
                         sig.name = input.name;
                         sig.modifiers = ts.createNodeArray(ensureModifiers(input));
                         sig.questionToken = input.questionToken;
                         return cleanup(sig);
                     }
-                    case 158 /* GetAccessor */: {
+                    case 159 /* GetAccessor */: {
                         var newNode = ensureAccessor(input);
                         return cleanup(newNode);
                     }
-                    case 159 /* SetAccessor */: {
+                    case 160 /* SetAccessor */: {
                         var newNode = ensureAccessor(input);
                         return cleanup(newNode);
                     }
-                    case 154 /* PropertyDeclaration */:
+                    case 155 /* PropertyDeclaration */:
                         return cleanup(ts.updateProperty(input, 
                         /*decorators*/ undefined, ensureModifiers(input), input.name, input.questionToken, !ts.hasModifier(input, 8 /* Private */) ? ensureType(input, input.type) : undefined, ensureNoInitializer(input)));
-                    case 153 /* PropertySignature */:
+                    case 154 /* PropertySignature */:
                         return cleanup(ts.updatePropertySignature(input, ensureModifiers(input), input.name, input.questionToken, !ts.hasModifier(input, 8 /* Private */) ? ensureType(input, input.type) : undefined, ensureNoInitializer(input)));
-                    case 155 /* MethodSignature */: {
+                    case 156 /* MethodSignature */: {
                         return cleanup(ts.updateMethodSignature(input, ensureTypeParams(input, input.typeParameters), updateParamsList(input, input.parameters), ensureType(input, input.type), input.name, input.questionToken));
                     }
-                    case 160 /* CallSignature */: {
+                    case 161 /* CallSignature */: {
                         return cleanup(ts.updateCallSignature(input, ensureTypeParams(input, input.typeParameters), updateParamsList(input, input.parameters), ensureType(input, input.type)));
                     }
-                    case 162 /* IndexSignature */: {
+                    case 163 /* IndexSignature */: {
                         return cleanup(ts.updateIndexSignature(input, 
-                        /*decorators*/ undefined, ensureModifiers(input), updateParamsList(input, input.parameters), ts.visitNode(input.type, visitDeclarationSubtree) || ts.createKeywordTypeNode(120 /* AnyKeyword */)));
+                        /*decorators*/ undefined, ensureModifiers(input), updateParamsList(input, input.parameters), ts.visitNode(input.type, visitDeclarationSubtree) || ts.createKeywordTypeNode(121 /* AnyKeyword */)));
                     }
-                    case 237 /* VariableDeclaration */: {
+                    case 238 /* VariableDeclaration */: {
                         if (ts.isBindingPattern(input.name)) {
                             return recreateBindingPattern(input.name);
                         }
@@ -81901,13 +84325,13 @@ var ts;
                         suppressNewDiagnosticContexts = true; // Variable declaration types also suppress new diagnostic contexts, provided the contexts wouldn't be made for binding pattern types
                         return cleanup(ts.updateVariableDeclaration(input, input.name, ensureType(input, input.type), ensureNoInitializer(input)));
                     }
-                    case 150 /* TypeParameter */: {
+                    case 151 /* TypeParameter */: {
                         if (isPrivateMethodTypeParameter(input) && (input.default || input.constraint)) {
                             return cleanup(ts.updateTypeParameterDeclaration(input, input.name, /*constraint*/ undefined, /*defaultType*/ undefined));
                         }
                         return cleanup(ts.visitEachChild(input, visitDeclarationSubtree, context));
                     }
-                    case 175 /* ConditionalType */: {
+                    case 176 /* ConditionalType */: {
                         // We have to process conditional types in a special way because for visibility purposes we need to push a new enclosingDeclaration
                         // just for the `infer` types in the true branch. It's an implicit declaration scope that only applies to _part_ of the type.
                         var checkType = ts.visitNode(input.checkType, visitDeclarationSubtree);
@@ -81919,13 +84343,13 @@ var ts;
                         var falseType = ts.visitNode(input.falseType, visitDeclarationSubtree);
                         return cleanup(ts.updateConditionalTypeNode(input, checkType, extendsType, trueType, falseType));
                     }
-                    case 165 /* FunctionType */: {
+                    case 166 /* FunctionType */: {
                         return cleanup(ts.updateFunctionTypeNode(input, ts.visitNodes(input.typeParameters, visitDeclarationSubtree), updateParamsList(input, input.parameters), ts.visitNode(input.type, visitDeclarationSubtree)));
                     }
-                    case 166 /* ConstructorType */: {
+                    case 167 /* ConstructorType */: {
                         return cleanup(ts.updateConstructorTypeNode(input, ts.visitNodes(input.typeParameters, visitDeclarationSubtree), updateParamsList(input, input.parameters), ts.visitNode(input.type, visitDeclarationSubtree)));
                     }
-                    case 183 /* ImportType */: {
+                    case 184 /* ImportType */: {
                         if (!ts.isLiteralImportTypeNode(input))
                             return cleanup(input);
                         return cleanup(ts.updateImportTypeNode(input, ts.updateLiteralTypeNode(input.argument, rewriteModuleSpecifier(input, input.argument.literal)), input.qualifier, ts.visitNodes(input.typeArguments, visitDeclarationSubtree, ts.isTypeNode), input.isTypeOf));
@@ -81954,7 +84378,7 @@ var ts;
             }
         }
         function isPrivateMethodTypeParameter(node) {
-            return node.parent.kind === 156 /* MethodDeclaration */ && ts.hasModifier(node.parent, 8 /* Private */);
+            return node.parent.kind === 157 /* MethodDeclaration */ && ts.hasModifier(node.parent, 8 /* Private */);
         }
         function visitDeclarationStatements(input) {
             if (!isPreservedDeclarationStatement(input)) {
@@ -81964,22 +84388,22 @@ var ts;
             if (shouldStripInternal(input))
                 return;
             switch (input.kind) {
-                case 255 /* ExportDeclaration */: {
+                case 256 /* ExportDeclaration */: {
                     if (ts.isSourceFile(input.parent)) {
                         resultHasExternalModuleIndicator = true;
-                        resultHasScopeMarker = true;
                     }
+                    resultHasScopeMarker = true;
                     // Always visible if the parent node isn't dropped for being not visible
                     // Rewrite external module names if necessary
                     return ts.updateExportDeclaration(input, /*decorators*/ undefined, input.modifiers, input.exportClause, rewriteModuleSpecifier(input, input.moduleSpecifier));
                 }
-                case 254 /* ExportAssignment */: {
+                case 255 /* ExportAssignment */: {
                     // Always visible if the parent node isn't dropped for being not visible
                     if (ts.isSourceFile(input.parent)) {
                         resultHasExternalModuleIndicator = true;
-                        resultHasScopeMarker = true;
                     }
-                    if (input.expression.kind === 72 /* Identifier */) {
+                    resultHasScopeMarker = true;
+                    if (input.expression.kind === 73 /* Identifier */) {
                         return input;
                     }
                     else {
@@ -81989,7 +84413,7 @@ var ts;
                             errorNode: input
                         }); };
                         var varDecl = ts.createVariableDeclaration(newId, resolver.createTypeOfExpression(input.expression, input, declarationEmitNodeBuilderFlags, symbolTracker), /*initializer*/ undefined);
-                        var statement = ts.createVariableStatement(needsDeclare ? [ts.createModifier(125 /* DeclareKeyword */)] : [], ts.createVariableDeclarationList([varDecl], 2 /* Const */));
+                        var statement = ts.createVariableStatement(needsDeclare ? [ts.createModifier(126 /* DeclareKeyword */)] : [], ts.createVariableDeclarationList([varDecl], 2 /* Const */));
                         return [statement, ts.updateExportAssignment(input, input.decorators, input.modifiers, newId)];
                     }
                 }
@@ -81999,14 +84423,25 @@ var ts;
             lateStatementReplacementMap.set("" + ts.getOriginalNodeId(input), result);
             return input;
         }
-        function transformTopLevelDeclaration(input, isPrivate) {
+        function stripExportModifiers(statement) {
+            if (ts.isImportEqualsDeclaration(statement) || ts.hasModifier(statement, 512 /* Default */)) {
+                // `export import` statements should remain as-is, as imports are _not_ implicitly exported in an ambient namespace
+                // Likewise, `export default` classes and the like and just be `default`, so we preserve their `export` modifiers, too
+                return statement;
+            }
+            var clone = ts.getMutableClone(statement);
+            var modifiers = ts.createModifiersFromModifierFlags(ts.getModifierFlags(statement) & (3071 /* All */ ^ 1 /* Export */));
+            clone.modifiers = modifiers.length ? ts.createNodeArray(modifiers) : undefined;
+            return clone;
+        }
+        function transformTopLevelDeclaration(input) {
             if (shouldStripInternal(input))
                 return;
             switch (input.kind) {
-                case 248 /* ImportEqualsDeclaration */: {
+                case 249 /* ImportEqualsDeclaration */: {
                     return transformImportEqualsDeclaration(input);
                 }
-                case 249 /* ImportDeclaration */: {
+                case 250 /* ImportDeclaration */: {
                     return transformImportDeclaration(input);
                 }
             }
@@ -82027,51 +84462,97 @@ var ts;
             }
             var previousNeedsDeclare = needsDeclare;
             switch (input.kind) {
-                case 242 /* TypeAliasDeclaration */: // Type aliases get `declare`d if need be (for legacy support), but that's all
+                case 243 /* TypeAliasDeclaration */: // Type aliases get `declare`d if need be (for legacy support), but that's all
                     return cleanup(ts.updateTypeAliasDeclaration(input, 
-                    /*decorators*/ undefined, ensureModifiers(input, isPrivate), input.name, ts.visitNodes(input.typeParameters, visitDeclarationSubtree, ts.isTypeParameterDeclaration), ts.visitNode(input.type, visitDeclarationSubtree, ts.isTypeNode)));
-                case 241 /* InterfaceDeclaration */: {
+                    /*decorators*/ undefined, ensureModifiers(input), input.name, ts.visitNodes(input.typeParameters, visitDeclarationSubtree, ts.isTypeParameterDeclaration), ts.visitNode(input.type, visitDeclarationSubtree, ts.isTypeNode)));
+                case 242 /* InterfaceDeclaration */: {
                     return cleanup(ts.updateInterfaceDeclaration(input, 
-                    /*decorators*/ undefined, ensureModifiers(input, isPrivate), input.name, ensureTypeParams(input, input.typeParameters), transformHeritageClauses(input.heritageClauses), ts.visitNodes(input.members, visitDeclarationSubtree)));
+                    /*decorators*/ undefined, ensureModifiers(input), input.name, ensureTypeParams(input, input.typeParameters), transformHeritageClauses(input.heritageClauses), ts.visitNodes(input.members, visitDeclarationSubtree)));
                 }
-                case 239 /* FunctionDeclaration */: {
+                case 240 /* FunctionDeclaration */: {
                     // Generators lose their generator-ness, excepting their return type
                     var clean = cleanup(ts.updateFunctionDeclaration(input, 
-                    /*decorators*/ undefined, ensureModifiers(input, isPrivate), 
+                    /*decorators*/ undefined, ensureModifiers(input), 
                     /*asteriskToken*/ undefined, input.name, ensureTypeParams(input, input.typeParameters), updateParamsList(input, input.parameters), ensureType(input, input.type), 
                     /*body*/ undefined));
                     if (clean && resolver.isExpandoFunctionDeclaration(input)) {
-                        var declarations = ts.mapDefined(resolver.getPropertiesOfContainerFunction(input), function (p) {
+                        var props = resolver.getPropertiesOfContainerFunction(input);
+                        var fakespace_1 = ts.createModuleDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, clean.name || ts.createIdentifier("_default"), ts.createModuleBlock([]), 16 /* Namespace */);
+                        fakespace_1.flags ^= 8 /* Synthesized */; // unset synthesized so it is usable as an enclosing declaration
+                        fakespace_1.parent = enclosingDeclaration;
+                        fakespace_1.locals = ts.createSymbolTable(props);
+                        fakespace_1.symbol = props[0].parent;
+                        var declarations = ts.mapDefined(props, function (p) {
                             if (!ts.isPropertyAccessExpression(p.valueDeclaration)) {
                                 return undefined;
                             }
                             getSymbolAccessibilityDiagnostic = ts.createGetSymbolAccessibilityDiagnosticForNode(p.valueDeclaration);
-                            var type = resolver.createTypeOfDeclaration(p.valueDeclaration, enclosingDeclaration, declarationEmitNodeBuilderFlags, symbolTracker);
+                            var type = resolver.createTypeOfDeclaration(p.valueDeclaration, fakespace_1, declarationEmitNodeBuilderFlags, symbolTracker);
                             getSymbolAccessibilityDiagnostic = oldDiag;
                             var varDecl = ts.createVariableDeclaration(ts.unescapeLeadingUnderscores(p.escapedName), type, /*initializer*/ undefined);
                             return ts.createVariableStatement(/*modifiers*/ undefined, ts.createVariableDeclarationList([varDecl]));
                         });
-                        var namespaceDecl = ts.createModuleDeclaration(/*decorators*/ undefined, ensureModifiers(input, isPrivate), input.name, ts.createModuleBlock(declarations), 16 /* Namespace */);
-                        return [clean, namespaceDecl];
+                        var namespaceDecl = ts.createModuleDeclaration(/*decorators*/ undefined, ensureModifiers(input), input.name, ts.createModuleBlock(declarations), 16 /* Namespace */);
+                        if (!ts.hasModifier(clean, 512 /* Default */)) {
+                            return [clean, namespaceDecl];
+                        }
+                        var modifiers = ts.createModifiersFromModifierFlags((ts.getModifierFlags(clean) & ~513 /* ExportDefault */) | 2 /* Ambient */);
+                        var cleanDeclaration = ts.updateFunctionDeclaration(clean, 
+                        /*decorators*/ undefined, modifiers, 
+                        /*asteriskToken*/ undefined, clean.name, clean.typeParameters, clean.parameters, clean.type, 
+                        /*body*/ undefined);
+                        var namespaceDeclaration = ts.updateModuleDeclaration(namespaceDecl, 
+                        /*decorators*/ undefined, modifiers, namespaceDecl.name, namespaceDecl.body);
+                        var exportDefaultDeclaration = ts.createExportAssignment(
+                        /*decorators*/ undefined, 
+                        /*modifiers*/ undefined, 
+                        /*isExportEquals*/ false, namespaceDecl.name);
+                        if (ts.isSourceFile(input.parent)) {
+                            resultHasExternalModuleIndicator = true;
+                        }
+                        resultHasScopeMarker = true;
+                        return [cleanDeclaration, namespaceDeclaration, exportDefaultDeclaration];
                     }
                     else {
                         return clean;
                     }
                 }
-                case 244 /* ModuleDeclaration */: {
+                case 245 /* ModuleDeclaration */: {
                     needsDeclare = false;
                     var inner = input.body;
-                    if (inner && inner.kind === 245 /* ModuleBlock */) {
+                    if (inner && inner.kind === 246 /* ModuleBlock */) {
+                        var oldNeedsScopeFix = needsScopeFixMarker;
+                        var oldHasScopeFix = resultHasScopeMarker;
+                        resultHasScopeMarker = false;
+                        needsScopeFixMarker = false;
                         var statements = ts.visitNodes(inner.statements, visitDeclarationStatements);
-                        var body = ts.updateModuleBlock(inner, transformAndReplaceLatePaintedStatements(statements));
+                        var lateStatements = transformAndReplaceLatePaintedStatements(statements);
+                        if (input.flags & 4194304 /* Ambient */) {
+                            needsScopeFixMarker = false; // If it was `declare`'d everything is implicitly exported already, ignore late printed "privates"
+                        }
+                        // With the final list of statements, there are 3 possibilities:
+                        // 1. There's an export assignment or export declaration in the namespace - do nothing
+                        // 2. Everything is exported and there are no export assignments or export declarations - strip all export modifiers
+                        // 3. Some things are exported, some are not, and there's no marker - add an empty marker
+                        if (!ts.isGlobalScopeAugmentation(input) && !hasScopeMarker(lateStatements) && !resultHasScopeMarker) {
+                            if (needsScopeFixMarker) {
+                                lateStatements = ts.createNodeArray(lateStatements.concat([createEmptyExports()]));
+                            }
+                            else {
+                                lateStatements = ts.visitNodes(lateStatements, stripExportModifiers);
+                            }
+                        }
+                        var body = ts.updateModuleBlock(inner, lateStatements);
                         needsDeclare = previousNeedsDeclare;
-                        var mods = ensureModifiers(input, isPrivate);
+                        needsScopeFixMarker = oldNeedsScopeFix;
+                        resultHasScopeMarker = oldHasScopeFix;
+                        var mods = ensureModifiers(input);
                         return cleanup(ts.updateModuleDeclaration(input, 
                         /*decorators*/ undefined, mods, ts.isExternalModuleAugmentation(input) ? rewriteModuleSpecifier(input, input.name) : input.name, body));
                     }
                     else {
                         needsDeclare = previousNeedsDeclare;
-                        var mods = ensureModifiers(input, isPrivate);
+                        var mods = ensureModifiers(input);
                         needsDeclare = false;
                         ts.visitNode(inner, visitDeclarationStatements);
                         // eagerly transform nested namespaces (the nesting doesn't need any elision or painting done)
@@ -82082,18 +84563,18 @@ var ts;
                         /*decorators*/ undefined, mods, input.name, body));
                     }
                 }
-                case 240 /* ClassDeclaration */: {
-                    var modifiers = ts.createNodeArray(ensureModifiers(input, isPrivate));
+                case 241 /* ClassDeclaration */: {
+                    var modifiers = ts.createNodeArray(ensureModifiers(input));
                     var typeParameters = ensureTypeParams(input, input.typeParameters);
                     var ctor = ts.getFirstConstructorWithBody(input);
                     var parameterProperties = void 0;
                     if (ctor) {
                         var oldDiag_1 = getSymbolAccessibilityDiagnostic;
                         parameterProperties = ts.compact(ts.flatMap(ctor.parameters, function (param) {
-                            if (!ts.hasModifier(param, 92 /* ParameterPropertyModifier */))
+                            if (!ts.hasModifier(param, 92 /* ParameterPropertyModifier */) || shouldStripInternal(param))
                                 return;
                             getSymbolAccessibilityDiagnostic = ts.createGetSymbolAccessibilityDiagnosticForNode(param);
-                            if (param.name.kind === 72 /* Identifier */) {
+                            if (param.name.kind === 73 /* Identifier */) {
                                 return preserveJsDoc(ts.createProperty(
                                 /*decorators*/ undefined, ensureModifiers(param), param.name, param.questionToken, ensureType(param, param.type), ensureNoInitializer(param)), param);
                             }
@@ -82123,7 +84604,7 @@ var ts;
                     }
                     var members = ts.createNodeArray(ts.concatenate(parameterProperties, ts.visitNodes(input.members, visitDeclarationSubtree)));
                     var extendsClause_1 = ts.getEffectiveBaseTypeNode(input);
-                    if (extendsClause_1 && !ts.isEntityNameExpression(extendsClause_1.expression) && extendsClause_1.expression.kind !== 96 /* NullKeyword */) {
+                    if (extendsClause_1 && !ts.isEntityNameExpression(extendsClause_1.expression) && extendsClause_1.expression.kind !== 97 /* NullKeyword */) {
                         // We must add a temporary declaration for the extends clause expression
                         var oldId = input.name ? ts.unescapeLeadingUnderscores(input.name.escapedText) : "default";
                         var newId_1 = ts.createOptimisticUniqueName(oldId + "_base");
@@ -82133,16 +84614,16 @@ var ts;
                             typeName: input.name
                         }); };
                         var varDecl = ts.createVariableDeclaration(newId_1, resolver.createTypeOfExpression(extendsClause_1.expression, input, declarationEmitNodeBuilderFlags, symbolTracker), /*initializer*/ undefined);
-                        var statement = ts.createVariableStatement(needsDeclare ? [ts.createModifier(125 /* DeclareKeyword */)] : [], ts.createVariableDeclarationList([varDecl], 2 /* Const */));
+                        var statement = ts.createVariableStatement(needsDeclare ? [ts.createModifier(126 /* DeclareKeyword */)] : [], ts.createVariableDeclarationList([varDecl], 2 /* Const */));
                         var heritageClauses = ts.createNodeArray(ts.map(input.heritageClauses, function (clause) {
-                            if (clause.token === 86 /* ExtendsKeyword */) {
+                            if (clause.token === 87 /* ExtendsKeyword */) {
                                 var oldDiag_2 = getSymbolAccessibilityDiagnostic;
                                 getSymbolAccessibilityDiagnostic = ts.createGetSymbolAccessibilityDiagnosticForNode(clause.types[0]);
                                 var newClause = ts.updateHeritageClause(clause, ts.map(clause.types, function (t) { return ts.updateExpressionWithTypeArguments(t, ts.visitNodes(t.typeArguments, visitDeclarationSubtree), newId_1); }));
                                 getSymbolAccessibilityDiagnostic = oldDiag_2;
                                 return newClause;
                             }
-                            return ts.updateHeritageClause(clause, ts.visitNodes(ts.createNodeArray(ts.filter(clause.types, function (t) { return ts.isEntityNameExpression(t.expression) || t.expression.kind === 96 /* NullKeyword */; })), visitDeclarationSubtree));
+                            return ts.updateHeritageClause(clause, ts.visitNodes(ts.createNodeArray(ts.filter(clause.types, function (t) { return ts.isEntityNameExpression(t.expression) || t.expression.kind === 97 /* NullKeyword */; })), visitDeclarationSubtree));
                         }));
                         return [statement, cleanup(ts.updateClassDeclaration(input, 
                             /*decorators*/ undefined, modifiers, input.name, typeParameters, heritageClauses, members))]; // TODO: GH#18217
@@ -82153,11 +84634,11 @@ var ts;
                         /*decorators*/ undefined, modifiers, input.name, typeParameters, heritageClauses, members));
                     }
                 }
-                case 219 /* VariableStatement */: {
-                    return cleanup(transformVariableStatement(input, isPrivate));
+                case 220 /* VariableStatement */: {
+                    return cleanup(transformVariableStatement(input));
                 }
-                case 243 /* EnumDeclaration */: {
-                    return cleanup(ts.updateEnumDeclaration(input, /*decorators*/ undefined, ts.createNodeArray(ensureModifiers(input, isPrivate)), input.name, ts.createNodeArray(ts.mapDefined(input.members, function (m) {
+                case 244 /* EnumDeclaration */: {
+                    return cleanup(ts.updateEnumDeclaration(input, /*decorators*/ undefined, ts.createNodeArray(ensureModifiers(input)), input.name, ts.createNodeArray(ts.mapDefined(input.members, function (m) {
                         if (shouldStripInternal(m))
                             return;
                         // Rewrite enum values to their constants, if available
@@ -82175,7 +84656,7 @@ var ts;
                 if (canProdiceDiagnostic) {
                     getSymbolAccessibilityDiagnostic = oldDiag;
                 }
-                if (input.kind === 244 /* ModuleDeclaration */) {
+                if (input.kind === 245 /* ModuleDeclaration */) {
                     needsDeclare = previousNeedsDeclare;
                 }
                 if (node === input) {
@@ -82184,19 +84665,19 @@ var ts;
                 return node && ts.setOriginalNode(preserveJsDoc(node, input), input);
             }
         }
-        function transformVariableStatement(input, privateDeclaration) {
+        function transformVariableStatement(input) {
             if (!ts.forEach(input.declarationList.declarations, getBindingNameVisible))
                 return;
             var nodes = ts.visitNodes(input.declarationList.declarations, visitDeclarationSubtree);
             if (!ts.length(nodes))
                 return;
-            return ts.updateVariableStatement(input, ts.createNodeArray(ensureModifiers(input, privateDeclaration)), ts.updateVariableDeclarationList(input.declarationList, nodes));
+            return ts.updateVariableStatement(input, ts.createNodeArray(ensureModifiers(input)), ts.updateVariableDeclarationList(input.declarationList, nodes));
         }
         function recreateBindingPattern(d) {
             return ts.flatten(ts.mapDefined(d.elements, function (e) { return recreateBindingElement(e); }));
         }
         function recreateBindingElement(e) {
-            if (e.kind === 210 /* OmittedExpression */) {
+            if (e.kind === 211 /* OmittedExpression */) {
                 return;
             }
             if (e.name) {
@@ -82232,26 +84713,23 @@ var ts;
         function isScopeMarker(node) {
             return ts.isExportAssignment(node) || ts.isExportDeclaration(node);
         }
-        function hasScopeMarker(node) {
-            if (ts.isModuleBlock(node)) {
-                return ts.some(node.statements, isScopeMarker);
-            }
-            return false;
+        function hasScopeMarker(statements) {
+            return ts.some(statements, isScopeMarker);
         }
-        function ensureModifiers(node, privateDeclaration) {
+        function ensureModifiers(node) {
             var currentFlags = ts.getModifierFlags(node);
-            var newFlags = ensureModifierFlags(node, privateDeclaration);
+            var newFlags = ensureModifierFlags(node);
             if (currentFlags === newFlags) {
                 return node.modifiers;
             }
             return ts.createModifiersFromModifierFlags(newFlags);
         }
-        function ensureModifierFlags(node, privateDeclaration) {
+        function ensureModifierFlags(node) {
             var mask = 3071 /* All */ ^ (4 /* Public */ | 256 /* Async */); // No async modifiers in declaration files
             var additions = (needsDeclare && !isAlwaysType(node)) ? 2 /* Ambient */ : 0 /* None */;
-            var parentIsFile = node.parent.kind === 284 /* SourceFile */;
+            var parentIsFile = node.parent.kind === 285 /* SourceFile */;
             if (!parentIsFile || (isBundledEmit && parentIsFile && ts.isExternalModule(node.parent))) {
-                mask ^= ((privateDeclaration || (isBundledEmit && parentIsFile) || hasScopeMarker(node.parent) ? 0 : 1 /* Export */) | 2 /* Ambient */);
+                mask ^= 2 /* Ambient */;
                 additions = 0 /* None */;
             }
             return maskModifierFlags(node, mask, additions);
@@ -82270,7 +84748,7 @@ var ts;
             var prop = ts.createProperty(/*decorators*/ undefined, maskModifiers(node, /*mask*/ undefined, (!accessors.setAccessor) ? 64 /* Readonly */ : 0 /* None */), node.name, node.questionToken, ensureType(node, accessorType), /*initializer*/ undefined);
             var leadingsSyntheticCommentRanges = accessors.secondAccessor && ts.getLeadingCommentRangesOfNode(accessors.secondAccessor, currentSourceFile);
             if (leadingsSyntheticCommentRanges) {
-                var _loop_10 = function (range) {
+                var _loop_15 = function (range) {
                     if (range.kind === 3 /* MultiLineCommentTrivia */) {
                         var text = currentSourceFile.text.slice(range.pos + 2, range.end - 2);
                         var lines = text.split(/\r\n?|\n/g);
@@ -82284,20 +84762,20 @@ var ts;
                 };
                 for (var _i = 0, leadingsSyntheticCommentRanges_1 = leadingsSyntheticCommentRanges; _i < leadingsSyntheticCommentRanges_1.length; _i++) {
                     var range = leadingsSyntheticCommentRanges_1[_i];
-                    _loop_10(range);
+                    _loop_15(range);
                 }
             }
             return prop;
         }
         function transformHeritageClauses(nodes) {
             return ts.createNodeArray(ts.filter(ts.map(nodes, function (clause) { return ts.updateHeritageClause(clause, ts.visitNodes(ts.createNodeArray(ts.filter(clause.types, function (t) {
-                return ts.isEntityNameExpression(t.expression) || (clause.token === 86 /* ExtendsKeyword */ && t.expression.kind === 96 /* NullKeyword */);
+                return ts.isEntityNameExpression(t.expression) || (clause.token === 87 /* ExtendsKeyword */ && t.expression.kind === 97 /* NullKeyword */);
             })), visitDeclarationSubtree)); }), function (clause) { return clause.types && !!clause.types.length; }));
         }
     }
     ts.transformDeclarations = transformDeclarations;
     function isAlwaysType(node) {
-        if (node.kind === 241 /* InterfaceDeclaration */) {
+        if (node.kind === 242 /* InterfaceDeclaration */) {
             return true;
         }
         return false;
@@ -82322,7 +84800,7 @@ var ts;
     }
     function getTypeAnnotationFromAccessor(accessor) {
         if (accessor) {
-            return accessor.kind === 158 /* GetAccessor */
+            return accessor.kind === 159 /* GetAccessor */
                 ? accessor.type // Getter - return type
                 : accessor.parameters.length > 0
                     ? accessor.parameters[0].type // Setter parameter type
@@ -82331,52 +84809,52 @@ var ts;
     }
     function canHaveLiteralInitializer(node) {
         switch (node.kind) {
-            case 154 /* PropertyDeclaration */:
-            case 153 /* PropertySignature */:
+            case 155 /* PropertyDeclaration */:
+            case 154 /* PropertySignature */:
                 return !ts.hasModifier(node, 8 /* Private */);
-            case 151 /* Parameter */:
-            case 237 /* VariableDeclaration */:
+            case 152 /* Parameter */:
+            case 238 /* VariableDeclaration */:
                 return true;
         }
         return false;
     }
     function isPreservedDeclarationStatement(node) {
         switch (node.kind) {
-            case 239 /* FunctionDeclaration */:
-            case 244 /* ModuleDeclaration */:
-            case 248 /* ImportEqualsDeclaration */:
-            case 241 /* InterfaceDeclaration */:
-            case 240 /* ClassDeclaration */:
-            case 242 /* TypeAliasDeclaration */:
-            case 243 /* EnumDeclaration */:
-            case 219 /* VariableStatement */:
-            case 249 /* ImportDeclaration */:
-            case 255 /* ExportDeclaration */:
-            case 254 /* ExportAssignment */:
+            case 240 /* FunctionDeclaration */:
+            case 245 /* ModuleDeclaration */:
+            case 249 /* ImportEqualsDeclaration */:
+            case 242 /* InterfaceDeclaration */:
+            case 241 /* ClassDeclaration */:
+            case 243 /* TypeAliasDeclaration */:
+            case 244 /* EnumDeclaration */:
+            case 220 /* VariableStatement */:
+            case 250 /* ImportDeclaration */:
+            case 256 /* ExportDeclaration */:
+            case 255 /* ExportAssignment */:
                 return true;
         }
         return false;
     }
     function isProcessedComponent(node) {
         switch (node.kind) {
-            case 161 /* ConstructSignature */:
-            case 157 /* Constructor */:
-            case 156 /* MethodDeclaration */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
-            case 154 /* PropertyDeclaration */:
-            case 153 /* PropertySignature */:
-            case 155 /* MethodSignature */:
-            case 160 /* CallSignature */:
-            case 162 /* IndexSignature */:
-            case 237 /* VariableDeclaration */:
-            case 150 /* TypeParameter */:
-            case 211 /* ExpressionWithTypeArguments */:
-            case 164 /* TypeReference */:
-            case 175 /* ConditionalType */:
-            case 165 /* FunctionType */:
-            case 166 /* ConstructorType */:
-            case 183 /* ImportType */:
+            case 162 /* ConstructSignature */:
+            case 158 /* Constructor */:
+            case 157 /* MethodDeclaration */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
+            case 155 /* PropertyDeclaration */:
+            case 154 /* PropertySignature */:
+            case 156 /* MethodSignature */:
+            case 161 /* CallSignature */:
+            case 163 /* IndexSignature */:
+            case 238 /* VariableDeclaration */:
+            case 151 /* TypeParameter */:
+            case 212 /* ExpressionWithTypeArguments */:
+            case 165 /* TypeReference */:
+            case 176 /* ConditionalType */:
+            case 166 /* FunctionType */:
+            case 167 /* ConstructorType */:
+            case 184 /* ImportType */:
                 return true;
         }
         return false;
@@ -82408,17 +84886,28 @@ var ts;
         SyntaxKindFeatureFlags[SyntaxKindFeatureFlags["Substitution"] = 1] = "Substitution";
         SyntaxKindFeatureFlags[SyntaxKindFeatureFlags["EmitNotifications"] = 2] = "EmitNotifications";
     })(SyntaxKindFeatureFlags || (SyntaxKindFeatureFlags = {}));
-    function getTransformers(compilerOptions, customTransformers) {
+    ts.noTransformers = { scriptTransformers: ts.emptyArray, declarationTransformers: ts.emptyArray };
+    function getTransformers(compilerOptions, customTransformers, emitOnlyDtsFiles) {
+        return {
+            scriptTransformers: getScriptTransformers(compilerOptions, customTransformers, emitOnlyDtsFiles),
+            declarationTransformers: getDeclarationTransformers(customTransformers),
+        };
+    }
+    ts.getTransformers = getTransformers;
+    function getScriptTransformers(compilerOptions, customTransformers, emitOnlyDtsFiles) {
+        if (emitOnlyDtsFiles)
+            return ts.emptyArray;
         var jsx = compilerOptions.jsx;
         var languageVersion = ts.getEmitScriptTarget(compilerOptions);
         var moduleKind = ts.getEmitModuleKind(compilerOptions);
         var transformers = [];
-        ts.addRange(transformers, customTransformers && customTransformers.before);
+        ts.addRange(transformers, customTransformers && ts.map(customTransformers.before, wrapScriptTransformerFactory));
         transformers.push(ts.transformTypeScript);
+        transformers.push(ts.transformClassFields);
         if (jsx === 2 /* React */) {
             transformers.push(ts.transformJsx);
         }
-        if (languageVersion < 7 /* ESNext */) {
+        if (languageVersion < 99 /* ESNext */) {
             transformers.push(ts.transformESNext);
         }
         if (languageVersion < 6 /* ES2019 */) {
@@ -82443,10 +84932,38 @@ var ts;
         if (languageVersion < 1 /* ES5 */) {
             transformers.push(ts.transformES5);
         }
-        ts.addRange(transformers, customTransformers && customTransformers.after);
+        ts.addRange(transformers, customTransformers && ts.map(customTransformers.after, wrapScriptTransformerFactory));
         return transformers;
     }
-    ts.getTransformers = getTransformers;
+    function getDeclarationTransformers(customTransformers) {
+        var transformers = [];
+        transformers.push(ts.transformDeclarations);
+        ts.addRange(transformers, customTransformers && ts.map(customTransformers.afterDeclarations, wrapDeclarationTransformerFactory));
+        return transformers;
+    }
+    /**
+     * Wrap a custom script or declaration transformer object in a `Transformer` callback with fallback support for transforming bundles.
+     */
+    function wrapCustomTransformer(transformer) {
+        return function (node) { return ts.isBundle(node) ? transformer.transformBundle(node) : transformer.transformSourceFile(node); };
+    }
+    /**
+     * Wrap a transformer factory that may return a custom script or declaration transformer object.
+     */
+    function wrapCustomTransformerFactory(transformer, handleDefault) {
+        return function (context) {
+            var customTransformer = transformer(context);
+            return typeof customTransformer === "function"
+                ? handleDefault(customTransformer)
+                : wrapCustomTransformer(customTransformer);
+        };
+    }
+    function wrapScriptTransformerFactory(transformer) {
+        return wrapCustomTransformerFactory(transformer, ts.chainBundle);
+    }
+    function wrapDeclarationTransformerFactory(transformer) {
+        return wrapCustomTransformerFactory(transformer, ts.identity);
+    }
     function noEmitSubstitution(_hint, node) {
         return node;
     }
@@ -82466,7 +84983,7 @@ var ts;
      * @param allowDtsFiles A value indicating whether to allow the transformation of .d.ts files.
      */
     function transformNodes(resolver, host, options, nodes, transformers, allowDtsFiles) {
-        var enabledSyntaxKindFeatures = new Array(317 /* Count */);
+        var enabledSyntaxKindFeatures = new Array(319 /* Count */);
         var lexicalEnvironmentVariableDeclarations;
         var lexicalEnvironmentFunctionDeclarations;
         var lexicalEnvironmentVariableDeclarationsStack = [];
@@ -82519,7 +85036,14 @@ var ts;
         }
         ts.performance.mark("beforeTransform");
         // Chain together and initialize each transformer.
-        var transformation = ts.chain.apply(void 0, transformers)(context);
+        var transformersWithContext = transformers.map(function (t) { return t(context); });
+        var transformation = function (node) {
+            for (var _i = 0, transformersWithContext_1 = transformersWithContext; _i < transformersWithContext_1.length; _i++) {
+                var transform = transformersWithContext_1[_i];
+                node = transform(node);
+            }
+            return node;
+        };
         // prevent modification of transformation hooks.
         state = 1 /* Initialized */;
         // Transform each node.
@@ -82671,6 +85195,7 @@ var ts;
                 if (lexicalEnvironmentVariableDeclarations) {
                     var statement = ts.createVariableStatement(
                     /*modifiers*/ undefined, ts.createVariableDeclarationList(lexicalEnvironmentVariableDeclarations));
+                    ts.setEmitFlags(statement, 1048576 /* CustomPrologue */);
                     if (!statements) {
                         statements = [statement];
                     }
@@ -82778,7 +85303,7 @@ var ts;
     /*@internal*/
     function getOutputPathForBuildInfo(options) {
         var configFile = options.configFilePath;
-        if (!configFile || !ts.isIncrementalCompilation(options))
+        if (!ts.isIncrementalCompilation(options))
             return undefined;
         if (options.tsBuildInfoFile)
             return options.tsBuildInfoFile;
@@ -82788,6 +85313,8 @@ var ts;
             buildInfoExtensionLess = ts.removeFileExtension(outPath);
         }
         else {
+            if (!configFile)
+                return undefined;
             var configFileExtensionLess = ts.removeFileExtension(configFile);
             buildInfoExtensionLess = options.outDir ?
                 options.rootDir ?
@@ -82812,7 +85339,7 @@ var ts;
     /*@internal*/
     function getOutputPathsFor(sourceFile, host, forceDtsPaths) {
         var options = host.getCompilerOptions();
-        if (sourceFile.kind === 285 /* Bundle */) {
+        if (sourceFile.kind === 286 /* Bundle */) {
             return getOutputPathsForBundle(options, forceDtsPaths);
         }
         else {
@@ -82855,16 +85382,99 @@ var ts;
         return ".js" /* Js */;
     }
     ts.getOutputExtension = getOutputExtension;
+    function rootDirOfOptions(configFile) {
+        return configFile.options.rootDir || ts.getDirectoryPath(ts.Debug.assertDefined(configFile.options.configFilePath));
+    }
+    function getOutputPathWithoutChangingExt(inputFileName, configFile, ignoreCase, outputDir) {
+        return outputDir ?
+            ts.resolvePath(outputDir, ts.getRelativePathFromDirectory(rootDirOfOptions(configFile), inputFileName, ignoreCase)) :
+            inputFileName;
+    }
+    /* @internal */
+    function getOutputDeclarationFileName(inputFileName, configFile, ignoreCase) {
+        ts.Debug.assert(!ts.fileExtensionIs(inputFileName, ".d.ts" /* Dts */) && ts.hasTSFileExtension(inputFileName));
+        return ts.changeExtension(getOutputPathWithoutChangingExt(inputFileName, configFile, ignoreCase, configFile.options.declarationDir || configFile.options.outDir), ".d.ts" /* Dts */);
+    }
+    ts.getOutputDeclarationFileName = getOutputDeclarationFileName;
+    function getOutputJSFileName(inputFileName, configFile, ignoreCase) {
+        var isJsonFile = ts.fileExtensionIs(inputFileName, ".json" /* Json */);
+        var outputFileName = ts.changeExtension(getOutputPathWithoutChangingExt(inputFileName, configFile, ignoreCase, configFile.options.outDir), isJsonFile ?
+            ".json" /* Json */ :
+            ts.fileExtensionIs(inputFileName, ".tsx" /* Tsx */) && configFile.options.jsx === 1 /* Preserve */ ?
+                ".jsx" /* Jsx */ :
+                ".js" /* Js */);
+        return !isJsonFile || ts.comparePaths(inputFileName, outputFileName, ts.Debug.assertDefined(configFile.options.configFilePath), ignoreCase) !== 0 /* EqualTo */ ?
+            outputFileName :
+            undefined;
+    }
+    /*@internal*/
+    function getAllProjectOutputs(configFile, ignoreCase) {
+        var outputs;
+        var addOutput = function (path) { return path && (outputs || (outputs = [])).push(path); };
+        if (configFile.options.outFile || configFile.options.out) {
+            var _a = getOutputPathsForBundle(configFile.options, /*forceDtsPaths*/ false), jsFilePath = _a.jsFilePath, sourceMapFilePath = _a.sourceMapFilePath, declarationFilePath = _a.declarationFilePath, declarationMapPath = _a.declarationMapPath, buildInfoPath = _a.buildInfoPath;
+            addOutput(jsFilePath);
+            addOutput(sourceMapFilePath);
+            addOutput(declarationFilePath);
+            addOutput(declarationMapPath);
+            addOutput(buildInfoPath);
+        }
+        else {
+            for (var _b = 0, _c = configFile.fileNames; _b < _c.length; _b++) {
+                var inputFileName = _c[_b];
+                if (ts.fileExtensionIs(inputFileName, ".d.ts" /* Dts */))
+                    continue;
+                var js = getOutputJSFileName(inputFileName, configFile, ignoreCase);
+                addOutput(js);
+                if (ts.fileExtensionIs(inputFileName, ".json" /* Json */))
+                    continue;
+                if (configFile.options.sourceMap) {
+                    addOutput(js + ".map");
+                }
+                if (ts.getEmitDeclarations(configFile.options) && ts.hasTSFileExtension(inputFileName)) {
+                    var dts = getOutputDeclarationFileName(inputFileName, configFile, ignoreCase);
+                    addOutput(dts);
+                    if (configFile.options.declarationMap) {
+                        addOutput(dts + ".map");
+                    }
+                }
+            }
+            addOutput(getOutputPathForBuildInfo(configFile.options));
+        }
+        return outputs || ts.emptyArray;
+    }
+    ts.getAllProjectOutputs = getAllProjectOutputs;
+    /*@internal*/
+    function getFirstProjectOutput(configFile, ignoreCase) {
+        if (configFile.options.outFile || configFile.options.out) {
+            var jsFilePath = getOutputPathsForBundle(configFile.options, /*forceDtsPaths*/ false).jsFilePath;
+            return ts.Debug.assertDefined(jsFilePath, "project " + configFile.options.configFilePath + " expected to have at least one output");
+        }
+        for (var _a = 0, _b = configFile.fileNames; _a < _b.length; _a++) {
+            var inputFileName = _b[_a];
+            if (ts.fileExtensionIs(inputFileName, ".d.ts" /* Dts */))
+                continue;
+            var jsFilePath = getOutputJSFileName(inputFileName, configFile, ignoreCase);
+            if (jsFilePath)
+                return jsFilePath;
+        }
+        var buildInfoPath = getOutputPathForBuildInfo(configFile.options);
+        if (buildInfoPath)
+            return buildInfoPath;
+        return ts.Debug.fail("project " + configFile.options.configFilePath + " expected to have at least one output");
+    }
+    ts.getFirstProjectOutput = getFirstProjectOutput;
     /*@internal*/
     // targetSourceFile is when users only want one file in entire project to be emitted. This is used in compileOnSave feature
-    function emitFiles(resolver, host, targetSourceFile, emitOnlyDtsFiles, transformers, declarationTransformers, onlyBuildInfo) {
+    function emitFiles(resolver, host, targetSourceFile, _a, emitOnlyDtsFiles, onlyBuildInfo) {
+        var scriptTransformers = _a.scriptTransformers, declarationTransformers = _a.declarationTransformers;
         var compilerOptions = host.getCompilerOptions();
         var sourceMapDataList = (compilerOptions.sourceMap || compilerOptions.inlineSourceMap || ts.getAreDeclarationMapsEnabled(compilerOptions)) ? [] : undefined;
         var emittedFilesList = compilerOptions.listEmittedFiles ? [] : undefined;
         var emitterDiagnostics = ts.createDiagnosticCollection();
         var newLine = ts.getNewLineCharacter(compilerOptions, function () { return host.getNewLine(); });
         var writer = ts.createTextWriter(newLine);
-        var _a = ts.performance.createTimer("printTime", "beforePrint", "afterPrint"), enter = _a.enter, exit = _a.exit;
+        var _b = ts.performance.createTimer("printTime", "beforePrint", "afterPrint"), enter = _b.enter, exit = _b.exit;
         var bundleBuildInfo;
         var emitSkipped = false;
         var exportedModulesFromDeclarationEmit;
@@ -82881,14 +85491,16 @@ var ts;
         };
         function emitSourceFileOrBundle(_a, sourceFileOrBundle) {
             var jsFilePath = _a.jsFilePath, sourceMapFilePath = _a.sourceMapFilePath, declarationFilePath = _a.declarationFilePath, declarationMapPath = _a.declarationMapPath, buildInfoPath = _a.buildInfoPath;
+            var buildInfoDirectory;
             if (buildInfoPath && sourceFileOrBundle && ts.isBundle(sourceFileOrBundle)) {
+                buildInfoDirectory = ts.getDirectoryPath(ts.getNormalizedAbsolutePath(buildInfoPath, host.getCurrentDirectory()));
                 bundleBuildInfo = {
-                    commonSourceDirectory: host.getCommonSourceDirectory(),
-                    sourceFiles: sourceFileOrBundle.sourceFiles.map(function (file) { return file.fileName; })
+                    commonSourceDirectory: relativeToBuildInfo(host.getCommonSourceDirectory()),
+                    sourceFiles: sourceFileOrBundle.sourceFiles.map(function (file) { return relativeToBuildInfo(ts.getNormalizedAbsolutePath(file.fileName, host.getCurrentDirectory())); })
                 };
             }
-            emitJsFileOrBundle(sourceFileOrBundle, jsFilePath, sourceMapFilePath);
-            emitDeclarationFileOrBundle(sourceFileOrBundle, declarationFilePath, declarationMapPath);
+            emitJsFileOrBundle(sourceFileOrBundle, jsFilePath, sourceMapFilePath, relativeToBuildInfo);
+            emitDeclarationFileOrBundle(sourceFileOrBundle, declarationFilePath, declarationMapPath, relativeToBuildInfo);
             emitBuildInfo(bundleBuildInfo, buildInfoPath);
             if (!emitSkipped && emittedFilesList) {
                 if (!emitOnlyDtsFiles) {
@@ -82909,21 +85521,22 @@ var ts;
                     emittedFilesList.push(declarationMapPath);
                 }
             }
+            function relativeToBuildInfo(path) {
+                return ts.ensurePathIsNonModuleName(ts.getRelativePathFromDirectory(buildInfoDirectory, path, host.getCanonicalFileName));
+            }
         }
         function emitBuildInfo(bundle, buildInfoPath) {
             // Write build information if applicable
             if (!buildInfoPath || targetSourceFile || emitSkipped)
                 return;
             var program = host.getProgramBuildInfo();
-            if (!bundle && !program)
-                return;
             if (host.isEmitBlocked(buildInfoPath) || compilerOptions.noEmit) {
                 emitSkipped = true;
                 return;
             }
             ts.writeFile(host, emitterDiagnostics, buildInfoPath, getBuildInfoText({ bundle: bundle, program: program, version: ts.version }), /*writeByteOrderMark*/ false);
         }
-        function emitJsFileOrBundle(sourceFileOrBundle, jsFilePath, sourceMapFilePath) {
+        function emitJsFileOrBundle(sourceFileOrBundle, jsFilePath, sourceMapFilePath, relativeToBuildInfo) {
             if (!sourceFileOrBundle || emitOnlyDtsFiles || !jsFilePath) {
                 return;
             }
@@ -82933,7 +85546,7 @@ var ts;
                 return;
             }
             // Transform the source files
-            var transform = ts.transformNodes(resolver, host, compilerOptions, [sourceFileOrBundle], transformers, /*allowDtsFiles*/ false);
+            var transform = ts.transformNodes(resolver, host, compilerOptions, [sourceFileOrBundle], scriptTransformers, /*allowDtsFiles*/ false);
             var printerOptions = {
                 removeComments: compilerOptions.removeComments,
                 newLine: compilerOptions.newLine,
@@ -82944,7 +85557,8 @@ var ts;
                 inlineSourceMap: compilerOptions.inlineSourceMap,
                 inlineSources: compilerOptions.inlineSources,
                 extendedDiagnostics: compilerOptions.extendedDiagnostics,
-                writeBundleFileInfo: !!bundleBuildInfo
+                writeBundleFileInfo: !!bundleBuildInfo,
+                relativeToBuildInfo: relativeToBuildInfo
             };
             // Create a printer to print the nodes
             var printer = createPrinter(printerOptions, {
@@ -82961,7 +85575,7 @@ var ts;
             if (bundleBuildInfo)
                 bundleBuildInfo.js = printer.bundleFileInfo;
         }
-        function emitDeclarationFileOrBundle(sourceFileOrBundle, declarationFilePath, declarationMapPath) {
+        function emitDeclarationFileOrBundle(sourceFileOrBundle, declarationFilePath, declarationMapPath, relativeToBuildInfo) {
             if (!sourceFileOrBundle || !(declarationFilePath && !ts.isInJSFile(sourceFileOrBundle))) {
                 return;
             }
@@ -82974,7 +85588,7 @@ var ts;
                 // Do that here when emitting only dts files
                 nonJsFiles.forEach(collectLinkedAliases);
             }
-            var declarationTransform = ts.transformNodes(resolver, host, compilerOptions, inputListOrBundle, ts.concatenate([ts.transformDeclarations], declarationTransformers), /*allowDtsFiles*/ false);
+            var declarationTransform = ts.transformNodes(resolver, host, compilerOptions, inputListOrBundle, declarationTransformers, /*allowDtsFiles*/ false);
             if (ts.length(declarationTransform.diagnostics)) {
                 for (var _a = 0, _b = declarationTransform.diagnostics; _a < _b.length; _a++) {
                     var diagnostic = _b[_a];
@@ -82992,7 +85606,8 @@ var ts;
                 extendedDiagnostics: compilerOptions.extendedDiagnostics,
                 onlyPrintJsDocStyle: true,
                 writeBundleFileInfo: !!bundleBuildInfo,
-                recordInternalSection: !!bundleBuildInfo
+                recordInternalSection: !!bundleBuildInfo,
+                relativeToBuildInfo: relativeToBuildInfo
             };
             var declarationPrinter = createPrinter(printerOptions, {
                 // resolver hooks
@@ -83011,8 +85626,12 @@ var ts;
                     mapRoot: compilerOptions.mapRoot,
                     extendedDiagnostics: compilerOptions.extendedDiagnostics,
                 });
-                if (emitOnlyDtsFiles && declarationTransform.transformed[0].kind === 284 /* SourceFile */) {
-                    var sourceFile = declarationTransform.transformed[0];
+                if (emitOnlyDtsFiles && declarationTransform.transformed[0].kind === 285 /* SourceFile */) {
+                    // Improved narrowing in master/3.6 makes this cast unnecessary, triggering a lint rule.
+                    // But at the same time, the LKG (3.5) necessitates it because it doesn’t narrow.
+                    // Once the LKG is updated to 3.6, this comment, the cast to `SourceFile`, and the
+                    // tslint directive can be all be removed.
+                    var sourceFile = declarationTransform.transformed[0]; // tslint:disable-line
                     exportedModulesFromDeclarationEmit = sourceFile.exportedModulesFromDeclarationEmit;
                 }
             }
@@ -83022,7 +85641,7 @@ var ts;
         }
         function collectLinkedAliases(node) {
             if (ts.isExportAssignment(node)) {
-                if (node.expression.kind === 72 /* Identifier */) {
+                if (node.expression.kind === 73 /* Identifier */) {
                     resolver.collectLinkedAliases(node.expression, /*setVisibility*/ true);
                 }
                 return;
@@ -83034,8 +85653,8 @@ var ts;
             ts.forEachChild(node, collectLinkedAliases);
         }
         function printSourceFileOrBundle(jsFilePath, sourceMapFilePath, sourceFileOrBundle, printer, mapOptions) {
-            var bundle = sourceFileOrBundle.kind === 285 /* Bundle */ ? sourceFileOrBundle : undefined;
-            var sourceFile = sourceFileOrBundle.kind === 284 /* SourceFile */ ? sourceFileOrBundle : undefined;
+            var bundle = sourceFileOrBundle.kind === 286 /* Bundle */ ? sourceFileOrBundle : undefined;
+            var sourceFile = sourceFileOrBundle.kind === 285 /* SourceFile */ ? sourceFileOrBundle : undefined;
             var sourceFiles = bundle ? bundle.sourceFiles : [sourceFile];
             var sourceMapGenerator;
             if (shouldEmitSourceMaps(mapOptions, sourceFileOrBundle)) {
@@ -83076,7 +85695,7 @@ var ts;
         }
         function shouldEmitSourceMaps(mapOptions, sourceFileOrBundle) {
             return (mapOptions.sourceMap || mapOptions.inlineSourceMap)
-                && (sourceFileOrBundle.kind !== 284 /* SourceFile */ || !ts.fileExtensionIs(sourceFileOrBundle.fileName, ".json" /* Json */));
+                && (sourceFileOrBundle.kind !== 285 /* SourceFile */ || !ts.fileExtensionIs(sourceFileOrBundle.fileName, ".json" /* Json */));
         }
         function getSourceRoot(mapOptions) {
             // Normalize source root and make sure it has trailing "/" so that it can be used to combine paths with the
@@ -83184,10 +85803,10 @@ var ts;
         getSymbolOfExternalModuleSpecifier: ts.notImplemented,
         isBindingCapturedByNode: ts.notImplemented,
     };
-    function createSourceFilesFromBundleBuildInfo(bundle) {
+    function createSourceFilesFromBundleBuildInfo(bundle, buildInfoDirectory, host) {
         var sourceFiles = bundle.sourceFiles.map(function (fileName) {
-            var sourceFile = ts.createNode(284 /* SourceFile */, 0, 0);
-            sourceFile.fileName = fileName;
+            var sourceFile = ts.createNode(285 /* SourceFile */, 0, 0);
+            sourceFile.fileName = ts.getRelativePathFromDirectory(host.getCurrentDirectory(), ts.getNormalizedAbsolutePath(fileName, buildInfoDirectory), !host.useCaseSensitiveFileNames());
             sourceFile.text = "";
             sourceFile.statements = ts.createNodeArray();
             return sourceFile;
@@ -83198,7 +85817,7 @@ var ts;
             sourceFile.text = prologueInfo.text;
             sourceFile.end = prologueInfo.text.length;
             sourceFile.statements = ts.createNodeArray(prologueInfo.directives.map(function (directive) {
-                var statement = ts.createNode(221 /* ExpressionStatement */, directive.pos, directive.end);
+                var statement = ts.createNode(222 /* ExpressionStatement */, directive.pos, directive.end);
                 statement.expression = ts.createNode(10 /* StringLiteral */, directive.expression.pos, directive.expression.end);
                 statement.expression.text = directive.expression.text;
                 return statement;
@@ -83207,7 +85826,7 @@ var ts;
         return sourceFiles;
     }
     /*@internal*/
-    function emitUsingBuildInfo(config, host, getCommandLine) {
+    function emitUsingBuildInfo(config, host, getCommandLine, customTransformers) {
         var _a = getOutputPathsForBundle(config.options, /*forceDtsPaths*/ false), buildInfoPath = _a.buildInfoPath, jsFilePath = _a.jsFilePath, sourceMapFilePath = _a.sourceMapFilePath, declarationFilePath = _a.declarationFilePath, declarationMapPath = _a.declarationMapPath;
         var buildInfoText = host.readFile(ts.Debug.assertDefined(buildInfoPath));
         if (!buildInfoText)
@@ -83230,23 +85849,25 @@ var ts;
         var buildInfo = getBuildInfo(buildInfoText);
         if (!buildInfo.bundle || !buildInfo.bundle.js || (declarationText && !buildInfo.bundle.dts))
             return buildInfoPath;
+        var buildInfoDirectory = ts.getDirectoryPath(ts.getNormalizedAbsolutePath(buildInfoPath, host.getCurrentDirectory()));
         var ownPrependInput = ts.createInputFiles(jsFileText, declarationText, sourceMapFilePath, sourceMapText, declarationMapPath, declarationMapText, jsFilePath, declarationFilePath, buildInfoPath, buildInfo, 
         /*onlyOwnText*/ true);
         var outputFiles = [];
         var prependNodes = ts.createPrependNodes(config.projectReferences, getCommandLine, function (f) { return host.readFile(f); });
-        var sourceFilesForJsEmit = createSourceFilesFromBundleBuildInfo(buildInfo.bundle);
+        var sourceFilesForJsEmit = createSourceFilesFromBundleBuildInfo(buildInfo.bundle, buildInfoDirectory, host);
         var emitHost = {
             getPrependNodes: ts.memoize(function () { return prependNodes.concat([ownPrependInput]); }),
             getCanonicalFileName: host.getCanonicalFileName,
-            getCommonSourceDirectory: function () { return buildInfo.bundle.commonSourceDirectory; },
+            getCommonSourceDirectory: function () { return ts.getNormalizedAbsolutePath(buildInfo.bundle.commonSourceDirectory, buildInfoDirectory); },
             getCompilerOptions: function () { return config.options; },
             getCurrentDirectory: function () { return host.getCurrentDirectory(); },
             getNewLine: function () { return host.getNewLine(); },
-            getSourceFile: function () { return undefined; },
-            getSourceFileByPath: function () { return undefined; },
+            getSourceFile: ts.returnUndefined,
+            getSourceFileByPath: ts.returnUndefined,
             getSourceFiles: function () { return sourceFilesForJsEmit; },
             getLibFileFromReference: ts.notImplemented,
             isSourceFileFromExternalLibrary: ts.returnFalse,
+            getResolvedProjectReferenceToRedirect: ts.returnUndefined,
             writeFile: function (name, text, writeByteOrderMark) {
                 switch (name) {
                     case jsFilePath:
@@ -83287,9 +85908,11 @@ var ts;
             fileExists: function (f) { return host.fileExists(f); },
             directoryExists: host.directoryExists && (function (f) { return host.directoryExists(f); }),
             useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); },
-            getProgramBuildInfo: function () { return undefined; }
+            getProgramBuildInfo: ts.returnUndefined,
+            getSourceFileFromReference: ts.returnUndefined,
         };
-        emitFiles(ts.notImplementedResolver, emitHost, /*targetSourceFile*/ undefined, /*emitOnlyDtsFiles*/ false, ts.getTransformers(config.options));
+        emitFiles(ts.notImplementedResolver, emitHost, 
+        /*targetSourceFile*/ undefined, ts.getTransformers(config.options, customTransformers));
         return outputFiles;
     }
     ts.emitUsingBuildInfo = emitUsingBuildInfo;
@@ -83322,6 +85945,7 @@ var ts;
         var write = writeBase;
         var isOwnFileEmit;
         var bundleFileInfo = printerOptions.writeBundleFileInfo ? { sections: [] } : undefined;
+        var relativeToBuildInfo = bundleFileInfo ? ts.Debug.assertDefined(printerOptions.relativeToBuildInfo) : undefined;
         var recordInternalSection = printerOptions.recordInternalSection;
         var sourceFileTextPos = 0;
         var sourceFileTextKind = "text" /* Text */;
@@ -83366,9 +85990,9 @@ var ts;
                     break;
             }
             switch (node.kind) {
-                case 284 /* SourceFile */: return printFile(node);
-                case 285 /* Bundle */: return printBundle(node);
-                case 286 /* UnparsedSource */: return printUnparsedSource(node);
+                case 285 /* SourceFile */: return printFile(node);
+                case 286 /* Bundle */: return printBundle(node);
+                case 287 /* UnparsedSource */: return printUnparsedSource(node);
             }
             writeNode(hint, node, sourceFile, beginPrint());
             return endPrint();
@@ -83471,7 +86095,13 @@ var ts;
                         (_a = bundleFileInfo.sections).push.apply(_a, newSections);
                     else {
                         newSections.forEach(function (section) { return ts.Debug.assert(ts.isBundleFileTextLike(section)); });
-                        bundleFileInfo.sections.push({ pos: pos, end: writer.getTextPos(), kind: "prepend" /* Prepend */, data: prepend.fileName, texts: newSections });
+                        bundleFileInfo.sections.push({
+                            pos: pos,
+                            end: writer.getTextPos(),
+                            kind: "prepend" /* Prepend */,
+                            data: relativeToBuildInfo(prepend.fileName),
+                            texts: newSections
+                        });
                     }
                 }
             }
@@ -83598,12 +86228,12 @@ var ts;
                     }
                 // falls through
                 case 2 /* Comments */:
-                    if (!commentsDisabled && node.kind !== 284 /* SourceFile */) {
+                    if (!commentsDisabled && node.kind !== 285 /* SourceFile */) {
                         return pipelineEmitWithComments;
                     }
                 // falls through
                 case 3 /* SourceMaps */:
-                    if (!sourceMapsDisabled && node.kind !== 284 /* SourceFile */ && !ts.isInJsonFile(node)) {
+                    if (!sourceMapsDisabled && node.kind !== 285 /* SourceFile */ && !ts.isInJsonFile(node)) {
                         return pipelineEmitWithSourceMap;
                     }
                 // falls through
@@ -83640,272 +86270,272 @@ var ts;
                     case 16 /* TemplateMiddle */:
                     case 17 /* TemplateTail */:
                         return emitLiteral(node);
-                    case 286 /* UnparsedSource */:
-                    case 280 /* UnparsedPrepend */:
+                    case 287 /* UnparsedSource */:
+                    case 281 /* UnparsedPrepend */:
                         return emitUnparsedSourceOrPrepend(node);
-                    case 279 /* UnparsedPrologue */:
+                    case 280 /* UnparsedPrologue */:
                         return writeUnparsedNode(node);
-                    case 281 /* UnparsedText */:
-                    case 282 /* UnparsedInternalText */:
+                    case 282 /* UnparsedText */:
+                    case 283 /* UnparsedInternalText */:
                         return emitUnparsedTextLike(node);
-                    case 283 /* UnparsedSyntheticReference */:
+                    case 284 /* UnparsedSyntheticReference */:
                         return emitUnparsedSyntheticReference(node);
                     // Identifiers
-                    case 72 /* Identifier */:
+                    case 73 /* Identifier */:
                         return emitIdentifier(node);
                     // Parse tree nodes
                     // Names
-                    case 148 /* QualifiedName */:
+                    case 149 /* QualifiedName */:
                         return emitQualifiedName(node);
-                    case 149 /* ComputedPropertyName */:
+                    case 150 /* ComputedPropertyName */:
                         return emitComputedPropertyName(node);
                     // Signature elements
-                    case 150 /* TypeParameter */:
+                    case 151 /* TypeParameter */:
                         return emitTypeParameter(node);
-                    case 151 /* Parameter */:
+                    case 152 /* Parameter */:
                         return emitParameter(node);
-                    case 152 /* Decorator */:
+                    case 153 /* Decorator */:
                         return emitDecorator(node);
                     // Type members
-                    case 153 /* PropertySignature */:
+                    case 154 /* PropertySignature */:
                         return emitPropertySignature(node);
-                    case 154 /* PropertyDeclaration */:
+                    case 155 /* PropertyDeclaration */:
                         return emitPropertyDeclaration(node);
-                    case 155 /* MethodSignature */:
+                    case 156 /* MethodSignature */:
                         return emitMethodSignature(node);
-                    case 156 /* MethodDeclaration */:
+                    case 157 /* MethodDeclaration */:
                         return emitMethodDeclaration(node);
-                    case 157 /* Constructor */:
+                    case 158 /* Constructor */:
                         return emitConstructor(node);
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
                         return emitAccessorDeclaration(node);
-                    case 160 /* CallSignature */:
+                    case 161 /* CallSignature */:
                         return emitCallSignature(node);
-                    case 161 /* ConstructSignature */:
+                    case 162 /* ConstructSignature */:
                         return emitConstructSignature(node);
-                    case 162 /* IndexSignature */:
+                    case 163 /* IndexSignature */:
                         return emitIndexSignature(node);
                     // Types
-                    case 163 /* TypePredicate */:
+                    case 164 /* TypePredicate */:
                         return emitTypePredicate(node);
-                    case 164 /* TypeReference */:
+                    case 165 /* TypeReference */:
                         return emitTypeReference(node);
-                    case 165 /* FunctionType */:
+                    case 166 /* FunctionType */:
                         return emitFunctionType(node);
-                    case 294 /* JSDocFunctionType */:
+                    case 295 /* JSDocFunctionType */:
                         return emitJSDocFunctionType(node);
-                    case 166 /* ConstructorType */:
+                    case 167 /* ConstructorType */:
                         return emitConstructorType(node);
-                    case 167 /* TypeQuery */:
+                    case 168 /* TypeQuery */:
                         return emitTypeQuery(node);
-                    case 168 /* TypeLiteral */:
+                    case 169 /* TypeLiteral */:
                         return emitTypeLiteral(node);
-                    case 169 /* ArrayType */:
+                    case 170 /* ArrayType */:
                         return emitArrayType(node);
-                    case 170 /* TupleType */:
+                    case 171 /* TupleType */:
                         return emitTupleType(node);
-                    case 171 /* OptionalType */:
+                    case 172 /* OptionalType */:
                         return emitOptionalType(node);
-                    case 173 /* UnionType */:
+                    case 174 /* UnionType */:
                         return emitUnionType(node);
-                    case 174 /* IntersectionType */:
+                    case 175 /* IntersectionType */:
                         return emitIntersectionType(node);
-                    case 175 /* ConditionalType */:
+                    case 176 /* ConditionalType */:
                         return emitConditionalType(node);
-                    case 176 /* InferType */:
+                    case 177 /* InferType */:
                         return emitInferType(node);
-                    case 177 /* ParenthesizedType */:
+                    case 178 /* ParenthesizedType */:
                         return emitParenthesizedType(node);
-                    case 211 /* ExpressionWithTypeArguments */:
+                    case 212 /* ExpressionWithTypeArguments */:
                         return emitExpressionWithTypeArguments(node);
-                    case 178 /* ThisType */:
+                    case 179 /* ThisType */:
                         return emitThisType();
-                    case 179 /* TypeOperator */:
+                    case 180 /* TypeOperator */:
                         return emitTypeOperator(node);
-                    case 180 /* IndexedAccessType */:
+                    case 181 /* IndexedAccessType */:
                         return emitIndexedAccessType(node);
-                    case 181 /* MappedType */:
+                    case 182 /* MappedType */:
                         return emitMappedType(node);
-                    case 182 /* LiteralType */:
+                    case 183 /* LiteralType */:
                         return emitLiteralType(node);
-                    case 183 /* ImportType */:
+                    case 184 /* ImportType */:
                         return emitImportTypeNode(node);
-                    case 289 /* JSDocAllType */:
+                    case 290 /* JSDocAllType */:
                         writePunctuation("*");
                         return;
-                    case 290 /* JSDocUnknownType */:
+                    case 291 /* JSDocUnknownType */:
                         writePunctuation("?");
                         return;
-                    case 291 /* JSDocNullableType */:
+                    case 292 /* JSDocNullableType */:
                         return emitJSDocNullableType(node);
-                    case 292 /* JSDocNonNullableType */:
+                    case 293 /* JSDocNonNullableType */:
                         return emitJSDocNonNullableType(node);
-                    case 293 /* JSDocOptionalType */:
+                    case 294 /* JSDocOptionalType */:
                         return emitJSDocOptionalType(node);
-                    case 172 /* RestType */:
-                    case 295 /* JSDocVariadicType */:
+                    case 173 /* RestType */:
+                    case 296 /* JSDocVariadicType */:
                         return emitRestOrJSDocVariadicType(node);
                     // Binding patterns
-                    case 184 /* ObjectBindingPattern */:
+                    case 185 /* ObjectBindingPattern */:
                         return emitObjectBindingPattern(node);
-                    case 185 /* ArrayBindingPattern */:
+                    case 186 /* ArrayBindingPattern */:
                         return emitArrayBindingPattern(node);
-                    case 186 /* BindingElement */:
+                    case 187 /* BindingElement */:
                         return emitBindingElement(node);
                     // Misc
-                    case 216 /* TemplateSpan */:
+                    case 217 /* TemplateSpan */:
                         return emitTemplateSpan(node);
-                    case 217 /* SemicolonClassElement */:
+                    case 218 /* SemicolonClassElement */:
                         return emitSemicolonClassElement();
                     // Statements
-                    case 218 /* Block */:
+                    case 219 /* Block */:
                         return emitBlock(node);
-                    case 219 /* VariableStatement */:
+                    case 220 /* VariableStatement */:
                         return emitVariableStatement(node);
-                    case 220 /* EmptyStatement */:
+                    case 221 /* EmptyStatement */:
                         return emitEmptyStatement(/*isEmbeddedStatement*/ false);
-                    case 221 /* ExpressionStatement */:
+                    case 222 /* ExpressionStatement */:
                         return emitExpressionStatement(node);
-                    case 222 /* IfStatement */:
+                    case 223 /* IfStatement */:
                         return emitIfStatement(node);
-                    case 223 /* DoStatement */:
+                    case 224 /* DoStatement */:
                         return emitDoStatement(node);
-                    case 224 /* WhileStatement */:
+                    case 225 /* WhileStatement */:
                         return emitWhileStatement(node);
-                    case 225 /* ForStatement */:
+                    case 226 /* ForStatement */:
                         return emitForStatement(node);
-                    case 226 /* ForInStatement */:
+                    case 227 /* ForInStatement */:
                         return emitForInStatement(node);
-                    case 227 /* ForOfStatement */:
+                    case 228 /* ForOfStatement */:
                         return emitForOfStatement(node);
-                    case 228 /* ContinueStatement */:
+                    case 229 /* ContinueStatement */:
                         return emitContinueStatement(node);
-                    case 229 /* BreakStatement */:
+                    case 230 /* BreakStatement */:
                         return emitBreakStatement(node);
-                    case 230 /* ReturnStatement */:
+                    case 231 /* ReturnStatement */:
                         return emitReturnStatement(node);
-                    case 231 /* WithStatement */:
+                    case 232 /* WithStatement */:
                         return emitWithStatement(node);
-                    case 232 /* SwitchStatement */:
+                    case 233 /* SwitchStatement */:
                         return emitSwitchStatement(node);
-                    case 233 /* LabeledStatement */:
+                    case 234 /* LabeledStatement */:
                         return emitLabeledStatement(node);
-                    case 234 /* ThrowStatement */:
+                    case 235 /* ThrowStatement */:
                         return emitThrowStatement(node);
-                    case 235 /* TryStatement */:
+                    case 236 /* TryStatement */:
                         return emitTryStatement(node);
-                    case 236 /* DebuggerStatement */:
+                    case 237 /* DebuggerStatement */:
                         return emitDebuggerStatement(node);
                     // Declarations
-                    case 237 /* VariableDeclaration */:
+                    case 238 /* VariableDeclaration */:
                         return emitVariableDeclaration(node);
-                    case 238 /* VariableDeclarationList */:
+                    case 239 /* VariableDeclarationList */:
                         return emitVariableDeclarationList(node);
-                    case 239 /* FunctionDeclaration */:
+                    case 240 /* FunctionDeclaration */:
                         return emitFunctionDeclaration(node);
-                    case 240 /* ClassDeclaration */:
+                    case 241 /* ClassDeclaration */:
                         return emitClassDeclaration(node);
-                    case 241 /* InterfaceDeclaration */:
+                    case 242 /* InterfaceDeclaration */:
                         return emitInterfaceDeclaration(node);
-                    case 242 /* TypeAliasDeclaration */:
+                    case 243 /* TypeAliasDeclaration */:
                         return emitTypeAliasDeclaration(node);
-                    case 243 /* EnumDeclaration */:
+                    case 244 /* EnumDeclaration */:
                         return emitEnumDeclaration(node);
-                    case 244 /* ModuleDeclaration */:
+                    case 245 /* ModuleDeclaration */:
                         return emitModuleDeclaration(node);
-                    case 245 /* ModuleBlock */:
+                    case 246 /* ModuleBlock */:
                         return emitModuleBlock(node);
-                    case 246 /* CaseBlock */:
+                    case 247 /* CaseBlock */:
                         return emitCaseBlock(node);
-                    case 247 /* NamespaceExportDeclaration */:
+                    case 248 /* NamespaceExportDeclaration */:
                         return emitNamespaceExportDeclaration(node);
-                    case 248 /* ImportEqualsDeclaration */:
+                    case 249 /* ImportEqualsDeclaration */:
                         return emitImportEqualsDeclaration(node);
-                    case 249 /* ImportDeclaration */:
+                    case 250 /* ImportDeclaration */:
                         return emitImportDeclaration(node);
-                    case 250 /* ImportClause */:
+                    case 251 /* ImportClause */:
                         return emitImportClause(node);
-                    case 251 /* NamespaceImport */:
+                    case 252 /* NamespaceImport */:
                         return emitNamespaceImport(node);
-                    case 252 /* NamedImports */:
+                    case 253 /* NamedImports */:
                         return emitNamedImports(node);
-                    case 253 /* ImportSpecifier */:
+                    case 254 /* ImportSpecifier */:
                         return emitImportSpecifier(node);
-                    case 254 /* ExportAssignment */:
+                    case 255 /* ExportAssignment */:
                         return emitExportAssignment(node);
-                    case 255 /* ExportDeclaration */:
+                    case 256 /* ExportDeclaration */:
                         return emitExportDeclaration(node);
-                    case 256 /* NamedExports */:
+                    case 257 /* NamedExports */:
                         return emitNamedExports(node);
-                    case 257 /* ExportSpecifier */:
+                    case 258 /* ExportSpecifier */:
                         return emitExportSpecifier(node);
-                    case 258 /* MissingDeclaration */:
+                    case 259 /* MissingDeclaration */:
                         return;
                     // Module references
-                    case 259 /* ExternalModuleReference */:
+                    case 260 /* ExternalModuleReference */:
                         return emitExternalModuleReference(node);
                     // JSX (non-expression)
                     case 11 /* JsxText */:
                         return emitJsxText(node);
-                    case 262 /* JsxOpeningElement */:
-                    case 265 /* JsxOpeningFragment */:
+                    case 263 /* JsxOpeningElement */:
+                    case 266 /* JsxOpeningFragment */:
                         return emitJsxOpeningElementOrFragment(node);
-                    case 263 /* JsxClosingElement */:
-                    case 266 /* JsxClosingFragment */:
+                    case 264 /* JsxClosingElement */:
+                    case 267 /* JsxClosingFragment */:
                         return emitJsxClosingElementOrFragment(node);
-                    case 267 /* JsxAttribute */:
+                    case 268 /* JsxAttribute */:
                         return emitJsxAttribute(node);
-                    case 268 /* JsxAttributes */:
+                    case 269 /* JsxAttributes */:
                         return emitJsxAttributes(node);
-                    case 269 /* JsxSpreadAttribute */:
+                    case 270 /* JsxSpreadAttribute */:
                         return emitJsxSpreadAttribute(node);
-                    case 270 /* JsxExpression */:
+                    case 271 /* JsxExpression */:
                         return emitJsxExpression(node);
                     // Clauses
-                    case 271 /* CaseClause */:
+                    case 272 /* CaseClause */:
                         return emitCaseClause(node);
-                    case 272 /* DefaultClause */:
+                    case 273 /* DefaultClause */:
                         return emitDefaultClause(node);
-                    case 273 /* HeritageClause */:
+                    case 274 /* HeritageClause */:
                         return emitHeritageClause(node);
-                    case 274 /* CatchClause */:
+                    case 275 /* CatchClause */:
                         return emitCatchClause(node);
                     // Property assignments
-                    case 275 /* PropertyAssignment */:
+                    case 276 /* PropertyAssignment */:
                         return emitPropertyAssignment(node);
-                    case 276 /* ShorthandPropertyAssignment */:
+                    case 277 /* ShorthandPropertyAssignment */:
                         return emitShorthandPropertyAssignment(node);
-                    case 277 /* SpreadAssignment */:
+                    case 278 /* SpreadAssignment */:
                         return emitSpreadAssignment(node);
                     // Enum
-                    case 278 /* EnumMember */:
+                    case 279 /* EnumMember */:
                         return emitEnumMember(node);
                     // JSDoc nodes (only used in codefixes currently)
-                    case 304 /* JSDocParameterTag */:
-                    case 310 /* JSDocPropertyTag */:
+                    case 306 /* JSDocParameterTag */:
+                    case 312 /* JSDocPropertyTag */:
                         return emitJSDocPropertyLikeTag(node);
-                    case 305 /* JSDocReturnTag */:
-                    case 307 /* JSDocTypeTag */:
-                    case 306 /* JSDocThisTag */:
-                    case 303 /* JSDocEnumTag */:
+                    case 307 /* JSDocReturnTag */:
+                    case 309 /* JSDocTypeTag */:
+                    case 308 /* JSDocThisTag */:
+                    case 305 /* JSDocEnumTag */:
                         return emitJSDocSimpleTypedTag(node);
-                    case 300 /* JSDocAugmentsTag */:
+                    case 301 /* JSDocAugmentsTag */:
                         return emitJSDocAugmentsTag(node);
-                    case 308 /* JSDocTemplateTag */:
+                    case 310 /* JSDocTemplateTag */:
                         return emitJSDocTemplateTag(node);
-                    case 309 /* JSDocTypedefTag */:
+                    case 311 /* JSDocTypedefTag */:
                         return emitJSDocTypedefTag(node);
-                    case 302 /* JSDocCallbackTag */:
+                    case 304 /* JSDocCallbackTag */:
                         return emitJSDocCallbackTag(node);
-                    case 298 /* JSDocSignature */:
+                    case 299 /* JSDocSignature */:
                         return emitJSDocSignature(node);
-                    case 297 /* JSDocTypeLiteral */:
+                    case 298 /* JSDocTypeLiteral */:
                         return emitJSDocTypeLiteral(node);
-                    case 301 /* JSDocClassTag */:
-                    case 299 /* JSDocTag */:
+                    case 303 /* JSDocClassTag */:
+                    case 300 /* JSDocTag */:
                         return emitJSDocSimpleTag(node);
-                    case 296 /* JSDocComment */:
+                    case 297 /* JSDocComment */:
                         return emitJSDoc(node);
                     // Transformation nodes (ignored)
                 }
@@ -83930,83 +86560,83 @@ var ts;
                     case 14 /* NoSubstitutionTemplateLiteral */:
                         return emitLiteral(node);
                     // Identifiers
-                    case 72 /* Identifier */:
+                    case 73 /* Identifier */:
                         return emitIdentifier(node);
                     // Reserved words
-                    case 87 /* FalseKeyword */:
-                    case 96 /* NullKeyword */:
-                    case 98 /* SuperKeyword */:
-                    case 102 /* TrueKeyword */:
-                    case 100 /* ThisKeyword */:
-                    case 92 /* ImportKeyword */:
+                    case 88 /* FalseKeyword */:
+                    case 97 /* NullKeyword */:
+                    case 99 /* SuperKeyword */:
+                    case 103 /* TrueKeyword */:
+                    case 101 /* ThisKeyword */:
+                    case 93 /* ImportKeyword */:
                         writeTokenNode(node, writeKeyword);
                         return;
                     // Expressions
-                    case 187 /* ArrayLiteralExpression */:
+                    case 188 /* ArrayLiteralExpression */:
                         return emitArrayLiteralExpression(node);
-                    case 188 /* ObjectLiteralExpression */:
+                    case 189 /* ObjectLiteralExpression */:
                         return emitObjectLiteralExpression(node);
-                    case 189 /* PropertyAccessExpression */:
+                    case 190 /* PropertyAccessExpression */:
                         return emitPropertyAccessExpression(node);
-                    case 190 /* ElementAccessExpression */:
+                    case 191 /* ElementAccessExpression */:
                         return emitElementAccessExpression(node);
-                    case 191 /* CallExpression */:
+                    case 192 /* CallExpression */:
                         return emitCallExpression(node);
-                    case 192 /* NewExpression */:
+                    case 193 /* NewExpression */:
                         return emitNewExpression(node);
-                    case 193 /* TaggedTemplateExpression */:
+                    case 194 /* TaggedTemplateExpression */:
                         return emitTaggedTemplateExpression(node);
-                    case 194 /* TypeAssertionExpression */:
+                    case 195 /* TypeAssertionExpression */:
                         return emitTypeAssertionExpression(node);
-                    case 195 /* ParenthesizedExpression */:
+                    case 196 /* ParenthesizedExpression */:
                         return emitParenthesizedExpression(node);
-                    case 196 /* FunctionExpression */:
+                    case 197 /* FunctionExpression */:
                         return emitFunctionExpression(node);
-                    case 197 /* ArrowFunction */:
+                    case 198 /* ArrowFunction */:
                         return emitArrowFunction(node);
-                    case 198 /* DeleteExpression */:
+                    case 199 /* DeleteExpression */:
                         return emitDeleteExpression(node);
-                    case 199 /* TypeOfExpression */:
+                    case 200 /* TypeOfExpression */:
                         return emitTypeOfExpression(node);
-                    case 200 /* VoidExpression */:
+                    case 201 /* VoidExpression */:
                         return emitVoidExpression(node);
-                    case 201 /* AwaitExpression */:
+                    case 202 /* AwaitExpression */:
                         return emitAwaitExpression(node);
-                    case 202 /* PrefixUnaryExpression */:
+                    case 203 /* PrefixUnaryExpression */:
                         return emitPrefixUnaryExpression(node);
-                    case 203 /* PostfixUnaryExpression */:
+                    case 204 /* PostfixUnaryExpression */:
                         return emitPostfixUnaryExpression(node);
-                    case 204 /* BinaryExpression */:
+                    case 205 /* BinaryExpression */:
                         return emitBinaryExpression(node);
-                    case 205 /* ConditionalExpression */:
+                    case 206 /* ConditionalExpression */:
                         return emitConditionalExpression(node);
-                    case 206 /* TemplateExpression */:
+                    case 207 /* TemplateExpression */:
                         return emitTemplateExpression(node);
-                    case 207 /* YieldExpression */:
+                    case 208 /* YieldExpression */:
                         return emitYieldExpression(node);
-                    case 208 /* SpreadElement */:
+                    case 209 /* SpreadElement */:
                         return emitSpreadExpression(node);
-                    case 209 /* ClassExpression */:
+                    case 210 /* ClassExpression */:
                         return emitClassExpression(node);
-                    case 210 /* OmittedExpression */:
+                    case 211 /* OmittedExpression */:
                         return;
-                    case 212 /* AsExpression */:
+                    case 213 /* AsExpression */:
                         return emitAsExpression(node);
-                    case 213 /* NonNullExpression */:
+                    case 214 /* NonNullExpression */:
                         return emitNonNullExpression(node);
-                    case 214 /* MetaProperty */:
+                    case 215 /* MetaProperty */:
                         return emitMetaProperty(node);
                     // JSX
-                    case 260 /* JsxElement */:
+                    case 261 /* JsxElement */:
                         return emitJsxElement(node);
-                    case 261 /* JsxSelfClosingElement */:
+                    case 262 /* JsxSelfClosingElement */:
                         return emitJsxSelfClosingElement(node);
-                    case 264 /* JsxFragment */:
+                    case 265 /* JsxFragment */:
                         return emitJsxFragment(node);
                     // Transformation nodes
-                    case 313 /* PartiallyEmittedExpression */:
+                    case 315 /* PartiallyEmittedExpression */:
                         return emitPartiallyEmittedExpression(node);
-                    case 314 /* CommaListExpression */:
+                    case 316 /* CommaListExpression */:
                         return emitCommaList(node);
                 }
             }
@@ -84046,7 +86676,7 @@ var ts;
         }
         function emitHelpers(node) {
             var helpersEmitted = false;
-            var bundle = node.kind === 285 /* Bundle */ ? node : undefined;
+            var bundle = node.kind === 286 /* Bundle */ ? node : undefined;
             if (bundle && moduleKind === ts.ModuleKind.None) {
                 return;
             }
@@ -84146,7 +86776,7 @@ var ts;
             var pos = getTextPosWithWriteLine();
             writeUnparsedNode(unparsed);
             if (bundleFileInfo) {
-                updateOrPushBundleFileTextLike(pos, writer.getTextPos(), unparsed.kind === 281 /* UnparsedText */ ?
+                updateOrPushBundleFileTextLike(pos, writer.getTextPos(), unparsed.kind === 282 /* UnparsedText */ ?
                     "text" /* Text */ :
                     "internal" /* Internal */);
             }
@@ -84179,7 +86809,7 @@ var ts;
             emit(node.right);
         }
         function emitEntityName(node) {
-            if (node.kind === 72 /* Identifier */) {
+            if (node.kind === 73 /* Identifier */) {
                 emitExpression(node);
             }
             else {
@@ -84215,7 +86845,7 @@ var ts;
             emit(node.dotDotDotToken);
             emitNodeWithWriter(node.name, writeParameter);
             emit(node.questionToken);
-            if (node.parent && node.parent.kind === 294 /* JSDocFunctionType */ && !node.name) {
+            if (node.parent && node.parent.kind === 295 /* JSDocFunctionType */ && !node.name) {
                 emit(node.type);
             }
             else {
@@ -84277,7 +86907,7 @@ var ts;
         function emitAccessorDeclaration(node) {
             emitDecorators(node, node.decorators);
             emitModifiers(node, node.modifiers);
-            writeKeyword(node.kind === 158 /* GetAccessor */ ? "get" : "set");
+            writeKeyword(node.kind === 159 /* GetAccessor */ ? "get" : "set");
             writeSpace();
             emit(node.name);
             emitSignatureAndBody(node, emitSignatureHead);
@@ -84454,7 +87084,7 @@ var ts;
             }
             if (node.readonlyToken) {
                 emit(node.readonlyToken);
-                if (node.readonlyToken.kind !== 133 /* ReadonlyKeyword */) {
+                if (node.readonlyToken.kind !== 134 /* ReadonlyKeyword */) {
                     writeKeyword("readonly");
                 }
                 writeSpace();
@@ -84604,7 +87234,7 @@ var ts;
             emitExpressionList(node, node.arguments, 2576 /* CallExpressionArguments */);
         }
         function emitNewExpression(node) {
-            emitTokenWithComment(95 /* NewKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(96 /* NewKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emitExpression(node.expression);
             emitTypeArguments(node, node.typeArguments);
@@ -84644,22 +87274,22 @@ var ts;
             emit(node.equalsGreaterThanToken);
         }
         function emitDeleteExpression(node) {
-            emitTokenWithComment(81 /* DeleteKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(82 /* DeleteKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emitExpression(node.expression);
         }
         function emitTypeOfExpression(node) {
-            emitTokenWithComment(104 /* TypeOfKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(105 /* TypeOfKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emitExpression(node.expression);
         }
         function emitVoidExpression(node) {
-            emitTokenWithComment(106 /* VoidKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(107 /* VoidKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emitExpression(node.expression);
         }
         function emitAwaitExpression(node) {
-            emitTokenWithComment(122 /* AwaitKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(123 /* AwaitKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emitExpression(node.expression);
         }
@@ -84684,7 +87314,7 @@ var ts;
             // expression a prefix increment whose operand is a plus expression - (++(+x))
             // The same is true of minus of course.
             var operand = node.operand;
-            return operand.kind === 202 /* PrefixUnaryExpression */
+            return operand.kind === 203 /* PrefixUnaryExpression */
                 && ((node.operator === 38 /* PlusToken */ && (operand.operator === 38 /* PlusToken */ || operand.operator === 44 /* PlusPlusToken */))
                     || (node.operator === 39 /* MinusToken */ && (operand.operator === 39 /* MinusToken */ || operand.operator === 45 /* MinusMinusToken */)));
         }
@@ -84699,7 +87329,7 @@ var ts;
             emitExpression(node.left);
             increaseIndentIf(indentBeforeOperator, isCommaOperator);
             emitLeadingCommentsOfPosition(node.operatorToken.pos);
-            writeTokenNode(node.operatorToken, node.operatorToken.kind === 93 /* InKeyword */ ? writeKeyword : writeOperator);
+            writeTokenNode(node.operatorToken, node.operatorToken.kind === 94 /* InKeyword */ ? writeKeyword : writeOperator);
             emitTrailingCommentsOfPosition(node.operatorToken.end, /*prefixSpace*/ true); // Binary operators should have a space before the comment starts
             increaseIndentIf(indentAfterOperator, /*writeSpaceIfNotIndenting*/ true);
             emitExpression(node.right);
@@ -84727,7 +87357,7 @@ var ts;
             emitList(node, node.templateSpans, 262144 /* TemplateExpressionSpans */);
         }
         function emitYieldExpression(node) {
-            emitTokenWithComment(117 /* YieldKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(118 /* YieldKeyword */, node.pos, writeKeyword, node);
             emit(node.asteriskToken);
             emitExpressionWithLeadingSpace(node.expression);
         }
@@ -84804,7 +87434,7 @@ var ts;
             }
         }
         function emitIfStatement(node) {
-            var openParenPos = emitTokenWithComment(91 /* IfKeyword */, node.pos, writeKeyword, node);
+            var openParenPos = emitTokenWithComment(92 /* IfKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emitTokenWithComment(20 /* OpenParenToken */, openParenPos, writePunctuation, node);
             emitExpression(node.expression);
@@ -84812,8 +87442,8 @@ var ts;
             emitEmbeddedStatement(node, node.thenStatement);
             if (node.elseStatement) {
                 writeLineOrSpace(node);
-                emitTokenWithComment(83 /* ElseKeyword */, node.thenStatement.end, writeKeyword, node);
-                if (node.elseStatement.kind === 222 /* IfStatement */) {
+                emitTokenWithComment(84 /* ElseKeyword */, node.thenStatement.end, writeKeyword, node);
+                if (node.elseStatement.kind === 223 /* IfStatement */) {
                     writeSpace();
                     emit(node.elseStatement);
                 }
@@ -84823,14 +87453,14 @@ var ts;
             }
         }
         function emitWhileClause(node, startPos) {
-            var openParenPos = emitTokenWithComment(107 /* WhileKeyword */, startPos, writeKeyword, node);
+            var openParenPos = emitTokenWithComment(108 /* WhileKeyword */, startPos, writeKeyword, node);
             writeSpace();
             emitTokenWithComment(20 /* OpenParenToken */, openParenPos, writePunctuation, node);
             emitExpression(node.expression);
             emitTokenWithComment(21 /* CloseParenToken */, node.expression.end, writePunctuation, node);
         }
         function emitDoStatement(node) {
-            emitTokenWithComment(82 /* DoKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(83 /* DoKeyword */, node.pos, writeKeyword, node);
             emitEmbeddedStatement(node, node.statement);
             if (ts.isBlock(node.statement)) {
                 writeSpace();
@@ -84846,7 +87476,7 @@ var ts;
             emitEmbeddedStatement(node, node.statement);
         }
         function emitForStatement(node) {
-            var openParenPos = emitTokenWithComment(89 /* ForKeyword */, node.pos, writeKeyword, node);
+            var openParenPos = emitTokenWithComment(90 /* ForKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             var pos = emitTokenWithComment(20 /* OpenParenToken */, openParenPos, writePunctuation, /*contextNode*/ node);
             emitForBinding(node.initializer);
@@ -84858,25 +87488,25 @@ var ts;
             emitEmbeddedStatement(node, node.statement);
         }
         function emitForInStatement(node) {
-            var openParenPos = emitTokenWithComment(89 /* ForKeyword */, node.pos, writeKeyword, node);
+            var openParenPos = emitTokenWithComment(90 /* ForKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emitTokenWithComment(20 /* OpenParenToken */, openParenPos, writePunctuation, node);
             emitForBinding(node.initializer);
             writeSpace();
-            emitTokenWithComment(93 /* InKeyword */, node.initializer.end, writeKeyword, node);
+            emitTokenWithComment(94 /* InKeyword */, node.initializer.end, writeKeyword, node);
             writeSpace();
             emitExpression(node.expression);
             emitTokenWithComment(21 /* CloseParenToken */, node.expression.end, writePunctuation, node);
             emitEmbeddedStatement(node, node.statement);
         }
         function emitForOfStatement(node) {
-            var openParenPos = emitTokenWithComment(89 /* ForKeyword */, node.pos, writeKeyword, node);
+            var openParenPos = emitTokenWithComment(90 /* ForKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emitWithTrailingSpace(node.awaitModifier);
             emitTokenWithComment(20 /* OpenParenToken */, openParenPos, writePunctuation, node);
             emitForBinding(node.initializer);
             writeSpace();
-            emitTokenWithComment(147 /* OfKeyword */, node.initializer.end, writeKeyword, node);
+            emitTokenWithComment(148 /* OfKeyword */, node.initializer.end, writeKeyword, node);
             writeSpace();
             emitExpression(node.expression);
             emitTokenWithComment(21 /* CloseParenToken */, node.expression.end, writePunctuation, node);
@@ -84884,7 +87514,7 @@ var ts;
         }
         function emitForBinding(node) {
             if (node !== undefined) {
-                if (node.kind === 238 /* VariableDeclarationList */) {
+                if (node.kind === 239 /* VariableDeclarationList */) {
                     emit(node);
                 }
                 else {
@@ -84893,12 +87523,12 @@ var ts;
             }
         }
         function emitContinueStatement(node) {
-            emitTokenWithComment(78 /* ContinueKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(79 /* ContinueKeyword */, node.pos, writeKeyword, node);
             emitWithLeadingSpace(node.label);
             writeTrailingSemicolon();
         }
         function emitBreakStatement(node) {
-            emitTokenWithComment(73 /* BreakKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(74 /* BreakKeyword */, node.pos, writeKeyword, node);
             emitWithLeadingSpace(node.label);
             writeTrailingSemicolon();
         }
@@ -84926,12 +87556,12 @@ var ts;
             return pos;
         }
         function emitReturnStatement(node) {
-            emitTokenWithComment(97 /* ReturnKeyword */, node.pos, writeKeyword, /*contextNode*/ node);
+            emitTokenWithComment(98 /* ReturnKeyword */, node.pos, writeKeyword, /*contextNode*/ node);
             emitExpressionWithLeadingSpace(node.expression);
             writeTrailingSemicolon();
         }
         function emitWithStatement(node) {
-            var openParenPos = emitTokenWithComment(108 /* WithKeyword */, node.pos, writeKeyword, node);
+            var openParenPos = emitTokenWithComment(109 /* WithKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emitTokenWithComment(20 /* OpenParenToken */, openParenPos, writePunctuation, node);
             emitExpression(node.expression);
@@ -84939,7 +87569,7 @@ var ts;
             emitEmbeddedStatement(node, node.statement);
         }
         function emitSwitchStatement(node) {
-            var openParenPos = emitTokenWithComment(99 /* SwitchKeyword */, node.pos, writeKeyword, node);
+            var openParenPos = emitTokenWithComment(100 /* SwitchKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emitTokenWithComment(20 /* OpenParenToken */, openParenPos, writePunctuation, node);
             emitExpression(node.expression);
@@ -84954,12 +87584,12 @@ var ts;
             emit(node.statement);
         }
         function emitThrowStatement(node) {
-            emitTokenWithComment(101 /* ThrowKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(102 /* ThrowKeyword */, node.pos, writeKeyword, node);
             emitExpressionWithLeadingSpace(node.expression);
             writeTrailingSemicolon();
         }
         function emitTryStatement(node) {
-            emitTokenWithComment(103 /* TryKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(104 /* TryKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emit(node.tryBlock);
             if (node.catchClause) {
@@ -84968,13 +87598,13 @@ var ts;
             }
             if (node.finallyBlock) {
                 writeLineOrSpace(node);
-                emitTokenWithComment(88 /* FinallyKeyword */, (node.catchClause || node.tryBlock).end, writeKeyword, node);
+                emitTokenWithComment(89 /* FinallyKeyword */, (node.catchClause || node.tryBlock).end, writeKeyword, node);
                 writeSpace();
                 emit(node.finallyBlock);
             }
         }
         function emitDebuggerStatement(node) {
-            writeToken(79 /* DebuggerKeyword */, node.pos, writeKeyword);
+            writeToken(80 /* DebuggerKeyword */, node.pos, writeKeyword);
             writeTrailingSemicolon();
         }
         //
@@ -85179,7 +87809,7 @@ var ts;
             var body = node.body;
             if (!body)
                 return writeTrailingSemicolon();
-            while (body.kind === 244 /* ModuleDeclaration */) {
+            while (body.kind === 245 /* ModuleDeclaration */) {
                 writePunctuation(".");
                 emit(body.name);
                 body = body.body;
@@ -85200,17 +87830,17 @@ var ts;
         }
         function emitImportEqualsDeclaration(node) {
             emitModifiers(node, node.modifiers);
-            emitTokenWithComment(92 /* ImportKeyword */, node.modifiers ? node.modifiers.end : node.pos, writeKeyword, node);
+            emitTokenWithComment(93 /* ImportKeyword */, node.modifiers ? node.modifiers.end : node.pos, writeKeyword, node);
             writeSpace();
             emit(node.name);
             writeSpace();
-            emitTokenWithComment(59 /* EqualsToken */, node.name.end, writePunctuation, node);
+            emitTokenWithComment(60 /* EqualsToken */, node.name.end, writePunctuation, node);
             writeSpace();
             emitModuleReference(node.moduleReference);
             writeTrailingSemicolon();
         }
         function emitModuleReference(node) {
-            if (node.kind === 72 /* Identifier */) {
+            if (node.kind === 73 /* Identifier */) {
                 emitExpression(node);
             }
             else {
@@ -85219,12 +87849,12 @@ var ts;
         }
         function emitImportDeclaration(node) {
             emitModifiers(node, node.modifiers);
-            emitTokenWithComment(92 /* ImportKeyword */, node.modifiers ? node.modifiers.end : node.pos, writeKeyword, node);
+            emitTokenWithComment(93 /* ImportKeyword */, node.modifiers ? node.modifiers.end : node.pos, writeKeyword, node);
             writeSpace();
             if (node.importClause) {
                 emit(node.importClause);
                 writeSpace();
-                emitTokenWithComment(144 /* FromKeyword */, node.importClause.end, writeKeyword, node);
+                emitTokenWithComment(145 /* FromKeyword */, node.importClause.end, writeKeyword, node);
                 writeSpace();
             }
             emitExpression(node.moduleSpecifier);
@@ -85241,7 +87871,7 @@ var ts;
         function emitNamespaceImport(node) {
             var asPos = emitTokenWithComment(40 /* AsteriskToken */, node.pos, writePunctuation, node);
             writeSpace();
-            emitTokenWithComment(119 /* AsKeyword */, asPos, writeKeyword, node);
+            emitTokenWithComment(120 /* AsKeyword */, asPos, writeKeyword, node);
             writeSpace();
             emit(node.name);
         }
@@ -85252,20 +87882,20 @@ var ts;
             emitImportOrExportSpecifier(node);
         }
         function emitExportAssignment(node) {
-            var nextPos = emitTokenWithComment(85 /* ExportKeyword */, node.pos, writeKeyword, node);
+            var nextPos = emitTokenWithComment(86 /* ExportKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             if (node.isExportEquals) {
-                emitTokenWithComment(59 /* EqualsToken */, nextPos, writeOperator, node);
+                emitTokenWithComment(60 /* EqualsToken */, nextPos, writeOperator, node);
             }
             else {
-                emitTokenWithComment(80 /* DefaultKeyword */, nextPos, writeKeyword, node);
+                emitTokenWithComment(81 /* DefaultKeyword */, nextPos, writeKeyword, node);
             }
             writeSpace();
             emitExpression(node.expression);
             writeTrailingSemicolon();
         }
         function emitExportDeclaration(node) {
-            var nextPos = emitTokenWithComment(85 /* ExportKeyword */, node.pos, writeKeyword, node);
+            var nextPos = emitTokenWithComment(86 /* ExportKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             if (node.exportClause) {
                 emit(node.exportClause);
@@ -85276,18 +87906,18 @@ var ts;
             if (node.moduleSpecifier) {
                 writeSpace();
                 var fromPos = node.exportClause ? node.exportClause.end : nextPos;
-                emitTokenWithComment(144 /* FromKeyword */, fromPos, writeKeyword, node);
+                emitTokenWithComment(145 /* FromKeyword */, fromPos, writeKeyword, node);
                 writeSpace();
                 emitExpression(node.moduleSpecifier);
             }
             writeTrailingSemicolon();
         }
         function emitNamespaceExportDeclaration(node) {
-            var nextPos = emitTokenWithComment(85 /* ExportKeyword */, node.pos, writeKeyword, node);
+            var nextPos = emitTokenWithComment(86 /* ExportKeyword */, node.pos, writeKeyword, node);
             writeSpace();
-            nextPos = emitTokenWithComment(119 /* AsKeyword */, nextPos, writeKeyword, node);
+            nextPos = emitTokenWithComment(120 /* AsKeyword */, nextPos, writeKeyword, node);
             writeSpace();
-            nextPos = emitTokenWithComment(131 /* NamespaceKeyword */, nextPos, writeKeyword, node);
+            nextPos = emitTokenWithComment(132 /* NamespaceKeyword */, nextPos, writeKeyword, node);
             writeSpace();
             emit(node.name);
             writeTrailingSemicolon();
@@ -85307,7 +87937,7 @@ var ts;
             if (node.propertyName) {
                 emit(node.propertyName);
                 writeSpace();
-                emitTokenWithComment(119 /* AsKeyword */, node.propertyName.end, writeKeyword, node);
+                emitTokenWithComment(120 /* AsKeyword */, node.propertyName.end, writeKeyword, node);
                 writeSpace();
             }
             emit(node.name);
@@ -85355,7 +87985,7 @@ var ts;
             writePunctuation(">");
         }
         function emitJsxText(node) {
-            writer.writeLiteral(getTextOfNode(node, /*includeTrivia*/ true));
+            writer.writeLiteral(node.text);
         }
         function emitJsxClosingElementOrFragment(node) {
             writePunctuation("</");
@@ -85385,7 +88015,7 @@ var ts;
             }
         }
         function emitJsxTagName(node) {
-            if (node.kind === 72 /* Identifier */) {
+            if (node.kind === 73 /* Identifier */) {
                 emitExpression(node);
             }
             else {
@@ -85396,13 +88026,13 @@ var ts;
         // Clauses
         //
         function emitCaseClause(node) {
-            emitTokenWithComment(74 /* CaseKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(75 /* CaseKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emitExpression(node.expression);
             emitCaseOrDefaultClauseRest(node, node.statements, node.expression.end);
         }
         function emitDefaultClause(node) {
-            var pos = emitTokenWithComment(80 /* DefaultKeyword */, node.pos, writeKeyword, node);
+            var pos = emitTokenWithComment(81 /* DefaultKeyword */, node.pos, writeKeyword, node);
             emitCaseOrDefaultClauseRest(node, node.statements, pos);
         }
         function emitCaseOrDefaultClauseRest(parentNode, statements, colonPos) {
@@ -85430,7 +88060,7 @@ var ts;
             emitList(node, node.types, 528 /* HeritageClauseTypes */);
         }
         function emitCatchClause(node) {
-            var openParenPos = emitTokenWithComment(75 /* CatchKeyword */, node.pos, writeKeyword, node);
+            var openParenPos = emitTokenWithComment(76 /* CatchKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             if (node.variableDeclaration) {
                 emitTokenWithComment(20 /* OpenParenToken */, openParenPos, writePunctuation, node);
@@ -85500,7 +88130,7 @@ var ts;
                 }
             }
             if (node.tags) {
-                if (node.tags.length === 1 && node.tags[0].kind === 307 /* JSDocTypeTag */ && !node.comment) {
+                if (node.tags.length === 1 && node.tags[0].kind === 309 /* JSDocTypeTag */ && !node.comment) {
                     writeSpace();
                     emit(node.tags[0]);
                 }
@@ -85534,7 +88164,7 @@ var ts;
         function emitJSDocTypedefTag(tag) {
             emitJSDocTagName(tag.tagName);
             if (tag.typeExpression) {
-                if (tag.typeExpression.kind === 288 /* JSDocTypeExpression */) {
+                if (tag.typeExpression.kind === 289 /* JSDocTypeExpression */) {
                     emitJSDocTypeExpression(tag.typeExpression);
                 }
                 else {
@@ -85553,7 +88183,7 @@ var ts;
                 emit(tag.fullName);
             }
             emitJSDocComment(tag.comment);
-            if (tag.typeExpression && tag.typeExpression.kind === 297 /* JSDocTypeLiteral */) {
+            if (tag.typeExpression && tag.typeExpression.kind === 298 /* JSDocTypeLiteral */) {
                 emitJSDocTypeLiteral(tag.typeExpression);
             }
         }
@@ -85868,7 +88498,7 @@ var ts;
         function emitInitializer(node, equalCommentStartPos, container) {
             if (node) {
                 writeSpace();
-                emitTokenWithComment(59 /* EqualsToken */, equalCommentStartPos, writeOperator, container);
+                emitTokenWithComment(60 /* EqualsToken */, equalCommentStartPos, writeOperator, container);
                 writeSpace();
                 emitExpression(node);
             }
@@ -86331,7 +88961,7 @@ var ts;
                 && ts.rangeEndIsOnSameLineAsRangeStart(block, block, currentSourceFile);
         }
         function skipSynthesizedParentheses(node) {
-            while (node.kind === 195 /* ParenthesizedExpression */ && ts.nodeIsSynthesized(node)) {
+            while (node.kind === 196 /* ParenthesizedExpression */ && ts.nodeIsSynthesized(node)) {
                 node = node.expression;
             }
             return node;
@@ -86396,81 +89026,81 @@ var ts;
             if (!node)
                 return;
             switch (node.kind) {
-                case 218 /* Block */:
+                case 219 /* Block */:
                     ts.forEach(node.statements, generateNames);
                     break;
-                case 233 /* LabeledStatement */:
-                case 231 /* WithStatement */:
-                case 223 /* DoStatement */:
-                case 224 /* WhileStatement */:
+                case 234 /* LabeledStatement */:
+                case 232 /* WithStatement */:
+                case 224 /* DoStatement */:
+                case 225 /* WhileStatement */:
                     generateNames(node.statement);
                     break;
-                case 222 /* IfStatement */:
+                case 223 /* IfStatement */:
                     generateNames(node.thenStatement);
                     generateNames(node.elseStatement);
                     break;
-                case 225 /* ForStatement */:
-                case 227 /* ForOfStatement */:
-                case 226 /* ForInStatement */:
+                case 226 /* ForStatement */:
+                case 228 /* ForOfStatement */:
+                case 227 /* ForInStatement */:
                     generateNames(node.initializer);
                     generateNames(node.statement);
                     break;
-                case 232 /* SwitchStatement */:
+                case 233 /* SwitchStatement */:
                     generateNames(node.caseBlock);
                     break;
-                case 246 /* CaseBlock */:
+                case 247 /* CaseBlock */:
                     ts.forEach(node.clauses, generateNames);
                     break;
-                case 271 /* CaseClause */:
-                case 272 /* DefaultClause */:
+                case 272 /* CaseClause */:
+                case 273 /* DefaultClause */:
                     ts.forEach(node.statements, generateNames);
                     break;
-                case 235 /* TryStatement */:
+                case 236 /* TryStatement */:
                     generateNames(node.tryBlock);
                     generateNames(node.catchClause);
                     generateNames(node.finallyBlock);
                     break;
-                case 274 /* CatchClause */:
+                case 275 /* CatchClause */:
                     generateNames(node.variableDeclaration);
                     generateNames(node.block);
                     break;
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     generateNames(node.declarationList);
                     break;
-                case 238 /* VariableDeclarationList */:
+                case 239 /* VariableDeclarationList */:
                     ts.forEach(node.declarations, generateNames);
                     break;
-                case 237 /* VariableDeclaration */:
-                case 151 /* Parameter */:
-                case 186 /* BindingElement */:
-                case 240 /* ClassDeclaration */:
+                case 238 /* VariableDeclaration */:
+                case 152 /* Parameter */:
+                case 187 /* BindingElement */:
+                case 241 /* ClassDeclaration */:
                     generateNameIfNeeded(node.name);
                     break;
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     generateNameIfNeeded(node.name);
                     if (ts.getEmitFlags(node) & 524288 /* ReuseTempVariableScope */) {
                         ts.forEach(node.parameters, generateNames);
                         generateNames(node.body);
                     }
                     break;
-                case 184 /* ObjectBindingPattern */:
-                case 185 /* ArrayBindingPattern */:
+                case 185 /* ObjectBindingPattern */:
+                case 186 /* ArrayBindingPattern */:
                     ts.forEach(node.elements, generateNames);
                     break;
-                case 249 /* ImportDeclaration */:
+                case 250 /* ImportDeclaration */:
                     generateNames(node.importClause);
                     break;
-                case 250 /* ImportClause */:
+                case 251 /* ImportClause */:
                     generateNameIfNeeded(node.name);
                     generateNames(node.namedBindings);
                     break;
-                case 251 /* NamespaceImport */:
+                case 252 /* NamespaceImport */:
                     generateNameIfNeeded(node.name);
                     break;
-                case 252 /* NamedImports */:
+                case 253 /* NamedImports */:
                     ts.forEach(node.elements, generateNames);
                     break;
-                case 253 /* ImportSpecifier */:
+                case 254 /* ImportSpecifier */:
                     generateNameIfNeeded(node.propertyName || node.name);
                     break;
             }
@@ -86479,12 +89109,12 @@ var ts;
             if (!node)
                 return;
             switch (node.kind) {
-                case 275 /* PropertyAssignment */:
-                case 276 /* ShorthandPropertyAssignment */:
-                case 154 /* PropertyDeclaration */:
-                case 156 /* MethodDeclaration */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 276 /* PropertyAssignment */:
+                case 277 /* ShorthandPropertyAssignment */:
+                case 155 /* PropertyDeclaration */:
+                case 157 /* MethodDeclaration */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     generateNameIfNeeded(node.name);
                     break;
             }
@@ -86664,24 +89294,26 @@ var ts;
          */
         function generateNameForNode(node, flags) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return makeUniqueName(getTextOfNode(node), isUniqueName, !!(flags & 16 /* Optimistic */), !!(flags & 8 /* ReservedInNestedScopes */));
-                case 244 /* ModuleDeclaration */:
-                case 243 /* EnumDeclaration */:
+                case 245 /* ModuleDeclaration */:
+                case 244 /* EnumDeclaration */:
                     return generateNameForModuleOrEnum(node);
-                case 249 /* ImportDeclaration */:
-                case 255 /* ExportDeclaration */:
+                case 250 /* ImportDeclaration */:
+                case 256 /* ExportDeclaration */:
                     return generateNameForImportOrExportDeclaration(node);
-                case 239 /* FunctionDeclaration */:
-                case 240 /* ClassDeclaration */:
-                case 254 /* ExportAssignment */:
+                case 240 /* FunctionDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 255 /* ExportAssignment */:
                     return generateNameForExportDefault();
-                case 209 /* ClassExpression */:
+                case 210 /* ClassExpression */:
                     return generateNameForClassExpression();
-                case 156 /* MethodDeclaration */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 157 /* MethodDeclaration */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     return generateNameForMethodOrAccessor(node);
+                case 150 /* ComputedPropertyName */:
+                    return makeTempVariableName(0 /* Auto */, /*reserveInNestedScopes*/ true);
                 default:
                     return makeTempVariableName(0 /* Auto */);
             }
@@ -86727,7 +89359,7 @@ var ts;
             hasWrittenComment = false;
             var emitFlags = ts.getEmitFlags(node);
             var _a = ts.getCommentRange(node), pos = _a.pos, end = _a.end;
-            var isEmittedNode = node.kind !== 312 /* NotEmittedStatement */;
+            var isEmittedNode = node.kind !== 314 /* NotEmittedStatement */;
             // We have to explicitly check that the node is JsxText because if the compilerOptions.jsx is "preserve" we will not do any transformation.
             // It is expensive to walk entire tree just to set one kind of node to have no comments.
             var skipLeadingComments = pos < 0 || (emitFlags & 512 /* NoLeadingComments */) !== 0 || node.kind === 11 /* JsxText */;
@@ -86751,7 +89383,7 @@ var ts;
                     containerEnd = end;
                     // To avoid invalid comment emit in a down-level binding pattern, we
                     // keep track of the last declaration list container's end
-                    if (node.kind === 238 /* VariableDeclarationList */) {
+                    if (node.kind === 239 /* VariableDeclarationList */) {
                         declarationListContainerEnd = end;
                     }
                 }
@@ -87008,7 +89640,7 @@ var ts;
             else {
                 var _a = ts.getSourceMapRange(node), pos = _a.pos, end = _a.end, _b = _a.source, source = _b === void 0 ? sourceMapSource : _b;
                 var emitFlags = ts.getEmitFlags(node);
-                if (node.kind !== 312 /* NotEmittedStatement */
+                if (node.kind !== 314 /* NotEmittedStatement */
                     && (emitFlags & 16 /* NoLeadingSourceMap */) === 0
                     && pos >= 0) {
                     emitSourcePos(source, skipSourceTrivia(source, pos));
@@ -87021,7 +89653,7 @@ var ts;
                 else {
                     pipelinePhase(hint, node);
                 }
-                if (node.kind !== 312 /* NotEmittedStatement */
+                if (node.kind !== 314 /* NotEmittedStatement */
                     && (emitFlags & 32 /* NoTrailingSourceMap */) === 0
                     && end >= 0) {
                     emitSourcePos(source, end);
@@ -87149,7 +89781,8 @@ var ts;
             writeFile: host.writeFile && writeFile,
             addOrDeleteFileOrDirectory: addOrDeleteFileOrDirectory,
             addOrDeleteFile: addOrDeleteFile,
-            clearCache: clearCache
+            clearCache: clearCache,
+            realpath: host.realpath && realpath
         };
         function toPath(fileName) {
             return ts.toPath(fileName, currentDirectory, getCanonicalFileName);
@@ -87246,7 +89879,7 @@ var ts;
             var rootDirPath = toPath(rootDir);
             var result = tryReadDirectory(rootDir, rootDirPath);
             if (result) {
-                return ts.matchFiles(rootDir, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory, depth, getFileSystemEntries);
+                return ts.matchFiles(rootDir, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory, depth, getFileSystemEntries, realpath);
             }
             return host.readDirectory(rootDir, extensions, excludes, includes, depth);
             function getFileSystemEntries(dir) {
@@ -87257,6 +89890,9 @@ var ts;
                 return tryReadDirectory(dir, path) || ts.emptyFileSystemEntries;
             }
         }
+        function realpath(s) {
+            return host.realpath ? host.realpath(s) : s;
+        }
         function addOrDeleteFileOrDirectory(fileOrDirectory, fileOrDirectoryPath) {
             var existingResult = getCachedFileSystemEntries(fileOrDirectoryPath);
             if (existingResult) {
@@ -87527,11 +90163,7 @@ var ts;
     function createCompilerHostWorker(options, setParentNodes, system) {
         if (system === void 0) { system = ts.sys; }
         var existingDirectories = ts.createMap();
-        function getCanonicalFileName(fileName) {
-            // if underlying system can distinguish between two files whose names differs only in cases then file name already in canonical form.
-            // otherwise use toLowerCase as a canonical form.
-            return system.useCaseSensitiveFileNames ? fileName : fileName.toLowerCase();
-        }
+        var getCanonicalFileName = ts.createGetCanonicalFileName(system.useCaseSensitiveFileNames);
         function getSourceFile(fileName, languageVersion, onError) {
             var text;
             try {
@@ -87636,7 +90268,8 @@ var ts;
             getDirectories: function (path) { return system.getDirectories(path); },
             realpath: realpath,
             readDirectory: function (path, extensions, include, exclude, depth) { return system.readDirectory(path, extensions, include, exclude, depth); },
-            createDirectory: function (d) { return system.createDirectory(d); }
+            createDirectory: function (d) { return system.createDirectory(d); },
+            createHash: ts.maybeBind(system, system.createHash)
         };
         return compilerHost;
     }
@@ -87883,11 +90516,11 @@ var ts;
                 if (diagnostic.relatedInformation) {
                     output += host.getNewLine();
                     for (var _a = 0, _b = diagnostic.relatedInformation; _a < _b.length; _a++) {
-                        var _c = _b[_a], file = _c.file, start = _c.start, length_4 = _c.length, messageText = _c.messageText;
+                        var _c = _b[_a], file = _c.file, start = _c.start, length_7 = _c.length, messageText = _c.messageText;
                         if (file) {
                             output += host.getNewLine();
                             output += halfIndent + formatLocation(file, start, host); // TODO: GH#18217
-                            output += formatCodeSpan(file, start, length_4, indent, ForegroundColorEscapeSequences.Cyan, host); // TODO: GH#18217
+                            output += formatCodeSpan(file, start, length_7, indent, ForegroundColorEscapeSequences.Cyan, host); // TODO: GH#18217
                         }
                         output += host.getNewLine();
                         output += indent + flattenDiagnosticMessageText(messageText, host.getNewLine());
@@ -87899,29 +90532,33 @@ var ts;
         return output;
     }
     ts.formatDiagnosticsWithColorAndContext = formatDiagnosticsWithColorAndContext;
-    function flattenDiagnosticMessageText(messageText, newLine) {
-        if (ts.isString(messageText)) {
-            return messageText;
+    function flattenDiagnosticMessageText(diag, newLine, indent) {
+        if (indent === void 0) { indent = 0; }
+        if (ts.isString(diag)) {
+            return diag;
         }
-        else {
-            var diagnosticChain = messageText;
-            var result = "";
-            var indent_1 = 0;
-            while (diagnosticChain) {
-                if (indent_1) {
-                    result += newLine;
-                    for (var i = 0; i < indent_1; i++) {
-                        result += "  ";
-                    }
-                }
-                result += diagnosticChain.messageText;
-                indent_1++;
-                diagnosticChain = diagnosticChain.next;
+        else if (diag === undefined) {
+            return "";
+        }
+        var result = "";
+        if (indent) {
+            result += newLine;
+            for (var i = 0; i < indent; i++) {
+                result += "  ";
             }
-            return result;
         }
+        result += diag.messageText;
+        indent++;
+        if (diag.next) {
+            for (var _i = 0, _a = diag.next; _i < _a.length; _i++) {
+                var kid = _a[_i];
+                result += flattenDiagnosticMessageText(kid, newLine, indent);
+            }
+        }
+        return result;
     }
     ts.flattenDiagnosticMessageText = flattenDiagnosticMessageText;
+    /* @internal */
     function loadWithLocalCache(names, containingFile, redirectedReference, loader) {
         if (names.length === 0) {
             return [];
@@ -87941,6 +90578,7 @@ var ts;
         }
         return resolutions;
     }
+    ts.loadWithLocalCache = loadWithLocalCache;
     /**
      * Determines if program structure is upto date or needs to be recreated
      */
@@ -88100,7 +90738,7 @@ var ts;
             }); };
         }
         else {
-            moduleResolutionCache = ts.createModuleResolutionCache(currentDirectory, function (x) { return host.getCanonicalFileName(x); });
+            moduleResolutionCache = ts.createModuleResolutionCache(currentDirectory, function (x) { return host.getCanonicalFileName(x); }, options);
             var loader_1 = function (moduleName, containingFile, redirectedReference) { return ts.resolveModuleName(moduleName, containingFile, options, host, moduleResolutionCache, redirectedReference).resolvedModule; }; // TODO: GH#18217
             resolveModuleNamesWorker = function (moduleNames, containingFile, _reusedNames, redirectedReference) { return loadWithLocalCache(ts.Debug.assertEachDefined(moduleNames), containingFile, redirectedReference, loader_1); };
         }
@@ -88147,11 +90785,18 @@ var ts;
                 if (rootNames.length) {
                     for (var _i = 0, resolvedProjectReferences_1 = resolvedProjectReferences; _i < resolvedProjectReferences_1.length; _i++) {
                         var parsedRef = resolvedProjectReferences_1[_i];
-                        if (parsedRef) {
-                            var out = parsedRef.commandLine.options.outFile || parsedRef.commandLine.options.out;
-                            if (out) {
-                                var dtsOutfile = ts.changeExtension(out, ".d.ts");
-                                processSourceFile(dtsOutfile, /*isDefaultLib*/ false, /*ignoreNoDefaultLib*/ false, /*packageId*/ undefined);
+                        if (!parsedRef)
+                            continue;
+                        var out = parsedRef.commandLine.options.outFile || parsedRef.commandLine.options.out;
+                        if (out) {
+                            processSourceFile(ts.changeExtension(out, ".d.ts"), /*isDefaultLib*/ false, /*ignoreNoDefaultLib*/ false, /*packageId*/ undefined);
+                        }
+                        else if (ts.getEmitModuleKind(parsedRef.commandLine.options) === ts.ModuleKind.None) {
+                            for (var _a = 0, _b = parsedRef.commandLine.fileNames; _a < _b.length; _a++) {
+                                var fileName = _b[_a];
+                                if (!ts.fileExtensionIs(fileName, ".d.ts" /* Dts */) && ts.hasTSFileExtension(fileName)) {
+                                    processSourceFile(ts.getOutputDeclarationFileName(fileName, parsedRef.commandLine, !host.useCaseSensitiveFileNames()), /*isDefaultLib*/ false, /*ignoreNoDefaultLib*/ false, /*packageId*/ undefined);
+                                }
                             }
                         }
                     }
@@ -88199,8 +90844,8 @@ var ts;
         // not part of the new program.
         if (oldProgram && host.onReleaseOldSourceFile) {
             var oldSourceFiles = oldProgram.getSourceFiles();
-            for (var _a = 0, oldSourceFiles_1 = oldSourceFiles; _a < oldSourceFiles_1.length; _a++) {
-                var oldSourceFile = oldSourceFiles_1[_a];
+            for (var _c = 0, oldSourceFiles_1 = oldSourceFiles; _c < oldSourceFiles_1.length; _c++) {
+                var oldSourceFile = oldSourceFiles_1[_c];
                 var newFile = getSourceFileByPath(oldSourceFile.resolvedPath);
                 if (shouldCreateNewSourceFile || !newFile ||
                     // old file wasnt redirect but new file is
@@ -88239,6 +90884,7 @@ var ts;
             getIdentifierCount: function () { return getDiagnosticsProducingTypeChecker().getIdentifierCount(); },
             getSymbolCount: function () { return getDiagnosticsProducingTypeChecker().getSymbolCount(); },
             getTypeCount: function () { return getDiagnosticsProducingTypeChecker().getTypeCount(); },
+            getRelationCacheSizes: function () { return getDiagnosticsProducingTypeChecker().getRelationCacheSizes(); },
             getFileProcessingDiagnostics: function () { return fileProcessingDiagnostics; },
             getResolvedTypeReferenceDirectives: function () { return resolvedTypeReferenceDirectives; },
             isSourceFileFromExternalLibrary: isSourceFileFromExternalLibrary,
@@ -88286,7 +90932,7 @@ var ts;
         }
         function getCommonSourceDirectory() {
             if (commonSourceDirectory === undefined) {
-                var emittedFiles = ts.filter(files, function (file) { return ts.sourceFileMayBeEmitted(file, options, isSourceFileFromExternalLibrary); });
+                var emittedFiles = ts.filter(files, function (file) { return ts.sourceFileMayBeEmitted(file, options, isSourceFileFromExternalLibrary, getResolvedProjectReferenceToRedirect); });
                 if (options.rootDir && checkSourceFilesBelongToPath(emittedFiles, options.rootDir)) {
                     // If a rootDir is specified use it as the commonSourceDirectory
                     commonSourceDirectory = ts.getNormalizedAbsolutePath(options.rootDir, currentDirectory);
@@ -88336,13 +90982,13 @@ var ts;
                 // which per above occurred during the current program creation.
                 // Since we assume the filesystem does not change during program creation,
                 // it is safe to reuse resolutions from the earlier call.
-                var result_6 = [];
+                var result_9 = [];
                 for (var _i = 0, moduleNames_1 = moduleNames; _i < moduleNames_1.length; _i++) {
                     var moduleName = moduleNames_1[_i];
                     var resolvedModule = file.resolvedModules.get(moduleName);
-                    result_6.push(resolvedModule);
+                    result_9.push(resolvedModule);
                 }
-                return result_6;
+                return result_9;
             }
             // At this point, we know at least one of the following hold:
             // - file has local declarations for ambient modules
@@ -88429,7 +91075,7 @@ var ts;
             function moduleNameResolvesToAmbientModuleInNonModifiedFile(moduleName) {
                 var resolutionToFile = ts.getResolvedModule(oldSourceFile, moduleName);
                 var resolvedFile = resolutionToFile && oldProgram.getSourceFile(resolutionToFile.resolvedFileName);
-                if (resolutionToFile && resolvedFile && !resolvedFile.externalModuleIndicator) {
+                if (resolutionToFile && resolvedFile) {
                     // In the old program, we resolved to an ambient module that was in the same
                     //   place as we expected to find an actual module file.
                     // We actually need to return 'false' here even though this seems like a 'true' case
@@ -88658,7 +91304,7 @@ var ts;
                 var filePath = newSourceFile.path;
                 addFileToFilesByName(newSourceFile, filePath, newSourceFile.resolvedPath);
                 // Set the file as found during node modules search if it was found that way in old progra,
-                if (oldProgram.isSourceFileFromExternalLibrary(oldProgram.getSourceFileByPath(filePath))) {
+                if (oldProgram.isSourceFileFromExternalLibrary(oldProgram.getSourceFileByPath(newSourceFile.resolvedPath))) {
                     sourceFilesFoundSearchingNodeModules.set(filePath, true);
                 }
             }
@@ -88675,7 +91321,8 @@ var ts;
         }
         function getEmitHost(writeFileCallback) {
             return __assign({ getPrependNodes: getPrependNodes,
-                getCanonicalFileName: getCanonicalFileName, getCommonSourceDirectory: program.getCommonSourceDirectory, getCompilerOptions: program.getCompilerOptions, getCurrentDirectory: function () { return currentDirectory; }, getNewLine: function () { return host.getNewLine(); }, getSourceFile: program.getSourceFile, getSourceFileByPath: program.getSourceFileByPath, getSourceFiles: program.getSourceFiles, getLibFileFromReference: program.getLibFileFromReference, isSourceFileFromExternalLibrary: isSourceFileFromExternalLibrary, writeFile: writeFileCallback || (function (fileName, data, writeByteOrderMark, onError, sourceFiles) { return host.writeFile(fileName, data, writeByteOrderMark, onError, sourceFiles); }), isEmitBlocked: isEmitBlocked, readFile: function (f) { return host.readFile(f); }, fileExists: function (f) {
+                getCanonicalFileName: getCanonicalFileName, getCommonSourceDirectory: program.getCommonSourceDirectory, getCompilerOptions: program.getCompilerOptions, getCurrentDirectory: function () { return currentDirectory; }, getNewLine: function () { return host.getNewLine(); }, getSourceFile: program.getSourceFile, getSourceFileByPath: program.getSourceFileByPath, getSourceFiles: program.getSourceFiles, getLibFileFromReference: program.getLibFileFromReference, isSourceFileFromExternalLibrary: isSourceFileFromExternalLibrary,
+                getResolvedProjectReferenceToRedirect: getResolvedProjectReferenceToRedirect, writeFile: writeFileCallback || (function (fileName, data, writeByteOrderMark, onError, sourceFiles) { return host.writeFile(fileName, data, writeByteOrderMark, onError, sourceFiles); }), isEmitBlocked: isEmitBlocked, readFile: function (f) { return host.readFile(f); }, fileExists: function (f) {
                     // Use local caches
                     var path = toPath(f);
                     if (getSourceFileByPath(path))
@@ -88684,16 +91331,15 @@ var ts;
                         return false;
                     // Before falling back to the host
                     return host.fileExists(f);
-                } }, (host.directoryExists ? { directoryExists: function (f) { return host.directoryExists(f); } } : {}), { useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); }, getProgramBuildInfo: function () { return program.getProgramBuildInfo && program.getProgramBuildInfo(); } });
+                } }, (host.directoryExists ? { directoryExists: function (f) { return host.directoryExists(f); } } : {}), { useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); }, getProgramBuildInfo: function () { return program.getProgramBuildInfo && program.getProgramBuildInfo(); }, getSourceFileFromReference: function (file, ref) { return program.getSourceFileFromReference(file, ref); } });
         }
         function emitBuildInfo(writeFileCallback) {
             ts.Debug.assert(!options.out && !options.outFile);
             ts.performance.mark("beforeEmit");
             var emitResult = ts.emitFiles(ts.notImplementedResolver, getEmitHost(writeFileCallback), 
             /*targetSourceFile*/ undefined, 
+            /*transformers*/ ts.noTransformers, 
             /*emitOnlyDtsFiles*/ false, 
-            /*transformers*/ undefined, 
-            /*declaraitonTransformers*/ undefined, 
             /*onlyBuildInfo*/ true);
             ts.performance.mark("afterEmit");
             ts.performance.measure("Emit", "beforeEmit", "afterEmit");
@@ -88781,8 +91427,7 @@ var ts;
             // checked is to not pass the file to getEmitResolver.
             var emitResolver = getDiagnosticsProducingTypeChecker().getEmitResolver((options.outFile || options.out) ? undefined : sourceFile, cancellationToken);
             ts.performance.mark("beforeEmit");
-            var transformers = emitOnlyDtsFiles ? [] : ts.getTransformers(options, customTransformers);
-            var emitResult = ts.emitFiles(emitResolver, getEmitHost(writeFileCallback), sourceFile, emitOnlyDtsFiles, transformers, customTransformers && customTransformers.afterDeclarations);
+            var emitResult = ts.emitFiles(emitResolver, getEmitHost(writeFileCallback), sourceFile, ts.getTransformers(options, customTransformers, emitOnlyDtsFiles), emitOnlyDtsFiles);
             ts.performance.mark("afterEmit");
             ts.performance.measure("Emit", "beforeEmit", "afterEmit");
             return emitResult;
@@ -88874,8 +91519,8 @@ var ts;
                 for (var _i = 0, _a = [bindDiagnostics, checkDiagnostics, fileProcessingDiagnosticsInFile, programDiagnosticsInFile, isCheckJs ? sourceFile.jsDocDiagnostics : undefined]; _i < _a.length; _i++) {
                     var diags = _a[_i];
                     if (diags) {
-                        for (var _b = 0, diags_1 = diags; _b < diags_1.length; _b++) {
-                            var diag = diags_1[_b];
+                        for (var _b = 0, diags_4 = diags; _b < diags_4.length; _b++) {
+                            var diag = diags_4[_b];
                             if (shouldReportDiagnostic(diag)) {
                                 diagnostics = ts.append(diagnostics, diag);
                             }
@@ -88924,22 +91569,22 @@ var ts;
                     // Return directly from the case if the given node doesnt want to visit each child
                     // Otherwise break to visit each child
                     switch (parent.kind) {
-                        case 151 /* Parameter */:
-                        case 154 /* PropertyDeclaration */:
+                        case 152 /* Parameter */:
+                        case 155 /* PropertyDeclaration */:
                             if (parent.questionToken === node) {
                                 diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics._0_can_only_be_used_in_a_ts_file, "?"));
                                 return;
                             }
                         // falls through
-                        case 156 /* MethodDeclaration */:
-                        case 155 /* MethodSignature */:
-                        case 157 /* Constructor */:
-                        case 158 /* GetAccessor */:
-                        case 159 /* SetAccessor */:
-                        case 196 /* FunctionExpression */:
-                        case 239 /* FunctionDeclaration */:
-                        case 197 /* ArrowFunction */:
-                        case 237 /* VariableDeclaration */:
+                        case 157 /* MethodDeclaration */:
+                        case 156 /* MethodSignature */:
+                        case 158 /* Constructor */:
+                        case 159 /* GetAccessor */:
+                        case 160 /* SetAccessor */:
+                        case 197 /* FunctionExpression */:
+                        case 240 /* FunctionDeclaration */:
+                        case 198 /* ArrowFunction */:
+                        case 238 /* VariableDeclaration */:
                             // type annotation
                             if (parent.type === node) {
                                 diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.types_can_only_be_used_in_a_ts_file));
@@ -88947,41 +91592,41 @@ var ts;
                             }
                     }
                     switch (node.kind) {
-                        case 248 /* ImportEqualsDeclaration */:
+                        case 249 /* ImportEqualsDeclaration */:
                             diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.import_can_only_be_used_in_a_ts_file));
                             return;
-                        case 254 /* ExportAssignment */:
+                        case 255 /* ExportAssignment */:
                             if (node.isExportEquals) {
                                 diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.export_can_only_be_used_in_a_ts_file));
                                 return;
                             }
                             break;
-                        case 273 /* HeritageClause */:
+                        case 274 /* HeritageClause */:
                             var heritageClause = node;
-                            if (heritageClause.token === 109 /* ImplementsKeyword */) {
+                            if (heritageClause.token === 110 /* ImplementsKeyword */) {
                                 diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.implements_clauses_can_only_be_used_in_a_ts_file));
                                 return;
                             }
                             break;
-                        case 241 /* InterfaceDeclaration */:
+                        case 242 /* InterfaceDeclaration */:
                             diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.interface_declarations_can_only_be_used_in_a_ts_file));
                             return;
-                        case 244 /* ModuleDeclaration */:
+                        case 245 /* ModuleDeclaration */:
                             diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.module_declarations_can_only_be_used_in_a_ts_file));
                             return;
-                        case 242 /* TypeAliasDeclaration */:
+                        case 243 /* TypeAliasDeclaration */:
                             diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.type_aliases_can_only_be_used_in_a_ts_file));
                             return;
-                        case 243 /* EnumDeclaration */:
+                        case 244 /* EnumDeclaration */:
                             diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.enum_declarations_can_only_be_used_in_a_ts_file));
                             return;
-                        case 213 /* NonNullExpression */:
+                        case 214 /* NonNullExpression */:
                             diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.non_null_assertions_can_only_be_used_in_a_ts_file));
                             return;
-                        case 212 /* AsExpression */:
+                        case 213 /* AsExpression */:
                             diagnostics.push(createDiagnosticForNode(node.type, ts.Diagnostics.type_assertion_expressions_can_only_be_used_in_a_ts_file));
                             return;
-                        case 194 /* TypeAssertionExpression */:
+                        case 195 /* TypeAssertionExpression */:
                             ts.Debug.fail(); // Won't parse these in a JS file anyway, as they are interpreted as JSX.
                     }
                     var prevParent = parent;
@@ -88991,54 +91636,54 @@ var ts;
                 }
                 function walkArray(nodes) {
                     if (parent.decorators === nodes && !options.experimentalDecorators) {
-                        diagnostics.push(createDiagnosticForNode(parent, ts.Diagnostics.Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_to_remove_this_warning));
+                        diagnostics.push(createDiagnosticForNode(parent, ts.Diagnostics.Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_in_your_tsconfig_or_jsconfig_to_remove_this_warning));
                     }
                     switch (parent.kind) {
-                        case 240 /* ClassDeclaration */:
-                        case 156 /* MethodDeclaration */:
-                        case 155 /* MethodSignature */:
-                        case 157 /* Constructor */:
-                        case 158 /* GetAccessor */:
-                        case 159 /* SetAccessor */:
-                        case 196 /* FunctionExpression */:
-                        case 239 /* FunctionDeclaration */:
-                        case 197 /* ArrowFunction */:
+                        case 241 /* ClassDeclaration */:
+                        case 157 /* MethodDeclaration */:
+                        case 156 /* MethodSignature */:
+                        case 158 /* Constructor */:
+                        case 159 /* GetAccessor */:
+                        case 160 /* SetAccessor */:
+                        case 197 /* FunctionExpression */:
+                        case 240 /* FunctionDeclaration */:
+                        case 198 /* ArrowFunction */:
                             // Check type parameters
                             if (nodes === parent.typeParameters) {
                                 diagnostics.push(createDiagnosticForNodeArray(nodes, ts.Diagnostics.type_parameter_declarations_can_only_be_used_in_a_ts_file));
                                 return;
                             }
                         // falls through
-                        case 219 /* VariableStatement */:
+                        case 220 /* VariableStatement */:
                             // Check modifiers
                             if (nodes === parent.modifiers) {
-                                return checkModifiers(nodes, parent.kind === 219 /* VariableStatement */);
+                                return checkModifiers(nodes, parent.kind === 220 /* VariableStatement */);
                             }
                             break;
-                        case 154 /* PropertyDeclaration */:
+                        case 155 /* PropertyDeclaration */:
                             // Check modifiers of property declaration
                             if (nodes === parent.modifiers) {
                                 for (var _i = 0, _a = nodes; _i < _a.length; _i++) {
                                     var modifier = _a[_i];
-                                    if (modifier.kind !== 116 /* StaticKeyword */) {
+                                    if (modifier.kind !== 117 /* StaticKeyword */) {
                                         diagnostics.push(createDiagnosticForNode(modifier, ts.Diagnostics._0_can_only_be_used_in_a_ts_file, ts.tokenToString(modifier.kind)));
                                     }
                                 }
                                 return;
                             }
                             break;
-                        case 151 /* Parameter */:
+                        case 152 /* Parameter */:
                             // Check modifiers of parameter declaration
                             if (nodes === parent.modifiers) {
                                 diagnostics.push(createDiagnosticForNodeArray(nodes, ts.Diagnostics.parameter_modifiers_can_only_be_used_in_a_ts_file));
                                 return;
                             }
                             break;
-                        case 191 /* CallExpression */:
-                        case 192 /* NewExpression */:
-                        case 211 /* ExpressionWithTypeArguments */:
-                        case 261 /* JsxSelfClosingElement */:
-                        case 262 /* JsxOpeningElement */:
+                        case 192 /* CallExpression */:
+                        case 193 /* NewExpression */:
+                        case 212 /* ExpressionWithTypeArguments */:
+                        case 262 /* JsxSelfClosingElement */:
+                        case 263 /* JsxOpeningElement */:
                             // Check type arguments
                             if (nodes === parent.typeArguments) {
                                 diagnostics.push(createDiagnosticForNodeArray(nodes, ts.Diagnostics.type_arguments_can_only_be_used_in_a_ts_file));
@@ -89055,24 +91700,24 @@ var ts;
                     for (var _i = 0, modifiers_1 = modifiers; _i < modifiers_1.length; _i++) {
                         var modifier = modifiers_1[_i];
                         switch (modifier.kind) {
-                            case 77 /* ConstKeyword */:
+                            case 78 /* ConstKeyword */:
                                 if (isConstValid) {
                                     continue;
                                 }
                             // to report error,
                             // falls through
-                            case 115 /* PublicKeyword */:
-                            case 113 /* PrivateKeyword */:
-                            case 114 /* ProtectedKeyword */:
-                            case 133 /* ReadonlyKeyword */:
-                            case 125 /* DeclareKeyword */:
-                            case 118 /* AbstractKeyword */:
+                            case 116 /* PublicKeyword */:
+                            case 114 /* PrivateKeyword */:
+                            case 115 /* ProtectedKeyword */:
+                            case 134 /* ReadonlyKeyword */:
+                            case 126 /* DeclareKeyword */:
+                            case 119 /* AbstractKeyword */:
                                 diagnostics.push(createDiagnosticForNode(modifier, ts.Diagnostics._0_can_only_be_used_in_a_ts_file, ts.tokenToString(modifier.kind)));
                                 break;
                             // These are all legal modifiers.
-                            case 116 /* StaticKeyword */:
-                            case 85 /* ExportKeyword */:
-                            case 80 /* DefaultKeyword */:
+                            case 117 /* StaticKeyword */:
+                            case 86 /* ExportKeyword */:
+                            case 81 /* DefaultKeyword */:
                         }
                     }
                 }
@@ -89147,8 +91792,8 @@ var ts;
             return a.fileName === b.fileName;
         }
         function moduleNameIsEqualTo(a, b) {
-            return a.kind === 72 /* Identifier */
-                ? b.kind === 72 /* Identifier */ && a.escapedText === b.escapedText
+            return a.kind === 73 /* Identifier */
+                ? b.kind === 73 /* Identifier */ && a.escapedText === b.escapedText
                 : b.kind === 10 /* StringLiteral */ && a.text === b.text;
         }
         function collectExternalModuleReferences(file) {
@@ -89363,7 +92008,10 @@ var ts;
                     if (isRedirect) {
                         inputName = getProjectReferenceRedirect(fileName) || fileName;
                     }
-                    if (ts.getNormalizedAbsolutePath(checkedName, currentDirectory) !== ts.getNormalizedAbsolutePath(inputName, currentDirectory)) {
+                    // Check if it differs only in drive letters its ok to ignore that error:
+                    var checkedAbsolutePath = ts.getNormalizedAbsolutePathWithoutRoot(checkedName, currentDirectory);
+                    var inputAbsolutePath = ts.getNormalizedAbsolutePathWithoutRoot(inputName, currentDirectory);
+                    if (checkedAbsolutePath !== inputAbsolutePath) {
                         reportFileNamesDifferOnlyInCasingError(inputName, checkedName, refFile, refPos, refEnd);
                     }
                 }
@@ -89392,9 +92040,13 @@ var ts;
             }
             var redirectedPath;
             if (refFile) {
-                var redirect = getProjectReferenceRedirect(fileName);
-                if (redirect) {
-                    (refFile.redirectedReferences || (refFile.redirectedReferences = [])).push(fileName);
+                var redirectProject = getProjectReferenceRedirectProject(fileName);
+                if (redirectProject) {
+                    if (redirectProject.commandLine.options.outFile || redirectProject.commandLine.options.out) {
+                        // Shouldnt create many to 1 mapping file in --out scenario
+                        return undefined;
+                    }
+                    var redirect = getProjectReferenceOutputName(redirectProject, fileName);
                     fileName = redirect;
                     // Once we start redirecting to a file, we can potentially come back to it
                     // via a back-reference from another file in the .d.ts folder. If that happens we'll
@@ -89478,20 +92130,23 @@ var ts;
             }
         }
         function getProjectReferenceRedirect(fileName) {
+            var referencedProject = getProjectReferenceRedirectProject(fileName);
+            return referencedProject && getProjectReferenceOutputName(referencedProject, fileName);
+        }
+        function getProjectReferenceRedirectProject(fileName) {
             // Ignore dts or any of the non ts files
             if (!resolvedProjectReferences || !resolvedProjectReferences.length || ts.fileExtensionIs(fileName, ".d.ts" /* Dts */) || !ts.fileExtensionIsOneOf(fileName, ts.supportedTSExtensions)) {
                 return undefined;
             }
             // If this file is produced by a referenced project, we need to rewrite it to
             // look in the output folder of the referenced project rather than the input
-            var referencedProject = getResolvedProjectReferenceToRedirect(fileName);
-            if (!referencedProject) {
-                return undefined;
-            }
+            return getResolvedProjectReferenceToRedirect(fileName);
+        }
+        function getProjectReferenceOutputName(referencedProject, fileName) {
             var out = referencedProject.commandLine.options.outFile || referencedProject.commandLine.options.out;
             return out ?
                 ts.changeExtension(out, ".d.ts" /* Dts */) :
-                ts.getOutputDeclarationFileName(fileName, referencedProject.commandLine);
+                ts.getOutputDeclarationFileName(fileName, referencedProject.commandLine, !host.useCaseSensitiveFileNames());
         }
         /**
          * Get the referenced project if the file is input file from that reference project
@@ -89732,18 +92387,33 @@ var ts;
             if (fromCache !== undefined) {
                 return fromCache || undefined;
             }
-            // An absolute path pointing to the containing directory of the config file
-            var basePath = ts.getNormalizedAbsolutePath(ts.getDirectoryPath(refPath), host.getCurrentDirectory());
-            var sourceFile = host.getSourceFile(refPath, 100 /* JSON */);
-            addFileToFilesByName(sourceFile, sourceFilePath, /*redirectedPath*/ undefined);
-            if (sourceFile === undefined) {
-                projectReferenceRedirects.set(sourceFilePath, false);
-                return undefined;
+            var commandLine;
+            var sourceFile;
+            if (host.getParsedCommandLine) {
+                commandLine = host.getParsedCommandLine(refPath);
+                if (!commandLine) {
+                    addFileToFilesByName(/*sourceFile*/ undefined, sourceFilePath, /*redirectedPath*/ undefined);
+                    projectReferenceRedirects.set(sourceFilePath, false);
+                    return undefined;
+                }
+                sourceFile = ts.Debug.assertDefined(commandLine.options.configFile);
+                ts.Debug.assert(!sourceFile.path || sourceFile.path === sourceFilePath);
+                addFileToFilesByName(sourceFile, sourceFilePath, /*redirectedPath*/ undefined);
+            }
+            else {
+                // An absolute path pointing to the containing directory of the config file
+                var basePath = ts.getNormalizedAbsolutePath(ts.getDirectoryPath(refPath), host.getCurrentDirectory());
+                sourceFile = host.getSourceFile(refPath, 100 /* JSON */);
+                addFileToFilesByName(sourceFile, sourceFilePath, /*redirectedPath*/ undefined);
+                if (sourceFile === undefined) {
+                    projectReferenceRedirects.set(sourceFilePath, false);
+                    return undefined;
+                }
+                commandLine = ts.parseJsonSourceFileConfigFileContent(sourceFile, configParsingHost, basePath, /*existingOptions*/ undefined, refPath);
             }
             sourceFile.path = sourceFilePath;
             sourceFile.resolvedPath = sourceFilePath;
             sourceFile.originalFileName = refPath;
-            var commandLine = ts.parseJsonSourceFileConfigFileContent(sourceFile, configParsingHost, basePath, /*existingOptions*/ undefined, refPath);
             var resolvedRef = { commandLine: commandLine, sourceFile: sourceFile };
             projectReferenceRedirects.set(sourceFilePath, resolvedRef);
             if (commandLine.projectReferences) {
@@ -89759,9 +92429,6 @@ var ts;
                 if (ts.getEmitDeclarations(options)) {
                     createDiagnosticForOptionName(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, getEmitDeclarationOptionName(options), "isolatedModules");
                 }
-                if (options.noEmitOnError) {
-                    createDiagnosticForOptionName(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "noEmitOnError", "isolatedModules");
-                }
                 if (options.out) {
                     createDiagnosticForOptionName(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "out", "isolatedModules");
                 }
@@ -89793,17 +92460,20 @@ var ts;
                     createDiagnosticForOptionName(ts.Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1_or_option_2, "tsBuildInfoFile", "incremental", "composite");
                 }
             }
+            else if (options.incremental && !options.outFile && !options.out && !options.configFilePath) {
+                programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_incremental_can_only_be_specified_using_tsconfig_emitting_to_single_file_or_when_option_tsBuildInfoFile_is_specified));
+            }
             verifyProjectReferences();
             // List of collected files is complete; validate exhautiveness if this is a project with a file list
             if (options.composite) {
-                var sourceFiles = files.filter(function (f) { return !f.isDeclarationFile; });
-                if (rootNames.length < sourceFiles.length) {
-                    var normalizedRootNames = rootNames.map(function (r) { return ts.normalizePath(r).toLowerCase(); });
-                    for (var _i = 0, _a = sourceFiles.map(function (f) { return ts.normalizePath(f.path).toLowerCase(); }); _i < _a.length; _i++) {
-                        var file = _a[_i];
-                        if (normalizedRootNames.indexOf(file) === -1) {
-                            programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.File_0_is_not_in_project_file_list_Projects_must_list_all_files_or_use_an_include_pattern, file));
-                        }
+                var rootPaths = rootNames.map(toPath);
+                for (var _i = 0, files_3 = files; _i < files_3.length; _i++) {
+                    var file = files_3[_i];
+                    // Ignore file that is not emitted
+                    if (!ts.sourceFileMayBeEmitted(file, options, isSourceFileFromExternalLibrary, getResolvedProjectReferenceToRedirect))
+                        continue;
+                    if (rootPaths.indexOf(file.path) === -1) {
+                        programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.File_0_is_not_listed_within_the_file_list_of_project_1_Projects_must_list_all_files_or_use_an_include_pattern, file.fileName, options.configFilePath || ""));
                     }
                 }
             }
@@ -89877,10 +92547,10 @@ var ts;
                 if (options.module === ts.ModuleKind.None && languageVersion < 2 /* ES2015 */) {
                     createDiagnosticForOptionName(ts.Diagnostics.Option_isolatedModules_can_only_be_used_when_either_option_module_is_provided_or_option_target_is_ES2015_or_higher, "isolatedModules", "target");
                 }
-                var firstNonExternalModuleSourceFile = ts.find(files, function (f) { return !ts.isExternalModule(f) && !f.isDeclarationFile && f.scriptKind !== 6 /* JSON */; });
+                var firstNonExternalModuleSourceFile = ts.find(files, function (f) { return !ts.isExternalModule(f) && !ts.isSourceFileJS(f) && !f.isDeclarationFile && f.scriptKind !== 6 /* JSON */; });
                 if (firstNonExternalModuleSourceFile) {
                     var span = ts.getErrorSpanForNode(firstNonExternalModuleSourceFile, firstNonExternalModuleSourceFile);
-                    programDiagnostics.add(ts.createFileDiagnostic(firstNonExternalModuleSourceFile, span.start, span.length, ts.Diagnostics.Cannot_compile_namespaces_when_the_isolatedModules_flag_is_provided));
+                    programDiagnostics.add(ts.createFileDiagnostic(firstNonExternalModuleSourceFile, span.start, span.length, ts.Diagnostics.All_files_must_be_modules_when_the_isolatedModules_flag_is_provided));
                 }
             }
             else if (firstNonAmbientExternalModuleSourceFile && languageVersion < 2 /* ES2015 */ && options.module === ts.ModuleKind.None) {
@@ -89965,13 +92635,13 @@ var ts;
                     var emitFilePath = toPath(emitFileName);
                     // Report error if the output overwrites input file
                     if (filesByName.has(emitFilePath)) {
-                        var chain_2;
+                        var chain = void 0;
                         if (!options.configFilePath) {
                             // The program is from either an inferred project or an external project
-                            chain_2 = ts.chainDiagnosticMessages(/*details*/ undefined, ts.Diagnostics.Adding_a_tsconfig_json_file_will_help_organize_projects_that_contain_both_TypeScript_and_JavaScript_files_Learn_more_at_https_Colon_Slash_Slashaka_ms_Slashtsconfig);
+                            chain = ts.chainDiagnosticMessages(/*details*/ undefined, ts.Diagnostics.Adding_a_tsconfig_json_file_will_help_organize_projects_that_contain_both_TypeScript_and_JavaScript_files_Learn_more_at_https_Colon_Slash_Slashaka_ms_Slashtsconfig);
                         }
-                        chain_2 = ts.chainDiagnosticMessages(chain_2, ts.Diagnostics.Cannot_write_file_0_because_it_would_overwrite_input_file, emitFileName);
-                        blockEmittingOfFile(emitFileName, ts.createCompilerDiagnosticFromMessageChain(chain_2));
+                        chain = ts.chainDiagnosticMessages(chain, ts.Diagnostics.Cannot_write_file_0_because_it_would_overwrite_input_file, emitFileName);
+                        blockEmittingOfFile(emitFileName, ts.createCompilerDiagnosticFromMessageChain(chain));
                     }
                     var emitFileKey = !host.useCaseSensitiveFileNames() ? emitFilePath.toLocaleLowerCase() : emitFilePath;
                     // Report error if multiple files write into same file
@@ -90161,7 +92831,7 @@ var ts;
             readFile: function (f) { return directoryStructureHost.readFile(f); },
             useCaseSensitiveFileNames: host.useCaseSensitiveFileNames(),
             getCurrentDirectory: function () { return host.getCurrentDirectory(); },
-            onUnRecoverableConfigFileDiagnostic: host.onUnRecoverableConfigFileDiagnostic || (function () { return undefined; }),
+            onUnRecoverableConfigFileDiagnostic: host.onUnRecoverableConfigFileDiagnostic || ts.returnUndefined,
             trace: host.trace ? function (s) { return host.trace(s); } : undefined
         };
     }
@@ -90383,7 +93053,7 @@ var ts;
             // Create the reference map, and set the file infos
             for (var _i = 0, _a = newProgram.getSourceFiles(); _i < _a.length; _i++) {
                 var sourceFile = _a[_i];
-                var version_1 = sourceFile.version;
+                var version_1 = ts.Debug.assertDefined(sourceFile.version, "Program intended to be used with Builder should have source files with versions set");
                 var oldInfo = useOldState ? oldState.fileInfos.get(sourceFile.path) : undefined;
                 if (referencedMap) {
                     var newReferences = getReferencedFiles(newProgram, sourceFile, getCanonicalFileName);
@@ -90506,6 +93176,7 @@ var ts;
             cacheToUpdateSignature.set(sourceFile.path, latestSignature);
             return !prevSignature || latestSignature !== prevSignature;
         }
+        BuilderState.updateShapeSignature = updateShapeSignature;
         /**
          * Coverts the declaration emit result into exported modules map
          */
@@ -90548,7 +93219,6 @@ var ts;
          * Get all the dependencies of the sourceFile
          */
         function getAllDependencies(state, programOfThisState, sourceFile) {
-            var _a;
             var compilerOptions = programOfThisState.getCompilerOptions();
             // With --out or --outFile all outputs go into single file, all files depend on each other
             if (compilerOptions.outFile || compilerOptions.out) {
@@ -90568,8 +93238,8 @@ var ts;
                     var references = state.referencedMap.get(path);
                     if (references) {
                         var iterator = references.keys();
-                        for (var _b = iterator.next(), value = _b.value, done = _b.done; !done; _a = iterator.next(), value = _a.value, done = _a.done, _a) {
-                            queue.push(value);
+                        for (var iterResult = iterator.next(); !iterResult.done; iterResult = iterator.next()) {
+                            queue.push(iterResult.value);
                         }
                     }
                 }
@@ -90775,7 +93445,7 @@ var ts;
                 // Unchanged file copy diagnostics
                 var diagnostics = oldState.semanticDiagnosticsPerFile.get(sourceFilePath);
                 if (diagnostics) {
-                    state.semanticDiagnosticsPerFile.set(sourceFilePath, oldState.hasReusableDiagnostic ? convertToDiagnostics(diagnostics, newProgram) : diagnostics);
+                    state.semanticDiagnosticsPerFile.set(sourceFilePath, oldState.hasReusableDiagnostic ? convertToDiagnostics(diagnostics, newProgram, getCanonicalFileName) : diagnostics);
                     if (!state.semanticDiagnosticsFromOldState) {
                         state.semanticDiagnosticsFromOldState = ts.createMap();
                     }
@@ -90783,44 +93453,37 @@ var ts;
                 }
             }
         });
-        if (oldCompilerOptions &&
-            (oldCompilerOptions.outDir !== compilerOptions.outDir ||
-                oldCompilerOptions.declarationDir !== compilerOptions.declarationDir ||
-                (oldCompilerOptions.outFile || oldCompilerOptions.out) !== (compilerOptions.outFile || compilerOptions.out))) {
+        if (oldCompilerOptions && ts.compilerOptionsAffectEmit(compilerOptions, oldCompilerOptions)) {
             // Add all files to affectedFilesPendingEmit since emit changed
-            state.affectedFilesPendingEmit = ts.concatenate(state.affectedFilesPendingEmit, newProgram.getSourceFiles().map(function (f) { return f.path; }));
-            if (state.affectedFilesPendingEmitIndex === undefined) {
-                state.affectedFilesPendingEmitIndex = 0;
-            }
+            addToAffectedFilesPendingEmit(state, newProgram.getSourceFiles().map(function (f) { return f.path; }));
             ts.Debug.assert(state.seenAffectedFiles === undefined);
             state.seenAffectedFiles = ts.createMap();
         }
         return state;
     }
-    function convertToDiagnostics(diagnostics, newProgram) {
+    function convertToDiagnostics(diagnostics, newProgram, getCanonicalFileName) {
         if (!diagnostics.length)
             return ts.emptyArray;
+        var buildInfoDirectory = ts.getDirectoryPath(ts.getNormalizedAbsolutePath(ts.getOutputPathForBuildInfo(newProgram.getCompilerOptions()), newProgram.getCurrentDirectory()));
         return diagnostics.map(function (diagnostic) {
-            var result = convertToDiagnosticRelatedInformation(diagnostic, newProgram);
+            var result = convertToDiagnosticRelatedInformation(diagnostic, newProgram, toPath);
             result.reportsUnnecessary = diagnostic.reportsUnnecessary;
             result.source = diagnostic.source;
             var relatedInformation = diagnostic.relatedInformation;
             result.relatedInformation = relatedInformation ?
                 relatedInformation.length ?
-                    relatedInformation.map(function (r) { return convertToDiagnosticRelatedInformation(r, newProgram); }) :
+                    relatedInformation.map(function (r) { return convertToDiagnosticRelatedInformation(r, newProgram, toPath); }) :
                     ts.emptyArray :
                 undefined;
             return result;
         });
+        function toPath(path) {
+            return ts.toPath(path, buildInfoDirectory, getCanonicalFileName);
+        }
     }
-    function convertToDiagnosticRelatedInformation(diagnostic, newProgram) {
-        var file = diagnostic.file, messageText = diagnostic.messageText;
-        return __assign({}, diagnostic, { file: file && newProgram.getSourceFileByPath(file), messageText: messageText === undefined || ts.isString(messageText) ?
-                messageText :
-                convertToDiagnosticMessageChain(messageText, newProgram) });
-    }
-    function convertToDiagnosticMessageChain(diagnostic, newProgram) {
-        return __assign({}, diagnostic, { next: diagnostic.next && convertToDiagnosticMessageChain(diagnostic.next, newProgram) });
+    function convertToDiagnosticRelatedInformation(diagnostic, newProgram, toPath) {
+        var file = diagnostic.file;
+        return __assign({}, diagnostic, { file: file ? newProgram.getSourceFileByPath(toPath(file)) : undefined });
     }
     /**
      * Releases program and other related not needed properties
@@ -90875,7 +93538,7 @@ var ts;
                     if (!seenAffectedFiles.has(affectedFile.path)) {
                         // Set the next affected file as seen and remove the cached semantic diagnostics
                         state.affectedFilesIndex = affectedFilesIndex;
-                        cleanSemanticDiagnosticsOfAffectedFile(state, affectedFile);
+                        handleDtsMayChangeOfAffectedFile(state, affectedFile, cancellationToken, computeHash);
                         return affectedFile;
                     }
                     seenAffectedFiles.set(affectedFile.path, true);
@@ -90936,94 +93599,49 @@ var ts;
         return undefined;
     }
     /**
-     * Remove the semantic diagnostics cached from old state for affected File and the files that are referencing modules that export entities from affected file
+     *  Handles semantic diagnostics and dts emit for affectedFile and files, that are referencing modules that export entities from affected file
+     *  This is because even though js emit doesnt change, dts emit / type used can change resulting in need for dts emit and js change
      */
-    function cleanSemanticDiagnosticsOfAffectedFile(state, affectedFile) {
-        if (removeSemanticDiagnosticsOf(state, affectedFile.path)) {
-            // If there are no more diagnostics from old cache, done
+    function handleDtsMayChangeOfAffectedFile(state, affectedFile, cancellationToken, computeHash) {
+        removeSemanticDiagnosticsOf(state, affectedFile.path);
+        // If affected files is everything except default library, then nothing more to do
+        if (state.allFilesExcludingDefaultLibraryFile === state.affectedFiles) {
+            if (!state.cleanedDiagnosticsOfLibFiles) {
+                state.cleanedDiagnosticsOfLibFiles = true;
+                var program_1 = ts.Debug.assertDefined(state.program);
+                var options_2 = program_1.getCompilerOptions();
+                ts.forEach(program_1.getSourceFiles(), function (f) {
+                    return program_1.isSourceFileDefaultLibrary(f) &&
+                        !ts.skipTypeChecking(f, options_2) &&
+                        removeSemanticDiagnosticsOf(state, f.path);
+                });
+            }
             return;
         }
-        // Clean lib file diagnostics if its all files excluding default files to emit
-        if (state.allFilesExcludingDefaultLibraryFile === state.affectedFiles && !state.cleanedDiagnosticsOfLibFiles) {
-            state.cleanedDiagnosticsOfLibFiles = true;
-            var program_1 = ts.Debug.assertDefined(state.program);
-            var options_2 = program_1.getCompilerOptions();
-            if (ts.forEach(program_1.getSourceFiles(), function (f) {
-                return program_1.isSourceFileDefaultLibrary(f) &&
-                    !ts.skipTypeChecking(f, options_2) &&
-                    removeSemanticDiagnosticsOf(state, f.path);
-            })) {
-                return;
+        forEachReferencingModulesOfExportOfAffectedFile(state, affectedFile, function (state, path) { return handleDtsMayChangeOf(state, path, cancellationToken, computeHash); });
+    }
+    /**
+     * Handle the dts may change, so they need to be added to pending emit if dts emit is enabled,
+     * Also we need to make sure signature is updated for these files
+     */
+    function handleDtsMayChangeOf(state, path, cancellationToken, computeHash) {
+        removeSemanticDiagnosticsOf(state, path);
+        if (!state.changedFilesSet.has(path)) {
+            var program = ts.Debug.assertDefined(state.program);
+            var sourceFile = program.getSourceFileByPath(path);
+            if (sourceFile) {
+                // Even though the js emit doesnt change and we are already handling dts emit and semantic diagnostics
+                // we need to update the signature to reflect correctness of the signature(which is output d.ts emit) of this file
+                // This ensures that we dont later during incremental builds considering wrong signature.
+                // Eg where this also is needed to ensure that .tsbuildinfo generated by incremental build should be same as if it was first fresh build
+                ts.BuilderState.updateShapeSignature(state, program, sourceFile, ts.Debug.assertDefined(state.currentAffectedFilesSignatures), cancellationToken, computeHash, state.currentAffectedFilesExportedModulesMap);
+                // If not dts emit, nothing more to do
+                if (ts.getEmitDeclarations(state.compilerOptions)) {
+                    addToAffectedFilesPendingEmit(state, [path]);
+                }
             }
         }
-        // If there was change in signature for the changed file,
-        // then delete the semantic diagnostics for files that are affected by using exports of this module
-        if (!state.exportedModulesMap || state.affectedFiles.length === 1 || !state.changedFilesSet.has(affectedFile.path)) {
-            return;
-        }
-        ts.Debug.assert(!!state.currentAffectedFilesExportedModulesMap);
-        var seenFileAndExportsOfFile = ts.createMap();
-        // Go through exported modules from cache first
-        // If exported modules has path, all files referencing file exported from are affected
-        if (ts.forEachEntry(state.currentAffectedFilesExportedModulesMap, function (exportedModules, exportedFromPath) {
-            return exportedModules &&
-                exportedModules.has(affectedFile.path) &&
-                removeSemanticDiagnosticsOfFilesReferencingPath(state, exportedFromPath, seenFileAndExportsOfFile);
-        })) {
-            return;
-        }
-        // If exported from path is not from cache and exported modules has path, all files referencing file exported from are affected
-        ts.forEachEntry(state.exportedModulesMap, function (exportedModules, exportedFromPath) {
-            return !state.currentAffectedFilesExportedModulesMap.has(exportedFromPath) && // If we already iterated this through cache, ignore it
-                exportedModules.has(affectedFile.path) &&
-                removeSemanticDiagnosticsOfFilesReferencingPath(state, exportedFromPath, seenFileAndExportsOfFile);
-        });
-    }
-    /**
-     * removes the semantic diagnostics of files referencing referencedPath and
-     * returns true if there are no more semantic diagnostics from old state
-     */
-    function removeSemanticDiagnosticsOfFilesReferencingPath(state, referencedPath, seenFileAndExportsOfFile) {
-        return ts.forEachEntry(state.referencedMap, function (referencesInFile, filePath) {
-            return referencesInFile.has(referencedPath) && removeSemanticDiagnosticsOfFileAndExportsOfFile(state, filePath, seenFileAndExportsOfFile);
-        });
-    }
-    /**
-     * Removes semantic diagnostics of file and anything that exports this file
-     */
-    function removeSemanticDiagnosticsOfFileAndExportsOfFile(state, filePath, seenFileAndExportsOfFile) {
-        if (!ts.addToSeen(seenFileAndExportsOfFile, filePath)) {
-            return false;
-        }
-        if (removeSemanticDiagnosticsOf(state, filePath)) {
-            // If there are no more diagnostics from old cache, done
-            return true;
-        }
-        ts.Debug.assert(!!state.currentAffectedFilesExportedModulesMap);
-        // Go through exported modules from cache first
-        // If exported modules has path, all files referencing file exported from are affected
-        if (ts.forEachEntry(state.currentAffectedFilesExportedModulesMap, function (exportedModules, exportedFromPath) {
-            return exportedModules &&
-                exportedModules.has(filePath) &&
-                removeSemanticDiagnosticsOfFileAndExportsOfFile(state, exportedFromPath, seenFileAndExportsOfFile);
-        })) {
-            return true;
-        }
-        // If exported from path is not from cache and exported modules has path, all files referencing file exported from are affected
-        if (ts.forEachEntry(state.exportedModulesMap, function (exportedModules, exportedFromPath) {
-            return !state.currentAffectedFilesExportedModulesMap.has(exportedFromPath) && // If we already iterated this through cache, ignore it
-                exportedModules.has(filePath) &&
-                removeSemanticDiagnosticsOfFileAndExportsOfFile(state, exportedFromPath, seenFileAndExportsOfFile);
-        })) {
-            return true;
-        }
-        // Remove diagnostics of files that import this file (without going to exports of referencing files)
-        return !!ts.forEachEntry(state.referencedMap, function (referencesInFile, referencingFilePath) {
-            return referencesInFile.has(filePath) &&
-                !seenFileAndExportsOfFile.has(referencingFilePath) && // Not already removed diagnostic file
-                removeSemanticDiagnosticsOf(state, referencingFilePath);
-        } // Dont add to seen since this is not yet done with the export removal
-        );
+        return false;
     }
     /**
      * Removes semantic diagnostics for path and
@@ -91037,6 +93655,78 @@ var ts;
         state.semanticDiagnosticsPerFile.delete(path);
         return !state.semanticDiagnosticsFromOldState.size;
     }
+    /**
+     * Iterate on referencing modules that export entities from affected file
+     */
+    function forEachReferencingModulesOfExportOfAffectedFile(state, affectedFile, fn) {
+        // If there was change in signature (dts output) for the changed file,
+        // then only we need to handle pending file emit
+        if (!state.exportedModulesMap || state.affectedFiles.length === 1 || !state.changedFilesSet.has(affectedFile.path)) {
+            return;
+        }
+        ts.Debug.assert(!!state.currentAffectedFilesExportedModulesMap);
+        var seenFileAndExportsOfFile = ts.createMap();
+        // Go through exported modules from cache first
+        // If exported modules has path, all files referencing file exported from are affected
+        if (ts.forEachEntry(state.currentAffectedFilesExportedModulesMap, function (exportedModules, exportedFromPath) {
+            return exportedModules &&
+                exportedModules.has(affectedFile.path) &&
+                forEachFilesReferencingPath(state, exportedFromPath, seenFileAndExportsOfFile, fn);
+        })) {
+            return;
+        }
+        // If exported from path is not from cache and exported modules has path, all files referencing file exported from are affected
+        ts.forEachEntry(state.exportedModulesMap, function (exportedModules, exportedFromPath) {
+            return !state.currentAffectedFilesExportedModulesMap.has(exportedFromPath) && // If we already iterated this through cache, ignore it
+                exportedModules.has(affectedFile.path) &&
+                forEachFilesReferencingPath(state, exportedFromPath, seenFileAndExportsOfFile, fn);
+        });
+    }
+    /**
+     * Iterate on files referencing referencedPath
+     */
+    function forEachFilesReferencingPath(state, referencedPath, seenFileAndExportsOfFile, fn) {
+        return ts.forEachEntry(state.referencedMap, function (referencesInFile, filePath) {
+            return referencesInFile.has(referencedPath) && forEachFileAndExportsOfFile(state, filePath, seenFileAndExportsOfFile, fn);
+        });
+    }
+    /**
+     * fn on file and iterate on anything that exports this file
+     */
+    function forEachFileAndExportsOfFile(state, filePath, seenFileAndExportsOfFile, fn) {
+        if (!ts.addToSeen(seenFileAndExportsOfFile, filePath)) {
+            return false;
+        }
+        if (fn(state, filePath)) {
+            // If there are no more diagnostics from old cache, done
+            return true;
+        }
+        ts.Debug.assert(!!state.currentAffectedFilesExportedModulesMap);
+        // Go through exported modules from cache first
+        // If exported modules has path, all files referencing file exported from are affected
+        if (ts.forEachEntry(state.currentAffectedFilesExportedModulesMap, function (exportedModules, exportedFromPath) {
+            return exportedModules &&
+                exportedModules.has(filePath) &&
+                forEachFileAndExportsOfFile(state, exportedFromPath, seenFileAndExportsOfFile, fn);
+        })) {
+            return true;
+        }
+        // If exported from path is not from cache and exported modules has path, all files referencing file exported from are affected
+        if (ts.forEachEntry(state.exportedModulesMap, function (exportedModules, exportedFromPath) {
+            return !state.currentAffectedFilesExportedModulesMap.has(exportedFromPath) && // If we already iterated this through cache, ignore it
+                exportedModules.has(filePath) &&
+                forEachFileAndExportsOfFile(state, exportedFromPath, seenFileAndExportsOfFile, fn);
+        })) {
+            return true;
+        }
+        // Remove diagnostics of files that import this file (without going to exports of referencing files)
+        return !!ts.forEachEntry(state.referencedMap, function (referencesInFile, referencingFilePath) {
+            return referencesInFile.has(filePath) &&
+                !seenFileAndExportsOfFile.has(referencingFilePath) && // Not already removed diagnostic file
+                fn(state, referencingFilePath);
+        } // Dont add to seen since this is not yet done with the export removal
+        );
+    }
     /**
      * This is called after completing operation on the next affected file.
      * The operations here are postponed to ensure that cancellation during the iteration is handled correctly
@@ -91089,19 +93779,24 @@ var ts;
     /**
      * Gets the program information to be emitted in buildInfo so that we can use it to create new program
      */
-    function getProgramBuildInfo(state) {
+    function getProgramBuildInfo(state, getCanonicalFileName) {
         if (state.compilerOptions.outFile || state.compilerOptions.out)
             return undefined;
+        var currentDirectory = ts.Debug.assertDefined(state.program).getCurrentDirectory();
+        var buildInfoDirectory = ts.getDirectoryPath(ts.getNormalizedAbsolutePath(ts.getOutputPathForBuildInfo(state.compilerOptions), currentDirectory));
         var fileInfos = {};
         state.fileInfos.forEach(function (value, key) {
             var signature = state.currentAffectedFilesSignatures && state.currentAffectedFilesSignatures.get(key);
-            fileInfos[key] = signature === undefined ? value : { version: value.version, signature: signature };
+            fileInfos[relativeToBuildInfo(key)] = signature === undefined ? value : { version: value.version, signature: signature };
         });
-        var result = { fileInfos: fileInfos, options: state.compilerOptions };
+        var result = {
+            fileInfos: fileInfos,
+            options: convertToReusableCompilerOptions(state.compilerOptions, relativeToBuildInfoEnsuringAbsolutePath)
+        };
         if (state.referencedMap) {
             var referencedMap_1 = {};
             state.referencedMap.forEach(function (value, key) {
-                referencedMap_1[key] = ts.arrayFrom(value.keys());
+                referencedMap_1[relativeToBuildInfo(key)] = ts.arrayFrom(value.keys(), relativeToBuildInfo);
             });
             result.referencedMap = referencedMap_1;
         }
@@ -91111,10 +93806,10 @@ var ts;
                 var newValue = state.currentAffectedFilesExportedModulesMap && state.currentAffectedFilesExportedModulesMap.get(key);
                 // Not in temporary cache, use existing value
                 if (newValue === undefined)
-                    exportedModulesMap_1[key] = ts.arrayFrom(value.keys());
+                    exportedModulesMap_1[relativeToBuildInfo(key)] = ts.arrayFrom(value.keys(), relativeToBuildInfo);
                 // Value in cache and has updated value map, use that
                 else if (newValue)
-                    exportedModulesMap_1[key] = ts.arrayFrom(newValue.keys());
+                    exportedModulesMap_1[relativeToBuildInfo(key)] = ts.arrayFrom(newValue.keys(), relativeToBuildInfo);
             });
             result.exportedModulesMap = exportedModulesMap_1;
         }
@@ -91123,39 +93818,67 @@ var ts;
             // Currently not recording actual errors since those mean no emit for tsc --build
             state.semanticDiagnosticsPerFile.forEach(function (value, key) { return semanticDiagnosticsPerFile_1.push(value.length ?
                 [
-                    key,
+                    relativeToBuildInfo(key),
                     state.hasReusableDiagnostic ?
                         value :
-                        convertToReusableDiagnostics(value)
+                        convertToReusableDiagnostics(value, relativeToBuildInfo)
                 ] :
-                key); });
+                relativeToBuildInfo(key)); });
             result.semanticDiagnosticsPerFile = semanticDiagnosticsPerFile_1;
         }
         return result;
+        function relativeToBuildInfoEnsuringAbsolutePath(path) {
+            return relativeToBuildInfo(ts.getNormalizedAbsolutePath(path, currentDirectory));
+        }
+        function relativeToBuildInfo(path) {
+            return ts.ensurePathIsNonModuleName(ts.getRelativePathFromDirectory(buildInfoDirectory, path, getCanonicalFileName));
+        }
     }
-    function convertToReusableDiagnostics(diagnostics) {
+    function convertToReusableCompilerOptions(options, relativeToBuildInfo) {
+        var result = {};
+        var optionsNameMap = ts.getOptionNameMap().optionNameMap;
+        for (var name in options) {
+            if (ts.hasProperty(options, name)) {
+                result[name] = convertToReusableCompilerOptionValue(optionsNameMap.get(name.toLowerCase()), options[name], relativeToBuildInfo);
+            }
+        }
+        if (result.configFilePath) {
+            result.configFilePath = relativeToBuildInfo(result.configFilePath);
+        }
+        return result;
+    }
+    function convertToReusableCompilerOptionValue(option, value, relativeToBuildInfo) {
+        if (option) {
+            if (option.type === "list") {
+                var values = value;
+                if (option.element.isFilePath && values.length) {
+                    return values.map(relativeToBuildInfo);
+                }
+            }
+            else if (option.isFilePath) {
+                return relativeToBuildInfo(value);
+            }
+        }
+        return value;
+    }
+    function convertToReusableDiagnostics(diagnostics, relativeToBuildInfo) {
         ts.Debug.assert(!!diagnostics.length);
         return diagnostics.map(function (diagnostic) {
-            var result = convertToReusableDiagnosticRelatedInformation(diagnostic);
+            var result = convertToReusableDiagnosticRelatedInformation(diagnostic, relativeToBuildInfo);
             result.reportsUnnecessary = diagnostic.reportsUnnecessary;
             result.source = diagnostic.source;
             var relatedInformation = diagnostic.relatedInformation;
             result.relatedInformation = relatedInformation ?
                 relatedInformation.length ?
-                    relatedInformation.map(function (r) { return convertToReusableDiagnosticRelatedInformation(r); }) :
+                    relatedInformation.map(function (r) { return convertToReusableDiagnosticRelatedInformation(r, relativeToBuildInfo); }) :
                     ts.emptyArray :
                 undefined;
             return result;
         });
     }
-    function convertToReusableDiagnosticRelatedInformation(diagnostic) {
-        var file = diagnostic.file, messageText = diagnostic.messageText;
-        return __assign({}, diagnostic, { file: file && file.path, messageText: messageText === undefined || ts.isString(messageText) ?
-                messageText :
-                convertToReusableDiagnosticMessageChain(messageText) });
-    }
-    function convertToReusableDiagnosticMessageChain(diagnostic) {
-        return __assign({}, diagnostic, { next: diagnostic.next && convertToReusableDiagnosticMessageChain(diagnostic.next) });
+    function convertToReusableDiagnosticRelatedInformation(diagnostic, relativeToBuildInfo) {
+        var file = diagnostic.file;
+        return __assign({}, diagnostic, { file: file ? relativeToBuildInfo(file.path) : undefined });
     }
     var BuilderProgramKind;
     (function (BuilderProgramKind) {
@@ -91213,7 +93936,7 @@ var ts;
         var computeHash = host.createHash || ts.generateDjb2Hash;
         var state = createBuilderProgramState(newProgram, getCanonicalFileName, oldState);
         var backupState;
-        newProgram.getProgramBuildInfo = function () { return getProgramBuildInfo(state); };
+        newProgram.getProgramBuildInfo = function () { return getProgramBuildInfo(state, getCanonicalFileName); };
         // To ensure that we arent storing any references to old program or new program without state
         newProgram = undefined; // TODO: GH#18217
         oldProgram = undefined;
@@ -91239,6 +93962,7 @@ var ts;
             result.getSemanticDiagnosticsOfNextAffectedFile = getSemanticDiagnosticsOfNextAffectedFile;
         }
         else if (kind === BuilderProgramKind.EmitAndSemanticDiagnosticsBuilderProgram) {
+            result.getSemanticDiagnosticsOfNextAffectedFile = getSemanticDiagnosticsOfNextAffectedFile;
             result.emitNextAffectedFile = emitNextAffectedFile;
         }
         else {
@@ -91264,7 +93988,7 @@ var ts;
                         return toAffectedFileResult(state, 
                         // When whole program is affected, do emit only once (eg when --out or --outFile is specified)
                         // Otherwise just affected file
-                        affected_1.emitBuildInfo(writeFile || host.writeFile, cancellationToken), affected_1, 
+                        affected_1.emitBuildInfo(writeFile || ts.maybeBind(host, host.writeFile), cancellationToken), affected_1, 
                         /*isPendingEmitFile*/ false, 
                         /*isBuildInfoEmit*/ true);
                     }
@@ -91280,14 +94004,10 @@ var ts;
                     affected = program;
                 }
             }
-            // Mark seen emitted files if there are pending files to be emitted
-            if (state.affectedFilesPendingEmit && state.program !== affected) {
-                (state.seenEmittedFiles || (state.seenEmittedFiles = ts.createMap())).set(affected.path, true);
-            }
             return toAffectedFileResult(state, 
             // When whole program is affected, do emit only once (eg when --out or --outFile is specified)
             // Otherwise just affected file
-            ts.Debug.assertDefined(state.program).emit(affected === state.program ? undefined : affected, writeFile || host.writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers), affected, isPendingEmitFile);
+            ts.Debug.assertDefined(state.program).emit(affected === state.program ? undefined : affected, writeFile || ts.maybeBind(host, host.writeFile), cancellationToken, emitOnlyDtsFiles, customTransformers), affected, isPendingEmitFile);
         }
         /**
          * Emits the JavaScript and declaration files.
@@ -91324,7 +94044,7 @@ var ts;
                     };
                 }
             }
-            return ts.Debug.assertDefined(state.program).emit(targetSourceFile, writeFile || host.writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers);
+            return ts.Debug.assertDefined(state.program).emit(targetSourceFile, writeFile || ts.maybeBind(host, host.writeFile), cancellationToken, emitOnlyDtsFiles, customTransformers);
         }
         /**
          * Return the semantic diagnostics for the next affected file or undefined if iteration is complete
@@ -91341,6 +94061,10 @@ var ts;
                     // When whole program is affected, get all semantic diagnostics (eg when --out or --outFile is specified)
                     return toAffectedFileResult(state, state.program.getSemanticDiagnostics(/*targetSourceFile*/ undefined, cancellationToken), affected);
                 }
+                // Add file to affected file pending emit to handle for later emit time
+                if (kind === BuilderProgramKind.EmitAndSemanticDiagnosticsBuilderProgram) {
+                    addToAffectedFilesPendingEmit(state, [affected.path]);
+                }
                 // Get diagnostics for the affected file if its not ignored
                 if (ignoreSourceFile && ignoreSourceFile(affected)) {
                     // Get next affected file
@@ -91371,35 +94095,29 @@ var ts;
             }
             // When semantic builder asks for diagnostics of the whole program,
             // ensure that all the affected files are handled
-            var affected;
-            var affectedFilesPendingEmit;
-            while (affected = getNextAffectedFile(state, cancellationToken, computeHash)) {
-                if (affected !== state.program && kind === BuilderProgramKind.EmitAndSemanticDiagnosticsBuilderProgram) {
-                    (affectedFilesPendingEmit || (affectedFilesPendingEmit = [])).push(affected.path);
-                }
-                doneWithAffectedFile(state, affected);
-            }
-            // In case of emit builder, cache the files to be emitted
-            if (affectedFilesPendingEmit) {
-                state.affectedFilesPendingEmit = ts.concatenate(state.affectedFilesPendingEmit, affectedFilesPendingEmit);
-                // affectedFilesPendingEmitIndex === undefined
-                // - means the emit state.affectedFilesPendingEmit was undefined before adding current affected files
-                //   so start from 0 as array would be affectedFilesPendingEmit
-                // else, continue to iterate from existing index, the current set is appended to existing files
-                if (state.affectedFilesPendingEmitIndex === undefined) {
-                    state.affectedFilesPendingEmitIndex = 0;
-                }
+            // tslint:disable-next-line no-empty
+            while (getSemanticDiagnosticsOfNextAffectedFile(cancellationToken)) {
             }
             var diagnostics;
             for (var _i = 0, _a = ts.Debug.assertDefined(state.program).getSourceFiles(); _i < _a.length; _i++) {
-                var sourceFile_2 = _a[_i];
-                diagnostics = ts.addRange(diagnostics, getSemanticDiagnosticsOfFile(state, sourceFile_2, cancellationToken));
+                var sourceFile_1 = _a[_i];
+                diagnostics = ts.addRange(diagnostics, getSemanticDiagnosticsOfFile(state, sourceFile_1, cancellationToken));
             }
             return diagnostics || ts.emptyArray;
         }
     }
     ts.createBuilderProgram = createBuilderProgram;
-    function getMapOfReferencedSet(mapLike) {
+    function addToAffectedFilesPendingEmit(state, affectedFilesPendingEmit) {
+        state.affectedFilesPendingEmit = ts.concatenate(state.affectedFilesPendingEmit, affectedFilesPendingEmit);
+        // affectedFilesPendingEmitIndex === undefined
+        // - means the emit state.affectedFilesPendingEmit was undefined before adding current affected files
+        //   so start from 0 as array would be affectedFilesPendingEmit
+        // else, continue to iterate from existing index, the current set is appended to existing files
+        if (state.affectedFilesPendingEmitIndex === undefined) {
+            state.affectedFilesPendingEmitIndex = 0;
+        }
+    }
+    function getMapOfReferencedSet(mapLike, toPath) {
         if (!mapLike)
             return undefined;
         var map = ts.createMap();
@@ -91407,18 +94125,25 @@ var ts;
         // template is undefined, and instead will just exit the loop.
         for (var key in mapLike) {
             if (ts.hasProperty(mapLike, key)) {
-                map.set(key, ts.arrayToSet(mapLike[key]));
+                map.set(toPath(key), ts.arrayToSet(mapLike[key], toPath));
             }
         }
         return map;
     }
-    function createBuildProgramUsingProgramBuildInfo(program) {
-        var fileInfos = ts.createMapFromTemplate(program.fileInfos);
+    function createBuildProgramUsingProgramBuildInfo(program, buildInfoPath, host) {
+        var buildInfoDirectory = ts.getDirectoryPath(ts.getNormalizedAbsolutePath(buildInfoPath, host.getCurrentDirectory()));
+        var getCanonicalFileName = ts.createGetCanonicalFileName(host.useCaseSensitiveFileNames());
+        var fileInfos = ts.createMap();
+        for (var key in program.fileInfos) {
+            if (ts.hasProperty(program.fileInfos, key)) {
+                fileInfos.set(toPath(key), program.fileInfos[key]);
+            }
+        }
         var state = {
             fileInfos: fileInfos,
-            compilerOptions: program.options,
-            referencedMap: getMapOfReferencedSet(program.referencedMap),
-            exportedModulesMap: getMapOfReferencedSet(program.exportedModulesMap),
+            compilerOptions: convertFromReusableCompilerOptions(program.options, toAbsolutePath),
+            referencedMap: getMapOfReferencedSet(program.referencedMap, toPath),
+            exportedModulesMap: getMapOfReferencedSet(program.exportedModulesMap, toPath),
             semanticDiagnosticsPerFile: program.semanticDiagnosticsPerFile && ts.arrayToMap(program.semanticDiagnosticsPerFile, function (value) { return ts.isString(value) ? value : value[0]; }, function (value) { return ts.isString(value) ? ts.emptyArray : value[1]; }),
             hasReusableDiagnostic: true
         };
@@ -91427,7 +94152,7 @@ var ts;
             backupState: ts.noop,
             restoreState: ts.noop,
             getProgram: ts.notImplemented,
-            getProgramOrUndefined: function () { return undefined; },
+            getProgramOrUndefined: ts.returnUndefined,
             releaseProgram: ts.noop,
             getCompilerOptions: function () { return state.compilerOptions; },
             getSourceFile: ts.notImplemented,
@@ -91444,8 +94169,41 @@ var ts;
             emitNextAffectedFile: ts.notImplemented,
             getSemanticDiagnosticsOfNextAffectedFile: ts.notImplemented,
         };
+        function toPath(path) {
+            return ts.toPath(path, buildInfoDirectory, getCanonicalFileName);
+        }
+        function toAbsolutePath(path) {
+            return ts.getNormalizedAbsolutePath(path, buildInfoDirectory);
+        }
     }
     ts.createBuildProgramUsingProgramBuildInfo = createBuildProgramUsingProgramBuildInfo;
+    function convertFromReusableCompilerOptions(options, toAbsolutePath) {
+        var result = {};
+        var optionsNameMap = ts.getOptionNameMap().optionNameMap;
+        for (var name in options) {
+            if (ts.hasProperty(options, name)) {
+                result[name] = convertFromReusableCompilerOptionValue(optionsNameMap.get(name.toLowerCase()), options[name], toAbsolutePath);
+            }
+        }
+        if (result.configFilePath) {
+            result.configFilePath = toAbsolutePath(result.configFilePath);
+        }
+        return result;
+    }
+    function convertFromReusableCompilerOptionValue(option, value, toAbsolutePath) {
+        if (option) {
+            if (option.type === "list") {
+                var values = value;
+                if (option.element.isFilePath && values.length) {
+                    return values.map(toAbsolutePath);
+                }
+            }
+            else if (option.isFilePath) {
+                return toAbsolutePath(value);
+            }
+        }
+        return value;
+    }
     function createRedirectedBuilderProgram(state, configFileParsingDiagnostics) {
         return {
             getState: ts.notImplemented,
@@ -91495,6 +94253,38 @@ var ts;
         return ts.some(ts.ignoredPaths, function (searchPath) { return ts.stringContains(path, searchPath); });
     }
     ts.isPathIgnored = isPathIgnored;
+    /**
+     * Filter out paths like
+     * "/", "/user", "/user/username", "/user/username/folderAtRoot",
+     * "c:/", "c:/users", "c:/users/username", "c:/users/username/folderAtRoot", "c:/folderAtRoot"
+     * @param dirPath
+     */
+    function canWatchDirectory(dirPath) {
+        var rootLength = ts.getRootLength(dirPath);
+        if (dirPath.length === rootLength) {
+            // Ignore "/", "c:/"
+            return false;
+        }
+        var nextDirectorySeparator = dirPath.indexOf(ts.directorySeparator, rootLength);
+        if (nextDirectorySeparator === -1) {
+            // ignore "/user", "c:/users" or "c:/folderAtRoot"
+            return false;
+        }
+        if (dirPath.charCodeAt(0) !== 47 /* slash */ &&
+            dirPath.substr(rootLength, nextDirectorySeparator).search(/users/i) === -1) {
+            // Paths like c:/folderAtRoot/subFolder are allowed
+            return true;
+        }
+        for (var searchIndex = nextDirectorySeparator + 1, searchLevels = 2; searchLevels > 0; searchLevels--) {
+            searchIndex = dirPath.indexOf(ts.directorySeparator, searchIndex) + 1;
+            if (searchIndex === 0) {
+                // Folder isnt at expected minimun levels
+                return false;
+            }
+        }
+        return true;
+    }
+    ts.canWatchDirectory = canWatchDirectory;
     ts.maxNumberOfFilesToIterateForInvalidation = 256;
     function createResolutionCache(resolutionHost, rootDirForResolution, logChangesWhenResolvingModule) {
         var filesWithChangedSetOfUnresolvedImports;
@@ -91625,7 +94415,7 @@ var ts;
             if (globalCache !== undefined && !ts.isExternalModuleNameRelative(moduleName) && !(primaryResult.resolvedModule && ts.extensionIsTS(primaryResult.resolvedModule.extension))) {
                 // create different collection of failed lookup locations for second pass
                 // if it will fail and we've already found something during the first pass - we don't want to pollute its results
-                var _a = ts.loadModuleFromGlobalCache(moduleName, resolutionHost.projectName, compilerOptions, host, globalCache), resolvedModule = _a.resolvedModule, failedLookupLocations = _a.failedLookupLocations;
+                var _a = ts.loadModuleFromGlobalCache(ts.Debug.assertDefined(resolutionHost.globalCacheResolutionModuleName)(moduleName), resolutionHost.projectName, compilerOptions, host, globalCache), resolvedModule = _a.resolvedModule, failedLookupLocations = _a.failedLookupLocations;
                 if (resolvedModule) {
                     return { resolvedModule: resolvedModule, failedLookupLocations: ts.addRange(primaryResult.failedLookupLocations, failedLookupLocations) };
                 }
@@ -91730,37 +94520,6 @@ var ts;
         function isNodeModulesAtTypesDirectory(dirPath) {
             return ts.endsWith(dirPath, "/node_modules/@types");
         }
-        /**
-         * Filter out paths like
-         * "/", "/user", "/user/username", "/user/username/folderAtRoot",
-         * "c:/", "c:/users", "c:/users/username", "c:/users/username/folderAtRoot", "c:/folderAtRoot"
-         * @param dirPath
-         */
-        function canWatchDirectory(dirPath) {
-            var rootLength = ts.getRootLength(dirPath);
-            if (dirPath.length === rootLength) {
-                // Ignore "/", "c:/"
-                return false;
-            }
-            var nextDirectorySeparator = dirPath.indexOf(ts.directorySeparator, rootLength);
-            if (nextDirectorySeparator === -1) {
-                // ignore "/user", "c:/users" or "c:/folderAtRoot"
-                return false;
-            }
-            if (dirPath.charCodeAt(0) !== 47 /* slash */ &&
-                dirPath.substr(rootLength, nextDirectorySeparator).search(/users/i) === -1) {
-                // Paths like c:/folderAtRoot/subFolder are allowed
-                return true;
-            }
-            for (var searchIndex = nextDirectorySeparator + 1, searchLevels = 2; searchLevels > 0; searchLevels--) {
-                searchIndex = dirPath.indexOf(ts.directorySeparator, searchIndex) + 1;
-                if (searchIndex === 0) {
-                    // Folder isnt at expected minimun levels
-                    return false;
-                }
-            }
-            return true;
-        }
         function getDirectoryToWatchFailedLookupLocation(failedLookupLocation, failedLookupLocationPath) {
             if (isInDirectoryPath(rootPath, failedLookupLocationPath)) {
                 // Ensure failed look up is normalized path
@@ -92018,6 +94777,10 @@ var ts;
                 // If something to do with folder/file starting with "." in node_modules folder, skip it
                 if (isPathIgnored(fileOrDirectoryPath))
                     return false;
+                // prevent saving an open file from over-eagerly triggering invalidation
+                if (resolutionHost.fileIsOpen(fileOrDirectoryPath)) {
+                    return false;
+                }
                 // Some file or directory in the watching directory is created
                 // Return early if it does not have any of the watching extension or not the custom failed lookup path
                 var dirOfFileOrDirectory = ts.getDirectoryPath(fileOrDirectoryPath);
@@ -92260,11 +95023,11 @@ var ts;
         }
         function discoverProbableSymlinks(files, getCanonicalFileName, cwd) {
             var result = ts.createMap();
-            var symlinks = ts.mapDefined(files, function (sf) {
-                return sf.resolvedModules && ts.firstDefinedIterator(sf.resolvedModules.values(), function (res) {
+            var symlinks = ts.flatten(ts.mapDefined(files, function (sf) {
+                return sf.resolvedModules && ts.compact(ts.arrayFrom(ts.mapIterator(sf.resolvedModules.values(), function (res) {
                     return res && res.originalPath && res.resolvedFileName !== res.originalPath ? [res.resolvedFileName, res.originalPath] : undefined;
-                });
-            });
+                })));
+            }));
             for (var _i = 0, symlinks_1 = symlinks; _i < symlinks_1.length; _i++) {
                 var _a = symlinks_1[_i], resolvedPath = _a[0], originalPath = _a[1];
                 var _b = guessDirectorySymlink(resolvedPath, originalPath, cwd, getCanonicalFileName), commonResolved = _b[0], commonOriginal = _b[1];
@@ -92607,25 +95370,34 @@ var ts;
         return "" + newLine + ts.flattenDiagnosticMessageText(d.messageText, newLine) + newLine + newLine;
     }
     ts.getErrorSummaryText = getErrorSummaryText;
+    function listFiles(program, writeFileName) {
+        if (program.getCompilerOptions().listFiles) {
+            ts.forEach(program.getSourceFiles(), function (file) {
+                writeFileName(file.fileName);
+            });
+        }
+    }
+    ts.listFiles = listFiles;
     /**
      * Helper that emit files, report diagnostics and lists emitted and/or source files depending on compiler options
      */
-    function emitFilesAndReportErrors(program, reportDiagnostic, writeFileName, reportSummary, writeFile) {
+    function emitFilesAndReportErrors(program, reportDiagnostic, writeFileName, reportSummary, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers) {
         // First get and report any syntactic errors.
         var diagnostics = program.getConfigFileParsingDiagnostics().slice();
         var configFileParsingDiagnosticsLength = diagnostics.length;
-        ts.addRange(diagnostics, program.getSyntacticDiagnostics());
+        ts.addRange(diagnostics, program.getSyntacticDiagnostics(/*sourceFile*/ undefined, cancellationToken));
         // If we didn't have any syntactic errors, then also try getting the global and
         // semantic errors.
         if (diagnostics.length === configFileParsingDiagnosticsLength) {
-            ts.addRange(diagnostics, program.getOptionsDiagnostics());
-            ts.addRange(diagnostics, program.getGlobalDiagnostics());
+            ts.addRange(diagnostics, program.getOptionsDiagnostics(cancellationToken));
+            ts.addRange(diagnostics, program.getGlobalDiagnostics(cancellationToken));
             if (diagnostics.length === configFileParsingDiagnosticsLength) {
-                ts.addRange(diagnostics, program.getSemanticDiagnostics());
+                ts.addRange(diagnostics, program.getSemanticDiagnostics(/*sourceFile*/ undefined, cancellationToken));
             }
         }
         // Emit and report any errors we ran into.
-        var _a = program.emit(/*targetSourceFile*/ undefined, writeFile), emittedFiles = _a.emittedFiles, emitSkipped = _a.emitSkipped, emitDiagnostics = _a.diagnostics;
+        var emitResult = program.emit(/*targetSourceFile*/ undefined, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers);
+        var emittedFiles = emitResult.emittedFiles, emitDiagnostics = emitResult.diagnostics;
         ts.addRange(diagnostics, emitDiagnostics);
         ts.sortAndDeduplicateDiagnostics(diagnostics).forEach(reportDiagnostic);
         if (writeFileName) {
@@ -92634,16 +95406,20 @@ var ts;
                 var filepath = ts.getNormalizedAbsolutePath(file, currentDir_1);
                 writeFileName("TSFILE: " + filepath);
             });
-            if (program.getCompilerOptions().listFiles) {
-                ts.forEach(program.getSourceFiles(), function (file) {
-                    writeFileName(file.fileName);
-                });
-            }
+            listFiles(program, writeFileName);
         }
         if (reportSummary) {
             reportSummary(getErrorCountForSummary(diagnostics));
         }
-        if (emitSkipped && diagnostics.length > 0) {
+        return {
+            emitResult: emitResult,
+            diagnostics: diagnostics,
+        };
+    }
+    ts.emitFilesAndReportErrors = emitFilesAndReportErrors;
+    function emitFilesAndReportErrorsAndGetExitStatus(program, reportDiagnostic, writeFileName, reportSummary, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers) {
+        var _a = emitFilesAndReportErrors(program, reportDiagnostic, writeFileName, reportSummary, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers), emitResult = _a.emitResult, diagnostics = _a.diagnostics;
+        if (emitResult.emitSkipped && diagnostics.length > 0) {
             // If the emitter didn't emit anything, then pass that value along.
             return ts.ExitStatus.DiagnosticsPresent_OutputsSkipped;
         }
@@ -92654,15 +95430,15 @@ var ts;
         }
         return ts.ExitStatus.Success;
     }
-    ts.emitFilesAndReportErrors = emitFilesAndReportErrors;
-    var noopFileWatcher = { close: ts.noop };
+    ts.emitFilesAndReportErrorsAndGetExitStatus = emitFilesAndReportErrorsAndGetExitStatus;
+    ts.noopFileWatcher = { close: ts.noop };
     function createWatchHost(system, reportWatchStatus) {
         if (system === void 0) { system = ts.sys; }
         var onWatchStatusChange = reportWatchStatus || createWatchStatusReporter(system);
         return {
             onWatchStatusChange: onWatchStatusChange,
-            watchFile: ts.maybeBind(system, system.watchFile) || (function () { return noopFileWatcher; }),
-            watchDirectory: ts.maybeBind(system, system.watchDirectory) || (function () { return noopFileWatcher; }),
+            watchFile: ts.maybeBind(system, system.watchFile) || (function () { return ts.noopFileWatcher; }),
+            watchDirectory: ts.maybeBind(system, system.watchDirectory) || (function () { return ts.noopFileWatcher; }),
             setTimeout: ts.maybeBind(system, system.setTimeout) || ts.noop,
             clearTimeout: ts.maybeBind(system, system.clearTimeout) || ts.noop
         };
@@ -92747,7 +95523,7 @@ var ts;
         }
     }
     ts.createCompilerHostFromProgramHost = createCompilerHostFromProgramHost;
-    function setCreateSourceFileAsHashVersioned(compilerHost, host) {
+    function setGetSourceFileAsHashVersioned(compilerHost, host) {
         var originalGetSourceFile = compilerHost.getSourceFile;
         var computeHash = host.createHash || ts.generateDjb2Hash;
         compilerHost.getSourceFile = function () {
@@ -92762,7 +95538,7 @@ var ts;
             return result;
         };
     }
-    ts.setCreateSourceFileAsHashVersioned = setCreateSourceFileAsHashVersioned;
+    ts.setGetSourceFileAsHashVersioned = setGetSourceFileAsHashVersioned;
     /**
      * Creates the watch compiler host that can be extended with config file or root file names and options host
      */
@@ -92837,13 +95613,25 @@ var ts;
         return host;
     }
     ts.createWatchCompilerHostOfFilesAndCompilerOptions = createWatchCompilerHostOfFilesAndCompilerOptions;
-    function readBuilderProgram(compilerOptions, readFile) {
+    function performIncrementalCompilation(input) {
+        var system = input.system || ts.sys;
+        var host = input.host || (input.host = ts.createIncrementalCompilerHost(input.options, system));
+        var builderProgram = ts.createIncrementalProgram(input);
+        var exitStatus = emitFilesAndReportErrorsAndGetExitStatus(builderProgram, input.reportDiagnostic || createDiagnosticReporter(system), function (s) { return host.trace && host.trace(s); }, input.reportErrorSummary || input.options.pretty ? function (errorCount) { return system.write(getErrorSummaryText(errorCount, system.newLine)); } : undefined);
+        if (input.afterProgramEmitAndDiagnostics)
+            input.afterProgramEmitAndDiagnostics(builderProgram);
+        return exitStatus;
+    }
+    ts.performIncrementalCompilation = performIncrementalCompilation;
+})(ts || (ts = {}));
+(function (ts) {
+    function readBuilderProgram(compilerOptions, host) {
         if (compilerOptions.out || compilerOptions.outFile)
             return undefined;
         var buildInfoPath = ts.getOutputPathForBuildInfo(compilerOptions);
         if (!buildInfoPath)
             return undefined;
-        var content = readFile(buildInfoPath);
+        var content = host.readFile(buildInfoPath);
         if (!content)
             return undefined;
         var buildInfo = ts.getBuildInfo(content);
@@ -92851,11 +95639,26 @@ var ts;
             return undefined;
         if (!buildInfo.program)
             return undefined;
-        return ts.createBuildProgramUsingProgramBuildInfo(buildInfo.program);
+        return ts.createBuildProgramUsingProgramBuildInfo(buildInfo.program, buildInfoPath, host);
     }
     ts.readBuilderProgram = readBuilderProgram;
-})(ts || (ts = {}));
-(function (ts) {
+    function createIncrementalCompilerHost(options, system) {
+        if (system === void 0) { system = ts.sys; }
+        var host = ts.createCompilerHostWorker(options, /*setParentNodes*/ undefined, system);
+        host.createHash = ts.maybeBind(system, system.createHash);
+        ts.setGetSourceFileAsHashVersioned(host, system);
+        ts.changeCompilerHostLikeToUseCache(host, function (fileName) { return ts.toPath(fileName, host.getCurrentDirectory(), host.getCanonicalFileName); });
+        return host;
+    }
+    ts.createIncrementalCompilerHost = createIncrementalCompilerHost;
+    function createIncrementalProgram(_a) {
+        var rootNames = _a.rootNames, options = _a.options, configFileParsingDiagnostics = _a.configFileParsingDiagnostics, projectReferences = _a.projectReferences, host = _a.host, createProgram = _a.createProgram;
+        host = host || createIncrementalCompilerHost(options);
+        createProgram = createProgram || ts.createEmitAndSemanticDiagnosticsBuilderProgram;
+        var oldProgram = readBuilderProgram(options, host);
+        return createProgram(rootNames, options, host, oldProgram, configFileParsingDiagnostics, projectReferences);
+    }
+    ts.createIncrementalProgram = createIncrementalProgram;
     function createWatchCompilerHost(rootFilesOrConfigFileName, options, system, createProgram, reportDiagnostic, reportWatchStatus, projectReferences) {
         if (ts.isArray(rootFilesOrConfigFileName)) {
             return ts.createWatchCompilerHostOfFilesAndCompilerOptions(rootFilesOrConfigFileName, options, system, createProgram, reportDiagnostic, reportWatchStatus, projectReferences); // TODO: GH#18217
@@ -92910,7 +95713,7 @@ var ts;
             configFileWatcher = watchFile(host, configFileName, scheduleProgramReload, ts.PollingInterval.High, "Config file" /* ConfigFile */);
         }
         var compilerHost = ts.createCompilerHostFromProgramHost(host, function () { return compilerOptions; }, directoryStructureHost);
-        ts.setCreateSourceFileAsHashVersioned(compilerHost, host);
+        ts.setGetSourceFileAsHashVersioned(compilerHost, host);
         // Members for CompilerHost
         var getNewSourceFile = compilerHost.getSourceFile;
         compilerHost.getSourceFile = function (fileName) {
@@ -92935,6 +95738,7 @@ var ts;
             hasChangedAutomaticTypeDirectiveNames = true;
             scheduleProgramUpdate();
         };
+        compilerHost.fileIsOpen = ts.returnFalse;
         compilerHost.maxNumberOfFilesToIterateForInvalidation = host.maxNumberOfFilesToIterateForInvalidation;
         compilerHost.getCurrentProgram = getCurrentProgram;
         compilerHost.writeLog = writeLog;
@@ -92951,7 +95755,7 @@ var ts;
             (function (typeDirectiveNames, containingFile, redirectedReference) { return host.resolveTypeReferenceDirectives(typeDirectiveNames, containingFile, redirectedReference); }) :
             (function (typeDirectiveNames, containingFile, redirectedReference) { return resolutionCache.resolveTypeReferenceDirectives(typeDirectiveNames, containingFile, redirectedReference); });
         var userProvidedResolution = !!host.resolveModuleNames || !!host.resolveTypeReferenceDirectives;
-        builderProgram = ts.readBuilderProgram(compilerOptions, function (path) { return compilerHost.readFile(path); });
+        builderProgram = readBuilderProgram(compilerOptions, compilerHost);
         synchronizeProgram();
         // Update the wild card directory watch
         watchConfigFileWildCardDirectories();
@@ -93282,31 +96086,9 @@ var ts;
     }
     ts.createWatchProgram = createWatchProgram;
 })(ts || (ts = {}));
-// Currently we do not want to expose API for build, we should work out the API, and then expose it just like we did for builder/watch
 /*@internal*/
 var ts;
 (function (ts) {
-    var minimumDate = new Date(-8640000000000000);
-    var maximumDate = new Date(8640000000000000);
-    var BuildResultFlags;
-    (function (BuildResultFlags) {
-        BuildResultFlags[BuildResultFlags["None"] = 0] = "None";
-        /**
-         * No errors of any kind occurred during build
-         */
-        BuildResultFlags[BuildResultFlags["Success"] = 1] = "Success";
-        /**
-         * None of the .d.ts files emitted by this build were
-         * different from the existing files on disk
-         */
-        BuildResultFlags[BuildResultFlags["DeclarationOutputUnchanged"] = 2] = "DeclarationOutputUnchanged";
-        BuildResultFlags[BuildResultFlags["ConfigFileErrors"] = 4] = "ConfigFileErrors";
-        BuildResultFlags[BuildResultFlags["SyntaxErrors"] = 8] = "SyntaxErrors";
-        BuildResultFlags[BuildResultFlags["TypeErrors"] = 16] = "TypeErrors";
-        BuildResultFlags[BuildResultFlags["DeclarationEmitErrors"] = 32] = "DeclarationEmitErrors";
-        BuildResultFlags[BuildResultFlags["EmitErrors"] = 64] = "EmitErrors";
-        BuildResultFlags[BuildResultFlags["AnyErrors"] = 124] = "AnyErrors";
-    })(BuildResultFlags || (BuildResultFlags = {}));
     var UpToDateStatusType;
     (function (UpToDateStatusType) {
         UpToDateStatusType[UpToDateStatusType["Unbuildable"] = 0] = "Unbuildable";
@@ -93335,101 +96117,51 @@ var ts;
          */
         UpToDateStatusType[UpToDateStatusType["ContainerOnly"] = 11] = "ContainerOnly";
     })(UpToDateStatusType = ts.UpToDateStatusType || (ts.UpToDateStatusType = {}));
-    function createFileMap(toPath) {
-        // tslint:disable-next-line:no-null-keyword
-        var lookup = ts.createMap();
-        return {
-            setValue: setValue,
-            getValue: getValue,
-            removeKey: removeKey,
-            forEach: forEach,
-            hasKey: hasKey,
-            getSize: getSize,
-            clear: clear
-        };
-        function forEach(action) {
-            lookup.forEach(action);
-        }
-        function hasKey(fileName) {
-            return lookup.has(toPath(fileName));
-        }
-        function removeKey(fileName) {
-            lookup.delete(toPath(fileName));
-        }
-        function setValue(fileName, value) {
-            lookup.set(toPath(fileName), value);
-        }
-        function getValue(fileName) {
-            return lookup.get(toPath(fileName));
-        }
-        function getSize() {
-            return lookup.size;
-        }
-        function clear() {
-            lookup.clear();
+    function resolveConfigFileProjectName(project) {
+        if (ts.fileExtensionIs(project, ".json" /* Json */)) {
+            return project;
         }
+        return ts.combinePaths(project, "tsconfig.json");
+    }
+    ts.resolveConfigFileProjectName = resolveConfigFileProjectName;
+})(ts || (ts = {}));
+(function (ts) {
+    var minimumDate = new Date(-8640000000000000);
+    var maximumDate = new Date(8640000000000000);
+    var BuildResultFlags;
+    (function (BuildResultFlags) {
+        BuildResultFlags[BuildResultFlags["None"] = 0] = "None";
+        /**
+         * No errors of any kind occurred during build
+         */
+        BuildResultFlags[BuildResultFlags["Success"] = 1] = "Success";
+        /**
+         * None of the .d.ts files emitted by this build were
+         * different from the existing files on disk
+         */
+        BuildResultFlags[BuildResultFlags["DeclarationOutputUnchanged"] = 2] = "DeclarationOutputUnchanged";
+        BuildResultFlags[BuildResultFlags["ConfigFileErrors"] = 4] = "ConfigFileErrors";
+        BuildResultFlags[BuildResultFlags["SyntaxErrors"] = 8] = "SyntaxErrors";
+        BuildResultFlags[BuildResultFlags["TypeErrors"] = 16] = "TypeErrors";
+        BuildResultFlags[BuildResultFlags["DeclarationEmitErrors"] = 32] = "DeclarationEmitErrors";
+        BuildResultFlags[BuildResultFlags["EmitErrors"] = 64] = "EmitErrors";
+        BuildResultFlags[BuildResultFlags["AnyErrors"] = 124] = "AnyErrors";
+    })(BuildResultFlags || (BuildResultFlags = {}));
+    function createConfigFileMap() {
+        return ts.createMap();
     }
     function getOrCreateValueFromConfigFileMap(configFileMap, resolved, createT) {
-        var existingValue = configFileMap.getValue(resolved);
+        var existingValue = configFileMap.get(resolved);
         var newValue;
         if (!existingValue) {
             newValue = createT();
-            configFileMap.setValue(resolved, newValue);
+            configFileMap.set(resolved, newValue);
         }
         return existingValue || newValue;
     }
     function getOrCreateValueMapFromConfigFileMap(configFileMap, resolved) {
         return getOrCreateValueFromConfigFileMap(configFileMap, resolved, ts.createMap);
     }
-    function getOutputDeclarationFileName(inputFileName, configFile) {
-        var relativePath = ts.getRelativePathFromDirectory(rootDirOfOptions(configFile.options, configFile.options.configFilePath), inputFileName, /*ignoreCase*/ true);
-        var outputPath = ts.resolvePath(configFile.options.declarationDir || configFile.options.outDir || ts.getDirectoryPath(configFile.options.configFilePath), relativePath);
-        return ts.changeExtension(outputPath, ".d.ts" /* Dts */);
-    }
-    ts.getOutputDeclarationFileName = getOutputDeclarationFileName;
-    function getOutputJSFileName(inputFileName, configFile) {
-        var relativePath = ts.getRelativePathFromDirectory(rootDirOfOptions(configFile.options, configFile.options.configFilePath), inputFileName, /*ignoreCase*/ true);
-        var outputPath = ts.resolvePath(configFile.options.outDir || ts.getDirectoryPath(configFile.options.configFilePath), relativePath);
-        var newExtension = ts.fileExtensionIs(inputFileName, ".json" /* Json */) ? ".json" /* Json */ :
-            ts.fileExtensionIs(inputFileName, ".tsx" /* Tsx */) && configFile.options.jsx === 1 /* Preserve */ ? ".jsx" /* Jsx */ : ".js" /* Js */;
-        return ts.changeExtension(outputPath, newExtension);
-    }
-    function getOutputFileNames(inputFileName, configFile) {
-        // outFile is handled elsewhere; .d.ts files don't generate outputs
-        if (configFile.options.outFile || configFile.options.out || ts.fileExtensionIs(inputFileName, ".d.ts" /* Dts */)) {
-            return ts.emptyArray;
-        }
-        var outputs = [];
-        var js = getOutputJSFileName(inputFileName, configFile);
-        outputs.push(js);
-        if (configFile.options.sourceMap) {
-            outputs.push(js + ".map");
-        }
-        if (ts.getEmitDeclarations(configFile.options) && !ts.fileExtensionIs(inputFileName, ".json" /* Json */)) {
-            var dts = getOutputDeclarationFileName(inputFileName, configFile);
-            outputs.push(dts);
-            if (configFile.options.declarationMap) {
-                outputs.push(dts + ".map");
-            }
-        }
-        return outputs;
-    }
-    function getOutFileOutputs(project, ignoreBuildInfo) {
-        ts.Debug.assert(!!project.options.outFile || !!project.options.out, "outFile must be set");
-        var _a = ts.getOutputPathsForBundle(project.options, /*forceDtsPaths*/ false), jsFilePath = _a.jsFilePath, sourceMapFilePath = _a.sourceMapFilePath, declarationFilePath = _a.declarationFilePath, declarationMapPath = _a.declarationMapPath, buildInfoPath = _a.buildInfoPath;
-        var outputs = [];
-        var addOutput = function (path) { return path && (outputs || (outputs = [])).push(path); };
-        addOutput(jsFilePath);
-        addOutput(sourceMapFilePath);
-        addOutput(declarationFilePath);
-        addOutput(declarationMapPath);
-        if (!ignoreBuildInfo)
-            addOutput(buildInfoPath);
-        return outputs || ts.emptyArray;
-    }
-    function rootDirOfOptions(opts, configFileName) {
-        return opts.rootDir || ts.getDirectoryPath(configFileName);
-    }
     function newer(date1, date2) {
         return date2 > date1 ? date2 : date1;
     }
@@ -93449,7 +96181,7 @@ var ts;
     ts.createBuilderStatusReporter = createBuilderStatusReporter;
     function createSolutionBuilderHostBase(system, createProgram, reportDiagnostic, reportSolutionBuilderStatus) {
         var host = ts.createProgramHost(system, createProgram);
-        host.getModifiedTime = system.getModifiedTime ? function (path) { return system.getModifiedTime(path); } : function () { return undefined; };
+        host.getModifiedTime = system.getModifiedTime ? function (path) { return system.getModifiedTime(path); } : ts.returnUndefined;
         host.setModifiedTime = system.setModifiedTime ? function (path, date) { return system.setModifiedTime(path, date); } : ts.noop;
         host.deleteFile = system.deleteFile ? function (path) { return system.deleteFile(path); } : ts.noop;
         host.reportDiagnostic = reportDiagnostic || ts.createDiagnosticReporter(system);
@@ -93474,644 +96206,459 @@ var ts;
     function getCompilerOptionsOfBuildOptions(buildOptions) {
         var result = {};
         ts.commonOptionsWithBuild.forEach(function (option) {
-            result[option.name] = buildOptions[option.name];
+            if (ts.hasProperty(buildOptions, option.name))
+                result[option.name] = buildOptions[option.name];
         });
         return result;
     }
     function createSolutionBuilder(host, rootNames, defaultOptions) {
-        var hostWithWatch = host;
+        return createSolutionBuilderWorker(/*watch*/ false, host, rootNames, defaultOptions);
+    }
+    ts.createSolutionBuilder = createSolutionBuilder;
+    function createSolutionBuilderWithWatch(host, rootNames, defaultOptions) {
+        return createSolutionBuilderWorker(/*watch*/ true, host, rootNames, defaultOptions);
+    }
+    ts.createSolutionBuilderWithWatch = createSolutionBuilderWithWatch;
+    function createSolutionBuilderState(watch, hostOrHostWithWatch, rootNames, options) {
+        var host = hostOrHostWithWatch;
+        var hostWithWatch = hostOrHostWithWatch;
         var currentDirectory = host.getCurrentDirectory();
         var getCanonicalFileName = ts.createGetCanonicalFileName(host.useCaseSensitiveFileNames());
-        var parseConfigFileHost = ts.parseConfigHostFromCompilerHostLike(host);
         // State of the solution
-        var options = defaultOptions;
         var baseCompilerOptions = getCompilerOptionsOfBuildOptions(options);
-        var configFileCache = createFileMap(toPath);
-        /** Map from output file name to its pre-build timestamp */
-        var unchangedOutputs = createFileMap(toPath);
-        /** Map from config file name to up-to-date status */
-        var projectStatus = createFileMap(toPath);
-        var missingRoots = ts.createMap();
-        var globalDependencyGraph;
-        var writeFileName = function (s) { return host.trace && host.trace(s); };
-        var readFileWithCache = function (f) { return host.readFile(f); };
-        var projectCompilerOptions = baseCompilerOptions;
-        var compilerHost = ts.createCompilerHostFromProgramHost(host, function () { return projectCompilerOptions; });
-        ts.setCreateSourceFileAsHashVersioned(compilerHost, host);
-        var buildInfoChecked = createFileMap(toPath);
-        // Watch state
-        var builderPrograms = createFileMap(toPath);
-        var diagnostics = createFileMap(toPath);
-        var projectPendingBuild = createFileMap(toPath);
-        var projectErrorsReported = createFileMap(toPath);
-        var invalidatedProjectQueue = [];
-        var nextProjectToBuild = 0;
-        var timerToBuildInvalidatedProject;
-        var reportFileChangeDetected = false;
-        var _a = ts.createWatchFactory(host, options), watchFile = _a.watchFile, watchFilePath = _a.watchFilePath, watchDirectory = _a.watchDirectory, writeLog = _a.writeLog;
-        // Watches for the solution
-        var allWatchedWildcardDirectories = createFileMap(toPath);
-        var allWatchedInputFiles = createFileMap(toPath);
-        var allWatchedConfigFiles = createFileMap(toPath);
-        return {
-            buildAllProjects: buildAllProjects,
-            getUpToDateStatusOfFile: getUpToDateStatusOfFile,
-            cleanAllProjects: cleanAllProjects,
-            resetBuildContext: resetBuildContext,
-            getBuildGraph: getBuildGraph,
-            invalidateProject: invalidateProject,
-            buildInvalidatedProject: buildInvalidatedProject,
-            resolveProjectName: resolveProjectName,
-            startWatching: startWatching
+        var compilerHost = ts.createCompilerHostFromProgramHost(host, function () { return state.projectCompilerOptions; });
+        ts.setGetSourceFileAsHashVersioned(compilerHost, host);
+        compilerHost.getParsedCommandLine = function (fileName) { return parseConfigFile(state, fileName, toResolvedConfigFilePath(state, fileName)); };
+        compilerHost.resolveModuleNames = ts.maybeBind(host, host.resolveModuleNames);
+        compilerHost.resolveTypeReferenceDirectives = ts.maybeBind(host, host.resolveTypeReferenceDirectives);
+        var moduleResolutionCache = !compilerHost.resolveModuleNames ? ts.createModuleResolutionCache(currentDirectory, getCanonicalFileName) : undefined;
+        if (!compilerHost.resolveModuleNames) {
+            var loader_3 = function (moduleName, containingFile, redirectedReference) { return ts.resolveModuleName(moduleName, containingFile, state.projectCompilerOptions, compilerHost, moduleResolutionCache, redirectedReference).resolvedModule; };
+            compilerHost.resolveModuleNames = function (moduleNames, containingFile, _reusedNames, redirectedReference) {
+                return ts.loadWithLocalCache(ts.Debug.assertEachDefined(moduleNames), containingFile, redirectedReference, loader_3);
+            };
+        }
+        var _a = ts.createWatchFactory(hostWithWatch, options), watchFile = _a.watchFile, watchFilePath = _a.watchFilePath, watchDirectory = _a.watchDirectory, writeLog = _a.writeLog;
+        var state = {
+            host: host,
+            hostWithWatch: hostWithWatch,
+            currentDirectory: currentDirectory,
+            getCanonicalFileName: getCanonicalFileName,
+            parseConfigFileHost: ts.parseConfigHostFromCompilerHostLike(host),
+            writeFileName: host.trace ? function (s) { return host.trace(s); } : undefined,
+            // State of solution
+            options: options,
+            baseCompilerOptions: baseCompilerOptions,
+            rootNames: rootNames,
+            resolvedConfigFilePaths: ts.createMap(),
+            configFileCache: createConfigFileMap(),
+            projectStatus: createConfigFileMap(),
+            buildInfoChecked: createConfigFileMap(),
+            extendedConfigCache: ts.createMap(),
+            builderPrograms: createConfigFileMap(),
+            diagnostics: createConfigFileMap(),
+            projectPendingBuild: createConfigFileMap(),
+            projectErrorsReported: createConfigFileMap(),
+            compilerHost: compilerHost,
+            moduleResolutionCache: moduleResolutionCache,
+            // Mutable state
+            buildOrder: undefined,
+            readFileWithCache: function (f) { return host.readFile(f); },
+            projectCompilerOptions: baseCompilerOptions,
+            cache: undefined,
+            allProjectBuildPending: true,
+            needsSummary: true,
+            watchAllProjectsPending: watch,
+            currentInvalidatedProject: undefined,
+            // Watch state
+            watch: watch,
+            allWatchedWildcardDirectories: createConfigFileMap(),
+            allWatchedInputFiles: createConfigFileMap(),
+            allWatchedConfigFiles: createConfigFileMap(),
+            timerToBuildInvalidatedProject: undefined,
+            reportFileChangeDetected: false,
+            watchFile: watchFile,
+            watchFilePath: watchFilePath,
+            watchDirectory: watchDirectory,
+            writeLog: writeLog,
         };
-        function toPath(fileName) {
-            return ts.toPath(fileName, currentDirectory, getCanonicalFileName);
+        return state;
+    }
+    function toPath(state, fileName) {
+        return ts.toPath(fileName, state.currentDirectory, state.getCanonicalFileName);
+    }
+    function toResolvedConfigFilePath(state, fileName) {
+        var resolvedConfigFilePaths = state.resolvedConfigFilePaths;
+        var path = resolvedConfigFilePaths.get(fileName);
+        if (path !== undefined)
+            return path;
+        var resolvedPath = toPath(state, fileName);
+        resolvedConfigFilePaths.set(fileName, resolvedPath);
+        return resolvedPath;
+    }
+    function isParsedCommandLine(entry) {
+        return !!entry.options;
+    }
+    function parseConfigFile(state, configFileName, configFilePath) {
+        var configFileCache = state.configFileCache;
+        var value = configFileCache.get(configFilePath);
+        if (value) {
+            return isParsedCommandLine(value) ? value : undefined;
         }
-        function resetBuildContext(opts) {
-            if (opts === void 0) { opts = defaultOptions; }
-            options = opts;
-            baseCompilerOptions = getCompilerOptionsOfBuildOptions(options);
-            configFileCache.clear();
-            unchangedOutputs.clear();
-            projectStatus.clear();
-            missingRoots.clear();
-            globalDependencyGraph = undefined;
-            buildInfoChecked.clear();
-            diagnostics.clear();
-            projectPendingBuild.clear();
-            projectErrorsReported.clear();
-            invalidatedProjectQueue.length = 0;
-            nextProjectToBuild = 0;
-            if (timerToBuildInvalidatedProject) {
-                clearTimeout(timerToBuildInvalidatedProject);
-                timerToBuildInvalidatedProject = undefined;
-            }
-            reportFileChangeDetected = false;
-            ts.clearMap(allWatchedWildcardDirectories, function (wildCardWatches) { return ts.clearMap(wildCardWatches, ts.closeFileWatcherOf); });
-            ts.clearMap(allWatchedInputFiles, function (inputFileWatches) { return ts.clearMap(inputFileWatches, ts.closeFileWatcher); });
-            ts.clearMap(allWatchedConfigFiles, ts.closeFileWatcher);
-            builderPrograms.clear();
+        var diagnostic;
+        var parseConfigFileHost = state.parseConfigFileHost, baseCompilerOptions = state.baseCompilerOptions, extendedConfigCache = state.extendedConfigCache, host = state.host;
+        var parsed;
+        if (host.getParsedCommandLine) {
+            parsed = host.getParsedCommandLine(configFileName);
+            if (!parsed)
+                diagnostic = ts.createCompilerDiagnostic(ts.Diagnostics.File_0_not_found, configFileName);
         }
-        function isParsedCommandLine(entry) {
-            return !!entry.options;
-        }
-        function parseConfigFile(configFilePath) {
-            var value = configFileCache.getValue(configFilePath);
-            if (value) {
-                return isParsedCommandLine(value) ? value : undefined;
-            }
-            var diagnostic;
+        else {
             parseConfigFileHost.onUnRecoverableConfigFileDiagnostic = function (d) { return diagnostic = d; };
-            var parsed = ts.getParsedCommandLineOfConfigFile(configFilePath, baseCompilerOptions, parseConfigFileHost);
+            parsed = ts.getParsedCommandLineOfConfigFile(configFileName, baseCompilerOptions, parseConfigFileHost, extendedConfigCache);
             parseConfigFileHost.onUnRecoverableConfigFileDiagnostic = ts.noop;
-            configFileCache.setValue(configFilePath, parsed || diagnostic);
-            return parsed;
         }
-        function reportStatus(message) {
+        configFileCache.set(configFilePath, parsed || diagnostic);
+        return parsed;
+    }
+    function resolveProjectName(state, name) {
+        return ts.resolveConfigFileProjectName(ts.resolvePath(state.currentDirectory, name));
+    }
+    function createBuildOrder(state, roots) {
+        var temporaryMarks = ts.createMap();
+        var permanentMarks = ts.createMap();
+        var circularityReportStack = [];
+        var buildOrder;
+        for (var _i = 0, roots_1 = roots; _i < roots_1.length; _i++) {
+            var root = roots_1[_i];
+            visit(root);
+        }
+        return buildOrder || ts.emptyArray;
+        function visit(configFileName, inCircularContext) {
+            var projPath = toResolvedConfigFilePath(state, configFileName);
+            // Already visited
+            if (permanentMarks.has(projPath))
+                return;
+            // Circular
+            if (temporaryMarks.has(projPath)) {
+                if (!inCircularContext) {
+                    // TODO:: Do we report this as error?
+                    reportStatus(state, ts.Diagnostics.Project_references_may_not_form_a_circular_graph_Cycle_detected_Colon_0, circularityReportStack.join("\r\n"));
+                }
+                return;
+            }
+            temporaryMarks.set(projPath, true);
+            circularityReportStack.push(configFileName);
+            var parsed = parseConfigFile(state, configFileName, projPath);
+            if (parsed && parsed.projectReferences) {
+                for (var _i = 0, _a = parsed.projectReferences; _i < _a.length; _i++) {
+                    var ref = _a[_i];
+                    var resolvedRefPath = resolveProjectName(state, ref.path);
+                    visit(resolvedRefPath, inCircularContext || ref.circular);
+                }
+            }
+            circularityReportStack.pop();
+            permanentMarks.set(projPath, true);
+            (buildOrder || (buildOrder = [])).push(configFileName);
+        }
+    }
+    function getBuildOrder(state) {
+        return state.buildOrder ||
+            (state.buildOrder = createBuildOrder(state, state.rootNames.map(function (f) { return resolveProjectName(state, f); })));
+    }
+    function getBuildOrderFor(state, project, onlyReferences) {
+        var resolvedProject = project && resolveProjectName(state, project);
+        var buildOrderFromState = getBuildOrder(state);
+        if (resolvedProject) {
+            var projectPath_1 = toResolvedConfigFilePath(state, resolvedProject);
+            var projectIndex = ts.findIndex(buildOrderFromState, function (configFileName) { return toResolvedConfigFilePath(state, configFileName) === projectPath_1; });
+            if (projectIndex === -1)
+                return undefined;
+        }
+        var buildOrder = resolvedProject ? createBuildOrder(state, [resolvedProject]) : buildOrderFromState;
+        ts.Debug.assert(!onlyReferences || resolvedProject !== undefined);
+        ts.Debug.assert(!onlyReferences || buildOrder[buildOrder.length - 1] === resolvedProject);
+        return onlyReferences ? buildOrder.slice(0, buildOrder.length - 1) : buildOrder;
+    }
+    function enableCache(state) {
+        if (state.cache) {
+            disableCache(state);
+        }
+        var compilerHost = state.compilerHost, host = state.host;
+        var originalReadFileWithCache = state.readFileWithCache;
+        var originalGetSourceFile = compilerHost.getSourceFile;
+        var _a = ts.changeCompilerHostLikeToUseCache(host, function (fileName) { return toPath(state, fileName); }, function () {
             var args = [];
-            for (var _i = 1; _i < arguments.length; _i++) {
-                args[_i - 1] = arguments[_i];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                args[_i] = arguments[_i];
             }
-            host.reportSolutionBuilderStatus(ts.createCompilerDiagnostic.apply(void 0, [message].concat(args)));
+            return originalGetSourceFile.call.apply(originalGetSourceFile, [compilerHost].concat(args));
+        }), originalReadFile = _a.originalReadFile, originalFileExists = _a.originalFileExists, originalDirectoryExists = _a.originalDirectoryExists, originalCreateDirectory = _a.originalCreateDirectory, originalWriteFile = _a.originalWriteFile, getSourceFileWithCache = _a.getSourceFileWithCache, readFileWithCache = _a.readFileWithCache;
+        state.readFileWithCache = readFileWithCache;
+        compilerHost.getSourceFile = getSourceFileWithCache;
+        state.cache = {
+            originalReadFile: originalReadFile,
+            originalFileExists: originalFileExists,
+            originalDirectoryExists: originalDirectoryExists,
+            originalCreateDirectory: originalCreateDirectory,
+            originalWriteFile: originalWriteFile,
+            originalReadFileWithCache: originalReadFileWithCache,
+            originalGetSourceFile: originalGetSourceFile,
+        };
+    }
+    function disableCache(state) {
+        if (!state.cache)
+            return;
+        var cache = state.cache, host = state.host, compilerHost = state.compilerHost, extendedConfigCache = state.extendedConfigCache, moduleResolutionCache = state.moduleResolutionCache;
+        host.readFile = cache.originalReadFile;
+        host.fileExists = cache.originalFileExists;
+        host.directoryExists = cache.originalDirectoryExists;
+        host.createDirectory = cache.originalCreateDirectory;
+        host.writeFile = cache.originalWriteFile;
+        compilerHost.getSourceFile = cache.originalGetSourceFile;
+        state.readFileWithCache = cache.originalReadFileWithCache;
+        extendedConfigCache.clear();
+        if (moduleResolutionCache) {
+            moduleResolutionCache.directoryToModuleNameMap.clear();
+            moduleResolutionCache.moduleNameToDirectoryMap.clear();
         }
-        function reportWatchStatus(message) {
-            var args = [];
-            for (var _i = 1; _i < arguments.length; _i++) {
-                args[_i - 1] = arguments[_i];
-            }
-            if (hostWithWatch.onWatchStatusChange) {
-                hostWithWatch.onWatchStatusChange(ts.createCompilerDiagnostic.apply(void 0, [message].concat(args)), host.getNewLine(), baseCompilerOptions);
-            }
+        state.cache = undefined;
+    }
+    function clearProjectStatus(state, resolved) {
+        state.projectStatus.delete(resolved);
+        state.diagnostics.delete(resolved);
+    }
+    function addProjToQueue(_a, proj, reloadLevel) {
+        var projectPendingBuild = _a.projectPendingBuild;
+        var value = projectPendingBuild.get(proj);
+        if (value === undefined) {
+            projectPendingBuild.set(proj, reloadLevel);
         }
-        function startWatching() {
-            var graph = getGlobalDependencyGraph();
-            for (var _i = 0, _a = graph.buildQueue; _i < _a.length; _i++) {
-                var resolved = _a[_i];
-                // Watch this file
-                watchConfigFile(resolved);
-                var cfg = parseConfigFile(resolved);
-                if (cfg) {
-                    // Update watchers for wildcard directories
-                    watchWildCardDirectories(resolved, cfg);
-                    // Watch input files
-                    watchInputFiles(resolved, cfg);
+        else if (value < reloadLevel) {
+            projectPendingBuild.set(proj, reloadLevel);
+        }
+    }
+    function setupInitialBuild(state, cancellationToken) {
+        // Set initial build if not already built
+        if (!state.allProjectBuildPending)
+            return;
+        state.allProjectBuildPending = false;
+        if (state.options.watch) {
+            reportWatchStatus(state, ts.Diagnostics.Starting_compilation_in_watch_mode);
+        }
+        enableCache(state);
+        var buildOrder = getBuildOrder(state);
+        buildOrder.forEach(function (configFileName) {
+            return state.projectPendingBuild.set(toResolvedConfigFilePath(state, configFileName), ts.ConfigFileProgramReloadLevel.None);
+        });
+        if (cancellationToken) {
+            cancellationToken.throwIfCancellationRequested();
+        }
+    }
+    var InvalidatedProjectKind;
+    (function (InvalidatedProjectKind) {
+        InvalidatedProjectKind[InvalidatedProjectKind["Build"] = 0] = "Build";
+        InvalidatedProjectKind[InvalidatedProjectKind["UpdateBundle"] = 1] = "UpdateBundle";
+        InvalidatedProjectKind[InvalidatedProjectKind["UpdateOutputFileStamps"] = 2] = "UpdateOutputFileStamps";
+    })(InvalidatedProjectKind = ts.InvalidatedProjectKind || (ts.InvalidatedProjectKind = {}));
+    function doneInvalidatedProject(state, projectPath) {
+        state.projectPendingBuild.delete(projectPath);
+        state.currentInvalidatedProject = undefined;
+        return state.diagnostics.has(projectPath) ?
+            ts.ExitStatus.DiagnosticsPresent_OutputsSkipped :
+            ts.ExitStatus.Success;
+    }
+    function createUpdateOutputFileStampsProject(state, project, projectPath, config, buildOrder) {
+        var updateOutputFileStampsPending = true;
+        return {
+            kind: InvalidatedProjectKind.UpdateOutputFileStamps,
+            project: project,
+            projectPath: projectPath,
+            buildOrder: buildOrder,
+            getCompilerOptions: function () { return config.options; },
+            getCurrentDirectory: function () { return state.currentDirectory; },
+            updateOutputFileStatmps: function () {
+                updateOutputTimestamps(state, config, projectPath);
+                updateOutputFileStampsPending = false;
+            },
+            done: function () {
+                if (updateOutputFileStampsPending) {
+                    updateOutputTimestamps(state, config, projectPath);
                 }
+                return doneInvalidatedProject(state, projectPath);
             }
-        }
-        function watchConfigFile(resolved) {
-            if (options.watch && !allWatchedConfigFiles.hasKey(resolved)) {
-                allWatchedConfigFiles.setValue(resolved, watchFile(hostWithWatch, resolved, function () {
-                    invalidateProjectAndScheduleBuilds(resolved, ts.ConfigFileProgramReloadLevel.Full);
-                }, ts.PollingInterval.High, "Config file" /* ConfigFile */, resolved));
-            }
-        }
-        function watchWildCardDirectories(resolved, parsed) {
-            if (!options.watch)
-                return;
-            ts.updateWatchingWildcardDirectories(getOrCreateValueMapFromConfigFileMap(allWatchedWildcardDirectories, resolved), ts.createMapFromTemplate(parsed.configFileSpecs.wildcardDirectories), function (dir, flags) {
-                return watchDirectory(hostWithWatch, dir, function (fileOrDirectory) {
-                    var fileOrDirectoryPath = toPath(fileOrDirectory);
-                    if (fileOrDirectoryPath !== toPath(dir) && ts.hasExtension(fileOrDirectoryPath) && !ts.isSupportedSourceFileName(fileOrDirectory, parsed.options)) {
-                        writeLog("Project: " + resolved + " Detected file add/remove of non supported extension: " + fileOrDirectory);
-                        return;
+        };
+    }
+    function createBuildOrUpdateInvalidedProject(kind, state, project, projectPath, projectIndex, config, buildOrder) {
+        var Step;
+        (function (Step) {
+            Step[Step["CreateProgram"] = 0] = "CreateProgram";
+            Step[Step["SyntaxDiagnostics"] = 1] = "SyntaxDiagnostics";
+            Step[Step["SemanticDiagnostics"] = 2] = "SemanticDiagnostics";
+            Step[Step["Emit"] = 3] = "Emit";
+            Step[Step["EmitBundle"] = 4] = "EmitBundle";
+            Step[Step["BuildInvalidatedProjectOfBundle"] = 5] = "BuildInvalidatedProjectOfBundle";
+            Step[Step["QueueReferencingProjects"] = 6] = "QueueReferencingProjects";
+            Step[Step["Done"] = 7] = "Done";
+        })(Step || (Step = {}));
+        var step = kind === InvalidatedProjectKind.Build ? Step.CreateProgram : Step.EmitBundle;
+        var program;
+        var buildResult;
+        var invalidatedProjectOfBundle;
+        return kind === InvalidatedProjectKind.Build ?
+            {
+                kind: kind,
+                project: project,
+                projectPath: projectPath,
+                buildOrder: buildOrder,
+                getCompilerOptions: function () { return config.options; },
+                getCurrentDirectory: function () { return state.currentDirectory; },
+                getBuilderProgram: function () { return withProgramOrUndefined(ts.identity); },
+                getProgram: function () {
+                    return withProgramOrUndefined(function (program) { return program.getProgramOrUndefined(); });
+                },
+                getSourceFile: function (fileName) {
+                    return withProgramOrUndefined(function (program) { return program.getSourceFile(fileName); });
+                },
+                getSourceFiles: function () {
+                    return withProgramOrEmptyArray(function (program) { return program.getSourceFiles(); });
+                },
+                getOptionsDiagnostics: function (cancellationToken) {
+                    return withProgramOrEmptyArray(function (program) { return program.getOptionsDiagnostics(cancellationToken); });
+                },
+                getGlobalDiagnostics: function (cancellationToken) {
+                    return withProgramOrEmptyArray(function (program) { return program.getGlobalDiagnostics(cancellationToken); });
+                },
+                getConfigFileParsingDiagnostics: function () {
+                    return withProgramOrEmptyArray(function (program) { return program.getConfigFileParsingDiagnostics(); });
+                },
+                getSyntacticDiagnostics: function (sourceFile, cancellationToken) {
+                    return withProgramOrEmptyArray(function (program) { return program.getSyntacticDiagnostics(sourceFile, cancellationToken); });
+                },
+                getAllDependencies: function (sourceFile) {
+                    return withProgramOrEmptyArray(function (program) { return program.getAllDependencies(sourceFile); });
+                },
+                getSemanticDiagnostics: function (sourceFile, cancellationToken) {
+                    return withProgramOrEmptyArray(function (program) { return program.getSemanticDiagnostics(sourceFile, cancellationToken); });
+                },
+                getSemanticDiagnosticsOfNextAffectedFile: function (cancellationToken, ignoreSourceFile) {
+                    return withProgramOrUndefined(function (program) {
+                        return (program.getSemanticDiagnosticsOfNextAffectedFile) &&
+                            program.getSemanticDiagnosticsOfNextAffectedFile(cancellationToken, ignoreSourceFile);
+                    });
+                },
+                emit: function (targetSourceFile, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers) {
+                    if (targetSourceFile || emitOnlyDtsFiles) {
+                        return withProgramOrUndefined(function (program) { return program.emit(targetSourceFile, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers); });
                     }
-                    if (isOutputFile(fileOrDirectory, parsed)) {
-                        writeLog(fileOrDirectory + " is output file");
-                        return;
-                    }
-                    invalidateProjectAndScheduleBuilds(resolved, ts.ConfigFileProgramReloadLevel.Partial);
-                }, flags, "Wild card directory" /* WildcardDirectory */, resolved);
-            });
-        }
-        function watchInputFiles(resolved, parsed) {
-            if (!options.watch)
-                return;
-            ts.mutateMap(getOrCreateValueMapFromConfigFileMap(allWatchedInputFiles, resolved), ts.arrayToMap(parsed.fileNames, toPath), {
-                createNewValue: function (path, input) { return watchFilePath(hostWithWatch, input, function () { return invalidateProjectAndScheduleBuilds(resolved, ts.ConfigFileProgramReloadLevel.None); }, ts.PollingInterval.Low, path, "Source file" /* SourceFile */, resolved); },
-                onDeleteValue: ts.closeFileWatcher,
-            });
-        }
-        function isOutputFile(fileName, configFile) {
-            if (configFile.options.noEmit)
-                return false;
-            // ts or tsx files are not output
-            if (!ts.fileExtensionIs(fileName, ".d.ts" /* Dts */) &&
-                (ts.fileExtensionIs(fileName, ".ts" /* Ts */) || ts.fileExtensionIs(fileName, ".tsx" /* Tsx */))) {
-                return false;
-            }
-            // If options have --outFile or --out, check if its that
-            var out = configFile.options.outFile || configFile.options.out;
-            if (out && (isSameFile(fileName, out) || isSameFile(fileName, ts.removeFileExtension(out) + ".d.ts" /* Dts */))) {
-                return true;
-            }
-            // If declarationDir is specified, return if its a file in that directory
-            if (configFile.options.declarationDir && ts.containsPath(configFile.options.declarationDir, fileName, currentDirectory, !host.useCaseSensitiveFileNames())) {
-                return true;
-            }
-            // If --outDir, check if file is in that directory
-            if (configFile.options.outDir && ts.containsPath(configFile.options.outDir, fileName, currentDirectory, !host.useCaseSensitiveFileNames())) {
-                return true;
-            }
-            return !ts.forEach(configFile.fileNames, function (inputFile) { return isSameFile(fileName, inputFile); });
-        }
-        function isSameFile(file1, file2) {
-            return ts.comparePaths(file1, file2, currentDirectory, !host.useCaseSensitiveFileNames()) === 0 /* EqualTo */;
-        }
-        function invalidateProjectAndScheduleBuilds(resolved, reloadLevel) {
-            reportFileChangeDetected = true;
-            invalidateResolvedProject(resolved, reloadLevel);
-            scheduleBuildInvalidatedProject();
-        }
-        function getUpToDateStatusOfFile(configFileName) {
-            return getUpToDateStatus(parseConfigFile(configFileName));
-        }
-        function getBuildGraph(configFileNames) {
-            return createDependencyGraph(resolveProjectNames(configFileNames));
-        }
-        function getGlobalDependencyGraph() {
-            return globalDependencyGraph || (globalDependencyGraph = getBuildGraph(rootNames));
-        }
-        function getUpToDateStatus(project) {
-            if (project === undefined) {
-                return { type: UpToDateStatusType.Unbuildable, reason: "File deleted mid-build" };
-            }
-            var prior = projectStatus.getValue(project.options.configFilePath);
-            if (prior !== undefined) {
-                return prior;
-            }
-            var actual = getUpToDateStatusWorker(project);
-            projectStatus.setValue(project.options.configFilePath, actual);
-            return actual;
-        }
-        function getUpToDateStatusWorker(project) {
-            var newestInputFileName = undefined;
-            var newestInputFileTime = minimumDate;
-            // Get timestamps of input files
-            for (var _i = 0, _a = project.fileNames; _i < _a.length; _i++) {
-                var inputFile = _a[_i];
-                if (!host.fileExists(inputFile)) {
-                    return {
-                        type: UpToDateStatusType.Unbuildable,
-                        reason: inputFile + " does not exist"
-                    };
-                }
-                var inputTime = host.getModifiedTime(inputFile) || ts.missingFileModifiedTime;
-                if (inputTime > newestInputFileTime) {
-                    newestInputFileName = inputFile;
-                    newestInputFileTime = inputTime;
-                }
-            }
-            // Collect the expected outputs of this project
-            var outputs = getAllProjectOutputs(project);
-            if (outputs.length === 0) {
-                return {
-                    type: UpToDateStatusType.ContainerOnly
-                };
-            }
-            // Now see if all outputs are newer than the newest input
-            var oldestOutputFileName = "(none)";
-            var oldestOutputFileTime = maximumDate;
-            var newestOutputFileName = "(none)";
-            var newestOutputFileTime = minimumDate;
-            var missingOutputFileName;
-            var newestDeclarationFileContentChangedTime = minimumDate;
-            var isOutOfDateWithInputs = false;
-            for (var _b = 0, outputs_1 = outputs; _b < outputs_1.length; _b++) {
-                var output = outputs_1[_b];
-                // Output is missing; can stop checking
-                // Don't immediately return because we can still be upstream-blocked, which is a higher-priority status
-                if (!host.fileExists(output)) {
-                    missingOutputFileName = output;
-                    break;
-                }
-                var outputTime = host.getModifiedTime(output) || ts.missingFileModifiedTime;
-                if (outputTime < oldestOutputFileTime) {
-                    oldestOutputFileTime = outputTime;
-                    oldestOutputFileName = output;
-                }
-                // If an output is older than the newest input, we can stop checking
-                // Don't immediately return because we can still be upstream-blocked, which is a higher-priority status
-                if (outputTime < newestInputFileTime) {
-                    isOutOfDateWithInputs = true;
-                    break;
-                }
-                if (outputTime > newestOutputFileTime) {
-                    newestOutputFileTime = outputTime;
-                    newestOutputFileName = output;
-                }
-                // Keep track of when the most recent time a .d.ts file was changed.
-                // In addition to file timestamps, we also keep track of when a .d.ts file
-                // had its file touched but not had its contents changed - this allows us
-                // to skip a downstream typecheck
-                if (isDeclarationFile(output)) {
-                    var unchangedTime = unchangedOutputs.getValue(output);
-                    if (unchangedTime !== undefined) {
-                        newestDeclarationFileContentChangedTime = newer(unchangedTime, newestDeclarationFileContentChangedTime);
-                    }
-                    else {
-                        var outputModifiedTime = host.getModifiedTime(output) || ts.missingFileModifiedTime;
-                        newestDeclarationFileContentChangedTime = newer(newestDeclarationFileContentChangedTime, outputModifiedTime);
-                    }
-                }
-            }
-            var pseudoUpToDate = false;
-            var usesPrepend = false;
-            var upstreamChangedProject;
-            if (project.projectReferences) {
-                projectStatus.setValue(project.options.configFilePath, { type: UpToDateStatusType.ComputingUpstream });
-                for (var _c = 0, _d = project.projectReferences; _c < _d.length; _c++) {
-                    var ref = _d[_c];
-                    usesPrepend = usesPrepend || !!(ref.prepend);
-                    var resolvedRef = ts.resolveProjectReferencePath(ref);
-                    var refStatus = getUpToDateStatus(parseConfigFile(resolvedRef));
-                    // Its a circular reference ignore the status of this project
-                    if (refStatus.type === UpToDateStatusType.ComputingUpstream) {
-                        continue;
-                    }
-                    // An upstream project is blocked
-                    if (refStatus.type === UpToDateStatusType.Unbuildable) {
-                        return {
-                            type: UpToDateStatusType.UpstreamBlocked,
-                            upstreamProjectName: ref.path
-                        };
-                    }
-                    // If the upstream project is out of date, then so are we (someone shouldn't have asked, though?)
-                    if (refStatus.type !== UpToDateStatusType.UpToDate) {
-                        return {
-                            type: UpToDateStatusType.UpstreamOutOfDate,
-                            upstreamProjectName: ref.path
-                        };
-                    }
-                    // Check oldest output file name only if there is no missing output file name
-                    if (!missingOutputFileName) {
-                        // If the upstream project's newest file is older than our oldest output, we
-                        // can't be out of date because of it
-                        if (refStatus.newestInputFileTime && refStatus.newestInputFileTime <= oldestOutputFileTime) {
-                            continue;
-                        }
-                        // If the upstream project has only change .d.ts files, and we've built
-                        // *after* those files, then we're "psuedo up to date" and eligible for a fast rebuild
-                        if (refStatus.newestDeclarationFileContentChangedTime && refStatus.newestDeclarationFileContentChangedTime <= oldestOutputFileTime) {
-                            pseudoUpToDate = true;
-                            upstreamChangedProject = ref.path;
-                            continue;
-                        }
-                        // We have an output older than an upstream output - we are out of date
-                        ts.Debug.assert(oldestOutputFileName !== undefined, "Should have an oldest output filename here");
-                        return {
-                            type: UpToDateStatusType.OutOfDateWithUpstream,
-                            outOfDateOutputFileName: oldestOutputFileName,
-                            newerProjectName: ref.path
-                        };
-                    }
-                }
-            }
-            if (missingOutputFileName !== undefined) {
-                return {
-                    type: UpToDateStatusType.OutputMissing,
-                    missingOutputFileName: missingOutputFileName
-                };
-            }
-            if (isOutOfDateWithInputs) {
-                return {
-                    type: UpToDateStatusType.OutOfDateWithSelf,
-                    outOfDateOutputFileName: oldestOutputFileName,
-                    newerInputFileName: newestInputFileName
-                };
-            }
-            if (!buildInfoChecked.hasKey(project.options.configFilePath)) {
-                buildInfoChecked.setValue(project.options.configFilePath, true);
-                var buildInfoPath = ts.getOutputPathForBuildInfo(project.options);
-                if (buildInfoPath) {
-                    var value = readFileWithCache(buildInfoPath);
-                    var buildInfo = value && ts.getBuildInfo(value);
-                    if (buildInfo && buildInfo.version !== ts.version) {
-                        return {
-                            type: UpToDateStatusType.TsVersionOutputOfDate,
-                            version: buildInfo.version
-                        };
-                    }
-                }
-            }
-            if (usesPrepend && pseudoUpToDate) {
-                return {
-                    type: UpToDateStatusType.OutOfDateWithPrepend,
-                    outOfDateOutputFileName: oldestOutputFileName,
-                    newerProjectName: upstreamChangedProject
-                };
-            }
-            // Up to date
-            return {
-                type: pseudoUpToDate ? UpToDateStatusType.UpToDateWithUpstreamTypes : UpToDateStatusType.UpToDate,
-                newestDeclarationFileContentChangedTime: newestDeclarationFileContentChangedTime,
-                newestInputFileTime: newestInputFileTime,
-                newestOutputFileTime: newestOutputFileTime,
-                newestInputFileName: newestInputFileName,
-                newestOutputFileName: newestOutputFileName,
-                oldestOutputFileName: oldestOutputFileName
+                    executeSteps(Step.SemanticDiagnostics, cancellationToken);
+                    if (step !== Step.Emit)
+                        return undefined;
+                    return emit(writeFile, cancellationToken, customTransformers);
+                },
+                done: done
+            } :
+            {
+                kind: kind,
+                project: project,
+                projectPath: projectPath,
+                buildOrder: buildOrder,
+                getCompilerOptions: function () { return config.options; },
+                getCurrentDirectory: function () { return state.currentDirectory; },
+                emit: function (writeFile, customTransformers) {
+                    if (step !== Step.EmitBundle)
+                        return invalidatedProjectOfBundle;
+                    return emitBundle(writeFile, customTransformers);
+                },
+                done: done,
             };
+        function done(cancellationToken, writeFile, customTransformers) {
+            executeSteps(Step.Done, cancellationToken, writeFile, customTransformers);
+            return doneInvalidatedProject(state, projectPath);
         }
-        function invalidateProject(configFileName, reloadLevel) {
-            invalidateResolvedProject(resolveProjectName(configFileName), reloadLevel);
+        function withProgramOrUndefined(action) {
+            executeSteps(Step.CreateProgram);
+            return program && action(program);
         }
-        function invalidateResolvedProject(resolved, reloadLevel) {
-            if (reloadLevel === ts.ConfigFileProgramReloadLevel.Full) {
-                configFileCache.removeKey(resolved);
-                globalDependencyGraph = undefined;
-            }
-            projectStatus.removeKey(resolved);
-            diagnostics.removeKey(resolved);
-            addProjToQueue(resolved, reloadLevel);
+        function withProgramOrEmptyArray(action) {
+            return withProgramOrUndefined(action) || ts.emptyArray;
         }
-        /**
-         * return true if new addition
-         */
-        function addProjToQueue(proj, reloadLevel) {
-            var value = projectPendingBuild.getValue(proj);
-            if (value === undefined) {
-                projectPendingBuild.setValue(proj, reloadLevel || ts.ConfigFileProgramReloadLevel.None);
-                invalidatedProjectQueue.push(proj);
-            }
-            else if (value < (reloadLevel || ts.ConfigFileProgramReloadLevel.None)) {
-                projectPendingBuild.setValue(proj, reloadLevel || ts.ConfigFileProgramReloadLevel.None);
-            }
-        }
-        function getNextInvalidatedProject() {
-            if (nextProjectToBuild < invalidatedProjectQueue.length) {
-                var project = invalidatedProjectQueue[nextProjectToBuild];
-                nextProjectToBuild++;
-                var reloadLevel = projectPendingBuild.getValue(project);
-                projectPendingBuild.removeKey(project);
-                if (!projectPendingBuild.getSize()) {
-                    invalidatedProjectQueue.length = 0;
-                    nextProjectToBuild = 0;
-                }
-                return { project: project, reloadLevel: reloadLevel };
-            }
-        }
-        function hasPendingInvalidatedProjects() {
-            return !!projectPendingBuild.getSize();
-        }
-        function scheduleBuildInvalidatedProject() {
-            if (!hostWithWatch.setTimeout || !hostWithWatch.clearTimeout) {
+        function createProgram() {
+            ts.Debug.assert(program === undefined);
+            if (state.options.dry) {
+                reportStatus(state, ts.Diagnostics.A_non_dry_build_would_build_project_0, project);
+                buildResult = BuildResultFlags.Success;
+                step = Step.QueueReferencingProjects;
                 return;
             }
-            if (timerToBuildInvalidatedProject) {
-                hostWithWatch.clearTimeout(timerToBuildInvalidatedProject);
-            }
-            timerToBuildInvalidatedProject = hostWithWatch.setTimeout(buildInvalidatedProject, 250);
-        }
-        function buildInvalidatedProject() {
-            timerToBuildInvalidatedProject = undefined;
-            if (reportFileChangeDetected) {
-                reportFileChangeDetected = false;
-                projectErrorsReported.clear();
-                reportWatchStatus(ts.Diagnostics.File_change_detected_Starting_incremental_compilation);
-            }
-            var buildProject = getNextInvalidatedProject();
-            if (buildProject) {
-                buildSingleInvalidatedProject(buildProject.project, buildProject.reloadLevel);
-                if (hasPendingInvalidatedProjects()) {
-                    if (options.watch && !timerToBuildInvalidatedProject) {
-                        scheduleBuildInvalidatedProject();
-                    }
-                }
-                else {
-                    reportErrorSummary();
-                }
-            }
-        }
-        function reportErrorSummary() {
-            if (options.watch || host.reportErrorSummary) {
-                // Report errors from the other projects
-                getGlobalDependencyGraph().buildQueue.forEach(function (project) {
-                    if (!projectErrorsReported.hasKey(project)) {
-                        reportErrors(diagnostics.getValue(project) || ts.emptyArray);
-                    }
-                });
-                var totalErrors_1 = 0;
-                diagnostics.forEach(function (singleProjectErrors) { return totalErrors_1 += ts.getErrorCountForSummary(singleProjectErrors); });
-                if (options.watch) {
-                    reportWatchStatus(ts.getWatchErrorSummaryDiagnosticMessage(totalErrors_1), totalErrors_1);
-                }
-                else {
-                    host.reportErrorSummary(totalErrors_1);
-                }
-            }
-        }
-        function buildSingleInvalidatedProject(resolved, reloadLevel) {
-            var proj = parseConfigFile(resolved);
-            if (!proj) {
-                reportParseConfigFileDiagnostic(resolved);
-                return;
-            }
-            if (reloadLevel === ts.ConfigFileProgramReloadLevel.Full) {
-                watchConfigFile(resolved);
-                watchWildCardDirectories(resolved, proj);
-                watchInputFiles(resolved, proj);
-            }
-            else if (reloadLevel === ts.ConfigFileProgramReloadLevel.Partial) {
-                // Update file names
-                var result = ts.getFileNamesFromConfigSpecs(proj.configFileSpecs, ts.getDirectoryPath(resolved), proj.options, parseConfigFileHost);
-                ts.updateErrorForNoInputFiles(result, resolved, proj.configFileSpecs, proj.errors, ts.canJsonReportNoInutFiles(proj.raw));
-                proj.fileNames = result.fileNames;
-                watchInputFiles(resolved, proj);
-            }
-            var status = getUpToDateStatus(proj);
-            verboseReportProjectStatus(resolved, status);
-            if (status.type === UpToDateStatusType.UpstreamBlocked) {
-                if (options.verbose)
-                    reportStatus(ts.Diagnostics.Skipping_build_of_project_0_because_its_dependency_1_has_errors, resolved, status.upstreamProjectName);
-                return;
-            }
-            if (status.type === UpToDateStatusType.UpToDateWithUpstreamTypes) {
-                // Fake that files have been built by updating output file stamps
-                updateOutputTimestamps(proj);
-                return;
-            }
-            var buildResult = status.type === UpToDateStatusType.OutOfDateWithPrepend ?
-                updateBundle(resolved) : // Fake that files have been built by manipulating prepend and existing output
-                buildSingleProject(resolved); // Actual build
-            if (buildResult & BuildResultFlags.AnyErrors)
-                return;
-            var _a = getGlobalDependencyGraph(), referencingProjectsMap = _a.referencingProjectsMap, buildQueue = _a.buildQueue;
-            var referencingProjects = referencingProjectsMap.getValue(resolved);
-            if (!referencingProjects)
-                return;
-            // Always use build order to queue projects
-            for (var index = buildQueue.indexOf(resolved) + 1; index < buildQueue.length; index++) {
-                var project = buildQueue[index];
-                var prepend = referencingProjects.getValue(project);
-                if (prepend !== undefined) {
-                    // If the project is referenced with prepend, always build downstream projects,
-                    // If declaration output is changed, build the project
-                    // otherwise mark the project UpToDateWithUpstreamTypes so it updates output time stamps
-                    var status_1 = projectStatus.getValue(project);
-                    if (!(buildResult & BuildResultFlags.DeclarationOutputUnchanged)) {
-                        if (status_1 && (status_1.type === UpToDateStatusType.UpToDate || status_1.type === UpToDateStatusType.UpToDateWithUpstreamTypes || status_1.type === UpToDateStatusType.OutOfDateWithPrepend)) {
-                            projectStatus.setValue(project, {
-                                type: UpToDateStatusType.OutOfDateWithUpstream,
-                                outOfDateOutputFileName: status_1.type === UpToDateStatusType.OutOfDateWithPrepend ? status_1.outOfDateOutputFileName : status_1.oldestOutputFileName,
-                                newerProjectName: resolved
-                            });
-                        }
-                    }
-                    else if (status_1 && status_1.type === UpToDateStatusType.UpToDate) {
-                        if (prepend) {
-                            projectStatus.setValue(project, {
-                                type: UpToDateStatusType.OutOfDateWithPrepend,
-                                outOfDateOutputFileName: status_1.oldestOutputFileName,
-                                newerProjectName: resolved
-                            });
-                        }
-                        else {
-                            status_1.type = UpToDateStatusType.UpToDateWithUpstreamTypes;
-                        }
-                    }
-                    addProjToQueue(project);
-                }
-            }
-        }
-        function createDependencyGraph(roots) {
-            var temporaryMarks = createFileMap(toPath);
-            var permanentMarks = createFileMap(toPath);
-            var circularityReportStack = [];
-            var buildOrder = [];
-            var referencingProjectsMap = createFileMap(toPath);
-            for (var _i = 0, roots_1 = roots; _i < roots_1.length; _i++) {
-                var root = roots_1[_i];
-                visit(root);
-            }
-            return {
-                buildQueue: buildOrder,
-                referencingProjectsMap: referencingProjectsMap
-            };
-            function visit(projPath, inCircularContext) {
-                // Already visited
-                if (permanentMarks.hasKey(projPath))
-                    return;
-                // Circular
-                if (temporaryMarks.hasKey(projPath)) {
-                    if (!inCircularContext) {
-                        // TODO:: Do we report this as error?
-                        reportStatus(ts.Diagnostics.Project_references_may_not_form_a_circular_graph_Cycle_detected_Colon_0, circularityReportStack.join("\r\n"));
-                    }
-                    return;
-                }
-                temporaryMarks.setValue(projPath, true);
-                circularityReportStack.push(projPath);
-                var parsed = parseConfigFile(projPath);
-                if (parsed && parsed.projectReferences) {
-                    for (var _i = 0, _a = parsed.projectReferences; _i < _a.length; _i++) {
-                        var ref = _a[_i];
-                        var resolvedRefPath = resolveProjectName(ref.path);
-                        visit(resolvedRefPath, inCircularContext || ref.circular);
-                        // Get projects referencing resolvedRefPath and add projPath to it
-                        var referencingProjects = getOrCreateValueFromConfigFileMap(referencingProjectsMap, resolvedRefPath, function () { return createFileMap(toPath); });
-                        referencingProjects.setValue(projPath, !!ref.prepend);
-                    }
-                }
-                circularityReportStack.pop();
-                permanentMarks.setValue(projPath, true);
-                buildOrder.push(projPath);
-            }
-        }
-        function buildSingleProject(proj) {
-            if (options.dry) {
-                reportStatus(ts.Diagnostics.A_non_dry_build_would_build_project_0, proj);
-                return BuildResultFlags.Success;
-            }
-            if (options.verbose)
-                reportStatus(ts.Diagnostics.Building_project_0, proj);
-            var resultFlags = BuildResultFlags.DeclarationOutputUnchanged;
-            var configFile = parseConfigFile(proj);
-            if (!configFile) {
-                // Failed to read the config file
-                resultFlags |= BuildResultFlags.ConfigFileErrors;
-                reportParseConfigFileDiagnostic(proj);
-                projectStatus.setValue(proj, { type: UpToDateStatusType.Unbuildable, reason: "Config file errors" });
-                return resultFlags;
-            }
-            if (configFile.fileNames.length === 0) {
-                reportAndStoreErrors(proj, configFile.errors);
+            if (state.options.verbose)
+                reportStatus(state, ts.Diagnostics.Building_project_0, project);
+            if (config.fileNames.length === 0) {
+                reportAndStoreErrors(state, projectPath, config.errors);
                 // Nothing to build - must be a solution file, basically
-                return BuildResultFlags.None;
+                buildResult = BuildResultFlags.None;
+                step = Step.QueueReferencingProjects;
+                return;
             }
-            // TODO: handle resolve module name to cache result in project reference redirect
-            projectCompilerOptions = configFile.options;
-            var program = host.createProgram(configFile.fileNames, configFile.options, compilerHost, getOldProgram(proj, configFile), configFile.errors, configFile.projectReferences);
-            // Don't emit anything in the presence of syntactic errors or options diagnostics
-            var syntaxDiagnostics = program.getConfigFileParsingDiagnostics().concat(program.getOptionsDiagnostics(), program.getGlobalDiagnostics(), program.getSyntacticDiagnostics());
-            if (syntaxDiagnostics.length) {
-                return buildErrors(syntaxDiagnostics, BuildResultFlags.SyntaxErrors, "Syntactic");
+            var host = state.host, compilerHost = state.compilerHost;
+            state.projectCompilerOptions = config.options;
+            // Update module resolution cache if needed
+            updateModuleResolutionCache(state, project, config);
+            // Create program
+            program = host.createProgram(config.fileNames, config.options, compilerHost, getOldProgram(state, projectPath, config), config.errors, config.projectReferences);
+            step++;
+        }
+        function handleDiagnostics(diagnostics, errorFlags, errorType) {
+            if (diagnostics.length) {
+                buildResult = buildErrors(state, projectPath, program, diagnostics, errorFlags, errorType);
+                step = Step.QueueReferencingProjects;
             }
-            // Same as above but now for semantic diagnostics
-            var semanticDiagnostics = program.getSemanticDiagnostics();
-            if (semanticDiagnostics.length) {
-                return buildErrors(semanticDiagnostics, BuildResultFlags.TypeErrors, "Semantic");
+            else {
+                step++;
             }
+        }
+        function getSyntaxDiagnostics(cancellationToken) {
+            ts.Debug.assertDefined(program);
+            handleDiagnostics(program.getConfigFileParsingDiagnostics().concat(program.getOptionsDiagnostics(cancellationToken), program.getGlobalDiagnostics(cancellationToken), program.getSyntacticDiagnostics(/*sourceFile*/ undefined, cancellationToken)), BuildResultFlags.SyntaxErrors, "Syntactic");
+        }
+        function getSemanticDiagnostics(cancellationToken) {
+            handleDiagnostics(ts.Debug.assertDefined(program).getSemanticDiagnostics(/*sourceFile*/ undefined, cancellationToken), BuildResultFlags.TypeErrors, "Semantic");
+        }
+        function emit(writeFileCallback, cancellationToken, customTransformers) {
+            ts.Debug.assertDefined(program);
+            ts.Debug.assert(step === Step.Emit);
             // Before emitting lets backup state, so we can revert it back if there are declaration errors to handle emit and declaration errors correctly
             program.backupState();
-            var newestDeclarationFileContentChangedTime = minimumDate;
-            var anyDtsChanged = false;
             var declDiagnostics;
             var reportDeclarationDiagnostics = function (d) { return (declDiagnostics || (declDiagnostics = [])).push(d); };
             var outputFiles = [];
-            ts.emitFilesAndReportErrors(program, reportDeclarationDiagnostics, writeFileName, /*reportSummary*/ undefined, function (name, text, writeByteOrderMark) { return outputFiles.push({ name: name, text: text, writeByteOrderMark: writeByteOrderMark }); });
+            var emitResult = ts.emitFilesAndReportErrors(program, reportDeclarationDiagnostics, 
+            /*writeFileName*/ undefined, 
+            /*reportSummary*/ undefined, function (name, text, writeByteOrderMark) { return outputFiles.push({ name: name, text: text, writeByteOrderMark: writeByteOrderMark }); }, cancellationToken, 
+            /*emitOnlyDts*/ false, customTransformers).emitResult;
             // Don't emit .d.ts if there are decl file errors
             if (declDiagnostics) {
                 program.restoreState();
-                return buildErrors(declDiagnostics, BuildResultFlags.DeclarationEmitErrors, "Declaration file");
+                buildResult = buildErrors(state, projectPath, program, declDiagnostics, BuildResultFlags.DeclarationEmitErrors, "Declaration file");
+                step = Step.QueueReferencingProjects;
+                return {
+                    emitSkipped: true,
+                    diagnostics: emitResult.diagnostics
+                };
             }
             // Actual Emit
+            var host = state.host, compilerHost = state.compilerHost;
+            var resultFlags = BuildResultFlags.DeclarationOutputUnchanged;
+            var newestDeclarationFileContentChangedTime = minimumDate;
+            var anyDtsChanged = false;
             var emitterDiagnostics = ts.createDiagnosticCollection();
-            var emittedOutputs = createFileMap(toPath);
+            var emittedOutputs = ts.createMap();
             outputFiles.forEach(function (_a) {
                 var name = _a.name, text = _a.text, writeByteOrderMark = _a.writeByteOrderMark;
                 var priorChangeTime;
                 if (!anyDtsChanged && isDeclarationFile(name)) {
                     // Check for unchanged .d.ts files
-                    if (host.fileExists(name) && readFileWithCache(name) === text) {
+                    if (host.fileExists(name) && state.readFileWithCache(name) === text) {
                         priorChangeTime = host.getModifiedTime(name);
                     }
                     else {
@@ -94119,481 +96666,872 @@ var ts;
                         anyDtsChanged = true;
                     }
                 }
-                emittedOutputs.setValue(name, true);
-                ts.writeFile(compilerHost, emitterDiagnostics, name, text, writeByteOrderMark);
+                emittedOutputs.set(toPath(state, name), name);
+                ts.writeFile(writeFileCallback ? { writeFile: writeFileCallback } : compilerHost, emitterDiagnostics, name, text, writeByteOrderMark);
                 if (priorChangeTime !== undefined) {
                     newestDeclarationFileContentChangedTime = newer(priorChangeTime, newestDeclarationFileContentChangedTime);
-                    unchangedOutputs.setValue(name, priorChangeTime);
                 }
             });
+            finishEmit(emitterDiagnostics, emittedOutputs, newestDeclarationFileContentChangedTime, 
+            /*newestDeclarationFileContentChangedTimeIsMaximumDate*/ anyDtsChanged, outputFiles.length ? outputFiles[0].name : ts.getFirstProjectOutput(config, !host.useCaseSensitiveFileNames()), resultFlags);
+            return emitResult;
+        }
+        function finishEmit(emitterDiagnostics, emittedOutputs, priorNewestUpdateTime, newestDeclarationFileContentChangedTimeIsMaximumDate, oldestOutputFileName, resultFlags) {
             var emitDiagnostics = emitterDiagnostics.getDiagnostics();
             if (emitDiagnostics.length) {
-                return buildErrors(emitDiagnostics, BuildResultFlags.EmitErrors, "Emit");
+                buildResult = buildErrors(state, projectPath, program, emitDiagnostics, BuildResultFlags.EmitErrors, "Emit");
+                step = Step.QueueReferencingProjects;
+                return emitDiagnostics;
+            }
+            if (state.writeFileName) {
+                emittedOutputs.forEach(function (name) { return listEmittedFile(state, config, name); });
+                if (program)
+                    ts.listFiles(program, state.writeFileName);
             }
             // Update time stamps for rest of the outputs
-            newestDeclarationFileContentChangedTime = updateOutputTimestampsWorker(configFile, newestDeclarationFileContentChangedTime, ts.Diagnostics.Updating_unchanged_output_timestamps_of_project_0, emittedOutputs);
-            var status = {
-                type: UpToDateStatusType.UpToDate,
-                newestDeclarationFileContentChangedTime: anyDtsChanged ? maximumDate : newestDeclarationFileContentChangedTime,
-                oldestOutputFileName: outputFiles.length ? outputFiles[0].name : getFirstProjectOutput(configFile)
-            };
-            diagnostics.removeKey(proj);
-            projectStatus.setValue(proj, status);
-            afterProgramCreate(proj, program);
-            projectCompilerOptions = baseCompilerOptions;
-            return resultFlags;
-            function buildErrors(diagnostics, errorFlags, errorType) {
-                resultFlags |= errorFlags;
-                reportAndStoreErrors(proj, diagnostics);
-                projectStatus.setValue(proj, { type: UpToDateStatusType.Unbuildable, reason: errorType + " errors" });
-                afterProgramCreate(proj, program);
-                projectCompilerOptions = baseCompilerOptions;
-                return resultFlags;
-            }
+            var newestDeclarationFileContentChangedTime = updateOutputTimestampsWorker(state, config, priorNewestUpdateTime, ts.Diagnostics.Updating_unchanged_output_timestamps_of_project_0, emittedOutputs);
+            state.diagnostics.delete(projectPath);
+            state.projectStatus.set(projectPath, {
+                type: ts.UpToDateStatusType.UpToDate,
+                newestDeclarationFileContentChangedTime: newestDeclarationFileContentChangedTimeIsMaximumDate ?
+                    maximumDate :
+                    newestDeclarationFileContentChangedTime,
+                oldestOutputFileName: oldestOutputFileName
+            });
+            if (program)
+                afterProgramCreate(state, projectPath, program);
+            state.projectCompilerOptions = state.baseCompilerOptions;
+            step = Step.QueueReferencingProjects;
+            buildResult = resultFlags;
+            return emitDiagnostics;
         }
-        function afterProgramCreate(proj, program) {
-            if (host.afterProgramEmitAndDiagnostics) {
-                host.afterProgramEmitAndDiagnostics(program);
+        function emitBundle(writeFileCallback, customTransformers) {
+            ts.Debug.assert(kind === InvalidatedProjectKind.UpdateBundle);
+            if (state.options.dry) {
+                reportStatus(state, ts.Diagnostics.A_non_dry_build_would_update_output_of_project_0, project);
+                buildResult = BuildResultFlags.Success;
+                step = Step.QueueReferencingProjects;
+                return undefined;
             }
-            if (options.watch) {
-                program.releaseProgram();
-                builderPrograms.setValue(proj, program);
-            }
-        }
-        function getOldProgram(proj, parsed) {
-            var value = builderPrograms.getValue(proj);
-            if (value)
-                return value;
-            return ts.readBuilderProgram(parsed.options, readFileWithCache);
-        }
-        function updateBundle(proj) {
-            if (options.dry) {
-                reportStatus(ts.Diagnostics.A_non_dry_build_would_update_output_of_project_0, proj);
-                return BuildResultFlags.Success;
-            }
-            if (options.verbose)
-                reportStatus(ts.Diagnostics.Updating_output_of_project_0, proj);
+            if (state.options.verbose)
+                reportStatus(state, ts.Diagnostics.Updating_output_of_project_0, project);
             // Update js, and source map
-            var config = ts.Debug.assertDefined(parseConfigFile(proj));
-            projectCompilerOptions = config.options;
-            var outputFiles = ts.emitUsingBuildInfo(config, compilerHost, function (ref) { return parseConfigFile(resolveProjectName(ref.path)); });
+            var compilerHost = state.compilerHost;
+            state.projectCompilerOptions = config.options;
+            var outputFiles = ts.emitUsingBuildInfo(config, compilerHost, function (ref) {
+                var refName = resolveProjectName(state, ref.path);
+                return parseConfigFile(state, refName, toResolvedConfigFilePath(state, refName));
+            }, customTransformers);
             if (ts.isString(outputFiles)) {
-                reportStatus(ts.Diagnostics.Cannot_update_output_of_project_0_because_there_was_error_reading_file_1, proj, relName(outputFiles));
-                return buildSingleProject(proj);
+                reportStatus(state, ts.Diagnostics.Cannot_update_output_of_project_0_because_there_was_error_reading_file_1, project, relName(state, outputFiles));
+                step = Step.BuildInvalidatedProjectOfBundle;
+                return invalidatedProjectOfBundle = createBuildOrUpdateInvalidedProject(InvalidatedProjectKind.Build, state, project, projectPath, projectIndex, config, buildOrder);
             }
             // Actual Emit
             ts.Debug.assert(!!outputFiles.length);
             var emitterDiagnostics = ts.createDiagnosticCollection();
-            var emittedOutputs = createFileMap(toPath);
+            var emittedOutputs = ts.createMap();
             outputFiles.forEach(function (_a) {
                 var name = _a.name, text = _a.text, writeByteOrderMark = _a.writeByteOrderMark;
-                emittedOutputs.setValue(name, true);
-                ts.writeFile(compilerHost, emitterDiagnostics, name, text, writeByteOrderMark);
+                emittedOutputs.set(toPath(state, name), name);
+                ts.writeFile(writeFileCallback ? { writeFile: writeFileCallback } : compilerHost, emitterDiagnostics, name, text, writeByteOrderMark);
             });
-            var emitDiagnostics = emitterDiagnostics.getDiagnostics();
-            if (emitDiagnostics.length) {
-                reportAndStoreErrors(proj, emitDiagnostics);
-                projectStatus.setValue(proj, { type: UpToDateStatusType.Unbuildable, reason: "Emit errors" });
-                projectCompilerOptions = baseCompilerOptions;
-                return BuildResultFlags.DeclarationOutputUnchanged | BuildResultFlags.EmitErrors;
-            }
-            // Update timestamps for dts
-            var newestDeclarationFileContentChangedTime = updateOutputTimestampsWorker(config, minimumDate, ts.Diagnostics.Updating_unchanged_output_timestamps_of_project_0, emittedOutputs);
-            var status = {
-                type: UpToDateStatusType.UpToDate,
-                newestDeclarationFileContentChangedTime: newestDeclarationFileContentChangedTime,
-                oldestOutputFileName: outputFiles[0].name
-            };
-            diagnostics.removeKey(proj);
-            projectStatus.setValue(proj, status);
-            projectCompilerOptions = baseCompilerOptions;
-            return BuildResultFlags.DeclarationOutputUnchanged;
+            var emitDiagnostics = finishEmit(emitterDiagnostics, emittedOutputs, minimumDate, 
+            /*newestDeclarationFileContentChangedTimeIsMaximumDate*/ false, outputFiles[0].name, BuildResultFlags.DeclarationOutputUnchanged);
+            return { emitSkipped: false, diagnostics: emitDiagnostics };
         }
-        function updateOutputTimestamps(proj) {
-            if (options.dry) {
-                return reportStatus(ts.Diagnostics.A_non_dry_build_would_update_timestamps_for_output_of_project_0, proj.options.configFilePath);
-            }
-            var priorNewestUpdateTime = updateOutputTimestampsWorker(proj, minimumDate, ts.Diagnostics.Updating_output_timestamps_of_project_0);
-            projectStatus.setValue(proj.options.configFilePath, { type: UpToDateStatusType.UpToDate, newestDeclarationFileContentChangedTime: priorNewestUpdateTime });
-        }
-        function updateOutputTimestampsWorker(proj, priorNewestUpdateTime, verboseMessage, skipOutputs) {
-            var outputs = getAllProjectOutputs(proj);
-            if (!skipOutputs || outputs.length !== skipOutputs.getSize()) {
-                if (options.verbose) {
-                    reportStatus(verboseMessage, proj.options.configFilePath);
-                }
-                var now = host.now ? host.now() : new Date();
-                for (var _i = 0, outputs_2 = outputs; _i < outputs_2.length; _i++) {
-                    var file = outputs_2[_i];
-                    if (skipOutputs && skipOutputs.hasKey(file)) {
-                        continue;
-                    }
-                    if (isDeclarationFile(file)) {
-                        priorNewestUpdateTime = newer(priorNewestUpdateTime, host.getModifiedTime(file) || ts.missingFileModifiedTime);
-                    }
-                    host.setModifiedTime(file, now);
-                    if (proj.options.listEmittedFiles) {
-                        writeFileName("TSFILE: " + file);
-                    }
+        function executeSteps(till, cancellationToken, writeFile, customTransformers) {
+            while (step <= till && step < Step.Done) {
+                var currentStep = step;
+                switch (step) {
+                    case Step.CreateProgram:
+                        createProgram();
+                        break;
+                    case Step.SyntaxDiagnostics:
+                        getSyntaxDiagnostics(cancellationToken);
+                        break;
+                    case Step.SemanticDiagnostics:
+                        getSemanticDiagnostics(cancellationToken);
+                        break;
+                    case Step.Emit:
+                        emit(writeFile, cancellationToken, customTransformers);
+                        break;
+                    case Step.EmitBundle:
+                        emitBundle(writeFile, customTransformers);
+                        break;
+                    case Step.BuildInvalidatedProjectOfBundle:
+                        ts.Debug.assertDefined(invalidatedProjectOfBundle).done(cancellationToken);
+                        step = Step.Done;
+                        break;
+                    case Step.QueueReferencingProjects:
+                        queueReferencingProjects(state, project, projectPath, projectIndex, config, buildOrder, ts.Debug.assertDefined(buildResult));
+                        step++;
+                        break;
+                    // Should never be done
+                    case Step.Done:
+                    default:
+                        ts.assertType(step);
                 }
+                ts.Debug.assert(step > currentStep);
             }
-            return priorNewestUpdateTime;
         }
-        function getFilesToClean() {
-            // Get the same graph for cleaning we'd use for building
-            var graph = getGlobalDependencyGraph();
-            var filesToDelete = [];
-            for (var _i = 0, _a = graph.buildQueue; _i < _a.length; _i++) {
-                var proj = _a[_i];
-                var parsed = parseConfigFile(proj);
-                if (parsed === undefined) {
-                    // File has gone missing; fine to ignore here
-                    reportParseConfigFileDiagnostic(proj);
-                    continue;
-                }
-                var outputs = getAllProjectOutputs(parsed);
-                for (var _b = 0, outputs_3 = outputs; _b < outputs_3.length; _b++) {
-                    var output = outputs_3[_b];
-                    if (host.fileExists(output)) {
-                        filesToDelete.push(output);
-                    }
-                }
+    }
+    function needsBuild(_a, status, config) {
+        var options = _a.options;
+        if (status.type !== ts.UpToDateStatusType.OutOfDateWithPrepend || options.force)
+            return true;
+        return config.fileNames.length === 0 ||
+            !!config.errors.length ||
+            !ts.isIncrementalCompilation(config.options);
+    }
+    function getNextInvalidatedProject(state, buildOrder, reportQueue) {
+        if (!state.projectPendingBuild.size)
+            return undefined;
+        if (state.currentInvalidatedProject) {
+            // Only if same buildOrder the currentInvalidated project can be sent again
+            return ts.arrayIsEqualTo(state.currentInvalidatedProject.buildOrder, buildOrder) ?
+                state.currentInvalidatedProject :
+                undefined;
+        }
+        var options = state.options, projectPendingBuild = state.projectPendingBuild;
+        for (var projectIndex = 0; projectIndex < buildOrder.length; projectIndex++) {
+            var project = buildOrder[projectIndex];
+            var projectPath = toResolvedConfigFilePath(state, project);
+            var reloadLevel = state.projectPendingBuild.get(projectPath);
+            if (reloadLevel === undefined)
+                continue;
+            if (reportQueue) {
+                reportQueue = false;
+                reportBuildQueue(state, buildOrder);
             }
-            return filesToDelete;
-        }
-        function cleanAllProjects() {
-            var filesToDelete = getFilesToClean();
-            if (options.dry) {
-                reportStatus(ts.Diagnostics.A_non_dry_build_would_delete_the_following_files_Colon_0, filesToDelete.map(function (f) { return "\r\n * " + f; }).join(""));
-                return ts.ExitStatus.Success;
+            var config = parseConfigFile(state, project, projectPath);
+            if (!config) {
+                reportParseConfigFileDiagnostic(state, projectPath);
+                projectPendingBuild.delete(projectPath);
+                continue;
             }
-            for (var _i = 0, filesToDelete_1 = filesToDelete; _i < filesToDelete_1.length; _i++) {
-                var output = filesToDelete_1[_i];
-                host.deleteFile(output);
+            if (reloadLevel === ts.ConfigFileProgramReloadLevel.Full) {
+                watchConfigFile(state, project, projectPath);
+                watchWildCardDirectories(state, project, projectPath, config);
+                watchInputFiles(state, project, projectPath, config);
             }
-            return ts.ExitStatus.Success;
-        }
-        function resolveProjectName(name) {
-            return resolveConfigFileProjectName(ts.resolvePath(host.getCurrentDirectory(), name));
-        }
-        function resolveProjectNames(configFileNames) {
-            return configFileNames.map(resolveProjectName);
-        }
-        function buildAllProjects() {
-            if (options.watch) {
-                reportWatchStatus(ts.Diagnostics.Starting_compilation_in_watch_mode);
+            else if (reloadLevel === ts.ConfigFileProgramReloadLevel.Partial) {
+                // Update file names
+                var result = ts.getFileNamesFromConfigSpecs(config.configFileSpecs, ts.getDirectoryPath(project), config.options, state.parseConfigFileHost);
+                ts.updateErrorForNoInputFiles(result, project, config.configFileSpecs, config.errors, ts.canJsonReportNoInutFiles(config.raw));
+                config.fileNames = result.fileNames;
+                watchInputFiles(state, project, projectPath, config);
             }
-            // TODO:: In watch mode as well to use caches for incremental build once we can invalidate caches correctly and have right api
-            // Override readFile for json files and output .d.ts to cache the text
-            var savedReadFileWithCache = readFileWithCache;
-            var savedGetSourceFile = compilerHost.getSourceFile;
-            var _a = ts.changeCompilerHostLikeToUseCache(host, toPath, function () {
-                var args = [];
-                for (var _i = 0; _i < arguments.length; _i++) {
-                    args[_i] = arguments[_i];
-                }
-                return savedGetSourceFile.call.apply(savedGetSourceFile, [compilerHost].concat(args));
-            }), originalReadFile = _a.originalReadFile, originalFileExists = _a.originalFileExists, originalDirectoryExists = _a.originalDirectoryExists, originalCreateDirectory = _a.originalCreateDirectory, originalWriteFile = _a.originalWriteFile, getSourceFileWithCache = _a.getSourceFileWithCache, newReadFileWithCache = _a.readFileWithCache;
-            readFileWithCache = newReadFileWithCache;
-            compilerHost.getSourceFile = getSourceFileWithCache;
-            var graph = getGlobalDependencyGraph();
-            reportBuildQueue(graph);
-            var anyFailed = false;
-            for (var _i = 0, _b = graph.buildQueue; _i < _b.length; _i++) {
-                var next = _b[_i];
-                var proj = parseConfigFile(next);
-                if (proj === undefined) {
-                    reportParseConfigFileDiagnostic(next);
-                    anyFailed = true;
-                    break;
-                }
-                // report errors early when using continue or break statements
-                var errors = proj.errors;
-                var status = getUpToDateStatus(proj);
-                verboseReportProjectStatus(next, status);
-                var projName = proj.options.configFilePath;
-                if (status.type === UpToDateStatusType.UpToDate && !options.force) {
-                    reportAndStoreErrors(next, errors);
+            var status = getUpToDateStatus(state, config, projectPath);
+            verboseReportProjectStatus(state, project, status);
+            if (!options.force) {
+                if (status.type === ts.UpToDateStatusType.UpToDate) {
+                    reportAndStoreErrors(state, projectPath, config.errors);
+                    projectPendingBuild.delete(projectPath);
                     // Up to date, skip
-                    if (defaultOptions.dry) {
+                    if (options.dry) {
                         // In a dry build, inform the user of this fact
-                        reportStatus(ts.Diagnostics.Project_0_is_up_to_date, projName);
+                        reportStatus(state, ts.Diagnostics.Project_0_is_up_to_date, project);
                     }
                     continue;
                 }
-                if (status.type === UpToDateStatusType.UpToDateWithUpstreamTypes && !options.force) {
-                    reportAndStoreErrors(next, errors);
-                    // Fake build
-                    updateOutputTimestamps(proj);
-                    continue;
+                if (status.type === ts.UpToDateStatusType.UpToDateWithUpstreamTypes) {
+                    reportAndStoreErrors(state, projectPath, config.errors);
+                    return createUpdateOutputFileStampsProject(state, project, projectPath, config, buildOrder);
                 }
-                if (status.type === UpToDateStatusType.UpstreamBlocked) {
-                    reportAndStoreErrors(next, errors);
-                    if (options.verbose)
-                        reportStatus(ts.Diagnostics.Skipping_build_of_project_0_because_its_dependency_1_has_errors, projName, status.upstreamProjectName);
-                    continue;
-                }
-                if (status.type === UpToDateStatusType.ContainerOnly) {
-                    reportAndStoreErrors(next, errors);
-                    // Do nothing
-                    continue;
-                }
-                var buildResult = status.type === UpToDateStatusType.OutOfDateWithPrepend && !options.force ?
-                    updateBundle(next) : // Fake that files have been built by manipulating prepend and existing output
-                    buildSingleProject(next); // Actual build
-                anyFailed = anyFailed || !!(buildResult & BuildResultFlags.AnyErrors);
             }
-            reportErrorSummary();
-            host.readFile = originalReadFile;
-            host.fileExists = originalFileExists;
-            host.directoryExists = originalDirectoryExists;
-            host.createDirectory = originalCreateDirectory;
-            host.writeFile = originalWriteFile;
-            compilerHost.getSourceFile = savedGetSourceFile;
-            readFileWithCache = savedReadFileWithCache;
-            return anyFailed ? ts.ExitStatus.DiagnosticsPresent_OutputsSkipped : ts.ExitStatus.Success;
-        }
-        function reportParseConfigFileDiagnostic(proj) {
-            reportAndStoreErrors(proj, [configFileCache.getValue(proj)]);
-        }
-        function reportAndStoreErrors(proj, errors) {
-            reportErrors(errors);
-            projectErrorsReported.setValue(proj, true);
-            diagnostics.setValue(proj, errors);
-        }
-        function reportErrors(errors) {
-            errors.forEach(function (err) { return host.reportDiagnostic(err); });
-        }
-        /**
-         * Report the build ordering inferred from the current project graph if we're in verbose mode
-         */
-        function reportBuildQueue(graph) {
-            if (options.verbose) {
-                reportStatus(ts.Diagnostics.Projects_in_this_build_Colon_0, graph.buildQueue.map(function (s) { return "\r\n    * " + relName(s); }).join(""));
+            if (status.type === ts.UpToDateStatusType.UpstreamBlocked) {
+                reportAndStoreErrors(state, projectPath, config.errors);
+                projectPendingBuild.delete(projectPath);
+                if (options.verbose)
+                    reportStatus(state, ts.Diagnostics.Skipping_build_of_project_0_because_its_dependency_1_has_errors, project, status.upstreamProjectName);
+                continue;
             }
+            if (status.type === ts.UpToDateStatusType.ContainerOnly) {
+                reportAndStoreErrors(state, projectPath, config.errors);
+                projectPendingBuild.delete(projectPath);
+                // Do nothing
+                continue;
+            }
+            return createBuildOrUpdateInvalidedProject(needsBuild(state, status, config) ?
+                InvalidatedProjectKind.Build :
+                InvalidatedProjectKind.UpdateBundle, state, project, projectPath, projectIndex, config, buildOrder);
         }
-        function relName(path) {
-            return ts.convertToRelativePath(path, host.getCurrentDirectory(), function (f) { return compilerHost.getCanonicalFileName(f); });
-        }
-        /**
-         * Report the up-to-date status of a project if we're in verbose mode
-         */
-        function verboseReportProjectStatus(configFileName, status) {
-            if (!options.verbose)
-                return;
-            return formatUpToDateStatus(configFileName, status, relName, reportStatus);
+        return undefined;
+    }
+    function listEmittedFile(_a, proj, file) {
+        var writeFileName = _a.writeFileName;
+        if (writeFileName && proj.options.listEmittedFiles) {
+            writeFileName("TSFILE: " + file);
         }
     }
-    ts.createSolutionBuilder = createSolutionBuilder;
-    function resolveConfigFileProjectName(project) {
-        if (ts.fileExtensionIs(project, ".json" /* Json */)) {
-            return project;
-        }
-        return ts.combinePaths(project, "tsconfig.json");
+    function getOldProgram(_a, proj, parsed) {
+        var options = _a.options, builderPrograms = _a.builderPrograms, compilerHost = _a.compilerHost;
+        if (options.force)
+            return undefined;
+        var value = builderPrograms.get(proj);
+        if (value)
+            return value;
+        return ts.readBuilderProgram(parsed.options, compilerHost);
     }
-    ts.resolveConfigFileProjectName = resolveConfigFileProjectName;
-    function getAllProjectOutputs(project) {
-        if (project.options.outFile || project.options.out) {
-            return getOutFileOutputs(project);
+    function afterProgramCreate(_a, proj, program) {
+        var host = _a.host, watch = _a.watch, builderPrograms = _a.builderPrograms;
+        if (host.afterProgramEmitAndDiagnostics) {
+            host.afterProgramEmitAndDiagnostics(program);
+        }
+        if (watch) {
+            program.releaseProgram();
+            builderPrograms.set(proj, program);
+        }
+    }
+    function buildErrors(state, resolvedPath, program, diagnostics, errorFlags, errorType) {
+        reportAndStoreErrors(state, resolvedPath, diagnostics);
+        // List files if any other build error using program (emit errors already report files)
+        if (program && state.writeFileName)
+            ts.listFiles(program, state.writeFileName);
+        state.projectStatus.set(resolvedPath, { type: ts.UpToDateStatusType.Unbuildable, reason: errorType + " errors" });
+        if (program)
+            afterProgramCreate(state, resolvedPath, program);
+        state.projectCompilerOptions = state.baseCompilerOptions;
+        return errorFlags;
+    }
+    function updateModuleResolutionCache(state, proj, config) {
+        if (!state.moduleResolutionCache)
+            return;
+        // Update module resolution cache if needed
+        var moduleResolutionCache = state.moduleResolutionCache;
+        var projPath = toPath(state, proj);
+        if (moduleResolutionCache.directoryToModuleNameMap.redirectsMap.size === 0) {
+            // The own map will be for projectCompilerOptions
+            ts.Debug.assert(moduleResolutionCache.moduleNameToDirectoryMap.redirectsMap.size === 0);
+            moduleResolutionCache.directoryToModuleNameMap.redirectsMap.set(projPath, moduleResolutionCache.directoryToModuleNameMap.ownMap);
+            moduleResolutionCache.moduleNameToDirectoryMap.redirectsMap.set(projPath, moduleResolutionCache.moduleNameToDirectoryMap.ownMap);
         }
         else {
-            var outputs = [];
-            for (var _i = 0, _a = project.fileNames; _i < _a.length; _i++) {
-                var inputFile = _a[_i];
-                outputs.push.apply(outputs, getOutputFileNames(inputFile, project));
-            }
-            var buildInfoPath = ts.getOutputPathForBuildInfo(project.options);
-            if (buildInfoPath)
-                outputs.push(buildInfoPath);
-            return outputs;
+            // Set correct own map
+            ts.Debug.assert(moduleResolutionCache.moduleNameToDirectoryMap.redirectsMap.size > 0);
+            var ref = {
+                sourceFile: config.options.configFile,
+                commandLine: config
+            };
+            moduleResolutionCache.directoryToModuleNameMap.setOwnMap(moduleResolutionCache.directoryToModuleNameMap.getOrCreateMapOfCacheRedirects(ref));
+            moduleResolutionCache.moduleNameToDirectoryMap.setOwnMap(moduleResolutionCache.moduleNameToDirectoryMap.getOrCreateMapOfCacheRedirects(ref));
+        }
+        moduleResolutionCache.directoryToModuleNameMap.setOwnOptions(config.options);
+        moduleResolutionCache.moduleNameToDirectoryMap.setOwnOptions(config.options);
+    }
+    function checkConfigFileUpToDateStatus(state, configFile, oldestOutputFileTime, oldestOutputFileName) {
+        // Check tsconfig time
+        var tsconfigTime = state.host.getModifiedTime(configFile) || ts.missingFileModifiedTime;
+        if (oldestOutputFileTime < tsconfigTime) {
+            return {
+                type: ts.UpToDateStatusType.OutOfDateWithSelf,
+                outOfDateOutputFileName: oldestOutputFileName,
+                newerInputFileName: configFile
+            };
         }
     }
-    ts.getAllProjectOutputs = getAllProjectOutputs;
-    function getFirstProjectOutput(project) {
-        if (project.options.outFile || project.options.out) {
-            return ts.first(getOutFileOutputs(project));
-        }
+    function getUpToDateStatusWorker(state, project, resolvedPath) {
+        var newestInputFileName = undefined;
+        var newestInputFileTime = minimumDate;
+        var host = state.host;
+        // Get timestamps of input files
         for (var _i = 0, _a = project.fileNames; _i < _a.length; _i++) {
             var inputFile = _a[_i];
-            var outputs = getOutputFileNames(inputFile, project);
-            if (outputs.length) {
-                return ts.first(outputs);
+            if (!host.fileExists(inputFile)) {
+                return {
+                    type: ts.UpToDateStatusType.Unbuildable,
+                    reason: inputFile + " does not exist"
+                };
+            }
+            var inputTime = host.getModifiedTime(inputFile) || ts.missingFileModifiedTime;
+            if (inputTime > newestInputFileTime) {
+                newestInputFileName = inputFile;
+                newestInputFileTime = inputTime;
             }
         }
-        return ts.Debug.fail("project " + project.options.configFilePath + " expected to have at least one output");
+        // Container if no files are specified in the project
+        if (!project.fileNames.length && !ts.canJsonReportNoInutFiles(project.raw)) {
+            return {
+                type: ts.UpToDateStatusType.ContainerOnly
+            };
+        }
+        // Collect the expected outputs of this project
+        var outputs = ts.getAllProjectOutputs(project, !host.useCaseSensitiveFileNames());
+        // Now see if all outputs are newer than the newest input
+        var oldestOutputFileName = "(none)";
+        var oldestOutputFileTime = maximumDate;
+        var newestOutputFileName = "(none)";
+        var newestOutputFileTime = minimumDate;
+        var missingOutputFileName;
+        var newestDeclarationFileContentChangedTime = minimumDate;
+        var isOutOfDateWithInputs = false;
+        for (var _b = 0, outputs_1 = outputs; _b < outputs_1.length; _b++) {
+            var output = outputs_1[_b];
+            // Output is missing; can stop checking
+            // Don't immediately return because we can still be upstream-blocked, which is a higher-priority status
+            if (!host.fileExists(output)) {
+                missingOutputFileName = output;
+                break;
+            }
+            var outputTime = host.getModifiedTime(output) || ts.missingFileModifiedTime;
+            if (outputTime < oldestOutputFileTime) {
+                oldestOutputFileTime = outputTime;
+                oldestOutputFileName = output;
+            }
+            // If an output is older than the newest input, we can stop checking
+            // Don't immediately return because we can still be upstream-blocked, which is a higher-priority status
+            if (outputTime < newestInputFileTime) {
+                isOutOfDateWithInputs = true;
+                break;
+            }
+            if (outputTime > newestOutputFileTime) {
+                newestOutputFileTime = outputTime;
+                newestOutputFileName = output;
+            }
+            // Keep track of when the most recent time a .d.ts file was changed.
+            // In addition to file timestamps, we also keep track of when a .d.ts file
+            // had its file touched but not had its contents changed - this allows us
+            // to skip a downstream typecheck
+            if (isDeclarationFile(output)) {
+                var outputModifiedTime = host.getModifiedTime(output) || ts.missingFileModifiedTime;
+                newestDeclarationFileContentChangedTime = newer(newestDeclarationFileContentChangedTime, outputModifiedTime);
+            }
+        }
+        var pseudoUpToDate = false;
+        var usesPrepend = false;
+        var upstreamChangedProject;
+        if (project.projectReferences) {
+            state.projectStatus.set(resolvedPath, { type: ts.UpToDateStatusType.ComputingUpstream });
+            for (var _c = 0, _d = project.projectReferences; _c < _d.length; _c++) {
+                var ref = _d[_c];
+                usesPrepend = usesPrepend || !!(ref.prepend);
+                var resolvedRef = ts.resolveProjectReferencePath(ref);
+                var resolvedRefPath = toResolvedConfigFilePath(state, resolvedRef);
+                var refStatus = getUpToDateStatus(state, parseConfigFile(state, resolvedRef, resolvedRefPath), resolvedRefPath);
+                // Its a circular reference ignore the status of this project
+                if (refStatus.type === ts.UpToDateStatusType.ComputingUpstream ||
+                    refStatus.type === ts.UpToDateStatusType.ContainerOnly) { // Container only ignore this project
+                    continue;
+                }
+                // An upstream project is blocked
+                if (refStatus.type === ts.UpToDateStatusType.Unbuildable) {
+                    return {
+                        type: ts.UpToDateStatusType.UpstreamBlocked,
+                        upstreamProjectName: ref.path
+                    };
+                }
+                // If the upstream project is out of date, then so are we (someone shouldn't have asked, though?)
+                if (refStatus.type !== ts.UpToDateStatusType.UpToDate) {
+                    return {
+                        type: ts.UpToDateStatusType.UpstreamOutOfDate,
+                        upstreamProjectName: ref.path
+                    };
+                }
+                // Check oldest output file name only if there is no missing output file name
+                if (!missingOutputFileName) {
+                    // If the upstream project's newest file is older than our oldest output, we
+                    // can't be out of date because of it
+                    if (refStatus.newestInputFileTime && refStatus.newestInputFileTime <= oldestOutputFileTime) {
+                        continue;
+                    }
+                    // If the upstream project has only change .d.ts files, and we've built
+                    // *after* those files, then we're "psuedo up to date" and eligible for a fast rebuild
+                    if (refStatus.newestDeclarationFileContentChangedTime && refStatus.newestDeclarationFileContentChangedTime <= oldestOutputFileTime) {
+                        pseudoUpToDate = true;
+                        upstreamChangedProject = ref.path;
+                        continue;
+                    }
+                    // We have an output older than an upstream output - we are out of date
+                    ts.Debug.assert(oldestOutputFileName !== undefined, "Should have an oldest output filename here");
+                    return {
+                        type: ts.UpToDateStatusType.OutOfDateWithUpstream,
+                        outOfDateOutputFileName: oldestOutputFileName,
+                        newerProjectName: ref.path
+                    };
+                }
+            }
+        }
+        if (missingOutputFileName !== undefined) {
+            return {
+                type: ts.UpToDateStatusType.OutputMissing,
+                missingOutputFileName: missingOutputFileName
+            };
+        }
+        if (isOutOfDateWithInputs) {
+            return {
+                type: ts.UpToDateStatusType.OutOfDateWithSelf,
+                outOfDateOutputFileName: oldestOutputFileName,
+                newerInputFileName: newestInputFileName
+            };
+        }
+        else {
+            // Check tsconfig time
+            var configStatus = checkConfigFileUpToDateStatus(state, project.options.configFilePath, oldestOutputFileTime, oldestOutputFileName);
+            if (configStatus)
+                return configStatus;
+            // Check extended config time
+            var extendedConfigStatus = ts.forEach(project.options.configFile.extendedSourceFiles || ts.emptyArray, function (configFile) { return checkConfigFileUpToDateStatus(state, configFile, oldestOutputFileTime, oldestOutputFileName); });
+            if (extendedConfigStatus)
+                return extendedConfigStatus;
+        }
+        if (!state.buildInfoChecked.has(resolvedPath)) {
+            state.buildInfoChecked.set(resolvedPath, true);
+            var buildInfoPath = ts.getOutputPathForBuildInfo(project.options);
+            if (buildInfoPath) {
+                var value = state.readFileWithCache(buildInfoPath);
+                var buildInfo = value && ts.getBuildInfo(value);
+                if (buildInfo && (buildInfo.bundle || buildInfo.program) && buildInfo.version !== ts.version) {
+                    return {
+                        type: ts.UpToDateStatusType.TsVersionOutputOfDate,
+                        version: buildInfo.version
+                    };
+                }
+            }
+        }
+        if (usesPrepend && pseudoUpToDate) {
+            return {
+                type: ts.UpToDateStatusType.OutOfDateWithPrepend,
+                outOfDateOutputFileName: oldestOutputFileName,
+                newerProjectName: upstreamChangedProject
+            };
+        }
+        // Up to date
+        return {
+            type: pseudoUpToDate ? ts.UpToDateStatusType.UpToDateWithUpstreamTypes : ts.UpToDateStatusType.UpToDate,
+            newestDeclarationFileContentChangedTime: newestDeclarationFileContentChangedTime,
+            newestInputFileTime: newestInputFileTime,
+            newestOutputFileTime: newestOutputFileTime,
+            newestInputFileName: newestInputFileName,
+            newestOutputFileName: newestOutputFileName,
+            oldestOutputFileName: oldestOutputFileName
+        };
     }
-    function formatUpToDateStatus(configFileName, status, relName, formatMessage) {
+    function getUpToDateStatus(state, project, resolvedPath) {
+        if (project === undefined) {
+            return { type: ts.UpToDateStatusType.Unbuildable, reason: "File deleted mid-build" };
+        }
+        var prior = state.projectStatus.get(resolvedPath);
+        if (prior !== undefined) {
+            return prior;
+        }
+        var actual = getUpToDateStatusWorker(state, project, resolvedPath);
+        state.projectStatus.set(resolvedPath, actual);
+        return actual;
+    }
+    function updateOutputTimestampsWorker(state, proj, priorNewestUpdateTime, verboseMessage, skipOutputs) {
+        var host = state.host;
+        var outputs = ts.getAllProjectOutputs(proj, !host.useCaseSensitiveFileNames());
+        if (!skipOutputs || outputs.length !== skipOutputs.size) {
+            var reportVerbose = !!state.options.verbose;
+            var now = host.now ? host.now() : new Date();
+            for (var _i = 0, outputs_2 = outputs; _i < outputs_2.length; _i++) {
+                var file = outputs_2[_i];
+                if (skipOutputs && skipOutputs.has(toPath(state, file))) {
+                    continue;
+                }
+                if (reportVerbose) {
+                    reportVerbose = false;
+                    reportStatus(state, verboseMessage, proj.options.configFilePath);
+                }
+                if (isDeclarationFile(file)) {
+                    priorNewestUpdateTime = newer(priorNewestUpdateTime, host.getModifiedTime(file) || ts.missingFileModifiedTime);
+                }
+                host.setModifiedTime(file, now);
+                listEmittedFile(state, proj, file);
+            }
+        }
+        return priorNewestUpdateTime;
+    }
+    function updateOutputTimestamps(state, proj, resolvedPath) {
+        if (state.options.dry) {
+            return reportStatus(state, ts.Diagnostics.A_non_dry_build_would_update_timestamps_for_output_of_project_0, proj.options.configFilePath);
+        }
+        var priorNewestUpdateTime = updateOutputTimestampsWorker(state, proj, minimumDate, ts.Diagnostics.Updating_output_timestamps_of_project_0);
+        state.projectStatus.set(resolvedPath, {
+            type: ts.UpToDateStatusType.UpToDate,
+            newestDeclarationFileContentChangedTime: priorNewestUpdateTime,
+            oldestOutputFileName: ts.getFirstProjectOutput(proj, !state.host.useCaseSensitiveFileNames())
+        });
+    }
+    function queueReferencingProjects(state, project, projectPath, projectIndex, config, buildOrder, buildResult) {
+        // Queue only if there are no errors
+        if (buildResult & BuildResultFlags.AnyErrors)
+            return;
+        // Only composite projects can be referenced by other projects
+        if (!config.options.composite)
+            return;
+        // Always use build order to queue projects
+        for (var index = projectIndex + 1; index < buildOrder.length; index++) {
+            var nextProject = buildOrder[index];
+            var nextProjectPath = toResolvedConfigFilePath(state, nextProject);
+            if (state.projectPendingBuild.has(nextProjectPath))
+                continue;
+            var nextProjectConfig = parseConfigFile(state, nextProject, nextProjectPath);
+            if (!nextProjectConfig || !nextProjectConfig.projectReferences)
+                continue;
+            for (var _i = 0, _a = nextProjectConfig.projectReferences; _i < _a.length; _i++) {
+                var ref = _a[_i];
+                var resolvedRefPath = resolveProjectName(state, ref.path);
+                if (toResolvedConfigFilePath(state, resolvedRefPath) !== projectPath)
+                    continue;
+                // If the project is referenced with prepend, always build downstream projects,
+                // If declaration output is changed, build the project
+                // otherwise mark the project UpToDateWithUpstreamTypes so it updates output time stamps
+                var status = state.projectStatus.get(nextProjectPath);
+                if (status) {
+                    switch (status.type) {
+                        case ts.UpToDateStatusType.UpToDate:
+                            if (buildResult & BuildResultFlags.DeclarationOutputUnchanged) {
+                                if (ref.prepend) {
+                                    state.projectStatus.set(nextProjectPath, {
+                                        type: ts.UpToDateStatusType.OutOfDateWithPrepend,
+                                        outOfDateOutputFileName: status.oldestOutputFileName,
+                                        newerProjectName: project
+                                    });
+                                }
+                                else {
+                                    status.type = ts.UpToDateStatusType.UpToDateWithUpstreamTypes;
+                                }
+                                break;
+                            }
+                        // falls through
+                        case ts.UpToDateStatusType.UpToDateWithUpstreamTypes:
+                        case ts.UpToDateStatusType.OutOfDateWithPrepend:
+                            if (!(buildResult & BuildResultFlags.DeclarationOutputUnchanged)) {
+                                state.projectStatus.set(nextProjectPath, {
+                                    type: ts.UpToDateStatusType.OutOfDateWithUpstream,
+                                    outOfDateOutputFileName: status.type === ts.UpToDateStatusType.OutOfDateWithPrepend ? status.outOfDateOutputFileName : status.oldestOutputFileName,
+                                    newerProjectName: project
+                                });
+                            }
+                            break;
+                        case ts.UpToDateStatusType.UpstreamBlocked:
+                            if (toResolvedConfigFilePath(state, resolveProjectName(state, status.upstreamProjectName)) === projectPath) {
+                                clearProjectStatus(state, nextProjectPath);
+                            }
+                            break;
+                    }
+                }
+                addProjToQueue(state, nextProjectPath, ts.ConfigFileProgramReloadLevel.None);
+                break;
+            }
+        }
+    }
+    function build(state, project, cancellationToken, onlyReferences) {
+        var buildOrder = getBuildOrderFor(state, project, onlyReferences);
+        if (!buildOrder)
+            return ts.ExitStatus.InvalidProject_OutputsSkipped;
+        setupInitialBuild(state, cancellationToken);
+        var reportQueue = true;
+        var successfulProjects = 0;
+        var errorProjects = 0;
+        while (true) {
+            var invalidatedProject = getNextInvalidatedProject(state, buildOrder, reportQueue);
+            if (!invalidatedProject)
+                break;
+            reportQueue = false;
+            invalidatedProject.done(cancellationToken);
+            if (state.diagnostics.has(invalidatedProject.projectPath)) {
+                errorProjects++;
+            }
+            else {
+                successfulProjects++;
+            }
+        }
+        disableCache(state);
+        reportErrorSummary(state, buildOrder);
+        startWatching(state, buildOrder);
+        return errorProjects ?
+            successfulProjects ?
+                ts.ExitStatus.DiagnosticsPresent_OutputsGenerated :
+                ts.ExitStatus.DiagnosticsPresent_OutputsSkipped :
+            ts.ExitStatus.Success;
+    }
+    function clean(state, project, onlyReferences) {
+        var buildOrder = getBuildOrderFor(state, project, onlyReferences);
+        if (!buildOrder)
+            return ts.ExitStatus.InvalidProject_OutputsSkipped;
+        var options = state.options, host = state.host;
+        var filesToDelete = options.dry ? [] : undefined;
+        for (var _i = 0, buildOrder_1 = buildOrder; _i < buildOrder_1.length; _i++) {
+            var proj = buildOrder_1[_i];
+            var resolvedPath = toResolvedConfigFilePath(state, proj);
+            var parsed = parseConfigFile(state, proj, resolvedPath);
+            if (parsed === undefined) {
+                // File has gone missing; fine to ignore here
+                reportParseConfigFileDiagnostic(state, resolvedPath);
+                continue;
+            }
+            var outputs = ts.getAllProjectOutputs(parsed, !host.useCaseSensitiveFileNames());
+            for (var _a = 0, outputs_3 = outputs; _a < outputs_3.length; _a++) {
+                var output = outputs_3[_a];
+                if (host.fileExists(output)) {
+                    if (filesToDelete) {
+                        filesToDelete.push(output);
+                    }
+                    else {
+                        host.deleteFile(output);
+                        invalidateProject(state, resolvedPath, ts.ConfigFileProgramReloadLevel.None);
+                    }
+                }
+            }
+        }
+        if (filesToDelete) {
+            reportStatus(state, ts.Diagnostics.A_non_dry_build_would_delete_the_following_files_Colon_0, filesToDelete.map(function (f) { return "\r\n * " + f; }).join(""));
+        }
+        return ts.ExitStatus.Success;
+    }
+    function invalidateProject(state, resolved, reloadLevel) {
+        // If host implements getParsedCommandLine, we cant get list of files from parseConfigFileHost
+        if (state.host.getParsedCommandLine && reloadLevel === ts.ConfigFileProgramReloadLevel.Partial) {
+            reloadLevel = ts.ConfigFileProgramReloadLevel.Full;
+        }
+        if (reloadLevel === ts.ConfigFileProgramReloadLevel.Full) {
+            state.configFileCache.delete(resolved);
+            state.buildOrder = undefined;
+        }
+        state.needsSummary = true;
+        clearProjectStatus(state, resolved);
+        addProjToQueue(state, resolved, reloadLevel);
+        enableCache(state);
+    }
+    function invalidateProjectAndScheduleBuilds(state, resolvedPath, reloadLevel) {
+        state.reportFileChangeDetected = true;
+        invalidateProject(state, resolvedPath, reloadLevel);
+        scheduleBuildInvalidatedProject(state);
+    }
+    function scheduleBuildInvalidatedProject(state) {
+        var hostWithWatch = state.hostWithWatch;
+        if (!hostWithWatch.setTimeout || !hostWithWatch.clearTimeout) {
+            return;
+        }
+        if (state.timerToBuildInvalidatedProject) {
+            hostWithWatch.clearTimeout(state.timerToBuildInvalidatedProject);
+        }
+        state.timerToBuildInvalidatedProject = hostWithWatch.setTimeout(buildNextInvalidatedProject, 250, state);
+    }
+    function buildNextInvalidatedProject(state) {
+        state.timerToBuildInvalidatedProject = undefined;
+        if (state.reportFileChangeDetected) {
+            state.reportFileChangeDetected = false;
+            state.projectErrorsReported.clear();
+            reportWatchStatus(state, ts.Diagnostics.File_change_detected_Starting_incremental_compilation);
+        }
+        var buildOrder = getBuildOrder(state);
+        var invalidatedProject = getNextInvalidatedProject(state, buildOrder, /*reportQueue*/ false);
+        if (invalidatedProject) {
+            invalidatedProject.done();
+            if (state.projectPendingBuild.size) {
+                // Schedule next project for build
+                if (state.watch && !state.timerToBuildInvalidatedProject) {
+                    scheduleBuildInvalidatedProject(state);
+                }
+                return;
+            }
+        }
+        disableCache(state);
+        reportErrorSummary(state, buildOrder);
+    }
+    function watchConfigFile(state, resolved, resolvedPath) {
+        if (!state.watch || state.allWatchedConfigFiles.has(resolvedPath))
+            return;
+        state.allWatchedConfigFiles.set(resolvedPath, state.watchFile(state.hostWithWatch, resolved, function () {
+            invalidateProjectAndScheduleBuilds(state, resolvedPath, ts.ConfigFileProgramReloadLevel.Full);
+        }, ts.PollingInterval.High, "Config file" /* ConfigFile */, resolved));
+    }
+    function isSameFile(state, file1, file2) {
+        return ts.comparePaths(file1, file2, state.currentDirectory, !state.host.useCaseSensitiveFileNames()) === 0 /* EqualTo */;
+    }
+    function isOutputFile(state, fileName, configFile) {
+        if (configFile.options.noEmit)
+            return false;
+        // ts or tsx files are not output
+        if (!ts.fileExtensionIs(fileName, ".d.ts" /* Dts */) &&
+            (ts.fileExtensionIs(fileName, ".ts" /* Ts */) || ts.fileExtensionIs(fileName, ".tsx" /* Tsx */))) {
+            return false;
+        }
+        // If options have --outFile or --out, check if its that
+        var out = configFile.options.outFile || configFile.options.out;
+        if (out && (isSameFile(state, fileName, out) || isSameFile(state, fileName, ts.removeFileExtension(out) + ".d.ts" /* Dts */))) {
+            return true;
+        }
+        // If declarationDir is specified, return if its a file in that directory
+        if (configFile.options.declarationDir && ts.containsPath(configFile.options.declarationDir, fileName, state.currentDirectory, !state.host.useCaseSensitiveFileNames())) {
+            return true;
+        }
+        // If --outDir, check if file is in that directory
+        if (configFile.options.outDir && ts.containsPath(configFile.options.outDir, fileName, state.currentDirectory, !state.host.useCaseSensitiveFileNames())) {
+            return true;
+        }
+        return !ts.forEach(configFile.fileNames, function (inputFile) { return isSameFile(state, fileName, inputFile); });
+    }
+    function watchWildCardDirectories(state, resolved, resolvedPath, parsed) {
+        if (!state.watch)
+            return;
+        ts.updateWatchingWildcardDirectories(getOrCreateValueMapFromConfigFileMap(state.allWatchedWildcardDirectories, resolvedPath), ts.createMapFromTemplate(parsed.configFileSpecs.wildcardDirectories), function (dir, flags) { return state.watchDirectory(state.hostWithWatch, dir, function (fileOrDirectory) {
+            var fileOrDirectoryPath = toPath(state, fileOrDirectory);
+            if (fileOrDirectoryPath !== toPath(state, dir) && ts.hasExtension(fileOrDirectoryPath) && !ts.isSupportedSourceFileName(fileOrDirectory, parsed.options)) {
+                state.writeLog("Project: " + resolved + " Detected file add/remove of non supported extension: " + fileOrDirectory);
+                return;
+            }
+            if (isOutputFile(state, fileOrDirectory, parsed)) {
+                state.writeLog(fileOrDirectory + " is output file");
+                return;
+            }
+            invalidateProjectAndScheduleBuilds(state, resolvedPath, ts.ConfigFileProgramReloadLevel.Partial);
+        }, flags, "Wild card directory" /* WildcardDirectory */, resolved); });
+    }
+    function watchInputFiles(state, resolved, resolvedPath, parsed) {
+        if (!state.watch)
+            return;
+        ts.mutateMap(getOrCreateValueMapFromConfigFileMap(state.allWatchedInputFiles, resolvedPath), ts.arrayToMap(parsed.fileNames, function (fileName) { return toPath(state, fileName); }), {
+            createNewValue: function (path, input) { return state.watchFilePath(state.hostWithWatch, input, function () { return invalidateProjectAndScheduleBuilds(state, resolvedPath, ts.ConfigFileProgramReloadLevel.None); }, ts.PollingInterval.Low, path, "Source file" /* SourceFile */, resolved); },
+            onDeleteValue: ts.closeFileWatcher,
+        });
+    }
+    function startWatching(state, buildOrder) {
+        if (!state.watchAllProjectsPending)
+            return;
+        state.watchAllProjectsPending = false;
+        for (var _i = 0, buildOrder_2 = buildOrder; _i < buildOrder_2.length; _i++) {
+            var resolved = buildOrder_2[_i];
+            var resolvedPath = toResolvedConfigFilePath(state, resolved);
+            // Watch this file
+            watchConfigFile(state, resolved, resolvedPath);
+            var cfg = parseConfigFile(state, resolved, resolvedPath);
+            if (cfg) {
+                // Update watchers for wildcard directories
+                watchWildCardDirectories(state, resolved, resolvedPath, cfg);
+                // Watch input files
+                watchInputFiles(state, resolved, resolvedPath, cfg);
+            }
+        }
+    }
+    function createSolutionBuilderWorker(watch, hostOrHostWithWatch, rootNames, options) {
+        var state = createSolutionBuilderState(watch, hostOrHostWithWatch, rootNames, options);
+        return {
+            build: function (project, cancellationToken) { return build(state, project, cancellationToken); },
+            clean: function (project) { return clean(state, project); },
+            buildReferences: function (project, cancellationToken) { return build(state, project, cancellationToken, /*onlyReferences*/ true); },
+            cleanReferences: function (project) { return clean(state, project, /*onlyReferences*/ true); },
+            getNextInvalidatedProject: function (cancellationToken) {
+                setupInitialBuild(state, cancellationToken);
+                return getNextInvalidatedProject(state, getBuildOrder(state), /*reportQueue*/ false);
+            },
+            getBuildOrder: function () { return getBuildOrder(state); },
+            getUpToDateStatusOfProject: function (project) {
+                var configFileName = resolveProjectName(state, project);
+                var configFilePath = toResolvedConfigFilePath(state, configFileName);
+                return getUpToDateStatus(state, parseConfigFile(state, configFileName, configFilePath), configFilePath);
+            },
+            invalidateProject: function (configFilePath, reloadLevel) { return invalidateProject(state, configFilePath, reloadLevel || ts.ConfigFileProgramReloadLevel.None); },
+            buildNextInvalidatedProject: function () { return buildNextInvalidatedProject(state); },
+        };
+    }
+    function relName(state, path) {
+        return ts.convertToRelativePath(path, state.currentDirectory, function (f) { return state.getCanonicalFileName(f); });
+    }
+    function reportStatus(state, message) {
+        var args = [];
+        for (var _i = 2; _i < arguments.length; _i++) {
+            args[_i - 2] = arguments[_i];
+        }
+        state.host.reportSolutionBuilderStatus(ts.createCompilerDiagnostic.apply(void 0, [message].concat(args)));
+    }
+    function reportWatchStatus(state, message) {
+        var args = [];
+        for (var _i = 2; _i < arguments.length; _i++) {
+            args[_i - 2] = arguments[_i];
+        }
+        if (state.hostWithWatch.onWatchStatusChange) {
+            state.hostWithWatch.onWatchStatusChange(ts.createCompilerDiagnostic.apply(void 0, [message].concat(args)), state.host.getNewLine(), state.baseCompilerOptions);
+        }
+    }
+    function reportErrors(_a, errors) {
+        var host = _a.host;
+        errors.forEach(function (err) { return host.reportDiagnostic(err); });
+    }
+    function reportAndStoreErrors(state, proj, errors) {
+        reportErrors(state, errors);
+        state.projectErrorsReported.set(proj, true);
+        if (errors.length) {
+            state.diagnostics.set(proj, errors);
+        }
+    }
+    function reportParseConfigFileDiagnostic(state, proj) {
+        reportAndStoreErrors(state, proj, [state.configFileCache.get(proj)]);
+    }
+    function reportErrorSummary(state, buildOrder) {
+        if (!state.needsSummary || (!state.watch && !state.host.reportErrorSummary))
+            return;
+        state.needsSummary = false;
+        var diagnostics = state.diagnostics;
+        // Report errors from the other projects
+        buildOrder.forEach(function (project) {
+            var projectPath = toResolvedConfigFilePath(state, project);
+            if (!state.projectErrorsReported.has(projectPath)) {
+                reportErrors(state, diagnostics.get(projectPath) || ts.emptyArray);
+            }
+        });
+        var totalErrors = 0;
+        diagnostics.forEach(function (singleProjectErrors) { return totalErrors += ts.getErrorCountForSummary(singleProjectErrors); });
+        if (state.watch) {
+            reportWatchStatus(state, ts.getWatchErrorSummaryDiagnosticMessage(totalErrors), totalErrors);
+        }
+        else {
+            state.host.reportErrorSummary(totalErrors);
+        }
+    }
+    /**
+     * Report the build ordering inferred from the current project graph if we're in verbose mode
+     */
+    function reportBuildQueue(state, buildQueue) {
+        if (state.options.verbose) {
+            reportStatus(state, ts.Diagnostics.Projects_in_this_build_Colon_0, buildQueue.map(function (s) { return "\r\n    * " + relName(state, s); }).join(""));
+        }
+    }
+    function reportUpToDateStatus(state, configFileName, status) {
         switch (status.type) {
-            case UpToDateStatusType.OutOfDateWithSelf:
-                return formatMessage(ts.Diagnostics.Project_0_is_out_of_date_because_oldest_output_1_is_older_than_newest_input_2, relName(configFileName), relName(status.outOfDateOutputFileName), relName(status.newerInputFileName));
-            case UpToDateStatusType.OutOfDateWithUpstream:
-                return formatMessage(ts.Diagnostics.Project_0_is_out_of_date_because_oldest_output_1_is_older_than_newest_input_2, relName(configFileName), relName(status.outOfDateOutputFileName), relName(status.newerProjectName));
-            case UpToDateStatusType.OutputMissing:
-                return formatMessage(ts.Diagnostics.Project_0_is_out_of_date_because_output_file_1_does_not_exist, relName(configFileName), relName(status.missingOutputFileName));
-            case UpToDateStatusType.UpToDate:
+            case ts.UpToDateStatusType.OutOfDateWithSelf:
+                return reportStatus(state, ts.Diagnostics.Project_0_is_out_of_date_because_oldest_output_1_is_older_than_newest_input_2, relName(state, configFileName), relName(state, status.outOfDateOutputFileName), relName(state, status.newerInputFileName));
+            case ts.UpToDateStatusType.OutOfDateWithUpstream:
+                return reportStatus(state, ts.Diagnostics.Project_0_is_out_of_date_because_oldest_output_1_is_older_than_newest_input_2, relName(state, configFileName), relName(state, status.outOfDateOutputFileName), relName(state, status.newerProjectName));
+            case ts.UpToDateStatusType.OutputMissing:
+                return reportStatus(state, ts.Diagnostics.Project_0_is_out_of_date_because_output_file_1_does_not_exist, relName(state, configFileName), relName(state, status.missingOutputFileName));
+            case ts.UpToDateStatusType.UpToDate:
                 if (status.newestInputFileTime !== undefined) {
-                    return formatMessage(ts.Diagnostics.Project_0_is_up_to_date_because_newest_input_1_is_older_than_oldest_output_2, relName(configFileName), relName(status.newestInputFileName || ""), relName(status.oldestOutputFileName || ""));
+                    return reportStatus(state, ts.Diagnostics.Project_0_is_up_to_date_because_newest_input_1_is_older_than_oldest_output_2, relName(state, configFileName), relName(state, status.newestInputFileName || ""), relName(state, status.oldestOutputFileName || ""));
                 }
                 // Don't report anything for "up to date because it was already built" -- too verbose
                 break;
-            case UpToDateStatusType.OutOfDateWithPrepend:
-                return formatMessage(ts.Diagnostics.Project_0_is_out_of_date_because_output_of_its_dependency_1_has_changed, relName(configFileName), relName(status.newerProjectName));
-            case UpToDateStatusType.UpToDateWithUpstreamTypes:
-                return formatMessage(ts.Diagnostics.Project_0_is_up_to_date_with_d_ts_files_from_its_dependencies, relName(configFileName));
-            case UpToDateStatusType.UpstreamOutOfDate:
-                return formatMessage(ts.Diagnostics.Project_0_is_out_of_date_because_its_dependency_1_is_out_of_date, relName(configFileName), relName(status.upstreamProjectName));
-            case UpToDateStatusType.UpstreamBlocked:
-                return formatMessage(ts.Diagnostics.Project_0_can_t_be_built_because_its_dependency_1_has_errors, relName(configFileName), relName(status.upstreamProjectName));
-            case UpToDateStatusType.Unbuildable:
-                return formatMessage(ts.Diagnostics.Failed_to_parse_file_0_Colon_1, relName(configFileName), status.reason);
-            case UpToDateStatusType.TsVersionOutputOfDate:
-                return formatMessage(ts.Diagnostics.Project_0_is_out_of_date_because_output_for_it_was_generated_with_version_1_that_differs_with_current_version_2, relName(configFileName), status.version, ts.version);
-            case UpToDateStatusType.ContainerOnly:
+            case ts.UpToDateStatusType.OutOfDateWithPrepend:
+                return reportStatus(state, ts.Diagnostics.Project_0_is_out_of_date_because_output_of_its_dependency_1_has_changed, relName(state, configFileName), relName(state, status.newerProjectName));
+            case ts.UpToDateStatusType.UpToDateWithUpstreamTypes:
+                return reportStatus(state, ts.Diagnostics.Project_0_is_up_to_date_with_d_ts_files_from_its_dependencies, relName(state, configFileName));
+            case ts.UpToDateStatusType.UpstreamOutOfDate:
+                return reportStatus(state, ts.Diagnostics.Project_0_is_out_of_date_because_its_dependency_1_is_out_of_date, relName(state, configFileName), relName(state, status.upstreamProjectName));
+            case ts.UpToDateStatusType.UpstreamBlocked:
+                return reportStatus(state, ts.Diagnostics.Project_0_can_t_be_built_because_its_dependency_1_has_errors, relName(state, configFileName), relName(state, status.upstreamProjectName));
+            case ts.UpToDateStatusType.Unbuildable:
+                return reportStatus(state, ts.Diagnostics.Failed_to_parse_file_0_Colon_1, relName(state, configFileName), status.reason);
+            case ts.UpToDateStatusType.TsVersionOutputOfDate:
+                return reportStatus(state, ts.Diagnostics.Project_0_is_out_of_date_because_output_for_it_was_generated_with_version_1_that_differs_with_current_version_2, relName(state, configFileName), status.version, ts.version);
+            case ts.UpToDateStatusType.ContainerOnly:
             // Don't report status on "solution" projects
-            case UpToDateStatusType.ComputingUpstream:
+            case ts.UpToDateStatusType.ComputingUpstream:
                 // Should never leak from getUptoDateStatusWorker
                 break;
             default:
                 ts.assertType(status);
         }
     }
-    ts.formatUpToDateStatus = formatUpToDateStatus;
-})(ts || (ts = {}));
-/* @internal */
-var ts;
-(function (ts) {
-    var ValueKind;
-    (function (ValueKind) {
-        ValueKind[ValueKind["Const"] = 0] = "Const";
-        ValueKind[ValueKind["Array"] = 1] = "Array";
-        ValueKind[ValueKind["FunctionOrClass"] = 2] = "FunctionOrClass";
-        ValueKind[ValueKind["Object"] = 3] = "Object";
-    })(ValueKind = ts.ValueKind || (ts.ValueKind = {}));
-    function inspectModule(fileNameToRequire) {
-        return inspectValue(ts.removeFileExtension(ts.getBaseFileName(fileNameToRequire)), tryRequire(fileNameToRequire));
-    }
-    ts.inspectModule = inspectModule;
-    function inspectValue(name, value) {
-        return getValueInfo(name, value, getRecurser());
-    }
-    ts.inspectValue = inspectValue;
-    function getRecurser() {
-        var seen = [];
-        var nameStack = [];
-        return function (obj, name, cbOk, cbFail) {
-            if (seen.indexOf(obj) !== -1 || nameStack.length > 4) {
-                return cbFail(seen.indexOf(obj) !== -1, nameStack);
-            }
-            seen.push(obj);
-            nameStack.push(name);
-            var res = cbOk();
-            nameStack.pop();
-            seen.pop();
-            return res;
-        };
-    }
-    function getValueInfo(name, value, recurser) {
-        return recurser(value, name, function () {
-            if (typeof value === "function")
-                return getFunctionOrClassInfo(value, name, recurser);
-            if (typeof value === "object") {
-                var builtin = getBuiltinType(name, value, recurser);
-                if (builtin !== undefined)
-                    return builtin;
-                var entries = getEntriesOfObject(value);
-                var hasNontrivialPrototype = Object.getPrototypeOf(value) !== Object.prototype;
-                var members = ts.flatMap(entries, function (_a) {
-                    var key = _a.key, value = _a.value;
-                    return getValueInfo(key, value, recurser);
-                });
-                return { kind: 3 /* Object */, name: name, hasNontrivialPrototype: hasNontrivialPrototype, members: members };
-            }
-            return { kind: 0 /* Const */, name: name, typeName: isNullOrUndefined(value) ? "any" : typeof value };
-        }, function (isCircularReference, keyStack) { return anyValue(name, " " + (isCircularReference ? "Circular reference" : "Too-deep object hierarchy") + " from " + keyStack.join(".")); });
-    }
-    function getFunctionOrClassInfo(fn, name, recurser) {
-        var prototypeMembers = getPrototypeMembers(fn, recurser);
-        var namespaceMembers = ts.flatMap(getEntriesOfObject(fn), function (_a) {
-            var key = _a.key, value = _a.value;
-            return getValueInfo(key, value, recurser);
-        });
-        var toString = ts.cast(Function.prototype.toString.call(fn), ts.isString);
-        var source = ts.stringContains(toString, "{ [native code] }") ? getFunctionLength(fn) : toString;
-        return { kind: 2 /* FunctionOrClass */, name: name, source: source, namespaceMembers: namespaceMembers, prototypeMembers: prototypeMembers };
-    }
-    var builtins = ts.memoize(function () {
-        var map = ts.createMap();
-        for (var _i = 0, _a = getEntriesOfObject(global); _i < _a.length; _i++) {
-            var _b = _a[_i], key = _b.key, value = _b.value;
-            if (typeof value === "function" && typeof value.prototype === "object" && value !== Object) {
-                map.set(key, value);
-            }
-        }
-        return map;
-    });
-    function getBuiltinType(name, value, recurser) {
-        return ts.isArray(value)
-            ? { name: name, kind: 1 /* Array */, inner: value.length && getValueInfo("element", ts.first(value), recurser) || anyValue(name) }
-            : ts.forEachEntry(builtins(), function (builtin, builtinName) {
-                return value instanceof builtin ? { kind: 0 /* Const */, name: name, typeName: builtinName } : undefined;
-            });
-    }
-    function getPrototypeMembers(fn, recurser) {
-        var prototype = fn.prototype;
-        // tslint:disable-next-line no-unnecessary-type-assertion (TODO: update LKG and it will really be unnecessary)
-        return typeof prototype !== "object" || prototype === null ? ts.emptyArray : ts.mapDefined(getEntriesOfObject(prototype), function (_a) {
-            var key = _a.key, value = _a.value;
-            return key === "constructor" ? undefined : getValueInfo(key, value, recurser);
-        });
-    }
-    var ignoredProperties = ["arguments", "caller", "constructor", "eval", "super_"];
-    var reservedFunctionProperties = Object.getOwnPropertyNames(ts.noop);
-    function getEntriesOfObject(obj) {
-        var seen = ts.createMap();
-        var entries = [];
-        var chain = obj;
-        while (!isNullOrUndefined(chain) && chain !== Object.prototype && chain !== Function.prototype) {
-            for (var _i = 0, _a = Object.getOwnPropertyNames(chain); _i < _a.length; _i++) {
-                var key = _a[_i];
-                if (!isJsPrivate(key) &&
-                    ignoredProperties.indexOf(key) === -1 &&
-                    (typeof obj !== "function" || reservedFunctionProperties.indexOf(key) === -1) &&
-                    // Don't add property from a higher prototype if it already exists in a lower one
-                    ts.addToSeen(seen, key)) {
-                    var value = safeGetPropertyOfObject(chain, key);
-                    // Don't repeat "toString" that matches signature from Object.prototype
-                    if (!(key === "toString" && typeof value === "function" && value.length === 0)) {
-                        entries.push({ key: key, value: value });
-                    }
-                }
-            }
-            chain = Object.getPrototypeOf(chain);
-        }
-        return entries.sort(function (e1, e2) { return ts.compareStringsCaseSensitive(e1.key, e2.key); });
-    }
-    function getFunctionLength(fn) {
-        return ts.tryCast(safeGetPropertyOfObject(fn, "length"), ts.isNumber) || 0;
-    }
-    function safeGetPropertyOfObject(obj, key) {
-        var desc = Object.getOwnPropertyDescriptor(obj, key);
-        return desc && desc.value;
-    }
-    function isNullOrUndefined(value) {
-        return value == null; // tslint:disable-line
-    }
-    function anyValue(name, comment) {
-        return { kind: 0 /* Const */, name: name, typeName: "any", comment: comment };
-    }
-    function isJsPrivate(name) {
-        return ts.startsWith(name, "_");
-    }
-    ts.isJsPrivate = isJsPrivate;
-    function tryRequire(fileNameToRequire) {
-        try {
-            return require(fileNameToRequire);
-        }
-        catch (_a) {
-            return undefined;
+    /**
+     * Report the up-to-date status of a project if we're in verbose mode
+     */
+    function verboseReportProjectStatus(state, configFileName, status) {
+        if (state.options.verbose) {
+            reportUpToDateStatus(state, configFileName, status);
         }
     }
 })(ts || (ts = {}));
@@ -94606,7 +97544,6 @@ var ts;
         server.ActionSet = "action::set";
         server.ActionInvalidate = "action::invalidate";
         server.ActionPackageInstalled = "action::packageInstalled";
-        server.ActionValueInspected = "action::valueInspected";
         server.EventTypesRegistry = "event::typesRegistry";
         server.EventBeginInstallTypes = "event::beginInstallTypes";
         server.EventEndInstallTypes = "event::endInstallTypes";
@@ -94623,6 +97560,11 @@ var ts;
              * typingsInstaller will run the command with `${npmLocation} install ...`.
              */
             Arguments.NpmLocation = "--npmLocation";
+            /**
+             * Flag indicating that the typings installer should try to validate the default npm location.
+             * If the default npm is not found when this flag is enabled, fallback to `npm install`
+             */
+            Arguments.ValidateDefaultNpmLocation = "--validateDefaultNpmLocation";
         })(Arguments = server.Arguments || (server.Arguments = {}));
         function hasArgument(argumentName) {
             return ts.sys.args.indexOf(argumentName) >= 0;
@@ -94692,6 +97634,10 @@ var ts;
             "zlib"
         ];
         JsTyping.nodeCoreModules = ts.arrayToSet(JsTyping.nodeCoreModuleList);
+        function nonRelativeModuleNameForTypingCache(moduleName) {
+            return JsTyping.nodeCoreModules.has(moduleName) ? "node" : moduleName;
+        }
+        JsTyping.nonRelativeModuleNameForTypingCache = nonRelativeModuleNameForTypingCache;
         function loadSafeList(host, safeListPath) {
             var result = ts.readConfigFile(safeListPath, function (path) { return host.readFile(path); });
             return ts.createMapFromTemplate(result.config);
@@ -94747,7 +97693,7 @@ var ts;
             getTypingNamesFromSourceFileNames(fileNames);
             // add typings for unresolved imports
             if (unresolvedImports) {
-                var module_1 = ts.deduplicate(unresolvedImports.map(function (moduleId) { return JsTyping.nodeCoreModules.has(moduleId) ? "node" : moduleId; }), ts.equateStringsCaseSensitive, ts.compareStringsCaseSensitive);
+                var module_1 = ts.deduplicate(unresolvedImports.map(nonRelativeModuleNameForTypingCache), ts.equateStringsCaseSensitive, ts.compareStringsCaseSensitive);
                 addInferredTypings(module_1, "Inferred typings from unresolved imports");
             }
             // Add the cached typing locations for inferred typings that are already installed
@@ -94875,66 +97821,82 @@ var ts;
             }
         }
         JsTyping.discoverTypings = discoverTypings;
-        var PackageNameValidationResult;
-        (function (PackageNameValidationResult) {
-            PackageNameValidationResult[PackageNameValidationResult["Ok"] = 0] = "Ok";
-            PackageNameValidationResult[PackageNameValidationResult["ScopedPackagesNotSupported"] = 1] = "ScopedPackagesNotSupported";
-            PackageNameValidationResult[PackageNameValidationResult["EmptyName"] = 2] = "EmptyName";
-            PackageNameValidationResult[PackageNameValidationResult["NameTooLong"] = 3] = "NameTooLong";
-            PackageNameValidationResult[PackageNameValidationResult["NameStartsWithDot"] = 4] = "NameStartsWithDot";
-            PackageNameValidationResult[PackageNameValidationResult["NameStartsWithUnderscore"] = 5] = "NameStartsWithUnderscore";
-            PackageNameValidationResult[PackageNameValidationResult["NameContainsNonURISafeCharacters"] = 6] = "NameContainsNonURISafeCharacters";
-        })(PackageNameValidationResult = JsTyping.PackageNameValidationResult || (JsTyping.PackageNameValidationResult = {}));
+        var NameValidationResult;
+        (function (NameValidationResult) {
+            NameValidationResult[NameValidationResult["Ok"] = 0] = "Ok";
+            NameValidationResult[NameValidationResult["EmptyName"] = 1] = "EmptyName";
+            NameValidationResult[NameValidationResult["NameTooLong"] = 2] = "NameTooLong";
+            NameValidationResult[NameValidationResult["NameStartsWithDot"] = 3] = "NameStartsWithDot";
+            NameValidationResult[NameValidationResult["NameStartsWithUnderscore"] = 4] = "NameStartsWithUnderscore";
+            NameValidationResult[NameValidationResult["NameContainsNonURISafeCharacters"] = 5] = "NameContainsNonURISafeCharacters";
+        })(NameValidationResult = JsTyping.NameValidationResult || (JsTyping.NameValidationResult = {}));
         var maxPackageNameLength = 214;
         /**
          * Validates package name using rules defined at https://docs.npmjs.com/files/package.json
          */
         function validatePackageName(packageName) {
+            return validatePackageNameWorker(packageName, /*supportScopedPackage*/ true);
+        }
+        JsTyping.validatePackageName = validatePackageName;
+        function validatePackageNameWorker(packageName, supportScopedPackage) {
             if (!packageName) {
-                return 2 /* EmptyName */;
+                return 1 /* EmptyName */;
             }
             if (packageName.length > maxPackageNameLength) {
-                return 3 /* NameTooLong */;
+                return 2 /* NameTooLong */;
             }
             if (packageName.charCodeAt(0) === 46 /* dot */) {
-                return 4 /* NameStartsWithDot */;
+                return 3 /* NameStartsWithDot */;
             }
             if (packageName.charCodeAt(0) === 95 /* _ */) {
-                return 5 /* NameStartsWithUnderscore */;
+                return 4 /* NameStartsWithUnderscore */;
             }
             // check if name is scope package like: starts with @ and has one '/' in the middle
             // scoped packages are not currently supported
-            // TODO: when support will be added we'll need to split and check both scope and package name
-            if (/^@[^/]+\/[^/]+$/.test(packageName)) {
-                return 1 /* ScopedPackagesNotSupported */;
+            if (supportScopedPackage) {
+                var matches = /^@([^/]+)\/([^/]+)$/.exec(packageName);
+                if (matches) {
+                    var scopeResult = validatePackageNameWorker(matches[1], /*supportScopedPackage*/ false);
+                    if (scopeResult !== 0 /* Ok */) {
+                        return { name: matches[1], isScopeName: true, result: scopeResult };
+                    }
+                    var packageResult = validatePackageNameWorker(matches[2], /*supportScopedPackage*/ false);
+                    if (packageResult !== 0 /* Ok */) {
+                        return { name: matches[2], isScopeName: false, result: packageResult };
+                    }
+                    return 0 /* Ok */;
+                }
             }
             if (encodeURIComponent(packageName) !== packageName) {
-                return 6 /* NameContainsNonURISafeCharacters */;
+                return 5 /* NameContainsNonURISafeCharacters */;
             }
             return 0 /* Ok */;
         }
-        JsTyping.validatePackageName = validatePackageName;
         function renderPackageNameValidationFailure(result, typing) {
+            return typeof result === "object" ?
+                renderPackageNameValidationFailureWorker(typing, result.result, result.name, result.isScopeName) :
+                renderPackageNameValidationFailureWorker(typing, result, typing, /*isScopeName*/ false);
+        }
+        JsTyping.renderPackageNameValidationFailure = renderPackageNameValidationFailure;
+        function renderPackageNameValidationFailureWorker(typing, result, name, isScopeName) {
+            var kind = isScopeName ? "Scope" : "Package";
             switch (result) {
-                case 2 /* EmptyName */:
-                    return "Package name '" + typing + "' cannot be empty";
-                case 3 /* NameTooLong */:
-                    return "Package name '" + typing + "' should be less than " + maxPackageNameLength + " characters";
-                case 4 /* NameStartsWithDot */:
-                    return "Package name '" + typing + "' cannot start with '.'";
-                case 5 /* NameStartsWithUnderscore */:
-                    return "Package name '" + typing + "' cannot start with '_'";
-                case 1 /* ScopedPackagesNotSupported */:
-                    return "Package '" + typing + "' is scoped and currently is not supported";
-                case 6 /* NameContainsNonURISafeCharacters */:
-                    return "Package name '" + typing + "' contains non URI safe characters";
+                case 1 /* EmptyName */:
+                    return "'" + typing + "':: " + kind + " name '" + name + "' cannot be empty";
+                case 2 /* NameTooLong */:
+                    return "'" + typing + "':: " + kind + " name '" + name + "' should be less than " + maxPackageNameLength + " characters";
+                case 3 /* NameStartsWithDot */:
+                    return "'" + typing + "':: " + kind + " name '" + name + "' cannot start with '.'";
+                case 4 /* NameStartsWithUnderscore */:
+                    return "'" + typing + "':: " + kind + " name '" + name + "' cannot start with '_'";
+                case 5 /* NameContainsNonURISafeCharacters */:
+                    return "'" + typing + "':: " + kind + " name '" + name + "' contains non URI safe characters";
                 case 0 /* Ok */:
                     return ts.Debug.fail(); // Shouldn't have called this.
                 default:
                     throw ts.Debug.assertNever(result);
             }
         }
-        JsTyping.renderPackageNameValidationFailure = renderPackageNameValidationFailure;
     })(JsTyping = ts.JsTyping || (ts.JsTyping = {}));
 })(ts || (ts = {}));
 var ts;
@@ -95219,7 +98181,7 @@ var ts;
 /* @internal */
 var ts;
 (function (ts) {
-    ts.scanner = ts.createScanner(7 /* Latest */, /*skipTrivia*/ true);
+    ts.scanner = ts.createScanner(99 /* Latest */, /*skipTrivia*/ true);
     var SemanticMeaning;
     (function (SemanticMeaning) {
         SemanticMeaning[SemanticMeaning["None"] = 0] = "None";
@@ -95230,37 +98192,37 @@ var ts;
     })(SemanticMeaning = ts.SemanticMeaning || (ts.SemanticMeaning = {}));
     function getMeaningFromDeclaration(node) {
         switch (node.kind) {
-            case 237 /* VariableDeclaration */:
+            case 238 /* VariableDeclaration */:
                 return ts.isInJSFile(node) && ts.getJSDocEnumTag(node) ? 7 /* All */ : 1 /* Value */;
-            case 151 /* Parameter */:
-            case 186 /* BindingElement */:
-            case 154 /* PropertyDeclaration */:
-            case 153 /* PropertySignature */:
-            case 275 /* PropertyAssignment */:
-            case 276 /* ShorthandPropertyAssignment */:
-            case 156 /* MethodDeclaration */:
-            case 155 /* MethodSignature */:
-            case 157 /* Constructor */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
-            case 239 /* FunctionDeclaration */:
-            case 196 /* FunctionExpression */:
-            case 197 /* ArrowFunction */:
-            case 274 /* CatchClause */:
-            case 267 /* JsxAttribute */:
+            case 152 /* Parameter */:
+            case 187 /* BindingElement */:
+            case 155 /* PropertyDeclaration */:
+            case 154 /* PropertySignature */:
+            case 276 /* PropertyAssignment */:
+            case 277 /* ShorthandPropertyAssignment */:
+            case 157 /* MethodDeclaration */:
+            case 156 /* MethodSignature */:
+            case 158 /* Constructor */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
+            case 240 /* FunctionDeclaration */:
+            case 197 /* FunctionExpression */:
+            case 198 /* ArrowFunction */:
+            case 275 /* CatchClause */:
+            case 268 /* JsxAttribute */:
                 return 1 /* Value */;
-            case 150 /* TypeParameter */:
-            case 241 /* InterfaceDeclaration */:
-            case 242 /* TypeAliasDeclaration */:
-            case 168 /* TypeLiteral */:
+            case 151 /* TypeParameter */:
+            case 242 /* InterfaceDeclaration */:
+            case 243 /* TypeAliasDeclaration */:
+            case 169 /* TypeLiteral */:
                 return 2 /* Type */;
-            case 309 /* JSDocTypedefTag */:
+            case 311 /* JSDocTypedefTag */:
                 // If it has no name node, it shares the name with the value declaration below it.
                 return node.name === undefined ? 1 /* Value */ | 2 /* Type */ : 2 /* Type */;
-            case 278 /* EnumMember */:
-            case 240 /* ClassDeclaration */:
+            case 279 /* EnumMember */:
+            case 241 /* ClassDeclaration */:
                 return 1 /* Value */ | 2 /* Type */;
-            case 244 /* ModuleDeclaration */:
+            case 245 /* ModuleDeclaration */:
                 if (ts.isAmbientModule(node)) {
                     return 4 /* Namespace */ | 1 /* Value */;
                 }
@@ -95270,26 +98232,26 @@ var ts;
                 else {
                     return 4 /* Namespace */;
                 }
-            case 243 /* EnumDeclaration */:
-            case 252 /* NamedImports */:
-            case 253 /* ImportSpecifier */:
-            case 248 /* ImportEqualsDeclaration */:
-            case 249 /* ImportDeclaration */:
-            case 254 /* ExportAssignment */:
-            case 255 /* ExportDeclaration */:
+            case 244 /* EnumDeclaration */:
+            case 253 /* NamedImports */:
+            case 254 /* ImportSpecifier */:
+            case 249 /* ImportEqualsDeclaration */:
+            case 250 /* ImportDeclaration */:
+            case 255 /* ExportAssignment */:
+            case 256 /* ExportDeclaration */:
                 return 7 /* All */;
             // An external module can be a Value
-            case 284 /* SourceFile */:
+            case 285 /* SourceFile */:
                 return 4 /* Namespace */ | 1 /* Value */;
         }
         return 7 /* All */;
     }
     ts.getMeaningFromDeclaration = getMeaningFromDeclaration;
     function getMeaningFromLocation(node) {
-        if (node.kind === 284 /* SourceFile */) {
+        if (node.kind === 285 /* SourceFile */) {
             return 1 /* Value */;
         }
-        else if (node.parent.kind === 254 /* ExportAssignment */ || node.parent.kind === 259 /* ExternalModuleReference */) {
+        else if (node.parent.kind === 255 /* ExportAssignment */ || node.parent.kind === 260 /* ExternalModuleReference */) {
             return 7 /* All */;
         }
         else if (isInRightSideOfInternalImportEqualsDeclaration(node)) {
@@ -95321,11 +98283,11 @@ var ts;
         //     import a = |b|; // Namespace
         //     import a = |b.c|; // Value, type, namespace
         //     import a = |b.c|.d; // Namespace
-        var name = node.kind === 148 /* QualifiedName */ ? node : ts.isQualifiedName(node.parent) && node.parent.right === node ? node.parent : undefined;
-        return name && name.parent.kind === 248 /* ImportEqualsDeclaration */ ? 7 /* All */ : 4 /* Namespace */;
+        var name = node.kind === 149 /* QualifiedName */ ? node : ts.isQualifiedName(node.parent) && node.parent.right === node ? node.parent : undefined;
+        return name && name.parent.kind === 249 /* ImportEqualsDeclaration */ ? 7 /* All */ : 4 /* Namespace */;
     }
     function isInRightSideOfInternalImportEqualsDeclaration(node) {
-        while (node.parent.kind === 148 /* QualifiedName */) {
+        while (node.parent.kind === 149 /* QualifiedName */) {
             node = node.parent;
         }
         return ts.isInternalModuleImportEqualsDeclaration(node.parent) && node.parent.moduleReference === node;
@@ -95337,27 +98299,27 @@ var ts;
     function isQualifiedNameNamespaceReference(node) {
         var root = node;
         var isLastClause = true;
-        if (root.parent.kind === 148 /* QualifiedName */) {
-            while (root.parent && root.parent.kind === 148 /* QualifiedName */) {
+        if (root.parent.kind === 149 /* QualifiedName */) {
+            while (root.parent && root.parent.kind === 149 /* QualifiedName */) {
                 root = root.parent;
             }
             isLastClause = root.right === node;
         }
-        return root.parent.kind === 164 /* TypeReference */ && !isLastClause;
+        return root.parent.kind === 165 /* TypeReference */ && !isLastClause;
     }
     function isPropertyAccessNamespaceReference(node) {
         var root = node;
         var isLastClause = true;
-        if (root.parent.kind === 189 /* PropertyAccessExpression */) {
-            while (root.parent && root.parent.kind === 189 /* PropertyAccessExpression */) {
+        if (root.parent.kind === 190 /* PropertyAccessExpression */) {
+            while (root.parent && root.parent.kind === 190 /* PropertyAccessExpression */) {
                 root = root.parent;
             }
             isLastClause = root.name === node;
         }
-        if (!isLastClause && root.parent.kind === 211 /* ExpressionWithTypeArguments */ && root.parent.parent.kind === 273 /* HeritageClause */) {
+        if (!isLastClause && root.parent.kind === 212 /* ExpressionWithTypeArguments */ && root.parent.parent.kind === 274 /* HeritageClause */) {
             var decl = root.parent.parent.parent;
-            return (decl.kind === 240 /* ClassDeclaration */ && root.parent.parent.token === 109 /* ImplementsKeyword */) ||
-                (decl.kind === 241 /* InterfaceDeclaration */ && root.parent.parent.token === 86 /* ExtendsKeyword */);
+            return (decl.kind === 241 /* ClassDeclaration */ && root.parent.parent.token === 110 /* ImplementsKeyword */) ||
+                (decl.kind === 242 /* InterfaceDeclaration */ && root.parent.parent.token === 87 /* ExtendsKeyword */);
         }
         return false;
     }
@@ -95366,17 +98328,17 @@ var ts;
             node = node.parent;
         }
         switch (node.kind) {
-            case 100 /* ThisKeyword */:
+            case 101 /* ThisKeyword */:
                 return !ts.isExpressionNode(node);
-            case 178 /* ThisType */:
+            case 179 /* ThisType */:
                 return true;
         }
         switch (node.parent.kind) {
-            case 164 /* TypeReference */:
+            case 165 /* TypeReference */:
                 return true;
-            case 183 /* ImportType */:
+            case 184 /* ImportType */:
                 return !node.parent.isTypeOf;
-            case 211 /* ExpressionWithTypeArguments */:
+            case 212 /* ExpressionWithTypeArguments */:
                 return !ts.isExpressionWithTypeArgumentsInClassExtendsClause(node.parent);
         }
         return false;
@@ -95403,7 +98365,7 @@ var ts;
     ts.climbPastPropertyAccess = climbPastPropertyAccess;
     function getTargetLabel(referenceNode, labelName) {
         while (referenceNode) {
-            if (referenceNode.kind === 233 /* LabeledStatement */ && referenceNode.label.escapedText === labelName) {
+            if (referenceNode.kind === 234 /* LabeledStatement */ && referenceNode.label.escapedText === labelName) {
                 return referenceNode.label;
             }
             referenceNode = referenceNode.parent;
@@ -95419,11 +98381,11 @@ var ts;
     }
     ts.hasPropertyAccessExpressionWithName = hasPropertyAccessExpressionWithName;
     function isJumpStatementTarget(node) {
-        return node.kind === 72 /* Identifier */ && ts.isBreakOrContinueStatement(node.parent) && node.parent.label === node;
+        return node.kind === 73 /* Identifier */ && ts.isBreakOrContinueStatement(node.parent) && node.parent.label === node;
     }
     ts.isJumpStatementTarget = isJumpStatementTarget;
     function isLabelOfLabeledStatement(node) {
-        return node.kind === 72 /* Identifier */ && ts.isLabeledStatement(node.parent) && node.parent.label === node;
+        return node.kind === 73 /* Identifier */ && ts.isLabeledStatement(node.parent) && node.parent.label === node;
     }
     ts.isLabelOfLabeledStatement = isLabelOfLabeledStatement;
     function isLabelName(node) {
@@ -95435,40 +98397,40 @@ var ts;
     }
     ts.isTagName = isTagName;
     function isRightSideOfQualifiedName(node) {
-        return node.parent.kind === 148 /* QualifiedName */ && node.parent.right === node;
+        return node.parent.kind === 149 /* QualifiedName */ && node.parent.right === node;
     }
     ts.isRightSideOfQualifiedName = isRightSideOfQualifiedName;
     function isRightSideOfPropertyAccess(node) {
-        return node && node.parent && node.parent.kind === 189 /* PropertyAccessExpression */ && node.parent.name === node;
+        return node && node.parent && node.parent.kind === 190 /* PropertyAccessExpression */ && node.parent.name === node;
     }
     ts.isRightSideOfPropertyAccess = isRightSideOfPropertyAccess;
     function isNameOfModuleDeclaration(node) {
-        return node.parent.kind === 244 /* ModuleDeclaration */ && node.parent.name === node;
+        return node.parent.kind === 245 /* ModuleDeclaration */ && node.parent.name === node;
     }
     ts.isNameOfModuleDeclaration = isNameOfModuleDeclaration;
     function isNameOfFunctionDeclaration(node) {
-        return node.kind === 72 /* Identifier */ &&
+        return node.kind === 73 /* Identifier */ &&
             ts.isFunctionLike(node.parent) && node.parent.name === node;
     }
     ts.isNameOfFunctionDeclaration = isNameOfFunctionDeclaration;
     function isLiteralNameOfPropertyDeclarationOrIndexAccess(node) {
         switch (node.parent.kind) {
-            case 154 /* PropertyDeclaration */:
-            case 153 /* PropertySignature */:
-            case 275 /* PropertyAssignment */:
-            case 278 /* EnumMember */:
-            case 156 /* MethodDeclaration */:
-            case 155 /* MethodSignature */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
-            case 244 /* ModuleDeclaration */:
+            case 155 /* PropertyDeclaration */:
+            case 154 /* PropertySignature */:
+            case 276 /* PropertyAssignment */:
+            case 279 /* EnumMember */:
+            case 157 /* MethodDeclaration */:
+            case 156 /* MethodSignature */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
+            case 245 /* ModuleDeclaration */:
                 return ts.getNameOfDeclaration(node.parent) === node;
-            case 190 /* ElementAccessExpression */:
+            case 191 /* ElementAccessExpression */:
                 return node.parent.argumentExpression === node;
-            case 149 /* ComputedPropertyName */:
+            case 150 /* ComputedPropertyName */:
                 return true;
-            case 182 /* LiteralType */:
-                return node.parent.parent.kind === 180 /* IndexedAccessType */;
+            case 183 /* LiteralType */:
+                return node.parent.parent.kind === 181 /* IndexedAccessType */;
             default:
                 return false;
         }
@@ -95492,17 +98454,17 @@ var ts;
                 return undefined;
             }
             switch (node.kind) {
-                case 284 /* SourceFile */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
-                case 240 /* ClassDeclaration */:
-                case 241 /* InterfaceDeclaration */:
-                case 243 /* EnumDeclaration */:
-                case 244 /* ModuleDeclaration */:
+                case 285 /* SourceFile */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
+                case 241 /* ClassDeclaration */:
+                case 242 /* InterfaceDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     return node;
             }
         }
@@ -95510,48 +98472,48 @@ var ts;
     ts.getContainerNode = getContainerNode;
     function getNodeKind(node) {
         switch (node.kind) {
-            case 284 /* SourceFile */:
+            case 285 /* SourceFile */:
                 return ts.isExternalModule(node) ? "module" /* moduleElement */ : "script" /* scriptElement */;
-            case 244 /* ModuleDeclaration */:
+            case 245 /* ModuleDeclaration */:
                 return "module" /* moduleElement */;
-            case 240 /* ClassDeclaration */:
-            case 209 /* ClassExpression */:
+            case 241 /* ClassDeclaration */:
+            case 210 /* ClassExpression */:
                 return "class" /* classElement */;
-            case 241 /* InterfaceDeclaration */: return "interface" /* interfaceElement */;
-            case 242 /* TypeAliasDeclaration */:
-            case 302 /* JSDocCallbackTag */:
-            case 309 /* JSDocTypedefTag */:
+            case 242 /* InterfaceDeclaration */: return "interface" /* interfaceElement */;
+            case 243 /* TypeAliasDeclaration */:
+            case 304 /* JSDocCallbackTag */:
+            case 311 /* JSDocTypedefTag */:
                 return "type" /* typeElement */;
-            case 243 /* EnumDeclaration */: return "enum" /* enumElement */;
-            case 237 /* VariableDeclaration */:
+            case 244 /* EnumDeclaration */: return "enum" /* enumElement */;
+            case 238 /* VariableDeclaration */:
                 return getKindOfVariableDeclaration(node);
-            case 186 /* BindingElement */:
+            case 187 /* BindingElement */:
                 return getKindOfVariableDeclaration(ts.getRootDeclaration(node));
-            case 197 /* ArrowFunction */:
-            case 239 /* FunctionDeclaration */:
-            case 196 /* FunctionExpression */:
+            case 198 /* ArrowFunction */:
+            case 240 /* FunctionDeclaration */:
+            case 197 /* FunctionExpression */:
                 return "function" /* functionElement */;
-            case 158 /* GetAccessor */: return "getter" /* memberGetAccessorElement */;
-            case 159 /* SetAccessor */: return "setter" /* memberSetAccessorElement */;
-            case 156 /* MethodDeclaration */:
-            case 155 /* MethodSignature */:
+            case 159 /* GetAccessor */: return "getter" /* memberGetAccessorElement */;
+            case 160 /* SetAccessor */: return "setter" /* memberSetAccessorElement */;
+            case 157 /* MethodDeclaration */:
+            case 156 /* MethodSignature */:
                 return "method" /* memberFunctionElement */;
-            case 154 /* PropertyDeclaration */:
-            case 153 /* PropertySignature */:
+            case 155 /* PropertyDeclaration */:
+            case 154 /* PropertySignature */:
                 return "property" /* memberVariableElement */;
-            case 162 /* IndexSignature */: return "index" /* indexSignatureElement */;
-            case 161 /* ConstructSignature */: return "construct" /* constructSignatureElement */;
-            case 160 /* CallSignature */: return "call" /* callSignatureElement */;
-            case 157 /* Constructor */: return "constructor" /* constructorImplementationElement */;
-            case 150 /* TypeParameter */: return "type parameter" /* typeParameterElement */;
-            case 278 /* EnumMember */: return "enum member" /* enumMemberElement */;
-            case 151 /* Parameter */: return ts.hasModifier(node, 92 /* ParameterPropertyModifier */) ? "property" /* memberVariableElement */ : "parameter" /* parameterElement */;
-            case 248 /* ImportEqualsDeclaration */:
-            case 253 /* ImportSpecifier */:
-            case 257 /* ExportSpecifier */:
-            case 251 /* NamespaceImport */:
+            case 163 /* IndexSignature */: return "index" /* indexSignatureElement */;
+            case 162 /* ConstructSignature */: return "construct" /* constructSignatureElement */;
+            case 161 /* CallSignature */: return "call" /* callSignatureElement */;
+            case 158 /* Constructor */: return "constructor" /* constructorImplementationElement */;
+            case 151 /* TypeParameter */: return "type parameter" /* typeParameterElement */;
+            case 279 /* EnumMember */: return "enum member" /* enumMemberElement */;
+            case 152 /* Parameter */: return ts.hasModifier(node, 92 /* ParameterPropertyModifier */) ? "property" /* memberVariableElement */ : "parameter" /* parameterElement */;
+            case 249 /* ImportEqualsDeclaration */:
+            case 254 /* ImportSpecifier */:
+            case 258 /* ExportSpecifier */:
+            case 252 /* NamespaceImport */:
                 return "alias" /* alias */;
-            case 204 /* BinaryExpression */:
+            case 205 /* BinaryExpression */:
                 var kind = ts.getAssignmentDeclarationKind(node);
                 var right = node.right;
                 switch (kind) {
@@ -95578,7 +98540,7 @@ var ts;
                         return "" /* unknown */;
                     }
                 }
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 return ts.isImportClause(node.parent) ? "alias" /* alias */ : "" /* unknown */;
             default:
                 return "" /* unknown */;
@@ -95594,12 +98556,12 @@ var ts;
     ts.getNodeKind = getNodeKind;
     function isThis(node) {
         switch (node.kind) {
-            case 100 /* ThisKeyword */:
+            case 101 /* ThisKeyword */:
                 // case SyntaxKind.ThisType: TODO: GH#9267
                 return true;
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 // 'this' as a parameter
-                return ts.identifierIsThisKeyword(node) && node.parent.kind === 151 /* Parameter */;
+                return ts.identifierIsThisKeyword(node) && node.parent.kind === 152 /* Parameter */;
             default:
                 return false;
         }
@@ -95664,42 +98626,42 @@ var ts;
             return false;
         }
         switch (n.kind) {
-            case 240 /* ClassDeclaration */:
-            case 241 /* InterfaceDeclaration */:
-            case 243 /* EnumDeclaration */:
-            case 188 /* ObjectLiteralExpression */:
-            case 184 /* ObjectBindingPattern */:
-            case 168 /* TypeLiteral */:
-            case 218 /* Block */:
-            case 245 /* ModuleBlock */:
-            case 246 /* CaseBlock */:
-            case 252 /* NamedImports */:
-            case 256 /* NamedExports */:
+            case 241 /* ClassDeclaration */:
+            case 242 /* InterfaceDeclaration */:
+            case 244 /* EnumDeclaration */:
+            case 189 /* ObjectLiteralExpression */:
+            case 185 /* ObjectBindingPattern */:
+            case 169 /* TypeLiteral */:
+            case 219 /* Block */:
+            case 246 /* ModuleBlock */:
+            case 247 /* CaseBlock */:
+            case 253 /* NamedImports */:
+            case 257 /* NamedExports */:
                 return nodeEndsWith(n, 19 /* CloseBraceToken */, sourceFile);
-            case 274 /* CatchClause */:
+            case 275 /* CatchClause */:
                 return isCompletedNode(n.block, sourceFile);
-            case 192 /* NewExpression */:
+            case 193 /* NewExpression */:
                 if (!n.arguments) {
                     return true;
                 }
             // falls through
-            case 191 /* CallExpression */:
-            case 195 /* ParenthesizedExpression */:
-            case 177 /* ParenthesizedType */:
+            case 192 /* CallExpression */:
+            case 196 /* ParenthesizedExpression */:
+            case 178 /* ParenthesizedType */:
                 return nodeEndsWith(n, 21 /* CloseParenToken */, sourceFile);
-            case 165 /* FunctionType */:
-            case 166 /* ConstructorType */:
+            case 166 /* FunctionType */:
+            case 167 /* ConstructorType */:
                 return isCompletedNode(n.type, sourceFile);
-            case 157 /* Constructor */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
-            case 239 /* FunctionDeclaration */:
-            case 196 /* FunctionExpression */:
-            case 156 /* MethodDeclaration */:
-            case 155 /* MethodSignature */:
-            case 161 /* ConstructSignature */:
-            case 160 /* CallSignature */:
-            case 197 /* ArrowFunction */:
+            case 158 /* Constructor */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
+            case 240 /* FunctionDeclaration */:
+            case 197 /* FunctionExpression */:
+            case 157 /* MethodDeclaration */:
+            case 156 /* MethodSignature */:
+            case 162 /* ConstructSignature */:
+            case 161 /* CallSignature */:
+            case 198 /* ArrowFunction */:
                 if (n.body) {
                     return isCompletedNode(n.body, sourceFile);
                 }
@@ -95709,65 +98671,65 @@ var ts;
                 // Even though type parameters can be unclosed, we can get away with
                 // having at least a closing paren.
                 return hasChildOfKind(n, 21 /* CloseParenToken */, sourceFile);
-            case 244 /* ModuleDeclaration */:
+            case 245 /* ModuleDeclaration */:
                 return !!n.body && isCompletedNode(n.body, sourceFile);
-            case 222 /* IfStatement */:
+            case 223 /* IfStatement */:
                 if (n.elseStatement) {
                     return isCompletedNode(n.elseStatement, sourceFile);
                 }
                 return isCompletedNode(n.thenStatement, sourceFile);
-            case 221 /* ExpressionStatement */:
+            case 222 /* ExpressionStatement */:
                 return isCompletedNode(n.expression, sourceFile) ||
                     hasChildOfKind(n, 26 /* SemicolonToken */, sourceFile);
-            case 187 /* ArrayLiteralExpression */:
-            case 185 /* ArrayBindingPattern */:
-            case 190 /* ElementAccessExpression */:
-            case 149 /* ComputedPropertyName */:
-            case 170 /* TupleType */:
+            case 188 /* ArrayLiteralExpression */:
+            case 186 /* ArrayBindingPattern */:
+            case 191 /* ElementAccessExpression */:
+            case 150 /* ComputedPropertyName */:
+            case 171 /* TupleType */:
                 return nodeEndsWith(n, 23 /* CloseBracketToken */, sourceFile);
-            case 162 /* IndexSignature */:
+            case 163 /* IndexSignature */:
                 if (n.type) {
                     return isCompletedNode(n.type, sourceFile);
                 }
                 return hasChildOfKind(n, 23 /* CloseBracketToken */, sourceFile);
-            case 271 /* CaseClause */:
-            case 272 /* DefaultClause */:
+            case 272 /* CaseClause */:
+            case 273 /* DefaultClause */:
                 // there is no such thing as terminator token for CaseClause/DefaultClause so for simplicity always consider them non-completed
                 return false;
-            case 225 /* ForStatement */:
-            case 226 /* ForInStatement */:
-            case 227 /* ForOfStatement */:
-            case 224 /* WhileStatement */:
+            case 226 /* ForStatement */:
+            case 227 /* ForInStatement */:
+            case 228 /* ForOfStatement */:
+            case 225 /* WhileStatement */:
                 return isCompletedNode(n.statement, sourceFile);
-            case 223 /* DoStatement */:
+            case 224 /* DoStatement */:
                 // rough approximation: if DoStatement has While keyword - then if node is completed is checking the presence of ')';
-                return hasChildOfKind(n, 107 /* WhileKeyword */, sourceFile)
+                return hasChildOfKind(n, 108 /* WhileKeyword */, sourceFile)
                     ? nodeEndsWith(n, 21 /* CloseParenToken */, sourceFile)
                     : isCompletedNode(n.statement, sourceFile);
-            case 167 /* TypeQuery */:
+            case 168 /* TypeQuery */:
                 return isCompletedNode(n.exprName, sourceFile);
-            case 199 /* TypeOfExpression */:
-            case 198 /* DeleteExpression */:
-            case 200 /* VoidExpression */:
-            case 207 /* YieldExpression */:
-            case 208 /* SpreadElement */:
+            case 200 /* TypeOfExpression */:
+            case 199 /* DeleteExpression */:
+            case 201 /* VoidExpression */:
+            case 208 /* YieldExpression */:
+            case 209 /* SpreadElement */:
                 var unaryWordExpression = n;
                 return isCompletedNode(unaryWordExpression.expression, sourceFile);
-            case 193 /* TaggedTemplateExpression */:
+            case 194 /* TaggedTemplateExpression */:
                 return isCompletedNode(n.template, sourceFile);
-            case 206 /* TemplateExpression */:
+            case 207 /* TemplateExpression */:
                 var lastSpan = ts.lastOrUndefined(n.templateSpans);
                 return isCompletedNode(lastSpan, sourceFile);
-            case 216 /* TemplateSpan */:
+            case 217 /* TemplateSpan */:
                 return ts.nodeIsPresent(n.literal);
-            case 255 /* ExportDeclaration */:
-            case 249 /* ImportDeclaration */:
+            case 256 /* ExportDeclaration */:
+            case 250 /* ImportDeclaration */:
                 return ts.nodeIsPresent(n.moduleSpecifier);
-            case 202 /* PrefixUnaryExpression */:
+            case 203 /* PrefixUnaryExpression */:
                 return isCompletedNode(n.operand, sourceFile);
-            case 204 /* BinaryExpression */:
+            case 205 /* BinaryExpression */:
                 return isCompletedNode(n.right, sourceFile);
-            case 205 /* ConditionalExpression */:
+            case 206 /* ConditionalExpression */:
                 return isCompletedNode(n.whenFalse, sourceFile);
             default:
                 return true;
@@ -95946,7 +98908,7 @@ var ts;
                     }
                 }
             }
-            ts.Debug.assert(startNode !== undefined || n.kind === 284 /* SourceFile */ || n.kind === 1 /* EndOfFileToken */ || ts.isJSDocCommentContainingNode(n));
+            ts.Debug.assert(startNode !== undefined || n.kind === 285 /* SourceFile */ || n.kind === 1 /* EndOfFileToken */ || ts.isJSDocCommentContainingNode(n));
             // Here we know that none of child token nodes embrace the position,
             // the only known case is when position is at the end of the file.
             // Try to find the rightmost token in the file without filtering.
@@ -96016,24 +98978,24 @@ var ts;
             return true;
         }
         // <div> { | </div> or <div a={| </div>
-        if (token.kind === 28 /* LessThanToken */ && token.parent.kind === 270 /* JsxExpression */) {
+        if (token.kind === 28 /* LessThanToken */ && token.parent.kind === 271 /* JsxExpression */) {
             return true;
         }
         // <div> {
         // |
         // } < /div>
-        if (token && token.kind === 19 /* CloseBraceToken */ && token.parent.kind === 270 /* JsxExpression */) {
+        if (token && token.kind === 19 /* CloseBraceToken */ && token.parent.kind === 271 /* JsxExpression */) {
             return true;
         }
         // <div>|</div>
-        if (token.kind === 28 /* LessThanToken */ && token.parent.kind === 263 /* JsxClosingElement */) {
+        if (token.kind === 28 /* LessThanToken */ && token.parent.kind === 264 /* JsxClosingElement */) {
             return true;
         }
         return false;
     }
     ts.isInsideJsxElementOrAttribute = isInsideJsxElementOrAttribute;
     function isWhiteSpaceOnlyJsxText(node) {
-        return ts.isJsxText(node) && node.containsOnlyWhiteSpaces;
+        return ts.isJsxText(node) && node.containsOnlyTriviaWhiteSpaces;
     }
     function isInTemplateString(sourceFile, position) {
         var token = getTokenAtPosition(sourceFile, position);
@@ -96145,15 +99107,15 @@ var ts;
                     nTypeArguments++;
                     break;
                 case 37 /* EqualsGreaterThanToken */:
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                 case 10 /* StringLiteral */:
                 case 8 /* NumericLiteral */:
                 case 9 /* BigIntLiteral */:
-                case 102 /* TrueKeyword */:
-                case 87 /* FalseKeyword */:
-                case 104 /* TypeOfKeyword */:
-                case 86 /* ExtendsKeyword */:
-                case 129 /* KeyOfKeyword */:
+                case 103 /* TrueKeyword */:
+                case 88 /* FalseKeyword */:
+                case 105 /* TypeOfKeyword */:
+                case 87 /* ExtendsKeyword */:
+                case 130 /* KeyOfKeyword */:
                 case 24 /* DotToken */:
                 case 50 /* BarToken */:
                 case 56 /* QuestionToken */:
@@ -96212,10 +99174,10 @@ var ts;
     }
     ts.getNodeModifiers = getNodeModifiers;
     function getTypeArgumentOrTypeParameterList(node) {
-        if (node.kind === 164 /* TypeReference */ || node.kind === 191 /* CallExpression */) {
+        if (node.kind === 165 /* TypeReference */ || node.kind === 192 /* CallExpression */) {
             return node.typeArguments;
         }
-        if (ts.isFunctionLike(node) || node.kind === 240 /* ClassDeclaration */ || node.kind === 241 /* InterfaceDeclaration */) {
+        if (ts.isFunctionLike(node) || node.kind === 241 /* ClassDeclaration */ || node.kind === 242 /* InterfaceDeclaration */) {
             return node.typeParameters;
         }
         return undefined;
@@ -96235,7 +99197,7 @@ var ts;
     }
     ts.isStringOrRegularExpressionOrTemplateLiteral = isStringOrRegularExpressionOrTemplateLiteral;
     function isPunctuation(kind) {
-        return 18 /* FirstPunctuation */ <= kind && kind <= 71 /* LastPunctuation */;
+        return 18 /* FirstPunctuation */ <= kind && kind <= 72 /* LastPunctuation */;
     }
     ts.isPunctuation = isPunctuation;
     function isInsideTemplateLiteral(node, position, sourceFile) {
@@ -96245,9 +99207,9 @@ var ts;
     ts.isInsideTemplateLiteral = isInsideTemplateLiteral;
     function isAccessibilityModifier(kind) {
         switch (kind) {
-            case 115 /* PublicKeyword */:
-            case 113 /* PrivateKeyword */:
-            case 114 /* ProtectedKeyword */:
+            case 116 /* PublicKeyword */:
+            case 114 /* PrivateKeyword */:
+            case 115 /* ProtectedKeyword */:
                 return true;
         }
         return false;
@@ -96260,18 +99222,18 @@ var ts;
     }
     ts.cloneCompilerOptions = cloneCompilerOptions;
     function isArrayLiteralOrObjectLiteralDestructuringPattern(node) {
-        if (node.kind === 187 /* ArrayLiteralExpression */ ||
-            node.kind === 188 /* ObjectLiteralExpression */) {
+        if (node.kind === 188 /* ArrayLiteralExpression */ ||
+            node.kind === 189 /* ObjectLiteralExpression */) {
             // [a,b,c] from:
             // [a, b, c] = someExpression;
-            if (node.parent.kind === 204 /* BinaryExpression */ &&
+            if (node.parent.kind === 205 /* BinaryExpression */ &&
                 node.parent.left === node &&
-                node.parent.operatorToken.kind === 59 /* EqualsToken */) {
+                node.parent.operatorToken.kind === 60 /* EqualsToken */) {
                 return true;
             }
             // [a, b, c] from:
             // for([a, b, c] of expression)
-            if (node.parent.kind === 227 /* ForOfStatement */ &&
+            if (node.parent.kind === 228 /* ForOfStatement */ &&
                 node.parent.initializer === node) {
                 return true;
             }
@@ -96279,7 +99241,7 @@ var ts;
             // [x, [a, b, c] ] = someExpression
             // or
             // {x, a: {a, b, c} } = someExpression
-            if (isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent.kind === 275 /* PropertyAssignment */ ? node.parent.parent : node.parent)) {
+            if (isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent.kind === 276 /* PropertyAssignment */ ? node.parent.parent : node.parent)) {
                 return true;
             }
         }
@@ -96298,8 +99260,8 @@ var ts;
         var range = isInComment(sourceFile, position, /*tokenAtPosition*/ undefined);
         return !!range && shouldBeReference === tripleSlashDirectivePrefixRegex.test(sourceFile.text.substring(range.pos, range.end));
     }
-    function createTextSpanFromNode(node, sourceFile) {
-        return ts.createTextSpanFromBounds(node.getStart(sourceFile), node.getEnd());
+    function createTextSpanFromNode(node, sourceFile, endNode) {
+        return ts.createTextSpanFromBounds(node.getStart(sourceFile), (endNode || node).getEnd());
     }
     ts.createTextSpanFromNode = createTextSpanFromNode;
     function createTextRangeFromNode(node, sourceFile) {
@@ -96323,22 +99285,23 @@ var ts;
     }
     ts.createTextChange = createTextChange;
     ts.typeKeywords = [
-        120 /* AnyKeyword */,
-        146 /* BigIntKeyword */,
-        123 /* BooleanKeyword */,
-        87 /* FalseKeyword */,
-        129 /* KeyOfKeyword */,
-        132 /* NeverKeyword */,
-        96 /* NullKeyword */,
-        135 /* NumberKeyword */,
-        136 /* ObjectKeyword */,
-        138 /* StringKeyword */,
-        139 /* SymbolKeyword */,
-        102 /* TrueKeyword */,
-        106 /* VoidKeyword */,
-        141 /* UndefinedKeyword */,
-        142 /* UniqueKeyword */,
-        143 /* UnknownKeyword */,
+        121 /* AnyKeyword */,
+        147 /* BigIntKeyword */,
+        124 /* BooleanKeyword */,
+        88 /* FalseKeyword */,
+        130 /* KeyOfKeyword */,
+        133 /* NeverKeyword */,
+        97 /* NullKeyword */,
+        136 /* NumberKeyword */,
+        137 /* ObjectKeyword */,
+        134 /* ReadonlyKeyword */,
+        139 /* StringKeyword */,
+        140 /* SymbolKeyword */,
+        103 /* TrueKeyword */,
+        107 /* VoidKeyword */,
+        142 /* UndefinedKeyword */,
+        143 /* UniqueKeyword */,
+        144 /* UnknownKeyword */,
     ];
     function isTypeKeyword(kind) {
         return ts.contains(ts.typeKeywords, kind);
@@ -96374,7 +99337,7 @@ var ts;
     }
     ts.skipConstraint = skipConstraint;
     function getNameFromPropertyName(name) {
-        return name.kind === 149 /* ComputedPropertyName */
+        return name.kind === 150 /* ComputedPropertyName */
             // treat computed property names where expression is string/numeric literal as just string/numeric literal
             ? ts.isStringOrNumericLiteralLike(name.expression) ? name.expression.text : undefined
             : ts.getTextOfIdentifierOrLiteral(name);
@@ -96450,7 +99413,7 @@ var ts;
         }
         return ts.firstDefined(symbol.declarations, function (decl) {
             var name = ts.getNameOfDeclaration(decl);
-            return name && name.kind === 72 /* Identifier */ ? name.escapedText : undefined;
+            return name && name.kind === 73 /* Identifier */ ? name.escapedText : undefined;
         });
     }
     ts.symbolEscapedNameNoDefault = symbolEscapedNameNoDefault;
@@ -96539,7 +99502,7 @@ var ts;
 /* @internal */
 (function (ts) {
     function isFirstDeclarationOfSymbolParameter(symbol) {
-        return symbol.declarations && symbol.declarations.length > 0 && symbol.declarations[0].kind === 151 /* Parameter */;
+        return symbol.declarations && symbol.declarations.length > 0 && symbol.declarations[0].kind === 152 /* Parameter */;
     }
     ts.isFirstDeclarationOfSymbolParameter = isFirstDeclarationOfSymbolParameter;
     var displayPartWriter = getDisplayPartWriter();
@@ -96761,23 +99724,6 @@ var ts;
         return !!location.parent && ts.isImportOrExportSpecifier(location.parent) && location.parent.propertyName === location;
     }
     ts.isImportOrExportSpecifierName = isImportOrExportSpecifierName;
-    /**
-     * Strip off existed single quotes or double quotes from a given string
-     *
-     * @return non-quoted string
-     */
-    function stripQuotes(name) {
-        var length = name.length;
-        if (length >= 2 && name.charCodeAt(0) === name.charCodeAt(length - 1) && startsWithQuote(name)) {
-            return name.substring(1, length - 1);
-        }
-        return name;
-    }
-    ts.stripQuotes = stripQuotes;
-    function startsWithQuote(name) {
-        return ts.isSingleOrDoubleQuote(name.charCodeAt(0));
-    }
-    ts.startsWithQuote = startsWithQuote;
     function scriptKindIs(fileName, host) {
         var scriptKinds = [];
         for (var _i = 2; _i < arguments.length; _i++) {
@@ -96793,10 +99739,15 @@ var ts;
         return ts.ensureScriptKind(fileName, host && host.getScriptKind && host.getScriptKind(fileName));
     }
     ts.getScriptKind = getScriptKind;
-    function getSymbolTarget(symbol) {
+    function getSymbolTarget(symbol, checker) {
         var next = symbol;
-        while (isTransientSymbol(next) && next.target) {
-            next = next.target;
+        while (isAliasSymbol(next) || (isTransientSymbol(next) && next.target)) {
+            if (isTransientSymbol(next) && next.target) {
+                next = next.target;
+            }
+            else {
+                next = ts.skipAlias(next, checker);
+            }
         }
         return next;
     }
@@ -96804,6 +99755,9 @@ var ts;
     function isTransientSymbol(symbol) {
         return (symbol.flags & 33554432 /* Transient */) !== 0;
     }
+    function isAliasSymbol(symbol) {
+        return (symbol.flags & 2097152 /* Alias */) !== 0;
+    }
     function getUniqueSymbolId(symbol, checker) {
         return ts.getSymbolId(ts.skipAlias(symbol, checker));
     }
@@ -96839,7 +99793,14 @@ var ts;
     function getSynthesizedDeepCloneWithRenames(node, includeTrivia, renameMap, checker, callback) {
         if (includeTrivia === void 0) { includeTrivia = true; }
         var clone;
-        if (ts.isIdentifier(node) && renameMap && checker) {
+        if (renameMap && checker && ts.isBindingElement(node) && ts.isIdentifier(node.name) && ts.isObjectBindingPattern(node.parent)) {
+            var symbol = checker.getSymbolAtLocation(node.name);
+            var renameInfo = symbol && renameMap.get(String(ts.getSymbolId(symbol)));
+            if (renameInfo && renameInfo.text !== (node.name || node.propertyName).getText()) {
+                clone = ts.createBindingElement(node.dotDotDotToken, node.propertyName || node.name, renameInfo, node.initializer);
+            }
+        }
+        else if (renameMap && checker && ts.isIdentifier(node)) {
             var symbol = checker.getSymbolAtLocation(node);
             var renameInfo = symbol && renameMap.get(String(ts.getSymbolId(symbol)));
             if (renameInfo) {
@@ -97003,15 +99964,15 @@ var ts;
     function getContextualTypeFromParent(node, checker) {
         var parent = node.parent;
         switch (parent.kind) {
-            case 192 /* NewExpression */:
+            case 193 /* NewExpression */:
                 return checker.getContextualType(parent);
-            case 204 /* BinaryExpression */: {
+            case 205 /* BinaryExpression */: {
                 var _a = parent, left = _a.left, operatorToken = _a.operatorToken, right = _a.right;
                 return isEqualityOperatorKind(operatorToken.kind)
                     ? checker.getTypeAtLocation(node === right ? left : right)
                     : checker.getContextualType(node);
             }
-            case 271 /* CaseClause */:
+            case 272 /* CaseClause */:
                 return parent.expression === node ? getSwitchedType(parent, checker) : undefined;
             default:
                 return checker.getContextualType(node);
@@ -97031,7 +99992,7 @@ var ts;
             case "double":
                 return quoted;
             case "single":
-                return "'" + stripQuotes(quoted).replace("'", "\\'").replace('\\"', '"') + "'";
+                return "'" + ts.stripQuotes(quoted).replace("'", "\\'").replace('\\"', '"') + "'";
             default:
                 return ts.Debug.assertNever(quotePreference);
         }
@@ -97053,8 +100014,8 @@ var ts;
         switch (node.kind) {
             case 10 /* StringLiteral */:
             case 14 /* NoSubstitutionTemplateLiteral */:
-            case 206 /* TemplateExpression */:
-            case 193 /* TaggedTemplateExpression */:
+            case 207 /* TemplateExpression */:
+            case 194 /* TaggedTemplateExpression */:
                 return true;
             default:
                 return false;
@@ -97093,11 +100054,55 @@ var ts;
         return typeIsAccessible ? res : undefined;
     }
     ts.getTypeNodeIfAccessible = getTypeNodeIfAccessible;
+    function syntaxUsuallyHasTrailingSemicolon(kind) {
+        return kind === 220 /* VariableStatement */
+            || kind === 222 /* ExpressionStatement */
+            || kind === 224 /* DoStatement */
+            || kind === 229 /* ContinueStatement */
+            || kind === 230 /* BreakStatement */
+            || kind === 231 /* ReturnStatement */
+            || kind === 235 /* ThrowStatement */
+            || kind === 237 /* DebuggerStatement */
+            || kind === 155 /* PropertyDeclaration */
+            || kind === 243 /* TypeAliasDeclaration */
+            || kind === 250 /* ImportDeclaration */
+            || kind === 249 /* ImportEqualsDeclaration */
+            || kind === 256 /* ExportDeclaration */;
+    }
+    ts.syntaxUsuallyHasTrailingSemicolon = syntaxUsuallyHasTrailingSemicolon;
+    function probablyUsesSemicolons(sourceFile) {
+        var withSemicolon = 0;
+        var withoutSemicolon = 0;
+        var nStatementsToObserve = 5;
+        ts.forEachChild(sourceFile, function visit(node) {
+            if (syntaxUsuallyHasTrailingSemicolon(node.kind)) {
+                var lastToken = node.getLastToken(sourceFile);
+                if (lastToken && lastToken.kind === 26 /* SemicolonToken */) {
+                    withSemicolon++;
+                }
+                else {
+                    withoutSemicolon++;
+                }
+            }
+            if (withSemicolon + withoutSemicolon >= nStatementsToObserve) {
+                return true;
+            }
+            return ts.forEachChild(node, visit);
+        });
+        // One statement missing a semicolon isn’t sufficient evidence to say the user
+        // doesn’t want semicolons, because they may not even be done writing that statement.
+        if (withSemicolon === 0 && withoutSemicolon <= 1) {
+            return true;
+        }
+        // If even 2/5 places have a semicolon, the user probably wants semicolons
+        return withSemicolon / withoutSemicolon > 1 / nStatementsToObserve;
+    }
+    ts.probablyUsesSemicolons = probablyUsesSemicolons;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
     function createClassifier() {
-        var scanner = ts.createScanner(7 /* Latest */, /*skipTrivia*/ false);
+        var scanner = ts.createScanner(99 /* Latest */, /*skipTrivia*/ false);
         function getClassificationsForLine(text, lexState, syntacticClassifierAbsent) {
             return convertClassificationsToResult(getEncodedLexicalClassifications(text, lexState, syntacticClassifierAbsent), text);
         }
@@ -97174,13 +100179,13 @@ var ts;
             function handleToken() {
                 switch (token) {
                     case 42 /* SlashToken */:
-                    case 64 /* SlashEqualsToken */:
+                    case 65 /* SlashEqualsToken */:
                         if (!noRegexTable[lastNonTriviaToken] && scanner.reScanSlashToken() === 13 /* RegularExpressionLiteral */) {
                             token = 13 /* RegularExpressionLiteral */;
                         }
                         break;
                     case 28 /* LessThanToken */:
-                        if (lastNonTriviaToken === 72 /* Identifier */) {
+                        if (lastNonTriviaToken === 73 /* Identifier */) {
                             // Could be the start of something generic.  Keep track of that by bumping
                             // up the current count of generic contexts we may be in.
                             angleBracketStack++;
@@ -97193,16 +100198,16 @@ var ts;
                             angleBracketStack--;
                         }
                         break;
-                    case 120 /* AnyKeyword */:
-                    case 138 /* StringKeyword */:
-                    case 135 /* NumberKeyword */:
-                    case 123 /* BooleanKeyword */:
-                    case 139 /* SymbolKeyword */:
+                    case 121 /* AnyKeyword */:
+                    case 139 /* StringKeyword */:
+                    case 136 /* NumberKeyword */:
+                    case 124 /* BooleanKeyword */:
+                    case 140 /* SymbolKeyword */:
                         if (angleBracketStack > 0 && !syntacticClassifierAbsent) {
                             // If it looks like we're could be in something generic, don't classify this
                             // as a keyword.  We may just get overwritten by the syntactic classifier,
                             // causing a noisy experience for the user.
-                            token = 72 /* Identifier */;
+                            token = 73 /* Identifier */;
                         }
                         break;
                     case 15 /* TemplateHead */:
@@ -97241,14 +100246,14 @@ var ts;
                             break;
                         }
                         if (lastNonTriviaToken === 24 /* DotToken */) {
-                            token = 72 /* Identifier */;
+                            token = 73 /* Identifier */;
                         }
                         else if (ts.isKeyword(lastNonTriviaToken) && ts.isKeyword(token) && !canFollow(lastNonTriviaToken, token)) {
                             // We have two keywords in a row.  Only treat the second as a keyword if
                             // it's a sequence that could legally occur in the language.  Otherwise
                             // treat it as an identifier.  This way, if someone writes "private var"
                             // we recognize that 'var' is actually an identifier here.
-                            token = 72 /* Identifier */;
+                            token = 73 /* Identifier */;
                         }
                 }
             }
@@ -97262,19 +100267,19 @@ var ts;
     /// we have a series of divide operator. this list allows us to be more accurate by ruling out
     /// locations where a regexp cannot exist.
     var noRegexTable = ts.arrayToNumericMap([
-        72 /* Identifier */,
+        73 /* Identifier */,
         10 /* StringLiteral */,
         8 /* NumericLiteral */,
         9 /* BigIntLiteral */,
         13 /* RegularExpressionLiteral */,
-        100 /* ThisKeyword */,
+        101 /* ThisKeyword */,
         44 /* PlusPlusToken */,
         45 /* MinusMinusToken */,
         21 /* CloseParenToken */,
         23 /* CloseBracketToken */,
         19 /* CloseBraceToken */,
-        102 /* TrueKeyword */,
-        87 /* FalseKeyword */,
+        103 /* TrueKeyword */,
+        88 /* FalseKeyword */,
     ], function (token) { return token; }, function () { return true; });
     function getNewEndOfLineState(scanner, token, lastOnTemplateStack) {
         switch (token) {
@@ -97386,10 +100391,10 @@ var ts;
             return true;
         }
         switch (keyword2) {
-            case 126 /* GetKeyword */:
-            case 137 /* SetKeyword */:
-            case 124 /* ConstructorKeyword */:
-            case 116 /* StaticKeyword */:
+            case 127 /* GetKeyword */:
+            case 138 /* SetKeyword */:
+            case 125 /* ConstructorKeyword */:
+            case 117 /* StaticKeyword */:
                 return true; // Allow things like "public get", "public constructor" and "public static".
             default:
                 return false; // Any other keyword following "public" is actually an identifier, not a real keyword.
@@ -97434,9 +100439,9 @@ var ts;
             case 30 /* GreaterThanToken */:
             case 31 /* LessThanEqualsToken */:
             case 32 /* GreaterThanEqualsToken */:
-            case 94 /* InstanceOfKeyword */:
-            case 93 /* InKeyword */:
-            case 119 /* AsKeyword */:
+            case 95 /* InstanceOfKeyword */:
+            case 94 /* InKeyword */:
+            case 120 /* AsKeyword */:
             case 33 /* EqualsEqualsToken */:
             case 34 /* ExclamationEqualsToken */:
             case 35 /* EqualsEqualsEqualsToken */:
@@ -97446,18 +100451,18 @@ var ts;
             case 50 /* BarToken */:
             case 54 /* AmpersandAmpersandToken */:
             case 55 /* BarBarToken */:
-            case 70 /* BarEqualsToken */:
-            case 69 /* AmpersandEqualsToken */:
-            case 71 /* CaretEqualsToken */:
-            case 66 /* LessThanLessThanEqualsToken */:
-            case 67 /* GreaterThanGreaterThanEqualsToken */:
-            case 68 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
-            case 60 /* PlusEqualsToken */:
-            case 61 /* MinusEqualsToken */:
-            case 62 /* AsteriskEqualsToken */:
-            case 64 /* SlashEqualsToken */:
-            case 65 /* PercentEqualsToken */:
-            case 59 /* EqualsToken */:
+            case 71 /* BarEqualsToken */:
+            case 70 /* AmpersandEqualsToken */:
+            case 72 /* CaretEqualsToken */:
+            case 67 /* LessThanLessThanEqualsToken */:
+            case 68 /* GreaterThanGreaterThanEqualsToken */:
+            case 69 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
+            case 61 /* PlusEqualsToken */:
+            case 62 /* MinusEqualsToken */:
+            case 63 /* AsteriskEqualsToken */:
+            case 65 /* SlashEqualsToken */:
+            case 66 /* PercentEqualsToken */:
+            case 60 /* EqualsToken */:
             case 27 /* CommaToken */:
                 return true;
             default:
@@ -97484,7 +100489,7 @@ var ts;
         else if (isBinaryExpressionOperatorToken(token) || isPrefixUnaryExpressionOperatorToken(token)) {
             return 5 /* operator */;
         }
-        else if (token >= 18 /* FirstPunctuation */ && token <= 71 /* LastPunctuation */) {
+        else if (token >= 18 /* FirstPunctuation */ && token <= 72 /* LastPunctuation */) {
             return 10 /* punctuation */;
         }
         switch (token) {
@@ -97503,7 +100508,7 @@ var ts;
             case 5 /* WhitespaceTrivia */:
             case 4 /* NewLineTrivia */:
                 return 8 /* whiteSpace */;
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
             default:
                 if (ts.isTemplateLiteralKind(token)) {
                     return 6 /* stringLiteral */;
@@ -97528,10 +100533,10 @@ var ts;
         // That means we're calling back into the host around every 1.2k of the file we process.
         // Lib.d.ts has similar numbers.
         switch (kind) {
-            case 244 /* ModuleDeclaration */:
-            case 240 /* ClassDeclaration */:
-            case 241 /* InterfaceDeclaration */:
-            case 239 /* FunctionDeclaration */:
+            case 245 /* ModuleDeclaration */:
+            case 241 /* ClassDeclaration */:
+            case 242 /* InterfaceDeclaration */:
+            case 240 /* FunctionDeclaration */:
                 cancellationToken.throwIfCancellationRequested();
         }
     }
@@ -97651,8 +100656,8 @@ var ts;
         var spanStart = span.start;
         var spanLength = span.length;
         // Make a scanner we can get trivia from.
-        var triviaScanner = ts.createScanner(7 /* Latest */, /*skipTrivia*/ false, sourceFile.languageVariant, sourceFile.text);
-        var mergeConflictScanner = ts.createScanner(7 /* Latest */, /*skipTrivia*/ false, sourceFile.languageVariant, sourceFile.text);
+        var triviaScanner = ts.createScanner(99 /* Latest */, /*skipTrivia*/ false, sourceFile.languageVariant, sourceFile.text);
+        var mergeConflictScanner = ts.createScanner(99 /* Latest */, /*skipTrivia*/ false, sourceFile.languageVariant, sourceFile.text);
         var result = [];
         processElement(sourceFile);
         return { spans: result, endOfLineState: 0 /* None */ };
@@ -97744,18 +100749,18 @@ var ts;
                     pushClassification(tag.tagName.pos, tag.tagName.end - tag.tagName.pos, 18 /* docCommentTagName */); // e.g. "param"
                     pos = tag.tagName.end;
                     switch (tag.kind) {
-                        case 304 /* JSDocParameterTag */:
+                        case 306 /* JSDocParameterTag */:
                             processJSDocParameterTag(tag);
                             break;
-                        case 308 /* JSDocTemplateTag */:
+                        case 310 /* JSDocTemplateTag */:
                             processJSDocTemplateTag(tag);
                             pos = tag.end;
                             break;
-                        case 307 /* JSDocTypeTag */:
+                        case 309 /* JSDocTypeTag */:
                             processElement(tag.typeExpression);
                             pos = tag.end;
                             break;
-                        case 305 /* JSDocReturnTag */:
+                        case 307 /* JSDocReturnTag */:
                             processElement(tag.typeExpression);
                             pos = tag.end;
                             break;
@@ -97842,22 +100847,22 @@ var ts;
         }
         function tryClassifyJsxElementName(token) {
             switch (token.parent && token.parent.kind) {
-                case 262 /* JsxOpeningElement */:
+                case 263 /* JsxOpeningElement */:
                     if (token.parent.tagName === token) {
                         return 19 /* jsxOpenTagName */;
                     }
                     break;
-                case 263 /* JsxClosingElement */:
+                case 264 /* JsxClosingElement */:
                     if (token.parent.tagName === token) {
                         return 20 /* jsxCloseTagName */;
                     }
                     break;
-                case 261 /* JsxSelfClosingElement */:
+                case 262 /* JsxSelfClosingElement */:
                     if (token.parent.tagName === token) {
                         return 21 /* jsxSelfClosingTagName */;
                     }
                     break;
-                case 267 /* JsxAttribute */:
+                case 268 /* JsxAttribute */:
                     if (token.parent.name === token) {
                         return 22 /* jsxAttribute */;
                     }
@@ -97884,19 +100889,19 @@ var ts;
             if (ts.isPunctuation(tokenKind)) {
                 if (token) {
                     var parent = token.parent;
-                    if (tokenKind === 59 /* EqualsToken */) {
+                    if (tokenKind === 60 /* EqualsToken */) {
                         // the '=' in a variable declaration is special cased here.
-                        if (parent.kind === 237 /* VariableDeclaration */ ||
-                            parent.kind === 154 /* PropertyDeclaration */ ||
-                            parent.kind === 151 /* Parameter */ ||
-                            parent.kind === 267 /* JsxAttribute */) {
+                        if (parent.kind === 238 /* VariableDeclaration */ ||
+                            parent.kind === 155 /* PropertyDeclaration */ ||
+                            parent.kind === 152 /* Parameter */ ||
+                            parent.kind === 268 /* JsxAttribute */) {
                             return 5 /* operator */;
                         }
                     }
-                    if (parent.kind === 204 /* BinaryExpression */ ||
-                        parent.kind === 202 /* PrefixUnaryExpression */ ||
-                        parent.kind === 203 /* PostfixUnaryExpression */ ||
-                        parent.kind === 205 /* ConditionalExpression */) {
+                    if (parent.kind === 205 /* BinaryExpression */ ||
+                        parent.kind === 203 /* PrefixUnaryExpression */ ||
+                        parent.kind === 204 /* PostfixUnaryExpression */ ||
+                        parent.kind === 206 /* ConditionalExpression */) {
                         return 5 /* operator */;
                     }
                 }
@@ -97910,7 +100915,7 @@ var ts;
             }
             else if (tokenKind === 10 /* StringLiteral */) {
                 // TODO: GH#18217
-                return token.parent.kind === 267 /* JsxAttribute */ ? 24 /* jsxAttributeStringLiteralValue */ : 6 /* stringLiteral */;
+                return token.parent.kind === 268 /* JsxAttribute */ ? 24 /* jsxAttributeStringLiteralValue */ : 6 /* stringLiteral */;
             }
             else if (tokenKind === 13 /* RegularExpressionLiteral */) {
                 // TODO: we should get another classification type for these literals.
@@ -97923,35 +100928,35 @@ var ts;
             else if (tokenKind === 11 /* JsxText */) {
                 return 23 /* jsxText */;
             }
-            else if (tokenKind === 72 /* Identifier */) {
+            else if (tokenKind === 73 /* Identifier */) {
                 if (token) {
                     switch (token.parent.kind) {
-                        case 240 /* ClassDeclaration */:
+                        case 241 /* ClassDeclaration */:
                             if (token.parent.name === token) {
                                 return 11 /* className */;
                             }
                             return;
-                        case 150 /* TypeParameter */:
+                        case 151 /* TypeParameter */:
                             if (token.parent.name === token) {
                                 return 15 /* typeParameterName */;
                             }
                             return;
-                        case 241 /* InterfaceDeclaration */:
+                        case 242 /* InterfaceDeclaration */:
                             if (token.parent.name === token) {
                                 return 13 /* interfaceName */;
                             }
                             return;
-                        case 243 /* EnumDeclaration */:
+                        case 244 /* EnumDeclaration */:
                             if (token.parent.name === token) {
                                 return 12 /* enumName */;
                             }
                             return;
-                        case 244 /* ModuleDeclaration */:
+                        case 245 /* ModuleDeclaration */:
                             if (token.parent.name === token) {
                                 return 14 /* moduleName */;
                             }
                             return;
-                        case 151 /* Parameter */:
+                        case 152 /* Parameter */:
                             if (token.parent.name === token) {
                                 return ts.isThisIdentifier(token) ? 3 /* keyword */ : 17 /* parameterName */;
                             }
@@ -98008,7 +101013,7 @@ var ts;
                         return convertPathCompletions(completion.paths);
                     case 1 /* Properties */: {
                         var entries = [];
-                        Completions.getCompletionEntriesFromSymbols(completion.symbols, entries, sourceFile, sourceFile, checker, 7 /* ESNext */, log, 4 /* String */, preferences); // Target will not be used, so arbitrary
+                        Completions.getCompletionEntriesFromSymbols(completion.symbols, entries, sourceFile, sourceFile, checker, 99 /* ESNext */, log, 4 /* String */, preferences); // Target will not be used, so arbitrary
                         return { isGlobalCompletion: false, isMemberCompletion: true, isNewIdentifierLocation: completion.hasIndexSignature, entries: entries };
                     }
                     case 2 /* Types */: {
@@ -98047,7 +101052,7 @@ var ts;
                 var isNewIdentifierLocation = true; // The user may type in a path that doesn't yet exist, creating a "new identifier" with respect to the collection of identifiers the server is aware of.
                 var entries = pathCompletions.map(function (_a) {
                     var name = _a.name, kind = _a.kind, span = _a.span, extension = _a.extension;
-                    return ({ name: name, kind: kind, kindModifiers: kindModifiersFromExtension(extension), sortText: "0", replacementSpan: span });
+                    return ({ name: name, kind: kind, kindModifiers: kindModifiersFromExtension(extension), sortText: Completions.SortText.LocationPriority, replacementSpan: span });
                 });
                 return { isGlobalCompletion: isGlobalCompletion, isMemberCompletion: false, isNewIdentifierLocation: isNewIdentifierLocation, entries: entries };
             }
@@ -98074,11 +101079,11 @@ var ts;
             function getStringLiteralCompletionEntries(sourceFile, node, position, typeChecker, compilerOptions, host) {
                 var parent = node.parent;
                 switch (parent.kind) {
-                    case 182 /* LiteralType */:
+                    case 183 /* LiteralType */:
                         switch (parent.parent.kind) {
-                            case 164 /* TypeReference */:
+                            case 165 /* TypeReference */:
                                 return { kind: 2 /* Types */, types: getStringLiteralTypes(typeChecker.getTypeArgumentConstraint(parent)), isNewIdentifier: false };
-                            case 180 /* IndexedAccessType */:
+                            case 181 /* IndexedAccessType */:
                                 // Get all apparent property names
                                 // i.e. interface Foo {
                                 //          foo: string;
@@ -98086,9 +101091,9 @@ var ts;
                                 //      }
                                 //      let x: Foo["/*completion position*/"]
                                 return stringLiteralCompletionsFromProperties(typeChecker.getTypeFromTypeNode(parent.parent.objectType));
-                            case 183 /* ImportType */:
+                            case 184 /* ImportType */:
                                 return { kind: 0 /* Paths */, paths: getStringLiteralCompletionsFromModuleNames(sourceFile, node, compilerOptions, host, typeChecker) };
-                            case 173 /* UnionType */: {
+                            case 174 /* UnionType */: {
                                 if (!ts.isTypeReferenceNode(parent.parent.parent))
                                     return undefined;
                                 var alreadyUsedTypes_1 = getAlreadyUsedTypesInStringLiteralUnion(parent.parent, parent);
@@ -98098,7 +101103,7 @@ var ts;
                             default:
                                 return undefined;
                         }
-                    case 275 /* PropertyAssignment */:
+                    case 276 /* PropertyAssignment */:
                         if (ts.isObjectLiteralExpression(parent.parent) && parent.name === node) {
                             // Get quoted name of properties of the object literal expression
                             // i.e. interface ConfigFiles {
@@ -98115,7 +101120,7 @@ var ts;
                             return stringLiteralCompletionsFromProperties(typeChecker.getContextualType(parent.parent));
                         }
                         return fromContextualType();
-                    case 190 /* ElementAccessExpression */: {
+                    case 191 /* ElementAccessExpression */: {
                         var _a = parent, expression = _a.expression, argumentExpression = _a.argumentExpression;
                         if (node === argumentExpression) {
                             // Get all names of properties on the expression
@@ -98128,8 +101133,8 @@ var ts;
                         }
                         return undefined;
                     }
-                    case 191 /* CallExpression */:
-                    case 192 /* NewExpression */:
+                    case 192 /* CallExpression */:
+                    case 193 /* NewExpression */:
                         if (!ts.isRequireCall(parent, /*checkArgumentIsStringLiteralLike*/ false) && !ts.isImportCall(parent)) {
                             var argumentInfo = ts.SignatureHelp.getArgumentInfoForCompletions(node, position, sourceFile);
                             // Get string literal completions from specialized signatures of the target
@@ -98138,9 +101143,9 @@ var ts;
                             return argumentInfo ? getStringLiteralCompletionsFromSignature(argumentInfo, typeChecker) : fromContextualType();
                         }
                     // falls through (is `require("")` or `import("")`)
-                    case 249 /* ImportDeclaration */:
-                    case 255 /* ExportDeclaration */:
-                    case 259 /* ExternalModuleReference */:
+                    case 250 /* ImportDeclaration */:
+                    case 256 /* ExportDeclaration */:
+                    case 260 /* ExternalModuleReference */:
                         // Get all known external module names or complete a path to a module
                         // i.e. import * as ns from "/*completion position*/";
                         //      var y = import("/*completion position*/");
@@ -98587,7 +101592,7 @@ var ts;
                 var offset = index !== -1 ? index + 1 : 0;
                 // If the range is an identifier, span is unnecessary.
                 var length = text.length - offset;
-                return length === 0 || ts.isIdentifierText(text.substr(offset, length), 7 /* ESNext */) ? undefined : ts.createTextSpan(textStart + offset, length);
+                return length === 0 || ts.isIdentifierText(text.substr(offset, length), 99 /* ESNext */) ? undefined : ts.createTextSpan(textStart + offset, length);
             }
             // Returns true if the path is explicitly relative to the script (i.e. relative to . or ..)
             function isPathRelativeToScript(path) {
@@ -98650,6 +101655,14 @@ var ts;
 (function (ts) {
     var Completions;
     (function (Completions) {
+        var SortText;
+        (function (SortText) {
+            SortText["LocationPriority"] = "0";
+            SortText["SuggestedClassMembers"] = "1";
+            SortText["GlobalsOrKeywords"] = "2";
+            SortText["AutoImportSuggestions"] = "3";
+            SortText["JavascriptIdentifiers"] = "4";
+        })(SortText = Completions.SortText || (Completions.SortText = {}));
         var SymbolOriginInfoKind;
         (function (SymbolOriginInfoKind) {
             SymbolOriginInfoKind[SymbolOriginInfoKind["ThisType"] = 0] = "ThisType";
@@ -98671,7 +101684,9 @@ var ts;
             KeywordCompletionFilters[KeywordCompletionFilters["InterfaceElementKeywords"] = 3] = "InterfaceElementKeywords";
             KeywordCompletionFilters[KeywordCompletionFilters["ConstructorParameterKeywords"] = 4] = "ConstructorParameterKeywords";
             KeywordCompletionFilters[KeywordCompletionFilters["FunctionLikeBodyKeywords"] = 5] = "FunctionLikeBodyKeywords";
-            KeywordCompletionFilters[KeywordCompletionFilters["TypeKeywords"] = 6] = "TypeKeywords";
+            KeywordCompletionFilters[KeywordCompletionFilters["TypeAssertionKeywords"] = 6] = "TypeAssertionKeywords";
+            KeywordCompletionFilters[KeywordCompletionFilters["TypeKeywords"] = 7] = "TypeKeywords";
+            KeywordCompletionFilters[KeywordCompletionFilters["Last"] = 7] = "Last";
         })(KeywordCompletionFilters || (KeywordCompletionFilters = {}));
         var GlobalsSearch;
         (function (GlobalsSearch) {
@@ -98683,14 +101698,15 @@ var ts;
             var typeChecker = program.getTypeChecker();
             var compilerOptions = program.getCompilerOptions();
             var contextToken = ts.findPrecedingToken(position, sourceFile);
-            if (triggerCharacter && !isValidTrigger(sourceFile, triggerCharacter, contextToken, position))
+            if (triggerCharacter && !ts.isInString(sourceFile, position, contextToken) && !isValidTrigger(sourceFile, triggerCharacter, contextToken, position)) {
                 return undefined;
+            }
             var stringCompletions = Completions.StringCompletions.getStringLiteralCompletions(sourceFile, position, contextToken, typeChecker, compilerOptions, host, log, preferences);
             if (stringCompletions) {
                 return stringCompletions;
             }
             if (contextToken && ts.isBreakOrContinueStatement(contextToken.parent)
-                && (contextToken.kind === 73 /* BreakKeyword */ || contextToken.kind === 78 /* ContinueKeyword */ || contextToken.kind === 72 /* Identifier */)) {
+                && (contextToken.kind === 74 /* BreakKeyword */ || contextToken.kind === 79 /* ContinueKeyword */ || contextToken.kind === 73 /* Identifier */)) {
                 return getLabelCompletionAtPosition(contextToken.parent);
             }
             var completionData = getCompletionData(program, log, sourceFile, isUncheckedFile(sourceFile, compilerOptions), position, preferences, /*detailsEntryId*/ undefined);
@@ -98717,7 +101733,7 @@ var ts;
             return { isGlobalCompletion: false, isMemberCompletion: false, isNewIdentifierLocation: false, entries: entries };
         }
         function completionInfoFromData(sourceFile, typeChecker, compilerOptions, log, completionData, preferences) {
-            var symbols = completionData.symbols, completionKind = completionData.completionKind, isInSnippetScope = completionData.isInSnippetScope, isNewIdentifierLocation = completionData.isNewIdentifierLocation, location = completionData.location, propertyAccessToConvert = completionData.propertyAccessToConvert, keywordFilters = completionData.keywordFilters, literals = completionData.literals, symbolToOriginInfoMap = completionData.symbolToOriginInfoMap, recommendedCompletion = completionData.recommendedCompletion, isJsxInitializer = completionData.isJsxInitializer;
+            var symbols = completionData.symbols, completionKind = completionData.completionKind, isInSnippetScope = completionData.isInSnippetScope, isNewIdentifierLocation = completionData.isNewIdentifierLocation, location = completionData.location, propertyAccessToConvert = completionData.propertyAccessToConvert, keywordFilters = completionData.keywordFilters, literals = completionData.literals, symbolToOriginInfoMap = completionData.symbolToOriginInfoMap, recommendedCompletion = completionData.recommendedCompletion, isJsxInitializer = completionData.isJsxInitializer, insideJsDocTagTypeExpression = completionData.insideJsDocTagTypeExpression, symbolToSortTextMap = completionData.symbolToSortTextMap;
             if (location && location.parent && ts.isJsxClosingElement(location.parent)) {
                 // In the TypeScript JSX element, if such element is not defined. When users query for completion at closing tag,
                 // instead of simply giving unknown value, the completion will return the tag-name of an associated opening-element.
@@ -98731,24 +101747,24 @@ var ts;
                     name: tagName.getFullText(sourceFile) + (hasClosingAngleBracket ? "" : ">"),
                     kind: "class" /* classElement */,
                     kindModifiers: undefined,
-                    sortText: "0",
+                    sortText: SortText.LocationPriority,
                 };
                 return { isGlobalCompletion: false, isMemberCompletion: true, isNewIdentifierLocation: false, entries: [entry] };
             }
             var entries = [];
             if (isUncheckedFile(sourceFile, compilerOptions)) {
-                var uniqueNames = getCompletionEntriesFromSymbols(symbols, entries, location, sourceFile, typeChecker, compilerOptions.target, log, completionKind, preferences, propertyAccessToConvert, isJsxInitializer, recommendedCompletion, symbolToOriginInfoMap);
+                var uniqueNames = getCompletionEntriesFromSymbols(symbols, entries, location, sourceFile, typeChecker, compilerOptions.target, log, completionKind, preferences, propertyAccessToConvert, isJsxInitializer, recommendedCompletion, symbolToOriginInfoMap, symbolToSortTextMap);
                 getJSCompletionEntries(sourceFile, location.pos, uniqueNames, compilerOptions.target, entries); // TODO: GH#18217
             }
             else {
                 if (!isNewIdentifierLocation && (!symbols || symbols.length === 0) && keywordFilters === 0 /* None */) {
                     return undefined;
                 }
-                getCompletionEntriesFromSymbols(symbols, entries, location, sourceFile, typeChecker, compilerOptions.target, log, completionKind, preferences, propertyAccessToConvert, isJsxInitializer, recommendedCompletion, symbolToOriginInfoMap);
+                getCompletionEntriesFromSymbols(symbols, entries, location, sourceFile, typeChecker, compilerOptions.target, log, completionKind, preferences, propertyAccessToConvert, isJsxInitializer, recommendedCompletion, symbolToOriginInfoMap, symbolToSortTextMap);
             }
             if (keywordFilters !== 0 /* None */) {
                 var entryNames = ts.arrayToSet(entries, function (e) { return e.name; });
-                for (var _i = 0, _a = getKeywordCompletions(keywordFilters); _i < _a.length; _i++) {
+                for (var _i = 0, _a = getKeywordCompletions(keywordFilters, !insideJsDocTagTypeExpression && ts.isSourceFileJS(sourceFile)); _i < _a.length; _i++) {
                     var keywordEntry = _a[_i];
                     if (!entryNames.has(keywordEntry.name)) {
                         entries.push(keywordEntry);
@@ -98786,7 +101802,7 @@ var ts;
                         name: realName,
                         kind: "warning" /* warning */,
                         kindModifiers: "",
-                        sortText: "1"
+                        sortText: SortText.JavascriptIdentifiers
                     });
                 }
             });
@@ -98795,14 +101811,9 @@ var ts;
             return typeof literal === "object" ? ts.pseudoBigIntToString(literal) + "n" : JSON.stringify(literal);
         };
         function createCompletionEntryForLiteral(literal) {
-            return { name: completionNameForLiteral(literal), kind: "string" /* string */, kindModifiers: "" /* none */, sortText: "0" };
+            return { name: completionNameForLiteral(literal), kind: "string" /* string */, kindModifiers: "" /* none */, sortText: SortText.LocationPriority };
         }
-        function createCompletionEntry(symbol, location, sourceFile, typeChecker, target, kind, origin, recommendedCompletion, propertyAccessToConvert, isJsxInitializer, preferences) {
-            var info = getCompletionEntryDisplayNameForSymbol(symbol, target, origin, kind);
-            if (!info) {
-                return undefined;
-            }
-            var name = info.name, needsConvertPropertyAccess = info.needsConvertPropertyAccess;
+        function createCompletionEntry(symbol, sortText, location, sourceFile, typeChecker, name, needsConvertPropertyAccess, origin, recommendedCompletion, propertyAccessToConvert, isJsxInitializer, preferences) {
             var insertText;
             var replacementSpan;
             if (origin && origin.kind === 0 /* ThisType */) {
@@ -98839,7 +101850,7 @@ var ts;
                 name: name,
                 kind: ts.SymbolDisplay.getSymbolKind(typeChecker, symbol, location),
                 kindModifiers: ts.SymbolDisplay.getSymbolModifiers(symbol),
-                sortText: "0",
+                sortText: sortText,
                 source: getSourceFromOrigin(origin),
                 hasAction: trueOrUndefined(!!origin && originIsExport(origin)),
                 isRecommended: trueOrUndefined(isRecommendedCompletionMatch(symbol, recommendedCompletion, typeChecker)),
@@ -98857,7 +101868,7 @@ var ts;
         function getSourceFromOrigin(origin) {
             return origin && originIsExport(origin) ? ts.stripQuotes(origin.moduleSymbol.name) : undefined;
         }
-        function getCompletionEntriesFromSymbols(symbols, entries, location, sourceFile, typeChecker, target, log, kind, preferences, propertyAccessToConvert, isJsxInitializer, recommendedCompletion, symbolToOriginInfoMap) {
+        function getCompletionEntriesFromSymbols(symbols, entries, location, sourceFile, typeChecker, target, log, kind, preferences, propertyAccessToConvert, isJsxInitializer, recommendedCompletion, symbolToOriginInfoMap, symbolToSortTextMap) {
             var start = ts.timestamp();
             // Tracks unique names.
             // We don't set this for global variables or completions from external module exports, because we can have multiple of those.
@@ -98867,14 +101878,18 @@ var ts;
             for (var _i = 0, symbols_1 = symbols; _i < symbols_1.length; _i++) {
                 var symbol = symbols_1[_i];
                 var origin = symbolToOriginInfoMap ? symbolToOriginInfoMap[ts.getSymbolId(symbol)] : undefined;
-                var entry = createCompletionEntry(symbol, location, sourceFile, typeChecker, target, kind, origin, recommendedCompletion, propertyAccessToConvert, isJsxInitializer, preferences);
-                if (!entry) {
+                var info = getCompletionEntryDisplayNameForSymbol(symbol, target, origin, kind);
+                if (!info) {
                     continue;
                 }
-                var name = entry.name;
+                var name = info.name, needsConvertPropertyAccess = info.needsConvertPropertyAccess;
                 if (uniques.has(name)) {
                     continue;
                 }
+                var entry = createCompletionEntry(symbol, symbolToSortTextMap && symbolToSortTextMap[ts.getSymbolId(symbol)] || SortText.LocationPriority, location, sourceFile, typeChecker, name, needsConvertPropertyAccess, origin, recommendedCompletion, propertyAccessToConvert, isJsxInitializer, preferences);
+                if (!entry) {
+                    continue;
+                }
                 // Latter case tests whether this is a global variable.
                 if (!origin && !(symbol.parent === undefined && !ts.some(symbol.declarations, function (d) { return d.getSourceFile() === location.getSourceFile(); }))) { // TODO: GH#18217
                     uniques.set(name, true);
@@ -98907,7 +101922,7 @@ var ts;
                             name: name,
                             kindModifiers: "" /* none */,
                             kind: "label" /* label */,
-                            sortText: "0"
+                            sortText: SortText.LocationPriority
                         });
                     }
                 }
@@ -99047,25 +102062,25 @@ var ts;
         function getContextualType(previousToken, position, sourceFile, checker) {
             var parent = previousToken.parent;
             switch (previousToken.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return ts.getContextualTypeFromParent(previousToken, checker);
-                case 59 /* EqualsToken */:
+                case 60 /* EqualsToken */:
                     switch (parent.kind) {
-                        case 237 /* VariableDeclaration */:
+                        case 238 /* VariableDeclaration */:
                             return checker.getContextualType(parent.initializer); // TODO: GH#18217
-                        case 204 /* BinaryExpression */:
+                        case 205 /* BinaryExpression */:
                             return checker.getTypeAtLocation(parent.left);
-                        case 267 /* JsxAttribute */:
+                        case 268 /* JsxAttribute */:
                             return checker.getContextualTypeForJsxAttribute(parent);
                         default:
                             return undefined;
                     }
-                case 95 /* NewKeyword */:
+                case 96 /* NewKeyword */:
                     return checker.getContextualType(parent);
-                case 74 /* CaseKeyword */:
+                case 75 /* CaseKeyword */:
                     return ts.getSwitchedType(ts.cast(parent, ts.isCaseClause), checker);
                 case 18 /* OpenBraceToken */:
-                    return ts.isJsxExpression(parent) && parent.parent.kind !== 260 /* JsxElement */ ? checker.getContextualTypeForJsxAttribute(parent.parent) : undefined;
+                    return ts.isJsxExpression(parent) && parent.parent.kind !== 261 /* JsxElement */ ? checker.getContextualTypeForJsxAttribute(parent.parent) : undefined;
                 default:
                     var argInfo = ts.SignatureHelp.getArgumentInfoForCompletions(previousToken, position, sourceFile);
                     return argInfo
@@ -99084,7 +102099,7 @@ var ts;
             return symbol.parent && (isModuleSymbol(symbol.parent) ? symbol : getFirstSymbolInChain(symbol.parent, enclosingDeclaration, checker));
         }
         function isModuleSymbol(symbol) {
-            return symbol.declarations.some(function (d) { return d.kind === 284 /* SourceFile */; });
+            return symbol.declarations.some(function (d) { return d.kind === 285 /* SourceFile */; });
         }
         function getCompletionData(program, log, sourceFile, isUncheckedFile, position, preferences, detailsEntryId) {
             var typeChecker = program.getTypeChecker();
@@ -99135,11 +102150,11 @@ var ts;
                     if (tag.tagName.pos <= position && position <= tag.tagName.end) {
                         return { kind: 1 /* JsDocTagName */ };
                     }
-                    if (isTagWithTypeExpression(tag) && tag.typeExpression && tag.typeExpression.kind === 288 /* JSDocTypeExpression */) {
+                    if (isTagWithTypeExpression(tag) && tag.typeExpression && tag.typeExpression.kind === 289 /* JSDocTypeExpression */) {
                         currentToken = ts.getTokenAtPosition(sourceFile, position);
                         if (!currentToken ||
                             (!ts.isDeclarationName(currentToken) &&
-                                (currentToken.parent.kind !== 310 /* JSDocPropertyTag */ ||
+                                (currentToken.parent.kind !== 312 /* JSDocPropertyTag */ ||
                                     currentToken.parent.name !== currentToken))) {
                             // Use as type location if inside tag's type expression
                             insideJsDocTagTypeExpression = isCurrentlyEditingNode(tag.typeExpression);
@@ -99189,18 +102204,26 @@ var ts;
                 if (contextToken.kind === 24 /* DotToken */) {
                     isRightOfDot = true;
                     switch (parent.kind) {
-                        case 189 /* PropertyAccessExpression */:
+                        case 190 /* PropertyAccessExpression */:
                             propertyAccessToConvert = parent;
                             node = propertyAccessToConvert.expression;
+                            if (node.end === contextToken.pos &&
+                                ts.isCallExpression(node) &&
+                                node.getChildCount(sourceFile) &&
+                                ts.last(node.getChildren(sourceFile)).kind !== 21 /* CloseParenToken */) {
+                                // This is likely dot from incorrectly parsed call expression and user is starting to write spread
+                                // eg: Math.min(./**/)
+                                return undefined;
+                            }
                             break;
-                        case 148 /* QualifiedName */:
+                        case 149 /* QualifiedName */:
                             node = parent.left;
                             break;
-                        case 244 /* ModuleDeclaration */:
+                        case 245 /* ModuleDeclaration */:
                             node = parent.name;
                             break;
-                        case 183 /* ImportType */:
-                        case 214 /* MetaProperty */:
+                        case 184 /* ImportType */:
+                        case 215 /* MetaProperty */:
                             node = parent;
                             break;
                         default:
@@ -99213,7 +102236,7 @@ var ts;
                     // <UI.Test /* completion position */ />
                     // If the tagname is a property access expression, we will then walk up to the top most of property access expression.
                     // Then, try to get a JSX container and its associated attributes type.
-                    if (parent && parent.kind === 189 /* PropertyAccessExpression */) {
+                    if (parent && parent.kind === 190 /* PropertyAccessExpression */) {
                         contextToken = parent;
                         parent = parent.parent;
                     }
@@ -99221,48 +102244,48 @@ var ts;
                     if (currentToken.parent === location) {
                         switch (currentToken.kind) {
                             case 30 /* GreaterThanToken */:
-                                if (currentToken.parent.kind === 260 /* JsxElement */ || currentToken.parent.kind === 262 /* JsxOpeningElement */) {
+                                if (currentToken.parent.kind === 261 /* JsxElement */ || currentToken.parent.kind === 263 /* JsxOpeningElement */) {
                                     location = currentToken;
                                 }
                                 break;
                             case 42 /* SlashToken */:
-                                if (currentToken.parent.kind === 261 /* JsxSelfClosingElement */) {
+                                if (currentToken.parent.kind === 262 /* JsxSelfClosingElement */) {
                                     location = currentToken;
                                 }
                                 break;
                         }
                     }
                     switch (parent.kind) {
-                        case 263 /* JsxClosingElement */:
+                        case 264 /* JsxClosingElement */:
                             if (contextToken.kind === 42 /* SlashToken */) {
                                 isStartingCloseTag = true;
                                 location = contextToken;
                             }
                             break;
-                        case 204 /* BinaryExpression */:
+                        case 205 /* BinaryExpression */:
                             if (!binaryExpressionMayBeOpenTag(parent)) {
                                 break;
                             }
                         // falls through
-                        case 261 /* JsxSelfClosingElement */:
-                        case 260 /* JsxElement */:
-                        case 262 /* JsxOpeningElement */:
+                        case 262 /* JsxSelfClosingElement */:
+                        case 261 /* JsxElement */:
+                        case 263 /* JsxOpeningElement */:
                             if (contextToken.kind === 28 /* LessThanToken */) {
                                 isRightOfOpenTag = true;
                                 location = contextToken;
                             }
                             break;
-                        case 267 /* JsxAttribute */:
+                        case 268 /* JsxAttribute */:
                             switch (previousToken.kind) {
-                                case 59 /* EqualsToken */:
+                                case 60 /* EqualsToken */:
                                     isJsxInitializer = true;
                                     break;
-                                case 72 /* Identifier */:
+                                case 73 /* Identifier */:
                                     // For `<div x=[|f/**/|]`, `parent` will be `x` and `previousToken.parent` will be `f` (which is its own JsxAttribute)
                                     // Note for `<div someBool f>` we don't want to treat this as a jsx inializer, instead it's the attribute name.
                                     if (parent !== previousToken.parent &&
                                         !parent.initializer &&
-                                        ts.findChildOfKind(parent, 59 /* EqualsToken */, sourceFile)) {
+                                        ts.findChildOfKind(parent, 60 /* EqualsToken */, sourceFile)) {
                                         isJsxInitializer = previousToken;
                                     }
                             }
@@ -99276,6 +102299,7 @@ var ts;
             var keywordFilters = 0 /* None */;
             var symbols = [];
             var symbolToOriginInfoMap = [];
+            var symbolToSortTextMap = [];
             if (isRightOfDot) {
                 getTypeScriptMemberSymbols();
             }
@@ -99307,14 +102331,30 @@ var ts;
             var contextualType = previousToken && getContextualType(previousToken, position, sourceFile, typeChecker);
             var literals = ts.mapDefined(contextualType && (contextualType.isUnion() ? contextualType.types : [contextualType]), function (t) { return t.isLiteral() ? t.value : undefined; });
             var recommendedCompletion = previousToken && contextualType && getRecommendedCompletion(previousToken, contextualType, typeChecker);
-            return { kind: 0 /* Data */, symbols: symbols, completionKind: completionKind, isInSnippetScope: isInSnippetScope, propertyAccessToConvert: propertyAccessToConvert, isNewIdentifierLocation: isNewIdentifierLocation, location: location, keywordFilters: keywordFilters, literals: literals, symbolToOriginInfoMap: symbolToOriginInfoMap, recommendedCompletion: recommendedCompletion, previousToken: previousToken, isJsxInitializer: isJsxInitializer };
+            return {
+                kind: 0 /* Data */,
+                symbols: symbols,
+                completionKind: completionKind,
+                isInSnippetScope: isInSnippetScope,
+                propertyAccessToConvert: propertyAccessToConvert,
+                isNewIdentifierLocation: isNewIdentifierLocation,
+                location: location,
+                keywordFilters: keywordFilters,
+                literals: literals,
+                symbolToOriginInfoMap: symbolToOriginInfoMap,
+                recommendedCompletion: recommendedCompletion,
+                previousToken: previousToken,
+                isJsxInitializer: isJsxInitializer,
+                insideJsDocTagTypeExpression: insideJsDocTagTypeExpression,
+                symbolToSortTextMap: symbolToSortTextMap
+            };
             function isTagWithTypeExpression(tag) {
                 switch (tag.kind) {
-                    case 304 /* JSDocParameterTag */:
-                    case 310 /* JSDocPropertyTag */:
-                    case 305 /* JSDocReturnTag */:
-                    case 307 /* JSDocTypeTag */:
-                    case 309 /* JSDocTypedefTag */:
+                    case 306 /* JSDocParameterTag */:
+                    case 312 /* JSDocPropertyTag */:
+                    case 307 /* JSDocReturnTag */:
+                    case 309 /* JSDocTypeTag */:
+                    case 311 /* JSDocTypedefTag */:
                         return true;
                     default:
                         return false;
@@ -99323,11 +102363,13 @@ var ts;
             function getTypeScriptMemberSymbols() {
                 // Right of dot member completion list
                 completionKind = 2 /* PropertyAccess */;
-                // Since this is qualified name check its a type node location
+                // Since this is qualified name check it's a type node location
                 var isImportType = ts.isLiteralImportTypeNode(node);
-                var isTypeLocation = insideJsDocTagTypeExpression || (isImportType && !node.isTypeOf) || ts.isPartOfTypeNode(node.parent);
+                var isTypeLocation = insideJsDocTagTypeExpression
+                    || (isImportType && !node.isTypeOf)
+                    || ts.isPartOfTypeNode(node.parent)
+                    || ts.isPossiblyTypeArgumentPosition(contextToken, sourceFile, typeChecker);
                 var isRhsOfImportDeclaration = ts.isInRightSideOfInternalImportEqualsDeclaration(node);
-                var allowTypeOrValue = isRhsOfImportDeclaration || (!isTypeLocation && ts.isPossiblyTypeArgumentPosition(contextToken, sourceFile, typeChecker));
                 if (ts.isEntityName(node) || isImportType) {
                     var isNamespaceName = ts.isModuleDeclaration(node.parent);
                     if (isNamespaceName)
@@ -99343,7 +102385,7 @@ var ts;
                             var isValidAccess = isNamespaceName
                                 // At `namespace N.M/**/`, if this is the only declaration of `M`, don't include `M` as a completion.
                                 ? function (symbol) { return !!(symbol.flags & 1920 /* Namespace */) && !symbol.declarations.every(function (d) { return d.parent === node.parent; }); }
-                                : allowTypeOrValue ?
+                                : isRhsOfImportDeclaration ?
                                     // Any kind is allowed when dotting off namespace in internal import equals declaration
                                     function (symbol) { return isValidTypeAccess_1(symbol) || isValidValueAccess_1(symbol); } :
                                     isTypeLocation ? isValidTypeAccess_1 : isValidValueAccess_1;
@@ -99354,15 +102396,17 @@ var ts;
                                 }
                             }
                             // If the module is merged with a value, we must get the type of the class and add its propertes (for inherited static methods).
-                            if (!isTypeLocation && symbol.declarations.some(function (d) { return d.kind !== 284 /* SourceFile */ && d.kind !== 244 /* ModuleDeclaration */ && d.kind !== 243 /* EnumDeclaration */; })) {
+                            if (!isTypeLocation &&
+                                symbol.declarations &&
+                                symbol.declarations.some(function (d) { return d.kind !== 285 /* SourceFile */ && d.kind !== 245 /* ModuleDeclaration */ && d.kind !== 244 /* EnumDeclaration */; })) {
                                 addTypeProperties(typeChecker.getTypeOfSymbolAtLocation(symbol, node));
                             }
                             return;
                         }
                     }
                 }
-                if (ts.isMetaProperty(node) && (node.keywordToken === 95 /* NewKeyword */ || node.keywordToken === 92 /* ImportKeyword */)) {
-                    var completion = (node.keywordToken === 95 /* NewKeyword */) ? "target" : "meta";
+                if (ts.isMetaProperty(node) && (node.keywordToken === 96 /* NewKeyword */ || node.keywordToken === 93 /* ImportKeyword */)) {
+                    var completion = (node.keywordToken === 96 /* NewKeyword */) ? "target" : "meta";
                     symbols.push(typeChecker.createSymbol(4 /* Property */, ts.escapeLeadingUnderscores(completion)));
                     return;
                 }
@@ -99383,7 +102427,7 @@ var ts;
                 else {
                     for (var _i = 0, _a = type.getApparentProperties(); _i < _a.length; _i++) {
                         var symbol = _a[_i];
-                        if (typeChecker.isValidPropertyAccessForCompletions(node.kind === 183 /* ImportType */ ? node : node.parent, type, symbol)) {
+                        if (typeChecker.isValidPropertyAccessForCompletions(node.kind === 184 /* ImportType */ ? node : node.parent, type, symbol)) {
                             addPropertySymbol(symbol);
                         }
                     }
@@ -99405,6 +102449,9 @@ var ts;
                         symbolToOriginInfoMap[ts.getSymbolId(firstAccessibleSymbol)] =
                             !moduleSymbol || !ts.isExternalModuleSymbol(moduleSymbol) ? { kind: 1 /* SymbolMemberNoExport */ } : { kind: 2 /* SymbolMemberExport */, moduleSymbol: moduleSymbol, isDefaultExport: false };
                     }
+                    else if (preferences.includeCompletionsWithInsertText) {
+                        symbols.push(symbol);
+                    }
                 }
                 else {
                     symbols.push(symbol);
@@ -99486,14 +102533,22 @@ var ts;
                 var isTypeOnly = isTypeOnlyCompletion();
                 var symbolMeanings = (isTypeOnly ? 0 /* None */ : 67220415 /* Value */) | 67897832 /* Type */ | 1920 /* Namespace */ | 2097152 /* Alias */;
                 symbols = ts.Debug.assertEachDefined(typeChecker.getSymbolsInScope(scopeNode, symbolMeanings), "getSymbolsInScope() should all be defined");
+                for (var _i = 0, symbols_2 = symbols; _i < symbols_2.length; _i++) {
+                    var symbol = symbols_2[_i];
+                    if (!typeChecker.isArgumentsSymbol(symbol) &&
+                        !ts.some(symbol.declarations, function (d) { return d.getSourceFile() === sourceFile; })) {
+                        symbolToSortTextMap[ts.getSymbolId(symbol)] = SortText.GlobalsOrKeywords;
+                    }
+                }
                 // Need to insert 'this.' before properties of `this` type, so only do that if `includeInsertTextCompletions`
-                if (preferences.includeCompletionsWithInsertText && scopeNode.kind !== 284 /* SourceFile */) {
+                if (preferences.includeCompletionsWithInsertText && scopeNode.kind !== 285 /* SourceFile */) {
                     var thisType = typeChecker.tryGetThisTypeAt(scopeNode, /*includeGlobalThis*/ false);
                     if (thisType) {
-                        for (var _i = 0, _a = getPropertiesForCompletion(thisType, typeChecker); _i < _a.length; _i++) {
-                            var symbol = _a[_i];
+                        for (var _a = 0, _b = getPropertiesForCompletion(thisType, typeChecker); _a < _b.length; _a++) {
+                            var symbol = _b[_a];
                             symbolToOriginInfoMap[ts.getSymbolId(symbol)] = { kind: 0 /* ThisType */ };
                             symbols.push(symbol);
+                            symbolToSortTextMap[ts.getSymbolId(symbol)] = SortText.SuggestedClassMembers;
                         }
                     }
                 }
@@ -99520,10 +102575,10 @@ var ts;
             }
             function isSnippetScope(scopeNode) {
                 switch (scopeNode.kind) {
-                    case 284 /* SourceFile */:
-                    case 206 /* TemplateExpression */:
-                    case 270 /* JsxExpression */:
-                    case 218 /* Block */:
+                    case 285 /* SourceFile */:
+                    case 207 /* TemplateExpression */:
+                    case 271 /* JsxExpression */:
+                    case 219 /* Block */:
                         return true;
                     default:
                         return ts.isStatement(scopeNode);
@@ -99531,9 +102586,11 @@ var ts;
             }
             function filterGlobalCompletion(symbols) {
                 var isTypeOnly = isTypeOnlyCompletion();
-                var allowTypes = isTypeOnly || !isContextTokenValueLocation(contextToken) && ts.isPossiblyTypeArgumentPosition(contextToken, sourceFile, typeChecker);
-                if (isTypeOnly)
-                    keywordFilters = 6 /* TypeKeywords */;
+                if (isTypeOnly) {
+                    keywordFilters = isTypeAssertion()
+                        ? 6 /* TypeAssertionKeywords */
+                        : 7 /* TypeKeywords */;
+                }
                 ts.filterMutate(symbols, function (symbol) {
                     if (!ts.isSourceFile(location)) {
                         // export = /**/ here we want to get all meanings, so any symbol is ok
@@ -99545,40 +102602,49 @@ var ts;
                         if (ts.isInRightSideOfInternalImportEqualsDeclaration(location)) {
                             return !!(symbol.flags & 1920 /* Namespace */);
                         }
-                        if (allowTypes) {
-                            // Its a type, but you can reach it by namespace.type as well
-                            var symbolAllowedAsType = symbolCanBeReferencedAtTypeLocation(symbol);
-                            if (symbolAllowedAsType || isTypeOnly) {
-                                return symbolAllowedAsType;
-                            }
+                        if (isTypeOnly) {
+                            // It's a type, but you can reach it by namespace.type as well
+                            return symbolCanBeReferencedAtTypeLocation(symbol);
                         }
                     }
                     // expressions are value space (which includes the value namespaces)
                     return !!(ts.getCombinedLocalAndExportSymbolFlags(symbol) & 67220415 /* Value */);
                 });
             }
+            function isTypeAssertion() {
+                return ts.isAssertionExpression(contextToken.parent);
+            }
             function isTypeOnlyCompletion() {
-                return insideJsDocTagTypeExpression || !isContextTokenValueLocation(contextToken) && (ts.isPartOfTypeNode(location) || isContextTokenTypeLocation(contextToken));
+                return insideJsDocTagTypeExpression
+                    || !isContextTokenValueLocation(contextToken) &&
+                        (ts.isPossiblyTypeArgumentPosition(contextToken, sourceFile, typeChecker)
+                            || ts.isPartOfTypeNode(location)
+                            || isContextTokenTypeLocation(contextToken));
             }
             function isContextTokenValueLocation(contextToken) {
                 return contextToken &&
-                    contextToken.kind === 104 /* TypeOfKeyword */ &&
-                    (contextToken.parent.kind === 167 /* TypeQuery */ || ts.isTypeOfExpression(contextToken.parent));
+                    contextToken.kind === 105 /* TypeOfKeyword */ &&
+                    (contextToken.parent.kind === 168 /* TypeQuery */ || ts.isTypeOfExpression(contextToken.parent));
             }
             function isContextTokenTypeLocation(contextToken) {
                 if (contextToken) {
                     var parentKind = contextToken.parent.kind;
                     switch (contextToken.kind) {
                         case 57 /* ColonToken */:
-                            return parentKind === 154 /* PropertyDeclaration */ ||
-                                parentKind === 153 /* PropertySignature */ ||
-                                parentKind === 151 /* Parameter */ ||
-                                parentKind === 237 /* VariableDeclaration */ ||
+                            return parentKind === 155 /* PropertyDeclaration */ ||
+                                parentKind === 154 /* PropertySignature */ ||
+                                parentKind === 152 /* Parameter */ ||
+                                parentKind === 238 /* VariableDeclaration */ ||
                                 ts.isFunctionLikeKind(parentKind);
-                        case 59 /* EqualsToken */:
-                            return parentKind === 242 /* TypeAliasDeclaration */;
-                        case 119 /* AsKeyword */:
-                            return parentKind === 212 /* AsExpression */;
+                        case 60 /* EqualsToken */:
+                            return parentKind === 243 /* TypeAliasDeclaration */;
+                        case 120 /* AsKeyword */:
+                            return parentKind === 213 /* AsExpression */;
+                        case 28 /* LessThanToken */:
+                            return parentKind === 165 /* TypeReference */ ||
+                                parentKind === 195 /* TypeAssertionExpression */;
+                        case 87 /* ExtendsKeyword */:
+                            return parentKind === 151 /* TypeParameter */;
                     }
                 }
                 return false;
@@ -99610,6 +102676,7 @@ var ts;
                         // So in `declare namespace foo {} declare module "foo" { export = foo; }`, there will just be the global completion for `foo`.
                         ts.some(resolvedModuleSymbol.declarations, function (d) { return !!d.getSourceFile().externalModuleIndicator; })) {
                         symbols.push(resolvedModuleSymbol);
+                        symbolToSortTextMap[ts.getSymbolId(resolvedModuleSymbol)] = SortText.AutoImportSuggestions;
                         symbolToOriginInfoMap[ts.getSymbolId(resolvedModuleSymbol)] = { kind: 3 /* Export */, moduleSymbol: moduleSymbol, isDefaultExport: false };
                     }
                     for (var _i = 0, _a = typeChecker.getExportsOfModule(moduleSymbol); _i < _a.length; _i++) {
@@ -99634,6 +102701,7 @@ var ts;
                         var origin = { kind: 3 /* Export */, moduleSymbol: moduleSymbol, isDefaultExport: isDefaultExport };
                         if (detailsEntryId || stringContainsCharactersInOrder(getSymbolName(symbol, origin, target).toLowerCase(), tokenTextLowerCase)) {
                             symbols.push(symbol);
+                            symbolToSortTextMap[ts.getSymbolId(symbol)] = SortText.AutoImportSuggestions;
                             symbolToOriginInfoMap[ts.getSymbolId(symbol)] = origin;
                         }
                     }
@@ -99685,11 +102753,11 @@ var ts;
                     return true;
                 }
                 if (contextToken.kind === 30 /* GreaterThanToken */ && contextToken.parent) {
-                    if (contextToken.parent.kind === 262 /* JsxOpeningElement */) {
+                    if (contextToken.parent.kind === 263 /* JsxOpeningElement */) {
                         return true;
                     }
-                    if (contextToken.parent.kind === 263 /* JsxClosingElement */ || contextToken.parent.kind === 261 /* JsxSelfClosingElement */) {
-                        return !!contextToken.parent.parent && contextToken.parent.parent.kind === 260 /* JsxElement */;
+                    if (contextToken.parent.kind === 264 /* JsxClosingElement */ || contextToken.parent.kind === 262 /* JsxSelfClosingElement */) {
+                        return !!contextToken.parent.parent && contextToken.parent.parent.kind === 261 /* JsxElement */;
                     }
                 }
                 return false;
@@ -99700,40 +102768,40 @@ var ts;
                     // Previous token may have been a keyword that was converted to an identifier.
                     switch (keywordForNode(previousToken)) {
                         case 27 /* CommaToken */:
-                            return containingNodeKind === 191 /* CallExpression */ // func( a, |
-                                || containingNodeKind === 157 /* Constructor */ // constructor( a, |   /* public, protected, private keywords are allowed here, so show completion */
-                                || containingNodeKind === 192 /* NewExpression */ // new C(a, |
-                                || containingNodeKind === 187 /* ArrayLiteralExpression */ // [a, |
-                                || containingNodeKind === 204 /* BinaryExpression */ // const x = (a, |
-                                || containingNodeKind === 165 /* FunctionType */; // var x: (s: string, list|
+                            return containingNodeKind === 192 /* CallExpression */ // func( a, |
+                                || containingNodeKind === 158 /* Constructor */ // constructor( a, |   /* public, protected, private keywords are allowed here, so show completion */
+                                || containingNodeKind === 193 /* NewExpression */ // new C(a, |
+                                || containingNodeKind === 188 /* ArrayLiteralExpression */ // [a, |
+                                || containingNodeKind === 205 /* BinaryExpression */ // const x = (a, |
+                                || containingNodeKind === 166 /* FunctionType */; // var x: (s: string, list|
                         case 20 /* OpenParenToken */:
-                            return containingNodeKind === 191 /* CallExpression */ // func( |
-                                || containingNodeKind === 157 /* Constructor */ // constructor( |
-                                || containingNodeKind === 192 /* NewExpression */ // new C(a|
-                                || containingNodeKind === 195 /* ParenthesizedExpression */ // const x = (a|
-                                || containingNodeKind === 177 /* ParenthesizedType */; // function F(pred: (a| /* this can become an arrow function, where 'a' is the argument */
+                            return containingNodeKind === 192 /* CallExpression */ // func( |
+                                || containingNodeKind === 158 /* Constructor */ // constructor( |
+                                || containingNodeKind === 193 /* NewExpression */ // new C(a|
+                                || containingNodeKind === 196 /* ParenthesizedExpression */ // const x = (a|
+                                || containingNodeKind === 178 /* ParenthesizedType */; // function F(pred: (a| /* this can become an arrow function, where 'a' is the argument */
                         case 22 /* OpenBracketToken */:
-                            return containingNodeKind === 187 /* ArrayLiteralExpression */ // [ |
-                                || containingNodeKind === 162 /* IndexSignature */ // [ | : string ]
-                                || containingNodeKind === 149 /* ComputedPropertyName */; // [ |    /* this can become an index signature */
-                        case 130 /* ModuleKeyword */: // module |
-                        case 131 /* NamespaceKeyword */: // namespace |
+                            return containingNodeKind === 188 /* ArrayLiteralExpression */ // [ |
+                                || containingNodeKind === 163 /* IndexSignature */ // [ | : string ]
+                                || containingNodeKind === 150 /* ComputedPropertyName */; // [ |    /* this can become an index signature */
+                        case 131 /* ModuleKeyword */: // module |
+                        case 132 /* NamespaceKeyword */: // namespace |
                             return true;
                         case 24 /* DotToken */:
-                            return containingNodeKind === 244 /* ModuleDeclaration */; // module A.|
+                            return containingNodeKind === 245 /* ModuleDeclaration */; // module A.|
                         case 18 /* OpenBraceToken */:
-                            return containingNodeKind === 240 /* ClassDeclaration */; // class A{ |
-                        case 59 /* EqualsToken */:
-                            return containingNodeKind === 237 /* VariableDeclaration */ // const x = a|
-                                || containingNodeKind === 204 /* BinaryExpression */; // x = a|
+                            return containingNodeKind === 241 /* ClassDeclaration */; // class A{ |
+                        case 60 /* EqualsToken */:
+                            return containingNodeKind === 238 /* VariableDeclaration */ // const x = a|
+                                || containingNodeKind === 205 /* BinaryExpression */; // x = a|
                         case 15 /* TemplateHead */:
-                            return containingNodeKind === 206 /* TemplateExpression */; // `aa ${|
+                            return containingNodeKind === 207 /* TemplateExpression */; // `aa ${|
                         case 16 /* TemplateMiddle */:
-                            return containingNodeKind === 216 /* TemplateSpan */; // `aa ${10} dd ${|
-                        case 115 /* PublicKeyword */:
-                        case 113 /* PrivateKeyword */:
-                        case 114 /* ProtectedKeyword */:
-                            return containingNodeKind === 154 /* PropertyDeclaration */; // class A{ public |
+                            return containingNodeKind === 217 /* TemplateSpan */; // `aa ${10} dd ${|
+                        case 116 /* PublicKeyword */:
+                        case 114 /* PrivateKeyword */:
+                        case 115 /* ProtectedKeyword */:
+                            return containingNodeKind === 155 /* PropertyDeclaration */; // class A{ public |
                     }
                 }
                 return false;
@@ -99760,7 +102828,7 @@ var ts;
                 completionKind = 0 /* ObjectPropertyDeclaration */;
                 var typeMembers;
                 var existingMembers;
-                if (objectLikeContainer.kind === 188 /* ObjectLiteralExpression */) {
+                if (objectLikeContainer.kind === 189 /* ObjectLiteralExpression */) {
                     var typeForObject = typeChecker.getContextualType(objectLikeContainer);
                     if (!typeForObject)
                         return 2 /* Fail */;
@@ -99769,7 +102837,7 @@ var ts;
                     existingMembers = objectLikeContainer.properties;
                 }
                 else {
-                    ts.Debug.assert(objectLikeContainer.kind === 184 /* ObjectBindingPattern */);
+                    ts.Debug.assert(objectLikeContainer.kind === 185 /* ObjectBindingPattern */);
                     // We are *only* completing on properties from the type being destructured.
                     isNewIdentifierLocation = false;
                     var rootDeclaration = ts.getRootDeclaration(objectLikeContainer.parent);
@@ -99780,12 +102848,12 @@ var ts;
                     // through type declaration or inference.
                     // Also proceed if rootDeclaration is a parameter and if its containing function expression/arrow function is contextually typed -
                     // type of parameter will flow in from the contextual type of the function
-                    var canGetType = ts.hasInitializer(rootDeclaration) || ts.hasType(rootDeclaration) || rootDeclaration.parent.parent.kind === 227 /* ForOfStatement */;
-                    if (!canGetType && rootDeclaration.kind === 151 /* Parameter */) {
+                    var canGetType = ts.hasInitializer(rootDeclaration) || ts.hasType(rootDeclaration) || rootDeclaration.parent.parent.kind === 228 /* ForOfStatement */;
+                    if (!canGetType && rootDeclaration.kind === 152 /* Parameter */) {
                         if (ts.isExpression(rootDeclaration.parent)) {
                             canGetType = !!typeChecker.getContextualType(rootDeclaration.parent);
                         }
-                        else if (rootDeclaration.parent.kind === 156 /* MethodDeclaration */ || rootDeclaration.parent.kind === 159 /* SetAccessor */) {
+                        else if (rootDeclaration.parent.kind === 157 /* MethodDeclaration */ || rootDeclaration.parent.kind === 160 /* SetAccessor */) {
                             canGetType = ts.isExpression(rootDeclaration.parent.parent) && !!typeChecker.getContextualType(rootDeclaration.parent.parent);
                         }
                     }
@@ -99827,7 +102895,7 @@ var ts;
                     return 0 /* Continue */;
                 // cursor is in an import clause
                 // try to show exported member for imported module
-                var moduleSpecifier = (namedImportsOrExports.kind === 252 /* NamedImports */ ? namedImportsOrExports.parent.parent : namedImportsOrExports.parent).moduleSpecifier;
+                var moduleSpecifier = (namedImportsOrExports.kind === 253 /* NamedImports */ ? namedImportsOrExports.parent.parent : namedImportsOrExports.parent).moduleSpecifier;
                 var moduleSpecifierSymbol = typeChecker.getSymbolAtLocation(moduleSpecifier); // TODO: GH#18217
                 if (!moduleSpecifierSymbol)
                     return 2 /* Fail */;
@@ -99843,7 +102911,7 @@ var ts;
              * Relevant symbols are stored in the captured 'symbols' variable.
              */
             function tryGetClassLikeCompletionSymbols() {
-                var decl = tryGetObjectTypeDeclarationCompletionContainer(sourceFile, contextToken, location);
+                var decl = tryGetObjectTypeDeclarationCompletionContainer(sourceFile, contextToken, location, position);
                 if (!decl)
                     return 0 /* Continue */;
                 // We're looking up possible property names from parent type.
@@ -99858,7 +102926,7 @@ var ts;
                 var classElement = contextToken.parent;
                 var classElementModifierFlags = ts.isClassElement(classElement) ? ts.getModifierFlags(classElement) : 0 /* None */;
                 // If this is context token is not something we are editing now, consider if this would lead to be modifier
-                if (contextToken.kind === 72 /* Identifier */ && !isCurrentlyEditingNode(contextToken)) {
+                if (contextToken.kind === 73 /* Identifier */ && !isCurrentlyEditingNode(contextToken)) {
                     switch (contextToken.getText()) {
                         case "private":
                             classElementModifierFlags = classElementModifierFlags | 8 /* Private */;
@@ -99895,7 +102963,7 @@ var ts;
                             break;
                         case 40 /* AsteriskToken */:
                             return ts.isMethodDeclaration(parent) ? ts.tryCast(parent.parent, ts.isObjectLiteralExpression) : undefined;
-                        case 72 /* Identifier */:
+                        case 73 /* Identifier */:
                             return contextToken.text === "async" && ts.isShorthandPropertyAssignment(contextToken.parent)
                                 ? contextToken.parent.parent : undefined;
                     }
@@ -99948,12 +103016,12 @@ var ts;
                         case 30 /* GreaterThanToken */: // End of a type argument list
                         case 29 /* LessThanSlashToken */:
                         case 42 /* SlashToken */:
-                        case 72 /* Identifier */:
-                        case 189 /* PropertyAccessExpression */:
-                        case 268 /* JsxAttributes */:
-                        case 267 /* JsxAttribute */:
-                        case 269 /* JsxSpreadAttribute */:
-                            if (parent && (parent.kind === 261 /* JsxSelfClosingElement */ || parent.kind === 262 /* JsxOpeningElement */)) {
+                        case 73 /* Identifier */:
+                        case 190 /* PropertyAccessExpression */:
+                        case 269 /* JsxAttributes */:
+                        case 268 /* JsxAttribute */:
+                        case 270 /* JsxSpreadAttribute */:
+                            if (parent && (parent.kind === 262 /* JsxSelfClosingElement */ || parent.kind === 263 /* JsxOpeningElement */)) {
                                 if (contextToken.kind === 30 /* GreaterThanToken */) {
                                     var precedingToken = ts.findPrecedingToken(contextToken.pos, sourceFile, /*startNode*/ undefined);
                                     if (!parent.typeArguments || (precedingToken && precedingToken.kind === 42 /* SlashToken */))
@@ -99961,7 +103029,7 @@ var ts;
                                 }
                                 return parent;
                             }
-                            else if (parent.kind === 267 /* JsxAttribute */) {
+                            else if (parent.kind === 268 /* JsxAttribute */) {
                                 // Currently we parse JsxOpeningLikeElement as:
                                 //      JsxOpeningLikeElement
                                 //          attributes: JsxAttributes
@@ -99973,7 +103041,7 @@ var ts;
                         // its parent is a JsxExpression, whose parent is a JsxAttribute,
                         // whose parent is a JsxOpeningLikeElement
                         case 10 /* StringLiteral */:
-                            if (parent && ((parent.kind === 267 /* JsxAttribute */) || (parent.kind === 269 /* JsxSpreadAttribute */))) {
+                            if (parent && ((parent.kind === 268 /* JsxAttribute */) || (parent.kind === 270 /* JsxSpreadAttribute */))) {
                                 // Currently we parse JsxOpeningLikeElement as:
                                 //      JsxOpeningLikeElement
                                 //          attributes: JsxAttributes
@@ -99983,8 +103051,8 @@ var ts;
                             break;
                         case 19 /* CloseBraceToken */:
                             if (parent &&
-                                parent.kind === 270 /* JsxExpression */ &&
-                                parent.parent && parent.parent.kind === 267 /* JsxAttribute */) {
+                                parent.kind === 271 /* JsxExpression */ &&
+                                parent.parent && parent.parent.kind === 268 /* JsxAttribute */) {
                                 // Currently we parse JsxOpeningLikeElement as:
                                 //      JsxOpeningLikeElement
                                 //          attributes: JsxAttributes
@@ -99992,7 +103060,7 @@ var ts;
                                 //                  each JsxAttribute can have initializer as JsxExpression
                                 return parent.parent.parent.parent;
                             }
-                            if (parent && parent.kind === 269 /* JsxSpreadAttribute */) {
+                            if (parent && parent.kind === 270 /* JsxSpreadAttribute */) {
                                 // Currently we parse JsxOpeningLikeElement as:
                                 //      JsxOpeningLikeElement
                                 //          attributes: JsxAttributes
@@ -100012,62 +103080,62 @@ var ts;
                 var containingNodeKind = parent.kind;
                 switch (contextToken.kind) {
                     case 27 /* CommaToken */:
-                        return containingNodeKind === 237 /* VariableDeclaration */ ||
-                            containingNodeKind === 238 /* VariableDeclarationList */ ||
-                            containingNodeKind === 219 /* VariableStatement */ ||
-                            containingNodeKind === 243 /* EnumDeclaration */ || // enum a { foo, |
+                        return containingNodeKind === 238 /* VariableDeclaration */ ||
+                            containingNodeKind === 239 /* VariableDeclarationList */ ||
+                            containingNodeKind === 220 /* VariableStatement */ ||
+                            containingNodeKind === 244 /* EnumDeclaration */ || // enum a { foo, |
                             isFunctionLikeButNotConstructor(containingNodeKind) ||
-                            containingNodeKind === 241 /* InterfaceDeclaration */ || // interface A<T, |
-                            containingNodeKind === 185 /* ArrayBindingPattern */ || // var [x, y|
-                            containingNodeKind === 242 /* TypeAliasDeclaration */ || // type Map, K, |
+                            containingNodeKind === 242 /* InterfaceDeclaration */ || // interface A<T, |
+                            containingNodeKind === 186 /* ArrayBindingPattern */ || // var [x, y|
+                            containingNodeKind === 243 /* TypeAliasDeclaration */ || // type Map, K, |
                             // class A<T, |
                             // var C = class D<T, |
                             (ts.isClassLike(parent) &&
                                 !!parent.typeParameters &&
                                 parent.typeParameters.end >= contextToken.pos);
                     case 24 /* DotToken */:
-                        return containingNodeKind === 185 /* ArrayBindingPattern */; // var [.|
+                        return containingNodeKind === 186 /* ArrayBindingPattern */; // var [.|
                     case 57 /* ColonToken */:
-                        return containingNodeKind === 186 /* BindingElement */; // var {x :html|
+                        return containingNodeKind === 187 /* BindingElement */; // var {x :html|
                     case 22 /* OpenBracketToken */:
-                        return containingNodeKind === 185 /* ArrayBindingPattern */; // var [x|
+                        return containingNodeKind === 186 /* ArrayBindingPattern */; // var [x|
                     case 20 /* OpenParenToken */:
-                        return containingNodeKind === 274 /* CatchClause */ ||
+                        return containingNodeKind === 275 /* CatchClause */ ||
                             isFunctionLikeButNotConstructor(containingNodeKind);
                     case 18 /* OpenBraceToken */:
-                        return containingNodeKind === 243 /* EnumDeclaration */; // enum a { |
+                        return containingNodeKind === 244 /* EnumDeclaration */; // enum a { |
                     case 28 /* LessThanToken */:
-                        return containingNodeKind === 240 /* ClassDeclaration */ || // class A< |
-                            containingNodeKind === 209 /* ClassExpression */ || // var C = class D< |
-                            containingNodeKind === 241 /* InterfaceDeclaration */ || // interface A< |
-                            containingNodeKind === 242 /* TypeAliasDeclaration */ || // type List< |
+                        return containingNodeKind === 241 /* ClassDeclaration */ || // class A< |
+                            containingNodeKind === 210 /* ClassExpression */ || // var C = class D< |
+                            containingNodeKind === 242 /* InterfaceDeclaration */ || // interface A< |
+                            containingNodeKind === 243 /* TypeAliasDeclaration */ || // type List< |
                             ts.isFunctionLikeKind(containingNodeKind);
-                    case 116 /* StaticKeyword */:
-                        return containingNodeKind === 154 /* PropertyDeclaration */ && !ts.isClassLike(parent.parent);
+                    case 117 /* StaticKeyword */:
+                        return containingNodeKind === 155 /* PropertyDeclaration */ && !ts.isClassLike(parent.parent);
                     case 25 /* DotDotDotToken */:
-                        return containingNodeKind === 151 /* Parameter */ ||
-                            (!!parent.parent && parent.parent.kind === 185 /* ArrayBindingPattern */); // var [...z|
-                    case 115 /* PublicKeyword */:
-                    case 113 /* PrivateKeyword */:
-                    case 114 /* ProtectedKeyword */:
-                        return containingNodeKind === 151 /* Parameter */ && !ts.isConstructorDeclaration(parent.parent);
-                    case 119 /* AsKeyword */:
-                        return containingNodeKind === 253 /* ImportSpecifier */ ||
-                            containingNodeKind === 257 /* ExportSpecifier */ ||
-                            containingNodeKind === 251 /* NamespaceImport */;
-                    case 126 /* GetKeyword */:
-                    case 137 /* SetKeyword */:
+                        return containingNodeKind === 152 /* Parameter */ ||
+                            (!!parent.parent && parent.parent.kind === 186 /* ArrayBindingPattern */); // var [...z|
+                    case 116 /* PublicKeyword */:
+                    case 114 /* PrivateKeyword */:
+                    case 115 /* ProtectedKeyword */:
+                        return containingNodeKind === 152 /* Parameter */ && !ts.isConstructorDeclaration(parent.parent);
+                    case 120 /* AsKeyword */:
+                        return containingNodeKind === 254 /* ImportSpecifier */ ||
+                            containingNodeKind === 258 /* ExportSpecifier */ ||
+                            containingNodeKind === 252 /* NamespaceImport */;
+                    case 127 /* GetKeyword */:
+                    case 138 /* SetKeyword */:
                         return !isFromObjectTypeDeclaration(contextToken);
-                    case 76 /* ClassKeyword */:
-                    case 84 /* EnumKeyword */:
-                    case 110 /* InterfaceKeyword */:
-                    case 90 /* FunctionKeyword */:
-                    case 105 /* VarKeyword */:
-                    case 92 /* ImportKeyword */:
-                    case 111 /* LetKeyword */:
-                    case 77 /* ConstKeyword */:
-                    case 117 /* YieldKeyword */:
-                    case 140 /* TypeKeyword */: // type htm|
+                    case 77 /* ClassKeyword */:
+                    case 85 /* EnumKeyword */:
+                    case 111 /* InterfaceKeyword */:
+                    case 91 /* FunctionKeyword */:
+                    case 106 /* VarKeyword */:
+                    case 93 /* ImportKeyword */:
+                    case 112 /* LetKeyword */:
+                    case 78 /* ConstKeyword */:
+                    case 118 /* YieldKeyword */:
+                    case 141 /* TypeKeyword */: // type htm|
                         return true;
                     case 40 /* AsteriskToken */:
                         return ts.isFunctionLike(contextToken.parent) && !ts.isMethodDeclaration(contextToken.parent);
@@ -100090,22 +103158,22 @@ var ts;
                 }
                 // Previous token may have been a keyword that was converted to an identifier.
                 switch (keywordForNode(contextToken)) {
-                    case 118 /* AbstractKeyword */:
-                    case 76 /* ClassKeyword */:
-                    case 77 /* ConstKeyword */:
-                    case 125 /* DeclareKeyword */:
-                    case 84 /* EnumKeyword */:
-                    case 90 /* FunctionKeyword */:
-                    case 110 /* InterfaceKeyword */:
-                    case 111 /* LetKeyword */:
-                    case 113 /* PrivateKeyword */:
-                    case 114 /* ProtectedKeyword */:
-                    case 115 /* PublicKeyword */:
-                    case 116 /* StaticKeyword */:
-                    case 105 /* VarKeyword */:
-                    case 117 /* YieldKeyword */:
+                    case 119 /* AbstractKeyword */:
+                    case 77 /* ClassKeyword */:
+                    case 78 /* ConstKeyword */:
+                    case 126 /* DeclareKeyword */:
+                    case 85 /* EnumKeyword */:
+                    case 91 /* FunctionKeyword */:
+                    case 111 /* InterfaceKeyword */:
+                    case 112 /* LetKeyword */:
+                    case 114 /* PrivateKeyword */:
+                    case 115 /* ProtectedKeyword */:
+                    case 116 /* PublicKeyword */:
+                    case 117 /* StaticKeyword */:
+                    case 106 /* VarKeyword */:
+                    case 118 /* YieldKeyword */:
                         return true;
-                    case 121 /* AsyncKeyword */:
+                    case 122 /* AsyncKeyword */:
                         return ts.isPropertyDeclaration(contextToken.parent);
                 }
                 return ts.isDeclarationName(contextToken)
@@ -100115,7 +103183,7 @@ var ts;
                     && !(ts.isClassLike(contextToken.parent) && (contextToken !== previousToken || position > previousToken.end));
             }
             function isFunctionLikeButNotConstructor(kind) {
-                return ts.isFunctionLikeKind(kind) && kind !== 157 /* Constructor */;
+                return ts.isFunctionLikeKind(kind) && kind !== 158 /* Constructor */;
             }
             function isDotOfNumericLiteral(contextToken) {
                 if (contextToken.kind === 8 /* NumericLiteral */) {
@@ -100138,12 +103206,12 @@ var ts;
                 for (var _i = 0, existingMembers_1 = existingMembers; _i < existingMembers_1.length; _i++) {
                     var m = existingMembers_1[_i];
                     // Ignore omitted expressions for missing members
-                    if (m.kind !== 275 /* PropertyAssignment */ &&
-                        m.kind !== 276 /* ShorthandPropertyAssignment */ &&
-                        m.kind !== 186 /* BindingElement */ &&
-                        m.kind !== 156 /* MethodDeclaration */ &&
-                        m.kind !== 158 /* GetAccessor */ &&
-                        m.kind !== 159 /* SetAccessor */) {
+                    if (m.kind !== 276 /* PropertyAssignment */ &&
+                        m.kind !== 277 /* ShorthandPropertyAssignment */ &&
+                        m.kind !== 187 /* BindingElement */ &&
+                        m.kind !== 157 /* MethodDeclaration */ &&
+                        m.kind !== 159 /* GetAccessor */ &&
+                        m.kind !== 160 /* SetAccessor */) {
                         continue;
                     }
                     // If this is the current item we are editing right now, do not filter it out
@@ -100153,7 +103221,7 @@ var ts;
                     var existingName = void 0;
                     if (ts.isBindingElement(m) && m.propertyName) {
                         // include only identifiers in completion list
-                        if (m.propertyName.kind === 72 /* Identifier */) {
+                        if (m.propertyName.kind === 73 /* Identifier */) {
                             existingName = m.propertyName.escapedText;
                         }
                     }
@@ -100178,10 +103246,10 @@ var ts;
                 for (var _i = 0, existingMembers_2 = existingMembers; _i < existingMembers_2.length; _i++) {
                     var m = existingMembers_2[_i];
                     // Ignore omitted expressions for missing members
-                    if (m.kind !== 154 /* PropertyDeclaration */ &&
-                        m.kind !== 156 /* MethodDeclaration */ &&
-                        m.kind !== 158 /* GetAccessor */ &&
-                        m.kind !== 159 /* SetAccessor */) {
+                    if (m.kind !== 155 /* PropertyDeclaration */ &&
+                        m.kind !== 157 /* MethodDeclaration */ &&
+                        m.kind !== 159 /* GetAccessor */ &&
+                        m.kind !== 160 /* SetAccessor */) {
                         continue;
                     }
                     // If this is the current item we are editing right now, do not filter it out
@@ -100221,7 +103289,7 @@ var ts;
                     if (isCurrentlyEditingNode(attr)) {
                         continue;
                     }
-                    if (attr.kind === 267 /* JsxAttribute */) {
+                    if (attr.kind === 268 /* JsxAttribute */) {
                         seenNames.set(attr.name.escapedText, true);
                     }
                 }
@@ -100265,57 +103333,104 @@ var ts;
         var _keywordCompletions = [];
         var allKeywordsCompletions = ts.memoize(function () {
             var res = [];
-            for (var i = 73 /* FirstKeyword */; i <= 147 /* LastKeyword */; i++) {
+            for (var i = 74 /* FirstKeyword */; i <= 148 /* LastKeyword */; i++) {
                 res.push({
                     name: ts.tokenToString(i),
                     kind: "keyword" /* keyword */,
                     kindModifiers: "" /* none */,
-                    sortText: "0"
+                    sortText: SortText.GlobalsOrKeywords
                 });
             }
             return res;
         });
-        function getKeywordCompletions(keywordFilter) {
+        function getKeywordCompletions(keywordFilter, filterOutTsOnlyKeywords) {
+            if (!filterOutTsOnlyKeywords)
+                return getTypescriptKeywordCompletions(keywordFilter);
+            var index = keywordFilter + 7 /* Last */ + 1;
+            return _keywordCompletions[index] ||
+                (_keywordCompletions[index] = getTypescriptKeywordCompletions(keywordFilter)
+                    .filter(function (entry) { return !isTypeScriptOnlyKeyword(ts.stringToToken(entry.name)); }));
+        }
+        function getTypescriptKeywordCompletions(keywordFilter) {
             return _keywordCompletions[keywordFilter] || (_keywordCompletions[keywordFilter] = allKeywordsCompletions().filter(function (entry) {
                 var kind = ts.stringToToken(entry.name);
                 switch (keywordFilter) {
                     case 0 /* None */:
                         return false;
                     case 1 /* All */:
-                        return kind === 121 /* AsyncKeyword */ || 122 /* AwaitKeyword */ || !ts.isContextualKeyword(kind) && !isClassMemberCompletionKeyword(kind) || kind === 125 /* DeclareKeyword */ || kind === 130 /* ModuleKeyword */
-                            || ts.isTypeKeyword(kind) && kind !== 141 /* UndefinedKeyword */;
+                        return isFunctionLikeBodyKeyword(kind)
+                            || kind === 126 /* DeclareKeyword */
+                            || kind === 131 /* ModuleKeyword */
+                            || ts.isTypeKeyword(kind) && kind !== 142 /* UndefinedKeyword */;
+                    case 5 /* FunctionLikeBodyKeywords */:
+                        return isFunctionLikeBodyKeyword(kind);
                     case 2 /* ClassElementKeywords */:
                         return isClassMemberCompletionKeyword(kind);
                     case 3 /* InterfaceElementKeywords */:
                         return isInterfaceOrTypeLiteralCompletionKeyword(kind);
                     case 4 /* ConstructorParameterKeywords */:
                         return ts.isParameterPropertyModifier(kind);
-                    case 5 /* FunctionLikeBodyKeywords */:
-                        return isFunctionLikeBodyKeyword(kind);
-                    case 6 /* TypeKeywords */:
+                    case 6 /* TypeAssertionKeywords */:
+                        return ts.isTypeKeyword(kind) || kind === 78 /* ConstKeyword */;
+                    case 7 /* TypeKeywords */:
                         return ts.isTypeKeyword(kind);
                     default:
                         return ts.Debug.assertNever(keywordFilter);
                 }
             }));
         }
+        function isTypeScriptOnlyKeyword(kind) {
+            switch (kind) {
+                case 119 /* AbstractKeyword */:
+                case 121 /* AnyKeyword */:
+                case 147 /* BigIntKeyword */:
+                case 124 /* BooleanKeyword */:
+                case 126 /* DeclareKeyword */:
+                case 85 /* EnumKeyword */:
+                case 146 /* GlobalKeyword */:
+                case 110 /* ImplementsKeyword */:
+                case 128 /* InferKeyword */:
+                case 111 /* InterfaceKeyword */:
+                case 129 /* IsKeyword */:
+                case 130 /* KeyOfKeyword */:
+                case 131 /* ModuleKeyword */:
+                case 132 /* NamespaceKeyword */:
+                case 133 /* NeverKeyword */:
+                case 136 /* NumberKeyword */:
+                case 137 /* ObjectKeyword */:
+                case 114 /* PrivateKeyword */:
+                case 115 /* ProtectedKeyword */:
+                case 116 /* PublicKeyword */:
+                case 134 /* ReadonlyKeyword */:
+                case 139 /* StringKeyword */:
+                case 140 /* SymbolKeyword */:
+                case 141 /* TypeKeyword */:
+                case 143 /* UniqueKeyword */:
+                case 144 /* UnknownKeyword */:
+                    return true;
+                default:
+                    return false;
+            }
+        }
         function isInterfaceOrTypeLiteralCompletionKeyword(kind) {
-            return kind === 133 /* ReadonlyKeyword */;
+            return kind === 134 /* ReadonlyKeyword */;
         }
         function isClassMemberCompletionKeyword(kind) {
             switch (kind) {
-                case 118 /* AbstractKeyword */:
-                case 124 /* ConstructorKeyword */:
-                case 126 /* GetKeyword */:
-                case 137 /* SetKeyword */:
-                case 121 /* AsyncKeyword */:
+                case 119 /* AbstractKeyword */:
+                case 125 /* ConstructorKeyword */:
+                case 127 /* GetKeyword */:
+                case 138 /* SetKeyword */:
+                case 122 /* AsyncKeyword */:
                     return true;
                 default:
                     return ts.isClassMemberModifier(kind);
             }
         }
         function isFunctionLikeBodyKeyword(kind) {
-            return kind === 121 /* AsyncKeyword */ || kind === 122 /* AwaitKeyword */ || !ts.isContextualKeyword(kind) && !isClassMemberCompletionKeyword(kind);
+            return kind === 122 /* AsyncKeyword */
+                || kind === 123 /* AwaitKeyword */
+                || !ts.isContextualKeyword(kind) && !isClassMemberCompletionKeyword(kind);
         }
         function keywordForNode(node) {
             return ts.isIdentifier(node) ? node.originalKeywordKind || 0 /* Unknown */ : node.kind;
@@ -100349,16 +103464,21 @@ var ts;
          * Returns the immediate owning class declaration of a context token,
          * on the condition that one exists and that the context implies completion should be given.
          */
-        function tryGetObjectTypeDeclarationCompletionContainer(sourceFile, contextToken, location) {
+        function tryGetObjectTypeDeclarationCompletionContainer(sourceFile, contextToken, location, position) {
             // class c { method() { } | method2() { } }
             switch (location.kind) {
-                case 311 /* SyntaxList */:
+                case 313 /* SyntaxList */:
                     return ts.tryCast(location.parent, ts.isObjectTypeDeclaration);
                 case 1 /* EndOfFileToken */:
                     var cls = ts.tryCast(ts.lastOrUndefined(ts.cast(location.parent, ts.isSourceFile).statements), ts.isObjectTypeDeclaration);
                     if (cls && !ts.findChildOfKind(cls, 19 /* CloseBraceToken */, sourceFile)) {
                         return cls;
                     }
+                    break;
+                case 73 /* Identifier */: // class c extends React.Component { a: () => 1\n compon| }
+                    if (isFromObjectTypeDeclaration(location)) {
+                        return ts.findAncestor(location, ts.isObjectTypeDeclaration);
+                    }
             }
             if (!contextToken)
                 return undefined;
@@ -100373,8 +103493,13 @@ var ts;
                 case 27 /* CommaToken */: // class c {getValue(): number, | }
                     return ts.tryCast(contextToken.parent, ts.isObjectTypeDeclaration);
                 default:
-                    if (!isFromObjectTypeDeclaration(contextToken))
+                    if (!isFromObjectTypeDeclaration(contextToken)) {
+                        // class c extends React.Component { a: () => 1\n| }
+                        if (ts.getLineAndCharacterOfPosition(sourceFile, contextToken.getEnd()).line !== ts.getLineAndCharacterOfPosition(sourceFile, position).line && ts.isObjectTypeDeclaration(location)) {
+                            return location;
+                        }
                         return undefined;
+                    }
                     var isValidKeyword = ts.isClassLike(contextToken.parent.parent) ? isClassMemberCompletionKeyword : isInterfaceOrTypeLiteralCompletionKeyword;
                     return (isValidKeyword(contextToken.kind) || contextToken.kind === 40 /* AsteriskToken */ || ts.isIdentifier(contextToken) && isValidKeyword(ts.stringToToken(contextToken.text))) // TODO: GH#18217
                         ? contextToken.parent.parent : undefined;
@@ -100461,40 +103586,40 @@ var ts;
         }
         function getHighlightSpans(node, sourceFile) {
             switch (node.kind) {
-                case 91 /* IfKeyword */:
-                case 83 /* ElseKeyword */:
+                case 92 /* IfKeyword */:
+                case 84 /* ElseKeyword */:
                     return ts.isIfStatement(node.parent) ? getIfElseOccurrences(node.parent, sourceFile) : undefined;
-                case 97 /* ReturnKeyword */:
+                case 98 /* ReturnKeyword */:
                     return useParent(node.parent, ts.isReturnStatement, getReturnOccurrences);
-                case 101 /* ThrowKeyword */:
+                case 102 /* ThrowKeyword */:
                     return useParent(node.parent, ts.isThrowStatement, getThrowOccurrences);
-                case 103 /* TryKeyword */:
-                case 75 /* CatchKeyword */:
-                case 88 /* FinallyKeyword */:
-                    var tryStatement = node.kind === 75 /* CatchKeyword */ ? node.parent.parent : node.parent;
+                case 104 /* TryKeyword */:
+                case 76 /* CatchKeyword */:
+                case 89 /* FinallyKeyword */:
+                    var tryStatement = node.kind === 76 /* CatchKeyword */ ? node.parent.parent : node.parent;
                     return useParent(tryStatement, ts.isTryStatement, getTryCatchFinallyOccurrences);
-                case 99 /* SwitchKeyword */:
+                case 100 /* SwitchKeyword */:
                     return useParent(node.parent, ts.isSwitchStatement, getSwitchCaseDefaultOccurrences);
-                case 74 /* CaseKeyword */:
-                case 80 /* DefaultKeyword */:
+                case 75 /* CaseKeyword */:
+                case 81 /* DefaultKeyword */:
                     return useParent(node.parent.parent.parent, ts.isSwitchStatement, getSwitchCaseDefaultOccurrences);
-                case 73 /* BreakKeyword */:
-                case 78 /* ContinueKeyword */:
+                case 74 /* BreakKeyword */:
+                case 79 /* ContinueKeyword */:
                     return useParent(node.parent, ts.isBreakOrContinueStatement, getBreakOrContinueStatementOccurrences);
-                case 89 /* ForKeyword */:
-                case 107 /* WhileKeyword */:
-                case 82 /* DoKeyword */:
+                case 90 /* ForKeyword */:
+                case 108 /* WhileKeyword */:
+                case 83 /* DoKeyword */:
                     return useParent(node.parent, function (n) { return ts.isIterationStatement(n, /*lookInLabeledStatements*/ true); }, getLoopBreakContinueOccurrences);
-                case 124 /* ConstructorKeyword */:
-                    return getFromAllDeclarations(ts.isConstructorDeclaration, [124 /* ConstructorKeyword */]);
-                case 126 /* GetKeyword */:
-                case 137 /* SetKeyword */:
-                    return getFromAllDeclarations(ts.isAccessor, [126 /* GetKeyword */, 137 /* SetKeyword */]);
-                case 122 /* AwaitKeyword */:
+                case 125 /* ConstructorKeyword */:
+                    return getFromAllDeclarations(ts.isConstructorDeclaration, [125 /* ConstructorKeyword */]);
+                case 127 /* GetKeyword */:
+                case 138 /* SetKeyword */:
+                    return getFromAllDeclarations(ts.isAccessor, [127 /* GetKeyword */, 138 /* SetKeyword */]);
+                case 123 /* AwaitKeyword */:
                     return useParent(node.parent, ts.isAwaitExpression, getAsyncAndAwaitOccurrences);
-                case 121 /* AsyncKeyword */:
+                case 122 /* AsyncKeyword */:
                     return highlightSpans(getAsyncAndAwaitOccurrences(node));
-                case 117 /* YieldKeyword */:
+                case 118 /* YieldKeyword */:
                     return highlightSpans(getYieldOccurrences(node));
                 default:
                     return ts.isModifierKind(node.kind) && (ts.isDeclaration(node.parent) || ts.isVariableStatement(node.parent))
@@ -100537,7 +103662,7 @@ var ts;
             var child = throwStatement;
             while (child.parent) {
                 var parent = child.parent;
-                if (ts.isFunctionBlock(parent) || parent.kind === 284 /* SourceFile */) {
+                if (ts.isFunctionBlock(parent) || parent.kind === 285 /* SourceFile */) {
                     return parent;
                 }
                 // A throw-statement is only owned by a try-statement if the try-statement has
@@ -100569,16 +103694,16 @@ var ts;
         function getBreakOrContinueOwner(statement) {
             return ts.findAncestor(statement, function (node) {
                 switch (node.kind) {
-                    case 232 /* SwitchStatement */:
-                        if (statement.kind === 228 /* ContinueStatement */) {
+                    case 233 /* SwitchStatement */:
+                        if (statement.kind === 229 /* ContinueStatement */) {
                             return false;
                         }
                     // falls through
-                    case 225 /* ForStatement */:
-                    case 226 /* ForInStatement */:
-                    case 227 /* ForOfStatement */:
-                    case 224 /* WhileStatement */:
-                    case 223 /* DoStatement */:
+                    case 226 /* ForStatement */:
+                    case 227 /* ForInStatement */:
+                    case 228 /* ForOfStatement */:
+                    case 225 /* WhileStatement */:
+                    case 224 /* DoStatement */:
                         return !statement.label || isLabeledBy(node, statement.label.escapedText);
                     default:
                         // Don't cross function boundaries.
@@ -100594,11 +103719,11 @@ var ts;
             // Types of node whose children might have modifiers.
             var container = declaration.parent;
             switch (container.kind) {
-                case 245 /* ModuleBlock */:
-                case 284 /* SourceFile */:
-                case 218 /* Block */:
-                case 271 /* CaseClause */:
-                case 272 /* DefaultClause */:
+                case 246 /* ModuleBlock */:
+                case 285 /* SourceFile */:
+                case 219 /* Block */:
+                case 272 /* CaseClause */:
+                case 273 /* DefaultClause */:
                     // Container is either a class declaration or the declaration is a classDeclaration
                     if (modifierFlag & 128 /* Abstract */ && ts.isClassDeclaration(declaration)) {
                         return declaration.members.concat([declaration]);
@@ -100606,12 +103731,12 @@ var ts;
                     else {
                         return container.statements;
                     }
-                case 157 /* Constructor */:
-                case 156 /* MethodDeclaration */:
-                case 239 /* FunctionDeclaration */:
+                case 158 /* Constructor */:
+                case 157 /* MethodDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     return container.parameters.concat((ts.isClassLike(container.parent) ? container.parent.members : []));
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
                     var nodes = container.members;
                     // If we're an accessibility modifier, we're in an instance member and should search
                     // the constructor's parameter list for instance members as well.
@@ -100642,12 +103767,12 @@ var ts;
         }
         function getLoopBreakContinueOccurrences(loopNode) {
             var keywords = [];
-            if (pushKeywordIf(keywords, loopNode.getFirstToken(), 89 /* ForKeyword */, 107 /* WhileKeyword */, 82 /* DoKeyword */)) {
+            if (pushKeywordIf(keywords, loopNode.getFirstToken(), 90 /* ForKeyword */, 108 /* WhileKeyword */, 83 /* DoKeyword */)) {
                 // If we succeeded and got a do-while loop, then start looking for a 'while' keyword.
-                if (loopNode.kind === 223 /* DoStatement */) {
+                if (loopNode.kind === 224 /* DoStatement */) {
                     var loopTokens = loopNode.getChildren();
                     for (var i = loopTokens.length - 1; i >= 0; i--) {
-                        if (pushKeywordIf(keywords, loopTokens[i], 107 /* WhileKeyword */)) {
+                        if (pushKeywordIf(keywords, loopTokens[i], 108 /* WhileKeyword */)) {
                             break;
                         }
                     }
@@ -100655,7 +103780,7 @@ var ts;
             }
             ts.forEach(aggregateAllBreakAndContinueStatements(loopNode.statement), function (statement) {
                 if (ownsBreakOrContinueStatement(loopNode, statement)) {
-                    pushKeywordIf(keywords, statement.getFirstToken(), 73 /* BreakKeyword */, 78 /* ContinueKeyword */);
+                    pushKeywordIf(keywords, statement.getFirstToken(), 74 /* BreakKeyword */, 79 /* ContinueKeyword */);
                 }
             });
             return keywords;
@@ -100664,13 +103789,13 @@ var ts;
             var owner = getBreakOrContinueOwner(breakOrContinueStatement);
             if (owner) {
                 switch (owner.kind) {
-                    case 225 /* ForStatement */:
-                    case 226 /* ForInStatement */:
-                    case 227 /* ForOfStatement */:
-                    case 223 /* DoStatement */:
-                    case 224 /* WhileStatement */:
+                    case 226 /* ForStatement */:
+                    case 227 /* ForInStatement */:
+                    case 228 /* ForOfStatement */:
+                    case 224 /* DoStatement */:
+                    case 225 /* WhileStatement */:
                         return getLoopBreakContinueOccurrences(owner);
-                    case 232 /* SwitchStatement */:
+                    case 233 /* SwitchStatement */:
                         return getSwitchCaseDefaultOccurrences(owner);
                 }
             }
@@ -100678,13 +103803,13 @@ var ts;
         }
         function getSwitchCaseDefaultOccurrences(switchStatement) {
             var keywords = [];
-            pushKeywordIf(keywords, switchStatement.getFirstToken(), 99 /* SwitchKeyword */);
+            pushKeywordIf(keywords, switchStatement.getFirstToken(), 100 /* SwitchKeyword */);
             // Go through each clause in the switch statement, collecting the 'case'/'default' keywords.
             ts.forEach(switchStatement.caseBlock.clauses, function (clause) {
-                pushKeywordIf(keywords, clause.getFirstToken(), 74 /* CaseKeyword */, 80 /* DefaultKeyword */);
+                pushKeywordIf(keywords, clause.getFirstToken(), 75 /* CaseKeyword */, 81 /* DefaultKeyword */);
                 ts.forEach(aggregateAllBreakAndContinueStatements(clause), function (statement) {
                     if (ownsBreakOrContinueStatement(switchStatement, statement)) {
-                        pushKeywordIf(keywords, statement.getFirstToken(), 73 /* BreakKeyword */);
+                        pushKeywordIf(keywords, statement.getFirstToken(), 74 /* BreakKeyword */);
                     }
                 });
             });
@@ -100692,13 +103817,13 @@ var ts;
         }
         function getTryCatchFinallyOccurrences(tryStatement, sourceFile) {
             var keywords = [];
-            pushKeywordIf(keywords, tryStatement.getFirstToken(), 103 /* TryKeyword */);
+            pushKeywordIf(keywords, tryStatement.getFirstToken(), 104 /* TryKeyword */);
             if (tryStatement.catchClause) {
-                pushKeywordIf(keywords, tryStatement.catchClause.getFirstToken(), 75 /* CatchKeyword */);
+                pushKeywordIf(keywords, tryStatement.catchClause.getFirstToken(), 76 /* CatchKeyword */);
             }
             if (tryStatement.finallyBlock) {
-                var finallyKeyword = ts.findChildOfKind(tryStatement, 88 /* FinallyKeyword */, sourceFile);
-                pushKeywordIf(keywords, finallyKeyword, 88 /* FinallyKeyword */);
+                var finallyKeyword = ts.findChildOfKind(tryStatement, 89 /* FinallyKeyword */, sourceFile);
+                pushKeywordIf(keywords, finallyKeyword, 89 /* FinallyKeyword */);
             }
             return keywords;
         }
@@ -100709,13 +103834,13 @@ var ts;
             }
             var keywords = [];
             ts.forEach(aggregateOwnedThrowStatements(owner), function (throwStatement) {
-                keywords.push(ts.findChildOfKind(throwStatement, 101 /* ThrowKeyword */, sourceFile));
+                keywords.push(ts.findChildOfKind(throwStatement, 102 /* ThrowKeyword */, sourceFile));
             });
             // If the "owner" is a function, then we equate 'return' and 'throw' statements in their
             // ability to "jump out" of the function, and include occurrences for both.
             if (ts.isFunctionBlock(owner)) {
                 ts.forEachReturnStatement(owner, function (returnStatement) {
-                    keywords.push(ts.findChildOfKind(returnStatement, 97 /* ReturnKeyword */, sourceFile));
+                    keywords.push(ts.findChildOfKind(returnStatement, 98 /* ReturnKeyword */, sourceFile));
                 });
             }
             return keywords;
@@ -100727,11 +103852,11 @@ var ts;
             }
             var keywords = [];
             ts.forEachReturnStatement(ts.cast(func.body, ts.isBlock), function (returnStatement) {
-                keywords.push(ts.findChildOfKind(returnStatement, 97 /* ReturnKeyword */, sourceFile));
+                keywords.push(ts.findChildOfKind(returnStatement, 98 /* ReturnKeyword */, sourceFile));
             });
             // Include 'throw' statements that do not occur within a try block.
             ts.forEach(aggregateOwnedThrowStatements(func.body), function (throwStatement) {
-                keywords.push(ts.findChildOfKind(throwStatement, 101 /* ThrowKeyword */, sourceFile));
+                keywords.push(ts.findChildOfKind(throwStatement, 102 /* ThrowKeyword */, sourceFile));
             });
             return keywords;
         }
@@ -100743,13 +103868,13 @@ var ts;
             var keywords = [];
             if (func.modifiers) {
                 func.modifiers.forEach(function (modifier) {
-                    pushKeywordIf(keywords, modifier, 121 /* AsyncKeyword */);
+                    pushKeywordIf(keywords, modifier, 122 /* AsyncKeyword */);
                 });
             }
             ts.forEachChild(func, function (child) {
                 traverseWithoutCrossingFunction(child, function (node) {
                     if (ts.isAwaitExpression(node)) {
-                        pushKeywordIf(keywords, node.getFirstToken(), 122 /* AwaitKeyword */);
+                        pushKeywordIf(keywords, node.getFirstToken(), 123 /* AwaitKeyword */);
                     }
                 });
             });
@@ -100764,7 +103889,7 @@ var ts;
             ts.forEachChild(func, function (child) {
                 traverseWithoutCrossingFunction(child, function (node) {
                     if (ts.isYieldExpression(node)) {
-                        pushKeywordIf(keywords, node.getFirstToken(), 117 /* YieldKeyword */);
+                        pushKeywordIf(keywords, node.getFirstToken(), 118 /* YieldKeyword */);
                     }
                 });
             });
@@ -100783,7 +103908,7 @@ var ts;
             // We'd like to highlight else/ifs together if they are only separated by whitespace
             // (i.e. the keywords are separated by no comments, no newlines).
             for (var i = 0; i < keywords.length; i++) {
-                if (keywords[i].kind === 83 /* ElseKeyword */ && i < keywords.length - 1) {
+                if (keywords[i].kind === 84 /* ElseKeyword */ && i < keywords.length - 1) {
                     var elseKeyword = keywords[i];
                     var ifKeyword = keywords[i + 1]; // this *should* always be an 'if' keyword.
                     var shouldCombineElseAndIf = true;
@@ -100818,10 +103943,10 @@ var ts;
             // Now traverse back down through the else branches, aggregating if/else keywords of if-statements.
             while (true) {
                 var children = ifStatement.getChildren(sourceFile);
-                pushKeywordIf(keywords, children[0], 91 /* IfKeyword */);
+                pushKeywordIf(keywords, children[0], 92 /* IfKeyword */);
                 // Generally the 'else' keyword is second-to-last, so we traverse backwards.
                 for (var i = children.length - 1; i >= 0; i--) {
-                    if (pushKeywordIf(keywords, children[i], 83 /* ElseKeyword */)) {
+                    if (pushKeywordIf(keywords, children[i], 84 /* ElseKeyword */)) {
                         break;
                     }
                 }
@@ -101037,12 +104162,12 @@ var ts;
                         if (cancellationToken)
                             cancellationToken.throwIfCancellationRequested();
                         switch (direct.kind) {
-                            case 191 /* CallExpression */:
+                            case 192 /* CallExpression */:
                                 if (!isAvailableThroughGlobal) {
                                     var parent = direct.parent;
-                                    if (exportKind === 2 /* ExportEquals */ && parent.kind === 237 /* VariableDeclaration */) {
+                                    if (exportKind === 2 /* ExportEquals */ && parent.kind === 238 /* VariableDeclaration */) {
                                         var name = parent.name;
-                                        if (name.kind === 72 /* Identifier */) {
+                                        if (name.kind === 73 /* Identifier */) {
                                             directImports.push(name);
                                             break;
                                         }
@@ -101051,22 +104176,22 @@ var ts;
                                     addIndirectUser(direct.getSourceFile());
                                 }
                                 break;
-                            case 72 /* Identifier */: // for 'const x = require("y");
+                            case 73 /* Identifier */: // for 'const x = require("y");
                                 break; // TODO: GH#23879
-                            case 248 /* ImportEqualsDeclaration */:
+                            case 249 /* ImportEqualsDeclaration */:
                                 handleNamespaceImport(direct, direct.name, ts.hasModifier(direct, 1 /* Export */), /*alreadyAddedDirect*/ false);
                                 break;
-                            case 249 /* ImportDeclaration */:
+                            case 250 /* ImportDeclaration */:
                                 directImports.push(direct);
                                 var namedBindings = direct.importClause && direct.importClause.namedBindings;
-                                if (namedBindings && namedBindings.kind === 251 /* NamespaceImport */) {
+                                if (namedBindings && namedBindings.kind === 252 /* NamespaceImport */) {
                                     handleNamespaceImport(direct, namedBindings.name, /*isReExport*/ false, /*alreadyAddedDirect*/ true);
                                 }
                                 else if (!isAvailableThroughGlobal && ts.isDefaultImport(direct)) {
                                     addIndirectUser(getSourceFileLikeForImportDeclaration(direct)); // Add a check for indirect uses to handle synthetic default imports
                                 }
                                 break;
-                            case 255 /* ExportDeclaration */:
+                            case 256 /* ExportDeclaration */:
                                 if (!direct.exportClause) {
                                     // This is `export * from "foo"`, so imports of this module may import the export too.
                                     handleDirectImports(getContainingModuleSymbol(direct, checker));
@@ -101076,11 +104201,11 @@ var ts;
                                     directImports.push(direct);
                                 }
                                 break;
-                            case 183 /* ImportType */:
+                            case 184 /* ImportType */:
                                 directImports.push(direct);
                                 break;
                             default:
-                                ts.Debug.assertNever(direct, "Unexpected import kind: " + ts.Debug.showSyntaxKind(direct));
+                                ts.Debug.failBadSyntaxKind(direct, "Unexpected import kind.");
                         }
                     }
                 }
@@ -101093,7 +104218,7 @@ var ts;
                 }
                 else if (!isAvailableThroughGlobal) {
                     var sourceFileLike = getSourceFileLikeForImportDeclaration(importDeclaration);
-                    ts.Debug.assert(sourceFileLike.kind === 284 /* SourceFile */ || sourceFileLike.kind === 244 /* ModuleDeclaration */);
+                    ts.Debug.assert(sourceFileLike.kind === 285 /* SourceFile */ || sourceFileLike.kind === 245 /* ModuleDeclaration */);
                     if (isReExport || findNamespaceReExports(sourceFileLike, name, checker)) {
                         addIndirectUsers(sourceFileLike);
                     }
@@ -101148,17 +104273,17 @@ var ts;
             }
             return { importSearches: importSearches, singleReferences: singleReferences };
             function handleImport(decl) {
-                if (decl.kind === 248 /* ImportEqualsDeclaration */) {
+                if (decl.kind === 249 /* ImportEqualsDeclaration */) {
                     if (isExternalModuleImportEquals(decl)) {
                         handleNamespaceImportLike(decl.name);
                     }
                     return;
                 }
-                if (decl.kind === 72 /* Identifier */) {
+                if (decl.kind === 73 /* Identifier */) {
                     handleNamespaceImportLike(decl);
                     return;
                 }
-                if (decl.kind === 183 /* ImportType */) {
+                if (decl.kind === 184 /* ImportType */) {
                     if (decl.qualifier) {
                         if (ts.isIdentifier(decl.qualifier) && decl.qualifier.escapedText === ts.symbolName(exportSymbol)) {
                             singleReferences.push(decl.qualifier);
@@ -101173,17 +104298,17 @@ var ts;
                 if (decl.moduleSpecifier.kind !== 10 /* StringLiteral */) {
                     return;
                 }
-                if (decl.kind === 255 /* ExportDeclaration */) {
+                if (decl.kind === 256 /* ExportDeclaration */) {
                     searchForNamedImport(decl.exportClause);
                     return;
                 }
                 var _a = decl.importClause || { name: undefined, namedBindings: undefined }, name = _a.name, namedBindings = _a.namedBindings;
                 if (namedBindings) {
                     switch (namedBindings.kind) {
-                        case 251 /* NamespaceImport */:
+                        case 252 /* NamespaceImport */:
                             handleNamespaceImportLike(namedBindings.name);
                             break;
-                        case 252 /* NamedImports */:
+                        case 253 /* NamedImports */:
                             // 'default' might be accessed as a named import `{ default as foo }`.
                             if (exportKind === 0 /* Named */ || exportKind === 1 /* Default */) {
                                 searchForNamedImport(namedBindings);
@@ -101202,7 +104327,7 @@ var ts;
                 }
             }
             /**
-             * `import x = require("./x") or `import * as x from "./x"`.
+             * `import x = require("./x")` or `import * as x from "./x"`.
              * An `export =` may be imported by this syntax, so it may be a direct import.
              * If it's not a direct import, it will be in `indirectUsers`, so we don't have to do anything here.
              */
@@ -101233,7 +104358,7 @@ var ts;
                         }
                     }
                     else {
-                        var localSymbol = element.kind === 257 /* ExportSpecifier */ && element.propertyName
+                        var localSymbol = element.kind === 258 /* ExportSpecifier */ && element.propertyName
                             ? checker.getExportSpecifierLocalTargetSymbol(element) // For re-exporting under a different name, we want to get the re-exported symbol.
                             : checker.getSymbolAtLocation(name);
                         addSearch(name, localSymbol);
@@ -101262,7 +104387,7 @@ var ts;
             for (var _i = 0, sourceFiles_1 = sourceFiles; _i < sourceFiles_1.length; _i++) {
                 var referencingFile = sourceFiles_1[_i];
                 var searchSourceFile = searchModuleSymbol.valueDeclaration;
-                if (searchSourceFile.kind === 284 /* SourceFile */) {
+                if (searchSourceFile.kind === 285 /* SourceFile */) {
                     for (var _a = 0, _b = referencingFile.referencedFiles; _a < _b.length; _a++) {
                         var ref = _b[_a];
                         if (program.getSourceFileFromReference(referencingFile, ref) === searchSourceFile) {
@@ -101310,7 +104435,7 @@ var ts;
         }
         /** Iterates over all statements at the top level or in module declarations. Returns the first truthy result. */
         function forEachPossibleImportOrExportStatement(sourceFileLike, action) {
-            return ts.forEach(sourceFileLike.kind === 284 /* SourceFile */ ? sourceFileLike.statements : sourceFileLike.body.statements, function (statement) {
+            return ts.forEach(sourceFileLike.kind === 285 /* SourceFile */ ? sourceFileLike.statements : sourceFileLike.body.statements, function (statement) {
                 return action(statement) || (isAmbientModuleDeclaration(statement) && ts.forEach(statement.body && statement.body.statements, action));
             });
         }
@@ -101325,15 +104450,15 @@ var ts;
             else {
                 forEachPossibleImportOrExportStatement(sourceFile, function (statement) {
                     switch (statement.kind) {
-                        case 255 /* ExportDeclaration */:
-                        case 249 /* ImportDeclaration */: {
+                        case 256 /* ExportDeclaration */:
+                        case 250 /* ImportDeclaration */: {
                             var decl = statement;
                             if (decl.moduleSpecifier && ts.isStringLiteral(decl.moduleSpecifier)) {
                                 action(decl, decl.moduleSpecifier);
                             }
                             break;
                         }
-                        case 248 /* ImportEqualsDeclaration */: {
+                        case 249 /* ImportEqualsDeclaration */: {
                             var decl = statement;
                             if (isExternalModuleImportEquals(decl)) {
                                 action(decl, decl.moduleReference.expression);
@@ -101357,7 +104482,7 @@ var ts;
                 var parent = node.parent;
                 var grandParent = parent.parent;
                 if (symbol.exportSymbol) {
-                    if (parent.kind === 189 /* PropertyAccessExpression */) {
+                    if (parent.kind === 190 /* PropertyAccessExpression */) {
                         // When accessing an export of a JS module, there's no alias. The symbol will still be flagged as an export even though we're at the use.
                         // So check that we are at the declaration.
                         return symbol.declarations.some(function (d) { return d === parent; }) && ts.isBinaryExpression(grandParent)
@@ -101423,7 +104548,7 @@ var ts;
                     var sym = useLhsSymbol ? checker.getSymbolAtLocation(ts.cast(node.left, ts.isPropertyAccessExpression).name) : symbol;
                     // Better detection for GH#20803
                     if (sym && !(checker.getMergedSymbol(sym.parent).flags & 1536 /* Module */)) {
-                        ts.Debug.fail("Special property assignment kind does not have a module as its parent. Assignment is " + ts.Debug.showSymbol(sym) + ", parent is " + ts.Debug.showSymbol(sym.parent));
+                        ts.Debug.fail("Special property assignment kind does not have a module as its parent. Assignment is " + ts.Debug.formatSymbol(sym) + ", parent is " + ts.Debug.formatSymbol(sym.parent));
                     }
                     return sym && exportInfo(sym, kind);
                 }
@@ -101479,10 +104604,10 @@ var ts;
         // If a reference is a class expression, the exported node would be its parent.
         // If a reference is a variable declaration, the exported node would be the variable statement.
         function getExportNode(parent, node) {
-            if (parent.kind === 237 /* VariableDeclaration */) {
+            if (parent.kind === 238 /* VariableDeclaration */) {
                 var p = parent;
                 return p.name !== node ? undefined :
-                    p.parent.kind === 274 /* CatchClause */ ? undefined : p.parent.parent.kind === 219 /* VariableStatement */ ? p.parent.parent : undefined;
+                    p.parent.kind === 275 /* CatchClause */ ? undefined : p.parent.parent.kind === 220 /* VariableStatement */ ? p.parent.parent : undefined;
             }
             else {
                 return parent;
@@ -101491,13 +104616,13 @@ var ts;
         function isNodeImport(node) {
             var parent = node.parent;
             switch (parent.kind) {
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return parent.name === node && isExternalModuleImportEquals(parent);
-                case 253 /* ImportSpecifier */:
+                case 254 /* ImportSpecifier */:
                     // For a rename import `{ foo as bar }`, don't search for the imported symbol. Just find local uses of `bar`.
                     return !parent.propertyName;
-                case 250 /* ImportClause */:
-                case 251 /* NamespaceImport */:
+                case 251 /* ImportClause */:
+                case 252 /* NamespaceImport */:
                     ts.Debug.assert(parent.name === node);
                     return true;
                 default:
@@ -101530,21 +104655,21 @@ var ts;
             return checker.getMergedSymbol(getSourceFileLikeForImportDeclaration(importer).symbol);
         }
         function getSourceFileLikeForImportDeclaration(node) {
-            if (node.kind === 191 /* CallExpression */) {
+            if (node.kind === 192 /* CallExpression */) {
                 return node.getSourceFile();
             }
             var parent = node.parent;
-            if (parent.kind === 284 /* SourceFile */) {
+            if (parent.kind === 285 /* SourceFile */) {
                 return parent;
             }
-            ts.Debug.assert(parent.kind === 245 /* ModuleBlock */);
+            ts.Debug.assert(parent.kind === 246 /* ModuleBlock */);
             return ts.cast(parent.parent, isAmbientModuleDeclaration);
         }
         function isAmbientModuleDeclaration(node) {
-            return node.kind === 244 /* ModuleDeclaration */ && node.name.kind === 10 /* StringLiteral */;
+            return node.kind === 245 /* ModuleDeclaration */ && node.name.kind === 10 /* StringLiteral */;
         }
         function isExternalModuleImportEquals(eq) {
-            return eq.moduleReference.kind === 259 /* ExternalModuleReference */ && eq.moduleReference.expression.kind === 10 /* StringLiteral */;
+            return eq.moduleReference.kind === 260 /* ExternalModuleReference */ && eq.moduleReference.expression.kind === 10 /* StringLiteral */;
         }
     })(FindAllReferences = ts.FindAllReferences || (ts.FindAllReferences = {}));
 })(ts || (ts = {}));
@@ -101571,9 +104696,131 @@ var ts;
         })(EntryKind = FindAllReferences.EntryKind || (FindAllReferences.EntryKind = {}));
         function nodeEntry(node, kind) {
             if (kind === void 0) { kind = 1 /* Node */; }
-            return { kind: kind, node: node.name || node };
+            return {
+                kind: kind,
+                node: node.name || node,
+                context: getContextNodeForNodeEntry(node)
+            };
         }
         FindAllReferences.nodeEntry = nodeEntry;
+        function isContextWithStartAndEndNode(node) {
+            return node && node.kind === undefined;
+        }
+        FindAllReferences.isContextWithStartAndEndNode = isContextWithStartAndEndNode;
+        function getContextNodeForNodeEntry(node) {
+            if (ts.isDeclaration(node)) {
+                return getContextNode(node);
+            }
+            if (!node.parent)
+                return undefined;
+            if (!ts.isDeclaration(node.parent) && !ts.isExportAssignment(node.parent)) {
+                // Special property assignment in javascript
+                if (ts.isInJSFile(node)) {
+                    var binaryExpression = ts.isBinaryExpression(node.parent) ?
+                        node.parent :
+                        ts.isPropertyAccessExpression(node.parent) &&
+                            ts.isBinaryExpression(node.parent.parent) &&
+                            node.parent.parent.left === node.parent ?
+                            node.parent.parent :
+                            undefined;
+                    if (binaryExpression && ts.getAssignmentDeclarationKind(binaryExpression) !== 0 /* None */) {
+                        return getContextNode(binaryExpression);
+                    }
+                }
+                // Jsx Tags
+                if (ts.isJsxOpeningElement(node.parent) || ts.isJsxClosingElement(node.parent)) {
+                    return node.parent.parent;
+                }
+                else if (ts.isJsxSelfClosingElement(node.parent) ||
+                    ts.isLabeledStatement(node.parent) ||
+                    ts.isBreakOrContinueStatement(node.parent)) {
+                    return node.parent;
+                }
+                else if (ts.isStringLiteralLike(node)) {
+                    var validImport = ts.tryGetImportFromModuleSpecifier(node);
+                    if (validImport) {
+                        var declOrStatement = ts.findAncestor(validImport, function (node) {
+                            return ts.isDeclaration(node) ||
+                                ts.isStatement(node) ||
+                                ts.isJSDocTag(node);
+                        });
+                        return ts.isDeclaration(declOrStatement) ?
+                            getContextNode(declOrStatement) :
+                            declOrStatement;
+                    }
+                }
+                // Handle computed property name
+                var propertyName = ts.findAncestor(node, ts.isComputedPropertyName);
+                return propertyName ?
+                    getContextNode(propertyName.parent) :
+                    undefined;
+            }
+            if (node.parent.name === node || // node is name of declaration, use parent
+                ts.isConstructorDeclaration(node.parent) ||
+                ts.isExportAssignment(node.parent) ||
+                // Property name of the import export specifier or binding pattern, use parent
+                ((ts.isImportOrExportSpecifier(node.parent) || ts.isBindingElement(node.parent))
+                    && node.parent.propertyName === node) ||
+                // Is default export
+                (node.kind === 81 /* DefaultKeyword */ && ts.hasModifier(node.parent, 513 /* ExportDefault */))) {
+                return getContextNode(node.parent);
+            }
+            return undefined;
+        }
+        function getContextNode(node) {
+            if (!node)
+                return undefined;
+            switch (node.kind) {
+                case 238 /* VariableDeclaration */:
+                    return !ts.isVariableDeclarationList(node.parent) || node.parent.declarations.length !== 1 ?
+                        node :
+                        ts.isVariableStatement(node.parent.parent) ?
+                            node.parent.parent :
+                            ts.isForInOrOfStatement(node.parent.parent) ?
+                                getContextNode(node.parent.parent) :
+                                node.parent;
+                case 187 /* BindingElement */:
+                    return getContextNode(node.parent.parent);
+                case 254 /* ImportSpecifier */:
+                    return node.parent.parent.parent;
+                case 258 /* ExportSpecifier */:
+                case 252 /* NamespaceImport */:
+                    return node.parent.parent;
+                case 251 /* ImportClause */:
+                    return node.parent;
+                case 205 /* BinaryExpression */:
+                    return ts.isExpressionStatement(node.parent) ?
+                        node.parent :
+                        node;
+                case 228 /* ForOfStatement */:
+                case 227 /* ForInStatement */:
+                    return {
+                        start: node.initializer,
+                        end: node.expression
+                    };
+                case 276 /* PropertyAssignment */:
+                case 277 /* ShorthandPropertyAssignment */:
+                    return ts.isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent) ?
+                        getContextNode(ts.findAncestor(node.parent, function (node) {
+                            return ts.isBinaryExpression(node) || ts.isForInOrOfStatement(node);
+                        })) :
+                        node;
+                default:
+                    return node;
+            }
+        }
+        FindAllReferences.getContextNode = getContextNode;
+        function toContextSpan(textSpan, sourceFile, context) {
+            if (!context)
+                return undefined;
+            var contextSpan = isContextWithStartAndEndNode(context) ?
+                getTextSpan(context.start, sourceFile, context.end) :
+                getTextSpan(context, sourceFile);
+            return contextSpan.start !== textSpan.start || contextSpan.length !== textSpan.length ?
+                { contextSpan: contextSpan } :
+                undefined;
+        }
+        FindAllReferences.toContextSpan = toContextSpan;
         function findReferencedSymbols(program, cancellationToken, sourceFiles, sourceFile, position) {
             var node = ts.getTouchingPropertyName(sourceFile, position);
             var referencedSymbols = FindAllReferences.Core.getReferencedSymbolsForNode(position, node, program, sourceFiles, cancellationToken);
@@ -101596,18 +104843,18 @@ var ts;
         }
         FindAllReferences.getImplementationsAtPosition = getImplementationsAtPosition;
         function getImplementationReferenceEntries(program, cancellationToken, sourceFiles, node, position) {
-            if (node.kind === 284 /* SourceFile */) {
+            if (node.kind === 285 /* SourceFile */) {
                 return undefined;
             }
             var checker = program.getTypeChecker();
             // If invoked directly on a shorthand property assignment, then return
             // the declaration of the symbol being assigned (not the symbol being assigned to).
-            if (node.parent.kind === 276 /* ShorthandPropertyAssignment */) {
+            if (node.parent.kind === 277 /* ShorthandPropertyAssignment */) {
                 var result_1 = [];
                 FindAllReferences.Core.getReferenceEntriesForShorthandPropertyAssignment(node, checker, function (node) { return result_1.push(nodeEntry(node)); });
                 return result_1;
             }
-            else if (node.kind === 98 /* SuperKeyword */ || ts.isSuperProperty(node.parent)) {
+            else if (node.kind === 99 /* SuperKeyword */ || ts.isSuperProperty(node.parent)) {
                 // References to and accesses on the super keyword only have one possible implementation, so no
                 // need to "Find all References"
                 var symbol = checker.getSymbolAtLocation(node);
@@ -101638,7 +104885,16 @@ var ts;
                         var symbol = def.symbol;
                         var _a = getDefinitionKindAndDisplayParts(symbol, checker, originalNode), displayParts_1 = _a.displayParts, kind_1 = _a.kind;
                         var name_1 = displayParts_1.map(function (p) { return p.text; }).join("");
-                        return { node: symbol.declarations ? ts.getNameOfDeclaration(ts.first(symbol.declarations)) || ts.first(symbol.declarations) : originalNode, name: name_1, kind: kind_1, displayParts: displayParts_1 };
+                        var declaration = symbol.declarations ? ts.first(symbol.declarations) : undefined;
+                        return {
+                            node: declaration ?
+                                ts.getNameOfDeclaration(declaration) || declaration :
+                                originalNode,
+                            name: name_1,
+                            kind: kind_1,
+                            displayParts: displayParts_1,
+                            context: getContextNode(declaration)
+                        };
                     }
                     case 1 /* Label */: {
                         var node_1 = def.node;
@@ -101663,9 +104919,13 @@ var ts;
                         return ts.Debug.assertNever(def);
                 }
             })();
-            var node = info.node, name = info.name, kind = info.kind, displayParts = info.displayParts;
+            var node = info.node, name = info.name, kind = info.kind, displayParts = info.displayParts, context = info.context;
             var sourceFile = node.getSourceFile();
-            return { containerKind: "" /* unknown */, containerName: "", fileName: sourceFile.fileName, kind: kind, name: name, textSpan: getTextSpan(ts.isComputedPropertyName(node) ? node.expression : node, sourceFile), displayParts: displayParts };
+            var textSpan = getTextSpan(ts.isComputedPropertyName(node) ? node.expression : node, sourceFile);
+            return __assign({ containerKind: "" /* unknown */, containerName: "", fileName: sourceFile.fileName, kind: kind,
+                name: name,
+                textSpan: textSpan,
+                displayParts: displayParts }, toContextSpan(textSpan, sourceFile, context));
         }
         function getDefinitionKindAndDisplayParts(symbol, checker, node) {
             var meaning = FindAllReferences.Core.getIntersectingMeaningFromDeclarations(node, symbol);
@@ -101678,20 +104938,14 @@ var ts;
         }
         FindAllReferences.toRenameLocation = toRenameLocation;
         function toReferenceEntry(entry) {
-            var _a = entryToDocumentSpan(entry), textSpan = _a.textSpan, fileName = _a.fileName;
+            var documentSpan = entryToDocumentSpan(entry);
             if (entry.kind === 0 /* Span */) {
-                return { textSpan: textSpan, fileName: fileName, isWriteAccess: false, isDefinition: false };
+                return __assign({}, documentSpan, { isWriteAccess: false, isDefinition: false });
             }
             var kind = entry.kind, node = entry.node;
-            return {
-                textSpan: textSpan,
-                fileName: fileName,
-                isWriteAccess: isWriteAccessForReference(node),
-                isDefinition: node.kind === 80 /* DefaultKeyword */
+            return __assign({}, documentSpan, { isWriteAccess: isWriteAccessForReference(node), isDefinition: node.kind === 81 /* DefaultKeyword */
                     || !!ts.getDeclarationFromName(node)
-                    || ts.isLiteralComputedPropertyDeclarationName(node),
-                isInString: kind === 2 /* StringLiteral */ ? true : undefined,
-            };
+                    || ts.isLiteralComputedPropertyDeclarationName(node), isInString: kind === 2 /* StringLiteral */ ? true : undefined });
         }
         FindAllReferences.toReferenceEntry = toReferenceEntry;
         function entryToDocumentSpan(entry) {
@@ -101700,7 +104954,8 @@ var ts;
             }
             else {
                 var sourceFile = entry.node.getSourceFile();
-                return { textSpan: getTextSpan(entry.node, sourceFile), fileName: sourceFile.fileName };
+                var textSpan = getTextSpan(entry.node, sourceFile);
+                return __assign({ textSpan: textSpan, fileName: sourceFile.fileName }, toContextSpan(textSpan, sourceFile, entry.context));
             }
         }
         function getPrefixAndSuffixText(entry, originalNode, checker) {
@@ -101729,14 +104984,13 @@ var ts;
             return ts.emptyOptions;
         }
         function toImplementationLocation(entry, checker) {
+            var documentSpan = entryToDocumentSpan(entry);
             if (entry.kind !== 0 /* Span */) {
                 var node = entry.node;
-                var sourceFile = node.getSourceFile();
-                return __assign({ textSpan: getTextSpan(node, sourceFile), fileName: sourceFile.fileName }, implementationKindDisplayParts(node, checker));
+                return __assign({}, documentSpan, implementationKindDisplayParts(node, checker));
             }
             else {
-                var textSpan = entry.textSpan, fileName = entry.fileName;
-                return { textSpan: textSpan, fileName: fileName, kind: "" /* unknown */, displayParts: [] };
+                return __assign({}, documentSpan, { kind: "" /* unknown */, displayParts: [] });
             }
         }
         function implementationKindDisplayParts(node, checker) {
@@ -101744,13 +104998,13 @@ var ts;
             if (symbol) {
                 return getDefinitionKindAndDisplayParts(symbol, checker, node);
             }
-            else if (node.kind === 188 /* ObjectLiteralExpression */) {
+            else if (node.kind === 189 /* ObjectLiteralExpression */) {
                 return {
                     kind: "interface" /* interfaceElement */,
                     displayParts: [ts.punctuationPart(20 /* OpenParenToken */), ts.textPart("object literal"), ts.punctuationPart(21 /* CloseParenToken */)]
                 };
             }
-            else if (node.kind === 209 /* ClassExpression */) {
+            else if (node.kind === 210 /* ClassExpression */) {
                 return {
                     kind: "local class" /* localClassElement */,
                     displayParts: [ts.punctuationPart(20 /* OpenParenToken */), ts.textPart("anonymous local class"), ts.punctuationPart(21 /* CloseParenToken */)]
@@ -101761,25 +105015,26 @@ var ts;
             }
         }
         function toHighlightSpan(entry) {
+            var documentSpan = entryToDocumentSpan(entry);
             if (entry.kind === 0 /* Span */) {
-                var fileName = entry.fileName, textSpan = entry.textSpan;
-                return { fileName: fileName, span: { textSpan: textSpan, kind: "reference" /* reference */ } };
+                return {
+                    fileName: documentSpan.fileName,
+                    span: {
+                        textSpan: documentSpan.textSpan,
+                        kind: "reference" /* reference */
+                    }
+                };
             }
-            var node = entry.node, kind = entry.kind;
-            var sourceFile = node.getSourceFile();
-            var writeAccess = isWriteAccessForReference(node);
-            var span = {
-                textSpan: getTextSpan(node, sourceFile),
-                kind: writeAccess ? "writtenReference" /* writtenReference */ : "reference" /* reference */,
-                isInString: kind === 2 /* StringLiteral */ ? true : undefined,
-            };
-            return { fileName: sourceFile.fileName, span: span };
+            var writeAccess = isWriteAccessForReference(entry.node);
+            var span = __assign({ textSpan: documentSpan.textSpan, kind: writeAccess ? "writtenReference" /* writtenReference */ : "reference" /* reference */, isInString: entry.kind === 2 /* StringLiteral */ ? true : undefined }, documentSpan.contextSpan && { contextSpan: documentSpan.contextSpan });
+            return { fileName: documentSpan.fileName, span: span };
         }
         FindAllReferences.toHighlightSpan = toHighlightSpan;
-        function getTextSpan(node, sourceFile) {
+        function getTextSpan(node, sourceFile, endNode) {
             var start = node.getStart(sourceFile);
-            var end = node.getEnd();
+            var end = (endNode || node).getEnd();
             if (node.kind === 10 /* StringLiteral */) {
+                ts.Debug.assert(endNode === undefined);
                 start += 1;
                 end -= 1;
             }
@@ -101793,7 +105048,7 @@ var ts;
         /** A node is considered a writeAccess iff it is a name of a declaration or a target of an assignment */
         function isWriteAccessForReference(node) {
             var decl = ts.getDeclarationFromName(node);
-            return !!decl && declarationIsWriteAccess(decl) || node.kind === 80 /* DefaultKeyword */ || ts.isWriteAccess(node);
+            return !!decl && declarationIsWriteAccess(decl) || node.kind === 81 /* DefaultKeyword */ || ts.isWriteAccess(node);
         }
         /**
          * True if 'decl' provides a value, as in `function f() {}`;
@@ -101804,46 +105059,46 @@ var ts;
             if (!!(decl.flags & 4194304 /* Ambient */))
                 return true;
             switch (decl.kind) {
-                case 204 /* BinaryExpression */:
-                case 186 /* BindingElement */:
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
-                case 80 /* DefaultKeyword */:
-                case 243 /* EnumDeclaration */:
-                case 278 /* EnumMember */:
-                case 257 /* ExportSpecifier */:
-                case 250 /* ImportClause */: // default import
-                case 248 /* ImportEqualsDeclaration */:
-                case 253 /* ImportSpecifier */:
-                case 241 /* InterfaceDeclaration */:
-                case 302 /* JSDocCallbackTag */:
-                case 309 /* JSDocTypedefTag */:
-                case 267 /* JsxAttribute */:
-                case 244 /* ModuleDeclaration */:
-                case 247 /* NamespaceExportDeclaration */:
-                case 251 /* NamespaceImport */:
-                case 151 /* Parameter */:
-                case 276 /* ShorthandPropertyAssignment */:
-                case 242 /* TypeAliasDeclaration */:
-                case 150 /* TypeParameter */:
+                case 205 /* BinaryExpression */:
+                case 187 /* BindingElement */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
+                case 81 /* DefaultKeyword */:
+                case 244 /* EnumDeclaration */:
+                case 279 /* EnumMember */:
+                case 258 /* ExportSpecifier */:
+                case 251 /* ImportClause */: // default import
+                case 249 /* ImportEqualsDeclaration */:
+                case 254 /* ImportSpecifier */:
+                case 242 /* InterfaceDeclaration */:
+                case 304 /* JSDocCallbackTag */:
+                case 311 /* JSDocTypedefTag */:
+                case 268 /* JsxAttribute */:
+                case 245 /* ModuleDeclaration */:
+                case 248 /* NamespaceExportDeclaration */:
+                case 252 /* NamespaceImport */:
+                case 152 /* Parameter */:
+                case 277 /* ShorthandPropertyAssignment */:
+                case 243 /* TypeAliasDeclaration */:
+                case 151 /* TypeParameter */:
                     return true;
-                case 275 /* PropertyAssignment */:
+                case 276 /* PropertyAssignment */:
                     // In `({ x: y } = 0);`, `x` is not a write access. (Won't call this function for `y`.)
                     return !ts.isArrayLiteralOrObjectLiteralDestructuringPattern(decl.parent);
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
-                case 157 /* Constructor */:
-                case 156 /* MethodDeclaration */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 158 /* Constructor */:
+                case 157 /* MethodDeclaration */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     return !!decl.body;
-                case 237 /* VariableDeclaration */:
-                case 154 /* PropertyDeclaration */:
+                case 238 /* VariableDeclaration */:
+                case 155 /* PropertyDeclaration */:
                     return !!decl.initializer || ts.isCatchClause(decl.parent);
-                case 155 /* MethodSignature */:
-                case 153 /* PropertySignature */:
-                case 310 /* JSDocPropertyTag */:
-                case 304 /* JSDocParameterTag */:
+                case 156 /* MethodSignature */:
+                case 154 /* PropertySignature */:
+                case 312 /* JSDocPropertyTag */:
+                case 306 /* JSDocParameterTag */:
                     return false;
                 default:
                     return ts.Debug.failBadSyntaxKind(decl);
@@ -102003,10 +105258,10 @@ var ts;
                 for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                     var decl = _a[_i];
                     switch (decl.kind) {
-                        case 284 /* SourceFile */:
+                        case 285 /* SourceFile */:
                             // Don't include the source file itself. (This may not be ideal behavior, but awkward to include an entire file as a reference.)
                             break;
-                        case 244 /* ModuleDeclaration */:
+                        case 245 /* ModuleDeclaration */:
                             if (sourceFilesSet.has(decl.getSourceFile().fileName)) {
                                 references.push(FindAllReferences.nodeEntry(decl.name));
                             }
@@ -102026,7 +105281,7 @@ var ts;
                             var node = ts.isBinaryExpression(decl) && ts.isPropertyAccessExpression(decl.left)
                                 ? decl.left.expression
                                 : ts.isExportAssignment(decl)
-                                    ? ts.Debug.assertDefined(ts.findChildOfKind(decl, 85 /* ExportKeyword */, sourceFile))
+                                    ? ts.Debug.assertDefined(ts.findChildOfKind(decl, 86 /* ExportKeyword */, sourceFile))
                                     : ts.getNameOfDeclaration(decl) || decl;
                             references.push(FindAllReferences.nodeEntry(node));
                         }
@@ -102053,7 +105308,7 @@ var ts;
                 if (ts.isThis(node)) {
                     return getReferencesForThisKeyword(node, sourceFiles, cancellationToken);
                 }
-                if (node.kind === 98 /* SuperKeyword */) {
+                if (node.kind === 99 /* SuperKeyword */) {
                     return getReferencesForSuperKeyword(node);
                 }
                 return undefined;
@@ -102070,34 +105325,37 @@ var ts;
                     // When renaming at an export specifier, rename the export and not the thing being exported.
                     getReferencesAtExportSpecifier(exportSpecifier.name, symbol, exportSpecifier, state.createSearch(node, originalSymbol, /*comingFrom*/ undefined), state, /*addReferencesHere*/ true, /*alwaysGetReferences*/ true);
                 }
-                else if (node && node.kind === 80 /* DefaultKeyword */) {
+                else if (node && node.kind === 81 /* DefaultKeyword */) {
                     addReference(node, symbol, state);
                     searchForImportsOfExport(node, symbol, { exportingModuleSymbol: ts.Debug.assertDefined(symbol.parent, "Expected export symbol to have a parent"), exportKind: 1 /* Default */ }, state);
                 }
                 else {
                     var search = state.createSearch(node, symbol, /*comingFrom*/ undefined, { allSearchSymbols: node ? populateSearchSymbolSet(symbol, node, checker, !!options.isForRename, !!options.providePrefixAndSuffixTextForRename, !!options.implementations) : [symbol] });
-                    // Try to get the smallest valid scope that we can limit our search to;
-                    // otherwise we'll need to search globally (i.e. include each file).
-                    var scope = getSymbolScope(symbol);
-                    if (scope) {
-                        getReferencesInContainer(scope, scope.getSourceFile(), search, state, /*addReferencesHere*/ !(ts.isSourceFile(scope) && !ts.contains(sourceFiles, scope)));
-                    }
-                    else {
-                        // Global search
-                        for (var _i = 0, _a = state.sourceFiles; _i < _a.length; _i++) {
-                            var sourceFile = _a[_i];
-                            state.cancellationToken.throwIfCancellationRequested();
-                            searchForName(sourceFile, search, state);
-                        }
-                    }
+                    getReferencesInContainerOrFiles(symbol, state, search);
                 }
                 return result;
             }
+            function getReferencesInContainerOrFiles(symbol, state, search) {
+                // Try to get the smallest valid scope that we can limit our search to;
+                // otherwise we'll need to search globally (i.e. include each file).
+                var scope = getSymbolScope(symbol);
+                if (scope) {
+                    getReferencesInContainer(scope, scope.getSourceFile(), search, state, /*addReferencesHere*/ !(ts.isSourceFile(scope) && !ts.contains(state.sourceFiles, scope)));
+                }
+                else {
+                    // Global search
+                    for (var _i = 0, _a = state.sourceFiles; _i < _a.length; _i++) {
+                        var sourceFile = _a[_i];
+                        state.cancellationToken.throwIfCancellationRequested();
+                        searchForName(sourceFile, search, state);
+                    }
+                }
+            }
             function getSpecialSearchKind(node) {
                 switch (node.kind) {
-                    case 124 /* ConstructorKeyword */:
+                    case 125 /* ConstructorKeyword */:
                         return 1 /* Constructor */;
-                    case 72 /* Identifier */:
+                    case 73 /* Identifier */:
                         if (ts.isClassLike(node.parent)) {
                             ts.Debug.assert(node.parent.name === node);
                             return 2 /* Class */;
@@ -102120,7 +105378,7 @@ var ts;
                         if (symbol.flags & 33554432 /* Transient */)
                             return undefined;
                         // Assertions for GH#21814. We should be handling SourceFile symbols in `getReferencedSymbolsForModule` instead of getting here.
-                        ts.Debug.fail("Unexpected symbol at " + ts.Debug.showSyntaxKind(node) + ": " + ts.Debug.showSymbol(symbol));
+                        ts.Debug.fail("Unexpected symbol at " + ts.Debug.formatSyntaxKind(node.kind) + ": " + ts.Debug.formatSymbol(symbol));
                     }
                     return ts.isTypeLiteralNode(decl.parent) && ts.isUnionTypeNode(decl.parent.parent)
                         ? checker.getPropertyOfType(checker.getTypeFromTypeNode(decl.parent.parent), symbol.name)
@@ -102144,9 +105402,7 @@ var ts;
              * Unlike `Search`, there is only one `State`.
              */
             var State = /** @class */ (function () {
-                function State(sourceFiles, sourceFilesSet, 
-                /** True if we're searching for constructor references. */
-                specialSearchKind, checker, cancellationToken, searchMeaning, options, result) {
+                function State(sourceFiles, sourceFilesSet, specialSearchKind, checker, cancellationToken, searchMeaning, options, result) {
                     this.sourceFiles = sourceFiles;
                     this.sourceFilesSet = sourceFilesSet;
                     this.specialSearchKind = specialSearchKind;
@@ -102227,8 +105483,8 @@ var ts;
                     var sourceId = ts.getNodeId(sourceFile);
                     var seenSymbols = this.sourceFileToSeenSymbols[sourceId] || (this.sourceFileToSeenSymbols[sourceId] = ts.createMap());
                     var anyNewSymbols = false;
-                    for (var _i = 0, symbols_2 = symbols; _i < symbols_2.length; _i++) {
-                        var sym = symbols_2[_i];
+                    for (var _i = 0, symbols_3 = symbols; _i < symbols_3.length; _i++) {
+                        var sym = symbols_3[_i];
                         anyNewSymbols = ts.addToSeen(seenSymbols, ts.getSymbolId(sym)) || anyNewSymbols;
                     }
                     return anyNewSymbols;
@@ -102335,7 +105591,7 @@ var ts;
                 // If this is the symbol of a named function expression or named class expression,
                 // then named references are limited to its own scope.
                 var declarations = symbol.declarations, flags = symbol.flags, parent = symbol.parent, valueDeclaration = symbol.valueDeclaration;
-                if (valueDeclaration && (valueDeclaration.kind === 196 /* FunctionExpression */ || valueDeclaration.kind === 209 /* ClassExpression */)) {
+                if (valueDeclaration && (valueDeclaration.kind === 197 /* FunctionExpression */ || valueDeclaration.kind === 210 /* ClassExpression */)) {
                     return valueDeclaration;
                 }
                 if (!declarations) {
@@ -102345,7 +105601,7 @@ var ts;
                 if (flags & (4 /* Property */ | 8192 /* Method */)) {
                     var privateDeclaration = ts.find(declarations, function (d) { return ts.hasModifier(d, 8 /* Private */); });
                     if (privateDeclaration) {
-                        return ts.getAncestor(privateDeclaration, 240 /* ClassDeclaration */);
+                        return ts.getAncestor(privateDeclaration, 241 /* ClassDeclaration */);
                     }
                     // Else this is a public property and could be accessed from anywhere.
                     return undefined;
@@ -102374,7 +105630,7 @@ var ts;
                         // Different declarations have different containers, bail out
                         return undefined;
                     }
-                    if (!container || container.kind === 284 /* SourceFile */ && !ts.isExternalOrCommonJsModule(container)) {
+                    if (!container || container.kind === 285 /* SourceFile */ && !ts.isExternalOrCommonJsModule(container)) {
                         // This is a global variable and not an external module, any declaration defined
                         // within this scope is visible outside the file
                         return undefined;
@@ -102461,8 +105717,8 @@ var ts;
                     // We found a match.  Make sure it's not part of a larger word (i.e. the char
                     // before and after it have to be a non-identifier char).
                     var endPosition = position + symbolNameLength;
-                    if ((position === 0 || !ts.isIdentifierPart(text.charCodeAt(position - 1), 7 /* Latest */)) &&
-                        (endPosition === sourceLength || !ts.isIdentifierPart(text.charCodeAt(endPosition), 7 /* Latest */))) {
+                    if ((position === 0 || !ts.isIdentifierPart(text.charCodeAt(position - 1), 99 /* Latest */)) &&
+                        (endPosition === sourceLength || !ts.isIdentifierPart(text.charCodeAt(endPosition), 99 /* Latest */))) {
                         // Found a real match.  Keep searching.
                         positions.push(position);
                     }
@@ -102482,7 +105738,7 @@ var ts;
             function isValidReferencePosition(node, searchSymbolName) {
                 // Compare the length so we filter out strict superstrings of the symbol we are looking for
                 switch (node.kind) {
-                    case 72 /* Identifier */:
+                    case 73 /* Identifier */:
                         return node.text.length === searchSymbolName.length;
                     case 10 /* StringLiteral */: {
                         var str = node;
@@ -102491,7 +105747,7 @@ var ts;
                     }
                     case 8 /* NumericLiteral */:
                         return ts.isLiteralNameOfPropertyDeclarationOrIndexAccess(node) && node.text.length === searchSymbolName.length;
-                    case 80 /* DefaultKeyword */:
+                    case 81 /* DefaultKeyword */:
                         return "default".length === searchSymbolName.length;
                     default:
                         return false;
@@ -102555,7 +105811,7 @@ var ts;
                     return;
                 }
                 if (ts.isExportSpecifier(parent)) {
-                    ts.Debug.assert(referenceLocation.kind === 72 /* Identifier */);
+                    ts.Debug.assert(referenceLocation.kind === 73 /* Identifier */);
                     getReferencesAtExportSpecifier(referenceLocation, referenceSymbol, parent, search, state, addReferencesHere);
                     return;
                 }
@@ -102611,7 +105867,9 @@ var ts;
                 }
                 // For `export { foo as bar }`, rename `foo`, but not `bar`.
                 if (!isForRenameWithPrefixAndSuffixText(state.options) || alwaysGetReferences) {
-                    var exportKind = referenceLocation.originalKeywordKind === 80 /* DefaultKeyword */ ? 1 /* Default */ : 0 /* Named */;
+                    var isDefaultExport = referenceLocation.originalKeywordKind === 81 /* DefaultKeyword */
+                        || exportSpecifier.name.originalKeywordKind === 81 /* DefaultKeyword */;
+                    var exportKind = isDefaultExport ? 1 /* Default */ : 0 /* Named */;
                     var exportSymbol = ts.Debug.assertDefined(exportSpecifier.symbol);
                     var exportInfo = ts.Debug.assertDefined(FindAllReferences.getExportInfo(exportSymbol, exportKind, state.checker));
                     searchForImportsOfExport(referenceLocation, exportSymbol, exportInfo, state);
@@ -102689,7 +105947,7 @@ var ts;
                 }
                 var pusher = function () { return state.referenceAdder(search.symbol); };
                 if (ts.isClassLike(referenceLocation.parent)) {
-                    ts.Debug.assert(referenceLocation.kind === 80 /* DefaultKeyword */ || referenceLocation.parent.name === referenceLocation);
+                    ts.Debug.assert(referenceLocation.kind === 81 /* DefaultKeyword */ || referenceLocation.parent.name === referenceLocation);
                     // This is the class declaration containing the constructor.
                     findOwnConstructorReferences(search.symbol, sourceFile, pusher());
                 }
@@ -102698,6 +105956,7 @@ var ts;
                     var classExtending = tryGetClassByExtendingIdentifier(referenceLocation);
                     if (classExtending) {
                         findSuperConstructorAccesses(classExtending, pusher());
+                        findInheritedConstructorReferences(classExtending, state);
                     }
                 }
             }
@@ -102715,7 +105974,7 @@ var ts;
                     }
                     if (member.body) {
                         member.body.forEachChild(function cb(node) {
-                            if (node.kind === 100 /* ThisKeyword */) {
+                            if (node.kind === 101 /* ThisKeyword */) {
                                 addRef(node);
                             }
                             else if (!ts.isFunctionLike(node) && !ts.isClassLike(node)) {
@@ -102730,38 +105989,46 @@ var ts;
              * Reference the constructor and all calls to `new this()`.
              */
             function findOwnConstructorReferences(classSymbol, sourceFile, addNode) {
-                for (var _i = 0, _a = classSymbol.members.get("__constructor" /* Constructor */).declarations; _i < _a.length; _i++) {
-                    var decl = _a[_i];
-                    var ctrKeyword = ts.findChildOfKind(decl, 124 /* ConstructorKeyword */, sourceFile);
-                    ts.Debug.assert(decl.kind === 157 /* Constructor */ && !!ctrKeyword);
-                    addNode(ctrKeyword);
-                }
-                classSymbol.exports.forEach(function (member) {
-                    var decl = member.valueDeclaration;
-                    if (decl && decl.kind === 156 /* MethodDeclaration */) {
-                        var body = decl.body;
-                        if (body) {
-                            forEachDescendantOfKind(body, 100 /* ThisKeyword */, function (thisKeyword) {
-                                if (ts.isNewExpressionTarget(thisKeyword)) {
-                                    addNode(thisKeyword);
-                                }
-                            });
-                        }
+                var constructorSymbol = getClassConstructorSymbol(classSymbol);
+                if (constructorSymbol) {
+                    for (var _i = 0, _a = constructorSymbol.declarations; _i < _a.length; _i++) {
+                        var decl = _a[_i];
+                        var ctrKeyword = ts.findChildOfKind(decl, 125 /* ConstructorKeyword */, sourceFile);
+                        ts.Debug.assert(decl.kind === 158 /* Constructor */ && !!ctrKeyword);
+                        addNode(ctrKeyword);
                     }
-                });
+                }
+                if (classSymbol.exports) {
+                    classSymbol.exports.forEach(function (member) {
+                        var decl = member.valueDeclaration;
+                        if (decl && decl.kind === 157 /* MethodDeclaration */) {
+                            var body = decl.body;
+                            if (body) {
+                                forEachDescendantOfKind(body, 101 /* ThisKeyword */, function (thisKeyword) {
+                                    if (ts.isNewExpressionTarget(thisKeyword)) {
+                                        addNode(thisKeyword);
+                                    }
+                                });
+                            }
+                        }
+                    });
+                }
+            }
+            function getClassConstructorSymbol(classSymbol) {
+                return classSymbol.members && classSymbol.members.get("__constructor" /* Constructor */);
             }
             /** Find references to `super` in the constructor of an extending class.  */
-            function findSuperConstructorAccesses(cls, addNode) {
-                var ctr = cls.symbol.members.get("__constructor" /* Constructor */);
-                if (!ctr) {
+            function findSuperConstructorAccesses(classDeclaration, addNode) {
+                var constructor = getClassConstructorSymbol(classDeclaration.symbol);
+                if (!constructor) {
                     return;
                 }
-                for (var _i = 0, _a = ctr.declarations; _i < _a.length; _i++) {
+                for (var _i = 0, _a = constructor.declarations; _i < _a.length; _i++) {
                     var decl = _a[_i];
-                    ts.Debug.assert(decl.kind === 157 /* Constructor */);
+                    ts.Debug.assert(decl.kind === 158 /* Constructor */);
                     var body = decl.body;
                     if (body) {
-                        forEachDescendantOfKind(body, 98 /* SuperKeyword */, function (node) {
+                        forEachDescendantOfKind(body, 99 /* SuperKeyword */, function (node) {
                             if (ts.isCallExpressionTarget(node)) {
                                 addNode(node);
                             }
@@ -102769,16 +106036,26 @@ var ts;
                     }
                 }
             }
+            function hasOwnConstructor(classDeclaration) {
+                return !!getClassConstructorSymbol(classDeclaration.symbol);
+            }
+            function findInheritedConstructorReferences(classDeclaration, state) {
+                if (hasOwnConstructor(classDeclaration))
+                    return;
+                var classSymbol = classDeclaration.symbol;
+                var search = state.createSearch(/*location*/ undefined, classSymbol, /*comingFrom*/ undefined);
+                getReferencesInContainerOrFiles(classSymbol, state, search);
+            }
             function addImplementationReferences(refNode, addReference, state) {
                 // Check if we found a function/propertyAssignment/method with an implementation or initializer
                 if (ts.isDeclarationName(refNode) && isImplementation(refNode.parent)) {
                     addReference(refNode);
                     return;
                 }
-                if (refNode.kind !== 72 /* Identifier */) {
+                if (refNode.kind !== 73 /* Identifier */) {
                     return;
                 }
-                if (refNode.parent.kind === 276 /* ShorthandPropertyAssignment */) {
+                if (refNode.parent.kind === 277 /* ShorthandPropertyAssignment */) {
                     // Go ahead and dereference the shorthand assignment by going to its definition
                     getReferenceEntriesForShorthandPropertyAssignment(refNode, state.checker, addReference);
                 }
@@ -102798,7 +106075,7 @@ var ts;
                     }
                     else if (ts.isFunctionLike(typeHavingNode) && typeHavingNode.body) {
                         var body = typeHavingNode.body;
-                        if (body.kind === 218 /* Block */) {
+                        if (body.kind === 219 /* Block */) {
                             ts.forEachReturnStatement(body, function (returnStatement) {
                                 if (returnStatement.expression)
                                     addIfImplementation(returnStatement.expression);
@@ -102826,13 +106103,13 @@ var ts;
              */
             function isImplementationExpression(node) {
                 switch (node.kind) {
-                    case 195 /* ParenthesizedExpression */:
+                    case 196 /* ParenthesizedExpression */:
                         return isImplementationExpression(node.expression);
-                    case 197 /* ArrowFunction */:
-                    case 196 /* FunctionExpression */:
-                    case 188 /* ObjectLiteralExpression */:
-                    case 209 /* ClassExpression */:
-                    case 187 /* ArrayLiteralExpression */:
+                    case 198 /* ArrowFunction */:
+                    case 197 /* FunctionExpression */:
+                    case 189 /* ObjectLiteralExpression */:
+                    case 210 /* ClassExpression */:
+                    case 188 /* ArrayLiteralExpression */:
                         return true;
                     default:
                         return false;
@@ -102885,13 +106162,13 @@ var ts;
                 // Whether 'super' occurs in a static context within a class.
                 var staticFlag = 32 /* Static */;
                 switch (searchSpaceNode.kind) {
-                    case 154 /* PropertyDeclaration */:
-                    case 153 /* PropertySignature */:
-                    case 156 /* MethodDeclaration */:
-                    case 155 /* MethodSignature */:
-                    case 157 /* Constructor */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
+                    case 155 /* PropertyDeclaration */:
+                    case 154 /* PropertySignature */:
+                    case 157 /* MethodDeclaration */:
+                    case 156 /* MethodSignature */:
+                    case 158 /* Constructor */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
                         staticFlag &= ts.getModifierFlags(searchSpaceNode);
                         searchSpaceNode = searchSpaceNode.parent; // re-assign to be the owning class
                         break;
@@ -102900,7 +106177,7 @@ var ts;
                 }
                 var sourceFile = searchSpaceNode.getSourceFile();
                 var references = ts.mapDefined(getPossibleSymbolReferenceNodes(sourceFile, "super", searchSpaceNode), function (node) {
-                    if (node.kind !== 98 /* SuperKeyword */) {
+                    if (node.kind !== 99 /* SuperKeyword */) {
                         return;
                     }
                     var container = ts.getSuperContainer(node, /*stopOnFunctions*/ false);
@@ -102912,41 +106189,41 @@ var ts;
                 return [{ definition: { type: 0 /* Symbol */, symbol: searchSpaceNode.symbol }, references: references }];
             }
             function isParameterName(node) {
-                return node.kind === 72 /* Identifier */ && node.parent.kind === 151 /* Parameter */ && node.parent.name === node;
+                return node.kind === 73 /* Identifier */ && node.parent.kind === 152 /* Parameter */ && node.parent.name === node;
             }
             function getReferencesForThisKeyword(thisOrSuperKeyword, sourceFiles, cancellationToken) {
                 var searchSpaceNode = ts.getThisContainer(thisOrSuperKeyword, /* includeArrowFunctions */ false);
                 // Whether 'this' occurs in a static context within a class.
                 var staticFlag = 32 /* Static */;
                 switch (searchSpaceNode.kind) {
-                    case 156 /* MethodDeclaration */:
-                    case 155 /* MethodSignature */:
+                    case 157 /* MethodDeclaration */:
+                    case 156 /* MethodSignature */:
                         if (ts.isObjectLiteralMethod(searchSpaceNode)) {
                             break;
                         }
                     // falls through
-                    case 154 /* PropertyDeclaration */:
-                    case 153 /* PropertySignature */:
-                    case 157 /* Constructor */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
+                    case 155 /* PropertyDeclaration */:
+                    case 154 /* PropertySignature */:
+                    case 158 /* Constructor */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
                         staticFlag &= ts.getModifierFlags(searchSpaceNode);
                         searchSpaceNode = searchSpaceNode.parent; // re-assign to be the owning class
                         break;
-                    case 284 /* SourceFile */:
+                    case 285 /* SourceFile */:
                         if (ts.isExternalModule(searchSpaceNode) || isParameterName(thisOrSuperKeyword)) {
                             return undefined;
                         }
                     // falls through
-                    case 239 /* FunctionDeclaration */:
-                    case 196 /* FunctionExpression */:
+                    case 240 /* FunctionDeclaration */:
+                    case 197 /* FunctionExpression */:
                         break;
                     // Computed properties in classes are not handled here because references to this are illegal,
                     // so there is no point finding references to them.
                     default:
                         return undefined;
                 }
-                var references = ts.flatMap(searchSpaceNode.kind === 284 /* SourceFile */ ? sourceFiles : [searchSpaceNode.getSourceFile()], function (sourceFile) {
+                var references = ts.flatMap(searchSpaceNode.kind === 285 /* SourceFile */ ? sourceFiles : [searchSpaceNode.getSourceFile()], function (sourceFile) {
                     cancellationToken.throwIfCancellationRequested();
                     return getPossibleSymbolReferenceNodes(sourceFile, "this", ts.isSourceFile(searchSpaceNode) ? sourceFile : searchSpaceNode).filter(function (node) {
                         if (!ts.isThis(node)) {
@@ -102954,19 +106231,19 @@ var ts;
                         }
                         var container = ts.getThisContainer(node, /* includeArrowFunctions */ false);
                         switch (searchSpaceNode.kind) {
-                            case 196 /* FunctionExpression */:
-                            case 239 /* FunctionDeclaration */:
+                            case 197 /* FunctionExpression */:
+                            case 240 /* FunctionDeclaration */:
                                 return searchSpaceNode.symbol === container.symbol;
-                            case 156 /* MethodDeclaration */:
-                            case 155 /* MethodSignature */:
+                            case 157 /* MethodDeclaration */:
+                            case 156 /* MethodSignature */:
                                 return ts.isObjectLiteralMethod(searchSpaceNode) && searchSpaceNode.symbol === container.symbol;
-                            case 209 /* ClassExpression */:
-                            case 240 /* ClassDeclaration */:
+                            case 210 /* ClassExpression */:
+                            case 241 /* ClassDeclaration */:
                                 // Make sure the container belongs to the same class
                                 // and has the appropriate static modifier from the original container.
                                 return container.parent && searchSpaceNode.symbol === container.parent.symbol && (ts.getModifierFlags(container) & 32 /* Static */) === staticFlag;
-                            case 284 /* SourceFile */:
-                                return container.kind === 284 /* SourceFile */ && !ts.isExternalModule(container) && !isParameterName(node);
+                            case 285 /* SourceFile */:
+                                return container.kind === 285 /* SourceFile */ && !ts.isExternalModule(container) && !isParameterName(node);
                         }
                     });
                 }).map(function (n) { return FindAllReferences.nodeEntry(n); });
@@ -103085,7 +106362,7 @@ var ts;
                     });
                 }
                 function getPropertySymbolOfObjectBindingPatternWithoutPropertyName(symbol, checker) {
-                    var bindingElement = ts.getDeclarationOfKind(symbol, 186 /* BindingElement */);
+                    var bindingElement = ts.getDeclarationOfKind(symbol, 187 /* BindingElement */);
                     if (bindingElement && ts.isObjectBindingElementWithoutPropertyName(bindingElement)) {
                         return ts.getPropertySymbolFromBindingElement(checker, bindingElement);
                     }
@@ -103444,7 +106721,7 @@ var ts;
                 else {
                     var defs = getDefinitionFromSymbol(typeChecker, symbol, node) || ts.emptyArray;
                     // For a 'super()' call, put the signature first, else put the variable first.
-                    return node.kind === 98 /* SuperKeyword */ ? [sigInfo].concat(defs) : defs.concat([sigInfo]);
+                    return node.kind === 99 /* SuperKeyword */ ? [sigInfo].concat(defs) : defs.concat([sigInfo]);
                 }
             }
             // Because name in short-hand property assignment has two different meanings: property name and property value,
@@ -103452,7 +106729,7 @@ var ts;
             // go to the declaration of the property name (in this case stay at the same position). However, if go-to-definition
             // is performed at the location of property access, we would like to go to definition of the property in the short-hand
             // assignment. This case and others are handled by the following code.
-            if (node.parent.kind === 276 /* ShorthandPropertyAssignment */) {
+            if (node.parent.kind === 277 /* ShorthandPropertyAssignment */) {
                 var shorthandSymbol_1 = typeChecker.getShorthandAssignmentValueSymbol(symbol.valueDeclaration);
                 return shorthandSymbol_1 ? shorthandSymbol_1.declarations.map(function (decl) { return createDefinitionInfo(decl, typeChecker, shorthandSymbol_1, node); }) : [];
             }
@@ -103508,7 +106785,7 @@ var ts;
         function getReferenceAtPosition(sourceFile, position, program) {
             var referencePath = findReferenceInPosition(sourceFile.referencedFiles, position);
             if (referencePath) {
-                var file = ts.tryResolveScriptReference(program, sourceFile, referencePath);
+                var file = program.getSourceFileFromReference(sourceFile, referencePath);
                 return file && { fileName: referencePath.fileName, file: file };
             }
             var typeReferenceDirective = findReferenceInPosition(sourceFile.typeReferenceDirectives, position);
@@ -103605,18 +106882,18 @@ var ts;
         //   (2) when the aliased symbol is originating from an import.
         //
         function shouldSkipAlias(node, declaration) {
-            if (node.kind !== 72 /* Identifier */) {
+            if (node.kind !== 73 /* Identifier */) {
                 return false;
             }
             if (node.parent === declaration) {
                 return true;
             }
             switch (declaration.kind) {
-                case 250 /* ImportClause */:
-                case 248 /* ImportEqualsDeclaration */:
+                case 251 /* ImportClause */:
+                case 249 /* ImportEqualsDeclaration */:
                     return true;
-                case 253 /* ImportSpecifier */:
-                    return declaration.parent.kind === 252 /* NamedImports */;
+                case 254 /* ImportSpecifier */:
+                    return declaration.parent.kind === 253 /* NamedImports */;
                 default:
                     return false;
             }
@@ -103626,7 +106903,7 @@ var ts;
             function getConstructSignatureDefinition() {
                 // Applicable only if we are in a new expression, or we are on a constructor declaration
                 // and in either case the symbol has a construct signature definition, i.e. class
-                if (symbol.flags & 32 /* Class */ && (ts.isNewExpressionTarget(node) || node.kind === 124 /* ConstructorKeyword */)) {
+                if (symbol.flags & 32 /* Class */ && (ts.isNewExpressionTarget(node) || node.kind === 125 /* ConstructorKeyword */)) {
                     var cls = ts.find(symbol.declarations, ts.isClassLike) || ts.Debug.fail("Expected declaration to have at least one class-like declaration");
                     return getSignatureDefinition(cls.members, /*selectConstructors*/ true);
                 }
@@ -103657,14 +106934,9 @@ var ts;
         function createDefinitionInfoFromName(declaration, symbolKind, symbolName, containerName) {
             var name = ts.getNameOfDeclaration(declaration) || declaration;
             var sourceFile = name.getSourceFile();
-            return {
-                fileName: sourceFile.fileName,
-                textSpan: ts.createTextSpanFromNode(name, sourceFile),
-                kind: symbolKind,
-                name: symbolName,
-                containerKind: undefined,
-                containerName: containerName
-            };
+            var textSpan = ts.createTextSpanFromNode(name, sourceFile);
+            return __assign({ fileName: sourceFile.fileName, textSpan: textSpan, kind: symbolKind, name: symbolName, containerKind: undefined, // TODO: GH#18217
+                containerName: containerName }, ts.FindAllReferences.toContextSpan(textSpan, sourceFile, ts.FindAllReferences.getContextNode(declaration)));
         }
         function createDefinitionFromSignatureDeclaration(typeChecker, decl) {
             return createDefinitionInfo(decl, typeChecker, decl.symbol, decl);
@@ -103700,9 +106972,9 @@ var ts;
         }
         function isConstructorLike(node) {
             switch (node.kind) {
-                case 157 /* Constructor */:
-                case 166 /* ConstructorType */:
-                case 161 /* ConstructSignature */:
+                case 158 /* Constructor */:
+                case 167 /* ConstructorType */:
+                case 162 /* ConstructSignature */:
                     return true;
                 default:
                     return false;
@@ -103820,11 +107092,11 @@ var ts;
         JsDoc.getJsDocCommentsFromDeclarations = getJsDocCommentsFromDeclarations;
         function getCommentHavingNodes(declaration) {
             switch (declaration.kind) {
-                case 304 /* JSDocParameterTag */:
-                case 310 /* JSDocPropertyTag */:
+                case 306 /* JSDocParameterTag */:
+                case 312 /* JSDocPropertyTag */:
                     return [declaration];
-                case 302 /* JSDocCallbackTag */:
-                case 309 /* JSDocTypedefTag */:
+                case 304 /* JSDocCallbackTag */:
+                case 311 /* JSDocTypedefTag */:
                     return [declaration, declaration.parent];
                 default:
                     return ts.getJSDocCommentsAndTags(declaration);
@@ -103845,16 +107117,16 @@ var ts;
         function getCommentText(tag) {
             var comment = tag.comment;
             switch (tag.kind) {
-                case 300 /* JSDocAugmentsTag */:
+                case 301 /* JSDocAugmentsTag */:
                     return withNode(tag.class);
-                case 308 /* JSDocTemplateTag */:
+                case 310 /* JSDocTemplateTag */:
                     return withList(tag.typeParameters);
-                case 307 /* JSDocTypeTag */:
+                case 309 /* JSDocTypeTag */:
                     return withNode(tag.typeExpression);
-                case 309 /* JSDocTypedefTag */:
-                case 302 /* JSDocCallbackTag */:
-                case 310 /* JSDocPropertyTag */:
-                case 304 /* JSDocParameterTag */:
+                case 311 /* JSDocTypedefTag */:
+                case 304 /* JSDocCallbackTag */:
+                case 312 /* JSDocPropertyTag */:
+                case 306 /* JSDocParameterTag */:
                     var name = tag.name;
                     return name ? withNode(name) : comment;
                 default:
@@ -104031,7 +107303,7 @@ var ts;
         function parameterDocComments(parameters, isJavaScriptFile, indentationStr, newLine) {
             return parameters.map(function (_a, i) {
                 var name = _a.name, dotDotDotToken = _a.dotDotDotToken;
-                var paramName = name.kind === 72 /* Identifier */ ? name.text : "param" + i;
+                var paramName = name.kind === 73 /* Identifier */ ? name.text : "param" + i;
                 var type = isJavaScriptFile ? (dotDotDotToken ? "{...any} " : "{any} ") : "";
                 return indentationStr + " * @param " + type + paramName + newLine;
             }).join("");
@@ -104041,23 +107313,23 @@ var ts;
         }
         function getCommentOwnerInfoWorker(commentOwner) {
             switch (commentOwner.kind) {
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
-                case 156 /* MethodDeclaration */:
-                case 157 /* Constructor */:
-                case 155 /* MethodSignature */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 157 /* MethodDeclaration */:
+                case 158 /* Constructor */:
+                case 156 /* MethodSignature */:
                     var parameters = commentOwner.parameters;
                     return { commentOwner: commentOwner, parameters: parameters };
-                case 275 /* PropertyAssignment */:
+                case 276 /* PropertyAssignment */:
                     return getCommentOwnerInfoWorker(commentOwner.initializer);
-                case 240 /* ClassDeclaration */:
-                case 241 /* InterfaceDeclaration */:
-                case 153 /* PropertySignature */:
-                case 243 /* EnumDeclaration */:
-                case 278 /* EnumMember */:
-                case 242 /* TypeAliasDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 242 /* InterfaceDeclaration */:
+                case 154 /* PropertySignature */:
+                case 244 /* EnumDeclaration */:
+                case 279 /* EnumMember */:
+                case 243 /* TypeAliasDeclaration */:
                     return { commentOwner: commentOwner };
-                case 219 /* VariableStatement */: {
+                case 220 /* VariableStatement */: {
                     var varStatement = commentOwner;
                     var varDeclarations = varStatement.declarationList.declarations;
                     var parameters_1 = varDeclarations.length === 1 && varDeclarations[0].initializer
@@ -104065,14 +107337,14 @@ var ts;
                         : undefined;
                     return { commentOwner: commentOwner, parameters: parameters_1 };
                 }
-                case 284 /* SourceFile */:
+                case 285 /* SourceFile */:
                     return "quit";
-                case 244 /* ModuleDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     // If in walking up the tree, we hit a a nested namespace declaration,
                     // then we must be somewhere within a dotted namespace name; however we don't
                     // want to give back a JSDoc template for the 'b' or 'c' in 'namespace a.b.c { }'.
-                    return commentOwner.parent.kind === 244 /* ModuleDeclaration */ ? undefined : { commentOwner: commentOwner };
-                case 204 /* BinaryExpression */: {
+                    return commentOwner.parent.kind === 245 /* ModuleDeclaration */ ? undefined : { commentOwner: commentOwner };
+                case 205 /* BinaryExpression */: {
                     var be = commentOwner;
                     if (ts.getAssignmentDeclarationKind(be) === 0 /* None */) {
                         return "quit";
@@ -104091,14 +107363,14 @@ var ts;
          * @returns the parameters of a signature found on the RHS if one exists; otherwise 'emptyArray'.
          */
         function getParametersFromRightHandSideOfAssignment(rightHandSide) {
-            while (rightHandSide.kind === 195 /* ParenthesizedExpression */) {
+            while (rightHandSide.kind === 196 /* ParenthesizedExpression */) {
                 rightHandSide = rightHandSide.expression;
             }
             switch (rightHandSide.kind) {
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
                     return rightHandSide.parameters;
-                case 209 /* ClassExpression */: {
+                case 210 /* ClassExpression */: {
                     var ctr = ts.find(rightHandSide.members, ts.isConstructorDeclaration);
                     return ctr ? ctr.parameters : ts.emptyArray;
                 }
@@ -104160,9 +107432,9 @@ var ts;
         }
         function shouldKeepItem(declaration, checker) {
             switch (declaration.kind) {
-                case 250 /* ImportClause */:
-                case 253 /* ImportSpecifier */:
-                case 248 /* ImportEqualsDeclaration */:
+                case 251 /* ImportClause */:
+                case 254 /* ImportSpecifier */:
+                case 249 /* ImportEqualsDeclaration */:
                     var importer = checker.getSymbolAtLocation(declaration.name); // TODO: GH#18217
                     var imported = checker.getAliasedSymbol(importer);
                     return importer.escapedName !== imported.escapedName;
@@ -104172,7 +107444,7 @@ var ts;
         }
         function tryAddSingleDeclarationName(declaration, containers) {
             var name = ts.getNameOfDeclaration(declaration);
-            return !!name && (pushLiteral(name, containers) || name.kind === 149 /* ComputedPropertyName */ && tryAddComputedPropertyName(name.expression, containers));
+            return !!name && (pushLiteral(name, containers) || name.kind === 150 /* ComputedPropertyName */ && tryAddComputedPropertyName(name.expression, containers));
         }
         // Only added the names of computed properties if they're simple dotted expressions, like:
         //
@@ -104189,7 +107461,7 @@ var ts;
             // First, if we started with a computed property name, then add all but the last
             // portion into the container array.
             var name = ts.getNameOfDeclaration(declaration);
-            if (name && name.kind === 149 /* ComputedPropertyName */ && !tryAddComputedPropertyName(name.expression, containers)) {
+            if (name && name.kind === 150 /* ComputedPropertyName */ && !tryAddComputedPropertyName(name.expression, containers)) {
                 return ts.emptyArray;
             }
             // Don't include the last portion.
@@ -104358,7 +107630,7 @@ var ts;
                 return;
             }
             switch (node.kind) {
-                case 157 /* Constructor */:
+                case 158 /* Constructor */:
                     // Get parameter properties, and treat them as being on the *same* level as the constructor, not under it.
                     var ctr = node;
                     addNodeWithRecursiveChild(ctr, ctr.body);
@@ -104370,21 +107642,21 @@ var ts;
                         }
                     }
                     break;
-                case 156 /* MethodDeclaration */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
-                case 155 /* MethodSignature */:
+                case 157 /* MethodDeclaration */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
+                case 156 /* MethodSignature */:
                     if (!ts.hasDynamicName(node)) {
                         addNodeWithRecursiveChild(node, node.body);
                     }
                     break;
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
                     if (!ts.hasDynamicName(node)) {
                         addLeafNode(node);
                     }
                     break;
-                case 250 /* ImportClause */:
+                case 251 /* ImportClause */:
                     var importClause = node;
                     // Handle default import case e.g.:
                     //    import d from "mod";
@@ -104396,7 +107668,7 @@ var ts;
                     //    import {a, b as B} from "mod";
                     var namedBindings = importClause.namedBindings;
                     if (namedBindings) {
-                        if (namedBindings.kind === 251 /* NamespaceImport */) {
+                        if (namedBindings.kind === 252 /* NamespaceImport */) {
                             addLeafNode(namedBindings);
                         }
                         else {
@@ -104407,8 +107679,8 @@ var ts;
                         }
                     }
                     break;
-                case 186 /* BindingElement */:
-                case 237 /* VariableDeclaration */:
+                case 187 /* BindingElement */:
+                case 238 /* VariableDeclaration */:
                     var _d = node, name = _d.name, initializer = _d.initializer;
                     if (ts.isBindingPattern(name)) {
                         addChildrenRecursively(name);
@@ -104429,12 +107701,12 @@ var ts;
                         addNodeWithRecursiveChild(node, initializer);
                     }
                     break;
-                case 197 /* ArrowFunction */:
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
                     addNodeWithRecursiveChild(node, node.body);
                     break;
-                case 243 /* EnumDeclaration */:
+                case 244 /* EnumDeclaration */:
                     startNode(node);
                     for (var _e = 0, _f = node.members; _e < _f.length; _e++) {
                         var member = _f[_e];
@@ -104444,9 +107716,9 @@ var ts;
                     }
                     endNode();
                     break;
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
-                case 241 /* InterfaceDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
+                case 242 /* InterfaceDeclaration */:
                     startNode(node);
                     for (var _g = 0, _h = node.members; _g < _h.length; _g++) {
                         var member = _h[_g];
@@ -104454,18 +107726,18 @@ var ts;
                     }
                     endNode();
                     break;
-                case 244 /* ModuleDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     addNodeWithRecursiveChild(node, getInteriorModule(node).body);
                     break;
-                case 257 /* ExportSpecifier */:
-                case 248 /* ImportEqualsDeclaration */:
-                case 162 /* IndexSignature */:
-                case 160 /* CallSignature */:
-                case 161 /* ConstructSignature */:
-                case 242 /* TypeAliasDeclaration */:
+                case 258 /* ExportSpecifier */:
+                case 249 /* ImportEqualsDeclaration */:
+                case 163 /* IndexSignature */:
+                case 161 /* CallSignature */:
+                case 162 /* ConstructSignature */:
+                case 243 /* TypeAliasDeclaration */:
                     addLeafNode(node);
                     break;
-                case 204 /* BinaryExpression */: {
+                case 205 /* BinaryExpression */: {
                     var special = ts.getAssignmentDeclarationKind(node);
                     switch (special) {
                         case 1 /* ExportsProperty */:
@@ -104547,12 +107819,12 @@ var ts;
                 return false;
             }
             switch (a.kind) {
-                case 154 /* PropertyDeclaration */:
-                case 156 /* MethodDeclaration */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 155 /* PropertyDeclaration */:
+                case 157 /* MethodDeclaration */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     return ts.hasModifier(a, 32 /* Static */) === ts.hasModifier(b, 32 /* Static */);
-                case 244 /* ModuleDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     return areSameModule(a, b);
                 default:
                     return true;
@@ -104568,7 +107840,7 @@ var ts;
         // Only merge module nodes that have the same chain. Don't merge 'A.B.C' with 'A'!
         function areSameModule(a, b) {
             // TODO: GH#18217
-            return a.body.kind === b.body.kind && (a.body.kind !== 244 /* ModuleDeclaration */ || areSameModule(a.body, b.body));
+            return a.body.kind === b.body.kind && (a.body.kind !== 245 /* ModuleDeclaration */ || areSameModule(a.body, b.body));
         }
         /** Merge source into target. Source should be thrown away after this is called. */
         function merge(target, source) {
@@ -104598,7 +107870,7 @@ var ts;
          * So `new()` can still come before an `aardvark` method.
          */
         function tryGetName(node) {
-            if (node.kind === 244 /* ModuleDeclaration */) {
+            if (node.kind === 245 /* ModuleDeclaration */) {
                 return getModuleName(node);
             }
             var declName = ts.getNameOfDeclaration(node);
@@ -104606,16 +107878,16 @@ var ts;
                 return ts.unescapeLeadingUnderscores(ts.getPropertyNameForPropertyNameNode(declName)); // TODO: GH#18217
             }
             switch (node.kind) {
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
-                case 209 /* ClassExpression */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
+                case 210 /* ClassExpression */:
                     return getFunctionOrClassName(node);
                 default:
                     return undefined;
             }
         }
         function getItemName(node, name) {
-            if (node.kind === 244 /* ModuleDeclaration */) {
+            if (node.kind === 245 /* ModuleDeclaration */) {
                 return getModuleName(node);
             }
             if (name) {
@@ -104625,16 +107897,16 @@ var ts;
                 }
             }
             switch (node.kind) {
-                case 284 /* SourceFile */:
+                case 285 /* SourceFile */:
                     var sourceFile = node;
                     return ts.isExternalModule(sourceFile)
                         ? "\"" + ts.escapeString(ts.getBaseFileName(ts.removeFileExtension(ts.normalizePath(sourceFile.fileName)))) + "\""
                         : "<global>";
-                case 197 /* ArrowFunction */:
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
+                case 198 /* ArrowFunction */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
                     if (ts.getModifierFlags(node) & 512 /* Default */) {
                         return "default";
                     }
@@ -104642,13 +107914,13 @@ var ts;
                     // (eg: "app\n.onactivated"), so we should remove the whitespace for readabiltiy in the
                     // navigation bar.
                     return getFunctionOrClassName(node);
-                case 157 /* Constructor */:
+                case 158 /* Constructor */:
                     return "constructor";
-                case 161 /* ConstructSignature */:
+                case 162 /* ConstructSignature */:
                     return "new()";
-                case 160 /* CallSignature */:
+                case 161 /* CallSignature */:
                     return "()";
-                case 162 /* IndexSignature */:
+                case 163 /* IndexSignature */:
                     return "[]";
                 default:
                     return "<unknown>";
@@ -104672,25 +107944,25 @@ var ts;
             return topLevel;
             function isTopLevel(item) {
                 switch (navigationBarNodeKind(item)) {
-                    case 240 /* ClassDeclaration */:
-                    case 209 /* ClassExpression */:
-                    case 243 /* EnumDeclaration */:
-                    case 241 /* InterfaceDeclaration */:
-                    case 244 /* ModuleDeclaration */:
-                    case 284 /* SourceFile */:
-                    case 242 /* TypeAliasDeclaration */:
-                    case 309 /* JSDocTypedefTag */:
-                    case 302 /* JSDocCallbackTag */:
+                    case 241 /* ClassDeclaration */:
+                    case 210 /* ClassExpression */:
+                    case 244 /* EnumDeclaration */:
+                    case 242 /* InterfaceDeclaration */:
+                    case 245 /* ModuleDeclaration */:
+                    case 285 /* SourceFile */:
+                    case 243 /* TypeAliasDeclaration */:
+                    case 311 /* JSDocTypedefTag */:
+                    case 304 /* JSDocCallbackTag */:
                         return true;
-                    case 157 /* Constructor */:
-                    case 156 /* MethodDeclaration */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
-                    case 237 /* VariableDeclaration */:
+                    case 158 /* Constructor */:
+                    case 157 /* MethodDeclaration */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
+                    case 238 /* VariableDeclaration */:
                         return hasSomeImportantChild(item);
-                    case 197 /* ArrowFunction */:
-                    case 239 /* FunctionDeclaration */:
-                    case 196 /* FunctionExpression */:
+                    case 198 /* ArrowFunction */:
+                    case 240 /* FunctionDeclaration */:
+                    case 197 /* FunctionExpression */:
                         return isTopLevelFunctionDeclaration(item);
                     default:
                         return false;
@@ -104700,10 +107972,10 @@ var ts;
                         return false;
                     }
                     switch (navigationBarNodeKind(item.parent)) {
-                        case 245 /* ModuleBlock */:
-                        case 284 /* SourceFile */:
-                        case 156 /* MethodDeclaration */:
-                        case 157 /* Constructor */:
+                        case 246 /* ModuleBlock */:
+                        case 285 /* SourceFile */:
+                        case 157 /* MethodDeclaration */:
+                        case 158 /* Constructor */:
                             return true;
                         default:
                             return hasSomeImportantChild(item);
@@ -104712,7 +107984,7 @@ var ts;
                 function hasSomeImportantChild(item) {
                     return ts.some(item.children, function (child) {
                         var childKind = navigationBarNodeKind(child);
-                        return childKind !== 237 /* VariableDeclaration */ && childKind !== 186 /* BindingElement */;
+                        return childKind !== 238 /* VariableDeclaration */ && childKind !== 187 /* BindingElement */;
                     });
                 }
             }
@@ -104769,7 +108041,7 @@ var ts;
             // Otherwise, we need to aggregate each identifier to build up the qualified name.
             var result = [];
             result.push(ts.getTextOfIdentifierOrLiteral(moduleDeclaration.name));
-            while (moduleDeclaration.body && moduleDeclaration.body.kind === 244 /* ModuleDeclaration */) {
+            while (moduleDeclaration.body && moduleDeclaration.body.kind === 245 /* ModuleDeclaration */) {
                 moduleDeclaration = moduleDeclaration.body;
                 result.push(ts.getTextOfIdentifierOrLiteral(moduleDeclaration.name));
             }
@@ -104783,13 +108055,13 @@ var ts;
             return decl.body && ts.isModuleDeclaration(decl.body) ? getInteriorModule(decl.body) : decl;
         }
         function isComputedProperty(member) {
-            return !member.name || member.name.kind === 149 /* ComputedPropertyName */;
+            return !member.name || member.name.kind === 150 /* ComputedPropertyName */;
         }
         function getNodeSpan(node) {
-            return node.kind === 284 /* SourceFile */ ? ts.createTextSpanFromRange(node) : ts.createTextSpanFromNode(node, curSourceFile);
+            return node.kind === 285 /* SourceFile */ ? ts.createTextSpanFromRange(node) : ts.createTextSpanFromNode(node, curSourceFile);
         }
         function getModifiers(node) {
-            if (node.parent && node.parent.kind === 237 /* VariableDeclaration */) {
+            if (node.parent && node.parent.kind === 238 /* VariableDeclaration */) {
                 node = node.parent;
             }
             return ts.getNodeModifiers(node);
@@ -104804,7 +108076,7 @@ var ts;
                 return ts.declarationNameToString(parent.name);
             }
             // See if it is of the form "<expr> = function(){...}". If so, use the text from the left-hand side.
-            else if (ts.isBinaryExpression(parent) && parent.operatorToken.kind === 59 /* EqualsToken */) {
+            else if (ts.isBinaryExpression(parent) && parent.operatorToken.kind === 60 /* EqualsToken */) {
                 return nodeText(parent.left).replace(whiteSpaceRegex, "");
             }
             // See if it is a property assignment, and if so use the property name
@@ -104842,9 +108114,9 @@ var ts;
         }
         function isFunctionOrClassExpression(node) {
             switch (node.kind) {
-                case 197 /* ArrowFunction */:
-                case 196 /* FunctionExpression */:
-                case 209 /* ClassExpression */:
+                case 198 /* ArrowFunction */:
+                case 197 /* FunctionExpression */:
+                case 210 /* ClassExpression */:
                     return true;
                 default:
                     return false;
@@ -104926,7 +108198,7 @@ var ts;
             var usedImports = [];
             for (var _i = 0, oldImports_1 = oldImports; _i < oldImports_1.length; _i++) {
                 var importDecl = oldImports_1[_i];
-                var importClause = importDecl.importClause;
+                var importClause = importDecl.importClause, moduleSpecifier = importDecl.moduleSpecifier;
                 if (!importClause) {
                     // Imports without import clauses are assumed to be included for their side effects and are not removed.
                     usedImports.push(importDecl);
@@ -104957,6 +108229,20 @@ var ts;
                 if (name || namedBindings) {
                     usedImports.push(updateImportDeclarationAndClause(importDecl, name, namedBindings));
                 }
+                // If a module is imported to be augmented, it’s used
+                else if (hasModuleDeclarationMatchingSpecifier(sourceFile, moduleSpecifier)) {
+                    // If we’re in a declaration file, it’s safe to remove the import clause from it
+                    if (sourceFile.isDeclarationFile) {
+                        usedImports.push(ts.createImportDeclaration(importDecl.decorators, importDecl.modifiers, 
+                        /*importClause*/ undefined, moduleSpecifier));
+                    }
+                    // If we’re not in a declaration file, we can’t remove the import clause even though
+                    // the imported symbols are unused, because removing them makes it look like the import
+                    // declaration has side effects, which will cause it to be preserved in the JS emit.
+                    else {
+                        usedImports.push(importDecl);
+                    }
+                }
             }
             return usedImports;
             function isDeclarationUsed(identifier) {
@@ -104964,6 +108250,13 @@ var ts;
                 return jsxElementsPresent && (identifier.text === jsxNamespace) || ts.FindAllReferences.Core.isSymbolReferencedInFile(identifier, typeChecker, sourceFile);
             }
         }
+        function hasModuleDeclarationMatchingSpecifier(sourceFile, moduleSpecifier) {
+            var moduleSpecifierText = ts.isStringLiteral(moduleSpecifier) && moduleSpecifier.text;
+            return ts.isString(moduleSpecifierText) && ts.some(sourceFile.moduleAugmentations, function (moduleName) {
+                return ts.isStringLiteral(moduleName)
+                    && moduleName.text === moduleSpecifierText;
+            });
+        }
         function getExternalModuleName(specifier) {
             return specifier !== undefined && ts.isStringLiteralLike(specifier)
                 ? specifier.text
@@ -105171,7 +108464,7 @@ var ts;
                 }
                 var lastImport = current - 1;
                 if (lastImport !== firstImport) {
-                    out.push(createOutliningSpanFromBounds(ts.findChildOfKind(statements[firstImport], 92 /* ImportKeyword */, sourceFile).getStart(sourceFile), statements[lastImport].getEnd(), "imports" /* Imports */));
+                    out.push(createOutliningSpanFromBounds(ts.findChildOfKind(statements[firstImport], 93 /* ImportKeyword */, sourceFile).getStart(sourceFile), statements[lastImport].getEnd(), "imports" /* Imports */));
                 }
             }
             function visitNonImportNode(n) {
@@ -105212,9 +108505,9 @@ var ts;
         function addRegionOutliningSpans(sourceFile, out) {
             var regions = [];
             var lineStarts = sourceFile.getLineStarts();
-            for (var i = 0; i < lineStarts.length; i++) {
-                var currentLineStart = lineStarts[i];
-                var lineEnd = i + 1 === lineStarts.length ? sourceFile.getEnd() : lineStarts[i + 1] - 1;
+            for (var _i = 0, lineStarts_1 = lineStarts; _i < lineStarts_1.length; _i++) {
+                var currentLineStart = lineStarts_1[_i];
+                var lineEnd = sourceFile.getLineEndOfPosition(currentLineStart);
                 var lineText = sourceFile.text.substring(currentLineStart, lineEnd);
                 var result = isRegionDelimiter(lineText);
                 if (!result || ts.isInComment(sourceFile, currentLineStart)) {
@@ -105288,31 +108581,31 @@ var ts;
         }
         function getOutliningSpanForNode(n, sourceFile) {
             switch (n.kind) {
-                case 218 /* Block */:
-                    if (ts.isFunctionBlock(n)) {
-                        return spanForNode(n.parent, /*autoCollapse*/ n.parent.kind !== 197 /* ArrowFunction */);
+                case 219 /* Block */:
+                    if (ts.isFunctionLike(n.parent)) {
+                        return functionSpan(n.parent, n, sourceFile);
                     }
                     // Check if the block is standalone, or 'attached' to some parent statement.
                     // If the latter, we want to collapse the block, but consider its hint span
                     // to be the entire span of the parent.
                     switch (n.parent.kind) {
-                        case 223 /* DoStatement */:
-                        case 226 /* ForInStatement */:
-                        case 227 /* ForOfStatement */:
-                        case 225 /* ForStatement */:
-                        case 222 /* IfStatement */:
-                        case 224 /* WhileStatement */:
-                        case 231 /* WithStatement */:
-                        case 274 /* CatchClause */:
+                        case 224 /* DoStatement */:
+                        case 227 /* ForInStatement */:
+                        case 228 /* ForOfStatement */:
+                        case 226 /* ForStatement */:
+                        case 223 /* IfStatement */:
+                        case 225 /* WhileStatement */:
+                        case 232 /* WithStatement */:
+                        case 275 /* CatchClause */:
                             return spanForNode(n.parent);
-                        case 235 /* TryStatement */:
+                        case 236 /* TryStatement */:
                             // Could be the try-block, or the finally-block.
                             var tryStatement = n.parent;
                             if (tryStatement.tryBlock === n) {
                                 return spanForNode(n.parent);
                             }
                             else if (tryStatement.finallyBlock === n) {
-                                return spanForNode(ts.findChildOfKind(tryStatement, 88 /* FinallyKeyword */, sourceFile));
+                                return spanForNode(ts.findChildOfKind(tryStatement, 89 /* FinallyKeyword */, sourceFile));
                             }
                         // falls through
                         default:
@@ -105320,22 +108613,24 @@ var ts;
                             // the span of the block, independent of any parent span.
                             return createOutliningSpan(ts.createTextSpanFromNode(n, sourceFile), "code" /* Code */);
                     }
-                case 245 /* ModuleBlock */:
+                case 246 /* ModuleBlock */:
                     return spanForNode(n.parent);
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
-                case 241 /* InterfaceDeclaration */:
-                case 243 /* EnumDeclaration */:
-                case 246 /* CaseBlock */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
+                case 242 /* InterfaceDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 247 /* CaseBlock */:
                     return spanForNode(n);
-                case 188 /* ObjectLiteralExpression */:
+                case 189 /* ObjectLiteralExpression */:
                     return spanForObjectOrArrayLiteral(n);
-                case 187 /* ArrayLiteralExpression */:
+                case 188 /* ArrayLiteralExpression */:
                     return spanForObjectOrArrayLiteral(n, 22 /* OpenBracketToken */);
-                case 260 /* JsxElement */:
+                case 261 /* JsxElement */:
                     return spanForJSXElement(n);
-                case 261 /* JsxSelfClosingElement */:
-                case 262 /* JsxOpeningElement */:
+                case 265 /* JsxFragment */:
+                    return spanForJSXFragment(n);
+                case 262 /* JsxSelfClosingElement */:
+                case 263 /* JsxOpeningElement */:
                     return spanForJSXAttributes(n.attributes);
             }
             function spanForJSXElement(node) {
@@ -105344,6 +108639,11 @@ var ts;
                 var bannerText = "<" + tagName + ">...</" + tagName + ">";
                 return createOutliningSpan(textSpan, "code" /* Code */, textSpan, /*autoCollapse*/ false, bannerText);
             }
+            function spanForJSXFragment(node) {
+                var textSpan = ts.createTextSpanFromBounds(node.openingFragment.getStart(sourceFile), node.closingFragment.getEnd());
+                var bannerText = "<>...</>";
+                return createOutliningSpan(textSpan, "code" /* Code */, textSpan, /*autoCollapse*/ false, bannerText);
+            }
             function spanForJSXAttributes(node) {
                 if (node.properties.length === 0) {
                     return undefined;
@@ -105357,20 +108657,29 @@ var ts;
                 // Otherwise, the collapsed section will include the end of the previous line.
                 return spanForNode(node, /*autoCollapse*/ false, /*useFullStart*/ !ts.isArrayLiteralExpression(node.parent) && !ts.isCallExpression(node.parent), open);
             }
-            function spanForNode(hintSpanNode, autoCollapse, useFullStart, open) {
+            function spanForNode(hintSpanNode, autoCollapse, useFullStart, open, close) {
                 if (autoCollapse === void 0) { autoCollapse = false; }
                 if (useFullStart === void 0) { useFullStart = true; }
                 if (open === void 0) { open = 18 /* OpenBraceToken */; }
+                if (close === void 0) { close = open === 18 /* OpenBraceToken */ ? 19 /* CloseBraceToken */ : 23 /* CloseBracketToken */; }
                 var openToken = ts.findChildOfKind(n, open, sourceFile);
-                var close = open === 18 /* OpenBraceToken */ ? 19 /* CloseBraceToken */ : 23 /* CloseBracketToken */;
                 var closeToken = ts.findChildOfKind(n, close, sourceFile);
-                if (!openToken || !closeToken) {
-                    return undefined;
-                }
-                var textSpan = ts.createTextSpanFromBounds(useFullStart ? openToken.getFullStart() : openToken.getStart(sourceFile), closeToken.getEnd());
-                return createOutliningSpan(textSpan, "code" /* Code */, ts.createTextSpanFromNode(hintSpanNode, sourceFile), autoCollapse);
+                return openToken && closeToken && spanBetweenTokens(openToken, closeToken, hintSpanNode, sourceFile, autoCollapse, useFullStart);
             }
         }
+        function functionSpan(node, body, sourceFile) {
+            var openToken = ts.isNodeArrayMultiLine(node.parameters, sourceFile)
+                ? ts.findChildOfKind(node, 20 /* OpenParenToken */, sourceFile)
+                : ts.findChildOfKind(body, 18 /* OpenBraceToken */, sourceFile);
+            var closeToken = ts.findChildOfKind(body, 19 /* CloseBraceToken */, sourceFile);
+            return openToken && closeToken && spanBetweenTokens(openToken, closeToken, node, sourceFile, /*autoCollapse*/ node.kind !== 198 /* ArrowFunction */);
+        }
+        function spanBetweenTokens(openToken, closeToken, hintSpanNode, sourceFile, autoCollapse, useFullStart) {
+            if (autoCollapse === void 0) { autoCollapse = false; }
+            if (useFullStart === void 0) { useFullStart = true; }
+            var textSpan = ts.createTextSpanFromBounds(useFullStart ? openToken.getFullStart() : openToken.getStart(sourceFile), closeToken.getEnd());
+            return createOutliningSpan(textSpan, "code" /* Code */, ts.createTextSpanFromNode(hintSpanNode, sourceFile), autoCollapse);
+        }
         function createOutliningSpan(textSpan, kind, hintSpan, autoCollapse, bannerText) {
             if (hintSpan === void 0) { hintSpan = textSpan; }
             if (autoCollapse === void 0) { autoCollapse = false; }
@@ -105633,7 +108942,7 @@ var ts;
         if (ch >= 65 /* A */ && ch <= 90 /* Z */) {
             return true;
         }
-        if (ch < 127 /* maxAsciiCharacter */ || !ts.isUnicodeIdentifierStart(ch, 7 /* Latest */)) {
+        if (ch < 127 /* maxAsciiCharacter */ || !ts.isUnicodeIdentifierStart(ch, 99 /* Latest */)) {
             return false;
         }
         // TODO: find a way to determine this for any unicode characters in a
@@ -105646,7 +108955,7 @@ var ts;
         if (ch >= 97 /* a */ && ch <= 122 /* z */) {
             return true;
         }
-        if (ch < 127 /* maxAsciiCharacter */ || !ts.isUnicodeIdentifierStart(ch, 7 /* Latest */)) {
+        if (ch < 127 /* maxAsciiCharacter */ || !ts.isUnicodeIdentifierStart(ch, 99 /* Latest */)) {
             return false;
         }
         // TODO: find a way to determine this for any unicode characters in a
@@ -105898,10 +109207,10 @@ var ts;
          */
         function tryConsumeDeclare() {
             var token = ts.scanner.getToken();
-            if (token === 125 /* DeclareKeyword */) {
+            if (token === 126 /* DeclareKeyword */) {
                 // declare module "mod"
                 token = nextToken();
-                if (token === 130 /* ModuleKeyword */) {
+                if (token === 131 /* ModuleKeyword */) {
                     token = nextToken();
                     if (token === 10 /* StringLiteral */) {
                         recordAmbientExternalModule();
@@ -105919,7 +109228,7 @@ var ts;
                 return false;
             }
             var token = ts.scanner.getToken();
-            if (token === 92 /* ImportKeyword */) {
+            if (token === 93 /* ImportKeyword */) {
                 token = nextToken();
                 if (token === 20 /* OpenParenToken */) {
                     token = nextToken();
@@ -105935,9 +109244,9 @@ var ts;
                     return true;
                 }
                 else {
-                    if (token === 72 /* Identifier */ || ts.isKeyword(token)) {
+                    if (token === 73 /* Identifier */ || ts.isKeyword(token)) {
                         token = nextToken();
-                        if (token === 144 /* FromKeyword */) {
+                        if (token === 145 /* FromKeyword */) {
                             token = nextToken();
                             if (token === 10 /* StringLiteral */) {
                                 // import d from "mod";
@@ -105945,7 +109254,7 @@ var ts;
                                 return true;
                             }
                         }
-                        else if (token === 59 /* EqualsToken */) {
+                        else if (token === 60 /* EqualsToken */) {
                             if (tryConsumeRequireCall(/*skipCurrentToken*/ true)) {
                                 return true;
                             }
@@ -105968,7 +109277,7 @@ var ts;
                         }
                         if (token === 19 /* CloseBraceToken */) {
                             token = nextToken();
-                            if (token === 144 /* FromKeyword */) {
+                            if (token === 145 /* FromKeyword */) {
                                 token = nextToken();
                                 if (token === 10 /* StringLiteral */) {
                                     // import {a as A} from "mod";
@@ -105980,11 +109289,11 @@ var ts;
                     }
                     else if (token === 40 /* AsteriskToken */) {
                         token = nextToken();
-                        if (token === 119 /* AsKeyword */) {
+                        if (token === 120 /* AsKeyword */) {
                             token = nextToken();
-                            if (token === 72 /* Identifier */ || ts.isKeyword(token)) {
+                            if (token === 73 /* Identifier */ || ts.isKeyword(token)) {
                                 token = nextToken();
-                                if (token === 144 /* FromKeyword */) {
+                                if (token === 145 /* FromKeyword */) {
                                     token = nextToken();
                                     if (token === 10 /* StringLiteral */) {
                                         // import * as NS from "mod"
@@ -106002,7 +109311,7 @@ var ts;
         }
         function tryConsumeExport() {
             var token = ts.scanner.getToken();
-            if (token === 85 /* ExportKeyword */) {
+            if (token === 86 /* ExportKeyword */) {
                 markAsExternalModuleIfTopLevel();
                 token = nextToken();
                 if (token === 18 /* OpenBraceToken */) {
@@ -106014,7 +109323,7 @@ var ts;
                     }
                     if (token === 19 /* CloseBraceToken */) {
                         token = nextToken();
-                        if (token === 144 /* FromKeyword */) {
+                        if (token === 145 /* FromKeyword */) {
                             token = nextToken();
                             if (token === 10 /* StringLiteral */) {
                                 // export {a as A} from "mod";
@@ -106026,7 +109335,7 @@ var ts;
                 }
                 else if (token === 40 /* AsteriskToken */) {
                     token = nextToken();
-                    if (token === 144 /* FromKeyword */) {
+                    if (token === 145 /* FromKeyword */) {
                         token = nextToken();
                         if (token === 10 /* StringLiteral */) {
                             // export * from "mod"
@@ -106034,11 +109343,11 @@ var ts;
                         }
                     }
                 }
-                else if (token === 92 /* ImportKeyword */) {
+                else if (token === 93 /* ImportKeyword */) {
                     token = nextToken();
-                    if (token === 72 /* Identifier */ || ts.isKeyword(token)) {
+                    if (token === 73 /* Identifier */ || ts.isKeyword(token)) {
                         token = nextToken();
-                        if (token === 59 /* EqualsToken */) {
+                        if (token === 60 /* EqualsToken */) {
                             if (tryConsumeRequireCall(/*skipCurrentToken*/ true)) {
                                 return true;
                             }
@@ -106051,7 +109360,7 @@ var ts;
         }
         function tryConsumeRequireCall(skipCurrentToken) {
             var token = skipCurrentToken ? nextToken() : ts.scanner.getToken();
-            if (token === 134 /* RequireKeyword */) {
+            if (token === 135 /* RequireKeyword */) {
                 token = nextToken();
                 if (token === 20 /* OpenParenToken */) {
                     token = nextToken();
@@ -106066,7 +109375,7 @@ var ts;
         }
         function tryConsumeDefine() {
             var token = ts.scanner.getToken();
-            if (token === 72 /* Identifier */ && ts.scanner.getTokenValue() === "define") {
+            if (token === 73 /* Identifier */ && ts.scanner.getTokenValue() === "define") {
                 token = nextToken();
                 if (token !== 20 /* OpenParenToken */) {
                     return true;
@@ -106200,14 +109509,14 @@ var ts;
                 return getRenameInfoError(ts.Diagnostics.You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library);
             }
             // Cannot rename `default` as in `import { default as foo } from "./someModule";
-            if (ts.isIdentifier(node) && node.originalKeywordKind === 80 /* DefaultKeyword */ && symbol.parent.flags & 1536 /* Module */) {
+            if (ts.isIdentifier(node) && node.originalKeywordKind === 81 /* DefaultKeyword */ && symbol.parent.flags & 1536 /* Module */) {
                 return undefined;
             }
             if (ts.isStringLiteralLike(node) && ts.tryGetImportFromModuleSpecifier(node)) {
                 return options && options.allowRenameOfImportPath ? getRenameInfoForModule(node, sourceFile, symbol) : undefined;
             }
             var kind = ts.SymbolDisplay.getSymbolKind(typeChecker, symbol, node);
-            var specifierName = (ts.isImportOrExportSpecifierName(node) || ts.isStringOrNumericLiteralLike(node) && node.parent.kind === 149 /* ComputedPropertyName */)
+            var specifierName = (ts.isImportOrExportSpecifierName(node) || ts.isStringOrNumericLiteralLike(node) && node.parent.kind === 150 /* ComputedPropertyName */)
                 ? ts.stripQuotes(ts.getTextOfIdentifierOrLiteral(node))
                 : undefined;
             var displayName = specifierName || typeChecker.symbolToString(symbol);
@@ -106263,9 +109572,9 @@ var ts;
         }
         function nodeIsEligibleForRename(node) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                 case 10 /* StringLiteral */:
-                case 100 /* ThisKeyword */:
+                case 101 /* ThisKeyword */:
                     return true;
                 case 8 /* NumericLiteral */:
                     return ts.isLiteralNameOfPropertyDeclarationOrIndexAccess(node);
@@ -106277,6 +109586,284 @@ var ts;
 })(ts || (ts = {}));
 /* @internal */
 var ts;
+(function (ts) {
+    var SmartSelectionRange;
+    (function (SmartSelectionRange) {
+        function getSmartSelectionRange(pos, sourceFile) {
+            var selectionRange = {
+                textSpan: ts.createTextSpanFromBounds(sourceFile.getFullStart(), sourceFile.getEnd())
+            };
+            var parentNode = sourceFile;
+            outer: while (true) {
+                var children = getSelectionChildren(parentNode);
+                if (!children.length)
+                    break;
+                for (var i = 0; i < children.length; i++) {
+                    var prevNode = children[i - 1];
+                    var node = children[i];
+                    var nextNode = children[i + 1];
+                    if (node.getStart(sourceFile) > pos) {
+                        break outer;
+                    }
+                    if (positionShouldSnapToNode(pos, node, nextNode)) {
+                        // 1. Blocks are effectively redundant with SyntaxLists.
+                        // 2. TemplateSpans, along with the SyntaxLists containing them, are a somewhat unintuitive grouping
+                        //    of things that should be considered independently.
+                        // 3. A VariableStatement’s children are just a VaraiableDeclarationList and a semicolon.
+                        // 4. A lone VariableDeclaration in a VaraibleDeclaration feels redundant with the VariableStatement.
+                        //
+                        // Dive in without pushing a selection range.
+                        if (ts.isBlock(node)
+                            || ts.isTemplateSpan(node) || ts.isTemplateHead(node)
+                            || prevNode && ts.isTemplateHead(prevNode)
+                            || ts.isVariableDeclarationList(node) && ts.isVariableStatement(parentNode)
+                            || ts.isSyntaxList(node) && ts.isVariableDeclarationList(parentNode)
+                            || ts.isVariableDeclaration(node) && ts.isSyntaxList(parentNode) && children.length === 1) {
+                            parentNode = node;
+                            break;
+                        }
+                        // Synthesize a stop for '${ ... }' since '${' and '}' actually belong to siblings.
+                        if (ts.isTemplateSpan(parentNode) && nextNode && ts.isTemplateMiddleOrTemplateTail(nextNode)) {
+                            var start_2 = node.getFullStart() - "${".length;
+                            var end_2 = nextNode.getStart() + "}".length;
+                            pushSelectionRange(start_2, end_2);
+                        }
+                        // Blocks with braces, brackets, parens, or JSX tags on separate lines should be
+                        // selected from open to close, including whitespace but not including the braces/etc. themselves.
+                        var isBetweenMultiLineBookends = ts.isSyntaxList(node)
+                            && isListOpener(prevNode)
+                            && isListCloser(nextNode)
+                            && !ts.positionsAreOnSameLine(prevNode.getStart(), nextNode.getStart(), sourceFile);
+                        var jsDocCommentStart = ts.hasJSDocNodes(node) && node.jsDoc[0].getStart();
+                        var start = isBetweenMultiLineBookends ? prevNode.getEnd() : node.getStart();
+                        var end = isBetweenMultiLineBookends ? nextNode.getStart() : node.getEnd();
+                        if (ts.isNumber(jsDocCommentStart)) {
+                            pushSelectionRange(jsDocCommentStart, end);
+                        }
+                        pushSelectionRange(start, end);
+                        // String literals should have a stop both inside and outside their quotes.
+                        if (ts.isStringLiteral(node) || ts.isTemplateLiteral(node)) {
+                            pushSelectionRange(start + 1, end - 1);
+                        }
+                        parentNode = node;
+                        break;
+                    }
+                    // If we made it to the end of the for loop, we’re done.
+                    // In practice, I’ve only seen this happen at the very end
+                    // of a SourceFile.
+                    if (i === children.length - 1) {
+                        break outer;
+                    }
+                }
+            }
+            return selectionRange;
+            function pushSelectionRange(start, end) {
+                // Skip empty ranges
+                if (start !== end) {
+                    var textSpan = ts.createTextSpanFromBounds(start, end);
+                    if (!selectionRange || (
+                    // Skip ranges that are identical to the parent
+                    !ts.textSpansEqual(textSpan, selectionRange.textSpan) &&
+                        // Skip ranges that don’t contain the original position
+                        ts.textSpanIntersectsWithPosition(textSpan, pos))) {
+                        selectionRange = __assign({ textSpan: textSpan }, selectionRange && { parent: selectionRange });
+                    }
+                }
+            }
+        }
+        SmartSelectionRange.getSmartSelectionRange = getSmartSelectionRange;
+        /**
+         * Like `ts.positionBelongsToNode`, except positions immediately after nodes
+         * count too, unless that position belongs to the next node. In effect, makes
+         * selections able to snap to preceding tokens when the cursor is on the tail
+         * end of them with only whitespace ahead.
+         * @param pos The position to check.
+         * @param node The candidate node to snap to.
+         * @param nextNode The next sibling node in the tree.
+         * @param sourceFile The source file containing the nodes.
+         */
+        function positionShouldSnapToNode(pos, node, nextNode) {
+            // Can’t use 'ts.positionBelongsToNode()' here because it cleverly accounts
+            // for missing nodes, which can’t really be considered when deciding what
+            // to select.
+            ts.Debug.assert(node.pos <= pos);
+            if (pos < node.end) {
+                return true;
+            }
+            var nodeEnd = node.getEnd();
+            var nextNodeStart = nextNode && nextNode.getStart();
+            if (nodeEnd === pos) {
+                return pos !== nextNodeStart;
+            }
+            return false;
+        }
+        var isImport = ts.or(ts.isImportDeclaration, ts.isImportEqualsDeclaration);
+        /**
+         * Gets the children of a node to be considered for selection ranging,
+         * transforming them into an artificial tree according to their intuitive
+         * grouping where no grouping actually exists in the parse tree. For example,
+         * top-level imports are grouped into their own SyntaxList so they can be
+         * selected all together, even though in the AST they’re just siblings of each
+         * other as well as of other top-level statements and declarations.
+         */
+        function getSelectionChildren(node) {
+            // Group top-level imports
+            if (ts.isSourceFile(node)) {
+                return groupChildren(node.getChildAt(0).getChildren(), isImport);
+            }
+            // Mapped types _look_ like ObjectTypes with a single member,
+            // but in fact don’t contain a SyntaxList or a node containing
+            // the “key/value” pair like ObjectTypes do, but it seems intuitive
+            // that the selection would snap to those points. The philosophy
+            // of choosing a selection range is not so much about what the
+            // syntax currently _is_ as what the syntax might easily become
+            // if the user is making a selection; e.g., we synthesize a selection
+            // around the “key/value” pair not because there’s a node there, but
+            // because it allows the mapped type to become an object type with a
+            // few keystrokes.
+            if (ts.isMappedTypeNode(node)) {
+                var _a = node.getChildren(), openBraceToken = _a[0], children = _a.slice(1);
+                var closeBraceToken = ts.Debug.assertDefined(children.pop());
+                ts.Debug.assertEqual(openBraceToken.kind, 18 /* OpenBraceToken */);
+                ts.Debug.assertEqual(closeBraceToken.kind, 19 /* CloseBraceToken */);
+                // Group `-/+readonly` and `-/+?`
+                var groupedWithPlusMinusTokens = groupChildren(children, function (child) {
+                    return child === node.readonlyToken || child.kind === 134 /* ReadonlyKeyword */ ||
+                        child === node.questionToken || child.kind === 56 /* QuestionToken */;
+                });
+                // Group type parameter with surrounding brackets
+                var groupedWithBrackets = groupChildren(groupedWithPlusMinusTokens, function (_a) {
+                    var kind = _a.kind;
+                    return kind === 22 /* OpenBracketToken */ ||
+                        kind === 151 /* TypeParameter */ ||
+                        kind === 23 /* CloseBracketToken */;
+                });
+                return [
+                    openBraceToken,
+                    // Pivot on `:`
+                    createSyntaxList(splitChildren(groupedWithBrackets, function (_a) {
+                        var kind = _a.kind;
+                        return kind === 57 /* ColonToken */;
+                    })),
+                    closeBraceToken,
+                ];
+            }
+            // Group modifiers and property name, then pivot on `:`.
+            if (ts.isPropertySignature(node)) {
+                var children = groupChildren(node.getChildren(), function (child) {
+                    return child === node.name || ts.contains(node.modifiers, child);
+                });
+                return splitChildren(children, function (_a) {
+                    var kind = _a.kind;
+                    return kind === 57 /* ColonToken */;
+                });
+            }
+            // Group the parameter name with its `...`, then that group with its `?`, then pivot on `=`.
+            if (ts.isParameter(node)) {
+                var groupedDotDotDotAndName_1 = groupChildren(node.getChildren(), function (child) {
+                    return child === node.dotDotDotToken || child === node.name;
+                });
+                var groupedWithQuestionToken = groupChildren(groupedDotDotDotAndName_1, function (child) {
+                    return child === groupedDotDotDotAndName_1[0] || child === node.questionToken;
+                });
+                return splitChildren(groupedWithQuestionToken, function (_a) {
+                    var kind = _a.kind;
+                    return kind === 60 /* EqualsToken */;
+                });
+            }
+            // Pivot on '='
+            if (ts.isBindingElement(node)) {
+                return splitChildren(node.getChildren(), function (_a) {
+                    var kind = _a.kind;
+                    return kind === 60 /* EqualsToken */;
+                });
+            }
+            return node.getChildren();
+        }
+        /**
+         * Groups sibling nodes together into their own SyntaxList if they
+         * a) are adjacent, AND b) match a predicate function.
+         */
+        function groupChildren(children, groupOn) {
+            var result = [];
+            var group;
+            for (var _i = 0, children_1 = children; _i < children_1.length; _i++) {
+                var child = children_1[_i];
+                if (groupOn(child)) {
+                    group = group || [];
+                    group.push(child);
+                }
+                else {
+                    if (group) {
+                        result.push(createSyntaxList(group));
+                        group = undefined;
+                    }
+                    result.push(child);
+                }
+            }
+            if (group) {
+                result.push(createSyntaxList(group));
+            }
+            return result;
+        }
+        /**
+         * Splits sibling nodes into up to four partitions:
+         * 1) everything left of the first node matched by `pivotOn`,
+         * 2) the first node matched by `pivotOn`,
+         * 3) everything right of the first node matched by `pivotOn`,
+         * 4) a trailing semicolon, if `separateTrailingSemicolon` is enabled.
+         * The left and right groups, if not empty, will each be grouped into their own containing SyntaxList.
+         * @param children The sibling nodes to split.
+         * @param pivotOn The predicate function to match the node to be the pivot. The first node that matches
+         * the predicate will be used; any others that may match will be included into the right-hand group.
+         * @param separateTrailingSemicolon If the last token is a semicolon, it will be returned as a separate
+         * child rather than be included in the right-hand group.
+         */
+        function splitChildren(children, pivotOn, separateTrailingSemicolon) {
+            if (separateTrailingSemicolon === void 0) { separateTrailingSemicolon = true; }
+            if (children.length < 2) {
+                return children;
+            }
+            var splitTokenIndex = ts.findIndex(children, pivotOn);
+            if (splitTokenIndex === -1) {
+                return children;
+            }
+            var leftChildren = children.slice(0, splitTokenIndex);
+            var splitToken = children[splitTokenIndex];
+            var lastToken = ts.last(children);
+            var separateLastToken = separateTrailingSemicolon && lastToken.kind === 26 /* SemicolonToken */;
+            var rightChildren = children.slice(splitTokenIndex + 1, separateLastToken ? children.length - 1 : undefined);
+            var result = ts.compact([
+                leftChildren.length ? createSyntaxList(leftChildren) : undefined,
+                splitToken,
+                rightChildren.length ? createSyntaxList(rightChildren) : undefined,
+            ]);
+            return separateLastToken ? result.concat(lastToken) : result;
+        }
+        function createSyntaxList(children) {
+            ts.Debug.assertGreaterThanOrEqual(children.length, 1);
+            var syntaxList = ts.createNode(313 /* SyntaxList */, children[0].pos, ts.last(children).end);
+            syntaxList._children = children;
+            return syntaxList;
+        }
+        function isListOpener(token) {
+            var kind = token && token.kind;
+            return kind === 18 /* OpenBraceToken */
+                || kind === 22 /* OpenBracketToken */
+                || kind === 20 /* OpenParenToken */
+                || kind === 263 /* JsxOpeningElement */;
+        }
+        function isListCloser(token) {
+            var kind = token && token.kind;
+            return kind === 19 /* CloseBraceToken */
+                || kind === 23 /* CloseBracketToken */
+                || kind === 21 /* CloseParenToken */
+                || kind === 264 /* JsxClosingElement */;
+        }
+    })(SmartSelectionRange = ts.SmartSelectionRange || (ts.SmartSelectionRange = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
 (function (ts) {
     var SignatureHelp;
     (function (SignatureHelp) {
@@ -106388,8 +109975,21 @@ var ts;
             });
         }
         function containsPrecedingToken(startingToken, sourceFile, container) {
-            var precedingToken = ts.Debug.assertDefined(ts.findPrecedingToken(startingToken.getFullStart(), sourceFile, startingToken.parent, /*excludeJsdoc*/ true));
-            return ts.rangeContainsRange(container, precedingToken);
+            var pos = startingToken.getFullStart();
+            // There’s a possibility that `startingToken.parent` contains only `startingToken` and
+            // missing nodes, none of which are valid to be returned by `findPrecedingToken`. In that
+            // case, the preceding token we want is actually higher up the tree—almost definitely the
+            // next parent, but theoretically the situation with missing nodes might be happening on
+            // multiple nested levels.
+            var currentParent = startingToken.parent;
+            while (currentParent) {
+                var precedingToken = ts.findPrecedingToken(pos, sourceFile, currentParent, /*excludeJsdoc*/ true);
+                if (precedingToken) {
+                    return ts.rangeContainsRange(container, precedingToken);
+                }
+                currentParent = currentParent.parent;
+            }
+            return ts.Debug.fail("Could not find preceding token");
         }
         function getArgumentInfoForCompletions(node, position, sourceFile) {
             var info = getImmediatelyContainingArgumentInfo(node, position, sourceFile);
@@ -106463,10 +110063,10 @@ var ts;
                 }
                 return undefined;
             }
-            else if (ts.isTemplateHead(node) && parent.parent.kind === 193 /* TaggedTemplateExpression */) {
+            else if (ts.isTemplateHead(node) && parent.parent.kind === 194 /* TaggedTemplateExpression */) {
                 var templateExpression = parent;
                 var tagExpression = templateExpression.parent;
-                ts.Debug.assert(templateExpression.kind === 206 /* TemplateExpression */);
+                ts.Debug.assert(templateExpression.kind === 207 /* TemplateExpression */);
                 var argumentIndex = ts.isInsideTemplateLiteral(node, position, sourceFile) ? 0 : 1;
                 return getArgumentListInfoForTemplate(tagExpression, argumentIndex, sourceFile);
             }
@@ -106533,17 +110133,17 @@ var ts;
                 return undefined;
             var parent = startingToken.parent;
             switch (parent.kind) {
-                case 195 /* ParenthesizedExpression */:
-                case 156 /* MethodDeclaration */:
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
+                case 196 /* ParenthesizedExpression */:
+                case 157 /* MethodDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
                     var info = getArgumentOrParameterListInfo(startingToken, sourceFile);
                     if (!info)
                         return undefined;
                     var argumentIndex = info.argumentIndex, argumentCount = info.argumentCount, argumentsSpan = info.argumentsSpan;
                     var contextualType = ts.isMethodDeclaration(parent) ? checker.getContextualTypeForObjectLiteralElement(parent) : checker.getContextualType(parent);
                     return contextualType && { contextualType: contextualType, argumentIndex: argumentIndex, argumentCount: argumentCount, argumentsSpan: argumentsSpan };
-                case 204 /* BinaryExpression */: {
+                case 205 /* BinaryExpression */: {
                     var highestBinary = getHighestBinary(parent);
                     var contextualType_1 = checker.getContextualType(highestBinary);
                     var argumentIndex_1 = startingToken.kind === 20 /* OpenParenToken */ ? 0 : countBinaryExpressionParameters(parent) - 1;
@@ -106667,7 +110267,7 @@ var ts;
             //       |       |
             // This is because a Missing node has no width. However, what we actually want is to include trivia
             // leading up to the next token in case the user is about to type in a TemplateMiddle or TemplateTail.
-            if (template.kind === 206 /* TemplateExpression */) {
+            if (template.kind === 207 /* TemplateExpression */) {
                 var lastSpan = ts.last(template.templateSpans);
                 if (lastSpan.literal.getFullWidth() === 0) {
                     applicableSpanEnd = ts.skipTrivia(sourceFile.text, applicableSpanEnd, /*stopAfterLineBreak*/ false);
@@ -106679,7 +110279,7 @@ var ts;
             var _loop_7 = function (n) {
                 // If the node is not a subspan of its parent, this is a big problem.
                 // There have been crashes that might be caused by this violation.
-                ts.Debug.assert(ts.rangeContainsRange(n.parent, n), "Not a subspan", function () { return "Child: " + ts.Debug.showSyntaxKind(n) + ", parent: " + ts.Debug.showSyntaxKind(n.parent); });
+                ts.Debug.assert(ts.rangeContainsRange(n.parent, n), "Not a subspan", function () { return "Child: " + ts.Debug.formatSyntaxKind(n.kind) + ", parent: " + ts.Debug.formatSyntaxKind(n.parent.kind); });
                 var argumentInfo = getImmediatelyContainingArgumentOrContextualParameterInfo(n, position, sourceFile, checker);
                 if (argumentInfo) {
                     return { value: argumentInfo };
@@ -106763,13 +110363,13 @@ var ts;
             var parameters = (typeParameters || ts.emptyArray).map(function (t) { return createSignatureHelpParameterForTypeParameter(t, checker, enclosingDeclaration, sourceFile, printer); });
             var parameterParts = ts.mapToDisplayParts(function (writer) {
                 var thisParameter = candidateSignature.thisParameter ? [checker.symbolToParameterDeclaration(candidateSignature.thisParameter, enclosingDeclaration, signatureHelpNodeBuilderFlags)] : [];
-                var params = ts.createNodeArray(thisParameter.concat(candidateSignature.parameters.map(function (param) { return checker.symbolToParameterDeclaration(param, enclosingDeclaration, signatureHelpNodeBuilderFlags); })));
+                var params = ts.createNodeArray(thisParameter.concat(checker.getExpandedParameters(candidateSignature).map(function (param) { return checker.symbolToParameterDeclaration(param, enclosingDeclaration, signatureHelpNodeBuilderFlags); })));
                 printer.writeList(2576 /* CallExpressionArguments */, params, sourceFile, writer);
             });
             return { isVariadic: false, parameters: parameters, prefix: [ts.punctuationPart(28 /* LessThanToken */)], suffix: [ts.punctuationPart(30 /* GreaterThanToken */)].concat(parameterParts) };
         }
         function itemInfoForParameters(candidateSignature, checker, enclosingDeclaration, sourceFile) {
-            var isVariadic = candidateSignature.hasRestParameter;
+            var isVariadic = checker.hasEffectiveRestParameter(candidateSignature);
             var printer = ts.createPrinter({ removeComments: true });
             var typeParameterParts = ts.mapToDisplayParts(function (writer) {
                 if (candidateSignature.typeParameters && candidateSignature.typeParameters.length) {
@@ -106777,7 +110377,7 @@ var ts;
                     printer.writeList(53776 /* TypeParameters */, args, sourceFile, writer);
                 }
             });
-            var parameters = candidateSignature.parameters.map(function (p) { return createSignatureHelpParameterForParameter(p, checker, enclosingDeclaration, sourceFile, printer); });
+            var parameters = checker.getExpandedParameters(candidateSignature).map(function (p) { return createSignatureHelpParameterForParameter(p, checker, enclosingDeclaration, sourceFile, printer); });
             return { isVariadic: isVariadic, parameters: parameters, prefix: typeParameterParts.concat([ts.punctuationPart(20 /* OpenParenToken */)]), suffix: [ts.punctuationPart(21 /* CloseParenToken */)] };
         }
         function createSignatureHelpParameterForParameter(parameter, checker, enclosingDeclaration, sourceFile, printer) {
@@ -106979,7 +110579,7 @@ var ts;
         function check(node) {
             if (isJsFile) {
                 switch (node.kind) {
-                    case 196 /* FunctionExpression */:
+                    case 197 /* FunctionExpression */:
                         var decl = ts.getDeclarationOfExpando(node);
                         if (decl) {
                             var symbol_1 = decl.symbol;
@@ -106989,7 +110589,7 @@ var ts;
                             }
                         }
                     // falls through if no diagnostic was created
-                    case 239 /* FunctionDeclaration */:
+                    case 240 /* FunctionDeclaration */:
                         var symbol = node.symbol;
                         if (symbol.members && (symbol.members.size > 0)) {
                             diags.push(ts.createDiagnosticForNode(ts.isVariableDeclaration(node.parent) ? node.parent.name : node, ts.Diagnostics.This_constructor_function_may_be_converted_to_a_class_declaration));
@@ -107022,11 +110622,11 @@ var ts;
     function containsTopLevelCommonjs(sourceFile) {
         return sourceFile.statements.some(function (statement) {
             switch (statement.kind) {
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     return statement.declarationList.declarations.some(function (decl) {
                         return !!decl.initializer && ts.isRequireCall(propertyAccessLeftHandSide(decl.initializer), /*checkArgumentIsStringLiteralLike*/ true);
                     });
-                case 221 /* ExpressionStatement */: {
+                case 222 /* ExpressionStatement */: {
                     var expression = statement.expression;
                     if (!ts.isBinaryExpression(expression))
                         return ts.isRequireCall(expression, /*checkArgumentIsStringLiteralLike*/ true);
@@ -107043,12 +110643,12 @@ var ts;
     }
     function importNameForConvertToDefaultImport(node) {
         switch (node.kind) {
-            case 249 /* ImportDeclaration */:
+            case 250 /* ImportDeclaration */:
                 var importClause = node.importClause, moduleSpecifier = node.moduleSpecifier;
-                return importClause && !importClause.name && importClause.namedBindings && importClause.namedBindings.kind === 251 /* NamespaceImport */ && ts.isStringLiteral(moduleSpecifier)
+                return importClause && !importClause.name && importClause.namedBindings && importClause.namedBindings.kind === 252 /* NamespaceImport */ && ts.isStringLiteral(moduleSpecifier)
                     ? importClause.namedBindings.name
                     : undefined;
-            case 248 /* ImportEqualsDeclaration */:
+            case 249 /* ImportEqualsDeclaration */:
                 return node.name;
             default:
                 return undefined;
@@ -107106,13 +110706,13 @@ var ts;
     // should be kept up to date with getTransformationBody in convertToAsyncFunction.ts
     function isFixablePromiseArgument(arg) {
         switch (arg.kind) {
-            case 239 /* FunctionDeclaration */:
-            case 196 /* FunctionExpression */:
-            case 197 /* ArrowFunction */:
+            case 240 /* FunctionDeclaration */:
+            case 197 /* FunctionExpression */:
+            case 198 /* ArrowFunction */:
                 visitedNestedConvertibleFunctions.set(getKeyFromNode(arg), true);
             /* falls through */
-            case 96 /* NullKeyword */:
-            case 72 /* Identifier */: // identifier includes undefined
+            case 97 /* NullKeyword */:
+            case 73 /* Identifier */: // identifier includes undefined
                 return true;
             default:
                 return false;
@@ -107135,7 +110735,7 @@ var ts;
             }
             var flags = ts.getCombinedLocalAndExportSymbolFlags(symbol);
             if (flags & 32 /* Class */) {
-                return ts.getDeclarationOfKind(symbol, 209 /* ClassExpression */) ?
+                return ts.getDeclarationOfKind(symbol, 210 /* ClassExpression */) ?
                     "local class" /* localClassElement */ : "class" /* classElement */;
             }
             if (flags & 384 /* Enum */)
@@ -107172,7 +110772,7 @@ var ts;
             if (typeChecker.isArgumentsSymbol(symbol)) {
                 return "local var" /* localVariableElement */;
             }
-            if (location.kind === 100 /* ThisKeyword */ && ts.isExpression(location)) {
+            if (location.kind === 101 /* ThisKeyword */ && ts.isExpression(location)) {
                 return "parameter" /* parameterElement */;
             }
             var flags = ts.getCombinedLocalAndExportSymbolFlags(symbol);
@@ -107223,11 +110823,11 @@ var ts;
                 // If we requested completions after `x.` at the top-level, we may be at a source file location.
                 switch (location.parent && location.parent.kind) {
                     // If we've typed a character of the attribute name, will be 'JsxAttribute', else will be 'JsxOpeningElement'.
-                    case 262 /* JsxOpeningElement */:
-                    case 260 /* JsxElement */:
-                    case 261 /* JsxSelfClosingElement */:
-                        return location.kind === 72 /* Identifier */ ? "property" /* memberVariableElement */ : "JSX attribute" /* jsxAttribute */;
-                    case 267 /* JsxAttribute */:
+                    case 263 /* JsxOpeningElement */:
+                    case 261 /* JsxElement */:
+                    case 262 /* JsxSelfClosingElement */:
+                        return location.kind === 73 /* Identifier */ ? "property" /* memberVariableElement */ : "JSX attribute" /* jsxAttribute */;
+                    case 268 /* JsxAttribute */:
                         return "JSX attribute" /* jsxAttribute */;
                     default:
                         return "property" /* memberVariableElement */;
@@ -107254,13 +110854,13 @@ var ts;
             var symbolFlags = ts.getCombinedLocalAndExportSymbolFlags(symbol);
             var symbolKind = semanticMeaning & 1 /* Value */ ? getSymbolKindOfConstructorPropertyMethodAccessorFunctionOrVar(typeChecker, symbol, location) : "" /* unknown */;
             var hasAddedSymbolInfo = false;
-            var isThisExpression = location.kind === 100 /* ThisKeyword */ && ts.isInExpressionContext(location);
+            var isThisExpression = location.kind === 101 /* ThisKeyword */ && ts.isInExpressionContext(location);
             var type;
             var printer;
             var documentationFromAlias;
             var tagsFromAlias;
-            if (location.kind === 100 /* ThisKeyword */ && !isThisExpression) {
-                return { displayParts: [ts.keywordPart(100 /* ThisKeyword */)], documentation: [], symbolKind: "primitive type" /* primitiveType */, tags: undefined };
+            if (location.kind === 101 /* ThisKeyword */ && !isThisExpression) {
+                return { displayParts: [ts.keywordPart(101 /* ThisKeyword */)], documentation: [], symbolKind: "primitive type" /* primitiveType */, tags: undefined };
             }
             // Class at constructor site need to be shown as constructor apart from property,method, vars
             if (symbolKind !== "" /* unknown */ || symbolFlags & 32 /* Class */ || symbolFlags & 2097152 /* Alias */) {
@@ -107270,7 +110870,7 @@ var ts;
                 }
                 var signature = void 0;
                 type = isThisExpression ? typeChecker.getTypeAtLocation(location) : typeChecker.getTypeOfSymbolAtLocation(symbol.exportSymbol || symbol, location);
-                if (location.parent && location.parent.kind === 189 /* PropertyAccessExpression */) {
+                if (location.parent && location.parent.kind === 190 /* PropertyAccessExpression */) {
                     var right = location.parent.name;
                     // Either the location is on the right of a property access, or on the left and the right is missing
                     if (right === location || (right && right.getFullWidth() === 0)) {
@@ -107289,9 +110889,8 @@ var ts;
                     callExpressionLike = location.parent;
                 }
                 if (callExpressionLike) {
-                    var candidateSignatures = [];
-                    signature = typeChecker.getResolvedSignature(callExpressionLike, candidateSignatures); // TODO: GH#18217
-                    var useConstructSignatures = callExpressionLike.kind === 192 /* NewExpression */ || (ts.isCallExpression(callExpressionLike) && callExpressionLike.expression.kind === 98 /* SuperKeyword */);
+                    signature = typeChecker.getResolvedSignature(callExpressionLike); // TODO: GH#18217
+                    var useConstructSignatures = callExpressionLike.kind === 193 /* NewExpression */ || (ts.isCallExpression(callExpressionLike) && callExpressionLike.expression.kind === 99 /* SuperKeyword */);
                     var allSignatures = useConstructSignatures ? type.getConstructSignatures() : type.getCallSignatures();
                     if (!ts.contains(allSignatures, signature.target) && !ts.contains(allSignatures, signature)) {
                         // Get the first signature if there is one -- allSignatures may contain
@@ -107309,7 +110908,7 @@ var ts;
                             pushSymbolKind(symbolKind);
                             displayParts.push(ts.spacePart());
                             if (useConstructSignatures) {
-                                displayParts.push(ts.keywordPart(95 /* NewKeyword */));
+                                displayParts.push(ts.keywordPart(96 /* NewKeyword */));
                                 displayParts.push(ts.spacePart());
                             }
                             addFullSymbolName(symbol);
@@ -107333,7 +110932,7 @@ var ts;
                                     displayParts.push(ts.lineBreakPart());
                                 }
                                 if (useConstructSignatures) {
-                                    displayParts.push(ts.keywordPart(95 /* NewKeyword */));
+                                    displayParts.push(ts.keywordPart(96 /* NewKeyword */));
                                     displayParts.push(ts.spacePart());
                                 }
                                 addSignatureDisplayParts(signature, allSignatures, 262144 /* WriteArrowStyleSignature */);
@@ -107346,29 +110945,29 @@ var ts;
                     }
                 }
                 else if ((ts.isNameOfFunctionDeclaration(location) && !(symbolFlags & 98304 /* Accessor */)) || // name of function declaration
-                    (location.kind === 124 /* ConstructorKeyword */ && location.parent.kind === 157 /* Constructor */)) { // At constructor keyword of constructor declaration
+                    (location.kind === 125 /* ConstructorKeyword */ && location.parent.kind === 158 /* Constructor */)) { // At constructor keyword of constructor declaration
                     // get the signature from the declaration and write it
                     var functionDeclaration_1 = location.parent;
                     // Use function declaration to write the signatures only if the symbol corresponding to this declaration
                     var locationIsSymbolDeclaration = ts.find(symbol.declarations, function (declaration) {
-                        return declaration === (location.kind === 124 /* ConstructorKeyword */ ? functionDeclaration_1.parent : functionDeclaration_1);
+                        return declaration === (location.kind === 125 /* ConstructorKeyword */ ? functionDeclaration_1.parent : functionDeclaration_1);
                     });
                     if (locationIsSymbolDeclaration) {
-                        var allSignatures = functionDeclaration_1.kind === 157 /* Constructor */ ? type.getNonNullableType().getConstructSignatures() : type.getNonNullableType().getCallSignatures();
+                        var allSignatures = functionDeclaration_1.kind === 158 /* Constructor */ ? type.getNonNullableType().getConstructSignatures() : type.getNonNullableType().getCallSignatures();
                         if (!typeChecker.isImplementationOfOverload(functionDeclaration_1)) {
                             signature = typeChecker.getSignatureFromDeclaration(functionDeclaration_1); // TODO: GH#18217
                         }
                         else {
                             signature = allSignatures[0];
                         }
-                        if (functionDeclaration_1.kind === 157 /* Constructor */) {
+                        if (functionDeclaration_1.kind === 158 /* Constructor */) {
                             // show (constructor) Type(...) signature
                             symbolKind = "constructor" /* constructorImplementationElement */;
                             addPrefixForAnyFunctionOrVar(type.symbol, symbolKind);
                         }
                         else {
                             // (function/method) symbol(..signature)
-                            addPrefixForAnyFunctionOrVar(functionDeclaration_1.kind === 160 /* CallSignature */ &&
+                            addPrefixForAnyFunctionOrVar(functionDeclaration_1.kind === 161 /* CallSignature */ &&
                                 !(type.symbol.flags & 2048 /* TypeLiteral */ || type.symbol.flags & 4096 /* ObjectLiteral */) ? type.symbol : symbol, symbolKind);
                         }
                         addSignatureDisplayParts(signature, allSignatures);
@@ -107378,7 +110977,7 @@ var ts;
             }
             if (symbolFlags & 32 /* Class */ && !hasAddedSymbolInfo && !isThisExpression) {
                 addAliasPrefixIfNecessary();
-                if (ts.getDeclarationOfKind(symbol, 209 /* ClassExpression */)) {
+                if (ts.getDeclarationOfKind(symbol, 210 /* ClassExpression */)) {
                     // Special case for class expressions because we would like to indicate that
                     // the class name is local to the class body (similar to function expression)
                     //      (local class) class <className>
@@ -107386,7 +110985,7 @@ var ts;
                 }
                 else {
                     // Class declaration has name which is not local.
-                    displayParts.push(ts.keywordPart(76 /* ClassKeyword */));
+                    displayParts.push(ts.keywordPart(77 /* ClassKeyword */));
                 }
                 displayParts.push(ts.spacePart());
                 addFullSymbolName(symbol);
@@ -107394,37 +110993,37 @@ var ts;
             }
             if ((symbolFlags & 64 /* Interface */) && (semanticMeaning & 2 /* Type */)) {
                 prefixNextMeaning();
-                displayParts.push(ts.keywordPart(110 /* InterfaceKeyword */));
+                displayParts.push(ts.keywordPart(111 /* InterfaceKeyword */));
                 displayParts.push(ts.spacePart());
                 addFullSymbolName(symbol);
                 writeTypeParametersOfSymbol(symbol, sourceFile);
             }
             if ((symbolFlags & 524288 /* TypeAlias */) && (semanticMeaning & 2 /* Type */)) {
                 prefixNextMeaning();
-                displayParts.push(ts.keywordPart(140 /* TypeKeyword */));
+                displayParts.push(ts.keywordPart(141 /* TypeKeyword */));
                 displayParts.push(ts.spacePart());
                 addFullSymbolName(symbol);
                 writeTypeParametersOfSymbol(symbol, sourceFile);
                 displayParts.push(ts.spacePart());
-                displayParts.push(ts.operatorPart(59 /* EqualsToken */));
+                displayParts.push(ts.operatorPart(60 /* EqualsToken */));
                 displayParts.push(ts.spacePart());
                 ts.addRange(displayParts, ts.typeToDisplayParts(typeChecker, typeChecker.getDeclaredTypeOfSymbol(symbol), enclosingDeclaration, 8388608 /* InTypeAlias */));
             }
             if (symbolFlags & 384 /* Enum */) {
                 prefixNextMeaning();
                 if (ts.some(symbol.declarations, function (d) { return ts.isEnumDeclaration(d) && ts.isEnumConst(d); })) {
-                    displayParts.push(ts.keywordPart(77 /* ConstKeyword */));
+                    displayParts.push(ts.keywordPart(78 /* ConstKeyword */));
                     displayParts.push(ts.spacePart());
                 }
-                displayParts.push(ts.keywordPart(84 /* EnumKeyword */));
+                displayParts.push(ts.keywordPart(85 /* EnumKeyword */));
                 displayParts.push(ts.spacePart());
                 addFullSymbolName(symbol);
             }
             if (symbolFlags & 1536 /* Module */ && !isThisExpression) {
                 prefixNextMeaning();
-                var declaration = ts.getDeclarationOfKind(symbol, 244 /* ModuleDeclaration */);
-                var isNamespace = declaration && declaration.name && declaration.name.kind === 72 /* Identifier */;
-                displayParts.push(ts.keywordPart(isNamespace ? 131 /* NamespaceKeyword */ : 130 /* ModuleKeyword */));
+                var declaration = ts.getDeclarationOfKind(symbol, 245 /* ModuleDeclaration */);
+                var isNamespace = declaration && declaration.name && declaration.name.kind === 73 /* Identifier */;
+                displayParts.push(ts.keywordPart(isNamespace ? 132 /* NamespaceKeyword */ : 131 /* ModuleKeyword */));
                 displayParts.push(ts.spacePart());
                 addFullSymbolName(symbol);
             }
@@ -107443,7 +111042,7 @@ var ts;
                 }
                 else {
                     // Method/function type parameter
-                    var decl = ts.getDeclarationOfKind(symbol, 150 /* TypeParameter */);
+                    var decl = ts.getDeclarationOfKind(symbol, 151 /* TypeParameter */);
                     if (decl === undefined)
                         return ts.Debug.fail();
                     var declaration = decl.parent;
@@ -107451,21 +111050,21 @@ var ts;
                         if (ts.isFunctionLikeKind(declaration.kind)) {
                             addInPrefix();
                             var signature = typeChecker.getSignatureFromDeclaration(declaration); // TODO: GH#18217
-                            if (declaration.kind === 161 /* ConstructSignature */) {
-                                displayParts.push(ts.keywordPart(95 /* NewKeyword */));
+                            if (declaration.kind === 162 /* ConstructSignature */) {
+                                displayParts.push(ts.keywordPart(96 /* NewKeyword */));
                                 displayParts.push(ts.spacePart());
                             }
-                            else if (declaration.kind !== 160 /* CallSignature */ && declaration.name) {
+                            else if (declaration.kind !== 161 /* CallSignature */ && declaration.name) {
                                 addFullSymbolName(declaration.symbol);
                             }
                             ts.addRange(displayParts, ts.signatureToDisplayParts(typeChecker, signature, sourceFile, 32 /* WriteTypeArgumentsOfSignature */));
                         }
-                        else if (declaration.kind === 242 /* TypeAliasDeclaration */) {
+                        else if (declaration.kind === 243 /* TypeAliasDeclaration */) {
                             // Type alias type parameter
                             // For example
                             //      type list<T> = T[]; // Both T will go through same code path
                             addInPrefix();
-                            displayParts.push(ts.keywordPart(140 /* TypeKeyword */));
+                            displayParts.push(ts.keywordPart(141 /* TypeKeyword */));
                             displayParts.push(ts.spacePart());
                             addFullSymbolName(declaration.symbol);
                             writeTypeParametersOfSymbol(declaration.symbol, sourceFile);
@@ -107477,11 +111076,11 @@ var ts;
                 symbolKind = "enum member" /* enumMemberElement */;
                 addPrefixForAnyFunctionOrVar(symbol, "enum member");
                 var declaration = symbol.declarations[0];
-                if (declaration.kind === 278 /* EnumMember */) {
+                if (declaration.kind === 279 /* EnumMember */) {
                     var constantValue = typeChecker.getConstantValue(declaration);
                     if (constantValue !== undefined) {
                         displayParts.push(ts.spacePart());
-                        displayParts.push(ts.operatorPart(59 /* EqualsToken */));
+                        displayParts.push(ts.operatorPart(60 /* EqualsToken */));
                         displayParts.push(ts.spacePart());
                         displayParts.push(ts.displayPart(ts.getTextOfConstantValue(constantValue), typeof constantValue === "number" ? ts.SymbolDisplayPartKind.numericLiteral : ts.SymbolDisplayPartKind.stringLiteral));
                     }
@@ -107507,32 +111106,32 @@ var ts;
                     }
                 }
                 switch (symbol.declarations[0].kind) {
-                    case 247 /* NamespaceExportDeclaration */:
-                        displayParts.push(ts.keywordPart(85 /* ExportKeyword */));
+                    case 248 /* NamespaceExportDeclaration */:
+                        displayParts.push(ts.keywordPart(86 /* ExportKeyword */));
                         displayParts.push(ts.spacePart());
-                        displayParts.push(ts.keywordPart(131 /* NamespaceKeyword */));
+                        displayParts.push(ts.keywordPart(132 /* NamespaceKeyword */));
                         break;
-                    case 254 /* ExportAssignment */:
-                        displayParts.push(ts.keywordPart(85 /* ExportKeyword */));
+                    case 255 /* ExportAssignment */:
+                        displayParts.push(ts.keywordPart(86 /* ExportKeyword */));
                         displayParts.push(ts.spacePart());
-                        displayParts.push(ts.keywordPart(symbol.declarations[0].isExportEquals ? 59 /* EqualsToken */ : 80 /* DefaultKeyword */));
+                        displayParts.push(ts.keywordPart(symbol.declarations[0].isExportEquals ? 60 /* EqualsToken */ : 81 /* DefaultKeyword */));
                         break;
-                    case 257 /* ExportSpecifier */:
-                        displayParts.push(ts.keywordPart(85 /* ExportKeyword */));
+                    case 258 /* ExportSpecifier */:
+                        displayParts.push(ts.keywordPart(86 /* ExportKeyword */));
                         break;
                     default:
-                        displayParts.push(ts.keywordPart(92 /* ImportKeyword */));
+                        displayParts.push(ts.keywordPart(93 /* ImportKeyword */));
                 }
                 displayParts.push(ts.spacePart());
                 addFullSymbolName(symbol);
                 ts.forEach(symbol.declarations, function (declaration) {
-                    if (declaration.kind === 248 /* ImportEqualsDeclaration */) {
+                    if (declaration.kind === 249 /* ImportEqualsDeclaration */) {
                         var importEqualsDeclaration = declaration;
                         if (ts.isExternalModuleImportEqualsDeclaration(importEqualsDeclaration)) {
                             displayParts.push(ts.spacePart());
-                            displayParts.push(ts.operatorPart(59 /* EqualsToken */));
+                            displayParts.push(ts.operatorPart(60 /* EqualsToken */));
                             displayParts.push(ts.spacePart());
-                            displayParts.push(ts.keywordPart(134 /* RequireKeyword */));
+                            displayParts.push(ts.keywordPart(135 /* RequireKeyword */));
                             displayParts.push(ts.punctuationPart(20 /* OpenParenToken */));
                             displayParts.push(ts.displayPart(ts.getTextOfNode(ts.getExternalModuleImportEqualsDeclarationExpression(importEqualsDeclaration)), ts.SymbolDisplayPartKind.stringLiteral));
                             displayParts.push(ts.punctuationPart(21 /* CloseParenToken */));
@@ -107541,7 +111140,7 @@ var ts;
                             var internalAliasSymbol = typeChecker.getSymbolAtLocation(importEqualsDeclaration.moduleReference);
                             if (internalAliasSymbol) {
                                 displayParts.push(ts.spacePart());
-                                displayParts.push(ts.operatorPart(59 /* EqualsToken */));
+                                displayParts.push(ts.operatorPart(60 /* EqualsToken */));
                                 displayParts.push(ts.spacePart());
                                 addFullSymbolName(internalAliasSymbol, enclosingDeclaration);
                             }
@@ -107555,7 +111154,7 @@ var ts;
                     if (type) {
                         if (isThisExpression) {
                             prefixNextMeaning();
-                            displayParts.push(ts.keywordPart(100 /* ThisKeyword */));
+                            displayParts.push(ts.keywordPart(101 /* ThisKeyword */));
                         }
                         else {
                             addPrefixForAnyFunctionOrVar(symbol, symbolKind);
@@ -107604,10 +111203,10 @@ var ts;
                     // For some special property access expressions like `exports.foo = foo` or `module.exports.foo = foo`
                     // there documentation comments might be attached to the right hand side symbol of their declarations.
                     // The pattern of such special property access is that the parent symbol is the symbol of the file.
-                    if (symbol.parent && ts.forEach(symbol.parent.declarations, function (declaration) { return declaration.kind === 284 /* SourceFile */; })) {
+                    if (symbol.parent && ts.forEach(symbol.parent.declarations, function (declaration) { return declaration.kind === 285 /* SourceFile */; })) {
                         for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                             var declaration = _a[_i];
-                            if (!declaration.parent || declaration.parent.kind !== 204 /* BinaryExpression */) {
+                            if (!declaration.parent || declaration.parent.kind !== 205 /* BinaryExpression */) {
                                 continue;
                             }
                             var rhsSymbol = typeChecker.getSymbolAtLocation(declaration.parent.right);
@@ -107650,7 +111249,7 @@ var ts;
             }
             function addInPrefix() {
                 displayParts.push(ts.spacePart());
-                displayParts.push(ts.keywordPart(93 /* InKeyword */));
+                displayParts.push(ts.keywordPart(94 /* InKeyword */));
                 displayParts.push(ts.spacePart());
             }
             function addFullSymbolName(symbolToDisplay, enclosingDeclaration) {
@@ -107720,16 +111319,16 @@ var ts;
             }
             return ts.forEach(symbol.declarations, function (declaration) {
                 // Function expressions are local
-                if (declaration.kind === 196 /* FunctionExpression */) {
+                if (declaration.kind === 197 /* FunctionExpression */) {
                     return true;
                 }
-                if (declaration.kind !== 237 /* VariableDeclaration */ && declaration.kind !== 239 /* FunctionDeclaration */) {
+                if (declaration.kind !== 238 /* VariableDeclaration */ && declaration.kind !== 240 /* FunctionDeclaration */) {
                     return false;
                 }
                 // If the parent is not sourceFile or module block it is local variable
                 for (var parent = declaration.parent; !ts.isFunctionBlock(parent); parent = parent.parent) {
                     // Reached source file or module block
-                    if (parent.kind === 284 /* SourceFile */ || parent.kind === 245 /* ModuleBlock */) {
+                    if (parent.kind === 285 /* SourceFile */ || parent.kind === 246 /* ModuleBlock */) {
                         return false;
                     }
                 }
@@ -107958,8 +111557,8 @@ var ts;
 (function (ts) {
     var formatting;
     (function (formatting) {
-        var standardScanner = ts.createScanner(7 /* Latest */, /*skipTrivia*/ false, 0 /* Standard */);
-        var jsxScanner = ts.createScanner(7 /* Latest */, /*skipTrivia*/ false, 1 /* JSX */);
+        var standardScanner = ts.createScanner(99 /* Latest */, /*skipTrivia*/ false, 0 /* Standard */);
+        var jsxScanner = ts.createScanner(99 /* Latest */, /*skipTrivia*/ false, 1 /* JSX */);
         var ScanAction;
         (function (ScanAction) {
             ScanAction[ScanAction["Scan"] = 0] = "Scan";
@@ -108023,8 +111622,8 @@ var ts;
             function shouldRescanGreaterThanToken(node) {
                 switch (node.kind) {
                     case 32 /* GreaterThanEqualsToken */:
-                    case 67 /* GreaterThanGreaterThanEqualsToken */:
-                    case 68 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
+                    case 68 /* GreaterThanGreaterThanEqualsToken */:
+                    case 69 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
                     case 48 /* GreaterThanGreaterThanGreaterThanToken */:
                     case 47 /* GreaterThanGreaterThanToken */:
                         return true;
@@ -108034,12 +111633,12 @@ var ts;
             function shouldRescanJsxIdentifier(node) {
                 if (node.parent) {
                     switch (node.parent.kind) {
-                        case 267 /* JsxAttribute */:
-                        case 262 /* JsxOpeningElement */:
-                        case 263 /* JsxClosingElement */:
-                        case 261 /* JsxSelfClosingElement */:
+                        case 268 /* JsxAttribute */:
+                        case 263 /* JsxOpeningElement */:
+                        case 264 /* JsxClosingElement */:
+                        case 262 /* JsxSelfClosingElement */:
                             // May parse an identifier like `module-layout`; that will be scanned as a keyword at first, but we should parse the whole thing to get an identifier.
-                            return ts.isKeyword(node.kind) || node.kind === 72 /* Identifier */;
+                            return ts.isKeyword(node.kind) || node.kind === 73 /* Identifier */;
                     }
                 }
                 return false;
@@ -108055,7 +111654,7 @@ var ts;
                     container.kind === 17 /* TemplateTail */;
             }
             function startsWithSlashToken(t) {
-                return t === 42 /* SlashToken */ || t === 64 /* SlashEqualsToken */;
+                return t === 42 /* SlashToken */ || t === 65 /* SlashEqualsToken */;
             }
             function readTokenInfo(n) {
                 ts.Debug.assert(isOnToken());
@@ -108214,7 +111813,7 @@ var ts;
     (function (formatting) {
         function getAllRules() {
             var allTokens = [];
-            for (var token = 0 /* FirstToken */; token <= 147 /* LastToken */; token++) {
+            for (var token = 0 /* FirstToken */; token <= 148 /* LastToken */; token++) {
                 allTokens.push(token);
             }
             function anyTokenExcept() {
@@ -108226,27 +111825,27 @@ var ts;
             }
             var anyToken = { tokens: allTokens, isSpecific: false };
             var anyTokenIncludingMultilineComments = tokenRangeFrom(allTokens.concat([3 /* MultiLineCommentTrivia */]));
-            var keywords = tokenRangeFromRange(73 /* FirstKeyword */, 147 /* LastKeyword */);
-            var binaryOperators = tokenRangeFromRange(28 /* FirstBinaryOperator */, 71 /* LastBinaryOperator */);
-            var binaryKeywordOperators = [93 /* InKeyword */, 94 /* InstanceOfKeyword */, 147 /* OfKeyword */, 119 /* AsKeyword */, 128 /* IsKeyword */];
+            var keywords = tokenRangeFromRange(74 /* FirstKeyword */, 148 /* LastKeyword */);
+            var binaryOperators = tokenRangeFromRange(28 /* FirstBinaryOperator */, 72 /* LastBinaryOperator */);
+            var binaryKeywordOperators = [94 /* InKeyword */, 95 /* InstanceOfKeyword */, 148 /* OfKeyword */, 120 /* AsKeyword */, 129 /* IsKeyword */];
             var unaryPrefixOperators = [44 /* PlusPlusToken */, 45 /* MinusMinusToken */, 53 /* TildeToken */, 52 /* ExclamationToken */];
             var unaryPrefixExpressions = [
-                8 /* NumericLiteral */, 9 /* BigIntLiteral */, 72 /* Identifier */, 20 /* OpenParenToken */,
-                22 /* OpenBracketToken */, 18 /* OpenBraceToken */, 100 /* ThisKeyword */, 95 /* NewKeyword */
+                8 /* NumericLiteral */, 9 /* BigIntLiteral */, 73 /* Identifier */, 20 /* OpenParenToken */,
+                22 /* OpenBracketToken */, 18 /* OpenBraceToken */, 101 /* ThisKeyword */, 96 /* NewKeyword */
             ];
-            var unaryPreincrementExpressions = [72 /* Identifier */, 20 /* OpenParenToken */, 100 /* ThisKeyword */, 95 /* NewKeyword */];
-            var unaryPostincrementExpressions = [72 /* Identifier */, 21 /* CloseParenToken */, 23 /* CloseBracketToken */, 95 /* NewKeyword */];
-            var unaryPredecrementExpressions = [72 /* Identifier */, 20 /* OpenParenToken */, 100 /* ThisKeyword */, 95 /* NewKeyword */];
-            var unaryPostdecrementExpressions = [72 /* Identifier */, 21 /* CloseParenToken */, 23 /* CloseBracketToken */, 95 /* NewKeyword */];
+            var unaryPreincrementExpressions = [73 /* Identifier */, 20 /* OpenParenToken */, 101 /* ThisKeyword */, 96 /* NewKeyword */];
+            var unaryPostincrementExpressions = [73 /* Identifier */, 21 /* CloseParenToken */, 23 /* CloseBracketToken */, 96 /* NewKeyword */];
+            var unaryPredecrementExpressions = [73 /* Identifier */, 20 /* OpenParenToken */, 101 /* ThisKeyword */, 96 /* NewKeyword */];
+            var unaryPostdecrementExpressions = [73 /* Identifier */, 21 /* CloseParenToken */, 23 /* CloseBracketToken */, 96 /* NewKeyword */];
             var comments = [2 /* SingleLineCommentTrivia */, 3 /* MultiLineCommentTrivia */];
-            var typeNames = [72 /* Identifier */].concat(ts.typeKeywords);
+            var typeNames = [73 /* Identifier */].concat(ts.typeKeywords);
             // Place a space before open brace in a function declaration
             // TypeScript: Function can have return types, which can be made of tons of different token kinds
             var functionOpenBraceLeftTokenRange = anyTokenIncludingMultilineComments;
             // Place a space before open brace in a TypeScript declaration that has braces as children (class, module, enum, etc)
-            var typeScriptOpenBraceLeftTokenRange = tokenRangeFrom([72 /* Identifier */, 3 /* MultiLineCommentTrivia */, 76 /* ClassKeyword */, 85 /* ExportKeyword */, 92 /* ImportKeyword */]);
+            var typeScriptOpenBraceLeftTokenRange = tokenRangeFrom([73 /* Identifier */, 3 /* MultiLineCommentTrivia */, 77 /* ClassKeyword */, 86 /* ExportKeyword */, 93 /* ImportKeyword */]);
             // Place a space before open brace in a control flow construct
-            var controlOpenBraceLeftTokenRange = tokenRangeFrom([21 /* CloseParenToken */, 3 /* MultiLineCommentTrivia */, 82 /* DoKeyword */, 103 /* TryKeyword */, 88 /* FinallyKeyword */, 83 /* ElseKeyword */]);
+            var controlOpenBraceLeftTokenRange = tokenRangeFrom([21 /* CloseParenToken */, 3 /* MultiLineCommentTrivia */, 83 /* DoKeyword */, 104 /* TryKeyword */, 89 /* FinallyKeyword */, 84 /* ElseKeyword */]);
             // These rules are higher in priority than user-configurable
             var highPriorityCommonRules = [
                 // Leave comments alone
@@ -108261,7 +111860,7 @@ var ts;
                 rule("NoSpaceAfterQuestionMark", 56 /* QuestionToken */, anyToken, [isNonJsxSameLineTokenContext], 8 /* Delete */),
                 rule("NoSpaceBeforeDot", anyToken, 24 /* DotToken */, [isNonJsxSameLineTokenContext], 8 /* Delete */),
                 rule("NoSpaceAfterDot", 24 /* DotToken */, anyToken, [isNonJsxSameLineTokenContext], 8 /* Delete */),
-                rule("NoSpaceBetweenImportParenInImportType", 92 /* ImportKeyword */, 20 /* OpenParenToken */, [isNonJsxSameLineTokenContext, isImportTypeContext], 8 /* Delete */),
+                rule("NoSpaceBetweenImportParenInImportType", 93 /* ImportKeyword */, 20 /* OpenParenToken */, [isNonJsxSameLineTokenContext, isImportTypeContext], 8 /* Delete */),
                 // Special handling of unary operators.
                 // Prefix operators generally shouldn't have a space between
                 // them and their target unary expression.
@@ -108288,79 +111887,79 @@ var ts;
                 rule("SpaceAfterCloseBrace", 19 /* CloseBraceToken */, anyTokenExcept(21 /* CloseParenToken */), [isNonJsxSameLineTokenContext, isAfterCodeBlockContext], 2 /* Space */),
                 // Special case for (}, else) and (}, while) since else & while tokens are not part of the tree which makes SpaceAfterCloseBrace rule not applied
                 // Also should not apply to })
-                rule("SpaceBetweenCloseBraceAndElse", 19 /* CloseBraceToken */, 83 /* ElseKeyword */, [isNonJsxSameLineTokenContext], 2 /* Space */),
-                rule("SpaceBetweenCloseBraceAndWhile", 19 /* CloseBraceToken */, 107 /* WhileKeyword */, [isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("SpaceBetweenCloseBraceAndElse", 19 /* CloseBraceToken */, 84 /* ElseKeyword */, [isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("SpaceBetweenCloseBraceAndWhile", 19 /* CloseBraceToken */, 108 /* WhileKeyword */, [isNonJsxSameLineTokenContext], 2 /* Space */),
                 rule("NoSpaceBetweenEmptyBraceBrackets", 18 /* OpenBraceToken */, 19 /* CloseBraceToken */, [isNonJsxSameLineTokenContext, isObjectContext], 8 /* Delete */),
                 // Add a space after control dec context if the next character is an open bracket ex: 'if (false)[a, b] = [1, 2];' -> 'if (false) [a, b] = [1, 2];'
                 rule("SpaceAfterConditionalClosingParen", 21 /* CloseParenToken */, 22 /* OpenBracketToken */, [isControlDeclContext], 2 /* Space */),
-                rule("NoSpaceBetweenFunctionKeywordAndStar", 90 /* FunctionKeyword */, 40 /* AsteriskToken */, [isFunctionDeclarationOrFunctionExpressionContext], 8 /* Delete */),
-                rule("SpaceAfterStarInGeneratorDeclaration", 40 /* AsteriskToken */, [72 /* Identifier */, 20 /* OpenParenToken */], [isFunctionDeclarationOrFunctionExpressionContext], 2 /* Space */),
-                rule("SpaceAfterFunctionInFuncDecl", 90 /* FunctionKeyword */, anyToken, [isFunctionDeclContext], 2 /* Space */),
+                rule("NoSpaceBetweenFunctionKeywordAndStar", 91 /* FunctionKeyword */, 40 /* AsteriskToken */, [isFunctionDeclarationOrFunctionExpressionContext], 8 /* Delete */),
+                rule("SpaceAfterStarInGeneratorDeclaration", 40 /* AsteriskToken */, 73 /* Identifier */, [isFunctionDeclarationOrFunctionExpressionContext], 2 /* Space */),
+                rule("SpaceAfterFunctionInFuncDecl", 91 /* FunctionKeyword */, anyToken, [isFunctionDeclContext], 2 /* Space */),
                 // Insert new line after { and before } in multi-line contexts.
                 rule("NewLineAfterOpenBraceInBlockContext", 18 /* OpenBraceToken */, anyToken, [isMultilineBlockContext], 4 /* NewLine */),
                 // For get/set members, we check for (identifier,identifier) since get/set don't have tokens and they are represented as just an identifier token.
                 // Though, we do extra check on the context to make sure we are dealing with get/set node. Example:
                 //      get x() {}
                 //      set x(val) {}
-                rule("SpaceAfterGetSetInMember", [126 /* GetKeyword */, 137 /* SetKeyword */], 72 /* Identifier */, [isFunctionDeclContext], 2 /* Space */),
-                rule("NoSpaceBetweenYieldKeywordAndStar", 117 /* YieldKeyword */, 40 /* AsteriskToken */, [isNonJsxSameLineTokenContext, isYieldOrYieldStarWithOperand], 8 /* Delete */),
-                rule("SpaceBetweenYieldOrYieldStarAndOperand", [117 /* YieldKeyword */, 40 /* AsteriskToken */], anyToken, [isNonJsxSameLineTokenContext, isYieldOrYieldStarWithOperand], 2 /* Space */),
-                rule("NoSpaceBetweenReturnAndSemicolon", 97 /* ReturnKeyword */, 26 /* SemicolonToken */, [isNonJsxSameLineTokenContext], 8 /* Delete */),
-                rule("SpaceAfterCertainKeywords", [105 /* VarKeyword */, 101 /* ThrowKeyword */, 95 /* NewKeyword */, 81 /* DeleteKeyword */, 97 /* ReturnKeyword */, 104 /* TypeOfKeyword */, 122 /* AwaitKeyword */], anyToken, [isNonJsxSameLineTokenContext], 2 /* Space */),
-                rule("SpaceAfterLetConstInVariableDeclaration", [111 /* LetKeyword */, 77 /* ConstKeyword */], anyToken, [isNonJsxSameLineTokenContext, isStartOfVariableDeclarationList], 2 /* Space */),
+                rule("SpaceAfterGetSetInMember", [127 /* GetKeyword */, 138 /* SetKeyword */], 73 /* Identifier */, [isFunctionDeclContext], 2 /* Space */),
+                rule("NoSpaceBetweenYieldKeywordAndStar", 118 /* YieldKeyword */, 40 /* AsteriskToken */, [isNonJsxSameLineTokenContext, isYieldOrYieldStarWithOperand], 8 /* Delete */),
+                rule("SpaceBetweenYieldOrYieldStarAndOperand", [118 /* YieldKeyword */, 40 /* AsteriskToken */], anyToken, [isNonJsxSameLineTokenContext, isYieldOrYieldStarWithOperand], 2 /* Space */),
+                rule("NoSpaceBetweenReturnAndSemicolon", 98 /* ReturnKeyword */, 26 /* SemicolonToken */, [isNonJsxSameLineTokenContext], 8 /* Delete */),
+                rule("SpaceAfterCertainKeywords", [106 /* VarKeyword */, 102 /* ThrowKeyword */, 96 /* NewKeyword */, 82 /* DeleteKeyword */, 98 /* ReturnKeyword */, 105 /* TypeOfKeyword */, 123 /* AwaitKeyword */], anyToken, [isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("SpaceAfterLetConstInVariableDeclaration", [112 /* LetKeyword */, 78 /* ConstKeyword */], anyToken, [isNonJsxSameLineTokenContext, isStartOfVariableDeclarationList], 2 /* Space */),
                 rule("NoSpaceBeforeOpenParenInFuncCall", anyToken, 20 /* OpenParenToken */, [isNonJsxSameLineTokenContext, isFunctionCallOrNewContext, isPreviousTokenNotComma], 8 /* Delete */),
                 // Special case for binary operators (that are keywords). For these we have to add a space and shouldn't follow any user options.
                 rule("SpaceBeforeBinaryKeywordOperator", anyToken, binaryKeywordOperators, [isNonJsxSameLineTokenContext, isBinaryOpContext], 2 /* Space */),
                 rule("SpaceAfterBinaryKeywordOperator", binaryKeywordOperators, anyToken, [isNonJsxSameLineTokenContext, isBinaryOpContext], 2 /* Space */),
-                rule("SpaceAfterVoidOperator", 106 /* VoidKeyword */, anyToken, [isNonJsxSameLineTokenContext, isVoidOpContext], 2 /* Space */),
+                rule("SpaceAfterVoidOperator", 107 /* VoidKeyword */, anyToken, [isNonJsxSameLineTokenContext, isVoidOpContext], 2 /* Space */),
                 // Async-await
-                rule("SpaceBetweenAsyncAndOpenParen", 121 /* AsyncKeyword */, 20 /* OpenParenToken */, [isArrowFunctionContext, isNonJsxSameLineTokenContext], 2 /* Space */),
-                rule("SpaceBetweenAsyncAndFunctionKeyword", 121 /* AsyncKeyword */, 90 /* FunctionKeyword */, [isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("SpaceBetweenAsyncAndOpenParen", 122 /* AsyncKeyword */, 20 /* OpenParenToken */, [isArrowFunctionContext, isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("SpaceBetweenAsyncAndFunctionKeyword", 122 /* AsyncKeyword */, 91 /* FunctionKeyword */, [isNonJsxSameLineTokenContext], 2 /* Space */),
                 // Template string
-                rule("NoSpaceBetweenTagAndTemplateString", [72 /* Identifier */, 21 /* CloseParenToken */], [14 /* NoSubstitutionTemplateLiteral */, 15 /* TemplateHead */], [isNonJsxSameLineTokenContext], 8 /* Delete */),
+                rule("NoSpaceBetweenTagAndTemplateString", [73 /* Identifier */, 21 /* CloseParenToken */], [14 /* NoSubstitutionTemplateLiteral */, 15 /* TemplateHead */], [isNonJsxSameLineTokenContext], 8 /* Delete */),
                 // JSX opening elements
-                rule("SpaceBeforeJsxAttribute", anyToken, 72 /* Identifier */, [isNextTokenParentJsxAttribute, isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("SpaceBeforeJsxAttribute", anyToken, 73 /* Identifier */, [isNextTokenParentJsxAttribute, isNonJsxSameLineTokenContext], 2 /* Space */),
                 rule("SpaceBeforeSlashInJsxOpeningElement", anyToken, 42 /* SlashToken */, [isJsxSelfClosingElementContext, isNonJsxSameLineTokenContext], 2 /* Space */),
                 rule("NoSpaceBeforeGreaterThanTokenInJsxOpeningElement", 42 /* SlashToken */, 30 /* GreaterThanToken */, [isJsxSelfClosingElementContext, isNonJsxSameLineTokenContext], 8 /* Delete */),
-                rule("NoSpaceBeforeEqualInJsxAttribute", anyToken, 59 /* EqualsToken */, [isJsxAttributeContext, isNonJsxSameLineTokenContext], 8 /* Delete */),
-                rule("NoSpaceAfterEqualInJsxAttribute", 59 /* EqualsToken */, anyToken, [isJsxAttributeContext, isNonJsxSameLineTokenContext], 8 /* Delete */),
+                rule("NoSpaceBeforeEqualInJsxAttribute", anyToken, 60 /* EqualsToken */, [isJsxAttributeContext, isNonJsxSameLineTokenContext], 8 /* Delete */),
+                rule("NoSpaceAfterEqualInJsxAttribute", 60 /* EqualsToken */, anyToken, [isJsxAttributeContext, isNonJsxSameLineTokenContext], 8 /* Delete */),
                 // TypeScript-specific rules
                 // Use of module as a function call. e.g.: import m2 = module("m2");
-                rule("NoSpaceAfterModuleImport", [130 /* ModuleKeyword */, 134 /* RequireKeyword */], 20 /* OpenParenToken */, [isNonJsxSameLineTokenContext], 8 /* Delete */),
+                rule("NoSpaceAfterModuleImport", [131 /* ModuleKeyword */, 135 /* RequireKeyword */], 20 /* OpenParenToken */, [isNonJsxSameLineTokenContext], 8 /* Delete */),
                 // Add a space around certain TypeScript keywords
                 rule("SpaceAfterCertainTypeScriptKeywords", [
-                    118 /* AbstractKeyword */,
-                    76 /* ClassKeyword */,
-                    125 /* DeclareKeyword */,
-                    80 /* DefaultKeyword */,
-                    84 /* EnumKeyword */,
-                    85 /* ExportKeyword */,
-                    86 /* ExtendsKeyword */,
-                    126 /* GetKeyword */,
-                    109 /* ImplementsKeyword */,
-                    92 /* ImportKeyword */,
-                    110 /* InterfaceKeyword */,
-                    130 /* ModuleKeyword */,
-                    131 /* NamespaceKeyword */,
-                    113 /* PrivateKeyword */,
-                    115 /* PublicKeyword */,
-                    114 /* ProtectedKeyword */,
-                    133 /* ReadonlyKeyword */,
-                    137 /* SetKeyword */,
-                    116 /* StaticKeyword */,
-                    140 /* TypeKeyword */,
-                    144 /* FromKeyword */,
-                    129 /* KeyOfKeyword */,
-                    127 /* InferKeyword */,
+                    119 /* AbstractKeyword */,
+                    77 /* ClassKeyword */,
+                    126 /* DeclareKeyword */,
+                    81 /* DefaultKeyword */,
+                    85 /* EnumKeyword */,
+                    86 /* ExportKeyword */,
+                    87 /* ExtendsKeyword */,
+                    127 /* GetKeyword */,
+                    110 /* ImplementsKeyword */,
+                    93 /* ImportKeyword */,
+                    111 /* InterfaceKeyword */,
+                    131 /* ModuleKeyword */,
+                    132 /* NamespaceKeyword */,
+                    114 /* PrivateKeyword */,
+                    116 /* PublicKeyword */,
+                    115 /* ProtectedKeyword */,
+                    134 /* ReadonlyKeyword */,
+                    138 /* SetKeyword */,
+                    117 /* StaticKeyword */,
+                    141 /* TypeKeyword */,
+                    145 /* FromKeyword */,
+                    130 /* KeyOfKeyword */,
+                    128 /* InferKeyword */,
                 ], anyToken, [isNonJsxSameLineTokenContext], 2 /* Space */),
-                rule("SpaceBeforeCertainTypeScriptKeywords", anyToken, [86 /* ExtendsKeyword */, 109 /* ImplementsKeyword */, 144 /* FromKeyword */], [isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("SpaceBeforeCertainTypeScriptKeywords", anyToken, [87 /* ExtendsKeyword */, 110 /* ImplementsKeyword */, 145 /* FromKeyword */], [isNonJsxSameLineTokenContext], 2 /* Space */),
                 // Treat string literals in module names as identifiers, and add a space between the literal and the opening Brace braces, e.g.: module "m2" {
                 rule("SpaceAfterModuleName", 10 /* StringLiteral */, 18 /* OpenBraceToken */, [isModuleDeclContext], 2 /* Space */),
                 // Lambda expressions
                 rule("SpaceBeforeArrow", anyToken, 37 /* EqualsGreaterThanToken */, [isNonJsxSameLineTokenContext], 2 /* Space */),
                 rule("SpaceAfterArrow", 37 /* EqualsGreaterThanToken */, anyToken, [isNonJsxSameLineTokenContext], 2 /* Space */),
                 // Optional parameters and let args
-                rule("NoSpaceAfterEllipsis", 25 /* DotDotDotToken */, 72 /* Identifier */, [isNonJsxSameLineTokenContext], 8 /* Delete */),
+                rule("NoSpaceAfterEllipsis", 25 /* DotDotDotToken */, 73 /* Identifier */, [isNonJsxSameLineTokenContext], 8 /* Delete */),
                 rule("NoSpaceAfterOptionalParameters", 56 /* QuestionToken */, [21 /* CloseParenToken */, 27 /* CommaToken */], [isNonJsxSameLineTokenContext, isNotBinaryOpContext], 8 /* Delete */),
                 // Remove spaces in empty interface literals. e.g.: x: {}
                 rule("NoSpaceBetweenEmptyInterfaceBraceBrackets", 18 /* OpenBraceToken */, 19 /* CloseBraceToken */, [isNonJsxSameLineTokenContext, isObjectTypeContext], 8 /* Delete */),
@@ -108371,37 +111970,38 @@ var ts;
                 rule("NoSpaceBeforeCloseAngularBracket", anyToken, 30 /* GreaterThanToken */, [isNonJsxSameLineTokenContext, isTypeArgumentOrParameterOrAssertionContext], 8 /* Delete */),
                 rule("NoSpaceAfterCloseAngularBracket", 30 /* GreaterThanToken */, [20 /* OpenParenToken */, 22 /* OpenBracketToken */, 30 /* GreaterThanToken */, 27 /* CommaToken */], [isNonJsxSameLineTokenContext, isTypeArgumentOrParameterOrAssertionContext, isNotFunctionDeclContext /*To prevent an interference with the SpaceBeforeOpenParenInFuncDecl rule*/], 8 /* Delete */),
                 // decorators
-                rule("SpaceBeforeAt", [21 /* CloseParenToken */, 72 /* Identifier */], 58 /* AtToken */, [isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("SpaceBeforeAt", [21 /* CloseParenToken */, 73 /* Identifier */], 58 /* AtToken */, [isNonJsxSameLineTokenContext], 2 /* Space */),
                 rule("NoSpaceAfterAt", 58 /* AtToken */, anyToken, [isNonJsxSameLineTokenContext], 8 /* Delete */),
                 // Insert space after @ in decorator
                 rule("SpaceAfterDecorator", anyToken, [
-                    118 /* AbstractKeyword */,
-                    72 /* Identifier */,
-                    85 /* ExportKeyword */,
-                    80 /* DefaultKeyword */,
-                    76 /* ClassKeyword */,
-                    116 /* StaticKeyword */,
-                    115 /* PublicKeyword */,
-                    113 /* PrivateKeyword */,
-                    114 /* ProtectedKeyword */,
-                    126 /* GetKeyword */,
-                    137 /* SetKeyword */,
+                    119 /* AbstractKeyword */,
+                    73 /* Identifier */,
+                    86 /* ExportKeyword */,
+                    81 /* DefaultKeyword */,
+                    77 /* ClassKeyword */,
+                    117 /* StaticKeyword */,
+                    116 /* PublicKeyword */,
+                    114 /* PrivateKeyword */,
+                    115 /* ProtectedKeyword */,
+                    127 /* GetKeyword */,
+                    138 /* SetKeyword */,
                     22 /* OpenBracketToken */,
                     40 /* AsteriskToken */,
                 ], [isEndOfDecoratorContextOnSameLine], 2 /* Space */),
                 rule("NoSpaceBeforeNonNullAssertionOperator", anyToken, 52 /* ExclamationToken */, [isNonJsxSameLineTokenContext, isNonNullAssertionContext], 8 /* Delete */),
-                rule("NoSpaceAfterNewKeywordOnConstructorSignature", 95 /* NewKeyword */, 20 /* OpenParenToken */, [isNonJsxSameLineTokenContext, isConstructorSignatureContext], 8 /* Delete */),
+                rule("NoSpaceAfterNewKeywordOnConstructorSignature", 96 /* NewKeyword */, 20 /* OpenParenToken */, [isNonJsxSameLineTokenContext, isConstructorSignatureContext], 8 /* Delete */),
+                rule("SpaceLessThanAndNonJSXTypeAnnotation", 28 /* LessThanToken */, 28 /* LessThanToken */, [isNonJsxSameLineTokenContext], 2 /* Space */),
             ];
             // These rules are applied after high priority
             var userConfigurableRules = [
                 // Treat constructor as an identifier in a function declaration, and remove spaces between constructor and following left parentheses
-                rule("SpaceAfterConstructor", 124 /* ConstructorKeyword */, 20 /* OpenParenToken */, [isOptionEnabled("insertSpaceAfterConstructor"), isNonJsxSameLineTokenContext], 2 /* Space */),
-                rule("NoSpaceAfterConstructor", 124 /* ConstructorKeyword */, 20 /* OpenParenToken */, [isOptionDisabledOrUndefined("insertSpaceAfterConstructor"), isNonJsxSameLineTokenContext], 8 /* Delete */),
+                rule("SpaceAfterConstructor", 125 /* ConstructorKeyword */, 20 /* OpenParenToken */, [isOptionEnabled("insertSpaceAfterConstructor"), isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("NoSpaceAfterConstructor", 125 /* ConstructorKeyword */, 20 /* OpenParenToken */, [isOptionDisabledOrUndefined("insertSpaceAfterConstructor"), isNonJsxSameLineTokenContext], 8 /* Delete */),
                 rule("SpaceAfterComma", 27 /* CommaToken */, anyToken, [isOptionEnabled("insertSpaceAfterCommaDelimiter"), isNonJsxSameLineTokenContext, isNonJsxElementOrFragmentContext, isNextTokenNotCloseBracket], 2 /* Space */),
                 rule("NoSpaceAfterComma", 27 /* CommaToken */, anyToken, [isOptionDisabledOrUndefined("insertSpaceAfterCommaDelimiter"), isNonJsxSameLineTokenContext, isNonJsxElementOrFragmentContext], 8 /* Delete */),
                 // Insert space after function keyword for anonymous functions
-                rule("SpaceAfterAnonymousFunctionKeyword", 90 /* FunctionKeyword */, 20 /* OpenParenToken */, [isOptionEnabled("insertSpaceAfterFunctionKeywordForAnonymousFunctions"), isFunctionDeclContext], 2 /* Space */),
-                rule("NoSpaceAfterAnonymousFunctionKeyword", 90 /* FunctionKeyword */, 20 /* OpenParenToken */, [isOptionDisabledOrUndefined("insertSpaceAfterFunctionKeywordForAnonymousFunctions"), isFunctionDeclContext], 8 /* Delete */),
+                rule("SpaceAfterAnonymousFunctionKeyword", [91 /* FunctionKeyword */, 40 /* AsteriskToken */], 20 /* OpenParenToken */, [isOptionEnabled("insertSpaceAfterFunctionKeywordForAnonymousFunctions"), isFunctionDeclContext], 2 /* Space */),
+                rule("NoSpaceAfterAnonymousFunctionKeyword", [91 /* FunctionKeyword */, 40 /* AsteriskToken */], 20 /* OpenParenToken */, [isOptionDisabledOrUndefined("insertSpaceAfterFunctionKeywordForAnonymousFunctions"), isFunctionDeclContext], 8 /* Delete */),
                 // Insert space after keywords in control flow statements
                 rule("SpaceAfterKeywordInControl", keywords, 20 /* OpenParenToken */, [isOptionEnabled("insertSpaceAfterKeywordsInControlFlowStatements"), isControlDeclContext], 2 /* Space */),
                 rule("NoSpaceAfterKeywordInControl", keywords, 20 /* OpenParenToken */, [isOptionDisabledOrUndefined("insertSpaceAfterKeywordsInControlFlowStatements"), isControlDeclContext], 8 /* Delete */),
@@ -108465,20 +112065,32 @@ var ts;
                 rule("SpaceBeforeOpenBraceInTypeScriptDeclWithBlock", typeScriptOpenBraceLeftTokenRange, 18 /* OpenBraceToken */, [isOptionDisabledOrUndefinedOrTokensOnSameLine("placeOpenBraceOnNewLineForFunctions"), isTypeScriptDeclWithBlockContext, isNotFormatOnEnter, isSameLineTokenOrBeforeBlockContext], 2 /* Space */, 1 /* CanDeleteNewLines */),
                 rule("NoSpaceBeforeComma", anyToken, 27 /* CommaToken */, [isNonJsxSameLineTokenContext], 8 /* Delete */),
                 // No space before and after indexer `x[]`
-                rule("NoSpaceBeforeOpenBracket", anyTokenExcept(121 /* AsyncKeyword */, 74 /* CaseKeyword */), 22 /* OpenBracketToken */, [isNonJsxSameLineTokenContext], 8 /* Delete */),
+                rule("NoSpaceBeforeOpenBracket", anyTokenExcept(122 /* AsyncKeyword */, 75 /* CaseKeyword */), 22 /* OpenBracketToken */, [isNonJsxSameLineTokenContext], 8 /* Delete */),
                 rule("NoSpaceAfterCloseBracket", 23 /* CloseBracketToken */, anyToken, [isNonJsxSameLineTokenContext, isNotBeforeBlockInFunctionDeclarationContext], 8 /* Delete */),
                 rule("SpaceAfterSemicolon", 26 /* SemicolonToken */, anyToken, [isNonJsxSameLineTokenContext], 2 /* Space */),
                 // Remove extra space between for and await
-                rule("SpaceBetweenForAndAwaitKeyword", 89 /* ForKeyword */, 122 /* AwaitKeyword */, [isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("SpaceBetweenForAndAwaitKeyword", 90 /* ForKeyword */, 123 /* AwaitKeyword */, [isNonJsxSameLineTokenContext], 2 /* Space */),
                 // Add a space between statements. All keywords except (do,else,case) has open/close parens after them.
                 // So, we have a rule to add a space for [),Any], [do,Any], [else,Any], and [case,Any]
-                rule("SpaceBetweenStatements", [21 /* CloseParenToken */, 82 /* DoKeyword */, 83 /* ElseKeyword */, 74 /* CaseKeyword */], anyToken, [isNonJsxSameLineTokenContext, isNonJsxElementOrFragmentContext, isNotForContext], 2 /* Space */),
+                rule("SpaceBetweenStatements", [21 /* CloseParenToken */, 83 /* DoKeyword */, 84 /* ElseKeyword */, 75 /* CaseKeyword */], anyToken, [isNonJsxSameLineTokenContext, isNonJsxElementOrFragmentContext, isNotForContext], 2 /* Space */),
                 // This low-pri rule takes care of "try {" and "finally {" in case the rule SpaceBeforeOpenBraceInControl didn't execute on FormatOnEnter.
-                rule("SpaceAfterTryFinally", [103 /* TryKeyword */, 88 /* FinallyKeyword */], 18 /* OpenBraceToken */, [isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("SpaceAfterTryFinally", [104 /* TryKeyword */, 89 /* FinallyKeyword */], 18 /* OpenBraceToken */, [isNonJsxSameLineTokenContext], 2 /* Space */),
             ];
             return highPriorityCommonRules.concat(userConfigurableRules, lowPriorityCommonRules);
         }
         formatting.getAllRules = getAllRules;
+        /**
+         * A rule takes a two tokens (left/right) and a particular context
+         * for which you're meant to look at them. You then declare what should the
+         * whitespace annotation be between these tokens via the action param.
+         *
+         * @param debugName Name to print
+         * @param left The left side of the comparison
+         * @param right The right side of the comparison
+         * @param context A set of filters to narrow down the space in which this formatter rule applies
+         * @param action a declaration of the expected whitespace
+         * @param flags whether the rule deletes a line or not, defaults to no-op
+         */
         function rule(debugName, left, right, context, action, flags) {
             if (flags === void 0) { flags = 0 /* None */; }
             return { leftTokenRange: toTokenRange(left), rightTokenRange: toTokenRange(right), rule: { debugName: debugName, context: context, action: action, flags: flags } };
@@ -108518,45 +112130,45 @@ var ts;
             return function (context) { return !context.options || !context.options.hasOwnProperty(optionName) || !!context.options[optionName]; };
         }
         function isForContext(context) {
-            return context.contextNode.kind === 225 /* ForStatement */;
+            return context.contextNode.kind === 226 /* ForStatement */;
         }
         function isNotForContext(context) {
             return !isForContext(context);
         }
         function isBinaryOpContext(context) {
             switch (context.contextNode.kind) {
-                case 204 /* BinaryExpression */:
-                case 205 /* ConditionalExpression */:
-                case 175 /* ConditionalType */:
-                case 212 /* AsExpression */:
-                case 257 /* ExportSpecifier */:
-                case 253 /* ImportSpecifier */:
-                case 163 /* TypePredicate */:
-                case 173 /* UnionType */:
-                case 174 /* IntersectionType */:
+                case 205 /* BinaryExpression */:
+                case 206 /* ConditionalExpression */:
+                case 176 /* ConditionalType */:
+                case 213 /* AsExpression */:
+                case 258 /* ExportSpecifier */:
+                case 254 /* ImportSpecifier */:
+                case 164 /* TypePredicate */:
+                case 174 /* UnionType */:
+                case 175 /* IntersectionType */:
                     return true;
                 // equals in binding elements: function foo([[x, y] = [1, 2]])
-                case 186 /* BindingElement */:
+                case 187 /* BindingElement */:
                 // equals in type X = ...
-                case 242 /* TypeAliasDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
                 // equal in import a = module('a');
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                 // equal in let a = 0;
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                 // equal in p = 0;
-                case 151 /* Parameter */:
-                case 278 /* EnumMember */:
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
-                    return context.currentTokenSpan.kind === 59 /* EqualsToken */ || context.nextTokenSpan.kind === 59 /* EqualsToken */;
+                case 152 /* Parameter */:
+                case 279 /* EnumMember */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
+                    return context.currentTokenSpan.kind === 60 /* EqualsToken */ || context.nextTokenSpan.kind === 60 /* EqualsToken */;
                 // "in" keyword in for (let x in []) { }
-                case 226 /* ForInStatement */:
+                case 227 /* ForInStatement */:
                 // "in" keyword in [P in keyof T]: T[P]
-                case 150 /* TypeParameter */:
-                    return context.currentTokenSpan.kind === 93 /* InKeyword */ || context.nextTokenSpan.kind === 93 /* InKeyword */ || context.currentTokenSpan.kind === 59 /* EqualsToken */ || context.nextTokenSpan.kind === 59 /* EqualsToken */;
+                case 151 /* TypeParameter */:
+                    return context.currentTokenSpan.kind === 94 /* InKeyword */ || context.nextTokenSpan.kind === 94 /* InKeyword */ || context.currentTokenSpan.kind === 60 /* EqualsToken */ || context.nextTokenSpan.kind === 60 /* EqualsToken */;
                 // Technically, "of" is not a binary operator, but format it the same way as "in"
-                case 227 /* ForOfStatement */:
-                    return context.currentTokenSpan.kind === 147 /* OfKeyword */ || context.nextTokenSpan.kind === 147 /* OfKeyword */;
+                case 228 /* ForOfStatement */:
+                    return context.currentTokenSpan.kind === 148 /* OfKeyword */ || context.nextTokenSpan.kind === 148 /* OfKeyword */;
             }
             return false;
         }
@@ -108568,22 +112180,22 @@ var ts;
         }
         function isTypeAnnotationContext(context) {
             var contextKind = context.contextNode.kind;
-            return contextKind === 154 /* PropertyDeclaration */ ||
-                contextKind === 153 /* PropertySignature */ ||
-                contextKind === 151 /* Parameter */ ||
-                contextKind === 237 /* VariableDeclaration */ ||
+            return contextKind === 155 /* PropertyDeclaration */ ||
+                contextKind === 154 /* PropertySignature */ ||
+                contextKind === 152 /* Parameter */ ||
+                contextKind === 238 /* VariableDeclaration */ ||
                 ts.isFunctionLikeKind(contextKind);
         }
         function isConditionalOperatorContext(context) {
-            return context.contextNode.kind === 205 /* ConditionalExpression */ ||
-                context.contextNode.kind === 175 /* ConditionalType */;
+            return context.contextNode.kind === 206 /* ConditionalExpression */ ||
+                context.contextNode.kind === 176 /* ConditionalType */;
         }
         function isSameLineTokenOrBeforeBlockContext(context) {
             return context.TokensAreOnSameLine() || isBeforeBlockContext(context);
         }
         function isBraceWrappedContext(context) {
-            return context.contextNode.kind === 184 /* ObjectBindingPattern */ ||
-                context.contextNode.kind === 181 /* MappedType */ ||
+            return context.contextNode.kind === 185 /* ObjectBindingPattern */ ||
+                context.contextNode.kind === 182 /* MappedType */ ||
                 isSingleLineBlockContext(context);
         }
         // This check is done before an open brace in a control construct, a function, or a typescript block declaration
@@ -108609,31 +112221,31 @@ var ts;
                 return true;
             }
             switch (node.kind) {
-                case 218 /* Block */:
-                case 246 /* CaseBlock */:
-                case 188 /* ObjectLiteralExpression */:
-                case 245 /* ModuleBlock */:
+                case 219 /* Block */:
+                case 247 /* CaseBlock */:
+                case 189 /* ObjectLiteralExpression */:
+                case 246 /* ModuleBlock */:
                     return true;
             }
             return false;
         }
         function isFunctionDeclContext(context) {
             switch (context.contextNode.kind) {
-                case 239 /* FunctionDeclaration */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
+                case 240 /* FunctionDeclaration */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
                 // case SyntaxKind.MemberFunctionDeclaration:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                 // case SyntaxKind.MethodSignature:
-                case 160 /* CallSignature */:
-                case 196 /* FunctionExpression */:
-                case 157 /* Constructor */:
-                case 197 /* ArrowFunction */:
+                case 161 /* CallSignature */:
+                case 197 /* FunctionExpression */:
+                case 158 /* Constructor */:
+                case 198 /* ArrowFunction */:
                 // case SyntaxKind.ConstructorDeclaration:
                 // case SyntaxKind.SimpleArrowFunctionExpression:
                 // case SyntaxKind.ParenthesizedArrowFunctionExpression:
-                case 241 /* InterfaceDeclaration */: // This one is not truly a function, but for formatting purposes, it acts just like one
+                case 242 /* InterfaceDeclaration */: // This one is not truly a function, but for formatting purposes, it acts just like one
                     return true;
             }
             return false;
@@ -108642,40 +112254,40 @@ var ts;
             return !isFunctionDeclContext(context);
         }
         function isFunctionDeclarationOrFunctionExpressionContext(context) {
-            return context.contextNode.kind === 239 /* FunctionDeclaration */ || context.contextNode.kind === 196 /* FunctionExpression */;
+            return context.contextNode.kind === 240 /* FunctionDeclaration */ || context.contextNode.kind === 197 /* FunctionExpression */;
         }
         function isTypeScriptDeclWithBlockContext(context) {
             return nodeIsTypeScriptDeclWithBlockContext(context.contextNode);
         }
         function nodeIsTypeScriptDeclWithBlockContext(node) {
             switch (node.kind) {
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
-                case 241 /* InterfaceDeclaration */:
-                case 243 /* EnumDeclaration */:
-                case 168 /* TypeLiteral */:
-                case 244 /* ModuleDeclaration */:
-                case 255 /* ExportDeclaration */:
-                case 256 /* NamedExports */:
-                case 249 /* ImportDeclaration */:
-                case 252 /* NamedImports */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
+                case 242 /* InterfaceDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 169 /* TypeLiteral */:
+                case 245 /* ModuleDeclaration */:
+                case 256 /* ExportDeclaration */:
+                case 257 /* NamedExports */:
+                case 250 /* ImportDeclaration */:
+                case 253 /* NamedImports */:
                     return true;
             }
             return false;
         }
         function isAfterCodeBlockContext(context) {
             switch (context.currentTokenParent.kind) {
-                case 240 /* ClassDeclaration */:
-                case 244 /* ModuleDeclaration */:
-                case 243 /* EnumDeclaration */:
-                case 274 /* CatchClause */:
-                case 245 /* ModuleBlock */:
-                case 232 /* SwitchStatement */:
+                case 241 /* ClassDeclaration */:
+                case 245 /* ModuleDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 275 /* CatchClause */:
+                case 246 /* ModuleBlock */:
+                case 233 /* SwitchStatement */:
                     return true;
-                case 218 /* Block */: {
+                case 219 /* Block */: {
                     var blockParent = context.currentTokenParent.parent;
                     // In a codefix scenario, we can't rely on parents being set. So just always return true.
-                    if (!blockParent || blockParent.kind !== 197 /* ArrowFunction */ && blockParent.kind !== 196 /* FunctionExpression */) {
+                    if (!blockParent || blockParent.kind !== 198 /* ArrowFunction */ && blockParent.kind !== 197 /* FunctionExpression */) {
                         return true;
                     }
                 }
@@ -108684,31 +112296,31 @@ var ts;
         }
         function isControlDeclContext(context) {
             switch (context.contextNode.kind) {
-                case 222 /* IfStatement */:
-                case 232 /* SwitchStatement */:
-                case 225 /* ForStatement */:
-                case 226 /* ForInStatement */:
-                case 227 /* ForOfStatement */:
-                case 224 /* WhileStatement */:
-                case 235 /* TryStatement */:
-                case 223 /* DoStatement */:
-                case 231 /* WithStatement */:
+                case 223 /* IfStatement */:
+                case 233 /* SwitchStatement */:
+                case 226 /* ForStatement */:
+                case 227 /* ForInStatement */:
+                case 228 /* ForOfStatement */:
+                case 225 /* WhileStatement */:
+                case 236 /* TryStatement */:
+                case 224 /* DoStatement */:
+                case 232 /* WithStatement */:
                 // TODO
                 // case SyntaxKind.ElseClause:
-                case 274 /* CatchClause */:
+                case 275 /* CatchClause */:
                     return true;
                 default:
                     return false;
             }
         }
         function isObjectContext(context) {
-            return context.contextNode.kind === 188 /* ObjectLiteralExpression */;
+            return context.contextNode.kind === 189 /* ObjectLiteralExpression */;
         }
         function isFunctionCallContext(context) {
-            return context.contextNode.kind === 191 /* CallExpression */;
+            return context.contextNode.kind === 192 /* CallExpression */;
         }
         function isNewContext(context) {
-            return context.contextNode.kind === 192 /* NewExpression */;
+            return context.contextNode.kind === 193 /* NewExpression */;
         }
         function isFunctionCallOrNewContext(context) {
             return isFunctionCallContext(context) || isNewContext(context);
@@ -108720,28 +112332,28 @@ var ts;
             return context.nextTokenSpan.kind !== 23 /* CloseBracketToken */;
         }
         function isArrowFunctionContext(context) {
-            return context.contextNode.kind === 197 /* ArrowFunction */;
+            return context.contextNode.kind === 198 /* ArrowFunction */;
         }
         function isImportTypeContext(context) {
-            return context.contextNode.kind === 183 /* ImportType */;
+            return context.contextNode.kind === 184 /* ImportType */;
         }
         function isNonJsxSameLineTokenContext(context) {
             return context.TokensAreOnSameLine() && context.contextNode.kind !== 11 /* JsxText */;
         }
         function isNonJsxElementOrFragmentContext(context) {
-            return context.contextNode.kind !== 260 /* JsxElement */ && context.contextNode.kind !== 264 /* JsxFragment */;
+            return context.contextNode.kind !== 261 /* JsxElement */ && context.contextNode.kind !== 265 /* JsxFragment */;
         }
         function isJsxExpressionContext(context) {
-            return context.contextNode.kind === 270 /* JsxExpression */ || context.contextNode.kind === 269 /* JsxSpreadAttribute */;
+            return context.contextNode.kind === 271 /* JsxExpression */ || context.contextNode.kind === 270 /* JsxSpreadAttribute */;
         }
         function isNextTokenParentJsxAttribute(context) {
-            return context.nextTokenParent.kind === 267 /* JsxAttribute */;
+            return context.nextTokenParent.kind === 268 /* JsxAttribute */;
         }
         function isJsxAttributeContext(context) {
-            return context.contextNode.kind === 267 /* JsxAttribute */;
+            return context.contextNode.kind === 268 /* JsxAttribute */;
         }
         function isJsxSelfClosingElementContext(context) {
-            return context.contextNode.kind === 261 /* JsxSelfClosingElement */;
+            return context.contextNode.kind === 262 /* JsxSelfClosingElement */;
         }
         function isNotBeforeBlockInFunctionDeclarationContext(context) {
             return !isFunctionDeclContext(context) && !isBeforeBlockContext(context);
@@ -108756,45 +112368,45 @@ var ts;
             while (ts.isExpressionNode(node)) {
                 node = node.parent;
             }
-            return node.kind === 152 /* Decorator */;
+            return node.kind === 153 /* Decorator */;
         }
         function isStartOfVariableDeclarationList(context) {
-            return context.currentTokenParent.kind === 238 /* VariableDeclarationList */ &&
+            return context.currentTokenParent.kind === 239 /* VariableDeclarationList */ &&
                 context.currentTokenParent.getStart(context.sourceFile) === context.currentTokenSpan.pos;
         }
         function isNotFormatOnEnter(context) {
             return context.formattingRequestKind !== 2 /* FormatOnEnter */;
         }
         function isModuleDeclContext(context) {
-            return context.contextNode.kind === 244 /* ModuleDeclaration */;
+            return context.contextNode.kind === 245 /* ModuleDeclaration */;
         }
         function isObjectTypeContext(context) {
-            return context.contextNode.kind === 168 /* TypeLiteral */; // && context.contextNode.parent.kind !== SyntaxKind.InterfaceDeclaration;
+            return context.contextNode.kind === 169 /* TypeLiteral */; // && context.contextNode.parent.kind !== SyntaxKind.InterfaceDeclaration;
         }
         function isConstructorSignatureContext(context) {
-            return context.contextNode.kind === 161 /* ConstructSignature */;
+            return context.contextNode.kind === 162 /* ConstructSignature */;
         }
         function isTypeArgumentOrParameterOrAssertion(token, parent) {
             if (token.kind !== 28 /* LessThanToken */ && token.kind !== 30 /* GreaterThanToken */) {
                 return false;
             }
             switch (parent.kind) {
-                case 164 /* TypeReference */:
-                case 194 /* TypeAssertionExpression */:
-                case 242 /* TypeAliasDeclaration */:
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
-                case 241 /* InterfaceDeclaration */:
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
-                case 160 /* CallSignature */:
-                case 161 /* ConstructSignature */:
-                case 191 /* CallExpression */:
-                case 192 /* NewExpression */:
-                case 211 /* ExpressionWithTypeArguments */:
+                case 165 /* TypeReference */:
+                case 195 /* TypeAssertionExpression */:
+                case 243 /* TypeAliasDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
+                case 242 /* InterfaceDeclaration */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
+                case 161 /* CallSignature */:
+                case 162 /* ConstructSignature */:
+                case 192 /* CallExpression */:
+                case 193 /* NewExpression */:
+                case 212 /* ExpressionWithTypeArguments */:
                     return true;
                 default:
                     return false;
@@ -108805,16 +112417,16 @@ var ts;
                 isTypeArgumentOrParameterOrAssertion(context.nextTokenSpan, context.nextTokenParent);
         }
         function isTypeAssertionContext(context) {
-            return context.contextNode.kind === 194 /* TypeAssertionExpression */;
+            return context.contextNode.kind === 195 /* TypeAssertionExpression */;
         }
         function isVoidOpContext(context) {
-            return context.currentTokenSpan.kind === 106 /* VoidKeyword */ && context.currentTokenParent.kind === 200 /* VoidExpression */;
+            return context.currentTokenSpan.kind === 107 /* VoidKeyword */ && context.currentTokenParent.kind === 201 /* VoidExpression */;
         }
         function isYieldOrYieldStarWithOperand(context) {
-            return context.contextNode.kind === 207 /* YieldExpression */ && context.contextNode.expression !== undefined;
+            return context.contextNode.kind === 208 /* YieldExpression */ && context.contextNode.expression !== undefined;
         }
         function isNonNullAssertionContext(context) {
-            return context.contextNode.kind === 213 /* NonNullExpression */;
+            return context.contextNode.kind === 214 /* NonNullExpression */;
         }
     })(formatting = ts.formatting || (ts.formatting = {}));
 })(ts || (ts = {}));
@@ -108865,12 +112477,12 @@ var ts;
             return map;
         }
         function getRuleBucketIndex(row, column) {
-            ts.Debug.assert(row <= 147 /* LastKeyword */ && column <= 147 /* LastKeyword */, "Must compute formatting context from tokens");
+            ts.Debug.assert(row <= 148 /* LastKeyword */ && column <= 148 /* LastKeyword */, "Must compute formatting context from tokens");
             return (row * mapRowLength) + column;
         }
         var maskBitSize = 5;
         var mask = 31; // MaskBitSize bits
-        var mapRowLength = 147 /* LastToken */ + 1;
+        var mapRowLength = 148 /* LastToken */ + 1;
         var RulesPosition;
         (function (RulesPosition) {
             RulesPosition[RulesPosition["IgnoreRulesSpecific"] = 0] = "IgnoreRulesSpecific";
@@ -109048,17 +112660,17 @@ var ts;
         // i.e. parent is class declaration with the list of members and node is one of members.
         function isListElement(parent, node) {
             switch (parent.kind) {
-                case 240 /* ClassDeclaration */:
-                case 241 /* InterfaceDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 242 /* InterfaceDeclaration */:
                     return ts.rangeContainsRange(parent.members, node);
-                case 244 /* ModuleDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     var body = parent.body;
-                    return !!body && body.kind === 245 /* ModuleBlock */ && ts.rangeContainsRange(body.statements, node);
-                case 284 /* SourceFile */:
-                case 218 /* Block */:
-                case 245 /* ModuleBlock */:
+                    return !!body && body.kind === 246 /* ModuleBlock */ && ts.rangeContainsRange(body.statements, node);
+                case 285 /* SourceFile */:
+                case 219 /* Block */:
+                case 246 /* ModuleBlock */:
                     return ts.rangeContainsRange(parent.statements, node);
-                case 274 /* CatchClause */:
+                case 275 /* CatchClause */:
                     return ts.rangeContainsRange(parent.block.statements, node);
             }
             return false;
@@ -109267,6 +112879,9 @@ var ts;
                     else if (formatting.SmartIndenter.childStartsOnTheSameLineWithElseInIfStatement(parent, node, startLine, sourceFile)) {
                         return { indentation: parentDynamicIndentation.getIndentation(), delta: delta };
                     }
+                    else if (formatting.SmartIndenter.argumentStartsOnSameLineAsPreviousArgument(parent, node, startLine, sourceFile)) {
+                        return { indentation: parentDynamicIndentation.getIndentation(), delta: delta };
+                    }
                     else {
                         return { indentation: parentDynamicIndentation.getIndentation() + parentDynamicIndentation.getDelta(node), delta: delta };
                     }
@@ -109280,19 +112895,19 @@ var ts;
                     return node.modifiers[0].kind;
                 }
                 switch (node.kind) {
-                    case 240 /* ClassDeclaration */: return 76 /* ClassKeyword */;
-                    case 241 /* InterfaceDeclaration */: return 110 /* InterfaceKeyword */;
-                    case 239 /* FunctionDeclaration */: return 90 /* FunctionKeyword */;
-                    case 243 /* EnumDeclaration */: return 243 /* EnumDeclaration */;
-                    case 158 /* GetAccessor */: return 126 /* GetKeyword */;
-                    case 159 /* SetAccessor */: return 137 /* SetKeyword */;
-                    case 156 /* MethodDeclaration */:
+                    case 241 /* ClassDeclaration */: return 77 /* ClassKeyword */;
+                    case 242 /* InterfaceDeclaration */: return 111 /* InterfaceKeyword */;
+                    case 240 /* FunctionDeclaration */: return 91 /* FunctionKeyword */;
+                    case 244 /* EnumDeclaration */: return 244 /* EnumDeclaration */;
+                    case 159 /* GetAccessor */: return 127 /* GetKeyword */;
+                    case 160 /* SetAccessor */: return 138 /* SetKeyword */;
+                    case 157 /* MethodDeclaration */:
                         if (node.asteriskToken) {
                             return 40 /* AsteriskToken */;
                         }
                     // falls through
-                    case 154 /* PropertyDeclaration */:
-                    case 151 /* Parameter */:
+                    case 155 /* PropertyDeclaration */:
+                    case 152 /* Parameter */:
                         var name = ts.getNameOfDeclaration(node);
                         if (name) {
                             return name.kind;
@@ -109342,22 +112957,22 @@ var ts;
                         case 18 /* OpenBraceToken */:
                         case 19 /* CloseBraceToken */:
                         case 21 /* CloseParenToken */:
-                        case 83 /* ElseKeyword */:
-                        case 107 /* WhileKeyword */:
+                        case 84 /* ElseKeyword */:
+                        case 108 /* WhileKeyword */:
                         case 58 /* AtToken */:
                             return false;
                         case 42 /* SlashToken */:
                         case 30 /* GreaterThanToken */:
                             switch (container.kind) {
-                                case 262 /* JsxOpeningElement */:
-                                case 263 /* JsxClosingElement */:
-                                case 261 /* JsxSelfClosingElement */:
+                                case 263 /* JsxOpeningElement */:
+                                case 264 /* JsxClosingElement */:
+                                case 262 /* JsxSelfClosingElement */:
                                     return false;
                             }
                             break;
                         case 22 /* OpenBracketToken */:
                         case 23 /* CloseBracketToken */:
-                            if (container.kind !== 181 /* MappedType */) {
+                            if (container.kind !== 182 /* MappedType */) {
                                 return false;
                             }
                             break;
@@ -109449,7 +113064,7 @@ var ts;
                         consumeTokenAndAdvanceScanner(tokenInfo, node, parentDynamicIndentation, child);
                         return inheritedIndentation;
                     }
-                    var effectiveParentStartLine = child.kind === 152 /* Decorator */ ? childStartLine : undecoratedParentStartLine;
+                    var effectiveParentStartLine = child.kind === 153 /* Decorator */ ? childStartLine : undecoratedParentStartLine;
                     var childIndentation = computeIndentation(child, childStartLine, childIndentationAmount, node, parentDynamicIndentation, effectiveParentStartLine);
                     processNode(child, childContextNode, childStartLine, undecoratedChildStartLine, childIndentation.indentation, childIndentation.delta);
                     if (child.kind === 11 /* JsxText */) {
@@ -109457,7 +113072,7 @@ var ts;
                         indentMultilineCommentOrJsxText(range, childIndentation.indentation, /*firstLineIsIndented*/ true, /*indentFinalLine*/ false);
                     }
                     childContextNode = node;
-                    if (isFirstListItem && parent.kind === 187 /* ArrayLiteralExpression */ && inheritedIndentation === -1 /* Unknown */) {
+                    if (isFirstListItem && parent.kind === 188 /* ArrayLiteralExpression */ && inheritedIndentation === -1 /* Unknown */) {
                         inheritedIndentation = childIndentation.indentation;
                     }
                     return inheritedIndentation;
@@ -109875,12 +113490,12 @@ var ts;
         formatting.getRangeOfEnclosingComment = getRangeOfEnclosingComment;
         function getOpenTokenForList(node, list) {
             switch (node.kind) {
-                case 157 /* Constructor */:
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
-                case 197 /* ArrowFunction */:
+                case 158 /* Constructor */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
+                case 198 /* ArrowFunction */:
                     if (node.typeParameters === list) {
                         return 28 /* LessThanToken */;
                     }
@@ -109888,8 +113503,8 @@ var ts;
                         return 20 /* OpenParenToken */;
                     }
                     break;
-                case 191 /* CallExpression */:
-                case 192 /* NewExpression */:
+                case 192 /* CallExpression */:
+                case 193 /* NewExpression */:
                     if (node.typeArguments === list) {
                         return 28 /* LessThanToken */;
                     }
@@ -109897,12 +113512,12 @@ var ts;
                         return 20 /* OpenParenToken */;
                     }
                     break;
-                case 164 /* TypeReference */:
+                case 165 /* TypeReference */:
                     if (node.typeArguments === list) {
                         return 28 /* LessThanToken */;
                     }
                     break;
-                case 168 /* TypeLiteral */:
+                case 169 /* TypeLiteral */:
                     return 18 /* OpenBraceToken */;
             }
             return 0 /* Unknown */;
@@ -110019,7 +113634,7 @@ var ts;
                 if (options.indentStyle === ts.IndentStyle.Block) {
                     return getBlockIndent(sourceFile, position, options);
                 }
-                if (precedingToken.kind === 27 /* CommaToken */ && precedingToken.parent.kind !== 204 /* BinaryExpression */) {
+                if (precedingToken.kind === 27 /* CommaToken */ && precedingToken.parent.kind !== 205 /* BinaryExpression */) {
                     // previous token is comma that separates items in list - find the previous item and try to derive indentation from it
                     var actualIndentation = getActualIndentationForListItemBeforeComma(precedingToken, sourceFile, options);
                     if (actualIndentation !== -1 /* Unknown */) {
@@ -110173,7 +113788,7 @@ var ts;
                 // - parent is SourceFile - by default immediate children of SourceFile are not indented except when user indents them manually
                 // - parent and child are not on the same line
                 var useActualIndentation = (ts.isDeclaration(current) || ts.isStatementButNotDeclaration(current)) &&
-                    (parent.kind === 284 /* SourceFile */ || !parentAndChildShareLine);
+                    (parent.kind === 285 /* SourceFile */ || !parentAndChildShareLine);
                 if (!useActualIndentation) {
                     return -1 /* Unknown */;
                 }
@@ -110221,8 +113836,8 @@ var ts;
             }
             SmartIndenter.isArgumentAndStartLineOverlapsExpressionBeingCalled = isArgumentAndStartLineOverlapsExpressionBeingCalled;
             function childStartsOnTheSameLineWithElseInIfStatement(parent, child, childStartLine, sourceFile) {
-                if (parent.kind === 222 /* IfStatement */ && parent.elseStatement === child) {
-                    var elseKeyword = ts.findChildOfKind(parent, 83 /* ElseKeyword */, sourceFile);
+                if (parent.kind === 223 /* IfStatement */ && parent.elseStatement === child) {
+                    var elseKeyword = ts.findChildOfKind(parent, 84 /* ElseKeyword */, sourceFile);
                     ts.Debug.assert(elseKeyword !== undefined);
                     var elseKeywordStartLine = getStartLineAndCharacterForNode(elseKeyword, sourceFile).line;
                     return elseKeywordStartLine === childStartLine;
@@ -110230,6 +113845,23 @@ var ts;
                 return false;
             }
             SmartIndenter.childStartsOnTheSameLineWithElseInIfStatement = childStartsOnTheSameLineWithElseInIfStatement;
+            function argumentStartsOnSameLineAsPreviousArgument(parent, child, childStartLine, sourceFile) {
+                if (ts.isCallOrNewExpression(parent)) {
+                    if (!parent.arguments)
+                        return false;
+                    var currentNode = ts.Debug.assertDefined(ts.find(parent.arguments, function (arg) { return arg.pos === child.pos; }));
+                    var currentIndex = parent.arguments.indexOf(currentNode);
+                    if (currentIndex === 0)
+                        return false; // Can't look at previous node if first
+                    var previousNode = parent.arguments[currentIndex - 1];
+                    var lineOfPreviousNode = ts.getLineAndCharacterOfPosition(sourceFile, previousNode.getEnd()).line;
+                    if (childStartLine === lineOfPreviousNode) {
+                        return true;
+                    }
+                }
+                return false;
+            }
+            SmartIndenter.argumentStartsOnSameLineAsPreviousArgument = argumentStartsOnSameLineAsPreviousArgument;
             function getContainingList(node, sourceFile) {
                 return node.parent && getListByRange(node.getStart(sourceFile), node.getEnd(), node.parent, sourceFile);
             }
@@ -110239,40 +113871,40 @@ var ts;
             }
             function getListByRange(start, end, node, sourceFile) {
                 switch (node.kind) {
-                    case 164 /* TypeReference */:
+                    case 165 /* TypeReference */:
                         return getList(node.typeArguments);
-                    case 188 /* ObjectLiteralExpression */:
+                    case 189 /* ObjectLiteralExpression */:
                         return getList(node.properties);
-                    case 187 /* ArrayLiteralExpression */:
+                    case 188 /* ArrayLiteralExpression */:
                         return getList(node.elements);
-                    case 168 /* TypeLiteral */:
+                    case 169 /* TypeLiteral */:
                         return getList(node.members);
-                    case 239 /* FunctionDeclaration */:
-                    case 196 /* FunctionExpression */:
-                    case 197 /* ArrowFunction */:
-                    case 156 /* MethodDeclaration */:
-                    case 155 /* MethodSignature */:
-                    case 160 /* CallSignature */:
-                    case 157 /* Constructor */:
-                    case 166 /* ConstructorType */:
-                    case 161 /* ConstructSignature */:
+                    case 240 /* FunctionDeclaration */:
+                    case 197 /* FunctionExpression */:
+                    case 198 /* ArrowFunction */:
+                    case 157 /* MethodDeclaration */:
+                    case 156 /* MethodSignature */:
+                    case 161 /* CallSignature */:
+                    case 158 /* Constructor */:
+                    case 167 /* ConstructorType */:
+                    case 162 /* ConstructSignature */:
                         return getList(node.typeParameters) || getList(node.parameters);
-                    case 240 /* ClassDeclaration */:
-                    case 209 /* ClassExpression */:
-                    case 241 /* InterfaceDeclaration */:
-                    case 242 /* TypeAliasDeclaration */:
-                    case 308 /* JSDocTemplateTag */:
+                    case 241 /* ClassDeclaration */:
+                    case 210 /* ClassExpression */:
+                    case 242 /* InterfaceDeclaration */:
+                    case 243 /* TypeAliasDeclaration */:
+                    case 310 /* JSDocTemplateTag */:
                         return getList(node.typeParameters);
-                    case 192 /* NewExpression */:
-                    case 191 /* CallExpression */:
+                    case 193 /* NewExpression */:
+                    case 192 /* CallExpression */:
                         return getList(node.typeArguments) || getList(node.arguments);
-                    case 238 /* VariableDeclarationList */:
+                    case 239 /* VariableDeclarationList */:
                         return getList(node.declarations);
-                    case 252 /* NamedImports */:
-                    case 256 /* NamedExports */:
+                    case 253 /* NamedImports */:
+                    case 257 /* NamedExports */:
                         return getList(node.elements);
-                    case 184 /* ObjectBindingPattern */:
-                    case 185 /* ArrayBindingPattern */:
+                    case 185 /* ObjectBindingPattern */:
+                    case 186 /* ArrayBindingPattern */:
                         return getList(node.elements);
                 }
                 function getList(list) {
@@ -110295,7 +113927,7 @@ var ts;
                 return findColumnForFirstNonWhitespaceCharacterInLine(sourceFile.getLineAndCharacterOfPosition(list.pos), sourceFile, options);
             }
             function getActualIndentationForListItem(node, sourceFile, options, listIndentsChild) {
-                if (node.parent && node.parent.kind === 238 /* VariableDeclarationList */) {
+                if (node.parent && node.parent.kind === 239 /* VariableDeclarationList */) {
                     // VariableDeclarationList has no wrapping tokens
                     return -1 /* Unknown */;
                 }
@@ -110368,83 +114000,83 @@ var ts;
             function nodeWillIndentChild(settings, parent, child, sourceFile, indentByDefault) {
                 var childKind = child ? child.kind : 0 /* Unknown */;
                 switch (parent.kind) {
-                    case 221 /* ExpressionStatement */:
-                    case 240 /* ClassDeclaration */:
-                    case 209 /* ClassExpression */:
-                    case 241 /* InterfaceDeclaration */:
-                    case 243 /* EnumDeclaration */:
-                    case 242 /* TypeAliasDeclaration */:
-                    case 187 /* ArrayLiteralExpression */:
-                    case 218 /* Block */:
-                    case 245 /* ModuleBlock */:
-                    case 188 /* ObjectLiteralExpression */:
-                    case 168 /* TypeLiteral */:
-                    case 181 /* MappedType */:
-                    case 170 /* TupleType */:
-                    case 246 /* CaseBlock */:
-                    case 272 /* DefaultClause */:
-                    case 271 /* CaseClause */:
-                    case 195 /* ParenthesizedExpression */:
-                    case 189 /* PropertyAccessExpression */:
-                    case 191 /* CallExpression */:
-                    case 192 /* NewExpression */:
-                    case 219 /* VariableStatement */:
-                    case 254 /* ExportAssignment */:
-                    case 230 /* ReturnStatement */:
-                    case 205 /* ConditionalExpression */:
-                    case 185 /* ArrayBindingPattern */:
-                    case 184 /* ObjectBindingPattern */:
-                    case 262 /* JsxOpeningElement */:
-                    case 265 /* JsxOpeningFragment */:
-                    case 261 /* JsxSelfClosingElement */:
-                    case 270 /* JsxExpression */:
-                    case 155 /* MethodSignature */:
-                    case 160 /* CallSignature */:
-                    case 161 /* ConstructSignature */:
-                    case 151 /* Parameter */:
-                    case 165 /* FunctionType */:
-                    case 166 /* ConstructorType */:
-                    case 177 /* ParenthesizedType */:
-                    case 193 /* TaggedTemplateExpression */:
-                    case 201 /* AwaitExpression */:
-                    case 256 /* NamedExports */:
-                    case 252 /* NamedImports */:
-                    case 257 /* ExportSpecifier */:
-                    case 253 /* ImportSpecifier */:
-                    case 154 /* PropertyDeclaration */:
+                    case 222 /* ExpressionStatement */:
+                    case 241 /* ClassDeclaration */:
+                    case 210 /* ClassExpression */:
+                    case 242 /* InterfaceDeclaration */:
+                    case 244 /* EnumDeclaration */:
+                    case 243 /* TypeAliasDeclaration */:
+                    case 188 /* ArrayLiteralExpression */:
+                    case 219 /* Block */:
+                    case 246 /* ModuleBlock */:
+                    case 189 /* ObjectLiteralExpression */:
+                    case 169 /* TypeLiteral */:
+                    case 182 /* MappedType */:
+                    case 171 /* TupleType */:
+                    case 247 /* CaseBlock */:
+                    case 273 /* DefaultClause */:
+                    case 272 /* CaseClause */:
+                    case 196 /* ParenthesizedExpression */:
+                    case 190 /* PropertyAccessExpression */:
+                    case 192 /* CallExpression */:
+                    case 193 /* NewExpression */:
+                    case 220 /* VariableStatement */:
+                    case 255 /* ExportAssignment */:
+                    case 231 /* ReturnStatement */:
+                    case 206 /* ConditionalExpression */:
+                    case 186 /* ArrayBindingPattern */:
+                    case 185 /* ObjectBindingPattern */:
+                    case 263 /* JsxOpeningElement */:
+                    case 266 /* JsxOpeningFragment */:
+                    case 262 /* JsxSelfClosingElement */:
+                    case 271 /* JsxExpression */:
+                    case 156 /* MethodSignature */:
+                    case 161 /* CallSignature */:
+                    case 162 /* ConstructSignature */:
+                    case 152 /* Parameter */:
+                    case 166 /* FunctionType */:
+                    case 167 /* ConstructorType */:
+                    case 178 /* ParenthesizedType */:
+                    case 194 /* TaggedTemplateExpression */:
+                    case 202 /* AwaitExpression */:
+                    case 257 /* NamedExports */:
+                    case 253 /* NamedImports */:
+                    case 258 /* ExportSpecifier */:
+                    case 254 /* ImportSpecifier */:
+                    case 155 /* PropertyDeclaration */:
                         return true;
-                    case 237 /* VariableDeclaration */:
-                    case 275 /* PropertyAssignment */:
-                        if (!settings.indentMultiLineObjectLiteralBeginningOnBlankLine && sourceFile && childKind === 188 /* ObjectLiteralExpression */) { // TODO: GH#18217
+                    case 238 /* VariableDeclaration */:
+                    case 276 /* PropertyAssignment */:
+                        if (!settings.indentMultiLineObjectLiteralBeginningOnBlankLine && sourceFile && childKind === 189 /* ObjectLiteralExpression */) { // TODO: GH#18217
                             return rangeIsOnOneLine(sourceFile, child);
                         }
                         return true;
-                    case 223 /* DoStatement */:
-                    case 224 /* WhileStatement */:
-                    case 226 /* ForInStatement */:
-                    case 227 /* ForOfStatement */:
-                    case 225 /* ForStatement */:
-                    case 222 /* IfStatement */:
-                    case 239 /* FunctionDeclaration */:
-                    case 196 /* FunctionExpression */:
-                    case 156 /* MethodDeclaration */:
-                    case 197 /* ArrowFunction */:
-                    case 157 /* Constructor */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
-                        return childKind !== 218 /* Block */;
-                    case 255 /* ExportDeclaration */:
-                        return childKind !== 256 /* NamedExports */;
-                    case 249 /* ImportDeclaration */:
-                        return childKind !== 250 /* ImportClause */ ||
-                            (!!child.namedBindings && child.namedBindings.kind !== 252 /* NamedImports */);
-                    case 260 /* JsxElement */:
-                        return childKind !== 263 /* JsxClosingElement */;
-                    case 264 /* JsxFragment */:
-                        return childKind !== 266 /* JsxClosingFragment */;
-                    case 174 /* IntersectionType */:
-                    case 173 /* UnionType */:
-                        if (childKind === 168 /* TypeLiteral */) {
+                    case 224 /* DoStatement */:
+                    case 225 /* WhileStatement */:
+                    case 227 /* ForInStatement */:
+                    case 228 /* ForOfStatement */:
+                    case 226 /* ForStatement */:
+                    case 223 /* IfStatement */:
+                    case 240 /* FunctionDeclaration */:
+                    case 197 /* FunctionExpression */:
+                    case 157 /* MethodDeclaration */:
+                    case 198 /* ArrowFunction */:
+                    case 158 /* Constructor */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
+                        return childKind !== 219 /* Block */;
+                    case 256 /* ExportDeclaration */:
+                        return childKind !== 257 /* NamedExports */;
+                    case 250 /* ImportDeclaration */:
+                        return childKind !== 251 /* ImportClause */ ||
+                            (!!child.namedBindings && child.namedBindings.kind !== 253 /* NamedImports */);
+                    case 261 /* JsxElement */:
+                        return childKind !== 264 /* JsxClosingElement */;
+                    case 265 /* JsxFragment */:
+                        return childKind !== 267 /* JsxClosingFragment */;
+                    case 175 /* IntersectionType */:
+                    case 174 /* UnionType */:
+                        if (childKind === 169 /* TypeLiteral */) {
                             return false;
                         }
                     // falls through
@@ -110455,11 +114087,11 @@ var ts;
             SmartIndenter.nodeWillIndentChild = nodeWillIndentChild;
             function isControlFlowEndingStatement(kind, parent) {
                 switch (kind) {
-                    case 230 /* ReturnStatement */:
-                    case 234 /* ThrowStatement */:
-                    case 228 /* ContinueStatement */:
-                    case 229 /* BreakStatement */:
-                        return parent.kind !== 218 /* Block */;
+                    case 231 /* ReturnStatement */:
+                    case 235 /* ThrowStatement */:
+                    case 229 /* ContinueStatement */:
+                    case 230 /* BreakStatement */:
+                        return parent.kind !== 219 /* Block */;
                     default:
                         return false;
                 }
@@ -110601,7 +114233,7 @@ var ts;
          * Checks if 'candidate' argument is a legal separator in the list that contains 'node' as an element
          */
         function isSeparator(node, candidate) {
-            return !!candidate && !!node.parent && (candidate.kind === 27 /* CommaToken */ || (candidate.kind === 26 /* SemicolonToken */ && node.parent.kind === 188 /* ObjectLiteralExpression */));
+            return !!candidate && !!node.parent && (candidate.kind === 27 /* CommaToken */ || (candidate.kind === 26 /* SemicolonToken */ && node.parent.kind === 189 /* ObjectLiteralExpression */));
         }
         function spaces(count) {
             var s = "";
@@ -110610,6 +114242,10 @@ var ts;
             }
             return s;
         }
+        function isThisTypeAnnotatable(containingFunction) {
+            return ts.isFunctionExpression(containingFunction) || ts.isFunctionDeclaration(containingFunction);
+        }
+        textChanges_3.isThisTypeAnnotatable = isThisTypeAnnotatable;
         var ChangeTracker = /** @class */ (function () {
             /** Public for tests only. Other callers should use `ChangeTracker.with`. */
             function ChangeTracker(newLineCharacter, formatContext) {
@@ -110762,10 +114398,15 @@ var ts;
                     }
                 }
                 else {
-                    endNode = node.kind !== 237 /* VariableDeclaration */ && node.questionToken ? node.questionToken : node.name;
+                    endNode = node.kind !== 238 /* VariableDeclaration */ && node.questionToken ? node.questionToken : node.name;
                 }
                 this.insertNodeAt(sourceFile, endNode.end, type, { prefix: ": " });
             };
+            ChangeTracker.prototype.tryInsertThisTypeAnnotation = function (sourceFile, node, type) {
+                var start = ts.findChildOfKind(node, 20 /* OpenParenToken */, sourceFile).getStart(sourceFile) + 1;
+                var suffix = node.parameters.length ? ", " : "";
+                this.insertNodeAt(sourceFile, start, type, { prefix: "this: ", suffix: suffix });
+            };
             ChangeTracker.prototype.insertTypeParameters = function (sourceFile, node, typeParameters) {
                 // If no `(`, is an arrow function `x => x`, so use the pos of the first parameter
                 var start = (ts.findChildOfKind(node, 20 /* OpenParenToken */, sourceFile) || ts.first(node.parameters)).getStart(sourceFile);
@@ -110874,18 +114515,18 @@ var ts;
             };
             ChangeTracker.prototype.getInsertNodeAfterOptionsWorker = function (node) {
                 switch (node.kind) {
-                    case 240 /* ClassDeclaration */:
-                    case 244 /* ModuleDeclaration */:
+                    case 241 /* ClassDeclaration */:
+                    case 245 /* ModuleDeclaration */:
                         return { prefix: this.newLineCharacter, suffix: this.newLineCharacter };
-                    case 237 /* VariableDeclaration */:
+                    case 238 /* VariableDeclaration */:
                     case 10 /* StringLiteral */:
-                    case 72 /* Identifier */:
+                    case 73 /* Identifier */:
                         return { prefix: ", " };
-                    case 275 /* PropertyAssignment */:
+                    case 276 /* PropertyAssignment */:
                         return { suffix: "," + this.newLineCharacter };
-                    case 85 /* ExportKeyword */:
+                    case 86 /* ExportKeyword */:
                         return { prefix: " " };
-                    case 151 /* Parameter */:
+                    case 152 /* Parameter */:
                         return {};
                     default:
                         ts.Debug.assert(ts.isStatement(node) || ts.isClassOrTypeElement(node)); // Else we haven't handled this kind of node yet -- add it
@@ -110894,12 +114535,12 @@ var ts;
             };
             ChangeTracker.prototype.insertName = function (sourceFile, node, name) {
                 ts.Debug.assert(!node.name);
-                if (node.kind === 197 /* ArrowFunction */) {
+                if (node.kind === 198 /* ArrowFunction */) {
                     var arrow = ts.findChildOfKind(node, 37 /* EqualsGreaterThanToken */, sourceFile);
                     var lparen = ts.findChildOfKind(node, 20 /* OpenParenToken */, sourceFile);
                     if (lparen) {
                         // `() => {}` --> `function f() {}`
-                        this.insertNodesAt(sourceFile, lparen.getStart(sourceFile), [ts.createToken(90 /* FunctionKeyword */), ts.createIdentifier(name)], { joiner: " " });
+                        this.insertNodesAt(sourceFile, lparen.getStart(sourceFile), [ts.createToken(91 /* FunctionKeyword */), ts.createIdentifier(name)], { joiner: " " });
                         deleteNode(this, sourceFile, arrow);
                     }
                     else {
@@ -110908,14 +114549,14 @@ var ts;
                         // Replacing full range of arrow to get rid of the leading space -- replace ` =>` with `)`
                         this.replaceRange(sourceFile, arrow, ts.createToken(21 /* CloseParenToken */));
                     }
-                    if (node.body.kind !== 218 /* Block */) {
+                    if (node.body.kind !== 219 /* Block */) {
                         // `() => 0` => `function f() { return 0; }`
-                        this.insertNodesAt(sourceFile, node.body.getStart(sourceFile), [ts.createToken(18 /* OpenBraceToken */), ts.createToken(97 /* ReturnKeyword */)], { joiner: " ", suffix: " " });
+                        this.insertNodesAt(sourceFile, node.body.getStart(sourceFile), [ts.createToken(18 /* OpenBraceToken */), ts.createToken(98 /* ReturnKeyword */)], { joiner: " ", suffix: " " });
                         this.insertNodesAt(sourceFile, node.body.end, [ts.createToken(26 /* SemicolonToken */), ts.createToken(19 /* CloseBraceToken */)], { joiner: " " });
                     }
                 }
                 else {
-                    var pos = ts.findChildOfKind(node, node.kind === 196 /* FunctionExpression */ ? 90 /* FunctionKeyword */ : 76 /* ClassKeyword */, sourceFile).end;
+                    var pos = ts.findChildOfKind(node, node.kind === 197 /* FunctionExpression */ ? 91 /* FunctionKeyword */ : 77 /* ClassKeyword */, sourceFile).end;
                     this.insertNodeAt(sourceFile, pos, ts.createIdentifier(name), { prefix: " " });
                 }
             };
@@ -111034,6 +114675,9 @@ var ts;
                     }
                 }
             };
+            ChangeTracker.prototype.parenthesizeExpression = function (sourceFile, expression) {
+                this.replaceRange(sourceFile, ts.rangeOfNode(expression), ts.createParen(expression));
+            };
             ChangeTracker.prototype.finishClassesWithNodesInsertedAtStart = function () {
                 var _this = this;
                 this.classesWithNodesInsertedAtStart.forEach(function (_a) {
@@ -111142,7 +114786,7 @@ var ts;
             function newFileChangesWorker(oldFile, scriptKind, statements, newLineCharacter, formatContext) {
                 // TODO: this emits the file, parses it back, then formats it that -- may be a less roundabout way to do this
                 var nonFormattedText = statements.map(function (s) { return getNonformattedText(s, oldFile, newLineCharacter).text; }).join(newLineCharacter);
-                var sourceFile = ts.createSourceFile("any file name", nonFormattedText, 7 /* ESNext */, /*setParentNodes*/ true, scriptKind);
+                var sourceFile = ts.createSourceFile("any file name", nonFormattedText, 99 /* ESNext */, /*setParentNodes*/ true, scriptKind);
                 var changes = ts.formatting.formatDocument(sourceFile, formatContext);
                 return applyChanges(nonFormattedText, changes) + newLineCharacter;
             }
@@ -111182,9 +114826,10 @@ var ts;
             }
             /** Note: output node may be mutated input node. */
             function getNonformattedText(node, sourceFile, newLineCharacter) {
-                var writer = new Writer(newLineCharacter);
+                var omitTrailingSemicolon = !!sourceFile && !ts.probablyUsesSemicolons(sourceFile);
+                var writer = createWriter(newLineCharacter, omitTrailingSemicolon);
                 var newLine = newLineCharacter === "\n" ? 1 /* LineFeed */ : 0 /* CarriageReturnLineFeed */;
-                ts.createPrinter({ newLine: newLine, neverAsciiEscape: true }, writer).writeNode(4 /* Unspecified */, node, sourceFile, writer);
+                ts.createPrinter({ newLine: newLine, neverAsciiEscape: true, omitTrailingSemicolon: omitTrailingSemicolon }, writer).writeNode(4 /* Unspecified */, node, sourceFile, writer);
                 return { text: writer.getText(), node: assignPositionsToNode(node) };
             }
             changesToText.getNonformattedText = getNonformattedText;
@@ -111219,136 +114864,162 @@ var ts;
             nodeArray.end = getEnd(nodes);
             return nodeArray;
         }
-        var Writer = /** @class */ (function () {
-            function Writer(newLine) {
-                var _this = this;
-                this.lastNonTriviaPosition = 0;
-                this.writer = ts.createTextWriter(newLine);
-                this.onEmitNode = function (hint, node, printCallback) {
-                    if (node) {
-                        setPos(node, _this.lastNonTriviaPosition);
-                    }
-                    printCallback(hint, node);
-                    if (node) {
-                        setEnd(node, _this.lastNonTriviaPosition);
-                    }
-                };
-                this.onBeforeEmitNodeArray = function (nodes) {
-                    if (nodes) {
-                        setPos(nodes, _this.lastNonTriviaPosition);
-                    }
-                };
-                this.onAfterEmitNodeArray = function (nodes) {
-                    if (nodes) {
-                        setEnd(nodes, _this.lastNonTriviaPosition);
-                    }
-                };
-                this.onBeforeEmitToken = function (node) {
-                    if (node) {
-                        setPos(node, _this.lastNonTriviaPosition);
-                    }
-                };
-                this.onAfterEmitToken = function (node) {
-                    if (node) {
-                        setEnd(node, _this.lastNonTriviaPosition);
-                    }
-                };
-            }
-            Writer.prototype.setLastNonTriviaPosition = function (s, force) {
+        function createWriter(newLine, omitTrailingSemicolon) {
+            var lastNonTriviaPosition = 0;
+            var writer = omitTrailingSemicolon ? ts.getTrailingSemicolonOmittingWriter(ts.createTextWriter(newLine)) : ts.createTextWriter(newLine);
+            var onEmitNode = function (hint, node, printCallback) {
+                if (node) {
+                    setPos(node, lastNonTriviaPosition);
+                }
+                printCallback(hint, node);
+                if (node) {
+                    setEnd(node, lastNonTriviaPosition);
+                }
+            };
+            var onBeforeEmitNodeArray = function (nodes) {
+                if (nodes) {
+                    setPos(nodes, lastNonTriviaPosition);
+                }
+            };
+            var onAfterEmitNodeArray = function (nodes) {
+                if (nodes) {
+                    setEnd(nodes, lastNonTriviaPosition);
+                }
+            };
+            var onBeforeEmitToken = function (node) {
+                if (node) {
+                    setPos(node, lastNonTriviaPosition);
+                }
+            };
+            var onAfterEmitToken = function (node) {
+                if (node) {
+                    setEnd(node, lastNonTriviaPosition);
+                }
+            };
+            function setLastNonTriviaPosition(s, force) {
                 if (force || !isTrivia(s)) {
-                    this.lastNonTriviaPosition = this.writer.getTextPos();
+                    lastNonTriviaPosition = writer.getTextPos();
                     var i = 0;
                     while (ts.isWhiteSpaceLike(s.charCodeAt(s.length - i - 1))) {
                         i++;
                     }
                     // trim trailing whitespaces
-                    this.lastNonTriviaPosition -= i;
+                    lastNonTriviaPosition -= i;
                 }
+            }
+            function write(s) {
+                writer.write(s);
+                setLastNonTriviaPosition(s, /*force*/ false);
+            }
+            function writeComment(s) {
+                writer.writeComment(s);
+            }
+            function writeKeyword(s) {
+                writer.writeKeyword(s);
+                setLastNonTriviaPosition(s, /*force*/ false);
+            }
+            function writeOperator(s) {
+                writer.writeOperator(s);
+                setLastNonTriviaPosition(s, /*force*/ false);
+            }
+            function writePunctuation(s) {
+                writer.writePunctuation(s);
+                setLastNonTriviaPosition(s, /*force*/ false);
+            }
+            function writeTrailingSemicolon(s) {
+                writer.writeTrailingSemicolon(s);
+                setLastNonTriviaPosition(s, /*force*/ false);
+            }
+            function writeParameter(s) {
+                writer.writeParameter(s);
+                setLastNonTriviaPosition(s, /*force*/ false);
+            }
+            function writeProperty(s) {
+                writer.writeProperty(s);
+                setLastNonTriviaPosition(s, /*force*/ false);
+            }
+            function writeSpace(s) {
+                writer.writeSpace(s);
+                setLastNonTriviaPosition(s, /*force*/ false);
+            }
+            function writeStringLiteral(s) {
+                writer.writeStringLiteral(s);
+                setLastNonTriviaPosition(s, /*force*/ false);
+            }
+            function writeSymbol(s, sym) {
+                writer.writeSymbol(s, sym);
+                setLastNonTriviaPosition(s, /*force*/ false);
+            }
+            function writeLine() {
+                writer.writeLine();
+            }
+            function increaseIndent() {
+                writer.increaseIndent();
+            }
+            function decreaseIndent() {
+                writer.decreaseIndent();
+            }
+            function getText() {
+                return writer.getText();
+            }
+            function rawWrite(s) {
+                writer.rawWrite(s);
+                setLastNonTriviaPosition(s, /*force*/ false);
+            }
+            function writeLiteral(s) {
+                writer.writeLiteral(s);
+                setLastNonTriviaPosition(s, /*force*/ true);
+            }
+            function getTextPos() {
+                return writer.getTextPos();
+            }
+            function getLine() {
+                return writer.getLine();
+            }
+            function getColumn() {
+                return writer.getColumn();
+            }
+            function getIndent() {
+                return writer.getIndent();
+            }
+            function isAtStartOfLine() {
+                return writer.isAtStartOfLine();
+            }
+            function clear() {
+                writer.clear();
+                lastNonTriviaPosition = 0;
+            }
+            return {
+                onEmitNode: onEmitNode,
+                onBeforeEmitNodeArray: onBeforeEmitNodeArray,
+                onAfterEmitNodeArray: onAfterEmitNodeArray,
+                onBeforeEmitToken: onBeforeEmitToken,
+                onAfterEmitToken: onAfterEmitToken,
+                write: write,
+                writeComment: writeComment,
+                writeKeyword: writeKeyword,
+                writeOperator: writeOperator,
+                writePunctuation: writePunctuation,
+                writeTrailingSemicolon: writeTrailingSemicolon,
+                writeParameter: writeParameter,
+                writeProperty: writeProperty,
+                writeSpace: writeSpace,
+                writeStringLiteral: writeStringLiteral,
+                writeSymbol: writeSymbol,
+                writeLine: writeLine,
+                increaseIndent: increaseIndent,
+                decreaseIndent: decreaseIndent,
+                getText: getText,
+                rawWrite: rawWrite,
+                writeLiteral: writeLiteral,
+                getTextPos: getTextPos,
+                getLine: getLine,
+                getColumn: getColumn,
+                getIndent: getIndent,
+                isAtStartOfLine: isAtStartOfLine,
+                clear: clear
             };
-            Writer.prototype.write = function (s) {
-                this.writer.write(s);
-                this.setLastNonTriviaPosition(s, /*force*/ false);
-            };
-            Writer.prototype.writeComment = function (s) {
-                this.writer.writeComment(s);
-            };
-            Writer.prototype.writeKeyword = function (s) {
-                this.writer.writeKeyword(s);
-                this.setLastNonTriviaPosition(s, /*force*/ false);
-            };
-            Writer.prototype.writeOperator = function (s) {
-                this.writer.writeOperator(s);
-                this.setLastNonTriviaPosition(s, /*force*/ false);
-            };
-            Writer.prototype.writePunctuation = function (s) {
-                this.writer.writePunctuation(s);
-                this.setLastNonTriviaPosition(s, /*force*/ false);
-            };
-            Writer.prototype.writeTrailingSemicolon = function (s) {
-                this.writer.writeTrailingSemicolon(s);
-                this.setLastNonTriviaPosition(s, /*force*/ false);
-            };
-            Writer.prototype.writeParameter = function (s) {
-                this.writer.writeParameter(s);
-                this.setLastNonTriviaPosition(s, /*force*/ false);
-            };
-            Writer.prototype.writeProperty = function (s) {
-                this.writer.writeProperty(s);
-                this.setLastNonTriviaPosition(s, /*force*/ false);
-            };
-            Writer.prototype.writeSpace = function (s) {
-                this.writer.writeSpace(s);
-                this.setLastNonTriviaPosition(s, /*force*/ false);
-            };
-            Writer.prototype.writeStringLiteral = function (s) {
-                this.writer.writeStringLiteral(s);
-                this.setLastNonTriviaPosition(s, /*force*/ false);
-            };
-            Writer.prototype.writeSymbol = function (s, sym) {
-                this.writer.writeSymbol(s, sym);
-                this.setLastNonTriviaPosition(s, /*force*/ false);
-            };
-            Writer.prototype.writeLine = function () {
-                this.writer.writeLine();
-            };
-            Writer.prototype.increaseIndent = function () {
-                this.writer.increaseIndent();
-            };
-            Writer.prototype.decreaseIndent = function () {
-                this.writer.decreaseIndent();
-            };
-            Writer.prototype.getText = function () {
-                return this.writer.getText();
-            };
-            Writer.prototype.rawWrite = function (s) {
-                this.writer.rawWrite(s);
-                this.setLastNonTriviaPosition(s, /*force*/ false);
-            };
-            Writer.prototype.writeLiteral = function (s) {
-                this.writer.writeLiteral(s);
-                this.setLastNonTriviaPosition(s, /*force*/ true);
-            };
-            Writer.prototype.getTextPos = function () {
-                return this.writer.getTextPos();
-            };
-            Writer.prototype.getLine = function () {
-                return this.writer.getLine();
-            };
-            Writer.prototype.getColumn = function () {
-                return this.writer.getColumn();
-            };
-            Writer.prototype.getIndent = function () {
-                return this.writer.getIndent();
-            };
-            Writer.prototype.isAtStartOfLine = function () {
-                return this.writer.isAtStartOfLine();
-            };
-            Writer.prototype.clear = function () {
-                this.writer.clear();
-                this.lastNonTriviaPosition = 0;
-            };
-            return Writer;
-        }());
+        }
         function getInsertionPositionAtSourceFileTop(sourceFile) {
             var lastPrologue;
             for (var _i = 0, _a = sourceFile.statements; _i < _a.length; _i++) {
@@ -111410,14 +115081,14 @@ var ts;
         }
         textChanges_3.isValidLocationToAddComment = isValidLocationToAddComment;
         function needSemicolonBetween(a, b) {
-            return (ts.isPropertySignature(a) || ts.isPropertyDeclaration(a)) && ts.isClassOrTypeElement(b) && b.name.kind === 149 /* ComputedPropertyName */
+            return (ts.isPropertySignature(a) || ts.isPropertyDeclaration(a)) && ts.isClassOrTypeElement(b) && b.name.kind === 150 /* ComputedPropertyName */
                 || ts.isStatementButNotDeclaration(a) && ts.isStatementButNotDeclaration(b); // TODO: only if b would start with a `(` or `[`
         }
         var deleteDeclaration;
         (function (deleteDeclaration_1) {
             function deleteDeclaration(changes, deletedNodesInLists, sourceFile, node) {
                 switch (node.kind) {
-                    case 151 /* Parameter */: {
+                    case 152 /* Parameter */: {
                         var oldFunction = node.parent;
                         if (ts.isArrowFunction(oldFunction) &&
                             oldFunction.parameters.length === 1 &&
@@ -111432,14 +115103,14 @@ var ts;
                         }
                         break;
                     }
-                    case 249 /* ImportDeclaration */:
+                    case 250 /* ImportDeclaration */:
                         deleteNode(changes, sourceFile, node, 
                         // For first import, leave header comment in place
                         node === sourceFile.imports[0].parent ? { leadingTriviaOption: LeadingTriviaOption.Exclude } : undefined);
                         break;
-                    case 186 /* BindingElement */:
+                    case 187 /* BindingElement */:
                         var pattern = node.parent;
-                        var preserveComma = pattern.kind === 185 /* ArrayBindingPattern */ && node !== ts.last(pattern.elements);
+                        var preserveComma = pattern.kind === 186 /* ArrayBindingPattern */ && node !== ts.last(pattern.elements);
                         if (preserveComma) {
                             deleteNode(changes, sourceFile, node);
                         }
@@ -111447,13 +115118,13 @@ var ts;
                             deleteNodeInList(changes, deletedNodesInLists, sourceFile, node);
                         }
                         break;
-                    case 237 /* VariableDeclaration */:
+                    case 238 /* VariableDeclaration */:
                         deleteVariableDeclaration(changes, deletedNodesInLists, sourceFile, node);
                         break;
-                    case 150 /* TypeParameter */:
+                    case 151 /* TypeParameter */:
                         deleteNodeInList(changes, deletedNodesInLists, sourceFile, node);
                         break;
-                    case 253 /* ImportSpecifier */:
+                    case 254 /* ImportSpecifier */:
                         var namedImports = node.parent;
                         if (namedImports.elements.length === 1) {
                             deleteImportBinding(changes, sourceFile, namedImports);
@@ -111462,7 +115133,7 @@ var ts;
                             deleteNodeInList(changes, deletedNodesInLists, sourceFile, node);
                         }
                         break;
-                    case 251 /* NamespaceImport */:
+                    case 252 /* NamespaceImport */:
                         deleteImportBinding(changes, sourceFile, node);
                         break;
                     default:
@@ -111509,13 +115180,13 @@ var ts;
                     // Delete the entire import declaration
                     // |import * as ns from './file'|
                     // |import { a } from './file'|
-                    var importDecl = ts.getAncestor(node, 249 /* ImportDeclaration */);
+                    var importDecl = ts.getAncestor(node, 250 /* ImportDeclaration */);
                     deleteNode(changes, sourceFile, importDecl);
                 }
             }
             function deleteVariableDeclaration(changes, deletedNodesInLists, sourceFile, node) {
                 var parent = node.parent;
-                if (parent.kind === 274 /* CatchClause */) {
+                if (parent.kind === 275 /* CatchClause */) {
                     // TODO: There's currently no unused diagnostic for this, could be a suggestion
                     changes.deleteNodeRange(sourceFile, ts.findChildOfKind(parent, 20 /* OpenParenToken */, sourceFile), ts.findChildOfKind(parent, 21 /* CloseParenToken */, sourceFile));
                     return;
@@ -111526,14 +115197,14 @@ var ts;
                 }
                 var gp = parent.parent;
                 switch (gp.kind) {
-                    case 227 /* ForOfStatement */:
-                    case 226 /* ForInStatement */:
+                    case 228 /* ForOfStatement */:
+                    case 227 /* ForInStatement */:
                         changes.replaceNode(sourceFile, node, ts.createObjectLiteral());
                         break;
-                    case 225 /* ForStatement */:
+                    case 226 /* ForStatement */:
                         deleteNode(changes, sourceFile, parent);
                         break;
-                    case 219 /* VariableStatement */:
+                    case 220 /* VariableStatement */:
                         deleteNode(changes, sourceFile, gp);
                         break;
                     default:
@@ -111696,14 +115367,270 @@ var ts;
             var token = ts.getTokenAtPosition(sourceFile, pos);
             var assertion = ts.Debug.assertDefined(ts.findAncestor(token, function (n) { return ts.isAsExpression(n) || ts.isTypeAssertion(n); }));
             var replacement = ts.isAsExpression(assertion)
-                ? ts.createAsExpression(assertion.expression, ts.createKeywordTypeNode(143 /* UnknownKeyword */))
-                : ts.createTypeAssertion(ts.createKeywordTypeNode(143 /* UnknownKeyword */), assertion.expression);
+                ? ts.createAsExpression(assertion.expression, ts.createKeywordTypeNode(144 /* UnknownKeyword */))
+                : ts.createTypeAssertion(ts.createKeywordTypeNode(144 /* UnknownKeyword */), assertion.expression);
             changeTracker.replaceNode(sourceFile, assertion.expression, replacement);
         }
     })(codefix = ts.codefix || (ts.codefix = {}));
 })(ts || (ts = {}));
 /* @internal */
 var ts;
+(function (ts) {
+    var codefix;
+    (function (codefix) {
+        var fixId = "addMissingAwait";
+        var propertyAccessCode = ts.Diagnostics.Property_0_does_not_exist_on_type_1.code;
+        var callableConstructableErrorCodes = [
+            ts.Diagnostics.This_expression_is_not_callable.code,
+            ts.Diagnostics.This_expression_is_not_constructable.code,
+        ];
+        var errorCodes = [
+            ts.Diagnostics.An_arithmetic_operand_must_be_of_type_any_number_bigint_or_an_enum_type.code,
+            ts.Diagnostics.The_left_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_bigint_or_an_enum_type.code,
+            ts.Diagnostics.The_right_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_bigint_or_an_enum_type.code,
+            ts.Diagnostics.Operator_0_cannot_be_applied_to_type_1.code,
+            ts.Diagnostics.Operator_0_cannot_be_applied_to_types_1_and_2.code,
+            ts.Diagnostics.This_condition_will_always_return_0_since_the_types_1_and_2_have_no_overlap.code,
+            ts.Diagnostics.Type_0_is_not_an_array_type.code,
+            ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type.code,
+            ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type_Use_compiler_option_downlevelIteration_to_allow_iterating_of_iterators.code,
+            ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type_or_does_not_have_a_Symbol_iterator_method_that_returns_an_iterator.code,
+            ts.Diagnostics.Type_0_is_not_an_array_type_or_does_not_have_a_Symbol_iterator_method_that_returns_an_iterator.code,
+            ts.Diagnostics.Type_0_must_have_a_Symbol_iterator_method_that_returns_an_iterator.code,
+            ts.Diagnostics.Type_0_must_have_a_Symbol_asyncIterator_method_that_returns_an_async_iterator.code,
+            ts.Diagnostics.Argument_of_type_0_is_not_assignable_to_parameter_of_type_1.code,
+            propertyAccessCode
+        ].concat(callableConstructableErrorCodes);
+        codefix.registerCodeFix({
+            fixIds: [fixId],
+            errorCodes: errorCodes,
+            getCodeActions: function (context) {
+                var sourceFile = context.sourceFile, errorCode = context.errorCode, span = context.span, cancellationToken = context.cancellationToken, program = context.program;
+                var expression = getAwaitableExpression(sourceFile, errorCode, span, cancellationToken, program);
+                if (!expression) {
+                    return;
+                }
+                var checker = context.program.getTypeChecker();
+                var trackChanges = function (cb) { return ts.textChanges.ChangeTracker.with(context, cb); };
+                return ts.compact([
+                    getDeclarationSiteFix(context, expression, errorCode, checker, trackChanges),
+                    getUseSiteFix(context, expression, errorCode, checker, trackChanges)
+                ]);
+            },
+            getAllCodeActions: function (context) {
+                var sourceFile = context.sourceFile, program = context.program, cancellationToken = context.cancellationToken;
+                var checker = context.program.getTypeChecker();
+                return codefix.codeFixAll(context, errorCodes, function (t, diagnostic) {
+                    var expression = getAwaitableExpression(sourceFile, diagnostic.code, diagnostic, cancellationToken, program);
+                    if (!expression) {
+                        return;
+                    }
+                    var trackChanges = function (cb) { return (cb(t), []); };
+                    return getDeclarationSiteFix(context, expression, diagnostic.code, checker, trackChanges)
+                        || getUseSiteFix(context, expression, diagnostic.code, checker, trackChanges);
+                });
+            },
+        });
+        function getDeclarationSiteFix(context, expression, errorCode, checker, trackChanges) {
+            var sourceFile = context.sourceFile;
+            var awaitableInitializer = findAwaitableInitializer(expression, sourceFile, checker);
+            if (awaitableInitializer) {
+                var initializerChanges = trackChanges(function (t) { return makeChange(t, errorCode, sourceFile, checker, awaitableInitializer); });
+                return codefix.createCodeFixActionNoFixId("addMissingAwaitToInitializer", initializerChanges, [ts.Diagnostics.Add_await_to_initializer_for_0, expression.getText(sourceFile)]);
+            }
+        }
+        function getUseSiteFix(context, expression, errorCode, checker, trackChanges) {
+            var changes = trackChanges(function (t) { return makeChange(t, errorCode, context.sourceFile, checker, expression); });
+            return codefix.createCodeFixAction(fixId, changes, ts.Diagnostics.Add_await, fixId, ts.Diagnostics.Fix_all_expressions_possibly_missing_await);
+        }
+        function isMissingAwaitError(sourceFile, errorCode, span, cancellationToken, program) {
+            var checker = program.getDiagnosticsProducingTypeChecker();
+            var diagnostics = checker.getDiagnostics(sourceFile, cancellationToken);
+            return ts.some(diagnostics, function (_a) {
+                var start = _a.start, length = _a.length, relatedInformation = _a.relatedInformation, code = _a.code;
+                return ts.isNumber(start) && ts.isNumber(length) && ts.textSpansEqual({ start: start, length: length }, span) &&
+                    code === errorCode &&
+                    !!relatedInformation &&
+                    ts.some(relatedInformation, function (related) { return related.code === ts.Diagnostics.Did_you_forget_to_use_await.code; });
+            });
+        }
+        function getAwaitableExpression(sourceFile, errorCode, span, cancellationToken, program) {
+            var token = ts.getTokenAtPosition(sourceFile, span.start);
+            // Checker has already done work to determine that await might be possible, and has attached
+            // related info to the node, so start by finding the expression that exactly matches up
+            // with the diagnostic range.
+            var expression = ts.findAncestor(token, function (node) {
+                if (node.getStart(sourceFile) < span.start || node.getEnd() > ts.textSpanEnd(span)) {
+                    return "quit";
+                }
+                return ts.isExpression(node) && ts.textSpansEqual(span, ts.createTextSpanFromNode(node, sourceFile));
+            });
+            return expression
+                && isMissingAwaitError(sourceFile, errorCode, span, cancellationToken, program)
+                && isInsideAwaitableBody(expression)
+                ? expression
+                : undefined;
+        }
+        function findAwaitableInitializer(expression, sourceFile, checker) {
+            if (!ts.isIdentifier(expression)) {
+                return;
+            }
+            var symbol = checker.getSymbolAtLocation(expression);
+            if (!symbol) {
+                return;
+            }
+            var declaration = ts.tryCast(symbol.valueDeclaration, ts.isVariableDeclaration);
+            var variableName = ts.tryCast(declaration && declaration.name, ts.isIdentifier);
+            var variableStatement = ts.getAncestor(declaration, 220 /* VariableStatement */);
+            if (!declaration || !variableStatement ||
+                declaration.type ||
+                !declaration.initializer ||
+                variableStatement.getSourceFile() !== sourceFile ||
+                ts.hasModifier(variableStatement, 1 /* Export */) ||
+                !variableName ||
+                !isInsideAwaitableBody(declaration.initializer)) {
+                return;
+            }
+            var isUsedElsewhere = ts.FindAllReferences.Core.eachSymbolReferenceInFile(variableName, checker, sourceFile, function (identifier) {
+                return identifier !== expression;
+            });
+            if (isUsedElsewhere) {
+                return;
+            }
+            return declaration.initializer;
+        }
+        function isInsideAwaitableBody(node) {
+            return node.kind & 16384 /* AwaitContext */ || !!ts.findAncestor(node, function (ancestor) {
+                return ancestor.parent && ts.isArrowFunction(ancestor.parent) && ancestor.parent.body === ancestor ||
+                    ts.isBlock(ancestor) && (ancestor.parent.kind === 240 /* FunctionDeclaration */ ||
+                        ancestor.parent.kind === 197 /* FunctionExpression */ ||
+                        ancestor.parent.kind === 198 /* ArrowFunction */ ||
+                        ancestor.parent.kind === 157 /* MethodDeclaration */);
+            });
+        }
+        function makeChange(changeTracker, errorCode, sourceFile, checker, insertionSite) {
+            if (ts.isBinaryExpression(insertionSite)) {
+                var left = insertionSite.left, right = insertionSite.right;
+                var leftType = checker.getTypeAtLocation(left);
+                var rightType = checker.getTypeAtLocation(right);
+                var newLeft = checker.getPromisedTypeOfPromise(leftType) ? ts.createAwait(left) : left;
+                var newRight = checker.getPromisedTypeOfPromise(rightType) ? ts.createAwait(right) : right;
+                changeTracker.replaceNode(sourceFile, left, newLeft);
+                changeTracker.replaceNode(sourceFile, right, newRight);
+            }
+            else if (errorCode === propertyAccessCode && ts.isPropertyAccessExpression(insertionSite.parent)) {
+                changeTracker.replaceNode(sourceFile, insertionSite.parent.expression, ts.createParen(ts.createAwait(insertionSite.parent.expression)));
+            }
+            else if (ts.contains(callableConstructableErrorCodes, errorCode) && ts.isCallOrNewExpression(insertionSite.parent)) {
+                changeTracker.replaceNode(sourceFile, insertionSite, ts.createParen(ts.createAwait(insertionSite)));
+            }
+            else {
+                changeTracker.replaceNode(sourceFile, insertionSite, ts.createAwait(insertionSite));
+            }
+        }
+    })(codefix = ts.codefix || (ts.codefix = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var codefix;
+    (function (codefix) {
+        var fixId = "addMissingConst";
+        var errorCodes = [
+            ts.Diagnostics.Cannot_find_name_0.code,
+            ts.Diagnostics.No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer.code
+        ];
+        codefix.registerCodeFix({
+            errorCodes: errorCodes,
+            getCodeActions: function (context) {
+                var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return makeChange(t, context.sourceFile, context.span.start, context.program); });
+                if (changes.length > 0) {
+                    return [codefix.createCodeFixAction(fixId, changes, ts.Diagnostics.Add_const_to_unresolved_variable, fixId, ts.Diagnostics.Add_const_to_all_unresolved_variables)];
+                }
+            },
+            fixIds: [fixId],
+            getAllCodeActions: function (context) {
+                var fixedNodes = new ts.NodeSet();
+                return codefix.codeFixAll(context, errorCodes, function (changes, diag) { return makeChange(changes, diag.file, diag.start, context.program, fixedNodes); });
+            },
+        });
+        function makeChange(changeTracker, sourceFile, pos, program, fixedNodes) {
+            var token = ts.getTokenAtPosition(sourceFile, pos);
+            var forInitializer = ts.findAncestor(token, function (node) {
+                return ts.isForInOrOfStatement(node.parent) ? node.parent.initializer === node :
+                    isPossiblyPartOfDestructuring(node) ? false : "quit";
+            });
+            if (forInitializer)
+                return applyChange(changeTracker, forInitializer, sourceFile, fixedNodes);
+            var parent = token.parent;
+            if (ts.isBinaryExpression(parent) && ts.isExpressionStatement(parent.parent)) {
+                return applyChange(changeTracker, token, sourceFile, fixedNodes);
+            }
+            if (ts.isArrayLiteralExpression(parent)) {
+                var checker_1 = program.getTypeChecker();
+                if (!ts.every(parent.elements, function (element) { return arrayElementCouldBeVariableDeclaration(element, checker_1); })) {
+                    return;
+                }
+                return applyChange(changeTracker, parent, sourceFile, fixedNodes);
+            }
+            var commaExpression = ts.findAncestor(token, function (node) {
+                return ts.isExpressionStatement(node.parent) ? true :
+                    isPossiblyPartOfCommaSeperatedInitializer(node) ? false : "quit";
+            });
+            if (commaExpression) {
+                var checker = program.getTypeChecker();
+                if (!expressionCouldBeVariableDeclaration(commaExpression, checker)) {
+                    return;
+                }
+                return applyChange(changeTracker, commaExpression, sourceFile, fixedNodes);
+            }
+        }
+        function applyChange(changeTracker, initializer, sourceFile, fixedNodes) {
+            if (!fixedNodes || fixedNodes.tryAdd(initializer)) {
+                changeTracker.insertModifierBefore(sourceFile, 78 /* ConstKeyword */, initializer);
+            }
+        }
+        function isPossiblyPartOfDestructuring(node) {
+            switch (node.kind) {
+                case 73 /* Identifier */:
+                case 188 /* ArrayLiteralExpression */:
+                case 189 /* ObjectLiteralExpression */:
+                case 276 /* PropertyAssignment */:
+                case 277 /* ShorthandPropertyAssignment */:
+                    return true;
+                default:
+                    return false;
+            }
+        }
+        function arrayElementCouldBeVariableDeclaration(expression, checker) {
+            var identifier = ts.isIdentifier(expression) ? expression :
+                ts.isAssignmentExpression(expression, /*excludeCompoundAssignment*/ true) && ts.isIdentifier(expression.left) ? expression.left :
+                    undefined;
+            return !!identifier && !checker.getSymbolAtLocation(identifier);
+        }
+        function isPossiblyPartOfCommaSeperatedInitializer(node) {
+            switch (node.kind) {
+                case 73 /* Identifier */:
+                case 205 /* BinaryExpression */:
+                case 27 /* CommaToken */:
+                    return true;
+                default:
+                    return false;
+            }
+        }
+        function expressionCouldBeVariableDeclaration(expression, checker) {
+            if (!ts.isBinaryExpression(expression)) {
+                return false;
+            }
+            if (expression.operatorToken.kind === 27 /* CommaToken */) {
+                return ts.every([expression.left, expression.right], function (expression) { return expressionCouldBeVariableDeclaration(expression, checker); });
+            }
+            return ts.isIdentifier(expression.left) && !checker.getSymbolAtLocation(expression.left);
+        }
+    })(codefix = ts.codefix || (ts.codefix = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
 (function (ts) {
     var codefix;
     (function (codefix) {
@@ -111746,11 +115673,11 @@ var ts;
         function makeChange(changeTracker, sourceFile, pos) {
             var token = ts.getTokenAtPosition(sourceFile, pos);
             if (!ts.isIdentifier(token)) {
-                return ts.Debug.fail("add-name-to-nameless-parameter operates on identifiers, but got a " + ts.formatSyntaxKind(token.kind));
+                return ts.Debug.fail("add-name-to-nameless-parameter operates on identifiers, but got a " + ts.Debug.formatSyntaxKind(token.kind));
             }
             var param = token.parent;
             if (!ts.isParameter(param)) {
-                return ts.Debug.fail("Tried to add a parameter name to a non-parameter: " + ts.formatSyntaxKind(token.kind));
+                return ts.Debug.fail("Tried to add a parameter name to a non-parameter: " + ts.Debug.formatSyntaxKind(token.kind));
             }
             var i = param.parent.parameters.indexOf(param);
             ts.Debug.assert(!param.type, "Tried to add a parameter name to a parameter that already had one.");
@@ -111832,26 +115759,26 @@ var ts;
         }
         function isDeclarationWithType(node) {
             return ts.isFunctionLikeDeclaration(node) ||
-                node.kind === 237 /* VariableDeclaration */ ||
-                node.kind === 153 /* PropertySignature */ ||
-                node.kind === 154 /* PropertyDeclaration */;
+                node.kind === 238 /* VariableDeclaration */ ||
+                node.kind === 154 /* PropertySignature */ ||
+                node.kind === 155 /* PropertyDeclaration */;
         }
         function transformJSDocType(node) {
             switch (node.kind) {
-                case 289 /* JSDocAllType */:
-                case 290 /* JSDocUnknownType */:
+                case 290 /* JSDocAllType */:
+                case 291 /* JSDocUnknownType */:
                     return ts.createTypeReferenceNode("any", ts.emptyArray);
-                case 293 /* JSDocOptionalType */:
+                case 294 /* JSDocOptionalType */:
                     return transformJSDocOptionalType(node);
-                case 292 /* JSDocNonNullableType */:
+                case 293 /* JSDocNonNullableType */:
                     return transformJSDocType(node.type);
-                case 291 /* JSDocNullableType */:
+                case 292 /* JSDocNullableType */:
                     return transformJSDocNullableType(node);
-                case 295 /* JSDocVariadicType */:
+                case 296 /* JSDocVariadicType */:
                     return transformJSDocVariadicType(node);
-                case 294 /* JSDocFunctionType */:
+                case 295 /* JSDocFunctionType */:
                     return transformJSDocFunctionType(node);
-                case 164 /* TypeReference */:
+                case 165 /* TypeReference */:
                     return transformJSDocTypeReference(node);
                 default:
                     var visited = ts.visitEachChild(node, transformJSDocType, /*context*/ undefined); // TODO: GH#18217
@@ -111873,7 +115800,7 @@ var ts;
         }
         function transformJSDocParameter(node) {
             var index = node.parent.parameters.indexOf(node);
-            var isRest = node.type.kind === 295 /* JSDocVariadicType */ && index === node.parent.parameters.length - 1; // TODO: GH#18217
+            var isRest = node.type.kind === 296 /* JSDocVariadicType */ && index === node.parent.parameters.length - 1; // TODO: GH#18217
             var name = node.name || (isRest ? "rest" : "arg" + index);
             var dotdotdot = isRest ? ts.createToken(25 /* DotDotDotToken */) : node.dotDotDotToken;
             return ts.createParameter(node.decorators, node.modifiers, dotdotdot, name, node.questionToken, ts.visitNode(node.type, transformJSDocType), node.initializer);
@@ -111913,8 +115840,8 @@ var ts;
             var index = ts.createParameter(
             /*decorators*/ undefined, 
             /*modifiers*/ undefined, 
-            /*dotDotDotToken*/ undefined, node.typeArguments[0].kind === 135 /* NumberKeyword */ ? "n" : "s", 
-            /*questionToken*/ undefined, ts.createTypeReferenceNode(node.typeArguments[0].kind === 135 /* NumberKeyword */ ? "number" : "string", []), 
+            /*dotDotDotToken*/ undefined, node.typeArguments[0].kind === 136 /* NumberKeyword */ ? "n" : "s", 
+            /*questionToken*/ undefined, ts.createTypeReferenceNode(node.typeArguments[0].kind === 136 /* NumberKeyword */ ? "number" : "string", []), 
             /*initializer*/ undefined);
             var indexSignature = ts.createTypeLiteralNode([ts.createIndexSignature(/*decorators*/ undefined, /*modifiers*/ undefined, [index], node.typeArguments[1])]);
             ts.setEmitFlags(indexSignature, 1 /* SingleLine */);
@@ -111958,6 +115885,8 @@ var ts;
             ts.Diagnostics.Property_0_implicitly_has_type_any_but_a_better_type_for_its_set_accessor_may_be_inferred_from_usage.code,
             // Property declarations
             ts.Diagnostics.Member_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage.code,
+            // Function expressions and declarations
+            ts.Diagnostics.this_implicitly_has_type_any_because_it_does_not_have_a_type_annotation.code,
         ];
         codefix.registerCodeFix({
             errorCodes: errorCodes,
@@ -111987,6 +115916,8 @@ var ts;
                 case ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type.code:
                 case ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type_but_a_better_type_may_be_inferred_from_usage.code:
                     return ts.Diagnostics.Infer_parameter_types_from_usage;
+                case ts.Diagnostics.this_implicitly_has_type_any_because_it_does_not_have_a_type_annotation.code:
+                    return ts.Diagnostics.Infer_this_type_of_0_from_usage;
                 default:
                     return ts.Diagnostics.Infer_type_of_0_from_usage;
             }
@@ -112014,7 +115945,7 @@ var ts;
             return errorCode;
         }
         function doChange(changes, sourceFile, token, errorCode, program, cancellationToken, markSeen, host) {
-            if (!ts.isParameterPropertyModifier(token.kind) && token.kind !== 72 /* Identifier */ && token.kind !== 25 /* DotDotDotToken */ && token.kind !== 100 /* ThisKeyword */) {
+            if (!ts.isParameterPropertyModifier(token.kind) && token.kind !== 73 /* Identifier */ && token.kind !== 25 /* DotDotDotToken */ && token.kind !== 101 /* ThisKeyword */) {
                 return undefined;
             }
             var parent = token.parent;
@@ -112081,6 +116012,13 @@ var ts;
                         return containingFunction;
                     }
                     return undefined;
+                // Function 'this'
+                case ts.Diagnostics.this_implicitly_has_type_any_because_it_does_not_have_a_type_annotation.code:
+                    if (ts.textChanges.isThisTypeAnnotatable(containingFunction) && markSeen(containingFunction)) {
+                        annotateThis(changes, sourceFile, containingFunction, program, host, cancellationToken);
+                        return containingFunction;
+                    }
+                    return undefined;
                 default:
                     return ts.Debug.fail(String(errorCode));
             }
@@ -112094,7 +116032,8 @@ var ts;
             if (!ts.isIdentifier(parameterDeclaration.name)) {
                 return;
             }
-            var parameterInferences = inferTypeForParametersFromUsage(containingFunction, sourceFile, program, cancellationToken) ||
+            var references = inferFunctionReferencesFromUsage(containingFunction, sourceFile, program, cancellationToken);
+            var parameterInferences = InferFromReference.inferTypeForParametersFromReferences(references, containingFunction, program, cancellationToken) ||
                 containingFunction.parameters.map(function (p) { return ({
                     declaration: p,
                     type: ts.isIdentifier(p.name) ? inferTypeForVariableFromUsage(p.name, program, cancellationToken) : program.getTypeChecker().getAnyType()
@@ -112117,6 +116056,31 @@ var ts;
                     changes.insertNodeAfter(sourceFile, ts.last(containingFunction.parameters), ts.createToken(21 /* CloseParenToken */));
             }
         }
+        function annotateThis(changes, sourceFile, containingFunction, program, host, cancellationToken) {
+            var references = inferFunctionReferencesFromUsage(containingFunction, sourceFile, program, cancellationToken);
+            if (!references) {
+                return;
+            }
+            var thisInference = InferFromReference.inferTypeForThisFromReferences(references, program, cancellationToken);
+            if (!thisInference) {
+                return;
+            }
+            var typeNode = ts.getTypeNodeIfAccessible(thisInference, containingFunction, program, host);
+            if (!typeNode) {
+                return;
+            }
+            if (ts.isInJSFile(containingFunction)) {
+                annotateJSDocThis(changes, sourceFile, containingFunction, typeNode);
+            }
+            else {
+                changes.tryInsertThisTypeAnnotation(sourceFile, containingFunction, typeNode);
+            }
+        }
+        function annotateJSDocThis(changes, sourceFile, containingFunction, typeNode) {
+            addJSDocTags(changes, sourceFile, containingFunction, [
+                ts.createJSDocThisTag(ts.createJSDocTypeExpression(typeNode)),
+            ]);
+        }
         function annotateSetAccessor(changes, sourceFile, setAccessorDeclaration, program, host, cancellationToken) {
             var param = ts.firstOrUndefined(setAccessorDeclaration.parameters);
             if (param && ts.isIdentifier(setAccessorDeclaration.name) && ts.isIdentifier(param.name)) {
@@ -112135,7 +116099,7 @@ var ts;
         function annotate(changes, sourceFile, declaration, type, program, host) {
             var typeNode = ts.getTypeNodeIfAccessible(type, declaration, program, host);
             if (typeNode) {
-                if (ts.isInJSFile(sourceFile) && declaration.kind !== 153 /* PropertySignature */) {
+                if (ts.isInJSFile(sourceFile) && declaration.kind !== 154 /* PropertySignature */) {
                     var parent = ts.isVariableDeclaration(declaration) ? ts.tryCast(declaration.parent.parent, ts.isVariableStatement) : declaration;
                     if (!parent) {
                         return;
@@ -112176,13 +116140,13 @@ var ts;
                 return !!merged;
             }); });
             var tag = ts.createJSDocComment(comments.join("\n"), ts.createNodeArray((oldTags || ts.emptyArray).concat(unmergedNewTags)));
-            var jsDocNode = parent.kind === 197 /* ArrowFunction */ ? getJsDocNodeForArrowFunction(parent) : parent;
+            var jsDocNode = parent.kind === 198 /* ArrowFunction */ ? getJsDocNodeForArrowFunction(parent) : parent;
             jsDocNode.jsDoc = parent.jsDoc;
             jsDocNode.jsDocCache = parent.jsDocCache;
             changes.insertJsdocCommentBefore(sourceFile, jsDocNode, tag);
         }
         function getJsDocNodeForArrowFunction(signature) {
-            if (signature.parent.kind === 154 /* PropertyDeclaration */) {
+            if (signature.parent.kind === 155 /* PropertyDeclaration */) {
                 return signature.parent;
             }
             return signature.parent.parent;
@@ -112192,14 +116156,14 @@ var ts;
                 return undefined;
             }
             switch (oldTag.kind) {
-                case 304 /* JSDocParameterTag */: {
+                case 306 /* JSDocParameterTag */: {
                     var oldParam = oldTag;
                     var newParam = newTag;
                     return ts.isIdentifier(oldParam.name) && ts.isIdentifier(newParam.name) && oldParam.name.escapedText === newParam.name.escapedText
                         ? ts.createJSDocParamTag(newParam.name, newParam.isBracketed, newParam.typeExpression, oldParam.comment)
                         : undefined;
                 }
-                case 305 /* JSDocReturnTag */:
+                case 307 /* JSDocReturnTag */:
                     return ts.createJSDocReturnTag(newTag.typeExpression, oldTag.comment);
             }
         }
@@ -112215,27 +116179,28 @@ var ts;
             var types = InferFromReference.inferTypesFromReferences(references, checker, cancellationToken);
             return InferFromReference.unifyFromContext(types, checker);
         }
-        function inferTypeForParametersFromUsage(containingFunction, sourceFile, program, cancellationToken) {
+        function inferFunctionReferencesFromUsage(containingFunction, sourceFile, program, cancellationToken) {
             var searchToken;
             switch (containingFunction.kind) {
-                case 157 /* Constructor */:
-                    searchToken = ts.findChildOfKind(containingFunction, 124 /* ConstructorKeyword */, sourceFile);
+                case 158 /* Constructor */:
+                    searchToken = ts.findChildOfKind(containingFunction, 125 /* ConstructorKeyword */, sourceFile);
                     break;
-                case 197 /* ArrowFunction */:
-                case 196 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
+                case 197 /* FunctionExpression */:
                     var parent = containingFunction.parent;
                     searchToken = ts.isVariableDeclaration(parent) && ts.isIdentifier(parent.name) ?
                         parent.name :
                         containingFunction.name;
                     break;
-                case 239 /* FunctionDeclaration */:
-                case 156 /* MethodDeclaration */:
+                case 240 /* FunctionDeclaration */:
+                case 157 /* MethodDeclaration */:
                     searchToken = containingFunction.name;
                     break;
             }
-            if (searchToken) {
-                return InferFromReference.inferTypeForParametersFromReferences(getReferences(searchToken, program, cancellationToken), containingFunction, program, cancellationToken);
+            if (!searchToken) {
+                return undefined;
             }
+            return getReferences(searchToken, program, cancellationToken);
         }
         var InferFromReference;
         (function (InferFromReference) {
@@ -112250,13 +116215,10 @@ var ts;
             }
             InferFromReference.inferTypesFromReferences = inferTypesFromReferences;
             function inferTypeForParametersFromReferences(references, declaration, program, cancellationToken) {
+                if (references === undefined || references.length === 0 || !declaration.parameters) {
+                    return undefined;
+                }
                 var checker = program.getTypeChecker();
-                if (references.length === 0) {
-                    return undefined;
-                }
-                if (!declaration.parameters) {
-                    return undefined;
-                }
                 var usageContext = {};
                 for (var _i = 0, references_3 = references; _i < references_3.length; _i++) {
                     var reference = references_3[_i];
@@ -112296,26 +116258,40 @@ var ts;
                 });
             }
             InferFromReference.inferTypeForParametersFromReferences = inferTypeForParametersFromReferences;
+            function inferTypeForThisFromReferences(references, program, cancellationToken) {
+                if (references.length === 0) {
+                    return undefined;
+                }
+                var checker = program.getTypeChecker();
+                var usageContext = {};
+                for (var _i = 0, references_4 = references; _i < references_4.length; _i++) {
+                    var reference = references_4[_i];
+                    cancellationToken.throwIfCancellationRequested();
+                    inferTypeFromContext(reference, checker, usageContext);
+                }
+                return unifyFromContext(usageContext.candidateThisTypes || ts.emptyArray, checker);
+            }
+            InferFromReference.inferTypeForThisFromReferences = inferTypeForThisFromReferences;
             function inferTypeFromContext(node, checker, usageContext) {
                 while (ts.isRightSideOfQualifiedNameOrPropertyAccess(node)) {
                     node = node.parent;
                 }
                 switch (node.parent.kind) {
-                    case 203 /* PostfixUnaryExpression */:
+                    case 204 /* PostfixUnaryExpression */:
                         usageContext.isNumber = true;
                         break;
-                    case 202 /* PrefixUnaryExpression */:
+                    case 203 /* PrefixUnaryExpression */:
                         inferTypeFromPrefixUnaryExpressionContext(node.parent, usageContext);
                         break;
-                    case 204 /* BinaryExpression */:
+                    case 205 /* BinaryExpression */:
                         inferTypeFromBinaryExpressionContext(node, node.parent, checker, usageContext);
                         break;
-                    case 271 /* CaseClause */:
-                    case 272 /* DefaultClause */:
+                    case 272 /* CaseClause */:
+                    case 273 /* DefaultClause */:
                         inferTypeFromSwitchStatementLabelContext(node.parent, checker, usageContext);
                         break;
-                    case 191 /* CallExpression */:
-                    case 192 /* NewExpression */:
+                    case 192 /* CallExpression */:
+                    case 193 /* NewExpression */:
                         if (node.parent.expression === node) {
                             inferTypeFromCallExpressionContext(node.parent, checker, usageContext);
                         }
@@ -112323,13 +116299,20 @@ var ts;
                             inferTypeFromContextualType(node, checker, usageContext);
                         }
                         break;
-                    case 189 /* PropertyAccessExpression */:
+                    case 190 /* PropertyAccessExpression */:
                         inferTypeFromPropertyAccessExpressionContext(node.parent, checker, usageContext);
                         break;
-                    case 190 /* ElementAccessExpression */:
+                    case 191 /* ElementAccessExpression */:
                         inferTypeFromPropertyElementExpressionContext(node.parent, node, checker, usageContext);
                         break;
-                    case 237 /* VariableDeclaration */: {
+                    case 276 /* PropertyAssignment */:
+                    case 277 /* ShorthandPropertyAssignment */:
+                        inferTypeFromPropertyAssignment(node.parent, checker, usageContext);
+                        break;
+                    case 155 /* PropertyDeclaration */:
+                        inferTypeFromPropertyDeclaration(node.parent, checker, usageContext);
+                        break;
+                    case 238 /* VariableDeclaration */: {
                         var _a = node.parent, name = _a.name, initializer = _a.initializer;
                         if (node === name) {
                             if (initializer) { // This can happen for `let x = null;` which still has an implicit-any error.
@@ -112380,17 +116363,17 @@ var ts;
                     case 50 /* BarToken */:
                     case 51 /* CaretToken */:
                     // CompoundAssignmentOperator
-                    case 61 /* MinusEqualsToken */:
-                    case 63 /* AsteriskAsteriskEqualsToken */:
-                    case 62 /* AsteriskEqualsToken */:
-                    case 64 /* SlashEqualsToken */:
-                    case 65 /* PercentEqualsToken */:
-                    case 69 /* AmpersandEqualsToken */:
-                    case 70 /* BarEqualsToken */:
-                    case 71 /* CaretEqualsToken */:
-                    case 66 /* LessThanLessThanEqualsToken */:
-                    case 68 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
-                    case 67 /* GreaterThanGreaterThanEqualsToken */:
+                    case 62 /* MinusEqualsToken */:
+                    case 64 /* AsteriskAsteriskEqualsToken */:
+                    case 63 /* AsteriskEqualsToken */:
+                    case 65 /* SlashEqualsToken */:
+                    case 66 /* PercentEqualsToken */:
+                    case 70 /* AmpersandEqualsToken */:
+                    case 71 /* BarEqualsToken */:
+                    case 72 /* CaretEqualsToken */:
+                    case 67 /* LessThanLessThanEqualsToken */:
+                    case 69 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
+                    case 68 /* GreaterThanGreaterThanEqualsToken */:
                     // AdditiveOperator
                     case 39 /* MinusToken */:
                     // RelationalOperator
@@ -112406,7 +116389,7 @@ var ts;
                             usageContext.isNumber = true;
                         }
                         break;
-                    case 60 /* PlusEqualsToken */:
+                    case 61 /* PlusEqualsToken */:
                     case 38 /* PlusToken */:
                         var otherOperandType = checker.getTypeAtLocation(parent.left === node ? parent.right : parent.left);
                         if (otherOperandType.flags & 1056 /* EnumLike */) {
@@ -112423,14 +116406,14 @@ var ts;
                         }
                         break;
                     //  AssignmentOperators
-                    case 59 /* EqualsToken */:
+                    case 60 /* EqualsToken */:
                     case 33 /* EqualsEqualsToken */:
                     case 35 /* EqualsEqualsEqualsToken */:
                     case 36 /* ExclamationEqualsEqualsToken */:
                     case 34 /* ExclamationEqualsToken */:
                         addCandidateType(usageContext, checker.getTypeAtLocation(parent.left === node ? parent.right : parent.left));
                         break;
-                    case 93 /* InKeyword */:
+                    case 94 /* InKeyword */:
                         if (node === parent.left) {
                             usageContext.isString = true;
                         }
@@ -112438,7 +116421,7 @@ var ts;
                     // LogicalOperator
                     case 55 /* BarBarToken */:
                         if (node === parent.left &&
-                            (node.parent.parent.kind === 237 /* VariableDeclaration */ || ts.isAssignmentExpression(node.parent.parent, /*excludeCompoundAssignment*/ true))) {
+                            (node.parent.parent.kind === 238 /* VariableDeclaration */ || ts.isAssignmentExpression(node.parent.parent, /*excludeCompoundAssignment*/ true))) {
                             // var x = x || {};
                             // TODO: use getFalsyflagsOfType
                             addCandidateType(usageContext, checker.getTypeAtLocation(parent.right));
@@ -112446,7 +116429,7 @@ var ts;
                         break;
                     case 54 /* AmpersandAmpersandToken */:
                     case 27 /* CommaToken */:
-                    case 94 /* InstanceOfKeyword */:
+                    case 95 /* InstanceOfKeyword */:
                         // nothing to infer here
                         break;
                 }
@@ -112466,7 +116449,7 @@ var ts;
                     }
                 }
                 inferTypeFromContext(parent, checker, callContext.returnType);
-                if (parent.kind === 191 /* CallExpression */) {
+                if (parent.kind === 192 /* CallExpression */) {
                     (usageContext.callContexts || (usageContext.callContexts = [])).push(callContext);
                 }
                 else {
@@ -112499,6 +116482,18 @@ var ts;
                     }
                 }
             }
+            function inferTypeFromPropertyAssignment(assignment, checker, usageContext) {
+                var objectLiteral = ts.isShorthandPropertyAssignment(assignment) ?
+                    assignment.parent :
+                    assignment.parent.parent;
+                var nodeWithRealType = ts.isVariableDeclaration(objectLiteral.parent) ?
+                    objectLiteral.parent :
+                    objectLiteral;
+                addCandidateThisType(usageContext, checker.getTypeAtLocation(nodeWithRealType));
+            }
+            function inferTypeFromPropertyDeclaration(declaration, checker, usageContext) {
+                addCandidateThisType(usageContext, checker.getTypeAtLocation(declaration.parent));
+            }
             function removeLowPriorityInferences(inferences, priorities) {
                 var toRemove = [];
                 for (var _i = 0, inferences_1 = inferences; _i < inferences_1.length; _i++) {
@@ -112674,6 +116669,11 @@ var ts;
                     (context.candidateTypes || (context.candidateTypes = [])).push(type);
                 }
             }
+            function addCandidateThisType(context, type) {
+                if (type && !(type.flags & 1 /* Any */) && !(type.flags & 131072 /* Never */)) {
+                    (context.candidateThisTypes || (context.candidateThisTypes = [])).push(type);
+                }
+            }
             function hasCallContext(usageContext) {
                 return !!usageContext && !!usageContext.callContexts;
             }
@@ -112706,12 +116706,12 @@ var ts;
             var precedingNode;
             var newClassDeclaration;
             switch (ctorDeclaration.kind) {
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     precedingNode = ctorDeclaration;
                     changes.delete(sourceFile, ctorDeclaration);
                     newClassDeclaration = createClassFromFunctionDeclaration(ctorDeclaration);
                     break;
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     precedingNode = ctorDeclaration.parent.parent;
                     newClassDeclaration = createClassFromVariableDeclaration(ctorDeclaration);
                     if (ctorDeclaration.parent.declarations.length === 1) {
@@ -112743,7 +116743,7 @@ var ts;
                 // all static members are stored in the "exports" array of symbol
                 if (symbol.exports) {
                     symbol.exports.forEach(function (member) {
-                        var memberElement = createClassElement(member, [ts.createToken(116 /* StaticKeyword */)]);
+                        var memberElement = createClassElement(member, [ts.createToken(117 /* StaticKeyword */)]);
                         if (memberElement) {
                             memberElements.push(memberElement);
                         }
@@ -112766,7 +116766,7 @@ var ts;
                         return;
                     }
                     // delete the entire statement if this expression is the sole expression to take care of the semicolon at the end
-                    var nodeToDelete = assignmentBinaryExpression.parent && assignmentBinaryExpression.parent.kind === 221 /* ExpressionStatement */
+                    var nodeToDelete = assignmentBinaryExpression.parent && assignmentBinaryExpression.parent.kind === 222 /* ExpressionStatement */
                         ? assignmentBinaryExpression.parent : assignmentBinaryExpression;
                     changes.delete(sourceFile, nodeToDelete);
                     if (!assignmentBinaryExpression.right) {
@@ -112774,27 +116774,27 @@ var ts;
                         /*type*/ undefined, /*initializer*/ undefined);
                     }
                     switch (assignmentBinaryExpression.right.kind) {
-                        case 196 /* FunctionExpression */: {
+                        case 197 /* FunctionExpression */: {
                             var functionExpression = assignmentBinaryExpression.right;
-                            var fullModifiers = ts.concatenate(modifiers, getModifierKindFromSource(functionExpression, 121 /* AsyncKeyword */));
+                            var fullModifiers = ts.concatenate(modifiers, getModifierKindFromSource(functionExpression, 122 /* AsyncKeyword */));
                             var method = ts.createMethod(/*decorators*/ undefined, fullModifiers, /*asteriskToken*/ undefined, memberDeclaration.name, /*questionToken*/ undefined, 
                             /*typeParameters*/ undefined, functionExpression.parameters, /*type*/ undefined, functionExpression.body);
                             ts.copyLeadingComments(assignmentBinaryExpression, method, sourceFile);
                             return method;
                         }
-                        case 197 /* ArrowFunction */: {
+                        case 198 /* ArrowFunction */: {
                             var arrowFunction = assignmentBinaryExpression.right;
                             var arrowFunctionBody = arrowFunction.body;
                             var bodyBlock = void 0;
                             // case 1: () => { return [1,2,3] }
-                            if (arrowFunctionBody.kind === 218 /* Block */) {
+                            if (arrowFunctionBody.kind === 219 /* Block */) {
                                 bodyBlock = arrowFunctionBody;
                             }
                             // case 2: () => [1,2,3]
                             else {
                                 bodyBlock = ts.createBlock([ts.createReturn(arrowFunctionBody)]);
                             }
-                            var fullModifiers = ts.concatenate(modifiers, getModifierKindFromSource(arrowFunction, 121 /* AsyncKeyword */));
+                            var fullModifiers = ts.concatenate(modifiers, getModifierKindFromSource(arrowFunction, 122 /* AsyncKeyword */));
                             var method = ts.createMethod(/*decorators*/ undefined, fullModifiers, /*asteriskToken*/ undefined, memberDeclaration.name, /*questionToken*/ undefined, 
                             /*typeParameters*/ undefined, arrowFunction.parameters, /*type*/ undefined, bodyBlock);
                             ts.copyLeadingComments(assignmentBinaryExpression, method, sourceFile);
@@ -112815,17 +116815,17 @@ var ts;
             }
             function createClassFromVariableDeclaration(node) {
                 var initializer = node.initializer;
-                if (!initializer || initializer.kind !== 196 /* FunctionExpression */) {
+                if (!initializer || initializer.kind !== 197 /* FunctionExpression */) {
                     return undefined;
                 }
-                if (node.name.kind !== 72 /* Identifier */) {
+                if (node.name.kind !== 73 /* Identifier */) {
                     return undefined;
                 }
                 var memberElements = createClassElementsFromSymbol(node.symbol);
                 if (initializer.body) {
                     memberElements.unshift(ts.createConstructor(/*decorators*/ undefined, /*modifiers*/ undefined, initializer.parameters, initializer.body));
                 }
-                var modifiers = getModifierKindFromSource(precedingNode, 85 /* ExportKeyword */);
+                var modifiers = getModifierKindFromSource(precedingNode, 86 /* ExportKeyword */);
                 var cls = ts.createClassDeclaration(/*decorators*/ undefined, modifiers, node.name, 
                 /*typeParameters*/ undefined, /*heritageClauses*/ undefined, memberElements);
                 // Don't call copyComments here because we'll already leave them in place
@@ -112836,7 +116836,7 @@ var ts;
                 if (node.body) {
                     memberElements.unshift(ts.createConstructor(/*decorators*/ undefined, /*modifiers*/ undefined, node.parameters, node.body));
                 }
-                var modifiers = getModifierKindFromSource(node, 85 /* ExportKeyword */);
+                var modifiers = getModifierKindFromSource(node, 86 /* ExportKeyword */);
                 var cls = ts.createClassDeclaration(/*decorators*/ undefined, modifiers, node.name, 
                 /*typeParameters*/ undefined, /*heritageClauses*/ undefined, memberElements);
                 // Don't call copyComments here because we'll already leave them in place
@@ -112866,6 +116866,11 @@ var ts;
             fixIds: [fixId],
             getAllCodeActions: function (context) { return codefix.codeFixAll(context, errorCodes, function (changes, err) { return convertToAsyncFunction(changes, err.file, err.start, context.program.getTypeChecker(), context); }); },
         });
+        var SynthBindingNameKind;
+        (function (SynthBindingNameKind) {
+            SynthBindingNameKind[SynthBindingNameKind["Identifier"] = 0] = "Identifier";
+            SynthBindingNameKind[SynthBindingNameKind["BindingPattern"] = 1] = "BindingPattern";
+        })(SynthBindingNameKind || (SynthBindingNameKind = {}));
         function convertToAsyncFunction(changes, sourceFile, position, checker, context) {
             // get the function declaration - returns a promise
             var tokenAtPosition = ts.getTokenAtPosition(sourceFile, position);
@@ -112894,7 +116899,7 @@ var ts;
                 return;
             }
             // add the async keyword
-            changes.insertLastModifierBefore(sourceFile, 121 /* AsyncKeyword */, functionToConvert);
+            changes.insertLastModifierBefore(sourceFile, 122 /* AsyncKeyword */, functionToConvert);
             function startTransformation(node, nodeToReplace) {
                 var newNodes = transformExpression(node, transformer, node);
                 changes.replaceNodeWithNodes(sourceFile, nodeToReplace, newNodes);
@@ -113002,8 +117007,8 @@ var ts;
                         allVarNames.push({ identifier: synthName.identifier, symbol: symbol });
                         addNameToFrequencyMap(collidingSymbolMap, ident.text, symbol);
                     }
-                    // we only care about identifiers that are parameters and declarations (don't care about other uses)
-                    else if (node.parent && (ts.isParameter(node.parent) || ts.isVariableDeclaration(node.parent))) {
+                    // we only care about identifiers that are parameters, declarations, or binding elements (don't care about other uses)
+                    else if (node.parent && (ts.isParameter(node.parent) || ts.isVariableDeclaration(node.parent) || ts.isBindingElement(node.parent))) {
                         var originalName = node.text;
                         var collidingSymbols = collidingSymbolMap.get(originalName);
                         // if the identifier name conflicts with a different identifier that we've already seen
@@ -113017,7 +117022,7 @@ var ts;
                         else {
                             var identifier = ts.getSynthesizedDeepClone(node);
                             identsToRenameMap.set(symbolIdString, identifier);
-                            synthNamesMap.set(symbolIdString, { identifier: identifier, types: [], numberOfAssignmentsOriginal: allVarNames.filter(function (elem) { return elem.identifier.text === node.text; }).length /*, numberOfAssignmentsSynthesized: 0*/ });
+                            synthNamesMap.set(symbolIdString, createSynthIdentifier(identifier, [], allVarNames.filter(function (elem) { return elem.identifier.text === node.text; }).length /*, numberOfAssignmentsSynthesized: 0*/));
                             if ((ts.isParameter(node.parent) && isExpressionOrCallOnTypePromise(node.parent.parent)) || ts.isVariableDeclaration(node.parent)) {
                                 allVarNames.push({ identifier: identifier, symbol: symbol });
                                 addNameToFrequencyMap(collidingSymbolMap, originalName, symbol);
@@ -113065,7 +117070,7 @@ var ts;
             var numVarsSameName = (originalNames.get(name.text) || ts.emptyArray).length;
             var numberOfAssignmentsOriginal = 0;
             var identifier = numVarsSameName === 0 ? name : ts.createIdentifier(name.text + "_" + numVarsSameName);
-            return { identifier: identifier, types: [], numberOfAssignmentsOriginal: numberOfAssignmentsOriginal };
+            return createSynthIdentifier(identifier, [], numberOfAssignmentsOriginal);
         }
         // dispatch function to recursively build the refactoring
         // should be kept up to date with isFixablePromiseHandler in suggestionDiagnostics.ts
@@ -113092,68 +117097,90 @@ var ts;
         }
         function transformCatch(node, transformer, prevArgName) {
             var func = node.arguments[0];
-            var argName = getArgName(func, transformer);
+            var argName = getArgBindingName(func, transformer);
             var shouldReturn = transformer.setOfExpressionsToReturn.get(ts.getNodeId(node).toString());
+            var possibleNameForVarDecl;
             /*
                 If there is another call in the chain after the .catch() we are transforming, we will need to save the result of both paths (try block and catch block)
                 To do this, we will need to synthesize a variable that we were not aware of while we were adding identifiers to the synthNamesMap
                 We will use the prevArgName and then update the synthNamesMap with a new variable name for the next transformation step
             */
             if (prevArgName && !shouldReturn) {
-                prevArgName.numberOfAssignmentsOriginal = 2; // Try block and catch block
-                transformer.synthNamesMap.forEach(function (val, key) {
-                    if (val.identifier.text === prevArgName.identifier.text) {
-                        var newSynthName = createUniqueSynthName(prevArgName);
-                        transformer.synthNamesMap.set(key, newSynthName);
-                    }
-                });
+                if (isSynthIdentifier(prevArgName)) {
+                    possibleNameForVarDecl = prevArgName;
+                    transformer.synthNamesMap.forEach(function (val, key) {
+                        if (val.identifier.text === prevArgName.identifier.text) {
+                            var newSynthName = createUniqueSynthName(prevArgName);
+                            transformer.synthNamesMap.set(key, newSynthName);
+                        }
+                    });
+                }
+                else {
+                    possibleNameForVarDecl = createSynthIdentifier(ts.createOptimisticUniqueName("result"), prevArgName.types);
+                }
+                possibleNameForVarDecl.numberOfAssignmentsOriginal = 2; // Try block and catch block
                 // update the constIdentifiers list
-                if (transformer.constIdentifiers.some(function (elem) { return elem.text === prevArgName.identifier.text; })) {
-                    transformer.constIdentifiers.push(createUniqueSynthName(prevArgName).identifier);
+                if (transformer.constIdentifiers.some(function (elem) { return elem.text === possibleNameForVarDecl.identifier.text; })) {
+                    transformer.constIdentifiers.push(createUniqueSynthName(possibleNameForVarDecl).identifier);
                 }
             }
-            var tryBlock = ts.createBlock(transformExpression(node.expression, transformer, node, prevArgName));
-            var transformationBody = getTransformationBody(func, prevArgName, argName, node, transformer);
-            var catchArg = argName ? argName.identifier.text : "e";
-            var catchClause = ts.createCatchClause(catchArg, ts.createBlock(transformationBody));
+            var tryBlock = ts.createBlock(transformExpression(node.expression, transformer, node, possibleNameForVarDecl));
+            var transformationBody = getTransformationBody(func, possibleNameForVarDecl, argName, node, transformer);
+            var catchArg = argName ? isSynthIdentifier(argName) ? argName.identifier.text : argName.bindingPattern : "e";
+            var catchVariableDeclaration = ts.createVariableDeclaration(catchArg);
+            var catchClause = ts.createCatchClause(catchVariableDeclaration, ts.createBlock(transformationBody));
             /*
                 In order to avoid an implicit any, we will synthesize a type for the declaration using the unions of the types of both paths (try block and catch block)
             */
             var varDeclList;
-            if (prevArgName && !shouldReturn) {
-                var typeArray = prevArgName.types;
+            var varDeclIdentifier;
+            if (possibleNameForVarDecl && !shouldReturn) {
+                varDeclIdentifier = ts.getSynthesizedDeepClone(possibleNameForVarDecl.identifier);
+                var typeArray = possibleNameForVarDecl.types;
                 var unionType = transformer.checker.getUnionType(typeArray, 2 /* Subtype */);
                 var unionTypeNode = transformer.isInJSFile ? undefined : transformer.checker.typeToTypeNode(unionType);
-                var varDecl = [ts.createVariableDeclaration(ts.getSynthesizedDeepClone(prevArgName.identifier), unionTypeNode)];
+                var varDecl = [ts.createVariableDeclaration(varDeclIdentifier, unionTypeNode)];
                 varDeclList = ts.createVariableStatement(/*modifiers*/ undefined, ts.createVariableDeclarationList(varDecl, 1 /* Let */));
             }
             var tryStatement = ts.createTry(tryBlock, catchClause, /*finallyBlock*/ undefined);
-            return varDeclList ? [varDeclList, tryStatement] : [tryStatement];
+            var destructuredResult = prevArgName && varDeclIdentifier && isSynthBindingPattern(prevArgName)
+                && ts.createVariableStatement(/* modifiers */ undefined, ts.createVariableDeclarationList([ts.createVariableDeclaration(ts.getSynthesizedDeepCloneWithRenames(prevArgName.bindingPattern), /* type */ undefined, varDeclIdentifier)], 2 /* Const */));
+            return ts.compact([varDeclList, tryStatement, destructuredResult]);
+        }
+        function getIdentifierTextsFromBindingName(bindingName) {
+            if (ts.isIdentifier(bindingName))
+                return [bindingName.text];
+            return ts.flatMap(bindingName.elements, function (element) {
+                if (ts.isOmittedExpression(element))
+                    return [];
+                return getIdentifierTextsFromBindingName(element.name);
+            });
         }
         function createUniqueSynthName(prevArgName) {
             var renamedPrevArg = ts.createOptimisticUniqueName(prevArgName.identifier.text);
-            var newSynthName = { identifier: renamedPrevArg, types: [], numberOfAssignmentsOriginal: 0 };
-            return newSynthName;
+            return createSynthIdentifier(renamedPrevArg);
         }
         function transformThen(node, transformer, outermostParent, prevArgName) {
             var _a = node.arguments, res = _a[0], rej = _a[1];
             if (!res) {
                 return transformExpression(node.expression, transformer, outermostParent);
             }
-            var argNameRes = getArgName(res, transformer);
+            var argNameRes = getArgBindingName(res, transformer);
             var transformationBody = getTransformationBody(res, prevArgName, argNameRes, node, transformer);
             if (rej) {
-                var argNameRej = getArgName(rej, transformer);
+                var argNameRej = getArgBindingName(rej, transformer);
                 var tryBlock = ts.createBlock(transformExpression(node.expression, transformer, node, argNameRes).concat(transformationBody));
                 var transformationBody2 = getTransformationBody(rej, prevArgName, argNameRej, node, transformer);
-                var catchArg = argNameRej ? argNameRej.identifier.text : "e";
-                var catchClause = ts.createCatchClause(catchArg, ts.createBlock(transformationBody2));
+                var catchArg = argNameRej ? isSynthIdentifier(argNameRej) ? argNameRej.identifier.text : argNameRej.bindingPattern : "e";
+                var catchVariableDeclaration = ts.createVariableDeclaration(catchArg);
+                var catchClause = ts.createCatchClause(catchVariableDeclaration, ts.createBlock(transformationBody2));
                 return [ts.createTry(tryBlock, catchClause, /* finallyBlock */ undefined)];
             }
             return transformExpression(node.expression, transformer, node, argNameRes).concat(transformationBody);
         }
-        function getFlagOfIdentifier(node, constIdentifiers) {
-            var inArr = constIdentifiers.some(function (elem) { return elem.text === node.text; });
+        function getFlagOfBindingName(bindingName, constIdentifiers) {
+            var identifiers = getIdentifierTextsFromBindingName(getNode(bindingName));
+            var inArr = constIdentifiers.some(function (elem) { return ts.contains(identifiers, elem.text); });
             return inArr ? 2 /* Const */ : 1 /* Let */;
         }
         function transformPromiseCall(node, transformer, prevArgName) {
@@ -113169,29 +117196,29 @@ var ts;
             return [ts.createReturn(ts.getSynthesizedDeepClone(node))];
         }
         function createTransformedStatement(prevArgName, rightHandSide, transformer) {
-            if (!prevArgName || prevArgName.identifier.text.length === 0) {
+            if (!prevArgName || isEmpty(prevArgName)) {
                 // if there's no argName to assign to, there still might be side effects
                 return [ts.createStatement(rightHandSide)];
             }
-            if (prevArgName.types.length < prevArgName.numberOfAssignmentsOriginal) {
+            if (isSynthIdentifier(prevArgName) && prevArgName.types.length < prevArgName.numberOfAssignmentsOriginal) {
                 // if the variable has already been declared, we don't need "let" or "const"
                 return [ts.createStatement(ts.createAssignment(ts.getSynthesizedDeepClone(prevArgName.identifier), rightHandSide))];
             }
-            return [ts.createVariableStatement(/*modifiers*/ undefined, (ts.createVariableDeclarationList([ts.createVariableDeclaration(ts.getSynthesizedDeepClone(prevArgName.identifier), /*type*/ undefined, rightHandSide)], getFlagOfIdentifier(prevArgName.identifier, transformer.constIdentifiers))))];
+            return [ts.createVariableStatement(/*modifiers*/ undefined, (ts.createVariableDeclarationList([ts.createVariableDeclaration(ts.getSynthesizedDeepClone(getNode(prevArgName)), /*type*/ undefined, rightHandSide)], getFlagOfBindingName(prevArgName, transformer.constIdentifiers))))];
         }
         // should be kept up to date with isFixablePromiseArgument in suggestionDiagnostics.ts
         function getTransformationBody(func, prevArgName, argName, parent, transformer) {
             var shouldReturn = transformer.setOfExpressionsToReturn.get(ts.getNodeId(parent).toString());
             switch (func.kind) {
-                case 96 /* NullKeyword */:
+                case 97 /* NullKeyword */:
                     // do not produce a transformed statement for a null argument
                     break;
-                case 72 /* Identifier */: // identifier includes undefined
+                case 73 /* Identifier */: // identifier includes undefined
                     if (!argName) {
                         // undefined was argument passed to promise handler
                         break;
                     }
-                    var synthCall = ts.createCall(ts.getSynthesizedDeepClone(func), /*typeArguments*/ undefined, [argName.identifier]);
+                    var synthCall = ts.createCall(ts.getSynthesizedDeepClone(func), /*typeArguments*/ undefined, isSynthIdentifier(argName) ? [argName.identifier] : []);
                     if (shouldReturn) {
                         return [ts.createReturn(synthCall)];
                     }
@@ -113208,8 +117235,8 @@ var ts;
                         prevArgName.types.push(returnType);
                     }
                     return varDeclOrAssignment;
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */: {
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */: {
                     var funcBody = func.body;
                     // Arrow functions with block bodies { } will enter this control flow
                     if (ts.isBlock(funcBody)) {
@@ -113228,7 +117255,7 @@ var ts;
                             }
                         }
                         return shouldReturn ? refactoredStmts.map(function (s) { return ts.getSynthesizedDeepClone(s); }) :
-                            removeReturns(refactoredStmts, prevArgName === undefined ? undefined : prevArgName.identifier, transformer, seenReturnStatement);
+                            removeReturns(refactoredStmts, prevArgName, transformer, seenReturnStatement);
                     }
                     else {
                         var innerRetStmts = ts.isFixablePromiseHandler(funcBody) ? [ts.createReturn(funcBody)] : ts.emptyArray;
@@ -113274,7 +117301,7 @@ var ts;
                             ret.push(ts.createExpressionStatement(possiblyAwaitedExpression));
                         }
                         else {
-                            ret.push(ts.createVariableStatement(/*modifiers*/ undefined, (ts.createVariableDeclarationList([ts.createVariableDeclaration(prevArgName, /*type*/ undefined, possiblyAwaitedExpression)], getFlagOfIdentifier(prevArgName, transformer.constIdentifiers)))));
+                            ret.push(ts.createVariableStatement(/*modifiers*/ undefined, (ts.createVariableDeclarationList([ts.createVariableDeclaration(getNode(prevArgName), /*type*/ undefined, possiblyAwaitedExpression)], getFlagOfBindingName(prevArgName, transformer.constIdentifiers)))));
                         }
                     }
                 }
@@ -113284,7 +117311,7 @@ var ts;
             }
             // if block has no return statement, need to define prevArgName as undefined to prevent undeclared variables
             if (!seenReturnStatement && prevArgName !== undefined) {
-                ret.push(ts.createVariableStatement(/*modifiers*/ undefined, (ts.createVariableDeclarationList([ts.createVariableDeclaration(prevArgName, /*type*/ undefined, ts.createIdentifier("undefined"))], getFlagOfIdentifier(prevArgName, transformer.constIdentifiers)))));
+                ret.push(ts.createVariableStatement(/*modifiers*/ undefined, (ts.createVariableDeclarationList([ts.createVariableDeclaration(getNode(prevArgName), /*type*/ undefined, ts.createIdentifier("undefined"))], getFlagOfBindingName(prevArgName, transformer.constIdentifiers)))));
             }
             return ret;
         }
@@ -113307,32 +117334,42 @@ var ts;
             }
             return innerCbBody;
         }
-        function getArgName(funcNode, transformer) {
+        function getArgBindingName(funcNode, transformer) {
             var numberOfAssignmentsOriginal = 0;
             var types = [];
             var name;
             if (ts.isFunctionLikeDeclaration(funcNode)) {
                 if (funcNode.parameters.length > 0) {
                     var param = funcNode.parameters[0].name;
-                    name = getMapEntryOrDefault(param);
+                    name = getMappedBindingNameOrDefault(param);
                 }
             }
             else if (ts.isIdentifier(funcNode)) {
                 name = getMapEntryOrDefault(funcNode);
             }
             // return undefined argName when arg is null or undefined
-            if (!name || name.identifier.text === "undefined") {
+            if (!name || "identifier" in name && name.identifier.text === "undefined") {
                 return undefined;
             }
             return name;
+            function getMappedBindingNameOrDefault(bindingName) {
+                if (ts.isIdentifier(bindingName))
+                    return getMapEntryOrDefault(bindingName);
+                var elements = ts.flatMap(bindingName.elements, function (element) {
+                    if (ts.isOmittedExpression(element))
+                        return [];
+                    return [getMappedBindingNameOrDefault(element.name)];
+                });
+                return createSynthBindingPattern(bindingName, elements);
+            }
             function getMapEntryOrDefault(identifier) {
                 var originalNode = getOriginalNode(identifier);
                 var symbol = getSymbol(originalNode);
                 if (!symbol) {
-                    return { identifier: identifier, types: types, numberOfAssignmentsOriginal: numberOfAssignmentsOriginal };
+                    return createSynthIdentifier(identifier, types, numberOfAssignmentsOriginal);
                 }
                 var mapEntry = transformer.synthNamesMap.get(ts.getSymbolId(symbol).toString());
-                return mapEntry || { identifier: identifier, types: types, numberOfAssignmentsOriginal: numberOfAssignmentsOriginal };
+                return mapEntry || createSynthIdentifier(identifier, types, numberOfAssignmentsOriginal);
             }
             function getSymbol(node) {
                 return node.symbol ? node.symbol : transformer.checker.getSymbolAtLocation(node);
@@ -113341,6 +117378,34 @@ var ts;
                 return node.original ? node.original : node;
             }
         }
+        function isEmpty(bindingName) {
+            if (!bindingName) {
+                return true;
+            }
+            if (isSynthIdentifier(bindingName)) {
+                return !bindingName.identifier.text;
+            }
+            return ts.every(bindingName.elements, isEmpty);
+        }
+        function getNode(bindingName) {
+            return isSynthIdentifier(bindingName) ? bindingName.identifier : bindingName.bindingPattern;
+        }
+        function createSynthIdentifier(identifier, types, numberOfAssignmentsOriginal) {
+            if (types === void 0) { types = []; }
+            if (numberOfAssignmentsOriginal === void 0) { numberOfAssignmentsOriginal = 0; }
+            return { kind: 0 /* Identifier */, identifier: identifier, types: types, numberOfAssignmentsOriginal: numberOfAssignmentsOriginal };
+        }
+        function createSynthBindingPattern(bindingPattern, elements, types) {
+            if (elements === void 0) { elements = ts.emptyArray; }
+            if (types === void 0) { types = []; }
+            return { kind: 1 /* BindingPattern */, bindingPattern: bindingPattern, elements: elements, types: types };
+        }
+        function isSynthIdentifier(bindingName) {
+            return bindingName.kind === 0 /* Identifier */;
+        }
+        function isSynthBindingPattern(bindingName) {
+            return bindingName.kind === 1 /* BindingPattern */;
+        }
     })(codefix = ts.codefix || (ts.codefix = {}));
 })(ts || (ts = {}));
 /* @internal */
@@ -113374,10 +117439,10 @@ var ts;
                 }
                 var importNode = ts.importFromModuleSpecifier(moduleSpecifier);
                 switch (importNode.kind) {
-                    case 248 /* ImportEqualsDeclaration */:
+                    case 249 /* ImportEqualsDeclaration */:
                         changes.replaceNode(importingFile, importNode, ts.makeImport(importNode.name, /*namedImports*/ undefined, moduleSpecifier, quotePreference));
                         break;
-                    case 191 /* CallExpression */:
+                    case 192 /* CallExpression */:
                         if (ts.isRequireCall(importNode, /*checkArgumentIsStringLiteralLike*/ false)) {
                             changes.replaceNode(importingFile, importNode, ts.createPropertyAccess(ts.getSynthesizedDeepClone(importNode), "default"));
                         }
@@ -113423,29 +117488,29 @@ var ts;
             sourceFile.forEachChild(function recur(node) {
                 if (ts.isPropertyAccessExpression(node) && ts.isExportsOrModuleExportsOrAlias(sourceFile, node.expression)) {
                     var parent = node.parent;
-                    cb(node, ts.isBinaryExpression(parent) && parent.left === node && parent.operatorToken.kind === 59 /* EqualsToken */);
+                    cb(node, ts.isBinaryExpression(parent) && parent.left === node && parent.operatorToken.kind === 60 /* EqualsToken */);
                 }
                 node.forEachChild(recur);
             });
         }
         function convertStatement(sourceFile, statement, checker, changes, identifiers, target, exports, quotePreference) {
             switch (statement.kind) {
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     convertVariableStatement(sourceFile, statement, changes, checker, identifiers, target, quotePreference);
                     return false;
-                case 221 /* ExpressionStatement */: {
+                case 222 /* ExpressionStatement */: {
                     var expression = statement.expression;
                     switch (expression.kind) {
-                        case 191 /* CallExpression */: {
+                        case 192 /* CallExpression */: {
                             if (ts.isRequireCall(expression, /*checkArgumentIsStringLiteralLike*/ true)) {
                                 // For side-effecting require() call, just make a side-effecting import.
                                 changes.replaceNode(sourceFile, statement, ts.makeImport(/*name*/ undefined, /*namedImports*/ undefined, expression.arguments[0], quotePreference));
                             }
                             return false;
                         }
-                        case 204 /* BinaryExpression */: {
+                        case 205 /* BinaryExpression */: {
                             var operatorToken = expression.operatorToken;
-                            return operatorToken.kind === 59 /* EqualsToken */ && convertAssignment(sourceFile, checker, expression, changes, exports);
+                            return operatorToken.kind === 60 /* EqualsToken */ && convertAssignment(sourceFile, checker, expression, changes, exports);
                         }
                     }
                 }
@@ -113485,8 +117550,8 @@ var ts;
         /** Converts `const name = require("moduleSpecifier").propertyName` */
         function convertPropertyAccessImport(name, propertyName, moduleSpecifier, identifiers, quotePreference) {
             switch (name.kind) {
-                case 184 /* ObjectBindingPattern */:
-                case 185 /* ArrayBindingPattern */: {
+                case 185 /* ObjectBindingPattern */:
+                case 186 /* ArrayBindingPattern */: {
                     // `const [a, b] = require("c").d` --> `import { d } from "c"; const [a, b] = d;`
                     var tmp = makeUniqueName(propertyName, identifiers);
                     return [
@@ -113494,7 +117559,7 @@ var ts;
                         makeConst(/*modifiers*/ undefined, name, ts.createIdentifier(tmp)),
                     ];
                 }
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     // `const a = require("b").c` --> `import { c as a } from "./b";
                     return [makeSingleImport(name.text, propertyName, moduleSpecifier, quotePreference)];
                 default:
@@ -113537,16 +117602,16 @@ var ts;
         function tryChangeModuleExportsObject(object) {
             var statements = ts.mapAllOrFail(object.properties, function (prop) {
                 switch (prop.kind) {
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
                     // TODO: Maybe we should handle this? See fourslash test `refactorConvertToEs6Module_export_object_shorthand.ts`.
-                    case 276 /* ShorthandPropertyAssignment */:
-                    case 277 /* SpreadAssignment */:
+                    case 277 /* ShorthandPropertyAssignment */:
+                    case 278 /* SpreadAssignment */:
                         return undefined;
-                    case 275 /* PropertyAssignment */:
+                    case 276 /* PropertyAssignment */:
                         return !ts.isIdentifier(prop.name) ? undefined : convertExportsDotXEquals_replaceNode(prop.name.text, prop.initializer);
-                    case 156 /* MethodDeclaration */:
-                        return !ts.isIdentifier(prop.name) ? undefined : functionExpressionToDeclaration(prop.name.text, [ts.createToken(85 /* ExportKeyword */)], prop);
+                    case 157 /* MethodDeclaration */:
+                        return !ts.isIdentifier(prop.name) ? undefined : functionExpressionToDeclaration(prop.name.text, [ts.createToken(86 /* ExportKeyword */)], prop);
                     default:
                         ts.Debug.assertNever(prop);
                 }
@@ -113595,7 +117660,7 @@ var ts;
             var name = left.name.text;
             if ((ts.isFunctionExpression(right) || ts.isArrowFunction(right) || ts.isClassExpression(right)) && (!right.name || right.name.text === name)) {
                 // `exports.f = function() {}` -> `export function f() {}` -- Replace `exports.f = ` with `export `, and insert the name after `function`.
-                changes.replaceRange(sourceFile, { pos: left.getStart(sourceFile), end: right.getStart(sourceFile) }, ts.createToken(85 /* ExportKeyword */), { suffix: " " });
+                changes.replaceRange(sourceFile, { pos: left.getStart(sourceFile), end: right.getStart(sourceFile) }, ts.createToken(86 /* ExportKeyword */), { suffix: " " });
                 if (!right.name)
                     changes.insertName(sourceFile, right, name);
                 var semi = ts.findChildOfKind(parent, 26 /* SemicolonToken */, sourceFile);
@@ -113604,14 +117669,14 @@ var ts;
             }
             else {
                 // `exports.f = function g() {}` -> `export const f = function g() {}` -- just replace `exports.` with `export const `
-                changes.replaceNodeRangeWithNodes(sourceFile, left.expression, ts.findChildOfKind(left, 24 /* DotToken */, sourceFile), [ts.createToken(85 /* ExportKeyword */), ts.createToken(77 /* ConstKeyword */)], { joiner: " ", suffix: " " });
+                changes.replaceNodeRangeWithNodes(sourceFile, left.expression, ts.findChildOfKind(left, 24 /* DotToken */, sourceFile), [ts.createToken(86 /* ExportKeyword */), ts.createToken(78 /* ConstKeyword */)], { joiner: " ", suffix: " " });
             }
         }
         // TODO: GH#22492 this will cause an error if a change has been made inside the body of the node.
         function convertExportsDotXEquals_replaceNode(name, exported) {
-            var modifiers = [ts.createToken(85 /* ExportKeyword */)];
+            var modifiers = [ts.createToken(86 /* ExportKeyword */)];
             switch (exported.kind) {
-                case 196 /* FunctionExpression */: {
+                case 197 /* FunctionExpression */: {
                     var expressionName = exported.name;
                     if (expressionName && expressionName.text !== name) {
                         // `exports.f = function g() {}` -> `export const f = function g() {}`
@@ -113619,10 +117684,10 @@ var ts;
                     }
                 }
                 // falls through
-                case 197 /* ArrowFunction */:
+                case 198 /* ArrowFunction */:
                     // `exports.f = function() {}` --> `export function f() {}`
                     return functionExpressionToDeclaration(name, modifiers, exported);
-                case 209 /* ClassExpression */:
+                case 210 /* ClassExpression */:
                     // `exports.C = class {}` --> `export class C {}`
                     return classExpressionToDeclaration(name, modifiers, exported);
                 default:
@@ -113640,7 +117705,7 @@ var ts;
          */
         function convertSingleImport(file, name, moduleSpecifier, changes, checker, identifiers, target, quotePreference) {
             switch (name.kind) {
-                case 184 /* ObjectBindingPattern */: {
+                case 185 /* ObjectBindingPattern */: {
                     var importSpecifiers = ts.mapAllOrFail(name.elements, function (e) {
                         return e.dotDotDotToken || e.initializer || e.propertyName && !ts.isIdentifier(e.propertyName) || !ts.isIdentifier(e.name)
                             ? undefined
@@ -113651,7 +117716,7 @@ var ts;
                     }
                 }
                 // falls through -- object destructuring has an interesting pattern and must be a variable declaration
-                case 185 /* ArrayBindingPattern */: {
+                case 186 /* ArrayBindingPattern */: {
                     /*
                     import x from "x";
                     const [a, b, c] = x;
@@ -113662,7 +117727,7 @@ var ts;
                         makeConst(/*modifiers*/ undefined, ts.getSynthesizedDeepClone(name), ts.createIdentifier(tmp)),
                     ];
                 }
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return convertSingleIdentifierImport(file, name, moduleSpecifier, changes, checker, identifiers, quotePreference);
                 default:
                     return ts.Debug.assertNever(name);
@@ -113734,11 +117799,11 @@ var ts;
         function isFreeIdentifier(node) {
             var parent = node.parent;
             switch (parent.kind) {
-                case 189 /* PropertyAccessExpression */:
+                case 190 /* PropertyAccessExpression */:
                     return parent.name !== node;
-                case 186 /* BindingElement */:
+                case 187 /* BindingElement */:
                     return parent.propertyName !== node;
-                case 253 /* ImportSpecifier */:
+                case 254 /* ImportSpecifier */:
                     return parent.propertyName !== node;
                 default:
                     return true;
@@ -114077,21 +118142,21 @@ var ts;
         function tryAddToExistingImport(existingImports) {
             return ts.firstDefined(existingImports, function (_a) {
                 var declaration = _a.declaration, importKind = _a.importKind;
-                if (declaration.kind !== 249 /* ImportDeclaration */)
+                if (declaration.kind !== 250 /* ImportDeclaration */)
                     return undefined;
                 var importClause = declaration.importClause;
                 if (!importClause)
                     return undefined;
                 var name = importClause.name, namedBindings = importClause.namedBindings;
-                return importKind === 1 /* Default */ && !name || importKind === 0 /* Named */ && (!namedBindings || namedBindings.kind === 252 /* NamedImports */)
+                return importKind === 1 /* Default */ && !name || importKind === 0 /* Named */ && (!namedBindings || namedBindings.kind === 253 /* NamedImports */)
                     ? { kind: 2 /* AddToExisting */, importClause: importClause, importKind: importKind }
                     : undefined;
             });
         }
         function getNamespaceImportName(declaration) {
-            if (declaration.kind === 249 /* ImportDeclaration */) {
+            if (declaration.kind === 250 /* ImportDeclaration */) {
                 var namedBindings = declaration.importClause && ts.isImportClause(declaration.importClause) && declaration.importClause.namedBindings;
-                return namedBindings && namedBindings.kind === 251 /* NamespaceImport */ ? namedBindings.name : undefined;
+                return namedBindings && namedBindings.kind === 252 /* NamespaceImport */ ? namedBindings.name : undefined;
             }
             else {
                 return declaration.name;
@@ -114102,7 +118167,7 @@ var ts;
             // Can't use an es6 import for a type in JS.
             return exportedSymbolIsTypeOnly && ts.isSourceFileJS(sourceFile) ? ts.emptyArray : ts.mapDefined(sourceFile.imports, function (moduleSpecifier) {
                 var i = ts.importFromModuleSpecifier(moduleSpecifier);
-                return (i.kind === 249 /* ImportDeclaration */ || i.kind === 248 /* ImportEqualsDeclaration */)
+                return (i.kind === 250 /* ImportDeclaration */ || i.kind === 249 /* ImportEqualsDeclaration */)
                     && checker.getSymbolAtLocation(moduleSpecifier) === moduleSymbol ? { declaration: i, importKind: importKind } : undefined;
             });
         }
@@ -114125,9 +118190,9 @@ var ts;
         }
         function newImportInfoFromExistingSpecifier(_a) {
             var declaration = _a.declaration, importKind = _a.importKind;
-            var expression = declaration.kind === 249 /* ImportDeclaration */
+            var expression = declaration.kind === 250 /* ImportDeclaration */
                 ? declaration.moduleSpecifier
-                : declaration.moduleReference.kind === 259 /* ExternalModuleReference */
+                : declaration.moduleReference.kind === 260 /* ExternalModuleReference */
                     ? declaration.moduleReference.expression
                     : undefined;
             return expression && ts.isStringLiteral(expression) ? { kind: 3 /* AddNew */, moduleSpecifier: expression.text, importKind: importKind } : undefined;
@@ -114249,9 +118314,11 @@ var ts;
                 var aliased = checker.getImmediateAliasedSymbol(defaultExport);
                 return aliased && getDefaultExportInfoWorker(aliased, ts.Debug.assertDefined(aliased.parent), checker, compilerOptions);
             }
-            else {
-                return { symbolForMeaning: defaultExport, name: moduleSymbolToValidIdentifier(moduleSymbol, compilerOptions.target) };
+            if (defaultExport.escapedName !== "default" /* Default */ &&
+                defaultExport.escapedName !== "export=" /* ExportEquals */) {
+                return { symbolForMeaning: defaultExport, name: defaultExport.getName() };
             }
+            return { symbolForMeaning: defaultExport, name: moduleSymbolToValidIdentifier(moduleSymbol, compilerOptions.target) };
         }
         function getNameForExportDefault(symbol) {
             return symbol.declarations && ts.firstDefined(symbol.declarations, function (declaration) {
@@ -114455,12 +118522,12 @@ var ts;
             var checker = context.program.getTypeChecker();
             var suggestion;
             if (ts.isPropertyAccessExpression(node.parent) && node.parent.name === node) {
-                ts.Debug.assert(node.kind === 72 /* Identifier */);
+                ts.Debug.assert(node.kind === 73 /* Identifier */);
                 var containingType = checker.getTypeAtLocation(node.parent.expression);
                 suggestion = checker.getSuggestionForNonexistentProperty(node, containingType);
             }
             else if (ts.isImportSpecifier(node.parent) && node.parent.name === node) {
-                ts.Debug.assert(node.kind === 72 /* Identifier */);
+                ts.Debug.assert(node.kind === 73 /* Identifier */);
                 var importDeclaration = ts.findAncestor(node, ts.isImportDeclaration);
                 var resolvedSourceFile = getResolvedSourceFileFromImportDeclaration(sourceFile, context, importDeclaration);
                 if (resolvedSourceFile && resolvedSourceFile.symbol) {
@@ -114523,7 +118590,7 @@ var ts;
         codefix.registerCodeFix({
             errorCodes: errorCodes,
             getCodeActions: function (context) {
-                var info = getInfo(context.sourceFile, context.span.start, context.program.getTypeChecker());
+                var info = getInfo(context.sourceFile, context.span.start, context.program.getTypeChecker(), context.program);
                 if (!info)
                     return undefined;
                 if (info.kind === 0 /* Enum */) {
@@ -114546,7 +118613,7 @@ var ts;
                 var typeDeclToMembers = new ts.NodeMap();
                 return codefix.createCombinedCodeActions(ts.textChanges.ChangeTracker.with(context, function (changes) {
                     codefix.eachDiagnostic(context, errorCodes, function (diag) {
-                        var info = getInfo(diag.file, diag.start, checker);
+                        var info = getInfo(diag.file, diag.start, checker, context.program);
                         if (!info || !ts.addToSeen(seen, ts.getNodeId(info.parentDeclaration) + "#" + info.token.text)) {
                             return;
                         }
@@ -114614,7 +118681,7 @@ var ts;
             InfoKind[InfoKind["Enum"] = 0] = "Enum";
             InfoKind[InfoKind["ClassOrInterface"] = 1] = "ClassOrInterface";
         })(InfoKind || (InfoKind = {}));
-        function getInfo(tokenSourceFile, tokenPos, checker) {
+        function getInfo(tokenSourceFile, tokenPos, checker, program) {
             // The identifier of the missing property. eg:
             // this.missing = 1;
             //      ^^^^^^^
@@ -114631,7 +118698,7 @@ var ts;
                 return undefined;
             // Prefer to change the class instead of the interface if they are merged
             var classOrInterface = ts.find(symbol.declarations, ts.isClassLike) || ts.find(symbol.declarations, ts.isInterfaceDeclaration);
-            if (classOrInterface) {
+            if (classOrInterface && !program.isSourceFileFromExternalLibrary(classOrInterface.getSourceFile())) {
                 var makeStatic = (leftExpressionType.target || leftExpressionType) !== checker.getDeclaredTypeOfSymbol(symbol);
                 var declSourceFile = classOrInterface.getSourceFile();
                 var inJs = ts.isSourceFileJS(declSourceFile);
@@ -114639,7 +118706,7 @@ var ts;
                 return { kind: 1 /* ClassOrInterface */, token: token, parentDeclaration: classOrInterface, makeStatic: makeStatic, declSourceFile: declSourceFile, inJs: inJs, call: call };
             }
             var enumDeclaration = ts.find(symbol.declarations, ts.isEnumDeclaration);
-            if (enumDeclaration) {
+            if (enumDeclaration && !program.isSourceFileFromExternalLibrary(enumDeclaration.getSourceFile())) {
                 return { kind: 0 /* Enum */, token: token, parentDeclaration: enumDeclaration };
             }
             return undefined;
@@ -114651,7 +118718,7 @@ var ts;
         }
         function addMissingMemberInJs(changeTracker, declSourceFile, classDeclaration, tokenName, makeStatic) {
             if (makeStatic) {
-                if (classDeclaration.kind === 209 /* ClassExpression */) {
+                if (classDeclaration.kind === 210 /* ClassExpression */) {
                     return;
                 }
                 var className = classDeclaration.name.getText();
@@ -114677,7 +118744,7 @@ var ts;
         }
         function getTypeNode(checker, classDeclaration, token) {
             var typeNode;
-            if (token.parent.parent.kind === 204 /* BinaryExpression */) {
+            if (token.parent.parent.kind === 205 /* BinaryExpression */) {
                 var binaryExpression = token.parent.parent;
                 var otherExpression = token.parent === binaryExpression.left ? binaryExpression.right : binaryExpression.left;
                 var widenedType = checker.getWidenedType(checker.getBaseTypeOfLiteralType(checker.getTypeAtLocation(otherExpression)));
@@ -114687,7 +118754,7 @@ var ts;
                 var contextualType = checker.getContextualType(token.parent);
                 typeNode = contextualType ? checker.typeToTypeNode(contextualType) : undefined;
             }
-            return typeNode || ts.createKeywordTypeNode(120 /* AnyKeyword */);
+            return typeNode || ts.createKeywordTypeNode(121 /* AnyKeyword */);
         }
         function createAddPropertyDeclarationAction(context, declSourceFile, classDeclaration, makeStatic, tokenName, typeNode) {
             var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return addPropertyDeclaration(t, declSourceFile, classDeclaration, tokenName, typeNode, makeStatic); });
@@ -114696,7 +118763,7 @@ var ts;
         function addPropertyDeclaration(changeTracker, declSourceFile, classDeclaration, tokenName, typeNode, makeStatic) {
             var property = ts.createProperty(
             /*decorators*/ undefined, 
-            /*modifiers*/ makeStatic ? [ts.createToken(116 /* StaticKeyword */)] : undefined, tokenName, 
+            /*modifiers*/ makeStatic ? [ts.createToken(117 /* StaticKeyword */)] : undefined, tokenName, 
             /*questionToken*/ undefined, typeNode, 
             /*initializer*/ undefined);
             var lastProp = getNodeToInsertPropertyAfter(classDeclaration);
@@ -114720,7 +118787,7 @@ var ts;
         }
         function createAddIndexSignatureAction(context, declSourceFile, classDeclaration, tokenName, typeNode) {
             // Index signatures cannot have the static modifier.
-            var stringTypeNode = ts.createKeywordTypeNode(138 /* StringKeyword */);
+            var stringTypeNode = ts.createKeywordTypeNode(139 /* StringKeyword */);
             var indexingParameter = ts.createParameter(
             /*decorators*/ undefined, 
             /*modifiers*/ undefined, 
@@ -114740,7 +118807,7 @@ var ts;
         }
         function addMethodDeclaration(context, changeTracker, declSourceFile, typeDecl, token, callExpression, makeStatic, inJs, preferences) {
             var methodDeclaration = codefix.createMethodFromCallExpression(context, callExpression, token.text, inJs, makeStatic, preferences, typeDecl);
-            var containingMethodDeclaration = ts.getAncestor(callExpression, 156 /* MethodDeclaration */);
+            var containingMethodDeclaration = ts.getAncestor(callExpression, 157 /* MethodDeclaration */);
             if (containingMethodDeclaration && containingMethodDeclaration.parent === typeDecl) {
                 changeTracker.insertNodeAfter(declSourceFile, containingMethodDeclaration, methodDeclaration);
             }
@@ -114804,7 +118871,6 @@ var ts;
     (function (codefix) {
         var fixName = "fixCannotFindModule";
         var fixIdInstallTypesPackage = "installTypesPackage";
-        var fixIdGenerateTypes = "generateTypes";
         var errorCodeCannotFindModule = ts.Diagnostics.Cannot_find_module_0.code;
         var errorCodes = [
             errorCodeCannotFindModule,
@@ -114819,13 +118885,12 @@ var ts;
                     return undefined;
                 var typesPackageName = getTypesPackageNameToInstall(packageName, host, context.errorCode);
                 return typesPackageName === undefined
-                    ? ts.singleElementArray(tryGetGenerateTypesAction(context, packageName))
+                    ? []
                     : [codefix.createCodeFixAction(fixName, /*changes*/ [], [ts.Diagnostics.Install_0, typesPackageName], fixIdInstallTypesPackage, ts.Diagnostics.Install_all_missing_types_packages, getInstallCommand(sourceFile.fileName, typesPackageName))];
             },
-            fixIds: [fixIdInstallTypesPackage, fixIdGenerateTypes],
+            fixIds: [fixIdInstallTypesPackage],
             getAllCodeActions: function (context) {
-                var savedTypesDir = null; // tslint:disable-line no-null-keyword
-                return codefix.codeFixAll(context, errorCodes, function (changes, diag, commands) {
+                return codefix.codeFixAll(context, errorCodes, function (_changes, diag, commands) {
                     var packageName = tryGetImportedPackageName(diag.file, diag.start);
                     if (packageName === undefined)
                         return undefined;
@@ -114837,96 +118902,12 @@ var ts;
                             }
                             break;
                         }
-                        case fixIdGenerateTypes: {
-                            var typesDir = savedTypesDir !== null ? savedTypesDir : savedTypesDir = getOrCreateTypesDirectory(changes, context);
-                            var command = typesDir === undefined ? undefined : tryGenerateTypes(typesDir, packageName, context);
-                            if (command)
-                                commands.push(command);
-                            break;
-                        }
                         default:
                             ts.Debug.fail("Bad fixId: " + context.fixId);
                     }
                 });
             },
         });
-        function tryGetGenerateTypesAction(context, packageName) {
-            var command;
-            var changes = ts.textChanges.ChangeTracker.with(context, function (t) {
-                var typesDir = getOrCreateTypesDirectory(t, context);
-                command = typesDir === undefined ? undefined : tryGenerateTypes(typesDir, packageName, context);
-            });
-            return command && codefix.createCodeFixAction(fixName, changes, [ts.Diagnostics.Generate_types_for_0, packageName], fixIdGenerateTypes, ts.Diagnostics.Generate_types_for_all_packages_without_types, command);
-        }
-        function tryGenerateTypes(typesDir, packageName, context) {
-            var file = context.sourceFile.fileName;
-            var fileToGenerateTypesFor = ts.tryResolveJSModule(packageName, ts.getDirectoryPath(file), context.host); // TODO: GH#18217
-            if (fileToGenerateTypesFor === undefined)
-                return undefined;
-            var outputFileName = ts.resolvePath(ts.getDirectoryPath(context.program.getCompilerOptions().configFile.fileName), typesDir, packageName + ".d.ts");
-            if (context.host.fileExists(outputFileName))
-                return undefined;
-            return { type: "generate types", file: file, fileToGenerateTypesFor: fileToGenerateTypesFor, outputFileName: outputFileName };
-        }
-        // If no types directory exists yet, adds it to tsconfig.json
-        function getOrCreateTypesDirectory(changes, context) {
-            var configFile = context.program.getCompilerOptions().configFile;
-            if (!configFile)
-                return undefined;
-            var tsconfigObjectLiteral = ts.getTsConfigObjectLiteralExpression(configFile);
-            if (!tsconfigObjectLiteral)
-                return undefined;
-            var compilerOptionsProperty = codefix.findJsonProperty(tsconfigObjectLiteral, "compilerOptions");
-            if (!compilerOptionsProperty) {
-                var newCompilerOptions = ts.createObjectLiteral([makeDefaultBaseUrl(), makeDefaultPaths()]);
-                changes.insertNodeAtObjectStart(configFile, tsconfigObjectLiteral, codefix.createJsonPropertyAssignment("compilerOptions", newCompilerOptions));
-                return defaultTypesDirectoryName;
-            }
-            var compilerOptions = compilerOptionsProperty.initializer;
-            if (!ts.isObjectLiteralExpression(compilerOptions))
-                return defaultTypesDirectoryName;
-            var baseUrl = getOrAddBaseUrl(changes, configFile, compilerOptions);
-            var typesDirectoryFromPathMapping = getOrAddPathMapping(changes, configFile, compilerOptions);
-            return ts.combinePaths(baseUrl, typesDirectoryFromPathMapping);
-        }
-        var defaultBaseUrl = ".";
-        function makeDefaultBaseUrl() {
-            return codefix.createJsonPropertyAssignment("baseUrl", ts.createStringLiteral(defaultBaseUrl));
-        }
-        function getOrAddBaseUrl(changes, tsconfig, compilerOptions) {
-            var baseUrlProp = codefix.findJsonProperty(compilerOptions, "baseUrl");
-            if (baseUrlProp) {
-                return ts.isStringLiteral(baseUrlProp.initializer) ? baseUrlProp.initializer.text : defaultBaseUrl;
-            }
-            else {
-                changes.insertNodeAtObjectStart(tsconfig, compilerOptions, makeDefaultBaseUrl());
-                return defaultBaseUrl;
-            }
-        }
-        var defaultTypesDirectoryName = "types";
-        function makeDefaultPathMapping() {
-            return codefix.createJsonPropertyAssignment("*", ts.createArrayLiteral([ts.createStringLiteral(defaultTypesDirectoryName + "/*")]));
-        }
-        function makeDefaultPaths() {
-            return codefix.createJsonPropertyAssignment("paths", ts.createObjectLiteral([makeDefaultPathMapping()]));
-        }
-        function getOrAddPathMapping(changes, tsconfig, compilerOptions) {
-            var paths = codefix.findJsonProperty(compilerOptions, "paths");
-            if (!paths || !ts.isObjectLiteralExpression(paths.initializer)) {
-                changes.insertNodeAtObjectStart(tsconfig, compilerOptions, makeDefaultPaths());
-                return defaultTypesDirectoryName;
-            }
-            // Look for an existing path mapping. Should look like `"*": "foo/*"`.
-            var existing = ts.firstDefined(paths.initializer.properties, function (prop) {
-                return ts.isPropertyAssignment(prop) && ts.isStringLiteral(prop.name) && prop.name.text === "*" && ts.isArrayLiteralExpression(prop.initializer)
-                    ? ts.firstDefined(prop.initializer.elements, function (value) { return ts.isStringLiteral(value) ? ts.tryRemoveSuffix(value.text, "/*") : undefined; })
-                    : undefined;
-            });
-            if (existing)
-                return existing;
-            changes.insertNodeAtObjectStart(tsconfig, paths.initializer, makeDefaultPathMapping());
-            return defaultTypesDirectoryName;
-        }
         function getInstallCommand(fileName, packageName) {
             return { type: "install package", file: fileName, packageName: packageName };
         }
@@ -115034,7 +119015,7 @@ var ts;
         }
         function getNodes(sourceFile, pos) {
             var token = ts.getTokenAtPosition(sourceFile, pos);
-            if (token.kind !== 100 /* ThisKeyword */)
+            if (token.kind !== 101 /* ThisKeyword */)
                 return undefined;
             var constructor = ts.getContainingFunction(token);
             var superCall = findSuperCall(constructor.body);
@@ -115073,7 +119054,7 @@ var ts;
         });
         function getNode(sourceFile, pos) {
             var token = ts.getTokenAtPosition(sourceFile, pos);
-            ts.Debug.assert(token.kind === 124 /* ConstructorKeyword */);
+            ts.Debug.assert(token.kind === 125 /* ConstructorKeyword */);
             return token.parent;
         }
         function doChange(changes, sourceFile, ctr) {
@@ -115089,7 +119070,7 @@ var ts;
     (function (codefix) {
         var fixId = "enableExperimentalDecorators";
         var errorCodes = [
-            ts.Diagnostics.Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_to_remove_this_warning.code
+            ts.Diagnostics.Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_in_your_tsconfig_or_jsconfig_to_remove_this_warning.code
         ];
         codefix.registerCodeFix({
             errorCodes: errorCodes,
@@ -115098,12 +119079,19 @@ var ts;
                 if (configFile === undefined) {
                     return undefined;
                 }
-                var changes = ts.textChanges.ChangeTracker.with(context, function (changeTracker) { return makeChange(changeTracker, configFile); });
+                var changes = ts.textChanges.ChangeTracker.with(context, function (changeTracker) { return doChange(changeTracker, configFile); });
                 return [codefix.createCodeFixActionNoFixId(fixId, changes, ts.Diagnostics.Enable_the_experimentalDecorators_option_in_your_configuration_file)];
             },
             fixIds: [fixId],
+            getAllCodeActions: function (context) { return codefix.codeFixAll(context, errorCodes, function (changes) {
+                var configFile = context.program.getCompilerOptions().configFile;
+                if (configFile === undefined) {
+                    return undefined;
+                }
+                doChange(changes, configFile);
+            }); },
         });
-        function makeChange(changeTracker, configFile) {
+        function doChange(changeTracker, configFile) {
             codefix.setJsonCompilerOptionValue(changeTracker, configFile, "experimentalDecorators", ts.createTrue());
         }
     })(codefix = ts.codefix || (ts.codefix = {}));
@@ -115137,14 +119125,14 @@ var ts;
             var token = ts.getTokenAtPosition(sourceFile, pos);
             var heritageClauses = ts.getContainingClass(token).heritageClauses;
             var extendsToken = heritageClauses[0].getFirstToken();
-            return extendsToken.kind === 86 /* ExtendsKeyword */ ? { extendsToken: extendsToken, heritageClauses: heritageClauses } : undefined;
+            return extendsToken.kind === 87 /* ExtendsKeyword */ ? { extendsToken: extendsToken, heritageClauses: heritageClauses } : undefined;
         }
         function doChanges(changes, sourceFile, extendsToken, heritageClauses) {
-            changes.replaceNode(sourceFile, extendsToken, ts.createToken(109 /* ImplementsKeyword */));
+            changes.replaceNode(sourceFile, extendsToken, ts.createToken(110 /* ImplementsKeyword */));
             // If there is already an implements clause, replace the implements keyword with a comma.
             if (heritageClauses.length === 2 &&
-                heritageClauses[0].token === 86 /* ExtendsKeyword */ &&
-                heritageClauses[1].token === 109 /* ImplementsKeyword */) {
+                heritageClauses[0].token === 87 /* ExtendsKeyword */ &&
+                heritageClauses[1].token === 110 /* ImplementsKeyword */) {
                 var implementsToken = heritageClauses[1].getFirstToken();
                 var implementsFullStart = implementsToken.getFullStart();
                 changes.replaceRange(sourceFile, { pos: implementsFullStart, end: implementsFullStart }, ts.createToken(27 /* CommaToken */));
@@ -115251,7 +119239,7 @@ var ts;
                     return [createDeleteFix(delVar, ts.Diagnostics.Remove_variable_statement)];
                 }
                 var result = [];
-                if (token.kind === 127 /* InferKeyword */) {
+                if (token.kind === 128 /* InferKeyword */) {
                     var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return changeInferToUnknown(t, sourceFile, token); });
                     var name = ts.cast(token.parent, ts.isInferTypeNode).typeParameter.name.text;
                     result.push(codefix.createCodeFixAction(fixName, changes, [ts.Diagnostics.Replace_infer_0_with_unknown, name], fixIdInfer, ts.Diagnostics.Replace_all_unused_infer_with_unknown));
@@ -115283,7 +119271,7 @@ var ts;
                             tryPrefixDeclaration(changes, diag.code, sourceFile, token);
                             break;
                         case fixIdDelete: {
-                            if (token.kind === 127 /* InferKeyword */)
+                            if (token.kind === 128 /* InferKeyword */)
                                 break; // Can't delete
                             var importDecl = tryGetFullImport(token);
                             if (importDecl) {
@@ -115302,7 +119290,7 @@ var ts;
                             break;
                         }
                         case fixIdInfer:
-                            if (token.kind === 127 /* InferKeyword */) {
+                            if (token.kind === 128 /* InferKeyword */) {
                                 changeInferToUnknown(changes, sourceFile, token);
                             }
                             break;
@@ -115313,7 +119301,7 @@ var ts;
             },
         });
         function changeInferToUnknown(changes, sourceFile, token) {
-            changes.replaceNode(sourceFile, token.parent, ts.createKeywordTypeNode(143 /* UnknownKeyword */));
+            changes.replaceNode(sourceFile, token.parent, ts.createKeywordTypeNode(144 /* UnknownKeyword */));
         }
         function createDeleteFix(changes, diag) {
             return codefix.createCodeFixAction(fixName, changes, diag, fixIdDelete, ts.Diagnostics.Delete_all_unused_declarations);
@@ -115323,13 +119311,13 @@ var ts;
         }
         // Sometimes the diagnostic span is an entire ImportDeclaration, so we should remove the whole thing.
         function tryGetFullImport(token) {
-            return token.kind === 92 /* ImportKeyword */ ? ts.tryCast(token.parent, ts.isImportDeclaration) : undefined;
+            return token.kind === 93 /* ImportKeyword */ ? ts.tryCast(token.parent, ts.isImportDeclaration) : undefined;
         }
         function tryDeleteFullDestructure(token, changes, sourceFile, checker, sourceFiles, isFixAll) {
             if (token.kind !== 18 /* OpenBraceToken */ || !ts.isObjectBindingPattern(token.parent))
                 return false;
             var decl = token.parent.parent;
-            if (decl.kind === 151 /* Parameter */) {
+            if (decl.kind === 152 /* Parameter */) {
                 tryDeleteParameter(changes, sourceFile, decl, checker, sourceFiles, isFixAll);
             }
             else {
@@ -115340,7 +119328,7 @@ var ts;
         function tryDeleteFullVariableStatement(sourceFile, token, changes) {
             var declarationList = ts.tryCast(token.parent, ts.isVariableDeclarationList);
             if (declarationList && declarationList.getChildren(sourceFile)[0] === token) {
-                changes.delete(sourceFile, declarationList.parent.kind === 219 /* VariableStatement */ ? declarationList.parent : declarationList);
+                changes.delete(sourceFile, declarationList.parent.kind === 220 /* VariableStatement */ ? declarationList.parent : declarationList);
                 return true;
             }
             return false;
@@ -115349,7 +119337,7 @@ var ts;
             // Don't offer to prefix a property.
             if (errorCode === ts.Diagnostics.Property_0_is_declared_but_its_value_is_never_read.code)
                 return;
-            if (token.kind === 127 /* InferKeyword */) {
+            if (token.kind === 128 /* InferKeyword */) {
                 token = ts.cast(token.parent, ts.isInferTypeNode).typeParameter.name;
             }
             if (ts.isIdentifier(token) && canPrefix(token)) {
@@ -115358,14 +119346,14 @@ var ts;
         }
         function canPrefix(token) {
             switch (token.parent.kind) {
-                case 151 /* Parameter */:
-                case 150 /* TypeParameter */:
+                case 152 /* Parameter */:
+                case 151 /* TypeParameter */:
                     return true;
-                case 237 /* VariableDeclaration */: {
+                case 238 /* VariableDeclaration */: {
                     var varDecl = token.parent;
                     switch (varDecl.parent.parent.kind) {
-                        case 227 /* ForOfStatement */:
-                        case 226 /* ForInStatement */:
+                        case 228 /* ForOfStatement */:
+                        case 227 /* ForInStatement */:
                             return true;
                     }
                 }
@@ -115412,26 +119400,26 @@ var ts;
         function mayDeleteParameter(p, checker, isFixAll) {
             var parent = p.parent;
             switch (parent.kind) {
-                case 156 /* MethodDeclaration */:
+                case 157 /* MethodDeclaration */:
                     // Don't remove a parameter if this overrides something.
                     var symbol = checker.getSymbolAtLocation(parent.name);
                     if (ts.isMemberSymbolInBaseType(symbol, checker))
                         return false;
                 // falls through
-                case 157 /* Constructor */:
-                case 239 /* FunctionDeclaration */:
+                case 158 /* Constructor */:
+                case 240 /* FunctionDeclaration */:
                     return true;
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */: {
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */: {
                     // Can't remove a non-last parameter in a callback. Can remove a parameter in code-fix-all if future parameters are also unused.
                     var parameters = parent.parameters;
                     var index = parameters.indexOf(p);
                     ts.Debug.assert(index !== -1);
                     return isFixAll
-                        ? parameters.slice(index + 1).every(function (p) { return p.name.kind === 72 /* Identifier */ && !p.symbol.isReferenced; })
+                        ? parameters.slice(index + 1).every(function (p) { return p.name.kind === 73 /* Identifier */ && !p.symbol.isReferenced; })
                         : index === parameters.length - 1;
                 }
-                case 159 /* SetAccessor */:
+                case 160 /* SetAccessor */:
                     // Setter must have a parameter
                     return false;
                 default:
@@ -115471,7 +119459,7 @@ var ts;
             var container = (ts.isBlock(statement.parent) ? statement.parent : statement).parent;
             if (!ts.isBlock(statement.parent) || statement === ts.first(statement.parent.statements)) {
                 switch (container.kind) {
-                    case 222 /* IfStatement */:
+                    case 223 /* IfStatement */:
                         if (container.elseStatement) {
                             if (ts.isBlock(statement.parent)) {
                                 break;
@@ -115482,15 +119470,15 @@ var ts;
                             return;
                         }
                     // falls through
-                    case 224 /* WhileStatement */:
-                    case 225 /* ForStatement */:
+                    case 225 /* WhileStatement */:
+                    case 226 /* ForStatement */:
                         changes.delete(sourceFile, container);
                         return;
                 }
             }
             if (ts.isBlock(statement.parent)) {
-                var end_2 = start + length;
-                var lastStatement = ts.Debug.assertDefined(lastWhere(ts.sliceAfter(statement.parent.statements, statement), function (s) { return s.pos < end_2; }));
+                var end_3 = start + length;
+                var lastStatement = ts.Debug.assertDefined(lastWhere(ts.sliceAfter(statement.parent.statements, statement), function (s) { return s.pos < end_3; }));
                 changes.deleteNodeRange(sourceFile, statement, lastStatement);
             }
             else {
@@ -115556,7 +119544,7 @@ var ts;
                 var typeNode = info.typeNode, type = info.type;
                 var original = typeNode.getText(sourceFile);
                 var actions = [fix(type, fixIdPlain, ts.Diagnostics.Change_all_jsdoc_style_types_to_TypeScript)];
-                if (typeNode.kind === 291 /* JSDocNullableType */) {
+                if (typeNode.kind === 292 /* JSDocNullableType */) {
                     // for nullable types, suggest the flow-compatible `T | null | undefined`
                     // in addition to the jsdoc/closure-compatible `T | null`
                     actions.push(fix(checker.getNullableType(type, 32768 /* Undefined */), fixIdNullable, ts.Diagnostics.Change_all_jsdoc_style_types_to_TypeScript_and_add_undefined_to_nullable_types));
@@ -115576,7 +119564,7 @@ var ts;
                     if (!info)
                         return;
                     var typeNode = info.typeNode, type = info.type;
-                    var fixedType = typeNode.kind === 291 /* JSDocNullableType */ && fixId === fixIdNullable ? checker.getNullableType(type, 32768 /* Undefined */) : type;
+                    var fixedType = typeNode.kind === 292 /* JSDocNullableType */ && fixId === fixIdNullable ? checker.getNullableType(type, 32768 /* Undefined */) : type;
                     doChange(changes, sourceFile, typeNode, fixedType, checker);
                 });
             }
@@ -115593,22 +119581,22 @@ var ts;
             // NOTE: Some locations are not handled yet:
             // MappedTypeNode.typeParameters and SignatureDeclaration.typeParameters, as well as CallExpression.typeArguments
             switch (node.kind) {
-                case 212 /* AsExpression */:
-                case 160 /* CallSignature */:
-                case 161 /* ConstructSignature */:
-                case 239 /* FunctionDeclaration */:
-                case 158 /* GetAccessor */:
-                case 162 /* IndexSignature */:
-                case 181 /* MappedType */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
-                case 151 /* Parameter */:
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
-                case 159 /* SetAccessor */:
-                case 242 /* TypeAliasDeclaration */:
-                case 194 /* TypeAssertionExpression */:
-                case 237 /* VariableDeclaration */:
+                case 213 /* AsExpression */:
+                case 161 /* CallSignature */:
+                case 162 /* ConstructSignature */:
+                case 240 /* FunctionDeclaration */:
+                case 159 /* GetAccessor */:
+                case 163 /* IndexSignature */:
+                case 182 /* MappedType */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
+                case 152 /* Parameter */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
+                case 160 /* SetAccessor */:
+                case 243 /* TypeAliasDeclaration */:
+                case 195 /* TypeAssertionExpression */:
+                case 238 /* VariableDeclaration */:
                     return true;
                 default:
                     return false;
@@ -115662,14 +119650,14 @@ var ts;
             }
             var insertBefore;
             switch (containingFunction.kind) {
-                case 156 /* MethodDeclaration */:
+                case 157 /* MethodDeclaration */:
                     insertBefore = containingFunction.name;
                     break;
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
-                    insertBefore = ts.findChildOfKind(containingFunction, 90 /* FunctionKeyword */, sourceFile);
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
+                    insertBefore = ts.findChildOfKind(containingFunction, 91 /* FunctionKeyword */, sourceFile);
                     break;
-                case 197 /* ArrowFunction */:
+                case 198 /* ArrowFunction */:
                     insertBefore = ts.findChildOfKind(containingFunction, 20 /* OpenParenToken */, sourceFile) || ts.first(containingFunction.parameters);
                     break;
                 default:
@@ -115684,11 +119672,11 @@ var ts;
             var insertBefore = _a.insertBefore, returnType = _a.returnType;
             if (returnType) {
                 var entityName = ts.getEntityNameFromTypeNode(returnType);
-                if (!entityName || entityName.kind !== 72 /* Identifier */ || entityName.text !== "Promise") {
+                if (!entityName || entityName.kind !== 73 /* Identifier */ || entityName.text !== "Promise") {
                     changes.replaceNode(sourceFile, returnType, ts.createTypeReferenceNode("Promise", ts.createNodeArray([returnType])));
                 }
             }
-            changes.insertModifierBefore(sourceFile, 121 /* AsyncKeyword */, insertBefore);
+            changes.insertModifierBefore(sourceFile, 122 /* AsyncKeyword */, insertBefore);
         }
     })(codefix = ts.codefix || (ts.codefix = {}));
 })(ts || (ts = {}));
@@ -115797,17 +119785,17 @@ var ts;
             var type = checker.getWidenedType(checker.getTypeOfSymbolAtLocation(symbol, enclosingDeclaration));
             var optional = !!(symbol.flags & 16777216 /* Optional */);
             switch (declaration.kind) {
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
-                case 153 /* PropertySignature */:
-                case 154 /* PropertyDeclaration */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
+                case 154 /* PropertySignature */:
+                case 155 /* PropertyDeclaration */:
                     var typeNode = checker.typeToTypeNode(type, enclosingDeclaration, /*flags*/ undefined, getNoopSymbolTrackerWithResolver(context));
                     out(ts.createProperty(
                     /*decorators*/ undefined, modifiers, name, optional ? ts.createToken(56 /* QuestionToken */) : undefined, typeNode, 
                     /*initializer*/ undefined));
                     break;
-                case 155 /* MethodSignature */:
-                case 156 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
+                case 157 /* MethodDeclaration */:
                     // The signature for the implementation appears as an entry in `signatures` iff
                     // there is only one signature.
                     // If there are overloads and an implementation signature, it appears as an
@@ -115848,7 +119836,7 @@ var ts;
         }
         function signatureToMethodDeclaration(context, signature, enclosingDeclaration, modifiers, name, optional, body) {
             var program = context.program;
-            var signatureDeclaration = program.getTypeChecker().signatureToSignatureDeclaration(signature, 156 /* MethodDeclaration */, enclosingDeclaration, 1 /* NoTruncation */ | 256 /* SuppressAnyReturnType */, getNoopSymbolTrackerWithResolver(context));
+            var signatureDeclaration = program.getTypeChecker().signatureToSignatureDeclaration(signature, 157 /* MethodDeclaration */, enclosingDeclaration, 1 /* NoTruncation */ | 256 /* SuppressAnyReturnType */, getNoopSymbolTrackerWithResolver(context));
             if (!signatureDeclaration) {
                 return undefined;
             }
@@ -115876,7 +119864,7 @@ var ts;
             var returnType = (inJs || !contextualType) ? undefined : checker.typeToTypeNode(contextualType, contextNode, /*flags*/ undefined, tracker);
             return ts.createMethod(
             /*decorators*/ undefined, 
-            /*modifiers*/ makeStatic ? [ts.createToken(116 /* StaticKeyword */)] : undefined, 
+            /*modifiers*/ makeStatic ? [ts.createToken(117 /* StaticKeyword */)] : undefined, 
             /*asteriskToken*/ ts.isYieldExpression(parent) ? ts.createToken(40 /* AsteriskToken */) : undefined, methodName, 
             /*questionToken*/ undefined, 
             /*typeParameters*/ inJs ? undefined : ts.map(typeArguments, function (_, i) {
@@ -115895,7 +119883,7 @@ var ts;
                 /*dotDotDotToken*/ undefined, 
                 /*name*/ names && names[i] || "arg" + i, 
                 /*questionToken*/ minArgumentCount !== undefined && i >= minArgumentCount ? ts.createToken(56 /* QuestionToken */) : undefined, 
-                /*type*/ inJs ? undefined : types && types[i] || ts.createKeywordTypeNode(120 /* AnyKeyword */), 
+                /*type*/ inJs ? undefined : types && types[i] || ts.createKeywordTypeNode(121 /* AnyKeyword */), 
                 /*initializer*/ undefined);
                 parameters.push(newParameter);
             }
@@ -115923,7 +119911,7 @@ var ts;
             var maxArgsParameterSymbolNames = maxArgsSignature.parameters.map(function (symbol) { return symbol.name; });
             var parameters = createDummyParameters(maxNonRestArgs, maxArgsParameterSymbolNames, /* types */ undefined, minArgumentCount, /*inJs*/ false);
             if (someSigHasRestParameter) {
-                var anyArrayType = ts.createArrayTypeNode(ts.createKeywordTypeNode(120 /* AnyKeyword */));
+                var anyArrayType = ts.createArrayTypeNode(ts.createKeywordTypeNode(121 /* AnyKeyword */));
                 var restParameter = ts.createParameter(
                 /*decorators*/ undefined, 
                 /*modifiers*/ undefined, ts.createToken(25 /* DotDotDotToken */), maxArgsParameterSymbolNames[maxNonRestArgs] || "rest", 
@@ -115949,10 +119937,10 @@ var ts;
         }
         function createVisibilityModifier(flags) {
             if (flags & 4 /* Public */) {
-                return ts.createToken(115 /* PublicKeyword */);
+                return ts.createToken(116 /* PublicKeyword */);
             }
             else if (flags & 16 /* Protected */) {
-                return ts.createToken(114 /* ProtectedKeyword */);
+                return ts.createToken(115 /* ProtectedKeyword */);
             }
             return undefined;
         }
@@ -116017,15 +120005,15 @@ var ts;
         }
         codefix.registerCodeFix({
             errorCodes: [
-                ts.Diagnostics.Cannot_invoke_an_expression_whose_type_lacks_a_call_signature_Type_0_has_no_compatible_call_signatures.code,
-                ts.Diagnostics.Cannot_use_new_with_an_expression_whose_type_lacks_a_call_or_construct_signature.code,
+                ts.Diagnostics.This_expression_is_not_callable.code,
+                ts.Diagnostics.This_expression_is_not_constructable.code,
             ],
             getCodeActions: getActionsForUsageOfInvalidImport
         });
         function getActionsForUsageOfInvalidImport(context) {
             var sourceFile = context.sourceFile;
-            var targetKind = ts.Diagnostics.Cannot_invoke_an_expression_whose_type_lacks_a_call_signature_Type_0_has_no_compatible_call_signatures.code === context.errorCode ? 191 /* CallExpression */ : 192 /* NewExpression */;
-            var node = ts.findAncestor(ts.getTokenAtPosition(sourceFile, context.span.start), function (a) { return a.kind === targetKind && a.getStart() === context.span.start && a.getEnd() === (context.span.start + context.span.length); });
+            var targetKind = ts.Diagnostics.This_expression_is_not_callable.code === context.errorCode ? 192 /* CallExpression */ : 193 /* NewExpression */;
+            var node = ts.findAncestor(ts.getTokenAtPosition(sourceFile, context.span.start), function (a) { return a.kind === targetKind; });
             if (!node) {
                 return [];
             }
@@ -116143,7 +120131,7 @@ var ts;
             return codefix.createCodeFixAction(fixName, changes, [ts.Diagnostics.Add_undefined_type_to_property_0, propertyDeclaration.name.getText()], fixIdAddUndefinedType, ts.Diagnostics.Add_undefined_type_to_all_uninitialized_properties);
         }
         function addUndefinedType(changeTracker, propertyDeclarationSourceFile, propertyDeclaration) {
-            var undefinedTypeNode = ts.createKeywordTypeNode(141 /* UndefinedKeyword */);
+            var undefinedTypeNode = ts.createKeywordTypeNode(142 /* UndefinedKeyword */);
             var type = propertyDeclaration.type; // TODO: GH#18217
             var types = ts.isUnionTypeNode(type) ? type.types.concat(undefinedTypeNode) : [type, undefinedTypeNode];
             changeTracker.replaceNode(propertyDeclarationSourceFile, type, ts.createUnionTypeNode(types));
@@ -116189,235 +120177,6 @@ var ts;
         }
     })(codefix = ts.codefix || (ts.codefix = {}));
 })(ts || (ts = {}));
-var ts;
-(function (ts) {
-    function generateTypesForModule(name, moduleValue, formatSettings) {
-        return generateTypesForModuleOrGlobal(name, moduleValue, formatSettings, 0 /* ExportEquals */);
-    }
-    ts.generateTypesForModule = generateTypesForModule;
-    function generateTypesForGlobal(name, globalValue, formatSettings) {
-        return generateTypesForModuleOrGlobal(name, globalValue, formatSettings, 3 /* Global */);
-    }
-    ts.generateTypesForGlobal = generateTypesForGlobal;
-    function generateTypesForModuleOrGlobal(name, globalValue, formatSettings, outputKind) {
-        return valueInfoToDeclarationFileText(ts.inspectValue(name, globalValue), formatSettings, outputKind);
-    }
-    /* @internal */
-    function valueInfoToDeclarationFileText(valueInfo, formatSettings, outputKind) {
-        if (outputKind === void 0) { outputKind = 0 /* ExportEquals */; }
-        return ts.textChanges.getNewFileText(toStatements(valueInfo, outputKind), 3 /* TS */, formatSettings.newLineCharacter || "\n", ts.formatting.getFormatContext(formatSettings));
-    }
-    ts.valueInfoToDeclarationFileText = valueInfoToDeclarationFileText;
-    /* @internal */
-    var OutputKind;
-    (function (OutputKind) {
-        OutputKind[OutputKind["ExportEquals"] = 0] = "ExportEquals";
-        OutputKind[OutputKind["NamedExport"] = 1] = "NamedExport";
-        OutputKind[OutputKind["NamespaceMember"] = 2] = "NamespaceMember";
-        OutputKind[OutputKind["Global"] = 3] = "Global";
-    })(OutputKind || (OutputKind = {}));
-    function toNamespaceMemberStatements(info) {
-        return toStatements(info, 2 /* NamespaceMember */);
-    }
-    function toStatements(info, kind) {
-        var isDefault = info.name === "default" /* Default */;
-        var name = isDefault ? "_default" : info.name;
-        if (!isValidIdentifier(name) || isDefault && kind !== 1 /* NamedExport */)
-            return ts.emptyArray;
-        var modifiers = isDefault && info.kind === 2 /* FunctionOrClass */ ? [ts.createModifier(85 /* ExportKeyword */), ts.createModifier(80 /* DefaultKeyword */)]
-            : kind === 3 /* Global */ || kind === 0 /* ExportEquals */ ? [ts.createModifier(125 /* DeclareKeyword */)]
-                : kind === 1 /* NamedExport */ ? [ts.createModifier(85 /* ExportKeyword */)]
-                    : undefined;
-        var exportEquals = function () { return kind === 0 /* ExportEquals */ ? [exportEqualsOrDefault(info.name, /*isExportEquals*/ true)] : ts.emptyArray; };
-        var exportDefault = function () { return isDefault ? [exportEqualsOrDefault("_default", /*isExportEquals*/ false)] : ts.emptyArray; };
-        switch (info.kind) {
-            case 2 /* FunctionOrClass */:
-                return exportEquals().concat(functionOrClassToStatements(modifiers, name, info));
-            case 3 /* Object */:
-                var members = info.members, hasNontrivialPrototype = info.hasNontrivialPrototype;
-                if (!hasNontrivialPrototype) {
-                    if (kind === 0 /* ExportEquals */) {
-                        return ts.flatMap(members, function (v) { return toStatements(v, 1 /* NamedExport */); });
-                    }
-                    if (members.some(function (m) { return m.kind === 2 /* FunctionOrClass */; })) {
-                        // If some member is a function, use a namespace so it gets a FunctionDeclaration or ClassDeclaration.
-                        return exportDefault().concat([createNamespace(modifiers, name, ts.flatMap(members, toNamespaceMemberStatements))]);
-                    }
-                }
-            // falls through
-            case 0 /* Const */:
-            case 1 /* Array */: {
-                var comment = info.kind === 0 /* Const */ ? info.comment : undefined;
-                var constVar = ts.createVariableStatement(modifiers, ts.createVariableDeclarationList([ts.createVariableDeclaration(name, toType(info))], 2 /* Const */));
-                return exportEquals().concat(exportDefault(), [addComment(constVar, comment)]);
-            }
-            default:
-                return ts.Debug.assertNever(info);
-        }
-    }
-    function exportEqualsOrDefault(name, isExportEquals) {
-        return ts.createExportAssignment(/*decorators*/ undefined, /*modifiers*/ undefined, isExportEquals, ts.createIdentifier(name));
-    }
-    function functionOrClassToStatements(modifiers, name, _a) {
-        var source = _a.source, prototypeMembers = _a.prototypeMembers, namespaceMembers = _a.namespaceMembers;
-        var fnAst = parseClassOrFunctionBody(source);
-        var _b = fnAst === undefined ? { parameters: ts.emptyArray, returnType: anyType() } : getParametersAndReturnType(fnAst), parameters = _b.parameters, returnType = _b.returnType;
-        var protoOrInstanceMembers = ts.createMap();
-        if (typeof fnAst === "object")
-            getConstructorFunctionInstanceProperties(fnAst, protoOrInstanceMembers);
-        for (var _i = 0, prototypeMembers_1 = prototypeMembers; _i < prototypeMembers_1.length; _i++) {
-            var p = prototypeMembers_1[_i];
-            // ignore non-functions on the prototype
-            if (p.kind === 2 /* FunctionOrClass */) {
-                var m = tryGetMethod(p);
-                if (m) {
-                    protoOrInstanceMembers.set(p.name, m);
-                }
-            }
-        }
-        var classStaticMembers = protoOrInstanceMembers.size !== 0 || fnAst === undefined || typeof fnAst !== "number" && fnAst.kind === 157 /* Constructor */ ? [] : undefined;
-        var namespaceStatements = ts.flatMap(namespaceMembers, function (info) {
-            if (!isValidIdentifier(info.name))
-                return undefined;
-            if (classStaticMembers) {
-                switch (info.kind) {
-                    case 3 /* Object */:
-                        if (info.members.some(function (m) { return m.kind === 2 /* FunctionOrClass */; })) {
-                            break;
-                        }
-                    // falls through
-                    case 1 /* Array */:
-                    case 0 /* Const */:
-                        classStaticMembers.push(addComment(ts.createProperty(/*decorators*/ undefined, [ts.createModifier(116 /* StaticKeyword */)], info.name, /*questionOrExclamationToken*/ undefined, toType(info), /*initializer*/ undefined), info.kind === 0 /* Const */ ? info.comment : undefined));
-                        return undefined;
-                    case 2 /* FunctionOrClass */:
-                        if (!info.namespaceMembers.length) { // Else, can't merge a static method with a namespace. Must make it a function on the namespace.
-                            var sig = tryGetMethod(info, [ts.createModifier(116 /* StaticKeyword */)]);
-                            if (sig) {
-                                classStaticMembers.push(sig);
-                                return undefined;
-                            }
-                        }
-                        break;
-                    default:
-                        ts.Debug.assertNever(info);
-                }
-            }
-            return toStatements(info, 2 /* NamespaceMember */);
-        });
-        var decl = classStaticMembers
-            ? ts.createClassDeclaration(
-            /*decorators*/ undefined, modifiers, name, 
-            /*typeParameters*/ undefined, 
-            /*heritageClauses*/ undefined, classStaticMembers.concat((parameters.length ? [ts.createConstructor(/*decorators*/ undefined, /*modifiers*/ undefined, parameters, /*body*/ undefined)] : ts.emptyArray), ts.arrayFrom(protoOrInstanceMembers.values())))
-            : ts.createFunctionDeclaration(/*decorators*/ undefined, modifiers, /*asteriskToken*/ undefined, name, /*typeParameters*/ undefined, parameters, returnType, /*body*/ undefined);
-        return [decl].concat((namespaceStatements.length === 0 ? ts.emptyArray : [createNamespace(modifiers && modifiers.map(function (m) { return ts.getSynthesizedDeepClone(m); }), name, namespaceStatements)]));
-    }
-    function tryGetMethod(_a, modifiers) {
-        var name = _a.name, source = _a.source;
-        if (!isValidIdentifier(name))
-            return undefined;
-        var fnAst = parseClassOrFunctionBody(source);
-        if (fnAst === undefined || (typeof fnAst !== "number" && fnAst.kind === 157 /* Constructor */))
-            return undefined;
-        var sig = getParametersAndReturnType(fnAst);
-        return sig && ts.createMethod(
-        /*decorators*/ undefined, modifiers, 
-        /*asteriskToken*/ undefined, name, 
-        /*questionToken*/ undefined, 
-        /*typeParameters*/ undefined, sig.parameters, sig.returnType, 
-        /*body*/ undefined);
-    }
-    function toType(info) {
-        switch (info.kind) {
-            case 0 /* Const */:
-                return ts.createTypeReferenceNode(info.typeName, /*typeArguments*/ undefined);
-            case 1 /* Array */:
-                return ts.createArrayTypeNode(toType(info.inner));
-            case 2 /* FunctionOrClass */:
-                return ts.createTypeReferenceNode("Function", /*typeArguments*/ undefined); // Normally we create a FunctionDeclaration, but this can happen for a function in an array.
-            case 3 /* Object */:
-                return ts.createTypeLiteralNode(info.members.map(function (m) { return ts.createPropertySignature(/*modifiers*/ undefined, toPropertyName(m.name), /*questionToken*/ undefined, toType(m), /*initializer*/ undefined); }));
-            default:
-                return ts.Debug.assertNever(info);
-        }
-    }
-    function toPropertyName(name) {
-        return ts.isIdentifierText(name, 7 /* ESNext */) ? ts.createIdentifier(name) : ts.createStringLiteral(name);
-    }
-    // Parses assignments to "this.x" in the constructor into class property declarations
-    function getConstructorFunctionInstanceProperties(fnAst, members) {
-        forEachOwnNodeOfFunction(fnAst, function (node) {
-            if (ts.isAssignmentExpression(node, /*excludeCompoundAssignment*/ true) &&
-                ts.isPropertyAccessExpression(node.left) && node.left.expression.kind === 100 /* ThisKeyword */) {
-                var name_4 = node.left.name.text;
-                if (!ts.isJsPrivate(name_4)) {
-                    ts.getOrUpdate(members, name_4, function () { return ts.createProperty(/*decorators*/ undefined, /*modifiers*/ undefined, name_4, /*questionOrExclamationToken*/ undefined, anyType(), /*initializer*/ undefined); });
-                }
-            }
-        });
-    }
-    function getParametersAndReturnType(fnAst) {
-        if (typeof fnAst === "number") {
-            return { parameters: ts.fill(fnAst, function (i) { return makeParameter("p" + i, anyType()); }), returnType: anyType() };
-        }
-        var usedArguments = false, hasReturn = false;
-        forEachOwnNodeOfFunction(fnAst, function (node) {
-            usedArguments = usedArguments || ts.isIdentifier(node) && node.text === "arguments";
-            hasReturn = hasReturn || ts.isReturnStatement(node) && !!node.expression && node.expression.kind !== 200 /* VoidExpression */;
-        });
-        var parameters = fnAst.parameters.map(function (p) { return makeParameter("" + p.name.getText(), inferParameterType(fnAst, p)); }).concat((usedArguments ? [makeRestParameter()] : ts.emptyArray));
-        return { parameters: parameters, returnType: hasReturn ? anyType() : ts.createKeywordTypeNode(106 /* VoidKeyword */) };
-    }
-    function makeParameter(name, type) {
-        return ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, name, /*questionToken*/ undefined, type);
-    }
-    function makeRestParameter() {
-        return ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, ts.createToken(25 /* DotDotDotToken */), "args", /*questionToken*/ undefined, ts.createArrayTypeNode(anyType()));
-    }
-    /** Returns 'undefined' for class with no declared constructor */
-    function parseClassOrFunctionBody(source) {
-        if (typeof source === "number")
-            return source;
-        var classOrFunction = ts.tryCast(parseExpression(source), function (node) { return ts.isFunctionExpression(node) || ts.isArrowFunction(node) || ts.isClassExpression(node); });
-        return classOrFunction
-            ? ts.isClassExpression(classOrFunction) ? ts.find(classOrFunction.members, ts.isConstructorDeclaration) : classOrFunction
-            // If that didn't parse, it's a method `m() {}`. Parse again inside of an object literal.
-            : ts.cast(ts.first(ts.cast(parseExpression("{ " + source + " }"), ts.isObjectLiteralExpression).properties), ts.isMethodDeclaration);
-    }
-    function parseExpression(expr) {
-        var text = "const _ = " + expr;
-        var srcFile = ts.createSourceFile("test.ts", text, 7 /* Latest */, /*setParentNodes*/ true);
-        return ts.first(ts.cast(ts.first(srcFile.statements), ts.isVariableStatement).declarationList.declarations).initializer;
-    }
-    function inferParameterType(_fn, _param) {
-        // TODO: Inspect function body for clues (see inferFromUsage.ts)
-        return anyType();
-    }
-    // Descends through all nodes in a function, but not in nested functions.
-    function forEachOwnNodeOfFunction(fnAst, cb) {
-        fnAst.body.forEachChild(function recur(node) {
-            cb(node);
-            if (!ts.isFunctionLike(node))
-                node.forEachChild(recur);
-        });
-    }
-    function isValidIdentifier(name) {
-        var keyword = ts.stringToToken(name);
-        return !(keyword && ts.isNonContextualKeyword(keyword)) && ts.isIdentifierText(name, 7 /* ESNext */);
-    }
-    function addComment(node, comment) {
-        if (comment !== undefined)
-            ts.addSyntheticLeadingComment(node, 2 /* SingleLineCommentTrivia */, comment);
-        return node;
-    }
-    function anyType() {
-        return ts.createKeywordTypeNode(120 /* AnyKeyword */);
-    }
-    function createNamespace(modifiers, name, statements) {
-        return ts.createModuleDeclaration(/*decorators*/ undefined, modifiers, ts.createIdentifier(name), ts.createModuleBlock(statements), 16 /* Namespace */);
-    }
-})(ts || (ts = {}));
 /* @internal */
 var ts;
 (function (ts) {
@@ -116514,8 +120273,8 @@ var ts;
         });
         function getImportTypeNode(sourceFile, pos) {
             var token = ts.getTokenAtPosition(sourceFile, pos);
-            ts.Debug.assert(token.kind === 92 /* ImportKeyword */);
-            ts.Debug.assert(token.parent.kind === 183 /* ImportType */);
+            ts.Debug.assert(token.kind === 93 /* ImportKeyword */);
+            ts.Debug.assert(token.parent.kind === 184 /* ImportType */);
             return token.parent;
         }
         function doChange(changes, sourceFile, importType) {
@@ -116567,7 +120326,7 @@ var ts;
             var otherMembers = members.filter(function (member) { return !ts.isIndexSignatureDeclaration(member); });
             var parameter = ts.first(indexSignature.parameters);
             var mappedTypeParameter = ts.createTypeParameterDeclaration(ts.cast(parameter.name, ts.isIdentifier), parameter.type);
-            var mappedIntersectionType = ts.createMappedTypeNode(ts.hasReadonlyModifier(indexSignature) ? ts.createModifier(133 /* ReadonlyKeyword */) : undefined, mappedTypeParameter, indexSignature.questionToken, indexSignature.type);
+            var mappedIntersectionType = ts.createMappedTypeNode(ts.hasReadonlyModifier(indexSignature) ? ts.createModifier(134 /* ReadonlyKeyword */) : undefined, mappedTypeParameter, indexSignature.questionToken, indexSignature.type);
             var intersectionType = ts.createIntersectionTypeNode(ts.getAllSuperTypeNodes(container).concat([
                 mappedIntersectionType
             ], (otherMembers.length ? [ts.createTypeLiteralNode(otherMembers)] : ts.emptyArray)));
@@ -116577,6 +120336,49 @@ var ts;
 })(ts || (ts = {}));
 /* @internal */
 var ts;
+(function (ts) {
+    var codefix;
+    (function (codefix) {
+        var fixId = "removeUnnecessaryAwait";
+        var errorCodes = [
+            ts.Diagnostics.await_has_no_effect_on_the_type_of_this_expression.code,
+        ];
+        codefix.registerCodeFix({
+            errorCodes: errorCodes,
+            getCodeActions: function (context) {
+                var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return makeChange(t, context.sourceFile, context.span); });
+                if (changes.length > 0) {
+                    return [codefix.createCodeFixAction(fixId, changes, ts.Diagnostics.Remove_unnecessary_await, fixId, ts.Diagnostics.Remove_all_unnecessary_uses_of_await)];
+                }
+            },
+            fixIds: [fixId],
+            getAllCodeActions: function (context) {
+                return codefix.codeFixAll(context, errorCodes, function (changes, diag) { return makeChange(changes, diag.file, diag); });
+            },
+        });
+        function makeChange(changeTracker, sourceFile, span) {
+            var awaitKeyword = ts.tryCast(ts.getTokenAtPosition(sourceFile, span.start), function (node) { return node.kind === 123 /* AwaitKeyword */; });
+            var awaitExpression = awaitKeyword && ts.tryCast(awaitKeyword.parent, ts.isAwaitExpression);
+            if (!awaitExpression) {
+                return;
+            }
+            var expressionToReplace = awaitExpression;
+            var hasSurroundingParens = ts.isParenthesizedExpression(awaitExpression.parent);
+            if (hasSurroundingParens) {
+                var leftMostExpression = ts.getLeftmostExpression(awaitExpression.expression, /*stopAtCallExpressions*/ false);
+                if (ts.isIdentifier(leftMostExpression)) {
+                    var precedingToken = ts.findPrecedingToken(awaitExpression.parent.pos, sourceFile);
+                    if (precedingToken && precedingToken.kind !== 96 /* NewKeyword */) {
+                        expressionToReplace = awaitExpression.parent;
+                    }
+                }
+            }
+            changeTracker.replaceNode(sourceFile, expressionToReplace, awaitExpression.expression);
+        }
+    })(codefix = ts.codefix || (ts.codefix = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
 (function (ts) {
     var refactor;
     (function (refactor) {
@@ -116614,16 +120416,16 @@ var ts;
                 return undefined;
             }
             switch (exportNode.kind) {
-                case 239 /* FunctionDeclaration */:
-                case 240 /* ClassDeclaration */:
-                case 241 /* InterfaceDeclaration */:
-                case 243 /* EnumDeclaration */:
-                case 242 /* TypeAliasDeclaration */:
-                case 244 /* ModuleDeclaration */: {
+                case 240 /* FunctionDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 242 /* InterfaceDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
+                case 245 /* ModuleDeclaration */: {
                     var node = exportNode;
                     return node.name && ts.isIdentifier(node.name) ? { exportNode: node, exportName: node.name, wasDefault: wasDefault, exportingModuleSymbol: exportingModuleSymbol } : undefined;
                 }
-                case 219 /* VariableStatement */: {
+                case 220 /* VariableStatement */: {
                     var vs = exportNode;
                     // Must be `export const x = something;`.
                     if (!(vs.declarationList.flags & 2 /* Const */) || vs.declarationList.declarations.length !== 1) {
@@ -116646,17 +120448,17 @@ var ts;
         function changeExport(exportingSourceFile, _a, changes, checker) {
             var wasDefault = _a.wasDefault, exportNode = _a.exportNode, exportName = _a.exportName;
             if (wasDefault) {
-                changes.delete(exportingSourceFile, ts.Debug.assertDefined(ts.findModifier(exportNode, 80 /* DefaultKeyword */)));
+                changes.delete(exportingSourceFile, ts.Debug.assertDefined(ts.findModifier(exportNode, 81 /* DefaultKeyword */)));
             }
             else {
-                var exportKeyword = ts.Debug.assertDefined(ts.findModifier(exportNode, 85 /* ExportKeyword */));
+                var exportKeyword = ts.Debug.assertDefined(ts.findModifier(exportNode, 86 /* ExportKeyword */));
                 switch (exportNode.kind) {
-                    case 239 /* FunctionDeclaration */:
-                    case 240 /* ClassDeclaration */:
-                    case 241 /* InterfaceDeclaration */:
-                        changes.insertNodeAfter(exportingSourceFile, exportKeyword, ts.createToken(80 /* DefaultKeyword */));
+                    case 240 /* FunctionDeclaration */:
+                    case 241 /* ClassDeclaration */:
+                    case 242 /* InterfaceDeclaration */:
+                        changes.insertNodeAfter(exportingSourceFile, exportKeyword, ts.createToken(81 /* DefaultKeyword */));
                         break;
-                    case 219 /* VariableStatement */:
+                    case 220 /* VariableStatement */:
                         // If 'x' isn't used in this file, `export const x = 0;` --> `export default 0;`
                         if (!ts.FindAllReferences.Core.isSymbolReferencedInFile(exportName, checker, exportingSourceFile)) {
                             // We checked in `getInfo` that an initializer exists.
@@ -116664,9 +120466,9 @@ var ts;
                             break;
                         }
                     // falls through
-                    case 243 /* EnumDeclaration */:
-                    case 242 /* TypeAliasDeclaration */:
-                    case 244 /* ModuleDeclaration */:
+                    case 244 /* EnumDeclaration */:
+                    case 243 /* TypeAliasDeclaration */:
+                    case 245 /* ModuleDeclaration */:
                         // `export type T = number;` -> `type T = number; export default T;`
                         changes.deleteModifier(exportingSourceFile, exportKeyword);
                         changes.insertNodeAfter(exportingSourceFile, exportNode, ts.createExportDefault(ts.createIdentifier(exportName.text)));
@@ -116693,18 +120495,18 @@ var ts;
         function changeDefaultToNamedImport(importingSourceFile, ref, changes, exportName) {
             var parent = ref.parent;
             switch (parent.kind) {
-                case 189 /* PropertyAccessExpression */:
+                case 190 /* PropertyAccessExpression */:
                     // `a.default` --> `a.foo`
                     changes.replaceNode(importingSourceFile, ref, ts.createIdentifier(exportName));
                     break;
-                case 253 /* ImportSpecifier */:
-                case 257 /* ExportSpecifier */: {
+                case 254 /* ImportSpecifier */:
+                case 258 /* ExportSpecifier */: {
                     var spec = parent;
                     // `default as foo` --> `foo`, `default as bar` --> `foo as bar`
                     changes.replaceNode(importingSourceFile, spec, makeImportSpecifier(exportName, spec.name.text));
                     break;
                 }
-                case 250 /* ImportClause */: {
+                case 251 /* ImportClause */: {
                     var clause = parent;
                     ts.Debug.assert(clause.name === ref);
                     var spec = makeImportSpecifier(exportName, ref.text);
@@ -116713,7 +120515,7 @@ var ts;
                         // `import foo from "./a";` --> `import { foo } from "./a";`
                         changes.replaceNode(importingSourceFile, ref, ts.createNamedImports([spec]));
                     }
-                    else if (namedBindings.kind === 251 /* NamespaceImport */) {
+                    else if (namedBindings.kind === 252 /* NamespaceImport */) {
                         // `import foo, * as a from "./a";` --> `import * as a from ".a/"; import { foo } from "./a";`
                         changes.deleteRange(importingSourceFile, { pos: ref.getStart(importingSourceFile), end: namedBindings.getStart(importingSourceFile) });
                         var quotePreference = ts.isStringLiteral(clause.parent.moduleSpecifier) ? ts.quotePreferenceFromString(clause.parent.moduleSpecifier, importingSourceFile) : 1 /* Double */;
@@ -116734,11 +120536,11 @@ var ts;
         function changeNamedToDefaultImport(importingSourceFile, ref, changes) {
             var parent = ref.parent;
             switch (parent.kind) {
-                case 189 /* PropertyAccessExpression */:
+                case 190 /* PropertyAccessExpression */:
                     // `a.foo` --> `a.default`
                     changes.replaceNode(importingSourceFile, ref, ts.createIdentifier("default"));
                     break;
-                case 253 /* ImportSpecifier */: {
+                case 254 /* ImportSpecifier */: {
                     // `import { foo } from "./a";` --> `import foo from "./a";`
                     // `import { foo as bar } from "./a";` --> `import bar from "./a";`
                     var defaultImport = ts.createIdentifier(parent.name.text);
@@ -116751,7 +120553,7 @@ var ts;
                     }
                     break;
                 }
-                case 257 /* ExportSpecifier */: {
+                case 258 /* ExportSpecifier */: {
                     // `export { foo } from "./a";` --> `export { default as foo } from "./a";`
                     // `export { foo as bar } from "./a";` --> `export { default as bar } from "./a";`
                     // `export { foo as default } from "./a";` --> `export { default } from "./a";`
@@ -116784,8 +120586,8 @@ var ts;
                 var i = getImportToConvert(context);
                 if (!i)
                     return ts.emptyArray;
-                var description = i.kind === 251 /* NamespaceImport */ ? ts.Diagnostics.Convert_namespace_import_to_named_imports.message : ts.Diagnostics.Convert_named_imports_to_namespace_import.message;
-                var actionName = i.kind === 251 /* NamespaceImport */ ? actionNameNamespaceToNamed : actionNameNamedToNamespace;
+                var description = i.kind === 252 /* NamespaceImport */ ? ts.Diagnostics.Convert_namespace_import_to_named_imports.message : ts.Diagnostics.Convert_named_imports_to_namespace_import.message;
+                var actionName = i.kind === 252 /* NamespaceImport */ ? actionNameNamespaceToNamed : actionNameNamedToNamespace;
                 return [{ name: refactorName, description: description, actions: [{ name: actionName, description: description }] }];
             },
             getEditsForAction: function (context, actionName) {
@@ -116807,7 +120609,7 @@ var ts;
         }
         function doChange(sourceFile, program, changes, toConvert) {
             var checker = program.getTypeChecker();
-            if (toConvert.kind === 251 /* NamespaceImport */) {
+            if (toConvert.kind === 252 /* NamespaceImport */) {
                 doChangeNamespaceToNamed(sourceFile, checker, changes, toConvert, ts.getAllowSyntheticDefaultImports(program.getCompilerOptions()));
             }
             else {
@@ -116859,7 +120661,7 @@ var ts;
         function doChangeNamedToNamespace(sourceFile, checker, changes, toConvert) {
             var importDecl = toConvert.parent.parent;
             var moduleSpecifier = importDecl.moduleSpecifier;
-            var preferredName = moduleSpecifier && ts.isStringLiteral(moduleSpecifier) ? ts.codefix.moduleSpecifierToValidIdentifier(moduleSpecifier.text, 7 /* ESNext */) : "module";
+            var preferredName = moduleSpecifier && ts.isStringLiteral(moduleSpecifier) ? ts.codefix.moduleSpecifierToValidIdentifier(moduleSpecifier.text, 99 /* ESNext */) : "module";
             var namespaceNameConflicts = toConvert.elements.some(function (element) {
                 return ts.FindAllReferences.Core.eachSymbolReferenceInFile(element.name, checker, sourceFile, function (id) {
                     return !!checker.resolveName(preferredName, id, 67108863 /* All */, /*excludeGlobals*/ true);
@@ -117150,20 +120952,20 @@ var ts;
                 function checkForStaticContext(nodeToCheck, containingClass) {
                     var current = nodeToCheck;
                     while (current !== containingClass) {
-                        if (current.kind === 154 /* PropertyDeclaration */) {
+                        if (current.kind === 155 /* PropertyDeclaration */) {
                             if (ts.hasModifier(current, 32 /* Static */)) {
                                 rangeFacts |= RangeFacts.InStaticRegion;
                             }
                             break;
                         }
-                        else if (current.kind === 151 /* Parameter */) {
+                        else if (current.kind === 152 /* Parameter */) {
                             var ctorOrMethod = ts.getContainingFunction(current);
-                            if (ctorOrMethod.kind === 157 /* Constructor */) {
+                            if (ctorOrMethod.kind === 158 /* Constructor */) {
                                 rangeFacts |= RangeFacts.InStaticRegion;
                             }
                             break;
                         }
-                        else if (current.kind === 156 /* MethodDeclaration */) {
+                        else if (current.kind === 157 /* MethodDeclaration */) {
                             if (ts.hasModifier(current, 32 /* Static */)) {
                                 rangeFacts |= RangeFacts.InStaticRegion;
                             }
@@ -117206,7 +121008,7 @@ var ts;
                             return true;
                         }
                         if (ts.isDeclaration(node)) {
-                            var declaringNode = (node.kind === 237 /* VariableDeclaration */) ? node.parent.parent : node;
+                            var declaringNode = (node.kind === 238 /* VariableDeclaration */) ? node.parent.parent : node;
                             if (ts.hasModifier(declaringNode, 1 /* Export */)) {
                                 // TODO: GH#18217 Silly to use `errors ||` since it's definitely not defined (see top of `visit`)
                                 // Also, if we're only pushing one error, just use `let error: Diagnostic | undefined`!
@@ -117218,13 +121020,13 @@ var ts;
                         }
                         // Some things can't be extracted in certain situations
                         switch (node.kind) {
-                            case 249 /* ImportDeclaration */:
+                            case 250 /* ImportDeclaration */:
                                 (errors || (errors = [])).push(ts.createDiagnosticForNode(node, Messages.cannotExtractImport));
                                 return true;
-                            case 98 /* SuperKeyword */:
+                            case 99 /* SuperKeyword */:
                                 // For a super *constructor call*, we have to be extracting the entire class,
                                 // but a super *method call* simply implies a 'this' reference
-                                if (node.parent.kind === 191 /* CallExpression */) {
+                                if (node.parent.kind === 192 /* CallExpression */) {
                                     // Super constructor call
                                     var containingClass_1 = ts.getContainingClass(node); // TODO:GH#18217
                                     if (containingClass_1.pos < span.start || containingClass_1.end >= (span.start + span.length)) {
@@ -117239,8 +121041,8 @@ var ts;
                         }
                         if (ts.isFunctionLikeDeclaration(node) || ts.isClassLike(node)) {
                             switch (node.kind) {
-                                case 239 /* FunctionDeclaration */:
-                                case 240 /* ClassDeclaration */:
+                                case 240 /* FunctionDeclaration */:
+                                case 241 /* ClassDeclaration */:
                                     if (ts.isSourceFile(node.parent) && node.parent.externalModuleIndicator === undefined) {
                                         // You cannot extract global declarations
                                         (errors || (errors = [])).push(ts.createDiagnosticForNode(node, Messages.functionWillNotBeVisibleInTheNewScope));
@@ -117252,20 +121054,20 @@ var ts;
                         }
                         var savedPermittedJumps = permittedJumps;
                         switch (node.kind) {
-                            case 222 /* IfStatement */:
+                            case 223 /* IfStatement */:
                                 permittedJumps = 0 /* None */;
                                 break;
-                            case 235 /* TryStatement */:
+                            case 236 /* TryStatement */:
                                 // forbid all jumps inside try blocks
                                 permittedJumps = 0 /* None */;
                                 break;
-                            case 218 /* Block */:
-                                if (node.parent && node.parent.kind === 235 /* TryStatement */ && node.parent.finallyBlock === node) {
+                            case 219 /* Block */:
+                                if (node.parent && node.parent.kind === 236 /* TryStatement */ && node.parent.finallyBlock === node) {
                                     // allow unconditional returns from finally blocks
                                     permittedJumps = 4 /* Return */;
                                 }
                                 break;
-                            case 271 /* CaseClause */:
+                            case 272 /* CaseClause */:
                                 // allow unlabeled break inside case clauses
                                 permittedJumps |= 1 /* Break */;
                                 break;
@@ -117277,19 +121079,19 @@ var ts;
                                 break;
                         }
                         switch (node.kind) {
-                            case 178 /* ThisType */:
-                            case 100 /* ThisKeyword */:
+                            case 179 /* ThisType */:
+                            case 101 /* ThisKeyword */:
                                 rangeFacts |= RangeFacts.UsesThis;
                                 break;
-                            case 233 /* LabeledStatement */: {
+                            case 234 /* LabeledStatement */: {
                                 var label = node.label;
                                 (seenLabels || (seenLabels = [])).push(label.escapedText);
                                 ts.forEachChild(node, visit);
                                 seenLabels.pop();
                                 break;
                             }
-                            case 229 /* BreakStatement */:
-                            case 228 /* ContinueStatement */: {
+                            case 230 /* BreakStatement */:
+                            case 229 /* ContinueStatement */: {
                                 var label = node.label;
                                 if (label) {
                                     if (!ts.contains(seenLabels, label.escapedText)) {
@@ -117298,20 +121100,20 @@ var ts;
                                     }
                                 }
                                 else {
-                                    if (!(permittedJumps & (node.kind === 229 /* BreakStatement */ ? 1 /* Break */ : 2 /* Continue */))) {
+                                    if (!(permittedJumps & (node.kind === 230 /* BreakStatement */ ? 1 /* Break */ : 2 /* Continue */))) {
                                         // attempt to break or continue in a forbidden context
                                         (errors || (errors = [])).push(ts.createDiagnosticForNode(node, Messages.cannotExtractRangeContainingConditionalBreakOrContinueStatements));
                                     }
                                 }
                                 break;
                             }
-                            case 201 /* AwaitExpression */:
+                            case 202 /* AwaitExpression */:
                                 rangeFacts |= RangeFacts.IsAsyncFunction;
                                 break;
-                            case 207 /* YieldExpression */:
+                            case 208 /* YieldExpression */:
                                 rangeFacts |= RangeFacts.IsGenerator;
                                 break;
-                            case 230 /* ReturnStatement */:
+                            case 231 /* ReturnStatement */:
                                 if (permittedJumps & 4 /* Return */) {
                                     rangeFacts |= RangeFacts.HasReturn;
                                 }
@@ -117365,7 +121167,7 @@ var ts;
                 while (true) {
                     current = current.parent;
                     // A function parameter's initializer is actually in the outer scope, not the function declaration
-                    if (current.kind === 151 /* Parameter */) {
+                    if (current.kind === 152 /* Parameter */) {
                         // Skip all the way to the outer scope of the function that declared this parameter
                         current = ts.findAncestor(current, function (parent) { return ts.isFunctionLikeDeclaration(parent); }).parent;
                     }
@@ -117376,7 +121178,7 @@ var ts;
                     //  * Module/namespace or source file
                     if (isScope(current)) {
                         scopes.push(current);
-                        if (current.kind === 284 /* SourceFile */) {
+                        if (current.kind === 285 /* SourceFile */) {
                             return scopes;
                         }
                     }
@@ -117466,32 +121268,32 @@ var ts;
             }
             function getDescriptionForFunctionLikeDeclaration(scope) {
                 switch (scope.kind) {
-                    case 157 /* Constructor */:
+                    case 158 /* Constructor */:
                         return "constructor";
-                    case 196 /* FunctionExpression */:
-                    case 239 /* FunctionDeclaration */:
+                    case 197 /* FunctionExpression */:
+                    case 240 /* FunctionDeclaration */:
                         return scope.name
                             ? "function '" + scope.name.text + "'"
                             : "anonymous function";
-                    case 197 /* ArrowFunction */:
+                    case 198 /* ArrowFunction */:
                         return "arrow function";
-                    case 156 /* MethodDeclaration */:
+                    case 157 /* MethodDeclaration */:
                         return "method '" + scope.name.getText() + "'";
-                    case 158 /* GetAccessor */:
+                    case 159 /* GetAccessor */:
                         return "'get " + scope.name.getText() + "'";
-                    case 159 /* SetAccessor */:
+                    case 160 /* SetAccessor */:
                         return "'set " + scope.name.getText() + "'";
                     default:
                         throw ts.Debug.assertNever(scope);
                 }
             }
             function getDescriptionForClassLikeDeclaration(scope) {
-                return scope.kind === 240 /* ClassDeclaration */
+                return scope.kind === 241 /* ClassDeclaration */
                     ? scope.name ? "class '" + scope.name.text + "'" : "anonymous class declaration"
                     : scope.name ? "class expression '" + scope.name.text + "'" : "anonymous class expression";
             }
             function getDescriptionForModuleLikeDeclaration(scope) {
-                return scope.kind === 245 /* ModuleBlock */
+                return scope.kind === 246 /* ModuleBlock */
                     ? "namespace '" + scope.parent.name.getText() + "'"
                     : scope.externalModuleIndicator ? 0 /* Module */ : 1 /* Global */;
             }
@@ -117557,12 +121359,12 @@ var ts;
                 var newFunction;
                 if (ts.isClassLike(scope)) {
                     // always create private method in TypeScript files
-                    var modifiers = isJS ? [] : [ts.createToken(113 /* PrivateKeyword */)];
+                    var modifiers = isJS ? [] : [ts.createToken(114 /* PrivateKeyword */)];
                     if (range.facts & RangeFacts.InStaticRegion) {
-                        modifiers.push(ts.createToken(116 /* StaticKeyword */));
+                        modifiers.push(ts.createToken(117 /* StaticKeyword */));
                     }
                     if (range.facts & RangeFacts.IsAsyncFunction) {
-                        modifiers.push(ts.createToken(121 /* AsyncKeyword */));
+                        modifiers.push(ts.createToken(122 /* AsyncKeyword */));
                     }
                     newFunction = ts.createMethod(
                     /*decorators*/ undefined, modifiers.length ? modifiers : undefined, range.facts & RangeFacts.IsGenerator ? ts.createToken(40 /* AsteriskToken */) : undefined, functionName, 
@@ -117570,7 +121372,7 @@ var ts;
                 }
                 else {
                     newFunction = ts.createFunctionDeclaration(
-                    /*decorators*/ undefined, range.facts & RangeFacts.IsAsyncFunction ? [ts.createToken(121 /* AsyncKeyword */)] : undefined, range.facts & RangeFacts.IsGenerator ? ts.createToken(40 /* AsteriskToken */) : undefined, functionName, typeParameters, parameters, returnType, body);
+                    /*decorators*/ undefined, range.facts & RangeFacts.IsAsyncFunction ? [ts.createToken(122 /* AsyncKeyword */)] : undefined, range.facts & RangeFacts.IsGenerator ? ts.createToken(40 /* AsteriskToken */) : undefined, functionName, typeParameters, parameters, returnType, body);
                 }
                 var changeTracker = ts.textChanges.ChangeTracker.fromContext(context);
                 var minInsertionPos = (isReadonlyArray(range.range) ? ts.last(range.range) : range.range).end;
@@ -117711,9 +121513,9 @@ var ts;
                     while (ts.isParenthesizedTypeNode(withoutParens)) {
                         withoutParens = withoutParens.type;
                     }
-                    return ts.isUnionTypeNode(withoutParens) && ts.find(withoutParens.types, function (t) { return t.kind === 141 /* UndefinedKeyword */; })
+                    return ts.isUnionTypeNode(withoutParens) && ts.find(withoutParens.types, function (t) { return t.kind === 142 /* UndefinedKeyword */; })
                         ? clone
-                        : ts.createUnionTypeNode([clone, ts.createKeywordTypeNode(141 /* UndefinedKeyword */)]);
+                        : ts.createUnionTypeNode([clone, ts.createKeywordTypeNode(142 /* UndefinedKeyword */)]);
                 }
             }
             /**
@@ -117736,11 +121538,11 @@ var ts;
                 if (ts.isClassLike(scope)) {
                     ts.Debug.assert(!isJS); // See CannotExtractToJSClass
                     var modifiers = [];
-                    modifiers.push(ts.createToken(113 /* PrivateKeyword */));
+                    modifiers.push(ts.createToken(114 /* PrivateKeyword */));
                     if (rangeFacts & RangeFacts.InStaticRegion) {
-                        modifiers.push(ts.createToken(116 /* StaticKeyword */));
+                        modifiers.push(ts.createToken(117 /* StaticKeyword */));
                     }
-                    modifiers.push(ts.createToken(133 /* ReadonlyKeyword */));
+                    modifiers.push(ts.createToken(134 /* ReadonlyKeyword */));
                     var newVariable = ts.createProperty(
                     /*decorators*/ undefined, modifiers, localNameText, 
                     /*questionToken*/ undefined, variableType, initializer);
@@ -117769,7 +121571,7 @@ var ts;
                         var localReference = ts.createIdentifier(localNameText);
                         changeTracker.replaceNode(context.file, node, localReference);
                     }
-                    else if (node.parent.kind === 221 /* ExpressionStatement */ && scope === ts.findAncestor(node, isScope)) {
+                    else if (node.parent.kind === 222 /* ExpressionStatement */ && scope === ts.findAncestor(node, isScope)) {
                         // If the parent is an expression statement and the target scope is the immediately enclosing one,
                         // replace the statement with the declaration.
                         var newVariableStatement = ts.createVariableStatement(
@@ -117788,7 +121590,7 @@ var ts;
                             changeTracker.insertNodeBefore(context.file, nodeToInsertBefore, newVariableStatement, /*blankLineBetween*/ false);
                         }
                         // Consume
-                        if (node.parent.kind === 221 /* ExpressionStatement */) {
+                        if (node.parent.kind === 222 /* ExpressionStatement */) {
                             // If the parent is an expression statement, delete it.
                             changeTracker.delete(context.file, node.parent);
                         }
@@ -117875,7 +121677,7 @@ var ts;
                     return { body: ts.createBlock(statements, /*multiLine*/ true), returnValueProperty: undefined };
                 }
                 function visitor(node) {
-                    if (!ignoreReturns && node.kind === 230 /* ReturnStatement */ && hasWritesOrVariableDeclarations) {
+                    if (!ignoreReturns && node.kind === 231 /* ReturnStatement */ && hasWritesOrVariableDeclarations) {
                         var assignments = getPropertyAssignmentsForWritesAndVariableDeclarations(exposedVariableDeclarations, writes);
                         if (node.expression) {
                             if (!returnValueProperty) {
@@ -118053,7 +121855,7 @@ var ts;
                     var scope = scopes_1[_i];
                     usagesPerScope.push({ usages: ts.createMap(), typeParameterUsages: ts.createMap(), substitutions: ts.createMap() });
                     substitutionsPerScope.push(ts.createMap());
-                    functionErrorsPerScope.push(ts.isFunctionLikeDeclaration(scope) && scope.kind !== 239 /* FunctionDeclaration */
+                    functionErrorsPerScope.push(ts.isFunctionLikeDeclaration(scope) && scope.kind !== 240 /* FunctionDeclaration */
                         ? [ts.createDiagnosticForNode(scope, Messages.cannotExtractToOtherFunctionLike)]
                         : []);
                     var constantErrors = [];
@@ -118369,30 +122171,30 @@ var ts;
             function isExtractableExpression(node) {
                 var parent = node.parent;
                 switch (parent.kind) {
-                    case 278 /* EnumMember */:
+                    case 279 /* EnumMember */:
                         return false;
                 }
                 switch (node.kind) {
                     case 10 /* StringLiteral */:
-                        return parent.kind !== 249 /* ImportDeclaration */ &&
-                            parent.kind !== 253 /* ImportSpecifier */;
-                    case 208 /* SpreadElement */:
-                    case 184 /* ObjectBindingPattern */:
-                    case 186 /* BindingElement */:
+                        return parent.kind !== 250 /* ImportDeclaration */ &&
+                            parent.kind !== 254 /* ImportSpecifier */;
+                    case 209 /* SpreadElement */:
+                    case 185 /* ObjectBindingPattern */:
+                    case 187 /* BindingElement */:
                         return false;
-                    case 72 /* Identifier */:
-                        return parent.kind !== 186 /* BindingElement */ &&
-                            parent.kind !== 253 /* ImportSpecifier */ &&
-                            parent.kind !== 257 /* ExportSpecifier */;
+                    case 73 /* Identifier */:
+                        return parent.kind !== 187 /* BindingElement */ &&
+                            parent.kind !== 254 /* ImportSpecifier */ &&
+                            parent.kind !== 258 /* ExportSpecifier */;
                 }
                 return true;
             }
             function isBlockLike(node) {
                 switch (node.kind) {
-                    case 218 /* Block */:
-                    case 284 /* SourceFile */:
-                    case 245 /* ModuleBlock */:
-                    case 271 /* CaseClause */:
+                    case 219 /* Block */:
+                    case 285 /* SourceFile */:
+                    case 246 /* ModuleBlock */:
+                    case 272 /* CaseClause */:
                         return true;
                     default:
                         return false;
@@ -118403,6 +122205,136 @@ var ts;
 })(ts || (ts = {}));
 /* @internal */
 var ts;
+(function (ts) {
+    var refactor;
+    (function (refactor) {
+        var refactorName = "Extract type";
+        var extractToTypeAlias = "Extract to type alias";
+        var extractToTypeDef = "Extract to typedef";
+        refactor.registerRefactor(refactorName, {
+            getAvailableActions: function (context) {
+                var info = getRangeToExtract(context);
+                if (!info)
+                    return ts.emptyArray;
+                return [{
+                        name: refactorName,
+                        description: ts.getLocaleSpecificMessage(ts.Diagnostics.Extract_type),
+                        actions: [info.isJS ? {
+                                name: extractToTypeDef, description: ts.getLocaleSpecificMessage(ts.Diagnostics.Extract_to_typedef)
+                            } : {
+                                name: extractToTypeAlias, description: ts.getLocaleSpecificMessage(ts.Diagnostics.Extract_to_type_alias)
+                            }]
+                    }];
+            },
+            getEditsForAction: function (context, actionName) {
+                ts.Debug.assert(actionName === extractToTypeAlias || actionName === extractToTypeDef);
+                var file = context.file;
+                var info = ts.Debug.assertDefined(getRangeToExtract(context));
+                ts.Debug.assert(actionName === extractToTypeAlias && !info.isJS || actionName === extractToTypeDef && info.isJS);
+                var name = ts.getUniqueName("NewType", file);
+                var edits = ts.textChanges.ChangeTracker.with(context, function (changes) { return info.isJS ?
+                    doTypedefChange(changes, file, name, info.firstStatement, info.selection, info.typeParameters) :
+                    doTypeAliasChange(changes, file, name, info.firstStatement, info.selection, info.typeParameters); });
+                var renameFilename = file.fileName;
+                var renameLocation = ts.getRenameLocation(edits, renameFilename, name, /*preferLastLocation*/ false);
+                return { edits: edits, renameFilename: renameFilename, renameLocation: renameLocation };
+            }
+        });
+        function getRangeToExtract(context) {
+            var file = context.file, startPosition = context.startPosition;
+            var isJS = ts.isSourceFileJS(file);
+            var current = ts.getTokenAtPosition(file, startPosition);
+            var range = ts.createTextRangeFromSpan(ts.getRefactorContextSpan(context));
+            var selection = ts.findAncestor(current, (function (node) { return node.parent && rangeContainsSkipTrivia(range, node, file) && !rangeContainsSkipTrivia(range, node.parent, file); }));
+            if (!selection || !ts.isTypeNode(selection))
+                return undefined;
+            var checker = context.program.getTypeChecker();
+            var firstStatement = ts.Debug.assertDefined(isJS ? ts.findAncestor(selection, isStatementAndHasJSDoc) : ts.findAncestor(selection, ts.isStatement));
+            var typeParameters = collectTypeParameters(checker, selection, firstStatement, file);
+            if (!typeParameters)
+                return undefined;
+            return { isJS: isJS, selection: selection, firstStatement: firstStatement, typeParameters: typeParameters };
+        }
+        function isStatementAndHasJSDoc(n) {
+            return ts.isStatement(n) && ts.hasJSDocNodes(n);
+        }
+        function rangeContainsSkipTrivia(r1, node, file) {
+            return ts.rangeContainsStartEnd(r1, ts.skipTrivia(file.text, node.pos), node.end);
+        }
+        function collectTypeParameters(checker, selection, statement, file) {
+            var result = [];
+            return visitor(selection) ? undefined : result;
+            function visitor(node) {
+                if (ts.isTypeReferenceNode(node)) {
+                    if (ts.isIdentifier(node.typeName)) {
+                        var symbol = checker.resolveName(node.typeName.text, node.typeName, 262144 /* TypeParameter */, /* excludeGlobals */ true);
+                        if (symbol) {
+                            var declaration = ts.cast(ts.first(symbol.declarations), ts.isTypeParameterDeclaration);
+                            if (rangeContainsSkipTrivia(statement, declaration, file) && !rangeContainsSkipTrivia(selection, declaration, file)) {
+                                result.push(declaration);
+                            }
+                        }
+                    }
+                }
+                else if (ts.isInferTypeNode(node)) {
+                    var conditionalTypeNode = ts.findAncestor(node, function (n) { return ts.isConditionalTypeNode(n) && rangeContainsSkipTrivia(n.extendsType, node, file); });
+                    if (!conditionalTypeNode || !rangeContainsSkipTrivia(selection, conditionalTypeNode, file)) {
+                        return true;
+                    }
+                }
+                else if ((ts.isTypePredicateNode(node) || ts.isThisTypeNode(node))) {
+                    var functionLikeNode = ts.findAncestor(node.parent, ts.isFunctionLike);
+                    if (functionLikeNode && functionLikeNode.type && rangeContainsSkipTrivia(functionLikeNode.type, node, file) && !rangeContainsSkipTrivia(selection, functionLikeNode, file)) {
+                        return true;
+                    }
+                }
+                else if (ts.isTypeQueryNode(node)) {
+                    if (ts.isIdentifier(node.exprName)) {
+                        var symbol = checker.resolveName(node.exprName.text, node.exprName, 67220415 /* Value */, /* excludeGlobals */ false);
+                        if (symbol && rangeContainsSkipTrivia(statement, symbol.valueDeclaration, file) && !rangeContainsSkipTrivia(selection, symbol.valueDeclaration, file)) {
+                            return true;
+                        }
+                    }
+                    else {
+                        if (ts.isThisIdentifier(node.exprName.left) && !rangeContainsSkipTrivia(selection, node.parent, file)) {
+                            return true;
+                        }
+                    }
+                }
+                return ts.forEachChild(node, visitor);
+            }
+        }
+        function doTypeAliasChange(changes, file, name, firstStatement, selection, typeParameters) {
+            var newTypeNode = ts.createTypeAliasDeclaration(
+            /* decorators */ undefined, 
+            /* modifiers */ undefined, name, typeParameters.map(function (id) { return ts.updateTypeParameterDeclaration(id, id.name, id.constraint, /* defaultType */ undefined); }), selection);
+            changes.insertNodeBefore(file, firstStatement, newTypeNode, /* blankLineBetween */ true);
+            changes.replaceNode(file, selection, ts.createTypeReferenceNode(name, typeParameters.map(function (id) { return ts.createTypeReferenceNode(id.name, /* typeArguments */ undefined); })));
+        }
+        function doTypedefChange(changes, file, name, firstStatement, selection, typeParameters) {
+            var node = ts.createNode(311 /* JSDocTypedefTag */);
+            node.tagName = ts.createIdentifier("typedef"); // TODO: jsdoc factory https://github.com/Microsoft/TypeScript/pull/29539
+            node.fullName = ts.createIdentifier(name);
+            node.name = node.fullName;
+            node.typeExpression = ts.createJSDocTypeExpression(selection);
+            var templates = [];
+            ts.forEach(typeParameters, function (typeParameter) {
+                var constraint = ts.getEffectiveConstraintOfTypeParameter(typeParameter);
+                var template = ts.createNode(310 /* JSDocTemplateTag */);
+                template.tagName = ts.createIdentifier("template");
+                template.constraint = constraint && ts.cast(constraint, ts.isJSDocTypeExpression);
+                var parameter = ts.createNode(151 /* TypeParameter */);
+                parameter.name = typeParameter.name;
+                template.typeParameters = ts.createNodeArray([parameter]);
+                templates.push(template);
+            });
+            changes.insertNodeBefore(file, firstStatement, ts.createJSDocComment(/* comment */ undefined, ts.createNodeArray(ts.concatenate(templates, [node]))), /* blankLineBetween */ true);
+            changes.replaceNode(file, selection, ts.createTypeReferenceNode(name, typeParameters.map(function (id) { return ts.createTypeReferenceNode(id.name, /* typeArguments */ undefined); })));
+        }
+    })(refactor = ts.refactor || (ts.refactor = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
 (function (ts) {
     var refactor;
     (function (refactor) {
@@ -118441,10 +122373,10 @@ var ts;
                 var modifierFlags = ts.getModifierFlags(declaration) & ~64 /* Readonly */;
                 var accessorModifiers = isInClassLike
                     ? !modifierFlags || modifierFlags & 8 /* Private */
-                        ? getModifiers(isJS, isStatic, 115 /* PublicKeyword */)
+                        ? getModifiers(isJS, isStatic, 116 /* PublicKeyword */)
                         : ts.createNodeArray(ts.createModifiersFromModifierFlags(modifierFlags))
                     : undefined;
-                var fieldModifiers = isInClassLike ? getModifiers(isJS, isStatic, 113 /* PrivateKeyword */) : undefined;
+                var fieldModifiers = isInClassLike ? getModifiers(isJS, isStatic, 114 /* PrivateKeyword */) : undefined;
                 updateFieldDeclaration(changeTracker, file, declaration, fieldName, fieldModifiers);
                 var getAccessor = generateGetAccessor(fieldName, accessorName, type, accessorModifiers, isStatic, container);
                 ts.suppressLeadingAndTrailingTrivia(getAccessor);
@@ -118482,7 +122414,7 @@ var ts;
                 return ts.isIdentifier(fieldName) ? ts.createPropertyAccess(leftHead, fieldName) : ts.createElementAccess(leftHead, ts.createLiteral(fieldName));
             }
             function getModifiers(isJS, isStatic, accessModifier) {
-                var modifiers = ts.append(!isJS ? [ts.createToken(accessModifier)] : undefined, isStatic ? ts.createToken(116 /* StaticKeyword */) : undefined);
+                var modifiers = ts.append(!isJS ? [ts.createToken(accessModifier)] : undefined, isStatic ? ts.createToken(117 /* StaticKeyword */) : undefined);
                 return modifiers && ts.createNodeArray(modifiers);
             }
             function startsWithUnderscore(name) {
@@ -118505,7 +122437,7 @@ var ts;
                     isStatic: ts.hasStaticModifier(declaration),
                     isReadonly: ts.hasReadonlyModifier(declaration),
                     type: ts.getTypeAnnotationNode(declaration),
-                    container: declaration.kind === 151 /* Parameter */ ? declaration.parent.parent : declaration.parent,
+                    container: declaration.kind === 152 /* Parameter */ ? declaration.parent.parent : declaration.parent,
                     originalName: declaration.name.text,
                     declaration: declaration,
                     fieldName: fieldName,
@@ -118562,13 +122494,13 @@ var ts;
                     return;
                 constructor.body.forEachChild(function recur(node) {
                     if (ts.isElementAccessExpression(node) &&
-                        node.expression.kind === 100 /* ThisKeyword */ &&
+                        node.expression.kind === 101 /* ThisKeyword */ &&
                         ts.isStringLiteral(node.argumentExpression) &&
                         node.argumentExpression.text === originalName &&
                         ts.isWriteAccess(node)) {
                         changeTracker.replaceNode(file, node.argumentExpression, ts.createStringLiteral(fieldName));
                     }
-                    if (ts.isPropertyAccessExpression(node) && node.expression.kind === 100 /* ThisKeyword */ && node.name.text === originalName && ts.isWriteAccess(node)) {
+                    if (ts.isPropertyAccessExpression(node) && node.expression.kind === 101 /* ThisKeyword */ && node.name.text === originalName && ts.isWriteAccess(node)) {
                         changeTracker.replaceNode(file, node.name, ts.createIdentifier(fieldName));
                     }
                     if (!ts.isFunctionLike(node) && !ts.isClassLike(node)) {
@@ -118650,11 +122582,11 @@ var ts;
         }
         function isPureImport(node) {
             switch (node.kind) {
-                case 249 /* ImportDeclaration */:
+                case 250 /* ImportDeclaration */:
                     return true;
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return !ts.hasModifier(node, 1 /* Export */);
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     return node.declarationList.declarations.every(function (d) { return !!d.initializer && ts.isRequireCall(d.initializer, /*checkArgumentIsStringLiteralLike*/ true); });
                 default:
                     return false;
@@ -118742,19 +122674,19 @@ var ts;
         }
         function getNamespaceLikeImport(node) {
             switch (node.kind) {
-                case 249 /* ImportDeclaration */:
-                    return node.importClause && node.importClause.namedBindings && node.importClause.namedBindings.kind === 251 /* NamespaceImport */ ?
+                case 250 /* ImportDeclaration */:
+                    return node.importClause && node.importClause.namedBindings && node.importClause.namedBindings.kind === 252 /* NamespaceImport */ ?
                         node.importClause.namedBindings.name : undefined;
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return node.name;
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     return ts.tryCast(node.name, ts.isIdentifier);
                 default:
                     return ts.Debug.assertNever(node);
             }
         }
         function updateNamespaceLikeImport(changes, sourceFile, checker, movedSymbols, newModuleName, newModuleSpecifier, oldImportId, oldImportNode) {
-            var preferredNewNamespaceName = ts.codefix.moduleSpecifierToValidIdentifier(newModuleName, 7 /* ESNext */);
+            var preferredNewNamespaceName = ts.codefix.moduleSpecifierToValidIdentifier(newModuleName, 99 /* ESNext */);
             var needUniqueName = false;
             var toChange = [];
             ts.FindAllReferences.Core.eachSymbolReferenceInFile(oldImportId, checker, sourceFile, function (ref) {
@@ -118778,20 +122710,20 @@ var ts;
             var newNamespaceId = ts.createIdentifier(newNamespaceName);
             var newModuleString = ts.createLiteral(newModuleSpecifier);
             switch (node.kind) {
-                case 249 /* ImportDeclaration */:
+                case 250 /* ImportDeclaration */:
                     return ts.createImportDeclaration(
                     /*decorators*/ undefined, /*modifiers*/ undefined, ts.createImportClause(/*name*/ undefined, ts.createNamespaceImport(newNamespaceId)), newModuleString);
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return ts.createImportEqualsDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, newNamespaceId, ts.createExternalModuleReference(newModuleString));
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     return ts.createVariableDeclaration(newNamespaceId, /*type*/ undefined, createRequireCall(newModuleString));
                 default:
                     return ts.Debug.assertNever(node);
             }
         }
         function moduleSpecifierFromImport(i) {
-            return (i.kind === 249 /* ImportDeclaration */ ? i.moduleSpecifier
-                : i.kind === 248 /* ImportEqualsDeclaration */ ? i.moduleReference.expression
+            return (i.kind === 250 /* ImportDeclaration */ ? i.moduleSpecifier
+                : i.kind === 249 /* ImportEqualsDeclaration */ ? i.moduleReference.expression
                     : i.initializer.arguments[0]);
         }
         function forEachImportInStatement(statement, cb) {
@@ -118861,15 +122793,15 @@ var ts;
         }
         function deleteUnusedImports(sourceFile, importDecl, changes, isUnused) {
             switch (importDecl.kind) {
-                case 249 /* ImportDeclaration */:
+                case 250 /* ImportDeclaration */:
                     deleteUnusedImportsInDeclaration(sourceFile, importDecl, changes, isUnused);
                     break;
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     if (isUnused(importDecl.name)) {
                         changes.delete(sourceFile, importDecl);
                     }
                     break;
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     deleteUnusedImportsInVariableDeclaration(sourceFile, importDecl, changes, isUnused);
                     break;
                 default:
@@ -118882,7 +122814,7 @@ var ts;
             var _a = importDecl.importClause, name = _a.name, namedBindings = _a.namedBindings;
             var defaultUnused = !name || isUnused(name);
             var namedBindingsUnused = !namedBindings ||
-                (namedBindings.kind === 251 /* NamespaceImport */ ? isUnused(namedBindings.name) : namedBindings.elements.length !== 0 && namedBindings.elements.every(function (e) { return isUnused(e.name); }));
+                (namedBindings.kind === 252 /* NamespaceImport */ ? isUnused(namedBindings.name) : namedBindings.elements.length !== 0 && namedBindings.elements.every(function (e) { return isUnused(e.name); }));
             if (defaultUnused && namedBindingsUnused) {
                 changes.delete(sourceFile, importDecl);
             }
@@ -118894,7 +122826,7 @@ var ts;
                     if (namedBindingsUnused) {
                         changes.delete(sourceFile, namedBindings);
                     }
-                    else if (namedBindings.kind === 252 /* NamedImports */) {
+                    else if (namedBindings.kind === 253 /* NamedImports */) {
                         for (var _i = 0, _b = namedBindings.elements; _i < _b.length; _i++) {
                             var element = _b[_i];
                             if (isUnused(element.name))
@@ -118907,14 +122839,14 @@ var ts;
         function deleteUnusedImportsInVariableDeclaration(sourceFile, varDecl, changes, isUnused) {
             var name = varDecl.name;
             switch (name.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     if (isUnused(name)) {
                         changes.delete(sourceFile, name);
                     }
                     break;
-                case 185 /* ArrayBindingPattern */:
+                case 186 /* ArrayBindingPattern */:
                     break;
-                case 184 /* ObjectBindingPattern */:
+                case 185 /* ObjectBindingPattern */:
                     if (name.elements.every(function (e) { return ts.isIdentifier(e.name) && isUnused(e.name); })) {
                         changes.delete(sourceFile, ts.isVariableDeclarationList(varDecl.parent) && varDecl.parent.declarations.length === 1 ? varDecl.parent.parent : varDecl);
                     }
@@ -119041,13 +122973,13 @@ var ts;
         // Below should all be utilities
         function isInImport(decl) {
             switch (decl.kind) {
-                case 248 /* ImportEqualsDeclaration */:
-                case 253 /* ImportSpecifier */:
-                case 250 /* ImportClause */:
+                case 249 /* ImportEqualsDeclaration */:
+                case 254 /* ImportSpecifier */:
+                case 251 /* ImportClause */:
                     return true;
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     return isVariableDeclarationInImport(decl);
-                case 186 /* BindingElement */:
+                case 187 /* BindingElement */:
                     return ts.isVariableDeclaration(decl.parent.parent) && isVariableDeclarationInImport(decl.parent.parent);
                 default:
                     return false;
@@ -119059,7 +122991,7 @@ var ts;
         }
         function filterImport(i, moduleSpecifier, keep) {
             switch (i.kind) {
-                case 249 /* ImportDeclaration */: {
+                case 250 /* ImportDeclaration */: {
                     var clause = i.importClause;
                     if (!clause)
                         return undefined;
@@ -119069,9 +123001,9 @@ var ts;
                         ? ts.createImportDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, ts.createImportClause(defaultImport, namedBindings), moduleSpecifier)
                         : undefined;
                 }
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return keep(i.name) ? i : undefined;
-                case 237 /* VariableDeclaration */: {
+                case 238 /* VariableDeclaration */: {
                     var name = filterBindingName(i.name, keep);
                     return name ? makeVariableStatement(name, i.type, createRequireCall(moduleSpecifier), i.parent.flags) : undefined;
                 }
@@ -119080,7 +123012,7 @@ var ts;
             }
         }
         function filterNamedBindings(namedBindings, keep) {
-            if (namedBindings.kind === 251 /* NamespaceImport */) {
+            if (namedBindings.kind === 252 /* NamespaceImport */) {
                 return keep(namedBindings.name) ? namedBindings : undefined;
             }
             else {
@@ -119090,11 +123022,11 @@ var ts;
         }
         function filterBindingName(name, keep) {
             switch (name.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return keep(name) ? name : undefined;
-                case 185 /* ArrayBindingPattern */:
+                case 186 /* ArrayBindingPattern */:
                     return name;
-                case 184 /* ObjectBindingPattern */: {
+                case 185 /* ObjectBindingPattern */: {
                     // We can't handle nested destructurings or property names well here, so just copy them all.
                     var newElements = name.elements.filter(function (prop) { return prop.propertyName || !ts.isIdentifier(prop.name) || keep(prop.name); });
                     return newElements.length ? ts.createObjectBindingPattern(newElements) : undefined;
@@ -119151,13 +123083,13 @@ var ts;
         }
         function isNonVariableTopLevelDeclaration(node) {
             switch (node.kind) {
-                case 239 /* FunctionDeclaration */:
-                case 240 /* ClassDeclaration */:
-                case 244 /* ModuleDeclaration */:
-                case 243 /* EnumDeclaration */:
-                case 242 /* TypeAliasDeclaration */:
-                case 241 /* InterfaceDeclaration */:
-                case 248 /* ImportEqualsDeclaration */:
+                case 240 /* FunctionDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 245 /* ModuleDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
+                case 242 /* InterfaceDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return true;
                 default:
                     return false;
@@ -119165,17 +123097,17 @@ var ts;
         }
         function forEachTopLevelDeclaration(statement, cb) {
             switch (statement.kind) {
-                case 239 /* FunctionDeclaration */:
-                case 240 /* ClassDeclaration */:
-                case 244 /* ModuleDeclaration */:
-                case 243 /* EnumDeclaration */:
-                case 242 /* TypeAliasDeclaration */:
-                case 241 /* InterfaceDeclaration */:
-                case 248 /* ImportEqualsDeclaration */:
+                case 240 /* FunctionDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 245 /* ModuleDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
+                case 242 /* InterfaceDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return cb(statement);
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     return ts.firstDefined(statement.declarationList.declarations, function (decl) { return forEachTopLevelDeclarationInBindingName(decl.name, cb); });
-                case 221 /* ExpressionStatement */: {
+                case 222 /* ExpressionStatement */: {
                     var expression = statement.expression;
                     return ts.isBinaryExpression(expression) && ts.getAssignmentDeclarationKind(expression) === 1 /* ExportsProperty */
                         ? cb(statement)
@@ -119185,10 +123117,10 @@ var ts;
         }
         function forEachTopLevelDeclarationInBindingName(name, cb) {
             switch (name.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return cb(ts.cast(name.parent, function (x) { return ts.isVariableDeclaration(x) || ts.isBindingElement(x); }));
-                case 185 /* ArrayBindingPattern */:
-                case 184 /* ObjectBindingPattern */:
+                case 186 /* ArrayBindingPattern */:
+                case 185 /* ObjectBindingPattern */:
                     return ts.firstDefined(name.elements, function (em) { return ts.isOmittedExpression(em) ? undefined : forEachTopLevelDeclarationInBindingName(em.name, cb); });
                 default:
                     return ts.Debug.assertNever(name);
@@ -119199,9 +123131,9 @@ var ts;
         }
         function getTopLevelDeclarationStatement(d) {
             switch (d.kind) {
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     return d.parent.parent;
-                case 186 /* BindingElement */:
+                case 187 /* BindingElement */:
                     return getTopLevelDeclarationStatement(ts.cast(d.parent.parent, function (p) { return ts.isVariableDeclaration(p) || ts.isBindingElement(p); }));
                 default:
                     return d;
@@ -119232,25 +123164,25 @@ var ts;
             return useEs6Exports ? [addEs6Export(decl)] : addCommonjsExport(decl);
         }
         function addEs6Export(d) {
-            var modifiers = ts.concatenate([ts.createModifier(85 /* ExportKeyword */)], d.modifiers);
+            var modifiers = ts.concatenate([ts.createModifier(86 /* ExportKeyword */)], d.modifiers);
             switch (d.kind) {
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     return ts.updateFunctionDeclaration(d, d.decorators, modifiers, d.asteriskToken, d.name, d.typeParameters, d.parameters, d.type, d.body);
-                case 240 /* ClassDeclaration */:
+                case 241 /* ClassDeclaration */:
                     return ts.updateClassDeclaration(d, d.decorators, modifiers, d.name, d.typeParameters, d.heritageClauses, d.members);
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     return ts.updateVariableStatement(d, modifiers, d.declarationList);
-                case 244 /* ModuleDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     return ts.updateModuleDeclaration(d, d.decorators, modifiers, d.name, d.body);
-                case 243 /* EnumDeclaration */:
+                case 244 /* EnumDeclaration */:
                     return ts.updateEnumDeclaration(d, d.decorators, modifiers, d.name, d.members);
-                case 242 /* TypeAliasDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
                     return ts.updateTypeAliasDeclaration(d, d.decorators, modifiers, d.name, d.typeParameters, d.type);
-                case 241 /* InterfaceDeclaration */:
+                case 242 /* InterfaceDeclaration */:
                     return ts.updateInterfaceDeclaration(d, d.decorators, modifiers, d.name, d.typeParameters, d.heritageClauses, d.members);
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return ts.updateImportEqualsDeclaration(d, d.decorators, modifiers, d.name, d.moduleReference);
-                case 221 /* ExpressionStatement */:
+                case 222 /* ExpressionStatement */:
                     return ts.Debug.fail(); // Shouldn't try to add 'export' keyword to `exports.x = ...`
                 default:
                     return ts.Debug.assertNever(d);
@@ -119261,18 +123193,18 @@ var ts;
         }
         function getNamesToExportInCommonJS(decl) {
             switch (decl.kind) {
-                case 239 /* FunctionDeclaration */:
-                case 240 /* ClassDeclaration */:
+                case 240 /* FunctionDeclaration */:
+                case 241 /* ClassDeclaration */:
                     return [decl.name.text]; // TODO: GH#18217
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     return ts.mapDefined(decl.declarationList.declarations, function (d) { return ts.isIdentifier(d.name) ? d.name.text : undefined; });
-                case 244 /* ModuleDeclaration */:
-                case 243 /* EnumDeclaration */:
-                case 242 /* TypeAliasDeclaration */:
-                case 241 /* InterfaceDeclaration */:
-                case 248 /* ImportEqualsDeclaration */:
+                case 245 /* ModuleDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
+                case 242 /* InterfaceDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return ts.emptyArray;
-                case 221 /* ExpressionStatement */:
+                case 222 /* ExpressionStatement */:
                     return ts.Debug.fail(); // Shouldn't try to add 'export' keyword to `exports.x = ...`
                 default:
                     return ts.Debug.assertNever(decl);
@@ -119280,7 +123212,7 @@ var ts;
         }
         /** Creates `exports.x = x;` */
         function createExportAssignment(name) {
-            return ts.createExpressionStatement(ts.createBinary(ts.createPropertyAccess(ts.createIdentifier("exports"), ts.createIdentifier(name)), 59 /* EqualsToken */, ts.createIdentifier(name)));
+            return ts.createExpressionStatement(ts.createBinary(ts.createPropertyAccess(ts.createIdentifier("exports"), ts.createIdentifier(name)), 60 /* EqualsToken */, ts.createIdentifier(name)));
         }
     })(refactor = ts.refactor || (ts.refactor = {}));
 })(ts || (ts = {}));
@@ -119379,9 +123311,9 @@ var ts;
 (function (ts) {
     var refactor;
     (function (refactor) {
-        var convertToNamedParameters;
-        (function (convertToNamedParameters) {
-            var refactorName = "Convert to named parameters";
+        var convertParamsToDestructuredObject;
+        (function (convertParamsToDestructuredObject) {
+            var refactorName = "Convert parameters to destructured object";
             var minimumParameterLength = 2;
             refactor.registerRefactor(refactorName, { getEditsForAction: getEditsForAction, getAvailableActions: getAvailableActions });
             function getAvailableActions(context) {
@@ -119392,7 +123324,7 @@ var ts;
                 var functionDeclaration = getFunctionDeclarationAtPosition(file, startPosition, context.program.getTypeChecker());
                 if (!functionDeclaration)
                     return ts.emptyArray;
-                var description = ts.getLocaleSpecificMessage(ts.Diagnostics.Convert_to_named_parameters);
+                var description = ts.getLocaleSpecificMessage(ts.Diagnostics.Convert_parameters_to_destructured_object);
                 return [{
                         name: refactorName,
                         description: description,
@@ -119439,15 +123371,15 @@ var ts;
                 var checker = program.getTypeChecker();
                 var references = ts.flatMap(names, /*mapfn*/ function (/*mapfn*/ name) { return ts.FindAllReferences.getReferenceEntriesForNode(-1, name, program, program.getSourceFiles(), cancellationToken); });
                 var groupedReferences = groupReferences(references);
-                if (!ts.every(groupedReferences.declarations, function (decl) { return ts.contains(names, decl); })) {
+                if (!ts.every(groupedReferences.declarations, /*callback*/ function (/*callback*/ decl) { return ts.contains(names, decl); })) {
                     groupedReferences.valid = false;
                 }
                 return groupedReferences;
                 function groupReferences(referenceEntries) {
                     var classReferences = { accessExpressions: [], typeUsages: [] };
                     var groupedReferences = { functionCalls: [], declarations: [], classReferences: classReferences, valid: true };
-                    var functionSymbols = ts.map(functionNames, checker.getSymbolAtLocation);
-                    var classSymbols = ts.map(classNames, checker.getSymbolAtLocation);
+                    var functionSymbols = ts.map(functionNames, getSymbolTargetAtLocation);
+                    var classSymbols = ts.map(classNames, getSymbolTargetAtLocation);
                     var isConstructor = ts.isConstructorDeclaration(functionDeclaration);
                     for (var _i = 0, referenceEntries_1 = referenceEntries; _i < referenceEntries_1.length; _i++) {
                         var entry = referenceEntries_1[_i];
@@ -119455,7 +123387,22 @@ var ts;
                             groupedReferences.valid = false;
                             continue;
                         }
-                        if (ts.contains(functionSymbols, checker.getSymbolAtLocation(entry.node), symbolComparer)) {
+                        /* We compare symbols because in some cases find all references wil return a reference that may or may not be to the refactored function.
+                        Example from the refactorConvertParamsToDestructuredObject_methodCallUnion.ts test:
+                            class A { foo(a: number, b: number) { return a + b; } }
+                            class B { foo(c: number, d: number) { return c + d; } }
+                            declare const ab: A | B;
+                            ab.foo(1, 2);
+                        Find all references will return `ab.foo(1, 2)` as a reference to A's `foo` but we could be calling B's `foo`.
+                        When looking for constructor calls, however, the symbol on the constructor call reference is going to be the corresponding class symbol.
+                        So we need to add a special case for this because when calling a constructor of a class through one of its subclasses,
+                        the symbols are going to be different.
+                        */
+                        if (ts.contains(functionSymbols, getSymbolTargetAtLocation(entry.node)) || ts.isNewExpressionTarget(entry.node)) {
+                            var importOrExportReference = entryToImportOrExport(entry);
+                            if (importOrExportReference) {
+                                continue;
+                            }
                             var decl = entryToDeclaration(entry);
                             if (decl) {
                                 groupedReferences.declarations.push(decl);
@@ -119468,7 +123415,11 @@ var ts;
                             }
                         }
                         // if the refactored function is a constructor, we must also check if the references to its class are valid
-                        if (isConstructor && ts.contains(classSymbols, checker.getSymbolAtLocation(entry.node), symbolComparer)) {
+                        if (isConstructor && ts.contains(classSymbols, getSymbolTargetAtLocation(entry.node))) {
+                            var importOrExportReference = entryToImportOrExport(entry);
+                            if (importOrExportReference) {
+                                continue;
+                            }
                             var decl = entryToDeclaration(entry);
                             if (decl) {
                                 groupedReferences.declarations.push(decl);
@@ -119493,9 +123444,23 @@ var ts;
                     }
                     return groupedReferences;
                 }
+                function getSymbolTargetAtLocation(node) {
+                    var symbol = checker.getSymbolAtLocation(node);
+                    return symbol && ts.getSymbolTarget(symbol, checker);
+                }
             }
-            function symbolComparer(a, b) {
-                return ts.getSymbolTarget(a) === ts.getSymbolTarget(b);
+            function entryToImportOrExport(entry) {
+                var node = entry.node;
+                if (ts.isImportSpecifier(node.parent)
+                    || ts.isImportClause(node.parent)
+                    || ts.isImportEqualsDeclaration(node.parent)
+                    || ts.isNamespaceImport(node.parent)) {
+                    return node;
+                }
+                if (ts.isExportSpecifier(node.parent) || ts.isExportAssignment(node.parent)) {
+                    return node;
+                }
+                return undefined;
             }
             function entryToDeclaration(entry) {
                 if (ts.isDeclaration(entry.node.parent)) {
@@ -119508,37 +123473,31 @@ var ts;
                     var functionReference = entry.node;
                     var parent = functionReference.parent;
                     switch (parent.kind) {
-                        // Function call (foo(...) or super(...))
-                        case 191 /* CallExpression */:
-                            var callExpression = ts.tryCast(parent, ts.isCallExpression);
-                            if (callExpression && callExpression.expression === functionReference) {
-                                return callExpression;
+                        // foo(...) or super(...) or new Foo(...)
+                        case 192 /* CallExpression */:
+                        case 193 /* NewExpression */:
+                            var callOrNewExpression = ts.tryCast(parent, ts.isCallOrNewExpression);
+                            if (callOrNewExpression && callOrNewExpression.expression === functionReference) {
+                                return callOrNewExpression;
                             }
                             break;
-                        // Constructor call (new Foo(...))
-                        case 192 /* NewExpression */:
-                            var newExpression = ts.tryCast(parent, ts.isNewExpression);
-                            if (newExpression && newExpression.expression === functionReference) {
-                                return newExpression;
-                            }
-                            break;
-                        // Method call (x.foo(...))
-                        case 189 /* PropertyAccessExpression */:
+                        // x.foo(...)
+                        case 190 /* PropertyAccessExpression */:
                             var propertyAccessExpression = ts.tryCast(parent, ts.isPropertyAccessExpression);
                             if (propertyAccessExpression && propertyAccessExpression.parent && propertyAccessExpression.name === functionReference) {
-                                var callExpression_1 = ts.tryCast(propertyAccessExpression.parent, ts.isCallExpression);
-                                if (callExpression_1 && callExpression_1.expression === propertyAccessExpression) {
-                                    return callExpression_1;
+                                var callOrNewExpression_1 = ts.tryCast(propertyAccessExpression.parent, ts.isCallOrNewExpression);
+                                if (callOrNewExpression_1 && callOrNewExpression_1.expression === propertyAccessExpression) {
+                                    return callOrNewExpression_1;
                                 }
                             }
                             break;
-                        // Method call (x["foo"](...))
-                        case 190 /* ElementAccessExpression */:
+                        // x["foo"](...)
+                        case 191 /* ElementAccessExpression */:
                             var elementAccessExpression = ts.tryCast(parent, ts.isElementAccessExpression);
                             if (elementAccessExpression && elementAccessExpression.parent && elementAccessExpression.argumentExpression === functionReference) {
-                                var callExpression_2 = ts.tryCast(elementAccessExpression.parent, ts.isCallExpression);
-                                if (callExpression_2 && callExpression_2.expression === elementAccessExpression) {
-                                    return callExpression_2;
+                                var callOrNewExpression_2 = ts.tryCast(elementAccessExpression.parent, ts.isCallOrNewExpression);
+                                if (callOrNewExpression_2 && callOrNewExpression_2.expression === elementAccessExpression) {
+                                    return callOrNewExpression_2;
                                 }
                             }
                             break;
@@ -119552,14 +123511,14 @@ var ts;
                     var parent = reference.parent;
                     switch (parent.kind) {
                         // `C.foo`
-                        case 189 /* PropertyAccessExpression */:
+                        case 190 /* PropertyAccessExpression */:
                             var propertyAccessExpression = ts.tryCast(parent, ts.isPropertyAccessExpression);
                             if (propertyAccessExpression && propertyAccessExpression.expression === reference) {
                                 return propertyAccessExpression;
                             }
                             break;
                         // `C["foo"]`
-                        case 190 /* ElementAccessExpression */:
+                        case 191 /* ElementAccessExpression */:
                             var elementAccessExpression = ts.tryCast(parent, ts.isElementAccessExpression);
                             if (elementAccessExpression && elementAccessExpression.expression === reference) {
                                 return elementAccessExpression;
@@ -119578,7 +123537,10 @@ var ts;
             }
             function getFunctionDeclarationAtPosition(file, startPosition, checker) {
                 var node = ts.getTouchingToken(file, startPosition);
-                var functionDeclaration = ts.getContainingFunction(node);
+                var functionDeclaration = ts.getContainingFunctionDeclaration(node);
+                // don't offer refactor on top-level JSDoc
+                if (isTopLevelJSDoc(node))
+                    return undefined;
                 if (functionDeclaration
                     && isValidFunctionDeclaration(functionDeclaration, checker)
                     && ts.rangeContainsRange(functionDeclaration, node)
@@ -119586,31 +123548,57 @@ var ts;
                     return functionDeclaration;
                 return undefined;
             }
+            function isTopLevelJSDoc(node) {
+                var containingJSDoc = ts.findAncestor(node, ts.isJSDocNode);
+                if (containingJSDoc) {
+                    var containingNonJSDoc = ts.findAncestor(containingJSDoc, function (n) { return !ts.isJSDocNode(n); });
+                    return !!containingNonJSDoc && ts.isFunctionLikeDeclaration(containingNonJSDoc);
+                }
+                return false;
+            }
             function isValidFunctionDeclaration(functionDeclaration, checker) {
-                if (!isValidParameterNodeArray(functionDeclaration.parameters))
+                if (!isValidParameterNodeArray(functionDeclaration.parameters, checker))
                     return false;
                 switch (functionDeclaration.kind) {
-                    case 239 /* FunctionDeclaration */:
-                    case 156 /* MethodDeclaration */:
-                        return !!functionDeclaration.name && !!functionDeclaration.body && !checker.isImplementationOfOverload(functionDeclaration);
-                    case 157 /* Constructor */:
+                    case 240 /* FunctionDeclaration */:
+                        return hasNameOrDefault(functionDeclaration) && isSingleImplementation(functionDeclaration, checker);
+                    case 157 /* MethodDeclaration */:
+                        return isSingleImplementation(functionDeclaration, checker);
+                    case 158 /* Constructor */:
                         if (ts.isClassDeclaration(functionDeclaration.parent)) {
-                            return !!functionDeclaration.body && !!functionDeclaration.parent.name && !checker.isImplementationOfOverload(functionDeclaration);
+                            return hasNameOrDefault(functionDeclaration.parent) && isSingleImplementation(functionDeclaration, checker);
                         }
                         else {
-                            return isValidVariableDeclaration(functionDeclaration.parent.parent) && !!functionDeclaration.body && !checker.isImplementationOfOverload(functionDeclaration);
+                            return isValidVariableDeclaration(functionDeclaration.parent.parent)
+                                && isSingleImplementation(functionDeclaration, checker);
                         }
-                    case 196 /* FunctionExpression */:
-                    case 197 /* ArrowFunction */:
+                    case 197 /* FunctionExpression */:
+                    case 198 /* ArrowFunction */:
                         return isValidVariableDeclaration(functionDeclaration.parent);
                 }
                 return false;
             }
-            function isValidParameterNodeArray(parameters) {
-                return getRefactorableParametersLength(parameters) >= minimumParameterLength && ts.every(parameters, isValidParameterDeclaration);
+            function isSingleImplementation(functionDeclaration, checker) {
+                return !!functionDeclaration.body && !checker.isImplementationOfOverload(functionDeclaration);
             }
-            function isValidParameterDeclaration(paramDeclaration) {
-                return !paramDeclaration.modifiers && !paramDeclaration.decorators && ts.isIdentifier(paramDeclaration.name);
+            function hasNameOrDefault(functionOrClassDeclaration) {
+                if (!functionOrClassDeclaration.name) {
+                    var defaultKeyword = ts.findModifier(functionOrClassDeclaration, 81 /* DefaultKeyword */);
+                    return !!defaultKeyword;
+                }
+                return true;
+            }
+            function isValidParameterNodeArray(parameters, checker) {
+                return getRefactorableParametersLength(parameters) >= minimumParameterLength
+                    && ts.every(parameters, /*callback*/ function (/*callback*/ paramDecl) { return isValidParameterDeclaration(paramDecl, checker); });
+            }
+            function isValidParameterDeclaration(parameterDeclaration, checker) {
+                if (ts.isRestParameter(parameterDeclaration)) {
+                    var type = checker.getTypeAtLocation(parameterDeclaration);
+                    if (!checker.isArrayType(type) && !checker.isTupleType(type))
+                        return false;
+                }
+                return !parameterDeclaration.modifiers && !parameterDeclaration.decorators && ts.isIdentifier(parameterDeclaration.name);
             }
             function isValidVariableDeclaration(node) {
                 return ts.isVariableDeclaration(node) && ts.isVarConst(node) && ts.isIdentifier(node.name) && !node.type; // TODO: GH#30113
@@ -119630,13 +123618,22 @@ var ts;
                 }
                 return parameters;
             }
+            function createPropertyOrShorthandAssignment(name, initializer) {
+                if (ts.isIdentifier(initializer) && ts.getTextOfIdentifierOrLiteral(initializer) === name) {
+                    return ts.createShorthandPropertyAssignment(name);
+                }
+                return ts.createPropertyAssignment(name, initializer);
+            }
             function createNewArgument(functionDeclaration, functionArguments) {
                 var parameters = getRefactorableParameters(functionDeclaration.parameters);
                 var hasRestParameter = ts.isRestParameter(ts.last(parameters));
                 var nonRestArguments = hasRestParameter ? functionArguments.slice(0, parameters.length - 1) : functionArguments;
                 var properties = ts.map(nonRestArguments, function (arg, i) {
-                    var property = ts.createPropertyAssignment(getParameterName(parameters[i]), arg);
-                    ts.suppressLeadingAndTrailingTrivia(property.initializer);
+                    var parameterName = getParameterName(parameters[i]);
+                    var property = createPropertyOrShorthandAssignment(parameterName, arg);
+                    ts.suppressLeadingAndTrailingTrivia(property.name);
+                    if (ts.isPropertyAssignment(property))
+                        ts.suppressLeadingAndTrailingTrivia(property.initializer);
                     copyComments(arg, property);
                     return property;
                 });
@@ -119649,14 +123646,14 @@ var ts;
                 return objectLiteral;
             }
             function createNewParameters(functionDeclaration, program, host) {
+                var checker = program.getTypeChecker();
                 var refactorableParameters = getRefactorableParameters(functionDeclaration.parameters);
                 var bindingElements = ts.map(refactorableParameters, createBindingElementFromParameterDeclaration);
                 var objectParameterName = ts.createObjectBindingPattern(bindingElements);
                 var objectParameterType = createParameterTypeNode(refactorableParameters);
-                var checker = program.getTypeChecker();
                 var objectInitializer;
                 // If every parameter in the original function was optional, add an empty object initializer to the new object parameter
-                if (ts.every(refactorableParameters, checker.isOptionalParameter)) {
+                if (ts.every(refactorableParameters, isOptionalParameter)) {
                     objectInitializer = ts.createObjectLiteral();
                 }
                 var objectParameter = ts.createParameter(
@@ -119680,6 +123677,16 @@ var ts;
                     return ts.createNodeArray([newThisParameter, objectParameter]);
                 }
                 return ts.createNodeArray([objectParameter]);
+                function createBindingElementFromParameterDeclaration(parameterDeclaration) {
+                    var element = ts.createBindingElement(
+                    /*dotDotDotToken*/ undefined, 
+                    /*propertyName*/ undefined, getParameterName(parameterDeclaration), ts.isRestParameter(parameterDeclaration) && isOptionalParameter(parameterDeclaration) ? ts.createArrayLiteral() : parameterDeclaration.initializer);
+                    ts.suppressLeadingAndTrailingTrivia(element);
+                    if (parameterDeclaration.initializer && element.initializer) {
+                        copyComments(parameterDeclaration.initializer, element.initializer);
+                    }
+                    return element;
+                }
                 function createParameterTypeNode(parameters) {
                     var members = ts.map(parameters, createPropertySignatureFromParameterDeclaration);
                     var typeNode = ts.addEmitFlags(ts.createTypeLiteralNode(members), 1 /* SingleLine */);
@@ -119691,7 +123698,7 @@ var ts;
                         parameterType = getTypeNode(parameterDeclaration);
                     }
                     var propertySignature = ts.createPropertySignature(
-                    /*modifiers*/ undefined, getParameterName(parameterDeclaration), parameterDeclaration.initializer || ts.isRestParameter(parameterDeclaration) ? ts.createToken(56 /* QuestionToken */) : parameterDeclaration.questionToken, parameterType, 
+                    /*modifiers*/ undefined, getParameterName(parameterDeclaration), isOptionalParameter(parameterDeclaration) ? ts.createToken(56 /* QuestionToken */) : parameterDeclaration.questionToken, parameterType, 
                     /*initializer*/ undefined);
                     ts.suppressLeadingAndTrailingTrivia(propertySignature);
                     copyComments(parameterDeclaration.name, propertySignature.name);
@@ -119701,20 +123708,16 @@ var ts;
                     return propertySignature;
                 }
                 function getTypeNode(node) {
-                    var checker = program.getTypeChecker();
                     var type = checker.getTypeAtLocation(node);
                     return ts.getTypeNodeIfAccessible(type, node, program, host);
                 }
-            }
-            function createBindingElementFromParameterDeclaration(parameterDeclaration) {
-                var element = ts.createBindingElement(
-                /*dotDotDotToken*/ undefined, 
-                /*propertyName*/ undefined, getParameterName(parameterDeclaration), ts.isRestParameter(parameterDeclaration) ? ts.createArrayLiteral() : parameterDeclaration.initializer);
-                ts.suppressLeadingAndTrailingTrivia(element);
-                if (parameterDeclaration.initializer && element.initializer) {
-                    copyComments(parameterDeclaration.initializer, element.initializer);
+                function isOptionalParameter(parameterDeclaration) {
+                    if (ts.isRestParameter(parameterDeclaration)) {
+                        var type = checker.getTypeAtLocation(parameterDeclaration);
+                        return !checker.isTupleType(type);
+                    }
+                    return checker.isOptionalParameter(parameterDeclaration);
                 }
-                return element;
             }
             function copyComments(sourceNode, targetNode) {
                 var sourceFile = sourceNode.getSourceFile();
@@ -119741,10 +123744,15 @@ var ts;
             }
             function getClassNames(constructorDeclaration) {
                 switch (constructorDeclaration.parent.kind) {
-                    case 240 /* ClassDeclaration */:
+                    case 241 /* ClassDeclaration */:
                         var classDeclaration = constructorDeclaration.parent;
-                        return [classDeclaration.name];
-                    case 209 /* ClassExpression */:
+                        if (classDeclaration.name)
+                            return [classDeclaration.name];
+                        // If the class declaration doesn't have a name, it should have a default modifier.
+                        // We validated this in `isValidFunctionDeclaration` through `hasNameOrDefault`
+                        var defaultModifier = ts.Debug.assertDefined(ts.findModifier(classDeclaration, 81 /* DefaultKeyword */), "Nameless class declaration should be a default export");
+                        return [defaultModifier];
+                    case 210 /* ClassExpression */:
                         var classExpression = constructorDeclaration.parent;
                         var variableDeclaration = constructorDeclaration.parent.parent;
                         var className = classExpression.name;
@@ -119755,19 +123763,25 @@ var ts;
             }
             function getFunctionNames(functionDeclaration) {
                 switch (functionDeclaration.kind) {
-                    case 239 /* FunctionDeclaration */:
-                    case 156 /* MethodDeclaration */:
+                    case 240 /* FunctionDeclaration */:
+                        if (functionDeclaration.name)
+                            return [functionDeclaration.name];
+                        // If the function declaration doesn't have a name, it should have a default modifier.
+                        // We validated this in `isValidFunctionDeclaration` through `hasNameOrDefault`
+                        var defaultModifier = ts.Debug.assertDefined(ts.findModifier(functionDeclaration, 81 /* DefaultKeyword */), "Nameless function declaration should be a default export");
+                        return [defaultModifier];
+                    case 157 /* MethodDeclaration */:
                         return [functionDeclaration.name];
-                    case 157 /* Constructor */:
-                        var ctrKeyword = ts.findChildOfKind(functionDeclaration, 124 /* ConstructorKeyword */, functionDeclaration.getSourceFile());
-                        if (functionDeclaration.parent.kind === 209 /* ClassExpression */) {
+                    case 158 /* Constructor */:
+                        var ctrKeyword = ts.Debug.assertDefined(ts.findChildOfKind(functionDeclaration, 125 /* ConstructorKeyword */, functionDeclaration.getSourceFile()), "Constructor declaration should have constructor keyword");
+                        if (functionDeclaration.parent.kind === 210 /* ClassExpression */) {
                             var variableDeclaration = functionDeclaration.parent.parent;
                             return [variableDeclaration.name, ctrKeyword];
                         }
                         return [ctrKeyword];
-                    case 197 /* ArrowFunction */:
+                    case 198 /* ArrowFunction */:
                         return [functionDeclaration.parent.name];
-                    case 196 /* FunctionExpression */:
+                    case 197 /* FunctionExpression */:
                         if (functionDeclaration.name)
                             return [functionDeclaration.name, functionDeclaration.parent.name];
                         return [functionDeclaration.parent.name];
@@ -119775,7 +123789,7 @@ var ts;
                         return ts.Debug.assertNever(functionDeclaration);
                 }
             }
-        })(convertToNamedParameters = refactor.convertToNamedParameters || (refactor.convertToNamedParameters = {}));
+        })(convertParamsToDestructuredObject = refactor.convertParamsToDestructuredObject || (refactor.convertParamsToDestructuredObject = {}));
     })(refactor = ts.refactor || (ts.refactor = {}));
 })(ts || (ts = {}));
 var ts;
@@ -119784,7 +123798,7 @@ var ts;
     ts.servicesVersion = "0.8";
     function createNode(kind, pos, end, parent) {
         var node = ts.isNodeKind(kind) ? new NodeObject(kind, pos, end) :
-            kind === 72 /* Identifier */ ? new IdentifierObject(72 /* Identifier */, pos, end) :
+            kind === 73 /* Identifier */ ? new IdentifierObject(73 /* Identifier */, pos, end) :
                 new TokenObject(kind, pos, end);
         node.parent = parent;
         node.flags = parent.flags & 12679168 /* ContextFlags */;
@@ -119858,8 +123872,8 @@ var ts;
             if (!children.length) {
                 return undefined;
             }
-            var child = ts.find(children, function (kid) { return kid.kind < 288 /* FirstJSDocNode */ || kid.kind > 310 /* LastJSDocNode */; });
-            return child.kind < 148 /* FirstNode */ ?
+            var child = ts.find(children, function (kid) { return kid.kind < 289 /* FirstJSDocNode */ || kid.kind > 312 /* LastJSDocNode */; });
+            return child.kind < 149 /* FirstNode */ ?
                 child :
                 child.getFirstToken(sourceFile);
         };
@@ -119870,7 +123884,7 @@ var ts;
             if (!child) {
                 return undefined;
             }
-            return child.kind < 148 /* FirstNode */ ? child : child.getLastToken(sourceFile);
+            return child.kind < 149 /* FirstNode */ ? child : child.getLastToken(sourceFile);
         };
         NodeObject.prototype.forEachChild = function (cbNode, cbNodeArray) {
             return ts.forEachChild(this, cbNode, cbNodeArray);
@@ -119916,8 +123930,8 @@ var ts;
             var token = ts.scanner.scan();
             var textPos = ts.scanner.getTextPos();
             if (textPos <= end) {
-                if (token === 72 /* Identifier */) {
-                    ts.Debug.fail("Did not expect " + ts.Debug.showSyntaxKind(parent) + " to have an Identifier in its trivia");
+                if (token === 73 /* Identifier */) {
+                    ts.Debug.fail("Did not expect " + ts.Debug.formatSyntaxKind(parent.kind) + " to have an Identifier in its trivia");
                 }
                 nodes.push(createNode(token, pos, textPos, parent));
             }
@@ -119928,7 +123942,7 @@ var ts;
         }
     }
     function createSyntaxList(nodes, parent) {
-        var list = createNode(311 /* SyntaxList */, nodes.pos, nodes.end, parent);
+        var list = createNode(313 /* SyntaxList */, nodes.pos, nodes.end, parent);
         list._children = [];
         var pos = nodes.pos;
         for (var _i = 0, nodes_1 = nodes; _i < nodes_1.length; _i++) {
@@ -120062,7 +124076,7 @@ var ts;
         });
         return IdentifierObject;
     }(TokenOrIdentifierObject));
-    IdentifierObject.prototype.kind = 72 /* Identifier */;
+    IdentifierObject.prototype.kind = 73 /* Identifier */;
     var TypeObject = /** @class */ (function () {
         function TypeObject(checker, flags) {
             this.checker = checker;
@@ -120263,10 +124277,10 @@ var ts;
             }
             function visit(node) {
                 switch (node.kind) {
-                    case 239 /* FunctionDeclaration */:
-                    case 196 /* FunctionExpression */:
-                    case 156 /* MethodDeclaration */:
-                    case 155 /* MethodSignature */:
+                    case 240 /* FunctionDeclaration */:
+                    case 197 /* FunctionExpression */:
+                    case 157 /* MethodDeclaration */:
+                    case 156 /* MethodSignature */:
                         var functionDeclaration = node;
                         var declarationName = getDeclarationName(functionDeclaration);
                         if (declarationName) {
@@ -120286,31 +124300,31 @@ var ts;
                         }
                         ts.forEachChild(node, visit);
                         break;
-                    case 240 /* ClassDeclaration */:
-                    case 209 /* ClassExpression */:
-                    case 241 /* InterfaceDeclaration */:
-                    case 242 /* TypeAliasDeclaration */:
-                    case 243 /* EnumDeclaration */:
-                    case 244 /* ModuleDeclaration */:
-                    case 248 /* ImportEqualsDeclaration */:
-                    case 257 /* ExportSpecifier */:
-                    case 253 /* ImportSpecifier */:
-                    case 250 /* ImportClause */:
-                    case 251 /* NamespaceImport */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
-                    case 168 /* TypeLiteral */:
+                    case 241 /* ClassDeclaration */:
+                    case 210 /* ClassExpression */:
+                    case 242 /* InterfaceDeclaration */:
+                    case 243 /* TypeAliasDeclaration */:
+                    case 244 /* EnumDeclaration */:
+                    case 245 /* ModuleDeclaration */:
+                    case 249 /* ImportEqualsDeclaration */:
+                    case 258 /* ExportSpecifier */:
+                    case 254 /* ImportSpecifier */:
+                    case 251 /* ImportClause */:
+                    case 252 /* NamespaceImport */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
+                    case 169 /* TypeLiteral */:
                         addDeclaration(node);
                         ts.forEachChild(node, visit);
                         break;
-                    case 151 /* Parameter */:
+                    case 152 /* Parameter */:
                         // Only consider parameter properties
                         if (!ts.hasModifier(node, 92 /* ParameterPropertyModifier */)) {
                             break;
                         }
                     // falls through
-                    case 237 /* VariableDeclaration */:
-                    case 186 /* BindingElement */: {
+                    case 238 /* VariableDeclaration */:
+                    case 187 /* BindingElement */: {
                         var decl = node;
                         if (ts.isBindingPattern(decl.name)) {
                             ts.forEachChild(decl.name, visit);
@@ -120321,19 +124335,19 @@ var ts;
                         }
                     }
                     // falls through
-                    case 278 /* EnumMember */:
-                    case 154 /* PropertyDeclaration */:
-                    case 153 /* PropertySignature */:
+                    case 279 /* EnumMember */:
+                    case 155 /* PropertyDeclaration */:
+                    case 154 /* PropertySignature */:
                         addDeclaration(node);
                         break;
-                    case 255 /* ExportDeclaration */:
+                    case 256 /* ExportDeclaration */:
                         // Handle named exports case e.g.:
                         //    export {a, b as B} from "mod";
                         if (node.exportClause) {
                             ts.forEach(node.exportClause.elements, visit);
                         }
                         break;
-                    case 249 /* ImportDeclaration */:
+                    case 250 /* ImportDeclaration */:
                         var importClause = node.importClause;
                         if (importClause) {
                             // Handle default import case e.g.:
@@ -120345,7 +124359,7 @@ var ts;
                             //    import * as NS from "mod";
                             //    import {a, b as B} from "mod";
                             if (importClause.namedBindings) {
-                                if (importClause.namedBindings.kind === 251 /* NamespaceImport */) {
+                                if (importClause.namedBindings.kind === 252 /* NamespaceImport */) {
                                     addDeclaration(importClause.namedBindings);
                                 }
                                 else {
@@ -120354,7 +124368,7 @@ var ts;
                             }
                         }
                         break;
-                    case 204 /* BinaryExpression */:
+                    case 205 /* BinaryExpression */:
                         if (ts.getAssignmentDeclarationKind(node) !== 0 /* None */) {
                             addDeclaration(node);
                         }
@@ -120523,7 +124537,7 @@ var ts;
             var sourceFile;
             if (this.currentFileName !== fileName) {
                 // This is a new file, just parse it
-                sourceFile = createLanguageServiceSourceFile(fileName, scriptSnapshot, 7 /* Latest */, version, /*setNodeParents*/ true, scriptKind);
+                sourceFile = createLanguageServiceSourceFile(fileName, scriptSnapshot, 99 /* Latest */, version, /*setNodeParents*/ true, scriptKind);
             }
             else if (this.currentFileVersion !== version) {
                 // This is the same file, just a newer version. Incrementally parse the file.
@@ -120647,9 +124661,9 @@ var ts;
     }());
     ts.ThrottledCancellationToken = ThrottledCancellationToken;
     function createLanguageService(host, documentRegistry, syntaxOnly) {
+        var _a;
         if (documentRegistry === void 0) { documentRegistry = ts.createDocumentRegistry(host.useCaseSensitiveFileNames && host.useCaseSensitiveFileNames(), host.getCurrentDirectory()); }
         if (syntaxOnly === void 0) { syntaxOnly = false; }
-        var _a;
         var syntaxTreeCache = new SyntaxTreeCache(host);
         var program;
         var lastProjectVersion;
@@ -120680,7 +124694,7 @@ var ts;
         function getValidSourceFile(fileName) {
             var sourceFile = program.getSourceFile(fileName);
             if (!sourceFile) {
-                throw new Error("Could not find file: '" + fileName + "'.");
+                throw new Error("Could not find sourceFile: '" + fileName + "' in " + (program && JSON.stringify(program.getSourceFiles().map(function (f) { return f.fileName; }))) + ".");
             }
             return sourceFile;
         }
@@ -120927,41 +124941,48 @@ var ts;
                 return undefined;
             }
             var typeChecker = program.getTypeChecker();
-            var symbol = getSymbolAtLocationForQuickInfo(node, typeChecker);
+            var nodeForQuickInfo = getNodeForQuickInfo(node);
+            var symbol = getSymbolAtLocationForQuickInfo(nodeForQuickInfo, typeChecker);
             if (!symbol || typeChecker.isUnknownSymbol(symbol)) {
-                var type_2 = shouldGetType(sourceFile, node, position) ? typeChecker.getTypeAtLocation(node) : undefined;
+                var type_2 = shouldGetType(sourceFile, nodeForQuickInfo, position) ? typeChecker.getTypeAtLocation(nodeForQuickInfo) : undefined;
                 return type_2 && {
                     kind: "" /* unknown */,
                     kindModifiers: "" /* none */,
-                    textSpan: ts.createTextSpanFromNode(node, sourceFile),
-                    displayParts: typeChecker.runWithCancellationToken(cancellationToken, function (typeChecker) { return ts.typeToDisplayParts(typeChecker, type_2, ts.getContainerNode(node)); }),
+                    textSpan: ts.createTextSpanFromNode(nodeForQuickInfo, sourceFile),
+                    displayParts: typeChecker.runWithCancellationToken(cancellationToken, function (typeChecker) { return ts.typeToDisplayParts(typeChecker, type_2, ts.getContainerNode(nodeForQuickInfo)); }),
                     documentation: type_2.symbol ? type_2.symbol.getDocumentationComment(typeChecker) : undefined,
                     tags: type_2.symbol ? type_2.symbol.getJsDocTags() : undefined
                 };
             }
             var _a = typeChecker.runWithCancellationToken(cancellationToken, function (typeChecker) {
-                return ts.SymbolDisplay.getSymbolDisplayPartsDocumentationAndSymbolKind(typeChecker, symbol, sourceFile, ts.getContainerNode(node), node);
+                return ts.SymbolDisplay.getSymbolDisplayPartsDocumentationAndSymbolKind(typeChecker, symbol, sourceFile, ts.getContainerNode(nodeForQuickInfo), nodeForQuickInfo);
             }), symbolKind = _a.symbolKind, displayParts = _a.displayParts, documentation = _a.documentation, tags = _a.tags;
             return {
                 kind: symbolKind,
                 kindModifiers: ts.SymbolDisplay.getSymbolModifiers(symbol),
-                textSpan: ts.createTextSpanFromNode(node, sourceFile),
+                textSpan: ts.createTextSpanFromNode(nodeForQuickInfo, sourceFile),
                 displayParts: displayParts,
                 documentation: documentation,
                 tags: tags,
             };
         }
+        function getNodeForQuickInfo(node) {
+            if (ts.isNewExpression(node.parent) && node.pos === node.parent.pos) {
+                return node.parent.expression;
+            }
+            return node;
+        }
         function shouldGetType(sourceFile, node, position) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return !ts.isLabelName(node) && !ts.isTagName(node);
-                case 189 /* PropertyAccessExpression */:
-                case 148 /* QualifiedName */:
+                case 190 /* PropertyAccessExpression */:
+                case 149 /* QualifiedName */:
                     // Don't return quickInfo if inside the comment in `a/**/.b`
                     return !ts.isInComment(sourceFile, position);
-                case 100 /* ThisKeyword */:
-                case 178 /* ThisType */:
-                case 98 /* SuperKeyword */:
+                case 101 /* ThisKeyword */:
+                case 179 /* ThisType */:
+                case 99 /* SuperKeyword */:
                     return true;
                 default:
                     return false;
@@ -120987,13 +125008,7 @@ var ts;
         }
         /// References and Occurrences
         function getOccurrencesAtPosition(fileName, position) {
-            return ts.flatMap(getDocumentHighlights(fileName, position, [fileName]), function (entry) { return entry.highlightSpans.map(function (highlightSpan) { return ({
-                fileName: entry.fileName,
-                textSpan: highlightSpan.textSpan,
-                isWriteAccess: highlightSpan.kind === "writtenReference" /* writtenReference */,
-                isDefinition: false,
-                isInString: highlightSpan.isInString,
-            }); }); });
+            return ts.flatMap(getDocumentHighlights(fileName, position, [fileName]), function (entry) { return entry.highlightSpans.map(function (highlightSpan) { return (__assign({ fileName: entry.fileName, textSpan: highlightSpan.textSpan, isWriteAccess: highlightSpan.kind === "writtenReference" /* writtenReference */, isDefinition: false }, highlightSpan.isInString && { isInString: true }, highlightSpan.contextSpan && { contextSpan: highlightSpan.contextSpan })); }); });
         }
         function getDocumentHighlights(fileName, position, filesToSearch) {
             var normalizedFileName = ts.normalizePath(fileName);
@@ -121010,7 +125025,8 @@ var ts;
             if (ts.isIdentifier(node) && (ts.isJsxOpeningElement(node.parent) || ts.isJsxClosingElement(node.parent)) && ts.isIntrinsicJsxName(node.escapedText)) {
                 var _a = node.parent.parent, openingElement = _a.openingElement, closingElement = _a.closingElement;
                 return [openingElement, closingElement].map(function (node) {
-                    return ({ fileName: sourceFile.fileName, textSpan: ts.createTextSpanFromNode(node.tagName, sourceFile) });
+                    var textSpan = ts.createTextSpanFromNode(node.tagName, sourceFile);
+                    return __assign({ fileName: sourceFile.fileName, textSpan: textSpan }, ts.FindAllReferences.toContextSpan(textSpan, sourceFile, node.parent));
                 });
             }
             else {
@@ -121068,16 +125084,16 @@ var ts;
                 return undefined;
             }
             switch (node.kind) {
-                case 189 /* PropertyAccessExpression */:
-                case 148 /* QualifiedName */:
+                case 190 /* PropertyAccessExpression */:
+                case 149 /* QualifiedName */:
                 case 10 /* StringLiteral */:
-                case 87 /* FalseKeyword */:
-                case 102 /* TrueKeyword */:
-                case 96 /* NullKeyword */:
-                case 98 /* SuperKeyword */:
-                case 100 /* ThisKeyword */:
-                case 178 /* ThisType */:
-                case 72 /* Identifier */:
+                case 88 /* FalseKeyword */:
+                case 103 /* TrueKeyword */:
+                case 97 /* NullKeyword */:
+                case 99 /* SuperKeyword */:
+                case 101 /* ThisKeyword */:
+                case 179 /* ThisType */:
+                case 73 /* Identifier */:
                     break;
                 // Cant create the text span
                 default:
@@ -121093,7 +125109,7 @@ var ts;
                     // If this is name of a module declarations, check if this is right side of dotted module name
                     // If parent of the module declaration which is parent of this node is module declaration and its body is the module declaration that this node is name of
                     // Then this name is name from dotted module
-                    if (nodeForStartPos.parent.parent.kind === 244 /* ModuleDeclaration */ &&
+                    if (nodeForStartPos.parent.parent.kind === 245 /* ModuleDeclaration */ &&
                         nodeForStartPos.parent.parent.body === nodeForStartPos.parent) {
                         // Use parent module declarations name for start pos
                         nodeForStartPos = nodeForStartPos.parent.parent.name;
@@ -121236,30 +125252,14 @@ var ts;
         }
         function applyCodeActionCommand(fileName, actionOrFormatSettingsOrUndefined) {
             var action = typeof fileName === "string" ? actionOrFormatSettingsOrUndefined : fileName;
-            var formatSettings = typeof fileName !== "string" ? actionOrFormatSettingsOrUndefined : undefined;
-            return ts.isArray(action) ? Promise.all(action.map(function (a) { return applySingleCodeActionCommand(a, formatSettings); })) : applySingleCodeActionCommand(action, formatSettings);
+            return ts.isArray(action) ? Promise.all(action.map(function (a) { return applySingleCodeActionCommand(a); })) : applySingleCodeActionCommand(action);
         }
-        function applySingleCodeActionCommand(action, formatSettings) {
+        function applySingleCodeActionCommand(action) {
             var getPath = function (path) { return ts.toPath(path, currentDirectory, getCanonicalFileName); };
-            switch (action.type) {
-                case "install package":
-                    return host.installPackage
-                        ? host.installPackage({ fileName: getPath(action.file), packageName: action.packageName })
-                        : Promise.reject("Host does not implement `installPackage`");
-                case "generate types": {
-                    var fileToGenerateTypesFor = action.fileToGenerateTypesFor, outputFileName_1 = action.outputFileName;
-                    if (!host.inspectValue)
-                        return Promise.reject("Host does not implement `installPackage`");
-                    var valueInfoPromise = host.inspectValue({ fileNameToRequire: fileToGenerateTypesFor });
-                    return valueInfoPromise.then(function (valueInfo) {
-                        var fullOut = getPath(outputFileName_1);
-                        host.writeFile(fullOut, ts.valueInfoToDeclarationFileText(valueInfo, formatSettings || ts.testFormatSettings)); // TODO: GH#18217
-                        return { successMessage: "Wrote types to '" + fullOut + "'" };
-                    });
-                }
-                default:
-                    return ts.Debug.assertNever(action);
-            }
+            ts.Debug.assertEqual(action.type, "install package");
+            return host.installPackage
+                ? host.installPackage({ fileName: getPath(action.file), packageName: action.packageName })
+                : Promise.reject("Host does not implement `installPackage`");
         }
         function getDocCommentTemplateAtPosition(fileName, position) {
             return ts.JsDoc.getDocCommentTemplateAtPosition(ts.getNewLineOrDefaultFromHost(host), syntaxTreeCache.getCurrentSourceFile(fileName), position);
@@ -121455,6 +125455,9 @@ var ts;
                 preferences: preferences,
             };
         }
+        function getSmartSelectionRange(fileName, position) {
+            return ts.SmartSelectionRange.getSmartSelectionRange(position, syntaxTreeCache.getCurrentSourceFile(fileName));
+        }
         function getApplicableRefactors(fileName, positionOrRange, preferences) {
             if (preferences === void 0) { preferences = ts.emptyOptions; }
             synchronizeHostData();
@@ -121495,6 +125498,7 @@ var ts;
             getBreakpointStatementAtPosition: getBreakpointStatementAtPosition,
             getNavigateToItems: getNavigateToItems,
             getRenameInfo: getRenameInfo,
+            getSmartSelectionRange: getSmartSelectionRange,
             findRenameLocations: findRenameLocations,
             getNavigationBarItems: getNavigationBarItems,
             getNavigationTree: getNavigationTree,
@@ -121557,7 +125561,7 @@ var ts;
      */
     function literalIsName(node) {
         return ts.isDeclarationName(node) ||
-            node.parent.kind === 259 /* ExternalModuleReference */ ||
+            node.parent.kind === 260 /* ExternalModuleReference */ ||
             isArgumentOfElementAccessExpression(node) ||
             ts.isLiteralComputedPropertyDeclarationName(node);
     }
@@ -121574,13 +125578,13 @@ var ts;
         switch (node.kind) {
             case 10 /* StringLiteral */:
             case 8 /* NumericLiteral */:
-                if (node.parent.kind === 149 /* ComputedPropertyName */) {
+                if (node.parent.kind === 150 /* ComputedPropertyName */) {
                     return ts.isObjectLiteralElement(node.parent.parent) ? node.parent.parent : undefined;
                 }
             // falls through
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 return ts.isObjectLiteralElement(node.parent) &&
-                    (node.parent.parent.kind === 188 /* ObjectLiteralExpression */ || node.parent.parent.kind === 268 /* JsxAttributes */) &&
+                    (node.parent.parent.kind === 189 /* ObjectLiteralExpression */ || node.parent.parent.kind === 269 /* JsxAttributes */) &&
                     node.parent.name === node ? node.parent : undefined;
         }
         return undefined;
@@ -121622,7 +125626,7 @@ var ts;
     function isArgumentOfElementAccessExpression(node) {
         return node &&
             node.parent &&
-            node.parent.kind === 190 /* ElementAccessExpression */ &&
+            node.parent.kind === 191 /* ElementAccessExpression */ &&
             node.parent.argumentExpression === node;
     }
     /**
@@ -121702,114 +125706,114 @@ var ts;
                 if (node) {
                     var parent = node.parent;
                     switch (node.kind) {
-                        case 219 /* VariableStatement */:
+                        case 220 /* VariableStatement */:
                             // Span on first variable declaration
                             return spanInVariableDeclaration(node.declarationList.declarations[0]);
-                        case 237 /* VariableDeclaration */:
-                        case 154 /* PropertyDeclaration */:
-                        case 153 /* PropertySignature */:
+                        case 238 /* VariableDeclaration */:
+                        case 155 /* PropertyDeclaration */:
+                        case 154 /* PropertySignature */:
                             return spanInVariableDeclaration(node);
-                        case 151 /* Parameter */:
+                        case 152 /* Parameter */:
                             return spanInParameterDeclaration(node);
-                        case 239 /* FunctionDeclaration */:
-                        case 156 /* MethodDeclaration */:
-                        case 155 /* MethodSignature */:
-                        case 158 /* GetAccessor */:
-                        case 159 /* SetAccessor */:
-                        case 157 /* Constructor */:
-                        case 196 /* FunctionExpression */:
-                        case 197 /* ArrowFunction */:
+                        case 240 /* FunctionDeclaration */:
+                        case 157 /* MethodDeclaration */:
+                        case 156 /* MethodSignature */:
+                        case 159 /* GetAccessor */:
+                        case 160 /* SetAccessor */:
+                        case 158 /* Constructor */:
+                        case 197 /* FunctionExpression */:
+                        case 198 /* ArrowFunction */:
                             return spanInFunctionDeclaration(node);
-                        case 218 /* Block */:
+                        case 219 /* Block */:
                             if (ts.isFunctionBlock(node)) {
                                 return spanInFunctionBlock(node);
                             }
                         // falls through
-                        case 245 /* ModuleBlock */:
+                        case 246 /* ModuleBlock */:
                             return spanInBlock(node);
-                        case 274 /* CatchClause */:
+                        case 275 /* CatchClause */:
                             return spanInBlock(node.block);
-                        case 221 /* ExpressionStatement */:
+                        case 222 /* ExpressionStatement */:
                             // span on the expression
                             return textSpan(node.expression);
-                        case 230 /* ReturnStatement */:
+                        case 231 /* ReturnStatement */:
                             // span on return keyword and expression if present
                             return textSpan(node.getChildAt(0), node.expression);
-                        case 224 /* WhileStatement */:
+                        case 225 /* WhileStatement */:
                             // Span on while(...)
                             return textSpanEndingAtNextToken(node, node.expression);
-                        case 223 /* DoStatement */:
+                        case 224 /* DoStatement */:
                             // span in statement of the do statement
                             return spanInNode(node.statement);
-                        case 236 /* DebuggerStatement */:
+                        case 237 /* DebuggerStatement */:
                             // span on debugger keyword
                             return textSpan(node.getChildAt(0));
-                        case 222 /* IfStatement */:
+                        case 223 /* IfStatement */:
                             // set on if(..) span
                             return textSpanEndingAtNextToken(node, node.expression);
-                        case 233 /* LabeledStatement */:
+                        case 234 /* LabeledStatement */:
                             // span in statement
                             return spanInNode(node.statement);
-                        case 229 /* BreakStatement */:
-                        case 228 /* ContinueStatement */:
+                        case 230 /* BreakStatement */:
+                        case 229 /* ContinueStatement */:
                             // On break or continue keyword and label if present
                             return textSpan(node.getChildAt(0), node.label);
-                        case 225 /* ForStatement */:
+                        case 226 /* ForStatement */:
                             return spanInForStatement(node);
-                        case 226 /* ForInStatement */:
+                        case 227 /* ForInStatement */:
                             // span of for (a in ...)
                             return textSpanEndingAtNextToken(node, node.expression);
-                        case 227 /* ForOfStatement */:
+                        case 228 /* ForOfStatement */:
                             // span in initializer
                             return spanInInitializerOfForLike(node);
-                        case 232 /* SwitchStatement */:
+                        case 233 /* SwitchStatement */:
                             // span on switch(...)
                             return textSpanEndingAtNextToken(node, node.expression);
-                        case 271 /* CaseClause */:
-                        case 272 /* DefaultClause */:
+                        case 272 /* CaseClause */:
+                        case 273 /* DefaultClause */:
                             // span in first statement of the clause
                             return spanInNode(node.statements[0]);
-                        case 235 /* TryStatement */:
+                        case 236 /* TryStatement */:
                             // span in try block
                             return spanInBlock(node.tryBlock);
-                        case 234 /* ThrowStatement */:
+                        case 235 /* ThrowStatement */:
                             // span in throw ...
                             return textSpan(node, node.expression);
-                        case 254 /* ExportAssignment */:
+                        case 255 /* ExportAssignment */:
                             // span on export = id
                             return textSpan(node, node.expression);
-                        case 248 /* ImportEqualsDeclaration */:
+                        case 249 /* ImportEqualsDeclaration */:
                             // import statement without including semicolon
                             return textSpan(node, node.moduleReference);
-                        case 249 /* ImportDeclaration */:
+                        case 250 /* ImportDeclaration */:
                             // import statement without including semicolon
                             return textSpan(node, node.moduleSpecifier);
-                        case 255 /* ExportDeclaration */:
+                        case 256 /* ExportDeclaration */:
                             // import statement without including semicolon
                             return textSpan(node, node.moduleSpecifier);
-                        case 244 /* ModuleDeclaration */:
+                        case 245 /* ModuleDeclaration */:
                             // span on complete module if it is instantiated
                             if (ts.getModuleInstanceState(node) !== 1 /* Instantiated */) {
                                 return undefined;
                             }
                         // falls through
-                        case 240 /* ClassDeclaration */:
-                        case 243 /* EnumDeclaration */:
-                        case 278 /* EnumMember */:
-                        case 186 /* BindingElement */:
+                        case 241 /* ClassDeclaration */:
+                        case 244 /* EnumDeclaration */:
+                        case 279 /* EnumMember */:
+                        case 187 /* BindingElement */:
                             // span on complete node
                             return textSpan(node);
-                        case 231 /* WithStatement */:
+                        case 232 /* WithStatement */:
                             // span in statement
                             return spanInNode(node.statement);
-                        case 152 /* Decorator */:
+                        case 153 /* Decorator */:
                             return spanInNodeArray(parent.decorators);
-                        case 184 /* ObjectBindingPattern */:
-                        case 185 /* ArrayBindingPattern */:
+                        case 185 /* ObjectBindingPattern */:
+                        case 186 /* ArrayBindingPattern */:
                             return spanInBindingPattern(node);
                         // No breakpoint in interface, type alias
-                        case 241 /* InterfaceDeclaration */:
-                        case 242 /* TypeAliasDeclaration */:
+                        case 242 /* InterfaceDeclaration */:
+                        case 243 /* TypeAliasDeclaration */:
                             return undefined;
                         // Tokens:
                         case 26 /* SemicolonToken */:
@@ -121833,13 +125837,13 @@ var ts;
                         case 28 /* LessThanToken */:
                             return spanInGreaterThanOrLessThanToken(node);
                         // Keywords:
-                        case 107 /* WhileKeyword */:
+                        case 108 /* WhileKeyword */:
                             return spanInWhileKeyword(node);
-                        case 83 /* ElseKeyword */:
-                        case 75 /* CatchKeyword */:
-                        case 88 /* FinallyKeyword */:
+                        case 84 /* ElseKeyword */:
+                        case 76 /* CatchKeyword */:
+                        case 89 /* FinallyKeyword */:
                             return spanInNextNode(node);
-                        case 147 /* OfKeyword */:
+                        case 148 /* OfKeyword */:
                             return spanInOfKeyword(node);
                         default:
                             // Destructuring pattern in destructuring assignment
@@ -121851,14 +125855,14 @@ var ts;
                             // Set breakpoint on identifier element of destructuring pattern
                             // `a` or `...c` or `d: x` from
                             // `[a, b, ...c]` or `{ a, b }` or `{ d: x }` from destructuring pattern
-                            if ((node.kind === 72 /* Identifier */ ||
-                                node.kind === 208 /* SpreadElement */ ||
-                                node.kind === 275 /* PropertyAssignment */ ||
-                                node.kind === 276 /* ShorthandPropertyAssignment */) &&
+                            if ((node.kind === 73 /* Identifier */ ||
+                                node.kind === 209 /* SpreadElement */ ||
+                                node.kind === 276 /* PropertyAssignment */ ||
+                                node.kind === 277 /* ShorthandPropertyAssignment */) &&
                                 ts.isArrayLiteralOrObjectLiteralDestructuringPattern(parent)) {
                                 return textSpan(node);
                             }
-                            if (node.kind === 204 /* BinaryExpression */) {
+                            if (node.kind === 205 /* BinaryExpression */) {
                                 var _a = node, left = _a.left, operatorToken = _a.operatorToken;
                                 // Set breakpoint in destructuring pattern if its destructuring assignment
                                 // [a, b, c] or {a, b, c} of
@@ -121867,7 +125871,7 @@ var ts;
                                 if (ts.isArrayLiteralOrObjectLiteralDestructuringPattern(left)) {
                                     return spanInArrayLiteralOrObjectLiteralDestructuringPattern(left);
                                 }
-                                if (operatorToken.kind === 59 /* EqualsToken */ && ts.isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent)) {
+                                if (operatorToken.kind === 60 /* EqualsToken */ && ts.isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent)) {
                                     // Set breakpoint on assignment expression element of destructuring pattern
                                     // a = expression of
                                     // [a = expression, b, c] = someExpression or
@@ -121880,22 +125884,22 @@ var ts;
                             }
                             if (ts.isExpressionNode(node)) {
                                 switch (parent.kind) {
-                                    case 223 /* DoStatement */:
+                                    case 224 /* DoStatement */:
                                         // Set span as if on while keyword
                                         return spanInPreviousNode(node);
-                                    case 152 /* Decorator */:
+                                    case 153 /* Decorator */:
                                         // Set breakpoint on the decorator emit
                                         return spanInNode(node.parent);
-                                    case 225 /* ForStatement */:
-                                    case 227 /* ForOfStatement */:
+                                    case 226 /* ForStatement */:
+                                    case 228 /* ForOfStatement */:
                                         return textSpan(node);
-                                    case 204 /* BinaryExpression */:
+                                    case 205 /* BinaryExpression */:
                                         if (node.parent.operatorToken.kind === 27 /* CommaToken */) {
                                             // If this is a comma expression, the breakpoint is possible in this expression
                                             return textSpan(node);
                                         }
                                         break;
-                                    case 197 /* ArrowFunction */:
+                                    case 198 /* ArrowFunction */:
                                         if (node.parent.body === node) {
                                             // If this is body of arrow function, it is allowed to have the breakpoint
                                             return textSpan(node);
@@ -121904,21 +125908,21 @@ var ts;
                                 }
                             }
                             switch (node.parent.kind) {
-                                case 275 /* PropertyAssignment */:
+                                case 276 /* PropertyAssignment */:
                                     // If this is name of property assignment, set breakpoint in the initializer
                                     if (node.parent.name === node &&
                                         !ts.isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent.parent)) {
                                         return spanInNode(node.parent.initializer);
                                     }
                                     break;
-                                case 194 /* TypeAssertionExpression */:
+                                case 195 /* TypeAssertionExpression */:
                                     // Breakpoint in type assertion goes to its operand
                                     if (node.parent.type === node) {
                                         return spanInNextNode(node.parent.type);
                                     }
                                     break;
-                                case 237 /* VariableDeclaration */:
-                                case 151 /* Parameter */: {
+                                case 238 /* VariableDeclaration */:
+                                case 152 /* Parameter */: {
                                     // initializer of variable/parameter declaration go to previous node
                                     var _b = node.parent, initializer = _b.initializer, type = _b.type;
                                     if (initializer === node || type === node || ts.isAssignmentOperator(node.kind)) {
@@ -121926,7 +125930,7 @@ var ts;
                                     }
                                     break;
                                 }
-                                case 204 /* BinaryExpression */: {
+                                case 205 /* BinaryExpression */: {
                                     var left = node.parent.left;
                                     if (ts.isArrayLiteralOrObjectLiteralDestructuringPattern(left) && node !== left) {
                                         // If initializer of destructuring assignment move to previous token
@@ -121956,7 +125960,7 @@ var ts;
                 }
                 function spanInVariableDeclaration(variableDeclaration) {
                     // If declaration of for in statement, just set the span in parent
-                    if (variableDeclaration.parent.parent.kind === 226 /* ForInStatement */) {
+                    if (variableDeclaration.parent.parent.kind === 227 /* ForInStatement */) {
                         return spanInNode(variableDeclaration.parent.parent);
                     }
                     var parent = variableDeclaration.parent;
@@ -121968,7 +125972,7 @@ var ts;
                     // or its declaration from 'for of'
                     if (variableDeclaration.initializer ||
                         ts.hasModifier(variableDeclaration, 1 /* Export */) ||
-                        parent.parent.kind === 227 /* ForOfStatement */) {
+                        parent.parent.kind === 228 /* ForOfStatement */) {
                         return textSpanFromVariableDeclaration(variableDeclaration);
                     }
                     if (ts.isVariableDeclarationList(variableDeclaration.parent) &&
@@ -122009,7 +126013,7 @@ var ts;
                 }
                 function canFunctionHaveSpanInWholeDeclaration(functionDeclaration) {
                     return ts.hasModifier(functionDeclaration, 1 /* Export */) ||
-                        (functionDeclaration.parent.kind === 240 /* ClassDeclaration */ && functionDeclaration.kind !== 157 /* Constructor */);
+                        (functionDeclaration.parent.kind === 241 /* ClassDeclaration */ && functionDeclaration.kind !== 158 /* Constructor */);
                 }
                 function spanInFunctionDeclaration(functionDeclaration) {
                     // No breakpoints in the function signature
@@ -122032,26 +126036,26 @@ var ts;
                 }
                 function spanInBlock(block) {
                     switch (block.parent.kind) {
-                        case 244 /* ModuleDeclaration */:
+                        case 245 /* ModuleDeclaration */:
                             if (ts.getModuleInstanceState(block.parent) !== 1 /* Instantiated */) {
                                 return undefined;
                             }
                         // falls through
                         // Set on parent if on same line otherwise on first statement
-                        case 224 /* WhileStatement */:
-                        case 222 /* IfStatement */:
-                        case 226 /* ForInStatement */:
+                        case 225 /* WhileStatement */:
+                        case 223 /* IfStatement */:
+                        case 227 /* ForInStatement */:
                             return spanInNodeIfStartsOnSameLine(block.parent, block.statements[0]);
                         // Set span on previous token if it starts on same line otherwise on the first statement of the block
-                        case 225 /* ForStatement */:
-                        case 227 /* ForOfStatement */:
+                        case 226 /* ForStatement */:
+                        case 228 /* ForOfStatement */:
                             return spanInNodeIfStartsOnSameLine(ts.findPrecedingToken(block.pos, sourceFile, block.parent), block.statements[0]);
                     }
                     // Default action is to set on first statement
                     return spanInNode(block.statements[0]);
                 }
                 function spanInInitializerOfForLike(forLikeStatement) {
-                    if (forLikeStatement.initializer.kind === 238 /* VariableDeclarationList */) {
+                    if (forLikeStatement.initializer.kind === 239 /* VariableDeclarationList */) {
                         // Declaration list - set breakpoint in first declaration
                         var variableDeclarationList = forLikeStatement.initializer;
                         if (variableDeclarationList.declarations.length > 0) {
@@ -122076,21 +126080,21 @@ var ts;
                 }
                 function spanInBindingPattern(bindingPattern) {
                     // Set breakpoint in first binding element
-                    var firstBindingElement = ts.forEach(bindingPattern.elements, function (element) { return element.kind !== 210 /* OmittedExpression */ ? element : undefined; });
+                    var firstBindingElement = ts.forEach(bindingPattern.elements, function (element) { return element.kind !== 211 /* OmittedExpression */ ? element : undefined; });
                     if (firstBindingElement) {
                         return spanInNode(firstBindingElement);
                     }
                     // Empty binding pattern of binding element, set breakpoint on binding element
-                    if (bindingPattern.parent.kind === 186 /* BindingElement */) {
+                    if (bindingPattern.parent.kind === 187 /* BindingElement */) {
                         return textSpan(bindingPattern.parent);
                     }
                     // Variable declaration is used as the span
                     return textSpanFromVariableDeclaration(bindingPattern.parent);
                 }
                 function spanInArrayLiteralOrObjectLiteralDestructuringPattern(node) {
-                    ts.Debug.assert(node.kind !== 185 /* ArrayBindingPattern */ && node.kind !== 184 /* ObjectBindingPattern */);
-                    var elements = node.kind === 187 /* ArrayLiteralExpression */ ? node.elements : node.properties;
-                    var firstBindingElement = ts.forEach(elements, function (element) { return element.kind !== 210 /* OmittedExpression */ ? element : undefined; });
+                    ts.Debug.assert(node.kind !== 186 /* ArrayBindingPattern */ && node.kind !== 185 /* ObjectBindingPattern */);
+                    var elements = node.kind === 188 /* ArrayLiteralExpression */ ? node.elements : node.properties;
+                    var firstBindingElement = ts.forEach(elements, function (element) { return element.kind !== 211 /* OmittedExpression */ ? element : undefined; });
                     if (firstBindingElement) {
                         return spanInNode(firstBindingElement);
                     }
@@ -122098,18 +126102,18 @@ var ts;
                     // just nested element in another destructuring assignment
                     // set breakpoint on assignment when parent is destructuring assignment
                     // Otherwise set breakpoint for this element
-                    return textSpan(node.parent.kind === 204 /* BinaryExpression */ ? node.parent : node);
+                    return textSpan(node.parent.kind === 205 /* BinaryExpression */ ? node.parent : node);
                 }
                 // Tokens:
                 function spanInOpenBraceToken(node) {
                     switch (node.parent.kind) {
-                        case 243 /* EnumDeclaration */:
+                        case 244 /* EnumDeclaration */:
                             var enumDeclaration = node.parent;
                             return spanInNodeIfStartsOnSameLine(ts.findPrecedingToken(node.pos, sourceFile, node.parent), enumDeclaration.members.length ? enumDeclaration.members[0] : enumDeclaration.getLastToken(sourceFile));
-                        case 240 /* ClassDeclaration */:
+                        case 241 /* ClassDeclaration */:
                             var classDeclaration = node.parent;
                             return spanInNodeIfStartsOnSameLine(ts.findPrecedingToken(node.pos, sourceFile, node.parent), classDeclaration.members.length ? classDeclaration.members[0] : classDeclaration.getLastToken(sourceFile));
-                        case 246 /* CaseBlock */:
+                        case 247 /* CaseBlock */:
                             return spanInNodeIfStartsOnSameLine(node.parent.parent, node.parent.clauses[0]);
                     }
                     // Default to parent node
@@ -122117,25 +126121,25 @@ var ts;
                 }
                 function spanInCloseBraceToken(node) {
                     switch (node.parent.kind) {
-                        case 245 /* ModuleBlock */:
+                        case 246 /* ModuleBlock */:
                             // If this is not an instantiated module block, no bp span
                             if (ts.getModuleInstanceState(node.parent.parent) !== 1 /* Instantiated */) {
                                 return undefined;
                             }
                         // falls through
-                        case 243 /* EnumDeclaration */:
-                        case 240 /* ClassDeclaration */:
+                        case 244 /* EnumDeclaration */:
+                        case 241 /* ClassDeclaration */:
                             // Span on close brace token
                             return textSpan(node);
-                        case 218 /* Block */:
+                        case 219 /* Block */:
                             if (ts.isFunctionBlock(node.parent)) {
                                 // Span on close brace token
                                 return textSpan(node);
                             }
                         // falls through
-                        case 274 /* CatchClause */:
+                        case 275 /* CatchClause */:
                             return spanInNode(ts.lastOrUndefined(node.parent.statements));
-                        case 246 /* CaseBlock */:
+                        case 247 /* CaseBlock */:
                             // breakpoint in last statement of the last clause
                             var caseBlock = node.parent;
                             var lastClause = ts.lastOrUndefined(caseBlock.clauses);
@@ -122143,7 +126147,7 @@ var ts;
                                 return spanInNode(ts.lastOrUndefined(lastClause.statements));
                             }
                             return undefined;
-                        case 184 /* ObjectBindingPattern */:
+                        case 185 /* ObjectBindingPattern */:
                             // Breakpoint in last binding element or binding pattern if it contains no elements
                             var bindingPattern = node.parent;
                             return spanInNode(ts.lastOrUndefined(bindingPattern.elements) || bindingPattern);
@@ -122159,7 +126163,7 @@ var ts;
                 }
                 function spanInCloseBracketToken(node) {
                     switch (node.parent.kind) {
-                        case 185 /* ArrayBindingPattern */:
+                        case 186 /* ArrayBindingPattern */:
                             // Breakpoint in last binding element or binding pattern if it contains no elements
                             var bindingPattern = node.parent;
                             return textSpan(ts.lastOrUndefined(bindingPattern.elements) || bindingPattern);
@@ -122174,12 +126178,12 @@ var ts;
                     }
                 }
                 function spanInOpenParenToken(node) {
-                    if (node.parent.kind === 223 /* DoStatement */ || // Go to while keyword and do action instead
-                        node.parent.kind === 191 /* CallExpression */ ||
-                        node.parent.kind === 192 /* NewExpression */) {
+                    if (node.parent.kind === 224 /* DoStatement */ || // Go to while keyword and do action instead
+                        node.parent.kind === 192 /* CallExpression */ ||
+                        node.parent.kind === 193 /* NewExpression */) {
                         return spanInPreviousNode(node);
                     }
-                    if (node.parent.kind === 195 /* ParenthesizedExpression */) {
+                    if (node.parent.kind === 196 /* ParenthesizedExpression */) {
                         return spanInNextNode(node);
                     }
                     // Default to parent node
@@ -122188,21 +126192,21 @@ var ts;
                 function spanInCloseParenToken(node) {
                     // Is this close paren token of parameter list, set span in previous token
                     switch (node.parent.kind) {
-                        case 196 /* FunctionExpression */:
-                        case 239 /* FunctionDeclaration */:
-                        case 197 /* ArrowFunction */:
-                        case 156 /* MethodDeclaration */:
-                        case 155 /* MethodSignature */:
-                        case 158 /* GetAccessor */:
-                        case 159 /* SetAccessor */:
-                        case 157 /* Constructor */:
-                        case 224 /* WhileStatement */:
-                        case 223 /* DoStatement */:
-                        case 225 /* ForStatement */:
-                        case 227 /* ForOfStatement */:
-                        case 191 /* CallExpression */:
-                        case 192 /* NewExpression */:
-                        case 195 /* ParenthesizedExpression */:
+                        case 197 /* FunctionExpression */:
+                        case 240 /* FunctionDeclaration */:
+                        case 198 /* ArrowFunction */:
+                        case 157 /* MethodDeclaration */:
+                        case 156 /* MethodSignature */:
+                        case 159 /* GetAccessor */:
+                        case 160 /* SetAccessor */:
+                        case 158 /* Constructor */:
+                        case 225 /* WhileStatement */:
+                        case 224 /* DoStatement */:
+                        case 226 /* ForStatement */:
+                        case 228 /* ForOfStatement */:
+                        case 192 /* CallExpression */:
+                        case 193 /* NewExpression */:
+                        case 196 /* ParenthesizedExpression */:
                             return spanInPreviousNode(node);
                         // Default to parent node
                         default:
@@ -122212,20 +126216,20 @@ var ts;
                 function spanInColonToken(node) {
                     // Is this : specifying return annotation of the function declaration
                     if (ts.isFunctionLike(node.parent) ||
-                        node.parent.kind === 275 /* PropertyAssignment */ ||
-                        node.parent.kind === 151 /* Parameter */) {
+                        node.parent.kind === 276 /* PropertyAssignment */ ||
+                        node.parent.kind === 152 /* Parameter */) {
                         return spanInPreviousNode(node);
                     }
                     return spanInNode(node.parent);
                 }
                 function spanInGreaterThanOrLessThanToken(node) {
-                    if (node.parent.kind === 194 /* TypeAssertionExpression */) {
+                    if (node.parent.kind === 195 /* TypeAssertionExpression */) {
                         return spanInNextNode(node);
                     }
                     return spanInNode(node.parent);
                 }
                 function spanInWhileKeyword(node) {
-                    if (node.parent.kind === 223 /* DoStatement */) {
+                    if (node.parent.kind === 224 /* DoStatement */) {
                         // Set span on while expression
                         return textSpanEndingAtNextToken(node, node.parent.expression);
                     }
@@ -122233,7 +126237,7 @@ var ts;
                     return spanInNode(node.parent);
                 }
                 function spanInOfKeyword(node) {
-                    if (node.parent.kind === 227 /* ForOfStatement */) {
+                    if (node.parent.kind === 228 /* ForOfStatement */) {
                         // Set using next token
                         return spanInNextNode(node);
                     }
@@ -122702,6 +126706,10 @@ var ts;
             var _this = this;
             return this.forwardJSONCall("getRenameInfo('" + fileName + "', " + position + ")", function () { return _this.languageService.getRenameInfo(fileName, position, options); });
         };
+        LanguageServiceShimObject.prototype.getSmartSelectionRange = function (fileName, position) {
+            var _this = this;
+            return this.forwardJSONCall("getSmartSelectionRange('" + fileName + "', " + position + ")", function () { return _this.languageService.getSmartSelectionRange(fileName, position); });
+        };
         LanguageServiceShimObject.prototype.findRenameLocations = function (fileName, position, findInStrings, findInComments, providePrefixAndSuffixTextForRename) {
             var _this = this;
             return this.forwardJSONCall("findRenameLocations('" + fileName + "', " + position + ", " + findInStrings + ", " + findInComments + ", " + providePrefixAndSuffixTextForRename + ")", function () { return _this.languageService.findRenameLocations(fileName, position, findInStrings, findInComments, providePrefixAndSuffixTextForRename); });
diff --git a/lib/typingsInstaller.js b/lib/typingsInstaller.js
index eaebe5e347f..d13ea154292 100644
--- a/lib/typingsInstaller.js
+++ b/lib/typingsInstaller.js
@@ -74,7 +74,7 @@ var ts;
 (function (ts) {
     // WARNING: The script `configureNightly.ts` uses a regexp to parse out these values.
     // If changing the text in this section, be sure to test `configureNightly` too.
-    ts.versionMajorMinor = "3.4";
+    ts.versionMajorMinor = "3.6";
     /** The version of the TypeScript compiler release */
     ts.version = ts.versionMajorMinor + ".0-dev";
 })(ts || (ts = {}));
@@ -206,7 +206,7 @@ var ts;
                         entry.nextEntry.previousEntry = previousEntry;
                     }
                     // When the deleted entry was the last one, we need to
-                    // adust the lastEntry reference.
+                    // adjust the lastEntry reference.
                     if (this.lastEntry === entry) {
                         this.lastEntry = previousEntry;
                     }
@@ -255,11 +255,12 @@ var ts;
             class_1.prototype.forEach = function (action) {
                 var iterator = this.entries();
                 while (true) {
-                    var _a = iterator.next(), entry = _a.value, done = _a.done;
-                    if (done) {
+                    var iterResult = iterator.next();
+                    if (iterResult.done) {
                         break;
                     }
-                    action(entry[1], entry[0]);
+                    var _a = iterResult.value, key = _a[0], value = _a[1];
+                    action(value, key);
                 }
             };
             return class_1;
@@ -303,11 +304,11 @@ var ts;
     ts.firstDefined = firstDefined;
     function firstDefinedIterator(iter, callback) {
         while (true) {
-            var _a = iter.next(), value = _a.value, done = _a.done;
-            if (done) {
+            var iterResult = iter.next();
+            if (iterResult.done) {
                 return undefined;
             }
-            var result = callback(value);
+            var result = callback(iterResult.value);
             if (result !== undefined) {
                 return result;
             }
@@ -316,7 +317,7 @@ var ts;
     ts.firstDefinedIterator = firstDefinedIterator;
     function zipWith(arrayA, arrayB, callback) {
         var result = [];
-        Debug.assertEqual(arrayA.length, arrayB.length);
+        ts.Debug.assertEqual(arrayA.length, arrayB.length);
         for (var i = 0; i < arrayA.length; i++) {
             result.push(callback(arrayA[i], arrayB[i], i));
         }
@@ -324,7 +325,7 @@ var ts;
     }
     ts.zipWith = zipWith;
     function zipToIterator(arrayA, arrayB) {
-        Debug.assertEqual(arrayA.length, arrayB.length);
+        ts.Debug.assertEqual(arrayA.length, arrayB.length);
         var i = 0;
         return {
             next: function () {
@@ -338,7 +339,7 @@ var ts;
     }
     ts.zipToIterator = zipToIterator;
     function zipToMap(keys, values) {
-        Debug.assert(keys.length === values.length);
+        ts.Debug.assert(keys.length === values.length);
         var map = createMap();
         for (var i = 0; i < keys.length; ++i) {
             map.set(keys[i], values[i]);
@@ -412,7 +413,7 @@ var ts;
                 return result;
             }
         }
-        return Debug.fail();
+        return ts.Debug.fail();
     }
     ts.findMap = findMap;
     function contains(array, value, equalityComparer) {
@@ -530,19 +531,21 @@ var ts;
         return array;
     }
     ts.sameMap = sameMap;
+    /**
+     * Flattens an array containing a mix of array or non-array elements.
+     *
+     * @param array The array to flatten.
+     */
     function flatten(array) {
-        var result;
-        if (array) {
-            result = [];
-            for (var _i = 0, array_2 = array; _i < array_2.length; _i++) {
-                var v = array_2[_i];
-                if (v) {
-                    if (isArray(v)) {
-                        addRange(result, v);
-                    }
-                    else {
-                        result.push(v);
-                    }
+        var result = [];
+        for (var _i = 0, array_2 = array; _i < array_2.length; _i++) {
+            var v = array_2[_i];
+            if (v) {
+                if (isArray(v)) {
+                    addRange(result, v);
+                }
+                else {
+                    result.push(v);
                 }
             }
         }
@@ -842,7 +845,7 @@ var ts;
                     continue;
                 case -1 /* LessThan */:
                     // If `array` is sorted, `next` should **never** be less than `last`.
-                    return Debug.fail("Array is unsorted.");
+                    return ts.Debug.fail("Array is unsorted.");
             }
             deduplicated.push(last = next);
         }
@@ -909,13 +912,13 @@ var ts;
         loopB: for (var offsetA = 0, offsetB = 0; offsetB < arrayB.length; offsetB++) {
             if (offsetB > 0) {
                 // Ensure `arrayB` is properly sorted.
-                Debug.assertGreaterThanOrEqual(comparer(arrayB[offsetB], arrayB[offsetB - 1]), 0 /* EqualTo */);
+                ts.Debug.assertGreaterThanOrEqual(comparer(arrayB[offsetB], arrayB[offsetB - 1]), 0 /* EqualTo */);
             }
             loopA: for (var startA = offsetA; offsetA < arrayA.length; offsetA++) {
                 if (offsetA > startA) {
                     // Ensure `arrayA` is properly sorted. We only need to perform this check if
                     // `offsetA` has changed since we entered the loop.
-                    Debug.assertGreaterThanOrEqual(comparer(arrayA[offsetA], arrayA[offsetA - 1]), 0 /* EqualTo */);
+                    ts.Debug.assertGreaterThanOrEqual(comparer(arrayA[offsetA], arrayA[offsetA - 1]), 0 /* EqualTo */);
                 }
                 switch (comparer(arrayB[offsetB], arrayA[offsetA])) {
                     case -1 /* LessThan */:
@@ -1085,7 +1088,7 @@ var ts;
     }
     ts.firstOrUndefined = firstOrUndefined;
     function first(array) {
-        Debug.assert(array.length !== 0);
+        ts.Debug.assert(array.length !== 0);
         return array[0];
     }
     ts.first = first;
@@ -1097,7 +1100,7 @@ var ts;
     }
     ts.lastOrUndefined = lastOrUndefined;
     function last(array) {
-        Debug.assert(array.length !== 0);
+        ts.Debug.assert(array.length !== 0);
         return array[array.length - 1];
     }
     ts.last = last;
@@ -1239,10 +1242,9 @@ var ts;
     }
     ts.getOwnValues = getOwnValues;
     function arrayFrom(iterator, map) {
-        var _a;
         var result = [];
-        for (var _b = iterator.next(), value = _b.value, done = _b.done; !done; _a = iterator.next(), value = _a.value, done = _a.done, _a) {
-            result.push(map ? map(value) : value);
+        for (var iterResult = iterator.next(); !iterResult.done; iterResult = iterator.next()) {
+            result.push(map ? map(iterResult.value) : iterResult.value);
         }
         return result;
     }
@@ -1422,7 +1424,7 @@ var ts;
     function cast(value, test) {
         if (value !== undefined && test(value))
             return value;
-        return Debug.fail("Invalid cast. The supplied value " + value + " did not pass the test '" + Debug.getFunctionName(test) + "'.");
+        return ts.Debug.fail("Invalid cast. The supplied value " + value + " did not pass the test '" + ts.Debug.getFunctionName(test) + "'.");
     }
     ts.cast = cast;
     /** Does nothing. */
@@ -1434,6 +1436,9 @@ var ts;
     /** Do nothing and return true */
     function returnTrue() { return true; }
     ts.returnTrue = returnTrue;
+    /** Do nothing and return undefined */
+    function returnUndefined() { return undefined; }
+    ts.returnUndefined = returnUndefined;
     /** Returns its argument. */
     function identity(x) { return x; }
     ts.identity = identity;
@@ -1456,38 +1461,13 @@ var ts;
         };
     }
     ts.memoize = memoize;
-    function chain(a, b, c, d, e) {
+    function compose(a, b, c, d, e) {
         if (e) {
             var args_2 = [];
             for (var i = 0; i < arguments.length; i++) {
                 args_2[i] = arguments[i];
             }
-            return function (t) { return compose.apply(void 0, map(args_2, function (f) { return f(t); })); };
-        }
-        else if (d) {
-            return function (t) { return compose(a(t), b(t), c(t), d(t)); };
-        }
-        else if (c) {
-            return function (t) { return compose(a(t), b(t), c(t)); };
-        }
-        else if (b) {
-            return function (t) { return compose(a(t), b(t)); };
-        }
-        else if (a) {
-            return function (t) { return compose(a(t)); };
-        }
-        else {
-            return function (_) { return function (u) { return u; }; };
-        }
-    }
-    ts.chain = chain;
-    function compose(a, b, c, d, e) {
-        if (e) {
-            var args_3 = [];
-            for (var i = 0; i < arguments.length; i++) {
-                args_3[i] = arguments[i];
-            }
-            return function (t) { return reduceLeft(args_3, function (u, f) { return f(u); }, t); };
+            return function (t) { return reduceLeft(args_2, function (u, f) { return f(u); }, t); };
         }
         else if (d) {
             return function (t) { return d(c(b(a(t)))); };
@@ -1513,92 +1493,6 @@ var ts;
         AssertionLevel[AssertionLevel["Aggressive"] = 2] = "Aggressive";
         AssertionLevel[AssertionLevel["VeryAggressive"] = 3] = "VeryAggressive";
     })(AssertionLevel = ts.AssertionLevel || (ts.AssertionLevel = {}));
-    var Debug;
-    (function (Debug) {
-        Debug.currentAssertionLevel = 0 /* None */;
-        Debug.isDebugging = false;
-        function shouldAssert(level) {
-            return Debug.currentAssertionLevel >= level;
-        }
-        Debug.shouldAssert = shouldAssert;
-        function assert(expression, message, verboseDebugInfo, stackCrawlMark) {
-            if (!expression) {
-                if (verboseDebugInfo) {
-                    message += "\r\nVerbose Debug Information: " + (typeof verboseDebugInfo === "string" ? verboseDebugInfo : verboseDebugInfo());
-                }
-                fail(message ? "False expression: " + message : "False expression.", stackCrawlMark || assert);
-            }
-        }
-        Debug.assert = assert;
-        function assertEqual(a, b, msg, msg2) {
-            if (a !== b) {
-                var message = msg ? msg2 ? msg + " " + msg2 : msg : "";
-                fail("Expected " + a + " === " + b + ". " + message);
-            }
-        }
-        Debug.assertEqual = assertEqual;
-        function assertLessThan(a, b, msg) {
-            if (a >= b) {
-                fail("Expected " + a + " < " + b + ". " + (msg || ""));
-            }
-        }
-        Debug.assertLessThan = assertLessThan;
-        function assertLessThanOrEqual(a, b) {
-            if (a > b) {
-                fail("Expected " + a + " <= " + b);
-            }
-        }
-        Debug.assertLessThanOrEqual = assertLessThanOrEqual;
-        function assertGreaterThanOrEqual(a, b) {
-            if (a < b) {
-                fail("Expected " + a + " >= " + b);
-            }
-        }
-        Debug.assertGreaterThanOrEqual = assertGreaterThanOrEqual;
-        function fail(message, stackCrawlMark) {
-            debugger;
-            var e = new Error(message ? "Debug Failure. " + message : "Debug Failure.");
-            if (Error.captureStackTrace) {
-                Error.captureStackTrace(e, stackCrawlMark || fail);
-            }
-            throw e;
-        }
-        Debug.fail = fail;
-        function assertDefined(value, message) {
-            if (value === undefined || value === null)
-                return fail(message);
-            return value;
-        }
-        Debug.assertDefined = assertDefined;
-        function assertEachDefined(value, message) {
-            for (var _i = 0, value_1 = value; _i < value_1.length; _i++) {
-                var v = value_1[_i];
-                assertDefined(v, message);
-            }
-            return value;
-        }
-        Debug.assertEachDefined = assertEachDefined;
-        function assertNever(member, message, stackCrawlMark) {
-            if (message === void 0) { message = "Illegal value:"; }
-            var detail = typeof member === "object" && "kind" in member && "pos" in member ? "SyntaxKind: " + Debug.showSyntaxKind(member) : JSON.stringify(member);
-            return fail(message + " " + detail, stackCrawlMark || assertNever);
-        }
-        Debug.assertNever = assertNever;
-        function getFunctionName(func) {
-            if (typeof func !== "function") {
-                return "";
-            }
-            else if (func.hasOwnProperty("name")) {
-                return func.name;
-            }
-            else {
-                var text = Function.prototype.toString.call(func);
-                var match = /^function\s+([\w\$]+)\s*\(/.exec(text);
-                return match ? match[1] : "";
-            }
-        }
-        Debug.getFunctionName = getFunctionName;
-    })(Debug = ts.Debug || (ts.Debug = {}));
     function equateValues(a, b) {
         return a === b;
     }
@@ -1855,7 +1749,7 @@ var ts;
                     bestCandidate = candidate;
                 }
                 else {
-                    Debug.assert(distance < bestDistance); // Else `levenshteinWithMax` should return undefined
+                    ts.Debug.assert(distance < bestDistance); // Else `levenshteinWithMax` should return undefined
                     bestDistance = distance;
                     bestCandidate = candidate;
                 }
@@ -1999,7 +1893,7 @@ var ts;
      * E.g.: matchedText(tryParsePattern("foo*baz"), "foobarbaz") === "bar"
      */
     function matchedText(pattern, candidate) {
-        Debug.assert(isPatternMatch(pattern, candidate));
+        ts.Debug.assert(isPatternMatch(pattern, candidate));
         return candidate.substring(pattern.prefix.length, candidate.length - pattern.suffix.length);
     }
     ts.matchedText = matchedText;
@@ -2092,6 +1986,267 @@ var ts;
         return result;
     }
     ts.fill = fill;
+    function cartesianProduct(arrays) {
+        var result = [];
+        cartesianProductWorker(arrays, result, /*outer*/ undefined, 0);
+        return result;
+    }
+    ts.cartesianProduct = cartesianProduct;
+    function cartesianProductWorker(arrays, result, outer, index) {
+        for (var _i = 0, _a = arrays[index]; _i < _a.length; _i++) {
+            var element = _a[_i];
+            var inner = void 0;
+            if (outer) {
+                inner = outer.slice();
+                inner.push(element);
+            }
+            else {
+                inner = [element];
+            }
+            if (index === arrays.length - 1) {
+                result.push(inner);
+            }
+            else {
+                cartesianProductWorker(arrays, result, inner, index + 1);
+            }
+        }
+    }
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var Debug;
+    (function (Debug) {
+        Debug.currentAssertionLevel = 0 /* None */;
+        Debug.isDebugging = false;
+        function shouldAssert(level) {
+            return Debug.currentAssertionLevel >= level;
+        }
+        Debug.shouldAssert = shouldAssert;
+        function assert(expression, message, verboseDebugInfo, stackCrawlMark) {
+            if (!expression) {
+                if (verboseDebugInfo) {
+                    message += "\r\nVerbose Debug Information: " + (typeof verboseDebugInfo === "string" ? verboseDebugInfo : verboseDebugInfo());
+                }
+                fail(message ? "False expression: " + message : "False expression.", stackCrawlMark || assert);
+            }
+        }
+        Debug.assert = assert;
+        function assertEqual(a, b, msg, msg2) {
+            if (a !== b) {
+                var message = msg ? msg2 ? msg + " " + msg2 : msg : "";
+                fail("Expected " + a + " === " + b + ". " + message);
+            }
+        }
+        Debug.assertEqual = assertEqual;
+        function assertLessThan(a, b, msg) {
+            if (a >= b) {
+                fail("Expected " + a + " < " + b + ". " + (msg || ""));
+            }
+        }
+        Debug.assertLessThan = assertLessThan;
+        function assertLessThanOrEqual(a, b) {
+            if (a > b) {
+                fail("Expected " + a + " <= " + b);
+            }
+        }
+        Debug.assertLessThanOrEqual = assertLessThanOrEqual;
+        function assertGreaterThanOrEqual(a, b) {
+            if (a < b) {
+                fail("Expected " + a + " >= " + b);
+            }
+        }
+        Debug.assertGreaterThanOrEqual = assertGreaterThanOrEqual;
+        function fail(message, stackCrawlMark) {
+            debugger;
+            var e = new Error(message ? "Debug Failure. " + message : "Debug Failure.");
+            if (Error.captureStackTrace) {
+                Error.captureStackTrace(e, stackCrawlMark || fail);
+            }
+            throw e;
+        }
+        Debug.fail = fail;
+        function assertDefined(value, message) {
+            if (value === undefined || value === null)
+                return fail(message);
+            return value;
+        }
+        Debug.assertDefined = assertDefined;
+        function assertEachDefined(value, message) {
+            for (var _i = 0, value_1 = value; _i < value_1.length; _i++) {
+                var v = value_1[_i];
+                assertDefined(v, message);
+            }
+            return value;
+        }
+        Debug.assertEachDefined = assertEachDefined;
+        function assertNever(member, message, stackCrawlMark) {
+            if (message === void 0) { message = "Illegal value:"; }
+            var detail = typeof member === "object" && "kind" in member && "pos" in member && formatSyntaxKind ? "SyntaxKind: " + formatSyntaxKind(member.kind) : JSON.stringify(member);
+            return fail(message + " " + detail, stackCrawlMark || assertNever);
+        }
+        Debug.assertNever = assertNever;
+        function getFunctionName(func) {
+            if (typeof func !== "function") {
+                return "";
+            }
+            else if (func.hasOwnProperty("name")) {
+                return func.name;
+            }
+            else {
+                var text = Function.prototype.toString.call(func);
+                var match = /^function\s+([\w\$]+)\s*\(/.exec(text);
+                return match ? match[1] : "";
+            }
+        }
+        Debug.getFunctionName = getFunctionName;
+        function formatSymbol(symbol) {
+            return "{ name: " + ts.unescapeLeadingUnderscores(symbol.escapedName) + "; flags: " + formatSymbolFlags(symbol.flags) + "; declarations: " + ts.map(symbol.declarations, function (node) { return formatSyntaxKind(node.kind); }) + " }";
+        }
+        Debug.formatSymbol = formatSymbol;
+        /**
+         * Formats an enum value as a string for debugging and debug assertions.
+         */
+        function formatEnum(value, enumObject, isFlags) {
+            if (value === void 0) { value = 0; }
+            var members = getEnumMembers(enumObject);
+            if (value === 0) {
+                return members.length > 0 && members[0][0] === 0 ? members[0][1] : "0";
+            }
+            if (isFlags) {
+                var result = "";
+                var remainingFlags = value;
+                for (var i = members.length - 1; i >= 0 && remainingFlags !== 0; i--) {
+                    var _a = members[i], enumValue = _a[0], enumName = _a[1];
+                    if (enumValue !== 0 && (remainingFlags & enumValue) === enumValue) {
+                        remainingFlags &= ~enumValue;
+                        result = "" + enumName + (result ? "|" : "") + result;
+                    }
+                }
+                if (remainingFlags === 0) {
+                    return result;
+                }
+            }
+            else {
+                for (var _i = 0, members_1 = members; _i < members_1.length; _i++) {
+                    var _b = members_1[_i], enumValue = _b[0], enumName = _b[1];
+                    if (enumValue === value) {
+                        return enumName;
+                    }
+                }
+            }
+            return value.toString();
+        }
+        Debug.formatEnum = formatEnum;
+        function getEnumMembers(enumObject) {
+            var result = [];
+            for (var name in enumObject) {
+                var value = enumObject[name];
+                if (typeof value === "number") {
+                    result.push([value, name]);
+                }
+            }
+            return ts.stableSort(result, function (x, y) { return ts.compareValues(x[0], y[0]); });
+        }
+        function formatSyntaxKind(kind) {
+            return formatEnum(kind, ts.SyntaxKind, /*isFlags*/ false);
+        }
+        Debug.formatSyntaxKind = formatSyntaxKind;
+        function formatNodeFlags(flags) {
+            return formatEnum(flags, ts.NodeFlags, /*isFlags*/ true);
+        }
+        Debug.formatNodeFlags = formatNodeFlags;
+        function formatModifierFlags(flags) {
+            return formatEnum(flags, ts.ModifierFlags, /*isFlags*/ true);
+        }
+        Debug.formatModifierFlags = formatModifierFlags;
+        function formatTransformFlags(flags) {
+            return formatEnum(flags, ts.TransformFlags, /*isFlags*/ true);
+        }
+        Debug.formatTransformFlags = formatTransformFlags;
+        function formatEmitFlags(flags) {
+            return formatEnum(flags, ts.EmitFlags, /*isFlags*/ true);
+        }
+        Debug.formatEmitFlags = formatEmitFlags;
+        function formatSymbolFlags(flags) {
+            return formatEnum(flags, ts.SymbolFlags, /*isFlags*/ true);
+        }
+        Debug.formatSymbolFlags = formatSymbolFlags;
+        function formatTypeFlags(flags) {
+            return formatEnum(flags, ts.TypeFlags, /*isFlags*/ true);
+        }
+        Debug.formatTypeFlags = formatTypeFlags;
+        function formatObjectFlags(flags) {
+            return formatEnum(flags, ts.ObjectFlags, /*isFlags*/ true);
+        }
+        Debug.formatObjectFlags = formatObjectFlags;
+        function failBadSyntaxKind(node, message) {
+            return fail((message || "Unexpected node.") + "\r\nNode " + formatSyntaxKind(node.kind) + " was unexpected.", failBadSyntaxKind);
+        }
+        Debug.failBadSyntaxKind = failBadSyntaxKind;
+        Debug.assertEachNode = shouldAssert(1 /* Normal */)
+            ? function (nodes, test, message) { return assert(test === undefined || ts.every(nodes, test), message || "Unexpected node.", function () { return "Node array did not pass test '" + getFunctionName(test) + "'."; }, Debug.assertEachNode); }
+            : ts.noop;
+        Debug.assertNode = shouldAssert(1 /* Normal */)
+            ? function (node, test, message) { return assert(test === undefined || test(node), message || "Unexpected node.", function () { return "Node " + formatSyntaxKind(node.kind) + " did not pass test '" + getFunctionName(test) + "'."; }, Debug.assertNode); }
+            : ts.noop;
+        Debug.assertOptionalNode = shouldAssert(1 /* Normal */)
+            ? function (node, test, message) { return assert(test === undefined || node === undefined || test(node), message || "Unexpected node.", function () { return "Node " + formatSyntaxKind(node.kind) + " did not pass test '" + getFunctionName(test) + "'."; }, Debug.assertOptionalNode); }
+            : ts.noop;
+        Debug.assertOptionalToken = shouldAssert(1 /* Normal */)
+            ? function (node, kind, message) { return assert(kind === undefined || node === undefined || node.kind === kind, message || "Unexpected node.", function () { return "Node " + formatSyntaxKind(node.kind) + " was not a '" + formatSyntaxKind(kind) + "' token."; }, Debug.assertOptionalToken); }
+            : ts.noop;
+        Debug.assertMissingNode = shouldAssert(1 /* Normal */)
+            ? function (node, message) { return assert(node === undefined, message || "Unexpected node.", function () { return "Node " + formatSyntaxKind(node.kind) + " was unexpected'."; }, Debug.assertMissingNode); }
+            : ts.noop;
+        var isDebugInfoEnabled = false;
+        /**
+         * Injects debug information into frequently used types.
+         */
+        function enableDebugInfo() {
+            if (isDebugInfoEnabled)
+                return;
+            // Add additional properties in debug mode to assist with debugging.
+            Object.defineProperties(ts.objectAllocator.getSymbolConstructor().prototype, {
+                __debugFlags: { get: function () { return formatSymbolFlags(this.flags); } }
+            });
+            Object.defineProperties(ts.objectAllocator.getTypeConstructor().prototype, {
+                __debugFlags: { get: function () { return formatTypeFlags(this.flags); } },
+                __debugObjectFlags: { get: function () { return this.flags & 524288 /* Object */ ? formatObjectFlags(this.objectFlags) : ""; } },
+                __debugTypeToString: { value: function () { return this.checker.typeToString(this); } },
+            });
+            var nodeConstructors = [
+                ts.objectAllocator.getNodeConstructor(),
+                ts.objectAllocator.getIdentifierConstructor(),
+                ts.objectAllocator.getTokenConstructor(),
+                ts.objectAllocator.getSourceFileConstructor()
+            ];
+            for (var _i = 0, nodeConstructors_1 = nodeConstructors; _i < nodeConstructors_1.length; _i++) {
+                var ctor = nodeConstructors_1[_i];
+                if (!ctor.prototype.hasOwnProperty("__debugKind")) {
+                    Object.defineProperties(ctor.prototype, {
+                        __debugKind: { get: function () { return formatSyntaxKind(this.kind); } },
+                        __debugNodeFlags: { get: function () { return formatNodeFlags(this.flags); } },
+                        __debugModifierFlags: { get: function () { return formatModifierFlags(ts.getModifierFlagsNoCache(this)); } },
+                        __debugTransformFlags: { get: function () { return formatTransformFlags(this.transformFlags); } },
+                        __debugIsParseTreeNode: { get: function () { return ts.isParseTreeNode(this); } },
+                        __debugEmitFlags: { get: function () { return formatEmitFlags(ts.getEmitFlags(this)); } },
+                        __debugGetText: {
+                            value: function (includeTrivia) {
+                                if (ts.nodeIsSynthesized(this))
+                                    return "";
+                                var parseNode = ts.getParseTreeNode(this);
+                                var sourceFile = parseNode && ts.getSourceFileOfNode(parseNode);
+                                return sourceFile ? ts.getSourceTextOfNodeFromSourceFile(sourceFile, parseNode, includeTrivia) : "";
+                            }
+                        }
+                    });
+                }
+            }
+            isDebugInfoEnabled = true;
+        }
+        Debug.enableDebugInfo = enableDebugInfo;
+    })(Debug = ts.Debug || (ts.Debug = {}));
 })(ts || (ts = {}));
 /*@internal*/
 var ts;
@@ -2644,309 +2799,312 @@ var ts;
         SyntaxKind[SyntaxKind["QuestionToken"] = 56] = "QuestionToken";
         SyntaxKind[SyntaxKind["ColonToken"] = 57] = "ColonToken";
         SyntaxKind[SyntaxKind["AtToken"] = 58] = "AtToken";
+        /** Only the JSDoc scanner produces BacktickToken. The normal scanner produces NoSubstitutionTemplateLiteral and related kinds. */
+        SyntaxKind[SyntaxKind["BacktickToken"] = 59] = "BacktickToken";
         // Assignments
-        SyntaxKind[SyntaxKind["EqualsToken"] = 59] = "EqualsToken";
-        SyntaxKind[SyntaxKind["PlusEqualsToken"] = 60] = "PlusEqualsToken";
-        SyntaxKind[SyntaxKind["MinusEqualsToken"] = 61] = "MinusEqualsToken";
-        SyntaxKind[SyntaxKind["AsteriskEqualsToken"] = 62] = "AsteriskEqualsToken";
-        SyntaxKind[SyntaxKind["AsteriskAsteriskEqualsToken"] = 63] = "AsteriskAsteriskEqualsToken";
-        SyntaxKind[SyntaxKind["SlashEqualsToken"] = 64] = "SlashEqualsToken";
-        SyntaxKind[SyntaxKind["PercentEqualsToken"] = 65] = "PercentEqualsToken";
-        SyntaxKind[SyntaxKind["LessThanLessThanEqualsToken"] = 66] = "LessThanLessThanEqualsToken";
-        SyntaxKind[SyntaxKind["GreaterThanGreaterThanEqualsToken"] = 67] = "GreaterThanGreaterThanEqualsToken";
-        SyntaxKind[SyntaxKind["GreaterThanGreaterThanGreaterThanEqualsToken"] = 68] = "GreaterThanGreaterThanGreaterThanEqualsToken";
-        SyntaxKind[SyntaxKind["AmpersandEqualsToken"] = 69] = "AmpersandEqualsToken";
-        SyntaxKind[SyntaxKind["BarEqualsToken"] = 70] = "BarEqualsToken";
-        SyntaxKind[SyntaxKind["CaretEqualsToken"] = 71] = "CaretEqualsToken";
+        SyntaxKind[SyntaxKind["EqualsToken"] = 60] = "EqualsToken";
+        SyntaxKind[SyntaxKind["PlusEqualsToken"] = 61] = "PlusEqualsToken";
+        SyntaxKind[SyntaxKind["MinusEqualsToken"] = 62] = "MinusEqualsToken";
+        SyntaxKind[SyntaxKind["AsteriskEqualsToken"] = 63] = "AsteriskEqualsToken";
+        SyntaxKind[SyntaxKind["AsteriskAsteriskEqualsToken"] = 64] = "AsteriskAsteriskEqualsToken";
+        SyntaxKind[SyntaxKind["SlashEqualsToken"] = 65] = "SlashEqualsToken";
+        SyntaxKind[SyntaxKind["PercentEqualsToken"] = 66] = "PercentEqualsToken";
+        SyntaxKind[SyntaxKind["LessThanLessThanEqualsToken"] = 67] = "LessThanLessThanEqualsToken";
+        SyntaxKind[SyntaxKind["GreaterThanGreaterThanEqualsToken"] = 68] = "GreaterThanGreaterThanEqualsToken";
+        SyntaxKind[SyntaxKind["GreaterThanGreaterThanGreaterThanEqualsToken"] = 69] = "GreaterThanGreaterThanGreaterThanEqualsToken";
+        SyntaxKind[SyntaxKind["AmpersandEqualsToken"] = 70] = "AmpersandEqualsToken";
+        SyntaxKind[SyntaxKind["BarEqualsToken"] = 71] = "BarEqualsToken";
+        SyntaxKind[SyntaxKind["CaretEqualsToken"] = 72] = "CaretEqualsToken";
         // Identifiers
-        SyntaxKind[SyntaxKind["Identifier"] = 72] = "Identifier";
+        SyntaxKind[SyntaxKind["Identifier"] = 73] = "Identifier";
         // Reserved words
-        SyntaxKind[SyntaxKind["BreakKeyword"] = 73] = "BreakKeyword";
-        SyntaxKind[SyntaxKind["CaseKeyword"] = 74] = "CaseKeyword";
-        SyntaxKind[SyntaxKind["CatchKeyword"] = 75] = "CatchKeyword";
-        SyntaxKind[SyntaxKind["ClassKeyword"] = 76] = "ClassKeyword";
-        SyntaxKind[SyntaxKind["ConstKeyword"] = 77] = "ConstKeyword";
-        SyntaxKind[SyntaxKind["ContinueKeyword"] = 78] = "ContinueKeyword";
-        SyntaxKind[SyntaxKind["DebuggerKeyword"] = 79] = "DebuggerKeyword";
-        SyntaxKind[SyntaxKind["DefaultKeyword"] = 80] = "DefaultKeyword";
-        SyntaxKind[SyntaxKind["DeleteKeyword"] = 81] = "DeleteKeyword";
-        SyntaxKind[SyntaxKind["DoKeyword"] = 82] = "DoKeyword";
-        SyntaxKind[SyntaxKind["ElseKeyword"] = 83] = "ElseKeyword";
-        SyntaxKind[SyntaxKind["EnumKeyword"] = 84] = "EnumKeyword";
-        SyntaxKind[SyntaxKind["ExportKeyword"] = 85] = "ExportKeyword";
-        SyntaxKind[SyntaxKind["ExtendsKeyword"] = 86] = "ExtendsKeyword";
-        SyntaxKind[SyntaxKind["FalseKeyword"] = 87] = "FalseKeyword";
-        SyntaxKind[SyntaxKind["FinallyKeyword"] = 88] = "FinallyKeyword";
-        SyntaxKind[SyntaxKind["ForKeyword"] = 89] = "ForKeyword";
-        SyntaxKind[SyntaxKind["FunctionKeyword"] = 90] = "FunctionKeyword";
-        SyntaxKind[SyntaxKind["IfKeyword"] = 91] = "IfKeyword";
-        SyntaxKind[SyntaxKind["ImportKeyword"] = 92] = "ImportKeyword";
-        SyntaxKind[SyntaxKind["InKeyword"] = 93] = "InKeyword";
-        SyntaxKind[SyntaxKind["InstanceOfKeyword"] = 94] = "InstanceOfKeyword";
-        SyntaxKind[SyntaxKind["NewKeyword"] = 95] = "NewKeyword";
-        SyntaxKind[SyntaxKind["NullKeyword"] = 96] = "NullKeyword";
-        SyntaxKind[SyntaxKind["ReturnKeyword"] = 97] = "ReturnKeyword";
-        SyntaxKind[SyntaxKind["SuperKeyword"] = 98] = "SuperKeyword";
-        SyntaxKind[SyntaxKind["SwitchKeyword"] = 99] = "SwitchKeyword";
-        SyntaxKind[SyntaxKind["ThisKeyword"] = 100] = "ThisKeyword";
-        SyntaxKind[SyntaxKind["ThrowKeyword"] = 101] = "ThrowKeyword";
-        SyntaxKind[SyntaxKind["TrueKeyword"] = 102] = "TrueKeyword";
-        SyntaxKind[SyntaxKind["TryKeyword"] = 103] = "TryKeyword";
-        SyntaxKind[SyntaxKind["TypeOfKeyword"] = 104] = "TypeOfKeyword";
-        SyntaxKind[SyntaxKind["VarKeyword"] = 105] = "VarKeyword";
-        SyntaxKind[SyntaxKind["VoidKeyword"] = 106] = "VoidKeyword";
-        SyntaxKind[SyntaxKind["WhileKeyword"] = 107] = "WhileKeyword";
-        SyntaxKind[SyntaxKind["WithKeyword"] = 108] = "WithKeyword";
+        SyntaxKind[SyntaxKind["BreakKeyword"] = 74] = "BreakKeyword";
+        SyntaxKind[SyntaxKind["CaseKeyword"] = 75] = "CaseKeyword";
+        SyntaxKind[SyntaxKind["CatchKeyword"] = 76] = "CatchKeyword";
+        SyntaxKind[SyntaxKind["ClassKeyword"] = 77] = "ClassKeyword";
+        SyntaxKind[SyntaxKind["ConstKeyword"] = 78] = "ConstKeyword";
+        SyntaxKind[SyntaxKind["ContinueKeyword"] = 79] = "ContinueKeyword";
+        SyntaxKind[SyntaxKind["DebuggerKeyword"] = 80] = "DebuggerKeyword";
+        SyntaxKind[SyntaxKind["DefaultKeyword"] = 81] = "DefaultKeyword";
+        SyntaxKind[SyntaxKind["DeleteKeyword"] = 82] = "DeleteKeyword";
+        SyntaxKind[SyntaxKind["DoKeyword"] = 83] = "DoKeyword";
+        SyntaxKind[SyntaxKind["ElseKeyword"] = 84] = "ElseKeyword";
+        SyntaxKind[SyntaxKind["EnumKeyword"] = 85] = "EnumKeyword";
+        SyntaxKind[SyntaxKind["ExportKeyword"] = 86] = "ExportKeyword";
+        SyntaxKind[SyntaxKind["ExtendsKeyword"] = 87] = "ExtendsKeyword";
+        SyntaxKind[SyntaxKind["FalseKeyword"] = 88] = "FalseKeyword";
+        SyntaxKind[SyntaxKind["FinallyKeyword"] = 89] = "FinallyKeyword";
+        SyntaxKind[SyntaxKind["ForKeyword"] = 90] = "ForKeyword";
+        SyntaxKind[SyntaxKind["FunctionKeyword"] = 91] = "FunctionKeyword";
+        SyntaxKind[SyntaxKind["IfKeyword"] = 92] = "IfKeyword";
+        SyntaxKind[SyntaxKind["ImportKeyword"] = 93] = "ImportKeyword";
+        SyntaxKind[SyntaxKind["InKeyword"] = 94] = "InKeyword";
+        SyntaxKind[SyntaxKind["InstanceOfKeyword"] = 95] = "InstanceOfKeyword";
+        SyntaxKind[SyntaxKind["NewKeyword"] = 96] = "NewKeyword";
+        SyntaxKind[SyntaxKind["NullKeyword"] = 97] = "NullKeyword";
+        SyntaxKind[SyntaxKind["ReturnKeyword"] = 98] = "ReturnKeyword";
+        SyntaxKind[SyntaxKind["SuperKeyword"] = 99] = "SuperKeyword";
+        SyntaxKind[SyntaxKind["SwitchKeyword"] = 100] = "SwitchKeyword";
+        SyntaxKind[SyntaxKind["ThisKeyword"] = 101] = "ThisKeyword";
+        SyntaxKind[SyntaxKind["ThrowKeyword"] = 102] = "ThrowKeyword";
+        SyntaxKind[SyntaxKind["TrueKeyword"] = 103] = "TrueKeyword";
+        SyntaxKind[SyntaxKind["TryKeyword"] = 104] = "TryKeyword";
+        SyntaxKind[SyntaxKind["TypeOfKeyword"] = 105] = "TypeOfKeyword";
+        SyntaxKind[SyntaxKind["VarKeyword"] = 106] = "VarKeyword";
+        SyntaxKind[SyntaxKind["VoidKeyword"] = 107] = "VoidKeyword";
+        SyntaxKind[SyntaxKind["WhileKeyword"] = 108] = "WhileKeyword";
+        SyntaxKind[SyntaxKind["WithKeyword"] = 109] = "WithKeyword";
         // Strict mode reserved words
-        SyntaxKind[SyntaxKind["ImplementsKeyword"] = 109] = "ImplementsKeyword";
-        SyntaxKind[SyntaxKind["InterfaceKeyword"] = 110] = "InterfaceKeyword";
-        SyntaxKind[SyntaxKind["LetKeyword"] = 111] = "LetKeyword";
-        SyntaxKind[SyntaxKind["PackageKeyword"] = 112] = "PackageKeyword";
-        SyntaxKind[SyntaxKind["PrivateKeyword"] = 113] = "PrivateKeyword";
-        SyntaxKind[SyntaxKind["ProtectedKeyword"] = 114] = "ProtectedKeyword";
-        SyntaxKind[SyntaxKind["PublicKeyword"] = 115] = "PublicKeyword";
-        SyntaxKind[SyntaxKind["StaticKeyword"] = 116] = "StaticKeyword";
-        SyntaxKind[SyntaxKind["YieldKeyword"] = 117] = "YieldKeyword";
+        SyntaxKind[SyntaxKind["ImplementsKeyword"] = 110] = "ImplementsKeyword";
+        SyntaxKind[SyntaxKind["InterfaceKeyword"] = 111] = "InterfaceKeyword";
+        SyntaxKind[SyntaxKind["LetKeyword"] = 112] = "LetKeyword";
+        SyntaxKind[SyntaxKind["PackageKeyword"] = 113] = "PackageKeyword";
+        SyntaxKind[SyntaxKind["PrivateKeyword"] = 114] = "PrivateKeyword";
+        SyntaxKind[SyntaxKind["ProtectedKeyword"] = 115] = "ProtectedKeyword";
+        SyntaxKind[SyntaxKind["PublicKeyword"] = 116] = "PublicKeyword";
+        SyntaxKind[SyntaxKind["StaticKeyword"] = 117] = "StaticKeyword";
+        SyntaxKind[SyntaxKind["YieldKeyword"] = 118] = "YieldKeyword";
         // Contextual keywords
-        SyntaxKind[SyntaxKind["AbstractKeyword"] = 118] = "AbstractKeyword";
-        SyntaxKind[SyntaxKind["AsKeyword"] = 119] = "AsKeyword";
-        SyntaxKind[SyntaxKind["AnyKeyword"] = 120] = "AnyKeyword";
-        SyntaxKind[SyntaxKind["AsyncKeyword"] = 121] = "AsyncKeyword";
-        SyntaxKind[SyntaxKind["AwaitKeyword"] = 122] = "AwaitKeyword";
-        SyntaxKind[SyntaxKind["BooleanKeyword"] = 123] = "BooleanKeyword";
-        SyntaxKind[SyntaxKind["ConstructorKeyword"] = 124] = "ConstructorKeyword";
-        SyntaxKind[SyntaxKind["DeclareKeyword"] = 125] = "DeclareKeyword";
-        SyntaxKind[SyntaxKind["GetKeyword"] = 126] = "GetKeyword";
-        SyntaxKind[SyntaxKind["InferKeyword"] = 127] = "InferKeyword";
-        SyntaxKind[SyntaxKind["IsKeyword"] = 128] = "IsKeyword";
-        SyntaxKind[SyntaxKind["KeyOfKeyword"] = 129] = "KeyOfKeyword";
-        SyntaxKind[SyntaxKind["ModuleKeyword"] = 130] = "ModuleKeyword";
-        SyntaxKind[SyntaxKind["NamespaceKeyword"] = 131] = "NamespaceKeyword";
-        SyntaxKind[SyntaxKind["NeverKeyword"] = 132] = "NeverKeyword";
-        SyntaxKind[SyntaxKind["ReadonlyKeyword"] = 133] = "ReadonlyKeyword";
-        SyntaxKind[SyntaxKind["RequireKeyword"] = 134] = "RequireKeyword";
-        SyntaxKind[SyntaxKind["NumberKeyword"] = 135] = "NumberKeyword";
-        SyntaxKind[SyntaxKind["ObjectKeyword"] = 136] = "ObjectKeyword";
-        SyntaxKind[SyntaxKind["SetKeyword"] = 137] = "SetKeyword";
-        SyntaxKind[SyntaxKind["StringKeyword"] = 138] = "StringKeyword";
-        SyntaxKind[SyntaxKind["SymbolKeyword"] = 139] = "SymbolKeyword";
-        SyntaxKind[SyntaxKind["TypeKeyword"] = 140] = "TypeKeyword";
-        SyntaxKind[SyntaxKind["UndefinedKeyword"] = 141] = "UndefinedKeyword";
-        SyntaxKind[SyntaxKind["UniqueKeyword"] = 142] = "UniqueKeyword";
-        SyntaxKind[SyntaxKind["UnknownKeyword"] = 143] = "UnknownKeyword";
-        SyntaxKind[SyntaxKind["FromKeyword"] = 144] = "FromKeyword";
-        SyntaxKind[SyntaxKind["GlobalKeyword"] = 145] = "GlobalKeyword";
-        SyntaxKind[SyntaxKind["BigIntKeyword"] = 146] = "BigIntKeyword";
-        SyntaxKind[SyntaxKind["OfKeyword"] = 147] = "OfKeyword";
+        SyntaxKind[SyntaxKind["AbstractKeyword"] = 119] = "AbstractKeyword";
+        SyntaxKind[SyntaxKind["AsKeyword"] = 120] = "AsKeyword";
+        SyntaxKind[SyntaxKind["AnyKeyword"] = 121] = "AnyKeyword";
+        SyntaxKind[SyntaxKind["AsyncKeyword"] = 122] = "AsyncKeyword";
+        SyntaxKind[SyntaxKind["AwaitKeyword"] = 123] = "AwaitKeyword";
+        SyntaxKind[SyntaxKind["BooleanKeyword"] = 124] = "BooleanKeyword";
+        SyntaxKind[SyntaxKind["ConstructorKeyword"] = 125] = "ConstructorKeyword";
+        SyntaxKind[SyntaxKind["DeclareKeyword"] = 126] = "DeclareKeyword";
+        SyntaxKind[SyntaxKind["GetKeyword"] = 127] = "GetKeyword";
+        SyntaxKind[SyntaxKind["InferKeyword"] = 128] = "InferKeyword";
+        SyntaxKind[SyntaxKind["IsKeyword"] = 129] = "IsKeyword";
+        SyntaxKind[SyntaxKind["KeyOfKeyword"] = 130] = "KeyOfKeyword";
+        SyntaxKind[SyntaxKind["ModuleKeyword"] = 131] = "ModuleKeyword";
+        SyntaxKind[SyntaxKind["NamespaceKeyword"] = 132] = "NamespaceKeyword";
+        SyntaxKind[SyntaxKind["NeverKeyword"] = 133] = "NeverKeyword";
+        SyntaxKind[SyntaxKind["ReadonlyKeyword"] = 134] = "ReadonlyKeyword";
+        SyntaxKind[SyntaxKind["RequireKeyword"] = 135] = "RequireKeyword";
+        SyntaxKind[SyntaxKind["NumberKeyword"] = 136] = "NumberKeyword";
+        SyntaxKind[SyntaxKind["ObjectKeyword"] = 137] = "ObjectKeyword";
+        SyntaxKind[SyntaxKind["SetKeyword"] = 138] = "SetKeyword";
+        SyntaxKind[SyntaxKind["StringKeyword"] = 139] = "StringKeyword";
+        SyntaxKind[SyntaxKind["SymbolKeyword"] = 140] = "SymbolKeyword";
+        SyntaxKind[SyntaxKind["TypeKeyword"] = 141] = "TypeKeyword";
+        SyntaxKind[SyntaxKind["UndefinedKeyword"] = 142] = "UndefinedKeyword";
+        SyntaxKind[SyntaxKind["UniqueKeyword"] = 143] = "UniqueKeyword";
+        SyntaxKind[SyntaxKind["UnknownKeyword"] = 144] = "UnknownKeyword";
+        SyntaxKind[SyntaxKind["FromKeyword"] = 145] = "FromKeyword";
+        SyntaxKind[SyntaxKind["GlobalKeyword"] = 146] = "GlobalKeyword";
+        SyntaxKind[SyntaxKind["BigIntKeyword"] = 147] = "BigIntKeyword";
+        SyntaxKind[SyntaxKind["OfKeyword"] = 148] = "OfKeyword";
         // Parse tree nodes
         // Names
-        SyntaxKind[SyntaxKind["QualifiedName"] = 148] = "QualifiedName";
-        SyntaxKind[SyntaxKind["ComputedPropertyName"] = 149] = "ComputedPropertyName";
+        SyntaxKind[SyntaxKind["QualifiedName"] = 149] = "QualifiedName";
+        SyntaxKind[SyntaxKind["ComputedPropertyName"] = 150] = "ComputedPropertyName";
         // Signature elements
-        SyntaxKind[SyntaxKind["TypeParameter"] = 150] = "TypeParameter";
-        SyntaxKind[SyntaxKind["Parameter"] = 151] = "Parameter";
-        SyntaxKind[SyntaxKind["Decorator"] = 152] = "Decorator";
+        SyntaxKind[SyntaxKind["TypeParameter"] = 151] = "TypeParameter";
+        SyntaxKind[SyntaxKind["Parameter"] = 152] = "Parameter";
+        SyntaxKind[SyntaxKind["Decorator"] = 153] = "Decorator";
         // TypeMember
-        SyntaxKind[SyntaxKind["PropertySignature"] = 153] = "PropertySignature";
-        SyntaxKind[SyntaxKind["PropertyDeclaration"] = 154] = "PropertyDeclaration";
-        SyntaxKind[SyntaxKind["MethodSignature"] = 155] = "MethodSignature";
-        SyntaxKind[SyntaxKind["MethodDeclaration"] = 156] = "MethodDeclaration";
-        SyntaxKind[SyntaxKind["Constructor"] = 157] = "Constructor";
-        SyntaxKind[SyntaxKind["GetAccessor"] = 158] = "GetAccessor";
-        SyntaxKind[SyntaxKind["SetAccessor"] = 159] = "SetAccessor";
-        SyntaxKind[SyntaxKind["CallSignature"] = 160] = "CallSignature";
-        SyntaxKind[SyntaxKind["ConstructSignature"] = 161] = "ConstructSignature";
-        SyntaxKind[SyntaxKind["IndexSignature"] = 162] = "IndexSignature";
+        SyntaxKind[SyntaxKind["PropertySignature"] = 154] = "PropertySignature";
+        SyntaxKind[SyntaxKind["PropertyDeclaration"] = 155] = "PropertyDeclaration";
+        SyntaxKind[SyntaxKind["MethodSignature"] = 156] = "MethodSignature";
+        SyntaxKind[SyntaxKind["MethodDeclaration"] = 157] = "MethodDeclaration";
+        SyntaxKind[SyntaxKind["Constructor"] = 158] = "Constructor";
+        SyntaxKind[SyntaxKind["GetAccessor"] = 159] = "GetAccessor";
+        SyntaxKind[SyntaxKind["SetAccessor"] = 160] = "SetAccessor";
+        SyntaxKind[SyntaxKind["CallSignature"] = 161] = "CallSignature";
+        SyntaxKind[SyntaxKind["ConstructSignature"] = 162] = "ConstructSignature";
+        SyntaxKind[SyntaxKind["IndexSignature"] = 163] = "IndexSignature";
         // Type
-        SyntaxKind[SyntaxKind["TypePredicate"] = 163] = "TypePredicate";
-        SyntaxKind[SyntaxKind["TypeReference"] = 164] = "TypeReference";
-        SyntaxKind[SyntaxKind["FunctionType"] = 165] = "FunctionType";
-        SyntaxKind[SyntaxKind["ConstructorType"] = 166] = "ConstructorType";
-        SyntaxKind[SyntaxKind["TypeQuery"] = 167] = "TypeQuery";
-        SyntaxKind[SyntaxKind["TypeLiteral"] = 168] = "TypeLiteral";
-        SyntaxKind[SyntaxKind["ArrayType"] = 169] = "ArrayType";
-        SyntaxKind[SyntaxKind["TupleType"] = 170] = "TupleType";
-        SyntaxKind[SyntaxKind["OptionalType"] = 171] = "OptionalType";
-        SyntaxKind[SyntaxKind["RestType"] = 172] = "RestType";
-        SyntaxKind[SyntaxKind["UnionType"] = 173] = "UnionType";
-        SyntaxKind[SyntaxKind["IntersectionType"] = 174] = "IntersectionType";
-        SyntaxKind[SyntaxKind["ConditionalType"] = 175] = "ConditionalType";
-        SyntaxKind[SyntaxKind["InferType"] = 176] = "InferType";
-        SyntaxKind[SyntaxKind["ParenthesizedType"] = 177] = "ParenthesizedType";
-        SyntaxKind[SyntaxKind["ThisType"] = 178] = "ThisType";
-        SyntaxKind[SyntaxKind["TypeOperator"] = 179] = "TypeOperator";
-        SyntaxKind[SyntaxKind["IndexedAccessType"] = 180] = "IndexedAccessType";
-        SyntaxKind[SyntaxKind["MappedType"] = 181] = "MappedType";
-        SyntaxKind[SyntaxKind["LiteralType"] = 182] = "LiteralType";
-        SyntaxKind[SyntaxKind["ImportType"] = 183] = "ImportType";
+        SyntaxKind[SyntaxKind["TypePredicate"] = 164] = "TypePredicate";
+        SyntaxKind[SyntaxKind["TypeReference"] = 165] = "TypeReference";
+        SyntaxKind[SyntaxKind["FunctionType"] = 166] = "FunctionType";
+        SyntaxKind[SyntaxKind["ConstructorType"] = 167] = "ConstructorType";
+        SyntaxKind[SyntaxKind["TypeQuery"] = 168] = "TypeQuery";
+        SyntaxKind[SyntaxKind["TypeLiteral"] = 169] = "TypeLiteral";
+        SyntaxKind[SyntaxKind["ArrayType"] = 170] = "ArrayType";
+        SyntaxKind[SyntaxKind["TupleType"] = 171] = "TupleType";
+        SyntaxKind[SyntaxKind["OptionalType"] = 172] = "OptionalType";
+        SyntaxKind[SyntaxKind["RestType"] = 173] = "RestType";
+        SyntaxKind[SyntaxKind["UnionType"] = 174] = "UnionType";
+        SyntaxKind[SyntaxKind["IntersectionType"] = 175] = "IntersectionType";
+        SyntaxKind[SyntaxKind["ConditionalType"] = 176] = "ConditionalType";
+        SyntaxKind[SyntaxKind["InferType"] = 177] = "InferType";
+        SyntaxKind[SyntaxKind["ParenthesizedType"] = 178] = "ParenthesizedType";
+        SyntaxKind[SyntaxKind["ThisType"] = 179] = "ThisType";
+        SyntaxKind[SyntaxKind["TypeOperator"] = 180] = "TypeOperator";
+        SyntaxKind[SyntaxKind["IndexedAccessType"] = 181] = "IndexedAccessType";
+        SyntaxKind[SyntaxKind["MappedType"] = 182] = "MappedType";
+        SyntaxKind[SyntaxKind["LiteralType"] = 183] = "LiteralType";
+        SyntaxKind[SyntaxKind["ImportType"] = 184] = "ImportType";
         // Binding patterns
-        SyntaxKind[SyntaxKind["ObjectBindingPattern"] = 184] = "ObjectBindingPattern";
-        SyntaxKind[SyntaxKind["ArrayBindingPattern"] = 185] = "ArrayBindingPattern";
-        SyntaxKind[SyntaxKind["BindingElement"] = 186] = "BindingElement";
+        SyntaxKind[SyntaxKind["ObjectBindingPattern"] = 185] = "ObjectBindingPattern";
+        SyntaxKind[SyntaxKind["ArrayBindingPattern"] = 186] = "ArrayBindingPattern";
+        SyntaxKind[SyntaxKind["BindingElement"] = 187] = "BindingElement";
         // Expression
-        SyntaxKind[SyntaxKind["ArrayLiteralExpression"] = 187] = "ArrayLiteralExpression";
-        SyntaxKind[SyntaxKind["ObjectLiteralExpression"] = 188] = "ObjectLiteralExpression";
-        SyntaxKind[SyntaxKind["PropertyAccessExpression"] = 189] = "PropertyAccessExpression";
-        SyntaxKind[SyntaxKind["ElementAccessExpression"] = 190] = "ElementAccessExpression";
-        SyntaxKind[SyntaxKind["CallExpression"] = 191] = "CallExpression";
-        SyntaxKind[SyntaxKind["NewExpression"] = 192] = "NewExpression";
-        SyntaxKind[SyntaxKind["TaggedTemplateExpression"] = 193] = "TaggedTemplateExpression";
-        SyntaxKind[SyntaxKind["TypeAssertionExpression"] = 194] = "TypeAssertionExpression";
-        SyntaxKind[SyntaxKind["ParenthesizedExpression"] = 195] = "ParenthesizedExpression";
-        SyntaxKind[SyntaxKind["FunctionExpression"] = 196] = "FunctionExpression";
-        SyntaxKind[SyntaxKind["ArrowFunction"] = 197] = "ArrowFunction";
-        SyntaxKind[SyntaxKind["DeleteExpression"] = 198] = "DeleteExpression";
-        SyntaxKind[SyntaxKind["TypeOfExpression"] = 199] = "TypeOfExpression";
-        SyntaxKind[SyntaxKind["VoidExpression"] = 200] = "VoidExpression";
-        SyntaxKind[SyntaxKind["AwaitExpression"] = 201] = "AwaitExpression";
-        SyntaxKind[SyntaxKind["PrefixUnaryExpression"] = 202] = "PrefixUnaryExpression";
-        SyntaxKind[SyntaxKind["PostfixUnaryExpression"] = 203] = "PostfixUnaryExpression";
-        SyntaxKind[SyntaxKind["BinaryExpression"] = 204] = "BinaryExpression";
-        SyntaxKind[SyntaxKind["ConditionalExpression"] = 205] = "ConditionalExpression";
-        SyntaxKind[SyntaxKind["TemplateExpression"] = 206] = "TemplateExpression";
-        SyntaxKind[SyntaxKind["YieldExpression"] = 207] = "YieldExpression";
-        SyntaxKind[SyntaxKind["SpreadElement"] = 208] = "SpreadElement";
-        SyntaxKind[SyntaxKind["ClassExpression"] = 209] = "ClassExpression";
-        SyntaxKind[SyntaxKind["OmittedExpression"] = 210] = "OmittedExpression";
-        SyntaxKind[SyntaxKind["ExpressionWithTypeArguments"] = 211] = "ExpressionWithTypeArguments";
-        SyntaxKind[SyntaxKind["AsExpression"] = 212] = "AsExpression";
-        SyntaxKind[SyntaxKind["NonNullExpression"] = 213] = "NonNullExpression";
-        SyntaxKind[SyntaxKind["MetaProperty"] = 214] = "MetaProperty";
-        SyntaxKind[SyntaxKind["SyntheticExpression"] = 215] = "SyntheticExpression";
+        SyntaxKind[SyntaxKind["ArrayLiteralExpression"] = 188] = "ArrayLiteralExpression";
+        SyntaxKind[SyntaxKind["ObjectLiteralExpression"] = 189] = "ObjectLiteralExpression";
+        SyntaxKind[SyntaxKind["PropertyAccessExpression"] = 190] = "PropertyAccessExpression";
+        SyntaxKind[SyntaxKind["ElementAccessExpression"] = 191] = "ElementAccessExpression";
+        SyntaxKind[SyntaxKind["CallExpression"] = 192] = "CallExpression";
+        SyntaxKind[SyntaxKind["NewExpression"] = 193] = "NewExpression";
+        SyntaxKind[SyntaxKind["TaggedTemplateExpression"] = 194] = "TaggedTemplateExpression";
+        SyntaxKind[SyntaxKind["TypeAssertionExpression"] = 195] = "TypeAssertionExpression";
+        SyntaxKind[SyntaxKind["ParenthesizedExpression"] = 196] = "ParenthesizedExpression";
+        SyntaxKind[SyntaxKind["FunctionExpression"] = 197] = "FunctionExpression";
+        SyntaxKind[SyntaxKind["ArrowFunction"] = 198] = "ArrowFunction";
+        SyntaxKind[SyntaxKind["DeleteExpression"] = 199] = "DeleteExpression";
+        SyntaxKind[SyntaxKind["TypeOfExpression"] = 200] = "TypeOfExpression";
+        SyntaxKind[SyntaxKind["VoidExpression"] = 201] = "VoidExpression";
+        SyntaxKind[SyntaxKind["AwaitExpression"] = 202] = "AwaitExpression";
+        SyntaxKind[SyntaxKind["PrefixUnaryExpression"] = 203] = "PrefixUnaryExpression";
+        SyntaxKind[SyntaxKind["PostfixUnaryExpression"] = 204] = "PostfixUnaryExpression";
+        SyntaxKind[SyntaxKind["BinaryExpression"] = 205] = "BinaryExpression";
+        SyntaxKind[SyntaxKind["ConditionalExpression"] = 206] = "ConditionalExpression";
+        SyntaxKind[SyntaxKind["TemplateExpression"] = 207] = "TemplateExpression";
+        SyntaxKind[SyntaxKind["YieldExpression"] = 208] = "YieldExpression";
+        SyntaxKind[SyntaxKind["SpreadElement"] = 209] = "SpreadElement";
+        SyntaxKind[SyntaxKind["ClassExpression"] = 210] = "ClassExpression";
+        SyntaxKind[SyntaxKind["OmittedExpression"] = 211] = "OmittedExpression";
+        SyntaxKind[SyntaxKind["ExpressionWithTypeArguments"] = 212] = "ExpressionWithTypeArguments";
+        SyntaxKind[SyntaxKind["AsExpression"] = 213] = "AsExpression";
+        SyntaxKind[SyntaxKind["NonNullExpression"] = 214] = "NonNullExpression";
+        SyntaxKind[SyntaxKind["MetaProperty"] = 215] = "MetaProperty";
+        SyntaxKind[SyntaxKind["SyntheticExpression"] = 216] = "SyntheticExpression";
         // Misc
-        SyntaxKind[SyntaxKind["TemplateSpan"] = 216] = "TemplateSpan";
-        SyntaxKind[SyntaxKind["SemicolonClassElement"] = 217] = "SemicolonClassElement";
+        SyntaxKind[SyntaxKind["TemplateSpan"] = 217] = "TemplateSpan";
+        SyntaxKind[SyntaxKind["SemicolonClassElement"] = 218] = "SemicolonClassElement";
         // Element
-        SyntaxKind[SyntaxKind["Block"] = 218] = "Block";
-        SyntaxKind[SyntaxKind["VariableStatement"] = 219] = "VariableStatement";
-        SyntaxKind[SyntaxKind["EmptyStatement"] = 220] = "EmptyStatement";
-        SyntaxKind[SyntaxKind["ExpressionStatement"] = 221] = "ExpressionStatement";
-        SyntaxKind[SyntaxKind["IfStatement"] = 222] = "IfStatement";
-        SyntaxKind[SyntaxKind["DoStatement"] = 223] = "DoStatement";
-        SyntaxKind[SyntaxKind["WhileStatement"] = 224] = "WhileStatement";
-        SyntaxKind[SyntaxKind["ForStatement"] = 225] = "ForStatement";
-        SyntaxKind[SyntaxKind["ForInStatement"] = 226] = "ForInStatement";
-        SyntaxKind[SyntaxKind["ForOfStatement"] = 227] = "ForOfStatement";
-        SyntaxKind[SyntaxKind["ContinueStatement"] = 228] = "ContinueStatement";
-        SyntaxKind[SyntaxKind["BreakStatement"] = 229] = "BreakStatement";
-        SyntaxKind[SyntaxKind["ReturnStatement"] = 230] = "ReturnStatement";
-        SyntaxKind[SyntaxKind["WithStatement"] = 231] = "WithStatement";
-        SyntaxKind[SyntaxKind["SwitchStatement"] = 232] = "SwitchStatement";
-        SyntaxKind[SyntaxKind["LabeledStatement"] = 233] = "LabeledStatement";
-        SyntaxKind[SyntaxKind["ThrowStatement"] = 234] = "ThrowStatement";
-        SyntaxKind[SyntaxKind["TryStatement"] = 235] = "TryStatement";
-        SyntaxKind[SyntaxKind["DebuggerStatement"] = 236] = "DebuggerStatement";
-        SyntaxKind[SyntaxKind["VariableDeclaration"] = 237] = "VariableDeclaration";
-        SyntaxKind[SyntaxKind["VariableDeclarationList"] = 238] = "VariableDeclarationList";
-        SyntaxKind[SyntaxKind["FunctionDeclaration"] = 239] = "FunctionDeclaration";
-        SyntaxKind[SyntaxKind["ClassDeclaration"] = 240] = "ClassDeclaration";
-        SyntaxKind[SyntaxKind["InterfaceDeclaration"] = 241] = "InterfaceDeclaration";
-        SyntaxKind[SyntaxKind["TypeAliasDeclaration"] = 242] = "TypeAliasDeclaration";
-        SyntaxKind[SyntaxKind["EnumDeclaration"] = 243] = "EnumDeclaration";
-        SyntaxKind[SyntaxKind["ModuleDeclaration"] = 244] = "ModuleDeclaration";
-        SyntaxKind[SyntaxKind["ModuleBlock"] = 245] = "ModuleBlock";
-        SyntaxKind[SyntaxKind["CaseBlock"] = 246] = "CaseBlock";
-        SyntaxKind[SyntaxKind["NamespaceExportDeclaration"] = 247] = "NamespaceExportDeclaration";
-        SyntaxKind[SyntaxKind["ImportEqualsDeclaration"] = 248] = "ImportEqualsDeclaration";
-        SyntaxKind[SyntaxKind["ImportDeclaration"] = 249] = "ImportDeclaration";
-        SyntaxKind[SyntaxKind["ImportClause"] = 250] = "ImportClause";
-        SyntaxKind[SyntaxKind["NamespaceImport"] = 251] = "NamespaceImport";
-        SyntaxKind[SyntaxKind["NamedImports"] = 252] = "NamedImports";
-        SyntaxKind[SyntaxKind["ImportSpecifier"] = 253] = "ImportSpecifier";
-        SyntaxKind[SyntaxKind["ExportAssignment"] = 254] = "ExportAssignment";
-        SyntaxKind[SyntaxKind["ExportDeclaration"] = 255] = "ExportDeclaration";
-        SyntaxKind[SyntaxKind["NamedExports"] = 256] = "NamedExports";
-        SyntaxKind[SyntaxKind["ExportSpecifier"] = 257] = "ExportSpecifier";
-        SyntaxKind[SyntaxKind["MissingDeclaration"] = 258] = "MissingDeclaration";
+        SyntaxKind[SyntaxKind["Block"] = 219] = "Block";
+        SyntaxKind[SyntaxKind["VariableStatement"] = 220] = "VariableStatement";
+        SyntaxKind[SyntaxKind["EmptyStatement"] = 221] = "EmptyStatement";
+        SyntaxKind[SyntaxKind["ExpressionStatement"] = 222] = "ExpressionStatement";
+        SyntaxKind[SyntaxKind["IfStatement"] = 223] = "IfStatement";
+        SyntaxKind[SyntaxKind["DoStatement"] = 224] = "DoStatement";
+        SyntaxKind[SyntaxKind["WhileStatement"] = 225] = "WhileStatement";
+        SyntaxKind[SyntaxKind["ForStatement"] = 226] = "ForStatement";
+        SyntaxKind[SyntaxKind["ForInStatement"] = 227] = "ForInStatement";
+        SyntaxKind[SyntaxKind["ForOfStatement"] = 228] = "ForOfStatement";
+        SyntaxKind[SyntaxKind["ContinueStatement"] = 229] = "ContinueStatement";
+        SyntaxKind[SyntaxKind["BreakStatement"] = 230] = "BreakStatement";
+        SyntaxKind[SyntaxKind["ReturnStatement"] = 231] = "ReturnStatement";
+        SyntaxKind[SyntaxKind["WithStatement"] = 232] = "WithStatement";
+        SyntaxKind[SyntaxKind["SwitchStatement"] = 233] = "SwitchStatement";
+        SyntaxKind[SyntaxKind["LabeledStatement"] = 234] = "LabeledStatement";
+        SyntaxKind[SyntaxKind["ThrowStatement"] = 235] = "ThrowStatement";
+        SyntaxKind[SyntaxKind["TryStatement"] = 236] = "TryStatement";
+        SyntaxKind[SyntaxKind["DebuggerStatement"] = 237] = "DebuggerStatement";
+        SyntaxKind[SyntaxKind["VariableDeclaration"] = 238] = "VariableDeclaration";
+        SyntaxKind[SyntaxKind["VariableDeclarationList"] = 239] = "VariableDeclarationList";
+        SyntaxKind[SyntaxKind["FunctionDeclaration"] = 240] = "FunctionDeclaration";
+        SyntaxKind[SyntaxKind["ClassDeclaration"] = 241] = "ClassDeclaration";
+        SyntaxKind[SyntaxKind["InterfaceDeclaration"] = 242] = "InterfaceDeclaration";
+        SyntaxKind[SyntaxKind["TypeAliasDeclaration"] = 243] = "TypeAliasDeclaration";
+        SyntaxKind[SyntaxKind["EnumDeclaration"] = 244] = "EnumDeclaration";
+        SyntaxKind[SyntaxKind["ModuleDeclaration"] = 245] = "ModuleDeclaration";
+        SyntaxKind[SyntaxKind["ModuleBlock"] = 246] = "ModuleBlock";
+        SyntaxKind[SyntaxKind["CaseBlock"] = 247] = "CaseBlock";
+        SyntaxKind[SyntaxKind["NamespaceExportDeclaration"] = 248] = "NamespaceExportDeclaration";
+        SyntaxKind[SyntaxKind["ImportEqualsDeclaration"] = 249] = "ImportEqualsDeclaration";
+        SyntaxKind[SyntaxKind["ImportDeclaration"] = 250] = "ImportDeclaration";
+        SyntaxKind[SyntaxKind["ImportClause"] = 251] = "ImportClause";
+        SyntaxKind[SyntaxKind["NamespaceImport"] = 252] = "NamespaceImport";
+        SyntaxKind[SyntaxKind["NamedImports"] = 253] = "NamedImports";
+        SyntaxKind[SyntaxKind["ImportSpecifier"] = 254] = "ImportSpecifier";
+        SyntaxKind[SyntaxKind["ExportAssignment"] = 255] = "ExportAssignment";
+        SyntaxKind[SyntaxKind["ExportDeclaration"] = 256] = "ExportDeclaration";
+        SyntaxKind[SyntaxKind["NamedExports"] = 257] = "NamedExports";
+        SyntaxKind[SyntaxKind["ExportSpecifier"] = 258] = "ExportSpecifier";
+        SyntaxKind[SyntaxKind["MissingDeclaration"] = 259] = "MissingDeclaration";
         // Module references
-        SyntaxKind[SyntaxKind["ExternalModuleReference"] = 259] = "ExternalModuleReference";
+        SyntaxKind[SyntaxKind["ExternalModuleReference"] = 260] = "ExternalModuleReference";
         // JSX
-        SyntaxKind[SyntaxKind["JsxElement"] = 260] = "JsxElement";
-        SyntaxKind[SyntaxKind["JsxSelfClosingElement"] = 261] = "JsxSelfClosingElement";
-        SyntaxKind[SyntaxKind["JsxOpeningElement"] = 262] = "JsxOpeningElement";
-        SyntaxKind[SyntaxKind["JsxClosingElement"] = 263] = "JsxClosingElement";
-        SyntaxKind[SyntaxKind["JsxFragment"] = 264] = "JsxFragment";
-        SyntaxKind[SyntaxKind["JsxOpeningFragment"] = 265] = "JsxOpeningFragment";
-        SyntaxKind[SyntaxKind["JsxClosingFragment"] = 266] = "JsxClosingFragment";
-        SyntaxKind[SyntaxKind["JsxAttribute"] = 267] = "JsxAttribute";
-        SyntaxKind[SyntaxKind["JsxAttributes"] = 268] = "JsxAttributes";
-        SyntaxKind[SyntaxKind["JsxSpreadAttribute"] = 269] = "JsxSpreadAttribute";
-        SyntaxKind[SyntaxKind["JsxExpression"] = 270] = "JsxExpression";
+        SyntaxKind[SyntaxKind["JsxElement"] = 261] = "JsxElement";
+        SyntaxKind[SyntaxKind["JsxSelfClosingElement"] = 262] = "JsxSelfClosingElement";
+        SyntaxKind[SyntaxKind["JsxOpeningElement"] = 263] = "JsxOpeningElement";
+        SyntaxKind[SyntaxKind["JsxClosingElement"] = 264] = "JsxClosingElement";
+        SyntaxKind[SyntaxKind["JsxFragment"] = 265] = "JsxFragment";
+        SyntaxKind[SyntaxKind["JsxOpeningFragment"] = 266] = "JsxOpeningFragment";
+        SyntaxKind[SyntaxKind["JsxClosingFragment"] = 267] = "JsxClosingFragment";
+        SyntaxKind[SyntaxKind["JsxAttribute"] = 268] = "JsxAttribute";
+        SyntaxKind[SyntaxKind["JsxAttributes"] = 269] = "JsxAttributes";
+        SyntaxKind[SyntaxKind["JsxSpreadAttribute"] = 270] = "JsxSpreadAttribute";
+        SyntaxKind[SyntaxKind["JsxExpression"] = 271] = "JsxExpression";
         // Clauses
-        SyntaxKind[SyntaxKind["CaseClause"] = 271] = "CaseClause";
-        SyntaxKind[SyntaxKind["DefaultClause"] = 272] = "DefaultClause";
-        SyntaxKind[SyntaxKind["HeritageClause"] = 273] = "HeritageClause";
-        SyntaxKind[SyntaxKind["CatchClause"] = 274] = "CatchClause";
+        SyntaxKind[SyntaxKind["CaseClause"] = 272] = "CaseClause";
+        SyntaxKind[SyntaxKind["DefaultClause"] = 273] = "DefaultClause";
+        SyntaxKind[SyntaxKind["HeritageClause"] = 274] = "HeritageClause";
+        SyntaxKind[SyntaxKind["CatchClause"] = 275] = "CatchClause";
         // Property assignments
-        SyntaxKind[SyntaxKind["PropertyAssignment"] = 275] = "PropertyAssignment";
-        SyntaxKind[SyntaxKind["ShorthandPropertyAssignment"] = 276] = "ShorthandPropertyAssignment";
-        SyntaxKind[SyntaxKind["SpreadAssignment"] = 277] = "SpreadAssignment";
+        SyntaxKind[SyntaxKind["PropertyAssignment"] = 276] = "PropertyAssignment";
+        SyntaxKind[SyntaxKind["ShorthandPropertyAssignment"] = 277] = "ShorthandPropertyAssignment";
+        SyntaxKind[SyntaxKind["SpreadAssignment"] = 278] = "SpreadAssignment";
         // Enum
-        SyntaxKind[SyntaxKind["EnumMember"] = 278] = "EnumMember";
+        SyntaxKind[SyntaxKind["EnumMember"] = 279] = "EnumMember";
         // Unparsed
-        SyntaxKind[SyntaxKind["UnparsedPrologue"] = 279] = "UnparsedPrologue";
-        SyntaxKind[SyntaxKind["UnparsedPrepend"] = 280] = "UnparsedPrepend";
-        SyntaxKind[SyntaxKind["UnparsedText"] = 281] = "UnparsedText";
-        SyntaxKind[SyntaxKind["UnparsedInternalText"] = 282] = "UnparsedInternalText";
-        SyntaxKind[SyntaxKind["UnparsedSyntheticReference"] = 283] = "UnparsedSyntheticReference";
+        SyntaxKind[SyntaxKind["UnparsedPrologue"] = 280] = "UnparsedPrologue";
+        SyntaxKind[SyntaxKind["UnparsedPrepend"] = 281] = "UnparsedPrepend";
+        SyntaxKind[SyntaxKind["UnparsedText"] = 282] = "UnparsedText";
+        SyntaxKind[SyntaxKind["UnparsedInternalText"] = 283] = "UnparsedInternalText";
+        SyntaxKind[SyntaxKind["UnparsedSyntheticReference"] = 284] = "UnparsedSyntheticReference";
         // Top-level nodes
-        SyntaxKind[SyntaxKind["SourceFile"] = 284] = "SourceFile";
-        SyntaxKind[SyntaxKind["Bundle"] = 285] = "Bundle";
-        SyntaxKind[SyntaxKind["UnparsedSource"] = 286] = "UnparsedSource";
-        SyntaxKind[SyntaxKind["InputFiles"] = 287] = "InputFiles";
+        SyntaxKind[SyntaxKind["SourceFile"] = 285] = "SourceFile";
+        SyntaxKind[SyntaxKind["Bundle"] = 286] = "Bundle";
+        SyntaxKind[SyntaxKind["UnparsedSource"] = 287] = "UnparsedSource";
+        SyntaxKind[SyntaxKind["InputFiles"] = 288] = "InputFiles";
         // JSDoc nodes
-        SyntaxKind[SyntaxKind["JSDocTypeExpression"] = 288] = "JSDocTypeExpression";
+        SyntaxKind[SyntaxKind["JSDocTypeExpression"] = 289] = "JSDocTypeExpression";
         // The * type
-        SyntaxKind[SyntaxKind["JSDocAllType"] = 289] = "JSDocAllType";
+        SyntaxKind[SyntaxKind["JSDocAllType"] = 290] = "JSDocAllType";
         // The ? type
-        SyntaxKind[SyntaxKind["JSDocUnknownType"] = 290] = "JSDocUnknownType";
-        SyntaxKind[SyntaxKind["JSDocNullableType"] = 291] = "JSDocNullableType";
-        SyntaxKind[SyntaxKind["JSDocNonNullableType"] = 292] = "JSDocNonNullableType";
-        SyntaxKind[SyntaxKind["JSDocOptionalType"] = 293] = "JSDocOptionalType";
-        SyntaxKind[SyntaxKind["JSDocFunctionType"] = 294] = "JSDocFunctionType";
-        SyntaxKind[SyntaxKind["JSDocVariadicType"] = 295] = "JSDocVariadicType";
-        SyntaxKind[SyntaxKind["JSDocComment"] = 296] = "JSDocComment";
-        SyntaxKind[SyntaxKind["JSDocTypeLiteral"] = 297] = "JSDocTypeLiteral";
-        SyntaxKind[SyntaxKind["JSDocSignature"] = 298] = "JSDocSignature";
-        SyntaxKind[SyntaxKind["JSDocTag"] = 299] = "JSDocTag";
-        SyntaxKind[SyntaxKind["JSDocAugmentsTag"] = 300] = "JSDocAugmentsTag";
-        SyntaxKind[SyntaxKind["JSDocClassTag"] = 301] = "JSDocClassTag";
-        SyntaxKind[SyntaxKind["JSDocCallbackTag"] = 302] = "JSDocCallbackTag";
-        SyntaxKind[SyntaxKind["JSDocEnumTag"] = 303] = "JSDocEnumTag";
-        SyntaxKind[SyntaxKind["JSDocParameterTag"] = 304] = "JSDocParameterTag";
-        SyntaxKind[SyntaxKind["JSDocReturnTag"] = 305] = "JSDocReturnTag";
-        SyntaxKind[SyntaxKind["JSDocThisTag"] = 306] = "JSDocThisTag";
-        SyntaxKind[SyntaxKind["JSDocTypeTag"] = 307] = "JSDocTypeTag";
-        SyntaxKind[SyntaxKind["JSDocTemplateTag"] = 308] = "JSDocTemplateTag";
-        SyntaxKind[SyntaxKind["JSDocTypedefTag"] = 309] = "JSDocTypedefTag";
-        SyntaxKind[SyntaxKind["JSDocPropertyTag"] = 310] = "JSDocPropertyTag";
+        SyntaxKind[SyntaxKind["JSDocUnknownType"] = 291] = "JSDocUnknownType";
+        SyntaxKind[SyntaxKind["JSDocNullableType"] = 292] = "JSDocNullableType";
+        SyntaxKind[SyntaxKind["JSDocNonNullableType"] = 293] = "JSDocNonNullableType";
+        SyntaxKind[SyntaxKind["JSDocOptionalType"] = 294] = "JSDocOptionalType";
+        SyntaxKind[SyntaxKind["JSDocFunctionType"] = 295] = "JSDocFunctionType";
+        SyntaxKind[SyntaxKind["JSDocVariadicType"] = 296] = "JSDocVariadicType";
+        SyntaxKind[SyntaxKind["JSDocComment"] = 297] = "JSDocComment";
+        SyntaxKind[SyntaxKind["JSDocTypeLiteral"] = 298] = "JSDocTypeLiteral";
+        SyntaxKind[SyntaxKind["JSDocSignature"] = 299] = "JSDocSignature";
+        SyntaxKind[SyntaxKind["JSDocTag"] = 300] = "JSDocTag";
+        SyntaxKind[SyntaxKind["JSDocAugmentsTag"] = 301] = "JSDocAugmentsTag";
+        SyntaxKind[SyntaxKind["JSDocAuthorTag"] = 302] = "JSDocAuthorTag";
+        SyntaxKind[SyntaxKind["JSDocClassTag"] = 303] = "JSDocClassTag";
+        SyntaxKind[SyntaxKind["JSDocCallbackTag"] = 304] = "JSDocCallbackTag";
+        SyntaxKind[SyntaxKind["JSDocEnumTag"] = 305] = "JSDocEnumTag";
+        SyntaxKind[SyntaxKind["JSDocParameterTag"] = 306] = "JSDocParameterTag";
+        SyntaxKind[SyntaxKind["JSDocReturnTag"] = 307] = "JSDocReturnTag";
+        SyntaxKind[SyntaxKind["JSDocThisTag"] = 308] = "JSDocThisTag";
+        SyntaxKind[SyntaxKind["JSDocTypeTag"] = 309] = "JSDocTypeTag";
+        SyntaxKind[SyntaxKind["JSDocTemplateTag"] = 310] = "JSDocTemplateTag";
+        SyntaxKind[SyntaxKind["JSDocTypedefTag"] = 311] = "JSDocTypedefTag";
+        SyntaxKind[SyntaxKind["JSDocPropertyTag"] = 312] = "JSDocPropertyTag";
         // Synthesized list
-        SyntaxKind[SyntaxKind["SyntaxList"] = 311] = "SyntaxList";
+        SyntaxKind[SyntaxKind["SyntaxList"] = 313] = "SyntaxList";
         // Transformation nodes
-        SyntaxKind[SyntaxKind["NotEmittedStatement"] = 312] = "NotEmittedStatement";
-        SyntaxKind[SyntaxKind["PartiallyEmittedExpression"] = 313] = "PartiallyEmittedExpression";
-        SyntaxKind[SyntaxKind["CommaListExpression"] = 314] = "CommaListExpression";
-        SyntaxKind[SyntaxKind["MergeDeclarationMarker"] = 315] = "MergeDeclarationMarker";
-        SyntaxKind[SyntaxKind["EndOfDeclarationMarker"] = 316] = "EndOfDeclarationMarker";
+        SyntaxKind[SyntaxKind["NotEmittedStatement"] = 314] = "NotEmittedStatement";
+        SyntaxKind[SyntaxKind["PartiallyEmittedExpression"] = 315] = "PartiallyEmittedExpression";
+        SyntaxKind[SyntaxKind["CommaListExpression"] = 316] = "CommaListExpression";
+        SyntaxKind[SyntaxKind["MergeDeclarationMarker"] = 317] = "MergeDeclarationMarker";
+        SyntaxKind[SyntaxKind["EndOfDeclarationMarker"] = 318] = "EndOfDeclarationMarker";
         // Enum value count
-        SyntaxKind[SyntaxKind["Count"] = 317] = "Count";
+        SyntaxKind[SyntaxKind["Count"] = 319] = "Count";
         // Markers
-        SyntaxKind[SyntaxKind["FirstAssignment"] = 59] = "FirstAssignment";
-        SyntaxKind[SyntaxKind["LastAssignment"] = 71] = "LastAssignment";
-        SyntaxKind[SyntaxKind["FirstCompoundAssignment"] = 60] = "FirstCompoundAssignment";
-        SyntaxKind[SyntaxKind["LastCompoundAssignment"] = 71] = "LastCompoundAssignment";
-        SyntaxKind[SyntaxKind["FirstReservedWord"] = 73] = "FirstReservedWord";
-        SyntaxKind[SyntaxKind["LastReservedWord"] = 108] = "LastReservedWord";
-        SyntaxKind[SyntaxKind["FirstKeyword"] = 73] = "FirstKeyword";
-        SyntaxKind[SyntaxKind["LastKeyword"] = 147] = "LastKeyword";
-        SyntaxKind[SyntaxKind["FirstFutureReservedWord"] = 109] = "FirstFutureReservedWord";
-        SyntaxKind[SyntaxKind["LastFutureReservedWord"] = 117] = "LastFutureReservedWord";
-        SyntaxKind[SyntaxKind["FirstTypeNode"] = 163] = "FirstTypeNode";
-        SyntaxKind[SyntaxKind["LastTypeNode"] = 183] = "LastTypeNode";
+        SyntaxKind[SyntaxKind["FirstAssignment"] = 60] = "FirstAssignment";
+        SyntaxKind[SyntaxKind["LastAssignment"] = 72] = "LastAssignment";
+        SyntaxKind[SyntaxKind["FirstCompoundAssignment"] = 61] = "FirstCompoundAssignment";
+        SyntaxKind[SyntaxKind["LastCompoundAssignment"] = 72] = "LastCompoundAssignment";
+        SyntaxKind[SyntaxKind["FirstReservedWord"] = 74] = "FirstReservedWord";
+        SyntaxKind[SyntaxKind["LastReservedWord"] = 109] = "LastReservedWord";
+        SyntaxKind[SyntaxKind["FirstKeyword"] = 74] = "FirstKeyword";
+        SyntaxKind[SyntaxKind["LastKeyword"] = 148] = "LastKeyword";
+        SyntaxKind[SyntaxKind["FirstFutureReservedWord"] = 110] = "FirstFutureReservedWord";
+        SyntaxKind[SyntaxKind["LastFutureReservedWord"] = 118] = "LastFutureReservedWord";
+        SyntaxKind[SyntaxKind["FirstTypeNode"] = 164] = "FirstTypeNode";
+        SyntaxKind[SyntaxKind["LastTypeNode"] = 184] = "LastTypeNode";
         SyntaxKind[SyntaxKind["FirstPunctuation"] = 18] = "FirstPunctuation";
-        SyntaxKind[SyntaxKind["LastPunctuation"] = 71] = "LastPunctuation";
+        SyntaxKind[SyntaxKind["LastPunctuation"] = 72] = "LastPunctuation";
         SyntaxKind[SyntaxKind["FirstToken"] = 0] = "FirstToken";
-        SyntaxKind[SyntaxKind["LastToken"] = 147] = "LastToken";
+        SyntaxKind[SyntaxKind["LastToken"] = 148] = "LastToken";
         SyntaxKind[SyntaxKind["FirstTriviaToken"] = 2] = "FirstTriviaToken";
         SyntaxKind[SyntaxKind["LastTriviaToken"] = 7] = "LastTriviaToken";
         SyntaxKind[SyntaxKind["FirstLiteralToken"] = 8] = "FirstLiteralToken";
@@ -2954,14 +3112,14 @@ var ts;
         SyntaxKind[SyntaxKind["FirstTemplateToken"] = 14] = "FirstTemplateToken";
         SyntaxKind[SyntaxKind["LastTemplateToken"] = 17] = "LastTemplateToken";
         SyntaxKind[SyntaxKind["FirstBinaryOperator"] = 28] = "FirstBinaryOperator";
-        SyntaxKind[SyntaxKind["LastBinaryOperator"] = 71] = "LastBinaryOperator";
-        SyntaxKind[SyntaxKind["FirstNode"] = 148] = "FirstNode";
-        SyntaxKind[SyntaxKind["FirstJSDocNode"] = 288] = "FirstJSDocNode";
-        SyntaxKind[SyntaxKind["LastJSDocNode"] = 310] = "LastJSDocNode";
-        SyntaxKind[SyntaxKind["FirstJSDocTagNode"] = 299] = "FirstJSDocTagNode";
-        SyntaxKind[SyntaxKind["LastJSDocTagNode"] = 310] = "LastJSDocTagNode";
-        /* @internal */ SyntaxKind[SyntaxKind["FirstContextualKeyword"] = 118] = "FirstContextualKeyword";
-        /* @internal */ SyntaxKind[SyntaxKind["LastContextualKeyword"] = 147] = "LastContextualKeyword";
+        SyntaxKind[SyntaxKind["LastBinaryOperator"] = 72] = "LastBinaryOperator";
+        SyntaxKind[SyntaxKind["FirstNode"] = 149] = "FirstNode";
+        SyntaxKind[SyntaxKind["FirstJSDocNode"] = 289] = "FirstJSDocNode";
+        SyntaxKind[SyntaxKind["LastJSDocNode"] = 312] = "LastJSDocNode";
+        SyntaxKind[SyntaxKind["FirstJSDocTagNode"] = 300] = "FirstJSDocTagNode";
+        SyntaxKind[SyntaxKind["LastJSDocTagNode"] = 312] = "LastJSDocTagNode";
+        /* @internal */ SyntaxKind[SyntaxKind["FirstContextualKeyword"] = 119] = "FirstContextualKeyword";
+        /* @internal */ SyntaxKind[SyntaxKind["LastContextualKeyword"] = 148] = "LastContextualKeyword";
     })(SyntaxKind = ts.SyntaxKind || (ts.SyntaxKind = {}));
     var NodeFlags;
     (function (NodeFlags) {
@@ -3104,6 +3262,8 @@ var ts;
         FlowFlags[FlowFlags["Shared"] = 1024] = "Shared";
         FlowFlags[FlowFlags["PreFinally"] = 2048] = "PreFinally";
         FlowFlags[FlowFlags["AfterFinally"] = 4096] = "AfterFinally";
+        /** @internal */
+        FlowFlags[FlowFlags["Cached"] = 8192] = "Cached";
         FlowFlags[FlowFlags["Label"] = 12] = "Label";
         FlowFlags[FlowFlags["Condition"] = 96] = "Condition";
     })(FlowFlags = ts.FlowFlags || (ts.FlowFlags = {}));
@@ -3131,6 +3291,8 @@ var ts;
         ExitStatus[ExitStatus["DiagnosticsPresent_OutputsSkipped"] = 1] = "DiagnosticsPresent_OutputsSkipped";
         // Diagnostics were produced and outputs were generated in spite of them.
         ExitStatus[ExitStatus["DiagnosticsPresent_OutputsGenerated"] = 2] = "DiagnosticsPresent_OutputsGenerated";
+        // When build skipped because passed in project is invalid
+        ExitStatus[ExitStatus["InvalidProject_OutputsSkipped"] = 3] = "InvalidProject_OutputsSkipped";
     })(ExitStatus = ts.ExitStatus || (ts.ExitStatus = {}));
     /* @internal */
     var UnionReduction;
@@ -3356,19 +3518,22 @@ var ts;
         CheckFlags[CheckFlags["SyntheticProperty"] = 2] = "SyntheticProperty";
         CheckFlags[CheckFlags["SyntheticMethod"] = 4] = "SyntheticMethod";
         CheckFlags[CheckFlags["Readonly"] = 8] = "Readonly";
-        CheckFlags[CheckFlags["Partial"] = 16] = "Partial";
-        CheckFlags[CheckFlags["HasNonUniformType"] = 32] = "HasNonUniformType";
-        CheckFlags[CheckFlags["HasLiteralType"] = 64] = "HasLiteralType";
-        CheckFlags[CheckFlags["ContainsPublic"] = 128] = "ContainsPublic";
-        CheckFlags[CheckFlags["ContainsProtected"] = 256] = "ContainsProtected";
-        CheckFlags[CheckFlags["ContainsPrivate"] = 512] = "ContainsPrivate";
-        CheckFlags[CheckFlags["ContainsStatic"] = 1024] = "ContainsStatic";
-        CheckFlags[CheckFlags["Late"] = 2048] = "Late";
-        CheckFlags[CheckFlags["ReverseMapped"] = 4096] = "ReverseMapped";
-        CheckFlags[CheckFlags["OptionalParameter"] = 8192] = "OptionalParameter";
-        CheckFlags[CheckFlags["RestParameter"] = 16384] = "RestParameter";
+        CheckFlags[CheckFlags["ReadPartial"] = 16] = "ReadPartial";
+        CheckFlags[CheckFlags["WritePartial"] = 32] = "WritePartial";
+        CheckFlags[CheckFlags["HasNonUniformType"] = 64] = "HasNonUniformType";
+        CheckFlags[CheckFlags["HasLiteralType"] = 128] = "HasLiteralType";
+        CheckFlags[CheckFlags["ContainsPublic"] = 256] = "ContainsPublic";
+        CheckFlags[CheckFlags["ContainsProtected"] = 512] = "ContainsProtected";
+        CheckFlags[CheckFlags["ContainsPrivate"] = 1024] = "ContainsPrivate";
+        CheckFlags[CheckFlags["ContainsStatic"] = 2048] = "ContainsStatic";
+        CheckFlags[CheckFlags["Late"] = 4096] = "Late";
+        CheckFlags[CheckFlags["ReverseMapped"] = 8192] = "ReverseMapped";
+        CheckFlags[CheckFlags["OptionalParameter"] = 16384] = "OptionalParameter";
+        CheckFlags[CheckFlags["RestParameter"] = 32768] = "RestParameter";
+        CheckFlags[CheckFlags["DeferredType"] = 65536] = "DeferredType";
         CheckFlags[CheckFlags["Synthetic"] = 6] = "Synthetic";
-        CheckFlags[CheckFlags["Discriminant"] = 96] = "Discriminant";
+        CheckFlags[CheckFlags["Discriminant"] = 192] = "Discriminant";
+        CheckFlags[CheckFlags["Partial"] = 48] = "Partial";
     })(CheckFlags = ts.CheckFlags || (ts.CheckFlags = {}));
     var InternalSymbolName;
     (function (InternalSymbolName) {
@@ -3478,7 +3643,9 @@ var ts;
         TypeFlags[TypeFlags["Instantiable"] = 63176704] = "Instantiable";
         TypeFlags[TypeFlags["StructuredOrInstantiable"] = 66846720] = "StructuredOrInstantiable";
         /* @internal */
-        TypeFlags[TypeFlags["ObjectFlagsType"] = 3768320] = "ObjectFlagsType";
+        TypeFlags[TypeFlags["ObjectFlagsType"] = 3899392] = "ObjectFlagsType";
+        /* @internal */
+        TypeFlags[TypeFlags["Simplifiable"] = 25165824] = "Simplifiable";
         // 'Narrowable' types are types where narrowing actually narrows.
         // This *should* be every type other than null, undefined, void, and never
         TypeFlags[TypeFlags["Narrowable"] = 133970943] = "Narrowable";
@@ -3487,7 +3654,7 @@ var ts;
         TypeFlags[TypeFlags["NotPrimitiveUnion"] = 66994211] = "NotPrimitiveUnion";
         // The following flags are aggregated during union and intersection type construction
         /* @internal */
-        TypeFlags[TypeFlags["IncludesMask"] = 1835007] = "IncludesMask";
+        TypeFlags[TypeFlags["IncludesMask"] = 68943871] = "IncludesMask";
         // The following flags are used for different purposes during union and intersection type construction
         /* @internal */
         TypeFlags[TypeFlags["IncludesStructuredOrInstantiable"] = 262144] = "IncludesStructuredOrInstantiable";
@@ -3519,29 +3686,34 @@ var ts;
         ObjectFlags[ObjectFlags["MarkerType"] = 8192] = "MarkerType";
         ObjectFlags[ObjectFlags["JSLiteral"] = 16384] = "JSLiteral";
         ObjectFlags[ObjectFlags["FreshLiteral"] = 32768] = "FreshLiteral";
+        ObjectFlags[ObjectFlags["ArrayLiteral"] = 65536] = "ArrayLiteral";
         /* @internal */
-        ObjectFlags[ObjectFlags["PrimitiveUnion"] = 65536] = "PrimitiveUnion";
+        ObjectFlags[ObjectFlags["PrimitiveUnion"] = 131072] = "PrimitiveUnion";
         /* @internal */
-        ObjectFlags[ObjectFlags["ContainsWideningType"] = 131072] = "ContainsWideningType";
+        ObjectFlags[ObjectFlags["ContainsWideningType"] = 262144] = "ContainsWideningType";
         /* @internal */
-        ObjectFlags[ObjectFlags["ContainsObjectLiteral"] = 262144] = "ContainsObjectLiteral";
+        ObjectFlags[ObjectFlags["ContainsObjectOrArrayLiteral"] = 524288] = "ContainsObjectOrArrayLiteral";
         /* @internal */
-        ObjectFlags[ObjectFlags["ContainsAnyFunctionType"] = 524288] = "ContainsAnyFunctionType";
+        ObjectFlags[ObjectFlags["NonInferrableType"] = 1048576] = "NonInferrableType";
         ObjectFlags[ObjectFlags["ClassOrInterface"] = 3] = "ClassOrInterface";
         /* @internal */
-        ObjectFlags[ObjectFlags["RequiresWidening"] = 393216] = "RequiresWidening";
+        ObjectFlags[ObjectFlags["RequiresWidening"] = 786432] = "RequiresWidening";
         /* @internal */
-        ObjectFlags[ObjectFlags["PropagatingFlags"] = 917504] = "PropagatingFlags";
+        ObjectFlags[ObjectFlags["PropagatingFlags"] = 1835008] = "PropagatingFlags";
     })(ObjectFlags = ts.ObjectFlags || (ts.ObjectFlags = {}));
     /* @internal */
-    var Variance;
-    (function (Variance) {
-        Variance[Variance["Invariant"] = 0] = "Invariant";
-        Variance[Variance["Covariant"] = 1] = "Covariant";
-        Variance[Variance["Contravariant"] = 2] = "Contravariant";
-        Variance[Variance["Bivariant"] = 3] = "Bivariant";
-        Variance[Variance["Independent"] = 4] = "Independent";
-    })(Variance = ts.Variance || (ts.Variance = {}));
+    var VarianceFlags;
+    (function (VarianceFlags) {
+        VarianceFlags[VarianceFlags["Invariant"] = 0] = "Invariant";
+        VarianceFlags[VarianceFlags["Covariant"] = 1] = "Covariant";
+        VarianceFlags[VarianceFlags["Contravariant"] = 2] = "Contravariant";
+        VarianceFlags[VarianceFlags["Bivariant"] = 3] = "Bivariant";
+        VarianceFlags[VarianceFlags["Independent"] = 4] = "Independent";
+        VarianceFlags[VarianceFlags["VarianceMask"] = 7] = "VarianceMask";
+        VarianceFlags[VarianceFlags["Unmeasurable"] = 8] = "Unmeasurable";
+        VarianceFlags[VarianceFlags["Unreliable"] = 16] = "Unreliable";
+        VarianceFlags[VarianceFlags["AllowsStructuralFallback"] = 24] = "AllowsStructuralFallback";
+    })(VarianceFlags = ts.VarianceFlags || (ts.VarianceFlags = {}));
     /* @internal */
     var JsxReferenceKind;
     (function (JsxReferenceKind) {
@@ -3563,12 +3735,13 @@ var ts;
     (function (InferencePriority) {
         InferencePriority[InferencePriority["NakedTypeVariable"] = 1] = "NakedTypeVariable";
         InferencePriority[InferencePriority["HomomorphicMappedType"] = 2] = "HomomorphicMappedType";
-        InferencePriority[InferencePriority["MappedTypeConstraint"] = 4] = "MappedTypeConstraint";
-        InferencePriority[InferencePriority["ReturnType"] = 8] = "ReturnType";
-        InferencePriority[InferencePriority["LiteralKeyof"] = 16] = "LiteralKeyof";
-        InferencePriority[InferencePriority["NoConstraints"] = 32] = "NoConstraints";
-        InferencePriority[InferencePriority["AlwaysStrict"] = 64] = "AlwaysStrict";
-        InferencePriority[InferencePriority["PriorityImpliesCombination"] = 28] = "PriorityImpliesCombination";
+        InferencePriority[InferencePriority["PartialHomomorphicMappedType"] = 4] = "PartialHomomorphicMappedType";
+        InferencePriority[InferencePriority["MappedTypeConstraint"] = 8] = "MappedTypeConstraint";
+        InferencePriority[InferencePriority["ReturnType"] = 16] = "ReturnType";
+        InferencePriority[InferencePriority["LiteralKeyof"] = 32] = "LiteralKeyof";
+        InferencePriority[InferencePriority["NoConstraints"] = 64] = "NoConstraints";
+        InferencePriority[InferencePriority["AlwaysStrict"] = 128] = "AlwaysStrict";
+        InferencePriority[InferencePriority["PriorityImpliesCombination"] = 56] = "PriorityImpliesCombination";
     })(InferencePriority = ts.InferencePriority || (ts.InferencePriority = {}));
     /* @internal */
     var InferenceFlags;
@@ -3576,8 +3749,7 @@ var ts;
         InferenceFlags[InferenceFlags["None"] = 0] = "None";
         InferenceFlags[InferenceFlags["NoDefault"] = 1] = "NoDefault";
         InferenceFlags[InferenceFlags["AnyDefault"] = 2] = "AnyDefault";
-        InferenceFlags[InferenceFlags["NoFixing"] = 4] = "NoFixing";
-        InferenceFlags[InferenceFlags["SkippedGenericFunction"] = 8] = "SkippedGenericFunction";
+        InferenceFlags[InferenceFlags["SkippedGenericFunction"] = 4] = "SkippedGenericFunction";
     })(InferenceFlags = ts.InferenceFlags || (ts.InferenceFlags = {}));
     /**
      * Ternary values are defined such that
@@ -3648,7 +3820,7 @@ var ts;
         ModuleKind[ModuleKind["UMD"] = 3] = "UMD";
         ModuleKind[ModuleKind["System"] = 4] = "System";
         ModuleKind[ModuleKind["ES2015"] = 5] = "ES2015";
-        ModuleKind[ModuleKind["ESNext"] = 6] = "ESNext";
+        ModuleKind[ModuleKind["ESNext"] = 99] = "ESNext";
     })(ModuleKind = ts.ModuleKind || (ts.ModuleKind = {}));
     var JsxEmit;
     (function (JsxEmit) {
@@ -3686,9 +3858,10 @@ var ts;
         ScriptTarget[ScriptTarget["ES2017"] = 4] = "ES2017";
         ScriptTarget[ScriptTarget["ES2018"] = 5] = "ES2018";
         ScriptTarget[ScriptTarget["ES2019"] = 6] = "ES2019";
-        ScriptTarget[ScriptTarget["ESNext"] = 7] = "ESNext";
+        ScriptTarget[ScriptTarget["ES2020"] = 7] = "ES2020";
+        ScriptTarget[ScriptTarget["ESNext"] = 99] = "ESNext";
         ScriptTarget[ScriptTarget["JSON"] = 100] = "JSON";
-        ScriptTarget[ScriptTarget["Latest"] = 7] = "Latest";
+        ScriptTarget[ScriptTarget["Latest"] = 99] = "Latest";
     })(ScriptTarget = ts.ScriptTarget || (ts.ScriptTarget = {}));
     var LanguageVariant;
     (function (LanguageVariant) {
@@ -3867,6 +4040,7 @@ var ts;
         TransformFlags[TransformFlags["ContainsYield"] = 131072] = "ContainsYield";
         TransformFlags[TransformFlags["ContainsHoistedDeclarationOrCompletion"] = 262144] = "ContainsHoistedDeclarationOrCompletion";
         TransformFlags[TransformFlags["ContainsDynamicImport"] = 524288] = "ContainsDynamicImport";
+        TransformFlags[TransformFlags["ContainsClassFields"] = 1048576] = "ContainsClassFields";
         // Please leave this as 1 << 29.
         // It is the maximum bit we can set before we outgrow the size of a v8 small integer (SMI) on an x86 system.
         // It is a good reminder of how much room we have left
@@ -3961,22 +4135,23 @@ var ts;
         ExternalEmitHelpers[ExternalEmitHelpers["Values"] = 256] = "Values";
         ExternalEmitHelpers[ExternalEmitHelpers["Read"] = 512] = "Read";
         ExternalEmitHelpers[ExternalEmitHelpers["Spread"] = 1024] = "Spread";
-        ExternalEmitHelpers[ExternalEmitHelpers["Await"] = 2048] = "Await";
-        ExternalEmitHelpers[ExternalEmitHelpers["AsyncGenerator"] = 4096] = "AsyncGenerator";
-        ExternalEmitHelpers[ExternalEmitHelpers["AsyncDelegator"] = 8192] = "AsyncDelegator";
-        ExternalEmitHelpers[ExternalEmitHelpers["AsyncValues"] = 16384] = "AsyncValues";
-        ExternalEmitHelpers[ExternalEmitHelpers["ExportStar"] = 32768] = "ExportStar";
-        ExternalEmitHelpers[ExternalEmitHelpers["MakeTemplateObject"] = 65536] = "MakeTemplateObject";
+        ExternalEmitHelpers[ExternalEmitHelpers["SpreadArrays"] = 2048] = "SpreadArrays";
+        ExternalEmitHelpers[ExternalEmitHelpers["Await"] = 4096] = "Await";
+        ExternalEmitHelpers[ExternalEmitHelpers["AsyncGenerator"] = 8192] = "AsyncGenerator";
+        ExternalEmitHelpers[ExternalEmitHelpers["AsyncDelegator"] = 16384] = "AsyncDelegator";
+        ExternalEmitHelpers[ExternalEmitHelpers["AsyncValues"] = 32768] = "AsyncValues";
+        ExternalEmitHelpers[ExternalEmitHelpers["ExportStar"] = 65536] = "ExportStar";
+        ExternalEmitHelpers[ExternalEmitHelpers["MakeTemplateObject"] = 131072] = "MakeTemplateObject";
         ExternalEmitHelpers[ExternalEmitHelpers["FirstEmitHelper"] = 1] = "FirstEmitHelper";
-        ExternalEmitHelpers[ExternalEmitHelpers["LastEmitHelper"] = 65536] = "LastEmitHelper";
+        ExternalEmitHelpers[ExternalEmitHelpers["LastEmitHelper"] = 131072] = "LastEmitHelper";
         // Helpers included by ES2015 for..of
         ExternalEmitHelpers[ExternalEmitHelpers["ForOfIncludes"] = 256] = "ForOfIncludes";
         // Helpers included by ES2017 for..await..of
-        ExternalEmitHelpers[ExternalEmitHelpers["ForAwaitOfIncludes"] = 16384] = "ForAwaitOfIncludes";
+        ExternalEmitHelpers[ExternalEmitHelpers["ForAwaitOfIncludes"] = 32768] = "ForAwaitOfIncludes";
         // Helpers included by ES2017 async generators
-        ExternalEmitHelpers[ExternalEmitHelpers["AsyncGeneratorIncludes"] = 6144] = "AsyncGeneratorIncludes";
+        ExternalEmitHelpers[ExternalEmitHelpers["AsyncGeneratorIncludes"] = 12288] = "AsyncGeneratorIncludes";
         // Helpers included by yield* in ES2017 async generators
-        ExternalEmitHelpers[ExternalEmitHelpers["AsyncDelegatorIncludes"] = 26624] = "AsyncDelegatorIncludes";
+        ExternalEmitHelpers[ExternalEmitHelpers["AsyncDelegatorIncludes"] = 53248] = "AsyncDelegatorIncludes";
         // Helpers included by ES2015 spread
         ExternalEmitHelpers[ExternalEmitHelpers["SpreadIncludes"] = 1536] = "SpreadIncludes";
     })(ExternalEmitHelpers = ts.ExternalEmitHelpers || (ts.ExternalEmitHelpers = {}));
@@ -4101,17 +4276,10 @@ var ts;
         PragmaKindFlags[PragmaKindFlags["All"] = 7] = "All";
         PragmaKindFlags[PragmaKindFlags["Default"] = 7] = "Default";
     })(PragmaKindFlags = ts.PragmaKindFlags || (ts.PragmaKindFlags = {}));
-    /**
-     * This function only exists to cause exact types to be inferred for all the literals within `commentPragmas`
-     */
-    /* @internal */
-    function _contextuallyTypePragmas(args) {
-        return args;
-    }
     // While not strictly a type, this is here because `PragmaMap` needs to be here to be used with `SourceFile`, and we don't
     //  fancy effectively defining it twice, once in value-space and once in type-space
     /* @internal */
-    ts.commentPragmas = _contextuallyTypePragmas({
+    ts.commentPragmas = {
         "reference": {
             args: [
                 { name: "types", optional: true, captureSpan: true },
@@ -4139,7 +4307,7 @@ var ts;
             args: [{ name: "factory" }],
             kind: 4 /* MultiLine */
         },
-    });
+    };
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
@@ -4149,8 +4317,11 @@ var ts;
      */
     /* @internal */
     function generateDjb2Hash(data) {
-        var chars = data.split("").map(function (str) { return str.charCodeAt(0); });
-        return "" + chars.reduce(function (prev, curr) { return ((prev << 5) + prev) + curr; }, 5381);
+        var acc = 5381;
+        for (var i = 0; i < data.length; i++) {
+            acc = ((acc << 5) + acc) + data.charCodeAt(i);
+        }
+        return acc.toString();
     }
     ts.generateDjb2Hash = generateDjb2Hash;
     /**
@@ -4411,7 +4582,7 @@ var ts;
     }
     ts.getFileWatcherEventKind = getFileWatcherEventKind;
     /*@internal*/
-    ts.ignoredPaths = ["/node_modules/.", "/.git"];
+    ts.ignoredPaths = ["/node_modules/.", "/.git", "/.#"];
     /**
      * Watch the directory recursively using host provided method to watch child directories
      * that means if this is recursive watcher, watch the children directories as well
@@ -4997,7 +5168,7 @@ var ts;
                 }
             }
             function readDirectory(path, extensions, excludes, includes, depth) {
-                return ts.matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, process.cwd(), depth, getAccessibleFileSystemEntries);
+                return ts.matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, process.cwd(), depth, getAccessibleFileSystemEntries, realpath);
             }
             function fileSystemEntryExists(path, entryKind) {
                 try {
@@ -5183,7 +5354,7 @@ var ts;
         _0_modifier_cannot_appear_on_a_data_property: diag(1043, ts.DiagnosticCategory.Error, "_0_modifier_cannot_appear_on_a_data_property_1043", "'{0}' modifier cannot appear on a data property."),
         _0_modifier_cannot_appear_on_a_module_or_namespace_element: diag(1044, ts.DiagnosticCategory.Error, "_0_modifier_cannot_appear_on_a_module_or_namespace_element_1044", "'{0}' modifier cannot appear on a module or namespace element."),
         A_0_modifier_cannot_be_used_with_an_interface_declaration: diag(1045, ts.DiagnosticCategory.Error, "A_0_modifier_cannot_be_used_with_an_interface_declaration_1045", "A '{0}' modifier cannot be used with an interface declaration."),
-        A_declare_modifier_is_required_for_a_top_level_declaration_in_a_d_ts_file: diag(1046, ts.DiagnosticCategory.Error, "A_declare_modifier_is_required_for_a_top_level_declaration_in_a_d_ts_file_1046", "A 'declare' modifier is required for a top level declaration in a .d.ts file."),
+        Top_level_declarations_in_d_ts_files_must_start_with_either_a_declare_or_export_modifier: diag(1046, ts.DiagnosticCategory.Error, "Top_level_declarations_in_d_ts_files_must_start_with_either_a_declare_or_export_modifier_1046", "Top-level declarations in .d.ts files must start with either a 'declare' or 'export' modifier."),
         A_rest_parameter_cannot_be_optional: diag(1047, ts.DiagnosticCategory.Error, "A_rest_parameter_cannot_be_optional_1047", "A rest parameter cannot be optional."),
         A_rest_parameter_cannot_have_an_initializer: diag(1048, ts.DiagnosticCategory.Error, "A_rest_parameter_cannot_have_an_initializer_1048", "A rest parameter cannot have an initializer."),
         A_set_accessor_must_have_exactly_one_parameter: diag(1049, ts.DiagnosticCategory.Error, "A_set_accessor_must_have_exactly_one_parameter_1049", "A 'set' accessor must have exactly one parameter."),
@@ -5312,7 +5483,7 @@ var ts;
         Cannot_re_export_a_type_when_the_isolatedModules_flag_is_provided: diag(1205, ts.DiagnosticCategory.Error, "Cannot_re_export_a_type_when_the_isolatedModules_flag_is_provided_1205", "Cannot re-export a type when the '--isolatedModules' flag is provided."),
         Decorators_are_not_valid_here: diag(1206, ts.DiagnosticCategory.Error, "Decorators_are_not_valid_here_1206", "Decorators are not valid here."),
         Decorators_cannot_be_applied_to_multiple_get_Slashset_accessors_of_the_same_name: diag(1207, ts.DiagnosticCategory.Error, "Decorators_cannot_be_applied_to_multiple_get_Slashset_accessors_of_the_same_name_1207", "Decorators cannot be applied to multiple get/set accessors of the same name."),
-        Cannot_compile_namespaces_when_the_isolatedModules_flag_is_provided: diag(1208, ts.DiagnosticCategory.Error, "Cannot_compile_namespaces_when_the_isolatedModules_flag_is_provided_1208", "Cannot compile namespaces when the '--isolatedModules' flag is provided."),
+        All_files_must_be_modules_when_the_isolatedModules_flag_is_provided: diag(1208, ts.DiagnosticCategory.Error, "All_files_must_be_modules_when_the_isolatedModules_flag_is_provided_1208", "All files must be modules when the '--isolatedModules' flag is provided."),
         Invalid_use_of_0_Class_definitions_are_automatically_in_strict_mode: diag(1210, ts.DiagnosticCategory.Error, "Invalid_use_of_0_Class_definitions_are_automatically_in_strict_mode_1210", "Invalid use of '{0}'. Class definitions are automatically in strict mode."),
         A_class_declaration_without_the_default_modifier_must_have_a_name: diag(1211, ts.DiagnosticCategory.Error, "A_class_declaration_without_the_default_modifier_must_have_a_name_1211", "A class declaration without the 'default' modifier must have a name."),
         Identifier_expected_0_is_a_reserved_word_in_strict_mode: diag(1212, ts.DiagnosticCategory.Error, "Identifier_expected_0_is_a_reserved_word_in_strict_mode_1212", "Identifier expected. '{0}' is a reserved word in strict mode."),
@@ -5321,7 +5492,7 @@ var ts;
         Invalid_use_of_0_Modules_are_automatically_in_strict_mode: diag(1215, ts.DiagnosticCategory.Error, "Invalid_use_of_0_Modules_are_automatically_in_strict_mode_1215", "Invalid use of '{0}'. Modules are automatically in strict mode."),
         Identifier_expected_esModule_is_reserved_as_an_exported_marker_when_transforming_ECMAScript_modules: diag(1216, ts.DiagnosticCategory.Error, "Identifier_expected_esModule_is_reserved_as_an_exported_marker_when_transforming_ECMAScript_modules_1216", "Identifier expected. '__esModule' is reserved as an exported marker when transforming ECMAScript modules."),
         Export_assignment_is_not_supported_when_module_flag_is_system: diag(1218, ts.DiagnosticCategory.Error, "Export_assignment_is_not_supported_when_module_flag_is_system_1218", "Export assignment is not supported when '--module' flag is 'system'."),
-        Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_to_remove_this_warning: diag(1219, ts.DiagnosticCategory.Error, "Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_t_1219", "Experimental support for decorators is a feature that is subject to change in a future release. Set the 'experimentalDecorators' option to remove this warning."),
+        Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_in_your_tsconfig_or_jsconfig_to_remove_this_warning: diag(1219, ts.DiagnosticCategory.Error, "Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_t_1219", "Experimental support for decorators is a feature that is subject to change in a future release. Set the 'experimentalDecorators' option in your 'tsconfig' or 'jsconfig' to remove this warning."),
         Generators_are_only_available_when_targeting_ECMAScript_2015_or_higher: diag(1220, ts.DiagnosticCategory.Error, "Generators_are_only_available_when_targeting_ECMAScript_2015_or_higher_1220", "Generators are only available when targeting ECMAScript 2015 or higher."),
         Generators_are_not_allowed_in_an_ambient_context: diag(1221, ts.DiagnosticCategory.Error, "Generators_are_not_allowed_in_an_ambient_context_1221", "Generators are not allowed in an ambient context."),
         An_overload_signature_cannot_be_declared_as_a_generator: diag(1222, ts.DiagnosticCategory.Error, "An_overload_signature_cannot_be_declared_as_a_generator_1222", "An overload signature cannot be declared as a generator."),
@@ -5360,6 +5531,8 @@ var ts;
         A_definite_assignment_assertion_is_not_permitted_in_this_context: diag(1255, ts.DiagnosticCategory.Error, "A_definite_assignment_assertion_is_not_permitted_in_this_context_1255", "A definite assignment assertion '!' is not permitted in this context."),
         A_rest_element_must_be_last_in_a_tuple_type: diag(1256, ts.DiagnosticCategory.Error, "A_rest_element_must_be_last_in_a_tuple_type_1256", "A rest element must be last in a tuple type."),
         A_required_element_cannot_follow_an_optional_element: diag(1257, ts.DiagnosticCategory.Error, "A_required_element_cannot_follow_an_optional_element_1257", "A required element cannot follow an optional element."),
+        Definite_assignment_assertions_can_only_be_used_along_with_a_type_annotation: diag(1258, ts.DiagnosticCategory.Error, "Definite_assignment_assertions_can_only_be_used_along_with_a_type_annotation_1258", "Definite assignment assertions can only be used along with a type annotation."),
+        Module_0_can_only_be_default_imported_using_the_1_flag: diag(1259, ts.DiagnosticCategory.Error, "Module_0_can_only_be_default_imported_using_the_1_flag_1259", "Module '{0}' can only be default-imported using the '{1}' flag"),
         with_statements_are_not_allowed_in_an_async_function_block: diag(1300, ts.DiagnosticCategory.Error, "with_statements_are_not_allowed_in_an_async_function_block_1300", "'with' statements are not allowed in an async function block."),
         await_expression_is_only_allowed_within_an_async_function: diag(1308, ts.DiagnosticCategory.Error, "await_expression_is_only_allowed_within_an_async_function_1308", "'await' expression is only allowed within an async function."),
         can_only_be_used_in_an_object_literal_property_inside_a_destructuring_assignment: diag(1312, ts.DiagnosticCategory.Error, "can_only_be_used_in_an_object_literal_property_inside_a_destructuring_assignment_1312", "'=' can only be used in an object literal property inside a destructuring assignment."),
@@ -5404,7 +5577,8 @@ var ts;
         A_bigint_literal_cannot_use_exponential_notation: diag(1352, ts.DiagnosticCategory.Error, "A_bigint_literal_cannot_use_exponential_notation_1352", "A bigint literal cannot use exponential notation."),
         A_bigint_literal_must_be_an_integer: diag(1353, ts.DiagnosticCategory.Error, "A_bigint_literal_must_be_an_integer_1353", "A bigint literal must be an integer."),
         readonly_type_modifier_is_only_permitted_on_array_and_tuple_literal_types: diag(1354, ts.DiagnosticCategory.Error, "readonly_type_modifier_is_only_permitted_on_array_and_tuple_literal_types_1354", "'readonly' type modifier is only permitted on array and tuple literal types."),
-        A_const_assertion_can_only_be_applied_to_a_string_number_boolean_array_or_object_literal: diag(1355, ts.DiagnosticCategory.Error, "A_const_assertion_can_only_be_applied_to_a_string_number_boolean_array_or_object_literal_1355", "A 'const' assertion can only be applied to a string, number, boolean, array, or object literal."),
+        A_const_assertions_can_only_be_applied_to_references_to_enum_members_or_string_number_boolean_array_or_object_literals: diag(1355, ts.DiagnosticCategory.Error, "A_const_assertions_can_only_be_applied_to_references_to_enum_members_or_string_number_boolean_array__1355", "A 'const' assertions can only be applied to references to enum members, or string, number, boolean, array, or object literals."),
+        Did_you_mean_to_mark_this_function_as_async: diag(1356, ts.DiagnosticCategory.Error, "Did_you_mean_to_mark_this_function_as_async_1356", "Did you mean to mark this function as 'async'?"),
         Duplicate_identifier_0: diag(2300, ts.DiagnosticCategory.Error, "Duplicate_identifier_0_2300", "Duplicate identifier '{0}'."),
         Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor: diag(2301, ts.DiagnosticCategory.Error, "Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor_2301", "Initializer of instance member variable '{0}' cannot reference identifier '{1}' declared in the constructor."),
         Static_members_cannot_reference_class_type_parameters: diag(2302, ts.DiagnosticCategory.Error, "Static_members_cannot_reference_class_type_parameters_2302", "Static members cannot reference class type parameters."),
@@ -5454,9 +5628,9 @@ var ts;
         Call_target_does_not_contain_any_signatures: diag(2346, ts.DiagnosticCategory.Error, "Call_target_does_not_contain_any_signatures_2346", "Call target does not contain any signatures."),
         Untyped_function_calls_may_not_accept_type_arguments: diag(2347, ts.DiagnosticCategory.Error, "Untyped_function_calls_may_not_accept_type_arguments_2347", "Untyped function calls may not accept type arguments."),
         Value_of_type_0_is_not_callable_Did_you_mean_to_include_new: diag(2348, ts.DiagnosticCategory.Error, "Value_of_type_0_is_not_callable_Did_you_mean_to_include_new_2348", "Value of type '{0}' is not callable. Did you mean to include 'new'?"),
-        Cannot_invoke_an_expression_whose_type_lacks_a_call_signature_Type_0_has_no_compatible_call_signatures: diag(2349, ts.DiagnosticCategory.Error, "Cannot_invoke_an_expression_whose_type_lacks_a_call_signature_Type_0_has_no_compatible_call_signatur_2349", "Cannot invoke an expression whose type lacks a call signature. Type '{0}' has no compatible call signatures."),
+        This_expression_is_not_callable: diag(2349, ts.DiagnosticCategory.Error, "This_expression_is_not_callable_2349", "This expression is not callable."),
         Only_a_void_function_can_be_called_with_the_new_keyword: diag(2350, ts.DiagnosticCategory.Error, "Only_a_void_function_can_be_called_with_the_new_keyword_2350", "Only a void function can be called with the 'new' keyword."),
-        Cannot_use_new_with_an_expression_whose_type_lacks_a_call_or_construct_signature: diag(2351, ts.DiagnosticCategory.Error, "Cannot_use_new_with_an_expression_whose_type_lacks_a_call_or_construct_signature_2351", "Cannot use 'new' with an expression whose type lacks a call or construct signature."),
+        This_expression_is_not_constructable: diag(2351, ts.DiagnosticCategory.Error, "This_expression_is_not_constructable_2351", "This expression is not constructable."),
         Conversion_of_type_0_to_type_1_may_be_a_mistake_because_neither_type_sufficiently_overlaps_with_the_other_If_this_was_intentional_convert_the_expression_to_unknown_first: diag(2352, ts.DiagnosticCategory.Error, "Conversion_of_type_0_to_type_1_may_be_a_mistake_because_neither_type_sufficiently_overlaps_with_the__2352", "Conversion of type '{0}' to type '{1}' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first."),
         Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1: diag(2353, ts.DiagnosticCategory.Error, "Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1_2353", "Object literal may only specify known properties, and '{0}' does not exist in type '{1}'."),
         This_syntax_requires_an_imported_helper_but_module_0_cannot_be_found: diag(2354, ts.DiagnosticCategory.Error, "This_syntax_requires_an_imported_helper_but_module_0_cannot_be_found_2354", "This syntax requires an imported helper but module '{0}' cannot be found."),
@@ -5586,7 +5760,7 @@ var ts;
         The_left_hand_side_of_a_for_of_statement_must_be_a_variable_or_a_property_access: diag(2487, ts.DiagnosticCategory.Error, "The_left_hand_side_of_a_for_of_statement_must_be_a_variable_or_a_property_access_2487", "The left-hand side of a 'for...of' statement must be a variable or a property access."),
         Type_0_must_have_a_Symbol_iterator_method_that_returns_an_iterator: diag(2488, ts.DiagnosticCategory.Error, "Type_0_must_have_a_Symbol_iterator_method_that_returns_an_iterator_2488", "Type '{0}' must have a '[Symbol.iterator]()' method that returns an iterator."),
         An_iterator_must_have_a_next_method: diag(2489, ts.DiagnosticCategory.Error, "An_iterator_must_have_a_next_method_2489", "An iterator must have a 'next()' method."),
-        The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property: diag(2490, ts.DiagnosticCategory.Error, "The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property_2490", "The type returned by the 'next()' method of an iterator must have a 'value' property."),
+        The_type_returned_by_the_0_method_of_an_iterator_must_have_a_value_property: diag(2490, ts.DiagnosticCategory.Error, "The_type_returned_by_the_0_method_of_an_iterator_must_have_a_value_property_2490", "The type returned by the '{0}()' method of an iterator must have a 'value' property."),
         The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern: diag(2491, ts.DiagnosticCategory.Error, "The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern_2491", "The left-hand side of a 'for...in' statement cannot be a destructuring pattern."),
         Cannot_redeclare_identifier_0_in_catch_clause: diag(2492, ts.DiagnosticCategory.Error, "Cannot_redeclare_identifier_0_in_catch_clause_2492", "Cannot redeclare identifier '{0}' in catch clause."),
         Tuple_type_0_of_length_1_has_no_element_at_index_2: diag(2493, ts.DiagnosticCategory.Error, "Tuple_type_0_of_length_1_has_no_element_at_index_2_2493", "Tuple type '{0}' of length '{1}' has no element at index '{2}'."),
@@ -5643,7 +5817,7 @@ var ts;
         Expression_resolves_to_variable_declaration_newTarget_that_compiler_uses_to_capture_new_target_meta_property_reference: diag(2544, ts.DiagnosticCategory.Error, "Expression_resolves_to_variable_declaration_newTarget_that_compiler_uses_to_capture_new_target_meta__2544", "Expression resolves to variable declaration '_newTarget' that compiler uses to capture 'new.target' meta-property reference."),
         A_mixin_class_must_have_a_constructor_with_a_single_rest_parameter_of_type_any: diag(2545, ts.DiagnosticCategory.Error, "A_mixin_class_must_have_a_constructor_with_a_single_rest_parameter_of_type_any_2545", "A mixin class must have a constructor with a single rest parameter of type 'any[]'."),
         Property_0_has_conflicting_declarations_and_is_inaccessible_in_type_1: diag(2546, ts.DiagnosticCategory.Error, "Property_0_has_conflicting_declarations_and_is_inaccessible_in_type_1_2546", "Property '{0}' has conflicting declarations and is inaccessible in type '{1}'."),
-        The_type_returned_by_the_next_method_of_an_async_iterator_must_be_a_promise_for_a_type_with_a_value_property: diag(2547, ts.DiagnosticCategory.Error, "The_type_returned_by_the_next_method_of_an_async_iterator_must_be_a_promise_for_a_type_with_a_value__2547", "The type returned by the 'next()' method of an async iterator must be a promise for a type with a 'value' property."),
+        The_type_returned_by_the_0_method_of_an_async_iterator_must_be_a_promise_for_a_type_with_a_value_property: diag(2547, ts.DiagnosticCategory.Error, "The_type_returned_by_the_0_method_of_an_async_iterator_must_be_a_promise_for_a_type_with_a_value_pro_2547", "The type returned by the '{0}()' method of an async iterator must be a promise for a type with a 'value' property."),
         Type_0_is_not_an_array_type_or_does_not_have_a_Symbol_iterator_method_that_returns_an_iterator: diag(2548, ts.DiagnosticCategory.Error, "Type_0_is_not_an_array_type_or_does_not_have_a_Symbol_iterator_method_that_returns_an_iterator_2548", "Type '{0}' is not an array type or does not have a '[Symbol.iterator]()' method that returns an iterator."),
         Type_0_is_not_an_array_type_or_a_string_type_or_does_not_have_a_Symbol_iterator_method_that_returns_an_iterator: diag(2549, ts.DiagnosticCategory.Error, "Type_0_is_not_an_array_type_or_a_string_type_or_does_not_have_a_Symbol_iterator_method_that_returns__2549", "Type '{0}' is not an array type or a string type or does not have a '[Symbol.iterator]()' method that returns an iterator."),
         Property_0_does_not_exist_on_type_1_Did_you_mean_2: diag(2551, ts.DiagnosticCategory.Error, "Property_0_does_not_exist_on_type_1_Did_you_mean_2_2551", "Property '{0}' does not exist on type '{1}'. Did you mean '{2}'?"),
@@ -5664,7 +5838,6 @@ var ts;
         A_rest_element_cannot_have_a_property_name: diag(2566, ts.DiagnosticCategory.Error, "A_rest_element_cannot_have_a_property_name_2566", "A rest element cannot have a property name."),
         Enum_declarations_can_only_merge_with_namespace_or_other_enum_declarations: diag(2567, ts.DiagnosticCategory.Error, "Enum_declarations_can_only_merge_with_namespace_or_other_enum_declarations_2567", "Enum declarations can only merge with namespace or other enum declarations."),
         Type_0_is_not_an_array_type_or_a_string_type_Use_compiler_option_downlevelIteration_to_allow_iterating_of_iterators: diag(2569, ts.DiagnosticCategory.Error, "Type_0_is_not_an_array_type_or_a_string_type_Use_compiler_option_downlevelIteration_to_allow_iterati_2569", "Type '{0}' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators."),
-        Property_0_does_not_exist_on_type_1_Did_you_forget_to_use_await: diag(2570, ts.DiagnosticCategory.Error, "Property_0_does_not_exist_on_type_1_Did_you_forget_to_use_await_2570", "Property '{0}' does not exist on type '{1}'. Did you forget to use 'await'?"),
         Object_is_of_type_unknown: diag(2571, ts.DiagnosticCategory.Error, "Object_is_of_type_unknown_2571", "Object is of type 'unknown'."),
         Rest_signatures_are_incompatible: diag(2572, ts.DiagnosticCategory.Error, "Rest_signatures_are_incompatible_2572", "Rest signatures are incompatible."),
         Property_0_is_incompatible_with_rest_element_type: diag(2573, ts.DiagnosticCategory.Error, "Property_0_is_incompatible_with_rest_element_type_2573", "Property '{0}' is incompatible with rest element type."),
@@ -5686,6 +5859,7 @@ var ts;
         Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_node_Try_npm_i_types_Slashnode_and_then_add_node_to_the_types_field_in_your_tsconfig: diag(2591, ts.DiagnosticCategory.Error, "Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_node_Try_npm_i_types_Slashnode_and_th_2591", "Cannot find name '{0}'. Do you need to install type definitions for node? Try `npm i @types/node` and then add `node` to the types field in your tsconfig."),
         Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_jQuery_Try_npm_i_types_Slashjquery_and_then_add_jquery_to_the_types_field_in_your_tsconfig: diag(2592, ts.DiagnosticCategory.Error, "Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_jQuery_Try_npm_i_types_Slashjquery_an_2592", "Cannot find name '{0}'. Do you need to install type definitions for jQuery? Try `npm i @types/jquery` and then add `jquery` to the types field in your tsconfig."),
         Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_a_test_runner_Try_npm_i_types_Slashjest_or_npm_i_types_Slashmocha_and_then_add_jest_or_mocha_to_the_types_field_in_your_tsconfig: diag(2593, ts.DiagnosticCategory.Error, "Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_a_test_runner_Try_npm_i_types_Slashje_2593", "Cannot find name '{0}'. Do you need to install type definitions for a test runner? Try `npm i @types/jest` or `npm i @types/mocha` and then add `jest` or `mocha` to the types field in your tsconfig."),
+        This_module_is_declared_with_using_export_and_can_only_be_used_with_a_default_import_when_using_the_0_flag: diag(2594, ts.DiagnosticCategory.Error, "This_module_is_declared_with_using_export_and_can_only_be_used_with_a_default_import_when_using_the__2594", "This module is declared with using 'export =', and can only be used with a default import when using the '{0}' flag."),
         JSX_element_attributes_type_0_may_not_be_a_union_type: diag(2600, ts.DiagnosticCategory.Error, "JSX_element_attributes_type_0_may_not_be_a_union_type_2600", "JSX element attributes type '{0}' may not be a union type."),
         The_return_type_of_a_JSX_element_constructor_must_return_an_object_type: diag(2601, ts.DiagnosticCategory.Error, "The_return_type_of_a_JSX_element_constructor_must_return_an_object_type_2601", "The return type of a JSX element constructor must return an object type."),
         JSX_element_implicitly_has_type_any_because_the_global_type_JSX_Element_does_not_exist: diag(2602, ts.DiagnosticCategory.Error, "JSX_element_implicitly_has_type_any_because_the_global_type_JSX_Element_does_not_exist_2602", "JSX element implicitly has type 'any' because the global type 'JSX.Element' does not exist."),
@@ -5796,6 +5970,28 @@ var ts;
         _0_refers_to_a_value_but_is_being_used_as_a_type_here: diag(2749, ts.DiagnosticCategory.Error, "_0_refers_to_a_value_but_is_being_used_as_a_type_here_2749", "'{0}' refers to a value, but is being used as a type here."),
         The_implementation_signature_is_declared_here: diag(2750, ts.DiagnosticCategory.Error, "The_implementation_signature_is_declared_here_2750", "The implementation signature is declared here."),
         Circularity_originates_in_type_at_this_location: diag(2751, ts.DiagnosticCategory.Error, "Circularity_originates_in_type_at_this_location_2751", "Circularity originates in type at this location."),
+        The_first_export_default_is_here: diag(2752, ts.DiagnosticCategory.Error, "The_first_export_default_is_here_2752", "The first export default is here."),
+        Another_export_default_is_here: diag(2753, ts.DiagnosticCategory.Error, "Another_export_default_is_here_2753", "Another export default is here."),
+        super_may_not_use_type_arguments: diag(2754, ts.DiagnosticCategory.Error, "super_may_not_use_type_arguments_2754", "'super' may not use type arguments."),
+        No_constituent_of_type_0_is_callable: diag(2755, ts.DiagnosticCategory.Error, "No_constituent_of_type_0_is_callable_2755", "No constituent of type '{0}' is callable."),
+        Not_all_constituents_of_type_0_are_callable: diag(2756, ts.DiagnosticCategory.Error, "Not_all_constituents_of_type_0_are_callable_2756", "Not all constituents of type '{0}' are callable."),
+        Type_0_has_no_call_signatures: diag(2757, ts.DiagnosticCategory.Error, "Type_0_has_no_call_signatures_2757", "Type '{0}' has no call signatures."),
+        Each_member_of_the_union_type_0_has_signatures_but_none_of_those_signatures_are_compatible_with_each_other: diag(2758, ts.DiagnosticCategory.Error, "Each_member_of_the_union_type_0_has_signatures_but_none_of_those_signatures_are_compatible_with_each_2758", "Each member of the union type '{0}' has signatures, but none of those signatures are compatible with each other."),
+        No_constituent_of_type_0_is_constructable: diag(2759, ts.DiagnosticCategory.Error, "No_constituent_of_type_0_is_constructable_2759", "No constituent of type '{0}' is constructable."),
+        Not_all_constituents_of_type_0_are_constructable: diag(2760, ts.DiagnosticCategory.Error, "Not_all_constituents_of_type_0_are_constructable_2760", "Not all constituents of type '{0}' are constructable."),
+        Type_0_has_no_construct_signatures: diag(2761, ts.DiagnosticCategory.Error, "Type_0_has_no_construct_signatures_2761", "Type '{0}' has no construct signatures."),
+        Each_member_of_the_union_type_0_has_construct_signatures_but_none_of_those_signatures_are_compatible_with_each_other: diag(2762, ts.DiagnosticCategory.Error, "Each_member_of_the_union_type_0_has_construct_signatures_but_none_of_those_signatures_are_compatible_2762", "Each member of the union type '{0}' has construct signatures, but none of those signatures are compatible with each other."),
+        Cannot_iterate_value_because_the_next_method_of_its_iterator_expects_type_1_but_for_of_will_always_send_0: diag(2763, ts.DiagnosticCategory.Error, "Cannot_iterate_value_because_the_next_method_of_its_iterator_expects_type_1_but_for_of_will_always_s_2763", "Cannot iterate value because the 'next' method of its iterator expects type '{1}', but for-of will always send '{0}'."),
+        Cannot_iterate_value_because_the_next_method_of_its_iterator_expects_type_1_but_array_spread_will_always_send_0: diag(2764, ts.DiagnosticCategory.Error, "Cannot_iterate_value_because_the_next_method_of_its_iterator_expects_type_1_but_array_spread_will_al_2764", "Cannot iterate value because the 'next' method of its iterator expects type '{1}', but array spread will always send '{0}'."),
+        Cannot_iterate_value_because_the_next_method_of_its_iterator_expects_type_1_but_array_destructuring_will_always_send_0: diag(2765, ts.DiagnosticCategory.Error, "Cannot_iterate_value_because_the_next_method_of_its_iterator_expects_type_1_but_array_destructuring__2765", "Cannot iterate value because the 'next' method of its iterator expects type '{1}', but array destructuring will always send '{0}'."),
+        Cannot_delegate_iteration_to_value_because_the_next_method_of_its_iterator_expects_type_1_but_the_containing_generator_will_always_send_0: diag(2766, ts.DiagnosticCategory.Error, "Cannot_delegate_iteration_to_value_because_the_next_method_of_its_iterator_expects_type_1_but_the_co_2766", "Cannot delegate iteration to value because the 'next' method of its iterator expects type '{1}', but the containing generator will always send '{0}'."),
+        The_0_property_of_an_iterator_must_be_a_method: diag(2767, ts.DiagnosticCategory.Error, "The_0_property_of_an_iterator_must_be_a_method_2767", "The '{0}' property of an iterator must be a method."),
+        The_0_property_of_an_async_iterator_must_be_a_method: diag(2768, ts.DiagnosticCategory.Error, "The_0_property_of_an_async_iterator_must_be_a_method_2768", "The '{0}' property of an async iterator must be a method."),
+        No_overload_matches_this_call: diag(2769, ts.DiagnosticCategory.Error, "No_overload_matches_this_call_2769", "No overload matches this call."),
+        The_last_overload_gave_the_following_error: diag(2770, ts.DiagnosticCategory.Error, "The_last_overload_gave_the_following_error_2770", "The last overload gave the following error."),
+        The_last_overload_is_declared_here: diag(2771, ts.DiagnosticCategory.Error, "The_last_overload_is_declared_here_2771", "The last overload is declared here."),
+        Overload_0_of_1_2_gave_the_following_error: diag(2772, ts.DiagnosticCategory.Error, "Overload_0_of_1_2_gave_the_following_error_2772", "Overload {0} of {1}, '{2}', gave the following error."),
+        Did_you_forget_to_use_await: diag(2773, ts.DiagnosticCategory.Error, "Did_you_forget_to_use_await_2773", "Did you forget to use 'await'?"),
         Import_declaration_0_is_using_private_name_1: diag(4000, ts.DiagnosticCategory.Error, "Import_declaration_0_is_using_private_name_1_4000", "Import declaration '{0}' is using private name '{1}'."),
         Type_parameter_0_of_exported_class_has_or_is_using_private_name_1: diag(4002, ts.DiagnosticCategory.Error, "Type_parameter_0_of_exported_class_has_or_is_using_private_name_1_4002", "Type parameter '{0}' of exported class has or is using private name '{1}'."),
         Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1: diag(4004, ts.DiagnosticCategory.Error, "Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1_4004", "Type parameter '{0}' of exported interface has or is using private name '{1}'."),
@@ -5880,6 +6076,8 @@ var ts;
         Method_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2: diag(4101, ts.DiagnosticCategory.Error, "Method_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2_4101", "Method '{0}' of exported interface has or is using name '{1}' from private module '{2}'."),
         Method_0_of_exported_interface_has_or_is_using_private_name_1: diag(4102, ts.DiagnosticCategory.Error, "Method_0_of_exported_interface_has_or_is_using_private_name_1_4102", "Method '{0}' of exported interface has or is using private name '{1}'."),
         Type_parameter_0_of_exported_mapped_object_type_is_using_private_name_1: diag(4103, ts.DiagnosticCategory.Error, "Type_parameter_0_of_exported_mapped_object_type_is_using_private_name_1_4103", "Type parameter '{0}' of exported mapped object type is using private name '{1}'."),
+        The_type_0_is_readonly_and_cannot_be_assigned_to_the_mutable_type_1: diag(4104, ts.DiagnosticCategory.Error, "The_type_0_is_readonly_and_cannot_be_assigned_to_the_mutable_type_1_4104", "The type '{0}' is 'readonly' and cannot be assigned to the mutable type '{1}'."),
+        Private_or_protected_member_0_cannot_be_accessed_on_a_type_parameter: diag(4105, ts.DiagnosticCategory.Error, "Private_or_protected_member_0_cannot_be_accessed_on_a_type_parameter_4105", "Private or protected member '{0}' cannot be accessed on a type parameter."),
         The_current_host_does_not_support_the_0_option: diag(5001, ts.DiagnosticCategory.Error, "The_current_host_does_not_support_the_0_option_5001", "The current host does not support the '{0}' option."),
         Cannot_find_the_common_subdirectory_path_for_the_input_files: diag(5009, ts.DiagnosticCategory.Error, "Cannot_find_the_common_subdirectory_path_for_the_input_files_5009", "Cannot find the common subdirectory path for the input files."),
         File_specification_cannot_end_in_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0: diag(5010, ts.DiagnosticCategory.Error, "File_specification_cannot_end_in_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0_5010", "File specification cannot end in a recursive directory wildcard ('**'): '{0}'."),
@@ -5913,6 +6111,8 @@ var ts;
         Option_resolveJsonModule_can_only_be_specified_when_module_code_generation_is_commonjs_amd_es2015_or_esNext: diag(5071, ts.DiagnosticCategory.Error, "Option_resolveJsonModule_can_only_be_specified_when_module_code_generation_is_commonjs_amd_es2015_or_5071", "Option '--resolveJsonModule' can only be specified when module code generation is 'commonjs', 'amd', 'es2015' or 'esNext'."),
         Unknown_build_option_0: diag(5072, ts.DiagnosticCategory.Error, "Unknown_build_option_0_5072", "Unknown build option '{0}'."),
         Build_option_0_requires_a_value_of_type_1: diag(5073, ts.DiagnosticCategory.Error, "Build_option_0_requires_a_value_of_type_1_5073", "Build option '{0}' requires a value of type {1}."),
+        Option_incremental_can_only_be_specified_using_tsconfig_emitting_to_single_file_or_when_option_tsBuildInfoFile_is_specified: diag(5074, ts.DiagnosticCategory.Error, "Option_incremental_can_only_be_specified_using_tsconfig_emitting_to_single_file_or_when_option_tsBui_5074", "Option '--incremental' can only be specified using tsconfig, emitting to single file or when option `--tsBuildInfoFile` is specified."),
+        _0_is_assignable_to_the_constraint_of_type_1_but_1_could_be_instantiated_with_a_different_subtype_of_constraint_2: diag(5075, ts.DiagnosticCategory.Error, "_0_is_assignable_to_the_constraint_of_type_1_but_1_could_be_instantiated_with_a_different_subtype_of_5075", "'{0}' is assignable to the constraint of type '{1}', but '{1}' could be instantiated with a different subtype of constraint '{2}'."),
         Generates_a_sourcemap_for_each_corresponding_d_ts_file: diag(6000, ts.DiagnosticCategory.Message, "Generates_a_sourcemap_for_each_corresponding_d_ts_file_6000", "Generates a sourcemap for each corresponding '.d.ts' file."),
         Concatenate_and_emit_output_to_single_file: diag(6001, ts.DiagnosticCategory.Message, "Concatenate_and_emit_output_to_single_file_6001", "Concatenate and emit output to single file."),
         Generates_corresponding_d_ts_file: diag(6002, ts.DiagnosticCategory.Message, "Generates_corresponding_d_ts_file_6002", "Generates corresponding '.d.ts' file."),
@@ -6089,7 +6289,6 @@ var ts;
         Enable_strict_checking_of_property_initialization_in_classes: diag(6187, ts.DiagnosticCategory.Message, "Enable_strict_checking_of_property_initialization_in_classes_6187", "Enable strict checking of property initialization in classes."),
         Numeric_separators_are_not_allowed_here: diag(6188, ts.DiagnosticCategory.Error, "Numeric_separators_are_not_allowed_here_6188", "Numeric separators are not allowed here."),
         Multiple_consecutive_numeric_separators_are_not_permitted: diag(6189, ts.DiagnosticCategory.Error, "Multiple_consecutive_numeric_separators_are_not_permitted_6189", "Multiple consecutive numeric separators are not permitted."),
-        Found_package_json_at_0_Package_ID_is_1: diag(6190, ts.DiagnosticCategory.Message, "Found_package_json_at_0_Package_ID_is_1_6190", "Found 'package.json' at '{0}'. Package ID is '{1}'."),
         Whether_to_keep_outdated_console_output_in_watch_mode_instead_of_clearing_the_screen: diag(6191, ts.DiagnosticCategory.Message, "Whether_to_keep_outdated_console_output_in_watch_mode_instead_of_clearing_the_screen_6191", "Whether to keep outdated console output in watch mode instead of clearing the screen."),
         All_imports_in_import_declaration_are_unused: diag(6192, ts.DiagnosticCategory.Error, "All_imports_in_import_declaration_are_unused_6192", "All imports in import declaration are unused.", /*reportsUnnecessary*/ true),
         Found_1_error_Watching_for_file_changes: diag(6193, ts.DiagnosticCategory.Message, "Found_1_error_Watching_for_file_changes_6193", "Found 1 error. Watching for file changes."),
@@ -6116,13 +6315,16 @@ var ts;
         Using_compiler_options_of_project_reference_redirect_0: diag(6215, ts.DiagnosticCategory.Message, "Using_compiler_options_of_project_reference_redirect_0_6215", "Using compiler options of project reference redirect '{0}'."),
         Found_1_error: diag(6216, ts.DiagnosticCategory.Message, "Found_1_error_6216", "Found 1 error."),
         Found_0_errors: diag(6217, ts.DiagnosticCategory.Message, "Found_0_errors_6217", "Found {0} errors."),
+        Module_name_0_was_successfully_resolved_to_1_with_Package_ID_2: diag(6218, ts.DiagnosticCategory.Message, "Module_name_0_was_successfully_resolved_to_1_with_Package_ID_2_6218", "======== Module name '{0}' was successfully resolved to '{1}' with Package ID '{2}'. ========"),
+        Type_reference_directive_0_was_successfully_resolved_to_1_with_Package_ID_2_primary_Colon_3: diag(6219, ts.DiagnosticCategory.Message, "Type_reference_directive_0_was_successfully_resolved_to_1_with_Package_ID_2_primary_Colon_3_6219", "======== Type reference directive '{0}' was successfully resolved to '{1}' with Package ID '{2}', primary: {3}. ========"),
+        package_json_had_a_falsy_0_field: diag(6220, ts.DiagnosticCategory.Message, "package_json_had_a_falsy_0_field_6220", "'package.json' had a falsy '{0}' field."),
         Projects_to_reference: diag(6300, ts.DiagnosticCategory.Message, "Projects_to_reference_6300", "Projects to reference"),
         Enable_project_compilation: diag(6302, ts.DiagnosticCategory.Message, "Enable_project_compilation_6302", "Enable project compilation"),
         Project_references_may_not_form_a_circular_graph_Cycle_detected_Colon_0: diag(6202, ts.DiagnosticCategory.Error, "Project_references_may_not_form_a_circular_graph_Cycle_detected_Colon_0_6202", "Project references may not form a circular graph. Cycle detected: {0}"),
         Composite_projects_may_not_disable_declaration_emit: diag(6304, ts.DiagnosticCategory.Error, "Composite_projects_may_not_disable_declaration_emit_6304", "Composite projects may not disable declaration emit."),
         Output_file_0_has_not_been_built_from_source_file_1: diag(6305, ts.DiagnosticCategory.Error, "Output_file_0_has_not_been_built_from_source_file_1_6305", "Output file '{0}' has not been built from source file '{1}'."),
         Referenced_project_0_must_have_setting_composite_Colon_true: diag(6306, ts.DiagnosticCategory.Error, "Referenced_project_0_must_have_setting_composite_Colon_true_6306", "Referenced project '{0}' must have setting \"composite\": true."),
-        File_0_is_not_in_project_file_list_Projects_must_list_all_files_or_use_an_include_pattern: diag(6307, ts.DiagnosticCategory.Error, "File_0_is_not_in_project_file_list_Projects_must_list_all_files_or_use_an_include_pattern_6307", "File '{0}' is not in project file list. Projects must list all files or use an 'include' pattern."),
+        File_0_is_not_listed_within_the_file_list_of_project_1_Projects_must_list_all_files_or_use_an_include_pattern: diag(6307, ts.DiagnosticCategory.Error, "File_0_is_not_listed_within_the_file_list_of_project_1_Projects_must_list_all_files_or_use_an_includ_6307", "File '{0}' is not listed within the file list of project '{1}'. Projects must list all files or use an 'include' pattern."),
         Cannot_prepend_project_0_because_it_does_not_have_outFile_set: diag(6308, ts.DiagnosticCategory.Error, "Cannot_prepend_project_0_because_it_does_not_have_outFile_set_6308", "Cannot prepend project '{0}' because it does not have 'outFile' set"),
         Output_file_0_from_project_1_does_not_exist: diag(6309, ts.DiagnosticCategory.Error, "Output_file_0_from_project_1_does_not_exist_6309", "Output file '{0}' from project '{1}' does not exist"),
         Project_0_is_out_of_date_because_oldest_output_1_is_older_than_newest_input_2: diag(6350, ts.DiagnosticCategory.Message, "Project_0_is_out_of_date_because_oldest_output_1_is_older_than_newest_input_2_6350", "Project '{0}' is out of date because oldest output '{1}' is older than newest input '{2}'"),
@@ -6177,7 +6379,7 @@ var ts;
         _0_implicitly_has_type_any_because_it_does_not_have_a_type_annotation_and_is_referenced_directly_or_indirectly_in_its_own_initializer: diag(7022, ts.DiagnosticCategory.Error, "_0_implicitly_has_type_any_because_it_does_not_have_a_type_annotation_and_is_referenced_directly_or__7022", "'{0}' implicitly has type 'any' because it does not have a type annotation and is referenced directly or indirectly in its own initializer."),
         _0_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions: diag(7023, ts.DiagnosticCategory.Error, "_0_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_reference_7023", "'{0}' implicitly has return type 'any' because it does not have a return type annotation and is referenced directly or indirectly in one of its return expressions."),
         Function_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions: diag(7024, ts.DiagnosticCategory.Error, "Function_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_ref_7024", "Function implicitly has return type 'any' because it does not have a return type annotation and is referenced directly or indirectly in one of its return expressions."),
-        Generator_implicitly_has_type_0_because_it_does_not_yield_any_values_Consider_supplying_a_return_type: diag(7025, ts.DiagnosticCategory.Error, "Generator_implicitly_has_type_0_because_it_does_not_yield_any_values_Consider_supplying_a_return_typ_7025", "Generator implicitly has type '{0}' because it does not yield any values. Consider supplying a return type."),
+        Generator_implicitly_has_yield_type_0_because_it_does_not_yield_any_values_Consider_supplying_a_return_type_annotation: diag(7025, ts.DiagnosticCategory.Error, "Generator_implicitly_has_yield_type_0_because_it_does_not_yield_any_values_Consider_supplying_a_retu_7025", "Generator implicitly has yield type '{0}' because it does not yield any values. Consider supplying a return type annotation."),
         JSX_element_implicitly_has_type_any_because_no_interface_JSX_0_exists: diag(7026, ts.DiagnosticCategory.Error, "JSX_element_implicitly_has_type_any_because_no_interface_JSX_0_exists_7026", "JSX element implicitly has type 'any' because no interface 'JSX.{0}' exists."),
         Unreachable_code_detected: diag(7027, ts.DiagnosticCategory.Error, "Unreachable_code_detected_7027", "Unreachable code detected.", /*reportsUnnecessary*/ true),
         Unused_label: diag(7028, ts.DiagnosticCategory.Error, "Unused_label_7028", "Unused label.", /*reportsUnnecessary*/ true),
@@ -6204,6 +6406,10 @@ var ts;
         Property_0_implicitly_has_type_any_but_a_better_type_for_its_set_accessor_may_be_inferred_from_usage: diag(7049, ts.DiagnosticCategory.Suggestion, "Property_0_implicitly_has_type_any_but_a_better_type_for_its_set_accessor_may_be_inferred_from_usage_7049", "Property '{0}' implicitly has type 'any', but a better type for its set accessor may be inferred from usage."),
         _0_implicitly_has_an_1_return_type_but_a_better_type_may_be_inferred_from_usage: diag(7050, ts.DiagnosticCategory.Suggestion, "_0_implicitly_has_an_1_return_type_but_a_better_type_may_be_inferred_from_usage_7050", "'{0}' implicitly has an '{1}' return type, but a better type may be inferred from usage."),
         Parameter_has_a_name_but_no_type_Did_you_mean_0_Colon_1: diag(7051, ts.DiagnosticCategory.Error, "Parameter_has_a_name_but_no_type_Did_you_mean_0_Colon_1_7051", "Parameter has a name but no type. Did you mean '{0}: {1}'?"),
+        Element_implicitly_has_an_any_type_because_type_0_has_no_index_signature_Did_you_mean_to_call_1: diag(7052, ts.DiagnosticCategory.Error, "Element_implicitly_has_an_any_type_because_type_0_has_no_index_signature_Did_you_mean_to_call_1_7052", "Element implicitly has an 'any' type because type '{0}' has no index signature. Did you mean to call '{1}' ?"),
+        Element_implicitly_has_an_any_type_because_expression_of_type_0_can_t_be_used_to_index_type_1: diag(7053, ts.DiagnosticCategory.Error, "Element_implicitly_has_an_any_type_because_expression_of_type_0_can_t_be_used_to_index_type_1_7053", "Element implicitly has an 'any' type because expression of type '{0}' can't be used to index type '{1}'."),
+        No_index_signature_with_a_parameter_of_type_0_was_found_on_type_1: diag(7054, ts.DiagnosticCategory.Error, "No_index_signature_with_a_parameter_of_type_0_was_found_on_type_1_7054", "No index signature with a parameter of type '{0}' was found on type '{1}'."),
+        _0_which_lacks_return_type_annotation_implicitly_has_an_1_yield_type: diag(7055, ts.DiagnosticCategory.Error, "_0_which_lacks_return_type_annotation_implicitly_has_an_1_yield_type_7055", "'{0}', which lacks return-type annotation, implicitly has an '{1}' yield type."),
         You_cannot_rename_this_element: diag(8000, ts.DiagnosticCategory.Error, "You_cannot_rename_this_element_8000", "You cannot rename this element."),
         You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library: diag(8001, ts.DiagnosticCategory.Error, "You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library_8001", "You cannot rename elements that are defined in the standard TypeScript library."),
         import_can_only_be_used_in_a_ts_file: diag(8002, ts.DiagnosticCategory.Error, "import_can_only_be_used_in_a_ts_file_8002", "'import ... =' can only be used in a .ts file."),
@@ -6267,6 +6473,7 @@ var ts;
         JSDoc_types_may_be_moved_to_TypeScript_types: diag(80004, ts.DiagnosticCategory.Suggestion, "JSDoc_types_may_be_moved_to_TypeScript_types_80004", "JSDoc types may be moved to TypeScript types."),
         require_call_may_be_converted_to_an_import: diag(80005, ts.DiagnosticCategory.Suggestion, "require_call_may_be_converted_to_an_import_80005", "'require' call may be converted to an import."),
         This_may_be_converted_to_an_async_function: diag(80006, ts.DiagnosticCategory.Suggestion, "This_may_be_converted_to_an_async_function_80006", "This may be converted to an async function."),
+        await_has_no_effect_on_the_type_of_this_expression: diag(80007, ts.DiagnosticCategory.Suggestion, "await_has_no_effect_on_the_type_of_this_expression_80007", "'await' has no effect on the type of this expression."),
         Add_missing_super_call: diag(90001, ts.DiagnosticCategory.Message, "Add_missing_super_call_90001", "Add missing 'super()' call"),
         Make_super_call_the_first_statement_in_the_constructor: diag(90002, ts.DiagnosticCategory.Message, "Make_super_call_the_first_statement_in_the_constructor_90002", "Make 'super()' call the first statement in the constructor"),
         Change_extends_to_implements: diag(90003, ts.DiagnosticCategory.Message, "Change_extends_to_implements_90003", "Change 'extends' to 'implements'"),
@@ -6365,15 +6572,28 @@ var ts;
         Add_all_missing_imports: diag(95064, ts.DiagnosticCategory.Message, "Add_all_missing_imports_95064", "Add all missing imports"),
         Convert_to_async_function: diag(95065, ts.DiagnosticCategory.Message, "Convert_to_async_function_95065", "Convert to async function"),
         Convert_all_to_async_functions: diag(95066, ts.DiagnosticCategory.Message, "Convert_all_to_async_functions_95066", "Convert all to async functions"),
-        Generate_types_for_0: diag(95067, ts.DiagnosticCategory.Message, "Generate_types_for_0_95067", "Generate types for '{0}'"),
-        Generate_types_for_all_packages_without_types: diag(95068, ts.DiagnosticCategory.Message, "Generate_types_for_all_packages_without_types_95068", "Generate types for all packages without types"),
         Add_unknown_conversion_for_non_overlapping_types: diag(95069, ts.DiagnosticCategory.Message, "Add_unknown_conversion_for_non_overlapping_types_95069", "Add 'unknown' conversion for non-overlapping types"),
         Add_unknown_to_all_conversions_of_non_overlapping_types: diag(95070, ts.DiagnosticCategory.Message, "Add_unknown_to_all_conversions_of_non_overlapping_types_95070", "Add 'unknown' to all conversions of non-overlapping types"),
         Add_missing_new_operator_to_call: diag(95071, ts.DiagnosticCategory.Message, "Add_missing_new_operator_to_call_95071", "Add missing 'new' operator to call"),
         Add_missing_new_operator_to_all_calls: diag(95072, ts.DiagnosticCategory.Message, "Add_missing_new_operator_to_all_calls_95072", "Add missing 'new' operator to all calls"),
         Add_names_to_all_parameters_without_names: diag(95073, ts.DiagnosticCategory.Message, "Add_names_to_all_parameters_without_names_95073", "Add names to all parameters without names"),
         Enable_the_experimentalDecorators_option_in_your_configuration_file: diag(95074, ts.DiagnosticCategory.Message, "Enable_the_experimentalDecorators_option_in_your_configuration_file_95074", "Enable the 'experimentalDecorators' option in your configuration file"),
-        Convert_to_named_parameters: diag(95075, ts.DiagnosticCategory.Message, "Convert_to_named_parameters_95075", "Convert to named parameters"),
+        Convert_parameters_to_destructured_object: diag(95075, ts.DiagnosticCategory.Message, "Convert_parameters_to_destructured_object_95075", "Convert parameters to destructured object"),
+        Allow_accessing_UMD_globals_from_modules: diag(95076, ts.DiagnosticCategory.Message, "Allow_accessing_UMD_globals_from_modules_95076", "Allow accessing UMD globals from modules."),
+        Extract_type: diag(95077, ts.DiagnosticCategory.Message, "Extract_type_95077", "Extract type"),
+        Extract_to_type_alias: diag(95078, ts.DiagnosticCategory.Message, "Extract_to_type_alias_95078", "Extract to type alias"),
+        Extract_to_typedef: diag(95079, ts.DiagnosticCategory.Message, "Extract_to_typedef_95079", "Extract to typedef"),
+        Infer_this_type_of_0_from_usage: diag(95080, ts.DiagnosticCategory.Message, "Infer_this_type_of_0_from_usage_95080", "Infer 'this' type of '{0}' from usage"),
+        Add_const_to_unresolved_variable: diag(95081, ts.DiagnosticCategory.Message, "Add_const_to_unresolved_variable_95081", "Add 'const' to unresolved variable"),
+        Add_const_to_all_unresolved_variables: diag(95082, ts.DiagnosticCategory.Message, "Add_const_to_all_unresolved_variables_95082", "Add 'const' to all unresolved variables"),
+        Add_await: diag(95083, ts.DiagnosticCategory.Message, "Add_await_95083", "Add 'await'"),
+        Add_await_to_initializer_for_0: diag(95084, ts.DiagnosticCategory.Message, "Add_await_to_initializer_for_0_95084", "Add 'await' to initializer for '{0}'"),
+        Fix_all_expressions_possibly_missing_await: diag(95085, ts.DiagnosticCategory.Message, "Fix_all_expressions_possibly_missing_await_95085", "Fix all expressions possibly missing 'await'"),
+        Remove_unnecessary_await: diag(95086, ts.DiagnosticCategory.Message, "Remove_unnecessary_await_95086", "Remove unnecessary 'await'"),
+        Remove_all_unnecessary_uses_of_await: diag(95087, ts.DiagnosticCategory.Message, "Remove_all_unnecessary_uses_of_await_95087", "Remove all unnecessary uses of 'await'"),
+        No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer: diag(18004, ts.DiagnosticCategory.Error, "No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer_18004", "No value exists in scope for the shorthand property '{0}'. Either declare one or provide an initializer."),
+        Classes_may_not_have_a_field_named_constructor: diag(18006, ts.DiagnosticCategory.Error, "Classes_may_not_have_a_field_named_constructor_18006", "Classes may not have a field named 'constructor'."),
+        JSX_expressions_may_not_use_the_comma_operator_Did_you_mean_to_write_an_array: diag(18007, ts.DiagnosticCategory.Error, "JSX_expressions_may_not_use_the_comma_operator_Did_you_mean_to_write_an_array_18007", "JSX expressions may not use the comma operator. Did you mean to write an array?"),
     };
 })(ts || (ts = {}));
 var ts;
@@ -6381,7 +6601,7 @@ var ts;
     var _a;
     /* @internal */
     function tokenIsIdentifierOrKeyword(token) {
-        return token >= 72 /* Identifier */;
+        return token >= 73 /* Identifier */;
     }
     ts.tokenIsIdentifierOrKeyword = tokenIsIdentifierOrKeyword;
     /* @internal */
@@ -6390,85 +6610,85 @@ var ts;
     }
     ts.tokenIsIdentifierOrKeywordOrGreaterThan = tokenIsIdentifierOrKeywordOrGreaterThan;
     var textToKeywordObj = (_a = {
-            abstract: 118 /* AbstractKeyword */,
-            any: 120 /* AnyKeyword */,
-            as: 119 /* AsKeyword */,
-            bigint: 146 /* BigIntKeyword */,
-            boolean: 123 /* BooleanKeyword */,
-            break: 73 /* BreakKeyword */,
-            case: 74 /* CaseKeyword */,
-            catch: 75 /* CatchKeyword */,
-            class: 76 /* ClassKeyword */,
-            continue: 78 /* ContinueKeyword */,
-            const: 77 /* ConstKeyword */
+            abstract: 119 /* AbstractKeyword */,
+            any: 121 /* AnyKeyword */,
+            as: 120 /* AsKeyword */,
+            bigint: 147 /* BigIntKeyword */,
+            boolean: 124 /* BooleanKeyword */,
+            break: 74 /* BreakKeyword */,
+            case: 75 /* CaseKeyword */,
+            catch: 76 /* CatchKeyword */,
+            class: 77 /* ClassKeyword */,
+            continue: 79 /* ContinueKeyword */,
+            const: 78 /* ConstKeyword */
         },
-        _a["" + "constructor"] = 124 /* ConstructorKeyword */,
-        _a.debugger = 79 /* DebuggerKeyword */,
-        _a.declare = 125 /* DeclareKeyword */,
-        _a.default = 80 /* DefaultKeyword */,
-        _a.delete = 81 /* DeleteKeyword */,
-        _a.do = 82 /* DoKeyword */,
-        _a.else = 83 /* ElseKeyword */,
-        _a.enum = 84 /* EnumKeyword */,
-        _a.export = 85 /* ExportKeyword */,
-        _a.extends = 86 /* ExtendsKeyword */,
-        _a.false = 87 /* FalseKeyword */,
-        _a.finally = 88 /* FinallyKeyword */,
-        _a.for = 89 /* ForKeyword */,
-        _a.from = 144 /* FromKeyword */,
-        _a.function = 90 /* FunctionKeyword */,
-        _a.get = 126 /* GetKeyword */,
-        _a.if = 91 /* IfKeyword */,
-        _a.implements = 109 /* ImplementsKeyword */,
-        _a.import = 92 /* ImportKeyword */,
-        _a.in = 93 /* InKeyword */,
-        _a.infer = 127 /* InferKeyword */,
-        _a.instanceof = 94 /* InstanceOfKeyword */,
-        _a.interface = 110 /* InterfaceKeyword */,
-        _a.is = 128 /* IsKeyword */,
-        _a.keyof = 129 /* KeyOfKeyword */,
-        _a.let = 111 /* LetKeyword */,
-        _a.module = 130 /* ModuleKeyword */,
-        _a.namespace = 131 /* NamespaceKeyword */,
-        _a.never = 132 /* NeverKeyword */,
-        _a.new = 95 /* NewKeyword */,
-        _a.null = 96 /* NullKeyword */,
-        _a.number = 135 /* NumberKeyword */,
-        _a.object = 136 /* ObjectKeyword */,
-        _a.package = 112 /* PackageKeyword */,
-        _a.private = 113 /* PrivateKeyword */,
-        _a.protected = 114 /* ProtectedKeyword */,
-        _a.public = 115 /* PublicKeyword */,
-        _a.readonly = 133 /* ReadonlyKeyword */,
-        _a.require = 134 /* RequireKeyword */,
-        _a.global = 145 /* GlobalKeyword */,
-        _a.return = 97 /* ReturnKeyword */,
-        _a.set = 137 /* SetKeyword */,
-        _a.static = 116 /* StaticKeyword */,
-        _a.string = 138 /* StringKeyword */,
-        _a.super = 98 /* SuperKeyword */,
-        _a.switch = 99 /* SwitchKeyword */,
-        _a.symbol = 139 /* SymbolKeyword */,
-        _a.this = 100 /* ThisKeyword */,
-        _a.throw = 101 /* ThrowKeyword */,
-        _a.true = 102 /* TrueKeyword */,
-        _a.try = 103 /* TryKeyword */,
-        _a.type = 140 /* TypeKeyword */,
-        _a.typeof = 104 /* TypeOfKeyword */,
-        _a.undefined = 141 /* UndefinedKeyword */,
-        _a.unique = 142 /* UniqueKeyword */,
-        _a.unknown = 143 /* UnknownKeyword */,
-        _a.var = 105 /* VarKeyword */,
-        _a.void = 106 /* VoidKeyword */,
-        _a.while = 107 /* WhileKeyword */,
-        _a.with = 108 /* WithKeyword */,
-        _a.yield = 117 /* YieldKeyword */,
-        _a.async = 121 /* AsyncKeyword */,
-        _a.await = 122 /* AwaitKeyword */,
-        _a.of = 147 /* OfKeyword */,
+        _a["" + "constructor"] = 125 /* ConstructorKeyword */,
+        _a.debugger = 80 /* DebuggerKeyword */,
+        _a.declare = 126 /* DeclareKeyword */,
+        _a.default = 81 /* DefaultKeyword */,
+        _a.delete = 82 /* DeleteKeyword */,
+        _a.do = 83 /* DoKeyword */,
+        _a.else = 84 /* ElseKeyword */,
+        _a.enum = 85 /* EnumKeyword */,
+        _a.export = 86 /* ExportKeyword */,
+        _a.extends = 87 /* ExtendsKeyword */,
+        _a.false = 88 /* FalseKeyword */,
+        _a.finally = 89 /* FinallyKeyword */,
+        _a.for = 90 /* ForKeyword */,
+        _a.from = 145 /* FromKeyword */,
+        _a.function = 91 /* FunctionKeyword */,
+        _a.get = 127 /* GetKeyword */,
+        _a.if = 92 /* IfKeyword */,
+        _a.implements = 110 /* ImplementsKeyword */,
+        _a.import = 93 /* ImportKeyword */,
+        _a.in = 94 /* InKeyword */,
+        _a.infer = 128 /* InferKeyword */,
+        _a.instanceof = 95 /* InstanceOfKeyword */,
+        _a.interface = 111 /* InterfaceKeyword */,
+        _a.is = 129 /* IsKeyword */,
+        _a.keyof = 130 /* KeyOfKeyword */,
+        _a.let = 112 /* LetKeyword */,
+        _a.module = 131 /* ModuleKeyword */,
+        _a.namespace = 132 /* NamespaceKeyword */,
+        _a.never = 133 /* NeverKeyword */,
+        _a.new = 96 /* NewKeyword */,
+        _a.null = 97 /* NullKeyword */,
+        _a.number = 136 /* NumberKeyword */,
+        _a.object = 137 /* ObjectKeyword */,
+        _a.package = 113 /* PackageKeyword */,
+        _a.private = 114 /* PrivateKeyword */,
+        _a.protected = 115 /* ProtectedKeyword */,
+        _a.public = 116 /* PublicKeyword */,
+        _a.readonly = 134 /* ReadonlyKeyword */,
+        _a.require = 135 /* RequireKeyword */,
+        _a.global = 146 /* GlobalKeyword */,
+        _a.return = 98 /* ReturnKeyword */,
+        _a.set = 138 /* SetKeyword */,
+        _a.static = 117 /* StaticKeyword */,
+        _a.string = 139 /* StringKeyword */,
+        _a.super = 99 /* SuperKeyword */,
+        _a.switch = 100 /* SwitchKeyword */,
+        _a.symbol = 140 /* SymbolKeyword */,
+        _a.this = 101 /* ThisKeyword */,
+        _a.throw = 102 /* ThrowKeyword */,
+        _a.true = 103 /* TrueKeyword */,
+        _a.try = 104 /* TryKeyword */,
+        _a.type = 141 /* TypeKeyword */,
+        _a.typeof = 105 /* TypeOfKeyword */,
+        _a.undefined = 142 /* UndefinedKeyword */,
+        _a.unique = 143 /* UniqueKeyword */,
+        _a.unknown = 144 /* UnknownKeyword */,
+        _a.var = 106 /* VarKeyword */,
+        _a.void = 107 /* VoidKeyword */,
+        _a.while = 108 /* WhileKeyword */,
+        _a.with = 109 /* WithKeyword */,
+        _a.yield = 118 /* YieldKeyword */,
+        _a.async = 122 /* AsyncKeyword */,
+        _a.await = 123 /* AwaitKeyword */,
+        _a.of = 148 /* OfKeyword */,
         _a);
     var textToKeyword = ts.createMapFromTemplate(textToKeywordObj);
-    var textToToken = ts.createMapFromTemplate(__assign({}, textToKeywordObj, { "{": 18 /* OpenBraceToken */, "}": 19 /* CloseBraceToken */, "(": 20 /* OpenParenToken */, ")": 21 /* CloseParenToken */, "[": 22 /* OpenBracketToken */, "]": 23 /* CloseBracketToken */, ".": 24 /* DotToken */, "...": 25 /* DotDotDotToken */, ";": 26 /* SemicolonToken */, ",": 27 /* CommaToken */, "<": 28 /* LessThanToken */, ">": 30 /* GreaterThanToken */, "<=": 31 /* LessThanEqualsToken */, ">=": 32 /* GreaterThanEqualsToken */, "==": 33 /* EqualsEqualsToken */, "!=": 34 /* ExclamationEqualsToken */, "===": 35 /* EqualsEqualsEqualsToken */, "!==": 36 /* ExclamationEqualsEqualsToken */, "=>": 37 /* EqualsGreaterThanToken */, "+": 38 /* PlusToken */, "-": 39 /* MinusToken */, "**": 41 /* AsteriskAsteriskToken */, "*": 40 /* AsteriskToken */, "/": 42 /* SlashToken */, "%": 43 /* PercentToken */, "++": 44 /* PlusPlusToken */, "--": 45 /* MinusMinusToken */, "<<": 46 /* LessThanLessThanToken */, "</": 29 /* LessThanSlashToken */, ">>": 47 /* GreaterThanGreaterThanToken */, ">>>": 48 /* GreaterThanGreaterThanGreaterThanToken */, "&": 49 /* AmpersandToken */, "|": 50 /* BarToken */, "^": 51 /* CaretToken */, "!": 52 /* ExclamationToken */, "~": 53 /* TildeToken */, "&&": 54 /* AmpersandAmpersandToken */, "||": 55 /* BarBarToken */, "?": 56 /* QuestionToken */, ":": 57 /* ColonToken */, "=": 59 /* EqualsToken */, "+=": 60 /* PlusEqualsToken */, "-=": 61 /* MinusEqualsToken */, "*=": 62 /* AsteriskEqualsToken */, "**=": 63 /* AsteriskAsteriskEqualsToken */, "/=": 64 /* SlashEqualsToken */, "%=": 65 /* PercentEqualsToken */, "<<=": 66 /* LessThanLessThanEqualsToken */, ">>=": 67 /* GreaterThanGreaterThanEqualsToken */, ">>>=": 68 /* GreaterThanGreaterThanGreaterThanEqualsToken */, "&=": 69 /* AmpersandEqualsToken */, "|=": 70 /* BarEqualsToken */, "^=": 71 /* CaretEqualsToken */, "@": 58 /* AtToken */ }));
+    var textToToken = ts.createMapFromTemplate(__assign({}, textToKeywordObj, { "{": 18 /* OpenBraceToken */, "}": 19 /* CloseBraceToken */, "(": 20 /* OpenParenToken */, ")": 21 /* CloseParenToken */, "[": 22 /* OpenBracketToken */, "]": 23 /* CloseBracketToken */, ".": 24 /* DotToken */, "...": 25 /* DotDotDotToken */, ";": 26 /* SemicolonToken */, ",": 27 /* CommaToken */, "<": 28 /* LessThanToken */, ">": 30 /* GreaterThanToken */, "<=": 31 /* LessThanEqualsToken */, ">=": 32 /* GreaterThanEqualsToken */, "==": 33 /* EqualsEqualsToken */, "!=": 34 /* ExclamationEqualsToken */, "===": 35 /* EqualsEqualsEqualsToken */, "!==": 36 /* ExclamationEqualsEqualsToken */, "=>": 37 /* EqualsGreaterThanToken */, "+": 38 /* PlusToken */, "-": 39 /* MinusToken */, "**": 41 /* AsteriskAsteriskToken */, "*": 40 /* AsteriskToken */, "/": 42 /* SlashToken */, "%": 43 /* PercentToken */, "++": 44 /* PlusPlusToken */, "--": 45 /* MinusMinusToken */, "<<": 46 /* LessThanLessThanToken */, "</": 29 /* LessThanSlashToken */, ">>": 47 /* GreaterThanGreaterThanToken */, ">>>": 48 /* GreaterThanGreaterThanGreaterThanToken */, "&": 49 /* AmpersandToken */, "|": 50 /* BarToken */, "^": 51 /* CaretToken */, "!": 52 /* ExclamationToken */, "~": 53 /* TildeToken */, "&&": 54 /* AmpersandAmpersandToken */, "||": 55 /* BarBarToken */, "?": 56 /* QuestionToken */, ":": 57 /* ColonToken */, "=": 60 /* EqualsToken */, "+=": 61 /* PlusEqualsToken */, "-=": 62 /* MinusEqualsToken */, "*=": 63 /* AsteriskEqualsToken */, "**=": 64 /* AsteriskAsteriskEqualsToken */, "/=": 65 /* SlashEqualsToken */, "%=": 66 /* PercentEqualsToken */, "<<=": 67 /* LessThanLessThanEqualsToken */, ">>=": 68 /* GreaterThanGreaterThanEqualsToken */, ">>>=": 69 /* GreaterThanGreaterThanGreaterThanEqualsToken */, "&=": 70 /* AmpersandEqualsToken */, "|=": 71 /* BarEqualsToken */, "^=": 72 /* CaretEqualsToken */, "@": 58 /* AtToken */, "`": 59 /* BacktickToken */ }));
     /*
         As per ECMAScript Language Specification 3th Edition, Section 7.6: Identifiers
         IdentifierStart ::
@@ -7082,8 +7302,8 @@ var ts;
             getTokenValue: function () { return tokenValue; },
             hasExtendedUnicodeEscape: function () { return (tokenFlags & 8 /* ExtendedUnicodeEscape */) !== 0; },
             hasPrecedingLineBreak: function () { return (tokenFlags & 1 /* PrecedingLineBreak */) !== 0; },
-            isIdentifier: function () { return token === 72 /* Identifier */ || token > 108 /* LastReservedWord */; },
-            isReservedWord: function () { return token >= 73 /* FirstReservedWord */ && token <= 108 /* LastReservedWord */; },
+            isIdentifier: function () { return token === 73 /* Identifier */ || token > 109 /* LastReservedWord */; },
+            isReservedWord: function () { return token >= 74 /* FirstReservedWord */ && token <= 109 /* LastReservedWord */; },
             isUnterminated: function () { return (tokenFlags & 4 /* Unterminated */) !== 0; },
             getTokenFlags: function () { return tokenFlags; },
             reScanGreaterToken: reScanGreaterToken,
@@ -7094,7 +7314,7 @@ var ts;
             reScanJsxToken: reScanJsxToken,
             reScanLessThanToken: reScanLessThanToken,
             scanJsxToken: scanJsxToken,
-            scanJSDocToken: scanJSDocToken,
+            scanJsDocToken: scanJsDocToken,
             scan: scan,
             getText: getText,
             setText: setText,
@@ -7534,7 +7754,7 @@ var ts;
                     }
                 }
             }
-            return token = 72 /* Identifier */;
+            return token = 73 /* Identifier */;
         }
         function scanBinaryOrOctalDigits(base) {
             var value = "";
@@ -7683,7 +7903,7 @@ var ts;
                         return token = scanTemplateAndSetTokenValue();
                     case 37 /* percent */:
                         if (text.charCodeAt(pos + 1) === 61 /* equals */) {
-                            return pos += 2, token = 65 /* PercentEqualsToken */;
+                            return pos += 2, token = 66 /* PercentEqualsToken */;
                         }
                         pos++;
                         return token = 43 /* PercentToken */;
@@ -7692,7 +7912,7 @@ var ts;
                             return pos += 2, token = 54 /* AmpersandAmpersandToken */;
                         }
                         if (text.charCodeAt(pos + 1) === 61 /* equals */) {
-                            return pos += 2, token = 69 /* AmpersandEqualsToken */;
+                            return pos += 2, token = 70 /* AmpersandEqualsToken */;
                         }
                         pos++;
                         return token = 49 /* AmpersandToken */;
@@ -7704,11 +7924,11 @@ var ts;
                         return token = 21 /* CloseParenToken */;
                     case 42 /* asterisk */:
                         if (text.charCodeAt(pos + 1) === 61 /* equals */) {
-                            return pos += 2, token = 62 /* AsteriskEqualsToken */;
+                            return pos += 2, token = 63 /* AsteriskEqualsToken */;
                         }
                         if (text.charCodeAt(pos + 1) === 42 /* asterisk */) {
                             if (text.charCodeAt(pos + 2) === 61 /* equals */) {
-                                return pos += 3, token = 63 /* AsteriskAsteriskEqualsToken */;
+                                return pos += 3, token = 64 /* AsteriskAsteriskEqualsToken */;
                             }
                             return pos += 2, token = 41 /* AsteriskAsteriskToken */;
                         }
@@ -7724,7 +7944,7 @@ var ts;
                             return pos += 2, token = 44 /* PlusPlusToken */;
                         }
                         if (text.charCodeAt(pos + 1) === 61 /* equals */) {
-                            return pos += 2, token = 60 /* PlusEqualsToken */;
+                            return pos += 2, token = 61 /* PlusEqualsToken */;
                         }
                         pos++;
                         return token = 38 /* PlusToken */;
@@ -7736,7 +7956,7 @@ var ts;
                             return pos += 2, token = 45 /* MinusMinusToken */;
                         }
                         if (text.charCodeAt(pos + 1) === 61 /* equals */) {
-                            return pos += 2, token = 61 /* MinusEqualsToken */;
+                            return pos += 2, token = 62 /* MinusEqualsToken */;
                         }
                         pos++;
                         return token = 39 /* MinusToken */;
@@ -7800,7 +8020,7 @@ var ts;
                             }
                         }
                         if (text.charCodeAt(pos + 1) === 61 /* equals */) {
-                            return pos += 2, token = 64 /* SlashEqualsToken */;
+                            return pos += 2, token = 65 /* SlashEqualsToken */;
                         }
                         pos++;
                         return token = 42 /* SlashToken */;
@@ -7877,7 +8097,7 @@ var ts;
                         }
                         if (text.charCodeAt(pos + 1) === 60 /* lessThan */) {
                             if (text.charCodeAt(pos + 2) === 61 /* equals */) {
-                                return pos += 3, token = 66 /* LessThanLessThanEqualsToken */;
+                                return pos += 3, token = 67 /* LessThanLessThanEqualsToken */;
                             }
                             return pos += 2, token = 46 /* LessThanLessThanToken */;
                         }
@@ -7911,7 +8131,7 @@ var ts;
                             return pos += 2, token = 37 /* EqualsGreaterThanToken */;
                         }
                         pos++;
-                        return token = 59 /* EqualsToken */;
+                        return token = 60 /* EqualsToken */;
                     case 62 /* greaterThan */:
                         if (isConflictMarkerTrivia(text, pos)) {
                             pos = scanConflictMarkerTrivia(text, pos, error);
@@ -7935,7 +8155,7 @@ var ts;
                         return token = 23 /* CloseBracketToken */;
                     case 94 /* caret */:
                         if (text.charCodeAt(pos + 1) === 61 /* equals */) {
-                            return pos += 2, token = 71 /* CaretEqualsToken */;
+                            return pos += 2, token = 72 /* CaretEqualsToken */;
                         }
                         pos++;
                         return token = 51 /* CaretToken */;
@@ -7956,7 +8176,7 @@ var ts;
                             return pos += 2, token = 55 /* BarBarToken */;
                         }
                         if (text.charCodeAt(pos + 1) === 61 /* equals */) {
-                            return pos += 2, token = 70 /* BarEqualsToken */;
+                            return pos += 2, token = 71 /* BarEqualsToken */;
                         }
                         pos++;
                         return token = 50 /* BarToken */;
@@ -8010,12 +8230,12 @@ var ts;
                 if (text.charCodeAt(pos) === 62 /* greaterThan */) {
                     if (text.charCodeAt(pos + 1) === 62 /* greaterThan */) {
                         if (text.charCodeAt(pos + 2) === 61 /* equals */) {
-                            return pos += 3, token = 68 /* GreaterThanGreaterThanGreaterThanEqualsToken */;
+                            return pos += 3, token = 69 /* GreaterThanGreaterThanGreaterThanEqualsToken */;
                         }
                         return pos += 2, token = 48 /* GreaterThanGreaterThanGreaterThanToken */;
                     }
                     if (text.charCodeAt(pos + 1) === 61 /* equals */) {
-                        return pos += 2, token = 67 /* GreaterThanGreaterThanEqualsToken */;
+                        return pos += 2, token = 68 /* GreaterThanGreaterThanEqualsToken */;
                     }
                     pos++;
                     return token = 47 /* GreaterThanGreaterThanToken */;
@@ -8028,7 +8248,7 @@ var ts;
             return token;
         }
         function reScanSlashToken() {
-            if (token === 42 /* SlashToken */ || token === 64 /* SlashEqualsToken */) {
+            if (token === 42 /* SlashToken */ || token === 65 /* SlashEqualsToken */) {
                 var p = tokenPos + 1;
                 var inEscape = false;
                 var inCharacterClass = false;
@@ -8144,6 +8364,7 @@ var ts;
                 }
                 pos++;
             }
+            tokenValue = text.substring(startPos, pos);
             return firstNonWhitespace === -1 ? 12 /* JsxTextAllWhiteSpaces */ : 11 /* JsxText */;
         }
         // Scans a JSX identifier; these differ from normal identifiers in that
@@ -8176,7 +8397,7 @@ var ts;
                     return scan();
             }
         }
-        function scanJSDocToken() {
+        function scanJsDocToken() {
             startPos = tokenPos = pos;
             tokenFlags = 0;
             if (pos >= end) {
@@ -8211,22 +8432,19 @@ var ts;
                     return token = 23 /* CloseBracketToken */;
                 case 60 /* lessThan */:
                     return token = 28 /* LessThanToken */;
+                case 62 /* greaterThan */:
+                    return token = 30 /* GreaterThanToken */;
                 case 61 /* equals */:
-                    return token = 59 /* EqualsToken */;
+                    return token = 60 /* EqualsToken */;
                 case 44 /* comma */:
                     return token = 27 /* CommaToken */;
                 case 46 /* dot */:
                     return token = 24 /* DotToken */;
                 case 96 /* backtick */:
-                    while (pos < end && text.charCodeAt(pos) !== 96 /* backtick */) {
-                        pos++;
-                    }
-                    tokenValue = text.substring(tokenPos + 1, pos);
-                    pos++;
-                    return token = 14 /* NoSubstitutionTemplateLiteral */;
+                    return token = 59 /* BacktickToken */;
             }
-            if (isIdentifierStart(ch, 7 /* Latest */)) {
-                while (isIdentifierPart(text.charCodeAt(pos), 7 /* Latest */) && pos < end) {
+            if (isIdentifierStart(ch, 99 /* Latest */)) {
+                while (isIdentifierPart(text.charCodeAt(pos), 99 /* Latest */) && pos < end) {
                     pos++;
                 }
                 tokenValue = text.substring(tokenPos, pos);
@@ -8411,11 +8629,16 @@ var ts;
     }
     ts.toPath = toPath;
     function changesAffectModuleResolution(oldOptions, newOptions) {
-        return oldOptions.configFilePath !== newOptions.configFilePath || ts.moduleResolutionOptionDeclarations.some(function (o) {
+        return oldOptions.configFilePath !== newOptions.configFilePath ||
+            optionsHaveModuleResolutionChanges(oldOptions, newOptions);
+    }
+    ts.changesAffectModuleResolution = changesAffectModuleResolution;
+    function optionsHaveModuleResolutionChanges(oldOptions, newOptions) {
+        return ts.moduleResolutionOptionDeclarations.some(function (o) {
             return !ts.isJsonEqual(ts.getCompilerOptionValue(oldOptions, o), ts.getCompilerOptionValue(newOptions, o));
         });
     }
-    ts.changesAffectModuleResolution = changesAffectModuleResolution;
+    ts.optionsHaveModuleResolutionChanges = optionsHaveModuleResolutionChanges;
     function findAncestor(node, callback) {
         while (node) {
             var result = callback(node);
@@ -8444,10 +8667,9 @@ var ts;
     }
     ts.forEachAncestor = forEachAncestor;
     function forEachEntry(map, callback) {
-        var _a;
         var iterator = map.entries();
-        for (var _b = iterator.next(), pair = _b.value, done = _b.done; !done; _a = iterator.next(), pair = _a.value, done = _a.done, _a) {
-            var key = pair[0], value = pair[1];
+        for (var iterResult = iterator.next(); !iterResult.done; iterResult = iterator.next()) {
+            var _a = iterResult.value, key = _a[0], value = _a[1];
             var result = callback(value, key);
             if (result) {
                 return result;
@@ -8457,10 +8679,9 @@ var ts;
     }
     ts.forEachEntry = forEachEntry;
     function forEachKey(map, callback) {
-        var _a;
         var iterator = map.keys();
-        for (var _b = iterator.next(), key = _b.value, done = _b.done; !done; _a = iterator.next(), key = _a.value, done = _a.done, _a) {
-            var result = callback(key);
+        for (var iterResult = iterator.next(); !iterResult.done; iterResult = iterator.next()) {
+            var result = callback(iterResult.value);
             if (result) {
                 return result;
             }
@@ -8584,7 +8805,7 @@ var ts;
         }
     }
     function getSourceFileOfNode(node) {
-        while (node && node.kind !== 284 /* SourceFile */) {
+        while (node && node.kind !== 285 /* SourceFile */) {
             node = node.parent;
         }
         return node;
@@ -8592,11 +8813,11 @@ var ts;
     ts.getSourceFileOfNode = getSourceFileOfNode;
     function isStatementWithLocals(node) {
         switch (node.kind) {
-            case 218 /* Block */:
-            case 246 /* CaseBlock */:
-            case 225 /* ForStatement */:
-            case 226 /* ForInStatement */:
-            case 227 /* ForOfStatement */:
+            case 219 /* Block */:
+            case 247 /* CaseBlock */:
+            case 226 /* ForStatement */:
+            case 227 /* ForInStatement */:
+            case 228 /* ForOfStatement */:
                 return true;
         }
         return false;
@@ -8764,7 +8985,7 @@ var ts;
         // the syntax list itself considers them as normal trivia. Therefore if we simply skip
         // trivia for the list, we may have skipped the JSDocComment as well. So we should process its
         // first child to determine the actual position of its first token.
-        if (node.kind === 311 /* SyntaxList */ && node._children.length > 0) {
+        if (node.kind === 313 /* SyntaxList */ && node._children.length > 0) {
             return getTokenPosOfNode(node._children[0], sourceFile, includeJsDoc);
         }
         return ts.skipTrivia((sourceFile || getSourceFileOfNode(node)).text, node.pos);
@@ -8783,7 +9004,7 @@ var ts;
     }
     ts.getSourceTextOfNodeFromSourceFile = getSourceTextOfNodeFromSourceFile;
     function isJSDocTypeExpressionOrChild(node) {
-        return node.kind === 288 /* JSDocTypeExpression */ || (node.parent && isJSDocTypeExpressionOrChild(node.parent));
+        return node.kind === 289 /* JSDocTypeExpression */ || (node.parent && isJSDocTypeExpressionOrChild(node.parent));
     }
     function getTextOfNodeFromSourceText(sourceText, node, includeTrivia) {
         if (includeTrivia === void 0) { includeTrivia = false; }
@@ -8875,7 +9096,7 @@ var ts;
     ts.isBlockOrCatchScoped = isBlockOrCatchScoped;
     function isCatchClauseVariableDeclarationOrBindingElement(declaration) {
         var node = getRootDeclaration(declaration);
-        return node.kind === 237 /* VariableDeclaration */ && node.parent.kind === 274 /* CatchClause */;
+        return node.kind === 238 /* VariableDeclaration */ && node.parent.kind === 275 /* CatchClause */;
     }
     ts.isCatchClauseVariableDeclarationOrBindingElement = isCatchClauseVariableDeclarationOrBindingElement;
     function isAmbientModule(node) {
@@ -8907,11 +9128,11 @@ var ts;
     ts.isShorthandAmbientModuleSymbol = isShorthandAmbientModuleSymbol;
     function isShorthandAmbientModule(node) {
         // The only kind of module that can be missing a body is a shorthand ambient module.
-        return node && node.kind === 244 /* ModuleDeclaration */ && (!node.body);
+        return node && node.kind === 245 /* ModuleDeclaration */ && (!node.body);
     }
     function isBlockScopedContainerTopLevel(node) {
-        return node.kind === 284 /* SourceFile */ ||
-            node.kind === 244 /* ModuleDeclaration */ ||
+        return node.kind === 285 /* SourceFile */ ||
+            node.kind === 245 /* ModuleDeclaration */ ||
             ts.isFunctionLike(node);
     }
     ts.isBlockScopedContainerTopLevel = isBlockScopedContainerTopLevel;
@@ -8928,9 +9149,9 @@ var ts;
         // - defined in the top level scope and source file is an external module
         // - defined inside ambient module declaration located in the top level scope and source file not an external module
         switch (node.parent.kind) {
-            case 284 /* SourceFile */:
+            case 285 /* SourceFile */:
                 return ts.isExternalModule(node.parent);
-            case 245 /* ModuleBlock */:
+            case 246 /* ModuleBlock */:
                 return isAmbientModule(node.parent.parent) && ts.isSourceFile(node.parent.parent.parent) && !ts.isExternalModule(node.parent.parent.parent);
         }
         return false;
@@ -8946,22 +9167,22 @@ var ts;
     ts.isEffectiveExternalModule = isEffectiveExternalModule;
     function isBlockScope(node, parentNode) {
         switch (node.kind) {
-            case 284 /* SourceFile */:
-            case 246 /* CaseBlock */:
-            case 274 /* CatchClause */:
-            case 244 /* ModuleDeclaration */:
-            case 225 /* ForStatement */:
-            case 226 /* ForInStatement */:
-            case 227 /* ForOfStatement */:
-            case 157 /* Constructor */:
-            case 156 /* MethodDeclaration */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
-            case 239 /* FunctionDeclaration */:
-            case 196 /* FunctionExpression */:
-            case 197 /* ArrowFunction */:
+            case 285 /* SourceFile */:
+            case 247 /* CaseBlock */:
+            case 275 /* CatchClause */:
+            case 245 /* ModuleDeclaration */:
+            case 226 /* ForStatement */:
+            case 227 /* ForInStatement */:
+            case 228 /* ForOfStatement */:
+            case 158 /* Constructor */:
+            case 157 /* MethodDeclaration */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
+            case 240 /* FunctionDeclaration */:
+            case 197 /* FunctionExpression */:
+            case 198 /* ArrowFunction */:
                 return true;
-            case 218 /* Block */:
+            case 219 /* Block */:
                 // function block is not considered block-scope container
                 // see comment in binder.ts: bind(...), case for SyntaxKind.Block
                 return !ts.isFunctionLike(parentNode);
@@ -8971,9 +9192,9 @@ var ts;
     ts.isBlockScope = isBlockScope;
     function isDeclarationWithTypeParameters(node) {
         switch (node.kind) {
-            case 302 /* JSDocCallbackTag */:
-            case 309 /* JSDocTypedefTag */:
-            case 298 /* JSDocSignature */:
+            case 304 /* JSDocCallbackTag */:
+            case 311 /* JSDocTypedefTag */:
+            case 299 /* JSDocSignature */:
                 return true;
             default:
                 ts.assertType(node);
@@ -8983,25 +9204,25 @@ var ts;
     ts.isDeclarationWithTypeParameters = isDeclarationWithTypeParameters;
     function isDeclarationWithTypeParameterChildren(node) {
         switch (node.kind) {
-            case 160 /* CallSignature */:
-            case 161 /* ConstructSignature */:
-            case 155 /* MethodSignature */:
-            case 162 /* IndexSignature */:
-            case 165 /* FunctionType */:
-            case 166 /* ConstructorType */:
-            case 294 /* JSDocFunctionType */:
-            case 240 /* ClassDeclaration */:
-            case 209 /* ClassExpression */:
-            case 241 /* InterfaceDeclaration */:
-            case 242 /* TypeAliasDeclaration */:
-            case 308 /* JSDocTemplateTag */:
-            case 239 /* FunctionDeclaration */:
-            case 156 /* MethodDeclaration */:
-            case 157 /* Constructor */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
-            case 196 /* FunctionExpression */:
-            case 197 /* ArrowFunction */:
+            case 161 /* CallSignature */:
+            case 162 /* ConstructSignature */:
+            case 156 /* MethodSignature */:
+            case 163 /* IndexSignature */:
+            case 166 /* FunctionType */:
+            case 167 /* ConstructorType */:
+            case 295 /* JSDocFunctionType */:
+            case 241 /* ClassDeclaration */:
+            case 210 /* ClassExpression */:
+            case 242 /* InterfaceDeclaration */:
+            case 243 /* TypeAliasDeclaration */:
+            case 310 /* JSDocTemplateTag */:
+            case 240 /* FunctionDeclaration */:
+            case 157 /* MethodDeclaration */:
+            case 158 /* Constructor */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
+            case 197 /* FunctionExpression */:
+            case 198 /* ArrowFunction */:
                 return true;
             default:
                 ts.assertType(node);
@@ -9011,8 +9232,8 @@ var ts;
     ts.isDeclarationWithTypeParameterChildren = isDeclarationWithTypeParameterChildren;
     function isAnyImportSyntax(node) {
         switch (node.kind) {
-            case 249 /* ImportDeclaration */:
-            case 248 /* ImportEqualsDeclaration */:
+            case 250 /* ImportDeclaration */:
+            case 249 /* ImportEqualsDeclaration */:
                 return true;
             default:
                 return false;
@@ -9021,15 +9242,15 @@ var ts;
     ts.isAnyImportSyntax = isAnyImportSyntax;
     function isLateVisibilityPaintedStatement(node) {
         switch (node.kind) {
-            case 249 /* ImportDeclaration */:
-            case 248 /* ImportEqualsDeclaration */:
-            case 219 /* VariableStatement */:
-            case 240 /* ClassDeclaration */:
-            case 239 /* FunctionDeclaration */:
-            case 244 /* ModuleDeclaration */:
-            case 242 /* TypeAliasDeclaration */:
-            case 241 /* InterfaceDeclaration */:
-            case 243 /* EnumDeclaration */:
+            case 250 /* ImportDeclaration */:
+            case 249 /* ImportEqualsDeclaration */:
+            case 220 /* VariableStatement */:
+            case 241 /* ClassDeclaration */:
+            case 240 /* FunctionDeclaration */:
+            case 245 /* ModuleDeclaration */:
+            case 243 /* TypeAliasDeclaration */:
+            case 242 /* InterfaceDeclaration */:
+            case 244 /* EnumDeclaration */:
                 return true;
             default:
                 return false;
@@ -9059,13 +9280,13 @@ var ts;
     ts.getNameFromIndexInfo = getNameFromIndexInfo;
     function getTextOfPropertyName(name) {
         switch (name.kind) {
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 return name.escapedText;
             case 10 /* StringLiteral */:
             case 8 /* NumericLiteral */:
             case 14 /* NoSubstitutionTemplateLiteral */:
                 return ts.escapeLeadingUnderscores(name.text);
-            case 149 /* ComputedPropertyName */:
+            case 150 /* ComputedPropertyName */:
                 if (isStringOrNumericLiteralLike(name.expression))
                     return ts.escapeLeadingUnderscores(name.expression.text);
                 return ts.Debug.fail("Text of property name cannot be read from non-literal-valued ComputedPropertyNames");
@@ -9076,11 +9297,11 @@ var ts;
     ts.getTextOfPropertyName = getTextOfPropertyName;
     function entityNameToString(name) {
         switch (name.kind) {
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 return getFullWidth(name) === 0 ? ts.idText(name) : getTextOfNode(name);
-            case 148 /* QualifiedName */:
+            case 149 /* QualifiedName */:
                 return entityNameToString(name.left) + "." + entityNameToString(name.right);
-            case 189 /* PropertyAccessExpression */:
+            case 190 /* PropertyAccessExpression */:
                 return entityNameToString(name.expression) + "." + entityNameToString(name.name);
             default:
                 throw ts.Debug.assertNever(name);
@@ -9125,7 +9346,7 @@ var ts;
     ts.getSpanOfTokenAtPosition = getSpanOfTokenAtPosition;
     function getErrorSpanForArrowFunction(sourceFile, node) {
         var pos = ts.skipTrivia(sourceFile.text, node.pos);
-        if (node.body && node.body.kind === 218 /* Block */) {
+        if (node.body && node.body.kind === 219 /* Block */) {
             var startLine = ts.getLineAndCharacterOfPosition(sourceFile, node.body.pos).line;
             var endLine = ts.getLineAndCharacterOfPosition(sourceFile, node.body.end).line;
             if (startLine < endLine) {
@@ -9139,7 +9360,7 @@ var ts;
     function getErrorSpanForNode(sourceFile, node) {
         var errorNode = node;
         switch (node.kind) {
-            case 284 /* SourceFile */:
+            case 285 /* SourceFile */:
                 var pos_1 = ts.skipTrivia(sourceFile.text, 0, /*stopAfterLineBreak*/ false);
                 if (pos_1 === sourceFile.text.length) {
                     // file is empty - return span for the beginning of the file
@@ -9148,25 +9369,25 @@ var ts;
                 return getSpanOfTokenAtPosition(sourceFile, pos_1);
             // This list is a work in progress. Add missing node kinds to improve their error
             // spans.
-            case 237 /* VariableDeclaration */:
-            case 186 /* BindingElement */:
-            case 240 /* ClassDeclaration */:
-            case 209 /* ClassExpression */:
-            case 241 /* InterfaceDeclaration */:
-            case 244 /* ModuleDeclaration */:
-            case 243 /* EnumDeclaration */:
-            case 278 /* EnumMember */:
-            case 239 /* FunctionDeclaration */:
-            case 196 /* FunctionExpression */:
-            case 156 /* MethodDeclaration */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
-            case 242 /* TypeAliasDeclaration */:
-            case 154 /* PropertyDeclaration */:
-            case 153 /* PropertySignature */:
+            case 238 /* VariableDeclaration */:
+            case 187 /* BindingElement */:
+            case 241 /* ClassDeclaration */:
+            case 210 /* ClassExpression */:
+            case 242 /* InterfaceDeclaration */:
+            case 245 /* ModuleDeclaration */:
+            case 244 /* EnumDeclaration */:
+            case 279 /* EnumMember */:
+            case 240 /* FunctionDeclaration */:
+            case 197 /* FunctionExpression */:
+            case 157 /* MethodDeclaration */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
+            case 243 /* TypeAliasDeclaration */:
+            case 155 /* PropertyDeclaration */:
+            case 154 /* PropertySignature */:
                 errorNode = node.name;
                 break;
-            case 197 /* ArrowFunction */:
+            case 198 /* ArrowFunction */:
                 return getErrorSpanForArrowFunction(sourceFile, node);
         }
         if (errorNode === undefined) {
@@ -9215,11 +9436,11 @@ var ts;
     }
     ts.isLet = isLet;
     function isSuperCall(n) {
-        return n.kind === 191 /* CallExpression */ && n.expression.kind === 98 /* SuperKeyword */;
+        return n.kind === 192 /* CallExpression */ && n.expression.kind === 99 /* SuperKeyword */;
     }
     ts.isSuperCall = isSuperCall;
     function isImportCall(n) {
-        return n.kind === 191 /* CallExpression */ && n.expression.kind === 92 /* ImportKeyword */;
+        return n.kind === 192 /* CallExpression */ && n.expression.kind === 93 /* ImportKeyword */;
     }
     ts.isImportCall = isImportCall;
     function isLiteralImportTypeNode(n) {
@@ -9227,7 +9448,7 @@ var ts;
     }
     ts.isLiteralImportTypeNode = isLiteralImportTypeNode;
     function isPrologueDirective(node) {
-        return node.kind === 221 /* ExpressionStatement */
+        return node.kind === 222 /* ExpressionStatement */
             && node.expression.kind === 10 /* StringLiteral */;
     }
     ts.isPrologueDirective = isPrologueDirective;
@@ -9236,11 +9457,11 @@ var ts;
     }
     ts.getLeadingCommentRangesOfNode = getLeadingCommentRangesOfNode;
     function getJSDocCommentRanges(node, text) {
-        var commentRanges = (node.kind === 151 /* Parameter */ ||
-            node.kind === 150 /* TypeParameter */ ||
-            node.kind === 196 /* FunctionExpression */ ||
-            node.kind === 197 /* ArrowFunction */ ||
-            node.kind === 195 /* ParenthesizedExpression */) ?
+        var commentRanges = (node.kind === 152 /* Parameter */ ||
+            node.kind === 151 /* TypeParameter */ ||
+            node.kind === 197 /* FunctionExpression */ ||
+            node.kind === 198 /* ArrowFunction */ ||
+            node.kind === 196 /* ParenthesizedExpression */) ?
             ts.concatenate(ts.getTrailingCommentRanges(text, node.pos), ts.getLeadingCommentRanges(text, node.pos)) :
             ts.getLeadingCommentRanges(text, node.pos);
         // True if the comment starts with '/**' but not if it is '/**/'
@@ -9256,48 +9477,48 @@ var ts;
     ts.fullTripleSlashAMDReferencePathRegEx = /^(\/\/\/\s*<amd-dependency\s+path\s*=\s*)('|")(.+?)\2.*?\/>/;
     var defaultLibReferenceRegEx = /^(\/\/\/\s*<reference\s+no-default-lib\s*=\s*)('|")(.+?)\2\s*\/>/;
     function isPartOfTypeNode(node) {
-        if (163 /* FirstTypeNode */ <= node.kind && node.kind <= 183 /* LastTypeNode */) {
+        if (164 /* FirstTypeNode */ <= node.kind && node.kind <= 184 /* LastTypeNode */) {
             return true;
         }
         switch (node.kind) {
-            case 120 /* AnyKeyword */:
-            case 143 /* UnknownKeyword */:
-            case 135 /* NumberKeyword */:
-            case 146 /* BigIntKeyword */:
-            case 138 /* StringKeyword */:
-            case 123 /* BooleanKeyword */:
-            case 139 /* SymbolKeyword */:
-            case 136 /* ObjectKeyword */:
-            case 141 /* UndefinedKeyword */:
-            case 132 /* NeverKeyword */:
+            case 121 /* AnyKeyword */:
+            case 144 /* UnknownKeyword */:
+            case 136 /* NumberKeyword */:
+            case 147 /* BigIntKeyword */:
+            case 139 /* StringKeyword */:
+            case 124 /* BooleanKeyword */:
+            case 140 /* SymbolKeyword */:
+            case 137 /* ObjectKeyword */:
+            case 142 /* UndefinedKeyword */:
+            case 133 /* NeverKeyword */:
                 return true;
-            case 106 /* VoidKeyword */:
-                return node.parent.kind !== 200 /* VoidExpression */;
-            case 211 /* ExpressionWithTypeArguments */:
+            case 107 /* VoidKeyword */:
+                return node.parent.kind !== 201 /* VoidExpression */;
+            case 212 /* ExpressionWithTypeArguments */:
                 return !isExpressionWithTypeArgumentsInClassExtendsClause(node);
-            case 150 /* TypeParameter */:
-                return node.parent.kind === 181 /* MappedType */ || node.parent.kind === 176 /* InferType */;
+            case 151 /* TypeParameter */:
+                return node.parent.kind === 182 /* MappedType */ || node.parent.kind === 177 /* InferType */;
             // Identifiers and qualified names may be type nodes, depending on their context. Climb
             // above them to find the lowest container
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 // If the identifier is the RHS of a qualified name, then it's a type iff its parent is.
-                if (node.parent.kind === 148 /* QualifiedName */ && node.parent.right === node) {
+                if (node.parent.kind === 149 /* QualifiedName */ && node.parent.right === node) {
                     node = node.parent;
                 }
-                else if (node.parent.kind === 189 /* PropertyAccessExpression */ && node.parent.name === node) {
+                else if (node.parent.kind === 190 /* PropertyAccessExpression */ && node.parent.name === node) {
                     node = node.parent;
                 }
                 // At this point, node is either a qualified name or an identifier
-                ts.Debug.assert(node.kind === 72 /* Identifier */ || node.kind === 148 /* QualifiedName */ || node.kind === 189 /* PropertyAccessExpression */, "'node' was expected to be a qualified name, identifier or property access in 'isPartOfTypeNode'.");
+                ts.Debug.assert(node.kind === 73 /* Identifier */ || node.kind === 149 /* QualifiedName */ || node.kind === 190 /* PropertyAccessExpression */, "'node' was expected to be a qualified name, identifier or property access in 'isPartOfTypeNode'.");
             // falls through
-            case 148 /* QualifiedName */:
-            case 189 /* PropertyAccessExpression */:
-            case 100 /* ThisKeyword */: {
+            case 149 /* QualifiedName */:
+            case 190 /* PropertyAccessExpression */:
+            case 101 /* ThisKeyword */: {
                 var parent = node.parent;
-                if (parent.kind === 167 /* TypeQuery */) {
+                if (parent.kind === 168 /* TypeQuery */) {
                     return false;
                 }
-                if (parent.kind === 183 /* ImportType */) {
+                if (parent.kind === 184 /* ImportType */) {
                     return !parent.isTypeOf;
                 }
                 // Do not recursively call isPartOfTypeNode on the parent. In the example:
@@ -9306,40 +9527,40 @@ var ts;
                 //
                 // Calling isPartOfTypeNode would consider the qualified name A.B a type node.
                 // Only C and A.B.C are type nodes.
-                if (163 /* FirstTypeNode */ <= parent.kind && parent.kind <= 183 /* LastTypeNode */) {
+                if (164 /* FirstTypeNode */ <= parent.kind && parent.kind <= 184 /* LastTypeNode */) {
                     return true;
                 }
                 switch (parent.kind) {
-                    case 211 /* ExpressionWithTypeArguments */:
+                    case 212 /* ExpressionWithTypeArguments */:
                         return !isExpressionWithTypeArgumentsInClassExtendsClause(parent);
-                    case 150 /* TypeParameter */:
+                    case 151 /* TypeParameter */:
                         return node === parent.constraint;
-                    case 308 /* JSDocTemplateTag */:
+                    case 310 /* JSDocTemplateTag */:
                         return node === parent.constraint;
-                    case 154 /* PropertyDeclaration */:
-                    case 153 /* PropertySignature */:
-                    case 151 /* Parameter */:
-                    case 237 /* VariableDeclaration */:
+                    case 155 /* PropertyDeclaration */:
+                    case 154 /* PropertySignature */:
+                    case 152 /* Parameter */:
+                    case 238 /* VariableDeclaration */:
                         return node === parent.type;
-                    case 239 /* FunctionDeclaration */:
-                    case 196 /* FunctionExpression */:
-                    case 197 /* ArrowFunction */:
-                    case 157 /* Constructor */:
-                    case 156 /* MethodDeclaration */:
-                    case 155 /* MethodSignature */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
+                    case 240 /* FunctionDeclaration */:
+                    case 197 /* FunctionExpression */:
+                    case 198 /* ArrowFunction */:
+                    case 158 /* Constructor */:
+                    case 157 /* MethodDeclaration */:
+                    case 156 /* MethodSignature */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
                         return node === parent.type;
-                    case 160 /* CallSignature */:
-                    case 161 /* ConstructSignature */:
-                    case 162 /* IndexSignature */:
+                    case 161 /* CallSignature */:
+                    case 162 /* ConstructSignature */:
+                    case 163 /* IndexSignature */:
                         return node === parent.type;
-                    case 194 /* TypeAssertionExpression */:
+                    case 195 /* TypeAssertionExpression */:
                         return node === parent.type;
-                    case 191 /* CallExpression */:
-                    case 192 /* NewExpression */:
+                    case 192 /* CallExpression */:
+                    case 193 /* NewExpression */:
                         return ts.contains(parent.typeArguments, node);
-                    case 193 /* TaggedTemplateExpression */:
+                    case 194 /* TaggedTemplateExpression */:
                         // TODO (drosen): TaggedTemplateExpressions may eventually support type arguments.
                         return false;
                 }
@@ -9364,23 +9585,23 @@ var ts;
         return traverse(body);
         function traverse(node) {
             switch (node.kind) {
-                case 230 /* ReturnStatement */:
+                case 231 /* ReturnStatement */:
                     return visitor(node);
-                case 246 /* CaseBlock */:
-                case 218 /* Block */:
-                case 222 /* IfStatement */:
-                case 223 /* DoStatement */:
-                case 224 /* WhileStatement */:
-                case 225 /* ForStatement */:
-                case 226 /* ForInStatement */:
-                case 227 /* ForOfStatement */:
-                case 231 /* WithStatement */:
-                case 232 /* SwitchStatement */:
-                case 271 /* CaseClause */:
-                case 272 /* DefaultClause */:
-                case 233 /* LabeledStatement */:
-                case 235 /* TryStatement */:
-                case 274 /* CatchClause */:
+                case 247 /* CaseBlock */:
+                case 219 /* Block */:
+                case 223 /* IfStatement */:
+                case 224 /* DoStatement */:
+                case 225 /* WhileStatement */:
+                case 226 /* ForStatement */:
+                case 227 /* ForInStatement */:
+                case 228 /* ForOfStatement */:
+                case 232 /* WithStatement */:
+                case 233 /* SwitchStatement */:
+                case 272 /* CaseClause */:
+                case 273 /* DefaultClause */:
+                case 234 /* LabeledStatement */:
+                case 236 /* TryStatement */:
+                case 275 /* CatchClause */:
                     return ts.forEachChild(node, traverse);
             }
         }
@@ -9390,26 +9611,26 @@ var ts;
         return traverse(body);
         function traverse(node) {
             switch (node.kind) {
-                case 207 /* YieldExpression */:
+                case 208 /* YieldExpression */:
                     visitor(node);
                     var operand = node.expression;
                     if (operand) {
                         traverse(operand);
                     }
                     return;
-                case 243 /* EnumDeclaration */:
-                case 241 /* InterfaceDeclaration */:
-                case 244 /* ModuleDeclaration */:
-                case 242 /* TypeAliasDeclaration */:
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
+                case 244 /* EnumDeclaration */:
+                case 242 /* InterfaceDeclaration */:
+                case 245 /* ModuleDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
                     // These are not allowed inside a generator now, but eventually they may be allowed
                     // as local types. Regardless, any yield statements contained within them should be
                     // skipped in this traversal.
                     return;
                 default:
                     if (ts.isFunctionLike(node)) {
-                        if (node.name && node.name.kind === 149 /* ComputedPropertyName */) {
+                        if (node.name && node.name.kind === 150 /* ComputedPropertyName */) {
                             // Note that we will not include methods/accessors of a class because they would require
                             // first descending into the class. This is by design.
                             traverse(node.name.expression);
@@ -9432,10 +9653,10 @@ var ts;
      * @param node The type node.
      */
     function getRestParameterElementType(node) {
-        if (node && node.kind === 169 /* ArrayType */) {
+        if (node && node.kind === 170 /* ArrayType */) {
             return node.elementType;
         }
-        else if (node && node.kind === 164 /* TypeReference */) {
+        else if (node && node.kind === 165 /* TypeReference */) {
             return ts.singleOrUndefined(node.typeArguments);
         }
         else {
@@ -9445,12 +9666,12 @@ var ts;
     ts.getRestParameterElementType = getRestParameterElementType;
     function getMembersOfDeclaration(node) {
         switch (node.kind) {
-            case 241 /* InterfaceDeclaration */:
-            case 240 /* ClassDeclaration */:
-            case 209 /* ClassExpression */:
-            case 168 /* TypeLiteral */:
+            case 242 /* InterfaceDeclaration */:
+            case 241 /* ClassDeclaration */:
+            case 210 /* ClassExpression */:
+            case 169 /* TypeLiteral */:
                 return node.members;
-            case 188 /* ObjectLiteralExpression */:
+            case 189 /* ObjectLiteralExpression */:
                 return node.properties;
         }
     }
@@ -9458,14 +9679,14 @@ var ts;
     function isVariableLike(node) {
         if (node) {
             switch (node.kind) {
-                case 186 /* BindingElement */:
-                case 278 /* EnumMember */:
-                case 151 /* Parameter */:
-                case 275 /* PropertyAssignment */:
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
-                case 276 /* ShorthandPropertyAssignment */:
-                case 237 /* VariableDeclaration */:
+                case 187 /* BindingElement */:
+                case 279 /* EnumMember */:
+                case 152 /* Parameter */:
+                case 276 /* PropertyAssignment */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
+                case 277 /* ShorthandPropertyAssignment */:
+                case 238 /* VariableDeclaration */:
                     return true;
             }
         }
@@ -9477,8 +9698,8 @@ var ts;
     }
     ts.isVariableLikeOrAccessor = isVariableLikeOrAccessor;
     function isVariableDeclarationInVariableStatement(node) {
-        return node.parent.kind === 238 /* VariableDeclarationList */
-            && node.parent.parent.kind === 219 /* VariableStatement */;
+        return node.parent.kind === 239 /* VariableDeclarationList */
+            && node.parent.parent.kind === 220 /* VariableStatement */;
     }
     ts.isVariableDeclarationInVariableStatement = isVariableDeclarationInVariableStatement;
     function isValidESSymbolDeclaration(node) {
@@ -9489,13 +9710,13 @@ var ts;
     ts.isValidESSymbolDeclaration = isValidESSymbolDeclaration;
     function introducesArgumentsExoticObject(node) {
         switch (node.kind) {
-            case 156 /* MethodDeclaration */:
-            case 155 /* MethodSignature */:
-            case 157 /* Constructor */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
-            case 239 /* FunctionDeclaration */:
-            case 196 /* FunctionExpression */:
+            case 157 /* MethodDeclaration */:
+            case 156 /* MethodSignature */:
+            case 158 /* Constructor */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
+            case 240 /* FunctionDeclaration */:
+            case 197 /* FunctionExpression */:
                 return true;
         }
         return false;
@@ -9506,7 +9727,7 @@ var ts;
             if (beforeUnwrapLabelCallback) {
                 beforeUnwrapLabelCallback(node);
             }
-            if (node.statement.kind !== 233 /* LabeledStatement */) {
+            if (node.statement.kind !== 234 /* LabeledStatement */) {
                 return node.statement;
             }
             node = node.statement;
@@ -9514,17 +9735,17 @@ var ts;
     }
     ts.unwrapInnermostStatementOfLabel = unwrapInnermostStatementOfLabel;
     function isFunctionBlock(node) {
-        return node && node.kind === 218 /* Block */ && ts.isFunctionLike(node.parent);
+        return node && node.kind === 219 /* Block */ && ts.isFunctionLike(node.parent);
     }
     ts.isFunctionBlock = isFunctionBlock;
     function isObjectLiteralMethod(node) {
-        return node && node.kind === 156 /* MethodDeclaration */ && node.parent.kind === 188 /* ObjectLiteralExpression */;
+        return node && node.kind === 157 /* MethodDeclaration */ && node.parent.kind === 189 /* ObjectLiteralExpression */;
     }
     ts.isObjectLiteralMethod = isObjectLiteralMethod;
     function isObjectLiteralOrClassExpressionMethod(node) {
-        return node.kind === 156 /* MethodDeclaration */ &&
-            (node.parent.kind === 188 /* ObjectLiteralExpression */ ||
-                node.parent.kind === 209 /* ClassExpression */);
+        return node.kind === 157 /* MethodDeclaration */ &&
+            (node.parent.kind === 189 /* ObjectLiteralExpression */ ||
+                node.parent.kind === 210 /* ClassExpression */);
     }
     ts.isObjectLiteralOrClassExpressionMethod = isObjectLiteralOrClassExpressionMethod;
     function isIdentifierTypePredicate(predicate) {
@@ -9537,7 +9758,7 @@ var ts;
     ts.isThisTypePredicate = isThisTypePredicate;
     function getPropertyAssignment(objectLiteral, key, key2) {
         return objectLiteral.properties.filter(function (property) {
-            if (property.kind === 275 /* PropertyAssignment */) {
+            if (property.kind === 276 /* PropertyAssignment */) {
                 var propName = getTextOfPropertyName(property.name);
                 return key === propName || (!!key2 && key2 === propName);
             }
@@ -9569,19 +9790,23 @@ var ts;
         return findAncestor(node.parent, ts.isFunctionLike);
     }
     ts.getContainingFunction = getContainingFunction;
+    function getContainingFunctionDeclaration(node) {
+        return findAncestor(node.parent, ts.isFunctionLikeDeclaration);
+    }
+    ts.getContainingFunctionDeclaration = getContainingFunctionDeclaration;
     function getContainingClass(node) {
         return findAncestor(node.parent, ts.isClassLike);
     }
     ts.getContainingClass = getContainingClass;
     function getThisContainer(node, includeArrowFunctions) {
-        ts.Debug.assert(node.kind !== 284 /* SourceFile */);
+        ts.Debug.assert(node.kind !== 285 /* SourceFile */);
         while (true) {
             node = node.parent;
             if (!node) {
                 return ts.Debug.fail(); // If we never pass in a SourceFile, this should be unreachable, since we'll stop when we reach that.
             }
             switch (node.kind) {
-                case 149 /* ComputedPropertyName */:
+                case 150 /* ComputedPropertyName */:
                     // If the grandparent node is an object literal (as opposed to a class),
                     // then the computed property is not a 'this' container.
                     // A computed property name in a class needs to be a this container
@@ -9596,9 +9821,9 @@ var ts;
                     // the *body* of the container.
                     node = node.parent;
                     break;
-                case 152 /* Decorator */:
+                case 153 /* Decorator */:
                     // Decorators are always applied outside of the body of a class or method.
-                    if (node.parent.kind === 151 /* Parameter */ && ts.isClassElement(node.parent.parent)) {
+                    if (node.parent.kind === 152 /* Parameter */ && ts.isClassElement(node.parent.parent)) {
                         // If the decorator's parent is a Parameter, we resolve the this container from
                         // the grandparent class declaration.
                         node = node.parent.parent;
@@ -9609,26 +9834,26 @@ var ts;
                         node = node.parent;
                     }
                     break;
-                case 197 /* ArrowFunction */:
+                case 198 /* ArrowFunction */:
                     if (!includeArrowFunctions) {
                         continue;
                     }
                 // falls through
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
-                case 244 /* ModuleDeclaration */:
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
-                case 157 /* Constructor */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
-                case 160 /* CallSignature */:
-                case 161 /* ConstructSignature */:
-                case 162 /* IndexSignature */:
-                case 243 /* EnumDeclaration */:
-                case 284 /* SourceFile */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 245 /* ModuleDeclaration */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
+                case 158 /* Constructor */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
+                case 161 /* CallSignature */:
+                case 162 /* ConstructSignature */:
+                case 163 /* IndexSignature */:
+                case 244 /* EnumDeclaration */:
+                case 285 /* SourceFile */:
                     return node;
             }
         }
@@ -9638,9 +9863,9 @@ var ts;
         var container = getThisContainer(node, /*includeArrowFunctions*/ false);
         if (container) {
             switch (container.kind) {
-                case 157 /* Constructor */:
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
+                case 158 /* Constructor */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
                     return container;
             }
         }
@@ -9662,27 +9887,27 @@ var ts;
                 return node;
             }
             switch (node.kind) {
-                case 149 /* ComputedPropertyName */:
+                case 150 /* ComputedPropertyName */:
                     node = node.parent;
                     break;
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
                     if (!stopOnFunctions) {
                         continue;
                     }
                 // falls through
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
-                case 157 /* Constructor */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
+                case 158 /* Constructor */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     return node;
-                case 152 /* Decorator */:
+                case 153 /* Decorator */:
                     // Decorators are always applied outside of the body of a class or method.
-                    if (node.parent.kind === 151 /* Parameter */ && ts.isClassElement(node.parent.parent)) {
+                    if (node.parent.kind === 152 /* Parameter */ && ts.isClassElement(node.parent.parent)) {
                         // If the decorator's parent is a Parameter, we resolve the this container from
                         // the grandparent class declaration.
                         node = node.parent.parent;
@@ -9698,21 +9923,21 @@ var ts;
     }
     ts.getSuperContainer = getSuperContainer;
     function getImmediatelyInvokedFunctionExpression(func) {
-        if (func.kind === 196 /* FunctionExpression */ || func.kind === 197 /* ArrowFunction */) {
+        if (func.kind === 197 /* FunctionExpression */ || func.kind === 198 /* ArrowFunction */) {
             var prev = func;
             var parent = func.parent;
-            while (parent.kind === 195 /* ParenthesizedExpression */) {
+            while (parent.kind === 196 /* ParenthesizedExpression */) {
                 prev = parent;
                 parent = parent.parent;
             }
-            if (parent.kind === 191 /* CallExpression */ && parent.expression === prev) {
+            if (parent.kind === 192 /* CallExpression */ && parent.expression === prev) {
                 return parent;
             }
         }
     }
     ts.getImmediatelyInvokedFunctionExpression = getImmediatelyInvokedFunctionExpression;
     function isSuperOrSuperProperty(node) {
-        return node.kind === 98 /* SuperKeyword */
+        return node.kind === 99 /* SuperKeyword */
             || isSuperProperty(node);
     }
     ts.isSuperOrSuperProperty = isSuperOrSuperProperty;
@@ -9721,8 +9946,8 @@ var ts;
      */
     function isSuperProperty(node) {
         var kind = node.kind;
-        return (kind === 189 /* PropertyAccessExpression */ || kind === 190 /* ElementAccessExpression */)
-            && node.expression.kind === 98 /* SuperKeyword */;
+        return (kind === 190 /* PropertyAccessExpression */ || kind === 191 /* ElementAccessExpression */)
+            && node.expression.kind === 99 /* SuperKeyword */;
     }
     ts.isSuperProperty = isSuperProperty;
     /**
@@ -9730,20 +9955,20 @@ var ts;
      */
     function isThisProperty(node) {
         var kind = node.kind;
-        return (kind === 189 /* PropertyAccessExpression */ || kind === 190 /* ElementAccessExpression */)
-            && node.expression.kind === 100 /* ThisKeyword */;
+        return (kind === 190 /* PropertyAccessExpression */ || kind === 191 /* ElementAccessExpression */)
+            && node.expression.kind === 101 /* ThisKeyword */;
     }
     ts.isThisProperty = isThisProperty;
     function getEntityNameFromTypeNode(node) {
         switch (node.kind) {
-            case 164 /* TypeReference */:
+            case 165 /* TypeReference */:
                 return node.typeName;
-            case 211 /* ExpressionWithTypeArguments */:
+            case 212 /* ExpressionWithTypeArguments */:
                 return isEntityNameExpression(node.expression)
                     ? node.expression
                     : undefined;
-            case 72 /* Identifier */:
-            case 148 /* QualifiedName */:
+            case 73 /* Identifier */:
+            case 149 /* QualifiedName */:
                 return node;
         }
         return undefined;
@@ -9751,10 +9976,10 @@ var ts;
     ts.getEntityNameFromTypeNode = getEntityNameFromTypeNode;
     function getInvokedExpression(node) {
         switch (node.kind) {
-            case 193 /* TaggedTemplateExpression */:
+            case 194 /* TaggedTemplateExpression */:
                 return node.tag;
-            case 262 /* JsxOpeningElement */:
-            case 261 /* JsxSelfClosingElement */:
+            case 263 /* JsxOpeningElement */:
+            case 262 /* JsxSelfClosingElement */:
                 return node.tagName;
             default:
                 return node.expression;
@@ -9763,25 +9988,25 @@ var ts;
     ts.getInvokedExpression = getInvokedExpression;
     function nodeCanBeDecorated(node, parent, grandparent) {
         switch (node.kind) {
-            case 240 /* ClassDeclaration */:
+            case 241 /* ClassDeclaration */:
                 // classes are valid targets
                 return true;
-            case 154 /* PropertyDeclaration */:
+            case 155 /* PropertyDeclaration */:
                 // property declarations are valid if their parent is a class declaration.
-                return parent.kind === 240 /* ClassDeclaration */;
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
-            case 156 /* MethodDeclaration */:
+                return parent.kind === 241 /* ClassDeclaration */;
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
+            case 157 /* MethodDeclaration */:
                 // if this method has a body and its parent is a class declaration, this is a valid target.
                 return node.body !== undefined
-                    && parent.kind === 240 /* ClassDeclaration */;
-            case 151 /* Parameter */:
+                    && parent.kind === 241 /* ClassDeclaration */;
+            case 152 /* Parameter */:
                 // if the parameter's parent has a body and its grandparent is a class declaration, this is a valid target;
                 return parent.body !== undefined
-                    && (parent.kind === 157 /* Constructor */
-                        || parent.kind === 156 /* MethodDeclaration */
-                        || parent.kind === 159 /* SetAccessor */)
-                    && grandparent.kind === 240 /* ClassDeclaration */;
+                    && (parent.kind === 158 /* Constructor */
+                        || parent.kind === 157 /* MethodDeclaration */
+                        || parent.kind === 160 /* SetAccessor */)
+                    && grandparent.kind === 241 /* ClassDeclaration */;
         }
         return false;
     }
@@ -9797,10 +10022,10 @@ var ts;
     ts.nodeOrChildIsDecorated = nodeOrChildIsDecorated;
     function childIsDecorated(node, parent) {
         switch (node.kind) {
-            case 240 /* ClassDeclaration */:
+            case 241 /* ClassDeclaration */:
                 return ts.some(node.members, function (m) { return nodeOrChildIsDecorated(m, node, parent); }); // TODO: GH#18217
-            case 156 /* MethodDeclaration */:
-            case 159 /* SetAccessor */:
+            case 157 /* MethodDeclaration */:
+            case 160 /* SetAccessor */:
                 return ts.some(node.parameters, function (p) { return nodeIsDecorated(p, node, parent); }); // TODO: GH#18217
             default:
                 return false;
@@ -9809,9 +10034,9 @@ var ts;
     ts.childIsDecorated = childIsDecorated;
     function isJSXTagName(node) {
         var parent = node.parent;
-        if (parent.kind === 262 /* JsxOpeningElement */ ||
-            parent.kind === 261 /* JsxSelfClosingElement */ ||
-            parent.kind === 263 /* JsxClosingElement */) {
+        if (parent.kind === 263 /* JsxOpeningElement */ ||
+            parent.kind === 262 /* JsxSelfClosingElement */ ||
+            parent.kind === 264 /* JsxClosingElement */) {
             return parent.tagName === node;
         }
         return false;
@@ -9819,57 +10044,57 @@ var ts;
     ts.isJSXTagName = isJSXTagName;
     function isExpressionNode(node) {
         switch (node.kind) {
-            case 98 /* SuperKeyword */:
-            case 96 /* NullKeyword */:
-            case 102 /* TrueKeyword */:
-            case 87 /* FalseKeyword */:
+            case 99 /* SuperKeyword */:
+            case 97 /* NullKeyword */:
+            case 103 /* TrueKeyword */:
+            case 88 /* FalseKeyword */:
             case 13 /* RegularExpressionLiteral */:
-            case 187 /* ArrayLiteralExpression */:
-            case 188 /* ObjectLiteralExpression */:
-            case 189 /* PropertyAccessExpression */:
-            case 190 /* ElementAccessExpression */:
-            case 191 /* CallExpression */:
-            case 192 /* NewExpression */:
-            case 193 /* TaggedTemplateExpression */:
-            case 212 /* AsExpression */:
-            case 194 /* TypeAssertionExpression */:
-            case 213 /* NonNullExpression */:
-            case 195 /* ParenthesizedExpression */:
-            case 196 /* FunctionExpression */:
-            case 209 /* ClassExpression */:
-            case 197 /* ArrowFunction */:
-            case 200 /* VoidExpression */:
-            case 198 /* DeleteExpression */:
-            case 199 /* TypeOfExpression */:
-            case 202 /* PrefixUnaryExpression */:
-            case 203 /* PostfixUnaryExpression */:
-            case 204 /* BinaryExpression */:
-            case 205 /* ConditionalExpression */:
-            case 208 /* SpreadElement */:
-            case 206 /* TemplateExpression */:
+            case 188 /* ArrayLiteralExpression */:
+            case 189 /* ObjectLiteralExpression */:
+            case 190 /* PropertyAccessExpression */:
+            case 191 /* ElementAccessExpression */:
+            case 192 /* CallExpression */:
+            case 193 /* NewExpression */:
+            case 194 /* TaggedTemplateExpression */:
+            case 213 /* AsExpression */:
+            case 195 /* TypeAssertionExpression */:
+            case 214 /* NonNullExpression */:
+            case 196 /* ParenthesizedExpression */:
+            case 197 /* FunctionExpression */:
+            case 210 /* ClassExpression */:
+            case 198 /* ArrowFunction */:
+            case 201 /* VoidExpression */:
+            case 199 /* DeleteExpression */:
+            case 200 /* TypeOfExpression */:
+            case 203 /* PrefixUnaryExpression */:
+            case 204 /* PostfixUnaryExpression */:
+            case 205 /* BinaryExpression */:
+            case 206 /* ConditionalExpression */:
+            case 209 /* SpreadElement */:
+            case 207 /* TemplateExpression */:
             case 14 /* NoSubstitutionTemplateLiteral */:
-            case 210 /* OmittedExpression */:
-            case 260 /* JsxElement */:
-            case 261 /* JsxSelfClosingElement */:
-            case 264 /* JsxFragment */:
-            case 207 /* YieldExpression */:
-            case 201 /* AwaitExpression */:
-            case 214 /* MetaProperty */:
+            case 211 /* OmittedExpression */:
+            case 261 /* JsxElement */:
+            case 262 /* JsxSelfClosingElement */:
+            case 265 /* JsxFragment */:
+            case 208 /* YieldExpression */:
+            case 202 /* AwaitExpression */:
+            case 215 /* MetaProperty */:
                 return true;
-            case 148 /* QualifiedName */:
-                while (node.parent.kind === 148 /* QualifiedName */) {
+            case 149 /* QualifiedName */:
+                while (node.parent.kind === 149 /* QualifiedName */) {
                     node = node.parent;
                 }
-                return node.parent.kind === 167 /* TypeQuery */ || isJSXTagName(node);
-            case 72 /* Identifier */:
-                if (node.parent.kind === 167 /* TypeQuery */ || isJSXTagName(node)) {
+                return node.parent.kind === 168 /* TypeQuery */ || isJSXTagName(node);
+            case 73 /* Identifier */:
+                if (node.parent.kind === 168 /* TypeQuery */ || isJSXTagName(node)) {
                     return true;
                 }
             // falls through
             case 8 /* NumericLiteral */:
             case 9 /* BigIntLiteral */:
             case 10 /* StringLiteral */:
-            case 100 /* ThisKeyword */:
+            case 101 /* ThisKeyword */:
                 return isInExpressionContext(node);
             default:
                 return false;
@@ -9879,49 +10104,49 @@ var ts;
     function isInExpressionContext(node) {
         var parent = node.parent;
         switch (parent.kind) {
-            case 237 /* VariableDeclaration */:
-            case 151 /* Parameter */:
-            case 154 /* PropertyDeclaration */:
-            case 153 /* PropertySignature */:
-            case 278 /* EnumMember */:
-            case 275 /* PropertyAssignment */:
-            case 186 /* BindingElement */:
+            case 238 /* VariableDeclaration */:
+            case 152 /* Parameter */:
+            case 155 /* PropertyDeclaration */:
+            case 154 /* PropertySignature */:
+            case 279 /* EnumMember */:
+            case 276 /* PropertyAssignment */:
+            case 187 /* BindingElement */:
                 return parent.initializer === node;
-            case 221 /* ExpressionStatement */:
-            case 222 /* IfStatement */:
-            case 223 /* DoStatement */:
-            case 224 /* WhileStatement */:
-            case 230 /* ReturnStatement */:
-            case 231 /* WithStatement */:
-            case 232 /* SwitchStatement */:
-            case 271 /* CaseClause */:
-            case 234 /* ThrowStatement */:
+            case 222 /* ExpressionStatement */:
+            case 223 /* IfStatement */:
+            case 224 /* DoStatement */:
+            case 225 /* WhileStatement */:
+            case 231 /* ReturnStatement */:
+            case 232 /* WithStatement */:
+            case 233 /* SwitchStatement */:
+            case 272 /* CaseClause */:
+            case 235 /* ThrowStatement */:
                 return parent.expression === node;
-            case 225 /* ForStatement */:
+            case 226 /* ForStatement */:
                 var forStatement = parent;
-                return (forStatement.initializer === node && forStatement.initializer.kind !== 238 /* VariableDeclarationList */) ||
+                return (forStatement.initializer === node && forStatement.initializer.kind !== 239 /* VariableDeclarationList */) ||
                     forStatement.condition === node ||
                     forStatement.incrementor === node;
-            case 226 /* ForInStatement */:
-            case 227 /* ForOfStatement */:
+            case 227 /* ForInStatement */:
+            case 228 /* ForOfStatement */:
                 var forInStatement = parent;
-                return (forInStatement.initializer === node && forInStatement.initializer.kind !== 238 /* VariableDeclarationList */) ||
+                return (forInStatement.initializer === node && forInStatement.initializer.kind !== 239 /* VariableDeclarationList */) ||
                     forInStatement.expression === node;
-            case 194 /* TypeAssertionExpression */:
-            case 212 /* AsExpression */:
+            case 195 /* TypeAssertionExpression */:
+            case 213 /* AsExpression */:
                 return node === parent.expression;
-            case 216 /* TemplateSpan */:
+            case 217 /* TemplateSpan */:
                 return node === parent.expression;
-            case 149 /* ComputedPropertyName */:
+            case 150 /* ComputedPropertyName */:
                 return node === parent.expression;
-            case 152 /* Decorator */:
-            case 270 /* JsxExpression */:
-            case 269 /* JsxSpreadAttribute */:
-            case 277 /* SpreadAssignment */:
+            case 153 /* Decorator */:
+            case 271 /* JsxExpression */:
+            case 270 /* JsxSpreadAttribute */:
+            case 278 /* SpreadAssignment */:
                 return true;
-            case 211 /* ExpressionWithTypeArguments */:
+            case 212 /* ExpressionWithTypeArguments */:
                 return parent.expression === node && isExpressionWithTypeArgumentsInClassExtendsClause(parent);
-            case 276 /* ShorthandPropertyAssignment */:
+            case 277 /* ShorthandPropertyAssignment */:
                 return parent.objectAssignmentInitializer === node;
             default:
                 return isExpressionNode(parent);
@@ -9929,7 +10154,7 @@ var ts;
     }
     ts.isInExpressionContext = isInExpressionContext;
     function isExternalModuleImportEqualsDeclaration(node) {
-        return node.kind === 248 /* ImportEqualsDeclaration */ && node.moduleReference.kind === 259 /* ExternalModuleReference */;
+        return node.kind === 249 /* ImportEqualsDeclaration */ && node.moduleReference.kind === 260 /* ExternalModuleReference */;
     }
     ts.isExternalModuleImportEqualsDeclaration = isExternalModuleImportEqualsDeclaration;
     function getExternalModuleImportEqualsDeclarationExpression(node) {
@@ -9938,7 +10163,7 @@ var ts;
     }
     ts.getExternalModuleImportEqualsDeclarationExpression = getExternalModuleImportEqualsDeclarationExpression;
     function isInternalModuleImportEqualsDeclaration(node) {
-        return node.kind === 248 /* ImportEqualsDeclaration */ && node.moduleReference.kind !== 259 /* ExternalModuleReference */;
+        return node.kind === 249 /* ImportEqualsDeclaration */ && node.moduleReference.kind !== 260 /* ExternalModuleReference */;
     }
     ts.isInternalModuleImportEqualsDeclaration = isInternalModuleImportEqualsDeclaration;
     function isSourceFileJS(file) {
@@ -9966,15 +10191,15 @@ var ts;
             ts.isIdentifier(node.typeName) &&
             node.typeName.escapedText === "Object" &&
             node.typeArguments && node.typeArguments.length === 2 &&
-            (node.typeArguments[0].kind === 138 /* StringKeyword */ || node.typeArguments[0].kind === 135 /* NumberKeyword */);
+            (node.typeArguments[0].kind === 139 /* StringKeyword */ || node.typeArguments[0].kind === 136 /* NumberKeyword */);
     }
     ts.isJSDocIndexSignature = isJSDocIndexSignature;
     function isRequireCall(callExpression, checkArgumentIsStringLiteralLike) {
-        if (callExpression.kind !== 191 /* CallExpression */) {
+        if (callExpression.kind !== 192 /* CallExpression */) {
             return false;
         }
         var _a = callExpression, expression = _a.expression, args = _a.arguments;
-        if (expression.kind !== 72 /* Identifier */ || expression.escapedText !== "require") {
+        if (expression.kind !== 73 /* Identifier */ || expression.escapedText !== "require") {
             return false;
         }
         if (args.length !== 1) {
@@ -10005,7 +10230,7 @@ var ts;
             name = node.parent.name;
             decl = node.parent;
         }
-        else if (ts.isBinaryExpression(node.parent) && node.parent.operatorToken.kind === 59 /* EqualsToken */ && node.parent.right === node) {
+        else if (ts.isBinaryExpression(node.parent) && node.parent.operatorToken.kind === 60 /* EqualsToken */ && node.parent.right === node) {
             name = node.parent.left;
             decl = name;
         }
@@ -10014,7 +10239,7 @@ var ts;
                 name = node.parent.parent.name;
                 decl = node.parent.parent;
             }
-            else if (ts.isBinaryExpression(node.parent.parent) && node.parent.parent.operatorToken.kind === 59 /* EqualsToken */ && node.parent.parent.right === node.parent) {
+            else if (ts.isBinaryExpression(node.parent.parent) && node.parent.parent.operatorToken.kind === 60 /* EqualsToken */ && node.parent.parent.right === node.parent) {
                 name = node.parent.parent.left;
                 decl = name;
             }
@@ -10056,7 +10281,7 @@ var ts;
      * We treat the right hand side of assignments with container-like initalizers as declarations.
      */
     function getAssignedExpandoInitializer(node) {
-        if (node && node.parent && ts.isBinaryExpression(node.parent) && node.parent.operatorToken.kind === 59 /* EqualsToken */) {
+        if (node && node.parent && ts.isBinaryExpression(node.parent) && node.parent.operatorToken.kind === 60 /* EqualsToken */) {
             var isPrototypeAssignment = isPrototypeAccess(node.parent.left);
             return getExpandoInitializer(node.parent.right, isPrototypeAssignment) ||
                 getDefaultedExpandoInitializer(node.parent.left, node.parent.right, isPrototypeAssignment);
@@ -10082,11 +10307,11 @@ var ts;
     function getExpandoInitializer(initializer, isPrototypeAssignment) {
         if (ts.isCallExpression(initializer)) {
             var e = skipParentheses(initializer.expression);
-            return e.kind === 196 /* FunctionExpression */ || e.kind === 197 /* ArrowFunction */ ? initializer : undefined;
+            return e.kind === 197 /* FunctionExpression */ || e.kind === 198 /* ArrowFunction */ ? initializer : undefined;
         }
-        if (initializer.kind === 196 /* FunctionExpression */ ||
-            initializer.kind === 209 /* ClassExpression */ ||
-            initializer.kind === 197 /* ArrowFunction */) {
+        if (initializer.kind === 197 /* FunctionExpression */ ||
+            initializer.kind === 210 /* ClassExpression */ ||
+            initializer.kind === 198 /* ArrowFunction */) {
             return initializer;
         }
         if (ts.isObjectLiteralExpression(initializer) && (initializer.properties.length === 0 || isPrototypeAssignment)) {
@@ -10110,7 +10335,7 @@ var ts;
     }
     function isDefaultedExpandoInitializer(node) {
         var name = ts.isVariableDeclaration(node.parent) ? node.parent.name :
-            ts.isBinaryExpression(node.parent) && node.parent.operatorToken.kind === 59 /* EqualsToken */ ? node.parent.left :
+            ts.isBinaryExpression(node.parent) && node.parent.operatorToken.kind === 60 /* EqualsToken */ ? node.parent.left :
                 undefined;
         return name && getExpandoInitializer(node.right, isPrototypeAccess(name)) && isEntityNameExpression(name) && isSameEntityName(name, node.left);
     }
@@ -10119,7 +10344,7 @@ var ts;
     function getNameOfExpando(node) {
         if (ts.isBinaryExpression(node.parent)) {
             var parent = (node.parent.operatorToken.kind === 55 /* BarBarToken */ && ts.isBinaryExpression(node.parent.parent)) ? node.parent.parent : node.parent;
-            if (parent.operatorToken.kind === 59 /* EqualsToken */ && ts.isIdentifier(parent.left)) {
+            if (parent.operatorToken.kind === 60 /* EqualsToken */ && ts.isIdentifier(parent.left)) {
                 return parent.left;
             }
         }
@@ -10142,7 +10367,7 @@ var ts;
             return name.escapedText === initializer.escapedText;
         }
         if (ts.isIdentifier(name) && ts.isPropertyAccessExpression(initializer)) {
-            return (initializer.expression.kind === 100 /* ThisKeyword */ ||
+            return (initializer.expression.kind === 101 /* ThisKeyword */ ||
                 ts.isIdentifier(initializer.expression) &&
                     (initializer.expression.escapedText === "window" ||
                         initializer.expression.escapedText === "self" ||
@@ -10200,7 +10425,7 @@ var ts;
             }
             return 7 /* ObjectDefinePropertyValue */;
         }
-        if (expr.operatorToken.kind !== 59 /* EqualsToken */ ||
+        if (expr.operatorToken.kind !== 60 /* EqualsToken */ ||
             !ts.isPropertyAccessExpression(expr.left)) {
             return 0 /* None */;
         }
@@ -10212,7 +10437,7 @@ var ts;
         return getAssignmentDeclarationPropertyAccessKind(lhs);
     }
     function getAssignmentDeclarationPropertyAccessKind(lhs) {
-        if (lhs.expression.kind === 100 /* ThisKeyword */) {
+        if (lhs.expression.kind === 101 /* ThisKeyword */) {
             return 4 /* ThisProperty */;
         }
         else if (isModuleExportsPropertyAccessExpression(lhs)) {
@@ -10254,7 +10479,7 @@ var ts;
     ts.isPrototypePropertyAssignment = isPrototypePropertyAssignment;
     function isSpecialPropertyDeclaration(expr) {
         return isInJSFile(expr) &&
-            expr.parent && expr.parent.kind === 221 /* ExpressionStatement */ &&
+            expr.parent && expr.parent.kind === 222 /* ExpressionStatement */ &&
             !!ts.getJSDocTypeTag(expr.parent);
     }
     ts.isSpecialPropertyDeclaration = isSpecialPropertyDeclaration;
@@ -10263,23 +10488,23 @@ var ts;
             return false;
         }
         var decl = symbol.valueDeclaration;
-        return decl.kind === 239 /* FunctionDeclaration */ || ts.isVariableDeclaration(decl) && decl.initializer && ts.isFunctionLike(decl.initializer);
+        return decl.kind === 240 /* FunctionDeclaration */ || ts.isVariableDeclaration(decl) && decl.initializer && ts.isFunctionLike(decl.initializer);
     }
     ts.isFunctionSymbol = isFunctionSymbol;
     function importFromModuleSpecifier(node) {
-        return tryGetImportFromModuleSpecifier(node) || ts.Debug.fail(ts.Debug.showSyntaxKind(node.parent));
+        return tryGetImportFromModuleSpecifier(node) || ts.Debug.failBadSyntaxKind(node.parent);
     }
     ts.importFromModuleSpecifier = importFromModuleSpecifier;
     function tryGetImportFromModuleSpecifier(node) {
         switch (node.parent.kind) {
-            case 249 /* ImportDeclaration */:
-            case 255 /* ExportDeclaration */:
+            case 250 /* ImportDeclaration */:
+            case 256 /* ExportDeclaration */:
                 return node.parent;
-            case 259 /* ExternalModuleReference */:
+            case 260 /* ExternalModuleReference */:
                 return node.parent.parent;
-            case 191 /* CallExpression */:
+            case 192 /* CallExpression */:
                 return isImportCall(node.parent) || isRequireCall(node.parent, /*checkArg*/ false) ? node.parent : undefined;
-            case 182 /* LiteralType */:
+            case 183 /* LiteralType */:
                 ts.Debug.assert(ts.isStringLiteral(node));
                 return ts.tryCast(node.parent.parent, ts.isImportTypeNode);
             default:
@@ -10289,12 +10514,12 @@ var ts;
     ts.tryGetImportFromModuleSpecifier = tryGetImportFromModuleSpecifier;
     function getExternalModuleName(node) {
         switch (node.kind) {
-            case 249 /* ImportDeclaration */:
-            case 255 /* ExportDeclaration */:
+            case 250 /* ImportDeclaration */:
+            case 256 /* ExportDeclaration */:
                 return node.moduleSpecifier;
-            case 248 /* ImportEqualsDeclaration */:
-                return node.moduleReference.kind === 259 /* ExternalModuleReference */ ? node.moduleReference.expression : undefined;
-            case 183 /* ImportType */:
+            case 249 /* ImportEqualsDeclaration */:
+                return node.moduleReference.kind === 260 /* ExternalModuleReference */ ? node.moduleReference.expression : undefined;
+            case 184 /* ImportType */:
                 return isLiteralImportTypeNode(node) ? node.argument.literal : undefined;
             default:
                 return ts.Debug.assertNever(node);
@@ -10303,11 +10528,11 @@ var ts;
     ts.getExternalModuleName = getExternalModuleName;
     function getNamespaceDeclarationNode(node) {
         switch (node.kind) {
-            case 249 /* ImportDeclaration */:
+            case 250 /* ImportDeclaration */:
                 return node.importClause && ts.tryCast(node.importClause.namedBindings, ts.isNamespaceImport);
-            case 248 /* ImportEqualsDeclaration */:
+            case 249 /* ImportEqualsDeclaration */:
                 return node;
-            case 255 /* ExportDeclaration */:
+            case 256 /* ExportDeclaration */:
                 return undefined;
             default:
                 return ts.Debug.assertNever(node);
@@ -10315,19 +10540,19 @@ var ts;
     }
     ts.getNamespaceDeclarationNode = getNamespaceDeclarationNode;
     function isDefaultImport(node) {
-        return node.kind === 249 /* ImportDeclaration */ && !!node.importClause && !!node.importClause.name;
+        return node.kind === 250 /* ImportDeclaration */ && !!node.importClause && !!node.importClause.name;
     }
     ts.isDefaultImport = isDefaultImport;
     function hasQuestionToken(node) {
         if (node) {
             switch (node.kind) {
-                case 151 /* Parameter */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
-                case 276 /* ShorthandPropertyAssignment */:
-                case 275 /* PropertyAssignment */:
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
+                case 152 /* Parameter */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
+                case 277 /* ShorthandPropertyAssignment */:
+                case 276 /* PropertyAssignment */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
                     return node.questionToken !== undefined;
             }
         }
@@ -10341,7 +10566,7 @@ var ts;
     }
     ts.isJSDocConstructSignature = isJSDocConstructSignature;
     function isJSDocTypeAlias(node) {
-        return node.kind === 309 /* JSDocTypedefTag */ || node.kind === 302 /* JSDocCallbackTag */;
+        return node.kind === 311 /* JSDocTypedefTag */ || node.kind === 304 /* JSDocCallbackTag */;
     }
     ts.isJSDocTypeAlias = isJSDocTypeAlias;
     function isTypeAlias(node) {
@@ -10351,7 +10576,7 @@ var ts;
     function getSourceOfAssignment(node) {
         return ts.isExpressionStatement(node) &&
             node.expression && ts.isBinaryExpression(node.expression) &&
-            node.expression.operatorToken.kind === 59 /* EqualsToken */
+            node.expression.operatorToken.kind === 60 /* EqualsToken */
             ? node.expression.right
             : undefined;
     }
@@ -10366,12 +10591,12 @@ var ts;
     }
     function getSingleInitializerOfVariableStatementOrPropertyDeclaration(node) {
         switch (node.kind) {
-            case 219 /* VariableStatement */:
+            case 220 /* VariableStatement */:
                 var v = getSingleVariableOfVariableStatement(node);
                 return v && v.initializer;
-            case 154 /* PropertyDeclaration */:
+            case 155 /* PropertyDeclaration */:
                 return node.initializer;
-            case 275 /* PropertyAssignment */:
+            case 276 /* PropertyAssignment */:
                 return node.initializer;
         }
     }
@@ -10382,7 +10607,7 @@ var ts;
     function getNestedModuleDeclaration(node) {
         return ts.isModuleDeclaration(node) &&
             node.body &&
-            node.body.kind === 244 /* ModuleDeclaration */
+            node.body.kind === 245 /* ModuleDeclaration */
             ? node.body
             : undefined;
     }
@@ -10390,18 +10615,18 @@ var ts;
         var result;
         // Pull parameter comments from declaring function as well
         if (isVariableLike(hostNode) && ts.hasInitializer(hostNode) && ts.hasJSDocNodes(hostNode.initializer)) {
-            result = ts.addRange(result, hostNode.initializer.jsDoc);
+            result = ts.append(result, ts.last(hostNode.initializer.jsDoc));
         }
         var node = hostNode;
         while (node && node.parent) {
             if (ts.hasJSDocNodes(node)) {
-                result = ts.addRange(result, node.jsDoc);
+                result = ts.append(result, ts.last(node.jsDoc));
             }
-            if (node.kind === 151 /* Parameter */) {
+            if (node.kind === 152 /* Parameter */) {
                 result = ts.addRange(result, ts.getJSDocParameterTags(node));
                 break;
             }
-            if (node.kind === 150 /* TypeParameter */) {
+            if (node.kind === 151 /* TypeParameter */) {
                 result = ts.addRange(result, ts.getJSDocTypeParameterTags(node));
                 break;
             }
@@ -10412,11 +10637,12 @@ var ts;
     ts.getJSDocCommentsAndTags = getJSDocCommentsAndTags;
     function getNextJSDocCommentLocation(node) {
         var parent = node.parent;
-        if (parent.kind === 275 /* PropertyAssignment */ ||
-            parent.kind === 154 /* PropertyDeclaration */ ||
-            parent.kind === 221 /* ExpressionStatement */ && node.kind === 189 /* PropertyAccessExpression */ ||
+        if (parent.kind === 276 /* PropertyAssignment */ ||
+            parent.kind === 255 /* ExportAssignment */ ||
+            parent.kind === 155 /* PropertyDeclaration */ ||
+            parent.kind === 222 /* ExpressionStatement */ && node.kind === 190 /* PropertyAccessExpression */ ||
             getNestedModuleDeclaration(parent) ||
-            ts.isBinaryExpression(node) && node.operatorToken.kind === 59 /* EqualsToken */) {
+            ts.isBinaryExpression(node) && node.operatorToken.kind === 60 /* EqualsToken */) {
             return parent;
         }
         // Try to recognize this pattern when node is initializer of variable declaration and JSDoc comments are on containing variable statement.
@@ -10427,7 +10653,7 @@ var ts;
         // var x = function(name) { return name.length; }
         else if (parent.parent &&
             (getSingleVariableOfVariableStatement(parent.parent) === node ||
-                ts.isBinaryExpression(parent) && parent.operatorToken.kind === 59 /* EqualsToken */)) {
+                ts.isBinaryExpression(parent) && parent.operatorToken.kind === 60 /* EqualsToken */)) {
             return parent.parent;
         }
         else if (parent.parent && parent.parent.parent &&
@@ -10450,7 +10676,7 @@ var ts;
         if (!decl) {
             return undefined;
         }
-        var parameter = ts.find(decl.parameters, function (p) { return p.name.kind === 72 /* Identifier */ && p.name.escapedText === name; });
+        var parameter = ts.find(decl.parameters, function (p) { return p.name.kind === 73 /* Identifier */ && p.name.escapedText === name; });
         return parameter && parameter.symbol;
     }
     ts.getParameterSymbolFromJSDoc = getParameterSymbolFromJSDoc;
@@ -10485,7 +10711,7 @@ var ts;
     ts.hasRestParameter = hasRestParameter;
     function isRestParameter(node) {
         var type = ts.isJSDocParameterTag(node) ? (node.typeExpression && node.typeExpression.type) : node.type;
-        return node.dotDotDotToken !== undefined || !!type && type.kind === 295 /* JSDocVariadicType */;
+        return node.dotDotDotToken !== undefined || !!type && type.kind === 296 /* JSDocVariadicType */;
     }
     ts.isRestParameter = isRestParameter;
     var AssignmentKind;
@@ -10498,31 +10724,31 @@ var ts;
         var parent = node.parent;
         while (true) {
             switch (parent.kind) {
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     var binaryOperator = parent.operatorToken.kind;
                     return isAssignmentOperator(binaryOperator) && parent.left === node ?
-                        binaryOperator === 59 /* EqualsToken */ ? 1 /* Definite */ : 2 /* Compound */ :
+                        binaryOperator === 60 /* EqualsToken */ ? 1 /* Definite */ : 2 /* Compound */ :
                         0 /* None */;
-                case 202 /* PrefixUnaryExpression */:
-                case 203 /* PostfixUnaryExpression */:
+                case 203 /* PrefixUnaryExpression */:
+                case 204 /* PostfixUnaryExpression */:
                     var unaryOperator = parent.operator;
                     return unaryOperator === 44 /* PlusPlusToken */ || unaryOperator === 45 /* MinusMinusToken */ ? 2 /* Compound */ : 0 /* None */;
-                case 226 /* ForInStatement */:
-                case 227 /* ForOfStatement */:
+                case 227 /* ForInStatement */:
+                case 228 /* ForOfStatement */:
                     return parent.initializer === node ? 1 /* Definite */ : 0 /* None */;
-                case 195 /* ParenthesizedExpression */:
-                case 187 /* ArrayLiteralExpression */:
-                case 208 /* SpreadElement */:
-                case 213 /* NonNullExpression */:
+                case 196 /* ParenthesizedExpression */:
+                case 188 /* ArrayLiteralExpression */:
+                case 209 /* SpreadElement */:
+                case 214 /* NonNullExpression */:
                     node = parent;
                     break;
-                case 276 /* ShorthandPropertyAssignment */:
+                case 277 /* ShorthandPropertyAssignment */:
                     if (parent.name !== node) {
                         return 0 /* None */;
                     }
                     node = parent.parent;
                     break;
-                case 275 /* PropertyAssignment */:
+                case 276 /* PropertyAssignment */:
                     if (parent.name === node) {
                         return 0 /* None */;
                     }
@@ -10549,22 +10775,22 @@ var ts;
      */
     function isNodeWithPossibleHoistedDeclaration(node) {
         switch (node.kind) {
-            case 218 /* Block */:
-            case 219 /* VariableStatement */:
-            case 231 /* WithStatement */:
-            case 222 /* IfStatement */:
-            case 232 /* SwitchStatement */:
-            case 246 /* CaseBlock */:
-            case 271 /* CaseClause */:
-            case 272 /* DefaultClause */:
-            case 233 /* LabeledStatement */:
-            case 225 /* ForStatement */:
-            case 226 /* ForInStatement */:
-            case 227 /* ForOfStatement */:
-            case 223 /* DoStatement */:
-            case 224 /* WhileStatement */:
-            case 235 /* TryStatement */:
-            case 274 /* CatchClause */:
+            case 219 /* Block */:
+            case 220 /* VariableStatement */:
+            case 232 /* WithStatement */:
+            case 223 /* IfStatement */:
+            case 233 /* SwitchStatement */:
+            case 247 /* CaseBlock */:
+            case 272 /* CaseClause */:
+            case 273 /* DefaultClause */:
+            case 234 /* LabeledStatement */:
+            case 226 /* ForStatement */:
+            case 227 /* ForInStatement */:
+            case 228 /* ForOfStatement */:
+            case 224 /* DoStatement */:
+            case 225 /* WhileStatement */:
+            case 236 /* TryStatement */:
+            case 275 /* CatchClause */:
                 return true;
         }
         return false;
@@ -10581,33 +10807,33 @@ var ts;
         return node;
     }
     function walkUpParenthesizedTypes(node) {
-        return walkUp(node, 177 /* ParenthesizedType */);
+        return walkUp(node, 178 /* ParenthesizedType */);
     }
     ts.walkUpParenthesizedTypes = walkUpParenthesizedTypes;
     function walkUpParenthesizedExpressions(node) {
-        return walkUp(node, 195 /* ParenthesizedExpression */);
+        return walkUp(node, 196 /* ParenthesizedExpression */);
     }
     ts.walkUpParenthesizedExpressions = walkUpParenthesizedExpressions;
     function skipParentheses(node) {
-        while (node.kind === 195 /* ParenthesizedExpression */) {
+        while (node.kind === 196 /* ParenthesizedExpression */) {
             node = node.expression;
         }
         return node;
     }
     ts.skipParentheses = skipParentheses;
     function skipParenthesesUp(node) {
-        while (node.kind === 195 /* ParenthesizedExpression */) {
+        while (node.kind === 196 /* ParenthesizedExpression */) {
             node = node.parent;
         }
         return node;
     }
     // a node is delete target iff. it is PropertyAccessExpression/ElementAccessExpression with parentheses skipped
     function isDeleteTarget(node) {
-        if (node.kind !== 189 /* PropertyAccessExpression */ && node.kind !== 190 /* ElementAccessExpression */) {
+        if (node.kind !== 190 /* PropertyAccessExpression */ && node.kind !== 191 /* ElementAccessExpression */) {
             return false;
         }
         node = walkUpParenthesizedExpressions(node.parent);
-        return node && node.kind === 198 /* DeleteExpression */;
+        return node && node.kind === 199 /* DeleteExpression */;
     }
     ts.isDeleteTarget = isDeleteTarget;
     function isNodeDescendantOf(node, ancestor) {
@@ -10633,7 +10859,7 @@ var ts;
                 if (ts.isComputedPropertyName(parent))
                     return parent.parent;
             // falls through
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 if (ts.isDeclaration(parent)) {
                     return parent.name === name ? parent : undefined;
                 }
@@ -10657,7 +10883,7 @@ var ts;
     ts.getDeclarationFromName = getDeclarationFromName;
     function isLiteralComputedPropertyDeclarationName(node) {
         return (node.kind === 10 /* StringLiteral */ || node.kind === 8 /* NumericLiteral */) &&
-            node.parent.kind === 149 /* ComputedPropertyName */ &&
+            node.parent.kind === 150 /* ComputedPropertyName */ &&
             ts.isDeclaration(node.parent.parent);
     }
     ts.isLiteralComputedPropertyDeclarationName = isLiteralComputedPropertyDeclarationName;
@@ -10665,32 +10891,32 @@ var ts;
     function isIdentifierName(node) {
         var parent = node.parent;
         switch (parent.kind) {
-            case 154 /* PropertyDeclaration */:
-            case 153 /* PropertySignature */:
-            case 156 /* MethodDeclaration */:
-            case 155 /* MethodSignature */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
-            case 278 /* EnumMember */:
-            case 275 /* PropertyAssignment */:
-            case 189 /* PropertyAccessExpression */:
+            case 155 /* PropertyDeclaration */:
+            case 154 /* PropertySignature */:
+            case 157 /* MethodDeclaration */:
+            case 156 /* MethodSignature */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
+            case 279 /* EnumMember */:
+            case 276 /* PropertyAssignment */:
+            case 190 /* PropertyAccessExpression */:
                 // Name in member declaration or property name in property access
                 return parent.name === node;
-            case 148 /* QualifiedName */:
+            case 149 /* QualifiedName */:
                 // Name on right hand side of dot in a type query or type reference
                 if (parent.right === node) {
-                    while (parent.kind === 148 /* QualifiedName */) {
+                    while (parent.kind === 149 /* QualifiedName */) {
                         parent = parent.parent;
                     }
-                    return parent.kind === 167 /* TypeQuery */ || parent.kind === 164 /* TypeReference */;
+                    return parent.kind === 168 /* TypeQuery */ || parent.kind === 165 /* TypeReference */;
                 }
                 return false;
-            case 186 /* BindingElement */:
-            case 253 /* ImportSpecifier */:
+            case 187 /* BindingElement */:
+            case 254 /* ImportSpecifier */:
                 // Property name in binding element or import specifier
                 return parent.propertyName === node;
-            case 257 /* ExportSpecifier */:
-            case 267 /* JsxAttribute */:
+            case 258 /* ExportSpecifier */:
+            case 268 /* JsxAttribute */:
                 // Any name in an export specifier or JSX Attribute
                 return true;
         }
@@ -10707,13 +10933,13 @@ var ts;
     // export default <EntityNameExpression>
     // module.exports = <EntityNameExpression>
     function isAliasSymbolDeclaration(node) {
-        return node.kind === 248 /* ImportEqualsDeclaration */ ||
-            node.kind === 247 /* NamespaceExportDeclaration */ ||
-            node.kind === 250 /* ImportClause */ && !!node.name ||
-            node.kind === 251 /* NamespaceImport */ ||
-            node.kind === 253 /* ImportSpecifier */ ||
-            node.kind === 257 /* ExportSpecifier */ ||
-            node.kind === 254 /* ExportAssignment */ && exportAssignmentIsAlias(node) ||
+        return node.kind === 249 /* ImportEqualsDeclaration */ ||
+            node.kind === 248 /* NamespaceExportDeclaration */ ||
+            node.kind === 251 /* ImportClause */ && !!node.name ||
+            node.kind === 252 /* NamespaceImport */ ||
+            node.kind === 254 /* ImportSpecifier */ ||
+            node.kind === 258 /* ExportSpecifier */ ||
+            node.kind === 255 /* ExportAssignment */ && exportAssignmentIsAlias(node) ||
             ts.isBinaryExpression(node) && getAssignmentDeclarationKind(node) === 2 /* ModuleExports */ && exportAssignmentIsAlias(node);
     }
     ts.isAliasSymbolDeclaration = isAliasSymbolDeclaration;
@@ -10735,12 +10961,12 @@ var ts;
     }
     ts.getEffectiveBaseTypeNode = getEffectiveBaseTypeNode;
     function getClassExtendsHeritageElement(node) {
-        var heritageClause = getHeritageClause(node.heritageClauses, 86 /* ExtendsKeyword */);
+        var heritageClause = getHeritageClause(node.heritageClauses, 87 /* ExtendsKeyword */);
         return heritageClause && heritageClause.types.length > 0 ? heritageClause.types[0] : undefined;
     }
     ts.getClassExtendsHeritageElement = getClassExtendsHeritageElement;
     function getClassImplementsHeritageClauseElements(node) {
-        var heritageClause = getHeritageClause(node.heritageClauses, 109 /* ImplementsKeyword */);
+        var heritageClause = getHeritageClause(node.heritageClauses, 110 /* ImplementsKeyword */);
         return heritageClause ? heritageClause.types : undefined;
     }
     ts.getClassImplementsHeritageClauseElements = getClassImplementsHeritageClauseElements;
@@ -10752,7 +10978,7 @@ var ts;
     }
     ts.getAllSuperTypeNodes = getAllSuperTypeNodes;
     function getInterfaceBaseTypeNodes(node) {
-        var heritageClause = getHeritageClause(node.heritageClauses, 86 /* ExtendsKeyword */);
+        var heritageClause = getHeritageClause(node.heritageClauses, 87 /* ExtendsKeyword */);
         return heritageClause ? heritageClause.types : undefined;
     }
     ts.getInterfaceBaseTypeNodes = getInterfaceBaseTypeNodes;
@@ -10768,13 +10994,6 @@ var ts;
         return undefined;
     }
     ts.getHeritageClause = getHeritageClause;
-    function tryResolveScriptReference(host, sourceFile, reference) {
-        if (!host.getCompilerOptions().noResolve) {
-            var referenceFileName = ts.isRootedDiskPath(reference.fileName) ? reference.fileName : ts.combinePaths(ts.getDirectoryPath(sourceFile.fileName), reference.fileName);
-            return host.getSourceFile(referenceFileName);
-        }
-    }
-    ts.tryResolveScriptReference = tryResolveScriptReference;
     function getAncestor(node, kind) {
         while (node) {
             if (node.kind === kind) {
@@ -10786,11 +11005,11 @@ var ts;
     }
     ts.getAncestor = getAncestor;
     function isKeyword(token) {
-        return 73 /* FirstKeyword */ <= token && token <= 147 /* LastKeyword */;
+        return 74 /* FirstKeyword */ <= token && token <= 148 /* LastKeyword */;
     }
     ts.isKeyword = isKeyword;
     function isContextualKeyword(token) {
-        return 118 /* FirstContextualKeyword */ <= token && token <= 147 /* LastContextualKeyword */;
+        return 119 /* FirstContextualKeyword */ <= token && token <= 148 /* LastContextualKeyword */;
     }
     ts.isContextualKeyword = isContextualKeyword;
     function isNonContextualKeyword(token) {
@@ -10825,14 +11044,14 @@ var ts;
         }
         var flags = 0 /* Normal */;
         switch (node.kind) {
-            case 239 /* FunctionDeclaration */:
-            case 196 /* FunctionExpression */:
-            case 156 /* MethodDeclaration */:
+            case 240 /* FunctionDeclaration */:
+            case 197 /* FunctionExpression */:
+            case 157 /* MethodDeclaration */:
                 if (node.asteriskToken) {
                     flags |= 1 /* Generator */;
                 }
             // falls through
-            case 197 /* ArrowFunction */:
+            case 198 /* ArrowFunction */:
                 if (hasModifier(node, 256 /* Async */)) {
                     flags |= 2 /* Async */;
                 }
@@ -10846,10 +11065,10 @@ var ts;
     ts.getFunctionFlags = getFunctionFlags;
     function isAsyncFunction(node) {
         switch (node.kind) {
-            case 239 /* FunctionDeclaration */:
-            case 196 /* FunctionExpression */:
-            case 197 /* ArrowFunction */:
-            case 156 /* MethodDeclaration */:
+            case 240 /* FunctionDeclaration */:
+            case 197 /* FunctionExpression */:
+            case 198 /* ArrowFunction */:
+            case 157 /* MethodDeclaration */:
                 return node.body !== undefined
                     && node.asteriskToken === undefined
                     && hasModifier(node, 256 /* Async */);
@@ -10861,11 +11080,19 @@ var ts;
         return ts.isStringLiteralLike(node) || ts.isNumericLiteral(node);
     }
     ts.isStringOrNumericLiteralLike = isStringOrNumericLiteralLike;
+    function isSignedNumericLiteral(node) {
+        return ts.isPrefixUnaryExpression(node) && (node.operator === 38 /* PlusToken */ || node.operator === 39 /* MinusToken */) && ts.isNumericLiteral(node.operand);
+    }
+    ts.isSignedNumericLiteral = isSignedNumericLiteral;
     /**
-     * A declaration has a dynamic name if both of the following are true:
-     *   1. The declaration has a computed property name
-     *   2. The computed name is *not* expressed as Symbol.<name>, where name
-     *      is a property of the Symbol constructor that denotes a built in
+     * A declaration has a dynamic name if all of the following are true:
+     *   1. The declaration has a computed property name.
+     *   2. The computed name is *not* expressed as a StringLiteral.
+     *   3. The computed name is *not* expressed as a NumericLiteral.
+     *   4. The computed name is *not* expressed as a PlusToken or MinusToken
+     *      immediately followed by a NumericLiteral.
+     *   5. The computed name is *not* expressed as `Symbol.<name>`, where `<name>`
+     *      is a property of the Symbol constructor that denotes a built-in
      *      Symbol.
      */
     function hasDynamicName(declaration) {
@@ -10874,8 +11101,9 @@ var ts;
     }
     ts.hasDynamicName = hasDynamicName;
     function isDynamicName(name) {
-        return name.kind === 149 /* ComputedPropertyName */ &&
+        return name.kind === 150 /* ComputedPropertyName */ &&
             !isStringOrNumericLiteralLike(name.expression) &&
+            !isSignedNumericLiteral(name.expression) &&
             !isWellKnownSymbolSyntactically(name.expression);
     }
     ts.isDynamicName = isDynamicName;
@@ -10890,12 +11118,12 @@ var ts;
     ts.isWellKnownSymbolSyntactically = isWellKnownSymbolSyntactically;
     function getPropertyNameForPropertyNameNode(name) {
         switch (name.kind) {
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 return name.escapedText;
             case 10 /* StringLiteral */:
             case 8 /* NumericLiteral */:
                 return ts.escapeLeadingUnderscores(name.text);
-            case 149 /* ComputedPropertyName */:
+            case 150 /* ComputedPropertyName */:
                 var nameExpression = name.expression;
                 if (isWellKnownSymbolSyntactically(nameExpression)) {
                     return getPropertyNameForKnownSymbolName(ts.idText(nameExpression.name));
@@ -10911,7 +11139,7 @@ var ts;
     ts.getPropertyNameForPropertyNameNode = getPropertyNameForPropertyNameNode;
     function isPropertyNameLiteral(node) {
         switch (node.kind) {
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
             case 10 /* StringLiteral */:
             case 14 /* NoSubstitutionTemplateLiteral */:
             case 8 /* NumericLiteral */:
@@ -10922,11 +11150,11 @@ var ts;
     }
     ts.isPropertyNameLiteral = isPropertyNameLiteral;
     function getTextOfIdentifierOrLiteral(node) {
-        return node.kind === 72 /* Identifier */ ? ts.idText(node) : node.text;
+        return node.kind === 73 /* Identifier */ ? ts.idText(node) : node.text;
     }
     ts.getTextOfIdentifierOrLiteral = getTextOfIdentifierOrLiteral;
     function getEscapedTextOfIdentifierOrLiteral(node) {
-        return node.kind === 72 /* Identifier */ ? node.escapedText : ts.escapeLeadingUnderscores(node.text);
+        return node.kind === 73 /* Identifier */ ? node.escapedText : ts.escapeLeadingUnderscores(node.text);
     }
     ts.getEscapedTextOfIdentifierOrLiteral = getEscapedTextOfIdentifierOrLiteral;
     function getPropertyNameForKnownSymbolName(symbolName) {
@@ -10941,7 +11169,7 @@ var ts;
      * Includes the word "Symbol" with unicode escapes
      */
     function isESSymbolIdentifier(node) {
-        return node.kind === 72 /* Identifier */ && node.escapedText === "Symbol";
+        return node.kind === 73 /* Identifier */ && node.escapedText === "Symbol";
     }
     ts.isESSymbolIdentifier = isESSymbolIdentifier;
     function isPushOrUnshiftIdentifier(node) {
@@ -10950,11 +11178,11 @@ var ts;
     ts.isPushOrUnshiftIdentifier = isPushOrUnshiftIdentifier;
     function isParameterDeclaration(node) {
         var root = getRootDeclaration(node);
-        return root.kind === 151 /* Parameter */;
+        return root.kind === 152 /* Parameter */;
     }
     ts.isParameterDeclaration = isParameterDeclaration;
     function getRootDeclaration(node) {
-        while (node.kind === 186 /* BindingElement */) {
+        while (node.kind === 187 /* BindingElement */) {
             node = node.parent.parent;
         }
         return node;
@@ -10962,15 +11190,15 @@ var ts;
     ts.getRootDeclaration = getRootDeclaration;
     function nodeStartsNewLexicalEnvironment(node) {
         var kind = node.kind;
-        return kind === 157 /* Constructor */
-            || kind === 196 /* FunctionExpression */
-            || kind === 239 /* FunctionDeclaration */
-            || kind === 197 /* ArrowFunction */
-            || kind === 156 /* MethodDeclaration */
-            || kind === 158 /* GetAccessor */
-            || kind === 159 /* SetAccessor */
-            || kind === 244 /* ModuleDeclaration */
-            || kind === 284 /* SourceFile */;
+        return kind === 158 /* Constructor */
+            || kind === 197 /* FunctionExpression */
+            || kind === 240 /* FunctionDeclaration */
+            || kind === 198 /* ArrowFunction */
+            || kind === 157 /* MethodDeclaration */
+            || kind === 159 /* GetAccessor */
+            || kind === 160 /* SetAccessor */
+            || kind === 245 /* ModuleDeclaration */
+            || kind === 285 /* SourceFile */;
     }
     ts.nodeStartsNewLexicalEnvironment = nodeStartsNewLexicalEnvironment;
     function nodeIsSynthesized(range) {
@@ -10989,38 +11217,38 @@ var ts;
     })(Associativity = ts.Associativity || (ts.Associativity = {}));
     function getExpressionAssociativity(expression) {
         var operator = getOperator(expression);
-        var hasArguments = expression.kind === 192 /* NewExpression */ && expression.arguments !== undefined;
+        var hasArguments = expression.kind === 193 /* NewExpression */ && expression.arguments !== undefined;
         return getOperatorAssociativity(expression.kind, operator, hasArguments);
     }
     ts.getExpressionAssociativity = getExpressionAssociativity;
     function getOperatorAssociativity(kind, operator, hasArguments) {
         switch (kind) {
-            case 192 /* NewExpression */:
+            case 193 /* NewExpression */:
                 return hasArguments ? 0 /* Left */ : 1 /* Right */;
-            case 202 /* PrefixUnaryExpression */:
-            case 199 /* TypeOfExpression */:
-            case 200 /* VoidExpression */:
-            case 198 /* DeleteExpression */:
-            case 201 /* AwaitExpression */:
-            case 205 /* ConditionalExpression */:
-            case 207 /* YieldExpression */:
+            case 203 /* PrefixUnaryExpression */:
+            case 200 /* TypeOfExpression */:
+            case 201 /* VoidExpression */:
+            case 199 /* DeleteExpression */:
+            case 202 /* AwaitExpression */:
+            case 206 /* ConditionalExpression */:
+            case 208 /* YieldExpression */:
                 return 1 /* Right */;
-            case 204 /* BinaryExpression */:
+            case 205 /* BinaryExpression */:
                 switch (operator) {
                     case 41 /* AsteriskAsteriskToken */:
-                    case 59 /* EqualsToken */:
-                    case 60 /* PlusEqualsToken */:
-                    case 61 /* MinusEqualsToken */:
-                    case 63 /* AsteriskAsteriskEqualsToken */:
-                    case 62 /* AsteriskEqualsToken */:
-                    case 64 /* SlashEqualsToken */:
-                    case 65 /* PercentEqualsToken */:
-                    case 66 /* LessThanLessThanEqualsToken */:
-                    case 67 /* GreaterThanGreaterThanEqualsToken */:
-                    case 68 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
-                    case 69 /* AmpersandEqualsToken */:
-                    case 71 /* CaretEqualsToken */:
-                    case 70 /* BarEqualsToken */:
+                    case 60 /* EqualsToken */:
+                    case 61 /* PlusEqualsToken */:
+                    case 62 /* MinusEqualsToken */:
+                    case 64 /* AsteriskAsteriskEqualsToken */:
+                    case 63 /* AsteriskEqualsToken */:
+                    case 65 /* SlashEqualsToken */:
+                    case 66 /* PercentEqualsToken */:
+                    case 67 /* LessThanLessThanEqualsToken */:
+                    case 68 /* GreaterThanGreaterThanEqualsToken */:
+                    case 69 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
+                    case 70 /* AmpersandEqualsToken */:
+                    case 72 /* CaretEqualsToken */:
+                    case 71 /* BarEqualsToken */:
                         return 1 /* Right */;
                 }
         }
@@ -11029,15 +11257,15 @@ var ts;
     ts.getOperatorAssociativity = getOperatorAssociativity;
     function getExpressionPrecedence(expression) {
         var operator = getOperator(expression);
-        var hasArguments = expression.kind === 192 /* NewExpression */ && expression.arguments !== undefined;
+        var hasArguments = expression.kind === 193 /* NewExpression */ && expression.arguments !== undefined;
         return getOperatorPrecedence(expression.kind, operator, hasArguments);
     }
     ts.getExpressionPrecedence = getExpressionPrecedence;
     function getOperator(expression) {
-        if (expression.kind === 204 /* BinaryExpression */) {
+        if (expression.kind === 205 /* BinaryExpression */) {
             return expression.operatorToken.kind;
         }
-        else if (expression.kind === 202 /* PrefixUnaryExpression */ || expression.kind === 203 /* PostfixUnaryExpression */) {
+        else if (expression.kind === 203 /* PrefixUnaryExpression */ || expression.kind === 204 /* PostfixUnaryExpression */) {
             return expression.operator;
         }
         else {
@@ -11047,73 +11275,73 @@ var ts;
     ts.getOperator = getOperator;
     function getOperatorPrecedence(nodeKind, operatorKind, hasArguments) {
         switch (nodeKind) {
-            case 314 /* CommaListExpression */:
+            case 316 /* CommaListExpression */:
                 return 0;
-            case 208 /* SpreadElement */:
+            case 209 /* SpreadElement */:
                 return 1;
-            case 207 /* YieldExpression */:
+            case 208 /* YieldExpression */:
                 return 2;
-            case 205 /* ConditionalExpression */:
+            case 206 /* ConditionalExpression */:
                 return 4;
-            case 204 /* BinaryExpression */:
+            case 205 /* BinaryExpression */:
                 switch (operatorKind) {
                     case 27 /* CommaToken */:
                         return 0;
-                    case 59 /* EqualsToken */:
-                    case 60 /* PlusEqualsToken */:
-                    case 61 /* MinusEqualsToken */:
-                    case 63 /* AsteriskAsteriskEqualsToken */:
-                    case 62 /* AsteriskEqualsToken */:
-                    case 64 /* SlashEqualsToken */:
-                    case 65 /* PercentEqualsToken */:
-                    case 66 /* LessThanLessThanEqualsToken */:
-                    case 67 /* GreaterThanGreaterThanEqualsToken */:
-                    case 68 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
-                    case 69 /* AmpersandEqualsToken */:
-                    case 71 /* CaretEqualsToken */:
-                    case 70 /* BarEqualsToken */:
+                    case 60 /* EqualsToken */:
+                    case 61 /* PlusEqualsToken */:
+                    case 62 /* MinusEqualsToken */:
+                    case 64 /* AsteriskAsteriskEqualsToken */:
+                    case 63 /* AsteriskEqualsToken */:
+                    case 65 /* SlashEqualsToken */:
+                    case 66 /* PercentEqualsToken */:
+                    case 67 /* LessThanLessThanEqualsToken */:
+                    case 68 /* GreaterThanGreaterThanEqualsToken */:
+                    case 69 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
+                    case 70 /* AmpersandEqualsToken */:
+                    case 72 /* CaretEqualsToken */:
+                    case 71 /* BarEqualsToken */:
                         return 3;
                     default:
                         return getBinaryOperatorPrecedence(operatorKind);
                 }
-            case 202 /* PrefixUnaryExpression */:
-            case 199 /* TypeOfExpression */:
-            case 200 /* VoidExpression */:
-            case 198 /* DeleteExpression */:
-            case 201 /* AwaitExpression */:
+            case 203 /* PrefixUnaryExpression */:
+            case 200 /* TypeOfExpression */:
+            case 201 /* VoidExpression */:
+            case 199 /* DeleteExpression */:
+            case 202 /* AwaitExpression */:
                 return 16;
-            case 203 /* PostfixUnaryExpression */:
+            case 204 /* PostfixUnaryExpression */:
                 return 17;
-            case 191 /* CallExpression */:
+            case 192 /* CallExpression */:
                 return 18;
-            case 192 /* NewExpression */:
+            case 193 /* NewExpression */:
                 return hasArguments ? 19 : 18;
-            case 193 /* TaggedTemplateExpression */:
-            case 189 /* PropertyAccessExpression */:
-            case 190 /* ElementAccessExpression */:
+            case 194 /* TaggedTemplateExpression */:
+            case 190 /* PropertyAccessExpression */:
+            case 191 /* ElementAccessExpression */:
                 return 19;
-            case 100 /* ThisKeyword */:
-            case 98 /* SuperKeyword */:
-            case 72 /* Identifier */:
-            case 96 /* NullKeyword */:
-            case 102 /* TrueKeyword */:
-            case 87 /* FalseKeyword */:
+            case 101 /* ThisKeyword */:
+            case 99 /* SuperKeyword */:
+            case 73 /* Identifier */:
+            case 97 /* NullKeyword */:
+            case 103 /* TrueKeyword */:
+            case 88 /* FalseKeyword */:
             case 8 /* NumericLiteral */:
             case 9 /* BigIntLiteral */:
             case 10 /* StringLiteral */:
-            case 187 /* ArrayLiteralExpression */:
-            case 188 /* ObjectLiteralExpression */:
-            case 196 /* FunctionExpression */:
-            case 197 /* ArrowFunction */:
-            case 209 /* ClassExpression */:
-            case 260 /* JsxElement */:
-            case 261 /* JsxSelfClosingElement */:
-            case 264 /* JsxFragment */:
+            case 188 /* ArrayLiteralExpression */:
+            case 189 /* ObjectLiteralExpression */:
+            case 197 /* FunctionExpression */:
+            case 198 /* ArrowFunction */:
+            case 210 /* ClassExpression */:
+            case 261 /* JsxElement */:
+            case 262 /* JsxSelfClosingElement */:
+            case 265 /* JsxFragment */:
             case 13 /* RegularExpressionLiteral */:
             case 14 /* NoSubstitutionTemplateLiteral */:
-            case 206 /* TemplateExpression */:
-            case 195 /* ParenthesizedExpression */:
-            case 210 /* OmittedExpression */:
+            case 207 /* TemplateExpression */:
+            case 196 /* ParenthesizedExpression */:
+            case 211 /* OmittedExpression */:
                 return 20;
             default:
                 return -1;
@@ -11141,9 +11369,9 @@ var ts;
             case 30 /* GreaterThanToken */:
             case 31 /* LessThanEqualsToken */:
             case 32 /* GreaterThanEqualsToken */:
-            case 94 /* InstanceOfKeyword */:
-            case 93 /* InKeyword */:
-            case 119 /* AsKeyword */:
+            case 95 /* InstanceOfKeyword */:
+            case 94 /* InKeyword */:
+            case 120 /* AsKeyword */:
                 return 11;
             case 46 /* LessThanLessThanToken */:
             case 47 /* GreaterThanGreaterThanToken */:
@@ -11268,6 +11496,23 @@ var ts;
         return s.replace(escapedCharsRegExp, getReplacement);
     }
     ts.escapeString = escapeString;
+    /**
+     * Strip off existed single quotes or double quotes from a given string
+     *
+     * @return non-quoted string
+     */
+    function stripQuotes(name) {
+        var length = name.length;
+        if (length >= 2 && name.charCodeAt(0) === name.charCodeAt(length - 1) && startsWithQuote(name)) {
+            return name.substring(1, length - 1);
+        }
+        return name;
+    }
+    ts.stripQuotes = stripQuotes;
+    function startsWithQuote(name) {
+        return isSingleOrDoubleQuote(name.charCodeAt(0));
+    }
+    ts.startsWithQuote = startsWithQuote;
     function getReplacement(c, offset, input) {
         if (c.charCodeAt(0) === 0 /* nullCharacter */) {
             var lookAhead = input.charCodeAt(offset + c.length);
@@ -11526,23 +11771,27 @@ var ts;
     function getSourceFilesToEmit(host, targetSourceFile) {
         var options = host.getCompilerOptions();
         var isSourceFileFromExternalLibrary = function (file) { return host.isSourceFileFromExternalLibrary(file); };
+        var getResolvedProjectReferenceToRedirect = function (fileName) { return host.getResolvedProjectReferenceToRedirect(fileName); };
         if (options.outFile || options.out) {
             var moduleKind = ts.getEmitModuleKind(options);
             var moduleEmitEnabled_1 = options.emitDeclarationOnly || moduleKind === ts.ModuleKind.AMD || moduleKind === ts.ModuleKind.System;
             // Can emit only sources that are not declaration file and are either non module code or module with --module or --target es6 specified
             return ts.filter(host.getSourceFiles(), function (sourceFile) {
-                return (moduleEmitEnabled_1 || !ts.isExternalModule(sourceFile)) && sourceFileMayBeEmitted(sourceFile, options, isSourceFileFromExternalLibrary);
+                return (moduleEmitEnabled_1 || !ts.isExternalModule(sourceFile)) && sourceFileMayBeEmitted(sourceFile, options, isSourceFileFromExternalLibrary, getResolvedProjectReferenceToRedirect);
             });
         }
         else {
             var sourceFiles = targetSourceFile === undefined ? host.getSourceFiles() : [targetSourceFile];
-            return ts.filter(sourceFiles, function (sourceFile) { return sourceFileMayBeEmitted(sourceFile, options, isSourceFileFromExternalLibrary); });
+            return ts.filter(sourceFiles, function (sourceFile) { return sourceFileMayBeEmitted(sourceFile, options, isSourceFileFromExternalLibrary, getResolvedProjectReferenceToRedirect); });
         }
     }
     ts.getSourceFilesToEmit = getSourceFilesToEmit;
     /** Don't call this for `--outFile`, just for `--outDir` or plain emit. `--outFile` needs additional checks. */
-    function sourceFileMayBeEmitted(sourceFile, options, isSourceFileFromExternalLibrary) {
-        return !(options.noEmitForJsFiles && isSourceFileJS(sourceFile)) && !sourceFile.isDeclarationFile && !isSourceFileFromExternalLibrary(sourceFile);
+    function sourceFileMayBeEmitted(sourceFile, options, isSourceFileFromExternalLibrary, getResolvedProjectReferenceToRedirect) {
+        return !(options.noEmitForJsFiles && isSourceFileJS(sourceFile)) &&
+            !sourceFile.isDeclarationFile &&
+            !isSourceFileFromExternalLibrary(sourceFile) &&
+            !(isJsonSourceFile(sourceFile) && getResolvedProjectReferenceToRedirect(sourceFile.fileName));
     }
     ts.sourceFileMayBeEmitted = sourceFileMayBeEmitted;
     function getSourceFilePathInNewDir(fileName, host, newDirPath) {
@@ -11601,11 +11850,11 @@ var ts;
     }
     ts.parameterIsThisKeyword = parameterIsThisKeyword;
     function isThisIdentifier(node) {
-        return !!node && node.kind === 72 /* Identifier */ && identifierIsThisKeyword(node);
+        return !!node && node.kind === 73 /* Identifier */ && identifierIsThisKeyword(node);
     }
     ts.isThisIdentifier = isThisIdentifier;
     function identifierIsThisKeyword(id) {
-        return id.originalKeywordKind === 100 /* ThisKeyword */;
+        return id.originalKeywordKind === 101 /* ThisKeyword */;
     }
     ts.identifierIsThisKeyword = identifierIsThisKeyword;
     function getAllAccessorDeclarations(declarations, accessor) {
@@ -11616,10 +11865,10 @@ var ts;
         var setAccessor;
         if (hasDynamicName(accessor)) {
             firstAccessor = accessor;
-            if (accessor.kind === 158 /* GetAccessor */) {
+            if (accessor.kind === 159 /* GetAccessor */) {
                 getAccessor = accessor;
             }
-            else if (accessor.kind === 159 /* SetAccessor */) {
+            else if (accessor.kind === 160 /* SetAccessor */) {
                 setAccessor = accessor;
             }
             else {
@@ -11639,10 +11888,10 @@ var ts;
                         else if (!secondAccessor) {
                             secondAccessor = member;
                         }
-                        if (member.kind === 158 /* GetAccessor */ && !getAccessor) {
+                        if (member.kind === 159 /* GetAccessor */ && !getAccessor) {
                             getAccessor = member;
                         }
-                        if (member.kind === 159 /* SetAccessor */ && !setAccessor) {
+                        if (member.kind === 160 /* SetAccessor */ && !setAccessor) {
                             setAccessor = member;
                         }
                     }
@@ -11688,7 +11937,7 @@ var ts;
     ts.getJSDocTypeParameterDeclarations = getJSDocTypeParameterDeclarations;
     /** template tags are only available when a typedef isn't already using them */
     function isNonTypeAliasTemplate(tag) {
-        return ts.isJSDocTemplateTag(tag) && !(tag.parent.kind === 296 /* JSDocComment */ && tag.parent.tags.some(isJSDocTypeAlias));
+        return ts.isJSDocTemplateTag(tag) && !(tag.parent.kind === 297 /* JSDocComment */ && tag.parent.tags.some(isJSDocTypeAlias));
     }
     /**
      * Gets the effective type annotation of the value parameter of a set accessor. If the node
@@ -11928,7 +12177,7 @@ var ts;
                 flags |= modifierToFlag(modifier.kind);
             }
         }
-        if (node.flags & 4 /* NestedNamespace */ || (node.kind === 72 /* Identifier */ && node.isInJSDocNamespace)) {
+        if (node.flags & 4 /* NestedNamespace */ || (node.kind === 73 /* Identifier */ && node.isInJSDocNamespace)) {
             flags |= 1 /* Export */;
         }
         return flags;
@@ -11936,17 +12185,17 @@ var ts;
     ts.getModifierFlagsNoCache = getModifierFlagsNoCache;
     function modifierToFlag(token) {
         switch (token) {
-            case 116 /* StaticKeyword */: return 32 /* Static */;
-            case 115 /* PublicKeyword */: return 4 /* Public */;
-            case 114 /* ProtectedKeyword */: return 16 /* Protected */;
-            case 113 /* PrivateKeyword */: return 8 /* Private */;
-            case 118 /* AbstractKeyword */: return 128 /* Abstract */;
-            case 85 /* ExportKeyword */: return 1 /* Export */;
-            case 125 /* DeclareKeyword */: return 2 /* Ambient */;
-            case 77 /* ConstKeyword */: return 2048 /* Const */;
-            case 80 /* DefaultKeyword */: return 512 /* Default */;
-            case 121 /* AsyncKeyword */: return 256 /* Async */;
-            case 133 /* ReadonlyKeyword */: return 64 /* Readonly */;
+            case 117 /* StaticKeyword */: return 32 /* Static */;
+            case 116 /* PublicKeyword */: return 4 /* Public */;
+            case 115 /* ProtectedKeyword */: return 16 /* Protected */;
+            case 114 /* PrivateKeyword */: return 8 /* Private */;
+            case 119 /* AbstractKeyword */: return 128 /* Abstract */;
+            case 86 /* ExportKeyword */: return 1 /* Export */;
+            case 126 /* DeclareKeyword */: return 2 /* Ambient */;
+            case 78 /* ConstKeyword */: return 2048 /* Const */;
+            case 81 /* DefaultKeyword */: return 512 /* Default */;
+            case 122 /* AsyncKeyword */: return 256 /* Async */;
+            case 134 /* ReadonlyKeyword */: return 64 /* Readonly */;
         }
         return 0 /* None */;
     }
@@ -11958,7 +12207,7 @@ var ts;
     }
     ts.isLogicalOperator = isLogicalOperator;
     function isAssignmentOperator(token) {
-        return token >= 59 /* FirstAssignment */ && token <= 71 /* LastAssignment */;
+        return token >= 60 /* FirstAssignment */ && token <= 72 /* LastAssignment */;
     }
     ts.isAssignmentOperator = isAssignmentOperator;
     /** Get `C` given `N` if `N` is in the position `class C extends N` where `N` is an ExpressionWithTypeArguments. */
@@ -11971,14 +12220,14 @@ var ts;
         return ts.isExpressionWithTypeArguments(node)
             && ts.isHeritageClause(node.parent)
             && ts.isClassLike(node.parent.parent)
-            ? { class: node.parent.parent, isImplements: node.parent.token === 109 /* ImplementsKeyword */ }
+            ? { class: node.parent.parent, isImplements: node.parent.token === 110 /* ImplementsKeyword */ }
             : undefined;
     }
     ts.tryGetClassImplementingOrExtendingExpressionWithTypeArguments = tryGetClassImplementingOrExtendingExpressionWithTypeArguments;
     function isAssignmentExpression(node, excludeCompoundAssignment) {
         return ts.isBinaryExpression(node)
             && (excludeCompoundAssignment
-                ? node.operatorToken.kind === 59 /* EqualsToken */
+                ? node.operatorToken.kind === 60 /* EqualsToken */
                 : isAssignmentOperator(node.operatorToken.kind))
             && ts.isLeftHandSideExpression(node.left);
     }
@@ -11986,8 +12235,8 @@ var ts;
     function isDestructuringAssignment(node) {
         if (isAssignmentExpression(node, /*excludeCompoundAssignment*/ true)) {
             var kind = node.left.kind;
-            return kind === 188 /* ObjectLiteralExpression */
-                || kind === 187 /* ArrayLiteralExpression */;
+            return kind === 189 /* ObjectLiteralExpression */
+                || kind === 188 /* ArrayLiteralExpression */;
         }
         return false;
     }
@@ -11997,29 +12246,39 @@ var ts;
     }
     ts.isExpressionWithTypeArgumentsInClassExtendsClause = isExpressionWithTypeArgumentsInClassExtendsClause;
     function isEntityNameExpression(node) {
-        return node.kind === 72 /* Identifier */ || isPropertyAccessEntityNameExpression(node);
+        return node.kind === 73 /* Identifier */ || isPropertyAccessEntityNameExpression(node);
     }
     ts.isEntityNameExpression = isEntityNameExpression;
     function isPropertyAccessEntityNameExpression(node) {
         return ts.isPropertyAccessExpression(node) && isEntityNameExpression(node.expression);
     }
     ts.isPropertyAccessEntityNameExpression = isPropertyAccessEntityNameExpression;
+    function tryGetPropertyAccessOrIdentifierToString(expr) {
+        if (ts.isPropertyAccessExpression(expr)) {
+            return tryGetPropertyAccessOrIdentifierToString(expr.expression) + "." + expr.name;
+        }
+        if (ts.isIdentifier(expr)) {
+            return ts.unescapeLeadingUnderscores(expr.escapedText);
+        }
+        return undefined;
+    }
+    ts.tryGetPropertyAccessOrIdentifierToString = tryGetPropertyAccessOrIdentifierToString;
     function isPrototypeAccess(node) {
         return ts.isPropertyAccessExpression(node) && node.name.escapedText === "prototype";
     }
     ts.isPrototypeAccess = isPrototypeAccess;
     function isRightSideOfQualifiedNameOrPropertyAccess(node) {
-        return (node.parent.kind === 148 /* QualifiedName */ && node.parent.right === node) ||
-            (node.parent.kind === 189 /* PropertyAccessExpression */ && node.parent.name === node);
+        return (node.parent.kind === 149 /* QualifiedName */ && node.parent.right === node) ||
+            (node.parent.kind === 190 /* PropertyAccessExpression */ && node.parent.name === node);
     }
     ts.isRightSideOfQualifiedNameOrPropertyAccess = isRightSideOfQualifiedNameOrPropertyAccess;
     function isEmptyObjectLiteral(expression) {
-        return expression.kind === 188 /* ObjectLiteralExpression */ &&
+        return expression.kind === 189 /* ObjectLiteralExpression */ &&
             expression.properties.length === 0;
     }
     ts.isEmptyObjectLiteral = isEmptyObjectLiteral;
     function isEmptyArrayLiteral(expression) {
-        return expression.kind === 187 /* ArrayLiteralExpression */ &&
+        return expression.kind === 188 /* ArrayLiteralExpression */ &&
             expression.elements.length === 0;
     }
     ts.isEmptyArrayLiteral = isEmptyArrayLiteral;
@@ -12207,77 +12466,6 @@ var ts;
         return getNewLine ? getNewLine() : ts.sys ? ts.sys.newLine : carriageReturnLineFeed;
     }
     ts.getNewLineCharacter = getNewLineCharacter;
-    /**
-     * Formats an enum value as a string for debugging and debug assertions.
-     */
-    function formatEnum(value, enumObject, isFlags) {
-        if (value === void 0) { value = 0; }
-        var members = getEnumMembers(enumObject);
-        if (value === 0) {
-            return members.length > 0 && members[0][0] === 0 ? members[0][1] : "0";
-        }
-        if (isFlags) {
-            var result = "";
-            var remainingFlags = value;
-            for (var i = members.length - 1; i >= 0 && remainingFlags !== 0; i--) {
-                var _a = members[i], enumValue = _a[0], enumName = _a[1];
-                if (enumValue !== 0 && (remainingFlags & enumValue) === enumValue) {
-                    remainingFlags &= ~enumValue;
-                    result = "" + enumName + (result ? ", " : "") + result;
-                }
-            }
-            if (remainingFlags === 0) {
-                return result;
-            }
-        }
-        else {
-            for (var _i = 0, members_1 = members; _i < members_1.length; _i++) {
-                var _b = members_1[_i], enumValue = _b[0], enumName = _b[1];
-                if (enumValue === value) {
-                    return enumName;
-                }
-            }
-        }
-        return value.toString();
-    }
-    function getEnumMembers(enumObject) {
-        var result = [];
-        for (var name in enumObject) {
-            var value = enumObject[name];
-            if (typeof value === "number") {
-                result.push([value, name]);
-            }
-        }
-        return ts.stableSort(result, function (x, y) { return ts.compareValues(x[0], y[0]); });
-    }
-    function formatSyntaxKind(kind) {
-        return formatEnum(kind, ts.SyntaxKind, /*isFlags*/ false);
-    }
-    ts.formatSyntaxKind = formatSyntaxKind;
-    function formatModifierFlags(flags) {
-        return formatEnum(flags, ts.ModifierFlags, /*isFlags*/ true);
-    }
-    ts.formatModifierFlags = formatModifierFlags;
-    function formatTransformFlags(flags) {
-        return formatEnum(flags, ts.TransformFlags, /*isFlags*/ true);
-    }
-    ts.formatTransformFlags = formatTransformFlags;
-    function formatEmitFlags(flags) {
-        return formatEnum(flags, ts.EmitFlags, /*isFlags*/ true);
-    }
-    ts.formatEmitFlags = formatEmitFlags;
-    function formatSymbolFlags(flags) {
-        return formatEnum(flags, ts.SymbolFlags, /*isFlags*/ true);
-    }
-    ts.formatSymbolFlags = formatSymbolFlags;
-    function formatTypeFlags(flags) {
-        return formatEnum(flags, ts.TypeFlags, /*isFlags*/ true);
-    }
-    ts.formatTypeFlags = formatTypeFlags;
-    function formatObjectFlags(flags) {
-        return formatEnum(flags, ts.ObjectFlags, /*isFlags*/ true);
-    }
-    ts.formatObjectFlags = formatObjectFlags;
     /**
      * Creates a new TextRange from the provided pos and end.
      *
@@ -12367,6 +12555,10 @@ var ts;
         return positionsAreOnSameLine(range1.end, getStartPositionOfRange(range2, sourceFile), sourceFile);
     }
     ts.rangeEndIsOnSameLineAsRangeStart = rangeEndIsOnSameLineAsRangeStart;
+    function isNodeArrayMultiLine(list, sourceFile) {
+        return !positionsAreOnSameLine(list.pos, list.end, sourceFile);
+    }
+    ts.isNodeArrayMultiLine = isNodeArrayMultiLine;
     function positionsAreOnSameLine(pos1, pos2, sourceFile) {
         return pos1 === pos2 ||
             getLineOfLocalPosition(sourceFile, pos1) === getLineOfLocalPosition(sourceFile, pos2);
@@ -12384,8 +12576,8 @@ var ts;
         var parseNode = ts.getParseTreeNode(node);
         if (parseNode) {
             switch (parseNode.parent.kind) {
-                case 243 /* EnumDeclaration */:
-                case 244 /* ModuleDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     return parseNode === parseNode.parent.name;
             }
         }
@@ -12419,10 +12611,10 @@ var ts;
         }
         if (getCheckFlags(s) & 6 /* Synthetic */) {
             var checkFlags = s.checkFlags;
-            var accessModifier = checkFlags & 512 /* ContainsPrivate */ ? 8 /* Private */ :
-                checkFlags & 128 /* ContainsPublic */ ? 4 /* Public */ :
+            var accessModifier = checkFlags & 1024 /* ContainsPrivate */ ? 8 /* Private */ :
+                checkFlags & 256 /* ContainsPublic */ ? 4 /* Public */ :
                     16 /* Protected */;
-            var staticModifier = checkFlags & 1024 /* ContainsStatic */ ? 32 /* Static */ : 0;
+            var staticModifier = checkFlags & 2048 /* ContainsStatic */ ? 32 /* Static */ : 0;
             return accessModifier | staticModifier;
         }
         if (s.flags & 4194304 /* Prototype */) {
@@ -12462,35 +12654,35 @@ var ts;
         if (!parent)
             return 0 /* Read */;
         switch (parent.kind) {
-            case 195 /* ParenthesizedExpression */:
+            case 196 /* ParenthesizedExpression */:
                 return accessKind(parent);
-            case 203 /* PostfixUnaryExpression */:
-            case 202 /* PrefixUnaryExpression */:
+            case 204 /* PostfixUnaryExpression */:
+            case 203 /* PrefixUnaryExpression */:
                 var operator = parent.operator;
                 return operator === 44 /* PlusPlusToken */ || operator === 45 /* MinusMinusToken */ ? writeOrReadWrite() : 0 /* Read */;
-            case 204 /* BinaryExpression */:
+            case 205 /* BinaryExpression */:
                 var _a = parent, left = _a.left, operatorToken = _a.operatorToken;
                 return left === node && isAssignmentOperator(operatorToken.kind) ?
-                    operatorToken.kind === 59 /* EqualsToken */ ? 1 /* Write */ : writeOrReadWrite()
+                    operatorToken.kind === 60 /* EqualsToken */ ? 1 /* Write */ : writeOrReadWrite()
                     : 0 /* Read */;
-            case 189 /* PropertyAccessExpression */:
+            case 190 /* PropertyAccessExpression */:
                 return parent.name !== node ? 0 /* Read */ : accessKind(parent);
-            case 275 /* PropertyAssignment */: {
+            case 276 /* PropertyAssignment */: {
                 var parentAccess = accessKind(parent.parent);
                 // In `({ x: varname }) = { x: 1 }`, the left `x` is a read, the right `x` is a write.
                 return node === parent.name ? reverseAccessKind(parentAccess) : parentAccess;
             }
-            case 276 /* ShorthandPropertyAssignment */:
+            case 277 /* ShorthandPropertyAssignment */:
                 // Assume it's the local variable being accessed, since we don't check public properties for --noUnusedLocals.
                 return node === parent.objectAssignmentInitializer ? 0 /* Read */ : accessKind(parent.parent);
-            case 187 /* ArrayLiteralExpression */:
+            case 188 /* ArrayLiteralExpression */:
                 return accessKind(parent);
             default:
                 return 0 /* Read */;
         }
         function writeOrReadWrite() {
             // If grandparent is not an ExpressionStatement, this is used as an expression in addition to having a side effect.
-            return parent.parent && skipParenthesesUp(parent.parent).kind === 221 /* ExpressionStatement */ ? 1 /* Write */ : 2 /* ReadWrite */;
+            return parent.parent && skipParenthesesUp(parent.parent).kind === 222 /* ExpressionStatement */ ? 1 /* Write */ : 2 /* ReadWrite */;
         }
     }
     function reverseAccessKind(a) {
@@ -12593,7 +12785,7 @@ var ts;
     }
     ts.getClassLikeDeclarationOfSymbol = getClassLikeDeclarationOfSymbol;
     function getObjectFlags(type) {
-        return type.flags & 3768320 /* ObjectFlagsType */ ? type.objectFlags : 0;
+        return type.flags & 3899392 /* ObjectFlagsType */ ? type.objectFlags : 0;
     }
     ts.getObjectFlags = getObjectFlags;
     function typeHasCallOrConstructSignatures(type, checker) {
@@ -12645,32 +12837,32 @@ var ts;
     }
     ts.isObjectTypeDeclaration = isObjectTypeDeclaration;
     function isTypeNodeKind(kind) {
-        return (kind >= 163 /* FirstTypeNode */ && kind <= 183 /* LastTypeNode */)
-            || kind === 120 /* AnyKeyword */
-            || kind === 143 /* UnknownKeyword */
-            || kind === 135 /* NumberKeyword */
-            || kind === 146 /* BigIntKeyword */
-            || kind === 136 /* ObjectKeyword */
-            || kind === 123 /* BooleanKeyword */
-            || kind === 138 /* StringKeyword */
-            || kind === 139 /* SymbolKeyword */
-            || kind === 100 /* ThisKeyword */
-            || kind === 106 /* VoidKeyword */
-            || kind === 141 /* UndefinedKeyword */
-            || kind === 96 /* NullKeyword */
-            || kind === 132 /* NeverKeyword */
-            || kind === 211 /* ExpressionWithTypeArguments */
-            || kind === 289 /* JSDocAllType */
-            || kind === 290 /* JSDocUnknownType */
-            || kind === 291 /* JSDocNullableType */
-            || kind === 292 /* JSDocNonNullableType */
-            || kind === 293 /* JSDocOptionalType */
-            || kind === 294 /* JSDocFunctionType */
-            || kind === 295 /* JSDocVariadicType */;
+        return (kind >= 164 /* FirstTypeNode */ && kind <= 184 /* LastTypeNode */)
+            || kind === 121 /* AnyKeyword */
+            || kind === 144 /* UnknownKeyword */
+            || kind === 136 /* NumberKeyword */
+            || kind === 147 /* BigIntKeyword */
+            || kind === 137 /* ObjectKeyword */
+            || kind === 124 /* BooleanKeyword */
+            || kind === 139 /* StringKeyword */
+            || kind === 140 /* SymbolKeyword */
+            || kind === 101 /* ThisKeyword */
+            || kind === 107 /* VoidKeyword */
+            || kind === 142 /* UndefinedKeyword */
+            || kind === 97 /* NullKeyword */
+            || kind === 133 /* NeverKeyword */
+            || kind === 212 /* ExpressionWithTypeArguments */
+            || kind === 290 /* JSDocAllType */
+            || kind === 291 /* JSDocUnknownType */
+            || kind === 292 /* JSDocNullableType */
+            || kind === 293 /* JSDocNonNullableType */
+            || kind === 294 /* JSDocOptionalType */
+            || kind === 295 /* JSDocFunctionType */
+            || kind === 296 /* JSDocVariadicType */;
     }
     ts.isTypeNodeKind = isTypeNodeKind;
     function isAccessExpression(node) {
-        return node.kind === 189 /* PropertyAccessExpression */ || node.kind === 190 /* ElementAccessExpression */;
+        return node.kind === 190 /* PropertyAccessExpression */ || node.kind === 191 /* ElementAccessExpression */;
     }
     ts.isAccessExpression = isAccessExpression;
     function isBundleFileTextLike(section) {
@@ -12687,8 +12879,10 @@ var ts;
 (function (ts) {
     function getDefaultLibFileName(options) {
         switch (options.target) {
-            case 7 /* ESNext */:
+            case 99 /* ESNext */:
                 return "lib.esnext.full.d.ts";
+            case 7 /* ES2020 */:
+                return "lib.es2020.full.d.ts";
             case 6 /* ES2019 */:
                 return "lib.es2019.full.d.ts";
             case 5 /* ES2018 */:
@@ -12905,9 +13099,9 @@ var ts;
     }
     ts.collapseTextChangeRangesAcrossMultipleVersions = collapseTextChangeRangesAcrossMultipleVersions;
     function getTypeParameterOwner(d) {
-        if (d && d.kind === 150 /* TypeParameter */) {
+        if (d && d.kind === 151 /* TypeParameter */) {
             for (var current = d; current; current = current.parent) {
-                if (ts.isFunctionLike(current) || ts.isClassLike(current) || current.kind === 241 /* InterfaceDeclaration */) {
+                if (ts.isFunctionLike(current) || ts.isClassLike(current) || current.kind === 242 /* InterfaceDeclaration */) {
                     return current;
                 }
             }
@@ -12915,7 +13109,7 @@ var ts;
     }
     ts.getTypeParameterOwner = getTypeParameterOwner;
     function isParameterPropertyDeclaration(node) {
-        return ts.hasModifier(node, 92 /* ParameterPropertyModifier */) && node.parent.kind === 157 /* Constructor */;
+        return ts.hasModifier(node, 92 /* ParameterPropertyModifier */) && node.parent.kind === 158 /* Constructor */;
     }
     ts.isParameterPropertyDeclaration = isParameterPropertyDeclaration;
     function isEmptyBindingPattern(node) {
@@ -12945,14 +13139,14 @@ var ts;
             node = walkUpBindingElementsAndPatterns(node);
         }
         var flags = getFlags(node);
-        if (node.kind === 237 /* VariableDeclaration */) {
+        if (node.kind === 238 /* VariableDeclaration */) {
             node = node.parent;
         }
-        if (node && node.kind === 238 /* VariableDeclarationList */) {
+        if (node && node.kind === 239 /* VariableDeclarationList */) {
             flags |= getFlags(node);
             node = node.parent;
         }
-        if (node && node.kind === 219 /* VariableStatement */) {
+        if (node && node.kind === 220 /* VariableStatement */) {
             flags |= getFlags(node);
         }
         return flags;
@@ -13098,27 +13292,27 @@ var ts;
         }
         // Covers remaining cases (returning undefined if none match).
         switch (hostNode.kind) {
-            case 219 /* VariableStatement */:
+            case 220 /* VariableStatement */:
                 if (hostNode.declarationList && hostNode.declarationList.declarations[0]) {
                     return getDeclarationIdentifier(hostNode.declarationList.declarations[0]);
                 }
                 break;
-            case 221 /* ExpressionStatement */:
+            case 222 /* ExpressionStatement */:
                 var expr = hostNode.expression;
                 switch (expr.kind) {
-                    case 189 /* PropertyAccessExpression */:
+                    case 190 /* PropertyAccessExpression */:
                         return expr.name;
-                    case 190 /* ElementAccessExpression */:
+                    case 191 /* ElementAccessExpression */:
                         var arg = expr.argumentExpression;
                         if (ts.isIdentifier(arg)) {
                             return arg;
                         }
                 }
                 break;
-            case 195 /* ParenthesizedExpression */: {
+            case 196 /* ParenthesizedExpression */: {
                 return getDeclarationIdentifier(hostNode.expression);
             }
-            case 233 /* LabeledStatement */: {
+            case 234 /* LabeledStatement */: {
                 if (ts.isDeclaration(hostNode.statement) || ts.isExpression(hostNode.statement)) {
                     return getDeclarationIdentifier(hostNode.statement);
                 }
@@ -13142,18 +13336,18 @@ var ts;
     /** @internal */
     function getNonAssignedNameOfDeclaration(declaration) {
         switch (declaration.kind) {
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 return declaration;
-            case 310 /* JSDocPropertyTag */:
-            case 304 /* JSDocParameterTag */: {
+            case 312 /* JSDocPropertyTag */:
+            case 306 /* JSDocParameterTag */: {
                 var name = declaration.name;
-                if (name.kind === 148 /* QualifiedName */) {
+                if (name.kind === 149 /* QualifiedName */) {
                     return name.right;
                 }
                 break;
             }
-            case 191 /* CallExpression */:
-            case 204 /* BinaryExpression */: {
+            case 192 /* CallExpression */:
+            case 205 /* BinaryExpression */: {
                 var expr = declaration;
                 switch (ts.getAssignmentDeclarationKind(expr)) {
                     case 1 /* ExportsProperty */:
@@ -13169,9 +13363,9 @@ var ts;
                         return undefined;
                 }
             }
-            case 309 /* JSDocTypedefTag */:
+            case 311 /* JSDocTypedefTag */:
                 return getNameOfJSDocTypedef(declaration);
-            case 254 /* ExportAssignment */: {
+            case 255 /* ExportAssignment */: {
                 var expression = declaration.expression;
                 return ts.isIdentifier(expression) ? expression : undefined;
             }
@@ -13201,6 +13395,9 @@ var ts;
                 return node.parent.left.name;
             }
         }
+        else if (ts.isVariableDeclaration(node.parent) && ts.isIdentifier(node.parent.name)) {
+            return node.parent.name;
+        }
     }
     /**
      * Gets the JSDoc parameter tags for the node if present.
@@ -13373,7 +13570,7 @@ var ts;
             return ts.emptyArray;
         }
         if (ts.isJSDocTypeAlias(node)) {
-            ts.Debug.assert(node.parent.kind === 296 /* JSDocComment */);
+            ts.Debug.assert(node.parent.kind === 297 /* JSDocComment */);
             return ts.flatMap(node.parent.tags, function (tag) { return ts.isJSDocTemplateTag(tag) ? tag.typeParameters : undefined; });
         }
         if (node.typeParameters) {
@@ -13441,198 +13638,198 @@ var ts;
     }
     ts.isTemplateTail = isTemplateTail;
     function isIdentifier(node) {
-        return node.kind === 72 /* Identifier */;
+        return node.kind === 73 /* Identifier */;
     }
     ts.isIdentifier = isIdentifier;
     // Names
     function isQualifiedName(node) {
-        return node.kind === 148 /* QualifiedName */;
+        return node.kind === 149 /* QualifiedName */;
     }
     ts.isQualifiedName = isQualifiedName;
     function isComputedPropertyName(node) {
-        return node.kind === 149 /* ComputedPropertyName */;
+        return node.kind === 150 /* ComputedPropertyName */;
     }
     ts.isComputedPropertyName = isComputedPropertyName;
     // Signature elements
     function isTypeParameterDeclaration(node) {
-        return node.kind === 150 /* TypeParameter */;
+        return node.kind === 151 /* TypeParameter */;
     }
     ts.isTypeParameterDeclaration = isTypeParameterDeclaration;
     function isParameter(node) {
-        return node.kind === 151 /* Parameter */;
+        return node.kind === 152 /* Parameter */;
     }
     ts.isParameter = isParameter;
     function isDecorator(node) {
-        return node.kind === 152 /* Decorator */;
+        return node.kind === 153 /* Decorator */;
     }
     ts.isDecorator = isDecorator;
     // TypeMember
     function isPropertySignature(node) {
-        return node.kind === 153 /* PropertySignature */;
+        return node.kind === 154 /* PropertySignature */;
     }
     ts.isPropertySignature = isPropertySignature;
     function isPropertyDeclaration(node) {
-        return node.kind === 154 /* PropertyDeclaration */;
+        return node.kind === 155 /* PropertyDeclaration */;
     }
     ts.isPropertyDeclaration = isPropertyDeclaration;
     function isMethodSignature(node) {
-        return node.kind === 155 /* MethodSignature */;
+        return node.kind === 156 /* MethodSignature */;
     }
     ts.isMethodSignature = isMethodSignature;
     function isMethodDeclaration(node) {
-        return node.kind === 156 /* MethodDeclaration */;
+        return node.kind === 157 /* MethodDeclaration */;
     }
     ts.isMethodDeclaration = isMethodDeclaration;
     function isConstructorDeclaration(node) {
-        return node.kind === 157 /* Constructor */;
+        return node.kind === 158 /* Constructor */;
     }
     ts.isConstructorDeclaration = isConstructorDeclaration;
     function isGetAccessorDeclaration(node) {
-        return node.kind === 158 /* GetAccessor */;
+        return node.kind === 159 /* GetAccessor */;
     }
     ts.isGetAccessorDeclaration = isGetAccessorDeclaration;
     function isSetAccessorDeclaration(node) {
-        return node.kind === 159 /* SetAccessor */;
+        return node.kind === 160 /* SetAccessor */;
     }
     ts.isSetAccessorDeclaration = isSetAccessorDeclaration;
     function isCallSignatureDeclaration(node) {
-        return node.kind === 160 /* CallSignature */;
+        return node.kind === 161 /* CallSignature */;
     }
     ts.isCallSignatureDeclaration = isCallSignatureDeclaration;
     function isConstructSignatureDeclaration(node) {
-        return node.kind === 161 /* ConstructSignature */;
+        return node.kind === 162 /* ConstructSignature */;
     }
     ts.isConstructSignatureDeclaration = isConstructSignatureDeclaration;
     function isIndexSignatureDeclaration(node) {
-        return node.kind === 162 /* IndexSignature */;
+        return node.kind === 163 /* IndexSignature */;
     }
     ts.isIndexSignatureDeclaration = isIndexSignatureDeclaration;
     /* @internal */
     function isGetOrSetAccessorDeclaration(node) {
-        return node.kind === 159 /* SetAccessor */ || node.kind === 158 /* GetAccessor */;
+        return node.kind === 160 /* SetAccessor */ || node.kind === 159 /* GetAccessor */;
     }
     ts.isGetOrSetAccessorDeclaration = isGetOrSetAccessorDeclaration;
     // Type
     function isTypePredicateNode(node) {
-        return node.kind === 163 /* TypePredicate */;
+        return node.kind === 164 /* TypePredicate */;
     }
     ts.isTypePredicateNode = isTypePredicateNode;
     function isTypeReferenceNode(node) {
-        return node.kind === 164 /* TypeReference */;
+        return node.kind === 165 /* TypeReference */;
     }
     ts.isTypeReferenceNode = isTypeReferenceNode;
     function isFunctionTypeNode(node) {
-        return node.kind === 165 /* FunctionType */;
+        return node.kind === 166 /* FunctionType */;
     }
     ts.isFunctionTypeNode = isFunctionTypeNode;
     function isConstructorTypeNode(node) {
-        return node.kind === 166 /* ConstructorType */;
+        return node.kind === 167 /* ConstructorType */;
     }
     ts.isConstructorTypeNode = isConstructorTypeNode;
     function isTypeQueryNode(node) {
-        return node.kind === 167 /* TypeQuery */;
+        return node.kind === 168 /* TypeQuery */;
     }
     ts.isTypeQueryNode = isTypeQueryNode;
     function isTypeLiteralNode(node) {
-        return node.kind === 168 /* TypeLiteral */;
+        return node.kind === 169 /* TypeLiteral */;
     }
     ts.isTypeLiteralNode = isTypeLiteralNode;
     function isArrayTypeNode(node) {
-        return node.kind === 169 /* ArrayType */;
+        return node.kind === 170 /* ArrayType */;
     }
     ts.isArrayTypeNode = isArrayTypeNode;
     function isTupleTypeNode(node) {
-        return node.kind === 170 /* TupleType */;
+        return node.kind === 171 /* TupleType */;
     }
     ts.isTupleTypeNode = isTupleTypeNode;
     function isUnionTypeNode(node) {
-        return node.kind === 173 /* UnionType */;
+        return node.kind === 174 /* UnionType */;
     }
     ts.isUnionTypeNode = isUnionTypeNode;
     function isIntersectionTypeNode(node) {
-        return node.kind === 174 /* IntersectionType */;
+        return node.kind === 175 /* IntersectionType */;
     }
     ts.isIntersectionTypeNode = isIntersectionTypeNode;
     function isConditionalTypeNode(node) {
-        return node.kind === 175 /* ConditionalType */;
+        return node.kind === 176 /* ConditionalType */;
     }
     ts.isConditionalTypeNode = isConditionalTypeNode;
     function isInferTypeNode(node) {
-        return node.kind === 176 /* InferType */;
+        return node.kind === 177 /* InferType */;
     }
     ts.isInferTypeNode = isInferTypeNode;
     function isParenthesizedTypeNode(node) {
-        return node.kind === 177 /* ParenthesizedType */;
+        return node.kind === 178 /* ParenthesizedType */;
     }
     ts.isParenthesizedTypeNode = isParenthesizedTypeNode;
     function isThisTypeNode(node) {
-        return node.kind === 178 /* ThisType */;
+        return node.kind === 179 /* ThisType */;
     }
     ts.isThisTypeNode = isThisTypeNode;
     function isTypeOperatorNode(node) {
-        return node.kind === 179 /* TypeOperator */;
+        return node.kind === 180 /* TypeOperator */;
     }
     ts.isTypeOperatorNode = isTypeOperatorNode;
     function isIndexedAccessTypeNode(node) {
-        return node.kind === 180 /* IndexedAccessType */;
+        return node.kind === 181 /* IndexedAccessType */;
     }
     ts.isIndexedAccessTypeNode = isIndexedAccessTypeNode;
     function isMappedTypeNode(node) {
-        return node.kind === 181 /* MappedType */;
+        return node.kind === 182 /* MappedType */;
     }
     ts.isMappedTypeNode = isMappedTypeNode;
     function isLiteralTypeNode(node) {
-        return node.kind === 182 /* LiteralType */;
+        return node.kind === 183 /* LiteralType */;
     }
     ts.isLiteralTypeNode = isLiteralTypeNode;
     function isImportTypeNode(node) {
-        return node.kind === 183 /* ImportType */;
+        return node.kind === 184 /* ImportType */;
     }
     ts.isImportTypeNode = isImportTypeNode;
     // Binding patterns
     function isObjectBindingPattern(node) {
-        return node.kind === 184 /* ObjectBindingPattern */;
+        return node.kind === 185 /* ObjectBindingPattern */;
     }
     ts.isObjectBindingPattern = isObjectBindingPattern;
     function isArrayBindingPattern(node) {
-        return node.kind === 185 /* ArrayBindingPattern */;
+        return node.kind === 186 /* ArrayBindingPattern */;
     }
     ts.isArrayBindingPattern = isArrayBindingPattern;
     function isBindingElement(node) {
-        return node.kind === 186 /* BindingElement */;
+        return node.kind === 187 /* BindingElement */;
     }
     ts.isBindingElement = isBindingElement;
     // Expression
     function isArrayLiteralExpression(node) {
-        return node.kind === 187 /* ArrayLiteralExpression */;
+        return node.kind === 188 /* ArrayLiteralExpression */;
     }
     ts.isArrayLiteralExpression = isArrayLiteralExpression;
     function isObjectLiteralExpression(node) {
-        return node.kind === 188 /* ObjectLiteralExpression */;
+        return node.kind === 189 /* ObjectLiteralExpression */;
     }
     ts.isObjectLiteralExpression = isObjectLiteralExpression;
     function isPropertyAccessExpression(node) {
-        return node.kind === 189 /* PropertyAccessExpression */;
+        return node.kind === 190 /* PropertyAccessExpression */;
     }
     ts.isPropertyAccessExpression = isPropertyAccessExpression;
     function isElementAccessExpression(node) {
-        return node.kind === 190 /* ElementAccessExpression */;
+        return node.kind === 191 /* ElementAccessExpression */;
     }
     ts.isElementAccessExpression = isElementAccessExpression;
     function isCallExpression(node) {
-        return node.kind === 191 /* CallExpression */;
+        return node.kind === 192 /* CallExpression */;
     }
     ts.isCallExpression = isCallExpression;
     function isNewExpression(node) {
-        return node.kind === 192 /* NewExpression */;
+        return node.kind === 193 /* NewExpression */;
     }
     ts.isNewExpression = isNewExpression;
     function isTaggedTemplateExpression(node) {
-        return node.kind === 193 /* TaggedTemplateExpression */;
+        return node.kind === 194 /* TaggedTemplateExpression */;
     }
     ts.isTaggedTemplateExpression = isTaggedTemplateExpression;
     function isTypeAssertion(node) {
-        return node.kind === 194 /* TypeAssertionExpression */;
+        return node.kind === 195 /* TypeAssertionExpression */;
     }
     ts.isTypeAssertion = isTypeAssertion;
     function isConstTypeReference(node) {
@@ -13641,376 +13838,376 @@ var ts;
     }
     ts.isConstTypeReference = isConstTypeReference;
     function isParenthesizedExpression(node) {
-        return node.kind === 195 /* ParenthesizedExpression */;
+        return node.kind === 196 /* ParenthesizedExpression */;
     }
     ts.isParenthesizedExpression = isParenthesizedExpression;
     function skipPartiallyEmittedExpressions(node) {
-        while (node.kind === 313 /* PartiallyEmittedExpression */) {
+        while (node.kind === 315 /* PartiallyEmittedExpression */) {
             node = node.expression;
         }
         return node;
     }
     ts.skipPartiallyEmittedExpressions = skipPartiallyEmittedExpressions;
     function isFunctionExpression(node) {
-        return node.kind === 196 /* FunctionExpression */;
+        return node.kind === 197 /* FunctionExpression */;
     }
     ts.isFunctionExpression = isFunctionExpression;
     function isArrowFunction(node) {
-        return node.kind === 197 /* ArrowFunction */;
+        return node.kind === 198 /* ArrowFunction */;
     }
     ts.isArrowFunction = isArrowFunction;
     function isDeleteExpression(node) {
-        return node.kind === 198 /* DeleteExpression */;
+        return node.kind === 199 /* DeleteExpression */;
     }
     ts.isDeleteExpression = isDeleteExpression;
     function isTypeOfExpression(node) {
-        return node.kind === 199 /* TypeOfExpression */;
+        return node.kind === 200 /* TypeOfExpression */;
     }
     ts.isTypeOfExpression = isTypeOfExpression;
     function isVoidExpression(node) {
-        return node.kind === 200 /* VoidExpression */;
+        return node.kind === 201 /* VoidExpression */;
     }
     ts.isVoidExpression = isVoidExpression;
     function isAwaitExpression(node) {
-        return node.kind === 201 /* AwaitExpression */;
+        return node.kind === 202 /* AwaitExpression */;
     }
     ts.isAwaitExpression = isAwaitExpression;
     function isPrefixUnaryExpression(node) {
-        return node.kind === 202 /* PrefixUnaryExpression */;
+        return node.kind === 203 /* PrefixUnaryExpression */;
     }
     ts.isPrefixUnaryExpression = isPrefixUnaryExpression;
     function isPostfixUnaryExpression(node) {
-        return node.kind === 203 /* PostfixUnaryExpression */;
+        return node.kind === 204 /* PostfixUnaryExpression */;
     }
     ts.isPostfixUnaryExpression = isPostfixUnaryExpression;
     function isBinaryExpression(node) {
-        return node.kind === 204 /* BinaryExpression */;
+        return node.kind === 205 /* BinaryExpression */;
     }
     ts.isBinaryExpression = isBinaryExpression;
     function isConditionalExpression(node) {
-        return node.kind === 205 /* ConditionalExpression */;
+        return node.kind === 206 /* ConditionalExpression */;
     }
     ts.isConditionalExpression = isConditionalExpression;
     function isTemplateExpression(node) {
-        return node.kind === 206 /* TemplateExpression */;
+        return node.kind === 207 /* TemplateExpression */;
     }
     ts.isTemplateExpression = isTemplateExpression;
     function isYieldExpression(node) {
-        return node.kind === 207 /* YieldExpression */;
+        return node.kind === 208 /* YieldExpression */;
     }
     ts.isYieldExpression = isYieldExpression;
     function isSpreadElement(node) {
-        return node.kind === 208 /* SpreadElement */;
+        return node.kind === 209 /* SpreadElement */;
     }
     ts.isSpreadElement = isSpreadElement;
     function isClassExpression(node) {
-        return node.kind === 209 /* ClassExpression */;
+        return node.kind === 210 /* ClassExpression */;
     }
     ts.isClassExpression = isClassExpression;
     function isOmittedExpression(node) {
-        return node.kind === 210 /* OmittedExpression */;
+        return node.kind === 211 /* OmittedExpression */;
     }
     ts.isOmittedExpression = isOmittedExpression;
     function isExpressionWithTypeArguments(node) {
-        return node.kind === 211 /* ExpressionWithTypeArguments */;
+        return node.kind === 212 /* ExpressionWithTypeArguments */;
     }
     ts.isExpressionWithTypeArguments = isExpressionWithTypeArguments;
     function isAsExpression(node) {
-        return node.kind === 212 /* AsExpression */;
+        return node.kind === 213 /* AsExpression */;
     }
     ts.isAsExpression = isAsExpression;
     function isNonNullExpression(node) {
-        return node.kind === 213 /* NonNullExpression */;
+        return node.kind === 214 /* NonNullExpression */;
     }
     ts.isNonNullExpression = isNonNullExpression;
     function isMetaProperty(node) {
-        return node.kind === 214 /* MetaProperty */;
+        return node.kind === 215 /* MetaProperty */;
     }
     ts.isMetaProperty = isMetaProperty;
     // Misc
     function isTemplateSpan(node) {
-        return node.kind === 216 /* TemplateSpan */;
+        return node.kind === 217 /* TemplateSpan */;
     }
     ts.isTemplateSpan = isTemplateSpan;
     function isSemicolonClassElement(node) {
-        return node.kind === 217 /* SemicolonClassElement */;
+        return node.kind === 218 /* SemicolonClassElement */;
     }
     ts.isSemicolonClassElement = isSemicolonClassElement;
     // Block
     function isBlock(node) {
-        return node.kind === 218 /* Block */;
+        return node.kind === 219 /* Block */;
     }
     ts.isBlock = isBlock;
     function isVariableStatement(node) {
-        return node.kind === 219 /* VariableStatement */;
+        return node.kind === 220 /* VariableStatement */;
     }
     ts.isVariableStatement = isVariableStatement;
     function isEmptyStatement(node) {
-        return node.kind === 220 /* EmptyStatement */;
+        return node.kind === 221 /* EmptyStatement */;
     }
     ts.isEmptyStatement = isEmptyStatement;
     function isExpressionStatement(node) {
-        return node.kind === 221 /* ExpressionStatement */;
+        return node.kind === 222 /* ExpressionStatement */;
     }
     ts.isExpressionStatement = isExpressionStatement;
     function isIfStatement(node) {
-        return node.kind === 222 /* IfStatement */;
+        return node.kind === 223 /* IfStatement */;
     }
     ts.isIfStatement = isIfStatement;
     function isDoStatement(node) {
-        return node.kind === 223 /* DoStatement */;
+        return node.kind === 224 /* DoStatement */;
     }
     ts.isDoStatement = isDoStatement;
     function isWhileStatement(node) {
-        return node.kind === 224 /* WhileStatement */;
+        return node.kind === 225 /* WhileStatement */;
     }
     ts.isWhileStatement = isWhileStatement;
     function isForStatement(node) {
-        return node.kind === 225 /* ForStatement */;
+        return node.kind === 226 /* ForStatement */;
     }
     ts.isForStatement = isForStatement;
     function isForInStatement(node) {
-        return node.kind === 226 /* ForInStatement */;
+        return node.kind === 227 /* ForInStatement */;
     }
     ts.isForInStatement = isForInStatement;
     function isForOfStatement(node) {
-        return node.kind === 227 /* ForOfStatement */;
+        return node.kind === 228 /* ForOfStatement */;
     }
     ts.isForOfStatement = isForOfStatement;
     function isContinueStatement(node) {
-        return node.kind === 228 /* ContinueStatement */;
+        return node.kind === 229 /* ContinueStatement */;
     }
     ts.isContinueStatement = isContinueStatement;
     function isBreakStatement(node) {
-        return node.kind === 229 /* BreakStatement */;
+        return node.kind === 230 /* BreakStatement */;
     }
     ts.isBreakStatement = isBreakStatement;
     function isBreakOrContinueStatement(node) {
-        return node.kind === 229 /* BreakStatement */ || node.kind === 228 /* ContinueStatement */;
+        return node.kind === 230 /* BreakStatement */ || node.kind === 229 /* ContinueStatement */;
     }
     ts.isBreakOrContinueStatement = isBreakOrContinueStatement;
     function isReturnStatement(node) {
-        return node.kind === 230 /* ReturnStatement */;
+        return node.kind === 231 /* ReturnStatement */;
     }
     ts.isReturnStatement = isReturnStatement;
     function isWithStatement(node) {
-        return node.kind === 231 /* WithStatement */;
+        return node.kind === 232 /* WithStatement */;
     }
     ts.isWithStatement = isWithStatement;
     function isSwitchStatement(node) {
-        return node.kind === 232 /* SwitchStatement */;
+        return node.kind === 233 /* SwitchStatement */;
     }
     ts.isSwitchStatement = isSwitchStatement;
     function isLabeledStatement(node) {
-        return node.kind === 233 /* LabeledStatement */;
+        return node.kind === 234 /* LabeledStatement */;
     }
     ts.isLabeledStatement = isLabeledStatement;
     function isThrowStatement(node) {
-        return node.kind === 234 /* ThrowStatement */;
+        return node.kind === 235 /* ThrowStatement */;
     }
     ts.isThrowStatement = isThrowStatement;
     function isTryStatement(node) {
-        return node.kind === 235 /* TryStatement */;
+        return node.kind === 236 /* TryStatement */;
     }
     ts.isTryStatement = isTryStatement;
     function isDebuggerStatement(node) {
-        return node.kind === 236 /* DebuggerStatement */;
+        return node.kind === 237 /* DebuggerStatement */;
     }
     ts.isDebuggerStatement = isDebuggerStatement;
     function isVariableDeclaration(node) {
-        return node.kind === 237 /* VariableDeclaration */;
+        return node.kind === 238 /* VariableDeclaration */;
     }
     ts.isVariableDeclaration = isVariableDeclaration;
     function isVariableDeclarationList(node) {
-        return node.kind === 238 /* VariableDeclarationList */;
+        return node.kind === 239 /* VariableDeclarationList */;
     }
     ts.isVariableDeclarationList = isVariableDeclarationList;
     function isFunctionDeclaration(node) {
-        return node.kind === 239 /* FunctionDeclaration */;
+        return node.kind === 240 /* FunctionDeclaration */;
     }
     ts.isFunctionDeclaration = isFunctionDeclaration;
     function isClassDeclaration(node) {
-        return node.kind === 240 /* ClassDeclaration */;
+        return node.kind === 241 /* ClassDeclaration */;
     }
     ts.isClassDeclaration = isClassDeclaration;
     function isInterfaceDeclaration(node) {
-        return node.kind === 241 /* InterfaceDeclaration */;
+        return node.kind === 242 /* InterfaceDeclaration */;
     }
     ts.isInterfaceDeclaration = isInterfaceDeclaration;
     function isTypeAliasDeclaration(node) {
-        return node.kind === 242 /* TypeAliasDeclaration */;
+        return node.kind === 243 /* TypeAliasDeclaration */;
     }
     ts.isTypeAliasDeclaration = isTypeAliasDeclaration;
     function isEnumDeclaration(node) {
-        return node.kind === 243 /* EnumDeclaration */;
+        return node.kind === 244 /* EnumDeclaration */;
     }
     ts.isEnumDeclaration = isEnumDeclaration;
     function isModuleDeclaration(node) {
-        return node.kind === 244 /* ModuleDeclaration */;
+        return node.kind === 245 /* ModuleDeclaration */;
     }
     ts.isModuleDeclaration = isModuleDeclaration;
     function isModuleBlock(node) {
-        return node.kind === 245 /* ModuleBlock */;
+        return node.kind === 246 /* ModuleBlock */;
     }
     ts.isModuleBlock = isModuleBlock;
     function isCaseBlock(node) {
-        return node.kind === 246 /* CaseBlock */;
+        return node.kind === 247 /* CaseBlock */;
     }
     ts.isCaseBlock = isCaseBlock;
     function isNamespaceExportDeclaration(node) {
-        return node.kind === 247 /* NamespaceExportDeclaration */;
+        return node.kind === 248 /* NamespaceExportDeclaration */;
     }
     ts.isNamespaceExportDeclaration = isNamespaceExportDeclaration;
     function isImportEqualsDeclaration(node) {
-        return node.kind === 248 /* ImportEqualsDeclaration */;
+        return node.kind === 249 /* ImportEqualsDeclaration */;
     }
     ts.isImportEqualsDeclaration = isImportEqualsDeclaration;
     function isImportDeclaration(node) {
-        return node.kind === 249 /* ImportDeclaration */;
+        return node.kind === 250 /* ImportDeclaration */;
     }
     ts.isImportDeclaration = isImportDeclaration;
     function isImportClause(node) {
-        return node.kind === 250 /* ImportClause */;
+        return node.kind === 251 /* ImportClause */;
     }
     ts.isImportClause = isImportClause;
     function isNamespaceImport(node) {
-        return node.kind === 251 /* NamespaceImport */;
+        return node.kind === 252 /* NamespaceImport */;
     }
     ts.isNamespaceImport = isNamespaceImport;
     function isNamedImports(node) {
-        return node.kind === 252 /* NamedImports */;
+        return node.kind === 253 /* NamedImports */;
     }
     ts.isNamedImports = isNamedImports;
     function isImportSpecifier(node) {
-        return node.kind === 253 /* ImportSpecifier */;
+        return node.kind === 254 /* ImportSpecifier */;
     }
     ts.isImportSpecifier = isImportSpecifier;
     function isExportAssignment(node) {
-        return node.kind === 254 /* ExportAssignment */;
+        return node.kind === 255 /* ExportAssignment */;
     }
     ts.isExportAssignment = isExportAssignment;
     function isExportDeclaration(node) {
-        return node.kind === 255 /* ExportDeclaration */;
+        return node.kind === 256 /* ExportDeclaration */;
     }
     ts.isExportDeclaration = isExportDeclaration;
     function isNamedExports(node) {
-        return node.kind === 256 /* NamedExports */;
+        return node.kind === 257 /* NamedExports */;
     }
     ts.isNamedExports = isNamedExports;
     function isExportSpecifier(node) {
-        return node.kind === 257 /* ExportSpecifier */;
+        return node.kind === 258 /* ExportSpecifier */;
     }
     ts.isExportSpecifier = isExportSpecifier;
     function isMissingDeclaration(node) {
-        return node.kind === 258 /* MissingDeclaration */;
+        return node.kind === 259 /* MissingDeclaration */;
     }
     ts.isMissingDeclaration = isMissingDeclaration;
     // Module References
     function isExternalModuleReference(node) {
-        return node.kind === 259 /* ExternalModuleReference */;
+        return node.kind === 260 /* ExternalModuleReference */;
     }
     ts.isExternalModuleReference = isExternalModuleReference;
     // JSX
     function isJsxElement(node) {
-        return node.kind === 260 /* JsxElement */;
+        return node.kind === 261 /* JsxElement */;
     }
     ts.isJsxElement = isJsxElement;
     function isJsxSelfClosingElement(node) {
-        return node.kind === 261 /* JsxSelfClosingElement */;
+        return node.kind === 262 /* JsxSelfClosingElement */;
     }
     ts.isJsxSelfClosingElement = isJsxSelfClosingElement;
     function isJsxOpeningElement(node) {
-        return node.kind === 262 /* JsxOpeningElement */;
+        return node.kind === 263 /* JsxOpeningElement */;
     }
     ts.isJsxOpeningElement = isJsxOpeningElement;
     function isJsxClosingElement(node) {
-        return node.kind === 263 /* JsxClosingElement */;
+        return node.kind === 264 /* JsxClosingElement */;
     }
     ts.isJsxClosingElement = isJsxClosingElement;
     function isJsxFragment(node) {
-        return node.kind === 264 /* JsxFragment */;
+        return node.kind === 265 /* JsxFragment */;
     }
     ts.isJsxFragment = isJsxFragment;
     function isJsxOpeningFragment(node) {
-        return node.kind === 265 /* JsxOpeningFragment */;
+        return node.kind === 266 /* JsxOpeningFragment */;
     }
     ts.isJsxOpeningFragment = isJsxOpeningFragment;
     function isJsxClosingFragment(node) {
-        return node.kind === 266 /* JsxClosingFragment */;
+        return node.kind === 267 /* JsxClosingFragment */;
     }
     ts.isJsxClosingFragment = isJsxClosingFragment;
     function isJsxAttribute(node) {
-        return node.kind === 267 /* JsxAttribute */;
+        return node.kind === 268 /* JsxAttribute */;
     }
     ts.isJsxAttribute = isJsxAttribute;
     function isJsxAttributes(node) {
-        return node.kind === 268 /* JsxAttributes */;
+        return node.kind === 269 /* JsxAttributes */;
     }
     ts.isJsxAttributes = isJsxAttributes;
     function isJsxSpreadAttribute(node) {
-        return node.kind === 269 /* JsxSpreadAttribute */;
+        return node.kind === 270 /* JsxSpreadAttribute */;
     }
     ts.isJsxSpreadAttribute = isJsxSpreadAttribute;
     function isJsxExpression(node) {
-        return node.kind === 270 /* JsxExpression */;
+        return node.kind === 271 /* JsxExpression */;
     }
     ts.isJsxExpression = isJsxExpression;
     // Clauses
     function isCaseClause(node) {
-        return node.kind === 271 /* CaseClause */;
+        return node.kind === 272 /* CaseClause */;
     }
     ts.isCaseClause = isCaseClause;
     function isDefaultClause(node) {
-        return node.kind === 272 /* DefaultClause */;
+        return node.kind === 273 /* DefaultClause */;
     }
     ts.isDefaultClause = isDefaultClause;
     function isHeritageClause(node) {
-        return node.kind === 273 /* HeritageClause */;
+        return node.kind === 274 /* HeritageClause */;
     }
     ts.isHeritageClause = isHeritageClause;
     function isCatchClause(node) {
-        return node.kind === 274 /* CatchClause */;
+        return node.kind === 275 /* CatchClause */;
     }
     ts.isCatchClause = isCatchClause;
     // Property assignments
     function isPropertyAssignment(node) {
-        return node.kind === 275 /* PropertyAssignment */;
+        return node.kind === 276 /* PropertyAssignment */;
     }
     ts.isPropertyAssignment = isPropertyAssignment;
     function isShorthandPropertyAssignment(node) {
-        return node.kind === 276 /* ShorthandPropertyAssignment */;
+        return node.kind === 277 /* ShorthandPropertyAssignment */;
     }
     ts.isShorthandPropertyAssignment = isShorthandPropertyAssignment;
     function isSpreadAssignment(node) {
-        return node.kind === 277 /* SpreadAssignment */;
+        return node.kind === 278 /* SpreadAssignment */;
     }
     ts.isSpreadAssignment = isSpreadAssignment;
     // Enum
     function isEnumMember(node) {
-        return node.kind === 278 /* EnumMember */;
+        return node.kind === 279 /* EnumMember */;
     }
     ts.isEnumMember = isEnumMember;
     // Top-level nodes
     function isSourceFile(node) {
-        return node.kind === 284 /* SourceFile */;
+        return node.kind === 285 /* SourceFile */;
     }
     ts.isSourceFile = isSourceFile;
     function isBundle(node) {
-        return node.kind === 285 /* Bundle */;
+        return node.kind === 286 /* Bundle */;
     }
     ts.isBundle = isBundle;
     function isUnparsedSource(node) {
-        return node.kind === 286 /* UnparsedSource */;
+        return node.kind === 287 /* UnparsedSource */;
     }
     ts.isUnparsedSource = isUnparsedSource;
     function isUnparsedPrepend(node) {
-        return node.kind === 280 /* UnparsedPrepend */;
+        return node.kind === 281 /* UnparsedPrepend */;
     }
     ts.isUnparsedPrepend = isUnparsedPrepend;
     function isUnparsedTextLike(node) {
         switch (node.kind) {
-            case 281 /* UnparsedText */:
-            case 282 /* UnparsedInternalText */:
+            case 282 /* UnparsedText */:
+            case 283 /* UnparsedInternalText */:
                 return true;
             default:
                 return false;
@@ -14019,101 +14216,105 @@ var ts;
     ts.isUnparsedTextLike = isUnparsedTextLike;
     function isUnparsedNode(node) {
         return isUnparsedTextLike(node) ||
-            node.kind === 279 /* UnparsedPrologue */ ||
-            node.kind === 283 /* UnparsedSyntheticReference */;
+            node.kind === 280 /* UnparsedPrologue */ ||
+            node.kind === 284 /* UnparsedSyntheticReference */;
     }
     ts.isUnparsedNode = isUnparsedNode;
     // JSDoc
     function isJSDocTypeExpression(node) {
-        return node.kind === 288 /* JSDocTypeExpression */;
+        return node.kind === 289 /* JSDocTypeExpression */;
     }
     ts.isJSDocTypeExpression = isJSDocTypeExpression;
     function isJSDocAllType(node) {
-        return node.kind === 289 /* JSDocAllType */;
+        return node.kind === 290 /* JSDocAllType */;
     }
     ts.isJSDocAllType = isJSDocAllType;
     function isJSDocUnknownType(node) {
-        return node.kind === 290 /* JSDocUnknownType */;
+        return node.kind === 291 /* JSDocUnknownType */;
     }
     ts.isJSDocUnknownType = isJSDocUnknownType;
     function isJSDocNullableType(node) {
-        return node.kind === 291 /* JSDocNullableType */;
+        return node.kind === 292 /* JSDocNullableType */;
     }
     ts.isJSDocNullableType = isJSDocNullableType;
     function isJSDocNonNullableType(node) {
-        return node.kind === 292 /* JSDocNonNullableType */;
+        return node.kind === 293 /* JSDocNonNullableType */;
     }
     ts.isJSDocNonNullableType = isJSDocNonNullableType;
     function isJSDocOptionalType(node) {
-        return node.kind === 293 /* JSDocOptionalType */;
+        return node.kind === 294 /* JSDocOptionalType */;
     }
     ts.isJSDocOptionalType = isJSDocOptionalType;
     function isJSDocFunctionType(node) {
-        return node.kind === 294 /* JSDocFunctionType */;
+        return node.kind === 295 /* JSDocFunctionType */;
     }
     ts.isJSDocFunctionType = isJSDocFunctionType;
     function isJSDocVariadicType(node) {
-        return node.kind === 295 /* JSDocVariadicType */;
+        return node.kind === 296 /* JSDocVariadicType */;
     }
     ts.isJSDocVariadicType = isJSDocVariadicType;
     function isJSDoc(node) {
-        return node.kind === 296 /* JSDocComment */;
+        return node.kind === 297 /* JSDocComment */;
     }
     ts.isJSDoc = isJSDoc;
+    function isJSDocAuthorTag(node) {
+        return node.kind === 302 /* JSDocAuthorTag */;
+    }
+    ts.isJSDocAuthorTag = isJSDocAuthorTag;
     function isJSDocAugmentsTag(node) {
-        return node.kind === 300 /* JSDocAugmentsTag */;
+        return node.kind === 301 /* JSDocAugmentsTag */;
     }
     ts.isJSDocAugmentsTag = isJSDocAugmentsTag;
     function isJSDocClassTag(node) {
-        return node.kind === 301 /* JSDocClassTag */;
+        return node.kind === 303 /* JSDocClassTag */;
     }
     ts.isJSDocClassTag = isJSDocClassTag;
     function isJSDocEnumTag(node) {
-        return node.kind === 303 /* JSDocEnumTag */;
+        return node.kind === 305 /* JSDocEnumTag */;
     }
     ts.isJSDocEnumTag = isJSDocEnumTag;
     function isJSDocThisTag(node) {
-        return node.kind === 306 /* JSDocThisTag */;
+        return node.kind === 308 /* JSDocThisTag */;
     }
     ts.isJSDocThisTag = isJSDocThisTag;
     function isJSDocParameterTag(node) {
-        return node.kind === 304 /* JSDocParameterTag */;
+        return node.kind === 306 /* JSDocParameterTag */;
     }
     ts.isJSDocParameterTag = isJSDocParameterTag;
     function isJSDocReturnTag(node) {
-        return node.kind === 305 /* JSDocReturnTag */;
+        return node.kind === 307 /* JSDocReturnTag */;
     }
     ts.isJSDocReturnTag = isJSDocReturnTag;
     function isJSDocTypeTag(node) {
-        return node.kind === 307 /* JSDocTypeTag */;
+        return node.kind === 309 /* JSDocTypeTag */;
     }
     ts.isJSDocTypeTag = isJSDocTypeTag;
     function isJSDocTemplateTag(node) {
-        return node.kind === 308 /* JSDocTemplateTag */;
+        return node.kind === 310 /* JSDocTemplateTag */;
     }
     ts.isJSDocTemplateTag = isJSDocTemplateTag;
     function isJSDocTypedefTag(node) {
-        return node.kind === 309 /* JSDocTypedefTag */;
+        return node.kind === 311 /* JSDocTypedefTag */;
     }
     ts.isJSDocTypedefTag = isJSDocTypedefTag;
     function isJSDocPropertyTag(node) {
-        return node.kind === 310 /* JSDocPropertyTag */;
+        return node.kind === 312 /* JSDocPropertyTag */;
     }
     ts.isJSDocPropertyTag = isJSDocPropertyTag;
     function isJSDocPropertyLikeTag(node) {
-        return node.kind === 310 /* JSDocPropertyTag */ || node.kind === 304 /* JSDocParameterTag */;
+        return node.kind === 312 /* JSDocPropertyTag */ || node.kind === 306 /* JSDocParameterTag */;
     }
     ts.isJSDocPropertyLikeTag = isJSDocPropertyLikeTag;
     function isJSDocTypeLiteral(node) {
-        return node.kind === 297 /* JSDocTypeLiteral */;
+        return node.kind === 298 /* JSDocTypeLiteral */;
     }
     ts.isJSDocTypeLiteral = isJSDocTypeLiteral;
     function isJSDocCallbackTag(node) {
-        return node.kind === 302 /* JSDocCallbackTag */;
+        return node.kind === 304 /* JSDocCallbackTag */;
     }
     ts.isJSDocCallbackTag = isJSDocCallbackTag;
     function isJSDocSignature(node) {
-        return node.kind === 298 /* JSDocSignature */;
+        return node.kind === 299 /* JSDocSignature */;
     }
     ts.isJSDocSignature = isJSDocSignature;
 })(ts || (ts = {}));
@@ -14124,7 +14325,7 @@ var ts;
 (function (ts) {
     /* @internal */
     function isSyntaxList(n) {
-        return n.kind === 311 /* SyntaxList */;
+        return n.kind === 313 /* SyntaxList */;
     }
     ts.isSyntaxList = isSyntaxList;
     /* @internal */
@@ -14134,7 +14335,7 @@ var ts;
     ts.isNode = isNode;
     /* @internal */
     function isNodeKind(kind) {
-        return kind >= 148 /* FirstNode */;
+        return kind >= 149 /* FirstNode */;
     }
     ts.isNodeKind = isNodeKind;
     /**
@@ -14143,7 +14344,7 @@ var ts;
      * Literals are considered tokens, except TemplateLiteral, but does include TemplateHead/Middle/Tail.
      */
     function isToken(n) {
-        return n.kind >= 0 /* FirstToken */ && n.kind <= 147 /* LastToken */;
+        return n.kind >= 0 /* FirstToken */ && n.kind <= 148 /* LastToken */;
     }
     ts.isToken = isToken;
     // Node Arrays
@@ -14196,17 +14397,17 @@ var ts;
     /* @internal */
     function isModifierKind(token) {
         switch (token) {
-            case 118 /* AbstractKeyword */:
-            case 121 /* AsyncKeyword */:
-            case 77 /* ConstKeyword */:
-            case 125 /* DeclareKeyword */:
-            case 80 /* DefaultKeyword */:
-            case 85 /* ExportKeyword */:
-            case 115 /* PublicKeyword */:
-            case 113 /* PrivateKeyword */:
-            case 114 /* ProtectedKeyword */:
-            case 133 /* ReadonlyKeyword */:
-            case 116 /* StaticKeyword */:
+            case 119 /* AbstractKeyword */:
+            case 122 /* AsyncKeyword */:
+            case 78 /* ConstKeyword */:
+            case 126 /* DeclareKeyword */:
+            case 81 /* DefaultKeyword */:
+            case 86 /* ExportKeyword */:
+            case 116 /* PublicKeyword */:
+            case 114 /* PrivateKeyword */:
+            case 115 /* ProtectedKeyword */:
+            case 134 /* ReadonlyKeyword */:
+            case 117 /* StaticKeyword */:
                 return true;
         }
         return false;
@@ -14219,7 +14420,7 @@ var ts;
     ts.isParameterPropertyModifier = isParameterPropertyModifier;
     /* @internal */
     function isClassMemberModifier(idToken) {
-        return isParameterPropertyModifier(idToken) || idToken === 116 /* StaticKeyword */;
+        return isParameterPropertyModifier(idToken) || idToken === 117 /* StaticKeyword */;
     }
     ts.isClassMemberModifier = isClassMemberModifier;
     function isModifier(node) {
@@ -14228,23 +14429,23 @@ var ts;
     ts.isModifier = isModifier;
     function isEntityName(node) {
         var kind = node.kind;
-        return kind === 148 /* QualifiedName */
-            || kind === 72 /* Identifier */;
+        return kind === 149 /* QualifiedName */
+            || kind === 73 /* Identifier */;
     }
     ts.isEntityName = isEntityName;
     function isPropertyName(node) {
         var kind = node.kind;
-        return kind === 72 /* Identifier */
+        return kind === 73 /* Identifier */
             || kind === 10 /* StringLiteral */
             || kind === 8 /* NumericLiteral */
-            || kind === 149 /* ComputedPropertyName */;
+            || kind === 150 /* ComputedPropertyName */;
     }
     ts.isPropertyName = isPropertyName;
     function isBindingName(node) {
         var kind = node.kind;
-        return kind === 72 /* Identifier */
-            || kind === 184 /* ObjectBindingPattern */
-            || kind === 185 /* ArrayBindingPattern */;
+        return kind === 73 /* Identifier */
+            || kind === 185 /* ObjectBindingPattern */
+            || kind === 186 /* ArrayBindingPattern */;
     }
     ts.isBindingName = isBindingName;
     // Functions
@@ -14259,13 +14460,13 @@ var ts;
     ts.isFunctionLikeDeclaration = isFunctionLikeDeclaration;
     function isFunctionLikeDeclarationKind(kind) {
         switch (kind) {
-            case 239 /* FunctionDeclaration */:
-            case 156 /* MethodDeclaration */:
-            case 157 /* Constructor */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
-            case 196 /* FunctionExpression */:
-            case 197 /* ArrowFunction */:
+            case 240 /* FunctionDeclaration */:
+            case 157 /* MethodDeclaration */:
+            case 158 /* Constructor */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
+            case 197 /* FunctionExpression */:
+            case 198 /* ArrowFunction */:
                 return true;
             default:
                 return false;
@@ -14274,14 +14475,14 @@ var ts;
     /* @internal */
     function isFunctionLikeKind(kind) {
         switch (kind) {
-            case 155 /* MethodSignature */:
-            case 160 /* CallSignature */:
-            case 298 /* JSDocSignature */:
-            case 161 /* ConstructSignature */:
-            case 162 /* IndexSignature */:
-            case 165 /* FunctionType */:
-            case 294 /* JSDocFunctionType */:
-            case 166 /* ConstructorType */:
+            case 156 /* MethodSignature */:
+            case 161 /* CallSignature */:
+            case 299 /* JSDocSignature */:
+            case 162 /* ConstructSignature */:
+            case 163 /* IndexSignature */:
+            case 166 /* FunctionType */:
+            case 295 /* JSDocFunctionType */:
+            case 167 /* ConstructorType */:
                 return true;
             default:
                 return isFunctionLikeDeclarationKind(kind);
@@ -14296,29 +14497,29 @@ var ts;
     // Classes
     function isClassElement(node) {
         var kind = node.kind;
-        return kind === 157 /* Constructor */
-            || kind === 154 /* PropertyDeclaration */
-            || kind === 156 /* MethodDeclaration */
-            || kind === 158 /* GetAccessor */
-            || kind === 159 /* SetAccessor */
-            || kind === 162 /* IndexSignature */
-            || kind === 217 /* SemicolonClassElement */;
+        return kind === 158 /* Constructor */
+            || kind === 155 /* PropertyDeclaration */
+            || kind === 157 /* MethodDeclaration */
+            || kind === 159 /* GetAccessor */
+            || kind === 160 /* SetAccessor */
+            || kind === 163 /* IndexSignature */
+            || kind === 218 /* SemicolonClassElement */;
     }
     ts.isClassElement = isClassElement;
     function isClassLike(node) {
-        return node && (node.kind === 240 /* ClassDeclaration */ || node.kind === 209 /* ClassExpression */);
+        return node && (node.kind === 241 /* ClassDeclaration */ || node.kind === 210 /* ClassExpression */);
     }
     ts.isClassLike = isClassLike;
     function isAccessor(node) {
-        return node && (node.kind === 158 /* GetAccessor */ || node.kind === 159 /* SetAccessor */);
+        return node && (node.kind === 159 /* GetAccessor */ || node.kind === 160 /* SetAccessor */);
     }
     ts.isAccessor = isAccessor;
     /* @internal */
     function isMethodOrAccessor(node) {
         switch (node.kind) {
-            case 156 /* MethodDeclaration */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
+            case 157 /* MethodDeclaration */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
                 return true;
             default:
                 return false;
@@ -14328,11 +14529,11 @@ var ts;
     // Type members
     function isTypeElement(node) {
         var kind = node.kind;
-        return kind === 161 /* ConstructSignature */
-            || kind === 160 /* CallSignature */
-            || kind === 153 /* PropertySignature */
-            || kind === 155 /* MethodSignature */
-            || kind === 162 /* IndexSignature */;
+        return kind === 162 /* ConstructSignature */
+            || kind === 161 /* CallSignature */
+            || kind === 154 /* PropertySignature */
+            || kind === 156 /* MethodSignature */
+            || kind === 163 /* IndexSignature */;
     }
     ts.isTypeElement = isTypeElement;
     function isClassOrTypeElement(node) {
@@ -14341,12 +14542,12 @@ var ts;
     ts.isClassOrTypeElement = isClassOrTypeElement;
     function isObjectLiteralElementLike(node) {
         var kind = node.kind;
-        return kind === 275 /* PropertyAssignment */
-            || kind === 276 /* ShorthandPropertyAssignment */
-            || kind === 277 /* SpreadAssignment */
-            || kind === 156 /* MethodDeclaration */
-            || kind === 158 /* GetAccessor */
-            || kind === 159 /* SetAccessor */;
+        return kind === 276 /* PropertyAssignment */
+            || kind === 277 /* ShorthandPropertyAssignment */
+            || kind === 278 /* SpreadAssignment */
+            || kind === 157 /* MethodDeclaration */
+            || kind === 159 /* GetAccessor */
+            || kind === 160 /* SetAccessor */;
     }
     ts.isObjectLiteralElementLike = isObjectLiteralElementLike;
     // Type
@@ -14361,8 +14562,8 @@ var ts;
     ts.isTypeNode = isTypeNode;
     function isFunctionOrConstructorTypeNode(node) {
         switch (node.kind) {
-            case 165 /* FunctionType */:
-            case 166 /* ConstructorType */:
+            case 166 /* FunctionType */:
+            case 167 /* ConstructorType */:
                 return true;
         }
         return false;
@@ -14373,8 +14574,8 @@ var ts;
     function isBindingPattern(node) {
         if (node) {
             var kind = node.kind;
-            return kind === 185 /* ArrayBindingPattern */
-                || kind === 184 /* ObjectBindingPattern */;
+            return kind === 186 /* ArrayBindingPattern */
+                || kind === 185 /* ObjectBindingPattern */;
         }
         return false;
     }
@@ -14382,15 +14583,15 @@ var ts;
     /* @internal */
     function isAssignmentPattern(node) {
         var kind = node.kind;
-        return kind === 187 /* ArrayLiteralExpression */
-            || kind === 188 /* ObjectLiteralExpression */;
+        return kind === 188 /* ArrayLiteralExpression */
+            || kind === 189 /* ObjectLiteralExpression */;
     }
     ts.isAssignmentPattern = isAssignmentPattern;
     /* @internal */
     function isArrayBindingElement(node) {
         var kind = node.kind;
-        return kind === 186 /* BindingElement */
-            || kind === 210 /* OmittedExpression */;
+        return kind === 187 /* BindingElement */
+            || kind === 211 /* OmittedExpression */;
     }
     ts.isArrayBindingElement = isArrayBindingElement;
     /**
@@ -14399,9 +14600,9 @@ var ts;
     /* @internal */
     function isDeclarationBindingElement(bindingElement) {
         switch (bindingElement.kind) {
-            case 237 /* VariableDeclaration */:
-            case 151 /* Parameter */:
-            case 186 /* BindingElement */:
+            case 238 /* VariableDeclaration */:
+            case 152 /* Parameter */:
+            case 187 /* BindingElement */:
                 return true;
         }
         return false;
@@ -14422,8 +14623,8 @@ var ts;
     /* @internal */
     function isObjectBindingOrAssignmentPattern(node) {
         switch (node.kind) {
-            case 184 /* ObjectBindingPattern */:
-            case 188 /* ObjectLiteralExpression */:
+            case 185 /* ObjectBindingPattern */:
+            case 189 /* ObjectLiteralExpression */:
                 return true;
         }
         return false;
@@ -14435,8 +14636,8 @@ var ts;
     /* @internal */
     function isArrayBindingOrAssignmentPattern(node) {
         switch (node.kind) {
-            case 185 /* ArrayBindingPattern */:
-            case 187 /* ArrayLiteralExpression */:
+            case 186 /* ArrayBindingPattern */:
+            case 188 /* ArrayLiteralExpression */:
                 return true;
         }
         return false;
@@ -14445,26 +14646,26 @@ var ts;
     /* @internal */
     function isPropertyAccessOrQualifiedNameOrImportTypeNode(node) {
         var kind = node.kind;
-        return kind === 189 /* PropertyAccessExpression */
-            || kind === 148 /* QualifiedName */
-            || kind === 183 /* ImportType */;
+        return kind === 190 /* PropertyAccessExpression */
+            || kind === 149 /* QualifiedName */
+            || kind === 184 /* ImportType */;
     }
     ts.isPropertyAccessOrQualifiedNameOrImportTypeNode = isPropertyAccessOrQualifiedNameOrImportTypeNode;
     // Expression
     function isPropertyAccessOrQualifiedName(node) {
         var kind = node.kind;
-        return kind === 189 /* PropertyAccessExpression */
-            || kind === 148 /* QualifiedName */;
+        return kind === 190 /* PropertyAccessExpression */
+            || kind === 149 /* QualifiedName */;
     }
     ts.isPropertyAccessOrQualifiedName = isPropertyAccessOrQualifiedName;
     function isCallLikeExpression(node) {
         switch (node.kind) {
-            case 262 /* JsxOpeningElement */:
-            case 261 /* JsxSelfClosingElement */:
-            case 191 /* CallExpression */:
-            case 192 /* NewExpression */:
-            case 193 /* TaggedTemplateExpression */:
-            case 152 /* Decorator */:
+            case 263 /* JsxOpeningElement */:
+            case 262 /* JsxSelfClosingElement */:
+            case 192 /* CallExpression */:
+            case 193 /* NewExpression */:
+            case 194 /* TaggedTemplateExpression */:
+            case 153 /* Decorator */:
                 return true;
             default:
                 return false;
@@ -14472,12 +14673,12 @@ var ts;
     }
     ts.isCallLikeExpression = isCallLikeExpression;
     function isCallOrNewExpression(node) {
-        return node.kind === 191 /* CallExpression */ || node.kind === 192 /* NewExpression */;
+        return node.kind === 192 /* CallExpression */ || node.kind === 193 /* NewExpression */;
     }
     ts.isCallOrNewExpression = isCallOrNewExpression;
     function isTemplateLiteral(node) {
         var kind = node.kind;
-        return kind === 206 /* TemplateExpression */
+        return kind === 207 /* TemplateExpression */
             || kind === 14 /* NoSubstitutionTemplateLiteral */;
     }
     ts.isTemplateLiteral = isTemplateLiteral;
@@ -14488,34 +14689,34 @@ var ts;
     ts.isLeftHandSideExpression = isLeftHandSideExpression;
     function isLeftHandSideExpressionKind(kind) {
         switch (kind) {
-            case 189 /* PropertyAccessExpression */:
-            case 190 /* ElementAccessExpression */:
-            case 192 /* NewExpression */:
-            case 191 /* CallExpression */:
-            case 260 /* JsxElement */:
-            case 261 /* JsxSelfClosingElement */:
-            case 264 /* JsxFragment */:
-            case 193 /* TaggedTemplateExpression */:
-            case 187 /* ArrayLiteralExpression */:
-            case 195 /* ParenthesizedExpression */:
-            case 188 /* ObjectLiteralExpression */:
-            case 209 /* ClassExpression */:
-            case 196 /* FunctionExpression */:
-            case 72 /* Identifier */:
+            case 190 /* PropertyAccessExpression */:
+            case 191 /* ElementAccessExpression */:
+            case 193 /* NewExpression */:
+            case 192 /* CallExpression */:
+            case 261 /* JsxElement */:
+            case 262 /* JsxSelfClosingElement */:
+            case 265 /* JsxFragment */:
+            case 194 /* TaggedTemplateExpression */:
+            case 188 /* ArrayLiteralExpression */:
+            case 196 /* ParenthesizedExpression */:
+            case 189 /* ObjectLiteralExpression */:
+            case 210 /* ClassExpression */:
+            case 197 /* FunctionExpression */:
+            case 73 /* Identifier */:
             case 13 /* RegularExpressionLiteral */:
             case 8 /* NumericLiteral */:
             case 9 /* BigIntLiteral */:
             case 10 /* StringLiteral */:
             case 14 /* NoSubstitutionTemplateLiteral */:
-            case 206 /* TemplateExpression */:
-            case 87 /* FalseKeyword */:
-            case 96 /* NullKeyword */:
-            case 100 /* ThisKeyword */:
-            case 102 /* TrueKeyword */:
-            case 98 /* SuperKeyword */:
-            case 213 /* NonNullExpression */:
-            case 214 /* MetaProperty */:
-            case 92 /* ImportKeyword */: // technically this is only an Expression if it's in a CallExpression
+            case 207 /* TemplateExpression */:
+            case 88 /* FalseKeyword */:
+            case 97 /* NullKeyword */:
+            case 101 /* ThisKeyword */:
+            case 103 /* TrueKeyword */:
+            case 99 /* SuperKeyword */:
+            case 214 /* NonNullExpression */:
+            case 215 /* MetaProperty */:
+            case 93 /* ImportKeyword */: // technically this is only an Expression if it's in a CallExpression
                 return true;
             default:
                 return false;
@@ -14528,13 +14729,13 @@ var ts;
     ts.isUnaryExpression = isUnaryExpression;
     function isUnaryExpressionKind(kind) {
         switch (kind) {
-            case 202 /* PrefixUnaryExpression */:
-            case 203 /* PostfixUnaryExpression */:
-            case 198 /* DeleteExpression */:
-            case 199 /* TypeOfExpression */:
-            case 200 /* VoidExpression */:
-            case 201 /* AwaitExpression */:
-            case 194 /* TypeAssertionExpression */:
+            case 203 /* PrefixUnaryExpression */:
+            case 204 /* PostfixUnaryExpression */:
+            case 199 /* DeleteExpression */:
+            case 200 /* TypeOfExpression */:
+            case 201 /* VoidExpression */:
+            case 202 /* AwaitExpression */:
+            case 195 /* TypeAssertionExpression */:
                 return true;
             default:
                 return isLeftHandSideExpressionKind(kind);
@@ -14543,9 +14744,9 @@ var ts;
     /* @internal */
     function isUnaryExpressionWithWrite(expr) {
         switch (expr.kind) {
-            case 203 /* PostfixUnaryExpression */:
+            case 204 /* PostfixUnaryExpression */:
                 return true;
-            case 202 /* PrefixUnaryExpression */:
+            case 203 /* PrefixUnaryExpression */:
                 return expr.operator === 44 /* PlusPlusToken */ ||
                     expr.operator === 45 /* MinusMinusToken */;
             default:
@@ -14564,15 +14765,15 @@ var ts;
     ts.isExpression = isExpression;
     function isExpressionKind(kind) {
         switch (kind) {
-            case 205 /* ConditionalExpression */:
-            case 207 /* YieldExpression */:
-            case 197 /* ArrowFunction */:
-            case 204 /* BinaryExpression */:
-            case 208 /* SpreadElement */:
-            case 212 /* AsExpression */:
-            case 210 /* OmittedExpression */:
-            case 314 /* CommaListExpression */:
-            case 313 /* PartiallyEmittedExpression */:
+            case 206 /* ConditionalExpression */:
+            case 208 /* YieldExpression */:
+            case 198 /* ArrowFunction */:
+            case 205 /* BinaryExpression */:
+            case 209 /* SpreadElement */:
+            case 213 /* AsExpression */:
+            case 211 /* OmittedExpression */:
+            case 316 /* CommaListExpression */:
+            case 315 /* PartiallyEmittedExpression */:
                 return true;
             default:
                 return isUnaryExpressionKind(kind);
@@ -14580,18 +14781,18 @@ var ts;
     }
     function isAssertionExpression(node) {
         var kind = node.kind;
-        return kind === 194 /* TypeAssertionExpression */
-            || kind === 212 /* AsExpression */;
+        return kind === 195 /* TypeAssertionExpression */
+            || kind === 213 /* AsExpression */;
     }
     ts.isAssertionExpression = isAssertionExpression;
     /* @internal */
     function isPartiallyEmittedExpression(node) {
-        return node.kind === 313 /* PartiallyEmittedExpression */;
+        return node.kind === 315 /* PartiallyEmittedExpression */;
     }
     ts.isPartiallyEmittedExpression = isPartiallyEmittedExpression;
     /* @internal */
     function isNotEmittedStatement(node) {
-        return node.kind === 312 /* NotEmittedStatement */;
+        return node.kind === 314 /* NotEmittedStatement */;
     }
     ts.isNotEmittedStatement = isNotEmittedStatement;
     /* @internal */
@@ -14602,13 +14803,13 @@ var ts;
     ts.isNotEmittedOrPartiallyEmittedNode = isNotEmittedOrPartiallyEmittedNode;
     function isIterationStatement(node, lookInLabeledStatements) {
         switch (node.kind) {
-            case 225 /* ForStatement */:
-            case 226 /* ForInStatement */:
-            case 227 /* ForOfStatement */:
-            case 223 /* DoStatement */:
-            case 224 /* WhileStatement */:
+            case 226 /* ForStatement */:
+            case 227 /* ForInStatement */:
+            case 228 /* ForOfStatement */:
+            case 224 /* DoStatement */:
+            case 225 /* WhileStatement */:
                 return true;
-            case 233 /* LabeledStatement */:
+            case 234 /* LabeledStatement */:
                 return lookInLabeledStatements && isIterationStatement(node.statement, lookInLabeledStatements);
         }
         return false;
@@ -14616,7 +14817,7 @@ var ts;
     ts.isIterationStatement = isIterationStatement;
     /* @internal */
     function isForInOrOfStatement(node) {
-        return node.kind === 226 /* ForInStatement */ || node.kind === 227 /* ForOfStatement */;
+        return node.kind === 227 /* ForInStatement */ || node.kind === 228 /* ForOfStatement */;
     }
     ts.isForInOrOfStatement = isForInOrOfStatement;
     // Element
@@ -14640,113 +14841,113 @@ var ts;
     /* @internal */
     function isModuleBody(node) {
         var kind = node.kind;
-        return kind === 245 /* ModuleBlock */
-            || kind === 244 /* ModuleDeclaration */
-            || kind === 72 /* Identifier */;
+        return kind === 246 /* ModuleBlock */
+            || kind === 245 /* ModuleDeclaration */
+            || kind === 73 /* Identifier */;
     }
     ts.isModuleBody = isModuleBody;
     /* @internal */
     function isNamespaceBody(node) {
         var kind = node.kind;
-        return kind === 245 /* ModuleBlock */
-            || kind === 244 /* ModuleDeclaration */;
+        return kind === 246 /* ModuleBlock */
+            || kind === 245 /* ModuleDeclaration */;
     }
     ts.isNamespaceBody = isNamespaceBody;
     /* @internal */
     function isJSDocNamespaceBody(node) {
         var kind = node.kind;
-        return kind === 72 /* Identifier */
-            || kind === 244 /* ModuleDeclaration */;
+        return kind === 73 /* Identifier */
+            || kind === 245 /* ModuleDeclaration */;
     }
     ts.isJSDocNamespaceBody = isJSDocNamespaceBody;
     /* @internal */
     function isNamedImportBindings(node) {
         var kind = node.kind;
-        return kind === 252 /* NamedImports */
-            || kind === 251 /* NamespaceImport */;
+        return kind === 253 /* NamedImports */
+            || kind === 252 /* NamespaceImport */;
     }
     ts.isNamedImportBindings = isNamedImportBindings;
     /* @internal */
     function isModuleOrEnumDeclaration(node) {
-        return node.kind === 244 /* ModuleDeclaration */ || node.kind === 243 /* EnumDeclaration */;
+        return node.kind === 245 /* ModuleDeclaration */ || node.kind === 244 /* EnumDeclaration */;
     }
     ts.isModuleOrEnumDeclaration = isModuleOrEnumDeclaration;
     function isDeclarationKind(kind) {
-        return kind === 197 /* ArrowFunction */
-            || kind === 186 /* BindingElement */
-            || kind === 240 /* ClassDeclaration */
-            || kind === 209 /* ClassExpression */
-            || kind === 157 /* Constructor */
-            || kind === 243 /* EnumDeclaration */
-            || kind === 278 /* EnumMember */
-            || kind === 257 /* ExportSpecifier */
-            || kind === 239 /* FunctionDeclaration */
-            || kind === 196 /* FunctionExpression */
-            || kind === 158 /* GetAccessor */
-            || kind === 250 /* ImportClause */
-            || kind === 248 /* ImportEqualsDeclaration */
-            || kind === 253 /* ImportSpecifier */
-            || kind === 241 /* InterfaceDeclaration */
-            || kind === 267 /* JsxAttribute */
-            || kind === 156 /* MethodDeclaration */
-            || kind === 155 /* MethodSignature */
-            || kind === 244 /* ModuleDeclaration */
-            || kind === 247 /* NamespaceExportDeclaration */
-            || kind === 251 /* NamespaceImport */
-            || kind === 151 /* Parameter */
-            || kind === 275 /* PropertyAssignment */
-            || kind === 154 /* PropertyDeclaration */
-            || kind === 153 /* PropertySignature */
-            || kind === 159 /* SetAccessor */
-            || kind === 276 /* ShorthandPropertyAssignment */
-            || kind === 242 /* TypeAliasDeclaration */
-            || kind === 150 /* TypeParameter */
-            || kind === 237 /* VariableDeclaration */
-            || kind === 309 /* JSDocTypedefTag */
-            || kind === 302 /* JSDocCallbackTag */
-            || kind === 310 /* JSDocPropertyTag */;
+        return kind === 198 /* ArrowFunction */
+            || kind === 187 /* BindingElement */
+            || kind === 241 /* ClassDeclaration */
+            || kind === 210 /* ClassExpression */
+            || kind === 158 /* Constructor */
+            || kind === 244 /* EnumDeclaration */
+            || kind === 279 /* EnumMember */
+            || kind === 258 /* ExportSpecifier */
+            || kind === 240 /* FunctionDeclaration */
+            || kind === 197 /* FunctionExpression */
+            || kind === 159 /* GetAccessor */
+            || kind === 251 /* ImportClause */
+            || kind === 249 /* ImportEqualsDeclaration */
+            || kind === 254 /* ImportSpecifier */
+            || kind === 242 /* InterfaceDeclaration */
+            || kind === 268 /* JsxAttribute */
+            || kind === 157 /* MethodDeclaration */
+            || kind === 156 /* MethodSignature */
+            || kind === 245 /* ModuleDeclaration */
+            || kind === 248 /* NamespaceExportDeclaration */
+            || kind === 252 /* NamespaceImport */
+            || kind === 152 /* Parameter */
+            || kind === 276 /* PropertyAssignment */
+            || kind === 155 /* PropertyDeclaration */
+            || kind === 154 /* PropertySignature */
+            || kind === 160 /* SetAccessor */
+            || kind === 277 /* ShorthandPropertyAssignment */
+            || kind === 243 /* TypeAliasDeclaration */
+            || kind === 151 /* TypeParameter */
+            || kind === 238 /* VariableDeclaration */
+            || kind === 311 /* JSDocTypedefTag */
+            || kind === 304 /* JSDocCallbackTag */
+            || kind === 312 /* JSDocPropertyTag */;
     }
     function isDeclarationStatementKind(kind) {
-        return kind === 239 /* FunctionDeclaration */
-            || kind === 258 /* MissingDeclaration */
-            || kind === 240 /* ClassDeclaration */
-            || kind === 241 /* InterfaceDeclaration */
-            || kind === 242 /* TypeAliasDeclaration */
-            || kind === 243 /* EnumDeclaration */
-            || kind === 244 /* ModuleDeclaration */
-            || kind === 249 /* ImportDeclaration */
-            || kind === 248 /* ImportEqualsDeclaration */
-            || kind === 255 /* ExportDeclaration */
-            || kind === 254 /* ExportAssignment */
-            || kind === 247 /* NamespaceExportDeclaration */;
+        return kind === 240 /* FunctionDeclaration */
+            || kind === 259 /* MissingDeclaration */
+            || kind === 241 /* ClassDeclaration */
+            || kind === 242 /* InterfaceDeclaration */
+            || kind === 243 /* TypeAliasDeclaration */
+            || kind === 244 /* EnumDeclaration */
+            || kind === 245 /* ModuleDeclaration */
+            || kind === 250 /* ImportDeclaration */
+            || kind === 249 /* ImportEqualsDeclaration */
+            || kind === 256 /* ExportDeclaration */
+            || kind === 255 /* ExportAssignment */
+            || kind === 248 /* NamespaceExportDeclaration */;
     }
     function isStatementKindButNotDeclarationKind(kind) {
-        return kind === 229 /* BreakStatement */
-            || kind === 228 /* ContinueStatement */
-            || kind === 236 /* DebuggerStatement */
-            || kind === 223 /* DoStatement */
-            || kind === 221 /* ExpressionStatement */
-            || kind === 220 /* EmptyStatement */
-            || kind === 226 /* ForInStatement */
-            || kind === 227 /* ForOfStatement */
-            || kind === 225 /* ForStatement */
-            || kind === 222 /* IfStatement */
-            || kind === 233 /* LabeledStatement */
-            || kind === 230 /* ReturnStatement */
-            || kind === 232 /* SwitchStatement */
-            || kind === 234 /* ThrowStatement */
-            || kind === 235 /* TryStatement */
-            || kind === 219 /* VariableStatement */
-            || kind === 224 /* WhileStatement */
-            || kind === 231 /* WithStatement */
-            || kind === 312 /* NotEmittedStatement */
-            || kind === 316 /* EndOfDeclarationMarker */
-            || kind === 315 /* MergeDeclarationMarker */;
+        return kind === 230 /* BreakStatement */
+            || kind === 229 /* ContinueStatement */
+            || kind === 237 /* DebuggerStatement */
+            || kind === 224 /* DoStatement */
+            || kind === 222 /* ExpressionStatement */
+            || kind === 221 /* EmptyStatement */
+            || kind === 227 /* ForInStatement */
+            || kind === 228 /* ForOfStatement */
+            || kind === 226 /* ForStatement */
+            || kind === 223 /* IfStatement */
+            || kind === 234 /* LabeledStatement */
+            || kind === 231 /* ReturnStatement */
+            || kind === 233 /* SwitchStatement */
+            || kind === 235 /* ThrowStatement */
+            || kind === 236 /* TryStatement */
+            || kind === 220 /* VariableStatement */
+            || kind === 225 /* WhileStatement */
+            || kind === 232 /* WithStatement */
+            || kind === 314 /* NotEmittedStatement */
+            || kind === 318 /* EndOfDeclarationMarker */
+            || kind === 317 /* MergeDeclarationMarker */;
     }
     /* @internal */
     function isDeclaration(node) {
-        if (node.kind === 150 /* TypeParameter */) {
-            return (node.parent && node.parent.kind !== 308 /* JSDocTemplateTag */) || ts.isInJSFile(node);
+        if (node.kind === 151 /* TypeParameter */) {
+            return (node.parent && node.parent.kind !== 310 /* JSDocTemplateTag */) || ts.isInJSFile(node);
         }
         return isDeclarationKind(node.kind);
     }
@@ -14773,10 +14974,10 @@ var ts;
     }
     ts.isStatement = isStatement;
     function isBlockStatement(node) {
-        if (node.kind !== 218 /* Block */)
+        if (node.kind !== 219 /* Block */)
             return false;
         if (node.parent !== undefined) {
-            if (node.parent.kind === 235 /* TryStatement */ || node.parent.kind === 274 /* CatchClause */) {
+            if (node.parent.kind === 236 /* TryStatement */ || node.parent.kind === 275 /* CatchClause */) {
                 return false;
             }
         }
@@ -14786,81 +14987,81 @@ var ts;
     /* @internal */
     function isModuleReference(node) {
         var kind = node.kind;
-        return kind === 259 /* ExternalModuleReference */
-            || kind === 148 /* QualifiedName */
-            || kind === 72 /* Identifier */;
+        return kind === 260 /* ExternalModuleReference */
+            || kind === 149 /* QualifiedName */
+            || kind === 73 /* Identifier */;
     }
     ts.isModuleReference = isModuleReference;
     // JSX
     /* @internal */
     function isJsxTagNameExpression(node) {
         var kind = node.kind;
-        return kind === 100 /* ThisKeyword */
-            || kind === 72 /* Identifier */
-            || kind === 189 /* PropertyAccessExpression */;
+        return kind === 101 /* ThisKeyword */
+            || kind === 73 /* Identifier */
+            || kind === 190 /* PropertyAccessExpression */;
     }
     ts.isJsxTagNameExpression = isJsxTagNameExpression;
     /* @internal */
     function isJsxChild(node) {
         var kind = node.kind;
-        return kind === 260 /* JsxElement */
-            || kind === 270 /* JsxExpression */
-            || kind === 261 /* JsxSelfClosingElement */
+        return kind === 261 /* JsxElement */
+            || kind === 271 /* JsxExpression */
+            || kind === 262 /* JsxSelfClosingElement */
             || kind === 11 /* JsxText */
-            || kind === 264 /* JsxFragment */;
+            || kind === 265 /* JsxFragment */;
     }
     ts.isJsxChild = isJsxChild;
     /* @internal */
     function isJsxAttributeLike(node) {
         var kind = node.kind;
-        return kind === 267 /* JsxAttribute */
-            || kind === 269 /* JsxSpreadAttribute */;
+        return kind === 268 /* JsxAttribute */
+            || kind === 270 /* JsxSpreadAttribute */;
     }
     ts.isJsxAttributeLike = isJsxAttributeLike;
     /* @internal */
     function isStringLiteralOrJsxExpression(node) {
         var kind = node.kind;
         return kind === 10 /* StringLiteral */
-            || kind === 270 /* JsxExpression */;
+            || kind === 271 /* JsxExpression */;
     }
     ts.isStringLiteralOrJsxExpression = isStringLiteralOrJsxExpression;
     function isJsxOpeningLikeElement(node) {
         var kind = node.kind;
-        return kind === 262 /* JsxOpeningElement */
-            || kind === 261 /* JsxSelfClosingElement */;
+        return kind === 263 /* JsxOpeningElement */
+            || kind === 262 /* JsxSelfClosingElement */;
     }
     ts.isJsxOpeningLikeElement = isJsxOpeningLikeElement;
     // Clauses
     function isCaseOrDefaultClause(node) {
         var kind = node.kind;
-        return kind === 271 /* CaseClause */
-            || kind === 272 /* DefaultClause */;
+        return kind === 272 /* CaseClause */
+            || kind === 273 /* DefaultClause */;
     }
     ts.isCaseOrDefaultClause = isCaseOrDefaultClause;
     // JSDoc
     /** True if node is of some JSDoc syntax kind. */
     /* @internal */
     function isJSDocNode(node) {
-        return node.kind >= 288 /* FirstJSDocNode */ && node.kind <= 310 /* LastJSDocNode */;
+        return node.kind >= 289 /* FirstJSDocNode */ && node.kind <= 312 /* LastJSDocNode */;
     }
     ts.isJSDocNode = isJSDocNode;
     /** True if node is of a kind that may contain comment text. */
     function isJSDocCommentContainingNode(node) {
-        return node.kind === 296 /* JSDocComment */ || isJSDocTag(node) || ts.isJSDocTypeLiteral(node) || ts.isJSDocSignature(node);
+        return node.kind === 297 /* JSDocComment */ || isJSDocTag(node) || ts.isJSDocTypeLiteral(node) || ts.isJSDocSignature(node);
     }
     ts.isJSDocCommentContainingNode = isJSDocCommentContainingNode;
     // TODO: determine what this does before making it public.
     /* @internal */
     function isJSDocTag(node) {
-        return node.kind >= 299 /* FirstJSDocTagNode */ && node.kind <= 310 /* LastJSDocTagNode */;
+        return node.kind >= 300 /* FirstJSDocTagNode */ && node.kind <= 312 /* LastJSDocTagNode */;
     }
     ts.isJSDocTag = isJSDocTag;
     function isSetAccessor(node) {
-        return node.kind === 159 /* SetAccessor */;
+        return node.kind === 160 /* SetAccessor */;
     }
     ts.isSetAccessor = isSetAccessor;
     function isGetAccessor(node) {
-        return node.kind === 158 /* GetAccessor */;
+        return node.kind === 159 /* GetAccessor */;
     }
     ts.isGetAccessor = isGetAccessor;
     /** True if has jsdoc nodes attached to it. */
@@ -14890,12 +15091,12 @@ var ts;
     }
     ts.hasOnlyExpressionInitializer = hasOnlyExpressionInitializer;
     function isObjectLiteralElement(node) {
-        return node.kind === 267 /* JsxAttribute */ || node.kind === 269 /* JsxSpreadAttribute */ || isObjectLiteralElementLike(node);
+        return node.kind === 268 /* JsxAttribute */ || node.kind === 270 /* JsxSpreadAttribute */ || isObjectLiteralElementLike(node);
     }
     ts.isObjectLiteralElement = isObjectLiteralElement;
     /* @internal */
     function isTypeReferenceType(node) {
-        return node.kind === 164 /* TypeReference */ || node.kind === 211 /* ExpressionWithTypeArguments */;
+        return node.kind === 165 /* TypeReference */ || node.kind === 212 /* ExpressionWithTypeArguments */;
     }
     ts.isTypeReferenceType = isTypeReferenceType;
     var MAX_SMI_X86 = 1073741823;
@@ -14931,7 +15132,7 @@ var ts;
 /* @internal */
 (function (ts) {
     function isNamedImportsOrExports(node) {
-        return node.kind === 252 /* NamedImports */ || node.kind === 256 /* NamedExports */;
+        return node.kind === 253 /* NamedImports */ || node.kind === 257 /* NamedExports */;
     }
     ts.isNamedImportsOrExports = isNamedImportsOrExports;
     function Symbol(flags, name) {
@@ -15051,17 +15252,16 @@ var ts;
             messageText: text,
             category: message.category,
             code: message.code,
-            next: details
+            next: details === undefined || Array.isArray(details) ? details : [details]
         };
     }
     ts.chainDiagnosticMessages = chainDiagnosticMessages;
     function concatenateDiagnosticMessageChains(headChain, tailChain) {
         var lastChain = headChain;
         while (lastChain.next) {
-            lastChain = lastChain.next;
+            lastChain = lastChain.next[0];
         }
-        lastChain.next = tailChain;
-        return headChain;
+        lastChain.next = [tailChain];
     }
     ts.concatenateDiagnosticMessageChains = concatenateDiagnosticMessageChains;
     function getDiagnosticFilePath(diagnostic) {
@@ -15095,25 +15295,42 @@ var ts;
         return d1.relatedInformation ? -1 /* LessThan */ : 1 /* GreaterThan */;
     }
     function compareMessageText(t1, t2) {
-        var text1 = t1;
-        var text2 = t2;
-        while (text1 && text2) {
-            // We still have both chains.
-            var string1 = ts.isString(text1) ? text1 : text1.messageText;
-            var string2 = ts.isString(text2) ? text2 : text2.messageText;
-            var res = ts.compareStringsCaseSensitive(string1, string2);
+        if (typeof t1 === "string" && typeof t2 === "string") {
+            return ts.compareStringsCaseSensitive(t1, t2);
+        }
+        else if (typeof t1 === "string") {
+            return -1 /* LessThan */;
+        }
+        else if (typeof t2 === "string") {
+            return 1 /* GreaterThan */;
+        }
+        var res = ts.compareStringsCaseSensitive(t1.messageText, t2.messageText);
+        if (res) {
+            return res;
+        }
+        if (!t1.next && !t2.next) {
+            return 0 /* EqualTo */;
+        }
+        if (!t1.next) {
+            return -1 /* LessThan */;
+        }
+        if (!t2.next) {
+            return 1 /* GreaterThan */;
+        }
+        var len = Math.min(t1.next.length, t2.next.length);
+        for (var i = 0; i < len; i++) {
+            res = compareMessageText(t1.next[i], t2.next[i]);
             if (res) {
                 return res;
             }
-            text1 = ts.isString(text1) ? undefined : text1.next;
-            text2 = ts.isString(text2) ? undefined : text2.next;
         }
-        if (!text1 && !text2) {
-            // if the chains are done, then these messages are the same.
-            return 0 /* EqualTo */;
+        if (t1.next.length < t2.next.length) {
+            return -1 /* LessThan */;
         }
-        // We still have one chain remaining.  The shorter chain should come first.
-        return text1 ? 1 /* GreaterThan */ : -1 /* LessThan */;
+        else if (t1.next.length > t2.next.length) {
+            return 1 /* GreaterThan */;
+        }
+        return 0 /* EqualTo */;
     }
     function getEmitScriptTarget(compilerOptions) {
         return compilerOptions.target || 0 /* ES3 */;
@@ -15182,6 +15399,11 @@ var ts;
             ts.semanticDiagnosticsOptionDeclarations.some(function (option) { return !ts.isJsonEqual(getCompilerOptionValue(oldOptions, option), getCompilerOptionValue(newOptions, option)); });
     }
     ts.compilerOptionsAffectSemanticDiagnostics = compilerOptionsAffectSemanticDiagnostics;
+    function compilerOptionsAffectEmit(newOptions, oldOptions) {
+        return oldOptions !== newOptions &&
+            ts.affectsEmitOptionDeclarations.some(function (option) { return !ts.isJsonEqual(getCompilerOptionValue(oldOptions, option), getCompilerOptionValue(newOptions, option)); });
+    }
+    ts.compilerOptionsAffectEmit = compilerOptionsAffectEmit;
     function getCompilerOptionValue(options, option) {
         return option.strictFlag ? getStrictOptionValue(options, option.name) : options[option.name];
     }
@@ -15460,6 +15682,15 @@ var ts;
         return root + pathComponents.slice(1).join(ts.directorySeparator);
     }
     ts.getPathFromPathComponents = getPathFromPathComponents;
+    function getNormalizedAbsolutePathWithoutRoot(fileName, currentDirectory) {
+        return getPathWithoutRoot(getNormalizedPathComponents(fileName, currentDirectory));
+    }
+    ts.getNormalizedAbsolutePathWithoutRoot = getNormalizedAbsolutePathWithoutRoot;
+    function getPathWithoutRoot(pathComponents) {
+        if (pathComponents.length === 0)
+            return "";
+        return pathComponents.slice(1).join(ts.directorySeparator);
+    }
 })(ts || (ts = {}));
 /* @internal */
 (function (ts) {
@@ -15490,7 +15721,7 @@ var ts;
     }
     ts.getRelativePathFromFile = getRelativePathFromFile;
     function getRelativePathFromDirectory(fromDirectory, to, getCanonicalFileNameOrIgnoreCase) {
-        Debug.assert((ts.getRootLength(fromDirectory) > 0) === (ts.getRootLength(to) > 0), "Paths must either both be absolute or both be relative");
+        ts.Debug.assert((ts.getRootLength(fromDirectory) > 0) === (ts.getRootLength(to) > 0), "Paths must either both be absolute or both be relative");
         var getCanonicalFileName = typeof getCanonicalFileNameOrIgnoreCase === "function" ? getCanonicalFileNameOrIgnoreCase : ts.identity;
         var ignoreCase = typeof getCanonicalFileNameOrIgnoreCase === "boolean" ? getCanonicalFileNameOrIgnoreCase : false;
         var pathComponents = getPathComponentsRelativeTo(fromDirectory, to, ignoreCase ? ts.equateStringsCaseInsensitive : ts.equateStringsCaseSensitive, getCanonicalFileName);
@@ -15860,7 +16091,7 @@ var ts;
     }
     ts.getRegexFromPattern = getRegexFromPattern;
     /** @param path directory of the tsconfig.json */
-    function matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory, depth, getFileSystemEntries) {
+    function matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory, depth, getFileSystemEntries, realpath) {
         path = ts.normalizePath(path);
         currentDirectory = ts.normalizePath(currentDirectory);
         var patterns = getFileMatcherPatterns(path, excludes, includes, useCaseSensitiveFileNames, currentDirectory);
@@ -15870,12 +16101,18 @@ var ts;
         // Associate an array of results with each include regex. This keeps results in order of the "include" order.
         // If there are no "includes", then just put everything in results[0].
         var results = includeFileRegexes ? includeFileRegexes.map(function () { return []; }) : [[]];
+        var visited = ts.createMap();
+        var toCanonical = ts.createGetCanonicalFileName(useCaseSensitiveFileNames);
         for (var _i = 0, _a = patterns.basePaths; _i < _a.length; _i++) {
             var basePath = _a[_i];
             visitDirectory(basePath, combinePaths(currentDirectory, basePath), depth);
         }
         return ts.flatten(results);
         function visitDirectory(path, absolutePath, depth) {
+            var canonicalPath = toCanonical(realpath(absolutePath));
+            if (visited.has(canonicalPath))
+                return;
+            visited.set(canonicalPath, true);
             var _a = getFileSystemEntries(path), files = _a.files, directories = _a.directories;
             var _loop_1 = function (current) {
                 var name = combinePaths(path, current);
@@ -16128,32 +16365,9 @@ var ts;
         return pathext ? path.slice(0, path.length - pathext.length) + (ts.startsWith(ext, ".") ? ext : "." + ext) : path;
     }
     ts.changeAnyExtension = changeAnyExtension;
-    var Debug;
-    (function (Debug) {
-        function showSymbol(symbol) {
-            var symbolFlags = ts.SymbolFlags;
-            return "{ flags: " + (symbolFlags ? showFlags(symbol.flags, symbolFlags) : symbol.flags) + "; declarations: " + ts.map(symbol.declarations, showSyntaxKind) + " }";
-        }
-        Debug.showSymbol = showSymbol;
-        function showFlags(flags, flagsEnum) {
-            var out = [];
-            for (var pow = 0; pow <= 30; pow++) {
-                var n = 1 << pow;
-                if (flags & n) {
-                    out.push(flagsEnum[n]);
-                }
-            }
-            return out.join("|");
-        }
-        function showSyntaxKind(node) {
-            var syntaxKind = ts.SyntaxKind;
-            return syntaxKind ? syntaxKind[node.kind] : node.kind.toString();
-        }
-        Debug.showSyntaxKind = showSyntaxKind;
-    })(Debug = ts.Debug || (ts.Debug = {}));
     function tryParsePattern(pattern) {
         // This should be verified outside of here and a proper error thrown.
-        Debug.assert(ts.hasZeroOrOneAsteriskCharacter(pattern));
+        ts.Debug.assert(ts.hasZeroOrOneAsteriskCharacter(pattern));
         var indexOfStar = pattern.indexOf("*");
         return indexOfStar === -1 ? undefined : {
             prefix: pattern.substr(0, indexOfStar),
@@ -16182,7 +16396,7 @@ var ts;
      */
     function extensionFromPath(path) {
         var ext = tryGetExtensionFromPath(path);
-        return ext !== undefined ? ext : Debug.fail("File " + path + " has unknown extension.");
+        return ext !== undefined ? ext : ts.Debug.fail("File " + path + " has unknown extension.");
     }
     ts.extensionFromPath = extensionFromPath;
     function isAnySupportedFileExtension(path) {
@@ -16254,12 +16468,25 @@ var ts;
     ts.matchPatternOrExact = matchPatternOrExact;
     function sliceAfter(arr, value) {
         var index = arr.indexOf(value);
-        Debug.assert(index !== -1);
+        ts.Debug.assert(index !== -1);
         return arr.slice(index);
     }
     ts.sliceAfter = sliceAfter;
+    function addRelatedInfo(diagnostic) {
+        var _a;
+        var relatedInformation = [];
+        for (var _i = 1; _i < arguments.length; _i++) {
+            relatedInformation[_i - 1] = arguments[_i];
+        }
+        if (!diagnostic.relatedInformation) {
+            diagnostic.relatedInformation = [];
+        }
+        (_a = diagnostic.relatedInformation).push.apply(_a, relatedInformation);
+        return diagnostic;
+    }
+    ts.addRelatedInfo = addRelatedInfo;
     function minAndMax(arr, getValue) {
-        Debug.assert(arr.length !== 0);
+        ts.Debug.assert(arr.length !== 0);
         var min = getValue(arr[0]);
         var max = min;
         for (var i = 1; i < arr.length; i++) {
@@ -16457,10 +16684,10 @@ var ts;
     var SourceFileConstructor;
     // tslint:enable variable-name
     function createNode(kind, pos, end) {
-        if (kind === 284 /* SourceFile */) {
+        if (kind === 285 /* SourceFile */) {
             return new (SourceFileConstructor || (SourceFileConstructor = ts.objectAllocator.getSourceFileConstructor()))(kind, pos, end);
         }
-        else if (kind === 72 /* Identifier */) {
+        else if (kind === 73 /* Identifier */) {
             return new (IdentifierConstructor || (IdentifierConstructor = ts.objectAllocator.getIdentifierConstructor()))(kind, pos, end);
         }
         else if (!ts.isNodeKind(kind)) {
@@ -16509,19 +16736,19 @@ var ts;
      * that they appear in the source code. The language service depends on this property to locate nodes by position.
      */
     function forEachChild(node, cbNode, cbNodes) {
-        if (!node || node.kind <= 147 /* LastToken */) {
+        if (!node || node.kind <= 148 /* LastToken */) {
             return;
         }
         switch (node.kind) {
-            case 148 /* QualifiedName */:
+            case 149 /* QualifiedName */:
                 return visitNode(cbNode, node.left) ||
                     visitNode(cbNode, node.right);
-            case 150 /* TypeParameter */:
+            case 151 /* TypeParameter */:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.constraint) ||
                     visitNode(cbNode, node.default) ||
                     visitNode(cbNode, node.expression);
-            case 276 /* ShorthandPropertyAssignment */:
+            case 277 /* ShorthandPropertyAssignment */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
@@ -16529,9 +16756,9 @@ var ts;
                     visitNode(cbNode, node.exclamationToken) ||
                     visitNode(cbNode, node.equalsToken) ||
                     visitNode(cbNode, node.objectAssignmentInitializer);
-            case 277 /* SpreadAssignment */:
+            case 278 /* SpreadAssignment */:
                 return visitNode(cbNode, node.expression);
-            case 151 /* Parameter */:
+            case 152 /* Parameter */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.dotDotDotToken) ||
@@ -16539,7 +16766,7 @@ var ts;
                     visitNode(cbNode, node.questionToken) ||
                     visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.initializer);
-            case 154 /* PropertyDeclaration */:
+            case 155 /* PropertyDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
@@ -16547,51 +16774,51 @@ var ts;
                     visitNode(cbNode, node.exclamationToken) ||
                     visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.initializer);
-            case 153 /* PropertySignature */:
+            case 154 /* PropertySignature */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.questionToken) ||
                     visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.initializer);
-            case 275 /* PropertyAssignment */:
+            case 276 /* PropertyAssignment */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.questionToken) ||
                     visitNode(cbNode, node.initializer);
-            case 237 /* VariableDeclaration */:
+            case 238 /* VariableDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.exclamationToken) ||
                     visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.initializer);
-            case 186 /* BindingElement */:
+            case 187 /* BindingElement */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.dotDotDotToken) ||
                     visitNode(cbNode, node.propertyName) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.initializer);
-            case 165 /* FunctionType */:
-            case 166 /* ConstructorType */:
-            case 160 /* CallSignature */:
-            case 161 /* ConstructSignature */:
-            case 162 /* IndexSignature */:
+            case 166 /* FunctionType */:
+            case 167 /* ConstructorType */:
+            case 161 /* CallSignature */:
+            case 162 /* ConstructSignature */:
+            case 163 /* IndexSignature */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNodes(cbNode, cbNodes, node.typeParameters) ||
                     visitNodes(cbNode, cbNodes, node.parameters) ||
                     visitNode(cbNode, node.type);
-            case 156 /* MethodDeclaration */:
-            case 155 /* MethodSignature */:
-            case 157 /* Constructor */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
-            case 196 /* FunctionExpression */:
-            case 239 /* FunctionDeclaration */:
-            case 197 /* ArrowFunction */:
+            case 157 /* MethodDeclaration */:
+            case 156 /* MethodSignature */:
+            case 158 /* Constructor */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
+            case 197 /* FunctionExpression */:
+            case 240 /* FunctionDeclaration */:
+            case 198 /* ArrowFunction */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.asteriskToken) ||
@@ -16603,343 +16830,345 @@ var ts;
                     visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.equalsGreaterThanToken) ||
                     visitNode(cbNode, node.body);
-            case 164 /* TypeReference */:
+            case 165 /* TypeReference */:
                 return visitNode(cbNode, node.typeName) ||
                     visitNodes(cbNode, cbNodes, node.typeArguments);
-            case 163 /* TypePredicate */:
+            case 164 /* TypePredicate */:
                 return visitNode(cbNode, node.parameterName) ||
                     visitNode(cbNode, node.type);
-            case 167 /* TypeQuery */:
+            case 168 /* TypeQuery */:
                 return visitNode(cbNode, node.exprName);
-            case 168 /* TypeLiteral */:
+            case 169 /* TypeLiteral */:
                 return visitNodes(cbNode, cbNodes, node.members);
-            case 169 /* ArrayType */:
+            case 170 /* ArrayType */:
                 return visitNode(cbNode, node.elementType);
-            case 170 /* TupleType */:
+            case 171 /* TupleType */:
                 return visitNodes(cbNode, cbNodes, node.elementTypes);
-            case 173 /* UnionType */:
-            case 174 /* IntersectionType */:
+            case 174 /* UnionType */:
+            case 175 /* IntersectionType */:
                 return visitNodes(cbNode, cbNodes, node.types);
-            case 175 /* ConditionalType */:
+            case 176 /* ConditionalType */:
                 return visitNode(cbNode, node.checkType) ||
                     visitNode(cbNode, node.extendsType) ||
                     visitNode(cbNode, node.trueType) ||
                     visitNode(cbNode, node.falseType);
-            case 176 /* InferType */:
+            case 177 /* InferType */:
                 return visitNode(cbNode, node.typeParameter);
-            case 183 /* ImportType */:
+            case 184 /* ImportType */:
                 return visitNode(cbNode, node.argument) ||
                     visitNode(cbNode, node.qualifier) ||
                     visitNodes(cbNode, cbNodes, node.typeArguments);
-            case 177 /* ParenthesizedType */:
-            case 179 /* TypeOperator */:
+            case 178 /* ParenthesizedType */:
+            case 180 /* TypeOperator */:
                 return visitNode(cbNode, node.type);
-            case 180 /* IndexedAccessType */:
+            case 181 /* IndexedAccessType */:
                 return visitNode(cbNode, node.objectType) ||
                     visitNode(cbNode, node.indexType);
-            case 181 /* MappedType */:
+            case 182 /* MappedType */:
                 return visitNode(cbNode, node.readonlyToken) ||
                     visitNode(cbNode, node.typeParameter) ||
                     visitNode(cbNode, node.questionToken) ||
                     visitNode(cbNode, node.type);
-            case 182 /* LiteralType */:
+            case 183 /* LiteralType */:
                 return visitNode(cbNode, node.literal);
-            case 184 /* ObjectBindingPattern */:
-            case 185 /* ArrayBindingPattern */:
+            case 185 /* ObjectBindingPattern */:
+            case 186 /* ArrayBindingPattern */:
                 return visitNodes(cbNode, cbNodes, node.elements);
-            case 187 /* ArrayLiteralExpression */:
+            case 188 /* ArrayLiteralExpression */:
                 return visitNodes(cbNode, cbNodes, node.elements);
-            case 188 /* ObjectLiteralExpression */:
+            case 189 /* ObjectLiteralExpression */:
                 return visitNodes(cbNode, cbNodes, node.properties);
-            case 189 /* PropertyAccessExpression */:
+            case 190 /* PropertyAccessExpression */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.name);
-            case 190 /* ElementAccessExpression */:
+            case 191 /* ElementAccessExpression */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.argumentExpression);
-            case 191 /* CallExpression */:
-            case 192 /* NewExpression */:
+            case 192 /* CallExpression */:
+            case 193 /* NewExpression */:
                 return visitNode(cbNode, node.expression) ||
                     visitNodes(cbNode, cbNodes, node.typeArguments) ||
                     visitNodes(cbNode, cbNodes, node.arguments);
-            case 193 /* TaggedTemplateExpression */:
+            case 194 /* TaggedTemplateExpression */:
                 return visitNode(cbNode, node.tag) ||
                     visitNodes(cbNode, cbNodes, node.typeArguments) ||
                     visitNode(cbNode, node.template);
-            case 194 /* TypeAssertionExpression */:
+            case 195 /* TypeAssertionExpression */:
                 return visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.expression);
-            case 195 /* ParenthesizedExpression */:
+            case 196 /* ParenthesizedExpression */:
                 return visitNode(cbNode, node.expression);
-            case 198 /* DeleteExpression */:
+            case 199 /* DeleteExpression */:
                 return visitNode(cbNode, node.expression);
-            case 199 /* TypeOfExpression */:
+            case 200 /* TypeOfExpression */:
                 return visitNode(cbNode, node.expression);
-            case 200 /* VoidExpression */:
+            case 201 /* VoidExpression */:
                 return visitNode(cbNode, node.expression);
-            case 202 /* PrefixUnaryExpression */:
+            case 203 /* PrefixUnaryExpression */:
                 return visitNode(cbNode, node.operand);
-            case 207 /* YieldExpression */:
+            case 208 /* YieldExpression */:
                 return visitNode(cbNode, node.asteriskToken) ||
                     visitNode(cbNode, node.expression);
-            case 201 /* AwaitExpression */:
+            case 202 /* AwaitExpression */:
                 return visitNode(cbNode, node.expression);
-            case 203 /* PostfixUnaryExpression */:
+            case 204 /* PostfixUnaryExpression */:
                 return visitNode(cbNode, node.operand);
-            case 204 /* BinaryExpression */:
+            case 205 /* BinaryExpression */:
                 return visitNode(cbNode, node.left) ||
                     visitNode(cbNode, node.operatorToken) ||
                     visitNode(cbNode, node.right);
-            case 212 /* AsExpression */:
+            case 213 /* AsExpression */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.type);
-            case 213 /* NonNullExpression */:
+            case 214 /* NonNullExpression */:
                 return visitNode(cbNode, node.expression);
-            case 214 /* MetaProperty */:
+            case 215 /* MetaProperty */:
                 return visitNode(cbNode, node.name);
-            case 205 /* ConditionalExpression */:
+            case 206 /* ConditionalExpression */:
                 return visitNode(cbNode, node.condition) ||
                     visitNode(cbNode, node.questionToken) ||
                     visitNode(cbNode, node.whenTrue) ||
                     visitNode(cbNode, node.colonToken) ||
                     visitNode(cbNode, node.whenFalse);
-            case 208 /* SpreadElement */:
+            case 209 /* SpreadElement */:
                 return visitNode(cbNode, node.expression);
-            case 218 /* Block */:
-            case 245 /* ModuleBlock */:
+            case 219 /* Block */:
+            case 246 /* ModuleBlock */:
                 return visitNodes(cbNode, cbNodes, node.statements);
-            case 284 /* SourceFile */:
+            case 285 /* SourceFile */:
                 return visitNodes(cbNode, cbNodes, node.statements) ||
                     visitNode(cbNode, node.endOfFileToken);
-            case 219 /* VariableStatement */:
+            case 220 /* VariableStatement */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.declarationList);
-            case 238 /* VariableDeclarationList */:
+            case 239 /* VariableDeclarationList */:
                 return visitNodes(cbNode, cbNodes, node.declarations);
-            case 221 /* ExpressionStatement */:
+            case 222 /* ExpressionStatement */:
                 return visitNode(cbNode, node.expression);
-            case 222 /* IfStatement */:
+            case 223 /* IfStatement */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.thenStatement) ||
                     visitNode(cbNode, node.elseStatement);
-            case 223 /* DoStatement */:
+            case 224 /* DoStatement */:
                 return visitNode(cbNode, node.statement) ||
                     visitNode(cbNode, node.expression);
-            case 224 /* WhileStatement */:
+            case 225 /* WhileStatement */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.statement);
-            case 225 /* ForStatement */:
+            case 226 /* ForStatement */:
                 return visitNode(cbNode, node.initializer) ||
                     visitNode(cbNode, node.condition) ||
                     visitNode(cbNode, node.incrementor) ||
                     visitNode(cbNode, node.statement);
-            case 226 /* ForInStatement */:
+            case 227 /* ForInStatement */:
                 return visitNode(cbNode, node.initializer) ||
                     visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.statement);
-            case 227 /* ForOfStatement */:
+            case 228 /* ForOfStatement */:
                 return visitNode(cbNode, node.awaitModifier) ||
                     visitNode(cbNode, node.initializer) ||
                     visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.statement);
-            case 228 /* ContinueStatement */:
-            case 229 /* BreakStatement */:
+            case 229 /* ContinueStatement */:
+            case 230 /* BreakStatement */:
                 return visitNode(cbNode, node.label);
-            case 230 /* ReturnStatement */:
+            case 231 /* ReturnStatement */:
                 return visitNode(cbNode, node.expression);
-            case 231 /* WithStatement */:
+            case 232 /* WithStatement */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.statement);
-            case 232 /* SwitchStatement */:
+            case 233 /* SwitchStatement */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.caseBlock);
-            case 246 /* CaseBlock */:
+            case 247 /* CaseBlock */:
                 return visitNodes(cbNode, cbNodes, node.clauses);
-            case 271 /* CaseClause */:
+            case 272 /* CaseClause */:
                 return visitNode(cbNode, node.expression) ||
                     visitNodes(cbNode, cbNodes, node.statements);
-            case 272 /* DefaultClause */:
+            case 273 /* DefaultClause */:
                 return visitNodes(cbNode, cbNodes, node.statements);
-            case 233 /* LabeledStatement */:
+            case 234 /* LabeledStatement */:
                 return visitNode(cbNode, node.label) ||
                     visitNode(cbNode, node.statement);
-            case 234 /* ThrowStatement */:
+            case 235 /* ThrowStatement */:
                 return visitNode(cbNode, node.expression);
-            case 235 /* TryStatement */:
+            case 236 /* TryStatement */:
                 return visitNode(cbNode, node.tryBlock) ||
                     visitNode(cbNode, node.catchClause) ||
                     visitNode(cbNode, node.finallyBlock);
-            case 274 /* CatchClause */:
+            case 275 /* CatchClause */:
                 return visitNode(cbNode, node.variableDeclaration) ||
                     visitNode(cbNode, node.block);
-            case 152 /* Decorator */:
+            case 153 /* Decorator */:
                 return visitNode(cbNode, node.expression);
-            case 240 /* ClassDeclaration */:
-            case 209 /* ClassExpression */:
+            case 241 /* ClassDeclaration */:
+            case 210 /* ClassExpression */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNodes(cbNode, cbNodes, node.typeParameters) ||
                     visitNodes(cbNode, cbNodes, node.heritageClauses) ||
                     visitNodes(cbNode, cbNodes, node.members);
-            case 241 /* InterfaceDeclaration */:
+            case 242 /* InterfaceDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNodes(cbNode, cbNodes, node.typeParameters) ||
                     visitNodes(cbNode, cbNodes, node.heritageClauses) ||
                     visitNodes(cbNode, cbNodes, node.members);
-            case 242 /* TypeAliasDeclaration */:
+            case 243 /* TypeAliasDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNodes(cbNode, cbNodes, node.typeParameters) ||
                     visitNode(cbNode, node.type);
-            case 243 /* EnumDeclaration */:
+            case 244 /* EnumDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNodes(cbNode, cbNodes, node.members);
-            case 278 /* EnumMember */:
+            case 279 /* EnumMember */:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.initializer);
-            case 244 /* ModuleDeclaration */:
+            case 245 /* ModuleDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.body);
-            case 248 /* ImportEqualsDeclaration */:
+            case 249 /* ImportEqualsDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.moduleReference);
-            case 249 /* ImportDeclaration */:
+            case 250 /* ImportDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.importClause) ||
                     visitNode(cbNode, node.moduleSpecifier);
-            case 250 /* ImportClause */:
+            case 251 /* ImportClause */:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.namedBindings);
-            case 247 /* NamespaceExportDeclaration */:
+            case 248 /* NamespaceExportDeclaration */:
                 return visitNode(cbNode, node.name);
-            case 251 /* NamespaceImport */:
+            case 252 /* NamespaceImport */:
                 return visitNode(cbNode, node.name);
-            case 252 /* NamedImports */:
-            case 256 /* NamedExports */:
+            case 253 /* NamedImports */:
+            case 257 /* NamedExports */:
                 return visitNodes(cbNode, cbNodes, node.elements);
-            case 255 /* ExportDeclaration */:
+            case 256 /* ExportDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.exportClause) ||
                     visitNode(cbNode, node.moduleSpecifier);
-            case 253 /* ImportSpecifier */:
-            case 257 /* ExportSpecifier */:
+            case 254 /* ImportSpecifier */:
+            case 258 /* ExportSpecifier */:
                 return visitNode(cbNode, node.propertyName) ||
                     visitNode(cbNode, node.name);
-            case 254 /* ExportAssignment */:
+            case 255 /* ExportAssignment */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.expression);
-            case 206 /* TemplateExpression */:
+            case 207 /* TemplateExpression */:
                 return visitNode(cbNode, node.head) || visitNodes(cbNode, cbNodes, node.templateSpans);
-            case 216 /* TemplateSpan */:
+            case 217 /* TemplateSpan */:
                 return visitNode(cbNode, node.expression) || visitNode(cbNode, node.literal);
-            case 149 /* ComputedPropertyName */:
+            case 150 /* ComputedPropertyName */:
                 return visitNode(cbNode, node.expression);
-            case 273 /* HeritageClause */:
+            case 274 /* HeritageClause */:
                 return visitNodes(cbNode, cbNodes, node.types);
-            case 211 /* ExpressionWithTypeArguments */:
+            case 212 /* ExpressionWithTypeArguments */:
                 return visitNode(cbNode, node.expression) ||
                     visitNodes(cbNode, cbNodes, node.typeArguments);
-            case 259 /* ExternalModuleReference */:
+            case 260 /* ExternalModuleReference */:
                 return visitNode(cbNode, node.expression);
-            case 258 /* MissingDeclaration */:
+            case 259 /* MissingDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators);
-            case 314 /* CommaListExpression */:
+            case 316 /* CommaListExpression */:
                 return visitNodes(cbNode, cbNodes, node.elements);
-            case 260 /* JsxElement */:
+            case 261 /* JsxElement */:
                 return visitNode(cbNode, node.openingElement) ||
                     visitNodes(cbNode, cbNodes, node.children) ||
                     visitNode(cbNode, node.closingElement);
-            case 264 /* JsxFragment */:
+            case 265 /* JsxFragment */:
                 return visitNode(cbNode, node.openingFragment) ||
                     visitNodes(cbNode, cbNodes, node.children) ||
                     visitNode(cbNode, node.closingFragment);
-            case 261 /* JsxSelfClosingElement */:
-            case 262 /* JsxOpeningElement */:
+            case 262 /* JsxSelfClosingElement */:
+            case 263 /* JsxOpeningElement */:
                 return visitNode(cbNode, node.tagName) ||
                     visitNodes(cbNode, cbNodes, node.typeArguments) ||
                     visitNode(cbNode, node.attributes);
-            case 268 /* JsxAttributes */:
+            case 269 /* JsxAttributes */:
                 return visitNodes(cbNode, cbNodes, node.properties);
-            case 267 /* JsxAttribute */:
+            case 268 /* JsxAttribute */:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.initializer);
-            case 269 /* JsxSpreadAttribute */:
+            case 270 /* JsxSpreadAttribute */:
                 return visitNode(cbNode, node.expression);
-            case 270 /* JsxExpression */:
+            case 271 /* JsxExpression */:
                 return visitNode(cbNode, node.dotDotDotToken) ||
                     visitNode(cbNode, node.expression);
-            case 263 /* JsxClosingElement */:
+            case 264 /* JsxClosingElement */:
                 return visitNode(cbNode, node.tagName);
-            case 171 /* OptionalType */:
-            case 172 /* RestType */:
-            case 288 /* JSDocTypeExpression */:
-            case 292 /* JSDocNonNullableType */:
-            case 291 /* JSDocNullableType */:
-            case 293 /* JSDocOptionalType */:
-            case 295 /* JSDocVariadicType */:
+            case 172 /* OptionalType */:
+            case 173 /* RestType */:
+            case 289 /* JSDocTypeExpression */:
+            case 293 /* JSDocNonNullableType */:
+            case 292 /* JSDocNullableType */:
+            case 294 /* JSDocOptionalType */:
+            case 296 /* JSDocVariadicType */:
                 return visitNode(cbNode, node.type);
-            case 294 /* JSDocFunctionType */:
+            case 295 /* JSDocFunctionType */:
                 return visitNodes(cbNode, cbNodes, node.parameters) ||
                     visitNode(cbNode, node.type);
-            case 296 /* JSDocComment */:
+            case 297 /* JSDocComment */:
                 return visitNodes(cbNode, cbNodes, node.tags);
-            case 304 /* JSDocParameterTag */:
-            case 310 /* JSDocPropertyTag */:
+            case 306 /* JSDocParameterTag */:
+            case 312 /* JSDocPropertyTag */:
                 return visitNode(cbNode, node.tagName) ||
                     (node.isNameFirst
                         ? visitNode(cbNode, node.name) ||
                             visitNode(cbNode, node.typeExpression)
                         : visitNode(cbNode, node.typeExpression) ||
                             visitNode(cbNode, node.name));
-            case 300 /* JSDocAugmentsTag */:
+            case 302 /* JSDocAuthorTag */:
+                return visitNode(cbNode, node.tagName);
+            case 301 /* JSDocAugmentsTag */:
                 return visitNode(cbNode, node.tagName) ||
                     visitNode(cbNode, node.class);
-            case 308 /* JSDocTemplateTag */:
+            case 310 /* JSDocTemplateTag */:
                 return visitNode(cbNode, node.tagName) ||
                     visitNode(cbNode, node.constraint) ||
                     visitNodes(cbNode, cbNodes, node.typeParameters);
-            case 309 /* JSDocTypedefTag */:
+            case 311 /* JSDocTypedefTag */:
                 return visitNode(cbNode, node.tagName) ||
                     (node.typeExpression &&
-                        node.typeExpression.kind === 288 /* JSDocTypeExpression */
+                        node.typeExpression.kind === 289 /* JSDocTypeExpression */
                         ? visitNode(cbNode, node.typeExpression) ||
                             visitNode(cbNode, node.fullName)
                         : visitNode(cbNode, node.fullName) ||
                             visitNode(cbNode, node.typeExpression));
-            case 302 /* JSDocCallbackTag */:
+            case 304 /* JSDocCallbackTag */:
                 return visitNode(cbNode, node.tagName) ||
                     visitNode(cbNode, node.fullName) ||
                     visitNode(cbNode, node.typeExpression);
-            case 305 /* JSDocReturnTag */:
-            case 307 /* JSDocTypeTag */:
-            case 306 /* JSDocThisTag */:
-            case 303 /* JSDocEnumTag */:
+            case 307 /* JSDocReturnTag */:
+            case 309 /* JSDocTypeTag */:
+            case 308 /* JSDocThisTag */:
+            case 305 /* JSDocEnumTag */:
                 return visitNode(cbNode, node.tagName) ||
                     visitNode(cbNode, node.typeExpression);
-            case 298 /* JSDocSignature */:
+            case 299 /* JSDocSignature */:
                 return ts.forEach(node.typeParameters, cbNode) ||
                     ts.forEach(node.parameters, cbNode) ||
                     visitNode(cbNode, node.type);
-            case 297 /* JSDocTypeLiteral */:
+            case 298 /* JSDocTypeLiteral */:
                 return ts.forEach(node.jsDocPropertyTags, cbNode);
-            case 299 /* JSDocTag */:
-            case 301 /* JSDocClassTag */:
+            case 300 /* JSDocTag */:
+            case 303 /* JSDocClassTag */:
                 return visitNode(cbNode, node.tagName);
-            case 313 /* PartiallyEmittedExpression */:
+            case 315 /* PartiallyEmittedExpression */:
                 return visitNode(cbNode, node.expression);
         }
     }
@@ -17019,7 +17248,7 @@ var ts;
     (function (Parser) {
         // Share a single scanner across all calls to parse a source file.  This helps speed things
         // up by avoiding the cost of creating/compiling scanners over and over again.
-        var scanner = ts.createScanner(7 /* Latest */, /*skipTrivia*/ true);
+        var scanner = ts.createScanner(99 /* Latest */, /*skipTrivia*/ true);
         var disallowInAndDecoratorContext = 2048 /* DisallowInContext */ | 8192 /* DecoratorContext */;
         // capture constructors in 'initializeState' to avoid null checks
         // tslint:disable variable-name
@@ -17157,14 +17386,14 @@ var ts;
                 sourceFile.endOfFileToken = parseTokenNode();
             }
             else {
-                var statement = createNode(221 /* ExpressionStatement */);
+                var statement = createNode(222 /* ExpressionStatement */);
                 switch (token()) {
                     case 22 /* OpenBracketToken */:
                         statement.expression = parseArrayLiteralExpression();
                         break;
-                    case 102 /* TrueKeyword */:
-                    case 87 /* FalseKeyword */:
-                    case 96 /* NullKeyword */:
+                    case 103 /* TrueKeyword */:
+                    case 88 /* FalseKeyword */:
+                    case 97 /* NullKeyword */:
                         statement.expression = parseTokenNode();
                         break;
                     case 39 /* MinusToken */:
@@ -17313,7 +17542,7 @@ var ts;
         function createSourceFile(fileName, languageVersion, scriptKind, isDeclarationFile) {
             // code from createNode is inlined here so createNode won't have to deal with special case of creating source files
             // this is quite rare comparing to other nodes and createNode should be as fast as possible
-            var sourceFile = new SourceFileConstructor(284 /* SourceFile */, /*pos*/ 0, /* end */ sourceText.length);
+            var sourceFile = new SourceFileConstructor(285 /* SourceFile */, /*pos*/ 0, /* end */ sourceText.length);
             nodeCount++;
             sourceFile.text = sourceText;
             sourceFile.bindDiagnostics = [];
@@ -17456,6 +17685,9 @@ var ts;
         function nextToken() {
             return currentToken = scanner.scan();
         }
+        function nextTokenJSDoc() {
+            return currentToken = scanner.scanJsDocToken();
+        }
         function reScanGreaterToken() {
             return currentToken = scanner.reScanGreaterToken();
         }
@@ -17521,20 +17753,20 @@ var ts;
         }
         // Ignore strict mode flag because we will report an error in type checker instead.
         function isIdentifier() {
-            if (token() === 72 /* Identifier */) {
+            if (token() === 73 /* Identifier */) {
                 return true;
             }
             // If we have a 'yield' keyword, and we're in the [yield] context, then 'yield' is
             // considered a keyword and is not an identifier.
-            if (token() === 117 /* YieldKeyword */ && inYieldContext()) {
+            if (token() === 118 /* YieldKeyword */ && inYieldContext()) {
                 return false;
             }
             // If we have a 'await' keyword, and we're in the [Await] context, then 'await' is
             // considered a keyword and is not an identifier.
-            if (token() === 122 /* AwaitKeyword */ && inAwaitContext()) {
+            if (token() === 123 /* AwaitKeyword */ && inAwaitContext()) {
                 return false;
             }
-            return token() > 108 /* LastReservedWord */;
+            return token() > 109 /* LastReservedWord */;
         }
         function parseExpected(kind, diagnosticMessage, shouldAdvance) {
             if (shouldAdvance === void 0) { shouldAdvance = true; }
@@ -17553,6 +17785,14 @@ var ts;
             }
             return false;
         }
+        function parseExpectedJSDoc(kind) {
+            if (token() === kind) {
+                nextTokenJSDoc();
+                return true;
+            }
+            parseErrorAtCurrentToken(ts.Diagnostics._0_expected, ts.tokenToString(kind));
+            return false;
+        }
         function parseOptional(t) {
             if (token() === t) {
                 nextToken();
@@ -17566,15 +17806,30 @@ var ts;
             }
             return undefined;
         }
+        function parseOptionalTokenJSDoc(t) {
+            if (token() === t) {
+                return parseTokenNodeJSDoc();
+            }
+            return undefined;
+        }
         function parseExpectedToken(t, diagnosticMessage, arg0) {
             return parseOptionalToken(t) ||
                 createMissingNode(t, /*reportAtCurrentPosition*/ false, diagnosticMessage || ts.Diagnostics._0_expected, arg0 || ts.tokenToString(t));
         }
+        function parseExpectedTokenJSDoc(t) {
+            return parseOptionalTokenJSDoc(t) ||
+                createMissingNode(t, /*reportAtCurrentPosition*/ false, ts.Diagnostics._0_expected, ts.tokenToString(t));
+        }
         function parseTokenNode() {
             var node = createNode(token());
             nextToken();
             return finishNode(node);
         }
+        function parseTokenNodeJSDoc() {
+            var node = createNode(token());
+            nextTokenJSDoc();
+            return finishNode(node);
+        }
         function canParseSemicolon() {
             // If there's a real semicolon, then we can always parse it out.
             if (token() === 26 /* SemicolonToken */) {
@@ -17599,7 +17854,7 @@ var ts;
             nodeCount++;
             var p = pos >= 0 ? pos : scanner.getStartPos();
             return ts.isNodeKind(kind) || kind === 0 /* Unknown */ ? new NodeConstructor(kind, p, p) :
-                kind === 72 /* Identifier */ ? new IdentifierConstructor(kind, p, p) :
+                kind === 73 /* Identifier */ ? new IdentifierConstructor(kind, p, p) :
                     new TokenConstructor(kind, p, p);
         }
         function createNodeWithJSDoc(kind, pos) {
@@ -17641,7 +17896,7 @@ var ts;
                 parseErrorAtCurrentToken(diagnosticMessage, arg0);
             }
             var result = createNode(kind);
-            if (kind === 72 /* Identifier */) {
+            if (kind === 73 /* Identifier */) {
                 result.escapedText = "";
             }
             else if (ts.isLiteralKind(kind) || ts.isTemplateLiteralKind(kind)) {
@@ -17662,9 +17917,9 @@ var ts;
         function createIdentifier(isIdentifier, diagnosticMessage) {
             identifierCount++;
             if (isIdentifier) {
-                var node = createNode(72 /* Identifier */);
+                var node = createNode(73 /* Identifier */);
                 // Store original token kind if it is not just an Identifier so we can report appropriate error later in type checker
-                if (token() !== 72 /* Identifier */) {
+                if (token() !== 73 /* Identifier */) {
                     node.originalKeywordKind = token();
                 }
                 node.escapedText = ts.escapeLeadingUnderscores(internIdentifier(scanner.getTokenValue()));
@@ -17673,7 +17928,7 @@ var ts;
             }
             // Only for end of file because the error gets reported incorrectly on embedded script tags.
             var reportAtCurrentPosition = token() === 1 /* EndOfFileToken */;
-            return createMissingNode(72 /* Identifier */, reportAtCurrentPosition, diagnosticMessage || ts.Diagnostics.Identifier_expected);
+            return createMissingNode(73 /* Identifier */, reportAtCurrentPosition, diagnosticMessage || ts.Diagnostics.Identifier_expected);
         }
         function parseIdentifier(diagnosticMessage) {
             return createIdentifier(isIdentifier(), diagnosticMessage);
@@ -17704,7 +17959,7 @@ var ts;
             // PropertyName [Yield]:
             //      LiteralPropertyName
             //      ComputedPropertyName[?Yield]
-            var node = createNode(149 /* ComputedPropertyName */);
+            var node = createNode(150 /* ComputedPropertyName */);
             parseExpected(22 /* OpenBracketToken */);
             // We parse any expression (including a comma expression). But the grammar
             // says that only an assignment expression is allowed, so the grammar checker
@@ -17725,20 +17980,20 @@ var ts;
         }
         function nextTokenCanFollowModifier() {
             switch (token()) {
-                case 77 /* ConstKeyword */:
+                case 78 /* ConstKeyword */:
                     // 'const' is only a modifier if followed by 'enum'.
-                    return nextToken() === 84 /* EnumKeyword */;
-                case 85 /* ExportKeyword */:
+                    return nextToken() === 85 /* EnumKeyword */;
+                case 86 /* ExportKeyword */:
                     nextToken();
-                    if (token() === 80 /* DefaultKeyword */) {
+                    if (token() === 81 /* DefaultKeyword */) {
                         return lookAhead(nextTokenCanFollowDefaultKeyword);
                     }
-                    return token() !== 40 /* AsteriskToken */ && token() !== 119 /* AsKeyword */ && token() !== 18 /* OpenBraceToken */ && canFollowModifier();
-                case 80 /* DefaultKeyword */:
+                    return token() !== 40 /* AsteriskToken */ && token() !== 120 /* AsKeyword */ && token() !== 18 /* OpenBraceToken */ && canFollowModifier();
+                case 81 /* DefaultKeyword */:
                     return nextTokenCanFollowDefaultKeyword();
-                case 116 /* StaticKeyword */:
-                case 126 /* GetKeyword */:
-                case 137 /* SetKeyword */:
+                case 117 /* StaticKeyword */:
+                case 127 /* GetKeyword */:
+                case 138 /* SetKeyword */:
                     nextToken();
                     return canFollowModifier();
                 default:
@@ -17757,10 +18012,10 @@ var ts;
         }
         function nextTokenCanFollowDefaultKeyword() {
             nextToken();
-            return token() === 76 /* ClassKeyword */ || token() === 90 /* FunctionKeyword */ ||
-                token() === 110 /* InterfaceKeyword */ ||
-                (token() === 118 /* AbstractKeyword */ && lookAhead(nextTokenIsClassKeywordOnSameLine)) ||
-                (token() === 121 /* AsyncKeyword */ && lookAhead(nextTokenIsFunctionKeywordOnSameLine));
+            return token() === 77 /* ClassKeyword */ || token() === 91 /* FunctionKeyword */ ||
+                token() === 111 /* InterfaceKeyword */ ||
+                (token() === 119 /* AbstractKeyword */ && lookAhead(nextTokenIsClassKeywordOnSameLine)) ||
+                (token() === 122 /* AsyncKeyword */ && lookAhead(nextTokenIsFunctionKeywordOnSameLine));
         }
         // True if positioned at the start of a list element
         function isListElement(parsingContext, inErrorRecovery) {
@@ -17780,7 +18035,7 @@ var ts;
                     // outer module.  We just want to consume and move on.
                     return !(token() === 26 /* SemicolonToken */ && inErrorRecovery) && isStartOfStatement();
                 case 2 /* SwitchClauses */:
-                    return token() === 74 /* CaseKeyword */ || token() === 80 /* DefaultKeyword */;
+                    return token() === 75 /* CaseKeyword */ || token() === 81 /* DefaultKeyword */;
                 case 4 /* TypeMembers */:
                     return lookAhead(isTypeMemberStart);
                 case 5 /* ClassMembers */:
@@ -17866,7 +18121,7 @@ var ts;
                 //      extends {} extends
                 //      extends {} implements
                 var next = nextToken();
-                return next === 27 /* CommaToken */ || next === 18 /* OpenBraceToken */ || next === 86 /* ExtendsKeyword */ || next === 109 /* ImplementsKeyword */;
+                return next === 27 /* CommaToken */ || next === 18 /* OpenBraceToken */ || next === 87 /* ExtendsKeyword */ || next === 110 /* ImplementsKeyword */;
             }
             return true;
         }
@@ -17883,8 +18138,8 @@ var ts;
             return ts.tokenIsIdentifierOrKeywordOrGreaterThan(token());
         }
         function isHeritageClauseExtendsOrImplementsKeyword() {
-            if (token() === 109 /* ImplementsKeyword */ ||
-                token() === 86 /* ExtendsKeyword */) {
+            if (token() === 110 /* ImplementsKeyword */ ||
+                token() === 87 /* ExtendsKeyword */) {
                 return lookAhead(nextTokenIsStartOfExpression);
             }
             return false;
@@ -17914,14 +18169,14 @@ var ts;
                 case 23 /* ImportOrExportSpecifiers */:
                     return token() === 19 /* CloseBraceToken */;
                 case 3 /* SwitchClauseStatements */:
-                    return token() === 19 /* CloseBraceToken */ || token() === 74 /* CaseKeyword */ || token() === 80 /* DefaultKeyword */;
+                    return token() === 19 /* CloseBraceToken */ || token() === 75 /* CaseKeyword */ || token() === 81 /* DefaultKeyword */;
                 case 7 /* HeritageClauseElement */:
-                    return token() === 18 /* OpenBraceToken */ || token() === 86 /* ExtendsKeyword */ || token() === 109 /* ImplementsKeyword */;
+                    return token() === 18 /* OpenBraceToken */ || token() === 87 /* ExtendsKeyword */ || token() === 110 /* ImplementsKeyword */;
                 case 8 /* VariableDeclarations */:
                     return isVariableDeclaratorListTerminator();
                 case 19 /* TypeParameters */:
                     // Tokens other than '>' are here for better error recovery
-                    return token() === 30 /* GreaterThanToken */ || token() === 20 /* OpenParenToken */ || token() === 18 /* OpenBraceToken */ || token() === 86 /* ExtendsKeyword */ || token() === 109 /* ImplementsKeyword */;
+                    return token() === 30 /* GreaterThanToken */ || token() === 20 /* OpenParenToken */ || token() === 18 /* OpenBraceToken */ || token() === 87 /* ExtendsKeyword */ || token() === 110 /* ImplementsKeyword */;
                 case 11 /* ArgumentExpressions */:
                     // Tokens other than ')' are here for better error recovery
                     return token() === 21 /* CloseParenToken */ || token() === 26 /* SemicolonToken */;
@@ -18138,20 +18393,20 @@ var ts;
         function isReusableClassMember(node) {
             if (node) {
                 switch (node.kind) {
-                    case 157 /* Constructor */:
-                    case 162 /* IndexSignature */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
-                    case 154 /* PropertyDeclaration */:
-                    case 217 /* SemicolonClassElement */:
+                    case 158 /* Constructor */:
+                    case 163 /* IndexSignature */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
+                    case 155 /* PropertyDeclaration */:
+                    case 218 /* SemicolonClassElement */:
                         return true;
-                    case 156 /* MethodDeclaration */:
+                    case 157 /* MethodDeclaration */:
                         // Method declarations are not necessarily reusable.  An object-literal
                         // may have a method calls "constructor(...)" and we must reparse that
                         // into an actual .ConstructorDeclaration.
                         var methodDeclaration = node;
-                        var nameIsConstructor = methodDeclaration.name.kind === 72 /* Identifier */ &&
-                            methodDeclaration.name.originalKeywordKind === 124 /* ConstructorKeyword */;
+                        var nameIsConstructor = methodDeclaration.name.kind === 73 /* Identifier */ &&
+                            methodDeclaration.name.originalKeywordKind === 125 /* ConstructorKeyword */;
                         return !nameIsConstructor;
                 }
             }
@@ -18160,8 +18415,8 @@ var ts;
         function isReusableSwitchClause(node) {
             if (node) {
                 switch (node.kind) {
-                    case 271 /* CaseClause */:
-                    case 272 /* DefaultClause */:
+                    case 272 /* CaseClause */:
+                    case 273 /* DefaultClause */:
                         return true;
                 }
             }
@@ -18170,58 +18425,58 @@ var ts;
         function isReusableStatement(node) {
             if (node) {
                 switch (node.kind) {
-                    case 239 /* FunctionDeclaration */:
-                    case 219 /* VariableStatement */:
-                    case 218 /* Block */:
-                    case 222 /* IfStatement */:
-                    case 221 /* ExpressionStatement */:
-                    case 234 /* ThrowStatement */:
-                    case 230 /* ReturnStatement */:
-                    case 232 /* SwitchStatement */:
-                    case 229 /* BreakStatement */:
-                    case 228 /* ContinueStatement */:
-                    case 226 /* ForInStatement */:
-                    case 227 /* ForOfStatement */:
-                    case 225 /* ForStatement */:
-                    case 224 /* WhileStatement */:
-                    case 231 /* WithStatement */:
-                    case 220 /* EmptyStatement */:
-                    case 235 /* TryStatement */:
-                    case 233 /* LabeledStatement */:
-                    case 223 /* DoStatement */:
-                    case 236 /* DebuggerStatement */:
-                    case 249 /* ImportDeclaration */:
-                    case 248 /* ImportEqualsDeclaration */:
-                    case 255 /* ExportDeclaration */:
-                    case 254 /* ExportAssignment */:
-                    case 244 /* ModuleDeclaration */:
-                    case 240 /* ClassDeclaration */:
-                    case 241 /* InterfaceDeclaration */:
-                    case 243 /* EnumDeclaration */:
-                    case 242 /* TypeAliasDeclaration */:
+                    case 240 /* FunctionDeclaration */:
+                    case 220 /* VariableStatement */:
+                    case 219 /* Block */:
+                    case 223 /* IfStatement */:
+                    case 222 /* ExpressionStatement */:
+                    case 235 /* ThrowStatement */:
+                    case 231 /* ReturnStatement */:
+                    case 233 /* SwitchStatement */:
+                    case 230 /* BreakStatement */:
+                    case 229 /* ContinueStatement */:
+                    case 227 /* ForInStatement */:
+                    case 228 /* ForOfStatement */:
+                    case 226 /* ForStatement */:
+                    case 225 /* WhileStatement */:
+                    case 232 /* WithStatement */:
+                    case 221 /* EmptyStatement */:
+                    case 236 /* TryStatement */:
+                    case 234 /* LabeledStatement */:
+                    case 224 /* DoStatement */:
+                    case 237 /* DebuggerStatement */:
+                    case 250 /* ImportDeclaration */:
+                    case 249 /* ImportEqualsDeclaration */:
+                    case 256 /* ExportDeclaration */:
+                    case 255 /* ExportAssignment */:
+                    case 245 /* ModuleDeclaration */:
+                    case 241 /* ClassDeclaration */:
+                    case 242 /* InterfaceDeclaration */:
+                    case 244 /* EnumDeclaration */:
+                    case 243 /* TypeAliasDeclaration */:
                         return true;
                 }
             }
             return false;
         }
         function isReusableEnumMember(node) {
-            return node.kind === 278 /* EnumMember */;
+            return node.kind === 279 /* EnumMember */;
         }
         function isReusableTypeMember(node) {
             if (node) {
                 switch (node.kind) {
-                    case 161 /* ConstructSignature */:
-                    case 155 /* MethodSignature */:
-                    case 162 /* IndexSignature */:
-                    case 153 /* PropertySignature */:
-                    case 160 /* CallSignature */:
+                    case 162 /* ConstructSignature */:
+                    case 156 /* MethodSignature */:
+                    case 163 /* IndexSignature */:
+                    case 154 /* PropertySignature */:
+                    case 161 /* CallSignature */:
                         return true;
                 }
             }
             return false;
         }
         function isReusableVariableDeclaration(node) {
-            if (node.kind !== 237 /* VariableDeclaration */) {
+            if (node.kind !== 238 /* VariableDeclaration */) {
                 return false;
             }
             // Very subtle incremental parsing bug.  Consider the following code:
@@ -18242,7 +18497,7 @@ var ts;
             return variableDeclarator.initializer === undefined;
         }
         function isReusableParameter(node) {
-            if (node.kind !== 151 /* Parameter */) {
+            if (node.kind !== 152 /* Parameter */) {
                 return false;
             }
             // See the comment in isReusableVariableDeclaration for why we do this.
@@ -18378,7 +18633,7 @@ var ts;
             return entity;
         }
         function createQualifiedName(entity, name) {
-            var node = createNode(148 /* QualifiedName */, entity.pos);
+            var node = createNode(149 /* QualifiedName */, entity.pos);
             node.left = entity;
             node.right = name;
             return finishNode(node);
@@ -18409,13 +18664,13 @@ var ts;
                     // Report that we need an identifier.  However, report it right after the dot,
                     // and not on the next token.  This is because the next token might actually
                     // be an identifier and the error would be quite confusing.
-                    return createMissingNode(72 /* Identifier */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Identifier_expected);
+                    return createMissingNode(73 /* Identifier */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Identifier_expected);
                 }
             }
             return allowIdentifierNames ? parseIdentifierName() : parseIdentifier();
         }
         function parseTemplateExpression() {
-            var template = createNode(206 /* TemplateExpression */);
+            var template = createNode(207 /* TemplateExpression */);
             template.head = parseTemplateHead();
             ts.Debug.assert(template.head.kind === 15 /* TemplateHead */, "Template head has wrong token kind");
             var list = [];
@@ -18427,7 +18682,7 @@ var ts;
             return finishNode(template);
         }
         function parseTemplateSpan() {
-            var span = createNode(216 /* TemplateSpan */);
+            var span = createNode(217 /* TemplateSpan */);
             span.expression = allowInAnd(parseExpression);
             var literal;
             if (token() === 19 /* CloseBraceToken */) {
@@ -18477,7 +18732,7 @@ var ts;
         }
         // TYPES
         function parseTypeReference() {
-            var node = createNode(164 /* TypeReference */);
+            var node = createNode(165 /* TypeReference */);
             node.typeName = parseEntityName(/*allowReservedWords*/ true, ts.Diagnostics.Type_expected);
             if (!scanner.hasPrecedingLineBreak() && reScanLessThanToken() === 28 /* LessThanToken */) {
                 node.typeArguments = parseBracketedList(20 /* TypeArguments */, parseType, 28 /* LessThanToken */, 30 /* GreaterThanToken */);
@@ -18487,14 +18742,14 @@ var ts;
         // If true, we should abort parsing an error function.
         function typeHasArrowFunctionBlockingParseError(node) {
             switch (node.kind) {
-                case 164 /* TypeReference */:
+                case 165 /* TypeReference */:
                     return ts.nodeIsMissing(node.typeName);
-                case 165 /* FunctionType */:
-                case 166 /* ConstructorType */: {
+                case 166 /* FunctionType */:
+                case 167 /* ConstructorType */: {
                     var _a = node, parameters = _a.parameters, type = _a.type;
                     return isMissingList(parameters) || typeHasArrowFunctionBlockingParseError(type);
                 }
-                case 177 /* ParenthesizedType */:
+                case 178 /* ParenthesizedType */:
                     return typeHasArrowFunctionBlockingParseError(node.type);
                 default:
                     return false;
@@ -18502,20 +18757,20 @@ var ts;
         }
         function parseThisTypePredicate(lhs) {
             nextToken();
-            var node = createNode(163 /* TypePredicate */, lhs.pos);
+            var node = createNode(164 /* TypePredicate */, lhs.pos);
             node.parameterName = lhs;
             node.type = parseType();
             return finishNode(node);
         }
         function parseThisTypeNode() {
-            var node = createNode(178 /* ThisType */);
+            var node = createNode(179 /* ThisType */);
             nextToken();
             return finishNode(node);
         }
         function parseJSDocAllType(postFixEquals) {
-            var result = createNode(289 /* JSDocAllType */);
+            var result = createNode(290 /* JSDocAllType */);
             if (postFixEquals) {
-                return createPostfixType(293 /* JSDocOptionalType */, result);
+                return createPostfixType(294 /* JSDocOptionalType */, result);
             }
             else {
                 nextToken();
@@ -18523,7 +18778,7 @@ var ts;
             return finishNode(result);
         }
         function parseJSDocNonNullableType() {
-            var result = createNode(292 /* JSDocNonNullableType */);
+            var result = createNode(293 /* JSDocNonNullableType */);
             nextToken();
             result.type = parseNonArrayType();
             return finishNode(result);
@@ -18545,31 +18800,31 @@ var ts;
                 token() === 19 /* CloseBraceToken */ ||
                 token() === 21 /* CloseParenToken */ ||
                 token() === 30 /* GreaterThanToken */ ||
-                token() === 59 /* EqualsToken */ ||
+                token() === 60 /* EqualsToken */ ||
                 token() === 50 /* BarToken */) {
-                var result = createNode(290 /* JSDocUnknownType */, pos);
+                var result = createNode(291 /* JSDocUnknownType */, pos);
                 return finishNode(result);
             }
             else {
-                var result = createNode(291 /* JSDocNullableType */, pos);
+                var result = createNode(292 /* JSDocNullableType */, pos);
                 result.type = parseType();
                 return finishNode(result);
             }
         }
         function parseJSDocFunctionType() {
             if (lookAhead(nextTokenIsOpenParen)) {
-                var result = createNodeWithJSDoc(294 /* JSDocFunctionType */);
+                var result = createNodeWithJSDoc(295 /* JSDocFunctionType */);
                 nextToken();
                 fillSignature(57 /* ColonToken */, 4 /* Type */ | 32 /* JSDoc */, result);
                 return finishNode(result);
             }
-            var node = createNode(164 /* TypeReference */);
+            var node = createNode(165 /* TypeReference */);
             node.typeName = parseIdentifierName();
             return finishNode(node);
         }
         function parseJSDocParameter() {
-            var parameter = createNode(151 /* Parameter */);
-            if (token() === 100 /* ThisKeyword */ || token() === 95 /* NewKeyword */) {
+            var parameter = createNode(152 /* Parameter */);
+            if (token() === 101 /* ThisKeyword */ || token() === 96 /* NewKeyword */) {
                 parameter.name = parseIdentifierName();
                 parseExpected(57 /* ColonToken */);
             }
@@ -18582,25 +18837,25 @@ var ts;
             var type = parseTypeOrTypePredicate();
             scanner.setInJSDocType(false);
             if (dotdotdot) {
-                var variadic = createNode(295 /* JSDocVariadicType */, dotdotdot.pos);
+                var variadic = createNode(296 /* JSDocVariadicType */, dotdotdot.pos);
                 variadic.type = type;
                 type = finishNode(variadic);
             }
-            if (token() === 59 /* EqualsToken */) {
-                return createPostfixType(293 /* JSDocOptionalType */, type);
+            if (token() === 60 /* EqualsToken */) {
+                return createPostfixType(294 /* JSDocOptionalType */, type);
             }
             return type;
         }
         function parseTypeQuery() {
-            var node = createNode(167 /* TypeQuery */);
-            parseExpected(104 /* TypeOfKeyword */);
+            var node = createNode(168 /* TypeQuery */);
+            parseExpected(105 /* TypeOfKeyword */);
             node.exprName = parseEntityName(/*allowReservedWords*/ true);
             return finishNode(node);
         }
         function parseTypeParameter() {
-            var node = createNode(150 /* TypeParameter */);
+            var node = createNode(151 /* TypeParameter */);
             node.name = parseIdentifier();
-            if (parseOptional(86 /* ExtendsKeyword */)) {
+            if (parseOptional(87 /* ExtendsKeyword */)) {
                 // It's not uncommon for people to write improper constraints to a generic.  If the
                 // user writes a constraint that is an expression and not an actual type, then parse
                 // it out as an expression (so we can recover well), but report that a type is needed
@@ -18619,7 +18874,7 @@ var ts;
                     node.expression = parseUnaryExpressionOrHigher();
                 }
             }
-            if (parseOptional(59 /* EqualsToken */)) {
+            if (parseOptional(60 /* EqualsToken */)) {
                 node.default = parseType();
             }
             return finishNode(node);
@@ -18643,8 +18898,8 @@ var ts;
                 isStartOfType(/*inStartOfParameter*/ !isJSDocParameter);
         }
         function parseParameter() {
-            var node = createNodeWithJSDoc(151 /* Parameter */);
-            if (token() === 100 /* ThisKeyword */) {
+            var node = createNodeWithJSDoc(152 /* Parameter */);
+            if (token() === 101 /* ThisKeyword */) {
                 node.name = createIdentifier(/*isIdentifier*/ true);
                 node.type = parseParameterType();
                 return finishNode(node);
@@ -18744,8 +18999,8 @@ var ts;
         }
         function parseSignatureMember(kind) {
             var node = createNodeWithJSDoc(kind);
-            if (kind === 161 /* ConstructSignature */) {
-                parseExpected(95 /* NewKeyword */);
+            if (kind === 162 /* ConstructSignature */) {
+                parseExpected(96 /* NewKeyword */);
             }
             fillSignature(57 /* ColonToken */, 4 /* Type */, node);
             parseTypeMemberSemicolon();
@@ -18805,7 +19060,7 @@ var ts;
             return token() === 57 /* ColonToken */ || token() === 27 /* CommaToken */ || token() === 23 /* CloseBracketToken */;
         }
         function parseIndexSignatureDeclaration(node) {
-            node.kind = 162 /* IndexSignature */;
+            node.kind = 163 /* IndexSignature */;
             node.parameters = parseBracketedList(16 /* Parameters */, parseParameter, 22 /* OpenBracketToken */, 23 /* CloseBracketToken */);
             node.type = parseTypeAnnotation();
             parseTypeMemberSemicolon();
@@ -18815,15 +19070,15 @@ var ts;
             node.name = parsePropertyName();
             node.questionToken = parseOptionalToken(56 /* QuestionToken */);
             if (token() === 20 /* OpenParenToken */ || token() === 28 /* LessThanToken */) {
-                node.kind = 155 /* MethodSignature */;
+                node.kind = 156 /* MethodSignature */;
                 // Method signatures don't exist in expression contexts.  So they have neither
                 // [Yield] nor [Await]
                 fillSignature(57 /* ColonToken */, 4 /* Type */, node);
             }
             else {
-                node.kind = 153 /* PropertySignature */;
+                node.kind = 154 /* PropertySignature */;
                 node.type = parseTypeAnnotation();
-                if (token() === 59 /* EqualsToken */) {
+                if (token() === 60 /* EqualsToken */) {
                     // Although type literal properties cannot not have initializers, we attempt
                     // to parse an initializer so we can report in the checker that an interface
                     // property or type literal property cannot have an initializer.
@@ -18867,10 +19122,10 @@ var ts;
         }
         function parseTypeMember() {
             if (token() === 20 /* OpenParenToken */ || token() === 28 /* LessThanToken */) {
-                return parseSignatureMember(160 /* CallSignature */);
+                return parseSignatureMember(161 /* CallSignature */);
             }
-            if (token() === 95 /* NewKeyword */ && lookAhead(nextTokenIsOpenParenOrLessThan)) {
-                return parseSignatureMember(161 /* ConstructSignature */);
+            if (token() === 96 /* NewKeyword */ && lookAhead(nextTokenIsOpenParenOrLessThan)) {
+                return parseSignatureMember(162 /* ConstructSignature */);
             }
             var node = createNodeWithJSDoc(0 /* Unknown */);
             node.modifiers = parseModifiers();
@@ -18896,7 +19151,7 @@ var ts;
             return false;
         }
         function parseTypeLiteral() {
-            var node = createNode(168 /* TypeLiteral */);
+            var node = createNode(169 /* TypeLiteral */);
             node.members = parseObjectTypeMembers();
             return finishNode(node);
         }
@@ -18914,27 +19169,27 @@ var ts;
         function isStartOfMappedType() {
             nextToken();
             if (token() === 38 /* PlusToken */ || token() === 39 /* MinusToken */) {
-                return nextToken() === 133 /* ReadonlyKeyword */;
+                return nextToken() === 134 /* ReadonlyKeyword */;
             }
-            if (token() === 133 /* ReadonlyKeyword */) {
+            if (token() === 134 /* ReadonlyKeyword */) {
                 nextToken();
             }
-            return token() === 22 /* OpenBracketToken */ && nextTokenIsIdentifier() && nextToken() === 93 /* InKeyword */;
+            return token() === 22 /* OpenBracketToken */ && nextTokenIsIdentifier() && nextToken() === 94 /* InKeyword */;
         }
         function parseMappedTypeParameter() {
-            var node = createNode(150 /* TypeParameter */);
+            var node = createNode(151 /* TypeParameter */);
             node.name = parseIdentifier();
-            parseExpected(93 /* InKeyword */);
+            parseExpected(94 /* InKeyword */);
             node.constraint = parseType();
             return finishNode(node);
         }
         function parseMappedType() {
-            var node = createNode(181 /* MappedType */);
+            var node = createNode(182 /* MappedType */);
             parseExpected(18 /* OpenBraceToken */);
-            if (token() === 133 /* ReadonlyKeyword */ || token() === 38 /* PlusToken */ || token() === 39 /* MinusToken */) {
+            if (token() === 134 /* ReadonlyKeyword */ || token() === 38 /* PlusToken */ || token() === 39 /* MinusToken */) {
                 node.readonlyToken = parseTokenNode();
-                if (node.readonlyToken.kind !== 133 /* ReadonlyKeyword */) {
-                    parseExpectedToken(133 /* ReadonlyKeyword */);
+                if (node.readonlyToken.kind !== 134 /* ReadonlyKeyword */) {
+                    parseExpectedToken(134 /* ReadonlyKeyword */);
                 }
             }
             parseExpected(22 /* OpenBracketToken */);
@@ -18954,23 +19209,23 @@ var ts;
         function parseTupleElementType() {
             var pos = getNodePos();
             if (parseOptional(25 /* DotDotDotToken */)) {
-                var node = createNode(172 /* RestType */, pos);
+                var node = createNode(173 /* RestType */, pos);
                 node.type = parseType();
                 return finishNode(node);
             }
             var type = parseType();
-            if (!(contextFlags & 2097152 /* JSDoc */) && type.kind === 291 /* JSDocNullableType */ && type.pos === type.type.pos) {
-                type.kind = 171 /* OptionalType */;
+            if (!(contextFlags & 2097152 /* JSDoc */) && type.kind === 292 /* JSDocNullableType */ && type.pos === type.type.pos) {
+                type.kind = 172 /* OptionalType */;
             }
             return type;
         }
         function parseTupleType() {
-            var node = createNode(170 /* TupleType */);
+            var node = createNode(171 /* TupleType */);
             node.elementTypes = parseBracketedList(21 /* TupleElementTypes */, parseTupleElementType, 22 /* OpenBracketToken */, 23 /* CloseBracketToken */);
             return finishNode(node);
         }
         function parseParenthesizedType() {
-            var node = createNode(177 /* ParenthesizedType */);
+            var node = createNode(178 /* ParenthesizedType */);
             parseExpected(20 /* OpenParenToken */);
             node.type = parseType();
             parseExpected(21 /* CloseParenToken */);
@@ -18978,7 +19233,7 @@ var ts;
         }
         function parseFunctionOrConstructorType() {
             var pos = getNodePos();
-            var kind = parseOptional(95 /* NewKeyword */) ? 166 /* ConstructorType */ : 165 /* FunctionType */;
+            var kind = parseOptional(96 /* NewKeyword */) ? 167 /* ConstructorType */ : 166 /* FunctionType */;
             var node = createNodeWithJSDoc(kind, pos);
             fillSignature(37 /* EqualsGreaterThanToken */, 4 /* Type */, node);
             return finishNode(node);
@@ -18988,14 +19243,14 @@ var ts;
             return token() === 24 /* DotToken */ ? undefined : node;
         }
         function parseLiteralTypeNode(negative) {
-            var node = createNode(182 /* LiteralType */);
+            var node = createNode(183 /* LiteralType */);
             var unaryMinusExpression;
             if (negative) {
-                unaryMinusExpression = createNode(202 /* PrefixUnaryExpression */);
+                unaryMinusExpression = createNode(203 /* PrefixUnaryExpression */);
                 unaryMinusExpression.operator = 39 /* MinusToken */;
                 nextToken();
             }
-            var expression = token() === 102 /* TrueKeyword */ || token() === 87 /* FalseKeyword */
+            var expression = token() === 103 /* TrueKeyword */ || token() === 88 /* FalseKeyword */
                 ? parseTokenNode()
                 : parseLiteralLikeNode(token());
             if (negative) {
@@ -19008,22 +19263,24 @@ var ts;
         }
         function isStartOfTypeOfImportType() {
             nextToken();
-            return token() === 92 /* ImportKeyword */;
+            return token() === 93 /* ImportKeyword */;
         }
         function parseImportType() {
             sourceFile.flags |= 524288 /* PossiblyContainsDynamicImport */;
-            var node = createNode(183 /* ImportType */);
-            if (parseOptional(104 /* TypeOfKeyword */)) {
+            var node = createNode(184 /* ImportType */);
+            if (parseOptional(105 /* TypeOfKeyword */)) {
                 node.isTypeOf = true;
             }
-            parseExpected(92 /* ImportKeyword */);
+            parseExpected(93 /* ImportKeyword */);
             parseExpected(20 /* OpenParenToken */);
             node.argument = parseType();
             parseExpected(21 /* CloseParenToken */);
             if (parseOptional(24 /* DotToken */)) {
                 node.qualifier = parseEntityName(/*allowReservedWords*/ true, ts.Diagnostics.Type_expected);
             }
-            node.typeArguments = tryParseTypeArguments();
+            if (!scanner.hasPrecedingLineBreak() && reScanLessThanToken() === 28 /* LessThanToken */) {
+                node.typeArguments = parseBracketedList(20 /* TypeArguments */, parseType, 28 /* LessThanToken */, 30 /* GreaterThanToken */);
+            }
             return finishNode(node);
         }
         function nextTokenIsNumericOrBigIntLiteral() {
@@ -19032,25 +19289,25 @@ var ts;
         }
         function parseNonArrayType() {
             switch (token()) {
-                case 120 /* AnyKeyword */:
-                case 143 /* UnknownKeyword */:
-                case 138 /* StringKeyword */:
-                case 135 /* NumberKeyword */:
-                case 146 /* BigIntKeyword */:
-                case 139 /* SymbolKeyword */:
-                case 123 /* BooleanKeyword */:
-                case 141 /* UndefinedKeyword */:
-                case 132 /* NeverKeyword */:
-                case 136 /* ObjectKeyword */:
+                case 121 /* AnyKeyword */:
+                case 144 /* UnknownKeyword */:
+                case 139 /* StringKeyword */:
+                case 136 /* NumberKeyword */:
+                case 147 /* BigIntKeyword */:
+                case 140 /* SymbolKeyword */:
+                case 124 /* BooleanKeyword */:
+                case 142 /* UndefinedKeyword */:
+                case 133 /* NeverKeyword */:
+                case 137 /* ObjectKeyword */:
                     // If these are followed by a dot, then parse these out as a dotted type reference instead.
                     return tryParse(parseKeywordAndNoDot) || parseTypeReference();
                 case 40 /* AsteriskToken */:
                     return parseJSDocAllType(/*postfixEquals*/ false);
-                case 62 /* AsteriskEqualsToken */:
+                case 63 /* AsteriskEqualsToken */:
                     return parseJSDocAllType(/*postfixEquals*/ true);
                 case 56 /* QuestionToken */:
                     return parseJSDocUnknownOrNullableType();
-                case 90 /* FunctionKeyword */:
+                case 91 /* FunctionKeyword */:
                     return parseJSDocFunctionType();
                 case 52 /* ExclamationToken */:
                     return parseJSDocNonNullableType();
@@ -19058,24 +19315,24 @@ var ts;
                 case 10 /* StringLiteral */:
                 case 8 /* NumericLiteral */:
                 case 9 /* BigIntLiteral */:
-                case 102 /* TrueKeyword */:
-                case 87 /* FalseKeyword */:
+                case 103 /* TrueKeyword */:
+                case 88 /* FalseKeyword */:
                     return parseLiteralTypeNode();
                 case 39 /* MinusToken */:
                     return lookAhead(nextTokenIsNumericOrBigIntLiteral) ? parseLiteralTypeNode(/*negative*/ true) : parseTypeReference();
-                case 106 /* VoidKeyword */:
-                case 96 /* NullKeyword */:
+                case 107 /* VoidKeyword */:
+                case 97 /* NullKeyword */:
                     return parseTokenNode();
-                case 100 /* ThisKeyword */: {
+                case 101 /* ThisKeyword */: {
                     var thisKeyword = parseThisTypeNode();
-                    if (token() === 128 /* IsKeyword */ && !scanner.hasPrecedingLineBreak()) {
+                    if (token() === 129 /* IsKeyword */ && !scanner.hasPrecedingLineBreak()) {
                         return parseThisTypePredicate(thisKeyword);
                     }
                     else {
                         return thisKeyword;
                     }
                 }
-                case 104 /* TypeOfKeyword */:
+                case 105 /* TypeOfKeyword */:
                     return lookAhead(isStartOfTypeOfImportType) ? parseImportType() : parseTypeQuery();
                 case 18 /* OpenBraceToken */:
                     return lookAhead(isStartOfMappedType) ? parseMappedType() : parseTypeLiteral();
@@ -19083,7 +19340,7 @@ var ts;
                     return parseTupleType();
                 case 20 /* OpenParenToken */:
                     return parseParenthesizedType();
-                case 92 /* ImportKeyword */:
+                case 93 /* ImportKeyword */:
                     return parseImportType();
                 default:
                     return parseTypeReference();
@@ -19091,41 +19348,41 @@ var ts;
         }
         function isStartOfType(inStartOfParameter) {
             switch (token()) {
-                case 120 /* AnyKeyword */:
-                case 143 /* UnknownKeyword */:
-                case 138 /* StringKeyword */:
-                case 135 /* NumberKeyword */:
-                case 146 /* BigIntKeyword */:
-                case 123 /* BooleanKeyword */:
-                case 133 /* ReadonlyKeyword */:
-                case 139 /* SymbolKeyword */:
-                case 142 /* UniqueKeyword */:
-                case 106 /* VoidKeyword */:
-                case 141 /* UndefinedKeyword */:
-                case 96 /* NullKeyword */:
-                case 100 /* ThisKeyword */:
-                case 104 /* TypeOfKeyword */:
-                case 132 /* NeverKeyword */:
+                case 121 /* AnyKeyword */:
+                case 144 /* UnknownKeyword */:
+                case 139 /* StringKeyword */:
+                case 136 /* NumberKeyword */:
+                case 147 /* BigIntKeyword */:
+                case 124 /* BooleanKeyword */:
+                case 134 /* ReadonlyKeyword */:
+                case 140 /* SymbolKeyword */:
+                case 143 /* UniqueKeyword */:
+                case 107 /* VoidKeyword */:
+                case 142 /* UndefinedKeyword */:
+                case 97 /* NullKeyword */:
+                case 101 /* ThisKeyword */:
+                case 105 /* TypeOfKeyword */:
+                case 133 /* NeverKeyword */:
                 case 18 /* OpenBraceToken */:
                 case 22 /* OpenBracketToken */:
                 case 28 /* LessThanToken */:
                 case 50 /* BarToken */:
                 case 49 /* AmpersandToken */:
-                case 95 /* NewKeyword */:
+                case 96 /* NewKeyword */:
                 case 10 /* StringLiteral */:
                 case 8 /* NumericLiteral */:
                 case 9 /* BigIntLiteral */:
-                case 102 /* TrueKeyword */:
-                case 87 /* FalseKeyword */:
-                case 136 /* ObjectKeyword */:
+                case 103 /* TrueKeyword */:
+                case 88 /* FalseKeyword */:
+                case 137 /* ObjectKeyword */:
                 case 40 /* AsteriskToken */:
                 case 56 /* QuestionToken */:
                 case 52 /* ExclamationToken */:
                 case 25 /* DotDotDotToken */:
-                case 127 /* InferKeyword */:
-                case 92 /* ImportKeyword */:
+                case 128 /* InferKeyword */:
+                case 93 /* ImportKeyword */:
                     return true;
-                case 90 /* FunctionKeyword */:
+                case 91 /* FunctionKeyword */:
                     return !inStartOfParameter;
                 case 39 /* MinusToken */:
                     return !inStartOfParameter && lookAhead(nextTokenIsNumericOrBigIntLiteral);
@@ -19146,26 +19403,26 @@ var ts;
             while (!scanner.hasPrecedingLineBreak()) {
                 switch (token()) {
                     case 52 /* ExclamationToken */:
-                        type = createPostfixType(292 /* JSDocNonNullableType */, type);
+                        type = createPostfixType(293 /* JSDocNonNullableType */, type);
                         break;
                     case 56 /* QuestionToken */:
                         // If not in JSDoc and next token is start of a type we have a conditional type
                         if (!(contextFlags & 2097152 /* JSDoc */) && lookAhead(nextTokenIsStartOfType)) {
                             return type;
                         }
-                        type = createPostfixType(291 /* JSDocNullableType */, type);
+                        type = createPostfixType(292 /* JSDocNullableType */, type);
                         break;
                     case 22 /* OpenBracketToken */:
                         parseExpected(22 /* OpenBracketToken */);
                         if (isStartOfType()) {
-                            var node = createNode(180 /* IndexedAccessType */, type.pos);
+                            var node = createNode(181 /* IndexedAccessType */, type.pos);
                             node.objectType = type;
                             node.indexType = parseType();
                             parseExpected(23 /* CloseBracketToken */);
                             type = finishNode(node);
                         }
                         else {
-                            var node = createNode(169 /* ArrayType */, type.pos);
+                            var node = createNode(170 /* ArrayType */, type.pos);
                             node.elementType = type;
                             parseExpected(23 /* CloseBracketToken */);
                             type = finishNode(node);
@@ -19184,16 +19441,16 @@ var ts;
             return finishNode(postfix);
         }
         function parseTypeOperator(operator) {
-            var node = createNode(179 /* TypeOperator */);
+            var node = createNode(180 /* TypeOperator */);
             parseExpected(operator);
             node.operator = operator;
             node.type = parseTypeOperatorOrHigher();
             return finishNode(node);
         }
         function parseInferType() {
-            var node = createNode(176 /* InferType */);
-            parseExpected(127 /* InferKeyword */);
-            var typeParameter = createNode(150 /* TypeParameter */);
+            var node = createNode(177 /* InferType */);
+            parseExpected(128 /* InferKeyword */);
+            var typeParameter = createNode(151 /* TypeParameter */);
             typeParameter.name = parseIdentifier();
             node.typeParameter = finishNode(typeParameter);
             return finishNode(node);
@@ -19201,34 +19458,35 @@ var ts;
         function parseTypeOperatorOrHigher() {
             var operator = token();
             switch (operator) {
-                case 129 /* KeyOfKeyword */:
-                case 142 /* UniqueKeyword */:
-                case 133 /* ReadonlyKeyword */:
+                case 130 /* KeyOfKeyword */:
+                case 143 /* UniqueKeyword */:
+                case 134 /* ReadonlyKeyword */:
                     return parseTypeOperator(operator);
-                case 127 /* InferKeyword */:
+                case 128 /* InferKeyword */:
                     return parseInferType();
             }
             return parsePostfixTypeOrHigher();
         }
         function parseUnionOrIntersectionType(kind, parseConstituentType, operator) {
-            parseOptional(operator);
+            var start = scanner.getStartPos();
+            var hasLeadingOperator = parseOptional(operator);
             var type = parseConstituentType();
-            if (token() === operator) {
+            if (token() === operator || hasLeadingOperator) {
                 var types = [type];
                 while (parseOptional(operator)) {
                     types.push(parseConstituentType());
                 }
-                var node = createNode(kind, type.pos);
-                node.types = createNodeArray(types, type.pos);
+                var node = createNode(kind, start);
+                node.types = createNodeArray(types, start);
                 type = finishNode(node);
             }
             return type;
         }
         function parseIntersectionTypeOrHigher() {
-            return parseUnionOrIntersectionType(174 /* IntersectionType */, parseTypeOperatorOrHigher, 49 /* AmpersandToken */);
+            return parseUnionOrIntersectionType(175 /* IntersectionType */, parseTypeOperatorOrHigher, 49 /* AmpersandToken */);
         }
         function parseUnionTypeOrHigher() {
-            return parseUnionOrIntersectionType(173 /* UnionType */, parseIntersectionTypeOrHigher, 50 /* BarToken */);
+            return parseUnionOrIntersectionType(174 /* UnionType */, parseIntersectionTypeOrHigher, 50 /* BarToken */);
         }
         function isStartOfFunctionType() {
             if (token() === 28 /* LessThanToken */) {
@@ -19241,7 +19499,7 @@ var ts;
                 // Skip modifiers
                 parseModifiers();
             }
-            if (isIdentifier() || token() === 100 /* ThisKeyword */) {
+            if (isIdentifier() || token() === 101 /* ThisKeyword */) {
                 nextToken();
                 return true;
             }
@@ -19264,7 +19522,7 @@ var ts;
                 // We successfully skipped modifiers (if any) and an identifier or binding pattern,
                 // now see if we have something that indicates a parameter declaration
                 if (token() === 57 /* ColonToken */ || token() === 27 /* CommaToken */ ||
-                    token() === 56 /* QuestionToken */ || token() === 59 /* EqualsToken */) {
+                    token() === 56 /* QuestionToken */ || token() === 60 /* EqualsToken */) {
                     // ( xxx :
                     // ( xxx ,
                     // ( xxx ?
@@ -19285,7 +19543,7 @@ var ts;
             var typePredicateVariable = isIdentifier() && tryParse(parseTypePredicatePrefix);
             var type = parseType();
             if (typePredicateVariable) {
-                var node = createNode(163 /* TypePredicate */, typePredicateVariable.pos);
+                var node = createNode(164 /* TypePredicate */, typePredicateVariable.pos);
                 node.parameterName = typePredicateVariable;
                 node.type = type;
                 return finishNode(node);
@@ -19296,7 +19554,7 @@ var ts;
         }
         function parseTypePredicatePrefix() {
             var id = parseIdentifier();
-            if (token() === 128 /* IsKeyword */ && !scanner.hasPrecedingLineBreak()) {
+            if (token() === 129 /* IsKeyword */ && !scanner.hasPrecedingLineBreak()) {
                 nextToken();
                 return id;
             }
@@ -19307,12 +19565,12 @@ var ts;
             return doOutsideOfContext(20480 /* TypeExcludesFlags */, parseTypeWorker);
         }
         function parseTypeWorker(noConditionalTypes) {
-            if (isStartOfFunctionType() || token() === 95 /* NewKeyword */) {
+            if (isStartOfFunctionType() || token() === 96 /* NewKeyword */) {
                 return parseFunctionOrConstructorType();
             }
             var type = parseUnionTypeOrHigher();
-            if (!noConditionalTypes && !scanner.hasPrecedingLineBreak() && parseOptional(86 /* ExtendsKeyword */)) {
-                var node = createNode(175 /* ConditionalType */, type.pos);
+            if (!noConditionalTypes && !scanner.hasPrecedingLineBreak() && parseOptional(87 /* ExtendsKeyword */)) {
+                var node = createNode(176 /* ConditionalType */, type.pos);
                 node.checkType = type;
                 // The type following 'extends' is not permitted to be another conditional type
                 node.extendsType = parseTypeWorker(/*noConditionalTypes*/ true);
@@ -19330,11 +19588,11 @@ var ts;
         // EXPRESSIONS
         function isStartOfLeftHandSideExpression() {
             switch (token()) {
-                case 100 /* ThisKeyword */:
-                case 98 /* SuperKeyword */:
-                case 96 /* NullKeyword */:
-                case 102 /* TrueKeyword */:
-                case 87 /* FalseKeyword */:
+                case 101 /* ThisKeyword */:
+                case 99 /* SuperKeyword */:
+                case 97 /* NullKeyword */:
+                case 103 /* TrueKeyword */:
+                case 88 /* FalseKeyword */:
                 case 8 /* NumericLiteral */:
                 case 9 /* BigIntLiteral */:
                 case 10 /* StringLiteral */:
@@ -19343,14 +19601,14 @@ var ts;
                 case 20 /* OpenParenToken */:
                 case 22 /* OpenBracketToken */:
                 case 18 /* OpenBraceToken */:
-                case 90 /* FunctionKeyword */:
-                case 76 /* ClassKeyword */:
-                case 95 /* NewKeyword */:
+                case 91 /* FunctionKeyword */:
+                case 77 /* ClassKeyword */:
+                case 96 /* NewKeyword */:
                 case 42 /* SlashToken */:
-                case 64 /* SlashEqualsToken */:
-                case 72 /* Identifier */:
+                case 65 /* SlashEqualsToken */:
+                case 73 /* Identifier */:
                     return true;
-                case 92 /* ImportKeyword */:
+                case 93 /* ImportKeyword */:
                     return lookAhead(nextTokenIsOpenParenOrLessThanOrDot);
                 default:
                     return isIdentifier();
@@ -19365,14 +19623,14 @@ var ts;
                 case 39 /* MinusToken */:
                 case 53 /* TildeToken */:
                 case 52 /* ExclamationToken */:
-                case 81 /* DeleteKeyword */:
-                case 104 /* TypeOfKeyword */:
-                case 106 /* VoidKeyword */:
+                case 82 /* DeleteKeyword */:
+                case 105 /* TypeOfKeyword */:
+                case 107 /* VoidKeyword */:
                 case 44 /* PlusPlusToken */:
                 case 45 /* MinusMinusToken */:
                 case 28 /* LessThanToken */:
-                case 122 /* AwaitKeyword */:
-                case 117 /* YieldKeyword */:
+                case 123 /* AwaitKeyword */:
+                case 118 /* YieldKeyword */:
                     // Yield/await always starts an expression.  Either it is an identifier (in which case
                     // it is definitely an expression).  Or it's a keyword (either because we're in
                     // a generator or async function, or in strict mode (or both)) and it started a yield or await expression.
@@ -19391,8 +19649,8 @@ var ts;
         function isStartOfExpressionStatement() {
             // As per the grammar, none of '{' or 'function' or 'class' can start an expression statement.
             return token() !== 18 /* OpenBraceToken */ &&
-                token() !== 90 /* FunctionKeyword */ &&
-                token() !== 76 /* ClassKeyword */ &&
+                token() !== 91 /* FunctionKeyword */ &&
+                token() !== 77 /* ClassKeyword */ &&
                 token() !== 58 /* AtToken */ &&
                 isStartOfExpression();
         }
@@ -19416,7 +19674,7 @@ var ts;
             return expr;
         }
         function parseInitializer() {
-            return parseOptional(59 /* EqualsToken */) ? parseAssignmentExpressionOrHigher() : undefined;
+            return parseOptional(60 /* EqualsToken */) ? parseAssignmentExpressionOrHigher() : undefined;
         }
         function parseAssignmentExpressionOrHigher() {
             //  AssignmentExpression[in,yield]:
@@ -19461,7 +19719,7 @@ var ts;
             // To avoid a look-ahead, we did not handle the case of an arrow function with a single un-parenthesized
             // parameter ('x => ...') above. We handle it here by checking if the parsed expression was a single
             // identifier and the current token is an arrow.
-            if (expr.kind === 72 /* Identifier */ && token() === 37 /* EqualsGreaterThanToken */) {
+            if (expr.kind === 73 /* Identifier */ && token() === 37 /* EqualsGreaterThanToken */) {
                 return parseSimpleArrowFunctionExpression(expr);
             }
             // Now see if we might be in cases '2' or '3'.
@@ -19477,7 +19735,7 @@ var ts;
             return parseConditionalExpressionRest(expr);
         }
         function isYieldExpression() {
-            if (token() === 117 /* YieldKeyword */) {
+            if (token() === 118 /* YieldKeyword */) {
                 // If we have a 'yield' keyword, and this is a context where yield expressions are
                 // allowed, then definitely parse out a yield expression.
                 if (inYieldContext()) {
@@ -19506,7 +19764,7 @@ var ts;
             return !scanner.hasPrecedingLineBreak() && isIdentifier();
         }
         function parseYieldExpression() {
-            var node = createNode(207 /* YieldExpression */);
+            var node = createNode(208 /* YieldExpression */);
             // YieldExpression[In] :
             //      yield
             //      yield [no LineTerminator here] [Lexical goal InputElementRegExp]AssignmentExpression[?In, Yield]
@@ -19528,13 +19786,13 @@ var ts;
             ts.Debug.assert(token() === 37 /* EqualsGreaterThanToken */, "parseSimpleArrowFunctionExpression should only have been called if we had a =>");
             var node;
             if (asyncModifier) {
-                node = createNode(197 /* ArrowFunction */, asyncModifier.pos);
+                node = createNode(198 /* ArrowFunction */, asyncModifier.pos);
                 node.modifiers = asyncModifier;
             }
             else {
-                node = createNode(197 /* ArrowFunction */, identifier.pos);
+                node = createNode(198 /* ArrowFunction */, identifier.pos);
             }
-            var parameter = createNode(151 /* Parameter */, identifier.pos);
+            var parameter = createNode(152 /* Parameter */, identifier.pos);
             parameter.name = identifier;
             finishNode(parameter);
             node.parameters = createNodeArray([parameter], parameter.pos, parameter.end);
@@ -19574,7 +19832,7 @@ var ts;
         //  Unknown     -> There *might* be a parenthesized arrow function here.
         //                 Speculatively look ahead to be sure, and rollback if not.
         function isParenthesizedArrowFunctionExpression() {
-            if (token() === 20 /* OpenParenToken */ || token() === 28 /* LessThanToken */ || token() === 121 /* AsyncKeyword */) {
+            if (token() === 20 /* OpenParenToken */ || token() === 28 /* LessThanToken */ || token() === 122 /* AsyncKeyword */) {
                 return lookAhead(isParenthesizedArrowFunctionExpressionWorker);
             }
             if (token() === 37 /* EqualsGreaterThanToken */) {
@@ -19587,7 +19845,7 @@ var ts;
             return 0 /* False */;
         }
         function isParenthesizedArrowFunctionExpressionWorker() {
-            if (token() === 121 /* AsyncKeyword */) {
+            if (token() === 122 /* AsyncKeyword */) {
                 nextToken();
                 if (scanner.hasPrecedingLineBreak()) {
                     return 0 /* False */;
@@ -19631,13 +19889,13 @@ var ts;
                 // Check for "(xxx yyy", where xxx is a modifier and yyy is an identifier. This
                 // isn't actually allowed, but we want to treat it as a lambda so we can provide
                 // a good error message.
-                if (ts.isModifierKind(second) && second !== 121 /* AsyncKeyword */ && lookAhead(nextTokenIsIdentifier)) {
+                if (ts.isModifierKind(second) && second !== 122 /* AsyncKeyword */ && lookAhead(nextTokenIsIdentifier)) {
                     return 1 /* True */;
                 }
                 // If we had "(" followed by something that's not an identifier,
                 // then this definitely doesn't look like a lambda.  "this" is not
                 // valid, but we want to parse it and then give a semantic error.
-                if (!isIdentifier() && second !== 100 /* ThisKeyword */) {
+                if (!isIdentifier() && second !== 101 /* ThisKeyword */) {
                     return 0 /* False */;
                 }
                 switch (nextToken()) {
@@ -19648,13 +19906,13 @@ var ts;
                     case 56 /* QuestionToken */:
                         nextToken();
                         // If we have "(a?:" or "(a?," or "(a?=" or "(a?)" then it is definitely a lambda.
-                        if (token() === 57 /* ColonToken */ || token() === 27 /* CommaToken */ || token() === 59 /* EqualsToken */ || token() === 21 /* CloseParenToken */) {
+                        if (token() === 57 /* ColonToken */ || token() === 27 /* CommaToken */ || token() === 60 /* EqualsToken */ || token() === 21 /* CloseParenToken */) {
                             return 1 /* True */;
                         }
                         // Otherwise it is definitely not a lambda.
                         return 0 /* False */;
                     case 27 /* CommaToken */:
-                    case 59 /* EqualsToken */:
+                    case 60 /* EqualsToken */:
                     case 21 /* CloseParenToken */:
                         // If we have "(a," or "(a=" or "(a)" this *could* be an arrow function
                         return 2 /* Unknown */;
@@ -19673,10 +19931,10 @@ var ts;
                 if (sourceFile.languageVariant === 1 /* JSX */) {
                     var isArrowFunctionInJsx = lookAhead(function () {
                         var third = nextToken();
-                        if (third === 86 /* ExtendsKeyword */) {
+                        if (third === 87 /* ExtendsKeyword */) {
                             var fourth = nextToken();
                             switch (fourth) {
-                                case 59 /* EqualsToken */:
+                                case 60 /* EqualsToken */:
                                 case 30 /* GreaterThanToken */:
                                     return false;
                                 default:
@@ -19702,7 +19960,7 @@ var ts;
         }
         function tryParseAsyncSimpleArrowFunctionExpression() {
             // We do a check here so that we won't be doing unnecessarily call to "lookAhead"
-            if (token() === 121 /* AsyncKeyword */) {
+            if (token() === 122 /* AsyncKeyword */) {
                 if (lookAhead(isUnParenthesizedAsyncArrowFunctionWorker) === 1 /* True */) {
                     var asyncModifier = parseModifiersForArrowFunction();
                     var expr = parseBinaryExpressionOrHigher(/*precedence*/ 0);
@@ -19715,7 +19973,7 @@ var ts;
             // AsyncArrowFunctionExpression:
             //      1) async[no LineTerminator here]AsyncArrowBindingIdentifier[?Yield][no LineTerminator here]=>AsyncConciseBody[?In]
             //      2) CoverCallExpressionAndAsyncArrowHead[?Yield, ?Await][no LineTerminator here]=>AsyncConciseBody[?In]
-            if (token() === 121 /* AsyncKeyword */) {
+            if (token() === 122 /* AsyncKeyword */) {
                 nextToken();
                 // If the "async" is followed by "=>" token then it is not a beginning of an async arrow-function
                 // but instead a simple arrow-function which will be parsed inside "parseAssignmentExpressionOrHigher"
@@ -19724,14 +19982,14 @@ var ts;
                 }
                 // Check for un-parenthesized AsyncArrowFunction
                 var expr = parseBinaryExpressionOrHigher(/*precedence*/ 0);
-                if (!scanner.hasPrecedingLineBreak() && expr.kind === 72 /* Identifier */ && token() === 37 /* EqualsGreaterThanToken */) {
+                if (!scanner.hasPrecedingLineBreak() && expr.kind === 73 /* Identifier */ && token() === 37 /* EqualsGreaterThanToken */) {
                     return 1 /* True */;
                 }
             }
             return 0 /* False */;
         }
         function parseParenthesizedArrowFunctionExpressionHead(allowAmbiguity) {
-            var node = createNodeWithJSDoc(197 /* ArrowFunction */);
+            var node = createNodeWithJSDoc(198 /* ArrowFunction */);
             node.modifiers = parseModifiersForArrowFunction();
             var isAsync = ts.hasModifier(node, 256 /* Async */) ? 2 /* Await */ : 0 /* None */;
             // Arrow functions are never generators.
@@ -19750,9 +20008,11 @@ var ts;
             //  - "(x = 10)" is an assignment expression parsed as a signature with a default parameter value.
             //  - "(x,y)" is a comma expression parsed as a signature with two parameters.
             //  - "a ? (b): c" will have "(b):" parsed as a signature with a return type annotation.
+            //  - "a ? (b): function() {}" will too, since function() is a valid JSDoc function type.
             //
             // So we need just a bit of lookahead to ensure that it can only be a signature.
-            if (!allowAmbiguity && token() !== 37 /* EqualsGreaterThanToken */ && token() !== 18 /* OpenBraceToken */) {
+            var hasJSDocFunctionType = node.type && ts.isJSDocFunctionType(node.type);
+            if (!allowAmbiguity && token() !== 37 /* EqualsGreaterThanToken */ && (hasJSDocFunctionType || token() !== 18 /* OpenBraceToken */)) {
                 // Returning undefined here will cause our caller to rewind to where we started from.
                 return undefined;
             }
@@ -19763,8 +20023,8 @@ var ts;
                 return parseFunctionBlock(isAsync ? 2 /* Await */ : 0 /* None */);
             }
             if (token() !== 26 /* SemicolonToken */ &&
-                token() !== 90 /* FunctionKeyword */ &&
-                token() !== 76 /* ClassKeyword */ &&
+                token() !== 91 /* FunctionKeyword */ &&
+                token() !== 77 /* ClassKeyword */ &&
                 isStartOfStatement() &&
                 !isStartOfExpressionStatement()) {
                 // Check if we got a plain statement (i.e. no expression-statements, no function/class expressions/declarations)
@@ -19795,14 +20055,14 @@ var ts;
             }
             // Note: we explicitly 'allowIn' in the whenTrue part of the condition expression, and
             // we do not that for the 'whenFalse' part.
-            var node = createNode(205 /* ConditionalExpression */, leftOperand.pos);
+            var node = createNode(206 /* ConditionalExpression */, leftOperand.pos);
             node.condition = leftOperand;
             node.questionToken = questionToken;
             node.whenTrue = doOutsideOfContext(disallowInAndDecoratorContext, parseAssignmentExpressionOrHigher);
             node.colonToken = parseExpectedToken(57 /* ColonToken */);
             node.whenFalse = ts.nodeIsPresent(node.colonToken)
                 ? parseAssignmentExpressionOrHigher()
-                : createMissingNode(72 /* Identifier */, /*reportAtCurrentPosition*/ false, ts.Diagnostics._0_expected, ts.tokenToString(57 /* ColonToken */));
+                : createMissingNode(73 /* Identifier */, /*reportAtCurrentPosition*/ false, ts.Diagnostics._0_expected, ts.tokenToString(57 /* ColonToken */));
             return finishNode(node);
         }
         function parseBinaryExpressionOrHigher(precedence) {
@@ -19810,7 +20070,7 @@ var ts;
             return parseBinaryExpressionRest(precedence, leftOperand);
         }
         function isInOrOfKeyword(t) {
-            return t === 93 /* InKeyword */ || t === 147 /* OfKeyword */;
+            return t === 94 /* InKeyword */ || t === 148 /* OfKeyword */;
         }
         function parseBinaryExpressionRest(precedence, leftOperand) {
             while (true) {
@@ -19845,10 +20105,10 @@ var ts;
                 if (!consumeCurrentOperator) {
                     break;
                 }
-                if (token() === 93 /* InKeyword */ && inDisallowInContext()) {
+                if (token() === 94 /* InKeyword */ && inDisallowInContext()) {
                     break;
                 }
-                if (token() === 119 /* AsKeyword */) {
+                if (token() === 120 /* AsKeyword */) {
                     // Make sure we *do* perform ASI for constructs like this:
                     //    var x = foo
                     //    as (Bar)
@@ -19869,51 +20129,51 @@ var ts;
             return leftOperand;
         }
         function isBinaryOperator() {
-            if (inDisallowInContext() && token() === 93 /* InKeyword */) {
+            if (inDisallowInContext() && token() === 94 /* InKeyword */) {
                 return false;
             }
             return ts.getBinaryOperatorPrecedence(token()) > 0;
         }
         function makeBinaryExpression(left, operatorToken, right) {
-            var node = createNode(204 /* BinaryExpression */, left.pos);
+            var node = createNode(205 /* BinaryExpression */, left.pos);
             node.left = left;
             node.operatorToken = operatorToken;
             node.right = right;
             return finishNode(node);
         }
         function makeAsExpression(left, right) {
-            var node = createNode(212 /* AsExpression */, left.pos);
+            var node = createNode(213 /* AsExpression */, left.pos);
             node.expression = left;
             node.type = right;
             return finishNode(node);
         }
         function parsePrefixUnaryExpression() {
-            var node = createNode(202 /* PrefixUnaryExpression */);
+            var node = createNode(203 /* PrefixUnaryExpression */);
             node.operator = token();
             nextToken();
             node.operand = parseSimpleUnaryExpression();
             return finishNode(node);
         }
         function parseDeleteExpression() {
-            var node = createNode(198 /* DeleteExpression */);
+            var node = createNode(199 /* DeleteExpression */);
             nextToken();
             node.expression = parseSimpleUnaryExpression();
             return finishNode(node);
         }
         function parseTypeOfExpression() {
-            var node = createNode(199 /* TypeOfExpression */);
+            var node = createNode(200 /* TypeOfExpression */);
             nextToken();
             node.expression = parseSimpleUnaryExpression();
             return finishNode(node);
         }
         function parseVoidExpression() {
-            var node = createNode(200 /* VoidExpression */);
+            var node = createNode(201 /* VoidExpression */);
             nextToken();
             node.expression = parseSimpleUnaryExpression();
             return finishNode(node);
         }
         function isAwaitExpression() {
-            if (token() === 122 /* AwaitKeyword */) {
+            if (token() === 123 /* AwaitKeyword */) {
                 if (inAwaitContext()) {
                     return true;
                 }
@@ -19923,7 +20183,7 @@ var ts;
             return false;
         }
         function parseAwaitExpression() {
-            var node = createNode(201 /* AwaitExpression */);
+            var node = createNode(202 /* AwaitExpression */);
             nextToken();
             node.expression = parseSimpleUnaryExpression();
             return finishNode(node);
@@ -19967,7 +20227,7 @@ var ts;
             if (token() === 41 /* AsteriskAsteriskToken */) {
                 var pos = ts.skipTrivia(sourceText, simpleUnaryExpression.pos);
                 var end = simpleUnaryExpression.end;
-                if (simpleUnaryExpression.kind === 194 /* TypeAssertionExpression */) {
+                if (simpleUnaryExpression.kind === 195 /* TypeAssertionExpression */) {
                     parseErrorAt(pos, end, ts.Diagnostics.A_type_assertion_expression_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Consider_enclosing_the_expression_in_parentheses);
                 }
                 else {
@@ -19997,18 +20257,18 @@ var ts;
                 case 53 /* TildeToken */:
                 case 52 /* ExclamationToken */:
                     return parsePrefixUnaryExpression();
-                case 81 /* DeleteKeyword */:
+                case 82 /* DeleteKeyword */:
                     return parseDeleteExpression();
-                case 104 /* TypeOfKeyword */:
+                case 105 /* TypeOfKeyword */:
                     return parseTypeOfExpression();
-                case 106 /* VoidKeyword */:
+                case 107 /* VoidKeyword */:
                     return parseVoidExpression();
                 case 28 /* LessThanToken */:
                     // This is modified UnaryExpression grammar in TypeScript
                     //  UnaryExpression (modified):
                     //      < type > UnaryExpression
                     return parseTypeAssertion();
-                case 122 /* AwaitKeyword */:
+                case 123 /* AwaitKeyword */:
                     if (isAwaitExpression()) {
                         return parseAwaitExpression();
                     }
@@ -20035,10 +20295,10 @@ var ts;
                 case 39 /* MinusToken */:
                 case 53 /* TildeToken */:
                 case 52 /* ExclamationToken */:
-                case 81 /* DeleteKeyword */:
-                case 104 /* TypeOfKeyword */:
-                case 106 /* VoidKeyword */:
-                case 122 /* AwaitKeyword */:
+                case 82 /* DeleteKeyword */:
+                case 105 /* TypeOfKeyword */:
+                case 107 /* VoidKeyword */:
+                case 123 /* AwaitKeyword */:
                     return false;
                 case 28 /* LessThanToken */:
                     // If we are not in JSX context, we are parsing TypeAssertion which is an UnaryExpression
@@ -20064,7 +20324,7 @@ var ts;
          */
         function parseUpdateExpression() {
             if (token() === 44 /* PlusPlusToken */ || token() === 45 /* MinusMinusToken */) {
-                var node = createNode(202 /* PrefixUnaryExpression */);
+                var node = createNode(203 /* PrefixUnaryExpression */);
                 node.operator = token();
                 nextToken();
                 node.operand = parseLeftHandSideExpressionOrHigher();
@@ -20077,7 +20337,7 @@ var ts;
             var expression = parseLeftHandSideExpressionOrHigher();
             ts.Debug.assert(ts.isLeftHandSideExpression(expression));
             if ((token() === 44 /* PlusPlusToken */ || token() === 45 /* MinusMinusToken */) && !scanner.hasPrecedingLineBreak()) {
-                var node = createNode(203 /* PostfixUnaryExpression */, expression.pos);
+                var node = createNode(204 /* PostfixUnaryExpression */, expression.pos);
                 node.operand = expression;
                 node.operator = token();
                 nextToken();
@@ -20118,7 +20378,7 @@ var ts;
             // 3)we have a MemberExpression which either completes the LeftHandSideExpression,
             // or starts the beginning of the first four CallExpression productions.
             var expression;
-            if (token() === 92 /* ImportKeyword */) {
+            if (token() === 93 /* ImportKeyword */) {
                 if (lookAhead(nextTokenIsOpenParenOrLessThan)) {
                     // We don't want to eagerly consume all import keyword as import call expression so we look ahead to find "("
                     // For example:
@@ -20133,8 +20393,8 @@ var ts;
                     var fullStart = scanner.getStartPos();
                     nextToken(); // advance past the 'import'
                     nextToken(); // advance past the dot
-                    var node = createNode(214 /* MetaProperty */, fullStart);
-                    node.keywordToken = 92 /* ImportKeyword */;
+                    var node = createNode(215 /* MetaProperty */, fullStart);
+                    node.keywordToken = 93 /* ImportKeyword */;
                     node.name = parseIdentifierName();
                     expression = finishNode(node);
                     sourceFile.flags |= 1048576 /* PossiblyContainsImportMeta */;
@@ -20144,7 +20404,7 @@ var ts;
                 }
             }
             else {
-                expression = token() === 98 /* SuperKeyword */ ? parseSuperExpression() : parseMemberExpressionOrHigher();
+                expression = token() === 99 /* SuperKeyword */ ? parseSuperExpression() : parseMemberExpressionOrHigher();
             }
             // Now, we *may* be complete.  However, we might have consumed the start of a
             // CallExpression.  As such, we need to consume the rest of it here to be complete.
@@ -20203,12 +20463,19 @@ var ts;
         }
         function parseSuperExpression() {
             var expression = parseTokenNode();
+            if (token() === 28 /* LessThanToken */) {
+                var startPos = getNodePos();
+                var typeArguments = tryParse(parseTypeArgumentsInExpression);
+                if (typeArguments !== undefined) {
+                    parseErrorAt(startPos, getNodePos(), ts.Diagnostics.super_may_not_use_type_arguments);
+                }
+            }
             if (token() === 20 /* OpenParenToken */ || token() === 24 /* DotToken */ || token() === 22 /* OpenBracketToken */) {
                 return expression;
             }
             // If we have seen "super" it must be followed by '(' or '.'.
             // If it wasn't then just try to parse out a '.' and report an error.
-            var node = createNode(189 /* PropertyAccessExpression */, expression.pos);
+            var node = createNode(190 /* PropertyAccessExpression */, expression.pos);
             node.expression = expression;
             parseExpectedToken(24 /* DotToken */, ts.Diagnostics.super_must_be_followed_by_an_argument_list_or_member_access);
             node.name = parseRightSideOfDot(/*allowIdentifierNames*/ true);
@@ -20217,8 +20484,8 @@ var ts;
         function parseJsxElementOrSelfClosingElementOrFragment(inExpressionContext) {
             var opening = parseJsxOpeningOrSelfClosingElementOrOpeningFragment(inExpressionContext);
             var result;
-            if (opening.kind === 262 /* JsxOpeningElement */) {
-                var node = createNode(260 /* JsxElement */, opening.pos);
+            if (opening.kind === 263 /* JsxOpeningElement */) {
+                var node = createNode(261 /* JsxElement */, opening.pos);
                 node.openingElement = opening;
                 node.children = parseJsxChildren(node.openingElement);
                 node.closingElement = parseJsxClosingElement(inExpressionContext);
@@ -20227,15 +20494,15 @@ var ts;
                 }
                 result = finishNode(node);
             }
-            else if (opening.kind === 265 /* JsxOpeningFragment */) {
-                var node = createNode(264 /* JsxFragment */, opening.pos);
+            else if (opening.kind === 266 /* JsxOpeningFragment */) {
+                var node = createNode(265 /* JsxFragment */, opening.pos);
                 node.openingFragment = opening;
                 node.children = parseJsxChildren(node.openingFragment);
                 node.closingFragment = parseJsxClosingFragment(inExpressionContext);
                 result = finishNode(node);
             }
             else {
-                ts.Debug.assert(opening.kind === 261 /* JsxSelfClosingElement */);
+                ts.Debug.assert(opening.kind === 262 /* JsxSelfClosingElement */);
                 // Nothing else to do for self-closing elements
                 result = opening;
             }
@@ -20250,11 +20517,11 @@ var ts;
                 var invalidElement = tryParse(function () { return parseJsxElementOrSelfClosingElementOrFragment(/*inExpressionContext*/ true); });
                 if (invalidElement) {
                     parseErrorAtCurrentToken(ts.Diagnostics.JSX_expressions_must_have_one_parent_element);
-                    var badNode = createNode(204 /* BinaryExpression */, result.pos);
+                    var badNode = createNode(205 /* BinaryExpression */, result.pos);
                     badNode.end = invalidElement.end;
                     badNode.left = result;
                     badNode.right = invalidElement;
-                    badNode.operatorToken = createMissingNode(27 /* CommaToken */, /*reportAtCurrentPosition*/ false, /*diagnosticMessage*/ undefined); // TODO: GH#18217
+                    badNode.operatorToken = createMissingNode(27 /* CommaToken */, /*reportAtCurrentPosition*/ false);
                     badNode.operatorToken.pos = badNode.operatorToken.end = badNode.right.pos;
                     return badNode;
                 }
@@ -20263,7 +20530,8 @@ var ts;
         }
         function parseJsxText() {
             var node = createNode(11 /* JsxText */);
-            node.containsOnlyWhiteSpaces = currentToken === 12 /* JsxTextAllWhiteSpaces */;
+            node.text = scanner.getTokenValue();
+            node.containsOnlyTriviaWhiteSpaces = currentToken === 12 /* JsxTextAllWhiteSpaces */;
             currentToken = scanner.scanJsxToken();
             return finishNode(node);
         }
@@ -20308,7 +20576,7 @@ var ts;
             return createNodeArray(list, listPos);
         }
         function parseJsxAttributes() {
-            var jsxAttributes = createNode(268 /* JsxAttributes */);
+            var jsxAttributes = createNode(269 /* JsxAttributes */);
             jsxAttributes.properties = parseList(13 /* JsxAttributes */, parseJsxAttribute);
             return finishNode(jsxAttributes);
         }
@@ -20317,7 +20585,7 @@ var ts;
             parseExpected(28 /* LessThanToken */);
             if (token() === 30 /* GreaterThanToken */) {
                 // See below for explanation of scanJsxText
-                var node_1 = createNode(265 /* JsxOpeningFragment */, fullStart);
+                var node_1 = createNode(266 /* JsxOpeningFragment */, fullStart);
                 scanJsxText();
                 return finishNode(node_1);
             }
@@ -20329,7 +20597,7 @@ var ts;
                 // Closing tag, so scan the immediately-following text with the JSX scanning instead
                 // of regular scanning to avoid treating illegal characters (e.g. '#') as immediate
                 // scanning errors
-                node = createNode(262 /* JsxOpeningElement */, fullStart);
+                node = createNode(263 /* JsxOpeningElement */, fullStart);
                 scanJsxText();
             }
             else {
@@ -20341,7 +20609,7 @@ var ts;
                     parseExpected(30 /* GreaterThanToken */, /*diagnostic*/ undefined, /*shouldAdvance*/ false);
                     scanJsxText();
                 }
-                node = createNode(261 /* JsxSelfClosingElement */, fullStart);
+                node = createNode(262 /* JsxSelfClosingElement */, fullStart);
             }
             node.tagName = tagName;
             node.typeArguments = typeArguments;
@@ -20355,10 +20623,10 @@ var ts;
             //      primaryExpression in the form of an identifier and "this" keyword
             // We can't just simply use parseLeftHandSideExpressionOrHigher because then we will start consider class,function etc as a keyword
             // We only want to consider "this" as a primaryExpression
-            var expression = token() === 100 /* ThisKeyword */ ?
+            var expression = token() === 101 /* ThisKeyword */ ?
                 parseTokenNode() : parseIdentifierName();
             while (parseOptional(24 /* DotToken */)) {
-                var propertyAccess = createNode(189 /* PropertyAccessExpression */, expression.pos);
+                var propertyAccess = createNode(190 /* PropertyAccessExpression */, expression.pos);
                 propertyAccess.expression = expression;
                 propertyAccess.name = parseRightSideOfDot(/*allowIdentifierNames*/ true);
                 expression = finishNode(propertyAccess);
@@ -20366,20 +20634,24 @@ var ts;
             return expression;
         }
         function parseJsxExpression(inExpressionContext) {
-            var node = createNode(270 /* JsxExpression */);
+            var node = createNode(271 /* JsxExpression */);
             if (!parseExpected(18 /* OpenBraceToken */)) {
                 return undefined;
             }
             if (token() !== 19 /* CloseBraceToken */) {
                 node.dotDotDotToken = parseOptionalToken(25 /* DotDotDotToken */);
-                node.expression = parseAssignmentExpressionOrHigher();
+                // Only an AssignmentExpression is valid here per the JSX spec,
+                // but we can unambiguously parse a comma sequence and provide
+                // a better error message in grammar checking.
+                node.expression = parseExpression();
             }
             if (inExpressionContext) {
                 parseExpected(19 /* CloseBraceToken */);
             }
             else {
-                parseExpected(19 /* CloseBraceToken */, /*message*/ undefined, /*shouldAdvance*/ false);
-                scanJsxText();
+                if (parseExpected(19 /* CloseBraceToken */, /*message*/ undefined, /*shouldAdvance*/ false)) {
+                    scanJsxText();
+                }
             }
             return finishNode(node);
         }
@@ -20388,9 +20660,9 @@ var ts;
                 return parseJsxSpreadAttribute();
             }
             scanJsxIdentifier();
-            var node = createNode(267 /* JsxAttribute */);
+            var node = createNode(268 /* JsxAttribute */);
             node.name = parseIdentifierName();
-            if (token() === 59 /* EqualsToken */) {
+            if (token() === 60 /* EqualsToken */) {
                 switch (scanJsxAttributeValue()) {
                     case 10 /* StringLiteral */:
                         node.initializer = parseLiteralNode();
@@ -20403,7 +20675,7 @@ var ts;
             return finishNode(node);
         }
         function parseJsxSpreadAttribute() {
-            var node = createNode(269 /* JsxSpreadAttribute */);
+            var node = createNode(270 /* JsxSpreadAttribute */);
             parseExpected(18 /* OpenBraceToken */);
             parseExpected(25 /* DotDotDotToken */);
             node.expression = parseExpression();
@@ -20411,7 +20683,7 @@ var ts;
             return finishNode(node);
         }
         function parseJsxClosingElement(inExpressionContext) {
-            var node = createNode(263 /* JsxClosingElement */);
+            var node = createNode(264 /* JsxClosingElement */);
             parseExpected(29 /* LessThanSlashToken */);
             node.tagName = parseJsxElementName();
             if (inExpressionContext) {
@@ -20424,7 +20696,7 @@ var ts;
             return finishNode(node);
         }
         function parseJsxClosingFragment(inExpressionContext) {
-            var node = createNode(266 /* JsxClosingFragment */);
+            var node = createNode(267 /* JsxClosingFragment */);
             parseExpected(29 /* LessThanSlashToken */);
             if (ts.tokenIsIdentifierOrKeyword(token())) {
                 parseErrorAtRange(parseJsxElementName(), ts.Diagnostics.Expected_corresponding_closing_tag_for_JSX_fragment);
@@ -20439,7 +20711,7 @@ var ts;
             return finishNode(node);
         }
         function parseTypeAssertion() {
-            var node = createNode(194 /* TypeAssertionExpression */);
+            var node = createNode(195 /* TypeAssertionExpression */);
             parseExpected(28 /* LessThanToken */);
             node.type = parseType();
             parseExpected(30 /* GreaterThanToken */);
@@ -20450,7 +20722,7 @@ var ts;
             while (true) {
                 var dotToken = parseOptionalToken(24 /* DotToken */);
                 if (dotToken) {
-                    var propertyAccess = createNode(189 /* PropertyAccessExpression */, expression.pos);
+                    var propertyAccess = createNode(190 /* PropertyAccessExpression */, expression.pos);
                     propertyAccess.expression = expression;
                     propertyAccess.name = parseRightSideOfDot(/*allowIdentifierNames*/ true);
                     expression = finishNode(propertyAccess);
@@ -20458,17 +20730,17 @@ var ts;
                 }
                 if (token() === 52 /* ExclamationToken */ && !scanner.hasPrecedingLineBreak()) {
                     nextToken();
-                    var nonNullExpression = createNode(213 /* NonNullExpression */, expression.pos);
+                    var nonNullExpression = createNode(214 /* NonNullExpression */, expression.pos);
                     nonNullExpression.expression = expression;
                     expression = finishNode(nonNullExpression);
                     continue;
                 }
                 // when in the [Decorator] context, we do not parse ElementAccess as it could be part of a ComputedPropertyName
                 if (!inDecoratorContext() && parseOptional(22 /* OpenBracketToken */)) {
-                    var indexedAccess = createNode(190 /* ElementAccessExpression */, expression.pos);
+                    var indexedAccess = createNode(191 /* ElementAccessExpression */, expression.pos);
                     indexedAccess.expression = expression;
                     if (token() === 23 /* CloseBracketToken */) {
-                        indexedAccess.argumentExpression = createMissingNode(72 /* Identifier */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.An_element_access_expression_should_take_an_argument);
+                        indexedAccess.argumentExpression = createMissingNode(73 /* Identifier */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.An_element_access_expression_should_take_an_argument);
                     }
                     else {
                         var argument = allowInAnd(parseExpression);
@@ -20492,7 +20764,7 @@ var ts;
             return token() === 14 /* NoSubstitutionTemplateLiteral */ || token() === 15 /* TemplateHead */;
         }
         function parseTaggedTemplateRest(tag, typeArguments) {
-            var tagExpression = createNode(193 /* TaggedTemplateExpression */, tag.pos);
+            var tagExpression = createNode(194 /* TaggedTemplateExpression */, tag.pos);
             tagExpression.tag = tag;
             tagExpression.typeArguments = typeArguments;
             tagExpression.template = token() === 14 /* NoSubstitutionTemplateLiteral */
@@ -20517,7 +20789,7 @@ var ts;
                         expression = parseTaggedTemplateRest(expression, typeArguments);
                         continue;
                     }
-                    var callExpr = createNode(191 /* CallExpression */, expression.pos);
+                    var callExpr = createNode(192 /* CallExpression */, expression.pos);
                     callExpr.expression = expression;
                     callExpr.typeArguments = typeArguments;
                     callExpr.arguments = parseArgumentList();
@@ -20525,7 +20797,7 @@ var ts;
                     continue;
                 }
                 else if (token() === 20 /* OpenParenToken */) {
-                    var callExpr = createNode(191 /* CallExpression */, expression.pos);
+                    var callExpr = createNode(192 /* CallExpression */, expression.pos);
                     callExpr.expression = expression;
                     callExpr.arguments = parseArgumentList();
                     expression = finishNode(callExpr);
@@ -20601,11 +20873,11 @@ var ts;
                 case 10 /* StringLiteral */:
                 case 14 /* NoSubstitutionTemplateLiteral */:
                     return parseLiteralNode();
-                case 100 /* ThisKeyword */:
-                case 98 /* SuperKeyword */:
-                case 96 /* NullKeyword */:
-                case 102 /* TrueKeyword */:
-                case 87 /* FalseKeyword */:
+                case 101 /* ThisKeyword */:
+                case 99 /* SuperKeyword */:
+                case 97 /* NullKeyword */:
+                case 103 /* TrueKeyword */:
+                case 88 /* FalseKeyword */:
                     return parseTokenNode();
                 case 20 /* OpenParenToken */:
                     return parseParenthesizedExpression();
@@ -20613,7 +20885,7 @@ var ts;
                     return parseArrayLiteralExpression();
                 case 18 /* OpenBraceToken */:
                     return parseObjectLiteralExpression();
-                case 121 /* AsyncKeyword */:
+                case 122 /* AsyncKeyword */:
                     // Async arrow functions are parsed earlier in parseAssignmentExpressionOrHigher.
                     // If we encounter `async [no LineTerminator here] function` then this is an async
                     // function; otherwise, its an identifier.
@@ -20621,14 +20893,14 @@ var ts;
                         break;
                     }
                     return parseFunctionExpression();
-                case 76 /* ClassKeyword */:
+                case 77 /* ClassKeyword */:
                     return parseClassExpression();
-                case 90 /* FunctionKeyword */:
+                case 91 /* FunctionKeyword */:
                     return parseFunctionExpression();
-                case 95 /* NewKeyword */:
+                case 96 /* NewKeyword */:
                     return parseNewExpressionOrNewDotTarget();
                 case 42 /* SlashToken */:
-                case 64 /* SlashEqualsToken */:
+                case 65 /* SlashEqualsToken */:
                     if (reScanSlashToken() === 13 /* RegularExpressionLiteral */) {
                         return parseLiteralNode();
                     }
@@ -20639,28 +20911,28 @@ var ts;
             return parseIdentifier(ts.Diagnostics.Expression_expected);
         }
         function parseParenthesizedExpression() {
-            var node = createNodeWithJSDoc(195 /* ParenthesizedExpression */);
+            var node = createNodeWithJSDoc(196 /* ParenthesizedExpression */);
             parseExpected(20 /* OpenParenToken */);
             node.expression = allowInAnd(parseExpression);
             parseExpected(21 /* CloseParenToken */);
             return finishNode(node);
         }
         function parseSpreadElement() {
-            var node = createNode(208 /* SpreadElement */);
+            var node = createNode(209 /* SpreadElement */);
             parseExpected(25 /* DotDotDotToken */);
             node.expression = parseAssignmentExpressionOrHigher();
             return finishNode(node);
         }
         function parseArgumentOrArrayLiteralElement() {
             return token() === 25 /* DotDotDotToken */ ? parseSpreadElement() :
-                token() === 27 /* CommaToken */ ? createNode(210 /* OmittedExpression */) :
+                token() === 27 /* CommaToken */ ? createNode(211 /* OmittedExpression */) :
                     parseAssignmentExpressionOrHigher();
         }
         function parseArgumentExpression() {
             return doOutsideOfContext(disallowInAndDecoratorContext, parseArgumentOrArrayLiteralElement);
         }
         function parseArrayLiteralExpression() {
-            var node = createNode(187 /* ArrayLiteralExpression */);
+            var node = createNode(188 /* ArrayLiteralExpression */);
             parseExpected(22 /* OpenBracketToken */);
             if (scanner.hasPrecedingLineBreak()) {
                 node.multiLine = true;
@@ -20672,17 +20944,17 @@ var ts;
         function parseObjectLiteralElement() {
             var node = createNodeWithJSDoc(0 /* Unknown */);
             if (parseOptionalToken(25 /* DotDotDotToken */)) {
-                node.kind = 277 /* SpreadAssignment */;
+                node.kind = 278 /* SpreadAssignment */;
                 node.expression = parseAssignmentExpressionOrHigher();
                 return finishNode(node);
             }
             node.decorators = parseDecorators();
             node.modifiers = parseModifiers();
-            if (parseContextualModifier(126 /* GetKeyword */)) {
-                return parseAccessorDeclaration(node, 158 /* GetAccessor */);
+            if (parseContextualModifier(127 /* GetKeyword */)) {
+                return parseAccessorDeclaration(node, 159 /* GetAccessor */);
             }
-            if (parseContextualModifier(137 /* SetKeyword */)) {
-                return parseAccessorDeclaration(node, 159 /* SetAccessor */);
+            if (parseContextualModifier(138 /* SetKeyword */)) {
+                return parseAccessorDeclaration(node, 160 /* SetAccessor */);
             }
             var asteriskToken = parseOptionalToken(40 /* AsteriskToken */);
             var tokenIsIdentifier = isIdentifier();
@@ -20700,22 +20972,22 @@ var ts;
             // this is necessary because ObjectLiteral productions are also used to cover grammar for ObjectAssignmentPattern
             var isShorthandPropertyAssignment = tokenIsIdentifier && (token() !== 57 /* ColonToken */);
             if (isShorthandPropertyAssignment) {
-                node.kind = 276 /* ShorthandPropertyAssignment */;
-                var equalsToken = parseOptionalToken(59 /* EqualsToken */);
+                node.kind = 277 /* ShorthandPropertyAssignment */;
+                var equalsToken = parseOptionalToken(60 /* EqualsToken */);
                 if (equalsToken) {
                     node.equalsToken = equalsToken;
                     node.objectAssignmentInitializer = allowInAnd(parseAssignmentExpressionOrHigher);
                 }
             }
             else {
-                node.kind = 275 /* PropertyAssignment */;
+                node.kind = 276 /* PropertyAssignment */;
                 parseExpected(57 /* ColonToken */);
                 node.initializer = allowInAnd(parseAssignmentExpressionOrHigher);
             }
             return finishNode(node);
         }
         function parseObjectLiteralExpression() {
-            var node = createNode(188 /* ObjectLiteralExpression */);
+            var node = createNode(189 /* ObjectLiteralExpression */);
             parseExpected(18 /* OpenBraceToken */);
             if (scanner.hasPrecedingLineBreak()) {
                 node.multiLine = true;
@@ -20734,9 +21006,9 @@ var ts;
             if (saveDecoratorContext) {
                 setDecoratorContext(/*val*/ false);
             }
-            var node = createNodeWithJSDoc(196 /* FunctionExpression */);
+            var node = createNodeWithJSDoc(197 /* FunctionExpression */);
             node.modifiers = parseModifiers();
-            parseExpected(90 /* FunctionKeyword */);
+            parseExpected(91 /* FunctionKeyword */);
             node.asteriskToken = parseOptionalToken(40 /* AsteriskToken */);
             var isGenerator = node.asteriskToken ? 1 /* Yield */ : 0 /* None */;
             var isAsync = ts.hasModifier(node, 256 /* Async */) ? 2 /* Await */ : 0 /* None */;
@@ -20757,10 +21029,10 @@ var ts;
         }
         function parseNewExpressionOrNewDotTarget() {
             var fullStart = scanner.getStartPos();
-            parseExpected(95 /* NewKeyword */);
+            parseExpected(96 /* NewKeyword */);
             if (parseOptional(24 /* DotToken */)) {
-                var node_2 = createNode(214 /* MetaProperty */, fullStart);
-                node_2.keywordToken = 95 /* NewKeyword */;
+                var node_2 = createNode(215 /* MetaProperty */, fullStart);
+                node_2.keywordToken = 96 /* NewKeyword */;
                 node_2.name = parseIdentifierName();
                 return finishNode(node_2);
             }
@@ -20776,7 +21048,7 @@ var ts;
                 }
                 break;
             }
-            var node = createNode(192 /* NewExpression */, fullStart);
+            var node = createNode(193 /* NewExpression */, fullStart);
             node.expression = expression;
             node.typeArguments = typeArguments;
             if (node.typeArguments || token() === 20 /* OpenParenToken */) {
@@ -20786,7 +21058,7 @@ var ts;
         }
         // STATEMENTS
         function parseBlock(ignoreMissingOpenBrace, diagnosticMessage) {
-            var node = createNode(218 /* Block */);
+            var node = createNode(219 /* Block */);
             if (parseExpected(18 /* OpenBraceToken */, diagnosticMessage) || ignoreMissingOpenBrace) {
                 if (scanner.hasPrecedingLineBreak()) {
                     node.multiLine = true;
@@ -20819,25 +21091,25 @@ var ts;
             return block;
         }
         function parseEmptyStatement() {
-            var node = createNode(220 /* EmptyStatement */);
+            var node = createNode(221 /* EmptyStatement */);
             parseExpected(26 /* SemicolonToken */);
             return finishNode(node);
         }
         function parseIfStatement() {
-            var node = createNode(222 /* IfStatement */);
-            parseExpected(91 /* IfKeyword */);
+            var node = createNode(223 /* IfStatement */);
+            parseExpected(92 /* IfKeyword */);
             parseExpected(20 /* OpenParenToken */);
             node.expression = allowInAnd(parseExpression);
             parseExpected(21 /* CloseParenToken */);
             node.thenStatement = parseStatement();
-            node.elseStatement = parseOptional(83 /* ElseKeyword */) ? parseStatement() : undefined;
+            node.elseStatement = parseOptional(84 /* ElseKeyword */) ? parseStatement() : undefined;
             return finishNode(node);
         }
         function parseDoStatement() {
-            var node = createNode(223 /* DoStatement */);
-            parseExpected(82 /* DoKeyword */);
+            var node = createNode(224 /* DoStatement */);
+            parseExpected(83 /* DoKeyword */);
             node.statement = parseStatement();
-            parseExpected(107 /* WhileKeyword */);
+            parseExpected(108 /* WhileKeyword */);
             parseExpected(20 /* OpenParenToken */);
             node.expression = allowInAnd(parseExpression);
             parseExpected(21 /* CloseParenToken */);
@@ -20849,8 +21121,8 @@ var ts;
             return finishNode(node);
         }
         function parseWhileStatement() {
-            var node = createNode(224 /* WhileStatement */);
-            parseExpected(107 /* WhileKeyword */);
+            var node = createNode(225 /* WhileStatement */);
+            parseExpected(108 /* WhileKeyword */);
             parseExpected(20 /* OpenParenToken */);
             node.expression = allowInAnd(parseExpression);
             parseExpected(21 /* CloseParenToken */);
@@ -20859,12 +21131,12 @@ var ts;
         }
         function parseForOrForInOrForOfStatement() {
             var pos = getNodePos();
-            parseExpected(89 /* ForKeyword */);
-            var awaitToken = parseOptionalToken(122 /* AwaitKeyword */);
+            parseExpected(90 /* ForKeyword */);
+            var awaitToken = parseOptionalToken(123 /* AwaitKeyword */);
             parseExpected(20 /* OpenParenToken */);
             var initializer;
             if (token() !== 26 /* SemicolonToken */) {
-                if (token() === 105 /* VarKeyword */ || token() === 111 /* LetKeyword */ || token() === 77 /* ConstKeyword */) {
+                if (token() === 106 /* VarKeyword */ || token() === 112 /* LetKeyword */ || token() === 78 /* ConstKeyword */) {
                     initializer = parseVariableDeclarationList(/*inForStatementInitializer*/ true);
                 }
                 else {
@@ -20872,23 +21144,23 @@ var ts;
                 }
             }
             var forOrForInOrForOfStatement;
-            if (awaitToken ? parseExpected(147 /* OfKeyword */) : parseOptional(147 /* OfKeyword */)) {
-                var forOfStatement = createNode(227 /* ForOfStatement */, pos);
+            if (awaitToken ? parseExpected(148 /* OfKeyword */) : parseOptional(148 /* OfKeyword */)) {
+                var forOfStatement = createNode(228 /* ForOfStatement */, pos);
                 forOfStatement.awaitModifier = awaitToken;
                 forOfStatement.initializer = initializer;
                 forOfStatement.expression = allowInAnd(parseAssignmentExpressionOrHigher);
                 parseExpected(21 /* CloseParenToken */);
                 forOrForInOrForOfStatement = forOfStatement;
             }
-            else if (parseOptional(93 /* InKeyword */)) {
-                var forInStatement = createNode(226 /* ForInStatement */, pos);
+            else if (parseOptional(94 /* InKeyword */)) {
+                var forInStatement = createNode(227 /* ForInStatement */, pos);
                 forInStatement.initializer = initializer;
                 forInStatement.expression = allowInAnd(parseExpression);
                 parseExpected(21 /* CloseParenToken */);
                 forOrForInOrForOfStatement = forInStatement;
             }
             else {
-                var forStatement = createNode(225 /* ForStatement */, pos);
+                var forStatement = createNode(226 /* ForStatement */, pos);
                 forStatement.initializer = initializer;
                 parseExpected(26 /* SemicolonToken */);
                 if (token() !== 26 /* SemicolonToken */ && token() !== 21 /* CloseParenToken */) {
@@ -20906,7 +21178,7 @@ var ts;
         }
         function parseBreakOrContinueStatement(kind) {
             var node = createNode(kind);
-            parseExpected(kind === 229 /* BreakStatement */ ? 73 /* BreakKeyword */ : 78 /* ContinueKeyword */);
+            parseExpected(kind === 230 /* BreakStatement */ ? 74 /* BreakKeyword */ : 79 /* ContinueKeyword */);
             if (!canParseSemicolon()) {
                 node.label = parseIdentifier();
             }
@@ -20914,8 +21186,8 @@ var ts;
             return finishNode(node);
         }
         function parseReturnStatement() {
-            var node = createNode(230 /* ReturnStatement */);
-            parseExpected(97 /* ReturnKeyword */);
+            var node = createNode(231 /* ReturnStatement */);
+            parseExpected(98 /* ReturnKeyword */);
             if (!canParseSemicolon()) {
                 node.expression = allowInAnd(parseExpression);
             }
@@ -20923,8 +21195,8 @@ var ts;
             return finishNode(node);
         }
         function parseWithStatement() {
-            var node = createNode(231 /* WithStatement */);
-            parseExpected(108 /* WithKeyword */);
+            var node = createNode(232 /* WithStatement */);
+            parseExpected(109 /* WithKeyword */);
             parseExpected(20 /* OpenParenToken */);
             node.expression = allowInAnd(parseExpression);
             parseExpected(21 /* CloseParenToken */);
@@ -20932,30 +21204,30 @@ var ts;
             return finishNode(node);
         }
         function parseCaseClause() {
-            var node = createNode(271 /* CaseClause */);
-            parseExpected(74 /* CaseKeyword */);
+            var node = createNode(272 /* CaseClause */);
+            parseExpected(75 /* CaseKeyword */);
             node.expression = allowInAnd(parseExpression);
             parseExpected(57 /* ColonToken */);
             node.statements = parseList(3 /* SwitchClauseStatements */, parseStatement);
             return finishNode(node);
         }
         function parseDefaultClause() {
-            var node = createNode(272 /* DefaultClause */);
-            parseExpected(80 /* DefaultKeyword */);
+            var node = createNode(273 /* DefaultClause */);
+            parseExpected(81 /* DefaultKeyword */);
             parseExpected(57 /* ColonToken */);
             node.statements = parseList(3 /* SwitchClauseStatements */, parseStatement);
             return finishNode(node);
         }
         function parseCaseOrDefaultClause() {
-            return token() === 74 /* CaseKeyword */ ? parseCaseClause() : parseDefaultClause();
+            return token() === 75 /* CaseKeyword */ ? parseCaseClause() : parseDefaultClause();
         }
         function parseSwitchStatement() {
-            var node = createNode(232 /* SwitchStatement */);
-            parseExpected(99 /* SwitchKeyword */);
+            var node = createNode(233 /* SwitchStatement */);
+            parseExpected(100 /* SwitchKeyword */);
             parseExpected(20 /* OpenParenToken */);
             node.expression = allowInAnd(parseExpression);
             parseExpected(21 /* CloseParenToken */);
-            var caseBlock = createNode(246 /* CaseBlock */);
+            var caseBlock = createNode(247 /* CaseBlock */);
             parseExpected(18 /* OpenBraceToken */);
             caseBlock.clauses = parseList(2 /* SwitchClauses */, parseCaseOrDefaultClause);
             parseExpected(19 /* CloseBraceToken */);
@@ -20970,29 +21242,29 @@ var ts;
             // directly as that might consume an expression on the following line.
             // We just return 'undefined' in that case.  The actual error will be reported in the
             // grammar walker.
-            var node = createNode(234 /* ThrowStatement */);
-            parseExpected(101 /* ThrowKeyword */);
+            var node = createNode(235 /* ThrowStatement */);
+            parseExpected(102 /* ThrowKeyword */);
             node.expression = scanner.hasPrecedingLineBreak() ? undefined : allowInAnd(parseExpression);
             parseSemicolon();
             return finishNode(node);
         }
         // TODO: Review for error recovery
         function parseTryStatement() {
-            var node = createNode(235 /* TryStatement */);
-            parseExpected(103 /* TryKeyword */);
+            var node = createNode(236 /* TryStatement */);
+            parseExpected(104 /* TryKeyword */);
             node.tryBlock = parseBlock(/*ignoreMissingOpenBrace*/ false);
-            node.catchClause = token() === 75 /* CatchKeyword */ ? parseCatchClause() : undefined;
+            node.catchClause = token() === 76 /* CatchKeyword */ ? parseCatchClause() : undefined;
             // If we don't have a catch clause, then we must have a finally clause.  Try to parse
             // one out no matter what.
-            if (!node.catchClause || token() === 88 /* FinallyKeyword */) {
-                parseExpected(88 /* FinallyKeyword */);
+            if (!node.catchClause || token() === 89 /* FinallyKeyword */) {
+                parseExpected(89 /* FinallyKeyword */);
                 node.finallyBlock = parseBlock(/*ignoreMissingOpenBrace*/ false);
             }
             return finishNode(node);
         }
         function parseCatchClause() {
-            var result = createNode(274 /* CatchClause */);
-            parseExpected(75 /* CatchKeyword */);
+            var result = createNode(275 /* CatchClause */);
+            parseExpected(76 /* CatchKeyword */);
             if (parseOptional(20 /* OpenParenToken */)) {
                 result.variableDeclaration = parseVariableDeclaration();
                 parseExpected(21 /* CloseParenToken */);
@@ -21005,8 +21277,8 @@ var ts;
             return finishNode(result);
         }
         function parseDebuggerStatement() {
-            var node = createNode(236 /* DebuggerStatement */);
-            parseExpected(79 /* DebuggerKeyword */);
+            var node = createNode(237 /* DebuggerStatement */);
+            parseExpected(80 /* DebuggerKeyword */);
             parseSemicolon();
             return finishNode(node);
         }
@@ -21016,13 +21288,13 @@ var ts;
             // a colon.
             var node = createNodeWithJSDoc(0 /* Unknown */);
             var expression = allowInAnd(parseExpression);
-            if (expression.kind === 72 /* Identifier */ && parseOptional(57 /* ColonToken */)) {
-                node.kind = 233 /* LabeledStatement */;
+            if (expression.kind === 73 /* Identifier */ && parseOptional(57 /* ColonToken */)) {
+                node.kind = 234 /* LabeledStatement */;
                 node.label = expression;
                 node.statement = parseStatement();
             }
             else {
-                node.kind = 221 /* ExpressionStatement */;
+                node.kind = 222 /* ExpressionStatement */;
                 node.expression = expression;
                 parseSemicolon();
             }
@@ -21034,11 +21306,11 @@ var ts;
         }
         function nextTokenIsClassKeywordOnSameLine() {
             nextToken();
-            return token() === 76 /* ClassKeyword */ && !scanner.hasPrecedingLineBreak();
+            return token() === 77 /* ClassKeyword */ && !scanner.hasPrecedingLineBreak();
         }
         function nextTokenIsFunctionKeywordOnSameLine() {
             nextToken();
-            return token() === 90 /* FunctionKeyword */ && !scanner.hasPrecedingLineBreak();
+            return token() === 91 /* FunctionKeyword */ && !scanner.hasPrecedingLineBreak();
         }
         function nextTokenIsIdentifierOrKeywordOrLiteralOnSameLine() {
             nextToken();
@@ -21047,12 +21319,12 @@ var ts;
         function isDeclaration() {
             while (true) {
                 switch (token()) {
-                    case 105 /* VarKeyword */:
-                    case 111 /* LetKeyword */:
-                    case 77 /* ConstKeyword */:
-                    case 90 /* FunctionKeyword */:
-                    case 76 /* ClassKeyword */:
-                    case 84 /* EnumKeyword */:
+                    case 106 /* VarKeyword */:
+                    case 112 /* LetKeyword */:
+                    case 78 /* ConstKeyword */:
+                    case 91 /* FunctionKeyword */:
+                    case 77 /* ClassKeyword */:
+                    case 85 /* EnumKeyword */:
                         return true;
                     // 'declare', 'module', 'namespace', 'interface'* and 'type' are all legal JavaScript identifiers;
                     // however, an identifier cannot be followed by another identifier on the same line. This is what we
@@ -21075,41 +21347,41 @@ var ts;
                     //   I {}
                     //
                     // could be legal, it would add complexity for very little gain.
-                    case 110 /* InterfaceKeyword */:
-                    case 140 /* TypeKeyword */:
+                    case 111 /* InterfaceKeyword */:
+                    case 141 /* TypeKeyword */:
                         return nextTokenIsIdentifierOnSameLine();
-                    case 130 /* ModuleKeyword */:
-                    case 131 /* NamespaceKeyword */:
+                    case 131 /* ModuleKeyword */:
+                    case 132 /* NamespaceKeyword */:
                         return nextTokenIsIdentifierOrStringLiteralOnSameLine();
-                    case 118 /* AbstractKeyword */:
-                    case 121 /* AsyncKeyword */:
-                    case 125 /* DeclareKeyword */:
-                    case 113 /* PrivateKeyword */:
-                    case 114 /* ProtectedKeyword */:
-                    case 115 /* PublicKeyword */:
-                    case 133 /* ReadonlyKeyword */:
+                    case 119 /* AbstractKeyword */:
+                    case 122 /* AsyncKeyword */:
+                    case 126 /* DeclareKeyword */:
+                    case 114 /* PrivateKeyword */:
+                    case 115 /* ProtectedKeyword */:
+                    case 116 /* PublicKeyword */:
+                    case 134 /* ReadonlyKeyword */:
                         nextToken();
                         // ASI takes effect for this modifier.
                         if (scanner.hasPrecedingLineBreak()) {
                             return false;
                         }
                         continue;
-                    case 145 /* GlobalKeyword */:
+                    case 146 /* GlobalKeyword */:
                         nextToken();
-                        return token() === 18 /* OpenBraceToken */ || token() === 72 /* Identifier */ || token() === 85 /* ExportKeyword */;
-                    case 92 /* ImportKeyword */:
+                        return token() === 18 /* OpenBraceToken */ || token() === 73 /* Identifier */ || token() === 86 /* ExportKeyword */;
+                    case 93 /* ImportKeyword */:
                         nextToken();
                         return token() === 10 /* StringLiteral */ || token() === 40 /* AsteriskToken */ ||
                             token() === 18 /* OpenBraceToken */ || ts.tokenIsIdentifierOrKeyword(token());
-                    case 85 /* ExportKeyword */:
+                    case 86 /* ExportKeyword */:
                         nextToken();
-                        if (token() === 59 /* EqualsToken */ || token() === 40 /* AsteriskToken */ ||
-                            token() === 18 /* OpenBraceToken */ || token() === 80 /* DefaultKeyword */ ||
-                            token() === 119 /* AsKeyword */) {
+                        if (token() === 60 /* EqualsToken */ || token() === 40 /* AsteriskToken */ ||
+                            token() === 18 /* OpenBraceToken */ || token() === 81 /* DefaultKeyword */ ||
+                            token() === 120 /* AsKeyword */) {
                             return true;
                         }
                         continue;
-                    case 116 /* StaticKeyword */:
+                    case 117 /* StaticKeyword */:
                         nextToken();
                         continue;
                     default:
@@ -21125,47 +21397,47 @@ var ts;
                 case 58 /* AtToken */:
                 case 26 /* SemicolonToken */:
                 case 18 /* OpenBraceToken */:
-                case 105 /* VarKeyword */:
-                case 111 /* LetKeyword */:
-                case 90 /* FunctionKeyword */:
-                case 76 /* ClassKeyword */:
-                case 84 /* EnumKeyword */:
-                case 91 /* IfKeyword */:
-                case 82 /* DoKeyword */:
-                case 107 /* WhileKeyword */:
-                case 89 /* ForKeyword */:
-                case 78 /* ContinueKeyword */:
-                case 73 /* BreakKeyword */:
-                case 97 /* ReturnKeyword */:
-                case 108 /* WithKeyword */:
-                case 99 /* SwitchKeyword */:
-                case 101 /* ThrowKeyword */:
-                case 103 /* TryKeyword */:
-                case 79 /* DebuggerKeyword */:
+                case 106 /* VarKeyword */:
+                case 112 /* LetKeyword */:
+                case 91 /* FunctionKeyword */:
+                case 77 /* ClassKeyword */:
+                case 85 /* EnumKeyword */:
+                case 92 /* IfKeyword */:
+                case 83 /* DoKeyword */:
+                case 108 /* WhileKeyword */:
+                case 90 /* ForKeyword */:
+                case 79 /* ContinueKeyword */:
+                case 74 /* BreakKeyword */:
+                case 98 /* ReturnKeyword */:
+                case 109 /* WithKeyword */:
+                case 100 /* SwitchKeyword */:
+                case 102 /* ThrowKeyword */:
+                case 104 /* TryKeyword */:
+                case 80 /* DebuggerKeyword */:
                 // 'catch' and 'finally' do not actually indicate that the code is part of a statement,
                 // however, we say they are here so that we may gracefully parse them and error later.
-                case 75 /* CatchKeyword */:
-                case 88 /* FinallyKeyword */:
+                case 76 /* CatchKeyword */:
+                case 89 /* FinallyKeyword */:
                     return true;
-                case 92 /* ImportKeyword */:
+                case 93 /* ImportKeyword */:
                     return isStartOfDeclaration() || lookAhead(nextTokenIsOpenParenOrLessThanOrDot);
-                case 77 /* ConstKeyword */:
-                case 85 /* ExportKeyword */:
+                case 78 /* ConstKeyword */:
+                case 86 /* ExportKeyword */:
                     return isStartOfDeclaration();
-                case 121 /* AsyncKeyword */:
-                case 125 /* DeclareKeyword */:
-                case 110 /* InterfaceKeyword */:
-                case 130 /* ModuleKeyword */:
-                case 131 /* NamespaceKeyword */:
-                case 140 /* TypeKeyword */:
-                case 145 /* GlobalKeyword */:
+                case 122 /* AsyncKeyword */:
+                case 126 /* DeclareKeyword */:
+                case 111 /* InterfaceKeyword */:
+                case 131 /* ModuleKeyword */:
+                case 132 /* NamespaceKeyword */:
+                case 141 /* TypeKeyword */:
+                case 146 /* GlobalKeyword */:
                     // When these don't start a declaration, they're an identifier in an expression statement
                     return true;
-                case 115 /* PublicKeyword */:
-                case 113 /* PrivateKeyword */:
-                case 114 /* ProtectedKeyword */:
-                case 116 /* StaticKeyword */:
-                case 133 /* ReadonlyKeyword */:
+                case 116 /* PublicKeyword */:
+                case 114 /* PrivateKeyword */:
+                case 115 /* ProtectedKeyword */:
+                case 117 /* StaticKeyword */:
+                case 134 /* ReadonlyKeyword */:
                     // When these don't start a declaration, they may be the start of a class member if an identifier
                     // immediately follows. Otherwise they're an identifier in an expression statement.
                     return isStartOfDeclaration() || !lookAhead(nextTokenIsIdentifierOrKeywordOnSameLine);
@@ -21188,63 +21460,63 @@ var ts;
                     return parseEmptyStatement();
                 case 18 /* OpenBraceToken */:
                     return parseBlock(/*ignoreMissingOpenBrace*/ false);
-                case 105 /* VarKeyword */:
-                    return parseVariableStatement(createNodeWithJSDoc(237 /* VariableDeclaration */));
-                case 111 /* LetKeyword */:
+                case 106 /* VarKeyword */:
+                    return parseVariableStatement(createNodeWithJSDoc(238 /* VariableDeclaration */));
+                case 112 /* LetKeyword */:
                     if (isLetDeclaration()) {
-                        return parseVariableStatement(createNodeWithJSDoc(237 /* VariableDeclaration */));
+                        return parseVariableStatement(createNodeWithJSDoc(238 /* VariableDeclaration */));
                     }
                     break;
-                case 90 /* FunctionKeyword */:
-                    return parseFunctionDeclaration(createNodeWithJSDoc(239 /* FunctionDeclaration */));
-                case 76 /* ClassKeyword */:
-                    return parseClassDeclaration(createNodeWithJSDoc(240 /* ClassDeclaration */));
-                case 91 /* IfKeyword */:
+                case 91 /* FunctionKeyword */:
+                    return parseFunctionDeclaration(createNodeWithJSDoc(240 /* FunctionDeclaration */));
+                case 77 /* ClassKeyword */:
+                    return parseClassDeclaration(createNodeWithJSDoc(241 /* ClassDeclaration */));
+                case 92 /* IfKeyword */:
                     return parseIfStatement();
-                case 82 /* DoKeyword */:
+                case 83 /* DoKeyword */:
                     return parseDoStatement();
-                case 107 /* WhileKeyword */:
+                case 108 /* WhileKeyword */:
                     return parseWhileStatement();
-                case 89 /* ForKeyword */:
+                case 90 /* ForKeyword */:
                     return parseForOrForInOrForOfStatement();
-                case 78 /* ContinueKeyword */:
-                    return parseBreakOrContinueStatement(228 /* ContinueStatement */);
-                case 73 /* BreakKeyword */:
-                    return parseBreakOrContinueStatement(229 /* BreakStatement */);
-                case 97 /* ReturnKeyword */:
+                case 79 /* ContinueKeyword */:
+                    return parseBreakOrContinueStatement(229 /* ContinueStatement */);
+                case 74 /* BreakKeyword */:
+                    return parseBreakOrContinueStatement(230 /* BreakStatement */);
+                case 98 /* ReturnKeyword */:
                     return parseReturnStatement();
-                case 108 /* WithKeyword */:
+                case 109 /* WithKeyword */:
                     return parseWithStatement();
-                case 99 /* SwitchKeyword */:
+                case 100 /* SwitchKeyword */:
                     return parseSwitchStatement();
-                case 101 /* ThrowKeyword */:
+                case 102 /* ThrowKeyword */:
                     return parseThrowStatement();
-                case 103 /* TryKeyword */:
+                case 104 /* TryKeyword */:
                 // Include 'catch' and 'finally' for error recovery.
-                case 75 /* CatchKeyword */:
-                case 88 /* FinallyKeyword */:
+                case 76 /* CatchKeyword */:
+                case 89 /* FinallyKeyword */:
                     return parseTryStatement();
-                case 79 /* DebuggerKeyword */:
+                case 80 /* DebuggerKeyword */:
                     return parseDebuggerStatement();
                 case 58 /* AtToken */:
                     return parseDeclaration();
-                case 121 /* AsyncKeyword */:
-                case 110 /* InterfaceKeyword */:
-                case 140 /* TypeKeyword */:
-                case 130 /* ModuleKeyword */:
-                case 131 /* NamespaceKeyword */:
-                case 125 /* DeclareKeyword */:
-                case 77 /* ConstKeyword */:
-                case 84 /* EnumKeyword */:
-                case 85 /* ExportKeyword */:
-                case 92 /* ImportKeyword */:
-                case 113 /* PrivateKeyword */:
-                case 114 /* ProtectedKeyword */:
-                case 115 /* PublicKeyword */:
-                case 118 /* AbstractKeyword */:
-                case 116 /* StaticKeyword */:
-                case 133 /* ReadonlyKeyword */:
-                case 145 /* GlobalKeyword */:
+                case 122 /* AsyncKeyword */:
+                case 111 /* InterfaceKeyword */:
+                case 141 /* TypeKeyword */:
+                case 131 /* ModuleKeyword */:
+                case 132 /* NamespaceKeyword */:
+                case 126 /* DeclareKeyword */:
+                case 78 /* ConstKeyword */:
+                case 85 /* EnumKeyword */:
+                case 86 /* ExportKeyword */:
+                case 93 /* ImportKeyword */:
+                case 114 /* PrivateKeyword */:
+                case 115 /* ProtectedKeyword */:
+                case 116 /* PublicKeyword */:
+                case 119 /* AbstractKeyword */:
+                case 117 /* StaticKeyword */:
+                case 134 /* ReadonlyKeyword */:
+                case 146 /* GlobalKeyword */:
                     if (isStartOfDeclaration()) {
                         return parseDeclaration();
                     }
@@ -21253,7 +21525,7 @@ var ts;
             return parseExpressionOrLabeledStatement();
         }
         function isDeclareModifier(modifier) {
-            return modifier.kind === 125 /* DeclareKeyword */;
+            return modifier.kind === 126 /* DeclareKeyword */;
         }
         function parseDeclaration() {
             var node = createNodeWithJSDoc(0 /* Unknown */);
@@ -21272,33 +21544,33 @@ var ts;
         }
         function parseDeclarationWorker(node) {
             switch (token()) {
-                case 105 /* VarKeyword */:
-                case 111 /* LetKeyword */:
-                case 77 /* ConstKeyword */:
+                case 106 /* VarKeyword */:
+                case 112 /* LetKeyword */:
+                case 78 /* ConstKeyword */:
                     return parseVariableStatement(node);
-                case 90 /* FunctionKeyword */:
+                case 91 /* FunctionKeyword */:
                     return parseFunctionDeclaration(node);
-                case 76 /* ClassKeyword */:
+                case 77 /* ClassKeyword */:
                     return parseClassDeclaration(node);
-                case 110 /* InterfaceKeyword */:
+                case 111 /* InterfaceKeyword */:
                     return parseInterfaceDeclaration(node);
-                case 140 /* TypeKeyword */:
+                case 141 /* TypeKeyword */:
                     return parseTypeAliasDeclaration(node);
-                case 84 /* EnumKeyword */:
+                case 85 /* EnumKeyword */:
                     return parseEnumDeclaration(node);
-                case 145 /* GlobalKeyword */:
-                case 130 /* ModuleKeyword */:
-                case 131 /* NamespaceKeyword */:
+                case 146 /* GlobalKeyword */:
+                case 131 /* ModuleKeyword */:
+                case 132 /* NamespaceKeyword */:
                     return parseModuleDeclaration(node);
-                case 92 /* ImportKeyword */:
+                case 93 /* ImportKeyword */:
                     return parseImportDeclarationOrImportEqualsDeclaration(node);
-                case 85 /* ExportKeyword */:
+                case 86 /* ExportKeyword */:
                     nextToken();
                     switch (token()) {
-                        case 80 /* DefaultKeyword */:
-                        case 59 /* EqualsToken */:
+                        case 81 /* DefaultKeyword */:
+                        case 60 /* EqualsToken */:
                             return parseExportAssignment(node);
-                        case 119 /* AsKeyword */:
+                        case 120 /* AsKeyword */:
                             return parseNamespaceExportDeclaration(node);
                         default:
                             return parseExportDeclaration(node);
@@ -21307,7 +21579,7 @@ var ts;
                     if (node.decorators || node.modifiers) {
                         // We reached this point because we encountered decorators and/or modifiers and assumed a declaration
                         // would follow. For recovery and error reporting purposes, return an incomplete declaration.
-                        var missing = createMissingNode(258 /* MissingDeclaration */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Declaration_expected);
+                        var missing = createMissingNode(259 /* MissingDeclaration */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Declaration_expected);
                         missing.pos = node.pos;
                         missing.decorators = node.decorators;
                         missing.modifiers = node.modifiers;
@@ -21330,16 +21602,16 @@ var ts;
         // DECLARATIONS
         function parseArrayBindingElement() {
             if (token() === 27 /* CommaToken */) {
-                return createNode(210 /* OmittedExpression */);
+                return createNode(211 /* OmittedExpression */);
             }
-            var node = createNode(186 /* BindingElement */);
+            var node = createNode(187 /* BindingElement */);
             node.dotDotDotToken = parseOptionalToken(25 /* DotDotDotToken */);
             node.name = parseIdentifierOrPattern();
             node.initializer = parseInitializer();
             return finishNode(node);
         }
         function parseObjectBindingElement() {
-            var node = createNode(186 /* BindingElement */);
+            var node = createNode(187 /* BindingElement */);
             node.dotDotDotToken = parseOptionalToken(25 /* DotDotDotToken */);
             var tokenIsIdentifier = isIdentifier();
             var propertyName = parsePropertyName();
@@ -21355,14 +21627,14 @@ var ts;
             return finishNode(node);
         }
         function parseObjectBindingPattern() {
-            var node = createNode(184 /* ObjectBindingPattern */);
+            var node = createNode(185 /* ObjectBindingPattern */);
             parseExpected(18 /* OpenBraceToken */);
             node.elements = parseDelimitedList(9 /* ObjectBindingElements */, parseObjectBindingElement);
             parseExpected(19 /* CloseBraceToken */);
             return finishNode(node);
         }
         function parseArrayBindingPattern() {
-            var node = createNode(185 /* ArrayBindingPattern */);
+            var node = createNode(186 /* ArrayBindingPattern */);
             parseExpected(22 /* OpenBracketToken */);
             node.elements = parseDelimitedList(10 /* ArrayBindingElements */, parseArrayBindingElement);
             parseExpected(23 /* CloseBracketToken */);
@@ -21384,9 +21656,9 @@ var ts;
             return parseVariableDeclaration(/*allowExclamation*/ true);
         }
         function parseVariableDeclaration(allowExclamation) {
-            var node = createNode(237 /* VariableDeclaration */);
+            var node = createNode(238 /* VariableDeclaration */);
             node.name = parseIdentifierOrPattern();
-            if (allowExclamation && node.name.kind === 72 /* Identifier */ &&
+            if (allowExclamation && node.name.kind === 73 /* Identifier */ &&
                 token() === 52 /* ExclamationToken */ && !scanner.hasPrecedingLineBreak()) {
                 node.exclamationToken = parseTokenNode();
             }
@@ -21397,14 +21669,14 @@ var ts;
             return finishNode(node);
         }
         function parseVariableDeclarationList(inForStatementInitializer) {
-            var node = createNode(238 /* VariableDeclarationList */);
+            var node = createNode(239 /* VariableDeclarationList */);
             switch (token()) {
-                case 105 /* VarKeyword */:
+                case 106 /* VarKeyword */:
                     break;
-                case 111 /* LetKeyword */:
+                case 112 /* LetKeyword */:
                     node.flags |= 1 /* Let */;
                     break;
-                case 77 /* ConstKeyword */:
+                case 78 /* ConstKeyword */:
                     node.flags |= 2 /* Const */;
                     break;
                 default:
@@ -21420,7 +21692,7 @@ var ts;
             // So we need to look ahead to determine if 'of' should be treated as a keyword in
             // this context.
             // The checker will then give an error that there is an empty declaration list.
-            if (token() === 147 /* OfKeyword */ && lookAhead(canFollowContextualOfKeyword)) {
+            if (token() === 148 /* OfKeyword */ && lookAhead(canFollowContextualOfKeyword)) {
                 node.declarations = createMissingList();
             }
             else {
@@ -21435,14 +21707,14 @@ var ts;
             return nextTokenIsIdentifier() && nextToken() === 21 /* CloseParenToken */;
         }
         function parseVariableStatement(node) {
-            node.kind = 219 /* VariableStatement */;
+            node.kind = 220 /* VariableStatement */;
             node.declarationList = parseVariableDeclarationList(/*inForStatementInitializer*/ false);
             parseSemicolon();
             return finishNode(node);
         }
         function parseFunctionDeclaration(node) {
-            node.kind = 239 /* FunctionDeclaration */;
-            parseExpected(90 /* FunctionKeyword */);
+            node.kind = 240 /* FunctionDeclaration */;
+            parseExpected(91 /* FunctionKeyword */);
             node.asteriskToken = parseOptionalToken(40 /* AsteriskToken */);
             node.name = ts.hasModifier(node, 512 /* Default */) ? parseOptionalIdentifier() : parseIdentifier();
             var isGenerator = node.asteriskToken ? 1 /* Yield */ : 0 /* None */;
@@ -21451,15 +21723,29 @@ var ts;
             node.body = parseFunctionBlockOrSemicolon(isGenerator | isAsync, ts.Diagnostics.or_expected);
             return finishNode(node);
         }
-        function parseConstructorDeclaration(node) {
-            node.kind = 157 /* Constructor */;
-            parseExpected(124 /* ConstructorKeyword */);
-            fillSignature(57 /* ColonToken */, 0 /* None */, node);
-            node.body = parseFunctionBlockOrSemicolon(0 /* None */, ts.Diagnostics.or_expected);
-            return finishNode(node);
+        function parseConstructorName() {
+            if (token() === 125 /* ConstructorKeyword */) {
+                return parseExpected(125 /* ConstructorKeyword */);
+            }
+            if (token() === 10 /* StringLiteral */ && lookAhead(nextToken) === 20 /* OpenParenToken */) {
+                return tryParse(function () {
+                    var literalNode = parseLiteralNode();
+                    return literalNode.text === "constructor" ? literalNode : undefined;
+                });
+            }
+        }
+        function tryParseConstructorDeclaration(node) {
+            return tryParse(function () {
+                if (parseConstructorName()) {
+                    node.kind = 158 /* Constructor */;
+                    fillSignature(57 /* ColonToken */, 0 /* None */, node);
+                    node.body = parseFunctionBlockOrSemicolon(0 /* None */, ts.Diagnostics.or_expected);
+                    return finishNode(node);
+                }
+            });
         }
         function parseMethodDeclaration(node, asteriskToken, diagnosticMessage) {
-            node.kind = 156 /* MethodDeclaration */;
+            node.kind = 157 /* MethodDeclaration */;
             node.asteriskToken = asteriskToken;
             var isGenerator = asteriskToken ? 1 /* Yield */ : 0 /* None */;
             var isAsync = ts.hasModifier(node, 256 /* Async */) ? 2 /* Await */ : 0 /* None */;
@@ -21468,7 +21754,7 @@ var ts;
             return finishNode(node);
         }
         function parsePropertyDeclaration(node) {
-            node.kind = 154 /* PropertyDeclaration */;
+            node.kind = 155 /* PropertyDeclaration */;
             if (!node.questionToken && token() === 52 /* ExclamationToken */ && !scanner.hasPrecedingLineBreak()) {
                 node.exclamationToken = parseTokenNode();
             }
@@ -21541,7 +21827,7 @@ var ts;
             // If we were able to get any potential identifier...
             if (idToken !== undefined) {
                 // If we have a non-keyword identifier, or if we have an accessor, then it's safe to parse.
-                if (!ts.isKeyword(idToken) || idToken === 137 /* SetKeyword */ || idToken === 126 /* GetKeyword */) {
+                if (!ts.isKeyword(idToken) || idToken === 138 /* SetKeyword */ || idToken === 127 /* GetKeyword */) {
                     return true;
                 }
                 // If it *is* a keyword, but not an accessor, check a little farther along
@@ -21551,7 +21837,7 @@ var ts;
                     case 28 /* LessThanToken */: // Generic Method declaration
                     case 52 /* ExclamationToken */: // Non-null assertion on property name
                     case 57 /* ColonToken */: // Type Annotation for declaration
-                    case 59 /* EqualsToken */: // Initializer for declaration
+                    case 60 /* EqualsToken */: // Initializer for declaration
                     case 56 /* QuestionToken */: // Not valid, but permitted so that it gets caught later on.
                         return true;
                     default:
@@ -21573,7 +21859,7 @@ var ts;
                 if (!parseOptional(58 /* AtToken */)) {
                     break;
                 }
-                var decorator = createNode(152 /* Decorator */, decoratorStart);
+                var decorator = createNode(153 /* Decorator */, decoratorStart);
                 decorator.expression = doInDecoratorContext(parseLeftHandSideExpressionOrHigher);
                 finishNode(decorator);
                 (list || (list = [])).push(decorator);
@@ -21593,7 +21879,7 @@ var ts;
             while (true) {
                 var modifierStart = scanner.getStartPos();
                 var modifierKind = token();
-                if (token() === 77 /* ConstKeyword */ && permitInvalidConstAsModifier) {
+                if (token() === 78 /* ConstKeyword */ && permitInvalidConstAsModifier) {
                     // We need to ensure that any subsequent modifiers appear on the same line
                     // so that when 'const' is a standalone declaration, we don't issue an error.
                     if (!tryParse(nextTokenIsOnSameLineAndCanFollowModifier)) {
@@ -21612,7 +21898,7 @@ var ts;
         }
         function parseModifiersForArrowFunction() {
             var modifiers;
-            if (token() === 121 /* AsyncKeyword */) {
+            if (token() === 122 /* AsyncKeyword */) {
                 var modifierStart = scanner.getStartPos();
                 var modifierKind = token();
                 nextToken();
@@ -21623,21 +21909,24 @@ var ts;
         }
         function parseClassElement() {
             if (token() === 26 /* SemicolonToken */) {
-                var result = createNode(217 /* SemicolonClassElement */);
+                var result = createNode(218 /* SemicolonClassElement */);
                 nextToken();
                 return finishNode(result);
             }
             var node = createNodeWithJSDoc(0 /* Unknown */);
             node.decorators = parseDecorators();
             node.modifiers = parseModifiers(/*permitInvalidConstAsModifier*/ true);
-            if (parseContextualModifier(126 /* GetKeyword */)) {
-                return parseAccessorDeclaration(node, 158 /* GetAccessor */);
+            if (parseContextualModifier(127 /* GetKeyword */)) {
+                return parseAccessorDeclaration(node, 159 /* GetAccessor */);
             }
-            if (parseContextualModifier(137 /* SetKeyword */)) {
-                return parseAccessorDeclaration(node, 159 /* SetAccessor */);
+            if (parseContextualModifier(138 /* SetKeyword */)) {
+                return parseAccessorDeclaration(node, 160 /* SetAccessor */);
             }
-            if (token() === 124 /* ConstructorKeyword */) {
-                return parseConstructorDeclaration(node);
+            if (token() === 125 /* ConstructorKeyword */ || token() === 10 /* StringLiteral */) {
+                var constructorDeclaration = tryParseConstructorDeclaration(node);
+                if (constructorDeclaration) {
+                    return constructorDeclaration;
+                }
             }
             if (isIndexSignature()) {
                 return parseIndexSignatureDeclaration(node);
@@ -21653,21 +21942,21 @@ var ts;
             }
             if (node.decorators || node.modifiers) {
                 // treat this as a property declaration with a missing name.
-                node.name = createMissingNode(72 /* Identifier */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Declaration_expected);
+                node.name = createMissingNode(73 /* Identifier */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Declaration_expected);
                 return parsePropertyDeclaration(node);
             }
             // 'isClassMemberStart' should have hinted not to attempt parsing.
             return ts.Debug.fail("Should not have attempted to parse class member declaration.");
         }
         function parseClassExpression() {
-            return parseClassDeclarationOrExpression(createNodeWithJSDoc(0 /* Unknown */), 209 /* ClassExpression */);
+            return parseClassDeclarationOrExpression(createNodeWithJSDoc(0 /* Unknown */), 210 /* ClassExpression */);
         }
         function parseClassDeclaration(node) {
-            return parseClassDeclarationOrExpression(node, 240 /* ClassDeclaration */);
+            return parseClassDeclarationOrExpression(node, 241 /* ClassDeclaration */);
         }
         function parseClassDeclarationOrExpression(node, kind) {
             node.kind = kind;
-            parseExpected(76 /* ClassKeyword */);
+            parseExpected(77 /* ClassKeyword */);
             node.name = parseNameOfClassDeclarationOrExpression();
             node.typeParameters = parseTypeParameters();
             node.heritageClauses = parseHeritageClauses();
@@ -21693,7 +21982,7 @@ var ts;
                 : undefined;
         }
         function isImplementsClause() {
-            return token() === 109 /* ImplementsKeyword */ && lookAhead(nextTokenIsIdentifierOrKeyword);
+            return token() === 110 /* ImplementsKeyword */ && lookAhead(nextTokenIsIdentifierOrKeyword);
         }
         function parseHeritageClauses() {
             // ClassTail[Yield,Await] : (Modified) See 14.5
@@ -21705,15 +21994,15 @@ var ts;
         }
         function parseHeritageClause() {
             var tok = token();
-            ts.Debug.assert(tok === 86 /* ExtendsKeyword */ || tok === 109 /* ImplementsKeyword */); // isListElement() should ensure this.
-            var node = createNode(273 /* HeritageClause */);
+            ts.Debug.assert(tok === 87 /* ExtendsKeyword */ || tok === 110 /* ImplementsKeyword */); // isListElement() should ensure this.
+            var node = createNode(274 /* HeritageClause */);
             node.token = tok;
             nextToken();
             node.types = parseDelimitedList(7 /* HeritageClauseElement */, parseExpressionWithTypeArguments);
             return finishNode(node);
         }
         function parseExpressionWithTypeArguments() {
-            var node = createNode(211 /* ExpressionWithTypeArguments */);
+            var node = createNode(212 /* ExpressionWithTypeArguments */);
             node.expression = parseLeftHandSideExpressionOrHigher();
             node.typeArguments = tryParseTypeArguments();
             return finishNode(node);
@@ -21724,14 +22013,14 @@ var ts;
                 : undefined;
         }
         function isHeritageClause() {
-            return token() === 86 /* ExtendsKeyword */ || token() === 109 /* ImplementsKeyword */;
+            return token() === 87 /* ExtendsKeyword */ || token() === 110 /* ImplementsKeyword */;
         }
         function parseClassMembers() {
             return parseList(5 /* ClassMembers */, parseClassElement);
         }
         function parseInterfaceDeclaration(node) {
-            node.kind = 241 /* InterfaceDeclaration */;
-            parseExpected(110 /* InterfaceKeyword */);
+            node.kind = 242 /* InterfaceDeclaration */;
+            parseExpected(111 /* InterfaceKeyword */);
             node.name = parseIdentifier();
             node.typeParameters = parseTypeParameters();
             node.heritageClauses = parseHeritageClauses();
@@ -21739,11 +22028,11 @@ var ts;
             return finishNode(node);
         }
         function parseTypeAliasDeclaration(node) {
-            node.kind = 242 /* TypeAliasDeclaration */;
-            parseExpected(140 /* TypeKeyword */);
+            node.kind = 243 /* TypeAliasDeclaration */;
+            parseExpected(141 /* TypeKeyword */);
             node.name = parseIdentifier();
             node.typeParameters = parseTypeParameters();
-            parseExpected(59 /* EqualsToken */);
+            parseExpected(60 /* EqualsToken */);
             node.type = parseType();
             parseSemicolon();
             return finishNode(node);
@@ -21753,14 +22042,14 @@ var ts;
         // ConstantEnumMemberSection, which starts at the beginning of an enum declaration
         // or any time an integer literal initializer is encountered.
         function parseEnumMember() {
-            var node = createNodeWithJSDoc(278 /* EnumMember */);
+            var node = createNodeWithJSDoc(279 /* EnumMember */);
             node.name = parsePropertyName();
             node.initializer = allowInAnd(parseInitializer);
             return finishNode(node);
         }
         function parseEnumDeclaration(node) {
-            node.kind = 243 /* EnumDeclaration */;
-            parseExpected(84 /* EnumKeyword */);
+            node.kind = 244 /* EnumDeclaration */;
+            parseExpected(85 /* EnumKeyword */);
             node.name = parseIdentifier();
             if (parseExpected(18 /* OpenBraceToken */)) {
                 node.members = parseDelimitedList(6 /* EnumMembers */, parseEnumMember);
@@ -21772,7 +22061,7 @@ var ts;
             return finishNode(node);
         }
         function parseModuleBlock() {
-            var node = createNode(245 /* ModuleBlock */);
+            var node = createNode(246 /* ModuleBlock */);
             if (parseExpected(18 /* OpenBraceToken */)) {
                 node.statements = parseList(1 /* BlockStatements */, parseStatement);
                 parseExpected(19 /* CloseBraceToken */);
@@ -21783,7 +22072,7 @@ var ts;
             return finishNode(node);
         }
         function parseModuleOrNamespaceDeclaration(node, flags) {
-            node.kind = 244 /* ModuleDeclaration */;
+            node.kind = 245 /* ModuleDeclaration */;
             // If we are parsing a dotted namespace name, we want to
             // propagate the 'Namespace' flag across the names if set.
             var namespaceFlag = flags & 16 /* Namespace */;
@@ -21795,8 +22084,8 @@ var ts;
             return finishNode(node);
         }
         function parseAmbientExternalModuleDeclaration(node) {
-            node.kind = 244 /* ModuleDeclaration */;
-            if (token() === 145 /* GlobalKeyword */) {
+            node.kind = 245 /* ModuleDeclaration */;
+            if (token() === 146 /* GlobalKeyword */) {
                 // parse 'global' as name of global scope augmentation
                 node.name = parseIdentifier();
                 node.flags |= 512 /* GlobalAugmentation */;
@@ -21815,15 +22104,15 @@ var ts;
         }
         function parseModuleDeclaration(node) {
             var flags = 0;
-            if (token() === 145 /* GlobalKeyword */) {
+            if (token() === 146 /* GlobalKeyword */) {
                 // global augmentation
                 return parseAmbientExternalModuleDeclaration(node);
             }
-            else if (parseOptional(131 /* NamespaceKeyword */)) {
+            else if (parseOptional(132 /* NamespaceKeyword */)) {
                 flags |= 16 /* Namespace */;
             }
             else {
-                parseExpected(130 /* ModuleKeyword */);
+                parseExpected(131 /* ModuleKeyword */);
                 if (token() === 10 /* StringLiteral */) {
                     return parseAmbientExternalModuleDeclaration(node);
                 }
@@ -21831,7 +22120,7 @@ var ts;
             return parseModuleOrNamespaceDeclaration(node, flags);
         }
         function isExternalModuleReference() {
-            return token() === 134 /* RequireKeyword */ &&
+            return token() === 135 /* RequireKeyword */ &&
                 lookAhead(nextTokenIsOpenParen);
         }
         function nextTokenIsOpenParen() {
@@ -21841,25 +22130,25 @@ var ts;
             return nextToken() === 42 /* SlashToken */;
         }
         function parseNamespaceExportDeclaration(node) {
-            node.kind = 247 /* NamespaceExportDeclaration */;
-            parseExpected(119 /* AsKeyword */);
-            parseExpected(131 /* NamespaceKeyword */);
+            node.kind = 248 /* NamespaceExportDeclaration */;
+            parseExpected(120 /* AsKeyword */);
+            parseExpected(132 /* NamespaceKeyword */);
             node.name = parseIdentifier();
             parseSemicolon();
             return finishNode(node);
         }
         function parseImportDeclarationOrImportEqualsDeclaration(node) {
-            parseExpected(92 /* ImportKeyword */);
+            parseExpected(93 /* ImportKeyword */);
             var afterImportPos = scanner.getStartPos();
             var identifier;
             if (isIdentifier()) {
                 identifier = parseIdentifier();
-                if (token() !== 27 /* CommaToken */ && token() !== 144 /* FromKeyword */) {
+                if (token() !== 27 /* CommaToken */ && token() !== 145 /* FromKeyword */) {
                     return parseImportEqualsDeclaration(node, identifier);
                 }
             }
             // Import statement
-            node.kind = 249 /* ImportDeclaration */;
+            node.kind = 250 /* ImportDeclaration */;
             // ImportDeclaration:
             //  import ImportClause from ModuleSpecifier ;
             //  import ModuleSpecifier;
@@ -21867,16 +22156,16 @@ var ts;
                 token() === 40 /* AsteriskToken */ || // import *
                 token() === 18 /* OpenBraceToken */) { // import {
                 node.importClause = parseImportClause(identifier, afterImportPos);
-                parseExpected(144 /* FromKeyword */);
+                parseExpected(145 /* FromKeyword */);
             }
             node.moduleSpecifier = parseModuleSpecifier();
             parseSemicolon();
             return finishNode(node);
         }
         function parseImportEqualsDeclaration(node, identifier) {
-            node.kind = 248 /* ImportEqualsDeclaration */;
+            node.kind = 249 /* ImportEqualsDeclaration */;
             node.name = identifier;
-            parseExpected(59 /* EqualsToken */);
+            parseExpected(60 /* EqualsToken */);
             node.moduleReference = parseModuleReference();
             parseSemicolon();
             return finishNode(node);
@@ -21888,7 +22177,7 @@ var ts;
             //  NamedImports
             //  ImportedDefaultBinding, NameSpaceImport
             //  ImportedDefaultBinding, NamedImports
-            var importClause = createNode(250 /* ImportClause */, fullStart);
+            var importClause = createNode(251 /* ImportClause */, fullStart);
             if (identifier) {
                 // ImportedDefaultBinding:
                 //  ImportedBinding
@@ -21898,7 +22187,7 @@ var ts;
             // parse namespace or named imports
             if (!importClause.name ||
                 parseOptional(27 /* CommaToken */)) {
-                importClause.namedBindings = token() === 40 /* AsteriskToken */ ? parseNamespaceImport() : parseNamedImportsOrExports(252 /* NamedImports */);
+                importClause.namedBindings = token() === 40 /* AsteriskToken */ ? parseNamespaceImport() : parseNamedImportsOrExports(253 /* NamedImports */);
             }
             return finishNode(importClause);
         }
@@ -21908,8 +22197,8 @@ var ts;
                 : parseEntityName(/*allowReservedWords*/ false);
         }
         function parseExternalModuleReference() {
-            var node = createNode(259 /* ExternalModuleReference */);
-            parseExpected(134 /* RequireKeyword */);
+            var node = createNode(260 /* ExternalModuleReference */);
+            parseExpected(135 /* RequireKeyword */);
             parseExpected(20 /* OpenParenToken */);
             node.expression = parseModuleSpecifier();
             parseExpected(21 /* CloseParenToken */);
@@ -21931,9 +22220,9 @@ var ts;
         function parseNamespaceImport() {
             // NameSpaceImport:
             //  * as ImportedBinding
-            var namespaceImport = createNode(251 /* NamespaceImport */);
+            var namespaceImport = createNode(252 /* NamespaceImport */);
             parseExpected(40 /* AsteriskToken */);
-            parseExpected(119 /* AsKeyword */);
+            parseExpected(120 /* AsKeyword */);
             namespaceImport.name = parseIdentifier();
             return finishNode(namespaceImport);
         }
@@ -21946,14 +22235,14 @@ var ts;
             // ImportsList:
             //  ImportSpecifier
             //  ImportsList, ImportSpecifier
-            node.elements = parseBracketedList(23 /* ImportOrExportSpecifiers */, kind === 252 /* NamedImports */ ? parseImportSpecifier : parseExportSpecifier, 18 /* OpenBraceToken */, 19 /* CloseBraceToken */);
+            node.elements = parseBracketedList(23 /* ImportOrExportSpecifiers */, kind === 253 /* NamedImports */ ? parseImportSpecifier : parseExportSpecifier, 18 /* OpenBraceToken */, 19 /* CloseBraceToken */);
             return finishNode(node);
         }
         function parseExportSpecifier() {
-            return parseImportOrExportSpecifier(257 /* ExportSpecifier */);
+            return parseImportOrExportSpecifier(258 /* ExportSpecifier */);
         }
         function parseImportSpecifier() {
-            return parseImportOrExportSpecifier(253 /* ImportSpecifier */);
+            return parseImportOrExportSpecifier(254 /* ImportSpecifier */);
         }
         function parseImportOrExportSpecifier(kind) {
             var node = createNode(kind);
@@ -21967,9 +22256,9 @@ var ts;
             var checkIdentifierStart = scanner.getTokenPos();
             var checkIdentifierEnd = scanner.getTextPos();
             var identifierName = parseIdentifierName();
-            if (token() === 119 /* AsKeyword */) {
+            if (token() === 120 /* AsKeyword */) {
                 node.propertyName = identifierName;
-                parseExpected(119 /* AsKeyword */);
+                parseExpected(120 /* AsKeyword */);
                 checkIdentifierIsKeyword = ts.isKeyword(token()) && !isIdentifier();
                 checkIdentifierStart = scanner.getTokenPos();
                 checkIdentifierEnd = scanner.getTextPos();
@@ -21978,24 +22267,24 @@ var ts;
             else {
                 node.name = identifierName;
             }
-            if (kind === 253 /* ImportSpecifier */ && checkIdentifierIsKeyword) {
+            if (kind === 254 /* ImportSpecifier */ && checkIdentifierIsKeyword) {
                 parseErrorAt(checkIdentifierStart, checkIdentifierEnd, ts.Diagnostics.Identifier_expected);
             }
             return finishNode(node);
         }
         function parseExportDeclaration(node) {
-            node.kind = 255 /* ExportDeclaration */;
+            node.kind = 256 /* ExportDeclaration */;
             if (parseOptional(40 /* AsteriskToken */)) {
-                parseExpected(144 /* FromKeyword */);
+                parseExpected(145 /* FromKeyword */);
                 node.moduleSpecifier = parseModuleSpecifier();
             }
             else {
-                node.exportClause = parseNamedImportsOrExports(256 /* NamedExports */);
+                node.exportClause = parseNamedImportsOrExports(257 /* NamedExports */);
                 // It is not uncommon to accidentally omit the 'from' keyword. Additionally, in editing scenarios,
                 // the 'from' keyword can be parsed as a named export when the export clause is unterminated (i.e. `export { from "moduleName";`)
                 // If we don't have a 'from' keyword, see if we have a string literal such that ASI won't take effect.
-                if (token() === 144 /* FromKeyword */ || (token() === 10 /* StringLiteral */ && !scanner.hasPrecedingLineBreak())) {
-                    parseExpected(144 /* FromKeyword */);
+                if (token() === 145 /* FromKeyword */ || (token() === 10 /* StringLiteral */ && !scanner.hasPrecedingLineBreak())) {
+                    parseExpected(145 /* FromKeyword */);
                     node.moduleSpecifier = parseModuleSpecifier();
                 }
             }
@@ -22003,12 +22292,12 @@ var ts;
             return finishNode(node);
         }
         function parseExportAssignment(node) {
-            node.kind = 254 /* ExportAssignment */;
-            if (parseOptional(59 /* EqualsToken */)) {
+            node.kind = 255 /* ExportAssignment */;
+            if (parseOptional(60 /* EqualsToken */)) {
                 node.isExportEquals = true;
             }
             else {
-                parseExpected(80 /* DefaultKeyword */);
+                parseExpected(81 /* DefaultKeyword */);
             }
             node.expression = parseAssignmentExpressionOrHigher();
             parseSemicolon();
@@ -22023,10 +22312,10 @@ var ts;
         }
         function isAnExternalModuleIndicatorNode(node) {
             return ts.hasModifier(node, 1 /* Export */)
-                || node.kind === 248 /* ImportEqualsDeclaration */ && node.moduleReference.kind === 259 /* ExternalModuleReference */
-                || node.kind === 249 /* ImportDeclaration */
-                || node.kind === 254 /* ExportAssignment */
-                || node.kind === 255 /* ExportDeclaration */
+                || node.kind === 249 /* ImportEqualsDeclaration */ && node.moduleReference.kind === 260 /* ExternalModuleReference */
+                || node.kind === 250 /* ImportDeclaration */
+                || node.kind === 255 /* ExportAssignment */
+                || node.kind === 256 /* ExportDeclaration */
                 ? node
                 : undefined;
         }
@@ -22039,7 +22328,7 @@ var ts;
             return isImportMeta(node) ? node : forEachChild(node, walkTreeForExternalModuleIndicators);
         }
         function isImportMeta(node) {
-            return ts.isMetaProperty(node) && node.keywordToken === 92 /* ImportKeyword */ && node.name.escapedText === "meta";
+            return ts.isMetaProperty(node) && node.keywordToken === 93 /* ImportKeyword */ && node.name.escapedText === "meta";
         }
         var ParsingContext;
         (function (ParsingContext) {
@@ -22078,8 +22367,8 @@ var ts;
         var JSDocParser;
         (function (JSDocParser) {
             function parseJSDocTypeExpressionForTests(content, start, length) {
-                initializeState(content, 7 /* Latest */, /*_syntaxCursor:*/ undefined, 1 /* JS */);
-                sourceFile = createSourceFile("file.js", 7 /* Latest */, 1 /* JS */, /*isDeclarationFile*/ false);
+                initializeState(content, 99 /* Latest */, /*_syntaxCursor:*/ undefined, 1 /* JS */);
+                sourceFile = createSourceFile("file.js", 99 /* Latest */, 1 /* JS */, /*isDeclarationFile*/ false);
                 scanner.setText(content, start, length);
                 currentToken = scanner.scan();
                 var jsDocTypeExpression = parseJSDocTypeExpression();
@@ -22090,18 +22379,18 @@ var ts;
             JSDocParser.parseJSDocTypeExpressionForTests = parseJSDocTypeExpressionForTests;
             // Parses out a JSDoc type expression.
             function parseJSDocTypeExpression(mayOmitBraces) {
-                var result = createNode(288 /* JSDocTypeExpression */);
+                var result = createNode(289 /* JSDocTypeExpression */);
                 var hasBrace = (mayOmitBraces ? parseOptional : parseExpected)(18 /* OpenBraceToken */);
                 result.type = doInsideOfContext(2097152 /* JSDoc */, parseJSDocType);
                 if (!mayOmitBraces || hasBrace) {
-                    parseExpected(19 /* CloseBraceToken */);
+                    parseExpectedJSDoc(19 /* CloseBraceToken */);
                 }
                 fixupParentReferences(result);
                 return finishNode(result);
             }
             JSDocParser.parseJSDocTypeExpression = parseJSDocTypeExpression;
             function parseIsolatedJSDocComment(content, start, length) {
-                initializeState(content, 7 /* Latest */, /*_syntaxCursor:*/ undefined, 1 /* JS */);
+                initializeState(content, 99 /* Latest */, /*_syntaxCursor:*/ undefined, 1 /* JS */);
                 sourceFile = { languageVariant: 0 /* Standard */, text: content }; // tslint:disable-line no-object-literal-type-assertion
                 var jsDoc = parseJSDocCommentWorker(start, length);
                 var diagnostics = parseDiagnostics;
@@ -22135,6 +22424,7 @@ var ts;
                 JSDocState[JSDocState["BeginningOfLine"] = 0] = "BeginningOfLine";
                 JSDocState[JSDocState["SawAsterisk"] = 1] = "SawAsterisk";
                 JSDocState[JSDocState["SavingComments"] = 2] = "SavingComments";
+                JSDocState[JSDocState["SavingBackticks"] = 3] = "SavingBackticks";
             })(JSDocState || (JSDocState = {}));
             var PropertyLikeParse;
             (function (PropertyLikeParse) {
@@ -22173,7 +22463,7 @@ var ts;
                         comments.push(text);
                         indent += text.length;
                     }
-                    nextJSDocToken();
+                    nextTokenJSDoc();
                     while (parseOptionalJsdoc(5 /* WhitespaceTrivia */))
                         ;
                     if (parseOptionalJsdoc(4 /* NewLineTrivia */)) {
@@ -22191,7 +22481,6 @@ var ts;
                                     // for malformed examples like `/** @param {string} x @returns {number} the length */`
                                     state = 0 /* BeginningOfLine */;
                                     margin = undefined;
-                                    indent++;
                                 }
                                 else {
                                     pushComment(scanner.getTokenText());
@@ -22236,7 +22525,7 @@ var ts;
                                 pushComment(scanner.getTokenText());
                                 break;
                         }
-                        nextJSDocToken();
+                        nextTokenJSDoc();
                     }
                     removeLeadingNewlines(comments);
                     removeTrailingWhitespace(comments);
@@ -22253,7 +22542,7 @@ var ts;
                     }
                 }
                 function createJSDocComment() {
-                    var result = createNode(296 /* JSDocComment */, start);
+                    var result = createNode(297 /* JSDocComment */, start);
                     result.tags = tags && createNodeArray(tags, tagsPos, tagsEnd);
                     result.comment = comments.length ? comments.join("") : undefined;
                     return finishNode(result, end);
@@ -22261,7 +22550,7 @@ var ts;
                 function isNextNonwhitespaceTokenEndOfFile() {
                     // We must use infinite lookahead, as there could be any number of newlines :(
                     while (true) {
-                        nextJSDocToken();
+                        nextTokenJSDoc();
                         if (token() === 1 /* EndOfFileToken */) {
                             return true;
                         }
@@ -22277,34 +22566,43 @@ var ts;
                         }
                     }
                     while (token() === 5 /* WhitespaceTrivia */ || token() === 4 /* NewLineTrivia */) {
-                        nextJSDocToken();
+                        nextTokenJSDoc();
                     }
                 }
                 function skipWhitespaceOrAsterisk() {
                     if (token() === 5 /* WhitespaceTrivia */ || token() === 4 /* NewLineTrivia */) {
                         if (lookAhead(isNextNonwhitespaceTokenEndOfFile)) {
-                            return; // Don't skip whitespace prior to EoF (or end of comment) - that shouldn't be included in any node's range
+                            return ""; // Don't skip whitespace prior to EoF (or end of comment) - that shouldn't be included in any node's range
                         }
                     }
                     var precedingLineBreak = scanner.hasPrecedingLineBreak();
+                    var seenLineBreak = false;
+                    var indentText = "";
                     while ((precedingLineBreak && token() === 40 /* AsteriskToken */) || token() === 5 /* WhitespaceTrivia */ || token() === 4 /* NewLineTrivia */) {
+                        indentText += scanner.getTokenText();
                         if (token() === 4 /* NewLineTrivia */) {
                             precedingLineBreak = true;
+                            seenLineBreak = true;
+                            indentText = "";
                         }
                         else if (token() === 40 /* AsteriskToken */) {
                             precedingLineBreak = false;
                         }
-                        nextJSDocToken();
+                        nextTokenJSDoc();
                     }
+                    return seenLineBreak ? indentText : "";
                 }
-                function parseTag(indent) {
+                function parseTag(margin) {
                     ts.Debug.assert(token() === 58 /* AtToken */);
                     var start = scanner.getTokenPos();
-                    nextJSDocToken();
+                    nextTokenJSDoc();
                     var tagName = parseJSDocIdentifierName(/*message*/ undefined);
-                    skipWhitespaceOrAsterisk();
+                    var indentText = skipWhitespaceOrAsterisk();
                     var tag;
                     switch (tagName.escapedText) {
+                        case "author":
+                            tag = parseAuthorTag(start, tagName, margin);
+                            break;
                         case "augments":
                         case "extends":
                             tag = parseAugmentsTag(start, tagName);
@@ -22322,7 +22620,7 @@ var ts;
                         case "arg":
                         case "argument":
                         case "param":
-                            return parseParameterOrPropertyTag(start, tagName, 2 /* Parameter */, indent);
+                            return parseParameterOrPropertyTag(start, tagName, 2 /* Parameter */, margin);
                         case "return":
                         case "returns":
                             tag = parseReturnTag(start, tagName);
@@ -22334,10 +22632,10 @@ var ts;
                             tag = parseTypeTag(start, tagName);
                             break;
                         case "typedef":
-                            tag = parseTypedefTag(start, tagName, indent);
+                            tag = parseTypedefTag(start, tagName, margin);
                             break;
                         case "callback":
-                            tag = parseCallbackTag(start, tagName, indent);
+                            tag = parseCallbackTag(start, tagName, margin);
                             break;
                         default:
                             tag = parseUnknownTag(start, tagName);
@@ -22345,11 +22643,14 @@ var ts;
                     }
                     if (!tag.comment) {
                         // some tags, like typedef and callback, have already parsed their comments earlier
-                        tag.comment = parseTagComments(indent + tag.end - tag.pos);
+                        if (!indentText) {
+                            margin += tag.end - tag.pos;
+                        }
+                        tag.comment = parseTagComments(margin, indentText.slice(margin));
                     }
                     return tag;
                 }
-                function parseTagComments(indent) {
+                function parseTagComments(indent, initialMargin) {
                     var comments = [];
                     var state = 0 /* BeginningOfLine */;
                     var margin;
@@ -22360,42 +22661,61 @@ var ts;
                         comments.push(text);
                         indent += text.length;
                     }
+                    if (initialMargin) {
+                        // jump straight to saving comments if there is some initial indentation
+                        pushComment(initialMargin);
+                        state = 2 /* SavingComments */;
+                    }
                     var tok = token();
                     loop: while (true) {
                         switch (tok) {
                             case 4 /* NewLineTrivia */:
                                 if (state >= 1 /* SawAsterisk */) {
                                     state = 0 /* BeginningOfLine */;
+                                    // don't use pushComment here because we want to keep the margin unchanged
                                     comments.push(scanner.getTokenText());
                                 }
                                 indent = 0;
                                 break;
                             case 58 /* AtToken */:
+                                if (state === 3 /* SavingBackticks */) {
+                                    comments.push(scanner.getTokenText());
+                                    break;
+                                }
                                 scanner.setTextPos(scanner.getTextPos() - 1);
                             // falls through
                             case 1 /* EndOfFileToken */:
                                 // Done
                                 break loop;
                             case 5 /* WhitespaceTrivia */:
-                                if (state === 2 /* SavingComments */) {
+                                if (state === 2 /* SavingComments */ || state === 3 /* SavingBackticks */) {
                                     pushComment(scanner.getTokenText());
                                 }
                                 else {
                                     var whitespace = scanner.getTokenText();
                                     // if the whitespace crosses the margin, take only the whitespace that passes the margin
                                     if (margin !== undefined && indent + whitespace.length > margin) {
-                                        comments.push(whitespace.slice(margin - indent - 1));
+                                        comments.push(whitespace.slice(margin - indent));
                                     }
                                     indent += whitespace.length;
                                 }
                                 break;
                             case 18 /* OpenBraceToken */:
                                 state = 2 /* SavingComments */;
-                                if (lookAhead(function () { return nextJSDocToken() === 58 /* AtToken */ && ts.tokenIsIdentifierOrKeyword(nextJSDocToken()) && scanner.getTokenText() === "link"; })) {
+                                if (lookAhead(function () { return nextTokenJSDoc() === 58 /* AtToken */ && ts.tokenIsIdentifierOrKeyword(nextTokenJSDoc()) && scanner.getTokenText() === "link"; })) {
                                     pushComment(scanner.getTokenText());
-                                    nextJSDocToken();
+                                    nextTokenJSDoc();
                                     pushComment(scanner.getTokenText());
-                                    nextJSDocToken();
+                                    nextTokenJSDoc();
+                                }
+                                pushComment(scanner.getTokenText());
+                                break;
+                            case 59 /* BacktickToken */:
+                                if (state === 3 /* SavingBackticks */) {
+                                    state = 2 /* SavingComments */;
+                                }
+                                else {
+                                    state = 3 /* SavingBackticks */;
                                 }
                                 pushComment(scanner.getTokenText());
                                 break;
@@ -22409,18 +22729,20 @@ var ts;
                             // record the * as a comment
                             // falls through
                             default:
-                                state = 2 /* SavingComments */; // leading identifiers start recording as well
+                                if (state !== 3 /* SavingBackticks */) {
+                                    state = 2 /* SavingComments */; // leading identifiers start recording as well
+                                }
                                 pushComment(scanner.getTokenText());
                                 break;
                         }
-                        tok = nextJSDocToken();
+                        tok = nextTokenJSDoc();
                     }
                     removeLeadingNewlines(comments);
                     removeTrailingWhitespace(comments);
                     return comments.length === 0 ? undefined : comments.join("");
                 }
                 function parseUnknownTag(start, tagName) {
-                    var result = createNode(299 /* JSDocTag */, start);
+                    var result = createNode(300 /* JSDocTag */, start);
                     result.tagName = tagName;
                     return finishNode(result);
                 }
@@ -22442,17 +22764,21 @@ var ts;
                     return token() === 18 /* OpenBraceToken */ ? parseJSDocTypeExpression() : undefined;
                 }
                 function parseBracketNameInPropertyAndParamTag() {
-                    if (token() === 14 /* NoSubstitutionTemplateLiteral */) {
-                        // a markdown-quoted name: `arg` is not legal jsdoc, but occurs in the wild
-                        return { name: createIdentifier(/*isIdentifier*/ true), isBracketed: false };
-                    }
                     // Looking for something like '[foo]', 'foo', '[foo.bar]' or 'foo.bar'
-                    var isBracketed = parseOptional(22 /* OpenBracketToken */);
+                    var isBracketed = parseOptionalJsdoc(22 /* OpenBracketToken */);
+                    if (isBracketed) {
+                        skipWhitespace();
+                    }
+                    // a markdown-quoted name: `arg` is not legal jsdoc, but occurs in the wild
+                    var isBackquoted = parseOptionalJsdoc(59 /* BacktickToken */);
                     var name = parseJSDocEntityName();
+                    if (isBackquoted) {
+                        parseExpectedTokenJSDoc(59 /* BacktickToken */);
+                    }
                     if (isBracketed) {
                         skipWhitespace();
                         // May have an optional default, e.g. '[foo = 42]'
-                        if (parseOptionalToken(59 /* EqualsToken */)) {
+                        if (parseOptionalToken(60 /* EqualsToken */)) {
                             parseExpression();
                         }
                         parseExpected(23 /* CloseBracketToken */);
@@ -22461,9 +22787,9 @@ var ts;
                 }
                 function isObjectOrObjectArrayTypeReference(node) {
                     switch (node.kind) {
-                        case 136 /* ObjectKeyword */:
+                        case 137 /* ObjectKeyword */:
                             return true;
-                        case 169 /* ArrayType */:
+                        case 170 /* ArrayType */:
                             return isObjectOrObjectArrayTypeReference(node.elementType);
                         default:
                             return ts.isTypeReferenceNode(node) && ts.isIdentifier(node.typeName) && node.typeName.escapedText === "Object";
@@ -22479,8 +22805,8 @@ var ts;
                         typeExpression = tryParseTypeExpression();
                     }
                     var result = target === 1 /* Property */ ?
-                        createNode(310 /* JSDocPropertyTag */, start) :
-                        createNode(304 /* JSDocParameterTag */, start);
+                        createNode(312 /* JSDocPropertyTag */, start) :
+                        createNode(306 /* JSDocParameterTag */, start);
                     var comment = parseTagComments(indent + scanner.getStartPos() - start);
                     var nestedTypeLiteral = target !== 4 /* CallbackParameter */ && parseNestedTypeLiteral(typeExpression, name, target, indent);
                     if (nestedTypeLiteral) {
@@ -22497,20 +22823,20 @@ var ts;
                 }
                 function parseNestedTypeLiteral(typeExpression, name, target, indent) {
                     if (typeExpression && isObjectOrObjectArrayTypeReference(typeExpression.type)) {
-                        var typeLiteralExpression = createNode(288 /* JSDocTypeExpression */, scanner.getTokenPos());
+                        var typeLiteralExpression = createNode(289 /* JSDocTypeExpression */, scanner.getTokenPos());
                         var child = void 0;
                         var jsdocTypeLiteral = void 0;
                         var start_2 = scanner.getStartPos();
                         var children = void 0;
                         while (child = tryParse(function () { return parseChildParameterOrPropertyTag(target, indent, name); })) {
-                            if (child.kind === 304 /* JSDocParameterTag */ || child.kind === 310 /* JSDocPropertyTag */) {
+                            if (child.kind === 306 /* JSDocParameterTag */ || child.kind === 312 /* JSDocPropertyTag */) {
                                 children = ts.append(children, child);
                             }
                         }
                         if (children) {
-                            jsdocTypeLiteral = createNode(297 /* JSDocTypeLiteral */, start_2);
+                            jsdocTypeLiteral = createNode(298 /* JSDocTypeLiteral */, start_2);
                             jsdocTypeLiteral.jsDocPropertyTags = children;
-                            if (typeExpression.type.kind === 169 /* ArrayType */) {
+                            if (typeExpression.type.kind === 170 /* ArrayType */) {
                                 jsdocTypeLiteral.isArrayType = true;
                             }
                             typeLiteralExpression.type = finishNode(jsdocTypeLiteral);
@@ -22519,32 +22845,86 @@ var ts;
                     }
                 }
                 function parseReturnTag(start, tagName) {
-                    if (ts.forEach(tags, function (t) { return t.kind === 305 /* JSDocReturnTag */; })) {
+                    if (ts.some(tags, ts.isJSDocReturnTag)) {
                         parseErrorAt(tagName.pos, scanner.getTokenPos(), ts.Diagnostics._0_tag_already_specified, tagName.escapedText);
                     }
-                    var result = createNode(305 /* JSDocReturnTag */, start);
+                    var result = createNode(307 /* JSDocReturnTag */, start);
                     result.tagName = tagName;
                     result.typeExpression = tryParseTypeExpression();
                     return finishNode(result);
                 }
                 function parseTypeTag(start, tagName) {
-                    if (ts.forEach(tags, function (t) { return t.kind === 307 /* JSDocTypeTag */; })) {
+                    if (ts.some(tags, ts.isJSDocTypeTag)) {
                         parseErrorAt(tagName.pos, scanner.getTokenPos(), ts.Diagnostics._0_tag_already_specified, tagName.escapedText);
                     }
-                    var result = createNode(307 /* JSDocTypeTag */, start);
+                    var result = createNode(309 /* JSDocTypeTag */, start);
                     result.tagName = tagName;
                     result.typeExpression = parseJSDocTypeExpression(/*mayOmitBraces*/ true);
                     return finishNode(result);
                 }
+                function parseAuthorTag(start, tagName, indent) {
+                    var result = createNode(302 /* JSDocAuthorTag */, start);
+                    result.tagName = tagName;
+                    var authorInfoWithEmail = tryParse(function () { return tryParseAuthorNameAndEmail(); });
+                    if (!authorInfoWithEmail) {
+                        return finishNode(result);
+                    }
+                    result.comment = authorInfoWithEmail;
+                    if (lookAhead(function () { return nextToken() !== 4 /* NewLineTrivia */; })) {
+                        var comment = parseTagComments(indent);
+                        if (comment) {
+                            result.comment += comment;
+                        }
+                    }
+                    return finishNode(result);
+                }
+                function tryParseAuthorNameAndEmail() {
+                    var comments = [];
+                    var seenLessThan = false;
+                    var seenGreaterThan = false;
+                    var token = scanner.getToken();
+                    loop: while (true) {
+                        switch (token) {
+                            case 73 /* Identifier */:
+                            case 5 /* WhitespaceTrivia */:
+                            case 24 /* DotToken */:
+                            case 58 /* AtToken */:
+                                comments.push(scanner.getTokenText());
+                                break;
+                            case 28 /* LessThanToken */:
+                                if (seenLessThan || seenGreaterThan) {
+                                    return;
+                                }
+                                seenLessThan = true;
+                                comments.push(scanner.getTokenText());
+                                break;
+                            case 30 /* GreaterThanToken */:
+                                if (!seenLessThan || seenGreaterThan) {
+                                    return;
+                                }
+                                seenGreaterThan = true;
+                                comments.push(scanner.getTokenText());
+                                scanner.setTextPos(scanner.getTokenPos() + 1);
+                                break loop;
+                            case 4 /* NewLineTrivia */:
+                            case 1 /* EndOfFileToken */:
+                                break loop;
+                        }
+                        token = nextTokenJSDoc();
+                    }
+                    if (seenLessThan && seenGreaterThan) {
+                        return comments.length === 0 ? undefined : comments.join("");
+                    }
+                }
                 function parseAugmentsTag(start, tagName) {
-                    var result = createNode(300 /* JSDocAugmentsTag */, start);
+                    var result = createNode(301 /* JSDocAugmentsTag */, start);
                     result.tagName = tagName;
                     result.class = parseExpressionWithTypeArgumentsForAugments();
                     return finishNode(result);
                 }
                 function parseExpressionWithTypeArgumentsForAugments() {
                     var usedBrace = parseOptional(18 /* OpenBraceToken */);
-                    var node = createNode(211 /* ExpressionWithTypeArguments */);
+                    var node = createNode(212 /* ExpressionWithTypeArguments */);
                     node.expression = parsePropertyAccessEntityNameExpression();
                     node.typeArguments = tryParseTypeArguments();
                     var res = finishNode(node);
@@ -22556,7 +22936,7 @@ var ts;
                 function parsePropertyAccessEntityNameExpression() {
                     var node = parseJSDocIdentifierName();
                     while (parseOptional(24 /* DotToken */)) {
-                        var prop = createNode(189 /* PropertyAccessExpression */, node.pos);
+                        var prop = createNode(190 /* PropertyAccessExpression */, node.pos);
                         prop.expression = node;
                         prop.name = parseJSDocIdentifierName();
                         node = finishNode(prop);
@@ -22564,19 +22944,19 @@ var ts;
                     return node;
                 }
                 function parseClassTag(start, tagName) {
-                    var tag = createNode(301 /* JSDocClassTag */, start);
+                    var tag = createNode(303 /* JSDocClassTag */, start);
                     tag.tagName = tagName;
                     return finishNode(tag);
                 }
                 function parseThisTag(start, tagName) {
-                    var tag = createNode(306 /* JSDocThisTag */, start);
+                    var tag = createNode(308 /* JSDocThisTag */, start);
                     tag.tagName = tagName;
                     tag.typeExpression = parseJSDocTypeExpression(/*mayOmitBraces*/ true);
                     skipWhitespace();
                     return finishNode(tag);
                 }
                 function parseEnumTag(start, tagName) {
-                    var tag = createNode(303 /* JSDocEnumTag */, start);
+                    var tag = createNode(305 /* JSDocEnumTag */, start);
                     tag.tagName = tagName;
                     tag.typeExpression = parseJSDocTypeExpression(/*mayOmitBraces*/ true);
                     skipWhitespace();
@@ -22585,7 +22965,7 @@ var ts;
                 function parseTypedefTag(start, tagName, indent) {
                     var typeExpression = tryParseTypeExpression();
                     skipWhitespaceOrAsterisk();
-                    var typedefTag = createNode(309 /* JSDocTypedefTag */, start);
+                    var typedefTag = createNode(311 /* JSDocTypedefTag */, start);
                     typedefTag.tagName = tagName;
                     typedefTag.fullName = parseJSDocTypeNameWithNamespace();
                     typedefTag.name = getJSDocTypeAliasName(typedefTag.fullName);
@@ -22599,9 +22979,9 @@ var ts;
                         var childTypeTag = void 0;
                         while (child = tryParse(function () { return parseChildPropertyTag(indent); })) {
                             if (!jsdocTypeLiteral) {
-                                jsdocTypeLiteral = createNode(297 /* JSDocTypeLiteral */, start);
+                                jsdocTypeLiteral = createNode(298 /* JSDocTypeLiteral */, start);
                             }
-                            if (child.kind === 307 /* JSDocTypeTag */) {
+                            if (child.kind === 309 /* JSDocTypeTag */) {
                                 if (childTypeTag) {
                                     break;
                                 }
@@ -22614,7 +22994,7 @@ var ts;
                             }
                         }
                         if (jsdocTypeLiteral) {
-                            if (typeExpression && typeExpression.type.kind === 169 /* ArrayType */) {
+                            if (typeExpression && typeExpression.type.kind === 170 /* ArrayType */) {
                                 jsdocTypeLiteral.isArrayType = true;
                             }
                             typedefTag.typeExpression = childTypeTag && childTypeTag.typeExpression && !isObjectOrObjectArrayTypeReference(childTypeTag.typeExpression.type) ?
@@ -22633,7 +23013,7 @@ var ts;
                     }
                     var typeNameOrNamespaceName = parseJSDocIdentifierName();
                     if (parseOptional(24 /* DotToken */)) {
-                        var jsDocNamespaceNode = createNode(244 /* ModuleDeclaration */, pos);
+                        var jsDocNamespaceNode = createNode(245 /* ModuleDeclaration */, pos);
                         if (nested) {
                             jsDocNamespaceNode.flags |= 4 /* NestedNamespace */;
                         }
@@ -22647,14 +23027,14 @@ var ts;
                     return typeNameOrNamespaceName;
                 }
                 function parseCallbackTag(start, tagName, indent) {
-                    var callbackTag = createNode(302 /* JSDocCallbackTag */, start);
+                    var callbackTag = createNode(304 /* JSDocCallbackTag */, start);
                     callbackTag.tagName = tagName;
                     callbackTag.fullName = parseJSDocTypeNameWithNamespace();
                     callbackTag.name = getJSDocTypeAliasName(callbackTag.fullName);
                     skipWhitespace();
                     callbackTag.comment = parseTagComments(indent);
                     var child;
-                    var jsdocSignature = createNode(298 /* JSDocSignature */, start);
+                    var jsdocSignature = createNode(299 /* JSDocSignature */, start);
                     jsdocSignature.parameters = [];
                     while (child = tryParse(function () { return parseChildParameterOrPropertyTag(4 /* CallbackParameter */, indent); })) {
                         jsdocSignature.parameters = ts.append(jsdocSignature.parameters, child);
@@ -22662,7 +23042,7 @@ var ts;
                     var returnTag = tryParse(function () {
                         if (parseOptionalJsdoc(58 /* AtToken */)) {
                             var tag = parseTag(indent);
-                            if (tag && tag.kind === 305 /* JSDocReturnTag */) {
+                            if (tag && tag.kind === 307 /* JSDocReturnTag */) {
                                 return tag;
                             }
                         }
@@ -22703,11 +23083,11 @@ var ts;
                     var canParseTag = true;
                     var seenAsterisk = false;
                     while (true) {
-                        switch (nextJSDocToken()) {
+                        switch (nextTokenJSDoc()) {
                             case 58 /* AtToken */:
                                 if (canParseTag) {
                                     var child = tryParseChildTag(target, indent);
-                                    if (child && (child.kind === 304 /* JSDocParameterTag */ || child.kind === 310 /* JSDocPropertyTag */) &&
+                                    if (child && (child.kind === 306 /* JSDocParameterTag */ || child.kind === 312 /* JSDocPropertyTag */) &&
                                         target !== 4 /* CallbackParameter */ &&
                                         name && (ts.isIdentifier(child.name) || !escapedTextsEqual(name, child.name.left))) {
                                         return false;
@@ -22726,7 +23106,7 @@ var ts;
                                 }
                                 seenAsterisk = true;
                                 break;
-                            case 72 /* Identifier */:
+                            case 73 /* Identifier */:
                                 canParseTag = false;
                                 break;
                             case 1 /* EndOfFileToken */:
@@ -22737,7 +23117,7 @@ var ts;
                 function tryParseChildTag(target, indent) {
                     ts.Debug.assert(token() === 58 /* AtToken */);
                     var start = scanner.getStartPos();
-                    nextJSDocToken();
+                    nextTokenJSDoc();
                     var tagName = parseJSDocIdentifierName();
                     skipWhitespace();
                     var t;
@@ -22771,25 +23151,22 @@ var ts;
                     var typeParametersPos = getNodePos();
                     do {
                         skipWhitespace();
-                        var typeParameter = createNode(150 /* TypeParameter */);
+                        var typeParameter = createNode(151 /* TypeParameter */);
                         typeParameter.name = parseJSDocIdentifierName(ts.Diagnostics.Unexpected_token_A_type_parameter_name_was_expected_without_curly_braces);
                         finishNode(typeParameter);
                         skipWhitespace();
                         typeParameters.push(typeParameter);
                     } while (parseOptionalJsdoc(27 /* CommaToken */));
-                    var result = createNode(308 /* JSDocTemplateTag */, start);
+                    var result = createNode(310 /* JSDocTemplateTag */, start);
                     result.tagName = tagName;
                     result.constraint = constraint;
                     result.typeParameters = createNodeArray(typeParameters, typeParametersPos);
                     finishNode(result);
                     return result;
                 }
-                function nextJSDocToken() {
-                    return currentToken = scanner.scanJSDocToken();
-                }
                 function parseOptionalJsdoc(t) {
                     if (token() === t) {
-                        nextJSDocToken();
+                        nextTokenJSDoc();
                         return true;
                     }
                     return false;
@@ -22813,14 +23190,14 @@ var ts;
                 }
                 function parseJSDocIdentifierName(message) {
                     if (!ts.tokenIsIdentifierOrKeyword(token())) {
-                        return createMissingNode(72 /* Identifier */, /*reportAtCurrentPosition*/ !message, message || ts.Diagnostics.Identifier_expected);
+                        return createMissingNode(73 /* Identifier */, /*reportAtCurrentPosition*/ !message, message || ts.Diagnostics.Identifier_expected);
                     }
                     var pos = scanner.getTokenPos();
                     var end = scanner.getTextPos();
-                    var result = createNode(72 /* Identifier */, pos);
+                    var result = createNode(73 /* Identifier */, pos);
                     result.escapedText = ts.escapeLeadingUnderscores(scanner.getTokenText());
                     finishNode(result, end);
-                    nextJSDocToken();
+                    nextTokenJSDoc();
                     return result;
                 }
             }
@@ -22945,7 +23322,7 @@ var ts;
             switch (node.kind) {
                 case 10 /* StringLiteral */:
                 case 8 /* NumericLiteral */:
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return true;
             }
             return false;
@@ -23312,28 +23689,16 @@ var ts;
     ts.isDeclarationFileName = isDeclarationFileName;
     /*@internal*/
     function processCommentPragmas(context, sourceText) {
-        var triviaScanner = ts.createScanner(context.languageVersion, /*skipTrivia*/ false, 0 /* Standard */, sourceText);
         var pragmas = [];
-        // Keep scanning all the leading trivia in the file until we get to something that
-        // isn't trivia.  Any single line comment will be analyzed to see if it is a
-        // reference comment.
-        while (true) {
-            var kind = triviaScanner.scan();
-            if (!ts.isTrivia(kind)) {
-                break;
-            }
-            var range = {
-                kind: triviaScanner.getToken(),
-                pos: triviaScanner.getTokenPos(),
-                end: triviaScanner.getTextPos(),
-            };
+        for (var _i = 0, _a = ts.getLeadingCommentRanges(sourceText, 0) || ts.emptyArray; _i < _a.length; _i++) {
+            var range = _a[_i];
             var comment = sourceText.substring(range.pos, range.end);
             extractPragmas(pragmas, range, comment);
         }
         context.pragmas = ts.createMap();
-        for (var _i = 0, pragmas_1 = pragmas; _i < pragmas_1.length; _i++) {
-            var pragma = pragmas_1[_i];
-            if (context.pragmas.has(pragma.name)) { // TODO: GH#18217
+        for (var _b = 0, pragmas_1 = pragmas; _b < pragmas_1.length; _b++) {
+            var pragma = pragmas_1[_b];
+            if (context.pragmas.has(pragma.name)) {
                 var currentValue = context.pragmas.get(pragma.name);
                 if (currentValue instanceof Array) {
                     currentValue.push(pragma.args);
@@ -23364,7 +23729,6 @@ var ts;
                     var typeReferenceDirectives_1 = context.typeReferenceDirectives;
                     var libReferenceDirectives_1 = context.libReferenceDirectives;
                     ts.forEach(ts.toArray(entryOrList), function (arg) {
-                        // TODO: GH#18217
                         var _a = arg.arguments, types = _a.types, lib = _a.lib, path = _a.path;
                         if (arg.arguments["no-default-lib"]) {
                             context.hasNoDefaultLib = true;
@@ -23385,7 +23749,7 @@ var ts;
                     break;
                 }
                 case "amd-dependency": {
-                    context.amdDependencies = ts.map(ts.toArray(entryOrList), function (x) { return ({ name: x.arguments.name, path: x.arguments.path }); }); // TODO: GH#18217
+                    context.amdDependencies = ts.map(ts.toArray(entryOrList), function (x) { return ({ name: x.arguments.name, path: x.arguments.path }); });
                     break;
                 }
                 case "amd-module": {
@@ -23408,7 +23772,7 @@ var ts;
                 case "ts-check": {
                     // _last_ of either nocheck or check in a file is the "winner"
                     ts.forEach(ts.toArray(entryOrList), function (entry) {
-                        if (!context.checkJsDirective || entry.range.pos > context.checkJsDirective.pos) { // TODO: GH#18217
+                        if (!context.checkJsDirective || entry.range.pos > context.checkJsDirective.pos) {
                             context.checkJsDirective = {
                                 enabled: key === "ts-check",
                                 end: entry.range.end,
@@ -23524,10 +23888,10 @@ var ts;
         if (lhs.kind !== rhs.kind) {
             return false;
         }
-        if (lhs.kind === 72 /* Identifier */) {
+        if (lhs.kind === 73 /* Identifier */) {
             return lhs.escapedText === rhs.escapedText;
         }
-        if (lhs.kind === 100 /* ThisKeyword */) {
+        if (lhs.kind === 101 /* ThisKeyword */) {
             return true;
         }
         // If we are at this statement then we must have PropertyAccessExpression and because tag name in Jsx element can only
@@ -23556,6 +23920,7 @@ var ts;
         ["es2017", "lib.es2017.d.ts"],
         ["es2018", "lib.es2018.d.ts"],
         ["es2019", "lib.es2019.d.ts"],
+        ["es2020", "lib.es2020.d.ts"],
         ["esnext", "lib.esnext.d.ts"],
         // Host only
         ["dom", "lib.dom.d.ts"],
@@ -23579,13 +23944,17 @@ var ts;
         ["es2017.string", "lib.es2017.string.d.ts"],
         ["es2017.intl", "lib.es2017.intl.d.ts"],
         ["es2017.typedarrays", "lib.es2017.typedarrays.d.ts"],
+        ["es2018.asyncgenerator", "lib.es2018.asyncgenerator.d.ts"],
         ["es2018.asynciterable", "lib.es2018.asynciterable.d.ts"],
         ["es2018.intl", "lib.es2018.intl.d.ts"],
         ["es2018.promise", "lib.es2018.promise.d.ts"],
         ["es2018.regexp", "lib.es2018.regexp.d.ts"],
         ["es2019.array", "lib.es2019.array.d.ts"],
+        ["es2019.object", "lib.es2019.object.d.ts"],
         ["es2019.string", "lib.es2019.string.d.ts"],
         ["es2019.symbol", "lib.es2019.symbol.d.ts"],
+        ["es2020.string", "lib.es2020.string.d.ts"],
+        ["es2020.symbol.wellknown", "lib.es2020.symbol.wellknown.d.ts"],
         ["esnext.array", "lib.es2019.array.d.ts"],
         ["esnext.symbol", "lib.es2019.symbol.d.ts"],
         ["esnext.asynciterable", "lib.es2018.asynciterable.d.ts"],
@@ -23672,6 +24041,19 @@ var ts;
             category: ts.Diagnostics.Advanced_Options,
             description: ts.Diagnostics.Show_verbose_diagnostic_information
         },
+        {
+            name: "incremental",
+            shortName: "i",
+            type: "boolean",
+            category: ts.Diagnostics.Basic_Options,
+            description: ts.Diagnostics.Enable_incremental_compilation,
+        },
+        {
+            name: "locale",
+            type: "string",
+            category: ts.Diagnostics.Advanced_Options,
+            description: ts.Diagnostics.The_locale_used_when_displaying_messages_to_the_user_e_g_en_us
+        },
     ];
     /* @internal */
     ts.optionDeclarations = ts.commonOptionsWithBuild.concat([
@@ -23735,10 +24117,12 @@ var ts;
                 es2017: 4 /* ES2017 */,
                 es2018: 5 /* ES2018 */,
                 es2019: 6 /* ES2019 */,
-                esnext: 7 /* ESNext */,
+                es2020: 7 /* ES2020 */,
+                esnext: 99 /* ESNext */,
             }),
             affectsSourceFile: true,
             affectsModuleResolution: true,
+            affectsEmit: true,
             paramType: ts.Diagnostics.VERSION,
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Basic_Options,
@@ -23758,6 +24142,7 @@ var ts;
                 esnext: ts.ModuleKind.ESNext
             }),
             affectsModuleResolution: true,
+            affectsEmit: true,
             paramType: ts.Diagnostics.KIND,
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Basic_Options,
@@ -23806,6 +24191,7 @@ var ts;
             name: "declaration",
             shortName: "d",
             type: "boolean",
+            affectsEmit: true,
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Basic_Options,
             description: ts.Diagnostics.Generates_corresponding_d_ts_file,
@@ -23813,6 +24199,7 @@ var ts;
         {
             name: "declarationMap",
             type: "boolean",
+            affectsEmit: true,
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Basic_Options,
             description: ts.Diagnostics.Generates_a_sourcemap_for_each_corresponding_d_ts_file,
@@ -23820,12 +24207,14 @@ var ts;
         {
             name: "emitDeclarationOnly",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Advanced_Options,
             description: ts.Diagnostics.Only_emit_d_ts_declaration_files,
         },
         {
             name: "sourceMap",
             type: "boolean",
+            affectsEmit: true,
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Basic_Options,
             description: ts.Diagnostics.Generates_corresponding_map_file,
@@ -23833,6 +24222,7 @@ var ts;
         {
             name: "outFile",
             type: "string",
+            affectsEmit: true,
             isFilePath: true,
             paramType: ts.Diagnostics.FILE,
             showInSimplifiedHelpView: true,
@@ -23842,6 +24232,7 @@ var ts;
         {
             name: "outDir",
             type: "string",
+            affectsEmit: true,
             isFilePath: true,
             paramType: ts.Diagnostics.DIRECTORY,
             showInSimplifiedHelpView: true,
@@ -23851,6 +24242,7 @@ var ts;
         {
             name: "rootDir",
             type: "string",
+            affectsEmit: true,
             isFilePath: true,
             paramType: ts.Diagnostics.LOCATION,
             category: ts.Diagnostics.Basic_Options,
@@ -23859,29 +24251,24 @@ var ts;
         {
             name: "composite",
             type: "boolean",
+            affectsEmit: true,
             isTSConfigOnly: true,
             category: ts.Diagnostics.Basic_Options,
             description: ts.Diagnostics.Enable_project_compilation,
         },
-        {
-            name: "incremental",
-            type: "boolean",
-            isTSConfigOnly: true,
-            category: ts.Diagnostics.Basic_Options,
-            description: ts.Diagnostics.Enable_incremental_compilation,
-        },
         {
             name: "tsBuildInfoFile",
             type: "string",
+            affectsEmit: true,
             isFilePath: true,
             paramType: ts.Diagnostics.FILE,
-            isTSConfigOnly: true,
             category: ts.Diagnostics.Basic_Options,
             description: ts.Diagnostics.Specify_file_to_store_incremental_compilation_information,
         },
         {
             name: "removeComments",
             type: "boolean",
+            affectsEmit: true,
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Basic_Options,
             description: ts.Diagnostics.Do_not_emit_comments_to_output,
@@ -23889,6 +24276,7 @@ var ts;
         {
             name: "noEmit",
             type: "boolean",
+            affectsEmit: true,
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Basic_Options,
             description: ts.Diagnostics.Do_not_emit_outputs,
@@ -23896,12 +24284,14 @@ var ts;
         {
             name: "importHelpers",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Basic_Options,
             description: ts.Diagnostics.Import_emit_helpers_from_tslib
         },
         {
             name: "downlevelIteration",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Basic_Options,
             description: ts.Diagnostics.Provide_full_support_for_iterables_in_for_of_spread_and_destructuring_when_targeting_ES5_or_ES3
         },
@@ -24095,6 +24485,7 @@ var ts;
             name: "esModuleInterop",
             type: "boolean",
             affectsSemanticDiagnostics: true,
+            affectsEmit: true,
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Module_Resolution_Options,
             description: ts.Diagnostics.Enables_emit_interoperability_between_CommonJS_and_ES_Modules_via_creation_of_namespace_objects_for_all_imports_Implies_allowSyntheticDefaultImports
@@ -24105,10 +24496,18 @@ var ts;
             category: ts.Diagnostics.Module_Resolution_Options,
             description: ts.Diagnostics.Do_not_resolve_the_real_path_of_symlinks,
         },
+        {
+            name: "allowUmdGlobalAccess",
+            type: "boolean",
+            affectsSemanticDiagnostics: true,
+            category: ts.Diagnostics.Module_Resolution_Options,
+            description: ts.Diagnostics.Allow_accessing_UMD_globals_from_modules,
+        },
         // Source Maps
         {
             name: "sourceRoot",
             type: "string",
+            affectsEmit: true,
             paramType: ts.Diagnostics.LOCATION,
             category: ts.Diagnostics.Source_Map_Options,
             description: ts.Diagnostics.Specify_the_location_where_debugger_should_locate_TypeScript_files_instead_of_source_locations,
@@ -24116,6 +24515,7 @@ var ts;
         {
             name: "mapRoot",
             type: "string",
+            affectsEmit: true,
             paramType: ts.Diagnostics.LOCATION,
             category: ts.Diagnostics.Source_Map_Options,
             description: ts.Diagnostics.Specify_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations,
@@ -24123,12 +24523,14 @@ var ts;
         {
             name: "inlineSourceMap",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Source_Map_Options,
             description: ts.Diagnostics.Emit_a_single_file_with_source_maps_instead_of_having_a_separate_file
         },
         {
             name: "inlineSources",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Source_Map_Options,
             description: ts.Diagnostics.Emit_the_source_alongside_the_sourcemaps_within_a_single_file_requires_inlineSourceMap_or_sourceMap_to_be_set
         },
@@ -24161,6 +24563,7 @@ var ts;
         {
             name: "out",
             type: "string",
+            affectsEmit: true,
             isFilePath: false,
             // for correct behaviour, please use outFile
             category: ts.Diagnostics.Advanced_Options,
@@ -24170,6 +24573,7 @@ var ts;
         {
             name: "reactNamespace",
             type: "string",
+            affectsEmit: true,
             category: ts.Diagnostics.Advanced_Options,
             description: ts.Diagnostics.Deprecated_Use_jsxFactory_instead_Specify_the_object_invoked_for_createElement_when_targeting_react_JSX_emit
         },
@@ -24188,21 +24592,17 @@ var ts;
         {
             name: "emitBOM",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Advanced_Options,
             description: ts.Diagnostics.Emit_a_UTF_8_Byte_Order_Mark_BOM_in_the_beginning_of_output_files
         },
-        {
-            name: "locale",
-            type: "string",
-            category: ts.Diagnostics.Advanced_Options,
-            description: ts.Diagnostics.The_locale_used_when_displaying_messages_to_the_user_e_g_en_us
-        },
         {
             name: "newLine",
             type: ts.createMapFromTemplate({
                 crlf: 0 /* CarriageReturnLineFeed */,
                 lf: 1 /* LineFeed */
             }),
+            affectsEmit: true,
             paramType: ts.Diagnostics.NEWLINE,
             category: ts.Diagnostics.Advanced_Options,
             description: ts.Diagnostics.Specify_the_end_of_line_sequence_to_be_used_when_emitting_files_Colon_CRLF_dos_or_LF_unix,
@@ -24230,6 +24630,7 @@ var ts;
         {
             name: "stripInternal",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Advanced_Options,
             description: ts.Diagnostics.Do_not_emit_declarations_for_code_that_has_an_internal_annotation,
         },
@@ -24250,24 +24651,28 @@ var ts;
         {
             name: "noEmitHelpers",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Advanced_Options,
             description: ts.Diagnostics.Do_not_generate_custom_helper_functions_like_extends_in_compiled_output
         },
         {
             name: "noEmitOnError",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Advanced_Options,
             description: ts.Diagnostics.Do_not_emit_outputs_if_any_errors_were_reported,
         },
         {
             name: "preserveConstEnums",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Advanced_Options,
             description: ts.Diagnostics.Do_not_erase_const_enum_declarations_in_generated_code
         },
         {
             name: "declarationDir",
             type: "string",
+            affectsEmit: true,
             isFilePath: true,
             paramType: ts.Diagnostics.DIRECTORY,
             category: ts.Diagnostics.Advanced_Options,
@@ -24350,6 +24755,8 @@ var ts;
     /* @internal */
     ts.semanticDiagnosticsOptionDeclarations = ts.optionDeclarations.filter(function (option) { return !!option.affectsSemanticDiagnostics; });
     /* @internal */
+    ts.affectsEmitOptionDeclarations = ts.optionDeclarations.filter(function (option) { return !!option.affectsEmit; });
+    /* @internal */
     ts.moduleResolutionOptionDeclarations = ts.optionDeclarations.filter(function (option) { return !!option.affectsModuleResolution; });
     /* @internal */
     ts.sourceFileAffectingCompilerOptions = ts.optionDeclarations.filter(function (option) {
@@ -24436,9 +24843,11 @@ var ts;
         return typeAcquisition;
     }
     ts.convertEnableAutoDiscoveryToEnable = convertEnableAutoDiscoveryToEnable;
+    /* @internal */
     function getOptionNameMap() {
         return optionNameMapCache || (optionNameMapCache = createOptionNameMap(ts.optionDeclarations));
     }
+    ts.getOptionNameMap = getOptionNameMap;
     /*@internal*/
     function createOptionNameMap(optionDeclarations) {
         var optionNameMap = ts.createMap();
@@ -24757,7 +25166,7 @@ var ts;
     /**
      * Reads the config file, reports errors if any and exits if the config file cannot be found
      */
-    function getParsedCommandLineOfConfigFile(configFileName, optionsToExtend, host) {
+    function getParsedCommandLineOfConfigFile(configFileName, optionsToExtend, host, extendedConfigCache) {
         var configFileText;
         try {
             configFileText = host.readFile(configFileName);
@@ -24777,7 +25186,9 @@ var ts;
         result.path = ts.toPath(configFileName, cwd, ts.createGetCanonicalFileName(host.useCaseSensitiveFileNames));
         result.resolvedPath = result.path;
         result.originalFileName = result.fileName;
-        return parseJsonSourceFileConfigFileContent(result, host, ts.getNormalizedAbsolutePath(ts.getDirectoryPath(configFileName), cwd), optionsToExtend, ts.getNormalizedAbsolutePath(configFileName, cwd));
+        return parseJsonSourceFileConfigFileContent(result, host, ts.getNormalizedAbsolutePath(ts.getDirectoryPath(configFileName), cwd), optionsToExtend, ts.getNormalizedAbsolutePath(configFileName, cwd), 
+        /*resolutionStack*/ undefined, 
+        /*extraFileExtension*/ undefined, extendedConfigCache);
     }
     ts.getParsedCommandLineOfConfigFile = getParsedCommandLineOfConfigFile;
     /**
@@ -24916,7 +25327,7 @@ var ts;
             var result = returnValue ? {} : undefined;
             for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
                 var element = _a[_i];
-                if (element.kind !== 275 /* PropertyAssignment */) {
+                if (element.kind !== 276 /* PropertyAssignment */) {
                     errors.push(ts.createDiagnosticForNodeInSourceFile(sourceFile, element, ts.Diagnostics.Property_assignment_expected));
                     continue;
                 }
@@ -24972,13 +25383,13 @@ var ts;
         }
         function convertPropertyValueToJson(valueExpression, option) {
             switch (valueExpression.kind) {
-                case 102 /* TrueKeyword */:
+                case 103 /* TrueKeyword */:
                     reportInvalidOptionValue(option && option.type !== "boolean");
                     return true;
-                case 87 /* FalseKeyword */:
+                case 88 /* FalseKeyword */:
                     reportInvalidOptionValue(option && option.type !== "boolean");
                     return false;
-                case 96 /* NullKeyword */:
+                case 97 /* NullKeyword */:
                     reportInvalidOptionValue(option && option.name === "extends"); // "extends" is the only option we don't allow null/undefined for
                     return null; // tslint:disable-line:no-null-keyword
                 case 10 /* StringLiteral */:
@@ -24998,13 +25409,13 @@ var ts;
                 case 8 /* NumericLiteral */:
                     reportInvalidOptionValue(option && option.type !== "number");
                     return Number(valueExpression.text);
-                case 202 /* PrefixUnaryExpression */:
+                case 203 /* PrefixUnaryExpression */:
                     if (valueExpression.operator !== 39 /* MinusToken */ || valueExpression.operand.kind !== 8 /* NumericLiteral */) {
                         break; // not valid JSON syntax
                     }
                     reportInvalidOptionValue(option && option.type !== "number");
                     return -Number(valueExpression.operand.text);
-                case 188 /* ObjectLiteralExpression */:
+                case 189 /* ObjectLiteralExpression */:
                     reportInvalidOptionValue(option && option.type !== "object");
                     var objectLiteralExpression = valueExpression;
                     // Currently having element option declaration in the tsconfig with type "object"
@@ -25021,7 +25432,7 @@ var ts;
                         return convertObjectLiteralExpressionToJson(objectLiteralExpression, /* knownOptions*/ undefined, 
                         /*extraKeyDiagnosticMessage */ undefined, /*parentOption*/ undefined);
                     }
-                case 187 /* ArrayLiteralExpression */:
+                case 188 /* ArrayLiteralExpression */:
                     reportInvalidOptionValue(option && option.type !== "list");
                     return convertArrayLiteralExpressionToJson(valueExpression.elements, option && option.element);
             }
@@ -25193,7 +25604,10 @@ var ts;
                 case "object":
                     return {};
                 default:
-                    return option.type.keys().next().value;
+                    var iterResult = option.type.keys().next();
+                    if (!iterResult.done)
+                        return iterResult.value;
+                    return ts.Debug.fail("Expected 'option.type' to have entries.");
             }
         }
         function makePadding(paddingLength) {
@@ -25277,8 +25691,8 @@ var ts;
      * @param basePath A root directory to resolve relative path entries in the config
      *    file to. e.g. outDir
      */
-    function parseJsonConfigFileContent(json, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions) {
-        return parseJsonConfigFileContentWorker(json, /*sourceFile*/ undefined, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions);
+    function parseJsonConfigFileContent(json, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions, extendedConfigCache) {
+        return parseJsonConfigFileContentWorker(json, /*sourceFile*/ undefined, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions, extendedConfigCache);
     }
     ts.parseJsonConfigFileContent = parseJsonConfigFileContent;
     /**
@@ -25288,8 +25702,8 @@ var ts;
      * @param basePath A root directory to resolve relative path entries in the config
      *    file to. e.g. outDir
      */
-    function parseJsonSourceFileConfigFileContent(sourceFile, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions) {
-        return parseJsonConfigFileContentWorker(/*json*/ undefined, sourceFile, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions);
+    function parseJsonSourceFileConfigFileContent(sourceFile, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions, extendedConfigCache) {
+        return parseJsonConfigFileContentWorker(/*json*/ undefined, sourceFile, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions, extendedConfigCache);
     }
     ts.parseJsonSourceFileConfigFileContent = parseJsonSourceFileConfigFileContent;
     /*@internal*/
@@ -25317,13 +25731,13 @@ var ts;
      *    file to. e.g. outDir
      * @param resolutionStack Only present for backwards-compatibility. Should be empty.
      */
-    function parseJsonConfigFileContentWorker(json, sourceFile, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions) {
+    function parseJsonConfigFileContentWorker(json, sourceFile, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions, extendedConfigCache) {
         if (existingOptions === void 0) { existingOptions = {}; }
         if (resolutionStack === void 0) { resolutionStack = []; }
         if (extraFileExtensions === void 0) { extraFileExtensions = []; }
         ts.Debug.assert((json === undefined && sourceFile !== undefined) || (json !== undefined && sourceFile === undefined));
         var errors = [];
-        var parsedConfig = parseConfig(json, sourceFile, host, basePath, configFileName, resolutionStack, errors);
+        var parsedConfig = parseConfig(json, sourceFile, host, basePath, configFileName, resolutionStack, errors, extendedConfigCache);
         var raw = parsedConfig.raw;
         var options = ts.extend(existingOptions, parsedConfig.options || {});
         options.configFilePath = configFileName && ts.normalizeSlashes(configFileName);
@@ -25463,7 +25877,7 @@ var ts;
      * This *just* extracts options/include/exclude/files out of a config file.
      * It does *not* resolve the included files.
      */
-    function parseConfig(json, sourceFile, host, basePath, configFileName, resolutionStack, errors) {
+    function parseConfig(json, sourceFile, host, basePath, configFileName, resolutionStack, errors, extendedConfigCache) {
         basePath = ts.normalizeSlashes(basePath);
         var resolvedPath = ts.getNormalizedAbsolutePath(configFileName || "", basePath);
         if (resolutionStack.indexOf(resolvedPath) >= 0) {
@@ -25476,7 +25890,7 @@ var ts;
         if (ownConfig.extendedConfigPath) {
             // copy the resolution stack so it is never reused between branches in potential diamond-problem scenarios.
             resolutionStack = resolutionStack.concat([resolvedPath]);
-            var extendedConfig = getExtendedConfig(sourceFile, ownConfig.extendedConfigPath, host, basePath, resolutionStack, errors);
+            var extendedConfig = getExtendedConfig(sourceFile, ownConfig.extendedConfigPath, host, basePath, resolutionStack, errors, extendedConfigCache);
             if (extendedConfig && isSuccessfulParsedTsconfig(extendedConfig)) {
                 var baseRaw_1 = extendedConfig.raw;
                 var raw_1 = ownConfig.raw;
@@ -25573,7 +25987,7 @@ var ts;
             if (!host.fileExists(extendedConfigPath) && !ts.endsWith(extendedConfigPath, ".json" /* Json */)) {
                 extendedConfigPath = extendedConfigPath + ".json";
                 if (!host.fileExists(extendedConfigPath)) {
-                    errors.push(createDiagnostic(ts.Diagnostics.File_0_does_not_exist, extendedConfig));
+                    errors.push(createDiagnostic(ts.Diagnostics.File_0_not_found, extendedConfig));
                     return undefined;
                 }
             }
@@ -25584,38 +25998,52 @@ var ts;
         if (resolved.resolvedModule) {
             return resolved.resolvedModule.resolvedFileName;
         }
-        errors.push(createDiagnostic(ts.Diagnostics.File_0_does_not_exist, extendedConfig));
+        errors.push(createDiagnostic(ts.Diagnostics.File_0_not_found, extendedConfig));
         return undefined;
     }
-    function getExtendedConfig(sourceFile, extendedConfigPath, host, basePath, resolutionStack, errors) {
+    function getExtendedConfig(sourceFile, extendedConfigPath, host, basePath, resolutionStack, errors, extendedConfigCache) {
         var _a;
-        var extendedResult = readJsonConfigFile(extendedConfigPath, function (path) { return host.readFile(path); });
+        var path = host.useCaseSensitiveFileNames ? extendedConfigPath : ts.toLowerCase(extendedConfigPath);
+        var value;
+        var extendedResult;
+        var extendedConfig;
+        if (extendedConfigCache && (value = extendedConfigCache.get(path))) {
+            (extendedResult = value.extendedResult, extendedConfig = value.extendedConfig);
+        }
+        else {
+            extendedResult = readJsonConfigFile(extendedConfigPath, function (path) { return host.readFile(path); });
+            if (!extendedResult.parseDiagnostics.length) {
+                var extendedDirname = ts.getDirectoryPath(extendedConfigPath);
+                extendedConfig = parseConfig(/*json*/ undefined, extendedResult, host, extendedDirname, ts.getBaseFileName(extendedConfigPath), resolutionStack, errors, extendedConfigCache);
+                if (isSuccessfulParsedTsconfig(extendedConfig)) {
+                    // Update the paths to reflect base path
+                    var relativeDifference_1 = ts.convertToRelativePath(extendedDirname, basePath, ts.identity);
+                    var updatePath_1 = function (path) { return ts.isRootedDiskPath(path) ? path : ts.combinePaths(relativeDifference_1, path); };
+                    var mapPropertiesInRawIfNotUndefined = function (propertyName) {
+                        if (raw_2[propertyName]) {
+                            raw_2[propertyName] = ts.map(raw_2[propertyName], updatePath_1);
+                        }
+                    };
+                    var raw_2 = extendedConfig.raw;
+                    mapPropertiesInRawIfNotUndefined("include");
+                    mapPropertiesInRawIfNotUndefined("exclude");
+                    mapPropertiesInRawIfNotUndefined("files");
+                }
+            }
+            if (extendedConfigCache) {
+                extendedConfigCache.set(path, { extendedResult: extendedResult, extendedConfig: extendedConfig });
+            }
+        }
         if (sourceFile) {
             sourceFile.extendedSourceFiles = [extendedResult.fileName];
+            if (extendedResult.extendedSourceFiles) {
+                (_a = sourceFile.extendedSourceFiles).push.apply(_a, extendedResult.extendedSourceFiles);
+            }
         }
         if (extendedResult.parseDiagnostics.length) {
             errors.push.apply(errors, extendedResult.parseDiagnostics);
             return undefined;
         }
-        var extendedDirname = ts.getDirectoryPath(extendedConfigPath);
-        var extendedConfig = parseConfig(/*json*/ undefined, extendedResult, host, extendedDirname, ts.getBaseFileName(extendedConfigPath), resolutionStack, errors);
-        if (sourceFile && extendedResult.extendedSourceFiles) {
-            (_a = sourceFile.extendedSourceFiles).push.apply(_a, extendedResult.extendedSourceFiles);
-        }
-        if (isSuccessfulParsedTsconfig(extendedConfig)) {
-            // Update the paths to reflect base path
-            var relativeDifference_1 = ts.convertToRelativePath(extendedDirname, basePath, ts.identity);
-            var updatePath_1 = function (path) { return ts.isRootedDiskPath(path) ? path : ts.combinePaths(relativeDifference_1, path); };
-            var mapPropertiesInRawIfNotUndefined = function (propertyName) {
-                if (raw_2[propertyName]) {
-                    raw_2[propertyName] = ts.map(raw_2[propertyName], updatePath_1);
-                }
-            };
-            var raw_2 = extendedConfig.raw;
-            mapPropertiesInRawIfNotUndefined("include");
-            mapPropertiesInRawIfNotUndefined("exclude");
-            mapPropertiesInRawIfNotUndefined("files");
-        }
         return extendedConfig;
     }
     function convertCompileOnSaveOptionFromJson(jsonOption, basePath, errors) {
@@ -26085,11 +26513,22 @@ var ts;
         return !!compilerOptions.traceResolution && host.trace !== undefined;
     }
     ts.isTraceEnabled = isTraceEnabled;
-    function withPackageId(packageId, r) {
+    function withPackageId(packageInfo, r) {
+        var packageId;
+        if (r && packageInfo) {
+            var packageJsonContent = packageInfo.packageJsonContent;
+            if (typeof packageJsonContent.name === "string" && typeof packageJsonContent.version === "string") {
+                packageId = {
+                    name: packageJsonContent.name,
+                    subModuleName: r.path.slice(packageInfo.packageDirectory.length + ts.directorySeparator.length),
+                    version: packageJsonContent.version
+                };
+            }
+        }
         return r && { path: r.path, extension: r.ext, packageId: packageId };
     }
     function noPackageId(r) {
-        return withPackageId(/*packageId*/ undefined, r);
+        return withPackageId(/*packageInfo*/ undefined, r);
     }
     function removeIgnoredPackageId(r) {
         if (r) {
@@ -26141,8 +26580,15 @@ var ts;
     }
     function readPackageJsonPathField(jsonContent, fieldName, baseDirectory, state) {
         var fileName = readPackageJsonField(jsonContent, fieldName, "string", state);
-        if (fileName === undefined)
+        if (fileName === undefined) {
             return;
+        }
+        if (!fileName) {
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.package_json_had_a_falsy_0_field, fieldName);
+            }
+            return;
+        }
         var path = ts.normalizePath(ts.combinePaths(baseDirectory, fileName));
         if (state.traceEnabled) {
             trace(state.host, ts.Diagnostics.package_json_has_0_field_1_that_references_2, fieldName, fileName, path);
@@ -26295,7 +26741,12 @@ var ts;
             var fileName = resolved.fileName, packageId = resolved.packageId;
             var resolvedFileName = options.preserveSymlinks ? fileName : realPath(fileName, host, traceEnabled);
             if (traceEnabled) {
-                trace(host, ts.Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2, typeReferenceDirectiveName, resolvedFileName, primary);
+                if (packageId) {
+                    trace(host, ts.Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_with_Package_ID_2_primary_Colon_3, typeReferenceDirectiveName, resolvedFileName, ts.packageIdToString(packageId), primary);
+                }
+                else {
+                    trace(host, ts.Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2, typeReferenceDirectiveName, resolvedFileName, primary);
+                }
             }
             resolvedTypeReferenceDirective = { primary: primary, resolvedFileName: resolvedFileName, packageId: packageId, isExternalLibraryImport: pathContainsNodeModules(fileName) };
         }
@@ -26397,20 +26848,28 @@ var ts;
         return result;
     }
     ts.getAutomaticTypeDirectiveNames = getAutomaticTypeDirectiveNames;
-    function createModuleResolutionCache(currentDirectory, getCanonicalFileName) {
-        return createModuleResolutionCacheWithMaps(createCacheWithRedirects(), createCacheWithRedirects(), currentDirectory, getCanonicalFileName);
+    function createModuleResolutionCache(currentDirectory, getCanonicalFileName, options) {
+        return createModuleResolutionCacheWithMaps(createCacheWithRedirects(options), createCacheWithRedirects(options), currentDirectory, getCanonicalFileName);
     }
     ts.createModuleResolutionCache = createModuleResolutionCache;
     /*@internal*/
-    function createCacheWithRedirects() {
+    function createCacheWithRedirects(options) {
         var ownMap = ts.createMap();
         var redirectsMap = ts.createMap();
         return {
             ownMap: ownMap,
             redirectsMap: redirectsMap,
             getOrCreateMapOfCacheRedirects: getOrCreateMapOfCacheRedirects,
-            clear: clear
+            clear: clear,
+            setOwnOptions: setOwnOptions,
+            setOwnMap: setOwnMap
         };
+        function setOwnOptions(newOptions) {
+            options = newOptions;
+        }
+        function setOwnMap(newOwnMap) {
+            ownMap = newOwnMap;
+        }
         function getOrCreateMapOfCacheRedirects(redirectedReference) {
             if (!redirectedReference) {
                 return ownMap;
@@ -26418,7 +26877,8 @@ var ts;
             var path = redirectedReference.sourceFile.path;
             var redirects = redirectsMap.get(path);
             if (!redirects) {
-                redirects = ts.createMap();
+                // Reuse map if redirected reference map uses same resolution
+                redirects = !options || ts.optionsHaveModuleResolutionChanges(options, redirectedReference.commandLine.options) ? ts.createMap() : ownMap;
                 redirectsMap.set(path, redirects);
             }
             return redirects;
@@ -26431,7 +26891,7 @@ var ts;
     ts.createCacheWithRedirects = createCacheWithRedirects;
     /*@internal*/
     function createModuleResolutionCacheWithMaps(directoryToModuleNameMap, moduleNameToDirectoryMap, currentDirectory, getCanonicalFileName) {
-        return { getOrCreateCacheForDirectory: getOrCreateCacheForDirectory, getOrCreateCacheForModuleName: getOrCreateCacheForModuleName };
+        return { getOrCreateCacheForDirectory: getOrCreateCacheForDirectory, getOrCreateCacheForModuleName: getOrCreateCacheForModuleName, directoryToModuleNameMap: directoryToModuleNameMap, moduleNameToDirectoryMap: moduleNameToDirectoryMap };
         function getOrCreateCacheForDirectory(directoryName, redirectedReference) {
             var path = ts.toPath(directoryName, currentDirectory, getCanonicalFileName);
             return getOrCreateCache(directoryToModuleNameMap, redirectedReference, path, ts.createMap);
@@ -26574,7 +27034,12 @@ var ts;
         }
         if (traceEnabled) {
             if (result.resolvedModule) {
-                trace(host, ts.Diagnostics.Module_name_0_was_successfully_resolved_to_1, moduleName, result.resolvedModule.resolvedFileName);
+                if (result.resolvedModule.packageId) {
+                    trace(host, ts.Diagnostics.Module_name_0_was_successfully_resolved_to_1_with_Package_ID_2, moduleName, result.resolvedModule.resolvedFileName, ts.packageIdToString(result.resolvedModule.packageId));
+                }
+                else {
+                    trace(host, ts.Diagnostics.Module_name_0_was_successfully_resolved_to_1, moduleName, result.resolvedModule.resolvedFileName);
+                }
             }
             else {
                 trace(host, ts.Diagnostics.Module_name_0_was_not_resolved, moduleName);
@@ -26844,10 +27309,9 @@ var ts;
             }
             var resolvedFromFile = loadModuleFromFile(extensions, candidate, onlyRecordFailures, state);
             if (resolvedFromFile) {
-                var nm = considerPackageJson ? parseNodeModuleFromPath(resolvedFromFile) : undefined;
-                var packageInfo = nm && getPackageJsonInfo(nm.packageDirectory, nm.subModuleName, /*onlyRecordFailures*/ false, state);
-                var packageId = packageInfo && packageInfo.packageId;
-                return withPackageId(packageId, resolvedFromFile);
+                var packageDirectory = considerPackageJson ? parseNodeModuleFromPath(resolvedFromFile) : undefined;
+                var packageInfo = packageDirectory ? getPackageJsonInfo(packageDirectory, /*onlyRecordFailures*/ false, state) : undefined;
+                return withPackageId(packageInfo, resolvedFromFile);
             }
         }
         if (!onlyRecordFailures) {
@@ -26873,11 +27337,10 @@ var ts;
      * (Not neeeded for `loadModuleFromNodeModules` as that looks up the `package.json` as part of resolution.)
      *
      * packageDirectory is the directory of the package itself.
-     * subModuleName is the path within the package.
-     *   For `blah/node_modules/foo/index.d.ts` this is { packageDirectory: "foo", subModuleName: "index.d.ts" }. (Part before "/node_modules/" is ignored.)
-     *   For `/node_modules/foo/bar.d.ts` this is { packageDirectory: "foo", subModuleName": "bar/index.d.ts" }.
-     *   For `/node_modules/@types/foo/bar/index.d.ts` this is { packageDirectory: "@types/foo", subModuleName: "bar/index.d.ts" }.
-     *   For `/node_modules/foo/bar/index.d.ts` this is { packageDirectory: "foo", subModuleName": "bar/index.d.ts" }.
+     *   For `blah/node_modules/foo/index.d.ts` this is packageDirectory: "foo"
+     *   For `/node_modules/foo/bar.d.ts` this is packageDirectory: "foo"
+     *   For `/node_modules/@types/foo/bar/index.d.ts` this is packageDirectory: "@types/foo"
+     *   For `/node_modules/foo/bar/index.d.ts` this is packageDirectory: "foo"
      */
     function parseNodeModuleFromPath(resolved) {
         var path = ts.normalizePath(resolved.path);
@@ -26890,26 +27353,12 @@ var ts;
         if (path.charCodeAt(indexAfterNodeModules) === 64 /* at */) {
             indexAfterPackageName = moveToNextDirectorySeparatorIfAvailable(path, indexAfterPackageName);
         }
-        var packageDirectory = path.slice(0, indexAfterPackageName);
-        var subModuleName = ts.removeExtension(path.slice(indexAfterPackageName + 1), resolved.ext) + ".d.ts" /* Dts */;
-        return { packageDirectory: packageDirectory, subModuleName: subModuleName };
+        return path.slice(0, indexAfterPackageName);
     }
     function moveToNextDirectorySeparatorIfAvailable(path, prevSeparatorIndex) {
         var nextSeparatorIndex = path.indexOf(ts.directorySeparator, prevSeparatorIndex + 1);
         return nextSeparatorIndex === -1 ? prevSeparatorIndex : nextSeparatorIndex;
     }
-    function addExtensionAndIndex(path) {
-        if (path === "") {
-            return "index.d.ts";
-        }
-        if (ts.endsWith(path, ".d.ts")) {
-            return path;
-        }
-        if (path === "index" || ts.endsWith(path, "/index")) {
-            return path + ".d.ts";
-        }
-        return path + "/index.d.ts";
-    }
     function loadModuleFromFileNoPackageId(extensions, candidate, onlyRecordFailures, state) {
         return noPackageId(loadModuleFromFile(extensions, candidate, onlyRecordFailures, state));
     }
@@ -26983,52 +27432,22 @@ var ts;
     }
     function loadNodeModuleFromDirectory(extensions, candidate, onlyRecordFailures, state, considerPackageJson) {
         if (considerPackageJson === void 0) { considerPackageJson = true; }
-        var packageInfo = considerPackageJson ? getPackageJsonInfo(candidate, "", onlyRecordFailures, state) : undefined;
-        var packageId = packageInfo && packageInfo.packageId;
+        var packageInfo = considerPackageJson ? getPackageJsonInfo(candidate, onlyRecordFailures, state) : undefined;
         var packageJsonContent = packageInfo && packageInfo.packageJsonContent;
-        var versionPaths = packageJsonContent && readPackageJsonTypesVersionPaths(packageJsonContent, state);
-        return withPackageId(packageId, loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageJsonContent, versionPaths));
+        var versionPaths = packageInfo && packageInfo.versionPaths;
+        return withPackageId(packageInfo, loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageJsonContent, versionPaths));
     }
-    function getPackageJsonInfo(packageDirectory, subModuleName, onlyRecordFailures, state) {
+    function getPackageJsonInfo(packageDirectory, onlyRecordFailures, state) {
         var host = state.host, traceEnabled = state.traceEnabled;
         var directoryExists = !onlyRecordFailures && ts.directoryProbablyExists(packageDirectory, host);
         var packageJsonPath = ts.combinePaths(packageDirectory, "package.json");
         if (directoryExists && host.fileExists(packageJsonPath)) {
             var packageJsonContent = ts.readJson(packageJsonPath, host);
-            if (subModuleName === "") { // looking up the root - need to handle types/typings/main redirects for subModuleName
-                var path = readPackageJsonTypesFields(packageJsonContent, packageDirectory, state);
-                if (typeof path === "string") {
-                    subModuleName = addExtensionAndIndex(path.substring(packageDirectory.length + 1));
-                }
-                else {
-                    var jsPath = readPackageJsonMainField(packageJsonContent, packageDirectory, state);
-                    if (typeof jsPath === "string" && jsPath.length > packageDirectory.length) {
-                        var potentialSubModule_1 = jsPath.substring(packageDirectory.length + 1);
-                        subModuleName = (ts.forEach(ts.supportedJSExtensions, function (extension) {
-                            return ts.tryRemoveExtension(potentialSubModule_1, extension);
-                        }) || potentialSubModule_1) + ".d.ts" /* Dts */;
-                    }
-                    else {
-                        subModuleName = "index.d.ts";
-                    }
-                }
-            }
-            if (!ts.endsWith(subModuleName, ".d.ts" /* Dts */)) {
-                subModuleName = addExtensionAndIndex(subModuleName);
+            if (traceEnabled) {
+                trace(host, ts.Diagnostics.Found_package_json_at_0, packageJsonPath);
             }
             var versionPaths = readPackageJsonTypesVersionPaths(packageJsonContent, state);
-            var packageId = typeof packageJsonContent.name === "string" && typeof packageJsonContent.version === "string"
-                ? { name: packageJsonContent.name, subModuleName: subModuleName, version: packageJsonContent.version }
-                : undefined;
-            if (traceEnabled) {
-                if (packageId) {
-                    trace(host, ts.Diagnostics.Found_package_json_at_0_Package_ID_is_1, packageJsonPath, ts.packageIdToString(packageId));
-                }
-                else {
-                    trace(host, ts.Diagnostics.Found_package_json_at_0, packageJsonPath);
-                }
-            }
-            return { packageJsonContent: packageJsonContent, packageId: packageId, versionPaths: versionPaths };
+            return { packageDirectory: packageDirectory, packageJsonContent: packageJsonContent, versionPaths: versionPaths };
         }
         else {
             if (directoryExists && traceEnabled) {
@@ -27167,37 +27586,31 @@ var ts;
     function loadModuleFromSpecificNodeModulesDirectory(extensions, moduleName, nodeModulesDirectory, nodeModulesDirectoryExists, state) {
         var candidate = ts.normalizePath(ts.combinePaths(nodeModulesDirectory, moduleName));
         // First look for a nested package.json, as in `node_modules/foo/bar/package.json`.
-        var packageJsonContent;
-        var packageId;
-        var versionPaths;
-        var packageInfo = getPackageJsonInfo(candidate, "", !nodeModulesDirectoryExists, state);
+        var packageInfo = getPackageJsonInfo(candidate, !nodeModulesDirectoryExists, state);
         if (packageInfo) {
-            (packageJsonContent = packageInfo.packageJsonContent, packageId = packageInfo.packageId, versionPaths = packageInfo.versionPaths);
             var fromFile = loadModuleFromFile(extensions, candidate, !nodeModulesDirectoryExists, state);
             if (fromFile) {
                 return noPackageId(fromFile);
             }
-            var fromDirectory = loadNodeModuleFromDirectoryWorker(extensions, candidate, !nodeModulesDirectoryExists, state, packageJsonContent, versionPaths);
-            return withPackageId(packageId, fromDirectory);
+            var fromDirectory = loadNodeModuleFromDirectoryWorker(extensions, candidate, !nodeModulesDirectoryExists, state, packageInfo.packageJsonContent, packageInfo.versionPaths);
+            return withPackageId(packageInfo, fromDirectory);
         }
         var loader = function (extensions, candidate, onlyRecordFailures, state) {
             var pathAndExtension = loadModuleFromFile(extensions, candidate, onlyRecordFailures, state) ||
-                loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageJsonContent, versionPaths);
-            return withPackageId(packageId, pathAndExtension);
+                loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageInfo && packageInfo.packageJsonContent, packageInfo && packageInfo.versionPaths);
+            return withPackageId(packageInfo, pathAndExtension);
         };
         var _a = parsePackageName(moduleName), packageName = _a.packageName, rest = _a.rest;
         if (rest !== "") { // If "rest" is empty, we just did this search above.
             var packageDirectory = ts.combinePaths(nodeModulesDirectory, packageName);
             // Don't use a "types" or "main" from here because we're not loading the root, but a subdirectory -- just here for the packageId and path mappings.
-            var packageInfo_1 = getPackageJsonInfo(packageDirectory, rest, !nodeModulesDirectoryExists, state);
-            if (packageInfo_1)
-                (packageId = packageInfo_1.packageId, versionPaths = packageInfo_1.versionPaths);
-            if (versionPaths) {
+            packageInfo = getPackageJsonInfo(packageDirectory, !nodeModulesDirectoryExists, state);
+            if (packageInfo && packageInfo.versionPaths) {
                 if (state.traceEnabled) {
-                    trace(state.host, ts.Diagnostics.package_json_has_a_typesVersions_entry_0_that_matches_compiler_version_1_looking_for_a_pattern_to_match_module_name_2, versionPaths.version, ts.version, rest);
+                    trace(state.host, ts.Diagnostics.package_json_has_a_typesVersions_entry_0_that_matches_compiler_version_1_looking_for_a_pattern_to_match_module_name_2, packageInfo.versionPaths.version, ts.version, rest);
                 }
                 var packageDirectoryExists = nodeModulesDirectoryExists && ts.directoryProbablyExists(packageDirectory, state.host);
-                var fromPaths = tryLoadModuleUsingPaths(extensions, rest, packageDirectory, versionPaths.paths, loader, !packageDirectoryExists, state);
+                var fromPaths = tryLoadModuleUsingPaths(extensions, rest, packageDirectory, packageInfo.versionPaths.paths, loader, !packageDirectoryExists, state);
                 if (fromPaths) {
                     return fromPaths.value;
                 }
@@ -27325,8 +27738,8 @@ var ts;
     }
     ts.classicNameResolver = classicNameResolver;
     /**
-     * LSHost may load a module from a global cache of typings.
-     * This is the minumum code needed to expose that functionality; the rest is in LSHost.
+     * A host may load a module from a global cache of typings.
+     * This is the minumum code needed to expose that functionality; the rest is in the host.
      */
     /* @internal */
     function loadModuleFromGlobalCache(moduleName, projectName, compilerOptions, host, globalCache) {
@@ -27365,24 +27778,24 @@ var ts;
         // A module is uninstantiated if it contains only
         switch (node.kind) {
             // 1. interface declarations, type alias declarations
-            case 241 /* InterfaceDeclaration */:
-            case 242 /* TypeAliasDeclaration */:
+            case 242 /* InterfaceDeclaration */:
+            case 243 /* TypeAliasDeclaration */:
                 return 0 /* NonInstantiated */;
             // 2. const enum declarations
-            case 243 /* EnumDeclaration */:
+            case 244 /* EnumDeclaration */:
                 if (ts.isEnumConst(node)) {
                     return 2 /* ConstEnumOnly */;
                 }
                 break;
             // 3. non-exported import declarations
-            case 249 /* ImportDeclaration */:
-            case 248 /* ImportEqualsDeclaration */:
+            case 250 /* ImportDeclaration */:
+            case 249 /* ImportEqualsDeclaration */:
                 if (!(ts.hasModifier(node, 1 /* Export */))) {
                     return 0 /* NonInstantiated */;
                 }
                 break;
             // 4. other uninstantiated module declarations.
-            case 245 /* ModuleBlock */: {
+            case 246 /* ModuleBlock */: {
                 var state_1 = 0 /* NonInstantiated */;
                 ts.forEachChild(node, function (n) {
                     var childState = getModuleInstanceStateWorker(n);
@@ -27404,9 +27817,9 @@ var ts;
                 });
                 return state_1;
             }
-            case 244 /* ModuleDeclaration */:
+            case 245 /* ModuleDeclaration */:
                 return getModuleInstanceState(node);
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 // Only jsdoc typedef definition can exist in jsdoc namespace, and it should
                 // be considered the same as type alias
                 if (node.isInJSDocNamespace) {
@@ -27572,7 +27985,7 @@ var ts;
         // Should not be called on a declaration with a computed property name,
         // unless it is a well known Symbol.
         function getDeclarationName(node) {
-            if (node.kind === 254 /* ExportAssignment */) {
+            if (node.kind === 255 /* ExportAssignment */) {
                 return node.isExportEquals ? "export=" /* ExportEquals */ : "default" /* Default */;
             }
             var name = ts.getNameOfDeclaration(node);
@@ -27581,48 +27994,51 @@ var ts;
                     var moduleName = ts.getTextOfIdentifierOrLiteral(name);
                     return (ts.isGlobalScopeAugmentation(node) ? "__global" : "\"" + moduleName + "\"");
                 }
-                if (name.kind === 149 /* ComputedPropertyName */) {
+                if (name.kind === 150 /* ComputedPropertyName */) {
                     var nameExpression = name.expression;
                     // treat computed property names where expression is string/numeric literal as just string/numeric literal
                     if (ts.isStringOrNumericLiteralLike(nameExpression)) {
                         return ts.escapeLeadingUnderscores(nameExpression.text);
                     }
+                    if (ts.isSignedNumericLiteral(nameExpression)) {
+                        return ts.tokenToString(nameExpression.operator) + nameExpression.operand.text;
+                    }
                     ts.Debug.assert(ts.isWellKnownSymbolSyntactically(nameExpression));
                     return ts.getPropertyNameForKnownSymbolName(ts.idText(nameExpression.name));
                 }
                 return ts.isPropertyNameLiteral(name) ? ts.getEscapedTextOfIdentifierOrLiteral(name) : undefined;
             }
             switch (node.kind) {
-                case 157 /* Constructor */:
+                case 158 /* Constructor */:
                     return "__constructor" /* Constructor */;
-                case 165 /* FunctionType */:
-                case 160 /* CallSignature */:
-                case 298 /* JSDocSignature */:
+                case 166 /* FunctionType */:
+                case 161 /* CallSignature */:
+                case 299 /* JSDocSignature */:
                     return "__call" /* Call */;
-                case 166 /* ConstructorType */:
-                case 161 /* ConstructSignature */:
+                case 167 /* ConstructorType */:
+                case 162 /* ConstructSignature */:
                     return "__new" /* New */;
-                case 162 /* IndexSignature */:
+                case 163 /* IndexSignature */:
                     return "__index" /* Index */;
-                case 255 /* ExportDeclaration */:
+                case 256 /* ExportDeclaration */:
                     return "__export" /* ExportStar */;
-                case 284 /* SourceFile */:
+                case 285 /* SourceFile */:
                     // json file should behave as
                     // module.exports = ...
                     return "export=" /* ExportEquals */;
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     if (ts.getAssignmentDeclarationKind(node) === 2 /* ModuleExports */) {
                         // module.exports = ...
                         return "export=" /* ExportEquals */;
                     }
                     ts.Debug.fail("Unknown binary declaration kind");
                     break;
-                case 294 /* JSDocFunctionType */:
+                case 295 /* JSDocFunctionType */:
                     return (ts.isJSDocConstructSignature(node) ? "__new" /* New */ : "__call" /* Call */);
-                case 151 /* Parameter */:
+                case 152 /* Parameter */:
                     // Parameters with names are handled at the top of this function.  Parameters
                     // without names can only come from JSDocFunctionTypes.
-                    ts.Debug.assert(node.parent.kind === 294 /* JSDocFunctionType */, "Impossible parameter parent kind", function () { return "parent is: " + (ts.SyntaxKind ? ts.SyntaxKind[node.parent.kind] : node.parent.kind) + ", expected JSDocFunctionType"; });
+                    ts.Debug.assert(node.parent.kind === 295 /* JSDocFunctionType */, "Impossible parameter parent kind", function () { return "parent is: " + (ts.SyntaxKind ? ts.SyntaxKind[node.parent.kind] : node.parent.kind) + ", expected JSDocFunctionType"; });
                     var functionType = node.parent;
                     var index = functionType.parameters.indexOf(node);
                     return "arg" + index;
@@ -27706,13 +28122,15 @@ var ts;
                             message_1 = ts.Diagnostics.Enum_declarations_can_only_merge_with_namespace_or_other_enum_declarations;
                             messageNeedsName_1 = false;
                         }
-                        if (symbol.declarations && symbol.declarations.length) {
+                        var multipleDefaultExports_1 = false;
+                        if (ts.length(symbol.declarations)) {
                             // If the current node is a default export of some sort, then check if
                             // there are any other default exports that we need to error on.
                             // We'll know whether we have other default exports depending on if `symbol` already has a declaration list set.
                             if (isDefaultExport) {
                                 message_1 = ts.Diagnostics.A_module_cannot_have_multiple_default_exports;
                                 messageNeedsName_1 = false;
+                                multipleDefaultExports_1 = true;
                             }
                             else {
                                 // This is to properly report an error in the case "export default { }" is after export default of class declaration or function declaration.
@@ -27720,17 +28138,25 @@ var ts;
                                 // 1. multiple export default of class declaration or function declaration by checking NodeFlags.Default
                                 // 2. multiple export default of export assignment. This one doesn't have NodeFlags.Default on (as export default doesn't considered as modifiers)
                                 if (symbol.declarations && symbol.declarations.length &&
-                                    (node.kind === 254 /* ExportAssignment */ && !node.isExportEquals)) {
+                                    (node.kind === 255 /* ExportAssignment */ && !node.isExportEquals)) {
                                     message_1 = ts.Diagnostics.A_module_cannot_have_multiple_default_exports;
                                     messageNeedsName_1 = false;
+                                    multipleDefaultExports_1 = true;
                                 }
                             }
                         }
-                        var addError = function (decl) {
-                            file.bindDiagnostics.push(createDiagnosticForNode(ts.getNameOfDeclaration(decl) || decl, message_1, messageNeedsName_1 ? getDisplayName(decl) : undefined));
-                        };
-                        ts.forEach(symbol.declarations, addError);
-                        addError(node);
+                        var declarationName_1 = ts.getNameOfDeclaration(node) || node;
+                        var relatedInformation_1 = [];
+                        ts.forEach(symbol.declarations, function (declaration, index) {
+                            var decl = ts.getNameOfDeclaration(declaration) || declaration;
+                            var diag = createDiagnosticForNode(decl, message_1, messageNeedsName_1 ? getDisplayName(declaration) : undefined);
+                            file.bindDiagnostics.push(multipleDefaultExports_1 ? ts.addRelatedInfo(diag, createDiagnosticForNode(declarationName_1, index === 0 ? ts.Diagnostics.Another_export_default_is_here : ts.Diagnostics.and_here)) : diag);
+                            if (multipleDefaultExports_1) {
+                                relatedInformation_1.push(createDiagnosticForNode(decl, ts.Diagnostics.The_first_export_default_is_here));
+                            }
+                        });
+                        var diag = createDiagnosticForNode(declarationName_1, message_1, messageNeedsName_1 ? getDisplayName(node) : undefined);
+                        file.bindDiagnostics.push(multipleDefaultExports_1 ? ts.addRelatedInfo.apply(void 0, [diag].concat(relatedInformation_1)) : diag);
                         symbol = createSymbol(0 /* None */, name);
                     }
                 }
@@ -27747,7 +28173,7 @@ var ts;
         function declareModuleMember(node, symbolFlags, symbolExcludes) {
             var hasExportModifier = ts.getCombinedModifierFlags(node) & 1 /* Export */;
             if (symbolFlags & 2097152 /* Alias */) {
-                if (node.kind === 257 /* ExportSpecifier */ || (node.kind === 248 /* ImportEqualsDeclaration */ && hasExportModifier)) {
+                if (node.kind === 258 /* ExportSpecifier */ || (node.kind === 249 /* ImportEqualsDeclaration */ && hasExportModifier)) {
                     return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);
                 }
                 else {
@@ -27814,7 +28240,7 @@ var ts;
             // for it.  We must clear this so we don't accidentally move any stale data forward from
             // a previous compilation.
             if (containerFlags & 1 /* IsContainer */) {
-                if (node.kind !== 197 /* ArrowFunction */) {
+                if (node.kind !== 198 /* ArrowFunction */) {
                     thisParentContainer = container;
                 }
                 container = blockScopeContainer = node;
@@ -27847,7 +28273,7 @@ var ts;
                 }
                 // We create a return control flow graph for IIFEs and constructors. For constructors
                 // we use the return control flow graph in strict property initialization checks.
-                currentReturnTarget = isIIFE || node.kind === 157 /* Constructor */ ? createBranchLabel() : undefined;
+                currentReturnTarget = isIIFE || node.kind === 158 /* Constructor */ ? createBranchLabel() : undefined;
                 currentBreakTarget = undefined;
                 currentContinueTarget = undefined;
                 activeLabels = undefined;
@@ -27861,13 +28287,13 @@ var ts;
                     if (hasExplicitReturn)
                         node.flags |= 256 /* HasExplicitReturn */;
                 }
-                if (node.kind === 284 /* SourceFile */) {
+                if (node.kind === 285 /* SourceFile */) {
                     node.flags |= emitFlags;
                 }
                 if (currentReturnTarget) {
                     addAntecedent(currentReturnTarget, currentFlow);
                     currentFlow = finishFlowLabel(currentReturnTarget);
-                    if (node.kind === 157 /* Constructor */) {
+                    if (node.kind === 158 /* Constructor */) {
                         node.returnFlowNode = currentFlow;
                     }
                 }
@@ -27911,8 +28337,8 @@ var ts;
             }
         }
         function bindEachFunctionsFirst(nodes) {
-            bindEach(nodes, function (n) { return n.kind === 239 /* FunctionDeclaration */ ? bind(n) : undefined; });
-            bindEach(nodes, function (n) { return n.kind !== 239 /* FunctionDeclaration */ ? bind(n) : undefined; });
+            bindEach(nodes, function (n) { return n.kind === 240 /* FunctionDeclaration */ ? bind(n) : undefined; });
+            bindEach(nodes, function (n) { return n.kind !== 240 /* FunctionDeclaration */ ? bind(n) : undefined; });
         }
         function bindEach(nodes, bindFunction) {
             if (bindFunction === void 0) { bindFunction = bind; }
@@ -27945,78 +28371,78 @@ var ts;
                 return;
             }
             switch (node.kind) {
-                case 224 /* WhileStatement */:
+                case 225 /* WhileStatement */:
                     bindWhileStatement(node);
                     break;
-                case 223 /* DoStatement */:
+                case 224 /* DoStatement */:
                     bindDoStatement(node);
                     break;
-                case 225 /* ForStatement */:
+                case 226 /* ForStatement */:
                     bindForStatement(node);
                     break;
-                case 226 /* ForInStatement */:
-                case 227 /* ForOfStatement */:
+                case 227 /* ForInStatement */:
+                case 228 /* ForOfStatement */:
                     bindForInOrForOfStatement(node);
                     break;
-                case 222 /* IfStatement */:
+                case 223 /* IfStatement */:
                     bindIfStatement(node);
                     break;
-                case 230 /* ReturnStatement */:
-                case 234 /* ThrowStatement */:
+                case 231 /* ReturnStatement */:
+                case 235 /* ThrowStatement */:
                     bindReturnOrThrow(node);
                     break;
-                case 229 /* BreakStatement */:
-                case 228 /* ContinueStatement */:
+                case 230 /* BreakStatement */:
+                case 229 /* ContinueStatement */:
                     bindBreakOrContinueStatement(node);
                     break;
-                case 235 /* TryStatement */:
+                case 236 /* TryStatement */:
                     bindTryStatement(node);
                     break;
-                case 232 /* SwitchStatement */:
+                case 233 /* SwitchStatement */:
                     bindSwitchStatement(node);
                     break;
-                case 246 /* CaseBlock */:
+                case 247 /* CaseBlock */:
                     bindCaseBlock(node);
                     break;
-                case 271 /* CaseClause */:
+                case 272 /* CaseClause */:
                     bindCaseClause(node);
                     break;
-                case 233 /* LabeledStatement */:
+                case 234 /* LabeledStatement */:
                     bindLabeledStatement(node);
                     break;
-                case 202 /* PrefixUnaryExpression */:
+                case 203 /* PrefixUnaryExpression */:
                     bindPrefixUnaryExpressionFlow(node);
                     break;
-                case 203 /* PostfixUnaryExpression */:
+                case 204 /* PostfixUnaryExpression */:
                     bindPostfixUnaryExpressionFlow(node);
                     break;
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     bindBinaryExpressionFlow(node);
                     break;
-                case 198 /* DeleteExpression */:
+                case 199 /* DeleteExpression */:
                     bindDeleteExpressionFlow(node);
                     break;
-                case 205 /* ConditionalExpression */:
+                case 206 /* ConditionalExpression */:
                     bindConditionalExpressionFlow(node);
                     break;
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     bindVariableDeclarationFlow(node);
                     break;
-                case 191 /* CallExpression */:
+                case 192 /* CallExpression */:
                     bindCallExpressionFlow(node);
                     break;
-                case 309 /* JSDocTypedefTag */:
-                case 302 /* JSDocCallbackTag */:
+                case 311 /* JSDocTypedefTag */:
+                case 304 /* JSDocCallbackTag */:
                     bindJSDocTypeAlias(node);
                     break;
                 // In source files and blocks, bind functions first to match hoisting that occurs at runtime
-                case 284 /* SourceFile */: {
+                case 285 /* SourceFile */: {
                     bindEachFunctionsFirst(node.statements);
                     bind(node.endOfFileToken);
                     break;
                 }
-                case 218 /* Block */:
-                case 245 /* ModuleBlock */:
+                case 219 /* Block */:
+                case 246 /* ModuleBlock */:
                     bindEachFunctionsFirst(node.statements);
                     break;
                 default:
@@ -28027,26 +28453,26 @@ var ts;
         }
         function isNarrowingExpression(expr) {
             switch (expr.kind) {
-                case 72 /* Identifier */:
-                case 100 /* ThisKeyword */:
-                case 189 /* PropertyAccessExpression */:
-                case 190 /* ElementAccessExpression */:
+                case 73 /* Identifier */:
+                case 101 /* ThisKeyword */:
+                case 190 /* PropertyAccessExpression */:
+                case 191 /* ElementAccessExpression */:
                     return isNarrowableReference(expr);
-                case 191 /* CallExpression */:
+                case 192 /* CallExpression */:
                     return hasNarrowableArgument(expr);
-                case 195 /* ParenthesizedExpression */:
+                case 196 /* ParenthesizedExpression */:
                     return isNarrowingExpression(expr.expression);
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return isNarrowingBinaryExpression(expr);
-                case 202 /* PrefixUnaryExpression */:
+                case 203 /* PrefixUnaryExpression */:
                     return expr.operator === 52 /* ExclamationToken */ && isNarrowingExpression(expr.operand);
-                case 199 /* TypeOfExpression */:
+                case 200 /* TypeOfExpression */:
                     return isNarrowingExpression(expr.expression);
             }
             return false;
         }
         function isNarrowableReference(expr) {
-            return expr.kind === 72 /* Identifier */ || expr.kind === 100 /* ThisKeyword */ || expr.kind === 98 /* SuperKeyword */ ||
+            return expr.kind === 73 /* Identifier */ || expr.kind === 101 /* ThisKeyword */ || expr.kind === 99 /* SuperKeyword */ ||
                 (ts.isPropertyAccessExpression(expr) || ts.isNonNullExpression(expr) || ts.isParenthesizedExpression(expr)) && isNarrowableReference(expr.expression) ||
                 ts.isElementAccessExpression(expr) && expr.argumentExpression &&
                     (ts.isStringLiteral(expr.argumentExpression) || ts.isNumericLiteral(expr.argumentExpression)) &&
@@ -28061,7 +28487,7 @@ var ts;
                     }
                 }
             }
-            if (expr.expression.kind === 189 /* PropertyAccessExpression */ &&
+            if (expr.expression.kind === 190 /* PropertyAccessExpression */ &&
                 isNarrowableReference(expr.expression.expression)) {
                 return true;
             }
@@ -28075,7 +28501,7 @@ var ts;
         }
         function isNarrowingBinaryExpression(expr) {
             switch (expr.operatorToken.kind) {
-                case 59 /* EqualsToken */:
+                case 60 /* EqualsToken */:
                     return isNarrowableReference(expr.left);
                 case 33 /* EqualsEqualsToken */:
                 case 34 /* ExclamationEqualsToken */:
@@ -28083,9 +28509,9 @@ var ts;
                 case 36 /* ExclamationEqualsEqualsToken */:
                     return isNarrowableOperand(expr.left) || isNarrowableOperand(expr.right) ||
                         isNarrowingTypeofOperands(expr.right, expr.left) || isNarrowingTypeofOperands(expr.left, expr.right);
-                case 94 /* InstanceOfKeyword */:
+                case 95 /* InstanceOfKeyword */:
                     return isNarrowableOperand(expr.left);
-                case 93 /* InKeyword */:
+                case 94 /* InKeyword */:
                     return isNarrowableInOperands(expr.left, expr.right);
                 case 27 /* CommaToken */:
                     return isNarrowingExpression(expr.right);
@@ -28094,11 +28520,11 @@ var ts;
         }
         function isNarrowableOperand(expr) {
             switch (expr.kind) {
-                case 195 /* ParenthesizedExpression */:
+                case 196 /* ParenthesizedExpression */:
                     return isNarrowableOperand(expr.expression);
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     switch (expr.operatorToken.kind) {
-                        case 59 /* EqualsToken */:
+                        case 60 /* EqualsToken */:
                             return isNarrowableOperand(expr.left);
                         case 27 /* CommaToken */:
                             return isNarrowableOperand(expr.right);
@@ -28135,8 +28561,8 @@ var ts;
             if (!expression) {
                 return flags & 32 /* TrueCondition */ ? antecedent : unreachableFlow;
             }
-            if (expression.kind === 102 /* TrueKeyword */ && flags & 64 /* FalseCondition */ ||
-                expression.kind === 87 /* FalseKeyword */ && flags & 32 /* TrueCondition */) {
+            if (expression.kind === 103 /* TrueKeyword */ && flags & 64 /* FalseCondition */ ||
+                expression.kind === 88 /* FalseKeyword */ && flags & 32 /* TrueCondition */) {
                 return unreachableFlow;
             }
             if (!isNarrowingExpression(expression)) {
@@ -28174,33 +28600,33 @@ var ts;
         function isStatementCondition(node) {
             var parent = node.parent;
             switch (parent.kind) {
-                case 222 /* IfStatement */:
-                case 224 /* WhileStatement */:
-                case 223 /* DoStatement */:
+                case 223 /* IfStatement */:
+                case 225 /* WhileStatement */:
+                case 224 /* DoStatement */:
                     return parent.expression === node;
-                case 225 /* ForStatement */:
-                case 205 /* ConditionalExpression */:
+                case 226 /* ForStatement */:
+                case 206 /* ConditionalExpression */:
                     return parent.condition === node;
             }
             return false;
         }
         function isLogicalExpression(node) {
             while (true) {
-                if (node.kind === 195 /* ParenthesizedExpression */) {
+                if (node.kind === 196 /* ParenthesizedExpression */) {
                     node = node.expression;
                 }
-                else if (node.kind === 202 /* PrefixUnaryExpression */ && node.operator === 52 /* ExclamationToken */) {
+                else if (node.kind === 203 /* PrefixUnaryExpression */ && node.operator === 52 /* ExclamationToken */) {
                     node = node.operand;
                 }
                 else {
-                    return node.kind === 204 /* BinaryExpression */ && (node.operatorToken.kind === 54 /* AmpersandAmpersandToken */ ||
+                    return node.kind === 205 /* BinaryExpression */ && (node.operatorToken.kind === 54 /* AmpersandAmpersandToken */ ||
                         node.operatorToken.kind === 55 /* BarBarToken */);
                 }
             }
         }
         function isTopLevelLogicalExpression(node) {
-            while (node.parent.kind === 195 /* ParenthesizedExpression */ ||
-                node.parent.kind === 202 /* PrefixUnaryExpression */ &&
+            while (node.parent.kind === 196 /* ParenthesizedExpression */ ||
+                node.parent.kind === 203 /* PrefixUnaryExpression */ &&
                     node.parent.operator === 52 /* ExclamationToken */) {
                 node = node.parent;
             }
@@ -28242,7 +28668,7 @@ var ts;
         }
         function bindDoStatement(node) {
             var preDoLabel = createLoopLabel();
-            var enclosingLabeledStatement = node.parent.kind === 233 /* LabeledStatement */
+            var enclosingLabeledStatement = node.parent.kind === 234 /* LabeledStatement */
                 ? ts.lastOrUndefined(activeLabels)
                 : undefined;
             // if do statement is wrapped in labeled statement then target labels for break/continue with or without
@@ -28276,13 +28702,13 @@ var ts;
             var postLoopLabel = createBranchLabel();
             addAntecedent(preLoopLabel, currentFlow);
             currentFlow = preLoopLabel;
-            if (node.kind === 227 /* ForOfStatement */) {
+            if (node.kind === 228 /* ForOfStatement */) {
                 bind(node.awaitModifier);
             }
             bind(node.expression);
             addAntecedent(postLoopLabel, currentFlow);
             bind(node.initializer);
-            if (node.initializer.kind !== 238 /* VariableDeclarationList */) {
+            if (node.initializer.kind !== 239 /* VariableDeclarationList */) {
                 bindAssignmentTargetFlow(node.initializer);
             }
             bindIterativeStatement(node.statement, postLoopLabel, preLoopLabel);
@@ -28304,7 +28730,7 @@ var ts;
         }
         function bindReturnOrThrow(node) {
             bind(node.expression);
-            if (node.kind === 230 /* ReturnStatement */) {
+            if (node.kind === 231 /* ReturnStatement */) {
                 hasExplicitReturn = true;
                 if (currentReturnTarget) {
                     addAntecedent(currentReturnTarget, currentFlow);
@@ -28324,7 +28750,7 @@ var ts;
             return undefined;
         }
         function bindBreakOrContinueFlow(node, breakTarget, continueTarget) {
-            var flowLabel = node.kind === 229 /* BreakStatement */ ? breakTarget : continueTarget;
+            var flowLabel = node.kind === 230 /* BreakStatement */ ? breakTarget : continueTarget;
             if (flowLabel) {
                 addAntecedent(flowLabel, currentFlow);
                 currentFlow = unreachableFlow;
@@ -28452,7 +28878,7 @@ var ts;
             preSwitchCaseFlow = currentFlow;
             bind(node.caseBlock);
             addAntecedent(postSwitchLabel, currentFlow);
-            var hasDefault = ts.forEach(node.caseBlock.clauses, function (c) { return c.kind === 272 /* DefaultClause */; });
+            var hasDefault = ts.forEach(node.caseBlock.clauses, function (c) { return c.kind === 273 /* DefaultClause */; });
             // We mark a switch statement as possibly exhaustive if it has no default clause and if all
             // case clauses have unreachable end points (e.g. they all return).
             node.possiblyExhaustive = !hasDefault && !postSwitchLabel.antecedents;
@@ -28519,14 +28945,14 @@ var ts;
             if (!activeLabel.referenced && !options.allowUnusedLabels) {
                 errorOrSuggestionOnNode(ts.unusedLabelIsError(options), node.label, ts.Diagnostics.Unused_label);
             }
-            if (!node.statement || node.statement.kind !== 223 /* DoStatement */) {
+            if (!node.statement || node.statement.kind !== 224 /* DoStatement */) {
                 // do statement sets current flow inside bindDoStatement
                 addAntecedent(postStatementLabel, currentFlow);
                 currentFlow = finishFlowLabel(postStatementLabel);
             }
         }
         function bindDestructuringTargetFlow(node) {
-            if (node.kind === 204 /* BinaryExpression */ && node.operatorToken.kind === 59 /* EqualsToken */) {
+            if (node.kind === 205 /* BinaryExpression */ && node.operatorToken.kind === 60 /* EqualsToken */) {
                 bindAssignmentTargetFlow(node.left);
             }
             else {
@@ -28537,10 +28963,10 @@ var ts;
             if (isNarrowableReference(node)) {
                 currentFlow = createFlowAssignment(currentFlow, node);
             }
-            else if (node.kind === 187 /* ArrayLiteralExpression */) {
+            else if (node.kind === 188 /* ArrayLiteralExpression */) {
                 for (var _i = 0, _a = node.elements; _i < _a.length; _i++) {
                     var e = _a[_i];
-                    if (e.kind === 208 /* SpreadElement */) {
+                    if (e.kind === 209 /* SpreadElement */) {
                         bindAssignmentTargetFlow(e.expression);
                     }
                     else {
@@ -28548,16 +28974,16 @@ var ts;
                     }
                 }
             }
-            else if (node.kind === 188 /* ObjectLiteralExpression */) {
+            else if (node.kind === 189 /* ObjectLiteralExpression */) {
                 for (var _b = 0, _c = node.properties; _b < _c.length; _b++) {
                     var p = _c[_b];
-                    if (p.kind === 275 /* PropertyAssignment */) {
+                    if (p.kind === 276 /* PropertyAssignment */) {
                         bindDestructuringTargetFlow(p.initializer);
                     }
-                    else if (p.kind === 276 /* ShorthandPropertyAssignment */) {
+                    else if (p.kind === 277 /* ShorthandPropertyAssignment */) {
                         bindAssignmentTargetFlow(p.name);
                     }
-                    else if (p.kind === 277 /* SpreadAssignment */) {
+                    else if (p.kind === 278 /* SpreadAssignment */) {
                         bindAssignmentTargetFlow(p.expression);
                     }
                 }
@@ -28613,7 +29039,7 @@ var ts;
                 bindEachChild(node);
                 if (ts.isAssignmentOperator(operator) && !ts.isAssignmentTarget(node)) {
                     bindAssignmentTargetFlow(node.left);
-                    if (operator === 59 /* EqualsToken */ && node.left.kind === 190 /* ElementAccessExpression */) {
+                    if (operator === 60 /* EqualsToken */ && node.left.kind === 191 /* ElementAccessExpression */) {
                         var elementAccess = node.left;
                         if (isNarrowableOperand(elementAccess.expression)) {
                             currentFlow = createFlowArrayMutation(currentFlow, node);
@@ -28624,7 +29050,7 @@ var ts;
         }
         function bindDeleteExpressionFlow(node) {
             bindEachChild(node);
-            if (node.expression.kind === 189 /* PropertyAccessExpression */) {
+            if (node.expression.kind === 190 /* PropertyAccessExpression */) {
                 bindAssignmentTargetFlow(node.expression);
             }
         }
@@ -28672,10 +29098,10 @@ var ts;
             // an immediately invoked function expression (IIFE). Initialize the flowNode property to
             // the current control flow (which includes evaluation of the IIFE arguments).
             var expr = node.expression;
-            while (expr.kind === 195 /* ParenthesizedExpression */) {
+            while (expr.kind === 196 /* ParenthesizedExpression */) {
                 expr = expr.expression;
             }
-            if (expr.kind === 196 /* FunctionExpression */ || expr.kind === 197 /* ArrowFunction */) {
+            if (expr.kind === 197 /* FunctionExpression */ || expr.kind === 198 /* ArrowFunction */) {
                 bindEach(node.typeArguments);
                 bindEach(node.arguments);
                 bind(node.expression);
@@ -28683,7 +29109,7 @@ var ts;
             else {
                 bindEachChild(node);
             }
-            if (node.expression.kind === 189 /* PropertyAccessExpression */) {
+            if (node.expression.kind === 190 /* PropertyAccessExpression */) {
                 var propertyAccess = node.expression;
                 if (isNarrowableOperand(propertyAccess.expression) && ts.isPushOrUnshiftIdentifier(propertyAccess.name)) {
                     currentFlow = createFlowArrayMutation(currentFlow, node);
@@ -28692,54 +29118,54 @@ var ts;
         }
         function getContainerFlags(node) {
             switch (node.kind) {
-                case 209 /* ClassExpression */:
-                case 240 /* ClassDeclaration */:
-                case 243 /* EnumDeclaration */:
-                case 188 /* ObjectLiteralExpression */:
-                case 168 /* TypeLiteral */:
-                case 297 /* JSDocTypeLiteral */:
-                case 268 /* JsxAttributes */:
+                case 210 /* ClassExpression */:
+                case 241 /* ClassDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 189 /* ObjectLiteralExpression */:
+                case 169 /* TypeLiteral */:
+                case 298 /* JSDocTypeLiteral */:
+                case 269 /* JsxAttributes */:
                     return 1 /* IsContainer */;
-                case 241 /* InterfaceDeclaration */:
+                case 242 /* InterfaceDeclaration */:
                     return 1 /* IsContainer */ | 64 /* IsInterface */;
-                case 244 /* ModuleDeclaration */:
-                case 242 /* TypeAliasDeclaration */:
-                case 181 /* MappedType */:
+                case 245 /* ModuleDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
+                case 182 /* MappedType */:
                     return 1 /* IsContainer */ | 32 /* HasLocals */;
-                case 284 /* SourceFile */:
+                case 285 /* SourceFile */:
                     return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */;
-                case 156 /* MethodDeclaration */:
+                case 157 /* MethodDeclaration */:
                     if (ts.isObjectLiteralOrClassExpressionMethod(node)) {
                         return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */ | 8 /* IsFunctionLike */ | 128 /* IsObjectLiteralOrClassExpressionMethod */;
                     }
                 // falls through
-                case 157 /* Constructor */:
-                case 239 /* FunctionDeclaration */:
-                case 155 /* MethodSignature */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
-                case 160 /* CallSignature */:
-                case 298 /* JSDocSignature */:
-                case 294 /* JSDocFunctionType */:
-                case 165 /* FunctionType */:
-                case 161 /* ConstructSignature */:
-                case 162 /* IndexSignature */:
-                case 166 /* ConstructorType */:
+                case 158 /* Constructor */:
+                case 240 /* FunctionDeclaration */:
+                case 156 /* MethodSignature */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
+                case 161 /* CallSignature */:
+                case 299 /* JSDocSignature */:
+                case 295 /* JSDocFunctionType */:
+                case 166 /* FunctionType */:
+                case 162 /* ConstructSignature */:
+                case 163 /* IndexSignature */:
+                case 167 /* ConstructorType */:
                     return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */ | 8 /* IsFunctionLike */;
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
                     return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */ | 8 /* IsFunctionLike */ | 16 /* IsFunctionExpression */;
-                case 245 /* ModuleBlock */:
+                case 246 /* ModuleBlock */:
                     return 4 /* IsControlFlowContainer */;
-                case 154 /* PropertyDeclaration */:
+                case 155 /* PropertyDeclaration */:
                     return node.initializer ? 4 /* IsControlFlowContainer */ : 0;
-                case 274 /* CatchClause */:
-                case 225 /* ForStatement */:
-                case 226 /* ForInStatement */:
-                case 227 /* ForOfStatement */:
-                case 246 /* CaseBlock */:
+                case 275 /* CatchClause */:
+                case 226 /* ForStatement */:
+                case 227 /* ForInStatement */:
+                case 228 /* ForOfStatement */:
+                case 247 /* CaseBlock */:
                     return 2 /* IsBlockScopedContainer */;
-                case 218 /* Block */:
+                case 219 /* Block */:
                     // do not treat blocks directly inside a function as a block-scoped-container.
                     // Locals that reside in this block should go to the function locals. Otherwise 'x'
                     // would not appear to be a redeclaration of a block scoped local in the following
@@ -28772,45 +29198,45 @@ var ts;
                 // members are declared (for example, a member of a class will go into a specific
                 // symbol table depending on if it is static or not). We defer to specialized
                 // handlers to take care of declaring these child members.
-                case 244 /* ModuleDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     return declareModuleMember(node, symbolFlags, symbolExcludes);
-                case 284 /* SourceFile */:
+                case 285 /* SourceFile */:
                     return declareSourceFileMember(node, symbolFlags, symbolExcludes);
-                case 209 /* ClassExpression */:
-                case 240 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
+                case 241 /* ClassDeclaration */:
                     return declareClassMember(node, symbolFlags, symbolExcludes);
-                case 243 /* EnumDeclaration */:
+                case 244 /* EnumDeclaration */:
                     return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);
-                case 168 /* TypeLiteral */:
-                case 297 /* JSDocTypeLiteral */:
-                case 188 /* ObjectLiteralExpression */:
-                case 241 /* InterfaceDeclaration */:
-                case 268 /* JsxAttributes */:
+                case 169 /* TypeLiteral */:
+                case 298 /* JSDocTypeLiteral */:
+                case 189 /* ObjectLiteralExpression */:
+                case 242 /* InterfaceDeclaration */:
+                case 269 /* JsxAttributes */:
                     // Interface/Object-types always have their children added to the 'members' of
                     // their container. They are only accessible through an instance of their
                     // container, and are never in scope otherwise (even inside the body of the
                     // object / type / interface declaring them). An exception is type parameters,
                     // which are in scope without qualification (similar to 'locals').
                     return declareSymbol(container.symbol.members, container.symbol, node, symbolFlags, symbolExcludes);
-                case 165 /* FunctionType */:
-                case 166 /* ConstructorType */:
-                case 160 /* CallSignature */:
-                case 161 /* ConstructSignature */:
-                case 298 /* JSDocSignature */:
-                case 162 /* IndexSignature */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
-                case 157 /* Constructor */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
-                case 294 /* JSDocFunctionType */:
-                case 309 /* JSDocTypedefTag */:
-                case 302 /* JSDocCallbackTag */:
-                case 242 /* TypeAliasDeclaration */:
-                case 181 /* MappedType */:
+                case 166 /* FunctionType */:
+                case 167 /* ConstructorType */:
+                case 161 /* CallSignature */:
+                case 162 /* ConstructSignature */:
+                case 299 /* JSDocSignature */:
+                case 163 /* IndexSignature */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
+                case 158 /* Constructor */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
+                case 295 /* JSDocFunctionType */:
+                case 311 /* JSDocTypedefTag */:
+                case 304 /* JSDocCallbackTag */:
+                case 243 /* TypeAliasDeclaration */:
+                case 182 /* MappedType */:
                     // All the children of these container types are never visible through another
                     // symbol (i.e. through another symbol's 'exports' or 'members').  Instead,
                     // they're only accessed 'lexically' (i.e. from code that exists underneath
@@ -28831,16 +29257,8 @@ var ts;
                 : declareSymbol(file.locals, /*parent*/ undefined, node, symbolFlags, symbolExcludes);
         }
         function hasExportDeclarations(node) {
-            var body = node.kind === 284 /* SourceFile */ ? node : node.body;
-            if (body && (body.kind === 284 /* SourceFile */ || body.kind === 245 /* ModuleBlock */)) {
-                for (var _i = 0, _a = body.statements; _i < _a.length; _i++) {
-                    var stat = _a[_i];
-                    if (stat.kind === 255 /* ExportDeclaration */ || stat.kind === 254 /* ExportAssignment */) {
-                        return true;
-                    }
-                }
-            }
-            return false;
+            var body = ts.isSourceFile(node) ? node : ts.tryCast(node.body, ts.isModuleBlock);
+            return !!body && body.statements.some(function (s) { return ts.isExportDeclaration(s) || ts.isExportAssignment(s); });
         }
         function setExportContextFlag(node) {
             // A declaration source file or ambient module declaration that contains no export declarations (but possibly regular
@@ -28919,7 +29337,7 @@ var ts;
                 var seen = ts.createUnderscoreEscapedMap();
                 for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
                     var prop = _a[_i];
-                    if (prop.kind === 277 /* SpreadAssignment */ || prop.name.kind !== 72 /* Identifier */) {
+                    if (prop.kind === 278 /* SpreadAssignment */ || prop.name.kind !== 73 /* Identifier */) {
                         continue;
                     }
                     var identifier = prop.name;
@@ -28931,7 +29349,7 @@ var ts;
                     //    c.IsAccessorDescriptor(previous) is true and IsDataDescriptor(propId.descriptor) is true.
                     //    d.IsAccessorDescriptor(previous) is true and IsAccessorDescriptor(propId.descriptor) is true
                     // and either both previous and propId.descriptor have[[Get]] fields or both previous and propId.descriptor have[[Set]] fields
-                    var currentKind = prop.kind === 275 /* PropertyAssignment */ || prop.kind === 276 /* ShorthandPropertyAssignment */ || prop.kind === 156 /* MethodDeclaration */
+                    var currentKind = prop.kind === 276 /* PropertyAssignment */ || prop.kind === 277 /* ShorthandPropertyAssignment */ || prop.kind === 157 /* MethodDeclaration */
                         ? 1 /* Property */
                         : 2 /* Accessor */;
                     var existingKind = seen.get(identifier.escapedText);
@@ -28963,10 +29381,10 @@ var ts;
         }
         function bindBlockScopedDeclaration(node, symbolFlags, symbolExcludes) {
             switch (blockScopeContainer.kind) {
-                case 244 /* ModuleDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     declareModuleMember(node, symbolFlags, symbolExcludes);
                     break;
-                case 284 /* SourceFile */:
+                case 285 /* SourceFile */:
                     if (ts.isExternalOrCommonJsModule(container)) {
                         declareModuleMember(node, symbolFlags, symbolExcludes);
                         break;
@@ -28997,7 +29415,7 @@ var ts;
                 currentFlow = { flags: 2 /* Start */ };
                 parent = typeAlias;
                 bind(typeAlias.typeExpression);
-                if (!typeAlias.fullName || typeAlias.fullName.kind === 72 /* Identifier */) {
+                if (!typeAlias.fullName || typeAlias.fullName.kind === 73 /* Identifier */) {
                     parent = typeAlias.parent;
                     bindBlockScopedDeclaration(typeAlias, 524288 /* TypeAlias */, 67897832 /* TypeAliasExcludes */);
                 }
@@ -29015,8 +29433,8 @@ var ts;
         // check for reserved words used as identifiers in strict mode code.
         function checkStrictModeIdentifier(node) {
             if (inStrictMode &&
-                node.originalKeywordKind >= 109 /* FirstFutureReservedWord */ &&
-                node.originalKeywordKind <= 117 /* LastFutureReservedWord */ &&
+                node.originalKeywordKind >= 110 /* FirstFutureReservedWord */ &&
+                node.originalKeywordKind <= 118 /* LastFutureReservedWord */ &&
                 !ts.isIdentifierName(node) &&
                 !(node.flags & 4194304 /* Ambient */)) {
                 // Report error only if there are no parse errors in file
@@ -29052,7 +29470,7 @@ var ts;
         }
         function checkStrictModeDeleteExpression(node) {
             // Grammar checking
-            if (inStrictMode && node.expression.kind === 72 /* Identifier */) {
+            if (inStrictMode && node.expression.kind === 73 /* Identifier */) {
                 // When a delete operator occurs within strict mode code, a SyntaxError is thrown if its
                 // UnaryExpression is a direct reference to a variable, function argument, or function name
                 var span = ts.getErrorSpanForNode(file, node.expression);
@@ -29063,7 +29481,7 @@ var ts;
             return ts.isIdentifier(node) && (node.escapedText === "eval" || node.escapedText === "arguments");
         }
         function checkStrictModeEvalOrArguments(contextNode, name) {
-            if (name && name.kind === 72 /* Identifier */) {
+            if (name && name.kind === 73 /* Identifier */) {
                 var identifier = name;
                 if (isEvalOrArgumentsIdentifier(identifier)) {
                     // We check first if the name is inside class declaration or class expression; if so give explicit message
@@ -29104,8 +29522,8 @@ var ts;
         function checkStrictModeFunctionDeclaration(node) {
             if (languageVersion < 2 /* ES2015 */) {
                 // Report error if function is not top level function declaration
-                if (blockScopeContainer.kind !== 284 /* SourceFile */ &&
-                    blockScopeContainer.kind !== 244 /* ModuleDeclaration */ &&
+                if (blockScopeContainer.kind !== 285 /* SourceFile */ &&
+                    blockScopeContainer.kind !== 245 /* ModuleDeclaration */ &&
                     !ts.isFunctionLike(blockScopeContainer)) {
                     // We check first if the name is inside class declaration or class expression; if so give explicit message
                     // otherwise report generic error message.
@@ -29200,7 +29618,7 @@ var ts;
             // the current 'container' node when it changes. This helps us know which symbol table
             // a local should go into for example. Since terminal nodes are known not to have
             // children, as an optimization we don't process those.
-            if (node.kind > 147 /* LastToken */) {
+            if (node.kind > 148 /* LastToken */) {
                 var saveParent = parent;
                 parent = node;
                 var containerFlags = getContainerFlags(node);
@@ -29262,7 +29680,7 @@ var ts;
         function bindWorker(node) {
             switch (node.kind) {
                 /* Strict mode checks */
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     // for typedef type names with namespaces, bind the new jsdoc type symbol here
                     // because it requires all containing namespaces to be in effect, namely the
                     // current "blockScopeContainer" needs to be set to its immediate namespace parent.
@@ -29275,13 +29693,13 @@ var ts;
                         break;
                     }
                 // falls through
-                case 100 /* ThisKeyword */:
-                    if (currentFlow && (ts.isExpression(node) || parent.kind === 276 /* ShorthandPropertyAssignment */)) {
+                case 101 /* ThisKeyword */:
+                    if (currentFlow && (ts.isExpression(node) || parent.kind === 277 /* ShorthandPropertyAssignment */)) {
                         node.flowNode = currentFlow;
                     }
                     return checkStrictModeIdentifier(node);
-                case 189 /* PropertyAccessExpression */:
-                case 190 /* ElementAccessExpression */:
+                case 190 /* PropertyAccessExpression */:
+                case 191 /* ElementAccessExpression */:
                     if (currentFlow && isNarrowableReference(node)) {
                         node.flowNode = currentFlow;
                     }
@@ -29295,7 +29713,7 @@ var ts;
                         declareSymbol(file.locals, /*parent*/ undefined, node.expression, 1 /* FunctionScopedVariable */ | 134217728 /* ModuleExports */, 67220414 /* FunctionScopedVariableExcludes */);
                     }
                     break;
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     var specialKind = ts.getAssignmentDeclarationKind(node);
                     switch (specialKind) {
                         case 1 /* ExportsProperty */:
@@ -29323,76 +29741,76 @@ var ts;
                             ts.Debug.fail("Unknown binary expression special property assignment kind");
                     }
                     return checkStrictModeBinaryExpression(node);
-                case 274 /* CatchClause */:
+                case 275 /* CatchClause */:
                     return checkStrictModeCatchClause(node);
-                case 198 /* DeleteExpression */:
+                case 199 /* DeleteExpression */:
                     return checkStrictModeDeleteExpression(node);
                 case 8 /* NumericLiteral */:
                     return checkStrictModeNumericLiteral(node);
-                case 203 /* PostfixUnaryExpression */:
+                case 204 /* PostfixUnaryExpression */:
                     return checkStrictModePostfixUnaryExpression(node);
-                case 202 /* PrefixUnaryExpression */:
+                case 203 /* PrefixUnaryExpression */:
                     return checkStrictModePrefixUnaryExpression(node);
-                case 231 /* WithStatement */:
+                case 232 /* WithStatement */:
                     return checkStrictModeWithStatement(node);
-                case 233 /* LabeledStatement */:
+                case 234 /* LabeledStatement */:
                     return checkStrictModeLabeledStatement(node);
-                case 178 /* ThisType */:
+                case 179 /* ThisType */:
                     seenThisKeyword = true;
                     return;
-                case 163 /* TypePredicate */:
+                case 164 /* TypePredicate */:
                     break; // Binding the children will handle everything
-                case 150 /* TypeParameter */:
+                case 151 /* TypeParameter */:
                     return bindTypeParameter(node);
-                case 151 /* Parameter */:
+                case 152 /* Parameter */:
                     return bindParameter(node);
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     return bindVariableDeclarationOrBindingElement(node);
-                case 186 /* BindingElement */:
+                case 187 /* BindingElement */:
                     node.flowNode = currentFlow;
                     return bindVariableDeclarationOrBindingElement(node);
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
                     return bindPropertyWorker(node);
-                case 275 /* PropertyAssignment */:
-                case 276 /* ShorthandPropertyAssignment */:
+                case 276 /* PropertyAssignment */:
+                case 277 /* ShorthandPropertyAssignment */:
                     return bindPropertyOrMethodOrAccessor(node, 4 /* Property */, 0 /* PropertyExcludes */);
-                case 278 /* EnumMember */:
+                case 279 /* EnumMember */:
                     return bindPropertyOrMethodOrAccessor(node, 8 /* EnumMember */, 68008959 /* EnumMemberExcludes */);
-                case 160 /* CallSignature */:
-                case 161 /* ConstructSignature */:
-                case 162 /* IndexSignature */:
+                case 161 /* CallSignature */:
+                case 162 /* ConstructSignature */:
+                case 163 /* IndexSignature */:
                     return declareSymbolAndAddToSymbolTable(node, 131072 /* Signature */, 0 /* None */);
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
                     // If this is an ObjectLiteralExpression method, then it sits in the same space
                     // as other properties in the object literal.  So we use SymbolFlags.PropertyExcludes
                     // so that it will conflict with any other object literal members with the same
                     // name.
                     return bindPropertyOrMethodOrAccessor(node, 8192 /* Method */ | (node.questionToken ? 16777216 /* Optional */ : 0 /* None */), ts.isObjectLiteralMethod(node) ? 0 /* PropertyExcludes */ : 67212223 /* MethodExcludes */);
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     return bindFunctionDeclaration(node);
-                case 157 /* Constructor */:
+                case 158 /* Constructor */:
                     return declareSymbolAndAddToSymbolTable(node, 16384 /* Constructor */, /*symbolExcludes:*/ 0 /* None */);
-                case 158 /* GetAccessor */:
+                case 159 /* GetAccessor */:
                     return bindPropertyOrMethodOrAccessor(node, 32768 /* GetAccessor */, 67154879 /* GetAccessorExcludes */);
-                case 159 /* SetAccessor */:
+                case 160 /* SetAccessor */:
                     return bindPropertyOrMethodOrAccessor(node, 65536 /* SetAccessor */, 67187647 /* SetAccessorExcludes */);
-                case 165 /* FunctionType */:
-                case 294 /* JSDocFunctionType */:
-                case 298 /* JSDocSignature */:
-                case 166 /* ConstructorType */:
+                case 166 /* FunctionType */:
+                case 295 /* JSDocFunctionType */:
+                case 299 /* JSDocSignature */:
+                case 167 /* ConstructorType */:
                     return bindFunctionOrConstructorType(node);
-                case 168 /* TypeLiteral */:
-                case 297 /* JSDocTypeLiteral */:
-                case 181 /* MappedType */:
+                case 169 /* TypeLiteral */:
+                case 298 /* JSDocTypeLiteral */:
+                case 182 /* MappedType */:
                     return bindAnonymousTypeWorker(node);
-                case 188 /* ObjectLiteralExpression */:
+                case 189 /* ObjectLiteralExpression */:
                     return bindObjectLiteralExpression(node);
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
                     return bindFunctionExpression(node);
-                case 191 /* CallExpression */:
+                case 192 /* CallExpression */:
                     var assignmentKind = ts.getAssignmentDeclarationKind(node);
                     switch (assignmentKind) {
                         case 7 /* ObjectDefinePropertyValue */:
@@ -29411,64 +29829,64 @@ var ts;
                     }
                     break;
                 // Members of classes, interfaces, and modules
-                case 209 /* ClassExpression */:
-                case 240 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
+                case 241 /* ClassDeclaration */:
                     // All classes are automatically in strict mode in ES6.
                     inStrictMode = true;
                     return bindClassLikeDeclaration(node);
-                case 241 /* InterfaceDeclaration */:
+                case 242 /* InterfaceDeclaration */:
                     return bindBlockScopedDeclaration(node, 64 /* Interface */, 67897736 /* InterfaceExcludes */);
-                case 242 /* TypeAliasDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
                     return bindBlockScopedDeclaration(node, 524288 /* TypeAlias */, 67897832 /* TypeAliasExcludes */);
-                case 243 /* EnumDeclaration */:
+                case 244 /* EnumDeclaration */:
                     return bindEnumDeclaration(node);
-                case 244 /* ModuleDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     return bindModuleDeclaration(node);
                 // Jsx-attributes
-                case 268 /* JsxAttributes */:
+                case 269 /* JsxAttributes */:
                     return bindJsxAttributes(node);
-                case 267 /* JsxAttribute */:
+                case 268 /* JsxAttribute */:
                     return bindJsxAttribute(node, 4 /* Property */, 0 /* PropertyExcludes */);
                 // Imports and exports
-                case 248 /* ImportEqualsDeclaration */:
-                case 251 /* NamespaceImport */:
-                case 253 /* ImportSpecifier */:
-                case 257 /* ExportSpecifier */:
+                case 249 /* ImportEqualsDeclaration */:
+                case 252 /* NamespaceImport */:
+                case 254 /* ImportSpecifier */:
+                case 258 /* ExportSpecifier */:
                     return declareSymbolAndAddToSymbolTable(node, 2097152 /* Alias */, 2097152 /* AliasExcludes */);
-                case 247 /* NamespaceExportDeclaration */:
+                case 248 /* NamespaceExportDeclaration */:
                     return bindNamespaceExportDeclaration(node);
-                case 250 /* ImportClause */:
+                case 251 /* ImportClause */:
                     return bindImportClause(node);
-                case 255 /* ExportDeclaration */:
+                case 256 /* ExportDeclaration */:
                     return bindExportDeclaration(node);
-                case 254 /* ExportAssignment */:
+                case 255 /* ExportAssignment */:
                     return bindExportAssignment(node);
-                case 284 /* SourceFile */:
+                case 285 /* SourceFile */:
                     updateStrictModeStatementList(node.statements);
                     return bindSourceFileIfExternalModule();
-                case 218 /* Block */:
+                case 219 /* Block */:
                     if (!ts.isFunctionLike(node.parent)) {
                         return;
                     }
                 // falls through
-                case 245 /* ModuleBlock */:
+                case 246 /* ModuleBlock */:
                     return updateStrictModeStatementList(node.statements);
-                case 304 /* JSDocParameterTag */:
-                    if (node.parent.kind === 298 /* JSDocSignature */) {
+                case 306 /* JSDocParameterTag */:
+                    if (node.parent.kind === 299 /* JSDocSignature */) {
                         return bindParameter(node);
                     }
-                    if (node.parent.kind !== 297 /* JSDocTypeLiteral */) {
+                    if (node.parent.kind !== 298 /* JSDocTypeLiteral */) {
                         break;
                     }
                 // falls through
-                case 310 /* JSDocPropertyTag */:
+                case 312 /* JSDocPropertyTag */:
                     var propTag = node;
-                    var flags = propTag.isBracketed || propTag.typeExpression && propTag.typeExpression.type.kind === 293 /* JSDocOptionalType */ ?
+                    var flags = propTag.isBracketed || propTag.typeExpression && propTag.typeExpression.type.kind === 294 /* JSDocOptionalType */ ?
                         4 /* Property */ | 16777216 /* Optional */ :
                         4 /* Property */;
                     return declareSymbolAndAddToSymbolTable(propTag, flags, 0 /* PropertyExcludes */);
-                case 309 /* JSDocTypedefTag */:
-                case 302 /* JSDocCallbackTag */:
+                case 311 /* JSDocTypedefTag */:
+                case 304 /* JSDocCallbackTag */:
                     return (delayedTypeAliases || (delayedTypeAliases = [])).push(node);
             }
         }
@@ -29612,11 +30030,11 @@ var ts;
             ts.Debug.assert(ts.isInJSFile(node));
             var thisContainer = ts.getThisContainer(node, /*includeArrowFunctions*/ false);
             switch (thisContainer.kind) {
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
                     var constructorSymbol = thisContainer.symbol;
                     // For `f.prototype.m = function() { this.x = 0; }`, `this.x = 0` should modify `f`'s members, not the function expression.
-                    if (ts.isBinaryExpression(thisContainer.parent) && thisContainer.parent.operatorToken.kind === 59 /* EqualsToken */) {
+                    if (ts.isBinaryExpression(thisContainer.parent) && thisContainer.parent.operatorToken.kind === 60 /* EqualsToken */) {
                         var l = thisContainer.parent.left;
                         if (ts.isPropertyAccessEntityNameExpression(l) && ts.isPrototypeAccess(l.expression)) {
                             constructorSymbol = lookupSymbolForPropertyAccess(l.expression.expression, thisParentContainer);
@@ -29629,18 +30047,18 @@ var ts;
                         declareSymbol(constructorSymbol.members, constructorSymbol, node, 4 /* Property */, 0 /* PropertyExcludes */ & ~4 /* Property */);
                     }
                     break;
-                case 157 /* Constructor */:
-                case 154 /* PropertyDeclaration */:
-                case 156 /* MethodDeclaration */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 158 /* Constructor */:
+                case 155 /* PropertyDeclaration */:
+                case 157 /* MethodDeclaration */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     // this.foo assignment in a JavaScript class
                     // Bind this property to the containing class
                     var containingClass = thisContainer.parent;
                     var symbolTable = ts.hasModifier(thisContainer, 32 /* Static */) ? containingClass.symbol.exports : containingClass.symbol.members;
                     declareSymbol(symbolTable, containingClass.symbol, node, 4 /* Property */, 0 /* None */, /*isReplaceableByMethod*/ true);
                     break;
-                case 284 /* SourceFile */:
+                case 285 /* SourceFile */:
                     // this.property = assignment in a source file -- declare symbol in exports for a module, in locals for a script
                     if (thisContainer.commonJsModuleIndicator) {
                         declareSymbol(thisContainer.symbol.exports, thisContainer.symbol, node, 4 /* Property */ | 1048576 /* ExportValue */, 0 /* None */);
@@ -29650,14 +30068,14 @@ var ts;
                     }
                     break;
                 default:
-                    ts.Debug.fail(ts.Debug.showSyntaxKind(thisContainer));
+                    ts.Debug.failBadSyntaxKind(thisContainer);
             }
         }
         function bindSpecialPropertyDeclaration(node) {
-            if (node.expression.kind === 100 /* ThisKeyword */) {
+            if (node.expression.kind === 101 /* ThisKeyword */) {
                 bindThisPropertyAssignment(node);
             }
-            else if (ts.isPropertyAccessEntityNameExpression(node) && node.parent.parent.kind === 284 /* SourceFile */) {
+            else if (ts.isPropertyAccessEntityNameExpression(node) && node.parent.parent.kind === 285 /* SourceFile */) {
                 if (ts.isPrototypeAccess(node.expression)) {
                     bindPrototypePropertyAssignment(node, node.parent);
                 }
@@ -29694,7 +30112,7 @@ var ts;
         }
         function bindObjectDefinePropertyAssignment(node) {
             var namespaceSymbol = lookupSymbolForPropertyAccess(node.arguments[0]);
-            var isToplevel = node.parent.parent.kind === 284 /* SourceFile */;
+            var isToplevel = node.parent.parent.kind === 285 /* SourceFile */;
             namespaceSymbol = bindPotentiallyMissingNamespaces(namespaceSymbol, node.arguments[0], isToplevel, /*isPrototypeProperty*/ false);
             bindPotentiallyNewExpandoMemberToNamespace(node, namespaceSymbol, /*isPrototypeProperty*/ false);
         }
@@ -29708,7 +30126,7 @@ var ts;
             // Fix up parent pointers since we're going to use these nodes before we bind into them
             node.left.parent = node;
             node.right.parent = node;
-            if (ts.isIdentifier(lhs.expression) && container === file && isNameOfExportsOrModuleExportsAliasDeclaration(file, lhs.expression)) {
+            if (ts.isIdentifier(lhs.expression) && container === file && isExportsOrModuleExportsOrAlias(file, lhs.expression)) {
                 // This can be an alias for the 'exports' or 'module.exports' names, e.g.
                 //    var util = module.exports;
                 //    util.property = function ...
@@ -29761,8 +30179,8 @@ var ts;
         function bindPropertyAssignment(name, propertyAccess, isPrototypeProperty) {
             var namespaceSymbol = lookupSymbolForPropertyAccess(name);
             var isToplevel = ts.isBinaryExpression(propertyAccess.parent)
-                ? getParentOfBinaryExpression(propertyAccess.parent).parent.kind === 284 /* SourceFile */
-                : propertyAccess.parent.parent.kind === 284 /* SourceFile */;
+                ? getParentOfBinaryExpression(propertyAccess.parent).parent.kind === 285 /* SourceFile */
+                : propertyAccess.parent.parent.kind === 285 /* SourceFile */;
             namespaceSymbol = bindPotentiallyMissingNamespaces(namespaceSymbol, propertyAccess.expression, isToplevel, isPrototypeProperty);
             bindPotentiallyNewExpandoMemberToNamespace(propertyAccess, namespaceSymbol, isPrototypeProperty);
         }
@@ -29821,9 +30239,7 @@ var ts;
             }
             else {
                 var s = forEachIdentifierInEntityName(e.expression, parent, action);
-                if (!s || !s.exports)
-                    return ts.Debug.fail();
-                return action(e.name, s.exports.get(e.name.escapedText), s);
+                return action(e.name, s && s.exports && s.exports.get(e.name.escapedText), s);
             }
         }
         function bindCallExpression(node) {
@@ -29834,7 +30250,7 @@ var ts;
             }
         }
         function bindClassLikeDeclaration(node) {
-            if (node.kind === 240 /* ClassDeclaration */) {
+            if (node.kind === 241 /* ClassDeclaration */) {
                 bindBlockScopedDeclaration(node, 32 /* Class */, 68008383 /* ClassExcludes */);
             }
             else {
@@ -29900,7 +30316,7 @@ var ts;
             }
         }
         function bindParameter(node) {
-            if (node.kind === 304 /* JSDocParameterTag */ && container.kind !== 298 /* JSDocSignature */) {
+            if (node.kind === 306 /* JSDocParameterTag */ && container.kind !== 299 /* JSDocSignature */) {
                 return;
             }
             if (inStrictMode && !(node.flags & 4194304 /* Ambient */)) {
@@ -29977,7 +30393,7 @@ var ts;
                     declareSymbolAndAddToSymbolTable(node, 262144 /* TypeParameter */, 67635688 /* TypeParameterExcludes */);
                 }
             }
-            else if (node.parent.kind === 176 /* InferType */) {
+            else if (node.parent.kind === 177 /* InferType */) {
                 var container_2 = getInferTypeContainer(node.parent);
                 if (container_2) {
                     if (!container_2.locals) {
@@ -30005,11 +30421,11 @@ var ts;
             if (currentFlow === unreachableFlow) {
                 var reportError = 
                 // report error on all statements except empty ones
-                (ts.isStatementButNotDeclaration(node) && node.kind !== 220 /* EmptyStatement */) ||
+                (ts.isStatementButNotDeclaration(node) && node.kind !== 221 /* EmptyStatement */) ||
                     // report error on class declarations
-                    node.kind === 240 /* ClassDeclaration */ ||
+                    node.kind === 241 /* ClassDeclaration */ ||
                     // report error on instantiated modules or const-enums only modules if preserveConstEnums is set
-                    (node.kind === 244 /* ModuleDeclaration */ && shouldReportErrorOnModuleDeclaration(node));
+                    (node.kind === 245 /* ModuleDeclaration */ && shouldReportErrorOnModuleDeclaration(node));
                 if (reportError) {
                     currentFlow = reportedUnreachableFlow;
                     if (!options.allowUnreachableCode) {
@@ -30053,32 +30469,41 @@ var ts;
     }
     function isPurelyTypeDeclaration(s) {
         switch (s.kind) {
-            case 241 /* InterfaceDeclaration */:
-            case 242 /* TypeAliasDeclaration */:
+            case 242 /* InterfaceDeclaration */:
+            case 243 /* TypeAliasDeclaration */:
                 return true;
-            case 244 /* ModuleDeclaration */:
+            case 245 /* ModuleDeclaration */:
                 return getModuleInstanceState(s) !== 1 /* Instantiated */;
-            case 243 /* EnumDeclaration */:
+            case 244 /* EnumDeclaration */:
                 return ts.hasModifier(s, 2048 /* Const */);
             default:
                 return false;
         }
     }
     function isExportsOrModuleExportsOrAlias(sourceFile, node) {
-        return ts.isExportsIdentifier(node) ||
-            ts.isModuleExportsPropertyAccessExpression(node) ||
-            ts.isIdentifier(node) && isNameOfExportsOrModuleExportsAliasDeclaration(sourceFile, node);
+        var i = 0;
+        var q = [node];
+        while (q.length && i < 100) {
+            i++;
+            node = q.shift();
+            if (ts.isExportsIdentifier(node) || ts.isModuleExportsPropertyAccessExpression(node)) {
+                return true;
+            }
+            else if (ts.isIdentifier(node)) {
+                var symbol = lookupSymbolForNameWorker(sourceFile, node.escapedText);
+                if (!!symbol && !!symbol.valueDeclaration && ts.isVariableDeclaration(symbol.valueDeclaration) && !!symbol.valueDeclaration.initializer) {
+                    var init = symbol.valueDeclaration.initializer;
+                    q.push(init);
+                    if (ts.isAssignmentExpression(init, /*excludeCompoundAssignment*/ true)) {
+                        q.push(init.left);
+                        q.push(init.right);
+                    }
+                }
+            }
+        }
+        return false;
     }
     ts.isExportsOrModuleExportsOrAlias = isExportsOrModuleExportsOrAlias;
-    function isNameOfExportsOrModuleExportsAliasDeclaration(sourceFile, node) {
-        var symbol = lookupSymbolForNameWorker(sourceFile, node.escapedText);
-        return !!symbol && !!symbol.valueDeclaration && ts.isVariableDeclaration(symbol.valueDeclaration) &&
-            !!symbol.valueDeclaration.initializer && isExportsOrModuleExportsOrAliasOrAssignment(sourceFile, symbol.valueDeclaration.initializer);
-    }
-    function isExportsOrModuleExportsOrAliasOrAssignment(sourceFile, node) {
-        return isExportsOrModuleExportsOrAlias(sourceFile, node) ||
-            (ts.isAssignmentExpression(node, /*excludeCompoundAssignment*/ true) && (isExportsOrModuleExportsOrAliasOrAssignment(sourceFile, node.left) || isExportsOrModuleExportsOrAliasOrAssignment(sourceFile, node.right)));
-    }
     function lookupSymbolForNameWorker(container, name) {
         var local = container.locals && container.locals.get(name);
         if (local) {
@@ -30098,58 +30523,58 @@ var ts;
     function computeTransformFlagsForNode(node, subtreeFlags) {
         var kind = node.kind;
         switch (kind) {
-            case 191 /* CallExpression */:
+            case 192 /* CallExpression */:
                 return computeCallExpression(node, subtreeFlags);
-            case 192 /* NewExpression */:
+            case 193 /* NewExpression */:
                 return computeNewExpression(node, subtreeFlags);
-            case 244 /* ModuleDeclaration */:
+            case 245 /* ModuleDeclaration */:
                 return computeModuleDeclaration(node, subtreeFlags);
-            case 195 /* ParenthesizedExpression */:
+            case 196 /* ParenthesizedExpression */:
                 return computeParenthesizedExpression(node, subtreeFlags);
-            case 204 /* BinaryExpression */:
+            case 205 /* BinaryExpression */:
                 return computeBinaryExpression(node, subtreeFlags);
-            case 221 /* ExpressionStatement */:
+            case 222 /* ExpressionStatement */:
                 return computeExpressionStatement(node, subtreeFlags);
-            case 151 /* Parameter */:
+            case 152 /* Parameter */:
                 return computeParameter(node, subtreeFlags);
-            case 197 /* ArrowFunction */:
+            case 198 /* ArrowFunction */:
                 return computeArrowFunction(node, subtreeFlags);
-            case 196 /* FunctionExpression */:
+            case 197 /* FunctionExpression */:
                 return computeFunctionExpression(node, subtreeFlags);
-            case 239 /* FunctionDeclaration */:
+            case 240 /* FunctionDeclaration */:
                 return computeFunctionDeclaration(node, subtreeFlags);
-            case 237 /* VariableDeclaration */:
+            case 238 /* VariableDeclaration */:
                 return computeVariableDeclaration(node, subtreeFlags);
-            case 238 /* VariableDeclarationList */:
+            case 239 /* VariableDeclarationList */:
                 return computeVariableDeclarationList(node, subtreeFlags);
-            case 219 /* VariableStatement */:
+            case 220 /* VariableStatement */:
                 return computeVariableStatement(node, subtreeFlags);
-            case 233 /* LabeledStatement */:
+            case 234 /* LabeledStatement */:
                 return computeLabeledStatement(node, subtreeFlags);
-            case 240 /* ClassDeclaration */:
+            case 241 /* ClassDeclaration */:
                 return computeClassDeclaration(node, subtreeFlags);
-            case 209 /* ClassExpression */:
+            case 210 /* ClassExpression */:
                 return computeClassExpression(node, subtreeFlags);
-            case 273 /* HeritageClause */:
+            case 274 /* HeritageClause */:
                 return computeHeritageClause(node, subtreeFlags);
-            case 274 /* CatchClause */:
+            case 275 /* CatchClause */:
                 return computeCatchClause(node, subtreeFlags);
-            case 211 /* ExpressionWithTypeArguments */:
+            case 212 /* ExpressionWithTypeArguments */:
                 return computeExpressionWithTypeArguments(node, subtreeFlags);
-            case 157 /* Constructor */:
+            case 158 /* Constructor */:
                 return computeConstructor(node, subtreeFlags);
-            case 154 /* PropertyDeclaration */:
+            case 155 /* PropertyDeclaration */:
                 return computePropertyDeclaration(node, subtreeFlags);
-            case 156 /* MethodDeclaration */:
+            case 157 /* MethodDeclaration */:
                 return computeMethod(node, subtreeFlags);
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
                 return computeAccessor(node, subtreeFlags);
-            case 248 /* ImportEqualsDeclaration */:
+            case 249 /* ImportEqualsDeclaration */:
                 return computeImportEquals(node, subtreeFlags);
-            case 189 /* PropertyAccessExpression */:
+            case 190 /* PropertyAccessExpression */:
                 return computePropertyAccess(node, subtreeFlags);
-            case 190 /* ElementAccessExpression */:
+            case 191 /* ElementAccessExpression */:
                 return computeElementAccess(node, subtreeFlags);
             default:
                 return computeOther(node, kind, subtreeFlags);
@@ -30171,7 +30596,7 @@ var ts;
                 transformFlags |= 2048 /* ContainsLexicalThis */;
             }
         }
-        if (expression.kind === 92 /* ImportKeyword */) {
+        if (expression.kind === 93 /* ImportKeyword */) {
             transformFlags |= 524288 /* ContainsDynamicImport */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
@@ -30194,17 +30619,17 @@ var ts;
         var transformFlags = subtreeFlags;
         var operatorTokenKind = node.operatorToken.kind;
         var leftKind = node.left.kind;
-        if (operatorTokenKind === 59 /* EqualsToken */ && leftKind === 188 /* ObjectLiteralExpression */) {
+        if (operatorTokenKind === 60 /* EqualsToken */ && leftKind === 189 /* ObjectLiteralExpression */) {
             // Destructuring object assignments with are ES2015 syntax
             // and possibly ES2018 if they contain rest
             transformFlags |= 16 /* AssertES2018 */ | 128 /* AssertES2015 */ | 512 /* AssertDestructuringAssignment */;
         }
-        else if (operatorTokenKind === 59 /* EqualsToken */ && leftKind === 187 /* ArrayLiteralExpression */) {
+        else if (operatorTokenKind === 60 /* EqualsToken */ && leftKind === 188 /* ArrayLiteralExpression */) {
             // Destructuring assignments are ES2015 syntax.
             transformFlags |= 128 /* AssertES2015 */ | 512 /* AssertDestructuringAssignment */;
         }
         else if (operatorTokenKind === 41 /* AsteriskAsteriskToken */
-            || operatorTokenKind === 63 /* AsteriskAsteriskEqualsToken */) {
+            || operatorTokenKind === 64 /* AsteriskAsteriskEqualsToken */) {
             // Exponentiation is ES2016 syntax.
             transformFlags |= 64 /* AssertES2016 */;
         }
@@ -30247,8 +30672,8 @@ var ts;
         // If the node is synthesized, it means the emitter put the parentheses there,
         // not the user. If we didn't want them, the emitter would not have put them
         // there.
-        if (expressionKind === 212 /* AsExpression */
-            || expressionKind === 194 /* TypeAssertionExpression */) {
+        if (expressionKind === 213 /* AsExpression */
+            || expressionKind === 195 /* TypeAssertionExpression */) {
             transformFlags |= 1 /* AssertTypeScript */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
@@ -30263,8 +30688,7 @@ var ts;
         else {
             // A ClassDeclaration is ES6 syntax.
             transformFlags = subtreeFlags | 128 /* AssertES2015 */;
-            // A class with a parameter property assignment, property initializer, computed property name, or decorator is
-            // TypeScript syntax.
+            // A class with a parameter property assignment or decorator is TypeScript syntax.
             // An exported declaration may be TypeScript syntax, but is handled by the visitor
             // for a namespace declaration.
             if ((subtreeFlags & 1024 /* ContainsTypeScriptClassSyntax */)
@@ -30278,8 +30702,7 @@ var ts;
     function computeClassExpression(node, subtreeFlags) {
         // A ClassExpression is ES6 syntax.
         var transformFlags = subtreeFlags | 128 /* AssertES2015 */;
-        // A class with a parameter property assignment, property initializer, or decorator is
-        // TypeScript syntax.
+        // A class with a parameter property assignment or decorator is TypeScript syntax.
         if (subtreeFlags & 1024 /* ContainsTypeScriptClassSyntax */
             || node.typeParameters) {
             transformFlags |= 1 /* AssertTypeScript */;
@@ -30290,11 +30713,11 @@ var ts;
     function computeHeritageClause(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
         switch (node.token) {
-            case 86 /* ExtendsKeyword */:
+            case 87 /* ExtendsKeyword */:
                 // An `extends` HeritageClause is ES6 syntax.
                 transformFlags |= 128 /* AssertES2015 */;
                 break;
-            case 109 /* ImplementsKeyword */:
+            case 110 /* ImplementsKeyword */:
                 // An `implements` HeritageClause is TypeScript syntax.
                 transformFlags |= 1 /* AssertTypeScript */;
                 break;
@@ -30351,7 +30774,6 @@ var ts;
             || ts.hasModifier(node, 2270 /* TypeScriptModifier */)
             || node.typeParameters
             || node.type
-            || (node.name && ts.isComputedPropertyName(node.name)) // While computed method names aren't typescript, the TS transform must visit them to emit property declarations correctly
             || !node.body) {
             transformFlags |= 1 /* AssertTypeScript */;
         }
@@ -30376,7 +30798,6 @@ var ts;
         if (node.decorators
             || ts.hasModifier(node, 2270 /* TypeScriptModifier */)
             || node.type
-            || (node.name && ts.isComputedPropertyName(node.name)) // While computed accessor names aren't typescript, the TS transform must visit them to emit property declarations correctly
             || !node.body) {
             transformFlags |= 1 /* AssertTypeScript */;
         }
@@ -30388,11 +30809,13 @@ var ts;
         return propagatePropertyNameFlags(node.name, transformFlags & ~537372672 /* MethodOrAccessorExcludes */);
     }
     function computePropertyDeclaration(node, subtreeFlags) {
-        // A PropertyDeclaration is TypeScript syntax.
-        var transformFlags = subtreeFlags | 1 /* AssertTypeScript */;
-        // If the PropertyDeclaration has an initializer or a computed name, we need to inform its ancestor
-        // so that it handle the transformation.
-        if (node.initializer || ts.isComputedPropertyName(node.name)) {
+        var transformFlags = subtreeFlags | 1048576 /* ContainsClassFields */;
+        // Decorators, TypeScript-specific modifiers, and type annotations are TypeScript syntax.
+        if (ts.some(node.decorators) || ts.hasModifier(node, 2270 /* TypeScriptModifier */) || node.type) {
+            transformFlags |= 1 /* AssertTypeScript */;
+        }
+        // Hoisted variables related to class properties should live within the TypeScript class wrapper.
+        if (ts.isComputedPropertyName(node.name) || (ts.hasStaticModifier(node) && node.initializer)) {
             transformFlags |= 1024 /* ContainsTypeScriptClassSyntax */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
@@ -30487,7 +30910,7 @@ var ts;
         var transformFlags = subtreeFlags;
         // If a PropertyAccessExpression starts with a super keyword, then it is
         // ES6 syntax, and requires a lexical `this` binding.
-        if (node.expression.kind === 98 /* SuperKeyword */) {
+        if (node.expression.kind === 99 /* SuperKeyword */) {
             // super inside of an async function requires hoisting the super access (ES2017).
             // same for super inside of an async generator, which is ES2018.
             transformFlags |= 32 /* ContainsES2017 */ | 16 /* ContainsES2018 */;
@@ -30499,7 +30922,7 @@ var ts;
         var transformFlags = subtreeFlags;
         // If an ElementAccessExpression starts with a super keyword, then it is
         // ES6 syntax, and requires a lexical `this` binding.
-        if (node.expression.kind === 98 /* SuperKeyword */) {
+        if (node.expression.kind === 99 /* SuperKeyword */) {
             // super inside of an async function requires hoisting the super access (ES2017).
             // same for super inside of an async generator, which is ES2018.
             transformFlags |= 32 /* ContainsES2017 */ | 16 /* ContainsES2018 */;
@@ -30587,43 +31010,43 @@ var ts;
         var transformFlags = subtreeFlags;
         var excludeFlags = 536870912 /* NodeExcludes */;
         switch (kind) {
-            case 121 /* AsyncKeyword */:
-            case 201 /* AwaitExpression */:
+            case 122 /* AsyncKeyword */:
+            case 202 /* AwaitExpression */:
                 // async/await is ES2017 syntax, but may be ES2018 syntax (for async generators)
                 transformFlags |= 16 /* AssertES2018 */ | 32 /* AssertES2017 */;
                 break;
-            case 194 /* TypeAssertionExpression */:
-            case 212 /* AsExpression */:
-            case 313 /* PartiallyEmittedExpression */:
+            case 195 /* TypeAssertionExpression */:
+            case 213 /* AsExpression */:
+            case 315 /* PartiallyEmittedExpression */:
                 // These nodes are TypeScript syntax.
                 transformFlags |= 1 /* AssertTypeScript */;
                 excludeFlags = 536870912 /* OuterExpressionExcludes */;
                 break;
-            case 115 /* PublicKeyword */:
-            case 113 /* PrivateKeyword */:
-            case 114 /* ProtectedKeyword */:
-            case 118 /* AbstractKeyword */:
-            case 125 /* DeclareKeyword */:
-            case 77 /* ConstKeyword */:
-            case 243 /* EnumDeclaration */:
-            case 278 /* EnumMember */:
-            case 213 /* NonNullExpression */:
-            case 133 /* ReadonlyKeyword */:
+            case 116 /* PublicKeyword */:
+            case 114 /* PrivateKeyword */:
+            case 115 /* ProtectedKeyword */:
+            case 119 /* AbstractKeyword */:
+            case 126 /* DeclareKeyword */:
+            case 78 /* ConstKeyword */:
+            case 244 /* EnumDeclaration */:
+            case 279 /* EnumMember */:
+            case 214 /* NonNullExpression */:
+            case 134 /* ReadonlyKeyword */:
                 // These nodes are TypeScript syntax.
                 transformFlags |= 1 /* AssertTypeScript */;
                 break;
-            case 260 /* JsxElement */:
-            case 261 /* JsxSelfClosingElement */:
-            case 262 /* JsxOpeningElement */:
+            case 261 /* JsxElement */:
+            case 262 /* JsxSelfClosingElement */:
+            case 263 /* JsxOpeningElement */:
             case 11 /* JsxText */:
-            case 263 /* JsxClosingElement */:
-            case 264 /* JsxFragment */:
-            case 265 /* JsxOpeningFragment */:
-            case 266 /* JsxClosingFragment */:
-            case 267 /* JsxAttribute */:
-            case 268 /* JsxAttributes */:
-            case 269 /* JsxSpreadAttribute */:
-            case 270 /* JsxExpression */:
+            case 264 /* JsxClosingElement */:
+            case 265 /* JsxFragment */:
+            case 266 /* JsxOpeningFragment */:
+            case 267 /* JsxClosingFragment */:
+            case 268 /* JsxAttribute */:
+            case 269 /* JsxAttributes */:
+            case 270 /* JsxSpreadAttribute */:
+            case 271 /* JsxExpression */:
                 // These nodes are Jsx syntax.
                 transformFlags |= 2 /* AssertJsx */;
                 break;
@@ -30631,11 +31054,11 @@ var ts;
             case 15 /* TemplateHead */:
             case 16 /* TemplateMiddle */:
             case 17 /* TemplateTail */:
-            case 206 /* TemplateExpression */:
-            case 193 /* TaggedTemplateExpression */:
-            case 276 /* ShorthandPropertyAssignment */:
-            case 116 /* StaticKeyword */:
-            case 214 /* MetaProperty */:
+            case 207 /* TemplateExpression */:
+            case 194 /* TaggedTemplateExpression */:
+            case 277 /* ShorthandPropertyAssignment */:
+            case 117 /* StaticKeyword */:
+            case 215 /* MetaProperty */:
                 // These nodes are ES6 syntax.
                 transformFlags |= 128 /* AssertES2015 */;
                 break;
@@ -30652,103 +31075,103 @@ var ts;
             case 9 /* BigIntLiteral */:
                 transformFlags |= 4 /* AssertESNext */;
                 break;
-            case 227 /* ForOfStatement */:
+            case 228 /* ForOfStatement */:
                 // This node is either ES2015 syntax or ES2017 syntax (if it is a for-await-of).
                 if (node.awaitModifier) {
                     transformFlags |= 16 /* AssertES2018 */;
                 }
                 transformFlags |= 128 /* AssertES2015 */;
                 break;
-            case 207 /* YieldExpression */:
+            case 208 /* YieldExpression */:
                 // This node is either ES2015 syntax (in a generator) or ES2017 syntax (in an async
                 // generator).
                 transformFlags |= 16 /* AssertES2018 */ | 128 /* AssertES2015 */ | 131072 /* ContainsYield */;
                 break;
-            case 120 /* AnyKeyword */:
-            case 135 /* NumberKeyword */:
-            case 146 /* BigIntKeyword */:
-            case 132 /* NeverKeyword */:
-            case 136 /* ObjectKeyword */:
-            case 138 /* StringKeyword */:
-            case 123 /* BooleanKeyword */:
-            case 139 /* SymbolKeyword */:
-            case 106 /* VoidKeyword */:
-            case 150 /* TypeParameter */:
-            case 153 /* PropertySignature */:
-            case 155 /* MethodSignature */:
-            case 160 /* CallSignature */:
-            case 161 /* ConstructSignature */:
-            case 162 /* IndexSignature */:
-            case 163 /* TypePredicate */:
-            case 164 /* TypeReference */:
-            case 165 /* FunctionType */:
-            case 166 /* ConstructorType */:
-            case 167 /* TypeQuery */:
-            case 168 /* TypeLiteral */:
-            case 169 /* ArrayType */:
-            case 170 /* TupleType */:
-            case 171 /* OptionalType */:
-            case 172 /* RestType */:
-            case 173 /* UnionType */:
-            case 174 /* IntersectionType */:
-            case 175 /* ConditionalType */:
-            case 176 /* InferType */:
-            case 177 /* ParenthesizedType */:
-            case 241 /* InterfaceDeclaration */:
-            case 242 /* TypeAliasDeclaration */:
-            case 178 /* ThisType */:
-            case 179 /* TypeOperator */:
-            case 180 /* IndexedAccessType */:
-            case 181 /* MappedType */:
-            case 182 /* LiteralType */:
-            case 247 /* NamespaceExportDeclaration */:
+            case 121 /* AnyKeyword */:
+            case 136 /* NumberKeyword */:
+            case 147 /* BigIntKeyword */:
+            case 133 /* NeverKeyword */:
+            case 137 /* ObjectKeyword */:
+            case 139 /* StringKeyword */:
+            case 124 /* BooleanKeyword */:
+            case 140 /* SymbolKeyword */:
+            case 107 /* VoidKeyword */:
+            case 151 /* TypeParameter */:
+            case 154 /* PropertySignature */:
+            case 156 /* MethodSignature */:
+            case 161 /* CallSignature */:
+            case 162 /* ConstructSignature */:
+            case 163 /* IndexSignature */:
+            case 164 /* TypePredicate */:
+            case 165 /* TypeReference */:
+            case 166 /* FunctionType */:
+            case 167 /* ConstructorType */:
+            case 168 /* TypeQuery */:
+            case 169 /* TypeLiteral */:
+            case 170 /* ArrayType */:
+            case 171 /* TupleType */:
+            case 172 /* OptionalType */:
+            case 173 /* RestType */:
+            case 174 /* UnionType */:
+            case 175 /* IntersectionType */:
+            case 176 /* ConditionalType */:
+            case 177 /* InferType */:
+            case 178 /* ParenthesizedType */:
+            case 242 /* InterfaceDeclaration */:
+            case 243 /* TypeAliasDeclaration */:
+            case 179 /* ThisType */:
+            case 180 /* TypeOperator */:
+            case 181 /* IndexedAccessType */:
+            case 182 /* MappedType */:
+            case 183 /* LiteralType */:
+            case 248 /* NamespaceExportDeclaration */:
                 // Types and signatures are TypeScript syntax, and exclude all other facts.
                 transformFlags = 1 /* AssertTypeScript */;
                 excludeFlags = -2 /* TypeExcludes */;
                 break;
-            case 149 /* ComputedPropertyName */:
+            case 150 /* ComputedPropertyName */:
                 // Even though computed property names are ES6, we don't treat them as such.
                 // This is so that they can flow through PropertyName transforms unaffected.
                 // Instead, we mark the container as ES6, so that it can properly handle the transform.
                 transformFlags |= 16384 /* ContainsComputedPropertyName */;
                 break;
-            case 208 /* SpreadElement */:
+            case 209 /* SpreadElement */:
                 transformFlags |= 128 /* AssertES2015 */ | 4096 /* ContainsRestOrSpread */;
                 break;
-            case 277 /* SpreadAssignment */:
+            case 278 /* SpreadAssignment */:
                 transformFlags |= 16 /* AssertES2018 */ | 8192 /* ContainsObjectRestOrSpread */;
                 break;
-            case 98 /* SuperKeyword */:
+            case 99 /* SuperKeyword */:
                 // This node is ES6 syntax.
                 transformFlags |= 128 /* AssertES2015 */;
                 excludeFlags = 536870912 /* OuterExpressionExcludes */; // must be set to persist `Super`
                 break;
-            case 100 /* ThisKeyword */:
+            case 101 /* ThisKeyword */:
                 // Mark this node and its ancestors as containing a lexical `this` keyword.
                 transformFlags |= 2048 /* ContainsLexicalThis */;
                 break;
-            case 184 /* ObjectBindingPattern */:
+            case 185 /* ObjectBindingPattern */:
                 transformFlags |= 128 /* AssertES2015 */ | 65536 /* ContainsBindingPattern */;
                 if (subtreeFlags & 4096 /* ContainsRestOrSpread */) {
                     transformFlags |= 16 /* AssertES2018 */ | 8192 /* ContainsObjectRestOrSpread */;
                 }
                 excludeFlags = 536875008 /* BindingPatternExcludes */;
                 break;
-            case 185 /* ArrayBindingPattern */:
+            case 186 /* ArrayBindingPattern */:
                 transformFlags |= 128 /* AssertES2015 */ | 65536 /* ContainsBindingPattern */;
                 excludeFlags = 536875008 /* BindingPatternExcludes */;
                 break;
-            case 186 /* BindingElement */:
+            case 187 /* BindingElement */:
                 transformFlags |= 128 /* AssertES2015 */;
                 if (node.dotDotDotToken) {
                     transformFlags |= 4096 /* ContainsRestOrSpread */;
                 }
                 break;
-            case 152 /* Decorator */:
+            case 153 /* Decorator */:
                 // This node is TypeScript syntax, and marks its container as also being TypeScript syntax.
                 transformFlags |= 1 /* AssertTypeScript */ | 1024 /* ContainsTypeScriptClassSyntax */;
                 break;
-            case 188 /* ObjectLiteralExpression */:
+            case 189 /* ObjectLiteralExpression */:
                 excludeFlags = 536896512 /* ObjectLiteralExcludes */;
                 if (subtreeFlags & 16384 /* ContainsComputedPropertyName */) {
                     // If an ObjectLiteralExpression contains a ComputedPropertyName, then it
@@ -30761,26 +31184,26 @@ var ts;
                     transformFlags |= 16 /* AssertES2018 */;
                 }
                 break;
-            case 187 /* ArrayLiteralExpression */:
+            case 188 /* ArrayLiteralExpression */:
                 excludeFlags = 536875008 /* ArrayLiteralOrCallOrNewExcludes */;
                 break;
-            case 223 /* DoStatement */:
-            case 224 /* WhileStatement */:
-            case 225 /* ForStatement */:
-            case 226 /* ForInStatement */:
+            case 224 /* DoStatement */:
+            case 225 /* WhileStatement */:
+            case 226 /* ForStatement */:
+            case 227 /* ForInStatement */:
                 // A loop containing a block scoped binding *may* need to be transformed from ES6.
                 if (subtreeFlags & 32768 /* ContainsBlockScopedBinding */) {
                     transformFlags |= 128 /* AssertES2015 */;
                 }
                 break;
-            case 284 /* SourceFile */:
+            case 285 /* SourceFile */:
                 break;
-            case 230 /* ReturnStatement */:
+            case 231 /* ReturnStatement */:
                 // Return statements may require an `await` in ES2018.
                 transformFlags |= 262144 /* ContainsHoistedDeclarationOrCompletion */ | 16 /* AssertES2018 */;
                 break;
-            case 228 /* ContinueStatement */:
-            case 229 /* BreakStatement */:
+            case 229 /* ContinueStatement */:
+            case 230 /* BreakStatement */:
                 transformFlags |= 262144 /* ContainsHoistedDeclarationOrCompletion */;
                 break;
         }
@@ -30798,67 +31221,67 @@ var ts;
      *       than calling this function.
      */
     function getTransformFlagsSubtreeExclusions(kind) {
-        if (kind >= 163 /* FirstTypeNode */ && kind <= 183 /* LastTypeNode */) {
+        if (kind >= 164 /* FirstTypeNode */ && kind <= 184 /* LastTypeNode */) {
             return -2 /* TypeExcludes */;
         }
         switch (kind) {
-            case 191 /* CallExpression */:
-            case 192 /* NewExpression */:
-            case 187 /* ArrayLiteralExpression */:
+            case 192 /* CallExpression */:
+            case 193 /* NewExpression */:
+            case 188 /* ArrayLiteralExpression */:
                 return 536875008 /* ArrayLiteralOrCallOrNewExcludes */;
-            case 244 /* ModuleDeclaration */:
+            case 245 /* ModuleDeclaration */:
                 return 537168896 /* ModuleExcludes */;
-            case 151 /* Parameter */:
+            case 152 /* Parameter */:
                 return 536870912 /* ParameterExcludes */;
-            case 197 /* ArrowFunction */:
+            case 198 /* ArrowFunction */:
                 return 537371648 /* ArrowFunctionExcludes */;
-            case 196 /* FunctionExpression */:
-            case 239 /* FunctionDeclaration */:
+            case 197 /* FunctionExpression */:
+            case 240 /* FunctionDeclaration */:
                 return 537373696 /* FunctionExcludes */;
-            case 238 /* VariableDeclarationList */:
+            case 239 /* VariableDeclarationList */:
                 return 536944640 /* VariableDeclarationListExcludes */;
-            case 240 /* ClassDeclaration */:
-            case 209 /* ClassExpression */:
+            case 241 /* ClassDeclaration */:
+            case 210 /* ClassExpression */:
                 return 536888320 /* ClassExcludes */;
-            case 157 /* Constructor */:
+            case 158 /* Constructor */:
                 return 537372672 /* ConstructorExcludes */;
-            case 156 /* MethodDeclaration */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
+            case 157 /* MethodDeclaration */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
                 return 537372672 /* MethodOrAccessorExcludes */;
-            case 120 /* AnyKeyword */:
-            case 135 /* NumberKeyword */:
-            case 146 /* BigIntKeyword */:
-            case 132 /* NeverKeyword */:
-            case 138 /* StringKeyword */:
-            case 136 /* ObjectKeyword */:
-            case 123 /* BooleanKeyword */:
-            case 139 /* SymbolKeyword */:
-            case 106 /* VoidKeyword */:
-            case 150 /* TypeParameter */:
-            case 153 /* PropertySignature */:
-            case 155 /* MethodSignature */:
-            case 160 /* CallSignature */:
-            case 161 /* ConstructSignature */:
-            case 162 /* IndexSignature */:
-            case 241 /* InterfaceDeclaration */:
-            case 242 /* TypeAliasDeclaration */:
+            case 121 /* AnyKeyword */:
+            case 136 /* NumberKeyword */:
+            case 147 /* BigIntKeyword */:
+            case 133 /* NeverKeyword */:
+            case 139 /* StringKeyword */:
+            case 137 /* ObjectKeyword */:
+            case 124 /* BooleanKeyword */:
+            case 140 /* SymbolKeyword */:
+            case 107 /* VoidKeyword */:
+            case 151 /* TypeParameter */:
+            case 154 /* PropertySignature */:
+            case 156 /* MethodSignature */:
+            case 161 /* CallSignature */:
+            case 162 /* ConstructSignature */:
+            case 163 /* IndexSignature */:
+            case 242 /* InterfaceDeclaration */:
+            case 243 /* TypeAliasDeclaration */:
                 return -2 /* TypeExcludes */;
-            case 188 /* ObjectLiteralExpression */:
+            case 189 /* ObjectLiteralExpression */:
                 return 536896512 /* ObjectLiteralExcludes */;
-            case 274 /* CatchClause */:
+            case 275 /* CatchClause */:
                 return 536879104 /* CatchClauseExcludes */;
-            case 184 /* ObjectBindingPattern */:
-            case 185 /* ArrayBindingPattern */:
+            case 185 /* ObjectBindingPattern */:
+            case 186 /* ArrayBindingPattern */:
                 return 536875008 /* BindingPatternExcludes */;
-            case 194 /* TypeAssertionExpression */:
-            case 212 /* AsExpression */:
-            case 313 /* PartiallyEmittedExpression */:
-            case 195 /* ParenthesizedExpression */:
-            case 98 /* SuperKeyword */:
+            case 195 /* TypeAssertionExpression */:
+            case 213 /* AsExpression */:
+            case 315 /* PartiallyEmittedExpression */:
+            case 196 /* ParenthesizedExpression */:
+            case 99 /* SuperKeyword */:
                 return 536870912 /* OuterExpressionExcludes */;
-            case 189 /* PropertyAccessExpression */:
-            case 190 /* ElementAccessExpression */:
+            case 190 /* PropertyAccessExpression */:
+            case 191 /* ElementAccessExpression */:
                 return 536870912 /* PropertyAccessExcludes */;
             default:
                 return 536870912 /* NodeExcludes */;
@@ -31033,7 +31456,7 @@ var ts;
                     //  (their type resolved directly to the member deeply referenced)
                     // So to get the intervening symbols, we need to check if there's a type
                     // query node on any of the symbol's declarations and get symbols there
-                    if (d.type && d.type.kind === 167 /* TypeQuery */) {
+                    if (d.type && d.type.kind === 168 /* TypeQuery */) {
                         var query = d.type;
                         var entity = getResolvedSymbol(getFirstIdentifier(query.exprName));
                         visitSymbol(entity);
@@ -31053,6 +31476,37 @@ var ts;
     var nextNodeId = 1;
     var nextMergeId = 1;
     var nextFlowId = 1;
+    var IterationUse;
+    (function (IterationUse) {
+        IterationUse[IterationUse["AllowsSyncIterablesFlag"] = 1] = "AllowsSyncIterablesFlag";
+        IterationUse[IterationUse["AllowsAsyncIterablesFlag"] = 2] = "AllowsAsyncIterablesFlag";
+        IterationUse[IterationUse["AllowsStringInputFlag"] = 4] = "AllowsStringInputFlag";
+        IterationUse[IterationUse["ForOfFlag"] = 8] = "ForOfFlag";
+        IterationUse[IterationUse["YieldStarFlag"] = 16] = "YieldStarFlag";
+        IterationUse[IterationUse["SpreadFlag"] = 32] = "SpreadFlag";
+        IterationUse[IterationUse["DestructuringFlag"] = 64] = "DestructuringFlag";
+        // Spread, Destructuring, Array element assignment
+        IterationUse[IterationUse["Element"] = 1] = "Element";
+        IterationUse[IterationUse["Spread"] = 33] = "Spread";
+        IterationUse[IterationUse["Destructuring"] = 65] = "Destructuring";
+        IterationUse[IterationUse["ForOf"] = 13] = "ForOf";
+        IterationUse[IterationUse["ForAwaitOf"] = 15] = "ForAwaitOf";
+        IterationUse[IterationUse["YieldStar"] = 17] = "YieldStar";
+        IterationUse[IterationUse["AsyncYieldStar"] = 19] = "AsyncYieldStar";
+        IterationUse[IterationUse["GeneratorReturnType"] = 1] = "GeneratorReturnType";
+        IterationUse[IterationUse["AsyncGeneratorReturnType"] = 2] = "AsyncGeneratorReturnType";
+    })(IterationUse || (IterationUse = {}));
+    var IterationTypeKind;
+    (function (IterationTypeKind) {
+        IterationTypeKind[IterationTypeKind["Yield"] = 0] = "Yield";
+        IterationTypeKind[IterationTypeKind["Return"] = 1] = "Return";
+        IterationTypeKind[IterationTypeKind["Next"] = 2] = "Next";
+    })(IterationTypeKind || (IterationTypeKind = {}));
+    var WideningKind;
+    (function (WideningKind) {
+        WideningKind[WideningKind["Normal"] = 0] = "Normal";
+        WideningKind[WideningKind["GeneratorYield"] = 1] = "GeneratorYield";
+    })(WideningKind || (WideningKind = {}));
     function getNodeId(node) {
         if (!node.id) {
             node.id = nextNodeId;
@@ -31108,6 +31562,7 @@ var ts;
         var typeCount = 0;
         var symbolCount = 0;
         var enumCount = 0;
+        var instantiationCount = 0;
         var instantiationDepth = 0;
         var constraintDepth = 0;
         var currentNode;
@@ -31132,8 +31587,6 @@ var ts;
         undefinedSymbol.declarations = [];
         var globalThisSymbol = createSymbol(1536 /* Module */, "globalThis", 8 /* Readonly */);
         globalThisSymbol.exports = globals;
-        globalThisSymbol.valueDeclaration = ts.createNode(72 /* Identifier */);
-        globalThisSymbol.valueDeclaration.escapedText = "globalThis";
         globals.set(globalThisSymbol.escapedName, globalThisSymbol);
         var argumentsSymbol = createSymbol(4 /* Property */, "arguments");
         var requireSymbol = createSymbol(4 /* Property */, "require");
@@ -31149,6 +31602,11 @@ var ts;
             getIdentifierCount: function () { return ts.sum(host.getSourceFiles(), "identifierCount"); },
             getSymbolCount: function () { return ts.sum(host.getSourceFiles(), "symbolCount") + symbolCount; },
             getTypeCount: function () { return typeCount; },
+            getRelationCacheSizes: function () { return ({
+                assignable: assignableRelation.size,
+                identity: identityRelation.size,
+                subtype: subtypeRelation.size,
+            }); },
             isUndefinedSymbol: function (symbol) { return symbol === undefinedSymbol; },
             isArgumentsSymbol: function (symbol) { return symbol === argumentsSymbol; },
             isUnknownSymbol: function (symbol) { return symbol === unknownSymbol; },
@@ -31215,6 +31673,10 @@ var ts;
                 node = ts.getParseTreeNode(node);
                 return node ? getTypeOfNode(node) : errorType;
             },
+            getTypeOfAssignmentPattern: function (nodeIn) {
+                var node = ts.getParseTreeNode(nodeIn, ts.isAssignmentPattern);
+                return node && getTypeOfAssignmentPattern(node) || errorType;
+            },
             getPropertySymbolOfDestructuringAssignment: function (locationIn) {
                 var location = ts.getParseTreeNode(locationIn, ts.isIdentifier);
                 return location ? getPropertySymbolOfDestructuringAssignment(location) : undefined;
@@ -31263,12 +31725,14 @@ var ts;
             },
             isContextSensitive: isContextSensitive,
             getFullyQualifiedName: getFullyQualifiedName,
-            getResolvedSignature: function (node, candidatesOutArray, agumentCount) {
-                return getResolvedSignatureWorker(node, candidatesOutArray, agumentCount, 0 /* Normal */);
+            getResolvedSignature: function (node, candidatesOutArray, argumentCount) {
+                return getResolvedSignatureWorker(node, candidatesOutArray, argumentCount, 0 /* Normal */);
             },
-            getResolvedSignatureForSignatureHelp: function (node, candidatesOutArray, agumentCount) {
-                return getResolvedSignatureWorker(node, candidatesOutArray, agumentCount, 16 /* IsForSignatureHelp */);
+            getResolvedSignatureForSignatureHelp: function (node, candidatesOutArray, argumentCount) {
+                return getResolvedSignatureWorker(node, candidatesOutArray, argumentCount, 16 /* IsForSignatureHelp */);
             },
+            getExpandedParameters: getExpandedParameters,
+            hasEffectiveRestParameter: hasEffectiveRestParameter,
             getConstantValue: function (nodeIn) {
                 var node = ts.getParseTreeNode(nodeIn, canHaveConstantValue);
                 return node ? getConstantValue(node) : undefined;
@@ -31330,6 +31794,8 @@ var ts;
             getNeverType: function () { return neverType; },
             isSymbolAccessible: isSymbolAccessible,
             getObjectFlags: ts.getObjectFlags,
+            isArrayType: isArrayType,
+            isTupleType: isTupleType,
             isArrayLikeType: isArrayLikeType,
             isTypeInvalidDueToUnionDiscriminant: isTypeInvalidDueToUnionDiscriminant,
             getAllPossiblePropertiesOfTypes: getAllPossiblePropertiesOfTypes,
@@ -31406,7 +31872,7 @@ var ts;
         var intersectionTypes = ts.createMap();
         var literalTypes = ts.createMap();
         var indexedAccessTypes = ts.createMap();
-        var conditionalTypes = ts.createMap();
+        var substitutionTypes = ts.createMap();
         var evolvingArrayTypes = [];
         var undefinedProperties = ts.createMap();
         var unknownSymbol = createSymbol(4 /* Property */, "unknown");
@@ -31416,10 +31882,10 @@ var ts;
         var wildcardType = createIntrinsicType(1 /* Any */, "any");
         var errorType = createIntrinsicType(1 /* Any */, "error");
         var unknownType = createIntrinsicType(2 /* Unknown */, "unknown");
-        var undefinedType = createNullableType(32768 /* Undefined */, "undefined", 0);
-        var undefinedWideningType = strictNullChecks ? undefinedType : createNullableType(32768 /* Undefined */, "undefined", 131072 /* ContainsWideningType */);
-        var nullType = createNullableType(65536 /* Null */, "null", 0);
-        var nullWideningType = strictNullChecks ? nullType : createNullableType(65536 /* Null */, "null", 131072 /* ContainsWideningType */);
+        var undefinedType = createIntrinsicType(32768 /* Undefined */, "undefined");
+        var undefinedWideningType = strictNullChecks ? undefinedType : createIntrinsicType(32768 /* Undefined */, "undefined", 262144 /* ContainsWideningType */);
+        var nullType = createIntrinsicType(65536 /* Null */, "null");
+        var nullWideningType = strictNullChecks ? nullType : createIntrinsicType(65536 /* Null */, "null", 262144 /* ContainsWideningType */);
         var stringType = createIntrinsicType(4 /* String */, "string");
         var numberType = createIntrinsicType(8 /* Number */, "number");
         var bigintType = createIntrinsicType(64 /* BigInt */, "bigint");
@@ -31445,6 +31911,7 @@ var ts;
         var voidType = createIntrinsicType(16384 /* Void */, "void");
         var neverType = createIntrinsicType(131072 /* Never */, "never");
         var silentNeverType = createIntrinsicType(131072 /* Never */, "never");
+        var nonInferrableType = createIntrinsicType(131072 /* Never */, "never", 1048576 /* NonInferrableType */);
         var implicitNeverType = createIntrinsicType(131072 /* Never */, "never");
         var nonPrimitiveType = createIntrinsicType(67108864 /* NonPrimitive */, "object");
         var stringNumberSymbolType = getUnionType([stringType, numberType, esSymbolType]);
@@ -31461,7 +31928,7 @@ var ts;
         var anyFunctionType = createAnonymousType(undefined, emptySymbols, ts.emptyArray, ts.emptyArray, undefined, undefined);
         // The anyFunctionType contains the anyFunctionType by definition. The flag is further propagated
         // in getPropagatingFlagsOfTypes, and it is checked in inferFromTypes.
-        anyFunctionType.objectFlags |= 524288 /* ContainsAnyFunctionType */;
+        anyFunctionType.objectFlags |= 1048576 /* NonInferrableType */;
         var noConstraintType = createAnonymousType(undefined, emptySymbols, ts.emptyArray, ts.emptyArray, undefined, undefined);
         var circularConstraintType = createAnonymousType(undefined, emptySymbols, ts.emptyArray, ts.emptyArray, undefined, undefined);
         var resolvingDefaultType = createAnonymousType(undefined, emptySymbols, ts.emptyArray, ts.emptyArray, undefined, undefined);
@@ -31475,6 +31942,41 @@ var ts;
         var resolvingSignature = createSignature(undefined, undefined, undefined, ts.emptyArray, anyType, /*resolvedTypePredicate*/ undefined, 0, /*hasRestParameter*/ false, /*hasLiteralTypes*/ false);
         var silentNeverSignature = createSignature(undefined, undefined, undefined, ts.emptyArray, silentNeverType, /*resolvedTypePredicate*/ undefined, 0, /*hasRestParameter*/ false, /*hasLiteralTypes*/ false);
         var enumNumberIndexInfo = createIndexInfo(stringType, /*isReadonly*/ true);
+        var iterationTypesCache = ts.createMap(); // cache for common IterationTypes instances
+        var noIterationTypes = {
+            get yieldType() { throw new Error("Not supported"); },
+            get returnType() { throw new Error("Not supported"); },
+            get nextType() { throw new Error("Not supported"); },
+        };
+        var anyIterationTypes = createIterationTypes(anyType, anyType, anyType);
+        var anyIterationTypesExceptNext = createIterationTypes(anyType, anyType, unknownType);
+        var defaultIterationTypes = createIterationTypes(neverType, anyType, undefinedType); // default iteration types for `Iterator`.
+        var asyncIterationTypesResolver = {
+            iterableCacheKey: "iterationTypesOfAsyncIterable",
+            iteratorCacheKey: "iterationTypesOfAsyncIterator",
+            iteratorSymbolName: "asyncIterator",
+            getGlobalIteratorType: getGlobalAsyncIteratorType,
+            getGlobalIterableType: getGlobalAsyncIterableType,
+            getGlobalIterableIteratorType: getGlobalAsyncIterableIteratorType,
+            getGlobalGeneratorType: getGlobalAsyncGeneratorType,
+            resolveIterationType: getAwaitedType,
+            mustHaveANextMethodDiagnostic: ts.Diagnostics.An_async_iterator_must_have_a_next_method,
+            mustBeAMethodDiagnostic: ts.Diagnostics.The_0_property_of_an_async_iterator_must_be_a_method,
+            mustHaveAValueDiagnostic: ts.Diagnostics.The_type_returned_by_the_0_method_of_an_async_iterator_must_be_a_promise_for_a_type_with_a_value_property,
+        };
+        var syncIterationTypesResolver = {
+            iterableCacheKey: "iterationTypesOfIterable",
+            iteratorCacheKey: "iterationTypesOfIterator",
+            iteratorSymbolName: "iterator",
+            getGlobalIteratorType: getGlobalIteratorType,
+            getGlobalIterableType: getGlobalIterableType,
+            getGlobalIterableIteratorType: getGlobalIterableIteratorType,
+            getGlobalGeneratorType: getGlobalGeneratorType,
+            resolveIterationType: function (type, _errorNode) { return type; },
+            mustHaveANextMethodDiagnostic: ts.Diagnostics.An_iterator_must_have_a_next_method,
+            mustBeAMethodDiagnostic: ts.Diagnostics.The_0_property_of_an_iterator_must_be_a_method,
+            mustHaveAValueDiagnostic: ts.Diagnostics.The_type_returned_by_the_0_method_of_an_iterator_must_have_a_value_property,
+        };
         /** Key is "/path/to/a.ts|/path/to/b.ts". */
         var amalgamatedDuplicates;
         var reverseMappedCache = ts.createMap();
@@ -31485,6 +31987,7 @@ var ts;
          * This is only used if there is no exact match.
          */
         var patternAmbientModules;
+        var patternAmbientModuleAugmentations;
         var globalObjectType;
         var globalFunctionType;
         var globalCallableFunctionType;
@@ -31513,14 +32016,17 @@ var ts;
         var deferredGlobalIterableType;
         var deferredGlobalIteratorType;
         var deferredGlobalIterableIteratorType;
+        var deferredGlobalGeneratorType;
+        var deferredGlobalIteratorYieldResultType;
+        var deferredGlobalIteratorReturnResultType;
         var deferredGlobalAsyncIterableType;
         var deferredGlobalAsyncIteratorType;
         var deferredGlobalAsyncIterableIteratorType;
+        var deferredGlobalAsyncGeneratorType;
         var deferredGlobalTemplateStringsArrayType;
         var deferredGlobalImportMetaType;
         var deferredGlobalExtractSymbol;
-        var deferredGlobalExcludeSymbol;
-        var deferredGlobalPickSymbol;
+        var deferredGlobalOmitSymbol;
         var deferredGlobalBigIntType;
         var allPotentiallyUnusedIdentifiers = ts.createMap(); // key is file name
         var flowLoopStart = 0;
@@ -31539,6 +32045,8 @@ var ts;
         var symbolLinks = [];
         var nodeLinks = [];
         var flowLoopCaches = [];
+        var flowAssignmentKeys = [];
+        var flowAssignmentTypes = [];
         var flowLoopNodes = [];
         var flowLoopKeys = [];
         var flowLoopTypes = [];
@@ -31655,6 +32163,7 @@ var ts;
         var typeofType = createTypeofType();
         var _jsxNamespace;
         var _jsxFactoryEntity;
+        var outofbandVarianceMarkerHandler;
         var subtypeRelation = ts.createMap();
         var assignableRelation = ts.createMap();
         var comparableRelation = ts.createMap();
@@ -31679,6 +32188,19 @@ var ts;
             CheckMode[CheckMode["SkipGenericFunctions"] = 8] = "SkipGenericFunctions";
             CheckMode[CheckMode["IsForSignatureHelp"] = 16] = "IsForSignatureHelp";
         })(CheckMode || (CheckMode = {}));
+        var ContextFlags;
+        (function (ContextFlags) {
+            ContextFlags[ContextFlags["None"] = 0] = "None";
+            ContextFlags[ContextFlags["Signature"] = 1] = "Signature";
+        })(ContextFlags || (ContextFlags = {}));
+        var AccessFlags;
+        (function (AccessFlags) {
+            AccessFlags[AccessFlags["None"] = 0] = "None";
+            AccessFlags[AccessFlags["NoIndexSignatures"] = 1] = "NoIndexSignatures";
+            AccessFlags[AccessFlags["Writing"] = 2] = "Writing";
+            AccessFlags[AccessFlags["CacheSymbol"] = 4] = "CacheSymbol";
+            AccessFlags[AccessFlags["NoTupleBoundsCheck"] = 8] = "NoTupleBoundsCheck";
+        })(AccessFlags || (AccessFlags = {}));
         var CallbackCheck;
         (function (CallbackCheck) {
             CallbackCheck[CallbackCheck["None"] = 0] = "None";
@@ -31764,18 +32286,6 @@ var ts;
                 return diagnostic;
             }
         }
-        function addRelatedInfo(diagnostic) {
-            var relatedInformation = [];
-            for (var _i = 1; _i < arguments.length; _i++) {
-                relatedInformation[_i - 1] = arguments[_i];
-            }
-            var _a;
-            if (!diagnostic.relatedInformation) {
-                diagnostic.relatedInformation = [];
-            }
-            (_a = diagnostic.relatedInformation).push.apply(_a, relatedInformation);
-            return diagnostic;
-        }
         function error(location, message, arg0, arg1, arg2, arg3) {
             var diagnostic = location
                 ? ts.createDiagnosticForNode(location, message, arg0, arg1, arg2, arg3)
@@ -31794,6 +32304,14 @@ var ts;
         function errorOrSuggestion(isError, location, message, arg0, arg1, arg2, arg3) {
             addErrorOrSuggestion(isError, "message" in message ? ts.createDiagnosticForNode(location, message, arg0, arg1, arg2, arg3) : ts.createDiagnosticForNodeFromMessageChain(location, message));
         }
+        function errorAndMaybeSuggestAwait(location, maybeMissingAwait, message, arg0, arg1, arg2, arg3) {
+            var diagnostic = error(location, message, arg0, arg1, arg2, arg3);
+            if (maybeMissingAwait) {
+                var related = ts.createDiagnosticForNode(location, ts.Diagnostics.Did_you_forget_to_use_await);
+                ts.addRelatedInfo(diagnostic, related);
+            }
+            return diagnostic;
+        }
         function createSymbol(flags, name, checkFlags) {
             symbolCount++;
             var symbol = (new Symbol(flags | 33554432 /* Transient */, name));
@@ -31865,7 +32383,8 @@ var ts;
          * Note: if target is transient, then it is mutable, and mergeSymbol with both mutate and return it.
          * If target is not transient, mergeSymbol will produce a transient clone, mutate that and return it.
          */
-        function mergeSymbol(target, source) {
+        function mergeSymbol(target, source, unidirectional) {
+            if (unidirectional === void 0) { unidirectional = false; }
             if (!(target.flags & getExcludedSymbolFlags(source.flags)) ||
                 (source.flags | target.flags) & 67108864 /* Assignment */) {
                 ts.Debug.assert(source !== target);
@@ -31893,17 +32412,24 @@ var ts;
                 if (source.members) {
                     if (!target.members)
                         target.members = ts.createSymbolTable();
-                    mergeSymbolTable(target.members, source.members);
+                    mergeSymbolTable(target.members, source.members, unidirectional);
                 }
                 if (source.exports) {
                     if (!target.exports)
                         target.exports = ts.createSymbolTable();
-                    mergeSymbolTable(target.exports, source.exports);
+                    mergeSymbolTable(target.exports, source.exports, unidirectional);
+                }
+                if (!unidirectional) {
+                    recordMergedSymbol(target, source);
                 }
-                recordMergedSymbol(target, source);
             }
             else if (target.flags & 1024 /* NamespaceModule */) {
-                error(ts.getNameOfDeclaration(source.declarations[0]), ts.Diagnostics.Cannot_augment_module_0_with_value_exports_because_it_resolves_to_a_non_module_entity, symbolToString(target));
+                // Do not report an error when merging `var globalThis` with the built-in `globalThis`,
+                // as we will already report a "Declaration name conflicts..." error, and this error
+                // won't make much sense.
+                if (target !== globalThisSymbol) {
+                    error(ts.getNameOfDeclaration(source.declarations[0]), ts.Diagnostics.Cannot_augment_module_0_with_value_exports_because_it_resolves_to_a_non_module_entity, symbolToString(target));
+                }
             }
             else { // error
                 var isEitherEnum = !!(target.flags & 384 /* Enum */ || source.flags & 384 /* Enum */);
@@ -31955,7 +32481,7 @@ var ts;
                 err.relatedInformation = err.relatedInformation || [];
                 if (ts.length(err.relatedInformation) >= 5)
                     continue;
-                addRelatedInfo(err, !ts.length(err.relatedInformation) ? ts.createDiagnosticForNode(relatedNode, ts.Diagnostics._0_was_also_declared_here, symbolName) : ts.createDiagnosticForNode(relatedNode, ts.Diagnostics.and_here));
+                ts.addRelatedInfo(err, !ts.length(err.relatedInformation) ? ts.createDiagnosticForNode(relatedNode, ts.Diagnostics._0_was_also_declared_here, symbolName) : ts.createDiagnosticForNode(relatedNode, ts.Diagnostics.and_here));
             }
         }
         function combineSymbolTables(first, second) {
@@ -31968,10 +32494,11 @@ var ts;
             mergeSymbolTable(combined, second);
             return combined;
         }
-        function mergeSymbolTable(target, source) {
+        function mergeSymbolTable(target, source, unidirectional) {
+            if (unidirectional === void 0) { unidirectional = false; }
             source.forEach(function (sourceSymbol, id) {
                 var targetSymbol = target.get(id);
-                target.set(id, targetSymbol ? mergeSymbol(targetSymbol, sourceSymbol) : sourceSymbol);
+                target.set(id, targetSymbol ? mergeSymbol(targetSymbol, sourceSymbol, unidirectional) : sourceSymbol);
             });
         }
         function mergeModuleAugmentation(moduleName) {
@@ -31992,14 +32519,29 @@ var ts;
                 var moduleNotFoundError = !(moduleName.parent.parent.flags & 4194304 /* Ambient */)
                     ? ts.Diagnostics.Invalid_module_name_in_augmentation_module_0_cannot_be_found
                     : undefined;
-                var mainModule = resolveExternalModuleNameWorker(moduleName, moduleName, moduleNotFoundError, /*isForAugmentation*/ true);
-                if (!mainModule) {
+                var mainModule_1 = resolveExternalModuleNameWorker(moduleName, moduleName, moduleNotFoundError, /*isForAugmentation*/ true);
+                if (!mainModule_1) {
                     return;
                 }
                 // obtain item referenced by 'export='
-                mainModule = resolveExternalModuleSymbol(mainModule);
-                if (mainModule.flags & 1920 /* Namespace */) {
-                    mainModule = mergeSymbol(mainModule, moduleAugmentation.symbol);
+                mainModule_1 = resolveExternalModuleSymbol(mainModule_1);
+                if (mainModule_1.flags & 1920 /* Namespace */) {
+                    // If we’re merging an augmentation to a pattern ambient module, we want to
+                    // perform the merge unidirectionally from the augmentation ('a.foo') to
+                    // the pattern ('*.foo'), so that 'getMergedSymbol()' on a.foo gives you
+                    // all the exports both from the pattern and from the augmentation, but
+                    // 'getMergedSymbol()' on *.foo only gives you exports from *.foo.
+                    if (ts.some(patternAmbientModules, function (module) { return mainModule_1 === module.symbol; })) {
+                        var merged = mergeSymbol(moduleAugmentation.symbol, mainModule_1, /*unidirectional*/ true);
+                        if (!patternAmbientModuleAugmentations) {
+                            patternAmbientModuleAugmentations = ts.createMap();
+                        }
+                        // moduleName will be a StringLiteral since this is not `declare global`.
+                        patternAmbientModuleAugmentations.set(moduleName.text, merged);
+                    }
+                    else {
+                        mergeSymbol(mainModule_1, moduleAugmentation.symbol);
+                    }
                 }
                 else {
                     // moduleName will be a StringLiteral since this is not `declare global`.
@@ -32033,7 +32575,7 @@ var ts;
             return nodeLinks[nodeId] || (nodeLinks[nodeId] = { flags: 0 });
         }
         function isGlobalSourceFile(node) {
-            return node.kind === 284 /* SourceFile */ && !ts.isExternalOrCommonJsModule(node);
+            return node.kind === 285 /* SourceFile */ && !ts.isExternalOrCommonJsModule(node);
         }
         function getSymbol(symbols, name, meaning) {
             if (meaning) {
@@ -32091,17 +32633,17 @@ var ts;
             }
             if (declaration.pos <= usage.pos) {
                 // declaration is before usage
-                if (declaration.kind === 186 /* BindingElement */) {
+                if (declaration.kind === 187 /* BindingElement */) {
                     // still might be illegal if declaration and usage are both binding elements (eg var [a = b, b = b] = [1, 2])
-                    var errorBindingElement = ts.getAncestor(usage, 186 /* BindingElement */);
+                    var errorBindingElement = ts.getAncestor(usage, 187 /* BindingElement */);
                     if (errorBindingElement) {
                         return ts.findAncestor(errorBindingElement, ts.isBindingElement) !== ts.findAncestor(declaration, ts.isBindingElement) ||
                             declaration.pos < errorBindingElement.pos;
                     }
                     // or it might be illegal if usage happens before parent variable is declared (eg var [a] = a)
-                    return isBlockScopedNameDeclaredBeforeUse(ts.getAncestor(declaration, 237 /* VariableDeclaration */), usage);
+                    return isBlockScopedNameDeclaredBeforeUse(ts.getAncestor(declaration, 238 /* VariableDeclaration */), usage);
                 }
-                else if (declaration.kind === 237 /* VariableDeclaration */) {
+                else if (declaration.kind === 238 /* VariableDeclaration */) {
                     // still might be illegal if usage is in the initializer of the variable declaration (eg var a = a)
                     return !isImmediatelyUsedInInitializerOfBlockScopedVariable(declaration, usage);
                 }
@@ -32109,6 +32651,10 @@ var ts;
                     // still might be illegal if the usage is within a computed property name in the class (eg class A { static p = "a"; [A.p]() {} })
                     return !ts.findAncestor(usage, function (n) { return ts.isComputedPropertyName(n) && n.parent.parent === declaration; });
                 }
+                else if (ts.isPropertyDeclaration(declaration)) {
+                    // still might be illegal if a self-referencing property initializer (eg private x = this.x)
+                    return !isPropertyImmediatelyReferencedWithinDeclaration(declaration, usage);
+                }
                 return true;
             }
             // declaration is after usage, but it can still be legal if usage is deferred:
@@ -32120,12 +32666,12 @@ var ts;
             // or if usage is in a type context:
             // 1. inside a type query (typeof in type position)
             // 2. inside a jsdoc comment
-            if (usage.parent.kind === 257 /* ExportSpecifier */ || (usage.parent.kind === 254 /* ExportAssignment */ && usage.parent.isExportEquals)) {
+            if (usage.parent.kind === 258 /* ExportSpecifier */ || (usage.parent.kind === 255 /* ExportAssignment */ && usage.parent.isExportEquals)) {
                 // export specifiers do not use the variable, they only make it available for use
                 return true;
             }
             // When resolving symbols for exports, the `usage` location passed in can be the export site directly
-            if (usage.kind === 254 /* ExportAssignment */ && usage.isExportEquals) {
+            if (usage.kind === 255 /* ExportAssignment */ && usage.isExportEquals) {
                 return true;
             }
             var container = ts.getEnclosingBlockScopeContainer(declaration);
@@ -32133,9 +32679,9 @@ var ts;
             function isImmediatelyUsedInInitializerOfBlockScopedVariable(declaration, usage) {
                 var container = ts.getEnclosingBlockScopeContainer(declaration);
                 switch (declaration.parent.parent.kind) {
-                    case 219 /* VariableStatement */:
-                    case 225 /* ForStatement */:
-                    case 227 /* ForOfStatement */:
+                    case 220 /* VariableStatement */:
+                    case 226 /* ForStatement */:
+                    case 228 /* ForOfStatement */:
                         // variable statement/for/for-of statement case,
                         // use site should not be inside variable declaration (initializer of declaration or binding element)
                         if (isSameScopeDescendentOf(usage, declaration, container)) {
@@ -32156,16 +32702,16 @@ var ts;
                         return true;
                     }
                     var initializerOfProperty = current.parent &&
-                        current.parent.kind === 154 /* PropertyDeclaration */ &&
+                        current.parent.kind === 155 /* PropertyDeclaration */ &&
                         current.parent.initializer === current;
                     if (initializerOfProperty) {
                         if (ts.hasModifier(current.parent, 32 /* Static */)) {
-                            if (declaration.kind === 156 /* MethodDeclaration */) {
+                            if (declaration.kind === 157 /* MethodDeclaration */) {
                                 return true;
                             }
                         }
                         else {
-                            var isDeclarationInstanceProperty = declaration.kind === 154 /* PropertyDeclaration */ && !ts.hasModifier(declaration, 32 /* Static */);
+                            var isDeclarationInstanceProperty = declaration.kind === 155 /* PropertyDeclaration */ && !ts.hasModifier(declaration, 32 /* Static */);
                             if (!isDeclarationInstanceProperty || ts.getContainingClass(usage) !== ts.getContainingClass(declaration)) {
                                 return true;
                             }
@@ -32174,6 +32720,36 @@ var ts;
                     return false;
                 });
             }
+            function isPropertyImmediatelyReferencedWithinDeclaration(declaration, usage) {
+                // always legal if usage is after declaration
+                if (usage.end > declaration.end) {
+                    return false;
+                }
+                // still might be legal if usage is deferred (e.g. x: any = () => this.x)
+                // otherwise illegal if immediately referenced within the declaration (e.g. x: any = this.x)
+                var ancestorChangingReferenceScope = ts.findAncestor(usage, function (node) {
+                    if (node === declaration) {
+                        return "quit";
+                    }
+                    switch (node.kind) {
+                        case 198 /* ArrowFunction */:
+                        case 155 /* PropertyDeclaration */:
+                            return true;
+                        case 219 /* Block */:
+                            switch (node.parent.kind) {
+                                case 159 /* GetAccessor */:
+                                case 157 /* MethodDeclaration */:
+                                case 160 /* SetAccessor */:
+                                    return true;
+                                default:
+                                    return false;
+                            }
+                        default:
+                            return false;
+                    }
+                });
+                return ancestorChangingReferenceScope === undefined;
+            }
         }
         /**
          * Resolve a given name for a given meaning at a given location. An error is reported if the name was not found and
@@ -32192,6 +32768,8 @@ var ts;
             var lastLocation;
             var lastSelfReferenceLocation;
             var propertyWithInvalidInitializer;
+            var associatedDeclarationForContainingInitializer;
+            var withinDeferredContext = false;
             var errorLocation = location;
             var grandparent;
             var isInExternalModule = false;
@@ -32207,12 +32785,12 @@ var ts;
                             // - parameters are only in the scope of function body
                             // This restriction does not apply to JSDoc comment types because they are parented
                             // at a higher level than type parameters would normally be
-                            if (meaning & result.flags & 67897832 /* Type */ && lastLocation.kind !== 296 /* JSDocComment */) {
+                            if (meaning & result.flags & 67897832 /* Type */ && lastLocation.kind !== 297 /* JSDocComment */) {
                                 useResult = result.flags & 262144 /* TypeParameter */
                                     // type parameters are visible in parameter list, return type and type parameter list
                                     ? lastLocation === location.type ||
-                                        lastLocation.kind === 151 /* Parameter */ ||
-                                        lastLocation.kind === 150 /* TypeParameter */
+                                        lastLocation.kind === 152 /* Parameter */ ||
+                                        lastLocation.kind === 151 /* TypeParameter */
                                     // local types not visible outside the function body
                                     : false;
                             }
@@ -32229,13 +32807,13 @@ var ts;
                                     // however it is detected separately when checking initializers of parameters
                                     // to make sure that they reference no variables declared after them.
                                     useResult =
-                                        lastLocation.kind === 151 /* Parameter */ ||
+                                        lastLocation.kind === 152 /* Parameter */ ||
                                             (lastLocation === location.type &&
                                                 !!ts.findAncestor(result.valueDeclaration, ts.isParameter));
                                 }
                             }
                         }
-                        else if (location.kind === 175 /* ConditionalType */) {
+                        else if (location.kind === 176 /* ConditionalType */) {
                             // A type parameter declared using 'infer T' in a conditional type is visible only in
                             // the true branch of the conditional type.
                             useResult = lastLocation === location.trueType;
@@ -32248,15 +32826,16 @@ var ts;
                         }
                     }
                 }
+                withinDeferredContext = withinDeferredContext || getIsDeferredContext(location, lastLocation);
                 switch (location.kind) {
-                    case 284 /* SourceFile */:
+                    case 285 /* SourceFile */:
                         if (!ts.isExternalOrCommonJsModule(location))
                             break;
                         isInExternalModule = true;
                     // falls through
-                    case 244 /* ModuleDeclaration */:
+                    case 245 /* ModuleDeclaration */:
                         var moduleExports = getSymbolOfNode(location).exports;
-                        if (location.kind === 284 /* SourceFile */ || ts.isAmbientModule(location)) {
+                        if (location.kind === 285 /* SourceFile */ || ts.isAmbientModule(location)) {
                             // It's an external module. First see if the module has an export default and if the local
                             // name of that export default matches.
                             if (result = moduleExports.get("default" /* Default */)) {
@@ -32280,7 +32859,7 @@ var ts;
                             var moduleExport = moduleExports.get(name);
                             if (moduleExport &&
                                 moduleExport.flags === 2097152 /* Alias */ &&
-                                ts.getDeclarationOfKind(moduleExport, 257 /* ExportSpecifier */)) {
+                                ts.getDeclarationOfKind(moduleExport, 258 /* ExportSpecifier */)) {
                                 break;
                             }
                         }
@@ -32294,20 +32873,19 @@ var ts;
                             }
                         }
                         break;
-                    case 243 /* EnumDeclaration */:
+                    case 244 /* EnumDeclaration */:
                         if (result = lookup(getSymbolOfNode(location).exports, name, meaning & 8 /* EnumMember */)) {
                             break loop;
                         }
                         break;
-                    case 154 /* PropertyDeclaration */:
-                    case 153 /* PropertySignature */:
+                    case 155 /* PropertyDeclaration */:
                         // TypeScript 1.0 spec (April 2014): 8.4.1
                         // Initializer expressions for instance member variables are evaluated in the scope
                         // of the class constructor body but are not permitted to reference parameters or
                         // local variables of the constructor. This effectively means that entities from outer scopes
                         // by the same name as a constructor parameter or local variable are inaccessible
                         // in initializer expressions for instance member variables.
-                        if (ts.isClassLike(location.parent) && !ts.hasModifier(location, 32 /* Static */)) {
+                        if (!ts.hasModifier(location, 32 /* Static */)) {
                             var ctor = findConstructorDeclaration(location.parent);
                             if (ctor && ctor.locals) {
                                 if (lookup(ctor.locals, name, meaning & 67220415 /* Value */)) {
@@ -32317,9 +32895,9 @@ var ts;
                             }
                         }
                         break;
-                    case 240 /* ClassDeclaration */:
-                    case 209 /* ClassExpression */:
-                    case 241 /* InterfaceDeclaration */:
+                    case 241 /* ClassDeclaration */:
+                    case 210 /* ClassExpression */:
+                    case 242 /* InterfaceDeclaration */:
                         // The below is used to lookup type parameters within a class or interface, as they are added to the class/interface locals
                         // These can never be latebound, so the symbol's raw members are sufficient. `getMembersOfNode` cannot be used, as it would
                         // trigger resolving late-bound names, which we may already be in the process of doing while we're here!
@@ -32338,7 +32916,7 @@ var ts;
                             }
                             break loop;
                         }
-                        if (location.kind === 209 /* ClassExpression */ && meaning & 32 /* Class */) {
+                        if (location.kind === 210 /* ClassExpression */ && meaning & 32 /* Class */) {
                             var className = location.name;
                             if (className && name === className.escapedText) {
                                 result = location.symbol;
@@ -32346,9 +32924,9 @@ var ts;
                             }
                         }
                         break;
-                    case 211 /* ExpressionWithTypeArguments */:
+                    case 212 /* ExpressionWithTypeArguments */:
                         // The type parameters of a class are not in scope in the base class expression.
-                        if (lastLocation === location.expression && location.parent.token === 86 /* ExtendsKeyword */) {
+                        if (lastLocation === location.expression && location.parent.token === 87 /* ExtendsKeyword */) {
                             var container = location.parent.parent;
                             if (ts.isClassLike(container) && (result = lookup(getSymbolOfNode(container).members, name, meaning & 67897832 /* Type */))) {
                                 if (nameNotFoundMessage) {
@@ -32366,9 +32944,9 @@ var ts;
                     //       [foo<T>()]() { } // <-- Reference to T from class's own computed property
                     //   }
                     //
-                    case 149 /* ComputedPropertyName */:
+                    case 150 /* ComputedPropertyName */:
                         grandparent = location.parent.parent;
-                        if (ts.isClassLike(grandparent) || grandparent.kind === 241 /* InterfaceDeclaration */) {
+                        if (ts.isClassLike(grandparent) || grandparent.kind === 242 /* InterfaceDeclaration */) {
                             // A reference to this grandparent's type parameters would be an error
                             if (result = lookup(getSymbolOfNode(grandparent).members, name, meaning & 67897832 /* Type */)) {
                                 error(errorLocation, ts.Diagnostics.A_computed_property_name_cannot_reference_a_type_parameter_from_its_containing_type);
@@ -32376,24 +32954,24 @@ var ts;
                             }
                         }
                         break;
-                    case 197 /* ArrowFunction */:
+                    case 198 /* ArrowFunction */:
                         // when targeting ES6 or higher there is no 'arguments' in an arrow function
                         // for lower compile targets the resolved symbol is used to emit an error
                         if (compilerOptions.target >= 2 /* ES2015 */) {
                             break;
                         }
                     // falls through
-                    case 156 /* MethodDeclaration */:
-                    case 157 /* Constructor */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
-                    case 239 /* FunctionDeclaration */:
+                    case 157 /* MethodDeclaration */:
+                    case 158 /* Constructor */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
+                    case 240 /* FunctionDeclaration */:
                         if (meaning & 3 /* Variable */ && name === "arguments") {
                             result = argumentsSymbol;
                             break loop;
                         }
                         break;
-                    case 196 /* FunctionExpression */:
+                    case 197 /* FunctionExpression */:
                         if (meaning & 3 /* Variable */ && name === "arguments") {
                             result = argumentsSymbol;
                             break loop;
@@ -32406,7 +32984,7 @@ var ts;
                             }
                         }
                         break;
-                    case 152 /* Decorator */:
+                    case 153 /* Decorator */:
                         // Decorators are resolved at the class declaration. Resolving at the parameter
                         // or member would result in looking up locals in the method.
                         //
@@ -32415,7 +32993,7 @@ var ts;
                         //       method(@y x, y) {} // <-- decorator y should be resolved at the class declaration, not the parameter.
                         //   }
                         //
-                        if (location.parent && location.parent.kind === 151 /* Parameter */) {
+                        if (location.parent && location.parent.kind === 152 /* Parameter */) {
                             location = location.parent;
                         }
                         //
@@ -32424,15 +33002,34 @@ var ts;
                         //       @y method(x, y) {} // <-- decorator y should be resolved at the class declaration, not the method.
                         //   }
                         //
-                        if (location.parent && ts.isClassElement(location.parent)) {
+                        // class Decorators are resolved outside of the class to avoid referencing type parameters of that class.
+                        //
+                        //   type T = number;
+                        //   declare function y(x: T): any;
+                        //   @param(1 as T) // <-- T should resolve to the type alias outside of class C
+                        //   class C<T> {}
+                        if (location.parent && (ts.isClassElement(location.parent) || location.parent.kind === 241 /* ClassDeclaration */)) {
                             location = location.parent;
                         }
                         break;
-                    case 309 /* JSDocTypedefTag */:
-                    case 302 /* JSDocCallbackTag */:
+                    case 311 /* JSDocTypedefTag */:
+                    case 304 /* JSDocCallbackTag */:
                         // js type aliases do not resolve names from their host, so skip past it
                         location = ts.getJSDocHost(location);
                         break;
+                    case 152 /* Parameter */:
+                        if (lastLocation && lastLocation === location.initializer) {
+                            associatedDeclarationForContainingInitializer = location;
+                        }
+                        break;
+                    case 187 /* BindingElement */:
+                        if (lastLocation && lastLocation === location.initializer) {
+                            var root = ts.getRootDeclaration(location);
+                            if (root.kind === 152 /* Parameter */) {
+                                associatedDeclarationForContainingInitializer = location;
+                            }
+                        }
+                        break;
                 }
                 if (isSelfReferenceLocation(location)) {
                     lastSelfReferenceLocation = location;
@@ -32448,7 +33045,7 @@ var ts;
             }
             if (!result) {
                 if (lastLocation) {
-                    ts.Debug.assert(lastLocation.kind === 284 /* SourceFile */);
+                    ts.Debug.assert(lastLocation.kind === 285 /* SourceFile */);
                     if (lastLocation.commonJsModuleIndicator && name === "exports" && meaning & lastLocation.symbol.flags) {
                         return lastLocation.symbol;
                     }
@@ -32480,7 +33077,7 @@ var ts;
                                 var suggestionName = symbolToString(suggestion);
                                 var diagnostic = error(errorLocation, suggestedNameNotFoundMessage, diagnosticName(nameArg), suggestionName);
                                 if (suggestion.valueDeclaration) {
-                                    addRelatedInfo(diagnostic, ts.createDiagnosticForNode(suggestion.valueDeclaration, ts.Diagnostics._0_is_declared_here, suggestionName));
+                                    ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(suggestion.valueDeclaration, ts.Diagnostics._0_is_declared_here, suggestionName));
                                 }
                             }
                         }
@@ -32524,20 +33121,48 @@ var ts;
                 if (result && isInExternalModule && (meaning & 67220415 /* Value */) === 67220415 /* Value */ && !(originalLocation.flags & 2097152 /* JSDoc */)) {
                     var merged = getMergedSymbol(result);
                     if (ts.length(merged.declarations) && ts.every(merged.declarations, function (d) { return ts.isNamespaceExportDeclaration(d) || ts.isSourceFile(d) && !!d.symbol.globalExports; })) {
-                        error(errorLocation, ts.Diagnostics._0_refers_to_a_UMD_global_but_the_current_file_is_a_module_Consider_adding_an_import_instead, ts.unescapeLeadingUnderscores(name)); // TODO: GH#18217
+                        errorOrSuggestion(!compilerOptions.allowUmdGlobalAccess, errorLocation, ts.Diagnostics._0_refers_to_a_UMD_global_but_the_current_file_is_a_module_Consider_adding_an_import_instead, ts.unescapeLeadingUnderscores(name));
+                    }
+                }
+                // If we're in a parameter initializer, we can't reference the values of the parameter whose initializer we're within or parameters to the right
+                if (result && associatedDeclarationForContainingInitializer && !withinDeferredContext && (meaning & 67220415 /* Value */) === 67220415 /* Value */) {
+                    var candidate = getMergedSymbol(getLateBoundSymbol(result));
+                    var root = ts.getRootDeclaration(associatedDeclarationForContainingInitializer);
+                    // A parameter initializer or binding pattern initializer within a parameter cannot refer to itself
+                    if (candidate === getSymbolOfNode(associatedDeclarationForContainingInitializer)) {
+                        error(errorLocation, ts.Diagnostics.Parameter_0_cannot_be_referenced_in_its_initializer, ts.declarationNameToString(associatedDeclarationForContainingInitializer.name));
+                    }
+                    // And it cannot refer to any declarations which come after it
+                    else if (candidate.valueDeclaration && candidate.valueDeclaration.pos > associatedDeclarationForContainingInitializer.pos && root.parent.locals && lookup(root.parent.locals, candidate.escapedName, meaning) === candidate) {
+                        error(errorLocation, ts.Diagnostics.Initializer_of_parameter_0_cannot_reference_identifier_1_declared_after_it, ts.declarationNameToString(associatedDeclarationForContainingInitializer.name), ts.declarationNameToString(errorLocation));
                     }
                 }
             }
             return result;
         }
+        function getIsDeferredContext(location, lastLocation) {
+            if (location.kind !== 198 /* ArrowFunction */ && location.kind !== 197 /* FunctionExpression */) {
+                // initializers in instance property declaration of class like entities are executed in constructor and thus deferred
+                return ts.isTypeQueryNode(location) || ((ts.isFunctionLikeDeclaration(location) ||
+                    (location.kind === 155 /* PropertyDeclaration */ && !ts.hasModifier(location, 32 /* Static */))) && (!lastLocation || lastLocation !== location.name)); // A name is evaluated within the enclosing scope - so it shouldn't count as deferred
+            }
+            if (lastLocation && lastLocation === location.name) {
+                return false;
+            }
+            // generator functions and async functions are not inlined in control flow when immediately invoked
+            if (location.asteriskToken || ts.hasModifier(location, 256 /* Async */)) {
+                return true;
+            }
+            return !ts.getImmediatelyInvokedFunctionExpression(location);
+        }
         function isSelfReferenceLocation(node) {
             switch (node.kind) {
-                case 239 /* FunctionDeclaration */:
-                case 240 /* ClassDeclaration */:
-                case 241 /* InterfaceDeclaration */:
-                case 243 /* EnumDeclaration */:
-                case 242 /* TypeAliasDeclaration */:
-                case 244 /* ModuleDeclaration */: // For `namespace N { N; }`
+                case 240 /* FunctionDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 242 /* InterfaceDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
+                case 245 /* ModuleDeclaration */: // For `namespace N { N; }`
                     return true;
                 default:
                     return false;
@@ -32549,7 +33174,7 @@ var ts;
         function isTypeParameterSymbolDeclaredInContainer(symbol, container) {
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var decl = _a[_i];
-                if (decl.kind === 150 /* TypeParameter */) {
+                if (decl.kind === 151 /* TypeParameter */) {
                     var parent = ts.isJSDocTemplateTag(decl.parent) ? ts.getJSDocHost(decl.parent) : decl.parent;
                     if (parent === container) {
                         return !(ts.isJSDocTemplateTag(decl.parent) && ts.find(decl.parent.parent.tags, ts.isJSDocTypeAlias)); // TODO: GH#18217
@@ -32604,10 +33229,10 @@ var ts;
          */
         function getEntityNameForExtendingInterface(node) {
             switch (node.kind) {
-                case 72 /* Identifier */:
-                case 189 /* PropertyAccessExpression */:
+                case 73 /* Identifier */:
+                case 190 /* PropertyAccessExpression */:
                     return node.parent ? getEntityNameForExtendingInterface(node.parent) : undefined;
-                case 211 /* ExpressionWithTypeArguments */:
+                case 212 /* ExpressionWithTypeArguments */:
                     if (ts.isEntityNameExpression(node.expression)) {
                         return node.expression;
                     }
@@ -32696,7 +33321,7 @@ var ts;
         function checkResolvedBlockScopedVariable(result, errorLocation) {
             ts.Debug.assert(!!(result.flags & 2 /* BlockScopedVariable */ || result.flags & 32 /* Class */ || result.flags & 384 /* Enum */));
             // Block-scoped variables cannot be used before their definition
-            var declaration = ts.find(result.declarations, function (d) { return ts.isBlockOrCatchScoped(d) || ts.isClassLike(d) || (d.kind === 243 /* EnumDeclaration */) || ts.isInJSFile(d) && !!ts.getJSDocEnumTag(d); });
+            var declaration = ts.find(result.declarations, function (d) { return ts.isBlockOrCatchScoped(d) || ts.isClassLike(d) || (d.kind === 244 /* EnumDeclaration */) || ts.isInJSFile(d) && !!ts.getJSDocEnumTag(d); });
             if (declaration === undefined)
                 return ts.Debug.fail("Declaration to checkResolvedBlockScopedVariable is undefined");
             if (!(declaration.flags & 4194304 /* Ambient */) && !isBlockScopedNameDeclaredBeforeUse(declaration, errorLocation)) {
@@ -32718,7 +33343,7 @@ var ts;
                     }
                 }
                 if (diagnosticMessage) {
-                    addRelatedInfo(diagnosticMessage, ts.createDiagnosticForNode(declaration, ts.Diagnostics._0_is_declared_here, declarationName));
+                    ts.addRelatedInfo(diagnosticMessage, ts.createDiagnosticForNode(declaration, ts.Diagnostics._0_is_declared_here, declarationName));
                 }
             }
         }
@@ -32731,13 +33356,13 @@ var ts;
         }
         function getAnyImportSyntax(node) {
             switch (node.kind) {
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return node;
-                case 250 /* ImportClause */:
+                case 251 /* ImportClause */:
                     return node.parent;
-                case 251 /* NamespaceImport */:
+                case 252 /* NamespaceImport */:
                     return node.parent.parent;
-                case 253 /* ImportSpecifier */:
+                case 254 /* ImportSpecifier */:
                     return node.parent.parent.parent;
                 default:
                     return undefined;
@@ -32747,7 +33372,7 @@ var ts;
             return ts.find(symbol.declarations, ts.isAliasSymbolDeclaration);
         }
         function getTargetOfImportEqualsDeclaration(node, dontResolveAlias) {
-            if (node.moduleReference.kind === 259 /* ExternalModuleReference */) {
+            if (node.moduleReference.kind === 260 /* ExternalModuleReference */) {
                 return resolveExternalModuleSymbol(resolveExternalModuleName(node, ts.getExternalModuleImportEqualsDeclarationExpression(node)));
             }
             return getSymbolOfPartOfRightHandSideOfImportEquals(node.moduleReference, dontResolveAlias);
@@ -32804,7 +33429,16 @@ var ts;
                 var file = ts.find(moduleSymbol.declarations, ts.isSourceFile);
                 var hasSyntheticDefault = canHaveSyntheticDefault(file, moduleSymbol, dontResolveAlias);
                 if (!exportDefaultSymbol && !hasSyntheticDefault) {
-                    error(node.name, ts.Diagnostics.Module_0_has_no_default_export, symbolToString(moduleSymbol));
+                    if (hasExportAssignmentSymbol(moduleSymbol)) {
+                        var compilerOptionName = moduleKind >= ts.ModuleKind.ES2015 ? "allowSyntheticDefaultImports" : "esModuleInterop";
+                        var exportEqualsSymbol = moduleSymbol.exports.get("export=" /* ExportEquals */);
+                        var exportAssignment = exportEqualsSymbol.valueDeclaration;
+                        var err = error(node.name, ts.Diagnostics.Module_0_can_only_be_default_imported_using_the_1_flag, symbolToString(moduleSymbol), compilerOptionName);
+                        ts.addRelatedInfo(err, ts.createDiagnosticForNode(exportAssignment, ts.Diagnostics.This_module_is_declared_with_using_export_and_can_only_be_used_with_a_default_import_when_using_the_0_flag, compilerOptionName));
+                    }
+                    else {
+                        error(node.name, ts.Diagnostics.Module_0_has_no_default_export, symbolToString(moduleSymbol));
+                    }
                 }
                 else if (hasSyntheticDefault) {
                     // per emit behavior, a synthetic default overrides a "real" .default member if `__esModule` is not present
@@ -32902,7 +33536,7 @@ var ts;
                             var suggestionName = symbolToString(suggestion);
                             var diagnostic = error(name, ts.Diagnostics.Module_0_has_no_exported_member_1_Did_you_mean_2, moduleName, declarationName, suggestionName);
                             if (suggestion.valueDeclaration) {
-                                addRelatedInfo(diagnostic, ts.createDiagnosticForNode(suggestion.valueDeclaration, ts.Diagnostics._0_is_declared_here, suggestionName));
+                                ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(suggestion.valueDeclaration, ts.Diagnostics._0_is_declared_here, suggestionName));
                             }
                         }
                         else {
@@ -32939,20 +33573,20 @@ var ts;
         function getTargetOfAliasDeclaration(node, dontRecursivelyResolve) {
             if (dontRecursivelyResolve === void 0) { dontRecursivelyResolve = false; }
             switch (node.kind) {
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return getTargetOfImportEqualsDeclaration(node, dontRecursivelyResolve);
-                case 250 /* ImportClause */:
+                case 251 /* ImportClause */:
                     return getTargetOfImportClause(node, dontRecursivelyResolve);
-                case 251 /* NamespaceImport */:
+                case 252 /* NamespaceImport */:
                     return getTargetOfNamespaceImport(node, dontRecursivelyResolve);
-                case 253 /* ImportSpecifier */:
+                case 254 /* ImportSpecifier */:
                     return getTargetOfImportSpecifier(node, dontRecursivelyResolve);
-                case 257 /* ExportSpecifier */:
+                case 258 /* ExportSpecifier */:
                     return getTargetOfExportSpecifier(node, 67220415 /* Value */ | 67897832 /* Type */ | 1920 /* Namespace */, dontRecursivelyResolve);
-                case 254 /* ExportAssignment */:
-                case 204 /* BinaryExpression */:
+                case 255 /* ExportAssignment */:
+                case 205 /* BinaryExpression */:
                     return getTargetOfExportAssignment(node, dontRecursivelyResolve);
-                case 247 /* NamespaceExportDeclaration */:
+                case 248 /* NamespaceExportDeclaration */:
                     return getTargetOfNamespaceExportDeclaration(node, dontRecursivelyResolve);
                 default:
                     return ts.Debug.fail();
@@ -33013,11 +33647,11 @@ var ts;
                 var node = getDeclarationOfAliasSymbol(symbol);
                 if (!node)
                     return ts.Debug.fail();
-                if (node.kind === 254 /* ExportAssignment */) {
+                if (node.kind === 255 /* ExportAssignment */) {
                     // export default <symbol>
                     checkExpressionCached(node.expression);
                 }
-                else if (node.kind === 257 /* ExportSpecifier */) {
+                else if (node.kind === 258 /* ExportSpecifier */) {
                     // export { <symbol> } or export { <symbol> as foo }
                     checkExpressionCached(node.propertyName || node.name);
                 }
@@ -33035,17 +33669,17 @@ var ts;
             //     import a = |b|; // Namespace
             //     import a = |b.c|; // Value, type, namespace
             //     import a = |b.c|.d; // Namespace
-            if (entityName.kind === 72 /* Identifier */ && ts.isRightSideOfQualifiedNameOrPropertyAccess(entityName)) {
+            if (entityName.kind === 73 /* Identifier */ && ts.isRightSideOfQualifiedNameOrPropertyAccess(entityName)) {
                 entityName = entityName.parent;
             }
             // Check for case 1 and 3 in the above example
-            if (entityName.kind === 72 /* Identifier */ || entityName.parent.kind === 148 /* QualifiedName */) {
+            if (entityName.kind === 73 /* Identifier */ || entityName.parent.kind === 149 /* QualifiedName */) {
                 return resolveEntityName(entityName, 1920 /* Namespace */, /*ignoreErrors*/ false, dontResolveAlias);
             }
             else {
                 // Case 2 in above example
                 // entityName.kind could be a QualifiedName or a Missing identifier
-                ts.Debug.assert(entityName.parent.kind === 248 /* ImportEqualsDeclaration */);
+                ts.Debug.assert(entityName.parent.kind === 249 /* ImportEqualsDeclaration */);
                 return resolveEntityName(entityName, 67220415 /* Value */ | 67897832 /* Type */ | 1920 /* Namespace */, /*ignoreErrors*/ false, dontResolveAlias);
             }
         }
@@ -33061,17 +33695,17 @@ var ts;
             }
             var namespaceMeaning = 1920 /* Namespace */ | (ts.isInJSFile(name) ? meaning & 67220415 /* Value */ : 0);
             var symbol;
-            if (name.kind === 72 /* Identifier */) {
-                var message = meaning === namespaceMeaning ? ts.Diagnostics.Cannot_find_namespace_0 : getCannotFindNameDiagnosticForName(getFirstIdentifier(name).escapedText);
+            if (name.kind === 73 /* Identifier */) {
+                var message = meaning === namespaceMeaning ? ts.Diagnostics.Cannot_find_namespace_0 : getCannotFindNameDiagnosticForName(getFirstIdentifier(name));
                 var symbolFromJSPrototype = ts.isInJSFile(name) ? resolveEntityNameFromAssignmentDeclaration(name, meaning) : undefined;
                 symbol = resolveName(location || name, name.escapedText, meaning, ignoreErrors || symbolFromJSPrototype ? undefined : message, name, /*isUse*/ true);
                 if (!symbol) {
                     return symbolFromJSPrototype;
                 }
             }
-            else if (name.kind === 148 /* QualifiedName */ || name.kind === 189 /* PropertyAccessExpression */) {
-                var left = name.kind === 148 /* QualifiedName */ ? name.left : name.expression;
-                var right = name.kind === 148 /* QualifiedName */ ? name.right : name.name;
+            else if (name.kind === 149 /* QualifiedName */ || name.kind === 190 /* PropertyAccessExpression */) {
+                var left = name.kind === 149 /* QualifiedName */ ? name.left : name.expression;
+                var right = name.kind === 149 /* QualifiedName */ ? name.right : name.name;
                 var namespace = resolveEntityName(left, namespaceMeaning, ignoreErrors, /*dontResolveAlias*/ false, location);
                 if (!namespace || ts.nodeIsMissing(right)) {
                     return undefined;
@@ -33206,6 +33840,14 @@ var ts;
             if (patternAmbientModules) {
                 var pattern = ts.findBestPatternMatch(patternAmbientModules, function (_) { return _.pattern; }, moduleReference);
                 if (pattern) {
+                    // If the module reference matched a pattern ambient module ('*.foo') but there’s also a
+                    // module augmentation by the specific name requested ('a.foo'), we store the merged symbol
+                    // by the augmentation name ('a.foo'), because asking for *.foo should not give you exports
+                    // from a.foo.
+                    var augmentation = patternAmbientModuleAugmentations && patternAmbientModuleAugmentations.get(moduleReference);
+                    if (augmentation) {
+                        return getMergedSymbol(augmentation);
+                    }
                     return getMergedSymbol(pattern.symbol);
                 }
             }
@@ -33222,20 +33864,12 @@ var ts;
                 return undefined;
             }
             if (moduleNotFoundError) {
-                // For relative paths, see if this was possibly a projectReference redirect
-                if (ts.pathIsRelative(moduleReference)) {
-                    var sourceFile_1 = ts.getSourceFileOfNode(location);
-                    var redirects = sourceFile_1.redirectedReferences;
-                    if (redirects) {
-                        var normalizedTargetPath = ts.getNormalizedAbsolutePath(moduleReference, ts.getDirectoryPath(sourceFile_1.fileName));
-                        for (var _i = 0, _a = [".ts" /* Ts */, ".tsx" /* Tsx */]; _i < _a.length; _i++) {
-                            var ext = _a[_i];
-                            var probePath = normalizedTargetPath + ext;
-                            if (redirects.indexOf(probePath) >= 0) {
-                                error(errorNode, ts.Diagnostics.Output_file_0_has_not_been_built_from_source_file_1, moduleReference, probePath);
-                                return undefined;
-                            }
-                        }
+                // See if this was possibly a projectReference redirect
+                if (resolvedModule) {
+                    var redirect = host.getProjectReferenceRedirect(resolvedModule.resolvedFileName);
+                    if (redirect) {
+                        error(errorNode, ts.Diagnostics.Output_file_0_has_not_been_built_from_source_file_1, redirect, resolvedModule.resolvedFileName);
+                        return undefined;
                     }
                 }
                 if (resolutionDiagnostic) {
@@ -33304,7 +33938,7 @@ var ts;
         function resolveESModuleSymbol(moduleSymbol, referencingLocation, dontResolveAlias) {
             var symbol = resolveExternalModuleSymbol(moduleSymbol, dontResolveAlias);
             if (!dontResolveAlias && symbol) {
-                if (!(symbol.flags & (1536 /* Module */ | 3 /* Variable */)) && !ts.getDeclarationOfKind(symbol, 284 /* SourceFile */)) {
+                if (!(symbol.flags & (1536 /* Module */ | 3 /* Variable */)) && !ts.getDeclarationOfKind(symbol, 285 /* SourceFile */)) {
                     var compilerOptionName = moduleKind >= ts.ModuleKind.ES2015
                         ? "allowSyntheticDefaultImports"
                         : "esModuleInterop";
@@ -33566,7 +34200,7 @@ var ts;
             var members = node.members;
             for (var _i = 0, members_2 = members; _i < members_2.length; _i++) {
                 var member = members_2[_i];
-                if (member.kind === 157 /* Constructor */ && ts.nodeIsPresent(member.body)) {
+                if (member.kind === 158 /* Constructor */ && ts.nodeIsPresent(member.body)) {
                     return member;
                 }
             }
@@ -33577,13 +34211,10 @@ var ts;
             result.id = typeCount;
             return result;
         }
-        function createIntrinsicType(kind, intrinsicName) {
+        function createIntrinsicType(kind, intrinsicName, objectFlags) {
+            if (objectFlags === void 0) { objectFlags = 0; }
             var type = createType(kind);
             type.intrinsicName = intrinsicName;
-            return type;
-        }
-        function createNullableType(kind, intrinsicName, objectFlags) {
-            var type = createIntrinsicType(kind, intrinsicName);
             type.objectFlags = objectFlags;
             return type;
         }
@@ -33655,12 +34286,12 @@ var ts;
                     }
                 }
                 switch (location.kind) {
-                    case 284 /* SourceFile */:
+                    case 285 /* SourceFile */:
                         if (!ts.isExternalOrCommonJsModule(location)) {
                             break;
                         }
                     // falls through
-                    case 244 /* ModuleDeclaration */:
+                    case 245 /* ModuleDeclaration */:
                         if (result = callback(getSymbolOfNode(location).exports)) {
                             return result;
                         }
@@ -33724,7 +34355,7 @@ var ts;
                         && (!useOnlyExternalAliasing || ts.some(symbolFromSymbolTable.declarations, ts.isExternalModuleImportEqualsDeclaration))
                         // While exports are generally considered to be in scope, export-specifier declared symbols are _not_
                         // See similar comment in `resolveName` for details
-                        && (ignoreQualification || !ts.getDeclarationOfKind(symbolFromSymbolTable, 257 /* ExportSpecifier */))) {
+                        && (ignoreQualification || !ts.getDeclarationOfKind(symbolFromSymbolTable, 258 /* ExportSpecifier */))) {
                         var resolvedImportedSymbol = resolveAlias(symbolFromSymbolTable);
                         if (isAccessible(symbolFromSymbolTable, resolvedImportedSymbol, ignoreQualification)) {
                             return [symbolFromSymbolTable];
@@ -33760,7 +34391,7 @@ var ts;
                     return true;
                 }
                 // Qualify if the symbol from symbol table has same meaning as expected
-                symbolFromSymbolTable = (symbolFromSymbolTable.flags & 2097152 /* Alias */ && !ts.getDeclarationOfKind(symbolFromSymbolTable, 257 /* ExportSpecifier */)) ? resolveAlias(symbolFromSymbolTable) : symbolFromSymbolTable;
+                symbolFromSymbolTable = (symbolFromSymbolTable.flags & 2097152 /* Alias */ && !ts.getDeclarationOfKind(symbolFromSymbolTable, 258 /* ExportSpecifier */)) ? resolveAlias(symbolFromSymbolTable) : symbolFromSymbolTable;
                 if (symbolFromSymbolTable.flags & meaning) {
                     qualify = true;
                     return true;
@@ -33775,10 +34406,10 @@ var ts;
                 for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                     var declaration = _a[_i];
                     switch (declaration.kind) {
-                        case 154 /* PropertyDeclaration */:
-                        case 156 /* MethodDeclaration */:
-                        case 158 /* GetAccessor */:
-                        case 159 /* SetAccessor */:
+                        case 155 /* PropertyDeclaration */:
+                        case 157 /* MethodDeclaration */:
+                        case 159 /* GetAccessor */:
+                        case 160 /* SetAccessor */:
                             continue;
                         default:
                             return false;
@@ -33834,7 +34465,7 @@ var ts;
                 var containers = getContainersOfSymbol(symbol, enclosingDeclaration);
                 // If we're trying to reference some object literal in, eg `var a = { x: 1 }`, the symbol for the literal, `__object`, is distinct
                 // from the symbol of the declaration it is being assigned to. Since we can use the declaration to refer to the literal, however,
-                // we'd like to make that connection here - potentially causing us to paint the declararation's visibiility, and therefore the literal.
+                // we'd like to make that connection here - potentially causing us to paint the declaration's visibility, and therefore the literal.
                 var firstDecl = ts.first(symbol.declarations);
                 if (!ts.length(containers) && meaning & 67220415 /* Value */ && firstDecl && ts.isObjectLiteralExpression(firstDecl)) {
                     if (firstDecl.parent && ts.isVariableDeclaration(firstDecl.parent) && firstDecl === firstDecl.parent.initializer) {
@@ -33895,14 +34526,14 @@ var ts;
             return node && getSymbolOfNode(node);
         }
         function hasExternalModuleSymbol(declaration) {
-            return ts.isAmbientModule(declaration) || (declaration.kind === 284 /* SourceFile */ && ts.isExternalOrCommonJsModule(declaration));
+            return ts.isAmbientModule(declaration) || (declaration.kind === 285 /* SourceFile */ && ts.isExternalOrCommonJsModule(declaration));
         }
         function hasNonGlobalAugmentationExternalModuleSymbol(declaration) {
-            return ts.isModuleWithStringLiteralName(declaration) || (declaration.kind === 284 /* SourceFile */ && ts.isExternalOrCommonJsModule(declaration));
+            return ts.isModuleWithStringLiteralName(declaration) || (declaration.kind === 285 /* SourceFile */ && ts.isExternalOrCommonJsModule(declaration));
         }
         function hasVisibleDeclarations(symbol, shouldComputeAliasToMakeVisible) {
             var aliasesToMakeVisible;
-            if (!ts.every(symbol.declarations, getIsDeclarationVisible)) {
+            if (!ts.every(ts.filter(symbol.declarations, function (d) { return d.kind !== 73 /* Identifier */; }), getIsDeclarationVisible)) {
                 return undefined;
             }
             return { accessibility: 0 /* Accessible */, aliasesToMakeVisible: aliasesToMakeVisible };
@@ -33945,14 +34576,14 @@ var ts;
         function isEntityNameVisible(entityName, enclosingDeclaration) {
             // get symbol of the first identifier of the entityName
             var meaning;
-            if (entityName.parent.kind === 167 /* TypeQuery */ ||
+            if (entityName.parent.kind === 168 /* TypeQuery */ ||
                 ts.isExpressionWithTypeArgumentsInClassExtendsClause(entityName.parent) ||
-                entityName.parent.kind === 149 /* ComputedPropertyName */) {
+                entityName.parent.kind === 150 /* ComputedPropertyName */) {
                 // Typeof value
                 meaning = 67220415 /* Value */ | 1048576 /* ExportValue */;
             }
-            else if (entityName.kind === 148 /* QualifiedName */ || entityName.kind === 189 /* PropertyAccessExpression */ ||
-                entityName.parent.kind === 248 /* ImportEqualsDeclaration */) {
+            else if (entityName.kind === 149 /* QualifiedName */ || entityName.kind === 190 /* PropertyAccessExpression */ ||
+                entityName.parent.kind === 249 /* ImportEqualsDeclaration */) {
                 // Left identifier from type reference or TypeAlias
                 // Entity name of the import declaration
                 meaning = 1920 /* Namespace */;
@@ -34001,10 +34632,10 @@ var ts;
             function signatureToStringWorker(writer) {
                 var sigOutput;
                 if (flags & 262144 /* WriteArrowStyleSignature */) {
-                    sigOutput = kind === 1 /* Construct */ ? 166 /* ConstructorType */ : 165 /* FunctionType */;
+                    sigOutput = kind === 1 /* Construct */ ? 167 /* ConstructorType */ : 166 /* FunctionType */;
                 }
                 else {
-                    sigOutput = kind === 1 /* Construct */ ? 161 /* ConstructSignature */ : 160 /* CallSignature */;
+                    sigOutput = kind === 1 /* Construct */ ? 162 /* ConstructSignature */ : 161 /* CallSignature */;
                 }
                 var sig = nodeBuilder.signatureToSignatureDeclaration(signature, sigOutput, enclosingDeclaration, toNodeBuilderFlags(flags) | 70221824 /* IgnoreErrors */ | 512 /* WriteTypeParametersInQualifiedName */);
                 var printer = ts.createPrinter({ removeComments: true, omitTrailingSemicolon: true });
@@ -34031,6 +34662,15 @@ var ts;
             }
             return result;
         }
+        function getTypeNamesForErrorDisplay(left, right) {
+            var leftStr = typeToString(left);
+            var rightStr = typeToString(right);
+            if (leftStr === rightStr) {
+                leftStr = typeToString(left, /*enclosingDeclaration*/ undefined, 64 /* UseFullyQualifiedType */);
+                rightStr = typeToString(right, /*enclosingDeclaration*/ undefined, 64 /* UseFullyQualifiedType */);
+            }
+            return [leftStr, rightStr];
+        }
         function toNodeBuilderFlags(flags) {
             if (flags === void 0) { flags = 0 /* None */; }
             return flags & 9469291 /* NodeBuilderFlagsMask */;
@@ -34099,26 +34739,26 @@ var ts;
                 }
                 if (type.flags & 1 /* Any */) {
                     context.approximateLength += 3;
-                    return ts.createKeywordTypeNode(120 /* AnyKeyword */);
+                    return ts.createKeywordTypeNode(121 /* AnyKeyword */);
                 }
                 if (type.flags & 2 /* Unknown */) {
-                    return ts.createKeywordTypeNode(143 /* UnknownKeyword */);
+                    return ts.createKeywordTypeNode(144 /* UnknownKeyword */);
                 }
                 if (type.flags & 4 /* String */) {
                     context.approximateLength += 6;
-                    return ts.createKeywordTypeNode(138 /* StringKeyword */);
+                    return ts.createKeywordTypeNode(139 /* StringKeyword */);
                 }
                 if (type.flags & 8 /* Number */) {
                     context.approximateLength += 6;
-                    return ts.createKeywordTypeNode(135 /* NumberKeyword */);
+                    return ts.createKeywordTypeNode(136 /* NumberKeyword */);
                 }
                 if (type.flags & 64 /* BigInt */) {
                     context.approximateLength += 6;
-                    return ts.createKeywordTypeNode(146 /* BigIntKeyword */);
+                    return ts.createKeywordTypeNode(147 /* BigIntKeyword */);
                 }
                 if (type.flags & 16 /* Boolean */) {
                     context.approximateLength += 7;
-                    return ts.createKeywordTypeNode(123 /* BooleanKeyword */);
+                    return ts.createKeywordTypeNode(124 /* BooleanKeyword */);
                 }
                 if (type.flags & 1024 /* EnumLiteral */ && !(type.flags & 1048576 /* Union */)) {
                     var parentSymbol = getParentOfSymbol(type.symbol);
@@ -34136,8 +34776,9 @@ var ts;
                     return ts.createLiteralTypeNode(ts.setEmitFlags(ts.createLiteral(type.value), 16777216 /* NoAsciiEscaping */));
                 }
                 if (type.flags & 256 /* NumberLiteral */) {
-                    context.approximateLength += (("" + type.value).length);
-                    return ts.createLiteralTypeNode((ts.createLiteral(type.value)));
+                    var value = type.value;
+                    context.approximateLength += ("" + value).length;
+                    return ts.createLiteralTypeNode(value < 0 ? ts.createPrefix(39 /* MinusToken */, ts.createLiteral(-value)) : ts.createLiteral(value));
                 }
                 if (type.flags & 2048 /* BigIntLiteral */) {
                     context.approximateLength += (ts.pseudoBigIntToString(type.value).length) + 1;
@@ -34158,33 +34799,33 @@ var ts;
                         }
                     }
                     context.approximateLength += 13;
-                    return ts.createTypeOperatorNode(142 /* UniqueKeyword */, ts.createKeywordTypeNode(139 /* SymbolKeyword */));
+                    return ts.createTypeOperatorNode(143 /* UniqueKeyword */, ts.createKeywordTypeNode(140 /* SymbolKeyword */));
                 }
                 if (type.flags & 16384 /* Void */) {
                     context.approximateLength += 4;
-                    return ts.createKeywordTypeNode(106 /* VoidKeyword */);
+                    return ts.createKeywordTypeNode(107 /* VoidKeyword */);
                 }
                 if (type.flags & 32768 /* Undefined */) {
                     context.approximateLength += 9;
-                    return ts.createKeywordTypeNode(141 /* UndefinedKeyword */);
+                    return ts.createKeywordTypeNode(142 /* UndefinedKeyword */);
                 }
                 if (type.flags & 65536 /* Null */) {
                     context.approximateLength += 4;
-                    return ts.createKeywordTypeNode(96 /* NullKeyword */);
+                    return ts.createKeywordTypeNode(97 /* NullKeyword */);
                 }
                 if (type.flags & 131072 /* Never */) {
                     context.approximateLength += 5;
-                    return ts.createKeywordTypeNode(132 /* NeverKeyword */);
+                    return ts.createKeywordTypeNode(133 /* NeverKeyword */);
                 }
                 if (type.flags & 4096 /* ESSymbol */) {
                     context.approximateLength += 6;
-                    return ts.createKeywordTypeNode(139 /* SymbolKeyword */);
+                    return ts.createKeywordTypeNode(140 /* SymbolKeyword */);
                 }
                 if (type.flags & 67108864 /* NonPrimitive */) {
                     context.approximateLength += 6;
-                    return ts.createKeywordTypeNode(136 /* ObjectKeyword */);
+                    return ts.createKeywordTypeNode(137 /* ObjectKeyword */);
                 }
-                if (type.flags & 262144 /* TypeParameter */ && type.isThisType) {
+                if (isThisTypeParameter(type)) {
                     if (context.flags & 4194304 /* InObjectTypeLiteral */) {
                         if (!context.encounteredError && !(context.flags & 32768 /* AllowThisInObjectLiteral */)) {
                             context.encounteredError = true;
@@ -34207,14 +34848,10 @@ var ts;
                         return ts.createInferTypeNode(typeParameterToDeclarationWithConstraint(type, context, /*constraintNode*/ undefined));
                     }
                     if (context.flags & 4 /* GenerateNamesForShadowedTypeParams */ &&
-                        type.flags & 262144 /* TypeParameter */ &&
-                        ts.length(type.symbol.declarations) &&
-                        ts.isTypeParameterDeclaration(type.symbol.declarations[0]) &&
-                        typeParameterShadowsNameInScope(type, context) &&
                         !isTypeSymbolAccessible(type.symbol, context.enclosingDeclaration)) {
-                        var name = type.symbol.declarations[0].name;
+                        var name = typeParameterToName(type, context);
                         context.approximateLength += ts.idText(name).length;
-                        return ts.createTypeReferenceNode(ts.getGeneratedNameForNode(name, 16 /* Optimistic */ | 8 /* ReservedInNestedScopes */), /*typeArguments*/ undefined);
+                        return ts.createTypeReferenceNode(ts.createIdentifier(ts.idText(name)), /*typeArguments*/ undefined);
                     }
                     // Ignore constraint/default when creating a usage (as opposed to declaration) of a type parameter.
                     return type.symbol
@@ -34234,7 +34871,7 @@ var ts;
                     }
                     var typeNodes = mapToTypeNodes(types, context, /*isBareList*/ true);
                     if (typeNodes && typeNodes.length > 0) {
-                        var unionOrIntersectionTypeNode = ts.createUnionOrIntersectionTypeNode(type.flags & 1048576 /* Union */ ? 173 /* UnionType */ : 174 /* IntersectionType */, typeNodes);
+                        var unionOrIntersectionTypeNode = ts.createUnionOrIntersectionTypeNode(type.flags & 1048576 /* Union */ ? 174 /* UnionType */ : 175 /* IntersectionType */, typeNodes);
                         return unionOrIntersectionTypeNode;
                     }
                     else {
@@ -34308,7 +34945,7 @@ var ts;
                             return symbolToTypeNode(symbol, context, isInstanceType);
                         }
                         // Always use 'typeof T' for type of class, enum, and module objects
-                        else if (symbol.flags & 32 /* Class */ && !getBaseTypeVariableOfClass(symbol) && !(symbol.valueDeclaration.kind === 209 /* ClassExpression */ && context.flags & 2048 /* WriteClassExpressionAsTypeLiteral */) ||
+                        else if (symbol.flags & 32 /* Class */ && !getBaseTypeVariableOfClass(symbol) && !(symbol.valueDeclaration.kind === 210 /* ClassExpression */ && context.flags & 2048 /* WriteClassExpressionAsTypeLiteral */) ||
                             symbol.flags & (384 /* Enum */ | 512 /* ValueModule */) ||
                             shouldWriteTypeOfFunctionSymbol()) {
                             return symbolToTypeNode(symbol, context, 67220415 /* Value */);
@@ -34355,7 +34992,7 @@ var ts;
                         var isNonLocalFunctionSymbol = !!(symbol.flags & 16 /* Function */) &&
                             (symbol.parent || // is exported function symbol
                                 ts.forEach(symbol.declarations, function (declaration) {
-                                    return declaration.parent.kind === 284 /* SourceFile */ || declaration.parent.kind === 245 /* ModuleBlock */;
+                                    return declaration.parent.kind === 285 /* SourceFile */ || declaration.parent.kind === 246 /* ModuleBlock */;
                                 }));
                         if (isStaticMethodSymbol || isNonLocalFunctionSymbol) {
                             // typeof is allowed only for static/non local functions
@@ -34376,12 +35013,12 @@ var ts;
                         }
                         if (resolved.callSignatures.length === 1 && !resolved.constructSignatures.length) {
                             var signature = resolved.callSignatures[0];
-                            var signatureNode = signatureToSignatureDeclarationHelper(signature, 165 /* FunctionType */, context);
+                            var signatureNode = signatureToSignatureDeclarationHelper(signature, 166 /* FunctionType */, context);
                             return signatureNode;
                         }
                         if (resolved.constructSignatures.length === 1 && !resolved.callSignatures.length) {
                             var signature = resolved.constructSignatures[0];
-                            var signatureNode = signatureToSignatureDeclarationHelper(signature, 166 /* ConstructorType */, context);
+                            var signatureNode = signatureToSignatureDeclarationHelper(signature, 167 /* ConstructorType */, context);
                             return signatureNode;
                         }
                     }
@@ -34402,7 +35039,7 @@ var ts;
                         }
                         var elementType = typeToTypeNodeHelper(typeArguments[0], context);
                         var arrayType = ts.createArrayTypeNode(elementType);
-                        return type.target === globalArrayType ? arrayType : ts.createTypeOperatorNode(133 /* ReadonlyKeyword */, arrayType);
+                        return type.target === globalArrayType ? arrayType : ts.createTypeOperatorNode(134 /* ReadonlyKeyword */, arrayType);
                     }
                     else if (type.target.objectFlags & 8 /* Tuple */) {
                         if (typeArguments.length > 0) {
@@ -34416,12 +35053,12 @@ var ts;
                                         ts.createOptionalTypeNode(tupleConstituentNodes[i]);
                                 }
                                 var tupleTypeNode = ts.createTupleTypeNode(tupleConstituentNodes);
-                                return type.target.readonly ? ts.createTypeOperatorNode(133 /* ReadonlyKeyword */, tupleTypeNode) : tupleTypeNode;
+                                return type.target.readonly ? ts.createTypeOperatorNode(134 /* ReadonlyKeyword */, tupleTypeNode) : tupleTypeNode;
                             }
                         }
                         if (context.encounteredError || (context.flags & 524288 /* AllowEmptyTuple */)) {
                             var tupleTypeNode = ts.createTupleTypeNode([]);
-                            return type.target.readonly ? ts.createTypeOperatorNode(133 /* ReadonlyKeyword */, tupleTypeNode) : tupleTypeNode;
+                            return type.target.readonly ? ts.createTypeOperatorNode(134 /* ReadonlyKeyword */, tupleTypeNode) : tupleTypeNode;
                         }
                         context.encounteredError = true;
                         return undefined; // TODO: GH#18217
@@ -34516,11 +35153,11 @@ var ts;
                     var typeElements = [];
                     for (var _i = 0, _a = resolvedType.callSignatures; _i < _a.length; _i++) {
                         var signature = _a[_i];
-                        typeElements.push(signatureToSignatureDeclarationHelper(signature, 160 /* CallSignature */, context));
+                        typeElements.push(signatureToSignatureDeclarationHelper(signature, 161 /* CallSignature */, context));
                     }
                     for (var _b = 0, _c = resolvedType.constructSignatures; _b < _c.length; _b++) {
                         var signature = _c[_b];
-                        typeElements.push(signatureToSignatureDeclarationHelper(signature, 161 /* ConstructSignature */, context));
+                        typeElements.push(signatureToSignatureDeclarationHelper(signature, 162 /* ConstructSignature */, context));
                     }
                     if (resolvedType.stringIndexInfo) {
                         var indexSignature = void 0;
@@ -34567,15 +35204,15 @@ var ts;
                 if (!(context.flags & 1 /* NoTruncation */)) {
                     return ts.createTypeReferenceNode(ts.createIdentifier("..."), /*typeArguments*/ undefined);
                 }
-                return ts.createKeywordTypeNode(120 /* AnyKeyword */);
+                return ts.createKeywordTypeNode(121 /* AnyKeyword */);
             }
             function addPropertyToElementList(propertySymbol, context, typeElements) {
-                var propertyIsReverseMapped = !!(ts.getCheckFlags(propertySymbol) & 4096 /* ReverseMapped */);
+                var propertyIsReverseMapped = !!(ts.getCheckFlags(propertySymbol) & 8192 /* ReverseMapped */);
                 var propertyType = propertyIsReverseMapped && context.flags & 33554432 /* InReverseMappedType */ ?
                     anyType : getTypeOfSymbol(propertySymbol);
                 var saveEnclosingDeclaration = context.enclosingDeclaration;
                 context.enclosingDeclaration = undefined;
-                if (context.tracker.trackSymbol && ts.getCheckFlags(propertySymbol) & 2048 /* Late */) {
+                if (context.tracker.trackSymbol && ts.getCheckFlags(propertySymbol) & 4096 /* Late */) {
                     var decl = ts.first(propertySymbol.declarations);
                     if (hasLateBindableName(decl)) {
                         trackComputedName(decl.name, saveEnclosingDeclaration, context);
@@ -34586,10 +35223,10 @@ var ts;
                 context.enclosingDeclaration = saveEnclosingDeclaration;
                 var optionalToken = propertySymbol.flags & 16777216 /* Optional */ ? ts.createToken(56 /* QuestionToken */) : undefined;
                 if (propertySymbol.flags & (16 /* Function */ | 8192 /* Method */) && !getPropertiesOfObjectType(propertyType).length && !isReadonlySymbol(propertySymbol)) {
-                    var signatures = getSignaturesOfType(propertyType, 0 /* Call */);
+                    var signatures = getSignaturesOfType(filterType(propertyType, function (t) { return !(t.flags & 32768 /* Undefined */); }), 0 /* Call */);
                     for (var _i = 0, signatures_1 = signatures; _i < signatures_1.length; _i++) {
                         var signature = signatures_1[_i];
-                        var methodDeclaration = signatureToSignatureDeclarationHelper(signature, 155 /* MethodSignature */, context);
+                        var methodDeclaration = signatureToSignatureDeclarationHelper(signature, 156 /* MethodSignature */, context);
                         methodDeclaration.name = propertyName;
                         methodDeclaration.questionToken = optionalToken;
                         if (propertySymbol.valueDeclaration) {
@@ -34607,10 +35244,10 @@ var ts;
                         propertyTypeNode = createElidedInformationPlaceholder(context);
                     }
                     else {
-                        propertyTypeNode = propertyType ? typeToTypeNodeHelper(propertyType, context) : ts.createKeywordTypeNode(120 /* AnyKeyword */);
+                        propertyTypeNode = propertyType ? typeToTypeNodeHelper(propertyType, context) : ts.createKeywordTypeNode(121 /* AnyKeyword */);
                     }
                     context.flags = savedFlags;
-                    var modifiers = isReadonlySymbol(propertySymbol) ? [ts.createToken(133 /* ReadonlyKeyword */)] : undefined;
+                    var modifiers = isReadonlySymbol(propertySymbol) ? [ts.createToken(134 /* ReadonlyKeyword */)] : undefined;
                     if (modifiers) {
                         context.approximateLength += 9;
                     }
@@ -34661,7 +35298,7 @@ var ts;
             }
             function indexInfoToIndexSignatureDeclarationHelper(indexInfo, kind, context) {
                 var name = ts.getNameFromIndexInfo(indexInfo) || "x";
-                var indexerTypeNode = ts.createKeywordTypeNode(kind === 0 /* String */ ? 138 /* StringKeyword */ : 135 /* NumberKeyword */);
+                var indexerTypeNode = ts.createKeywordTypeNode(kind === 0 /* String */ ? 139 /* StringKeyword */ : 136 /* NumberKeyword */);
                 var indexingParameter = ts.createParameter(
                 /*decorators*/ undefined, 
                 /*modifiers*/ undefined, 
@@ -34674,7 +35311,7 @@ var ts;
                 }
                 context.approximateLength += (name.length + 4);
                 return ts.createIndexSignature(
-                /*decorators*/ undefined, indexInfo.isReadonly ? [ts.createToken(133 /* ReadonlyKeyword */)] : undefined, [indexingParameter], typeNode);
+                /*decorators*/ undefined, indexInfo.isReadonly ? [ts.createToken(134 /* ReadonlyKeyword */)] : undefined, [indexingParameter], typeNode);
             }
             function signatureToSignatureDeclarationHelper(signature, kind, context) {
                 var typeParameters;
@@ -34685,7 +35322,7 @@ var ts;
                 else {
                     typeParameters = signature.typeParameters && signature.typeParameters.map(function (parameter) { return typeParameterToDeclaration(parameter, context); });
                 }
-                var parameters = getExpandedParameters(signature).map(function (parameter) { return symbolToParameterDeclaration(parameter, context, kind === 157 /* Constructor */); });
+                var parameters = getExpandedParameters(signature).map(function (parameter) { return symbolToParameterDeclaration(parameter, context, kind === 158 /* Constructor */); });
                 if (signature.thisParameter) {
                     var thisParameter = symbolToParameterDeclaration(signature.thisParameter, context);
                     parameters.unshift(thisParameter);
@@ -34704,29 +35341,20 @@ var ts;
                     returnTypeNode = returnType && typeToTypeNodeHelper(returnType, context);
                 }
                 if (context.flags & 256 /* SuppressAnyReturnType */) {
-                    if (returnTypeNode && returnTypeNode.kind === 120 /* AnyKeyword */) {
+                    if (returnTypeNode && returnTypeNode.kind === 121 /* AnyKeyword */) {
                         returnTypeNode = undefined;
                     }
                 }
                 else if (!returnTypeNode) {
-                    returnTypeNode = ts.createKeywordTypeNode(120 /* AnyKeyword */);
+                    returnTypeNode = ts.createKeywordTypeNode(121 /* AnyKeyword */);
                 }
                 context.approximateLength += 3; // Usually a signature contributes a few more characters than this, but 3 is the minimum
                 return ts.createSignatureDeclaration(kind, typeParameters, parameters, returnTypeNode, typeArguments);
             }
-            function typeParameterShadowsNameInScope(type, context) {
-                return !!resolveName(context.enclosingDeclaration, type.symbol.escapedName, 67897832 /* Type */, /*nameNotFoundArg*/ undefined, type.symbol.escapedName, /*isUse*/ false);
-            }
             function typeParameterToDeclarationWithConstraint(type, context, constraintNode) {
                 var savedContextFlags = context.flags;
                 context.flags &= ~512 /* WriteTypeParametersInQualifiedName */; // Avoids potential infinite loop when building for a claimspace with a generic
-                var shouldUseGeneratedName = context.flags & 4 /* GenerateNamesForShadowedTypeParams */ &&
-                    type.symbol.declarations && type.symbol.declarations[0] &&
-                    ts.isTypeParameterDeclaration(type.symbol.declarations[0]) &&
-                    typeParameterShadowsNameInScope(type, context);
-                var name = shouldUseGeneratedName
-                    ? ts.getGeneratedNameForNode(type.symbol.declarations[0].name, 16 /* Optimistic */ | 8 /* ReservedInNestedScopes */)
-                    : symbolToName(type.symbol, context, 67897832 /* Type */, /*expectsIdentifier*/ true);
+                var name = typeParameterToName(type, context);
                 var defaultParameter = getDefaultFromTypeParameter(type);
                 var defaultParameterNode = defaultParameter && typeToTypeNodeHelper(defaultParameter, context);
                 context.flags = savedContextFlags;
@@ -34738,9 +35366,9 @@ var ts;
                 return typeParameterToDeclarationWithConstraint(type, context, constraintNode);
             }
             function symbolToParameterDeclaration(parameterSymbol, context, preserveModifierFlags) {
-                var parameterDeclaration = ts.getDeclarationOfKind(parameterSymbol, 151 /* Parameter */);
+                var parameterDeclaration = ts.getDeclarationOfKind(parameterSymbol, 152 /* Parameter */);
                 if (!parameterDeclaration && !isTransientSymbol(parameterSymbol)) {
-                    parameterDeclaration = ts.getDeclarationOfKind(parameterSymbol, 304 /* JSDocParameterTag */);
+                    parameterDeclaration = ts.getDeclarationOfKind(parameterSymbol, 306 /* JSDocParameterTag */);
                 }
                 var parameterType = getTypeOfSymbol(parameterSymbol);
                 if (parameterDeclaration && isRequiredInitializedParameter(parameterDeclaration)) {
@@ -34748,16 +35376,16 @@ var ts;
                 }
                 var parameterTypeNode = typeToTypeNodeHelper(parameterType, context);
                 var modifiers = !(context.flags & 8192 /* OmitParameterModifiers */) && preserveModifierFlags && parameterDeclaration && parameterDeclaration.modifiers ? parameterDeclaration.modifiers.map(ts.getSynthesizedClone) : undefined;
-                var isRest = parameterDeclaration && ts.isRestParameter(parameterDeclaration) || ts.getCheckFlags(parameterSymbol) & 16384 /* RestParameter */;
+                var isRest = parameterDeclaration && ts.isRestParameter(parameterDeclaration) || ts.getCheckFlags(parameterSymbol) & 32768 /* RestParameter */;
                 var dotDotDotToken = isRest ? ts.createToken(25 /* DotDotDotToken */) : undefined;
                 var name = parameterDeclaration
                     ? parameterDeclaration.name ?
-                        parameterDeclaration.name.kind === 72 /* Identifier */ ? ts.setEmitFlags(ts.getSynthesizedClone(parameterDeclaration.name), 16777216 /* NoAsciiEscaping */) :
-                            parameterDeclaration.name.kind === 148 /* QualifiedName */ ? ts.setEmitFlags(ts.getSynthesizedClone(parameterDeclaration.name.right), 16777216 /* NoAsciiEscaping */) :
+                        parameterDeclaration.name.kind === 73 /* Identifier */ ? ts.setEmitFlags(ts.getSynthesizedClone(parameterDeclaration.name), 16777216 /* NoAsciiEscaping */) :
+                            parameterDeclaration.name.kind === 149 /* QualifiedName */ ? ts.setEmitFlags(ts.getSynthesizedClone(parameterDeclaration.name.right), 16777216 /* NoAsciiEscaping */) :
                                 cloneBindingName(parameterDeclaration.name) :
                         ts.symbolName(parameterSymbol)
                     : ts.symbolName(parameterSymbol);
-                var isOptional = parameterDeclaration && isOptionalParameter(parameterDeclaration) || ts.getCheckFlags(parameterSymbol) & 8192 /* OptionalParameter */;
+                var isOptional = parameterDeclaration && isOptionalParameter(parameterDeclaration) || ts.getCheckFlags(parameterSymbol) & 16384 /* OptionalParameter */;
                 var questionToken = isOptional ? ts.createToken(56 /* QuestionToken */) : undefined;
                 var parameterNode = ts.createParameter(
                 /*decorators*/ undefined, modifiers, dotDotDotToken, name, questionToken, parameterTypeNode, 
@@ -34772,7 +35400,7 @@ var ts;
                         }
                         var visited = ts.visitEachChild(node, elideInitializerAndSetEmitFlags, ts.nullTransformationContext, /*nodesVisitor*/ undefined, elideInitializerAndSetEmitFlags);
                         var clone = ts.nodeIsSynthesized(visited) ? visited : ts.getSynthesizedClone(visited);
-                        if (clone.kind === 186 /* BindingElement */) {
+                        if (clone.kind === 187 /* BindingElement */) {
                             clone.initializer = undefined;
                         }
                         return ts.setEmitFlags(clone, 1 /* SingleLine */ | 16777216 /* NoAsciiEscaping */);
@@ -34874,6 +35502,11 @@ var ts;
             function lookupTypeParameterNodes(chain, index, context) {
                 ts.Debug.assert(chain && 0 <= index && index < chain.length);
                 var symbol = chain[index];
+                var symbolId = "" + getSymbolId(symbol);
+                if (context.typeParameterSymbolList && context.typeParameterSymbolList.get(symbolId)) {
+                    return undefined;
+                }
+                (context.typeParameterSymbolList || (context.typeParameterSymbolList = ts.createMap())).set(symbolId, true);
                 var typeParameterNodes;
                 if (context.flags & 512 /* WriteTypeParametersInQualifiedName */ && index < (chain.length - 1)) {
                     var parentSymbol = symbol;
@@ -34898,7 +35531,7 @@ var ts;
                 return top;
             }
             function getSpecifierForModuleSymbol(symbol, context) {
-                var file = ts.getDeclarationOfKind(symbol, 284 /* SourceFile */);
+                var file = ts.getDeclarationOfKind(symbol, 285 /* SourceFile */);
                 if (file && file.moduleName !== undefined) {
                     // Use the amd name if it is available
                     return file.moduleName;
@@ -35021,6 +35654,33 @@ var ts;
                     return identifier;
                 }
             }
+            function typeParameterShadowsNameInScope(escapedName, context) {
+                return !!resolveName(context.enclosingDeclaration, escapedName, 67897832 /* Type */, /*nameNotFoundArg*/ undefined, escapedName, /*isUse*/ false);
+            }
+            function typeParameterToName(type, context) {
+                if (context.flags & 4 /* GenerateNamesForShadowedTypeParams */ && context.typeParameterNames) {
+                    var cached = context.typeParameterNames.get("" + getTypeId(type));
+                    if (cached) {
+                        return cached;
+                    }
+                }
+                var result = symbolToName(type.symbol, context, 67897832 /* Type */, /*expectsIdentifier*/ true);
+                if (context.flags & 4 /* GenerateNamesForShadowedTypeParams */) {
+                    var rawtext = result.escapedText;
+                    var i = 0;
+                    var text = rawtext;
+                    while ((context.typeParameterNamesByText && context.typeParameterNamesByText.get(text)) || typeParameterShadowsNameInScope(text, context)) {
+                        i++;
+                        text = rawtext + "_" + i;
+                    }
+                    if (text !== rawtext) {
+                        result = ts.createIdentifier(text, result.typeArguments);
+                    }
+                    (context.typeParameterNames || (context.typeParameterNames = ts.createMap())).set("" + getTypeId(type), result);
+                    (context.typeParameterNamesByText || (context.typeParameterNamesByText = ts.createMap())).set(result.escapedText, true);
+                }
+                return result;
+            }
             function symbolToName(symbol, context, meaning, expectsIdentifier) {
                 var chain = lookupSymbolChain(symbol, context, meaning);
                 if (expectsIdentifier && chain.length !== 1
@@ -35138,8 +35798,8 @@ var ts;
         }
         function getTypeAliasForTypeLiteral(type) {
             if (type.symbol && type.symbol.flags & 2048 /* TypeLiteral */) {
-                var node = ts.findAncestor(type.symbol.declarations[0].parent, function (n) { return n.kind !== 177 /* ParenthesizedType */; });
-                if (node.kind === 242 /* TypeAliasDeclaration */) {
+                var node = ts.findAncestor(type.symbol.declarations[0].parent, function (n) { return n.kind !== 178 /* ParenthesizedType */; });
+                if (node.kind === 243 /* TypeAliasDeclaration */) {
                     return getSymbolOfNode(node);
                 }
             }
@@ -35147,11 +35807,11 @@ var ts;
         }
         function isTopLevelInExternalModuleAugmentation(node) {
             return node && node.parent &&
-                node.parent.kind === 245 /* ModuleBlock */ &&
+                node.parent.kind === 246 /* ModuleBlock */ &&
                 ts.isExternalModuleAugmentation(node.parent.parent);
         }
         function isDefaultBindingContext(location) {
-            return location.kind === 284 /* SourceFile */ || ts.isAmbientModule(location);
+            return location.kind === 285 /* SourceFile */ || ts.isAmbientModule(location);
         }
         function getNameOfSymbolFromNameType(symbol, context) {
             var nameType = symbol.nameType;
@@ -35161,6 +35821,9 @@ var ts;
                     if (!ts.isIdentifierText(name, compilerOptions.target) && !isNumericLiteralName(name)) {
                         return "\"" + ts.escapeString(name, 34 /* doubleQuote */) + "\"";
                     }
+                    if (isNumericLiteralName(name) && ts.startsWith(name, "-")) {
+                        return "[" + name + "]";
+                    }
                     return name;
                 }
                 if (nameType.flags & 8192 /* UniqueESSymbol */) {
@@ -35192,7 +35855,7 @@ var ts;
                     if (ts.isCallExpression(declaration) && ts.isBindableObjectDefinePropertyCall(declaration)) {
                         return ts.symbolName(symbol);
                     }
-                    if (ts.isComputedPropertyName(name_2) && !(ts.getCheckFlags(symbol) & 2048 /* Late */) && symbol.nameType && symbol.nameType.flags & 384 /* StringOrNumberLiteral */) {
+                    if (ts.isComputedPropertyName(name_2) && !(ts.getCheckFlags(symbol) & 4096 /* Late */) && symbol.nameType && symbol.nameType.flags & 384 /* StringOrNumberLiteral */) {
                         // Computed property name isn't late bound, but has a well-known name type - use name type to generate a symbol name
                         var result = getNameOfSymbolFromNameType(symbol, context);
                         if (result !== undefined) {
@@ -35201,17 +35864,17 @@ var ts;
                     }
                     return ts.declarationNameToString(name_2);
                 }
-                if (declaration.parent && declaration.parent.kind === 237 /* VariableDeclaration */) {
+                if (declaration.parent && declaration.parent.kind === 238 /* VariableDeclaration */) {
                     return ts.declarationNameToString(declaration.parent.name);
                 }
                 switch (declaration.kind) {
-                    case 209 /* ClassExpression */:
-                    case 196 /* FunctionExpression */:
-                    case 197 /* ArrowFunction */:
+                    case 210 /* ClassExpression */:
+                    case 197 /* FunctionExpression */:
+                    case 198 /* ArrowFunction */:
                         if (context && !context.encounteredError && !(context.flags & 131072 /* AllowAnonymousIdentifier */)) {
                             context.encounteredError = true;
                         }
-                        return declaration.kind === 209 /* ClassExpression */ ? "(Anonymous class)" : "(Anonymous function)";
+                        return declaration.kind === 210 /* ClassExpression */ ? "(Anonymous class)" : "(Anonymous function)";
                 }
             }
             var name = getNameOfSymbolFromNameType(symbol, context);
@@ -35228,27 +35891,27 @@ var ts;
             return false;
             function determineIfDeclarationIsVisible() {
                 switch (node.kind) {
-                    case 302 /* JSDocCallbackTag */:
-                    case 309 /* JSDocTypedefTag */:
+                    case 304 /* JSDocCallbackTag */:
+                    case 311 /* JSDocTypedefTag */:
                         // Top-level jsdoc type aliases are considered exported
                         // First parent is comment node, second is hosting declaration or token; we only care about those tokens or declarations whose parent is a source file
                         return !!(node.parent && node.parent.parent && node.parent.parent.parent && ts.isSourceFile(node.parent.parent.parent));
-                    case 186 /* BindingElement */:
+                    case 187 /* BindingElement */:
                         return isDeclarationVisible(node.parent.parent);
-                    case 237 /* VariableDeclaration */:
+                    case 238 /* VariableDeclaration */:
                         if (ts.isBindingPattern(node.name) &&
                             !node.name.elements.length) {
                             // If the binding pattern is empty, this variable declaration is not visible
                             return false;
                         }
                     // falls through
-                    case 244 /* ModuleDeclaration */:
-                    case 240 /* ClassDeclaration */:
-                    case 241 /* InterfaceDeclaration */:
-                    case 242 /* TypeAliasDeclaration */:
-                    case 239 /* FunctionDeclaration */:
-                    case 243 /* EnumDeclaration */:
-                    case 248 /* ImportEqualsDeclaration */:
+                    case 245 /* ModuleDeclaration */:
+                    case 241 /* ClassDeclaration */:
+                    case 242 /* InterfaceDeclaration */:
+                    case 243 /* TypeAliasDeclaration */:
+                    case 240 /* FunctionDeclaration */:
+                    case 244 /* EnumDeclaration */:
+                    case 249 /* ImportEqualsDeclaration */:
                         // external module augmentation is always visible
                         if (ts.isExternalModuleAugmentation(node)) {
                             return true;
@@ -35256,53 +35919,53 @@ var ts;
                         var parent = getDeclarationContainer(node);
                         // If the node is not exported or it is not ambient module element (except import declaration)
                         if (!(ts.getCombinedModifierFlags(node) & 1 /* Export */) &&
-                            !(node.kind !== 248 /* ImportEqualsDeclaration */ && parent.kind !== 284 /* SourceFile */ && parent.flags & 4194304 /* Ambient */)) {
+                            !(node.kind !== 249 /* ImportEqualsDeclaration */ && parent.kind !== 285 /* SourceFile */ && parent.flags & 4194304 /* Ambient */)) {
                             return isGlobalSourceFile(parent);
                         }
                         // Exported members/ambient module elements (exception import declaration) are visible if parent is visible
                         return isDeclarationVisible(parent);
-                    case 154 /* PropertyDeclaration */:
-                    case 153 /* PropertySignature */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
-                    case 156 /* MethodDeclaration */:
-                    case 155 /* MethodSignature */:
+                    case 155 /* PropertyDeclaration */:
+                    case 154 /* PropertySignature */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
+                    case 157 /* MethodDeclaration */:
+                    case 156 /* MethodSignature */:
                         if (ts.hasModifier(node, 8 /* Private */ | 16 /* Protected */)) {
                             // Private/protected properties/methods are not visible
                             return false;
                         }
                     // Public properties/methods are visible if its parents are visible, so:
                     // falls through
-                    case 157 /* Constructor */:
-                    case 161 /* ConstructSignature */:
-                    case 160 /* CallSignature */:
-                    case 162 /* IndexSignature */:
-                    case 151 /* Parameter */:
-                    case 245 /* ModuleBlock */:
-                    case 165 /* FunctionType */:
-                    case 166 /* ConstructorType */:
-                    case 168 /* TypeLiteral */:
-                    case 164 /* TypeReference */:
-                    case 169 /* ArrayType */:
-                    case 170 /* TupleType */:
-                    case 173 /* UnionType */:
-                    case 174 /* IntersectionType */:
-                    case 177 /* ParenthesizedType */:
+                    case 158 /* Constructor */:
+                    case 162 /* ConstructSignature */:
+                    case 161 /* CallSignature */:
+                    case 163 /* IndexSignature */:
+                    case 152 /* Parameter */:
+                    case 246 /* ModuleBlock */:
+                    case 166 /* FunctionType */:
+                    case 167 /* ConstructorType */:
+                    case 169 /* TypeLiteral */:
+                    case 165 /* TypeReference */:
+                    case 170 /* ArrayType */:
+                    case 171 /* TupleType */:
+                    case 174 /* UnionType */:
+                    case 175 /* IntersectionType */:
+                    case 178 /* ParenthesizedType */:
                         return isDeclarationVisible(node.parent);
                     // Default binding, import specifier and namespace import is visible
                     // only on demand so by default it is not visible
-                    case 250 /* ImportClause */:
-                    case 251 /* NamespaceImport */:
-                    case 253 /* ImportSpecifier */:
+                    case 251 /* ImportClause */:
+                    case 252 /* NamespaceImport */:
+                    case 254 /* ImportSpecifier */:
                         return false;
                     // Type parameters are always visible
-                    case 150 /* TypeParameter */:
+                    case 151 /* TypeParameter */:
                     // Source file and namespace export are always visible
-                    case 284 /* SourceFile */:
-                    case 247 /* NamespaceExportDeclaration */:
+                    case 285 /* SourceFile */:
+                    case 248 /* NamespaceExportDeclaration */:
                         return true;
                     // Export assignments do not create name bindings outside the module
-                    case 254 /* ExportAssignment */:
+                    case 255 /* ExportAssignment */:
                         return false;
                     default:
                         return false;
@@ -35311,10 +35974,10 @@ var ts;
         }
         function collectLinkedAliases(node, setVisibility) {
             var exportSymbol;
-            if (node.parent && node.parent.kind === 254 /* ExportAssignment */) {
+            if (node.parent && node.parent.kind === 255 /* ExportAssignment */) {
                 exportSymbol = resolveName(node, node.escapedText, 67220415 /* Value */ | 67897832 /* Type */ | 1920 /* Namespace */ | 2097152 /* Alias */, /*nameNotFoundMessage*/ undefined, node, /*isUse*/ false);
             }
-            else if (node.parent.kind === 257 /* ExportSpecifier */) {
+            else if (node.parent.kind === 258 /* ExportSpecifier */) {
                 exportSymbol = getTargetOfExportSpecifier(node.parent, 67220415 /* Value */ | 67897832 /* Type */ | 1920 /* Namespace */ | 2097152 /* Alias */);
             }
             var result;
@@ -35410,12 +36073,12 @@ var ts;
         function getDeclarationContainer(node) {
             return ts.findAncestor(ts.getRootDeclaration(node), function (node) {
                 switch (node.kind) {
-                    case 237 /* VariableDeclaration */:
-                    case 238 /* VariableDeclarationList */:
-                    case 253 /* ImportSpecifier */:
-                    case 252 /* NamedImports */:
-                    case 251 /* NamespaceImport */:
-                    case 250 /* ImportClause */:
+                    case 238 /* VariableDeclaration */:
+                    case 239 /* VariableDeclarationList */:
+                    case 254 /* ImportSpecifier */:
+                    case 253 /* NamedImports */:
+                    case 252 /* NamespaceImport */:
+                    case 251 /* ImportClause */:
                         return false;
                     default:
                         return true;
@@ -35448,7 +36111,7 @@ var ts;
             return symbol && getSymbolLinks(symbol).type || getTypeForVariableLikeDeclaration(node, /*includeOptionality*/ false);
         }
         function isComputedNonLiteralName(name) {
-            return name.kind === 149 /* ComputedPropertyName */ && !ts.isStringOrNumericLiteralLike(name.expression);
+            return name.kind === 150 /* ComputedPropertyName */ && !ts.isStringOrNumericLiteralLike(name.expression);
         }
         function getRestType(source, properties, symbol) {
             source = filterType(source, function (t) { return !(t.flags & 98304 /* Nullable */); });
@@ -35463,13 +36126,11 @@ var ts;
                 if (omitKeyType.flags & 131072 /* Never */) {
                     return source;
                 }
-                var pickTypeAlias = getGlobalPickSymbol();
-                var excludeTypeAlias = getGlobalExcludeSymbol();
-                if (!pickTypeAlias || !excludeTypeAlias) {
+                var omitTypeAlias = getGlobalOmitSymbol();
+                if (!omitTypeAlias) {
                     return errorType;
                 }
-                var pickKeys = getTypeAliasInstantiation(excludeTypeAlias, [getIndexType(source), omitKeyType]);
-                return getTypeAliasInstantiation(pickTypeAlias, [source, pickKeys]);
+                return getTypeAliasInstantiation(omitTypeAlias, [source, omitKeyType]);
             }
             var members = ts.createSymbolTable();
             for (var _i = 0, _a = getPropertiesOfType(source); _i < _a.length; _i++) {
@@ -35502,7 +36163,7 @@ var ts;
             if (parentAccess && parentAccess.flowNode) {
                 var propName = getDestructuringPropertyName(node);
                 if (propName) {
-                    var result = ts.createNode(190 /* ElementAccessExpression */, node.pos, node.end);
+                    var result = ts.createNode(191 /* ElementAccessExpression */, node.pos, node.end);
                     result.parent = node;
                     result.expression = parentAccess;
                     var literal = ts.createNode(10 /* StringLiteral */, node.pos, node.end);
@@ -35517,23 +36178,23 @@ var ts;
         function getParentElementAccess(node) {
             var ancestor = node.parent.parent;
             switch (ancestor.kind) {
-                case 186 /* BindingElement */:
-                case 275 /* PropertyAssignment */:
+                case 187 /* BindingElement */:
+                case 276 /* PropertyAssignment */:
                     return getSyntheticElementAccess(ancestor);
-                case 187 /* ArrayLiteralExpression */:
+                case 188 /* ArrayLiteralExpression */:
                     return getSyntheticElementAccess(node.parent);
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     return ancestor.initializer;
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return ancestor.right;
             }
         }
         function getDestructuringPropertyName(node) {
             var parent = node.parent;
-            if (node.kind === 186 /* BindingElement */ && parent.kind === 184 /* ObjectBindingPattern */) {
+            if (node.kind === 187 /* BindingElement */ && parent.kind === 185 /* ObjectBindingPattern */) {
                 return getLiteralPropertyNameText(node.propertyName || node.name);
             }
-            if (node.kind === 275 /* PropertyAssignment */ || node.kind === 276 /* ShorthandPropertyAssignment */) {
+            if (node.kind === 276 /* PropertyAssignment */ || node.kind === 277 /* ShorthandPropertyAssignment */) {
                 return getLiteralPropertyNameText(node.name);
             }
             return "" + parent.elements.indexOf(node);
@@ -35555,7 +36216,7 @@ var ts;
                 parentType = getNonNullableType(parentType);
             }
             var type;
-            if (pattern.kind === 184 /* ObjectBindingPattern */) {
+            if (pattern.kind === 185 /* ObjectBindingPattern */) {
                 if (declaration.dotDotDotToken) {
                     if (parentType.flags & 2 /* Unknown */ || !isValidSpreadType(parentType)) {
                         error(declaration, ts.Diagnostics.Rest_types_may_only_be_created_from_object_types);
@@ -35582,7 +36243,7 @@ var ts;
                 // This elementType will be used if the specific property corresponding to this index is not
                 // present (aka the tuple element property). This call also checks that the parentType is in
                 // fact an iterable or array (depending on target language).
-                var elementType = checkIteratedTypeOrElementType(parentType, pattern, /*allowStringInput*/ false, /*allowAsyncIterables*/ false);
+                var elementType = checkIteratedTypeOrElementType(65 /* Destructuring */, parentType, undefinedType, pattern);
                 var index_1 = pattern.elements.indexOf(declaration);
                 if (declaration.dotDotDotToken) {
                     // If the parent is a tuple type, the rest element has a tuple type of the
@@ -35594,21 +36255,25 @@ var ts;
                 }
                 else if (isArrayLikeType(parentType)) {
                     var indexType = getLiteralType(index_1);
-                    var declaredType = getConstraintForLocation(getIndexedAccessType(parentType, indexType, declaration.name), declaration.name);
+                    var accessFlags = hasDefaultValue(declaration) ? 8 /* NoTupleBoundsCheck */ : 0;
+                    var declaredType = getConstraintForLocation(getIndexedAccessTypeOrUndefined(parentType, indexType, declaration.name, accessFlags) || errorType, declaration.name);
                     type = getFlowTypeOfDestructuring(declaration, declaredType);
                 }
                 else {
                     type = elementType;
                 }
             }
-            // In strict null checking mode, if a default value of a non-undefined type is specified, remove
-            // undefined from the final type.
-            if (strictNullChecks && declaration.initializer && !(getFalsyFlags(checkDeclarationInitializer(declaration)) & 32768 /* Undefined */)) {
-                type = getTypeWithFacts(type, 524288 /* NEUndefined */);
+            if (!declaration.initializer) {
+                return type;
             }
-            return declaration.initializer && !ts.getEffectiveTypeAnnotationNode(ts.walkUpBindingElementsAndPatterns(declaration)) ?
-                getUnionType([type, checkDeclarationInitializer(declaration)], 2 /* Subtype */) :
-                type;
+            if (ts.getEffectiveTypeAnnotationNode(ts.walkUpBindingElementsAndPatterns(declaration))) {
+                // In strict null checking mode, if a default value of a non-undefined type is specified, remove
+                // undefined from the final type.
+                return strictNullChecks && !(getFalsyFlags(checkDeclarationInitializer(declaration)) & 32768 /* Undefined */) ?
+                    getTypeWithFacts(type, 524288 /* NEUndefined */) :
+                    type;
+            }
+            return getUnionType([getTypeWithFacts(type, 524288 /* NEUndefined */), checkDeclarationInitializer(declaration)], 2 /* Subtype */);
         }
         function getTypeForDeclarationFromJSDocComment(declaration) {
             var jsdocType = ts.getJSDocType(declaration);
@@ -35619,30 +36284,30 @@ var ts;
         }
         function isNullOrUndefined(node) {
             var expr = ts.skipParentheses(node);
-            return expr.kind === 96 /* NullKeyword */ || expr.kind === 72 /* Identifier */ && getResolvedSymbol(expr) === undefinedSymbol;
+            return expr.kind === 97 /* NullKeyword */ || expr.kind === 73 /* Identifier */ && getResolvedSymbol(expr) === undefinedSymbol;
         }
         function isEmptyArrayLiteral(node) {
             var expr = ts.skipParentheses(node);
-            return expr.kind === 187 /* ArrayLiteralExpression */ && expr.elements.length === 0;
+            return expr.kind === 188 /* ArrayLiteralExpression */ && expr.elements.length === 0;
         }
         function addOptionality(type, optional) {
             if (optional === void 0) { optional = true; }
             return strictNullChecks && optional ? getOptionalType(type) : type;
         }
         function isParameterOfContextuallyTypedFunction(node) {
-            return node.kind === 151 /* Parameter */ &&
-                (node.parent.kind === 196 /* FunctionExpression */ || node.parent.kind === 197 /* ArrowFunction */) &&
+            return node.kind === 152 /* Parameter */ &&
+                (node.parent.kind === 197 /* FunctionExpression */ || node.parent.kind === 198 /* ArrowFunction */) &&
                 !!getContextualType(node.parent);
         }
         // Return the inferred type for a variable, parameter, or property declaration
         function getTypeForVariableLikeDeclaration(declaration, includeOptionality) {
             // A variable declared in a for..in statement is of type string, or of type keyof T when the
             // right hand expression is of a type parameter type.
-            if (ts.isVariableDeclaration(declaration) && declaration.parent.parent.kind === 226 /* ForInStatement */) {
+            if (ts.isVariableDeclaration(declaration) && declaration.parent.parent.kind === 227 /* ForInStatement */) {
                 var indexType = getIndexType(getNonNullableTypeIfNeeded(checkExpression(declaration.parent.parent.expression)));
                 return indexType.flags & (262144 /* TypeParameter */ | 4194304 /* Index */) ? getExtractStringType(indexType) : stringType;
             }
-            if (ts.isVariableDeclaration(declaration) && declaration.parent.parent.kind === 227 /* ForOfStatement */) {
+            if (ts.isVariableDeclaration(declaration) && declaration.parent.parent.kind === 228 /* ForOfStatement */) {
                 // checkRightHandSideOfForOf will return undefined if the for-of expression type was
                 // missing properties/signatures required to get its iteratedType (like
                 // [Symbol.iterator] or next). This may be because we accessed properties from anyType,
@@ -35661,7 +36326,7 @@ var ts;
                 return addOptionality(declaredType, isOptional);
             }
             if ((noImplicitAny || ts.isInJSFile(declaration)) &&
-                declaration.kind === 237 /* VariableDeclaration */ && !ts.isBindingPattern(declaration.name) &&
+                declaration.kind === 238 /* VariableDeclaration */ && !ts.isBindingPattern(declaration.name) &&
                 !(ts.getCombinedModifierFlags(declaration) & 1 /* Export */) && !(declaration.flags & 4194304 /* Ambient */)) {
                 // If --noImplicitAny is on or the declaration is in a Javascript file,
                 // use control flow tracked 'any' type for non-ambient, non-exported var or let variables with no
@@ -35675,11 +36340,11 @@ var ts;
                     return autoArrayType;
                 }
             }
-            if (declaration.kind === 151 /* Parameter */) {
+            if (declaration.kind === 152 /* Parameter */) {
                 var func = declaration.parent;
                 // For a parameter of a set accessor, use the type of the get accessor if one is present
-                if (func.kind === 159 /* SetAccessor */ && !hasNonBindableDynamicName(func)) {
-                    var getter = ts.getDeclarationOfKind(getSymbolOfNode(declaration.parent), 158 /* GetAccessor */);
+                if (func.kind === 160 /* SetAccessor */ && !hasNonBindableDynamicName(func)) {
+                    var getter = ts.getDeclarationOfKind(getSymbolOfNode(declaration.parent), 159 /* GetAccessor */);
                     if (getter) {
                         var getterSignature = getSignatureFromDeclaration(getter);
                         var thisParameter = getAccessorThisParameter(func);
@@ -35698,7 +36363,7 @@ var ts;
                     }
                 }
                 // Use contextual parameter type if one is available
-                var type = declaration.symbol.escapedName === "this" /* This */ ? getContextualThisParameterType(func) : getContextuallyTypedParameterType(declaration);
+                var type = declaration.symbol.escapedName === "this" /* This */ ? getContextualThisParameterType(func) : getContextuallyTypedParameterType(declaration, /*forCache*/ true);
                 if (type) {
                     return addOptionality(type, isOptional);
                 }
@@ -35728,7 +36393,7 @@ var ts;
             // No type specified and nothing can be inferred
             return undefined;
         }
-        function getWidenedTypeFromAssignmentDeclaration(symbol, resolvedSymbol) {
+        function getWidenedTypeForAssignmentDeclaration(symbol, resolvedSymbol) {
             // function/class/{} initializers are themselves containers, so they won't merge in the same way as other initializers
             var container = ts.getAssignedExpandoInitializer(symbol.valueDeclaration);
             if (container) {
@@ -35761,7 +36426,7 @@ var ts;
                     }
                 }
                 if (!ts.isCallExpression(expression)) {
-                    jsdocType = getJSDocTypeFromAssignmentDeclaration(jsdocType, expression, symbol, declaration);
+                    jsdocType = getAnnotatedTypeForAssignmentDeclaration(jsdocType, expression, symbol, declaration);
                 }
                 if (!jsdocType) {
                     (types || (types = [])).push((ts.isBinaryExpression(expression) || ts.isCallExpression(expression)) ? getInitializerTypeFromAssignmentDeclaration(symbol, resolvedSymbol, expression, kind) : neverType);
@@ -35808,15 +36473,21 @@ var ts;
             type.objectFlags |= 16384 /* JSLiteral */;
             return type;
         }
-        function getJSDocTypeFromAssignmentDeclaration(declaredType, expression, _symbol, declaration) {
-            var typeNode = ts.getJSDocType(expression.parent);
+        function getAnnotatedTypeForAssignmentDeclaration(declaredType, expression, symbol, declaration) {
+            var typeNode = ts.getEffectiveTypeAnnotationNode(expression.parent);
             if (typeNode) {
                 var type = getWidenedType(getTypeFromTypeNode(typeNode));
                 if (!declaredType) {
                     return type;
                 }
                 else if (declaredType !== errorType && type !== errorType && !isTypeIdenticalTo(declaredType, type)) {
-                    errorNextVariableOrPropertyDeclarationMustHaveSameType(declaredType, declaration, type);
+                    errorNextVariableOrPropertyDeclarationMustHaveSameType(/*firstDeclaration*/ undefined, declaredType, declaration, type);
+                }
+            }
+            if (symbol.parent) {
+                var typeNode_2 = ts.getEffectiveTypeAnnotationNode(symbol.parent.valueDeclaration);
+                if (typeNode_2) {
+                    return getTypeOfPropertyOfType(getTypeFromTypeNode(typeNode_2), symbol.escapedName);
                 }
             }
             return declaredType;
@@ -35883,9 +36554,9 @@ var ts;
             var thisContainer = ts.getThisContainer(expression, /*includeArrowFunctions*/ false);
             // Properties defined in a constructor (or base constructor, or javascript constructor function) don't get undefined added.
             // Function expressions that are assigned to the prototype count as methods.
-            return thisContainer.kind === 157 /* Constructor */ ||
-                thisContainer.kind === 239 /* FunctionDeclaration */ ||
-                (thisContainer.kind === 196 /* FunctionExpression */ && !ts.isPrototypePropertyAssignment(thisContainer.parent));
+            return thisContainer.kind === 158 /* Constructor */ ||
+                thisContainer.kind === 240 /* FunctionDeclaration */ ||
+                (thisContainer.kind === 197 /* FunctionExpression */ && !ts.isPrototypePropertyAssignment(thisContainer.parent));
         }
         function getConstructorDefinedThisAssignmentTypes(types, declarations) {
             ts.Debug.assert(types.length === declarations.length);
@@ -35929,7 +36600,7 @@ var ts;
         function getTypeFromObjectBindingPattern(pattern, includePatternInType, reportErrors) {
             var members = ts.createSymbolTable();
             var stringIndexInfo;
-            var objectFlags = 128 /* ObjectLiteral */ | 262144 /* ContainsObjectLiteral */;
+            var objectFlags = 128 /* ObjectLiteral */ | 524288 /* ContainsObjectOrArrayLiteral */;
             ts.forEach(pattern.elements, function (e) {
                 var name = e.propertyName || e.name;
                 if (e.dotDotDotToken) {
@@ -35960,7 +36631,7 @@ var ts;
         function getTypeFromArrayBindingPattern(pattern, includePatternInType, reportErrors) {
             var elements = pattern.elements;
             var lastElement = ts.lastOrUndefined(elements);
-            var hasRestElement = !!(lastElement && lastElement.kind === 186 /* BindingElement */ && lastElement.dotDotDotToken);
+            var hasRestElement = !!(lastElement && lastElement.kind === 187 /* BindingElement */ && lastElement.dotDotDotToken);
             if (elements.length === 0 || elements.length === 1 && hasRestElement) {
                 return languageVersion >= 2 /* ES2015 */ ? createIterableType(anyType) : anyArrayType;
             }
@@ -35983,7 +36654,7 @@ var ts;
         function getTypeFromBindingPattern(pattern, includePatternInType, reportErrors) {
             if (includePatternInType === void 0) { includePatternInType = false; }
             if (reportErrors === void 0) { reportErrors = false; }
-            return pattern.kind === 184 /* ObjectBindingPattern */
+            return pattern.kind === 185 /* ObjectBindingPattern */
                 ? getTypeFromObjectBindingPattern(pattern, includePatternInType, reportErrors)
                 : getTypeFromArrayBindingPattern(pattern, includePatternInType, reportErrors);
         }
@@ -36022,7 +36693,7 @@ var ts;
         }
         function declarationBelongsToPrivateAmbientMember(declaration) {
             var root = ts.getRootDeclaration(declaration);
-            var memberDeclaration = root.kind === 151 /* Parameter */ ? root.parent : root;
+            var memberDeclaration = root.kind === 152 /* Parameter */ ? root.parent : root;
             return isPrivateWithinAmbient(memberDeclaration);
         }
         function tryGetTypeFromEffectiveTypeNode(declaration) {
@@ -36075,9 +36746,6 @@ var ts;
                 }
                 return type_1;
             }
-            if (declaration.kind === 254 /* ExportAssignment */) {
-                return widenTypeForVariableLikeDeclaration(checkExpressionCached(declaration.expression), declaration);
-            }
             // Handle variable, parameter or property
             if (!pushTypeResolution(symbol, 0 /* Type */)) {
                 // Symbol is property of some kind that is merged with something - should use `getTypeOfFuncClassEnumModule` and not `getTypeOfVariableOrParameterOrProperty`
@@ -36087,9 +36755,12 @@ var ts;
                 return reportCircularityError(symbol);
             }
             var type;
-            if (ts.isInJSFile(declaration) &&
+            if (declaration.kind === 255 /* ExportAssignment */) {
+                type = widenTypeForVariableLikeDeclaration(checkExpressionCached(declaration.expression), declaration);
+            }
+            else if (ts.isInJSFile(declaration) &&
                 (ts.isCallExpression(declaration) || ts.isBinaryExpression(declaration) || ts.isPropertyAccessExpression(declaration) && ts.isBinaryExpression(declaration.parent))) {
-                type = getWidenedTypeFromAssignmentDeclaration(symbol);
+                type = getWidenedTypeForAssignmentDeclaration(symbol);
             }
             else if (ts.isJSDocPropertyLikeTag(declaration)
                 || ts.isPropertyAccessExpression(declaration)
@@ -36104,7 +36775,7 @@ var ts;
                     return getTypeOfFuncClassEnumModule(symbol);
                 }
                 type = ts.isBinaryExpression(declaration.parent) ?
-                    getWidenedTypeFromAssignmentDeclaration(symbol) :
+                    getWidenedTypeForAssignmentDeclaration(symbol) :
                     tryGetTypeFromEffectiveTypeNode(declaration) || anyType;
             }
             else if (ts.isPropertyAssignment(declaration)) {
@@ -36135,7 +36806,7 @@ var ts;
                 type = getTypeOfEnumMember(symbol);
             }
             else {
-                return ts.Debug.fail("Unhandled declaration kind! " + ts.Debug.showSyntaxKind(declaration) + " for " + ts.Debug.showSymbol(symbol));
+                return ts.Debug.fail("Unhandled declaration kind! " + ts.Debug.formatSyntaxKind(declaration.kind) + " for " + ts.Debug.formatSymbol(symbol));
             }
             if (!popTypeResolution()) {
                 // Symbol is property of some kind that is merged with something - should use `getTypeOfFuncClassEnumModule` and not `getTypeOfVariableOrParameterOrProperty`
@@ -36148,7 +36819,7 @@ var ts;
         }
         function getAnnotatedAccessorTypeNode(accessor) {
             if (accessor) {
-                if (accessor.kind === 158 /* GetAccessor */) {
+                if (accessor.kind === 159 /* GetAccessor */) {
                     var getterTypeAnnotation = ts.getEffectiveReturnTypeNode(accessor);
                     return getterTypeAnnotation;
                 }
@@ -36175,8 +36846,8 @@ var ts;
             return links.type || (links.type = getTypeOfAccessorsWorker(symbol));
         }
         function getTypeOfAccessorsWorker(symbol) {
-            var getter = ts.getDeclarationOfKind(symbol, 158 /* GetAccessor */);
-            var setter = ts.getDeclarationOfKind(symbol, 159 /* SetAccessor */);
+            var getter = ts.getDeclarationOfKind(symbol, 159 /* GetAccessor */);
+            var setter = ts.getDeclarationOfKind(symbol, 160 /* SetAccessor */);
             if (getter && ts.isInJSFile(getter)) {
                 var jsDocType = getTypeForDeclarationFromJSDocComment(getter);
                 if (jsDocType) {
@@ -36219,7 +36890,7 @@ var ts;
             if (!popTypeResolution()) {
                 type = anyType;
                 if (noImplicitAny) {
-                    var getter_1 = ts.getDeclarationOfKind(symbol, 158 /* GetAccessor */);
+                    var getter_1 = ts.getDeclarationOfKind(symbol, 159 /* GetAccessor */);
                     error(getter_1, ts.Diagnostics._0_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions, symbolToString(symbol));
                 }
             }
@@ -36259,9 +36930,9 @@ var ts;
             if (symbol.flags & 1536 /* Module */ && ts.isShorthandAmbientModuleSymbol(symbol)) {
                 return anyType;
             }
-            else if (declaration.kind === 204 /* BinaryExpression */ ||
-                declaration.kind === 189 /* PropertyAccessExpression */ && declaration.parent.kind === 204 /* BinaryExpression */) {
-                return getWidenedTypeFromAssignmentDeclaration(symbol);
+            else if (declaration.kind === 205 /* BinaryExpression */ ||
+                declaration.kind === 190 /* PropertyAccessExpression */ && declaration.parent.kind === 205 /* BinaryExpression */) {
+                return getWidenedTypeForAssignmentDeclaration(symbol);
             }
             else if (symbol.flags & 512 /* ValueModule */ && declaration && ts.isSourceFile(declaration) && declaration.commonJsModuleIndicator) {
                 var resolvedModule = resolveExternalModuleSymbol(symbol);
@@ -36270,7 +36941,7 @@ var ts;
                         return errorType;
                     }
                     var exportEquals = getMergedSymbol(symbol.exports.get("export=" /* ExportEquals */));
-                    var type_2 = getWidenedTypeFromAssignmentDeclaration(exportEquals, exportEquals === resolvedModule ? undefined : resolvedModule);
+                    var type_2 = getWidenedTypeForAssignmentDeclaration(exportEquals, exportEquals === resolvedModule ? undefined : resolvedModule);
                     if (!popTypeResolution()) {
                         return reportCircularityError(symbol);
                     }
@@ -36327,7 +36998,7 @@ var ts;
                 return errorType;
             }
             // Check if variable has initializer that circularly references the variable itself
-            if (noImplicitAny && (declaration.kind !== 151 /* Parameter */ || declaration.initializer)) {
+            if (noImplicitAny && (declaration.kind !== 152 /* Parameter */ || declaration.initializer)) {
                 error(symbol.valueDeclaration, ts.Diagnostics._0_implicitly_has_type_any_because_it_does_not_have_a_type_annotation_and_is_referenced_directly_or_indirectly_in_its_own_initializer, symbolToString(symbol));
             }
             // Circularities could also result from parameters in function expressions that end up
@@ -36335,11 +37006,23 @@ var ts;
             // we have already reported an implicit any error so we don't report anything here.
             return anyType;
         }
+        function getTypeOfSymbolWithDeferredType(symbol) {
+            var links = getSymbolLinks(symbol);
+            if (!links.type) {
+                ts.Debug.assertDefined(links.deferralParent);
+                ts.Debug.assertDefined(links.deferralConstituents);
+                links.type = links.deferralParent.flags & 1048576 /* Union */ ? getUnionType(links.deferralConstituents) : getIntersectionType(links.deferralConstituents);
+            }
+            return links.type;
+        }
         function getTypeOfSymbol(symbol) {
+            if (ts.getCheckFlags(symbol) & 65536 /* DeferredType */) {
+                return getTypeOfSymbolWithDeferredType(symbol);
+            }
             if (ts.getCheckFlags(symbol) & 1 /* Instantiated */) {
                 return getTypeOfInstantiatedSymbol(symbol);
             }
-            if (ts.getCheckFlags(symbol) & 4096 /* ReverseMapped */) {
+            if (ts.getCheckFlags(symbol) & 8192 /* ReverseMapped */) {
                 return getTypeOfReverseMappedSymbol(symbol);
             }
             if (symbol.flags & (3 /* Variable */ | 4 /* Property */)) {
@@ -36400,35 +37083,35 @@ var ts;
                     return undefined;
                 }
                 switch (node.kind) {
-                    case 240 /* ClassDeclaration */:
-                    case 209 /* ClassExpression */:
-                    case 241 /* InterfaceDeclaration */:
-                    case 160 /* CallSignature */:
-                    case 161 /* ConstructSignature */:
-                    case 155 /* MethodSignature */:
-                    case 165 /* FunctionType */:
-                    case 166 /* ConstructorType */:
-                    case 294 /* JSDocFunctionType */:
-                    case 239 /* FunctionDeclaration */:
-                    case 156 /* MethodDeclaration */:
-                    case 196 /* FunctionExpression */:
-                    case 197 /* ArrowFunction */:
-                    case 242 /* TypeAliasDeclaration */:
-                    case 308 /* JSDocTemplateTag */:
-                    case 309 /* JSDocTypedefTag */:
-                    case 302 /* JSDocCallbackTag */:
-                    case 181 /* MappedType */:
-                    case 175 /* ConditionalType */:
+                    case 241 /* ClassDeclaration */:
+                    case 210 /* ClassExpression */:
+                    case 242 /* InterfaceDeclaration */:
+                    case 161 /* CallSignature */:
+                    case 162 /* ConstructSignature */:
+                    case 156 /* MethodSignature */:
+                    case 166 /* FunctionType */:
+                    case 167 /* ConstructorType */:
+                    case 295 /* JSDocFunctionType */:
+                    case 240 /* FunctionDeclaration */:
+                    case 157 /* MethodDeclaration */:
+                    case 197 /* FunctionExpression */:
+                    case 198 /* ArrowFunction */:
+                    case 243 /* TypeAliasDeclaration */:
+                    case 310 /* JSDocTemplateTag */:
+                    case 311 /* JSDocTypedefTag */:
+                    case 304 /* JSDocCallbackTag */:
+                    case 182 /* MappedType */:
+                    case 176 /* ConditionalType */:
                         var outerTypeParameters = getOuterTypeParameters(node, includeThisTypes);
-                        if (node.kind === 181 /* MappedType */) {
+                        if (node.kind === 182 /* MappedType */) {
                             return ts.append(outerTypeParameters, getDeclaredTypeOfTypeParameter(getSymbolOfNode(node.typeParameter)));
                         }
-                        else if (node.kind === 175 /* ConditionalType */) {
+                        else if (node.kind === 176 /* ConditionalType */) {
                             return ts.concatenate(outerTypeParameters, getInferTypeParameters(node));
                         }
                         var outerAndOwnTypeParameters = appendTypeParameters(outerTypeParameters, ts.getEffectiveTypeParameterDeclarations(node));
                         var thisType = includeThisTypes &&
-                            (node.kind === 240 /* ClassDeclaration */ || node.kind === 209 /* ClassExpression */ || node.kind === 241 /* InterfaceDeclaration */) &&
+                            (node.kind === 241 /* ClassDeclaration */ || node.kind === 210 /* ClassExpression */ || node.kind === 242 /* InterfaceDeclaration */) &&
                             getDeclaredTypeOfClassOrInterface(getSymbolOfNode(node)).thisType;
                         return thisType ? ts.append(outerAndOwnTypeParameters, thisType) : outerAndOwnTypeParameters;
                 }
@@ -36436,7 +37119,7 @@ var ts;
         }
         // The outer type parameters are those defined by enclosing generic classes, methods, or functions.
         function getOuterTypeParametersOfClassOrInterface(symbol) {
-            var declaration = symbol.flags & 32 /* Class */ ? symbol.valueDeclaration : ts.getDeclarationOfKind(symbol, 241 /* InterfaceDeclaration */);
+            var declaration = symbol.flags & 32 /* Class */ ? symbol.valueDeclaration : ts.getDeclarationOfKind(symbol, 242 /* InterfaceDeclaration */);
             return getOuterTypeParameters(declaration);
         }
         // The local type parameters are the combined set of type parameters from all declarations of the class,
@@ -36445,9 +37128,9 @@ var ts;
             var result;
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var node = _a[_i];
-                if (node.kind === 241 /* InterfaceDeclaration */ ||
-                    node.kind === 240 /* ClassDeclaration */ ||
-                    node.kind === 209 /* ClassExpression */ ||
+                if (node.kind === 242 /* InterfaceDeclaration */ ||
+                    node.kind === 241 /* ClassDeclaration */ ||
+                    node.kind === 210 /* ClassExpression */ ||
                     ts.isTypeAlias(node)) {
                     var declaration = node;
                     result = appendTypeParameters(result, ts.getEffectiveTypeParameterDeclarations(declaration));
@@ -36537,7 +37220,7 @@ var ts;
                                 ctorReturn = getReturnTypeOfSignature(ctorSig[0]);
                             }
                         }
-                        addRelatedInfo(err, ts.createDiagnosticForNode(baseConstructorType.symbol.declarations[0], ts.Diagnostics.Did_you_mean_for_0_to_be_constrained_to_type_new_args_Colon_any_1, symbolToString(baseConstructorType.symbol), typeToString(ctorReturn)));
+                        ts.addRelatedInfo(err, ts.createDiagnosticForNode(baseConstructorType.symbol.declarations[0], ts.Diagnostics.Did_you_mean_for_0_to_be_constrained_to_type_new_args_Colon_any_1, symbolToString(baseConstructorType.symbol), typeToString(ctorReturn)));
                     }
                     return type.resolvedBaseConstructorType = errorType;
                 }
@@ -36641,7 +37324,7 @@ var ts;
             type.resolvedBaseTypes = type.resolvedBaseTypes || ts.emptyArray;
             for (var _i = 0, _a = type.symbol.declarations; _i < _a.length; _i++) {
                 var declaration = _a[_i];
-                if (declaration.kind === 241 /* InterfaceDeclaration */ && ts.getInterfaceBaseTypeNodes(declaration)) {
+                if (declaration.kind === 242 /* InterfaceDeclaration */ && ts.getInterfaceBaseTypeNodes(declaration)) {
                     for (var _b = 0, _c = ts.getInterfaceBaseTypeNodes(declaration); _b < _c.length; _b++) {
                         var node = _c[_b];
                         var baseType = getTypeFromTypeNode(node);
@@ -36677,7 +37360,7 @@ var ts;
         function isThislessInterface(symbol) {
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var declaration = _a[_i];
-                if (declaration.kind === 241 /* InterfaceDeclaration */) {
+                if (declaration.kind === 242 /* InterfaceDeclaration */) {
                     if (declaration.flags & 64 /* ContainsThis */) {
                         return false;
                     }
@@ -36734,7 +37417,7 @@ var ts;
                     return errorType;
                 }
                 var declaration = ts.find(symbol.declarations, function (d) {
-                    return ts.isJSDocTypeAlias(d) || d.kind === 242 /* TypeAliasDeclaration */;
+                    return ts.isJSDocTypeAlias(d) || d.kind === 243 /* TypeAliasDeclaration */;
                 });
                 var typeNode = ts.isJSDocTypeAlias(declaration) ? declaration.typeExpression : declaration.type;
                 // If typeNode is missing, we will error in checkJSDocTypedefTag.
@@ -36761,7 +37444,7 @@ var ts;
             if (expr.kind === 10 /* StringLiteral */) {
                 return true;
             }
-            else if (expr.kind === 204 /* BinaryExpression */) {
+            else if (expr.kind === 205 /* BinaryExpression */) {
                 return isStringConcatExpression(expr.left) && isStringConcatExpression(expr.right);
             }
             return false;
@@ -36775,12 +37458,12 @@ var ts;
                 case 10 /* StringLiteral */:
                 case 8 /* NumericLiteral */:
                     return true;
-                case 202 /* PrefixUnaryExpression */:
+                case 203 /* PrefixUnaryExpression */:
                     return expr.operator === 39 /* MinusToken */ &&
                         expr.operand.kind === 8 /* NumericLiteral */;
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return ts.nodeIsMissing(expr) || !!getSymbolOfNode(member.parent).exports.get(expr.escapedText);
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return isStringConcatExpression(expr);
                 default:
                     return false;
@@ -36794,7 +37477,7 @@ var ts;
             var hasNonLiteralMember = false;
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var declaration = _a[_i];
-                if (declaration.kind === 243 /* EnumDeclaration */) {
+                if (declaration.kind === 244 /* EnumDeclaration */) {
                     for (var _b = 0, _c = declaration.members; _b < _c.length; _b++) {
                         var member = _c[_b];
                         if (member.initializer && member.initializer.kind === 10 /* StringLiteral */) {
@@ -36821,10 +37504,11 @@ var ts;
                 var memberTypeList = [];
                 for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                     var declaration = _a[_i];
-                    if (declaration.kind === 243 /* EnumDeclaration */) {
+                    if (declaration.kind === 244 /* EnumDeclaration */) {
                         for (var _b = 0, _c = declaration.members; _b < _c.length; _b++) {
                             var member = _c[_b];
-                            var memberType = getFreshTypeOfLiteralType(getLiteralType(getEnumMemberValue(member), enumCount, getSymbolOfNode(member))); // TODO: GH#18217
+                            var value = getEnumMemberValue(member);
+                            var memberType = getFreshTypeOfLiteralType(getLiteralType(value !== undefined ? value : 0, enumCount, getSymbolOfNode(member)));
                             getSymbolLinks(getSymbolOfNode(member)).declaredType = memberType;
                             memberTypeList.push(getRegularTypeOfLiteralType(memberType));
                         }
@@ -36892,23 +37576,23 @@ var ts;
          */
         function isThislessType(node) {
             switch (node.kind) {
-                case 120 /* AnyKeyword */:
-                case 143 /* UnknownKeyword */:
-                case 138 /* StringKeyword */:
-                case 135 /* NumberKeyword */:
-                case 146 /* BigIntKeyword */:
-                case 123 /* BooleanKeyword */:
-                case 139 /* SymbolKeyword */:
-                case 136 /* ObjectKeyword */:
-                case 106 /* VoidKeyword */:
-                case 141 /* UndefinedKeyword */:
-                case 96 /* NullKeyword */:
-                case 132 /* NeverKeyword */:
-                case 182 /* LiteralType */:
+                case 121 /* AnyKeyword */:
+                case 144 /* UnknownKeyword */:
+                case 139 /* StringKeyword */:
+                case 136 /* NumberKeyword */:
+                case 147 /* BigIntKeyword */:
+                case 124 /* BooleanKeyword */:
+                case 140 /* SymbolKeyword */:
+                case 137 /* ObjectKeyword */:
+                case 107 /* VoidKeyword */:
+                case 142 /* UndefinedKeyword */:
+                case 97 /* NullKeyword */:
+                case 133 /* NeverKeyword */:
+                case 183 /* LiteralType */:
                     return true;
-                case 169 /* ArrayType */:
+                case 170 /* ArrayType */:
                     return isThislessType(node.elementType);
-                case 164 /* TypeReference */:
+                case 165 /* TypeReference */:
                     return !node.typeArguments || node.typeArguments.every(isThislessType);
             }
             return false;
@@ -36934,7 +37618,7 @@ var ts;
         function isThislessFunctionLikeDeclaration(node) {
             var returnType = ts.getEffectiveReturnTypeNode(node);
             var typeParameters = ts.getEffectiveTypeParameterDeclarations(node);
-            return (node.kind === 157 /* Constructor */ || (!!returnType && isThislessType(returnType))) &&
+            return (node.kind === 158 /* Constructor */ || (!!returnType && isThislessType(returnType))) &&
                 node.parameters.every(isThislessVariableLikeDeclaration) &&
                 typeParameters.every(isThislessTypeParameter);
         }
@@ -36950,14 +37634,14 @@ var ts;
                 var declaration = symbol.declarations[0];
                 if (declaration) {
                     switch (declaration.kind) {
-                        case 154 /* PropertyDeclaration */:
-                        case 153 /* PropertySignature */:
+                        case 155 /* PropertyDeclaration */:
+                        case 154 /* PropertySignature */:
                             return isThislessVariableLikeDeclaration(declaration);
-                        case 156 /* MethodDeclaration */:
-                        case 155 /* MethodSignature */:
-                        case 157 /* Constructor */:
-                        case 158 /* GetAccessor */:
-                        case 159 /* SetAccessor */:
+                        case 157 /* MethodDeclaration */:
+                        case 156 /* MethodSignature */:
+                        case 158 /* Constructor */:
+                        case 159 /* GetAccessor */:
+                        case 160 /* SetAccessor */:
                             return isThislessFunctionLikeDeclaration(declaration);
                     }
                 }
@@ -37058,7 +37742,7 @@ var ts;
          * members.
          */
         function addDeclarationToLateBoundSymbol(symbol, member, symbolFlags) {
-            ts.Debug.assert(!!(ts.getCheckFlags(symbol) & 2048 /* Late */), "Expected a late-bound symbol.");
+            ts.Debug.assert(!!(ts.getCheckFlags(symbol) & 4096 /* Late */), "Expected a late-bound symbol.");
             symbol.flags |= symbolFlags;
             getSymbolLinks(member.symbol).lateSymbol = symbol;
             if (!symbol.declarations) {
@@ -37115,7 +37799,7 @@ var ts;
                     // Get or add a late-bound symbol for the member. This allows us to merge late-bound accessor declarations.
                     var lateSymbol = lateSymbols.get(memberName);
                     if (!lateSymbol)
-                        lateSymbols.set(memberName, lateSymbol = createSymbol(0 /* None */, memberName, 2048 /* Late */));
+                        lateSymbols.set(memberName, lateSymbol = createSymbol(0 /* None */, memberName, 4096 /* Late */));
                     // Report an error if a late-bound member has the same name as an early-bound member,
                     // or if we have another early-bound symbol declaration with the same name and
                     // conflicting flags.
@@ -37127,7 +37811,7 @@ var ts;
                         var name_3 = !(type.flags & 8192 /* UniqueESSymbol */) && ts.unescapeLeadingUnderscores(memberName) || ts.declarationNameToString(decl.name);
                         ts.forEach(declarations, function (declaration) { return error(ts.getNameOfDeclaration(declaration) || declaration, ts.Diagnostics.Property_0_was_also_declared_here, name_3); });
                         error(decl.name || decl, ts.Diagnostics.Duplicate_property_0, name_3);
-                        lateSymbol = createSymbol(0 /* None */, memberName, 2048 /* Late */);
+                        lateSymbol = createSymbol(0 /* None */, memberName, 4096 /* Late */);
                     }
                     lateSymbol.nameType = type;
                     addDeclarationToLateBoundSymbol(lateSymbol, decl, symbolFlags);
@@ -37192,11 +37876,12 @@ var ts;
                 var links = getSymbolLinks(symbol);
                 if (!links.lateSymbol && ts.some(symbol.declarations, hasLateBindableName)) {
                     // force late binding of members/exports. This will set the late-bound symbol
+                    var parent = getMergedSymbol(symbol.parent);
                     if (ts.some(symbol.declarations, ts.hasStaticModifier)) {
-                        getExportsOfSymbol(symbol.parent);
+                        getExportsOfSymbol(parent);
                     }
                     else {
-                        getMembersOfSymbol(symbol.parent);
+                        getMembersOfSymbol(parent);
                     }
                 }
                 return links.lateSymbol || (links.lateSymbol = symbol);
@@ -37289,8 +37974,18 @@ var ts;
             return sig;
         }
         function cloneSignature(sig) {
-            return createSignature(sig.declaration, sig.typeParameters, sig.thisParameter, sig.parameters, /*resolvedReturnType*/ undefined, 
+            var result = createSignature(sig.declaration, sig.typeParameters, sig.thisParameter, sig.parameters, /*resolvedReturnType*/ undefined, 
             /*resolvedTypePredicate*/ undefined, sig.minArgumentCount, sig.hasRestParameter, sig.hasLiteralTypes);
+            result.target = sig.target;
+            result.mapper = sig.mapper;
+            return result;
+        }
+        function createUnionSignature(signature, unionSignatures) {
+            var result = cloneSignature(signature);
+            result.unionSignatures = unionSignatures;
+            result.target = undefined;
+            result.mapper = undefined;
+            return result;
         }
         function getExpandedParameters(sig) {
             if (sig.hasRestParameter) {
@@ -37303,8 +37998,8 @@ var ts;
                     var tupleRestIndex_1 = restType.target.hasRestElement ? elementTypes.length - 1 : -1;
                     var restParams = ts.map(elementTypes, function (t, i) {
                         var name = getParameterNameAtPosition(sig, restIndex_1 + i);
-                        var checkFlags = i === tupleRestIndex_1 ? 16384 /* RestParameter */ :
-                            i >= minLength_1 ? 8192 /* OptionalParameter */ : 0;
+                        var checkFlags = i === tupleRestIndex_1 ? 32768 /* RestParameter */ :
+                            i >= minLength_1 ? 16384 /* OptionalParameter */ : 0;
                         var symbol = createSymbol(1 /* FunctionScopedVariable */, name, checkFlags);
                         symbol.type = i === tupleRestIndex_1 ? createArrayType(t) : t;
                         return symbol;
@@ -37394,14 +38089,13 @@ var ts;
                             // Union the result types when more than one signature matches
                             if (unionSignatures.length > 1) {
                                 var thisParameter = signature.thisParameter;
-                                if (ts.forEach(unionSignatures, function (sig) { return sig.thisParameter; })) {
-                                    // TODO: GH#18217 We tested that *some* has thisParameter and now act as if *all* do
+                                var firstThisParameterOfUnionSignatures = ts.forEach(unionSignatures, function (sig) { return sig.thisParameter; });
+                                if (firstThisParameterOfUnionSignatures) {
                                     var thisType = getUnionType(ts.map(unionSignatures, function (sig) { return sig.thisParameter ? getTypeOfSymbol(sig.thisParameter) : anyType; }), 2 /* Subtype */);
-                                    thisParameter = createSymbolWithType(signature.thisParameter, thisType);
+                                    thisParameter = createSymbolWithType(firstThisParameterOfUnionSignatures, thisType);
                                 }
-                                s = cloneSignature(signature);
+                                s = createUnionSignature(signature, unionSignatures);
                                 s.thisParameter = thisParameter;
-                                s.unionSignatures = unionSignatures;
                             }
                             (result || (result = [])).push(s);
                         }
@@ -37446,9 +38140,11 @@ var ts;
             return createSymbolWithType(left, thisType);
         }
         function combineUnionParameters(left, right) {
-            var longest = getParameterCount(left) >= getParameterCount(right) ? left : right;
+            var leftCount = getParameterCount(left);
+            var rightCount = getParameterCount(right);
+            var longest = leftCount >= rightCount ? left : right;
             var shorter = longest === left ? right : left;
-            var longestCount = getParameterCount(longest);
+            var longestCount = longest === left ? leftCount : rightCount;
             var eitherHasEffectiveRest = (hasEffectiveRestParameter(left) || hasEffectiveRestParameter(right));
             var needsExtraRestElement = eitherHasEffectiveRest && !hasEffectiveRestParameter(longest);
             var params = new Array(longestCount + (needsExtraRestElement ? 1 : 0));
@@ -37458,9 +38154,13 @@ var ts;
                 var unionParamType = getIntersectionType([longestParamType, shorterParamType]);
                 var isRestParam = eitherHasEffectiveRest && !needsExtraRestElement && i === (longestCount - 1);
                 var isOptional = i >= getMinArgumentCount(longest) && i >= getMinArgumentCount(shorter);
-                var leftName = getParameterNameAtPosition(left, i);
-                var rightName = getParameterNameAtPosition(right, i);
-                var paramSymbol = createSymbol(1 /* FunctionScopedVariable */ | (isOptional && !isRestParam ? 16777216 /* Optional */ : 0), leftName === rightName ? leftName : "arg" + i);
+                var leftName = i >= leftCount ? undefined : getParameterNameAtPosition(left, i);
+                var rightName = i >= rightCount ? undefined : getParameterNameAtPosition(right, i);
+                var paramName = leftName === rightName ? leftName :
+                    !leftName ? rightName :
+                        !rightName ? leftName :
+                            undefined;
+                var paramSymbol = createSymbol(1 /* FunctionScopedVariable */ | (isOptional && !isRestParam ? 16777216 /* Optional */ : 0), paramName || "arg" + i);
                 paramSymbol.type = isRestParam ? createArrayType(unionParamType) : unionParamType;
                 params[i] = paramSymbol;
             }
@@ -37516,13 +38216,22 @@ var ts;
         function unionSpreadIndexInfos(info1, info2) {
             return info1 && info2 && createIndexInfo(getUnionType([info1.type, info2.type]), info1.isReadonly || info2.isReadonly);
         }
-        function includeMixinType(type, types, index) {
+        function findMixins(types) {
+            var constructorTypeCount = ts.countWhere(types, function (t) { return getSignaturesOfType(t, 1 /* Construct */).length > 0; });
+            var mixinFlags = ts.map(types, isMixinConstructorType);
+            if (constructorTypeCount > 0 && constructorTypeCount === ts.countWhere(mixinFlags, function (b) { return b; })) {
+                var firstMixinIndex = mixinFlags.indexOf(/*searchElement*/ true);
+                mixinFlags[firstMixinIndex] = false;
+            }
+            return mixinFlags;
+        }
+        function includeMixinType(type, types, mixinFlags, index) {
             var mixedTypes = [];
             for (var i = 0; i < types.length; i++) {
                 if (i === index) {
                     mixedTypes.push(type);
                 }
-                else if (isMixinConstructorType(types[i])) {
+                else if (mixinFlags[i]) {
                     mixedTypes.push(getReturnTypeOfSignature(getSignaturesOfType(types[i], 1 /* Construct */)[0]));
                 }
             }
@@ -37531,12 +38240,13 @@ var ts;
         function resolveIntersectionTypeMembers(type) {
             // The members and properties collections are empty for intersection types. To get all properties of an
             // intersection type use getPropertiesOfType (only the language service uses this).
-            var callSignatures = ts.emptyArray;
-            var constructSignatures = ts.emptyArray;
+            var callSignatures;
+            var constructSignatures;
             var stringIndexInfo;
             var numberIndexInfo;
             var types = type.types;
-            var mixinCount = ts.countWhere(types, isMixinConstructorType);
+            var mixinFlags = findMixins(types);
+            var mixinCount = ts.countWhere(mixinFlags, function (b) { return b; });
             var _loop_6 = function (i) {
                 var t = type.types[i];
                 // When an intersection type contains mixin constructor types, the construct signatures from
@@ -37544,25 +38254,37 @@ var ts;
                 // other construct signatures in the intersection type. For example, the intersection type
                 // '{ new(...args: any[]) => A } & { new(s: string) => B }' has a single construct signature
                 // 'new(s: string) => A & B'.
-                if (mixinCount === 0 || mixinCount === types.length && i === 0 || !isMixinConstructorType(t)) {
+                if (!mixinFlags[i]) {
                     var signatures = getSignaturesOfType(t, 1 /* Construct */);
                     if (signatures.length && mixinCount > 0) {
                         signatures = ts.map(signatures, function (s) {
                             var clone = cloneSignature(s);
-                            clone.resolvedReturnType = includeMixinType(getReturnTypeOfSignature(s), types, i);
+                            clone.resolvedReturnType = includeMixinType(getReturnTypeOfSignature(s), types, mixinFlags, i);
                             return clone;
                         });
                     }
-                    constructSignatures = ts.concatenate(constructSignatures, signatures);
+                    constructSignatures = appendSignatures(constructSignatures, signatures);
                 }
-                callSignatures = ts.concatenate(callSignatures, getSignaturesOfType(t, 0 /* Call */));
+                callSignatures = appendSignatures(callSignatures, getSignaturesOfType(t, 0 /* Call */));
                 stringIndexInfo = intersectIndexInfos(stringIndexInfo, getIndexInfoOfType(t, 0 /* String */));
                 numberIndexInfo = intersectIndexInfos(numberIndexInfo, getIndexInfoOfType(t, 1 /* Number */));
             };
             for (var i = 0; i < types.length; i++) {
                 _loop_6(i);
             }
-            setStructuredTypeMembers(type, emptySymbols, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
+            setStructuredTypeMembers(type, emptySymbols, callSignatures || ts.emptyArray, constructSignatures || ts.emptyArray, stringIndexInfo, numberIndexInfo);
+        }
+        function appendSignatures(signatures, newSignatures) {
+            var _loop_7 = function (sig) {
+                if (!signatures || ts.every(signatures, function (s) { return !compareSignaturesIdentical(s, sig, /*partialMatch*/ false, /*ignoreThisTypes*/ false, /*ignoreReturnTypes*/ false, compareTypesIdentical); })) {
+                    signatures = ts.append(signatures, sig);
+                }
+            };
+            for (var _i = 0, newSignatures_1 = newSignatures; _i < newSignatures_1.length; _i++) {
+                var sig = newSignatures_1[_i];
+                _loop_7(sig);
+            }
+            return signatures;
         }
         /**
          * Converts an AnonymousType to a ResolvedType.
@@ -37593,6 +38315,15 @@ var ts;
                 var stringIndexInfo = void 0;
                 if (symbol.exports) {
                     members = getExportsOfSymbol(symbol);
+                    if (symbol === globalThisSymbol) {
+                        var varsOnly_1 = ts.createMap();
+                        members.forEach(function (p) {
+                            if (!(p.flags & 418 /* BlockScoped */)) {
+                                varsOnly_1.set(p.escapedName, p);
+                            }
+                        });
+                        members = varsOnly_1;
+                    }
                 }
                 setStructuredTypeMembers(type, members, ts.emptyArray, ts.emptyArray, undefined, undefined);
                 if (symbol.flags & 32 /* Class */) {
@@ -37606,7 +38337,8 @@ var ts;
                         stringIndexInfo = createIndexInfo(anyType, /*isReadonly*/ false);
                     }
                 }
-                var numberIndexInfo = symbol.flags & 384 /* Enum */ ? enumNumberIndexInfo : undefined;
+                var numberIndexInfo = symbol.flags & 384 /* Enum */ && (getDeclaredTypeOfSymbol(symbol).flags & 32 /* Enum */ ||
+                    ts.some(type.properties, function (prop) { return !!(getTypeOfSymbol(prop).flags & 296 /* NumberLike */); })) ? enumNumberIndexInfo : undefined;
                 setStructuredTypeMembers(type, members, ts.emptyArray, ts.emptyArray, stringIndexInfo, numberIndexInfo);
                 // We resolve the members before computing the signatures because a signature may use
                 // typeof with a qualified name expression that circularly references the type we are
@@ -37636,7 +38368,7 @@ var ts;
             var members = ts.createSymbolTable();
             for (var _i = 0, _a = getPropertiesOfType(type.source); _i < _a.length; _i++) {
                 var prop = _a[_i];
-                var checkFlags = 4096 /* ReverseMapped */ | (readonlyMask && isReadonlySymbol(prop) ? 8 /* Readonly */ : 0);
+                var checkFlags = 8192 /* ReverseMapped */ | (readonlyMask && isReadonlySymbol(prop) ? 8 /* Readonly */ : 0);
                 var inferredProp = createSymbol(4 /* Property */ | prop.flags & optionalMask, prop.escapedName, checkFlags);
                 inferredProp.declarations = prop.declarations;
                 inferredProp.nameType = prop.nameType;
@@ -37658,7 +38390,15 @@ var ts;
                 return getIndexType(getApparentType(type.type));
             }
             if (type.flags & 16777216 /* Conditional */) {
-                return getLowerBoundOfConditionalType(type);
+                if (type.root.isDistributive) {
+                    var checkType = type.checkType;
+                    var constraint = getLowerBoundOfKeyType(checkType);
+                    if (constraint !== checkType) {
+                        var mapper = makeUnaryTypeMapper(type.root.checkType, constraint);
+                        return getConditionalTypeInstantiation(type, combineTypeMappers(mapper, type.mapper));
+                    }
+                }
+                return type;
             }
             if (type.flags & 1048576 /* Union */) {
                 return getUnionType(ts.sameMap(type.types, getLowerBoundOfKeyType));
@@ -37668,16 +38408,6 @@ var ts;
             }
             return neverType;
         }
-        function getLowerBoundOfConditionalType(type) {
-            if (type.root.isDistributive) {
-                var constraint = getLowerBoundOfKeyType(type.checkType);
-                if (constraint !== type.checkType) {
-                    var mapper = makeUnaryTypeMapper(type.root.checkType, constraint);
-                    return getConditionalTypeInstantiation(type, combineTypeMappers(mapper, type.mapper));
-                }
-            }
-            return type;
-        }
         /** Resolve the members of a mapped type { [P in K]: T } */
         function resolveMappedTypeMembers(type) {
             var members = ts.createSymbolTable();
@@ -37742,8 +38472,8 @@ var ts;
                 else if (t.flags & (1 /* Any */ | 4 /* String */)) {
                     stringIndexInfo = createIndexInfo(propType, !!(templateModifiers & 1 /* IncludeReadonly */));
                 }
-                else if (t.flags & 8 /* Number */) {
-                    numberIndexInfo = createIndexInfo(propType, !!(templateModifiers & 1 /* IncludeReadonly */));
+                else if (t.flags & (8 /* Number */ | 32 /* Enum */)) {
+                    numberIndexInfo = createIndexInfo(numberIndexInfo ? getUnionType([numberIndexInfo.type, propType]) : propType, !!(templateModifiers & 1 /* IncludeReadonly */));
                 }
             }
         }
@@ -37766,8 +38496,8 @@ var ts;
         }
         function isMappedTypeWithKeyofConstraintDeclaration(type) {
             var constraintDeclaration = getConstraintDeclarationForMappedType(type); // TODO: GH#18217
-            return constraintDeclaration.kind === 179 /* TypeOperator */ &&
-                constraintDeclaration.operator === 129 /* KeyOfKeyword */;
+            return constraintDeclaration.kind === 180 /* TypeOperator */ &&
+                constraintDeclaration.operator === 130 /* KeyOfKeyword */;
         }
         function getModifiersTypeFromMappedType(type) {
             if (!type.modifiersType) {
@@ -37784,7 +38514,7 @@ var ts;
                     var declaredType = getTypeFromMappedTypeNode(type.declaration);
                     var constraint = getConstraintTypeFromMappedType(declaredType);
                     var extendedConstraint = constraint && constraint.flags & 262144 /* TypeParameter */ ? getConstraintOfTypeParameter(constraint) : constraint;
-                    type.modifiersType = extendedConstraint && extendedConstraint.flags & 4194304 /* Index */ ? instantiateType(extendedConstraint.type, type.mapper || identityMapper) : emptyObjectType;
+                    type.modifiersType = extendedConstraint && extendedConstraint.flags & 4194304 /* Index */ ? instantiateType(extendedConstraint.type, type.mapper || identityMapper) : unknownType;
                 }
             }
             return type.modifiersType;
@@ -37880,6 +38610,26 @@ var ts;
             }
             return type.resolvedProperties;
         }
+        function getPossiblePropertiesOfUnionType(type) {
+            if (type.possiblePropertyCache) {
+                return type.possiblePropertyCache.size ? ts.arrayFrom(type.possiblePropertyCache.values()) : ts.emptyArray;
+            }
+            type.possiblePropertyCache = ts.createSymbolTable();
+            for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
+                var t = _a[_i];
+                for (var _b = 0, _c = getPropertiesOfType(t); _b < _c.length; _b++) {
+                    var p = _c[_b];
+                    if (!type.possiblePropertyCache.has(p.escapedName)) {
+                        var prop = getUnionOrIntersectionProperty(type, p.escapedName);
+                        if (prop) {
+                            type.possiblePropertyCache.set(p.escapedName, prop);
+                        }
+                    }
+                }
+            }
+            // We can't simply use the normal property cache here, since that will contain cached apparent type members :(
+            return type.possiblePropertyCache.size ? ts.arrayFrom(type.possiblePropertyCache.values()) : ts.emptyArray;
+        }
         function getPropertiesOfType(type) {
             type = getApparentType(type);
             return type.flags & 3145728 /* UnionOrIntersection */ ?
@@ -37925,24 +38675,25 @@ var ts;
             return hasNonCircularBaseConstraint(typeParameter) ? getConstraintFromTypeParameter(typeParameter) : undefined;
         }
         function getConstraintOfIndexedAccess(type) {
-            var objectType = getConstraintOfType(type.objectType) || type.objectType;
-            if (objectType !== type.objectType) {
-                var constraint = getIndexedAccessType(objectType, type.indexType, /*accessNode*/ undefined, errorType);
-                if (constraint && constraint !== errorType) {
-                    return constraint;
+            return hasNonCircularBaseConstraint(type) ? getConstraintFromIndexedAccess(type) : undefined;
+        }
+        function getSimplifiedTypeOrConstraint(type) {
+            var simplified = getSimplifiedType(type, /*writing*/ false);
+            return simplified !== type ? simplified : getConstraintOfType(type);
+        }
+        function getConstraintFromIndexedAccess(type) {
+            var indexConstraint = getSimplifiedTypeOrConstraint(type.indexType);
+            if (indexConstraint && indexConstraint !== type.indexType) {
+                var indexedAccess = getIndexedAccessTypeOrUndefined(type.objectType, indexConstraint);
+                if (indexedAccess) {
+                    return indexedAccess;
                 }
             }
-            var baseConstraint = getBaseConstraintOfType(type);
-            return baseConstraint && baseConstraint !== type ? baseConstraint : undefined;
-        }
-        function getDefaultConstraintOfTrueBranchOfConditionalType(root, combinedMapper, mapper) {
-            var rootTrueType = root.trueType;
-            var rootTrueConstraint = !(rootTrueType.flags & 33554432 /* Substitution */)
-                ? rootTrueType
-                : instantiateType((rootTrueType.substitute), combinedMapper || mapper).flags & 3 /* AnyOrUnknown */
-                    ? rootTrueType.typeVariable
-                    : getIntersectionType([rootTrueType.substitute, rootTrueType.typeVariable]);
-            return instantiateType(rootTrueConstraint, combinedMapper || mapper);
+            var objectConstraint = getSimplifiedTypeOrConstraint(type.objectType);
+            if (objectConstraint && objectConstraint !== type.objectType) {
+                return getIndexedAccessTypeOrUndefined(objectConstraint, type.indexType);
+            }
+            return undefined;
         }
         function getDefaultConstraintOfConditionalType(type) {
             if (!type.resolvedDefaultConstraint) {
@@ -37950,7 +38701,7 @@ var ts;
                 // a conditional type with a single branch of type `any` would be assignable to anything, since it's constraint would simplify to
                 // just `any`. This result is _usually_ unwanted - so instead here we elide an `any` branch from the constraint type,
                 // in effect treating `any` like `never` rather than `unknown` in this location.
-                var trueConstraint = getDefaultConstraintOfTrueBranchOfConditionalType(type.root, type.combinedMapper, type.mapper);
+                var trueConstraint = getInferredTrueTypeFromConditionalType(type);
                 var falseConstraint = getFalseTypeFromConditionalType(type);
                 type.resolvedDefaultConstraint = isTypeAny(trueConstraint) ? falseConstraint : isTypeAny(falseConstraint) ? trueConstraint : getUnionType([trueConstraint, falseConstraint]);
             }
@@ -37969,7 +38720,7 @@ var ts;
             // a union - once negated types exist and are applied to the conditional false branch, this "constraint"
             // likely doesn't need to exist.
             if (type.root.isDistributive && type.restrictiveInstantiation !== type) {
-                var simplified = getSimplifiedType(type.checkType);
+                var simplified = getSimplifiedType(type.checkType, /*writing*/ false);
                 var constraint = simplified === type.checkType ? getConstraintOfType(simplified) : simplified;
                 if (constraint && constraint !== type.checkType) {
                     var mapper = makeUnaryTypeMapper(type.root.checkType, constraint);
@@ -37981,9 +38732,12 @@ var ts;
             }
             return undefined;
         }
-        function getConstraintOfConditionalType(type) {
+        function getConstraintFromConditionalType(type) {
             return getConstraintOfDistributiveConditionalType(type) || getDefaultConstraintOfConditionalType(type);
         }
+        function getConstraintOfConditionalType(type) {
+            return hasNonCircularBaseConstraint(type) ? getConstraintFromConditionalType(type) : undefined;
+        }
         function getUnionConstraintOfIntersection(type, targetIsUnion) {
             var constraints;
             var hasDisjointDomainType = false;
@@ -37997,11 +38751,6 @@ var ts;
                         constraint = getConstraintOfType(constraint);
                     }
                     if (constraint) {
-                        // A constraint that isn't a union type implies that the final type would be a non-union
-                        // type as well. Since non-union constraints are of no interest, we can exit here.
-                        if (!(constraint.flags & 1048576 /* Union */)) {
-                            return undefined;
-                        }
                         constraints = ts.append(constraints, constraint);
                     }
                 }
@@ -38010,10 +38759,10 @@ var ts;
                 }
             }
             // If the target is a union type or if we are intersecting with types belonging to one of the
-            // disjoint domans, we may end up producing a constraint that hasn't been examined before.
+            // disjoint domains, we may end up producing a constraint that hasn't been examined before.
             if (constraints && (targetIsUnion || hasDisjointDomainType)) {
                 if (hasDisjointDomainType) {
-                    // We add any types belong to one of the disjoint domans because they might cause the final
+                    // We add any types belong to one of the disjoint domains because they might cause the final
                     // intersection operation to reduce the union constraints.
                     for (var _b = 0, _c = type.types; _b < _c.length; _b++) {
                         var t = _c[_b];
@@ -38057,9 +38806,9 @@ var ts;
                     if (!pushTypeResolution(t, 4 /* ImmediateBaseConstraint */)) {
                         return circularConstraintType;
                     }
-                    if (constraintDepth === 50) {
+                    if (constraintDepth >= 50) {
                         // We have reached 50 recursive invocations of getImmediateBaseConstraint and there is a
-                        // very high likelyhood we're dealing with an infinite generic type that perpetually generates
+                        // very high likelihood we're dealing with an infinite generic type that perpetually generates
                         // new type identities as we descend into it. We stop the recursion here and mark this type
                         // and the outer types as having circular constraints.
                         error(currentNode, ts.Diagnostics.Type_instantiation_is_excessively_deep_and_possibly_infinite);
@@ -38067,7 +38816,7 @@ var ts;
                         return t.immediateBaseConstraint = noConstraintType;
                     }
                     constraintDepth++;
-                    var result = computeBaseConstraint(getSimplifiedType(t));
+                    var result = computeBaseConstraint(getSimplifiedType(t, /*writing*/ false));
                     constraintDepth--;
                     if (!popTypeResolution()) {
                         if (t.flags & 262144 /* TypeParameter */) {
@@ -38075,7 +38824,7 @@ var ts;
                             if (errorNode) {
                                 var diagnostic = error(errorNode, ts.Diagnostics.Type_parameter_0_has_a_circular_constraint, typeToString(t));
                                 if (currentNode && !ts.isNodeDescendantOf(errorNode, currentNode) && !ts.isNodeDescendantOf(currentNode, errorNode)) {
-                                    addRelatedInfo(diagnostic, ts.createDiagnosticForNode(currentNode, ts.Diagnostics.Circularity_originates_in_type_at_this_location));
+                                    ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(currentNode, ts.Diagnostics.Circularity_originates_in_type_at_this_location));
                                 }
                             }
                         }
@@ -38119,12 +38868,15 @@ var ts;
                 if (t.flags & 8388608 /* IndexedAccess */) {
                     var baseObjectType = getBaseConstraint(t.objectType);
                     var baseIndexType = getBaseConstraint(t.indexType);
-                    var baseIndexedAccess = baseObjectType && baseIndexType ? getIndexedAccessType(baseObjectType, baseIndexType, /*accessNode*/ undefined, errorType) : undefined;
-                    return baseIndexedAccess && baseIndexedAccess !== errorType ? getBaseConstraint(baseIndexedAccess) : undefined;
+                    var baseIndexedAccess = baseObjectType && baseIndexType && getIndexedAccessTypeOrUndefined(baseObjectType, baseIndexType);
+                    return baseIndexedAccess && getBaseConstraint(baseIndexedAccess);
                 }
                 if (t.flags & 16777216 /* Conditional */) {
-                    var constraint = getConstraintOfConditionalType(t);
-                    return constraint && getBaseConstraint(constraint);
+                    var constraint = getConstraintFromConditionalType(t);
+                    constraintDepth++; // Penalize repeating conditional types (this captures the recursion within getConstraintFromConditionalType and carries it forward)
+                    var result = constraint && getBaseConstraint(constraint);
+                    constraintDepth--;
+                    return result;
                 }
                 if (t.flags & 33554432 /* Substitution */) {
                     return getBaseConstraint(t.substitute);
@@ -38198,25 +38950,26 @@ var ts;
          * type itself. Note that the apparent type of a union type is the union type itself.
          */
         function getApparentType(type) {
-            var t = type.flags & 63176704 /* Instantiable */ ? getBaseConstraintOfType(type) || emptyObjectType : type;
+            var t = type.flags & 63176704 /* Instantiable */ ? getBaseConstraintOfType(type) || unknownType : type;
             return ts.getObjectFlags(t) & 32 /* Mapped */ ? getApparentTypeOfMappedType(t) :
                 t.flags & 2097152 /* Intersection */ ? getApparentTypeOfIntersectionType(t) :
                     t.flags & 132 /* StringLike */ ? globalStringType :
                         t.flags & 296 /* NumberLike */ ? globalNumberType :
-                            t.flags & 2112 /* BigIntLike */ ? getGlobalBigIntType(/*reportErrors*/ languageVersion >= 7 /* ESNext */) :
+                            t.flags & 2112 /* BigIntLike */ ? getGlobalBigIntType(/*reportErrors*/ languageVersion >= 99 /* ESNext */) :
                                 t.flags & 528 /* BooleanLike */ ? globalBooleanType :
                                     t.flags & 12288 /* ESSymbolLike */ ? getGlobalESSymbolType(/*reportErrors*/ languageVersion >= 2 /* ES2015 */) :
                                         t.flags & 67108864 /* NonPrimitive */ ? emptyObjectType :
                                             t.flags & 4194304 /* Index */ ? keyofConstraintType :
-                                                t;
+                                                t.flags & 2 /* Unknown */ && !strictNullChecks ? emptyObjectType :
+                                                    t;
         }
         function createUnionOrIntersectionProperty(containingType, name) {
-            var props;
+            var propSet = ts.createMap();
             var indexTypes;
             var isUnion = containingType.flags & 1048576 /* Union */;
             var excludeModifiers = isUnion ? 24 /* NonPublicAccessibilityModifier */ : 0;
             // Flags we want to propagate to the result if they exist in all source symbols
-            var commonFlags = isUnion ? 0 /* None */ : 16777216 /* Optional */;
+            var optionalFlag = isUnion ? 0 /* None */ : 16777216 /* Optional */;
             var syntheticFlag = 4 /* SyntheticMethod */;
             var checkFlags = 0;
             for (var _i = 0, _a = containingType.types; _i < _a.length; _i++) {
@@ -38226,13 +38979,21 @@ var ts;
                     var prop = getPropertyOfType(type, name);
                     var modifiers = prop ? ts.getDeclarationModifierFlagsFromSymbol(prop) : 0;
                     if (prop && !(modifiers & excludeModifiers)) {
-                        commonFlags &= prop.flags;
-                        props = ts.appendIfUnique(props, prop);
+                        if (isUnion) {
+                            optionalFlag |= (prop.flags & 16777216 /* Optional */);
+                        }
+                        else {
+                            optionalFlag &= prop.flags;
+                        }
+                        var id = "" + getSymbolId(prop);
+                        if (!propSet.has(id)) {
+                            propSet.set(id, prop);
+                        }
                         checkFlags |= (isReadonlySymbol(prop) ? 8 /* Readonly */ : 0) |
-                            (!(modifiers & 24 /* NonPublicAccessibilityModifier */) ? 128 /* ContainsPublic */ : 0) |
-                            (modifiers & 16 /* Protected */ ? 256 /* ContainsProtected */ : 0) |
-                            (modifiers & 8 /* Private */ ? 512 /* ContainsPrivate */ : 0) |
-                            (modifiers & 32 /* Static */ ? 1024 /* ContainsStatic */ : 0);
+                            (!(modifiers & 24 /* NonPublicAccessibilityModifier */) ? 256 /* ContainsPublic */ : 0) |
+                            (modifiers & 16 /* Protected */ ? 512 /* ContainsProtected */ : 0) |
+                            (modifiers & 8 /* Private */ ? 1024 /* ContainsPrivate */ : 0) |
+                            (modifiers & 32 /* Static */ ? 2048 /* ContainsStatic */ : 0);
                         if (!isPrototypeProperty(prop)) {
                             syntheticFlag = 2 /* SyntheticProperty */;
                         }
@@ -38240,19 +39001,24 @@ var ts;
                     else if (isUnion) {
                         var indexInfo = !isLateBoundName(name) && (isNumericLiteralName(name) && getIndexInfoOfType(type, 1 /* Number */) || getIndexInfoOfType(type, 0 /* String */));
                         if (indexInfo) {
-                            checkFlags |= indexInfo.isReadonly ? 8 /* Readonly */ : 0;
+                            checkFlags |= 32 /* WritePartial */ | (indexInfo.isReadonly ? 8 /* Readonly */ : 0);
                             indexTypes = ts.append(indexTypes, isTupleType(type) ? getRestTypeOfTupleType(type) || undefinedType : indexInfo.type);
                         }
+                        else if (isObjectLiteralType(type)) {
+                            checkFlags |= 32 /* WritePartial */;
+                            indexTypes = ts.append(indexTypes, undefinedType);
+                        }
                         else {
-                            checkFlags |= 16 /* Partial */;
+                            checkFlags |= 16 /* ReadPartial */;
                         }
                     }
                 }
             }
-            if (!props) {
+            if (!propSet.size) {
                 return undefined;
             }
-            if (props.length === 1 && !(checkFlags & 16 /* Partial */) && !indexTypes) {
+            var props = ts.arrayFrom(propSet.values());
+            if (props.length === 1 && !(checkFlags & 16 /* ReadPartial */) && !indexTypes) {
                 return props[0];
             }
             var declarations;
@@ -38276,15 +39042,15 @@ var ts;
                     nameType = prop.nameType;
                 }
                 else if (type !== firstType) {
-                    checkFlags |= 32 /* HasNonUniformType */;
+                    checkFlags |= 64 /* HasNonUniformType */;
                 }
                 if (isLiteralType(type)) {
-                    checkFlags |= 64 /* HasLiteralType */;
+                    checkFlags |= 128 /* HasLiteralType */;
                 }
                 propTypes.push(type);
             }
             ts.addRange(propTypes, indexTypes);
-            var result = createSymbol(4 /* Property */ | commonFlags, name, syntheticFlag | checkFlags);
+            var result = createSymbol(4 /* Property */ | optionalFlag, name, syntheticFlag | checkFlags);
             result.containingType = containingType;
             if (!hasNonUniformValueDeclaration && firstValueDeclaration) {
                 result.valueDeclaration = firstValueDeclaration;
@@ -38295,7 +39061,15 @@ var ts;
             }
             result.declarations = declarations;
             result.nameType = nameType;
-            result.type = isUnion ? getUnionType(propTypes) : getIntersectionType(propTypes);
+            if (propTypes.length > 2) {
+                // When `propTypes` has the potential to explode in size when normalized, defer normalization until absolutely needed
+                result.checkFlags |= 65536 /* DeferredType */;
+                result.deferralParent = containingType;
+                result.deferralConstituents = propTypes;
+            }
+            else {
+                result.type = isUnion ? getUnionType(propTypes) : getIntersectionType(propTypes);
+            }
             return result;
         }
         // Return the symbol for a given property in a union or intersection type, or undefined if the property
@@ -38317,7 +39091,7 @@ var ts;
         function getPropertyOfUnionOrIntersectionType(type, name) {
             var property = getUnionOrIntersectionProperty(type, name);
             // We need to filter out partial properties in union types
-            return property && !(ts.getCheckFlags(property) & 16 /* Partial */) ? property : undefined;
+            return property && !(ts.getCheckFlags(property) & 16 /* ReadPartial */) ? property : undefined;
         }
         /**
          * Return the symbol for the property with the given name in the given type. Creates synthetic union properties when
@@ -38395,6 +39169,9 @@ var ts;
                         propTypes.push(getTypeOfSymbol(prop));
                     }
                 }
+                if (kind === 0 /* String */) {
+                    ts.append(propTypes, getIndexTypeOfType(type, 1 /* Number */));
+                }
                 if (propTypes.length) {
                     return getUnionType(propTypes, 2 /* Subtype */);
                 }
@@ -38423,10 +39200,10 @@ var ts;
         function isJSDocOptionalParameter(node) {
             return ts.isInJSFile(node) && (
             // node.type should only be a JSDocOptionalType when node is a parameter of a JSDocFunctionType
-            node.type && node.type.kind === 293 /* JSDocOptionalType */
+            node.type && node.type.kind === 294 /* JSDocOptionalType */
                 || ts.getJSDocParameterTags(node).some(function (_a) {
                     var isBracketed = _a.isBracketed, typeExpression = _a.typeExpression;
-                    return isBracketed || !!typeExpression && typeExpression.type.kind === 293 /* JSDocOptionalType */;
+                    return isBracketed || !!typeExpression && typeExpression.type.kind === 294 /* JSDocOptionalType */;
                 }));
         }
         function tryFindAmbientModule(moduleName, withAugmentations) {
@@ -38460,7 +39237,7 @@ var ts;
                 return false;
             }
             var isBracketed = node.isBracketed, typeExpression = node.typeExpression;
-            return isBracketed || !!typeExpression && typeExpression.type.kind === 293 /* JSDocOptionalType */;
+            return isBracketed || !!typeExpression && typeExpression.type.kind === 294 /* JSDocOptionalType */;
         }
         function createIdentifierTypePredicate(parameterName, parameterIndex, type) {
             return { kind: 1 /* Identifier */, parameterName: parameterName, parameterIndex: parameterIndex, type: type };
@@ -38498,7 +39275,7 @@ var ts;
                 var baseDefaultType = getDefaultTypeArgumentType(isJavaScriptImplicitAny);
                 for (var i = numTypeArguments; i < numTypeParameters; i++) {
                     var defaultType = getDefaultFromTypeParameter(typeParameters[i]);
-                    if (isJavaScriptImplicitAny && defaultType && isTypeIdenticalTo(defaultType, emptyObjectType)) {
+                    if (isJavaScriptImplicitAny && defaultType && (isTypeIdenticalTo(defaultType, unknownType) || isTypeIdenticalTo(defaultType, emptyObjectType))) {
                         defaultType = anyType;
                     }
                     result[i] = defaultType ? instantiateType(defaultType, createTypeMapper(typeParameters, result)) : baseDefaultType;
@@ -38542,7 +39319,7 @@ var ts;
                     else {
                         parameters.push(paramSymbol);
                     }
-                    if (type && type.kind === 182 /* LiteralType */) {
+                    if (type && type.kind === 183 /* LiteralType */) {
                         hasLiteralTypes = true;
                     }
                     // Record a new minimum argument count if this is not an optional parameter
@@ -38556,16 +39333,16 @@ var ts;
                     }
                 }
                 // If only one accessor includes a this-type annotation, the other behaves as if it had the same type annotation
-                if ((declaration.kind === 158 /* GetAccessor */ || declaration.kind === 159 /* SetAccessor */) &&
+                if ((declaration.kind === 159 /* GetAccessor */ || declaration.kind === 160 /* SetAccessor */) &&
                     !hasNonBindableDynamicName(declaration) &&
                     (!hasThisParameter || !thisParameter)) {
-                    var otherKind = declaration.kind === 158 /* GetAccessor */ ? 159 /* SetAccessor */ : 158 /* GetAccessor */;
+                    var otherKind = declaration.kind === 159 /* GetAccessor */ ? 160 /* SetAccessor */ : 159 /* GetAccessor */;
                     var other = ts.getDeclarationOfKind(getSymbolOfNode(declaration), otherKind);
                     if (other) {
                         thisParameter = getAnnotatedAccessorThisParameter(other);
                     }
                 }
-                var classType = declaration.kind === 157 /* Constructor */ ?
+                var classType = declaration.kind === 158 /* Constructor */ ?
                     getDeclaredTypeOfClassOrInterface(getMergedSymbol(declaration.parent.symbol))
                     : undefined;
                 var typeParameters = classType ? classType.localTypeParameters : getTypeParametersFromDeclaration(declaration);
@@ -38590,7 +39367,7 @@ var ts;
             var lastParamVariadicType = ts.firstDefined(lastParamTags, function (p) {
                 return p.typeExpression && ts.isJSDocVariadicType(p.typeExpression.type) ? p.typeExpression.type : undefined;
             });
-            var syntheticArgsSymbol = createSymbol(3 /* Variable */, "args", 16384 /* RestParameter */);
+            var syntheticArgsSymbol = createSymbol(3 /* Variable */, "args", 32768 /* RestParameter */);
             syntheticArgsSymbol.type = lastParamVariadicType ? createArrayType(getTypeFromTypeNode(lastParamVariadicType.type)) : anyArrayType;
             if (lastParamVariadicType) {
                 // Replace the last parameter with a rest parameter.
@@ -38623,13 +39400,13 @@ var ts;
                 if (!node)
                     return false;
                 switch (node.kind) {
-                    case 72 /* Identifier */:
+                    case 73 /* Identifier */:
                         return node.escapedText === "arguments" && ts.isExpressionNode(node);
-                    case 154 /* PropertyDeclaration */:
-                    case 156 /* MethodDeclaration */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
-                        return node.name.kind === 149 /* ComputedPropertyName */
+                    case 155 /* PropertyDeclaration */:
+                    case 157 /* MethodDeclaration */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
+                        return node.name.kind === 150 /* ComputedPropertyName */
                             && traverse(node.name);
                     default:
                         return !ts.nodeStartsNewLexicalEnvironment(node) && !ts.isPartOfTypeNode(node) && !!ts.forEachChild(node, traverse);
@@ -38694,32 +39471,23 @@ var ts;
                         }
                     }
                     signature.resolvedTypePredicate = type && ts.isTypePredicateNode(type) ?
-                        createTypePredicateFromTypePredicateNode(type, signature.declaration) :
+                        createTypePredicateFromTypePredicateNode(type, signature) :
                         jsdocPredicate || noTypePredicate;
                 }
                 ts.Debug.assert(!!signature.resolvedTypePredicate);
             }
             return signature.resolvedTypePredicate === noTypePredicate ? undefined : signature.resolvedTypePredicate;
         }
-        function createTypePredicateFromTypePredicateNode(node, func) {
+        function createTypePredicateFromTypePredicateNode(node, signature) {
             var parameterName = node.parameterName;
             var type = getTypeFromTypeNode(node.type);
-            if (parameterName.kind === 72 /* Identifier */) {
-                return createIdentifierTypePredicate(parameterName.escapedText, getTypePredicateParameterIndex(func.parameters, parameterName), type);
+            if (parameterName.kind === 73 /* Identifier */) {
+                return createIdentifierTypePredicate(parameterName.escapedText, ts.findIndex(signature.parameters, function (p) { return p.escapedName === parameterName.escapedText; }), type);
             }
             else {
                 return createThisTypePredicate(type);
             }
         }
-        function getTypePredicateParameterIndex(parameterList, parameter) {
-            for (var i = 0; i < parameterList.length; i++) {
-                var param = parameterList[i];
-                if (param.name.kind === 72 /* Identifier */ && param.name.escapedText === parameter.escapedText) {
-                    return i;
-                }
-            }
-            return -1;
-        }
         function getReturnTypeOfSignature(signature) {
             if (!signature.resolvedReturnType) {
                 if (!pushTypeResolution(signature, 3 /* ResolvedReturnType */)) {
@@ -38754,7 +39522,7 @@ var ts;
             return signature.resolvedReturnType;
         }
         function getReturnTypeFromAnnotation(declaration) {
-            if (declaration.kind === 157 /* Constructor */) {
+            if (declaration.kind === 158 /* Constructor */) {
                 return getDeclaredTypeOfClassOrInterface(getMergedSymbol(declaration.parent.symbol));
             }
             if (ts.isJSDocConstructSignature(declaration)) {
@@ -38764,12 +39532,12 @@ var ts;
             if (typeNode) {
                 return getTypeFromTypeNode(typeNode);
             }
-            if (declaration.kind === 158 /* GetAccessor */ && !hasNonBindableDynamicName(declaration)) {
+            if (declaration.kind === 159 /* GetAccessor */ && !hasNonBindableDynamicName(declaration)) {
                 var jsDocType = ts.isInJSFile(declaration) && getTypeForDeclarationFromJSDocComment(declaration);
                 if (jsDocType) {
                     return jsDocType;
                 }
-                var setter = ts.getDeclarationOfKind(getSymbolOfNode(declaration), 159 /* SetAccessor */);
+                var setter = ts.getDeclarationOfKind(getSymbolOfNode(declaration), 160 /* SetAccessor */);
                 var setterType = getAnnotatedAccessorType(setter);
                 if (setterType) {
                     return setterType;
@@ -38794,12 +39562,10 @@ var ts;
         function getSignatureInstantiation(signature, typeArguments, isJavascript, inferredTypeParameters) {
             var instantiatedSignature = getSignatureInstantiationWithoutFillingInTypeArguments(signature, fillMissingTypeArguments(typeArguments, signature.typeParameters, getMinTypeArgumentCount(signature.typeParameters), isJavascript));
             if (inferredTypeParameters) {
-                var returnSignature = getSingleCallSignature(getReturnTypeOfSignature(instantiatedSignature));
+                var returnSignature = getSingleCallOrConstructSignature(getReturnTypeOfSignature(instantiatedSignature));
                 if (returnSignature) {
                     var newReturnSignature = cloneSignature(returnSignature);
                     newReturnSignature.typeParameters = inferredTypeParameters;
-                    newReturnSignature.target = returnSignature.target;
-                    newReturnSignature.mapper = returnSignature.mapper;
                     var newInstantiatedSignature = cloneSignature(instantiatedSignature);
                     newInstantiatedSignature.resolvedReturnType = getOrCreateTypeFromSignature(newReturnSignature);
                     return newInstantiatedSignature;
@@ -38849,7 +39615,7 @@ var ts;
             var typeParameters = signature.typeParameters;
             if (typeParameters) {
                 var typeEraser_1 = createTypeEraser(typeParameters);
-                var baseConstraints = ts.map(typeParameters, function (tp) { return instantiateType(getBaseConstraintOfType(tp), typeEraser_1) || emptyObjectType; });
+                var baseConstraints = ts.map(typeParameters, function (tp) { return instantiateType(getBaseConstraintOfType(tp), typeEraser_1) || unknownType; });
                 return instantiateSignature(signature, createTypeMapper(typeParameters, baseConstraints), /*eraseTypeParameters*/ true);
             }
             return signature;
@@ -38860,7 +39626,8 @@ var ts;
             // object type literal or interface (using the new keyword). Each way of declaring a constructor
             // will result in a different declaration kind.
             if (!signature.isolatedSignatureType) {
-                var isConstructor = signature.declaration.kind === 157 /* Constructor */ || signature.declaration.kind === 161 /* ConstructSignature */; // TODO: GH#18217
+                var kind = signature.declaration ? signature.declaration.kind : 0 /* Unknown */;
+                var isConstructor = kind === 158 /* Constructor */ || kind === 162 /* ConstructSignature */ || kind === 167 /* ConstructorType */;
                 var type = createObjectType(16 /* Anonymous */);
                 type.members = emptySymbols;
                 type.properties = ts.emptyArray;
@@ -38874,7 +39641,7 @@ var ts;
             return symbol.members.get("__index" /* Index */);
         }
         function getIndexDeclarationOfSymbol(symbol, kind) {
-            var syntaxKind = kind === 1 /* Number */ ? 135 /* NumberKeyword */ : 138 /* StringKeyword */;
+            var syntaxKind = kind === 1 /* Number */ ? 136 /* NumberKeyword */ : 139 /* StringKeyword */;
             var indexSymbol = getIndexSymbol(symbol);
             if (indexSymbol) {
                 for (var _i = 0, _a = indexSymbol.declarations; _i < _a.length; _i++) {
@@ -38901,7 +39668,7 @@ var ts;
             return undefined;
         }
         function getConstraintDeclaration(type) {
-            var decl = type.symbol && ts.getDeclarationOfKind(type.symbol, 150 /* TypeParameter */);
+            var decl = type.symbol && ts.getDeclarationOfKind(type.symbol, 151 /* TypeParameter */);
             return decl && ts.getEffectiveConstraintOfTypeParameter(decl);
         }
         function getInferredTypeParameterConstraint(typeParameter) {
@@ -38909,13 +39676,13 @@ var ts;
             if (typeParameter.symbol) {
                 for (var _i = 0, _a = typeParameter.symbol.declarations; _i < _a.length; _i++) {
                     var declaration = _a[_i];
-                    if (declaration.parent.kind === 176 /* InferType */) {
+                    if (declaration.parent.kind === 177 /* InferType */) {
                         // When an 'infer T' declaration is immediately contained in a type reference node
                         // (such as 'Foo<infer T>'), T's constraint is inferred from the constraint of the
                         // corresponding type parameter in 'Foo'. When multiple 'infer T' declarations are
                         // present, we form an intersection of the inferred constraint types.
                         var grandParent = declaration.parent.parent;
-                        if (grandParent.kind === 164 /* TypeReference */) {
+                        if (grandParent.kind === 165 /* TypeReference */) {
                             var typeReference = grandParent;
                             var typeParameters = getTypeParametersForTypeReference(typeReference);
                             if (typeParameters) {
@@ -38940,7 +39707,7 @@ var ts;
                         }
                         // When an 'infer T' declaration is immediately contained in a rest parameter
                         // declaration, we infer an 'unknown[]' constraint.
-                        else if (grandParent.kind === 151 /* Parameter */ && grandParent.dotDotDotToken) {
+                        else if (grandParent.kind === 152 /* Parameter */ && grandParent.dotDotDotToken) {
                             inferences = ts.append(inferences, createArrayType(unknownType));
                         }
                     }
@@ -38964,7 +39731,7 @@ var ts;
             return typeParameter.constraint === noConstraintType ? undefined : typeParameter.constraint;
         }
         function getParentSymbolOfTypeParameter(typeParameter) {
-            var tp = ts.getDeclarationOfKind(typeParameter.symbol, 150 /* TypeParameter */);
+            var tp = ts.getDeclarationOfKind(typeParameter.symbol, 151 /* TypeParameter */);
             var host = ts.isJSDocTemplateTag(tp.parent) ? ts.getHostSignatureFromJSDoc(tp.parent) : tp.parent;
             return host && getSymbolOfNode(host);
         }
@@ -39003,7 +39770,7 @@ var ts;
                     result |= ts.getObjectFlags(type);
                 }
             }
-            return result & 917504 /* PropagatingFlags */;
+            return result & 1835008 /* PropagatingFlags */;
         }
         function createTypeReference(target, typeArguments) {
             var id = getTypeListId(typeArguments);
@@ -39097,9 +39864,9 @@ var ts;
         }
         function getTypeReferenceName(node) {
             switch (node.kind) {
-                case 164 /* TypeReference */:
+                case 165 /* TypeReference */:
                     return node.typeName;
-                case 211 /* ExpressionWithTypeArguments */:
+                case 212 /* ExpressionWithTypeArguments */:
                     // We only support expressions that are simple qualified names. For other
                     // expressions this produces undefined.
                     var expr = node.expression;
@@ -39198,13 +39965,22 @@ var ts;
             }
         }
         function getSubstitutionType(typeVariable, substitute) {
+            if (substitute.flags & 3 /* AnyOrUnknown */ || substitute === typeVariable) {
+                return typeVariable;
+            }
+            var id = getTypeId(typeVariable) + ">" + getTypeId(substitute);
+            var cached = substitutionTypes.get(id);
+            if (cached) {
+                return cached;
+            }
             var result = createType(33554432 /* Substitution */);
             result.typeVariable = typeVariable;
             result.substitute = substitute;
+            substitutionTypes.set(id, result);
             return result;
         }
         function isUnaryTupleTypeNode(node) {
-            return node.kind === 170 /* TupleType */ && node.elementTypes.length === 1;
+            return node.kind === 171 /* TupleType */ && node.elementTypes.length === 1;
         }
         function getImpliedConstraint(typeVariable, checkNode, extendsNode) {
             return isUnaryTupleTypeNode(checkNode) && isUnaryTupleTypeNode(extendsNode) ? getImpliedConstraint(typeVariable, checkNode.elementTypes[0], extendsNode.elementTypes[0]) :
@@ -39213,9 +39989,9 @@ var ts;
         }
         function getConstrainedTypeVariable(typeVariable, node) {
             var constraints;
-            while (node && !ts.isStatement(node) && node.kind !== 296 /* JSDocComment */) {
+            while (node && !ts.isStatement(node) && node.kind !== 297 /* JSDocComment */) {
                 var parent = node.parent;
-                if (parent.kind === 175 /* ConditionalType */ && node === parent.trueType) {
+                if (parent.kind === 176 /* ConditionalType */ && node === parent.trueType) {
                     var constraint = getImpliedConstraint(typeVariable, parent.checkType, parent.extendsType);
                     if (constraint) {
                         constraints = ts.append(constraints, constraint);
@@ -39226,7 +40002,7 @@ var ts;
             return constraints ? getSubstitutionType(typeVariable, getIntersectionType(ts.append(constraints, typeVariable))) : typeVariable;
         }
         function isJSDocTypeReference(node) {
-            return !!(node.flags & 2097152 /* JSDoc */) && (node.kind === 164 /* TypeReference */ || node.kind === 183 /* ImportType */);
+            return !!(node.flags & 2097152 /* JSDoc */) && (node.kind === 165 /* TypeReference */ || node.kind === 184 /* ImportType */);
         }
         function checkNoTypeArguments(node, symbol) {
             if (node.typeArguments) {
@@ -39327,9 +40103,9 @@ var ts;
                 for (var _i = 0, declarations_3 = declarations; _i < declarations_3.length; _i++) {
                     var declaration = declarations_3[_i];
                     switch (declaration.kind) {
-                        case 240 /* ClassDeclaration */:
-                        case 241 /* InterfaceDeclaration */:
-                        case 243 /* EnumDeclaration */:
+                        case 241 /* ClassDeclaration */:
+                        case 242 /* InterfaceDeclaration */:
+                        case 244 /* EnumDeclaration */:
                             return declaration;
                     }
                 }
@@ -39393,20 +40169,32 @@ var ts;
             return deferredGlobalAsyncIterableType || (deferredGlobalAsyncIterableType = getGlobalType("AsyncIterable", /*arity*/ 1, reportErrors)) || emptyGenericType;
         }
         function getGlobalAsyncIteratorType(reportErrors) {
-            return deferredGlobalAsyncIteratorType || (deferredGlobalAsyncIteratorType = getGlobalType("AsyncIterator", /*arity*/ 1, reportErrors)) || emptyGenericType;
+            return deferredGlobalAsyncIteratorType || (deferredGlobalAsyncIteratorType = getGlobalType("AsyncIterator", /*arity*/ 3, reportErrors)) || emptyGenericType;
         }
         function getGlobalAsyncIterableIteratorType(reportErrors) {
             return deferredGlobalAsyncIterableIteratorType || (deferredGlobalAsyncIterableIteratorType = getGlobalType("AsyncIterableIterator", /*arity*/ 1, reportErrors)) || emptyGenericType;
         }
+        function getGlobalAsyncGeneratorType(reportErrors) {
+            return deferredGlobalAsyncGeneratorType || (deferredGlobalAsyncGeneratorType = getGlobalType("AsyncGenerator", /*arity*/ 3, reportErrors)) || emptyGenericType;
+        }
         function getGlobalIterableType(reportErrors) {
             return deferredGlobalIterableType || (deferredGlobalIterableType = getGlobalType("Iterable", /*arity*/ 1, reportErrors)) || emptyGenericType;
         }
         function getGlobalIteratorType(reportErrors) {
-            return deferredGlobalIteratorType || (deferredGlobalIteratorType = getGlobalType("Iterator", /*arity*/ 1, reportErrors)) || emptyGenericType;
+            return deferredGlobalIteratorType || (deferredGlobalIteratorType = getGlobalType("Iterator", /*arity*/ 3, reportErrors)) || emptyGenericType;
         }
         function getGlobalIterableIteratorType(reportErrors) {
             return deferredGlobalIterableIteratorType || (deferredGlobalIterableIteratorType = getGlobalType("IterableIterator", /*arity*/ 1, reportErrors)) || emptyGenericType;
         }
+        function getGlobalGeneratorType(reportErrors) {
+            return deferredGlobalGeneratorType || (deferredGlobalGeneratorType = getGlobalType("Generator", /*arity*/ 3, reportErrors)) || emptyGenericType;
+        }
+        function getGlobalIteratorYieldResultType(reportErrors) {
+            return deferredGlobalIteratorYieldResultType || (deferredGlobalIteratorYieldResultType = getGlobalType("IteratorYieldResult", /*arity*/ 1, reportErrors)) || emptyGenericType;
+        }
+        function getGlobalIteratorReturnResultType(reportErrors) {
+            return deferredGlobalIteratorReturnResultType || (deferredGlobalIteratorReturnResultType = getGlobalType("IteratorReturnResult", /*arity*/ 1, reportErrors)) || emptyGenericType;
+        }
         function getGlobalTypeOrUndefined(name, arity) {
             if (arity === void 0) { arity = 0; }
             var symbol = getGlobalSymbol(name, 67897832 /* Type */, /*diagnostic*/ undefined);
@@ -39415,11 +40203,8 @@ var ts;
         function getGlobalExtractSymbol() {
             return deferredGlobalExtractSymbol || (deferredGlobalExtractSymbol = getGlobalSymbol("Extract", 524288 /* TypeAlias */, ts.Diagnostics.Cannot_find_global_type_0)); // TODO: GH#18217
         }
-        function getGlobalExcludeSymbol() {
-            return deferredGlobalExcludeSymbol || (deferredGlobalExcludeSymbol = getGlobalSymbol("Exclude", 524288 /* TypeAlias */, ts.Diagnostics.Cannot_find_global_type_0)); // TODO: GH#18217
-        }
-        function getGlobalPickSymbol() {
-            return deferredGlobalPickSymbol || (deferredGlobalPickSymbol = getGlobalSymbol("Pick", 524288 /* TypeAlias */, ts.Diagnostics.Cannot_find_global_type_0)); // TODO: GH#18217
+        function getGlobalOmitSymbol() {
+            return deferredGlobalOmitSymbol || (deferredGlobalOmitSymbol = getGlobalSymbol("Omit", 524288 /* TypeAlias */, ts.Diagnostics.Cannot_find_global_type_0)); // TODO: GH#18217
         }
         function getGlobalBigIntType(reportErrors) {
             return deferredGlobalBigIntType || (deferredGlobalBigIntType = getGlobalType("BigInt", /*arity*/ 0, reportErrors)) || emptyObjectType;
@@ -39433,18 +40218,9 @@ var ts;
         function createTypedPropertyDescriptorType(propertyType) {
             return createTypeFromGenericGlobalType(getGlobalTypedPropertyDescriptorType(), [propertyType]);
         }
-        function createAsyncIterableType(iteratedType) {
-            return createTypeFromGenericGlobalType(getGlobalAsyncIterableType(/*reportErrors*/ true), [iteratedType]);
-        }
-        function createAsyncIterableIteratorType(iteratedType) {
-            return createTypeFromGenericGlobalType(getGlobalAsyncIterableIteratorType(/*reportErrors*/ true), [iteratedType]);
-        }
         function createIterableType(iteratedType) {
             return createTypeFromGenericGlobalType(getGlobalIterableType(/*reportErrors*/ true), [iteratedType]);
         }
-        function createIterableIteratorType(iteratedType) {
-            return createTypeFromGenericGlobalType(getGlobalIterableIteratorType(/*reportErrors*/ true), [iteratedType]);
-        }
         function createArrayType(elementType, readonly) {
             return createTypeFromGenericGlobalType(readonly ? globalReadonlyArrayType : globalArrayType, [elementType]);
         }
@@ -39456,7 +40232,7 @@ var ts;
             return links.resolvedType;
         }
         function isReadonlyTypeOperator(node) {
-            return ts.isTypeOperatorNode(node) && node.operator === 133 /* ReadonlyKeyword */;
+            return ts.isTypeOperatorNode(node) && node.operator === 134 /* ReadonlyKeyword */;
         }
         // We represent tuple types as type references to synthesized generic interface types created by
         // this function. The types are of the form:
@@ -39531,8 +40307,8 @@ var ts;
             var links = getNodeLinks(node);
             if (!links.resolvedType) {
                 var lastElement = ts.lastOrUndefined(node.elementTypes);
-                var restElement_1 = lastElement && lastElement.kind === 172 /* RestType */ ? lastElement : undefined;
-                var minLength = ts.findLastIndex(node.elementTypes, function (n) { return n.kind !== 171 /* OptionalType */ && n !== restElement_1; }) + 1;
+                var restElement_1 = lastElement && lastElement.kind === 173 /* RestType */ ? lastElement : undefined;
+                var minLength = ts.findLastIndex(node.elementTypes, function (n) { return n.kind !== 172 /* OptionalType */ && n !== restElement_1; }) + 1;
                 var elementTypes = ts.map(node.elementTypes, function (n) {
                     var type = getTypeFromTypeNode(n);
                     return n === restElement_1 && getIndexTypeOfType(type, 1 /* Number */) || type;
@@ -39567,51 +40343,20 @@ var ts;
             }
             return false;
         }
-        // Return true if the given intersection type contains
-        // more than one unit type or,
-        // an object type and a nullable type (null or undefined), or
-        // a string-like type and a type known to be non-string-like, or
-        // a number-like type and a type known to be non-number-like, or
-        // a symbol-like type and a type known to be non-symbol-like, or
-        // a void-like type and a type known to be non-void-like, or
-        // a non-primitive type and a type known to be primitive.
-        function isEmptyIntersectionType(type) {
-            var combined = 0;
-            for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
-                var t = _a[_i];
-                if (t.flags & 109440 /* Unit */ && combined & 109440 /* Unit */) {
-                    return true;
-                }
-                combined |= t.flags;
-                if (combined & 98304 /* Nullable */ && combined & (524288 /* Object */ | 67108864 /* NonPrimitive */) ||
-                    combined & 67108864 /* NonPrimitive */ && combined & (67238908 /* DisjointDomains */ & ~67108864 /* NonPrimitive */) ||
-                    combined & 132 /* StringLike */ && combined & (67238908 /* DisjointDomains */ & ~132 /* StringLike */) ||
-                    combined & 296 /* NumberLike */ && combined & (67238908 /* DisjointDomains */ & ~296 /* NumberLike */) ||
-                    combined & 2112 /* BigIntLike */ && combined & (67238908 /* DisjointDomains */ & ~2112 /* BigIntLike */) ||
-                    combined & 12288 /* ESSymbolLike */ && combined & (67238908 /* DisjointDomains */ & ~12288 /* ESSymbolLike */) ||
-                    combined & 49152 /* VoidLike */ && combined & (67238908 /* DisjointDomains */ & ~49152 /* VoidLike */)) {
-                    return true;
-                }
-            }
-            return false;
-        }
         function addTypeToUnion(typeSet, includes, type) {
             var flags = type.flags;
             if (flags & 1048576 /* Union */) {
                 return addTypesToUnion(typeSet, includes, type.types);
             }
-            // We ignore 'never' types in unions. Likewise, we ignore intersections of unit types as they are
-            // another form of 'never' (in that they have an empty value domain). We could in theory turn
-            // intersections of unit types into 'never' upon construction, but deferring the reduction makes it
-            // easier to reason about their origin.
-            if (!(flags & 131072 /* Never */ || flags & 2097152 /* Intersection */ && isEmptyIntersectionType(type))) {
-                includes |= flags & 1835007 /* IncludesMask */;
+            // We ignore 'never' types in unions
+            if (!(flags & 131072 /* Never */)) {
+                includes |= flags & 68943871 /* IncludesMask */;
                 if (flags & 66846720 /* StructuredOrInstantiable */)
                     includes |= 262144 /* IncludesStructuredOrInstantiable */;
                 if (type === wildcardType)
                     includes |= 4194304 /* IncludesWildcard */;
                 if (!strictNullChecks && flags & 98304 /* Nullable */) {
-                    if (!(ts.getObjectFlags(type) & 131072 /* ContainsWideningType */))
+                    if (!(ts.getObjectFlags(type) & 262144 /* ContainsWideningType */))
                         includes |= 2097152 /* IncludesNonWideningType */;
                 }
                 else {
@@ -39738,7 +40483,7 @@ var ts;
                             neverType;
                 }
             }
-            return getUnionTypeFromSortedList(typeSet, includes & 66994211 /* NotPrimitiveUnion */ ? 0 : 65536 /* PrimitiveUnion */, aliasSymbol, aliasTypeArguments);
+            return getUnionTypeFromSortedList(typeSet, includes & 66994211 /* NotPrimitiveUnion */ ? 0 : 131072 /* PrimitiveUnion */, aliasSymbol, aliasTypeArguments);
         }
         function getUnionTypePredicate(signatures) {
             var first;
@@ -39816,18 +40561,23 @@ var ts;
             if (isEmptyAnonymousObjectType(type)) {
                 if (!(includes & 8388608 /* IncludesEmptyObject */)) {
                     includes |= 8388608 /* IncludesEmptyObject */;
-                    typeSet.push(type);
+                    typeSet.set(type.id.toString(), type);
                 }
             }
             else {
-                includes |= flags & 1835007 /* IncludesMask */;
                 if (flags & 3 /* AnyOrUnknown */) {
                     if (type === wildcardType)
                         includes |= 4194304 /* IncludesWildcard */;
                 }
-                else if ((strictNullChecks || !(flags & 98304 /* Nullable */)) && !ts.contains(typeSet, type)) {
-                    typeSet.push(type);
+                else if ((strictNullChecks || !(flags & 98304 /* Nullable */)) && !typeSet.has(type.id.toString())) {
+                    if (type.flags & 109440 /* Unit */ && includes & 109440 /* Unit */) {
+                        // We have seen two distinct unit types which means we should reduce to an
+                        // empty intersection. Adding TypeFlags.NonPrimitive causes that to happen.
+                        includes |= 67108864 /* NonPrimitive */;
+                    }
+                    typeSet.set(type.id.toString(), type);
                 }
+                includes |= flags & 68943871 /* IncludesMask */;
             }
             return includes;
         }
@@ -39878,7 +40628,7 @@ var ts;
         // other unions and return true. Otherwise, do nothing and return false.
         function intersectUnionsOfPrimitiveTypes(types) {
             var unionTypes;
-            var index = ts.findIndex(types, function (t) { return !!(ts.getObjectFlags(t) & 65536 /* PrimitiveUnion */); });
+            var index = ts.findIndex(types, function (t) { return !!(ts.getObjectFlags(t) & 131072 /* PrimitiveUnion */); });
             if (index < 0) {
                 return false;
             }
@@ -39887,7 +40637,7 @@ var ts;
             // the unionTypes array.
             while (i < types.length) {
                 var t = types[i];
-                if (ts.getObjectFlags(t) & 65536 /* PrimitiveUnion */) {
+                if (ts.getObjectFlags(t) & 131072 /* PrimitiveUnion */) {
                     (unionTypes || (unionTypes = [types[index]])).push(t);
                     ts.orderedRemoveItemAt(types, i);
                 }
@@ -39916,9 +40666,17 @@ var ts;
                 }
             }
             // Finally replace the first union with the result
-            types[index] = getUnionTypeFromSortedList(result, 65536 /* PrimitiveUnion */);
+            types[index] = getUnionTypeFromSortedList(result, 131072 /* PrimitiveUnion */);
             return true;
         }
+        function createIntersectionType(types, aliasSymbol, aliasTypeArguments) {
+            var result = createType(2097152 /* Intersection */);
+            result.objectFlags = getPropagatingFlagsOfTypes(types, /*excludeKinds*/ 98304 /* Nullable */);
+            result.types = types;
+            result.aliasSymbol = aliasSymbol; // See comment in `getUnionTypeFromSortedList`.
+            result.aliasTypeArguments = aliasTypeArguments;
+            return result;
+        }
         // We normalize combinations of intersection and union types based on the distributive property of the '&'
         // operator. Specifically, because X & (A | B) is equivalent to X & A | X & B, we can transform intersection
         // types with union type constituents into equivalent union types with intersection type constituents and
@@ -39930,9 +40688,26 @@ var ts;
         // Also, unlike union types, the order of the constituent types is preserved in order that overload resolution
         // for intersections of types with signatures can be deterministic.
         function getIntersectionType(types, aliasSymbol, aliasTypeArguments) {
-            var typeSet = [];
-            var includes = addTypesToIntersection(typeSet, 0, types);
-            if (includes & 131072 /* Never */) {
+            var typeMembershipMap = ts.createMap();
+            var includes = addTypesToIntersection(typeMembershipMap, 0, types);
+            var typeSet = ts.arrayFrom(typeMembershipMap.values());
+            // An intersection type is considered empty if it contains
+            // the type never, or
+            // more than one unit type or,
+            // an object type and a nullable type (null or undefined), or
+            // a string-like type and a type known to be non-string-like, or
+            // a number-like type and a type known to be non-number-like, or
+            // a symbol-like type and a type known to be non-symbol-like, or
+            // a void-like type and a type known to be non-void-like, or
+            // a non-primitive type and a type known to be primitive.
+            if (includes & 131072 /* Never */ ||
+                strictNullChecks && includes & 98304 /* Nullable */ && includes & (524288 /* Object */ | 67108864 /* NonPrimitive */ | 8388608 /* IncludesEmptyObject */) ||
+                includes & 67108864 /* NonPrimitive */ && includes & (67238908 /* DisjointDomains */ & ~67108864 /* NonPrimitive */) ||
+                includes & 132 /* StringLike */ && includes & (67238908 /* DisjointDomains */ & ~132 /* StringLike */) ||
+                includes & 296 /* NumberLike */ && includes & (67238908 /* DisjointDomains */ & ~296 /* NumberLike */) ||
+                includes & 2112 /* BigIntLike */ && includes & (67238908 /* DisjointDomains */ & ~2112 /* BigIntLike */) ||
+                includes & 12288 /* ESSymbolLike */ && includes & (67238908 /* DisjointDomains */ & ~12288 /* ESSymbolLike */) ||
+                includes & 49152 /* VoidLike */ && includes & (67238908 /* DisjointDomains */ & ~49152 /* VoidLike */)) {
                 return neverType;
             }
             if (includes & 1 /* Any */) {
@@ -39956,30 +40731,36 @@ var ts;
             if (typeSet.length === 1) {
                 return typeSet[0];
             }
-            if (includes & 1048576 /* Union */) {
-                if (intersectUnionsOfPrimitiveTypes(typeSet)) {
-                    // When the intersection creates a reduced set (which might mean that *all* union types have
-                    // disappeared), we restart the operation to get a new set of combined flags. Once we have
-                    // reduced we'll never reduce again, so this occurs at most once.
-                    return getIntersectionType(typeSet, aliasSymbol, aliasTypeArguments);
-                }
-                // We are attempting to construct a type of the form X & (A | B) & Y. Transform this into a type of
-                // the form X & A & Y | X & B & Y and recursively reduce until no union type constituents remain.
-                var unionIndex_1 = ts.findIndex(typeSet, function (t) { return (t.flags & 1048576 /* Union */) !== 0; });
-                var unionType = typeSet[unionIndex_1];
-                return getUnionType(ts.map(unionType.types, function (t) { return getIntersectionType(ts.replaceElement(typeSet, unionIndex_1, t)); }), 1 /* Literal */, aliasSymbol, aliasTypeArguments);
-            }
             var id = getTypeListId(typeSet);
-            var type = intersectionTypes.get(id);
-            if (!type) {
-                type = createType(2097152 /* Intersection */);
-                intersectionTypes.set(id, type);
-                type.objectFlags = getPropagatingFlagsOfTypes(typeSet, /*excludeKinds*/ 98304 /* Nullable */);
-                type.types = typeSet;
-                type.aliasSymbol = aliasSymbol; // See comment in `getUnionTypeFromSortedList`.
-                type.aliasTypeArguments = aliasTypeArguments;
+            var result = intersectionTypes.get(id);
+            if (!result) {
+                if (includes & 1048576 /* Union */) {
+                    if (intersectUnionsOfPrimitiveTypes(typeSet)) {
+                        // When the intersection creates a reduced set (which might mean that *all* union types have
+                        // disappeared), we restart the operation to get a new set of combined flags. Once we have
+                        // reduced we'll never reduce again, so this occurs at most once.
+                        result = getIntersectionType(typeSet, aliasSymbol, aliasTypeArguments);
+                    }
+                    else {
+                        // We are attempting to construct a type of the form X & (A | B) & Y. Transform this into a type of
+                        // the form X & A & Y | X & B & Y and recursively reduce until no union type constituents remain.
+                        // If the estimated size of the resulting union type exceeds 100000 constituents, report an error.
+                        var size = ts.reduceLeft(typeSet, function (n, t) { return n * (t.flags & 1048576 /* Union */ ? t.types.length : 1); }, 1);
+                        if (size >= 100000) {
+                            error(currentNode, ts.Diagnostics.Expression_produces_a_union_type_that_is_too_complex_to_represent);
+                            return errorType;
+                        }
+                        var unionIndex_1 = ts.findIndex(typeSet, function (t) { return (t.flags & 1048576 /* Union */) !== 0; });
+                        var unionType = typeSet[unionIndex_1];
+                        result = getUnionType(ts.map(unionType.types, function (t) { return getIntersectionType(ts.replaceElement(typeSet, unionIndex_1, t)); }), 1 /* Literal */, aliasSymbol, aliasTypeArguments);
+                    }
+                }
+                else {
+                    result = createIntersectionType(typeSet, aliasSymbol, aliasTypeArguments);
+                }
+                intersectionTypes.set(id, result);
             }
-            return type;
+            return result;
         }
         function getTypeFromIntersectionTypeNode(node) {
             var links = getNodeLinks(node);
@@ -40035,18 +40816,19 @@ var ts;
             var numberIndexInfo = getIndexInfoOfType(type, 1 /* Number */);
             return numberIndexInfo !== enumNumberIndexInfo ? numberIndexInfo : undefined;
         }
-        function getIndexType(type, stringsOnly) {
+        function getIndexType(type, stringsOnly, noIndexSignatures) {
             if (stringsOnly === void 0) { stringsOnly = keyofStringsOnly; }
-            return type.flags & 1048576 /* Union */ ? getIntersectionType(ts.map(type.types, function (t) { return getIndexType(t, stringsOnly); })) :
-                type.flags & 2097152 /* Intersection */ ? getUnionType(ts.map(type.types, function (t) { return getIndexType(t, stringsOnly); })) :
+            return type.flags & 1048576 /* Union */ ? getIntersectionType(ts.map(type.types, function (t) { return getIndexType(t, stringsOnly, noIndexSignatures); })) :
+                type.flags & 2097152 /* Intersection */ ? getUnionType(ts.map(type.types, function (t) { return getIndexType(t, stringsOnly, noIndexSignatures); })) :
                     maybeTypeOfKind(type, 58982400 /* InstantiableNonPrimitive */) ? getIndexTypeForGenericType(type, stringsOnly) :
-                        ts.getObjectFlags(type) & 32 /* Mapped */ ? getConstraintTypeFromMappedType(type) :
+                        ts.getObjectFlags(type) & 32 /* Mapped */ ? filterType(getConstraintTypeFromMappedType(type), function (t) { return !(noIndexSignatures && t.flags & (1 /* Any */ | 4 /* String */)); }) :
                             type === wildcardType ? wildcardType :
-                                type.flags & 1 /* Any */ ? keyofConstraintType :
-                                    stringsOnly ? getIndexInfoOfType(type, 0 /* String */) ? stringType : getLiteralTypeFromProperties(type, 128 /* StringLiteral */) :
-                                        getIndexInfoOfType(type, 0 /* String */) ? getUnionType([stringType, numberType, getLiteralTypeFromProperties(type, 8192 /* UniqueESSymbol */)]) :
-                                            getNonEnumNumberIndexInfo(type) ? getUnionType([numberType, getLiteralTypeFromProperties(type, 128 /* StringLiteral */ | 8192 /* UniqueESSymbol */)]) :
-                                                getLiteralTypeFromProperties(type, 8576 /* StringOrNumberLiteralOrUnique */);
+                                type.flags & 2 /* Unknown */ ? neverType :
+                                    type.flags & (1 /* Any */ | 131072 /* Never */) ? keyofConstraintType :
+                                        stringsOnly ? !noIndexSignatures && getIndexInfoOfType(type, 0 /* String */) ? stringType : getLiteralTypeFromProperties(type, 128 /* StringLiteral */) :
+                                            !noIndexSignatures && getIndexInfoOfType(type, 0 /* String */) ? getUnionType([stringType, numberType, getLiteralTypeFromProperties(type, 8192 /* UniqueESSymbol */)]) :
+                                                getNonEnumNumberIndexInfo(type) ? getUnionType([numberType, getLiteralTypeFromProperties(type, 128 /* StringLiteral */ | 8192 /* UniqueESSymbol */)]) :
+                                                    getLiteralTypeFromProperties(type, 8576 /* StringOrNumberLiteralOrUnique */);
         }
         function getExtractStringType(type) {
             if (keyofStringsOnly) {
@@ -40063,15 +40845,15 @@ var ts;
             var links = getNodeLinks(node);
             if (!links.resolvedType) {
                 switch (node.operator) {
-                    case 129 /* KeyOfKeyword */:
+                    case 130 /* KeyOfKeyword */:
                         links.resolvedType = getIndexType(getTypeFromTypeNode(node.type));
                         break;
-                    case 142 /* UniqueKeyword */:
-                        links.resolvedType = node.type.kind === 139 /* SymbolKeyword */
+                    case 143 /* UniqueKeyword */:
+                        links.resolvedType = node.type.kind === 140 /* SymbolKeyword */
                             ? getESSymbolLikeTypeForNode(ts.walkUpParenthesizedTypes(node.parent))
                             : errorType;
                         break;
-                    case 133 /* ReadonlyKeyword */:
+                    case 134 /* ReadonlyKeyword */:
                         links.resolvedType = getTypeFromTypeNode(node.type);
                         break;
                 }
@@ -40111,9 +40893,9 @@ var ts;
             }
             return false;
         }
-        function getPropertyTypeForIndexType(objectType, indexType, accessNode, cacheSymbol, missingType) {
-            var accessExpression = accessNode && accessNode.kind === 190 /* ElementAccessExpression */ ? accessNode : undefined;
-            var propName = isTypeUsableAsPropertyName(indexType) ?
+        function getPropertyNameFromIndex(indexType, accessNode) {
+            var accessExpression = accessNode && accessNode.kind === 191 /* ElementAccessExpression */ ? accessNode : undefined;
+            return isTypeUsableAsPropertyName(indexType) ?
                 getPropertyNameFromType(indexType) :
                 accessExpression && checkThatExpressionIsProperSymbolReference(accessExpression.argumentExpression, indexType, /*reportError*/ false) ?
                     ts.getPropertyNameForKnownSymbolName(ts.idText(accessExpression.argumentExpression.name)) :
@@ -40121,16 +40903,20 @@ var ts;
                         // late bound names are handled in the first branch, so here we only need to handle normal names
                         ts.getPropertyNameForPropertyNameNode(accessNode) :
                         undefined;
+        }
+        function getPropertyTypeForIndexType(originalObjectType, objectType, indexType, fullIndexType, suppressNoImplicitAnyError, accessNode, accessFlags) {
+            var accessExpression = accessNode && accessNode.kind === 191 /* ElementAccessExpression */ ? accessNode : undefined;
+            var propName = getPropertyNameFromIndex(indexType, accessNode);
             if (propName !== undefined) {
                 var prop = getPropertyOfType(objectType, propName);
                 if (prop) {
                     if (accessExpression) {
-                        markPropertyAsReferenced(prop, accessExpression, /*isThisAccess*/ accessExpression.expression.kind === 100 /* ThisKeyword */);
+                        markPropertyAsReferenced(prop, accessExpression, /*isThisAccess*/ accessExpression.expression.kind === 101 /* ThisKeyword */);
                         if (ts.isAssignmentTarget(accessExpression) && (isReferenceToReadonlyEntity(accessExpression, prop) || isReferenceThroughNamespaceImport(accessExpression))) {
                             error(accessExpression.argumentExpression, ts.Diagnostics.Cannot_assign_to_0_because_it_is_a_read_only_property, symbolToString(prop));
-                            return missingType;
+                            return undefined;
                         }
-                        if (cacheSymbol) {
+                        if (accessFlags & 4 /* CacheSymbol */) {
                             getNodeLinks(accessNode).resolvedSymbol = prop;
                         }
                     }
@@ -40140,7 +40926,7 @@ var ts;
                         propType;
                 }
                 if (everyType(objectType, isTupleType) && isNumericLiteralName(propName) && +propName >= 0) {
-                    if (accessNode && everyType(objectType, function (t) { return !t.target.hasRestElement; })) {
+                    if (accessNode && everyType(objectType, function (t) { return !t.target.hasRestElement; }) && !(accessFlags & 8 /* NoTupleBoundsCheck */)) {
                         var indexNode = getIndexNodeForAccessExpression(accessNode);
                         if (isTupleType(objectType)) {
                             error(indexNode, ts.Diagnostics.Tuple_type_0_of_length_1_has_no_element_at_index_2, typeToString(objectType), getTypeReferenceArity(objectType), ts.unescapeLeadingUnderscores(propName));
@@ -40149,6 +40935,7 @@ var ts;
                             error(indexNode, ts.Diagnostics.Property_0_does_not_exist_on_type_1, ts.unescapeLeadingUnderscores(propName), typeToString(objectType));
                         }
                     }
+                    errorIfWritingToReadonlyIndex(getIndexInfoOfType(objectType, 1 /* Number */));
                     return mapType(objectType, function (t) { return getRestTypeOfTupleType(t) || undefinedType; });
                 }
             }
@@ -40156,17 +40943,21 @@ var ts;
                 if (objectType.flags & (1 /* Any */ | 131072 /* Never */)) {
                     return objectType;
                 }
-                var indexInfo = isTypeAssignableToKind(indexType, 296 /* NumberLike */) && getIndexInfoOfType(objectType, 1 /* Number */) ||
-                    getIndexInfoOfType(objectType, 0 /* String */) ||
-                    undefined;
+                var stringIndexInfo = getIndexInfoOfType(objectType, 0 /* String */);
+                var indexInfo = isTypeAssignableToKind(indexType, 296 /* NumberLike */) && getIndexInfoOfType(objectType, 1 /* Number */) || stringIndexInfo;
                 if (indexInfo) {
+                    if (accessFlags & 1 /* NoIndexSignatures */ && indexInfo === stringIndexInfo) {
+                        if (accessExpression) {
+                            error(accessExpression, ts.Diagnostics.Type_0_cannot_be_used_to_index_type_1, typeToString(indexType), typeToString(originalObjectType));
+                        }
+                        return undefined;
+                    }
                     if (accessNode && !isTypeAssignableToKind(indexType, 4 /* String */ | 8 /* Number */)) {
                         var indexNode = getIndexNodeForAccessExpression(accessNode);
                         error(indexNode, ts.Diagnostics.Type_0_cannot_be_used_as_an_index_type, typeToString(indexType));
+                        return indexInfo.type;
                     }
-                    else if (accessExpression && indexInfo.isReadonly && (ts.isAssignmentTarget(accessExpression) || ts.isDeleteTarget(accessExpression))) {
-                        error(accessExpression, ts.Diagnostics.Index_signature_in_type_0_only_permits_reading, typeToString(objectType));
-                    }
+                    errorIfWritingToReadonlyIndex(indexInfo);
                     return indexInfo.type;
                 }
                 if (indexType.flags & 131072 /* Never */) {
@@ -40176,7 +40967,10 @@ var ts;
                     return anyType;
                 }
                 if (accessExpression && !isConstEnumObjectType(objectType)) {
-                    if (noImplicitAny && !compilerOptions.suppressImplicitAnyIndexErrors) {
+                    if (objectType.symbol === globalThisSymbol && propName !== undefined && globalThisSymbol.exports.has(propName) && (globalThisSymbol.exports.get(propName).flags & 418 /* BlockScoped */)) {
+                        error(accessExpression, ts.Diagnostics.Property_0_does_not_exist_on_type_1, ts.unescapeLeadingUnderscores(propName), typeToString(objectType));
+                    }
+                    else if (noImplicitAny && !compilerOptions.suppressImplicitAnyIndexErrors && !suppressNoImplicitAnyError) {
                         if (propName !== undefined && typeHasStaticProperty(propName, objectType)) {
                             error(accessExpression, ts.Diagnostics.Property_0_is_a_static_member_of_type_1, propName, typeToString(objectType));
                         }
@@ -40191,11 +40985,35 @@ var ts;
                                 }
                             }
                             else {
-                                error(accessExpression, ts.Diagnostics.Element_implicitly_has_an_any_type_because_type_0_has_no_index_signature, typeToString(objectType));
+                                var suggestion_1 = getSuggestionForNonexistentIndexSignature(objectType, accessExpression);
+                                if (suggestion_1 !== undefined) {
+                                    error(accessExpression, ts.Diagnostics.Element_implicitly_has_an_any_type_because_type_0_has_no_index_signature_Did_you_mean_to_call_1, typeToString(objectType), suggestion_1);
+                                }
+                                else {
+                                    var errorInfo = void 0;
+                                    if (indexType.flags & 1024 /* EnumLiteral */) {
+                                        errorInfo = ts.chainDiagnosticMessages(/* details */ undefined, ts.Diagnostics.Property_0_does_not_exist_on_type_1, "[" + typeToString(indexType) + "]", typeToString(objectType));
+                                    }
+                                    else if (indexType.flags & 8192 /* UniqueESSymbol */) {
+                                        var symbolName_2 = getFullyQualifiedName(indexType.symbol, accessExpression);
+                                        errorInfo = ts.chainDiagnosticMessages(/* details */ undefined, ts.Diagnostics.Property_0_does_not_exist_on_type_1, "[" + symbolName_2 + "]", typeToString(objectType));
+                                    }
+                                    else if (indexType.flags & 128 /* StringLiteral */) {
+                                        errorInfo = ts.chainDiagnosticMessages(/* details */ undefined, ts.Diagnostics.Property_0_does_not_exist_on_type_1, indexType.value, typeToString(objectType));
+                                    }
+                                    else if (indexType.flags & 256 /* NumberLiteral */) {
+                                        errorInfo = ts.chainDiagnosticMessages(/* details */ undefined, ts.Diagnostics.Property_0_does_not_exist_on_type_1, indexType.value, typeToString(objectType));
+                                    }
+                                    else if (indexType.flags & (8 /* Number */ | 4 /* String */)) {
+                                        errorInfo = ts.chainDiagnosticMessages(/* details */ undefined, ts.Diagnostics.No_index_signature_with_a_parameter_of_type_0_was_found_on_type_1, typeToString(indexType), typeToString(objectType));
+                                    }
+                                    errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.Element_implicitly_has_an_any_type_because_expression_of_type_0_can_t_be_used_to_index_type_1, typeToString(fullIndexType), typeToString(objectType));
+                                    diagnostics.add(ts.createDiagnosticForNodeFromMessageChain(accessExpression, errorInfo));
+                                }
                             }
                         }
                     }
-                    return missingType;
+                    return undefined;
                 }
             }
             if (isJSLiteralType(objectType)) {
@@ -40216,14 +41034,19 @@ var ts;
             if (isTypeAny(indexType)) {
                 return indexType;
             }
-            return missingType;
+            return undefined;
+            function errorIfWritingToReadonlyIndex(indexInfo) {
+                if (indexInfo && indexInfo.isReadonly && accessExpression && (ts.isAssignmentTarget(accessExpression) || ts.isDeleteTarget(accessExpression))) {
+                    error(accessExpression, ts.Diagnostics.Index_signature_in_type_0_only_permits_reading, typeToString(objectType));
+                }
+            }
         }
         function getIndexNodeForAccessExpression(accessNode) {
-            return accessNode.kind === 190 /* ElementAccessExpression */
+            return accessNode.kind === 191 /* ElementAccessExpression */
                 ? accessNode.argumentExpression
-                : accessNode.kind === 180 /* IndexedAccessType */
+                : accessNode.kind === 181 /* IndexedAccessType */
                     ? accessNode.indexType
-                    : accessNode.kind === 149 /* ComputedPropertyName */
+                    : accessNode.kind === 150 /* ComputedPropertyName */
                         ? accessNode.expression
                         : accessNode;
         }
@@ -40233,64 +41056,124 @@ var ts;
         function isGenericIndexType(type) {
             return maybeTypeOfKind(type, 58982400 /* InstantiableNonPrimitive */ | 4194304 /* Index */);
         }
-        function getSimplifiedType(type) {
-            return type.flags & 8388608 /* IndexedAccess */ ? getSimplifiedIndexedAccessType(type) : type;
+        function isThisTypeParameter(type) {
+            return !!(type.flags & 262144 /* TypeParameter */ && type.isThisType);
         }
-        function distributeIndexOverObjectType(objectType, indexType) {
-            // (T | U)[K] -> T[K] | U[K]
-            if (objectType.flags & 1048576 /* Union */) {
-                return mapType(objectType, function (t) { return getSimplifiedType(getIndexedAccessType(t, indexType)); });
-            }
+        function getSimplifiedType(type, writing) {
+            return type.flags & 8388608 /* IndexedAccess */ ? getSimplifiedIndexedAccessType(type, writing) :
+                type.flags & 16777216 /* Conditional */ ? getSimplifiedConditionalType(type, writing) :
+                    type;
+        }
+        function distributeIndexOverObjectType(objectType, indexType, writing) {
+            // (T | U)[K] -> T[K] | U[K] (reading)
+            // (T | U)[K] -> T[K] & U[K] (writing)
             // (T & U)[K] -> T[K] & U[K]
-            if (objectType.flags & 2097152 /* Intersection */) {
-                return getIntersectionType(ts.map(objectType.types, function (t) { return getSimplifiedType(getIndexedAccessType(t, indexType)); }));
+            if (objectType.flags & 3145728 /* UnionOrIntersection */) {
+                var types = ts.map(objectType.types, function (t) { return getSimplifiedType(getIndexedAccessType(t, indexType), writing); });
+                return objectType.flags & 2097152 /* Intersection */ || writing ? getIntersectionType(types) : getUnionType(types);
+            }
+        }
+        function distributeObjectOverIndexType(objectType, indexType, writing) {
+            // T[A | B] -> T[A] | T[B] (reading)
+            // T[A | B] -> T[A] & T[B] (writing)
+            if (indexType.flags & 1048576 /* Union */) {
+                var types = ts.map(indexType.types, function (t) { return getSimplifiedType(getIndexedAccessType(objectType, t), writing); });
+                return writing ? getIntersectionType(types) : getUnionType(types);
             }
         }
         // Transform an indexed access to a simpler form, if possible. Return the simpler form, or return
-        // the type itself if no transformation is possible.
-        function getSimplifiedIndexedAccessType(type) {
-            if (type.simplified) {
-                return type.simplified === circularConstraintType ? type : type.simplified;
+        // the type itself if no transformation is possible. The writing flag indicates that the type is
+        // the target of an assignment.
+        function getSimplifiedIndexedAccessType(type, writing) {
+            var cache = writing ? "simplifiedForWriting" : "simplifiedForReading";
+            if (type[cache]) {
+                return type[cache] === circularConstraintType ? type : type[cache];
             }
-            type.simplified = circularConstraintType;
+            type[cache] = circularConstraintType;
             // We recursively simplify the object type as it may in turn be an indexed access type. For example, with
             // '{ [P in T]: { [Q in U]: number } }[T][U]' we want to first simplify the inner indexed access type.
-            var objectType = getSimplifiedType(type.objectType);
-            var indexType = getSimplifiedType(type.indexType);
-            // T[A | B] -> T[A] | T[B]
-            if (indexType.flags & 1048576 /* Union */) {
-                return type.simplified = mapType(indexType, function (t) { return getSimplifiedType(getIndexedAccessType(objectType, t)); });
+            var objectType = getSimplifiedType(type.objectType, writing);
+            var indexType = getSimplifiedType(type.indexType, writing);
+            // T[A | B] -> T[A] | T[B] (reading)
+            // T[A | B] -> T[A] & T[B] (writing)
+            var distributedOverIndex = distributeObjectOverIndexType(objectType, indexType, writing);
+            if (distributedOverIndex) {
+                return type[cache] = distributedOverIndex;
             }
             // Only do the inner distributions if the index can no longer be instantiated to cause index distribution again
             if (!(indexType.flags & 63176704 /* Instantiable */)) {
-                var simplified = distributeIndexOverObjectType(objectType, indexType);
-                if (simplified) {
-                    return type.simplified = simplified;
+                // (T | U)[K] -> T[K] | U[K] (reading)
+                // (T | U)[K] -> T[K] & U[K] (writing)
+                // (T & U)[K] -> T[K] & U[K]
+                var distributedOverObject = distributeIndexOverObjectType(objectType, indexType, writing);
+                if (distributedOverObject) {
+                    return type[cache] = distributedOverObject;
                 }
             }
-            // So ultimately:
+            // So ultimately (reading):
             // ((A & B) | C)[K1 | K2] -> ((A & B) | C)[K1] | ((A & B) | C)[K2] -> (A & B)[K1] | C[K1] | (A & B)[K2] | C[K2] -> (A[K1] & B[K1]) | C[K1] | (A[K2] & B[K2]) | C[K2]
             // If the object type is a mapped type { [P in K]: E }, where K is generic, instantiate E using a mapper
             // that substitutes the index type for P. For example, for an index access { [P in K]: Box<T[P]> }[X], we
             // construct the type Box<T[X]>.
             if (isGenericMappedType(objectType)) {
-                var mapper = createTypeMapper([getTypeParameterFromMappedType(objectType)], [type.indexType]);
-                var templateMapper = combineTypeMappers(objectType.mapper, mapper);
-                return type.simplified = mapType(instantiateType(getTemplateTypeFromMappedType(objectType), templateMapper), getSimplifiedType);
+                return type[cache] = mapType(substituteIndexedMappedType(objectType, type.indexType), function (t) { return getSimplifiedType(t, writing); });
             }
-            return type.simplified = type;
+            return type[cache] = type;
         }
-        function getIndexedAccessType(objectType, indexType, accessNode, missingType) {
-            if (missingType === void 0) { missingType = accessNode ? errorType : unknownType; }
+        function getSimplifiedConditionalType(type, writing) {
+            var checkType = type.checkType;
+            var extendsType = type.extendsType;
+            var trueType = getTrueTypeFromConditionalType(type);
+            var falseType = getFalseTypeFromConditionalType(type);
+            // Simplifications for types of the form `T extends U ? T : never` and `T extends U ? never : T`.
+            if (falseType.flags & 131072 /* Never */ && getActualTypeVariable(trueType) === getActualTypeVariable(checkType)) {
+                if (checkType.flags & 1 /* Any */ || isTypeAssignableTo(getRestrictiveInstantiation(checkType), getRestrictiveInstantiation(extendsType))) { // Always true
+                    return getSimplifiedType(trueType, writing);
+                }
+                else if (isIntersectionEmpty(checkType, extendsType)) { // Always false
+                    return neverType;
+                }
+            }
+            else if (trueType.flags & 131072 /* Never */ && getActualTypeVariable(falseType) === getActualTypeVariable(checkType)) {
+                if (!(checkType.flags & 1 /* Any */) && isTypeAssignableTo(getRestrictiveInstantiation(checkType), getRestrictiveInstantiation(extendsType))) { // Always true
+                    return neverType;
+                }
+                else if (checkType.flags & 1 /* Any */ || isIntersectionEmpty(checkType, extendsType)) { // Always false
+                    return getSimplifiedType(falseType, writing);
+                }
+            }
+            return type;
+        }
+        /**
+         * Invokes union simplification logic to determine if an intersection is considered empty as a union constituent
+         */
+        function isIntersectionEmpty(type1, type2) {
+            return !!(getUnionType([intersectTypes(type1, type2), neverType]).flags & 131072 /* Never */);
+        }
+        function substituteIndexedMappedType(objectType, index) {
+            var mapper = createTypeMapper([getTypeParameterFromMappedType(objectType)], [index]);
+            var templateMapper = combineTypeMappers(objectType.mapper, mapper);
+            return instantiateType(getTemplateTypeFromMappedType(objectType), templateMapper);
+        }
+        function getIndexedAccessType(objectType, indexType, accessNode) {
+            return getIndexedAccessTypeOrUndefined(objectType, indexType, accessNode, 0 /* None */) || (accessNode ? errorType : unknownType);
+        }
+        function getIndexedAccessTypeOrUndefined(objectType, indexType, accessNode, accessFlags) {
+            if (accessFlags === void 0) { accessFlags = 0 /* None */; }
             if (objectType === wildcardType || indexType === wildcardType) {
                 return wildcardType;
             }
+            // If the object type has a string index signature and no other members we know that the result will
+            // always be the type of that index signature and we can simplify accordingly.
+            if (isStringIndexSignatureOnlyType(objectType) && !(indexType.flags & 98304 /* Nullable */) && isTypeAssignableToKind(indexType, 4 /* String */ | 8 /* Number */)) {
+                indexType = stringType;
+            }
             // If the index type is generic, or if the object type is generic and doesn't originate in an expression,
             // we are performing a higher-order index access where we cannot meaningfully access the properties of the
             // object type. Note that for a generic T and a non-generic K, we eagerly resolve T[K] if it originates in
             // an expression. This is to preserve backwards compatibility. For example, an element access 'this["foo"]'
             // has always been resolved eagerly using the constraint type of 'this' at the given location.
-            if (isGenericIndexType(indexType) || !(accessNode && accessNode.kind !== 180 /* IndexedAccessType */) && isGenericObjectType(objectType)) {
+            if (isGenericIndexType(indexType) || !(accessNode && accessNode.kind !== 181 /* IndexedAccessType */) && isGenericObjectType(objectType)) {
                 if (objectType.flags & 3 /* AnyOrUnknown */) {
                     return objectType;
                 }
@@ -40311,25 +41194,25 @@ var ts;
                 var wasMissingProp = false;
                 for (var _i = 0, _a = indexType.types; _i < _a.length; _i++) {
                     var t = _a[_i];
-                    var propType = getPropertyTypeForIndexType(apparentObjectType, t, accessNode, /*cacheSymbol*/ false, missingType);
-                    if (propType === missingType) {
-                        if (!accessNode) {
-                            // If there's no error node, we can immeditely stop, since error reporting is off
-                            return missingType;
-                        }
-                        else {
-                            // Otherwise we set a flag and return at the end of the loop so we still mark all errors
-                            wasMissingProp = true;
-                        }
+                    var propType = getPropertyTypeForIndexType(objectType, apparentObjectType, t, indexType, wasMissingProp, accessNode, accessFlags);
+                    if (propType) {
+                        propTypes.push(propType);
+                    }
+                    else if (!accessNode) {
+                        // If there's no error node, we can immeditely stop, since error reporting is off
+                        return undefined;
+                    }
+                    else {
+                        // Otherwise we set a flag and return at the end of the loop so we still mark all errors
+                        wasMissingProp = true;
                     }
-                    propTypes.push(propType);
                 }
                 if (wasMissingProp) {
-                    return missingType;
+                    return undefined;
                 }
-                return getUnionType(propTypes);
+                return accessFlags & 2 /* Writing */ ? getIntersectionType(propTypes) : getUnionType(propTypes);
             }
-            return getPropertyTypeForIndexType(apparentObjectType, indexType, accessNode, /*cacheSymbol*/ true, missingType);
+            return getPropertyTypeForIndexType(objectType, apparentObjectType, indexType, indexType, /* supressNoImplicitAnyError */ false, accessNode, accessFlags | 4 /* CacheSymbol */);
         }
         function getTypeFromIndexedAccessTypeNode(node) {
             var links = getNodeLinks(node);
@@ -40359,13 +41242,14 @@ var ts;
             return links.resolvedType;
         }
         function getActualTypeVariable(type) {
-            return type.flags & 33554432 /* Substitution */ ? type.typeVariable : type;
-        }
-        /**
-         * Invokes union simplification logic to determine if an intersection is considered empty as a union constituent
-         */
-        function isIntersectionEmpty(type1, type2) {
-            return !!(getUnionType([intersectTypes(type1, type2), neverType]).flags & 131072 /* Never */);
+            if (type.flags & 33554432 /* Substitution */) {
+                return type.typeVariable;
+            }
+            if (type.flags & 8388608 /* IndexedAccess */ && (type.objectType.flags & 33554432 /* Substitution */ ||
+                type.indexType.flags & 33554432 /* Substitution */)) {
+                return getIndexedAccessType(getActualTypeVariable(type.objectType), getActualTypeVariable(type.indexType));
+            }
+            return type;
         }
         function getConditionalType(root, mapper) {
             var checkType = instantiateType(root.checkType, mapper);
@@ -40373,35 +41257,6 @@ var ts;
             if (checkType === wildcardType || extendsType === wildcardType) {
                 return wildcardType;
             }
-            var trueType = instantiateType(root.trueType, mapper);
-            var falseType = instantiateType(root.falseType, mapper);
-            var instantiationId = "" + (root.isDistributive ? "d" : "") + getTypeId(checkType) + ">" + getTypeId(extendsType) + "?" + getTypeId(trueType) + ":" + getTypeId(falseType);
-            var result = conditionalTypes.get(instantiationId);
-            if (result) {
-                return result;
-            }
-            var newResult = getConditionalTypeWorker(root, mapper, checkType, extendsType, trueType, falseType);
-            conditionalTypes.set(instantiationId, newResult);
-            return newResult;
-        }
-        function getConditionalTypeWorker(root, mapper, checkType, extendsType, trueType, falseType) {
-            // Simplifications for types of the form `T extends U ? T : never` and `T extends U ? never : T`.
-            if (falseType.flags & 131072 /* Never */ && isTypeIdenticalTo(getActualTypeVariable(trueType), getActualTypeVariable(checkType))) {
-                if (checkType.flags & 1 /* Any */ || isTypeAssignableTo(getRestrictiveInstantiation(checkType), getRestrictiveInstantiation(extendsType))) { // Always true
-                    return getDefaultConstraintOfTrueBranchOfConditionalType(root, /*combinedMapper*/ undefined, mapper);
-                }
-                else if (isIntersectionEmpty(checkType, extendsType)) { // Always false
-                    return neverType;
-                }
-            }
-            else if (trueType.flags & 131072 /* Never */ && isTypeIdenticalTo(getActualTypeVariable(falseType), getActualTypeVariable(checkType))) {
-                if (!(checkType.flags & 1 /* Any */) && isTypeAssignableTo(getRestrictiveInstantiation(checkType), getRestrictiveInstantiation(extendsType))) { // Always true
-                    return neverType;
-                }
-                else if (checkType.flags & 1 /* Any */ || isIntersectionEmpty(checkType, extendsType)) { // Always false
-                    return falseType; // TODO: Intersect negated `extends` type here
-                }
-            }
             var checkTypeInstantiable = maybeTypeOfKind(checkType, 63176704 /* Instantiable */ | 131072 /* GenericMappedType */);
             var combinedMapper;
             if (root.inferTypeParameters) {
@@ -40410,27 +41265,27 @@ var ts;
                     // We don't want inferences from constraints as they may cause us to eagerly resolve the
                     // conditional type instead of deferring resolution. Also, we always want strict function
                     // types rules (i.e. proper contravariance) for inferences.
-                    inferTypes(context.inferences, checkType, extendsType, 32 /* NoConstraints */ | 64 /* AlwaysStrict */);
+                    inferTypes(context.inferences, checkType, extendsType, 64 /* NoConstraints */ | 128 /* AlwaysStrict */);
                 }
-                combinedMapper = combineTypeMappers(mapper, context);
+                combinedMapper = combineTypeMappers(mapper, context.mapper);
             }
             // Instantiate the extends type including inferences for 'infer T' type parameters
             var inferredExtendsType = combinedMapper ? instantiateType(root.extendsType, combinedMapper) : extendsType;
             // We attempt to resolve the conditional type only when the check and extends types are non-generic
             if (!checkTypeInstantiable && !maybeTypeOfKind(inferredExtendsType, 63176704 /* Instantiable */ | 131072 /* GenericMappedType */)) {
                 if (inferredExtendsType.flags & 3 /* AnyOrUnknown */) {
-                    return trueType;
+                    return instantiateType(root.trueType, combinedMapper || mapper);
                 }
                 // Return union of trueType and falseType for 'any' since it matches anything
                 if (checkType.flags & 1 /* Any */) {
-                    return getUnionType([instantiateType(root.trueType, combinedMapper || mapper), falseType]);
+                    return getUnionType([instantiateType(root.trueType, combinedMapper || mapper), instantiateType(root.falseType, mapper)]);
                 }
                 // Return falseType for a definitely false extends check. We check an instantiations of the two
                 // types with type parameters mapped to the wildcard type, the most permissive instantiations
                 // possible (the wildcard type is assignable to and from all types). If those are not related,
                 // then no instantiations will be and we can just return the false branch type.
                 if (!isTypeAssignableTo(getPermissiveInstantiation(checkType), getPermissiveInstantiation(inferredExtendsType))) {
-                    return falseType;
+                    return instantiateType(root.falseType, mapper);
                 }
                 // Return trueType for a definitely true extends check. We check instantiations of the two
                 // types with type parameters mapped to their restrictive form, i.e. a form of the type parameter
@@ -40449,10 +41304,6 @@ var ts;
             result.extendsType = extendsType;
             result.mapper = mapper;
             result.combinedMapper = combinedMapper;
-            if (!combinedMapper) {
-                result.resolvedTrueType = trueType;
-                result.resolvedFalseType = falseType;
-            }
             result.aliasSymbol = root.aliasSymbol;
             result.aliasTypeArguments = instantiateTypes(root.aliasTypeArguments, mapper); // TODO: GH#18217
             return result;
@@ -40463,6 +41314,9 @@ var ts;
         function getFalseTypeFromConditionalType(type) {
             return type.resolvedFalseType || (type.resolvedFalseType = instantiateType(type.root.falseType, type.mapper));
         }
+        function getInferredTrueTypeFromConditionalType(type) {
+            return type.resolvedInferredTrueType || (type.resolvedInferredTrueType = type.combinedMapper ? instantiateType(type.root.trueType, type.combinedMapper) : getTrueTypeFromConditionalType(type));
+        }
         function getInferTypeParameters(node) {
             var result;
             if (node.locals) {
@@ -40474,20 +41328,6 @@ var ts;
             }
             return result;
         }
-        function isPossiblyReferencedInConditionalType(tp, node) {
-            if (isTypeParameterPossiblyReferenced(tp, node)) {
-                return true;
-            }
-            while (node) {
-                if (node.kind === 175 /* ConditionalType */) {
-                    if (isTypeParameterPossiblyReferenced(tp, node.extendsType)) {
-                        return true;
-                    }
-                }
-                node = node.parent;
-            }
-            return false;
-        }
         function getTypeFromConditionalTypeNode(node) {
             var links = getNodeLinks(node);
             if (!links.resolvedType) {
@@ -40495,7 +41335,7 @@ var ts;
                 var aliasSymbol = getAliasSymbolForTypeNode(node);
                 var aliasTypeArguments = getTypeArgumentsForAliasSymbol(aliasSymbol);
                 var allOuterTypeParameters = getOuterTypeParameters(node, /*includeThisTypes*/ true);
-                var outerTypeParameters = aliasTypeArguments ? allOuterTypeParameters : ts.filter(allOuterTypeParameters, function (tp) { return isPossiblyReferencedInConditionalType(tp, node); });
+                var outerTypeParameters = aliasTypeArguments ? allOuterTypeParameters : ts.filter(allOuterTypeParameters, function (tp) { return isTypeParameterPossiblyReferenced(tp, node); });
                 var root = {
                     node: node,
                     checkType: checkType,
@@ -40715,7 +41555,7 @@ var ts;
                 }
             }
             var spread = createAnonymousType(symbol, members, ts.emptyArray, ts.emptyArray, getIndexInfoWithReadonly(stringIndexInfo, readonly), getIndexInfoWithReadonly(numberIndexInfo, readonly));
-            spread.objectFlags |= 128 /* ObjectLiteral */ | 262144 /* ContainsObjectLiteral */ | 1024 /* ContainsSpread */ | objectFlags;
+            spread.objectFlags |= 128 /* ObjectLiteral */ | 524288 /* ContainsObjectOrArrayLiteral */ | 1024 /* ContainsSpread */ | objectFlags;
             return spread;
         }
         /** We approximate own properties as non-methods plus methods that are inside the object literal */
@@ -40806,9 +41646,9 @@ var ts;
         function getThisType(node) {
             var container = ts.getThisContainer(node, /*includeArrowFunctions*/ false);
             var parent = container && container.parent;
-            if (parent && (ts.isClassLike(parent) || parent.kind === 241 /* InterfaceDeclaration */)) {
+            if (parent && (ts.isClassLike(parent) || parent.kind === 242 /* InterfaceDeclaration */)) {
                 if (!ts.hasModifier(container, 32 /* Static */) &&
-                    (container.kind !== 157 /* Constructor */ || ts.isNodeDescendantOf(node, container.body))) {
+                    (container.kind !== 158 /* Constructor */ || ts.isNodeDescendantOf(node, container.body))) {
                     return getDeclaredTypeOfClassOrInterface(getSymbolOfNode(parent)).thisType;
                 }
             }
@@ -40824,89 +41664,89 @@ var ts;
         }
         function getTypeFromTypeNode(node) {
             switch (node.kind) {
-                case 120 /* AnyKeyword */:
-                case 289 /* JSDocAllType */:
-                case 290 /* JSDocUnknownType */:
+                case 121 /* AnyKeyword */:
+                case 290 /* JSDocAllType */:
+                case 291 /* JSDocUnknownType */:
                     return anyType;
-                case 143 /* UnknownKeyword */:
+                case 144 /* UnknownKeyword */:
                     return unknownType;
-                case 138 /* StringKeyword */:
+                case 139 /* StringKeyword */:
                     return stringType;
-                case 135 /* NumberKeyword */:
+                case 136 /* NumberKeyword */:
                     return numberType;
-                case 146 /* BigIntKeyword */:
+                case 147 /* BigIntKeyword */:
                     return bigintType;
-                case 123 /* BooleanKeyword */:
+                case 124 /* BooleanKeyword */:
                     return booleanType;
-                case 139 /* SymbolKeyword */:
+                case 140 /* SymbolKeyword */:
                     return esSymbolType;
-                case 106 /* VoidKeyword */:
+                case 107 /* VoidKeyword */:
                     return voidType;
-                case 141 /* UndefinedKeyword */:
+                case 142 /* UndefinedKeyword */:
                     return undefinedType;
-                case 96 /* NullKeyword */:
+                case 97 /* NullKeyword */:
                     return nullType;
-                case 132 /* NeverKeyword */:
+                case 133 /* NeverKeyword */:
                     return neverType;
-                case 136 /* ObjectKeyword */:
+                case 137 /* ObjectKeyword */:
                     return node.flags & 65536 /* JavaScriptFile */ ? anyType : nonPrimitiveType;
-                case 178 /* ThisType */:
-                case 100 /* ThisKeyword */:
+                case 179 /* ThisType */:
+                case 101 /* ThisKeyword */:
                     return getTypeFromThisTypeNode(node);
-                case 182 /* LiteralType */:
+                case 183 /* LiteralType */:
                     return getTypeFromLiteralTypeNode(node);
-                case 164 /* TypeReference */:
+                case 165 /* TypeReference */:
                     return getTypeFromTypeReference(node);
-                case 163 /* TypePredicate */:
+                case 164 /* TypePredicate */:
                     return booleanType;
-                case 211 /* ExpressionWithTypeArguments */:
+                case 212 /* ExpressionWithTypeArguments */:
                     return getTypeFromTypeReference(node);
-                case 167 /* TypeQuery */:
+                case 168 /* TypeQuery */:
                     return getTypeFromTypeQueryNode(node);
-                case 169 /* ArrayType */:
+                case 170 /* ArrayType */:
                     return getTypeFromArrayTypeNode(node);
-                case 170 /* TupleType */:
+                case 171 /* TupleType */:
                     return getTypeFromTupleTypeNode(node);
-                case 171 /* OptionalType */:
+                case 172 /* OptionalType */:
                     return getTypeFromOptionalTypeNode(node);
-                case 173 /* UnionType */:
+                case 174 /* UnionType */:
                     return getTypeFromUnionTypeNode(node);
-                case 174 /* IntersectionType */:
+                case 175 /* IntersectionType */:
                     return getTypeFromIntersectionTypeNode(node);
-                case 291 /* JSDocNullableType */:
+                case 292 /* JSDocNullableType */:
                     return getTypeFromJSDocNullableTypeNode(node);
-                case 293 /* JSDocOptionalType */:
+                case 294 /* JSDocOptionalType */:
                     return addOptionality(getTypeFromTypeNode(node.type));
-                case 177 /* ParenthesizedType */:
-                case 172 /* RestType */:
-                case 292 /* JSDocNonNullableType */:
-                case 288 /* JSDocTypeExpression */:
+                case 178 /* ParenthesizedType */:
+                case 173 /* RestType */:
+                case 293 /* JSDocNonNullableType */:
+                case 289 /* JSDocTypeExpression */:
                     return getTypeFromTypeNode(node.type);
-                case 295 /* JSDocVariadicType */:
+                case 296 /* JSDocVariadicType */:
                     return getTypeFromJSDocVariadicType(node);
-                case 165 /* FunctionType */:
-                case 166 /* ConstructorType */:
-                case 168 /* TypeLiteral */:
-                case 297 /* JSDocTypeLiteral */:
-                case 294 /* JSDocFunctionType */:
-                case 298 /* JSDocSignature */:
+                case 166 /* FunctionType */:
+                case 167 /* ConstructorType */:
+                case 169 /* TypeLiteral */:
+                case 298 /* JSDocTypeLiteral */:
+                case 295 /* JSDocFunctionType */:
+                case 299 /* JSDocSignature */:
                     return getTypeFromTypeLiteralOrFunctionOrConstructorTypeNode(node);
-                case 179 /* TypeOperator */:
+                case 180 /* TypeOperator */:
                     return getTypeFromTypeOperatorNode(node);
-                case 180 /* IndexedAccessType */:
+                case 181 /* IndexedAccessType */:
                     return getTypeFromIndexedAccessTypeNode(node);
-                case 181 /* MappedType */:
+                case 182 /* MappedType */:
                     return getTypeFromMappedTypeNode(node);
-                case 175 /* ConditionalType */:
+                case 176 /* ConditionalType */:
                     return getTypeFromConditionalTypeNode(node);
-                case 176 /* InferType */:
+                case 177 /* InferType */:
                     return getTypeFromInferTypeNode(node);
-                case 183 /* ImportType */:
+                case 184 /* ImportType */:
                     return getTypeFromImportTypeNode(node);
                 // This function assumes that an identifier or qualified name is a type expression
                 // Callers should first ensure this by calling isTypeNode
-                case 72 /* Identifier */:
-                case 148 /* QualifiedName */:
+                case 73 /* Identifier */:
+                case 149 /* QualifiedName */:
                     var symbol = getSymbolAtLocation(node);
                     return symbol ? getDeclaredTypeOfSymbol(symbol) : errorType;
                 default:
@@ -40965,33 +41805,8 @@ var ts;
          * Maps forward-references to later types parameters to the empty object type.
          * This is used during inference when instantiating type parameter defaults.
          */
-        function createBackreferenceMapper(typeParameters, index) {
-            return function (t) { return typeParameters.indexOf(t) >= index ? emptyObjectType : t; };
-        }
-        function isInferenceContext(mapper) {
-            return !!mapper.typeParameters;
-        }
-        function cloneTypeMapper(mapper, extraFlags) {
-            if (extraFlags === void 0) { extraFlags = 0; }
-            return mapper && isInferenceContext(mapper) ?
-                createInferenceContext(mapper.typeParameters, mapper.signature, mapper.flags | extraFlags, mapper.compareTypes, mapper.inferences) :
-                mapper;
-        }
-        function cloneInferredPartOfContext(context) {
-            // Filter context to only those parameters which actually have inference candidates
-            var params = [];
-            var inferences = [];
-            for (var i = 0; i < context.typeParameters.length; i++) {
-                var info = context.inferences[i];
-                if (info.candidates || info.contraCandidates) {
-                    params.push(context.typeParameters[i]);
-                    inferences.push(info);
-                }
-            }
-            if (!params.length) {
-                return undefined;
-            }
-            return createInferenceContext(params, context.signature, context.flags | 1 /* NoDefault */, context.compareTypes, inferences);
+        function createBackreferenceMapper(context, index) {
+            return function (t) { return ts.findIndex(context.inferences, function (info) { return info.typeParameter === t; }) >= index ? unknownType : t; };
         }
         function combineTypeMappers(mapper1, mapper2) {
             if (!mapper1)
@@ -41074,7 +41889,7 @@ var ts;
             }
             // Keep the flags from the symbol we're instantiating.  Mark that is instantiated, and
             // also transient so that we can just store data on it directly.
-            var result = createSymbol(symbol.flags, symbol.escapedName, 1 /* Instantiated */ | ts.getCheckFlags(symbol) & (8 /* Readonly */ | 2048 /* Late */ | 8192 /* OptionalParameter */ | 16384 /* RestParameter */));
+            var result = createSymbol(symbol.flags, symbol.escapedName, 1 /* Instantiated */ | ts.getCheckFlags(symbol) & (8 /* Readonly */ | 4096 /* Late */ | 16384 /* OptionalParameter */ | 32768 /* RestParameter */));
             result.declarations = symbol.declarations;
             result.parent = symbol.parent;
             result.target = symbol;
@@ -41140,28 +41955,31 @@ var ts;
             return type;
         }
         function maybeTypeParameterReference(node) {
-            return !(node.kind === 148 /* QualifiedName */ ||
-                node.parent.kind === 164 /* TypeReference */ && node.parent.typeArguments && node === node.parent.typeName);
+            return !(node.kind === 149 /* QualifiedName */ ||
+                node.parent.kind === 165 /* TypeReference */ && node.parent.typeArguments && node === node.parent.typeName);
         }
         function isTypeParameterPossiblyReferenced(tp, node) {
             // If the type parameter doesn't have exactly one declaration, if there are invening statement blocks
             // between the node and the type parameter declaration, if the node contains actual references to the
             // type parameter, or if the node contains type queries, we consider the type parameter possibly referenced.
             if (tp.symbol && tp.symbol.declarations && tp.symbol.declarations.length === 1) {
-                var container_3 = tp.symbol.declarations[0].parent;
-                if (ts.findAncestor(node, function (n) { return n.kind === 218 /* Block */ ? "quit" : n === container_3; })) {
-                    return !!ts.forEachChild(node, containsReference);
+                var container = tp.symbol.declarations[0].parent;
+                for (var n = node; n !== container; n = n.parent) {
+                    if (!n || n.kind === 219 /* Block */ || n.kind === 176 /* ConditionalType */ && ts.forEachChild(n.extendsType, containsReference)) {
+                        return true;
+                    }
                 }
+                return !!ts.forEachChild(node, containsReference);
             }
             return true;
             function containsReference(node) {
                 switch (node.kind) {
-                    case 178 /* ThisType */:
+                    case 179 /* ThisType */:
                         return !!tp.isThisType;
-                    case 72 /* Identifier */:
+                    case 73 /* Identifier */:
                         return !tp.isThisType && ts.isPartOfTypeNode(node) && maybeTypeParameterReference(node) &&
                             getTypeFromTypeNode(node) === tp;
-                    case 167 /* TypeQuery */:
+                    case 168 /* TypeQuery */:
                         return true;
                 }
                 return !!ts.forEachChild(node, containsReference);
@@ -41286,13 +42104,14 @@ var ts;
             if (!type || !mapper || mapper === identityMapper) {
                 return type;
             }
-            if (instantiationDepth === 50) {
+            if (instantiationDepth === 50 || instantiationCount >= 5000000) {
                 // We have reached 50 recursive type instantiations and there is a very high likelyhood we're dealing
                 // with a combination of infinite generic types that perpetually generate new type identities. We stop
                 // the recursion here by yielding the error type.
                 error(currentNode, ts.Diagnostics.Type_instantiation_is_excessively_deep_and_possibly_infinite);
                 return errorType;
             }
+            instantiationCount++;
             instantiationDepth++;
             var result = instantiateTypeWorker(type, mapper);
             instantiationDepth--;
@@ -41309,7 +42128,7 @@ var ts;
                     // If the anonymous type originates in a declaration of a function, method, class, or
                     // interface, in an object type literal, or in an object literal expression, we may need
                     // to instantiate the type because it might reference a type parameter.
-                    return type.symbol && type.symbol.flags & (16 /* Function */ | 8192 /* Method */ | 32 /* Class */ | 2048 /* TypeLiteral */ | 4096 /* ObjectLiteral */) && type.symbol.declarations ?
+                    return couldContainTypeVariables(type) ?
                         getAnonymousTypeInstantiation(type, mapper) : type;
                 }
                 if (objectFlags & 32 /* Mapped */) {
@@ -41347,7 +42166,11 @@ var ts;
                     return getSubstitutionType(maybeVariable, instantiateType(type.substitute, mapper));
                 }
                 else {
-                    return maybeVariable;
+                    var sub = instantiateType(type.substitute, mapper);
+                    if (sub.flags & 3 /* AnyOrUnknown */ || isTypeAssignableTo(getRestrictiveInstantiation(maybeVariable), getRestrictiveInstantiation(sub))) {
+                        return maybeVariable;
+                    }
+                    return sub;
                 }
             }
             return type;
@@ -41378,34 +42201,35 @@ var ts;
         // Returns true if the given expression contains (at any level of nesting) a function or arrow expression
         // that is subject to contextual typing.
         function isContextSensitive(node) {
-            ts.Debug.assert(node.kind !== 156 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 157 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
             switch (node.kind) {
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
-                case 156 /* MethodDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
+                case 157 /* MethodDeclaration */:
+                case 240 /* FunctionDeclaration */: // Function declarations can have context when annotated with a jsdoc @type
                     return isContextSensitiveFunctionLikeDeclaration(node);
-                case 188 /* ObjectLiteralExpression */:
+                case 189 /* ObjectLiteralExpression */:
                     return ts.some(node.properties, isContextSensitive);
-                case 187 /* ArrayLiteralExpression */:
+                case 188 /* ArrayLiteralExpression */:
                     return ts.some(node.elements, isContextSensitive);
-                case 205 /* ConditionalExpression */:
+                case 206 /* ConditionalExpression */:
                     return isContextSensitive(node.whenTrue) ||
                         isContextSensitive(node.whenFalse);
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return node.operatorToken.kind === 55 /* BarBarToken */ &&
                         (isContextSensitive(node.left) || isContextSensitive(node.right));
-                case 275 /* PropertyAssignment */:
+                case 276 /* PropertyAssignment */:
                     return isContextSensitive(node.initializer);
-                case 195 /* ParenthesizedExpression */:
+                case 196 /* ParenthesizedExpression */:
                     return isContextSensitive(node.expression);
-                case 268 /* JsxAttributes */:
+                case 269 /* JsxAttributes */:
                     return ts.some(node.properties, isContextSensitive) || ts.isJsxOpeningElement(node.parent) && ts.some(node.parent.parent.children, isContextSensitive);
-                case 267 /* JsxAttribute */: {
+                case 268 /* JsxAttribute */: {
                     // If there is no initializer, JSX attribute has a boolean value of true which is not context sensitive.
                     var initializer = node.initializer;
                     return !!initializer && isContextSensitive(initializer);
                 }
-                case 270 /* JsxExpression */: {
+                case 271 /* JsxExpression */: {
                     // It is possible to that node.expression is undefined (e.g <div x={} />)
                     var expression = node.expression;
                     return !!expression && isContextSensitive(expression);
@@ -41414,6 +42238,9 @@ var ts;
             return false;
         }
         function isContextSensitiveFunctionLikeDeclaration(node) {
+            if (ts.isFunctionDeclaration(node) && (!ts.isInJSFile(node) || !getTypeForDeclarationFromJSDocComment(node))) {
+                return false;
+            }
             // Functions with type parameters are not context sensitive.
             if (node.typeParameters) {
                 return false;
@@ -41422,7 +42249,7 @@ var ts;
             if (ts.some(node.parameters, function (p) { return !ts.getEffectiveTypeAnnotationNode(p); })) {
                 return true;
             }
-            if (node.kind !== 197 /* ArrowFunction */) {
+            if (node.kind !== 198 /* ArrowFunction */) {
                 // If the first parameter is not an explicit 'this' parameter, then the function has
                 // an implicit 'this' parameter which is subject to contextual typing.
                 var parameter = ts.firstOrUndefined(node.parameters);
@@ -41434,7 +42261,7 @@ var ts;
         }
         function hasContextSensitiveReturnExpression(node) {
             // TODO(anhans): A block should be context-sensitive if it has a context-sensitive return value.
-            return !!node.body && node.body.kind !== 218 /* Block */ && isContextSensitive(node.body);
+            return !!node.body && node.body.kind !== 219 /* Block */ && isContextSensitive(node.body);
         }
         function isContextSensitiveFunctionOrObjectLiteralMethod(func) {
             return (ts.isInJSFile(func) && ts.isFunctionDeclaration(func) || isFunctionExpressionOrArrowFunction(func) || ts.isObjectLiteralMethod(func)) &&
@@ -41487,7 +42314,7 @@ var ts;
         function isTypeDerivedFrom(source, target) {
             return source.flags & 1048576 /* Union */ ? ts.every(source.types, function (t) { return isTypeDerivedFrom(t, target); }) :
                 target.flags & 1048576 /* Union */ ? ts.some(target.types, function (t) { return isTypeDerivedFrom(source, t); }) :
-                    source.flags & 58982400 /* InstantiableNonPrimitive */ ? isTypeDerivedFrom(getBaseConstraintOfType(source) || emptyObjectType, target) :
+                    source.flags & 58982400 /* InstantiableNonPrimitive */ ? isTypeDerivedFrom(getBaseConstraintOfType(source) || unknownType, target) :
                         target === globalObjectType ? !!(source.flags & (524288 /* Object */ | 67108864 /* NonPrimitive */)) :
                             target === globalFunctionType ? !!(source.flags & 524288 /* Object */) && isFunctionObjectType(source) :
                                 hasBaseType(source, getTargetType(target));
@@ -41516,48 +42343,49 @@ var ts;
          * attempt to issue more specific errors on, for example, specific object literal properties or tuple members.
          */
         function checkTypeAssignableToAndOptionallyElaborate(source, target, errorNode, expr, headMessage, containingMessageChain) {
-            return checkTypeRelatedToAndOptionallyElaborate(source, target, assignableRelation, errorNode, expr, headMessage, containingMessageChain);
+            return checkTypeRelatedToAndOptionallyElaborate(source, target, assignableRelation, errorNode, expr, headMessage, containingMessageChain, /*errorOutputContainer*/ undefined);
         }
-        function checkTypeRelatedToAndOptionallyElaborate(source, target, relation, errorNode, expr, headMessage, containingMessageChain) {
+        function checkTypeRelatedToAndOptionallyElaborate(source, target, relation, errorNode, expr, headMessage, containingMessageChain, errorOutputContainer) {
             if (isTypeRelatedTo(source, target, relation))
                 return true;
-            if (!errorNode || !elaborateError(expr, source, target, relation, headMessage)) {
-                return checkTypeRelatedTo(source, target, relation, errorNode, headMessage, containingMessageChain);
+            if (!errorNode || !elaborateError(expr, source, target, relation, headMessage, containingMessageChain, errorOutputContainer)) {
+                return checkTypeRelatedTo(source, target, relation, errorNode, headMessage, containingMessageChain, errorOutputContainer);
             }
             return false;
         }
         function isOrHasGenericConditional(type) {
             return !!(type.flags & 16777216 /* Conditional */ || (type.flags & 2097152 /* Intersection */ && ts.some(type.types, isOrHasGenericConditional)));
         }
-        function elaborateError(node, source, target, relation, headMessage) {
+        function elaborateError(node, source, target, relation, headMessage, containingMessageChain, errorOutputContainer) {
             if (!node || isOrHasGenericConditional(target))
                 return false;
-            if (!checkTypeRelatedTo(source, target, relation, /*errorNode*/ undefined) && elaborateDidYouMeanToCallOrConstruct(node, source, target, relation, headMessage)) {
+            if (!checkTypeRelatedTo(source, target, relation, /*errorNode*/ undefined)
+                && elaborateDidYouMeanToCallOrConstruct(node, source, target, relation, headMessage, containingMessageChain, errorOutputContainer)) {
                 return true;
             }
             switch (node.kind) {
-                case 270 /* JsxExpression */:
-                case 195 /* ParenthesizedExpression */:
-                    return elaborateError(node.expression, source, target, relation, headMessage);
-                case 204 /* BinaryExpression */:
+                case 271 /* JsxExpression */:
+                case 196 /* ParenthesizedExpression */:
+                    return elaborateError(node.expression, source, target, relation, headMessage, containingMessageChain, errorOutputContainer);
+                case 205 /* BinaryExpression */:
                     switch (node.operatorToken.kind) {
-                        case 59 /* EqualsToken */:
+                        case 60 /* EqualsToken */:
                         case 27 /* CommaToken */:
-                            return elaborateError(node.right, source, target, relation, headMessage);
+                            return elaborateError(node.right, source, target, relation, headMessage, containingMessageChain, errorOutputContainer);
                     }
                     break;
-                case 188 /* ObjectLiteralExpression */:
-                    return elaborateObjectLiteral(node, source, target, relation);
-                case 187 /* ArrayLiteralExpression */:
-                    return elaborateArrayLiteral(node, source, target, relation);
-                case 268 /* JsxAttributes */:
-                    return elaborateJsxComponents(node, source, target, relation);
-                case 197 /* ArrowFunction */:
-                    return elaborateArrowFunction(node, source, target, relation);
+                case 189 /* ObjectLiteralExpression */:
+                    return elaborateObjectLiteral(node, source, target, relation, containingMessageChain, errorOutputContainer);
+                case 188 /* ArrayLiteralExpression */:
+                    return elaborateArrayLiteral(node, source, target, relation, containingMessageChain, errorOutputContainer);
+                case 269 /* JsxAttributes */:
+                    return elaborateJsxComponents(node, source, target, relation, containingMessageChain, errorOutputContainer);
+                case 198 /* ArrowFunction */:
+                    return elaborateArrowFunction(node, source, target, relation, containingMessageChain, errorOutputContainer);
             }
             return false;
         }
-        function elaborateDidYouMeanToCallOrConstruct(node, source, target, relation, headMessage) {
+        function elaborateDidYouMeanToCallOrConstruct(node, source, target, relation, headMessage, containingMessageChain, errorOutputContainer) {
             var callSignatures = getSignaturesOfType(source, 0 /* Call */);
             var constructSignatures = getSignaturesOfType(source, 1 /* Construct */);
             for (var _i = 0, _a = [constructSignatures, callSignatures]; _i < _a.length; _i++) {
@@ -41566,16 +42394,16 @@ var ts;
                     var returnType = getReturnTypeOfSignature(s);
                     return !(returnType.flags & (1 /* Any */ | 131072 /* Never */)) && checkTypeRelatedTo(returnType, target, relation, /*errorNode*/ undefined);
                 })) {
-                    var resultObj = {};
-                    checkTypeAssignableTo(source, target, node, headMessage, /*containingChain*/ undefined, resultObj);
-                    var diagnostic = resultObj.error;
-                    addRelatedInfo(diagnostic, ts.createDiagnosticForNode(node, signatures === constructSignatures ? ts.Diagnostics.Did_you_mean_to_use_new_with_this_expression : ts.Diagnostics.Did_you_mean_to_call_this_expression));
+                    var resultObj = errorOutputContainer || {};
+                    checkTypeAssignableTo(source, target, node, headMessage, containingMessageChain, resultObj);
+                    var diagnostic = resultObj.errors[resultObj.errors.length - 1];
+                    ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(node, signatures === constructSignatures ? ts.Diagnostics.Did_you_mean_to_use_new_with_this_expression : ts.Diagnostics.Did_you_mean_to_call_this_expression));
                     return true;
                 }
             }
             return false;
         }
-        function elaborateArrowFunction(node, source, target, relation) {
+        function elaborateArrowFunction(node, source, target, relation, containingMessageChain, errorOutputContainer) {
             // Don't elaborate blocks
             if (ts.isBlock(node.body)) {
                 return false;
@@ -41596,15 +42424,15 @@ var ts;
             var sourceReturn = getReturnTypeOfSignature(sourceSig);
             var targetReturn = getUnionType(ts.map(targetSignatures, getReturnTypeOfSignature));
             if (!checkTypeRelatedTo(sourceReturn, targetReturn, relation, /*errorNode*/ undefined)) {
-                var elaborated = returnExpression && elaborateError(returnExpression, sourceReturn, targetReturn, relation, /*headMessage*/ undefined);
+                var elaborated = returnExpression && elaborateError(returnExpression, sourceReturn, targetReturn, relation, /*headMessage*/ undefined, containingMessageChain, errorOutputContainer);
                 if (elaborated) {
                     return elaborated;
                 }
-                var resultObj = {};
-                checkTypeRelatedTo(sourceReturn, targetReturn, relation, returnExpression, /*message*/ undefined, /*chain*/ undefined, resultObj);
-                if (resultObj.error) {
+                var resultObj = errorOutputContainer || {};
+                checkTypeRelatedTo(sourceReturn, targetReturn, relation, returnExpression, /*message*/ undefined, containingMessageChain, resultObj);
+                if (resultObj.errors) {
                     if (target.symbol && ts.length(target.symbol.declarations)) {
-                        addRelatedInfo(resultObj.error, ts.createDiagnosticForNode(target.symbol.declarations[0], ts.Diagnostics.The_expected_type_comes_from_the_return_type_of_this_signature));
+                        ts.addRelatedInfo(resultObj.errors[resultObj.errors.length - 1], ts.createDiagnosticForNode(target.symbol.declarations[0], ts.Diagnostics.The_expected_type_comes_from_the_return_type_of_this_signature));
                     }
                     return true;
                 }
@@ -41616,32 +42444,32 @@ var ts;
          * If that element would issue an error, we first attempt to dive into that element's inner expression and issue a more specific error by recuring into `elaborateError`
          * Otherwise, we issue an error on _every_ element which fail the assignability check
          */
-        function elaborateElementwise(iterator, source, target, relation) {
+        function elaborateElementwise(iterator, source, target, relation, containingMessageChain, errorOutputContainer) {
             // Assignability failure - check each prop individually, and if that fails, fall back on the bad error span
             var reportedError = false;
             for (var status = iterator.next(); !status.done; status = iterator.next()) {
                 var _a = status.value, prop = _a.errorNode, next = _a.innerExpression, nameType = _a.nameType, errorMessage = _a.errorMessage;
-                var targetPropType = getIndexedAccessType(target, nameType, /*accessNode*/ undefined, errorType);
-                if (targetPropType === errorType || targetPropType.flags & 8388608 /* IndexedAccess */)
+                var targetPropType = getIndexedAccessTypeOrUndefined(target, nameType);
+                if (!targetPropType || targetPropType.flags & 8388608 /* IndexedAccess */)
                     continue; // Don't elaborate on indexes on generic variables
-                var sourcePropType = getIndexedAccessType(source, nameType, /*accessNode*/ undefined, errorType);
-                if (sourcePropType !== errorType && targetPropType !== errorType && !checkTypeRelatedTo(sourcePropType, targetPropType, relation, /*errorNode*/ undefined)) {
-                    var elaborated = next && elaborateError(next, sourcePropType, targetPropType, relation, /*headMessage*/ undefined);
+                var sourcePropType = getIndexedAccessTypeOrUndefined(source, nameType);
+                if (sourcePropType && !checkTypeRelatedTo(sourcePropType, targetPropType, relation, /*errorNode*/ undefined)) {
+                    var elaborated = next && elaborateError(next, sourcePropType, targetPropType, relation, /*headMessage*/ undefined, containingMessageChain, errorOutputContainer);
                     if (elaborated) {
                         reportedError = true;
                     }
                     else {
                         // Issue error on the prop itself, since the prop couldn't elaborate the error
-                        var resultObj = {};
+                        var resultObj = errorOutputContainer || {};
                         // Use the expression type, if available
                         var specificSource = next ? checkExpressionForMutableLocation(next, 0 /* Normal */, sourcePropType) : sourcePropType;
-                        var result = checkTypeRelatedTo(specificSource, targetPropType, relation, prop, errorMessage, /*containingChain*/ undefined, resultObj);
+                        var result = checkTypeRelatedTo(specificSource, targetPropType, relation, prop, errorMessage, containingMessageChain, resultObj);
                         if (result && specificSource !== sourcePropType) {
                             // If for whatever reason the expression type doesn't yield an error, make sure we still issue an error on the sourcePropType
-                            checkTypeRelatedTo(sourcePropType, targetPropType, relation, prop, errorMessage, /*containingChain*/ undefined, resultObj);
+                            checkTypeRelatedTo(sourcePropType, targetPropType, relation, prop, errorMessage, containingMessageChain, resultObj);
                         }
-                        if (resultObj.error) {
-                            var reportedDiag = resultObj.error;
+                        if (resultObj.errors) {
+                            var reportedDiag = resultObj.errors[resultObj.errors.length - 1];
                             var propertyName = isTypeUsableAsPropertyName(nameType) ? getPropertyNameFromType(nameType) : undefined;
                             var targetProp = propertyName !== undefined ? getPropertyOfType(target, propertyName) : undefined;
                             var issuedElaboration = false;
@@ -41651,13 +42479,13 @@ var ts;
                                     undefined;
                                 if (indexInfo && indexInfo.declaration && !ts.getSourceFileOfNode(indexInfo.declaration).hasNoDefaultLib) {
                                     issuedElaboration = true;
-                                    addRelatedInfo(reportedDiag, ts.createDiagnosticForNode(indexInfo.declaration, ts.Diagnostics.The_expected_type_comes_from_this_index_signature));
+                                    ts.addRelatedInfo(reportedDiag, ts.createDiagnosticForNode(indexInfo.declaration, ts.Diagnostics.The_expected_type_comes_from_this_index_signature));
                                 }
                             }
                             if (!issuedElaboration && (targetProp && ts.length(targetProp.declarations) || target.symbol && ts.length(target.symbol.declarations))) {
                                 var targetNode = targetProp && ts.length(targetProp.declarations) ? targetProp.declarations[0] : target.symbol.declarations[0];
                                 if (!ts.getSourceFileOfNode(targetNode).hasNoDefaultLib) {
-                                    addRelatedInfo(reportedDiag, ts.createDiagnosticForNode(targetNode, ts.Diagnostics.The_expected_type_comes_from_property_0_which_is_declared_here_on_type_1, propertyName && !(nameType.flags & 8192 /* UniqueESSymbol */) ? ts.unescapeLeadingUnderscores(propertyName) : typeToString(nameType), typeToString(target)));
+                                    ts.addRelatedInfo(reportedDiag, ts.createDiagnosticForNode(targetNode, ts.Diagnostics.The_expected_type_comes_from_property_0_which_is_declared_here_on_type_1, propertyName && !(nameType.flags & 8192 /* UniqueESSymbol */) ? ts.unescapeLeadingUnderscores(propertyName) : typeToString(nameType), typeToString(target)));
                                 }
                             }
                         }
@@ -41724,26 +42552,29 @@ var ts;
         }
         function getElaborationElementForJsxChild(child, nameType, getInvalidTextDiagnostic) {
             switch (child.kind) {
-                case 270 /* JsxExpression */:
+                case 271 /* JsxExpression */:
                     // child is of the type of the expression
                     return { errorNode: child, innerExpression: child.expression, nameType: nameType };
                 case 11 /* JsxText */:
-                    if (child.containsOnlyWhiteSpaces) {
+                    if (child.containsOnlyTriviaWhiteSpaces) {
                         break; // Whitespace only jsx text isn't real jsx text
                     }
                     // child is a string
                     return { errorNode: child, innerExpression: undefined, nameType: nameType, errorMessage: getInvalidTextDiagnostic() };
-                case 260 /* JsxElement */:
-                case 261 /* JsxSelfClosingElement */:
-                case 264 /* JsxFragment */:
+                case 261 /* JsxElement */:
+                case 262 /* JsxSelfClosingElement */:
+                case 265 /* JsxFragment */:
                     // child is of type JSX.Element
                     return { errorNode: child, innerExpression: child, nameType: nameType };
                 default:
                     return ts.Debug.assertNever(child, "Found invalid jsx child");
             }
         }
-        function elaborateJsxComponents(node, source, target, relation) {
-            var result = elaborateElementwise(generateJsxAttributes(node), source, target, relation);
+        function getSemanticJsxChildren(children) {
+            return ts.filter(children, function (i) { return !ts.isJsxText(i) || !i.containsOnlyTriviaWhiteSpaces; });
+        }
+        function elaborateJsxComponents(node, source, target, relation, containingMessageChain, errorOutputContainer) {
+            var result = elaborateElementwise(generateJsxAttributes(node), source, target, relation, containingMessageChain, errorOutputContainer);
             var invalidTextDiagnostic;
             if (ts.isJsxOpeningElement(node.parent) && ts.isJsxElement(node.parent.parent)) {
                 var containingElement = node.parent.parent;
@@ -41751,7 +42582,7 @@ var ts;
                 var childrenPropName = childPropName === undefined ? "children" : ts.unescapeLeadingUnderscores(childPropName);
                 var childrenNameType = getLiteralType(childrenPropName);
                 var childrenTargetType = getIndexedAccessType(target, childrenNameType);
-                var validChildren = ts.filter(containingElement.children, function (i) { return !ts.isJsxText(i) || !i.containsOnlyWhiteSpaces; });
+                var validChildren = getSemanticJsxChildren(containingElement.children);
                 if (!ts.length(validChildren)) {
                     return result;
                 }
@@ -41761,12 +42592,16 @@ var ts;
                 if (moreThanOneRealChildren) {
                     if (arrayLikeTargetParts !== neverType) {
                         var realSource = createTupleType(checkJsxChildren(containingElement, 0 /* Normal */));
-                        result = elaborateElementwise(generateJsxChildren(containingElement, getInvalidTextualChildDiagnostic), realSource, arrayLikeTargetParts, relation) || result;
+                        var children = generateJsxChildren(containingElement, getInvalidTextualChildDiagnostic);
+                        result = elaborateElementwise(children, realSource, arrayLikeTargetParts, relation, containingMessageChain, errorOutputContainer) || result;
                     }
                     else if (!isTypeRelatedTo(getIndexedAccessType(source, childrenNameType), childrenTargetType, relation)) {
                         // arity mismatch
                         result = true;
-                        error(containingElement.openingElement.tagName, ts.Diagnostics.This_JSX_tag_s_0_prop_expects_a_single_child_of_type_1_but_multiple_children_were_provided, childrenPropName, typeToString(childrenTargetType));
+                        var diag = error(containingElement.openingElement.tagName, ts.Diagnostics.This_JSX_tag_s_0_prop_expects_a_single_child_of_type_1_but_multiple_children_were_provided, childrenPropName, typeToString(childrenTargetType));
+                        if (errorOutputContainer && errorOutputContainer.skipLogging) {
+                            (errorOutputContainer.errors || (errorOutputContainer.errors = [])).push(diag);
+                        }
                     }
                 }
                 else {
@@ -41781,13 +42616,16 @@ var ts;
                                         _a.sent();
                                         return [2 /*return*/];
                                 }
-                            }); })(), source, target, relation) || result;
+                            }); })(), source, target, relation, containingMessageChain, errorOutputContainer) || result;
                         }
                     }
                     else if (!isTypeRelatedTo(getIndexedAccessType(source, childrenNameType), childrenTargetType, relation)) {
                         // arity mismatch
                         result = true;
-                        error(containingElement.openingElement.tagName, ts.Diagnostics.This_JSX_tag_s_0_prop_expects_type_1_which_requires_multiple_children_but_only_a_single_child_was_provided, childrenPropName, typeToString(childrenTargetType));
+                        var diag = error(containingElement.openingElement.tagName, ts.Diagnostics.This_JSX_tag_s_0_prop_expects_type_1_which_requires_multiple_children_but_only_a_single_child_was_provided, childrenPropName, typeToString(childrenTargetType));
+                        if (errorOutputContainer && errorOutputContainer.skipLogging) {
+                            (errorOutputContainer.errors || (errorOutputContainer.errors = [])).push(diag);
+                        }
                     }
                 }
             }
@@ -41834,14 +42672,16 @@ var ts;
                 }
             });
         }
-        function elaborateArrayLiteral(node, source, target, relation) {
+        function elaborateArrayLiteral(node, source, target, relation, containingMessageChain, errorOutputContainer) {
+            if (target.flags & 131068 /* Primitive */)
+                return false;
             if (isTupleLikeType(source)) {
-                return elaborateElementwise(generateLimitedTupleElements(node, target), source, target, relation);
+                return elaborateElementwise(generateLimitedTupleElements(node, target), source, target, relation, containingMessageChain, errorOutputContainer);
             }
             // recreate a tuple from the elements, if possible
             var tupleizedType = checkArrayLiteral(node, 1 /* Contextual */, /*forceTuple*/ true);
             if (isTupleLikeType(tupleizedType)) {
-                return elaborateElementwise(generateLimitedTupleElements(node, target), tupleizedType, target, relation);
+                return elaborateElementwise(generateLimitedTupleElements(node, target), tupleizedType, target, relation, containingMessageChain, errorOutputContainer);
             }
             return false;
         }
@@ -41865,11 +42705,11 @@ var ts;
                         }
                         _b = prop.kind;
                         switch (_b) {
-                            case 159 /* SetAccessor */: return [3 /*break*/, 2];
-                            case 158 /* GetAccessor */: return [3 /*break*/, 2];
-                            case 156 /* MethodDeclaration */: return [3 /*break*/, 2];
-                            case 276 /* ShorthandPropertyAssignment */: return [3 /*break*/, 2];
-                            case 275 /* PropertyAssignment */: return [3 /*break*/, 4];
+                            case 160 /* SetAccessor */: return [3 /*break*/, 2];
+                            case 159 /* GetAccessor */: return [3 /*break*/, 2];
+                            case 157 /* MethodDeclaration */: return [3 /*break*/, 2];
+                            case 277 /* ShorthandPropertyAssignment */: return [3 /*break*/, 2];
+                            case 276 /* PropertyAssignment */: return [3 /*break*/, 4];
                         }
                         return [3 /*break*/, 6];
                     case 2: return [4 /*yield*/, { errorNode: prop.name, innerExpression: undefined, nameType: type }];
@@ -41890,8 +42730,10 @@ var ts;
                 }
             });
         }
-        function elaborateObjectLiteral(node, source, target, relation) {
-            return elaborateElementwise(generateObjectLiteralElements(node), source, target, relation);
+        function elaborateObjectLiteral(node, source, target, relation, containingMessageChain, errorOutputContainer) {
+            if (target.flags & 131068 /* Primitive */)
+                return false;
+            return elaborateElementwise(generateObjectLiteralElements(node), source, target, relation, containingMessageChain, errorOutputContainer);
         }
         /**
          * This is *not* a bi-directional relationship.
@@ -41904,6 +42746,14 @@ var ts;
             return compareSignaturesRelated(source, target, 0 /* None */, ignoreReturnTypes, /*reportErrors*/ false, 
             /*errorReporter*/ undefined, compareTypesAssignable) !== 0 /* False */;
         }
+        /**
+         * Returns true if `s` is `(...args: any[]) => any` or `(this: any, ...args: any[]) => any`
+         */
+        function isAnySignature(s) {
+            return !s.typeParameters && (!s.thisParameter || isTypeAny(getTypeOfParameter(s.thisParameter))) && s.parameters.length === 1 &&
+                s.hasRestParameter && (getTypeOfParameter(s.parameters[0]) === anyArrayType || isTypeAny(getTypeOfParameter(s.parameters[0]))) &&
+                isTypeAny(getReturnTypeOfSignature(s));
+        }
         /**
          * See signatureRelatedTo, compareSignaturesIdentical
          */
@@ -41912,13 +42762,16 @@ var ts;
             if (source === target) {
                 return -1 /* True */;
             }
+            if (isAnySignature(target)) {
+                return -1 /* True */;
+            }
             var targetCount = getParameterCount(target);
             if (!hasEffectiveRestParameter(target) && getMinArgumentCount(source) > targetCount) {
                 return 0 /* False */;
             }
             if (source.typeParameters && source.typeParameters !== target.typeParameters) {
                 target = getCanonicalSignature(target);
-                source = instantiateSignatureInContextOf(source, target, /*contextualMapper*/ undefined, compareTypes);
+                source = instantiateSignatureInContextOf(source, target, /*inferenceContext*/ undefined, compareTypes);
             }
             var sourceCount = getParameterCount(source);
             var sourceRestType = getNonArrayRestType(source);
@@ -41928,8 +42781,8 @@ var ts;
                 return 0 /* False */;
             }
             var kind = target.declaration ? target.declaration.kind : 0 /* Unknown */;
-            var strictVariance = !callbackCheck && strictFunctionTypes && kind !== 156 /* MethodDeclaration */ &&
-                kind !== 155 /* MethodSignature */ && kind !== 157 /* Constructor */;
+            var strictVariance = !callbackCheck && strictFunctionTypes && kind !== 157 /* MethodDeclaration */ &&
+                kind !== 156 /* MethodSignature */ && kind !== 158 /* Constructor */;
             var result = -1 /* True */;
             var sourceThisType = getThisTypeOfSignature(source);
             if (sourceThisType && sourceThisType !== voidType) {
@@ -41977,19 +42830,21 @@ var ts;
                 result &= related;
             }
             if (!ignoreReturnTypes) {
-                var targetReturnType = (target.declaration && isJSConstructor(target.declaration)) ?
+                // If a signature reolution is already in-flight, skip issuing a circularity error
+                // here and just use the `any` type directly
+                var targetReturnType = isResolvingReturnTypeOfSignature(target) ? anyType : (target.declaration && isJSConstructor(target.declaration)) ?
                     getJSClassType(target.declaration.symbol) : getReturnTypeOfSignature(target);
                 if (targetReturnType === voidType) {
                     return result;
                 }
-                var sourceReturnType = (source.declaration && isJSConstructor(source.declaration)) ?
+                var sourceReturnType = isResolvingReturnTypeOfSignature(source) ? anyType : (source.declaration && isJSConstructor(source.declaration)) ?
                     getJSClassType(source.declaration.symbol) : getReturnTypeOfSignature(source);
                 // The following block preserves behavior forbidding boolean returning functions from being assignable to type guard returning functions
                 var targetTypePredicate = getTypePredicateOfSignature(target);
                 if (targetTypePredicate) {
                     var sourceTypePredicate = getTypePredicateOfSignature(source);
                     if (sourceTypePredicate) {
-                        result &= compareTypePredicateRelatedTo(sourceTypePredicate, targetTypePredicate, source.declaration, target.declaration, reportErrors, errorReporter, compareTypes); // TODO: GH#18217
+                        result &= compareTypePredicateRelatedTo(sourceTypePredicate, targetTypePredicate, reportErrors, errorReporter, compareTypes);
                     }
                     else if (ts.isIdentifierTypePredicate(targetTypePredicate)) {
                         if (reportErrors) {
@@ -42008,7 +42863,7 @@ var ts;
             }
             return result;
         }
-        function compareTypePredicateRelatedTo(source, target, sourceDeclaration, targetDeclaration, reportErrors, errorReporter, compareTypes) {
+        function compareTypePredicateRelatedTo(source, target, reportErrors, errorReporter, compareTypes) {
             if (source.kind !== target.kind) {
                 if (reportErrors) {
                     errorReporter(ts.Diagnostics.A_this_based_type_guard_is_not_compatible_with_a_parameter_based_type_guard);
@@ -42017,12 +42872,9 @@ var ts;
                 return 0 /* False */;
             }
             if (source.kind === 1 /* Identifier */) {
-                var targetPredicate = target;
-                var sourceIndex = source.parameterIndex - (ts.getThisParameter(sourceDeclaration) ? 1 : 0);
-                var targetIndex = targetPredicate.parameterIndex - (ts.getThisParameter(targetDeclaration) ? 1 : 0);
-                if (sourceIndex !== targetIndex) {
+                if (source.parameterIndex !== target.parameterIndex) {
                     if (reportErrors) {
-                        errorReporter(ts.Diagnostics.Parameter_0_is_not_in_the_same_position_as_parameter_1, source.parameterName, targetPredicate.parameterName);
+                        errorReporter(ts.Diagnostics.Parameter_0_is_not_in_the_same_position_as_parameter_1, source.parameterName, target.parameterName);
                         errorReporter(ts.Diagnostics.Type_predicate_0_is_not_assignable_to_1, typePredicateToString(source), typePredicateToString(target));
                     }
                     return 0 /* False */;
@@ -42064,6 +42916,11 @@ var ts;
         function isEmptyAnonymousObjectType(type) {
             return !!(ts.getObjectFlags(type) & 16 /* Anonymous */) && isEmptyObjectType(type);
         }
+        function isStringIndexSignatureOnlyType(type) {
+            return type.flags & 524288 /* Object */ && !isGenericMappedType(type) && getPropertiesOfType(type).length === 0 && getIndexInfoOfType(type, 0 /* String */) && !getIndexInfoOfType(type, 1 /* Number */) ||
+                type.flags & 3145728 /* UnionOrIntersection */ && ts.every(type.types, isStringIndexSignatureOnlyType) ||
+                false;
+        }
         function isEnumTypeRelatedTo(sourceSymbol, targetSymbol, errorReporter) {
             if (sourceSymbol === targetSymbol) {
                 return true;
@@ -42172,8 +43029,8 @@ var ts;
             }
             return false;
         }
-        function isIgnoredJsxProperty(source, sourceProp, targetMemberType) {
-            return ts.getObjectFlags(source) & 4096 /* JsxAttributes */ && !(isUnhyphenatedJsxName(sourceProp.escapedName) || targetMemberType);
+        function isIgnoredJsxProperty(source, sourceProp) {
+            return ts.getObjectFlags(source) & 4096 /* JsxAttributes */ && !isUnhyphenatedJsxName(sourceProp.escapedName);
         }
         /**
          * Checks if 'source' is related to 'target' (e.g.: is a assignable to).
@@ -42184,6 +43041,7 @@ var ts;
          * @param errorNode The suggested node upon which all errors will be reported, if defined. This may or may not be the actual node used.
          * @param headMessage If the error chain should be prepended by a head message, then headMessage will be used.
          * @param containingMessageChain A chain of errors to prepend any new errors found.
+         * @param errorOutputContainer Return the diagnostic. Do not log if 'skipLogging' is truthy.
          */
         function checkTypeRelatedTo(source, target, relation, errorNode, headMessage, containingMessageChain, errorOutputContainer) {
             var errorInfo;
@@ -42195,17 +43053,21 @@ var ts;
             var depth = 0;
             var expandingFlags = 0 /* None */;
             var overflow = false;
-            var suppressNextError = false;
+            var overrideNextErrorInfo;
             ts.Debug.assert(relation !== identityRelation || !errorNode, "no error reporting in identity checking");
             var result = isRelatedTo(source, target, /*reportErrors*/ !!errorNode, headMessage);
             if (overflow) {
-                error(errorNode, ts.Diagnostics.Excessive_stack_depth_comparing_types_0_and_1, typeToString(source), typeToString(target));
+                var diag = error(errorNode, ts.Diagnostics.Excessive_stack_depth_comparing_types_0_and_1, typeToString(source), typeToString(target));
+                if (errorOutputContainer) {
+                    (errorOutputContainer.errors || (errorOutputContainer.errors = [])).push(diag);
+                }
             }
             else if (errorInfo) {
                 if (containingMessageChain) {
-                    var chain_1 = containingMessageChain();
-                    if (chain_1) {
-                        errorInfo = ts.concatenateDiagnosticMessageChains(chain_1, errorInfo);
+                    var chain = containingMessageChain();
+                    if (chain) {
+                        ts.concatenateDiagnosticMessageChains(chain, errorInfo);
+                        errorInfo = chain;
                     }
                 }
                 var relatedInformation = void 0;
@@ -42223,12 +43085,17 @@ var ts;
                 }
                 var diag = ts.createDiagnosticForNodeFromMessageChain(errorNode, errorInfo, relatedInformation);
                 if (relatedInfo) {
-                    addRelatedInfo.apply(void 0, [diag].concat(relatedInfo));
+                    ts.addRelatedInfo.apply(void 0, [diag].concat(relatedInfo));
                 }
                 if (errorOutputContainer) {
-                    errorOutputContainer.error = diag;
+                    (errorOutputContainer.errors || (errorOutputContainer.errors = [])).push(diag);
                 }
-                diagnostics.add(diag); // TODO: GH#18217
+                if (!errorOutputContainer || !errorOutputContainer.skipLogging) {
+                    diagnostics.add(diag);
+                }
+            }
+            if (errorNode && errorOutputContainer && errorOutputContainer.skipLogging && result === 0 /* False */) {
+                ts.Debug.assert(!!errorOutputContainer.errors, "missed opportunity to interact with error.");
             }
             return result !== 0 /* False */;
             function reportError(message, arg0, arg1, arg2, arg3) {
@@ -42245,11 +43112,9 @@ var ts;
                 }
             }
             function reportRelationError(message, source, target) {
-                var sourceType = typeToString(source);
-                var targetType = typeToString(target);
-                if (sourceType === targetType) {
-                    sourceType = typeToString(source, /*enclosingDeclaration*/ undefined, 64 /* UseFullyQualifiedType */);
-                    targetType = typeToString(target, /*enclosingDeclaration*/ undefined, 64 /* UseFullyQualifiedType */);
+                var _a = getTypeNamesForErrorDisplay(source, target), sourceType = _a[0], targetType = _a[1];
+                if (target.flags & 262144 /* TypeParameter */ && target.immediateBaseConstraint !== undefined && isTypeAssignableTo(source, target.immediateBaseConstraint)) {
+                    reportError(ts.Diagnostics._0_is_assignable_to_the_constraint_of_type_1_but_1_could_be_instantiated_with_a_different_subtype_of_constraint_2, sourceType, targetType, typeToString(target.immediateBaseConstraint));
                 }
                 if (!message) {
                     if (relation === comparableRelation) {
@@ -42274,24 +43139,38 @@ var ts;
                     reportError(ts.Diagnostics._0_is_a_primitive_but_1_is_a_wrapper_object_Prefer_using_0_when_possible, targetType, sourceType);
                 }
             }
-            function isUnionOrIntersectionTypeWithoutNullableConstituents(type) {
-                if (!(type.flags & 3145728 /* UnionOrIntersection */)) {
+            /**
+             * Try and elaborate array and tuple errors. Returns false
+             * if we have found an elaboration, or we should ignore
+             * any other elaborations when relating the `source` and
+             * `target` types.
+             *
+             * @param source
+             * @param target
+             * @param reportErrors
+             */
+            function tryElaborateArrayLikeErrors(source, target, reportErrors) {
+                if (isTupleLikeType(source)) {
+                    var sourceTuple = source.target;
+                    if (sourceTuple && sourceTuple.readonly && isArrayOrTupleLikeType(target) &&
+                        (!isReadonlyArrayType(target) || isTupleType(target) && !target.target.readonly)) {
+                        if (reportErrors) {
+                            reportError(ts.Diagnostics.The_type_0_is_readonly_and_cannot_be_assigned_to_the_mutable_type_1, typeToString(source), typeToString(target));
+                        }
+                        return false;
+                    }
+                    return isArrayLikeType(target);
+                }
+                if (isTupleLikeType(target)) {
+                    return isArrayLikeType(source);
+                }
+                if (isReadonlyArrayType(source) && isArrayType(target) && !isReadonlyArrayType(target)) {
+                    if (reportErrors) {
+                        reportError(ts.Diagnostics.The_type_0_is_readonly_and_cannot_be_assigned_to_the_mutable_type_1, typeToString(source), typeToString(target));
+                    }
                     return false;
                 }
-                // at this point we know that this is union or intersection type possibly with nullable constituents.
-                // check if we still will have compound type if we ignore nullable components.
-                var seenNonNullable = false;
-                for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
-                    var t = _a[_i];
-                    if (t.flags & 98304 /* Nullable */) {
-                        continue;
-                    }
-                    if (seenNonNullable) {
-                        return true;
-                    }
-                    seenNonNullable = true;
-                }
-                return false;
+                return true;
             }
             /**
              * Compare two types and return
@@ -42313,11 +43192,11 @@ var ts;
                 if (target.flags & 33554432 /* Substitution */) {
                     target = target.typeVariable;
                 }
-                if (source.flags & 8388608 /* IndexedAccess */) {
-                    source = getSimplifiedType(source);
+                if (source.flags & 25165824 /* Simplifiable */) {
+                    source = getSimplifiedType(source, /*writing*/ false);
                 }
-                if (target.flags & 8388608 /* IndexedAccess */) {
-                    target = getSimplifiedType(target);
+                if (target.flags & 25165824 /* Simplifiable */) {
+                    target = getSimplifiedType(target, /*writing*/ true);
                 }
                 // Try to see if we're relating something like `Foo` -> `Bar | null | undefined`.
                 // If so, reporting the `null` and `undefined` in the type is hardly useful.
@@ -42345,7 +43224,8 @@ var ts;
                     isSimpleTypeRelatedTo(source, target, relation, reportErrors ? reportError : undefined))
                     return -1 /* True */;
                 var isComparingJsxAttributes = !!(ts.getObjectFlags(source) & 4096 /* JsxAttributes */);
-                if (isObjectLiteralType(source) && ts.getObjectFlags(source) & 32768 /* FreshLiteral */) {
+                var isPerformingExcessPropertyChecks = (isObjectLiteralType(source) && ts.getObjectFlags(source) & 32768 /* FreshLiteral */);
+                if (isPerformingExcessPropertyChecks) {
                     var discriminantType = target.flags & 1048576 /* Union */ ? findMatchingDiscriminantType(source, target) : undefined;
                     if (hasExcessProperties(source, target, discriminantType, reportErrors)) {
                         if (reportErrors) {
@@ -42353,13 +43233,6 @@ var ts;
                         }
                         return 0 /* False */;
                     }
-                    // Above we check for excess properties with respect to the entire target type. When union
-                    // and intersection types are further deconstructed on the target side, we don't want to
-                    // make the check again (as it might fail for a partial target type). Therefore we obtain
-                    // the regular source type and proceed with that.
-                    if (isUnionOrIntersectionTypeWithoutNullableConstituents(target) && !discriminantType) {
-                        source = getRegularTypeOfObjectLiteral(source);
-                    }
                 }
                 if (relation !== comparableRelation && !isApparentIntersectionConstituent &&
                     source.flags & (131068 /* Primitive */ | 524288 /* Object */ | 2097152 /* Intersection */) && source !== globalObjectType &&
@@ -42392,11 +43265,24 @@ var ts;
                 }
                 else {
                     if (target.flags & 1048576 /* Union */) {
-                        result = typeRelatedToSomeType(source, target, reportErrors && !(source.flags & 131068 /* Primitive */) && !(target.flags & 131068 /* Primitive */));
+                        result = typeRelatedToSomeType(getRegularTypeOfObjectLiteral(source), target, reportErrors && !(source.flags & 131068 /* Primitive */) && !(target.flags & 131068 /* Primitive */));
+                        if (result && isPerformingExcessPropertyChecks) {
+                            // Validate against excess props using the original `source`
+                            var discriminantType = findMatchingDiscriminantType(source, target) || filterPrimitivesIfContainsNonPrimitive(target);
+                            if (!propertiesRelatedTo(source, discriminantType, reportErrors, /*excludedProperties*/ undefined)) {
+                                return 0 /* False */;
+                            }
+                        }
                     }
                     else if (target.flags & 2097152 /* Intersection */) {
                         isIntersectionConstituent = true; // set here to affect the following trio of checks
-                        result = typeRelatedToEachType(source, target, reportErrors);
+                        result = typeRelatedToEachType(getRegularTypeOfObjectLiteral(source), target, reportErrors);
+                        if (result && isPerformingExcessPropertyChecks) {
+                            // Validate against excess props using the original `source`
+                            if (!propertiesRelatedTo(source, target, reportErrors, /*excludedProperties*/ undefined)) {
+                                return 0 /* False */;
+                            }
+                        }
                     }
                     else if (source.flags & 2097152 /* Intersection */) {
                         // Check to see if any constituents of the intersection are immediately related to the target.
@@ -42438,8 +43324,15 @@ var ts;
                     }
                 }
                 if (!result && reportErrors) {
-                    var maybeSuppress = suppressNextError;
-                    suppressNextError = false;
+                    var maybeSuppress = overrideNextErrorInfo;
+                    overrideNextErrorInfo = undefined;
+                    if (source.flags & 524288 /* Object */ && target.flags & 524288 /* Object */) {
+                        var currentError = errorInfo;
+                        tryElaborateArrayLikeErrors(source, target, reportErrors);
+                        if (errorInfo !== currentError) {
+                            maybeSuppress = errorInfo;
+                        }
+                    }
                     if (source.flags & 524288 /* Object */ && target.flags & 131068 /* Primitive */) {
                         tryElaborateErrorsForPrimitivesAndObjects(source, target);
                     }
@@ -42493,7 +43386,7 @@ var ts;
                         // check excess properties against discriminant type only, not the entire union
                         return hasExcessProperties(source, discriminant, /*discriminant*/ undefined, reportErrors);
                     }
-                    var _loop_7 = function (prop) {
+                    var _loop_8 = function (prop) {
                         if (shouldCheckAsExcessProperty(prop, source.symbol) && !isKnownProperty(target, prop.escapedName, isComparingJsxAttributes)) {
                             if (reportErrors) {
                                 // Report error in terms of object types in the target as those are the only ones
@@ -42534,9 +43427,9 @@ var ts;
                             return { value: true };
                         }
                     };
-                    for (var _i = 0, _a = getPropertiesOfObjectType(source); _i < _a.length; _i++) {
+                    for (var _i = 0, _a = getPropertiesOfType(source); _i < _a.length; _i++) {
                         var prop = _a[_i];
-                        var state_3 = _loop_7(prop);
+                        var state_3 = _loop_8(prop);
                         if (typeof state_3 === "object")
                             return state_3.value;
                     }
@@ -42639,10 +43532,19 @@ var ts;
                 }
                 return bestMatch;
             }
+            function filterPrimitivesIfContainsNonPrimitive(type) {
+                if (maybeTypeOfKind(type, 67108864 /* NonPrimitive */)) {
+                    var result_3 = filterType(type, function (t) { return !(t.flags & 131068 /* Primitive */); });
+                    if (!(result_3.flags & 131072 /* Never */)) {
+                        return result_3;
+                    }
+                }
+                return type;
+            }
             // Keep this up-to-date with the same logic within `getApparentTypeOfContextualType`, since they should behave similarly
             function findMatchingDiscriminantType(source, target) {
-                if (target.flags & 1048576 /* Union */) {
-                    var sourceProperties = getPropertiesOfObjectType(source);
+                if (target.flags & 1048576 /* Union */ && source.flags & (2097152 /* Intersection */ | 524288 /* Object */)) {
+                    var sourceProperties = getPropertiesOfType(source);
                     if (sourceProperties) {
                         var sourcePropertiesFiltered = findDiscriminantProperties(sourceProperties, target);
                         if (sourcePropertiesFiltered) {
@@ -42705,13 +43607,20 @@ var ts;
                     // When variance information isn't available we default to covariance. This happens
                     // in the process of computing variance information for recursive types and when
                     // comparing 'this' type arguments.
-                    var variance = i < variances.length ? variances[i] : 1 /* Covariant */;
+                    var varianceFlags = i < variances.length ? variances[i] : 1 /* Covariant */;
+                    var variance = varianceFlags & 7 /* VarianceMask */;
                     // We ignore arguments for independent type parameters (because they're never witnessed).
                     if (variance !== 4 /* Independent */) {
                         var s = sources[i];
                         var t = targets[i];
                         var related = -1 /* True */;
-                        if (variance === 1 /* Covariant */) {
+                        if (varianceFlags & 8 /* Unmeasurable */) {
+                            // Even an `Unmeasurable` variance works out without a structural check if the source and target are _identical_.
+                            // We can't simply assume invariance, because `Unmeasurable` marks nonlinear relations, for example, a relation tained by
+                            // the `-?` modifier in a mapped type (where, no matter how the inputs are related, the outputs still might not be)
+                            related = relation === identityRelation ? isRelatedTo(s, t, /*reportErrors*/ false) : compareTypesIdentical(s, t);
+                        }
+                        else if (variance === 1 /* Covariant */) {
                             related = isRelatedTo(s, t, reportErrors);
                         }
                         else if (variance === 2 /* Contravariant */) {
@@ -42744,6 +43653,17 @@ var ts;
                 }
                 return result;
             }
+            function propagateSidebandVarianceFlags(typeArguments, variances) {
+                for (var i = 0; i < variances.length; i++) {
+                    var v = variances[i];
+                    if (v & 8 /* Unmeasurable */) {
+                        instantiateType(typeArguments[i], reportUnmeasurableMarkers);
+                    }
+                    if (v & 16 /* Unreliable */) {
+                        instantiateType(typeArguments[i], reportUnreliableMarkers);
+                    }
+                }
+            }
             // Determine if possibly recursive types are related. First, check if the result is already available in the global cache.
             // Second, check if we have already started a comparison of the given two types in which case we assume the result to be true.
             // Third, check if both types are part of deeply nested chains of generic type instantiations and if so assume the types are
@@ -42761,6 +43681,16 @@ var ts;
                         // as a failure, and should be updated as a reported failure by the bottom of this function.
                     }
                     else {
+                        if (outofbandVarianceMarkerHandler) {
+                            // We're in the middle of variance checking - integrate any unmeasurable/unreliable flags from this cached component
+                            if (source.flags & (524288 /* Object */ | 16777216 /* Conditional */) && source.aliasSymbol &&
+                                source.aliasTypeArguments && source.aliasSymbol === target.aliasSymbol) {
+                                propagateSidebandVarianceFlags(source.aliasTypeArguments, getAliasVariances(source.aliasSymbol));
+                            }
+                            if (ts.getObjectFlags(source) & 4 /* Reference */ && ts.getObjectFlags(target) & 4 /* Reference */ && source.target === target.target && ts.length(source.typeArguments)) {
+                                propagateSidebandVarianceFlags(source.typeArguments, getVariances(source.target));
+                            }
+                        }
                         return related === 1 /* Succeeded */ ? -1 /* True */ : 0 /* False */;
                     }
                 }
@@ -42818,21 +43748,21 @@ var ts;
                     if (flags & 4194304 /* Index */) {
                         return isRelatedTo(source.type, target.type, /*reportErrors*/ false);
                     }
-                    var result_3 = 0 /* False */;
+                    var result_4 = 0 /* False */;
                     if (flags & 8388608 /* IndexedAccess */) {
-                        if (result_3 = isRelatedTo(source.objectType, target.objectType, /*reportErrors*/ false)) {
-                            if (result_3 &= isRelatedTo(source.indexType, target.indexType, /*reportErrors*/ false)) {
-                                return result_3;
+                        if (result_4 = isRelatedTo(source.objectType, target.objectType, /*reportErrors*/ false)) {
+                            if (result_4 &= isRelatedTo(source.indexType, target.indexType, /*reportErrors*/ false)) {
+                                return result_4;
                             }
                         }
                     }
                     if (flags & 16777216 /* Conditional */) {
                         if (source.root.isDistributive === target.root.isDistributive) {
-                            if (result_3 = isRelatedTo(source.checkType, target.checkType, /*reportErrors*/ false)) {
-                                if (result_3 &= isRelatedTo(source.extendsType, target.extendsType, /*reportErrors*/ false)) {
-                                    if (result_3 &= isRelatedTo(getTrueTypeFromConditionalType(source), getTrueTypeFromConditionalType(target), /*reportErrors*/ false)) {
-                                        if (result_3 &= isRelatedTo(getFalseTypeFromConditionalType(source), getFalseTypeFromConditionalType(target), /*reportErrors*/ false)) {
-                                            return result_3;
+                            if (result_4 = isRelatedTo(source.checkType, target.checkType, /*reportErrors*/ false)) {
+                                if (result_4 &= isRelatedTo(source.extendsType, target.extendsType, /*reportErrors*/ false)) {
+                                    if (result_4 &= isRelatedTo(getTrueTypeFromConditionalType(source), getTrueTypeFromConditionalType(target), /*reportErrors*/ false)) {
+                                        if (result_4 &= isRelatedTo(getFalseTypeFromConditionalType(source), getFalseTypeFromConditionalType(target), /*reportErrors*/ false)) {
+                                            return result_4;
                                         }
                                     }
                                 }
@@ -42881,8 +43811,7 @@ var ts;
                     }
                     // A type S is assignable to keyof T if S is assignable to keyof C, where C is the
                     // simplified form of T or, if T doesn't simplify, the constraint of T.
-                    var simplified = getSimplifiedType(target.type);
-                    var constraint = simplified !== target.type ? simplified : getConstraintOfType(target.type);
+                    var constraint = getSimplifiedTypeOrConstraint(target.type);
                     if (constraint) {
                         // We require Ternary.True here such that circular constraints don't cause
                         // false positives. For example, given 'T extends { [K in keyof T]: string }',
@@ -42894,13 +43823,17 @@ var ts;
                     }
                 }
                 else if (target.flags & 8388608 /* IndexedAccess */) {
-                    // A type S is related to a type T[K], where T and K aren't both type variables, if S is related to C,
-                    // where C is the base constraint of T[K]
-                    if (relation !== identityRelation &&
-                        !(isGenericObjectType(target.objectType) && isGenericIndexType(target.indexType))) {
-                        var constraint = getBaseConstraintOfType(target);
-                        if (constraint && constraint !== target) {
-                            if (result = isRelatedTo(source, constraint, reportErrors)) {
+                    // A type S is related to a type T[K] if S is related to C, where C is the base
+                    // constraint of T[K] for writing.
+                    if (relation !== identityRelation) {
+                        var objectType = target.objectType;
+                        var indexType = target.indexType;
+                        var baseObjectType = getBaseConstraintOfType(objectType) || objectType;
+                        var baseIndexType = getBaseConstraintOfType(indexType) || indexType;
+                        if (!isGenericObjectType(baseObjectType) && !isGenericIndexType(baseIndexType)) {
+                            var accessFlags = 2 /* Writing */ | (baseObjectType !== objectType ? 1 /* NoIndexSignatures */ : 0);
+                            var constraint = getIndexedAccessTypeOrUndefined(baseObjectType, baseIndexType, /*accessNode*/ undefined, accessFlags);
+                            if (constraint && (result = isRelatedTo(source, constraint, reportErrors))) {
                                 return result;
                             }
                         }
@@ -42917,15 +43850,16 @@ var ts;
                         }
                         if (!isGenericMappedType(source)) {
                             var targetConstraint = getConstraintTypeFromMappedType(target);
-                            var sourceKeys_1 = getIndexType(source);
-                            var hasOptionalUnionKeys = modifiers & 4 /* IncludeOptional */ && targetConstraint.flags & 1048576 /* Union */;
-                            var filteredByApplicability = hasOptionalUnionKeys ? filterType(targetConstraint, function (t) { return !!isRelatedTo(t, sourceKeys_1); }) : undefined;
+                            var sourceKeys = getIndexType(source, /*stringsOnly*/ undefined, /*noIndexSignatures*/ true);
+                            var includeOptional = modifiers & 4 /* IncludeOptional */;
+                            var filteredByApplicability = includeOptional ? intersectTypes(targetConstraint, sourceKeys) : undefined;
                             // A source type T is related to a target type { [P in Q]: X } if Q is related to keyof T and T[Q] is related to X.
                             // A source type T is related to a target type { [P in Q]?: X } if some constituent Q' of Q is related to keyof T and T[Q'] is related to X.
-                            if (hasOptionalUnionKeys
+                            if (includeOptional
                                 ? !(filteredByApplicability.flags & 131072 /* Never */)
-                                : isRelatedTo(targetConstraint, sourceKeys_1)) {
-                                var indexingType = hasOptionalUnionKeys ? filteredByApplicability : getTypeParameterFromMappedType(target);
+                                : isRelatedTo(targetConstraint, sourceKeys)) {
+                                var typeParameter = getTypeParameterFromMappedType(target);
+                                var indexingType = filteredByApplicability ? getIntersectionType([filteredByApplicability, typeParameter]) : typeParameter;
                                 var indexedAccessType = getIndexedAccessType(source, indexingType);
                                 var templateType = getTemplateTypeFromMappedType(target);
                                 if (result = isRelatedTo(indexedAccessType, templateType, reportErrors)) {
@@ -42948,23 +43882,25 @@ var ts;
                             return result;
                         }
                     }
-                    var constraint = getConstraintOfType(source);
-                    if (!constraint || (source.flags & 262144 /* TypeParameter */ && constraint.flags & 1 /* Any */)) {
-                        // A type variable with no constraint is not related to the non-primitive object type.
-                        if (result = isRelatedTo(emptyObjectType, extractTypesOfKind(target, ~67108864 /* NonPrimitive */))) {
+                    else {
+                        var constraint = getConstraintOfType(source);
+                        if (!constraint || (source.flags & 262144 /* TypeParameter */ && constraint.flags & 1 /* Any */)) {
+                            // A type variable with no constraint is not related to the non-primitive object type.
+                            if (result = isRelatedTo(emptyObjectType, extractTypesOfKind(target, ~67108864 /* NonPrimitive */))) {
+                                errorInfo = saveErrorInfo;
+                                return result;
+                            }
+                        }
+                        // hi-speed no-this-instantiation check (less accurate, but avoids costly `this`-instantiation when the constraint will suffice), see #28231 for report on why this is needed
+                        else if (result = isRelatedTo(constraint, target, /*reportErrors*/ false, /*headMessage*/ undefined, isIntersectionConstituent)) {
+                            errorInfo = saveErrorInfo;
+                            return result;
+                        }
+                        // slower, fuller, this-instantiated check (necessary when comparing raw `this` types from base classes), see `subclassWithPolymorphicThisIsAssignable.ts` test for example
+                        else if (result = isRelatedTo(getTypeWithThisArgument(constraint, source), target, reportErrors, /*headMessage*/ undefined, isIntersectionConstituent)) {
                             errorInfo = saveErrorInfo;
                             return result;
                         }
-                    }
-                    // hi-speed no-this-instantiation check (less accurate, but avoids costly `this`-instantiation when the constraint will suffice), see #28231 for report on why this is needed
-                    else if (result = isRelatedTo(constraint, target, /*reportErrors*/ false, /*headMessage*/ undefined, isIntersectionConstituent)) {
-                        errorInfo = saveErrorInfo;
-                        return result;
-                    }
-                    // slower, fuller, this-instantiated check (necessary when comparing raw `this` types from base classes), see `subclassWithPolymorphicThisIsAssignable.ts` test for example
-                    else if (result = isRelatedTo(getTypeWithThisArgument(constraint, source), target, reportErrors, /*headMessage*/ undefined, isIntersectionConstituent)) {
-                        errorInfo = saveErrorInfo;
-                        return result;
                     }
                 }
                 else if (source.flags & 4194304 /* Index */) {
@@ -43024,6 +43960,9 @@ var ts;
                     if (relation !== identityRelation) {
                         source = getApparentType(source);
                     }
+                    else if (isGenericMappedType(source)) {
+                        return 0 /* False */;
+                    }
                     if (ts.getObjectFlags(source) & 4 /* Reference */ && ts.getObjectFlags(target) & 4 /* Reference */ && source.target === target.target &&
                         !(ts.getObjectFlags(source) & 8192 /* MarkerType */ || ts.getObjectFlags(target) & 8192 /* MarkerType */)) {
                         // We have type references to the same generic type, and the type references are not marker
@@ -43036,7 +43975,14 @@ var ts;
                         }
                     }
                     else if (isReadonlyArrayType(target) ? isArrayType(source) || isTupleType(source) : isArrayType(target) && isTupleType(source) && !source.target.readonly) {
-                        return isRelatedTo(getIndexTypeOfType(source, 1 /* Number */) || anyType, getIndexTypeOfType(target, 1 /* Number */) || anyType, reportErrors);
+                        if (relation !== identityRelation) {
+                            return isRelatedTo(getIndexTypeOfType(source, 1 /* Number */) || anyType, getIndexTypeOfType(target, 1 /* Number */) || anyType, reportErrors);
+                        }
+                        else {
+                            // By flags alone, we know that the `target` is a readonly array while the source is a normal array or tuple
+                            // or `target` is an array and source is a tuple - in both cases the types cannot be identical, by construction
+                            return 0 /* False */;
+                        }
                     }
                     // Consider a fresh empty object literal type "closed" under the subtype relationship - this way `{} <- {[idx: string]: any} <- fresh({})`
                     // and not `{} <- fresh({}) <- {[idx: string]: any}`
@@ -43051,7 +43997,7 @@ var ts;
                     if (source.flags & (524288 /* Object */ | 2097152 /* Intersection */) && target.flags & 524288 /* Object */) {
                         // Report structural errors only if we haven't reported any errors yet
                         var reportStructuralErrors = reportErrors && errorInfo === saveErrorInfo && !sourceIsPrimitive;
-                        result = propertiesRelatedTo(source, target, reportStructuralErrors);
+                        result = propertiesRelatedTo(source, target, reportStructuralErrors, /*excludedProperties*/ undefined);
                         if (result) {
                             result &= signaturesRelatedTo(source, target, 0 /* Call */, reportStructuralErrors);
                             if (result) {
@@ -43071,22 +44017,35 @@ var ts;
                             return result;
                         }
                     }
+                    // If S is an object type and T is a discriminated union, S may be related to T if
+                    // there exists a constituent of T for every combination of the discriminants of S
+                    // with respect to T. We do not report errors here, as we will use the existing
+                    // error result from checking each constituent of the union.
+                    if (source.flags & (524288 /* Object */ | 2097152 /* Intersection */) && target.flags & 1048576 /* Union */) {
+                        var objectOnlyTarget = extractTypesOfKind(target, 524288 /* Object */);
+                        if (objectOnlyTarget.flags & 1048576 /* Union */) {
+                            var result_5 = typeRelatedToDiscriminatedType(source, objectOnlyTarget);
+                            if (result_5) {
+                                return result_5;
+                            }
+                        }
+                    }
                 }
                 return 0 /* False */;
-                function isNonGeneric(type) {
-                    // If we're already in identity relationship checking, we should use `isRelatedTo`
-                    // to catch the `Maybe` from an excessively deep type (which we then assume means
-                    // that the type could possibly contain a generic)
-                    if (relation === identityRelation) {
-                        return isRelatedTo(type, getPermissiveInstantiation(type)) === -1 /* True */;
-                    }
-                    return isTypeIdenticalTo(type, getPermissiveInstantiation(type));
-                }
                 function relateVariances(sourceTypeArguments, targetTypeArguments, variances) {
                     if (result = typeArgumentsRelatedTo(sourceTypeArguments, targetTypeArguments, variances, reportErrors)) {
                         return result;
                     }
-                    var allowStructuralFallback = (targetTypeArguments && hasCovariantVoidArgument(targetTypeArguments, variances)) || isNonGeneric(source) || isNonGeneric(target);
+                    if (ts.some(variances, function (v) { return !!(v & 24 /* AllowsStructuralFallback */); })) {
+                        // If some type parameter was `Unmeasurable` or `Unreliable`, and we couldn't pass by assuming it was identical, then we
+                        // have to allow a structural fallback check
+                        // We elide the variance-based error elaborations, since those might not be too helpful, since we'll potentially
+                        // be assuming identity of the type parameter.
+                        originalErrorInfo = undefined;
+                        errorInfo = saveErrorInfo;
+                        return undefined;
+                    }
+                    var allowStructuralFallback = targetTypeArguments && hasCovariantVoidArgument(targetTypeArguments, variances);
                     varianceCheckFailed = !allowStructuralFallback;
                     // The type arguments did not relate appropriately, but it may be because we have no variance
                     // information (in which case typeArgumentsRelatedTo defaulted to covariance for all type
@@ -43104,7 +44063,7 @@ var ts;
                         // reveal the reason).
                         // We can switch on `reportErrors` here, since varianceCheckFailed guarantees we return `False`,
                         // we can return `False` early here to skip calculating the structural error message we don't need.
-                        if (varianceCheckFailed && !(reportErrors && ts.some(variances, function (v) { return v === 0 /* Invariant */; }))) {
+                        if (varianceCheckFailed && !(reportErrors && ts.some(variances, function (v) { return (v & 7 /* VarianceMask */) === 0 /* Invariant */; }))) {
                             return 0 /* False */;
                         }
                         // We remember the original error information so we can restore it in case the structural
@@ -43115,6 +44074,18 @@ var ts;
                     }
                 }
             }
+            function reportUnmeasurableMarkers(p) {
+                if (outofbandVarianceMarkerHandler && (p === markerSuperType || p === markerSubType || p === markerOtherType)) {
+                    outofbandVarianceMarkerHandler(/*onlyUnreliable*/ false);
+                }
+                return p;
+            }
+            function reportUnreliableMarkers(p) {
+                if (outofbandVarianceMarkerHandler && (p === markerSuperType || p === markerSubType || p === markerOtherType)) {
+                    outofbandVarianceMarkerHandler(/*onlyUnreliable*/ true);
+                }
+                return p;
+            }
             // A type [P in S]: X is related to a type [Q in T]: Y if T is related to S and X' is
             // related to Y, where X' is an instantiation of X in which P is replaced with Q. Notice
             // that S and T are contra-variant whereas X and Y are co-variant.
@@ -43122,45 +44093,281 @@ var ts;
                 var modifiersRelated = relation === comparableRelation || (relation === identityRelation ? getMappedTypeModifiers(source) === getMappedTypeModifiers(target) :
                     getCombinedMappedTypeOptionality(source) <= getCombinedMappedTypeOptionality(target));
                 if (modifiersRelated) {
-                    var result_4;
-                    if (result_4 = isRelatedTo(getConstraintTypeFromMappedType(target), getConstraintTypeFromMappedType(source), reportErrors)) {
+                    var result_6;
+                    var targetConstraint = getConstraintTypeFromMappedType(target);
+                    var sourceConstraint = instantiateType(getConstraintTypeFromMappedType(source), getCombinedMappedTypeOptionality(source) < 0 ? reportUnmeasurableMarkers : reportUnreliableMarkers);
+                    if (result_6 = isRelatedTo(targetConstraint, sourceConstraint, reportErrors)) {
                         var mapper = createTypeMapper([getTypeParameterFromMappedType(source)], [getTypeParameterFromMappedType(target)]);
-                        return result_4 & isRelatedTo(instantiateType(getTemplateTypeFromMappedType(source), mapper), getTemplateTypeFromMappedType(target), reportErrors);
+                        return result_6 & isRelatedTo(instantiateType(getTemplateTypeFromMappedType(source), mapper), getTemplateTypeFromMappedType(target), reportErrors);
                     }
                 }
                 return 0 /* False */;
             }
-            function propertiesRelatedTo(source, target, reportErrors) {
+            function typeRelatedToDiscriminatedType(source, target) {
+                // 1. Generate the combinations of discriminant properties & types 'source' can satisfy.
+                //    a. If the number of combinations is above a set limit, the comparison is too complex.
+                // 2. Filter 'target' to the subset of types whose discriminants exist in the matrix.
+                //    a. If 'target' does not satisfy all discriminants in the matrix, 'source' is not related.
+                // 3. For each type in the filtered 'target', determine if all non-discriminant properties of
+                //    'target' are related to a property in 'source'.
+                //
+                // NOTE: See ~/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithDiscriminatedUnion.ts
+                //       for examples.
+                var sourceProperties = getPropertiesOfObjectType(source);
+                var sourcePropertiesFiltered = findDiscriminantProperties(sourceProperties, target);
+                if (!sourcePropertiesFiltered)
+                    return 0 /* False */;
+                // Though we could compute the number of combinations as we generate
+                // the matrix, this would incur additional memory overhead due to
+                // array allocations. To reduce this overhead, we first compute
+                // the number of combinations to ensure we will not surpass our
+                // fixed limit before incurring the cost of any allocations:
+                var numCombinations = 1;
+                for (var _i = 0, sourcePropertiesFiltered_1 = sourcePropertiesFiltered; _i < sourcePropertiesFiltered_1.length; _i++) {
+                    var sourceProperty = sourcePropertiesFiltered_1[_i];
+                    numCombinations *= countTypes(getTypeOfSymbol(sourceProperty));
+                    if (numCombinations > 25) {
+                        // We've reached the complexity limit.
+                        return 0 /* False */;
+                    }
+                }
+                // Compute the set of types for each discriminant property.
+                var sourceDiscriminantTypes = new Array(sourcePropertiesFiltered.length);
+                var excludedProperties = ts.createUnderscoreEscapedMap();
+                for (var i = 0; i < sourcePropertiesFiltered.length; i++) {
+                    var sourceProperty = sourcePropertiesFiltered[i];
+                    var sourcePropertyType = getTypeOfSymbol(sourceProperty);
+                    sourceDiscriminantTypes[i] = sourcePropertyType.flags & 1048576 /* Union */
+                        ? sourcePropertyType.types
+                        : [sourcePropertyType];
+                    excludedProperties.set(sourceProperty.escapedName, true);
+                }
+                // Match each combination of the cartesian product of discriminant properties to one or more
+                // constituents of 'target'. If any combination does not have a match then 'source' is not relatable.
+                var discriminantCombinations = ts.cartesianProduct(sourceDiscriminantTypes);
+                var matchingTypes = [];
+                var _loop_9 = function (combination) {
+                    var hasMatch = false;
+                    outer: for (var _i = 0, _a = target.types; _i < _a.length; _i++) {
+                        var type = _a[_i];
+                        var _loop_10 = function (i) {
+                            var sourceProperty = sourcePropertiesFiltered[i];
+                            var targetProperty = getPropertyOfObjectType(type, sourceProperty.escapedName);
+                            if (!targetProperty)
+                                return "continue-outer";
+                            if (sourceProperty === targetProperty)
+                                return "continue";
+                            // We compare the source property to the target in the context of a single discriminant type.
+                            var related = propertyRelatedTo(source, target, sourceProperty, targetProperty, function (_) { return combination[i]; }, /*reportErrors*/ false);
+                            // If the target property could not be found, or if the properties were not related,
+                            // then this constituent is not a match.
+                            if (!related) {
+                                return "continue-outer";
+                            }
+                        };
+                        for (var i = 0; i < sourcePropertiesFiltered.length; i++) {
+                            var state_5 = _loop_10(i);
+                            switch (state_5) {
+                                case "continue-outer": continue outer;
+                            }
+                        }
+                        ts.pushIfUnique(matchingTypes, type, ts.equateValues);
+                        hasMatch = true;
+                    }
+                    if (!hasMatch) {
+                        return { value: 0 /* False */ };
+                    }
+                };
+                for (var _a = 0, discriminantCombinations_1 = discriminantCombinations; _a < discriminantCombinations_1.length; _a++) {
+                    var combination = discriminantCombinations_1[_a];
+                    var state_4 = _loop_9(combination);
+                    if (typeof state_4 === "object")
+                        return state_4.value;
+                }
+                // Compare the remaining non-discriminant properties of each match.
+                var result = -1 /* True */;
+                for (var _b = 0, matchingTypes_1 = matchingTypes; _b < matchingTypes_1.length; _b++) {
+                    var type = matchingTypes_1[_b];
+                    result &= propertiesRelatedTo(source, type, /*reportErrors*/ false, excludedProperties);
+                    if (result) {
+                        result &= signaturesRelatedTo(source, type, 0 /* Call */, /*reportStructuralErrors*/ false);
+                        if (result) {
+                            result &= signaturesRelatedTo(source, type, 1 /* Construct */, /*reportStructuralErrors*/ false);
+                            if (result) {
+                                result &= indexTypesRelatedTo(source, type, 0 /* String */, /*sourceIsPrimitive*/ false, /*reportStructuralErrors*/ false);
+                                if (result) {
+                                    result &= indexTypesRelatedTo(source, type, 1 /* Number */, /*sourceIsPrimitive*/ false, /*reportStructuralErrors*/ false);
+                                }
+                            }
+                        }
+                    }
+                    if (!result) {
+                        return result;
+                    }
+                }
+                return result;
+            }
+            function excludeProperties(properties, excludedProperties) {
+                if (!excludedProperties || properties.length === 0)
+                    return properties;
+                var result;
+                for (var i = 0; i < properties.length; i++) {
+                    if (!excludedProperties.has(properties[i].escapedName)) {
+                        if (result) {
+                            result.push(properties[i]);
+                        }
+                    }
+                    else if (!result) {
+                        result = properties.slice(0, i);
+                    }
+                }
+                return result || properties;
+            }
+            function isPropertySymbolTypeRelated(sourceProp, targetProp, getTypeOfSourceProperty, reportErrors) {
+                var targetIsOptional = strictNullChecks && !!(ts.getCheckFlags(targetProp) & 48 /* Partial */);
+                var source = getTypeOfSourceProperty(sourceProp);
+                if (ts.getCheckFlags(targetProp) & 65536 /* DeferredType */ && !getSymbolLinks(targetProp).type) {
+                    // Rather than resolving (and normalizing) the type, relate constituent-by-constituent without performing normalization or seconadary passes
+                    var links = getSymbolLinks(targetProp);
+                    ts.Debug.assertDefined(links.deferralParent);
+                    ts.Debug.assertDefined(links.deferralConstituents);
+                    var unionParent = !!(links.deferralParent.flags & 1048576 /* Union */);
+                    var result_7 = unionParent ? 0 /* False */ : -1 /* True */;
+                    var targetTypes = links.deferralConstituents;
+                    for (var _i = 0, targetTypes_3 = targetTypes; _i < targetTypes_3.length; _i++) {
+                        var targetType = targetTypes_3[_i];
+                        var related = isRelatedTo(source, targetType, /*reportErrors*/ false, /*headMessage*/ undefined, /*isIntersectionConstituent*/ !unionParent);
+                        if (!unionParent) {
+                            if (!related) {
+                                // Can't assign to a target individually - have to fallback to assigning to the _whole_ intersection (which forces normalization)
+                                return isRelatedTo(source, addOptionality(getTypeOfSymbol(targetProp), targetIsOptional), reportErrors);
+                            }
+                            result_7 &= related;
+                        }
+                        else {
+                            if (related) {
+                                return related;
+                            }
+                        }
+                    }
+                    if (unionParent && !result_7 && targetIsOptional) {
+                        result_7 = isRelatedTo(source, undefinedType);
+                    }
+                    if (unionParent && !result_7 && reportErrors) {
+                        // The easiest way to get the right errors here is to un-defer (which may be costly)
+                        // If it turns out this is too costly too often, we can replicate the error handling logic within
+                        // typeRelatedToSomeType without the discriminatable type branch (as that requires a manifest union
+                        // type on which to hand discriminable properties, which we are expressly trying to avoid here)
+                        return isRelatedTo(source, addOptionality(getTypeOfSymbol(targetProp), targetIsOptional), reportErrors);
+                    }
+                    return result_7;
+                }
+                else {
+                    return isRelatedTo(source, addOptionality(getTypeOfSymbol(targetProp), targetIsOptional), reportErrors);
+                }
+            }
+            function propertyRelatedTo(source, target, sourceProp, targetProp, getTypeOfSourceProperty, reportErrors) {
+                var sourcePropFlags = ts.getDeclarationModifierFlagsFromSymbol(sourceProp);
+                var targetPropFlags = ts.getDeclarationModifierFlagsFromSymbol(targetProp);
+                if (sourcePropFlags & 8 /* Private */ || targetPropFlags & 8 /* Private */) {
+                    var hasDifferingDeclarations = sourceProp.valueDeclaration !== targetProp.valueDeclaration;
+                    if (ts.getCheckFlags(sourceProp) & 1024 /* ContainsPrivate */ && hasDifferingDeclarations) {
+                        if (reportErrors) {
+                            reportError(ts.Diagnostics.Property_0_has_conflicting_declarations_and_is_inaccessible_in_type_1, symbolToString(sourceProp), typeToString(source));
+                        }
+                        return 0 /* False */;
+                    }
+                    if (hasDifferingDeclarations) {
+                        if (reportErrors) {
+                            if (sourcePropFlags & 8 /* Private */ && targetPropFlags & 8 /* Private */) {
+                                reportError(ts.Diagnostics.Types_have_separate_declarations_of_a_private_property_0, symbolToString(targetProp));
+                            }
+                            else {
+                                reportError(ts.Diagnostics.Property_0_is_private_in_type_1_but_not_in_type_2, symbolToString(targetProp), typeToString(sourcePropFlags & 8 /* Private */ ? source : target), typeToString(sourcePropFlags & 8 /* Private */ ? target : source));
+                            }
+                        }
+                        return 0 /* False */;
+                    }
+                }
+                else if (targetPropFlags & 16 /* Protected */) {
+                    if (!isValidOverrideOf(sourceProp, targetProp)) {
+                        if (reportErrors) {
+                            reportError(ts.Diagnostics.Property_0_is_protected_but_type_1_is_not_a_class_derived_from_2, symbolToString(targetProp), typeToString(getDeclaringClass(sourceProp) || source), typeToString(getDeclaringClass(targetProp) || target));
+                        }
+                        return 0 /* False */;
+                    }
+                }
+                else if (sourcePropFlags & 16 /* Protected */) {
+                    if (reportErrors) {
+                        reportError(ts.Diagnostics.Property_0_is_protected_in_type_1_but_public_in_type_2, symbolToString(targetProp), typeToString(source), typeToString(target));
+                    }
+                    return 0 /* False */;
+                }
+                // If the target comes from a partial union prop, allow `undefined` in the target type
+                var related = isPropertySymbolTypeRelated(sourceProp, targetProp, getTypeOfSourceProperty, reportErrors);
+                if (!related) {
+                    if (reportErrors) {
+                        reportError(ts.Diagnostics.Types_of_property_0_are_incompatible, symbolToString(targetProp));
+                    }
+                    return 0 /* False */;
+                }
+                // When checking for comparability, be more lenient with optional properties.
+                if (relation !== comparableRelation && sourceProp.flags & 16777216 /* Optional */ && !(targetProp.flags & 16777216 /* Optional */)) {
+                    // TypeScript 1.0 spec (April 2014): 3.8.3
+                    // S is a subtype of a type T, and T is a supertype of S if ...
+                    // S' and T are object types and, for each member M in T..
+                    // M is a property and S' contains a property N where
+                    // if M is a required property, N is also a required property
+                    // (M - property in T)
+                    // (N - property in S)
+                    if (reportErrors) {
+                        reportError(ts.Diagnostics.Property_0_is_optional_in_type_1_but_required_in_type_2, symbolToString(targetProp), typeToString(source), typeToString(target));
+                    }
+                    return 0 /* False */;
+                }
+                return related;
+            }
+            function propertiesRelatedTo(source, target, reportErrors, excludedProperties) {
                 if (relation === identityRelation) {
-                    return propertiesIdenticalTo(source, target);
+                    return propertiesIdenticalTo(source, target, excludedProperties);
                 }
                 var requireOptionalProperties = relation === subtypeRelation && !isObjectLiteralType(source) && !isEmptyArrayLiteralType(source) && !isTupleType(source);
                 var unmatchedProperty = getUnmatchedProperty(source, target, requireOptionalProperties, /*matchDiscriminantProperties*/ false);
                 if (unmatchedProperty) {
                     if (reportErrors) {
                         var props = ts.arrayFrom(getUnmatchedProperties(source, target, requireOptionalProperties, /*matchDiscriminantProperties*/ false));
+                        var shouldSkipElaboration = false;
                         if (!headMessage || (headMessage.code !== ts.Diagnostics.Class_0_incorrectly_implements_interface_1.code &&
                             headMessage.code !== ts.Diagnostics.Class_0_incorrectly_implements_class_1_Did_you_mean_to_extend_1_and_inherit_its_members_as_a_subclass.code)) {
-                            suppressNextError = true; // Retain top-level error for interface implementing issues, otherwise omit it
+                            shouldSkipElaboration = true; // Retain top-level error for interface implementing issues, otherwise omit it
                         }
                         if (props.length === 1) {
                             var propName = symbolToString(unmatchedProperty);
-                            reportError(ts.Diagnostics.Property_0_is_missing_in_type_1_but_required_in_type_2, propName, typeToString(source), typeToString(target));
+                            reportError.apply(void 0, [ts.Diagnostics.Property_0_is_missing_in_type_1_but_required_in_type_2, propName].concat(getTypeNamesForErrorDisplay(source, target)));
                             if (ts.length(unmatchedProperty.declarations)) {
                                 associateRelatedInfo(ts.createDiagnosticForNode(unmatchedProperty.declarations[0], ts.Diagnostics._0_is_declared_here, propName));
                             }
+                            if (shouldSkipElaboration) {
+                                overrideNextErrorInfo = errorInfo;
+                            }
                         }
-                        else if (props.length > 5) { // arbitrary cutoff for too-long list form
-                            reportError(ts.Diagnostics.Type_0_is_missing_the_following_properties_from_type_1_Colon_2_and_3_more, typeToString(source), typeToString(target), ts.map(props.slice(0, 4), function (p) { return symbolToString(p); }).join(", "), props.length - 4);
-                        }
-                        else {
-                            reportError(ts.Diagnostics.Type_0_is_missing_the_following_properties_from_type_1_Colon_2, typeToString(source), typeToString(target), ts.map(props, function (p) { return symbolToString(p); }).join(", "));
+                        else if (tryElaborateArrayLikeErrors(source, target, /*reportErrors*/ false)) {
+                            if (props.length > 5) { // arbitrary cutoff for too-long list form
+                                reportError(ts.Diagnostics.Type_0_is_missing_the_following_properties_from_type_1_Colon_2_and_3_more, typeToString(source), typeToString(target), ts.map(props.slice(0, 4), function (p) { return symbolToString(p); }).join(", "), props.length - 4);
+                            }
+                            else {
+                                reportError(ts.Diagnostics.Type_0_is_missing_the_following_properties_from_type_1_Colon_2, typeToString(source), typeToString(target), ts.map(props, function (p) { return symbolToString(p); }).join(", "));
+                            }
+                            if (shouldSkipElaboration) {
+                                overrideNextErrorInfo = errorInfo;
+                            }
                         }
+                        // ELSE: No array like or unmatched property error - just issue top level error (errorInfo = undefined)
                     }
                     return 0 /* False */;
                 }
                 if (isObjectLiteralType(target)) {
-                    for (var _i = 0, _a = getPropertiesOfType(source); _i < _a.length; _i++) {
+                    for (var _i = 0, _a = excludeProperties(getPropertiesOfType(source), excludedProperties); _i < _a.length; _i++) {
                         var sourceProp = _a[_i];
                         if (!getPropertyOfObjectType(target, sourceProp.escapedName)) {
                             var sourceType = getTypeOfSymbol(sourceProp);
@@ -43201,84 +44408,30 @@ var ts;
                         }
                     }
                 }
-                var properties = getPropertiesOfObjectType(target);
-                for (var _b = 0, properties_2 = properties; _b < properties_2.length; _b++) {
-                    var targetProp = properties_2[_b];
+                // We only call this for union target types when we're attempting to do excess property checking - in those cases, we want to get _all possible props_
+                // from the target union, across all members
+                var properties = target.flags & 1048576 /* Union */ ? getPossiblePropertiesOfUnionType(target) : getPropertiesOfType(target);
+                for (var _b = 0, _c = excludeProperties(properties, excludedProperties); _b < _c.length; _b++) {
+                    var targetProp = _c[_b];
                     if (!(targetProp.flags & 4194304 /* Prototype */)) {
                         var sourceProp = getPropertyOfType(source, targetProp.escapedName);
                         if (sourceProp && sourceProp !== targetProp) {
-                            if (isIgnoredJsxProperty(source, sourceProp, getTypeOfSymbol(targetProp))) {
-                                continue;
-                            }
-                            var sourcePropFlags = ts.getDeclarationModifierFlagsFromSymbol(sourceProp);
-                            var targetPropFlags = ts.getDeclarationModifierFlagsFromSymbol(targetProp);
-                            if (sourcePropFlags & 8 /* Private */ || targetPropFlags & 8 /* Private */) {
-                                var hasDifferingDeclarations = sourceProp.valueDeclaration !== targetProp.valueDeclaration;
-                                if (ts.getCheckFlags(sourceProp) & 512 /* ContainsPrivate */ && hasDifferingDeclarations) {
-                                    if (reportErrors) {
-                                        reportError(ts.Diagnostics.Property_0_has_conflicting_declarations_and_is_inaccessible_in_type_1, symbolToString(sourceProp), typeToString(source));
-                                    }
-                                    return 0 /* False */;
-                                }
-                                if (hasDifferingDeclarations) {
-                                    if (reportErrors) {
-                                        if (sourcePropFlags & 8 /* Private */ && targetPropFlags & 8 /* Private */) {
-                                            reportError(ts.Diagnostics.Types_have_separate_declarations_of_a_private_property_0, symbolToString(targetProp));
-                                        }
-                                        else {
-                                            reportError(ts.Diagnostics.Property_0_is_private_in_type_1_but_not_in_type_2, symbolToString(targetProp), typeToString(sourcePropFlags & 8 /* Private */ ? source : target), typeToString(sourcePropFlags & 8 /* Private */ ? target : source));
-                                        }
-                                    }
-                                    return 0 /* False */;
-                                }
-                            }
-                            else if (targetPropFlags & 16 /* Protected */) {
-                                if (!isValidOverrideOf(sourceProp, targetProp)) {
-                                    if (reportErrors) {
-                                        reportError(ts.Diagnostics.Property_0_is_protected_but_type_1_is_not_a_class_derived_from_2, symbolToString(targetProp), typeToString(getDeclaringClass(sourceProp) || source), typeToString(getDeclaringClass(targetProp) || target));
-                                    }
-                                    return 0 /* False */;
-                                }
-                            }
-                            else if (sourcePropFlags & 16 /* Protected */) {
-                                if (reportErrors) {
-                                    reportError(ts.Diagnostics.Property_0_is_protected_in_type_1_but_public_in_type_2, symbolToString(targetProp), typeToString(source), typeToString(target));
-                                }
-                                return 0 /* False */;
-                            }
-                            var related = isRelatedTo(getTypeOfSymbol(sourceProp), getTypeOfSymbol(targetProp), reportErrors);
+                            var related = propertyRelatedTo(source, target, sourceProp, targetProp, getTypeOfSymbol, reportErrors);
                             if (!related) {
-                                if (reportErrors) {
-                                    reportError(ts.Diagnostics.Types_of_property_0_are_incompatible, symbolToString(targetProp));
-                                }
                                 return 0 /* False */;
                             }
                             result &= related;
-                            // When checking for comparability, be more lenient with optional properties.
-                            if (relation !== comparableRelation && sourceProp.flags & 16777216 /* Optional */ && !(targetProp.flags & 16777216 /* Optional */)) {
-                                // TypeScript 1.0 spec (April 2014): 3.8.3
-                                // S is a subtype of a type T, and T is a supertype of S if ...
-                                // S' and T are object types and, for each member M in T..
-                                // M is a property and S' contains a property N where
-                                // if M is a required property, N is also a required property
-                                // (M - property in T)
-                                // (N - property in S)
-                                if (reportErrors) {
-                                    reportError(ts.Diagnostics.Property_0_is_optional_in_type_1_but_required_in_type_2, symbolToString(targetProp), typeToString(source), typeToString(target));
-                                }
-                                return 0 /* False */;
-                            }
                         }
                     }
                 }
                 return result;
             }
-            function propertiesIdenticalTo(source, target) {
+            function propertiesIdenticalTo(source, target, excludedProperties) {
                 if (!(source.flags & 524288 /* Object */ && target.flags & 524288 /* Object */)) {
                     return 0 /* False */;
                 }
-                var sourceProperties = getPropertiesOfObjectType(source);
-                var targetProperties = getPropertiesOfObjectType(target);
+                var sourceProperties = excludeProperties(getPropertiesOfObjectType(source), excludedProperties);
+                var targetProperties = excludeProperties(getPropertiesOfObjectType(target), excludedProperties);
                 if (sourceProperties.length !== targetProperties.length) {
                     return 0 /* False */;
                 }
@@ -43398,7 +44551,7 @@ var ts;
                 var result = -1 /* True */;
                 for (var _i = 0, _a = getPropertiesOfObjectType(source); _i < _a.length; _i++) {
                     var prop = _a[_i];
-                    if (isIgnoredJsxProperty(source, prop, /*targetMemberType*/ undefined)) {
+                    if (isIgnoredJsxProperty(source, prop)) {
                         continue;
                     }
                     // Skip over symbol-named members
@@ -43430,7 +44583,7 @@ var ts;
                     return indexTypesIdenticalTo(source, target, kind);
                 }
                 var targetInfo = getIndexInfoOfType(target, kind);
-                if (!targetInfo || targetInfo.type.flags & 3 /* AnyOrUnknown */ && !sourceIsPrimitive) {
+                if (!targetInfo || targetInfo.type.flags & 1 /* Any */ && !sourceIsPrimitive) {
                     // Index signature of type any permits assignment from everything but primitives
                     return -1 /* True */;
                 }
@@ -43570,8 +44723,11 @@ var ts;
                 // The emptyArray singleton is used to signal a recursive invocation.
                 cache.variances = ts.emptyArray;
                 variances = [];
-                for (var _i = 0, typeParameters_1 = typeParameters; _i < typeParameters_1.length; _i++) {
-                    var tp = typeParameters_1[_i];
+                var _loop_11 = function (tp) {
+                    var unmeasurable = false;
+                    var unreliable = false;
+                    var oldHandler = outofbandVarianceMarkerHandler;
+                    outofbandVarianceMarkerHandler = function (onlyUnreliable) { return onlyUnreliable ? unreliable = true : unmeasurable = true; };
                     // We first compare instantiations where the type parameter is replaced with
                     // marker types that have a known subtype relationship. From this we can infer
                     // invariance, covariance, contravariance or bivariance.
@@ -43586,7 +44742,20 @@ var ts;
                     if (variance === 3 /* Bivariant */ && isTypeAssignableTo(createMarkerType(cache, tp, markerOtherType), typeWithSuper)) {
                         variance = 4 /* Independent */;
                     }
+                    outofbandVarianceMarkerHandler = oldHandler;
+                    if (unmeasurable || unreliable) {
+                        if (unmeasurable) {
+                            variance |= 8 /* Unmeasurable */;
+                        }
+                        if (unreliable) {
+                            variance |= 16 /* Unreliable */;
+                        }
+                    }
                     variances.push(variance);
+                };
+                for (var _i = 0, typeParameters_1 = typeParameters; _i < typeParameters_1.length; _i++) {
+                    var tp = typeParameters_1[_i];
+                    _loop_11(tp);
                 }
                 cache.variances = variances;
             }
@@ -43603,7 +44772,7 @@ var ts;
         // See comment at call in recursiveTypeRelatedTo for when this case matters.
         function hasCovariantVoidArgument(typeArguments, variances) {
             for (var i = 0; i < variances.length; i++) {
-                if (variances[i] === 1 /* Covariant */ && typeArguments[i].flags & 16384 /* Void */) {
+                if ((variances[i] & 7 /* VarianceMask */) === 1 /* Covariant */ && typeArguments[i].flags & 16384 /* Void */) {
                     return true;
                 }
             }
@@ -43781,18 +44950,24 @@ var ts;
             if (!(isMatchingSignature(source, target, partialMatch))) {
                 return 0 /* False */;
             }
-            // Check that the two signatures have the same number of type parameters. We might consider
-            // also checking that any type parameter constraints match, but that would require instantiating
-            // the constraints with a common set of type arguments to get relatable entities in places where
-            // type parameters occur in the constraints. The complexity of doing that doesn't seem worthwhile,
-            // particularly as we're comparing erased versions of the signatures below.
+            // Check that the two signatures have the same number of type parameters.
             if (ts.length(source.typeParameters) !== ts.length(target.typeParameters)) {
                 return 0 /* False */;
             }
-            // Spec 1.0 Section 3.8.3 & 3.8.4:
-            // M and N (the signatures) are instantiated using type Any as the type argument for all type parameters declared by M and N
-            source = getErasedSignature(source);
-            target = getErasedSignature(target);
+            // Check that type parameter constraints and defaults match. If they do, instantiate the source
+            // signature with the type parameters of the target signature and continue the comparison.
+            if (target.typeParameters) {
+                var mapper = createTypeMapper(source.typeParameters, target.typeParameters);
+                for (var i = 0; i < target.typeParameters.length; i++) {
+                    var s = source.typeParameters[i];
+                    var t = target.typeParameters[i];
+                    if (!(s === t || compareTypes(instantiateType(getConstraintFromTypeParameter(s), mapper) || unknownType, getConstraintFromTypeParameter(t) || unknownType) &&
+                        compareTypes(instantiateType(getDefaultFromTypeParameter(s), mapper) || unknownType, getDefaultFromTypeParameter(t) || unknownType))) {
+                        return 0 /* False */;
+                    }
+                }
+                source = instantiateSignature(source, mapper, /*eraseTypeParameters*/ true);
+            }
             var result = -1 /* True */;
             if (!ignoreThisTypes) {
                 var sourceThisType = getThisTypeOfSignature(source);
@@ -43894,7 +45069,7 @@ var ts;
             if (propType) {
                 return propType;
             }
-            if (everyType(type, isTupleType) && !everyType(type, function (t) { return !t.target.hasRestElement; })) {
+            if (everyType(type, isTupleType)) {
                 return mapType(type, function (t) { return getRestTypeOfTupleType(t) || undefinedType; });
             }
             return undefined;
@@ -43939,6 +45114,23 @@ var ts;
             }
             return type;
         }
+        function getWidenedLiteralLikeTypeForContextualReturnTypeIfNeeded(type, contextualSignatureReturnType, isAsync) {
+            if (type && isUnitType(type)) {
+                var contextualType = !contextualSignatureReturnType ? undefined :
+                    isAsync ? getPromisedTypeOfPromise(contextualSignatureReturnType) :
+                        contextualSignatureReturnType;
+                type = getWidenedLiteralLikeTypeForContextualType(type, contextualType);
+            }
+            return type;
+        }
+        function getWidenedLiteralLikeTypeForContextualIterationTypeIfNeeded(type, contextualSignatureReturnType, kind, isAsyncGenerator) {
+            if (type && isUnitType(type)) {
+                var contextualType = !contextualSignatureReturnType ? undefined :
+                    getIterationTypeOfGeneratorFunctionReturnType(kind, contextualSignatureReturnType, isAsyncGenerator);
+                type = getWidenedLiteralLikeTypeForContextualType(type, contextualType);
+            }
+            return type;
+        }
         /**
          * Check if a Type was written as a tuple type literal.
          * Prefer using isTupleLikeType() unless the use of `elementTypes` is required.
@@ -44028,16 +45220,40 @@ var ts;
         function getNonNullableType(type) {
             return strictNullChecks ? getGlobalNonNullableTypeInstantiation(type) : type;
         }
+        /**
+         * Is source potentially coercible to target type under `==`.
+         * Assumes that `source` is a constituent of a union, hence
+         * the boolean literal flag on the LHS, but not on the RHS.
+         *
+         * This does not fully replicate the semantics of `==`. The
+         * intention is to catch cases that are clearly not right.
+         *
+         * Comparing (string | number) to number should not remove the
+         * string element.
+         *
+         * Comparing (string | number) to 1 will remove the string
+         * element, though this is not sound. This is a pragmatic
+         * choice.
+         *
+         * @see narrowTypeByEquality
+         *
+         * @param source
+         * @param target
+         */
+        function isCoercibleUnderDoubleEquals(source, target) {
+            return ((source.flags & (8 /* Number */ | 4 /* String */ | 512 /* BooleanLiteral */)) !== 0)
+                && ((target.flags & (8 /* Number */ | 4 /* String */ | 16 /* Boolean */)) !== 0);
+        }
         /**
          * Return true if type was inferred from an object literal, written as an object type literal, or is the shape of a module
          * with no call or construct signatures.
          */
         function isObjectTypeWithInferableIndex(type) {
-            return type.symbol && (type.symbol.flags & (4096 /* ObjectLiteral */ | 2048 /* TypeLiteral */ | 512 /* ValueModule */)) !== 0 &&
+            return type.symbol && (type.symbol.flags & (4096 /* ObjectLiteral */ | 2048 /* TypeLiteral */ | 384 /* Enum */ | 512 /* ValueModule */)) !== 0 &&
                 !typeHasCallOrConstructSignatures(type);
         }
         function createSymbolWithType(source, type) {
-            var symbol = createSymbol(source.flags, source.escapedName);
+            var symbol = createSymbol(source.flags, source.escapedName, ts.getCheckFlags(source) & 8 /* Readonly */);
             symbol.declarations = source.declarations;
             symbol.parent = source.parent;
             symbol.type = type;
@@ -44156,34 +45372,42 @@ var ts;
             var stringIndexInfo = getIndexInfoOfType(type, 0 /* String */);
             var numberIndexInfo = getIndexInfoOfType(type, 1 /* Number */);
             var result = createAnonymousType(type.symbol, members, ts.emptyArray, ts.emptyArray, stringIndexInfo && createIndexInfo(getWidenedType(stringIndexInfo.type), stringIndexInfo.isReadonly), numberIndexInfo && createIndexInfo(getWidenedType(numberIndexInfo.type), numberIndexInfo.isReadonly));
-            result.objectFlags |= (ts.getObjectFlags(type) & 16384 /* JSLiteral */); // Retain js literal flag through widening
+            result.objectFlags |= (ts.getObjectFlags(type) & (16384 /* JSLiteral */ | 1048576 /* NonInferrableType */)); // Retain js literal flag through widening
             return result;
         }
         function getWidenedType(type) {
             return getWidenedTypeWithContext(type, /*context*/ undefined);
         }
         function getWidenedTypeWithContext(type, context) {
-            if (ts.getObjectFlags(type) & 393216 /* RequiresWidening */) {
+            if (ts.getObjectFlags(type) & 786432 /* RequiresWidening */) {
+                if (context === undefined && type.widened) {
+                    return type.widened;
+                }
+                var result = void 0;
                 if (type.flags & 98304 /* Nullable */) {
-                    return anyType;
+                    result = anyType;
                 }
-                if (isObjectLiteralType(type)) {
-                    return getWidenedTypeOfObjectLiteral(type, context);
+                else if (isObjectLiteralType(type)) {
+                    result = getWidenedTypeOfObjectLiteral(type, context);
                 }
-                if (type.flags & 1048576 /* Union */) {
+                else if (type.flags & 1048576 /* Union */) {
                     var unionContext_1 = context || createWideningContext(/*parent*/ undefined, /*propertyName*/ undefined, type.types);
                     var widenedTypes = ts.sameMap(type.types, function (t) { return t.flags & 98304 /* Nullable */ ? t : getWidenedTypeWithContext(t, unionContext_1); });
                     // Widening an empty object literal transitions from a highly restrictive type to
                     // a highly inclusive one. For that reason we perform subtype reduction here if the
                     // union includes empty object types (e.g. reducing {} | string to just {}).
-                    return getUnionType(widenedTypes, ts.some(widenedTypes, isEmptyObjectType) ? 2 /* Subtype */ : 1 /* Literal */);
+                    result = getUnionType(widenedTypes, ts.some(widenedTypes, isEmptyObjectType) ? 2 /* Subtype */ : 1 /* Literal */);
                 }
-                if (type.flags & 2097152 /* Intersection */) {
-                    return getIntersectionType(ts.sameMap(type.types, getWidenedType));
+                else if (type.flags & 2097152 /* Intersection */) {
+                    result = getIntersectionType(ts.sameMap(type.types, getWidenedType));
                 }
-                if (isArrayType(type) || isTupleType(type)) {
-                    return createTypeReference(type.target, ts.sameMap(type.typeArguments, getWidenedType));
+                else if (isArrayType(type) || isTupleType(type)) {
+                    result = createTypeReference(type.target, ts.sameMap(type.typeArguments, getWidenedType));
                 }
+                if (result && context === undefined) {
+                    type.widened = result;
+                }
+                return result || type;
             }
             return type;
         }
@@ -44200,7 +45424,7 @@ var ts;
          */
         function reportWideningErrorsInType(type) {
             var errorReported = false;
-            if (ts.getObjectFlags(type) & 131072 /* ContainsWideningType */) {
+            if (ts.getObjectFlags(type) & 262144 /* ContainsWideningType */) {
                 if (type.flags & 1048576 /* Union */) {
                     if (ts.some(type.types, isEmptyObjectType)) {
                         errorReported = true;
@@ -44226,7 +45450,7 @@ var ts;
                     for (var _d = 0, _e = getPropertiesOfObjectType(type); _d < _e.length; _d++) {
                         var p = _e[_d];
                         var t = getTypeOfSymbol(p);
-                        if (ts.getObjectFlags(t) & 131072 /* ContainsWideningType */) {
+                        if (ts.getObjectFlags(t) & 262144 /* ContainsWideningType */) {
                             if (!reportWideningErrorsInType(t)) {
                                 error(p.valueDeclaration, ts.Diagnostics.Object_literal_s_property_0_implicitly_has_an_1_type, symbolToString(p), typeToString(getWidenedType(t)));
                             }
@@ -44237,7 +45461,7 @@ var ts;
             }
             return errorReported;
         }
-        function reportImplicitAny(declaration, type) {
+        function reportImplicitAny(declaration, type, wideningKind) {
             var typeAsString = typeToString(getWidenedType(type));
             if (ts.isInJSFile(declaration) && !ts.isCheckJsEnabledForFile(ts.getSourceFileOfNode(declaration), compilerOptions)) {
                 // Only report implicit any errors/suggestions in TS and ts-check JS files
@@ -44245,12 +45469,12 @@ var ts;
             }
             var diagnostic;
             switch (declaration.kind) {
-                case 204 /* BinaryExpression */:
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
+                case 205 /* BinaryExpression */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
                     diagnostic = noImplicitAny ? ts.Diagnostics.Member_0_implicitly_has_an_1_type : ts.Diagnostics.Member_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage;
                     break;
-                case 151 /* Parameter */:
+                case 152 /* Parameter */:
                     var param = declaration;
                     if (ts.isIdentifier(param.name) &&
                         (ts.isCallSignatureDeclaration(param.parent) || ts.isMethodSignature(param.parent) || ts.isFunctionTypeNode(param.parent)) &&
@@ -44265,30 +45489,37 @@ var ts;
                         noImplicitAny ? ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type : ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type_but_a_better_type_may_be_inferred_from_usage :
                         noImplicitAny ? ts.Diagnostics.Parameter_0_implicitly_has_an_1_type : ts.Diagnostics.Parameter_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage;
                     break;
-                case 186 /* BindingElement */:
+                case 187 /* BindingElement */:
                     diagnostic = ts.Diagnostics.Binding_element_0_implicitly_has_an_1_type;
                     if (!noImplicitAny) {
                         // Don't issue a suggestion for binding elements since the codefix doesn't yet support them.
                         return;
                     }
                     break;
-                case 294 /* JSDocFunctionType */:
+                case 295 /* JSDocFunctionType */:
                     error(declaration, ts.Diagnostics.Function_type_which_lacks_return_type_annotation_implicitly_has_an_0_return_type, typeAsString);
                     return;
-                case 239 /* FunctionDeclaration */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
+                case 240 /* FunctionDeclaration */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
                     if (noImplicitAny && !declaration.name) {
-                        error(declaration, ts.Diagnostics.Function_expression_which_lacks_return_type_annotation_implicitly_has_an_0_return_type, typeAsString);
+                        if (wideningKind === 1 /* GeneratorYield */) {
+                            error(declaration, ts.Diagnostics.Generator_implicitly_has_yield_type_0_because_it_does_not_yield_any_values_Consider_supplying_a_return_type_annotation, typeAsString);
+                        }
+                        else {
+                            error(declaration, ts.Diagnostics.Function_expression_which_lacks_return_type_annotation_implicitly_has_an_0_return_type, typeAsString);
+                        }
                         return;
                     }
-                    diagnostic = noImplicitAny ? ts.Diagnostics._0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type : ts.Diagnostics._0_implicitly_has_an_1_return_type_but_a_better_type_may_be_inferred_from_usage;
+                    diagnostic = !noImplicitAny ? ts.Diagnostics._0_implicitly_has_an_1_return_type_but_a_better_type_may_be_inferred_from_usage :
+                        wideningKind === 1 /* GeneratorYield */ ? ts.Diagnostics._0_which_lacks_return_type_annotation_implicitly_has_an_1_yield_type :
+                            ts.Diagnostics._0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type;
                     break;
-                case 181 /* MappedType */:
+                case 182 /* MappedType */:
                     if (noImplicitAny) {
                         error(declaration, ts.Diagnostics.Mapped_object_type_implicitly_has_an_any_template_type);
                     }
@@ -44298,15 +45529,15 @@ var ts;
             }
             errorOrSuggestion(noImplicitAny, declaration, diagnostic, ts.declarationNameToString(ts.getNameOfDeclaration(declaration)), typeAsString);
         }
-        function reportErrorsFromWidening(declaration, type) {
-            if (produceDiagnostics && noImplicitAny && ts.getObjectFlags(type) & 131072 /* ContainsWideningType */) {
+        function reportErrorsFromWidening(declaration, type, wideningKind) {
+            if (produceDiagnostics && noImplicitAny && ts.getObjectFlags(type) & 262144 /* ContainsWideningType */) {
                 // Report implicit any error within type if possible, otherwise report error on declaration
                 if (!reportWideningErrorsInType(type)) {
-                    reportImplicitAny(declaration, type);
+                    reportImplicitAny(declaration, type, wideningKind);
                 }
             }
         }
-        function forEachMatchingParameterType(source, target, callback) {
+        function applyToParameterTypes(source, target, callback) {
             var sourceCount = getParameterCount(source);
             var targetCount = getParameterCount(target);
             var sourceRestType = getEffectiveRestType(source);
@@ -44327,25 +45558,55 @@ var ts;
                 callback(getRestTypeAtPosition(source, paramCount), targetRestType);
             }
         }
-        function createInferenceContext(typeParameters, signature, flags, compareTypes, baseInferences) {
-            var inferences = baseInferences ? baseInferences.map(cloneInferenceInfo) : typeParameters.map(createInferenceInfo);
-            var context = mapper;
-            context.typeParameters = typeParameters;
-            context.signature = signature;
-            context.inferences = inferences;
-            context.flags = flags;
-            context.compareTypes = compareTypes || compareTypesAssignable;
+        function applyToReturnTypes(source, target, callback) {
+            var sourceTypePredicate = getTypePredicateOfSignature(source);
+            var targetTypePredicate = getTypePredicateOfSignature(target);
+            if (sourceTypePredicate && targetTypePredicate && sourceTypePredicate.kind === targetTypePredicate.kind &&
+                (sourceTypePredicate.kind === 0 /* This */ || sourceTypePredicate.parameterIndex === targetTypePredicate.parameterIndex)) {
+                callback(sourceTypePredicate.type, targetTypePredicate.type);
+            }
+            else {
+                callback(getReturnTypeOfSignature(source), getReturnTypeOfSignature(target));
+            }
+        }
+        function createInferenceContext(typeParameters, signature, flags, compareTypes) {
+            return createInferenceContextWorker(typeParameters.map(createInferenceInfo), signature, flags, compareTypes || compareTypesAssignable);
+        }
+        function cloneInferenceContext(context, extraFlags) {
+            if (extraFlags === void 0) { extraFlags = 0; }
+            return context && createInferenceContextWorker(ts.map(context.inferences, cloneInferenceInfo), context.signature, context.flags | extraFlags, context.compareTypes);
+        }
+        function createInferenceContextWorker(inferences, signature, flags, compareTypes) {
+            var context = {
+                inferences: inferences,
+                signature: signature,
+                flags: flags,
+                compareTypes: compareTypes,
+                mapper: function (t) { return mapToInferredType(context, t, /*fix*/ true); },
+                nonFixingMapper: function (t) { return mapToInferredType(context, t, /*fix*/ false); },
+            };
             return context;
-            function mapper(t) {
-                for (var i = 0; i < inferences.length; i++) {
-                    if (t === inferences[i].typeParameter) {
-                        if (!(context.flags & 4 /* NoFixing */)) {
-                            inferences[i].isFixed = true;
-                        }
-                        return getInferredType(context, i);
+        }
+        function mapToInferredType(context, t, fix) {
+            var inferences = context.inferences;
+            for (var i = 0; i < inferences.length; i++) {
+                var inference = inferences[i];
+                if (t === inference.typeParameter) {
+                    if (fix && !inference.isFixed) {
+                        clearCachedInferences(inferences);
+                        inference.isFixed = true;
                     }
+                    return getInferredType(context, i);
+                }
+            }
+            return t;
+        }
+        function clearCachedInferences(inferences) {
+            for (var _i = 0, inferences_1 = inferences; _i < inferences_1.length; _i++) {
+                var inference = inferences_1[_i];
+                if (!inference.isFixed) {
+                    inference.inferredType = undefined;
                 }
-                return t;
             }
         }
         function createInferenceInfo(typeParameter) {
@@ -44370,6 +45631,9 @@ var ts;
                 isFixed: inference.isFixed
             };
         }
+        function getMapperFromContext(context) {
+            return context && context.mapper;
+        }
         // Return true if the given type could possibly reference a type parameter for which
         // we perform type inference (i.e. a type parameter of a generic function). We cache
         // results for union and intersection types for performance reasons.
@@ -44377,7 +45641,7 @@ var ts;
             var objectFlags = ts.getObjectFlags(type);
             return !!(type.flags & 63176704 /* Instantiable */ ||
                 objectFlags & 4 /* Reference */ && ts.forEach(type.typeArguments, couldContainTypeVariables) ||
-                objectFlags & 16 /* Anonymous */ && type.symbol && type.symbol.flags & (16 /* Function */ | 8192 /* Method */ | 2048 /* TypeLiteral */ | 32 /* Class */) ||
+                objectFlags & 16 /* Anonymous */ && type.symbol && type.symbol.flags & (16 /* Function */ | 8192 /* Method */ | 32 /* Class */ | 2048 /* TypeLiteral */ | 4096 /* ObjectLiteral */) && type.symbol.declarations ||
                 objectFlags & 32 /* Mapped */ ||
                 type.flags & 3145728 /* UnionOrIntersection */ && couldUnionOrIntersectionContainTypeVariables(type));
         }
@@ -44388,7 +45652,10 @@ var ts;
             return type.couldContainTypeVariables;
         }
         function isTypeParameterAtTopLevel(type, typeParameter) {
-            return type === typeParameter || !!(type.flags & 3145728 /* UnionOrIntersection */) && ts.some(type.types, function (t) { return isTypeParameterAtTopLevel(t, typeParameter); });
+            return !!(type === typeParameter ||
+                type.flags & 3145728 /* UnionOrIntersection */ && ts.some(type.types, function (t) { return isTypeParameterAtTopLevel(t, typeParameter); }) ||
+                type.flags & 16777216 /* Conditional */ && (isTypeParameterAtTopLevel(getTrueTypeFromConditionalType(type), typeParameter) ||
+                    isTypeParameterAtTopLevel(getFalseTypeFromConditionalType(type), typeParameter)));
         }
         /** Create an object with properties named in the string literal type. Every property has type `any` */
         function createEmptyObjectTypeFromStringLiteral(type) {
@@ -44425,19 +45692,20 @@ var ts;
             reverseMappedCache.set(key, type);
             return type;
         }
+        // We consider a type to be partially inferable if it isn't marked non-inferable or if it is
+        // an object literal type with at least one property of an inferable type. For example, an object
+        // literal { a: 123, b: x => true } is marked non-inferable because it contains a context sensitive
+        // arrow function, but is considered partially inferable because property 'a' has an inferable type.
+        function isPartiallyInferableType(type) {
+            return !(ts.getObjectFlags(type) & 1048576 /* NonInferrableType */) ||
+                isObjectLiteralType(type) && ts.some(getPropertiesOfType(type), function (prop) { return isPartiallyInferableType(getTypeOfSymbol(prop)); });
+        }
         function createReverseMappedType(source, target, constraint) {
-            var properties = getPropertiesOfType(source);
-            if (properties.length === 0 && !getIndexInfoOfType(source, 0 /* String */)) {
+            // We consider a source type reverse mappable if it has a string index signature or if
+            // it has one or more properties and is of a partially inferable type.
+            if (!(getIndexInfoOfType(source, 0 /* String */) || getPropertiesOfType(source).length !== 0 && isPartiallyInferableType(source))) {
                 return undefined;
             }
-            // If any property contains context sensitive functions that have been skipped, the source type
-            // is incomplete and we can't infer a meaningful input type.
-            for (var _i = 0, properties_3 = properties; _i < properties_3.length; _i++) {
-                var prop = properties_3[_i];
-                if (ts.getObjectFlags(getTypeOfSymbol(prop)) & 524288 /* ContainsAnyFunctionType */) {
-                    return undefined;
-                }
-            }
             // For arrays and tuples we infer new arrays and tuples where the reverse mapping has been
             // applied to the element type(s).
             if (isArrayType(source)) {
@@ -44465,20 +45733,20 @@ var ts;
             var templateType = getTemplateTypeFromMappedType(target);
             var inference = createInferenceInfo(typeParameter);
             inferTypes([inference], sourceType, templateType);
-            return getTypeFromInference(inference);
+            return getTypeFromInference(inference) || unknownType;
         }
         function getUnmatchedProperties(source, target, requireOptionalProperties, matchDiscriminantProperties) {
-            var properties, _i, properties_4, targetProp, sourceProp, targetType, sourceType;
+            var properties, _i, properties_2, targetProp, sourceProp, targetType, sourceType;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        properties = target.flags & 2097152 /* Intersection */ ? getPropertiesOfUnionOrIntersectionType(target) : getPropertiesOfObjectType(target);
-                        _i = 0, properties_4 = properties;
+                        properties = target.flags & 1048576 /* Union */ ? getPossiblePropertiesOfUnionType(target) : getPropertiesOfType(target);
+                        _i = 0, properties_2 = properties;
                         _a.label = 1;
                     case 1:
-                        if (!(_i < properties_4.length)) return [3 /*break*/, 6];
-                        targetProp = properties_4[_i];
-                        if (!(requireOptionalProperties || !(targetProp.flags & 16777216 /* Optional */))) return [3 /*break*/, 5];
+                        if (!(_i < properties_2.length)) return [3 /*break*/, 6];
+                        targetProp = properties_2[_i];
+                        if (!(requireOptionalProperties || !(targetProp.flags & 16777216 /* Optional */ || ts.getCheckFlags(targetProp) & 48 /* Partial */))) return [3 /*break*/, 5];
                         sourceProp = getPropertyOfType(source, targetProp.escapedName);
                         if (!!sourceProp) return [3 /*break*/, 3];
                         return [4 /*yield*/, targetProp];
@@ -44503,7 +45771,9 @@ var ts;
             });
         }
         function getUnmatchedProperty(source, target, requireOptionalProperties, matchDiscriminantProperties) {
-            return getUnmatchedProperties(source, target, requireOptionalProperties, matchDiscriminantProperties).next().value;
+            var result = getUnmatchedProperties(source, target, requireOptionalProperties, matchDiscriminantProperties).next();
+            if (!result.done)
+                return result.value;
         }
         function tupleTypesDefinitelyUnrelated(source, target) {
             return target.target.minLength > source.target.minLength ||
@@ -44519,15 +45789,17 @@ var ts;
         function getTypeFromInference(inference) {
             return inference.candidates ? getUnionType(inference.candidates, 2 /* Subtype */) :
                 inference.contraCandidates ? getIntersectionType(inference.contraCandidates) :
-                    emptyObjectType;
+                    undefined;
         }
-        function inferTypes(inferences, originalSource, originalTarget, priority) {
+        function inferTypes(inferences, originalSource, originalTarget, priority, contravariant) {
             if (priority === void 0) { priority = 0; }
+            if (contravariant === void 0) { contravariant = false; }
             var symbolStack;
             var visited;
-            var contravariant = false;
             var bivariant = false;
             var propagationType;
+            var inferenceCount = 0;
+            var inferenceIncomplete = false;
             var allowComplexConstraintInference = true;
             inferFromTypes(originalSource, originalTarget);
             function inferFromTypes(source, target) {
@@ -44547,11 +45819,7 @@ var ts;
                 if (source.aliasSymbol && source.aliasTypeArguments && source.aliasSymbol === target.aliasSymbol) {
                     // Source and target are types originating in the same generic type alias declaration.
                     // Simply infer from source type arguments to target type arguments.
-                    var sourceTypes = source.aliasTypeArguments;
-                    var targetTypes = target.aliasTypeArguments;
-                    for (var i = 0; i < sourceTypes.length; i++) {
-                        inferFromTypes(sourceTypes[i], targetTypes[i]);
-                    }
+                    inferFromTypeArguments(source.aliasTypeArguments, target.aliasTypeArguments, getAliasVariances(source.aliasSymbol));
                     return;
                 }
                 if (source.flags & 1048576 /* Union */ && target.flags & 1048576 /* Union */ && !(source.flags & 1024 /* EnumLiteral */ && target.flags & 1024 /* EnumLiteral */) ||
@@ -44574,25 +45842,34 @@ var ts;
                     var matchingTypes = void 0;
                     for (var _b = 0, _c = source.types; _b < _c.length; _b++) {
                         var t = _c[_b];
-                        if (typeIdenticalToSomeType(t, target.types)) {
-                            (matchingTypes || (matchingTypes = [])).push(t);
-                            inferFromTypes(t, t);
-                        }
-                        else if (t.flags & (256 /* NumberLiteral */ | 128 /* StringLiteral */)) {
-                            var b = getBaseTypeOfLiteralType(t);
-                            if (typeIdenticalToSomeType(b, target.types)) {
-                                (matchingTypes || (matchingTypes = [])).push(t, b);
-                            }
+                        var matched = findMatchedType(t, target);
+                        if (matched) {
+                            (matchingTypes || (matchingTypes = [])).push(matched);
+                            inferFromTypes(matched, matched);
                         }
                     }
                     // Next, to improve the quality of inferences, reduce the source and target types by
                     // removing the identically matched constituents. For example, when inferring from
                     // 'string | string[]' to 'string | T' we reduce the types to 'string[]' and 'T'.
                     if (matchingTypes) {
-                        source = removeTypesFromUnionOrIntersection(source, matchingTypes);
-                        target = removeTypesFromUnionOrIntersection(target, matchingTypes);
+                        var s = removeTypesFromUnionOrIntersection(source, matchingTypes);
+                        var t = removeTypesFromUnionOrIntersection(target, matchingTypes);
+                        if (!(s && t))
+                            return;
+                        source = s;
+                        target = t;
                     }
                 }
+                else if (target.flags & 1048576 /* Union */ && !(target.flags & 1024 /* EnumLiteral */) || target.flags & 2097152 /* Intersection */) {
+                    var matched = findMatchedType(source, target);
+                    if (matched) {
+                        inferFromTypes(matched, matched);
+                        return;
+                    }
+                }
+                else if (target.flags & (8388608 /* IndexedAccess */ | 33554432 /* Substitution */)) {
+                    target = getActualTypeVariable(target);
+                }
                 if (target.flags & 8650752 /* TypeVariable */) {
                     // If target is a type parameter, make an inference, unless the source type contains
                     // the anyFunctionType (the wildcard type that's used to avoid contextually typing functions).
@@ -44601,7 +45878,7 @@ var ts;
                     // not contain anyFunctionType when we come back to this argument for its second round
                     // of inference. Also, we exclude inferences for silentNeverType (which is used as a wildcard
                     // when constructing types from type parameters that had no inference candidates).
-                    if (ts.getObjectFlags(source) & 524288 /* ContainsAnyFunctionType */ || source === silentNeverType || (priority & 8 /* ReturnType */ && (source === autoType || source === autoArrayType))) {
+                    if (ts.getObjectFlags(source) & 1048576 /* NonInferrableType */ || source === silentNeverType || (priority & 16 /* ReturnType */ && (source === autoType || source === autoArrayType))) {
                         return;
                     }
                     var inference = getInferenceInfoForType(target);
@@ -44618,54 +45895,46 @@ var ts;
                                 // We make contravariant inferences only if we are in a pure contravariant position,
                                 // i.e. only if we have not descended into a bivariant position.
                                 if (contravariant && !bivariant) {
-                                    inference.contraCandidates = ts.appendIfUnique(inference.contraCandidates, candidate);
+                                    if (!ts.contains(inference.contraCandidates, candidate)) {
+                                        inference.contraCandidates = ts.append(inference.contraCandidates, candidate);
+                                        clearCachedInferences(inferences);
+                                    }
                                 }
-                                else {
-                                    inference.candidates = ts.appendIfUnique(inference.candidates, candidate);
+                                else if (!ts.contains(inference.candidates, candidate)) {
+                                    inference.candidates = ts.append(inference.candidates, candidate);
+                                    clearCachedInferences(inferences);
                                 }
                             }
-                            if (!(priority & 8 /* ReturnType */) && target.flags & 262144 /* TypeParameter */ && !isTypeParameterAtTopLevel(originalTarget, target)) {
+                            if (!(priority & 16 /* ReturnType */) && target.flags & 262144 /* TypeParameter */ && inference.topLevel && !isTypeParameterAtTopLevel(originalTarget, target)) {
                                 inference.topLevel = false;
+                                clearCachedInferences(inferences);
                             }
                         }
+                        inferenceCount++;
                         return;
                     }
                     else {
                         // Infer to the simplified version of an indexed access, if possible, to (hopefully) expose more bare type parameters to the inference engine
-                        var simplified = getSimplifiedType(target);
+                        var simplified = getSimplifiedType(target, /*writing*/ false);
                         if (simplified !== target) {
-                            inferFromTypesOnce(source, simplified);
+                            invokeOnce(source, simplified, inferFromTypes);
                         }
                         else if (target.flags & 8388608 /* IndexedAccess */) {
-                            var indexType = getSimplifiedType(target.indexType);
+                            var indexType = getSimplifiedType(target.indexType, /*writing*/ false);
                             // Generally simplifications of instantiable indexes are avoided to keep relationship checking correct, however if our target is an access, we can consider
                             // that key of that access to be "instantiated", since we're looking to find the infernce goal in any way we can.
                             if (indexType.flags & 63176704 /* Instantiable */) {
-                                var simplified_1 = distributeIndexOverObjectType(getSimplifiedType(target.objectType), indexType);
+                                var simplified_1 = distributeIndexOverObjectType(getSimplifiedType(target.objectType, /*writing*/ false), indexType, /*writing*/ false);
                                 if (simplified_1 && simplified_1 !== target) {
-                                    inferFromTypesOnce(source, simplified_1);
+                                    invokeOnce(source, simplified_1, inferFromTypes);
                                 }
                             }
                         }
                     }
                 }
-                else if (target.flags & 33554432 /* Substitution */) {
-                    inferFromTypes(source, target.typeVariable);
-                }
-                if (ts.getObjectFlags(source) & 4 /* Reference */ && ts.getObjectFlags(target) & 4 /* Reference */ && source.target === target.target) {
+                if (ts.getObjectFlags(source) & 4 /* Reference */ && ts.getObjectFlags(target) & 4 /* Reference */ && (source.target === target.target || isArrayType(source) && isArrayType(target))) {
                     // If source and target are references to the same generic type, infer from type arguments
-                    var sourceTypes = source.typeArguments || ts.emptyArray;
-                    var targetTypes = target.typeArguments || ts.emptyArray;
-                    var count = sourceTypes.length < targetTypes.length ? sourceTypes.length : targetTypes.length;
-                    var variances = getVariances(source.target);
-                    for (var i = 0; i < count; i++) {
-                        if (i < variances.length && variances[i] === 2 /* Contravariant */) {
-                            inferFromContravariantTypes(sourceTypes[i], targetTypes[i]);
-                        }
-                        else {
-                            inferFromTypes(sourceTypes[i], targetTypes[i]);
-                        }
-                    }
+                    inferFromTypeArguments(source.typeArguments || ts.emptyArray, target.typeArguments || ts.emptyArray, getVariances(source.target));
                 }
                 else if (source.flags & 4194304 /* Index */ && target.flags & 4194304 /* Index */) {
                     contravariant = !contravariant;
@@ -44676,7 +45945,7 @@ var ts;
                     var empty = createEmptyObjectTypeFromStringLiteral(source);
                     contravariant = !contravariant;
                     var savePriority = priority;
-                    priority |= 16 /* LiteralKeyof */;
+                    priority |= 32 /* LiteralKeyof */;
                     inferFromTypes(empty, target.type);
                     priority = savePriority;
                     contravariant = !contravariant;
@@ -44691,34 +45960,23 @@ var ts;
                     inferFromTypes(getTrueTypeFromConditionalType(source), getTrueTypeFromConditionalType(target));
                     inferFromTypes(getFalseTypeFromConditionalType(source), getFalseTypeFromConditionalType(target));
                 }
-                else if (target.flags & 16777216 /* Conditional */) {
-                    inferFromTypes(source, getTrueTypeFromConditionalType(target));
-                    inferFromTypes(source, getFalseTypeFromConditionalType(target));
+                else if (target.flags & 16777216 /* Conditional */ && !contravariant) {
+                    var targetTypes = [getTrueTypeFromConditionalType(target), getFalseTypeFromConditionalType(target)];
+                    inferToMultipleTypes(source, targetTypes, target.flags);
                 }
                 else if (target.flags & 3145728 /* UnionOrIntersection */) {
-                    for (var _d = 0, _e = target.types; _d < _e.length; _d++) {
-                        var t = _e[_d];
-                        var savePriority = priority;
-                        // Inferences directly to naked type variables are given lower priority as they are
-                        // less specific. For example, when inferring from Promise<string> to T | Promise<T>,
-                        // we want to infer string for T, not Promise<string> | string.
-                        if (getInferenceInfoForType(t)) {
-                            priority |= 1 /* NakedTypeVariable */;
-                        }
-                        inferFromTypes(source, t);
-                        priority = savePriority;
-                    }
+                    inferToMultipleTypes(source, target.types, target.flags);
                 }
                 else if (source.flags & 1048576 /* Union */) {
                     // Source is a union or intersection type, infer from each constituent type
                     var sourceTypes = source.types;
-                    for (var _f = 0, sourceTypes_3 = sourceTypes; _f < sourceTypes_3.length; _f++) {
-                        var sourceType = sourceTypes_3[_f];
+                    for (var _d = 0, sourceTypes_3 = sourceTypes; _d < sourceTypes_3.length; _d++) {
+                        var sourceType = sourceTypes_3[_d];
                         inferFromTypes(sourceType, target);
                     }
                 }
                 else {
-                    if (!(priority & 32 /* NoConstraints */ && source.flags & (2097152 /* Intersection */ | 63176704 /* Instantiable */))) {
+                    if (!(priority & 64 /* NoConstraints */ && source.flags & (2097152 /* Intersection */ | 63176704 /* Instantiable */))) {
                         var apparentSource = getApparentType(source);
                         // getApparentType can return _any_ type, since an indexed access or conditional may simplify to any other type.
                         // If that occurs and it doesn't simplify to an object or intersection, we'll need to restart `inferFromTypes`
@@ -44737,41 +45995,35 @@ var ts;
                         source = apparentSource;
                     }
                     if (source.flags & (524288 /* Object */ | 2097152 /* Intersection */)) {
-                        var key = source.id + "," + target.id;
-                        if (visited && visited.get(key)) {
-                            return;
-                        }
-                        (visited || (visited = ts.createMap())).set(key, true);
-                        // If we are already processing another target type with the same associated symbol (such as
-                        // an instantiation of the same generic type), we do not explore this target as it would yield
-                        // no further inferences. We exclude the static side of classes from this check since it shares
-                        // its symbol with the instance side which would lead to false positives.
-                        var isNonConstructorObject = target.flags & 524288 /* Object */ &&
-                            !(ts.getObjectFlags(target) & 16 /* Anonymous */ && target.symbol && target.symbol.flags & 32 /* Class */);
-                        var symbol = isNonConstructorObject ? target.symbol : undefined;
-                        if (symbol) {
-                            if (ts.contains(symbolStack, symbol)) {
-                                return;
-                            }
-                            (symbolStack || (symbolStack = [])).push(symbol);
-                            inferFromObjectTypes(source, target);
-                            symbolStack.pop();
-                        }
-                        else {
-                            inferFromObjectTypes(source, target);
-                        }
+                        invokeOnce(source, target, inferFromObjectTypes);
                     }
                 }
-                function inferFromTypesOnce(source, target) {
-                    var key = source.id + "," + target.id;
-                    if (!visited || !visited.get(key)) {
-                        (visited || (visited = ts.createMap())).set(key, true);
-                        inferFromTypes(source, target);
+            }
+            function invokeOnce(source, target, action) {
+                var key = source.id + "," + target.id;
+                var count = visited && visited.get(key);
+                if (count !== undefined) {
+                    inferenceCount += count;
+                    return;
+                }
+                (visited || (visited = ts.createMap())).set(key, 0);
+                var startCount = inferenceCount;
+                action(source, target);
+                visited.set(key, inferenceCount - startCount);
+            }
+            function inferFromTypeArguments(sourceTypes, targetTypes, variances) {
+                var count = sourceTypes.length < targetTypes.length ? sourceTypes.length : targetTypes.length;
+                for (var i = 0; i < count; i++) {
+                    if (i < variances.length && (variances[i] & 7 /* VarianceMask */) === 2 /* Contravariant */) {
+                        inferFromContravariantTypes(sourceTypes[i], targetTypes[i]);
+                    }
+                    else {
+                        inferFromTypes(sourceTypes[i], targetTypes[i]);
                     }
                 }
             }
             function inferFromContravariantTypes(source, target) {
-                if (strictFunctionTypes || priority & 64 /* AlwaysStrict */) {
+                if (strictFunctionTypes || priority & 128 /* AlwaysStrict */) {
                     contravariant = !contravariant;
                     inferFromTypes(source, target);
                     contravariant = !contravariant;
@@ -44782,8 +46034,8 @@ var ts;
             }
             function getInferenceInfoForType(type) {
                 if (type.flags & 8650752 /* TypeVariable */) {
-                    for (var _i = 0, inferences_1 = inferences; _i < inferences_1.length; _i++) {
-                        var inference = inferences_1[_i];
+                    for (var _i = 0, inferences_2 = inferences; _i < inferences_2.length; _i++) {
+                        var inference = inferences_2[_i];
                         if (type === inference.typeParameter) {
                             return inference;
                         }
@@ -44791,6 +46043,74 @@ var ts;
                 }
                 return undefined;
             }
+            function inferToMultipleTypes(source, targets, targetFlags) {
+                var typeVariableCount = 0;
+                if (targetFlags & 1048576 /* Union */) {
+                    var nakedTypeVariable = void 0;
+                    var sources = source.flags & 1048576 /* Union */ ? source.types : [source];
+                    var matched_1 = new Array(sources.length);
+                    var saveInferenceIncomplete = inferenceIncomplete;
+                    inferenceIncomplete = false;
+                    // First infer to types that are not naked type variables. For each source type we
+                    // track whether inferences were made from that particular type to some target.
+                    for (var _i = 0, targets_1 = targets; _i < targets_1.length; _i++) {
+                        var t = targets_1[_i];
+                        if (getInferenceInfoForType(t)) {
+                            nakedTypeVariable = t;
+                            typeVariableCount++;
+                        }
+                        else {
+                            for (var i = 0; i < sources.length; i++) {
+                                var count = inferenceCount;
+                                inferFromTypes(sources[i], t);
+                                if (count !== inferenceCount)
+                                    matched_1[i] = true;
+                            }
+                        }
+                    }
+                    var inferenceComplete = !inferenceIncomplete;
+                    inferenceIncomplete = inferenceIncomplete || saveInferenceIncomplete;
+                    // If the target has a single naked type variable and inference completed (meaning we
+                    // explored the types fully), create a union of the source types from which no inferences
+                    // have been made so far and infer from that union to the naked type variable.
+                    if (typeVariableCount === 1 && inferenceComplete) {
+                        var unmatched = ts.flatMap(sources, function (s, i) { return matched_1[i] ? undefined : s; });
+                        if (unmatched.length) {
+                            inferFromTypes(getUnionType(unmatched), nakedTypeVariable);
+                            return;
+                        }
+                    }
+                }
+                else {
+                    // We infer from types that are not naked type variables first so that inferences we
+                    // make from nested naked type variables and given slightly higher priority by virtue
+                    // of being first in the candidates array.
+                    for (var _a = 0, targets_2 = targets; _a < targets_2.length; _a++) {
+                        var t = targets_2[_a];
+                        if (getInferenceInfoForType(t)) {
+                            typeVariableCount++;
+                        }
+                        else {
+                            inferFromTypes(source, t);
+                        }
+                    }
+                }
+                // Inferences directly to naked type variables are given lower priority as they are
+                // less specific. For example, when inferring from Promise<string> to T | Promise<T>,
+                // we want to infer string for T, not Promise<string> | string. For intersection types
+                // we only infer to single naked type variables.
+                if (targetFlags & 2097152 /* Intersection */ ? typeVariableCount === 1 : typeVariableCount > 0) {
+                    var savePriority = priority;
+                    priority |= 1 /* NakedTypeVariable */;
+                    for (var _b = 0, targets_3 = targets; _b < targets_3.length; _b++) {
+                        var t = targets_3[_b];
+                        if (getInferenceInfoForType(t)) {
+                            inferFromTypes(source, t);
+                        }
+                    }
+                    priority = savePriority;
+                }
+            }
             function inferToMappedType(source, target, constraintType) {
                 if (constraintType.flags & 1048576 /* Union */) {
                     var result = false;
@@ -44810,7 +46130,11 @@ var ts;
                         var inferredType = inferTypeForHomomorphicMappedType(source, target, constraintType);
                         if (inferredType) {
                             var savePriority = priority;
-                            priority |= 2 /* HomomorphicMappedType */;
+                            // We assign a lower priority to inferences made from types containing non-inferrable
+                            // types because we may only have a partial result (i.e. we may have failed to make
+                            // reverse inferences for some properties).
+                            priority |= ts.getObjectFlags(source) & 1048576 /* NonInferrableType */ ?
+                                4 /* PartialHomomorphicMappedType */ : 2 /* HomomorphicMappedType */;
                             inferFromTypes(inferredType, inference.typeParameter);
                             priority = savePriority;
                         }
@@ -44821,7 +46145,7 @@ var ts;
                     // We're inferring from some source type S to a mapped type { [P in K]: X }, where K is a type
                     // parameter. First infer from 'keyof S' to K.
                     var savePriority = priority;
-                    priority |= 4 /* MappedTypeConstraint */;
+                    priority |= 8 /* MappedTypeConstraint */;
                     inferFromTypes(getIndexType(source), constraintType);
                     priority = savePriority;
                     // If K is constrained to a type C, also infer to C. Thus, for a mapped type { [P in K]: X },
@@ -44834,16 +46158,37 @@ var ts;
                     }
                     // If no inferences can be made to K's constraint, infer from a union of the property types
                     // in the source to the template type X.
-                    var valueTypes = ts.compact([
-                        getIndexTypeOfType(source, 0 /* String */),
-                        getIndexTypeOfType(source, 1 /* Number */)
-                    ].concat(ts.map(getPropertiesOfType(source), getTypeOfSymbol)));
-                    inferFromTypes(getUnionType(valueTypes), getTemplateTypeFromMappedType(target));
+                    var propTypes = ts.map(getPropertiesOfType(source), getTypeOfSymbol);
+                    var stringIndexType = getIndexTypeOfType(source, 0 /* String */);
+                    var numberIndexInfo = getNonEnumNumberIndexInfo(source);
+                    var numberIndexType = numberIndexInfo && numberIndexInfo.type;
+                    inferFromTypes(getUnionType(ts.append(ts.append(propTypes, stringIndexType), numberIndexType)), getTemplateTypeFromMappedType(target));
                     return true;
                 }
                 return false;
             }
             function inferFromObjectTypes(source, target) {
+                // If we are already processing another target type with the same associated symbol (such as
+                // an instantiation of the same generic type), we do not explore this target as it would yield
+                // no further inferences. We exclude the static side of classes from this check since it shares
+                // its symbol with the instance side which would lead to false positives.
+                var isNonConstructorObject = target.flags & 524288 /* Object */ &&
+                    !(ts.getObjectFlags(target) & 16 /* Anonymous */ && target.symbol && target.symbol.flags & 32 /* Class */);
+                var symbol = isNonConstructorObject ? target.symbol : undefined;
+                if (symbol) {
+                    if (ts.contains(symbolStack, symbol)) {
+                        inferenceIncomplete = true;
+                        return;
+                    }
+                    (symbolStack || (symbolStack = [])).push(symbol);
+                    inferFromObjectTypesWorker(source, target);
+                    symbolStack.pop();
+                }
+                else {
+                    inferFromObjectTypesWorker(source, target);
+                }
+            }
+            function inferFromObjectTypesWorker(source, target) {
                 if (isGenericMappedType(source) && isGenericMappedType(target)) {
                     // The source and target types are generic types { [P in S]: X } and { [P in T]: Y }, so we infer
                     // from S to T and from X to Y.
@@ -44892,8 +46237,8 @@ var ts;
                     }
                 }
                 var properties = getPropertiesOfObjectType(target);
-                for (var _i = 0, properties_5 = properties; _i < properties_5.length; _i++) {
-                    var targetProp = properties_5[_i];
+                for (var _i = 0, properties_3 = properties; _i < properties_3.length; _i++) {
+                    var targetProp = properties_3[_i];
                     var sourceProp = getPropertyOfType(source, targetProp.escapedName);
                     if (sourceProp) {
                         inferFromTypes(getTypeOfSymbol(sourceProp), getTypeOfSymbol(targetProp));
@@ -44906,7 +46251,7 @@ var ts;
                 var sourceLen = sourceSignatures.length;
                 var targetLen = targetSignatures.length;
                 var len = sourceLen < targetLen ? sourceLen : targetLen;
-                var skipParameters = !!(ts.getObjectFlags(source) & 524288 /* ContainsAnyFunctionType */);
+                var skipParameters = !!(ts.getObjectFlags(source) & 1048576 /* NonInferrableType */);
                 for (var i = 0; i < len; i++) {
                     inferFromSignature(getBaseSignature(sourceSignatures[sourceLen - len + i]), getBaseSignature(targetSignatures[targetLen - len + i]), skipParameters);
                 }
@@ -44916,18 +46261,11 @@ var ts;
                     var saveBivariant = bivariant;
                     var kind = target.declaration ? target.declaration.kind : 0 /* Unknown */;
                     // Once we descend into a bivariant signature we remain bivariant for all nested inferences
-                    bivariant = bivariant || kind === 156 /* MethodDeclaration */ || kind === 155 /* MethodSignature */ || kind === 157 /* Constructor */;
-                    forEachMatchingParameterType(source, target, inferFromContravariantTypes);
+                    bivariant = bivariant || kind === 157 /* MethodDeclaration */ || kind === 156 /* MethodSignature */ || kind === 158 /* Constructor */;
+                    applyToParameterTypes(source, target, inferFromContravariantTypes);
                     bivariant = saveBivariant;
                 }
-                var sourceTypePredicate = getTypePredicateOfSignature(source);
-                var targetTypePredicate = getTypePredicateOfSignature(target);
-                if (sourceTypePredicate && targetTypePredicate && sourceTypePredicate.kind === targetTypePredicate.kind) {
-                    inferFromTypes(sourceTypePredicate.type, targetTypePredicate.type);
-                }
-                else {
-                    inferFromTypes(getReturnTypeOfSignature(source), getReturnTypeOfSignature(target));
-                }
+                applyToReturnTypes(source, target, inferFromTypes);
             }
             function inferFromIndexTypes(source, target) {
                 var targetStringIndexType = getIndexTypeOfType(target, 0 /* String */);
@@ -44949,15 +46287,33 @@ var ts;
                 }
             }
         }
-        function typeIdenticalToSomeType(type, types) {
+        function isMatchableType(type) {
+            // We exclude non-anonymous object types because some frameworks (e.g. Ember) rely on the ability to
+            // infer between types that don't witness their type variables. Such types would otherwise be eliminated
+            // because they appear identical.
+            return !(type.flags & 524288 /* Object */) || !!(ts.getObjectFlags(type) & 16 /* Anonymous */);
+        }
+        function typeMatchedBySomeType(type, types) {
             for (var _i = 0, types_11 = types; _i < types_11.length; _i++) {
                 var t = types_11[_i];
-                if (isTypeIdenticalTo(t, type)) {
+                if (t === type || isMatchableType(t) && isMatchableType(type) && isTypeIdenticalTo(t, type)) {
                     return true;
                 }
             }
             return false;
         }
+        function findMatchedType(type, target) {
+            if (typeMatchedBySomeType(type, target.types)) {
+                return type;
+            }
+            if (type.flags & (256 /* NumberLiteral */ | 128 /* StringLiteral */) && target.flags & 1048576 /* Union */) {
+                var base = getBaseTypeOfLiteralType(type);
+                if (typeMatchedBySomeType(base, target.types)) {
+                    return base;
+                }
+            }
+            return undefined;
+        }
         /**
          * Return a new union or intersection type computed by removing a given set of types
          * from a given union or intersection type.
@@ -44966,11 +46322,11 @@ var ts;
             var reducedTypes = [];
             for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
                 var t = _a[_i];
-                if (!typeIdenticalToSomeType(t, typesToRemove)) {
+                if (!typeMatchedBySomeType(t, typesToRemove)) {
                     reducedTypes.push(t);
                 }
             }
-            return type.flags & 1048576 /* Union */ ? getUnionType(reducedTypes) : getIntersectionType(reducedTypes);
+            return reducedTypes.length ? type.flags & 1048576 /* Union */ ? getUnionType(reducedTypes) : getIntersectionType(reducedTypes) : undefined;
         }
         function hasPrimitiveConstraint(type) {
             var constraint = getConstraintOfTypeParameter(type);
@@ -44979,22 +46335,25 @@ var ts;
         function isObjectLiteralType(type) {
             return !!(ts.getObjectFlags(type) & 128 /* ObjectLiteral */);
         }
-        function widenObjectLiteralCandidates(candidates) {
+        function isObjectOrArrayLiteralType(type) {
+            return !!(ts.getObjectFlags(type) & (128 /* ObjectLiteral */ | 65536 /* ArrayLiteral */));
+        }
+        function unionObjectAndArrayLiteralCandidates(candidates) {
             if (candidates.length > 1) {
-                var objectLiterals = ts.filter(candidates, isObjectLiteralType);
+                var objectLiterals = ts.filter(candidates, isObjectOrArrayLiteralType);
                 if (objectLiterals.length) {
-                    var objectLiteralsType = getWidenedType(getUnionType(objectLiterals, 2 /* Subtype */));
-                    return ts.concatenate(ts.filter(candidates, function (t) { return !isObjectLiteralType(t); }), [objectLiteralsType]);
+                    var literalsType = getUnionType(objectLiterals, 2 /* Subtype */);
+                    return ts.concatenate(ts.filter(candidates, function (t) { return !isObjectOrArrayLiteralType(t); }), [literalsType]);
                 }
             }
             return candidates;
         }
         function getContravariantInference(inference) {
-            return inference.priority & 28 /* PriorityImpliesCombination */ ? getIntersectionType(inference.contraCandidates) : getCommonSubtype(inference.contraCandidates);
+            return inference.priority & 56 /* PriorityImpliesCombination */ ? getIntersectionType(inference.contraCandidates) : getCommonSubtype(inference.contraCandidates);
         }
         function getCovariantInference(inference, signature) {
-            // Extract all object literal types and replace them with a single widened and normalized type.
-            var candidates = widenObjectLiteralCandidates(inference.candidates);
+            // Extract all object and array literal types and replace them with a single widened and normalized type.
+            var candidates = unionObjectAndArrayLiteralCandidates(inference.candidates);
             // We widen inferred literal types if
             // all inferences were made to top-level occurrences of the type parameter, and
             // the type parameter has no constraint or its constraint includes no primitive or literal types, and
@@ -45007,15 +46366,15 @@ var ts;
                     candidates;
             // If all inferences were made from a position that implies a combined result, infer a union type.
             // Otherwise, infer a common supertype.
-            var unwidenedType = inference.priority & 28 /* PriorityImpliesCombination */ ?
+            var unwidenedType = inference.priority & 56 /* PriorityImpliesCombination */ ?
                 getUnionType(baseCandidates, 2 /* Subtype */) :
                 getCommonSupertype(baseCandidates);
             return getWidenedType(unwidenedType);
         }
         function getInferredType(context, index) {
             var inference = context.inferences[index];
-            var inferredType = inference.inferredType;
-            if (!inferredType) {
+            if (!inference.inferredType) {
+                var inferredType = void 0;
                 var signature = context.signature;
                 if (signature) {
                     var inferredCovariantType = inference.candidates ? getCovariantInference(inference, signature) : undefined;
@@ -45044,31 +46403,26 @@ var ts;
                         if (defaultType) {
                             // Instantiate the default type. Any forward reference to a type
                             // parameter should be instantiated to the empty object type.
-                            inferredType = instantiateType(defaultType, combineTypeMappers(createBackreferenceMapper(context.typeParameters, index), context));
-                        }
-                        else {
-                            inferredType = getDefaultTypeArgumentType(!!(context.flags & 2 /* AnyDefault */));
+                            inferredType = instantiateType(defaultType, combineTypeMappers(createBackreferenceMapper(context, index), context.nonFixingMapper));
                         }
                     }
                 }
                 else {
                     inferredType = getTypeFromInference(inference);
                 }
-                inference.inferredType = inferredType;
+                inference.inferredType = inferredType || getDefaultTypeArgumentType(!!(context.flags & 2 /* AnyDefault */));
                 var constraint = getConstraintOfTypeParameter(inference.typeParameter);
                 if (constraint) {
-                    context.flags |= 4 /* NoFixing */;
-                    var instantiatedConstraint = instantiateType(constraint, context);
-                    if (!context.compareTypes(inferredType, getTypeWithThisArgument(instantiatedConstraint, inferredType))) {
+                    var instantiatedConstraint = instantiateType(constraint, context.nonFixingMapper);
+                    if (!inferredType || !context.compareTypes(inferredType, getTypeWithThisArgument(instantiatedConstraint, inferredType))) {
                         inference.inferredType = inferredType = instantiatedConstraint;
                     }
-                    context.flags &= ~4 /* NoFixing */;
                 }
             }
-            return inferredType;
+            return inference.inferredType;
         }
         function getDefaultTypeArgumentType(isInJavaScriptFile) {
-            return isInJavaScriptFile ? anyType : emptyObjectType;
+            return isInJavaScriptFile ? anyType : unknownType;
         }
         function getInferredTypes(context) {
             var result = [];
@@ -45078,8 +46432,8 @@ var ts;
             return result;
         }
         // EXPRESSION TYPE CHECKING
-        function getCannotFindNameDiagnosticForName(name) {
-            switch (name) {
+        function getCannotFindNameDiagnosticForName(node) {
+            switch (node.escapedText) {
                 case "document":
                 case "console":
                     return ts.Diagnostics.Cannot_find_name_0_Do_you_need_to_change_your_target_library_Try_changing_the_lib_compiler_option_to_include_dom;
@@ -45110,14 +46464,20 @@ var ts;
                 case "Iterator":
                 case "AsyncIterator":
                     return ts.Diagnostics.Cannot_find_name_0_Do_you_need_to_change_your_target_library_Try_changing_the_lib_compiler_option_to_es2015_or_later;
-                default: return ts.Diagnostics.Cannot_find_name_0;
+                default:
+                    if (node.parent.kind === 277 /* ShorthandPropertyAssignment */) {
+                        return ts.Diagnostics.No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer;
+                    }
+                    else {
+                        return ts.Diagnostics.Cannot_find_name_0;
+                    }
             }
         }
         function getResolvedSymbol(node) {
             var links = getNodeLinks(node);
             if (!links.resolvedSymbol) {
                 links.resolvedSymbol = !ts.nodeIsMissing(node) &&
-                    resolveName(node, node.escapedText, 67220415 /* Value */ | 1048576 /* ExportValue */, getCannotFindNameDiagnosticForName(node.escapedText), node, !ts.isWriteOnlyAccess(node), 
+                    resolveName(node, node.escapedText, 67220415 /* Value */ | 1048576 /* ExportValue */, getCannotFindNameDiagnosticForName(node), node, !ts.isWriteOnlyAccess(node), 
                     /*excludeGlobals*/ false, ts.Diagnostics.Cannot_find_name_0_Did_you_mean_1) || unknownSymbol;
             }
             return links.resolvedSymbol;
@@ -45126,7 +46486,7 @@ var ts;
             // TypeScript 1.0 spec (April 2014): 3.6.3
             // A type query consists of the keyword typeof followed by an expression.
             // The expression is restricted to a single identifier or a sequence of identifiers separated by periods
-            return !!ts.findAncestor(node, function (n) { return n.kind === 167 /* TypeQuery */ ? true : n.kind === 72 /* Identifier */ || n.kind === 148 /* QualifiedName */ ? false : "quit"; });
+            return !!ts.findAncestor(node, function (n) { return n.kind === 168 /* TypeQuery */ ? true : n.kind === 73 /* Identifier */ || n.kind === 149 /* QualifiedName */ ? false : "quit"; });
         }
         // Return the flow cache key for a "dotted name" (i.e. a sequence of identifiers
         // separated by dots). The key consists of the id of the symbol referenced by the
@@ -45134,21 +46494,21 @@ var ts;
         // The result is undefined if the reference isn't a dotted name. We prefix nodes
         // occurring in an apparent type position with '@' because the control flow type
         // of such nodes may be based on the apparent type instead of the declared type.
-        function getFlowCacheKey(node) {
+        function getFlowCacheKey(node, declaredType, initialType, flowContainer) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     var symbol = getResolvedSymbol(node);
-                    return symbol !== unknownSymbol ? (isConstraintPosition(node) ? "@" : "") + getSymbolId(symbol) : undefined;
-                case 100 /* ThisKeyword */:
+                    return symbol !== unknownSymbol ? (flowContainer ? getNodeId(flowContainer) : "-1") + "|" + getTypeId(declaredType) + "|" + getTypeId(initialType) + "|" + (isConstraintPosition(node) ? "@" : "") + getSymbolId(symbol) : undefined;
+                case 101 /* ThisKeyword */:
                     return "0";
-                case 213 /* NonNullExpression */:
-                case 195 /* ParenthesizedExpression */:
-                    return getFlowCacheKey(node.expression);
-                case 189 /* PropertyAccessExpression */:
-                case 190 /* ElementAccessExpression */:
+                case 214 /* NonNullExpression */:
+                case 196 /* ParenthesizedExpression */:
+                    return getFlowCacheKey(node.expression, declaredType, initialType, flowContainer);
+                case 190 /* PropertyAccessExpression */:
+                case 191 /* ElementAccessExpression */:
                     var propName = getAccessedPropertyName(node);
                     if (propName !== undefined) {
-                        var key = getFlowCacheKey(node.expression);
+                        var key = getFlowCacheKey(node.expression, declaredType, initialType, flowContainer);
                         return key && key + "." + propName;
                     }
             }
@@ -45156,24 +46516,24 @@ var ts;
         }
         function isMatchingReference(source, target) {
             switch (target.kind) {
-                case 195 /* ParenthesizedExpression */:
-                case 213 /* NonNullExpression */:
+                case 196 /* ParenthesizedExpression */:
+                case 214 /* NonNullExpression */:
                     return isMatchingReference(source, target.expression);
             }
             switch (source.kind) {
-                case 72 /* Identifier */:
-                    return target.kind === 72 /* Identifier */ && getResolvedSymbol(source) === getResolvedSymbol(target) ||
-                        (target.kind === 237 /* VariableDeclaration */ || target.kind === 186 /* BindingElement */) &&
+                case 73 /* Identifier */:
+                    return target.kind === 73 /* Identifier */ && getResolvedSymbol(source) === getResolvedSymbol(target) ||
+                        (target.kind === 238 /* VariableDeclaration */ || target.kind === 187 /* BindingElement */) &&
                             getExportSymbolOfValueSymbolIfExported(getResolvedSymbol(source)) === getSymbolOfNode(target);
-                case 100 /* ThisKeyword */:
-                    return target.kind === 100 /* ThisKeyword */;
-                case 98 /* SuperKeyword */:
-                    return target.kind === 98 /* SuperKeyword */;
-                case 213 /* NonNullExpression */:
-                case 195 /* ParenthesizedExpression */:
+                case 101 /* ThisKeyword */:
+                    return target.kind === 101 /* ThisKeyword */;
+                case 99 /* SuperKeyword */:
+                    return target.kind === 99 /* SuperKeyword */;
+                case 214 /* NonNullExpression */:
+                case 196 /* ParenthesizedExpression */:
                     return isMatchingReference(source.expression, target);
-                case 189 /* PropertyAccessExpression */:
-                case 190 /* ElementAccessExpression */:
+                case 190 /* PropertyAccessExpression */:
+                case 191 /* ElementAccessExpression */:
                     return ts.isAccessExpression(target) &&
                         getAccessedPropertyName(source) === getAccessedPropertyName(target) &&
                         isMatchingReference(source.expression, target.expression);
@@ -45181,7 +46541,7 @@ var ts;
             return false;
         }
         function getAccessedPropertyName(access) {
-            return access.kind === 189 /* PropertyAccessExpression */ ? access.name.escapedText :
+            return access.kind === 190 /* PropertyAccessExpression */ ? access.name.escapedText :
                 ts.isStringLiteral(access.argumentExpression) || ts.isNumericLiteral(access.argumentExpression) ? ts.escapeLeadingUnderscores(access.argumentExpression.text) :
                     undefined;
         }
@@ -45206,7 +46566,7 @@ var ts;
                 isDiscriminantProperty(getDeclaredTypeOfReference(target.expression), name);
         }
         function getDeclaredTypeOfReference(expr) {
-            if (expr.kind === 72 /* Identifier */) {
+            if (expr.kind === 73 /* Identifier */) {
                 return getTypeOfSymbol(getResolvedSymbol(expr));
             }
             if (ts.isAccessExpression(expr)) {
@@ -45228,7 +46588,7 @@ var ts;
                 if (prop && ts.getCheckFlags(prop) & 2 /* SyntheticProperty */) {
                     if (prop.isDiscriminantProperty === undefined) {
                         prop.isDiscriminantProperty =
-                            (prop.checkFlags & 96 /* Discriminant */) === 96 /* Discriminant */ &&
+                            (prop.checkFlags & 192 /* Discriminant */) === 192 /* Discriminant */ &&
                                 isDiscriminantType(getTypeOfSymbol(prop));
                     }
                     return !!prop.isDiscriminantProperty;
@@ -45237,7 +46597,7 @@ var ts;
             return false;
         }
         function isSyntheticThisPropertyAccess(expr) {
-            return ts.isAccessExpression(expr) && expr.expression.kind === 100 /* ThisKeyword */ && !!(expr.expression.flags & 8 /* Synthesized */);
+            return ts.isAccessExpression(expr) && expr.expression.kind === 101 /* ThisKeyword */ && !!(expr.expression.flags & 8 /* Synthesized */);
         }
         function findDiscriminantProperties(sourceProperties, target) {
             var result;
@@ -45265,7 +46625,7 @@ var ts;
                     }
                 }
             }
-            if (callExpression.expression.kind === 189 /* PropertyAccessExpression */ &&
+            if (callExpression.expression.kind === 190 /* PropertyAccessExpression */ &&
                 isOrContainsMatchingReference(reference, callExpression.expression.expression)) {
                 return true;
             }
@@ -45384,7 +46744,7 @@ var ts;
                 return strictNullChecks ? 7888800 /* ObjectStrictFacts */ : 16736160 /* ObjectFacts */;
             }
             if (flags & 63176704 /* Instantiable */) {
-                return getTypeFacts(getBaseConstraintOfType(type) || emptyObjectType);
+                return getTypeFacts(getBaseConstraintOfType(type) || unknownType);
             }
             if (flags & 3145728 /* UnionOrIntersection */) {
                 return getTypeFactsOfTypes(type.types);
@@ -45413,22 +46773,22 @@ var ts;
         }
         function getTypeOfDestructuredArrayElement(type, index) {
             return everyType(type, isTupleLikeType) && getTupleElementType(type, index) ||
-                checkIteratedTypeOrElementType(type, /*errorNode*/ undefined, /*allowStringInput*/ false, /*allowAsyncIterables*/ false) ||
+                checkIteratedTypeOrElementType(65 /* Destructuring */, type, undefinedType, /*errorNode*/ undefined) ||
                 errorType;
         }
         function getTypeOfDestructuredSpreadExpression(type) {
-            return createArrayType(checkIteratedTypeOrElementType(type, /*errorNode*/ undefined, /*allowStringInput*/ false, /*allowAsyncIterables*/ false) || errorType);
+            return createArrayType(checkIteratedTypeOrElementType(65 /* Destructuring */, type, undefinedType, /*errorNode*/ undefined) || errorType);
         }
         function getAssignedTypeOfBinaryExpression(node) {
-            var isDestructuringDefaultAssignment = node.parent.kind === 187 /* ArrayLiteralExpression */ && isDestructuringAssignmentTarget(node.parent) ||
-                node.parent.kind === 275 /* PropertyAssignment */ && isDestructuringAssignmentTarget(node.parent.parent);
+            var isDestructuringDefaultAssignment = node.parent.kind === 188 /* ArrayLiteralExpression */ && isDestructuringAssignmentTarget(node.parent) ||
+                node.parent.kind === 276 /* PropertyAssignment */ && isDestructuringAssignmentTarget(node.parent.parent);
             return isDestructuringDefaultAssignment ?
                 getTypeWithDefault(getAssignedType(node), node.right) :
                 getTypeOfExpression(node.right);
         }
         function isDestructuringAssignmentTarget(parent) {
-            return parent.parent.kind === 204 /* BinaryExpression */ && parent.parent.left === parent ||
-                parent.parent.kind === 227 /* ForOfStatement */ && parent.parent.initializer === parent;
+            return parent.parent.kind === 205 /* BinaryExpression */ && parent.parent.left === parent ||
+                parent.parent.kind === 228 /* ForOfStatement */ && parent.parent.initializer === parent;
         }
         function getAssignedTypeOfArrayLiteralElement(node, element) {
             return getTypeOfDestructuredArrayElement(getAssignedType(node), node.elements.indexOf(element));
@@ -45445,21 +46805,21 @@ var ts;
         function getAssignedType(node) {
             var parent = node.parent;
             switch (parent.kind) {
-                case 226 /* ForInStatement */:
+                case 227 /* ForInStatement */:
                     return stringType;
-                case 227 /* ForOfStatement */:
+                case 228 /* ForOfStatement */:
                     return checkRightHandSideOfForOf(parent.expression, parent.awaitModifier) || errorType;
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return getAssignedTypeOfBinaryExpression(parent);
-                case 198 /* DeleteExpression */:
+                case 199 /* DeleteExpression */:
                     return undefinedType;
-                case 187 /* ArrayLiteralExpression */:
+                case 188 /* ArrayLiteralExpression */:
                     return getAssignedTypeOfArrayLiteralElement(parent, node);
-                case 208 /* SpreadElement */:
+                case 209 /* SpreadElement */:
                     return getAssignedTypeOfSpreadExpression(parent);
-                case 275 /* PropertyAssignment */:
+                case 276 /* PropertyAssignment */:
                     return getAssignedTypeOfPropertyAssignment(parent);
-                case 276 /* ShorthandPropertyAssignment */:
+                case 277 /* ShorthandPropertyAssignment */:
                     return getAssignedTypeOfShorthandPropertyAssignment(parent);
             }
             return errorType;
@@ -45467,7 +46827,7 @@ var ts;
         function getInitialTypeOfBindingElement(node) {
             var pattern = node.parent;
             var parentType = getInitialType(pattern.parent);
-            var type = pattern.kind === 184 /* ObjectBindingPattern */ ?
+            var type = pattern.kind === 185 /* ObjectBindingPattern */ ?
                 getTypeOfDestructuredProperty(parentType, node.propertyName || node.name) :
                 !node.dotDotDotToken ?
                     getTypeOfDestructuredArrayElement(parentType, pattern.elements.indexOf(node)) :
@@ -45485,37 +46845,37 @@ var ts;
             if (node.initializer) {
                 return getTypeOfInitializer(node.initializer);
             }
-            if (node.parent.parent.kind === 226 /* ForInStatement */) {
+            if (node.parent.parent.kind === 227 /* ForInStatement */) {
                 return stringType;
             }
-            if (node.parent.parent.kind === 227 /* ForOfStatement */) {
+            if (node.parent.parent.kind === 228 /* ForOfStatement */) {
                 return checkRightHandSideOfForOf(node.parent.parent.expression, node.parent.parent.awaitModifier) || errorType;
             }
             return errorType;
         }
         function getInitialType(node) {
-            return node.kind === 237 /* VariableDeclaration */ ?
+            return node.kind === 238 /* VariableDeclaration */ ?
                 getInitialTypeOfVariableDeclaration(node) :
                 getInitialTypeOfBindingElement(node);
         }
         function getInitialOrAssignedType(node, reference) {
-            return getConstraintForLocation(node.kind === 237 /* VariableDeclaration */ || node.kind === 186 /* BindingElement */ ?
+            return getConstraintForLocation(node.kind === 238 /* VariableDeclaration */ || node.kind === 187 /* BindingElement */ ?
                 getInitialType(node) :
                 getAssignedType(node), reference);
         }
         function isEmptyArrayAssignment(node) {
-            return node.kind === 237 /* VariableDeclaration */ && node.initializer &&
+            return node.kind === 238 /* VariableDeclaration */ && node.initializer &&
                 isEmptyArrayLiteral(node.initializer) ||
-                node.kind !== 186 /* BindingElement */ && node.parent.kind === 204 /* BinaryExpression */ &&
+                node.kind !== 187 /* BindingElement */ && node.parent.kind === 205 /* BinaryExpression */ &&
                     isEmptyArrayLiteral(node.parent.right);
         }
         function getReferenceCandidate(node) {
             switch (node.kind) {
-                case 195 /* ParenthesizedExpression */:
+                case 196 /* ParenthesizedExpression */:
                     return getReferenceCandidate(node.expression);
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     switch (node.operatorToken.kind) {
-                        case 59 /* EqualsToken */:
+                        case 60 /* EqualsToken */:
                             return getReferenceCandidate(node.left);
                         case 27 /* CommaToken */:
                             return getReferenceCandidate(node.right);
@@ -45525,13 +46885,13 @@ var ts;
         }
         function getReferenceRoot(node) {
             var parent = node.parent;
-            return parent.kind === 195 /* ParenthesizedExpression */ ||
-                parent.kind === 204 /* BinaryExpression */ && parent.operatorToken.kind === 59 /* EqualsToken */ && parent.left === node ||
-                parent.kind === 204 /* BinaryExpression */ && parent.operatorToken.kind === 27 /* CommaToken */ && parent.right === node ?
+            return parent.kind === 196 /* ParenthesizedExpression */ ||
+                parent.kind === 205 /* BinaryExpression */ && parent.operatorToken.kind === 60 /* EqualsToken */ && parent.left === node ||
+                parent.kind === 205 /* BinaryExpression */ && parent.operatorToken.kind === 27 /* CommaToken */ && parent.right === node ?
                 getReferenceRoot(parent) : node;
         }
         function getTypeOfSwitchClause(clause) {
-            if (clause.kind === 271 /* CaseClause */) {
+            if (clause.kind === 272 /* CaseClause */) {
                 return getRegularTypeOfLiteralType(getTypeOfExpression(clause.expression));
             }
             return neverType;
@@ -45553,7 +46913,7 @@ var ts;
             var witnesses = [];
             for (var _i = 0, _a = switchStatement.caseBlock.clauses; _i < _a.length; _i++) {
                 var clause = _a[_i];
-                if (clause.kind === 271 /* CaseClause */) {
+                if (clause.kind === 272 /* CaseClause */) {
                     if (clause.expression.kind === 10 /* StringLiteral */) {
                         witnesses.push(clause.expression.text);
                         continue;
@@ -45599,6 +46959,9 @@ var ts;
             }
             return f(type) ? type : neverType;
         }
+        function countTypes(type) {
+            return type.flags & 1048576 /* Union */ ? type.types.length : 1;
+        }
         function mapType(type, mapper, noReductions) {
             if (type.flags & 131072 /* Never */) {
                 return type;
@@ -45606,25 +46969,20 @@ var ts;
             if (!(type.flags & 1048576 /* Union */)) {
                 return mapper(type);
             }
-            var types = type.types;
-            var mappedType;
             var mappedTypes;
-            for (var _i = 0, types_13 = types; _i < types_13.length; _i++) {
-                var current = types_13[_i];
-                var t = mapper(current);
-                if (t) {
-                    if (!mappedType) {
-                        mappedType = t;
-                    }
-                    else if (!mappedTypes) {
-                        mappedTypes = [mappedType, t];
+            for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
+                var t = _a[_i];
+                var mapped = mapper(t);
+                if (mapped) {
+                    if (!mappedTypes) {
+                        mappedTypes = [mapped];
                     }
                     else {
-                        mappedTypes.push(t);
+                        mappedTypes.push(mapped);
                     }
                 }
             }
-            return mappedTypes ? getUnionType(mappedTypes, noReductions ? 0 /* None */ : 1 /* Literal */) : mappedType;
+            return mappedTypes && getUnionType(mappedTypes, noReductions ? 0 /* None */ : 1 /* Literal */);
         }
         function extractTypesOfKind(type, kind) {
             return filterType(type, function (t) { return (t.flags & kind) !== 0; });
@@ -45692,8 +47050,8 @@ var ts;
         }
         function isEvolvingArrayTypeList(types) {
             var hasEvolvingArrayType = false;
-            for (var _i = 0, types_14 = types; _i < types_14.length; _i++) {
-                var t = types_14[_i];
+            for (var _i = 0, types_13 = types; _i < types_13.length; _i++) {
+                var t = types_13[_i];
                 if (!(t.flags & 131072 /* Never */)) {
                     if (!(ts.getObjectFlags(t) & 256 /* EvolvingArray */)) {
                         return false;
@@ -45716,12 +47074,12 @@ var ts;
         function isEvolvingArrayOperationTarget(node) {
             var root = getReferenceRoot(node);
             var parent = root.parent;
-            var isLengthPushOrUnshift = parent.kind === 189 /* PropertyAccessExpression */ && (parent.name.escapedText === "length" ||
-                parent.parent.kind === 191 /* CallExpression */ && ts.isPushOrUnshiftIdentifier(parent.name));
-            var isElementAssignment = parent.kind === 190 /* ElementAccessExpression */ &&
+            var isLengthPushOrUnshift = parent.kind === 190 /* PropertyAccessExpression */ && (parent.name.escapedText === "length" ||
+                parent.parent.kind === 192 /* CallExpression */ && ts.isPushOrUnshiftIdentifier(parent.name));
+            var isElementAssignment = parent.kind === 191 /* ElementAccessExpression */ &&
                 parent.expression === root &&
-                parent.parent.kind === 204 /* BinaryExpression */ &&
-                parent.parent.operatorToken.kind === 59 /* EqualsToken */ &&
+                parent.parent.kind === 205 /* BinaryExpression */ &&
+                parent.parent.operatorToken.kind === 60 /* EqualsToken */ &&
                 parent.parent.left === parent &&
                 !ts.isAssignmentTarget(parent.parent) &&
                 isTypeAssignableToKind(getTypeOfExpression(parent.argumentExpression), 296 /* NumberLike */);
@@ -45735,7 +47093,7 @@ var ts;
             return links.maybeTypePredicate;
         }
         function getMaybeTypePredicate(node) {
-            if (node.expression.kind !== 98 /* SuperKeyword */) {
+            if (node.expression.kind !== 99 /* SuperKeyword */) {
                 var funcType = checkNonNullExpression(node.expression);
                 if (funcType !== silentNeverType) {
                     var apparentType = getApparentType(funcType);
@@ -45753,6 +47111,7 @@ var ts;
         function getFlowTypeOfReference(reference, declaredType, initialType, flowContainer, couldBeUninitialized) {
             if (initialType === void 0) { initialType = declaredType; }
             var key;
+            var keySet = false;
             var flowDepth = 0;
             if (flowAnalysisDisabled) {
                 return errorType;
@@ -45768,10 +47127,17 @@ var ts;
             // on empty arrays are possible without implicit any errors and new element types can be inferred without
             // type mismatch errors.
             var resultType = ts.getObjectFlags(evolvedType) & 256 /* EvolvingArray */ && isEvolvingArrayOperationTarget(reference) ? autoArrayType : finalizeEvolvingArrayType(evolvedType);
-            if (reference.parent && reference.parent.kind === 213 /* NonNullExpression */ && getTypeWithFacts(resultType, 2097152 /* NEUndefinedOrNull */).flags & 131072 /* Never */) {
+            if (reference.parent && reference.parent.kind === 214 /* NonNullExpression */ && getTypeWithFacts(resultType, 2097152 /* NEUndefinedOrNull */).flags & 131072 /* Never */) {
                 return declaredType;
             }
             return resultType;
+            function getOrSetCacheKey() {
+                if (keySet) {
+                    return key;
+                }
+                keySet = true;
+                return key = getFlowCacheKey(reference, declaredType, initialType, flowContainer);
+            }
             function getTypeAtFlowNode(flow) {
                 if (flowDepth === 2000) {
                     // We have made 2000 recursive invocations. To avoid overflowing the call stack we report an error
@@ -45783,6 +47149,15 @@ var ts;
                 flowDepth++;
                 while (true) {
                     var flags = flow.flags;
+                    if (flags & 8192 /* Cached */) {
+                        var key_2 = getOrSetCacheKey();
+                        if (key_2) {
+                            var id = getFlowNodeId(flow);
+                            if (flowAssignmentKeys[id] === key_2) {
+                                return flowAssignmentTypes[id];
+                            }
+                        }
+                    }
                     if (flags & 1024 /* Shared */) {
                         // We cache results of flow type resolution for shared nodes that were previously visited in
                         // the same getFlowTypeOfReference invocation. A node is considered shared when it is the
@@ -45813,6 +47188,15 @@ var ts;
                             flow = flow.antecedent;
                             continue;
                         }
+                        else if (flowLoopCount === flowLoopStart) { // Only cache assignments when not within loop analysis
+                            var key_3 = getOrSetCacheKey();
+                            if (key_3 && !isIncomplete(type)) {
+                                flow.flags |= 8192 /* Cached */;
+                                var id = getFlowNodeId(flow);
+                                flowAssignmentKeys[id] = key_3;
+                                flowAssignmentTypes[id] = type;
+                            }
+                        }
                     }
                     else if (flags & 96 /* Condition */) {
                         type = getTypeAtFlowCondition(flow);
@@ -45840,9 +47224,9 @@ var ts;
                         // Check if we should continue with the control flow of the containing function.
                         var container = flow.container;
                         if (container && container !== flowContainer &&
-                            reference.kind !== 189 /* PropertyAccessExpression */ &&
-                            reference.kind !== 190 /* ElementAccessExpression */ &&
-                            reference.kind !== 100 /* ThisKeyword */) {
+                            reference.kind !== 190 /* PropertyAccessExpression */ &&
+                            reference.kind !== 191 /* ElementAccessExpression */ &&
+                            reference.kind !== 101 /* ThisKeyword */) {
                             flow = container.flowNode;
                             continue;
                         }
@@ -45894,14 +47278,14 @@ var ts;
                     // in which case we continue control flow analysis back to the function's declaration
                     if (ts.isVariableDeclaration(node) && (ts.isInJSFile(node) || ts.isVarConst(node))) {
                         var init = ts.getDeclaredExpandoInitializer(node);
-                        if (init && (init.kind === 196 /* FunctionExpression */ || init.kind === 197 /* ArrowFunction */)) {
+                        if (init && (init.kind === 197 /* FunctionExpression */ || init.kind === 198 /* ArrowFunction */)) {
                             return getTypeAtFlowNode(flow.antecedent);
                         }
                     }
                     return declaredType;
                 }
                 // for (const _ in ref) acts as a nonnull on ref
-                if (ts.isVariableDeclaration(node) && node.parent.parent.kind === 226 /* ForInStatement */ && isMatchingReference(reference, node.parent.parent.expression)) {
+                if (ts.isVariableDeclaration(node) && node.parent.parent.kind === 227 /* ForInStatement */ && isMatchingReference(reference, node.parent.parent.expression)) {
                     return getNonNullableTypeIfNeeded(getTypeFromFlowType(getTypeAtFlowNode(flow.antecedent)));
                 }
                 // Assignment doesn't affect reference
@@ -45910,7 +47294,7 @@ var ts;
             function getTypeAtFlowArrayMutation(flow) {
                 if (declaredType === autoType || declaredType === autoArrayType) {
                     var node = flow.node;
-                    var expr = node.kind === 191 /* CallExpression */ ?
+                    var expr = node.kind === 192 /* CallExpression */ ?
                         node.expression.expression :
                         node.left.expression;
                     if (isMatchingReference(reference, getReferenceCandidate(expr))) {
@@ -45918,7 +47302,7 @@ var ts;
                         var type = getTypeFromFlowType(flowType);
                         if (ts.getObjectFlags(type) & 256 /* EvolvingArray */) {
                             var evolvedType_1 = type;
-                            if (node.kind === 191 /* CallExpression */) {
+                            if (node.kind === 192 /* CallExpression */) {
                                 for (var _i = 0, _a = node.arguments; _i < _a.length; _i++) {
                                     var arg = _a[_i];
                                     evolvedType_1 = addEvolvingArrayElementType(evolvedType_1, arg);
@@ -45971,7 +47355,7 @@ var ts;
                 else if (isMatchingReferenceDiscriminant(expr, type)) {
                     type = narrowTypeByDiscriminant(type, expr, function (t) { return narrowTypeBySwitchOnDiscriminant(t, flow.switchStatement, flow.clauseStart, flow.clauseEnd); });
                 }
-                else if (expr.kind === 199 /* TypeOfExpression */ && isMatchingReference(reference, expr.expression)) {
+                else if (expr.kind === 200 /* TypeOfExpression */ && isMatchingReference(reference, expr.expression)) {
                     type = narrowBySwitchOnTypeOf(type, flow.switchStatement, flow.clauseStart, flow.clauseEnd);
                 }
                 else if (containsMatchingReferenceDiscriminant(reference, expr)) {
@@ -46018,12 +47402,10 @@ var ts;
                 // this flow loop junction, return the cached type.
                 var id = getFlowNodeId(flow);
                 var cache = flowLoopCaches[id] || (flowLoopCaches[id] = ts.createMap());
+                var key = getOrSetCacheKey();
                 if (!key) {
-                    key = getFlowCacheKey(reference);
                     // No cache key is generated when binding patterns are in unnarrowable situations
-                    if (!key) {
-                        return declaredType;
-                    }
+                    return declaredType;
                 }
                 var cached = cache.get(key);
                 if (cached) {
@@ -46131,7 +47513,7 @@ var ts;
                 return !assumeTrue;
             }
             function narrowByInKeyword(type, literal, assumeTrue) {
-                if ((type.flags & (1048576 /* Union */ | 524288 /* Object */)) || (type.flags & 262144 /* TypeParameter */ && type.isThisType)) {
+                if (type.flags & (1048576 /* Union */ | 524288 /* Object */) || isThisTypeParameter(type)) {
                     var propName_1 = ts.escapeLeadingUnderscores(literal.text);
                     return filterType(type, function (t) { return isTypePresencePossible(t, propName_1, assumeTrue); });
                 }
@@ -46139,8 +47521,8 @@ var ts;
             }
             function narrowTypeByBinaryExpression(type, expr, assumeTrue) {
                 switch (expr.operatorToken.kind) {
-                    case 59 /* EqualsToken */:
-                        return narrowTypeByTruthiness(type, expr.left, assumeTrue);
+                    case 60 /* EqualsToken */:
+                        return narrowTypeByTruthiness(narrowType(type, expr.right, assumeTrue), expr.left, assumeTrue);
                     case 33 /* EqualsEqualsToken */:
                     case 34 /* ExclamationEqualsToken */:
                     case 35 /* EqualsEqualsEqualsToken */:
@@ -46148,10 +47530,10 @@ var ts;
                         var operator_1 = expr.operatorToken.kind;
                         var left_1 = getReferenceCandidate(expr.left);
                         var right_1 = getReferenceCandidate(expr.right);
-                        if (left_1.kind === 199 /* TypeOfExpression */ && ts.isStringLiteralLike(right_1)) {
+                        if (left_1.kind === 200 /* TypeOfExpression */ && ts.isStringLiteralLike(right_1)) {
                             return narrowTypeByTypeof(type, left_1, operator_1, right_1, assumeTrue);
                         }
-                        if (right_1.kind === 199 /* TypeOfExpression */ && ts.isStringLiteralLike(left_1)) {
+                        if (right_1.kind === 200 /* TypeOfExpression */ && ts.isStringLiteralLike(left_1)) {
                             return narrowTypeByTypeof(type, right_1, operator_1, left_1, assumeTrue);
                         }
                         if (isMatchingReference(reference, left_1)) {
@@ -46170,9 +47552,9 @@ var ts;
                             return declaredType;
                         }
                         break;
-                    case 94 /* InstanceOfKeyword */:
+                    case 95 /* InstanceOfKeyword */:
                         return narrowTypeByInstanceof(type, expr, assumeTrue);
-                    case 93 /* InKeyword */:
+                    case 94 /* InKeyword */:
                         var target = getReferenceCandidate(expr.right);
                         if (ts.isStringLiteralLike(expr.left) && isMatchingReference(reference, target)) {
                             return narrowByInKeyword(type, expr.left, assumeTrue);
@@ -46216,7 +47598,10 @@ var ts;
                     return type;
                 }
                 if (assumeTrue) {
-                    var narrowedType = filterType(type, function (t) { return areTypesComparable(t, valueType); });
+                    var filterFn = operator === 33 /* EqualsEqualsToken */ ?
+                        (function (t) { return areTypesComparable(t, valueType) || isCoercibleUnderDoubleEquals(t, valueType); }) :
+                        function (t) { return areTypesComparable(t, valueType); };
+                    var narrowedType = filterType(type, filterFn);
                     return narrowedType.flags & 131072 /* Never */ ? type : replacePrimitivesWithLiterals(narrowedType, valueType);
                 }
                 if (isUnitType(valueType)) {
@@ -46477,7 +47862,7 @@ var ts;
                     return type;
                 }
                 if (ts.isIdentifierTypePredicate(predicate)) {
-                    var predicateArgument = callExpression.arguments[predicate.parameterIndex - (signature.thisParameter ? 1 : 0)];
+                    var predicateArgument = callExpression.arguments[predicate.parameterIndex];
                     if (predicateArgument) {
                         if (isMatchingReference(reference, predicateArgument)) {
                             return getNarrowedType(type, predicate.type, assumeTrue, isTypeSubtypeOf);
@@ -46505,19 +47890,19 @@ var ts;
             // will be a subtype or the same type as the argument.
             function narrowType(type, expr, assumeTrue) {
                 switch (expr.kind) {
-                    case 72 /* Identifier */:
-                    case 100 /* ThisKeyword */:
-                    case 98 /* SuperKeyword */:
-                    case 189 /* PropertyAccessExpression */:
-                    case 190 /* ElementAccessExpression */:
+                    case 73 /* Identifier */:
+                    case 101 /* ThisKeyword */:
+                    case 99 /* SuperKeyword */:
+                    case 190 /* PropertyAccessExpression */:
+                    case 191 /* ElementAccessExpression */:
                         return narrowTypeByTruthiness(type, expr, assumeTrue);
-                    case 191 /* CallExpression */:
+                    case 192 /* CallExpression */:
                         return narrowTypeByTypePredicate(type, expr, assumeTrue);
-                    case 195 /* ParenthesizedExpression */:
+                    case 196 /* ParenthesizedExpression */:
                         return narrowType(type, expr.expression, assumeTrue);
-                    case 204 /* BinaryExpression */:
+                    case 205 /* BinaryExpression */:
                         return narrowTypeByBinaryExpression(type, expr, assumeTrue);
-                    case 202 /* PrefixUnaryExpression */:
+                    case 203 /* PrefixUnaryExpression */:
                         if (expr.operator === 52 /* ExclamationToken */) {
                             return narrowType(type, expr.operand, !assumeTrue);
                         }
@@ -46532,7 +47917,7 @@ var ts;
             // an dotted name expression, and if the location is not an assignment target, obtain the type
             // of the expression (which will reflect control flow analysis). If the expression indeed
             // resolved to the given symbol, return the narrowed type.
-            if (location.kind === 72 /* Identifier */) {
+            if (location.kind === 73 /* Identifier */) {
                 if (ts.isRightSideOfQualifiedNameOrPropertyAccess(location)) {
                     location = location.parent;
                 }
@@ -46553,9 +47938,9 @@ var ts;
         function getControlFlowContainer(node) {
             return ts.findAncestor(node.parent, function (node) {
                 return ts.isFunctionLike(node) && !ts.getImmediatelyInvokedFunctionExpression(node) ||
-                    node.kind === 245 /* ModuleBlock */ ||
-                    node.kind === 284 /* SourceFile */ ||
-                    node.kind === 154 /* PropertyDeclaration */;
+                    node.kind === 246 /* ModuleBlock */ ||
+                    node.kind === 285 /* SourceFile */ ||
+                    node.kind === 155 /* PropertyDeclaration */;
             });
         }
         // Check if a parameter is assigned anywhere within its declaring function.
@@ -46574,10 +47959,10 @@ var ts;
             return !!ts.findAncestor(node.parent, function (node) { return ts.isFunctionLike(node) && !!(getNodeLinks(node).flags & 8388608 /* AssignmentsMarked */); });
         }
         function markParameterAssignments(node) {
-            if (node.kind === 72 /* Identifier */) {
+            if (node.kind === 73 /* Identifier */) {
                 if (ts.isAssignmentTarget(node)) {
                     var symbol = getResolvedSymbol(node);
-                    if (symbol.valueDeclaration && ts.getRootDeclaration(symbol.valueDeclaration).kind === 151 /* Parameter */) {
+                    if (symbol.valueDeclaration && ts.getRootDeclaration(symbol.valueDeclaration).kind === 152 /* Parameter */) {
                         symbol.isAssigned = true;
                     }
                 }
@@ -46592,7 +47977,7 @@ var ts;
         /** remove undefined from the annotated type of a parameter when there is an initializer (that doesn't include undefined) */
         function removeOptionalityFromDeclaredType(declaredType, declaration) {
             var annotationIncludesUndefined = strictNullChecks &&
-                declaration.kind === 151 /* Parameter */ &&
+                declaration.kind === 152 /* Parameter */ &&
                 declaration.initializer &&
                 getFalsyFlags(declaredType) & 32768 /* Undefined */ &&
                 !(getFalsyFlags(checkExpression(declaration.initializer)) & 32768 /* Undefined */);
@@ -46600,13 +47985,13 @@ var ts;
         }
         function isConstraintPosition(node) {
             var parent = node.parent;
-            return parent.kind === 189 /* PropertyAccessExpression */ ||
-                parent.kind === 191 /* CallExpression */ && parent.expression === node ||
-                parent.kind === 190 /* ElementAccessExpression */ && parent.expression === node ||
-                parent.kind === 186 /* BindingElement */ && parent.name === node && !!parent.initializer;
+            return parent.kind === 190 /* PropertyAccessExpression */ ||
+                parent.kind === 192 /* CallExpression */ && parent.expression === node ||
+                parent.kind === 191 /* ElementAccessExpression */ && parent.expression === node ||
+                parent.kind === 187 /* BindingElement */ && parent.name === node && !!parent.initializer;
         }
         function typeHasNullableConstraint(type) {
-            return type.flags & 58982400 /* InstantiableNonPrimitive */ && maybeTypeOfKind(getBaseConstraintOfType(type) || emptyObjectType, 98304 /* Nullable */);
+            return type.flags & 58982400 /* InstantiableNonPrimitive */ && maybeTypeOfKind(getBaseConstraintOfType(type) || unknownType, 98304 /* Nullable */);
         }
         function getConstraintForLocation(type, node) {
             // When a node is the left hand expression of a property access, element access, or call expression,
@@ -46637,7 +48022,7 @@ var ts;
             if (symbol === argumentsSymbol) {
                 var container = ts.getContainingFunction(node);
                 if (languageVersion < 2 /* ES2015 */) {
-                    if (container.kind === 197 /* ArrowFunction */) {
+                    if (container.kind === 198 /* ArrowFunction */) {
                         error(node, ts.Diagnostics.The_arguments_object_cannot_be_referenced_in_an_arrow_function_in_ES3_and_ES5_Consider_using_a_standard_function_expression);
                     }
                     else if (ts.hasModifier(container, 256 /* Async */)) {
@@ -46658,7 +48043,7 @@ var ts;
                 // Due to the emit for class decorators, any reference to the class from inside of the class body
                 // must instead be rewritten to point to a temporary variable to avoid issues with the double-bind
                 // behavior of class names in ES6.
-                if (declaration.kind === 240 /* ClassDeclaration */
+                if (declaration.kind === 241 /* ClassDeclaration */
                     && ts.nodeIsDecorated(declaration)) {
                     var container = ts.getContainingClass(node);
                     while (container !== undefined) {
@@ -46670,14 +48055,14 @@ var ts;
                         container = ts.getContainingClass(container);
                     }
                 }
-                else if (declaration.kind === 209 /* ClassExpression */) {
+                else if (declaration.kind === 210 /* ClassExpression */) {
                     // When we emit a class expression with static members that contain a reference
                     // to the constructor in the initializer, we will need to substitute that
                     // binding with an alias as the class name is not in scope.
                     var container = ts.getThisContainer(node, /*includeArrowFunctions*/ false);
-                    while (container.kind !== 284 /* SourceFile */) {
+                    while (container.kind !== 285 /* SourceFile */) {
                         if (container.parent === declaration) {
-                            if (container.kind === 154 /* PropertyDeclaration */ && ts.hasModifier(container, 32 /* Static */)) {
+                            if (container.kind === 155 /* PropertyDeclaration */ && ts.hasModifier(container, 32 /* Static */)) {
                                 getNodeLinks(declaration).flags |= 16777216 /* ClassWithConstructorReference */;
                                 getNodeLinks(node).flags |= 33554432 /* ConstructorReferenceInClass */;
                             }
@@ -46726,7 +48111,7 @@ var ts;
             // The declaration container is the innermost function that encloses the declaration of the variable
             // or parameter. The flow container is the innermost function starting with which we analyze the control
             // flow graph to determine the control flow based type.
-            var isParameter = ts.getRootDeclaration(declaration).kind === 151 /* Parameter */;
+            var isParameter = ts.getRootDeclaration(declaration).kind === 152 /* Parameter */;
             var declarationContainer = getControlFlowContainer(declaration);
             var flowContainer = getControlFlowContainer(node);
             var isOuterVariable = flowContainer !== declarationContainer;
@@ -46735,19 +48120,19 @@ var ts;
             // When the control flow originates in a function expression or arrow function and we are referencing
             // a const variable or parameter from an outer function, we extend the origin of the control flow
             // analysis to include the immediately enclosing function.
-            while (flowContainer !== declarationContainer && (flowContainer.kind === 196 /* FunctionExpression */ ||
-                flowContainer.kind === 197 /* ArrowFunction */ || ts.isObjectLiteralOrClassExpressionMethod(flowContainer)) &&
+            while (flowContainer !== declarationContainer && (flowContainer.kind === 197 /* FunctionExpression */ ||
+                flowContainer.kind === 198 /* ArrowFunction */ || ts.isObjectLiteralOrClassExpressionMethod(flowContainer)) &&
                 (isConstVariable(localOrExportSymbol) || isParameter && !isParameterAssigned(localOrExportSymbol))) {
                 flowContainer = getControlFlowContainer(flowContainer);
             }
             // We only look for uninitialized variables in strict null checking mode, and only when we can analyze
             // the entire control flow graph from the variable's declaration (i.e. when the flow container and
             // declaration container are the same).
-            var assumeInitialized = isParameter || isAlias || isOuterVariable || isSpreadDestructuringAssignmentTarget || isModuleExports ||
+            var assumeInitialized = isParameter || isAlias || isOuterVariable || isSpreadDestructuringAssignmentTarget || isModuleExports || ts.isBindingElement(declaration) ||
                 type !== autoType && type !== autoArrayType && (!strictNullChecks || (type.flags & 3 /* AnyOrUnknown */) !== 0 ||
-                    isInTypeQuery(node) || node.parent.kind === 257 /* ExportSpecifier */) ||
-                node.parent.kind === 213 /* NonNullExpression */ ||
-                declaration.kind === 237 /* VariableDeclaration */ && declaration.exclamationToken ||
+                    isInTypeQuery(node) || node.parent.kind === 258 /* ExportSpecifier */) ||
+                node.parent.kind === 214 /* NonNullExpression */ ||
+                declaration.kind === 238 /* VariableDeclaration */ && declaration.exclamationToken ||
                 declaration.flags & 4194304 /* Ambient */;
             var initialType = assumeInitialized ? (isParameter ? removeOptionalityFromDeclaredType(type, declaration) : type) :
                 type === autoType || type === autoArrayType ? undefinedType :
@@ -46781,7 +48166,8 @@ var ts;
         function checkNestedBlockScopedBinding(node, symbol) {
             if (languageVersion >= 2 /* ES2015 */ ||
                 (symbol.flags & (2 /* BlockScopedVariable */ | 32 /* Class */)) === 0 ||
-                symbol.valueDeclaration.parent.kind === 274 /* CatchClause */) {
+                ts.isSourceFile(symbol.valueDeclaration) ||
+                symbol.valueDeclaration.parent.kind === 275 /* CatchClause */) {
                 return;
             }
             // 1. walk from the use site up to the declaration and check
@@ -46804,7 +48190,7 @@ var ts;
                     // mark iteration statement as containing block-scoped binding captured in some function
                     var capturesBlockScopeBindingInLoopBody = true;
                     if (ts.isForStatement(container) &&
-                        ts.getAncestor(symbol.valueDeclaration, 238 /* VariableDeclarationList */).parent === container) {
+                        ts.getAncestor(symbol.valueDeclaration, 239 /* VariableDeclarationList */).parent === container) {
                         var part = getPartOfForStatementContainingNode(node.parent, container);
                         if (part) {
                             var links = getNodeLinks(part);
@@ -46822,8 +48208,8 @@ var ts;
                 }
                 // mark variables that are declared in loop initializer and reassigned inside the body of ForStatement.
                 // if body of ForStatement will be converted to function then we'll need a extra machinery to propagate reassigned values back.
-                if (container.kind === 225 /* ForStatement */ &&
-                    ts.getAncestor(symbol.valueDeclaration, 238 /* VariableDeclarationList */).parent === container &&
+                if (container.kind === 226 /* ForStatement */ &&
+                    ts.getAncestor(symbol.valueDeclaration, 239 /* VariableDeclarationList */).parent === container &&
                     isAssignedInBodyOfForStatement(node, container)) {
                     getNodeLinks(symbol.valueDeclaration).flags |= 4194304 /* NeedsLoopOutParameter */;
                 }
@@ -46841,7 +48227,7 @@ var ts;
         function isAssignedInBodyOfForStatement(node, container) {
             // skip parenthesized nodes
             var current = node;
-            while (current.parent.kind === 195 /* ParenthesizedExpression */) {
+            while (current.parent.kind === 196 /* ParenthesizedExpression */) {
                 current = current.parent;
             }
             // check if node is used as LHS in some assignment expression
@@ -46849,7 +48235,7 @@ var ts;
             if (ts.isAssignmentTarget(current)) {
                 isAssigned = true;
             }
-            else if ((current.parent.kind === 202 /* PrefixUnaryExpression */ || current.parent.kind === 203 /* PostfixUnaryExpression */)) {
+            else if ((current.parent.kind === 203 /* PrefixUnaryExpression */ || current.parent.kind === 204 /* PostfixUnaryExpression */)) {
                 var expr = current.parent;
                 isAssigned = expr.operator === 44 /* PlusPlusToken */ || expr.operator === 45 /* MinusMinusToken */;
             }
@@ -46862,7 +48248,7 @@ var ts;
         }
         function captureLexicalThis(node, container) {
             getNodeLinks(node).flags |= 2 /* LexicalThis */;
-            if (container.kind === 154 /* PropertyDeclaration */ || container.kind === 157 /* Constructor */) {
+            if (container.kind === 155 /* PropertyDeclaration */ || container.kind === 158 /* Constructor */) {
                 var classNode = container.parent;
                 getNodeLinks(classNode).flags |= 4 /* CaptureThis */;
             }
@@ -46930,37 +48316,37 @@ var ts;
             // tell whether 'this' needs to be captured.
             var container = ts.getThisContainer(node, /* includeArrowFunctions */ true);
             var capturedByArrowFunction = false;
-            if (container.kind === 157 /* Constructor */) {
+            if (container.kind === 158 /* Constructor */) {
                 checkThisBeforeSuper(node, container, ts.Diagnostics.super_must_be_called_before_accessing_this_in_the_constructor_of_a_derived_class);
             }
             // Now skip arrow functions to get the "real" owner of 'this'.
-            if (container.kind === 197 /* ArrowFunction */) {
+            if (container.kind === 198 /* ArrowFunction */) {
                 container = ts.getThisContainer(container, /* includeArrowFunctions */ false);
                 capturedByArrowFunction = true;
             }
             switch (container.kind) {
-                case 244 /* ModuleDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     error(node, ts.Diagnostics.this_cannot_be_referenced_in_a_module_or_namespace_body);
                     // do not return here so in case if lexical this is captured - it will be reflected in flags on NodeLinks
                     break;
-                case 243 /* EnumDeclaration */:
+                case 244 /* EnumDeclaration */:
                     error(node, ts.Diagnostics.this_cannot_be_referenced_in_current_location);
                     // do not return here so in case if lexical this is captured - it will be reflected in flags on NodeLinks
                     break;
-                case 157 /* Constructor */:
+                case 158 /* Constructor */:
                     if (isInConstructorArgumentInitializer(node, container)) {
                         error(node, ts.Diagnostics.this_cannot_be_referenced_in_constructor_arguments);
                         // do not return here so in case if lexical this is captured - it will be reflected in flags on NodeLinks
                     }
                     break;
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
                     if (ts.hasModifier(container, 32 /* Static */)) {
                         error(node, ts.Diagnostics.this_cannot_be_referenced_in_a_static_property_initializer);
                         // do not return here so in case if lexical this is captured - it will be reflected in flags on NodeLinks
                     }
                     break;
-                case 149 /* ComputedPropertyName */:
+                case 150 /* ComputedPropertyName */:
                     error(node, ts.Diagnostics.this_cannot_be_referenced_in_a_computed_property_name);
                     break;
             }
@@ -46980,7 +48366,7 @@ var ts;
                     if (!ts.isSourceFile(container)) {
                         var outsideThis = tryGetThisTypeAt(container);
                         if (outsideThis && outsideThis !== globalThisType_1) {
-                            addRelatedInfo(diag, ts.createDiagnosticForNode(container, ts.Diagnostics.An_outer_value_of_this_is_shadowed_by_this_container));
+                            ts.addRelatedInfo(diag, ts.createDiagnosticForNode(container, ts.Diagnostics.An_outer_value_of_this_is_shadowed_by_this_container));
                         }
                     }
                 }
@@ -47010,7 +48396,7 @@ var ts;
                 //   * /** @constructor */ function [name]() { ... }
                 //   * /** @constructor */ var x = function() { ... }
                 else if (isInJS &&
-                    (container.kind === 196 /* FunctionExpression */ || container.kind === 239 /* FunctionDeclaration */) &&
+                    (container.kind === 197 /* FunctionExpression */ || container.kind === 240 /* FunctionDeclaration */) &&
                     ts.getJSDocClassTag(container)) {
                     var classType = getJSClassType(getMergedSymbol(container.symbol));
                     if (classType) {
@@ -47046,7 +48432,7 @@ var ts;
         }
         function getClassNameFromPrototypeMethod(container) {
             // Check if it's the RHS of a x.prototype.y = function [name]() { .... }
-            if (container.kind === 196 /* FunctionExpression */ &&
+            if (container.kind === 197 /* FunctionExpression */ &&
                 ts.isBinaryExpression(container.parent) &&
                 ts.getAssignmentDeclarationKind(container.parent) === 3 /* PrototypeProperty */) {
                 // Get the 'x' of 'x.prototype.y = container'
@@ -47056,16 +48442,16 @@ var ts;
                     .expression; // x
             }
             // x.prototype = { method() { } }
-            else if (container.kind === 156 /* MethodDeclaration */ &&
-                container.parent.kind === 188 /* ObjectLiteralExpression */ &&
+            else if (container.kind === 157 /* MethodDeclaration */ &&
+                container.parent.kind === 189 /* ObjectLiteralExpression */ &&
                 ts.isBinaryExpression(container.parent.parent) &&
                 ts.getAssignmentDeclarationKind(container.parent.parent) === 6 /* Prototype */) {
                 return container.parent.parent.left.expression;
             }
             // x.prototype = { method: function() { } }
-            else if (container.kind === 196 /* FunctionExpression */ &&
-                container.parent.kind === 275 /* PropertyAssignment */ &&
-                container.parent.parent.kind === 188 /* ObjectLiteralExpression */ &&
+            else if (container.kind === 197 /* FunctionExpression */ &&
+                container.parent.kind === 276 /* PropertyAssignment */ &&
+                container.parent.parent.kind === 189 /* ObjectLiteralExpression */ &&
                 ts.isBinaryExpression(container.parent.parent.parent) &&
                 ts.getAssignmentDeclarationKind(container.parent.parent.parent) === 6 /* Prototype */) {
                 return container.parent.parent.parent.left.expression;
@@ -47073,7 +48459,7 @@ var ts;
             // Object.defineProperty(x, "method", { value: function() { } });
             // Object.defineProperty(x, "method", { set: (x: () => void) => void });
             // Object.defineProperty(x, "method", { get: () => function() { }) });
-            else if (container.kind === 196 /* FunctionExpression */ &&
+            else if (container.kind === 197 /* FunctionExpression */ &&
                 ts.isPropertyAssignment(container.parent) &&
                 ts.isIdentifier(container.parent.name) &&
                 (container.parent.name.escapedText === "value" || container.parent.name.escapedText === "get" || container.parent.name.escapedText === "set") &&
@@ -47098,7 +48484,7 @@ var ts;
         }
         function getTypeForThisExpressionFromJSDoc(node) {
             var jsdocType = ts.getJSDocType(node);
-            if (jsdocType && jsdocType.kind === 294 /* JSDocFunctionType */) {
+            if (jsdocType && jsdocType.kind === 295 /* JSDocFunctionType */) {
                 var jsDocFunctionType = jsdocType;
                 if (jsDocFunctionType.parameters.length > 0 &&
                     jsDocFunctionType.parameters[0].name &&
@@ -47112,15 +48498,15 @@ var ts;
             }
         }
         function isInConstructorArgumentInitializer(node, constructorDecl) {
-            return !!ts.findAncestor(node, function (n) { return ts.isFunctionLikeDeclaration(n) ? "quit" : n.kind === 151 /* Parameter */ && n.parent === constructorDecl; });
+            return !!ts.findAncestor(node, function (n) { return ts.isFunctionLikeDeclaration(n) ? "quit" : n.kind === 152 /* Parameter */ && n.parent === constructorDecl; });
         }
         function checkSuperExpression(node) {
-            var isCallExpression = node.parent.kind === 191 /* CallExpression */ && node.parent.expression === node;
+            var isCallExpression = node.parent.kind === 192 /* CallExpression */ && node.parent.expression === node;
             var container = ts.getSuperContainer(node, /*stopOnFunctions*/ true);
             var needToCaptureLexicalThis = false;
             // adjust the container reference in case if super is used inside arrow functions with arbitrarily deep nesting
             if (!isCallExpression) {
-                while (container && container.kind === 197 /* ArrowFunction */) {
+                while (container && container.kind === 198 /* ArrowFunction */) {
                     container = ts.getSuperContainer(container, /*stopOnFunctions*/ true);
                     needToCaptureLexicalThis = languageVersion < 2 /* ES2015 */;
                 }
@@ -47133,14 +48519,14 @@ var ts;
                 // class B {
                 //     [super.foo()]() {}
                 // }
-                var current = ts.findAncestor(node, function (n) { return n === container ? "quit" : n.kind === 149 /* ComputedPropertyName */; });
-                if (current && current.kind === 149 /* ComputedPropertyName */) {
+                var current = ts.findAncestor(node, function (n) { return n === container ? "quit" : n.kind === 150 /* ComputedPropertyName */; });
+                if (current && current.kind === 150 /* ComputedPropertyName */) {
                     error(node, ts.Diagnostics.super_cannot_be_referenced_in_a_computed_property_name);
                 }
                 else if (isCallExpression) {
                     error(node, ts.Diagnostics.Super_calls_are_not_permitted_outside_constructors_or_in_nested_functions_inside_constructors);
                 }
-                else if (!container || !container.parent || !(ts.isClassLike(container.parent) || container.parent.kind === 188 /* ObjectLiteralExpression */)) {
+                else if (!container || !container.parent || !(ts.isClassLike(container.parent) || container.parent.kind === 189 /* ObjectLiteralExpression */)) {
                     error(node, ts.Diagnostics.super_can_only_be_referenced_in_members_of_derived_classes_or_object_literal_expressions);
                 }
                 else {
@@ -47148,7 +48534,7 @@ var ts;
                 }
                 return errorType;
             }
-            if (!isCallExpression && container.kind === 157 /* Constructor */) {
+            if (!isCallExpression && container.kind === 158 /* Constructor */) {
                 checkThisBeforeSuper(node, container, ts.Diagnostics.super_must_be_called_before_accessing_a_property_of_super_in_the_constructor_of_a_derived_class);
             }
             if (ts.hasModifier(container, 32 /* Static */) || isCallExpression) {
@@ -47217,7 +48603,7 @@ var ts;
             // as a call expression cannot be used as the target of a destructuring assignment while a property access can.
             //
             // For element access expressions (`super[x]`), we emit a generic helper that forwards the element access in both situations.
-            if (container.kind === 156 /* MethodDeclaration */ && ts.hasModifier(container, 256 /* Async */)) {
+            if (container.kind === 157 /* MethodDeclaration */ && ts.hasModifier(container, 256 /* Async */)) {
                 if (ts.isSuperProperty(node.parent) && ts.isAssignmentTarget(node.parent)) {
                     getNodeLinks(container).flags |= 4096 /* AsyncMethodWithSuperBinding */;
                 }
@@ -47231,7 +48617,7 @@ var ts;
                 // in this case they should also use correct lexical this
                 captureLexicalThis(node.parent, container);
             }
-            if (container.parent.kind === 188 /* ObjectLiteralExpression */) {
+            if (container.parent.kind === 189 /* ObjectLiteralExpression */) {
                 if (languageVersion < 2 /* ES2015 */) {
                     error(node, ts.Diagnostics.super_is_only_allowed_in_members_of_object_literal_expressions_when_option_target_is_ES2015_or_higher);
                     return errorType;
@@ -47252,7 +48638,7 @@ var ts;
             if (!baseClassType) {
                 return errorType;
             }
-            if (container.kind === 157 /* Constructor */ && isInConstructorArgumentInitializer(node, container)) {
+            if (container.kind === 158 /* Constructor */ && isInConstructorArgumentInitializer(node, container)) {
                 // issue custom error message for super property access in constructor arguments (to be aligned with old compiler)
                 error(node, ts.Diagnostics.super_cannot_be_referenced_in_constructor_arguments);
                 return errorType;
@@ -47267,7 +48653,7 @@ var ts;
                 if (isCallExpression) {
                     // TS 1.0 SPEC (April 2014): 4.8.1
                     // Super calls are only permitted in constructors of derived classes
-                    return container.kind === 157 /* Constructor */;
+                    return container.kind === 158 /* Constructor */;
                 }
                 else {
                     // TS 1.0 SPEC (April 2014)
@@ -47275,21 +48661,21 @@ var ts;
                     // - In a constructor, instance member function, instance member accessor, or instance member variable initializer where this references a derived class instance
                     // - In a static member function or static member accessor
                     // topmost container must be something that is directly nested in the class declaration\object literal expression
-                    if (ts.isClassLike(container.parent) || container.parent.kind === 188 /* ObjectLiteralExpression */) {
+                    if (ts.isClassLike(container.parent) || container.parent.kind === 189 /* ObjectLiteralExpression */) {
                         if (ts.hasModifier(container, 32 /* Static */)) {
-                            return container.kind === 156 /* MethodDeclaration */ ||
-                                container.kind === 155 /* MethodSignature */ ||
-                                container.kind === 158 /* GetAccessor */ ||
-                                container.kind === 159 /* SetAccessor */;
+                            return container.kind === 157 /* MethodDeclaration */ ||
+                                container.kind === 156 /* MethodSignature */ ||
+                                container.kind === 159 /* GetAccessor */ ||
+                                container.kind === 160 /* SetAccessor */;
                         }
                         else {
-                            return container.kind === 156 /* MethodDeclaration */ ||
-                                container.kind === 155 /* MethodSignature */ ||
-                                container.kind === 158 /* GetAccessor */ ||
-                                container.kind === 159 /* SetAccessor */ ||
-                                container.kind === 154 /* PropertyDeclaration */ ||
-                                container.kind === 153 /* PropertySignature */ ||
-                                container.kind === 157 /* Constructor */;
+                            return container.kind === 157 /* MethodDeclaration */ ||
+                                container.kind === 156 /* MethodSignature */ ||
+                                container.kind === 159 /* GetAccessor */ ||
+                                container.kind === 160 /* SetAccessor */ ||
+                                container.kind === 155 /* PropertyDeclaration */ ||
+                                container.kind === 154 /* PropertySignature */ ||
+                                container.kind === 158 /* Constructor */;
                         }
                     }
                 }
@@ -47297,10 +48683,10 @@ var ts;
             }
         }
         function getContainingObjectLiteral(func) {
-            return (func.kind === 156 /* MethodDeclaration */ ||
-                func.kind === 158 /* GetAccessor */ ||
-                func.kind === 159 /* SetAccessor */) && func.parent.kind === 188 /* ObjectLiteralExpression */ ? func.parent :
-                func.kind === 196 /* FunctionExpression */ && func.parent.kind === 275 /* PropertyAssignment */ ? func.parent.parent :
+            return (func.kind === 157 /* MethodDeclaration */ ||
+                func.kind === 159 /* GetAccessor */ ||
+                func.kind === 160 /* SetAccessor */) && func.parent.kind === 189 /* ObjectLiteralExpression */ ? func.parent :
+                func.kind === 197 /* FunctionExpression */ && func.parent.kind === 276 /* PropertyAssignment */ ? func.parent.parent :
                     undefined;
         }
         function getThisTypeArgument(type) {
@@ -47312,7 +48698,7 @@ var ts;
             });
         }
         function getContextualThisParameterType(func) {
-            if (func.kind === 197 /* ArrowFunction */) {
+            if (func.kind === 198 /* ArrowFunction */) {
                 return undefined;
             }
             if (isContextSensitiveFunctionOrObjectLiteralMethod(func)) {
@@ -47337,9 +48723,9 @@ var ts;
                     while (type) {
                         var thisType = getThisTypeFromContextualType(type);
                         if (thisType) {
-                            return instantiateType(thisType, getContextualMapper(containingLiteral));
+                            return instantiateType(thisType, getMapperFromContext(getInferenceContext(containingLiteral)));
                         }
-                        if (literal.parent.kind !== 275 /* PropertyAssignment */) {
+                        if (literal.parent.kind !== 276 /* PropertyAssignment */) {
                             break;
                         }
                         literal = literal.parent.parent;
@@ -47348,14 +48734,14 @@ var ts;
                     // There was no contextual ThisType<T> for the containing object literal, so the contextual type
                     // for 'this' is the non-null form of the contextual type for the containing object literal or
                     // the type of the object literal itself.
-                    return contextualType ? getNonNullableType(contextualType) : checkExpressionCached(containingLiteral);
+                    return getWidenedType(contextualType ? getNonNullableType(contextualType) : checkExpressionCached(containingLiteral));
                 }
                 // In an assignment of the form 'obj.xxx = function(...)' or 'obj[xxx] = function(...)', the
                 // contextual type for 'this' is 'obj'.
                 var parent = func.parent;
-                if (parent.kind === 204 /* BinaryExpression */ && parent.operatorToken.kind === 59 /* EqualsToken */) {
+                if (parent.kind === 205 /* BinaryExpression */ && parent.operatorToken.kind === 60 /* EqualsToken */) {
                     var target = parent.left;
-                    if (target.kind === 189 /* PropertyAccessExpression */ || target.kind === 190 /* ElementAccessExpression */) {
+                    if (target.kind === 190 /* PropertyAccessExpression */ || target.kind === 191 /* ElementAccessExpression */) {
                         var expression = target.expression;
                         // Don't contextually type `this` as `exports` in `exports.Point = function(x, y) { this.x = x; this.y = y; }`
                         if (inJs && ts.isIdentifier(expression)) {
@@ -47364,14 +48750,14 @@ var ts;
                                 return undefined;
                             }
                         }
-                        return checkExpressionCached(expression);
+                        return getWidenedType(checkExpressionCached(expression));
                     }
                 }
             }
             return undefined;
         }
         // Return contextual type of parameter or undefined if no contextual type is available
-        function getContextuallyTypedParameterType(parameter) {
+        function getContextuallyTypedParameterType(parameter, forCache) {
             var func = parameter.parent;
             if (!isContextSensitiveFunctionOrObjectLiteralMethod(func)) {
                 return undefined;
@@ -47394,6 +48780,19 @@ var ts;
             }
             var contextualSignature = getContextualSignature(func);
             if (contextualSignature) {
+                if (forCache) {
+                    // Calling the below guarantees the types are primed and assigned in the same way
+                    // as when the parameter is reached via `checkFunctionExpressionOrObjectLiteralMethod`.
+                    // This should prevent any uninstantiated inference variables in the contextual signature
+                    // from leaking, and should lock in cached parameter types via `assignContextualParameterTypes`
+                    // which we will then immediately use the results of below.
+                    contextuallyCheckFunctionExpressionOrObjectLiteralMethod(func);
+                    var type = getTypeOfSymbol(getMergedSymbol(func.symbol));
+                    if (isTypeAny(type)) {
+                        return type;
+                    }
+                    contextualSignature = getSignaturesOfType(type, 0 /* Call */)[0];
+                }
                 var index = func.parameters.indexOf(parameter) - (ts.getThisParameter(func) ? 1 : 0);
                 return parameter.dotDotDotToken && ts.lastOrUndefined(func.parameters) === parameter ?
                     getRestTypeAtPosition(contextualSignature, index) :
@@ -47406,9 +48805,9 @@ var ts;
                 return getTypeFromTypeNode(typeNode);
             }
             switch (declaration.kind) {
-                case 151 /* Parameter */:
-                    return getContextuallyTypedParameterType(declaration);
-                case 186 /* BindingElement */:
+                case 152 /* Parameter */:
+                    return getContextuallyTypedParameterType(declaration, /*forCache*/ false);
+                case 187 /* BindingElement */:
                     return getContextualTypeForBindingElement(declaration);
                 // By default, do nothing and return undefined - only parameters and binding elements have context implied by a parent
             }
@@ -47480,7 +48879,7 @@ var ts;
                 if (contextualReturnType) {
                     return node.asteriskToken
                         ? contextualReturnType
-                        : getIteratedTypeOfGenerator(contextualReturnType, (functionFlags & 2 /* Async */) !== 0);
+                        : getIterationTypeOfGeneratorFunctionReturnType(0 /* Yield */, contextualReturnType, (functionFlags & 2 /* Async */) !== 0);
                 }
             }
             return undefined;
@@ -47529,16 +48928,16 @@ var ts;
             return getTypeAtPosition(signature, argIndex);
         }
         function getContextualTypeForSubstitutionExpression(template, substitutionExpression) {
-            if (template.parent.kind === 193 /* TaggedTemplateExpression */) {
+            if (template.parent.kind === 194 /* TaggedTemplateExpression */) {
                 return getContextualTypeForArgument(template.parent, substitutionExpression);
             }
             return undefined;
         }
-        function getContextualTypeForBinaryOperand(node) {
+        function getContextualTypeForBinaryOperand(node, contextFlags) {
             var binaryExpression = node.parent;
             var left = binaryExpression.left, operatorToken = binaryExpression.operatorToken, right = binaryExpression.right;
             switch (operatorToken.kind) {
-                case 59 /* EqualsToken */:
+                case 60 /* EqualsToken */:
                     if (node !== right) {
                         return undefined;
                     }
@@ -47548,15 +48947,17 @@ var ts;
                     }
                     return contextSensitive === true ? getTypeOfExpression(left) : contextSensitive;
                 case 55 /* BarBarToken */:
-                    // When an || expression has a contextual type, the operands are contextually typed by that type. When an ||
-                    // expression has no contextual type, the right operand is contextually typed by the type of the left operand,
-                    // except for the special case of Javascript declarations of the form `namespace.prop = namespace.prop || {}`
-                    var type = getContextualType(binaryExpression);
-                    return !type && node === right && !ts.isDefaultedExpandoInitializer(binaryExpression) ?
+                    // When an || expression has a contextual type, the operands are contextually typed by that type, except
+                    // when that type originates in a binding pattern, the right operand is contextually typed by the type of
+                    // the left operand. When an || expression has no contextual type, the right operand is contextually typed
+                    // by the type of the left operand, except for the special case of Javascript declarations of the form
+                    // `namespace.prop = namespace.prop || {}`.
+                    var type = getContextualType(binaryExpression, contextFlags);
+                    return node === right && (type && type.pattern || !type && !ts.isDefaultedExpandoInitializer(binaryExpression)) ?
                         getTypeOfExpression(left) : type;
                 case 54 /* AmpersandAmpersandToken */:
                 case 27 /* CommaToken */:
-                    return node === right ? getContextualType(binaryExpression) : undefined;
+                    return node === right ? getContextualType(binaryExpression, contextFlags) : undefined;
                 default:
                     return undefined;
             }
@@ -47632,7 +49033,15 @@ var ts;
         }
         function getTypeOfPropertyOfContextualType(type, name) {
             return mapType(type, function (t) {
-                if (t.flags & 3670016 /* StructuredType */) {
+                if (isGenericMappedType(t)) {
+                    var constraint = getConstraintTypeFromMappedType(t);
+                    var constraintOfConstraint = getBaseConstraintOfType(constraint) || constraint;
+                    var propertyNameType = getLiteralType(ts.unescapeLeadingUnderscores(name));
+                    if (isTypeAssignableTo(propertyNameType, constraintOfConstraint)) {
+                        return substituteIndexedMappedType(t, propertyNameType);
+                    }
+                }
+                else if (t.flags & 3670016 /* StructuredType */) {
                     var prop = getPropertyOfType(t, name);
                     if (prop) {
                         return getTypeOfSymbol(prop);
@@ -47655,24 +49064,24 @@ var ts;
         // In an object literal contextually typed by a type T, the contextual type of a property assignment is the type of
         // the matching property in T, if one exists. Otherwise, it is the type of the numeric index signature in T, if one
         // exists. Otherwise, it is the type of the string index signature in T, if one exists.
-        function getContextualTypeForObjectLiteralMethod(node) {
+        function getContextualTypeForObjectLiteralMethod(node, contextFlags) {
             ts.Debug.assert(ts.isObjectLiteralMethod(node));
             if (node.flags & 8388608 /* InWithStatement */) {
                 // We cannot answer semantic questions within a with block, do not proceed any further
                 return undefined;
             }
-            return getContextualTypeForObjectLiteralElement(node);
+            return getContextualTypeForObjectLiteralElement(node, contextFlags);
         }
-        function getContextualTypeForObjectLiteralElement(element) {
+        function getContextualTypeForObjectLiteralElement(element, contextFlags) {
             var objectLiteral = element.parent;
-            var type = getApparentTypeOfContextualType(objectLiteral);
+            var type = getApparentTypeOfContextualType(objectLiteral, contextFlags);
             if (type) {
                 if (!hasNonBindableDynamicName(element)) {
                     // For a (non-symbol) computed property, there is no reason to look up the name
                     // in the type. It will just be "__computed", which does not appear in any
                     // SymbolTable.
-                    var symbolName_2 = getSymbolOfNode(element).escapedName;
-                    var propertyType = getTypeOfPropertyOfContextualType(type, symbolName_2);
+                    var symbolName_3 = getSymbolOfNode(element).escapedName;
+                    var propertyType = getTypeOfPropertyOfContextualType(type, symbolName_3);
                     if (propertyType) {
                         return propertyType;
                     }
@@ -47688,12 +49097,12 @@ var ts;
         // type of T.
         function getContextualTypeForElementExpression(arrayContextualType, index) {
             return arrayContextualType && (getTypeOfPropertyOfContextualType(arrayContextualType, "" + index)
-                || getIteratedTypeOrElementType(arrayContextualType, /*errorNode*/ undefined, /*allowStringInput*/ false, /*allowAsyncIterables*/ false, /*checkAssignability*/ false));
+                || getIteratedTypeOrElementType(1 /* Element */, arrayContextualType, undefinedType, /*errorNode*/ undefined, /*checkAssignability*/ false));
         }
         // In a contextually typed conditional expression, the true/false expressions are contextually typed by the same type.
-        function getContextualTypeForConditionalOperand(node) {
+        function getContextualTypeForConditionalOperand(node, contextFlags) {
             var conditional = node.parent;
-            return node === conditional.whenTrue || node === conditional.whenFalse ? getContextualType(conditional) : undefined;
+            return node === conditional.whenTrue || node === conditional.whenFalse ? getContextualType(conditional, contextFlags) : undefined;
         }
         function getContextualTypeForChildJsxExpression(node, child) {
             var attributesType = getApparentTypeOfContextualType(node.openingElement.tagName);
@@ -47702,16 +49111,17 @@ var ts;
             if (!(attributesType && !isTypeAny(attributesType) && jsxChildrenPropertyName && jsxChildrenPropertyName !== "")) {
                 return undefined;
             }
-            var childIndex = node.children.indexOf(child);
+            var realChildren = getSemanticJsxChildren(node.children);
+            var childIndex = realChildren.indexOf(child);
             var childFieldType = getTypeOfPropertyOfContextualType(attributesType, jsxChildrenPropertyName);
-            return childFieldType && mapType(childFieldType, function (t) {
+            return childFieldType && (realChildren.length === 1 ? childFieldType : mapType(childFieldType, function (t) {
                 if (isArrayLikeType(t)) {
                     return getIndexedAccessType(t, getLiteralType(childIndex));
                 }
                 else {
                     return t;
                 }
-            }, /*noReductions*/ true);
+            }, /*noReductions*/ true));
         }
         function getContextualTypeForJsxExpression(node) {
             var exprParent = node.parent;
@@ -47745,30 +49155,30 @@ var ts;
                 case 8 /* NumericLiteral */:
                 case 9 /* BigIntLiteral */:
                 case 14 /* NoSubstitutionTemplateLiteral */:
-                case 102 /* TrueKeyword */:
-                case 87 /* FalseKeyword */:
-                case 96 /* NullKeyword */:
-                case 72 /* Identifier */:
-                case 141 /* UndefinedKeyword */:
+                case 103 /* TrueKeyword */:
+                case 88 /* FalseKeyword */:
+                case 97 /* NullKeyword */:
+                case 73 /* Identifier */:
+                case 142 /* UndefinedKeyword */:
                     return true;
-                case 189 /* PropertyAccessExpression */:
-                case 195 /* ParenthesizedExpression */:
+                case 190 /* PropertyAccessExpression */:
+                case 196 /* ParenthesizedExpression */:
                     return isPossiblyDiscriminantValue(node.expression);
-                case 270 /* JsxExpression */:
+                case 271 /* JsxExpression */:
                     return !node.expression || isPossiblyDiscriminantValue(node.expression);
             }
             return false;
         }
         function discriminateContextualTypeByObjectMembers(node, contextualType) {
-            return discriminateTypeByDiscriminableItems(contextualType, ts.map(ts.filter(node.properties, function (p) { return !!p.symbol && p.kind === 275 /* PropertyAssignment */ && isPossiblyDiscriminantValue(p.initializer) && isDiscriminantProperty(contextualType, p.symbol.escapedName); }), function (prop) { return [function () { return checkExpression(prop.initializer); }, prop.symbol.escapedName]; }), isTypeAssignableTo, contextualType);
+            return discriminateTypeByDiscriminableItems(contextualType, ts.map(ts.filter(node.properties, function (p) { return !!p.symbol && p.kind === 276 /* PropertyAssignment */ && isPossiblyDiscriminantValue(p.initializer) && isDiscriminantProperty(contextualType, p.symbol.escapedName); }), function (prop) { return [function () { return checkExpression(prop.initializer); }, prop.symbol.escapedName]; }), isTypeAssignableTo, contextualType);
         }
         function discriminateContextualTypeByJSXAttributes(node, contextualType) {
-            return discriminateTypeByDiscriminableItems(contextualType, ts.map(ts.filter(node.properties, function (p) { return !!p.symbol && p.kind === 267 /* JsxAttribute */ && isDiscriminantProperty(contextualType, p.symbol.escapedName) && (!p.initializer || isPossiblyDiscriminantValue(p.initializer)); }), function (prop) { return [!prop.initializer ? (function () { return trueType; }) : (function () { return checkExpression(prop.initializer); }), prop.symbol.escapedName]; }), isTypeAssignableTo, contextualType);
+            return discriminateTypeByDiscriminableItems(contextualType, ts.map(ts.filter(node.properties, function (p) { return !!p.symbol && p.kind === 268 /* JsxAttribute */ && isDiscriminantProperty(contextualType, p.symbol.escapedName) && (!p.initializer || isPossiblyDiscriminantValue(p.initializer)); }), function (prop) { return [!prop.initializer ? (function () { return trueType; }) : (function () { return checkExpression(prop.initializer); }), prop.symbol.escapedName]; }), isTypeAssignableTo, contextualType);
         }
         // Return the contextual type for a given expression node. During overload resolution, a contextual type may temporarily
         // be "pushed" onto a node using the contextualType property.
-        function getApparentTypeOfContextualType(node) {
-            var contextualType = instantiateContextualType(getContextualType(node), node);
+        function getApparentTypeOfContextualType(node, contextFlags) {
+            var contextualType = instantiateContextualType(getContextualType(node, contextFlags), node, contextFlags);
             if (contextualType) {
                 var apparentType = mapType(contextualType, getApparentType, /*noReductions*/ true);
                 if (apparentType.flags & 1048576 /* Union */) {
@@ -47784,11 +49194,22 @@ var ts;
         }
         // If the given contextual type contains instantiable types and if a mapper representing
         // return type inferences is available, instantiate those types using that mapper.
-        function instantiateContextualType(contextualType, node) {
+        function instantiateContextualType(contextualType, node, contextFlags) {
             if (contextualType && maybeTypeOfKind(contextualType, 63176704 /* Instantiable */)) {
-                var returnMapper = getContextualMapper(node).returnMapper;
-                if (returnMapper) {
-                    return instantiateInstantiableTypes(contextualType, returnMapper);
+                var inferenceContext = getInferenceContext(node);
+                // If no inferences have been made, nothing is gained from instantiating as type parameters
+                // would just be replaced with their defaults similar to the apparent type.
+                if (inferenceContext && ts.some(inferenceContext.inferences, hasInferenceCandidates)) {
+                    // For contextual signatures we incorporate all inferences made so far, e.g. from return
+                    // types as well as arguments to the left in a function call.
+                    if (contextFlags && contextFlags & 1 /* Signature */) {
+                        return instantiateInstantiableTypes(contextualType, inferenceContext.nonFixingMapper);
+                    }
+                    // For other purposes (e.g. determining whether to produce literal types) we only
+                    // incorporate inferences made from the return type in a function call.
+                    if (inferenceContext.returnMapper) {
+                        return instantiateInstantiableTypes(contextualType, inferenceContext.returnMapper);
+                    }
                 }
             }
             return contextualType;
@@ -47809,7 +49230,7 @@ var ts;
             return type;
         }
         /**
-         * Woah! Do you really want to use this function?
+         * Whoa! Do you really want to use this function?
          *
          * Unless you're trying to get the *non-apparent* type for a
          * value-literal type or you're authoring relevant portions of this algorithm,
@@ -47825,7 +49246,7 @@ var ts;
          * @param node the expression whose contextual type will be returned.
          * @returns the contextual type of an expression.
          */
-        function getContextualType(node) {
+        function getContextualType(node, contextFlags) {
             if (node.flags & 8388608 /* InWithStatement */) {
                 // We cannot answer semantic questions within a with block, do not proceed any further
                 return undefined;
@@ -47835,61 +49256,65 @@ var ts;
             }
             var parent = node.parent;
             switch (parent.kind) {
-                case 237 /* VariableDeclaration */:
-                case 151 /* Parameter */:
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
-                case 186 /* BindingElement */:
+                case 238 /* VariableDeclaration */:
+                case 152 /* Parameter */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
+                case 187 /* BindingElement */:
                     return getContextualTypeForInitializerExpression(node);
-                case 197 /* ArrowFunction */:
-                case 230 /* ReturnStatement */:
+                case 198 /* ArrowFunction */:
+                case 231 /* ReturnStatement */:
                     return getContextualTypeForReturnExpression(node);
-                case 207 /* YieldExpression */:
+                case 208 /* YieldExpression */:
                     return getContextualTypeForYieldOperand(parent);
-                case 201 /* AwaitExpression */:
+                case 202 /* AwaitExpression */:
                     return getContextualTypeForAwaitOperand(parent);
-                case 191 /* CallExpression */:
-                case 192 /* NewExpression */:
+                case 192 /* CallExpression */:
+                    if (parent.expression.kind === 93 /* ImportKeyword */) {
+                        return stringType;
+                    }
+                /* falls through */
+                case 193 /* NewExpression */:
                     return getContextualTypeForArgument(parent, node);
-                case 194 /* TypeAssertionExpression */:
-                case 212 /* AsExpression */:
+                case 195 /* TypeAssertionExpression */:
+                case 213 /* AsExpression */:
                     return ts.isConstTypeReference(parent.type) ? undefined : getTypeFromTypeNode(parent.type);
-                case 204 /* BinaryExpression */:
-                    return getContextualTypeForBinaryOperand(node);
-                case 275 /* PropertyAssignment */:
-                case 276 /* ShorthandPropertyAssignment */:
-                    return getContextualTypeForObjectLiteralElement(parent);
-                case 277 /* SpreadAssignment */:
-                    return getApparentTypeOfContextualType(parent.parent);
-                case 187 /* ArrayLiteralExpression */: {
+                case 205 /* BinaryExpression */:
+                    return getContextualTypeForBinaryOperand(node, contextFlags);
+                case 276 /* PropertyAssignment */:
+                case 277 /* ShorthandPropertyAssignment */:
+                    return getContextualTypeForObjectLiteralElement(parent, contextFlags);
+                case 278 /* SpreadAssignment */:
+                    return getApparentTypeOfContextualType(parent.parent, contextFlags);
+                case 188 /* ArrayLiteralExpression */: {
                     var arrayLiteral = parent;
-                    var type = getApparentTypeOfContextualType(arrayLiteral);
+                    var type = getApparentTypeOfContextualType(arrayLiteral, contextFlags);
                     return getContextualTypeForElementExpression(type, ts.indexOfNode(arrayLiteral.elements, node));
                 }
-                case 205 /* ConditionalExpression */:
-                    return getContextualTypeForConditionalOperand(node);
-                case 216 /* TemplateSpan */:
-                    ts.Debug.assert(parent.parent.kind === 206 /* TemplateExpression */);
+                case 206 /* ConditionalExpression */:
+                    return getContextualTypeForConditionalOperand(node, contextFlags);
+                case 217 /* TemplateSpan */:
+                    ts.Debug.assert(parent.parent.kind === 207 /* TemplateExpression */);
                     return getContextualTypeForSubstitutionExpression(parent.parent, node);
-                case 195 /* ParenthesizedExpression */: {
+                case 196 /* ParenthesizedExpression */: {
                     // Like in `checkParenthesizedExpression`, an `/** @type {xyz} */` comment before a parenthesized expression acts as a type cast.
                     var tag = ts.isInJSFile(parent) ? ts.getJSDocTypeTag(parent) : undefined;
-                    return tag ? getTypeFromTypeNode(tag.typeExpression.type) : getContextualType(parent);
+                    return tag ? getTypeFromTypeNode(tag.typeExpression.type) : getContextualType(parent, contextFlags);
                 }
-                case 270 /* JsxExpression */:
+                case 271 /* JsxExpression */:
                     return getContextualTypeForJsxExpression(parent);
-                case 267 /* JsxAttribute */:
-                case 269 /* JsxSpreadAttribute */:
+                case 268 /* JsxAttribute */:
+                case 270 /* JsxSpreadAttribute */:
                     return getContextualTypeForJsxAttribute(parent);
-                case 262 /* JsxOpeningElement */:
-                case 261 /* JsxSelfClosingElement */:
+                case 263 /* JsxOpeningElement */:
+                case 262 /* JsxSelfClosingElement */:
                     return getContextualJsxElementAttributesType(parent);
             }
             return undefined;
         }
-        function getContextualMapper(node) {
-            var ancestor = ts.findAncestor(node, function (n) { return !!n.contextualMapper; });
-            return ancestor ? ancestor.contextualMapper : identityMapper;
+        function getInferenceContext(node) {
+            var ancestor = ts.findAncestor(node, function (n) { return !!n.inferenceContext; });
+            return ancestor && ancestor.inferenceContext;
         }
         function getContextualJsxElementAttributesType(node) {
             if (ts.isJsxOpeningElement(node) && node.parent.contextualType) {
@@ -47904,7 +49329,7 @@ var ts;
             return getJsxReferenceKind(node) !== 0 /* Component */ ? getJsxPropsTypeFromCallSignature(signature, node) : getJsxPropsTypeFromClassType(signature, node);
         }
         function getJsxPropsTypeFromCallSignature(sig, context) {
-            var propsType = getTypeOfFirstParameterOfSignatureWithFallback(sig, emptyObjectType);
+            var propsType = getTypeOfFirstParameterOfSignatureWithFallback(sig, unknownType);
             propsType = getJsxManagedAttributesFromLocatedAttributes(context, getJsxNamespaceAt(context), propsType);
             var intrinsicAttribs = getJsxType(JsxNames.IntrinsicAttributes, context);
             if (intrinsicAttribs !== errorType) {
@@ -47975,7 +49400,7 @@ var ts;
             var forcedLookupLocation = getJsxElementPropertiesName(ns);
             var attributesType = forcedLookupLocation === undefined
                 // If there is no type ElementAttributesProperty, return the type of the first parameter of the signature, which should be the props type
-                ? getTypeOfFirstParameterOfSignatureWithFallback(sig, emptyObjectType)
+                ? getTypeOfFirstParameterOfSignatureWithFallback(sig, unknownType)
                 : forcedLookupLocation === ""
                     // If there is no e.g. 'props' member in ElementAttributesProperty, use the element class type instead
                     ? getReturnTypeOfSignature(sig)
@@ -47986,7 +49411,7 @@ var ts;
                 if (!!forcedLookupLocation && !!ts.length(context.attributes.properties)) {
                     error(context, ts.Diagnostics.JSX_element_class_does_not_support_attributes_because_it_does_not_have_a_0_property, ts.unescapeLeadingUnderscores(forcedLookupLocation));
                 }
-                return emptyObjectType;
+                return unknownType;
             }
             attributesType = getJsxManagedAttributesFromLocatedAttributes(context, ns, attributesType);
             if (isTypeAny(attributesType)) {
@@ -48037,7 +49462,7 @@ var ts;
             return !hasEffectiveRestParameter(signature) && getParameterCount(signature) < targetParameterCount;
         }
         function isFunctionExpressionOrArrowFunction(node) {
-            return node.kind === 196 /* FunctionExpression */ || node.kind === 197 /* ArrowFunction */;
+            return node.kind === 197 /* FunctionExpression */ || node.kind === 198 /* ArrowFunction */;
         }
         function getContextualSignatureForFunctionLikeDeclaration(node) {
             // Only function expressions, arrow functions, and object literal methods are contextually typed.
@@ -48045,23 +49470,20 @@ var ts;
                 ? getContextualSignature(node)
                 : undefined;
         }
-        function getContextualTypeForFunctionLikeDeclaration(node) {
-            return ts.isObjectLiteralMethod(node) ?
-                getContextualTypeForObjectLiteralMethod(node) :
-                getApparentTypeOfContextualType(node);
-        }
         // Return the contextual signature for a given expression node. A contextual type provides a
         // contextual signature if it has a single call signature and if that call signature is non-generic.
         // If the contextual type is a union type, get the signature from each type possible and if they are
         // all identical ignoring their return type, the result is same signature but with return type as
         // union type of return types from these signatures
         function getContextualSignature(node) {
-            ts.Debug.assert(node.kind !== 156 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 157 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
             var typeTagSignature = getSignatureOfTypeTag(node);
             if (typeTagSignature) {
                 return typeTagSignature;
             }
-            var type = getContextualTypeForFunctionLikeDeclaration(node);
+            var type = ts.isObjectLiteralMethod(node) ?
+                getContextualTypeForObjectLiteralMethod(node, 1 /* Signature */) :
+                getApparentTypeOfContextualType(node, 1 /* Signature */);
             if (!type) {
                 return undefined;
             }
@@ -48070,8 +49492,8 @@ var ts;
             }
             var signatureList;
             var types = type.types;
-            for (var _i = 0, types_15 = types; _i < types_15.length; _i++) {
-                var current = types_15[_i];
+            for (var _i = 0, types_14 = types; _i < types_14.length; _i++) {
+                var current = types_14[_i];
                 var signature = getContextualCallSignature(current, node);
                 if (signature) {
                     if (!signatureList) {
@@ -48089,23 +49511,20 @@ var ts;
                 }
             }
             // Result is union of signatures collected (return type is union of return types of this signature set)
-            var result;
             if (signatureList) {
-                result = cloneSignature(signatureList[0]);
-                result.unionSignatures = signatureList;
+                return signatureList.length === 1 ? signatureList[0] : createUnionSignature(signatureList[0], signatureList);
             }
-            return result;
         }
         function checkSpreadExpression(node, checkMode) {
-            if (languageVersion < 2 /* ES2015 */ && compilerOptions.downlevelIteration) {
-                checkExternalEmitHelpers(node, 1536 /* SpreadIncludes */);
+            if (languageVersion < 2 /* ES2015 */) {
+                checkExternalEmitHelpers(node, compilerOptions.downlevelIteration ? 1536 /* SpreadIncludes */ : 2048 /* SpreadArrays */);
             }
             var arrayOrIterableType = checkExpression(node.expression, checkMode);
-            return checkIteratedTypeOrElementType(arrayOrIterableType, node.expression, /*allowStringInput*/ false, /*allowAsyncIterables*/ false);
+            return checkIteratedTypeOrElementType(33 /* Spread */, arrayOrIterableType, undefinedType, node.expression);
         }
         function hasDefaultValue(node) {
-            return (node.kind === 186 /* BindingElement */ && !!node.initializer) ||
-                (node.kind === 204 /* BinaryExpression */ && node.operatorToken.kind === 59 /* EqualsToken */);
+            return (node.kind === 187 /* BindingElement */ && !!node.initializer) ||
+                (node.kind === 205 /* BinaryExpression */ && node.operatorToken.kind === 60 /* EqualsToken */);
         }
         function checkArrayLiteral(node, checkMode, forceTuple) {
             var elements = node.elements;
@@ -48117,7 +49536,7 @@ var ts;
             var inConstContext = isConstContext(node);
             for (var index = 0; index < elementCount; index++) {
                 var e = elements[index];
-                if (inDestructuringPattern && e.kind === 208 /* SpreadElement */) {
+                if (inDestructuringPattern && e.kind === 209 /* SpreadElement */) {
                     // Given the following situation:
                     //    var c: {};
                     //    [...c] = ["", 0];
@@ -48132,7 +49551,7 @@ var ts;
                     // if there is no index type / iterated type.
                     var restArrayType = checkExpression(e.expression, checkMode, forceTuple);
                     var restElementType = getIndexTypeOfType(restArrayType, 1 /* Number */) ||
-                        getIteratedTypeOrElementType(restArrayType, /*errorNode*/ undefined, /*allowStringInput*/ false, /*allowAsyncIterables*/ false, /*checkAssignability*/ false);
+                        getIteratedTypeOrElementType(65 /* Destructuring */, restArrayType, undefinedType, /*errorNode*/ undefined, /*checkAssignability*/ false);
                     if (restElementType) {
                         elementTypes.push(restElementType);
                     }
@@ -48142,12 +49561,12 @@ var ts;
                     var type = checkExpressionForMutableLocation(e, checkMode, elementContextualType, forceTuple);
                     elementTypes.push(type);
                 }
-                if (index < elementCount - 1 && e.kind === 208 /* SpreadElement */) {
+                if (index < elementCount - 1 && e.kind === 209 /* SpreadElement */) {
                     hasNonEndingSpreadElement = true;
                 }
             }
             if (!hasNonEndingSpreadElement) {
-                var hasRestElement = elementCount > 0 && elements[elementCount - 1].kind === 208 /* SpreadElement */;
+                var hasRestElement = elementCount > 0 && elements[elementCount - 1].kind === 209 /* SpreadElement */;
                 var minLength = elementCount - (hasRestElement ? 1 : 0);
                 // If array literal is actually a destructuring pattern, mark it as an implied type. We do this such
                 // that we get the same behavior for "var [x, y] = []" and "[x, y] = []".
@@ -48158,48 +49577,40 @@ var ts;
                     return type;
                 }
                 else if (tupleResult = getArrayLiteralTupleTypeIfApplicable(elementTypes, contextualType, hasRestElement, elementCount, inConstContext)) {
-                    return tupleResult;
+                    return createArrayLiteralType(tupleResult);
                 }
                 else if (forceTuple) {
-                    return createTupleType(elementTypes, minLength, hasRestElement);
+                    return createArrayLiteralType(createTupleType(elementTypes, minLength, hasRestElement));
                 }
             }
-            return createArrayType(elementTypes.length ?
+            return createArrayLiteralType(createArrayType(elementTypes.length ?
                 getUnionType(elementTypes, 2 /* Subtype */) :
-                strictNullChecks ? implicitNeverType : undefinedWideningType, inConstContext);
+                strictNullChecks ? implicitNeverType : undefinedWideningType, inConstContext));
+        }
+        function createArrayLiteralType(type) {
+            if (!(ts.getObjectFlags(type) & 4 /* Reference */)) {
+                return type;
+            }
+            var literalType = type.literalType;
+            if (!literalType) {
+                literalType = type.literalType = cloneTypeReference(type);
+                literalType.objectFlags |= 65536 /* ArrayLiteral */ | 524288 /* ContainsObjectOrArrayLiteral */;
+            }
+            return literalType;
         }
         function getArrayLiteralTupleTypeIfApplicable(elementTypes, contextualType, hasRestElement, elementCount, readonly) {
             if (elementCount === void 0) { elementCount = elementTypes.length; }
             if (readonly === void 0) { readonly = false; }
             // Infer a tuple type when the contextual type is or contains a tuple-like type
             if (readonly || (contextualType && forEachType(contextualType, isTupleLikeType))) {
-                var minLength = elementCount - (hasRestElement ? 1 : 0);
-                var pattern = contextualType && contextualType.pattern;
-                // If array literal is contextually typed by a binding pattern or an assignment pattern, pad the resulting
-                // tuple type with the corresponding binding or assignment element types to make the lengths equal.
-                if (!hasRestElement && pattern && (pattern.kind === 185 /* ArrayBindingPattern */ || pattern.kind === 187 /* ArrayLiteralExpression */)) {
-                    var patternElements = pattern.elements;
-                    for (var i = elementCount; i < patternElements.length; i++) {
-                        var e = patternElements[i];
-                        if (hasDefaultValue(e)) {
-                            elementTypes.push(contextualType.typeArguments[i]);
-                        }
-                        else if (i < patternElements.length - 1 || !(e.kind === 186 /* BindingElement */ && e.dotDotDotToken || e.kind === 208 /* SpreadElement */)) {
-                            if (e.kind !== 210 /* OmittedExpression */) {
-                                error(e, ts.Diagnostics.Initializer_provides_no_value_for_this_binding_element_and_the_binding_element_has_no_default_value);
-                            }
-                            elementTypes.push(strictNullChecks ? implicitNeverType : undefinedWideningType);
-                        }
-                    }
-                }
-                return createTupleType(elementTypes, minLength, hasRestElement, readonly);
+                return createTupleType(elementTypes, elementCount - (hasRestElement ? 1 : 0), hasRestElement, readonly);
             }
         }
         function isNumericName(name) {
             switch (name.kind) {
-                case 149 /* ComputedPropertyName */:
+                case 150 /* ComputedPropertyName */:
                     return isNumericComputedName(name);
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return isNumericLiteralName(name.escapedText);
                 case 8 /* NumericLiteral */:
                 case 10 /* StringLiteral */:
@@ -48287,7 +49698,7 @@ var ts;
             var spread = emptyObjectType;
             var contextualType = getApparentTypeOfContextualType(node);
             var contextualTypeHasPattern = contextualType && contextualType.pattern &&
-                (contextualType.pattern.kind === 184 /* ObjectBindingPattern */ || contextualType.pattern.kind === 188 /* ObjectLiteralExpression */);
+                (contextualType.pattern.kind === 185 /* ObjectBindingPattern */ || contextualType.pattern.kind === 189 /* ObjectLiteralExpression */);
             var inConstContext = isConstContext(node);
             var checkFlags = inConstContext ? 8 /* Readonly */ : 0;
             var isInJavascript = ts.isInJSFile(node) && !ts.isInJsonFile(node);
@@ -48302,13 +49713,13 @@ var ts;
             for (var i = 0; i < node.properties.length; i++) {
                 var memberDecl = node.properties[i];
                 var member = getSymbolOfNode(memberDecl);
-                var computedNameType = memberDecl.name && memberDecl.name.kind === 149 /* ComputedPropertyName */ && !ts.isWellKnownSymbolSyntactically(memberDecl.name.expression) ?
+                var computedNameType = memberDecl.name && memberDecl.name.kind === 150 /* ComputedPropertyName */ && !ts.isWellKnownSymbolSyntactically(memberDecl.name.expression) ?
                     checkComputedPropertyName(memberDecl.name) : undefined;
-                if (memberDecl.kind === 275 /* PropertyAssignment */ ||
-                    memberDecl.kind === 276 /* ShorthandPropertyAssignment */ ||
+                if (memberDecl.kind === 276 /* PropertyAssignment */ ||
+                    memberDecl.kind === 277 /* ShorthandPropertyAssignment */ ||
                     ts.isObjectLiteralMethod(memberDecl)) {
-                    var type = memberDecl.kind === 275 /* PropertyAssignment */ ? checkPropertyAssignment(memberDecl, checkMode) :
-                        memberDecl.kind === 276 /* ShorthandPropertyAssignment */ ? checkExpressionForMutableLocation(memberDecl.name, checkMode) :
+                    var type = memberDecl.kind === 276 /* PropertyAssignment */ ? checkPropertyAssignment(memberDecl, checkMode) :
+                        memberDecl.kind === 277 /* ShorthandPropertyAssignment */ ? checkExpressionForMutableLocation(memberDecl.name, checkMode) :
                             checkObjectLiteralMethod(memberDecl, checkMode);
                     if (isInJavascript) {
                         var jsDocType = getTypeForDeclarationFromJSDocComment(memberDecl);
@@ -48320,10 +49731,10 @@ var ts;
                             checkTypeAssignableTo(type, getTypeFromTypeNode(enumTag.typeExpression), memberDecl);
                         }
                     }
-                    objectFlags |= ts.getObjectFlags(type) & 917504 /* PropagatingFlags */;
+                    objectFlags |= ts.getObjectFlags(type) & 1835008 /* PropagatingFlags */;
                     var nameType = computedNameType && isTypeUsableAsPropertyName(computedNameType) ? computedNameType : undefined;
                     var prop = nameType ?
-                        createSymbol(4 /* Property */ | member.flags, getPropertyNameFromType(nameType), checkFlags | 2048 /* Late */) :
+                        createSymbol(4 /* Property */ | member.flags, getPropertyNameFromType(nameType), checkFlags | 4096 /* Late */) :
                         createSymbol(4 /* Property */ | member.flags, member.escapedName, checkFlags);
                     if (nameType) {
                         prop.nameType = nameType;
@@ -48331,8 +49742,8 @@ var ts;
                     if (inDestructuringPattern) {
                         // If object literal is an assignment pattern and if the assignment pattern specifies a default value
                         // for the property, make the property optional.
-                        var isOptional = (memberDecl.kind === 275 /* PropertyAssignment */ && hasDefaultValue(memberDecl.initializer)) ||
-                            (memberDecl.kind === 276 /* ShorthandPropertyAssignment */ && memberDecl.objectAssignmentInitializer);
+                        var isOptional = (memberDecl.kind === 276 /* PropertyAssignment */ && hasDefaultValue(memberDecl.initializer)) ||
+                            (memberDecl.kind === 277 /* ShorthandPropertyAssignment */ && memberDecl.objectAssignmentInitializer);
                         if (isOptional) {
                             prop.flags |= 16777216 /* Optional */;
                         }
@@ -48357,7 +49768,7 @@ var ts;
                     prop.target = member;
                     member = prop;
                 }
-                else if (memberDecl.kind === 277 /* SpreadAssignment */) {
+                else if (memberDecl.kind === 278 /* SpreadAssignment */) {
                     if (languageVersion < 2 /* ES2015 */) {
                         checkExternalEmitHelpers(memberDecl, 2 /* Assign */);
                     }
@@ -48383,7 +49794,7 @@ var ts;
                     // an ordinary function declaration(section 6.1) with no parameters.
                     // A set accessor declaration is processed in the same manner
                     // as an ordinary function declaration with a single parameter and a Void return type.
-                    ts.Debug.assert(memberDecl.kind === 158 /* GetAccessor */ || memberDecl.kind === 159 /* SetAccessor */);
+                    ts.Debug.assert(memberDecl.kind === 159 /* GetAccessor */ || memberDecl.kind === 160 /* SetAccessor */);
                     checkNodeDeferred(memberDecl);
                 }
                 if (computedNameType && !(computedNameType.flags & 8576 /* StringOrNumberLiteralOrUnique */)) {
@@ -48429,7 +49840,7 @@ var ts;
                 var stringIndexInfo = hasComputedStringProperty ? getObjectLiteralIndexInfo(node, offset, propertiesArray, 0 /* String */) : undefined;
                 var numberIndexInfo = hasComputedNumberProperty ? getObjectLiteralIndexInfo(node, offset, propertiesArray, 1 /* Number */) : undefined;
                 var result = createAnonymousType(node.symbol, propertiesTable, ts.emptyArray, ts.emptyArray, stringIndexInfo, numberIndexInfo);
-                result.objectFlags |= objectFlags | 128 /* ObjectLiteral */ | 262144 /* ContainsObjectLiteral */;
+                result.objectFlags |= objectFlags | 128 /* ObjectLiteral */ | 524288 /* ContainsObjectOrArrayLiteral */;
                 if (isJSObjectLiteral) {
                     result.objectFlags |= 16384 /* JSLiteral */;
                 }
@@ -48491,7 +49902,7 @@ var ts;
          * Returns true iff React would emit this tag name as a string rather than an identifier or qualified name
          */
         function isJsxIntrinsicIdentifier(tagName) {
-            return tagName.kind === 72 /* Identifier */ && ts.isIntrinsicJsxName(tagName.escapedText);
+            return tagName.kind === 73 /* Identifier */ && ts.isIntrinsicJsxName(tagName.escapedText);
         }
         function checkJsxAttribute(node, checkMode) {
             return node.initializer
@@ -48521,7 +49932,7 @@ var ts;
                 var member = attributeDecl.symbol;
                 if (ts.isJsxAttribute(attributeDecl)) {
                     var exprType = checkJsxAttribute(attributeDecl, checkMode);
-                    objectFlags |= ts.getObjectFlags(exprType) & 917504 /* PropagatingFlags */;
+                    objectFlags |= ts.getObjectFlags(exprType) & 1835008 /* PropagatingFlags */;
                     var attributeSymbol = createSymbol(4 /* Property */ | 33554432 /* Transient */ | member.flags, member.escapedName);
                     attributeSymbol.declarations = member.declarations;
                     attributeSymbol.parent = member.parent;
@@ -48536,7 +49947,7 @@ var ts;
                     }
                 }
                 else {
-                    ts.Debug.assert(attributeDecl.kind === 269 /* JsxSpreadAttribute */);
+                    ts.Debug.assert(attributeDecl.kind === 270 /* JsxSpreadAttribute */);
                     if (attributesTable.size > 0) {
                         spread = getSpreadType(spread, createJsxAttributesType(), attributes.symbol, objectFlags, /*readonly*/ false);
                         attributesTable = ts.createSymbolTable();
@@ -48559,7 +49970,7 @@ var ts;
                 }
             }
             // Handle children attribute
-            var parent = openingLikeElement.parent.kind === 260 /* JsxElement */ ? openingLikeElement.parent : undefined;
+            var parent = openingLikeElement.parent.kind === 261 /* JsxElement */ ? openingLikeElement.parent : undefined;
             // We have to check that openingElement of the parent is the one we are visiting as this may not be true for selfClosingElement
             if (parent && parent.openingElement === openingLikeElement && parent.children.length > 0) {
                 var childrenTypes = checkJsxChildren(parent, checkMode);
@@ -48601,7 +50012,7 @@ var ts;
             function createJsxAttributesType() {
                 objectFlags |= freshObjectLiteralFlag;
                 var result = createAnonymousType(attributes.symbol, attributesTable, ts.emptyArray, ts.emptyArray, /*stringIndexInfo*/ undefined, /*numberIndexInfo*/ undefined);
-                result.objectFlags |= objectFlags | 128 /* ObjectLiteral */ | 262144 /* ContainsObjectLiteral */;
+                result.objectFlags |= objectFlags | 128 /* ObjectLiteral */ | 524288 /* ContainsObjectOrArrayLiteral */;
                 return result;
             }
         }
@@ -48612,7 +50023,7 @@ var ts;
                 // In React, JSX text that contains only whitespaces will be ignored so we don't want to type-check that
                 // because then type of children property will have constituent of string type.
                 if (child.kind === 11 /* JsxText */) {
-                    if (!child.containsOnlyWhiteSpaces) {
+                    if (!child.containsOnlyTriviaWhiteSpaces) {
                         childrenTypes.push(stringType);
                     }
                 }
@@ -48939,6 +50350,7 @@ var ts;
                 type.flags & 2097152 /* Intersection */ && ts.every(type.types, isExcessPropertyCheckTarget));
         }
         function checkJsxExpression(node, checkMode) {
+            checkGrammarJsxExpression(node);
             if (node.expression) {
                 var type = checkExpression(node.expression, checkMode);
                 if (node.dotDotDotToken && type !== anyType && !isArrayType(type)) {
@@ -48977,8 +50389,8 @@ var ts;
          */
         function checkPropertyAccessibility(node, isSuper, type, prop) {
             var flags = ts.getDeclarationModifierFlagsFromSymbol(prop);
-            var errorNode = node.kind === 148 /* QualifiedName */ ? node.right : node.kind === 183 /* ImportType */ ? node : node.name;
-            if (ts.getCheckFlags(prop) & 512 /* ContainsPrivate */) {
+            var errorNode = node.kind === 149 /* QualifiedName */ ? node.right : node.kind === 184 /* ImportType */ ? node : node.name;
+            if (ts.getCheckFlags(prop) & 1024 /* ContainsPrivate */) {
                 // Synthetic property with private constituent property
                 error(errorNode, ts.Diagnostics.Property_0_has_conflicting_declarations_and_is_inaccessible_in_type_1, symbolToString(prop), typeToString(type));
                 return false;
@@ -49083,7 +50495,7 @@ var ts;
             return type;
         }
         function checkNonNullType(type, node, nullDiagnostic, undefinedDiagnostic, nullOrUndefinedDiagnostic) {
-            if (type.flags & 2 /* Unknown */) {
+            if (strictNullChecks && type.flags & 2 /* Unknown */) {
                 error(node, ts.Diagnostics.Object_is_of_type_unknown);
                 return errorType;
             }
@@ -49098,42 +50510,58 @@ var ts;
             }
             return type;
         }
+        function checkNonNullNonVoidType(type, node) {
+            var nonNullType = checkNonNullType(type, node);
+            if (nonNullType !== errorType && nonNullType.flags & 16384 /* Void */) {
+                error(node, ts.Diagnostics.Object_is_possibly_undefined);
+            }
+            return nonNullType;
+        }
         function checkPropertyAccessExpression(node) {
             return checkPropertyAccessExpressionOrQualifiedName(node, node.expression, node.name);
         }
         function checkQualifiedName(node) {
             return checkPropertyAccessExpressionOrQualifiedName(node, node.left, node.right);
         }
+        function isMethodAccessForCall(node) {
+            while (node.parent.kind === 196 /* ParenthesizedExpression */) {
+                node = node.parent;
+            }
+            return ts.isCallOrNewExpression(node.parent) && node.parent.expression === node;
+        }
         function checkPropertyAccessExpressionOrQualifiedName(node, left, right) {
             var propType;
             var leftType = checkNonNullExpression(left);
             var parentSymbol = getNodeLinks(left).resolvedSymbol;
-            var apparentType = getApparentType(getWidenedType(leftType));
+            var assignmentKind = ts.getAssignmentTargetKind(node);
+            var apparentType = getApparentType(assignmentKind !== 0 /* None */ || isMethodAccessForCall(node) ? getWidenedType(leftType) : leftType);
             if (isTypeAny(apparentType) || apparentType === silentNeverType) {
                 if (ts.isIdentifier(left) && parentSymbol) {
                     markAliasReferenced(parentSymbol, node);
                 }
                 return apparentType;
             }
-            var assignmentKind = ts.getAssignmentTargetKind(node);
             var prop = getPropertyOfType(apparentType, right.escapedText);
             if (ts.isIdentifier(left) && parentSymbol && !(prop && isConstEnumOrConstEnumOnlyModule(prop))) {
                 markAliasReferenced(parentSymbol, node);
             }
             if (!prop) {
-                var indexInfo = getIndexInfoOfType(apparentType, 0 /* String */);
+                var indexInfo = assignmentKind === 0 /* None */ || !isGenericObjectType(leftType) || isThisTypeParameter(leftType) ? getIndexInfoOfType(apparentType, 0 /* String */) : undefined;
                 if (!(indexInfo && indexInfo.type)) {
                     if (isJSLiteralType(leftType)) {
                         return anyType;
                     }
                     if (leftType.symbol === globalThisSymbol) {
-                        if (noImplicitAny) {
+                        if (globalThisSymbol.exports.has(right.escapedText) && (globalThisSymbol.exports.get(right.escapedText).flags & 418 /* BlockScoped */)) {
+                            error(right, ts.Diagnostics.Property_0_does_not_exist_on_type_1, ts.unescapeLeadingUnderscores(right.escapedText), typeToString(leftType));
+                        }
+                        else if (noImplicitAny) {
                             error(right, ts.Diagnostics.Element_implicitly_has_an_any_type_because_type_0_has_no_index_signature, typeToString(leftType));
                         }
                         return anyType;
                     }
                     if (right.escapedText && !checkAndReportErrorForExtendingInterface(node)) {
-                        reportNonexistentProperty(right, leftType.flags & 262144 /* TypeParameter */ && leftType.isThisType ? apparentType : leftType);
+                        reportNonexistentProperty(right, isThisTypeParameter(leftType) ? apparentType : leftType);
                     }
                     return errorType;
                 }
@@ -49144,9 +50572,9 @@ var ts;
             }
             else {
                 checkPropertyNotUsedBeforeDeclaration(prop, node, right);
-                markPropertyAsReferenced(prop, node, left.kind === 100 /* ThisKeyword */);
+                markPropertyAsReferenced(prop, node, left.kind === 101 /* ThisKeyword */);
                 getNodeLinks(node).resolvedSymbol = prop;
-                checkPropertyAccessibility(node, left.kind === 98 /* SuperKeyword */, apparentType, prop);
+                checkPropertyAccessibility(node, left.kind === 99 /* SuperKeyword */, apparentType, prop);
                 if (assignmentKind) {
                     if (isReferenceToReadonlyEntity(node, prop) || isReferenceThroughNamespaceImport(node)) {
                         error(right, ts.Diagnostics.Cannot_assign_to_0_because_it_is_a_read_only_property, ts.idText(right));
@@ -49155,10 +50583,14 @@ var ts;
                 }
                 propType = getConstraintForLocation(getTypeOfSymbol(prop), node);
             }
+            return getFlowTypeOfAccessExpression(node, prop, propType, right);
+        }
+        function getFlowTypeOfAccessExpression(node, prop, propType, errorNode) {
             // Only compute control flow type if this is a property access expression that isn't an
             // assignment target, and the referenced property was declared as a variable, property,
             // accessor, or optional method.
-            if (node.kind !== 189 /* PropertyAccessExpression */ ||
+            var assignmentKind = ts.getAssignmentTargetKind(node);
+            if (node.kind !== 191 /* ElementAccessExpression */ && node.kind !== 190 /* PropertyAccessExpression */ ||
                 assignmentKind === 1 /* Definite */ ||
                 prop && !(prop.flags & (3 /* Variable */ | 4 /* Property */ | 98304 /* Accessor */)) && !(prop.flags & 8192 /* Method */ && propType.flags & 1048576 /* Union */)) {
                 return propType;
@@ -49168,11 +50600,11 @@ var ts;
             // and if we are in a constructor of the same class as the property declaration, assume that
             // the property is uninitialized at the top of the control flow.
             var assumeUninitialized = false;
-            if (strictNullChecks && strictPropertyInitialization && left.kind === 100 /* ThisKeyword */) {
+            if (strictNullChecks && strictPropertyInitialization && node.expression.kind === 101 /* ThisKeyword */) {
                 var declaration = prop && prop.valueDeclaration;
                 if (declaration && isInstancePropertyWithoutInitializer(declaration)) {
                     var flowContainer = getControlFlowContainer(node);
-                    if (flowContainer.kind === 157 /* Constructor */ && flowContainer.parent === declaration.parent) {
+                    if (flowContainer.kind === 158 /* Constructor */ && flowContainer.parent === declaration.parent) {
                         assumeUninitialized = true;
                     }
                 }
@@ -49185,7 +50617,7 @@ var ts;
             }
             var flowType = getFlowTypeOfReference(node, propType, assumeUninitialized ? getOptionalType(propType) : propType);
             if (assumeUninitialized && !(getFalsyFlags(propType) & 32768 /* Undefined */) && getFalsyFlags(flowType) & 32768 /* Undefined */) {
-                error(right, ts.Diagnostics.Property_0_is_used_before_being_assigned, symbolToString(prop)); // TODO: GH#18217
+                error(errorNode, ts.Diagnostics.Property_0_is_used_before_being_assigned, symbolToString(prop)); // TODO: GH#18217
                 // Return the declared type to reduce follow-on errors
                 return propType;
             }
@@ -49203,35 +50635,35 @@ var ts;
                 && !isPropertyDeclaredInAncestorClass(prop)) {
                 diagnosticMessage = error(right, ts.Diagnostics.Property_0_is_used_before_its_initialization, declarationName);
             }
-            else if (valueDeclaration.kind === 240 /* ClassDeclaration */ &&
-                node.parent.kind !== 164 /* TypeReference */ &&
+            else if (valueDeclaration.kind === 241 /* ClassDeclaration */ &&
+                node.parent.kind !== 165 /* TypeReference */ &&
                 !(valueDeclaration.flags & 4194304 /* Ambient */) &&
                 !isBlockScopedNameDeclaredBeforeUse(valueDeclaration, right)) {
                 diagnosticMessage = error(right, ts.Diagnostics.Class_0_used_before_its_declaration, declarationName);
             }
             if (diagnosticMessage) {
-                addRelatedInfo(diagnosticMessage, ts.createDiagnosticForNode(valueDeclaration, ts.Diagnostics._0_is_declared_here, declarationName));
+                ts.addRelatedInfo(diagnosticMessage, ts.createDiagnosticForNode(valueDeclaration, ts.Diagnostics._0_is_declared_here, declarationName));
             }
         }
         function isInPropertyInitializer(node) {
             return !!ts.findAncestor(node, function (node) {
                 switch (node.kind) {
-                    case 154 /* PropertyDeclaration */:
+                    case 155 /* PropertyDeclaration */:
                         return true;
-                    case 275 /* PropertyAssignment */:
-                    case 156 /* MethodDeclaration */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
-                    case 277 /* SpreadAssignment */:
-                    case 149 /* ComputedPropertyName */:
-                    case 216 /* TemplateSpan */:
-                    case 270 /* JsxExpression */:
-                    case 267 /* JsxAttribute */:
-                    case 268 /* JsxAttributes */:
-                    case 269 /* JsxSpreadAttribute */:
-                    case 262 /* JsxOpeningElement */:
-                    case 211 /* ExpressionWithTypeArguments */:
-                    case 273 /* HeritageClause */:
+                    case 276 /* PropertyAssignment */:
+                    case 157 /* MethodDeclaration */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
+                    case 278 /* SpreadAssignment */:
+                    case 150 /* ComputedPropertyName */:
+                    case 217 /* TemplateSpan */:
+                    case 271 /* JsxExpression */:
+                    case 268 /* JsxAttribute */:
+                    case 269 /* JsxAttributes */:
+                    case 270 /* JsxSpreadAttribute */:
+                    case 263 /* JsxOpeningElement */:
+                    case 212 /* ExpressionWithTypeArguments */:
+                    case 274 /* HeritageClause */:
                         return false;
                     default:
                         return ts.isExpressionNode(node) ? false : "quit";
@@ -49283,7 +50715,8 @@ var ts;
             else {
                 var promisedType = getPromisedTypeOfPromise(containingType);
                 if (promisedType && getPropertyOfType(promisedType, propNode.escapedText)) {
-                    errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.Property_0_does_not_exist_on_type_1_Did_you_forget_to_use_await, ts.declarationNameToString(propNode), typeToString(containingType));
+                    errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.Property_0_does_not_exist_on_type_1, ts.declarationNameToString(propNode), typeToString(containingType));
+                    relatedInfo = ts.createDiagnosticForNode(propNode, ts.Diagnostics.Did_you_forget_to_use_await);
                 }
                 else {
                     var suggestion = getSuggestedSymbolForNonexistentProperty(propNode, containingType);
@@ -49299,7 +50732,7 @@ var ts;
             }
             var resultDiagnostic = ts.createDiagnosticForNodeFromMessageChain(propNode, errorInfo);
             if (relatedInfo) {
-                addRelatedInfo(resultDiagnostic, relatedInfo);
+                ts.addRelatedInfo(resultDiagnostic, relatedInfo);
             }
             diagnostics.add(resultDiagnostic);
         }
@@ -49337,6 +50770,32 @@ var ts;
             var suggestion = getSuggestedSymbolForNonexistentModule(name, targetModule);
             return suggestion && ts.symbolName(suggestion);
         }
+        function getSuggestionForNonexistentIndexSignature(objectType, expr) {
+            // check if object type has setter or getter
+            var hasProp = function (name, argCount) {
+                if (argCount === void 0) { argCount = 1; }
+                var prop = getPropertyOfObjectType(objectType, name);
+                if (prop) {
+                    var s = getSingleCallSignature(getTypeOfSymbol(prop));
+                    if (s && getMinArgumentCount(s) === argCount && typeToString(getTypeAtPosition(s, 0)) === "string") {
+                        return true;
+                    }
+                }
+                return false;
+            };
+            var suggestedMethod = ts.isAssignmentTarget(expr) ? "set" : "get";
+            if (!hasProp(suggestedMethod)) {
+                return undefined;
+            }
+            var suggestion = ts.tryGetPropertyAccessOrIdentifierToString(expr);
+            if (suggestion === undefined) {
+                suggestion = suggestedMethod;
+            }
+            else {
+                suggestion += "." + suggestedMethod;
+            }
+            return suggestion;
+        }
         /**
          * Given a name and a list of symbols whose names are *not* equal to the name, return a spelling suggestion if there is one that is close enough.
          * Names less than length 3 only check for case-insensitive equality, not levenshtein distance.
@@ -49377,34 +50836,17 @@ var ts;
         }
         function isValidPropertyAccess(node, propertyName) {
             switch (node.kind) {
-                case 189 /* PropertyAccessExpression */:
-                    return isValidPropertyAccessWithType(node, node.expression.kind === 98 /* SuperKeyword */, propertyName, getWidenedType(checkExpression(node.expression)));
-                case 148 /* QualifiedName */:
+                case 190 /* PropertyAccessExpression */:
+                    return isValidPropertyAccessWithType(node, node.expression.kind === 99 /* SuperKeyword */, propertyName, getWidenedType(checkExpression(node.expression)));
+                case 149 /* QualifiedName */:
                     return isValidPropertyAccessWithType(node, /*isSuper*/ false, propertyName, getWidenedType(checkExpression(node.left)));
-                case 183 /* ImportType */:
+                case 184 /* ImportType */:
                     return isValidPropertyAccessWithType(node, /*isSuper*/ false, propertyName, getTypeFromTypeNode(node));
             }
         }
         function isValidPropertyAccessForCompletions(node, type, property) {
-            return isValidPropertyAccessWithType(node, node.kind === 189 /* PropertyAccessExpression */ && node.expression.kind === 98 /* SuperKeyword */, property.escapedName, type)
-                && (!(property.flags & 8192 /* Method */) || isValidMethodAccess(property, type));
-        }
-        function isValidMethodAccess(method, actualThisType) {
-            var propType = getTypeOfPropertyOfType(actualThisType, method.escapedName);
-            var signatures = getSignaturesOfType(getNonNullableType(propType), 0 /* Call */);
-            ts.Debug.assert(signatures.length !== 0);
-            return signatures.some(function (sig) {
-                var signatureThisType = getThisTypeOfSignature(sig);
-                return !signatureThisType || isTypeAssignableTo(actualThisType, getInstantiatedSignatureThisType(sig, signatureThisType, actualThisType));
-            });
-        }
-        function getInstantiatedSignatureThisType(sig, signatureThisType, actualThisType) {
-            if (!sig.typeParameters) {
-                return signatureThisType;
-            }
-            var context = createInferenceContext(sig.typeParameters, sig, 0 /* None */);
-            inferTypes(context.inferences, actualThisType, signatureThisType);
-            return instantiateType(signatureThisType, createSignatureTypeMapper(sig, getInferredTypes(context)));
+            return isValidPropertyAccessWithType(node, node.kind === 190 /* PropertyAccessExpression */ && node.expression.kind === 99 /* SuperKeyword */, property.escapedName, type);
+            // Previously we validated the 'this' type of methods but this adversely affected performance. See #31377 for more context.
         }
         function isValidPropertyAccessWithType(node, isSuper, propertyName, type) {
             if (type === errorType || isTypeAny(type)) {
@@ -49420,13 +50862,13 @@ var ts;
          */
         function getForInVariableSymbol(node) {
             var initializer = node.initializer;
-            if (initializer.kind === 238 /* VariableDeclarationList */) {
+            if (initializer.kind === 239 /* VariableDeclarationList */) {
                 var variable = initializer.declarations[0];
                 if (variable && !ts.isBindingPattern(variable.name)) {
                     return getSymbolOfNode(variable);
                 }
             }
-            else if (initializer.kind === 72 /* Identifier */) {
+            else if (initializer.kind === 73 /* Identifier */) {
                 return getResolvedSymbol(initializer);
             }
             return undefined;
@@ -49443,13 +50885,13 @@ var ts;
          */
         function isForInVariableForNumericPropertyNames(expr) {
             var e = ts.skipParentheses(expr);
-            if (e.kind === 72 /* Identifier */) {
+            if (e.kind === 73 /* Identifier */) {
                 var symbol = getResolvedSymbol(e);
                 if (symbol.flags & 3 /* Variable */) {
                     var child = expr;
                     var node = expr.parent;
                     while (node) {
-                        if (node.kind === 226 /* ForInStatement */ &&
+                        if (node.kind === 227 /* ForInStatement */ &&
                             child === node.statement &&
                             getForInVariableSymbol(node) === symbol &&
                             hasNumericPropertyNames(getTypeOfExpression(node.expression))) {
@@ -49463,11 +50905,12 @@ var ts;
             return false;
         }
         function checkIndexedAccess(node) {
-            var objectType = checkNonNullExpression(node.expression);
+            var exprType = checkNonNullExpression(node.expression);
+            var objectType = ts.getAssignmentTargetKind(node) !== 0 /* None */ || isMethodAccessForCall(node) ? getWidenedType(exprType) : exprType;
             var indexExpression = node.argumentExpression;
             if (!indexExpression) {
                 var sourceFile = ts.getSourceFileOfNode(node);
-                if (node.parent.kind === 192 /* NewExpression */ && node.parent.expression === node) {
+                if (node.parent.kind === 193 /* NewExpression */ && node.parent.expression === node) {
                     var start = ts.skipTrivia(sourceFile.text, node.expression.end);
                     var end = node.end;
                     grammarErrorAtPos(sourceFile, start, end - start, ts.Diagnostics.new_T_cannot_be_used_to_create_an_array_Use_new_Array_T_instead);
@@ -49487,7 +50930,12 @@ var ts;
                 error(indexExpression, ts.Diagnostics.A_const_enum_member_can_only_be_accessed_using_a_string_literal);
                 return errorType;
             }
-            return checkIndexedAccessIndexType(getIndexedAccessType(objectType, isForInVariableForNumericPropertyNames(indexExpression) ? numberType : indexType, node), node);
+            var effectiveIndexType = isForInVariableForNumericPropertyNames(indexExpression) ? numberType : indexType;
+            var accessFlags = ts.isAssignmentTarget(node) ?
+                2 /* Writing */ | (isGenericObjectType(objectType) && !isThisTypeParameter(objectType) ? 1 /* NoIndexSignatures */ : 0) :
+                0 /* None */;
+            var indexedAccessType = getIndexedAccessTypeOrUndefined(objectType, effectiveIndexType, node, accessFlags) || errorType;
+            return checkIndexedAccessIndexType(getFlowTypeOfAccessExpression(node, indexedAccessType.symbol, indexedAccessType, indexExpression), node);
         }
         function checkThatExpressionIsProperSymbolReference(expression, expressionType, reportError) {
             if (expressionType === errorType) {
@@ -49533,13 +50981,13 @@ var ts;
                 // This gets us diagnostics for the type arguments and marks them as referenced.
                 ts.forEach(node.typeArguments, checkSourceElement);
             }
-            if (node.kind === 193 /* TaggedTemplateExpression */) {
+            if (node.kind === 194 /* TaggedTemplateExpression */) {
                 checkExpression(node.template);
             }
             else if (ts.isJsxOpeningLikeElement(node)) {
                 checkExpression(node.attributes);
             }
-            else if (node.kind !== 152 /* Decorator */) {
+            else if (node.kind !== 153 /* Decorator */) {
                 ts.forEach(node.arguments, function (argument) {
                     checkExpression(argument);
                 });
@@ -49603,7 +51051,7 @@ var ts;
             }
         }
         function isSpreadArgument(arg) {
-            return !!arg && (arg.kind === 208 /* SpreadElement */ || arg.kind === 215 /* SyntheticExpression */ && arg.isSpread);
+            return !!arg && (arg.kind === 209 /* SpreadElement */ || arg.kind === 216 /* SyntheticExpression */ && arg.isSpread);
         }
         function getSpreadArgumentIndex(args) {
             return ts.findIndex(args, isSpreadArgument);
@@ -49617,9 +51065,9 @@ var ts;
             var callIsIncomplete = false; // In incomplete call we want to be lenient when we have too few arguments
             var effectiveParameterCount = getParameterCount(signature);
             var effectiveMinimumArguments = getMinArgumentCount(signature);
-            if (node.kind === 193 /* TaggedTemplateExpression */) {
+            if (node.kind === 194 /* TaggedTemplateExpression */) {
                 argCount = args.length;
-                if (node.template.kind === 206 /* TemplateExpression */) {
+                if (node.template.kind === 207 /* TemplateExpression */) {
                     // If a tagged template expression lacks a tail literal, the call is incomplete.
                     // Specifically, a template only can end in a TemplateTail or a Missing literal.
                     var lastSpan = ts.last(node.template.templateSpans); // we should always have at least one span.
@@ -49634,7 +51082,7 @@ var ts;
                     callIsIncomplete = !!templateLiteral.isUnterminated;
                 }
             }
-            else if (node.kind === 152 /* Decorator */) {
+            else if (node.kind === 153 /* Decorator */) {
                 argCount = getDecoratorArgumentCount(node, signature);
             }
             else if (ts.isJsxOpeningLikeElement(node)) {
@@ -49649,7 +51097,7 @@ var ts;
             else {
                 if (!node.arguments) {
                     // This only happens when we have something of the form: 'new C'
-                    ts.Debug.assert(node.kind === 192 /* NewExpression */);
+                    ts.Debug.assert(node.kind === 193 /* NewExpression */);
                     return getMinArgumentCount(signature) === 0;
                 }
                 argCount = signatureHelpTrailingComma ? args.length + 1 : args.length;
@@ -49688,36 +51136,43 @@ var ts;
         }
         // If type has a single call signature and no other members, return that signature. Otherwise, return undefined.
         function getSingleCallSignature(type) {
+            return getSingleSignature(type, 0 /* Call */, /*allowMembers*/ false);
+        }
+        function getSingleCallOrConstructSignature(type) {
+            return getSingleSignature(type, 0 /* Call */, /*allowMembers*/ false) ||
+                getSingleSignature(type, 1 /* Construct */, /*allowMembers*/ false);
+        }
+        function getSingleSignature(type, kind, allowMembers) {
             if (type.flags & 524288 /* Object */) {
                 var resolved = resolveStructuredTypeMembers(type);
-                if (resolved.callSignatures.length === 1 && resolved.constructSignatures.length === 0 &&
-                    resolved.properties.length === 0 && !resolved.stringIndexInfo && !resolved.numberIndexInfo) {
-                    return resolved.callSignatures[0];
+                if (allowMembers || resolved.properties.length === 0 && !resolved.stringIndexInfo && !resolved.numberIndexInfo) {
+                    if (kind === 0 /* Call */ && resolved.callSignatures.length === 1 && resolved.constructSignatures.length === 0) {
+                        return resolved.callSignatures[0];
+                    }
+                    if (kind === 1 /* Construct */ && resolved.constructSignatures.length === 1 && resolved.callSignatures.length === 0) {
+                        return resolved.constructSignatures[0];
+                    }
                 }
             }
             return undefined;
         }
         // Instantiate a generic signature in the context of a non-generic signature (section 3.8.5 in TypeScript spec)
-        function instantiateSignatureInContextOf(signature, contextualSignature, contextualMapper, compareTypes) {
+        function instantiateSignatureInContextOf(signature, contextualSignature, inferenceContext, compareTypes) {
             var context = createInferenceContext(signature.typeParameters, signature, 0 /* None */, compareTypes);
-            // We clone the contextualMapper to avoid fixing. For example, when the source signature is <T>(x: T) => T[] and
+            // We clone the inferenceContext to avoid fixing. For example, when the source signature is <T>(x: T) => T[] and
             // the contextual signature is (...args: A) => B, we want to infer the element type of A's constraint (say 'any')
             // for T but leave it possible to later infer '[any]' back to A.
             var restType = getEffectiveRestType(contextualSignature);
-            var mapper = contextualMapper && restType && restType.flags & 262144 /* TypeParameter */ ? cloneTypeMapper(contextualMapper) : contextualMapper;
+            var mapper = inferenceContext && (restType && restType.flags & 262144 /* TypeParameter */ ? inferenceContext.nonFixingMapper : inferenceContext.mapper);
             var sourceSignature = mapper ? instantiateSignature(contextualSignature, mapper) : contextualSignature;
-            forEachMatchingParameterType(sourceSignature, signature, function (source, target) {
+            applyToParameterTypes(sourceSignature, signature, function (source, target) {
                 // Type parameters from outer context referenced by source type are fixed by instantiation of the source type
                 inferTypes(context.inferences, source, target);
             });
-            if (!contextualMapper) {
-                inferTypes(context.inferences, getReturnTypeOfSignature(contextualSignature), getReturnTypeOfSignature(signature), 8 /* ReturnType */);
-                var signaturePredicate = getTypePredicateOfSignature(signature);
-                var contextualPredicate = getTypePredicateOfSignature(sourceSignature);
-                if (signaturePredicate && contextualPredicate && signaturePredicate.kind === contextualPredicate.kind &&
-                    (signaturePredicate.kind === 0 /* This */ || signaturePredicate.parameterIndex === contextualPredicate.parameterIndex)) {
-                    inferTypes(context.inferences, contextualPredicate.type, signaturePredicate.type, 8 /* ReturnType */);
-                }
+            if (!inferenceContext) {
+                applyToReturnTypes(contextualSignature, signature, function (source, target) {
+                    inferTypes(context.inferences, source, target, 16 /* ReturnType */);
+                });
             }
             return getSignatureInstantiation(signature, getInferredTypes(context), ts.isInJSFile(contextualSignature.declaration));
         }
@@ -49728,17 +51183,6 @@ var ts;
             return getInferredTypes(context);
         }
         function inferTypeArguments(node, signature, args, checkMode, context) {
-            // Clear out all the inference results from the last time inferTypeArguments was called on this context
-            for (var _i = 0, _a = context.inferences; _i < _a.length; _i++) {
-                var inference = _a[_i];
-                // As an optimization, we don't have to clear (and later recompute) inferred types
-                // for type parameters that have already been fixed on the previous call to inferTypeArguments.
-                // It would be just as correct to reset all of them. But then we'd be repeating the same work
-                // for the type parameters that were fixed, namely the work done by getInferredType.
-                if (!inference.isFixed) {
-                    inference.inferredType = undefined;
-                }
-            }
             if (ts.isJsxOpeningLikeElement(node)) {
                 return inferJsxTypeArguments(node, signature, checkMode, context);
             }
@@ -49746,13 +51190,15 @@ var ts;
             // example, given a 'function wrap<T, U>(cb: (x: T) => U): (x: T) => U' and a call expression
             // 'let f: (x: string) => number = wrap(s => s.length)', we infer from the declared type of 'f' to the
             // return type of 'wrap'.
-            if (node.kind !== 152 /* Decorator */) {
+            if (node.kind !== 153 /* Decorator */) {
                 var contextualType = getContextualType(node);
                 if (contextualType) {
-                    // We clone the contextual mapper to avoid disturbing a resolution in progress for an
+                    // We clone the inference context to avoid disturbing a resolution in progress for an
                     // outer call expression. Effectively we just want a snapshot of whatever has been
                     // inferred for any outer call expression so far.
-                    var instantiatedType = instantiateType(contextualType, cloneTypeMapper(getContextualMapper(node), 1 /* NoDefault */));
+                    var outerContext = getInferenceContext(node);
+                    var outerMapper = getMapperFromContext(cloneInferenceContext(outerContext, 1 /* NoDefault */));
+                    var instantiatedType = instantiateType(contextualType, outerMapper);
                     // If the contextual type is a generic function type with a single call signature, we
                     // instantiate the type with its own type parameters and type arguments. This ensures that
                     // the type parameters are not erased to type any during type inference such that they can
@@ -49766,10 +51212,15 @@ var ts;
                         instantiatedType;
                     var inferenceTargetType = getReturnTypeOfSignature(signature);
                     // Inferences made from return types have lower priority than all other inferences.
-                    inferTypes(context.inferences, inferenceSourceType, inferenceTargetType, 8 /* ReturnType */);
+                    inferTypes(context.inferences, inferenceSourceType, inferenceTargetType, 16 /* ReturnType */);
                     // Create a type mapper for instantiating generic contextual types using the inferences made
-                    // from the return type.
-                    context.returnMapper = cloneInferredPartOfContext(context);
+                    // from the return type. We need a separate inference pass here because (a) instantiation of
+                    // the source type uses the outer context's return mapper (which excludes inferences made from
+                    // outer arguments), and (b) we don't want any further inferences going into this context.
+                    var returnContext = createInferenceContext(signature.typeParameters, signature, context.flags);
+                    var returnSourceType = instantiateType(contextualType, outerContext && outerContext.returnMapper);
+                    inferTypes(returnContext.inferences, returnSourceType, inferenceTargetType);
+                    context.returnMapper = ts.some(returnContext.inferences, hasInferenceCandidates) ? getMapperFromContext(returnContext) : undefined;
                 }
             }
             var thisType = getThisTypeOfSignature(signature);
@@ -49782,7 +51233,7 @@ var ts;
             var argCount = restType ? Math.min(getParameterCount(signature) - 1, args.length) : args.length;
             for (var i = 0; i < argCount; i++) {
                 var arg = args[i];
-                if (arg.kind !== 210 /* OmittedExpression */) {
+                if (arg.kind !== 211 /* OmittedExpression */) {
                     var paramType = getTypeAtPosition(signature, i);
                     var argType = checkExpressionWithContextualType(arg, paramType, context, checkMode);
                     inferTypes(context.inferences, argType, paramType);
@@ -49796,7 +51247,7 @@ var ts;
         }
         function getArrayifiedType(type) {
             if (forEachType(type, function (t) { return !(t.flags & (1 /* Any */ | 63176704 /* Instantiable */) || isArrayType(t) || isTupleType(t)); })) {
-                return createArrayType(getIndexTypeOfType(type, 1 /* Number */) || errorType);
+                return createArrayType(getIndexedAccessType(type, numberType));
             }
             return type;
         }
@@ -49806,20 +51257,20 @@ var ts;
                 if (isSpreadArgument(arg)) {
                     // We are inferring from a spread expression in the last argument position, i.e. both the parameter
                     // and the argument are ...x forms.
-                    return arg.kind === 215 /* SyntheticExpression */ ?
+                    return arg.kind === 216 /* SyntheticExpression */ ?
                         createArrayType(arg.type) :
                         getArrayifiedType(checkExpressionWithContextualType(arg.expression, restType, context, 0 /* Normal */));
                 }
             }
-            var contextualType = getIndexTypeOfType(restType, 1 /* Number */) || anyType;
-            var hasPrimitiveContextualType = maybeTypeOfKind(contextualType, 131068 /* Primitive */ | 4194304 /* Index */);
             var types = [];
             var spreadIndex = -1;
             for (var i = index; i < argCount; i++) {
+                var contextualType = getIndexedAccessType(restType, getLiteralType(i - index));
                 var argType = checkExpressionWithContextualType(args[i], contextualType, context, 0 /* Normal */);
                 if (spreadIndex < 0 && isSpreadArgument(args[i])) {
                     spreadIndex = i - index;
                 }
+                var hasPrimitiveContextualType = maybeTypeOfKind(contextualType, 131068 /* Primitive */ | 4194304 /* Index */);
                 types.push(hasPrimitiveContextualType ? getRegularTypeOfLiteralType(argType) : getWidenedLiteralType(argType));
             }
             return spreadIndex < 0 ?
@@ -49867,20 +51318,26 @@ var ts;
          * @param signature a candidate signature we are trying whether it is a call signature
          * @param relation a relationship to check parameter and argument type
          */
-        function checkApplicableSignatureForJsxOpeningLikeElement(node, signature, relation, checkMode, reportErrors) {
+        function checkApplicableSignatureForJsxOpeningLikeElement(node, signature, relation, checkMode, reportErrors, containingMessageChain, errorOutputContainer) {
             // Stateless function components can have maximum of three arguments: "props", "context", and "updater".
             // However "context" and "updater" are implicit and can't be specify by users. Only the first parameter, props,
             // can be specified by users through attributes property.
             var paramType = getEffectiveFirstArgumentForJsxSignature(signature, node);
-            var attributesType = checkExpressionWithContextualType(node.attributes, paramType, /*contextualMapper*/ undefined, checkMode);
-            return checkTypeRelatedToAndOptionallyElaborate(attributesType, paramType, relation, reportErrors ? node.tagName : undefined, node.attributes);
+            var attributesType = checkExpressionWithContextualType(node.attributes, paramType, /*inferenceContext*/ undefined, checkMode);
+            return checkTypeRelatedToAndOptionallyElaborate(attributesType, paramType, relation, reportErrors ? node.tagName : undefined, node.attributes, 
+            /*headMessage*/ undefined, containingMessageChain, errorOutputContainer);
         }
-        function checkApplicableSignature(node, args, signature, relation, checkMode, reportErrors) {
+        function getSignatureApplicabilityError(node, args, signature, relation, checkMode, reportErrors, containingMessageChain) {
+            var errorOutputContainer = { errors: undefined, skipLogging: true };
             if (ts.isJsxOpeningLikeElement(node)) {
-                return checkApplicableSignatureForJsxOpeningLikeElement(node, signature, relation, checkMode, reportErrors);
+                if (!checkApplicableSignatureForJsxOpeningLikeElement(node, signature, relation, checkMode, reportErrors, containingMessageChain, errorOutputContainer)) {
+                    ts.Debug.assert(!reportErrors || !!errorOutputContainer.errors, "jsx should have errors when reporting errors");
+                    return errorOutputContainer.errors || [];
+                }
+                return undefined;
             }
             var thisType = getThisTypeOfSignature(signature);
-            if (thisType && thisType !== voidType && node.kind !== 192 /* NewExpression */) {
+            if (thisType && thisType !== voidType && node.kind !== 193 /* NewExpression */) {
                 // If the called expression is not of the form `x.f` or `x["f"]`, then sourceType = voidType
                 // If the signature's 'this' type is voidType, then the check is skipped -- anything is compatible.
                 // If the expression is a new expression, then the check is skipped.
@@ -49888,8 +51345,9 @@ var ts;
                 var thisArgumentType = thisArgumentNode ? checkExpression(thisArgumentNode) : voidType;
                 var errorNode = reportErrors ? (thisArgumentNode || node) : undefined;
                 var headMessage_1 = ts.Diagnostics.The_this_context_of_type_0_is_not_assignable_to_method_s_this_of_type_1;
-                if (!checkTypeRelatedTo(thisArgumentType, thisType, relation, errorNode, headMessage_1)) {
-                    return false;
+                if (!checkTypeRelatedTo(thisArgumentType, thisType, relation, errorNode, headMessage_1, containingMessageChain, errorOutputContainer)) {
+                    ts.Debug.assert(!reportErrors || !!errorOutputContainer.errors, "this parameter should have errors when reporting errors");
+                    return errorOutputContainer.errors || [];
                 }
             }
             var headMessage = ts.Diagnostics.Argument_of_type_0_is_not_assignable_to_parameter_of_type_1;
@@ -49897,38 +51355,56 @@ var ts;
             var argCount = restType ? Math.min(getParameterCount(signature) - 1, args.length) : args.length;
             for (var i = 0; i < argCount; i++) {
                 var arg = args[i];
-                if (arg.kind !== 210 /* OmittedExpression */) {
+                if (arg.kind !== 211 /* OmittedExpression */) {
                     var paramType = getTypeAtPosition(signature, i);
-                    var argType = checkExpressionWithContextualType(arg, paramType, /*contextualMapper*/ undefined, checkMode);
+                    var argType = checkExpressionWithContextualType(arg, paramType, /*inferenceContext*/ undefined, checkMode);
                     // If one or more arguments are still excluded (as indicated by CheckMode.SkipContextSensitive),
                     // we obtain the regular type of any object literal arguments because we may not have inferred complete
                     // parameter types yet and therefore excess property checks may yield false positives (see #17041).
                     var checkArgType = checkMode & 4 /* SkipContextSensitive */ ? getRegularTypeOfObjectLiteral(argType) : argType;
-                    if (!checkTypeRelatedToAndOptionallyElaborate(checkArgType, paramType, relation, reportErrors ? arg : undefined, arg, headMessage)) {
-                        return false;
+                    if (!checkTypeRelatedToAndOptionallyElaborate(checkArgType, paramType, relation, reportErrors ? arg : undefined, arg, headMessage, containingMessageChain, errorOutputContainer)) {
+                        ts.Debug.assert(!reportErrors || !!errorOutputContainer.errors, "parameter should have errors when reporting errors");
+                        maybeAddMissingAwaitInfo(arg, checkArgType, paramType);
+                        return errorOutputContainer.errors || [];
                     }
                 }
             }
             if (restType) {
                 var spreadType = getSpreadArgumentType(args, argCount, args.length, restType, /*context*/ undefined);
                 var errorNode = reportErrors ? argCount < args.length ? args[argCount] : node : undefined;
-                return checkTypeRelatedTo(spreadType, restType, relation, errorNode, headMessage);
+                if (!checkTypeRelatedTo(spreadType, restType, relation, errorNode, headMessage, /*containingMessageChain*/ undefined, errorOutputContainer)) {
+                    ts.Debug.assert(!reportErrors || !!errorOutputContainer.errors, "rest parameter should have errors when reporting errors");
+                    maybeAddMissingAwaitInfo(errorNode, spreadType, restType);
+                    return errorOutputContainer.errors || [];
+                }
+            }
+            return undefined;
+            function maybeAddMissingAwaitInfo(errorNode, source, target) {
+                if (errorNode && reportErrors && errorOutputContainer.errors && errorOutputContainer.errors.length) {
+                    // Bail if target is Promise-like---something else is wrong
+                    if (getAwaitedTypeOfPromise(target)) {
+                        return;
+                    }
+                    var awaitedTypeOfSource = getAwaitedTypeOfPromise(source);
+                    if (awaitedTypeOfSource && isTypeRelatedTo(awaitedTypeOfSource, target, relation)) {
+                        ts.addRelatedInfo(errorOutputContainer.errors[0], ts.createDiagnosticForNode(errorNode, ts.Diagnostics.Did_you_forget_to_use_await));
+                    }
+                }
             }
-            return true;
         }
         /**
          * Returns the this argument in calls like x.f(...) and x[f](...). Undefined otherwise.
          */
         function getThisArgumentOfCall(node) {
-            if (node.kind === 191 /* CallExpression */) {
+            if (node.kind === 192 /* CallExpression */) {
                 var callee = ts.skipOuterExpressions(node.expression);
-                if (callee.kind === 189 /* PropertyAccessExpression */ || callee.kind === 190 /* ElementAccessExpression */) {
+                if (callee.kind === 190 /* PropertyAccessExpression */ || callee.kind === 191 /* ElementAccessExpression */) {
                     return callee.expression;
                 }
             }
         }
         function createSyntheticExpression(parent, type, isSpread) {
-            var result = ts.createNode(215 /* SyntheticExpression */, parent.pos, parent.end);
+            var result = ts.createNode(216 /* SyntheticExpression */, parent.pos, parent.end);
             result.parent = parent;
             result.type = type;
             result.isSpread = isSpread || false;
@@ -49938,17 +51414,17 @@ var ts;
          * Returns the effective arguments for an expression that works like a function invocation.
          */
         function getEffectiveCallArguments(node) {
-            if (node.kind === 193 /* TaggedTemplateExpression */) {
+            if (node.kind === 194 /* TaggedTemplateExpression */) {
                 var template = node.template;
-                var args_4 = [createSyntheticExpression(template, getGlobalTemplateStringsArrayType())];
-                if (template.kind === 206 /* TemplateExpression */) {
+                var args_3 = [createSyntheticExpression(template, getGlobalTemplateStringsArrayType())];
+                if (template.kind === 207 /* TemplateExpression */) {
                     ts.forEach(template.templateSpans, function (span) {
-                        args_4.push(span.expression);
+                        args_3.push(span.expression);
                     });
                 }
-                return args_4;
+                return args_3;
             }
-            if (node.kind === 152 /* Decorator */) {
+            if (node.kind === 153 /* Decorator */) {
                 return getEffectiveDecoratorArguments(node);
             }
             if (ts.isJsxOpeningLikeElement(node)) {
@@ -49961,7 +51437,7 @@ var ts;
                 // of the argument is a tuple type, spread the tuple elements into the argument list. We can
                 // call checkExpressionCached because spread expressions never have a contextual type.
                 var spreadArgument_1 = args[length - 1];
-                var type = checkExpressionCached(spreadArgument_1.expression);
+                var type = flowLoopCount ? checkExpression(spreadArgument_1.expression) : checkExpressionCached(spreadArgument_1.expression);
                 if (isTupleType(type)) {
                     var typeArguments = type.typeArguments || ts.emptyArray;
                     var restIndex_2 = type.target.hasRestElement ? typeArguments.length - 1 : -1;
@@ -49978,30 +51454,30 @@ var ts;
             var parent = node.parent;
             var expr = node.expression;
             switch (parent.kind) {
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
                     // For a class decorator, the `target` is the type of the class (e.g. the
                     // "static" or "constructor" side of the class).
                     return [
                         createSyntheticExpression(expr, getTypeOfSymbol(getSymbolOfNode(parent)))
                     ];
-                case 151 /* Parameter */:
+                case 152 /* Parameter */:
                     // A parameter declaration decorator will have three arguments (see
                     // `ParameterDecorator` in core.d.ts).
                     var func = parent.parent;
                     return [
-                        createSyntheticExpression(expr, parent.parent.kind === 157 /* Constructor */ ? getTypeOfSymbol(getSymbolOfNode(func)) : errorType),
+                        createSyntheticExpression(expr, parent.parent.kind === 158 /* Constructor */ ? getTypeOfSymbol(getSymbolOfNode(func)) : errorType),
                         createSyntheticExpression(expr, anyType),
                         createSyntheticExpression(expr, numberType)
                     ];
-                case 154 /* PropertyDeclaration */:
-                case 156 /* MethodDeclaration */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 155 /* PropertyDeclaration */:
+                case 157 /* MethodDeclaration */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     // A method or accessor declaration decorator will have two or three arguments (see
                     // `PropertyDecorator` and `MethodDecorator` in core.d.ts). If we are emitting decorators
                     // for ES3, we will only pass two arguments.
-                    var hasPropDesc = parent.kind !== 154 /* PropertyDeclaration */ && languageVersion !== 0 /* ES3 */;
+                    var hasPropDesc = parent.kind !== 155 /* PropertyDeclaration */ && languageVersion !== 0 /* ES3 */;
                     return [
                         createSyntheticExpression(expr, getParentTypeOfClassElement(parent)),
                         createSyntheticExpression(expr, getClassElementPropertyKeyType(parent)),
@@ -50015,22 +51491,47 @@ var ts;
          */
         function getDecoratorArgumentCount(node, signature) {
             switch (node.parent.kind) {
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
                     return 1;
-                case 154 /* PropertyDeclaration */:
+                case 155 /* PropertyDeclaration */:
                     return 2;
-                case 156 /* MethodDeclaration */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 157 /* MethodDeclaration */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     // For ES3 or decorators with only two parameters we supply only two arguments
                     return languageVersion === 0 /* ES3 */ || signature.parameters.length <= 2 ? 2 : 3;
-                case 151 /* Parameter */:
+                case 152 /* Parameter */:
                     return 3;
                 default:
                     return ts.Debug.fail();
             }
         }
+        function getDiagnosticSpanForCallNode(node, doNotIncludeArguments) {
+            var start;
+            var length;
+            var sourceFile = ts.getSourceFileOfNode(node);
+            if (ts.isPropertyAccessExpression(node.expression)) {
+                var nameSpan = ts.getErrorSpanForNode(sourceFile, node.expression.name);
+                start = nameSpan.start;
+                length = doNotIncludeArguments ? nameSpan.length : node.end - start;
+            }
+            else {
+                var expressionSpan = ts.getErrorSpanForNode(sourceFile, node.expression);
+                start = expressionSpan.start;
+                length = doNotIncludeArguments ? expressionSpan.length : node.end - start;
+            }
+            return { start: start, length: length, sourceFile: sourceFile };
+        }
+        function getDiagnosticForCallNode(node, message, arg0, arg1, arg2, arg3) {
+            if (ts.isCallExpression(node)) {
+                var _a = getDiagnosticSpanForCallNode(node), sourceFile = _a.sourceFile, start = _a.start, length_4 = _a.length;
+                return ts.createFileDiagnostic(sourceFile, start, length_4, message, arg0, arg1, arg2, arg3);
+            }
+            else {
+                return ts.createDiagnosticForNode(node, message, arg0, arg1, arg2, arg3);
+            }
+        }
         function getArgumentArityError(node, signatures, args) {
             var min = Number.POSITIVE_INFINITY;
             var max = Number.NEGATIVE_INFINITY;
@@ -50060,25 +51561,41 @@ var ts;
             if (argCount <= max && hasSpreadArgument) {
                 argCount--;
             }
+            var spanArray;
             var related;
+            var error = hasRestParameter || hasSpreadArgument ? hasRestParameter && hasSpreadArgument ? ts.Diagnostics.Expected_at_least_0_arguments_but_got_1_or_more :
+                hasRestParameter ? ts.Diagnostics.Expected_at_least_0_arguments_but_got_1 :
+                    ts.Diagnostics.Expected_0_arguments_but_got_1_or_more : ts.Diagnostics.Expected_0_arguments_but_got_1;
             if (closestSignature && getMinArgumentCount(closestSignature) > argCount && closestSignature.declaration) {
                 var paramDecl = closestSignature.declaration.parameters[closestSignature.thisParameter ? argCount + 1 : argCount];
                 if (paramDecl) {
                     related = ts.createDiagnosticForNode(paramDecl, ts.isBindingPattern(paramDecl.name) ? ts.Diagnostics.An_argument_matching_this_binding_pattern_was_not_provided : ts.Diagnostics.An_argument_for_0_was_not_provided, !paramDecl.name ? argCount : !ts.isBindingPattern(paramDecl.name) ? ts.idText(getFirstIdentifier(paramDecl.name)) : undefined);
                 }
             }
-            if (hasRestParameter || hasSpreadArgument) {
-                var error_1 = hasRestParameter && hasSpreadArgument ? ts.Diagnostics.Expected_at_least_0_arguments_but_got_1_or_more :
-                    hasRestParameter ? ts.Diagnostics.Expected_at_least_0_arguments_but_got_1 :
-                        ts.Diagnostics.Expected_0_arguments_but_got_1_or_more;
-                var diagnostic_1 = ts.createDiagnosticForNode(node, error_1, paramRange, argCount);
-                return related ? addRelatedInfo(diagnostic_1, related) : diagnostic_1;
-            }
             if (min < argCount && argCount < max) {
-                return ts.createDiagnosticForNode(node, ts.Diagnostics.No_overload_expects_0_arguments_but_overloads_do_exist_that_expect_either_1_or_2_arguments, argCount, belowArgCount, aboveArgCount);
+                return getDiagnosticForCallNode(node, ts.Diagnostics.No_overload_expects_0_arguments_but_overloads_do_exist_that_expect_either_1_or_2_arguments, argCount, belowArgCount, aboveArgCount);
             }
-            var diagnostic = ts.createDiagnosticForNode(node, ts.Diagnostics.Expected_0_arguments_but_got_1, paramRange, argCount);
-            return related ? addRelatedInfo(diagnostic, related) : diagnostic;
+            if (!hasSpreadArgument && argCount < min) {
+                var diagnostic_1 = getDiagnosticForCallNode(node, error, paramRange, argCount);
+                return related ? ts.addRelatedInfo(diagnostic_1, related) : diagnostic_1;
+            }
+            if (hasRestParameter || hasSpreadArgument) {
+                spanArray = ts.createNodeArray(args);
+                if (hasSpreadArgument && argCount) {
+                    var nextArg = ts.elementAt(args, getSpreadArgumentIndex(args) + 1) || undefined;
+                    spanArray = ts.createNodeArray(args.slice(max > argCount && nextArg ? args.indexOf(nextArg) : Math.min(max, args.length - 1)));
+                }
+            }
+            else {
+                spanArray = ts.createNodeArray(args.slice(max));
+            }
+            spanArray.pos = ts.first(spanArray).pos;
+            spanArray.end = ts.last(spanArray).end;
+            if (spanArray.end === spanArray.pos) {
+                spanArray.end++;
+            }
+            var diagnostic = ts.createDiagnosticForNodeArray(ts.getSourceFileOfNode(node), spanArray, error, paramRange, argCount);
+            return related ? ts.addRelatedInfo(diagnostic, related) : diagnostic;
         }
         function getTypeArgumentArityError(node, signatures, typeArguments) {
             var argCount = typeArguments.length;
@@ -50109,15 +51626,15 @@ var ts;
             return ts.createDiagnosticForNodeArray(ts.getSourceFileOfNode(node), typeArguments, ts.Diagnostics.Expected_0_type_arguments_but_got_1, belowArgCount === -Infinity ? aboveArgCount : belowArgCount, argCount);
         }
         function resolveCall(node, signatures, candidatesOutArray, checkMode, fallbackError) {
-            var isTaggedTemplate = node.kind === 193 /* TaggedTemplateExpression */;
-            var isDecorator = node.kind === 152 /* Decorator */;
+            var isTaggedTemplate = node.kind === 194 /* TaggedTemplateExpression */;
+            var isDecorator = node.kind === 153 /* Decorator */;
             var isJsxOpeningOrSelfClosingElement = ts.isJsxOpeningLikeElement(node);
             var reportErrors = !candidatesOutArray;
             var typeArguments;
             if (!isDecorator) {
                 typeArguments = node.typeArguments;
                 // We already perform checking on the type arguments on the class declaration itself.
-                if (isTaggedTemplate || isJsxOpeningOrSelfClosingElement || node.expression.kind !== 98 /* SuperKeyword */) {
+                if (isTaggedTemplate || isJsxOpeningOrSelfClosingElement || node.expression.kind !== 99 /* SuperKeyword */) {
                     ts.forEach(typeArguments, checkSourceElement);
                 }
             }
@@ -50126,7 +51643,7 @@ var ts;
             reorderCandidates(signatures, candidates);
             if (!candidates.length) {
                 if (reportErrors) {
-                    diagnostics.add(ts.createDiagnosticForNode(node, ts.Diagnostics.Call_target_does_not_contain_any_signatures));
+                    diagnostics.add(getDiagnosticForCallNode(node, ts.Diagnostics.Call_target_does_not_contain_any_signatures));
                 }
                 return resolveErrorCall(node);
             }
@@ -50166,13 +51683,13 @@ var ts;
             //     function foo(): void;
             //     foo<number>(0);
             //
-            var candidateForArgumentError;
+            var candidatesForArgumentError;
             var candidateForArgumentArityError;
             var candidateForTypeArgumentError;
             var result;
             // If we are in signature help, a trailing comma indicates that we intend to provide another argument,
             // so we will only accept overloads with arity at least 1 higher than the current number of provided arguments.
-            var signatureHelpTrailingComma = !!(checkMode & 16 /* IsForSignatureHelp */) && node.kind === 191 /* CallExpression */ && node.arguments.hasTrailingComma;
+            var signatureHelpTrailingComma = !!(checkMode & 16 /* IsForSignatureHelp */) && node.kind === 192 /* CallExpression */ && node.arguments.hasTrailingComma;
             // Section 4.12.1:
             // if the candidate list contains one or more signatures for which the type of each argument
             // expression is a subtype of each corresponding parameter type, the return type of the first
@@ -50197,8 +51714,66 @@ var ts;
             // If candidate is undefined, it means that no candidates had a suitable arity. In that case,
             // skip the checkApplicableSignature check.
             if (reportErrors) {
-                if (candidateForArgumentError) {
-                    checkApplicableSignature(node, args, candidateForArgumentError, assignableRelation, 0 /* Normal */, /*reportErrors*/ true);
+                if (candidatesForArgumentError) {
+                    if (candidatesForArgumentError.length === 1 || candidatesForArgumentError.length > 3) {
+                        var last_2 = candidatesForArgumentError[candidatesForArgumentError.length - 1];
+                        var chain_1;
+                        if (candidatesForArgumentError.length > 3) {
+                            chain_1 = ts.chainDiagnosticMessages(chain_1, ts.Diagnostics.The_last_overload_gave_the_following_error);
+                            chain_1 = ts.chainDiagnosticMessages(chain_1, ts.Diagnostics.No_overload_matches_this_call);
+                        }
+                        var diags = getSignatureApplicabilityError(node, args, last_2, assignableRelation, 0 /* Normal */, /*reportErrors*/ true, function () { return chain_1; });
+                        if (diags) {
+                            for (var _i = 0, diags_1 = diags; _i < diags_1.length; _i++) {
+                                var d = diags_1[_i];
+                                if (last_2.declaration && candidatesForArgumentError.length > 3) {
+                                    ts.addRelatedInfo(d, ts.createDiagnosticForNode(last_2.declaration, ts.Diagnostics.The_last_overload_is_declared_here));
+                                }
+                                diagnostics.add(d);
+                            }
+                        }
+                        else {
+                            ts.Debug.fail("No error for last overload signature");
+                        }
+                    }
+                    else {
+                        var allDiagnostics = [];
+                        var max = 0;
+                        var min_3 = Number.MAX_VALUE;
+                        var minIndex = 0;
+                        var i_1 = 0;
+                        var _loop_12 = function (c) {
+                            var chain_2 = function () { return ts.chainDiagnosticMessages(/*details*/ undefined, ts.Diagnostics.Overload_0_of_1_2_gave_the_following_error, i_1 + 1, candidates.length, signatureToString(c)); };
+                            var diags_2 = getSignatureApplicabilityError(node, args, c, assignableRelation, 0 /* Normal */, /*reportErrors*/ true, chain_2);
+                            if (diags_2) {
+                                if (diags_2.length <= min_3) {
+                                    min_3 = diags_2.length;
+                                    minIndex = i_1;
+                                }
+                                max = Math.max(max, diags_2.length);
+                                allDiagnostics.push(diags_2);
+                            }
+                            else {
+                                ts.Debug.fail("No error for 3 or fewer overload signatures");
+                            }
+                            i_1++;
+                        };
+                        for (var _a = 0, candidatesForArgumentError_1 = candidatesForArgumentError; _a < candidatesForArgumentError_1.length; _a++) {
+                            var c = candidatesForArgumentError_1[_a];
+                            _loop_12(c);
+                        }
+                        var diags_3 = max > 1 ? allDiagnostics[minIndex] : ts.flatten(allDiagnostics);
+                        ts.Debug.assert(diags_3.length > 0, "No errors reported for 3 or fewer overload signatures");
+                        var chain = ts.chainDiagnosticMessages(ts.map(diags_3, function (d) { return typeof d.messageText === "string" ? d : d.messageText; }), ts.Diagnostics.No_overload_matches_this_call);
+                        var related = ts.flatMap(diags_3, function (d) { return d.relatedInformation; });
+                        if (ts.every(diags_3, function (d) { return d.start === diags_3[0].start && d.length === diags_3[0].length && d.file === diags_3[0].file; })) {
+                            var _b = diags_3[0], file = _b.file, start = _b.start, length_5 = _b.length;
+                            diagnostics.add({ file: file, start: start, length: length_5, code: chain.code, category: chain.category, messageText: chain, relatedInformation: related });
+                        }
+                        else {
+                            diagnostics.add(ts.createDiagnosticForNodeFromMessageChain(node, chain, related));
+                        }
+                    }
                 }
                 else if (candidateForArgumentArityError) {
                     diagnostics.add(getArgumentArityError(node, [candidateForArgumentArityError], args));
@@ -50215,14 +51790,14 @@ var ts;
                         diagnostics.add(getArgumentArityError(node, signaturesWithCorrectTypeArgumentArity, args));
                     }
                     else if (fallbackError) {
-                        diagnostics.add(ts.createDiagnosticForNode(node, fallbackError));
+                        diagnostics.add(getDiagnosticForCallNode(node, fallbackError));
                     }
                 }
             }
             return produceDiagnostics || !args ? resolveErrorCall(node) : getCandidateForOverloadFailure(node, candidates, args, !!candidatesOutArray);
             function chooseOverload(candidates, relation, signatureHelpTrailingComma) {
                 if (signatureHelpTrailingComma === void 0) { signatureHelpTrailingComma = false; }
-                candidateForArgumentError = undefined;
+                candidatesForArgumentError = undefined;
                 candidateForArgumentArityError = undefined;
                 candidateForTypeArgumentError = undefined;
                 if (isSingleNonGenericCandidate) {
@@ -50230,8 +51805,8 @@ var ts;
                     if (typeArguments || !hasCorrectArity(node, args, candidate, signatureHelpTrailingComma)) {
                         return undefined;
                     }
-                    if (!checkApplicableSignature(node, args, candidate, relation, 0 /* Normal */, /*reportErrors*/ false)) {
-                        candidateForArgumentError = candidate;
+                    if (getSignatureApplicabilityError(node, args, candidate, relation, 0 /* Normal */, /*reportErrors*/ false, /*containingMessageChain*/ undefined)) {
+                        candidatesForArgumentError = [candidate];
                         return undefined;
                     }
                     return candidate;
@@ -50255,7 +51830,7 @@ var ts;
                         else {
                             inferenceContext = createInferenceContext(candidate.typeParameters, candidate, /*flags*/ ts.isInJSFile(node) ? 2 /* AnyDefault */ : 0 /* None */);
                             typeArgumentTypes = inferTypeArguments(node, candidate, args, argCheckMode | 8 /* SkipGenericFunctions */, inferenceContext);
-                            argCheckMode |= inferenceContext.flags & 8 /* SkippedGenericFunction */ ? 8 /* SkipGenericFunctions */ : 0 /* Normal */;
+                            argCheckMode |= inferenceContext.flags & 4 /* SkippedGenericFunction */ ? 8 /* SkipGenericFunctions */ : 0 /* Normal */;
                         }
                         checkCandidate = getSignatureInstantiation(candidate, typeArgumentTypes, ts.isInJSFile(candidate.declaration), inferenceContext && inferenceContext.inferredTypeParameters);
                         // If the original signature has a generic rest type, instantiation may produce a
@@ -50268,11 +51843,9 @@ var ts;
                     else {
                         checkCandidate = candidate;
                     }
-                    if (!checkApplicableSignature(node, args, checkCandidate, relation, argCheckMode, /*reportErrors*/ false)) {
+                    if (getSignatureApplicabilityError(node, args, checkCandidate, relation, argCheckMode, /*reportErrors*/ false, /*containingMessageChain*/ undefined)) {
                         // Give preference to error candidates that have no rest parameters (as they are more specific)
-                        if (!candidateForArgumentError || getEffectiveRestType(candidateForArgumentError) || !getEffectiveRestType(checkCandidate)) {
-                            candidateForArgumentError = checkCandidate;
-                        }
+                        (candidatesForArgumentError || (candidatesForArgumentError = [])).push(checkCandidate);
                         continue;
                     }
                     if (argCheckMode) {
@@ -50290,11 +51863,9 @@ var ts;
                                 continue;
                             }
                         }
-                        if (!checkApplicableSignature(node, args, checkCandidate, relation, argCheckMode, /*reportErrors*/ false)) {
+                        if (getSignatureApplicabilityError(node, args, checkCandidate, relation, argCheckMode, /*reportErrors*/ false, /*containingMessageChain*/ undefined)) {
                             // Give preference to error candidates that have no rest parameters (as they are more specific)
-                            if (!candidateForArgumentError || getEffectiveRestType(candidateForArgumentError) || !getEffectiveRestType(checkCandidate)) {
-                                candidateForArgumentError = checkCandidate;
-                            }
+                            (candidatesForArgumentError || (candidatesForArgumentError = [])).push(checkCandidate);
                             continue;
                         }
                     }
@@ -50323,7 +51894,7 @@ var ts;
             }
             var _a = ts.minAndMax(candidates, getNumNonRestParameters), minArgumentCount = _a.min, maxNonRestParam = _a.max;
             var parameters = [];
-            var _loop_8 = function (i) {
+            var _loop_13 = function (i) {
                 var symbols = ts.mapDefined(candidates, function (_a) {
                     var parameters = _a.parameters, hasRestParameter = _a.hasRestParameter;
                     return hasRestParameter ?
@@ -50334,7 +51905,7 @@ var ts;
                 parameters.push(createCombinedSymbolFromTypes(symbols, ts.mapDefined(candidates, function (candidate) { return tryGetTypeAtPosition(candidate, i); })));
             };
             for (var i = 0; i < maxNonRestParam; i++) {
-                _loop_8(i);
+                _loop_13(i);
             }
             var restParameterSymbols = ts.mapDefined(candidates, function (c) { return c.hasRestParameter ? ts.last(c.parameters) : undefined; });
             var hasRestParameter = restParameterSymbols.length !== 0;
@@ -50412,7 +51983,7 @@ var ts;
             return maxParamsIndex;
         }
         function resolveCallExpression(node, candidatesOutArray, checkMode) {
-            if (node.expression.kind === 98 /* SuperKeyword */) {
+            if (node.expression.kind === 99 /* SuperKeyword */) {
                 var superType = checkSuperExpression(node.expression);
                 if (isTypeAny(superType)) {
                     for (var _i = 0, _a = node.arguments; _i < _a.length; _i++) {
@@ -50473,7 +52044,7 @@ var ts;
                             relatedInformation = ts.createDiagnosticForNode(node.expression, ts.Diagnostics.It_is_highly_likely_that_you_are_missing_a_semicolon);
                         }
                     }
-                    invocationError(node, apparentType, 0 /* Call */, relatedInformation);
+                    invocationError(node.expression, apparentType, 0 /* Call */, relatedInformation);
                 }
                 return resolveErrorCall(node);
             }
@@ -50487,7 +52058,7 @@ var ts;
             // returns a function type, we choose to defer processing. This narrowly permits function composition
             // operators to flow inferences through return types, but otherwise processes calls right away. We
             // use the resolvingSignature singleton to indicate that we deferred processing. This result will be
-            // propagated out and eventually turned into silentNeverType (a type that is assignable to anything and
+            // propagated out and eventually turned into nonInferrableType (a type that is assignable to anything and
             // from which we never make inferences).
             if (checkMode & 8 /* SkipGenericFunctions */ && !node.typeArguments && callSignatures.some(isGenericFunctionReturningFunction)) {
                 skippedGenericFunction(node, checkMode);
@@ -50580,7 +52151,7 @@ var ts;
                 }
                 return signature;
             }
-            invocationError(node, expressionType, 1 /* Construct */);
+            invocationError(node.expression, expressionType, 1 /* Construct */);
             return resolveErrorCall(node);
         }
         function typeHasProtectedAccessibleBase(target, type) {
@@ -50591,13 +52162,12 @@ var ts;
             var firstBase = baseTypes[0];
             if (firstBase.flags & 2097152 /* Intersection */) {
                 var types = firstBase.types;
-                var mixinCount = ts.countWhere(types, isMixinConstructorType);
+                var mixinFlags = findMixins(types);
                 var i = 0;
                 for (var _i = 0, _a = firstBase.types; _i < _a.length; _i++) {
                     var intersectionMember = _a[_i];
-                    i++;
                     // We want to ignore mixin ctors
-                    if (mixinCount === 0 || mixinCount === types.length && i === 0 || !isMixinConstructorType(intersectionMember)) {
+                    if (!mixinFlags[i]) {
                         if (ts.getObjectFlags(intersectionMember) & (1 /* Class */ | 2 /* Interface */)) {
                             if (intersectionMember.symbol === target) {
                                 return true;
@@ -50607,6 +52177,7 @@ var ts;
                             }
                         }
                     }
+                    i++;
                 }
                 return false;
             }
@@ -50646,11 +52217,75 @@ var ts;
             }
             return true;
         }
-        function invocationError(node, apparentType, kind, relatedInformation) {
-            var diagnostic = error(node, (kind === 0 /* Call */ ?
-                ts.Diagnostics.Cannot_invoke_an_expression_whose_type_lacks_a_call_signature_Type_0_has_no_compatible_call_signatures :
-                ts.Diagnostics.Cannot_use_new_with_an_expression_whose_type_lacks_a_call_or_construct_signature), typeToString(apparentType));
-            invocationErrorRecovery(apparentType, kind, relatedInformation ? addRelatedInfo(diagnostic, relatedInformation) : diagnostic);
+        function invocationErrorDetails(apparentType, kind) {
+            var errorInfo;
+            var isCall = kind === 0 /* Call */;
+            var awaitedType = getAwaitedType(apparentType);
+            var maybeMissingAwait = awaitedType && getSignaturesOfType(awaitedType, kind).length > 0;
+            if (apparentType.flags & 1048576 /* Union */) {
+                var types = apparentType.types;
+                var hasSignatures = false;
+                for (var _i = 0, types_15 = types; _i < types_15.length; _i++) {
+                    var constituent = types_15[_i];
+                    var signatures = getSignaturesOfType(constituent, kind);
+                    if (signatures.length !== 0) {
+                        hasSignatures = true;
+                        if (errorInfo) {
+                            // Bail early if we already have an error, no chance of "No constituent of type is callable"
+                            break;
+                        }
+                    }
+                    else {
+                        // Error on the first non callable constituent only
+                        if (!errorInfo) {
+                            errorInfo = ts.chainDiagnosticMessages(errorInfo, isCall ?
+                                ts.Diagnostics.Type_0_has_no_call_signatures :
+                                ts.Diagnostics.Type_0_has_no_construct_signatures, typeToString(constituent));
+                            errorInfo = ts.chainDiagnosticMessages(errorInfo, isCall ?
+                                ts.Diagnostics.Not_all_constituents_of_type_0_are_callable :
+                                ts.Diagnostics.Not_all_constituents_of_type_0_are_constructable, typeToString(apparentType));
+                        }
+                        if (hasSignatures) {
+                            // Bail early if we already found a siganture, no chance of "No constituent of type is callable"
+                            break;
+                        }
+                    }
+                }
+                if (!hasSignatures) {
+                    errorInfo = ts.chainDiagnosticMessages(
+                    /* detials */ undefined, isCall ?
+                        ts.Diagnostics.No_constituent_of_type_0_is_callable :
+                        ts.Diagnostics.No_constituent_of_type_0_is_constructable, typeToString(apparentType));
+                }
+                if (!errorInfo) {
+                    errorInfo = ts.chainDiagnosticMessages(errorInfo, isCall ?
+                        ts.Diagnostics.Each_member_of_the_union_type_0_has_signatures_but_none_of_those_signatures_are_compatible_with_each_other :
+                        ts.Diagnostics.Each_member_of_the_union_type_0_has_construct_signatures_but_none_of_those_signatures_are_compatible_with_each_other, typeToString(apparentType));
+                }
+            }
+            else {
+                errorInfo = ts.chainDiagnosticMessages(errorInfo, isCall ?
+                    ts.Diagnostics.Type_0_has_no_call_signatures :
+                    ts.Diagnostics.Type_0_has_no_construct_signatures, typeToString(apparentType));
+            }
+            return {
+                messageChain: ts.chainDiagnosticMessages(errorInfo, isCall ? ts.Diagnostics.This_expression_is_not_callable : ts.Diagnostics.This_expression_is_not_constructable),
+                relatedMessage: maybeMissingAwait ? ts.Diagnostics.Did_you_forget_to_use_await : undefined,
+            };
+        }
+        function invocationError(errorTarget, apparentType, kind, relatedInformation) {
+            var _a = invocationErrorDetails(apparentType, kind), messageChain = _a.messageChain, relatedInfo = _a.relatedMessage;
+            var diagnostic = ts.createDiagnosticForNodeFromMessageChain(errorTarget, messageChain);
+            if (relatedInfo) {
+                ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(errorTarget, relatedInfo));
+            }
+            if (ts.isCallExpression(errorTarget.parent)) {
+                var _b = getDiagnosticSpanForCallNode(errorTarget.parent, /* doNotIncludeArguments */ true), start = _b.start, length_6 = _b.length;
+                diagnostic.start = start;
+                diagnostic.length = length_6;
+            }
+            diagnostics.add(diagnostic);
+            invocationErrorRecovery(apparentType, kind, relatedInformation ? ts.addRelatedInfo(diagnostic, relatedInformation) : diagnostic);
         }
         function invocationErrorRecovery(apparentType, kind, diagnostic) {
             if (!apparentType.symbol) {
@@ -50663,7 +52298,7 @@ var ts;
                 var sigs = getSignaturesOfType(getTypeOfSymbol(getSymbolLinks(apparentType.symbol).target), kind);
                 if (!sigs || !sigs.length)
                     return;
-                addRelatedInfo(diagnostic, ts.createDiagnosticForNode(importNode, ts.Diagnostics.Type_originates_at_this_import_A_namespace_style_import_cannot_be_called_or_constructed_and_will_cause_a_failure_at_runtime_Consider_using_a_default_import_or_import_require_here_instead));
+                ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(importNode, ts.Diagnostics.Type_originates_at_this_import_A_namespace_style_import_cannot_be_called_or_constructed_and_will_cause_a_failure_at_runtime_Consider_using_a_default_import_or_import_require_here_instead));
             }
         }
         function resolveTaggedTemplateExpression(node, candidatesOutArray, checkMode) {
@@ -50679,7 +52314,7 @@ var ts;
                 return resolveUntypedCall(node);
             }
             if (!callSignatures.length) {
-                invocationError(node, apparentType, 0 /* Call */);
+                invocationError(node.tag, apparentType, 0 /* Call */);
                 return resolveErrorCall(node);
             }
             return resolveCall(node, callSignatures, candidatesOutArray, checkMode);
@@ -50689,16 +52324,16 @@ var ts;
          */
         function getDiagnosticHeadMessageForDecoratorResolution(node) {
             switch (node.parent.kind) {
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_class_decorator_when_called_as_an_expression;
-                case 151 /* Parameter */:
+                case 152 /* Parameter */:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_parameter_decorator_when_called_as_an_expression;
-                case 154 /* PropertyDeclaration */:
+                case 155 /* PropertyDeclaration */:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_property_decorator_when_called_as_an_expression;
-                case 156 /* MethodDeclaration */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 157 /* MethodDeclaration */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_method_decorator_when_called_as_an_expression;
                 default:
                     return ts.Debug.fail();
@@ -50725,9 +52360,12 @@ var ts;
             }
             var headMessage = getDiagnosticHeadMessageForDecoratorResolution(node);
             if (!callSignatures.length) {
-                var errorInfo = ts.chainDiagnosticMessages(/*details*/ undefined, ts.Diagnostics.Cannot_invoke_an_expression_whose_type_lacks_a_call_signature_Type_0_has_no_compatible_call_signatures, typeToString(apparentType));
-                errorInfo = ts.chainDiagnosticMessages(errorInfo, headMessage);
-                var diag = ts.createDiagnosticForNodeFromMessageChain(node, errorInfo);
+                var errorDetails = invocationErrorDetails(apparentType, 0 /* Call */);
+                var messageChain = ts.chainDiagnosticMessages(errorDetails.messageChain, headMessage);
+                var diag = ts.createDiagnosticForNodeFromMessageChain(node.expression, messageChain);
+                if (errorDetails.relatedMessage) {
+                    ts.addRelatedInfo(diag, ts.createDiagnosticForNode(node.expression, errorDetails.relatedMessage));
+                }
                 diagnostics.add(diag);
                 invocationErrorRecovery(apparentType, 0 /* Call */, diag);
                 return resolveErrorCall(node);
@@ -50741,7 +52379,7 @@ var ts;
             // file would probably be preferable.
             var typeSymbol = exports && getSymbol(exports, JsxNames.Element, 67897832 /* Type */);
             var returnNode = typeSymbol && nodeBuilder.symbolToEntityName(typeSymbol, 67897832 /* Type */, node);
-            var declaration = ts.createFunctionTypeNode(/*typeParameters*/ undefined, [ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotdotdot*/ undefined, "props", /*questionMark*/ undefined, nodeBuilder.typeToTypeNode(result, node))], returnNode ? ts.createTypeReferenceNode(returnNode, /*typeArguments*/ undefined) : ts.createKeywordTypeNode(120 /* AnyKeyword */));
+            var declaration = ts.createFunctionTypeNode(/*typeParameters*/ undefined, [ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotdotdot*/ undefined, "props", /*questionMark*/ undefined, nodeBuilder.typeToTypeNode(result, node))], returnNode ? ts.createTypeReferenceNode(returnNode, /*typeArguments*/ undefined) : ts.createKeywordTypeNode(121 /* AnyKeyword */));
             var parameterSymbol = createSymbol(1 /* FunctionScopedVariable */, "props");
             parameterSymbol.type = result;
             return createSignature(declaration, 
@@ -50788,16 +52426,16 @@ var ts;
         }
         function resolveSignature(node, candidatesOutArray, checkMode) {
             switch (node.kind) {
-                case 191 /* CallExpression */:
+                case 192 /* CallExpression */:
                     return resolveCallExpression(node, candidatesOutArray, checkMode);
-                case 192 /* NewExpression */:
+                case 193 /* NewExpression */:
                     return resolveNewExpression(node, candidatesOutArray, checkMode);
-                case 193 /* TaggedTemplateExpression */:
+                case 194 /* TaggedTemplateExpression */:
                     return resolveTaggedTemplateExpression(node, candidatesOutArray, checkMode);
-                case 152 /* Decorator */:
+                case 153 /* Decorator */:
                     return resolveDecorator(node, candidatesOutArray, checkMode);
-                case 262 /* JsxOpeningElement */:
-                case 261 /* JsxSelfClosingElement */:
+                case 263 /* JsxOpeningElement */:
+                case 262 /* JsxSelfClosingElement */:
                     return resolveJsxOpeningLikeElement(node, candidatesOutArray, checkMode);
             }
             throw ts.Debug.assertNever(node, "Branch in 'resolveSignature' should be unreachable.");
@@ -50877,17 +52515,17 @@ var ts;
                     ts.isVariableDeclaration(decl.parent) && getSymbolOfNode(decl.parent));
             var prototype = assignmentSymbol && assignmentSymbol.exports && assignmentSymbol.exports.get("prototype");
             var init = prototype && prototype.valueDeclaration && getAssignedJSPrototype(prototype.valueDeclaration);
-            return init ? checkExpression(init) : undefined;
+            return init ? getWidenedType(checkExpressionCached(init)) : undefined;
         }
         function getAssignedJSPrototype(node) {
             if (!node.parent) {
                 return false;
             }
             var parent = node.parent;
-            while (parent && parent.kind === 189 /* PropertyAccessExpression */) {
+            while (parent && parent.kind === 190 /* PropertyAccessExpression */) {
                 parent = parent.parent;
             }
-            if (parent && ts.isBinaryExpression(parent) && ts.isPrototypeAccess(parent.left) && parent.operatorToken.kind === 59 /* EqualsToken */) {
+            if (parent && ts.isBinaryExpression(parent) && ts.isPrototypeAccess(parent.left) && parent.operatorToken.kind === 60 /* EqualsToken */) {
                 var right = ts.getInitializerOfBinaryExpression(parent);
                 return ts.isObjectLiteralExpression(right) && right;
             }
@@ -50910,18 +52548,18 @@ var ts;
             var signature = getResolvedSignature(node, /*candidatesOutArray*/ undefined, checkMode);
             if (signature === resolvingSignature) {
                 // CheckMode.SkipGenericFunctions is enabled and this is a call to a generic function that
-                // returns a function type. We defer checking and return anyFunctionType.
-                return silentNeverType;
+                // returns a function type. We defer checking and return nonInferrableType.
+                return nonInferrableType;
             }
-            if (node.expression.kind === 98 /* SuperKeyword */) {
+            if (node.expression.kind === 99 /* SuperKeyword */) {
                 return voidType;
             }
-            if (node.kind === 192 /* NewExpression */) {
+            if (node.kind === 193 /* NewExpression */) {
                 var declaration = signature.declaration;
                 if (declaration &&
-                    declaration.kind !== 157 /* Constructor */ &&
-                    declaration.kind !== 161 /* ConstructSignature */ &&
-                    declaration.kind !== 166 /* ConstructorType */ &&
+                    declaration.kind !== 158 /* Constructor */ &&
+                    declaration.kind !== 162 /* ConstructSignature */ &&
+                    declaration.kind !== 167 /* ConstructorType */ &&
                     !ts.isJSDocConstructSignature(declaration) &&
                     !isJSConstructor(declaration)) {
                     // When resolved signature is a call signature (and not a construct signature) the result type is any
@@ -51038,9 +52676,9 @@ var ts;
                 return false;
             }
             var targetDeclarationKind = resolvedRequire.flags & 16 /* Function */
-                ? 239 /* FunctionDeclaration */
+                ? 240 /* FunctionDeclaration */
                 : resolvedRequire.flags & 3 /* Variable */
-                    ? 237 /* VariableDeclaration */
+                    ? 238 /* VariableDeclaration */
                     : 0 /* Unknown */;
             if (targetDeclarationKind !== 0 /* Unknown */) {
                 var decl = ts.getDeclarationOfKind(resolvedRequire, targetDeclarationKind);
@@ -51052,7 +52690,7 @@ var ts;
         function checkTaggedTemplateExpression(node) {
             checkGrammarTypeArguments(node, node.typeArguments);
             if (languageVersion < 2 /* ES2015 */) {
-                checkExternalEmitHelpers(node, 65536 /* MakeTemplateObject */);
+                checkExternalEmitHelpers(node, 131072 /* MakeTemplateObject */);
             }
             return getReturnTypeOfSignature(getResolvedSignature(node));
         }
@@ -51065,18 +52703,28 @@ var ts;
                 case 14 /* NoSubstitutionTemplateLiteral */:
                 case 8 /* NumericLiteral */:
                 case 9 /* BigIntLiteral */:
-                case 102 /* TrueKeyword */:
-                case 87 /* FalseKeyword */:
-                case 187 /* ArrayLiteralExpression */:
-                case 188 /* ObjectLiteralExpression */:
+                case 103 /* TrueKeyword */:
+                case 88 /* FalseKeyword */:
+                case 188 /* ArrayLiteralExpression */:
+                case 189 /* ObjectLiteralExpression */:
                     return true;
-                case 195 /* ParenthesizedExpression */:
+                case 196 /* ParenthesizedExpression */:
                     return isValidConstAssertionArgument(node.expression);
-                case 202 /* PrefixUnaryExpression */:
+                case 203 /* PrefixUnaryExpression */:
                     var op = node.operator;
                     var arg = node.operand;
                     return op === 39 /* MinusToken */ && (arg.kind === 8 /* NumericLiteral */ || arg.kind === 9 /* BigIntLiteral */) ||
                         op === 38 /* PlusToken */ && arg.kind === 8 /* NumericLiteral */;
+                case 190 /* PropertyAccessExpression */:
+                case 191 /* ElementAccessExpression */:
+                    var expr = node.expression;
+                    if (ts.isIdentifier(expr)) {
+                        var symbol = getSymbolAtLocation(expr);
+                        if (symbol && symbol.flags & 2097152 /* Alias */) {
+                            symbol = resolveAlias(symbol);
+                        }
+                        return !!(symbol && (symbol.flags & 384 /* Enum */) && getEnumKind(symbol) === 1 /* Literal */);
+                    }
             }
             return false;
         }
@@ -51084,7 +52732,7 @@ var ts;
             var exprType = checkExpression(expression, checkMode);
             if (ts.isConstTypeReference(type)) {
                 if (!isValidConstAssertionArgument(expression)) {
-                    error(expression, ts.Diagnostics.A_const_assertion_can_only_be_applied_to_a_string_number_boolean_array_or_object_literal);
+                    error(expression, ts.Diagnostics.A_const_assertions_can_only_be_applied_to_references_to_enum_members_or_string_number_boolean_array_or_object_literals);
                 }
                 return getRegularTypeOfLiteralType(exprType);
             }
@@ -51104,10 +52752,10 @@ var ts;
         }
         function checkMetaProperty(node) {
             checkGrammarMetaProperty(node);
-            if (node.keywordToken === 95 /* NewKeyword */) {
+            if (node.keywordToken === 96 /* NewKeyword */) {
                 return checkNewTargetMetaProperty(node);
             }
-            if (node.keywordToken === 92 /* ImportKeyword */) {
+            if (node.keywordToken === 93 /* ImportKeyword */) {
                 return checkImportMetaProperty(node);
             }
             return ts.Debug.assertNever(node.keywordToken);
@@ -51118,7 +52766,7 @@ var ts;
                 error(node, ts.Diagnostics.Meta_property_0_is_only_allowed_in_the_body_of_a_function_declaration_function_expression_or_constructor, "new.target");
                 return errorType;
             }
-            else if (container.kind === 157 /* Constructor */) {
+            else if (container.kind === 158 /* Constructor */) {
                 var symbol = getSymbolOfNode(container.parent);
                 return getTypeOfSymbol(symbol);
             }
@@ -51128,7 +52776,7 @@ var ts;
             }
         }
         function checkImportMetaProperty(node) {
-            if (languageVersion < 7 /* ESNext */ || moduleKind < ts.ModuleKind.ESNext) {
+            if (languageVersion < 99 /* ESNext */ || moduleKind < ts.ModuleKind.ESNext) {
                 error(node, ts.Diagnostics.The_import_meta_meta_property_is_only_allowed_using_ESNext_for_the_target_and_module_compiler_options);
             }
             var file = ts.getSourceFileOfNode(node);
@@ -51169,9 +52817,14 @@ var ts;
                 return getTypeOfParameter(signature.parameters[pos]);
             }
             if (signature.hasRestParameter) {
+                // We want to return the value undefined for an out of bounds parameter position,
+                // so we need to check bounds here before calling getIndexedAccessType (which
+                // otherwise would return the type 'undefined').
                 var restType = getTypeOfSymbol(signature.parameters[paramCount]);
-                var indexType = getLiteralType(pos - paramCount);
-                return getIndexedAccessType(restType, indexType);
+                var index = pos - paramCount;
+                if (!isTupleType(restType) || restType.target.hasRestElement || index < (restType.typeArguments || ts.emptyArray).length) {
+                    return getIndexedAccessType(restType, getLiteralType(index));
+                }
             }
             return undefined;
         }
@@ -51242,14 +52895,14 @@ var ts;
         function getTypeOfFirstParameterOfSignatureWithFallback(signature, fallbackType) {
             return signature.parameters.length > 0 ? getTypeAtPosition(signature, 0) : fallbackType;
         }
-        function inferFromAnnotatedParameters(signature, context, mapper) {
+        function inferFromAnnotatedParameters(signature, context, inferenceContext) {
             var len = signature.parameters.length - (signature.hasRestParameter ? 1 : 0);
             for (var i = 0; i < len; i++) {
                 var declaration = signature.parameters[i].valueDeclaration;
                 if (declaration.type) {
                     var typeNode = ts.getEffectiveTypeAnnotationNode(declaration);
                     if (typeNode) {
-                        inferTypes(mapper.inferences, getTypeFromTypeNode(typeNode), getTypeAtPosition(context, i));
+                        inferTypes(inferenceContext.inferences, getTypeFromTypeNode(typeNode), getTypeAtPosition(context, i));
                     }
                 }
             }
@@ -51257,12 +52910,12 @@ var ts;
             if (restType && restType.flags & 262144 /* TypeParameter */) {
                 // The contextual signature has a generic rest parameter. We first instantiate the contextual
                 // signature (without fixing type parameters) and assign types to contextually typed parameters.
-                var instantiatedContext = instantiateSignature(context, cloneTypeMapper(mapper));
+                var instantiatedContext = instantiateSignature(context, inferenceContext.nonFixingMapper);
                 assignContextualParameterTypes(signature, instantiatedContext);
                 // We then infer from a tuple type representing the parameters that correspond to the contextual
                 // rest parameter.
                 var restPos = getParameterCount(context) - 1;
-                inferTypes(mapper.inferences, getRestTypeAtPosition(signature, restPos), restType);
+                inferTypes(inferenceContext.inferences, getRestTypeAtPosition(signature, restPos), restType);
             }
         }
         function assignContextualParameterTypes(signature, context) {
@@ -51299,7 +52952,7 @@ var ts;
             for (var _i = 0, _a = pattern.elements; _i < _a.length; _i++) {
                 var element = _a[_i];
                 if (!ts.isOmittedExpression(element)) {
-                    if (element.name.kind === 72 /* Identifier */) {
+                    if (element.name.kind === 73 /* Identifier */) {
                         getSymbolLinks(getSymbolOfNode(element)).type = getTypeForBindingElement(element);
                     }
                     else {
@@ -51313,9 +52966,9 @@ var ts;
             if (!links.type) {
                 links.type = contextualType;
                 var decl = parameter.valueDeclaration;
-                if (decl.name.kind !== 72 /* Identifier */) {
+                if (decl.name.kind !== 73 /* Identifier */) {
                     // if inference didn't come up with anything but {}, fall back to the binding pattern if present.
-                    if (links.type === emptyObjectType) {
+                    if (links.type === unknownType) {
                         links.type = getTypeFromBindingPattern(decl.name);
                     }
                     assignBindingElementTypes(decl.name);
@@ -51327,24 +52980,24 @@ var ts;
             var globalPromiseType = getGlobalPromiseType(/*reportErrors*/ true);
             if (globalPromiseType !== emptyGenericType) {
                 // if the promised type is itself a promise, get the underlying type; otherwise, fallback to the promised type
-                promisedType = getAwaitedType(promisedType) || emptyObjectType;
+                promisedType = getAwaitedType(promisedType) || unknownType;
                 return createTypeReference(globalPromiseType, [promisedType]);
             }
-            return emptyObjectType;
+            return unknownType;
         }
         function createPromiseLikeType(promisedType) {
             // creates a `PromiseLike<T>` type where `T` is the promisedType argument
             var globalPromiseLikeType = getGlobalPromiseLikeType(/*reportErrors*/ true);
             if (globalPromiseLikeType !== emptyGenericType) {
                 // if the promised type is itself a promise, get the underlying type; otherwise, fallback to the promised type
-                promisedType = getAwaitedType(promisedType) || emptyObjectType;
+                promisedType = getAwaitedType(promisedType) || unknownType;
                 return createTypeReference(globalPromiseLikeType, [promisedType]);
             }
-            return emptyObjectType;
+            return unknownType;
         }
         function createPromiseReturnType(func, promisedType) {
             var promiseType = createPromiseType(promisedType);
-            if (promiseType === emptyObjectType) {
+            if (promiseType === unknownType) {
                 error(func, ts.isImportCall(func) ?
                     ts.Diagnostics.A_dynamic_import_call_returns_a_Promise_Make_sure_you_have_a_declaration_for_Promise_or_include_ES2015_in_your_lib_option :
                     ts.Diagnostics.An_async_function_or_method_must_return_a_Promise_Make_sure_you_have_a_declaration_for_Promise_or_include_ES2015_in_your_lib_option);
@@ -51362,99 +53015,148 @@ var ts;
                 return errorType;
             }
             var functionFlags = ts.getFunctionFlags(func);
-            var type;
-            if (func.body.kind !== 218 /* Block */) {
-                type = checkExpressionCached(func.body, checkMode && checkMode & ~8 /* SkipGenericFunctions */);
-                if (functionFlags & 2 /* Async */) {
+            var isAsync = (functionFlags & 2 /* Async */) !== 0;
+            var isGenerator = (functionFlags & 1 /* Generator */) !== 0;
+            var returnType;
+            var yieldType;
+            var nextType;
+            var fallbackReturnType = voidType;
+            if (func.body.kind !== 219 /* Block */) { // Async or normal arrow function
+                returnType = checkExpressionCached(func.body, checkMode && checkMode & ~8 /* SkipGenericFunctions */);
+                if (isAsync) {
                     // From within an async function you can return either a non-promise value or a promise. Any
                     // Promise/A+ compatible implementation will always assimilate any foreign promise, so the
                     // return type of the body should be unwrapped to its awaited type, which we will wrap in
                     // the native Promise<T> type later in this function.
-                    type = checkAwaitedType(type, /*errorNode*/ func, ts.Diagnostics.The_return_type_of_an_async_function_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member);
+                    returnType = checkAwaitedType(returnType, /*errorNode*/ func, ts.Diagnostics.The_return_type_of_an_async_function_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member);
                 }
             }
-            else {
-                var types = checkAndAggregateReturnExpressionTypes(func, checkMode);
-                if (functionFlags & 1 /* Generator */) { // Generator or AsyncGenerator function
-                    types = ts.concatenate(checkAndAggregateYieldOperandTypes(func, checkMode), types);
-                    if (!types || types.length === 0) {
-                        var iterableIteratorAny = functionFlags & 2 /* Async */
-                            ? createAsyncIterableIteratorType(anyType) // AsyncGenerator function
-                            : createIterableIteratorType(anyType); // Generator function
-                        if (noImplicitAny) {
-                            error(func.asteriskToken, ts.Diagnostics.Generator_implicitly_has_type_0_because_it_does_not_yield_any_values_Consider_supplying_a_return_type, typeToString(iterableIteratorAny));
-                        }
-                        return iterableIteratorAny;
-                    }
+            else if (isGenerator) { // Generator or AsyncGenerator function
+                var returnTypes = checkAndAggregateReturnExpressionTypes(func, checkMode);
+                if (!returnTypes) {
+                    fallbackReturnType = neverType;
                 }
-                else {
-                    if (!types) {
-                        // For an async function, the return type will not be never, but rather a Promise for never.
-                        return functionFlags & 2 /* Async */
-                            ? createPromiseReturnType(func, neverType) // Async function
-                            : neverType; // Normal function
-                    }
-                    if (types.length === 0) {
-                        // For an async function, the return type will not be void, but rather a Promise for void.
-                        return functionFlags & 2 /* Async */
-                            ? createPromiseReturnType(func, voidType) // Async function
-                            : voidType; // Normal function
-                    }
+                else if (returnTypes.length > 0) {
+                    returnType = getUnionType(returnTypes, 2 /* Subtype */);
+                }
+                var _a = checkAndAggregateYieldOperandTypes(func, checkMode), yieldTypes = _a.yieldTypes, nextTypes = _a.nextTypes;
+                yieldType = ts.some(yieldTypes) ? getUnionType(yieldTypes, 2 /* Subtype */) : undefined;
+                nextType = ts.some(nextTypes) ? getIntersectionType(nextTypes) : undefined;
+            }
+            else { // Async or normal function
+                var types = checkAndAggregateReturnExpressionTypes(func, checkMode);
+                if (!types) {
+                    // For an async function, the return type will not be never, but rather a Promise for never.
+                    return functionFlags & 2 /* Async */
+                        ? createPromiseReturnType(func, neverType) // Async function
+                        : neverType; // Normal function
+                }
+                if (types.length === 0) {
+                    // For an async function, the return type will not be void, but rather a Promise for void.
+                    return functionFlags & 2 /* Async */
+                        ? createPromiseReturnType(func, voidType) // Async function
+                        : voidType; // Normal function
                 }
                 // Return a union of the return expression types.
-                type = getUnionType(types, 2 /* Subtype */);
+                returnType = getUnionType(types, 2 /* Subtype */);
             }
-            var contextualSignature = getContextualSignatureForFunctionLikeDeclaration(func);
-            if (!contextualSignature) {
-                reportErrorsFromWidening(func, type);
-            }
-            if (isUnitType(type)) {
-                var contextualType = !contextualSignature ? undefined :
-                    contextualSignature === getSignatureFromDeclaration(func) ? type :
-                        getReturnTypeOfSignature(contextualSignature);
-                if (contextualType) {
-                    switch (functionFlags & 3 /* AsyncGenerator */) {
-                        case 3 /* AsyncGenerator */:
-                            contextualType = getIteratedTypeOfGenerator(contextualType, /*isAsyncGenerator*/ true);
-                            break;
-                        case 1 /* Generator */:
-                            contextualType = getIteratedTypeOfGenerator(contextualType, /*isAsyncGenerator*/ false);
-                            break;
-                        case 2 /* Async */:
-                            contextualType = getPromisedTypeOfPromise(contextualType);
-                            break;
+            if (returnType || yieldType || nextType) {
+                var contextualSignature = getContextualSignatureForFunctionLikeDeclaration(func);
+                if (!contextualSignature) {
+                    if (yieldType)
+                        reportErrorsFromWidening(func, yieldType, 1 /* GeneratorYield */);
+                    if (returnType)
+                        reportErrorsFromWidening(func, returnType);
+                    if (nextType)
+                        reportErrorsFromWidening(func, nextType);
+                }
+                if (returnType && isUnitType(returnType) ||
+                    yieldType && isUnitType(yieldType) ||
+                    nextType && isUnitType(nextType)) {
+                    var contextualType = !contextualSignature ? undefined :
+                        contextualSignature === getSignatureFromDeclaration(func) ? isGenerator ? undefined : returnType :
+                            instantiateContextualType(getReturnTypeOfSignature(contextualSignature), func);
+                    if (isGenerator) {
+                        yieldType = getWidenedLiteralLikeTypeForContextualIterationTypeIfNeeded(yieldType, contextualType, 0 /* Yield */, isAsync);
+                        returnType = getWidenedLiteralLikeTypeForContextualIterationTypeIfNeeded(returnType, contextualType, 1 /* Return */, isAsync);
+                        nextType = getWidenedLiteralLikeTypeForContextualIterationTypeIfNeeded(nextType, contextualType, 2 /* Next */, isAsync);
+                    }
+                    else {
+                        returnType = getWidenedLiteralLikeTypeForContextualReturnTypeIfNeeded(returnType, contextualType, isAsync);
                     }
                 }
-                type = getWidenedLiteralLikeTypeForContextualType(type, contextualType);
+                if (yieldType)
+                    yieldType = getWidenedType(yieldType);
+                if (returnType)
+                    returnType = getWidenedType(returnType);
+                if (nextType)
+                    nextType = getWidenedType(nextType);
             }
-            var widenedType = getWidenedType(type);
-            switch (functionFlags & 3 /* AsyncGenerator */) {
-                case 3 /* AsyncGenerator */:
-                    return createAsyncIterableIteratorType(widenedType);
-                case 1 /* Generator */:
-                    return createIterableIteratorType(widenedType);
-                case 2 /* Async */:
-                    // From within an async function you can return either a non-promise value or a promise. Any
-                    // Promise/A+ compatible implementation will always assimilate any foreign promise, so the
-                    // return type of the body is awaited type of the body, wrapped in a native Promise<T> type.
-                    return createPromiseType(widenedType);
-                default:
-                    return widenedType;
+            if (isGenerator) {
+                return createGeneratorReturnType(yieldType || neverType, returnType || fallbackReturnType, nextType || unknownType, isAsync);
             }
+            else {
+                // From within an async function you can return either a non-promise value or a promise. Any
+                // Promise/A+ compatible implementation will always assimilate any foreign promise, so the
+                // return type of the body is awaited type of the body, wrapped in a native Promise<T> type.
+                return isAsync
+                    ? createPromiseType(returnType || fallbackReturnType)
+                    : returnType || fallbackReturnType;
+            }
+        }
+        function createGeneratorReturnType(yieldType, returnType, nextType, isAsyncGenerator) {
+            var resolver = isAsyncGenerator ? asyncIterationTypesResolver : syncIterationTypesResolver;
+            var globalGeneratorType = resolver.getGlobalGeneratorType(/*reportErrors*/ false);
+            yieldType = resolver.resolveIterationType(yieldType, /*errorNode*/ undefined) || unknownType;
+            returnType = resolver.resolveIterationType(returnType, /*errorNode*/ undefined) || unknownType;
+            nextType = resolver.resolveIterationType(nextType, /*errorNode*/ undefined) || unknownType;
+            if (globalGeneratorType === emptyGenericType) {
+                // Fall back to the global IterableIterator if returnType is assignable to the expected return iteration
+                // type of IterableIterator, and the expected next iteration type of IterableIterator is assignable to
+                // nextType.
+                var globalType = resolver.getGlobalIterableIteratorType(/*reportErrors*/ false);
+                var iterationTypes = globalType !== emptyGenericType ? getIterationTypesOfGlobalIterableType(globalType, resolver) : undefined;
+                var iterableIteratorReturnType = iterationTypes ? iterationTypes.returnType : anyType;
+                var iterableIteratorNextType = iterationTypes ? iterationTypes.nextType : undefinedType;
+                if (isTypeAssignableTo(returnType, iterableIteratorReturnType) &&
+                    isTypeAssignableTo(iterableIteratorNextType, nextType)) {
+                    if (globalType !== emptyGenericType) {
+                        return createTypeFromGenericGlobalType(globalType, [yieldType]);
+                    }
+                    // The global IterableIterator type doesn't exist, so report an error
+                    resolver.getGlobalIterableIteratorType(/*reportErrors*/ true);
+                    return emptyObjectType;
+                }
+                // The global Generator type doesn't exist, so report an error
+                resolver.getGlobalGeneratorType(/*reportErrors*/ true);
+                return emptyObjectType;
+            }
+            return createTypeFromGenericGlobalType(globalGeneratorType, [yieldType, returnType, nextType]);
         }
         function checkAndAggregateYieldOperandTypes(func, checkMode) {
-            var aggregatedTypes = [];
+            var yieldTypes = [];
+            var nextTypes = [];
             var isAsync = (ts.getFunctionFlags(func) & 2 /* Async */) !== 0;
             ts.forEachYieldExpression(func.body, function (yieldExpression) {
-                ts.pushIfUnique(aggregatedTypes, getYieldedTypeOfYieldExpression(yieldExpression, isAsync, checkMode));
+                var yieldExpressionType = yieldExpression.expression ? checkExpression(yieldExpression.expression, checkMode) : undefinedWideningType;
+                ts.pushIfUnique(yieldTypes, getYieldedTypeOfYieldExpression(yieldExpression, yieldExpressionType, anyType, isAsync));
+                var nextType;
+                if (yieldExpression.asteriskToken) {
+                    var iterationTypes = getIterationTypesOfIterable(yieldExpressionType, isAsync ? 19 /* AsyncYieldStar */ : 17 /* YieldStar */, yieldExpression.expression);
+                    nextType = iterationTypes && iterationTypes.nextType;
+                }
+                else {
+                    nextType = getContextualType(yieldExpression);
+                }
+                if (nextType)
+                    ts.pushIfUnique(nextTypes, nextType);
             });
-            return aggregatedTypes;
+            return { yieldTypes: yieldTypes, nextTypes: nextTypes };
         }
-        function getYieldedTypeOfYieldExpression(node, isAsync, checkMode) {
+        function getYieldedTypeOfYieldExpression(node, expressionType, sentType, isAsync) {
             var errorNode = node.expression || node;
-            var expressionType = node.expression ? checkExpression(node.expression, checkMode) : undefinedWideningType;
             // A `yield*` expression effectively yields everything that its operand yields
-            var yieldedType = node.asteriskToken ? checkIteratedTypeOrElementType(expressionType, errorNode, /*allowStringInput*/ false, isAsync) : expressionType;
+            var yieldedType = node.asteriskToken ? checkIteratedTypeOrElementType(isAsync ? 19 /* AsyncYieldStar */ : 17 /* YieldStar */, expressionType, sentType, errorNode) : expressionType;
             return !isAsync ? yieldedType : getAwaitedType(yieldedType, errorNode, node.asteriskToken
                 ? ts.Diagnostics.Type_of_iterated_elements_of_a_yield_Asterisk_operand_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member
                 : ts.Diagnostics.Type_of_yield_operand_in_an_async_generator_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member);
@@ -51505,7 +53207,7 @@ var ts;
             if (!node.possiblyExhaustive) {
                 return false;
             }
-            if (node.expression.kind === 199 /* TypeOfExpression */) {
+            if (node.expression.kind === 200 /* TypeOfExpression */) {
                 var operandType = getTypeOfExpression(node.expression.expression);
                 // This cast is safe because the switch is possibly exhaustive and does not contain a default case, so there can be no undefined.
                 var witnesses = getSwitchClauseTypeOfWitnesses(node);
@@ -51528,7 +53230,7 @@ var ts;
             if (!(func.flags & 128 /* HasImplicitReturn */)) {
                 return false;
             }
-            if (ts.some(func.body.statements, function (statement) { return statement.kind === 232 /* SwitchStatement */ && isExhaustiveSwitchStatement(statement); })) {
+            if (ts.some(func.body.statements, function (statement) { return statement.kind === 233 /* SwitchStatement */ && isExhaustiveSwitchStatement(statement); })) {
                 return false;
             }
             return true;
@@ -51571,11 +53273,11 @@ var ts;
         }
         function mayReturnNever(func) {
             switch (func.kind) {
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
                     return true;
-                case 156 /* MethodDeclaration */:
-                    return func.parent.kind === 188 /* ObjectLiteralExpression */;
+                case 157 /* MethodDeclaration */:
+                    return func.parent.kind === 189 /* ObjectLiteralExpression */;
                 default:
                     return false;
             }
@@ -51593,30 +53295,32 @@ var ts;
             if (!produceDiagnostics) {
                 return;
             }
+            var functionFlags = ts.getFunctionFlags(func);
+            var type = returnType && getReturnOrPromisedType(returnType, functionFlags);
             // Functions with with an explicitly specified 'void' or 'any' return type don't need any return expressions.
-            if (returnType && maybeTypeOfKind(returnType, 1 /* Any */ | 16384 /* Void */)) {
+            if (type && maybeTypeOfKind(type, 1 /* Any */ | 16384 /* Void */)) {
                 return;
             }
             // If all we have is a function signature, or an arrow function with an expression body, then there is nothing to check.
             // also if HasImplicitReturn flag is not set this means that all codepaths in function body end with return or throw
-            if (func.kind === 155 /* MethodSignature */ || ts.nodeIsMissing(func.body) || func.body.kind !== 218 /* Block */ || !functionHasImplicitReturn(func)) {
+            if (func.kind === 156 /* MethodSignature */ || ts.nodeIsMissing(func.body) || func.body.kind !== 219 /* Block */ || !functionHasImplicitReturn(func)) {
                 return;
             }
             var hasExplicitReturn = func.flags & 256 /* HasExplicitReturn */;
-            if (returnType && returnType.flags & 131072 /* Never */) {
+            if (type && type.flags & 131072 /* Never */) {
                 error(ts.getEffectiveReturnTypeNode(func), ts.Diagnostics.A_function_returning_never_cannot_have_a_reachable_end_point);
             }
-            else if (returnType && !hasExplicitReturn) {
+            else if (type && !hasExplicitReturn) {
                 // minimal check: function has syntactic return type annotation and no explicit return statements in the body
                 // this function does not conform to the specification.
                 // NOTE: having returnType !== undefined is a precondition for entering this branch so func.type will always be present
                 error(ts.getEffectiveReturnTypeNode(func), ts.Diagnostics.A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value);
             }
-            else if (returnType && strictNullChecks && !isTypeAssignableTo(undefinedType, returnType)) {
+            else if (type && strictNullChecks && !isTypeAssignableTo(undefinedType, type)) {
                 error(ts.getEffectiveReturnTypeNode(func), ts.Diagnostics.Function_lacks_ending_return_statement_and_return_type_does_not_include_undefined);
             }
             else if (compilerOptions.noImplicitReturns) {
-                if (!returnType) {
+                if (!type) {
                     // If return type annotation is omitted check if function has any explicit return statements.
                     // If it does not have any - its inferred return type is void - don't do any checks.
                     // Otherwise get inferred return type from function body and report error only if it is not void / anytype
@@ -51632,34 +53336,38 @@ var ts;
             }
         }
         function checkFunctionExpressionOrObjectLiteralMethod(node, checkMode) {
-            ts.Debug.assert(node.kind !== 156 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 157 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
             checkNodeDeferred(node);
             // The identityMapper object is used to indicate that function expressions are wildcards
             if (checkMode && checkMode & 4 /* SkipContextSensitive */ && isContextSensitive(node)) {
                 // Skip parameters, return signature with return type that retains noncontextual parts so inferences can still be drawn in an early stage
                 if (!ts.getEffectiveReturnTypeNode(node) && hasContextSensitiveReturnExpression(node)) {
-                    var links_1 = getNodeLinks(node);
-                    if (links_1.contextFreeType) {
-                        return links_1.contextFreeType;
+                    var links = getNodeLinks(node);
+                    if (links.contextFreeType) {
+                        return links.contextFreeType;
                     }
                     var returnType = getReturnTypeFromBody(node, checkMode);
                     var returnOnlySignature = createSignature(undefined, undefined, undefined, ts.emptyArray, returnType, /*resolvedTypePredicate*/ undefined, 0, /*hasRestParameter*/ false, /*hasLiteralTypes*/ false);
                     var returnOnlyType = createAnonymousType(node.symbol, emptySymbols, [returnOnlySignature], ts.emptyArray, undefined, undefined);
-                    returnOnlyType.objectFlags |= 524288 /* ContainsAnyFunctionType */;
-                    return links_1.contextFreeType = returnOnlyType;
+                    returnOnlyType.objectFlags |= 1048576 /* NonInferrableType */;
+                    return links.contextFreeType = returnOnlyType;
                 }
                 return anyFunctionType;
             }
             // Grammar checking
             var hasGrammarError = checkGrammarFunctionLikeDeclaration(node);
-            if (!hasGrammarError && node.kind === 196 /* FunctionExpression */) {
+            if (!hasGrammarError && node.kind === 197 /* FunctionExpression */) {
                 checkGrammarForGenerator(node);
             }
-            var links = getNodeLinks(node);
             var type = getTypeOfSymbol(getMergedSymbol(node.symbol));
             if (isTypeAny(type)) {
                 return type;
             }
+            contextuallyCheckFunctionExpressionOrObjectLiteralMethod(node, checkMode);
+            return type;
+        }
+        function contextuallyCheckFunctionExpressionOrObjectLiteralMethod(node, checkMode) {
+            var links = getNodeLinks(node);
             // Check if function expression is contextually typed and assign parameter types if so.
             if (!(links.flags & 1024 /* ContextChecked */)) {
                 var contextualSignature = getContextualSignature(node);
@@ -51669,14 +53377,18 @@ var ts;
                 if (!(links.flags & 1024 /* ContextChecked */)) {
                     links.flags |= 1024 /* ContextChecked */;
                     if (contextualSignature) {
+                        var type = getTypeOfSymbol(getMergedSymbol(node.symbol));
+                        if (isTypeAny(type)) {
+                            return;
+                        }
                         var signature = getSignaturesOfType(type, 0 /* Call */)[0];
                         if (isContextSensitive(node)) {
-                            var contextualMapper = getContextualMapper(node);
+                            var inferenceContext = getInferenceContext(node);
                             if (checkMode && checkMode & 2 /* Inferential */) {
-                                inferFromAnnotatedParameters(signature, contextualSignature, contextualMapper);
+                                inferFromAnnotatedParameters(signature, contextualSignature, inferenceContext);
                             }
-                            var instantiatedContextualSignature = contextualMapper === identityMapper ?
-                                contextualSignature : instantiateSignature(contextualSignature, contextualMapper);
+                            var instantiatedContextualSignature = inferenceContext ?
+                                instantiateSignature(contextualSignature, inferenceContext.mapper) : contextualSignature;
                             assignContextualParameterTypes(signature, instantiatedContextualSignature);
                         }
                         if (!getReturnTypeFromAnnotation(node) && !signature.resolvedReturnType) {
@@ -51689,21 +53401,19 @@ var ts;
                     checkSignatureDeclaration(node);
                 }
             }
-            return type;
         }
-        function getReturnOrPromisedType(node, functionFlags) {
-            var type = getReturnTypeFromAnnotation(node);
-            return type && ((functionFlags & 3 /* AsyncGenerator */) === 2 /* Async */) ?
-                getAwaitedType(type) || errorType : type;
+        function getReturnOrPromisedType(type, functionFlags) {
+            var isGenerator = !!(functionFlags & 1 /* Generator */);
+            var isAsync = !!(functionFlags & 2 /* Async */);
+            return type && isGenerator ? getIterationTypeOfGeneratorFunctionReturnType(1 /* Return */, type, isAsync) || errorType :
+                type && isAsync ? getAwaitedType(type) || errorType :
+                    type;
         }
         function checkFunctionExpressionOrObjectLiteralMethodDeferred(node) {
-            ts.Debug.assert(node.kind !== 156 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 157 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
             var functionFlags = ts.getFunctionFlags(node);
-            var returnOrPromisedType = getReturnOrPromisedType(node, functionFlags);
-            if ((functionFlags & 1 /* Generator */) === 0) { // Async function or normal function
-                // return is not necessary in the body of generators
-                checkAllCodePathsInNonVoidFunctionReturnOrThrow(node, returnOrPromisedType);
-            }
+            var returnType = getReturnTypeFromAnnotation(node);
+            checkAllCodePathsInNonVoidFunctionReturnOrThrow(node, returnType);
             if (node.body) {
                 if (!ts.getEffectiveReturnTypeNode(node)) {
                     // There are some checks that are only performed in getReturnTypeFromBody, that may produce errors
@@ -51713,7 +53423,7 @@ var ts;
                     // checkFunctionExpressionBodies). So it must be done now.
                     getReturnTypeOfSignature(getSignatureFromDeclaration(node));
                 }
-                if (node.body.kind === 218 /* Block */) {
+                if (node.body.kind === 219 /* Block */) {
                     checkSourceElement(node.body);
                 }
                 else {
@@ -51723,6 +53433,7 @@ var ts;
                     // check assignability of the awaited type of the expression body against the promised type of
                     // its return type annotation.
                     var exprType = checkExpression(node.body);
+                    var returnOrPromisedType = getReturnOrPromisedType(returnType, functionFlags);
                     if (returnOrPromisedType) {
                         if ((functionFlags & 3 /* AsyncGenerator */) === 2 /* Async */) { // Async function
                             var awaitedType = checkAwaitedType(exprType, node.body, ts.Diagnostics.The_return_type_of_an_async_function_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member);
@@ -51735,9 +53446,11 @@ var ts;
                 }
             }
         }
-        function checkArithmeticOperandType(operand, type, diagnostic) {
+        function checkArithmeticOperandType(operand, type, diagnostic, isAwaitValid) {
+            if (isAwaitValid === void 0) { isAwaitValid = false; }
             if (!isTypeAssignableTo(type, numberOrBigIntType)) {
-                error(operand, diagnostic);
+                var awaitedType = isAwaitValid && getAwaitedTypeOfPromise(type);
+                errorAndMaybeSuggestAwait(operand, !!awaitedType && isTypeAssignableTo(awaitedType, numberOrBigIntType), diagnostic);
                 return false;
             }
             return true;
@@ -51791,11 +53504,11 @@ var ts;
             if (isReadonlySymbol(symbol)) {
                 // Allow assignments to readonly properties within constructors of the same class declaration.
                 if (symbol.flags & 4 /* Property */ &&
-                    (expr.kind === 189 /* PropertyAccessExpression */ || expr.kind === 190 /* ElementAccessExpression */) &&
-                    expr.expression.kind === 100 /* ThisKeyword */) {
+                    (expr.kind === 190 /* PropertyAccessExpression */ || expr.kind === 191 /* ElementAccessExpression */) &&
+                    expr.expression.kind === 101 /* ThisKeyword */) {
                     // Look for if this is the constructor for the class that `symbol` is a property of.
                     var func = ts.getContainingFunction(expr);
-                    if (!(func && func.kind === 157 /* Constructor */)) {
+                    if (!(func && func.kind === 158 /* Constructor */)) {
                         return true;
                     }
                     // If func.parent is a class and symbol is a (readonly) property of that class, or
@@ -51808,13 +53521,13 @@ var ts;
             return false;
         }
         function isReferenceThroughNamespaceImport(expr) {
-            if (expr.kind === 189 /* PropertyAccessExpression */ || expr.kind === 190 /* ElementAccessExpression */) {
+            if (expr.kind === 190 /* PropertyAccessExpression */ || expr.kind === 191 /* ElementAccessExpression */) {
                 var node = ts.skipParentheses(expr.expression);
-                if (node.kind === 72 /* Identifier */) {
+                if (node.kind === 73 /* Identifier */) {
                     var symbol = getNodeLinks(node).resolvedSymbol;
                     if (symbol.flags & 2097152 /* Alias */) {
                         var declaration = getDeclarationOfAliasSymbol(symbol);
-                        return !!declaration && declaration.kind === 251 /* NamespaceImport */;
+                        return !!declaration && declaration.kind === 252 /* NamespaceImport */;
                     }
                 }
             }
@@ -51823,7 +53536,7 @@ var ts;
         function checkReferenceExpression(expr, invalidReferenceMessage) {
             // References are combinations of identifiers, parentheses, and property accesses.
             var node = ts.skipOuterExpressions(expr, 2 /* Assertions */ | 1 /* Parentheses */);
-            if (node.kind !== 72 /* Identifier */ && node.kind !== 189 /* PropertyAccessExpression */ && node.kind !== 190 /* ElementAccessExpression */) {
+            if (node.kind !== 73 /* Identifier */ && node.kind !== 190 /* PropertyAccessExpression */ && node.kind !== 191 /* ElementAccessExpression */) {
                 error(expr, invalidReferenceMessage);
                 return false;
             }
@@ -51832,7 +53545,7 @@ var ts;
         function checkDeleteExpression(node) {
             checkExpression(node.expression);
             var expr = ts.skipParentheses(node.expression);
-            if (expr.kind !== 189 /* PropertyAccessExpression */ && expr.kind !== 190 /* ElementAccessExpression */) {
+            if (expr.kind !== 190 /* PropertyAccessExpression */ && expr.kind !== 191 /* ElementAccessExpression */) {
                 error(expr, ts.Diagnostics.The_operand_of_a_delete_operator_must_be_a_property_reference);
                 return booleanType;
             }
@@ -51855,7 +53568,19 @@ var ts;
             // Grammar checking
             if (produceDiagnostics) {
                 if (!(node.flags & 16384 /* AwaitContext */)) {
-                    grammarErrorOnFirstToken(node, ts.Diagnostics.await_expression_is_only_allowed_within_an_async_function);
+                    // use of 'await' in non-async function
+                    var sourceFile = ts.getSourceFileOfNode(node);
+                    if (!hasParseDiagnostics(sourceFile)) {
+                        var span = ts.getSpanOfTokenAtPosition(sourceFile, node.pos);
+                        var diagnostic = ts.createFileDiagnostic(sourceFile, span.start, span.length, ts.Diagnostics.await_expression_is_only_allowed_within_an_async_function);
+                        var func = ts.getContainingFunction(node);
+                        if (func && func.kind !== 158 /* Constructor */) {
+                            ts.Debug.assert((ts.getFunctionFlags(func) & 2 /* Async */) === 0, "Enclosing function should never be an async function.");
+                            var relatedInfo = ts.createDiagnosticForNode(func, ts.Diagnostics.Did_you_mean_to_mark_this_function_as_async);
+                            ts.addRelatedInfo(diagnostic, relatedInfo);
+                        }
+                        diagnostics.add(diagnostic);
+                    }
                 }
                 if (isInParameterInitializerBeforeContainingFunction(node)) {
                     error(node, ts.Diagnostics.await_expressions_cannot_be_used_in_a_parameter_initializer);
@@ -52027,16 +53752,17 @@ var ts;
             if (strictNullChecks && properties.length === 0) {
                 return checkNonNullType(sourceType, node);
             }
-            for (var _i = 0, properties_6 = properties; _i < properties_6.length; _i++) {
-                var p = properties_6[_i];
-                checkObjectLiteralDestructuringPropertyAssignment(sourceType, p, properties, rightIsThis);
+            for (var i = 0; i < properties.length; i++) {
+                checkObjectLiteralDestructuringPropertyAssignment(node, sourceType, i, properties, rightIsThis);
             }
             return sourceType;
         }
         /** Note: If property cannot be a SpreadAssignment, then allProperties does not need to be provided */
-        function checkObjectLiteralDestructuringPropertyAssignment(objectLiteralType, property, allProperties, rightIsThis) {
+        function checkObjectLiteralDestructuringPropertyAssignment(node, objectLiteralType, propertyIndex, allProperties, rightIsThis) {
             if (rightIsThis === void 0) { rightIsThis = false; }
-            if (property.kind === 275 /* PropertyAssignment */ || property.kind === 276 /* ShorthandPropertyAssignment */) {
+            var properties = node.properties;
+            var property = properties[propertyIndex];
+            if (property.kind === 276 /* PropertyAssignment */ || property.kind === 277 /* ShorthandPropertyAssignment */) {
                 var name = property.name;
                 var exprType = getLiteralTypeFromPropertyName(name);
                 if (isTypeUsableAsPropertyName(exprType)) {
@@ -52049,21 +53775,29 @@ var ts;
                 }
                 var elementType = getIndexedAccessType(objectLiteralType, exprType, name);
                 var type = getFlowTypeOfDestructuring(property, elementType);
-                return checkDestructuringAssignment(property.kind === 276 /* ShorthandPropertyAssignment */ ? property : property.initializer, type);
+                return checkDestructuringAssignment(property.kind === 277 /* ShorthandPropertyAssignment */ ? property : property.initializer, type);
             }
-            else if (property.kind === 277 /* SpreadAssignment */) {
-                if (languageVersion < 7 /* ESNext */) {
-                    checkExternalEmitHelpers(property, 4 /* Rest */);
+            else if (property.kind === 278 /* SpreadAssignment */) {
+                if (propertyIndex < properties.length - 1) {
+                    error(property, ts.Diagnostics.A_rest_element_must_be_last_in_a_destructuring_pattern);
                 }
-                var nonRestNames = [];
-                if (allProperties) {
-                    for (var i = 0; i < allProperties.length - 1; i++) {
-                        nonRestNames.push(allProperties[i].name);
+                else {
+                    if (languageVersion < 99 /* ESNext */) {
+                        checkExternalEmitHelpers(property, 4 /* Rest */);
                     }
+                    var nonRestNames = [];
+                    if (allProperties) {
+                        for (var _i = 0, allProperties_1 = allProperties; _i < allProperties_1.length; _i++) {
+                            var otherProperty = allProperties_1[_i];
+                            if (!ts.isSpreadAssignment(otherProperty)) {
+                                nonRestNames.push(otherProperty.name);
+                            }
+                        }
+                    }
+                    var type = getRestType(objectLiteralType, nonRestNames, objectLiteralType.symbol);
+                    checkGrammarForDisallowedTrailingComma(allProperties, ts.Diagnostics.A_rest_parameter_or_binding_pattern_may_not_have_a_trailing_comma);
+                    return checkDestructuringAssignment(property.expression, type);
                 }
-                var type = getRestType(objectLiteralType, nonRestNames, objectLiteralType.symbol);
-                checkGrammarForDisallowedTrailingComma(allProperties, ts.Diagnostics.A_rest_parameter_or_binding_pattern_may_not_have_a_trailing_comma);
-                return checkDestructuringAssignment(property.expression, type);
             }
             else {
                 error(property, ts.Diagnostics.Property_assignment_expected);
@@ -52077,7 +53811,7 @@ var ts;
             // This elementType will be used if the specific property corresponding to this index is not
             // present (aka the tuple element property). This call also checks that the parentType is in
             // fact an iterable or array (depending on target language).
-            var elementType = checkIteratedTypeOrElementType(sourceType, node, /*allowStringInput*/ false, /*allowAsyncIterables*/ false) || errorType;
+            var elementType = checkIteratedTypeOrElementType(65 /* Destructuring */, sourceType, undefinedType, node) || errorType;
             for (var i = 0; i < elements.length; i++) {
                 checkArrayLiteralDestructuringElementAssignment(node, sourceType, i, elementType, checkMode);
             }
@@ -52086,14 +53820,16 @@ var ts;
         function checkArrayLiteralDestructuringElementAssignment(node, sourceType, elementIndex, elementType, checkMode) {
             var elements = node.elements;
             var element = elements[elementIndex];
-            if (element.kind !== 210 /* OmittedExpression */) {
-                if (element.kind !== 208 /* SpreadElement */) {
+            if (element.kind !== 211 /* OmittedExpression */) {
+                if (element.kind !== 209 /* SpreadElement */) {
                     var indexType = getLiteralType(elementIndex);
                     if (isArrayLikeType(sourceType)) {
                         // We create a synthetic expression so that getIndexedAccessType doesn't get confused
                         // when the element is a SyntaxKind.ElementAccessExpression.
-                        var elementType_2 = getIndexedAccessType(sourceType, indexType, createSyntheticExpression(element, indexType));
-                        var type = getFlowTypeOfDestructuring(element, elementType_2);
+                        var accessFlags = hasDefaultValue(element) ? 8 /* NoTupleBoundsCheck */ : 0;
+                        var elementType_2 = getIndexedAccessTypeOrUndefined(sourceType, indexType, createSyntheticExpression(element, indexType), accessFlags) || errorType;
+                        var assignedType = hasDefaultValue(element) ? getTypeWithFacts(elementType_2, 524288 /* NEUndefined */) : elementType_2;
+                        var type = getFlowTypeOfDestructuring(element, assignedType);
                         return checkDestructuringAssignment(element, type, checkMode);
                     }
                     return checkDestructuringAssignment(element, elementType, checkMode);
@@ -52103,7 +53839,7 @@ var ts;
                 }
                 else {
                     var restExpression = element.expression;
-                    if (restExpression.kind === 204 /* BinaryExpression */ && restExpression.operatorToken.kind === 59 /* EqualsToken */) {
+                    if (restExpression.kind === 205 /* BinaryExpression */ && restExpression.operatorToken.kind === 60 /* EqualsToken */) {
                         error(restExpression.operatorToken, ts.Diagnostics.A_rest_element_cannot_have_an_initializer);
                     }
                     else {
@@ -52119,7 +53855,7 @@ var ts;
         }
         function checkDestructuringAssignment(exprOrAssignment, sourceType, checkMode, rightIsThis) {
             var target;
-            if (exprOrAssignment.kind === 276 /* ShorthandPropertyAssignment */) {
+            if (exprOrAssignment.kind === 277 /* ShorthandPropertyAssignment */) {
                 var prop = exprOrAssignment;
                 if (prop.objectAssignmentInitializer) {
                     // In strict null checking mode, if a default value of a non-undefined type is specified, remove
@@ -52135,21 +53871,21 @@ var ts;
             else {
                 target = exprOrAssignment;
             }
-            if (target.kind === 204 /* BinaryExpression */ && target.operatorToken.kind === 59 /* EqualsToken */) {
+            if (target.kind === 205 /* BinaryExpression */ && target.operatorToken.kind === 60 /* EqualsToken */) {
                 checkBinaryExpression(target, checkMode);
                 target = target.left;
             }
-            if (target.kind === 188 /* ObjectLiteralExpression */) {
+            if (target.kind === 189 /* ObjectLiteralExpression */) {
                 return checkObjectLiteralAssignment(target, sourceType, rightIsThis);
             }
-            if (target.kind === 187 /* ArrayLiteralExpression */) {
+            if (target.kind === 188 /* ArrayLiteralExpression */) {
                 return checkArrayLiteralAssignment(target, sourceType, checkMode);
             }
             return checkReferenceAssignment(target, sourceType, checkMode);
         }
         function checkReferenceAssignment(target, sourceType, checkMode) {
             var targetType = checkExpression(target, checkMode);
-            var error = target.parent.kind === 277 /* SpreadAssignment */ ?
+            var error = target.parent.kind === 278 /* SpreadAssignment */ ?
                 ts.Diagnostics.The_target_of_an_object_rest_assignment_must_be_a_variable_or_a_property_access :
                 ts.Diagnostics.The_left_hand_side_of_an_assignment_expression_must_be_a_variable_or_a_property_access;
             if (checkReferenceExpression(target, error)) {
@@ -52168,39 +53904,39 @@ var ts;
         function isSideEffectFree(node) {
             node = ts.skipParentheses(node);
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                 case 10 /* StringLiteral */:
                 case 13 /* RegularExpressionLiteral */:
-                case 193 /* TaggedTemplateExpression */:
-                case 206 /* TemplateExpression */:
+                case 194 /* TaggedTemplateExpression */:
+                case 207 /* TemplateExpression */:
                 case 14 /* NoSubstitutionTemplateLiteral */:
                 case 8 /* NumericLiteral */:
                 case 9 /* BigIntLiteral */:
-                case 102 /* TrueKeyword */:
-                case 87 /* FalseKeyword */:
-                case 96 /* NullKeyword */:
-                case 141 /* UndefinedKeyword */:
-                case 196 /* FunctionExpression */:
-                case 209 /* ClassExpression */:
-                case 197 /* ArrowFunction */:
-                case 187 /* ArrayLiteralExpression */:
-                case 188 /* ObjectLiteralExpression */:
-                case 199 /* TypeOfExpression */:
-                case 213 /* NonNullExpression */:
-                case 261 /* JsxSelfClosingElement */:
-                case 260 /* JsxElement */:
+                case 103 /* TrueKeyword */:
+                case 88 /* FalseKeyword */:
+                case 97 /* NullKeyword */:
+                case 142 /* UndefinedKeyword */:
+                case 197 /* FunctionExpression */:
+                case 210 /* ClassExpression */:
+                case 198 /* ArrowFunction */:
+                case 188 /* ArrayLiteralExpression */:
+                case 189 /* ObjectLiteralExpression */:
+                case 200 /* TypeOfExpression */:
+                case 214 /* NonNullExpression */:
+                case 262 /* JsxSelfClosingElement */:
+                case 261 /* JsxElement */:
                     return true;
-                case 205 /* ConditionalExpression */:
+                case 206 /* ConditionalExpression */:
                     return isSideEffectFree(node.whenTrue) &&
                         isSideEffectFree(node.whenFalse);
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     if (ts.isAssignmentOperator(node.operatorToken.kind)) {
                         return false;
                     }
                     return isSideEffectFree(node.left) &&
                         isSideEffectFree(node.right);
-                case 202 /* PrefixUnaryExpression */:
-                case 203 /* PostfixUnaryExpression */:
+                case 203 /* PrefixUnaryExpression */:
+                case 204 /* PostfixUnaryExpression */:
                     // Unary operators ~, !, +, and - have no side effects.
                     // The rest do.
                     switch (node.operator) {
@@ -52212,9 +53948,9 @@ var ts;
                     }
                     return false;
                 // Some forms listed here for clarity
-                case 200 /* VoidExpression */: // Explicit opt-out
-                case 194 /* TypeAssertionExpression */: // Not SEF, but can produce useful type warnings
-                case 212 /* AsExpression */: // Not SEF, but can produce useful type warnings
+                case 201 /* VoidExpression */: // Explicit opt-out
+                case 195 /* TypeAssertionExpression */: // Not SEF, but can produce useful type warnings
+                case 213 /* AsExpression */: // Not SEF, but can produce useful type warnings
                 default:
                     return false;
             }
@@ -52230,8 +53966,8 @@ var ts;
         }
         function checkBinaryLikeExpression(left, operatorToken, right, checkMode, errorNode) {
             var operator = operatorToken.kind;
-            if (operator === 59 /* EqualsToken */ && (left.kind === 188 /* ObjectLiteralExpression */ || left.kind === 187 /* ArrayLiteralExpression */)) {
-                return checkDestructuringAssignment(left, checkExpression(right, checkMode), checkMode, right.kind === 100 /* ThisKeyword */);
+            if (operator === 60 /* EqualsToken */ && (left.kind === 189 /* ObjectLiteralExpression */ || left.kind === 188 /* ArrayLiteralExpression */)) {
+                return checkDestructuringAssignment(left, checkExpression(right, checkMode), checkMode, right.kind === 101 /* ThisKeyword */);
             }
             var leftType;
             if (operator === 54 /* AmpersandAmpersandToken */ || operator === 55 /* BarBarToken */) {
@@ -52244,26 +53980,26 @@ var ts;
             switch (operator) {
                 case 40 /* AsteriskToken */:
                 case 41 /* AsteriskAsteriskToken */:
-                case 62 /* AsteriskEqualsToken */:
-                case 63 /* AsteriskAsteriskEqualsToken */:
+                case 63 /* AsteriskEqualsToken */:
+                case 64 /* AsteriskAsteriskEqualsToken */:
                 case 42 /* SlashToken */:
-                case 64 /* SlashEqualsToken */:
+                case 65 /* SlashEqualsToken */:
                 case 43 /* PercentToken */:
-                case 65 /* PercentEqualsToken */:
+                case 66 /* PercentEqualsToken */:
                 case 39 /* MinusToken */:
-                case 61 /* MinusEqualsToken */:
+                case 62 /* MinusEqualsToken */:
                 case 46 /* LessThanLessThanToken */:
-                case 66 /* LessThanLessThanEqualsToken */:
+                case 67 /* LessThanLessThanEqualsToken */:
                 case 47 /* GreaterThanGreaterThanToken */:
-                case 67 /* GreaterThanGreaterThanEqualsToken */:
+                case 68 /* GreaterThanGreaterThanEqualsToken */:
                 case 48 /* GreaterThanGreaterThanGreaterThanToken */:
-                case 68 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
+                case 69 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
                 case 50 /* BarToken */:
-                case 70 /* BarEqualsToken */:
+                case 71 /* BarEqualsToken */:
                 case 51 /* CaretToken */:
-                case 71 /* CaretEqualsToken */:
+                case 72 /* CaretEqualsToken */:
                 case 49 /* AmpersandToken */:
-                case 69 /* AmpersandEqualsToken */:
+                case 70 /* AmpersandEqualsToken */:
                     if (leftType === silentNeverType || rightType === silentNeverType) {
                         return silentNeverType;
                     }
@@ -52280,8 +54016,8 @@ var ts;
                     }
                     else {
                         // otherwise just check each operand separately and report errors as normal
-                        var leftOk = checkArithmeticOperandType(left, leftType, ts.Diagnostics.The_left_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_bigint_or_an_enum_type);
-                        var rightOk = checkArithmeticOperandType(right, rightType, ts.Diagnostics.The_right_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_bigint_or_an_enum_type);
+                        var leftOk = checkArithmeticOperandType(left, leftType, ts.Diagnostics.The_left_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_bigint_or_an_enum_type, /*isAwaitValid*/ true);
+                        var rightOk = checkArithmeticOperandType(right, rightType, ts.Diagnostics.The_right_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_bigint_or_an_enum_type, /*isAwaitValid*/ true);
                         var resultType_1;
                         // If both are any or unknown, allow operation; assume it will resolve to number
                         if ((isTypeAssignableToKind(leftType, 3 /* AnyOrUnknown */) && isTypeAssignableToKind(rightType, 3 /* AnyOrUnknown */)) ||
@@ -52289,17 +54025,18 @@ var ts;
                             !(maybeTypeOfKind(leftType, 2112 /* BigIntLike */) || maybeTypeOfKind(rightType, 2112 /* BigIntLike */))) {
                             resultType_1 = numberType;
                         }
-                        // At least one is assignable to bigint, so both should be only assignable to bigint
+                        // At least one is assignable to bigint, so check that both are
                         else if (isTypeAssignableToKind(leftType, 2112 /* BigIntLike */) && isTypeAssignableToKind(rightType, 2112 /* BigIntLike */)) {
                             switch (operator) {
                                 case 48 /* GreaterThanGreaterThanGreaterThanToken */:
-                                case 68 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
+                                case 69 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
                                     reportOperatorError();
                             }
                             resultType_1 = bigintType;
                         }
+                        // Exactly one of leftType/rightType is assignable to bigint
                         else {
-                            reportOperatorError();
+                            reportOperatorError(function (awaitedLeft, awaitedRight) { return isTypeAssignableToKind(awaitedLeft, 2112 /* BigIntLike */) && isTypeAssignableToKind(awaitedRight, 2112 /* BigIntLike */); });
                             resultType_1 = errorType;
                         }
                         if (leftOk && rightOk) {
@@ -52308,7 +54045,7 @@ var ts;
                         return resultType_1;
                     }
                 case 38 /* PlusToken */:
-                case 60 /* PlusEqualsToken */:
+                case 61 /* PlusEqualsToken */:
                     if (leftType === silentNeverType || rightType === silentNeverType) {
                         return silentNeverType;
                     }
@@ -52340,10 +54077,18 @@ var ts;
                         return resultType;
                     }
                     if (!resultType) {
-                        reportOperatorError();
+                        // Types that have a reasonably good chance of being a valid operand type.
+                        // If both types have an awaited type of one of these, we’ll assume the user
+                        // might be missing an await without doing an exhaustive check that inserting
+                        // await(s) will actually be a completely valid binary expression.
+                        var closeEnoughKind_1 = 296 /* NumberLike */ | 2112 /* BigIntLike */ | 132 /* StringLike */ | 3 /* AnyOrUnknown */;
+                        reportOperatorError(function (awaitedLeft, awaitedRight) {
+                            return isTypeAssignableToKind(awaitedLeft, closeEnoughKind_1) &&
+                                isTypeAssignableToKind(awaitedRight, closeEnoughKind_1);
+                        });
                         return anyType;
                     }
-                    if (operator === 60 /* PlusEqualsToken */) {
+                    if (operator === 61 /* PlusEqualsToken */) {
                         checkAssignmentOperator(resultType);
                     }
                     return resultType;
@@ -52354,29 +54099,20 @@ var ts;
                     if (checkForDisallowedESSymbolOperand(operator)) {
                         leftType = getBaseTypeOfLiteralType(checkNonNullType(leftType, left));
                         rightType = getBaseTypeOfLiteralType(checkNonNullType(rightType, right));
-                        if (!(isTypeComparableTo(leftType, rightType) || isTypeComparableTo(rightType, leftType) ||
-                            (isTypeAssignableTo(leftType, numberOrBigIntType) && isTypeAssignableTo(rightType, numberOrBigIntType)))) {
-                            reportOperatorError();
-                        }
+                        reportOperatorErrorUnless(function (left, right) {
+                            return isTypeComparableTo(left, right) || isTypeComparableTo(right, left) || (isTypeAssignableTo(left, numberOrBigIntType) && isTypeAssignableTo(right, numberOrBigIntType));
+                        });
                     }
                     return booleanType;
                 case 33 /* EqualsEqualsToken */:
                 case 34 /* ExclamationEqualsToken */:
                 case 35 /* EqualsEqualsEqualsToken */:
                 case 36 /* ExclamationEqualsEqualsToken */:
-                    var leftIsLiteral = isLiteralType(leftType);
-                    var rightIsLiteral = isLiteralType(rightType);
-                    if (!leftIsLiteral || !rightIsLiteral) {
-                        leftType = leftIsLiteral ? getBaseTypeOfLiteralType(leftType) : leftType;
-                        rightType = rightIsLiteral ? getBaseTypeOfLiteralType(rightType) : rightType;
-                    }
-                    if (!isTypeEqualityComparableTo(leftType, rightType) && !isTypeEqualityComparableTo(rightType, leftType)) {
-                        reportOperatorError();
-                    }
+                    reportOperatorErrorUnless(function (left, right) { return isTypeEqualityComparableTo(left, right) || isTypeEqualityComparableTo(right, left); });
                     return booleanType;
-                case 94 /* InstanceOfKeyword */:
+                case 95 /* InstanceOfKeyword */:
                     return checkInstanceOfExpression(left, right, leftType, rightType);
-                case 93 /* InKeyword */:
+                case 94 /* InKeyword */:
                     return checkInExpression(left, right, leftType, rightType);
                 case 54 /* AmpersandAmpersandToken */:
                     return getTypeFacts(leftType) & 4194304 /* Truthy */ ?
@@ -52386,7 +54122,7 @@ var ts;
                     return getTypeFacts(leftType) & 8388608 /* Falsy */ ?
                         getUnionType([removeDefinitelyFalsyTypes(leftType), rightType], 2 /* Subtype */) :
                         leftType;
-                case 59 /* EqualsToken */:
+                case 60 /* EqualsToken */:
                     var declKind = ts.isBinaryExpression(left.parent) ? ts.getAssignmentDeclarationKind(left.parent) : 0 /* None */;
                     checkAssignmentDeclaration(declKind, rightType);
                     if (isAssignmentDeclaration(declKind)) {
@@ -52430,7 +54166,7 @@ var ts;
                 }
             }
             function isEvalNode(node) {
-                return node.kind === 72 /* Identifier */ && node.escapedText === "eval";
+                return node.kind === 73 /* Identifier */ && node.escapedText === "eval";
             }
             // Return true if there was no error, false if there was an error.
             function checkForDisallowedESSymbolOperand(operator) {
@@ -52446,13 +54182,13 @@ var ts;
             function getSuggestedBooleanOperator(operator) {
                 switch (operator) {
                     case 50 /* BarToken */:
-                    case 70 /* BarEqualsToken */:
+                    case 71 /* BarEqualsToken */:
                         return 55 /* BarBarToken */;
                     case 51 /* CaretToken */:
-                    case 71 /* CaretEqualsToken */:
+                    case 72 /* CaretEqualsToken */:
                         return 36 /* ExclamationEqualsEqualsToken */;
                     case 49 /* AmpersandToken */:
-                    case 69 /* AmpersandEqualsToken */:
+                    case 70 /* AmpersandEqualsToken */:
                         return 54 /* AmpersandAmpersandToken */;
                     default:
                         return undefined;
@@ -52490,22 +54226,44 @@ var ts;
                         return false;
                 }
             }
-            function reportOperatorError() {
-                var leftStr = typeToString(leftType);
-                var rightStr = typeToString(rightType);
+            /**
+             * Returns true if an error is reported
+             */
+            function reportOperatorErrorUnless(typesAreCompatible) {
+                if (!typesAreCompatible(leftType, rightType)) {
+                    reportOperatorError(typesAreCompatible);
+                    return true;
+                }
+                return false;
+            }
+            function reportOperatorError(awaitedTypesAreCompatible) {
+                var wouldWorkWithAwait = false;
                 var errNode = errorNode || operatorToken;
-                if (!tryGiveBetterPrimaryError(errNode, leftStr, rightStr)) {
-                    error(errNode, ts.Diagnostics.Operator_0_cannot_be_applied_to_types_1_and_2, ts.tokenToString(operatorToken.kind), leftStr, rightStr);
+                var _a = getTypeNamesForErrorDisplay(leftType, rightType), leftStr = _a[0], rightStr = _a[1];
+                if (awaitedTypesAreCompatible) {
+                    var awaitedLeftType = getAwaitedType(leftType);
+                    var awaitedRightType = getAwaitedType(rightType);
+                    wouldWorkWithAwait = !(awaitedLeftType === leftType && awaitedRightType === rightType)
+                        && !!(awaitedLeftType && awaitedRightType)
+                        && awaitedTypesAreCompatible(awaitedLeftType, awaitedRightType);
+                }
+                if (!tryGiveBetterPrimaryError(errNode, wouldWorkWithAwait, leftStr, rightStr)) {
+                    errorAndMaybeSuggestAwait(errNode, wouldWorkWithAwait, ts.Diagnostics.Operator_0_cannot_be_applied_to_types_1_and_2, ts.tokenToString(operatorToken.kind), leftStr, rightStr);
                 }
             }
-            function tryGiveBetterPrimaryError(errNode, leftStr, rightStr) {
+            function tryGiveBetterPrimaryError(errNode, maybeMissingAwait, leftStr, rightStr) {
+                var typeName;
                 switch (operatorToken.kind) {
                     case 35 /* EqualsEqualsEqualsToken */:
                     case 33 /* EqualsEqualsToken */:
-                        return error(errNode, ts.Diagnostics.This_condition_will_always_return_0_since_the_types_1_and_2_have_no_overlap, "false", leftStr, rightStr);
+                        typeName = "false";
+                        break;
                     case 36 /* ExclamationEqualsEqualsToken */:
                     case 34 /* ExclamationEqualsToken */:
-                        return error(errNode, ts.Diagnostics.This_condition_will_always_return_0_since_the_types_1_and_2_have_no_overlap, "true", leftStr, rightStr);
+                        typeName = "true";
+                }
+                if (typeName) {
+                    return errorAndMaybeSuggestAwait(errNode, maybeMissingAwait, ts.Diagnostics.This_condition_will_always_return_0_since_the_types_1_and_2_have_no_overlap, typeName, leftStr, rightStr);
                 }
                 return undefined;
             }
@@ -52543,30 +54301,45 @@ var ts;
                 // If the user's code is syntactically correct, the func should always have a star. After all, we are in a yield context.
                 return anyType;
             }
+            var isAsync = (functionFlags & 2 /* Async */) !== 0;
             if (node.asteriskToken) {
                 // Async generator functions prior to ESNext require the __await, __asyncDelegator,
                 // and __asyncValues helpers
-                if ((functionFlags & 3 /* AsyncGenerator */) === 3 /* AsyncGenerator */ &&
-                    languageVersion < 7 /* ESNext */) {
-                    checkExternalEmitHelpers(node, 26624 /* AsyncDelegatorIncludes */);
+                if (isAsync && languageVersion < 99 /* ESNext */) {
+                    checkExternalEmitHelpers(node, 53248 /* AsyncDelegatorIncludes */);
                 }
                 // Generator functions prior to ES2015 require the __values helper
-                if ((functionFlags & 3 /* AsyncGenerator */) === 1 /* Generator */ &&
-                    languageVersion < 2 /* ES2015 */ && compilerOptions.downlevelIteration) {
+                if (!isAsync && languageVersion < 2 /* ES2015 */ && compilerOptions.downlevelIteration) {
                     checkExternalEmitHelpers(node, 256 /* Values */);
                 }
             }
-            var isAsync = (functionFlags & 2 /* Async */) !== 0;
-            var yieldedType = getYieldedTypeOfYieldExpression(node, isAsync); // TODO: GH#18217
             // There is no point in doing an assignability check if the function
             // has no explicit return type because the return type is directly computed
             // from the yield expressions.
             var returnType = getReturnTypeFromAnnotation(func);
-            if (returnType) {
-                var signatureElementType = getIteratedTypeOfGenerator(returnType, isAsync) || anyType;
-                checkTypeAssignableToAndOptionallyElaborate(yieldedType, signatureElementType, node.expression || node, node.expression);
+            var iterationTypes = returnType && getIterationTypesOfGeneratorFunctionReturnType(returnType, isAsync);
+            var signatureYieldType = iterationTypes && iterationTypes.yieldType || anyType;
+            var signatureNextType = iterationTypes && iterationTypes.nextType || anyType;
+            var resolvedSignatureNextType = isAsync ? getAwaitedType(signatureNextType) || anyType : signatureNextType;
+            var yieldExpressionType = node.expression ? checkExpression(node.expression) : undefinedWideningType;
+            var yieldedType = getYieldedTypeOfYieldExpression(node, yieldExpressionType, resolvedSignatureNextType, isAsync);
+            if (returnType && yieldedType) {
+                checkTypeAssignableToAndOptionallyElaborate(yieldedType, signatureYieldType, node.expression || node, node.expression);
+            }
+            if (node.asteriskToken) {
+                var use = isAsync ? 19 /* AsyncYieldStar */ : 17 /* YieldStar */;
+                return getIterationTypeOfIterable(use, 1 /* Return */, yieldExpressionType, node.expression)
+                    || anyType;
+            }
+            else if (returnType) {
+                return getIterationTypeOfGeneratorFunctionReturnType(2 /* Next */, returnType, isAsync)
+                    || anyType;
+            }
+            var contextualReturnType = getContextualReturnType(func);
+            if (contextualReturnType) {
+                return getIterationTypeOfGeneratorFunctionReturnType(2 /* Next */, contextualReturnType, isAsync)
+                    || anyType;
             }
-            // Both yield and yield* expressions have type 'any'
             return anyType;
         }
         function checkConditionalExpression(node, checkMode) {
@@ -52589,25 +54362,25 @@ var ts;
             return stringType;
         }
         function getContextNode(node) {
-            if (node.kind === 268 /* JsxAttributes */ && !ts.isJsxSelfClosingElement(node.parent)) {
+            if (node.kind === 269 /* JsxAttributes */ && !ts.isJsxSelfClosingElement(node.parent)) {
                 return node.parent.parent; // Needs to be the root JsxElement, so it encompasses the attributes _and_ the children (which are essentially part of the attributes)
             }
             return node;
         }
-        function checkExpressionWithContextualType(node, contextualType, contextualMapper, checkMode) {
+        function checkExpressionWithContextualType(node, contextualType, inferenceContext, checkMode) {
             var context = getContextNode(node);
             var saveContextualType = context.contextualType;
-            var saveContextualMapper = context.contextualMapper;
+            var saveInferenceContext = context.inferenceContext;
             context.contextualType = contextualType;
-            context.contextualMapper = contextualMapper;
-            var type = checkExpression(node, checkMode | 1 /* Contextual */ | (contextualMapper ? 2 /* Inferential */ : 0));
+            context.inferenceContext = inferenceContext;
+            var type = checkExpression(node, checkMode | 1 /* Contextual */ | (inferenceContext ? 2 /* Inferential */ : 0));
             // We strip literal freshness when an appropriate contextual type is present such that contextually typed
             // literals always preserve their literal types (otherwise they might widen during type inference). An alternative
             // here would be to not mark contextually typed literals as fresh in the first place.
             var result = maybeTypeOfKind(type, 2944 /* Literal */) && isLiteralOfContextualType(type, instantiateContextualType(contextualType, node)) ?
                 getRegularTypeOfLiteralType(type) : type;
             context.contextualType = saveContextualType;
-            context.contextualMapper = saveContextualMapper;
+            context.inferenceContext = saveInferenceContext;
             return result;
         }
         function checkExpressionCached(node, checkMode) {
@@ -52628,15 +54401,18 @@ var ts;
         }
         function isTypeAssertion(node) {
             node = ts.skipParentheses(node);
-            return node.kind === 194 /* TypeAssertionExpression */ || node.kind === 212 /* AsExpression */;
+            return node.kind === 195 /* TypeAssertionExpression */ || node.kind === 213 /* AsExpression */;
         }
         function checkDeclarationInitializer(declaration) {
             var initializer = ts.getEffectiveInitializer(declaration);
             var type = getTypeOfExpression(initializer, /*cache*/ true);
+            var padded = ts.isParameter(declaration) && declaration.name.kind === 186 /* ArrayBindingPattern */ &&
+                isTupleType(type) && !type.target.hasRestElement && getTypeReferenceArity(type) < declaration.name.elements.length ?
+                padTupleType(type, declaration.name) : type;
             var widened = ts.getCombinedNodeFlags(declaration) & 2 /* Const */ ||
                 ts.isDeclarationReadonly(declaration) ||
                 isTypeAssertion(initializer) ||
-                isLiteralOfContextualType(type, getContextualType(initializer)) ? type : getWidenedLiteralType(type);
+                isLiteralOfContextualType(padded, getContextualType(initializer)) ? padded : getWidenedLiteralType(padded);
             if (ts.isInJSFile(declaration)) {
                 if (widened.flags & 98304 /* Nullable */) {
                     reportImplicitAny(declaration, anyType);
@@ -52649,6 +54425,21 @@ var ts;
             }
             return widened;
         }
+        function padTupleType(type, pattern) {
+            var patternElements = pattern.elements;
+            var arity = getTypeReferenceArity(type);
+            var elementTypes = arity ? type.typeArguments.slice() : [];
+            for (var i = arity; i < patternElements.length; i++) {
+                var e = patternElements[i];
+                if (i < patternElements.length - 1 || !(e.kind === 187 /* BindingElement */ && e.dotDotDotToken)) {
+                    elementTypes.push(!ts.isOmittedExpression(e) && hasDefaultValue(e) ? getTypeFromBindingElement(e, /*includePatternInType*/ false, /*reportErrors*/ false) : anyType);
+                    if (!ts.isOmittedExpression(e) && !hasDefaultValue(e)) {
+                        reportImplicitAny(e, anyType);
+                    }
+                }
+            }
+            return createTupleType(elementTypes, type.target.minLength, /*hasRestElement*/ false, type.target.readonly);
+        }
         function isLiteralOfContextualType(candidateType, contextualType) {
             if (contextualType) {
                 if (contextualType.flags & 3145728 /* UnionOrIntersection */) {
@@ -52659,7 +54450,7 @@ var ts;
                     // If the contextual type is a type variable constrained to a primitive type, consider
                     // this a literal context for literals of that primitive type. For example, given a
                     // type parameter 'T extends string', infer string literal types for T.
-                    var constraint = getBaseConstraintOfType(contextualType) || emptyObjectType;
+                    var constraint = getBaseConstraintOfType(contextualType) || unknownType;
                     return maybeTypeOfKind(constraint, 4 /* String */) && maybeTypeOfKind(candidateType, 128 /* StringLiteral */) ||
                         maybeTypeOfKind(constraint, 8 /* Number */) && maybeTypeOfKind(candidateType, 256 /* NumberLiteral */) ||
                         maybeTypeOfKind(constraint, 64 /* BigInt */) && maybeTypeOfKind(candidateType, 2048 /* BigIntLiteral */) ||
@@ -52692,7 +54483,7 @@ var ts;
             // Do not use hasDynamicName here, because that returns false for well known symbols.
             // We want to perform checkComputedPropertyName for all computed properties, including
             // well known symbols.
-            if (node.name.kind === 149 /* ComputedPropertyName */) {
+            if (node.name.kind === 150 /* ComputedPropertyName */) {
                 checkComputedPropertyName(node.name);
             }
             return checkExpressionForMutableLocation(node.initializer, checkMode);
@@ -52703,7 +54494,7 @@ var ts;
             // Do not use hasDynamicName here, because that returns false for well known symbols.
             // We want to perform checkComputedPropertyName for all computed properties, including
             // well known symbols.
-            if (node.name.kind === 149 /* ComputedPropertyName */) {
+            if (node.name.kind === 150 /* ComputedPropertyName */) {
                 checkComputedPropertyName(node.name);
             }
             var uninstantiatedType = checkFunctionExpressionOrObjectLiteralMethod(node, checkMode);
@@ -52711,42 +54502,52 @@ var ts;
         }
         function instantiateTypeWithSingleGenericCallSignature(node, type, checkMode) {
             if (checkMode && checkMode & (2 /* Inferential */ | 8 /* SkipGenericFunctions */)) {
-                var signature = getSingleCallSignature(type);
+                var callSignature = getSingleSignature(type, 0 /* Call */, /*allowMembers*/ true);
+                var constructSignature = getSingleSignature(type, 1 /* Construct */, /*allowMembers*/ true);
+                var signature = callSignature || constructSignature;
                 if (signature && signature.typeParameters) {
-                    if (checkMode & 8 /* SkipGenericFunctions */) {
-                        skippedGenericFunction(node, checkMode);
-                        return anyFunctionType;
-                    }
                     var contextualType = getApparentTypeOfContextualType(node);
-                    if (contextualType) {
-                        var contextualSignature = getSingleCallSignature(getNonNullableType(contextualType));
+                    if (contextualType && !isMixinConstructorType(contextualType)) {
+                        var contextualSignature = getSingleSignature(getNonNullableType(contextualType), callSignature ? 0 /* Call */ : 1 /* Construct */, /*allowMembers*/ false);
                         if (contextualSignature && !contextualSignature.typeParameters) {
-                            var context = getContextualMapper(node);
+                            if (checkMode & 8 /* SkipGenericFunctions */) {
+                                skippedGenericFunction(node, checkMode);
+                                return anyFunctionType;
+                            }
+                            var context = getInferenceContext(node);
                             // We have an expression that is an argument of a generic function for which we are performing
                             // type argument inference. The expression is of a function type with a single generic call
                             // signature and a contextual function type with a single non-generic call signature. Now check
                             // if the outer function returns a function type with a single non-generic call signature and
                             // if some of the outer function type parameters have no inferences so far. If so, we can
                             // potentially add inferred type parameters to the outer function return type.
-                            var returnSignature = context.signature && getSingleCallSignature(getReturnTypeOfSignature(context.signature));
+                            var returnType = context.signature && getReturnTypeOfSignature(context.signature);
+                            var returnSignature = returnType && getSingleCallOrConstructSignature(returnType);
                             if (returnSignature && !returnSignature.typeParameters && !ts.every(context.inferences, hasInferenceCandidates)) {
-                                // Instantiate the expression type with its own type parameters as type arguments. This
-                                // ensures that the type parameters are not erased to type any during type inference such
-                                // that they can be inferred as actual types.
+                                // Instantiate the signature with its own type parameters as type arguments, possibly
+                                // renaming the type parameters to ensure they have unique names.
                                 var uniqueTypeParameters = getUniqueTypeParameters(context, signature.typeParameters);
-                                var strippedType = getOrCreateTypeFromSignature(getSignatureInstantiationWithoutFillingInTypeArguments(signature, uniqueTypeParameters));
-                                // Infer from the stripped expression type to the contextual type starting with an empty
-                                // set of inference candidates.
-                                var inferences = ts.map(context.typeParameters, createInferenceInfo);
-                                inferTypes(inferences, strippedType, contextualType);
-                                // If we produced some inference candidates and if the type parameters for which we produced
-                                // candidates do not already have existing inferences, we adopt the new inference candidates and
-                                // add the type parameters of the expression type to the set of inferred type parameters for
-                                // the outer function return type.
-                                if (ts.some(inferences, hasInferenceCandidates) && !hasOverlappingInferences(context.inferences, inferences)) {
-                                    mergeInferences(context.inferences, inferences);
-                                    context.inferredTypeParameters = ts.concatenate(context.inferredTypeParameters, uniqueTypeParameters);
-                                    return strippedType;
+                                var instantiatedSignature = getSignatureInstantiationWithoutFillingInTypeArguments(signature, uniqueTypeParameters);
+                                // Infer from the parameters of the instantiated signature to the parameters of the
+                                // contextual signature starting with an empty set of inference candidates.
+                                var inferences_3 = ts.map(context.inferences, function (info) { return createInferenceInfo(info.typeParameter); });
+                                applyToParameterTypes(instantiatedSignature, contextualSignature, function (source, target) {
+                                    inferTypes(inferences_3, source, target, /*priority*/ 0, /*contravariant*/ true);
+                                });
+                                if (ts.some(inferences_3, hasInferenceCandidates)) {
+                                    // We have inference candidates, indicating that one or more type parameters are referenced
+                                    // in the parameter types of the contextual signature. Now also infer from the return type.
+                                    applyToReturnTypes(instantiatedSignature, contextualSignature, function (source, target) {
+                                        inferTypes(inferences_3, source, target);
+                                    });
+                                    // If the type parameters for which we produced candidates do not have any inferences yet,
+                                    // we adopt the new inference candidates and add the type parameters of the expression type
+                                    // to the set of inferred type parameters for the outer function return type.
+                                    if (!hasOverlappingInferences(context.inferences, inferences_3)) {
+                                        mergeInferences(context.inferences, inferences_3);
+                                        context.inferredTypeParameters = ts.concatenate(context.inferredTypeParameters, uniqueTypeParameters);
+                                        return getOrCreateTypeFromSignature(instantiatedSignature);
+                                    }
                                 }
                             }
                             return getOrCreateTypeFromSignature(instantiateSignatureInContextOf(signature, contextualSignature, context));
@@ -52760,8 +54561,8 @@ var ts;
             if (checkMode & 2 /* Inferential */) {
                 // We have skipped a generic function during inferential typing. Obtain the inference context and
                 // indicate this has occurred such that we know a second pass of inference is be needed.
-                var context = getContextualMapper(node);
-                context.flags |= 8 /* SkippedGenericFunction */;
+                var context = getInferenceContext(node);
+                context.flags |= 4 /* SkippedGenericFunction */;
             }
         }
         function hasInferenceCandidates(info) {
@@ -52836,7 +54637,7 @@ var ts;
             var expr = ts.skipParentheses(node);
             // Optimize for the common case of a call to a function with a single non-generic call
             // signature where we can just fetch the return type without checking the arguments.
-            if (expr.kind === 191 /* CallExpression */ && expr.expression.kind !== 98 /* SuperKeyword */ && !ts.isRequireCall(expr, /*checkArgumentIsStringLiteralLike*/ true) && !isSymbolOrSymbolForCall(expr)) {
+            if (expr.kind === 192 /* CallExpression */ && expr.expression.kind !== 99 /* SuperKeyword */ && !ts.isRequireCall(expr, /*checkArgumentIsStringLiteralLike*/ true) && !isSymbolOrSymbolForCall(expr)) {
                 var funcType = checkNonNullExpression(expr.expression);
                 var signature = getSingleCallSignature(funcType);
                 if (signature && !signature.typeParameters) {
@@ -52869,16 +54670,10 @@ var ts;
             node.contextualType = saveContextualType;
             return type;
         }
-        // Checks an expression and returns its type. The contextualMapper parameter serves two purposes: When
-        // contextualMapper is not undefined and not equal to the identityMapper function object it indicates that the
-        // expression is being inferentially typed (section 4.15.2 in spec) and provides the type mapper to use in
-        // conjunction with the generic contextual type. When contextualMapper is equal to the identityMapper function
-        // object, it serves as an indicator that all contained function and arrow expressions should be considered to
-        // have the wildcard function type; this form of type check is used during overload resolution to exclude
-        // contextually typed function and arrow expressions in the initial phase.
         function checkExpression(node, checkMode, forceTuple) {
             var saveCurrentNode = currentNode;
             currentNode = node;
+            instantiationCount = 0;
             var uninstantiatedType = checkExpressionWorker(node, checkMode, forceTuple);
             var type = instantiateTypeWithSingleGenericCallSignature(node, uninstantiatedType, checkMode);
             if (isConstEnumObjectType(type)) {
@@ -52892,10 +54687,10 @@ var ts;
             // - 'left' in property access
             // - 'object' in indexed access
             // - target in rhs of import statement
-            var ok = (node.parent.kind === 189 /* PropertyAccessExpression */ && node.parent.expression === node) ||
-                (node.parent.kind === 190 /* ElementAccessExpression */ && node.parent.expression === node) ||
-                ((node.kind === 72 /* Identifier */ || node.kind === 148 /* QualifiedName */) && isInRightSideOfImportOrExportAssignment(node) ||
-                    (node.parent.kind === 167 /* TypeQuery */ && node.parent.exprName === node));
+            var ok = (node.parent.kind === 190 /* PropertyAccessExpression */ && node.parent.expression === node) ||
+                (node.parent.kind === 191 /* ElementAccessExpression */ && node.parent.expression === node) ||
+                ((node.kind === 73 /* Identifier */ || node.kind === 149 /* QualifiedName */) && isInRightSideOfImportOrExportAssignment(node) ||
+                    (node.parent.kind === 168 /* TypeQuery */ && node.parent.exprName === node));
             if (!ok) {
                 error(node, ts.Diagnostics.const_enums_can_only_be_used_in_property_or_index_access_expressions_or_the_right_hand_side_of_an_import_declaration_or_export_assignment_or_type_query);
             }
@@ -52916,13 +54711,13 @@ var ts;
         }
         function checkExpressionWorker(node, checkMode, forceTuple) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return checkIdentifier(node);
-                case 100 /* ThisKeyword */:
+                case 101 /* ThisKeyword */:
                     return checkThisExpression(node);
-                case 98 /* SuperKeyword */:
+                case 99 /* SuperKeyword */:
                     return checkSuperExpression(node);
-                case 96 /* NullKeyword */:
+                case 97 /* NullKeyword */:
                     return nullWideningType;
                 case 14 /* NoSubstitutionTemplateLiteral */:
                 case 10 /* StringLiteral */:
@@ -52933,82 +54728,82 @@ var ts;
                 case 9 /* BigIntLiteral */:
                     checkGrammarBigIntLiteral(node);
                     return getFreshTypeOfLiteralType(getBigIntLiteralType(node));
-                case 102 /* TrueKeyword */:
+                case 103 /* TrueKeyword */:
                     return trueType;
-                case 87 /* FalseKeyword */:
+                case 88 /* FalseKeyword */:
                     return falseType;
-                case 206 /* TemplateExpression */:
+                case 207 /* TemplateExpression */:
                     return checkTemplateExpression(node);
                 case 13 /* RegularExpressionLiteral */:
                     return globalRegExpType;
-                case 187 /* ArrayLiteralExpression */:
+                case 188 /* ArrayLiteralExpression */:
                     return checkArrayLiteral(node, checkMode, forceTuple);
-                case 188 /* ObjectLiteralExpression */:
+                case 189 /* ObjectLiteralExpression */:
                     return checkObjectLiteral(node, checkMode);
-                case 189 /* PropertyAccessExpression */:
+                case 190 /* PropertyAccessExpression */:
                     return checkPropertyAccessExpression(node);
-                case 148 /* QualifiedName */:
+                case 149 /* QualifiedName */:
                     return checkQualifiedName(node);
-                case 190 /* ElementAccessExpression */:
+                case 191 /* ElementAccessExpression */:
                     return checkIndexedAccess(node);
-                case 191 /* CallExpression */:
-                    if (node.expression.kind === 92 /* ImportKeyword */) {
+                case 192 /* CallExpression */:
+                    if (node.expression.kind === 93 /* ImportKeyword */) {
                         return checkImportCallExpression(node);
                     }
                 /* falls through */
-                case 192 /* NewExpression */:
+                case 193 /* NewExpression */:
                     return checkCallExpression(node, checkMode);
-                case 193 /* TaggedTemplateExpression */:
+                case 194 /* TaggedTemplateExpression */:
                     return checkTaggedTemplateExpression(node);
-                case 195 /* ParenthesizedExpression */:
+                case 196 /* ParenthesizedExpression */:
                     return checkParenthesizedExpression(node, checkMode);
-                case 209 /* ClassExpression */:
+                case 210 /* ClassExpression */:
                     return checkClassExpression(node);
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
                     return checkFunctionExpressionOrObjectLiteralMethod(node, checkMode);
-                case 199 /* TypeOfExpression */:
+                case 200 /* TypeOfExpression */:
                     return checkTypeOfExpression(node);
-                case 194 /* TypeAssertionExpression */:
-                case 212 /* AsExpression */:
+                case 195 /* TypeAssertionExpression */:
+                case 213 /* AsExpression */:
                     return checkAssertion(node);
-                case 213 /* NonNullExpression */:
+                case 214 /* NonNullExpression */:
                     return checkNonNullAssertion(node);
-                case 214 /* MetaProperty */:
+                case 215 /* MetaProperty */:
                     return checkMetaProperty(node);
-                case 198 /* DeleteExpression */:
+                case 199 /* DeleteExpression */:
                     return checkDeleteExpression(node);
-                case 200 /* VoidExpression */:
+                case 201 /* VoidExpression */:
                     return checkVoidExpression(node);
-                case 201 /* AwaitExpression */:
+                case 202 /* AwaitExpression */:
                     return checkAwaitExpression(node);
-                case 202 /* PrefixUnaryExpression */:
+                case 203 /* PrefixUnaryExpression */:
                     return checkPrefixUnaryExpression(node);
-                case 203 /* PostfixUnaryExpression */:
+                case 204 /* PostfixUnaryExpression */:
                     return checkPostfixUnaryExpression(node);
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return checkBinaryExpression(node, checkMode);
-                case 205 /* ConditionalExpression */:
+                case 206 /* ConditionalExpression */:
                     return checkConditionalExpression(node, checkMode);
-                case 208 /* SpreadElement */:
+                case 209 /* SpreadElement */:
                     return checkSpreadExpression(node, checkMode);
-                case 210 /* OmittedExpression */:
+                case 211 /* OmittedExpression */:
                     return undefinedWideningType;
-                case 207 /* YieldExpression */:
+                case 208 /* YieldExpression */:
                     return checkYieldExpression(node);
-                case 215 /* SyntheticExpression */:
+                case 216 /* SyntheticExpression */:
                     return node.type;
-                case 270 /* JsxExpression */:
+                case 271 /* JsxExpression */:
                     return checkJsxExpression(node, checkMode);
-                case 260 /* JsxElement */:
+                case 261 /* JsxElement */:
                     return checkJsxElement(node, checkMode);
-                case 261 /* JsxSelfClosingElement */:
+                case 262 /* JsxSelfClosingElement */:
                     return checkJsxSelfClosingElement(node, checkMode);
-                case 264 /* JsxFragment */:
+                case 265 /* JsxFragment */:
                     return checkJsxFragment(node);
-                case 268 /* JsxAttributes */:
+                case 269 /* JsxAttributes */:
                     return checkJsxAttributes(node, checkMode);
-                case 262 /* JsxOpeningElement */:
+                case 263 /* JsxOpeningElement */:
                     ts.Debug.fail("Shouldn't ever directly check a JsxOpeningElement");
             }
             return errorType;
@@ -53030,7 +54825,7 @@ var ts;
             var constraintType = getConstraintOfTypeParameter(typeParameter);
             var defaultType = getDefaultFromTypeParameter(typeParameter);
             if (constraintType && defaultType) {
-                checkTypeAssignableTo(defaultType, getTypeWithThisArgument(constraintType, defaultType), node.default, ts.Diagnostics.Type_0_does_not_satisfy_the_constraint_1);
+                checkTypeAssignableTo(defaultType, getTypeWithThisArgument(instantiateType(constraintType, makeUnaryTypeMapper(typeParameter, defaultType)), defaultType), node.default, ts.Diagnostics.Type_0_does_not_satisfy_the_constraint_1);
             }
             if (produceDiagnostics) {
                 checkTypeNameIsReserved(node.name, ts.Diagnostics.Type_parameter_name_cannot_be_0);
@@ -53045,7 +54840,7 @@ var ts;
             checkVariableLikeDeclaration(node);
             var func = ts.getContainingFunction(node);
             if (ts.hasModifier(node, 92 /* ParameterPropertyModifier */)) {
-                if (!(func.kind === 157 /* Constructor */ && ts.nodeIsPresent(func.body))) {
+                if (!(func.kind === 158 /* Constructor */ && ts.nodeIsPresent(func.body))) {
                     error(node, ts.Diagnostics.A_parameter_property_is_only_allowed_in_a_constructor_implementation);
                 }
             }
@@ -53056,10 +54851,10 @@ var ts;
                 if (func.parameters.indexOf(node) !== 0) {
                     error(node, ts.Diagnostics.A_0_parameter_must_be_the_first_parameter, node.name.escapedText);
                 }
-                if (func.kind === 157 /* Constructor */ || func.kind === 161 /* ConstructSignature */ || func.kind === 166 /* ConstructorType */) {
+                if (func.kind === 158 /* Constructor */ || func.kind === 162 /* ConstructSignature */ || func.kind === 167 /* ConstructorType */) {
                     error(node, ts.Diagnostics.A_constructor_cannot_have_a_this_parameter);
                 }
-                if (func.kind === 197 /* ArrowFunction */) {
+                if (func.kind === 198 /* ArrowFunction */) {
                     error(node, ts.Diagnostics.An_arrow_function_cannot_have_a_this_parameter);
                 }
             }
@@ -53076,7 +54871,8 @@ var ts;
                 error(node, ts.Diagnostics.A_type_predicate_is_only_allowed_in_return_type_position_for_functions_and_methods);
                 return;
             }
-            var typePredicate = getTypePredicateOfSignature(getSignatureFromDeclaration(parent));
+            var signature = getSignatureFromDeclaration(parent);
+            var typePredicate = getTypePredicateOfSignature(signature);
             if (!typePredicate) {
                 return;
             }
@@ -53087,12 +54883,12 @@ var ts;
             }
             else {
                 if (typePredicate.parameterIndex >= 0) {
-                    if (parent.parameters[typePredicate.parameterIndex].dotDotDotToken) {
+                    if (signature.hasRestParameter && typePredicate.parameterIndex === signature.parameters.length - 1) {
                         error(parameterName, ts.Diagnostics.A_type_predicate_cannot_reference_a_rest_parameter);
                     }
                     else {
                         var leadingError = function () { return ts.chainDiagnosticMessages(/*details*/ undefined, ts.Diagnostics.A_type_predicate_s_type_must_be_assignable_to_its_parameter_s_type); };
-                        checkTypeAssignableTo(typePredicate.type, getTypeOfNode(parent.parameters[typePredicate.parameterIndex]), node.type, 
+                        checkTypeAssignableTo(typePredicate.type, getTypeOfSymbol(signature.parameters[typePredicate.parameterIndex]), node.type, 
                         /*headMessage*/ undefined, leadingError);
                     }
                 }
@@ -53114,13 +54910,13 @@ var ts;
         }
         function getTypePredicateParent(node) {
             switch (node.parent.kind) {
-                case 197 /* ArrowFunction */:
-                case 160 /* CallSignature */:
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
-                case 165 /* FunctionType */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
+                case 198 /* ArrowFunction */:
+                case 161 /* CallSignature */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 166 /* FunctionType */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
                     var parent = node.parent;
                     if (node === parent.type) {
                         return parent;
@@ -53134,11 +54930,11 @@ var ts;
                     continue;
                 }
                 var name = element.name;
-                if (name.kind === 72 /* Identifier */ && name.escapedText === predicateVariableName) {
+                if (name.kind === 73 /* Identifier */ && name.escapedText === predicateVariableName) {
                     error(predicateVariableNode, ts.Diagnostics.A_type_predicate_cannot_reference_element_0_in_a_binding_pattern, predicateVariableName);
                     return true;
                 }
-                else if (name.kind === 185 /* ArrayBindingPattern */ || name.kind === 184 /* ObjectBindingPattern */) {
+                else if (name.kind === 186 /* ArrayBindingPattern */ || name.kind === 185 /* ObjectBindingPattern */) {
                     if (checkIfTypePredicateVariableIsDeclaredInBindingPattern(name, predicateVariableNode, predicateVariableName)) {
                         return true;
                     }
@@ -53147,20 +54943,20 @@ var ts;
         }
         function checkSignatureDeclaration(node) {
             // Grammar checking
-            if (node.kind === 162 /* IndexSignature */) {
+            if (node.kind === 163 /* IndexSignature */) {
                 checkGrammarIndexSignature(node);
             }
             // TODO (yuisu): Remove this check in else-if when SyntaxKind.Construct is moved and ambient context is handled
-            else if (node.kind === 165 /* FunctionType */ || node.kind === 239 /* FunctionDeclaration */ || node.kind === 166 /* ConstructorType */ ||
-                node.kind === 160 /* CallSignature */ || node.kind === 157 /* Constructor */ ||
-                node.kind === 161 /* ConstructSignature */) {
+            else if (node.kind === 166 /* FunctionType */ || node.kind === 240 /* FunctionDeclaration */ || node.kind === 167 /* ConstructorType */ ||
+                node.kind === 161 /* CallSignature */ || node.kind === 158 /* Constructor */ ||
+                node.kind === 162 /* ConstructSignature */) {
                 checkGrammarFunctionLikeDeclaration(node);
             }
             var functionFlags = ts.getFunctionFlags(node);
             if (!(functionFlags & 4 /* Invalid */)) {
                 // Async generators prior to ESNext require the __await and __asyncGenerator helpers
-                if ((functionFlags & 3 /* AsyncGenerator */) === 3 /* AsyncGenerator */ && languageVersion < 7 /* ESNext */) {
-                    checkExternalEmitHelpers(node, 6144 /* AsyncGeneratorIncludes */);
+                if ((functionFlags & 3 /* AsyncGenerator */) === 3 /* AsyncGenerator */ && languageVersion < 99 /* ESNext */) {
+                    checkExternalEmitHelpers(node, 12288 /* AsyncGeneratorIncludes */);
                 }
                 // Async functions prior to ES2017 require the __awaiter helper
                 if ((functionFlags & 3 /* AsyncGenerator */) === 2 /* Async */ && languageVersion < 4 /* ES2017 */) {
@@ -53183,10 +54979,10 @@ var ts;
                 var returnTypeNode = ts.getEffectiveReturnTypeNode(node);
                 if (noImplicitAny && !returnTypeNode) {
                     switch (node.kind) {
-                        case 161 /* ConstructSignature */:
+                        case 162 /* ConstructSignature */:
                             error(node, ts.Diagnostics.Construct_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type);
                             break;
-                        case 160 /* CallSignature */:
+                        case 161 /* CallSignature */:
                             error(node, ts.Diagnostics.Call_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type);
                             break;
                     }
@@ -53199,24 +54995,24 @@ var ts;
                             error(returnTypeNode, ts.Diagnostics.A_generator_cannot_have_a_void_type_annotation);
                         }
                         else {
-                            var generatorElementType = getIteratedTypeOfGenerator(returnType, (functionFlags_1 & 2 /* Async */) !== 0) || anyType;
-                            var iterableIteratorInstantiation = functionFlags_1 & 2 /* Async */
-                                ? createAsyncIterableIteratorType(generatorElementType) // AsyncGenerator function
-                                : createIterableIteratorType(generatorElementType); // Generator function
-                            // Naively, one could check that IterableIterator<any> is assignable to the return type annotation.
+                            // Naively, one could check that Generator<any, any, any> is assignable to the return type annotation.
                             // However, that would not catch the error in the following case.
                             //
                             //    interface BadGenerator extends Iterable<number>, Iterator<string> { }
                             //    function* g(): BadGenerator { } // Iterable and Iterator have different types!
                             //
-                            checkTypeAssignableTo(iterableIteratorInstantiation, returnType, returnTypeNode);
+                            var generatorYieldType = getIterationTypeOfGeneratorFunctionReturnType(0 /* Yield */, returnType, (functionFlags_1 & 2 /* Async */) !== 0) || anyType;
+                            var generatorReturnType = getIterationTypeOfGeneratorFunctionReturnType(1 /* Return */, returnType, (functionFlags_1 & 2 /* Async */) !== 0) || generatorYieldType;
+                            var generatorNextType = getIterationTypeOfGeneratorFunctionReturnType(2 /* Next */, returnType, (functionFlags_1 & 2 /* Async */) !== 0) || unknownType;
+                            var generatorInstantiation = createGeneratorReturnType(generatorYieldType, generatorReturnType, generatorNextType, !!(functionFlags_1 & 2 /* Async */));
+                            checkTypeAssignableTo(generatorInstantiation, returnType, returnTypeNode);
                         }
                     }
                     else if ((functionFlags_1 & 3 /* AsyncGenerator */) === 2 /* Async */) {
                         checkAsyncFunctionReturnType(node, returnTypeNode);
                     }
                 }
-                if (node.kind !== 162 /* IndexSignature */ && node.kind !== 294 /* JSDocFunctionType */) {
+                if (node.kind !== 163 /* IndexSignature */ && node.kind !== 295 /* JSDocFunctionType */) {
                     registerForUnusedIdentifiersCheck(node);
                 }
             }
@@ -53233,7 +55029,7 @@ var ts;
             var staticNames = ts.createUnderscoreEscapedMap();
             for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                 var member = _a[_i];
-                if (member.kind === 157 /* Constructor */) {
+                if (member.kind === 158 /* Constructor */) {
                     for (var _b = 0, _c = member.parameters; _b < _c.length; _b++) {
                         var param = _c[_b];
                         if (ts.isParameterPropertyDeclaration(param) && !ts.isBindingPattern(param.name)) {
@@ -53248,16 +55044,16 @@ var ts;
                     var memberName = name && ts.getPropertyNameForPropertyNameNode(name);
                     if (name && memberName) {
                         switch (member.kind) {
-                            case 158 /* GetAccessor */:
+                            case 159 /* GetAccessor */:
                                 addName(names, name, memberName, 1 /* Getter */);
                                 break;
-                            case 159 /* SetAccessor */:
+                            case 160 /* SetAccessor */:
                                 addName(names, name, memberName, 2 /* Setter */);
                                 break;
-                            case 154 /* PropertyDeclaration */:
+                            case 155 /* PropertyDeclaration */:
                                 addName(names, name, memberName, 3 /* Property */);
                                 break;
-                            case 156 /* MethodDeclaration */:
+                            case 157 /* MethodDeclaration */:
                                 addName(names, name, memberName, 4 /* Method */);
                                 break;
                         }
@@ -53320,7 +55116,7 @@ var ts;
             var names = ts.createMap();
             for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                 var member = _a[_i];
-                if (member.kind === 153 /* PropertySignature */) {
+                if (member.kind === 154 /* PropertySignature */) {
                     var memberName = void 0;
                     var name = member.name;
                     switch (name.kind) {
@@ -53328,7 +55124,7 @@ var ts;
                         case 8 /* NumericLiteral */:
                             memberName = name.text;
                             break;
-                        case 72 /* Identifier */:
+                        case 73 /* Identifier */:
                             memberName = ts.idText(name);
                             break;
                         default:
@@ -53345,7 +55141,7 @@ var ts;
             }
         }
         function checkTypeForDuplicateIndexSignatures(node) {
-            if (node.kind === 241 /* InterfaceDeclaration */) {
+            if (node.kind === 242 /* InterfaceDeclaration */) {
                 var nodeSymbol = getSymbolOfNode(node);
                 // in case of merging interface declaration it is possible that we'll enter this check procedure several times for every declaration
                 // to prevent this run check only for the first declaration of a given kind
@@ -53365,7 +55161,7 @@ var ts;
                     var declaration = decl;
                     if (declaration.parameters.length === 1 && declaration.parameters[0].type) {
                         switch (declaration.parameters[0].type.kind) {
-                            case 138 /* StringKeyword */:
+                            case 139 /* StringKeyword */:
                                 if (!seenStringIndexer) {
                                     seenStringIndexer = true;
                                 }
@@ -53373,7 +55169,7 @@ var ts;
                                     error(declaration, ts.Diagnostics.Duplicate_string_index_signature);
                                 }
                                 break;
-                            case 135 /* NumberKeyword */:
+                            case 136 /* NumberKeyword */:
                                 if (!seenNumericIndexer) {
                                     seenNumericIndexer = true;
                                 }
@@ -53400,7 +55196,7 @@ var ts;
             checkFunctionOrMethodDeclaration(node);
             // Abstract methods cannot have an implementation.
             // Extra checks are to avoid reporting multiple errors relating to the "abstractness" of the node.
-            if (ts.hasModifier(node, 128 /* Abstract */) && node.kind === 156 /* MethodDeclaration */ && node.body) {
+            if (ts.hasModifier(node, 128 /* Abstract */) && node.kind === 157 /* MethodDeclaration */ && node.body) {
                 error(node, ts.Diagnostics.Method_0_cannot_have_an_implementation_because_it_is_marked_abstract, ts.declarationNameToString(node.name));
             }
         }
@@ -53425,7 +55221,7 @@ var ts;
                 return;
             }
             function isInstancePropertyWithInitializer(n) {
-                return n.kind === 154 /* PropertyDeclaration */ &&
+                return n.kind === 155 /* PropertyDeclaration */ &&
                     !ts.hasModifier(n, 32 /* Static */) &&
                     !!n.initializer;
             }
@@ -53455,7 +55251,7 @@ var ts;
                         var superCallStatement = void 0;
                         for (var _i = 0, statements_2 = statements; _i < statements_2.length; _i++) {
                             var statement = statements_2[_i];
-                            if (statement.kind === 221 /* ExpressionStatement */ && ts.isSuperCall(statement.expression)) {
+                            if (statement.kind === 222 /* ExpressionStatement */ && ts.isSuperCall(statement.expression)) {
                                 superCallStatement = statement;
                                 break;
                             }
@@ -53480,7 +55276,7 @@ var ts;
                     checkGrammarComputedPropertyName(node.name);
                 checkDecorators(node);
                 checkSignatureDeclaration(node);
-                if (node.kind === 158 /* GetAccessor */) {
+                if (node.kind === 159 /* GetAccessor */) {
                     if (!(node.flags & 4194304 /* Ambient */) && ts.nodeIsPresent(node.body) && (node.flags & 128 /* HasImplicitReturn */)) {
                         if (!(node.flags & 256 /* HasExplicitReturn */)) {
                             error(node.name, ts.Diagnostics.A_get_accessor_must_return_a_value);
@@ -53490,13 +55286,13 @@ var ts;
                 // Do not use hasDynamicName here, because that returns false for well known symbols.
                 // We want to perform checkComputedPropertyName for all computed properties, including
                 // well known symbols.
-                if (node.name.kind === 149 /* ComputedPropertyName */) {
+                if (node.name.kind === 150 /* ComputedPropertyName */) {
                     checkComputedPropertyName(node.name);
                 }
                 if (!hasNonBindableDynamicName(node)) {
                     // TypeScript 1.0 spec (April 2014): 8.4.3
                     // Accessors for the same member name must specify the same accessibility.
-                    var otherKind = node.kind === 158 /* GetAccessor */ ? 159 /* SetAccessor */ : 158 /* GetAccessor */;
+                    var otherKind = node.kind === 159 /* GetAccessor */ ? 160 /* SetAccessor */ : 159 /* GetAccessor */;
                     var otherAccessor = ts.getDeclarationOfKind(getSymbolOfNode(node), otherKind);
                     if (otherAccessor) {
                         var nodeFlags = ts.getModifierFlags(node);
@@ -53514,7 +55310,7 @@ var ts;
                     }
                 }
                 var returnType = getTypeOfAccessors(getSymbolOfNode(node));
-                if (node.kind === 158 /* GetAccessor */) {
+                if (node.kind === 159 /* GetAccessor */) {
                     checkAllCodePathsInNonVoidFunctionReturnOrThrow(node, returnType);
                 }
             }
@@ -53562,7 +55358,7 @@ var ts;
         }
         function checkTypeReferenceNode(node) {
             checkGrammarTypeArguments(node, node.typeArguments);
-            if (node.kind === 164 /* TypeReference */ && node.typeName.jsdocDotPos !== undefined && !ts.isInJSFile(node) && !ts.isInJSDoc(node)) {
+            if (node.kind === 165 /* TypeReference */ && node.typeName.jsdocDotPos !== undefined && !ts.isInJSFile(node) && !ts.isInJSDoc(node)) {
                 grammarErrorAtPos(node, node.typeName.jsdocDotPos, 1, ts.Diagnostics.JSDoc_types_can_only_be_used_inside_documentation_comments);
             }
             var type = getTypeFromTypeReference(node);
@@ -53610,7 +55406,7 @@ var ts;
             var seenOptionalElement = false;
             for (var i = 0; i < elementTypes.length; i++) {
                 var e = elementTypes[i];
-                if (e.kind === 172 /* RestType */) {
+                if (e.kind === 173 /* RestType */) {
                     if (i !== elementTypes.length - 1) {
                         grammarErrorOnNode(e, ts.Diagnostics.A_rest_element_must_be_last_in_a_tuple_type);
                         break;
@@ -53619,7 +55415,7 @@ var ts;
                         error(e, ts.Diagnostics.A_rest_element_type_must_be_an_array_type);
                     }
                 }
-                else if (e.kind === 171 /* OptionalType */) {
+                else if (e.kind === 172 /* OptionalType */) {
                     seenOptionalElement = true;
                 }
                 else if (seenOptionalElement) {
@@ -53640,7 +55436,7 @@ var ts;
             var objectType = type.objectType;
             var indexType = type.indexType;
             if (isTypeAssignableTo(indexType, getIndexType(objectType, /*stringsOnly*/ false))) {
-                if (accessNode.kind === 190 /* ElementAccessExpression */ && ts.isAssignmentTarget(accessNode) &&
+                if (accessNode.kind === 191 /* ElementAccessExpression */ && ts.isAssignmentTarget(accessNode) &&
                     ts.getObjectFlags(objectType) & 32 /* Mapped */ && getMappedTypeModifiers(objectType) & 1 /* IncludeReadonly */) {
                     error(accessNode, ts.Diagnostics.Index_signature_in_type_0_only_permits_reading, typeToString(objectType));
                 }
@@ -53648,11 +55444,22 @@ var ts;
             }
             // Check if we're indexing with a numeric type and if either object or index types
             // is a generic type with a constraint that has a numeric index signature.
-            if (getIndexInfoOfType(getApparentType(objectType), 1 /* Number */) && isTypeAssignableToKind(indexType, 296 /* NumberLike */)) {
+            var apparentObjectType = getApparentType(objectType);
+            if (getIndexInfoOfType(apparentObjectType, 1 /* Number */) && isTypeAssignableToKind(indexType, 296 /* NumberLike */)) {
                 return type;
             }
+            if (isGenericObjectType(objectType)) {
+                var propertyName_1 = getPropertyNameFromIndex(indexType, accessNode);
+                if (propertyName_1) {
+                    var propertySymbol = forEachType(apparentObjectType, function (t) { return getPropertyOfType(t, propertyName_1); });
+                    if (propertySymbol && ts.getDeclarationModifierFlagsFromSymbol(propertySymbol) & 24 /* NonPublicAccessibilityModifier */) {
+                        error(accessNode, ts.Diagnostics.Private_or_protected_member_0_cannot_be_accessed_on_a_type_parameter, ts.unescapeLeadingUnderscores(propertyName_1));
+                        return errorType;
+                    }
+                }
+            }
             error(accessNode, ts.Diagnostics.Type_0_cannot_be_used_to_index_type_1, typeToString(indexType), typeToString(objectType));
-            return type;
+            return errorType;
         }
         function checkIndexedAccessType(node) {
             checkSourceElement(node.objectType);
@@ -53680,7 +55487,7 @@ var ts;
             ts.forEachChild(node, checkSourceElement);
         }
         function checkInferType(node) {
-            if (!ts.findAncestor(node, function (n) { return n.parent && n.parent.kind === 175 /* ConditionalType */ && n.parent.extendsType === n; })) {
+            if (!ts.findAncestor(node, function (n) { return n.parent && n.parent.kind === 176 /* ConditionalType */ && n.parent.extendsType === n; })) {
                 grammarErrorOnNode(node, ts.Diagnostics.infer_declarations_are_only_permitted_in_the_extends_clause_of_a_conditional_type);
             }
             checkSourceElement(node.typeParameter);
@@ -53697,9 +55504,9 @@ var ts;
             var flags = ts.getCombinedModifierFlags(n);
             // children of classes (even ambient classes) should not be marked as ambient or export
             // because those flags have no useful semantics there.
-            if (n.parent.kind !== 241 /* InterfaceDeclaration */ &&
-                n.parent.kind !== 240 /* ClassDeclaration */ &&
-                n.parent.kind !== 209 /* ClassExpression */ &&
+            if (n.parent.kind !== 242 /* InterfaceDeclaration */ &&
+                n.parent.kind !== 241 /* ClassDeclaration */ &&
+                n.parent.kind !== 210 /* ClassExpression */ &&
                 n.flags & 4194304 /* Ambient */) {
                 if (!(flags & 2 /* Ambient */) && !(ts.isModuleBlock(n.parent) && ts.isModuleDeclaration(n.parent.parent) && ts.isGlobalScopeAugmentation(n.parent.parent))) {
                     // It is nested in an ambient context, which means it is automatically exported
@@ -53790,7 +55597,7 @@ var ts;
                         if (node.name && subsequentName &&
                             (ts.isComputedPropertyName(node.name) && ts.isComputedPropertyName(subsequentName) ||
                                 !ts.isComputedPropertyName(node.name) && !ts.isComputedPropertyName(subsequentName) && ts.getEscapedTextOfIdentifierOrLiteral(node.name) === ts.getEscapedTextOfIdentifierOrLiteral(subsequentName))) {
-                            var reportError = (node.kind === 156 /* MethodDeclaration */ || node.kind === 155 /* MethodSignature */) &&
+                            var reportError = (node.kind === 157 /* MethodDeclaration */ || node.kind === 156 /* MethodSignature */) &&
                                 ts.hasModifier(node, 32 /* Static */) !== ts.hasModifier(subsequentNode, 32 /* Static */);
                             // we can get here in two cases
                             // 1. mixed static and instance class members
@@ -53829,7 +55636,7 @@ var ts;
                 var current = declarations_4[_i];
                 var node = current;
                 var inAmbientContext = node.flags & 4194304 /* Ambient */;
-                var inAmbientContextOrInterface = node.parent.kind === 241 /* InterfaceDeclaration */ || node.parent.kind === 168 /* TypeLiteral */ || inAmbientContext;
+                var inAmbientContextOrInterface = node.parent.kind === 242 /* InterfaceDeclaration */ || node.parent.kind === 169 /* TypeLiteral */ || inAmbientContext;
                 if (inAmbientContextOrInterface) {
                     // check if declarations are consecutive only if they are non-ambient
                     // 1. ambient declarations can be interleaved
@@ -53840,7 +55647,7 @@ var ts;
                     // 2. mixing ambient and non-ambient declarations is a separate error that will be reported - do not want to report an extra one
                     previousDeclaration = undefined;
                 }
-                if (node.kind === 239 /* FunctionDeclaration */ || node.kind === 156 /* MethodDeclaration */ || node.kind === 155 /* MethodSignature */ || node.kind === 157 /* Constructor */) {
+                if (node.kind === 240 /* FunctionDeclaration */ || node.kind === 157 /* MethodDeclaration */ || node.kind === 156 /* MethodSignature */ || node.kind === 158 /* Constructor */) {
                     var currentNodeFlags = getEffectiveDeclarationFlags(node, flagsToCheck);
                     someNodeFlags |= currentNodeFlags;
                     allNodeFlags &= currentNodeFlags;
@@ -53895,7 +55702,7 @@ var ts;
                     for (var _a = 0, signatures_6 = signatures; _a < signatures_6.length; _a++) {
                         var signature = signatures_6[_a];
                         if (!isImplementationCompatibleWithOverload(bodySignature, signature)) {
-                            addRelatedInfo(error(signature.declaration, ts.Diagnostics.This_overload_signature_is_not_compatible_with_its_implementation_signature), ts.createDiagnosticForNode(bodyDeclaration, ts.Diagnostics.The_implementation_signature_is_declared_here));
+                            ts.addRelatedInfo(error(signature.declaration, ts.Diagnostics.This_overload_signature_is_not_compatible_with_its_implementation_signature), ts.createDiagnosticForNode(bodyDeclaration, ts.Diagnostics.The_implementation_signature_is_declared_here));
                             break;
                         }
                     }
@@ -53969,22 +55776,22 @@ var ts;
             function getDeclarationSpaces(decl) {
                 var d = decl;
                 switch (d.kind) {
-                    case 241 /* InterfaceDeclaration */:
-                    case 242 /* TypeAliasDeclaration */:
+                    case 242 /* InterfaceDeclaration */:
+                    case 243 /* TypeAliasDeclaration */:
                     // A jsdoc typedef and callback are, by definition, type aliases
-                    case 309 /* JSDocTypedefTag */:
-                    case 302 /* JSDocCallbackTag */:
+                    case 311 /* JSDocTypedefTag */:
+                    case 304 /* JSDocCallbackTag */:
                         return 2 /* ExportType */;
-                    case 244 /* ModuleDeclaration */:
+                    case 245 /* ModuleDeclaration */:
                         return ts.isAmbientModule(d) || ts.getModuleInstanceState(d) !== 0 /* NonInstantiated */
                             ? 4 /* ExportNamespace */ | 1 /* ExportValue */
                             : 4 /* ExportNamespace */;
-                    case 240 /* ClassDeclaration */:
-                    case 243 /* EnumDeclaration */:
+                    case 241 /* ClassDeclaration */:
+                    case 244 /* EnumDeclaration */:
                         return 2 /* ExportType */ | 1 /* ExportValue */;
-                    case 284 /* SourceFile */:
+                    case 285 /* SourceFile */:
                         return 2 /* ExportType */ | 1 /* ExportValue */ | 4 /* ExportNamespace */;
-                    case 254 /* ExportAssignment */:
+                    case 255 /* ExportAssignment */:
                         // Export assigned entity name expressions act as aliases and should fall through, otherwise they export values
                         if (!ts.isEntityNameExpression(d.expression)) {
                             return 1 /* ExportValue */;
@@ -53992,26 +55799,26 @@ var ts;
                         d = d.expression;
                     /* falls through */
                     // The below options all declare an Alias, which is allowed to merge with other values within the importing module
-                    case 248 /* ImportEqualsDeclaration */:
-                    case 251 /* NamespaceImport */:
-                    case 250 /* ImportClause */:
-                        var result_5 = 0 /* None */;
+                    case 249 /* ImportEqualsDeclaration */:
+                    case 252 /* NamespaceImport */:
+                    case 251 /* ImportClause */:
+                        var result_8 = 0 /* None */;
                         var target = resolveAlias(getSymbolOfNode(d));
-                        ts.forEach(target.declarations, function (d) { result_5 |= getDeclarationSpaces(d); });
-                        return result_5;
-                    case 237 /* VariableDeclaration */:
-                    case 186 /* BindingElement */:
-                    case 239 /* FunctionDeclaration */:
-                    case 253 /* ImportSpecifier */: // https://github.com/Microsoft/TypeScript/pull/7591
+                        ts.forEach(target.declarations, function (d) { result_8 |= getDeclarationSpaces(d); });
+                        return result_8;
+                    case 238 /* VariableDeclaration */:
+                    case 187 /* BindingElement */:
+                    case 240 /* FunctionDeclaration */:
+                    case 254 /* ImportSpecifier */: // https://github.com/Microsoft/TypeScript/pull/7591
                         return 1 /* ExportValue */;
                     default:
-                        return ts.Debug.fail(ts.Debug.showSyntaxKind(d));
+                        return ts.Debug.failBadSyntaxKind(d);
                 }
             }
         }
-        function getAwaitedTypeOfPromise(type, errorNode, diagnosticMessage) {
+        function getAwaitedTypeOfPromise(type, errorNode, diagnosticMessage, arg0) {
             var promisedType = getPromisedTypeOfPromise(type, errorNode);
-            return promisedType && getAwaitedType(promisedType, errorNode, diagnosticMessage);
+            return promisedType && getAwaitedType(promisedType, errorNode, diagnosticMessage, arg0);
         }
         /**
          * Gets the "promised type" of a promise.
@@ -54069,10 +55876,14 @@ var ts;
          * Promise-like type; otherwise, it is the type of the expression. This is used to reflect
          * The runtime behavior of the `await` keyword.
          */
-        function checkAwaitedType(type, errorNode, diagnosticMessage) {
-            return getAwaitedType(type, errorNode, diagnosticMessage) || errorType;
+        function checkAwaitedType(type, errorNode, diagnosticMessage, arg0) {
+            var awaitedType = getAwaitedType(type, errorNode, diagnosticMessage, arg0);
+            if (awaitedType === type && !(type.flags & 3 /* AnyOrUnknown */)) {
+                addErrorOrSuggestion(/*isError*/ false, ts.createDiagnosticForNode(errorNode, ts.Diagnostics.await_has_no_effect_on_the_type_of_this_expression));
+            }
+            return awaitedType || errorType;
         }
-        function getAwaitedType(type, errorNode, diagnosticMessage) {
+        function getAwaitedType(type, errorNode, diagnosticMessage, arg0) {
             var typeAsAwaitable = type;
             if (typeAsAwaitable.awaitedTypeOfType) {
                 return typeAsAwaitable.awaitedTypeOfType;
@@ -54084,7 +55895,7 @@ var ts;
                 var types = void 0;
                 for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
                     var constituentType = _a[_i];
-                    types = ts.append(types, getAwaitedType(constituentType, errorNode, diagnosticMessage));
+                    types = ts.append(types, getAwaitedType(constituentType, errorNode, diagnosticMessage, arg0));
                 }
                 if (!types) {
                     return undefined;
@@ -54134,7 +55945,7 @@ var ts;
                 // Keep track of the type we're about to unwrap to avoid bad recursive promise types.
                 // See the comments above for more information.
                 awaitedTypeStack.push(type.id);
-                var awaitedType = getAwaitedType(promisedType, errorNode, diagnosticMessage);
+                var awaitedType = getAwaitedType(promisedType, errorNode, diagnosticMessage, arg0);
                 awaitedTypeStack.pop();
                 if (!awaitedType) {
                     return undefined;
@@ -54161,7 +55972,7 @@ var ts;
                 if (errorNode) {
                     if (!diagnosticMessage)
                         return ts.Debug.fail();
-                    error(errorNode, diagnosticMessage);
+                    error(errorNode, diagnosticMessage, arg0);
                 }
                 return undefined;
             }
@@ -54231,7 +56042,7 @@ var ts;
                 var promiseConstructorSymbol = resolveEntityName(promiseConstructorName, 67220415 /* Value */, /*ignoreErrors*/ true);
                 var promiseConstructorType = promiseConstructorSymbol ? getTypeOfSymbol(promiseConstructorSymbol) : errorType;
                 if (promiseConstructorType === errorType) {
-                    if (promiseConstructorName.kind === 72 /* Identifier */ && promiseConstructorName.escapedText === "Promise" && getTargetType(returnType) === getGlobalPromiseType(/*reportErrors*/ false)) {
+                    if (promiseConstructorName.kind === 73 /* Identifier */ && promiseConstructorName.escapedText === "Promise" && getTargetType(returnType) === getGlobalPromiseType(/*reportErrors*/ false)) {
                         error(returnTypeNode, ts.Diagnostics.An_async_function_or_method_in_ES5_SlashES3_requires_the_Promise_constructor_Make_sure_you_have_a_declaration_for_the_Promise_constructor_or_include_ES2015_in_your_lib_option);
                     }
                     else {
@@ -54270,24 +56081,24 @@ var ts;
             var headMessage = getDiagnosticHeadMessageForDecoratorResolution(node);
             var errorInfo;
             switch (node.parent.kind) {
-                case 240 /* ClassDeclaration */:
+                case 241 /* ClassDeclaration */:
                     var classSymbol = getSymbolOfNode(node.parent);
                     var classConstructorType = getTypeOfSymbol(classSymbol);
                     expectedReturnType = getUnionType([classConstructorType, voidType]);
                     break;
-                case 151 /* Parameter */:
+                case 152 /* Parameter */:
                     expectedReturnType = voidType;
                     errorInfo = ts.chainDiagnosticMessages(
                     /*details*/ undefined, ts.Diagnostics.The_return_type_of_a_parameter_decorator_function_must_be_either_void_or_any);
                     break;
-                case 154 /* PropertyDeclaration */:
+                case 155 /* PropertyDeclaration */:
                     expectedReturnType = voidType;
                     errorInfo = ts.chainDiagnosticMessages(
                     /*details*/ undefined, ts.Diagnostics.The_return_type_of_a_property_decorator_function_must_be_either_void_or_any);
                     break;
-                case 156 /* MethodDeclaration */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 157 /* MethodDeclaration */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     var methodType = getTypeOfNode(node.parent);
                     var descriptorType = createTypedPropertyDescriptorType(methodType);
                     expectedReturnType = getUnionType([descriptorType, voidType]);
@@ -54308,7 +56119,7 @@ var ts;
             if (!typeName)
                 return;
             var rootName = getFirstIdentifier(typeName);
-            var meaning = (typeName.kind === 72 /* Identifier */ ? 67897832 /* Type */ : 1920 /* Namespace */) | 2097152 /* Alias */;
+            var meaning = (typeName.kind === 73 /* Identifier */ ? 67897832 /* Type */ : 1920 /* Namespace */) | 2097152 /* Alias */;
             var rootSymbol = resolveName(rootName, rootName.escapedText, meaning, /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined, /*isRefernce*/ true);
             if (rootSymbol
                 && rootSymbol.flags & 2097152 /* Alias */
@@ -54333,14 +56144,14 @@ var ts;
         function getEntityNameForDecoratorMetadata(node) {
             if (node) {
                 switch (node.kind) {
-                    case 174 /* IntersectionType */:
-                    case 173 /* UnionType */:
+                    case 175 /* IntersectionType */:
+                    case 174 /* UnionType */:
                         return getEntityNameForDecoratorMetadataFromTypeList(node.types);
-                    case 175 /* ConditionalType */:
+                    case 176 /* ConditionalType */:
                         return getEntityNameForDecoratorMetadataFromTypeList([node.trueType, node.falseType]);
-                    case 177 /* ParenthesizedType */:
+                    case 178 /* ParenthesizedType */:
                         return getEntityNameForDecoratorMetadata(node.type);
-                    case 164 /* TypeReference */:
+                    case 165 /* TypeReference */:
                         return node.typeName;
                 }
             }
@@ -54349,13 +56160,13 @@ var ts;
             var commonEntityName;
             for (var _i = 0, types_17 = types; _i < types_17.length; _i++) {
                 var typeNode = types_17[_i];
-                while (typeNode.kind === 177 /* ParenthesizedType */) {
+                while (typeNode.kind === 178 /* ParenthesizedType */) {
                     typeNode = typeNode.type; // Skip parens if need be
                 }
-                if (typeNode.kind === 132 /* NeverKeyword */) {
+                if (typeNode.kind === 133 /* NeverKeyword */) {
                     continue; // Always elide `never` from the union/intersection if possible
                 }
-                if (!strictNullChecks && (typeNode.kind === 96 /* NullKeyword */ || typeNode.kind === 141 /* UndefinedKeyword */)) {
+                if (!strictNullChecks && (typeNode.kind === 97 /* NullKeyword */ || typeNode.kind === 142 /* UndefinedKeyword */)) {
                     continue; // Elide null and undefined from unions for metadata, just like what we did prior to the implementation of strict null checks
                 }
                 var individualEntityName = getEntityNameForDecoratorMetadata(typeNode);
@@ -54397,18 +56208,18 @@ var ts;
                 return;
             }
             if (!compilerOptions.experimentalDecorators) {
-                error(node, ts.Diagnostics.Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_to_remove_this_warning);
+                error(node, ts.Diagnostics.Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_in_your_tsconfig_or_jsconfig_to_remove_this_warning);
             }
             var firstDecorator = node.decorators[0];
             checkExternalEmitHelpers(firstDecorator, 8 /* Decorate */);
-            if (node.kind === 151 /* Parameter */) {
+            if (node.kind === 152 /* Parameter */) {
                 checkExternalEmitHelpers(firstDecorator, 32 /* Param */);
             }
             if (compilerOptions.emitDecoratorMetadata) {
                 checkExternalEmitHelpers(firstDecorator, 16 /* Metadata */);
                 // we only need to perform these checks if we are emitting serialized type metadata for the target of a decorator.
                 switch (node.kind) {
-                    case 240 /* ClassDeclaration */:
+                    case 241 /* ClassDeclaration */:
                         var constructor = ts.getFirstConstructorWithBody(node);
                         if (constructor) {
                             for (var _i = 0, _a = constructor.parameters; _i < _a.length; _i++) {
@@ -54417,23 +56228,23 @@ var ts;
                             }
                         }
                         break;
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
-                        var otherKind = node.kind === 158 /* GetAccessor */ ? 159 /* SetAccessor */ : 158 /* GetAccessor */;
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
+                        var otherKind = node.kind === 159 /* GetAccessor */ ? 160 /* SetAccessor */ : 159 /* GetAccessor */;
                         var otherAccessor = ts.getDeclarationOfKind(getSymbolOfNode(node), otherKind);
                         markDecoratorMedataDataTypeNodeAsReferenced(getAnnotatedAccessorTypeNode(node) || otherAccessor && getAnnotatedAccessorTypeNode(otherAccessor));
                         break;
-                    case 156 /* MethodDeclaration */:
+                    case 157 /* MethodDeclaration */:
                         for (var _b = 0, _c = node.parameters; _b < _c.length; _b++) {
                             var parameter = _c[_b];
                             markDecoratorMedataDataTypeNodeAsReferenced(getParameterTypeNodeForDecoratorCheck(parameter));
                         }
                         markDecoratorMedataDataTypeNodeAsReferenced(ts.getEffectiveReturnTypeNode(node));
                         break;
-                    case 154 /* PropertyDeclaration */:
+                    case 155 /* PropertyDeclaration */:
                         markDecoratorMedataDataTypeNodeAsReferenced(ts.getEffectiveTypeAnnotationNode(node));
                         break;
-                    case 151 /* Parameter */:
+                    case 152 /* Parameter */:
                         markDecoratorMedataDataTypeNodeAsReferenced(getParameterTypeNodeForDecoratorCheck(node));
                         var containingSignature = node.parent;
                         for (var _d = 0, _e = containingSignature.parameters; _d < _e.length; _d++) {
@@ -54496,7 +56307,7 @@ var ts;
                     else if (ts.findLast(ts.getJSDocTags(decl), ts.isJSDocParameterTag) === node &&
                         node.typeExpression && node.typeExpression.type &&
                         !isArrayType(getTypeFromTypeNode(node.typeExpression.type))) {
-                        error(node.name, ts.Diagnostics.JSDoc_param_tag_has_name_0_but_there_is_no_parameter_with_that_name_It_would_match_arguments_if_it_had_an_array_type, ts.idText(node.name.kind === 148 /* QualifiedName */ ? node.name.right : node.name));
+                        error(node.name, ts.Diagnostics.JSDoc_param_tag_has_name_0_but_there_is_no_parameter_with_that_name_It_would_match_arguments_if_it_had_an_array_type, ts.idText(node.name.kind === 149 /* QualifiedName */ ? node.name.right : node.name));
                     }
                 }
             }
@@ -54529,9 +56340,9 @@ var ts;
         }
         function getIdentifierFromEntityNameExpression(node) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return node;
-                case 189 /* PropertyAccessExpression */:
+                case 190 /* PropertyAccessExpression */:
                     return node.name;
                 default:
                     return undefined;
@@ -54544,7 +56355,7 @@ var ts;
             // Do not use hasDynamicName here, because that returns false for well known symbols.
             // We want to perform checkComputedPropertyName for all computed properties, including
             // well known symbols.
-            if (node.name && node.name.kind === 149 /* ComputedPropertyName */) {
+            if (node.name && node.name.kind === 150 /* ComputedPropertyName */) {
                 // This check will account for methods in class/interface declarations,
                 // as well as accessors in classes/object literals
                 checkComputedPropertyName(node.name);
@@ -54573,12 +56384,9 @@ var ts;
                     }
                 }
             }
-            var body = node.kind === 155 /* MethodSignature */ ? undefined : node.body;
+            var body = node.kind === 156 /* MethodSignature */ ? undefined : node.body;
             checkSourceElement(body);
-            if ((functionFlags & 1 /* Generator */) === 0) { // Async function or normal function
-                var returnOrPromisedType = getReturnOrPromisedType(node, functionFlags);
-                checkAllCodePathsInNonVoidFunctionReturnOrThrow(node, returnOrPromisedType);
-            }
+            checkAllCodePathsInNonVoidFunctionReturnOrThrow(node, getReturnTypeFromAnnotation(node));
             if (produceDiagnostics && !ts.getEffectiveReturnTypeNode(node)) {
                 // Report an implicit any error if there is no body, no explicit return type, and node is not a private method
                 // in an ambient context
@@ -54618,42 +56426,42 @@ var ts;
             for (var _i = 0, potentiallyUnusedIdentifiers_1 = potentiallyUnusedIdentifiers; _i < potentiallyUnusedIdentifiers_1.length; _i++) {
                 var node = potentiallyUnusedIdentifiers_1[_i];
                 switch (node.kind) {
-                    case 240 /* ClassDeclaration */:
-                    case 209 /* ClassExpression */:
+                    case 241 /* ClassDeclaration */:
+                    case 210 /* ClassExpression */:
                         checkUnusedClassMembers(node, addDiagnostic);
                         checkUnusedTypeParameters(node, addDiagnostic);
                         break;
-                    case 284 /* SourceFile */:
-                    case 244 /* ModuleDeclaration */:
-                    case 218 /* Block */:
-                    case 246 /* CaseBlock */:
-                    case 225 /* ForStatement */:
-                    case 226 /* ForInStatement */:
-                    case 227 /* ForOfStatement */:
+                    case 285 /* SourceFile */:
+                    case 245 /* ModuleDeclaration */:
+                    case 219 /* Block */:
+                    case 247 /* CaseBlock */:
+                    case 226 /* ForStatement */:
+                    case 227 /* ForInStatement */:
+                    case 228 /* ForOfStatement */:
                         checkUnusedLocalsAndParameters(node, addDiagnostic);
                         break;
-                    case 157 /* Constructor */:
-                    case 196 /* FunctionExpression */:
-                    case 239 /* FunctionDeclaration */:
-                    case 197 /* ArrowFunction */:
-                    case 156 /* MethodDeclaration */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
+                    case 158 /* Constructor */:
+                    case 197 /* FunctionExpression */:
+                    case 240 /* FunctionDeclaration */:
+                    case 198 /* ArrowFunction */:
+                    case 157 /* MethodDeclaration */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
                         if (node.body) { // Don't report unused parameters in overloads
                             checkUnusedLocalsAndParameters(node, addDiagnostic);
                         }
                         checkUnusedTypeParameters(node, addDiagnostic);
                         break;
-                    case 155 /* MethodSignature */:
-                    case 160 /* CallSignature */:
-                    case 161 /* ConstructSignature */:
-                    case 165 /* FunctionType */:
-                    case 166 /* ConstructorType */:
-                    case 242 /* TypeAliasDeclaration */:
-                    case 241 /* InterfaceDeclaration */:
+                    case 156 /* MethodSignature */:
+                    case 161 /* CallSignature */:
+                    case 162 /* ConstructSignature */:
+                    case 166 /* FunctionType */:
+                    case 167 /* ConstructorType */:
+                    case 243 /* TypeAliasDeclaration */:
+                    case 242 /* InterfaceDeclaration */:
                         checkUnusedTypeParameters(node, addDiagnostic);
                         break;
-                    case 176 /* InferType */:
+                    case 177 /* InferType */:
                         checkUnusedInferTypeParameter(node, addDiagnostic);
                         break;
                     default:
@@ -54673,11 +56481,11 @@ var ts;
             for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                 var member = _a[_i];
                 switch (member.kind) {
-                    case 156 /* MethodDeclaration */:
-                    case 154 /* PropertyDeclaration */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
-                        if (member.kind === 159 /* SetAccessor */ && member.symbol.flags & 32768 /* GetAccessor */) {
+                    case 157 /* MethodDeclaration */:
+                    case 155 /* PropertyDeclaration */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
+                        if (member.kind === 160 /* SetAccessor */ && member.symbol.flags & 32768 /* GetAccessor */) {
                             // Already would have reported an error on the getter.
                             break;
                         }
@@ -54686,7 +56494,7 @@ var ts;
                             addDiagnostic(member, 0 /* Local */, ts.createDiagnosticForNode(member.name, ts.Diagnostics._0_is_declared_but_its_value_is_never_read, symbolToString(symbol)));
                         }
                         break;
-                    case 157 /* Constructor */:
+                    case 158 /* Constructor */:
                         for (var _b = 0, _c = member.parameters; _b < _c.length; _b++) {
                             var parameter = _c[_b];
                             if (!parameter.symbol.isReferenced && ts.hasModifier(parameter, 8 /* Private */)) {
@@ -54694,8 +56502,8 @@ var ts;
                             }
                         }
                         break;
-                    case 162 /* IndexSignature */:
-                    case 217 /* SemicolonClassElement */:
+                    case 163 /* IndexSignature */:
+                    case 218 /* SemicolonClassElement */:
                         // Can't be private
                         break;
                     default:
@@ -54722,7 +56530,7 @@ var ts;
                     continue;
                 var name = ts.idText(typeParameter.name);
                 var parent = typeParameter.parent;
-                if (parent.kind !== 176 /* InferType */ && parent.typeParameters.every(isTypeParameterUnused)) {
+                if (parent.kind !== 177 /* InferType */ && parent.typeParameters.every(isTypeParameterUnused)) {
                     if (seenParentsWithEveryUnused.tryAdd(parent)) {
                         var range = ts.isJSDocTemplateTag(parent)
                             // Whole @template tag
@@ -54807,7 +56615,7 @@ var ts;
                 var importDecl = importClause.parent;
                 var nDeclarations = (importClause.name ? 1 : 0) +
                     (importClause.namedBindings ?
-                        (importClause.namedBindings.kind === 251 /* NamespaceImport */ ? 1 : importClause.namedBindings.elements.length)
+                        (importClause.namedBindings.kind === 252 /* NamespaceImport */ ? 1 : importClause.namedBindings.elements.length)
                         : 0);
                 if (nDeclarations === unuseds.length) {
                     addDiagnostic(importDecl, 0 /* Local */, unuseds.length === 1
@@ -54825,7 +56633,7 @@ var ts;
                 var bindingPattern = _a[0], bindingElements = _a[1];
                 var kind = tryGetRootParameterDeclaration(bindingPattern.parent) ? 1 /* Parameter */ : 0 /* Local */;
                 if (bindingPattern.elements.length === bindingElements.length) {
-                    if (bindingElements.length === 1 && bindingPattern.parent.kind === 237 /* VariableDeclaration */ && bindingPattern.parent.parent.kind === 238 /* VariableDeclarationList */) {
+                    if (bindingElements.length === 1 && bindingPattern.parent.kind === 238 /* VariableDeclaration */ && bindingPattern.parent.parent.kind === 239 /* VariableDeclarationList */) {
                         addToGroup(unusedVariables, bindingPattern.parent.parent, bindingPattern.parent, getNodeId);
                     }
                     else {
@@ -54846,7 +56654,7 @@ var ts;
                 if (declarationList.declarations.length === declarations.length) {
                     addDiagnostic(declarationList, 0 /* Local */, declarations.length === 1
                         ? ts.createDiagnosticForNode(ts.first(declarations).name, ts.Diagnostics._0_is_declared_but_its_value_is_never_read, bindingNameText(ts.first(declarations).name))
-                        : ts.createDiagnosticForNode(declarationList.parent.kind === 219 /* VariableStatement */ ? declarationList.parent : declarationList, ts.Diagnostics.All_variables_are_unused));
+                        : ts.createDiagnosticForNode(declarationList.parent.kind === 220 /* VariableStatement */ ? declarationList.parent : declarationList, ts.Diagnostics.All_variables_are_unused));
                 }
                 else {
                     for (var _i = 0, declarations_5 = declarations; _i < declarations_5.length; _i++) {
@@ -54858,24 +56666,24 @@ var ts;
         }
         function bindingNameText(name) {
             switch (name.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return ts.idText(name);
-                case 185 /* ArrayBindingPattern */:
-                case 184 /* ObjectBindingPattern */:
+                case 186 /* ArrayBindingPattern */:
+                case 185 /* ObjectBindingPattern */:
                     return bindingNameText(ts.cast(ts.first(name.elements), ts.isBindingElement).name);
                 default:
                     return ts.Debug.assertNever(name);
             }
         }
         function isImportedDeclaration(node) {
-            return node.kind === 250 /* ImportClause */ || node.kind === 253 /* ImportSpecifier */ || node.kind === 251 /* NamespaceImport */;
+            return node.kind === 251 /* ImportClause */ || node.kind === 254 /* ImportSpecifier */ || node.kind === 252 /* NamespaceImport */;
         }
         function importClauseFromImported(decl) {
-            return decl.kind === 250 /* ImportClause */ ? decl : decl.kind === 251 /* NamespaceImport */ ? decl.parent : decl.parent.parent;
+            return decl.kind === 251 /* ImportClause */ ? decl : decl.kind === 252 /* NamespaceImport */ ? decl.parent : decl.parent.parent;
         }
         function checkBlock(node) {
             // Grammar checking for SyntaxKind.Block
-            if (node.kind === 218 /* Block */) {
+            if (node.kind === 219 /* Block */) {
                 checkGrammarStatementInAmbientContext(node);
             }
             if (ts.isFunctionOrModuleBlock(node)) {
@@ -54905,12 +56713,12 @@ var ts;
             if (!(identifier && identifier.escapedText === name)) {
                 return false;
             }
-            if (node.kind === 154 /* PropertyDeclaration */ ||
-                node.kind === 153 /* PropertySignature */ ||
-                node.kind === 156 /* MethodDeclaration */ ||
-                node.kind === 155 /* MethodSignature */ ||
-                node.kind === 158 /* GetAccessor */ ||
-                node.kind === 159 /* SetAccessor */) {
+            if (node.kind === 155 /* PropertyDeclaration */ ||
+                node.kind === 154 /* PropertySignature */ ||
+                node.kind === 157 /* MethodDeclaration */ ||
+                node.kind === 156 /* MethodSignature */ ||
+                node.kind === 159 /* GetAccessor */ ||
+                node.kind === 160 /* SetAccessor */) {
                 // it is ok to have member named '_super' or '_this' - member access is always qualified
                 return false;
             }
@@ -54919,7 +56727,7 @@ var ts;
                 return false;
             }
             var root = ts.getRootDeclaration(node);
-            if (root.kind === 151 /* Parameter */ && ts.nodeIsMissing(root.parent.body)) {
+            if (root.kind === 152 /* Parameter */ && ts.nodeIsMissing(root.parent.body)) {
                 // just an overload - no codegen impact
                 return false;
             }
@@ -54929,7 +56737,7 @@ var ts;
         function checkIfThisIsCapturedInEnclosingScope(node) {
             ts.findAncestor(node, function (current) {
                 if (getNodeCheckFlags(current) & 4 /* CaptureThis */) {
-                    var isDeclaration_1 = node.kind !== 72 /* Identifier */;
+                    var isDeclaration_1 = node.kind !== 73 /* Identifier */;
                     if (isDeclaration_1) {
                         error(ts.getNameOfDeclaration(node), ts.Diagnostics.Duplicate_identifier_this_Compiler_uses_variable_declaration_this_to_capture_this_reference);
                     }
@@ -54944,7 +56752,7 @@ var ts;
         function checkIfNewTargetIsCapturedInEnclosingScope(node) {
             ts.findAncestor(node, function (current) {
                 if (getNodeCheckFlags(current) & 8 /* CaptureNewTarget */) {
-                    var isDeclaration_2 = node.kind !== 72 /* Identifier */;
+                    var isDeclaration_2 = node.kind !== 73 /* Identifier */;
                     if (isDeclaration_2) {
                         error(ts.getNameOfDeclaration(node), ts.Diagnostics.Duplicate_identifier_newTarget_Compiler_uses_variable_declaration_newTarget_to_capture_new_target_meta_property_reference);
                     }
@@ -54970,7 +56778,7 @@ var ts;
             }
             // In case of variable declaration, node.parent is variable statement so look at the variable statement's parent
             var parent = getDeclarationContainer(node);
-            if (parent.kind === 284 /* SourceFile */ && ts.isExternalOrCommonJsModule(parent)) {
+            if (parent.kind === 285 /* SourceFile */ && ts.isExternalOrCommonJsModule(parent)) {
                 // If the declaration happens to be in external module, report error that require and exports are reserved keywords
                 error(name, ts.Diagnostics.Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module, ts.declarationNameToString(name), ts.declarationNameToString(name));
             }
@@ -54985,7 +56793,7 @@ var ts;
             }
             // In case of variable declaration, node.parent is variable statement so look at the variable statement's parent
             var parent = getDeclarationContainer(node);
-            if (parent.kind === 284 /* SourceFile */ && ts.isExternalOrCommonJsModule(parent) && parent.flags & 1024 /* HasAsyncFunctions */) {
+            if (parent.kind === 285 /* SourceFile */ && ts.isExternalOrCommonJsModule(parent) && parent.flags & 1024 /* HasAsyncFunctions */) {
                 // If the declaration happens to be in external module, report error that Promise is a reserved identifier.
                 error(name, ts.Diagnostics.Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module_containing_async_functions, ts.declarationNameToString(name), ts.declarationNameToString(name));
             }
@@ -55020,7 +56828,7 @@ var ts;
             // skip variable declarations that don't have initializers
             // NOTE: in ES6 spec initializer is required in variable declarations where name is binding pattern
             // so we'll always treat binding elements as initialized
-            if (node.kind === 237 /* VariableDeclaration */ && !node.initializer) {
+            if (node.kind === 238 /* VariableDeclaration */ && !node.initializer) {
                 return;
             }
             var symbol = getSymbolOfNode(node);
@@ -55032,17 +56840,17 @@ var ts;
                     localDeclarationSymbol !== symbol &&
                     localDeclarationSymbol.flags & 2 /* BlockScopedVariable */) {
                     if (getDeclarationNodeFlagsFromSymbol(localDeclarationSymbol) & 3 /* BlockScoped */) {
-                        var varDeclList = ts.getAncestor(localDeclarationSymbol.valueDeclaration, 238 /* VariableDeclarationList */);
-                        var container = varDeclList.parent.kind === 219 /* VariableStatement */ && varDeclList.parent.parent
+                        var varDeclList = ts.getAncestor(localDeclarationSymbol.valueDeclaration, 239 /* VariableDeclarationList */);
+                        var container = varDeclList.parent.kind === 220 /* VariableStatement */ && varDeclList.parent.parent
                             ? varDeclList.parent.parent
                             : undefined;
                         // names of block-scoped and function scoped variables can collide only
                         // if block scoped variable is defined in the function\module\source file scope (because of variable hoisting)
                         var namesShareScope = container &&
-                            (container.kind === 218 /* Block */ && ts.isFunctionLike(container.parent) ||
-                                container.kind === 245 /* ModuleBlock */ ||
-                                container.kind === 244 /* ModuleDeclaration */ ||
-                                container.kind === 284 /* SourceFile */);
+                            (container.kind === 219 /* Block */ && ts.isFunctionLike(container.parent) ||
+                                container.kind === 246 /* ModuleBlock */ ||
+                                container.kind === 245 /* ModuleDeclaration */ ||
+                                container.kind === 285 /* SourceFile */);
                         // here we know that function scoped variable is shadowed by block scoped one
                         // if they are defined in the same scope - binder has already reported redeclaration error
                         // otherwise if variable has an initializer - show error that initialization will fail
@@ -55055,69 +56863,6 @@ var ts;
                 }
             }
         }
-        // Check that a parameter initializer contains no references to parameters declared to the right of itself
-        function checkParameterInitializer(node) {
-            if (ts.getRootDeclaration(node).kind !== 151 /* Parameter */) {
-                return;
-            }
-            var func = ts.getContainingFunction(node);
-            visit(node.initializer);
-            function visit(n) {
-                if (ts.isTypeNode(n) || ts.isDeclarationName(n)) {
-                    // do not dive in types
-                    // skip declaration names (i.e. in object literal expressions)
-                    return;
-                }
-                if (n.kind === 189 /* PropertyAccessExpression */) {
-                    // skip property names in property access expression
-                    return visit(n.expression);
-                }
-                else if (n.kind === 72 /* Identifier */) {
-                    // check FunctionLikeDeclaration.locals (stores parameters\function local variable)
-                    // if it contains entry with a specified name
-                    var symbol = resolveName(n, n.escapedText, 67220415 /* Value */ | 2097152 /* Alias */, /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined, /*isUse*/ false);
-                    if (!symbol || symbol === unknownSymbol || !symbol.valueDeclaration) {
-                        return;
-                    }
-                    if (symbol.valueDeclaration === node) {
-                        error(n, ts.Diagnostics.Parameter_0_cannot_be_referenced_in_its_initializer, ts.declarationNameToString(node.name));
-                        return;
-                    }
-                    // locals map for function contain both parameters and function locals
-                    // so we need to do a bit of extra work to check if reference is legal
-                    var enclosingContainer = ts.getEnclosingBlockScopeContainer(symbol.valueDeclaration);
-                    if (enclosingContainer === func) {
-                        if (symbol.valueDeclaration.kind === 151 /* Parameter */ ||
-                            symbol.valueDeclaration.kind === 186 /* BindingElement */) {
-                            // it is ok to reference parameter in initializer if either
-                            // - parameter is located strictly on the left of current parameter declaration
-                            if (symbol.valueDeclaration.pos < node.pos) {
-                                return;
-                            }
-                            // - parameter is wrapped in function-like entity
-                            if (ts.findAncestor(n, function (current) {
-                                if (current === node.initializer) {
-                                    return "quit";
-                                }
-                                return ts.isFunctionLike(current.parent) ||
-                                    // computed property names/initializers in instance property declaration of class like entities
-                                    // are executed in constructor and thus deferred
-                                    (current.parent.kind === 154 /* PropertyDeclaration */ &&
-                                        !(ts.hasModifier(current.parent, 32 /* Static */)) &&
-                                        ts.isClassLike(current.parent.parent));
-                            })) {
-                                return;
-                            }
-                            // fall through to report error
-                        }
-                        error(n, ts.Diagnostics.Initializer_of_parameter_0_cannot_reference_identifier_1_declared_after_it, ts.declarationNameToString(node.name), ts.declarationNameToString(n));
-                    }
-                }
-                else {
-                    return ts.forEachChild(n, visit);
-                }
-            }
-        }
         function convertAutoToAny(type) {
             return type === autoType ? anyType : type === autoArrayType ? anyArrayType : type;
         }
@@ -55135,18 +56880,18 @@ var ts;
             // Do not use hasDynamicName here, because that returns false for well known symbols.
             // We want to perform checkComputedPropertyName for all computed properties, including
             // well known symbols.
-            if (node.name.kind === 149 /* ComputedPropertyName */) {
+            if (node.name.kind === 150 /* ComputedPropertyName */) {
                 checkComputedPropertyName(node.name);
                 if (node.initializer) {
                     checkExpressionCached(node.initializer);
                 }
             }
-            if (node.kind === 186 /* BindingElement */) {
-                if (node.parent.kind === 184 /* ObjectBindingPattern */ && languageVersion < 7 /* ESNext */) {
+            if (node.kind === 187 /* BindingElement */) {
+                if (node.parent.kind === 185 /* ObjectBindingPattern */ && languageVersion < 99 /* ESNext */) {
                     checkExternalEmitHelpers(node, 4 /* Rest */);
                 }
                 // check computed properties inside property names of binding elements
-                if (node.propertyName && node.propertyName.kind === 149 /* ComputedPropertyName */) {
+                if (node.propertyName && node.propertyName.kind === 150 /* ComputedPropertyName */) {
                     checkComputedPropertyName(node.propertyName);
                 }
                 // check private/protected variable access
@@ -55160,35 +56905,48 @@ var ts;
                         var property = getPropertyOfType(parentType, nameText);
                         if (property) {
                             markPropertyAsReferenced(property, /*nodeForCheckWriteOnly*/ undefined, /*isThisAccess*/ false); // A destructuring is never a write-only reference.
-                            checkPropertyAccessibility(parent, !!parent.initializer && parent.initializer.kind === 98 /* SuperKeyword */, parentType, property);
+                            checkPropertyAccessibility(parent, !!parent.initializer && parent.initializer.kind === 99 /* SuperKeyword */, parentType, property);
                         }
                     }
                 }
             }
             // For a binding pattern, check contained binding elements
             if (ts.isBindingPattern(node.name)) {
-                if (node.name.kind === 185 /* ArrayBindingPattern */ && languageVersion < 2 /* ES2015 */ && compilerOptions.downlevelIteration) {
+                if (node.name.kind === 186 /* ArrayBindingPattern */ && languageVersion < 2 /* ES2015 */ && compilerOptions.downlevelIteration) {
                     checkExternalEmitHelpers(node, 512 /* Read */);
                 }
                 ts.forEach(node.name.elements, checkSourceElement);
             }
             // For a parameter declaration with an initializer, error and exit if the containing function doesn't have a body
-            if (node.initializer && ts.getRootDeclaration(node).kind === 151 /* Parameter */ && ts.nodeIsMissing(ts.getContainingFunction(node).body)) {
+            if (node.initializer && ts.getRootDeclaration(node).kind === 152 /* Parameter */ && ts.nodeIsMissing(ts.getContainingFunction(node).body)) {
                 error(node, ts.Diagnostics.A_parameter_initializer_is_only_allowed_in_a_function_or_constructor_implementation);
                 return;
             }
             // For a binding pattern, validate the initializer and exit
             if (ts.isBindingPattern(node.name)) {
-                // Don't validate for-in initializer as it is already an error
-                if (node.initializer && node.parent.parent.kind !== 226 /* ForInStatement */) {
-                    var initializerType = checkExpressionCached(node.initializer);
-                    if (strictNullChecks && node.name.elements.length === 0) {
-                        checkNonNullType(initializerType, node);
+                var needCheckInitializer = node.initializer && node.parent.parent.kind !== 227 /* ForInStatement */;
+                var needCheckWidenedType = node.name.elements.length === 0;
+                if (needCheckInitializer || needCheckWidenedType) {
+                    // Don't validate for-in initializer as it is already an error
+                    var widenedType = getWidenedTypeForVariableLikeDeclaration(node);
+                    if (needCheckInitializer) {
+                        var initializerType = checkExpressionCached(node.initializer);
+                        if (strictNullChecks && needCheckWidenedType) {
+                            checkNonNullNonVoidType(initializerType, node);
+                        }
+                        else {
+                            checkTypeAssignableToAndOptionallyElaborate(initializerType, getWidenedTypeForVariableLikeDeclaration(node), node, node.initializer);
+                        }
                     }
-                    else {
-                        checkTypeAssignableToAndOptionallyElaborate(initializerType, getWidenedTypeForVariableLikeDeclaration(node), node, node.initializer);
+                    // check the binding pattern with empty elements
+                    if (needCheckWidenedType) {
+                        if (ts.isArrayBindingPattern(node.name)) {
+                            checkIteratedTypeOrElementType(65 /* Destructuring */, widenedType, undefinedType, node);
+                        }
+                        else if (strictNullChecks) {
+                            checkNonNullNonVoidType(widenedType, node);
+                        }
                     }
-                    checkParameterInitializer(node);
                 }
                 return;
             }
@@ -55203,9 +56961,8 @@ var ts;
                         ts.isObjectLiteralExpression(initializer) &&
                         (initializer.properties.length === 0 || ts.isPrototypeAccess(node.name)) &&
                         ts.hasEntries(symbol.exports);
-                    if (!isJSObjectLiteralInitializer && node.parent.parent.kind !== 226 /* ForInStatement */) {
+                    if (!isJSObjectLiteralInitializer && node.parent.parent.kind !== 227 /* ForInStatement */) {
                         checkTypeAssignableToAndOptionallyElaborate(checkExpressionCached(initializer), type, node, initializer, /*headMessage*/ undefined);
-                        checkParameterInitializer(node);
                     }
                 }
                 if (symbol.declarations.length > 1) {
@@ -55221,7 +56978,7 @@ var ts;
                 if (type !== errorType && declarationType !== errorType &&
                     !isTypeIdenticalTo(type, declarationType) &&
                     !(symbol.flags & 67108864 /* Assignment */)) {
-                    errorNextVariableOrPropertyDeclarationMustHaveSameType(type, node, declarationType);
+                    errorNextVariableOrPropertyDeclarationMustHaveSameType(symbol.valueDeclaration, type, node, declarationType);
                 }
                 if (node.initializer) {
                     checkTypeAssignableToAndOptionallyElaborate(checkExpressionCached(node.initializer), declarationType, node, node.initializer, /*headMessage*/ undefined);
@@ -55230,26 +56987,30 @@ var ts;
                     error(node.name, ts.Diagnostics.All_declarations_of_0_must_have_identical_modifiers, ts.declarationNameToString(node.name));
                 }
             }
-            if (node.kind !== 154 /* PropertyDeclaration */ && node.kind !== 153 /* PropertySignature */) {
+            if (node.kind !== 155 /* PropertyDeclaration */ && node.kind !== 154 /* PropertySignature */) {
                 // We know we don't have a binding pattern or computed name here
                 checkExportsOnMergedDeclarations(node);
-                if (node.kind === 237 /* VariableDeclaration */ || node.kind === 186 /* BindingElement */) {
+                if (node.kind === 238 /* VariableDeclaration */ || node.kind === 187 /* BindingElement */) {
                     checkVarDeclaredNamesNotShadowed(node);
                 }
                 checkCollisionWithRequireExportsInGeneratedCode(node, node.name);
                 checkCollisionWithGlobalPromiseInGeneratedCode(node, node.name);
             }
         }
-        function errorNextVariableOrPropertyDeclarationMustHaveSameType(firstType, nextDeclaration, nextType) {
+        function errorNextVariableOrPropertyDeclarationMustHaveSameType(firstDeclaration, firstType, nextDeclaration, nextType) {
             var nextDeclarationName = ts.getNameOfDeclaration(nextDeclaration);
-            var message = nextDeclaration.kind === 154 /* PropertyDeclaration */ || nextDeclaration.kind === 153 /* PropertySignature */
+            var message = nextDeclaration.kind === 155 /* PropertyDeclaration */ || nextDeclaration.kind === 154 /* PropertySignature */
                 ? ts.Diagnostics.Subsequent_property_declarations_must_have_the_same_type_Property_0_must_be_of_type_1_but_here_has_type_2
                 : ts.Diagnostics.Subsequent_variable_declarations_must_have_the_same_type_Variable_0_must_be_of_type_1_but_here_has_type_2;
-            error(nextDeclarationName, message, ts.declarationNameToString(nextDeclarationName), typeToString(firstType), typeToString(nextType));
+            var declName = ts.declarationNameToString(nextDeclarationName);
+            var err = error(nextDeclarationName, message, declName, typeToString(firstType), typeToString(nextType));
+            if (firstDeclaration) {
+                ts.addRelatedInfo(err, ts.createDiagnosticForNode(firstDeclaration, ts.Diagnostics._0_was_also_declared_here, declName));
+            }
         }
         function areDeclarationFlagsIdentical(left, right) {
-            if ((left.kind === 151 /* Parameter */ && right.kind === 237 /* VariableDeclaration */) ||
-                (left.kind === 237 /* VariableDeclaration */ && right.kind === 151 /* Parameter */)) {
+            if ((left.kind === 152 /* Parameter */ && right.kind === 238 /* VariableDeclaration */) ||
+                (left.kind === 238 /* VariableDeclaration */ && right.kind === 152 /* Parameter */)) {
                 // Differences in optionality between parameters and variables are allowed.
                 return true;
             }
@@ -55288,7 +57049,7 @@ var ts;
             checkGrammarStatementInAmbientContext(node);
             checkTruthinessExpression(node.expression);
             checkSourceElement(node.thenStatement);
-            if (node.thenStatement.kind === 220 /* EmptyStatement */) {
+            if (node.thenStatement.kind === 221 /* EmptyStatement */) {
                 error(node.thenStatement, ts.Diagnostics.The_body_of_an_if_statement_cannot_be_the_empty_statement);
             }
             checkSourceElement(node.elseStatement);
@@ -55315,12 +57076,12 @@ var ts;
         function checkForStatement(node) {
             // Grammar checking
             if (!checkGrammarStatementInAmbientContext(node)) {
-                if (node.initializer && node.initializer.kind === 238 /* VariableDeclarationList */) {
+                if (node.initializer && node.initializer.kind === 239 /* VariableDeclarationList */) {
                     checkGrammarVariableDeclarationList(node.initializer);
                 }
             }
             if (node.initializer) {
-                if (node.initializer.kind === 238 /* VariableDeclarationList */) {
+                if (node.initializer.kind === 239 /* VariableDeclarationList */) {
                     ts.forEach(node.initializer.declarations, checkVariableDeclaration);
                 }
                 else {
@@ -55340,9 +57101,9 @@ var ts;
             checkGrammarForInOrForOfStatement(node);
             if (node.awaitModifier) {
                 var functionFlags = ts.getFunctionFlags(ts.getContainingFunction(node));
-                if ((functionFlags & (4 /* Invalid */ | 2 /* Async */)) === 2 /* Async */ && languageVersion < 7 /* ESNext */) {
+                if ((functionFlags & (4 /* Invalid */ | 2 /* Async */)) === 2 /* Async */ && languageVersion < 99 /* ESNext */) {
                     // for..await..of in an async function or async generator function prior to ESNext requires the __asyncValues helper
-                    checkExternalEmitHelpers(node, 16384 /* ForAwaitOfIncludes */);
+                    checkExternalEmitHelpers(node, 32768 /* ForAwaitOfIncludes */);
                 }
             }
             else if (compilerOptions.downlevelIteration && languageVersion < 2 /* ES2015 */) {
@@ -55354,14 +57115,14 @@ var ts;
             // via checkRightHandSideOfForOf.
             // If the LHS is an expression, check the LHS, as a destructuring assignment or as a reference.
             // Then check that the RHS is assignable to it.
-            if (node.initializer.kind === 238 /* VariableDeclarationList */) {
+            if (node.initializer.kind === 239 /* VariableDeclarationList */) {
                 checkForInOrForOfVariableDeclaration(node);
             }
             else {
                 var varExpr = node.initializer;
                 var iteratedType = checkRightHandSideOfForOf(node.expression, node.awaitModifier);
                 // There may be a destructuring assignment on the left side
-                if (varExpr.kind === 187 /* ArrayLiteralExpression */ || varExpr.kind === 188 /* ObjectLiteralExpression */) {
+                if (varExpr.kind === 188 /* ArrayLiteralExpression */ || varExpr.kind === 189 /* ObjectLiteralExpression */) {
                     // iteratedType may be undefined. In this case, we still want to check the structure of
                     // varExpr, in particular making sure it's a valid LeftHandSideExpression. But we'd like
                     // to short circuit the type relation checking as much as possible, so we pass the unknownType.
@@ -55393,7 +57154,7 @@ var ts;
             // for (let VarDecl in Expr) Statement
             //   VarDecl must be a variable declaration without a type annotation that declares a variable of type Any,
             //   and Expr must be an expression of type Any, an object type, or a type parameter type.
-            if (node.initializer.kind === 238 /* VariableDeclarationList */) {
+            if (node.initializer.kind === 239 /* VariableDeclarationList */) {
                 var variable = node.initializer.declarations[0];
                 if (variable && ts.isBindingPattern(variable.name)) {
                     error(variable.name, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern);
@@ -55407,7 +57168,7 @@ var ts;
                 //   and Expr must be an expression of type Any, an object type, or a type parameter type.
                 var varExpr = node.initializer;
                 var leftType = checkExpression(varExpr);
-                if (varExpr.kind === 187 /* ArrayLiteralExpression */ || varExpr.kind === 188 /* ObjectLiteralExpression */) {
+                if (varExpr.kind === 188 /* ArrayLiteralExpression */ || varExpr.kind === 189 /* ObjectLiteralExpression */) {
                     error(varExpr, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern);
                 }
                 else if (!isTypeAssignableTo(getIndexTypeOrString(rightType), leftType)) {
@@ -55438,20 +57199,22 @@ var ts;
         }
         function checkRightHandSideOfForOf(rhsExpression, awaitModifier) {
             var expressionType = checkNonNullExpression(rhsExpression);
-            return checkIteratedTypeOrElementType(expressionType, rhsExpression, /*allowStringInput*/ true, awaitModifier !== undefined);
+            var use = awaitModifier ? 15 /* ForAwaitOf */ : 13 /* ForOf */;
+            return checkIteratedTypeOrElementType(use, expressionType, undefinedType, rhsExpression);
         }
-        function checkIteratedTypeOrElementType(inputType, errorNode, allowStringInput, allowAsyncIterables) {
+        function checkIteratedTypeOrElementType(use, inputType, sentType, errorNode) {
             if (isTypeAny(inputType)) {
                 return inputType;
             }
-            return getIteratedTypeOrElementType(inputType, errorNode, allowStringInput, allowAsyncIterables, /*checkAssignability*/ true) || anyType;
+            return getIteratedTypeOrElementType(use, inputType, sentType, errorNode, /*checkAssignability*/ true) || anyType;
         }
         /**
          * When consuming an iterable type in a for..of, spread, or iterator destructuring assignment
          * we want to get the iterated type of an iterable for ES2015 or later, or the iterated type
          * of a iterable (if defined globally) or element type of an array like for ES2015 or earlier.
          */
-        function getIteratedTypeOrElementType(inputType, errorNode, allowStringInput, allowAsyncIterables, checkAssignability) {
+        function getIteratedTypeOrElementType(use, inputType, sentType, errorNode, checkAssignability) {
+            var allowAsyncIterables = (use & 2 /* AllowsAsyncIterablesFlag */) !== 0;
             if (inputType === neverType) {
                 reportTypeNotIterableError(errorNode, inputType, allowAsyncIterables); // TODO: GH#18217
                 return undefined;
@@ -55463,9 +57226,21 @@ var ts;
             // downlevelIteration is requested.
             if (uplevelIteration || downlevelIteration || allowAsyncIterables) {
                 // We only report errors for an invalid iterable type in ES2015 or higher.
-                var iteratedType = getIteratedTypeOfIterable(inputType, uplevelIteration ? errorNode : undefined, allowAsyncIterables, /*allowSyncIterables*/ true, checkAssignability);
-                if (iteratedType || uplevelIteration) {
-                    return iteratedType;
+                var iterationTypes = getIterationTypesOfIterable(inputType, use, uplevelIteration ? errorNode : undefined);
+                if (checkAssignability) {
+                    if (iterationTypes) {
+                        var diagnostic = use & 8 /* ForOfFlag */ ? ts.Diagnostics.Cannot_iterate_value_because_the_next_method_of_its_iterator_expects_type_1_but_for_of_will_always_send_0 :
+                            use & 32 /* SpreadFlag */ ? ts.Diagnostics.Cannot_iterate_value_because_the_next_method_of_its_iterator_expects_type_1_but_array_spread_will_always_send_0 :
+                                use & 64 /* DestructuringFlag */ ? ts.Diagnostics.Cannot_iterate_value_because_the_next_method_of_its_iterator_expects_type_1_but_array_destructuring_will_always_send_0 :
+                                    use & 16 /* YieldStarFlag */ ? ts.Diagnostics.Cannot_delegate_iteration_to_value_because_the_next_method_of_its_iterator_expects_type_1_but_the_containing_generator_will_always_send_0 :
+                                        undefined;
+                        if (diagnostic) {
+                            checkTypeAssignableTo(sentType, iterationTypes.nextType, errorNode, diagnostic);
+                        }
+                    }
+                }
+                if (iterationTypes || uplevelIteration) {
+                    return iterationTypes && iterationTypes.yieldType;
                 }
             }
             var arrayType = inputType;
@@ -55474,7 +57249,7 @@ var ts;
             // If strings are permitted, remove any string-like constituents from the array type.
             // This allows us to find other non-string element types from an array unioned with
             // a string.
-            if (allowStringInput) {
+            if (use & 4 /* AllowsStringInputFlag */) {
                 if (arrayType.flags & 1048576 /* Union */) {
                     // After we remove all types that are StringLike, we will know if there was a string constituent
                     // based on whether the result of filter is a new array.
@@ -55509,19 +57284,19 @@ var ts;
                     // want to say that number is not an array type. But if the input was just
                     // number and string input is allowed, we want to say that number is not an
                     // array type or a string type.
-                    var isIterable = !!getIteratedTypeOfIterable(inputType, /* errorNode */ undefined, allowAsyncIterables, /*allowSyncIterables*/ true, checkAssignability);
-                    var diagnostic = !allowStringInput || hasStringConstituent
+                    var yieldType = getIterationTypeOfIterable(use, 0 /* Yield */, inputType, /*errorNode*/ undefined);
+                    var _a = !(use & 4 /* AllowsStringInputFlag */) || hasStringConstituent
                         ? downlevelIteration
-                            ? ts.Diagnostics.Type_0_is_not_an_array_type_or_does_not_have_a_Symbol_iterator_method_that_returns_an_iterator
-                            : isIterable
-                                ? ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type_Use_compiler_option_downlevelIteration_to_allow_iterating_of_iterators
-                                : ts.Diagnostics.Type_0_is_not_an_array_type
+                            ? [ts.Diagnostics.Type_0_is_not_an_array_type_or_does_not_have_a_Symbol_iterator_method_that_returns_an_iterator, true]
+                            : yieldType
+                                ? [ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type_Use_compiler_option_downlevelIteration_to_allow_iterating_of_iterators, false]
+                                : [ts.Diagnostics.Type_0_is_not_an_array_type, true]
                         : downlevelIteration
-                            ? ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type_or_does_not_have_a_Symbol_iterator_method_that_returns_an_iterator
-                            : isIterable
-                                ? ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type_Use_compiler_option_downlevelIteration_to_allow_iterating_of_iterators
-                                : ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type;
-                    error(errorNode, diagnostic, typeToString(arrayType));
+                            ? [ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type_or_does_not_have_a_Symbol_iterator_method_that_returns_an_iterator, true]
+                            : yieldType
+                                ? [ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type_Use_compiler_option_downlevelIteration_to_allow_iterating_of_iterators, false]
+                                : [ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type, true], defaultDiagnostic = _a[0], maybeMissingAwait = _a[1];
+                    errorAndMaybeSuggestAwait(errorNode, maybeMissingAwait && !!getAwaitedTypeOfPromise(arrayType), defaultDiagnostic, typeToString(arrayType));
                 }
                 return hasStringConstituent ? stringType : undefined;
             }
@@ -55536,33 +57311,78 @@ var ts;
             return arrayElementType;
         }
         /**
-         * We want to treat type as an iterable, and get the type it is an iterable of. The iterable
-         * must have the following structure (annotated with the names of the variables below):
+         * Gets the requested "iteration type" from an `Iterable`-like or `AsyncIterable`-like type.
+         */
+        function getIterationTypeOfIterable(use, typeKind, inputType, errorNode) {
+            if (isTypeAny(inputType)) {
+                return undefined;
+            }
+            var iterationTypes = getIterationTypesOfIterable(inputType, use, errorNode);
+            return iterationTypes && iterationTypes[getIterationTypesKeyFromIterationTypeKind(typeKind)];
+        }
+        function createIterationTypes(yieldType, returnType, nextType) {
+            // `yieldType` and `returnType` are defaulted to `neverType` they each will be combined
+            // via `getUnionType` when merging iteration types. `nextType` is defined as `unknownType`
+            // as it is combined via `getIntersectionType` when merging iteration types.
+            if (yieldType === void 0) { yieldType = neverType; }
+            if (returnType === void 0) { returnType = neverType; }
+            if (nextType === void 0) { nextType = unknownType; }
+            // Use the cache only for intrinsic types to keep it small as they are likely to be
+            // more frequently created (i.e. `Iterator<number, void, unknown>`). Iteration types
+            // are also cached on the type they are requested for, so we shouldn't need to maintain
+            // the cache for less-frequently used types.
+            if (yieldType.flags & 67359327 /* Intrinsic */ &&
+                returnType.flags & (1 /* Any */ | 131072 /* Never */ | 2 /* Unknown */ | 16384 /* Void */ | 32768 /* Undefined */) &&
+                nextType.flags & (1 /* Any */ | 131072 /* Never */ | 2 /* Unknown */ | 16384 /* Void */ | 32768 /* Undefined */)) {
+                var id = getTypeListId([yieldType, returnType, nextType]);
+                var iterationTypes = iterationTypesCache.get(id);
+                if (!iterationTypes) {
+                    iterationTypes = { yieldType: yieldType, returnType: returnType, nextType: nextType };
+                    iterationTypesCache.set(id, iterationTypes);
+                }
+                return iterationTypes;
+            }
+            return { yieldType: yieldType, returnType: returnType, nextType: nextType };
+        }
+        /**
+         * Combines multiple `IterationTypes` records.
          *
-         *     { // iterable
-         *         [Symbol.iterator]: { // iteratorMethod
-         *             (): Iterator<T>
-         *         }
-         *     }
+         * If `array` is empty or all elements are missing or are references to `noIterationTypes`,
+         * then `noIterationTypes` is returned. Otherwise, an `IterationTypes` record is returned
+         * for the combined iteration types.
+         */
+        function combineIterationTypes(array) {
+            var yieldTypes;
+            var returnTypes;
+            var nextTypes;
+            for (var _i = 0, array_10 = array; _i < array_10.length; _i++) {
+                var iterationTypes = array_10[_i];
+                if (iterationTypes === undefined || iterationTypes === noIterationTypes) {
+                    continue;
+                }
+                if (iterationTypes === anyIterationTypes) {
+                    return anyIterationTypes;
+                }
+                yieldTypes = ts.append(yieldTypes, iterationTypes.yieldType);
+                returnTypes = ts.append(returnTypes, iterationTypes.returnType);
+                nextTypes = ts.append(nextTypes, iterationTypes.nextType);
+            }
+            if (yieldTypes || returnTypes || nextTypes) {
+                return createIterationTypes(yieldTypes && getUnionType(yieldTypes), returnTypes && getUnionType(returnTypes), nextTypes && getIntersectionType(nextTypes));
+            }
+            return noIterationTypes;
+        }
+        /**
+         * Gets the *yield*, *return*, and *next* types from an `Iterable`-like or `AsyncIterable`-like type.
          *
-         * For an async iterable, we expect the following structure:
-         *
-         *     { // iterable
-         *         [Symbol.asyncIterator]: { // iteratorMethod
-         *             (): AsyncIterator<T>
-         *         }
-         *     }
-         *
-         * T is the type we are after. At every level that involves analyzing return types
-         * of signatures, we union the return types of all the signatures.
+         * At every level that involves analyzing return types of signatures, we union the return types of all the signatures.
          *
          * Another thing to note is that at any step of this process, we could run into a dead end,
          * meaning either the property is missing, or we run into the anyType. If either of these things
-         * happens, we return undefined to signal that we could not find the iterated type. If a property
-         * is missing, and the previous step did not result in 'any', then we also give an error if the
+         * happens, we return `undefined` to signal that we could not find the iteration type. If a property
+         * is missing, and the previous step did not result in `any`, then we also give an error if the
          * caller requested it. Then the caller can decide what to do in the case where there is no iterated
-         * type. This is different from returning anyType, because that would signify that we have matched the
-         * whole pattern and that T (above) is 'any'.
+         * type.
          *
          * For a **for-of** statement, `yield*` (in a normal generator), spread, array
          * destructuring, or normal generator we will only ever look for a `[Symbol.iterator]()`
@@ -55573,164 +57393,412 @@ var ts;
          * For a **for-await-of** statement or a `yield*` in an async generator we will look for
          * the `[Symbol.asyncIterator]()` method first, and then the `[Symbol.iterator]()` method.
          */
-        function getIteratedTypeOfIterable(type, errorNode, allowAsyncIterables, allowSyncIterables, checkAssignability) {
+        function getIterationTypesOfIterable(type, use, errorNode) {
             if (isTypeAny(type)) {
-                return undefined;
+                return anyIterationTypes;
             }
-            return mapType(type, getIteratedType);
-            function getIteratedType(type) {
-                var typeAsIterable = type;
-                if (allowAsyncIterables) {
-                    if (typeAsIterable.iteratedTypeOfAsyncIterable) {
-                        return typeAsIterable.iteratedTypeOfAsyncIterable;
+            if (!(type.flags & 1048576 /* Union */)) {
+                var iterationTypes_1 = getIterationTypesOfIterableWorker(type, use, errorNode);
+                if (iterationTypes_1 === noIterationTypes) {
+                    if (errorNode) {
+                        reportTypeNotIterableError(errorNode, type, !!(use & 2 /* AllowsAsyncIterablesFlag */));
                     }
-                    // As an optimization, if the type is an instantiation of the global `AsyncIterable<T>`
-                    // or the global `AsyncIterableIterator<T>` then just grab its type argument.
-                    if (isReferenceToType(type, getGlobalAsyncIterableType(/*reportErrors*/ false)) ||
-                        isReferenceToType(type, getGlobalAsyncIterableIteratorType(/*reportErrors*/ false))) {
-                        return typeAsIterable.iteratedTypeOfAsyncIterable = type.typeArguments[0];
-                    }
-                }
-                if (allowSyncIterables) {
-                    if (typeAsIterable.iteratedTypeOfIterable) {
-                        return allowAsyncIterables
-                            ? typeAsIterable.iteratedTypeOfAsyncIterable = getAwaitedType(typeAsIterable.iteratedTypeOfIterable)
-                            : typeAsIterable.iteratedTypeOfIterable;
-                    }
-                    // As an optimization, if the type is an instantiation of the global `Iterable<T>` or
-                    // `IterableIterator<T>` then just grab its type argument.
-                    if (isReferenceToType(type, getGlobalIterableType(/*reportErrors*/ false)) ||
-                        isReferenceToType(type, getGlobalIterableIteratorType(/*reportErrors*/ false))) {
-                        return allowAsyncIterables
-                            ? typeAsIterable.iteratedTypeOfAsyncIterable = getAwaitedType(type.typeArguments[0])
-                            : typeAsIterable.iteratedTypeOfIterable = type.typeArguments[0];
-                    }
-                }
-                var asyncMethodType = allowAsyncIterables && getTypeOfPropertyOfType(type, ts.getPropertyNameForKnownSymbolName("asyncIterator"));
-                var methodType = asyncMethodType || (allowSyncIterables ? getTypeOfPropertyOfType(type, ts.getPropertyNameForKnownSymbolName("iterator")) : undefined);
-                if (isTypeAny(methodType)) {
                     return undefined;
                 }
-                var signatures = methodType ? getSignaturesOfType(methodType, 0 /* Call */) : undefined;
-                if (!ts.some(signatures)) {
+                return iterationTypes_1;
+            }
+            var cacheKey = use & 2 /* AllowsAsyncIterablesFlag */ ? "iterationTypesOfAsyncIterable" : "iterationTypesOfIterable";
+            var cachedTypes = type[cacheKey];
+            if (cachedTypes)
+                return cachedTypes === noIterationTypes ? undefined : cachedTypes;
+            var allIterationTypes;
+            for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
+                var constituent = _a[_i];
+                var iterationTypes_2 = getIterationTypesOfIterableWorker(constituent, use, errorNode);
+                if (iterationTypes_2 === noIterationTypes) {
                     if (errorNode) {
-                        // only report on the first error
-                        reportTypeNotIterableError(errorNode, type, allowAsyncIterables);
+                        reportTypeNotIterableError(errorNode, type, !!(use & 2 /* AllowsAsyncIterablesFlag */));
                         errorNode = undefined;
                     }
-                    return undefined;
                 }
-                var returnType = getUnionType(ts.map(signatures, getReturnTypeOfSignature), 2 /* Subtype */);
-                var iteratedType = getIteratedTypeOfIterator(returnType, errorNode, /*isAsyncIterator*/ !!asyncMethodType);
-                if (checkAssignability && errorNode && iteratedType) {
-                    // If `checkAssignability` was specified, we were called from
-                    // `checkIteratedTypeOrElementType`. As such, we need to validate that
-                    // the type passed in is actually an Iterable.
-                    checkTypeAssignableTo(type, asyncMethodType
-                        ? createAsyncIterableType(iteratedType)
-                        : createIterableType(iteratedType), errorNode);
-                }
-                if (iteratedType) {
-                    return allowAsyncIterables
-                        ? typeAsIterable.iteratedTypeOfAsyncIterable = asyncMethodType ? iteratedType : getAwaitedType(iteratedType)
-                        : typeAsIterable.iteratedTypeOfIterable = iteratedType;
+                else {
+                    allIterationTypes = ts.append(allIterationTypes, iterationTypes_2);
                 }
             }
+            var iterationTypes = allIterationTypes ? combineIterationTypes(allIterationTypes) : noIterationTypes;
+            type[cacheKey] = iterationTypes;
+            return iterationTypes === noIterationTypes ? undefined : iterationTypes;
+        }
+        function getAsyncFromSyncIterationTypes(iterationTypes, errorNode) {
+            if (iterationTypes === noIterationTypes)
+                return noIterationTypes;
+            if (iterationTypes === anyIterationTypes)
+                return anyIterationTypes;
+            var yieldType = iterationTypes.yieldType, returnType = iterationTypes.returnType, nextType = iterationTypes.nextType;
+            return createIterationTypes(getAwaitedType(yieldType, errorNode) || anyType, getAwaitedType(returnType, errorNode) || anyType, nextType);
+        }
+        /**
+         * Gets the *yield*, *return*, and *next* types from a non-union type.
+         *
+         * If we are unable to find the *yield*, *return*, and *next* types, `noIterationTypes` is
+         * returned to indicate to the caller that it should report an error. Otherwise, an
+         * `IterationTypes` record is returned.
+         *
+         * NOTE: You probably don't want to call this directly and should be calling
+         * `getIterationTypesOfIterable` instead.
+         */
+        function getIterationTypesOfIterableWorker(type, use, errorNode) {
+            if (isTypeAny(type)) {
+                return anyIterationTypes;
+            }
+            if (use & 2 /* AllowsAsyncIterablesFlag */) {
+                var iterationTypes = getIterationTypesOfIterableCached(type, asyncIterationTypesResolver) ||
+                    getIterationTypesOfIterableFast(type, asyncIterationTypesResolver);
+                if (iterationTypes) {
+                    return iterationTypes;
+                }
+            }
+            if (use & 1 /* AllowsSyncIterablesFlag */) {
+                var iterationTypes = getIterationTypesOfIterableCached(type, syncIterationTypesResolver) ||
+                    getIterationTypesOfIterableFast(type, syncIterationTypesResolver);
+                if (iterationTypes) {
+                    if (use & 2 /* AllowsAsyncIterablesFlag */) {
+                        // for a sync iterable in an async context, only use the cached types if they are valid.
+                        if (iterationTypes !== noIterationTypes) {
+                            return type.iterationTypesOfAsyncIterable = getAsyncFromSyncIterationTypes(iterationTypes, errorNode);
+                        }
+                    }
+                    else {
+                        return iterationTypes;
+                    }
+                }
+            }
+            if (use & 2 /* AllowsAsyncIterablesFlag */) {
+                var iterationTypes = getIterationTypesOfIterableSlow(type, asyncIterationTypesResolver, errorNode);
+                if (iterationTypes !== noIterationTypes) {
+                    return iterationTypes;
+                }
+            }
+            if (use & 1 /* AllowsSyncIterablesFlag */) {
+                var iterationTypes = getIterationTypesOfIterableSlow(type, syncIterationTypesResolver, errorNode);
+                if (iterationTypes !== noIterationTypes) {
+                    if (use & 2 /* AllowsAsyncIterablesFlag */) {
+                        return type.iterationTypesOfAsyncIterable = iterationTypes
+                            ? getAsyncFromSyncIterationTypes(iterationTypes, errorNode)
+                            : noIterationTypes;
+                    }
+                    else {
+                        return iterationTypes;
+                    }
+                }
+            }
+            return noIterationTypes;
+        }
+        /**
+         * Gets the *yield*, *return*, and *next* types of an `Iterable`-like or
+         * `AsyncIterable`-like type from the cache.
+         *
+         * NOTE: You probably don't want to call this directly and should be calling
+         * `getIterationTypesOfIterable` instead.
+         */
+        function getIterationTypesOfIterableCached(type, resolver) {
+            return type[resolver.iterableCacheKey];
+        }
+        function getIterationTypesOfGlobalIterableType(globalType, resolver) {
+            var globalIterationTypes = getIterationTypesOfIterableCached(globalType, resolver) ||
+                getIterationTypesOfIterableSlow(globalType, resolver, /*errorNode*/ undefined);
+            return globalIterationTypes === noIterationTypes ? defaultIterationTypes : globalIterationTypes;
+        }
+        /**
+         * Gets the *yield*, *return*, and *next* types of an `Iterable`-like or `AsyncIterable`-like
+         * type from from common heuristics.
+         *
+         * If we previously analyzed this type and found no iteration types, `noIterationTypes` is
+         * returned. If we found iteration types, an `IterationTypes` record is returned.
+         * Otherwise, we return `undefined` to indicate to the caller it should perform a more
+         * exhaustive analysis.
+         *
+         * NOTE: You probably don't want to call this directly and should be calling
+         * `getIterationTypesOfIterable` instead.
+         */
+        function getIterationTypesOfIterableFast(type, resolver) {
+            // As an optimization, if the type is an instantiation of one of the following global types, then
+            // just grab its related type argument:
+            // - `Iterable<T>` or `AsyncIterable<T>`
+            // - `IterableIterator<T>` or `AsyncIterableIterator<T>`
+            var globalType;
+            if (isReferenceToType(type, globalType = resolver.getGlobalIterableType(/*reportErrors*/ false)) ||
+                isReferenceToType(type, globalType = resolver.getGlobalIterableIteratorType(/*reportErrors*/ false))) {
+                var yieldType = type.typeArguments[0];
+                // The "return" and "next" types of `Iterable` and `IterableIterator` are defined by the
+                // iteration types of their `[Symbol.iterator]()` method. The same is true for their async cousins.
+                // While we define these as `any` and `undefined` in our libs by default, a custom lib *could* use
+                // different definitions.
+                var _a = getIterationTypesOfGlobalIterableType(globalType, resolver), returnType = _a.returnType, nextType = _a.nextType;
+                return type[resolver.iterableCacheKey] = createIterationTypes(yieldType, returnType, nextType);
+            }
+            // As an optimization, if the type is an instantiation of the following global type, then
+            // just grab its related type arguments:
+            // - `Generator<T, TReturn, TNext>` or `AsyncGenerator<T, TReturn, TNext>`
+            if (isReferenceToType(type, resolver.getGlobalGeneratorType(/*reportErrors*/ false))) {
+                var _b = type.typeArguments, yieldType = _b[0], returnType = _b[1], nextType = _b[2];
+                return type[resolver.iterableCacheKey] = createIterationTypes(yieldType, returnType, nextType);
+            }
+        }
+        /**
+         * Gets the *yield*, *return*, and *next* types of an `Iterable`-like or `AsyncIterable`-like
+         * type from its members.
+         *
+         * If we successfully found the *yield*, *return*, and *next* types, an `IterationTypes`
+         * record is returned. Otherwise, `noIterationTypes` is returned.
+         *
+         * NOTE: You probably don't want to call this directly and should be calling
+         * `getIterationTypesOfIterable` instead.
+         */
+        function getIterationTypesOfIterableSlow(type, resolver, errorNode) {
+            var method = getPropertyOfType(type, ts.getPropertyNameForKnownSymbolName(resolver.iteratorSymbolName));
+            var methodType = method && !(method.flags & 16777216 /* Optional */) ? getTypeOfSymbol(method) : undefined;
+            if (isTypeAny(methodType)) {
+                return type[resolver.iterableCacheKey] = anyIterationTypes;
+            }
+            var signatures = methodType ? getSignaturesOfType(methodType, 0 /* Call */) : undefined;
+            if (!ts.some(signatures)) {
+                return type[resolver.iterableCacheKey] = noIterationTypes;
+            }
+            var iteratorType = getUnionType(ts.map(signatures, getReturnTypeOfSignature), 2 /* Subtype */);
+            var iterationTypes = getIterationTypesOfIterator(iteratorType, resolver, errorNode) || noIterationTypes;
+            return type[resolver.iterableCacheKey] = iterationTypes;
         }
         function reportTypeNotIterableError(errorNode, type, allowAsyncIterables) {
-            error(errorNode, allowAsyncIterables
+            var message = allowAsyncIterables
                 ? ts.Diagnostics.Type_0_must_have_a_Symbol_asyncIterator_method_that_returns_an_async_iterator
-                : ts.Diagnostics.Type_0_must_have_a_Symbol_iterator_method_that_returns_an_iterator, typeToString(type));
+                : ts.Diagnostics.Type_0_must_have_a_Symbol_iterator_method_that_returns_an_iterator;
+            errorAndMaybeSuggestAwait(errorNode, !!getAwaitedTypeOfPromise(type), message, typeToString(type));
         }
         /**
-         * This function has very similar logic as getIteratedTypeOfIterable, except that it operates on
-         * Iterators instead of Iterables. Here is the structure:
+         * Gets the *yield*, *return*, and *next* types from an `Iterator`-like or `AsyncIterator`-like type.
          *
-         *  { // iterator
-         *      next: { // nextMethod
-         *          (): { // nextResult
-         *              value: T // nextValue
-         *          }
-         *      }
-         *  }
-         *
-         * For an async iterator, we expect the following structure:
-         *
-         *  { // iterator
-         *      next: { // nextMethod
-         *          (): PromiseLike<{ // nextResult
-         *              value: T // nextValue
-         *          }>
-         *      }
-         *  }
+         * If we successfully found the *yield*, *return*, and *next* types, an `IterationTypes`
+         * record is returned. Otherwise, `undefined` is returned.
          */
-        function getIteratedTypeOfIterator(type, errorNode, isAsyncIterator) {
+        function getIterationTypesOfIterator(type, resolver, errorNode) {
             if (isTypeAny(type)) {
-                return undefined;
+                return anyIterationTypes;
             }
-            var typeAsIterator = type;
-            if (isAsyncIterator ? typeAsIterator.iteratedTypeOfAsyncIterator : typeAsIterator.iteratedTypeOfIterator) {
-                return isAsyncIterator ? typeAsIterator.iteratedTypeOfAsyncIterator : typeAsIterator.iteratedTypeOfIterator;
-            }
-            // As an optimization, if the type is an instantiation of the global `Iterator<T>` (for
-            // a non-async iterator) or the global `AsyncIterator<T>` (for an async-iterator) then
-            // just grab its type argument.
-            var getIteratorType = isAsyncIterator ? getGlobalAsyncIteratorType : getGlobalIteratorType;
-            if (isReferenceToType(type, getIteratorType(/*reportErrors*/ false))) {
-                return isAsyncIterator
-                    ? typeAsIterator.iteratedTypeOfAsyncIterator = type.typeArguments[0]
-                    : typeAsIterator.iteratedTypeOfIterator = type.typeArguments[0];
-            }
-            // Both async and non-async iterators must have a `next` method.
-            var nextMethod = getTypeOfPropertyOfType(type, "next");
-            if (isTypeAny(nextMethod)) {
-                return undefined;
-            }
-            var nextMethodSignatures = nextMethod ? getSignaturesOfType(nextMethod, 0 /* Call */) : ts.emptyArray;
-            if (nextMethodSignatures.length === 0) {
-                if (errorNode) {
-                    error(errorNode, isAsyncIterator
-                        ? ts.Diagnostics.An_async_iterator_must_have_a_next_method
-                        : ts.Diagnostics.An_iterator_must_have_a_next_method);
-                }
-                return undefined;
-            }
-            var nextResult = getUnionType(ts.map(nextMethodSignatures, getReturnTypeOfSignature), 2 /* Subtype */);
-            if (isTypeAny(nextResult)) {
-                return undefined;
-            }
-            // For an async iterator, we must get the awaited type of the return type.
-            if (isAsyncIterator) {
-                nextResult = getAwaitedTypeOfPromise(nextResult, errorNode, ts.Diagnostics.The_type_returned_by_the_next_method_of_an_async_iterator_must_be_a_promise_for_a_type_with_a_value_property);
-                if (isTypeAny(nextResult)) {
-                    return undefined;
-                }
-            }
-            var nextValue = nextResult && getTypeOfPropertyOfType(nextResult, "value");
-            if (!nextValue) {
-                if (errorNode) {
-                    error(errorNode, isAsyncIterator
-                        ? ts.Diagnostics.The_type_returned_by_the_next_method_of_an_async_iterator_must_be_a_promise_for_a_type_with_a_value_property
-                        : ts.Diagnostics.The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property);
-                }
-                return undefined;
-            }
-            return isAsyncIterator
-                ? typeAsIterator.iteratedTypeOfAsyncIterator = nextValue
-                : typeAsIterator.iteratedTypeOfIterator = nextValue;
+            var iterationTypes = getIterationTypesOfIteratorCached(type, resolver) ||
+                getIterationTypesOfIteratorFast(type, resolver) ||
+                getIterationTypesOfIteratorSlow(type, resolver, errorNode);
+            return iterationTypes === noIterationTypes ? undefined : iterationTypes;
         }
         /**
-         * A generator may have a return type of `Iterator<T>`, `Iterable<T>`, or
-         * `IterableIterator<T>`. An async generator may have a return type of `AsyncIterator<T>`,
-         * `AsyncIterable<T>`, or `AsyncIterableIterator<T>`. This function can be used to extract
-         * the iterated type from this return type for contextual typing and verifying signatures.
+         * Gets the iteration types of an `Iterator`-like or `AsyncIterator`-like type from the
+         * cache.
+         *
+         * NOTE: You probably don't want to call this directly and should be calling
+         * `getIterationTypesOfIterator` instead.
          */
-        function getIteratedTypeOfGenerator(returnType, isAsyncGenerator) {
+        function getIterationTypesOfIteratorCached(type, resolver) {
+            return type[resolver.iteratorCacheKey];
+        }
+        /**
+         * Gets the iteration types of an `Iterator`-like or `AsyncIterator`-like type from the
+         * cache or from common heuristics.
+         *
+         * If we previously analyzed this type and found no iteration types, `noIterationTypes` is
+         * returned. If we found iteration types, an `IterationTypes` record is returned.
+         * Otherwise, we return `undefined` to indicate to the caller it should perform a more
+         * exhaustive analysis.
+         *
+         * NOTE: You probably don't want to call this directly and should be calling
+         * `getIterationTypesOfIterator` instead.
+         */
+        function getIterationTypesOfIteratorFast(type, resolver) {
+            // As an optimization, if the type is an instantiation of one of the following global types,
+            // then just grab its related type argument:
+            // - `IterableIterator<T>` or `AsyncIterableIterator<T>`
+            // - `Iterator<T, TReturn, TNext>` or `AsyncIterator<T, TReturn, TNext>`
+            // - `Generator<T, TReturn, TNext>` or `AsyncGenerator<T, TReturn, TNext>`
+            var globalType = resolver.getGlobalIterableIteratorType(/*reportErrors*/ false);
+            if (isReferenceToType(type, globalType)) {
+                var yieldType = type.typeArguments[0];
+                // The "return" and "next" types of `IterableIterator` and `AsyncIterableIterator` are defined by the
+                // iteration types of their `next`, `return`, and `throw` methods. While we define these as `any`
+                // and `undefined` in our libs by default, a custom lib *could* use different definitions.
+                var globalIterationTypes = getIterationTypesOfIteratorCached(globalType, resolver) ||
+                    getIterationTypesOfIteratorSlow(globalType, resolver, /*errorNode*/ undefined);
+                var _a = globalIterationTypes === noIterationTypes ? defaultIterationTypes : globalIterationTypes, returnType = _a.returnType, nextType = _a.nextType;
+                return type[resolver.iteratorCacheKey] = createIterationTypes(yieldType, returnType, nextType);
+            }
+            if (isReferenceToType(type, resolver.getGlobalIteratorType(/*reportErrors*/ false)) ||
+                isReferenceToType(type, resolver.getGlobalGeneratorType(/*reportErrors*/ false))) {
+                var _b = type.typeArguments, yieldType = _b[0], returnType = _b[1], nextType = _b[2];
+                return type[resolver.iteratorCacheKey] = createIterationTypes(yieldType, returnType, nextType);
+            }
+        }
+        function isIteratorResult(type, kind) {
+            // From https://tc39.github.io/ecma262/#sec-iteratorresult-interface:
+            // > [done] is the result status of an iterator `next` method call. If the end of the iterator was reached `done` is `true`.
+            // > If the end was not reached `done` is `false` and a value is available.
+            // > If a `done` property (either own or inherited) does not exist, it is consider to have the value `false`.
+            var doneType = getTypeOfPropertyOfType(type, "done") || falseType;
+            return isTypeAssignableTo(kind === 0 /* Yield */ ? falseType : trueType, doneType);
+        }
+        function isYieldIteratorResult(type) {
+            return isIteratorResult(type, 0 /* Yield */);
+        }
+        function isReturnIteratorResult(type) {
+            return isIteratorResult(type, 1 /* Return */);
+        }
+        /**
+         * Gets the *yield* and *return* types of an `IteratorResult`-like type.
+         *
+         * If we are unable to determine a *yield* or a *return* type, `noIterationTypes` is
+         * returned to indicate to the caller that it should handle the error. Otherwise, an
+         * `IterationTypes` record is returned.
+         */
+        function getIterationTypesOfIteratorResult(type) {
+            if (isTypeAny(type)) {
+                return anyIterationTypes;
+            }
+            var cachedTypes = type.iterationTypesOfIteratorResult;
+            if (cachedTypes) {
+                return cachedTypes;
+            }
+            // As an optimization, if the type is an instantiation of one of the global `IteratorYieldResult<T>`
+            // or `IteratorReturnResult<TReturn>` types, then just grab its type argument.
+            if (isReferenceToType(type, getGlobalIteratorYieldResultType(/*reportErrors*/ false))) {
+                var yieldType_1 = type.typeArguments[0];
+                return type.iterationTypesOfIteratorResult = createIterationTypes(yieldType_1, /*returnType*/ undefined, /*nextType*/ undefined);
+            }
+            if (isReferenceToType(type, getGlobalIteratorReturnResultType(/*reportErrors*/ false))) {
+                var returnType_1 = type.typeArguments[0];
+                return type.iterationTypesOfIteratorResult = createIterationTypes(/*yieldType*/ undefined, returnType_1, /*nextType*/ undefined);
+            }
+            // Choose any constituents that can produce the requested iteration type.
+            var yieldIteratorResult = filterType(type, isYieldIteratorResult);
+            var yieldType = yieldIteratorResult !== neverType ? getTypeOfPropertyOfType(yieldIteratorResult, "value") : undefined;
+            var returnIteratorResult = filterType(type, isReturnIteratorResult);
+            var returnType = returnIteratorResult !== neverType ? getTypeOfPropertyOfType(returnIteratorResult, "value") : undefined;
+            if (!yieldType && !returnType) {
+                return type.iterationTypesOfIteratorResult = noIterationTypes;
+            }
+            // From https://tc39.github.io/ecma262/#sec-iteratorresult-interface
+            // > ... If the iterator does not have a return value, `value` is `undefined`. In that case, the
+            // > `value` property may be absent from the conforming object if it does not inherit an explicit
+            // > `value` property.
+            return type.iterationTypesOfIteratorResult = createIterationTypes(yieldType, returnType || voidType, /*nextType*/ undefined);
+        }
+        /**
+         * Gets the *yield*, *return*, and *next* types of a the `next()`, `return()`, or
+         * `throw()` method of an `Iterator`-like or `AsyncIterator`-like type.
+         *
+         * If we successfully found the *yield*, *return*, and *next* types, an `IterationTypes`
+         * record is returned. Otherwise, we return `undefined`.
+         */
+        function getIterationTypesOfMethod(type, resolver, methodName, errorNode) {
+            var method = getPropertyOfType(type, methodName);
+            // Ignore 'return' or 'throw' if they are missing.
+            if (!method && methodName !== "next") {
+                return undefined;
+            }
+            var methodType = method && !(methodName === "next" && (method.flags & 16777216 /* Optional */))
+                ? methodName === "next" ? getTypeOfSymbol(method) : getTypeWithFacts(getTypeOfSymbol(method), 2097152 /* NEUndefinedOrNull */)
+                : undefined;
+            if (isTypeAny(methodType)) {
+                // `return()` and `throw()` don't provide a *next* type.
+                return methodName === "next" ? anyIterationTypes : anyIterationTypesExceptNext;
+            }
+            // Both async and non-async iterators *must* have a `next` method.
+            var methodSignatures = methodType ? getSignaturesOfType(methodType, 0 /* Call */) : ts.emptyArray;
+            if (methodSignatures.length === 0) {
+                if (errorNode) {
+                    var diagnostic = methodName === "next"
+                        ? resolver.mustHaveANextMethodDiagnostic
+                        : resolver.mustBeAMethodDiagnostic;
+                    error(errorNode, diagnostic, methodName);
+                }
+                return methodName === "next" ? anyIterationTypes : undefined;
+            }
+            // Extract the first parameter and return type of each signature.
+            var methodParameterTypes;
+            var methodReturnTypes;
+            for (var _i = 0, methodSignatures_1 = methodSignatures; _i < methodSignatures_1.length; _i++) {
+                var signature = methodSignatures_1[_i];
+                if (methodName !== "throw" && ts.some(signature.parameters)) {
+                    methodParameterTypes = ts.append(methodParameterTypes, getTypeAtPosition(signature, 0));
+                }
+                methodReturnTypes = ts.append(methodReturnTypes, getReturnTypeOfSignature(signature));
+            }
+            // Resolve the *next* or *return* type from the first parameter of a `next()` or
+            // `return()` method, respectively.
+            var returnTypes;
+            var nextType;
+            if (methodName !== "throw") {
+                var methodParameterType = methodParameterTypes ? getUnionType(methodParameterTypes) : unknownType;
+                var resolvedMethodParameterType = resolver.resolveIterationType(methodParameterType, errorNode) || anyType;
+                if (methodName === "next") {
+                    nextType = resolvedMethodParameterType;
+                }
+                else if (methodName === "return") {
+                    returnTypes = ts.append(returnTypes, resolvedMethodParameterType);
+                }
+            }
+            // Resolve the *yield* and *return* types from the return type of the method (i.e. `IteratorResult`)
+            var yieldType;
+            var methodReturnType = methodReturnTypes ? getUnionType(methodReturnTypes, 2 /* Subtype */) : neverType;
+            var resolvedMethodReturnType = resolver.resolveIterationType(methodReturnType, errorNode) || anyType;
+            var iterationTypes = getIterationTypesOfIteratorResult(resolvedMethodReturnType);
+            if (iterationTypes === noIterationTypes) {
+                if (errorNode) {
+                    error(errorNode, resolver.mustHaveAValueDiagnostic, methodName);
+                }
+                yieldType = anyType;
+                returnTypes = ts.append(returnTypes, anyType);
+            }
+            else {
+                yieldType = iterationTypes.yieldType;
+                returnTypes = ts.append(returnTypes, iterationTypes.returnType);
+            }
+            return createIterationTypes(yieldType, getUnionType(returnTypes), nextType);
+        }
+        /**
+         * Gets the *yield*, *return*, and *next* types of an `Iterator`-like or `AsyncIterator`-like
+         * type from its members.
+         *
+         * If we successfully found the *yield*, *return*, and *next* types, an `IterationTypes`
+         * record is returned. Otherwise, `noIterationTypes` is returned.
+         *
+         * NOTE: You probably don't want to call this directly and should be calling
+         * `getIterationTypesOfIterator` instead.
+         */
+        function getIterationTypesOfIteratorSlow(type, resolver, errorNode) {
+            var iterationTypes = combineIterationTypes([
+                getIterationTypesOfMethod(type, resolver, "next", errorNode),
+                getIterationTypesOfMethod(type, resolver, "return", errorNode),
+                getIterationTypesOfMethod(type, resolver, "throw", errorNode),
+            ]);
+            return type[resolver.iteratorCacheKey] = iterationTypes;
+        }
+        /**
+         * Gets the requested "iteration type" from a type that is either `Iterable`-like, `Iterator`-like,
+         * `IterableIterator`-like, or `Generator`-like (for a non-async generator); or `AsyncIterable`-like,
+         * `AsyncIterator`-like, `AsyncIterableIterator`-like, or `AsyncGenerator`-like (for an async generator).
+         */
+        function getIterationTypeOfGeneratorFunctionReturnType(kind, returnType, isAsyncGenerator) {
             if (isTypeAny(returnType)) {
                 return undefined;
             }
-            return getIteratedTypeOfIterable(returnType, /*errorNode*/ undefined, /*allowAsyncIterables*/ isAsyncGenerator, /*allowSyncIterables*/ !isAsyncGenerator, /*checkAssignability*/ false)
-                || getIteratedTypeOfIterator(returnType, /*errorNode*/ undefined, isAsyncGenerator);
+            var iterationTypes = getIterationTypesOfGeneratorFunctionReturnType(returnType, isAsyncGenerator);
+            return iterationTypes && iterationTypes[getIterationTypesKeyFromIterationTypeKind(kind)];
+        }
+        function getIterationTypesOfGeneratorFunctionReturnType(type, isAsyncGenerator) {
+            if (isTypeAny(type)) {
+                return anyIterationTypes;
+            }
+            var use = isAsyncGenerator ? 2 /* AsyncGeneratorReturnType */ : 1 /* GeneratorReturnType */;
+            var resolver = isAsyncGenerator ? asyncIterationTypesResolver : syncIterationTypesResolver;
+            return getIterationTypesOfIterable(type, use, /*errorNode*/ undefined) ||
+                getIterationTypesOfIterator(type, resolver, /*errorNode*/ undefined);
         }
         function checkBreakOrContinueStatement(node) {
             // Grammar checking
@@ -55738,10 +57806,15 @@ var ts;
                 checkGrammarBreakOrContinueStatement(node);
             // TODO: Check that target label is valid
         }
+        function unwrapReturnType(returnType, functionFlags) {
+            var isGenerator = !!(functionFlags & 1 /* Generator */);
+            var isAsync = !!(functionFlags & 2 /* Async */);
+            return isGenerator ? getIterationTypeOfGeneratorFunctionReturnType(1 /* Return */, returnType, isAsync) || errorType :
+                isAsync ? getPromisedTypeOfPromise(returnType) || errorType :
+                    returnType;
+        }
         function isUnwrappedReturnTypeVoidOrAny(func, returnType) {
-            var unwrappedReturnType = (ts.getFunctionFlags(func) & 3 /* AsyncGenerator */) === 2 /* Async */
-                ? getPromisedTypeOfPromise(returnType) // Async function
-                : returnType; // AsyncGenerator function, Generator function, or normal function
+            var unwrappedReturnType = unwrapReturnType(returnType, ts.getFunctionFlags(func));
             return !!unwrappedReturnType && maybeTypeOfKind(unwrappedReturnType, 16384 /* Void */ | 3 /* AnyOrUnknown */);
         }
         function checkReturnStatement(node) {
@@ -55757,43 +57830,32 @@ var ts;
             var signature = getSignatureFromDeclaration(func);
             var returnType = getReturnTypeOfSignature(signature);
             var functionFlags = ts.getFunctionFlags(func);
-            var isGenerator = functionFlags & 1 /* Generator */;
             if (strictNullChecks || node.expression || returnType.flags & 131072 /* Never */) {
                 var exprType = node.expression ? checkExpressionCached(node.expression) : undefinedType;
-                if (isGenerator) { // AsyncGenerator function or Generator function
-                    // A generator does not need its return expressions checked against its return type.
-                    // Instead, the yield expressions are checked against the element type.
-                    // TODO: Check return types of generators when return type tracking is added
-                    // for generators.
-                    return;
-                }
-                else if (func.kind === 159 /* SetAccessor */) {
+                if (func.kind === 160 /* SetAccessor */) {
                     if (node.expression) {
                         error(node, ts.Diagnostics.Setters_cannot_return_a_value);
                     }
                 }
-                else if (func.kind === 157 /* Constructor */) {
+                else if (func.kind === 158 /* Constructor */) {
                     if (node.expression && !checkTypeAssignableToAndOptionallyElaborate(exprType, returnType, node, node.expression)) {
                         error(node, ts.Diagnostics.Return_type_of_constructor_signature_must_be_assignable_to_the_instance_type_of_the_class);
                     }
                 }
                 else if (getReturnTypeFromAnnotation(func)) {
-                    if (functionFlags & 2 /* Async */) { // Async function
-                        var promisedType = getPromisedTypeOfPromise(returnType);
-                        var awaitedType = checkAwaitedType(exprType, node, ts.Diagnostics.The_return_type_of_an_async_function_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member);
-                        if (promisedType) {
-                            // If the function has a return type, but promisedType is
-                            // undefined, an error will be reported in checkAsyncFunctionReturnType
-                            // so we don't need to report one here.
-                            checkTypeAssignableTo(awaitedType, promisedType, node);
-                        }
-                    }
-                    else {
-                        checkTypeAssignableToAndOptionallyElaborate(exprType, returnType, node, node.expression);
+                    var unwrappedReturnType = unwrapReturnType(returnType, functionFlags);
+                    var unwrappedExprType = functionFlags & 2 /* Async */
+                        ? checkAwaitedType(exprType, node, ts.Diagnostics.The_return_type_of_an_async_function_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member)
+                        : exprType;
+                    if (unwrappedReturnType) {
+                        // If the function has a return type, but promisedType is
+                        // undefined, an error will be reported in checkAsyncFunctionReturnType
+                        // so we don't need to report one here.
+                        checkTypeAssignableToAndOptionallyElaborate(unwrappedExprType, unwrappedReturnType, node, node.expression);
                     }
                 }
             }
-            else if (func.kind !== 157 /* Constructor */ && compilerOptions.noImplicitReturns && !isUnwrappedReturnTypeVoidOrAny(func, returnType) && !isGenerator) {
+            else if (func.kind !== 158 /* Constructor */ && compilerOptions.noImplicitReturns && !isUnwrappedReturnTypeVoidOrAny(func, returnType)) {
                 // The function has a return type, but the return statement doesn't have an expression.
                 error(node, ts.Diagnostics.Not_all_code_paths_return_a_value);
             }
@@ -55822,7 +57884,7 @@ var ts;
             var expressionIsLiteral = isLiteralType(expressionType);
             ts.forEach(node.caseBlock.clauses, function (clause) {
                 // Grammar check for duplicate default clauses, skip if we already report duplicate default clause
-                if (clause.kind === 272 /* DefaultClause */ && !hasDuplicateDefaultClause) {
+                if (clause.kind === 273 /* DefaultClause */ && !hasDuplicateDefaultClause) {
                     if (firstDefaultClause === undefined) {
                         firstDefaultClause = clause;
                     }
@@ -55834,7 +57896,7 @@ var ts;
                         hasDuplicateDefaultClause = true;
                     }
                 }
-                if (produceDiagnostics && clause.kind === 271 /* CaseClause */) {
+                if (produceDiagnostics && clause.kind === 272 /* CaseClause */) {
                     // TypeScript 1.0 spec (April 2014): 5.9
                     // In a 'switch' statement, each 'case' expression must be of a type that is comparable
                     // to or from the type of the 'switch' expression.
@@ -55863,7 +57925,7 @@ var ts;
                     if (ts.isFunctionLike(current)) {
                         return "quit";
                     }
-                    if (current.kind === 233 /* LabeledStatement */ && current.label.escapedText === node.label.escapedText) {
+                    if (current.kind === 234 /* LabeledStatement */ && current.label.escapedText === node.label.escapedText) {
                         grammarErrorOnNode(node.label, ts.Diagnostics.Duplicate_label_0, ts.getTextOfNode(node.label));
                         return true;
                     }
@@ -55970,8 +58032,8 @@ var ts;
                 // this allows us to rule out cases when both property and indexer are inherited from the base class
                 var errorNode;
                 if (propDeclaration && name &&
-                    (propDeclaration.kind === 204 /* BinaryExpression */ ||
-                        name.kind === 149 /* ComputedPropertyName */ ||
+                    (propDeclaration.kind === 205 /* BinaryExpression */ ||
+                        name.kind === 150 /* ComputedPropertyName */ ||
                         prop.parent === containingType.symbol)) {
                     errorNode = propDeclaration;
                 }
@@ -56048,7 +58110,7 @@ var ts;
         function checkTypeParametersNotReferenced(root, typeParameters, index) {
             visit(root);
             function visit(node) {
-                if (node.kind === 164 /* TypeReference */) {
+                if (node.kind === 165 /* TypeReference */) {
                     var type = getTypeFromTypeReference(node);
                     if (type.flags & 262144 /* TypeParameter */) {
                         for (var i = index; i < typeParameters.length; i++) {
@@ -56170,6 +58232,11 @@ var ts;
                 if (languageVersion < 2 /* ES2015 */) {
                     checkExternalEmitHelpers(baseTypeNode.parent, 1 /* Extends */);
                 }
+                // check both @extends and extends if both are specified.
+                var extendsNode = ts.getClassExtendsHeritageElement(node);
+                if (extendsNode && extendsNode !== baseTypeNode) {
+                    checkExpression(extendsNode.expression);
+                }
                 var baseTypes = getBaseTypes(type);
                 if (baseTypes.length && produceDiagnostics) {
                     var baseType_1 = baseTypes[0];
@@ -56177,10 +58244,6 @@ var ts;
                     var staticBaseType = getApparentType(baseConstructorType);
                     checkBaseTypeAccessibility(staticBaseType, baseTypeNode);
                     checkSourceElement(baseTypeNode.expression);
-                    var extendsNode = ts.getClassExtendsHeritageElement(node);
-                    if (extendsNode && extendsNode !== baseTypeNode) {
-                        checkExpression(extendsNode.expression);
-                    }
                     if (ts.some(baseTypeNode.typeArguments)) {
                         ts.forEach(baseTypeNode.typeArguments, checkSourceElement);
                         for (var _i = 0, _a = getConstructorsForTypeArguments(staticBaseType, baseTypeNode.typeArguments, baseTypeNode); _i < _a.length; _i++) {
@@ -56251,7 +58314,7 @@ var ts;
         function issueMemberSpecificError(node, typeWithThis, baseWithThis, broadDiag) {
             // iterate over all implemented properties and issue errors on each one which isn't compatible, rather than the class as a whole, if possible
             var issuedMemberError = false;
-            var _loop_9 = function (member) {
+            var _loop_14 = function (member) {
                 if (ts.hasStaticModifier(member)) {
                     return "continue";
                 }
@@ -56270,7 +58333,7 @@ var ts;
             };
             for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                 var member = _a[_i];
-                _loop_9(member);
+                _loop_14(member);
             }
             if (!issuedMemberError) {
                 // check again with diagnostics to generate a less-specific error
@@ -56296,7 +58359,7 @@ var ts;
         }
         function getClassOrInterfaceDeclarationsOfSymbol(symbol) {
             return ts.filter(symbol.declarations, function (d) {
-                return d.kind === 240 /* ClassDeclaration */ || d.kind === 241 /* InterfaceDeclaration */;
+                return d.kind === 241 /* ClassDeclaration */ || d.kind === 242 /* InterfaceDeclaration */;
             });
         }
         function checkKindsOfPropertyMemberOverrides(type, baseType) {
@@ -56335,7 +58398,7 @@ var ts;
                         // If there is no declaration for the derived class (as in the case of class expressions),
                         // then the class cannot be declared abstract.
                         if (baseDeclarationFlags & 128 /* Abstract */ && (!derivedClassDecl || !ts.hasModifier(derivedClassDecl, 128 /* Abstract */))) {
-                            if (derivedClassDecl.kind === 209 /* ClassExpression */) {
+                            if (derivedClassDecl.kind === 210 /* ClassExpression */) {
                                 error(derivedClassDecl, ts.Diagnostics.Non_abstract_class_expression_does_not_implement_inherited_abstract_member_0_from_class_1, symbolToString(baseProperty), typeToString(baseType));
                             }
                             else {
@@ -56385,8 +58448,8 @@ var ts;
             for (var _i = 0, baseTypes_2 = baseTypes; _i < baseTypes_2.length; _i++) {
                 var base = baseTypes_2[_i];
                 var properties = getPropertiesOfType(getTypeWithThisArgument(base, type.thisType));
-                for (var _a = 0, properties_7 = properties; _a < properties_7.length; _a++) {
-                    var prop = properties_7[_a];
+                for (var _a = 0, properties_4 = properties; _a < properties_4.length; _a++) {
+                    var prop = properties_4[_a];
                     var existing = seen.get(prop.escapedName);
                     if (!existing) {
                         seen.set(prop.escapedName, { prop: prop, containingType: base });
@@ -56427,7 +58490,7 @@ var ts;
             }
         }
         function isInstancePropertyWithoutInitializer(node) {
-            return node.kind === 154 /* PropertyDeclaration */ &&
+            return node.kind === 155 /* PropertyDeclaration */ &&
                 !ts.hasModifier(node, 32 /* Static */ | 128 /* Abstract */) &&
                 !node.exclamationToken &&
                 !node.initializer;
@@ -56451,7 +58514,7 @@ var ts;
                 var symbol = getSymbolOfNode(node);
                 checkTypeParameterListsIdentical(symbol);
                 // Only check this symbol once
-                var firstInterfaceDecl = ts.getDeclarationOfKind(symbol, 241 /* InterfaceDeclaration */);
+                var firstInterfaceDecl = ts.getDeclarationOfKind(symbol, 242 /* InterfaceDeclaration */);
                 if (node === firstInterfaceDecl) {
                     var type = getDeclaredTypeOfSymbol(symbol);
                     var typeWithThis = getTypeWithThisArgument(type);
@@ -56512,9 +58575,9 @@ var ts;
             if (member.initializer) {
                 return computeConstantValue(member);
             }
-            // In ambient enum declarations that specify no const modifier, enum member declarations that omit
-            // a value are considered computed members (as opposed to having auto-incremented values).
-            if (member.parent.flags & 4194304 /* Ambient */ && !ts.isEnumConst(member.parent)) {
+            // In ambient non-const numeric enum declarations, enum members without initializers are
+            // considered computed members (as opposed to having auto-incremented values).
+            if (member.parent.flags & 4194304 /* Ambient */ && !ts.isEnumConst(member.parent) && getEnumKind(getSymbolOfNode(member.parent)) === 0 /* Numeric */) {
                 return undefined;
             }
             // If the member declaration specifies no value, the member is considered a constant enum member.
@@ -56556,7 +58619,7 @@ var ts;
             return value;
             function evaluate(expr) {
                 switch (expr.kind) {
-                    case 202 /* PrefixUnaryExpression */:
+                    case 203 /* PrefixUnaryExpression */:
                         var value_2 = evaluate(expr.operand);
                         if (typeof value_2 === "number") {
                             switch (expr.operator) {
@@ -56566,7 +58629,7 @@ var ts;
                             }
                         }
                         break;
-                    case 204 /* BinaryExpression */:
+                    case 205 /* BinaryExpression */:
                         var left = evaluate(expr.left);
                         var right = evaluate(expr.right);
                         if (typeof left === "number" && typeof right === "number") {
@@ -56594,22 +58657,22 @@ var ts;
                     case 8 /* NumericLiteral */:
                         checkGrammarNumericLiteral(expr);
                         return +expr.text;
-                    case 195 /* ParenthesizedExpression */:
+                    case 196 /* ParenthesizedExpression */:
                         return evaluate(expr.expression);
-                    case 72 /* Identifier */:
+                    case 73 /* Identifier */:
                         var identifier = expr;
                         if (isInfinityOrNaNString(identifier.escapedText)) {
                             return +(identifier.escapedText);
                         }
                         return ts.nodeIsMissing(expr) ? 0 : evaluateEnumMember(expr, getSymbolOfNode(member.parent), identifier.escapedText);
-                    case 190 /* ElementAccessExpression */:
-                    case 189 /* PropertyAccessExpression */:
+                    case 191 /* ElementAccessExpression */:
+                    case 190 /* PropertyAccessExpression */:
                         var ex = expr;
                         if (isConstantMemberAccess(ex)) {
                             var type = getTypeOfExpression(ex.expression);
                             if (type.symbol && type.symbol.flags & 384 /* Enum */) {
                                 var name = void 0;
-                                if (ex.kind === 189 /* PropertyAccessExpression */) {
+                                if (ex.kind === 190 /* PropertyAccessExpression */) {
                                     name = ex.name.escapedText;
                                 }
                                 else {
@@ -56640,9 +58703,9 @@ var ts;
             }
         }
         function isConstantMemberAccess(node) {
-            return node.kind === 72 /* Identifier */ ||
-                node.kind === 189 /* PropertyAccessExpression */ && isConstantMemberAccess(node.expression) ||
-                node.kind === 190 /* ElementAccessExpression */ && isConstantMemberAccess(node.expression) &&
+            return node.kind === 73 /* Identifier */ ||
+                node.kind === 190 /* PropertyAccessExpression */ && isConstantMemberAccess(node.expression) ||
+                node.kind === 191 /* ElementAccessExpression */ && isConstantMemberAccess(node.expression) &&
                     node.argumentExpression.kind === 10 /* StringLiteral */;
         }
         function checkEnumDeclaration(node) {
@@ -56677,7 +58740,7 @@ var ts;
                 var seenEnumMissingInitialInitializer_1 = false;
                 ts.forEach(enumSymbol.declarations, function (declaration) {
                     // return true if we hit a violation of the rule, false otherwise
-                    if (declaration.kind !== 243 /* EnumDeclaration */) {
+                    if (declaration.kind !== 244 /* EnumDeclaration */) {
                         return false;
                     }
                     var enumDeclaration = declaration;
@@ -56700,8 +58763,8 @@ var ts;
             var declarations = symbol.declarations;
             for (var _i = 0, declarations_8 = declarations; _i < declarations_8.length; _i++) {
                 var declaration = declarations_8[_i];
-                if ((declaration.kind === 240 /* ClassDeclaration */ ||
-                    (declaration.kind === 239 /* FunctionDeclaration */ && ts.nodeIsPresent(declaration.body))) &&
+                if ((declaration.kind === 241 /* ClassDeclaration */ ||
+                    (declaration.kind === 240 /* FunctionDeclaration */ && ts.nodeIsPresent(declaration.body))) &&
                     !(declaration.flags & 4194304 /* Ambient */)) {
                     return declaration;
                 }
@@ -56750,8 +58813,8 @@ var ts;
                 var symbol = getSymbolOfNode(node);
                 // The following checks only apply on a non-ambient instantiated module declaration.
                 if (symbol.flags & 512 /* ValueModule */
-                    && symbol.declarations.length > 1
                     && !inAmbientContext
+                    && symbol.declarations.length > 1
                     && isInstantiatedModule(node, !!compilerOptions.preserveConstEnums || !!compilerOptions.isolatedModules)) {
                     var firstNonAmbientClassOrFunc = getFirstNonAmbientClassOrFunctionDeclaration(symbol);
                     if (firstNonAmbientClassOrFunc) {
@@ -56764,7 +58827,7 @@ var ts;
                     }
                     // if the module merges with a class declaration in the same lexical scope,
                     // we need to track this to ensure the correct emit.
-                    var mergedClass = ts.getDeclarationOfKind(symbol, 240 /* ClassDeclaration */);
+                    var mergedClass = ts.getDeclarationOfKind(symbol, 241 /* ClassDeclaration */);
                     if (mergedClass &&
                         inSameLexicalScope(node, mergedClass)) {
                         getNodeLinks(node).flags |= 32768 /* LexicalModuleMergesWithClass */;
@@ -56814,23 +58877,23 @@ var ts;
         }
         function checkModuleAugmentationElement(node, isGlobalAugmentation) {
             switch (node.kind) {
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     // error each individual name in variable statement instead of marking the entire variable statement
                     for (var _i = 0, _a = node.declarationList.declarations; _i < _a.length; _i++) {
                         var decl = _a[_i];
                         checkModuleAugmentationElement(decl, isGlobalAugmentation);
                     }
                     break;
-                case 254 /* ExportAssignment */:
-                case 255 /* ExportDeclaration */:
+                case 255 /* ExportAssignment */:
+                case 256 /* ExportDeclaration */:
                     grammarErrorOnFirstToken(node, ts.Diagnostics.Exports_and_export_assignments_are_not_permitted_in_module_augmentations);
                     break;
-                case 248 /* ImportEqualsDeclaration */:
-                case 249 /* ImportDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
+                case 250 /* ImportDeclaration */:
                     grammarErrorOnFirstToken(node, ts.Diagnostics.Imports_are_not_permitted_in_module_augmentations_Consider_moving_them_to_the_enclosing_external_module);
                     break;
-                case 186 /* BindingElement */:
-                case 237 /* VariableDeclaration */:
+                case 187 /* BindingElement */:
+                case 238 /* VariableDeclaration */:
                     var name = node.name;
                     if (ts.isBindingPattern(name)) {
                         for (var _b = 0, _c = name.elements; _b < _c.length; _b++) {
@@ -56841,12 +58904,12 @@ var ts;
                         break;
                     }
                 // falls through
-                case 240 /* ClassDeclaration */:
-                case 243 /* EnumDeclaration */:
-                case 239 /* FunctionDeclaration */:
-                case 241 /* InterfaceDeclaration */:
-                case 244 /* ModuleDeclaration */:
-                case 242 /* TypeAliasDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 240 /* FunctionDeclaration */:
+                case 242 /* InterfaceDeclaration */:
+                case 245 /* ModuleDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
                     if (isGlobalAugmentation) {
                         return;
                     }
@@ -56867,17 +58930,17 @@ var ts;
         }
         function getFirstIdentifier(node) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return node;
-                case 148 /* QualifiedName */:
+                case 149 /* QualifiedName */:
                     do {
                         node = node.left;
-                    } while (node.kind !== 72 /* Identifier */);
+                    } while (node.kind !== 73 /* Identifier */);
                     return node;
-                case 189 /* PropertyAccessExpression */:
+                case 190 /* PropertyAccessExpression */:
                     do {
                         node = node.expression;
-                    } while (node.kind !== 72 /* Identifier */);
+                    } while (node.kind !== 73 /* Identifier */);
                     return node;
             }
         }
@@ -56891,9 +58954,9 @@ var ts;
                 error(moduleName, ts.Diagnostics.String_literal_expected);
                 return false;
             }
-            var inAmbientExternalModule = node.parent.kind === 245 /* ModuleBlock */ && ts.isAmbientModule(node.parent.parent);
-            if (node.parent.kind !== 284 /* SourceFile */ && !inAmbientExternalModule) {
-                error(moduleName, node.kind === 255 /* ExportDeclaration */ ?
+            var inAmbientExternalModule = node.parent.kind === 246 /* ModuleBlock */ && ts.isAmbientModule(node.parent.parent);
+            if (node.parent.kind !== 285 /* SourceFile */ && !inAmbientExternalModule) {
+                error(moduleName, node.kind === 256 /* ExportDeclaration */ ?
                     ts.Diagnostics.Export_declarations_are_not_permitted_in_a_namespace :
                     ts.Diagnostics.Import_declarations_in_a_namespace_cannot_reference_a_module);
                 return false;
@@ -56926,14 +58989,14 @@ var ts;
                     (symbol.flags & 67897832 /* Type */ ? 67897832 /* Type */ : 0) |
                     (symbol.flags & 1920 /* Namespace */ ? 1920 /* Namespace */ : 0);
                 if (target.flags & excludedMeanings) {
-                    var message = node.kind === 257 /* ExportSpecifier */ ?
+                    var message = node.kind === 258 /* ExportSpecifier */ ?
                         ts.Diagnostics.Export_declaration_conflicts_with_exported_declaration_of_0 :
                         ts.Diagnostics.Import_declaration_conflicts_with_local_declaration_of_0;
                     error(node, message, symbolToString(symbol));
                 }
                 // Don't allow to re-export something with no value side when `--isolatedModules` is set.
                 if (compilerOptions.isolatedModules
-                    && node.kind === 257 /* ExportSpecifier */
+                    && node.kind === 258 /* ExportSpecifier */
                     && !(target.flags & 67220415 /* Value */)
                     && !(node.flags & 4194304 /* Ambient */)) {
                     error(node, ts.Diagnostics.Cannot_re_export_a_type_when_the_isolatedModules_flag_is_provided);
@@ -56960,7 +59023,7 @@ var ts;
                         checkImportBinding(importClause);
                     }
                     if (importClause.namedBindings) {
-                        if (importClause.namedBindings.kind === 251 /* NamespaceImport */) {
+                        if (importClause.namedBindings.kind === 252 /* NamespaceImport */) {
                             checkImportBinding(importClause.namedBindings);
                         }
                         else {
@@ -56984,7 +59047,7 @@ var ts;
                 if (ts.hasModifier(node, 1 /* Export */)) {
                     markExportAsReferenced(node);
                 }
-                if (node.moduleReference.kind !== 259 /* ExternalModuleReference */) {
+                if (node.moduleReference.kind !== 260 /* ExternalModuleReference */) {
                     var target = resolveAlias(getSymbolOfNode(node));
                     if (target !== unknownSymbol) {
                         if (target.flags & 67220415 /* Value */) {
@@ -57020,10 +59083,10 @@ var ts;
                     // export { x, y }
                     // export { x, y } from "foo"
                     ts.forEach(node.exportClause.elements, checkExportSpecifier);
-                    var inAmbientExternalModule = node.parent.kind === 245 /* ModuleBlock */ && ts.isAmbientModule(node.parent.parent);
-                    var inAmbientNamespaceDeclaration = !inAmbientExternalModule && node.parent.kind === 245 /* ModuleBlock */ &&
+                    var inAmbientExternalModule = node.parent.kind === 246 /* ModuleBlock */ && ts.isAmbientModule(node.parent.parent);
+                    var inAmbientNamespaceDeclaration = !inAmbientExternalModule && node.parent.kind === 246 /* ModuleBlock */ &&
                         !node.moduleSpecifier && node.flags & 4194304 /* Ambient */;
-                    if (node.parent.kind !== 284 /* SourceFile */ && !inAmbientExternalModule && !inAmbientNamespaceDeclaration) {
+                    if (node.parent.kind !== 285 /* SourceFile */ && !inAmbientExternalModule && !inAmbientNamespaceDeclaration) {
                         error(node, ts.Diagnostics.Export_declarations_are_not_permitted_in_a_namespace);
                     }
                 }
@@ -57034,13 +59097,13 @@ var ts;
                         error(node.moduleSpecifier, ts.Diagnostics.Module_0_uses_export_and_cannot_be_used_with_export_Asterisk, symbolToString(moduleSymbol));
                     }
                     if (moduleKind !== ts.ModuleKind.System && moduleKind !== ts.ModuleKind.ES2015 && moduleKind !== ts.ModuleKind.ESNext) {
-                        checkExternalEmitHelpers(node, 32768 /* ExportStar */);
+                        checkExternalEmitHelpers(node, 65536 /* ExportStar */);
                     }
                 }
             }
         }
         function checkGrammarModuleElementContext(node, errorMessage) {
-            var isInAppropriateContext = node.parent.kind === 284 /* SourceFile */ || node.parent.kind === 245 /* ModuleBlock */ || node.parent.kind === 244 /* ModuleDeclaration */;
+            var isInAppropriateContext = node.parent.kind === 285 /* SourceFile */ || node.parent.kind === 246 /* ModuleBlock */ || node.parent.kind === 245 /* ModuleDeclaration */;
             if (!isInAppropriateContext) {
                 grammarErrorOnFirstToken(node, errorMessage);
             }
@@ -57069,8 +59132,8 @@ var ts;
                 // If we hit an export assignment in an illegal context, just bail out to avoid cascading errors.
                 return;
             }
-            var container = node.parent.kind === 284 /* SourceFile */ ? node.parent : node.parent.parent;
-            if (container.kind === 244 /* ModuleDeclaration */ && !ts.isAmbientModule(container)) {
+            var container = node.parent.kind === 285 /* SourceFile */ ? node.parent : node.parent.parent;
+            if (container.kind === 245 /* ModuleDeclaration */ && !ts.isAmbientModule(container)) {
                 if (node.isExportEquals) {
                     error(node, ts.Diagnostics.An_export_assignment_cannot_be_used_in_a_namespace);
                 }
@@ -57083,7 +59146,7 @@ var ts;
             if (!checkGrammarDecoratorsAndModifiers(node) && ts.hasModifiers(node)) {
                 grammarErrorOnFirstToken(node, ts.Diagnostics.An_export_assignment_cannot_have_modifiers);
             }
-            if (node.expression.kind === 72 /* Identifier */) {
+            if (node.expression.kind === 73 /* Identifier */) {
                 markExportAsReferenced(node);
                 if (ts.getEmitDeclarations(compilerOptions)) {
                     collectLinkedAliases(node.expression, /*setVisibility*/ true);
@@ -57158,13 +59221,14 @@ var ts;
             return !ts.isAccessor(declaration);
         }
         function isNotOverload(declaration) {
-            return (declaration.kind !== 239 /* FunctionDeclaration */ && declaration.kind !== 156 /* MethodDeclaration */) ||
+            return (declaration.kind !== 240 /* FunctionDeclaration */ && declaration.kind !== 157 /* MethodDeclaration */) ||
                 !!declaration.body;
         }
         function checkSourceElement(node) {
             if (node) {
                 var saveCurrentNode = currentNode;
                 currentNode = node;
+                instantiationCount = 0;
                 checkSourceElementWorker(node);
                 currentNode = saveCurrentNode;
             }
@@ -57181,158 +59245,158 @@ var ts;
                 // Only bother checking on a few construct kinds.  We don't want to be excessively
                 // hitting the cancellation token on every node we check.
                 switch (kind) {
-                    case 244 /* ModuleDeclaration */:
-                    case 240 /* ClassDeclaration */:
-                    case 241 /* InterfaceDeclaration */:
-                    case 239 /* FunctionDeclaration */:
+                    case 245 /* ModuleDeclaration */:
+                    case 241 /* ClassDeclaration */:
+                    case 242 /* InterfaceDeclaration */:
+                    case 240 /* FunctionDeclaration */:
                         cancellationToken.throwIfCancellationRequested();
                 }
             }
             switch (kind) {
-                case 150 /* TypeParameter */:
+                case 151 /* TypeParameter */:
                     return checkTypeParameter(node);
-                case 151 /* Parameter */:
+                case 152 /* Parameter */:
                     return checkParameter(node);
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
                     return checkPropertyDeclaration(node);
-                case 165 /* FunctionType */:
-                case 166 /* ConstructorType */:
-                case 160 /* CallSignature */:
-                case 161 /* ConstructSignature */:
-                case 162 /* IndexSignature */:
+                case 166 /* FunctionType */:
+                case 167 /* ConstructorType */:
+                case 161 /* CallSignature */:
+                case 162 /* ConstructSignature */:
+                case 163 /* IndexSignature */:
                     return checkSignatureDeclaration(node);
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
                     return checkMethodDeclaration(node);
-                case 157 /* Constructor */:
+                case 158 /* Constructor */:
                     return checkConstructorDeclaration(node);
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     return checkAccessorDeclaration(node);
-                case 164 /* TypeReference */:
+                case 165 /* TypeReference */:
                     return checkTypeReferenceNode(node);
-                case 163 /* TypePredicate */:
+                case 164 /* TypePredicate */:
                     return checkTypePredicate(node);
-                case 167 /* TypeQuery */:
+                case 168 /* TypeQuery */:
                     return checkTypeQuery(node);
-                case 168 /* TypeLiteral */:
+                case 169 /* TypeLiteral */:
                     return checkTypeLiteral(node);
-                case 169 /* ArrayType */:
+                case 170 /* ArrayType */:
                     return checkArrayType(node);
-                case 170 /* TupleType */:
+                case 171 /* TupleType */:
                     return checkTupleType(node);
-                case 173 /* UnionType */:
-                case 174 /* IntersectionType */:
+                case 174 /* UnionType */:
+                case 175 /* IntersectionType */:
                     return checkUnionOrIntersectionType(node);
-                case 177 /* ParenthesizedType */:
-                case 171 /* OptionalType */:
-                case 172 /* RestType */:
+                case 178 /* ParenthesizedType */:
+                case 172 /* OptionalType */:
+                case 173 /* RestType */:
                     return checkSourceElement(node.type);
-                case 178 /* ThisType */:
+                case 179 /* ThisType */:
                     return checkThisType(node);
-                case 179 /* TypeOperator */:
+                case 180 /* TypeOperator */:
                     return checkTypeOperator(node);
-                case 175 /* ConditionalType */:
+                case 176 /* ConditionalType */:
                     return checkConditionalType(node);
-                case 176 /* InferType */:
+                case 177 /* InferType */:
                     return checkInferType(node);
-                case 183 /* ImportType */:
+                case 184 /* ImportType */:
                     return checkImportType(node);
-                case 300 /* JSDocAugmentsTag */:
+                case 301 /* JSDocAugmentsTag */:
                     return checkJSDocAugmentsTag(node);
-                case 309 /* JSDocTypedefTag */:
-                case 302 /* JSDocCallbackTag */:
+                case 311 /* JSDocTypedefTag */:
+                case 304 /* JSDocCallbackTag */:
                     return checkJSDocTypeAliasTag(node);
-                case 308 /* JSDocTemplateTag */:
+                case 310 /* JSDocTemplateTag */:
                     return checkJSDocTemplateTag(node);
-                case 307 /* JSDocTypeTag */:
+                case 309 /* JSDocTypeTag */:
                     return checkJSDocTypeTag(node);
-                case 304 /* JSDocParameterTag */:
+                case 306 /* JSDocParameterTag */:
                     return checkJSDocParameterTag(node);
-                case 294 /* JSDocFunctionType */:
+                case 295 /* JSDocFunctionType */:
                     checkJSDocFunctionType(node);
                 // falls through
-                case 292 /* JSDocNonNullableType */:
-                case 291 /* JSDocNullableType */:
-                case 289 /* JSDocAllType */:
-                case 290 /* JSDocUnknownType */:
-                case 297 /* JSDocTypeLiteral */:
+                case 293 /* JSDocNonNullableType */:
+                case 292 /* JSDocNullableType */:
+                case 290 /* JSDocAllType */:
+                case 291 /* JSDocUnknownType */:
+                case 298 /* JSDocTypeLiteral */:
                     checkJSDocTypeIsInJsFile(node);
                     ts.forEachChild(node, checkSourceElement);
                     return;
-                case 295 /* JSDocVariadicType */:
+                case 296 /* JSDocVariadicType */:
                     checkJSDocVariadicType(node);
                     return;
-                case 288 /* JSDocTypeExpression */:
+                case 289 /* JSDocTypeExpression */:
                     return checkSourceElement(node.type);
-                case 180 /* IndexedAccessType */:
+                case 181 /* IndexedAccessType */:
                     return checkIndexedAccessType(node);
-                case 181 /* MappedType */:
+                case 182 /* MappedType */:
                     return checkMappedType(node);
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     return checkFunctionDeclaration(node);
-                case 218 /* Block */:
-                case 245 /* ModuleBlock */:
+                case 219 /* Block */:
+                case 246 /* ModuleBlock */:
                     return checkBlock(node);
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     return checkVariableStatement(node);
-                case 221 /* ExpressionStatement */:
+                case 222 /* ExpressionStatement */:
                     return checkExpressionStatement(node);
-                case 222 /* IfStatement */:
+                case 223 /* IfStatement */:
                     return checkIfStatement(node);
-                case 223 /* DoStatement */:
+                case 224 /* DoStatement */:
                     return checkDoStatement(node);
-                case 224 /* WhileStatement */:
+                case 225 /* WhileStatement */:
                     return checkWhileStatement(node);
-                case 225 /* ForStatement */:
+                case 226 /* ForStatement */:
                     return checkForStatement(node);
-                case 226 /* ForInStatement */:
+                case 227 /* ForInStatement */:
                     return checkForInStatement(node);
-                case 227 /* ForOfStatement */:
+                case 228 /* ForOfStatement */:
                     return checkForOfStatement(node);
-                case 228 /* ContinueStatement */:
-                case 229 /* BreakStatement */:
+                case 229 /* ContinueStatement */:
+                case 230 /* BreakStatement */:
                     return checkBreakOrContinueStatement(node);
-                case 230 /* ReturnStatement */:
+                case 231 /* ReturnStatement */:
                     return checkReturnStatement(node);
-                case 231 /* WithStatement */:
+                case 232 /* WithStatement */:
                     return checkWithStatement(node);
-                case 232 /* SwitchStatement */:
+                case 233 /* SwitchStatement */:
                     return checkSwitchStatement(node);
-                case 233 /* LabeledStatement */:
+                case 234 /* LabeledStatement */:
                     return checkLabeledStatement(node);
-                case 234 /* ThrowStatement */:
+                case 235 /* ThrowStatement */:
                     return checkThrowStatement(node);
-                case 235 /* TryStatement */:
+                case 236 /* TryStatement */:
                     return checkTryStatement(node);
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     return checkVariableDeclaration(node);
-                case 186 /* BindingElement */:
+                case 187 /* BindingElement */:
                     return checkBindingElement(node);
-                case 240 /* ClassDeclaration */:
+                case 241 /* ClassDeclaration */:
                     return checkClassDeclaration(node);
-                case 241 /* InterfaceDeclaration */:
+                case 242 /* InterfaceDeclaration */:
                     return checkInterfaceDeclaration(node);
-                case 242 /* TypeAliasDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
                     return checkTypeAliasDeclaration(node);
-                case 243 /* EnumDeclaration */:
+                case 244 /* EnumDeclaration */:
                     return checkEnumDeclaration(node);
-                case 244 /* ModuleDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     return checkModuleDeclaration(node);
-                case 249 /* ImportDeclaration */:
+                case 250 /* ImportDeclaration */:
                     return checkImportDeclaration(node);
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return checkImportEqualsDeclaration(node);
-                case 255 /* ExportDeclaration */:
+                case 256 /* ExportDeclaration */:
                     return checkExportDeclaration(node);
-                case 254 /* ExportAssignment */:
+                case 255 /* ExportAssignment */:
                     return checkExportAssignment(node);
-                case 220 /* EmptyStatement */:
-                case 236 /* DebuggerStatement */:
+                case 221 /* EmptyStatement */:
+                case 237 /* DebuggerStatement */:
                     checkGrammarStatementInAmbientContext(node);
                     return;
-                case 258 /* MissingDeclaration */:
+                case 259 /* MissingDeclaration */:
                     return checkMissingDeclaration(node);
             }
         }
@@ -57425,24 +59489,25 @@ var ts;
         function checkDeferredNode(node) {
             var saveCurrentNode = currentNode;
             currentNode = node;
+            instantiationCount = 0;
             switch (node.kind) {
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
                     checkFunctionExpressionOrObjectLiteralMethodDeferred(node);
                     break;
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     checkAccessorDeclaration(node);
                     break;
-                case 209 /* ClassExpression */:
+                case 210 /* ClassExpression */:
                     checkClassExpressionDeferred(node);
                     break;
-                case 261 /* JsxSelfClosingElement */:
+                case 262 /* JsxSelfClosingElement */:
                     checkJsxSelfClosingElementDeferred(node);
                     break;
-                case 260 /* JsxElement */:
+                case 261 /* JsxElement */:
                     checkJsxElementDeferred(node);
                     break;
             }
@@ -57572,17 +59637,17 @@ var ts;
                         copySymbols(location.locals, meaning);
                     }
                     switch (location.kind) {
-                        case 284 /* SourceFile */:
+                        case 285 /* SourceFile */:
                             if (!ts.isExternalOrCommonJsModule(location))
                                 break;
                         // falls through
-                        case 244 /* ModuleDeclaration */:
+                        case 245 /* ModuleDeclaration */:
                             copySymbols(getSymbolOfNode(location).exports, meaning & 2623475 /* ModuleMember */);
                             break;
-                        case 243 /* EnumDeclaration */:
+                        case 244 /* EnumDeclaration */:
                             copySymbols(getSymbolOfNode(location).exports, meaning & 8 /* EnumMember */);
                             break;
-                        case 209 /* ClassExpression */:
+                        case 210 /* ClassExpression */:
                             var className = location.name;
                             if (className) {
                                 copySymbol(location.symbol, meaning);
@@ -57590,8 +59655,8 @@ var ts;
                         // falls through
                         // this fall-through is necessary because we would like to handle
                         // type parameter inside class expression similar to how we handle it in classDeclaration and interface Declaration
-                        case 240 /* ClassDeclaration */:
-                        case 241 /* InterfaceDeclaration */:
+                        case 241 /* ClassDeclaration */:
+                        case 242 /* InterfaceDeclaration */:
                             // If we didn't come from static member of class or interface,
                             // add the type parameters into the symbol table
                             // (type parameters of classDeclaration/classExpression and interface are in member property of the symbol.
@@ -57600,7 +59665,7 @@ var ts;
                                 copySymbols(getMembersOfSymbol(getSymbolOfNode(location)), meaning & 67897832 /* Type */);
                             }
                             break;
-                        case 196 /* FunctionExpression */:
+                        case 197 /* FunctionExpression */:
                             var funcName = location.name;
                             if (funcName) {
                                 copySymbol(location.symbol, meaning);
@@ -57642,17 +59707,17 @@ var ts;
             }
         }
         function isTypeDeclarationName(name) {
-            return name.kind === 72 /* Identifier */ &&
+            return name.kind === 73 /* Identifier */ &&
                 isTypeDeclaration(name.parent) &&
                 name.parent.name === name;
         }
         function isTypeDeclaration(node) {
             switch (node.kind) {
-                case 150 /* TypeParameter */:
-                case 240 /* ClassDeclaration */:
-                case 241 /* InterfaceDeclaration */:
-                case 242 /* TypeAliasDeclaration */:
-                case 243 /* EnumDeclaration */:
+                case 151 /* TypeParameter */:
+                case 241 /* ClassDeclaration */:
+                case 242 /* InterfaceDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
+                case 244 /* EnumDeclaration */:
                     return true;
                 default:
                     return false;
@@ -57660,16 +59725,16 @@ var ts;
         }
         // True if the given identifier is part of a type reference
         function isTypeReferenceIdentifier(node) {
-            while (node.parent.kind === 148 /* QualifiedName */) {
+            while (node.parent.kind === 149 /* QualifiedName */) {
                 node = node.parent;
             }
-            return node.parent.kind === 164 /* TypeReference */;
+            return node.parent.kind === 165 /* TypeReference */;
         }
         function isHeritageClauseElementIdentifier(node) {
-            while (node.parent.kind === 189 /* PropertyAccessExpression */) {
+            while (node.parent.kind === 190 /* PropertyAccessExpression */) {
                 node = node.parent;
             }
-            return node.parent.kind === 211 /* ExpressionWithTypeArguments */;
+            return node.parent.kind === 212 /* ExpressionWithTypeArguments */;
         }
         function forEachEnclosingClass(node, callback) {
             var result;
@@ -57697,13 +59762,13 @@ var ts;
             return !!forEachEnclosingClass(node, function (n) { return n === classDeclaration; });
         }
         function getLeftSideOfImportEqualsOrExportAssignment(nodeOnRightSide) {
-            while (nodeOnRightSide.parent.kind === 148 /* QualifiedName */) {
+            while (nodeOnRightSide.parent.kind === 149 /* QualifiedName */) {
                 nodeOnRightSide = nodeOnRightSide.parent;
             }
-            if (nodeOnRightSide.parent.kind === 248 /* ImportEqualsDeclaration */) {
+            if (nodeOnRightSide.parent.kind === 249 /* ImportEqualsDeclaration */) {
                 return nodeOnRightSide.parent.moduleReference === nodeOnRightSide ? nodeOnRightSide.parent : undefined;
             }
-            if (nodeOnRightSide.parent.kind === 254 /* ExportAssignment */) {
+            if (nodeOnRightSide.parent.kind === 255 /* ExportAssignment */) {
                 return nodeOnRightSide.parent.expression === nodeOnRightSide ? nodeOnRightSide.parent : undefined;
             }
             return undefined;
@@ -57729,7 +59794,7 @@ var ts;
                 node = parent;
                 parent = parent.parent;
             }
-            if (parent && parent.kind === 183 /* ImportType */ && parent.qualifier === node) {
+            if (parent && parent.kind === 184 /* ImportType */ && parent.qualifier === node) {
                 return parent;
             }
             return undefined;
@@ -57739,7 +59804,7 @@ var ts;
                 return getSymbolOfNode(entityName.parent);
             }
             if (ts.isInJSFile(entityName) &&
-                entityName.parent.kind === 189 /* PropertyAccessExpression */ &&
+                entityName.parent.kind === 190 /* PropertyAccessExpression */ &&
                 entityName.parent === entityName.parent.parent.left) {
                 // Check if this is a special property assignment
                 var specialPropertyAssignmentSymbol = getSpecialPropertyAssignmentSymbolFromEntityName(entityName);
@@ -57747,7 +59812,7 @@ var ts;
                     return specialPropertyAssignmentSymbol;
                 }
             }
-            if (entityName.parent.kind === 254 /* ExportAssignment */ && ts.isEntityNameExpression(entityName)) {
+            if (entityName.parent.kind === 255 /* ExportAssignment */ && ts.isEntityNameExpression(entityName)) {
                 // Even an entity name expression that doesn't resolve as an entityname may still typecheck as a property access expression
                 var success = resolveEntityName(entityName, 
                 /*all meanings*/ 67220415 /* Value */ | 67897832 /* Type */ | 1920 /* Namespace */ | 2097152 /* Alias */, /*ignoreErrors*/ true);
@@ -57757,7 +59822,7 @@ var ts;
             }
             else if (!ts.isPropertyAccessExpression(entityName) && isInRightSideOfImportOrExportAssignment(entityName)) {
                 // Since we already checked for ExportAssignment, this really could only be an Import
-                var importEqualsDeclaration = ts.getAncestor(entityName, 248 /* ImportEqualsDeclaration */);
+                var importEqualsDeclaration = ts.getAncestor(entityName, 249 /* ImportEqualsDeclaration */);
                 ts.Debug.assert(importEqualsDeclaration !== undefined);
                 return getSymbolOfPartOfRightHandSideOfImportEquals(entityName, /*dontResolveAlias*/ true);
             }
@@ -57775,7 +59840,7 @@ var ts;
             if (isHeritageClauseElementIdentifier(entityName)) {
                 var meaning = 0 /* None */;
                 // In an interface or class, we're definitely interested in a type.
-                if (entityName.parent.kind === 211 /* ExpressionWithTypeArguments */) {
+                if (entityName.parent.kind === 212 /* ExpressionWithTypeArguments */) {
                     meaning = 67897832 /* Type */;
                     // In a class 'extends' clause we are also looking for a value.
                     if (ts.isExpressionWithTypeArgumentsInClassExtendsClause(entityName.parent)) {
@@ -57791,10 +59856,10 @@ var ts;
                     return entityNameSymbol;
                 }
             }
-            if (entityName.parent.kind === 304 /* JSDocParameterTag */) {
+            if (entityName.parent.kind === 306 /* JSDocParameterTag */) {
                 return ts.getParameterSymbolFromJSDoc(entityName.parent);
             }
-            if (entityName.parent.kind === 150 /* TypeParameter */ && entityName.parent.parent.kind === 308 /* JSDocTemplateTag */) {
+            if (entityName.parent.kind === 151 /* TypeParameter */ && entityName.parent.parent.kind === 310 /* JSDocTemplateTag */) {
                 ts.Debug.assert(!ts.isInJSFile(entityName)); // Otherwise `isDeclarationName` would have been true.
                 var typeParameter = ts.getTypeParameterFromJsDoc(entityName.parent);
                 return typeParameter && typeParameter.symbol;
@@ -57804,19 +59869,19 @@ var ts;
                     // Missing entity name.
                     return undefined;
                 }
-                if (entityName.kind === 72 /* Identifier */) {
+                if (entityName.kind === 73 /* Identifier */) {
                     if (ts.isJSXTagName(entityName) && isJsxIntrinsicIdentifier(entityName)) {
                         var symbol = getIntrinsicTagSymbol(entityName.parent);
                         return symbol === unknownSymbol ? undefined : symbol;
                     }
                     return resolveEntityName(entityName, 67220415 /* Value */, /*ignoreErrors*/ false, /*dontResolveAlias*/ true);
                 }
-                else if (entityName.kind === 189 /* PropertyAccessExpression */ || entityName.kind === 148 /* QualifiedName */) {
+                else if (entityName.kind === 190 /* PropertyAccessExpression */ || entityName.kind === 149 /* QualifiedName */) {
                     var links = getNodeLinks(entityName);
                     if (links.resolvedSymbol) {
                         return links.resolvedSymbol;
                     }
-                    if (entityName.kind === 189 /* PropertyAccessExpression */) {
+                    if (entityName.kind === 190 /* PropertyAccessExpression */) {
                         checkPropertyAccessExpression(entityName);
                     }
                     else {
@@ -57826,17 +59891,17 @@ var ts;
                 }
             }
             else if (isTypeReferenceIdentifier(entityName)) {
-                var meaning = entityName.parent.kind === 164 /* TypeReference */ ? 67897832 /* Type */ : 1920 /* Namespace */;
+                var meaning = entityName.parent.kind === 165 /* TypeReference */ ? 67897832 /* Type */ : 1920 /* Namespace */;
                 return resolveEntityName(entityName, meaning, /*ignoreErrors*/ false, /*dontResolveAlias*/ true);
             }
-            if (entityName.parent.kind === 163 /* TypePredicate */) {
+            if (entityName.parent.kind === 164 /* TypePredicate */) {
                 return resolveEntityName(entityName, /*meaning*/ 1 /* FunctionScopedVariable */);
             }
             // Do we want to return undefined here?
             return undefined;
         }
         function getSymbolAtLocation(node) {
-            if (node.kind === 284 /* SourceFile */) {
+            if (node.kind === 285 /* SourceFile */) {
                 return ts.isExternalModule(node) ? getMergedSymbol(node.symbol) : undefined;
             }
             var parent = node.parent;
@@ -57855,12 +59920,12 @@ var ts;
             else if (ts.isLiteralComputedPropertyDeclarationName(node)) {
                 return getSymbolOfNode(parent.parent);
             }
-            if (node.kind === 72 /* Identifier */) {
+            if (node.kind === 73 /* Identifier */) {
                 if (isInRightSideOfImportOrExportAssignment(node)) {
                     return getSymbolOfEntityNameOrPropertyAccessExpression(node);
                 }
-                else if (parent.kind === 186 /* BindingElement */ &&
-                    grandParent.kind === 184 /* ObjectBindingPattern */ &&
+                else if (parent.kind === 187 /* BindingElement */ &&
+                    grandParent.kind === 185 /* ObjectBindingPattern */ &&
                     node === parent.propertyName) {
                     var typeOfPattern = getTypeOfNode(grandParent);
                     var propertyDeclaration = getPropertyOfType(typeOfPattern, node.escapedText);
@@ -57870,11 +59935,11 @@ var ts;
                 }
             }
             switch (node.kind) {
-                case 72 /* Identifier */:
-                case 189 /* PropertyAccessExpression */:
-                case 148 /* QualifiedName */:
+                case 73 /* Identifier */:
+                case 190 /* PropertyAccessExpression */:
+                case 149 /* QualifiedName */:
                     return getSymbolOfEntityNameOrPropertyAccessExpression(node);
-                case 100 /* ThisKeyword */:
+                case 101 /* ThisKeyword */:
                     var container = ts.getThisContainer(node, /*includeArrowFunctions*/ false);
                     if (ts.isFunctionLike(container)) {
                         var sig = getSignatureFromDeclaration(container);
@@ -57886,14 +59951,14 @@ var ts;
                         return checkExpression(node).symbol;
                     }
                 // falls through
-                case 178 /* ThisType */:
+                case 179 /* ThisType */:
                     return getTypeFromThisTypeNode(node).symbol;
-                case 98 /* SuperKeyword */:
+                case 99 /* SuperKeyword */:
                     return checkExpression(node).symbol;
-                case 124 /* ConstructorKeyword */:
+                case 125 /* ConstructorKeyword */:
                     // constructor keyword for an overload, should take us to the definition if it exist
                     var constructorDeclaration = node.parent;
-                    if (constructorDeclaration && constructorDeclaration.kind === 157 /* Constructor */) {
+                    if (constructorDeclaration && constructorDeclaration.kind === 158 /* Constructor */) {
                         return constructorDeclaration.parent.symbol;
                     }
                     return undefined;
@@ -57904,7 +59969,7 @@ var ts;
                     // 3). Dynamic import call or require in javascript
                     // 4). type A = import("./f/*gotToDefinitionHere*/oo")
                     if ((ts.isExternalModuleImportEqualsDeclaration(node.parent.parent) && ts.getExternalModuleImportEqualsDeclarationExpression(node.parent.parent) === node) ||
-                        ((node.parent.kind === 249 /* ImportDeclaration */ || node.parent.kind === 255 /* ExportDeclaration */) && node.parent.moduleSpecifier === node) ||
+                        ((node.parent.kind === 250 /* ImportDeclaration */ || node.parent.kind === 256 /* ExportDeclaration */) && node.parent.moduleSpecifier === node) ||
                         ((ts.isInJSFile(node) && ts.isRequireCall(node.parent, /*checkArgumentIsStringLiteralLike*/ false)) || ts.isImportCall(node.parent)) ||
                         (ts.isLiteralTypeNode(node.parent) && ts.isLiteralImportTypeNode(node.parent.parent) && node.parent.parent.argument === node.parent)) {
                         return resolveExternalModuleName(node, node);
@@ -57921,21 +59986,21 @@ var ts;
                             ? getTypeFromTypeNode(grandParent.objectType)
                             : undefined;
                     return objectType && getPropertyOfType(objectType, ts.escapeLeadingUnderscores(node.text));
-                case 80 /* DefaultKeyword */:
-                case 90 /* FunctionKeyword */:
+                case 81 /* DefaultKeyword */:
+                case 91 /* FunctionKeyword */:
                 case 37 /* EqualsGreaterThanToken */:
-                case 76 /* ClassKeyword */:
+                case 77 /* ClassKeyword */:
                     return getSymbolOfNode(node.parent);
-                case 183 /* ImportType */:
+                case 184 /* ImportType */:
                     return ts.isLiteralImportTypeNode(node) ? getSymbolAtLocation(node.argument.literal) : undefined;
-                case 85 /* ExportKeyword */:
+                case 86 /* ExportKeyword */:
                     return ts.isExportAssignment(node.parent) ? ts.Debug.assertDefined(node.parent.symbol) : undefined;
                 default:
                     return undefined;
             }
         }
         function getShorthandAssignmentValueSymbol(location) {
-            if (location && location.kind === 276 /* ShorthandPropertyAssignment */) {
+            if (location && location.kind === 277 /* ShorthandPropertyAssignment */) {
                 return resolveEntityName(location.name, 67220415 /* Value */ | 2097152 /* Alias */);
             }
             return undefined;
@@ -58002,33 +60067,35 @@ var ts;
         //     }
         // [ a ] from
         //     [a] = [ some array ...]
-        function getTypeOfArrayLiteralOrObjectLiteralDestructuringAssignment(expr) {
-            ts.Debug.assert(expr.kind === 188 /* ObjectLiteralExpression */ || expr.kind === 187 /* ArrayLiteralExpression */);
+        function getTypeOfAssignmentPattern(expr) {
+            ts.Debug.assert(expr.kind === 189 /* ObjectLiteralExpression */ || expr.kind === 188 /* ArrayLiteralExpression */);
             // If this is from "for of"
             //     for ( { a } of elems) {
             //     }
-            if (expr.parent.kind === 227 /* ForOfStatement */) {
+            if (expr.parent.kind === 228 /* ForOfStatement */) {
                 var iteratedType = checkRightHandSideOfForOf(expr.parent.expression, expr.parent.awaitModifier);
                 return checkDestructuringAssignment(expr, iteratedType || errorType);
             }
             // If this is from "for" initializer
             //     for ({a } = elems[0];.....) { }
-            if (expr.parent.kind === 204 /* BinaryExpression */) {
+            if (expr.parent.kind === 205 /* BinaryExpression */) {
                 var iteratedType = getTypeOfExpression(expr.parent.right);
                 return checkDestructuringAssignment(expr, iteratedType || errorType);
             }
             // If this is from nested object binding pattern
             //     for ({ skills: { primary, secondary } } = multiRobot, i = 0; i < 1; i++) {
-            if (expr.parent.kind === 275 /* PropertyAssignment */) {
-                var typeOfParentObjectLiteral = getTypeOfArrayLiteralOrObjectLiteralDestructuringAssignment(expr.parent.parent);
-                return checkObjectLiteralDestructuringPropertyAssignment(typeOfParentObjectLiteral || errorType, expr.parent); // TODO: GH#18217
+            if (expr.parent.kind === 276 /* PropertyAssignment */) {
+                var node_3 = ts.cast(expr.parent.parent, ts.isObjectLiteralExpression);
+                var typeOfParentObjectLiteral = getTypeOfAssignmentPattern(node_3) || errorType;
+                var propertyIndex = ts.indexOfNode(node_3.properties, expr.parent);
+                return checkObjectLiteralDestructuringPropertyAssignment(node_3, typeOfParentObjectLiteral, propertyIndex);
             }
             // Array literal assignment - array destructuring pattern
-            ts.Debug.assert(expr.parent.kind === 187 /* ArrayLiteralExpression */);
+            var node = ts.cast(expr.parent, ts.isArrayLiteralExpression);
             //    [{ property1: p1, property2 }] = elems;
-            var typeOfArrayLiteral = getTypeOfArrayLiteralOrObjectLiteralDestructuringAssignment(expr.parent);
-            var elementType = checkIteratedTypeOrElementType(typeOfArrayLiteral || errorType, expr.parent, /*allowStringInput*/ false, /*allowAsyncIterables*/ false) || errorType;
-            return checkArrayLiteralDestructuringElementAssignment(expr.parent, typeOfArrayLiteral, expr.parent.elements.indexOf(expr), elementType || errorType); // TODO: GH#18217
+            var typeOfArrayLiteral = getTypeOfAssignmentPattern(node) || errorType;
+            var elementType = checkIteratedTypeOrElementType(65 /* Destructuring */, typeOfArrayLiteral, undefinedType, expr.parent) || errorType;
+            return checkArrayLiteralDestructuringElementAssignment(node, typeOfArrayLiteral, node.elements.indexOf(expr), elementType);
         }
         // Gets the property symbol corresponding to the property in destructuring assignment
         // 'property1' from
@@ -58038,7 +60105,7 @@ var ts;
         //     [a] = [ property1, property2 ]
         function getPropertySymbolOfDestructuringAssignment(location) {
             // Get the type of the object or array literal and then look for property of given name in the type
-            var typeOfObjectLiteral = getTypeOfArrayLiteralOrObjectLiteralDestructuringAssignment(location.parent.parent);
+            var typeOfObjectLiteral = getTypeOfAssignmentPattern(ts.cast(location.parent.parent, ts.isAssignmentPattern));
             return typeOfObjectLiteral && getPropertyOfType(typeOfObjectLiteral, location.escapedText);
         }
         function getRegularTypeOfExpression(expr) {
@@ -58060,12 +60127,12 @@ var ts;
         function getClassElementPropertyKeyType(element) {
             var name = element.name;
             switch (name.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return getLiteralType(ts.idText(name));
                 case 8 /* NumericLiteral */:
                 case 10 /* StringLiteral */:
                     return getLiteralType(name.text);
-                case 149 /* ComputedPropertyName */:
+                case 150 /* ComputedPropertyName */:
                     var nameType = checkComputedPropertyName(name);
                     return isTypeAssignableToKind(nameType, 12288 /* ESSymbolLike */) ? nameType : stringType;
                 default:
@@ -58122,7 +60189,7 @@ var ts;
             if (!ts.isGeneratedIdentifier(nodeIn)) {
                 var node = ts.getParseTreeNode(nodeIn, ts.isIdentifier);
                 if (node) {
-                    var isPropertyName_1 = node.parent.kind === 189 /* PropertyAccessExpression */ && node.parent.name === node;
+                    var isPropertyName_1 = node.parent.kind === 190 /* PropertyAccessExpression */ && node.parent.name === node;
                     return !isPropertyName_1 && getReferencedValueSymbol(node) === argumentsSymbol;
                 }
             }
@@ -58178,7 +60245,7 @@ var ts;
                     }
                     var parentSymbol_1 = getParentOfSymbol(symbol);
                     if (parentSymbol_1) {
-                        if (parentSymbol_1.flags & 512 /* ValueModule */ && parentSymbol_1.valueDeclaration.kind === 284 /* SourceFile */) {
+                        if (parentSymbol_1.flags & 512 /* ValueModule */ && parentSymbol_1.valueDeclaration.kind === 285 /* SourceFile */) {
                             var symbolFile = parentSymbol_1.valueDeclaration;
                             var referenceFile = ts.getSourceFileOfNode(node);
                             // If `node` accesses an export and that export isn't in the same file, then symbol is a namespace export, so return undefined.
@@ -58204,12 +60271,16 @@ var ts;
             }
             return undefined;
         }
+        function isSymbolOfDestructuredElementOfCatchBinding(symbol) {
+            return ts.isBindingElement(symbol.valueDeclaration)
+                && ts.walkUpBindingElementsAndPatterns(symbol.valueDeclaration).parent.kind === 275 /* CatchClause */;
+        }
         function isSymbolOfDeclarationWithCollidingName(symbol) {
-            if (symbol.flags & 418 /* BlockScoped */) {
+            if (symbol.flags & 418 /* BlockScoped */ && !ts.isSourceFile(symbol.valueDeclaration)) {
                 var links = getSymbolLinks(symbol);
                 if (links.isDeclarationWithCollidingName === undefined) {
                     var container = ts.getEnclosingBlockScopeContainer(symbol.valueDeclaration);
-                    if (ts.isStatementWithLocals(container)) {
+                    if (ts.isStatementWithLocals(container) || isSymbolOfDestructuredElementOfCatchBinding(symbol)) {
                         var nodeLinks_1 = getNodeLinks(symbol.valueDeclaration);
                         if (resolveName(container.parent, symbol.escapedName, 67220415 /* Value */, /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined, /*isUse*/ false)) {
                             // redeclaration - always should be renamed
@@ -58233,7 +60304,7 @@ var ts;
                             //       they will not collide with anything
                             var isDeclaredInLoop = nodeLinks_1.flags & 524288 /* BlockScopedBindingInLoop */;
                             var inLoopInitializer = ts.isIterationStatement(container, /*lookInLabeledStatements*/ false);
-                            var inLoopBodyBlock = container.kind === 218 /* Block */ && ts.isIterationStatement(container.parent, /*lookInLabeledStatements*/ false);
+                            var inLoopBodyBlock = container.kind === 219 /* Block */ && ts.isIterationStatement(container.parent, /*lookInLabeledStatements*/ false);
                             links.isDeclarationWithCollidingName = !ts.isBlockScopedContainerTopLevel(container) && (!isDeclaredInLoop || (!inLoopInitializer && !inLoopBodyBlock));
                         }
                         else {
@@ -58274,18 +60345,18 @@ var ts;
         }
         function isValueAliasDeclaration(node) {
             switch (node.kind) {
-                case 248 /* ImportEqualsDeclaration */:
-                case 250 /* ImportClause */:
-                case 251 /* NamespaceImport */:
-                case 253 /* ImportSpecifier */:
-                case 257 /* ExportSpecifier */:
+                case 249 /* ImportEqualsDeclaration */:
+                case 251 /* ImportClause */:
+                case 252 /* NamespaceImport */:
+                case 254 /* ImportSpecifier */:
+                case 258 /* ExportSpecifier */:
                     return isAliasResolvedToValue(getSymbolOfNode(node) || unknownSymbol);
-                case 255 /* ExportDeclaration */:
+                case 256 /* ExportDeclaration */:
                     var exportClause = node.exportClause;
                     return !!exportClause && ts.some(exportClause.elements, isValueAliasDeclaration);
-                case 254 /* ExportAssignment */:
+                case 255 /* ExportAssignment */:
                     return node.expression
-                        && node.expression.kind === 72 /* Identifier */
+                        && node.expression.kind === 73 /* Identifier */
                         ? isAliasResolvedToValue(getSymbolOfNode(node) || unknownSymbol)
                         : true;
             }
@@ -58293,7 +60364,7 @@ var ts;
         }
         function isTopLevelValueImportEqualsWithEntityName(nodeIn) {
             var node = ts.getParseTreeNode(nodeIn, ts.isImportEqualsDeclaration);
-            if (node === undefined || node.parent.kind !== 284 /* SourceFile */ || !ts.isInternalModuleImportEqualsDeclaration(node)) {
+            if (node === undefined || node.parent.kind !== 285 /* SourceFile */ || !ts.isInternalModuleImportEqualsDeclaration(node)) {
                 // parent is not source file or it is not reference to internal module
                 return false;
             }
@@ -58394,15 +60465,15 @@ var ts;
         }
         function canHaveConstantValue(node) {
             switch (node.kind) {
-                case 278 /* EnumMember */:
-                case 189 /* PropertyAccessExpression */:
-                case 190 /* ElementAccessExpression */:
+                case 279 /* EnumMember */:
+                case 190 /* PropertyAccessExpression */:
+                case 191 /* ElementAccessExpression */:
                     return true;
             }
             return false;
         }
         function getConstantValue(node) {
-            if (node.kind === 278 /* EnumMember */) {
+            if (node.kind === 279 /* EnumMember */) {
                 return getEnumMemberValue(node);
             }
             var symbol = getNodeLinks(node).resolvedSymbol;
@@ -58487,7 +60558,7 @@ var ts;
         function createTypeOfDeclaration(declarationIn, enclosingDeclaration, flags, tracker, addUndefined) {
             var declaration = ts.getParseTreeNode(declarationIn, ts.isVariableLikeOrAccessor);
             if (!declaration) {
-                return ts.createToken(120 /* AnyKeyword */);
+                return ts.createToken(121 /* AnyKeyword */);
             }
             // Get type of the symbol if this is the valid symbol otherwise get type at location
             var symbol = getSymbolOfNode(declaration);
@@ -58506,7 +60577,7 @@ var ts;
         function createReturnTypeOfSignatureDeclaration(signatureDeclarationIn, enclosingDeclaration, flags, tracker) {
             var signatureDeclaration = ts.getParseTreeNode(signatureDeclarationIn, ts.isFunctionLike);
             if (!signatureDeclaration) {
-                return ts.createToken(120 /* AnyKeyword */);
+                return ts.createToken(121 /* AnyKeyword */);
             }
             var signature = getSignatureFromDeclaration(signatureDeclaration);
             return nodeBuilder.typeToTypeNode(getReturnTypeOfSignature(signature), enclosingDeclaration, flags | 1024 /* MultilineObjectLiterals */, tracker);
@@ -58514,7 +60585,7 @@ var ts;
         function createTypeOfExpression(exprIn, enclosingDeclaration, flags, tracker) {
             var expr = ts.getParseTreeNode(exprIn, ts.isExpression);
             if (!expr) {
-                return ts.createToken(120 /* AnyKeyword */);
+                return ts.createToken(121 /* AnyKeyword */);
             }
             var type = getWidenedType(getRegularTypeOfExpression(expr));
             return nodeBuilder.typeToTypeNode(type, enclosingDeclaration, flags | 1024 /* MultilineObjectLiterals */, tracker);
@@ -58633,17 +60704,17 @@ var ts;
                 isLateBound: function (nodeIn) {
                     var node = ts.getParseTreeNode(nodeIn, ts.isDeclaration);
                     var symbol = node && getSymbolOfNode(node);
-                    return !!(symbol && ts.getCheckFlags(symbol) & 2048 /* Late */);
+                    return !!(symbol && ts.getCheckFlags(symbol) & 4096 /* Late */);
                 },
                 getJsxFactoryEntity: function (location) { return location ? (getJsxNamespace(location), (ts.getSourceFileOfNode(location).localJsxFactory || _jsxFactoryEntity)) : _jsxFactoryEntity; },
                 getAllAccessorDeclarations: function (accessor) {
                     accessor = ts.getParseTreeNode(accessor, ts.isGetOrSetAccessorDeclaration); // TODO: GH#18217
-                    var otherKind = accessor.kind === 159 /* SetAccessor */ ? 158 /* GetAccessor */ : 159 /* SetAccessor */;
+                    var otherKind = accessor.kind === 160 /* SetAccessor */ ? 159 /* GetAccessor */ : 160 /* SetAccessor */;
                     var otherAccessor = ts.getDeclarationOfKind(getSymbolOfNode(accessor), otherKind);
                     var firstAccessor = otherAccessor && (otherAccessor.pos < accessor.pos) ? otherAccessor : accessor;
                     var secondAccessor = otherAccessor && (otherAccessor.pos < accessor.pos) ? accessor : otherAccessor;
-                    var setAccessor = accessor.kind === 159 /* SetAccessor */ ? accessor : otherAccessor;
-                    var getAccessor = accessor.kind === 158 /* GetAccessor */ ? accessor : otherAccessor;
+                    var setAccessor = accessor.kind === 160 /* SetAccessor */ ? accessor : otherAccessor;
+                    var getAccessor = accessor.kind === 159 /* GetAccessor */ ? accessor : otherAccessor;
                     return {
                         firstAccessor: firstAccessor,
                         secondAccessor: secondAccessor,
@@ -58659,7 +60730,7 @@ var ts;
                 }
             };
             function isInHeritageClause(node) {
-                return node.parent && node.parent.kind === 211 /* ExpressionWithTypeArguments */ && node.parent.parent && node.parent.parent.kind === 273 /* HeritageClause */;
+                return node.parent && node.parent.kind === 212 /* ExpressionWithTypeArguments */ && node.parent.parent && node.parent.parent.kind === 274 /* HeritageClause */;
             }
             // defined here to avoid outer scope pollution
             function getTypeReferenceDirectivesForEntityName(node) {
@@ -58671,7 +60742,7 @@ var ts;
                 // qualified names can only be used as types\namespaces
                 // identifiers are treated as values only if they appear in type queries
                 var meaning = 67897832 /* Type */ | 1920 /* Namespace */;
-                if ((node.kind === 72 /* Identifier */ && isInTypeQuery(node)) || (node.kind === 189 /* PropertyAccessExpression */ && !isInHeritageClause(node))) {
+                if ((node.kind === 73 /* Identifier */ && isInTypeQuery(node)) || (node.kind === 190 /* PropertyAccessExpression */ && !isInHeritageClause(node))) {
                     meaning = 67220415 /* Value */ | 1048576 /* ExportValue */;
                 }
                 var symbol = resolveEntityName(node, meaning, /*ignoreErrors*/ true);
@@ -58722,7 +60793,7 @@ var ts;
                         break;
                     }
                 }
-                if (current.valueDeclaration && current.valueDeclaration.kind === 284 /* SourceFile */ && current.flags & 512 /* ValueModule */) {
+                if (current.valueDeclaration && current.valueDeclaration.kind === 285 /* SourceFile */ && current.flags & 512 /* ValueModule */) {
                     return false;
                 }
                 // check that at least one declaration of top level symbol originates from type declaration file
@@ -58750,12 +60821,12 @@ var ts;
             }
         }
         function getExternalModuleFileFromDeclaration(declaration) {
-            var specifier = declaration.kind === 244 /* ModuleDeclaration */ ? ts.tryCast(declaration.name, ts.isStringLiteral) : ts.getExternalModuleName(declaration);
+            var specifier = declaration.kind === 245 /* ModuleDeclaration */ ? ts.tryCast(declaration.name, ts.isStringLiteral) : ts.getExternalModuleName(declaration);
             var moduleSymbol = resolveExternalModuleNameWorker(specifier, specifier, /*moduleNotFoundError*/ undefined); // TODO: GH#18217
             if (!moduleSymbol) {
                 return undefined;
             }
-            return ts.getDeclarationOfKind(moduleSymbol, 284 /* SourceFile */);
+            return ts.getDeclarationOfKind(moduleSymbol, 285 /* SourceFile */);
         }
         function initializeTypeChecker() {
             // Bind all source files and propagate errors
@@ -58772,6 +60843,15 @@ var ts;
                     continue;
                 }
                 if (!ts.isExternalOrCommonJsModule(file)) {
+                    // It is an error for a non-external-module (i.e. script) to declare its own `globalThis`.
+                    // We can't use `builtinGlobals` for this due to synthetic expando-namespace generation in JS files.
+                    var fileGlobalThisSymbol = file.locals.get("globalThis");
+                    if (fileGlobalThisSymbol) {
+                        for (var _d = 0, _e = fileGlobalThisSymbol.declarations; _d < _e.length; _d++) {
+                            var declaration = _e[_d];
+                            diagnostics.add(ts.createDiagnosticForNode(declaration, ts.Diagnostics.Declaration_name_conflicts_with_built_in_global_identifier_0, "globalThis"));
+                        }
+                    }
                     mergeSymbolTable(globals, file.locals);
                 }
                 if (file.jsGlobalAugmentations) {
@@ -58802,10 +60882,10 @@ var ts;
             if (augmentations) {
                 // merge _global_ module augmentations.
                 // this needs to be done after global symbol table is initialized to make sure that all ambient modules are indexed
-                for (var _d = 0, augmentations_1 = augmentations; _d < augmentations_1.length; _d++) {
-                    var list = augmentations_1[_d];
-                    for (var _e = 0, list_1 = list; _e < list_1.length; _e++) {
-                        var augmentation = list_1[_e];
+                for (var _f = 0, augmentations_1 = augmentations; _f < augmentations_1.length; _f++) {
+                    var list = augmentations_1[_f];
+                    for (var _g = 0, list_1 = list; _g < list_1.length; _g++) {
+                        var augmentation = list_1[_g];
                         if (!ts.isGlobalScopeAugmentation(augmentation.parent))
                             continue;
                         mergeModuleAugmentation(augmentation);
@@ -58817,6 +60897,7 @@ var ts;
             getSymbolLinks(undefinedSymbol).type = undefinedWideningType;
             getSymbolLinks(argumentsSymbol).type = getGlobalType("IArguments", /*arity*/ 0, /*reportErrors*/ true);
             getSymbolLinks(unknownSymbol).type = errorType;
+            getSymbolLinks(globalThisSymbol).type = createObjectType(16 /* Anonymous */, globalThisSymbol);
             // Initialize special types
             globalArrayType = getGlobalType("Array", /*arity*/ 1, /*reportErrors*/ true);
             globalObjectType = getGlobalType("Object", /*arity*/ 0, /*reportErrors*/ true);
@@ -58833,16 +60914,16 @@ var ts;
                 // autoArrayType is used as a marker, so even if global Array type is not defined, it needs to be a unique type
                 autoArrayType = createAnonymousType(undefined, emptySymbols, ts.emptyArray, ts.emptyArray, undefined, undefined);
             }
-            globalReadonlyArrayType = getGlobalTypeOrUndefined("ReadonlyArray", /*arity*/ 1);
+            globalReadonlyArrayType = getGlobalTypeOrUndefined("ReadonlyArray", /*arity*/ 1) || globalArrayType;
             anyReadonlyArrayType = globalReadonlyArrayType ? createTypeFromGenericGlobalType(globalReadonlyArrayType, [anyType]) : anyArrayType;
             globalThisType = getGlobalTypeOrUndefined("ThisType", /*arity*/ 1);
             if (augmentations) {
                 // merge _nonglobal_ module augmentations.
                 // this needs to be done after global symbol table is initialized to make sure that all ambient modules are indexed
-                for (var _f = 0, augmentations_2 = augmentations; _f < augmentations_2.length; _f++) {
-                    var list = augmentations_2[_f];
-                    for (var _g = 0, list_2 = list; _g < list_2.length; _g++) {
-                        var augmentation = list_2[_g];
+                for (var _h = 0, augmentations_2 = augmentations; _h < augmentations_2.length; _h++) {
+                    var list = augmentations_2[_h];
+                    for (var _j = 0, list_2 = list; _j < list_2.length; _j++) {
+                        var augmentation = list_2[_j];
                         if (ts.isGlobalScopeAugmentation(augmentation.parent))
                             continue;
                         mergeModuleAugmentation(augmentation);
@@ -58869,8 +60950,8 @@ var ts;
                 else {
                     // Otherwise issue top-level error since the files appear very identical in terms of what they contain
                     var list = ts.arrayFrom(conflictingSymbols.keys()).join(", ");
-                    diagnostics.add(addRelatedInfo(ts.createDiagnosticForNode(firstFile, ts.Diagnostics.Definitions_of_the_following_identifiers_conflict_with_those_in_another_file_Colon_0, list), ts.createDiagnosticForNode(secondFile, ts.Diagnostics.Conflicts_are_in_this_file)));
-                    diagnostics.add(addRelatedInfo(ts.createDiagnosticForNode(secondFile, ts.Diagnostics.Definitions_of_the_following_identifiers_conflict_with_those_in_another_file_Colon_0, list), ts.createDiagnosticForNode(firstFile, ts.Diagnostics.Conflicts_are_in_this_file)));
+                    diagnostics.add(ts.addRelatedInfo(ts.createDiagnosticForNode(firstFile, ts.Diagnostics.Definitions_of_the_following_identifiers_conflict_with_those_in_another_file_Colon_0, list), ts.createDiagnosticForNode(secondFile, ts.Diagnostics.Conflicts_are_in_this_file)));
+                    diagnostics.add(ts.addRelatedInfo(ts.createDiagnosticForNode(secondFile, ts.Diagnostics.Definitions_of_the_following_identifiers_conflict_with_those_in_another_file_Colon_0, list), ts.createDiagnosticForNode(firstFile, ts.Diagnostics.Conflicts_are_in_this_file)));
                 }
             });
             amalgamatedDuplicates = undefined;
@@ -58882,7 +60963,7 @@ var ts;
                     var helpersModule = resolveHelpersModule(sourceFile, location);
                     if (helpersModule !== unknownSymbol) {
                         var uncheckedHelpers = helpers & ~requestedExternalEmitHelpers;
-                        for (var helper = 1 /* FirstEmitHelper */; helper <= 65536 /* LastEmitHelper */; helper <<= 1) {
+                        for (var helper = 1 /* FirstEmitHelper */; helper <= 131072 /* LastEmitHelper */; helper <<= 1) {
                             if (uncheckedHelpers & helper) {
                                 var name = getHelperName(helper);
                                 var symbol = getSymbol(helpersModule.exports, ts.escapeLeadingUnderscores(name), 67220415 /* Value */);
@@ -58909,12 +60990,13 @@ var ts;
                 case 256 /* Values */: return "__values";
                 case 512 /* Read */: return "__read";
                 case 1024 /* Spread */: return "__spread";
-                case 2048 /* Await */: return "__await";
-                case 4096 /* AsyncGenerator */: return "__asyncGenerator";
-                case 8192 /* AsyncDelegator */: return "__asyncDelegator";
-                case 16384 /* AsyncValues */: return "__asyncValues";
-                case 32768 /* ExportStar */: return "__exportStar";
-                case 65536 /* MakeTemplateObject */: return "__makeTemplateObject";
+                case 2048 /* SpreadArrays */: return "__spreadArrays";
+                case 4096 /* Await */: return "__await";
+                case 8192 /* AsyncGenerator */: return "__asyncGenerator";
+                case 16384 /* AsyncDelegator */: return "__asyncDelegator";
+                case 32768 /* AsyncValues */: return "__asyncValues";
+                case 65536 /* ExportStar */: return "__exportStar";
+                case 131072 /* MakeTemplateObject */: return "__makeTemplateObject";
                 default: return ts.Debug.fail("Unrecognized helper");
             }
         }
@@ -58933,14 +61015,14 @@ var ts;
                 return false;
             }
             if (!ts.nodeCanBeDecorated(node, node.parent, node.parent.parent)) {
-                if (node.kind === 156 /* MethodDeclaration */ && !ts.nodeIsPresent(node.body)) {
+                if (node.kind === 157 /* MethodDeclaration */ && !ts.nodeIsPresent(node.body)) {
                     return grammarErrorOnFirstToken(node, ts.Diagnostics.A_decorator_can_only_decorate_a_method_implementation_not_an_overload);
                 }
                 else {
                     return grammarErrorOnFirstToken(node, ts.Diagnostics.Decorators_are_not_valid_here);
                 }
             }
-            else if (node.kind === 158 /* GetAccessor */ || node.kind === 159 /* SetAccessor */) {
+            else if (node.kind === 159 /* GetAccessor */ || node.kind === 160 /* SetAccessor */) {
                 var accessors = ts.getAllAccessorDeclarations(node.parent.members, node);
                 if (accessors.firstAccessor.decorators && node === accessors.secondAccessor) {
                     return grammarErrorOnFirstToken(node, ts.Diagnostics.Decorators_cannot_be_applied_to_multiple_get_Slashset_accessors_of_the_same_name);
@@ -58957,23 +61039,23 @@ var ts;
             var flags = 0 /* None */;
             for (var _i = 0, _a = node.modifiers; _i < _a.length; _i++) {
                 var modifier = _a[_i];
-                if (modifier.kind !== 133 /* ReadonlyKeyword */) {
-                    if (node.kind === 153 /* PropertySignature */ || node.kind === 155 /* MethodSignature */) {
+                if (modifier.kind !== 134 /* ReadonlyKeyword */) {
+                    if (node.kind === 154 /* PropertySignature */ || node.kind === 156 /* MethodSignature */) {
                         return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_type_member, ts.tokenToString(modifier.kind));
                     }
-                    if (node.kind === 162 /* IndexSignature */) {
+                    if (node.kind === 163 /* IndexSignature */) {
                         return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_an_index_signature, ts.tokenToString(modifier.kind));
                     }
                 }
                 switch (modifier.kind) {
-                    case 77 /* ConstKeyword */:
-                        if (node.kind !== 243 /* EnumDeclaration */) {
-                            return grammarErrorOnNode(node, ts.Diagnostics.A_class_member_cannot_have_the_0_keyword, ts.tokenToString(77 /* ConstKeyword */));
+                    case 78 /* ConstKeyword */:
+                        if (node.kind !== 244 /* EnumDeclaration */) {
+                            return grammarErrorOnNode(node, ts.Diagnostics.A_class_member_cannot_have_the_0_keyword, ts.tokenToString(78 /* ConstKeyword */));
                         }
                         break;
-                    case 115 /* PublicKeyword */:
-                    case 114 /* ProtectedKeyword */:
-                    case 113 /* PrivateKeyword */:
+                    case 116 /* PublicKeyword */:
+                    case 115 /* ProtectedKeyword */:
+                    case 114 /* PrivateKeyword */:
                         var text = visibilityToString(ts.modifierToFlag(modifier.kind));
                         if (flags & 28 /* AccessibilityModifier */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics.Accessibility_modifier_already_seen);
@@ -58987,11 +61069,11 @@ var ts;
                         else if (flags & 256 /* Async */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, text, "async");
                         }
-                        else if (node.parent.kind === 245 /* ModuleBlock */ || node.parent.kind === 284 /* SourceFile */) {
+                        else if (node.parent.kind === 246 /* ModuleBlock */ || node.parent.kind === 285 /* SourceFile */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_module_or_namespace_element, text);
                         }
                         else if (flags & 128 /* Abstract */) {
-                            if (modifier.kind === 113 /* PrivateKeyword */) {
+                            if (modifier.kind === 114 /* PrivateKeyword */) {
                                 return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_with_1_modifier, text, "abstract");
                             }
                             else {
@@ -59000,7 +61082,7 @@ var ts;
                         }
                         flags |= ts.modifierToFlag(modifier.kind);
                         break;
-                    case 116 /* StaticKeyword */:
+                    case 117 /* StaticKeyword */:
                         if (flags & 32 /* Static */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "static");
                         }
@@ -59010,10 +61092,10 @@ var ts;
                         else if (flags & 256 /* Async */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, "static", "async");
                         }
-                        else if (node.parent.kind === 245 /* ModuleBlock */ || node.parent.kind === 284 /* SourceFile */) {
+                        else if (node.parent.kind === 246 /* ModuleBlock */ || node.parent.kind === 285 /* SourceFile */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_module_or_namespace_element, "static");
                         }
-                        else if (node.kind === 151 /* Parameter */) {
+                        else if (node.kind === 152 /* Parameter */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "static");
                         }
                         else if (flags & 128 /* Abstract */) {
@@ -59022,18 +61104,18 @@ var ts;
                         flags |= 32 /* Static */;
                         lastStatic = modifier;
                         break;
-                    case 133 /* ReadonlyKeyword */:
+                    case 134 /* ReadonlyKeyword */:
                         if (flags & 64 /* Readonly */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "readonly");
                         }
-                        else if (node.kind !== 154 /* PropertyDeclaration */ && node.kind !== 153 /* PropertySignature */ && node.kind !== 162 /* IndexSignature */ && node.kind !== 151 /* Parameter */) {
+                        else if (node.kind !== 155 /* PropertyDeclaration */ && node.kind !== 154 /* PropertySignature */ && node.kind !== 163 /* IndexSignature */ && node.kind !== 152 /* Parameter */) {
                             // If node.kind === SyntaxKind.Parameter, checkParameter report an error if it's not a parameter property.
                             return grammarErrorOnNode(modifier, ts.Diagnostics.readonly_modifier_can_only_appear_on_a_property_declaration_or_index_signature);
                         }
                         flags |= 64 /* Readonly */;
                         lastReadonly = modifier;
                         break;
-                    case 85 /* ExportKeyword */:
+                    case 86 /* ExportKeyword */:
                         if (flags & 1 /* Export */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "export");
                         }
@@ -59046,52 +61128,52 @@ var ts;
                         else if (flags & 256 /* Async */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, "export", "async");
                         }
-                        else if (node.parent.kind === 240 /* ClassDeclaration */) {
+                        else if (node.parent.kind === 241 /* ClassDeclaration */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_class_element, "export");
                         }
-                        else if (node.kind === 151 /* Parameter */) {
+                        else if (node.kind === 152 /* Parameter */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "export");
                         }
                         flags |= 1 /* Export */;
                         break;
-                    case 80 /* DefaultKeyword */:
-                        var container = node.parent.kind === 284 /* SourceFile */ ? node.parent : node.parent.parent;
-                        if (container.kind === 244 /* ModuleDeclaration */ && !ts.isAmbientModule(container)) {
+                    case 81 /* DefaultKeyword */:
+                        var container = node.parent.kind === 285 /* SourceFile */ ? node.parent : node.parent.parent;
+                        if (container.kind === 245 /* ModuleDeclaration */ && !ts.isAmbientModule(container)) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics.A_default_export_can_only_be_used_in_an_ECMAScript_style_module);
                         }
                         flags |= 512 /* Default */;
                         break;
-                    case 125 /* DeclareKeyword */:
+                    case 126 /* DeclareKeyword */:
                         if (flags & 2 /* Ambient */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "declare");
                         }
                         else if (flags & 256 /* Async */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_in_an_ambient_context, "async");
                         }
-                        else if (node.parent.kind === 240 /* ClassDeclaration */) {
+                        else if (node.parent.kind === 241 /* ClassDeclaration */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_class_element, "declare");
                         }
-                        else if (node.kind === 151 /* Parameter */) {
+                        else if (node.kind === 152 /* Parameter */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "declare");
                         }
-                        else if ((node.parent.flags & 4194304 /* Ambient */) && node.parent.kind === 245 /* ModuleBlock */) {
+                        else if ((node.parent.flags & 4194304 /* Ambient */) && node.parent.kind === 246 /* ModuleBlock */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics.A_declare_modifier_cannot_be_used_in_an_already_ambient_context);
                         }
                         flags |= 2 /* Ambient */;
                         lastDeclare = modifier;
                         break;
-                    case 118 /* AbstractKeyword */:
+                    case 119 /* AbstractKeyword */:
                         if (flags & 128 /* Abstract */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "abstract");
                         }
-                        if (node.kind !== 240 /* ClassDeclaration */) {
-                            if (node.kind !== 156 /* MethodDeclaration */ &&
-                                node.kind !== 154 /* PropertyDeclaration */ &&
-                                node.kind !== 158 /* GetAccessor */ &&
-                                node.kind !== 159 /* SetAccessor */) {
+                        if (node.kind !== 241 /* ClassDeclaration */) {
+                            if (node.kind !== 157 /* MethodDeclaration */ &&
+                                node.kind !== 155 /* PropertyDeclaration */ &&
+                                node.kind !== 159 /* GetAccessor */ &&
+                                node.kind !== 160 /* SetAccessor */) {
                                 return grammarErrorOnNode(modifier, ts.Diagnostics.abstract_modifier_can_only_appear_on_a_class_method_or_property_declaration);
                             }
-                            if (!(node.parent.kind === 240 /* ClassDeclaration */ && ts.hasModifier(node.parent, 128 /* Abstract */))) {
+                            if (!(node.parent.kind === 241 /* ClassDeclaration */ && ts.hasModifier(node.parent, 128 /* Abstract */))) {
                                 return grammarErrorOnNode(modifier, ts.Diagnostics.Abstract_methods_can_only_appear_within_an_abstract_class);
                             }
                             if (flags & 32 /* Static */) {
@@ -59103,14 +61185,14 @@ var ts;
                         }
                         flags |= 128 /* Abstract */;
                         break;
-                    case 121 /* AsyncKeyword */:
+                    case 122 /* AsyncKeyword */:
                         if (flags & 256 /* Async */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "async");
                         }
                         else if (flags & 2 /* Ambient */ || node.parent.flags & 4194304 /* Ambient */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_in_an_ambient_context, "async");
                         }
-                        else if (node.kind === 151 /* Parameter */) {
+                        else if (node.kind === 152 /* Parameter */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "async");
                         }
                         flags |= 256 /* Async */;
@@ -59118,7 +61200,7 @@ var ts;
                         break;
                 }
             }
-            if (node.kind === 157 /* Constructor */) {
+            if (node.kind === 158 /* Constructor */) {
                 if (flags & 32 /* Static */) {
                     return grammarErrorOnNode(lastStatic, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "static");
                 }
@@ -59133,13 +61215,13 @@ var ts;
                 }
                 return false;
             }
-            else if ((node.kind === 249 /* ImportDeclaration */ || node.kind === 248 /* ImportEqualsDeclaration */) && flags & 2 /* Ambient */) {
+            else if ((node.kind === 250 /* ImportDeclaration */ || node.kind === 249 /* ImportEqualsDeclaration */) && flags & 2 /* Ambient */) {
                 return grammarErrorOnNode(lastDeclare, ts.Diagnostics.A_0_modifier_cannot_be_used_with_an_import_declaration, "declare");
             }
-            else if (node.kind === 151 /* Parameter */ && (flags & 92 /* ParameterPropertyModifier */) && ts.isBindingPattern(node.name)) {
+            else if (node.kind === 152 /* Parameter */ && (flags & 92 /* ParameterPropertyModifier */) && ts.isBindingPattern(node.name)) {
                 return grammarErrorOnNode(node, ts.Diagnostics.A_parameter_property_may_not_be_declared_using_a_binding_pattern);
             }
-            else if (node.kind === 151 /* Parameter */ && (flags & 92 /* ParameterPropertyModifier */) && node.dotDotDotToken) {
+            else if (node.kind === 152 /* Parameter */ && (flags & 92 /* ParameterPropertyModifier */) && node.dotDotDotToken) {
                 return grammarErrorOnNode(node, ts.Diagnostics.A_parameter_property_cannot_be_declared_using_a_rest_parameter);
             }
             if (flags & 256 /* Async */) {
@@ -59160,38 +61242,38 @@ var ts;
         }
         function shouldReportBadModifier(node) {
             switch (node.kind) {
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
-                case 157 /* Constructor */:
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
-                case 162 /* IndexSignature */:
-                case 244 /* ModuleDeclaration */:
-                case 249 /* ImportDeclaration */:
-                case 248 /* ImportEqualsDeclaration */:
-                case 255 /* ExportDeclaration */:
-                case 254 /* ExportAssignment */:
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
-                case 151 /* Parameter */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
+                case 158 /* Constructor */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
+                case 163 /* IndexSignature */:
+                case 245 /* ModuleDeclaration */:
+                case 250 /* ImportDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
+                case 256 /* ExportDeclaration */:
+                case 255 /* ExportAssignment */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
+                case 152 /* Parameter */:
                     return false;
                 default:
-                    if (node.parent.kind === 245 /* ModuleBlock */ || node.parent.kind === 284 /* SourceFile */) {
+                    if (node.parent.kind === 246 /* ModuleBlock */ || node.parent.kind === 285 /* SourceFile */) {
                         return false;
                     }
                     switch (node.kind) {
-                        case 239 /* FunctionDeclaration */:
-                            return nodeHasAnyModifiersExcept(node, 121 /* AsyncKeyword */);
-                        case 240 /* ClassDeclaration */:
-                            return nodeHasAnyModifiersExcept(node, 118 /* AbstractKeyword */);
-                        case 241 /* InterfaceDeclaration */:
-                        case 219 /* VariableStatement */:
-                        case 242 /* TypeAliasDeclaration */:
+                        case 240 /* FunctionDeclaration */:
+                            return nodeHasAnyModifiersExcept(node, 122 /* AsyncKeyword */);
+                        case 241 /* ClassDeclaration */:
+                            return nodeHasAnyModifiersExcept(node, 119 /* AbstractKeyword */);
+                        case 242 /* InterfaceDeclaration */:
+                        case 220 /* VariableStatement */:
+                        case 243 /* TypeAliasDeclaration */:
                             return true;
-                        case 243 /* EnumDeclaration */:
-                            return nodeHasAnyModifiersExcept(node, 77 /* ConstKeyword */);
+                        case 244 /* EnumDeclaration */:
+                            return nodeHasAnyModifiersExcept(node, 78 /* ConstKeyword */);
                         default:
                             ts.Debug.fail();
                             return false;
@@ -59203,10 +61285,10 @@ var ts;
         }
         function checkGrammarAsyncModifier(node, asyncModifier) {
             switch (node.kind) {
-                case 156 /* MethodDeclaration */:
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
+                case 157 /* MethodDeclaration */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
                     return false;
             }
             return grammarErrorOnNode(asyncModifier, ts.Diagnostics._0_modifier_cannot_be_used_here, "async");
@@ -59266,10 +61348,10 @@ var ts;
                     var nonSimpleParameters = getNonSimpleParameters(node.parameters);
                     if (ts.length(nonSimpleParameters)) {
                         ts.forEach(nonSimpleParameters, function (parameter) {
-                            addRelatedInfo(error(parameter, ts.Diagnostics.This_parameter_is_not_allowed_with_use_strict_directive), ts.createDiagnosticForNode(useStrictDirective_1, ts.Diagnostics.use_strict_directive_used_here));
+                            ts.addRelatedInfo(error(parameter, ts.Diagnostics.This_parameter_is_not_allowed_with_use_strict_directive), ts.createDiagnosticForNode(useStrictDirective_1, ts.Diagnostics.use_strict_directive_used_here));
                         });
                         var diagnostics_1 = nonSimpleParameters.map(function (parameter, index) { return (index === 0 ? ts.createDiagnosticForNode(parameter, ts.Diagnostics.Non_simple_parameter_declared_here) : ts.createDiagnosticForNode(parameter, ts.Diagnostics.and_here)); });
-                        addRelatedInfo.apply(void 0, [error(useStrictDirective_1, ts.Diagnostics.use_strict_directive_cannot_be_used_with_non_simple_parameter_list)].concat(diagnostics_1));
+                        ts.addRelatedInfo.apply(void 0, [error(useStrictDirective_1, ts.Diagnostics.use_strict_directive_cannot_be_used_with_non_simple_parameter_list)].concat(diagnostics_1));
                         return true;
                     }
                 }
@@ -59321,10 +61403,10 @@ var ts;
             if (!parameter.type) {
                 return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_must_have_a_type_annotation);
             }
-            if (parameter.type.kind !== 138 /* StringKeyword */ && parameter.type.kind !== 135 /* NumberKeyword */) {
+            if (parameter.type.kind !== 139 /* StringKeyword */ && parameter.type.kind !== 136 /* NumberKeyword */) {
                 var type = getTypeFromTypeNode(parameter.type);
                 if (type.flags & 4 /* String */ || type.flags & 8 /* Number */) {
-                    return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_type_cannot_be_a_type_alias_Consider_writing_0_Colon_1_Colon_2_instead, ts.getTextOfNode(parameter.name), typeToString(type), typeToString(getTypeFromTypeNode(node.type)));
+                    return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_type_cannot_be_a_type_alias_Consider_writing_0_Colon_1_Colon_2_instead, ts.getTextOfNode(parameter.name), typeToString(type), typeToString(node.type ? getTypeFromTypeNode(node.type) : anyType));
                 }
                 if (type.flags & 1048576 /* Union */ && allTypesAssignableToKind(type, 128 /* StringLiteral */, /*strict*/ true)) {
                     return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_type_cannot_be_a_union_type_Consider_using_a_mapped_object_type_instead);
@@ -59355,9 +61437,9 @@ var ts;
         }
         function checkGrammarForOmittedArgument(args) {
             if (args) {
-                for (var _i = 0, args_5 = args; _i < args_5.length; _i++) {
-                    var arg = args_5[_i];
-                    if (arg.kind === 210 /* OmittedExpression */) {
+                for (var _i = 0, args_4 = args; _i < args_4.length; _i++) {
+                    var arg = args_4[_i];
+                    if (arg.kind === 211 /* OmittedExpression */) {
                         return grammarErrorAtPos(arg, arg.pos, 0, ts.Diagnostics.Argument_expression_expected);
                     }
                 }
@@ -59387,7 +61469,7 @@ var ts;
             if (!checkGrammarDecoratorsAndModifiers(node) && node.heritageClauses) {
                 for (var _i = 0, _a = node.heritageClauses; _i < _a.length; _i++) {
                     var heritageClause = _a[_i];
-                    if (heritageClause.token === 86 /* ExtendsKeyword */) {
+                    if (heritageClause.token === 87 /* ExtendsKeyword */) {
                         if (seenExtendsClause) {
                             return grammarErrorOnFirstToken(heritageClause, ts.Diagnostics.extends_clause_already_seen);
                         }
@@ -59400,7 +61482,7 @@ var ts;
                         seenExtendsClause = true;
                     }
                     else {
-                        ts.Debug.assert(heritageClause.token === 109 /* ImplementsKeyword */);
+                        ts.Debug.assert(heritageClause.token === 110 /* ImplementsKeyword */);
                         if (seenImplementsClause) {
                             return grammarErrorOnFirstToken(heritageClause, ts.Diagnostics.implements_clause_already_seen);
                         }
@@ -59416,14 +61498,14 @@ var ts;
             if (node.heritageClauses) {
                 for (var _i = 0, _a = node.heritageClauses; _i < _a.length; _i++) {
                     var heritageClause = _a[_i];
-                    if (heritageClause.token === 86 /* ExtendsKeyword */) {
+                    if (heritageClause.token === 87 /* ExtendsKeyword */) {
                         if (seenExtendsClause) {
                             return grammarErrorOnFirstToken(heritageClause, ts.Diagnostics.extends_clause_already_seen);
                         }
                         seenExtendsClause = true;
                     }
                     else {
-                        ts.Debug.assert(heritageClause.token === 109 /* ImplementsKeyword */);
+                        ts.Debug.assert(heritageClause.token === 110 /* ImplementsKeyword */);
                         return grammarErrorOnFirstToken(heritageClause, ts.Diagnostics.Interface_declaration_cannot_have_implements_clause);
                     }
                     // Grammar checking heritageClause inside class declaration
@@ -59434,20 +61516,20 @@ var ts;
         }
         function checkGrammarComputedPropertyName(node) {
             // If node is not a computedPropertyName, just skip the grammar checking
-            if (node.kind !== 149 /* ComputedPropertyName */) {
+            if (node.kind !== 150 /* ComputedPropertyName */) {
                 return false;
             }
             var computedPropertyName = node;
-            if (computedPropertyName.expression.kind === 204 /* BinaryExpression */ && computedPropertyName.expression.operatorToken.kind === 27 /* CommaToken */) {
+            if (computedPropertyName.expression.kind === 205 /* BinaryExpression */ && computedPropertyName.expression.operatorToken.kind === 27 /* CommaToken */) {
                 return grammarErrorOnNode(computedPropertyName.expression, ts.Diagnostics.A_comma_expression_is_not_allowed_in_a_computed_property_name);
             }
             return false;
         }
         function checkGrammarForGenerator(node) {
             if (node.asteriskToken) {
-                ts.Debug.assert(node.kind === 239 /* FunctionDeclaration */ ||
-                    node.kind === 196 /* FunctionExpression */ ||
-                    node.kind === 156 /* MethodDeclaration */);
+                ts.Debug.assert(node.kind === 240 /* FunctionDeclaration */ ||
+                    node.kind === 197 /* FunctionExpression */ ||
+                    node.kind === 157 /* MethodDeclaration */);
                 if (node.flags & 4194304 /* Ambient */) {
                     return grammarErrorOnNode(node.asteriskToken, ts.Diagnostics.Generators_are_not_allowed_in_an_ambient_context);
                 }
@@ -59473,15 +61555,22 @@ var ts;
             var seen = ts.createUnderscoreEscapedMap();
             for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
                 var prop = _a[_i];
-                if (prop.kind === 277 /* SpreadAssignment */) {
+                if (prop.kind === 278 /* SpreadAssignment */) {
+                    if (inDestructuring) {
+                        // a rest property cannot be destructured any further
+                        var expression = ts.skipParentheses(prop.expression);
+                        if (ts.isArrayLiteralExpression(expression) || ts.isObjectLiteralExpression(expression)) {
+                            return grammarErrorOnNode(prop.expression, ts.Diagnostics.A_rest_element_cannot_contain_a_binding_pattern);
+                        }
+                    }
                     continue;
                 }
                 var name = prop.name;
-                if (name.kind === 149 /* ComputedPropertyName */) {
+                if (name.kind === 150 /* ComputedPropertyName */) {
                     // If the name is not a ComputedPropertyName, the grammar checking will skip it
                     checkGrammarComputedPropertyName(name);
                 }
-                if (prop.kind === 276 /* ShorthandPropertyAssignment */ && !inDestructuring && prop.objectAssignmentInitializer) {
+                if (prop.kind === 277 /* ShorthandPropertyAssignment */ && !inDestructuring && prop.objectAssignmentInitializer) {
                     // having objectAssignmentInitializer is only valid in ObjectAssignmentPattern
                     // outside of destructuring it is a syntax error
                     return grammarErrorOnNode(prop.equalsToken, ts.Diagnostics.can_only_be_used_in_an_object_literal_property_inside_a_destructuring_assignment);
@@ -59490,7 +61579,7 @@ var ts;
                 if (prop.modifiers) {
                     for (var _b = 0, _c = prop.modifiers; _b < _c.length; _b++) { // TODO: GH#19955
                         var mod = _c[_b];
-                        if (mod.kind !== 121 /* AsyncKeyword */ || prop.kind !== 156 /* MethodDeclaration */) {
+                        if (mod.kind !== 122 /* AsyncKeyword */ || prop.kind !== 157 /* MethodDeclaration */) {
                             grammarErrorOnNode(mod, ts.Diagnostics._0_modifier_cannot_be_used_here, ts.getTextOfNode(mod));
                         }
                     }
@@ -59505,23 +61594,23 @@ var ts;
                 // and either both previous and propId.descriptor have[[Get]] fields or both previous and propId.descriptor have[[Set]] fields
                 var currentKind = void 0;
                 switch (prop.kind) {
-                    case 276 /* ShorthandPropertyAssignment */:
+                    case 277 /* ShorthandPropertyAssignment */:
                         checkGrammarForInvalidExclamationToken(prop.exclamationToken, ts.Diagnostics.A_definite_assignment_assertion_is_not_permitted_in_this_context);
                     /* tslint:disable:no-switch-case-fall-through */
-                    case 275 /* PropertyAssignment */:
+                    case 276 /* PropertyAssignment */:
                         // Grammar checking for computedPropertyName and shorthandPropertyAssignment
                         checkGrammarForInvalidQuestionMark(prop.questionToken, ts.Diagnostics.An_object_member_cannot_be_declared_optional);
                         if (name.kind === 8 /* NumericLiteral */) {
                             checkGrammarNumericLiteral(name);
                         }
                     // falls through
-                    case 156 /* MethodDeclaration */:
+                    case 157 /* MethodDeclaration */:
                         currentKind = 1 /* Property */;
                         break;
-                    case 158 /* GetAccessor */:
+                    case 159 /* GetAccessor */:
                         currentKind = 2 /* GetAccessor */;
                         break;
-                    case 159 /* SetAccessor */:
+                    case 160 /* SetAccessor */:
                         currentKind = 4 /* SetAccessor */;
                         break;
                     default:
@@ -59558,7 +61647,7 @@ var ts;
             var seen = ts.createUnderscoreEscapedMap();
             for (var _i = 0, _a = node.attributes.properties; _i < _a.length; _i++) {
                 var attr = _a[_i];
-                if (attr.kind === 269 /* JsxSpreadAttribute */) {
+                if (attr.kind === 270 /* JsxSpreadAttribute */) {
                     continue;
                 }
                 var name = attr.name, initializer = attr.initializer;
@@ -59568,21 +61657,39 @@ var ts;
                 else {
                     return grammarErrorOnNode(name, ts.Diagnostics.JSX_elements_cannot_have_multiple_attributes_with_the_same_name);
                 }
-                if (initializer && initializer.kind === 270 /* JsxExpression */ && !initializer.expression) {
+                if (initializer && initializer.kind === 271 /* JsxExpression */ && !initializer.expression) {
                     return grammarErrorOnNode(initializer, ts.Diagnostics.JSX_attributes_must_only_be_assigned_a_non_empty_expression);
                 }
             }
         }
+        function checkGrammarJsxExpression(node) {
+            if (node.expression && ts.isCommaSequence(node.expression)) {
+                return grammarErrorOnNode(node.expression, ts.Diagnostics.JSX_expressions_may_not_use_the_comma_operator_Did_you_mean_to_write_an_array);
+            }
+        }
         function checkGrammarForInOrForOfStatement(forInOrOfStatement) {
             if (checkGrammarStatementInAmbientContext(forInOrOfStatement)) {
                 return true;
             }
-            if (forInOrOfStatement.kind === 227 /* ForOfStatement */ && forInOrOfStatement.awaitModifier) {
+            if (forInOrOfStatement.kind === 228 /* ForOfStatement */ && forInOrOfStatement.awaitModifier) {
                 if ((forInOrOfStatement.flags & 16384 /* AwaitContext */) === 0 /* None */) {
-                    return grammarErrorOnNode(forInOrOfStatement.awaitModifier, ts.Diagnostics.A_for_await_of_statement_is_only_allowed_within_an_async_function_or_async_generator);
+                    // use of 'for-await-of' in non-async function
+                    var sourceFile = ts.getSourceFileOfNode(forInOrOfStatement);
+                    if (!hasParseDiagnostics(sourceFile)) {
+                        var diagnostic = ts.createDiagnosticForNode(forInOrOfStatement.awaitModifier, ts.Diagnostics.A_for_await_of_statement_is_only_allowed_within_an_async_function_or_async_generator);
+                        var func = ts.getContainingFunction(forInOrOfStatement);
+                        if (func && func.kind !== 158 /* Constructor */) {
+                            ts.Debug.assert((ts.getFunctionFlags(func) & 2 /* Async */) === 0, "Enclosing function should never be an async function.");
+                            var relatedInfo = ts.createDiagnosticForNode(func, ts.Diagnostics.Did_you_mean_to_mark_this_function_as_async);
+                            ts.addRelatedInfo(diagnostic, relatedInfo);
+                        }
+                        diagnostics.add(diagnostic);
+                        return true;
+                    }
+                    return false;
                 }
             }
-            if (forInOrOfStatement.initializer.kind === 238 /* VariableDeclarationList */) {
+            if (forInOrOfStatement.initializer.kind === 239 /* VariableDeclarationList */) {
                 var variableList = forInOrOfStatement.initializer;
                 if (!checkGrammarVariableDeclarationList(variableList)) {
                     var declarations = variableList.declarations;
@@ -59597,20 +61704,20 @@ var ts;
                         return false;
                     }
                     if (declarations.length > 1) {
-                        var diagnostic = forInOrOfStatement.kind === 226 /* ForInStatement */
+                        var diagnostic = forInOrOfStatement.kind === 227 /* ForInStatement */
                             ? ts.Diagnostics.Only_a_single_variable_declaration_is_allowed_in_a_for_in_statement
                             : ts.Diagnostics.Only_a_single_variable_declaration_is_allowed_in_a_for_of_statement;
                         return grammarErrorOnFirstToken(variableList.declarations[1], diagnostic);
                     }
                     var firstDeclaration = declarations[0];
                     if (firstDeclaration.initializer) {
-                        var diagnostic = forInOrOfStatement.kind === 226 /* ForInStatement */
+                        var diagnostic = forInOrOfStatement.kind === 227 /* ForInStatement */
                             ? ts.Diagnostics.The_variable_declaration_of_a_for_in_statement_cannot_have_an_initializer
                             : ts.Diagnostics.The_variable_declaration_of_a_for_of_statement_cannot_have_an_initializer;
                         return grammarErrorOnNode(firstDeclaration.name, diagnostic);
                     }
                     if (firstDeclaration.type) {
-                        var diagnostic = forInOrOfStatement.kind === 226 /* ForInStatement */
+                        var diagnostic = forInOrOfStatement.kind === 227 /* ForInStatement */
                             ? ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_use_a_type_annotation
                             : ts.Diagnostics.The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation;
                         return grammarErrorOnNode(firstDeclaration, diagnostic);
@@ -59637,11 +61744,11 @@ var ts;
                 return grammarErrorOnNode(accessor.name, ts.Diagnostics.An_accessor_cannot_have_type_parameters);
             }
             else if (!doesAccessorHaveCorrectParameterCount(accessor)) {
-                return grammarErrorOnNode(accessor.name, kind === 158 /* GetAccessor */ ?
+                return grammarErrorOnNode(accessor.name, kind === 159 /* GetAccessor */ ?
                     ts.Diagnostics.A_get_accessor_cannot_have_parameters :
                     ts.Diagnostics.A_set_accessor_must_have_exactly_one_parameter);
             }
-            else if (kind === 159 /* SetAccessor */) {
+            else if (kind === 160 /* SetAccessor */) {
                 if (accessor.type) {
                     return grammarErrorOnNode(accessor.name, ts.Diagnostics.A_set_accessor_cannot_have_a_return_type_annotation);
                 }
@@ -59665,23 +61772,23 @@ var ts;
          * A set accessor has one parameter or a `this` parameter and one more parameter.
          */
         function doesAccessorHaveCorrectParameterCount(accessor) {
-            return getAccessorThisParameter(accessor) || accessor.parameters.length === (accessor.kind === 158 /* GetAccessor */ ? 0 : 1);
+            return getAccessorThisParameter(accessor) || accessor.parameters.length === (accessor.kind === 159 /* GetAccessor */ ? 0 : 1);
         }
         function getAccessorThisParameter(accessor) {
-            if (accessor.parameters.length === (accessor.kind === 158 /* GetAccessor */ ? 1 : 2)) {
+            if (accessor.parameters.length === (accessor.kind === 159 /* GetAccessor */ ? 1 : 2)) {
                 return ts.getThisParameter(accessor);
             }
         }
         function checkGrammarTypeOperatorNode(node) {
-            if (node.operator === 142 /* UniqueKeyword */) {
-                if (node.type.kind !== 139 /* SymbolKeyword */) {
-                    return grammarErrorOnNode(node.type, ts.Diagnostics._0_expected, ts.tokenToString(139 /* SymbolKeyword */));
+            if (node.operator === 143 /* UniqueKeyword */) {
+                if (node.type.kind !== 140 /* SymbolKeyword */) {
+                    return grammarErrorOnNode(node.type, ts.Diagnostics._0_expected, ts.tokenToString(140 /* SymbolKeyword */));
                 }
                 var parent = ts.walkUpParenthesizedTypes(node.parent);
                 switch (parent.kind) {
-                    case 237 /* VariableDeclaration */:
+                    case 238 /* VariableDeclaration */:
                         var decl = parent;
-                        if (decl.name.kind !== 72 /* Identifier */) {
+                        if (decl.name.kind !== 73 /* Identifier */) {
                             return grammarErrorOnNode(node, ts.Diagnostics.unique_symbol_types_may_not_be_used_on_a_variable_declaration_with_a_binding_name);
                         }
                         if (!ts.isVariableDeclarationInVariableStatement(decl)) {
@@ -59691,13 +61798,13 @@ var ts;
                             return grammarErrorOnNode(parent.name, ts.Diagnostics.A_variable_whose_type_is_a_unique_symbol_type_must_be_const);
                         }
                         break;
-                    case 154 /* PropertyDeclaration */:
+                    case 155 /* PropertyDeclaration */:
                         if (!ts.hasModifier(parent, 32 /* Static */) ||
                             !ts.hasModifier(parent, 64 /* Readonly */)) {
                             return grammarErrorOnNode(parent.name, ts.Diagnostics.A_property_of_a_class_whose_type_is_a_unique_symbol_type_must_be_both_static_and_readonly);
                         }
                         break;
-                    case 153 /* PropertySignature */:
+                    case 154 /* PropertySignature */:
                         if (!ts.hasModifier(parent, 64 /* Readonly */)) {
                             return grammarErrorOnNode(parent.name, ts.Diagnostics.A_property_of_an_interface_or_type_literal_whose_type_is_a_unique_symbol_type_must_be_readonly);
                         }
@@ -59706,9 +61813,9 @@ var ts;
                         return grammarErrorOnNode(node, ts.Diagnostics.unique_symbol_types_are_not_allowed_here);
                 }
             }
-            else if (node.operator === 133 /* ReadonlyKeyword */) {
-                if (node.type.kind !== 169 /* ArrayType */ && node.type.kind !== 170 /* TupleType */) {
-                    return grammarErrorOnFirstToken(node, ts.Diagnostics.readonly_type_modifier_is_only_permitted_on_array_and_tuple_literal_types, ts.tokenToString(139 /* SymbolKeyword */));
+            else if (node.operator === 134 /* ReadonlyKeyword */) {
+                if (node.type.kind !== 170 /* ArrayType */ && node.type.kind !== 171 /* TupleType */) {
+                    return grammarErrorOnFirstToken(node, ts.Diagnostics.readonly_type_modifier_is_only_permitted_on_array_and_tuple_literal_types, ts.tokenToString(140 /* SymbolKeyword */));
                 }
             }
         }
@@ -59721,10 +61828,10 @@ var ts;
             if (checkGrammarFunctionLikeDeclaration(node)) {
                 return true;
             }
-            if (node.kind === 156 /* MethodDeclaration */) {
-                if (node.parent.kind === 188 /* ObjectLiteralExpression */) {
+            if (node.kind === 157 /* MethodDeclaration */) {
+                if (node.parent.kind === 189 /* ObjectLiteralExpression */) {
                     // We only disallow modifier on a method declaration if it is a property of object-literal-expression
-                    if (node.modifiers && !(node.modifiers.length === 1 && ts.first(node.modifiers).kind === 121 /* AsyncKeyword */)) {
+                    if (node.modifiers && !(node.modifiers.length === 1 && ts.first(node.modifiers).kind === 122 /* AsyncKeyword */)) {
                         return grammarErrorOnFirstToken(node, ts.Diagnostics.Modifiers_cannot_appear_here);
                     }
                     else if (checkGrammarForInvalidQuestionMark(node.questionToken, ts.Diagnostics.An_object_member_cannot_be_declared_optional)) {
@@ -59750,14 +61857,14 @@ var ts;
                 if (node.flags & 4194304 /* Ambient */) {
                     return checkGrammarForInvalidDynamicName(node.name, ts.Diagnostics.A_computed_property_name_in_an_ambient_context_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type);
                 }
-                else if (node.kind === 156 /* MethodDeclaration */ && !node.body) {
+                else if (node.kind === 157 /* MethodDeclaration */ && !node.body) {
                     return checkGrammarForInvalidDynamicName(node.name, ts.Diagnostics.A_computed_property_name_in_a_method_overload_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type);
                 }
             }
-            else if (node.parent.kind === 241 /* InterfaceDeclaration */) {
+            else if (node.parent.kind === 242 /* InterfaceDeclaration */) {
                 return checkGrammarForInvalidDynamicName(node.name, ts.Diagnostics.A_computed_property_name_in_an_interface_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type);
             }
-            else if (node.parent.kind === 168 /* TypeLiteral */) {
+            else if (node.parent.kind === 169 /* TypeLiteral */) {
                 return checkGrammarForInvalidDynamicName(node.name, ts.Diagnostics.A_computed_property_name_in_a_type_literal_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type);
             }
         }
@@ -59768,11 +61875,11 @@ var ts;
                     return grammarErrorOnNode(node, ts.Diagnostics.Jump_target_cannot_cross_function_boundary);
                 }
                 switch (current.kind) {
-                    case 233 /* LabeledStatement */:
+                    case 234 /* LabeledStatement */:
                         if (node.label && current.label.escapedText === node.label.escapedText) {
                             // found matching label - verify that label usage is correct
                             // continue can only target labels that are on iteration statements
-                            var isMisplacedContinueLabel = node.kind === 228 /* ContinueStatement */
+                            var isMisplacedContinueLabel = node.kind === 229 /* ContinueStatement */
                                 && !ts.isIterationStatement(current.statement, /*lookInLabeledStatement*/ true);
                             if (isMisplacedContinueLabel) {
                                 return grammarErrorOnNode(node, ts.Diagnostics.A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement);
@@ -59780,8 +61887,8 @@ var ts;
                             return false;
                         }
                         break;
-                    case 232 /* SwitchStatement */:
-                        if (node.kind === 229 /* BreakStatement */ && !node.label) {
+                    case 233 /* SwitchStatement */:
+                        if (node.kind === 230 /* BreakStatement */ && !node.label) {
                             // unlabeled break within switch statement - ok
                             return false;
                         }
@@ -59796,13 +61903,13 @@ var ts;
                 current = current.parent;
             }
             if (node.label) {
-                var message = node.kind === 229 /* BreakStatement */
+                var message = node.kind === 230 /* BreakStatement */
                     ? ts.Diagnostics.A_break_statement_can_only_jump_to_a_label_of_an_enclosing_statement
                     : ts.Diagnostics.A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement;
                 return grammarErrorOnNode(node, message);
             }
             else {
-                var message = node.kind === 229 /* BreakStatement */
+                var message = node.kind === 230 /* BreakStatement */
                     ? ts.Diagnostics.A_break_statement_can_only_be_used_within_an_enclosing_iteration_or_switch_statement
                     : ts.Diagnostics.A_continue_statement_can_only_be_used_within_an_enclosing_iteration_statement;
                 return grammarErrorOnNode(node, message);
@@ -59826,12 +61933,12 @@ var ts;
         }
         function isStringOrNumberLiteralExpression(expr) {
             return expr.kind === 10 /* StringLiteral */ || expr.kind === 8 /* NumericLiteral */ ||
-                expr.kind === 202 /* PrefixUnaryExpression */ && expr.operator === 39 /* MinusToken */ &&
+                expr.kind === 203 /* PrefixUnaryExpression */ && expr.operator === 39 /* MinusToken */ &&
                     expr.operand.kind === 8 /* NumericLiteral */;
         }
         function isBigIntLiteralExpression(expr) {
             return expr.kind === 9 /* BigIntLiteral */ ||
-                expr.kind === 202 /* PrefixUnaryExpression */ && expr.operator === 39 /* MinusToken */ &&
+                expr.kind === 203 /* PrefixUnaryExpression */ && expr.operator === 39 /* MinusToken */ &&
                     expr.operand.kind === 9 /* BigIntLiteral */;
         }
         function isSimpleLiteralEnumReference(expr) {
@@ -59844,7 +61951,7 @@ var ts;
             if (initializer) {
                 var isInvalidInitializer = !(isStringOrNumberLiteralExpression(initializer) ||
                     isSimpleLiteralEnumReference(initializer) ||
-                    initializer.kind === 102 /* TrueKeyword */ || initializer.kind === 87 /* FalseKeyword */ ||
+                    initializer.kind === 103 /* TrueKeyword */ || initializer.kind === 88 /* FalseKeyword */ ||
                     isBigIntLiteralExpression(initializer));
                 var isConstOrReadonly = ts.isDeclarationReadonly(node) || ts.isVariableDeclaration(node) && ts.isVarConst(node);
                 if (isConstOrReadonly && !node.type) {
@@ -59861,7 +61968,7 @@ var ts;
             }
         }
         function checkGrammarVariableDeclaration(node) {
-            if (node.parent.parent.kind !== 226 /* ForInStatement */ && node.parent.parent.kind !== 227 /* ForOfStatement */) {
+            if (node.parent.parent.kind !== 227 /* ForInStatement */ && node.parent.parent.kind !== 228 /* ForOfStatement */) {
                 if (node.flags & 4194304 /* Ambient */) {
                     checkAmbientInitializer(node);
                 }
@@ -59874,8 +61981,8 @@ var ts;
                     }
                 }
             }
-            if (node.exclamationToken && (node.parent.parent.kind !== 219 /* VariableStatement */ || !node.type || node.initializer || node.flags & 4194304 /* Ambient */)) {
-                return grammarErrorOnNode(node.exclamationToken, ts.Diagnostics.A_definite_assignment_assertion_is_not_permitted_in_this_context);
+            if (node.exclamationToken && (node.parent.parent.kind !== 220 /* VariableStatement */ || !node.type || node.initializer || node.flags & 4194304 /* Ambient */)) {
+                return grammarErrorOnNode(node.exclamationToken, ts.Diagnostics.Definite_assignment_assertions_can_only_be_used_along_with_a_type_annotation);
             }
             if (compilerOptions.module !== ts.ModuleKind.ES2015 && compilerOptions.module !== ts.ModuleKind.ESNext && compilerOptions.module !== ts.ModuleKind.System && !compilerOptions.noEmit &&
                 !(node.parent.parent.flags & 4194304 /* Ambient */) && ts.hasModifier(node.parent.parent, 1 /* Export */)) {
@@ -59891,7 +61998,7 @@ var ts;
             return checkLetConstNames && checkGrammarNameInLetOrConstDeclarations(node.name);
         }
         function checkESModuleMarker(name) {
-            if (name.kind === 72 /* Identifier */) {
+            if (name.kind === 73 /* Identifier */) {
                 if (ts.idText(name) === "__esModule") {
                     return grammarErrorOnNode(name, ts.Diagnostics.Identifier_expected_esModule_is_reserved_as_an_exported_marker_when_transforming_ECMAScript_modules);
                 }
@@ -59908,8 +62015,8 @@ var ts;
             return false;
         }
         function checkGrammarNameInLetOrConstDeclarations(name) {
-            if (name.kind === 72 /* Identifier */) {
-                if (name.originalKeywordKind === 111 /* LetKeyword */) {
+            if (name.kind === 73 /* Identifier */) {
+                if (name.originalKeywordKind === 112 /* LetKeyword */) {
                     return grammarErrorOnNode(name, ts.Diagnostics.let_is_not_allowed_to_be_used_as_a_name_in_let_or_const_declarations);
                 }
             }
@@ -59936,15 +62043,15 @@ var ts;
         }
         function allowLetAndConstDeclarations(parent) {
             switch (parent.kind) {
-                case 222 /* IfStatement */:
-                case 223 /* DoStatement */:
-                case 224 /* WhileStatement */:
-                case 231 /* WithStatement */:
-                case 225 /* ForStatement */:
-                case 226 /* ForInStatement */:
-                case 227 /* ForOfStatement */:
+                case 223 /* IfStatement */:
+                case 224 /* DoStatement */:
+                case 225 /* WhileStatement */:
+                case 232 /* WithStatement */:
+                case 226 /* ForStatement */:
+                case 227 /* ForInStatement */:
+                case 228 /* ForOfStatement */:
                     return false;
-                case 233 /* LabeledStatement */:
+                case 234 /* LabeledStatement */:
                     return allowLetAndConstDeclarations(parent.parent);
             }
             return true;
@@ -59962,12 +62069,12 @@ var ts;
         function checkGrammarMetaProperty(node) {
             var escapedText = node.name.escapedText;
             switch (node.keywordToken) {
-                case 95 /* NewKeyword */:
+                case 96 /* NewKeyword */:
                     if (escapedText !== "target") {
                         return grammarErrorOnNode(node.name, ts.Diagnostics._0_is_not_a_valid_meta_property_for_keyword_1_Did_you_mean_2, node.name.escapedText, ts.tokenToString(node.keywordToken), "target");
                     }
                     break;
-                case 92 /* ImportKeyword */:
+                case 93 /* ImportKeyword */:
                     if (escapedText !== "meta") {
                         return grammarErrorOnNode(node.name, ts.Diagnostics._0_is_not_a_valid_meta_property_for_keyword_1_Did_you_mean_2, node.name.escapedText, ts.tokenToString(node.keywordToken), "meta");
                     }
@@ -60018,11 +62125,14 @@ var ts;
         }
         function checkGrammarProperty(node) {
             if (ts.isClassLike(node.parent)) {
+                if (ts.isStringLiteral(node.name) && node.name.text === "constructor") {
+                    return grammarErrorOnNode(node.name, ts.Diagnostics.Classes_may_not_have_a_field_named_constructor);
+                }
                 if (checkGrammarForInvalidDynamicName(node.name, ts.Diagnostics.A_computed_property_name_in_a_class_property_declaration_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type)) {
                     return true;
                 }
             }
-            else if (node.parent.kind === 241 /* InterfaceDeclaration */) {
+            else if (node.parent.kind === 242 /* InterfaceDeclaration */) {
                 if (checkGrammarForInvalidDynamicName(node.name, ts.Diagnostics.A_computed_property_name_in_an_interface_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type)) {
                     return true;
                 }
@@ -60030,7 +62140,7 @@ var ts;
                     return grammarErrorOnNode(node.initializer, ts.Diagnostics.An_interface_property_cannot_have_an_initializer);
                 }
             }
-            else if (node.parent.kind === 168 /* TypeLiteral */) {
+            else if (node.parent.kind === 169 /* TypeLiteral */) {
                 if (checkGrammarForInvalidDynamicName(node.name, ts.Diagnostics.A_computed_property_name_in_a_type_literal_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type)) {
                     return true;
                 }
@@ -60059,22 +62169,22 @@ var ts;
             //     export_opt   AmbientDeclaration
             //
             // TODO: The spec needs to be amended to reflect this grammar.
-            if (node.kind === 241 /* InterfaceDeclaration */ ||
-                node.kind === 242 /* TypeAliasDeclaration */ ||
-                node.kind === 249 /* ImportDeclaration */ ||
-                node.kind === 248 /* ImportEqualsDeclaration */ ||
-                node.kind === 255 /* ExportDeclaration */ ||
-                node.kind === 254 /* ExportAssignment */ ||
-                node.kind === 247 /* NamespaceExportDeclaration */ ||
+            if (node.kind === 242 /* InterfaceDeclaration */ ||
+                node.kind === 243 /* TypeAliasDeclaration */ ||
+                node.kind === 250 /* ImportDeclaration */ ||
+                node.kind === 249 /* ImportEqualsDeclaration */ ||
+                node.kind === 256 /* ExportDeclaration */ ||
+                node.kind === 255 /* ExportAssignment */ ||
+                node.kind === 248 /* NamespaceExportDeclaration */ ||
                 ts.hasModifier(node, 2 /* Ambient */ | 1 /* Export */ | 512 /* Default */)) {
                 return false;
             }
-            return grammarErrorOnFirstToken(node, ts.Diagnostics.A_declare_modifier_is_required_for_a_top_level_declaration_in_a_d_ts_file);
+            return grammarErrorOnFirstToken(node, ts.Diagnostics.Top_level_declarations_in_d_ts_files_must_start_with_either_a_declare_or_export_modifier);
         }
         function checkGrammarTopLevelElementsForRequiredDeclareModifier(file) {
             for (var _i = 0, _a = file.statements; _i < _a.length; _i++) {
                 var decl = _a[_i];
-                if (ts.isDeclaration(decl) || decl.kind === 219 /* VariableStatement */) {
+                if (ts.isDeclaration(decl) || decl.kind === 220 /* VariableStatement */) {
                     if (checkGrammarTopLevelElementForRequiredDeclareModifier(decl)) {
                         return true;
                     }
@@ -60101,11 +62211,11 @@ var ts;
                 // to prevent noisiness.  So use a bit on the block to indicate if
                 // this has already been reported, and don't report if it has.
                 //
-                if (node.parent.kind === 218 /* Block */ || node.parent.kind === 245 /* ModuleBlock */ || node.parent.kind === 284 /* SourceFile */) {
-                    var links_2 = getNodeLinks(node.parent);
+                if (node.parent.kind === 219 /* Block */ || node.parent.kind === 246 /* ModuleBlock */ || node.parent.kind === 285 /* SourceFile */) {
+                    var links_1 = getNodeLinks(node.parent);
                     // Check if the containing block ever report this error
-                    if (!links_2.hasReportedStatementInAmbientContext) {
-                        return links_2.hasReportedStatementInAmbientContext = grammarErrorOnFirstToken(node, ts.Diagnostics.Statements_are_not_allowed_in_ambient_contexts);
+                    if (!links_1.hasReportedStatementInAmbientContext) {
+                        return links_1.hasReportedStatementInAmbientContext = grammarErrorOnFirstToken(node, ts.Diagnostics.Statements_are_not_allowed_in_ambient_contexts);
                     }
                 }
                 else {
@@ -60123,10 +62233,10 @@ var ts;
                 if (languageVersion >= 1 /* ES5 */) {
                     diagnosticMessage = ts.Diagnostics.Octal_literals_are_not_available_when_targeting_ECMAScript_5_and_higher_Use_the_syntax_0;
                 }
-                else if (ts.isChildOfNodeWithKind(node, 182 /* LiteralType */)) {
+                else if (ts.isChildOfNodeWithKind(node, 183 /* LiteralType */)) {
                     diagnosticMessage = ts.Diagnostics.Octal_literal_types_must_use_ES2015_syntax_Use_the_syntax_0;
                 }
-                else if (ts.isChildOfNodeWithKind(node, 278 /* EnumMember */)) {
+                else if (ts.isChildOfNodeWithKind(node, 279 /* EnumMember */)) {
                     diagnosticMessage = ts.Diagnostics.Octal_literals_are_not_allowed_in_enums_members_initializer_Use_the_syntax_0;
                 }
                 if (diagnosticMessage) {
@@ -60141,7 +62251,7 @@ var ts;
             var literalType = ts.isLiteralTypeNode(node.parent) ||
                 ts.isPrefixUnaryExpression(node.parent) && ts.isLiteralTypeNode(node.parent.parent);
             if (!literalType) {
-                if (languageVersion < 7 /* ESNext */) {
+                if (languageVersion < 99 /* ESNext */) {
                     if (grammarErrorOnNode(node, ts.Diagnostics.BigInt_literals_are_not_available_when_targeting_lower_than_ESNext)) {
                         return true;
                     }
@@ -60194,8 +62304,8 @@ var ts;
     /** Like 'isDeclarationName', but returns true for LHS of `import { x as y }` or `export { x as y }`. */
     function isDeclarationNameOrImportPropertyName(name) {
         switch (name.parent.kind) {
-            case 253 /* ImportSpecifier */:
-            case 257 /* ExportSpecifier */:
+            case 254 /* ImportSpecifier */:
+            case 258 /* ExportSpecifier */:
                 return ts.isIdentifier(name);
             default:
                 return ts.isDeclarationName(name);
@@ -60203,14 +62313,14 @@ var ts;
     }
     function isSomeImportDeclaration(decl) {
         switch (decl.kind) {
-            case 250 /* ImportClause */: // For default import
-            case 248 /* ImportEqualsDeclaration */:
-            case 251 /* NamespaceImport */:
-            case 253 /* ImportSpecifier */: // For rename import `x as y`
+            case 251 /* ImportClause */: // For default import
+            case 249 /* ImportEqualsDeclaration */:
+            case 252 /* NamespaceImport */:
+            case 254 /* ImportSpecifier */: // For rename import `x as y`
                 return true;
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 // For regular import, `decl` is an Identifier under the ImportSpecifier.
-                return decl.parent.kind === 253 /* ImportSpecifier */;
+                return decl.parent.kind === 254 /* ImportSpecifier */;
             default:
                 return false;
         }
@@ -60229,6 +62339,13 @@ var ts;
         JsxNames.LibraryManagedAttributes = "LibraryManagedAttributes";
         // tslint:enable variable-name
     })(JsxNames || (JsxNames = {}));
+    function getIterationTypesKeyFromIterationTypeKind(typeKind) {
+        switch (typeKind) {
+            case 0 /* Yield */: return "yieldType";
+            case 1 /* Return */: return "returnType";
+            case 2 /* Next */: return "nextType";
+        }
+    }
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
@@ -60338,7 +62455,7 @@ var ts;
         return node;
     }
     function createIdentifier(text, typeArguments) {
-        var node = createSynthesizedNode(72 /* Identifier */);
+        var node = createSynthesizedNode(73 /* Identifier */);
         node.escapedText = ts.escapeLeadingUnderscores(text);
         node.originalKeywordKind = text ? ts.stringToToken(text) : 0 /* Unknown */;
         node.autoGenerateFlags = 0 /* None */;
@@ -60419,23 +62536,23 @@ var ts;
     ts.createToken = createToken;
     // Reserved words
     function createSuper() {
-        return createSynthesizedNode(98 /* SuperKeyword */);
+        return createSynthesizedNode(99 /* SuperKeyword */);
     }
     ts.createSuper = createSuper;
     function createThis() {
-        return createSynthesizedNode(100 /* ThisKeyword */);
+        return createSynthesizedNode(101 /* ThisKeyword */);
     }
     ts.createThis = createThis;
     function createNull() {
-        return createSynthesizedNode(96 /* NullKeyword */);
+        return createSynthesizedNode(97 /* NullKeyword */);
     }
     ts.createNull = createNull;
     function createTrue() {
-        return createSynthesizedNode(102 /* TrueKeyword */);
+        return createSynthesizedNode(103 /* TrueKeyword */);
     }
     ts.createTrue = createTrue;
     function createFalse() {
-        return createSynthesizedNode(87 /* FalseKeyword */);
+        return createSynthesizedNode(88 /* FalseKeyword */);
     }
     ts.createFalse = createFalse;
     // Modifiers
@@ -60446,44 +62563,44 @@ var ts;
     function createModifiersFromModifierFlags(flags) {
         var result = [];
         if (flags & 1 /* Export */) {
-            result.push(createModifier(85 /* ExportKeyword */));
+            result.push(createModifier(86 /* ExportKeyword */));
         }
         if (flags & 2 /* Ambient */) {
-            result.push(createModifier(125 /* DeclareKeyword */));
+            result.push(createModifier(126 /* DeclareKeyword */));
         }
         if (flags & 512 /* Default */) {
-            result.push(createModifier(80 /* DefaultKeyword */));
+            result.push(createModifier(81 /* DefaultKeyword */));
         }
         if (flags & 2048 /* Const */) {
-            result.push(createModifier(77 /* ConstKeyword */));
+            result.push(createModifier(78 /* ConstKeyword */));
         }
         if (flags & 4 /* Public */) {
-            result.push(createModifier(115 /* PublicKeyword */));
+            result.push(createModifier(116 /* PublicKeyword */));
         }
         if (flags & 8 /* Private */) {
-            result.push(createModifier(113 /* PrivateKeyword */));
+            result.push(createModifier(114 /* PrivateKeyword */));
         }
         if (flags & 16 /* Protected */) {
-            result.push(createModifier(114 /* ProtectedKeyword */));
+            result.push(createModifier(115 /* ProtectedKeyword */));
         }
         if (flags & 128 /* Abstract */) {
-            result.push(createModifier(118 /* AbstractKeyword */));
+            result.push(createModifier(119 /* AbstractKeyword */));
         }
         if (flags & 32 /* Static */) {
-            result.push(createModifier(116 /* StaticKeyword */));
+            result.push(createModifier(117 /* StaticKeyword */));
         }
         if (flags & 64 /* Readonly */) {
-            result.push(createModifier(133 /* ReadonlyKeyword */));
+            result.push(createModifier(134 /* ReadonlyKeyword */));
         }
         if (flags & 256 /* Async */) {
-            result.push(createModifier(121 /* AsyncKeyword */));
+            result.push(createModifier(122 /* AsyncKeyword */));
         }
         return result;
     }
     ts.createModifiersFromModifierFlags = createModifiersFromModifierFlags;
     // Names
     function createQualifiedName(left, right) {
-        var node = createSynthesizedNode(148 /* QualifiedName */);
+        var node = createSynthesizedNode(149 /* QualifiedName */);
         node.left = left;
         node.right = asName(right);
         return node;
@@ -60502,7 +62619,7 @@ var ts;
             : expression;
     }
     function createComputedPropertyName(expression) {
-        var node = createSynthesizedNode(149 /* ComputedPropertyName */);
+        var node = createSynthesizedNode(150 /* ComputedPropertyName */);
         node.expression = parenthesizeForComputedName(expression);
         return node;
     }
@@ -60515,7 +62632,7 @@ var ts;
     ts.updateComputedPropertyName = updateComputedPropertyName;
     // Signature elements
     function createTypeParameterDeclaration(name, constraint, defaultType) {
-        var node = createSynthesizedNode(150 /* TypeParameter */);
+        var node = createSynthesizedNode(151 /* TypeParameter */);
         node.name = asName(name);
         node.constraint = constraint;
         node.default = defaultType;
@@ -60531,7 +62648,7 @@ var ts;
     }
     ts.updateTypeParameterDeclaration = updateTypeParameterDeclaration;
     function createParameter(decorators, modifiers, dotDotDotToken, name, questionToken, type, initializer) {
-        var node = createSynthesizedNode(151 /* Parameter */);
+        var node = createSynthesizedNode(152 /* Parameter */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.dotDotDotToken = dotDotDotToken;
@@ -60555,7 +62672,7 @@ var ts;
     }
     ts.updateParameter = updateParameter;
     function createDecorator(expression) {
-        var node = createSynthesizedNode(152 /* Decorator */);
+        var node = createSynthesizedNode(153 /* Decorator */);
         node.expression = ts.parenthesizeForAccess(expression);
         return node;
     }
@@ -60568,7 +62685,7 @@ var ts;
     ts.updateDecorator = updateDecorator;
     // Type Elements
     function createPropertySignature(modifiers, name, questionToken, type, initializer) {
-        var node = createSynthesizedNode(153 /* PropertySignature */);
+        var node = createSynthesizedNode(154 /* PropertySignature */);
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
         node.questionToken = questionToken;
@@ -60588,7 +62705,7 @@ var ts;
     }
     ts.updatePropertySignature = updatePropertySignature;
     function createProperty(decorators, modifiers, name, questionOrExclamationToken, type, initializer) {
-        var node = createSynthesizedNode(154 /* PropertyDeclaration */);
+        var node = createSynthesizedNode(155 /* PropertyDeclaration */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
@@ -60612,7 +62729,7 @@ var ts;
     }
     ts.updateProperty = updateProperty;
     function createMethodSignature(typeParameters, parameters, type, name, questionToken) {
-        var node = createSignatureDeclaration(155 /* MethodSignature */, typeParameters, parameters, type);
+        var node = createSignatureDeclaration(156 /* MethodSignature */, typeParameters, parameters, type);
         node.name = asName(name);
         node.questionToken = questionToken;
         return node;
@@ -60629,7 +62746,7 @@ var ts;
     }
     ts.updateMethodSignature = updateMethodSignature;
     function createMethod(decorators, modifiers, asteriskToken, name, questionToken, typeParameters, parameters, type, body) {
-        var node = createSynthesizedNode(156 /* MethodDeclaration */);
+        var node = createSynthesizedNode(157 /* MethodDeclaration */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.asteriskToken = asteriskToken;
@@ -60657,7 +62774,7 @@ var ts;
     }
     ts.updateMethod = updateMethod;
     function createConstructor(decorators, modifiers, parameters, body) {
-        var node = createSynthesizedNode(157 /* Constructor */);
+        var node = createSynthesizedNode(158 /* Constructor */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.typeParameters = undefined;
@@ -60677,7 +62794,7 @@ var ts;
     }
     ts.updateConstructor = updateConstructor;
     function createGetAccessor(decorators, modifiers, name, parameters, type, body) {
-        var node = createSynthesizedNode(158 /* GetAccessor */);
+        var node = createSynthesizedNode(159 /* GetAccessor */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
@@ -60700,7 +62817,7 @@ var ts;
     }
     ts.updateGetAccessor = updateGetAccessor;
     function createSetAccessor(decorators, modifiers, name, parameters, body) {
-        var node = createSynthesizedNode(159 /* SetAccessor */);
+        var node = createSynthesizedNode(160 /* SetAccessor */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
@@ -60721,7 +62838,7 @@ var ts;
     }
     ts.updateSetAccessor = updateSetAccessor;
     function createCallSignature(typeParameters, parameters, type) {
-        return createSignatureDeclaration(160 /* CallSignature */, typeParameters, parameters, type);
+        return createSignatureDeclaration(161 /* CallSignature */, typeParameters, parameters, type);
     }
     ts.createCallSignature = createCallSignature;
     function updateCallSignature(node, typeParameters, parameters, type) {
@@ -60729,7 +62846,7 @@ var ts;
     }
     ts.updateCallSignature = updateCallSignature;
     function createConstructSignature(typeParameters, parameters, type) {
-        return createSignatureDeclaration(161 /* ConstructSignature */, typeParameters, parameters, type);
+        return createSignatureDeclaration(162 /* ConstructSignature */, typeParameters, parameters, type);
     }
     ts.createConstructSignature = createConstructSignature;
     function updateConstructSignature(node, typeParameters, parameters, type) {
@@ -60737,7 +62854,7 @@ var ts;
     }
     ts.updateConstructSignature = updateConstructSignature;
     function createIndexSignature(decorators, modifiers, parameters, type) {
-        var node = createSynthesizedNode(162 /* IndexSignature */);
+        var node = createSynthesizedNode(163 /* IndexSignature */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.parameters = createNodeArray(parameters);
@@ -60777,7 +62894,7 @@ var ts;
     }
     ts.createKeywordTypeNode = createKeywordTypeNode;
     function createTypePredicateNode(parameterName, type) {
-        var node = createSynthesizedNode(163 /* TypePredicate */);
+        var node = createSynthesizedNode(164 /* TypePredicate */);
         node.parameterName = asName(parameterName);
         node.type = type;
         return node;
@@ -60791,7 +62908,7 @@ var ts;
     }
     ts.updateTypePredicateNode = updateTypePredicateNode;
     function createTypeReferenceNode(typeName, typeArguments) {
-        var node = createSynthesizedNode(164 /* TypeReference */);
+        var node = createSynthesizedNode(165 /* TypeReference */);
         node.typeName = asName(typeName);
         node.typeArguments = typeArguments && ts.parenthesizeTypeParameters(typeArguments);
         return node;
@@ -60805,7 +62922,7 @@ var ts;
     }
     ts.updateTypeReferenceNode = updateTypeReferenceNode;
     function createFunctionTypeNode(typeParameters, parameters, type) {
-        return createSignatureDeclaration(165 /* FunctionType */, typeParameters, parameters, type);
+        return createSignatureDeclaration(166 /* FunctionType */, typeParameters, parameters, type);
     }
     ts.createFunctionTypeNode = createFunctionTypeNode;
     function updateFunctionTypeNode(node, typeParameters, parameters, type) {
@@ -60813,7 +62930,7 @@ var ts;
     }
     ts.updateFunctionTypeNode = updateFunctionTypeNode;
     function createConstructorTypeNode(typeParameters, parameters, type) {
-        return createSignatureDeclaration(166 /* ConstructorType */, typeParameters, parameters, type);
+        return createSignatureDeclaration(167 /* ConstructorType */, typeParameters, parameters, type);
     }
     ts.createConstructorTypeNode = createConstructorTypeNode;
     function updateConstructorTypeNode(node, typeParameters, parameters, type) {
@@ -60821,7 +62938,7 @@ var ts;
     }
     ts.updateConstructorTypeNode = updateConstructorTypeNode;
     function createTypeQueryNode(exprName) {
-        var node = createSynthesizedNode(167 /* TypeQuery */);
+        var node = createSynthesizedNode(168 /* TypeQuery */);
         node.exprName = exprName;
         return node;
     }
@@ -60833,7 +62950,7 @@ var ts;
     }
     ts.updateTypeQueryNode = updateTypeQueryNode;
     function createTypeLiteralNode(members) {
-        var node = createSynthesizedNode(168 /* TypeLiteral */);
+        var node = createSynthesizedNode(169 /* TypeLiteral */);
         node.members = createNodeArray(members);
         return node;
     }
@@ -60845,7 +62962,7 @@ var ts;
     }
     ts.updateTypeLiteralNode = updateTypeLiteralNode;
     function createArrayTypeNode(elementType) {
-        var node = createSynthesizedNode(169 /* ArrayType */);
+        var node = createSynthesizedNode(170 /* ArrayType */);
         node.elementType = ts.parenthesizeArrayTypeMember(elementType);
         return node;
     }
@@ -60857,7 +62974,7 @@ var ts;
     }
     ts.updateArrayTypeNode = updateArrayTypeNode;
     function createTupleTypeNode(elementTypes) {
-        var node = createSynthesizedNode(170 /* TupleType */);
+        var node = createSynthesizedNode(171 /* TupleType */);
         node.elementTypes = createNodeArray(elementTypes);
         return node;
     }
@@ -60869,7 +62986,7 @@ var ts;
     }
     ts.updateTupleTypeNode = updateTupleTypeNode;
     function createOptionalTypeNode(type) {
-        var node = createSynthesizedNode(171 /* OptionalType */);
+        var node = createSynthesizedNode(172 /* OptionalType */);
         node.type = ts.parenthesizeArrayTypeMember(type);
         return node;
     }
@@ -60881,7 +62998,7 @@ var ts;
     }
     ts.updateOptionalTypeNode = updateOptionalTypeNode;
     function createRestTypeNode(type) {
-        var node = createSynthesizedNode(172 /* RestType */);
+        var node = createSynthesizedNode(173 /* RestType */);
         node.type = type;
         return node;
     }
@@ -60893,7 +63010,7 @@ var ts;
     }
     ts.updateRestTypeNode = updateRestTypeNode;
     function createUnionTypeNode(types) {
-        return createUnionOrIntersectionTypeNode(173 /* UnionType */, types);
+        return createUnionOrIntersectionTypeNode(174 /* UnionType */, types);
     }
     ts.createUnionTypeNode = createUnionTypeNode;
     function updateUnionTypeNode(node, types) {
@@ -60901,7 +63018,7 @@ var ts;
     }
     ts.updateUnionTypeNode = updateUnionTypeNode;
     function createIntersectionTypeNode(types) {
-        return createUnionOrIntersectionTypeNode(174 /* IntersectionType */, types);
+        return createUnionOrIntersectionTypeNode(175 /* IntersectionType */, types);
     }
     ts.createIntersectionTypeNode = createIntersectionTypeNode;
     function updateIntersectionTypeNode(node, types) {
@@ -60920,7 +63037,7 @@ var ts;
             : node;
     }
     function createConditionalTypeNode(checkType, extendsType, trueType, falseType) {
-        var node = createSynthesizedNode(175 /* ConditionalType */);
+        var node = createSynthesizedNode(176 /* ConditionalType */);
         node.checkType = ts.parenthesizeConditionalTypeMember(checkType);
         node.extendsType = ts.parenthesizeConditionalTypeMember(extendsType);
         node.trueType = trueType;
@@ -60938,7 +63055,7 @@ var ts;
     }
     ts.updateConditionalTypeNode = updateConditionalTypeNode;
     function createInferTypeNode(typeParameter) {
-        var node = createSynthesizedNode(176 /* InferType */);
+        var node = createSynthesizedNode(177 /* InferType */);
         node.typeParameter = typeParameter;
         return node;
     }
@@ -60950,10 +63067,10 @@ var ts;
     }
     ts.updateInferTypeNode = updateInferTypeNode;
     function createImportTypeNode(argument, qualifier, typeArguments, isTypeOf) {
-        var node = createSynthesizedNode(183 /* ImportType */);
+        var node = createSynthesizedNode(184 /* ImportType */);
         node.argument = argument;
         node.qualifier = qualifier;
-        node.typeArguments = asNodeArray(typeArguments);
+        node.typeArguments = ts.parenthesizeTypeParameters(typeArguments);
         node.isTypeOf = isTypeOf;
         return node;
     }
@@ -60968,7 +63085,7 @@ var ts;
     }
     ts.updateImportTypeNode = updateImportTypeNode;
     function createParenthesizedType(type) {
-        var node = createSynthesizedNode(177 /* ParenthesizedType */);
+        var node = createSynthesizedNode(178 /* ParenthesizedType */);
         node.type = type;
         return node;
     }
@@ -60980,12 +63097,12 @@ var ts;
     }
     ts.updateParenthesizedType = updateParenthesizedType;
     function createThisTypeNode() {
-        return createSynthesizedNode(178 /* ThisType */);
+        return createSynthesizedNode(179 /* ThisType */);
     }
     ts.createThisTypeNode = createThisTypeNode;
     function createTypeOperatorNode(operatorOrType, type) {
-        var node = createSynthesizedNode(179 /* TypeOperator */);
-        node.operator = typeof operatorOrType === "number" ? operatorOrType : 129 /* KeyOfKeyword */;
+        var node = createSynthesizedNode(180 /* TypeOperator */);
+        node.operator = typeof operatorOrType === "number" ? operatorOrType : 130 /* KeyOfKeyword */;
         node.type = ts.parenthesizeElementTypeMember(typeof operatorOrType === "number" ? type : operatorOrType);
         return node;
     }
@@ -60995,7 +63112,7 @@ var ts;
     }
     ts.updateTypeOperatorNode = updateTypeOperatorNode;
     function createIndexedAccessTypeNode(objectType, indexType) {
-        var node = createSynthesizedNode(180 /* IndexedAccessType */);
+        var node = createSynthesizedNode(181 /* IndexedAccessType */);
         node.objectType = ts.parenthesizeElementTypeMember(objectType);
         node.indexType = indexType;
         return node;
@@ -61009,7 +63126,7 @@ var ts;
     }
     ts.updateIndexedAccessTypeNode = updateIndexedAccessTypeNode;
     function createMappedTypeNode(readonlyToken, typeParameter, questionToken, type) {
-        var node = createSynthesizedNode(181 /* MappedType */);
+        var node = createSynthesizedNode(182 /* MappedType */);
         node.readonlyToken = readonlyToken;
         node.typeParameter = typeParameter;
         node.questionToken = questionToken;
@@ -61027,7 +63144,7 @@ var ts;
     }
     ts.updateMappedTypeNode = updateMappedTypeNode;
     function createLiteralTypeNode(literal) {
-        var node = createSynthesizedNode(182 /* LiteralType */);
+        var node = createSynthesizedNode(183 /* LiteralType */);
         node.literal = literal;
         return node;
     }
@@ -61040,7 +63157,7 @@ var ts;
     ts.updateLiteralTypeNode = updateLiteralTypeNode;
     // Binding Patterns
     function createObjectBindingPattern(elements) {
-        var node = createSynthesizedNode(184 /* ObjectBindingPattern */);
+        var node = createSynthesizedNode(185 /* ObjectBindingPattern */);
         node.elements = createNodeArray(elements);
         return node;
     }
@@ -61052,7 +63169,7 @@ var ts;
     }
     ts.updateObjectBindingPattern = updateObjectBindingPattern;
     function createArrayBindingPattern(elements) {
-        var node = createSynthesizedNode(185 /* ArrayBindingPattern */);
+        var node = createSynthesizedNode(186 /* ArrayBindingPattern */);
         node.elements = createNodeArray(elements);
         return node;
     }
@@ -61064,7 +63181,7 @@ var ts;
     }
     ts.updateArrayBindingPattern = updateArrayBindingPattern;
     function createBindingElement(dotDotDotToken, propertyName, name, initializer) {
-        var node = createSynthesizedNode(186 /* BindingElement */);
+        var node = createSynthesizedNode(187 /* BindingElement */);
         node.dotDotDotToken = dotDotDotToken;
         node.propertyName = asName(propertyName);
         node.name = asName(name);
@@ -61083,7 +63200,7 @@ var ts;
     ts.updateBindingElement = updateBindingElement;
     // Expression
     function createArrayLiteral(elements, multiLine) {
-        var node = createSynthesizedNode(187 /* ArrayLiteralExpression */);
+        var node = createSynthesizedNode(188 /* ArrayLiteralExpression */);
         node.elements = ts.parenthesizeListElements(createNodeArray(elements));
         if (multiLine)
             node.multiLine = true;
@@ -61097,7 +63214,7 @@ var ts;
     }
     ts.updateArrayLiteral = updateArrayLiteral;
     function createObjectLiteral(properties, multiLine) {
-        var node = createSynthesizedNode(188 /* ObjectLiteralExpression */);
+        var node = createSynthesizedNode(189 /* ObjectLiteralExpression */);
         node.properties = createNodeArray(properties);
         if (multiLine)
             node.multiLine = true;
@@ -61111,9 +63228,9 @@ var ts;
     }
     ts.updateObjectLiteral = updateObjectLiteral;
     function createPropertyAccess(expression, name) {
-        var node = createSynthesizedNode(189 /* PropertyAccessExpression */);
+        var node = createSynthesizedNode(190 /* PropertyAccessExpression */);
         node.expression = ts.parenthesizeForAccess(expression);
-        node.name = asName(name); // TODO: GH#18217
+        node.name = asName(name);
         setEmitFlags(node, 131072 /* NoIndentation */);
         return node;
     }
@@ -61128,7 +63245,7 @@ var ts;
     }
     ts.updatePropertyAccess = updatePropertyAccess;
     function createElementAccess(expression, index) {
-        var node = createSynthesizedNode(190 /* ElementAccessExpression */);
+        var node = createSynthesizedNode(191 /* ElementAccessExpression */);
         node.expression = ts.parenthesizeForAccess(expression);
         node.argumentExpression = asExpression(index);
         return node;
@@ -61142,7 +63259,7 @@ var ts;
     }
     ts.updateElementAccess = updateElementAccess;
     function createCall(expression, typeArguments, argumentsArray) {
-        var node = createSynthesizedNode(191 /* CallExpression */);
+        var node = createSynthesizedNode(192 /* CallExpression */);
         node.expression = ts.parenthesizeForAccess(expression);
         node.typeArguments = asNodeArray(typeArguments);
         node.arguments = ts.parenthesizeListElements(createNodeArray(argumentsArray));
@@ -61158,7 +63275,7 @@ var ts;
     }
     ts.updateCall = updateCall;
     function createNew(expression, typeArguments, argumentsArray) {
-        var node = createSynthesizedNode(192 /* NewExpression */);
+        var node = createSynthesizedNode(193 /* NewExpression */);
         node.expression = ts.parenthesizeForNew(expression);
         node.typeArguments = asNodeArray(typeArguments);
         node.arguments = argumentsArray ? ts.parenthesizeListElements(createNodeArray(argumentsArray)) : undefined;
@@ -61174,7 +63291,7 @@ var ts;
     }
     ts.updateNew = updateNew;
     function createTaggedTemplate(tag, typeArgumentsOrTemplate, template) {
-        var node = createSynthesizedNode(193 /* TaggedTemplateExpression */);
+        var node = createSynthesizedNode(194 /* TaggedTemplateExpression */);
         node.tag = ts.parenthesizeForAccess(tag);
         if (template) {
             node.typeArguments = asNodeArray(typeArgumentsOrTemplate);
@@ -61197,7 +63314,7 @@ var ts;
     }
     ts.updateTaggedTemplate = updateTaggedTemplate;
     function createTypeAssertion(type, expression) {
-        var node = createSynthesizedNode(194 /* TypeAssertionExpression */);
+        var node = createSynthesizedNode(195 /* TypeAssertionExpression */);
         node.type = type;
         node.expression = ts.parenthesizePrefixOperand(expression);
         return node;
@@ -61211,7 +63328,7 @@ var ts;
     }
     ts.updateTypeAssertion = updateTypeAssertion;
     function createParen(expression) {
-        var node = createSynthesizedNode(195 /* ParenthesizedExpression */);
+        var node = createSynthesizedNode(196 /* ParenthesizedExpression */);
         node.expression = expression;
         return node;
     }
@@ -61223,7 +63340,7 @@ var ts;
     }
     ts.updateParen = updateParen;
     function createFunctionExpression(modifiers, asteriskToken, name, typeParameters, parameters, type, body) {
-        var node = createSynthesizedNode(196 /* FunctionExpression */);
+        var node = createSynthesizedNode(197 /* FunctionExpression */);
         node.modifiers = asNodeArray(modifiers);
         node.asteriskToken = asteriskToken;
         node.name = asName(name);
@@ -61247,7 +63364,7 @@ var ts;
     }
     ts.updateFunctionExpression = updateFunctionExpression;
     function createArrowFunction(modifiers, typeParameters, parameters, type, equalsGreaterThanToken, body) {
-        var node = createSynthesizedNode(197 /* ArrowFunction */);
+        var node = createSynthesizedNode(198 /* ArrowFunction */);
         node.modifiers = asNodeArray(modifiers);
         node.typeParameters = asNodeArray(typeParameters);
         node.parameters = createNodeArray(parameters);
@@ -61269,7 +63386,7 @@ var ts;
     }
     ts.updateArrowFunction = updateArrowFunction;
     function createDelete(expression) {
-        var node = createSynthesizedNode(198 /* DeleteExpression */);
+        var node = createSynthesizedNode(199 /* DeleteExpression */);
         node.expression = ts.parenthesizePrefixOperand(expression);
         return node;
     }
@@ -61281,7 +63398,7 @@ var ts;
     }
     ts.updateDelete = updateDelete;
     function createTypeOf(expression) {
-        var node = createSynthesizedNode(199 /* TypeOfExpression */);
+        var node = createSynthesizedNode(200 /* TypeOfExpression */);
         node.expression = ts.parenthesizePrefixOperand(expression);
         return node;
     }
@@ -61293,7 +63410,7 @@ var ts;
     }
     ts.updateTypeOf = updateTypeOf;
     function createVoid(expression) {
-        var node = createSynthesizedNode(200 /* VoidExpression */);
+        var node = createSynthesizedNode(201 /* VoidExpression */);
         node.expression = ts.parenthesizePrefixOperand(expression);
         return node;
     }
@@ -61305,7 +63422,7 @@ var ts;
     }
     ts.updateVoid = updateVoid;
     function createAwait(expression) {
-        var node = createSynthesizedNode(201 /* AwaitExpression */);
+        var node = createSynthesizedNode(202 /* AwaitExpression */);
         node.expression = ts.parenthesizePrefixOperand(expression);
         return node;
     }
@@ -61317,7 +63434,7 @@ var ts;
     }
     ts.updateAwait = updateAwait;
     function createPrefix(operator, operand) {
-        var node = createSynthesizedNode(202 /* PrefixUnaryExpression */);
+        var node = createSynthesizedNode(203 /* PrefixUnaryExpression */);
         node.operator = operator;
         node.operand = ts.parenthesizePrefixOperand(operand);
         return node;
@@ -61330,7 +63447,7 @@ var ts;
     }
     ts.updatePrefix = updatePrefix;
     function createPostfix(operand, operator) {
-        var node = createSynthesizedNode(203 /* PostfixUnaryExpression */);
+        var node = createSynthesizedNode(204 /* PostfixUnaryExpression */);
         node.operand = ts.parenthesizePostfixOperand(operand);
         node.operator = operator;
         return node;
@@ -61343,7 +63460,7 @@ var ts;
     }
     ts.updatePostfix = updatePostfix;
     function createBinary(left, operator, right) {
-        var node = createSynthesizedNode(204 /* BinaryExpression */);
+        var node = createSynthesizedNode(205 /* BinaryExpression */);
         var operatorToken = asToken(operator);
         var operatorKind = operatorToken.kind;
         node.left = ts.parenthesizeBinaryOperand(operatorKind, left, /*isLeftSideOfBinary*/ true, /*leftOperand*/ undefined);
@@ -61360,7 +63477,7 @@ var ts;
     }
     ts.updateBinary = updateBinary;
     function createConditional(condition, questionTokenOrWhenTrue, whenTrueOrWhenFalse, colonToken, whenFalse) {
-        var node = createSynthesizedNode(205 /* ConditionalExpression */);
+        var node = createSynthesizedNode(206 /* ConditionalExpression */);
         node.condition = ts.parenthesizeForConditionalHead(condition);
         node.questionToken = whenFalse ? questionTokenOrWhenTrue : createToken(56 /* QuestionToken */);
         node.whenTrue = ts.parenthesizeSubexpressionOfConditionalExpression(whenFalse ? whenTrueOrWhenFalse : questionTokenOrWhenTrue);
@@ -61380,7 +63497,7 @@ var ts;
     }
     ts.updateConditional = updateConditional;
     function createTemplateExpression(head, templateSpans) {
-        var node = createSynthesizedNode(206 /* TemplateExpression */);
+        var node = createSynthesizedNode(207 /* TemplateExpression */);
         node.head = head;
         node.templateSpans = createNodeArray(templateSpans);
         return node;
@@ -61418,7 +63535,7 @@ var ts;
     }
     ts.createNoSubstitutionTemplateLiteral = createNoSubstitutionTemplateLiteral;
     function createYield(asteriskTokenOrExpression, expression) {
-        var node = createSynthesizedNode(207 /* YieldExpression */);
+        var node = createSynthesizedNode(208 /* YieldExpression */);
         node.asteriskToken = asteriskTokenOrExpression && asteriskTokenOrExpression.kind === 40 /* AsteriskToken */ ? asteriskTokenOrExpression : undefined;
         node.expression = asteriskTokenOrExpression && asteriskTokenOrExpression.kind !== 40 /* AsteriskToken */ ? asteriskTokenOrExpression : expression;
         return node;
@@ -61432,7 +63549,7 @@ var ts;
     }
     ts.updateYield = updateYield;
     function createSpread(expression) {
-        var node = createSynthesizedNode(208 /* SpreadElement */);
+        var node = createSynthesizedNode(209 /* SpreadElement */);
         node.expression = ts.parenthesizeExpressionForList(expression);
         return node;
     }
@@ -61444,7 +63561,7 @@ var ts;
     }
     ts.updateSpread = updateSpread;
     function createClassExpression(modifiers, name, typeParameters, heritageClauses, members) {
-        var node = createSynthesizedNode(209 /* ClassExpression */);
+        var node = createSynthesizedNode(210 /* ClassExpression */);
         node.decorators = undefined;
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
@@ -61465,11 +63582,11 @@ var ts;
     }
     ts.updateClassExpression = updateClassExpression;
     function createOmittedExpression() {
-        return createSynthesizedNode(210 /* OmittedExpression */);
+        return createSynthesizedNode(211 /* OmittedExpression */);
     }
     ts.createOmittedExpression = createOmittedExpression;
     function createExpressionWithTypeArguments(typeArguments, expression) {
-        var node = createSynthesizedNode(211 /* ExpressionWithTypeArguments */);
+        var node = createSynthesizedNode(212 /* ExpressionWithTypeArguments */);
         node.expression = ts.parenthesizeForAccess(expression);
         node.typeArguments = asNodeArray(typeArguments);
         return node;
@@ -61483,7 +63600,7 @@ var ts;
     }
     ts.updateExpressionWithTypeArguments = updateExpressionWithTypeArguments;
     function createAsExpression(expression, type) {
-        var node = createSynthesizedNode(212 /* AsExpression */);
+        var node = createSynthesizedNode(213 /* AsExpression */);
         node.expression = expression;
         node.type = type;
         return node;
@@ -61497,7 +63614,7 @@ var ts;
     }
     ts.updateAsExpression = updateAsExpression;
     function createNonNullExpression(expression) {
-        var node = createSynthesizedNode(213 /* NonNullExpression */);
+        var node = createSynthesizedNode(214 /* NonNullExpression */);
         node.expression = ts.parenthesizeForAccess(expression);
         return node;
     }
@@ -61509,7 +63626,7 @@ var ts;
     }
     ts.updateNonNullExpression = updateNonNullExpression;
     function createMetaProperty(keywordToken, name) {
-        var node = createSynthesizedNode(214 /* MetaProperty */);
+        var node = createSynthesizedNode(215 /* MetaProperty */);
         node.keywordToken = keywordToken;
         node.name = name;
         return node;
@@ -61523,7 +63640,7 @@ var ts;
     ts.updateMetaProperty = updateMetaProperty;
     // Misc
     function createTemplateSpan(expression, literal) {
-        var node = createSynthesizedNode(216 /* TemplateSpan */);
+        var node = createSynthesizedNode(217 /* TemplateSpan */);
         node.expression = expression;
         node.literal = literal;
         return node;
@@ -61537,12 +63654,12 @@ var ts;
     }
     ts.updateTemplateSpan = updateTemplateSpan;
     function createSemicolonClassElement() {
-        return createSynthesizedNode(217 /* SemicolonClassElement */);
+        return createSynthesizedNode(218 /* SemicolonClassElement */);
     }
     ts.createSemicolonClassElement = createSemicolonClassElement;
     // Element
     function createBlock(statements, multiLine) {
-        var block = createSynthesizedNode(218 /* Block */);
+        var block = createSynthesizedNode(219 /* Block */);
         block.statements = createNodeArray(statements);
         if (multiLine)
             block.multiLine = multiLine;
@@ -61556,7 +63673,7 @@ var ts;
     }
     ts.updateBlock = updateBlock;
     function createVariableStatement(modifiers, declarationList) {
-        var node = createSynthesizedNode(219 /* VariableStatement */);
+        var node = createSynthesizedNode(220 /* VariableStatement */);
         node.decorators = undefined;
         node.modifiers = asNodeArray(modifiers);
         node.declarationList = ts.isArray(declarationList) ? createVariableDeclarationList(declarationList) : declarationList;
@@ -61571,11 +63688,11 @@ var ts;
     }
     ts.updateVariableStatement = updateVariableStatement;
     function createEmptyStatement() {
-        return createSynthesizedNode(220 /* EmptyStatement */);
+        return createSynthesizedNode(221 /* EmptyStatement */);
     }
     ts.createEmptyStatement = createEmptyStatement;
     function createExpressionStatement(expression) {
-        var node = createSynthesizedNode(221 /* ExpressionStatement */);
+        var node = createSynthesizedNode(222 /* ExpressionStatement */);
         node.expression = ts.parenthesizeExpressionForExpressionStatement(expression);
         return node;
     }
@@ -61591,10 +63708,10 @@ var ts;
     /** @deprecated Use `updateExpressionStatement` instead.  */
     ts.updateStatement = updateExpressionStatement;
     function createIf(expression, thenStatement, elseStatement) {
-        var node = createSynthesizedNode(222 /* IfStatement */);
+        var node = createSynthesizedNode(223 /* IfStatement */);
         node.expression = expression;
-        node.thenStatement = thenStatement;
-        node.elseStatement = elseStatement;
+        node.thenStatement = asEmbeddedStatement(thenStatement);
+        node.elseStatement = asEmbeddedStatement(elseStatement);
         return node;
     }
     ts.createIf = createIf;
@@ -61607,8 +63724,8 @@ var ts;
     }
     ts.updateIf = updateIf;
     function createDo(statement, expression) {
-        var node = createSynthesizedNode(223 /* DoStatement */);
-        node.statement = statement;
+        var node = createSynthesizedNode(224 /* DoStatement */);
+        node.statement = asEmbeddedStatement(statement);
         node.expression = expression;
         return node;
     }
@@ -61621,9 +63738,9 @@ var ts;
     }
     ts.updateDo = updateDo;
     function createWhile(expression, statement) {
-        var node = createSynthesizedNode(224 /* WhileStatement */);
+        var node = createSynthesizedNode(225 /* WhileStatement */);
         node.expression = expression;
-        node.statement = statement;
+        node.statement = asEmbeddedStatement(statement);
         return node;
     }
     ts.createWhile = createWhile;
@@ -61635,11 +63752,11 @@ var ts;
     }
     ts.updateWhile = updateWhile;
     function createFor(initializer, condition, incrementor, statement) {
-        var node = createSynthesizedNode(225 /* ForStatement */);
+        var node = createSynthesizedNode(226 /* ForStatement */);
         node.initializer = initializer;
         node.condition = condition;
         node.incrementor = incrementor;
-        node.statement = statement;
+        node.statement = asEmbeddedStatement(statement);
         return node;
     }
     ts.createFor = createFor;
@@ -61653,10 +63770,10 @@ var ts;
     }
     ts.updateFor = updateFor;
     function createForIn(initializer, expression, statement) {
-        var node = createSynthesizedNode(226 /* ForInStatement */);
+        var node = createSynthesizedNode(227 /* ForInStatement */);
         node.initializer = initializer;
         node.expression = expression;
-        node.statement = statement;
+        node.statement = asEmbeddedStatement(statement);
         return node;
     }
     ts.createForIn = createForIn;
@@ -61669,11 +63786,11 @@ var ts;
     }
     ts.updateForIn = updateForIn;
     function createForOf(awaitModifier, initializer, expression, statement) {
-        var node = createSynthesizedNode(227 /* ForOfStatement */);
+        var node = createSynthesizedNode(228 /* ForOfStatement */);
         node.awaitModifier = awaitModifier;
         node.initializer = initializer;
         node.expression = expression;
-        node.statement = statement;
+        node.statement = asEmbeddedStatement(statement);
         return node;
     }
     ts.createForOf = createForOf;
@@ -61687,7 +63804,7 @@ var ts;
     }
     ts.updateForOf = updateForOf;
     function createContinue(label) {
-        var node = createSynthesizedNode(228 /* ContinueStatement */);
+        var node = createSynthesizedNode(229 /* ContinueStatement */);
         node.label = asName(label);
         return node;
     }
@@ -61699,7 +63816,7 @@ var ts;
     }
     ts.updateContinue = updateContinue;
     function createBreak(label) {
-        var node = createSynthesizedNode(229 /* BreakStatement */);
+        var node = createSynthesizedNode(230 /* BreakStatement */);
         node.label = asName(label);
         return node;
     }
@@ -61711,7 +63828,7 @@ var ts;
     }
     ts.updateBreak = updateBreak;
     function createReturn(expression) {
-        var node = createSynthesizedNode(230 /* ReturnStatement */);
+        var node = createSynthesizedNode(231 /* ReturnStatement */);
         node.expression = expression;
         return node;
     }
@@ -61723,9 +63840,9 @@ var ts;
     }
     ts.updateReturn = updateReturn;
     function createWith(expression, statement) {
-        var node = createSynthesizedNode(231 /* WithStatement */);
+        var node = createSynthesizedNode(232 /* WithStatement */);
         node.expression = expression;
-        node.statement = statement;
+        node.statement = asEmbeddedStatement(statement);
         return node;
     }
     ts.createWith = createWith;
@@ -61737,7 +63854,7 @@ var ts;
     }
     ts.updateWith = updateWith;
     function createSwitch(expression, caseBlock) {
-        var node = createSynthesizedNode(232 /* SwitchStatement */);
+        var node = createSynthesizedNode(233 /* SwitchStatement */);
         node.expression = ts.parenthesizeExpressionForList(expression);
         node.caseBlock = caseBlock;
         return node;
@@ -61751,9 +63868,9 @@ var ts;
     }
     ts.updateSwitch = updateSwitch;
     function createLabel(label, statement) {
-        var node = createSynthesizedNode(233 /* LabeledStatement */);
+        var node = createSynthesizedNode(234 /* LabeledStatement */);
         node.label = asName(label);
-        node.statement = statement;
+        node.statement = asEmbeddedStatement(statement);
         return node;
     }
     ts.createLabel = createLabel;
@@ -61765,7 +63882,7 @@ var ts;
     }
     ts.updateLabel = updateLabel;
     function createThrow(expression) {
-        var node = createSynthesizedNode(234 /* ThrowStatement */);
+        var node = createSynthesizedNode(235 /* ThrowStatement */);
         node.expression = expression;
         return node;
     }
@@ -61777,7 +63894,7 @@ var ts;
     }
     ts.updateThrow = updateThrow;
     function createTry(tryBlock, catchClause, finallyBlock) {
-        var node = createSynthesizedNode(235 /* TryStatement */);
+        var node = createSynthesizedNode(236 /* TryStatement */);
         node.tryBlock = tryBlock;
         node.catchClause = catchClause;
         node.finallyBlock = finallyBlock;
@@ -61793,11 +63910,11 @@ var ts;
     }
     ts.updateTry = updateTry;
     function createDebuggerStatement() {
-        return createSynthesizedNode(236 /* DebuggerStatement */);
+        return createSynthesizedNode(237 /* DebuggerStatement */);
     }
     ts.createDebuggerStatement = createDebuggerStatement;
     function createVariableDeclaration(name, type, initializer) {
-        var node = createSynthesizedNode(237 /* VariableDeclaration */);
+        var node = createSynthesizedNode(238 /* VariableDeclaration */);
         node.name = asName(name);
         node.type = type;
         node.initializer = initializer !== undefined ? ts.parenthesizeExpressionForList(initializer) : undefined;
@@ -61814,7 +63931,7 @@ var ts;
     ts.updateVariableDeclaration = updateVariableDeclaration;
     function createVariableDeclarationList(declarations, flags) {
         if (flags === void 0) { flags = 0 /* None */; }
-        var node = createSynthesizedNode(238 /* VariableDeclarationList */);
+        var node = createSynthesizedNode(239 /* VariableDeclarationList */);
         node.flags |= flags & 3 /* BlockScoped */;
         node.declarations = createNodeArray(declarations);
         return node;
@@ -61827,7 +63944,7 @@ var ts;
     }
     ts.updateVariableDeclarationList = updateVariableDeclarationList;
     function createFunctionDeclaration(decorators, modifiers, asteriskToken, name, typeParameters, parameters, type, body) {
-        var node = createSynthesizedNode(239 /* FunctionDeclaration */);
+        var node = createSynthesizedNode(240 /* FunctionDeclaration */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.asteriskToken = asteriskToken;
@@ -61853,7 +63970,7 @@ var ts;
     }
     ts.updateFunctionDeclaration = updateFunctionDeclaration;
     function createClassDeclaration(decorators, modifiers, name, typeParameters, heritageClauses, members) {
-        var node = createSynthesizedNode(240 /* ClassDeclaration */);
+        var node = createSynthesizedNode(241 /* ClassDeclaration */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
@@ -61875,7 +63992,7 @@ var ts;
     }
     ts.updateClassDeclaration = updateClassDeclaration;
     function createInterfaceDeclaration(decorators, modifiers, name, typeParameters, heritageClauses, members) {
-        var node = createSynthesizedNode(241 /* InterfaceDeclaration */);
+        var node = createSynthesizedNode(242 /* InterfaceDeclaration */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
@@ -61897,7 +64014,7 @@ var ts;
     }
     ts.updateInterfaceDeclaration = updateInterfaceDeclaration;
     function createTypeAliasDeclaration(decorators, modifiers, name, typeParameters, type) {
-        var node = createSynthesizedNode(242 /* TypeAliasDeclaration */);
+        var node = createSynthesizedNode(243 /* TypeAliasDeclaration */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
@@ -61917,7 +64034,7 @@ var ts;
     }
     ts.updateTypeAliasDeclaration = updateTypeAliasDeclaration;
     function createEnumDeclaration(decorators, modifiers, name, members) {
-        var node = createSynthesizedNode(243 /* EnumDeclaration */);
+        var node = createSynthesizedNode(244 /* EnumDeclaration */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
@@ -61936,7 +64053,7 @@ var ts;
     ts.updateEnumDeclaration = updateEnumDeclaration;
     function createModuleDeclaration(decorators, modifiers, name, body, flags) {
         if (flags === void 0) { flags = 0 /* None */; }
-        var node = createSynthesizedNode(244 /* ModuleDeclaration */);
+        var node = createSynthesizedNode(245 /* ModuleDeclaration */);
         node.flags |= flags & (16 /* Namespace */ | 4 /* NestedNamespace */ | 512 /* GlobalAugmentation */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
@@ -61955,7 +64072,7 @@ var ts;
     }
     ts.updateModuleDeclaration = updateModuleDeclaration;
     function createModuleBlock(statements) {
-        var node = createSynthesizedNode(245 /* ModuleBlock */);
+        var node = createSynthesizedNode(246 /* ModuleBlock */);
         node.statements = createNodeArray(statements);
         return node;
     }
@@ -61967,7 +64084,7 @@ var ts;
     }
     ts.updateModuleBlock = updateModuleBlock;
     function createCaseBlock(clauses) {
-        var node = createSynthesizedNode(246 /* CaseBlock */);
+        var node = createSynthesizedNode(247 /* CaseBlock */);
         node.clauses = createNodeArray(clauses);
         return node;
     }
@@ -61979,7 +64096,7 @@ var ts;
     }
     ts.updateCaseBlock = updateCaseBlock;
     function createNamespaceExportDeclaration(name) {
-        var node = createSynthesizedNode(247 /* NamespaceExportDeclaration */);
+        var node = createSynthesizedNode(248 /* NamespaceExportDeclaration */);
         node.name = asName(name);
         return node;
     }
@@ -61991,7 +64108,7 @@ var ts;
     }
     ts.updateNamespaceExportDeclaration = updateNamespaceExportDeclaration;
     function createImportEqualsDeclaration(decorators, modifiers, name, moduleReference) {
-        var node = createSynthesizedNode(248 /* ImportEqualsDeclaration */);
+        var node = createSynthesizedNode(249 /* ImportEqualsDeclaration */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
@@ -62009,7 +64126,7 @@ var ts;
     }
     ts.updateImportEqualsDeclaration = updateImportEqualsDeclaration;
     function createImportDeclaration(decorators, modifiers, importClause, moduleSpecifier) {
-        var node = createSynthesizedNode(249 /* ImportDeclaration */);
+        var node = createSynthesizedNode(250 /* ImportDeclaration */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.importClause = importClause;
@@ -62027,7 +64144,7 @@ var ts;
     }
     ts.updateImportDeclaration = updateImportDeclaration;
     function createImportClause(name, namedBindings) {
-        var node = createSynthesizedNode(250 /* ImportClause */);
+        var node = createSynthesizedNode(251 /* ImportClause */);
         node.name = name;
         node.namedBindings = namedBindings;
         return node;
@@ -62041,7 +64158,7 @@ var ts;
     }
     ts.updateImportClause = updateImportClause;
     function createNamespaceImport(name) {
-        var node = createSynthesizedNode(251 /* NamespaceImport */);
+        var node = createSynthesizedNode(252 /* NamespaceImport */);
         node.name = name;
         return node;
     }
@@ -62053,7 +64170,7 @@ var ts;
     }
     ts.updateNamespaceImport = updateNamespaceImport;
     function createNamedImports(elements) {
-        var node = createSynthesizedNode(252 /* NamedImports */);
+        var node = createSynthesizedNode(253 /* NamedImports */);
         node.elements = createNodeArray(elements);
         return node;
     }
@@ -62065,7 +64182,7 @@ var ts;
     }
     ts.updateNamedImports = updateNamedImports;
     function createImportSpecifier(propertyName, name) {
-        var node = createSynthesizedNode(253 /* ImportSpecifier */);
+        var node = createSynthesizedNode(254 /* ImportSpecifier */);
         node.propertyName = propertyName;
         node.name = name;
         return node;
@@ -62079,11 +64196,11 @@ var ts;
     }
     ts.updateImportSpecifier = updateImportSpecifier;
     function createExportAssignment(decorators, modifiers, isExportEquals, expression) {
-        var node = createSynthesizedNode(254 /* ExportAssignment */);
+        var node = createSynthesizedNode(255 /* ExportAssignment */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.isExportEquals = isExportEquals;
-        node.expression = isExportEquals ? ts.parenthesizeBinaryOperand(59 /* EqualsToken */, expression, /*isLeftSideOfBinary*/ false, /*leftOperand*/ undefined) : ts.parenthesizeDefaultExpression(expression);
+        node.expression = isExportEquals ? ts.parenthesizeBinaryOperand(60 /* EqualsToken */, expression, /*isLeftSideOfBinary*/ false, /*leftOperand*/ undefined) : ts.parenthesizeDefaultExpression(expression);
         return node;
     }
     ts.createExportAssignment = createExportAssignment;
@@ -62096,7 +64213,7 @@ var ts;
     }
     ts.updateExportAssignment = updateExportAssignment;
     function createExportDeclaration(decorators, modifiers, exportClause, moduleSpecifier) {
-        var node = createSynthesizedNode(255 /* ExportDeclaration */);
+        var node = createSynthesizedNode(256 /* ExportDeclaration */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.exportClause = exportClause;
@@ -62114,7 +64231,7 @@ var ts;
     }
     ts.updateExportDeclaration = updateExportDeclaration;
     function createNamedExports(elements) {
-        var node = createSynthesizedNode(256 /* NamedExports */);
+        var node = createSynthesizedNode(257 /* NamedExports */);
         node.elements = createNodeArray(elements);
         return node;
     }
@@ -62126,7 +64243,7 @@ var ts;
     }
     ts.updateNamedExports = updateNamedExports;
     function createExportSpecifier(propertyName, name) {
-        var node = createSynthesizedNode(257 /* ExportSpecifier */);
+        var node = createSynthesizedNode(258 /* ExportSpecifier */);
         node.propertyName = asName(propertyName);
         node.name = asName(name);
         return node;
@@ -62141,7 +64258,7 @@ var ts;
     ts.updateExportSpecifier = updateExportSpecifier;
     // Module references
     function createExternalModuleReference(expression) {
-        var node = createSynthesizedNode(259 /* ExternalModuleReference */);
+        var node = createSynthesizedNode(260 /* ExternalModuleReference */);
         node.expression = expression;
         return node;
     }
@@ -62155,14 +64272,14 @@ var ts;
     // JSDoc
     /* @internal */
     function createJSDocTypeExpression(type) {
-        var node = createSynthesizedNode(288 /* JSDocTypeExpression */);
+        var node = createSynthesizedNode(289 /* JSDocTypeExpression */);
         node.type = type;
         return node;
     }
     ts.createJSDocTypeExpression = createJSDocTypeExpression;
     /* @internal */
     function createJSDocTypeTag(typeExpression, comment) {
-        var tag = createJSDocTag(307 /* JSDocTypeTag */, "type");
+        var tag = createJSDocTag(309 /* JSDocTypeTag */, "type");
         tag.typeExpression = typeExpression;
         tag.comment = comment;
         return tag;
@@ -62170,15 +64287,22 @@ var ts;
     ts.createJSDocTypeTag = createJSDocTypeTag;
     /* @internal */
     function createJSDocReturnTag(typeExpression, comment) {
-        var tag = createJSDocTag(305 /* JSDocReturnTag */, "returns");
+        var tag = createJSDocTag(307 /* JSDocReturnTag */, "returns");
         tag.typeExpression = typeExpression;
         tag.comment = comment;
         return tag;
     }
     ts.createJSDocReturnTag = createJSDocReturnTag;
+    /** @internal */
+    function createJSDocThisTag(typeExpression) {
+        var tag = createJSDocTag(308 /* JSDocThisTag */, "this");
+        tag.typeExpression = typeExpression;
+        return tag;
+    }
+    ts.createJSDocThisTag = createJSDocThisTag;
     /* @internal */
     function createJSDocParamTag(name, isBracketed, typeExpression, comment) {
-        var tag = createJSDocTag(304 /* JSDocParameterTag */, "param");
+        var tag = createJSDocTag(306 /* JSDocParameterTag */, "param");
         tag.typeExpression = typeExpression;
         tag.name = name;
         tag.isBracketed = isBracketed;
@@ -62188,7 +64312,7 @@ var ts;
     ts.createJSDocParamTag = createJSDocParamTag;
     /* @internal */
     function createJSDocComment(comment, tags) {
-        var node = createSynthesizedNode(296 /* JSDocComment */);
+        var node = createSynthesizedNode(297 /* JSDocComment */);
         node.comment = comment;
         node.tags = tags;
         return node;
@@ -62202,7 +64326,7 @@ var ts;
     }
     // JSX
     function createJsxElement(openingElement, children, closingElement) {
-        var node = createSynthesizedNode(260 /* JsxElement */);
+        var node = createSynthesizedNode(261 /* JsxElement */);
         node.openingElement = openingElement;
         node.children = createNodeArray(children);
         node.closingElement = closingElement;
@@ -62218,7 +64342,7 @@ var ts;
     }
     ts.updateJsxElement = updateJsxElement;
     function createJsxSelfClosingElement(tagName, typeArguments, attributes) {
-        var node = createSynthesizedNode(261 /* JsxSelfClosingElement */);
+        var node = createSynthesizedNode(262 /* JsxSelfClosingElement */);
         node.tagName = tagName;
         node.typeArguments = asNodeArray(typeArguments);
         node.attributes = attributes;
@@ -62234,7 +64358,7 @@ var ts;
     }
     ts.updateJsxSelfClosingElement = updateJsxSelfClosingElement;
     function createJsxOpeningElement(tagName, typeArguments, attributes) {
-        var node = createSynthesizedNode(262 /* JsxOpeningElement */);
+        var node = createSynthesizedNode(263 /* JsxOpeningElement */);
         node.tagName = tagName;
         node.typeArguments = asNodeArray(typeArguments);
         node.attributes = attributes;
@@ -62250,7 +64374,7 @@ var ts;
     }
     ts.updateJsxOpeningElement = updateJsxOpeningElement;
     function createJsxClosingElement(tagName) {
-        var node = createSynthesizedNode(263 /* JsxClosingElement */);
+        var node = createSynthesizedNode(264 /* JsxClosingElement */);
         node.tagName = tagName;
         return node;
     }
@@ -62262,13 +64386,35 @@ var ts;
     }
     ts.updateJsxClosingElement = updateJsxClosingElement;
     function createJsxFragment(openingFragment, children, closingFragment) {
-        var node = createSynthesizedNode(264 /* JsxFragment */);
+        var node = createSynthesizedNode(265 /* JsxFragment */);
         node.openingFragment = openingFragment;
         node.children = createNodeArray(children);
         node.closingFragment = closingFragment;
         return node;
     }
     ts.createJsxFragment = createJsxFragment;
+    function createJsxText(text, containsOnlyTriviaWhiteSpaces) {
+        var node = createSynthesizedNode(11 /* JsxText */);
+        node.text = text;
+        node.containsOnlyTriviaWhiteSpaces = !!containsOnlyTriviaWhiteSpaces;
+        return node;
+    }
+    ts.createJsxText = createJsxText;
+    function updateJsxText(node, text, containsOnlyTriviaWhiteSpaces) {
+        return node.text !== text
+            || node.containsOnlyTriviaWhiteSpaces !== containsOnlyTriviaWhiteSpaces
+            ? updateNode(createJsxText(text, containsOnlyTriviaWhiteSpaces), node)
+            : node;
+    }
+    ts.updateJsxText = updateJsxText;
+    function createJsxOpeningFragment() {
+        return createSynthesizedNode(266 /* JsxOpeningFragment */);
+    }
+    ts.createJsxOpeningFragment = createJsxOpeningFragment;
+    function createJsxJsxClosingFragment() {
+        return createSynthesizedNode(267 /* JsxClosingFragment */);
+    }
+    ts.createJsxJsxClosingFragment = createJsxJsxClosingFragment;
     function updateJsxFragment(node, openingFragment, children, closingFragment) {
         return node.openingFragment !== openingFragment
             || node.children !== children
@@ -62278,7 +64424,7 @@ var ts;
     }
     ts.updateJsxFragment = updateJsxFragment;
     function createJsxAttribute(name, initializer) {
-        var node = createSynthesizedNode(267 /* JsxAttribute */);
+        var node = createSynthesizedNode(268 /* JsxAttribute */);
         node.name = name;
         node.initializer = initializer;
         return node;
@@ -62292,7 +64438,7 @@ var ts;
     }
     ts.updateJsxAttribute = updateJsxAttribute;
     function createJsxAttributes(properties) {
-        var node = createSynthesizedNode(268 /* JsxAttributes */);
+        var node = createSynthesizedNode(269 /* JsxAttributes */);
         node.properties = createNodeArray(properties);
         return node;
     }
@@ -62304,7 +64450,7 @@ var ts;
     }
     ts.updateJsxAttributes = updateJsxAttributes;
     function createJsxSpreadAttribute(expression) {
-        var node = createSynthesizedNode(269 /* JsxSpreadAttribute */);
+        var node = createSynthesizedNode(270 /* JsxSpreadAttribute */);
         node.expression = expression;
         return node;
     }
@@ -62316,7 +64462,7 @@ var ts;
     }
     ts.updateJsxSpreadAttribute = updateJsxSpreadAttribute;
     function createJsxExpression(dotDotDotToken, expression) {
-        var node = createSynthesizedNode(270 /* JsxExpression */);
+        var node = createSynthesizedNode(271 /* JsxExpression */);
         node.dotDotDotToken = dotDotDotToken;
         node.expression = expression;
         return node;
@@ -62330,7 +64476,7 @@ var ts;
     ts.updateJsxExpression = updateJsxExpression;
     // Clauses
     function createCaseClause(expression, statements) {
-        var node = createSynthesizedNode(271 /* CaseClause */);
+        var node = createSynthesizedNode(272 /* CaseClause */);
         node.expression = ts.parenthesizeExpressionForList(expression);
         node.statements = createNodeArray(statements);
         return node;
@@ -62344,7 +64490,7 @@ var ts;
     }
     ts.updateCaseClause = updateCaseClause;
     function createDefaultClause(statements) {
-        var node = createSynthesizedNode(272 /* DefaultClause */);
+        var node = createSynthesizedNode(273 /* DefaultClause */);
         node.statements = createNodeArray(statements);
         return node;
     }
@@ -62356,7 +64502,7 @@ var ts;
     }
     ts.updateDefaultClause = updateDefaultClause;
     function createHeritageClause(token, types) {
-        var node = createSynthesizedNode(273 /* HeritageClause */);
+        var node = createSynthesizedNode(274 /* HeritageClause */);
         node.token = token;
         node.types = createNodeArray(types);
         return node;
@@ -62369,7 +64515,7 @@ var ts;
     }
     ts.updateHeritageClause = updateHeritageClause;
     function createCatchClause(variableDeclaration, block) {
-        var node = createSynthesizedNode(274 /* CatchClause */);
+        var node = createSynthesizedNode(275 /* CatchClause */);
         node.variableDeclaration = ts.isString(variableDeclaration) ? createVariableDeclaration(variableDeclaration) : variableDeclaration;
         node.block = block;
         return node;
@@ -62384,7 +64530,7 @@ var ts;
     ts.updateCatchClause = updateCatchClause;
     // Property assignments
     function createPropertyAssignment(name, initializer) {
-        var node = createSynthesizedNode(275 /* PropertyAssignment */);
+        var node = createSynthesizedNode(276 /* PropertyAssignment */);
         node.name = asName(name);
         node.questionToken = undefined;
         node.initializer = ts.parenthesizeExpressionForList(initializer);
@@ -62399,7 +64545,7 @@ var ts;
     }
     ts.updatePropertyAssignment = updatePropertyAssignment;
     function createShorthandPropertyAssignment(name, objectAssignmentInitializer) {
-        var node = createSynthesizedNode(276 /* ShorthandPropertyAssignment */);
+        var node = createSynthesizedNode(277 /* ShorthandPropertyAssignment */);
         node.name = asName(name);
         node.objectAssignmentInitializer = objectAssignmentInitializer !== undefined ? ts.parenthesizeExpressionForList(objectAssignmentInitializer) : undefined;
         return node;
@@ -62413,8 +64559,8 @@ var ts;
     }
     ts.updateShorthandPropertyAssignment = updateShorthandPropertyAssignment;
     function createSpreadAssignment(expression) {
-        var node = createSynthesizedNode(277 /* SpreadAssignment */);
-        node.expression = expression !== undefined ? ts.parenthesizeExpressionForList(expression) : undefined; // TODO: GH#18217
+        var node = createSynthesizedNode(278 /* SpreadAssignment */);
+        node.expression = ts.parenthesizeExpressionForList(expression);
         return node;
     }
     ts.createSpreadAssignment = createSpreadAssignment;
@@ -62426,7 +64572,7 @@ var ts;
     ts.updateSpreadAssignment = updateSpreadAssignment;
     // Enum
     function createEnumMember(name, initializer) {
-        var node = createSynthesizedNode(278 /* EnumMember */);
+        var node = createSynthesizedNode(279 /* EnumMember */);
         node.name = asName(name);
         node.initializer = initializer && ts.parenthesizeExpressionForList(initializer);
         return node;
@@ -62447,7 +64593,7 @@ var ts;
             (typeReferences !== undefined && node.typeReferenceDirectives !== typeReferences) ||
             (libReferences !== undefined && node.libReferenceDirectives !== libReferences) ||
             (hasNoDefaultLib !== undefined && node.hasNoDefaultLib !== hasNoDefaultLib)) {
-            var updated = createSynthesizedNode(284 /* SourceFile */);
+            var updated = createSynthesizedNode(285 /* SourceFile */);
             updated.flags |= node.flags;
             updated.statements = createNodeArray(statements);
             updated.endOfFileToken = node.endOfFileToken;
@@ -62531,7 +64677,7 @@ var ts;
      * @param original The original statement.
      */
     function createNotEmittedStatement(original) {
-        var node = createSynthesizedNode(312 /* NotEmittedStatement */);
+        var node = createSynthesizedNode(314 /* NotEmittedStatement */);
         node.original = original;
         setTextRange(node, original);
         return node;
@@ -62543,7 +64689,7 @@ var ts;
      */
     /* @internal */
     function createEndOfDeclarationMarker(original) {
-        var node = createSynthesizedNode(316 /* EndOfDeclarationMarker */);
+        var node = createSynthesizedNode(318 /* EndOfDeclarationMarker */);
         node.emitNode = {};
         node.original = original;
         return node;
@@ -62555,7 +64701,7 @@ var ts;
      */
     /* @internal */
     function createMergeDeclarationMarker(original) {
-        var node = createSynthesizedNode(315 /* MergeDeclarationMarker */);
+        var node = createSynthesizedNode(317 /* MergeDeclarationMarker */);
         node.emitNode = {};
         node.original = original;
         return node;
@@ -62570,7 +64716,7 @@ var ts;
      * @param location The location for the expression. Defaults to the positions from "original" if provided.
      */
     function createPartiallyEmittedExpression(expression, original) {
-        var node = createSynthesizedNode(313 /* PartiallyEmittedExpression */);
+        var node = createSynthesizedNode(315 /* PartiallyEmittedExpression */);
         node.expression = expression;
         node.original = original;
         setTextRange(node, original);
@@ -62586,7 +64732,7 @@ var ts;
     ts.updatePartiallyEmittedExpression = updatePartiallyEmittedExpression;
     function flattenCommaElements(node) {
         if (ts.nodeIsSynthesized(node) && !ts.isParseTreeNode(node) && !node.original && !node.emitNode && !node.id) {
-            if (node.kind === 314 /* CommaListExpression */) {
+            if (node.kind === 316 /* CommaListExpression */) {
                 return node.elements;
             }
             if (ts.isBinaryExpression(node) && node.operatorToken.kind === 27 /* CommaToken */) {
@@ -62596,7 +64742,7 @@ var ts;
         return node;
     }
     function createCommaList(elements) {
-        var node = createSynthesizedNode(314 /* CommaListExpression */);
+        var node = createSynthesizedNode(316 /* CommaListExpression */);
         node.elements = createNodeArray(ts.sameFlatMap(elements, flattenCommaElements));
         return node;
     }
@@ -62609,7 +64755,7 @@ var ts;
     ts.updateCommaList = updateCommaList;
     function createBundle(sourceFiles, prepends) {
         if (prepends === void 0) { prepends = ts.emptyArray; }
-        var node = ts.createNode(285 /* Bundle */);
+        var node = ts.createNode(286 /* Bundle */);
         node.prepends = prepends;
         node.sourceFiles = sourceFiles;
         return node;
@@ -62621,6 +64767,7 @@ var ts;
             ts.valuesHelper,
             ts.readHelper,
             ts.spreadHelper,
+            ts.spreadArraysHelper,
             ts.restHelper,
             ts.decorateHelper,
             ts.metadataHelper,
@@ -62639,7 +64786,7 @@ var ts;
         ], function (helper) { return helper.name; }));
     }
     function createUnparsedSource() {
-        var node = ts.createNode(286 /* UnparsedSource */);
+        var node = ts.createNode(287 /* UnparsedSource */);
         node.prologues = ts.emptyArray;
         node.referencedFiles = ts.emptyArray;
         node.libReferenceDirectives = ts.emptyArray;
@@ -62771,10 +64918,10 @@ var ts;
     }
     function mapBundleFileSectionKindToSyntaxKind(kind) {
         switch (kind) {
-            case "prologue" /* Prologue */: return 279 /* UnparsedPrologue */;
-            case "prepend" /* Prepend */: return 280 /* UnparsedPrepend */;
-            case "internal" /* Internal */: return 282 /* UnparsedInternalText */;
-            case "text" /* Text */: return 281 /* UnparsedText */;
+            case "prologue" /* Prologue */: return 280 /* UnparsedPrologue */;
+            case "prepend" /* Prepend */: return 281 /* UnparsedPrepend */;
+            case "internal" /* Internal */: return 283 /* UnparsedInternalText */;
+            case "text" /* Text */: return 282 /* UnparsedText */;
             case "emitHelpers" /* EmitHelpers */:
             case "no-default-lib" /* NoDefaultLib */:
             case "reference" /* Reference */:
@@ -62792,14 +64939,14 @@ var ts;
         return node;
     }
     function createUnparsedSyntheticReference(section, parent) {
-        var node = ts.createNode(283 /* UnparsedSyntheticReference */, section.pos, section.end);
+        var node = ts.createNode(284 /* UnparsedSyntheticReference */, section.pos, section.end);
         node.parent = parent;
         node.data = section.data;
         node.section = section;
         return node;
     }
     function createInputFiles(javascriptTextOrReadFileText, declarationTextOrJavascriptPath, javascriptMapPath, javascriptMapTextOrDeclarationPath, declarationMapPath, declarationMapTextOrBuildInfoPath, javascriptPath, declarationPath, buildInfoPath, buildInfo, oldFileOfCurrentEmit) {
-        var node = ts.createNode(287 /* InputFiles */);
+        var node = ts.createNode(288 /* InputFiles */);
         if (!ts.isString(javascriptTextOrReadFileText)) {
             var cache_1 = ts.createMap();
             var textGetter_1 = function (path) {
@@ -62893,7 +65040,7 @@ var ts;
     }
     ts.createLessThan = createLessThan;
     function createAssignment(left, right) {
-        return createBinary(left, 59 /* EqualsToken */, right);
+        return createBinary(left, 60 /* EqualsToken */, right);
     }
     ts.createAssignment = createAssignment;
     function createStrictEquality(left, right) {
@@ -62953,6 +65100,9 @@ var ts;
     function asToken(value) {
         return typeof value === "number" ? createToken(value) : value;
     }
+    function asEmbeddedStatement(statement) {
+        return statement && ts.isNotEmittedStatement(statement) ? setTextRange(setOriginalNode(createEmptyStatement(), statement), statement) : statement;
+    }
     /**
      * Clears any EmitNode entries from parse-tree nodes.
      * @param sourceFile A source file.
@@ -62986,7 +65136,7 @@ var ts;
                 // To avoid holding onto transformation artifacts, we keep track of any
                 // parse tree node we are annotating. This allows us to clean them up after
                 // all transformations have completed.
-                if (node.kind === 284 /* SourceFile */) {
+                if (node.kind === 285 /* SourceFile */) {
                     return node.emitNode = { annotatedNodes: [node] };
                 }
                 var sourceFile = ts.getSourceFileOfNode(ts.getParseTreeNode(ts.getSourceFileOfNode(node)));
@@ -62997,6 +65147,18 @@ var ts;
         return node.emitNode;
     }
     ts.getOrCreateEmitNode = getOrCreateEmitNode;
+    /**
+     * Sets `EmitFlags.NoComments` on a node and removes any leading and trailing synthetic comments.
+     * @internal
+     */
+    function removeAllComments(node) {
+        var emitNode = getOrCreateEmitNode(node);
+        emitNode.flags |= 1536 /* NoComments */;
+        emitNode.leadingComments = undefined;
+        emitNode.trailingComments = undefined;
+        return node;
+    }
+    ts.removeAllComments = removeAllComments;
     function setTextRange(range, location) {
         if (location) {
             range.pos = location.pos;
@@ -63287,7 +65449,7 @@ var ts;
     ts.nullTransformationContext = {
         enableEmitNotification: ts.noop,
         enableSubstitution: ts.noop,
-        endLexicalEnvironment: function () { return undefined; },
+        endLexicalEnvironment: ts.returnUndefined,
         getCompilerOptions: ts.notImplemented,
         getEmitHost: ts.notImplemented,
         getEmitResolver: ts.notImplemented,
@@ -63468,6 +65630,17 @@ var ts;
         /*typeArguments*/ undefined, argumentList), location);
     }
     ts.createSpreadHelper = createSpreadHelper;
+    ts.spreadArraysHelper = {
+        name: "typescript:spreadArrays",
+        scoped: false,
+        text: "\n            var __spreadArrays = (this && this.__spreadArrays) || function () {\n                for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;\n                for (var r = Array(s), k = 0, i = 0; i < il; i++)\n                    for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)\n                        r[k] = a[j];\n                return r;\n            };"
+    };
+    function createSpreadArraysHelper(context, argumentList, location) {
+        context.requestEmitHelper(ts.spreadArraysHelper);
+        return ts.setTextRange(ts.createCall(getHelperName("__spreadArrays"), 
+        /*typeArguments*/ undefined, argumentList), location);
+    }
+    ts.createSpreadArraysHelper = createSpreadArraysHelper;
     // Utilities
     function createForOfBindingStatement(node, boundValue) {
         if (ts.isVariableDeclarationList(node)) {
@@ -63497,7 +65670,7 @@ var ts;
         if (!outermostLabeledStatement) {
             return node;
         }
-        var updated = ts.updateLabel(outermostLabeledStatement, outermostLabeledStatement.label, outermostLabeledStatement.statement.kind === 233 /* LabeledStatement */
+        var updated = ts.updateLabel(outermostLabeledStatement, outermostLabeledStatement.label, outermostLabeledStatement.statement.kind === 234 /* LabeledStatement */
             ? restoreEnclosingLabel(node, outermostLabeledStatement.statement)
             : node);
         if (afterRestoreLabelCallback) {
@@ -63509,20 +65682,20 @@ var ts;
     function shouldBeCapturedInTempVariable(node, cacheIdentifiers) {
         var target = ts.skipParentheses(node);
         switch (target.kind) {
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 return cacheIdentifiers;
-            case 100 /* ThisKeyword */:
+            case 101 /* ThisKeyword */:
             case 8 /* NumericLiteral */:
             case 9 /* BigIntLiteral */:
             case 10 /* StringLiteral */:
                 return false;
-            case 187 /* ArrayLiteralExpression */:
+            case 188 /* ArrayLiteralExpression */:
                 var elements = target.elements;
                 if (elements.length === 0) {
                     return false;
                 }
                 return true;
-            case 188 /* ObjectLiteralExpression */:
+            case 189 /* ObjectLiteralExpression */:
                 return target.properties.length > 0;
             default:
                 return true;
@@ -63537,7 +65710,7 @@ var ts;
             thisArg = ts.createThis();
             target = callee;
         }
-        else if (callee.kind === 98 /* SuperKeyword */) {
+        else if (callee.kind === 99 /* SuperKeyword */) {
             thisArg = ts.createThis();
             target = languageVersion < 2 /* ES2015 */
                 ? ts.setTextRange(ts.createIdentifier("_super"), callee)
@@ -63549,7 +65722,7 @@ var ts;
         }
         else {
             switch (callee.kind) {
-                case 189 /* PropertyAccessExpression */: {
+                case 190 /* PropertyAccessExpression */: {
                     if (shouldBeCapturedInTempVariable(callee.expression, cacheIdentifiers)) {
                         // for `a.b()` target is `(_a = a).b` and thisArg is `_a`
                         thisArg = ts.createTempVariable(recordTempVariable);
@@ -63562,7 +65735,7 @@ var ts;
                     }
                     break;
                 }
-                case 190 /* ElementAccessExpression */: {
+                case 191 /* ElementAccessExpression */: {
                     if (shouldBeCapturedInTempVariable(callee.expression, cacheIdentifiers)) {
                         // for `a[b]()` target is `(_a = a)[b]` and thisArg is `_a`
                         thisArg = ts.createTempVariable(recordTempVariable);
@@ -63619,14 +65792,14 @@ var ts;
     ts.createExpressionForPropertyName = createExpressionForPropertyName;
     function createExpressionForObjectLiteralElementLike(node, property, receiver) {
         switch (property.kind) {
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
                 return createExpressionForAccessorDeclaration(node.properties, property, receiver, !!node.multiLine);
-            case 275 /* PropertyAssignment */:
+            case 276 /* PropertyAssignment */:
                 return createExpressionForPropertyAssignment(property, receiver);
-            case 276 /* ShorthandPropertyAssignment */:
+            case 277 /* ShorthandPropertyAssignment */:
                 return createExpressionForShorthandPropertyAssignment(property, receiver);
-            case 156 /* MethodDeclaration */:
+            case 157 /* MethodDeclaration */:
                 return createExpressionForMethodDeclaration(property, receiver);
         }
     }
@@ -63634,7 +65807,7 @@ var ts;
     function createExpressionForAccessorDeclaration(properties, property, receiver, multiLine) {
         var _a = ts.getAllAccessorDeclarations(properties, property), firstAccessor = _a.firstAccessor, getAccessor = _a.getAccessor, setAccessor = _a.setAccessor;
         if (property === firstAccessor) {
-            var properties_8 = [];
+            var properties_5 = [];
             if (getAccessor) {
                 var getterFunction = ts.createFunctionExpression(getAccessor.modifiers, 
                 /*asteriskToken*/ undefined, 
@@ -63645,7 +65818,7 @@ var ts;
                 ts.setTextRange(getterFunction, getAccessor);
                 ts.setOriginalNode(getterFunction, getAccessor);
                 var getter = ts.createPropertyAssignment("get", getterFunction);
-                properties_8.push(getter);
+                properties_5.push(getter);
             }
             if (setAccessor) {
                 var setterFunction = ts.createFunctionExpression(setAccessor.modifiers, 
@@ -63657,15 +65830,15 @@ var ts;
                 ts.setTextRange(setterFunction, setAccessor);
                 ts.setOriginalNode(setterFunction, setAccessor);
                 var setter = ts.createPropertyAssignment("set", setterFunction);
-                properties_8.push(setter);
+                properties_5.push(setter);
             }
-            properties_8.push(ts.createPropertyAssignment("enumerable", ts.createTrue()));
-            properties_8.push(ts.createPropertyAssignment("configurable", ts.createTrue()));
+            properties_5.push(ts.createPropertyAssignment("enumerable", ts.createTrue()));
+            properties_5.push(ts.createPropertyAssignment("configurable", ts.createTrue()));
             var expression = ts.setTextRange(ts.createCall(ts.createPropertyAccess(ts.createIdentifier("Object"), "defineProperty"), 
             /*typeArguments*/ undefined, [
                 receiver,
                 createExpressionForPropertyName(property.name),
-                ts.createObjectLiteral(properties_8, multiLine)
+                ts.createObjectLiteral(properties_5, multiLine)
             ]), 
             /*location*/ firstAccessor);
             return ts.aggregateTransformFlags(expression);
@@ -63952,7 +66125,7 @@ var ts;
     function parenthesizeBinaryOperand(binaryOperator, operand, isLeftSideOfBinary, leftOperand) {
         var skipped = ts.skipPartiallyEmittedExpressions(operand);
         // If the resulting expression is already parenthesized, we do not need to do any further processing.
-        if (skipped.kind === 195 /* ParenthesizedExpression */) {
+        if (skipped.kind === 196 /* ParenthesizedExpression */) {
             return operand;
         }
         return binaryOperandNeedsParentheses(binaryOperator, operand, isLeftSideOfBinary, leftOperand)
@@ -63986,10 +66159,10 @@ var ts;
         //
         // If `a ** d` is on the left of operator `**`, we need to parenthesize to preserve
         // the intended order of operations: `(a ** b) ** c`
-        var binaryOperatorPrecedence = ts.getOperatorPrecedence(204 /* BinaryExpression */, binaryOperator);
-        var binaryOperatorAssociativity = ts.getOperatorAssociativity(204 /* BinaryExpression */, binaryOperator);
+        var binaryOperatorPrecedence = ts.getOperatorPrecedence(205 /* BinaryExpression */, binaryOperator);
+        var binaryOperatorAssociativity = ts.getOperatorAssociativity(205 /* BinaryExpression */, binaryOperator);
         var emittedOperand = ts.skipPartiallyEmittedExpressions(operand);
-        if (!isLeftSideOfBinary && operand.kind === 197 /* ArrowFunction */ && binaryOperatorPrecedence > 4) {
+        if (!isLeftSideOfBinary && operand.kind === 198 /* ArrowFunction */ && binaryOperatorPrecedence > 4) {
             // We need to parenthesize arrow functions on the right side to avoid it being
             // parsed as parenthesized expression: `a && (() => {})`
             return true;
@@ -64001,7 +66174,7 @@ var ts;
                 // and is a yield expression, then we do not need parentheses.
                 if (!isLeftSideOfBinary
                     && binaryOperatorAssociativity === 1 /* Right */
-                    && operand.kind === 207 /* YieldExpression */) {
+                    && operand.kind === 208 /* YieldExpression */) {
                     return false;
                 }
                 return true;
@@ -64089,7 +66262,7 @@ var ts;
         if (ts.isLiteralKind(node.kind)) {
             return node.kind;
         }
-        if (node.kind === 204 /* BinaryExpression */ && node.operatorToken.kind === 38 /* PlusToken */) {
+        if (node.kind === 205 /* BinaryExpression */ && node.operatorToken.kind === 38 /* PlusToken */) {
             if (node.cachedLiteralKind !== undefined) {
                 return node.cachedLiteralKind;
             }
@@ -64104,7 +66277,7 @@ var ts;
         return 0 /* Unknown */;
     }
     function parenthesizeForConditionalHead(condition) {
-        var conditionalPrecedence = ts.getOperatorPrecedence(205 /* ConditionalExpression */, 56 /* QuestionToken */);
+        var conditionalPrecedence = ts.getOperatorPrecedence(206 /* ConditionalExpression */, 56 /* QuestionToken */);
         var emittedCondition = ts.skipPartiallyEmittedExpressions(condition);
         var conditionPrecedence = ts.getExpressionPrecedence(emittedCondition);
         if (ts.compareValues(conditionPrecedence, conditionalPrecedence) === -1 /* LessThan */) {
@@ -64139,8 +66312,8 @@ var ts;
         var needsParens = isCommaSequence(check);
         if (!needsParens) {
             switch (getLeftmostExpression(check, /*stopAtCallExpression*/ false).kind) {
-                case 209 /* ClassExpression */:
-                case 196 /* FunctionExpression */:
+                case 210 /* ClassExpression */:
+                case 197 /* FunctionExpression */:
                     needsParens = true;
             }
         }
@@ -64156,9 +66329,9 @@ var ts;
     function parenthesizeForNew(expression) {
         var leftmostExpr = getLeftmostExpression(expression, /*stopAtCallExpressions*/ true);
         switch (leftmostExpr.kind) {
-            case 191 /* CallExpression */:
+            case 192 /* CallExpression */:
                 return ts.createParen(expression);
-            case 192 /* NewExpression */:
+            case 193 /* NewExpression */:
                 return !leftmostExpr.arguments
                     ? ts.createParen(expression)
                     : expression;
@@ -64181,7 +66354,7 @@ var ts;
         //
         var emittedExpression = ts.skipPartiallyEmittedExpressions(expression);
         if (ts.isLeftHandSideExpression(emittedExpression)
-            && (emittedExpression.kind !== 192 /* NewExpression */ || emittedExpression.arguments)) {
+            && (emittedExpression.kind !== 193 /* NewExpression */ || emittedExpression.arguments)) {
             return expression;
         }
         return ts.setTextRange(ts.createParen(expression), expression);
@@ -64219,7 +66392,7 @@ var ts;
     function parenthesizeExpressionForList(expression) {
         var emittedExpression = ts.skipPartiallyEmittedExpressions(expression);
         var expressionPrecedence = ts.getExpressionPrecedence(emittedExpression);
-        var commaPrecedence = ts.getOperatorPrecedence(204 /* BinaryExpression */, 27 /* CommaToken */);
+        var commaPrecedence = ts.getOperatorPrecedence(205 /* BinaryExpression */, 27 /* CommaToken */);
         return expressionPrecedence > commaPrecedence
             ? expression
             : ts.setTextRange(ts.createParen(expression), expression);
@@ -64230,29 +66403,29 @@ var ts;
         if (ts.isCallExpression(emittedExpression)) {
             var callee = emittedExpression.expression;
             var kind = ts.skipPartiallyEmittedExpressions(callee).kind;
-            if (kind === 196 /* FunctionExpression */ || kind === 197 /* ArrowFunction */) {
+            if (kind === 197 /* FunctionExpression */ || kind === 198 /* ArrowFunction */) {
                 var mutableCall = ts.getMutableClone(emittedExpression);
                 mutableCall.expression = ts.setTextRange(ts.createParen(callee), callee);
                 return recreateOuterExpressions(expression, mutableCall, 4 /* PartiallyEmittedExpressions */);
             }
         }
         var leftmostExpressionKind = getLeftmostExpression(emittedExpression, /*stopAtCallExpressions*/ false).kind;
-        if (leftmostExpressionKind === 188 /* ObjectLiteralExpression */ || leftmostExpressionKind === 196 /* FunctionExpression */) {
+        if (leftmostExpressionKind === 189 /* ObjectLiteralExpression */ || leftmostExpressionKind === 197 /* FunctionExpression */) {
             return ts.setTextRange(ts.createParen(expression), expression);
         }
         return expression;
     }
     ts.parenthesizeExpressionForExpressionStatement = parenthesizeExpressionForExpressionStatement;
     function parenthesizeConditionalTypeMember(member) {
-        return member.kind === 175 /* ConditionalType */ ? ts.createParenthesizedType(member) : member;
+        return member.kind === 176 /* ConditionalType */ ? ts.createParenthesizedType(member) : member;
     }
     ts.parenthesizeConditionalTypeMember = parenthesizeConditionalTypeMember;
     function parenthesizeElementTypeMember(member) {
         switch (member.kind) {
-            case 173 /* UnionType */:
-            case 174 /* IntersectionType */:
-            case 165 /* FunctionType */:
-            case 166 /* ConstructorType */:
+            case 174 /* UnionType */:
+            case 175 /* IntersectionType */:
+            case 166 /* FunctionType */:
+            case 167 /* ConstructorType */:
                 return ts.createParenthesizedType(member);
         }
         return parenthesizeConditionalTypeMember(member);
@@ -64260,9 +66433,9 @@ var ts;
     ts.parenthesizeElementTypeMember = parenthesizeElementTypeMember;
     function parenthesizeArrayTypeMember(member) {
         switch (member.kind) {
-            case 167 /* TypeQuery */:
-            case 179 /* TypeOperator */:
-            case 176 /* InferType */:
+            case 168 /* TypeQuery */:
+            case 180 /* TypeOperator */:
+            case 177 /* InferType */:
                 return ts.createParenthesizedType(member);
         }
         return parenthesizeElementTypeMember(member);
@@ -64288,44 +66461,45 @@ var ts;
     function getLeftmostExpression(node, stopAtCallExpressions) {
         while (true) {
             switch (node.kind) {
-                case 203 /* PostfixUnaryExpression */:
+                case 204 /* PostfixUnaryExpression */:
                     node = node.operand;
                     continue;
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     node = node.left;
                     continue;
-                case 205 /* ConditionalExpression */:
+                case 206 /* ConditionalExpression */:
                     node = node.condition;
                     continue;
-                case 193 /* TaggedTemplateExpression */:
+                case 194 /* TaggedTemplateExpression */:
                     node = node.tag;
                     continue;
-                case 191 /* CallExpression */:
+                case 192 /* CallExpression */:
                     if (stopAtCallExpressions) {
                         return node;
                     }
                 // falls through
-                case 212 /* AsExpression */:
-                case 190 /* ElementAccessExpression */:
-                case 189 /* PropertyAccessExpression */:
-                case 213 /* NonNullExpression */:
-                case 313 /* PartiallyEmittedExpression */:
+                case 213 /* AsExpression */:
+                case 191 /* ElementAccessExpression */:
+                case 190 /* PropertyAccessExpression */:
+                case 214 /* NonNullExpression */:
+                case 315 /* PartiallyEmittedExpression */:
                     node = node.expression;
                     continue;
             }
             return node;
         }
     }
+    ts.getLeftmostExpression = getLeftmostExpression;
     function parenthesizeConciseBody(body) {
-        if (!ts.isBlock(body) && (isCommaSequence(body) || getLeftmostExpression(body, /*stopAtCallExpressions*/ false).kind === 188 /* ObjectLiteralExpression */)) {
+        if (!ts.isBlock(body) && (isCommaSequence(body) || getLeftmostExpression(body, /*stopAtCallExpressions*/ false).kind === 189 /* ObjectLiteralExpression */)) {
             return ts.setTextRange(ts.createParen(body), body);
         }
         return body;
     }
     ts.parenthesizeConciseBody = parenthesizeConciseBody;
     function isCommaSequence(node) {
-        return node.kind === 204 /* BinaryExpression */ && node.operatorToken.kind === 27 /* CommaToken */ ||
-            node.kind === 314 /* CommaListExpression */;
+        return node.kind === 205 /* BinaryExpression */ && node.operatorToken.kind === 27 /* CommaToken */ ||
+            node.kind === 316 /* CommaListExpression */;
     }
     ts.isCommaSequence = isCommaSequence;
     var OuterExpressionKinds;
@@ -64338,13 +66512,13 @@ var ts;
     function isOuterExpression(node, kinds) {
         if (kinds === void 0) { kinds = 7 /* All */; }
         switch (node.kind) {
-            case 195 /* ParenthesizedExpression */:
+            case 196 /* ParenthesizedExpression */:
                 return (kinds & 1 /* Parentheses */) !== 0;
-            case 194 /* TypeAssertionExpression */:
-            case 212 /* AsExpression */:
-            case 213 /* NonNullExpression */:
+            case 195 /* TypeAssertionExpression */:
+            case 213 /* AsExpression */:
+            case 214 /* NonNullExpression */:
                 return (kinds & 2 /* Assertions */) !== 0;
-            case 313 /* PartiallyEmittedExpression */:
+            case 315 /* PartiallyEmittedExpression */:
                 return (kinds & 4 /* PartiallyEmittedExpressions */) !== 0;
         }
         return false;
@@ -64369,7 +66543,7 @@ var ts;
     }
     ts.skipOuterExpressions = skipOuterExpressions;
     function skipAssertions(node) {
-        while (ts.isAssertionExpression(node) || node.kind === 213 /* NonNullExpression */) {
+        while (ts.isAssertionExpression(node) || node.kind === 214 /* NonNullExpression */) {
             node = node.expression;
         }
         return node;
@@ -64377,11 +66551,11 @@ var ts;
     ts.skipAssertions = skipAssertions;
     function updateOuterExpression(outerExpression, expression) {
         switch (outerExpression.kind) {
-            case 195 /* ParenthesizedExpression */: return ts.updateParen(outerExpression, expression);
-            case 194 /* TypeAssertionExpression */: return ts.updateTypeAssertion(outerExpression, outerExpression.type, expression);
-            case 212 /* AsExpression */: return ts.updateAsExpression(outerExpression, expression, outerExpression.type);
-            case 213 /* NonNullExpression */: return ts.updateNonNullExpression(outerExpression, expression);
-            case 313 /* PartiallyEmittedExpression */: return ts.updatePartiallyEmittedExpression(outerExpression, expression);
+            case 196 /* ParenthesizedExpression */: return ts.updateParen(outerExpression, expression);
+            case 195 /* TypeAssertionExpression */: return ts.updateTypeAssertion(outerExpression, outerExpression.type, expression);
+            case 213 /* AsExpression */: return ts.updateAsExpression(outerExpression, expression, outerExpression.type);
+            case 214 /* NonNullExpression */: return ts.updateNonNullExpression(outerExpression, expression);
+            case 315 /* PartiallyEmittedExpression */: return ts.updatePartiallyEmittedExpression(outerExpression, expression);
         }
     }
     /**
@@ -64399,7 +66573,7 @@ var ts;
      * the containing expression is created/updated.
      */
     function isIgnorableParen(node) {
-        return node.kind === 195 /* ParenthesizedExpression */
+        return node.kind === 196 /* ParenthesizedExpression */
             && ts.nodeIsSynthesized(node)
             && ts.nodeIsSynthesized(ts.getSourceMapRange(node))
             && ts.nodeIsSynthesized(ts.getCommentRange(node))
@@ -64464,10 +66638,10 @@ var ts;
             var name = namespaceDeclaration.name;
             return ts.isGeneratedIdentifier(name) ? name : ts.createIdentifier(ts.getSourceTextOfNodeFromSourceFile(sourceFile, name) || ts.idText(name));
         }
-        if (node.kind === 249 /* ImportDeclaration */ && node.importClause) {
+        if (node.kind === 250 /* ImportDeclaration */ && node.importClause) {
             return ts.getGeneratedNameForNode(node);
         }
-        if (node.kind === 255 /* ExportDeclaration */ && node.moduleSpecifier) {
+        if (node.kind === 256 /* ExportDeclaration */ && node.moduleSpecifier) {
             return ts.getGeneratedNameForNode(node);
         }
         return undefined;
@@ -64586,7 +66760,7 @@ var ts;
         }
         if (ts.isObjectLiteralElementLike(bindingElement)) {
             switch (bindingElement.kind) {
-                case 275 /* PropertyAssignment */:
+                case 276 /* PropertyAssignment */:
                     // `b` in `({ a: b } = ...)`
                     // `b` in `({ a: b = 1 } = ...)`
                     // `{b}` in `({ a: {b} } = ...)`
@@ -64598,11 +66772,11 @@ var ts;
                     // `b[0]` in `({ a: b[0] } = ...)`
                     // `b[0]` in `({ a: b[0] = 1 } = ...)`
                     return getTargetOfBindingOrAssignmentElement(bindingElement.initializer);
-                case 276 /* ShorthandPropertyAssignment */:
+                case 277 /* ShorthandPropertyAssignment */:
                     // `a` in `({ a } = ...)`
                     // `a` in `({ a = 1 } = ...)`
                     return bindingElement.name;
-                case 277 /* SpreadAssignment */:
+                case 278 /* SpreadAssignment */:
                     // `a` in `({ ...a } = ...)`
                     return getTargetOfBindingOrAssignmentElement(bindingElement.expression);
             }
@@ -64634,12 +66808,12 @@ var ts;
      */
     function getRestIndicatorOfBindingOrAssignmentElement(bindingElement) {
         switch (bindingElement.kind) {
-            case 151 /* Parameter */:
-            case 186 /* BindingElement */:
+            case 152 /* Parameter */:
+            case 187 /* BindingElement */:
                 // `...` in `let [...a] = ...`
                 return bindingElement.dotDotDotToken;
-            case 208 /* SpreadElement */:
-            case 277 /* SpreadAssignment */:
+            case 209 /* SpreadElement */:
+            case 278 /* SpreadAssignment */:
                 // `...` in `[...a] = ...`
                 return bindingElement;
         }
@@ -64651,7 +66825,7 @@ var ts;
      */
     function getPropertyNameOfBindingOrAssignmentElement(bindingElement) {
         switch (bindingElement.kind) {
-            case 186 /* BindingElement */:
+            case 187 /* BindingElement */:
                 // `a` in `let { a: b } = ...`
                 // `[a]` in `let { [a]: b } = ...`
                 // `"a"` in `let { "a": b } = ...`
@@ -64663,7 +66837,7 @@ var ts;
                         : propertyName;
                 }
                 break;
-            case 275 /* PropertyAssignment */:
+            case 276 /* PropertyAssignment */:
                 // `a` in `({ a: b } = ...)`
                 // `[a]` in `({ [a]: b } = ...)`
                 // `"a"` in `({ "a": b } = ...)`
@@ -64675,7 +66849,7 @@ var ts;
                         : propertyName;
                 }
                 break;
-            case 277 /* SpreadAssignment */:
+            case 278 /* SpreadAssignment */:
                 // `a` in `({ ...a } = ...)`
                 return bindingElement.name;
         }
@@ -64698,13 +66872,13 @@ var ts;
      */
     function getElementsOfBindingOrAssignmentPattern(name) {
         switch (name.kind) {
-            case 184 /* ObjectBindingPattern */:
-            case 185 /* ArrayBindingPattern */:
-            case 187 /* ArrayLiteralExpression */:
+            case 185 /* ObjectBindingPattern */:
+            case 186 /* ArrayBindingPattern */:
+            case 188 /* ArrayLiteralExpression */:
                 // `a` in `{a}`
                 // `a` in `[a]`
                 return name.elements;
-            case 188 /* ObjectLiteralExpression */:
+            case 189 /* ObjectLiteralExpression */:
                 // `a` in `{a}`
                 return name.properties;
         }
@@ -64744,11 +66918,11 @@ var ts;
     ts.convertToObjectAssignmentElement = convertToObjectAssignmentElement;
     function convertToAssignmentPattern(node) {
         switch (node.kind) {
-            case 185 /* ArrayBindingPattern */:
-            case 187 /* ArrayLiteralExpression */:
+            case 186 /* ArrayBindingPattern */:
+            case 188 /* ArrayLiteralExpression */:
                 return convertToArrayAssignmentPattern(node);
-            case 184 /* ObjectBindingPattern */:
-            case 188 /* ObjectLiteralExpression */:
+            case 185 /* ObjectBindingPattern */:
+            case 189 /* ObjectLiteralExpression */:
                 return convertToObjectAssignmentPattern(node);
         }
     }
@@ -64909,276 +67083,278 @@ var ts;
         }
         var kind = node.kind;
         // No need to visit nodes with no children.
-        if ((kind > 0 /* FirstToken */ && kind <= 147 /* LastToken */) || kind === 178 /* ThisType */) {
+        if ((kind > 0 /* FirstToken */ && kind <= 148 /* LastToken */) || kind === 179 /* ThisType */) {
             return node;
         }
         switch (kind) {
             // Names
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 return ts.updateIdentifier(node, nodesVisitor(node.typeArguments, visitor, isTypeNodeOrTypeParameterDeclaration));
-            case 148 /* QualifiedName */:
+            case 149 /* QualifiedName */:
                 return ts.updateQualifiedName(node, visitNode(node.left, visitor, ts.isEntityName), visitNode(node.right, visitor, ts.isIdentifier));
-            case 149 /* ComputedPropertyName */:
+            case 150 /* ComputedPropertyName */:
                 return ts.updateComputedPropertyName(node, visitNode(node.expression, visitor, ts.isExpression));
             // Signature elements
-            case 150 /* TypeParameter */:
+            case 151 /* TypeParameter */:
                 return ts.updateTypeParameterDeclaration(node, visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.constraint, visitor, ts.isTypeNode), visitNode(node.default, visitor, ts.isTypeNode));
-            case 151 /* Parameter */:
+            case 152 /* Parameter */:
                 return ts.updateParameter(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.dotDotDotToken, tokenVisitor, ts.isToken), visitNode(node.name, visitor, ts.isBindingName), visitNode(node.questionToken, tokenVisitor, ts.isToken), visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.initializer, visitor, ts.isExpression));
-            case 152 /* Decorator */:
+            case 153 /* Decorator */:
                 return ts.updateDecorator(node, visitNode(node.expression, visitor, ts.isExpression));
             // Type elements
-            case 153 /* PropertySignature */:
+            case 154 /* PropertySignature */:
                 return ts.updatePropertySignature(node, nodesVisitor(node.modifiers, visitor, ts.isToken), visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.questionToken, tokenVisitor, ts.isToken), visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.initializer, visitor, ts.isExpression));
-            case 154 /* PropertyDeclaration */:
-                return ts.updateProperty(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.questionToken, tokenVisitor, ts.isToken), visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.initializer, visitor, ts.isExpression));
-            case 155 /* MethodSignature */:
+            case 155 /* PropertyDeclaration */:
+                return ts.updateProperty(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), 
+                // QuestionToken and ExclamationToken is uniqued in Property Declaration and the signature of 'updateProperty' is that too
+                visitNode(node.questionToken || node.exclamationToken, tokenVisitor, ts.isToken), visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.initializer, visitor, ts.isExpression));
+            case 156 /* MethodSignature */:
                 return ts.updateMethodSignature(node, nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.questionToken, tokenVisitor, ts.isToken));
-            case 156 /* MethodDeclaration */:
+            case 157 /* MethodDeclaration */:
                 return ts.updateMethod(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.asteriskToken, tokenVisitor, ts.isToken), visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.questionToken, tokenVisitor, ts.isToken), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitNode(node.type, visitor, ts.isTypeNode), visitFunctionBody(node.body, visitor, context));
-            case 157 /* Constructor */:
+            case 158 /* Constructor */:
                 return ts.updateConstructor(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitFunctionBody(node.body, visitor, context));
-            case 158 /* GetAccessor */:
+            case 159 /* GetAccessor */:
                 return ts.updateGetAccessor(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitNode(node.type, visitor, ts.isTypeNode), visitFunctionBody(node.body, visitor, context));
-            case 159 /* SetAccessor */:
+            case 160 /* SetAccessor */:
                 return ts.updateSetAccessor(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitFunctionBody(node.body, visitor, context));
-            case 160 /* CallSignature */:
+            case 161 /* CallSignature */:
                 return ts.updateCallSignature(node, nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode));
-            case 161 /* ConstructSignature */:
+            case 162 /* ConstructSignature */:
                 return ts.updateConstructSignature(node, nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode));
-            case 162 /* IndexSignature */:
+            case 163 /* IndexSignature */:
                 return ts.updateIndexSignature(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode));
             // Types
-            case 163 /* TypePredicate */:
+            case 164 /* TypePredicate */:
                 return ts.updateTypePredicateNode(node, visitNode(node.parameterName, visitor), visitNode(node.type, visitor, ts.isTypeNode));
-            case 164 /* TypeReference */:
+            case 165 /* TypeReference */:
                 return ts.updateTypeReferenceNode(node, visitNode(node.typeName, visitor, ts.isEntityName), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode));
-            case 165 /* FunctionType */:
+            case 166 /* FunctionType */:
                 return ts.updateFunctionTypeNode(node, nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode));
-            case 166 /* ConstructorType */:
+            case 167 /* ConstructorType */:
                 return ts.updateConstructorTypeNode(node, nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode));
-            case 167 /* TypeQuery */:
+            case 168 /* TypeQuery */:
                 return ts.updateTypeQueryNode(node, visitNode(node.exprName, visitor, ts.isEntityName));
-            case 168 /* TypeLiteral */:
+            case 169 /* TypeLiteral */:
                 return ts.updateTypeLiteralNode(node, nodesVisitor(node.members, visitor, ts.isTypeElement));
-            case 169 /* ArrayType */:
+            case 170 /* ArrayType */:
                 return ts.updateArrayTypeNode(node, visitNode(node.elementType, visitor, ts.isTypeNode));
-            case 170 /* TupleType */:
+            case 171 /* TupleType */:
                 return ts.updateTupleTypeNode(node, nodesVisitor(node.elementTypes, visitor, ts.isTypeNode));
-            case 171 /* OptionalType */:
+            case 172 /* OptionalType */:
                 return ts.updateOptionalTypeNode(node, visitNode(node.type, visitor, ts.isTypeNode));
-            case 172 /* RestType */:
+            case 173 /* RestType */:
                 return ts.updateRestTypeNode(node, visitNode(node.type, visitor, ts.isTypeNode));
-            case 173 /* UnionType */:
+            case 174 /* UnionType */:
                 return ts.updateUnionTypeNode(node, nodesVisitor(node.types, visitor, ts.isTypeNode));
-            case 174 /* IntersectionType */:
+            case 175 /* IntersectionType */:
                 return ts.updateIntersectionTypeNode(node, nodesVisitor(node.types, visitor, ts.isTypeNode));
-            case 175 /* ConditionalType */:
+            case 176 /* ConditionalType */:
                 return ts.updateConditionalTypeNode(node, visitNode(node.checkType, visitor, ts.isTypeNode), visitNode(node.extendsType, visitor, ts.isTypeNode), visitNode(node.trueType, visitor, ts.isTypeNode), visitNode(node.falseType, visitor, ts.isTypeNode));
-            case 176 /* InferType */:
+            case 177 /* InferType */:
                 return ts.updateInferTypeNode(node, visitNode(node.typeParameter, visitor, ts.isTypeParameterDeclaration));
-            case 183 /* ImportType */:
+            case 184 /* ImportType */:
                 return ts.updateImportTypeNode(node, visitNode(node.argument, visitor, ts.isTypeNode), visitNode(node.qualifier, visitor, ts.isEntityName), visitNodes(node.typeArguments, visitor, ts.isTypeNode), node.isTypeOf);
-            case 177 /* ParenthesizedType */:
+            case 178 /* ParenthesizedType */:
                 return ts.updateParenthesizedType(node, visitNode(node.type, visitor, ts.isTypeNode));
-            case 179 /* TypeOperator */:
+            case 180 /* TypeOperator */:
                 return ts.updateTypeOperatorNode(node, visitNode(node.type, visitor, ts.isTypeNode));
-            case 180 /* IndexedAccessType */:
+            case 181 /* IndexedAccessType */:
                 return ts.updateIndexedAccessTypeNode(node, visitNode(node.objectType, visitor, ts.isTypeNode), visitNode(node.indexType, visitor, ts.isTypeNode));
-            case 181 /* MappedType */:
+            case 182 /* MappedType */:
                 return ts.updateMappedTypeNode(node, visitNode(node.readonlyToken, tokenVisitor, ts.isToken), visitNode(node.typeParameter, visitor, ts.isTypeParameterDeclaration), visitNode(node.questionToken, tokenVisitor, ts.isToken), visitNode(node.type, visitor, ts.isTypeNode));
-            case 182 /* LiteralType */:
+            case 183 /* LiteralType */:
                 return ts.updateLiteralTypeNode(node, visitNode(node.literal, visitor, ts.isExpression));
             // Binding patterns
-            case 184 /* ObjectBindingPattern */:
+            case 185 /* ObjectBindingPattern */:
                 return ts.updateObjectBindingPattern(node, nodesVisitor(node.elements, visitor, ts.isBindingElement));
-            case 185 /* ArrayBindingPattern */:
+            case 186 /* ArrayBindingPattern */:
                 return ts.updateArrayBindingPattern(node, nodesVisitor(node.elements, visitor, ts.isArrayBindingElement));
-            case 186 /* BindingElement */:
+            case 187 /* BindingElement */:
                 return ts.updateBindingElement(node, visitNode(node.dotDotDotToken, tokenVisitor, ts.isToken), visitNode(node.propertyName, visitor, ts.isPropertyName), visitNode(node.name, visitor, ts.isBindingName), visitNode(node.initializer, visitor, ts.isExpression));
             // Expression
-            case 187 /* ArrayLiteralExpression */:
+            case 188 /* ArrayLiteralExpression */:
                 return ts.updateArrayLiteral(node, nodesVisitor(node.elements, visitor, ts.isExpression));
-            case 188 /* ObjectLiteralExpression */:
+            case 189 /* ObjectLiteralExpression */:
                 return ts.updateObjectLiteral(node, nodesVisitor(node.properties, visitor, ts.isObjectLiteralElementLike));
-            case 189 /* PropertyAccessExpression */:
+            case 190 /* PropertyAccessExpression */:
                 return ts.updatePropertyAccess(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.name, visitor, ts.isIdentifier));
-            case 190 /* ElementAccessExpression */:
+            case 191 /* ElementAccessExpression */:
                 return ts.updateElementAccess(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.argumentExpression, visitor, ts.isExpression));
-            case 191 /* CallExpression */:
+            case 192 /* CallExpression */:
                 return ts.updateCall(node, visitNode(node.expression, visitor, ts.isExpression), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode), nodesVisitor(node.arguments, visitor, ts.isExpression));
-            case 192 /* NewExpression */:
+            case 193 /* NewExpression */:
                 return ts.updateNew(node, visitNode(node.expression, visitor, ts.isExpression), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode), nodesVisitor(node.arguments, visitor, ts.isExpression));
-            case 193 /* TaggedTemplateExpression */:
+            case 194 /* TaggedTemplateExpression */:
                 return ts.updateTaggedTemplate(node, visitNode(node.tag, visitor, ts.isExpression), visitNodes(node.typeArguments, visitor, ts.isExpression), visitNode(node.template, visitor, ts.isTemplateLiteral));
-            case 194 /* TypeAssertionExpression */:
+            case 195 /* TypeAssertionExpression */:
                 return ts.updateTypeAssertion(node, visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.expression, visitor, ts.isExpression));
-            case 195 /* ParenthesizedExpression */:
+            case 196 /* ParenthesizedExpression */:
                 return ts.updateParen(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 196 /* FunctionExpression */:
+            case 197 /* FunctionExpression */:
                 return ts.updateFunctionExpression(node, nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.asteriskToken, tokenVisitor, ts.isToken), visitNode(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitNode(node.type, visitor, ts.isTypeNode), visitFunctionBody(node.body, visitor, context));
-            case 197 /* ArrowFunction */:
+            case 198 /* ArrowFunction */:
                 return ts.updateArrowFunction(node, nodesVisitor(node.modifiers, visitor, ts.isModifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.equalsGreaterThanToken, visitor, ts.isToken), visitFunctionBody(node.body, visitor, context));
-            case 198 /* DeleteExpression */:
+            case 199 /* DeleteExpression */:
                 return ts.updateDelete(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 199 /* TypeOfExpression */:
+            case 200 /* TypeOfExpression */:
                 return ts.updateTypeOf(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 200 /* VoidExpression */:
+            case 201 /* VoidExpression */:
                 return ts.updateVoid(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 201 /* AwaitExpression */:
+            case 202 /* AwaitExpression */:
                 return ts.updateAwait(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 202 /* PrefixUnaryExpression */:
+            case 203 /* PrefixUnaryExpression */:
                 return ts.updatePrefix(node, visitNode(node.operand, visitor, ts.isExpression));
-            case 203 /* PostfixUnaryExpression */:
+            case 204 /* PostfixUnaryExpression */:
                 return ts.updatePostfix(node, visitNode(node.operand, visitor, ts.isExpression));
-            case 204 /* BinaryExpression */:
+            case 205 /* BinaryExpression */:
                 return ts.updateBinary(node, visitNode(node.left, visitor, ts.isExpression), visitNode(node.right, visitor, ts.isExpression), visitNode(node.operatorToken, visitor, ts.isToken));
-            case 205 /* ConditionalExpression */:
+            case 206 /* ConditionalExpression */:
                 return ts.updateConditional(node, visitNode(node.condition, visitor, ts.isExpression), visitNode(node.questionToken, visitor, ts.isToken), visitNode(node.whenTrue, visitor, ts.isExpression), visitNode(node.colonToken, visitor, ts.isToken), visitNode(node.whenFalse, visitor, ts.isExpression));
-            case 206 /* TemplateExpression */:
+            case 207 /* TemplateExpression */:
                 return ts.updateTemplateExpression(node, visitNode(node.head, visitor, ts.isTemplateHead), nodesVisitor(node.templateSpans, visitor, ts.isTemplateSpan));
-            case 207 /* YieldExpression */:
+            case 208 /* YieldExpression */:
                 return ts.updateYield(node, visitNode(node.asteriskToken, tokenVisitor, ts.isToken), visitNode(node.expression, visitor, ts.isExpression));
-            case 208 /* SpreadElement */:
+            case 209 /* SpreadElement */:
                 return ts.updateSpread(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 209 /* ClassExpression */:
+            case 210 /* ClassExpression */:
                 return ts.updateClassExpression(node, nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.heritageClauses, visitor, ts.isHeritageClause), nodesVisitor(node.members, visitor, ts.isClassElement));
-            case 211 /* ExpressionWithTypeArguments */:
+            case 212 /* ExpressionWithTypeArguments */:
                 return ts.updateExpressionWithTypeArguments(node, nodesVisitor(node.typeArguments, visitor, ts.isTypeNode), visitNode(node.expression, visitor, ts.isExpression));
-            case 212 /* AsExpression */:
+            case 213 /* AsExpression */:
                 return ts.updateAsExpression(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.type, visitor, ts.isTypeNode));
-            case 213 /* NonNullExpression */:
+            case 214 /* NonNullExpression */:
                 return ts.updateNonNullExpression(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 214 /* MetaProperty */:
+            case 215 /* MetaProperty */:
                 return ts.updateMetaProperty(node, visitNode(node.name, visitor, ts.isIdentifier));
             // Misc
-            case 216 /* TemplateSpan */:
+            case 217 /* TemplateSpan */:
                 return ts.updateTemplateSpan(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.literal, visitor, ts.isTemplateMiddleOrTemplateTail));
             // Element
-            case 218 /* Block */:
+            case 219 /* Block */:
                 return ts.updateBlock(node, nodesVisitor(node.statements, visitor, ts.isStatement));
-            case 219 /* VariableStatement */:
+            case 220 /* VariableStatement */:
                 return ts.updateVariableStatement(node, nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.declarationList, visitor, ts.isVariableDeclarationList));
-            case 221 /* ExpressionStatement */:
+            case 222 /* ExpressionStatement */:
                 return ts.updateExpressionStatement(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 222 /* IfStatement */:
+            case 223 /* IfStatement */:
                 return ts.updateIf(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.thenStatement, visitor, ts.isStatement, ts.liftToBlock), visitNode(node.elseStatement, visitor, ts.isStatement, ts.liftToBlock));
-            case 223 /* DoStatement */:
+            case 224 /* DoStatement */:
                 return ts.updateDo(node, visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock), visitNode(node.expression, visitor, ts.isExpression));
-            case 224 /* WhileStatement */:
+            case 225 /* WhileStatement */:
                 return ts.updateWhile(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock));
-            case 225 /* ForStatement */:
+            case 226 /* ForStatement */:
                 return ts.updateFor(node, visitNode(node.initializer, visitor, ts.isForInitializer), visitNode(node.condition, visitor, ts.isExpression), visitNode(node.incrementor, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock));
-            case 226 /* ForInStatement */:
+            case 227 /* ForInStatement */:
                 return ts.updateForIn(node, visitNode(node.initializer, visitor, ts.isForInitializer), visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock));
-            case 227 /* ForOfStatement */:
+            case 228 /* ForOfStatement */:
                 return ts.updateForOf(node, visitNode(node.awaitModifier, visitor, ts.isToken), visitNode(node.initializer, visitor, ts.isForInitializer), visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock));
-            case 228 /* ContinueStatement */:
+            case 229 /* ContinueStatement */:
                 return ts.updateContinue(node, visitNode(node.label, visitor, ts.isIdentifier));
-            case 229 /* BreakStatement */:
+            case 230 /* BreakStatement */:
                 return ts.updateBreak(node, visitNode(node.label, visitor, ts.isIdentifier));
-            case 230 /* ReturnStatement */:
+            case 231 /* ReturnStatement */:
                 return ts.updateReturn(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 231 /* WithStatement */:
+            case 232 /* WithStatement */:
                 return ts.updateWith(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock));
-            case 232 /* SwitchStatement */:
+            case 233 /* SwitchStatement */:
                 return ts.updateSwitch(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.caseBlock, visitor, ts.isCaseBlock));
-            case 233 /* LabeledStatement */:
+            case 234 /* LabeledStatement */:
                 return ts.updateLabel(node, visitNode(node.label, visitor, ts.isIdentifier), visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock));
-            case 234 /* ThrowStatement */:
+            case 235 /* ThrowStatement */:
                 return ts.updateThrow(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 235 /* TryStatement */:
+            case 236 /* TryStatement */:
                 return ts.updateTry(node, visitNode(node.tryBlock, visitor, ts.isBlock), visitNode(node.catchClause, visitor, ts.isCatchClause), visitNode(node.finallyBlock, visitor, ts.isBlock));
-            case 237 /* VariableDeclaration */:
+            case 238 /* VariableDeclaration */:
                 return ts.updateVariableDeclaration(node, visitNode(node.name, visitor, ts.isBindingName), visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.initializer, visitor, ts.isExpression));
-            case 238 /* VariableDeclarationList */:
+            case 239 /* VariableDeclarationList */:
                 return ts.updateVariableDeclarationList(node, nodesVisitor(node.declarations, visitor, ts.isVariableDeclaration));
-            case 239 /* FunctionDeclaration */:
+            case 240 /* FunctionDeclaration */:
                 return ts.updateFunctionDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.asteriskToken, tokenVisitor, ts.isToken), visitNode(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitNode(node.type, visitor, ts.isTypeNode), visitFunctionBody(node.body, visitor, context));
-            case 240 /* ClassDeclaration */:
+            case 241 /* ClassDeclaration */:
                 return ts.updateClassDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.heritageClauses, visitor, ts.isHeritageClause), nodesVisitor(node.members, visitor, ts.isClassElement));
-            case 241 /* InterfaceDeclaration */:
+            case 242 /* InterfaceDeclaration */:
                 return ts.updateInterfaceDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.heritageClauses, visitor, ts.isHeritageClause), nodesVisitor(node.members, visitor, ts.isTypeElement));
-            case 242 /* TypeAliasDeclaration */:
+            case 243 /* TypeAliasDeclaration */:
                 return ts.updateTypeAliasDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode));
-            case 243 /* EnumDeclaration */:
+            case 244 /* EnumDeclaration */:
                 return ts.updateEnumDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier), nodesVisitor(node.members, visitor, ts.isEnumMember));
-            case 244 /* ModuleDeclaration */:
+            case 245 /* ModuleDeclaration */:
                 return ts.updateModuleDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.body, visitor, ts.isModuleBody));
-            case 245 /* ModuleBlock */:
+            case 246 /* ModuleBlock */:
                 return ts.updateModuleBlock(node, nodesVisitor(node.statements, visitor, ts.isStatement));
-            case 246 /* CaseBlock */:
+            case 247 /* CaseBlock */:
                 return ts.updateCaseBlock(node, nodesVisitor(node.clauses, visitor, ts.isCaseOrDefaultClause));
-            case 247 /* NamespaceExportDeclaration */:
+            case 248 /* NamespaceExportDeclaration */:
                 return ts.updateNamespaceExportDeclaration(node, visitNode(node.name, visitor, ts.isIdentifier));
-            case 248 /* ImportEqualsDeclaration */:
+            case 249 /* ImportEqualsDeclaration */:
                 return ts.updateImportEqualsDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.moduleReference, visitor, ts.isModuleReference));
-            case 249 /* ImportDeclaration */:
+            case 250 /* ImportDeclaration */:
                 return ts.updateImportDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.importClause, visitor, ts.isImportClause), visitNode(node.moduleSpecifier, visitor, ts.isExpression));
-            case 250 /* ImportClause */:
+            case 251 /* ImportClause */:
                 return ts.updateImportClause(node, visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.namedBindings, visitor, ts.isNamedImportBindings));
-            case 251 /* NamespaceImport */:
+            case 252 /* NamespaceImport */:
                 return ts.updateNamespaceImport(node, visitNode(node.name, visitor, ts.isIdentifier));
-            case 252 /* NamedImports */:
+            case 253 /* NamedImports */:
                 return ts.updateNamedImports(node, nodesVisitor(node.elements, visitor, ts.isImportSpecifier));
-            case 253 /* ImportSpecifier */:
+            case 254 /* ImportSpecifier */:
                 return ts.updateImportSpecifier(node, visitNode(node.propertyName, visitor, ts.isIdentifier), visitNode(node.name, visitor, ts.isIdentifier));
-            case 254 /* ExportAssignment */:
+            case 255 /* ExportAssignment */:
                 return ts.updateExportAssignment(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.expression, visitor, ts.isExpression));
-            case 255 /* ExportDeclaration */:
+            case 256 /* ExportDeclaration */:
                 return ts.updateExportDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.exportClause, visitor, ts.isNamedExports), visitNode(node.moduleSpecifier, visitor, ts.isExpression));
-            case 256 /* NamedExports */:
+            case 257 /* NamedExports */:
                 return ts.updateNamedExports(node, nodesVisitor(node.elements, visitor, ts.isExportSpecifier));
-            case 257 /* ExportSpecifier */:
+            case 258 /* ExportSpecifier */:
                 return ts.updateExportSpecifier(node, visitNode(node.propertyName, visitor, ts.isIdentifier), visitNode(node.name, visitor, ts.isIdentifier));
             // Module references
-            case 259 /* ExternalModuleReference */:
+            case 260 /* ExternalModuleReference */:
                 return ts.updateExternalModuleReference(node, visitNode(node.expression, visitor, ts.isExpression));
             // JSX
-            case 260 /* JsxElement */:
+            case 261 /* JsxElement */:
                 return ts.updateJsxElement(node, visitNode(node.openingElement, visitor, ts.isJsxOpeningElement), nodesVisitor(node.children, visitor, ts.isJsxChild), visitNode(node.closingElement, visitor, ts.isJsxClosingElement));
-            case 261 /* JsxSelfClosingElement */:
+            case 262 /* JsxSelfClosingElement */:
                 return ts.updateJsxSelfClosingElement(node, visitNode(node.tagName, visitor, ts.isJsxTagNameExpression), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode), visitNode(node.attributes, visitor, ts.isJsxAttributes));
-            case 262 /* JsxOpeningElement */:
+            case 263 /* JsxOpeningElement */:
                 return ts.updateJsxOpeningElement(node, visitNode(node.tagName, visitor, ts.isJsxTagNameExpression), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode), visitNode(node.attributes, visitor, ts.isJsxAttributes));
-            case 263 /* JsxClosingElement */:
+            case 264 /* JsxClosingElement */:
                 return ts.updateJsxClosingElement(node, visitNode(node.tagName, visitor, ts.isJsxTagNameExpression));
-            case 264 /* JsxFragment */:
+            case 265 /* JsxFragment */:
                 return ts.updateJsxFragment(node, visitNode(node.openingFragment, visitor, ts.isJsxOpeningFragment), nodesVisitor(node.children, visitor, ts.isJsxChild), visitNode(node.closingFragment, visitor, ts.isJsxClosingFragment));
-            case 267 /* JsxAttribute */:
+            case 268 /* JsxAttribute */:
                 return ts.updateJsxAttribute(node, visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.initializer, visitor, ts.isStringLiteralOrJsxExpression));
-            case 268 /* JsxAttributes */:
+            case 269 /* JsxAttributes */:
                 return ts.updateJsxAttributes(node, nodesVisitor(node.properties, visitor, ts.isJsxAttributeLike));
-            case 269 /* JsxSpreadAttribute */:
+            case 270 /* JsxSpreadAttribute */:
                 return ts.updateJsxSpreadAttribute(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 270 /* JsxExpression */:
+            case 271 /* JsxExpression */:
                 return ts.updateJsxExpression(node, visitNode(node.expression, visitor, ts.isExpression));
             // Clauses
-            case 271 /* CaseClause */:
+            case 272 /* CaseClause */:
                 return ts.updateCaseClause(node, visitNode(node.expression, visitor, ts.isExpression), nodesVisitor(node.statements, visitor, ts.isStatement));
-            case 272 /* DefaultClause */:
+            case 273 /* DefaultClause */:
                 return ts.updateDefaultClause(node, nodesVisitor(node.statements, visitor, ts.isStatement));
-            case 273 /* HeritageClause */:
+            case 274 /* HeritageClause */:
                 return ts.updateHeritageClause(node, nodesVisitor(node.types, visitor, ts.isExpressionWithTypeArguments));
-            case 274 /* CatchClause */:
+            case 275 /* CatchClause */:
                 return ts.updateCatchClause(node, visitNode(node.variableDeclaration, visitor, ts.isVariableDeclaration), visitNode(node.block, visitor, ts.isBlock));
             // Property assignments
-            case 275 /* PropertyAssignment */:
+            case 276 /* PropertyAssignment */:
                 return ts.updatePropertyAssignment(node, visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.initializer, visitor, ts.isExpression));
-            case 276 /* ShorthandPropertyAssignment */:
+            case 277 /* ShorthandPropertyAssignment */:
                 return ts.updateShorthandPropertyAssignment(node, visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.objectAssignmentInitializer, visitor, ts.isExpression));
-            case 277 /* SpreadAssignment */:
+            case 278 /* SpreadAssignment */:
                 return ts.updateSpreadAssignment(node, visitNode(node.expression, visitor, ts.isExpression));
             // Enum
-            case 278 /* EnumMember */:
+            case 279 /* EnumMember */:
                 return ts.updateEnumMember(node, visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.initializer, visitor, ts.isExpression));
             // Top-level nodes
-            case 284 /* SourceFile */:
+            case 285 /* SourceFile */:
                 return ts.updateSourceFileNode(node, visitLexicalEnvironment(node.statements, visitor, context));
             // Transformation nodes
-            case 313 /* PartiallyEmittedExpression */:
+            case 315 /* PartiallyEmittedExpression */:
                 return ts.updatePartiallyEmittedExpression(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 314 /* CommaListExpression */:
+            case 316 /* CommaListExpression */:
                 return ts.updateCommaList(node, nodesVisitor(node.elements, visitor, ts.isExpression));
             default:
                 // No need to visit nodes with no children.
@@ -65220,58 +67396,58 @@ var ts;
         var cbNodes = cbNodeArray || cbNode;
         var kind = node.kind;
         // No need to visit nodes with no children.
-        if ((kind > 0 /* FirstToken */ && kind <= 147 /* LastToken */)) {
+        if ((kind > 0 /* FirstToken */ && kind <= 148 /* LastToken */)) {
             return initial;
         }
         // We do not yet support types.
-        if ((kind >= 163 /* TypePredicate */ && kind <= 182 /* LiteralType */)) {
+        if ((kind >= 164 /* TypePredicate */ && kind <= 183 /* LiteralType */)) {
             return initial;
         }
         var result = initial;
         switch (node.kind) {
             // Leaf nodes
-            case 217 /* SemicolonClassElement */:
-            case 220 /* EmptyStatement */:
-            case 210 /* OmittedExpression */:
-            case 236 /* DebuggerStatement */:
-            case 312 /* NotEmittedStatement */:
+            case 218 /* SemicolonClassElement */:
+            case 221 /* EmptyStatement */:
+            case 211 /* OmittedExpression */:
+            case 237 /* DebuggerStatement */:
+            case 314 /* NotEmittedStatement */:
                 // No need to visit nodes with no children.
                 break;
             // Names
-            case 148 /* QualifiedName */:
+            case 149 /* QualifiedName */:
                 result = reduceNode(node.left, cbNode, result);
                 result = reduceNode(node.right, cbNode, result);
                 break;
-            case 149 /* ComputedPropertyName */:
+            case 150 /* ComputedPropertyName */:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
             // Signature elements
-            case 151 /* Parameter */:
+            case 152 /* Parameter */:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.type, cbNode, result);
                 result = reduceNode(node.initializer, cbNode, result);
                 break;
-            case 152 /* Decorator */:
+            case 153 /* Decorator */:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
             // Type member
-            case 153 /* PropertySignature */:
+            case 154 /* PropertySignature */:
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.questionToken, cbNode, result);
                 result = reduceNode(node.type, cbNode, result);
                 result = reduceNode(node.initializer, cbNode, result);
                 break;
-            case 154 /* PropertyDeclaration */:
+            case 155 /* PropertyDeclaration */:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.type, cbNode, result);
                 result = reduceNode(node.initializer, cbNode, result);
                 break;
-            case 156 /* MethodDeclaration */:
+            case 157 /* MethodDeclaration */:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
@@ -65280,12 +67456,12 @@ var ts;
                 result = reduceNode(node.type, cbNode, result);
                 result = reduceNode(node.body, cbNode, result);
                 break;
-            case 157 /* Constructor */:
+            case 158 /* Constructor */:
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNodes(node.parameters, cbNodes, result);
                 result = reduceNode(node.body, cbNode, result);
                 break;
-            case 158 /* GetAccessor */:
+            case 159 /* GetAccessor */:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
@@ -65293,7 +67469,7 @@ var ts;
                 result = reduceNode(node.type, cbNode, result);
                 result = reduceNode(node.body, cbNode, result);
                 break;
-            case 159 /* SetAccessor */:
+            case 160 /* SetAccessor */:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
@@ -65301,50 +67477,50 @@ var ts;
                 result = reduceNode(node.body, cbNode, result);
                 break;
             // Binding patterns
-            case 184 /* ObjectBindingPattern */:
-            case 185 /* ArrayBindingPattern */:
+            case 185 /* ObjectBindingPattern */:
+            case 186 /* ArrayBindingPattern */:
                 result = reduceNodes(node.elements, cbNodes, result);
                 break;
-            case 186 /* BindingElement */:
+            case 187 /* BindingElement */:
                 result = reduceNode(node.propertyName, cbNode, result);
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.initializer, cbNode, result);
                 break;
             // Expression
-            case 187 /* ArrayLiteralExpression */:
+            case 188 /* ArrayLiteralExpression */:
                 result = reduceNodes(node.elements, cbNodes, result);
                 break;
-            case 188 /* ObjectLiteralExpression */:
+            case 189 /* ObjectLiteralExpression */:
                 result = reduceNodes(node.properties, cbNodes, result);
                 break;
-            case 189 /* PropertyAccessExpression */:
+            case 190 /* PropertyAccessExpression */:
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNode(node.name, cbNode, result);
                 break;
-            case 190 /* ElementAccessExpression */:
+            case 191 /* ElementAccessExpression */:
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNode(node.argumentExpression, cbNode, result);
                 break;
-            case 191 /* CallExpression */:
+            case 192 /* CallExpression */:
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNodes(node.typeArguments, cbNodes, result);
                 result = reduceNodes(node.arguments, cbNodes, result);
                 break;
-            case 192 /* NewExpression */:
+            case 193 /* NewExpression */:
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNodes(node.typeArguments, cbNodes, result);
                 result = reduceNodes(node.arguments, cbNodes, result);
                 break;
-            case 193 /* TaggedTemplateExpression */:
+            case 194 /* TaggedTemplateExpression */:
                 result = reduceNode(node.tag, cbNode, result);
                 result = reduceNodes(node.typeArguments, cbNodes, result);
                 result = reduceNode(node.template, cbNode, result);
                 break;
-            case 194 /* TypeAssertionExpression */:
+            case 195 /* TypeAssertionExpression */:
                 result = reduceNode(node.type, cbNode, result);
                 result = reduceNode(node.expression, cbNode, result);
                 break;
-            case 196 /* FunctionExpression */:
+            case 197 /* FunctionExpression */:
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNodes(node.typeParameters, cbNodes, result);
@@ -65352,123 +67528,123 @@ var ts;
                 result = reduceNode(node.type, cbNode, result);
                 result = reduceNode(node.body, cbNode, result);
                 break;
-            case 197 /* ArrowFunction */:
+            case 198 /* ArrowFunction */:
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNodes(node.typeParameters, cbNodes, result);
                 result = reduceNodes(node.parameters, cbNodes, result);
                 result = reduceNode(node.type, cbNode, result);
                 result = reduceNode(node.body, cbNode, result);
                 break;
-            case 195 /* ParenthesizedExpression */:
-            case 198 /* DeleteExpression */:
-            case 199 /* TypeOfExpression */:
-            case 200 /* VoidExpression */:
-            case 201 /* AwaitExpression */:
-            case 207 /* YieldExpression */:
-            case 208 /* SpreadElement */:
-            case 213 /* NonNullExpression */:
+            case 196 /* ParenthesizedExpression */:
+            case 199 /* DeleteExpression */:
+            case 200 /* TypeOfExpression */:
+            case 201 /* VoidExpression */:
+            case 202 /* AwaitExpression */:
+            case 208 /* YieldExpression */:
+            case 209 /* SpreadElement */:
+            case 214 /* NonNullExpression */:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
-            case 202 /* PrefixUnaryExpression */:
-            case 203 /* PostfixUnaryExpression */:
+            case 203 /* PrefixUnaryExpression */:
+            case 204 /* PostfixUnaryExpression */:
                 result = reduceNode(node.operand, cbNode, result);
                 break;
-            case 204 /* BinaryExpression */:
+            case 205 /* BinaryExpression */:
                 result = reduceNode(node.left, cbNode, result);
                 result = reduceNode(node.right, cbNode, result);
                 break;
-            case 205 /* ConditionalExpression */:
+            case 206 /* ConditionalExpression */:
                 result = reduceNode(node.condition, cbNode, result);
                 result = reduceNode(node.whenTrue, cbNode, result);
                 result = reduceNode(node.whenFalse, cbNode, result);
                 break;
-            case 206 /* TemplateExpression */:
+            case 207 /* TemplateExpression */:
                 result = reduceNode(node.head, cbNode, result);
                 result = reduceNodes(node.templateSpans, cbNodes, result);
                 break;
-            case 209 /* ClassExpression */:
+            case 210 /* ClassExpression */:
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNodes(node.typeParameters, cbNodes, result);
                 result = reduceNodes(node.heritageClauses, cbNodes, result);
                 result = reduceNodes(node.members, cbNodes, result);
                 break;
-            case 211 /* ExpressionWithTypeArguments */:
+            case 212 /* ExpressionWithTypeArguments */:
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNodes(node.typeArguments, cbNodes, result);
                 break;
-            case 212 /* AsExpression */:
+            case 213 /* AsExpression */:
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNode(node.type, cbNode, result);
                 break;
             // Misc
-            case 216 /* TemplateSpan */:
+            case 217 /* TemplateSpan */:
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNode(node.literal, cbNode, result);
                 break;
             // Element
-            case 218 /* Block */:
+            case 219 /* Block */:
                 result = reduceNodes(node.statements, cbNodes, result);
                 break;
-            case 219 /* VariableStatement */:
+            case 220 /* VariableStatement */:
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.declarationList, cbNode, result);
                 break;
-            case 221 /* ExpressionStatement */:
+            case 222 /* ExpressionStatement */:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
-            case 222 /* IfStatement */:
+            case 223 /* IfStatement */:
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNode(node.thenStatement, cbNode, result);
                 result = reduceNode(node.elseStatement, cbNode, result);
                 break;
-            case 223 /* DoStatement */:
+            case 224 /* DoStatement */:
                 result = reduceNode(node.statement, cbNode, result);
                 result = reduceNode(node.expression, cbNode, result);
                 break;
-            case 224 /* WhileStatement */:
-            case 231 /* WithStatement */:
+            case 225 /* WhileStatement */:
+            case 232 /* WithStatement */:
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNode(node.statement, cbNode, result);
                 break;
-            case 225 /* ForStatement */:
+            case 226 /* ForStatement */:
                 result = reduceNode(node.initializer, cbNode, result);
                 result = reduceNode(node.condition, cbNode, result);
                 result = reduceNode(node.incrementor, cbNode, result);
                 result = reduceNode(node.statement, cbNode, result);
                 break;
-            case 226 /* ForInStatement */:
-            case 227 /* ForOfStatement */:
+            case 227 /* ForInStatement */:
+            case 228 /* ForOfStatement */:
                 result = reduceNode(node.initializer, cbNode, result);
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNode(node.statement, cbNode, result);
                 break;
-            case 230 /* ReturnStatement */:
-            case 234 /* ThrowStatement */:
+            case 231 /* ReturnStatement */:
+            case 235 /* ThrowStatement */:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
-            case 232 /* SwitchStatement */:
+            case 233 /* SwitchStatement */:
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNode(node.caseBlock, cbNode, result);
                 break;
-            case 233 /* LabeledStatement */:
+            case 234 /* LabeledStatement */:
                 result = reduceNode(node.label, cbNode, result);
                 result = reduceNode(node.statement, cbNode, result);
                 break;
-            case 235 /* TryStatement */:
+            case 236 /* TryStatement */:
                 result = reduceNode(node.tryBlock, cbNode, result);
                 result = reduceNode(node.catchClause, cbNode, result);
                 result = reduceNode(node.finallyBlock, cbNode, result);
                 break;
-            case 237 /* VariableDeclaration */:
+            case 238 /* VariableDeclaration */:
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.type, cbNode, result);
                 result = reduceNode(node.initializer, cbNode, result);
                 break;
-            case 238 /* VariableDeclarationList */:
+            case 239 /* VariableDeclarationList */:
                 result = reduceNodes(node.declarations, cbNodes, result);
                 break;
-            case 239 /* FunctionDeclaration */:
+            case 240 /* FunctionDeclaration */:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
@@ -65477,7 +67653,7 @@ var ts;
                 result = reduceNode(node.type, cbNode, result);
                 result = reduceNode(node.body, cbNode, result);
                 break;
-            case 240 /* ClassDeclaration */:
+            case 241 /* ClassDeclaration */:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
@@ -65485,140 +67661,140 @@ var ts;
                 result = reduceNodes(node.heritageClauses, cbNodes, result);
                 result = reduceNodes(node.members, cbNodes, result);
                 break;
-            case 243 /* EnumDeclaration */:
+            case 244 /* EnumDeclaration */:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNodes(node.members, cbNodes, result);
                 break;
-            case 244 /* ModuleDeclaration */:
+            case 245 /* ModuleDeclaration */:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.body, cbNode, result);
                 break;
-            case 245 /* ModuleBlock */:
+            case 246 /* ModuleBlock */:
                 result = reduceNodes(node.statements, cbNodes, result);
                 break;
-            case 246 /* CaseBlock */:
+            case 247 /* CaseBlock */:
                 result = reduceNodes(node.clauses, cbNodes, result);
                 break;
-            case 248 /* ImportEqualsDeclaration */:
+            case 249 /* ImportEqualsDeclaration */:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.moduleReference, cbNode, result);
                 break;
-            case 249 /* ImportDeclaration */:
+            case 250 /* ImportDeclaration */:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.importClause, cbNode, result);
                 result = reduceNode(node.moduleSpecifier, cbNode, result);
                 break;
-            case 250 /* ImportClause */:
+            case 251 /* ImportClause */:
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.namedBindings, cbNode, result);
                 break;
-            case 251 /* NamespaceImport */:
+            case 252 /* NamespaceImport */:
                 result = reduceNode(node.name, cbNode, result);
                 break;
-            case 252 /* NamedImports */:
-            case 256 /* NamedExports */:
+            case 253 /* NamedImports */:
+            case 257 /* NamedExports */:
                 result = reduceNodes(node.elements, cbNodes, result);
                 break;
-            case 253 /* ImportSpecifier */:
-            case 257 /* ExportSpecifier */:
+            case 254 /* ImportSpecifier */:
+            case 258 /* ExportSpecifier */:
                 result = reduceNode(node.propertyName, cbNode, result);
                 result = reduceNode(node.name, cbNode, result);
                 break;
-            case 254 /* ExportAssignment */:
+            case 255 /* ExportAssignment */:
                 result = ts.reduceLeft(node.decorators, cbNode, result);
                 result = ts.reduceLeft(node.modifiers, cbNode, result);
                 result = reduceNode(node.expression, cbNode, result);
                 break;
-            case 255 /* ExportDeclaration */:
+            case 256 /* ExportDeclaration */:
                 result = ts.reduceLeft(node.decorators, cbNode, result);
                 result = ts.reduceLeft(node.modifiers, cbNode, result);
                 result = reduceNode(node.exportClause, cbNode, result);
                 result = reduceNode(node.moduleSpecifier, cbNode, result);
                 break;
             // Module references
-            case 259 /* ExternalModuleReference */:
+            case 260 /* ExternalModuleReference */:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
             // JSX
-            case 260 /* JsxElement */:
+            case 261 /* JsxElement */:
                 result = reduceNode(node.openingElement, cbNode, result);
                 result = ts.reduceLeft(node.children, cbNode, result);
                 result = reduceNode(node.closingElement, cbNode, result);
                 break;
-            case 264 /* JsxFragment */:
+            case 265 /* JsxFragment */:
                 result = reduceNode(node.openingFragment, cbNode, result);
                 result = ts.reduceLeft(node.children, cbNode, result);
                 result = reduceNode(node.closingFragment, cbNode, result);
                 break;
-            case 261 /* JsxSelfClosingElement */:
-            case 262 /* JsxOpeningElement */:
+            case 262 /* JsxSelfClosingElement */:
+            case 263 /* JsxOpeningElement */:
                 result = reduceNode(node.tagName, cbNode, result);
                 result = reduceNodes(node.typeArguments, cbNode, result);
                 result = reduceNode(node.attributes, cbNode, result);
                 break;
-            case 268 /* JsxAttributes */:
+            case 269 /* JsxAttributes */:
                 result = reduceNodes(node.properties, cbNodes, result);
                 break;
-            case 263 /* JsxClosingElement */:
+            case 264 /* JsxClosingElement */:
                 result = reduceNode(node.tagName, cbNode, result);
                 break;
-            case 267 /* JsxAttribute */:
+            case 268 /* JsxAttribute */:
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.initializer, cbNode, result);
                 break;
-            case 269 /* JsxSpreadAttribute */:
+            case 270 /* JsxSpreadAttribute */:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
-            case 270 /* JsxExpression */:
+            case 271 /* JsxExpression */:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
             // Clauses
-            case 271 /* CaseClause */:
+            case 272 /* CaseClause */:
                 result = reduceNode(node.expression, cbNode, result);
             // falls through
-            case 272 /* DefaultClause */:
+            case 273 /* DefaultClause */:
                 result = reduceNodes(node.statements, cbNodes, result);
                 break;
-            case 273 /* HeritageClause */:
+            case 274 /* HeritageClause */:
                 result = reduceNodes(node.types, cbNodes, result);
                 break;
-            case 274 /* CatchClause */:
+            case 275 /* CatchClause */:
                 result = reduceNode(node.variableDeclaration, cbNode, result);
                 result = reduceNode(node.block, cbNode, result);
                 break;
             // Property assignments
-            case 275 /* PropertyAssignment */:
+            case 276 /* PropertyAssignment */:
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.initializer, cbNode, result);
                 break;
-            case 276 /* ShorthandPropertyAssignment */:
+            case 277 /* ShorthandPropertyAssignment */:
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.objectAssignmentInitializer, cbNode, result);
                 break;
-            case 277 /* SpreadAssignment */:
+            case 278 /* SpreadAssignment */:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
             // Enum
-            case 278 /* EnumMember */:
+            case 279 /* EnumMember */:
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.initializer, cbNode, result);
                 break;
             // Top-level nodes
-            case 284 /* SourceFile */:
+            case 285 /* SourceFile */:
                 result = reduceNodes(node.statements, cbNodes, result);
                 break;
             // Transformation nodes
-            case 313 /* PartiallyEmittedExpression */:
+            case 315 /* PartiallyEmittedExpression */:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
-            case 314 /* CommaListExpression */:
+            case 316 /* CommaListExpression */:
                 result = reduceNodes(node.elements, cbNodes, result);
                 break;
             default:
@@ -65642,7 +67818,7 @@ var ts;
      * @param nodes The NodeArray.
      */
     function liftToBlock(nodes) {
-        Debug.assert(ts.every(nodes, ts.isStatement), "Cannot lift nodes to a Block.");
+        ts.Debug.assert(ts.every(nodes, ts.isStatement), "Cannot lift nodes to a Block.");
         return ts.singleOrUndefined(nodes) || ts.createBlock(nodes);
     }
     ts.liftToBlock = liftToBlock;
@@ -65691,7 +67867,7 @@ var ts;
     function aggregateTransformFlagsForSubtree(node) {
         // We do not transform ambient declarations or types, so there is no need to
         // recursively aggregate transform flags.
-        if (ts.hasModifier(node, 2 /* Ambient */) || (ts.isTypeNode(node) && node.kind !== 211 /* ExpressionWithTypeArguments */)) {
+        if (ts.hasModifier(node, 2 /* Ambient */) || (ts.isTypeNode(node) && node.kind !== 212 /* ExpressionWithTypeArguments */)) {
             return 0 /* None */;
         }
         // Aggregate the transform flags of each child.
@@ -65707,73 +67883,6 @@ var ts;
     function aggregateTransformFlagsForChildNodes(transformFlags, nodes) {
         return transformFlags | aggregateTransformFlagsForNodeArray(nodes);
     }
-    var Debug;
-    (function (Debug) {
-        var isDebugInfoEnabled = false;
-        function failBadSyntaxKind(node, message) {
-            return Debug.fail((message || "Unexpected node.") + "\r\nNode " + ts.formatSyntaxKind(node.kind) + " was unexpected.", failBadSyntaxKind);
-        }
-        Debug.failBadSyntaxKind = failBadSyntaxKind;
-        Debug.assertEachNode = Debug.shouldAssert(1 /* Normal */)
-            ? function (nodes, test, message) { return Debug.assert(test === undefined || ts.every(nodes, test), message || "Unexpected node.", function () { return "Node array did not pass test '" + Debug.getFunctionName(test) + "'."; }, Debug.assertEachNode); }
-            : ts.noop;
-        Debug.assertNode = Debug.shouldAssert(1 /* Normal */)
-            ? function (node, test, message) { return Debug.assert(test === undefined || test(node), message || "Unexpected node.", function () { return "Node " + ts.formatSyntaxKind(node.kind) + " did not pass test '" + Debug.getFunctionName(test) + "'."; }, Debug.assertNode); }
-            : ts.noop;
-        Debug.assertOptionalNode = Debug.shouldAssert(1 /* Normal */)
-            ? function (node, test, message) { return Debug.assert(test === undefined || node === undefined || test(node), message || "Unexpected node.", function () { return "Node " + ts.formatSyntaxKind(node.kind) + " did not pass test '" + Debug.getFunctionName(test) + "'."; }, Debug.assertOptionalNode); }
-            : ts.noop;
-        Debug.assertOptionalToken = Debug.shouldAssert(1 /* Normal */)
-            ? function (node, kind, message) { return Debug.assert(kind === undefined || node === undefined || node.kind === kind, message || "Unexpected node.", function () { return "Node " + ts.formatSyntaxKind(node.kind) + " was not a '" + ts.formatSyntaxKind(kind) + "' token."; }, Debug.assertOptionalToken); }
-            : ts.noop;
-        Debug.assertMissingNode = Debug.shouldAssert(1 /* Normal */)
-            ? function (node, message) { return Debug.assert(node === undefined, message || "Unexpected node.", function () { return "Node " + ts.formatSyntaxKind(node.kind) + " was unexpected'."; }, Debug.assertMissingNode); }
-            : ts.noop;
-        /**
-         * Injects debug information into frequently used types.
-         */
-        function enableDebugInfo() {
-            if (isDebugInfoEnabled)
-                return;
-            // Add additional properties in debug mode to assist with debugging.
-            Object.defineProperties(ts.objectAllocator.getSymbolConstructor().prototype, {
-                __debugFlags: { get: function () { return ts.formatSymbolFlags(this.flags); } }
-            });
-            Object.defineProperties(ts.objectAllocator.getTypeConstructor().prototype, {
-                __debugFlags: { get: function () { return ts.formatTypeFlags(this.flags); } },
-                __debugObjectFlags: { get: function () { return this.flags & 524288 /* Object */ ? ts.formatObjectFlags(this.objectFlags) : ""; } },
-                __debugTypeToString: { value: function () { return this.checker.typeToString(this); } },
-            });
-            var nodeConstructors = [
-                ts.objectAllocator.getNodeConstructor(),
-                ts.objectAllocator.getIdentifierConstructor(),
-                ts.objectAllocator.getTokenConstructor(),
-                ts.objectAllocator.getSourceFileConstructor()
-            ];
-            for (var _i = 0, nodeConstructors_1 = nodeConstructors; _i < nodeConstructors_1.length; _i++) {
-                var ctor = nodeConstructors_1[_i];
-                if (!ctor.prototype.hasOwnProperty("__debugKind")) {
-                    Object.defineProperties(ctor.prototype, {
-                        __debugKind: { get: function () { return ts.formatSyntaxKind(this.kind); } },
-                        __debugModifierFlags: { get: function () { return ts.formatModifierFlags(ts.getModifierFlagsNoCache(this)); } },
-                        __debugTransformFlags: { get: function () { return ts.formatTransformFlags(this.transformFlags); } },
-                        __debugEmitFlags: { get: function () { return ts.formatEmitFlags(ts.getEmitFlags(this)); } },
-                        __debugGetText: {
-                            value: function (includeTrivia) {
-                                if (ts.nodeIsSynthesized(this))
-                                    return "";
-                                var parseNode = ts.getParseTreeNode(this);
-                                var sourceFile = parseNode && ts.getSourceFileOfNode(parseNode);
-                                return sourceFile ? ts.getSourceTextOfNodeFromSourceFile(sourceFile, parseNode, includeTrivia) : "";
-                            }
-                        }
-                    });
-                }
-            }
-            isDebugInfoEnabled = true;
-        }
-        Debug.enableDebugInfo = enableDebugInfo;
-    })(Debug = ts.Debug || (ts.Debug = {}));
 })(ts || (ts = {}));
 /* @internal */
 var ts;
@@ -65900,7 +68009,6 @@ var ts;
             exit();
         }
         function appendSourceMap(generatedLine, generatedCharacter, map, sourceMapPath, start, end) {
-            var _a;
             ts.Debug.assert(generatedLine >= pendingGeneratedLine, "generatedLine cannot backtrack");
             ts.Debug.assert(generatedCharacter >= 0, "generatedCharacter cannot be negative");
             enter();
@@ -65908,7 +68016,8 @@ var ts;
             var sourceIndexToNewSourceIndexMap = [];
             var nameIndexToNewNameIndexMap;
             var mappingIterator = decodeMappings(map.mappings);
-            for (var _b = mappingIterator.next(), raw = _b.value, done = _b.done; !done; _a = mappingIterator.next(), raw = _a.value, done = _a.done, _a) {
+            for (var iterResult = mappingIterator.next(); !iterResult.done; iterResult = mappingIterator.next()) {
+                var raw = iterResult.value;
                 if (end && (raw.generatedLine > end.line ||
                     (raw.generatedLine === end.line && raw.generatedCharacter > end.character))) {
                     break;
@@ -66431,7 +68540,7 @@ var ts;
     function chainBundle(transformSourceFile) {
         return transformSourceFileOrBundle;
         function transformSourceFileOrBundle(node) {
-            return node.kind === 284 /* SourceFile */ ? transformSourceFile(node) : transformBundle(node);
+            return node.kind === 285 /* SourceFile */ ? transformSourceFile(node) : transformBundle(node);
         }
         function transformBundle(node) {
             return ts.createBundle(ts.map(node.sourceFiles, transformSourceFile), node.prepends);
@@ -66477,7 +68586,7 @@ var ts;
         for (var _i = 0, _a = sourceFile.statements; _i < _a.length; _i++) {
             var node = _a[_i];
             switch (node.kind) {
-                case 249 /* ImportDeclaration */:
+                case 250 /* ImportDeclaration */:
                     // import "mod"
                     // import x from "mod"
                     // import * as x from "mod"
@@ -66485,13 +68594,13 @@ var ts;
                     externalImports.push(node);
                     hasImportStarOrImportDefault = hasImportStarOrImportDefault || getImportNeedsImportStarHelper(node) || getImportNeedsImportDefaultHelper(node);
                     break;
-                case 248 /* ImportEqualsDeclaration */:
-                    if (node.moduleReference.kind === 259 /* ExternalModuleReference */) {
+                case 249 /* ImportEqualsDeclaration */:
+                    if (node.moduleReference.kind === 260 /* ExternalModuleReference */) {
                         // import x = require("mod")
                         externalImports.push(node);
                     }
                     break;
-                case 255 /* ExportDeclaration */:
+                case 256 /* ExportDeclaration */:
                     if (node.moduleSpecifier) {
                         if (!node.exportClause) {
                             // export * from "mod"
@@ -66521,13 +68630,13 @@ var ts;
                         }
                     }
                     break;
-                case 254 /* ExportAssignment */:
+                case 255 /* ExportAssignment */:
                     if (node.isExportEquals && !exportEquals) {
                         // export = x
                         exportEquals = node;
                     }
                     break;
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     if (ts.hasModifier(node, 1 /* Export */)) {
                         for (var _d = 0, _e = node.declarationList.declarations; _d < _e.length; _d++) {
                             var decl = _e[_d];
@@ -66535,7 +68644,7 @@ var ts;
                         }
                     }
                     break;
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     if (ts.hasModifier(node, 1 /* Export */)) {
                         if (ts.hasModifier(node, 512 /* Default */)) {
                             // export default function() { }
@@ -66555,7 +68664,7 @@ var ts;
                         }
                     }
                     break;
-                case 240 /* ClassDeclaration */:
+                case 241 /* ClassDeclaration */:
                     if (ts.hasModifier(node, 1 /* Export */)) {
                         if (ts.hasModifier(node, 512 /* Default */)) {
                             // export default class { }
@@ -66629,6 +68738,43 @@ var ts;
             ts.isIdentifier(expression);
     }
     ts.isSimpleCopiableExpression = isSimpleCopiableExpression;
+    /**
+     * A simple inlinable expression is an expression which can be copied into multiple locations
+     * without risk of repeating any sideeffects and whose value could not possibly change between
+     * any such locations
+     */
+    function isSimpleInlineableExpression(expression) {
+        return !ts.isIdentifier(expression) && isSimpleCopiableExpression(expression) ||
+            ts.isWellKnownSymbolSyntactically(expression);
+    }
+    ts.isSimpleInlineableExpression = isSimpleInlineableExpression;
+    /**
+     * Adds super call and preceding prologue directives into the list of statements.
+     *
+     * @param ctor The constructor node.
+     * @param result The list of statements.
+     * @param visitor The visitor to apply to each node added to the result array.
+     * @returns index of the statement that follows super call
+     */
+    function addPrologueDirectivesAndInitialSuperCall(ctor, result, visitor) {
+        if (ctor.body) {
+            var statements = ctor.body.statements;
+            // add prologue directives to the list (if any)
+            var index = ts.addPrologue(result, statements, /*ensureUseStrict*/ false, visitor);
+            if (index === statements.length) {
+                // list contains nothing but prologue directives (or empty) - exit
+                return index;
+            }
+            var statement = statements[index];
+            if (statement.kind === 222 /* ExpressionStatement */ && ts.isSuperCall(statement.expression)) {
+                result.push(ts.visitNode(statement, visitor, ts.isStatement));
+                return index + 1;
+            }
+            return index;
+        }
+        return 0;
+    }
+    ts.addPrologueDirectivesAndInitialSuperCall = addPrologueDirectivesAndInitialSuperCall;
     /**
      * @param input Template string input strings
      * @param args Names which need to be made file-level unique
@@ -66649,6 +68795,45 @@ var ts;
         };
     }
     ts.helperString = helperString;
+    /**
+     * Gets all property declarations with initializers on either the static or instance side of a class.
+     *
+     * @param node The class node.
+     * @param isStatic A value indicating whether to get properties from the static or instance side of the class.
+     */
+    function getInitializedProperties(node, isStatic) {
+        return ts.filter(node.members, isStatic ? isStaticInitializedProperty : isInstanceInitializedProperty);
+    }
+    ts.getInitializedProperties = getInitializedProperties;
+    /**
+     * Gets a value indicating whether a class element is a static property declaration with an initializer.
+     *
+     * @param member The class element node.
+     */
+    function isStaticInitializedProperty(member) {
+        return isInitializedProperty(member) && ts.hasStaticModifier(member);
+    }
+    ts.isStaticInitializedProperty = isStaticInitializedProperty;
+    /**
+     * Gets a value indicating whether a class element is an instance property declaration with an initializer.
+     *
+     * @param member The class element node.
+     */
+    function isInstanceInitializedProperty(member) {
+        return isInitializedProperty(member) && !ts.hasStaticModifier(member);
+    }
+    ts.isInstanceInitializedProperty = isInstanceInitializedProperty;
+    /**
+     * Gets a value indicating whether a class element is either a static or an instance property declaration with an initializer.
+     *
+     * @param member The class element node.
+     * @param isStatic A value indicating whether the member should be a static or instance member.
+     */
+    function isInitializedProperty(member) {
+        return member.kind === 155 /* PropertyDeclaration */
+            && member.initializer !== undefined;
+    }
+    ts.isInitializedProperty = isInitializedProperty;
 })(ts || (ts = {}));
 /*@internal*/
 var ts;
@@ -67095,7 +69280,7 @@ var ts;
     ts.restHelper = {
         name: "typescript:rest",
         scoped: false,
-        text: "\n            var __rest = (this && this.__rest) || function (s, e) {\n                var t = {};\n                for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)\n                    t[p] = s[p];\n                if (s != null && typeof Object.getOwnPropertySymbols === \"function\")\n                    for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)\n                        t[p[i]] = s[p[i]];\n                return t;\n            };"
+        text: "\n            var __rest = (this && this.__rest) || function (s, e) {\n                var t = {};\n                for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)\n                    t[p] = s[p];\n                if (s != null && typeof Object.getOwnPropertySymbols === \"function\")\n                    for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {\n                        if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))\n                            t[p[i]] = s[p[i]];\n                    }\n                return t;\n            };"
     };
     /** Given value: o, propName: p, pattern: { a, b, ...p } from the original statement
      * `{ a, b, ...p } = o`, create `p = __rest(o, ["a", "b"]);`
@@ -67171,8 +69356,8 @@ var ts;
         context.onEmitNode = onEmitNode;
         context.onSubstituteNode = onSubstituteNode;
         // Enable substitution for property/element access to emit const enum values.
-        context.enableSubstitution(189 /* PropertyAccessExpression */);
-        context.enableSubstitution(190 /* ElementAccessExpression */);
+        context.enableSubstitution(190 /* PropertyAccessExpression */);
+        context.enableSubstitution(191 /* ElementAccessExpression */);
         // These variables contain state that changes as we descend into the tree.
         var currentSourceFile;
         var currentNamespace;
@@ -67180,6 +69365,7 @@ var ts;
         var currentLexicalScope;
         var currentNameScope;
         var currentScopeFirstDeclarationsOfName;
+        var currentClassHasParameterProperties;
         /**
          * Keeps track of whether expression substitution has been enabled for specific edge cases.
          * They are persisted between each SourceFile transformation and should not be reset.
@@ -67195,21 +69381,16 @@ var ts;
          * just-in-time substitution while printing an expression identifier.
          */
         var applicableSubstitutions;
-        /**
-         * Tracks what computed name expressions originating from elided names must be inlined
-         * at the next execution site, in document order
-         */
-        var pendingExpressions;
         return transformSourceFileOrBundle;
         function transformSourceFileOrBundle(node) {
-            if (node.kind === 285 /* Bundle */) {
+            if (node.kind === 286 /* Bundle */) {
                 return transformBundle(node);
             }
             return transformSourceFile(node);
         }
         function transformBundle(node) {
             return ts.createBundle(node.sourceFiles.map(transformSourceFile), ts.mapDefined(node.prepends, function (prepend) {
-                if (prepend.kind === 287 /* InputFiles */) {
+                if (prepend.kind === 288 /* InputFiles */) {
                     return ts.createUnparsedSourceFile(prepend, "js");
                 }
                 return prepend;
@@ -67240,6 +69421,7 @@ var ts;
             var savedCurrentScope = currentLexicalScope;
             var savedCurrentNameScope = currentNameScope;
             var savedCurrentScopeFirstDeclarationsOfName = currentScopeFirstDeclarationsOfName;
+            var savedCurrentClassHasParameterProperties = currentClassHasParameterProperties;
             // Handle state changes before visiting a node.
             onBeforeVisitNode(node);
             var visited = f(node);
@@ -67249,6 +69431,7 @@ var ts;
             }
             currentLexicalScope = savedCurrentScope;
             currentNameScope = savedCurrentNameScope;
+            currentClassHasParameterProperties = savedCurrentClassHasParameterProperties;
             return visited;
         }
         /**
@@ -67258,16 +69441,16 @@ var ts;
          */
         function onBeforeVisitNode(node) {
             switch (node.kind) {
-                case 284 /* SourceFile */:
-                case 246 /* CaseBlock */:
-                case 245 /* ModuleBlock */:
-                case 218 /* Block */:
+                case 285 /* SourceFile */:
+                case 247 /* CaseBlock */:
+                case 246 /* ModuleBlock */:
+                case 219 /* Block */:
                     currentLexicalScope = node;
                     currentNameScope = undefined;
                     currentScopeFirstDeclarationsOfName = undefined;
                     break;
-                case 240 /* ClassDeclaration */:
-                case 239 /* FunctionDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     if (ts.hasModifier(node, 2 /* Ambient */)) {
                         break;
                     }
@@ -67279,7 +69462,7 @@ var ts;
                         // These nodes should always have names unless they are default-exports;
                         // however, class declaration parsing allows for undefined names, so syntactically invalid
                         // programs may also have an undefined name.
-                        ts.Debug.assert(node.kind === 240 /* ClassDeclaration */ || ts.hasModifier(node, 512 /* Default */));
+                        ts.Debug.assert(node.kind === 241 /* ClassDeclaration */ || ts.hasModifier(node, 512 /* Default */));
                     }
                     if (ts.isClassDeclaration(node)) {
                         // XXX: should probably also cover interfaces and type aliases that can have type variables?
@@ -67322,10 +69505,10 @@ var ts;
          */
         function sourceElementVisitorWorker(node) {
             switch (node.kind) {
-                case 249 /* ImportDeclaration */:
-                case 248 /* ImportEqualsDeclaration */:
-                case 254 /* ExportAssignment */:
-                case 255 /* ExportDeclaration */:
+                case 250 /* ImportDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
+                case 255 /* ExportAssignment */:
+                case 256 /* ExportDeclaration */:
                     return visitEllidableStatement(node);
                 default:
                     return visitorWorker(node);
@@ -67346,13 +69529,13 @@ var ts;
                 return node;
             }
             switch (node.kind) {
-                case 249 /* ImportDeclaration */:
+                case 250 /* ImportDeclaration */:
                     return visitImportDeclaration(node);
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return visitImportEqualsDeclaration(node);
-                case 254 /* ExportAssignment */:
+                case 255 /* ExportAssignment */:
                     return visitExportAssignment(node);
-                case 255 /* ExportDeclaration */:
+                case 256 /* ExportDeclaration */:
                     return visitExportDeclaration(node);
                 default:
                     ts.Debug.fail("Unhandled ellided statement");
@@ -67372,11 +69555,11 @@ var ts;
          * @param node The node to visit.
          */
         function namespaceElementVisitorWorker(node) {
-            if (node.kind === 255 /* ExportDeclaration */ ||
-                node.kind === 249 /* ImportDeclaration */ ||
-                node.kind === 250 /* ImportClause */ ||
-                (node.kind === 248 /* ImportEqualsDeclaration */ &&
-                    node.moduleReference.kind === 259 /* ExternalModuleReference */)) {
+            if (node.kind === 256 /* ExportDeclaration */ ||
+                node.kind === 250 /* ImportDeclaration */ ||
+                node.kind === 251 /* ImportClause */ ||
+                (node.kind === 249 /* ImportEqualsDeclaration */ &&
+                    node.moduleReference.kind === 260 /* ExternalModuleReference */)) {
                 // do not emit ES6 imports and exports since they are illegal inside a namespace
                 return undefined;
             }
@@ -67400,19 +69583,19 @@ var ts;
          */
         function classElementVisitorWorker(node) {
             switch (node.kind) {
-                case 157 /* Constructor */:
-                    // TypeScript constructors are transformed in `visitClassDeclaration`.
-                    // We elide them here as `visitorWorker` checks transform flags, which could
-                    // erronously include an ES6 constructor without TypeScript syntax.
-                    return undefined;
-                case 154 /* PropertyDeclaration */:
-                case 162 /* IndexSignature */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
-                case 156 /* MethodDeclaration */:
+                case 158 /* Constructor */:
+                    return visitConstructor(node);
+                case 155 /* PropertyDeclaration */:
+                    // Property declarations are not TypeScript syntax, but they must be visited
+                    // for the decorator transformation.
+                    return visitPropertyDeclaration(node);
+                case 163 /* IndexSignature */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
+                case 157 /* MethodDeclaration */:
                     // Fallback to the default visit behavior.
                     return visitorWorker(node);
-                case 217 /* SemicolonClassElement */:
+                case 218 /* SemicolonClassElement */:
                     return node;
                 default:
                     return ts.Debug.failBadSyntaxKind(node);
@@ -67422,7 +69605,7 @@ var ts;
             if (ts.modifierToFlag(node.kind) & 2270 /* TypeScriptModifier */) {
                 return undefined;
             }
-            else if (currentNamespace && node.kind === 85 /* ExportKeyword */) {
+            else if (currentNamespace && node.kind === 86 /* ExportKeyword */) {
                 return undefined;
             }
             return node;
@@ -67439,117 +69622,115 @@ var ts;
                 return ts.createNotEmittedStatement(node);
             }
             switch (node.kind) {
-                case 85 /* ExportKeyword */:
-                case 80 /* DefaultKeyword */:
+                case 86 /* ExportKeyword */:
+                case 81 /* DefaultKeyword */:
                     // ES6 export and default modifiers are elided when inside a namespace.
                     return currentNamespace ? undefined : node;
-                case 115 /* PublicKeyword */:
-                case 113 /* PrivateKeyword */:
-                case 114 /* ProtectedKeyword */:
-                case 118 /* AbstractKeyword */:
-                case 77 /* ConstKeyword */:
-                case 125 /* DeclareKeyword */:
-                case 133 /* ReadonlyKeyword */:
+                case 116 /* PublicKeyword */:
+                case 114 /* PrivateKeyword */:
+                case 115 /* ProtectedKeyword */:
+                case 119 /* AbstractKeyword */:
+                case 78 /* ConstKeyword */:
+                case 126 /* DeclareKeyword */:
+                case 134 /* ReadonlyKeyword */:
                 // TypeScript accessibility and readonly modifiers are elided.
-                case 169 /* ArrayType */:
-                case 170 /* TupleType */:
-                case 171 /* OptionalType */:
-                case 172 /* RestType */:
-                case 168 /* TypeLiteral */:
-                case 163 /* TypePredicate */:
-                case 150 /* TypeParameter */:
-                case 120 /* AnyKeyword */:
-                case 143 /* UnknownKeyword */:
-                case 123 /* BooleanKeyword */:
-                case 138 /* StringKeyword */:
-                case 135 /* NumberKeyword */:
-                case 132 /* NeverKeyword */:
-                case 106 /* VoidKeyword */:
-                case 139 /* SymbolKeyword */:
-                case 166 /* ConstructorType */:
-                case 165 /* FunctionType */:
-                case 167 /* TypeQuery */:
-                case 164 /* TypeReference */:
-                case 173 /* UnionType */:
-                case 174 /* IntersectionType */:
-                case 175 /* ConditionalType */:
-                case 177 /* ParenthesizedType */:
-                case 178 /* ThisType */:
-                case 179 /* TypeOperator */:
-                case 180 /* IndexedAccessType */:
-                case 181 /* MappedType */:
-                case 182 /* LiteralType */:
+                case 170 /* ArrayType */:
+                case 171 /* TupleType */:
+                case 172 /* OptionalType */:
+                case 173 /* RestType */:
+                case 169 /* TypeLiteral */:
+                case 164 /* TypePredicate */:
+                case 151 /* TypeParameter */:
+                case 121 /* AnyKeyword */:
+                case 144 /* UnknownKeyword */:
+                case 124 /* BooleanKeyword */:
+                case 139 /* StringKeyword */:
+                case 136 /* NumberKeyword */:
+                case 133 /* NeverKeyword */:
+                case 107 /* VoidKeyword */:
+                case 140 /* SymbolKeyword */:
+                case 167 /* ConstructorType */:
+                case 166 /* FunctionType */:
+                case 168 /* TypeQuery */:
+                case 165 /* TypeReference */:
+                case 174 /* UnionType */:
+                case 175 /* IntersectionType */:
+                case 176 /* ConditionalType */:
+                case 178 /* ParenthesizedType */:
+                case 179 /* ThisType */:
+                case 180 /* TypeOperator */:
+                case 181 /* IndexedAccessType */:
+                case 182 /* MappedType */:
+                case 183 /* LiteralType */:
                 // TypeScript type nodes are elided.
-                case 162 /* IndexSignature */:
+                case 163 /* IndexSignature */:
                 // TypeScript index signatures are elided.
-                case 152 /* Decorator */:
+                case 153 /* Decorator */:
                 // TypeScript decorators are elided. They will be emitted as part of visitClassDeclaration.
-                case 242 /* TypeAliasDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
                     // TypeScript type-only declarations are elided.
                     return undefined;
-                case 154 /* PropertyDeclaration */:
+                case 155 /* PropertyDeclaration */:
                     // TypeScript property declarations are elided. However their names are still visited, and can potentially be retained if they could have sideeffects
                     return visitPropertyDeclaration(node);
-                case 247 /* NamespaceExportDeclaration */:
+                case 248 /* NamespaceExportDeclaration */:
                     // TypeScript namespace export declarations are elided.
                     return undefined;
-                case 157 /* Constructor */:
+                case 158 /* Constructor */:
                     return visitConstructor(node);
-                case 241 /* InterfaceDeclaration */:
+                case 242 /* InterfaceDeclaration */:
                     // TypeScript interfaces are elided, but some comments may be preserved.
                     // See the implementation of `getLeadingComments` in comments.ts for more details.
                     return ts.createNotEmittedStatement(node);
-                case 240 /* ClassDeclaration */:
+                case 241 /* ClassDeclaration */:
                     // This may be a class declaration with TypeScript syntax extensions.
                     //
                     // TypeScript class syntax extensions include:
                     // - decorators
                     // - optional `implements` heritage clause
                     // - parameter property assignments in the constructor
-                    // - property declarations
                     // - index signatures
                     // - method overload signatures
                     return visitClassDeclaration(node);
-                case 209 /* ClassExpression */:
+                case 210 /* ClassExpression */:
                     // This may be a class expression with TypeScript syntax extensions.
                     //
                     // TypeScript class syntax extensions include:
                     // - decorators
                     // - optional `implements` heritage clause
                     // - parameter property assignments in the constructor
-                    // - property declarations
                     // - index signatures
                     // - method overload signatures
                     return visitClassExpression(node);
-                case 273 /* HeritageClause */:
+                case 274 /* HeritageClause */:
                     // This may be a heritage clause with TypeScript syntax extensions.
                     //
                     // TypeScript heritage clause extensions include:
                     // - `implements` clause
                     return visitHeritageClause(node);
-                case 211 /* ExpressionWithTypeArguments */:
+                case 212 /* ExpressionWithTypeArguments */:
                     // TypeScript supports type arguments on an expression in an `extends` heritage clause.
                     return visitExpressionWithTypeArguments(node);
-                case 156 /* MethodDeclaration */:
+                case 157 /* MethodDeclaration */:
                     // TypeScript method declarations may have decorators, modifiers
                     // or type annotations.
                     return visitMethodDeclaration(node);
-                case 158 /* GetAccessor */:
+                case 159 /* GetAccessor */:
                     // Get Accessors can have TypeScript modifiers, decorators, and type annotations.
                     return visitGetAccessor(node);
-                case 159 /* SetAccessor */:
+                case 160 /* SetAccessor */:
                     // Set Accessors can have TypeScript modifiers and type annotations.
                     return visitSetAccessor(node);
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     // Typescript function declarations can have modifiers, decorators, and type annotations.
                     return visitFunctionDeclaration(node);
-                case 196 /* FunctionExpression */:
+                case 197 /* FunctionExpression */:
                     // TypeScript function expressions can have modifiers and type annotations.
                     return visitFunctionExpression(node);
-                case 197 /* ArrowFunction */:
+                case 198 /* ArrowFunction */:
                     // TypeScript arrow functions can have modifiers and type annotations.
                     return visitArrowFunction(node);
-                case 151 /* Parameter */:
+                case 152 /* Parameter */:
                     // This may be a parameter declaration with TypeScript syntax extensions.
                     //
                     // TypeScript parameter declaration syntax extensions include:
@@ -67559,35 +69740,35 @@ var ts;
                     // - type annotations
                     // - this parameters
                     return visitParameter(node);
-                case 195 /* ParenthesizedExpression */:
+                case 196 /* ParenthesizedExpression */:
                     // ParenthesizedExpressions are TypeScript if their expression is a
                     // TypeAssertion or AsExpression
                     return visitParenthesizedExpression(node);
-                case 194 /* TypeAssertionExpression */:
-                case 212 /* AsExpression */:
+                case 195 /* TypeAssertionExpression */:
+                case 213 /* AsExpression */:
                     // TypeScript type assertions are removed, but their subtrees are preserved.
                     return visitAssertionExpression(node);
-                case 191 /* CallExpression */:
+                case 192 /* CallExpression */:
                     return visitCallExpression(node);
-                case 192 /* NewExpression */:
+                case 193 /* NewExpression */:
                     return visitNewExpression(node);
-                case 193 /* TaggedTemplateExpression */:
+                case 194 /* TaggedTemplateExpression */:
                     return visitTaggedTemplateExpression(node);
-                case 213 /* NonNullExpression */:
+                case 214 /* NonNullExpression */:
                     // TypeScript non-null expressions are removed, but their subtrees are preserved.
                     return visitNonNullExpression(node);
-                case 243 /* EnumDeclaration */:
+                case 244 /* EnumDeclaration */:
                     // TypeScript enum declarations do not exist in ES6 and must be rewritten.
                     return visitEnumDeclaration(node);
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     // TypeScript namespace exports for variable statements must be transformed.
                     return visitVariableStatement(node);
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     return visitVariableDeclaration(node);
-                case 244 /* ModuleDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     // TypeScript namespace declarations must be transformed.
                     return visitModuleDeclaration(node);
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     // TypeScript namespace or external module import.
                     return visitImportEqualsDeclaration(node);
                 default:
@@ -67625,7 +69806,7 @@ var ts;
             if (ts.some(staticProperties))
                 facts |= 1 /* HasStaticInitializedProperties */;
             var extendsClauseElement = ts.getEffectiveBaseTypeNode(node);
-            if (extendsClauseElement && ts.skipOuterExpressions(extendsClauseElement.expression).kind !== 96 /* NullKeyword */)
+            if (extendsClauseElement && ts.skipOuterExpressions(extendsClauseElement.expression).kind !== 97 /* NullKeyword */)
                 facts |= 64 /* IsDerivedClass */;
             if (shouldEmitDecorateCallForClass(node))
                 facts |= 2 /* HasConstructorDecorators */;
@@ -67654,31 +69835,16 @@ var ts;
             if (!isClassLikeDeclarationWithTypeScriptSyntax(node) && !(currentNamespace && ts.hasModifier(node, 1 /* Export */))) {
                 return ts.visitEachChild(node, visitor, context);
             }
-            var savedPendingExpressions = pendingExpressions;
-            pendingExpressions = undefined;
-            var staticProperties = getInitializedProperties(node, /*isStatic*/ true);
+            var staticProperties = ts.getInitializedProperties(node, /*isStatic*/ true);
             var facts = getClassFacts(node, staticProperties);
             if (facts & 128 /* UseImmediatelyInvokedFunctionExpression */) {
                 context.startLexicalEnvironment();
             }
             var name = node.name || (facts & 5 /* NeedsName */ ? ts.getGeneratedNameForNode(node) : undefined);
             var classStatement = facts & 2 /* HasConstructorDecorators */
-                ? createClassDeclarationHeadWithDecorators(node, name, facts)
+                ? createClassDeclarationHeadWithDecorators(node, name)
                 : createClassDeclarationHeadWithoutDecorators(node, name, facts);
             var statements = [classStatement];
-            // Write any pending expressions from elided or moved computed property names
-            if (ts.some(pendingExpressions)) {
-                statements.push(ts.createExpressionStatement(ts.inlineExpressions(pendingExpressions)));
-            }
-            pendingExpressions = savedPendingExpressions;
-            // Emit static property assignment. Because classDeclaration is lexically evaluated,
-            // it is safe to emit static property assignment after classDeclaration
-            // From ES6 specification:
-            //      HasLexicalDeclaration (N) : Determines if the argument identifier has a binding in this environment record that was created using
-            //                                  a lexical declaration such as a LexicalDeclaration or a ClassDeclaration.
-            if (facts & 1 /* HasStaticInitializedProperties */) {
-                addInitializedPropertyStatements(statements, staticProperties, facts & 128 /* UseImmediatelyInvokedFunctionExpression */ ? ts.getInternalName(node) : ts.getLocalName(node));
-            }
             // Write any decorators of the node.
             addClassElementDecorationStatements(statements, node, /*isStatic*/ false);
             addClassElementDecorationStatements(statements, node, /*isStatic*/ true);
@@ -67758,13 +69924,14 @@ var ts;
                 : undefined;
             var classDeclaration = ts.createClassDeclaration(
             /*decorators*/ undefined, modifiers, name, 
-            /*typeParameters*/ undefined, ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), transformClassMembers(node, (facts & 64 /* IsDerivedClass */) !== 0));
+            /*typeParameters*/ undefined, ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), transformClassMembers(node));
             // To better align with the old emitter, we should not emit a trailing source map
             // entry if the class has static properties.
             var emitFlags = ts.getEmitFlags(node);
             if (facts & 1 /* HasStaticInitializedProperties */) {
                 emitFlags |= 32 /* NoTrailingSourceMap */;
             }
+            ts.aggregateTransformFlags(classDeclaration);
             ts.setTextRange(classDeclaration, node);
             ts.setOriginalNode(classDeclaration, node);
             ts.setEmitFlags(classDeclaration, emitFlags);
@@ -67774,7 +69941,7 @@ var ts;
          * Transforms a decorated class declaration and appends the resulting statements. If
          * the class requires an alias to avoid issues with double-binding, the alias is returned.
          */
-        function createClassDeclarationHeadWithDecorators(node, name, facts) {
+        function createClassDeclarationHeadWithDecorators(node, name) {
             // When we emit an ES6 class that has a class decorator, we must tailor the
             // emit to certain specific cases.
             //
@@ -67867,8 +70034,9 @@ var ts;
             //      ${members}
             //  }
             var heritageClauses = ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause);
-            var members = transformClassMembers(node, (facts & 64 /* IsDerivedClass */) !== 0);
+            var members = transformClassMembers(node);
             var classExpression = ts.createClassExpression(/*modifiers*/ undefined, name, /*typeParameters*/ undefined, heritageClauses, members);
+            ts.aggregateTransformFlags(classExpression);
             ts.setOriginalNode(classExpression, node);
             ts.setTextRange(classExpression, location);
             //  let ${name} = ${classExpression} where name is either declaredName if the class doesn't contain self-reference
@@ -67887,311 +70055,40 @@ var ts;
             if (!isClassLikeDeclarationWithTypeScriptSyntax(node)) {
                 return ts.visitEachChild(node, visitor, context);
             }
-            var savedPendingExpressions = pendingExpressions;
-            pendingExpressions = undefined;
-            var staticProperties = getInitializedProperties(node, /*isStatic*/ true);
-            var heritageClauses = ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause);
-            var members = transformClassMembers(node, ts.some(heritageClauses, function (c) { return c.token === 86 /* ExtendsKeyword */; }));
             var classExpression = ts.createClassExpression(
             /*modifiers*/ undefined, node.name, 
-            /*typeParameters*/ undefined, heritageClauses, members);
+            /*typeParameters*/ undefined, ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), transformClassMembers(node));
+            ts.aggregateTransformFlags(classExpression);
             ts.setOriginalNode(classExpression, node);
             ts.setTextRange(classExpression, node);
-            if (ts.some(staticProperties) || ts.some(pendingExpressions)) {
-                var expressions = [];
-                var isClassWithConstructorReference = resolver.getNodeCheckFlags(node) & 16777216 /* ClassWithConstructorReference */;
-                var temp = ts.createTempVariable(hoistVariableDeclaration, !!isClassWithConstructorReference);
-                if (isClassWithConstructorReference) {
-                    // record an alias as the class name is not in scope for statics.
-                    enableSubstitutionForClassAliases();
-                    var alias = ts.getSynthesizedClone(temp);
-                    alias.autoGenerateFlags &= ~8 /* ReservedInNestedScopes */;
-                    classAliases[ts.getOriginalNodeId(node)] = alias;
-                }
-                // To preserve the behavior of the old emitter, we explicitly indent
-                // the body of a class with static initializers.
-                ts.setEmitFlags(classExpression, 65536 /* Indented */ | ts.getEmitFlags(classExpression));
-                expressions.push(ts.startOnNewLine(ts.createAssignment(temp, classExpression)));
-                // Add any pending expressions leftover from elided or relocated computed property names
-                ts.addRange(expressions, ts.map(pendingExpressions, ts.startOnNewLine));
-                pendingExpressions = savedPendingExpressions;
-                ts.addRange(expressions, generateInitializedPropertyExpressions(staticProperties, temp));
-                expressions.push(ts.startOnNewLine(temp));
-                return ts.inlineExpressions(expressions);
-            }
-            pendingExpressions = savedPendingExpressions;
             return classExpression;
         }
         /**
          * Transforms the members of a class.
          *
          * @param node The current class.
-         * @param isDerivedClass A value indicating whether the class has an extends clause that does not extend 'null'.
          */
-        function transformClassMembers(node, isDerivedClass) {
+        function transformClassMembers(node) {
             var members = [];
-            var constructor = transformConstructor(node, isDerivedClass);
-            if (constructor) {
-                members.push(constructor);
+            var constructor = ts.getFirstConstructorWithBody(node);
+            var parametersWithPropertyAssignments = constructor &&
+                ts.filter(constructor.parameters, ts.isParameterPropertyDeclaration);
+            if (parametersWithPropertyAssignments) {
+                for (var _i = 0, parametersWithPropertyAssignments_1 = parametersWithPropertyAssignments; _i < parametersWithPropertyAssignments_1.length; _i++) {
+                    var parameter = parametersWithPropertyAssignments_1[_i];
+                    if (ts.isIdentifier(parameter.name)) {
+                        members.push(ts.aggregateTransformFlags(ts.createProperty(
+                        /*decorators*/ undefined, 
+                        /*modifiers*/ undefined, parameter.name, 
+                        /*questionOrExclamationToken*/ undefined, 
+                        /*type*/ undefined, 
+                        /*initializer*/ undefined)));
+                    }
+                }
             }
             ts.addRange(members, ts.visitNodes(node.members, classElementVisitor, ts.isClassElement));
             return ts.setTextRange(ts.createNodeArray(members), /*location*/ node.members);
         }
-        /**
-         * Transforms (or creates) a constructor for a class.
-         *
-         * @param node The current class.
-         * @param isDerivedClass A value indicating whether the class has an extends clause that does not extend 'null'.
-         */
-        function transformConstructor(node, isDerivedClass) {
-            // Check if we have property assignment inside class declaration.
-            // If there is a property assignment, we need to emit constructor whether users define it or not
-            // If there is no property assignment, we can omit constructor if users do not define it
-            var constructor = ts.getFirstConstructorWithBody(node);
-            var hasInstancePropertyWithInitializer = ts.forEach(node.members, isInstanceInitializedProperty);
-            var hasParameterPropertyAssignments = constructor &&
-                constructor.transformFlags & 1024 /* ContainsTypeScriptClassSyntax */ &&
-                ts.forEach(constructor.parameters, isParameterWithPropertyAssignment);
-            // If the class does not contain nodes that require a synthesized constructor,
-            // accept the current constructor if it exists.
-            if (!hasInstancePropertyWithInitializer && !hasParameterPropertyAssignments) {
-                return ts.visitEachChild(constructor, visitor, context);
-            }
-            var parameters = transformConstructorParameters(constructor);
-            var body = transformConstructorBody(node, constructor, isDerivedClass);
-            //  constructor(${parameters}) {
-            //      ${body}
-            //  }
-            return ts.startOnNewLine(ts.setOriginalNode(ts.setTextRange(ts.createConstructor(
-            /*decorators*/ undefined, 
-            /*modifiers*/ undefined, parameters, body), constructor || node), constructor));
-        }
-        /**
-         * Transforms (or creates) the parameters for the constructor of a class with
-         * parameter property assignments or instance property initializers.
-         *
-         * @param constructor The constructor declaration.
-         */
-        function transformConstructorParameters(constructor) {
-            // The ES2015 spec specifies in 14.5.14. Runtime Semantics: ClassDefinitionEvaluation:
-            // If constructor is empty, then
-            //     If ClassHeritag_eopt is present and protoParent is not null, then
-            //          Let constructor be the result of parsing the source text
-            //              constructor(...args) { super (...args);}
-            //          using the syntactic grammar with the goal symbol MethodDefinition[~Yield].
-            //      Else,
-            //           Let constructor be the result of parsing the source text
-            //               constructor( ){ }
-            //           using the syntactic grammar with the goal symbol MethodDefinition[~Yield].
-            //
-            // While we could emit the '...args' rest parameter, certain later tools in the pipeline might
-            // downlevel the '...args' portion less efficiently by naively copying the contents of 'arguments' to an array.
-            // Instead, we'll avoid using a rest parameter and spread into the super call as
-            // 'super(...arguments)' instead of 'super(...args)', as you can see in "transformConstructorBody".
-            return ts.visitParameterList(constructor && constructor.parameters, visitor, context)
-                || [];
-        }
-        /**
-         * Transforms (or creates) a constructor body for a class with parameter property
-         * assignments or instance property initializers.
-         *
-         * @param node The current class.
-         * @param constructor The current class constructor.
-         * @param isDerivedClass A value indicating whether the class has an extends clause that does not extend 'null'.
-         */
-        function transformConstructorBody(node, constructor, isDerivedClass) {
-            var statements = [];
-            var indexOfFirstStatement = 0;
-            resumeLexicalEnvironment();
-            if (constructor) {
-                indexOfFirstStatement = addPrologueDirectivesAndInitialSuperCall(constructor, statements);
-                // Add parameters with property assignments. Transforms this:
-                //
-                //  constructor (public x, public y) {
-                //  }
-                //
-                // Into this:
-                //
-                //  constructor (x, y) {
-                //      this.x = x;
-                //      this.y = y;
-                //  }
-                //
-                var propertyAssignments = getParametersWithPropertyAssignments(constructor);
-                ts.addRange(statements, ts.map(propertyAssignments, transformParameterWithPropertyAssignment));
-            }
-            else if (isDerivedClass) {
-                // Add a synthetic `super` call:
-                //
-                //  super(...arguments);
-                //
-                statements.push(ts.createExpressionStatement(ts.createCall(ts.createSuper(), 
-                /*typeArguments*/ undefined, [ts.createSpread(ts.createIdentifier("arguments"))])));
-            }
-            // Add the property initializers. Transforms this:
-            //
-            //  public x = 1;
-            //
-            // Into this:
-            //
-            //  constructor() {
-            //      this.x = 1;
-            //  }
-            //
-            var properties = getInitializedProperties(node, /*isStatic*/ false);
-            addInitializedPropertyStatements(statements, properties, ts.createThis());
-            if (constructor) {
-                // The class already had a constructor, so we should add the existing statements, skipping the initial super call.
-                ts.addRange(statements, ts.visitNodes(constructor.body.statements, visitor, ts.isStatement, indexOfFirstStatement));
-            }
-            // End the lexical environment.
-            statements = ts.mergeLexicalEnvironment(statements, endLexicalEnvironment());
-            return ts.setTextRange(ts.createBlock(ts.setTextRange(ts.createNodeArray(statements), 
-            /*location*/ constructor ? constructor.body.statements : node.members), 
-            /*multiLine*/ true), 
-            /*location*/ constructor ? constructor.body : undefined);
-        }
-        /**
-         * Adds super call and preceding prologue directives into the list of statements.
-         *
-         * @param ctor The constructor node.
-         * @returns index of the statement that follows super call
-         */
-        function addPrologueDirectivesAndInitialSuperCall(ctor, result) {
-            if (ctor.body) {
-                var statements = ctor.body.statements;
-                // add prologue directives to the list (if any)
-                var index = ts.addPrologue(result, statements, /*ensureUseStrict*/ false, visitor);
-                if (index === statements.length) {
-                    // list contains nothing but prologue directives (or empty) - exit
-                    return index;
-                }
-                var statement = statements[index];
-                if (statement.kind === 221 /* ExpressionStatement */ && ts.isSuperCall(statement.expression)) {
-                    result.push(ts.visitNode(statement, visitor, ts.isStatement));
-                    return index + 1;
-                }
-                return index;
-            }
-            return 0;
-        }
-        /**
-         * Gets all parameters of a constructor that should be transformed into property assignments.
-         *
-         * @param node The constructor node.
-         */
-        function getParametersWithPropertyAssignments(node) {
-            return ts.filter(node.parameters, isParameterWithPropertyAssignment);
-        }
-        /**
-         * Determines whether a parameter should be transformed into a property assignment.
-         *
-         * @param parameter The parameter node.
-         */
-        function isParameterWithPropertyAssignment(parameter) {
-            return ts.hasModifier(parameter, 92 /* ParameterPropertyModifier */)
-                && ts.isIdentifier(parameter.name);
-        }
-        /**
-         * Transforms a parameter into a property assignment statement.
-         *
-         * @param node The parameter declaration.
-         */
-        function transformParameterWithPropertyAssignment(node) {
-            ts.Debug.assert(ts.isIdentifier(node.name));
-            var name = node.name;
-            var propertyName = ts.getMutableClone(name);
-            ts.setEmitFlags(propertyName, 1536 /* NoComments */ | 48 /* NoSourceMap */);
-            var localName = ts.getMutableClone(name);
-            ts.setEmitFlags(localName, 1536 /* NoComments */);
-            return ts.startOnNewLine(ts.setEmitFlags(ts.setTextRange(ts.createExpressionStatement(ts.createAssignment(ts.setTextRange(ts.createPropertyAccess(ts.createThis(), propertyName), node.name), localName)), ts.moveRangePos(node, -1)), 1536 /* NoComments */));
-        }
-        /**
-         * Gets all property declarations with initializers on either the static or instance side of a class.
-         *
-         * @param node The class node.
-         * @param isStatic A value indicating whether to get properties from the static or instance side of the class.
-         */
-        function getInitializedProperties(node, isStatic) {
-            return ts.filter(node.members, isStatic ? isStaticInitializedProperty : isInstanceInitializedProperty);
-        }
-        /**
-         * Gets a value indicating whether a class element is a static property declaration with an initializer.
-         *
-         * @param member The class element node.
-         */
-        function isStaticInitializedProperty(member) {
-            return isInitializedProperty(member, /*isStatic*/ true);
-        }
-        /**
-         * Gets a value indicating whether a class element is an instance property declaration with an initializer.
-         *
-         * @param member The class element node.
-         */
-        function isInstanceInitializedProperty(member) {
-            return isInitializedProperty(member, /*isStatic*/ false);
-        }
-        /**
-         * Gets a value indicating whether a class element is either a static or an instance property declaration with an initializer.
-         *
-         * @param member The class element node.
-         * @param isStatic A value indicating whether the member should be a static or instance member.
-         */
-        function isInitializedProperty(member, isStatic) {
-            return member.kind === 154 /* PropertyDeclaration */
-                && isStatic === ts.hasModifier(member, 32 /* Static */)
-                && member.initializer !== undefined;
-        }
-        /**
-         * Generates assignment statements for property initializers.
-         *
-         * @param properties An array of property declarations to transform.
-         * @param receiver The receiver on which each property should be assigned.
-         */
-        function addInitializedPropertyStatements(statements, properties, receiver) {
-            for (var _i = 0, properties_9 = properties; _i < properties_9.length; _i++) {
-                var property = properties_9[_i];
-                var statement = ts.createExpressionStatement(transformInitializedProperty(property, receiver));
-                ts.setSourceMapRange(statement, ts.moveRangePastModifiers(property));
-                ts.setCommentRange(statement, property);
-                ts.setOriginalNode(statement, property);
-                statements.push(statement);
-            }
-        }
-        /**
-         * Generates assignment expressions for property initializers.
-         *
-         * @param properties An array of property declarations to transform.
-         * @param receiver The receiver on which each property should be assigned.
-         */
-        function generateInitializedPropertyExpressions(properties, receiver) {
-            var expressions = [];
-            for (var _i = 0, properties_10 = properties; _i < properties_10.length; _i++) {
-                var property = properties_10[_i];
-                var expression = transformInitializedProperty(property, receiver);
-                ts.startOnNewLine(expression);
-                ts.setSourceMapRange(expression, ts.moveRangePastModifiers(property));
-                ts.setCommentRange(expression, property);
-                ts.setOriginalNode(expression, property);
-                expressions.push(expression);
-            }
-            return expressions;
-        }
-        /**
-         * Transforms a property initializer into an assignment statement.
-         *
-         * @param property The property declaration.
-         * @param receiver The object receiving the property assignment.
-         */
-        function transformInitializedProperty(property, receiver) {
-            // We generate a name here in order to reuse the value cached by the relocated computed name expression (which uses the same generated name)
-            var propertyName = ts.isComputedPropertyName(property.name) && !isSimpleInlineableExpression(property.name.expression)
-                ? ts.updateComputedPropertyName(property.name, ts.getGeneratedNameForNode(property.name))
-                : property.name;
-            var initializer = ts.visitNode(property.initializer, visitor, ts.isExpression);
-            var memberAccess = ts.createMemberAccessForPropertyName(receiver, propertyName, /*location*/ propertyName);
-            return ts.createAssignment(memberAccess, initializer);
-        }
         /**
          * Gets either the static or instance members of a class that are decorated, or have
          * parameters that are decorated.
@@ -68241,11 +70138,14 @@ var ts;
             var decorators;
             if (node) {
                 var parameters = node.parameters;
-                for (var i = 0; i < parameters.length; i++) {
-                    var parameter = parameters[i];
+                var firstParameterIsThis = parameters.length > 0 && ts.parameterIsThisKeyword(parameters[0]);
+                var firstParameterOffset = firstParameterIsThis ? 1 : 0;
+                var numParameters = firstParameterIsThis ? parameters.length - 1 : parameters.length;
+                for (var i = 0; i < numParameters; i++) {
+                    var parameter = parameters[i + firstParameterOffset];
                     if (decorators || parameter.decorators) {
                         if (!decorators) {
-                            decorators = new Array(parameters.length);
+                            decorators = new Array(numParameters);
                         }
                         decorators[i] = parameter.decorators;
                     }
@@ -68278,12 +70178,12 @@ var ts;
          */
         function getAllDecoratorsOfClassElement(node, member) {
             switch (member.kind) {
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     return getAllDecoratorsOfAccessors(node, member);
-                case 156 /* MethodDeclaration */:
+                case 157 /* MethodDeclaration */:
                     return getAllDecoratorsOfMethod(member);
-                case 154 /* PropertyDeclaration */:
+                case 155 /* PropertyDeclaration */:
                     return getAllDecoratorsOfProperty(member);
                 default:
                     return undefined;
@@ -68436,7 +70336,7 @@ var ts;
             var prefix = getClassMemberPrefix(node, member);
             var memberName = getExpressionForPropertyName(member, /*generateNameForComputedPropertyName*/ true);
             var descriptor = languageVersion > 0 /* ES3 */
-                ? member.kind === 154 /* PropertyDeclaration */
+                ? member.kind === 155 /* PropertyDeclaration */
                     // We emit `void 0` here to indicate to `__decorate` that it can invoke `Object.defineProperty` directly, but that it
                     // should not invoke `Object.getOwnPropertyDescriptor`.
                     ? ts.createVoidZero()
@@ -68559,10 +70459,10 @@ var ts;
          */
         function shouldAddTypeMetadata(node) {
             var kind = node.kind;
-            return kind === 156 /* MethodDeclaration */
-                || kind === 158 /* GetAccessor */
-                || kind === 159 /* SetAccessor */
-                || kind === 154 /* PropertyDeclaration */;
+            return kind === 157 /* MethodDeclaration */
+                || kind === 159 /* GetAccessor */
+                || kind === 160 /* SetAccessor */
+                || kind === 155 /* PropertyDeclaration */;
         }
         /**
          * Determines whether to emit the "design:returntype" metadata based on the node's kind.
@@ -68572,7 +70472,7 @@ var ts;
          * @param node The node to test.
          */
         function shouldAddReturnTypeMetadata(node) {
-            return node.kind === 156 /* MethodDeclaration */;
+            return node.kind === 157 /* MethodDeclaration */;
         }
         /**
          * Determines whether to emit the "design:paramtypes" metadata based on the node's kind.
@@ -68583,12 +70483,12 @@ var ts;
          */
         function shouldAddParamTypesMetadata(node) {
             switch (node.kind) {
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
                     return ts.getFirstConstructorWithBody(node) !== undefined;
-                case 156 /* MethodDeclaration */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 157 /* MethodDeclaration */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     return true;
             }
             return false;
@@ -68605,15 +70505,15 @@ var ts;
          */
         function serializeTypeOfNode(node) {
             switch (node.kind) {
-                case 154 /* PropertyDeclaration */:
-                case 151 /* Parameter */:
+                case 155 /* PropertyDeclaration */:
+                case 152 /* Parameter */:
                     return serializeTypeNode(node.type);
-                case 159 /* SetAccessor */:
-                case 158 /* GetAccessor */:
+                case 160 /* SetAccessor */:
+                case 159 /* GetAccessor */:
                     return serializeTypeNode(getAccessorTypeNode(node));
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
-                case 156 /* MethodDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
+                case 157 /* MethodDeclaration */:
                     return ts.createIdentifier("Function");
                 default:
                     return ts.createVoidZero();
@@ -68650,7 +70550,7 @@ var ts;
             return ts.createArrayLiteral(expressions);
         }
         function getParametersOfDecoratedDeclaration(node, container) {
-            if (container && node.kind === 158 /* GetAccessor */) {
+            if (container && node.kind === 159 /* GetAccessor */) {
                 var setAccessor = ts.getAllAccessorDeclarations(container.members, node).setAccessor;
                 if (setAccessor) {
                     return setAccessor.parameters;
@@ -68695,69 +70595,69 @@ var ts;
                 return ts.createIdentifier("Object");
             }
             switch (node.kind) {
-                case 106 /* VoidKeyword */:
-                case 141 /* UndefinedKeyword */:
-                case 96 /* NullKeyword */:
-                case 132 /* NeverKeyword */:
+                case 107 /* VoidKeyword */:
+                case 142 /* UndefinedKeyword */:
+                case 97 /* NullKeyword */:
+                case 133 /* NeverKeyword */:
                     return ts.createVoidZero();
-                case 177 /* ParenthesizedType */:
+                case 178 /* ParenthesizedType */:
                     return serializeTypeNode(node.type);
-                case 165 /* FunctionType */:
-                case 166 /* ConstructorType */:
+                case 166 /* FunctionType */:
+                case 167 /* ConstructorType */:
                     return ts.createIdentifier("Function");
-                case 169 /* ArrayType */:
-                case 170 /* TupleType */:
+                case 170 /* ArrayType */:
+                case 171 /* TupleType */:
                     return ts.createIdentifier("Array");
-                case 163 /* TypePredicate */:
-                case 123 /* BooleanKeyword */:
+                case 164 /* TypePredicate */:
+                case 124 /* BooleanKeyword */:
                     return ts.createIdentifier("Boolean");
-                case 138 /* StringKeyword */:
+                case 139 /* StringKeyword */:
                     return ts.createIdentifier("String");
-                case 136 /* ObjectKeyword */:
+                case 137 /* ObjectKeyword */:
                     return ts.createIdentifier("Object");
-                case 182 /* LiteralType */:
+                case 183 /* LiteralType */:
                     switch (node.literal.kind) {
                         case 10 /* StringLiteral */:
                             return ts.createIdentifier("String");
-                        case 202 /* PrefixUnaryExpression */:
+                        case 203 /* PrefixUnaryExpression */:
                         case 8 /* NumericLiteral */:
                             return ts.createIdentifier("Number");
                         case 9 /* BigIntLiteral */:
                             return getGlobalBigIntNameWithFallback();
-                        case 102 /* TrueKeyword */:
-                        case 87 /* FalseKeyword */:
+                        case 103 /* TrueKeyword */:
+                        case 88 /* FalseKeyword */:
                             return ts.createIdentifier("Boolean");
                         default:
                             return ts.Debug.failBadSyntaxKind(node.literal);
                     }
-                case 135 /* NumberKeyword */:
+                case 136 /* NumberKeyword */:
                     return ts.createIdentifier("Number");
-                case 146 /* BigIntKeyword */:
+                case 147 /* BigIntKeyword */:
                     return getGlobalBigIntNameWithFallback();
-                case 139 /* SymbolKeyword */:
+                case 140 /* SymbolKeyword */:
                     return languageVersion < 2 /* ES2015 */
                         ? getGlobalSymbolNameWithFallback()
                         : ts.createIdentifier("Symbol");
-                case 164 /* TypeReference */:
+                case 165 /* TypeReference */:
                     return serializeTypeReferenceNode(node);
-                case 174 /* IntersectionType */:
-                case 173 /* UnionType */:
+                case 175 /* IntersectionType */:
+                case 174 /* UnionType */:
                     return serializeTypeList(node.types);
-                case 175 /* ConditionalType */:
+                case 176 /* ConditionalType */:
                     return serializeTypeList([node.trueType, node.falseType]);
-                case 179 /* TypeOperator */:
-                    if (node.operator === 133 /* ReadonlyKeyword */) {
+                case 180 /* TypeOperator */:
+                    if (node.operator === 134 /* ReadonlyKeyword */) {
                         return serializeTypeNode(node.type);
                     }
                     break;
-                case 167 /* TypeQuery */:
-                case 180 /* IndexedAccessType */:
-                case 181 /* MappedType */:
-                case 168 /* TypeLiteral */:
-                case 120 /* AnyKeyword */:
-                case 143 /* UnknownKeyword */:
-                case 178 /* ThisType */:
-                case 183 /* ImportType */:
+                case 168 /* TypeQuery */:
+                case 181 /* IndexedAccessType */:
+                case 182 /* MappedType */:
+                case 169 /* TypeLiteral */:
+                case 121 /* AnyKeyword */:
+                case 144 /* UnknownKeyword */:
+                case 179 /* ThisType */:
+                case 184 /* ImportType */:
                     break;
                 default:
                     return ts.Debug.failBadSyntaxKind(node);
@@ -68770,13 +70670,13 @@ var ts;
             var serializedUnion;
             for (var _i = 0, types_18 = types; _i < types_18.length; _i++) {
                 var typeNode = types_18[_i];
-                while (typeNode.kind === 177 /* ParenthesizedType */) {
+                while (typeNode.kind === 178 /* ParenthesizedType */) {
                     typeNode = typeNode.type; // Skip parens if need be
                 }
-                if (typeNode.kind === 132 /* NeverKeyword */) {
+                if (typeNode.kind === 133 /* NeverKeyword */) {
                     continue; // Always elide `never` from the union/intersection if possible
                 }
-                if (!strictNullChecks && (typeNode.kind === 96 /* NullKeyword */ || typeNode.kind === 141 /* UndefinedKeyword */)) {
+                if (!strictNullChecks && (typeNode.kind === 97 /* NullKeyword */ || typeNode.kind === 142 /* UndefinedKeyword */)) {
                     continue; // Elide null and undefined from unions for metadata, just like what we did prior to the implementation of strict null checks
                 }
                 var serializedIndividual = serializeTypeNode(typeNode);
@@ -68856,12 +70756,12 @@ var ts;
          * @param node The entity name to serialize.
          */
         function serializeEntityNameAsExpressionFallback(node) {
-            if (node.kind === 72 /* Identifier */) {
+            if (node.kind === 73 /* Identifier */) {
                 // A -> typeof A !== undefined && A
                 var copied = serializeEntityNameAsExpression(node);
                 return createCheckedValue(copied, copied);
             }
-            if (node.left.kind === 72 /* Identifier */) {
+            if (node.left.kind === 73 /* Identifier */) {
                 // A.B -> typeof A !== undefined && A.B
                 return createCheckedValue(serializeEntityNameAsExpression(node.left), serializeEntityNameAsExpression(node));
             }
@@ -68877,7 +70777,7 @@ var ts;
          */
         function serializeEntityNameAsExpression(node) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     // Create a clone of the name with a new parent, and treat it as if it were
                     // a source tree node for the purposes of the checker.
                     var name = ts.getMutableClone(node);
@@ -68885,7 +70785,7 @@ var ts;
                     name.original = undefined;
                     name.parent = ts.getParseTreeNode(currentLexicalScope); // ensure the parent is set to a parse tree node.
                     return name;
-                case 148 /* QualifiedName */:
+                case 149 /* QualifiedName */:
                     return serializeQualifiedNameAsExpression(node);
             }
         }
@@ -68911,19 +70811,10 @@ var ts;
          * available.
          */
         function getGlobalBigIntNameWithFallback() {
-            return languageVersion < 7 /* ESNext */
+            return languageVersion < 99 /* ESNext */
                 ? ts.createConditional(ts.createTypeCheck(ts.createIdentifier("BigInt"), "function"), ts.createIdentifier("BigInt"), ts.createIdentifier("Object"))
                 : ts.createIdentifier("BigInt");
         }
-        /**
-         * A simple inlinable expression is an expression which can be copied into multiple locations
-         * without risk of repeating any sideeffects and whose value could not possibly change between
-         * any such locations
-         */
-        function isSimpleInlineableExpression(expression) {
-            return !ts.isIdentifier(expression) && ts.isSimpleCopiableExpression(expression) ||
-                ts.isWellKnownSymbolSyntactically(expression);
-        }
         /**
          * Gets an expression that represents a property name. For a computed property, a
          * name is generated for the node.
@@ -68933,7 +70824,7 @@ var ts;
         function getExpressionForPropertyName(member, generateNameForComputedPropertyName) {
             var name = member.name;
             if (ts.isComputedPropertyName(name)) {
-                return generateNameForComputedPropertyName && !isSimpleInlineableExpression(name.expression)
+                return generateNameForComputedPropertyName && !ts.isSimpleInlineableExpression(name.expression)
                     ? ts.getGeneratedNameForNode(name)
                     : name.expression;
             }
@@ -68944,25 +70835,6 @@ var ts;
                 return ts.getSynthesizedClone(name);
             }
         }
-        /**
-         * If the name is a computed property, this function transforms it, then either returns an expression which caches the
-         * value of the result or the expression itself if the value is either unused or safe to inline into multiple locations
-         * @param shouldHoist Does the expression need to be reused? (ie, for an initializer or a decorator)
-         * @param omitSimple Should expressions with no observable side-effects be elided? (ie, the expression is not hoisted for a decorator or initializer and is a literal)
-         */
-        function getPropertyNameExpressionIfNeeded(name, shouldHoist, omitSimple) {
-            if (ts.isComputedPropertyName(name)) {
-                var expression = ts.visitNode(name.expression, visitor, ts.isExpression);
-                var innerExpression = ts.skipPartiallyEmittedExpressions(expression);
-                var inlinable = isSimpleInlineableExpression(innerExpression);
-                if (!inlinable && shouldHoist) {
-                    var generatedName = ts.getGeneratedNameForNode(name);
-                    hoistVariableDeclaration(generatedName);
-                    return ts.createAssignment(generatedName, expression);
-                }
-                return (omitSimple && (inlinable || ts.isIdentifier(innerExpression))) ? undefined : expression;
-            }
-        }
         /**
          * Visits the property name of a class element, for use when emitting property
          * initializers. For a computed property on a node with decorators, a temporary
@@ -68972,18 +70844,20 @@ var ts;
          */
         function visitPropertyNameOfClassElement(member) {
             var name = member.name;
-            var expr = getPropertyNameExpressionIfNeeded(name, ts.some(member.decorators), /*omitSimple*/ false);
-            if (expr) { // expr only exists if `name` is a computed property name
-                // Inline any pending expressions from previous elided or relocated computed property name expressions in order to preserve execution order
-                if (ts.some(pendingExpressions)) {
-                    expr = ts.inlineExpressions(pendingExpressions.concat([expr]));
-                    pendingExpressions.length = 0;
+            // Computed property names need to be transformed into a hoisted variable when they are used more than once.
+            // The names are used more than once when:
+            //   - the property is non-static and its initializer is moved to the constructor (when there are parameter property assignments).
+            //   - the property has a decorator.
+            if (ts.isComputedPropertyName(name) && ((!ts.hasStaticModifier(member) && currentClassHasParameterProperties) || ts.some(member.decorators))) {
+                var expression = ts.visitNode(name.expression, visitor, ts.isExpression);
+                var innerExpression = ts.skipPartiallyEmittedExpressions(expression);
+                if (!ts.isSimpleInlineableExpression(innerExpression)) {
+                    var generatedName = ts.getGeneratedNameForNode(name);
+                    hoistVariableDeclaration(generatedName);
+                    return ts.updateComputedPropertyName(name, ts.createAssignment(generatedName, expression));
                 }
-                return ts.updateComputedPropertyName(name, expr);
-            }
-            else {
-                return name;
             }
+            return ts.visitNode(name, visitor, ts.isPropertyName);
         }
         /**
          * Transforms a HeritageClause with TypeScript syntax.
@@ -68995,7 +70869,7 @@ var ts;
          * @param node The HeritageClause to transform.
          */
         function visitHeritageClause(node) {
-            if (node.token === 109 /* ImplementsKeyword */) {
+            if (node.token === 110 /* ImplementsKeyword */) {
                 // implements clauses are elided
                 return undefined;
             }
@@ -69023,17 +70897,73 @@ var ts;
             return !ts.nodeIsMissing(node.body);
         }
         function visitPropertyDeclaration(node) {
-            var expr = getPropertyNameExpressionIfNeeded(node.name, ts.some(node.decorators) || !!node.initializer, /*omitSimple*/ true);
-            if (expr && !isSimpleInlineableExpression(expr)) {
-                (pendingExpressions || (pendingExpressions = [])).push(expr);
+            var updated = ts.updateProperty(node, 
+            /*decorators*/ undefined, ts.visitNodes(node.modifiers, visitor, ts.isModifier), visitPropertyNameOfClassElement(node), 
+            /*questionOrExclamationToken*/ undefined, 
+            /*type*/ undefined, ts.visitNode(node.initializer, visitor));
+            if (updated !== node) {
+                // While we emit the source map for the node after skipping decorators and modifiers,
+                // we need to emit the comments for the original range.
+                ts.setCommentRange(updated, node);
+                ts.setSourceMapRange(updated, ts.moveRangePastDecorators(node));
             }
-            return undefined;
+            return updated;
         }
         function visitConstructor(node) {
             if (!shouldEmitFunctionLikeDeclaration(node)) {
                 return undefined;
             }
-            return ts.updateConstructor(node, ts.visitNodes(node.decorators, visitor, ts.isDecorator), ts.visitNodes(node.modifiers, visitor, ts.isModifier), ts.visitParameterList(node.parameters, visitor, context), ts.visitFunctionBody(node.body, visitor, context));
+            return ts.updateConstructor(node, 
+            /*decorators*/ undefined, 
+            /*modifiers*/ undefined, ts.visitParameterList(node.parameters, visitor, context), transformConstructorBody(node.body, node));
+        }
+        function transformConstructorBody(body, constructor) {
+            var parametersWithPropertyAssignments = constructor &&
+                ts.filter(constructor.parameters, ts.isParameterPropertyDeclaration);
+            if (!ts.some(parametersWithPropertyAssignments)) {
+                return ts.visitFunctionBody(body, visitor, context);
+            }
+            var statements = [];
+            var indexOfFirstStatement = 0;
+            resumeLexicalEnvironment();
+            indexOfFirstStatement = ts.addPrologueDirectivesAndInitialSuperCall(constructor, statements, visitor);
+            // Add parameters with property assignments. Transforms this:
+            //
+            //  constructor (public x, public y) {
+            //  }
+            //
+            // Into this:
+            //
+            //  constructor (x, y) {
+            //      this.x = x;
+            //      this.y = y;
+            //  }
+            //
+            ts.addRange(statements, ts.map(parametersWithPropertyAssignments, transformParameterWithPropertyAssignment));
+            // Add the existing statements, skipping the initial super call.
+            ts.addRange(statements, ts.visitNodes(body.statements, visitor, ts.isStatement, indexOfFirstStatement));
+            // End the lexical environment.
+            statements = ts.mergeLexicalEnvironment(statements, endLexicalEnvironment());
+            var block = ts.createBlock(ts.setTextRange(ts.createNodeArray(statements), body.statements), /*multiLine*/ true);
+            ts.setTextRange(block, /*location*/ body);
+            ts.setOriginalNode(block, body);
+            return block;
+        }
+        /**
+         * Transforms a parameter into a property assignment statement.
+         *
+         * @param node The parameter declaration.
+         */
+        function transformParameterWithPropertyAssignment(node) {
+            var name = node.name;
+            if (!ts.isIdentifier(name)) {
+                return undefined;
+            }
+            var propertyName = ts.getMutableClone(name);
+            ts.setEmitFlags(propertyName, 1536 /* NoComments */ | 48 /* NoSourceMap */);
+            var localName = ts.getMutableClone(name);
+            ts.setEmitFlags(localName, 1536 /* NoComments */);
+            return ts.startOnNewLine(ts.removeAllComments(ts.setTextRange(ts.setOriginalNode(ts.createExpressionStatement(ts.createAssignment(ts.setTextRange(ts.createPropertyAccess(ts.createThis(), propertyName), node.name), localName)), node), ts.moveRangePos(node, -1))));
         }
         function visitMethodDeclaration(node) {
             if (!shouldEmitFunctionLikeDeclaration(node)) {
@@ -69234,7 +71164,7 @@ var ts;
          */
         function visitEnumDeclaration(node) {
             if (!shouldEmitEnumDeclaration(node)) {
-                return undefined;
+                return ts.createNotEmittedStatement(node);
             }
             var statements = [];
             // We request to be advised when the printer is about to print this node. This allows
@@ -69402,12 +71332,12 @@ var ts;
             // enums in any other scope are emitted as a `let` declaration.
             var statement = ts.createVariableStatement(ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), ts.createVariableDeclarationList([
                 ts.createVariableDeclaration(ts.getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true))
-            ], currentLexicalScope.kind === 284 /* SourceFile */ ? 0 /* None */ : 1 /* Let */));
+            ], currentLexicalScope.kind === 285 /* SourceFile */ ? 0 /* None */ : 1 /* Let */));
             ts.setOriginalNode(statement, node);
             recordEmittedDeclarationInScope(node);
             if (isFirstEmittedDeclarationInScope(node)) {
                 // Adjust the source map emit to match the old emitter.
-                if (node.kind === 243 /* EnumDeclaration */) {
+                if (node.kind === 244 /* EnumDeclaration */) {
                     ts.setSourceMapRange(statement.declarationList, node);
                 }
                 else {
@@ -69532,7 +71462,7 @@ var ts;
             var statementsLocation;
             var blockLocation;
             var body = node.body;
-            if (body.kind === 245 /* ModuleBlock */) {
+            if (body.kind === 246 /* ModuleBlock */) {
                 saveStateAndInvoke(body, function (body) { return ts.addRange(statements, ts.visitNodes(body.statements, namespaceElementVisitor, ts.isStatement)); });
                 statementsLocation = body.statements;
                 blockLocation = body;
@@ -69578,13 +71508,13 @@ var ts;
             //     })(hi = hello.hi || (hello.hi = {}));
             // })(hello || (hello = {}));
             // We only want to emit comment on the namespace which contains block body itself, not the containing namespaces.
-            if (body.kind !== 245 /* ModuleBlock */) {
+            if (body.kind !== 246 /* ModuleBlock */) {
                 ts.setEmitFlags(block, ts.getEmitFlags(block) | 1536 /* NoComments */);
             }
             return block;
         }
         function getInnerMostModuleDeclarationFromDottedModule(moduleDeclaration) {
-            if (moduleDeclaration.body.kind === 244 /* ModuleDeclaration */) {
+            if (moduleDeclaration.body.kind === 245 /* ModuleDeclaration */) {
                 var recursiveInnerModule = getInnerMostModuleDeclarationFromDottedModule(moduleDeclaration.body);
                 return recursiveInnerModule || moduleDeclaration.body;
             }
@@ -69625,7 +71555,7 @@ var ts;
          * @param node The named import bindings node.
          */
         function visitNamedImportBindings(node) {
-            if (node.kind === 251 /* NamespaceImport */) {
+            if (node.kind === 252 /* NamespaceImport */) {
                 // Elide a namespace import if it is not referenced.
                 return resolver.isReferencedAliasDeclaration(node) ? node : undefined;
             }
@@ -69838,7 +71768,7 @@ var ts;
         function enableSubstitutionForNonQualifiedEnumMembers() {
             if ((enabledSubstitutions & 8 /* NonQualifiedEnumMembers */) === 0) {
                 enabledSubstitutions |= 8 /* NonQualifiedEnumMembers */;
-                context.enableSubstitution(72 /* Identifier */);
+                context.enableSubstitution(73 /* Identifier */);
             }
         }
         function enableSubstitutionForClassAliases() {
@@ -69846,7 +71776,7 @@ var ts;
                 enabledSubstitutions |= 1 /* ClassAliases */;
                 // We need to enable substitutions for identifiers. This allows us to
                 // substitute class names inside of a class declaration.
-                context.enableSubstitution(72 /* Identifier */);
+                context.enableSubstitution(73 /* Identifier */);
                 // Keep track of class aliases.
                 classAliases = [];
             }
@@ -69856,17 +71786,17 @@ var ts;
                 enabledSubstitutions |= 2 /* NamespaceExports */;
                 // We need to enable substitutions for identifiers and shorthand property assignments. This allows us to
                 // substitute the names of exported members of a namespace.
-                context.enableSubstitution(72 /* Identifier */);
-                context.enableSubstitution(276 /* ShorthandPropertyAssignment */);
+                context.enableSubstitution(73 /* Identifier */);
+                context.enableSubstitution(277 /* ShorthandPropertyAssignment */);
                 // We need to be notified when entering and exiting namespaces.
-                context.enableEmitNotification(244 /* ModuleDeclaration */);
+                context.enableEmitNotification(245 /* ModuleDeclaration */);
             }
         }
         function isTransformedModuleDeclaration(node) {
-            return ts.getOriginalNode(node).kind === 244 /* ModuleDeclaration */;
+            return ts.getOriginalNode(node).kind === 245 /* ModuleDeclaration */;
         }
         function isTransformedEnumDeclaration(node) {
-            return ts.getOriginalNode(node).kind === 243 /* EnumDeclaration */;
+            return ts.getOriginalNode(node).kind === 244 /* EnumDeclaration */;
         }
         /**
          * Hook for node emit.
@@ -69925,11 +71855,11 @@ var ts;
         }
         function substituteExpression(node) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return substituteExpressionIdentifier(node);
-                case 189 /* PropertyAccessExpression */:
+                case 190 /* PropertyAccessExpression */:
                     return substitutePropertyAccessExpression(node);
-                case 190 /* ElementAccessExpression */:
+                case 191 /* ElementAccessExpression */:
                     return substituteElementAccessExpression(node);
             }
             return node;
@@ -69967,9 +71897,9 @@ var ts;
                 // If we are nested within a namespace declaration, we may need to qualifiy
                 // an identifier that is exported from a merged namespace.
                 var container = resolver.getReferencedExportContainer(node, /*prefixLocals*/ false);
-                if (container && container.kind !== 284 /* SourceFile */) {
-                    var substitute = (applicableSubstitutions & 2 /* NamespaceExports */ && container.kind === 244 /* ModuleDeclaration */) ||
-                        (applicableSubstitutions & 8 /* NonQualifiedEnumMembers */ && container.kind === 243 /* EnumDeclaration */);
+                if (container && container.kind !== 285 /* SourceFile */) {
+                    var substitute = (applicableSubstitutions & 2 /* NamespaceExports */ && container.kind === 245 /* ModuleDeclaration */) ||
+                        (applicableSubstitutions & 8 /* NonQualifiedEnumMembers */ && container.kind === 244 /* EnumDeclaration */);
                     if (substitute) {
                         return ts.setTextRange(ts.createPropertyAccess(ts.getGeneratedNameForNode(container), node), 
                         /*location*/ node);
@@ -70059,6 +71989,413 @@ var ts;
 })(ts || (ts = {}));
 /*@internal*/
 var ts;
+(function (ts) {
+    var ClassPropertySubstitutionFlags;
+    (function (ClassPropertySubstitutionFlags) {
+        /**
+         * Enables substitutions for class expressions with static fields
+         * which have initializers that reference the class name.
+         */
+        ClassPropertySubstitutionFlags[ClassPropertySubstitutionFlags["ClassAliases"] = 1] = "ClassAliases";
+    })(ClassPropertySubstitutionFlags || (ClassPropertySubstitutionFlags = {}));
+    /**
+     * Transforms ECMAScript Class Syntax.
+     * TypeScript parameter property syntax is transformed in the TypeScript transformer.
+     * For now, this transforms public field declarations using TypeScript class semantics
+     * (where the declarations get elided and initializers are transformed as assignments in the constructor).
+     * Eventually, this transform will change to the ECMAScript semantics (with Object.defineProperty).
+     */
+    function transformClassFields(context) {
+        var hoistVariableDeclaration = context.hoistVariableDeclaration, endLexicalEnvironment = context.endLexicalEnvironment, resumeLexicalEnvironment = context.resumeLexicalEnvironment;
+        var resolver = context.getEmitResolver();
+        var previousOnSubstituteNode = context.onSubstituteNode;
+        context.onSubstituteNode = onSubstituteNode;
+        var enabledSubstitutions;
+        var classAliases;
+        /**
+         * Tracks what computed name expressions originating from elided names must be inlined
+         * at the next execution site, in document order
+         */
+        var pendingExpressions;
+        /**
+         * Tracks what computed name expression statements and static property initializers must be
+         * emitted at the next execution site, in document order (for decorated classes).
+         */
+        var pendingStatements;
+        return ts.chainBundle(transformSourceFile);
+        function transformSourceFile(node) {
+            if (node.isDeclarationFile) {
+                return node;
+            }
+            var visited = ts.visitEachChild(node, visitor, context);
+            ts.addEmitHelpers(visited, context.readEmitHelpers());
+            return visited;
+        }
+        function visitor(node) {
+            if (!(node.transformFlags & 1048576 /* ContainsClassFields */))
+                return node;
+            switch (node.kind) {
+                case 210 /* ClassExpression */:
+                    return visitClassExpression(node);
+                case 241 /* ClassDeclaration */:
+                    return visitClassDeclaration(node);
+                case 220 /* VariableStatement */:
+                    return visitVariableStatement(node);
+            }
+            return ts.visitEachChild(node, visitor, context);
+        }
+        /**
+         * Visits the members of a class that has fields.
+         *
+         * @param node The node to visit.
+         */
+        function classElementVisitor(node) {
+            switch (node.kind) {
+                case 158 /* Constructor */:
+                    // Constructors for classes using class fields are transformed in
+                    // `visitClassDeclaration` or `visitClassExpression`.
+                    return undefined;
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
+                case 157 /* MethodDeclaration */:
+                    // Visit the name of the member (if it's a computed property name).
+                    return ts.visitEachChild(node, classElementVisitor, context);
+                case 155 /* PropertyDeclaration */:
+                    return visitPropertyDeclaration(node);
+                case 150 /* ComputedPropertyName */:
+                    return visitComputedPropertyName(node);
+                case 218 /* SemicolonClassElement */:
+                    return node;
+                default:
+                    return visitor(node);
+            }
+        }
+        function visitVariableStatement(node) {
+            var savedPendingStatements = pendingStatements;
+            pendingStatements = [];
+            var visitedNode = ts.visitEachChild(node, visitor, context);
+            var statement = ts.some(pendingStatements) ? [visitedNode].concat(pendingStatements) :
+                visitedNode;
+            pendingStatements = savedPendingStatements;
+            return statement;
+        }
+        function visitComputedPropertyName(name) {
+            var node = ts.visitEachChild(name, visitor, context);
+            if (ts.some(pendingExpressions)) {
+                var expressions = pendingExpressions;
+                expressions.push(name.expression);
+                pendingExpressions = [];
+                node = ts.updateComputedPropertyName(node, ts.inlineExpressions(expressions));
+            }
+            return node;
+        }
+        function visitPropertyDeclaration(node) {
+            ts.Debug.assert(!ts.some(node.decorators));
+            // Create a temporary variable to store a computed property name (if necessary).
+            // If it's not inlineable, then we emit an expression after the class which assigns
+            // the property name to the temporary variable.
+            var expr = getPropertyNameExpressionIfNeeded(node.name, !!node.initializer);
+            if (expr && !ts.isSimpleInlineableExpression(expr)) {
+                (pendingExpressions || (pendingExpressions = [])).push(expr);
+            }
+            return undefined;
+        }
+        function visitClassDeclaration(node) {
+            if (!ts.forEach(node.members, ts.isPropertyDeclaration)) {
+                return ts.visitEachChild(node, visitor, context);
+            }
+            var savedPendingExpressions = pendingExpressions;
+            pendingExpressions = undefined;
+            var extendsClauseElement = ts.getEffectiveBaseTypeNode(node);
+            var isDerivedClass = !!(extendsClauseElement && ts.skipOuterExpressions(extendsClauseElement.expression).kind !== 97 /* NullKeyword */);
+            var statements = [
+                ts.updateClassDeclaration(node, 
+                /*decorators*/ undefined, node.modifiers, node.name, 
+                /*typeParameters*/ undefined, ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), transformClassMembers(node, isDerivedClass))
+            ];
+            // Write any pending expressions from elided or moved computed property names
+            if (ts.some(pendingExpressions)) {
+                statements.push(ts.createExpressionStatement(ts.inlineExpressions(pendingExpressions)));
+            }
+            pendingExpressions = savedPendingExpressions;
+            // Emit static property assignment. Because classDeclaration is lexically evaluated,
+            // it is safe to emit static property assignment after classDeclaration
+            // From ES6 specification:
+            //      HasLexicalDeclaration (N) : Determines if the argument identifier has a binding in this environment record that was created using
+            //                                  a lexical declaration such as a LexicalDeclaration or a ClassDeclaration.
+            var staticProperties = ts.getInitializedProperties(node, /*isStatic*/ true);
+            if (ts.some(staticProperties)) {
+                addInitializedPropertyStatements(statements, staticProperties, ts.getInternalName(node));
+            }
+            return statements;
+        }
+        function visitClassExpression(node) {
+            if (!ts.forEach(node.members, ts.isPropertyDeclaration)) {
+                return ts.visitEachChild(node, visitor, context);
+            }
+            var savedPendingExpressions = pendingExpressions;
+            pendingExpressions = undefined;
+            // If this class expression is a transformation of a decorated class declaration,
+            // then we want to output the pendingExpressions as statements, not as inlined
+            // expressions with the class statement.
+            //
+            // In this case, we use pendingStatements to produce the same output as the
+            // class declaration transformation. The VariableStatement visitor will insert
+            // these statements after the class expression variable statement.
+            var isDecoratedClassDeclaration = ts.isClassDeclaration(ts.getOriginalNode(node));
+            var staticProperties = ts.getInitializedProperties(node, /*isStatic*/ true);
+            var extendsClauseElement = ts.getEffectiveBaseTypeNode(node);
+            var isDerivedClass = !!(extendsClauseElement && ts.skipOuterExpressions(extendsClauseElement.expression).kind !== 97 /* NullKeyword */);
+            var classExpression = ts.updateClassExpression(node, node.modifiers, node.name, 
+            /*typeParameters*/ undefined, ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), transformClassMembers(node, isDerivedClass));
+            if (ts.some(staticProperties) || ts.some(pendingExpressions)) {
+                if (isDecoratedClassDeclaration) {
+                    ts.Debug.assertDefined(pendingStatements, "Decorated classes transformed by TypeScript are expected to be within a variable declaration.");
+                    // Write any pending expressions from elided or moved computed property names
+                    if (pendingStatements && pendingExpressions && ts.some(pendingExpressions)) {
+                        pendingStatements.push(ts.createExpressionStatement(ts.inlineExpressions(pendingExpressions)));
+                    }
+                    pendingExpressions = savedPendingExpressions;
+                    if (pendingStatements && ts.some(staticProperties)) {
+                        addInitializedPropertyStatements(pendingStatements, staticProperties, ts.getInternalName(node));
+                    }
+                    return classExpression;
+                }
+                else {
+                    var expressions = [];
+                    var isClassWithConstructorReference = resolver.getNodeCheckFlags(node) & 16777216 /* ClassWithConstructorReference */;
+                    var temp = ts.createTempVariable(hoistVariableDeclaration, !!isClassWithConstructorReference);
+                    if (isClassWithConstructorReference) {
+                        // record an alias as the class name is not in scope for statics.
+                        enableSubstitutionForClassAliases();
+                        var alias = ts.getSynthesizedClone(temp);
+                        alias.autoGenerateFlags &= ~8 /* ReservedInNestedScopes */;
+                        classAliases[ts.getOriginalNodeId(node)] = alias;
+                    }
+                    // To preserve the behavior of the old emitter, we explicitly indent
+                    // the body of a class with static initializers.
+                    ts.setEmitFlags(classExpression, 65536 /* Indented */ | ts.getEmitFlags(classExpression));
+                    expressions.push(ts.startOnNewLine(ts.createAssignment(temp, classExpression)));
+                    // Add any pending expressions leftover from elided or relocated computed property names
+                    ts.addRange(expressions, ts.map(pendingExpressions, ts.startOnNewLine));
+                    ts.addRange(expressions, generateInitializedPropertyExpressions(staticProperties, temp));
+                    expressions.push(ts.startOnNewLine(temp));
+                    pendingExpressions = savedPendingExpressions;
+                    return ts.inlineExpressions(expressions);
+                }
+            }
+            pendingExpressions = savedPendingExpressions;
+            return classExpression;
+        }
+        function transformClassMembers(node, isDerivedClass) {
+            var members = [];
+            var constructor = transformConstructor(node, isDerivedClass);
+            if (constructor) {
+                members.push(constructor);
+            }
+            ts.addRange(members, ts.visitNodes(node.members, classElementVisitor, ts.isClassElement));
+            return ts.setTextRange(ts.createNodeArray(members), /*location*/ node.members);
+        }
+        function transformConstructor(node, isDerivedClass) {
+            var constructor = ts.visitNode(ts.getFirstConstructorWithBody(node), visitor, ts.isConstructorDeclaration);
+            var containsPropertyInitializer = ts.forEach(node.members, ts.isInitializedProperty);
+            if (!containsPropertyInitializer) {
+                return constructor;
+            }
+            var parameters = ts.visitParameterList(constructor ? constructor.parameters : undefined, visitor, context);
+            var body = transformConstructorBody(node, constructor, isDerivedClass);
+            if (!body) {
+                return undefined;
+            }
+            return ts.startOnNewLine(ts.setOriginalNode(ts.setTextRange(ts.createConstructor(
+            /*decorators*/ undefined, 
+            /*modifiers*/ undefined, parameters, body), constructor || node), constructor));
+        }
+        function transformConstructorBody(node, constructor, isDerivedClass) {
+            var properties = ts.getInitializedProperties(node, /*isStatic*/ false);
+            // Only generate synthetic constructor when there are property initializers to move.
+            if (!constructor && !ts.some(properties)) {
+                return ts.visitFunctionBody(/*node*/ undefined, visitor, context);
+            }
+            resumeLexicalEnvironment();
+            var indexOfFirstStatement = 0;
+            var statements = [];
+            if (!constructor && isDerivedClass) {
+                // Add a synthetic `super` call:
+                //
+                //  super(...arguments);
+                //
+                statements.push(ts.createExpressionStatement(ts.createCall(ts.createSuper(), 
+                /*typeArguments*/ undefined, [ts.createSpread(ts.createIdentifier("arguments"))])));
+            }
+            if (constructor) {
+                indexOfFirstStatement = ts.addPrologueDirectivesAndInitialSuperCall(constructor, statements, visitor);
+            }
+            // Add the property initializers. Transforms this:
+            //
+            //  public x = 1;
+            //
+            // Into this:
+            //
+            //  constructor() {
+            //      this.x = 1;
+            //  }
+            //
+            if (constructor && constructor.body) {
+                var parameterPropertyDeclarationCount = 0;
+                for (var i = indexOfFirstStatement; i < constructor.body.statements.length; i++) {
+                    if (ts.isParameterPropertyDeclaration(ts.getOriginalNode(constructor.body.statements[i]))) {
+                        parameterPropertyDeclarationCount++;
+                    }
+                    else {
+                        break;
+                    }
+                }
+                if (parameterPropertyDeclarationCount > 0) {
+                    ts.addRange(statements, ts.visitNodes(constructor.body.statements, visitor, ts.isStatement, indexOfFirstStatement, parameterPropertyDeclarationCount));
+                    indexOfFirstStatement += parameterPropertyDeclarationCount;
+                }
+            }
+            addInitializedPropertyStatements(statements, properties, ts.createThis());
+            // Add existing statements, skipping the initial super call.
+            if (constructor) {
+                ts.addRange(statements, ts.visitNodes(constructor.body.statements, visitor, ts.isStatement, indexOfFirstStatement));
+            }
+            statements = ts.mergeLexicalEnvironment(statements, endLexicalEnvironment());
+            return ts.setTextRange(ts.createBlock(ts.setTextRange(ts.createNodeArray(statements), 
+            /*location*/ constructor ? constructor.body.statements : node.members), 
+            /*multiLine*/ true), 
+            /*location*/ constructor ? constructor.body : undefined);
+        }
+        /**
+         * Generates assignment statements for property initializers.
+         *
+         * @param properties An array of property declarations to transform.
+         * @param receiver The receiver on which each property should be assigned.
+         */
+        function addInitializedPropertyStatements(statements, properties, receiver) {
+            for (var _i = 0, properties_6 = properties; _i < properties_6.length; _i++) {
+                var property = properties_6[_i];
+                var statement = ts.createExpressionStatement(transformInitializedProperty(property, receiver));
+                ts.setSourceMapRange(statement, ts.moveRangePastModifiers(property));
+                ts.setCommentRange(statement, property);
+                ts.setOriginalNode(statement, property);
+                statements.push(statement);
+            }
+        }
+        /**
+         * Generates assignment expressions for property initializers.
+         *
+         * @param properties An array of property declarations to transform.
+         * @param receiver The receiver on which each property should be assigned.
+         */
+        function generateInitializedPropertyExpressions(properties, receiver) {
+            var expressions = [];
+            for (var _i = 0, properties_7 = properties; _i < properties_7.length; _i++) {
+                var property = properties_7[_i];
+                var expression = transformInitializedProperty(property, receiver);
+                ts.startOnNewLine(expression);
+                ts.setSourceMapRange(expression, ts.moveRangePastModifiers(property));
+                ts.setCommentRange(expression, property);
+                ts.setOriginalNode(expression, property);
+                expressions.push(expression);
+            }
+            return expressions;
+        }
+        /**
+         * Transforms a property initializer into an assignment statement.
+         *
+         * @param property The property declaration.
+         * @param receiver The object receiving the property assignment.
+         */
+        function transformInitializedProperty(property, receiver) {
+            // We generate a name here in order to reuse the value cached by the relocated computed name expression (which uses the same generated name)
+            var propertyName = ts.isComputedPropertyName(property.name) && !ts.isSimpleInlineableExpression(property.name.expression)
+                ? ts.updateComputedPropertyName(property.name, ts.getGeneratedNameForNode(property.name))
+                : property.name;
+            var initializer = ts.visitNode(property.initializer, visitor, ts.isExpression);
+            var memberAccess = ts.createMemberAccessForPropertyName(receiver, propertyName, /*location*/ propertyName);
+            return ts.createAssignment(memberAccess, initializer);
+        }
+        function enableSubstitutionForClassAliases() {
+            if ((enabledSubstitutions & 1 /* ClassAliases */) === 0) {
+                enabledSubstitutions |= 1 /* ClassAliases */;
+                // We need to enable substitutions for identifiers. This allows us to
+                // substitute class names inside of a class declaration.
+                context.enableSubstitution(73 /* Identifier */);
+                // Keep track of class aliases.
+                classAliases = [];
+            }
+        }
+        /**
+         * Hooks node substitutions.
+         *
+         * @param hint The context for the emitter.
+         * @param node The node to substitute.
+         */
+        function onSubstituteNode(hint, node) {
+            node = previousOnSubstituteNode(hint, node);
+            if (hint === 1 /* Expression */) {
+                return substituteExpression(node);
+            }
+            return node;
+        }
+        function substituteExpression(node) {
+            switch (node.kind) {
+                case 73 /* Identifier */:
+                    return substituteExpressionIdentifier(node);
+            }
+            return node;
+        }
+        function substituteExpressionIdentifier(node) {
+            return trySubstituteClassAlias(node) || node;
+        }
+        function trySubstituteClassAlias(node) {
+            if (enabledSubstitutions & 1 /* ClassAliases */) {
+                if (resolver.getNodeCheckFlags(node) & 33554432 /* ConstructorReferenceInClass */) {
+                    // Due to the emit for class decorators, any reference to the class from inside of the class body
+                    // must instead be rewritten to point to a temporary variable to avoid issues with the double-bind
+                    // behavior of class names in ES6.
+                    // Also, when emitting statics for class expressions, we must substitute a class alias for
+                    // constructor references in static property initializers.
+                    var declaration = resolver.getReferencedValueDeclaration(node);
+                    if (declaration) {
+                        var classAlias = classAliases[declaration.id]; // TODO: GH#18217
+                        if (classAlias) {
+                            var clone_2 = ts.getSynthesizedClone(classAlias);
+                            ts.setSourceMapRange(clone_2, node);
+                            ts.setCommentRange(clone_2, node);
+                            return clone_2;
+                        }
+                    }
+                }
+            }
+            return undefined;
+        }
+        /**
+         * If the name is a computed property, this function transforms it, then either returns an expression which caches the
+         * value of the result or the expression itself if the value is either unused or safe to inline into multiple locations
+         * @param shouldHoist Does the expression need to be reused? (ie, for an initializer or a decorator)
+         */
+        function getPropertyNameExpressionIfNeeded(name, shouldHoist) {
+            if (ts.isComputedPropertyName(name)) {
+                var expression = ts.visitNode(name.expression, visitor, ts.isExpression);
+                var innerExpression = ts.skipPartiallyEmittedExpressions(expression);
+                var inlinable = ts.isSimpleInlineableExpression(innerExpression);
+                var alreadyTransformed = ts.isAssignmentExpression(innerExpression) && ts.isGeneratedIdentifier(innerExpression.left);
+                if (!alreadyTransformed && !inlinable && shouldHoist) {
+                    var generatedName = ts.getGeneratedNameForNode(name);
+                    hoistVariableDeclaration(generatedName);
+                    return ts.createAssignment(generatedName, expression);
+                }
+                return (inlinable || ts.isIdentifier(innerExpression)) ? undefined : expression;
+            }
+        }
+    }
+    ts.transformClassFields = transformClassFields;
+})(ts || (ts = {}));
+/*@internal*/
+var ts;
 (function (ts) {
     var ES2017SubstitutionFlags;
     (function (ES2017SubstitutionFlags) {
@@ -70109,26 +72446,26 @@ var ts;
                 return node;
             }
             switch (node.kind) {
-                case 121 /* AsyncKeyword */:
+                case 122 /* AsyncKeyword */:
                     // ES2017 async modifier should be elided for targets < ES2017
                     return undefined;
-                case 201 /* AwaitExpression */:
+                case 202 /* AwaitExpression */:
                     return visitAwaitExpression(node);
-                case 156 /* MethodDeclaration */:
+                case 157 /* MethodDeclaration */:
                     return visitMethodDeclaration(node);
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     return visitFunctionDeclaration(node);
-                case 196 /* FunctionExpression */:
+                case 197 /* FunctionExpression */:
                     return visitFunctionExpression(node);
-                case 197 /* ArrowFunction */:
+                case 198 /* ArrowFunction */:
                     return visitArrowFunction(node);
-                case 189 /* PropertyAccessExpression */:
-                    if (capturedSuperProperties && ts.isPropertyAccessExpression(node) && node.expression.kind === 98 /* SuperKeyword */) {
+                case 190 /* PropertyAccessExpression */:
+                    if (capturedSuperProperties && ts.isPropertyAccessExpression(node) && node.expression.kind === 99 /* SuperKeyword */) {
                         capturedSuperProperties.set(node.name.escapedText, true);
                     }
                     return ts.visitEachChild(node, visitor, context);
-                case 190 /* ElementAccessExpression */:
-                    if (capturedSuperProperties && node.expression.kind === 98 /* SuperKeyword */) {
+                case 191 /* ElementAccessExpression */:
+                    if (capturedSuperProperties && node.expression.kind === 99 /* SuperKeyword */) {
                         hasSuperElementAccess = true;
                     }
                     return ts.visitEachChild(node, visitor, context);
@@ -70139,27 +72476,27 @@ var ts;
         function asyncBodyVisitor(node) {
             if (ts.isNodeWithPossibleHoistedDeclaration(node)) {
                 switch (node.kind) {
-                    case 219 /* VariableStatement */:
+                    case 220 /* VariableStatement */:
                         return visitVariableStatementInAsyncBody(node);
-                    case 225 /* ForStatement */:
+                    case 226 /* ForStatement */:
                         return visitForStatementInAsyncBody(node);
-                    case 226 /* ForInStatement */:
+                    case 227 /* ForInStatement */:
                         return visitForInStatementInAsyncBody(node);
-                    case 227 /* ForOfStatement */:
+                    case 228 /* ForOfStatement */:
                         return visitForOfStatementInAsyncBody(node);
-                    case 274 /* CatchClause */:
+                    case 275 /* CatchClause */:
                         return visitCatchClauseInAsyncBody(node);
-                    case 218 /* Block */:
-                    case 232 /* SwitchStatement */:
-                    case 246 /* CaseBlock */:
-                    case 271 /* CaseClause */:
-                    case 272 /* DefaultClause */:
-                    case 235 /* TryStatement */:
-                    case 223 /* DoStatement */:
-                    case 224 /* WhileStatement */:
-                    case 222 /* IfStatement */:
-                    case 231 /* WithStatement */:
-                    case 233 /* LabeledStatement */:
+                    case 219 /* Block */:
+                    case 233 /* SwitchStatement */:
+                    case 247 /* CaseBlock */:
+                    case 272 /* CaseClause */:
+                    case 273 /* DefaultClause */:
+                    case 236 /* TryStatement */:
+                    case 224 /* DoStatement */:
+                    case 225 /* WhileStatement */:
+                    case 223 /* IfStatement */:
+                    case 232 /* WithStatement */:
+                    case 234 /* LabeledStatement */:
                         return ts.visitEachChild(node, asyncBodyVisitor, context);
                     default:
                         return ts.Debug.assertNever(node, "Unhandled node.");
@@ -70360,7 +72697,7 @@ var ts;
             var original = ts.getOriginalNode(node, ts.isFunctionLike);
             var nodeType = original.type;
             var promiseConstructor = languageVersion < 2 /* ES2015 */ ? getPromiseConstructor(nodeType) : undefined;
-            var isArrowFunction = node.kind === 197 /* ArrowFunction */;
+            var isArrowFunction = node.kind === 198 /* ArrowFunction */;
             var hasLexicalArguments = (resolver.getNodeCheckFlags(node) & 8192 /* CaptureArguments */) !== 0;
             // An async function is emit as an outer function that calls an inner
             // generator function. To preserve lexical bindings, we pass the current
@@ -70375,8 +72712,10 @@ var ts;
             }
             var savedCapturedSuperProperties = capturedSuperProperties;
             var savedHasSuperElementAccess = hasSuperElementAccess;
-            capturedSuperProperties = ts.createUnderscoreEscapedMap();
-            hasSuperElementAccess = false;
+            if (!isArrowFunction) {
+                capturedSuperProperties = ts.createUnderscoreEscapedMap();
+                hasSuperElementAccess = false;
+            }
             var result;
             if (!isArrowFunction) {
                 var statements = [];
@@ -70388,9 +72727,11 @@ var ts;
                 var emitSuperHelpers = languageVersion >= 2 /* ES2015 */ && resolver.getNodeCheckFlags(node) & (4096 /* AsyncMethodWithSuperBinding */ | 2048 /* AsyncMethodWithSuper */);
                 if (emitSuperHelpers) {
                     enableSubstitutionForAsyncMethodsWithSuper();
-                    var variableStatement = createSuperAccessVariableStatement(resolver, node, capturedSuperProperties);
-                    substitutedSuperAccessors[ts.getNodeId(variableStatement)] = true;
-                    ts.insertStatementsAfterStandardPrologue(statements, [variableStatement]);
+                    if (ts.hasEntries(capturedSuperProperties)) {
+                        var variableStatement = createSuperAccessVariableStatement(resolver, node, capturedSuperProperties);
+                        substitutedSuperAccessors[ts.getNodeId(variableStatement)] = true;
+                        ts.insertStatementsAfterStandardPrologue(statements, [variableStatement]);
+                    }
                 }
                 var block = ts.createBlock(statements, /*multiLine*/ true);
                 ts.setTextRange(block, node.body);
@@ -70417,8 +72758,10 @@ var ts;
                 }
             }
             enclosingFunctionParameterNames = savedEnclosingFunctionParameterNames;
-            capturedSuperProperties = savedCapturedSuperProperties;
-            hasSuperElementAccess = savedHasSuperElementAccess;
+            if (!isArrowFunction) {
+                capturedSuperProperties = savedCapturedSuperProperties;
+                hasSuperElementAccess = savedHasSuperElementAccess;
+            }
             return result;
         }
         function transformAsyncFunctionBodyWorker(body, start) {
@@ -70445,17 +72788,17 @@ var ts;
                 enabledSubstitutions |= 1 /* AsyncMethodsWithSuper */;
                 // We need to enable substitutions for call, property access, and element access
                 // if we need to rewrite super calls.
-                context.enableSubstitution(191 /* CallExpression */);
-                context.enableSubstitution(189 /* PropertyAccessExpression */);
-                context.enableSubstitution(190 /* ElementAccessExpression */);
+                context.enableSubstitution(192 /* CallExpression */);
+                context.enableSubstitution(190 /* PropertyAccessExpression */);
+                context.enableSubstitution(191 /* ElementAccessExpression */);
                 // We need to be notified when entering and exiting declarations that bind super.
-                context.enableEmitNotification(240 /* ClassDeclaration */);
-                context.enableEmitNotification(156 /* MethodDeclaration */);
-                context.enableEmitNotification(158 /* GetAccessor */);
-                context.enableEmitNotification(159 /* SetAccessor */);
-                context.enableEmitNotification(157 /* Constructor */);
+                context.enableEmitNotification(241 /* ClassDeclaration */);
+                context.enableEmitNotification(157 /* MethodDeclaration */);
+                context.enableEmitNotification(159 /* GetAccessor */);
+                context.enableEmitNotification(160 /* SetAccessor */);
+                context.enableEmitNotification(158 /* Constructor */);
                 // We need to be notified when entering the generated accessor arrow functions.
-                context.enableEmitNotification(219 /* VariableStatement */);
+                context.enableEmitNotification(220 /* VariableStatement */);
             }
         }
         /**
@@ -70503,23 +72846,23 @@ var ts;
         }
         function substituteExpression(node) {
             switch (node.kind) {
-                case 189 /* PropertyAccessExpression */:
+                case 190 /* PropertyAccessExpression */:
                     return substitutePropertyAccessExpression(node);
-                case 190 /* ElementAccessExpression */:
+                case 191 /* ElementAccessExpression */:
                     return substituteElementAccessExpression(node);
-                case 191 /* CallExpression */:
+                case 192 /* CallExpression */:
                     return substituteCallExpression(node);
             }
             return node;
         }
         function substitutePropertyAccessExpression(node) {
-            if (node.expression.kind === 98 /* SuperKeyword */) {
+            if (node.expression.kind === 99 /* SuperKeyword */) {
                 return ts.setTextRange(ts.createPropertyAccess(ts.createFileLevelUniqueName("_super"), node.name), node);
             }
             return node;
         }
         function substituteElementAccessExpression(node) {
-            if (node.expression.kind === 98 /* SuperKeyword */) {
+            if (node.expression.kind === 99 /* SuperKeyword */) {
                 return createSuperElementAccessInAsyncMethod(node.argumentExpression, node);
             }
             return node;
@@ -70539,11 +72882,11 @@ var ts;
         }
         function isSuperContainer(node) {
             var kind = node.kind;
-            return kind === 240 /* ClassDeclaration */
-                || kind === 157 /* Constructor */
-                || kind === 156 /* MethodDeclaration */
-                || kind === 158 /* GetAccessor */
-                || kind === 159 /* SetAccessor */;
+            return kind === 241 /* ClassDeclaration */
+                || kind === 158 /* Constructor */
+                || kind === 157 /* MethodDeclaration */
+                || kind === 159 /* GetAccessor */
+                || kind === 160 /* SetAccessor */;
         }
         function createSuperElementAccessInAsyncMethod(argumentExpression, location) {
             if (enclosingSuperContainerFlags & 4096 /* AsyncMethodWithSuperBinding */) {
@@ -70571,7 +72914,7 @@ var ts;
             /* typeParameters */ undefined, 
             /* parameters */ [], 
             /* type */ undefined, 
-            /* equalsGreaterThanToken */ undefined, ts.createPropertyAccess(ts.createSuper(), name))));
+            /* equalsGreaterThanToken */ undefined, ts.setEmitFlags(ts.createPropertyAccess(ts.setEmitFlags(ts.createSuper(), 4 /* NoSubstitution */), name), 4 /* NoSubstitution */))));
             if (hasBinding) {
                 getterAndSetter.push(ts.createPropertyAssignment("set", ts.createArrowFunction(
                 /* modifiers */ undefined, 
@@ -70586,7 +72929,7 @@ var ts;
                     /* initializer */ undefined)
                 ], 
                 /* type */ undefined, 
-                /* equalsGreaterThanToken */ undefined, ts.createAssignment(ts.createPropertyAccess(ts.createSuper(), name), ts.createIdentifier("v")))));
+                /* equalsGreaterThanToken */ undefined, ts.createAssignment(ts.setEmitFlags(ts.createPropertyAccess(ts.setEmitFlags(ts.createSuper(), 4 /* NoSubstitution */), name), 4 /* NoSubstitution */), ts.createIdentifier("v")))));
             }
             accessors.push(ts.createPropertyAssignment(name, ts.createObjectLiteral(getterAndSetter)));
         });
@@ -70605,7 +72948,7 @@ var ts;
         name: "typescript:awaiter",
         scoped: false,
         priority: 5,
-        text: "\n            var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {\n                return new (P || (P = Promise))(function (resolve, reject) {\n                    function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }\n                    function rejected(value) { try { step(generator[\"throw\"](value)); } catch (e) { reject(e); } }\n                    function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }\n                    step((generator = generator.apply(thisArg, _arguments || [])).next());\n                });\n            };"
+        text: "\n            var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {\n                function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }\n                return new (P || (P = Promise))(function (resolve, reject) {\n                    function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }\n                    function rejected(value) { try { step(generator[\"throw\"](value)); } catch (e) { reject(e); } }\n                    function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }\n                    step((generator = generator.apply(thisArg, _arguments || [])).next());\n                });\n            };"
     };
     function createAwaiterHelper(context, hasLexicalArguments, promiseConstructor, body) {
         context.requestEmitHelper(ts.awaiterHelper);
@@ -70678,7 +73021,7 @@ var ts;
             return visitorWorker(node, /*noDestructuringValue*/ true);
         }
         function visitorNoAsyncModifier(node) {
-            if (node.kind === 121 /* AsyncKeyword */) {
+            if (node.kind === 122 /* AsyncKeyword */) {
                 return undefined;
             }
             return node;
@@ -70688,53 +73031,55 @@ var ts;
                 return node;
             }
             switch (node.kind) {
-                case 201 /* AwaitExpression */:
+                case 202 /* AwaitExpression */:
                     return visitAwaitExpression(node);
-                case 207 /* YieldExpression */:
+                case 208 /* YieldExpression */:
                     return visitYieldExpression(node);
-                case 230 /* ReturnStatement */:
+                case 231 /* ReturnStatement */:
                     return visitReturnStatement(node);
-                case 233 /* LabeledStatement */:
+                case 234 /* LabeledStatement */:
                     return visitLabeledStatement(node);
-                case 188 /* ObjectLiteralExpression */:
+                case 189 /* ObjectLiteralExpression */:
                     return visitObjectLiteralExpression(node);
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return visitBinaryExpression(node, noDestructuringValue);
-                case 237 /* VariableDeclaration */:
+                case 275 /* CatchClause */:
+                    return visitCatchClause(node);
+                case 238 /* VariableDeclaration */:
                     return visitVariableDeclaration(node);
-                case 227 /* ForOfStatement */:
+                case 228 /* ForOfStatement */:
                     return visitForOfStatement(node, /*outermostLabeledStatement*/ undefined);
-                case 225 /* ForStatement */:
+                case 226 /* ForStatement */:
                     return visitForStatement(node);
-                case 200 /* VoidExpression */:
+                case 201 /* VoidExpression */:
                     return visitVoidExpression(node);
-                case 157 /* Constructor */:
+                case 158 /* Constructor */:
                     return visitConstructorDeclaration(node);
-                case 156 /* MethodDeclaration */:
+                case 157 /* MethodDeclaration */:
                     return visitMethodDeclaration(node);
-                case 158 /* GetAccessor */:
+                case 159 /* GetAccessor */:
                     return visitGetAccessorDeclaration(node);
-                case 159 /* SetAccessor */:
+                case 160 /* SetAccessor */:
                     return visitSetAccessorDeclaration(node);
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     return visitFunctionDeclaration(node);
-                case 196 /* FunctionExpression */:
+                case 197 /* FunctionExpression */:
                     return visitFunctionExpression(node);
-                case 197 /* ArrowFunction */:
+                case 198 /* ArrowFunction */:
                     return visitArrowFunction(node);
-                case 151 /* Parameter */:
+                case 152 /* Parameter */:
                     return visitParameter(node);
-                case 221 /* ExpressionStatement */:
+                case 222 /* ExpressionStatement */:
                     return visitExpressionStatement(node);
-                case 195 /* ParenthesizedExpression */:
+                case 196 /* ParenthesizedExpression */:
                     return visitParenthesizedExpression(node, noDestructuringValue);
-                case 189 /* PropertyAccessExpression */:
-                    if (capturedSuperProperties && ts.isPropertyAccessExpression(node) && node.expression.kind === 98 /* SuperKeyword */) {
+                case 190 /* PropertyAccessExpression */:
+                    if (capturedSuperProperties && ts.isPropertyAccessExpression(node) && node.expression.kind === 99 /* SuperKeyword */) {
                         capturedSuperProperties.set(node.name.escapedText, true);
                     }
                     return ts.visitEachChild(node, visitor, context);
-                case 190 /* ElementAccessExpression */:
-                    if (capturedSuperProperties && node.expression.kind === 98 /* SuperKeyword */) {
+                case 191 /* ElementAccessExpression */:
+                    if (capturedSuperProperties && node.expression.kind === 99 /* SuperKeyword */) {
                         hasSuperElementAccess = true;
                     }
                     return ts.visitEachChild(node, visitor, context);
@@ -70770,7 +73115,7 @@ var ts;
         function visitLabeledStatement(node) {
             if (enclosingFunctionFlags & 2 /* Async */) {
                 var statement = ts.unwrapInnermostStatementOfLabel(node);
-                if (statement.kind === 227 /* ForOfStatement */ && statement.awaitModifier) {
+                if (statement.kind === 228 /* ForOfStatement */ && statement.awaitModifier) {
                     return visitForOfStatement(statement, node);
                 }
                 return ts.restoreEnclosingLabel(ts.visitEachChild(statement, visitor, context), node);
@@ -70782,7 +73127,7 @@ var ts;
             var objects = [];
             for (var _i = 0, elements_4 = elements; _i < elements_4.length; _i++) {
                 var e = elements_4[_i];
-                if (e.kind === 277 /* SpreadAssignment */) {
+                if (e.kind === 278 /* SpreadAssignment */) {
                     if (chunkObject) {
                         objects.push(ts.createObjectLiteral(chunkObject));
                         chunkObject = undefined;
@@ -70791,7 +73136,7 @@ var ts;
                     objects.push(ts.visitNode(target, visitor, ts.isExpression));
                 }
                 else {
-                    chunkObject = ts.append(chunkObject, e.kind === 275 /* PropertyAssignment */
+                    chunkObject = ts.append(chunkObject, e.kind === 276 /* PropertyAssignment */
                         ? ts.createPropertyAssignment(e.name, ts.visitNode(e.initializer, visitor, ts.isExpression))
                         : ts.visitNode(e, visitor, ts.isObjectLiteralElementLike));
                 }
@@ -70805,14 +73150,39 @@ var ts;
             if (node.transformFlags & 8192 /* ContainsObjectRestOrSpread */) {
                 // spread elements emit like so:
                 // non-spread elements are chunked together into object literals, and then all are passed to __assign:
-                //     { a, ...o, b } => __assign({a}, o, {b});
+                //     { a, ...o, b } => __assign(__assign({a}, o), {b});
                 // If the first element is a spread element, then the first argument to __assign is {}:
-                //     { ...o, a, b, ...o2 } => __assign({}, o, {a, b}, o2)
+                //     { ...o, a, b, ...o2 } => __assign(__assign(__assign({}, o), {a, b}), o2)
+                //
+                // We cannot call __assign with more than two elements, since any element could cause side effects. For
+                // example:
+                //      var k = { a: 1, b: 2 };
+                //      var o = { a: 3, ...k, b: k.a++ };
+                //      // expected: { a: 1, b: 1 }
+                // If we translate the above to `__assign({ a: 3 }, k, { b: k.a++ })`, the `k.a++` will evaluate before
+                // `k` is spread and we end up with `{ a: 2, b: 1 }`.
+                //
+                // This also occurs for spread elements, not just property assignments:
+                //      var k = { a: 1, get b() { l = { z: 9 }; return 2; } };
+                //      var l = { c: 3 };
+                //      var o = { ...k, ...l };
+                //      // expected: { a: 1, b: 2, z: 9 }
+                // If we translate the above to `__assign({}, k, l)`, the `l` will evaluate before `k` is spread and we
+                // end up with `{ a: 1, b: 2, c: 3 }`
                 var objects = chunkObjectLiteralElements(node.properties);
-                if (objects.length && objects[0].kind !== 188 /* ObjectLiteralExpression */) {
+                if (objects.length && objects[0].kind !== 189 /* ObjectLiteralExpression */) {
                     objects.unshift(ts.createObjectLiteral());
                 }
-                return createAssignHelper(context, objects);
+                var expression = objects[0];
+                if (objects.length > 1) {
+                    for (var i = 1; i < objects.length; i++) {
+                        expression = createAssignHelper(context, [expression, objects[i]]);
+                    }
+                    return expression;
+                }
+                else {
+                    return createAssignHelper(context, objects);
+                }
             }
             return ts.visitEachChild(node, visitor, context);
         }
@@ -70836,6 +73206,23 @@ var ts;
             }
             return ts.visitEachChild(node, visitor, context);
         }
+        function visitCatchClause(node) {
+            if (node.variableDeclaration &&
+                ts.isBindingPattern(node.variableDeclaration.name) &&
+                node.variableDeclaration.name.transformFlags & 8192 /* ContainsObjectRestOrSpread */) {
+                var name = ts.getGeneratedNameForNode(node.variableDeclaration.name);
+                var updatedDecl = ts.updateVariableDeclaration(node.variableDeclaration, node.variableDeclaration.name, /*type*/ undefined, name);
+                var visitedBindings = ts.flattenDestructuringBinding(updatedDecl, visitor, context, 1 /* ObjectRest */);
+                var block = ts.visitNode(node.block, visitor, ts.isBlock);
+                if (ts.some(visitedBindings)) {
+                    block = ts.updateBlock(block, [
+                        ts.createVariableStatement(/*modifiers*/ undefined, visitedBindings)
+                    ].concat(block.statements));
+                }
+                return ts.updateCatchClause(node, ts.updateVariableDeclaration(node.variableDeclaration, name, /*type*/ undefined, /*initializer*/ undefined), block);
+            }
+            return ts.visitEachChild(node, visitor, context);
+        }
         /**
          * Visits a VariableDeclaration node with a binding pattern.
          *
@@ -71128,17 +73515,17 @@ var ts;
                 enabledSubstitutions |= 1 /* AsyncMethodsWithSuper */;
                 // We need to enable substitutions for call, property access, and element access
                 // if we need to rewrite super calls.
-                context.enableSubstitution(191 /* CallExpression */);
-                context.enableSubstitution(189 /* PropertyAccessExpression */);
-                context.enableSubstitution(190 /* ElementAccessExpression */);
+                context.enableSubstitution(192 /* CallExpression */);
+                context.enableSubstitution(190 /* PropertyAccessExpression */);
+                context.enableSubstitution(191 /* ElementAccessExpression */);
                 // We need to be notified when entering and exiting declarations that bind super.
-                context.enableEmitNotification(240 /* ClassDeclaration */);
-                context.enableEmitNotification(156 /* MethodDeclaration */);
-                context.enableEmitNotification(158 /* GetAccessor */);
-                context.enableEmitNotification(159 /* SetAccessor */);
-                context.enableEmitNotification(157 /* Constructor */);
+                context.enableEmitNotification(241 /* ClassDeclaration */);
+                context.enableEmitNotification(157 /* MethodDeclaration */);
+                context.enableEmitNotification(159 /* GetAccessor */);
+                context.enableEmitNotification(160 /* SetAccessor */);
+                context.enableEmitNotification(158 /* Constructor */);
                 // We need to be notified when entering the generated accessor arrow functions.
-                context.enableEmitNotification(219 /* VariableStatement */);
+                context.enableEmitNotification(220 /* VariableStatement */);
             }
         }
         /**
@@ -71186,23 +73573,23 @@ var ts;
         }
         function substituteExpression(node) {
             switch (node.kind) {
-                case 189 /* PropertyAccessExpression */:
+                case 190 /* PropertyAccessExpression */:
                     return substitutePropertyAccessExpression(node);
-                case 190 /* ElementAccessExpression */:
+                case 191 /* ElementAccessExpression */:
                     return substituteElementAccessExpression(node);
-                case 191 /* CallExpression */:
+                case 192 /* CallExpression */:
                     return substituteCallExpression(node);
             }
             return node;
         }
         function substitutePropertyAccessExpression(node) {
-            if (node.expression.kind === 98 /* SuperKeyword */) {
+            if (node.expression.kind === 99 /* SuperKeyword */) {
                 return ts.setTextRange(ts.createPropertyAccess(ts.createFileLevelUniqueName("_super"), node.name), node);
             }
             return node;
         }
         function substituteElementAccessExpression(node) {
-            if (node.expression.kind === 98 /* SuperKeyword */) {
+            if (node.expression.kind === 99 /* SuperKeyword */) {
                 return createSuperElementAccessInAsyncMethod(node.argumentExpression, node);
             }
             return node;
@@ -71222,11 +73609,11 @@ var ts;
         }
         function isSuperContainer(node) {
             var kind = node.kind;
-            return kind === 240 /* ClassDeclaration */
-                || kind === 157 /* Constructor */
-                || kind === 156 /* MethodDeclaration */
-                || kind === 158 /* GetAccessor */
-                || kind === 159 /* SetAccessor */;
+            return kind === 241 /* ClassDeclaration */
+                || kind === 158 /* Constructor */
+                || kind === 157 /* MethodDeclaration */
+                || kind === 159 /* GetAccessor */
+                || kind === 160 /* SetAccessor */;
         }
         function createSuperElementAccessInAsyncMethod(argumentExpression, location) {
             if (enclosingSuperContainerFlags & 4096 /* AsyncMethodWithSuperBinding */) {
@@ -71320,7 +73707,7 @@ var ts;
                 return node;
             }
             switch (node.kind) {
-                case 274 /* CatchClause */:
+                case 275 /* CatchClause */:
                     return visitCatchClause(node);
                 default:
                     return ts.visitEachChild(node, visitor, context);
@@ -71389,13 +73776,13 @@ var ts;
         }
         function visitorWorker(node) {
             switch (node.kind) {
-                case 260 /* JsxElement */:
+                case 261 /* JsxElement */:
                     return visitJsxElement(node, /*isChild*/ false);
-                case 261 /* JsxSelfClosingElement */:
+                case 262 /* JsxSelfClosingElement */:
                     return visitJsxSelfClosingElement(node, /*isChild*/ false);
-                case 264 /* JsxFragment */:
+                case 265 /* JsxFragment */:
                     return visitJsxFragment(node, /*isChild*/ false);
-                case 270 /* JsxExpression */:
+                case 271 /* JsxExpression */:
                     return visitJsxExpression(node);
                 default:
                     return ts.visitEachChild(node, visitor, context);
@@ -71405,13 +73792,13 @@ var ts;
             switch (node.kind) {
                 case 11 /* JsxText */:
                     return visitJsxText(node);
-                case 270 /* JsxExpression */:
+                case 271 /* JsxExpression */:
                     return visitJsxExpression(node);
-                case 260 /* JsxElement */:
+                case 261 /* JsxElement */:
                     return visitJsxElement(node, /*isChild*/ true);
-                case 261 /* JsxSelfClosingElement */:
+                case 262 /* JsxSelfClosingElement */:
                     return visitJsxSelfClosingElement(node, /*isChild*/ true);
-                case 264 /* JsxFragment */:
+                case 265 /* JsxFragment */:
                     return visitJsxFragment(node, /*isChild*/ true);
                 default:
                     return ts.Debug.failBadSyntaxKind(node);
@@ -71486,7 +73873,7 @@ var ts;
                 literal.singleQuote = node.singleQuote !== undefined ? node.singleQuote : !ts.isStringDoubleQuoted(node, currentSourceFile);
                 return ts.setTextRange(literal, node);
             }
-            else if (node.kind === 270 /* JsxExpression */) {
+            else if (node.kind === 271 /* JsxExpression */) {
                 if (node.expression === undefined) {
                     return ts.createTrue();
                 }
@@ -71497,7 +73884,7 @@ var ts;
             }
         }
         function visitJsxText(node) {
-            var fixed = fixupWhitespaceAndDecodeEntities(ts.getTextOfNode(node, /*includeTrivia*/ true));
+            var fixed = fixupWhitespaceAndDecodeEntities(node.text);
             return fixed === undefined ? undefined : ts.createLiteral(fixed);
         }
         /**
@@ -71580,7 +73967,7 @@ var ts;
             return decoded === text ? undefined : decoded;
         }
         function getTagName(node) {
-            if (node.kind === 260 /* JsxElement */) {
+            if (node.kind === 261 /* JsxElement */) {
                 return getTagName(node.openingElement);
             }
             else {
@@ -71886,7 +74273,7 @@ var ts;
                 return node;
             }
             switch (node.kind) {
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return visitBinaryExpression(node);
                 default:
                     return ts.visitEachChild(node, visitor, context);
@@ -71894,7 +74281,7 @@ var ts;
         }
         function visitBinaryExpression(node) {
             switch (node.operatorToken.kind) {
-                case 63 /* AsteriskAsteriskEqualsToken */:
+                case 64 /* AsteriskAsteriskEqualsToken */:
                     return visitExponentiationAssignmentExpression(node);
                 case 41 /* AsteriskAsteriskToken */:
                     return visitExponentiationExpression(node);
@@ -71979,62 +74366,63 @@ var ts;
         HierarchyFacts[HierarchyFacts["Block"] = 128] = "Block";
         HierarchyFacts[HierarchyFacts["IterationStatement"] = 256] = "IterationStatement";
         HierarchyFacts[HierarchyFacts["IterationStatementBlock"] = 512] = "IterationStatementBlock";
-        HierarchyFacts[HierarchyFacts["ForStatement"] = 1024] = "ForStatement";
-        HierarchyFacts[HierarchyFacts["ForInOrForOfStatement"] = 2048] = "ForInOrForOfStatement";
-        HierarchyFacts[HierarchyFacts["ConstructorWithCapturedSuper"] = 4096] = "ConstructorWithCapturedSuper";
+        HierarchyFacts[HierarchyFacts["IterationContainer"] = 1024] = "IterationContainer";
+        HierarchyFacts[HierarchyFacts["ForStatement"] = 2048] = "ForStatement";
+        HierarchyFacts[HierarchyFacts["ForInOrForOfStatement"] = 4096] = "ForInOrForOfStatement";
+        HierarchyFacts[HierarchyFacts["ConstructorWithCapturedSuper"] = 8192] = "ConstructorWithCapturedSuper";
         // NOTE: do not add more ancestor flags without also updating AncestorFactsMask below.
         // NOTE: when adding a new ancestor flag, be sure to update the subtree flags below.
         //
         // Ancestor masks
         //
-        HierarchyFacts[HierarchyFacts["AncestorFactsMask"] = 8191] = "AncestorFactsMask";
+        HierarchyFacts[HierarchyFacts["AncestorFactsMask"] = 16383] = "AncestorFactsMask";
         // We are always in *some* kind of block scope, but only specific block-scope containers are
         // top-level or Blocks.
         HierarchyFacts[HierarchyFacts["BlockScopeIncludes"] = 0] = "BlockScopeIncludes";
-        HierarchyFacts[HierarchyFacts["BlockScopeExcludes"] = 4032] = "BlockScopeExcludes";
+        HierarchyFacts[HierarchyFacts["BlockScopeExcludes"] = 7104] = "BlockScopeExcludes";
         // A source file is a top-level block scope.
         HierarchyFacts[HierarchyFacts["SourceFileIncludes"] = 64] = "SourceFileIncludes";
-        HierarchyFacts[HierarchyFacts["SourceFileExcludes"] = 3968] = "SourceFileExcludes";
+        HierarchyFacts[HierarchyFacts["SourceFileExcludes"] = 8064] = "SourceFileExcludes";
         // Functions, methods, and accessors are both new lexical scopes and new block scopes.
         HierarchyFacts[HierarchyFacts["FunctionIncludes"] = 65] = "FunctionIncludes";
-        HierarchyFacts[HierarchyFacts["FunctionExcludes"] = 8094] = "FunctionExcludes";
+        HierarchyFacts[HierarchyFacts["FunctionExcludes"] = 16286] = "FunctionExcludes";
         HierarchyFacts[HierarchyFacts["AsyncFunctionBodyIncludes"] = 69] = "AsyncFunctionBodyIncludes";
-        HierarchyFacts[HierarchyFacts["AsyncFunctionBodyExcludes"] = 8086] = "AsyncFunctionBodyExcludes";
+        HierarchyFacts[HierarchyFacts["AsyncFunctionBodyExcludes"] = 16278] = "AsyncFunctionBodyExcludes";
         // Arrow functions are lexically scoped to their container, but are new block scopes.
         HierarchyFacts[HierarchyFacts["ArrowFunctionIncludes"] = 66] = "ArrowFunctionIncludes";
-        HierarchyFacts[HierarchyFacts["ArrowFunctionExcludes"] = 8064] = "ArrowFunctionExcludes";
+        HierarchyFacts[HierarchyFacts["ArrowFunctionExcludes"] = 15232] = "ArrowFunctionExcludes";
         // Constructors are both new lexical scopes and new block scopes. Constructors are also
         // always considered non-static members of a class.
         HierarchyFacts[HierarchyFacts["ConstructorIncludes"] = 73] = "ConstructorIncludes";
-        HierarchyFacts[HierarchyFacts["ConstructorExcludes"] = 8086] = "ConstructorExcludes";
+        HierarchyFacts[HierarchyFacts["ConstructorExcludes"] = 16278] = "ConstructorExcludes";
         // 'do' and 'while' statements are not block scopes. We track that the subtree is contained
         // within an IterationStatement to indicate whether the embedded statement is an
         // IterationStatementBlock.
-        HierarchyFacts[HierarchyFacts["DoOrWhileStatementIncludes"] = 256] = "DoOrWhileStatementIncludes";
+        HierarchyFacts[HierarchyFacts["DoOrWhileStatementIncludes"] = 1280] = "DoOrWhileStatementIncludes";
         HierarchyFacts[HierarchyFacts["DoOrWhileStatementExcludes"] = 0] = "DoOrWhileStatementExcludes";
         // 'for' statements are new block scopes and have special handling for 'let' declarations.
-        HierarchyFacts[HierarchyFacts["ForStatementIncludes"] = 1280] = "ForStatementIncludes";
-        HierarchyFacts[HierarchyFacts["ForStatementExcludes"] = 3008] = "ForStatementExcludes";
+        HierarchyFacts[HierarchyFacts["ForStatementIncludes"] = 3328] = "ForStatementIncludes";
+        HierarchyFacts[HierarchyFacts["ForStatementExcludes"] = 5056] = "ForStatementExcludes";
         // 'for-in' and 'for-of' statements are new block scopes and have special handling for
         // 'let' declarations.
-        HierarchyFacts[HierarchyFacts["ForInOrForOfStatementIncludes"] = 2304] = "ForInOrForOfStatementIncludes";
-        HierarchyFacts[HierarchyFacts["ForInOrForOfStatementExcludes"] = 1984] = "ForInOrForOfStatementExcludes";
+        HierarchyFacts[HierarchyFacts["ForInOrForOfStatementIncludes"] = 5376] = "ForInOrForOfStatementIncludes";
+        HierarchyFacts[HierarchyFacts["ForInOrForOfStatementExcludes"] = 3008] = "ForInOrForOfStatementExcludes";
         // Blocks (other than function bodies) are new block scopes.
         HierarchyFacts[HierarchyFacts["BlockIncludes"] = 128] = "BlockIncludes";
-        HierarchyFacts[HierarchyFacts["BlockExcludes"] = 3904] = "BlockExcludes";
+        HierarchyFacts[HierarchyFacts["BlockExcludes"] = 6976] = "BlockExcludes";
         HierarchyFacts[HierarchyFacts["IterationStatementBlockIncludes"] = 512] = "IterationStatementBlockIncludes";
-        HierarchyFacts[HierarchyFacts["IterationStatementBlockExcludes"] = 4032] = "IterationStatementBlockExcludes";
+        HierarchyFacts[HierarchyFacts["IterationStatementBlockExcludes"] = 7104] = "IterationStatementBlockExcludes";
         //
         // Subtree facts
         //
-        HierarchyFacts[HierarchyFacts["NewTarget"] = 8192] = "NewTarget";
-        HierarchyFacts[HierarchyFacts["CapturedLexicalThis"] = 16384] = "CapturedLexicalThis";
+        HierarchyFacts[HierarchyFacts["NewTarget"] = 16384] = "NewTarget";
+        HierarchyFacts[HierarchyFacts["CapturedLexicalThis"] = 32768] = "CapturedLexicalThis";
         //
         // Subtree masks
         //
-        HierarchyFacts[HierarchyFacts["SubtreeFactsMask"] = -8192] = "SubtreeFactsMask";
+        HierarchyFacts[HierarchyFacts["SubtreeFactsMask"] = -16384] = "SubtreeFactsMask";
         HierarchyFacts[HierarchyFacts["ArrowFunctionSubtreeExcludes"] = 0] = "ArrowFunctionSubtreeExcludes";
-        HierarchyFacts[HierarchyFacts["FunctionSubtreeExcludes"] = 24576] = "FunctionSubtreeExcludes";
+        HierarchyFacts[HierarchyFacts["FunctionSubtreeExcludes"] = 49152] = "FunctionSubtreeExcludes";
     })(HierarchyFacts || (HierarchyFacts = {}));
     function transformES2015(context) {
         var startLexicalEnvironment = context.startLexicalEnvironment, resumeLexicalEnvironment = context.resumeLexicalEnvironment, endLexicalEnvironment = context.endLexicalEnvironment, hoistVariableDeclaration = context.hoistVariableDeclaration;
@@ -72083,7 +74471,7 @@ var ts;
          */
         function enterSubtree(excludeFacts, includeFacts) {
             var ancestorFacts = hierarchyFacts;
-            hierarchyFacts = (hierarchyFacts & ~excludeFacts | includeFacts) & 8191 /* AncestorFactsMask */;
+            hierarchyFacts = (hierarchyFacts & ~excludeFacts | includeFacts) & 16383 /* AncestorFactsMask */;
             return ancestorFacts;
         }
         /**
@@ -72094,17 +74482,17 @@ var ts;
          * @param includeFacts The new `HierarchyFacts` of the subtree that should be propagated.
          */
         function exitSubtree(ancestorFacts, excludeFacts, includeFacts) {
-            hierarchyFacts = (hierarchyFacts & ~excludeFacts | includeFacts) & -8192 /* SubtreeFactsMask */ | ancestorFacts;
+            hierarchyFacts = (hierarchyFacts & ~excludeFacts | includeFacts) & -16384 /* SubtreeFactsMask */ | ancestorFacts;
         }
         function isReturnVoidStatementInConstructorWithCapturedSuper(node) {
-            return (hierarchyFacts & 4096 /* ConstructorWithCapturedSuper */) !== 0
-                && node.kind === 230 /* ReturnStatement */
+            return (hierarchyFacts & 8192 /* ConstructorWithCapturedSuper */) !== 0
+                && node.kind === 231 /* ReturnStatement */
                 && !node.expression;
         }
         function shouldVisitNode(node) {
             return (node.transformFlags & 128 /* ContainsES2015 */) !== 0
                 || convertedLoopState !== undefined
-                || (hierarchyFacts & 4096 /* ConstructorWithCapturedSuper */ && (ts.isStatement(node) || (node.kind === 218 /* Block */)))
+                || (hierarchyFacts & 8192 /* ConstructorWithCapturedSuper */ && (ts.isStatement(node) || (node.kind === 219 /* Block */)))
                 || (ts.isIterationStatement(node, /*lookInLabeledStatements*/ false) && shouldConvertIterationStatement(node))
                 || (ts.getEmitFlags(node) & 33554432 /* TypeScriptClassWrapper */) !== 0;
         }
@@ -72117,72 +74505,72 @@ var ts;
             }
         }
         function callExpressionVisitor(node) {
-            if (node.kind === 98 /* SuperKeyword */) {
+            if (node.kind === 99 /* SuperKeyword */) {
                 return visitSuperKeyword(/*isExpressionOfCall*/ true);
             }
             return visitor(node);
         }
         function visitJavaScript(node) {
             switch (node.kind) {
-                case 116 /* StaticKeyword */:
+                case 117 /* StaticKeyword */:
                     return undefined; // elide static keyword
-                case 240 /* ClassDeclaration */:
+                case 241 /* ClassDeclaration */:
                     return visitClassDeclaration(node);
-                case 209 /* ClassExpression */:
+                case 210 /* ClassExpression */:
                     return visitClassExpression(node);
-                case 151 /* Parameter */:
+                case 152 /* Parameter */:
                     return visitParameter(node);
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     return visitFunctionDeclaration(node);
-                case 197 /* ArrowFunction */:
+                case 198 /* ArrowFunction */:
                     return visitArrowFunction(node);
-                case 196 /* FunctionExpression */:
+                case 197 /* FunctionExpression */:
                     return visitFunctionExpression(node);
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     return visitVariableDeclaration(node);
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return visitIdentifier(node);
-                case 238 /* VariableDeclarationList */:
+                case 239 /* VariableDeclarationList */:
                     return visitVariableDeclarationList(node);
-                case 232 /* SwitchStatement */:
+                case 233 /* SwitchStatement */:
                     return visitSwitchStatement(node);
-                case 246 /* CaseBlock */:
+                case 247 /* CaseBlock */:
                     return visitCaseBlock(node);
-                case 218 /* Block */:
+                case 219 /* Block */:
                     return visitBlock(node, /*isFunctionBody*/ false);
-                case 229 /* BreakStatement */:
-                case 228 /* ContinueStatement */:
+                case 230 /* BreakStatement */:
+                case 229 /* ContinueStatement */:
                     return visitBreakOrContinueStatement(node);
-                case 233 /* LabeledStatement */:
+                case 234 /* LabeledStatement */:
                     return visitLabeledStatement(node);
-                case 223 /* DoStatement */:
-                case 224 /* WhileStatement */:
+                case 224 /* DoStatement */:
+                case 225 /* WhileStatement */:
                     return visitDoOrWhileStatement(node, /*outermostLabeledStatement*/ undefined);
-                case 225 /* ForStatement */:
+                case 226 /* ForStatement */:
                     return visitForStatement(node, /*outermostLabeledStatement*/ undefined);
-                case 226 /* ForInStatement */:
+                case 227 /* ForInStatement */:
                     return visitForInStatement(node, /*outermostLabeledStatement*/ undefined);
-                case 227 /* ForOfStatement */:
+                case 228 /* ForOfStatement */:
                     return visitForOfStatement(node, /*outermostLabeledStatement*/ undefined);
-                case 221 /* ExpressionStatement */:
+                case 222 /* ExpressionStatement */:
                     return visitExpressionStatement(node);
-                case 188 /* ObjectLiteralExpression */:
+                case 189 /* ObjectLiteralExpression */:
                     return visitObjectLiteralExpression(node);
-                case 274 /* CatchClause */:
+                case 275 /* CatchClause */:
                     return visitCatchClause(node);
-                case 276 /* ShorthandPropertyAssignment */:
+                case 277 /* ShorthandPropertyAssignment */:
                     return visitShorthandPropertyAssignment(node);
-                case 149 /* ComputedPropertyName */:
+                case 150 /* ComputedPropertyName */:
                     return visitComputedPropertyName(node);
-                case 187 /* ArrayLiteralExpression */:
+                case 188 /* ArrayLiteralExpression */:
                     return visitArrayLiteralExpression(node);
-                case 191 /* CallExpression */:
+                case 192 /* CallExpression */:
                     return visitCallExpression(node);
-                case 192 /* NewExpression */:
+                case 193 /* NewExpression */:
                     return visitNewExpression(node);
-                case 195 /* ParenthesizedExpression */:
+                case 196 /* ParenthesizedExpression */:
                     return visitParenthesizedExpression(node, /*needsDestructuringValue*/ true);
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return visitBinaryExpression(node, /*needsDestructuringValue*/ true);
                 case 14 /* NoSubstitutionTemplateLiteral */:
                 case 15 /* TemplateHead */:
@@ -72193,35 +74581,35 @@ var ts;
                     return visitStringLiteral(node);
                 case 8 /* NumericLiteral */:
                     return visitNumericLiteral(node);
-                case 193 /* TaggedTemplateExpression */:
+                case 194 /* TaggedTemplateExpression */:
                     return visitTaggedTemplateExpression(node);
-                case 206 /* TemplateExpression */:
+                case 207 /* TemplateExpression */:
                     return visitTemplateExpression(node);
-                case 207 /* YieldExpression */:
+                case 208 /* YieldExpression */:
                     return visitYieldExpression(node);
-                case 208 /* SpreadElement */:
+                case 209 /* SpreadElement */:
                     return visitSpreadElement(node);
-                case 98 /* SuperKeyword */:
+                case 99 /* SuperKeyword */:
                     return visitSuperKeyword(/*isExpressionOfCall*/ false);
-                case 100 /* ThisKeyword */:
+                case 101 /* ThisKeyword */:
                     return visitThisKeyword(node);
-                case 214 /* MetaProperty */:
+                case 215 /* MetaProperty */:
                     return visitMetaProperty(node);
-                case 156 /* MethodDeclaration */:
+                case 157 /* MethodDeclaration */:
                     return visitMethodDeclaration(node);
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     return visitAccessorDeclaration(node);
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     return visitVariableStatement(node);
-                case 230 /* ReturnStatement */:
+                case 231 /* ReturnStatement */:
                     return visitReturnStatement(node);
                 default:
                     return ts.visitEachChild(node, visitor, context);
             }
         }
         function visitSourceFile(node) {
-            var ancestorFacts = enterSubtree(3968 /* SourceFileExcludes */, 64 /* SourceFileIncludes */);
+            var ancestorFacts = enterSubtree(8064 /* SourceFileExcludes */, 64 /* SourceFileIncludes */);
             var prologue = [];
             var statements = [];
             startLexicalEnvironment();
@@ -72248,7 +74636,7 @@ var ts;
             return ts.visitEachChild(node, visitor, context);
         }
         function visitCaseBlock(node) {
-            var ancestorFacts = enterSubtree(4032 /* BlockScopeExcludes */, 0 /* BlockScopeIncludes */);
+            var ancestorFacts = enterSubtree(7104 /* BlockScopeExcludes */, 0 /* BlockScopeIncludes */);
             var updated = ts.visitEachChild(node, visitor, context);
             exitSubtree(ancestorFacts, 0 /* None */, 0 /* None */);
             return updated;
@@ -72275,7 +74663,7 @@ var ts;
         }
         function visitThisKeyword(node) {
             if (hierarchyFacts & 2 /* ArrowFunction */) {
-                hierarchyFacts |= 16384 /* CapturedLexicalThis */;
+                hierarchyFacts |= 32768 /* CapturedLexicalThis */;
             }
             if (convertedLoopState) {
                 if (hierarchyFacts & 2 /* ArrowFunction */) {
@@ -72305,14 +74693,14 @@ var ts;
                 // it is possible if either
                 //   - break/continue is labeled and label is located inside the converted loop
                 //   - break/continue is non-labeled and located in non-converted loop/switch statement
-                var jump = node.kind === 229 /* BreakStatement */ ? 2 /* Break */ : 4 /* Continue */;
+                var jump = node.kind === 230 /* BreakStatement */ ? 2 /* Break */ : 4 /* Continue */;
                 var canUseBreakOrContinue = (node.label && convertedLoopState.labels && convertedLoopState.labels.get(ts.idText(node.label))) ||
                     (!node.label && (convertedLoopState.allowedNonLabeledJumps & jump));
                 if (!canUseBreakOrContinue) {
                     var labelMarker = void 0;
                     var label = node.label;
                     if (!label) {
-                        if (node.kind === 229 /* BreakStatement */) {
+                        if (node.kind === 230 /* BreakStatement */) {
                             convertedLoopState.nonLocalJumps |= 2 /* Break */;
                             labelMarker = "break";
                         }
@@ -72323,7 +74711,7 @@ var ts;
                         }
                     }
                     else {
-                        if (node.kind === 229 /* BreakStatement */) {
+                        if (node.kind === 230 /* BreakStatement */) {
                             labelMarker = "break-" + label.escapedText;
                             setLabeledJump(convertedLoopState, /*isBreak*/ true, ts.idText(label), labelMarker);
                         }
@@ -72518,7 +74906,7 @@ var ts;
         function addConstructor(statements, node, extendsClauseElement) {
             var savedConvertedLoopState = convertedLoopState;
             convertedLoopState = undefined;
-            var ancestorFacts = enterSubtree(8086 /* ConstructorExcludes */, 73 /* ConstructorIncludes */);
+            var ancestorFacts = enterSubtree(16278 /* ConstructorExcludes */, 73 /* ConstructorIncludes */);
             var constructor = ts.getFirstConstructorWithBody(node);
             var hasSynthesizedSuper = hasSynthesizedDefaultSuperCall(constructor, extendsClauseElement !== undefined);
             var constructorFunction = ts.createFunctionDeclaration(
@@ -72532,7 +74920,7 @@ var ts;
                 ts.setEmitFlags(constructorFunction, 8 /* CapturesThis */);
             }
             statements.push(constructorFunction);
-            exitSubtree(ancestorFacts, 24576 /* FunctionSubtreeExcludes */, 0 /* None */);
+            exitSubtree(ancestorFacts, 49152 /* FunctionSubtreeExcludes */, 0 /* None */);
             convertedLoopState = savedConvertedLoopState;
         }
         /**
@@ -72581,7 +74969,7 @@ var ts;
         function transformConstructorBody(constructor, node, extendsClauseElement, hasSynthesizedSuper) {
             // determine whether the class is known syntactically to be a derived class (e.g. a
             // class that extends a value that is not syntactically known to be `null`).
-            var isDerivedClass = !!extendsClauseElement && ts.skipOuterExpressions(extendsClauseElement.expression).kind !== 96 /* NullKeyword */;
+            var isDerivedClass = !!extendsClauseElement && ts.skipOuterExpressions(extendsClauseElement.expression).kind !== 97 /* NullKeyword */;
             // When the subclass does not have a constructor, we synthesize a *default* constructor using the following
             // representation:
             //
@@ -72625,7 +75013,7 @@ var ts;
                 }
             }
             if (superCallExpression) {
-                hierarchyFacts |= 4096 /* ConstructorWithCapturedSuper */;
+                hierarchyFacts |= 8192 /* ConstructorWithCapturedSuper */;
                 statementOffset++; // skip this statement, we will add it after visiting the rest of the body.
             }
             // visit the remaining statements
@@ -72719,11 +75107,11 @@ var ts;
          */
         function isSufficientlyCoveredByReturnStatements(statement) {
             // A return statement is considered covered.
-            if (statement.kind === 230 /* ReturnStatement */) {
+            if (statement.kind === 231 /* ReturnStatement */) {
                 return true;
             }
             // An if-statement with two covered branches is covered.
-            else if (statement.kind === 222 /* IfStatement */) {
+            else if (statement.kind === 223 /* IfStatement */) {
                 var ifStatement = statement;
                 if (ifStatement.elseStatement) {
                     return isSufficientlyCoveredByReturnStatements(ifStatement.thenStatement) &&
@@ -72731,7 +75119,7 @@ var ts;
                 }
             }
             // A block is covered if it has a last statement which is covered.
-            else if (statement.kind === 218 /* Block */) {
+            else if (statement.kind === 219 /* Block */) {
                 var lastStatement = ts.lastOrUndefined(statement.statements);
                 if (lastStatement && isSufficientlyCoveredByReturnStatements(lastStatement)) {
                     return true;
@@ -72886,10 +75274,10 @@ var ts;
                 return false;
             }
             // `declarationName` is the name of the local declaration for the parameter.
-            var declarationName = parameter.name.kind === 72 /* Identifier */ ? ts.getMutableClone(parameter.name) : ts.createTempVariable(/*recordTempVariable*/ undefined);
+            var declarationName = parameter.name.kind === 73 /* Identifier */ ? ts.getMutableClone(parameter.name) : ts.createTempVariable(/*recordTempVariable*/ undefined);
             ts.setEmitFlags(declarationName, 48 /* NoSourceMap */);
             // `expressionName` is the name of the parameter used in expressions.
-            var expressionName = parameter.name.kind === 72 /* Identifier */ ? ts.getSynthesizedClone(parameter.name) : declarationName;
+            var expressionName = parameter.name.kind === 73 /* Identifier */ ? ts.getSynthesizedClone(parameter.name) : declarationName;
             var restIndex = node.parameters.length - 1;
             var temp = ts.createLoopVariable();
             // var param = [];
@@ -72913,7 +75301,7 @@ var ts;
             ts.setEmitFlags(forStatement, 1048576 /* CustomPrologue */);
             ts.startOnNewLine(forStatement);
             prologueStatements.push(forStatement);
-            if (parameter.name.kind !== 72 /* Identifier */) {
+            if (parameter.name.kind !== 73 /* Identifier */) {
                 // do the actual destructuring of the rest parameter if necessary
                 prologueStatements.push(ts.setEmitFlags(ts.setTextRange(ts.createVariableStatement(
                 /*modifiers*/ undefined, ts.createVariableDeclarationList(ts.flattenDestructuringBinding(parameter, visitor, context, 0 /* All */, expressionName))), parameter), 1048576 /* CustomPrologue */));
@@ -72929,7 +75317,7 @@ var ts;
          * @param node A node.
          */
         function insertCaptureThisForNodeIfNeeded(statements, node) {
-            if (hierarchyFacts & 16384 /* CapturedLexicalThis */ && node.kind !== 197 /* ArrowFunction */) {
+            if (hierarchyFacts & 32768 /* CapturedLexicalThis */ && node.kind !== 198 /* ArrowFunction */) {
                 insertCaptureThisForNode(statements, node, ts.createThis());
                 return true;
             }
@@ -72947,28 +75335,28 @@ var ts;
             ts.insertStatementAfterCustomPrologue(statements, captureThisStatement);
         }
         function insertCaptureNewTargetIfNeeded(statements, node, copyOnWrite) {
-            if (hierarchyFacts & 8192 /* NewTarget */) {
+            if (hierarchyFacts & 16384 /* NewTarget */) {
                 var newTarget = void 0;
                 switch (node.kind) {
-                    case 197 /* ArrowFunction */:
+                    case 198 /* ArrowFunction */:
                         return statements;
-                    case 156 /* MethodDeclaration */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
+                    case 157 /* MethodDeclaration */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
                         // Methods and accessors cannot be constructors, so 'new.target' will
                         // always return 'undefined'.
                         newTarget = ts.createVoidZero();
                         break;
-                    case 157 /* Constructor */:
+                    case 158 /* Constructor */:
                         // Class constructors can only be called with `new`, so `this.constructor`
                         // should be relatively safe to use.
                         newTarget = ts.createPropertyAccess(ts.setEmitFlags(ts.createThis(), 4 /* NoSubstitution */), "constructor");
                         break;
-                    case 239 /* FunctionDeclaration */:
-                    case 196 /* FunctionExpression */:
+                    case 240 /* FunctionDeclaration */:
+                    case 197 /* FunctionExpression */:
                         // Functions can be called or constructed, and may have a `this` due to
                         // being a member or when calling an imported function via `other_1.f()`.
-                        newTarget = ts.createConditional(ts.createLogicalAnd(ts.setEmitFlags(ts.createThis(), 4 /* NoSubstitution */), ts.createBinary(ts.setEmitFlags(ts.createThis(), 4 /* NoSubstitution */), 94 /* InstanceOfKeyword */, ts.getLocalName(node))), ts.createPropertyAccess(ts.setEmitFlags(ts.createThis(), 4 /* NoSubstitution */), "constructor"), ts.createVoidZero());
+                        newTarget = ts.createConditional(ts.createLogicalAnd(ts.setEmitFlags(ts.createThis(), 4 /* NoSubstitution */), ts.createBinary(ts.setEmitFlags(ts.createThis(), 4 /* NoSubstitution */), 95 /* InstanceOfKeyword */, ts.getLocalName(node))), ts.createPropertyAccess(ts.setEmitFlags(ts.createThis(), 4 /* NoSubstitution */), "constructor"), ts.createVoidZero());
                         break;
                     default:
                         return ts.Debug.failBadSyntaxKind(node);
@@ -72997,24 +75385,24 @@ var ts;
             for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                 var member = _a[_i];
                 switch (member.kind) {
-                    case 217 /* SemicolonClassElement */:
+                    case 218 /* SemicolonClassElement */:
                         statements.push(transformSemicolonClassElementToStatement(member));
                         break;
-                    case 156 /* MethodDeclaration */:
+                    case 157 /* MethodDeclaration */:
                         statements.push(transformClassMethodDeclarationToStatement(getClassMemberPrefix(node, member), member, node));
                         break;
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
                         var accessors = ts.getAllAccessorDeclarations(node.members, member);
                         if (member === accessors.firstAccessor) {
                             statements.push(transformAccessorsToStatement(getClassMemberPrefix(node, member), accessors, node));
                         }
                         break;
-                    case 157 /* Constructor */:
+                    case 158 /* Constructor */:
                         // Constructors are handled in visitClassExpression/visitClassDeclaration
                         break;
                     default:
-                        ts.Debug.failBadSyntaxKind(node);
+                        ts.Debug.failBadSyntaxKind(member, currentSourceFile && currentSourceFile.fileName);
                         break;
                 }
             }
@@ -73077,7 +75465,7 @@ var ts;
             // arguments are both mapped contiguously to the accessor name.
             var target = ts.getMutableClone(receiver);
             ts.setEmitFlags(target, 1536 /* NoComments */ | 32 /* NoTrailingSourceMap */);
-            ts.setSourceMapRange(target, firstAccessor.name); // TODO: GH#18217
+            ts.setSourceMapRange(target, firstAccessor.name);
             var propertyName = ts.createExpressionForPropertyName(ts.visitNode(firstAccessor.name, visitor, ts.isPropertyName));
             ts.setEmitFlags(propertyName, 1536 /* NoComments */ | 16 /* NoLeadingSourceMap */);
             ts.setSourceMapRange(propertyName, firstAccessor.name);
@@ -73117,11 +75505,11 @@ var ts;
          */
         function visitArrowFunction(node) {
             if (node.transformFlags & 2048 /* ContainsLexicalThis */) {
-                hierarchyFacts |= 16384 /* CapturedLexicalThis */;
+                hierarchyFacts |= 32768 /* CapturedLexicalThis */;
             }
             var savedConvertedLoopState = convertedLoopState;
             convertedLoopState = undefined;
-            var ancestorFacts = enterSubtree(8064 /* ArrowFunctionExcludes */, 66 /* ArrowFunctionIncludes */);
+            var ancestorFacts = enterSubtree(15232 /* ArrowFunctionExcludes */, 66 /* ArrowFunctionIncludes */);
             var func = ts.createFunctionExpression(
             /*modifiers*/ undefined, 
             /*asteriskToken*/ undefined, 
@@ -73131,7 +75519,7 @@ var ts;
             ts.setTextRange(func, node);
             ts.setOriginalNode(func, node);
             ts.setEmitFlags(func, 8 /* CapturesThis */);
-            if (hierarchyFacts & 16384 /* CapturedLexicalThis */) {
+            if (hierarchyFacts & 32768 /* CapturedLexicalThis */) {
                 enableSubstitutionsForCapturedThis();
             }
             // If an arrow function contains
@@ -73146,16 +75534,16 @@ var ts;
          */
         function visitFunctionExpression(node) {
             var ancestorFacts = ts.getEmitFlags(node) & 262144 /* AsyncFunctionBody */
-                ? enterSubtree(8086 /* AsyncFunctionBodyExcludes */, 69 /* AsyncFunctionBodyIncludes */)
-                : enterSubtree(8094 /* FunctionExcludes */, 65 /* FunctionIncludes */);
+                ? enterSubtree(16278 /* AsyncFunctionBodyExcludes */, 69 /* AsyncFunctionBodyIncludes */)
+                : enterSubtree(16286 /* FunctionExcludes */, 65 /* FunctionIncludes */);
             var savedConvertedLoopState = convertedLoopState;
             convertedLoopState = undefined;
             var parameters = ts.visitParameterList(node.parameters, visitor, context);
             var body = transformFunctionBody(node);
-            var name = hierarchyFacts & 8192 /* NewTarget */
+            var name = hierarchyFacts & 16384 /* NewTarget */
                 ? ts.getLocalName(node)
                 : node.name;
-            exitSubtree(ancestorFacts, 24576 /* FunctionSubtreeExcludes */, 0 /* None */);
+            exitSubtree(ancestorFacts, 49152 /* FunctionSubtreeExcludes */, 0 /* None */);
             convertedLoopState = savedConvertedLoopState;
             return ts.updateFunctionExpression(node, 
             /*modifiers*/ undefined, node.asteriskToken, name, 
@@ -73170,13 +75558,13 @@ var ts;
         function visitFunctionDeclaration(node) {
             var savedConvertedLoopState = convertedLoopState;
             convertedLoopState = undefined;
-            var ancestorFacts = enterSubtree(8094 /* FunctionExcludes */, 65 /* FunctionIncludes */);
+            var ancestorFacts = enterSubtree(16286 /* FunctionExcludes */, 65 /* FunctionIncludes */);
             var parameters = ts.visitParameterList(node.parameters, visitor, context);
             var body = transformFunctionBody(node);
-            var name = hierarchyFacts & 8192 /* NewTarget */
+            var name = hierarchyFacts & 16384 /* NewTarget */
                 ? ts.getLocalName(node)
                 : node.name;
-            exitSubtree(ancestorFacts, 24576 /* FunctionSubtreeExcludes */, 0 /* None */);
+            exitSubtree(ancestorFacts, 49152 /* FunctionSubtreeExcludes */, 0 /* None */);
             convertedLoopState = savedConvertedLoopState;
             return ts.updateFunctionDeclaration(node, 
             /*decorators*/ undefined, ts.visitNodes(node.modifiers, visitor, ts.isModifier), node.asteriskToken, name, 
@@ -73194,14 +75582,14 @@ var ts;
             var savedConvertedLoopState = convertedLoopState;
             convertedLoopState = undefined;
             var ancestorFacts = container && ts.isClassLike(container) && !ts.hasModifier(node, 32 /* Static */)
-                ? enterSubtree(8094 /* FunctionExcludes */, 65 /* FunctionIncludes */ | 8 /* NonStaticClassElement */)
-                : enterSubtree(8094 /* FunctionExcludes */, 65 /* FunctionIncludes */);
+                ? enterSubtree(16286 /* FunctionExcludes */, 65 /* FunctionIncludes */ | 8 /* NonStaticClassElement */)
+                : enterSubtree(16286 /* FunctionExcludes */, 65 /* FunctionIncludes */);
             var parameters = ts.visitParameterList(node.parameters, visitor, context);
             var body = transformFunctionBody(node);
-            if (hierarchyFacts & 8192 /* NewTarget */ && !name && (node.kind === 239 /* FunctionDeclaration */ || node.kind === 196 /* FunctionExpression */)) {
+            if (hierarchyFacts & 16384 /* NewTarget */ && !name && (node.kind === 240 /* FunctionDeclaration */ || node.kind === 197 /* FunctionExpression */)) {
                 name = ts.getGeneratedNameForNode(node);
             }
-            exitSubtree(ancestorFacts, 24576 /* FunctionSubtreeExcludes */, 0 /* None */);
+            exitSubtree(ancestorFacts, 49152 /* FunctionSubtreeExcludes */, 0 /* None */);
             convertedLoopState = savedConvertedLoopState;
             return ts.setOriginalNode(ts.setTextRange(ts.createFunctionExpression(
             /*modifiers*/ undefined, node.asteriskToken, name, 
@@ -73242,7 +75630,7 @@ var ts;
                 }
             }
             else {
-                ts.Debug.assert(node.kind === 197 /* ArrowFunction */);
+                ts.Debug.assert(node.kind === 198 /* ArrowFunction */);
                 // To align with the old emitter, we use a synthetic end position on the location
                 // for the statement list we synthesize when we down-level an arrow function with
                 // an expression function body. This prevents both comments and source maps from
@@ -73296,8 +75684,8 @@ var ts;
                 return ts.visitEachChild(node, visitor, context);
             }
             var ancestorFacts = hierarchyFacts & 256 /* IterationStatement */
-                ? enterSubtree(4032 /* IterationStatementBlockExcludes */, 512 /* IterationStatementBlockIncludes */)
-                : enterSubtree(3904 /* BlockExcludes */, 128 /* BlockIncludes */);
+                ? enterSubtree(7104 /* IterationStatementBlockExcludes */, 512 /* IterationStatementBlockIncludes */)
+                : enterSubtree(6976 /* BlockExcludes */, 128 /* BlockIncludes */);
             var updated = ts.visitEachChild(node, visitor, context);
             exitSubtree(ancestorFacts, 0 /* None */, 0 /* None */);
             return updated;
@@ -73310,9 +75698,9 @@ var ts;
         function visitExpressionStatement(node) {
             // If we are here it is most likely because our expression is a destructuring assignment.
             switch (node.expression.kind) {
-                case 195 /* ParenthesizedExpression */:
+                case 196 /* ParenthesizedExpression */:
                     return ts.updateExpressionStatement(node, visitParenthesizedExpression(node.expression, /*needsDestructuringValue*/ false));
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return ts.updateExpressionStatement(node, visitBinaryExpression(node.expression, /*needsDestructuringValue*/ false));
             }
             return ts.visitEachChild(node, visitor, context);
@@ -73331,9 +75719,9 @@ var ts;
                 // expression. If we are in a state where we do not need the destructuring value,
                 // we pass that information along to the children that care about it.
                 switch (node.expression.kind) {
-                    case 195 /* ParenthesizedExpression */:
+                    case 196 /* ParenthesizedExpression */:
                         return ts.updateParen(node, visitParenthesizedExpression(node.expression, /*needsDestructuringValue*/ false));
-                    case 204 /* BinaryExpression */:
+                    case 205 /* BinaryExpression */:
                         return ts.updateParen(node, visitBinaryExpression(node.expression, /*needsDestructuringValue*/ false));
                 }
             }
@@ -73368,7 +75756,7 @@ var ts;
                             assignment = ts.flattenDestructuringAssignment(decl, visitor, context, 0 /* All */);
                         }
                         else {
-                            assignment = ts.createBinary(decl.name, 59 /* EqualsToken */, ts.visitNode(decl.initializer, visitor, ts.isExpression));
+                            assignment = ts.createBinary(decl.name, 60 /* EqualsToken */, ts.visitNode(decl.initializer, visitor, ts.isExpression));
                             ts.setTextRange(assignment, decl);
                         }
                         assignments = ts.append(assignments, assignment);
@@ -73480,11 +75868,11 @@ var ts;
                     && isDeclaredInLoop
                     && (hierarchyFacts & 512 /* IterationStatementBlock */) !== 0);
             var emitExplicitInitializer = !emittedAsTopLevel
-                && (hierarchyFacts & 2048 /* ForInOrForOfStatement */) === 0
+                && (hierarchyFacts & 4096 /* ForInOrForOfStatement */) === 0
                 && (!resolver.isDeclarationWithCollidingName(node)
                     || (isDeclaredInLoop
                         && !isCapturedInFunction
-                        && (hierarchyFacts & (1024 /* ForStatement */ | 2048 /* ForInOrForOfStatement */)) === 0));
+                        && (hierarchyFacts & (2048 /* ForStatement */ | 4096 /* ForInOrForOfStatement */)) === 0));
             return emitExplicitInitializer;
         }
         /**
@@ -73501,9 +75889,9 @@ var ts;
                 return visitVariableDeclaration(node);
             }
             if (!node.initializer && shouldEmitExplicitInitializerForLetDeclaration(node)) {
-                var clone_2 = ts.getMutableClone(node);
-                clone_2.initializer = ts.createVoidZero();
-                return clone_2;
+                var clone_3 = ts.getMutableClone(node);
+                clone_3.initializer = ts.createVoidZero();
+                return clone_3;
             }
             return ts.visitEachChild(node, visitor, context);
         }
@@ -73542,34 +75930,34 @@ var ts;
         }
         function visitIterationStatement(node, outermostLabeledStatement) {
             switch (node.kind) {
-                case 223 /* DoStatement */:
-                case 224 /* WhileStatement */:
+                case 224 /* DoStatement */:
+                case 225 /* WhileStatement */:
                     return visitDoOrWhileStatement(node, outermostLabeledStatement);
-                case 225 /* ForStatement */:
+                case 226 /* ForStatement */:
                     return visitForStatement(node, outermostLabeledStatement);
-                case 226 /* ForInStatement */:
+                case 227 /* ForInStatement */:
                     return visitForInStatement(node, outermostLabeledStatement);
-                case 227 /* ForOfStatement */:
+                case 228 /* ForOfStatement */:
                     return visitForOfStatement(node, outermostLabeledStatement);
             }
         }
         function visitIterationStatementWithFacts(excludeFacts, includeFacts, node, outermostLabeledStatement, convert) {
             var ancestorFacts = enterSubtree(excludeFacts, includeFacts);
-            var updated = convertIterationStatementBodyIfNecessary(node, outermostLabeledStatement, convert);
+            var updated = convertIterationStatementBodyIfNecessary(node, outermostLabeledStatement, ancestorFacts, convert);
             exitSubtree(ancestorFacts, 0 /* None */, 0 /* None */);
             return updated;
         }
         function visitDoOrWhileStatement(node, outermostLabeledStatement) {
-            return visitIterationStatementWithFacts(0 /* DoOrWhileStatementExcludes */, 256 /* DoOrWhileStatementIncludes */, node, outermostLabeledStatement);
+            return visitIterationStatementWithFacts(0 /* DoOrWhileStatementExcludes */, 1280 /* DoOrWhileStatementIncludes */, node, outermostLabeledStatement);
         }
         function visitForStatement(node, outermostLabeledStatement) {
-            return visitIterationStatementWithFacts(3008 /* ForStatementExcludes */, 1280 /* ForStatementIncludes */, node, outermostLabeledStatement);
+            return visitIterationStatementWithFacts(5056 /* ForStatementExcludes */, 3328 /* ForStatementIncludes */, node, outermostLabeledStatement);
         }
         function visitForInStatement(node, outermostLabeledStatement) {
-            return visitIterationStatementWithFacts(1984 /* ForInOrForOfStatementExcludes */, 2304 /* ForInOrForOfStatementIncludes */, node, outermostLabeledStatement);
+            return visitIterationStatementWithFacts(3008 /* ForInOrForOfStatementExcludes */, 5376 /* ForInOrForOfStatementIncludes */, node, outermostLabeledStatement);
         }
         function visitForOfStatement(node, outermostLabeledStatement) {
-            return visitIterationStatementWithFacts(1984 /* ForInOrForOfStatementExcludes */, 2304 /* ForInOrForOfStatementIncludes */, node, outermostLabeledStatement, compilerOptions.downlevelIteration ? convertForOfStatementForIterable : convertForOfStatementForArray);
+            return visitIterationStatementWithFacts(3008 /* ForInOrForOfStatementExcludes */, 5376 /* ForInOrForOfStatementIncludes */, node, outermostLabeledStatement, compilerOptions.downlevelIteration ? convertForOfStatementForIterable : convertForOfStatementForArray);
         }
         function convertForOfStatementHead(node, boundValue, convertedLoopBodyStatements) {
             var statements = [];
@@ -73677,7 +76065,7 @@ var ts;
             ts.setTextRange(forStatement, node);
             return ts.restoreEnclosingLabel(forStatement, outermostLabeledStatement, convertedLoopState && resetLabel);
         }
-        function convertForOfStatementForIterable(node, outermostLabeledStatement, convertedLoopBodyStatements) {
+        function convertForOfStatementForIterable(node, outermostLabeledStatement, convertedLoopBodyStatements, ancestorFacts) {
             var expression = ts.visitNode(node.expression, visitor, ts.isExpression);
             var iterator = ts.isIdentifier(expression) ? ts.getGeneratedNameForNode(expression) : ts.createTempVariable(/*recordTempVariable*/ undefined);
             var result = ts.isIdentifier(expression) ? ts.getGeneratedNameForNode(iterator) : ts.createTempVariable(/*recordTempVariable*/ undefined);
@@ -73688,9 +76076,13 @@ var ts;
             var next = ts.createCall(ts.createPropertyAccess(iterator, "next"), /*typeArguments*/ undefined, []);
             hoistVariableDeclaration(errorRecord);
             hoistVariableDeclaration(returnMethod);
+            // if we are enclosed in an outer loop ensure we reset 'errorRecord' per each iteration
+            var initializer = ancestorFacts & 1024 /* IterationContainer */
+                ? ts.inlineExpressions([ts.createAssignment(errorRecord, ts.createVoidZero()), values])
+                : values;
             var forStatement = ts.setEmitFlags(ts.setTextRange(ts.createFor(
             /*initializer*/ ts.setEmitFlags(ts.setTextRange(ts.createVariableDeclarationList([
-                ts.setTextRange(ts.createVariableDeclaration(iterator, /*type*/ undefined, values), node.expression),
+                ts.setTextRange(ts.createVariableDeclaration(iterator, /*type*/ undefined, initializer), node.expression),
                 ts.createVariableDeclaration(result, /*type*/ undefined, next)
             ]), node.expression), 2097152 /* NoHoisting */), 
             /*condition*/ ts.createLogicalNot(ts.createPropertyAccess(result, "done")), 
@@ -73733,7 +76125,7 @@ var ts;
                     && i < numInitialPropertiesWithoutYield) {
                     numInitialPropertiesWithoutYield = i;
                 }
-                if (property.name.kind === 149 /* ComputedPropertyName */) {
+                if (property.name.kind === 150 /* ComputedPropertyName */) {
                     numInitialProperties = i;
                     break;
                 }
@@ -73788,7 +76180,7 @@ var ts;
             }
             visit(node.name);
             function visit(node) {
-                if (node.kind === 72 /* Identifier */) {
+                if (node.kind === 73 /* Identifier */) {
                     state.hoistedLocalVariables.push(node);
                 }
                 else {
@@ -73801,7 +76193,7 @@ var ts;
                 }
             }
         }
-        function convertIterationStatementBodyIfNecessary(node, outermostLabeledStatement, convert) {
+        function convertIterationStatementBodyIfNecessary(node, outermostLabeledStatement, ancestorFacts, convert) {
             if (!shouldConvertIterationStatement(node)) {
                 var saveAllowedNonLabeledJumps = void 0;
                 if (convertedLoopState) {
@@ -73811,7 +76203,7 @@ var ts;
                     convertedLoopState.allowedNonLabeledJumps = 2 /* Break */ | 4 /* Continue */;
                 }
                 var result = convert
-                    ? convert(node, outermostLabeledStatement, /*convertedLoopBodyStatements*/ undefined)
+                    ? convert(node, outermostLabeledStatement, /*convertedLoopBodyStatements*/ undefined, ancestorFacts)
                     : ts.restoreEnclosingLabel(ts.visitEachChild(node, visitor, context), outermostLabeledStatement, convertedLoopState && resetLabel);
                 if (convertedLoopState) {
                     convertedLoopState.allowedNonLabeledJumps = saveAllowedNonLabeledJumps;
@@ -73836,29 +76228,29 @@ var ts;
             var loop;
             if (bodyFunction) {
                 if (convert) {
-                    loop = convert(node, outermostLabeledStatement, bodyFunction.part);
+                    loop = convert(node, outermostLabeledStatement, bodyFunction.part, ancestorFacts);
                 }
                 else {
-                    var clone_3 = convertIterationStatementCore(node, initializerFunction, ts.createBlock(bodyFunction.part, /*multiLine*/ true));
-                    ts.aggregateTransformFlags(clone_3);
-                    loop = ts.restoreEnclosingLabel(clone_3, outermostLabeledStatement, convertedLoopState && resetLabel);
+                    var clone_4 = convertIterationStatementCore(node, initializerFunction, ts.createBlock(bodyFunction.part, /*multiLine*/ true));
+                    ts.aggregateTransformFlags(clone_4);
+                    loop = ts.restoreEnclosingLabel(clone_4, outermostLabeledStatement, convertedLoopState && resetLabel);
                 }
             }
             else {
-                var clone_4 = convertIterationStatementCore(node, initializerFunction, ts.visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock));
-                ts.aggregateTransformFlags(clone_4);
-                loop = ts.restoreEnclosingLabel(clone_4, outermostLabeledStatement, convertedLoopState && resetLabel);
+                var clone_5 = convertIterationStatementCore(node, initializerFunction, ts.visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock));
+                ts.aggregateTransformFlags(clone_5);
+                loop = ts.restoreEnclosingLabel(clone_5, outermostLabeledStatement, convertedLoopState && resetLabel);
             }
             statements.push(loop);
             return statements;
         }
         function convertIterationStatementCore(node, initializerFunction, convertedLoopBody) {
             switch (node.kind) {
-                case 225 /* ForStatement */: return convertForStatement(node, initializerFunction, convertedLoopBody);
-                case 226 /* ForInStatement */: return convertForInStatement(node, convertedLoopBody);
-                case 227 /* ForOfStatement */: return convertForOfStatement(node, convertedLoopBody);
-                case 223 /* DoStatement */: return convertDoStatement(node, convertedLoopBody);
-                case 224 /* WhileStatement */: return convertWhileStatement(node, convertedLoopBody);
+                case 226 /* ForStatement */: return convertForStatement(node, initializerFunction, convertedLoopBody);
+                case 227 /* ForInStatement */: return convertForInStatement(node, convertedLoopBody);
+                case 228 /* ForOfStatement */: return convertForOfStatement(node, convertedLoopBody);
+                case 224 /* DoStatement */: return convertDoStatement(node, convertedLoopBody);
+                case 225 /* WhileStatement */: return convertWhileStatement(node, convertedLoopBody);
                 default: return ts.Debug.failBadSyntaxKind(node, "IterationStatement expected");
             }
         }
@@ -73883,11 +76275,11 @@ var ts;
         function createConvertedLoopState(node) {
             var loopInitializer;
             switch (node.kind) {
-                case 225 /* ForStatement */:
-                case 226 /* ForInStatement */:
-                case 227 /* ForOfStatement */:
+                case 226 /* ForStatement */:
+                case 227 /* ForInStatement */:
+                case 228 /* ForOfStatement */:
                     var initializer = node.initializer;
-                    if (initializer && initializer.kind === 238 /* VariableDeclarationList */) {
+                    if (initializer && initializer.kind === 239 /* VariableDeclarationList */) {
                         loopInitializer = initializer;
                     }
                     break;
@@ -74149,7 +76541,7 @@ var ts;
         function copyOutParameter(outParam, copyDirection) {
             var source = copyDirection === 0 /* ToOriginal */ ? outParam.outParamName : outParam.originalName;
             var target = copyDirection === 0 /* ToOriginal */ ? outParam.originalName : outParam.outParamName;
-            return ts.createBinary(target, 59 /* EqualsToken */, source);
+            return ts.createBinary(target, 60 /* EqualsToken */, source);
         }
         function copyOutParameters(outParams, partFlags, copyDirection, statements) {
             for (var _i = 0, outParams_1 = outParams; _i < outParams_1.length; _i++) {
@@ -74286,20 +76678,20 @@ var ts;
             for (var i = start; i < numProperties; i++) {
                 var property = properties[i];
                 switch (property.kind) {
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
                         var accessors = ts.getAllAccessorDeclarations(node.properties, property);
                         if (property === accessors.firstAccessor) {
                             expressions.push(transformAccessorsToExpression(receiver, accessors, node, !!node.multiLine));
                         }
                         break;
-                    case 156 /* MethodDeclaration */:
+                    case 157 /* MethodDeclaration */:
                         expressions.push(transformObjectLiteralMethodDeclarationToExpression(property, receiver, node, node.multiLine));
                         break;
-                    case 275 /* PropertyAssignment */:
+                    case 276 /* PropertyAssignment */:
                         expressions.push(transformPropertyAssignmentToExpression(property, receiver, node.multiLine));
                         break;
-                    case 276 /* ShorthandPropertyAssignment */:
+                    case 277 /* ShorthandPropertyAssignment */:
                         expressions.push(transformShorthandPropertyAssignmentToExpression(property, receiver, node.multiLine));
                         break;
                     default:
@@ -74354,7 +76746,7 @@ var ts;
             return expression;
         }
         function visitCatchClause(node) {
-            var ancestorFacts = enterSubtree(4032 /* BlockScopeExcludes */, 0 /* BlockScopeIncludes */);
+            var ancestorFacts = enterSubtree(7104 /* BlockScopeExcludes */, 0 /* BlockScopeIncludes */);
             var updated;
             ts.Debug.assert(!!node.variableDeclaration, "Catch clause variable should always be present when downleveling ES2015.");
             if (ts.isBindingPattern(node.variableDeclaration.name)) {
@@ -74402,17 +76794,17 @@ var ts;
             ts.Debug.assert(!ts.isComputedPropertyName(node.name));
             var savedConvertedLoopState = convertedLoopState;
             convertedLoopState = undefined;
-            var ancestorFacts = enterSubtree(8094 /* FunctionExcludes */, 65 /* FunctionIncludes */);
+            var ancestorFacts = enterSubtree(16286 /* FunctionExcludes */, 65 /* FunctionIncludes */);
             var updated;
             var parameters = ts.visitParameterList(node.parameters, visitor, context);
             var body = transformFunctionBody(node);
-            if (node.kind === 158 /* GetAccessor */) {
+            if (node.kind === 159 /* GetAccessor */) {
                 updated = ts.updateGetAccessor(node, node.decorators, node.modifiers, node.name, parameters, node.type, body);
             }
             else {
                 updated = ts.updateSetAccessor(node, node.decorators, node.modifiers, node.name, parameters, body);
             }
-            exitSubtree(ancestorFacts, 24576 /* FunctionSubtreeExcludes */, 0 /* None */);
+            exitSubtree(ancestorFacts, 49152 /* FunctionSubtreeExcludes */, 0 /* None */);
             convertedLoopState = savedConvertedLoopState;
             return updated;
         }
@@ -74459,7 +76851,7 @@ var ts;
                 return visitTypeScriptClassWrapper(node);
             }
             var expression = ts.skipOuterExpressions(node.expression);
-            if (expression.kind === 98 /* SuperKeyword */ ||
+            if (expression.kind === 99 /* SuperKeyword */ ||
                 ts.isSuperProperty(expression) ||
                 ts.some(node.arguments, ts.isSpreadElement)) {
                 return visitCallExpressionWithPotentialCapturedThisAssignment(node, /*assignToCapturedThis*/ true);
@@ -74583,10 +76975,10 @@ var ts;
             // We are here either because SuperKeyword was used somewhere in the expression, or
             // because we contain a SpreadElementExpression.
             if (node.transformFlags & 4096 /* ContainsRestOrSpread */ ||
-                node.expression.kind === 98 /* SuperKeyword */ ||
+                node.expression.kind === 99 /* SuperKeyword */ ||
                 ts.isSuperProperty(ts.skipOuterExpressions(node.expression))) {
                 var _a = ts.createCallBinding(node.expression, hoistVariableDeclaration), target = _a.target, thisArg = _a.thisArg;
-                if (node.expression.kind === 98 /* SuperKeyword */) {
+                if (node.expression.kind === 99 /* SuperKeyword */) {
                     ts.setEmitFlags(thisArg, 4 /* NoSubstitution */);
                 }
                 var resultingCall = void 0;
@@ -74604,7 +76996,7 @@ var ts;
                     //      _super.apply(this, a.concat([b]))
                     //      _super.m.apply(this, a.concat([b]))
                     //      _super.prototype.m.apply(this, a.concat([b]))
-                    resultingCall = ts.createFunctionApply(ts.visitNode(target, callExpressionVisitor, ts.isExpression), node.expression.kind === 98 /* SuperKeyword */ ? thisArg : ts.visitNode(thisArg, visitor, ts.isExpression), transformAndSpreadElements(node.arguments, /*needsUniqueCopy*/ false, /*multiLine*/ false, /*hasTrailingComma*/ false));
+                    resultingCall = ts.createFunctionApply(ts.visitNode(target, callExpressionVisitor, ts.isExpression), node.expression.kind === 99 /* SuperKeyword */ ? thisArg : ts.visitNode(thisArg, visitor, ts.isExpression), transformAndSpreadElements(node.arguments, /*needsUniqueCopy*/ false, /*multiLine*/ false, /*hasTrailingComma*/ false));
                 }
                 else {
                     // [source]
@@ -74616,10 +77008,10 @@ var ts;
                     //      _super.call(this, a)
                     //      _super.m.call(this, a)
                     //      _super.prototype.m.call(this, a)
-                    resultingCall = ts.createFunctionCall(ts.visitNode(target, callExpressionVisitor, ts.isExpression), node.expression.kind === 98 /* SuperKeyword */ ? thisArg : ts.visitNode(thisArg, visitor, ts.isExpression), ts.visitNodes(node.arguments, visitor, ts.isExpression), 
+                    resultingCall = ts.createFunctionCall(ts.visitNode(target, callExpressionVisitor, ts.isExpression), node.expression.kind === 99 /* SuperKeyword */ ? thisArg : ts.visitNode(thisArg, visitor, ts.isExpression), ts.visitNodes(node.arguments, visitor, ts.isExpression), 
                     /*location*/ node);
                 }
-                if (node.expression.kind === 98 /* SuperKeyword */) {
+                if (node.expression.kind === 99 /* SuperKeyword */) {
                     var initializer = ts.createLogicalOr(resultingCall, createActualThis());
                     resultingCall = assignToCapturedThis
                         ? ts.createAssignment(ts.createFileLevelUniqueName("_this"), initializer)
@@ -74659,8 +77051,11 @@ var ts;
             // [source]
             //      [a, ...b, c]
             //
+            // [output (downlevelIteration)]
+            //      __spread([a], b, [c])
+            //
             // [output]
-            //      [a].concat(b, [c])
+            //      __spreadArrays([a], b, [c])
             // Map spans of spread expressions into their expressions and spans of other
             // expressions into an array literal.
             var numElements = elements.length;
@@ -74670,10 +77065,7 @@ var ts;
             if (compilerOptions.downlevelIteration) {
                 if (segments.length === 1) {
                     var firstSegment = segments[0];
-                    if (ts.isCallExpression(firstSegment)
-                        && ts.isIdentifier(firstSegment.expression)
-                        && (ts.getEmitFlags(firstSegment.expression) & 4096 /* HelperName */)
-                        && firstSegment.expression.escapedText === "___spread") {
+                    if (isCallToHelper(firstSegment, "___spread")) {
                         return segments[0];
                     }
                 }
@@ -74681,15 +77073,28 @@ var ts;
             }
             else {
                 if (segments.length === 1) {
-                    var firstElement = elements[0];
-                    return needsUniqueCopy && ts.isSpreadElement(firstElement) && firstElement.expression.kind !== 187 /* ArrayLiteralExpression */
-                        ? ts.createArraySlice(segments[0])
-                        : segments[0];
+                    var firstSegment = segments[0];
+                    if (!needsUniqueCopy
+                        || isPackedArrayLiteral(firstSegment)
+                        || isCallToHelper(firstSegment, "___spreadArrays")) {
+                        return segments[0];
+                    }
                 }
-                // Rewrite using the pattern <segment0>.concat(<segment1>, <segment2>, ...)
-                return ts.createArrayConcat(segments.shift(), segments);
+                return ts.createSpreadArraysHelper(context, segments);
             }
         }
+        function isPackedElement(node) {
+            return !ts.isOmittedExpression(node);
+        }
+        function isPackedArrayLiteral(node) {
+            return ts.isArrayLiteralExpression(node) && ts.every(node.elements, isPackedElement);
+        }
+        function isCallToHelper(firstSegment, helperName) {
+            return ts.isCallExpression(firstSegment)
+                && ts.isIdentifier(firstSegment.expression)
+                && (ts.getEmitFlags(firstSegment.expression) & 4096 /* HelperName */)
+                && firstSegment.expression.escapedText === helperName;
+        }
         function partitionSpread(node) {
             return ts.isSpreadElement(node)
                 ? visitSpanOfSpreads
@@ -74897,8 +77302,8 @@ var ts;
                 : ts.createFileLevelUniqueName("_super");
         }
         function visitMetaProperty(node) {
-            if (node.keywordToken === 95 /* NewKeyword */ && node.name.escapedText === "target") {
-                hierarchyFacts |= 8192 /* NewTarget */;
+            if (node.keywordToken === 96 /* NewKeyword */ && node.name.escapedText === "target") {
+                hierarchyFacts |= 16384 /* NewTarget */;
                 return ts.createFileLevelUniqueName("_newTarget");
             }
             return node;
@@ -74913,7 +77318,7 @@ var ts;
         function onEmitNode(hint, node, emitCallback) {
             if (enabledSubstitutions & 1 /* CapturedThis */ && ts.isFunctionLike(node)) {
                 // If we are tracking a captured `this`, keep track of the enclosing function.
-                var ancestorFacts = enterSubtree(8094 /* FunctionExcludes */, ts.getEmitFlags(node) & 8 /* CapturesThis */
+                var ancestorFacts = enterSubtree(16286 /* FunctionExcludes */, ts.getEmitFlags(node) & 8 /* CapturesThis */
                     ? 65 /* FunctionIncludes */ | 16 /* CapturesThis */
                     : 65 /* FunctionIncludes */);
                 previousOnEmitNode(hint, node, emitCallback);
@@ -74929,7 +77334,7 @@ var ts;
         function enableSubstitutionsForBlockScopedBindings() {
             if ((enabledSubstitutions & 2 /* BlockScopedBindings */) === 0) {
                 enabledSubstitutions |= 2 /* BlockScopedBindings */;
-                context.enableSubstitution(72 /* Identifier */);
+                context.enableSubstitution(73 /* Identifier */);
             }
         }
         /**
@@ -74939,14 +77344,14 @@ var ts;
         function enableSubstitutionsForCapturedThis() {
             if ((enabledSubstitutions & 1 /* CapturedThis */) === 0) {
                 enabledSubstitutions |= 1 /* CapturedThis */;
-                context.enableSubstitution(100 /* ThisKeyword */);
-                context.enableEmitNotification(157 /* Constructor */);
-                context.enableEmitNotification(156 /* MethodDeclaration */);
-                context.enableEmitNotification(158 /* GetAccessor */);
-                context.enableEmitNotification(159 /* SetAccessor */);
-                context.enableEmitNotification(197 /* ArrowFunction */);
-                context.enableEmitNotification(196 /* FunctionExpression */);
-                context.enableEmitNotification(239 /* FunctionDeclaration */);
+                context.enableSubstitution(101 /* ThisKeyword */);
+                context.enableEmitNotification(158 /* Constructor */);
+                context.enableEmitNotification(157 /* MethodDeclaration */);
+                context.enableEmitNotification(159 /* GetAccessor */);
+                context.enableEmitNotification(160 /* SetAccessor */);
+                context.enableEmitNotification(198 /* ArrowFunction */);
+                context.enableEmitNotification(197 /* FunctionExpression */);
+                context.enableEmitNotification(240 /* FunctionDeclaration */);
             }
         }
         /**
@@ -74987,10 +77392,10 @@ var ts;
          */
         function isNameOfDeclarationWithCollidingName(node) {
             switch (node.parent.kind) {
-                case 186 /* BindingElement */:
-                case 240 /* ClassDeclaration */:
-                case 243 /* EnumDeclaration */:
-                case 237 /* VariableDeclaration */:
+                case 187 /* BindingElement */:
+                case 241 /* ClassDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 238 /* VariableDeclaration */:
                     return node.parent.name === node
                         && resolver.isDeclarationWithCollidingName(node.parent);
             }
@@ -75003,9 +77408,9 @@ var ts;
          */
         function substituteExpression(node) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return substituteExpressionIdentifier(node);
-                case 100 /* ThisKeyword */:
+                case 101 /* ThisKeyword */:
                     return substituteThisKeyword(node);
             }
             return node;
@@ -75072,19 +77477,19 @@ var ts;
                 return false;
             }
             var statement = ts.firstOrUndefined(constructor.body.statements);
-            if (!statement || !ts.nodeIsSynthesized(statement) || statement.kind !== 221 /* ExpressionStatement */) {
+            if (!statement || !ts.nodeIsSynthesized(statement) || statement.kind !== 222 /* ExpressionStatement */) {
                 return false;
             }
             var statementExpression = statement.expression;
-            if (!ts.nodeIsSynthesized(statementExpression) || statementExpression.kind !== 191 /* CallExpression */) {
+            if (!ts.nodeIsSynthesized(statementExpression) || statementExpression.kind !== 192 /* CallExpression */) {
                 return false;
             }
             var callTarget = statementExpression.expression;
-            if (!ts.nodeIsSynthesized(callTarget) || callTarget.kind !== 98 /* SuperKeyword */) {
+            if (!ts.nodeIsSynthesized(callTarget) || callTarget.kind !== 99 /* SuperKeyword */) {
                 return false;
             }
             var callArgument = ts.singleOrUndefined(statementExpression.arguments);
-            if (!callArgument || !ts.nodeIsSynthesized(callArgument) || callArgument.kind !== 208 /* SpreadElement */) {
+            if (!callArgument || !ts.nodeIsSynthesized(callArgument) || callArgument.kind !== 209 /* SpreadElement */) {
                 return false;
             }
             var expression = callArgument.expression;
@@ -75137,15 +77542,15 @@ var ts;
         if (compilerOptions.jsx === 1 /* Preserve */ || compilerOptions.jsx === 3 /* ReactNative */) {
             previousOnEmitNode = context.onEmitNode;
             context.onEmitNode = onEmitNode;
-            context.enableEmitNotification(262 /* JsxOpeningElement */);
-            context.enableEmitNotification(263 /* JsxClosingElement */);
-            context.enableEmitNotification(261 /* JsxSelfClosingElement */);
+            context.enableEmitNotification(263 /* JsxOpeningElement */);
+            context.enableEmitNotification(264 /* JsxClosingElement */);
+            context.enableEmitNotification(262 /* JsxSelfClosingElement */);
             noSubstitution = [];
         }
         var previousOnSubstituteNode = context.onSubstituteNode;
         context.onSubstituteNode = onSubstituteNode;
-        context.enableSubstitution(189 /* PropertyAccessExpression */);
-        context.enableSubstitution(275 /* PropertyAssignment */);
+        context.enableSubstitution(190 /* PropertyAccessExpression */);
+        context.enableSubstitution(276 /* PropertyAssignment */);
         return ts.chainBundle(transformSourceFile);
         /**
          * Transforms an ES5 source file to ES3.
@@ -75164,9 +77569,9 @@ var ts;
          */
         function onEmitNode(hint, node, emitCallback) {
             switch (node.kind) {
-                case 262 /* JsxOpeningElement */:
-                case 263 /* JsxClosingElement */:
-                case 261 /* JsxSelfClosingElement */:
+                case 263 /* JsxOpeningElement */:
+                case 264 /* JsxClosingElement */:
+                case 262 /* JsxSelfClosingElement */:
                     var tagName = node.tagName;
                     noSubstitution[ts.getOriginalNodeId(tagName)] = true;
                     break;
@@ -75223,7 +77628,7 @@ var ts;
          */
         function trySubstituteReservedName(name) {
             var token = name.originalKeywordKind || (ts.nodeIsSynthesized(name) ? ts.stringToToken(ts.idText(name)) : undefined);
-            if (token !== undefined && token >= 73 /* FirstReservedWord */ && token <= 108 /* LastReservedWord */) {
+            if (token !== undefined && token >= 74 /* FirstReservedWord */ && token <= 109 /* LastReservedWord */) {
                 return ts.setTextRange(ts.createLiteral(name), name);
             }
             return undefined;
@@ -75498,13 +77903,13 @@ var ts;
          */
         function visitJavaScriptInStatementContainingYield(node) {
             switch (node.kind) {
-                case 223 /* DoStatement */:
+                case 224 /* DoStatement */:
                     return visitDoStatement(node);
-                case 224 /* WhileStatement */:
+                case 225 /* WhileStatement */:
                     return visitWhileStatement(node);
-                case 232 /* SwitchStatement */:
+                case 233 /* SwitchStatement */:
                     return visitSwitchStatement(node);
-                case 233 /* LabeledStatement */:
+                case 234 /* LabeledStatement */:
                     return visitLabeledStatement(node);
                 default:
                     return visitJavaScriptInGeneratorFunctionBody(node);
@@ -75517,24 +77922,24 @@ var ts;
          */
         function visitJavaScriptInGeneratorFunctionBody(node) {
             switch (node.kind) {
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     return visitFunctionDeclaration(node);
-                case 196 /* FunctionExpression */:
+                case 197 /* FunctionExpression */:
                     return visitFunctionExpression(node);
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     return visitAccessorDeclaration(node);
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     return visitVariableStatement(node);
-                case 225 /* ForStatement */:
+                case 226 /* ForStatement */:
                     return visitForStatement(node);
-                case 226 /* ForInStatement */:
+                case 227 /* ForInStatement */:
                     return visitForInStatement(node);
-                case 229 /* BreakStatement */:
+                case 230 /* BreakStatement */:
                     return visitBreakStatement(node);
-                case 228 /* ContinueStatement */:
+                case 229 /* ContinueStatement */:
                     return visitContinueStatement(node);
-                case 230 /* ReturnStatement */:
+                case 231 /* ReturnStatement */:
                     return visitReturnStatement(node);
                 default:
                     if (node.transformFlags & 131072 /* ContainsYield */) {
@@ -75555,21 +77960,21 @@ var ts;
          */
         function visitJavaScriptContainingYield(node) {
             switch (node.kind) {
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return visitBinaryExpression(node);
-                case 205 /* ConditionalExpression */:
+                case 206 /* ConditionalExpression */:
                     return visitConditionalExpression(node);
-                case 207 /* YieldExpression */:
+                case 208 /* YieldExpression */:
                     return visitYieldExpression(node);
-                case 187 /* ArrayLiteralExpression */:
+                case 188 /* ArrayLiteralExpression */:
                     return visitArrayLiteralExpression(node);
-                case 188 /* ObjectLiteralExpression */:
+                case 189 /* ObjectLiteralExpression */:
                     return visitObjectLiteralExpression(node);
-                case 190 /* ElementAccessExpression */:
+                case 191 /* ElementAccessExpression */:
                     return visitElementAccessExpression(node);
-                case 191 /* CallExpression */:
+                case 192 /* CallExpression */:
                     return visitCallExpression(node);
-                case 192 /* NewExpression */:
+                case 193 /* NewExpression */:
                     return visitNewExpression(node);
                 default:
                     return ts.visitEachChild(node, visitor, context);
@@ -75582,9 +77987,9 @@ var ts;
          */
         function visitGenerator(node) {
             switch (node.kind) {
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     return visitFunctionDeclaration(node);
-                case 196 /* FunctionExpression */:
+                case 197 /* FunctionExpression */:
                     return visitFunctionExpression(node);
                 default:
                     return ts.Debug.failBadSyntaxKind(node);
@@ -75783,23 +78188,23 @@ var ts;
             }
         }
         function isCompoundAssignment(kind) {
-            return kind >= 60 /* FirstCompoundAssignment */
-                && kind <= 71 /* LastCompoundAssignment */;
+            return kind >= 61 /* FirstCompoundAssignment */
+                && kind <= 72 /* LastCompoundAssignment */;
         }
         function getOperatorForCompoundAssignment(kind) {
             switch (kind) {
-                case 60 /* PlusEqualsToken */: return 38 /* PlusToken */;
-                case 61 /* MinusEqualsToken */: return 39 /* MinusToken */;
-                case 62 /* AsteriskEqualsToken */: return 40 /* AsteriskToken */;
-                case 63 /* AsteriskAsteriskEqualsToken */: return 41 /* AsteriskAsteriskToken */;
-                case 64 /* SlashEqualsToken */: return 42 /* SlashToken */;
-                case 65 /* PercentEqualsToken */: return 43 /* PercentToken */;
-                case 66 /* LessThanLessThanEqualsToken */: return 46 /* LessThanLessThanToken */;
-                case 67 /* GreaterThanGreaterThanEqualsToken */: return 47 /* GreaterThanGreaterThanToken */;
-                case 68 /* GreaterThanGreaterThanGreaterThanEqualsToken */: return 48 /* GreaterThanGreaterThanGreaterThanToken */;
-                case 69 /* AmpersandEqualsToken */: return 49 /* AmpersandToken */;
-                case 70 /* BarEqualsToken */: return 50 /* BarToken */;
-                case 71 /* CaretEqualsToken */: return 51 /* CaretToken */;
+                case 61 /* PlusEqualsToken */: return 38 /* PlusToken */;
+                case 62 /* MinusEqualsToken */: return 39 /* MinusToken */;
+                case 63 /* AsteriskEqualsToken */: return 40 /* AsteriskToken */;
+                case 64 /* AsteriskAsteriskEqualsToken */: return 41 /* AsteriskAsteriskToken */;
+                case 65 /* SlashEqualsToken */: return 42 /* SlashToken */;
+                case 66 /* PercentEqualsToken */: return 43 /* PercentToken */;
+                case 67 /* LessThanLessThanEqualsToken */: return 46 /* LessThanLessThanToken */;
+                case 68 /* GreaterThanGreaterThanEqualsToken */: return 47 /* GreaterThanGreaterThanToken */;
+                case 69 /* GreaterThanGreaterThanGreaterThanEqualsToken */: return 48 /* GreaterThanGreaterThanGreaterThanToken */;
+                case 70 /* AmpersandEqualsToken */: return 49 /* AmpersandToken */;
+                case 71 /* BarEqualsToken */: return 50 /* BarToken */;
+                case 72 /* CaretEqualsToken */: return 51 /* CaretToken */;
             }
         }
         /**
@@ -75812,7 +78217,7 @@ var ts;
             if (containsYield(right)) {
                 var target = void 0;
                 switch (left.kind) {
-                    case 189 /* PropertyAccessExpression */:
+                    case 190 /* PropertyAccessExpression */:
                         // [source]
                         //      a.b = yield;
                         //
@@ -75824,7 +78229,7 @@ var ts;
                         //      _a.b = %sent%;
                         target = ts.updatePropertyAccess(left, cacheExpression(ts.visitNode(left.expression, visitor, ts.isLeftHandSideExpression)), left.name);
                         break;
-                    case 190 /* ElementAccessExpression */:
+                    case 191 /* ElementAccessExpression */:
                         // [source]
                         //      a[b] = yield;
                         //
@@ -75867,10 +78272,10 @@ var ts;
                 //      _a = a();
                 //  .yield resumeLabel
                 //      _a + %sent% + c()
-                var clone_5 = ts.getMutableClone(node);
-                clone_5.left = cacheExpression(ts.visitNode(node.left, visitor, ts.isExpression));
-                clone_5.right = ts.visitNode(node.right, visitor, ts.isExpression);
-                return clone_5;
+                var clone_6 = ts.getMutableClone(node);
+                clone_6.left = cacheExpression(ts.visitNode(node.left, visitor, ts.isExpression));
+                clone_6.right = ts.visitNode(node.right, visitor, ts.isExpression);
+                return clone_6;
             }
             return ts.visitEachChild(node, visitor, context);
         }
@@ -76131,10 +78536,10 @@ var ts;
                 //  .yield resumeLabel
                 //  .mark resumeLabel
                 //      a = _a[%sent%]
-                var clone_6 = ts.getMutableClone(node);
-                clone_6.expression = cacheExpression(ts.visitNode(node.expression, visitor, ts.isLeftHandSideExpression));
-                clone_6.argumentExpression = ts.visitNode(node.argumentExpression, visitor, ts.isExpression);
-                return clone_6;
+                var clone_7 = ts.getMutableClone(node);
+                clone_7.expression = cacheExpression(ts.visitNode(node.expression, visitor, ts.isLeftHandSideExpression));
+                clone_7.argumentExpression = ts.visitNode(node.argumentExpression, visitor, ts.isExpression);
+                return clone_7;
             }
             return ts.visitEachChild(node, visitor, context);
         }
@@ -76200,35 +78605,35 @@ var ts;
         }
         function transformAndEmitStatementWorker(node) {
             switch (node.kind) {
-                case 218 /* Block */:
+                case 219 /* Block */:
                     return transformAndEmitBlock(node);
-                case 221 /* ExpressionStatement */:
+                case 222 /* ExpressionStatement */:
                     return transformAndEmitExpressionStatement(node);
-                case 222 /* IfStatement */:
+                case 223 /* IfStatement */:
                     return transformAndEmitIfStatement(node);
-                case 223 /* DoStatement */:
+                case 224 /* DoStatement */:
                     return transformAndEmitDoStatement(node);
-                case 224 /* WhileStatement */:
+                case 225 /* WhileStatement */:
                     return transformAndEmitWhileStatement(node);
-                case 225 /* ForStatement */:
+                case 226 /* ForStatement */:
                     return transformAndEmitForStatement(node);
-                case 226 /* ForInStatement */:
+                case 227 /* ForInStatement */:
                     return transformAndEmitForInStatement(node);
-                case 228 /* ContinueStatement */:
+                case 229 /* ContinueStatement */:
                     return transformAndEmitContinueStatement(node);
-                case 229 /* BreakStatement */:
+                case 230 /* BreakStatement */:
                     return transformAndEmitBreakStatement(node);
-                case 230 /* ReturnStatement */:
+                case 231 /* ReturnStatement */:
                     return transformAndEmitReturnStatement(node);
-                case 231 /* WithStatement */:
+                case 232 /* WithStatement */:
                     return transformAndEmitWithStatement(node);
-                case 232 /* SwitchStatement */:
+                case 233 /* SwitchStatement */:
                     return transformAndEmitSwitchStatement(node);
-                case 233 /* LabeledStatement */:
+                case 234 /* LabeledStatement */:
                     return transformAndEmitLabeledStatement(node);
-                case 234 /* ThrowStatement */:
+                case 235 /* ThrowStatement */:
                     return transformAndEmitThrowStatement(node);
-                case 235 /* TryStatement */:
+                case 236 /* TryStatement */:
                     return transformAndEmitTryStatement(node);
                 default:
                     return emitStatement(ts.visitNode(node, visitor, ts.isStatement));
@@ -76658,7 +79063,7 @@ var ts;
                 for (var i = 0; i < numClauses; i++) {
                     var clause = caseBlock.clauses[i];
                     clauseLabels.push(defineLabel());
-                    if (clause.kind === 272 /* DefaultClause */ && defaultClauseIndex === -1) {
+                    if (clause.kind === 273 /* DefaultClause */ && defaultClauseIndex === -1) {
                         defaultClauseIndex = i;
                     }
                 }
@@ -76671,7 +79076,7 @@ var ts;
                     var defaultClausesSkipped = 0;
                     for (var i = clausesWritten; i < numClauses; i++) {
                         var clause = caseBlock.clauses[i];
-                        if (clause.kind === 271 /* CaseClause */) {
+                        if (clause.kind === 272 /* CaseClause */) {
                             if (containsYield(clause.expression) && pendingClauses.length > 0) {
                                 break;
                             }
@@ -76833,10 +79238,10 @@ var ts;
                     if (declaration) {
                         var name = renamedCatchVariableDeclarations[ts.getOriginalNodeId(declaration)];
                         if (name) {
-                            var clone_7 = ts.getMutableClone(name);
-                            ts.setSourceMapRange(clone_7, node);
-                            ts.setCommentRange(clone_7, node);
-                            return clone_7;
+                            var clone_8 = ts.getMutableClone(name);
+                            ts.setSourceMapRange(clone_8, node);
+                            ts.setCommentRange(clone_8, node);
+                            return clone_8;
                         }
                     }
                 }
@@ -76983,7 +79388,7 @@ var ts;
                 if (!renamedCatchVariables) {
                     renamedCatchVariables = ts.createMap();
                     renamedCatchVariableDeclarations = [];
-                    context.enableSubstitution(72 /* Identifier */);
+                    context.enableSubstitution(73 /* Identifier */);
                 }
                 renamedCatchVariables.set(text, true);
                 renamedCatchVariableDeclarations[ts.getOriginalNodeId(variable)] = name;
@@ -77899,12 +80304,12 @@ var ts;
         var previousOnEmitNode = context.onEmitNode;
         context.onSubstituteNode = onSubstituteNode;
         context.onEmitNode = onEmitNode;
-        context.enableSubstitution(72 /* Identifier */); // Substitutes expression identifiers with imported/exported symbols.
-        context.enableSubstitution(204 /* BinaryExpression */); // Substitutes assignments to exported symbols.
-        context.enableSubstitution(202 /* PrefixUnaryExpression */); // Substitutes updates to exported symbols.
-        context.enableSubstitution(203 /* PostfixUnaryExpression */); // Substitutes updates to exported symbols.
-        context.enableSubstitution(276 /* ShorthandPropertyAssignment */); // Substitutes shorthand property assignments for imported/exported symbols.
-        context.enableEmitNotification(284 /* SourceFile */); // Restore state when substituting nodes in a file.
+        context.enableSubstitution(73 /* Identifier */); // Substitutes expression identifiers with imported/exported symbols.
+        context.enableSubstitution(205 /* BinaryExpression */); // Substitutes assignments to exported symbols.
+        context.enableSubstitution(203 /* PrefixUnaryExpression */); // Substitutes updates to exported symbols.
+        context.enableSubstitution(204 /* PostfixUnaryExpression */); // Substitutes updates to exported symbols.
+        context.enableSubstitution(277 /* ShorthandPropertyAssignment */); // Substitutes shorthand property assignments for imported/exported symbols.
+        context.enableEmitNotification(285 /* SourceFile */); // Restore state when substituting nodes in a file.
         var moduleInfoMap = []; // The ExternalModuleInfo for each file.
         var deferredExports = []; // Exports to defer until an EndOfDeclarationMarker is found.
         var currentSourceFile; // The current file.
@@ -78232,23 +80637,23 @@ var ts;
          */
         function sourceElementVisitor(node) {
             switch (node.kind) {
-                case 249 /* ImportDeclaration */:
+                case 250 /* ImportDeclaration */:
                     return visitImportDeclaration(node);
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return visitImportEqualsDeclaration(node);
-                case 255 /* ExportDeclaration */:
+                case 256 /* ExportDeclaration */:
                     return visitExportDeclaration(node);
-                case 254 /* ExportAssignment */:
+                case 255 /* ExportAssignment */:
                     return visitExportAssignment(node);
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     return visitVariableStatement(node);
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     return visitFunctionDeclaration(node);
-                case 240 /* ClassDeclaration */:
+                case 241 /* ClassDeclaration */:
                     return visitClassDeclaration(node);
-                case 315 /* MergeDeclarationMarker */:
+                case 317 /* MergeDeclarationMarker */:
                     return visitMergeDeclarationMarker(node);
-                case 316 /* EndOfDeclarationMarker */:
+                case 318 /* EndOfDeclarationMarker */:
                     return visitEndOfDeclarationMarker(node);
                 default:
                     return ts.visitEachChild(node, moduleExpressionElementVisitor, context);
@@ -78275,24 +80680,24 @@ var ts;
                 for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
                     var elem = _a[_i];
                     switch (elem.kind) {
-                        case 275 /* PropertyAssignment */:
+                        case 276 /* PropertyAssignment */:
                             if (destructuringNeedsFlattening(elem.initializer)) {
                                 return true;
                             }
                             break;
-                        case 276 /* ShorthandPropertyAssignment */:
+                        case 277 /* ShorthandPropertyAssignment */:
                             if (destructuringNeedsFlattening(elem.name)) {
                                 return true;
                             }
                             break;
-                        case 277 /* SpreadAssignment */:
+                        case 278 /* SpreadAssignment */:
                             if (destructuringNeedsFlattening(elem.expression)) {
                                 return true;
                             }
                             break;
-                        case 156 /* MethodDeclaration */:
-                        case 158 /* GetAccessor */:
-                        case 159 /* SetAccessor */:
+                        case 157 /* MethodDeclaration */:
+                        case 159 /* GetAccessor */:
+                        case 160 /* SetAccessor */:
                             return false;
                         default: ts.Debug.assertNever(elem, "Unhandled object member kind");
                     }
@@ -78770,7 +81175,7 @@ var ts;
             //
             // To balance the declaration, add the exports of the elided variable
             // statement.
-            if (hasAssociatedEndOfDeclarationMarker(node) && node.original.kind === 219 /* VariableStatement */) {
+            if (hasAssociatedEndOfDeclarationMarker(node) && node.original.kind === 220 /* VariableStatement */) {
                 var id = ts.getOriginalNodeId(node);
                 deferredExports[id] = appendExportsOfVariableStatement(deferredExports[id], node.original);
             }
@@ -78825,10 +81230,10 @@ var ts;
             var namedBindings = importClause.namedBindings;
             if (namedBindings) {
                 switch (namedBindings.kind) {
-                    case 251 /* NamespaceImport */:
+                    case 252 /* NamespaceImport */:
                         statements = appendExportsOfDeclaration(statements, namedBindings);
                         break;
-                    case 252 /* NamedImports */:
+                    case 253 /* NamedImports */:
                         for (var _i = 0, _a = namedBindings.elements; _i < _a.length; _i++) {
                             var importBinding = _a[_i];
                             statements = appendExportsOfDeclaration(statements, importBinding);
@@ -79010,8 +81415,8 @@ var ts;
         function modifierVisitor(node) {
             // Elide module-specific modifiers.
             switch (node.kind) {
-                case 85 /* ExportKeyword */:
-                case 80 /* DefaultKeyword */:
+                case 86 /* ExportKeyword */:
+                case 81 /* DefaultKeyword */:
                     return undefined;
             }
             return node;
@@ -79027,7 +81432,7 @@ var ts;
          * @param emit A callback used to emit the node in the printer.
          */
         function onEmitNode(hint, node, emitCallback) {
-            if (node.kind === 284 /* SourceFile */) {
+            if (node.kind === 285 /* SourceFile */) {
                 currentSourceFile = node;
                 currentModuleInfo = moduleInfoMap[ts.getOriginalNodeId(currentSourceFile)];
                 noSubstitution = [];
@@ -79089,12 +81494,12 @@ var ts;
          */
         function substituteExpression(node) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return substituteExpressionIdentifier(node);
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return substituteBinaryExpression(node);
-                case 203 /* PostfixUnaryExpression */:
-                case 202 /* PrefixUnaryExpression */:
+                case 204 /* PostfixUnaryExpression */:
+                case 203 /* PrefixUnaryExpression */:
                     return substituteUnaryExpression(node);
             }
             return node;
@@ -79115,7 +81520,7 @@ var ts;
             }
             if (!ts.isGeneratedIdentifier(node) && !ts.isLocalName(node)) {
                 var exportContainer = resolver.getReferencedExportContainer(node, ts.isExportName(node));
-                if (exportContainer && exportContainer.kind === 284 /* SourceFile */) {
+                if (exportContainer && exportContainer.kind === 285 /* SourceFile */) {
                     return ts.setTextRange(ts.createPropertyAccess(ts.createIdentifier("exports"), ts.getSynthesizedClone(node)), 
                     /*location*/ node);
                 }
@@ -79190,8 +81595,8 @@ var ts;
                 && !ts.isDeclarationNameOfEnumOrNamespace(node.operand)) {
                 var exportedNames = getExports(node.operand);
                 if (exportedNames) {
-                    var expression = node.kind === 203 /* PostfixUnaryExpression */
-                        ? ts.setTextRange(ts.createBinary(node.operand, ts.createToken(node.operator === 44 /* PlusPlusToken */ ? 60 /* PlusEqualsToken */ : 61 /* MinusEqualsToken */), ts.createLiteral(1)), 
+                    var expression = node.kind === 204 /* PostfixUnaryExpression */
+                        ? ts.setTextRange(ts.createBinary(node.operand, ts.createToken(node.operator === 44 /* PlusPlusToken */ ? 61 /* PlusEqualsToken */ : 62 /* MinusEqualsToken */), ts.createLiteral(1)), 
                         /*location*/ node)
                         : node;
                     for (var _i = 0, exportedNames_3 = exportedNames; _i < exportedNames_3.length; _i++) {
@@ -79265,12 +81670,12 @@ var ts;
         var previousOnEmitNode = context.onEmitNode;
         context.onSubstituteNode = onSubstituteNode;
         context.onEmitNode = onEmitNode;
-        context.enableSubstitution(72 /* Identifier */); // Substitutes expression identifiers for imported symbols.
-        context.enableSubstitution(276 /* ShorthandPropertyAssignment */); // Substitutes expression identifiers for imported symbols
-        context.enableSubstitution(204 /* BinaryExpression */); // Substitutes assignments to exported symbols.
-        context.enableSubstitution(202 /* PrefixUnaryExpression */); // Substitutes updates to exported symbols.
-        context.enableSubstitution(203 /* PostfixUnaryExpression */); // Substitutes updates to exported symbols.
-        context.enableEmitNotification(284 /* SourceFile */); // Restore state when substituting nodes in a file.
+        context.enableSubstitution(73 /* Identifier */); // Substitutes expression identifiers for imported symbols.
+        context.enableSubstitution(277 /* ShorthandPropertyAssignment */); // Substitutes expression identifiers for imported symbols
+        context.enableSubstitution(205 /* BinaryExpression */); // Substitutes assignments to exported symbols.
+        context.enableSubstitution(203 /* PrefixUnaryExpression */); // Substitutes updates to exported symbols.
+        context.enableSubstitution(204 /* PostfixUnaryExpression */); // Substitutes updates to exported symbols.
+        context.enableEmitNotification(285 /* SourceFile */); // Restore state when substituting nodes in a file.
         var moduleInfoMap = []; // The ExternalModuleInfo for each file.
         var deferredExports = []; // Exports to defer until an EndOfDeclarationMarker is found.
         var exportFunctionsMap = []; // The export function associated with a source file.
@@ -79491,7 +81896,7 @@ var ts;
                 var hasExportDeclarationWithExportClause = false;
                 for (var _i = 0, _a = moduleInfo.externalImports; _i < _a.length; _i++) {
                     var externalImport = _a[_i];
-                    if (externalImport.kind === 255 /* ExportDeclaration */ && externalImport.exportClause) {
+                    if (externalImport.kind === 256 /* ExportDeclaration */ && externalImport.exportClause) {
                         hasExportDeclarationWithExportClause = true;
                         break;
                     }
@@ -79516,7 +81921,7 @@ var ts;
             }
             for (var _d = 0, _e = moduleInfo.externalImports; _d < _e.length; _d++) {
                 var externalImport = _e[_d];
-                if (externalImport.kind !== 255 /* ExportDeclaration */) {
+                if (externalImport.kind !== 256 /* ExportDeclaration */) {
                     continue;
                 }
                 if (!externalImport.exportClause) {
@@ -79594,19 +81999,19 @@ var ts;
                     var entry = _b[_a];
                     var importVariableName = ts.getLocalNameForExternalImport(entry, currentSourceFile); // TODO: GH#18217
                     switch (entry.kind) {
-                        case 249 /* ImportDeclaration */:
+                        case 250 /* ImportDeclaration */:
                             if (!entry.importClause) {
                                 // 'import "..."' case
                                 // module is imported only for side-effects, no emit required
                                 break;
                             }
                         // falls through
-                        case 248 /* ImportEqualsDeclaration */:
+                        case 249 /* ImportEqualsDeclaration */:
                             ts.Debug.assert(importVariableName !== undefined);
                             // save import into the local
                             statements.push(ts.createExpressionStatement(ts.createAssignment(importVariableName, parameterName)));
                             break;
-                        case 255 /* ExportDeclaration */:
+                        case 256 /* ExportDeclaration */:
                             ts.Debug.assert(importVariableName !== undefined);
                             if (entry.exportClause) {
                                 //  export {a, b as c} from 'foo'
@@ -79656,15 +82061,15 @@ var ts;
          */
         function sourceElementVisitor(node) {
             switch (node.kind) {
-                case 249 /* ImportDeclaration */:
+                case 250 /* ImportDeclaration */:
                     return visitImportDeclaration(node);
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return visitImportEqualsDeclaration(node);
-                case 255 /* ExportDeclaration */:
+                case 256 /* ExportDeclaration */:
                     // ExportDeclarations are elided as they are handled via
                     // `appendExportsOfDeclaration`.
                     return undefined;
-                case 254 /* ExportAssignment */:
+                case 255 /* ExportAssignment */:
                     return visitExportAssignment(node);
                 default:
                     return nestedElementVisitor(node);
@@ -79840,7 +82245,7 @@ var ts;
         function shouldHoistVariableDeclarationList(node) {
             // hoist only non-block scoped declarations or block scoped declarations parented by source file
             return (ts.getEmitFlags(node) & 2097152 /* NoHoisting */) === 0
-                && (enclosingBlockScopedContainer.kind === 284 /* SourceFile */
+                && (enclosingBlockScopedContainer.kind === 285 /* SourceFile */
                     || (ts.getOriginalNode(node).flags & 3 /* BlockScoped */) === 0);
         }
         /**
@@ -79904,7 +82309,7 @@ var ts;
             //
             // To balance the declaration, we defer the exports of the elided variable
             // statement until we visit this declaration's `EndOfDeclarationMarker`.
-            if (hasAssociatedEndOfDeclarationMarker(node) && node.original.kind === 219 /* VariableStatement */) {
+            if (hasAssociatedEndOfDeclarationMarker(node) && node.original.kind === 220 /* VariableStatement */) {
                 var id = ts.getOriginalNodeId(node);
                 var isExportedDeclaration = ts.hasModifier(node.original, 1 /* Export */);
                 deferredExports[id] = appendExportsOfVariableStatement(deferredExports[id], node.original, isExportedDeclaration);
@@ -79966,10 +82371,10 @@ var ts;
             var namedBindings = importClause.namedBindings;
             if (namedBindings) {
                 switch (namedBindings.kind) {
-                    case 251 /* NamespaceImport */:
+                    case 252 /* NamespaceImport */:
                         statements = appendExportsOfDeclaration(statements, namedBindings);
                         break;
-                    case 252 /* NamedImports */:
+                    case 253 /* NamedImports */:
                         for (var _i = 0, _a = namedBindings.elements; _i < _a.length; _i++) {
                             var importBinding = _a[_i];
                             statements = appendExportsOfDeclaration(statements, importBinding);
@@ -80149,43 +82554,43 @@ var ts;
          */
         function nestedElementVisitor(node) {
             switch (node.kind) {
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     return visitVariableStatement(node);
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     return visitFunctionDeclaration(node);
-                case 240 /* ClassDeclaration */:
+                case 241 /* ClassDeclaration */:
                     return visitClassDeclaration(node);
-                case 225 /* ForStatement */:
+                case 226 /* ForStatement */:
                     return visitForStatement(node);
-                case 226 /* ForInStatement */:
+                case 227 /* ForInStatement */:
                     return visitForInStatement(node);
-                case 227 /* ForOfStatement */:
+                case 228 /* ForOfStatement */:
                     return visitForOfStatement(node);
-                case 223 /* DoStatement */:
+                case 224 /* DoStatement */:
                     return visitDoStatement(node);
-                case 224 /* WhileStatement */:
+                case 225 /* WhileStatement */:
                     return visitWhileStatement(node);
-                case 233 /* LabeledStatement */:
+                case 234 /* LabeledStatement */:
                     return visitLabeledStatement(node);
-                case 231 /* WithStatement */:
+                case 232 /* WithStatement */:
                     return visitWithStatement(node);
-                case 232 /* SwitchStatement */:
+                case 233 /* SwitchStatement */:
                     return visitSwitchStatement(node);
-                case 246 /* CaseBlock */:
+                case 247 /* CaseBlock */:
                     return visitCaseBlock(node);
-                case 271 /* CaseClause */:
+                case 272 /* CaseClause */:
                     return visitCaseClause(node);
-                case 272 /* DefaultClause */:
+                case 273 /* DefaultClause */:
                     return visitDefaultClause(node);
-                case 235 /* TryStatement */:
+                case 236 /* TryStatement */:
                     return visitTryStatement(node);
-                case 274 /* CatchClause */:
+                case 275 /* CatchClause */:
                     return visitCatchClause(node);
-                case 218 /* Block */:
+                case 219 /* Block */:
                     return visitBlock(node);
-                case 315 /* MergeDeclarationMarker */:
+                case 317 /* MergeDeclarationMarker */:
                     return visitMergeDeclarationMarker(node);
-                case 316 /* EndOfDeclarationMarker */:
+                case 318 /* EndOfDeclarationMarker */:
                     return visitEndOfDeclarationMarker(node);
                 default:
                     return destructuringAndImportCallVisitor(node);
@@ -80432,7 +82837,7 @@ var ts;
             }
             else if (ts.isIdentifier(node)) {
                 var container = resolver.getReferencedExportContainer(node);
-                return container !== undefined && container.kind === 284 /* SourceFile */;
+                return container !== undefined && container.kind === 285 /* SourceFile */;
             }
             else {
                 return false;
@@ -80448,8 +82853,8 @@ var ts;
          */
         function modifierVisitor(node) {
             switch (node.kind) {
-                case 85 /* ExportKeyword */:
-                case 80 /* DefaultKeyword */:
+                case 86 /* ExportKeyword */:
+                case 81 /* DefaultKeyword */:
                     return undefined;
             }
             return node;
@@ -80465,7 +82870,7 @@ var ts;
          * @param emitCallback A callback used to emit the node in the printer.
          */
         function onEmitNode(hint, node, emitCallback) {
-            if (node.kind === 284 /* SourceFile */) {
+            if (node.kind === 285 /* SourceFile */) {
                 var id = ts.getOriginalNodeId(node);
                 currentSourceFile = node;
                 moduleInfo = moduleInfoMap[id];
@@ -80513,7 +82918,7 @@ var ts;
          */
         function substituteUnspecified(node) {
             switch (node.kind) {
-                case 276 /* ShorthandPropertyAssignment */:
+                case 277 /* ShorthandPropertyAssignment */:
                     return substituteShorthandPropertyAssignment(node);
             }
             return node;
@@ -80547,12 +82952,12 @@ var ts;
          */
         function substituteExpression(node) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return substituteExpressionIdentifier(node);
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return substituteBinaryExpression(node);
-                case 202 /* PrefixUnaryExpression */:
-                case 203 /* PostfixUnaryExpression */:
+                case 203 /* PrefixUnaryExpression */:
+                case 204 /* PostfixUnaryExpression */:
                     return substituteUnaryExpression(node);
             }
             return node;
@@ -80645,14 +83050,14 @@ var ts;
                 && !ts.isDeclarationNameOfEnumOrNamespace(node.operand)) {
                 var exportedNames = getExports(node.operand);
                 if (exportedNames) {
-                    var expression = node.kind === 203 /* PostfixUnaryExpression */
+                    var expression = node.kind === 204 /* PostfixUnaryExpression */
                         ? ts.setTextRange(ts.createPrefix(node.operator, node.operand), node)
                         : node;
                     for (var _i = 0, exportedNames_5 = exportedNames; _i < exportedNames_5.length; _i++) {
                         var exportName = exportedNames_5[_i];
                         expression = createExportExpression(exportName, preventSubstitution(expression));
                     }
-                    if (node.kind === 203 /* PostfixUnaryExpression */) {
+                    if (node.kind === 204 /* PostfixUnaryExpression */) {
                         expression = node.operator === 44 /* PlusPlusToken */
                             ? ts.createSubtract(preventSubstitution(expression), ts.createLiteral(1))
                             : ts.createAdd(preventSubstitution(expression), ts.createLiteral(1));
@@ -80674,7 +83079,7 @@ var ts;
                     || resolver.getReferencedValueDeclaration(name);
                 if (valueDeclaration) {
                     var exportContainer = resolver.getReferencedExportContainer(name, /*prefixLocals*/ false);
-                    if (exportContainer && exportContainer.kind === 284 /* SourceFile */) {
+                    if (exportContainer && exportContainer.kind === 285 /* SourceFile */) {
                         exportedNames = ts.append(exportedNames, ts.getDeclarationName(valueDeclaration));
                     }
                     exportedNames = ts.addRange(exportedNames, moduleInfo && moduleInfo.exportedBindings[ts.getOriginalNodeId(valueDeclaration)]);
@@ -80713,8 +83118,8 @@ var ts;
         var previousOnSubstituteNode = context.onSubstituteNode;
         context.onEmitNode = onEmitNode;
         context.onSubstituteNode = onSubstituteNode;
-        context.enableEmitNotification(284 /* SourceFile */);
-        context.enableSubstitution(72 /* Identifier */);
+        context.enableEmitNotification(285 /* SourceFile */);
+        context.enableSubstitution(73 /* Identifier */);
         var currentSourceFile;
         return ts.chainBundle(transformSourceFile);
         function transformSourceFile(node) {
@@ -80742,10 +83147,10 @@ var ts;
         }
         function visitor(node) {
             switch (node.kind) {
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     // Elide `import=` as it is not legal with --module ES6
                     return undefined;
-                case 254 /* ExportAssignment */:
+                case 255 /* ExportAssignment */:
                     return visitExportAssignment(node);
             }
             return node;
@@ -80853,7 +83258,7 @@ var ts;
                         ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 :
                     ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_private_name_1;
             }
-            else if (node.parent.kind === 240 /* ClassDeclaration */) {
+            else if (node.parent.kind === 241 /* ClassDeclaration */) {
                 return symbolAccessibilityResult.errorModuleName ?
                     symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                         ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
@@ -80882,7 +83287,7 @@ var ts;
                         ts.Diagnostics.Public_static_method_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 :
                     ts.Diagnostics.Public_static_method_0_of_exported_class_has_or_is_using_private_name_1;
             }
-            else if (node.parent.kind === 240 /* ClassDeclaration */) {
+            else if (node.parent.kind === 241 /* ClassDeclaration */) {
                 return symbolAccessibilityResult.errorModuleName ?
                     symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                         ts.Diagnostics.Public_method_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
@@ -80929,7 +83334,7 @@ var ts;
             return ts.Debug.assertNever(node, "Attempted to set a declaration diagnostic context for unhandled node kind: " + ts.SyntaxKind[node.kind]);
         }
         function getVariableDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult) {
-            if (node.kind === 237 /* VariableDeclaration */ || node.kind === 186 /* BindingElement */) {
+            if (node.kind === 238 /* VariableDeclaration */ || node.kind === 187 /* BindingElement */) {
                 return symbolAccessibilityResult.errorModuleName ?
                     symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                         ts.Diagnostics.Exported_variable_0_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
@@ -80938,8 +83343,8 @@ var ts;
             }
             // This check is to ensure we don't report error on constructor parameter property as that error would be reported during parameter emit
             // The only exception here is if the constructor was marked as private. we are not emitting the constructor parameters at all.
-            else if (node.kind === 154 /* PropertyDeclaration */ || node.kind === 189 /* PropertyAccessExpression */ || node.kind === 153 /* PropertySignature */ ||
-                (node.kind === 151 /* Parameter */ && ts.hasModifier(node.parent, 8 /* Private */))) {
+            else if (node.kind === 155 /* PropertyDeclaration */ || node.kind === 190 /* PropertyAccessExpression */ || node.kind === 154 /* PropertySignature */ ||
+                (node.kind === 152 /* Parameter */ && ts.hasModifier(node.parent, 8 /* Private */))) {
                 // TODO(jfreeman): Deal with computed properties in error reporting.
                 if (ts.hasModifier(node, 32 /* Static */)) {
                     return symbolAccessibilityResult.errorModuleName ?
@@ -80948,7 +83353,7 @@ var ts;
                             ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 :
                         ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_private_name_1;
                 }
-                else if (node.parent.kind === 240 /* ClassDeclaration */ || node.kind === 151 /* Parameter */) {
+                else if (node.parent.kind === 241 /* ClassDeclaration */ || node.kind === 152 /* Parameter */) {
                     return symbolAccessibilityResult.errorModuleName ?
                         symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                             ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
@@ -80973,7 +83378,7 @@ var ts;
         }
         function getAccessorDeclarationTypeVisibilityError(symbolAccessibilityResult) {
             var diagnosticMessage;
-            if (node.kind === 159 /* SetAccessor */) {
+            if (node.kind === 160 /* SetAccessor */) {
                 // Getters can infer the return type from the returned expression, but setters cannot, so the
                 // "_from_external_module_1_but_cannot_be_named" case cannot occur.
                 if (ts.hasModifier(node, 32 /* Static */)) {
@@ -81012,26 +83417,26 @@ var ts;
         function getReturnTypeVisibilityError(symbolAccessibilityResult) {
             var diagnosticMessage;
             switch (node.kind) {
-                case 161 /* ConstructSignature */:
+                case 162 /* ConstructSignature */:
                     // Interfaces cannot have return types that cannot be named
                     diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                         ts.Diagnostics.Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 :
                         ts.Diagnostics.Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_0;
                     break;
-                case 160 /* CallSignature */:
+                case 161 /* CallSignature */:
                     // Interfaces cannot have return types that cannot be named
                     diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                         ts.Diagnostics.Return_type_of_call_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 :
                         ts.Diagnostics.Return_type_of_call_signature_from_exported_interface_has_or_is_using_private_name_0;
                     break;
-                case 162 /* IndexSignature */:
+                case 163 /* IndexSignature */:
                     // Interfaces cannot have return types that cannot be named
                     diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                         ts.Diagnostics.Return_type_of_index_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 :
                         ts.Diagnostics.Return_type_of_index_signature_from_exported_interface_has_or_is_using_private_name_0;
                     break;
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
                     if (ts.hasModifier(node, 32 /* Static */)) {
                         diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                             symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
@@ -81039,7 +83444,7 @@ var ts;
                                 ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_private_module_1 :
                             ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_private_name_0;
                     }
-                    else if (node.parent.kind === 240 /* ClassDeclaration */) {
+                    else if (node.parent.kind === 241 /* ClassDeclaration */) {
                         diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                             symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                                 ts.Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named :
@@ -81053,7 +83458,7 @@ var ts;
                             ts.Diagnostics.Return_type_of_method_from_exported_interface_has_or_is_using_private_name_0;
                     }
                     break;
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                         symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                             ts.Diagnostics.Return_type_of_exported_function_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named :
@@ -81078,30 +83483,30 @@ var ts;
         }
         function getParameterDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult) {
             switch (node.parent.kind) {
-                case 157 /* Constructor */:
+                case 158 /* Constructor */:
                     return symbolAccessibilityResult.errorModuleName ?
                         symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                             ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
                             ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
                         ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_private_name_1;
-                case 161 /* ConstructSignature */:
-                case 166 /* ConstructorType */:
+                case 162 /* ConstructSignature */:
+                case 167 /* ConstructorType */:
                     // Interfaces cannot have parameter types that cannot be named
                     return symbolAccessibilityResult.errorModuleName ?
                         ts.Diagnostics.Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 :
                         ts.Diagnostics.Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1;
-                case 160 /* CallSignature */:
+                case 161 /* CallSignature */:
                     // Interfaces cannot have parameter types that cannot be named
                     return symbolAccessibilityResult.errorModuleName ?
                         ts.Diagnostics.Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 :
                         ts.Diagnostics.Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1;
-                case 162 /* IndexSignature */:
+                case 163 /* IndexSignature */:
                     // Interfaces cannot have parameter types that cannot be named
                     return symbolAccessibilityResult.errorModuleName ?
                         ts.Diagnostics.Parameter_0_of_index_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 :
                         ts.Diagnostics.Parameter_0_of_index_signature_from_exported_interface_has_or_is_using_private_name_1;
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
                     if (ts.hasModifier(node.parent, 32 /* Static */)) {
                         return symbolAccessibilityResult.errorModuleName ?
                             symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
@@ -81109,7 +83514,7 @@ var ts;
                                 ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
                             ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1;
                     }
-                    else if (node.parent.parent.kind === 240 /* ClassDeclaration */) {
+                    else if (node.parent.parent.kind === 241 /* ClassDeclaration */) {
                         return symbolAccessibilityResult.errorModuleName ?
                             symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                                 ts.Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
@@ -81122,8 +83527,8 @@ var ts;
                             ts.Diagnostics.Parameter_0_of_method_from_exported_interface_has_or_is_using_name_1_from_private_module_2 :
                             ts.Diagnostics.Parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1;
                     }
-                case 239 /* FunctionDeclaration */:
-                case 165 /* FunctionType */:
+                case 240 /* FunctionDeclaration */:
+                case 166 /* FunctionType */:
                     return symbolAccessibilityResult.errorModuleName ?
                         symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                             ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
@@ -81137,39 +83542,39 @@ var ts;
             // Type parameter constraints are named by user so we should always be able to name it
             var diagnosticMessage;
             switch (node.parent.kind) {
-                case 240 /* ClassDeclaration */:
+                case 241 /* ClassDeclaration */:
                     diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_class_has_or_is_using_private_name_1;
                     break;
-                case 241 /* InterfaceDeclaration */:
+                case 242 /* InterfaceDeclaration */:
                     diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1;
                     break;
-                case 181 /* MappedType */:
+                case 182 /* MappedType */:
                     diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_mapped_object_type_is_using_private_name_1;
                     break;
-                case 166 /* ConstructorType */:
-                case 161 /* ConstructSignature */:
+                case 167 /* ConstructorType */:
+                case 162 /* ConstructSignature */:
                     diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1;
                     break;
-                case 160 /* CallSignature */:
+                case 161 /* CallSignature */:
                     diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1;
                     break;
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
                     if (ts.hasModifier(node.parent, 32 /* Static */)) {
                         diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1;
                     }
-                    else if (node.parent.parent.kind === 240 /* ClassDeclaration */) {
+                    else if (node.parent.parent.kind === 241 /* ClassDeclaration */) {
                         diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1;
                     }
                     else {
                         diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1;
                     }
                     break;
-                case 165 /* FunctionType */:
-                case 239 /* FunctionDeclaration */:
+                case 166 /* FunctionType */:
+                case 240 /* FunctionDeclaration */:
                     diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_function_has_or_is_using_private_name_1;
                     break;
-                case 242 /* TypeAliasDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
                     diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_type_alias_has_or_is_using_private_name_1;
                     break;
                 default:
@@ -81184,9 +83589,9 @@ var ts;
         function getHeritageClauseVisibilityError() {
             var diagnosticMessage;
             // Heritage clause is written by user so it can always be named
-            if (node.parent.parent.kind === 240 /* ClassDeclaration */) {
+            if (node.parent.parent.kind === 241 /* ClassDeclaration */) {
                 // Class or Interface implemented/extended is inaccessible
-                diagnosticMessage = ts.isHeritageClause(node.parent) && node.parent.token === 109 /* ImplementsKeyword */ ?
+                diagnosticMessage = ts.isHeritageClause(node.parent) && node.parent.token === 110 /* ImplementsKeyword */ ?
                     ts.Diagnostics.Implements_clause_of_exported_class_0_has_or_is_using_private_name_1 :
                     ts.Diagnostics.extends_clause_of_exported_class_0_has_or_is_using_private_name_1;
             }
@@ -81229,12 +83634,28 @@ var ts;
         return result.diagnostics;
     }
     ts.getDeclarationDiagnostics = getDeclarationDiagnostics;
+    function hasInternalAnnotation(range, currentSourceFile) {
+        var comment = currentSourceFile.text.substring(range.pos, range.end);
+        return ts.stringContains(comment, "@internal");
+    }
     function isInternalDeclaration(node, currentSourceFile) {
         var parseTreeNode = ts.getParseTreeNode(node);
+        if (parseTreeNode && parseTreeNode.kind === 152 /* Parameter */) {
+            var paramIdx = parseTreeNode.parent.parameters.indexOf(parseTreeNode);
+            var previousSibling = paramIdx > 0 ? parseTreeNode.parent.parameters[paramIdx - 1] : undefined;
+            var text = currentSourceFile.text;
+            var commentRanges = previousSibling
+                ? ts.concatenate(
+                // to handle
+                // ... parameters, /* @internal */
+                // public param: string
+                ts.getTrailingCommentRanges(text, ts.skipTrivia(text, previousSibling.end + 1, /* stopAfterLineBreak */ false, /* stopAtComments */ true)), ts.getLeadingCommentRanges(text, node.pos))
+                : ts.getTrailingCommentRanges(text, ts.skipTrivia(text, node.pos, /* stopAfterLineBreak */ false, /* stopAtComments */ true));
+            return commentRanges && commentRanges.length && hasInternalAnnotation(ts.last(commentRanges), currentSourceFile);
+        }
         var leadingCommentRanges = parseTreeNode && ts.getLeadingCommentRangesOfNode(parseTreeNode, currentSourceFile);
         return !!ts.forEach(leadingCommentRanges, function (range) {
-            var comment = currentSourceFile.text.substring(range.pos, range.end);
-            return ts.stringContains(comment, "@internal");
+            return hasInternalAnnotation(range, currentSourceFile);
         });
     }
     ts.isInternalDeclaration = isInternalDeclaration;
@@ -81365,11 +83786,14 @@ var ts;
                 context.addDiagnostic(ts.createDiagnosticForNode(errorNameNode, ts.Diagnostics.The_inferred_type_of_0_cannot_be_named_without_a_reference_to_1_This_is_likely_not_portable_A_type_annotation_is_necessary, ts.declarationNameToString(errorNameNode), specifier));
             }
         }
+        function createEmptyExports() {
+            return ts.createExportDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, ts.createNamedExports([]), /*moduleSpecifier*/ undefined);
+        }
         function transformRoot(node) {
-            if (node.kind === 284 /* SourceFile */ && (node.isDeclarationFile || ts.isSourceFileJS(node))) {
+            if (node.kind === 285 /* SourceFile */ && (node.isDeclarationFile || ts.isSourceFileJS(node))) {
                 return node;
             }
-            if (node.kind === 285 /* Bundle */) {
+            if (node.kind === 286 /* Bundle */) {
                 isBundledEmit = true;
                 refs = ts.createMap();
                 libs = ts.createMap();
@@ -81392,14 +83816,14 @@ var ts;
                         resultHasExternalModuleIndicator = false; // unused in external module bundle emit (all external modules are within module blocks, therefore are known to be modules)
                         needsDeclare = false;
                         var statements_4 = ts.visitNodes(sourceFile.statements, visitDeclarationStatements);
-                        var newFile = ts.updateSourceFileNode(sourceFile, [ts.createModuleDeclaration([], [ts.createModifier(125 /* DeclareKeyword */)], ts.createLiteral(ts.getResolvedExternalModuleName(context.getEmitHost(), sourceFile)), ts.createModuleBlock(ts.setTextRange(ts.createNodeArray(transformAndReplaceLatePaintedStatements(statements_4)), sourceFile.statements)))], /*isDeclarationFile*/ true, /*referencedFiles*/ [], /*typeReferences*/ [], /*hasNoDefaultLib*/ false, /*libReferences*/ []);
+                        var newFile = ts.updateSourceFileNode(sourceFile, [ts.createModuleDeclaration([], [ts.createModifier(126 /* DeclareKeyword */)], ts.createLiteral(ts.getResolvedExternalModuleName(context.getEmitHost(), sourceFile)), ts.createModuleBlock(ts.setTextRange(ts.createNodeArray(transformAndReplaceLatePaintedStatements(statements_4)), sourceFile.statements)))], /*isDeclarationFile*/ true, /*referencedFiles*/ [], /*typeReferences*/ [], /*hasNoDefaultLib*/ false, /*libReferences*/ []);
                         return newFile;
                     }
                     needsDeclare = true;
                     var updated = ts.visitNodes(sourceFile.statements, visitDeclarationStatements);
                     return ts.updateSourceFileNode(sourceFile, transformAndReplaceLatePaintedStatements(updated), /*isDeclarationFile*/ true, /*referencedFiles*/ [], /*typeReferences*/ [], /*hasNoDefaultLib*/ false, /*libReferences*/ []);
                 }), ts.mapDefined(node.prepends, function (prepend) {
-                    if (prepend.kind === 287 /* InputFiles */) {
+                    if (prepend.kind === 288 /* InputFiles */) {
                         var sourceFile = ts.createUnparsedSourceFile(prepend, "dts", stripInternal);
                         hasNoDefaultLib_1 = hasNoDefaultLib_1 || !!sourceFile.hasNoDefaultLib;
                         collectReferences(sourceFile, refs);
@@ -81441,7 +83865,7 @@ var ts;
             refs.forEach(referenceVisitor);
             var emittedImports = ts.filter(combinedStatements, ts.isAnyImportSyntax);
             if (ts.isExternalModule(node) && (!resultHasExternalModuleIndicator || (needsScopeFixMarker && !resultHasScopeMarker))) {
-                combinedStatements = ts.setTextRange(ts.createNodeArray(combinedStatements.concat([ts.createExportDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, ts.createNamedExports([]), /*moduleSpecifier*/ undefined)])), combinedStatements);
+                combinedStatements = ts.setTextRange(ts.createNodeArray(combinedStatements.concat([createEmptyExports()])), combinedStatements);
             }
             var updated = ts.updateSourceFileNode(node, combinedStatements, /*isDeclarationFile*/ true, references, getFileReferencesForUsedTypeReferences(), node.hasNoDefaultLib, getLibReferences());
             updated.exportedModulesFromDeclarationEmit = exportedModulesFromDeclarationEmit;
@@ -81502,7 +83926,7 @@ var ts;
             if (noResolve || (!ts.isUnparsedSource(sourceFile) && ts.isSourceFileJS(sourceFile)))
                 return ret;
             ts.forEach(sourceFile.referencedFiles, function (f) {
-                var elem = ts.tryResolveScriptReference(host, sourceFile, f);
+                var elem = host.getSourceFileFromReference(sourceFile, f);
                 if (elem) {
                     ret.set("" + ts.getOriginalNodeId(elem), elem);
                 }
@@ -81519,11 +83943,11 @@ var ts;
             return ret;
         }
         function filterBindingPatternInitializers(name) {
-            if (name.kind === 72 /* Identifier */) {
+            if (name.kind === 73 /* Identifier */) {
                 return name;
             }
             else {
-                if (name.kind === 185 /* ArrayBindingPattern */) {
+                if (name.kind === 186 /* ArrayBindingPattern */) {
                     return ts.updateArrayBindingPattern(name, ts.visitNodes(name.elements, visitBindingElement));
                 }
                 else {
@@ -81531,7 +83955,7 @@ var ts;
                 }
             }
             function visitBindingElement(elem) {
-                if (elem.kind === 210 /* OmittedExpression */) {
+                if (elem.kind === 211 /* OmittedExpression */) {
                     return elem;
                 }
                 return ts.updateBindingElement(elem, elem.dotDotDotToken, elem.propertyName, filterBindingPatternInitializers(elem.name), shouldPrintWithInitializer(elem) ? elem.initializer : undefined);
@@ -81569,19 +83993,19 @@ var ts;
                 // Literal const declarations will have an initializer ensured rather than a type
                 return;
             }
-            var shouldUseResolverType = node.kind === 151 /* Parameter */ &&
+            var shouldUseResolverType = node.kind === 152 /* Parameter */ &&
                 (resolver.isRequiredInitializedParameter(node) ||
                     resolver.isOptionalUninitializedParameterProperty(node));
             if (type && !shouldUseResolverType) {
                 return ts.visitNode(type, visitDeclarationSubtree);
             }
             if (!ts.getParseTreeNode(node)) {
-                return type ? ts.visitNode(type, visitDeclarationSubtree) : ts.createKeywordTypeNode(120 /* AnyKeyword */);
+                return type ? ts.visitNode(type, visitDeclarationSubtree) : ts.createKeywordTypeNode(121 /* AnyKeyword */);
             }
-            if (node.kind === 159 /* SetAccessor */) {
+            if (node.kind === 160 /* SetAccessor */) {
                 // Set accessors with no associated type node (from it's param or get accessor return) are `any` since they are never contextually typed right now
                 // (The inferred type here will be void, but the old declaration emitter printed `any`, so this replicates that)
-                return ts.createKeywordTypeNode(120 /* AnyKeyword */);
+                return ts.createKeywordTypeNode(121 /* AnyKeyword */);
             }
             errorNameNode = node.name;
             var oldDiag;
@@ -81589,12 +84013,12 @@ var ts;
                 oldDiag = getSymbolAccessibilityDiagnostic;
                 getSymbolAccessibilityDiagnostic = ts.createGetSymbolAccessibilityDiagnosticForNode(node);
             }
-            if (node.kind === 237 /* VariableDeclaration */ || node.kind === 186 /* BindingElement */) {
+            if (node.kind === 238 /* VariableDeclaration */ || node.kind === 187 /* BindingElement */) {
                 return cleanup(resolver.createTypeOfDeclaration(node, enclosingDeclaration, declarationEmitNodeBuilderFlags, symbolTracker));
             }
-            if (node.kind === 151 /* Parameter */
-                || node.kind === 154 /* PropertyDeclaration */
-                || node.kind === 153 /* PropertySignature */) {
+            if (node.kind === 152 /* Parameter */
+                || node.kind === 155 /* PropertyDeclaration */
+                || node.kind === 154 /* PropertySignature */) {
                 if (!node.initializer)
                     return cleanup(resolver.createTypeOfDeclaration(node, enclosingDeclaration, declarationEmitNodeBuilderFlags, symbolTracker, shouldUseResolverType));
                 return cleanup(resolver.createTypeOfDeclaration(node, enclosingDeclaration, declarationEmitNodeBuilderFlags, symbolTracker, shouldUseResolverType) || resolver.createTypeOfExpression(node.initializer, enclosingDeclaration, declarationEmitNodeBuilderFlags, symbolTracker));
@@ -81605,26 +84029,26 @@ var ts;
                 if (!suppressNewDiagnosticContexts) {
                     getSymbolAccessibilityDiagnostic = oldDiag;
                 }
-                return returnValue || ts.createKeywordTypeNode(120 /* AnyKeyword */);
+                return returnValue || ts.createKeywordTypeNode(121 /* AnyKeyword */);
             }
         }
         function isDeclarationAndNotVisible(node) {
             node = ts.getParseTreeNode(node);
             switch (node.kind) {
-                case 239 /* FunctionDeclaration */:
-                case 244 /* ModuleDeclaration */:
-                case 241 /* InterfaceDeclaration */:
-                case 240 /* ClassDeclaration */:
-                case 242 /* TypeAliasDeclaration */:
-                case 243 /* EnumDeclaration */:
+                case 240 /* FunctionDeclaration */:
+                case 245 /* ModuleDeclaration */:
+                case 242 /* InterfaceDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
+                case 244 /* EnumDeclaration */:
                     return !resolver.isDeclarationVisible(node);
                 // The following should be doing their own visibility checks based on filtering their members
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     return !getBindingNameVisible(node);
-                case 248 /* ImportEqualsDeclaration */:
-                case 249 /* ImportDeclaration */:
-                case 255 /* ExportDeclaration */:
-                case 254 /* ExportAssignment */:
+                case 249 /* ImportEqualsDeclaration */:
+                case 250 /* ImportDeclaration */:
+                case 256 /* ExportDeclaration */:
+                case 255 /* ExportAssignment */:
                     return false;
             }
             return false;
@@ -81678,7 +84102,7 @@ var ts;
         function rewriteModuleSpecifier(parent, input) {
             if (!input)
                 return undefined; // TODO: GH#18217
-            resultHasExternalModuleIndicator = resultHasExternalModuleIndicator || (parent.kind !== 244 /* ModuleDeclaration */ && parent.kind !== 183 /* ImportType */);
+            resultHasExternalModuleIndicator = resultHasExternalModuleIndicator || (parent.kind !== 245 /* ModuleDeclaration */ && parent.kind !== 184 /* ImportType */);
             if (ts.isStringLiteralLike(input)) {
                 if (isBundledEmit) {
                     var newName = ts.getExternalModuleNameFromDeclaration(context.getEmitHost(), resolver, parent);
@@ -81698,7 +84122,7 @@ var ts;
         function transformImportEqualsDeclaration(decl) {
             if (!resolver.isDeclarationVisible(decl))
                 return;
-            if (decl.moduleReference.kind === 259 /* ExternalModuleReference */) {
+            if (decl.moduleReference.kind === 260 /* ExternalModuleReference */) {
                 // Rewrite external module names if necessary
                 var specifier = ts.getExternalModuleImportEqualsDeclarationExpression(decl);
                 return ts.updateImportEqualsDeclaration(decl, 
@@ -81725,7 +84149,7 @@ var ts;
                 return visibleDefaultBinding && ts.updateImportDeclaration(decl, /*decorators*/ undefined, decl.modifiers, ts.updateImportClause(decl.importClause, visibleDefaultBinding, 
                 /*namedBindings*/ undefined), rewriteModuleSpecifier(decl, decl.moduleSpecifier));
             }
-            if (decl.importClause.namedBindings.kind === 251 /* NamespaceImport */) {
+            if (decl.importClause.namedBindings.kind === 252 /* NamespaceImport */) {
                 // Namespace import (optionally with visible default)
                 var namedBindings = resolver.isDeclarationVisible(decl.importClause.namedBindings) ? decl.importClause.namedBindings : /*namedBindings*/ undefined;
                 return visibleDefaultBinding || namedBindings ? ts.updateImportDeclaration(decl, /*decorators*/ undefined, decl.modifiers, ts.updateImportClause(decl.importClause, visibleDefaultBinding, namedBindings), rewriteModuleSpecifier(decl, decl.moduleSpecifier)) : undefined;
@@ -81760,7 +84184,7 @@ var ts;
                 }
                 var priorNeedsDeclare = needsDeclare;
                 needsDeclare = i.parent && ts.isSourceFile(i.parent) && !(ts.isExternalModule(i.parent) && isBundledEmit);
-                var result = transformTopLevelDeclaration(i, /*privateDeclaration*/ true);
+                var result = transformTopLevelDeclaration(i);
                 needsDeclare = priorNeedsDeclare;
                 lateStatementReplacementMap.set("" + ts.getOriginalNodeId(i), result);
             }
@@ -81773,12 +84197,12 @@ var ts;
                     if (lateStatementReplacementMap.has(key)) {
                         var result = lateStatementReplacementMap.get(key);
                         lateStatementReplacementMap.delete(key);
-                        if (result && ts.isSourceFile(statement.parent)) {
+                        if (result) {
                             if (ts.isArray(result) ? ts.some(result, needsScopeMarker) : needsScopeMarker(result)) {
                                 // Top-level declarations in .d.ts files are always considered exported even without a modifier unless there's an export assignment or specifier
                                 needsScopeFixMarker = true;
                             }
-                            if (ts.isArray(result) ? ts.some(result, isExternalModuleIndicator) : isExternalModuleIndicator(result)) {
+                            if (ts.isSourceFile(statement.parent) && (ts.isArray(result) ? ts.some(result, isExternalModuleIndicator) : isExternalModuleIndicator(result))) {
                                 resultHasExternalModuleIndicator = true;
                             }
                         }
@@ -81833,68 +84257,68 @@ var ts;
                 checkEntityNameVisibility(input.exprName, enclosingDeclaration);
             }
             var oldWithinObjectLiteralType = suppressNewDiagnosticContexts;
-            var shouldEnterSuppressNewDiagnosticsContextContext = ((input.kind === 168 /* TypeLiteral */ || input.kind === 181 /* MappedType */) && input.parent.kind !== 242 /* TypeAliasDeclaration */);
+            var shouldEnterSuppressNewDiagnosticsContextContext = ((input.kind === 169 /* TypeLiteral */ || input.kind === 182 /* MappedType */) && input.parent.kind !== 243 /* TypeAliasDeclaration */);
             if (shouldEnterSuppressNewDiagnosticsContextContext) {
                 // We stop making new diagnostic contexts within object literal types. Unless it's an object type on the RHS of a type alias declaration. Then we do.
                 suppressNewDiagnosticContexts = true;
             }
             if (isProcessedComponent(input)) {
                 switch (input.kind) {
-                    case 211 /* ExpressionWithTypeArguments */: {
+                    case 212 /* ExpressionWithTypeArguments */: {
                         if ((ts.isEntityName(input.expression) || ts.isEntityNameExpression(input.expression))) {
                             checkEntityNameVisibility(input.expression, enclosingDeclaration);
                         }
                         var node = ts.visitEachChild(input, visitDeclarationSubtree, context);
                         return cleanup(ts.updateExpressionWithTypeArguments(node, ts.parenthesizeTypeParameters(node.typeArguments), node.expression));
                     }
-                    case 164 /* TypeReference */: {
+                    case 165 /* TypeReference */: {
                         checkEntityNameVisibility(input.typeName, enclosingDeclaration);
                         var node = ts.visitEachChild(input, visitDeclarationSubtree, context);
                         return cleanup(ts.updateTypeReferenceNode(node, node.typeName, ts.parenthesizeTypeParameters(node.typeArguments)));
                     }
-                    case 161 /* ConstructSignature */:
+                    case 162 /* ConstructSignature */:
                         return cleanup(ts.updateConstructSignature(input, ensureTypeParams(input, input.typeParameters), updateParamsList(input, input.parameters), ensureType(input, input.type)));
-                    case 157 /* Constructor */: {
+                    case 158 /* Constructor */: {
                         var isPrivate = ts.hasModifier(input, 8 /* Private */);
                         // A constructor declaration may not have a type annotation
-                        var ctor = ts.createSignatureDeclaration(157 /* Constructor */, isPrivate ? undefined : ensureTypeParams(input, input.typeParameters), 
+                        var ctor = ts.createSignatureDeclaration(158 /* Constructor */, isPrivate ? undefined : ensureTypeParams(input, input.typeParameters), 
                         // TODO: GH#18217
                         isPrivate ? undefined : updateParamsList(input, input.parameters, 0 /* None */), 
                         /*type*/ undefined);
                         ctor.modifiers = ts.createNodeArray(ensureModifiers(input));
                         return cleanup(ctor);
                     }
-                    case 156 /* MethodDeclaration */: {
-                        var sig = ts.createSignatureDeclaration(155 /* MethodSignature */, ensureTypeParams(input, input.typeParameters), updateParamsList(input, input.parameters), ensureType(input, input.type));
+                    case 157 /* MethodDeclaration */: {
+                        var sig = ts.createSignatureDeclaration(156 /* MethodSignature */, ensureTypeParams(input, input.typeParameters), updateParamsList(input, input.parameters), ensureType(input, input.type));
                         sig.name = input.name;
                         sig.modifiers = ts.createNodeArray(ensureModifiers(input));
                         sig.questionToken = input.questionToken;
                         return cleanup(sig);
                     }
-                    case 158 /* GetAccessor */: {
+                    case 159 /* GetAccessor */: {
                         var newNode = ensureAccessor(input);
                         return cleanup(newNode);
                     }
-                    case 159 /* SetAccessor */: {
+                    case 160 /* SetAccessor */: {
                         var newNode = ensureAccessor(input);
                         return cleanup(newNode);
                     }
-                    case 154 /* PropertyDeclaration */:
+                    case 155 /* PropertyDeclaration */:
                         return cleanup(ts.updateProperty(input, 
                         /*decorators*/ undefined, ensureModifiers(input), input.name, input.questionToken, !ts.hasModifier(input, 8 /* Private */) ? ensureType(input, input.type) : undefined, ensureNoInitializer(input)));
-                    case 153 /* PropertySignature */:
+                    case 154 /* PropertySignature */:
                         return cleanup(ts.updatePropertySignature(input, ensureModifiers(input), input.name, input.questionToken, !ts.hasModifier(input, 8 /* Private */) ? ensureType(input, input.type) : undefined, ensureNoInitializer(input)));
-                    case 155 /* MethodSignature */: {
+                    case 156 /* MethodSignature */: {
                         return cleanup(ts.updateMethodSignature(input, ensureTypeParams(input, input.typeParameters), updateParamsList(input, input.parameters), ensureType(input, input.type), input.name, input.questionToken));
                     }
-                    case 160 /* CallSignature */: {
+                    case 161 /* CallSignature */: {
                         return cleanup(ts.updateCallSignature(input, ensureTypeParams(input, input.typeParameters), updateParamsList(input, input.parameters), ensureType(input, input.type)));
                     }
-                    case 162 /* IndexSignature */: {
+                    case 163 /* IndexSignature */: {
                         return cleanup(ts.updateIndexSignature(input, 
-                        /*decorators*/ undefined, ensureModifiers(input), updateParamsList(input, input.parameters), ts.visitNode(input.type, visitDeclarationSubtree) || ts.createKeywordTypeNode(120 /* AnyKeyword */)));
+                        /*decorators*/ undefined, ensureModifiers(input), updateParamsList(input, input.parameters), ts.visitNode(input.type, visitDeclarationSubtree) || ts.createKeywordTypeNode(121 /* AnyKeyword */)));
                     }
-                    case 237 /* VariableDeclaration */: {
+                    case 238 /* VariableDeclaration */: {
                         if (ts.isBindingPattern(input.name)) {
                             return recreateBindingPattern(input.name);
                         }
@@ -81902,13 +84326,13 @@ var ts;
                         suppressNewDiagnosticContexts = true; // Variable declaration types also suppress new diagnostic contexts, provided the contexts wouldn't be made for binding pattern types
                         return cleanup(ts.updateVariableDeclaration(input, input.name, ensureType(input, input.type), ensureNoInitializer(input)));
                     }
-                    case 150 /* TypeParameter */: {
+                    case 151 /* TypeParameter */: {
                         if (isPrivateMethodTypeParameter(input) && (input.default || input.constraint)) {
                             return cleanup(ts.updateTypeParameterDeclaration(input, input.name, /*constraint*/ undefined, /*defaultType*/ undefined));
                         }
                         return cleanup(ts.visitEachChild(input, visitDeclarationSubtree, context));
                     }
-                    case 175 /* ConditionalType */: {
+                    case 176 /* ConditionalType */: {
                         // We have to process conditional types in a special way because for visibility purposes we need to push a new enclosingDeclaration
                         // just for the `infer` types in the true branch. It's an implicit declaration scope that only applies to _part_ of the type.
                         var checkType = ts.visitNode(input.checkType, visitDeclarationSubtree);
@@ -81920,13 +84344,13 @@ var ts;
                         var falseType = ts.visitNode(input.falseType, visitDeclarationSubtree);
                         return cleanup(ts.updateConditionalTypeNode(input, checkType, extendsType, trueType, falseType));
                     }
-                    case 165 /* FunctionType */: {
+                    case 166 /* FunctionType */: {
                         return cleanup(ts.updateFunctionTypeNode(input, ts.visitNodes(input.typeParameters, visitDeclarationSubtree), updateParamsList(input, input.parameters), ts.visitNode(input.type, visitDeclarationSubtree)));
                     }
-                    case 166 /* ConstructorType */: {
+                    case 167 /* ConstructorType */: {
                         return cleanup(ts.updateConstructorTypeNode(input, ts.visitNodes(input.typeParameters, visitDeclarationSubtree), updateParamsList(input, input.parameters), ts.visitNode(input.type, visitDeclarationSubtree)));
                     }
-                    case 183 /* ImportType */: {
+                    case 184 /* ImportType */: {
                         if (!ts.isLiteralImportTypeNode(input))
                             return cleanup(input);
                         return cleanup(ts.updateImportTypeNode(input, ts.updateLiteralTypeNode(input.argument, rewriteModuleSpecifier(input, input.argument.literal)), input.qualifier, ts.visitNodes(input.typeArguments, visitDeclarationSubtree, ts.isTypeNode), input.isTypeOf));
@@ -81955,7 +84379,7 @@ var ts;
             }
         }
         function isPrivateMethodTypeParameter(node) {
-            return node.parent.kind === 156 /* MethodDeclaration */ && ts.hasModifier(node.parent, 8 /* Private */);
+            return node.parent.kind === 157 /* MethodDeclaration */ && ts.hasModifier(node.parent, 8 /* Private */);
         }
         function visitDeclarationStatements(input) {
             if (!isPreservedDeclarationStatement(input)) {
@@ -81965,22 +84389,22 @@ var ts;
             if (shouldStripInternal(input))
                 return;
             switch (input.kind) {
-                case 255 /* ExportDeclaration */: {
+                case 256 /* ExportDeclaration */: {
                     if (ts.isSourceFile(input.parent)) {
                         resultHasExternalModuleIndicator = true;
-                        resultHasScopeMarker = true;
                     }
+                    resultHasScopeMarker = true;
                     // Always visible if the parent node isn't dropped for being not visible
                     // Rewrite external module names if necessary
                     return ts.updateExportDeclaration(input, /*decorators*/ undefined, input.modifiers, input.exportClause, rewriteModuleSpecifier(input, input.moduleSpecifier));
                 }
-                case 254 /* ExportAssignment */: {
+                case 255 /* ExportAssignment */: {
                     // Always visible if the parent node isn't dropped for being not visible
                     if (ts.isSourceFile(input.parent)) {
                         resultHasExternalModuleIndicator = true;
-                        resultHasScopeMarker = true;
                     }
-                    if (input.expression.kind === 72 /* Identifier */) {
+                    resultHasScopeMarker = true;
+                    if (input.expression.kind === 73 /* Identifier */) {
                         return input;
                     }
                     else {
@@ -81990,7 +84414,7 @@ var ts;
                             errorNode: input
                         }); };
                         var varDecl = ts.createVariableDeclaration(newId, resolver.createTypeOfExpression(input.expression, input, declarationEmitNodeBuilderFlags, symbolTracker), /*initializer*/ undefined);
-                        var statement = ts.createVariableStatement(needsDeclare ? [ts.createModifier(125 /* DeclareKeyword */)] : [], ts.createVariableDeclarationList([varDecl], 2 /* Const */));
+                        var statement = ts.createVariableStatement(needsDeclare ? [ts.createModifier(126 /* DeclareKeyword */)] : [], ts.createVariableDeclarationList([varDecl], 2 /* Const */));
                         return [statement, ts.updateExportAssignment(input, input.decorators, input.modifiers, newId)];
                     }
                 }
@@ -82000,14 +84424,25 @@ var ts;
             lateStatementReplacementMap.set("" + ts.getOriginalNodeId(input), result);
             return input;
         }
-        function transformTopLevelDeclaration(input, isPrivate) {
+        function stripExportModifiers(statement) {
+            if (ts.isImportEqualsDeclaration(statement) || ts.hasModifier(statement, 512 /* Default */)) {
+                // `export import` statements should remain as-is, as imports are _not_ implicitly exported in an ambient namespace
+                // Likewise, `export default` classes and the like and just be `default`, so we preserve their `export` modifiers, too
+                return statement;
+            }
+            var clone = ts.getMutableClone(statement);
+            var modifiers = ts.createModifiersFromModifierFlags(ts.getModifierFlags(statement) & (3071 /* All */ ^ 1 /* Export */));
+            clone.modifiers = modifiers.length ? ts.createNodeArray(modifiers) : undefined;
+            return clone;
+        }
+        function transformTopLevelDeclaration(input) {
             if (shouldStripInternal(input))
                 return;
             switch (input.kind) {
-                case 248 /* ImportEqualsDeclaration */: {
+                case 249 /* ImportEqualsDeclaration */: {
                     return transformImportEqualsDeclaration(input);
                 }
-                case 249 /* ImportDeclaration */: {
+                case 250 /* ImportDeclaration */: {
                     return transformImportDeclaration(input);
                 }
             }
@@ -82028,51 +84463,97 @@ var ts;
             }
             var previousNeedsDeclare = needsDeclare;
             switch (input.kind) {
-                case 242 /* TypeAliasDeclaration */: // Type aliases get `declare`d if need be (for legacy support), but that's all
+                case 243 /* TypeAliasDeclaration */: // Type aliases get `declare`d if need be (for legacy support), but that's all
                     return cleanup(ts.updateTypeAliasDeclaration(input, 
-                    /*decorators*/ undefined, ensureModifiers(input, isPrivate), input.name, ts.visitNodes(input.typeParameters, visitDeclarationSubtree, ts.isTypeParameterDeclaration), ts.visitNode(input.type, visitDeclarationSubtree, ts.isTypeNode)));
-                case 241 /* InterfaceDeclaration */: {
+                    /*decorators*/ undefined, ensureModifiers(input), input.name, ts.visitNodes(input.typeParameters, visitDeclarationSubtree, ts.isTypeParameterDeclaration), ts.visitNode(input.type, visitDeclarationSubtree, ts.isTypeNode)));
+                case 242 /* InterfaceDeclaration */: {
                     return cleanup(ts.updateInterfaceDeclaration(input, 
-                    /*decorators*/ undefined, ensureModifiers(input, isPrivate), input.name, ensureTypeParams(input, input.typeParameters), transformHeritageClauses(input.heritageClauses), ts.visitNodes(input.members, visitDeclarationSubtree)));
+                    /*decorators*/ undefined, ensureModifiers(input), input.name, ensureTypeParams(input, input.typeParameters), transformHeritageClauses(input.heritageClauses), ts.visitNodes(input.members, visitDeclarationSubtree)));
                 }
-                case 239 /* FunctionDeclaration */: {
+                case 240 /* FunctionDeclaration */: {
                     // Generators lose their generator-ness, excepting their return type
                     var clean = cleanup(ts.updateFunctionDeclaration(input, 
-                    /*decorators*/ undefined, ensureModifiers(input, isPrivate), 
+                    /*decorators*/ undefined, ensureModifiers(input), 
                     /*asteriskToken*/ undefined, input.name, ensureTypeParams(input, input.typeParameters), updateParamsList(input, input.parameters), ensureType(input, input.type), 
                     /*body*/ undefined));
                     if (clean && resolver.isExpandoFunctionDeclaration(input)) {
-                        var declarations = ts.mapDefined(resolver.getPropertiesOfContainerFunction(input), function (p) {
+                        var props = resolver.getPropertiesOfContainerFunction(input);
+                        var fakespace_1 = ts.createModuleDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, clean.name || ts.createIdentifier("_default"), ts.createModuleBlock([]), 16 /* Namespace */);
+                        fakespace_1.flags ^= 8 /* Synthesized */; // unset synthesized so it is usable as an enclosing declaration
+                        fakespace_1.parent = enclosingDeclaration;
+                        fakespace_1.locals = ts.createSymbolTable(props);
+                        fakespace_1.symbol = props[0].parent;
+                        var declarations = ts.mapDefined(props, function (p) {
                             if (!ts.isPropertyAccessExpression(p.valueDeclaration)) {
                                 return undefined;
                             }
                             getSymbolAccessibilityDiagnostic = ts.createGetSymbolAccessibilityDiagnosticForNode(p.valueDeclaration);
-                            var type = resolver.createTypeOfDeclaration(p.valueDeclaration, enclosingDeclaration, declarationEmitNodeBuilderFlags, symbolTracker);
+                            var type = resolver.createTypeOfDeclaration(p.valueDeclaration, fakespace_1, declarationEmitNodeBuilderFlags, symbolTracker);
                             getSymbolAccessibilityDiagnostic = oldDiag;
                             var varDecl = ts.createVariableDeclaration(ts.unescapeLeadingUnderscores(p.escapedName), type, /*initializer*/ undefined);
                             return ts.createVariableStatement(/*modifiers*/ undefined, ts.createVariableDeclarationList([varDecl]));
                         });
-                        var namespaceDecl = ts.createModuleDeclaration(/*decorators*/ undefined, ensureModifiers(input, isPrivate), input.name, ts.createModuleBlock(declarations), 16 /* Namespace */);
-                        return [clean, namespaceDecl];
+                        var namespaceDecl = ts.createModuleDeclaration(/*decorators*/ undefined, ensureModifiers(input), input.name, ts.createModuleBlock(declarations), 16 /* Namespace */);
+                        if (!ts.hasModifier(clean, 512 /* Default */)) {
+                            return [clean, namespaceDecl];
+                        }
+                        var modifiers = ts.createModifiersFromModifierFlags((ts.getModifierFlags(clean) & ~513 /* ExportDefault */) | 2 /* Ambient */);
+                        var cleanDeclaration = ts.updateFunctionDeclaration(clean, 
+                        /*decorators*/ undefined, modifiers, 
+                        /*asteriskToken*/ undefined, clean.name, clean.typeParameters, clean.parameters, clean.type, 
+                        /*body*/ undefined);
+                        var namespaceDeclaration = ts.updateModuleDeclaration(namespaceDecl, 
+                        /*decorators*/ undefined, modifiers, namespaceDecl.name, namespaceDecl.body);
+                        var exportDefaultDeclaration = ts.createExportAssignment(
+                        /*decorators*/ undefined, 
+                        /*modifiers*/ undefined, 
+                        /*isExportEquals*/ false, namespaceDecl.name);
+                        if (ts.isSourceFile(input.parent)) {
+                            resultHasExternalModuleIndicator = true;
+                        }
+                        resultHasScopeMarker = true;
+                        return [cleanDeclaration, namespaceDeclaration, exportDefaultDeclaration];
                     }
                     else {
                         return clean;
                     }
                 }
-                case 244 /* ModuleDeclaration */: {
+                case 245 /* ModuleDeclaration */: {
                     needsDeclare = false;
                     var inner = input.body;
-                    if (inner && inner.kind === 245 /* ModuleBlock */) {
+                    if (inner && inner.kind === 246 /* ModuleBlock */) {
+                        var oldNeedsScopeFix = needsScopeFixMarker;
+                        var oldHasScopeFix = resultHasScopeMarker;
+                        resultHasScopeMarker = false;
+                        needsScopeFixMarker = false;
                         var statements = ts.visitNodes(inner.statements, visitDeclarationStatements);
-                        var body = ts.updateModuleBlock(inner, transformAndReplaceLatePaintedStatements(statements));
+                        var lateStatements = transformAndReplaceLatePaintedStatements(statements);
+                        if (input.flags & 4194304 /* Ambient */) {
+                            needsScopeFixMarker = false; // If it was `declare`'d everything is implicitly exported already, ignore late printed "privates"
+                        }
+                        // With the final list of statements, there are 3 possibilities:
+                        // 1. There's an export assignment or export declaration in the namespace - do nothing
+                        // 2. Everything is exported and there are no export assignments or export declarations - strip all export modifiers
+                        // 3. Some things are exported, some are not, and there's no marker - add an empty marker
+                        if (!ts.isGlobalScopeAugmentation(input) && !hasScopeMarker(lateStatements) && !resultHasScopeMarker) {
+                            if (needsScopeFixMarker) {
+                                lateStatements = ts.createNodeArray(lateStatements.concat([createEmptyExports()]));
+                            }
+                            else {
+                                lateStatements = ts.visitNodes(lateStatements, stripExportModifiers);
+                            }
+                        }
+                        var body = ts.updateModuleBlock(inner, lateStatements);
                         needsDeclare = previousNeedsDeclare;
-                        var mods = ensureModifiers(input, isPrivate);
+                        needsScopeFixMarker = oldNeedsScopeFix;
+                        resultHasScopeMarker = oldHasScopeFix;
+                        var mods = ensureModifiers(input);
                         return cleanup(ts.updateModuleDeclaration(input, 
                         /*decorators*/ undefined, mods, ts.isExternalModuleAugmentation(input) ? rewriteModuleSpecifier(input, input.name) : input.name, body));
                     }
                     else {
                         needsDeclare = previousNeedsDeclare;
-                        var mods = ensureModifiers(input, isPrivate);
+                        var mods = ensureModifiers(input);
                         needsDeclare = false;
                         ts.visitNode(inner, visitDeclarationStatements);
                         // eagerly transform nested namespaces (the nesting doesn't need any elision or painting done)
@@ -82083,18 +84564,18 @@ var ts;
                         /*decorators*/ undefined, mods, input.name, body));
                     }
                 }
-                case 240 /* ClassDeclaration */: {
-                    var modifiers = ts.createNodeArray(ensureModifiers(input, isPrivate));
+                case 241 /* ClassDeclaration */: {
+                    var modifiers = ts.createNodeArray(ensureModifiers(input));
                     var typeParameters = ensureTypeParams(input, input.typeParameters);
                     var ctor = ts.getFirstConstructorWithBody(input);
                     var parameterProperties = void 0;
                     if (ctor) {
                         var oldDiag_1 = getSymbolAccessibilityDiagnostic;
                         parameterProperties = ts.compact(ts.flatMap(ctor.parameters, function (param) {
-                            if (!ts.hasModifier(param, 92 /* ParameterPropertyModifier */))
+                            if (!ts.hasModifier(param, 92 /* ParameterPropertyModifier */) || shouldStripInternal(param))
                                 return;
                             getSymbolAccessibilityDiagnostic = ts.createGetSymbolAccessibilityDiagnosticForNode(param);
-                            if (param.name.kind === 72 /* Identifier */) {
+                            if (param.name.kind === 73 /* Identifier */) {
                                 return preserveJsDoc(ts.createProperty(
                                 /*decorators*/ undefined, ensureModifiers(param), param.name, param.questionToken, ensureType(param, param.type), ensureNoInitializer(param)), param);
                             }
@@ -82124,7 +84605,7 @@ var ts;
                     }
                     var members = ts.createNodeArray(ts.concatenate(parameterProperties, ts.visitNodes(input.members, visitDeclarationSubtree)));
                     var extendsClause_1 = ts.getEffectiveBaseTypeNode(input);
-                    if (extendsClause_1 && !ts.isEntityNameExpression(extendsClause_1.expression) && extendsClause_1.expression.kind !== 96 /* NullKeyword */) {
+                    if (extendsClause_1 && !ts.isEntityNameExpression(extendsClause_1.expression) && extendsClause_1.expression.kind !== 97 /* NullKeyword */) {
                         // We must add a temporary declaration for the extends clause expression
                         var oldId = input.name ? ts.unescapeLeadingUnderscores(input.name.escapedText) : "default";
                         var newId_1 = ts.createOptimisticUniqueName(oldId + "_base");
@@ -82134,16 +84615,16 @@ var ts;
                             typeName: input.name
                         }); };
                         var varDecl = ts.createVariableDeclaration(newId_1, resolver.createTypeOfExpression(extendsClause_1.expression, input, declarationEmitNodeBuilderFlags, symbolTracker), /*initializer*/ undefined);
-                        var statement = ts.createVariableStatement(needsDeclare ? [ts.createModifier(125 /* DeclareKeyword */)] : [], ts.createVariableDeclarationList([varDecl], 2 /* Const */));
+                        var statement = ts.createVariableStatement(needsDeclare ? [ts.createModifier(126 /* DeclareKeyword */)] : [], ts.createVariableDeclarationList([varDecl], 2 /* Const */));
                         var heritageClauses = ts.createNodeArray(ts.map(input.heritageClauses, function (clause) {
-                            if (clause.token === 86 /* ExtendsKeyword */) {
+                            if (clause.token === 87 /* ExtendsKeyword */) {
                                 var oldDiag_2 = getSymbolAccessibilityDiagnostic;
                                 getSymbolAccessibilityDiagnostic = ts.createGetSymbolAccessibilityDiagnosticForNode(clause.types[0]);
                                 var newClause = ts.updateHeritageClause(clause, ts.map(clause.types, function (t) { return ts.updateExpressionWithTypeArguments(t, ts.visitNodes(t.typeArguments, visitDeclarationSubtree), newId_1); }));
                                 getSymbolAccessibilityDiagnostic = oldDiag_2;
                                 return newClause;
                             }
-                            return ts.updateHeritageClause(clause, ts.visitNodes(ts.createNodeArray(ts.filter(clause.types, function (t) { return ts.isEntityNameExpression(t.expression) || t.expression.kind === 96 /* NullKeyword */; })), visitDeclarationSubtree));
+                            return ts.updateHeritageClause(clause, ts.visitNodes(ts.createNodeArray(ts.filter(clause.types, function (t) { return ts.isEntityNameExpression(t.expression) || t.expression.kind === 97 /* NullKeyword */; })), visitDeclarationSubtree));
                         }));
                         return [statement, cleanup(ts.updateClassDeclaration(input, 
                             /*decorators*/ undefined, modifiers, input.name, typeParameters, heritageClauses, members))]; // TODO: GH#18217
@@ -82154,11 +84635,11 @@ var ts;
                         /*decorators*/ undefined, modifiers, input.name, typeParameters, heritageClauses, members));
                     }
                 }
-                case 219 /* VariableStatement */: {
-                    return cleanup(transformVariableStatement(input, isPrivate));
+                case 220 /* VariableStatement */: {
+                    return cleanup(transformVariableStatement(input));
                 }
-                case 243 /* EnumDeclaration */: {
-                    return cleanup(ts.updateEnumDeclaration(input, /*decorators*/ undefined, ts.createNodeArray(ensureModifiers(input, isPrivate)), input.name, ts.createNodeArray(ts.mapDefined(input.members, function (m) {
+                case 244 /* EnumDeclaration */: {
+                    return cleanup(ts.updateEnumDeclaration(input, /*decorators*/ undefined, ts.createNodeArray(ensureModifiers(input)), input.name, ts.createNodeArray(ts.mapDefined(input.members, function (m) {
                         if (shouldStripInternal(m))
                             return;
                         // Rewrite enum values to their constants, if available
@@ -82176,7 +84657,7 @@ var ts;
                 if (canProdiceDiagnostic) {
                     getSymbolAccessibilityDiagnostic = oldDiag;
                 }
-                if (input.kind === 244 /* ModuleDeclaration */) {
+                if (input.kind === 245 /* ModuleDeclaration */) {
                     needsDeclare = previousNeedsDeclare;
                 }
                 if (node === input) {
@@ -82185,19 +84666,19 @@ var ts;
                 return node && ts.setOriginalNode(preserveJsDoc(node, input), input);
             }
         }
-        function transformVariableStatement(input, privateDeclaration) {
+        function transformVariableStatement(input) {
             if (!ts.forEach(input.declarationList.declarations, getBindingNameVisible))
                 return;
             var nodes = ts.visitNodes(input.declarationList.declarations, visitDeclarationSubtree);
             if (!ts.length(nodes))
                 return;
-            return ts.updateVariableStatement(input, ts.createNodeArray(ensureModifiers(input, privateDeclaration)), ts.updateVariableDeclarationList(input.declarationList, nodes));
+            return ts.updateVariableStatement(input, ts.createNodeArray(ensureModifiers(input)), ts.updateVariableDeclarationList(input.declarationList, nodes));
         }
         function recreateBindingPattern(d) {
             return ts.flatten(ts.mapDefined(d.elements, function (e) { return recreateBindingElement(e); }));
         }
         function recreateBindingElement(e) {
-            if (e.kind === 210 /* OmittedExpression */) {
+            if (e.kind === 211 /* OmittedExpression */) {
                 return;
             }
             if (e.name) {
@@ -82233,26 +84714,23 @@ var ts;
         function isScopeMarker(node) {
             return ts.isExportAssignment(node) || ts.isExportDeclaration(node);
         }
-        function hasScopeMarker(node) {
-            if (ts.isModuleBlock(node)) {
-                return ts.some(node.statements, isScopeMarker);
-            }
-            return false;
+        function hasScopeMarker(statements) {
+            return ts.some(statements, isScopeMarker);
         }
-        function ensureModifiers(node, privateDeclaration) {
+        function ensureModifiers(node) {
             var currentFlags = ts.getModifierFlags(node);
-            var newFlags = ensureModifierFlags(node, privateDeclaration);
+            var newFlags = ensureModifierFlags(node);
             if (currentFlags === newFlags) {
                 return node.modifiers;
             }
             return ts.createModifiersFromModifierFlags(newFlags);
         }
-        function ensureModifierFlags(node, privateDeclaration) {
+        function ensureModifierFlags(node) {
             var mask = 3071 /* All */ ^ (4 /* Public */ | 256 /* Async */); // No async modifiers in declaration files
             var additions = (needsDeclare && !isAlwaysType(node)) ? 2 /* Ambient */ : 0 /* None */;
-            var parentIsFile = node.parent.kind === 284 /* SourceFile */;
+            var parentIsFile = node.parent.kind === 285 /* SourceFile */;
             if (!parentIsFile || (isBundledEmit && parentIsFile && ts.isExternalModule(node.parent))) {
-                mask ^= ((privateDeclaration || (isBundledEmit && parentIsFile) || hasScopeMarker(node.parent) ? 0 : 1 /* Export */) | 2 /* Ambient */);
+                mask ^= 2 /* Ambient */;
                 additions = 0 /* None */;
             }
             return maskModifierFlags(node, mask, additions);
@@ -82271,7 +84749,7 @@ var ts;
             var prop = ts.createProperty(/*decorators*/ undefined, maskModifiers(node, /*mask*/ undefined, (!accessors.setAccessor) ? 64 /* Readonly */ : 0 /* None */), node.name, node.questionToken, ensureType(node, accessorType), /*initializer*/ undefined);
             var leadingsSyntheticCommentRanges = accessors.secondAccessor && ts.getLeadingCommentRangesOfNode(accessors.secondAccessor, currentSourceFile);
             if (leadingsSyntheticCommentRanges) {
-                var _loop_10 = function (range) {
+                var _loop_15 = function (range) {
                     if (range.kind === 3 /* MultiLineCommentTrivia */) {
                         var text = currentSourceFile.text.slice(range.pos + 2, range.end - 2);
                         var lines = text.split(/\r\n?|\n/g);
@@ -82285,20 +84763,20 @@ var ts;
                 };
                 for (var _i = 0, leadingsSyntheticCommentRanges_1 = leadingsSyntheticCommentRanges; _i < leadingsSyntheticCommentRanges_1.length; _i++) {
                     var range = leadingsSyntheticCommentRanges_1[_i];
-                    _loop_10(range);
+                    _loop_15(range);
                 }
             }
             return prop;
         }
         function transformHeritageClauses(nodes) {
             return ts.createNodeArray(ts.filter(ts.map(nodes, function (clause) { return ts.updateHeritageClause(clause, ts.visitNodes(ts.createNodeArray(ts.filter(clause.types, function (t) {
-                return ts.isEntityNameExpression(t.expression) || (clause.token === 86 /* ExtendsKeyword */ && t.expression.kind === 96 /* NullKeyword */);
+                return ts.isEntityNameExpression(t.expression) || (clause.token === 87 /* ExtendsKeyword */ && t.expression.kind === 97 /* NullKeyword */);
             })), visitDeclarationSubtree)); }), function (clause) { return clause.types && !!clause.types.length; }));
         }
     }
     ts.transformDeclarations = transformDeclarations;
     function isAlwaysType(node) {
-        if (node.kind === 241 /* InterfaceDeclaration */) {
+        if (node.kind === 242 /* InterfaceDeclaration */) {
             return true;
         }
         return false;
@@ -82323,7 +84801,7 @@ var ts;
     }
     function getTypeAnnotationFromAccessor(accessor) {
         if (accessor) {
-            return accessor.kind === 158 /* GetAccessor */
+            return accessor.kind === 159 /* GetAccessor */
                 ? accessor.type // Getter - return type
                 : accessor.parameters.length > 0
                     ? accessor.parameters[0].type // Setter parameter type
@@ -82332,52 +84810,52 @@ var ts;
     }
     function canHaveLiteralInitializer(node) {
         switch (node.kind) {
-            case 154 /* PropertyDeclaration */:
-            case 153 /* PropertySignature */:
+            case 155 /* PropertyDeclaration */:
+            case 154 /* PropertySignature */:
                 return !ts.hasModifier(node, 8 /* Private */);
-            case 151 /* Parameter */:
-            case 237 /* VariableDeclaration */:
+            case 152 /* Parameter */:
+            case 238 /* VariableDeclaration */:
                 return true;
         }
         return false;
     }
     function isPreservedDeclarationStatement(node) {
         switch (node.kind) {
-            case 239 /* FunctionDeclaration */:
-            case 244 /* ModuleDeclaration */:
-            case 248 /* ImportEqualsDeclaration */:
-            case 241 /* InterfaceDeclaration */:
-            case 240 /* ClassDeclaration */:
-            case 242 /* TypeAliasDeclaration */:
-            case 243 /* EnumDeclaration */:
-            case 219 /* VariableStatement */:
-            case 249 /* ImportDeclaration */:
-            case 255 /* ExportDeclaration */:
-            case 254 /* ExportAssignment */:
+            case 240 /* FunctionDeclaration */:
+            case 245 /* ModuleDeclaration */:
+            case 249 /* ImportEqualsDeclaration */:
+            case 242 /* InterfaceDeclaration */:
+            case 241 /* ClassDeclaration */:
+            case 243 /* TypeAliasDeclaration */:
+            case 244 /* EnumDeclaration */:
+            case 220 /* VariableStatement */:
+            case 250 /* ImportDeclaration */:
+            case 256 /* ExportDeclaration */:
+            case 255 /* ExportAssignment */:
                 return true;
         }
         return false;
     }
     function isProcessedComponent(node) {
         switch (node.kind) {
-            case 161 /* ConstructSignature */:
-            case 157 /* Constructor */:
-            case 156 /* MethodDeclaration */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
-            case 154 /* PropertyDeclaration */:
-            case 153 /* PropertySignature */:
-            case 155 /* MethodSignature */:
-            case 160 /* CallSignature */:
-            case 162 /* IndexSignature */:
-            case 237 /* VariableDeclaration */:
-            case 150 /* TypeParameter */:
-            case 211 /* ExpressionWithTypeArguments */:
-            case 164 /* TypeReference */:
-            case 175 /* ConditionalType */:
-            case 165 /* FunctionType */:
-            case 166 /* ConstructorType */:
-            case 183 /* ImportType */:
+            case 162 /* ConstructSignature */:
+            case 158 /* Constructor */:
+            case 157 /* MethodDeclaration */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
+            case 155 /* PropertyDeclaration */:
+            case 154 /* PropertySignature */:
+            case 156 /* MethodSignature */:
+            case 161 /* CallSignature */:
+            case 163 /* IndexSignature */:
+            case 238 /* VariableDeclaration */:
+            case 151 /* TypeParameter */:
+            case 212 /* ExpressionWithTypeArguments */:
+            case 165 /* TypeReference */:
+            case 176 /* ConditionalType */:
+            case 166 /* FunctionType */:
+            case 167 /* ConstructorType */:
+            case 184 /* ImportType */:
                 return true;
         }
         return false;
@@ -82409,17 +84887,28 @@ var ts;
         SyntaxKindFeatureFlags[SyntaxKindFeatureFlags["Substitution"] = 1] = "Substitution";
         SyntaxKindFeatureFlags[SyntaxKindFeatureFlags["EmitNotifications"] = 2] = "EmitNotifications";
     })(SyntaxKindFeatureFlags || (SyntaxKindFeatureFlags = {}));
-    function getTransformers(compilerOptions, customTransformers) {
+    ts.noTransformers = { scriptTransformers: ts.emptyArray, declarationTransformers: ts.emptyArray };
+    function getTransformers(compilerOptions, customTransformers, emitOnlyDtsFiles) {
+        return {
+            scriptTransformers: getScriptTransformers(compilerOptions, customTransformers, emitOnlyDtsFiles),
+            declarationTransformers: getDeclarationTransformers(customTransformers),
+        };
+    }
+    ts.getTransformers = getTransformers;
+    function getScriptTransformers(compilerOptions, customTransformers, emitOnlyDtsFiles) {
+        if (emitOnlyDtsFiles)
+            return ts.emptyArray;
         var jsx = compilerOptions.jsx;
         var languageVersion = ts.getEmitScriptTarget(compilerOptions);
         var moduleKind = ts.getEmitModuleKind(compilerOptions);
         var transformers = [];
-        ts.addRange(transformers, customTransformers && customTransformers.before);
+        ts.addRange(transformers, customTransformers && ts.map(customTransformers.before, wrapScriptTransformerFactory));
         transformers.push(ts.transformTypeScript);
+        transformers.push(ts.transformClassFields);
         if (jsx === 2 /* React */) {
             transformers.push(ts.transformJsx);
         }
-        if (languageVersion < 7 /* ESNext */) {
+        if (languageVersion < 99 /* ESNext */) {
             transformers.push(ts.transformESNext);
         }
         if (languageVersion < 6 /* ES2019 */) {
@@ -82444,10 +84933,38 @@ var ts;
         if (languageVersion < 1 /* ES5 */) {
             transformers.push(ts.transformES5);
         }
-        ts.addRange(transformers, customTransformers && customTransformers.after);
+        ts.addRange(transformers, customTransformers && ts.map(customTransformers.after, wrapScriptTransformerFactory));
         return transformers;
     }
-    ts.getTransformers = getTransformers;
+    function getDeclarationTransformers(customTransformers) {
+        var transformers = [];
+        transformers.push(ts.transformDeclarations);
+        ts.addRange(transformers, customTransformers && ts.map(customTransformers.afterDeclarations, wrapDeclarationTransformerFactory));
+        return transformers;
+    }
+    /**
+     * Wrap a custom script or declaration transformer object in a `Transformer` callback with fallback support for transforming bundles.
+     */
+    function wrapCustomTransformer(transformer) {
+        return function (node) { return ts.isBundle(node) ? transformer.transformBundle(node) : transformer.transformSourceFile(node); };
+    }
+    /**
+     * Wrap a transformer factory that may return a custom script or declaration transformer object.
+     */
+    function wrapCustomTransformerFactory(transformer, handleDefault) {
+        return function (context) {
+            var customTransformer = transformer(context);
+            return typeof customTransformer === "function"
+                ? handleDefault(customTransformer)
+                : wrapCustomTransformer(customTransformer);
+        };
+    }
+    function wrapScriptTransformerFactory(transformer) {
+        return wrapCustomTransformerFactory(transformer, ts.chainBundle);
+    }
+    function wrapDeclarationTransformerFactory(transformer) {
+        return wrapCustomTransformerFactory(transformer, ts.identity);
+    }
     function noEmitSubstitution(_hint, node) {
         return node;
     }
@@ -82467,7 +84984,7 @@ var ts;
      * @param allowDtsFiles A value indicating whether to allow the transformation of .d.ts files.
      */
     function transformNodes(resolver, host, options, nodes, transformers, allowDtsFiles) {
-        var enabledSyntaxKindFeatures = new Array(317 /* Count */);
+        var enabledSyntaxKindFeatures = new Array(319 /* Count */);
         var lexicalEnvironmentVariableDeclarations;
         var lexicalEnvironmentFunctionDeclarations;
         var lexicalEnvironmentVariableDeclarationsStack = [];
@@ -82520,7 +85037,14 @@ var ts;
         }
         ts.performance.mark("beforeTransform");
         // Chain together and initialize each transformer.
-        var transformation = ts.chain.apply(void 0, transformers)(context);
+        var transformersWithContext = transformers.map(function (t) { return t(context); });
+        var transformation = function (node) {
+            for (var _i = 0, transformersWithContext_1 = transformersWithContext; _i < transformersWithContext_1.length; _i++) {
+                var transform = transformersWithContext_1[_i];
+                node = transform(node);
+            }
+            return node;
+        };
         // prevent modification of transformation hooks.
         state = 1 /* Initialized */;
         // Transform each node.
@@ -82672,6 +85196,7 @@ var ts;
                 if (lexicalEnvironmentVariableDeclarations) {
                     var statement = ts.createVariableStatement(
                     /*modifiers*/ undefined, ts.createVariableDeclarationList(lexicalEnvironmentVariableDeclarations));
+                    ts.setEmitFlags(statement, 1048576 /* CustomPrologue */);
                     if (!statements) {
                         statements = [statement];
                     }
@@ -82779,7 +85304,7 @@ var ts;
     /*@internal*/
     function getOutputPathForBuildInfo(options) {
         var configFile = options.configFilePath;
-        if (!configFile || !ts.isIncrementalCompilation(options))
+        if (!ts.isIncrementalCompilation(options))
             return undefined;
         if (options.tsBuildInfoFile)
             return options.tsBuildInfoFile;
@@ -82789,6 +85314,8 @@ var ts;
             buildInfoExtensionLess = ts.removeFileExtension(outPath);
         }
         else {
+            if (!configFile)
+                return undefined;
             var configFileExtensionLess = ts.removeFileExtension(configFile);
             buildInfoExtensionLess = options.outDir ?
                 options.rootDir ?
@@ -82813,7 +85340,7 @@ var ts;
     /*@internal*/
     function getOutputPathsFor(sourceFile, host, forceDtsPaths) {
         var options = host.getCompilerOptions();
-        if (sourceFile.kind === 285 /* Bundle */) {
+        if (sourceFile.kind === 286 /* Bundle */) {
             return getOutputPathsForBundle(options, forceDtsPaths);
         }
         else {
@@ -82856,16 +85383,99 @@ var ts;
         return ".js" /* Js */;
     }
     ts.getOutputExtension = getOutputExtension;
+    function rootDirOfOptions(configFile) {
+        return configFile.options.rootDir || ts.getDirectoryPath(ts.Debug.assertDefined(configFile.options.configFilePath));
+    }
+    function getOutputPathWithoutChangingExt(inputFileName, configFile, ignoreCase, outputDir) {
+        return outputDir ?
+            ts.resolvePath(outputDir, ts.getRelativePathFromDirectory(rootDirOfOptions(configFile), inputFileName, ignoreCase)) :
+            inputFileName;
+    }
+    /* @internal */
+    function getOutputDeclarationFileName(inputFileName, configFile, ignoreCase) {
+        ts.Debug.assert(!ts.fileExtensionIs(inputFileName, ".d.ts" /* Dts */) && ts.hasTSFileExtension(inputFileName));
+        return ts.changeExtension(getOutputPathWithoutChangingExt(inputFileName, configFile, ignoreCase, configFile.options.declarationDir || configFile.options.outDir), ".d.ts" /* Dts */);
+    }
+    ts.getOutputDeclarationFileName = getOutputDeclarationFileName;
+    function getOutputJSFileName(inputFileName, configFile, ignoreCase) {
+        var isJsonFile = ts.fileExtensionIs(inputFileName, ".json" /* Json */);
+        var outputFileName = ts.changeExtension(getOutputPathWithoutChangingExt(inputFileName, configFile, ignoreCase, configFile.options.outDir), isJsonFile ?
+            ".json" /* Json */ :
+            ts.fileExtensionIs(inputFileName, ".tsx" /* Tsx */) && configFile.options.jsx === 1 /* Preserve */ ?
+                ".jsx" /* Jsx */ :
+                ".js" /* Js */);
+        return !isJsonFile || ts.comparePaths(inputFileName, outputFileName, ts.Debug.assertDefined(configFile.options.configFilePath), ignoreCase) !== 0 /* EqualTo */ ?
+            outputFileName :
+            undefined;
+    }
+    /*@internal*/
+    function getAllProjectOutputs(configFile, ignoreCase) {
+        var outputs;
+        var addOutput = function (path) { return path && (outputs || (outputs = [])).push(path); };
+        if (configFile.options.outFile || configFile.options.out) {
+            var _a = getOutputPathsForBundle(configFile.options, /*forceDtsPaths*/ false), jsFilePath = _a.jsFilePath, sourceMapFilePath = _a.sourceMapFilePath, declarationFilePath = _a.declarationFilePath, declarationMapPath = _a.declarationMapPath, buildInfoPath = _a.buildInfoPath;
+            addOutput(jsFilePath);
+            addOutput(sourceMapFilePath);
+            addOutput(declarationFilePath);
+            addOutput(declarationMapPath);
+            addOutput(buildInfoPath);
+        }
+        else {
+            for (var _b = 0, _c = configFile.fileNames; _b < _c.length; _b++) {
+                var inputFileName = _c[_b];
+                if (ts.fileExtensionIs(inputFileName, ".d.ts" /* Dts */))
+                    continue;
+                var js = getOutputJSFileName(inputFileName, configFile, ignoreCase);
+                addOutput(js);
+                if (ts.fileExtensionIs(inputFileName, ".json" /* Json */))
+                    continue;
+                if (configFile.options.sourceMap) {
+                    addOutput(js + ".map");
+                }
+                if (ts.getEmitDeclarations(configFile.options) && ts.hasTSFileExtension(inputFileName)) {
+                    var dts = getOutputDeclarationFileName(inputFileName, configFile, ignoreCase);
+                    addOutput(dts);
+                    if (configFile.options.declarationMap) {
+                        addOutput(dts + ".map");
+                    }
+                }
+            }
+            addOutput(getOutputPathForBuildInfo(configFile.options));
+        }
+        return outputs || ts.emptyArray;
+    }
+    ts.getAllProjectOutputs = getAllProjectOutputs;
+    /*@internal*/
+    function getFirstProjectOutput(configFile, ignoreCase) {
+        if (configFile.options.outFile || configFile.options.out) {
+            var jsFilePath = getOutputPathsForBundle(configFile.options, /*forceDtsPaths*/ false).jsFilePath;
+            return ts.Debug.assertDefined(jsFilePath, "project " + configFile.options.configFilePath + " expected to have at least one output");
+        }
+        for (var _a = 0, _b = configFile.fileNames; _a < _b.length; _a++) {
+            var inputFileName = _b[_a];
+            if (ts.fileExtensionIs(inputFileName, ".d.ts" /* Dts */))
+                continue;
+            var jsFilePath = getOutputJSFileName(inputFileName, configFile, ignoreCase);
+            if (jsFilePath)
+                return jsFilePath;
+        }
+        var buildInfoPath = getOutputPathForBuildInfo(configFile.options);
+        if (buildInfoPath)
+            return buildInfoPath;
+        return ts.Debug.fail("project " + configFile.options.configFilePath + " expected to have at least one output");
+    }
+    ts.getFirstProjectOutput = getFirstProjectOutput;
     /*@internal*/
     // targetSourceFile is when users only want one file in entire project to be emitted. This is used in compileOnSave feature
-    function emitFiles(resolver, host, targetSourceFile, emitOnlyDtsFiles, transformers, declarationTransformers, onlyBuildInfo) {
+    function emitFiles(resolver, host, targetSourceFile, _a, emitOnlyDtsFiles, onlyBuildInfo) {
+        var scriptTransformers = _a.scriptTransformers, declarationTransformers = _a.declarationTransformers;
         var compilerOptions = host.getCompilerOptions();
         var sourceMapDataList = (compilerOptions.sourceMap || compilerOptions.inlineSourceMap || ts.getAreDeclarationMapsEnabled(compilerOptions)) ? [] : undefined;
         var emittedFilesList = compilerOptions.listEmittedFiles ? [] : undefined;
         var emitterDiagnostics = ts.createDiagnosticCollection();
         var newLine = ts.getNewLineCharacter(compilerOptions, function () { return host.getNewLine(); });
         var writer = ts.createTextWriter(newLine);
-        var _a = ts.performance.createTimer("printTime", "beforePrint", "afterPrint"), enter = _a.enter, exit = _a.exit;
+        var _b = ts.performance.createTimer("printTime", "beforePrint", "afterPrint"), enter = _b.enter, exit = _b.exit;
         var bundleBuildInfo;
         var emitSkipped = false;
         var exportedModulesFromDeclarationEmit;
@@ -82882,14 +85492,16 @@ var ts;
         };
         function emitSourceFileOrBundle(_a, sourceFileOrBundle) {
             var jsFilePath = _a.jsFilePath, sourceMapFilePath = _a.sourceMapFilePath, declarationFilePath = _a.declarationFilePath, declarationMapPath = _a.declarationMapPath, buildInfoPath = _a.buildInfoPath;
+            var buildInfoDirectory;
             if (buildInfoPath && sourceFileOrBundle && ts.isBundle(sourceFileOrBundle)) {
+                buildInfoDirectory = ts.getDirectoryPath(ts.getNormalizedAbsolutePath(buildInfoPath, host.getCurrentDirectory()));
                 bundleBuildInfo = {
-                    commonSourceDirectory: host.getCommonSourceDirectory(),
-                    sourceFiles: sourceFileOrBundle.sourceFiles.map(function (file) { return file.fileName; })
+                    commonSourceDirectory: relativeToBuildInfo(host.getCommonSourceDirectory()),
+                    sourceFiles: sourceFileOrBundle.sourceFiles.map(function (file) { return relativeToBuildInfo(ts.getNormalizedAbsolutePath(file.fileName, host.getCurrentDirectory())); })
                 };
             }
-            emitJsFileOrBundle(sourceFileOrBundle, jsFilePath, sourceMapFilePath);
-            emitDeclarationFileOrBundle(sourceFileOrBundle, declarationFilePath, declarationMapPath);
+            emitJsFileOrBundle(sourceFileOrBundle, jsFilePath, sourceMapFilePath, relativeToBuildInfo);
+            emitDeclarationFileOrBundle(sourceFileOrBundle, declarationFilePath, declarationMapPath, relativeToBuildInfo);
             emitBuildInfo(bundleBuildInfo, buildInfoPath);
             if (!emitSkipped && emittedFilesList) {
                 if (!emitOnlyDtsFiles) {
@@ -82910,21 +85522,22 @@ var ts;
                     emittedFilesList.push(declarationMapPath);
                 }
             }
+            function relativeToBuildInfo(path) {
+                return ts.ensurePathIsNonModuleName(ts.getRelativePathFromDirectory(buildInfoDirectory, path, host.getCanonicalFileName));
+            }
         }
         function emitBuildInfo(bundle, buildInfoPath) {
             // Write build information if applicable
             if (!buildInfoPath || targetSourceFile || emitSkipped)
                 return;
             var program = host.getProgramBuildInfo();
-            if (!bundle && !program)
-                return;
             if (host.isEmitBlocked(buildInfoPath) || compilerOptions.noEmit) {
                 emitSkipped = true;
                 return;
             }
             ts.writeFile(host, emitterDiagnostics, buildInfoPath, getBuildInfoText({ bundle: bundle, program: program, version: ts.version }), /*writeByteOrderMark*/ false);
         }
-        function emitJsFileOrBundle(sourceFileOrBundle, jsFilePath, sourceMapFilePath) {
+        function emitJsFileOrBundle(sourceFileOrBundle, jsFilePath, sourceMapFilePath, relativeToBuildInfo) {
             if (!sourceFileOrBundle || emitOnlyDtsFiles || !jsFilePath) {
                 return;
             }
@@ -82934,7 +85547,7 @@ var ts;
                 return;
             }
             // Transform the source files
-            var transform = ts.transformNodes(resolver, host, compilerOptions, [sourceFileOrBundle], transformers, /*allowDtsFiles*/ false);
+            var transform = ts.transformNodes(resolver, host, compilerOptions, [sourceFileOrBundle], scriptTransformers, /*allowDtsFiles*/ false);
             var printerOptions = {
                 removeComments: compilerOptions.removeComments,
                 newLine: compilerOptions.newLine,
@@ -82945,7 +85558,8 @@ var ts;
                 inlineSourceMap: compilerOptions.inlineSourceMap,
                 inlineSources: compilerOptions.inlineSources,
                 extendedDiagnostics: compilerOptions.extendedDiagnostics,
-                writeBundleFileInfo: !!bundleBuildInfo
+                writeBundleFileInfo: !!bundleBuildInfo,
+                relativeToBuildInfo: relativeToBuildInfo
             };
             // Create a printer to print the nodes
             var printer = createPrinter(printerOptions, {
@@ -82962,7 +85576,7 @@ var ts;
             if (bundleBuildInfo)
                 bundleBuildInfo.js = printer.bundleFileInfo;
         }
-        function emitDeclarationFileOrBundle(sourceFileOrBundle, declarationFilePath, declarationMapPath) {
+        function emitDeclarationFileOrBundle(sourceFileOrBundle, declarationFilePath, declarationMapPath, relativeToBuildInfo) {
             if (!sourceFileOrBundle || !(declarationFilePath && !ts.isInJSFile(sourceFileOrBundle))) {
                 return;
             }
@@ -82975,7 +85589,7 @@ var ts;
                 // Do that here when emitting only dts files
                 nonJsFiles.forEach(collectLinkedAliases);
             }
-            var declarationTransform = ts.transformNodes(resolver, host, compilerOptions, inputListOrBundle, ts.concatenate([ts.transformDeclarations], declarationTransformers), /*allowDtsFiles*/ false);
+            var declarationTransform = ts.transformNodes(resolver, host, compilerOptions, inputListOrBundle, declarationTransformers, /*allowDtsFiles*/ false);
             if (ts.length(declarationTransform.diagnostics)) {
                 for (var _a = 0, _b = declarationTransform.diagnostics; _a < _b.length; _a++) {
                     var diagnostic = _b[_a];
@@ -82993,7 +85607,8 @@ var ts;
                 extendedDiagnostics: compilerOptions.extendedDiagnostics,
                 onlyPrintJsDocStyle: true,
                 writeBundleFileInfo: !!bundleBuildInfo,
-                recordInternalSection: !!bundleBuildInfo
+                recordInternalSection: !!bundleBuildInfo,
+                relativeToBuildInfo: relativeToBuildInfo
             };
             var declarationPrinter = createPrinter(printerOptions, {
                 // resolver hooks
@@ -83012,8 +85627,12 @@ var ts;
                     mapRoot: compilerOptions.mapRoot,
                     extendedDiagnostics: compilerOptions.extendedDiagnostics,
                 });
-                if (emitOnlyDtsFiles && declarationTransform.transformed[0].kind === 284 /* SourceFile */) {
-                    var sourceFile = declarationTransform.transformed[0];
+                if (emitOnlyDtsFiles && declarationTransform.transformed[0].kind === 285 /* SourceFile */) {
+                    // Improved narrowing in master/3.6 makes this cast unnecessary, triggering a lint rule.
+                    // But at the same time, the LKG (3.5) necessitates it because it doesn’t narrow.
+                    // Once the LKG is updated to 3.6, this comment, the cast to `SourceFile`, and the
+                    // tslint directive can be all be removed.
+                    var sourceFile = declarationTransform.transformed[0]; // tslint:disable-line
                     exportedModulesFromDeclarationEmit = sourceFile.exportedModulesFromDeclarationEmit;
                 }
             }
@@ -83023,7 +85642,7 @@ var ts;
         }
         function collectLinkedAliases(node) {
             if (ts.isExportAssignment(node)) {
-                if (node.expression.kind === 72 /* Identifier */) {
+                if (node.expression.kind === 73 /* Identifier */) {
                     resolver.collectLinkedAliases(node.expression, /*setVisibility*/ true);
                 }
                 return;
@@ -83035,8 +85654,8 @@ var ts;
             ts.forEachChild(node, collectLinkedAliases);
         }
         function printSourceFileOrBundle(jsFilePath, sourceMapFilePath, sourceFileOrBundle, printer, mapOptions) {
-            var bundle = sourceFileOrBundle.kind === 285 /* Bundle */ ? sourceFileOrBundle : undefined;
-            var sourceFile = sourceFileOrBundle.kind === 284 /* SourceFile */ ? sourceFileOrBundle : undefined;
+            var bundle = sourceFileOrBundle.kind === 286 /* Bundle */ ? sourceFileOrBundle : undefined;
+            var sourceFile = sourceFileOrBundle.kind === 285 /* SourceFile */ ? sourceFileOrBundle : undefined;
             var sourceFiles = bundle ? bundle.sourceFiles : [sourceFile];
             var sourceMapGenerator;
             if (shouldEmitSourceMaps(mapOptions, sourceFileOrBundle)) {
@@ -83077,7 +85696,7 @@ var ts;
         }
         function shouldEmitSourceMaps(mapOptions, sourceFileOrBundle) {
             return (mapOptions.sourceMap || mapOptions.inlineSourceMap)
-                && (sourceFileOrBundle.kind !== 284 /* SourceFile */ || !ts.fileExtensionIs(sourceFileOrBundle.fileName, ".json" /* Json */));
+                && (sourceFileOrBundle.kind !== 285 /* SourceFile */ || !ts.fileExtensionIs(sourceFileOrBundle.fileName, ".json" /* Json */));
         }
         function getSourceRoot(mapOptions) {
             // Normalize source root and make sure it has trailing "/" so that it can be used to combine paths with the
@@ -83185,10 +85804,10 @@ var ts;
         getSymbolOfExternalModuleSpecifier: ts.notImplemented,
         isBindingCapturedByNode: ts.notImplemented,
     };
-    function createSourceFilesFromBundleBuildInfo(bundle) {
+    function createSourceFilesFromBundleBuildInfo(bundle, buildInfoDirectory, host) {
         var sourceFiles = bundle.sourceFiles.map(function (fileName) {
-            var sourceFile = ts.createNode(284 /* SourceFile */, 0, 0);
-            sourceFile.fileName = fileName;
+            var sourceFile = ts.createNode(285 /* SourceFile */, 0, 0);
+            sourceFile.fileName = ts.getRelativePathFromDirectory(host.getCurrentDirectory(), ts.getNormalizedAbsolutePath(fileName, buildInfoDirectory), !host.useCaseSensitiveFileNames());
             sourceFile.text = "";
             sourceFile.statements = ts.createNodeArray();
             return sourceFile;
@@ -83199,7 +85818,7 @@ var ts;
             sourceFile.text = prologueInfo.text;
             sourceFile.end = prologueInfo.text.length;
             sourceFile.statements = ts.createNodeArray(prologueInfo.directives.map(function (directive) {
-                var statement = ts.createNode(221 /* ExpressionStatement */, directive.pos, directive.end);
+                var statement = ts.createNode(222 /* ExpressionStatement */, directive.pos, directive.end);
                 statement.expression = ts.createNode(10 /* StringLiteral */, directive.expression.pos, directive.expression.end);
                 statement.expression.text = directive.expression.text;
                 return statement;
@@ -83208,7 +85827,7 @@ var ts;
         return sourceFiles;
     }
     /*@internal*/
-    function emitUsingBuildInfo(config, host, getCommandLine) {
+    function emitUsingBuildInfo(config, host, getCommandLine, customTransformers) {
         var _a = getOutputPathsForBundle(config.options, /*forceDtsPaths*/ false), buildInfoPath = _a.buildInfoPath, jsFilePath = _a.jsFilePath, sourceMapFilePath = _a.sourceMapFilePath, declarationFilePath = _a.declarationFilePath, declarationMapPath = _a.declarationMapPath;
         var buildInfoText = host.readFile(ts.Debug.assertDefined(buildInfoPath));
         if (!buildInfoText)
@@ -83231,23 +85850,25 @@ var ts;
         var buildInfo = getBuildInfo(buildInfoText);
         if (!buildInfo.bundle || !buildInfo.bundle.js || (declarationText && !buildInfo.bundle.dts))
             return buildInfoPath;
+        var buildInfoDirectory = ts.getDirectoryPath(ts.getNormalizedAbsolutePath(buildInfoPath, host.getCurrentDirectory()));
         var ownPrependInput = ts.createInputFiles(jsFileText, declarationText, sourceMapFilePath, sourceMapText, declarationMapPath, declarationMapText, jsFilePath, declarationFilePath, buildInfoPath, buildInfo, 
         /*onlyOwnText*/ true);
         var outputFiles = [];
         var prependNodes = ts.createPrependNodes(config.projectReferences, getCommandLine, function (f) { return host.readFile(f); });
-        var sourceFilesForJsEmit = createSourceFilesFromBundleBuildInfo(buildInfo.bundle);
+        var sourceFilesForJsEmit = createSourceFilesFromBundleBuildInfo(buildInfo.bundle, buildInfoDirectory, host);
         var emitHost = {
             getPrependNodes: ts.memoize(function () { return prependNodes.concat([ownPrependInput]); }),
             getCanonicalFileName: host.getCanonicalFileName,
-            getCommonSourceDirectory: function () { return buildInfo.bundle.commonSourceDirectory; },
+            getCommonSourceDirectory: function () { return ts.getNormalizedAbsolutePath(buildInfo.bundle.commonSourceDirectory, buildInfoDirectory); },
             getCompilerOptions: function () { return config.options; },
             getCurrentDirectory: function () { return host.getCurrentDirectory(); },
             getNewLine: function () { return host.getNewLine(); },
-            getSourceFile: function () { return undefined; },
-            getSourceFileByPath: function () { return undefined; },
+            getSourceFile: ts.returnUndefined,
+            getSourceFileByPath: ts.returnUndefined,
             getSourceFiles: function () { return sourceFilesForJsEmit; },
             getLibFileFromReference: ts.notImplemented,
             isSourceFileFromExternalLibrary: ts.returnFalse,
+            getResolvedProjectReferenceToRedirect: ts.returnUndefined,
             writeFile: function (name, text, writeByteOrderMark) {
                 switch (name) {
                     case jsFilePath:
@@ -83288,9 +85909,11 @@ var ts;
             fileExists: function (f) { return host.fileExists(f); },
             directoryExists: host.directoryExists && (function (f) { return host.directoryExists(f); }),
             useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); },
-            getProgramBuildInfo: function () { return undefined; }
+            getProgramBuildInfo: ts.returnUndefined,
+            getSourceFileFromReference: ts.returnUndefined,
         };
-        emitFiles(ts.notImplementedResolver, emitHost, /*targetSourceFile*/ undefined, /*emitOnlyDtsFiles*/ false, ts.getTransformers(config.options));
+        emitFiles(ts.notImplementedResolver, emitHost, 
+        /*targetSourceFile*/ undefined, ts.getTransformers(config.options, customTransformers));
         return outputFiles;
     }
     ts.emitUsingBuildInfo = emitUsingBuildInfo;
@@ -83323,6 +85946,7 @@ var ts;
         var write = writeBase;
         var isOwnFileEmit;
         var bundleFileInfo = printerOptions.writeBundleFileInfo ? { sections: [] } : undefined;
+        var relativeToBuildInfo = bundleFileInfo ? ts.Debug.assertDefined(printerOptions.relativeToBuildInfo) : undefined;
         var recordInternalSection = printerOptions.recordInternalSection;
         var sourceFileTextPos = 0;
         var sourceFileTextKind = "text" /* Text */;
@@ -83367,9 +85991,9 @@ var ts;
                     break;
             }
             switch (node.kind) {
-                case 284 /* SourceFile */: return printFile(node);
-                case 285 /* Bundle */: return printBundle(node);
-                case 286 /* UnparsedSource */: return printUnparsedSource(node);
+                case 285 /* SourceFile */: return printFile(node);
+                case 286 /* Bundle */: return printBundle(node);
+                case 287 /* UnparsedSource */: return printUnparsedSource(node);
             }
             writeNode(hint, node, sourceFile, beginPrint());
             return endPrint();
@@ -83472,7 +86096,13 @@ var ts;
                         (_a = bundleFileInfo.sections).push.apply(_a, newSections);
                     else {
                         newSections.forEach(function (section) { return ts.Debug.assert(ts.isBundleFileTextLike(section)); });
-                        bundleFileInfo.sections.push({ pos: pos, end: writer.getTextPos(), kind: "prepend" /* Prepend */, data: prepend.fileName, texts: newSections });
+                        bundleFileInfo.sections.push({
+                            pos: pos,
+                            end: writer.getTextPos(),
+                            kind: "prepend" /* Prepend */,
+                            data: relativeToBuildInfo(prepend.fileName),
+                            texts: newSections
+                        });
                     }
                 }
             }
@@ -83599,12 +86229,12 @@ var ts;
                     }
                 // falls through
                 case 2 /* Comments */:
-                    if (!commentsDisabled && node.kind !== 284 /* SourceFile */) {
+                    if (!commentsDisabled && node.kind !== 285 /* SourceFile */) {
                         return pipelineEmitWithComments;
                     }
                 // falls through
                 case 3 /* SourceMaps */:
-                    if (!sourceMapsDisabled && node.kind !== 284 /* SourceFile */ && !ts.isInJsonFile(node)) {
+                    if (!sourceMapsDisabled && node.kind !== 285 /* SourceFile */ && !ts.isInJsonFile(node)) {
                         return pipelineEmitWithSourceMap;
                     }
                 // falls through
@@ -83641,272 +86271,272 @@ var ts;
                     case 16 /* TemplateMiddle */:
                     case 17 /* TemplateTail */:
                         return emitLiteral(node);
-                    case 286 /* UnparsedSource */:
-                    case 280 /* UnparsedPrepend */:
+                    case 287 /* UnparsedSource */:
+                    case 281 /* UnparsedPrepend */:
                         return emitUnparsedSourceOrPrepend(node);
-                    case 279 /* UnparsedPrologue */:
+                    case 280 /* UnparsedPrologue */:
                         return writeUnparsedNode(node);
-                    case 281 /* UnparsedText */:
-                    case 282 /* UnparsedInternalText */:
+                    case 282 /* UnparsedText */:
+                    case 283 /* UnparsedInternalText */:
                         return emitUnparsedTextLike(node);
-                    case 283 /* UnparsedSyntheticReference */:
+                    case 284 /* UnparsedSyntheticReference */:
                         return emitUnparsedSyntheticReference(node);
                     // Identifiers
-                    case 72 /* Identifier */:
+                    case 73 /* Identifier */:
                         return emitIdentifier(node);
                     // Parse tree nodes
                     // Names
-                    case 148 /* QualifiedName */:
+                    case 149 /* QualifiedName */:
                         return emitQualifiedName(node);
-                    case 149 /* ComputedPropertyName */:
+                    case 150 /* ComputedPropertyName */:
                         return emitComputedPropertyName(node);
                     // Signature elements
-                    case 150 /* TypeParameter */:
+                    case 151 /* TypeParameter */:
                         return emitTypeParameter(node);
-                    case 151 /* Parameter */:
+                    case 152 /* Parameter */:
                         return emitParameter(node);
-                    case 152 /* Decorator */:
+                    case 153 /* Decorator */:
                         return emitDecorator(node);
                     // Type members
-                    case 153 /* PropertySignature */:
+                    case 154 /* PropertySignature */:
                         return emitPropertySignature(node);
-                    case 154 /* PropertyDeclaration */:
+                    case 155 /* PropertyDeclaration */:
                         return emitPropertyDeclaration(node);
-                    case 155 /* MethodSignature */:
+                    case 156 /* MethodSignature */:
                         return emitMethodSignature(node);
-                    case 156 /* MethodDeclaration */:
+                    case 157 /* MethodDeclaration */:
                         return emitMethodDeclaration(node);
-                    case 157 /* Constructor */:
+                    case 158 /* Constructor */:
                         return emitConstructor(node);
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
                         return emitAccessorDeclaration(node);
-                    case 160 /* CallSignature */:
+                    case 161 /* CallSignature */:
                         return emitCallSignature(node);
-                    case 161 /* ConstructSignature */:
+                    case 162 /* ConstructSignature */:
                         return emitConstructSignature(node);
-                    case 162 /* IndexSignature */:
+                    case 163 /* IndexSignature */:
                         return emitIndexSignature(node);
                     // Types
-                    case 163 /* TypePredicate */:
+                    case 164 /* TypePredicate */:
                         return emitTypePredicate(node);
-                    case 164 /* TypeReference */:
+                    case 165 /* TypeReference */:
                         return emitTypeReference(node);
-                    case 165 /* FunctionType */:
+                    case 166 /* FunctionType */:
                         return emitFunctionType(node);
-                    case 294 /* JSDocFunctionType */:
+                    case 295 /* JSDocFunctionType */:
                         return emitJSDocFunctionType(node);
-                    case 166 /* ConstructorType */:
+                    case 167 /* ConstructorType */:
                         return emitConstructorType(node);
-                    case 167 /* TypeQuery */:
+                    case 168 /* TypeQuery */:
                         return emitTypeQuery(node);
-                    case 168 /* TypeLiteral */:
+                    case 169 /* TypeLiteral */:
                         return emitTypeLiteral(node);
-                    case 169 /* ArrayType */:
+                    case 170 /* ArrayType */:
                         return emitArrayType(node);
-                    case 170 /* TupleType */:
+                    case 171 /* TupleType */:
                         return emitTupleType(node);
-                    case 171 /* OptionalType */:
+                    case 172 /* OptionalType */:
                         return emitOptionalType(node);
-                    case 173 /* UnionType */:
+                    case 174 /* UnionType */:
                         return emitUnionType(node);
-                    case 174 /* IntersectionType */:
+                    case 175 /* IntersectionType */:
                         return emitIntersectionType(node);
-                    case 175 /* ConditionalType */:
+                    case 176 /* ConditionalType */:
                         return emitConditionalType(node);
-                    case 176 /* InferType */:
+                    case 177 /* InferType */:
                         return emitInferType(node);
-                    case 177 /* ParenthesizedType */:
+                    case 178 /* ParenthesizedType */:
                         return emitParenthesizedType(node);
-                    case 211 /* ExpressionWithTypeArguments */:
+                    case 212 /* ExpressionWithTypeArguments */:
                         return emitExpressionWithTypeArguments(node);
-                    case 178 /* ThisType */:
+                    case 179 /* ThisType */:
                         return emitThisType();
-                    case 179 /* TypeOperator */:
+                    case 180 /* TypeOperator */:
                         return emitTypeOperator(node);
-                    case 180 /* IndexedAccessType */:
+                    case 181 /* IndexedAccessType */:
                         return emitIndexedAccessType(node);
-                    case 181 /* MappedType */:
+                    case 182 /* MappedType */:
                         return emitMappedType(node);
-                    case 182 /* LiteralType */:
+                    case 183 /* LiteralType */:
                         return emitLiteralType(node);
-                    case 183 /* ImportType */:
+                    case 184 /* ImportType */:
                         return emitImportTypeNode(node);
-                    case 289 /* JSDocAllType */:
+                    case 290 /* JSDocAllType */:
                         writePunctuation("*");
                         return;
-                    case 290 /* JSDocUnknownType */:
+                    case 291 /* JSDocUnknownType */:
                         writePunctuation("?");
                         return;
-                    case 291 /* JSDocNullableType */:
+                    case 292 /* JSDocNullableType */:
                         return emitJSDocNullableType(node);
-                    case 292 /* JSDocNonNullableType */:
+                    case 293 /* JSDocNonNullableType */:
                         return emitJSDocNonNullableType(node);
-                    case 293 /* JSDocOptionalType */:
+                    case 294 /* JSDocOptionalType */:
                         return emitJSDocOptionalType(node);
-                    case 172 /* RestType */:
-                    case 295 /* JSDocVariadicType */:
+                    case 173 /* RestType */:
+                    case 296 /* JSDocVariadicType */:
                         return emitRestOrJSDocVariadicType(node);
                     // Binding patterns
-                    case 184 /* ObjectBindingPattern */:
+                    case 185 /* ObjectBindingPattern */:
                         return emitObjectBindingPattern(node);
-                    case 185 /* ArrayBindingPattern */:
+                    case 186 /* ArrayBindingPattern */:
                         return emitArrayBindingPattern(node);
-                    case 186 /* BindingElement */:
+                    case 187 /* BindingElement */:
                         return emitBindingElement(node);
                     // Misc
-                    case 216 /* TemplateSpan */:
+                    case 217 /* TemplateSpan */:
                         return emitTemplateSpan(node);
-                    case 217 /* SemicolonClassElement */:
+                    case 218 /* SemicolonClassElement */:
                         return emitSemicolonClassElement();
                     // Statements
-                    case 218 /* Block */:
+                    case 219 /* Block */:
                         return emitBlock(node);
-                    case 219 /* VariableStatement */:
+                    case 220 /* VariableStatement */:
                         return emitVariableStatement(node);
-                    case 220 /* EmptyStatement */:
+                    case 221 /* EmptyStatement */:
                         return emitEmptyStatement(/*isEmbeddedStatement*/ false);
-                    case 221 /* ExpressionStatement */:
+                    case 222 /* ExpressionStatement */:
                         return emitExpressionStatement(node);
-                    case 222 /* IfStatement */:
+                    case 223 /* IfStatement */:
                         return emitIfStatement(node);
-                    case 223 /* DoStatement */:
+                    case 224 /* DoStatement */:
                         return emitDoStatement(node);
-                    case 224 /* WhileStatement */:
+                    case 225 /* WhileStatement */:
                         return emitWhileStatement(node);
-                    case 225 /* ForStatement */:
+                    case 226 /* ForStatement */:
                         return emitForStatement(node);
-                    case 226 /* ForInStatement */:
+                    case 227 /* ForInStatement */:
                         return emitForInStatement(node);
-                    case 227 /* ForOfStatement */:
+                    case 228 /* ForOfStatement */:
                         return emitForOfStatement(node);
-                    case 228 /* ContinueStatement */:
+                    case 229 /* ContinueStatement */:
                         return emitContinueStatement(node);
-                    case 229 /* BreakStatement */:
+                    case 230 /* BreakStatement */:
                         return emitBreakStatement(node);
-                    case 230 /* ReturnStatement */:
+                    case 231 /* ReturnStatement */:
                         return emitReturnStatement(node);
-                    case 231 /* WithStatement */:
+                    case 232 /* WithStatement */:
                         return emitWithStatement(node);
-                    case 232 /* SwitchStatement */:
+                    case 233 /* SwitchStatement */:
                         return emitSwitchStatement(node);
-                    case 233 /* LabeledStatement */:
+                    case 234 /* LabeledStatement */:
                         return emitLabeledStatement(node);
-                    case 234 /* ThrowStatement */:
+                    case 235 /* ThrowStatement */:
                         return emitThrowStatement(node);
-                    case 235 /* TryStatement */:
+                    case 236 /* TryStatement */:
                         return emitTryStatement(node);
-                    case 236 /* DebuggerStatement */:
+                    case 237 /* DebuggerStatement */:
                         return emitDebuggerStatement(node);
                     // Declarations
-                    case 237 /* VariableDeclaration */:
+                    case 238 /* VariableDeclaration */:
                         return emitVariableDeclaration(node);
-                    case 238 /* VariableDeclarationList */:
+                    case 239 /* VariableDeclarationList */:
                         return emitVariableDeclarationList(node);
-                    case 239 /* FunctionDeclaration */:
+                    case 240 /* FunctionDeclaration */:
                         return emitFunctionDeclaration(node);
-                    case 240 /* ClassDeclaration */:
+                    case 241 /* ClassDeclaration */:
                         return emitClassDeclaration(node);
-                    case 241 /* InterfaceDeclaration */:
+                    case 242 /* InterfaceDeclaration */:
                         return emitInterfaceDeclaration(node);
-                    case 242 /* TypeAliasDeclaration */:
+                    case 243 /* TypeAliasDeclaration */:
                         return emitTypeAliasDeclaration(node);
-                    case 243 /* EnumDeclaration */:
+                    case 244 /* EnumDeclaration */:
                         return emitEnumDeclaration(node);
-                    case 244 /* ModuleDeclaration */:
+                    case 245 /* ModuleDeclaration */:
                         return emitModuleDeclaration(node);
-                    case 245 /* ModuleBlock */:
+                    case 246 /* ModuleBlock */:
                         return emitModuleBlock(node);
-                    case 246 /* CaseBlock */:
+                    case 247 /* CaseBlock */:
                         return emitCaseBlock(node);
-                    case 247 /* NamespaceExportDeclaration */:
+                    case 248 /* NamespaceExportDeclaration */:
                         return emitNamespaceExportDeclaration(node);
-                    case 248 /* ImportEqualsDeclaration */:
+                    case 249 /* ImportEqualsDeclaration */:
                         return emitImportEqualsDeclaration(node);
-                    case 249 /* ImportDeclaration */:
+                    case 250 /* ImportDeclaration */:
                         return emitImportDeclaration(node);
-                    case 250 /* ImportClause */:
+                    case 251 /* ImportClause */:
                         return emitImportClause(node);
-                    case 251 /* NamespaceImport */:
+                    case 252 /* NamespaceImport */:
                         return emitNamespaceImport(node);
-                    case 252 /* NamedImports */:
+                    case 253 /* NamedImports */:
                         return emitNamedImports(node);
-                    case 253 /* ImportSpecifier */:
+                    case 254 /* ImportSpecifier */:
                         return emitImportSpecifier(node);
-                    case 254 /* ExportAssignment */:
+                    case 255 /* ExportAssignment */:
                         return emitExportAssignment(node);
-                    case 255 /* ExportDeclaration */:
+                    case 256 /* ExportDeclaration */:
                         return emitExportDeclaration(node);
-                    case 256 /* NamedExports */:
+                    case 257 /* NamedExports */:
                         return emitNamedExports(node);
-                    case 257 /* ExportSpecifier */:
+                    case 258 /* ExportSpecifier */:
                         return emitExportSpecifier(node);
-                    case 258 /* MissingDeclaration */:
+                    case 259 /* MissingDeclaration */:
                         return;
                     // Module references
-                    case 259 /* ExternalModuleReference */:
+                    case 260 /* ExternalModuleReference */:
                         return emitExternalModuleReference(node);
                     // JSX (non-expression)
                     case 11 /* JsxText */:
                         return emitJsxText(node);
-                    case 262 /* JsxOpeningElement */:
-                    case 265 /* JsxOpeningFragment */:
+                    case 263 /* JsxOpeningElement */:
+                    case 266 /* JsxOpeningFragment */:
                         return emitJsxOpeningElementOrFragment(node);
-                    case 263 /* JsxClosingElement */:
-                    case 266 /* JsxClosingFragment */:
+                    case 264 /* JsxClosingElement */:
+                    case 267 /* JsxClosingFragment */:
                         return emitJsxClosingElementOrFragment(node);
-                    case 267 /* JsxAttribute */:
+                    case 268 /* JsxAttribute */:
                         return emitJsxAttribute(node);
-                    case 268 /* JsxAttributes */:
+                    case 269 /* JsxAttributes */:
                         return emitJsxAttributes(node);
-                    case 269 /* JsxSpreadAttribute */:
+                    case 270 /* JsxSpreadAttribute */:
                         return emitJsxSpreadAttribute(node);
-                    case 270 /* JsxExpression */:
+                    case 271 /* JsxExpression */:
                         return emitJsxExpression(node);
                     // Clauses
-                    case 271 /* CaseClause */:
+                    case 272 /* CaseClause */:
                         return emitCaseClause(node);
-                    case 272 /* DefaultClause */:
+                    case 273 /* DefaultClause */:
                         return emitDefaultClause(node);
-                    case 273 /* HeritageClause */:
+                    case 274 /* HeritageClause */:
                         return emitHeritageClause(node);
-                    case 274 /* CatchClause */:
+                    case 275 /* CatchClause */:
                         return emitCatchClause(node);
                     // Property assignments
-                    case 275 /* PropertyAssignment */:
+                    case 276 /* PropertyAssignment */:
                         return emitPropertyAssignment(node);
-                    case 276 /* ShorthandPropertyAssignment */:
+                    case 277 /* ShorthandPropertyAssignment */:
                         return emitShorthandPropertyAssignment(node);
-                    case 277 /* SpreadAssignment */:
+                    case 278 /* SpreadAssignment */:
                         return emitSpreadAssignment(node);
                     // Enum
-                    case 278 /* EnumMember */:
+                    case 279 /* EnumMember */:
                         return emitEnumMember(node);
                     // JSDoc nodes (only used in codefixes currently)
-                    case 304 /* JSDocParameterTag */:
-                    case 310 /* JSDocPropertyTag */:
+                    case 306 /* JSDocParameterTag */:
+                    case 312 /* JSDocPropertyTag */:
                         return emitJSDocPropertyLikeTag(node);
-                    case 305 /* JSDocReturnTag */:
-                    case 307 /* JSDocTypeTag */:
-                    case 306 /* JSDocThisTag */:
-                    case 303 /* JSDocEnumTag */:
+                    case 307 /* JSDocReturnTag */:
+                    case 309 /* JSDocTypeTag */:
+                    case 308 /* JSDocThisTag */:
+                    case 305 /* JSDocEnumTag */:
                         return emitJSDocSimpleTypedTag(node);
-                    case 300 /* JSDocAugmentsTag */:
+                    case 301 /* JSDocAugmentsTag */:
                         return emitJSDocAugmentsTag(node);
-                    case 308 /* JSDocTemplateTag */:
+                    case 310 /* JSDocTemplateTag */:
                         return emitJSDocTemplateTag(node);
-                    case 309 /* JSDocTypedefTag */:
+                    case 311 /* JSDocTypedefTag */:
                         return emitJSDocTypedefTag(node);
-                    case 302 /* JSDocCallbackTag */:
+                    case 304 /* JSDocCallbackTag */:
                         return emitJSDocCallbackTag(node);
-                    case 298 /* JSDocSignature */:
+                    case 299 /* JSDocSignature */:
                         return emitJSDocSignature(node);
-                    case 297 /* JSDocTypeLiteral */:
+                    case 298 /* JSDocTypeLiteral */:
                         return emitJSDocTypeLiteral(node);
-                    case 301 /* JSDocClassTag */:
-                    case 299 /* JSDocTag */:
+                    case 303 /* JSDocClassTag */:
+                    case 300 /* JSDocTag */:
                         return emitJSDocSimpleTag(node);
-                    case 296 /* JSDocComment */:
+                    case 297 /* JSDocComment */:
                         return emitJSDoc(node);
                     // Transformation nodes (ignored)
                 }
@@ -83931,83 +86561,83 @@ var ts;
                     case 14 /* NoSubstitutionTemplateLiteral */:
                         return emitLiteral(node);
                     // Identifiers
-                    case 72 /* Identifier */:
+                    case 73 /* Identifier */:
                         return emitIdentifier(node);
                     // Reserved words
-                    case 87 /* FalseKeyword */:
-                    case 96 /* NullKeyword */:
-                    case 98 /* SuperKeyword */:
-                    case 102 /* TrueKeyword */:
-                    case 100 /* ThisKeyword */:
-                    case 92 /* ImportKeyword */:
+                    case 88 /* FalseKeyword */:
+                    case 97 /* NullKeyword */:
+                    case 99 /* SuperKeyword */:
+                    case 103 /* TrueKeyword */:
+                    case 101 /* ThisKeyword */:
+                    case 93 /* ImportKeyword */:
                         writeTokenNode(node, writeKeyword);
                         return;
                     // Expressions
-                    case 187 /* ArrayLiteralExpression */:
+                    case 188 /* ArrayLiteralExpression */:
                         return emitArrayLiteralExpression(node);
-                    case 188 /* ObjectLiteralExpression */:
+                    case 189 /* ObjectLiteralExpression */:
                         return emitObjectLiteralExpression(node);
-                    case 189 /* PropertyAccessExpression */:
+                    case 190 /* PropertyAccessExpression */:
                         return emitPropertyAccessExpression(node);
-                    case 190 /* ElementAccessExpression */:
+                    case 191 /* ElementAccessExpression */:
                         return emitElementAccessExpression(node);
-                    case 191 /* CallExpression */:
+                    case 192 /* CallExpression */:
                         return emitCallExpression(node);
-                    case 192 /* NewExpression */:
+                    case 193 /* NewExpression */:
                         return emitNewExpression(node);
-                    case 193 /* TaggedTemplateExpression */:
+                    case 194 /* TaggedTemplateExpression */:
                         return emitTaggedTemplateExpression(node);
-                    case 194 /* TypeAssertionExpression */:
+                    case 195 /* TypeAssertionExpression */:
                         return emitTypeAssertionExpression(node);
-                    case 195 /* ParenthesizedExpression */:
+                    case 196 /* ParenthesizedExpression */:
                         return emitParenthesizedExpression(node);
-                    case 196 /* FunctionExpression */:
+                    case 197 /* FunctionExpression */:
                         return emitFunctionExpression(node);
-                    case 197 /* ArrowFunction */:
+                    case 198 /* ArrowFunction */:
                         return emitArrowFunction(node);
-                    case 198 /* DeleteExpression */:
+                    case 199 /* DeleteExpression */:
                         return emitDeleteExpression(node);
-                    case 199 /* TypeOfExpression */:
+                    case 200 /* TypeOfExpression */:
                         return emitTypeOfExpression(node);
-                    case 200 /* VoidExpression */:
+                    case 201 /* VoidExpression */:
                         return emitVoidExpression(node);
-                    case 201 /* AwaitExpression */:
+                    case 202 /* AwaitExpression */:
                         return emitAwaitExpression(node);
-                    case 202 /* PrefixUnaryExpression */:
+                    case 203 /* PrefixUnaryExpression */:
                         return emitPrefixUnaryExpression(node);
-                    case 203 /* PostfixUnaryExpression */:
+                    case 204 /* PostfixUnaryExpression */:
                         return emitPostfixUnaryExpression(node);
-                    case 204 /* BinaryExpression */:
+                    case 205 /* BinaryExpression */:
                         return emitBinaryExpression(node);
-                    case 205 /* ConditionalExpression */:
+                    case 206 /* ConditionalExpression */:
                         return emitConditionalExpression(node);
-                    case 206 /* TemplateExpression */:
+                    case 207 /* TemplateExpression */:
                         return emitTemplateExpression(node);
-                    case 207 /* YieldExpression */:
+                    case 208 /* YieldExpression */:
                         return emitYieldExpression(node);
-                    case 208 /* SpreadElement */:
+                    case 209 /* SpreadElement */:
                         return emitSpreadExpression(node);
-                    case 209 /* ClassExpression */:
+                    case 210 /* ClassExpression */:
                         return emitClassExpression(node);
-                    case 210 /* OmittedExpression */:
+                    case 211 /* OmittedExpression */:
                         return;
-                    case 212 /* AsExpression */:
+                    case 213 /* AsExpression */:
                         return emitAsExpression(node);
-                    case 213 /* NonNullExpression */:
+                    case 214 /* NonNullExpression */:
                         return emitNonNullExpression(node);
-                    case 214 /* MetaProperty */:
+                    case 215 /* MetaProperty */:
                         return emitMetaProperty(node);
                     // JSX
-                    case 260 /* JsxElement */:
+                    case 261 /* JsxElement */:
                         return emitJsxElement(node);
-                    case 261 /* JsxSelfClosingElement */:
+                    case 262 /* JsxSelfClosingElement */:
                         return emitJsxSelfClosingElement(node);
-                    case 264 /* JsxFragment */:
+                    case 265 /* JsxFragment */:
                         return emitJsxFragment(node);
                     // Transformation nodes
-                    case 313 /* PartiallyEmittedExpression */:
+                    case 315 /* PartiallyEmittedExpression */:
                         return emitPartiallyEmittedExpression(node);
-                    case 314 /* CommaListExpression */:
+                    case 316 /* CommaListExpression */:
                         return emitCommaList(node);
                 }
             }
@@ -84047,7 +86677,7 @@ var ts;
         }
         function emitHelpers(node) {
             var helpersEmitted = false;
-            var bundle = node.kind === 285 /* Bundle */ ? node : undefined;
+            var bundle = node.kind === 286 /* Bundle */ ? node : undefined;
             if (bundle && moduleKind === ts.ModuleKind.None) {
                 return;
             }
@@ -84147,7 +86777,7 @@ var ts;
             var pos = getTextPosWithWriteLine();
             writeUnparsedNode(unparsed);
             if (bundleFileInfo) {
-                updateOrPushBundleFileTextLike(pos, writer.getTextPos(), unparsed.kind === 281 /* UnparsedText */ ?
+                updateOrPushBundleFileTextLike(pos, writer.getTextPos(), unparsed.kind === 282 /* UnparsedText */ ?
                     "text" /* Text */ :
                     "internal" /* Internal */);
             }
@@ -84180,7 +86810,7 @@ var ts;
             emit(node.right);
         }
         function emitEntityName(node) {
-            if (node.kind === 72 /* Identifier */) {
+            if (node.kind === 73 /* Identifier */) {
                 emitExpression(node);
             }
             else {
@@ -84216,7 +86846,7 @@ var ts;
             emit(node.dotDotDotToken);
             emitNodeWithWriter(node.name, writeParameter);
             emit(node.questionToken);
-            if (node.parent && node.parent.kind === 294 /* JSDocFunctionType */ && !node.name) {
+            if (node.parent && node.parent.kind === 295 /* JSDocFunctionType */ && !node.name) {
                 emit(node.type);
             }
             else {
@@ -84278,7 +86908,7 @@ var ts;
         function emitAccessorDeclaration(node) {
             emitDecorators(node, node.decorators);
             emitModifiers(node, node.modifiers);
-            writeKeyword(node.kind === 158 /* GetAccessor */ ? "get" : "set");
+            writeKeyword(node.kind === 159 /* GetAccessor */ ? "get" : "set");
             writeSpace();
             emit(node.name);
             emitSignatureAndBody(node, emitSignatureHead);
@@ -84455,7 +87085,7 @@ var ts;
             }
             if (node.readonlyToken) {
                 emit(node.readonlyToken);
-                if (node.readonlyToken.kind !== 133 /* ReadonlyKeyword */) {
+                if (node.readonlyToken.kind !== 134 /* ReadonlyKeyword */) {
                     writeKeyword("readonly");
                 }
                 writeSpace();
@@ -84605,7 +87235,7 @@ var ts;
             emitExpressionList(node, node.arguments, 2576 /* CallExpressionArguments */);
         }
         function emitNewExpression(node) {
-            emitTokenWithComment(95 /* NewKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(96 /* NewKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emitExpression(node.expression);
             emitTypeArguments(node, node.typeArguments);
@@ -84645,22 +87275,22 @@ var ts;
             emit(node.equalsGreaterThanToken);
         }
         function emitDeleteExpression(node) {
-            emitTokenWithComment(81 /* DeleteKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(82 /* DeleteKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emitExpression(node.expression);
         }
         function emitTypeOfExpression(node) {
-            emitTokenWithComment(104 /* TypeOfKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(105 /* TypeOfKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emitExpression(node.expression);
         }
         function emitVoidExpression(node) {
-            emitTokenWithComment(106 /* VoidKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(107 /* VoidKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emitExpression(node.expression);
         }
         function emitAwaitExpression(node) {
-            emitTokenWithComment(122 /* AwaitKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(123 /* AwaitKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emitExpression(node.expression);
         }
@@ -84685,7 +87315,7 @@ var ts;
             // expression a prefix increment whose operand is a plus expression - (++(+x))
             // The same is true of minus of course.
             var operand = node.operand;
-            return operand.kind === 202 /* PrefixUnaryExpression */
+            return operand.kind === 203 /* PrefixUnaryExpression */
                 && ((node.operator === 38 /* PlusToken */ && (operand.operator === 38 /* PlusToken */ || operand.operator === 44 /* PlusPlusToken */))
                     || (node.operator === 39 /* MinusToken */ && (operand.operator === 39 /* MinusToken */ || operand.operator === 45 /* MinusMinusToken */)));
         }
@@ -84700,7 +87330,7 @@ var ts;
             emitExpression(node.left);
             increaseIndentIf(indentBeforeOperator, isCommaOperator);
             emitLeadingCommentsOfPosition(node.operatorToken.pos);
-            writeTokenNode(node.operatorToken, node.operatorToken.kind === 93 /* InKeyword */ ? writeKeyword : writeOperator);
+            writeTokenNode(node.operatorToken, node.operatorToken.kind === 94 /* InKeyword */ ? writeKeyword : writeOperator);
             emitTrailingCommentsOfPosition(node.operatorToken.end, /*prefixSpace*/ true); // Binary operators should have a space before the comment starts
             increaseIndentIf(indentAfterOperator, /*writeSpaceIfNotIndenting*/ true);
             emitExpression(node.right);
@@ -84728,7 +87358,7 @@ var ts;
             emitList(node, node.templateSpans, 262144 /* TemplateExpressionSpans */);
         }
         function emitYieldExpression(node) {
-            emitTokenWithComment(117 /* YieldKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(118 /* YieldKeyword */, node.pos, writeKeyword, node);
             emit(node.asteriskToken);
             emitExpressionWithLeadingSpace(node.expression);
         }
@@ -84805,7 +87435,7 @@ var ts;
             }
         }
         function emitIfStatement(node) {
-            var openParenPos = emitTokenWithComment(91 /* IfKeyword */, node.pos, writeKeyword, node);
+            var openParenPos = emitTokenWithComment(92 /* IfKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emitTokenWithComment(20 /* OpenParenToken */, openParenPos, writePunctuation, node);
             emitExpression(node.expression);
@@ -84813,8 +87443,8 @@ var ts;
             emitEmbeddedStatement(node, node.thenStatement);
             if (node.elseStatement) {
                 writeLineOrSpace(node);
-                emitTokenWithComment(83 /* ElseKeyword */, node.thenStatement.end, writeKeyword, node);
-                if (node.elseStatement.kind === 222 /* IfStatement */) {
+                emitTokenWithComment(84 /* ElseKeyword */, node.thenStatement.end, writeKeyword, node);
+                if (node.elseStatement.kind === 223 /* IfStatement */) {
                     writeSpace();
                     emit(node.elseStatement);
                 }
@@ -84824,14 +87454,14 @@ var ts;
             }
         }
         function emitWhileClause(node, startPos) {
-            var openParenPos = emitTokenWithComment(107 /* WhileKeyword */, startPos, writeKeyword, node);
+            var openParenPos = emitTokenWithComment(108 /* WhileKeyword */, startPos, writeKeyword, node);
             writeSpace();
             emitTokenWithComment(20 /* OpenParenToken */, openParenPos, writePunctuation, node);
             emitExpression(node.expression);
             emitTokenWithComment(21 /* CloseParenToken */, node.expression.end, writePunctuation, node);
         }
         function emitDoStatement(node) {
-            emitTokenWithComment(82 /* DoKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(83 /* DoKeyword */, node.pos, writeKeyword, node);
             emitEmbeddedStatement(node, node.statement);
             if (ts.isBlock(node.statement)) {
                 writeSpace();
@@ -84847,7 +87477,7 @@ var ts;
             emitEmbeddedStatement(node, node.statement);
         }
         function emitForStatement(node) {
-            var openParenPos = emitTokenWithComment(89 /* ForKeyword */, node.pos, writeKeyword, node);
+            var openParenPos = emitTokenWithComment(90 /* ForKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             var pos = emitTokenWithComment(20 /* OpenParenToken */, openParenPos, writePunctuation, /*contextNode*/ node);
             emitForBinding(node.initializer);
@@ -84859,25 +87489,25 @@ var ts;
             emitEmbeddedStatement(node, node.statement);
         }
         function emitForInStatement(node) {
-            var openParenPos = emitTokenWithComment(89 /* ForKeyword */, node.pos, writeKeyword, node);
+            var openParenPos = emitTokenWithComment(90 /* ForKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emitTokenWithComment(20 /* OpenParenToken */, openParenPos, writePunctuation, node);
             emitForBinding(node.initializer);
             writeSpace();
-            emitTokenWithComment(93 /* InKeyword */, node.initializer.end, writeKeyword, node);
+            emitTokenWithComment(94 /* InKeyword */, node.initializer.end, writeKeyword, node);
             writeSpace();
             emitExpression(node.expression);
             emitTokenWithComment(21 /* CloseParenToken */, node.expression.end, writePunctuation, node);
             emitEmbeddedStatement(node, node.statement);
         }
         function emitForOfStatement(node) {
-            var openParenPos = emitTokenWithComment(89 /* ForKeyword */, node.pos, writeKeyword, node);
+            var openParenPos = emitTokenWithComment(90 /* ForKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emitWithTrailingSpace(node.awaitModifier);
             emitTokenWithComment(20 /* OpenParenToken */, openParenPos, writePunctuation, node);
             emitForBinding(node.initializer);
             writeSpace();
-            emitTokenWithComment(147 /* OfKeyword */, node.initializer.end, writeKeyword, node);
+            emitTokenWithComment(148 /* OfKeyword */, node.initializer.end, writeKeyword, node);
             writeSpace();
             emitExpression(node.expression);
             emitTokenWithComment(21 /* CloseParenToken */, node.expression.end, writePunctuation, node);
@@ -84885,7 +87515,7 @@ var ts;
         }
         function emitForBinding(node) {
             if (node !== undefined) {
-                if (node.kind === 238 /* VariableDeclarationList */) {
+                if (node.kind === 239 /* VariableDeclarationList */) {
                     emit(node);
                 }
                 else {
@@ -84894,12 +87524,12 @@ var ts;
             }
         }
         function emitContinueStatement(node) {
-            emitTokenWithComment(78 /* ContinueKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(79 /* ContinueKeyword */, node.pos, writeKeyword, node);
             emitWithLeadingSpace(node.label);
             writeTrailingSemicolon();
         }
         function emitBreakStatement(node) {
-            emitTokenWithComment(73 /* BreakKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(74 /* BreakKeyword */, node.pos, writeKeyword, node);
             emitWithLeadingSpace(node.label);
             writeTrailingSemicolon();
         }
@@ -84927,12 +87557,12 @@ var ts;
             return pos;
         }
         function emitReturnStatement(node) {
-            emitTokenWithComment(97 /* ReturnKeyword */, node.pos, writeKeyword, /*contextNode*/ node);
+            emitTokenWithComment(98 /* ReturnKeyword */, node.pos, writeKeyword, /*contextNode*/ node);
             emitExpressionWithLeadingSpace(node.expression);
             writeTrailingSemicolon();
         }
         function emitWithStatement(node) {
-            var openParenPos = emitTokenWithComment(108 /* WithKeyword */, node.pos, writeKeyword, node);
+            var openParenPos = emitTokenWithComment(109 /* WithKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emitTokenWithComment(20 /* OpenParenToken */, openParenPos, writePunctuation, node);
             emitExpression(node.expression);
@@ -84940,7 +87570,7 @@ var ts;
             emitEmbeddedStatement(node, node.statement);
         }
         function emitSwitchStatement(node) {
-            var openParenPos = emitTokenWithComment(99 /* SwitchKeyword */, node.pos, writeKeyword, node);
+            var openParenPos = emitTokenWithComment(100 /* SwitchKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emitTokenWithComment(20 /* OpenParenToken */, openParenPos, writePunctuation, node);
             emitExpression(node.expression);
@@ -84955,12 +87585,12 @@ var ts;
             emit(node.statement);
         }
         function emitThrowStatement(node) {
-            emitTokenWithComment(101 /* ThrowKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(102 /* ThrowKeyword */, node.pos, writeKeyword, node);
             emitExpressionWithLeadingSpace(node.expression);
             writeTrailingSemicolon();
         }
         function emitTryStatement(node) {
-            emitTokenWithComment(103 /* TryKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(104 /* TryKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emit(node.tryBlock);
             if (node.catchClause) {
@@ -84969,13 +87599,13 @@ var ts;
             }
             if (node.finallyBlock) {
                 writeLineOrSpace(node);
-                emitTokenWithComment(88 /* FinallyKeyword */, (node.catchClause || node.tryBlock).end, writeKeyword, node);
+                emitTokenWithComment(89 /* FinallyKeyword */, (node.catchClause || node.tryBlock).end, writeKeyword, node);
                 writeSpace();
                 emit(node.finallyBlock);
             }
         }
         function emitDebuggerStatement(node) {
-            writeToken(79 /* DebuggerKeyword */, node.pos, writeKeyword);
+            writeToken(80 /* DebuggerKeyword */, node.pos, writeKeyword);
             writeTrailingSemicolon();
         }
         //
@@ -85180,7 +87810,7 @@ var ts;
             var body = node.body;
             if (!body)
                 return writeTrailingSemicolon();
-            while (body.kind === 244 /* ModuleDeclaration */) {
+            while (body.kind === 245 /* ModuleDeclaration */) {
                 writePunctuation(".");
                 emit(body.name);
                 body = body.body;
@@ -85201,17 +87831,17 @@ var ts;
         }
         function emitImportEqualsDeclaration(node) {
             emitModifiers(node, node.modifiers);
-            emitTokenWithComment(92 /* ImportKeyword */, node.modifiers ? node.modifiers.end : node.pos, writeKeyword, node);
+            emitTokenWithComment(93 /* ImportKeyword */, node.modifiers ? node.modifiers.end : node.pos, writeKeyword, node);
             writeSpace();
             emit(node.name);
             writeSpace();
-            emitTokenWithComment(59 /* EqualsToken */, node.name.end, writePunctuation, node);
+            emitTokenWithComment(60 /* EqualsToken */, node.name.end, writePunctuation, node);
             writeSpace();
             emitModuleReference(node.moduleReference);
             writeTrailingSemicolon();
         }
         function emitModuleReference(node) {
-            if (node.kind === 72 /* Identifier */) {
+            if (node.kind === 73 /* Identifier */) {
                 emitExpression(node);
             }
             else {
@@ -85220,12 +87850,12 @@ var ts;
         }
         function emitImportDeclaration(node) {
             emitModifiers(node, node.modifiers);
-            emitTokenWithComment(92 /* ImportKeyword */, node.modifiers ? node.modifiers.end : node.pos, writeKeyword, node);
+            emitTokenWithComment(93 /* ImportKeyword */, node.modifiers ? node.modifiers.end : node.pos, writeKeyword, node);
             writeSpace();
             if (node.importClause) {
                 emit(node.importClause);
                 writeSpace();
-                emitTokenWithComment(144 /* FromKeyword */, node.importClause.end, writeKeyword, node);
+                emitTokenWithComment(145 /* FromKeyword */, node.importClause.end, writeKeyword, node);
                 writeSpace();
             }
             emitExpression(node.moduleSpecifier);
@@ -85242,7 +87872,7 @@ var ts;
         function emitNamespaceImport(node) {
             var asPos = emitTokenWithComment(40 /* AsteriskToken */, node.pos, writePunctuation, node);
             writeSpace();
-            emitTokenWithComment(119 /* AsKeyword */, asPos, writeKeyword, node);
+            emitTokenWithComment(120 /* AsKeyword */, asPos, writeKeyword, node);
             writeSpace();
             emit(node.name);
         }
@@ -85253,20 +87883,20 @@ var ts;
             emitImportOrExportSpecifier(node);
         }
         function emitExportAssignment(node) {
-            var nextPos = emitTokenWithComment(85 /* ExportKeyword */, node.pos, writeKeyword, node);
+            var nextPos = emitTokenWithComment(86 /* ExportKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             if (node.isExportEquals) {
-                emitTokenWithComment(59 /* EqualsToken */, nextPos, writeOperator, node);
+                emitTokenWithComment(60 /* EqualsToken */, nextPos, writeOperator, node);
             }
             else {
-                emitTokenWithComment(80 /* DefaultKeyword */, nextPos, writeKeyword, node);
+                emitTokenWithComment(81 /* DefaultKeyword */, nextPos, writeKeyword, node);
             }
             writeSpace();
             emitExpression(node.expression);
             writeTrailingSemicolon();
         }
         function emitExportDeclaration(node) {
-            var nextPos = emitTokenWithComment(85 /* ExportKeyword */, node.pos, writeKeyword, node);
+            var nextPos = emitTokenWithComment(86 /* ExportKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             if (node.exportClause) {
                 emit(node.exportClause);
@@ -85277,18 +87907,18 @@ var ts;
             if (node.moduleSpecifier) {
                 writeSpace();
                 var fromPos = node.exportClause ? node.exportClause.end : nextPos;
-                emitTokenWithComment(144 /* FromKeyword */, fromPos, writeKeyword, node);
+                emitTokenWithComment(145 /* FromKeyword */, fromPos, writeKeyword, node);
                 writeSpace();
                 emitExpression(node.moduleSpecifier);
             }
             writeTrailingSemicolon();
         }
         function emitNamespaceExportDeclaration(node) {
-            var nextPos = emitTokenWithComment(85 /* ExportKeyword */, node.pos, writeKeyword, node);
+            var nextPos = emitTokenWithComment(86 /* ExportKeyword */, node.pos, writeKeyword, node);
             writeSpace();
-            nextPos = emitTokenWithComment(119 /* AsKeyword */, nextPos, writeKeyword, node);
+            nextPos = emitTokenWithComment(120 /* AsKeyword */, nextPos, writeKeyword, node);
             writeSpace();
-            nextPos = emitTokenWithComment(131 /* NamespaceKeyword */, nextPos, writeKeyword, node);
+            nextPos = emitTokenWithComment(132 /* NamespaceKeyword */, nextPos, writeKeyword, node);
             writeSpace();
             emit(node.name);
             writeTrailingSemicolon();
@@ -85308,7 +87938,7 @@ var ts;
             if (node.propertyName) {
                 emit(node.propertyName);
                 writeSpace();
-                emitTokenWithComment(119 /* AsKeyword */, node.propertyName.end, writeKeyword, node);
+                emitTokenWithComment(120 /* AsKeyword */, node.propertyName.end, writeKeyword, node);
                 writeSpace();
             }
             emit(node.name);
@@ -85356,7 +87986,7 @@ var ts;
             writePunctuation(">");
         }
         function emitJsxText(node) {
-            writer.writeLiteral(getTextOfNode(node, /*includeTrivia*/ true));
+            writer.writeLiteral(node.text);
         }
         function emitJsxClosingElementOrFragment(node) {
             writePunctuation("</");
@@ -85386,7 +88016,7 @@ var ts;
             }
         }
         function emitJsxTagName(node) {
-            if (node.kind === 72 /* Identifier */) {
+            if (node.kind === 73 /* Identifier */) {
                 emitExpression(node);
             }
             else {
@@ -85397,13 +88027,13 @@ var ts;
         // Clauses
         //
         function emitCaseClause(node) {
-            emitTokenWithComment(74 /* CaseKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(75 /* CaseKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emitExpression(node.expression);
             emitCaseOrDefaultClauseRest(node, node.statements, node.expression.end);
         }
         function emitDefaultClause(node) {
-            var pos = emitTokenWithComment(80 /* DefaultKeyword */, node.pos, writeKeyword, node);
+            var pos = emitTokenWithComment(81 /* DefaultKeyword */, node.pos, writeKeyword, node);
             emitCaseOrDefaultClauseRest(node, node.statements, pos);
         }
         function emitCaseOrDefaultClauseRest(parentNode, statements, colonPos) {
@@ -85431,7 +88061,7 @@ var ts;
             emitList(node, node.types, 528 /* HeritageClauseTypes */);
         }
         function emitCatchClause(node) {
-            var openParenPos = emitTokenWithComment(75 /* CatchKeyword */, node.pos, writeKeyword, node);
+            var openParenPos = emitTokenWithComment(76 /* CatchKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             if (node.variableDeclaration) {
                 emitTokenWithComment(20 /* OpenParenToken */, openParenPos, writePunctuation, node);
@@ -85501,7 +88131,7 @@ var ts;
                 }
             }
             if (node.tags) {
-                if (node.tags.length === 1 && node.tags[0].kind === 307 /* JSDocTypeTag */ && !node.comment) {
+                if (node.tags.length === 1 && node.tags[0].kind === 309 /* JSDocTypeTag */ && !node.comment) {
                     writeSpace();
                     emit(node.tags[0]);
                 }
@@ -85535,7 +88165,7 @@ var ts;
         function emitJSDocTypedefTag(tag) {
             emitJSDocTagName(tag.tagName);
             if (tag.typeExpression) {
-                if (tag.typeExpression.kind === 288 /* JSDocTypeExpression */) {
+                if (tag.typeExpression.kind === 289 /* JSDocTypeExpression */) {
                     emitJSDocTypeExpression(tag.typeExpression);
                 }
                 else {
@@ -85554,7 +88184,7 @@ var ts;
                 emit(tag.fullName);
             }
             emitJSDocComment(tag.comment);
-            if (tag.typeExpression && tag.typeExpression.kind === 297 /* JSDocTypeLiteral */) {
+            if (tag.typeExpression && tag.typeExpression.kind === 298 /* JSDocTypeLiteral */) {
                 emitJSDocTypeLiteral(tag.typeExpression);
             }
         }
@@ -85869,7 +88499,7 @@ var ts;
         function emitInitializer(node, equalCommentStartPos, container) {
             if (node) {
                 writeSpace();
-                emitTokenWithComment(59 /* EqualsToken */, equalCommentStartPos, writeOperator, container);
+                emitTokenWithComment(60 /* EqualsToken */, equalCommentStartPos, writeOperator, container);
                 writeSpace();
                 emitExpression(node);
             }
@@ -86332,7 +88962,7 @@ var ts;
                 && ts.rangeEndIsOnSameLineAsRangeStart(block, block, currentSourceFile);
         }
         function skipSynthesizedParentheses(node) {
-            while (node.kind === 195 /* ParenthesizedExpression */ && ts.nodeIsSynthesized(node)) {
+            while (node.kind === 196 /* ParenthesizedExpression */ && ts.nodeIsSynthesized(node)) {
                 node = node.expression;
             }
             return node;
@@ -86397,81 +89027,81 @@ var ts;
             if (!node)
                 return;
             switch (node.kind) {
-                case 218 /* Block */:
+                case 219 /* Block */:
                     ts.forEach(node.statements, generateNames);
                     break;
-                case 233 /* LabeledStatement */:
-                case 231 /* WithStatement */:
-                case 223 /* DoStatement */:
-                case 224 /* WhileStatement */:
+                case 234 /* LabeledStatement */:
+                case 232 /* WithStatement */:
+                case 224 /* DoStatement */:
+                case 225 /* WhileStatement */:
                     generateNames(node.statement);
                     break;
-                case 222 /* IfStatement */:
+                case 223 /* IfStatement */:
                     generateNames(node.thenStatement);
                     generateNames(node.elseStatement);
                     break;
-                case 225 /* ForStatement */:
-                case 227 /* ForOfStatement */:
-                case 226 /* ForInStatement */:
+                case 226 /* ForStatement */:
+                case 228 /* ForOfStatement */:
+                case 227 /* ForInStatement */:
                     generateNames(node.initializer);
                     generateNames(node.statement);
                     break;
-                case 232 /* SwitchStatement */:
+                case 233 /* SwitchStatement */:
                     generateNames(node.caseBlock);
                     break;
-                case 246 /* CaseBlock */:
+                case 247 /* CaseBlock */:
                     ts.forEach(node.clauses, generateNames);
                     break;
-                case 271 /* CaseClause */:
-                case 272 /* DefaultClause */:
+                case 272 /* CaseClause */:
+                case 273 /* DefaultClause */:
                     ts.forEach(node.statements, generateNames);
                     break;
-                case 235 /* TryStatement */:
+                case 236 /* TryStatement */:
                     generateNames(node.tryBlock);
                     generateNames(node.catchClause);
                     generateNames(node.finallyBlock);
                     break;
-                case 274 /* CatchClause */:
+                case 275 /* CatchClause */:
                     generateNames(node.variableDeclaration);
                     generateNames(node.block);
                     break;
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     generateNames(node.declarationList);
                     break;
-                case 238 /* VariableDeclarationList */:
+                case 239 /* VariableDeclarationList */:
                     ts.forEach(node.declarations, generateNames);
                     break;
-                case 237 /* VariableDeclaration */:
-                case 151 /* Parameter */:
-                case 186 /* BindingElement */:
-                case 240 /* ClassDeclaration */:
+                case 238 /* VariableDeclaration */:
+                case 152 /* Parameter */:
+                case 187 /* BindingElement */:
+                case 241 /* ClassDeclaration */:
                     generateNameIfNeeded(node.name);
                     break;
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     generateNameIfNeeded(node.name);
                     if (ts.getEmitFlags(node) & 524288 /* ReuseTempVariableScope */) {
                         ts.forEach(node.parameters, generateNames);
                         generateNames(node.body);
                     }
                     break;
-                case 184 /* ObjectBindingPattern */:
-                case 185 /* ArrayBindingPattern */:
+                case 185 /* ObjectBindingPattern */:
+                case 186 /* ArrayBindingPattern */:
                     ts.forEach(node.elements, generateNames);
                     break;
-                case 249 /* ImportDeclaration */:
+                case 250 /* ImportDeclaration */:
                     generateNames(node.importClause);
                     break;
-                case 250 /* ImportClause */:
+                case 251 /* ImportClause */:
                     generateNameIfNeeded(node.name);
                     generateNames(node.namedBindings);
                     break;
-                case 251 /* NamespaceImport */:
+                case 252 /* NamespaceImport */:
                     generateNameIfNeeded(node.name);
                     break;
-                case 252 /* NamedImports */:
+                case 253 /* NamedImports */:
                     ts.forEach(node.elements, generateNames);
                     break;
-                case 253 /* ImportSpecifier */:
+                case 254 /* ImportSpecifier */:
                     generateNameIfNeeded(node.propertyName || node.name);
                     break;
             }
@@ -86480,12 +89110,12 @@ var ts;
             if (!node)
                 return;
             switch (node.kind) {
-                case 275 /* PropertyAssignment */:
-                case 276 /* ShorthandPropertyAssignment */:
-                case 154 /* PropertyDeclaration */:
-                case 156 /* MethodDeclaration */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 276 /* PropertyAssignment */:
+                case 277 /* ShorthandPropertyAssignment */:
+                case 155 /* PropertyDeclaration */:
+                case 157 /* MethodDeclaration */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     generateNameIfNeeded(node.name);
                     break;
             }
@@ -86665,24 +89295,26 @@ var ts;
          */
         function generateNameForNode(node, flags) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return makeUniqueName(getTextOfNode(node), isUniqueName, !!(flags & 16 /* Optimistic */), !!(flags & 8 /* ReservedInNestedScopes */));
-                case 244 /* ModuleDeclaration */:
-                case 243 /* EnumDeclaration */:
+                case 245 /* ModuleDeclaration */:
+                case 244 /* EnumDeclaration */:
                     return generateNameForModuleOrEnum(node);
-                case 249 /* ImportDeclaration */:
-                case 255 /* ExportDeclaration */:
+                case 250 /* ImportDeclaration */:
+                case 256 /* ExportDeclaration */:
                     return generateNameForImportOrExportDeclaration(node);
-                case 239 /* FunctionDeclaration */:
-                case 240 /* ClassDeclaration */:
-                case 254 /* ExportAssignment */:
+                case 240 /* FunctionDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 255 /* ExportAssignment */:
                     return generateNameForExportDefault();
-                case 209 /* ClassExpression */:
+                case 210 /* ClassExpression */:
                     return generateNameForClassExpression();
-                case 156 /* MethodDeclaration */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 157 /* MethodDeclaration */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     return generateNameForMethodOrAccessor(node);
+                case 150 /* ComputedPropertyName */:
+                    return makeTempVariableName(0 /* Auto */, /*reserveInNestedScopes*/ true);
                 default:
                     return makeTempVariableName(0 /* Auto */);
             }
@@ -86728,7 +89360,7 @@ var ts;
             hasWrittenComment = false;
             var emitFlags = ts.getEmitFlags(node);
             var _a = ts.getCommentRange(node), pos = _a.pos, end = _a.end;
-            var isEmittedNode = node.kind !== 312 /* NotEmittedStatement */;
+            var isEmittedNode = node.kind !== 314 /* NotEmittedStatement */;
             // We have to explicitly check that the node is JsxText because if the compilerOptions.jsx is "preserve" we will not do any transformation.
             // It is expensive to walk entire tree just to set one kind of node to have no comments.
             var skipLeadingComments = pos < 0 || (emitFlags & 512 /* NoLeadingComments */) !== 0 || node.kind === 11 /* JsxText */;
@@ -86752,7 +89384,7 @@ var ts;
                     containerEnd = end;
                     // To avoid invalid comment emit in a down-level binding pattern, we
                     // keep track of the last declaration list container's end
-                    if (node.kind === 238 /* VariableDeclarationList */) {
+                    if (node.kind === 239 /* VariableDeclarationList */) {
                         declarationListContainerEnd = end;
                     }
                 }
@@ -87009,7 +89641,7 @@ var ts;
             else {
                 var _a = ts.getSourceMapRange(node), pos = _a.pos, end = _a.end, _b = _a.source, source = _b === void 0 ? sourceMapSource : _b;
                 var emitFlags = ts.getEmitFlags(node);
-                if (node.kind !== 312 /* NotEmittedStatement */
+                if (node.kind !== 314 /* NotEmittedStatement */
                     && (emitFlags & 16 /* NoLeadingSourceMap */) === 0
                     && pos >= 0) {
                     emitSourcePos(source, skipSourceTrivia(source, pos));
@@ -87022,7 +89654,7 @@ var ts;
                 else {
                     pipelinePhase(hint, node);
                 }
-                if (node.kind !== 312 /* NotEmittedStatement */
+                if (node.kind !== 314 /* NotEmittedStatement */
                     && (emitFlags & 32 /* NoTrailingSourceMap */) === 0
                     && end >= 0) {
                     emitSourcePos(source, end);
@@ -87150,7 +89782,8 @@ var ts;
             writeFile: host.writeFile && writeFile,
             addOrDeleteFileOrDirectory: addOrDeleteFileOrDirectory,
             addOrDeleteFile: addOrDeleteFile,
-            clearCache: clearCache
+            clearCache: clearCache,
+            realpath: host.realpath && realpath
         };
         function toPath(fileName) {
             return ts.toPath(fileName, currentDirectory, getCanonicalFileName);
@@ -87247,7 +89880,7 @@ var ts;
             var rootDirPath = toPath(rootDir);
             var result = tryReadDirectory(rootDir, rootDirPath);
             if (result) {
-                return ts.matchFiles(rootDir, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory, depth, getFileSystemEntries);
+                return ts.matchFiles(rootDir, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory, depth, getFileSystemEntries, realpath);
             }
             return host.readDirectory(rootDir, extensions, excludes, includes, depth);
             function getFileSystemEntries(dir) {
@@ -87258,6 +89891,9 @@ var ts;
                 return tryReadDirectory(dir, path) || ts.emptyFileSystemEntries;
             }
         }
+        function realpath(s) {
+            return host.realpath ? host.realpath(s) : s;
+        }
         function addOrDeleteFileOrDirectory(fileOrDirectory, fileOrDirectoryPath) {
             var existingResult = getCachedFileSystemEntries(fileOrDirectoryPath);
             if (existingResult) {
@@ -87528,11 +90164,7 @@ var ts;
     function createCompilerHostWorker(options, setParentNodes, system) {
         if (system === void 0) { system = ts.sys; }
         var existingDirectories = ts.createMap();
-        function getCanonicalFileName(fileName) {
-            // if underlying system can distinguish between two files whose names differs only in cases then file name already in canonical form.
-            // otherwise use toLowerCase as a canonical form.
-            return system.useCaseSensitiveFileNames ? fileName : fileName.toLowerCase();
-        }
+        var getCanonicalFileName = ts.createGetCanonicalFileName(system.useCaseSensitiveFileNames);
         function getSourceFile(fileName, languageVersion, onError) {
             var text;
             try {
@@ -87637,7 +90269,8 @@ var ts;
             getDirectories: function (path) { return system.getDirectories(path); },
             realpath: realpath,
             readDirectory: function (path, extensions, include, exclude, depth) { return system.readDirectory(path, extensions, include, exclude, depth); },
-            createDirectory: function (d) { return system.createDirectory(d); }
+            createDirectory: function (d) { return system.createDirectory(d); },
+            createHash: ts.maybeBind(system, system.createHash)
         };
         return compilerHost;
     }
@@ -87884,11 +90517,11 @@ var ts;
                 if (diagnostic.relatedInformation) {
                     output += host.getNewLine();
                     for (var _a = 0, _b = diagnostic.relatedInformation; _a < _b.length; _a++) {
-                        var _c = _b[_a], file = _c.file, start = _c.start, length_4 = _c.length, messageText = _c.messageText;
+                        var _c = _b[_a], file = _c.file, start = _c.start, length_7 = _c.length, messageText = _c.messageText;
                         if (file) {
                             output += host.getNewLine();
                             output += halfIndent + formatLocation(file, start, host); // TODO: GH#18217
-                            output += formatCodeSpan(file, start, length_4, indent, ForegroundColorEscapeSequences.Cyan, host); // TODO: GH#18217
+                            output += formatCodeSpan(file, start, length_7, indent, ForegroundColorEscapeSequences.Cyan, host); // TODO: GH#18217
                         }
                         output += host.getNewLine();
                         output += indent + flattenDiagnosticMessageText(messageText, host.getNewLine());
@@ -87900,29 +90533,33 @@ var ts;
         return output;
     }
     ts.formatDiagnosticsWithColorAndContext = formatDiagnosticsWithColorAndContext;
-    function flattenDiagnosticMessageText(messageText, newLine) {
-        if (ts.isString(messageText)) {
-            return messageText;
+    function flattenDiagnosticMessageText(diag, newLine, indent) {
+        if (indent === void 0) { indent = 0; }
+        if (ts.isString(diag)) {
+            return diag;
         }
-        else {
-            var diagnosticChain = messageText;
-            var result = "";
-            var indent_1 = 0;
-            while (diagnosticChain) {
-                if (indent_1) {
-                    result += newLine;
-                    for (var i = 0; i < indent_1; i++) {
-                        result += "  ";
-                    }
-                }
-                result += diagnosticChain.messageText;
-                indent_1++;
-                diagnosticChain = diagnosticChain.next;
+        else if (diag === undefined) {
+            return "";
+        }
+        var result = "";
+        if (indent) {
+            result += newLine;
+            for (var i = 0; i < indent; i++) {
+                result += "  ";
             }
-            return result;
         }
+        result += diag.messageText;
+        indent++;
+        if (diag.next) {
+            for (var _i = 0, _a = diag.next; _i < _a.length; _i++) {
+                var kid = _a[_i];
+                result += flattenDiagnosticMessageText(kid, newLine, indent);
+            }
+        }
+        return result;
     }
     ts.flattenDiagnosticMessageText = flattenDiagnosticMessageText;
+    /* @internal */
     function loadWithLocalCache(names, containingFile, redirectedReference, loader) {
         if (names.length === 0) {
             return [];
@@ -87942,6 +90579,7 @@ var ts;
         }
         return resolutions;
     }
+    ts.loadWithLocalCache = loadWithLocalCache;
     /**
      * Determines if program structure is upto date or needs to be recreated
      */
@@ -88101,7 +90739,7 @@ var ts;
             }); };
         }
         else {
-            moduleResolutionCache = ts.createModuleResolutionCache(currentDirectory, function (x) { return host.getCanonicalFileName(x); });
+            moduleResolutionCache = ts.createModuleResolutionCache(currentDirectory, function (x) { return host.getCanonicalFileName(x); }, options);
             var loader_1 = function (moduleName, containingFile, redirectedReference) { return ts.resolveModuleName(moduleName, containingFile, options, host, moduleResolutionCache, redirectedReference).resolvedModule; }; // TODO: GH#18217
             resolveModuleNamesWorker = function (moduleNames, containingFile, _reusedNames, redirectedReference) { return loadWithLocalCache(ts.Debug.assertEachDefined(moduleNames), containingFile, redirectedReference, loader_1); };
         }
@@ -88148,11 +90786,18 @@ var ts;
                 if (rootNames.length) {
                     for (var _i = 0, resolvedProjectReferences_1 = resolvedProjectReferences; _i < resolvedProjectReferences_1.length; _i++) {
                         var parsedRef = resolvedProjectReferences_1[_i];
-                        if (parsedRef) {
-                            var out = parsedRef.commandLine.options.outFile || parsedRef.commandLine.options.out;
-                            if (out) {
-                                var dtsOutfile = ts.changeExtension(out, ".d.ts");
-                                processSourceFile(dtsOutfile, /*isDefaultLib*/ false, /*ignoreNoDefaultLib*/ false, /*packageId*/ undefined);
+                        if (!parsedRef)
+                            continue;
+                        var out = parsedRef.commandLine.options.outFile || parsedRef.commandLine.options.out;
+                        if (out) {
+                            processSourceFile(ts.changeExtension(out, ".d.ts"), /*isDefaultLib*/ false, /*ignoreNoDefaultLib*/ false, /*packageId*/ undefined);
+                        }
+                        else if (ts.getEmitModuleKind(parsedRef.commandLine.options) === ts.ModuleKind.None) {
+                            for (var _a = 0, _b = parsedRef.commandLine.fileNames; _a < _b.length; _a++) {
+                                var fileName = _b[_a];
+                                if (!ts.fileExtensionIs(fileName, ".d.ts" /* Dts */) && ts.hasTSFileExtension(fileName)) {
+                                    processSourceFile(ts.getOutputDeclarationFileName(fileName, parsedRef.commandLine, !host.useCaseSensitiveFileNames()), /*isDefaultLib*/ false, /*ignoreNoDefaultLib*/ false, /*packageId*/ undefined);
+                                }
                             }
                         }
                     }
@@ -88200,8 +90845,8 @@ var ts;
         // not part of the new program.
         if (oldProgram && host.onReleaseOldSourceFile) {
             var oldSourceFiles = oldProgram.getSourceFiles();
-            for (var _a = 0, oldSourceFiles_1 = oldSourceFiles; _a < oldSourceFiles_1.length; _a++) {
-                var oldSourceFile = oldSourceFiles_1[_a];
+            for (var _c = 0, oldSourceFiles_1 = oldSourceFiles; _c < oldSourceFiles_1.length; _c++) {
+                var oldSourceFile = oldSourceFiles_1[_c];
                 var newFile = getSourceFileByPath(oldSourceFile.resolvedPath);
                 if (shouldCreateNewSourceFile || !newFile ||
                     // old file wasnt redirect but new file is
@@ -88240,6 +90885,7 @@ var ts;
             getIdentifierCount: function () { return getDiagnosticsProducingTypeChecker().getIdentifierCount(); },
             getSymbolCount: function () { return getDiagnosticsProducingTypeChecker().getSymbolCount(); },
             getTypeCount: function () { return getDiagnosticsProducingTypeChecker().getTypeCount(); },
+            getRelationCacheSizes: function () { return getDiagnosticsProducingTypeChecker().getRelationCacheSizes(); },
             getFileProcessingDiagnostics: function () { return fileProcessingDiagnostics; },
             getResolvedTypeReferenceDirectives: function () { return resolvedTypeReferenceDirectives; },
             isSourceFileFromExternalLibrary: isSourceFileFromExternalLibrary,
@@ -88287,7 +90933,7 @@ var ts;
         }
         function getCommonSourceDirectory() {
             if (commonSourceDirectory === undefined) {
-                var emittedFiles = ts.filter(files, function (file) { return ts.sourceFileMayBeEmitted(file, options, isSourceFileFromExternalLibrary); });
+                var emittedFiles = ts.filter(files, function (file) { return ts.sourceFileMayBeEmitted(file, options, isSourceFileFromExternalLibrary, getResolvedProjectReferenceToRedirect); });
                 if (options.rootDir && checkSourceFilesBelongToPath(emittedFiles, options.rootDir)) {
                     // If a rootDir is specified use it as the commonSourceDirectory
                     commonSourceDirectory = ts.getNormalizedAbsolutePath(options.rootDir, currentDirectory);
@@ -88337,13 +90983,13 @@ var ts;
                 // which per above occurred during the current program creation.
                 // Since we assume the filesystem does not change during program creation,
                 // it is safe to reuse resolutions from the earlier call.
-                var result_6 = [];
+                var result_9 = [];
                 for (var _i = 0, moduleNames_1 = moduleNames; _i < moduleNames_1.length; _i++) {
                     var moduleName = moduleNames_1[_i];
                     var resolvedModule = file.resolvedModules.get(moduleName);
-                    result_6.push(resolvedModule);
+                    result_9.push(resolvedModule);
                 }
-                return result_6;
+                return result_9;
             }
             // At this point, we know at least one of the following hold:
             // - file has local declarations for ambient modules
@@ -88430,7 +91076,7 @@ var ts;
             function moduleNameResolvesToAmbientModuleInNonModifiedFile(moduleName) {
                 var resolutionToFile = ts.getResolvedModule(oldSourceFile, moduleName);
                 var resolvedFile = resolutionToFile && oldProgram.getSourceFile(resolutionToFile.resolvedFileName);
-                if (resolutionToFile && resolvedFile && !resolvedFile.externalModuleIndicator) {
+                if (resolutionToFile && resolvedFile) {
                     // In the old program, we resolved to an ambient module that was in the same
                     //   place as we expected to find an actual module file.
                     // We actually need to return 'false' here even though this seems like a 'true' case
@@ -88659,7 +91305,7 @@ var ts;
                 var filePath = newSourceFile.path;
                 addFileToFilesByName(newSourceFile, filePath, newSourceFile.resolvedPath);
                 // Set the file as found during node modules search if it was found that way in old progra,
-                if (oldProgram.isSourceFileFromExternalLibrary(oldProgram.getSourceFileByPath(filePath))) {
+                if (oldProgram.isSourceFileFromExternalLibrary(oldProgram.getSourceFileByPath(newSourceFile.resolvedPath))) {
                     sourceFilesFoundSearchingNodeModules.set(filePath, true);
                 }
             }
@@ -88676,7 +91322,8 @@ var ts;
         }
         function getEmitHost(writeFileCallback) {
             return __assign({ getPrependNodes: getPrependNodes,
-                getCanonicalFileName: getCanonicalFileName, getCommonSourceDirectory: program.getCommonSourceDirectory, getCompilerOptions: program.getCompilerOptions, getCurrentDirectory: function () { return currentDirectory; }, getNewLine: function () { return host.getNewLine(); }, getSourceFile: program.getSourceFile, getSourceFileByPath: program.getSourceFileByPath, getSourceFiles: program.getSourceFiles, getLibFileFromReference: program.getLibFileFromReference, isSourceFileFromExternalLibrary: isSourceFileFromExternalLibrary, writeFile: writeFileCallback || (function (fileName, data, writeByteOrderMark, onError, sourceFiles) { return host.writeFile(fileName, data, writeByteOrderMark, onError, sourceFiles); }), isEmitBlocked: isEmitBlocked, readFile: function (f) { return host.readFile(f); }, fileExists: function (f) {
+                getCanonicalFileName: getCanonicalFileName, getCommonSourceDirectory: program.getCommonSourceDirectory, getCompilerOptions: program.getCompilerOptions, getCurrentDirectory: function () { return currentDirectory; }, getNewLine: function () { return host.getNewLine(); }, getSourceFile: program.getSourceFile, getSourceFileByPath: program.getSourceFileByPath, getSourceFiles: program.getSourceFiles, getLibFileFromReference: program.getLibFileFromReference, isSourceFileFromExternalLibrary: isSourceFileFromExternalLibrary,
+                getResolvedProjectReferenceToRedirect: getResolvedProjectReferenceToRedirect, writeFile: writeFileCallback || (function (fileName, data, writeByteOrderMark, onError, sourceFiles) { return host.writeFile(fileName, data, writeByteOrderMark, onError, sourceFiles); }), isEmitBlocked: isEmitBlocked, readFile: function (f) { return host.readFile(f); }, fileExists: function (f) {
                     // Use local caches
                     var path = toPath(f);
                     if (getSourceFileByPath(path))
@@ -88685,16 +91332,15 @@ var ts;
                         return false;
                     // Before falling back to the host
                     return host.fileExists(f);
-                } }, (host.directoryExists ? { directoryExists: function (f) { return host.directoryExists(f); } } : {}), { useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); }, getProgramBuildInfo: function () { return program.getProgramBuildInfo && program.getProgramBuildInfo(); } });
+                } }, (host.directoryExists ? { directoryExists: function (f) { return host.directoryExists(f); } } : {}), { useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); }, getProgramBuildInfo: function () { return program.getProgramBuildInfo && program.getProgramBuildInfo(); }, getSourceFileFromReference: function (file, ref) { return program.getSourceFileFromReference(file, ref); } });
         }
         function emitBuildInfo(writeFileCallback) {
             ts.Debug.assert(!options.out && !options.outFile);
             ts.performance.mark("beforeEmit");
             var emitResult = ts.emitFiles(ts.notImplementedResolver, getEmitHost(writeFileCallback), 
             /*targetSourceFile*/ undefined, 
+            /*transformers*/ ts.noTransformers, 
             /*emitOnlyDtsFiles*/ false, 
-            /*transformers*/ undefined, 
-            /*declaraitonTransformers*/ undefined, 
             /*onlyBuildInfo*/ true);
             ts.performance.mark("afterEmit");
             ts.performance.measure("Emit", "beforeEmit", "afterEmit");
@@ -88782,8 +91428,7 @@ var ts;
             // checked is to not pass the file to getEmitResolver.
             var emitResolver = getDiagnosticsProducingTypeChecker().getEmitResolver((options.outFile || options.out) ? undefined : sourceFile, cancellationToken);
             ts.performance.mark("beforeEmit");
-            var transformers = emitOnlyDtsFiles ? [] : ts.getTransformers(options, customTransformers);
-            var emitResult = ts.emitFiles(emitResolver, getEmitHost(writeFileCallback), sourceFile, emitOnlyDtsFiles, transformers, customTransformers && customTransformers.afterDeclarations);
+            var emitResult = ts.emitFiles(emitResolver, getEmitHost(writeFileCallback), sourceFile, ts.getTransformers(options, customTransformers, emitOnlyDtsFiles), emitOnlyDtsFiles);
             ts.performance.mark("afterEmit");
             ts.performance.measure("Emit", "beforeEmit", "afterEmit");
             return emitResult;
@@ -88875,8 +91520,8 @@ var ts;
                 for (var _i = 0, _a = [bindDiagnostics, checkDiagnostics, fileProcessingDiagnosticsInFile, programDiagnosticsInFile, isCheckJs ? sourceFile.jsDocDiagnostics : undefined]; _i < _a.length; _i++) {
                     var diags = _a[_i];
                     if (diags) {
-                        for (var _b = 0, diags_1 = diags; _b < diags_1.length; _b++) {
-                            var diag = diags_1[_b];
+                        for (var _b = 0, diags_4 = diags; _b < diags_4.length; _b++) {
+                            var diag = diags_4[_b];
                             if (shouldReportDiagnostic(diag)) {
                                 diagnostics = ts.append(diagnostics, diag);
                             }
@@ -88925,22 +91570,22 @@ var ts;
                     // Return directly from the case if the given node doesnt want to visit each child
                     // Otherwise break to visit each child
                     switch (parent.kind) {
-                        case 151 /* Parameter */:
-                        case 154 /* PropertyDeclaration */:
+                        case 152 /* Parameter */:
+                        case 155 /* PropertyDeclaration */:
                             if (parent.questionToken === node) {
                                 diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics._0_can_only_be_used_in_a_ts_file, "?"));
                                 return;
                             }
                         // falls through
-                        case 156 /* MethodDeclaration */:
-                        case 155 /* MethodSignature */:
-                        case 157 /* Constructor */:
-                        case 158 /* GetAccessor */:
-                        case 159 /* SetAccessor */:
-                        case 196 /* FunctionExpression */:
-                        case 239 /* FunctionDeclaration */:
-                        case 197 /* ArrowFunction */:
-                        case 237 /* VariableDeclaration */:
+                        case 157 /* MethodDeclaration */:
+                        case 156 /* MethodSignature */:
+                        case 158 /* Constructor */:
+                        case 159 /* GetAccessor */:
+                        case 160 /* SetAccessor */:
+                        case 197 /* FunctionExpression */:
+                        case 240 /* FunctionDeclaration */:
+                        case 198 /* ArrowFunction */:
+                        case 238 /* VariableDeclaration */:
                             // type annotation
                             if (parent.type === node) {
                                 diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.types_can_only_be_used_in_a_ts_file));
@@ -88948,41 +91593,41 @@ var ts;
                             }
                     }
                     switch (node.kind) {
-                        case 248 /* ImportEqualsDeclaration */:
+                        case 249 /* ImportEqualsDeclaration */:
                             diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.import_can_only_be_used_in_a_ts_file));
                             return;
-                        case 254 /* ExportAssignment */:
+                        case 255 /* ExportAssignment */:
                             if (node.isExportEquals) {
                                 diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.export_can_only_be_used_in_a_ts_file));
                                 return;
                             }
                             break;
-                        case 273 /* HeritageClause */:
+                        case 274 /* HeritageClause */:
                             var heritageClause = node;
-                            if (heritageClause.token === 109 /* ImplementsKeyword */) {
+                            if (heritageClause.token === 110 /* ImplementsKeyword */) {
                                 diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.implements_clauses_can_only_be_used_in_a_ts_file));
                                 return;
                             }
                             break;
-                        case 241 /* InterfaceDeclaration */:
+                        case 242 /* InterfaceDeclaration */:
                             diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.interface_declarations_can_only_be_used_in_a_ts_file));
                             return;
-                        case 244 /* ModuleDeclaration */:
+                        case 245 /* ModuleDeclaration */:
                             diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.module_declarations_can_only_be_used_in_a_ts_file));
                             return;
-                        case 242 /* TypeAliasDeclaration */:
+                        case 243 /* TypeAliasDeclaration */:
                             diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.type_aliases_can_only_be_used_in_a_ts_file));
                             return;
-                        case 243 /* EnumDeclaration */:
+                        case 244 /* EnumDeclaration */:
                             diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.enum_declarations_can_only_be_used_in_a_ts_file));
                             return;
-                        case 213 /* NonNullExpression */:
+                        case 214 /* NonNullExpression */:
                             diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.non_null_assertions_can_only_be_used_in_a_ts_file));
                             return;
-                        case 212 /* AsExpression */:
+                        case 213 /* AsExpression */:
                             diagnostics.push(createDiagnosticForNode(node.type, ts.Diagnostics.type_assertion_expressions_can_only_be_used_in_a_ts_file));
                             return;
-                        case 194 /* TypeAssertionExpression */:
+                        case 195 /* TypeAssertionExpression */:
                             ts.Debug.fail(); // Won't parse these in a JS file anyway, as they are interpreted as JSX.
                     }
                     var prevParent = parent;
@@ -88992,54 +91637,54 @@ var ts;
                 }
                 function walkArray(nodes) {
                     if (parent.decorators === nodes && !options.experimentalDecorators) {
-                        diagnostics.push(createDiagnosticForNode(parent, ts.Diagnostics.Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_to_remove_this_warning));
+                        diagnostics.push(createDiagnosticForNode(parent, ts.Diagnostics.Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_in_your_tsconfig_or_jsconfig_to_remove_this_warning));
                     }
                     switch (parent.kind) {
-                        case 240 /* ClassDeclaration */:
-                        case 156 /* MethodDeclaration */:
-                        case 155 /* MethodSignature */:
-                        case 157 /* Constructor */:
-                        case 158 /* GetAccessor */:
-                        case 159 /* SetAccessor */:
-                        case 196 /* FunctionExpression */:
-                        case 239 /* FunctionDeclaration */:
-                        case 197 /* ArrowFunction */:
+                        case 241 /* ClassDeclaration */:
+                        case 157 /* MethodDeclaration */:
+                        case 156 /* MethodSignature */:
+                        case 158 /* Constructor */:
+                        case 159 /* GetAccessor */:
+                        case 160 /* SetAccessor */:
+                        case 197 /* FunctionExpression */:
+                        case 240 /* FunctionDeclaration */:
+                        case 198 /* ArrowFunction */:
                             // Check type parameters
                             if (nodes === parent.typeParameters) {
                                 diagnostics.push(createDiagnosticForNodeArray(nodes, ts.Diagnostics.type_parameter_declarations_can_only_be_used_in_a_ts_file));
                                 return;
                             }
                         // falls through
-                        case 219 /* VariableStatement */:
+                        case 220 /* VariableStatement */:
                             // Check modifiers
                             if (nodes === parent.modifiers) {
-                                return checkModifiers(nodes, parent.kind === 219 /* VariableStatement */);
+                                return checkModifiers(nodes, parent.kind === 220 /* VariableStatement */);
                             }
                             break;
-                        case 154 /* PropertyDeclaration */:
+                        case 155 /* PropertyDeclaration */:
                             // Check modifiers of property declaration
                             if (nodes === parent.modifiers) {
                                 for (var _i = 0, _a = nodes; _i < _a.length; _i++) {
                                     var modifier = _a[_i];
-                                    if (modifier.kind !== 116 /* StaticKeyword */) {
+                                    if (modifier.kind !== 117 /* StaticKeyword */) {
                                         diagnostics.push(createDiagnosticForNode(modifier, ts.Diagnostics._0_can_only_be_used_in_a_ts_file, ts.tokenToString(modifier.kind)));
                                     }
                                 }
                                 return;
                             }
                             break;
-                        case 151 /* Parameter */:
+                        case 152 /* Parameter */:
                             // Check modifiers of parameter declaration
                             if (nodes === parent.modifiers) {
                                 diagnostics.push(createDiagnosticForNodeArray(nodes, ts.Diagnostics.parameter_modifiers_can_only_be_used_in_a_ts_file));
                                 return;
                             }
                             break;
-                        case 191 /* CallExpression */:
-                        case 192 /* NewExpression */:
-                        case 211 /* ExpressionWithTypeArguments */:
-                        case 261 /* JsxSelfClosingElement */:
-                        case 262 /* JsxOpeningElement */:
+                        case 192 /* CallExpression */:
+                        case 193 /* NewExpression */:
+                        case 212 /* ExpressionWithTypeArguments */:
+                        case 262 /* JsxSelfClosingElement */:
+                        case 263 /* JsxOpeningElement */:
                             // Check type arguments
                             if (nodes === parent.typeArguments) {
                                 diagnostics.push(createDiagnosticForNodeArray(nodes, ts.Diagnostics.type_arguments_can_only_be_used_in_a_ts_file));
@@ -89056,24 +91701,24 @@ var ts;
                     for (var _i = 0, modifiers_1 = modifiers; _i < modifiers_1.length; _i++) {
                         var modifier = modifiers_1[_i];
                         switch (modifier.kind) {
-                            case 77 /* ConstKeyword */:
+                            case 78 /* ConstKeyword */:
                                 if (isConstValid) {
                                     continue;
                                 }
                             // to report error,
                             // falls through
-                            case 115 /* PublicKeyword */:
-                            case 113 /* PrivateKeyword */:
-                            case 114 /* ProtectedKeyword */:
-                            case 133 /* ReadonlyKeyword */:
-                            case 125 /* DeclareKeyword */:
-                            case 118 /* AbstractKeyword */:
+                            case 116 /* PublicKeyword */:
+                            case 114 /* PrivateKeyword */:
+                            case 115 /* ProtectedKeyword */:
+                            case 134 /* ReadonlyKeyword */:
+                            case 126 /* DeclareKeyword */:
+                            case 119 /* AbstractKeyword */:
                                 diagnostics.push(createDiagnosticForNode(modifier, ts.Diagnostics._0_can_only_be_used_in_a_ts_file, ts.tokenToString(modifier.kind)));
                                 break;
                             // These are all legal modifiers.
-                            case 116 /* StaticKeyword */:
-                            case 85 /* ExportKeyword */:
-                            case 80 /* DefaultKeyword */:
+                            case 117 /* StaticKeyword */:
+                            case 86 /* ExportKeyword */:
+                            case 81 /* DefaultKeyword */:
                         }
                     }
                 }
@@ -89148,8 +91793,8 @@ var ts;
             return a.fileName === b.fileName;
         }
         function moduleNameIsEqualTo(a, b) {
-            return a.kind === 72 /* Identifier */
-                ? b.kind === 72 /* Identifier */ && a.escapedText === b.escapedText
+            return a.kind === 73 /* Identifier */
+                ? b.kind === 73 /* Identifier */ && a.escapedText === b.escapedText
                 : b.kind === 10 /* StringLiteral */ && a.text === b.text;
         }
         function collectExternalModuleReferences(file) {
@@ -89364,7 +92009,10 @@ var ts;
                     if (isRedirect) {
                         inputName = getProjectReferenceRedirect(fileName) || fileName;
                     }
-                    if (ts.getNormalizedAbsolutePath(checkedName, currentDirectory) !== ts.getNormalizedAbsolutePath(inputName, currentDirectory)) {
+                    // Check if it differs only in drive letters its ok to ignore that error:
+                    var checkedAbsolutePath = ts.getNormalizedAbsolutePathWithoutRoot(checkedName, currentDirectory);
+                    var inputAbsolutePath = ts.getNormalizedAbsolutePathWithoutRoot(inputName, currentDirectory);
+                    if (checkedAbsolutePath !== inputAbsolutePath) {
                         reportFileNamesDifferOnlyInCasingError(inputName, checkedName, refFile, refPos, refEnd);
                     }
                 }
@@ -89393,9 +92041,13 @@ var ts;
             }
             var redirectedPath;
             if (refFile) {
-                var redirect = getProjectReferenceRedirect(fileName);
-                if (redirect) {
-                    (refFile.redirectedReferences || (refFile.redirectedReferences = [])).push(fileName);
+                var redirectProject = getProjectReferenceRedirectProject(fileName);
+                if (redirectProject) {
+                    if (redirectProject.commandLine.options.outFile || redirectProject.commandLine.options.out) {
+                        // Shouldnt create many to 1 mapping file in --out scenario
+                        return undefined;
+                    }
+                    var redirect = getProjectReferenceOutputName(redirectProject, fileName);
                     fileName = redirect;
                     // Once we start redirecting to a file, we can potentially come back to it
                     // via a back-reference from another file in the .d.ts folder. If that happens we'll
@@ -89479,20 +92131,23 @@ var ts;
             }
         }
         function getProjectReferenceRedirect(fileName) {
+            var referencedProject = getProjectReferenceRedirectProject(fileName);
+            return referencedProject && getProjectReferenceOutputName(referencedProject, fileName);
+        }
+        function getProjectReferenceRedirectProject(fileName) {
             // Ignore dts or any of the non ts files
             if (!resolvedProjectReferences || !resolvedProjectReferences.length || ts.fileExtensionIs(fileName, ".d.ts" /* Dts */) || !ts.fileExtensionIsOneOf(fileName, ts.supportedTSExtensions)) {
                 return undefined;
             }
             // If this file is produced by a referenced project, we need to rewrite it to
             // look in the output folder of the referenced project rather than the input
-            var referencedProject = getResolvedProjectReferenceToRedirect(fileName);
-            if (!referencedProject) {
-                return undefined;
-            }
+            return getResolvedProjectReferenceToRedirect(fileName);
+        }
+        function getProjectReferenceOutputName(referencedProject, fileName) {
             var out = referencedProject.commandLine.options.outFile || referencedProject.commandLine.options.out;
             return out ?
                 ts.changeExtension(out, ".d.ts" /* Dts */) :
-                ts.getOutputDeclarationFileName(fileName, referencedProject.commandLine);
+                ts.getOutputDeclarationFileName(fileName, referencedProject.commandLine, !host.useCaseSensitiveFileNames());
         }
         /**
          * Get the referenced project if the file is input file from that reference project
@@ -89733,18 +92388,33 @@ var ts;
             if (fromCache !== undefined) {
                 return fromCache || undefined;
             }
-            // An absolute path pointing to the containing directory of the config file
-            var basePath = ts.getNormalizedAbsolutePath(ts.getDirectoryPath(refPath), host.getCurrentDirectory());
-            var sourceFile = host.getSourceFile(refPath, 100 /* JSON */);
-            addFileToFilesByName(sourceFile, sourceFilePath, /*redirectedPath*/ undefined);
-            if (sourceFile === undefined) {
-                projectReferenceRedirects.set(sourceFilePath, false);
-                return undefined;
+            var commandLine;
+            var sourceFile;
+            if (host.getParsedCommandLine) {
+                commandLine = host.getParsedCommandLine(refPath);
+                if (!commandLine) {
+                    addFileToFilesByName(/*sourceFile*/ undefined, sourceFilePath, /*redirectedPath*/ undefined);
+                    projectReferenceRedirects.set(sourceFilePath, false);
+                    return undefined;
+                }
+                sourceFile = ts.Debug.assertDefined(commandLine.options.configFile);
+                ts.Debug.assert(!sourceFile.path || sourceFile.path === sourceFilePath);
+                addFileToFilesByName(sourceFile, sourceFilePath, /*redirectedPath*/ undefined);
+            }
+            else {
+                // An absolute path pointing to the containing directory of the config file
+                var basePath = ts.getNormalizedAbsolutePath(ts.getDirectoryPath(refPath), host.getCurrentDirectory());
+                sourceFile = host.getSourceFile(refPath, 100 /* JSON */);
+                addFileToFilesByName(sourceFile, sourceFilePath, /*redirectedPath*/ undefined);
+                if (sourceFile === undefined) {
+                    projectReferenceRedirects.set(sourceFilePath, false);
+                    return undefined;
+                }
+                commandLine = ts.parseJsonSourceFileConfigFileContent(sourceFile, configParsingHost, basePath, /*existingOptions*/ undefined, refPath);
             }
             sourceFile.path = sourceFilePath;
             sourceFile.resolvedPath = sourceFilePath;
             sourceFile.originalFileName = refPath;
-            var commandLine = ts.parseJsonSourceFileConfigFileContent(sourceFile, configParsingHost, basePath, /*existingOptions*/ undefined, refPath);
             var resolvedRef = { commandLine: commandLine, sourceFile: sourceFile };
             projectReferenceRedirects.set(sourceFilePath, resolvedRef);
             if (commandLine.projectReferences) {
@@ -89760,9 +92430,6 @@ var ts;
                 if (ts.getEmitDeclarations(options)) {
                     createDiagnosticForOptionName(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, getEmitDeclarationOptionName(options), "isolatedModules");
                 }
-                if (options.noEmitOnError) {
-                    createDiagnosticForOptionName(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "noEmitOnError", "isolatedModules");
-                }
                 if (options.out) {
                     createDiagnosticForOptionName(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "out", "isolatedModules");
                 }
@@ -89794,17 +92461,20 @@ var ts;
                     createDiagnosticForOptionName(ts.Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1_or_option_2, "tsBuildInfoFile", "incremental", "composite");
                 }
             }
+            else if (options.incremental && !options.outFile && !options.out && !options.configFilePath) {
+                programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_incremental_can_only_be_specified_using_tsconfig_emitting_to_single_file_or_when_option_tsBuildInfoFile_is_specified));
+            }
             verifyProjectReferences();
             // List of collected files is complete; validate exhautiveness if this is a project with a file list
             if (options.composite) {
-                var sourceFiles = files.filter(function (f) { return !f.isDeclarationFile; });
-                if (rootNames.length < sourceFiles.length) {
-                    var normalizedRootNames = rootNames.map(function (r) { return ts.normalizePath(r).toLowerCase(); });
-                    for (var _i = 0, _a = sourceFiles.map(function (f) { return ts.normalizePath(f.path).toLowerCase(); }); _i < _a.length; _i++) {
-                        var file = _a[_i];
-                        if (normalizedRootNames.indexOf(file) === -1) {
-                            programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.File_0_is_not_in_project_file_list_Projects_must_list_all_files_or_use_an_include_pattern, file));
-                        }
+                var rootPaths = rootNames.map(toPath);
+                for (var _i = 0, files_3 = files; _i < files_3.length; _i++) {
+                    var file = files_3[_i];
+                    // Ignore file that is not emitted
+                    if (!ts.sourceFileMayBeEmitted(file, options, isSourceFileFromExternalLibrary, getResolvedProjectReferenceToRedirect))
+                        continue;
+                    if (rootPaths.indexOf(file.path) === -1) {
+                        programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.File_0_is_not_listed_within_the_file_list_of_project_1_Projects_must_list_all_files_or_use_an_include_pattern, file.fileName, options.configFilePath || ""));
                     }
                 }
             }
@@ -89878,10 +92548,10 @@ var ts;
                 if (options.module === ts.ModuleKind.None && languageVersion < 2 /* ES2015 */) {
                     createDiagnosticForOptionName(ts.Diagnostics.Option_isolatedModules_can_only_be_used_when_either_option_module_is_provided_or_option_target_is_ES2015_or_higher, "isolatedModules", "target");
                 }
-                var firstNonExternalModuleSourceFile = ts.find(files, function (f) { return !ts.isExternalModule(f) && !f.isDeclarationFile && f.scriptKind !== 6 /* JSON */; });
+                var firstNonExternalModuleSourceFile = ts.find(files, function (f) { return !ts.isExternalModule(f) && !ts.isSourceFileJS(f) && !f.isDeclarationFile && f.scriptKind !== 6 /* JSON */; });
                 if (firstNonExternalModuleSourceFile) {
                     var span = ts.getErrorSpanForNode(firstNonExternalModuleSourceFile, firstNonExternalModuleSourceFile);
-                    programDiagnostics.add(ts.createFileDiagnostic(firstNonExternalModuleSourceFile, span.start, span.length, ts.Diagnostics.Cannot_compile_namespaces_when_the_isolatedModules_flag_is_provided));
+                    programDiagnostics.add(ts.createFileDiagnostic(firstNonExternalModuleSourceFile, span.start, span.length, ts.Diagnostics.All_files_must_be_modules_when_the_isolatedModules_flag_is_provided));
                 }
             }
             else if (firstNonAmbientExternalModuleSourceFile && languageVersion < 2 /* ES2015 */ && options.module === ts.ModuleKind.None) {
@@ -89966,13 +92636,13 @@ var ts;
                     var emitFilePath = toPath(emitFileName);
                     // Report error if the output overwrites input file
                     if (filesByName.has(emitFilePath)) {
-                        var chain_2;
+                        var chain = void 0;
                         if (!options.configFilePath) {
                             // The program is from either an inferred project or an external project
-                            chain_2 = ts.chainDiagnosticMessages(/*details*/ undefined, ts.Diagnostics.Adding_a_tsconfig_json_file_will_help_organize_projects_that_contain_both_TypeScript_and_JavaScript_files_Learn_more_at_https_Colon_Slash_Slashaka_ms_Slashtsconfig);
+                            chain = ts.chainDiagnosticMessages(/*details*/ undefined, ts.Diagnostics.Adding_a_tsconfig_json_file_will_help_organize_projects_that_contain_both_TypeScript_and_JavaScript_files_Learn_more_at_https_Colon_Slash_Slashaka_ms_Slashtsconfig);
                         }
-                        chain_2 = ts.chainDiagnosticMessages(chain_2, ts.Diagnostics.Cannot_write_file_0_because_it_would_overwrite_input_file, emitFileName);
-                        blockEmittingOfFile(emitFileName, ts.createCompilerDiagnosticFromMessageChain(chain_2));
+                        chain = ts.chainDiagnosticMessages(chain, ts.Diagnostics.Cannot_write_file_0_because_it_would_overwrite_input_file, emitFileName);
+                        blockEmittingOfFile(emitFileName, ts.createCompilerDiagnosticFromMessageChain(chain));
                     }
                     var emitFileKey = !host.useCaseSensitiveFileNames() ? emitFilePath.toLocaleLowerCase() : emitFilePath;
                     // Report error if multiple files write into same file
@@ -90162,7 +92832,7 @@ var ts;
             readFile: function (f) { return directoryStructureHost.readFile(f); },
             useCaseSensitiveFileNames: host.useCaseSensitiveFileNames(),
             getCurrentDirectory: function () { return host.getCurrentDirectory(); },
-            onUnRecoverableConfigFileDiagnostic: host.onUnRecoverableConfigFileDiagnostic || (function () { return undefined; }),
+            onUnRecoverableConfigFileDiagnostic: host.onUnRecoverableConfigFileDiagnostic || ts.returnUndefined,
             trace: host.trace ? function (s) { return host.trace(s); } : undefined
         };
     }
@@ -90384,7 +93054,7 @@ var ts;
             // Create the reference map, and set the file infos
             for (var _i = 0, _a = newProgram.getSourceFiles(); _i < _a.length; _i++) {
                 var sourceFile = _a[_i];
-                var version_1 = sourceFile.version;
+                var version_1 = ts.Debug.assertDefined(sourceFile.version, "Program intended to be used with Builder should have source files with versions set");
                 var oldInfo = useOldState ? oldState.fileInfos.get(sourceFile.path) : undefined;
                 if (referencedMap) {
                     var newReferences = getReferencedFiles(newProgram, sourceFile, getCanonicalFileName);
@@ -90507,6 +93177,7 @@ var ts;
             cacheToUpdateSignature.set(sourceFile.path, latestSignature);
             return !prevSignature || latestSignature !== prevSignature;
         }
+        BuilderState.updateShapeSignature = updateShapeSignature;
         /**
          * Coverts the declaration emit result into exported modules map
          */
@@ -90549,7 +93220,6 @@ var ts;
          * Get all the dependencies of the sourceFile
          */
         function getAllDependencies(state, programOfThisState, sourceFile) {
-            var _a;
             var compilerOptions = programOfThisState.getCompilerOptions();
             // With --out or --outFile all outputs go into single file, all files depend on each other
             if (compilerOptions.outFile || compilerOptions.out) {
@@ -90569,8 +93239,8 @@ var ts;
                     var references = state.referencedMap.get(path);
                     if (references) {
                         var iterator = references.keys();
-                        for (var _b = iterator.next(), value = _b.value, done = _b.done; !done; _a = iterator.next(), value = _a.value, done = _a.done, _a) {
-                            queue.push(value);
+                        for (var iterResult = iterator.next(); !iterResult.done; iterResult = iterator.next()) {
+                            queue.push(iterResult.value);
                         }
                     }
                 }
@@ -90776,7 +93446,7 @@ var ts;
                 // Unchanged file copy diagnostics
                 var diagnostics = oldState.semanticDiagnosticsPerFile.get(sourceFilePath);
                 if (diagnostics) {
-                    state.semanticDiagnosticsPerFile.set(sourceFilePath, oldState.hasReusableDiagnostic ? convertToDiagnostics(diagnostics, newProgram) : diagnostics);
+                    state.semanticDiagnosticsPerFile.set(sourceFilePath, oldState.hasReusableDiagnostic ? convertToDiagnostics(diagnostics, newProgram, getCanonicalFileName) : diagnostics);
                     if (!state.semanticDiagnosticsFromOldState) {
                         state.semanticDiagnosticsFromOldState = ts.createMap();
                     }
@@ -90784,44 +93454,37 @@ var ts;
                 }
             }
         });
-        if (oldCompilerOptions &&
-            (oldCompilerOptions.outDir !== compilerOptions.outDir ||
-                oldCompilerOptions.declarationDir !== compilerOptions.declarationDir ||
-                (oldCompilerOptions.outFile || oldCompilerOptions.out) !== (compilerOptions.outFile || compilerOptions.out))) {
+        if (oldCompilerOptions && ts.compilerOptionsAffectEmit(compilerOptions, oldCompilerOptions)) {
             // Add all files to affectedFilesPendingEmit since emit changed
-            state.affectedFilesPendingEmit = ts.concatenate(state.affectedFilesPendingEmit, newProgram.getSourceFiles().map(function (f) { return f.path; }));
-            if (state.affectedFilesPendingEmitIndex === undefined) {
-                state.affectedFilesPendingEmitIndex = 0;
-            }
+            addToAffectedFilesPendingEmit(state, newProgram.getSourceFiles().map(function (f) { return f.path; }));
             ts.Debug.assert(state.seenAffectedFiles === undefined);
             state.seenAffectedFiles = ts.createMap();
         }
         return state;
     }
-    function convertToDiagnostics(diagnostics, newProgram) {
+    function convertToDiagnostics(diagnostics, newProgram, getCanonicalFileName) {
         if (!diagnostics.length)
             return ts.emptyArray;
+        var buildInfoDirectory = ts.getDirectoryPath(ts.getNormalizedAbsolutePath(ts.getOutputPathForBuildInfo(newProgram.getCompilerOptions()), newProgram.getCurrentDirectory()));
         return diagnostics.map(function (diagnostic) {
-            var result = convertToDiagnosticRelatedInformation(diagnostic, newProgram);
+            var result = convertToDiagnosticRelatedInformation(diagnostic, newProgram, toPath);
             result.reportsUnnecessary = diagnostic.reportsUnnecessary;
             result.source = diagnostic.source;
             var relatedInformation = diagnostic.relatedInformation;
             result.relatedInformation = relatedInformation ?
                 relatedInformation.length ?
-                    relatedInformation.map(function (r) { return convertToDiagnosticRelatedInformation(r, newProgram); }) :
+                    relatedInformation.map(function (r) { return convertToDiagnosticRelatedInformation(r, newProgram, toPath); }) :
                     ts.emptyArray :
                 undefined;
             return result;
         });
+        function toPath(path) {
+            return ts.toPath(path, buildInfoDirectory, getCanonicalFileName);
+        }
     }
-    function convertToDiagnosticRelatedInformation(diagnostic, newProgram) {
-        var file = diagnostic.file, messageText = diagnostic.messageText;
-        return __assign({}, diagnostic, { file: file && newProgram.getSourceFileByPath(file), messageText: messageText === undefined || ts.isString(messageText) ?
-                messageText :
-                convertToDiagnosticMessageChain(messageText, newProgram) });
-    }
-    function convertToDiagnosticMessageChain(diagnostic, newProgram) {
-        return __assign({}, diagnostic, { next: diagnostic.next && convertToDiagnosticMessageChain(diagnostic.next, newProgram) });
+    function convertToDiagnosticRelatedInformation(diagnostic, newProgram, toPath) {
+        var file = diagnostic.file;
+        return __assign({}, diagnostic, { file: file ? newProgram.getSourceFileByPath(toPath(file)) : undefined });
     }
     /**
      * Releases program and other related not needed properties
@@ -90876,7 +93539,7 @@ var ts;
                     if (!seenAffectedFiles.has(affectedFile.path)) {
                         // Set the next affected file as seen and remove the cached semantic diagnostics
                         state.affectedFilesIndex = affectedFilesIndex;
-                        cleanSemanticDiagnosticsOfAffectedFile(state, affectedFile);
+                        handleDtsMayChangeOfAffectedFile(state, affectedFile, cancellationToken, computeHash);
                         return affectedFile;
                     }
                     seenAffectedFiles.set(affectedFile.path, true);
@@ -90937,94 +93600,49 @@ var ts;
         return undefined;
     }
     /**
-     * Remove the semantic diagnostics cached from old state for affected File and the files that are referencing modules that export entities from affected file
+     *  Handles semantic diagnostics and dts emit for affectedFile and files, that are referencing modules that export entities from affected file
+     *  This is because even though js emit doesnt change, dts emit / type used can change resulting in need for dts emit and js change
      */
-    function cleanSemanticDiagnosticsOfAffectedFile(state, affectedFile) {
-        if (removeSemanticDiagnosticsOf(state, affectedFile.path)) {
-            // If there are no more diagnostics from old cache, done
+    function handleDtsMayChangeOfAffectedFile(state, affectedFile, cancellationToken, computeHash) {
+        removeSemanticDiagnosticsOf(state, affectedFile.path);
+        // If affected files is everything except default library, then nothing more to do
+        if (state.allFilesExcludingDefaultLibraryFile === state.affectedFiles) {
+            if (!state.cleanedDiagnosticsOfLibFiles) {
+                state.cleanedDiagnosticsOfLibFiles = true;
+                var program_1 = ts.Debug.assertDefined(state.program);
+                var options_2 = program_1.getCompilerOptions();
+                ts.forEach(program_1.getSourceFiles(), function (f) {
+                    return program_1.isSourceFileDefaultLibrary(f) &&
+                        !ts.skipTypeChecking(f, options_2) &&
+                        removeSemanticDiagnosticsOf(state, f.path);
+                });
+            }
             return;
         }
-        // Clean lib file diagnostics if its all files excluding default files to emit
-        if (state.allFilesExcludingDefaultLibraryFile === state.affectedFiles && !state.cleanedDiagnosticsOfLibFiles) {
-            state.cleanedDiagnosticsOfLibFiles = true;
-            var program_1 = ts.Debug.assertDefined(state.program);
-            var options_2 = program_1.getCompilerOptions();
-            if (ts.forEach(program_1.getSourceFiles(), function (f) {
-                return program_1.isSourceFileDefaultLibrary(f) &&
-                    !ts.skipTypeChecking(f, options_2) &&
-                    removeSemanticDiagnosticsOf(state, f.path);
-            })) {
-                return;
+        forEachReferencingModulesOfExportOfAffectedFile(state, affectedFile, function (state, path) { return handleDtsMayChangeOf(state, path, cancellationToken, computeHash); });
+    }
+    /**
+     * Handle the dts may change, so they need to be added to pending emit if dts emit is enabled,
+     * Also we need to make sure signature is updated for these files
+     */
+    function handleDtsMayChangeOf(state, path, cancellationToken, computeHash) {
+        removeSemanticDiagnosticsOf(state, path);
+        if (!state.changedFilesSet.has(path)) {
+            var program = ts.Debug.assertDefined(state.program);
+            var sourceFile = program.getSourceFileByPath(path);
+            if (sourceFile) {
+                // Even though the js emit doesnt change and we are already handling dts emit and semantic diagnostics
+                // we need to update the signature to reflect correctness of the signature(which is output d.ts emit) of this file
+                // This ensures that we dont later during incremental builds considering wrong signature.
+                // Eg where this also is needed to ensure that .tsbuildinfo generated by incremental build should be same as if it was first fresh build
+                ts.BuilderState.updateShapeSignature(state, program, sourceFile, ts.Debug.assertDefined(state.currentAffectedFilesSignatures), cancellationToken, computeHash, state.currentAffectedFilesExportedModulesMap);
+                // If not dts emit, nothing more to do
+                if (ts.getEmitDeclarations(state.compilerOptions)) {
+                    addToAffectedFilesPendingEmit(state, [path]);
+                }
             }
         }
-        // If there was change in signature for the changed file,
-        // then delete the semantic diagnostics for files that are affected by using exports of this module
-        if (!state.exportedModulesMap || state.affectedFiles.length === 1 || !state.changedFilesSet.has(affectedFile.path)) {
-            return;
-        }
-        ts.Debug.assert(!!state.currentAffectedFilesExportedModulesMap);
-        var seenFileAndExportsOfFile = ts.createMap();
-        // Go through exported modules from cache first
-        // If exported modules has path, all files referencing file exported from are affected
-        if (ts.forEachEntry(state.currentAffectedFilesExportedModulesMap, function (exportedModules, exportedFromPath) {
-            return exportedModules &&
-                exportedModules.has(affectedFile.path) &&
-                removeSemanticDiagnosticsOfFilesReferencingPath(state, exportedFromPath, seenFileAndExportsOfFile);
-        })) {
-            return;
-        }
-        // If exported from path is not from cache and exported modules has path, all files referencing file exported from are affected
-        ts.forEachEntry(state.exportedModulesMap, function (exportedModules, exportedFromPath) {
-            return !state.currentAffectedFilesExportedModulesMap.has(exportedFromPath) && // If we already iterated this through cache, ignore it
-                exportedModules.has(affectedFile.path) &&
-                removeSemanticDiagnosticsOfFilesReferencingPath(state, exportedFromPath, seenFileAndExportsOfFile);
-        });
-    }
-    /**
-     * removes the semantic diagnostics of files referencing referencedPath and
-     * returns true if there are no more semantic diagnostics from old state
-     */
-    function removeSemanticDiagnosticsOfFilesReferencingPath(state, referencedPath, seenFileAndExportsOfFile) {
-        return ts.forEachEntry(state.referencedMap, function (referencesInFile, filePath) {
-            return referencesInFile.has(referencedPath) && removeSemanticDiagnosticsOfFileAndExportsOfFile(state, filePath, seenFileAndExportsOfFile);
-        });
-    }
-    /**
-     * Removes semantic diagnostics of file and anything that exports this file
-     */
-    function removeSemanticDiagnosticsOfFileAndExportsOfFile(state, filePath, seenFileAndExportsOfFile) {
-        if (!ts.addToSeen(seenFileAndExportsOfFile, filePath)) {
-            return false;
-        }
-        if (removeSemanticDiagnosticsOf(state, filePath)) {
-            // If there are no more diagnostics from old cache, done
-            return true;
-        }
-        ts.Debug.assert(!!state.currentAffectedFilesExportedModulesMap);
-        // Go through exported modules from cache first
-        // If exported modules has path, all files referencing file exported from are affected
-        if (ts.forEachEntry(state.currentAffectedFilesExportedModulesMap, function (exportedModules, exportedFromPath) {
-            return exportedModules &&
-                exportedModules.has(filePath) &&
-                removeSemanticDiagnosticsOfFileAndExportsOfFile(state, exportedFromPath, seenFileAndExportsOfFile);
-        })) {
-            return true;
-        }
-        // If exported from path is not from cache and exported modules has path, all files referencing file exported from are affected
-        if (ts.forEachEntry(state.exportedModulesMap, function (exportedModules, exportedFromPath) {
-            return !state.currentAffectedFilesExportedModulesMap.has(exportedFromPath) && // If we already iterated this through cache, ignore it
-                exportedModules.has(filePath) &&
-                removeSemanticDiagnosticsOfFileAndExportsOfFile(state, exportedFromPath, seenFileAndExportsOfFile);
-        })) {
-            return true;
-        }
-        // Remove diagnostics of files that import this file (without going to exports of referencing files)
-        return !!ts.forEachEntry(state.referencedMap, function (referencesInFile, referencingFilePath) {
-            return referencesInFile.has(filePath) &&
-                !seenFileAndExportsOfFile.has(referencingFilePath) && // Not already removed diagnostic file
-                removeSemanticDiagnosticsOf(state, referencingFilePath);
-        } // Dont add to seen since this is not yet done with the export removal
-        );
+        return false;
     }
     /**
      * Removes semantic diagnostics for path and
@@ -91038,6 +93656,78 @@ var ts;
         state.semanticDiagnosticsPerFile.delete(path);
         return !state.semanticDiagnosticsFromOldState.size;
     }
+    /**
+     * Iterate on referencing modules that export entities from affected file
+     */
+    function forEachReferencingModulesOfExportOfAffectedFile(state, affectedFile, fn) {
+        // If there was change in signature (dts output) for the changed file,
+        // then only we need to handle pending file emit
+        if (!state.exportedModulesMap || state.affectedFiles.length === 1 || !state.changedFilesSet.has(affectedFile.path)) {
+            return;
+        }
+        ts.Debug.assert(!!state.currentAffectedFilesExportedModulesMap);
+        var seenFileAndExportsOfFile = ts.createMap();
+        // Go through exported modules from cache first
+        // If exported modules has path, all files referencing file exported from are affected
+        if (ts.forEachEntry(state.currentAffectedFilesExportedModulesMap, function (exportedModules, exportedFromPath) {
+            return exportedModules &&
+                exportedModules.has(affectedFile.path) &&
+                forEachFilesReferencingPath(state, exportedFromPath, seenFileAndExportsOfFile, fn);
+        })) {
+            return;
+        }
+        // If exported from path is not from cache and exported modules has path, all files referencing file exported from are affected
+        ts.forEachEntry(state.exportedModulesMap, function (exportedModules, exportedFromPath) {
+            return !state.currentAffectedFilesExportedModulesMap.has(exportedFromPath) && // If we already iterated this through cache, ignore it
+                exportedModules.has(affectedFile.path) &&
+                forEachFilesReferencingPath(state, exportedFromPath, seenFileAndExportsOfFile, fn);
+        });
+    }
+    /**
+     * Iterate on files referencing referencedPath
+     */
+    function forEachFilesReferencingPath(state, referencedPath, seenFileAndExportsOfFile, fn) {
+        return ts.forEachEntry(state.referencedMap, function (referencesInFile, filePath) {
+            return referencesInFile.has(referencedPath) && forEachFileAndExportsOfFile(state, filePath, seenFileAndExportsOfFile, fn);
+        });
+    }
+    /**
+     * fn on file and iterate on anything that exports this file
+     */
+    function forEachFileAndExportsOfFile(state, filePath, seenFileAndExportsOfFile, fn) {
+        if (!ts.addToSeen(seenFileAndExportsOfFile, filePath)) {
+            return false;
+        }
+        if (fn(state, filePath)) {
+            // If there are no more diagnostics from old cache, done
+            return true;
+        }
+        ts.Debug.assert(!!state.currentAffectedFilesExportedModulesMap);
+        // Go through exported modules from cache first
+        // If exported modules has path, all files referencing file exported from are affected
+        if (ts.forEachEntry(state.currentAffectedFilesExportedModulesMap, function (exportedModules, exportedFromPath) {
+            return exportedModules &&
+                exportedModules.has(filePath) &&
+                forEachFileAndExportsOfFile(state, exportedFromPath, seenFileAndExportsOfFile, fn);
+        })) {
+            return true;
+        }
+        // If exported from path is not from cache and exported modules has path, all files referencing file exported from are affected
+        if (ts.forEachEntry(state.exportedModulesMap, function (exportedModules, exportedFromPath) {
+            return !state.currentAffectedFilesExportedModulesMap.has(exportedFromPath) && // If we already iterated this through cache, ignore it
+                exportedModules.has(filePath) &&
+                forEachFileAndExportsOfFile(state, exportedFromPath, seenFileAndExportsOfFile, fn);
+        })) {
+            return true;
+        }
+        // Remove diagnostics of files that import this file (without going to exports of referencing files)
+        return !!ts.forEachEntry(state.referencedMap, function (referencesInFile, referencingFilePath) {
+            return referencesInFile.has(filePath) &&
+                !seenFileAndExportsOfFile.has(referencingFilePath) && // Not already removed diagnostic file
+                fn(state, referencingFilePath);
+        } // Dont add to seen since this is not yet done with the export removal
+        );
+    }
     /**
      * This is called after completing operation on the next affected file.
      * The operations here are postponed to ensure that cancellation during the iteration is handled correctly
@@ -91090,19 +93780,24 @@ var ts;
     /**
      * Gets the program information to be emitted in buildInfo so that we can use it to create new program
      */
-    function getProgramBuildInfo(state) {
+    function getProgramBuildInfo(state, getCanonicalFileName) {
         if (state.compilerOptions.outFile || state.compilerOptions.out)
             return undefined;
+        var currentDirectory = ts.Debug.assertDefined(state.program).getCurrentDirectory();
+        var buildInfoDirectory = ts.getDirectoryPath(ts.getNormalizedAbsolutePath(ts.getOutputPathForBuildInfo(state.compilerOptions), currentDirectory));
         var fileInfos = {};
         state.fileInfos.forEach(function (value, key) {
             var signature = state.currentAffectedFilesSignatures && state.currentAffectedFilesSignatures.get(key);
-            fileInfos[key] = signature === undefined ? value : { version: value.version, signature: signature };
+            fileInfos[relativeToBuildInfo(key)] = signature === undefined ? value : { version: value.version, signature: signature };
         });
-        var result = { fileInfos: fileInfos, options: state.compilerOptions };
+        var result = {
+            fileInfos: fileInfos,
+            options: convertToReusableCompilerOptions(state.compilerOptions, relativeToBuildInfoEnsuringAbsolutePath)
+        };
         if (state.referencedMap) {
             var referencedMap_1 = {};
             state.referencedMap.forEach(function (value, key) {
-                referencedMap_1[key] = ts.arrayFrom(value.keys());
+                referencedMap_1[relativeToBuildInfo(key)] = ts.arrayFrom(value.keys(), relativeToBuildInfo);
             });
             result.referencedMap = referencedMap_1;
         }
@@ -91112,10 +93807,10 @@ var ts;
                 var newValue = state.currentAffectedFilesExportedModulesMap && state.currentAffectedFilesExportedModulesMap.get(key);
                 // Not in temporary cache, use existing value
                 if (newValue === undefined)
-                    exportedModulesMap_1[key] = ts.arrayFrom(value.keys());
+                    exportedModulesMap_1[relativeToBuildInfo(key)] = ts.arrayFrom(value.keys(), relativeToBuildInfo);
                 // Value in cache and has updated value map, use that
                 else if (newValue)
-                    exportedModulesMap_1[key] = ts.arrayFrom(newValue.keys());
+                    exportedModulesMap_1[relativeToBuildInfo(key)] = ts.arrayFrom(newValue.keys(), relativeToBuildInfo);
             });
             result.exportedModulesMap = exportedModulesMap_1;
         }
@@ -91124,39 +93819,67 @@ var ts;
             // Currently not recording actual errors since those mean no emit for tsc --build
             state.semanticDiagnosticsPerFile.forEach(function (value, key) { return semanticDiagnosticsPerFile_1.push(value.length ?
                 [
-                    key,
+                    relativeToBuildInfo(key),
                     state.hasReusableDiagnostic ?
                         value :
-                        convertToReusableDiagnostics(value)
+                        convertToReusableDiagnostics(value, relativeToBuildInfo)
                 ] :
-                key); });
+                relativeToBuildInfo(key)); });
             result.semanticDiagnosticsPerFile = semanticDiagnosticsPerFile_1;
         }
         return result;
+        function relativeToBuildInfoEnsuringAbsolutePath(path) {
+            return relativeToBuildInfo(ts.getNormalizedAbsolutePath(path, currentDirectory));
+        }
+        function relativeToBuildInfo(path) {
+            return ts.ensurePathIsNonModuleName(ts.getRelativePathFromDirectory(buildInfoDirectory, path, getCanonicalFileName));
+        }
     }
-    function convertToReusableDiagnostics(diagnostics) {
+    function convertToReusableCompilerOptions(options, relativeToBuildInfo) {
+        var result = {};
+        var optionsNameMap = ts.getOptionNameMap().optionNameMap;
+        for (var name in options) {
+            if (ts.hasProperty(options, name)) {
+                result[name] = convertToReusableCompilerOptionValue(optionsNameMap.get(name.toLowerCase()), options[name], relativeToBuildInfo);
+            }
+        }
+        if (result.configFilePath) {
+            result.configFilePath = relativeToBuildInfo(result.configFilePath);
+        }
+        return result;
+    }
+    function convertToReusableCompilerOptionValue(option, value, relativeToBuildInfo) {
+        if (option) {
+            if (option.type === "list") {
+                var values = value;
+                if (option.element.isFilePath && values.length) {
+                    return values.map(relativeToBuildInfo);
+                }
+            }
+            else if (option.isFilePath) {
+                return relativeToBuildInfo(value);
+            }
+        }
+        return value;
+    }
+    function convertToReusableDiagnostics(diagnostics, relativeToBuildInfo) {
         ts.Debug.assert(!!diagnostics.length);
         return diagnostics.map(function (diagnostic) {
-            var result = convertToReusableDiagnosticRelatedInformation(diagnostic);
+            var result = convertToReusableDiagnosticRelatedInformation(diagnostic, relativeToBuildInfo);
             result.reportsUnnecessary = diagnostic.reportsUnnecessary;
             result.source = diagnostic.source;
             var relatedInformation = diagnostic.relatedInformation;
             result.relatedInformation = relatedInformation ?
                 relatedInformation.length ?
-                    relatedInformation.map(function (r) { return convertToReusableDiagnosticRelatedInformation(r); }) :
+                    relatedInformation.map(function (r) { return convertToReusableDiagnosticRelatedInformation(r, relativeToBuildInfo); }) :
                     ts.emptyArray :
                 undefined;
             return result;
         });
     }
-    function convertToReusableDiagnosticRelatedInformation(diagnostic) {
-        var file = diagnostic.file, messageText = diagnostic.messageText;
-        return __assign({}, diagnostic, { file: file && file.path, messageText: messageText === undefined || ts.isString(messageText) ?
-                messageText :
-                convertToReusableDiagnosticMessageChain(messageText) });
-    }
-    function convertToReusableDiagnosticMessageChain(diagnostic) {
-        return __assign({}, diagnostic, { next: diagnostic.next && convertToReusableDiagnosticMessageChain(diagnostic.next) });
+    function convertToReusableDiagnosticRelatedInformation(diagnostic, relativeToBuildInfo) {
+        var file = diagnostic.file;
+        return __assign({}, diagnostic, { file: file ? relativeToBuildInfo(file.path) : undefined });
     }
     var BuilderProgramKind;
     (function (BuilderProgramKind) {
@@ -91214,7 +93937,7 @@ var ts;
         var computeHash = host.createHash || ts.generateDjb2Hash;
         var state = createBuilderProgramState(newProgram, getCanonicalFileName, oldState);
         var backupState;
-        newProgram.getProgramBuildInfo = function () { return getProgramBuildInfo(state); };
+        newProgram.getProgramBuildInfo = function () { return getProgramBuildInfo(state, getCanonicalFileName); };
         // To ensure that we arent storing any references to old program or new program without state
         newProgram = undefined; // TODO: GH#18217
         oldProgram = undefined;
@@ -91240,6 +93963,7 @@ var ts;
             result.getSemanticDiagnosticsOfNextAffectedFile = getSemanticDiagnosticsOfNextAffectedFile;
         }
         else if (kind === BuilderProgramKind.EmitAndSemanticDiagnosticsBuilderProgram) {
+            result.getSemanticDiagnosticsOfNextAffectedFile = getSemanticDiagnosticsOfNextAffectedFile;
             result.emitNextAffectedFile = emitNextAffectedFile;
         }
         else {
@@ -91265,7 +93989,7 @@ var ts;
                         return toAffectedFileResult(state, 
                         // When whole program is affected, do emit only once (eg when --out or --outFile is specified)
                         // Otherwise just affected file
-                        affected_1.emitBuildInfo(writeFile || host.writeFile, cancellationToken), affected_1, 
+                        affected_1.emitBuildInfo(writeFile || ts.maybeBind(host, host.writeFile), cancellationToken), affected_1, 
                         /*isPendingEmitFile*/ false, 
                         /*isBuildInfoEmit*/ true);
                     }
@@ -91281,14 +94005,10 @@ var ts;
                     affected = program;
                 }
             }
-            // Mark seen emitted files if there are pending files to be emitted
-            if (state.affectedFilesPendingEmit && state.program !== affected) {
-                (state.seenEmittedFiles || (state.seenEmittedFiles = ts.createMap())).set(affected.path, true);
-            }
             return toAffectedFileResult(state, 
             // When whole program is affected, do emit only once (eg when --out or --outFile is specified)
             // Otherwise just affected file
-            ts.Debug.assertDefined(state.program).emit(affected === state.program ? undefined : affected, writeFile || host.writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers), affected, isPendingEmitFile);
+            ts.Debug.assertDefined(state.program).emit(affected === state.program ? undefined : affected, writeFile || ts.maybeBind(host, host.writeFile), cancellationToken, emitOnlyDtsFiles, customTransformers), affected, isPendingEmitFile);
         }
         /**
          * Emits the JavaScript and declaration files.
@@ -91325,7 +94045,7 @@ var ts;
                     };
                 }
             }
-            return ts.Debug.assertDefined(state.program).emit(targetSourceFile, writeFile || host.writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers);
+            return ts.Debug.assertDefined(state.program).emit(targetSourceFile, writeFile || ts.maybeBind(host, host.writeFile), cancellationToken, emitOnlyDtsFiles, customTransformers);
         }
         /**
          * Return the semantic diagnostics for the next affected file or undefined if iteration is complete
@@ -91342,6 +94062,10 @@ var ts;
                     // When whole program is affected, get all semantic diagnostics (eg when --out or --outFile is specified)
                     return toAffectedFileResult(state, state.program.getSemanticDiagnostics(/*targetSourceFile*/ undefined, cancellationToken), affected);
                 }
+                // Add file to affected file pending emit to handle for later emit time
+                if (kind === BuilderProgramKind.EmitAndSemanticDiagnosticsBuilderProgram) {
+                    addToAffectedFilesPendingEmit(state, [affected.path]);
+                }
                 // Get diagnostics for the affected file if its not ignored
                 if (ignoreSourceFile && ignoreSourceFile(affected)) {
                     // Get next affected file
@@ -91372,35 +94096,29 @@ var ts;
             }
             // When semantic builder asks for diagnostics of the whole program,
             // ensure that all the affected files are handled
-            var affected;
-            var affectedFilesPendingEmit;
-            while (affected = getNextAffectedFile(state, cancellationToken, computeHash)) {
-                if (affected !== state.program && kind === BuilderProgramKind.EmitAndSemanticDiagnosticsBuilderProgram) {
-                    (affectedFilesPendingEmit || (affectedFilesPendingEmit = [])).push(affected.path);
-                }
-                doneWithAffectedFile(state, affected);
-            }
-            // In case of emit builder, cache the files to be emitted
-            if (affectedFilesPendingEmit) {
-                state.affectedFilesPendingEmit = ts.concatenate(state.affectedFilesPendingEmit, affectedFilesPendingEmit);
-                // affectedFilesPendingEmitIndex === undefined
-                // - means the emit state.affectedFilesPendingEmit was undefined before adding current affected files
-                //   so start from 0 as array would be affectedFilesPendingEmit
-                // else, continue to iterate from existing index, the current set is appended to existing files
-                if (state.affectedFilesPendingEmitIndex === undefined) {
-                    state.affectedFilesPendingEmitIndex = 0;
-                }
+            // tslint:disable-next-line no-empty
+            while (getSemanticDiagnosticsOfNextAffectedFile(cancellationToken)) {
             }
             var diagnostics;
             for (var _i = 0, _a = ts.Debug.assertDefined(state.program).getSourceFiles(); _i < _a.length; _i++) {
-                var sourceFile_2 = _a[_i];
-                diagnostics = ts.addRange(diagnostics, getSemanticDiagnosticsOfFile(state, sourceFile_2, cancellationToken));
+                var sourceFile_1 = _a[_i];
+                diagnostics = ts.addRange(diagnostics, getSemanticDiagnosticsOfFile(state, sourceFile_1, cancellationToken));
             }
             return diagnostics || ts.emptyArray;
         }
     }
     ts.createBuilderProgram = createBuilderProgram;
-    function getMapOfReferencedSet(mapLike) {
+    function addToAffectedFilesPendingEmit(state, affectedFilesPendingEmit) {
+        state.affectedFilesPendingEmit = ts.concatenate(state.affectedFilesPendingEmit, affectedFilesPendingEmit);
+        // affectedFilesPendingEmitIndex === undefined
+        // - means the emit state.affectedFilesPendingEmit was undefined before adding current affected files
+        //   so start from 0 as array would be affectedFilesPendingEmit
+        // else, continue to iterate from existing index, the current set is appended to existing files
+        if (state.affectedFilesPendingEmitIndex === undefined) {
+            state.affectedFilesPendingEmitIndex = 0;
+        }
+    }
+    function getMapOfReferencedSet(mapLike, toPath) {
         if (!mapLike)
             return undefined;
         var map = ts.createMap();
@@ -91408,18 +94126,25 @@ var ts;
         // template is undefined, and instead will just exit the loop.
         for (var key in mapLike) {
             if (ts.hasProperty(mapLike, key)) {
-                map.set(key, ts.arrayToSet(mapLike[key]));
+                map.set(toPath(key), ts.arrayToSet(mapLike[key], toPath));
             }
         }
         return map;
     }
-    function createBuildProgramUsingProgramBuildInfo(program) {
-        var fileInfos = ts.createMapFromTemplate(program.fileInfos);
+    function createBuildProgramUsingProgramBuildInfo(program, buildInfoPath, host) {
+        var buildInfoDirectory = ts.getDirectoryPath(ts.getNormalizedAbsolutePath(buildInfoPath, host.getCurrentDirectory()));
+        var getCanonicalFileName = ts.createGetCanonicalFileName(host.useCaseSensitiveFileNames());
+        var fileInfos = ts.createMap();
+        for (var key in program.fileInfos) {
+            if (ts.hasProperty(program.fileInfos, key)) {
+                fileInfos.set(toPath(key), program.fileInfos[key]);
+            }
+        }
         var state = {
             fileInfos: fileInfos,
-            compilerOptions: program.options,
-            referencedMap: getMapOfReferencedSet(program.referencedMap),
-            exportedModulesMap: getMapOfReferencedSet(program.exportedModulesMap),
+            compilerOptions: convertFromReusableCompilerOptions(program.options, toAbsolutePath),
+            referencedMap: getMapOfReferencedSet(program.referencedMap, toPath),
+            exportedModulesMap: getMapOfReferencedSet(program.exportedModulesMap, toPath),
             semanticDiagnosticsPerFile: program.semanticDiagnosticsPerFile && ts.arrayToMap(program.semanticDiagnosticsPerFile, function (value) { return ts.isString(value) ? value : value[0]; }, function (value) { return ts.isString(value) ? ts.emptyArray : value[1]; }),
             hasReusableDiagnostic: true
         };
@@ -91428,7 +94153,7 @@ var ts;
             backupState: ts.noop,
             restoreState: ts.noop,
             getProgram: ts.notImplemented,
-            getProgramOrUndefined: function () { return undefined; },
+            getProgramOrUndefined: ts.returnUndefined,
             releaseProgram: ts.noop,
             getCompilerOptions: function () { return state.compilerOptions; },
             getSourceFile: ts.notImplemented,
@@ -91445,8 +94170,41 @@ var ts;
             emitNextAffectedFile: ts.notImplemented,
             getSemanticDiagnosticsOfNextAffectedFile: ts.notImplemented,
         };
+        function toPath(path) {
+            return ts.toPath(path, buildInfoDirectory, getCanonicalFileName);
+        }
+        function toAbsolutePath(path) {
+            return ts.getNormalizedAbsolutePath(path, buildInfoDirectory);
+        }
     }
     ts.createBuildProgramUsingProgramBuildInfo = createBuildProgramUsingProgramBuildInfo;
+    function convertFromReusableCompilerOptions(options, toAbsolutePath) {
+        var result = {};
+        var optionsNameMap = ts.getOptionNameMap().optionNameMap;
+        for (var name in options) {
+            if (ts.hasProperty(options, name)) {
+                result[name] = convertFromReusableCompilerOptionValue(optionsNameMap.get(name.toLowerCase()), options[name], toAbsolutePath);
+            }
+        }
+        if (result.configFilePath) {
+            result.configFilePath = toAbsolutePath(result.configFilePath);
+        }
+        return result;
+    }
+    function convertFromReusableCompilerOptionValue(option, value, toAbsolutePath) {
+        if (option) {
+            if (option.type === "list") {
+                var values = value;
+                if (option.element.isFilePath && values.length) {
+                    return values.map(toAbsolutePath);
+                }
+            }
+            else if (option.isFilePath) {
+                return toAbsolutePath(value);
+            }
+        }
+        return value;
+    }
     function createRedirectedBuilderProgram(state, configFileParsingDiagnostics) {
         return {
             getState: ts.notImplemented,
@@ -91496,6 +94254,38 @@ var ts;
         return ts.some(ts.ignoredPaths, function (searchPath) { return ts.stringContains(path, searchPath); });
     }
     ts.isPathIgnored = isPathIgnored;
+    /**
+     * Filter out paths like
+     * "/", "/user", "/user/username", "/user/username/folderAtRoot",
+     * "c:/", "c:/users", "c:/users/username", "c:/users/username/folderAtRoot", "c:/folderAtRoot"
+     * @param dirPath
+     */
+    function canWatchDirectory(dirPath) {
+        var rootLength = ts.getRootLength(dirPath);
+        if (dirPath.length === rootLength) {
+            // Ignore "/", "c:/"
+            return false;
+        }
+        var nextDirectorySeparator = dirPath.indexOf(ts.directorySeparator, rootLength);
+        if (nextDirectorySeparator === -1) {
+            // ignore "/user", "c:/users" or "c:/folderAtRoot"
+            return false;
+        }
+        if (dirPath.charCodeAt(0) !== 47 /* slash */ &&
+            dirPath.substr(rootLength, nextDirectorySeparator).search(/users/i) === -1) {
+            // Paths like c:/folderAtRoot/subFolder are allowed
+            return true;
+        }
+        for (var searchIndex = nextDirectorySeparator + 1, searchLevels = 2; searchLevels > 0; searchLevels--) {
+            searchIndex = dirPath.indexOf(ts.directorySeparator, searchIndex) + 1;
+            if (searchIndex === 0) {
+                // Folder isnt at expected minimun levels
+                return false;
+            }
+        }
+        return true;
+    }
+    ts.canWatchDirectory = canWatchDirectory;
     ts.maxNumberOfFilesToIterateForInvalidation = 256;
     function createResolutionCache(resolutionHost, rootDirForResolution, logChangesWhenResolvingModule) {
         var filesWithChangedSetOfUnresolvedImports;
@@ -91626,7 +94416,7 @@ var ts;
             if (globalCache !== undefined && !ts.isExternalModuleNameRelative(moduleName) && !(primaryResult.resolvedModule && ts.extensionIsTS(primaryResult.resolvedModule.extension))) {
                 // create different collection of failed lookup locations for second pass
                 // if it will fail and we've already found something during the first pass - we don't want to pollute its results
-                var _a = ts.loadModuleFromGlobalCache(moduleName, resolutionHost.projectName, compilerOptions, host, globalCache), resolvedModule = _a.resolvedModule, failedLookupLocations = _a.failedLookupLocations;
+                var _a = ts.loadModuleFromGlobalCache(ts.Debug.assertDefined(resolutionHost.globalCacheResolutionModuleName)(moduleName), resolutionHost.projectName, compilerOptions, host, globalCache), resolvedModule = _a.resolvedModule, failedLookupLocations = _a.failedLookupLocations;
                 if (resolvedModule) {
                     return { resolvedModule: resolvedModule, failedLookupLocations: ts.addRange(primaryResult.failedLookupLocations, failedLookupLocations) };
                 }
@@ -91731,37 +94521,6 @@ var ts;
         function isNodeModulesAtTypesDirectory(dirPath) {
             return ts.endsWith(dirPath, "/node_modules/@types");
         }
-        /**
-         * Filter out paths like
-         * "/", "/user", "/user/username", "/user/username/folderAtRoot",
-         * "c:/", "c:/users", "c:/users/username", "c:/users/username/folderAtRoot", "c:/folderAtRoot"
-         * @param dirPath
-         */
-        function canWatchDirectory(dirPath) {
-            var rootLength = ts.getRootLength(dirPath);
-            if (dirPath.length === rootLength) {
-                // Ignore "/", "c:/"
-                return false;
-            }
-            var nextDirectorySeparator = dirPath.indexOf(ts.directorySeparator, rootLength);
-            if (nextDirectorySeparator === -1) {
-                // ignore "/user", "c:/users" or "c:/folderAtRoot"
-                return false;
-            }
-            if (dirPath.charCodeAt(0) !== 47 /* slash */ &&
-                dirPath.substr(rootLength, nextDirectorySeparator).search(/users/i) === -1) {
-                // Paths like c:/folderAtRoot/subFolder are allowed
-                return true;
-            }
-            for (var searchIndex = nextDirectorySeparator + 1, searchLevels = 2; searchLevels > 0; searchLevels--) {
-                searchIndex = dirPath.indexOf(ts.directorySeparator, searchIndex) + 1;
-                if (searchIndex === 0) {
-                    // Folder isnt at expected minimun levels
-                    return false;
-                }
-            }
-            return true;
-        }
         function getDirectoryToWatchFailedLookupLocation(failedLookupLocation, failedLookupLocationPath) {
             if (isInDirectoryPath(rootPath, failedLookupLocationPath)) {
                 // Ensure failed look up is normalized path
@@ -92019,6 +94778,10 @@ var ts;
                 // If something to do with folder/file starting with "." in node_modules folder, skip it
                 if (isPathIgnored(fileOrDirectoryPath))
                     return false;
+                // prevent saving an open file from over-eagerly triggering invalidation
+                if (resolutionHost.fileIsOpen(fileOrDirectoryPath)) {
+                    return false;
+                }
                 // Some file or directory in the watching directory is created
                 // Return early if it does not have any of the watching extension or not the custom failed lookup path
                 var dirOfFileOrDirectory = ts.getDirectoryPath(fileOrDirectoryPath);
@@ -92261,11 +95024,11 @@ var ts;
         }
         function discoverProbableSymlinks(files, getCanonicalFileName, cwd) {
             var result = ts.createMap();
-            var symlinks = ts.mapDefined(files, function (sf) {
-                return sf.resolvedModules && ts.firstDefinedIterator(sf.resolvedModules.values(), function (res) {
+            var symlinks = ts.flatten(ts.mapDefined(files, function (sf) {
+                return sf.resolvedModules && ts.compact(ts.arrayFrom(ts.mapIterator(sf.resolvedModules.values(), function (res) {
                     return res && res.originalPath && res.resolvedFileName !== res.originalPath ? [res.resolvedFileName, res.originalPath] : undefined;
-                });
-            });
+                })));
+            }));
             for (var _i = 0, symlinks_1 = symlinks; _i < symlinks_1.length; _i++) {
                 var _a = symlinks_1[_i], resolvedPath = _a[0], originalPath = _a[1];
                 var _b = guessDirectorySymlink(resolvedPath, originalPath, cwd, getCanonicalFileName), commonResolved = _b[0], commonOriginal = _b[1];
@@ -92608,25 +95371,34 @@ var ts;
         return "" + newLine + ts.flattenDiagnosticMessageText(d.messageText, newLine) + newLine + newLine;
     }
     ts.getErrorSummaryText = getErrorSummaryText;
+    function listFiles(program, writeFileName) {
+        if (program.getCompilerOptions().listFiles) {
+            ts.forEach(program.getSourceFiles(), function (file) {
+                writeFileName(file.fileName);
+            });
+        }
+    }
+    ts.listFiles = listFiles;
     /**
      * Helper that emit files, report diagnostics and lists emitted and/or source files depending on compiler options
      */
-    function emitFilesAndReportErrors(program, reportDiagnostic, writeFileName, reportSummary, writeFile) {
+    function emitFilesAndReportErrors(program, reportDiagnostic, writeFileName, reportSummary, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers) {
         // First get and report any syntactic errors.
         var diagnostics = program.getConfigFileParsingDiagnostics().slice();
         var configFileParsingDiagnosticsLength = diagnostics.length;
-        ts.addRange(diagnostics, program.getSyntacticDiagnostics());
+        ts.addRange(diagnostics, program.getSyntacticDiagnostics(/*sourceFile*/ undefined, cancellationToken));
         // If we didn't have any syntactic errors, then also try getting the global and
         // semantic errors.
         if (diagnostics.length === configFileParsingDiagnosticsLength) {
-            ts.addRange(diagnostics, program.getOptionsDiagnostics());
-            ts.addRange(diagnostics, program.getGlobalDiagnostics());
+            ts.addRange(diagnostics, program.getOptionsDiagnostics(cancellationToken));
+            ts.addRange(diagnostics, program.getGlobalDiagnostics(cancellationToken));
             if (diagnostics.length === configFileParsingDiagnosticsLength) {
-                ts.addRange(diagnostics, program.getSemanticDiagnostics());
+                ts.addRange(diagnostics, program.getSemanticDiagnostics(/*sourceFile*/ undefined, cancellationToken));
             }
         }
         // Emit and report any errors we ran into.
-        var _a = program.emit(/*targetSourceFile*/ undefined, writeFile), emittedFiles = _a.emittedFiles, emitSkipped = _a.emitSkipped, emitDiagnostics = _a.diagnostics;
+        var emitResult = program.emit(/*targetSourceFile*/ undefined, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers);
+        var emittedFiles = emitResult.emittedFiles, emitDiagnostics = emitResult.diagnostics;
         ts.addRange(diagnostics, emitDiagnostics);
         ts.sortAndDeduplicateDiagnostics(diagnostics).forEach(reportDiagnostic);
         if (writeFileName) {
@@ -92635,16 +95407,20 @@ var ts;
                 var filepath = ts.getNormalizedAbsolutePath(file, currentDir_1);
                 writeFileName("TSFILE: " + filepath);
             });
-            if (program.getCompilerOptions().listFiles) {
-                ts.forEach(program.getSourceFiles(), function (file) {
-                    writeFileName(file.fileName);
-                });
-            }
+            listFiles(program, writeFileName);
         }
         if (reportSummary) {
             reportSummary(getErrorCountForSummary(diagnostics));
         }
-        if (emitSkipped && diagnostics.length > 0) {
+        return {
+            emitResult: emitResult,
+            diagnostics: diagnostics,
+        };
+    }
+    ts.emitFilesAndReportErrors = emitFilesAndReportErrors;
+    function emitFilesAndReportErrorsAndGetExitStatus(program, reportDiagnostic, writeFileName, reportSummary, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers) {
+        var _a = emitFilesAndReportErrors(program, reportDiagnostic, writeFileName, reportSummary, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers), emitResult = _a.emitResult, diagnostics = _a.diagnostics;
+        if (emitResult.emitSkipped && diagnostics.length > 0) {
             // If the emitter didn't emit anything, then pass that value along.
             return ts.ExitStatus.DiagnosticsPresent_OutputsSkipped;
         }
@@ -92655,15 +95431,15 @@ var ts;
         }
         return ts.ExitStatus.Success;
     }
-    ts.emitFilesAndReportErrors = emitFilesAndReportErrors;
-    var noopFileWatcher = { close: ts.noop };
+    ts.emitFilesAndReportErrorsAndGetExitStatus = emitFilesAndReportErrorsAndGetExitStatus;
+    ts.noopFileWatcher = { close: ts.noop };
     function createWatchHost(system, reportWatchStatus) {
         if (system === void 0) { system = ts.sys; }
         var onWatchStatusChange = reportWatchStatus || createWatchStatusReporter(system);
         return {
             onWatchStatusChange: onWatchStatusChange,
-            watchFile: ts.maybeBind(system, system.watchFile) || (function () { return noopFileWatcher; }),
-            watchDirectory: ts.maybeBind(system, system.watchDirectory) || (function () { return noopFileWatcher; }),
+            watchFile: ts.maybeBind(system, system.watchFile) || (function () { return ts.noopFileWatcher; }),
+            watchDirectory: ts.maybeBind(system, system.watchDirectory) || (function () { return ts.noopFileWatcher; }),
             setTimeout: ts.maybeBind(system, system.setTimeout) || ts.noop,
             clearTimeout: ts.maybeBind(system, system.clearTimeout) || ts.noop
         };
@@ -92748,7 +95524,7 @@ var ts;
         }
     }
     ts.createCompilerHostFromProgramHost = createCompilerHostFromProgramHost;
-    function setCreateSourceFileAsHashVersioned(compilerHost, host) {
+    function setGetSourceFileAsHashVersioned(compilerHost, host) {
         var originalGetSourceFile = compilerHost.getSourceFile;
         var computeHash = host.createHash || ts.generateDjb2Hash;
         compilerHost.getSourceFile = function () {
@@ -92763,7 +95539,7 @@ var ts;
             return result;
         };
     }
-    ts.setCreateSourceFileAsHashVersioned = setCreateSourceFileAsHashVersioned;
+    ts.setGetSourceFileAsHashVersioned = setGetSourceFileAsHashVersioned;
     /**
      * Creates the watch compiler host that can be extended with config file or root file names and options host
      */
@@ -92838,13 +95614,25 @@ var ts;
         return host;
     }
     ts.createWatchCompilerHostOfFilesAndCompilerOptions = createWatchCompilerHostOfFilesAndCompilerOptions;
-    function readBuilderProgram(compilerOptions, readFile) {
+    function performIncrementalCompilation(input) {
+        var system = input.system || ts.sys;
+        var host = input.host || (input.host = ts.createIncrementalCompilerHost(input.options, system));
+        var builderProgram = ts.createIncrementalProgram(input);
+        var exitStatus = emitFilesAndReportErrorsAndGetExitStatus(builderProgram, input.reportDiagnostic || createDiagnosticReporter(system), function (s) { return host.trace && host.trace(s); }, input.reportErrorSummary || input.options.pretty ? function (errorCount) { return system.write(getErrorSummaryText(errorCount, system.newLine)); } : undefined);
+        if (input.afterProgramEmitAndDiagnostics)
+            input.afterProgramEmitAndDiagnostics(builderProgram);
+        return exitStatus;
+    }
+    ts.performIncrementalCompilation = performIncrementalCompilation;
+})(ts || (ts = {}));
+(function (ts) {
+    function readBuilderProgram(compilerOptions, host) {
         if (compilerOptions.out || compilerOptions.outFile)
             return undefined;
         var buildInfoPath = ts.getOutputPathForBuildInfo(compilerOptions);
         if (!buildInfoPath)
             return undefined;
-        var content = readFile(buildInfoPath);
+        var content = host.readFile(buildInfoPath);
         if (!content)
             return undefined;
         var buildInfo = ts.getBuildInfo(content);
@@ -92852,11 +95640,26 @@ var ts;
             return undefined;
         if (!buildInfo.program)
             return undefined;
-        return ts.createBuildProgramUsingProgramBuildInfo(buildInfo.program);
+        return ts.createBuildProgramUsingProgramBuildInfo(buildInfo.program, buildInfoPath, host);
     }
     ts.readBuilderProgram = readBuilderProgram;
-})(ts || (ts = {}));
-(function (ts) {
+    function createIncrementalCompilerHost(options, system) {
+        if (system === void 0) { system = ts.sys; }
+        var host = ts.createCompilerHostWorker(options, /*setParentNodes*/ undefined, system);
+        host.createHash = ts.maybeBind(system, system.createHash);
+        ts.setGetSourceFileAsHashVersioned(host, system);
+        ts.changeCompilerHostLikeToUseCache(host, function (fileName) { return ts.toPath(fileName, host.getCurrentDirectory(), host.getCanonicalFileName); });
+        return host;
+    }
+    ts.createIncrementalCompilerHost = createIncrementalCompilerHost;
+    function createIncrementalProgram(_a) {
+        var rootNames = _a.rootNames, options = _a.options, configFileParsingDiagnostics = _a.configFileParsingDiagnostics, projectReferences = _a.projectReferences, host = _a.host, createProgram = _a.createProgram;
+        host = host || createIncrementalCompilerHost(options);
+        createProgram = createProgram || ts.createEmitAndSemanticDiagnosticsBuilderProgram;
+        var oldProgram = readBuilderProgram(options, host);
+        return createProgram(rootNames, options, host, oldProgram, configFileParsingDiagnostics, projectReferences);
+    }
+    ts.createIncrementalProgram = createIncrementalProgram;
     function createWatchCompilerHost(rootFilesOrConfigFileName, options, system, createProgram, reportDiagnostic, reportWatchStatus, projectReferences) {
         if (ts.isArray(rootFilesOrConfigFileName)) {
             return ts.createWatchCompilerHostOfFilesAndCompilerOptions(rootFilesOrConfigFileName, options, system, createProgram, reportDiagnostic, reportWatchStatus, projectReferences); // TODO: GH#18217
@@ -92911,7 +95714,7 @@ var ts;
             configFileWatcher = watchFile(host, configFileName, scheduleProgramReload, ts.PollingInterval.High, "Config file" /* ConfigFile */);
         }
         var compilerHost = ts.createCompilerHostFromProgramHost(host, function () { return compilerOptions; }, directoryStructureHost);
-        ts.setCreateSourceFileAsHashVersioned(compilerHost, host);
+        ts.setGetSourceFileAsHashVersioned(compilerHost, host);
         // Members for CompilerHost
         var getNewSourceFile = compilerHost.getSourceFile;
         compilerHost.getSourceFile = function (fileName) {
@@ -92936,6 +95739,7 @@ var ts;
             hasChangedAutomaticTypeDirectiveNames = true;
             scheduleProgramUpdate();
         };
+        compilerHost.fileIsOpen = ts.returnFalse;
         compilerHost.maxNumberOfFilesToIterateForInvalidation = host.maxNumberOfFilesToIterateForInvalidation;
         compilerHost.getCurrentProgram = getCurrentProgram;
         compilerHost.writeLog = writeLog;
@@ -92952,7 +95756,7 @@ var ts;
             (function (typeDirectiveNames, containingFile, redirectedReference) { return host.resolveTypeReferenceDirectives(typeDirectiveNames, containingFile, redirectedReference); }) :
             (function (typeDirectiveNames, containingFile, redirectedReference) { return resolutionCache.resolveTypeReferenceDirectives(typeDirectiveNames, containingFile, redirectedReference); });
         var userProvidedResolution = !!host.resolveModuleNames || !!host.resolveTypeReferenceDirectives;
-        builderProgram = ts.readBuilderProgram(compilerOptions, function (path) { return compilerHost.readFile(path); });
+        builderProgram = readBuilderProgram(compilerOptions, compilerHost);
         synchronizeProgram();
         // Update the wild card directory watch
         watchConfigFileWildCardDirectories();
@@ -93283,31 +96087,9 @@ var ts;
     }
     ts.createWatchProgram = createWatchProgram;
 })(ts || (ts = {}));
-// Currently we do not want to expose API for build, we should work out the API, and then expose it just like we did for builder/watch
 /*@internal*/
 var ts;
 (function (ts) {
-    var minimumDate = new Date(-8640000000000000);
-    var maximumDate = new Date(8640000000000000);
-    var BuildResultFlags;
-    (function (BuildResultFlags) {
-        BuildResultFlags[BuildResultFlags["None"] = 0] = "None";
-        /**
-         * No errors of any kind occurred during build
-         */
-        BuildResultFlags[BuildResultFlags["Success"] = 1] = "Success";
-        /**
-         * None of the .d.ts files emitted by this build were
-         * different from the existing files on disk
-         */
-        BuildResultFlags[BuildResultFlags["DeclarationOutputUnchanged"] = 2] = "DeclarationOutputUnchanged";
-        BuildResultFlags[BuildResultFlags["ConfigFileErrors"] = 4] = "ConfigFileErrors";
-        BuildResultFlags[BuildResultFlags["SyntaxErrors"] = 8] = "SyntaxErrors";
-        BuildResultFlags[BuildResultFlags["TypeErrors"] = 16] = "TypeErrors";
-        BuildResultFlags[BuildResultFlags["DeclarationEmitErrors"] = 32] = "DeclarationEmitErrors";
-        BuildResultFlags[BuildResultFlags["EmitErrors"] = 64] = "EmitErrors";
-        BuildResultFlags[BuildResultFlags["AnyErrors"] = 124] = "AnyErrors";
-    })(BuildResultFlags || (BuildResultFlags = {}));
     var UpToDateStatusType;
     (function (UpToDateStatusType) {
         UpToDateStatusType[UpToDateStatusType["Unbuildable"] = 0] = "Unbuildable";
@@ -93336,101 +96118,51 @@ var ts;
          */
         UpToDateStatusType[UpToDateStatusType["ContainerOnly"] = 11] = "ContainerOnly";
     })(UpToDateStatusType = ts.UpToDateStatusType || (ts.UpToDateStatusType = {}));
-    function createFileMap(toPath) {
-        // tslint:disable-next-line:no-null-keyword
-        var lookup = ts.createMap();
-        return {
-            setValue: setValue,
-            getValue: getValue,
-            removeKey: removeKey,
-            forEach: forEach,
-            hasKey: hasKey,
-            getSize: getSize,
-            clear: clear
-        };
-        function forEach(action) {
-            lookup.forEach(action);
-        }
-        function hasKey(fileName) {
-            return lookup.has(toPath(fileName));
-        }
-        function removeKey(fileName) {
-            lookup.delete(toPath(fileName));
-        }
-        function setValue(fileName, value) {
-            lookup.set(toPath(fileName), value);
-        }
-        function getValue(fileName) {
-            return lookup.get(toPath(fileName));
-        }
-        function getSize() {
-            return lookup.size;
-        }
-        function clear() {
-            lookup.clear();
+    function resolveConfigFileProjectName(project) {
+        if (ts.fileExtensionIs(project, ".json" /* Json */)) {
+            return project;
         }
+        return ts.combinePaths(project, "tsconfig.json");
+    }
+    ts.resolveConfigFileProjectName = resolveConfigFileProjectName;
+})(ts || (ts = {}));
+(function (ts) {
+    var minimumDate = new Date(-8640000000000000);
+    var maximumDate = new Date(8640000000000000);
+    var BuildResultFlags;
+    (function (BuildResultFlags) {
+        BuildResultFlags[BuildResultFlags["None"] = 0] = "None";
+        /**
+         * No errors of any kind occurred during build
+         */
+        BuildResultFlags[BuildResultFlags["Success"] = 1] = "Success";
+        /**
+         * None of the .d.ts files emitted by this build were
+         * different from the existing files on disk
+         */
+        BuildResultFlags[BuildResultFlags["DeclarationOutputUnchanged"] = 2] = "DeclarationOutputUnchanged";
+        BuildResultFlags[BuildResultFlags["ConfigFileErrors"] = 4] = "ConfigFileErrors";
+        BuildResultFlags[BuildResultFlags["SyntaxErrors"] = 8] = "SyntaxErrors";
+        BuildResultFlags[BuildResultFlags["TypeErrors"] = 16] = "TypeErrors";
+        BuildResultFlags[BuildResultFlags["DeclarationEmitErrors"] = 32] = "DeclarationEmitErrors";
+        BuildResultFlags[BuildResultFlags["EmitErrors"] = 64] = "EmitErrors";
+        BuildResultFlags[BuildResultFlags["AnyErrors"] = 124] = "AnyErrors";
+    })(BuildResultFlags || (BuildResultFlags = {}));
+    function createConfigFileMap() {
+        return ts.createMap();
     }
     function getOrCreateValueFromConfigFileMap(configFileMap, resolved, createT) {
-        var existingValue = configFileMap.getValue(resolved);
+        var existingValue = configFileMap.get(resolved);
         var newValue;
         if (!existingValue) {
             newValue = createT();
-            configFileMap.setValue(resolved, newValue);
+            configFileMap.set(resolved, newValue);
         }
         return existingValue || newValue;
     }
     function getOrCreateValueMapFromConfigFileMap(configFileMap, resolved) {
         return getOrCreateValueFromConfigFileMap(configFileMap, resolved, ts.createMap);
     }
-    function getOutputDeclarationFileName(inputFileName, configFile) {
-        var relativePath = ts.getRelativePathFromDirectory(rootDirOfOptions(configFile.options, configFile.options.configFilePath), inputFileName, /*ignoreCase*/ true);
-        var outputPath = ts.resolvePath(configFile.options.declarationDir || configFile.options.outDir || ts.getDirectoryPath(configFile.options.configFilePath), relativePath);
-        return ts.changeExtension(outputPath, ".d.ts" /* Dts */);
-    }
-    ts.getOutputDeclarationFileName = getOutputDeclarationFileName;
-    function getOutputJSFileName(inputFileName, configFile) {
-        var relativePath = ts.getRelativePathFromDirectory(rootDirOfOptions(configFile.options, configFile.options.configFilePath), inputFileName, /*ignoreCase*/ true);
-        var outputPath = ts.resolvePath(configFile.options.outDir || ts.getDirectoryPath(configFile.options.configFilePath), relativePath);
-        var newExtension = ts.fileExtensionIs(inputFileName, ".json" /* Json */) ? ".json" /* Json */ :
-            ts.fileExtensionIs(inputFileName, ".tsx" /* Tsx */) && configFile.options.jsx === 1 /* Preserve */ ? ".jsx" /* Jsx */ : ".js" /* Js */;
-        return ts.changeExtension(outputPath, newExtension);
-    }
-    function getOutputFileNames(inputFileName, configFile) {
-        // outFile is handled elsewhere; .d.ts files don't generate outputs
-        if (configFile.options.outFile || configFile.options.out || ts.fileExtensionIs(inputFileName, ".d.ts" /* Dts */)) {
-            return ts.emptyArray;
-        }
-        var outputs = [];
-        var js = getOutputJSFileName(inputFileName, configFile);
-        outputs.push(js);
-        if (configFile.options.sourceMap) {
-            outputs.push(js + ".map");
-        }
-        if (ts.getEmitDeclarations(configFile.options) && !ts.fileExtensionIs(inputFileName, ".json" /* Json */)) {
-            var dts = getOutputDeclarationFileName(inputFileName, configFile);
-            outputs.push(dts);
-            if (configFile.options.declarationMap) {
-                outputs.push(dts + ".map");
-            }
-        }
-        return outputs;
-    }
-    function getOutFileOutputs(project, ignoreBuildInfo) {
-        ts.Debug.assert(!!project.options.outFile || !!project.options.out, "outFile must be set");
-        var _a = ts.getOutputPathsForBundle(project.options, /*forceDtsPaths*/ false), jsFilePath = _a.jsFilePath, sourceMapFilePath = _a.sourceMapFilePath, declarationFilePath = _a.declarationFilePath, declarationMapPath = _a.declarationMapPath, buildInfoPath = _a.buildInfoPath;
-        var outputs = [];
-        var addOutput = function (path) { return path && (outputs || (outputs = [])).push(path); };
-        addOutput(jsFilePath);
-        addOutput(sourceMapFilePath);
-        addOutput(declarationFilePath);
-        addOutput(declarationMapPath);
-        if (!ignoreBuildInfo)
-            addOutput(buildInfoPath);
-        return outputs || ts.emptyArray;
-    }
-    function rootDirOfOptions(opts, configFileName) {
-        return opts.rootDir || ts.getDirectoryPath(configFileName);
-    }
     function newer(date1, date2) {
         return date2 > date1 ? date2 : date1;
     }
@@ -93450,7 +96182,7 @@ var ts;
     ts.createBuilderStatusReporter = createBuilderStatusReporter;
     function createSolutionBuilderHostBase(system, createProgram, reportDiagnostic, reportSolutionBuilderStatus) {
         var host = ts.createProgramHost(system, createProgram);
-        host.getModifiedTime = system.getModifiedTime ? function (path) { return system.getModifiedTime(path); } : function () { return undefined; };
+        host.getModifiedTime = system.getModifiedTime ? function (path) { return system.getModifiedTime(path); } : ts.returnUndefined;
         host.setModifiedTime = system.setModifiedTime ? function (path, date) { return system.setModifiedTime(path, date); } : ts.noop;
         host.deleteFile = system.deleteFile ? function (path) { return system.deleteFile(path); } : ts.noop;
         host.reportDiagnostic = reportDiagnostic || ts.createDiagnosticReporter(system);
@@ -93475,644 +96207,459 @@ var ts;
     function getCompilerOptionsOfBuildOptions(buildOptions) {
         var result = {};
         ts.commonOptionsWithBuild.forEach(function (option) {
-            result[option.name] = buildOptions[option.name];
+            if (ts.hasProperty(buildOptions, option.name))
+                result[option.name] = buildOptions[option.name];
         });
         return result;
     }
     function createSolutionBuilder(host, rootNames, defaultOptions) {
-        var hostWithWatch = host;
+        return createSolutionBuilderWorker(/*watch*/ false, host, rootNames, defaultOptions);
+    }
+    ts.createSolutionBuilder = createSolutionBuilder;
+    function createSolutionBuilderWithWatch(host, rootNames, defaultOptions) {
+        return createSolutionBuilderWorker(/*watch*/ true, host, rootNames, defaultOptions);
+    }
+    ts.createSolutionBuilderWithWatch = createSolutionBuilderWithWatch;
+    function createSolutionBuilderState(watch, hostOrHostWithWatch, rootNames, options) {
+        var host = hostOrHostWithWatch;
+        var hostWithWatch = hostOrHostWithWatch;
         var currentDirectory = host.getCurrentDirectory();
         var getCanonicalFileName = ts.createGetCanonicalFileName(host.useCaseSensitiveFileNames());
-        var parseConfigFileHost = ts.parseConfigHostFromCompilerHostLike(host);
         // State of the solution
-        var options = defaultOptions;
         var baseCompilerOptions = getCompilerOptionsOfBuildOptions(options);
-        var configFileCache = createFileMap(toPath);
-        /** Map from output file name to its pre-build timestamp */
-        var unchangedOutputs = createFileMap(toPath);
-        /** Map from config file name to up-to-date status */
-        var projectStatus = createFileMap(toPath);
-        var missingRoots = ts.createMap();
-        var globalDependencyGraph;
-        var writeFileName = function (s) { return host.trace && host.trace(s); };
-        var readFileWithCache = function (f) { return host.readFile(f); };
-        var projectCompilerOptions = baseCompilerOptions;
-        var compilerHost = ts.createCompilerHostFromProgramHost(host, function () { return projectCompilerOptions; });
-        ts.setCreateSourceFileAsHashVersioned(compilerHost, host);
-        var buildInfoChecked = createFileMap(toPath);
-        // Watch state
-        var builderPrograms = createFileMap(toPath);
-        var diagnostics = createFileMap(toPath);
-        var projectPendingBuild = createFileMap(toPath);
-        var projectErrorsReported = createFileMap(toPath);
-        var invalidatedProjectQueue = [];
-        var nextProjectToBuild = 0;
-        var timerToBuildInvalidatedProject;
-        var reportFileChangeDetected = false;
-        var _a = ts.createWatchFactory(host, options), watchFile = _a.watchFile, watchFilePath = _a.watchFilePath, watchDirectory = _a.watchDirectory, writeLog = _a.writeLog;
-        // Watches for the solution
-        var allWatchedWildcardDirectories = createFileMap(toPath);
-        var allWatchedInputFiles = createFileMap(toPath);
-        var allWatchedConfigFiles = createFileMap(toPath);
-        return {
-            buildAllProjects: buildAllProjects,
-            getUpToDateStatusOfFile: getUpToDateStatusOfFile,
-            cleanAllProjects: cleanAllProjects,
-            resetBuildContext: resetBuildContext,
-            getBuildGraph: getBuildGraph,
-            invalidateProject: invalidateProject,
-            buildInvalidatedProject: buildInvalidatedProject,
-            resolveProjectName: resolveProjectName,
-            startWatching: startWatching
+        var compilerHost = ts.createCompilerHostFromProgramHost(host, function () { return state.projectCompilerOptions; });
+        ts.setGetSourceFileAsHashVersioned(compilerHost, host);
+        compilerHost.getParsedCommandLine = function (fileName) { return parseConfigFile(state, fileName, toResolvedConfigFilePath(state, fileName)); };
+        compilerHost.resolveModuleNames = ts.maybeBind(host, host.resolveModuleNames);
+        compilerHost.resolveTypeReferenceDirectives = ts.maybeBind(host, host.resolveTypeReferenceDirectives);
+        var moduleResolutionCache = !compilerHost.resolveModuleNames ? ts.createModuleResolutionCache(currentDirectory, getCanonicalFileName) : undefined;
+        if (!compilerHost.resolveModuleNames) {
+            var loader_3 = function (moduleName, containingFile, redirectedReference) { return ts.resolveModuleName(moduleName, containingFile, state.projectCompilerOptions, compilerHost, moduleResolutionCache, redirectedReference).resolvedModule; };
+            compilerHost.resolveModuleNames = function (moduleNames, containingFile, _reusedNames, redirectedReference) {
+                return ts.loadWithLocalCache(ts.Debug.assertEachDefined(moduleNames), containingFile, redirectedReference, loader_3);
+            };
+        }
+        var _a = ts.createWatchFactory(hostWithWatch, options), watchFile = _a.watchFile, watchFilePath = _a.watchFilePath, watchDirectory = _a.watchDirectory, writeLog = _a.writeLog;
+        var state = {
+            host: host,
+            hostWithWatch: hostWithWatch,
+            currentDirectory: currentDirectory,
+            getCanonicalFileName: getCanonicalFileName,
+            parseConfigFileHost: ts.parseConfigHostFromCompilerHostLike(host),
+            writeFileName: host.trace ? function (s) { return host.trace(s); } : undefined,
+            // State of solution
+            options: options,
+            baseCompilerOptions: baseCompilerOptions,
+            rootNames: rootNames,
+            resolvedConfigFilePaths: ts.createMap(),
+            configFileCache: createConfigFileMap(),
+            projectStatus: createConfigFileMap(),
+            buildInfoChecked: createConfigFileMap(),
+            extendedConfigCache: ts.createMap(),
+            builderPrograms: createConfigFileMap(),
+            diagnostics: createConfigFileMap(),
+            projectPendingBuild: createConfigFileMap(),
+            projectErrorsReported: createConfigFileMap(),
+            compilerHost: compilerHost,
+            moduleResolutionCache: moduleResolutionCache,
+            // Mutable state
+            buildOrder: undefined,
+            readFileWithCache: function (f) { return host.readFile(f); },
+            projectCompilerOptions: baseCompilerOptions,
+            cache: undefined,
+            allProjectBuildPending: true,
+            needsSummary: true,
+            watchAllProjectsPending: watch,
+            currentInvalidatedProject: undefined,
+            // Watch state
+            watch: watch,
+            allWatchedWildcardDirectories: createConfigFileMap(),
+            allWatchedInputFiles: createConfigFileMap(),
+            allWatchedConfigFiles: createConfigFileMap(),
+            timerToBuildInvalidatedProject: undefined,
+            reportFileChangeDetected: false,
+            watchFile: watchFile,
+            watchFilePath: watchFilePath,
+            watchDirectory: watchDirectory,
+            writeLog: writeLog,
         };
-        function toPath(fileName) {
-            return ts.toPath(fileName, currentDirectory, getCanonicalFileName);
+        return state;
+    }
+    function toPath(state, fileName) {
+        return ts.toPath(fileName, state.currentDirectory, state.getCanonicalFileName);
+    }
+    function toResolvedConfigFilePath(state, fileName) {
+        var resolvedConfigFilePaths = state.resolvedConfigFilePaths;
+        var path = resolvedConfigFilePaths.get(fileName);
+        if (path !== undefined)
+            return path;
+        var resolvedPath = toPath(state, fileName);
+        resolvedConfigFilePaths.set(fileName, resolvedPath);
+        return resolvedPath;
+    }
+    function isParsedCommandLine(entry) {
+        return !!entry.options;
+    }
+    function parseConfigFile(state, configFileName, configFilePath) {
+        var configFileCache = state.configFileCache;
+        var value = configFileCache.get(configFilePath);
+        if (value) {
+            return isParsedCommandLine(value) ? value : undefined;
         }
-        function resetBuildContext(opts) {
-            if (opts === void 0) { opts = defaultOptions; }
-            options = opts;
-            baseCompilerOptions = getCompilerOptionsOfBuildOptions(options);
-            configFileCache.clear();
-            unchangedOutputs.clear();
-            projectStatus.clear();
-            missingRoots.clear();
-            globalDependencyGraph = undefined;
-            buildInfoChecked.clear();
-            diagnostics.clear();
-            projectPendingBuild.clear();
-            projectErrorsReported.clear();
-            invalidatedProjectQueue.length = 0;
-            nextProjectToBuild = 0;
-            if (timerToBuildInvalidatedProject) {
-                clearTimeout(timerToBuildInvalidatedProject);
-                timerToBuildInvalidatedProject = undefined;
-            }
-            reportFileChangeDetected = false;
-            ts.clearMap(allWatchedWildcardDirectories, function (wildCardWatches) { return ts.clearMap(wildCardWatches, ts.closeFileWatcherOf); });
-            ts.clearMap(allWatchedInputFiles, function (inputFileWatches) { return ts.clearMap(inputFileWatches, ts.closeFileWatcher); });
-            ts.clearMap(allWatchedConfigFiles, ts.closeFileWatcher);
-            builderPrograms.clear();
+        var diagnostic;
+        var parseConfigFileHost = state.parseConfigFileHost, baseCompilerOptions = state.baseCompilerOptions, extendedConfigCache = state.extendedConfigCache, host = state.host;
+        var parsed;
+        if (host.getParsedCommandLine) {
+            parsed = host.getParsedCommandLine(configFileName);
+            if (!parsed)
+                diagnostic = ts.createCompilerDiagnostic(ts.Diagnostics.File_0_not_found, configFileName);
         }
-        function isParsedCommandLine(entry) {
-            return !!entry.options;
-        }
-        function parseConfigFile(configFilePath) {
-            var value = configFileCache.getValue(configFilePath);
-            if (value) {
-                return isParsedCommandLine(value) ? value : undefined;
-            }
-            var diagnostic;
+        else {
             parseConfigFileHost.onUnRecoverableConfigFileDiagnostic = function (d) { return diagnostic = d; };
-            var parsed = ts.getParsedCommandLineOfConfigFile(configFilePath, baseCompilerOptions, parseConfigFileHost);
+            parsed = ts.getParsedCommandLineOfConfigFile(configFileName, baseCompilerOptions, parseConfigFileHost, extendedConfigCache);
             parseConfigFileHost.onUnRecoverableConfigFileDiagnostic = ts.noop;
-            configFileCache.setValue(configFilePath, parsed || diagnostic);
-            return parsed;
         }
-        function reportStatus(message) {
+        configFileCache.set(configFilePath, parsed || diagnostic);
+        return parsed;
+    }
+    function resolveProjectName(state, name) {
+        return ts.resolveConfigFileProjectName(ts.resolvePath(state.currentDirectory, name));
+    }
+    function createBuildOrder(state, roots) {
+        var temporaryMarks = ts.createMap();
+        var permanentMarks = ts.createMap();
+        var circularityReportStack = [];
+        var buildOrder;
+        for (var _i = 0, roots_1 = roots; _i < roots_1.length; _i++) {
+            var root = roots_1[_i];
+            visit(root);
+        }
+        return buildOrder || ts.emptyArray;
+        function visit(configFileName, inCircularContext) {
+            var projPath = toResolvedConfigFilePath(state, configFileName);
+            // Already visited
+            if (permanentMarks.has(projPath))
+                return;
+            // Circular
+            if (temporaryMarks.has(projPath)) {
+                if (!inCircularContext) {
+                    // TODO:: Do we report this as error?
+                    reportStatus(state, ts.Diagnostics.Project_references_may_not_form_a_circular_graph_Cycle_detected_Colon_0, circularityReportStack.join("\r\n"));
+                }
+                return;
+            }
+            temporaryMarks.set(projPath, true);
+            circularityReportStack.push(configFileName);
+            var parsed = parseConfigFile(state, configFileName, projPath);
+            if (parsed && parsed.projectReferences) {
+                for (var _i = 0, _a = parsed.projectReferences; _i < _a.length; _i++) {
+                    var ref = _a[_i];
+                    var resolvedRefPath = resolveProjectName(state, ref.path);
+                    visit(resolvedRefPath, inCircularContext || ref.circular);
+                }
+            }
+            circularityReportStack.pop();
+            permanentMarks.set(projPath, true);
+            (buildOrder || (buildOrder = [])).push(configFileName);
+        }
+    }
+    function getBuildOrder(state) {
+        return state.buildOrder ||
+            (state.buildOrder = createBuildOrder(state, state.rootNames.map(function (f) { return resolveProjectName(state, f); })));
+    }
+    function getBuildOrderFor(state, project, onlyReferences) {
+        var resolvedProject = project && resolveProjectName(state, project);
+        var buildOrderFromState = getBuildOrder(state);
+        if (resolvedProject) {
+            var projectPath_1 = toResolvedConfigFilePath(state, resolvedProject);
+            var projectIndex = ts.findIndex(buildOrderFromState, function (configFileName) { return toResolvedConfigFilePath(state, configFileName) === projectPath_1; });
+            if (projectIndex === -1)
+                return undefined;
+        }
+        var buildOrder = resolvedProject ? createBuildOrder(state, [resolvedProject]) : buildOrderFromState;
+        ts.Debug.assert(!onlyReferences || resolvedProject !== undefined);
+        ts.Debug.assert(!onlyReferences || buildOrder[buildOrder.length - 1] === resolvedProject);
+        return onlyReferences ? buildOrder.slice(0, buildOrder.length - 1) : buildOrder;
+    }
+    function enableCache(state) {
+        if (state.cache) {
+            disableCache(state);
+        }
+        var compilerHost = state.compilerHost, host = state.host;
+        var originalReadFileWithCache = state.readFileWithCache;
+        var originalGetSourceFile = compilerHost.getSourceFile;
+        var _a = ts.changeCompilerHostLikeToUseCache(host, function (fileName) { return toPath(state, fileName); }, function () {
             var args = [];
-            for (var _i = 1; _i < arguments.length; _i++) {
-                args[_i - 1] = arguments[_i];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                args[_i] = arguments[_i];
             }
-            host.reportSolutionBuilderStatus(ts.createCompilerDiagnostic.apply(void 0, [message].concat(args)));
+            return originalGetSourceFile.call.apply(originalGetSourceFile, [compilerHost].concat(args));
+        }), originalReadFile = _a.originalReadFile, originalFileExists = _a.originalFileExists, originalDirectoryExists = _a.originalDirectoryExists, originalCreateDirectory = _a.originalCreateDirectory, originalWriteFile = _a.originalWriteFile, getSourceFileWithCache = _a.getSourceFileWithCache, readFileWithCache = _a.readFileWithCache;
+        state.readFileWithCache = readFileWithCache;
+        compilerHost.getSourceFile = getSourceFileWithCache;
+        state.cache = {
+            originalReadFile: originalReadFile,
+            originalFileExists: originalFileExists,
+            originalDirectoryExists: originalDirectoryExists,
+            originalCreateDirectory: originalCreateDirectory,
+            originalWriteFile: originalWriteFile,
+            originalReadFileWithCache: originalReadFileWithCache,
+            originalGetSourceFile: originalGetSourceFile,
+        };
+    }
+    function disableCache(state) {
+        if (!state.cache)
+            return;
+        var cache = state.cache, host = state.host, compilerHost = state.compilerHost, extendedConfigCache = state.extendedConfigCache, moduleResolutionCache = state.moduleResolutionCache;
+        host.readFile = cache.originalReadFile;
+        host.fileExists = cache.originalFileExists;
+        host.directoryExists = cache.originalDirectoryExists;
+        host.createDirectory = cache.originalCreateDirectory;
+        host.writeFile = cache.originalWriteFile;
+        compilerHost.getSourceFile = cache.originalGetSourceFile;
+        state.readFileWithCache = cache.originalReadFileWithCache;
+        extendedConfigCache.clear();
+        if (moduleResolutionCache) {
+            moduleResolutionCache.directoryToModuleNameMap.clear();
+            moduleResolutionCache.moduleNameToDirectoryMap.clear();
         }
-        function reportWatchStatus(message) {
-            var args = [];
-            for (var _i = 1; _i < arguments.length; _i++) {
-                args[_i - 1] = arguments[_i];
-            }
-            if (hostWithWatch.onWatchStatusChange) {
-                hostWithWatch.onWatchStatusChange(ts.createCompilerDiagnostic.apply(void 0, [message].concat(args)), host.getNewLine(), baseCompilerOptions);
-            }
+        state.cache = undefined;
+    }
+    function clearProjectStatus(state, resolved) {
+        state.projectStatus.delete(resolved);
+        state.diagnostics.delete(resolved);
+    }
+    function addProjToQueue(_a, proj, reloadLevel) {
+        var projectPendingBuild = _a.projectPendingBuild;
+        var value = projectPendingBuild.get(proj);
+        if (value === undefined) {
+            projectPendingBuild.set(proj, reloadLevel);
         }
-        function startWatching() {
-            var graph = getGlobalDependencyGraph();
-            for (var _i = 0, _a = graph.buildQueue; _i < _a.length; _i++) {
-                var resolved = _a[_i];
-                // Watch this file
-                watchConfigFile(resolved);
-                var cfg = parseConfigFile(resolved);
-                if (cfg) {
-                    // Update watchers for wildcard directories
-                    watchWildCardDirectories(resolved, cfg);
-                    // Watch input files
-                    watchInputFiles(resolved, cfg);
+        else if (value < reloadLevel) {
+            projectPendingBuild.set(proj, reloadLevel);
+        }
+    }
+    function setupInitialBuild(state, cancellationToken) {
+        // Set initial build if not already built
+        if (!state.allProjectBuildPending)
+            return;
+        state.allProjectBuildPending = false;
+        if (state.options.watch) {
+            reportWatchStatus(state, ts.Diagnostics.Starting_compilation_in_watch_mode);
+        }
+        enableCache(state);
+        var buildOrder = getBuildOrder(state);
+        buildOrder.forEach(function (configFileName) {
+            return state.projectPendingBuild.set(toResolvedConfigFilePath(state, configFileName), ts.ConfigFileProgramReloadLevel.None);
+        });
+        if (cancellationToken) {
+            cancellationToken.throwIfCancellationRequested();
+        }
+    }
+    var InvalidatedProjectKind;
+    (function (InvalidatedProjectKind) {
+        InvalidatedProjectKind[InvalidatedProjectKind["Build"] = 0] = "Build";
+        InvalidatedProjectKind[InvalidatedProjectKind["UpdateBundle"] = 1] = "UpdateBundle";
+        InvalidatedProjectKind[InvalidatedProjectKind["UpdateOutputFileStamps"] = 2] = "UpdateOutputFileStamps";
+    })(InvalidatedProjectKind = ts.InvalidatedProjectKind || (ts.InvalidatedProjectKind = {}));
+    function doneInvalidatedProject(state, projectPath) {
+        state.projectPendingBuild.delete(projectPath);
+        state.currentInvalidatedProject = undefined;
+        return state.diagnostics.has(projectPath) ?
+            ts.ExitStatus.DiagnosticsPresent_OutputsSkipped :
+            ts.ExitStatus.Success;
+    }
+    function createUpdateOutputFileStampsProject(state, project, projectPath, config, buildOrder) {
+        var updateOutputFileStampsPending = true;
+        return {
+            kind: InvalidatedProjectKind.UpdateOutputFileStamps,
+            project: project,
+            projectPath: projectPath,
+            buildOrder: buildOrder,
+            getCompilerOptions: function () { return config.options; },
+            getCurrentDirectory: function () { return state.currentDirectory; },
+            updateOutputFileStatmps: function () {
+                updateOutputTimestamps(state, config, projectPath);
+                updateOutputFileStampsPending = false;
+            },
+            done: function () {
+                if (updateOutputFileStampsPending) {
+                    updateOutputTimestamps(state, config, projectPath);
                 }
+                return doneInvalidatedProject(state, projectPath);
             }
-        }
-        function watchConfigFile(resolved) {
-            if (options.watch && !allWatchedConfigFiles.hasKey(resolved)) {
-                allWatchedConfigFiles.setValue(resolved, watchFile(hostWithWatch, resolved, function () {
-                    invalidateProjectAndScheduleBuilds(resolved, ts.ConfigFileProgramReloadLevel.Full);
-                }, ts.PollingInterval.High, "Config file" /* ConfigFile */, resolved));
-            }
-        }
-        function watchWildCardDirectories(resolved, parsed) {
-            if (!options.watch)
-                return;
-            ts.updateWatchingWildcardDirectories(getOrCreateValueMapFromConfigFileMap(allWatchedWildcardDirectories, resolved), ts.createMapFromTemplate(parsed.configFileSpecs.wildcardDirectories), function (dir, flags) {
-                return watchDirectory(hostWithWatch, dir, function (fileOrDirectory) {
-                    var fileOrDirectoryPath = toPath(fileOrDirectory);
-                    if (fileOrDirectoryPath !== toPath(dir) && ts.hasExtension(fileOrDirectoryPath) && !ts.isSupportedSourceFileName(fileOrDirectory, parsed.options)) {
-                        writeLog("Project: " + resolved + " Detected file add/remove of non supported extension: " + fileOrDirectory);
-                        return;
+        };
+    }
+    function createBuildOrUpdateInvalidedProject(kind, state, project, projectPath, projectIndex, config, buildOrder) {
+        var Step;
+        (function (Step) {
+            Step[Step["CreateProgram"] = 0] = "CreateProgram";
+            Step[Step["SyntaxDiagnostics"] = 1] = "SyntaxDiagnostics";
+            Step[Step["SemanticDiagnostics"] = 2] = "SemanticDiagnostics";
+            Step[Step["Emit"] = 3] = "Emit";
+            Step[Step["EmitBundle"] = 4] = "EmitBundle";
+            Step[Step["BuildInvalidatedProjectOfBundle"] = 5] = "BuildInvalidatedProjectOfBundle";
+            Step[Step["QueueReferencingProjects"] = 6] = "QueueReferencingProjects";
+            Step[Step["Done"] = 7] = "Done";
+        })(Step || (Step = {}));
+        var step = kind === InvalidatedProjectKind.Build ? Step.CreateProgram : Step.EmitBundle;
+        var program;
+        var buildResult;
+        var invalidatedProjectOfBundle;
+        return kind === InvalidatedProjectKind.Build ?
+            {
+                kind: kind,
+                project: project,
+                projectPath: projectPath,
+                buildOrder: buildOrder,
+                getCompilerOptions: function () { return config.options; },
+                getCurrentDirectory: function () { return state.currentDirectory; },
+                getBuilderProgram: function () { return withProgramOrUndefined(ts.identity); },
+                getProgram: function () {
+                    return withProgramOrUndefined(function (program) { return program.getProgramOrUndefined(); });
+                },
+                getSourceFile: function (fileName) {
+                    return withProgramOrUndefined(function (program) { return program.getSourceFile(fileName); });
+                },
+                getSourceFiles: function () {
+                    return withProgramOrEmptyArray(function (program) { return program.getSourceFiles(); });
+                },
+                getOptionsDiagnostics: function (cancellationToken) {
+                    return withProgramOrEmptyArray(function (program) { return program.getOptionsDiagnostics(cancellationToken); });
+                },
+                getGlobalDiagnostics: function (cancellationToken) {
+                    return withProgramOrEmptyArray(function (program) { return program.getGlobalDiagnostics(cancellationToken); });
+                },
+                getConfigFileParsingDiagnostics: function () {
+                    return withProgramOrEmptyArray(function (program) { return program.getConfigFileParsingDiagnostics(); });
+                },
+                getSyntacticDiagnostics: function (sourceFile, cancellationToken) {
+                    return withProgramOrEmptyArray(function (program) { return program.getSyntacticDiagnostics(sourceFile, cancellationToken); });
+                },
+                getAllDependencies: function (sourceFile) {
+                    return withProgramOrEmptyArray(function (program) { return program.getAllDependencies(sourceFile); });
+                },
+                getSemanticDiagnostics: function (sourceFile, cancellationToken) {
+                    return withProgramOrEmptyArray(function (program) { return program.getSemanticDiagnostics(sourceFile, cancellationToken); });
+                },
+                getSemanticDiagnosticsOfNextAffectedFile: function (cancellationToken, ignoreSourceFile) {
+                    return withProgramOrUndefined(function (program) {
+                        return (program.getSemanticDiagnosticsOfNextAffectedFile) &&
+                            program.getSemanticDiagnosticsOfNextAffectedFile(cancellationToken, ignoreSourceFile);
+                    });
+                },
+                emit: function (targetSourceFile, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers) {
+                    if (targetSourceFile || emitOnlyDtsFiles) {
+                        return withProgramOrUndefined(function (program) { return program.emit(targetSourceFile, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers); });
                     }
-                    if (isOutputFile(fileOrDirectory, parsed)) {
-                        writeLog(fileOrDirectory + " is output file");
-                        return;
-                    }
-                    invalidateProjectAndScheduleBuilds(resolved, ts.ConfigFileProgramReloadLevel.Partial);
-                }, flags, "Wild card directory" /* WildcardDirectory */, resolved);
-            });
-        }
-        function watchInputFiles(resolved, parsed) {
-            if (!options.watch)
-                return;
-            ts.mutateMap(getOrCreateValueMapFromConfigFileMap(allWatchedInputFiles, resolved), ts.arrayToMap(parsed.fileNames, toPath), {
-                createNewValue: function (path, input) { return watchFilePath(hostWithWatch, input, function () { return invalidateProjectAndScheduleBuilds(resolved, ts.ConfigFileProgramReloadLevel.None); }, ts.PollingInterval.Low, path, "Source file" /* SourceFile */, resolved); },
-                onDeleteValue: ts.closeFileWatcher,
-            });
-        }
-        function isOutputFile(fileName, configFile) {
-            if (configFile.options.noEmit)
-                return false;
-            // ts or tsx files are not output
-            if (!ts.fileExtensionIs(fileName, ".d.ts" /* Dts */) &&
-                (ts.fileExtensionIs(fileName, ".ts" /* Ts */) || ts.fileExtensionIs(fileName, ".tsx" /* Tsx */))) {
-                return false;
-            }
-            // If options have --outFile or --out, check if its that
-            var out = configFile.options.outFile || configFile.options.out;
-            if (out && (isSameFile(fileName, out) || isSameFile(fileName, ts.removeFileExtension(out) + ".d.ts" /* Dts */))) {
-                return true;
-            }
-            // If declarationDir is specified, return if its a file in that directory
-            if (configFile.options.declarationDir && ts.containsPath(configFile.options.declarationDir, fileName, currentDirectory, !host.useCaseSensitiveFileNames())) {
-                return true;
-            }
-            // If --outDir, check if file is in that directory
-            if (configFile.options.outDir && ts.containsPath(configFile.options.outDir, fileName, currentDirectory, !host.useCaseSensitiveFileNames())) {
-                return true;
-            }
-            return !ts.forEach(configFile.fileNames, function (inputFile) { return isSameFile(fileName, inputFile); });
-        }
-        function isSameFile(file1, file2) {
-            return ts.comparePaths(file1, file2, currentDirectory, !host.useCaseSensitiveFileNames()) === 0 /* EqualTo */;
-        }
-        function invalidateProjectAndScheduleBuilds(resolved, reloadLevel) {
-            reportFileChangeDetected = true;
-            invalidateResolvedProject(resolved, reloadLevel);
-            scheduleBuildInvalidatedProject();
-        }
-        function getUpToDateStatusOfFile(configFileName) {
-            return getUpToDateStatus(parseConfigFile(configFileName));
-        }
-        function getBuildGraph(configFileNames) {
-            return createDependencyGraph(resolveProjectNames(configFileNames));
-        }
-        function getGlobalDependencyGraph() {
-            return globalDependencyGraph || (globalDependencyGraph = getBuildGraph(rootNames));
-        }
-        function getUpToDateStatus(project) {
-            if (project === undefined) {
-                return { type: UpToDateStatusType.Unbuildable, reason: "File deleted mid-build" };
-            }
-            var prior = projectStatus.getValue(project.options.configFilePath);
-            if (prior !== undefined) {
-                return prior;
-            }
-            var actual = getUpToDateStatusWorker(project);
-            projectStatus.setValue(project.options.configFilePath, actual);
-            return actual;
-        }
-        function getUpToDateStatusWorker(project) {
-            var newestInputFileName = undefined;
-            var newestInputFileTime = minimumDate;
-            // Get timestamps of input files
-            for (var _i = 0, _a = project.fileNames; _i < _a.length; _i++) {
-                var inputFile = _a[_i];
-                if (!host.fileExists(inputFile)) {
-                    return {
-                        type: UpToDateStatusType.Unbuildable,
-                        reason: inputFile + " does not exist"
-                    };
-                }
-                var inputTime = host.getModifiedTime(inputFile) || ts.missingFileModifiedTime;
-                if (inputTime > newestInputFileTime) {
-                    newestInputFileName = inputFile;
-                    newestInputFileTime = inputTime;
-                }
-            }
-            // Collect the expected outputs of this project
-            var outputs = getAllProjectOutputs(project);
-            if (outputs.length === 0) {
-                return {
-                    type: UpToDateStatusType.ContainerOnly
-                };
-            }
-            // Now see if all outputs are newer than the newest input
-            var oldestOutputFileName = "(none)";
-            var oldestOutputFileTime = maximumDate;
-            var newestOutputFileName = "(none)";
-            var newestOutputFileTime = minimumDate;
-            var missingOutputFileName;
-            var newestDeclarationFileContentChangedTime = minimumDate;
-            var isOutOfDateWithInputs = false;
-            for (var _b = 0, outputs_1 = outputs; _b < outputs_1.length; _b++) {
-                var output = outputs_1[_b];
-                // Output is missing; can stop checking
-                // Don't immediately return because we can still be upstream-blocked, which is a higher-priority status
-                if (!host.fileExists(output)) {
-                    missingOutputFileName = output;
-                    break;
-                }
-                var outputTime = host.getModifiedTime(output) || ts.missingFileModifiedTime;
-                if (outputTime < oldestOutputFileTime) {
-                    oldestOutputFileTime = outputTime;
-                    oldestOutputFileName = output;
-                }
-                // If an output is older than the newest input, we can stop checking
-                // Don't immediately return because we can still be upstream-blocked, which is a higher-priority status
-                if (outputTime < newestInputFileTime) {
-                    isOutOfDateWithInputs = true;
-                    break;
-                }
-                if (outputTime > newestOutputFileTime) {
-                    newestOutputFileTime = outputTime;
-                    newestOutputFileName = output;
-                }
-                // Keep track of when the most recent time a .d.ts file was changed.
-                // In addition to file timestamps, we also keep track of when a .d.ts file
-                // had its file touched but not had its contents changed - this allows us
-                // to skip a downstream typecheck
-                if (isDeclarationFile(output)) {
-                    var unchangedTime = unchangedOutputs.getValue(output);
-                    if (unchangedTime !== undefined) {
-                        newestDeclarationFileContentChangedTime = newer(unchangedTime, newestDeclarationFileContentChangedTime);
-                    }
-                    else {
-                        var outputModifiedTime = host.getModifiedTime(output) || ts.missingFileModifiedTime;
-                        newestDeclarationFileContentChangedTime = newer(newestDeclarationFileContentChangedTime, outputModifiedTime);
-                    }
-                }
-            }
-            var pseudoUpToDate = false;
-            var usesPrepend = false;
-            var upstreamChangedProject;
-            if (project.projectReferences) {
-                projectStatus.setValue(project.options.configFilePath, { type: UpToDateStatusType.ComputingUpstream });
-                for (var _c = 0, _d = project.projectReferences; _c < _d.length; _c++) {
-                    var ref = _d[_c];
-                    usesPrepend = usesPrepend || !!(ref.prepend);
-                    var resolvedRef = ts.resolveProjectReferencePath(ref);
-                    var refStatus = getUpToDateStatus(parseConfigFile(resolvedRef));
-                    // Its a circular reference ignore the status of this project
-                    if (refStatus.type === UpToDateStatusType.ComputingUpstream) {
-                        continue;
-                    }
-                    // An upstream project is blocked
-                    if (refStatus.type === UpToDateStatusType.Unbuildable) {
-                        return {
-                            type: UpToDateStatusType.UpstreamBlocked,
-                            upstreamProjectName: ref.path
-                        };
-                    }
-                    // If the upstream project is out of date, then so are we (someone shouldn't have asked, though?)
-                    if (refStatus.type !== UpToDateStatusType.UpToDate) {
-                        return {
-                            type: UpToDateStatusType.UpstreamOutOfDate,
-                            upstreamProjectName: ref.path
-                        };
-                    }
-                    // Check oldest output file name only if there is no missing output file name
-                    if (!missingOutputFileName) {
-                        // If the upstream project's newest file is older than our oldest output, we
-                        // can't be out of date because of it
-                        if (refStatus.newestInputFileTime && refStatus.newestInputFileTime <= oldestOutputFileTime) {
-                            continue;
-                        }
-                        // If the upstream project has only change .d.ts files, and we've built
-                        // *after* those files, then we're "psuedo up to date" and eligible for a fast rebuild
-                        if (refStatus.newestDeclarationFileContentChangedTime && refStatus.newestDeclarationFileContentChangedTime <= oldestOutputFileTime) {
-                            pseudoUpToDate = true;
-                            upstreamChangedProject = ref.path;
-                            continue;
-                        }
-                        // We have an output older than an upstream output - we are out of date
-                        ts.Debug.assert(oldestOutputFileName !== undefined, "Should have an oldest output filename here");
-                        return {
-                            type: UpToDateStatusType.OutOfDateWithUpstream,
-                            outOfDateOutputFileName: oldestOutputFileName,
-                            newerProjectName: ref.path
-                        };
-                    }
-                }
-            }
-            if (missingOutputFileName !== undefined) {
-                return {
-                    type: UpToDateStatusType.OutputMissing,
-                    missingOutputFileName: missingOutputFileName
-                };
-            }
-            if (isOutOfDateWithInputs) {
-                return {
-                    type: UpToDateStatusType.OutOfDateWithSelf,
-                    outOfDateOutputFileName: oldestOutputFileName,
-                    newerInputFileName: newestInputFileName
-                };
-            }
-            if (!buildInfoChecked.hasKey(project.options.configFilePath)) {
-                buildInfoChecked.setValue(project.options.configFilePath, true);
-                var buildInfoPath = ts.getOutputPathForBuildInfo(project.options);
-                if (buildInfoPath) {
-                    var value = readFileWithCache(buildInfoPath);
-                    var buildInfo = value && ts.getBuildInfo(value);
-                    if (buildInfo && buildInfo.version !== ts.version) {
-                        return {
-                            type: UpToDateStatusType.TsVersionOutputOfDate,
-                            version: buildInfo.version
-                        };
-                    }
-                }
-            }
-            if (usesPrepend && pseudoUpToDate) {
-                return {
-                    type: UpToDateStatusType.OutOfDateWithPrepend,
-                    outOfDateOutputFileName: oldestOutputFileName,
-                    newerProjectName: upstreamChangedProject
-                };
-            }
-            // Up to date
-            return {
-                type: pseudoUpToDate ? UpToDateStatusType.UpToDateWithUpstreamTypes : UpToDateStatusType.UpToDate,
-                newestDeclarationFileContentChangedTime: newestDeclarationFileContentChangedTime,
-                newestInputFileTime: newestInputFileTime,
-                newestOutputFileTime: newestOutputFileTime,
-                newestInputFileName: newestInputFileName,
-                newestOutputFileName: newestOutputFileName,
-                oldestOutputFileName: oldestOutputFileName
+                    executeSteps(Step.SemanticDiagnostics, cancellationToken);
+                    if (step !== Step.Emit)
+                        return undefined;
+                    return emit(writeFile, cancellationToken, customTransformers);
+                },
+                done: done
+            } :
+            {
+                kind: kind,
+                project: project,
+                projectPath: projectPath,
+                buildOrder: buildOrder,
+                getCompilerOptions: function () { return config.options; },
+                getCurrentDirectory: function () { return state.currentDirectory; },
+                emit: function (writeFile, customTransformers) {
+                    if (step !== Step.EmitBundle)
+                        return invalidatedProjectOfBundle;
+                    return emitBundle(writeFile, customTransformers);
+                },
+                done: done,
             };
+        function done(cancellationToken, writeFile, customTransformers) {
+            executeSteps(Step.Done, cancellationToken, writeFile, customTransformers);
+            return doneInvalidatedProject(state, projectPath);
         }
-        function invalidateProject(configFileName, reloadLevel) {
-            invalidateResolvedProject(resolveProjectName(configFileName), reloadLevel);
+        function withProgramOrUndefined(action) {
+            executeSteps(Step.CreateProgram);
+            return program && action(program);
         }
-        function invalidateResolvedProject(resolved, reloadLevel) {
-            if (reloadLevel === ts.ConfigFileProgramReloadLevel.Full) {
-                configFileCache.removeKey(resolved);
-                globalDependencyGraph = undefined;
-            }
-            projectStatus.removeKey(resolved);
-            diagnostics.removeKey(resolved);
-            addProjToQueue(resolved, reloadLevel);
+        function withProgramOrEmptyArray(action) {
+            return withProgramOrUndefined(action) || ts.emptyArray;
         }
-        /**
-         * return true if new addition
-         */
-        function addProjToQueue(proj, reloadLevel) {
-            var value = projectPendingBuild.getValue(proj);
-            if (value === undefined) {
-                projectPendingBuild.setValue(proj, reloadLevel || ts.ConfigFileProgramReloadLevel.None);
-                invalidatedProjectQueue.push(proj);
-            }
-            else if (value < (reloadLevel || ts.ConfigFileProgramReloadLevel.None)) {
-                projectPendingBuild.setValue(proj, reloadLevel || ts.ConfigFileProgramReloadLevel.None);
-            }
-        }
-        function getNextInvalidatedProject() {
-            if (nextProjectToBuild < invalidatedProjectQueue.length) {
-                var project = invalidatedProjectQueue[nextProjectToBuild];
-                nextProjectToBuild++;
-                var reloadLevel = projectPendingBuild.getValue(project);
-                projectPendingBuild.removeKey(project);
-                if (!projectPendingBuild.getSize()) {
-                    invalidatedProjectQueue.length = 0;
-                    nextProjectToBuild = 0;
-                }
-                return { project: project, reloadLevel: reloadLevel };
-            }
-        }
-        function hasPendingInvalidatedProjects() {
-            return !!projectPendingBuild.getSize();
-        }
-        function scheduleBuildInvalidatedProject() {
-            if (!hostWithWatch.setTimeout || !hostWithWatch.clearTimeout) {
+        function createProgram() {
+            ts.Debug.assert(program === undefined);
+            if (state.options.dry) {
+                reportStatus(state, ts.Diagnostics.A_non_dry_build_would_build_project_0, project);
+                buildResult = BuildResultFlags.Success;
+                step = Step.QueueReferencingProjects;
                 return;
             }
-            if (timerToBuildInvalidatedProject) {
-                hostWithWatch.clearTimeout(timerToBuildInvalidatedProject);
-            }
-            timerToBuildInvalidatedProject = hostWithWatch.setTimeout(buildInvalidatedProject, 250);
-        }
-        function buildInvalidatedProject() {
-            timerToBuildInvalidatedProject = undefined;
-            if (reportFileChangeDetected) {
-                reportFileChangeDetected = false;
-                projectErrorsReported.clear();
-                reportWatchStatus(ts.Diagnostics.File_change_detected_Starting_incremental_compilation);
-            }
-            var buildProject = getNextInvalidatedProject();
-            if (buildProject) {
-                buildSingleInvalidatedProject(buildProject.project, buildProject.reloadLevel);
-                if (hasPendingInvalidatedProjects()) {
-                    if (options.watch && !timerToBuildInvalidatedProject) {
-                        scheduleBuildInvalidatedProject();
-                    }
-                }
-                else {
-                    reportErrorSummary();
-                }
-            }
-        }
-        function reportErrorSummary() {
-            if (options.watch || host.reportErrorSummary) {
-                // Report errors from the other projects
-                getGlobalDependencyGraph().buildQueue.forEach(function (project) {
-                    if (!projectErrorsReported.hasKey(project)) {
-                        reportErrors(diagnostics.getValue(project) || ts.emptyArray);
-                    }
-                });
-                var totalErrors_1 = 0;
-                diagnostics.forEach(function (singleProjectErrors) { return totalErrors_1 += ts.getErrorCountForSummary(singleProjectErrors); });
-                if (options.watch) {
-                    reportWatchStatus(ts.getWatchErrorSummaryDiagnosticMessage(totalErrors_1), totalErrors_1);
-                }
-                else {
-                    host.reportErrorSummary(totalErrors_1);
-                }
-            }
-        }
-        function buildSingleInvalidatedProject(resolved, reloadLevel) {
-            var proj = parseConfigFile(resolved);
-            if (!proj) {
-                reportParseConfigFileDiagnostic(resolved);
-                return;
-            }
-            if (reloadLevel === ts.ConfigFileProgramReloadLevel.Full) {
-                watchConfigFile(resolved);
-                watchWildCardDirectories(resolved, proj);
-                watchInputFiles(resolved, proj);
-            }
-            else if (reloadLevel === ts.ConfigFileProgramReloadLevel.Partial) {
-                // Update file names
-                var result = ts.getFileNamesFromConfigSpecs(proj.configFileSpecs, ts.getDirectoryPath(resolved), proj.options, parseConfigFileHost);
-                ts.updateErrorForNoInputFiles(result, resolved, proj.configFileSpecs, proj.errors, ts.canJsonReportNoInutFiles(proj.raw));
-                proj.fileNames = result.fileNames;
-                watchInputFiles(resolved, proj);
-            }
-            var status = getUpToDateStatus(proj);
-            verboseReportProjectStatus(resolved, status);
-            if (status.type === UpToDateStatusType.UpstreamBlocked) {
-                if (options.verbose)
-                    reportStatus(ts.Diagnostics.Skipping_build_of_project_0_because_its_dependency_1_has_errors, resolved, status.upstreamProjectName);
-                return;
-            }
-            if (status.type === UpToDateStatusType.UpToDateWithUpstreamTypes) {
-                // Fake that files have been built by updating output file stamps
-                updateOutputTimestamps(proj);
-                return;
-            }
-            var buildResult = status.type === UpToDateStatusType.OutOfDateWithPrepend ?
-                updateBundle(resolved) : // Fake that files have been built by manipulating prepend and existing output
-                buildSingleProject(resolved); // Actual build
-            if (buildResult & BuildResultFlags.AnyErrors)
-                return;
-            var _a = getGlobalDependencyGraph(), referencingProjectsMap = _a.referencingProjectsMap, buildQueue = _a.buildQueue;
-            var referencingProjects = referencingProjectsMap.getValue(resolved);
-            if (!referencingProjects)
-                return;
-            // Always use build order to queue projects
-            for (var index = buildQueue.indexOf(resolved) + 1; index < buildQueue.length; index++) {
-                var project = buildQueue[index];
-                var prepend = referencingProjects.getValue(project);
-                if (prepend !== undefined) {
-                    // If the project is referenced with prepend, always build downstream projects,
-                    // If declaration output is changed, build the project
-                    // otherwise mark the project UpToDateWithUpstreamTypes so it updates output time stamps
-                    var status_1 = projectStatus.getValue(project);
-                    if (!(buildResult & BuildResultFlags.DeclarationOutputUnchanged)) {
-                        if (status_1 && (status_1.type === UpToDateStatusType.UpToDate || status_1.type === UpToDateStatusType.UpToDateWithUpstreamTypes || status_1.type === UpToDateStatusType.OutOfDateWithPrepend)) {
-                            projectStatus.setValue(project, {
-                                type: UpToDateStatusType.OutOfDateWithUpstream,
-                                outOfDateOutputFileName: status_1.type === UpToDateStatusType.OutOfDateWithPrepend ? status_1.outOfDateOutputFileName : status_1.oldestOutputFileName,
-                                newerProjectName: resolved
-                            });
-                        }
-                    }
-                    else if (status_1 && status_1.type === UpToDateStatusType.UpToDate) {
-                        if (prepend) {
-                            projectStatus.setValue(project, {
-                                type: UpToDateStatusType.OutOfDateWithPrepend,
-                                outOfDateOutputFileName: status_1.oldestOutputFileName,
-                                newerProjectName: resolved
-                            });
-                        }
-                        else {
-                            status_1.type = UpToDateStatusType.UpToDateWithUpstreamTypes;
-                        }
-                    }
-                    addProjToQueue(project);
-                }
-            }
-        }
-        function createDependencyGraph(roots) {
-            var temporaryMarks = createFileMap(toPath);
-            var permanentMarks = createFileMap(toPath);
-            var circularityReportStack = [];
-            var buildOrder = [];
-            var referencingProjectsMap = createFileMap(toPath);
-            for (var _i = 0, roots_1 = roots; _i < roots_1.length; _i++) {
-                var root = roots_1[_i];
-                visit(root);
-            }
-            return {
-                buildQueue: buildOrder,
-                referencingProjectsMap: referencingProjectsMap
-            };
-            function visit(projPath, inCircularContext) {
-                // Already visited
-                if (permanentMarks.hasKey(projPath))
-                    return;
-                // Circular
-                if (temporaryMarks.hasKey(projPath)) {
-                    if (!inCircularContext) {
-                        // TODO:: Do we report this as error?
-                        reportStatus(ts.Diagnostics.Project_references_may_not_form_a_circular_graph_Cycle_detected_Colon_0, circularityReportStack.join("\r\n"));
-                    }
-                    return;
-                }
-                temporaryMarks.setValue(projPath, true);
-                circularityReportStack.push(projPath);
-                var parsed = parseConfigFile(projPath);
-                if (parsed && parsed.projectReferences) {
-                    for (var _i = 0, _a = parsed.projectReferences; _i < _a.length; _i++) {
-                        var ref = _a[_i];
-                        var resolvedRefPath = resolveProjectName(ref.path);
-                        visit(resolvedRefPath, inCircularContext || ref.circular);
-                        // Get projects referencing resolvedRefPath and add projPath to it
-                        var referencingProjects = getOrCreateValueFromConfigFileMap(referencingProjectsMap, resolvedRefPath, function () { return createFileMap(toPath); });
-                        referencingProjects.setValue(projPath, !!ref.prepend);
-                    }
-                }
-                circularityReportStack.pop();
-                permanentMarks.setValue(projPath, true);
-                buildOrder.push(projPath);
-            }
-        }
-        function buildSingleProject(proj) {
-            if (options.dry) {
-                reportStatus(ts.Diagnostics.A_non_dry_build_would_build_project_0, proj);
-                return BuildResultFlags.Success;
-            }
-            if (options.verbose)
-                reportStatus(ts.Diagnostics.Building_project_0, proj);
-            var resultFlags = BuildResultFlags.DeclarationOutputUnchanged;
-            var configFile = parseConfigFile(proj);
-            if (!configFile) {
-                // Failed to read the config file
-                resultFlags |= BuildResultFlags.ConfigFileErrors;
-                reportParseConfigFileDiagnostic(proj);
-                projectStatus.setValue(proj, { type: UpToDateStatusType.Unbuildable, reason: "Config file errors" });
-                return resultFlags;
-            }
-            if (configFile.fileNames.length === 0) {
-                reportAndStoreErrors(proj, configFile.errors);
+            if (state.options.verbose)
+                reportStatus(state, ts.Diagnostics.Building_project_0, project);
+            if (config.fileNames.length === 0) {
+                reportAndStoreErrors(state, projectPath, config.errors);
                 // Nothing to build - must be a solution file, basically
-                return BuildResultFlags.None;
+                buildResult = BuildResultFlags.None;
+                step = Step.QueueReferencingProjects;
+                return;
             }
-            // TODO: handle resolve module name to cache result in project reference redirect
-            projectCompilerOptions = configFile.options;
-            var program = host.createProgram(configFile.fileNames, configFile.options, compilerHost, getOldProgram(proj, configFile), configFile.errors, configFile.projectReferences);
-            // Don't emit anything in the presence of syntactic errors or options diagnostics
-            var syntaxDiagnostics = program.getConfigFileParsingDiagnostics().concat(program.getOptionsDiagnostics(), program.getGlobalDiagnostics(), program.getSyntacticDiagnostics());
-            if (syntaxDiagnostics.length) {
-                return buildErrors(syntaxDiagnostics, BuildResultFlags.SyntaxErrors, "Syntactic");
+            var host = state.host, compilerHost = state.compilerHost;
+            state.projectCompilerOptions = config.options;
+            // Update module resolution cache if needed
+            updateModuleResolutionCache(state, project, config);
+            // Create program
+            program = host.createProgram(config.fileNames, config.options, compilerHost, getOldProgram(state, projectPath, config), config.errors, config.projectReferences);
+            step++;
+        }
+        function handleDiagnostics(diagnostics, errorFlags, errorType) {
+            if (diagnostics.length) {
+                buildResult = buildErrors(state, projectPath, program, diagnostics, errorFlags, errorType);
+                step = Step.QueueReferencingProjects;
             }
-            // Same as above but now for semantic diagnostics
-            var semanticDiagnostics = program.getSemanticDiagnostics();
-            if (semanticDiagnostics.length) {
-                return buildErrors(semanticDiagnostics, BuildResultFlags.TypeErrors, "Semantic");
+            else {
+                step++;
             }
+        }
+        function getSyntaxDiagnostics(cancellationToken) {
+            ts.Debug.assertDefined(program);
+            handleDiagnostics(program.getConfigFileParsingDiagnostics().concat(program.getOptionsDiagnostics(cancellationToken), program.getGlobalDiagnostics(cancellationToken), program.getSyntacticDiagnostics(/*sourceFile*/ undefined, cancellationToken)), BuildResultFlags.SyntaxErrors, "Syntactic");
+        }
+        function getSemanticDiagnostics(cancellationToken) {
+            handleDiagnostics(ts.Debug.assertDefined(program).getSemanticDiagnostics(/*sourceFile*/ undefined, cancellationToken), BuildResultFlags.TypeErrors, "Semantic");
+        }
+        function emit(writeFileCallback, cancellationToken, customTransformers) {
+            ts.Debug.assertDefined(program);
+            ts.Debug.assert(step === Step.Emit);
             // Before emitting lets backup state, so we can revert it back if there are declaration errors to handle emit and declaration errors correctly
             program.backupState();
-            var newestDeclarationFileContentChangedTime = minimumDate;
-            var anyDtsChanged = false;
             var declDiagnostics;
             var reportDeclarationDiagnostics = function (d) { return (declDiagnostics || (declDiagnostics = [])).push(d); };
             var outputFiles = [];
-            ts.emitFilesAndReportErrors(program, reportDeclarationDiagnostics, writeFileName, /*reportSummary*/ undefined, function (name, text, writeByteOrderMark) { return outputFiles.push({ name: name, text: text, writeByteOrderMark: writeByteOrderMark }); });
+            var emitResult = ts.emitFilesAndReportErrors(program, reportDeclarationDiagnostics, 
+            /*writeFileName*/ undefined, 
+            /*reportSummary*/ undefined, function (name, text, writeByteOrderMark) { return outputFiles.push({ name: name, text: text, writeByteOrderMark: writeByteOrderMark }); }, cancellationToken, 
+            /*emitOnlyDts*/ false, customTransformers).emitResult;
             // Don't emit .d.ts if there are decl file errors
             if (declDiagnostics) {
                 program.restoreState();
-                return buildErrors(declDiagnostics, BuildResultFlags.DeclarationEmitErrors, "Declaration file");
+                buildResult = buildErrors(state, projectPath, program, declDiagnostics, BuildResultFlags.DeclarationEmitErrors, "Declaration file");
+                step = Step.QueueReferencingProjects;
+                return {
+                    emitSkipped: true,
+                    diagnostics: emitResult.diagnostics
+                };
             }
             // Actual Emit
+            var host = state.host, compilerHost = state.compilerHost;
+            var resultFlags = BuildResultFlags.DeclarationOutputUnchanged;
+            var newestDeclarationFileContentChangedTime = minimumDate;
+            var anyDtsChanged = false;
             var emitterDiagnostics = ts.createDiagnosticCollection();
-            var emittedOutputs = createFileMap(toPath);
+            var emittedOutputs = ts.createMap();
             outputFiles.forEach(function (_a) {
                 var name = _a.name, text = _a.text, writeByteOrderMark = _a.writeByteOrderMark;
                 var priorChangeTime;
                 if (!anyDtsChanged && isDeclarationFile(name)) {
                     // Check for unchanged .d.ts files
-                    if (host.fileExists(name) && readFileWithCache(name) === text) {
+                    if (host.fileExists(name) && state.readFileWithCache(name) === text) {
                         priorChangeTime = host.getModifiedTime(name);
                     }
                     else {
@@ -94120,481 +96667,872 @@ var ts;
                         anyDtsChanged = true;
                     }
                 }
-                emittedOutputs.setValue(name, true);
-                ts.writeFile(compilerHost, emitterDiagnostics, name, text, writeByteOrderMark);
+                emittedOutputs.set(toPath(state, name), name);
+                ts.writeFile(writeFileCallback ? { writeFile: writeFileCallback } : compilerHost, emitterDiagnostics, name, text, writeByteOrderMark);
                 if (priorChangeTime !== undefined) {
                     newestDeclarationFileContentChangedTime = newer(priorChangeTime, newestDeclarationFileContentChangedTime);
-                    unchangedOutputs.setValue(name, priorChangeTime);
                 }
             });
+            finishEmit(emitterDiagnostics, emittedOutputs, newestDeclarationFileContentChangedTime, 
+            /*newestDeclarationFileContentChangedTimeIsMaximumDate*/ anyDtsChanged, outputFiles.length ? outputFiles[0].name : ts.getFirstProjectOutput(config, !host.useCaseSensitiveFileNames()), resultFlags);
+            return emitResult;
+        }
+        function finishEmit(emitterDiagnostics, emittedOutputs, priorNewestUpdateTime, newestDeclarationFileContentChangedTimeIsMaximumDate, oldestOutputFileName, resultFlags) {
             var emitDiagnostics = emitterDiagnostics.getDiagnostics();
             if (emitDiagnostics.length) {
-                return buildErrors(emitDiagnostics, BuildResultFlags.EmitErrors, "Emit");
+                buildResult = buildErrors(state, projectPath, program, emitDiagnostics, BuildResultFlags.EmitErrors, "Emit");
+                step = Step.QueueReferencingProjects;
+                return emitDiagnostics;
+            }
+            if (state.writeFileName) {
+                emittedOutputs.forEach(function (name) { return listEmittedFile(state, config, name); });
+                if (program)
+                    ts.listFiles(program, state.writeFileName);
             }
             // Update time stamps for rest of the outputs
-            newestDeclarationFileContentChangedTime = updateOutputTimestampsWorker(configFile, newestDeclarationFileContentChangedTime, ts.Diagnostics.Updating_unchanged_output_timestamps_of_project_0, emittedOutputs);
-            var status = {
-                type: UpToDateStatusType.UpToDate,
-                newestDeclarationFileContentChangedTime: anyDtsChanged ? maximumDate : newestDeclarationFileContentChangedTime,
-                oldestOutputFileName: outputFiles.length ? outputFiles[0].name : getFirstProjectOutput(configFile)
-            };
-            diagnostics.removeKey(proj);
-            projectStatus.setValue(proj, status);
-            afterProgramCreate(proj, program);
-            projectCompilerOptions = baseCompilerOptions;
-            return resultFlags;
-            function buildErrors(diagnostics, errorFlags, errorType) {
-                resultFlags |= errorFlags;
-                reportAndStoreErrors(proj, diagnostics);
-                projectStatus.setValue(proj, { type: UpToDateStatusType.Unbuildable, reason: errorType + " errors" });
-                afterProgramCreate(proj, program);
-                projectCompilerOptions = baseCompilerOptions;
-                return resultFlags;
-            }
+            var newestDeclarationFileContentChangedTime = updateOutputTimestampsWorker(state, config, priorNewestUpdateTime, ts.Diagnostics.Updating_unchanged_output_timestamps_of_project_0, emittedOutputs);
+            state.diagnostics.delete(projectPath);
+            state.projectStatus.set(projectPath, {
+                type: ts.UpToDateStatusType.UpToDate,
+                newestDeclarationFileContentChangedTime: newestDeclarationFileContentChangedTimeIsMaximumDate ?
+                    maximumDate :
+                    newestDeclarationFileContentChangedTime,
+                oldestOutputFileName: oldestOutputFileName
+            });
+            if (program)
+                afterProgramCreate(state, projectPath, program);
+            state.projectCompilerOptions = state.baseCompilerOptions;
+            step = Step.QueueReferencingProjects;
+            buildResult = resultFlags;
+            return emitDiagnostics;
         }
-        function afterProgramCreate(proj, program) {
-            if (host.afterProgramEmitAndDiagnostics) {
-                host.afterProgramEmitAndDiagnostics(program);
+        function emitBundle(writeFileCallback, customTransformers) {
+            ts.Debug.assert(kind === InvalidatedProjectKind.UpdateBundle);
+            if (state.options.dry) {
+                reportStatus(state, ts.Diagnostics.A_non_dry_build_would_update_output_of_project_0, project);
+                buildResult = BuildResultFlags.Success;
+                step = Step.QueueReferencingProjects;
+                return undefined;
             }
-            if (options.watch) {
-                program.releaseProgram();
-                builderPrograms.setValue(proj, program);
-            }
-        }
-        function getOldProgram(proj, parsed) {
-            var value = builderPrograms.getValue(proj);
-            if (value)
-                return value;
-            return ts.readBuilderProgram(parsed.options, readFileWithCache);
-        }
-        function updateBundle(proj) {
-            if (options.dry) {
-                reportStatus(ts.Diagnostics.A_non_dry_build_would_update_output_of_project_0, proj);
-                return BuildResultFlags.Success;
-            }
-            if (options.verbose)
-                reportStatus(ts.Diagnostics.Updating_output_of_project_0, proj);
+            if (state.options.verbose)
+                reportStatus(state, ts.Diagnostics.Updating_output_of_project_0, project);
             // Update js, and source map
-            var config = ts.Debug.assertDefined(parseConfigFile(proj));
-            projectCompilerOptions = config.options;
-            var outputFiles = ts.emitUsingBuildInfo(config, compilerHost, function (ref) { return parseConfigFile(resolveProjectName(ref.path)); });
+            var compilerHost = state.compilerHost;
+            state.projectCompilerOptions = config.options;
+            var outputFiles = ts.emitUsingBuildInfo(config, compilerHost, function (ref) {
+                var refName = resolveProjectName(state, ref.path);
+                return parseConfigFile(state, refName, toResolvedConfigFilePath(state, refName));
+            }, customTransformers);
             if (ts.isString(outputFiles)) {
-                reportStatus(ts.Diagnostics.Cannot_update_output_of_project_0_because_there_was_error_reading_file_1, proj, relName(outputFiles));
-                return buildSingleProject(proj);
+                reportStatus(state, ts.Diagnostics.Cannot_update_output_of_project_0_because_there_was_error_reading_file_1, project, relName(state, outputFiles));
+                step = Step.BuildInvalidatedProjectOfBundle;
+                return invalidatedProjectOfBundle = createBuildOrUpdateInvalidedProject(InvalidatedProjectKind.Build, state, project, projectPath, projectIndex, config, buildOrder);
             }
             // Actual Emit
             ts.Debug.assert(!!outputFiles.length);
             var emitterDiagnostics = ts.createDiagnosticCollection();
-            var emittedOutputs = createFileMap(toPath);
+            var emittedOutputs = ts.createMap();
             outputFiles.forEach(function (_a) {
                 var name = _a.name, text = _a.text, writeByteOrderMark = _a.writeByteOrderMark;
-                emittedOutputs.setValue(name, true);
-                ts.writeFile(compilerHost, emitterDiagnostics, name, text, writeByteOrderMark);
+                emittedOutputs.set(toPath(state, name), name);
+                ts.writeFile(writeFileCallback ? { writeFile: writeFileCallback } : compilerHost, emitterDiagnostics, name, text, writeByteOrderMark);
             });
-            var emitDiagnostics = emitterDiagnostics.getDiagnostics();
-            if (emitDiagnostics.length) {
-                reportAndStoreErrors(proj, emitDiagnostics);
-                projectStatus.setValue(proj, { type: UpToDateStatusType.Unbuildable, reason: "Emit errors" });
-                projectCompilerOptions = baseCompilerOptions;
-                return BuildResultFlags.DeclarationOutputUnchanged | BuildResultFlags.EmitErrors;
-            }
-            // Update timestamps for dts
-            var newestDeclarationFileContentChangedTime = updateOutputTimestampsWorker(config, minimumDate, ts.Diagnostics.Updating_unchanged_output_timestamps_of_project_0, emittedOutputs);
-            var status = {
-                type: UpToDateStatusType.UpToDate,
-                newestDeclarationFileContentChangedTime: newestDeclarationFileContentChangedTime,
-                oldestOutputFileName: outputFiles[0].name
-            };
-            diagnostics.removeKey(proj);
-            projectStatus.setValue(proj, status);
-            projectCompilerOptions = baseCompilerOptions;
-            return BuildResultFlags.DeclarationOutputUnchanged;
+            var emitDiagnostics = finishEmit(emitterDiagnostics, emittedOutputs, minimumDate, 
+            /*newestDeclarationFileContentChangedTimeIsMaximumDate*/ false, outputFiles[0].name, BuildResultFlags.DeclarationOutputUnchanged);
+            return { emitSkipped: false, diagnostics: emitDiagnostics };
         }
-        function updateOutputTimestamps(proj) {
-            if (options.dry) {
-                return reportStatus(ts.Diagnostics.A_non_dry_build_would_update_timestamps_for_output_of_project_0, proj.options.configFilePath);
-            }
-            var priorNewestUpdateTime = updateOutputTimestampsWorker(proj, minimumDate, ts.Diagnostics.Updating_output_timestamps_of_project_0);
-            projectStatus.setValue(proj.options.configFilePath, { type: UpToDateStatusType.UpToDate, newestDeclarationFileContentChangedTime: priorNewestUpdateTime });
-        }
-        function updateOutputTimestampsWorker(proj, priorNewestUpdateTime, verboseMessage, skipOutputs) {
-            var outputs = getAllProjectOutputs(proj);
-            if (!skipOutputs || outputs.length !== skipOutputs.getSize()) {
-                if (options.verbose) {
-                    reportStatus(verboseMessage, proj.options.configFilePath);
-                }
-                var now = host.now ? host.now() : new Date();
-                for (var _i = 0, outputs_2 = outputs; _i < outputs_2.length; _i++) {
-                    var file = outputs_2[_i];
-                    if (skipOutputs && skipOutputs.hasKey(file)) {
-                        continue;
-                    }
-                    if (isDeclarationFile(file)) {
-                        priorNewestUpdateTime = newer(priorNewestUpdateTime, host.getModifiedTime(file) || ts.missingFileModifiedTime);
-                    }
-                    host.setModifiedTime(file, now);
-                    if (proj.options.listEmittedFiles) {
-                        writeFileName("TSFILE: " + file);
-                    }
+        function executeSteps(till, cancellationToken, writeFile, customTransformers) {
+            while (step <= till && step < Step.Done) {
+                var currentStep = step;
+                switch (step) {
+                    case Step.CreateProgram:
+                        createProgram();
+                        break;
+                    case Step.SyntaxDiagnostics:
+                        getSyntaxDiagnostics(cancellationToken);
+                        break;
+                    case Step.SemanticDiagnostics:
+                        getSemanticDiagnostics(cancellationToken);
+                        break;
+                    case Step.Emit:
+                        emit(writeFile, cancellationToken, customTransformers);
+                        break;
+                    case Step.EmitBundle:
+                        emitBundle(writeFile, customTransformers);
+                        break;
+                    case Step.BuildInvalidatedProjectOfBundle:
+                        ts.Debug.assertDefined(invalidatedProjectOfBundle).done(cancellationToken);
+                        step = Step.Done;
+                        break;
+                    case Step.QueueReferencingProjects:
+                        queueReferencingProjects(state, project, projectPath, projectIndex, config, buildOrder, ts.Debug.assertDefined(buildResult));
+                        step++;
+                        break;
+                    // Should never be done
+                    case Step.Done:
+                    default:
+                        ts.assertType(step);
                 }
+                ts.Debug.assert(step > currentStep);
             }
-            return priorNewestUpdateTime;
         }
-        function getFilesToClean() {
-            // Get the same graph for cleaning we'd use for building
-            var graph = getGlobalDependencyGraph();
-            var filesToDelete = [];
-            for (var _i = 0, _a = graph.buildQueue; _i < _a.length; _i++) {
-                var proj = _a[_i];
-                var parsed = parseConfigFile(proj);
-                if (parsed === undefined) {
-                    // File has gone missing; fine to ignore here
-                    reportParseConfigFileDiagnostic(proj);
-                    continue;
-                }
-                var outputs = getAllProjectOutputs(parsed);
-                for (var _b = 0, outputs_3 = outputs; _b < outputs_3.length; _b++) {
-                    var output = outputs_3[_b];
-                    if (host.fileExists(output)) {
-                        filesToDelete.push(output);
-                    }
-                }
+    }
+    function needsBuild(_a, status, config) {
+        var options = _a.options;
+        if (status.type !== ts.UpToDateStatusType.OutOfDateWithPrepend || options.force)
+            return true;
+        return config.fileNames.length === 0 ||
+            !!config.errors.length ||
+            !ts.isIncrementalCompilation(config.options);
+    }
+    function getNextInvalidatedProject(state, buildOrder, reportQueue) {
+        if (!state.projectPendingBuild.size)
+            return undefined;
+        if (state.currentInvalidatedProject) {
+            // Only if same buildOrder the currentInvalidated project can be sent again
+            return ts.arrayIsEqualTo(state.currentInvalidatedProject.buildOrder, buildOrder) ?
+                state.currentInvalidatedProject :
+                undefined;
+        }
+        var options = state.options, projectPendingBuild = state.projectPendingBuild;
+        for (var projectIndex = 0; projectIndex < buildOrder.length; projectIndex++) {
+            var project = buildOrder[projectIndex];
+            var projectPath = toResolvedConfigFilePath(state, project);
+            var reloadLevel = state.projectPendingBuild.get(projectPath);
+            if (reloadLevel === undefined)
+                continue;
+            if (reportQueue) {
+                reportQueue = false;
+                reportBuildQueue(state, buildOrder);
             }
-            return filesToDelete;
-        }
-        function cleanAllProjects() {
-            var filesToDelete = getFilesToClean();
-            if (options.dry) {
-                reportStatus(ts.Diagnostics.A_non_dry_build_would_delete_the_following_files_Colon_0, filesToDelete.map(function (f) { return "\r\n * " + f; }).join(""));
-                return ts.ExitStatus.Success;
+            var config = parseConfigFile(state, project, projectPath);
+            if (!config) {
+                reportParseConfigFileDiagnostic(state, projectPath);
+                projectPendingBuild.delete(projectPath);
+                continue;
             }
-            for (var _i = 0, filesToDelete_1 = filesToDelete; _i < filesToDelete_1.length; _i++) {
-                var output = filesToDelete_1[_i];
-                host.deleteFile(output);
+            if (reloadLevel === ts.ConfigFileProgramReloadLevel.Full) {
+                watchConfigFile(state, project, projectPath);
+                watchWildCardDirectories(state, project, projectPath, config);
+                watchInputFiles(state, project, projectPath, config);
             }
-            return ts.ExitStatus.Success;
-        }
-        function resolveProjectName(name) {
-            return resolveConfigFileProjectName(ts.resolvePath(host.getCurrentDirectory(), name));
-        }
-        function resolveProjectNames(configFileNames) {
-            return configFileNames.map(resolveProjectName);
-        }
-        function buildAllProjects() {
-            if (options.watch) {
-                reportWatchStatus(ts.Diagnostics.Starting_compilation_in_watch_mode);
+            else if (reloadLevel === ts.ConfigFileProgramReloadLevel.Partial) {
+                // Update file names
+                var result = ts.getFileNamesFromConfigSpecs(config.configFileSpecs, ts.getDirectoryPath(project), config.options, state.parseConfigFileHost);
+                ts.updateErrorForNoInputFiles(result, project, config.configFileSpecs, config.errors, ts.canJsonReportNoInutFiles(config.raw));
+                config.fileNames = result.fileNames;
+                watchInputFiles(state, project, projectPath, config);
             }
-            // TODO:: In watch mode as well to use caches for incremental build once we can invalidate caches correctly and have right api
-            // Override readFile for json files and output .d.ts to cache the text
-            var savedReadFileWithCache = readFileWithCache;
-            var savedGetSourceFile = compilerHost.getSourceFile;
-            var _a = ts.changeCompilerHostLikeToUseCache(host, toPath, function () {
-                var args = [];
-                for (var _i = 0; _i < arguments.length; _i++) {
-                    args[_i] = arguments[_i];
-                }
-                return savedGetSourceFile.call.apply(savedGetSourceFile, [compilerHost].concat(args));
-            }), originalReadFile = _a.originalReadFile, originalFileExists = _a.originalFileExists, originalDirectoryExists = _a.originalDirectoryExists, originalCreateDirectory = _a.originalCreateDirectory, originalWriteFile = _a.originalWriteFile, getSourceFileWithCache = _a.getSourceFileWithCache, newReadFileWithCache = _a.readFileWithCache;
-            readFileWithCache = newReadFileWithCache;
-            compilerHost.getSourceFile = getSourceFileWithCache;
-            var graph = getGlobalDependencyGraph();
-            reportBuildQueue(graph);
-            var anyFailed = false;
-            for (var _i = 0, _b = graph.buildQueue; _i < _b.length; _i++) {
-                var next = _b[_i];
-                var proj = parseConfigFile(next);
-                if (proj === undefined) {
-                    reportParseConfigFileDiagnostic(next);
-                    anyFailed = true;
-                    break;
-                }
-                // report errors early when using continue or break statements
-                var errors = proj.errors;
-                var status = getUpToDateStatus(proj);
-                verboseReportProjectStatus(next, status);
-                var projName = proj.options.configFilePath;
-                if (status.type === UpToDateStatusType.UpToDate && !options.force) {
-                    reportAndStoreErrors(next, errors);
+            var status = getUpToDateStatus(state, config, projectPath);
+            verboseReportProjectStatus(state, project, status);
+            if (!options.force) {
+                if (status.type === ts.UpToDateStatusType.UpToDate) {
+                    reportAndStoreErrors(state, projectPath, config.errors);
+                    projectPendingBuild.delete(projectPath);
                     // Up to date, skip
-                    if (defaultOptions.dry) {
+                    if (options.dry) {
                         // In a dry build, inform the user of this fact
-                        reportStatus(ts.Diagnostics.Project_0_is_up_to_date, projName);
+                        reportStatus(state, ts.Diagnostics.Project_0_is_up_to_date, project);
                     }
                     continue;
                 }
-                if (status.type === UpToDateStatusType.UpToDateWithUpstreamTypes && !options.force) {
-                    reportAndStoreErrors(next, errors);
-                    // Fake build
-                    updateOutputTimestamps(proj);
-                    continue;
+                if (status.type === ts.UpToDateStatusType.UpToDateWithUpstreamTypes) {
+                    reportAndStoreErrors(state, projectPath, config.errors);
+                    return createUpdateOutputFileStampsProject(state, project, projectPath, config, buildOrder);
                 }
-                if (status.type === UpToDateStatusType.UpstreamBlocked) {
-                    reportAndStoreErrors(next, errors);
-                    if (options.verbose)
-                        reportStatus(ts.Diagnostics.Skipping_build_of_project_0_because_its_dependency_1_has_errors, projName, status.upstreamProjectName);
-                    continue;
-                }
-                if (status.type === UpToDateStatusType.ContainerOnly) {
-                    reportAndStoreErrors(next, errors);
-                    // Do nothing
-                    continue;
-                }
-                var buildResult = status.type === UpToDateStatusType.OutOfDateWithPrepend && !options.force ?
-                    updateBundle(next) : // Fake that files have been built by manipulating prepend and existing output
-                    buildSingleProject(next); // Actual build
-                anyFailed = anyFailed || !!(buildResult & BuildResultFlags.AnyErrors);
             }
-            reportErrorSummary();
-            host.readFile = originalReadFile;
-            host.fileExists = originalFileExists;
-            host.directoryExists = originalDirectoryExists;
-            host.createDirectory = originalCreateDirectory;
-            host.writeFile = originalWriteFile;
-            compilerHost.getSourceFile = savedGetSourceFile;
-            readFileWithCache = savedReadFileWithCache;
-            return anyFailed ? ts.ExitStatus.DiagnosticsPresent_OutputsSkipped : ts.ExitStatus.Success;
-        }
-        function reportParseConfigFileDiagnostic(proj) {
-            reportAndStoreErrors(proj, [configFileCache.getValue(proj)]);
-        }
-        function reportAndStoreErrors(proj, errors) {
-            reportErrors(errors);
-            projectErrorsReported.setValue(proj, true);
-            diagnostics.setValue(proj, errors);
-        }
-        function reportErrors(errors) {
-            errors.forEach(function (err) { return host.reportDiagnostic(err); });
-        }
-        /**
-         * Report the build ordering inferred from the current project graph if we're in verbose mode
-         */
-        function reportBuildQueue(graph) {
-            if (options.verbose) {
-                reportStatus(ts.Diagnostics.Projects_in_this_build_Colon_0, graph.buildQueue.map(function (s) { return "\r\n    * " + relName(s); }).join(""));
+            if (status.type === ts.UpToDateStatusType.UpstreamBlocked) {
+                reportAndStoreErrors(state, projectPath, config.errors);
+                projectPendingBuild.delete(projectPath);
+                if (options.verbose)
+                    reportStatus(state, ts.Diagnostics.Skipping_build_of_project_0_because_its_dependency_1_has_errors, project, status.upstreamProjectName);
+                continue;
             }
+            if (status.type === ts.UpToDateStatusType.ContainerOnly) {
+                reportAndStoreErrors(state, projectPath, config.errors);
+                projectPendingBuild.delete(projectPath);
+                // Do nothing
+                continue;
+            }
+            return createBuildOrUpdateInvalidedProject(needsBuild(state, status, config) ?
+                InvalidatedProjectKind.Build :
+                InvalidatedProjectKind.UpdateBundle, state, project, projectPath, projectIndex, config, buildOrder);
         }
-        function relName(path) {
-            return ts.convertToRelativePath(path, host.getCurrentDirectory(), function (f) { return compilerHost.getCanonicalFileName(f); });
-        }
-        /**
-         * Report the up-to-date status of a project if we're in verbose mode
-         */
-        function verboseReportProjectStatus(configFileName, status) {
-            if (!options.verbose)
-                return;
-            return formatUpToDateStatus(configFileName, status, relName, reportStatus);
+        return undefined;
+    }
+    function listEmittedFile(_a, proj, file) {
+        var writeFileName = _a.writeFileName;
+        if (writeFileName && proj.options.listEmittedFiles) {
+            writeFileName("TSFILE: " + file);
         }
     }
-    ts.createSolutionBuilder = createSolutionBuilder;
-    function resolveConfigFileProjectName(project) {
-        if (ts.fileExtensionIs(project, ".json" /* Json */)) {
-            return project;
-        }
-        return ts.combinePaths(project, "tsconfig.json");
+    function getOldProgram(_a, proj, parsed) {
+        var options = _a.options, builderPrograms = _a.builderPrograms, compilerHost = _a.compilerHost;
+        if (options.force)
+            return undefined;
+        var value = builderPrograms.get(proj);
+        if (value)
+            return value;
+        return ts.readBuilderProgram(parsed.options, compilerHost);
     }
-    ts.resolveConfigFileProjectName = resolveConfigFileProjectName;
-    function getAllProjectOutputs(project) {
-        if (project.options.outFile || project.options.out) {
-            return getOutFileOutputs(project);
+    function afterProgramCreate(_a, proj, program) {
+        var host = _a.host, watch = _a.watch, builderPrograms = _a.builderPrograms;
+        if (host.afterProgramEmitAndDiagnostics) {
+            host.afterProgramEmitAndDiagnostics(program);
+        }
+        if (watch) {
+            program.releaseProgram();
+            builderPrograms.set(proj, program);
+        }
+    }
+    function buildErrors(state, resolvedPath, program, diagnostics, errorFlags, errorType) {
+        reportAndStoreErrors(state, resolvedPath, diagnostics);
+        // List files if any other build error using program (emit errors already report files)
+        if (program && state.writeFileName)
+            ts.listFiles(program, state.writeFileName);
+        state.projectStatus.set(resolvedPath, { type: ts.UpToDateStatusType.Unbuildable, reason: errorType + " errors" });
+        if (program)
+            afterProgramCreate(state, resolvedPath, program);
+        state.projectCompilerOptions = state.baseCompilerOptions;
+        return errorFlags;
+    }
+    function updateModuleResolutionCache(state, proj, config) {
+        if (!state.moduleResolutionCache)
+            return;
+        // Update module resolution cache if needed
+        var moduleResolutionCache = state.moduleResolutionCache;
+        var projPath = toPath(state, proj);
+        if (moduleResolutionCache.directoryToModuleNameMap.redirectsMap.size === 0) {
+            // The own map will be for projectCompilerOptions
+            ts.Debug.assert(moduleResolutionCache.moduleNameToDirectoryMap.redirectsMap.size === 0);
+            moduleResolutionCache.directoryToModuleNameMap.redirectsMap.set(projPath, moduleResolutionCache.directoryToModuleNameMap.ownMap);
+            moduleResolutionCache.moduleNameToDirectoryMap.redirectsMap.set(projPath, moduleResolutionCache.moduleNameToDirectoryMap.ownMap);
         }
         else {
-            var outputs = [];
-            for (var _i = 0, _a = project.fileNames; _i < _a.length; _i++) {
-                var inputFile = _a[_i];
-                outputs.push.apply(outputs, getOutputFileNames(inputFile, project));
-            }
-            var buildInfoPath = ts.getOutputPathForBuildInfo(project.options);
-            if (buildInfoPath)
-                outputs.push(buildInfoPath);
-            return outputs;
+            // Set correct own map
+            ts.Debug.assert(moduleResolutionCache.moduleNameToDirectoryMap.redirectsMap.size > 0);
+            var ref = {
+                sourceFile: config.options.configFile,
+                commandLine: config
+            };
+            moduleResolutionCache.directoryToModuleNameMap.setOwnMap(moduleResolutionCache.directoryToModuleNameMap.getOrCreateMapOfCacheRedirects(ref));
+            moduleResolutionCache.moduleNameToDirectoryMap.setOwnMap(moduleResolutionCache.moduleNameToDirectoryMap.getOrCreateMapOfCacheRedirects(ref));
+        }
+        moduleResolutionCache.directoryToModuleNameMap.setOwnOptions(config.options);
+        moduleResolutionCache.moduleNameToDirectoryMap.setOwnOptions(config.options);
+    }
+    function checkConfigFileUpToDateStatus(state, configFile, oldestOutputFileTime, oldestOutputFileName) {
+        // Check tsconfig time
+        var tsconfigTime = state.host.getModifiedTime(configFile) || ts.missingFileModifiedTime;
+        if (oldestOutputFileTime < tsconfigTime) {
+            return {
+                type: ts.UpToDateStatusType.OutOfDateWithSelf,
+                outOfDateOutputFileName: oldestOutputFileName,
+                newerInputFileName: configFile
+            };
         }
     }
-    ts.getAllProjectOutputs = getAllProjectOutputs;
-    function getFirstProjectOutput(project) {
-        if (project.options.outFile || project.options.out) {
-            return ts.first(getOutFileOutputs(project));
-        }
+    function getUpToDateStatusWorker(state, project, resolvedPath) {
+        var newestInputFileName = undefined;
+        var newestInputFileTime = minimumDate;
+        var host = state.host;
+        // Get timestamps of input files
         for (var _i = 0, _a = project.fileNames; _i < _a.length; _i++) {
             var inputFile = _a[_i];
-            var outputs = getOutputFileNames(inputFile, project);
-            if (outputs.length) {
-                return ts.first(outputs);
+            if (!host.fileExists(inputFile)) {
+                return {
+                    type: ts.UpToDateStatusType.Unbuildable,
+                    reason: inputFile + " does not exist"
+                };
+            }
+            var inputTime = host.getModifiedTime(inputFile) || ts.missingFileModifiedTime;
+            if (inputTime > newestInputFileTime) {
+                newestInputFileName = inputFile;
+                newestInputFileTime = inputTime;
             }
         }
-        return ts.Debug.fail("project " + project.options.configFilePath + " expected to have at least one output");
+        // Container if no files are specified in the project
+        if (!project.fileNames.length && !ts.canJsonReportNoInutFiles(project.raw)) {
+            return {
+                type: ts.UpToDateStatusType.ContainerOnly
+            };
+        }
+        // Collect the expected outputs of this project
+        var outputs = ts.getAllProjectOutputs(project, !host.useCaseSensitiveFileNames());
+        // Now see if all outputs are newer than the newest input
+        var oldestOutputFileName = "(none)";
+        var oldestOutputFileTime = maximumDate;
+        var newestOutputFileName = "(none)";
+        var newestOutputFileTime = minimumDate;
+        var missingOutputFileName;
+        var newestDeclarationFileContentChangedTime = minimumDate;
+        var isOutOfDateWithInputs = false;
+        for (var _b = 0, outputs_1 = outputs; _b < outputs_1.length; _b++) {
+            var output = outputs_1[_b];
+            // Output is missing; can stop checking
+            // Don't immediately return because we can still be upstream-blocked, which is a higher-priority status
+            if (!host.fileExists(output)) {
+                missingOutputFileName = output;
+                break;
+            }
+            var outputTime = host.getModifiedTime(output) || ts.missingFileModifiedTime;
+            if (outputTime < oldestOutputFileTime) {
+                oldestOutputFileTime = outputTime;
+                oldestOutputFileName = output;
+            }
+            // If an output is older than the newest input, we can stop checking
+            // Don't immediately return because we can still be upstream-blocked, which is a higher-priority status
+            if (outputTime < newestInputFileTime) {
+                isOutOfDateWithInputs = true;
+                break;
+            }
+            if (outputTime > newestOutputFileTime) {
+                newestOutputFileTime = outputTime;
+                newestOutputFileName = output;
+            }
+            // Keep track of when the most recent time a .d.ts file was changed.
+            // In addition to file timestamps, we also keep track of when a .d.ts file
+            // had its file touched but not had its contents changed - this allows us
+            // to skip a downstream typecheck
+            if (isDeclarationFile(output)) {
+                var outputModifiedTime = host.getModifiedTime(output) || ts.missingFileModifiedTime;
+                newestDeclarationFileContentChangedTime = newer(newestDeclarationFileContentChangedTime, outputModifiedTime);
+            }
+        }
+        var pseudoUpToDate = false;
+        var usesPrepend = false;
+        var upstreamChangedProject;
+        if (project.projectReferences) {
+            state.projectStatus.set(resolvedPath, { type: ts.UpToDateStatusType.ComputingUpstream });
+            for (var _c = 0, _d = project.projectReferences; _c < _d.length; _c++) {
+                var ref = _d[_c];
+                usesPrepend = usesPrepend || !!(ref.prepend);
+                var resolvedRef = ts.resolveProjectReferencePath(ref);
+                var resolvedRefPath = toResolvedConfigFilePath(state, resolvedRef);
+                var refStatus = getUpToDateStatus(state, parseConfigFile(state, resolvedRef, resolvedRefPath), resolvedRefPath);
+                // Its a circular reference ignore the status of this project
+                if (refStatus.type === ts.UpToDateStatusType.ComputingUpstream ||
+                    refStatus.type === ts.UpToDateStatusType.ContainerOnly) { // Container only ignore this project
+                    continue;
+                }
+                // An upstream project is blocked
+                if (refStatus.type === ts.UpToDateStatusType.Unbuildable) {
+                    return {
+                        type: ts.UpToDateStatusType.UpstreamBlocked,
+                        upstreamProjectName: ref.path
+                    };
+                }
+                // If the upstream project is out of date, then so are we (someone shouldn't have asked, though?)
+                if (refStatus.type !== ts.UpToDateStatusType.UpToDate) {
+                    return {
+                        type: ts.UpToDateStatusType.UpstreamOutOfDate,
+                        upstreamProjectName: ref.path
+                    };
+                }
+                // Check oldest output file name only if there is no missing output file name
+                if (!missingOutputFileName) {
+                    // If the upstream project's newest file is older than our oldest output, we
+                    // can't be out of date because of it
+                    if (refStatus.newestInputFileTime && refStatus.newestInputFileTime <= oldestOutputFileTime) {
+                        continue;
+                    }
+                    // If the upstream project has only change .d.ts files, and we've built
+                    // *after* those files, then we're "psuedo up to date" and eligible for a fast rebuild
+                    if (refStatus.newestDeclarationFileContentChangedTime && refStatus.newestDeclarationFileContentChangedTime <= oldestOutputFileTime) {
+                        pseudoUpToDate = true;
+                        upstreamChangedProject = ref.path;
+                        continue;
+                    }
+                    // We have an output older than an upstream output - we are out of date
+                    ts.Debug.assert(oldestOutputFileName !== undefined, "Should have an oldest output filename here");
+                    return {
+                        type: ts.UpToDateStatusType.OutOfDateWithUpstream,
+                        outOfDateOutputFileName: oldestOutputFileName,
+                        newerProjectName: ref.path
+                    };
+                }
+            }
+        }
+        if (missingOutputFileName !== undefined) {
+            return {
+                type: ts.UpToDateStatusType.OutputMissing,
+                missingOutputFileName: missingOutputFileName
+            };
+        }
+        if (isOutOfDateWithInputs) {
+            return {
+                type: ts.UpToDateStatusType.OutOfDateWithSelf,
+                outOfDateOutputFileName: oldestOutputFileName,
+                newerInputFileName: newestInputFileName
+            };
+        }
+        else {
+            // Check tsconfig time
+            var configStatus = checkConfigFileUpToDateStatus(state, project.options.configFilePath, oldestOutputFileTime, oldestOutputFileName);
+            if (configStatus)
+                return configStatus;
+            // Check extended config time
+            var extendedConfigStatus = ts.forEach(project.options.configFile.extendedSourceFiles || ts.emptyArray, function (configFile) { return checkConfigFileUpToDateStatus(state, configFile, oldestOutputFileTime, oldestOutputFileName); });
+            if (extendedConfigStatus)
+                return extendedConfigStatus;
+        }
+        if (!state.buildInfoChecked.has(resolvedPath)) {
+            state.buildInfoChecked.set(resolvedPath, true);
+            var buildInfoPath = ts.getOutputPathForBuildInfo(project.options);
+            if (buildInfoPath) {
+                var value = state.readFileWithCache(buildInfoPath);
+                var buildInfo = value && ts.getBuildInfo(value);
+                if (buildInfo && (buildInfo.bundle || buildInfo.program) && buildInfo.version !== ts.version) {
+                    return {
+                        type: ts.UpToDateStatusType.TsVersionOutputOfDate,
+                        version: buildInfo.version
+                    };
+                }
+            }
+        }
+        if (usesPrepend && pseudoUpToDate) {
+            return {
+                type: ts.UpToDateStatusType.OutOfDateWithPrepend,
+                outOfDateOutputFileName: oldestOutputFileName,
+                newerProjectName: upstreamChangedProject
+            };
+        }
+        // Up to date
+        return {
+            type: pseudoUpToDate ? ts.UpToDateStatusType.UpToDateWithUpstreamTypes : ts.UpToDateStatusType.UpToDate,
+            newestDeclarationFileContentChangedTime: newestDeclarationFileContentChangedTime,
+            newestInputFileTime: newestInputFileTime,
+            newestOutputFileTime: newestOutputFileTime,
+            newestInputFileName: newestInputFileName,
+            newestOutputFileName: newestOutputFileName,
+            oldestOutputFileName: oldestOutputFileName
+        };
     }
-    function formatUpToDateStatus(configFileName, status, relName, formatMessage) {
+    function getUpToDateStatus(state, project, resolvedPath) {
+        if (project === undefined) {
+            return { type: ts.UpToDateStatusType.Unbuildable, reason: "File deleted mid-build" };
+        }
+        var prior = state.projectStatus.get(resolvedPath);
+        if (prior !== undefined) {
+            return prior;
+        }
+        var actual = getUpToDateStatusWorker(state, project, resolvedPath);
+        state.projectStatus.set(resolvedPath, actual);
+        return actual;
+    }
+    function updateOutputTimestampsWorker(state, proj, priorNewestUpdateTime, verboseMessage, skipOutputs) {
+        var host = state.host;
+        var outputs = ts.getAllProjectOutputs(proj, !host.useCaseSensitiveFileNames());
+        if (!skipOutputs || outputs.length !== skipOutputs.size) {
+            var reportVerbose = !!state.options.verbose;
+            var now = host.now ? host.now() : new Date();
+            for (var _i = 0, outputs_2 = outputs; _i < outputs_2.length; _i++) {
+                var file = outputs_2[_i];
+                if (skipOutputs && skipOutputs.has(toPath(state, file))) {
+                    continue;
+                }
+                if (reportVerbose) {
+                    reportVerbose = false;
+                    reportStatus(state, verboseMessage, proj.options.configFilePath);
+                }
+                if (isDeclarationFile(file)) {
+                    priorNewestUpdateTime = newer(priorNewestUpdateTime, host.getModifiedTime(file) || ts.missingFileModifiedTime);
+                }
+                host.setModifiedTime(file, now);
+                listEmittedFile(state, proj, file);
+            }
+        }
+        return priorNewestUpdateTime;
+    }
+    function updateOutputTimestamps(state, proj, resolvedPath) {
+        if (state.options.dry) {
+            return reportStatus(state, ts.Diagnostics.A_non_dry_build_would_update_timestamps_for_output_of_project_0, proj.options.configFilePath);
+        }
+        var priorNewestUpdateTime = updateOutputTimestampsWorker(state, proj, minimumDate, ts.Diagnostics.Updating_output_timestamps_of_project_0);
+        state.projectStatus.set(resolvedPath, {
+            type: ts.UpToDateStatusType.UpToDate,
+            newestDeclarationFileContentChangedTime: priorNewestUpdateTime,
+            oldestOutputFileName: ts.getFirstProjectOutput(proj, !state.host.useCaseSensitiveFileNames())
+        });
+    }
+    function queueReferencingProjects(state, project, projectPath, projectIndex, config, buildOrder, buildResult) {
+        // Queue only if there are no errors
+        if (buildResult & BuildResultFlags.AnyErrors)
+            return;
+        // Only composite projects can be referenced by other projects
+        if (!config.options.composite)
+            return;
+        // Always use build order to queue projects
+        for (var index = projectIndex + 1; index < buildOrder.length; index++) {
+            var nextProject = buildOrder[index];
+            var nextProjectPath = toResolvedConfigFilePath(state, nextProject);
+            if (state.projectPendingBuild.has(nextProjectPath))
+                continue;
+            var nextProjectConfig = parseConfigFile(state, nextProject, nextProjectPath);
+            if (!nextProjectConfig || !nextProjectConfig.projectReferences)
+                continue;
+            for (var _i = 0, _a = nextProjectConfig.projectReferences; _i < _a.length; _i++) {
+                var ref = _a[_i];
+                var resolvedRefPath = resolveProjectName(state, ref.path);
+                if (toResolvedConfigFilePath(state, resolvedRefPath) !== projectPath)
+                    continue;
+                // If the project is referenced with prepend, always build downstream projects,
+                // If declaration output is changed, build the project
+                // otherwise mark the project UpToDateWithUpstreamTypes so it updates output time stamps
+                var status = state.projectStatus.get(nextProjectPath);
+                if (status) {
+                    switch (status.type) {
+                        case ts.UpToDateStatusType.UpToDate:
+                            if (buildResult & BuildResultFlags.DeclarationOutputUnchanged) {
+                                if (ref.prepend) {
+                                    state.projectStatus.set(nextProjectPath, {
+                                        type: ts.UpToDateStatusType.OutOfDateWithPrepend,
+                                        outOfDateOutputFileName: status.oldestOutputFileName,
+                                        newerProjectName: project
+                                    });
+                                }
+                                else {
+                                    status.type = ts.UpToDateStatusType.UpToDateWithUpstreamTypes;
+                                }
+                                break;
+                            }
+                        // falls through
+                        case ts.UpToDateStatusType.UpToDateWithUpstreamTypes:
+                        case ts.UpToDateStatusType.OutOfDateWithPrepend:
+                            if (!(buildResult & BuildResultFlags.DeclarationOutputUnchanged)) {
+                                state.projectStatus.set(nextProjectPath, {
+                                    type: ts.UpToDateStatusType.OutOfDateWithUpstream,
+                                    outOfDateOutputFileName: status.type === ts.UpToDateStatusType.OutOfDateWithPrepend ? status.outOfDateOutputFileName : status.oldestOutputFileName,
+                                    newerProjectName: project
+                                });
+                            }
+                            break;
+                        case ts.UpToDateStatusType.UpstreamBlocked:
+                            if (toResolvedConfigFilePath(state, resolveProjectName(state, status.upstreamProjectName)) === projectPath) {
+                                clearProjectStatus(state, nextProjectPath);
+                            }
+                            break;
+                    }
+                }
+                addProjToQueue(state, nextProjectPath, ts.ConfigFileProgramReloadLevel.None);
+                break;
+            }
+        }
+    }
+    function build(state, project, cancellationToken, onlyReferences) {
+        var buildOrder = getBuildOrderFor(state, project, onlyReferences);
+        if (!buildOrder)
+            return ts.ExitStatus.InvalidProject_OutputsSkipped;
+        setupInitialBuild(state, cancellationToken);
+        var reportQueue = true;
+        var successfulProjects = 0;
+        var errorProjects = 0;
+        while (true) {
+            var invalidatedProject = getNextInvalidatedProject(state, buildOrder, reportQueue);
+            if (!invalidatedProject)
+                break;
+            reportQueue = false;
+            invalidatedProject.done(cancellationToken);
+            if (state.diagnostics.has(invalidatedProject.projectPath)) {
+                errorProjects++;
+            }
+            else {
+                successfulProjects++;
+            }
+        }
+        disableCache(state);
+        reportErrorSummary(state, buildOrder);
+        startWatching(state, buildOrder);
+        return errorProjects ?
+            successfulProjects ?
+                ts.ExitStatus.DiagnosticsPresent_OutputsGenerated :
+                ts.ExitStatus.DiagnosticsPresent_OutputsSkipped :
+            ts.ExitStatus.Success;
+    }
+    function clean(state, project, onlyReferences) {
+        var buildOrder = getBuildOrderFor(state, project, onlyReferences);
+        if (!buildOrder)
+            return ts.ExitStatus.InvalidProject_OutputsSkipped;
+        var options = state.options, host = state.host;
+        var filesToDelete = options.dry ? [] : undefined;
+        for (var _i = 0, buildOrder_1 = buildOrder; _i < buildOrder_1.length; _i++) {
+            var proj = buildOrder_1[_i];
+            var resolvedPath = toResolvedConfigFilePath(state, proj);
+            var parsed = parseConfigFile(state, proj, resolvedPath);
+            if (parsed === undefined) {
+                // File has gone missing; fine to ignore here
+                reportParseConfigFileDiagnostic(state, resolvedPath);
+                continue;
+            }
+            var outputs = ts.getAllProjectOutputs(parsed, !host.useCaseSensitiveFileNames());
+            for (var _a = 0, outputs_3 = outputs; _a < outputs_3.length; _a++) {
+                var output = outputs_3[_a];
+                if (host.fileExists(output)) {
+                    if (filesToDelete) {
+                        filesToDelete.push(output);
+                    }
+                    else {
+                        host.deleteFile(output);
+                        invalidateProject(state, resolvedPath, ts.ConfigFileProgramReloadLevel.None);
+                    }
+                }
+            }
+        }
+        if (filesToDelete) {
+            reportStatus(state, ts.Diagnostics.A_non_dry_build_would_delete_the_following_files_Colon_0, filesToDelete.map(function (f) { return "\r\n * " + f; }).join(""));
+        }
+        return ts.ExitStatus.Success;
+    }
+    function invalidateProject(state, resolved, reloadLevel) {
+        // If host implements getParsedCommandLine, we cant get list of files from parseConfigFileHost
+        if (state.host.getParsedCommandLine && reloadLevel === ts.ConfigFileProgramReloadLevel.Partial) {
+            reloadLevel = ts.ConfigFileProgramReloadLevel.Full;
+        }
+        if (reloadLevel === ts.ConfigFileProgramReloadLevel.Full) {
+            state.configFileCache.delete(resolved);
+            state.buildOrder = undefined;
+        }
+        state.needsSummary = true;
+        clearProjectStatus(state, resolved);
+        addProjToQueue(state, resolved, reloadLevel);
+        enableCache(state);
+    }
+    function invalidateProjectAndScheduleBuilds(state, resolvedPath, reloadLevel) {
+        state.reportFileChangeDetected = true;
+        invalidateProject(state, resolvedPath, reloadLevel);
+        scheduleBuildInvalidatedProject(state);
+    }
+    function scheduleBuildInvalidatedProject(state) {
+        var hostWithWatch = state.hostWithWatch;
+        if (!hostWithWatch.setTimeout || !hostWithWatch.clearTimeout) {
+            return;
+        }
+        if (state.timerToBuildInvalidatedProject) {
+            hostWithWatch.clearTimeout(state.timerToBuildInvalidatedProject);
+        }
+        state.timerToBuildInvalidatedProject = hostWithWatch.setTimeout(buildNextInvalidatedProject, 250, state);
+    }
+    function buildNextInvalidatedProject(state) {
+        state.timerToBuildInvalidatedProject = undefined;
+        if (state.reportFileChangeDetected) {
+            state.reportFileChangeDetected = false;
+            state.projectErrorsReported.clear();
+            reportWatchStatus(state, ts.Diagnostics.File_change_detected_Starting_incremental_compilation);
+        }
+        var buildOrder = getBuildOrder(state);
+        var invalidatedProject = getNextInvalidatedProject(state, buildOrder, /*reportQueue*/ false);
+        if (invalidatedProject) {
+            invalidatedProject.done();
+            if (state.projectPendingBuild.size) {
+                // Schedule next project for build
+                if (state.watch && !state.timerToBuildInvalidatedProject) {
+                    scheduleBuildInvalidatedProject(state);
+                }
+                return;
+            }
+        }
+        disableCache(state);
+        reportErrorSummary(state, buildOrder);
+    }
+    function watchConfigFile(state, resolved, resolvedPath) {
+        if (!state.watch || state.allWatchedConfigFiles.has(resolvedPath))
+            return;
+        state.allWatchedConfigFiles.set(resolvedPath, state.watchFile(state.hostWithWatch, resolved, function () {
+            invalidateProjectAndScheduleBuilds(state, resolvedPath, ts.ConfigFileProgramReloadLevel.Full);
+        }, ts.PollingInterval.High, "Config file" /* ConfigFile */, resolved));
+    }
+    function isSameFile(state, file1, file2) {
+        return ts.comparePaths(file1, file2, state.currentDirectory, !state.host.useCaseSensitiveFileNames()) === 0 /* EqualTo */;
+    }
+    function isOutputFile(state, fileName, configFile) {
+        if (configFile.options.noEmit)
+            return false;
+        // ts or tsx files are not output
+        if (!ts.fileExtensionIs(fileName, ".d.ts" /* Dts */) &&
+            (ts.fileExtensionIs(fileName, ".ts" /* Ts */) || ts.fileExtensionIs(fileName, ".tsx" /* Tsx */))) {
+            return false;
+        }
+        // If options have --outFile or --out, check if its that
+        var out = configFile.options.outFile || configFile.options.out;
+        if (out && (isSameFile(state, fileName, out) || isSameFile(state, fileName, ts.removeFileExtension(out) + ".d.ts" /* Dts */))) {
+            return true;
+        }
+        // If declarationDir is specified, return if its a file in that directory
+        if (configFile.options.declarationDir && ts.containsPath(configFile.options.declarationDir, fileName, state.currentDirectory, !state.host.useCaseSensitiveFileNames())) {
+            return true;
+        }
+        // If --outDir, check if file is in that directory
+        if (configFile.options.outDir && ts.containsPath(configFile.options.outDir, fileName, state.currentDirectory, !state.host.useCaseSensitiveFileNames())) {
+            return true;
+        }
+        return !ts.forEach(configFile.fileNames, function (inputFile) { return isSameFile(state, fileName, inputFile); });
+    }
+    function watchWildCardDirectories(state, resolved, resolvedPath, parsed) {
+        if (!state.watch)
+            return;
+        ts.updateWatchingWildcardDirectories(getOrCreateValueMapFromConfigFileMap(state.allWatchedWildcardDirectories, resolvedPath), ts.createMapFromTemplate(parsed.configFileSpecs.wildcardDirectories), function (dir, flags) { return state.watchDirectory(state.hostWithWatch, dir, function (fileOrDirectory) {
+            var fileOrDirectoryPath = toPath(state, fileOrDirectory);
+            if (fileOrDirectoryPath !== toPath(state, dir) && ts.hasExtension(fileOrDirectoryPath) && !ts.isSupportedSourceFileName(fileOrDirectory, parsed.options)) {
+                state.writeLog("Project: " + resolved + " Detected file add/remove of non supported extension: " + fileOrDirectory);
+                return;
+            }
+            if (isOutputFile(state, fileOrDirectory, parsed)) {
+                state.writeLog(fileOrDirectory + " is output file");
+                return;
+            }
+            invalidateProjectAndScheduleBuilds(state, resolvedPath, ts.ConfigFileProgramReloadLevel.Partial);
+        }, flags, "Wild card directory" /* WildcardDirectory */, resolved); });
+    }
+    function watchInputFiles(state, resolved, resolvedPath, parsed) {
+        if (!state.watch)
+            return;
+        ts.mutateMap(getOrCreateValueMapFromConfigFileMap(state.allWatchedInputFiles, resolvedPath), ts.arrayToMap(parsed.fileNames, function (fileName) { return toPath(state, fileName); }), {
+            createNewValue: function (path, input) { return state.watchFilePath(state.hostWithWatch, input, function () { return invalidateProjectAndScheduleBuilds(state, resolvedPath, ts.ConfigFileProgramReloadLevel.None); }, ts.PollingInterval.Low, path, "Source file" /* SourceFile */, resolved); },
+            onDeleteValue: ts.closeFileWatcher,
+        });
+    }
+    function startWatching(state, buildOrder) {
+        if (!state.watchAllProjectsPending)
+            return;
+        state.watchAllProjectsPending = false;
+        for (var _i = 0, buildOrder_2 = buildOrder; _i < buildOrder_2.length; _i++) {
+            var resolved = buildOrder_2[_i];
+            var resolvedPath = toResolvedConfigFilePath(state, resolved);
+            // Watch this file
+            watchConfigFile(state, resolved, resolvedPath);
+            var cfg = parseConfigFile(state, resolved, resolvedPath);
+            if (cfg) {
+                // Update watchers for wildcard directories
+                watchWildCardDirectories(state, resolved, resolvedPath, cfg);
+                // Watch input files
+                watchInputFiles(state, resolved, resolvedPath, cfg);
+            }
+        }
+    }
+    function createSolutionBuilderWorker(watch, hostOrHostWithWatch, rootNames, options) {
+        var state = createSolutionBuilderState(watch, hostOrHostWithWatch, rootNames, options);
+        return {
+            build: function (project, cancellationToken) { return build(state, project, cancellationToken); },
+            clean: function (project) { return clean(state, project); },
+            buildReferences: function (project, cancellationToken) { return build(state, project, cancellationToken, /*onlyReferences*/ true); },
+            cleanReferences: function (project) { return clean(state, project, /*onlyReferences*/ true); },
+            getNextInvalidatedProject: function (cancellationToken) {
+                setupInitialBuild(state, cancellationToken);
+                return getNextInvalidatedProject(state, getBuildOrder(state), /*reportQueue*/ false);
+            },
+            getBuildOrder: function () { return getBuildOrder(state); },
+            getUpToDateStatusOfProject: function (project) {
+                var configFileName = resolveProjectName(state, project);
+                var configFilePath = toResolvedConfigFilePath(state, configFileName);
+                return getUpToDateStatus(state, parseConfigFile(state, configFileName, configFilePath), configFilePath);
+            },
+            invalidateProject: function (configFilePath, reloadLevel) { return invalidateProject(state, configFilePath, reloadLevel || ts.ConfigFileProgramReloadLevel.None); },
+            buildNextInvalidatedProject: function () { return buildNextInvalidatedProject(state); },
+        };
+    }
+    function relName(state, path) {
+        return ts.convertToRelativePath(path, state.currentDirectory, function (f) { return state.getCanonicalFileName(f); });
+    }
+    function reportStatus(state, message) {
+        var args = [];
+        for (var _i = 2; _i < arguments.length; _i++) {
+            args[_i - 2] = arguments[_i];
+        }
+        state.host.reportSolutionBuilderStatus(ts.createCompilerDiagnostic.apply(void 0, [message].concat(args)));
+    }
+    function reportWatchStatus(state, message) {
+        var args = [];
+        for (var _i = 2; _i < arguments.length; _i++) {
+            args[_i - 2] = arguments[_i];
+        }
+        if (state.hostWithWatch.onWatchStatusChange) {
+            state.hostWithWatch.onWatchStatusChange(ts.createCompilerDiagnostic.apply(void 0, [message].concat(args)), state.host.getNewLine(), state.baseCompilerOptions);
+        }
+    }
+    function reportErrors(_a, errors) {
+        var host = _a.host;
+        errors.forEach(function (err) { return host.reportDiagnostic(err); });
+    }
+    function reportAndStoreErrors(state, proj, errors) {
+        reportErrors(state, errors);
+        state.projectErrorsReported.set(proj, true);
+        if (errors.length) {
+            state.diagnostics.set(proj, errors);
+        }
+    }
+    function reportParseConfigFileDiagnostic(state, proj) {
+        reportAndStoreErrors(state, proj, [state.configFileCache.get(proj)]);
+    }
+    function reportErrorSummary(state, buildOrder) {
+        if (!state.needsSummary || (!state.watch && !state.host.reportErrorSummary))
+            return;
+        state.needsSummary = false;
+        var diagnostics = state.diagnostics;
+        // Report errors from the other projects
+        buildOrder.forEach(function (project) {
+            var projectPath = toResolvedConfigFilePath(state, project);
+            if (!state.projectErrorsReported.has(projectPath)) {
+                reportErrors(state, diagnostics.get(projectPath) || ts.emptyArray);
+            }
+        });
+        var totalErrors = 0;
+        diagnostics.forEach(function (singleProjectErrors) { return totalErrors += ts.getErrorCountForSummary(singleProjectErrors); });
+        if (state.watch) {
+            reportWatchStatus(state, ts.getWatchErrorSummaryDiagnosticMessage(totalErrors), totalErrors);
+        }
+        else {
+            state.host.reportErrorSummary(totalErrors);
+        }
+    }
+    /**
+     * Report the build ordering inferred from the current project graph if we're in verbose mode
+     */
+    function reportBuildQueue(state, buildQueue) {
+        if (state.options.verbose) {
+            reportStatus(state, ts.Diagnostics.Projects_in_this_build_Colon_0, buildQueue.map(function (s) { return "\r\n    * " + relName(state, s); }).join(""));
+        }
+    }
+    function reportUpToDateStatus(state, configFileName, status) {
         switch (status.type) {
-            case UpToDateStatusType.OutOfDateWithSelf:
-                return formatMessage(ts.Diagnostics.Project_0_is_out_of_date_because_oldest_output_1_is_older_than_newest_input_2, relName(configFileName), relName(status.outOfDateOutputFileName), relName(status.newerInputFileName));
-            case UpToDateStatusType.OutOfDateWithUpstream:
-                return formatMessage(ts.Diagnostics.Project_0_is_out_of_date_because_oldest_output_1_is_older_than_newest_input_2, relName(configFileName), relName(status.outOfDateOutputFileName), relName(status.newerProjectName));
-            case UpToDateStatusType.OutputMissing:
-                return formatMessage(ts.Diagnostics.Project_0_is_out_of_date_because_output_file_1_does_not_exist, relName(configFileName), relName(status.missingOutputFileName));
-            case UpToDateStatusType.UpToDate:
+            case ts.UpToDateStatusType.OutOfDateWithSelf:
+                return reportStatus(state, ts.Diagnostics.Project_0_is_out_of_date_because_oldest_output_1_is_older_than_newest_input_2, relName(state, configFileName), relName(state, status.outOfDateOutputFileName), relName(state, status.newerInputFileName));
+            case ts.UpToDateStatusType.OutOfDateWithUpstream:
+                return reportStatus(state, ts.Diagnostics.Project_0_is_out_of_date_because_oldest_output_1_is_older_than_newest_input_2, relName(state, configFileName), relName(state, status.outOfDateOutputFileName), relName(state, status.newerProjectName));
+            case ts.UpToDateStatusType.OutputMissing:
+                return reportStatus(state, ts.Diagnostics.Project_0_is_out_of_date_because_output_file_1_does_not_exist, relName(state, configFileName), relName(state, status.missingOutputFileName));
+            case ts.UpToDateStatusType.UpToDate:
                 if (status.newestInputFileTime !== undefined) {
-                    return formatMessage(ts.Diagnostics.Project_0_is_up_to_date_because_newest_input_1_is_older_than_oldest_output_2, relName(configFileName), relName(status.newestInputFileName || ""), relName(status.oldestOutputFileName || ""));
+                    return reportStatus(state, ts.Diagnostics.Project_0_is_up_to_date_because_newest_input_1_is_older_than_oldest_output_2, relName(state, configFileName), relName(state, status.newestInputFileName || ""), relName(state, status.oldestOutputFileName || ""));
                 }
                 // Don't report anything for "up to date because it was already built" -- too verbose
                 break;
-            case UpToDateStatusType.OutOfDateWithPrepend:
-                return formatMessage(ts.Diagnostics.Project_0_is_out_of_date_because_output_of_its_dependency_1_has_changed, relName(configFileName), relName(status.newerProjectName));
-            case UpToDateStatusType.UpToDateWithUpstreamTypes:
-                return formatMessage(ts.Diagnostics.Project_0_is_up_to_date_with_d_ts_files_from_its_dependencies, relName(configFileName));
-            case UpToDateStatusType.UpstreamOutOfDate:
-                return formatMessage(ts.Diagnostics.Project_0_is_out_of_date_because_its_dependency_1_is_out_of_date, relName(configFileName), relName(status.upstreamProjectName));
-            case UpToDateStatusType.UpstreamBlocked:
-                return formatMessage(ts.Diagnostics.Project_0_can_t_be_built_because_its_dependency_1_has_errors, relName(configFileName), relName(status.upstreamProjectName));
-            case UpToDateStatusType.Unbuildable:
-                return formatMessage(ts.Diagnostics.Failed_to_parse_file_0_Colon_1, relName(configFileName), status.reason);
-            case UpToDateStatusType.TsVersionOutputOfDate:
-                return formatMessage(ts.Diagnostics.Project_0_is_out_of_date_because_output_for_it_was_generated_with_version_1_that_differs_with_current_version_2, relName(configFileName), status.version, ts.version);
-            case UpToDateStatusType.ContainerOnly:
+            case ts.UpToDateStatusType.OutOfDateWithPrepend:
+                return reportStatus(state, ts.Diagnostics.Project_0_is_out_of_date_because_output_of_its_dependency_1_has_changed, relName(state, configFileName), relName(state, status.newerProjectName));
+            case ts.UpToDateStatusType.UpToDateWithUpstreamTypes:
+                return reportStatus(state, ts.Diagnostics.Project_0_is_up_to_date_with_d_ts_files_from_its_dependencies, relName(state, configFileName));
+            case ts.UpToDateStatusType.UpstreamOutOfDate:
+                return reportStatus(state, ts.Diagnostics.Project_0_is_out_of_date_because_its_dependency_1_is_out_of_date, relName(state, configFileName), relName(state, status.upstreamProjectName));
+            case ts.UpToDateStatusType.UpstreamBlocked:
+                return reportStatus(state, ts.Diagnostics.Project_0_can_t_be_built_because_its_dependency_1_has_errors, relName(state, configFileName), relName(state, status.upstreamProjectName));
+            case ts.UpToDateStatusType.Unbuildable:
+                return reportStatus(state, ts.Diagnostics.Failed_to_parse_file_0_Colon_1, relName(state, configFileName), status.reason);
+            case ts.UpToDateStatusType.TsVersionOutputOfDate:
+                return reportStatus(state, ts.Diagnostics.Project_0_is_out_of_date_because_output_for_it_was_generated_with_version_1_that_differs_with_current_version_2, relName(state, configFileName), status.version, ts.version);
+            case ts.UpToDateStatusType.ContainerOnly:
             // Don't report status on "solution" projects
-            case UpToDateStatusType.ComputingUpstream:
+            case ts.UpToDateStatusType.ComputingUpstream:
                 // Should never leak from getUptoDateStatusWorker
                 break;
             default:
                 ts.assertType(status);
         }
     }
-    ts.formatUpToDateStatus = formatUpToDateStatus;
-})(ts || (ts = {}));
-/* @internal */
-var ts;
-(function (ts) {
-    var ValueKind;
-    (function (ValueKind) {
-        ValueKind[ValueKind["Const"] = 0] = "Const";
-        ValueKind[ValueKind["Array"] = 1] = "Array";
-        ValueKind[ValueKind["FunctionOrClass"] = 2] = "FunctionOrClass";
-        ValueKind[ValueKind["Object"] = 3] = "Object";
-    })(ValueKind = ts.ValueKind || (ts.ValueKind = {}));
-    function inspectModule(fileNameToRequire) {
-        return inspectValue(ts.removeFileExtension(ts.getBaseFileName(fileNameToRequire)), tryRequire(fileNameToRequire));
-    }
-    ts.inspectModule = inspectModule;
-    function inspectValue(name, value) {
-        return getValueInfo(name, value, getRecurser());
-    }
-    ts.inspectValue = inspectValue;
-    function getRecurser() {
-        var seen = [];
-        var nameStack = [];
-        return function (obj, name, cbOk, cbFail) {
-            if (seen.indexOf(obj) !== -1 || nameStack.length > 4) {
-                return cbFail(seen.indexOf(obj) !== -1, nameStack);
-            }
-            seen.push(obj);
-            nameStack.push(name);
-            var res = cbOk();
-            nameStack.pop();
-            seen.pop();
-            return res;
-        };
-    }
-    function getValueInfo(name, value, recurser) {
-        return recurser(value, name, function () {
-            if (typeof value === "function")
-                return getFunctionOrClassInfo(value, name, recurser);
-            if (typeof value === "object") {
-                var builtin = getBuiltinType(name, value, recurser);
-                if (builtin !== undefined)
-                    return builtin;
-                var entries = getEntriesOfObject(value);
-                var hasNontrivialPrototype = Object.getPrototypeOf(value) !== Object.prototype;
-                var members = ts.flatMap(entries, function (_a) {
-                    var key = _a.key, value = _a.value;
-                    return getValueInfo(key, value, recurser);
-                });
-                return { kind: 3 /* Object */, name: name, hasNontrivialPrototype: hasNontrivialPrototype, members: members };
-            }
-            return { kind: 0 /* Const */, name: name, typeName: isNullOrUndefined(value) ? "any" : typeof value };
-        }, function (isCircularReference, keyStack) { return anyValue(name, " " + (isCircularReference ? "Circular reference" : "Too-deep object hierarchy") + " from " + keyStack.join(".")); });
-    }
-    function getFunctionOrClassInfo(fn, name, recurser) {
-        var prototypeMembers = getPrototypeMembers(fn, recurser);
-        var namespaceMembers = ts.flatMap(getEntriesOfObject(fn), function (_a) {
-            var key = _a.key, value = _a.value;
-            return getValueInfo(key, value, recurser);
-        });
-        var toString = ts.cast(Function.prototype.toString.call(fn), ts.isString);
-        var source = ts.stringContains(toString, "{ [native code] }") ? getFunctionLength(fn) : toString;
-        return { kind: 2 /* FunctionOrClass */, name: name, source: source, namespaceMembers: namespaceMembers, prototypeMembers: prototypeMembers };
-    }
-    var builtins = ts.memoize(function () {
-        var map = ts.createMap();
-        for (var _i = 0, _a = getEntriesOfObject(global); _i < _a.length; _i++) {
-            var _b = _a[_i], key = _b.key, value = _b.value;
-            if (typeof value === "function" && typeof value.prototype === "object" && value !== Object) {
-                map.set(key, value);
-            }
-        }
-        return map;
-    });
-    function getBuiltinType(name, value, recurser) {
-        return ts.isArray(value)
-            ? { name: name, kind: 1 /* Array */, inner: value.length && getValueInfo("element", ts.first(value), recurser) || anyValue(name) }
-            : ts.forEachEntry(builtins(), function (builtin, builtinName) {
-                return value instanceof builtin ? { kind: 0 /* Const */, name: name, typeName: builtinName } : undefined;
-            });
-    }
-    function getPrototypeMembers(fn, recurser) {
-        var prototype = fn.prototype;
-        // tslint:disable-next-line no-unnecessary-type-assertion (TODO: update LKG and it will really be unnecessary)
-        return typeof prototype !== "object" || prototype === null ? ts.emptyArray : ts.mapDefined(getEntriesOfObject(prototype), function (_a) {
-            var key = _a.key, value = _a.value;
-            return key === "constructor" ? undefined : getValueInfo(key, value, recurser);
-        });
-    }
-    var ignoredProperties = ["arguments", "caller", "constructor", "eval", "super_"];
-    var reservedFunctionProperties = Object.getOwnPropertyNames(ts.noop);
-    function getEntriesOfObject(obj) {
-        var seen = ts.createMap();
-        var entries = [];
-        var chain = obj;
-        while (!isNullOrUndefined(chain) && chain !== Object.prototype && chain !== Function.prototype) {
-            for (var _i = 0, _a = Object.getOwnPropertyNames(chain); _i < _a.length; _i++) {
-                var key = _a[_i];
-                if (!isJsPrivate(key) &&
-                    ignoredProperties.indexOf(key) === -1 &&
-                    (typeof obj !== "function" || reservedFunctionProperties.indexOf(key) === -1) &&
-                    // Don't add property from a higher prototype if it already exists in a lower one
-                    ts.addToSeen(seen, key)) {
-                    var value = safeGetPropertyOfObject(chain, key);
-                    // Don't repeat "toString" that matches signature from Object.prototype
-                    if (!(key === "toString" && typeof value === "function" && value.length === 0)) {
-                        entries.push({ key: key, value: value });
-                    }
-                }
-            }
-            chain = Object.getPrototypeOf(chain);
-        }
-        return entries.sort(function (e1, e2) { return ts.compareStringsCaseSensitive(e1.key, e2.key); });
-    }
-    function getFunctionLength(fn) {
-        return ts.tryCast(safeGetPropertyOfObject(fn, "length"), ts.isNumber) || 0;
-    }
-    function safeGetPropertyOfObject(obj, key) {
-        var desc = Object.getOwnPropertyDescriptor(obj, key);
-        return desc && desc.value;
-    }
-    function isNullOrUndefined(value) {
-        return value == null; // tslint:disable-line
-    }
-    function anyValue(name, comment) {
-        return { kind: 0 /* Const */, name: name, typeName: "any", comment: comment };
-    }
-    function isJsPrivate(name) {
-        return ts.startsWith(name, "_");
-    }
-    ts.isJsPrivate = isJsPrivate;
-    function tryRequire(fileNameToRequire) {
-        try {
-            return require(fileNameToRequire);
-        }
-        catch (_a) {
-            return undefined;
+    /**
+     * Report the up-to-date status of a project if we're in verbose mode
+     */
+    function verboseReportProjectStatus(state, configFileName, status) {
+        if (state.options.verbose) {
+            reportUpToDateStatus(state, configFileName, status);
         }
     }
 })(ts || (ts = {}));
@@ -94607,7 +97545,6 @@ var ts;
         server.ActionSet = "action::set";
         server.ActionInvalidate = "action::invalidate";
         server.ActionPackageInstalled = "action::packageInstalled";
-        server.ActionValueInspected = "action::valueInspected";
         server.EventTypesRegistry = "event::typesRegistry";
         server.EventBeginInstallTypes = "event::beginInstallTypes";
         server.EventEndInstallTypes = "event::endInstallTypes";
@@ -94624,6 +97561,11 @@ var ts;
              * typingsInstaller will run the command with `${npmLocation} install ...`.
              */
             Arguments.NpmLocation = "--npmLocation";
+            /**
+             * Flag indicating that the typings installer should try to validate the default npm location.
+             * If the default npm is not found when this flag is enabled, fallback to `npm install`
+             */
+            Arguments.ValidateDefaultNpmLocation = "--validateDefaultNpmLocation";
         })(Arguments = server.Arguments || (server.Arguments = {}));
         function hasArgument(argumentName) {
             return ts.sys.args.indexOf(argumentName) >= 0;
@@ -94693,6 +97635,10 @@ var ts;
             "zlib"
         ];
         JsTyping.nodeCoreModules = ts.arrayToSet(JsTyping.nodeCoreModuleList);
+        function nonRelativeModuleNameForTypingCache(moduleName) {
+            return JsTyping.nodeCoreModules.has(moduleName) ? "node" : moduleName;
+        }
+        JsTyping.nonRelativeModuleNameForTypingCache = nonRelativeModuleNameForTypingCache;
         function loadSafeList(host, safeListPath) {
             var result = ts.readConfigFile(safeListPath, function (path) { return host.readFile(path); });
             return ts.createMapFromTemplate(result.config);
@@ -94748,7 +97694,7 @@ var ts;
             getTypingNamesFromSourceFileNames(fileNames);
             // add typings for unresolved imports
             if (unresolvedImports) {
-                var module_1 = ts.deduplicate(unresolvedImports.map(function (moduleId) { return JsTyping.nodeCoreModules.has(moduleId) ? "node" : moduleId; }), ts.equateStringsCaseSensitive, ts.compareStringsCaseSensitive);
+                var module_1 = ts.deduplicate(unresolvedImports.map(nonRelativeModuleNameForTypingCache), ts.equateStringsCaseSensitive, ts.compareStringsCaseSensitive);
                 addInferredTypings(module_1, "Inferred typings from unresolved imports");
             }
             // Add the cached typing locations for inferred typings that are already installed
@@ -94876,66 +97822,82 @@ var ts;
             }
         }
         JsTyping.discoverTypings = discoverTypings;
-        var PackageNameValidationResult;
-        (function (PackageNameValidationResult) {
-            PackageNameValidationResult[PackageNameValidationResult["Ok"] = 0] = "Ok";
-            PackageNameValidationResult[PackageNameValidationResult["ScopedPackagesNotSupported"] = 1] = "ScopedPackagesNotSupported";
-            PackageNameValidationResult[PackageNameValidationResult["EmptyName"] = 2] = "EmptyName";
-            PackageNameValidationResult[PackageNameValidationResult["NameTooLong"] = 3] = "NameTooLong";
-            PackageNameValidationResult[PackageNameValidationResult["NameStartsWithDot"] = 4] = "NameStartsWithDot";
-            PackageNameValidationResult[PackageNameValidationResult["NameStartsWithUnderscore"] = 5] = "NameStartsWithUnderscore";
-            PackageNameValidationResult[PackageNameValidationResult["NameContainsNonURISafeCharacters"] = 6] = "NameContainsNonURISafeCharacters";
-        })(PackageNameValidationResult = JsTyping.PackageNameValidationResult || (JsTyping.PackageNameValidationResult = {}));
+        var NameValidationResult;
+        (function (NameValidationResult) {
+            NameValidationResult[NameValidationResult["Ok"] = 0] = "Ok";
+            NameValidationResult[NameValidationResult["EmptyName"] = 1] = "EmptyName";
+            NameValidationResult[NameValidationResult["NameTooLong"] = 2] = "NameTooLong";
+            NameValidationResult[NameValidationResult["NameStartsWithDot"] = 3] = "NameStartsWithDot";
+            NameValidationResult[NameValidationResult["NameStartsWithUnderscore"] = 4] = "NameStartsWithUnderscore";
+            NameValidationResult[NameValidationResult["NameContainsNonURISafeCharacters"] = 5] = "NameContainsNonURISafeCharacters";
+        })(NameValidationResult = JsTyping.NameValidationResult || (JsTyping.NameValidationResult = {}));
         var maxPackageNameLength = 214;
         /**
          * Validates package name using rules defined at https://docs.npmjs.com/files/package.json
          */
         function validatePackageName(packageName) {
+            return validatePackageNameWorker(packageName, /*supportScopedPackage*/ true);
+        }
+        JsTyping.validatePackageName = validatePackageName;
+        function validatePackageNameWorker(packageName, supportScopedPackage) {
             if (!packageName) {
-                return 2 /* EmptyName */;
+                return 1 /* EmptyName */;
             }
             if (packageName.length > maxPackageNameLength) {
-                return 3 /* NameTooLong */;
+                return 2 /* NameTooLong */;
             }
             if (packageName.charCodeAt(0) === 46 /* dot */) {
-                return 4 /* NameStartsWithDot */;
+                return 3 /* NameStartsWithDot */;
             }
             if (packageName.charCodeAt(0) === 95 /* _ */) {
-                return 5 /* NameStartsWithUnderscore */;
+                return 4 /* NameStartsWithUnderscore */;
             }
             // check if name is scope package like: starts with @ and has one '/' in the middle
             // scoped packages are not currently supported
-            // TODO: when support will be added we'll need to split and check both scope and package name
-            if (/^@[^/]+\/[^/]+$/.test(packageName)) {
-                return 1 /* ScopedPackagesNotSupported */;
+            if (supportScopedPackage) {
+                var matches = /^@([^/]+)\/([^/]+)$/.exec(packageName);
+                if (matches) {
+                    var scopeResult = validatePackageNameWorker(matches[1], /*supportScopedPackage*/ false);
+                    if (scopeResult !== 0 /* Ok */) {
+                        return { name: matches[1], isScopeName: true, result: scopeResult };
+                    }
+                    var packageResult = validatePackageNameWorker(matches[2], /*supportScopedPackage*/ false);
+                    if (packageResult !== 0 /* Ok */) {
+                        return { name: matches[2], isScopeName: false, result: packageResult };
+                    }
+                    return 0 /* Ok */;
+                }
             }
             if (encodeURIComponent(packageName) !== packageName) {
-                return 6 /* NameContainsNonURISafeCharacters */;
+                return 5 /* NameContainsNonURISafeCharacters */;
             }
             return 0 /* Ok */;
         }
-        JsTyping.validatePackageName = validatePackageName;
         function renderPackageNameValidationFailure(result, typing) {
+            return typeof result === "object" ?
+                renderPackageNameValidationFailureWorker(typing, result.result, result.name, result.isScopeName) :
+                renderPackageNameValidationFailureWorker(typing, result, typing, /*isScopeName*/ false);
+        }
+        JsTyping.renderPackageNameValidationFailure = renderPackageNameValidationFailure;
+        function renderPackageNameValidationFailureWorker(typing, result, name, isScopeName) {
+            var kind = isScopeName ? "Scope" : "Package";
             switch (result) {
-                case 2 /* EmptyName */:
-                    return "Package name '" + typing + "' cannot be empty";
-                case 3 /* NameTooLong */:
-                    return "Package name '" + typing + "' should be less than " + maxPackageNameLength + " characters";
-                case 4 /* NameStartsWithDot */:
-                    return "Package name '" + typing + "' cannot start with '.'";
-                case 5 /* NameStartsWithUnderscore */:
-                    return "Package name '" + typing + "' cannot start with '_'";
-                case 1 /* ScopedPackagesNotSupported */:
-                    return "Package '" + typing + "' is scoped and currently is not supported";
-                case 6 /* NameContainsNonURISafeCharacters */:
-                    return "Package name '" + typing + "' contains non URI safe characters";
+                case 1 /* EmptyName */:
+                    return "'" + typing + "':: " + kind + " name '" + name + "' cannot be empty";
+                case 2 /* NameTooLong */:
+                    return "'" + typing + "':: " + kind + " name '" + name + "' should be less than " + maxPackageNameLength + " characters";
+                case 3 /* NameStartsWithDot */:
+                    return "'" + typing + "':: " + kind + " name '" + name + "' cannot start with '.'";
+                case 4 /* NameStartsWithUnderscore */:
+                    return "'" + typing + "':: " + kind + " name '" + name + "' cannot start with '_'";
+                case 5 /* NameContainsNonURISafeCharacters */:
+                    return "'" + typing + "':: " + kind + " name '" + name + "' contains non URI safe characters";
                 case 0 /* Ok */:
                     return ts.Debug.fail(); // Shouldn't have called this.
                 default:
                     throw ts.Debug.assertNever(result);
             }
         }
-        JsTyping.renderPackageNameValidationFailure = renderPackageNameValidationFailure;
     })(JsTyping = ts.JsTyping || (ts.JsTyping = {}));
 })(ts || (ts = {}));
 var ts;
@@ -95158,31 +98120,32 @@ var ts;
                 };
                 TypingsInstaller.prototype.filterTypings = function (typingsToInstall) {
                     var _this = this;
-                    return typingsToInstall.filter(function (typing) {
-                        if (_this.missingTypingsSet.get(typing)) {
+                    return ts.mapDefined(typingsToInstall, function (typing) {
+                        var typingKey = ts.mangleScopedPackageName(typing);
+                        if (_this.missingTypingsSet.get(typingKey)) {
                             if (_this.log.isEnabled())
-                                _this.log.writeLine("'" + typing + "' is in missingTypingsSet - skipping...");
-                            return false;
+                                _this.log.writeLine("'" + typing + "':: '" + typingKey + "' is in missingTypingsSet - skipping...");
+                            return undefined;
                         }
                         var validationResult = ts.JsTyping.validatePackageName(typing);
                         if (validationResult !== 0 /* Ok */) {
                             // add typing name to missing set so we won't process it again
-                            _this.missingTypingsSet.set(typing, true);
+                            _this.missingTypingsSet.set(typingKey, true);
                             if (_this.log.isEnabled())
                                 _this.log.writeLine(ts.JsTyping.renderPackageNameValidationFailure(validationResult, typing));
-                            return false;
+                            return undefined;
                         }
-                        if (!_this.typesRegistry.has(typing)) {
+                        if (!_this.typesRegistry.has(typingKey)) {
                             if (_this.log.isEnabled())
-                                _this.log.writeLine("Entry for package '" + typing + "' does not exist in local types registry - skipping...");
-                            return false;
+                                _this.log.writeLine("'" + typing + "':: Entry for package '" + typingKey + "' does not exist in local types registry - skipping...");
+                            return undefined;
                         }
-                        if (_this.packageNameToTypingLocation.get(typing) && ts.JsTyping.isTypingUpToDate(_this.packageNameToTypingLocation.get(typing), _this.typesRegistry.get(typing))) {
+                        if (_this.packageNameToTypingLocation.get(typingKey) && ts.JsTyping.isTypingUpToDate(_this.packageNameToTypingLocation.get(typingKey), _this.typesRegistry.get(typingKey))) {
                             if (_this.log.isEnabled())
-                                _this.log.writeLine("'" + typing + "' already has an up-to-date typing - skipping...");
-                            return false;
+                                _this.log.writeLine("'" + typing + "':: '" + typingKey + "' already has an up-to-date typing - skipping...");
+                            return undefined;
                         }
-                        return true;
+                        return typingKey;
                     });
                 };
                 TypingsInstaller.prototype.ensurePackageDirectoryExists = function (directory) {
@@ -95442,13 +98405,17 @@ var ts;
                 }
                 return FileLog;
             }());
-            function getDefaultNPMLocation(processName) {
+            function getDefaultNPMLocation(processName, validateDefaultNpmLocation, host) {
                 if (path.basename(processName).indexOf("node") === 0) {
-                    return "\"" + path.join(path.dirname(process.argv[0]), "npm") + "\"";
-                }
-                else {
-                    return "npm";
+                    var npmPath = path.join(path.dirname(process.argv[0]), "npm");
+                    if (!validateDefaultNpmLocation) {
+                        return npmPath;
+                    }
+                    if (host.fileExists(npmPath)) {
+                        return "\"" + npmPath + "\"";
+                    }
                 }
+                return "npm";
             }
             function loadTypesRegistryFile(typesRegistryFilePath, host, log) {
                 if (!host.fileExists(typesRegistryFilePath)) {
@@ -95474,15 +98441,16 @@ var ts;
             }
             var NodeTypingsInstaller = (function (_super) {
                 __extends(NodeTypingsInstaller, _super);
-                function NodeTypingsInstaller(globalTypingsCacheLocation, typingSafeListLocation, typesMapLocation, npmLocation, throttleLimit, log) {
+                function NodeTypingsInstaller(globalTypingsCacheLocation, typingSafeListLocation, typesMapLocation, npmLocation, validateDefaultNpmLocation, throttleLimit, log) {
                     var _this = _super.call(this, ts.sys, globalTypingsCacheLocation, typingSafeListLocation ? ts.toPath(typingSafeListLocation, "", ts.createGetCanonicalFileName(ts.sys.useCaseSensitiveFileNames)) : ts.toPath("typingSafeList.json", __dirname, ts.createGetCanonicalFileName(ts.sys.useCaseSensitiveFileNames)), typesMapLocation ? ts.toPath(typesMapLocation, "", ts.createGetCanonicalFileName(ts.sys.useCaseSensitiveFileNames)) : ts.toPath("typesMap.json", __dirname, ts.createGetCanonicalFileName(ts.sys.useCaseSensitiveFileNames)), throttleLimit, log) || this;
-                    _this.npmPath = npmLocation !== undefined ? npmLocation : getDefaultNPMLocation(process.argv[0]);
+                    _this.npmPath = npmLocation !== undefined ? npmLocation : getDefaultNPMLocation(process.argv[0], validateDefaultNpmLocation, _this.installTypingHost);
                     if (ts.stringContains(_this.npmPath, " ") && _this.npmPath[0] !== "\"") {
                         _this.npmPath = "\"" + _this.npmPath + "\"";
                     }
                     if (_this.log.isEnabled()) {
                         _this.log.writeLine("Process id: " + process.pid);
                         _this.log.writeLine("NPM location: " + _this.npmPath + " (explicit '" + server.Arguments.NpmLocation + "' " + (npmLocation === undefined ? "not " : "") + " provided)");
+                        _this.log.writeLine("validateDefaultNpmLocation: " + validateDefaultNpmLocation);
                     }
                     (_this.nodeExecSync = require("child_process").execSync);
                     _this.ensurePackageDirectoryExists(globalTypingsCacheLocation);
@@ -95546,11 +98514,6 @@ var ts;
                                 }
                                 break;
                             }
-                            case "inspectValue": {
-                                var response = { kind: server.ActionValueInspected, result: ts.inspectModule(req.options.fileNameToRequire) };
-                                _this.sendResponse(response);
-                                break;
-                            }
                             default:
                                 ts.Debug.assertNever(req);
                         }
@@ -95609,6 +98572,7 @@ var ts;
             var typingSafeListLocation = server.findArgument(server.Arguments.TypingSafeListLocation);
             var typesMapLocation = server.findArgument(server.Arguments.TypesMapLocation);
             var npmLocation = server.findArgument(server.Arguments.NpmLocation);
+            var validateDefaultNpmLocation = server.hasArgument(server.Arguments.ValidateDefaultNpmLocation);
             var log = new FileLog(logFilePath);
             if (log.isEnabled()) {
                 process.on("uncaughtException", function (e) {
@@ -95621,7 +98585,7 @@ var ts;
                 }
                 process.exit(0);
             });
-            var installer = new NodeTypingsInstaller(globalTypingsCacheLocation, typingSafeListLocation, typesMapLocation, npmLocation, 5, log);
+            var installer = new NodeTypingsInstaller(globalTypingsCacheLocation, typingSafeListLocation, typesMapLocation, npmLocation, validateDefaultNpmLocation, 5, log);
             installer.listen();
             function indent(newline, str) {
                 return newline + "    " + str.replace(/\r?\n/, newline + "    ");
diff --git a/lib/zh-cn/diagnosticMessages.generated.json b/lib/zh-cn/diagnosticMessages.generated.json
index 23d0bae7b27..2eb27cd9054 100644
--- a/lib/zh-cn/diagnosticMessages.generated.json
+++ b/lib/zh-cn/diagnosticMessages.generated.json
@@ -445,7 +445,7 @@
   "Function_overload_must_be_static_2387": "函数重载必须为静态。",
   "Function_overload_must_not_be_static_2388": "函数重载不能为静态。",
   "Generate_get_and_set_accessors_95046": "生成 \"get\" 和 \"set\" 访问器",
-  "Generates_a_sourcemap_for_each_corresponding_d_ts_file_6000": "为每个相应的 \".d.ts\" 文件生成 sourcemap。",
+  "Generates_a_sourcemap_for_each_corresponding_d_ts_file_6000": "为每个相应的 \".d.ts\" 文件生成源映射。",
   "Generates_corresponding_d_ts_file_6002": "生成相应的 \".d.ts\" 文件。",
   "Generates_corresponding_map_file_6043": "生成相应的 \".map\" 文件。",
   "Generator_implicitly_has_type_0_because_it_does_not_yield_any_values_Consider_supplying_a_return_typ_7025": "生成器隐式具有类型“{0}”，因为它不生成任何值。请考虑提供一个返回类型。",
diff --git a/package.json b/package.json
index 276a49a53b3..2f1b44cbb0d 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
         "@types/mkdirp": "latest",
         "@types/mocha": "latest",
         "@types/ms": "latest",
-        "@types/node": "8.5.5",
+        "@types/node": "latest",
         "@types/node-fetch": "^2.3.4",
         "@types/q": "latest",
         "@types/source-map-support": "latest",
diff --git a/src/compiler/sys.ts b/src/compiler/sys.ts
index 5abc19cdbc4..7049821c90f 100644
--- a/src/compiler/sys.ts
+++ b/src/compiler/sys.ts
@@ -472,59 +472,81 @@ namespace ts {
         }
     }
 
+    /*@internal*/
+    export type BufferEncoding = "ascii" | "utf8" | "utf-8" | "utf16le" | "ucs2" | "ucs-2" | "base64" | "latin1" | "binary" | "hex";
+
     /*@internal*/
     interface NodeBuffer extends Uint8Array {
-        write(str: string, offset?: number, length?: number, encoding?: string): number;
+        constructor: any;
+        write(str: string, encoding?: BufferEncoding): number;
+        write(str: string, offset: number, encoding?: BufferEncoding): number;
+        write(str: string, offset: number, length: number, encoding?: BufferEncoding): number;
         toString(encoding?: string, start?: number, end?: number): string;
-        toJSON(): { type: "Buffer", data: any[] };
-        equals(otherBuffer: Buffer): boolean;
-        compare(otherBuffer: Buffer, targetStart?: number, targetEnd?: number, sourceStart?: number, sourceEnd?: number): number;
-        copy(targetBuffer: Buffer, targetStart?: number, sourceStart?: number, sourceEnd?: number): number;
-        slice(start?: number, end?: number): Buffer;
-        writeUIntLE(value: number, offset: number, byteLength: number, noAssert?: boolean): number;
-        writeUIntBE(value: number, offset: number, byteLength: number, noAssert?: boolean): number;
-        writeIntLE(value: number, offset: number, byteLength: number, noAssert?: boolean): number;
-        writeIntBE(value: number, offset: number, byteLength: number, noAssert?: boolean): number;
-        readUIntLE(offset: number, byteLength: number, noAssert?: boolean): number;
-        readUIntBE(offset: number, byteLength: number, noAssert?: boolean): number;
-        readIntLE(offset: number, byteLength: number, noAssert?: boolean): number;
-        readIntBE(offset: number, byteLength: number, noAssert?: boolean): number;
-        readUInt8(offset: number, noAssert?: boolean): number;
-        readUInt16LE(offset: number, noAssert?: boolean): number;
-        readUInt16BE(offset: number, noAssert?: boolean): number;
-        readUInt32LE(offset: number, noAssert?: boolean): number;
-        readUInt32BE(offset: number, noAssert?: boolean): number;
-        readInt8(offset: number, noAssert?: boolean): number;
-        readInt16LE(offset: number, noAssert?: boolean): number;
-        readInt16BE(offset: number, noAssert?: boolean): number;
-        readInt32LE(offset: number, noAssert?: boolean): number;
-        readInt32BE(offset: number, noAssert?: boolean): number;
-        readFloatLE(offset: number, noAssert?: boolean): number;
-        readFloatBE(offset: number, noAssert?: boolean): number;
-        readDoubleLE(offset: number, noAssert?: boolean): number;
-        readDoubleBE(offset: number, noAssert?: boolean): number;
+        toJSON(): { type: "Buffer"; data: number[] };
+        equals(otherBuffer: Uint8Array): boolean;
+        compare(
+            otherBuffer: Uint8Array,
+            targetStart?: number,
+            targetEnd?: number,
+            sourceStart?: number,
+            sourceEnd?: number
+        ): number;
+        copy(targetBuffer: Uint8Array, targetStart?: number, sourceStart?: number, sourceEnd?: number): number;
+        slice(begin?: number, end?: number): Buffer;
+        subarray(begin?: number, end?: number): Buffer;
+        writeUIntLE(value: number, offset: number, byteLength: number): number;
+        writeUIntBE(value: number, offset: number, byteLength: number): number;
+        writeIntLE(value: number, offset: number, byteLength: number): number;
+        writeIntBE(value: number, offset: number, byteLength: number): number;
+        readUIntLE(offset: number, byteLength: number): number;
+        readUIntBE(offset: number, byteLength: number): number;
+        readIntLE(offset: number, byteLength: number): number;
+        readIntBE(offset: number, byteLength: number): number;
+        readUInt8(offset: number): number;
+        readUInt16LE(offset: number): number;
+        readUInt16BE(offset: number): number;
+        readUInt32LE(offset: number): number;
+        readUInt32BE(offset: number): number;
+        readInt8(offset: number): number;
+        readInt16LE(offset: number): number;
+        readInt16BE(offset: number): number;
+        readInt32LE(offset: number): number;
+        readInt32BE(offset: number): number;
+        readFloatLE(offset: number): number;
+        readFloatBE(offset: number): number;
+        readDoubleLE(offset: number): number;
+        readDoubleBE(offset: number): number;
+        reverse(): this;
         swap16(): Buffer;
         swap32(): Buffer;
         swap64(): Buffer;
-        writeUInt8(value: number, offset: number, noAssert?: boolean): number;
-        writeUInt16LE(value: number, offset: number, noAssert?: boolean): number;
-        writeUInt16BE(value: number, offset: number, noAssert?: boolean): number;
-        writeUInt32LE(value: number, offset: number, noAssert?: boolean): number;
-        writeUInt32BE(value: number, offset: number, noAssert?: boolean): number;
-        writeInt8(value: number, offset: number, noAssert?: boolean): number;
-        writeInt16LE(value: number, offset: number, noAssert?: boolean): number;
-        writeInt16BE(value: number, offset: number, noAssert?: boolean): number;
-        writeInt32LE(value: number, offset: number, noAssert?: boolean): number;
-        writeInt32BE(value: number, offset: number, noAssert?: boolean): number;
-        writeFloatLE(value: number, offset: number, noAssert?: boolean): number;
-        writeFloatBE(value: number, offset: number, noAssert?: boolean): number;
-        writeDoubleLE(value: number, offset: number, noAssert?: boolean): number;
-        writeDoubleBE(value: number, offset: number, noAssert?: boolean): number;
-        fill(value: any, offset?: number, end?: number): this;
-        indexOf(value: string | number | Buffer, byteOffset?: number, encoding?: string): number;
-        lastIndexOf(value: string | number | Buffer, byteOffset?: number, encoding?: string): number;
+        writeUInt8(value: number, offset: number): number;
+        writeUInt16LE(value: number, offset: number): number;
+        writeUInt16BE(value: number, offset: number): number;
+        writeUInt32LE(value: number, offset: number): number;
+        writeUInt32BE(value: number, offset: number): number;
+        writeInt8(value: number, offset: number): number;
+        writeInt16LE(value: number, offset: number): number;
+        writeInt16BE(value: number, offset: number): number;
+        writeInt32LE(value: number, offset: number): number;
+        writeInt32BE(value: number, offset: number): number;
+        writeFloatLE(value: number, offset: number): number;
+        writeFloatBE(value: number, offset: number): number;
+        writeDoubleLE(value: number, offset: number): number;
+        writeDoubleBE(value: number, offset: number): number;
+        readBigUInt64BE(offset?: number): bigint;
+        readBigUInt64LE(offset?: number): bigint;
+        readBigInt64BE(offset?: number): bigint;
+        readBigInt64LE(offset?: number): bigint;
+        writeBigInt64BE(value: bigint, offset?: number): number;
+        writeBigInt64LE(value: bigint, offset?: number): number;
+        writeBigUInt64BE(value: bigint, offset?: number): number;
+        writeBigUInt64LE(value: bigint, offset?: number): number;
+        fill(value: string | Uint8Array | number, offset?: number, end?: number, encoding?: BufferEncoding): this;
+        indexOf(value: string | number | Uint8Array, byteOffset?: number, encoding?: BufferEncoding): number;
+        lastIndexOf(value: string | number | Uint8Array, byteOffset?: number, encoding?: BufferEncoding): number;
         entries(): IterableIterator<[number, number]>;
-        includes(value: string | number | Buffer, byteOffset?: number, encoding?: string): boolean;
+        includes(value: string | number | Buffer, byteOffset?: number, encoding?: BufferEncoding): boolean;
         keys(): IterableIterator<number>;
         values(): IterableIterator<number>;
     }
diff --git a/src/harness/harness.ts b/src/harness/harness.ts
index fe5ec344322..9abafded8f9 100644
--- a/src/harness/harness.ts
+++ b/src/harness/harness.ts
@@ -53,7 +53,7 @@ namespace Utils {
 
     export function byteLength(s: string, encoding?: string): number {
         // stub implementation if Buffer is not available (in-browser case)
-        return Buffer.byteLength(s, encoding);
+        return Buffer.byteLength(s, encoding as ts.BufferEncoding | undefined);
     }
 
     export function evalFile(fileContents: string, fileName: string, nodeContext?: any) {
diff --git a/src/testRunner/externalCompileRunner.ts b/src/testRunner/externalCompileRunner.ts
index a47c0b59e24..dd412c7aef1 100644
--- a/src/testRunner/externalCompileRunner.ts
+++ b/src/testRunner/externalCompileRunner.ts
@@ -5,7 +5,7 @@ const del: typeof import("del") = require("del");
 interface ExecResult {
     stdout: Buffer;
     stderr: Buffer;
-    status: number;
+    status: number | null;
 }
 
 interface UserConfig {
diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts
index 6d81a6f08ab..d73cbab6b5f 100644
--- a/tests/baselines/reference/api/tsserverlibrary.d.ts
+++ b/tests/baselines/reference/api/tsserverlibrary.d.ts
@@ -65,17 +65,17 @@ declare namespace ts {
     }
 }
 declare namespace ts {
-    type Path = string & {
+    export type Path = string & {
         __pathBrand: any;
     };
-    interface TextRange {
+    export interface TextRange {
         pos: number;
         end: number;
     }
-    type JSDocSyntaxKind = SyntaxKind.EndOfFileToken | SyntaxKind.WhitespaceTrivia | SyntaxKind.AtToken | SyntaxKind.NewLineTrivia | SyntaxKind.AsteriskToken | SyntaxKind.OpenBraceToken | SyntaxKind.CloseBraceToken | SyntaxKind.LessThanToken | SyntaxKind.GreaterThanToken | SyntaxKind.OpenBracketToken | SyntaxKind.CloseBracketToken | SyntaxKind.EqualsToken | SyntaxKind.CommaToken | SyntaxKind.DotToken | SyntaxKind.Identifier | SyntaxKind.BacktickToken | SyntaxKind.Unknown | KeywordSyntaxKind;
-    type KeywordSyntaxKind = SyntaxKind.AbstractKeyword | SyntaxKind.AnyKeyword | SyntaxKind.AsKeyword | SyntaxKind.BigIntKeyword | SyntaxKind.BooleanKeyword | SyntaxKind.BreakKeyword | SyntaxKind.CaseKeyword | SyntaxKind.CatchKeyword | SyntaxKind.ClassKeyword | SyntaxKind.ContinueKeyword | SyntaxKind.ConstKeyword | SyntaxKind.ConstructorKeyword | SyntaxKind.DebuggerKeyword | SyntaxKind.DeclareKeyword | SyntaxKind.DefaultKeyword | SyntaxKind.DeleteKeyword | SyntaxKind.DoKeyword | SyntaxKind.ElseKeyword | SyntaxKind.EnumKeyword | SyntaxKind.ExportKeyword | SyntaxKind.ExtendsKeyword | SyntaxKind.FalseKeyword | SyntaxKind.FinallyKeyword | SyntaxKind.ForKeyword | SyntaxKind.FromKeyword | SyntaxKind.FunctionKeyword | SyntaxKind.GetKeyword | SyntaxKind.IfKeyword | SyntaxKind.ImplementsKeyword | SyntaxKind.ImportKeyword | SyntaxKind.InKeyword | SyntaxKind.InferKeyword | SyntaxKind.InstanceOfKeyword | SyntaxKind.InterfaceKeyword | SyntaxKind.IsKeyword | SyntaxKind.KeyOfKeyword | SyntaxKind.LetKeyword | SyntaxKind.ModuleKeyword | SyntaxKind.NamespaceKeyword | SyntaxKind.NeverKeyword | SyntaxKind.NewKeyword | SyntaxKind.NullKeyword | SyntaxKind.NumberKeyword | SyntaxKind.ObjectKeyword | SyntaxKind.PackageKeyword | SyntaxKind.PrivateKeyword | SyntaxKind.ProtectedKeyword | SyntaxKind.PublicKeyword | SyntaxKind.ReadonlyKeyword | SyntaxKind.RequireKeyword | SyntaxKind.GlobalKeyword | SyntaxKind.ReturnKeyword | SyntaxKind.SetKeyword | SyntaxKind.StaticKeyword | SyntaxKind.StringKeyword | SyntaxKind.SuperKeyword | SyntaxKind.SwitchKeyword | SyntaxKind.SymbolKeyword | SyntaxKind.ThisKeyword | SyntaxKind.ThrowKeyword | SyntaxKind.TrueKeyword | SyntaxKind.TryKeyword | SyntaxKind.TypeKeyword | SyntaxKind.TypeOfKeyword | SyntaxKind.UndefinedKeyword | SyntaxKind.UniqueKeyword | SyntaxKind.UnknownKeyword | SyntaxKind.VarKeyword | SyntaxKind.VoidKeyword | SyntaxKind.WhileKeyword | SyntaxKind.WithKeyword | SyntaxKind.YieldKeyword | SyntaxKind.AsyncKeyword | SyntaxKind.AwaitKeyword | SyntaxKind.OfKeyword;
-    type JsxTokenSyntaxKind = SyntaxKind.LessThanSlashToken | SyntaxKind.EndOfFileToken | SyntaxKind.ConflictMarkerTrivia | SyntaxKind.JsxText | SyntaxKind.JsxTextAllWhiteSpaces | SyntaxKind.OpenBraceToken | SyntaxKind.LessThanToken;
-    enum SyntaxKind {
+    export type JSDocSyntaxKind = SyntaxKind.EndOfFileToken | SyntaxKind.WhitespaceTrivia | SyntaxKind.AtToken | SyntaxKind.NewLineTrivia | SyntaxKind.AsteriskToken | SyntaxKind.OpenBraceToken | SyntaxKind.CloseBraceToken | SyntaxKind.LessThanToken | SyntaxKind.GreaterThanToken | SyntaxKind.OpenBracketToken | SyntaxKind.CloseBracketToken | SyntaxKind.EqualsToken | SyntaxKind.CommaToken | SyntaxKind.DotToken | SyntaxKind.Identifier | SyntaxKind.BacktickToken | SyntaxKind.Unknown | KeywordSyntaxKind;
+    export type KeywordSyntaxKind = SyntaxKind.AbstractKeyword | SyntaxKind.AnyKeyword | SyntaxKind.AsKeyword | SyntaxKind.BigIntKeyword | SyntaxKind.BooleanKeyword | SyntaxKind.BreakKeyword | SyntaxKind.CaseKeyword | SyntaxKind.CatchKeyword | SyntaxKind.ClassKeyword | SyntaxKind.ContinueKeyword | SyntaxKind.ConstKeyword | SyntaxKind.ConstructorKeyword | SyntaxKind.DebuggerKeyword | SyntaxKind.DeclareKeyword | SyntaxKind.DefaultKeyword | SyntaxKind.DeleteKeyword | SyntaxKind.DoKeyword | SyntaxKind.ElseKeyword | SyntaxKind.EnumKeyword | SyntaxKind.ExportKeyword | SyntaxKind.ExtendsKeyword | SyntaxKind.FalseKeyword | SyntaxKind.FinallyKeyword | SyntaxKind.ForKeyword | SyntaxKind.FromKeyword | SyntaxKind.FunctionKeyword | SyntaxKind.GetKeyword | SyntaxKind.IfKeyword | SyntaxKind.ImplementsKeyword | SyntaxKind.ImportKeyword | SyntaxKind.InKeyword | SyntaxKind.InferKeyword | SyntaxKind.InstanceOfKeyword | SyntaxKind.InterfaceKeyword | SyntaxKind.IsKeyword | SyntaxKind.KeyOfKeyword | SyntaxKind.LetKeyword | SyntaxKind.ModuleKeyword | SyntaxKind.NamespaceKeyword | SyntaxKind.NeverKeyword | SyntaxKind.NewKeyword | SyntaxKind.NullKeyword | SyntaxKind.NumberKeyword | SyntaxKind.ObjectKeyword | SyntaxKind.PackageKeyword | SyntaxKind.PrivateKeyword | SyntaxKind.ProtectedKeyword | SyntaxKind.PublicKeyword | SyntaxKind.ReadonlyKeyword | SyntaxKind.RequireKeyword | SyntaxKind.GlobalKeyword | SyntaxKind.ReturnKeyword | SyntaxKind.SetKeyword | SyntaxKind.StaticKeyword | SyntaxKind.StringKeyword | SyntaxKind.SuperKeyword | SyntaxKind.SwitchKeyword | SyntaxKind.SymbolKeyword | SyntaxKind.ThisKeyword | SyntaxKind.ThrowKeyword | SyntaxKind.TrueKeyword | SyntaxKind.TryKeyword | SyntaxKind.TypeKeyword | SyntaxKind.TypeOfKeyword | SyntaxKind.UndefinedKeyword | SyntaxKind.UniqueKeyword | SyntaxKind.UnknownKeyword | SyntaxKind.VarKeyword | SyntaxKind.VoidKeyword | SyntaxKind.WhileKeyword | SyntaxKind.WithKeyword | SyntaxKind.YieldKeyword | SyntaxKind.AsyncKeyword | SyntaxKind.AwaitKeyword | SyntaxKind.OfKeyword;
+    export type JsxTokenSyntaxKind = SyntaxKind.LessThanSlashToken | SyntaxKind.EndOfFileToken | SyntaxKind.ConflictMarkerTrivia | SyntaxKind.JsxText | SyntaxKind.JsxTextAllWhiteSpaces | SyntaxKind.OpenBraceToken | SyntaxKind.LessThanToken;
+    export enum SyntaxKind {
         Unknown = 0,
         EndOfFileToken = 1,
         SingleLineCommentTrivia = 2,
@@ -427,7 +427,7 @@ declare namespace ts {
         FirstJSDocTagNode = 300,
         LastJSDocTagNode = 312,
     }
-    enum NodeFlags {
+    export enum NodeFlags {
         None = 0,
         Let = 1,
         Const = 2,
@@ -456,7 +456,7 @@ declare namespace ts {
         ContextFlags = 12679168,
         TypeExcludesFlags = 20480,
     }
-    enum ModifierFlags {
+    export enum ModifierFlags {
         None = 0,
         Export = 1,
         Ambient = 2,
@@ -477,7 +477,7 @@ declare namespace ts {
         ExportDefault = 513,
         All = 3071
     }
-    enum JsxFlags {
+    export enum JsxFlags {
         None = 0,
         /** An element from a named property of the JSX.IntrinsicElements interface */
         IntrinsicNamedElement = 1,
@@ -485,40 +485,40 @@ declare namespace ts {
         IntrinsicIndexedElement = 2,
         IntrinsicElement = 3
     }
-    interface Node extends TextRange {
+    export interface Node extends TextRange {
         kind: SyntaxKind;
         flags: NodeFlags;
         decorators?: NodeArray<Decorator>;
         modifiers?: ModifiersArray;
         parent: Node;
     }
-    interface JSDocContainer {
+    export interface JSDocContainer {
     }
-    type HasJSDoc = ParameterDeclaration | CallSignatureDeclaration | ConstructSignatureDeclaration | MethodSignature | PropertySignature | ArrowFunction | ParenthesizedExpression | SpreadAssignment | ShorthandPropertyAssignment | PropertyAssignment | FunctionExpression | LabeledStatement | ExpressionStatement | VariableStatement | FunctionDeclaration | ConstructorDeclaration | MethodDeclaration | PropertyDeclaration | AccessorDeclaration | ClassLikeDeclaration | InterfaceDeclaration | TypeAliasDeclaration | EnumMember | EnumDeclaration | ModuleDeclaration | ImportEqualsDeclaration | IndexSignatureDeclaration | FunctionTypeNode | ConstructorTypeNode | JSDocFunctionType | ExportDeclaration | EndOfFileToken;
-    type HasType = SignatureDeclaration | VariableDeclaration | ParameterDeclaration | PropertySignature | PropertyDeclaration | TypePredicateNode | ParenthesizedTypeNode | TypeOperatorNode | MappedTypeNode | AssertionExpression | TypeAliasDeclaration | JSDocTypeExpression | JSDocNonNullableType | JSDocNullableType | JSDocOptionalType | JSDocVariadicType;
-    type HasInitializer = HasExpressionInitializer | ForStatement | ForInStatement | ForOfStatement | JsxAttribute;
-    type HasExpressionInitializer = VariableDeclaration | ParameterDeclaration | BindingElement | PropertySignature | PropertyDeclaration | PropertyAssignment | EnumMember;
-    interface NodeArray<T extends Node> extends ReadonlyArray<T>, TextRange {
+    export type HasJSDoc = ParameterDeclaration | CallSignatureDeclaration | ConstructSignatureDeclaration | MethodSignature | PropertySignature | ArrowFunction | ParenthesizedExpression | SpreadAssignment | ShorthandPropertyAssignment | PropertyAssignment | FunctionExpression | LabeledStatement | ExpressionStatement | VariableStatement | FunctionDeclaration | ConstructorDeclaration | MethodDeclaration | PropertyDeclaration | AccessorDeclaration | ClassLikeDeclaration | InterfaceDeclaration | TypeAliasDeclaration | EnumMember | EnumDeclaration | ModuleDeclaration | ImportEqualsDeclaration | IndexSignatureDeclaration | FunctionTypeNode | ConstructorTypeNode | JSDocFunctionType | ExportDeclaration | EndOfFileToken;
+    export type HasType = SignatureDeclaration | VariableDeclaration | ParameterDeclaration | PropertySignature | PropertyDeclaration | TypePredicateNode | ParenthesizedTypeNode | TypeOperatorNode | MappedTypeNode | AssertionExpression | TypeAliasDeclaration | JSDocTypeExpression | JSDocNonNullableType | JSDocNullableType | JSDocOptionalType | JSDocVariadicType;
+    export type HasInitializer = HasExpressionInitializer | ForStatement | ForInStatement | ForOfStatement | JsxAttribute;
+    export type HasExpressionInitializer = VariableDeclaration | ParameterDeclaration | BindingElement | PropertySignature | PropertyDeclaration | PropertyAssignment | EnumMember;
+    export interface NodeArray<T extends Node> extends ReadonlyArray<T>, TextRange {
         hasTrailingComma?: boolean;
     }
-    interface Token<TKind extends SyntaxKind> extends Node {
+    export interface Token<TKind extends SyntaxKind> extends Node {
         kind: TKind;
     }
-    type DotDotDotToken = Token<SyntaxKind.DotDotDotToken>;
-    type QuestionToken = Token<SyntaxKind.QuestionToken>;
-    type ExclamationToken = Token<SyntaxKind.ExclamationToken>;
-    type ColonToken = Token<SyntaxKind.ColonToken>;
-    type EqualsToken = Token<SyntaxKind.EqualsToken>;
-    type AsteriskToken = Token<SyntaxKind.AsteriskToken>;
-    type EqualsGreaterThanToken = Token<SyntaxKind.EqualsGreaterThanToken>;
-    type EndOfFileToken = Token<SyntaxKind.EndOfFileToken> & JSDocContainer;
-    type ReadonlyToken = Token<SyntaxKind.ReadonlyKeyword>;
-    type AwaitKeywordToken = Token<SyntaxKind.AwaitKeyword>;
-    type PlusToken = Token<SyntaxKind.PlusToken>;
-    type MinusToken = Token<SyntaxKind.MinusToken>;
-    type Modifier = Token<SyntaxKind.AbstractKeyword> | Token<SyntaxKind.AsyncKeyword> | Token<SyntaxKind.ConstKeyword> | Token<SyntaxKind.DeclareKeyword> | Token<SyntaxKind.DefaultKeyword> | Token<SyntaxKind.ExportKeyword> | Token<SyntaxKind.PublicKeyword> | Token<SyntaxKind.PrivateKeyword> | Token<SyntaxKind.ProtectedKeyword> | Token<SyntaxKind.ReadonlyKeyword> | Token<SyntaxKind.StaticKeyword>;
-    type ModifiersArray = NodeArray<Modifier>;
-    interface Identifier extends PrimaryExpression, Declaration {
+    export type DotDotDotToken = Token<SyntaxKind.DotDotDotToken>;
+    export type QuestionToken = Token<SyntaxKind.QuestionToken>;
+    export type ExclamationToken = Token<SyntaxKind.ExclamationToken>;
+    export type ColonToken = Token<SyntaxKind.ColonToken>;
+    export type EqualsToken = Token<SyntaxKind.EqualsToken>;
+    export type AsteriskToken = Token<SyntaxKind.AsteriskToken>;
+    export type EqualsGreaterThanToken = Token<SyntaxKind.EqualsGreaterThanToken>;
+    export type EndOfFileToken = Token<SyntaxKind.EndOfFileToken> & JSDocContainer;
+    export type ReadonlyToken = Token<SyntaxKind.ReadonlyKeyword>;
+    export type AwaitKeywordToken = Token<SyntaxKind.AwaitKeyword>;
+    export type PlusToken = Token<SyntaxKind.PlusToken>;
+    export type MinusToken = Token<SyntaxKind.MinusToken>;
+    export type Modifier = Token<SyntaxKind.AbstractKeyword> | Token<SyntaxKind.AsyncKeyword> | Token<SyntaxKind.ConstKeyword> | Token<SyntaxKind.DeclareKeyword> | Token<SyntaxKind.DefaultKeyword> | Token<SyntaxKind.ExportKeyword> | Token<SyntaxKind.PublicKeyword> | Token<SyntaxKind.PrivateKeyword> | Token<SyntaxKind.ProtectedKeyword> | Token<SyntaxKind.ReadonlyKeyword> | Token<SyntaxKind.StaticKeyword>;
+    export type ModifiersArray = NodeArray<Modifier>;
+    export interface Identifier extends PrimaryExpression, Declaration {
         kind: SyntaxKind.Identifier;
         /**
          * Prefer to use `id.unescapedText`. (Note: This is available only in services, not internally to the TypeScript compiler.)
@@ -528,37 +528,37 @@ declare namespace ts {
         originalKeywordKind?: SyntaxKind;
         isInJSDocNamespace?: boolean;
     }
-    interface TransientIdentifier extends Identifier {
+    export interface TransientIdentifier extends Identifier {
         resolvedSymbol: Symbol;
     }
-    interface QualifiedName extends Node {
+    export interface QualifiedName extends Node {
         kind: SyntaxKind.QualifiedName;
         left: EntityName;
         right: Identifier;
     }
-    type EntityName = Identifier | QualifiedName;
-    type PropertyName = Identifier | StringLiteral | NumericLiteral | ComputedPropertyName;
-    type DeclarationName = Identifier | StringLiteralLike | NumericLiteral | ComputedPropertyName | BindingPattern;
-    interface Declaration extends Node {
+    export type EntityName = Identifier | QualifiedName;
+    export type PropertyName = Identifier | StringLiteral | NumericLiteral | ComputedPropertyName;
+    export type DeclarationName = Identifier | StringLiteralLike | NumericLiteral | ComputedPropertyName | BindingPattern;
+    export interface Declaration extends Node {
         _declarationBrand: any;
     }
-    interface NamedDeclaration extends Declaration {
+    export interface NamedDeclaration extends Declaration {
         name?: DeclarationName;
     }
-    interface DeclarationStatement extends NamedDeclaration, Statement {
+    export interface DeclarationStatement extends NamedDeclaration, Statement {
         name?: Identifier | StringLiteral | NumericLiteral;
     }
-    interface ComputedPropertyName extends Node {
+    export interface ComputedPropertyName extends Node {
         parent: Declaration;
         kind: SyntaxKind.ComputedPropertyName;
         expression: Expression;
     }
-    interface Decorator extends Node {
+    export interface Decorator extends Node {
         kind: SyntaxKind.Decorator;
         parent: NamedDeclaration;
         expression: LeftHandSideExpression;
     }
-    interface TypeParameterDeclaration extends NamedDeclaration {
+    export interface TypeParameterDeclaration extends NamedDeclaration {
         kind: SyntaxKind.TypeParameter;
         parent: DeclarationWithTypeParameterChildren | InferTypeNode;
         name: Identifier;
@@ -567,22 +567,22 @@ declare namespace ts {
         default?: TypeNode;
         expression?: Expression;
     }
-    interface SignatureDeclarationBase extends NamedDeclaration, JSDocContainer {
+    export interface SignatureDeclarationBase extends NamedDeclaration, JSDocContainer {
         kind: SignatureDeclaration["kind"];
         name?: PropertyName;
         typeParameters?: NodeArray<TypeParameterDeclaration>;
         parameters: NodeArray<ParameterDeclaration>;
         type?: TypeNode;
     }
-    type SignatureDeclaration = CallSignatureDeclaration | ConstructSignatureDeclaration | MethodSignature | IndexSignatureDeclaration | FunctionTypeNode | ConstructorTypeNode | JSDocFunctionType | FunctionDeclaration | MethodDeclaration | ConstructorDeclaration | AccessorDeclaration | FunctionExpression | ArrowFunction;
-    interface CallSignatureDeclaration extends SignatureDeclarationBase, TypeElement {
+    export type SignatureDeclaration = CallSignatureDeclaration | ConstructSignatureDeclaration | MethodSignature | IndexSignatureDeclaration | FunctionTypeNode | ConstructorTypeNode | JSDocFunctionType | FunctionDeclaration | MethodDeclaration | ConstructorDeclaration | AccessorDeclaration | FunctionExpression | ArrowFunction;
+    export interface CallSignatureDeclaration extends SignatureDeclarationBase, TypeElement {
         kind: SyntaxKind.CallSignature;
     }
-    interface ConstructSignatureDeclaration extends SignatureDeclarationBase, TypeElement {
+    export interface ConstructSignatureDeclaration extends SignatureDeclarationBase, TypeElement {
         kind: SyntaxKind.ConstructSignature;
     }
-    type BindingName = Identifier | BindingPattern;
-    interface VariableDeclaration extends NamedDeclaration {
+    export type BindingName = Identifier | BindingPattern;
+    export interface VariableDeclaration extends NamedDeclaration {
         kind: SyntaxKind.VariableDeclaration;
         parent: VariableDeclarationList | CatchClause;
         name: BindingName;
@@ -590,12 +590,12 @@ declare namespace ts {
         type?: TypeNode;
         initializer?: Expression;
     }
-    interface VariableDeclarationList extends Node {
+    export interface VariableDeclarationList extends Node {
         kind: SyntaxKind.VariableDeclarationList;
         parent: VariableStatement | ForStatement | ForOfStatement | ForInStatement;
         declarations: NodeArray<VariableDeclaration>;
     }
-    interface ParameterDeclaration extends NamedDeclaration, JSDocContainer {
+    export interface ParameterDeclaration extends NamedDeclaration, JSDocContainer {
         kind: SyntaxKind.Parameter;
         parent: SignatureDeclaration;
         dotDotDotToken?: DotDotDotToken;
@@ -604,7 +604,7 @@ declare namespace ts {
         type?: TypeNode;
         initializer?: Expression;
     }
-    interface BindingElement extends NamedDeclaration {
+    export interface BindingElement extends NamedDeclaration {
         kind: SyntaxKind.BindingElement;
         parent: BindingPattern;
         propertyName?: PropertyName;
@@ -612,14 +612,14 @@ declare namespace ts {
         name: BindingName;
         initializer?: Expression;
     }
-    interface PropertySignature extends TypeElement, JSDocContainer {
+    export interface PropertySignature extends TypeElement, JSDocContainer {
         kind: SyntaxKind.PropertySignature;
         name: PropertyName;
         questionToken?: QuestionToken;
         type?: TypeNode;
         initializer?: Expression;
     }
-    interface PropertyDeclaration extends ClassElement, JSDocContainer {
+    export interface PropertyDeclaration extends ClassElement, JSDocContainer {
         kind: SyntaxKind.PropertyDeclaration;
         parent: ClassLikeDeclaration;
         name: PropertyName;
@@ -628,20 +628,20 @@ declare namespace ts {
         type?: TypeNode;
         initializer?: Expression;
     }
-    interface ObjectLiteralElement extends NamedDeclaration {
+    export interface ObjectLiteralElement extends NamedDeclaration {
         _objectLiteralBrand: any;
         name?: PropertyName;
     }
     /** Unlike ObjectLiteralElement, excludes JSXAttribute and JSXSpreadAttribute. */
-    type ObjectLiteralElementLike = PropertyAssignment | ShorthandPropertyAssignment | SpreadAssignment | MethodDeclaration | AccessorDeclaration;
-    interface PropertyAssignment extends ObjectLiteralElement, JSDocContainer {
+    export type ObjectLiteralElementLike = PropertyAssignment | ShorthandPropertyAssignment | SpreadAssignment | MethodDeclaration | AccessorDeclaration;
+    export interface PropertyAssignment extends ObjectLiteralElement, JSDocContainer {
         parent: ObjectLiteralExpression;
         kind: SyntaxKind.PropertyAssignment;
         name: PropertyName;
         questionToken?: QuestionToken;
         initializer: Expression;
     }
-    interface ShorthandPropertyAssignment extends ObjectLiteralElement, JSDocContainer {
+    export interface ShorthandPropertyAssignment extends ObjectLiteralElement, JSDocContainer {
         parent: ObjectLiteralExpression;
         kind: SyntaxKind.ShorthandPropertyAssignment;
         name: Identifier;
@@ -650,27 +650,27 @@ declare namespace ts {
         equalsToken?: Token<SyntaxKind.EqualsToken>;
         objectAssignmentInitializer?: Expression;
     }
-    interface SpreadAssignment extends ObjectLiteralElement, JSDocContainer {
+    export interface SpreadAssignment extends ObjectLiteralElement, JSDocContainer {
         parent: ObjectLiteralExpression;
         kind: SyntaxKind.SpreadAssignment;
         expression: Expression;
     }
-    type VariableLikeDeclaration = VariableDeclaration | ParameterDeclaration | BindingElement | PropertyDeclaration | PropertyAssignment | PropertySignature | JsxAttribute | ShorthandPropertyAssignment | EnumMember | JSDocPropertyTag | JSDocParameterTag;
-    interface PropertyLikeDeclaration extends NamedDeclaration {
+    export type VariableLikeDeclaration = VariableDeclaration | ParameterDeclaration | BindingElement | PropertyDeclaration | PropertyAssignment | PropertySignature | JsxAttribute | ShorthandPropertyAssignment | EnumMember | JSDocPropertyTag | JSDocParameterTag;
+    export interface PropertyLikeDeclaration extends NamedDeclaration {
         name: PropertyName;
     }
-    interface ObjectBindingPattern extends Node {
+    export interface ObjectBindingPattern extends Node {
         kind: SyntaxKind.ObjectBindingPattern;
         parent: VariableDeclaration | ParameterDeclaration | BindingElement;
         elements: NodeArray<BindingElement>;
     }
-    interface ArrayBindingPattern extends Node {
+    export interface ArrayBindingPattern extends Node {
         kind: SyntaxKind.ArrayBindingPattern;
         parent: VariableDeclaration | ParameterDeclaration | BindingElement;
         elements: NodeArray<ArrayBindingElement>;
     }
-    type BindingPattern = ObjectBindingPattern | ArrayBindingPattern;
-    type ArrayBindingElement = BindingElement | OmittedExpression;
+    export type BindingPattern = ObjectBindingPattern | ArrayBindingPattern;
+    export type ArrayBindingElement = BindingElement | OmittedExpression;
     /**
      * Several node kinds share function-like features such as a signature,
      * a name, and a body. These nodes should extend FunctionLikeDeclarationBase.
@@ -679,298 +679,298 @@ declare namespace ts {
      * - MethodDeclaration
      * - AccessorDeclaration
      */
-    interface FunctionLikeDeclarationBase extends SignatureDeclarationBase {
+    export interface FunctionLikeDeclarationBase extends SignatureDeclarationBase {
         _functionLikeDeclarationBrand: any;
         asteriskToken?: AsteriskToken;
         questionToken?: QuestionToken;
         exclamationToken?: ExclamationToken;
         body?: Block | Expression;
     }
-    type FunctionLikeDeclaration = FunctionDeclaration | MethodDeclaration | GetAccessorDeclaration | SetAccessorDeclaration | ConstructorDeclaration | FunctionExpression | ArrowFunction;
+    export type FunctionLikeDeclaration = FunctionDeclaration | MethodDeclaration | GetAccessorDeclaration | SetAccessorDeclaration | ConstructorDeclaration | FunctionExpression | ArrowFunction;
     /** @deprecated Use SignatureDeclaration */
-    type FunctionLike = SignatureDeclaration;
-    interface FunctionDeclaration extends FunctionLikeDeclarationBase, DeclarationStatement {
+    export type FunctionLike = SignatureDeclaration;
+    export interface FunctionDeclaration extends FunctionLikeDeclarationBase, DeclarationStatement {
         kind: SyntaxKind.FunctionDeclaration;
         name?: Identifier;
         body?: FunctionBody;
     }
-    interface MethodSignature extends SignatureDeclarationBase, TypeElement {
+    export interface MethodSignature extends SignatureDeclarationBase, TypeElement {
         kind: SyntaxKind.MethodSignature;
         parent: ObjectTypeDeclaration;
         name: PropertyName;
     }
-    interface MethodDeclaration extends FunctionLikeDeclarationBase, ClassElement, ObjectLiteralElement, JSDocContainer {
+    export interface MethodDeclaration extends FunctionLikeDeclarationBase, ClassElement, ObjectLiteralElement, JSDocContainer {
         kind: SyntaxKind.MethodDeclaration;
         parent: ClassLikeDeclaration | ObjectLiteralExpression;
         name: PropertyName;
         body?: FunctionBody;
     }
-    interface ConstructorDeclaration extends FunctionLikeDeclarationBase, ClassElement, JSDocContainer {
+    export interface ConstructorDeclaration extends FunctionLikeDeclarationBase, ClassElement, JSDocContainer {
         kind: SyntaxKind.Constructor;
         parent: ClassLikeDeclaration;
         body?: FunctionBody;
     }
     /** For when we encounter a semicolon in a class declaration. ES6 allows these as class elements. */
-    interface SemicolonClassElement extends ClassElement {
+    export interface SemicolonClassElement extends ClassElement {
         kind: SyntaxKind.SemicolonClassElement;
         parent: ClassLikeDeclaration;
     }
-    interface GetAccessorDeclaration extends FunctionLikeDeclarationBase, ClassElement, ObjectLiteralElement, JSDocContainer {
+    export interface GetAccessorDeclaration extends FunctionLikeDeclarationBase, ClassElement, ObjectLiteralElement, JSDocContainer {
         kind: SyntaxKind.GetAccessor;
         parent: ClassLikeDeclaration | ObjectLiteralExpression;
         name: PropertyName;
         body?: FunctionBody;
     }
-    interface SetAccessorDeclaration extends FunctionLikeDeclarationBase, ClassElement, ObjectLiteralElement, JSDocContainer {
+    export interface SetAccessorDeclaration extends FunctionLikeDeclarationBase, ClassElement, ObjectLiteralElement, JSDocContainer {
         kind: SyntaxKind.SetAccessor;
         parent: ClassLikeDeclaration | ObjectLiteralExpression;
         name: PropertyName;
         body?: FunctionBody;
     }
-    type AccessorDeclaration = GetAccessorDeclaration | SetAccessorDeclaration;
-    interface IndexSignatureDeclaration extends SignatureDeclarationBase, ClassElement, TypeElement {
+    export type AccessorDeclaration = GetAccessorDeclaration | SetAccessorDeclaration;
+    export interface IndexSignatureDeclaration extends SignatureDeclarationBase, ClassElement, TypeElement {
         kind: SyntaxKind.IndexSignature;
         parent: ObjectTypeDeclaration;
     }
-    interface TypeNode extends Node {
+    export interface TypeNode extends Node {
         _typeNodeBrand: any;
     }
-    interface KeywordTypeNode extends TypeNode {
+    export interface KeywordTypeNode extends TypeNode {
         kind: SyntaxKind.AnyKeyword | SyntaxKind.UnknownKeyword | SyntaxKind.NumberKeyword | SyntaxKind.BigIntKeyword | SyntaxKind.ObjectKeyword | SyntaxKind.BooleanKeyword | SyntaxKind.StringKeyword | SyntaxKind.SymbolKeyword | SyntaxKind.ThisKeyword | SyntaxKind.VoidKeyword | SyntaxKind.UndefinedKeyword | SyntaxKind.NullKeyword | SyntaxKind.NeverKeyword;
     }
-    interface ImportTypeNode extends NodeWithTypeArguments {
+    export interface ImportTypeNode extends NodeWithTypeArguments {
         kind: SyntaxKind.ImportType;
         isTypeOf?: boolean;
         argument: TypeNode;
         qualifier?: EntityName;
     }
-    interface ThisTypeNode extends TypeNode {
+    export interface ThisTypeNode extends TypeNode {
         kind: SyntaxKind.ThisType;
     }
-    type FunctionOrConstructorTypeNode = FunctionTypeNode | ConstructorTypeNode;
-    interface FunctionOrConstructorTypeNodeBase extends TypeNode, SignatureDeclarationBase {
+    export type FunctionOrConstructorTypeNode = FunctionTypeNode | ConstructorTypeNode;
+    export interface FunctionOrConstructorTypeNodeBase extends TypeNode, SignatureDeclarationBase {
         kind: SyntaxKind.FunctionType | SyntaxKind.ConstructorType;
         type: TypeNode;
     }
-    interface FunctionTypeNode extends FunctionOrConstructorTypeNodeBase {
+    export interface FunctionTypeNode extends FunctionOrConstructorTypeNodeBase {
         kind: SyntaxKind.FunctionType;
     }
-    interface ConstructorTypeNode extends FunctionOrConstructorTypeNodeBase {
+    export interface ConstructorTypeNode extends FunctionOrConstructorTypeNodeBase {
         kind: SyntaxKind.ConstructorType;
     }
-    interface NodeWithTypeArguments extends TypeNode {
+    export interface NodeWithTypeArguments extends TypeNode {
         typeArguments?: NodeArray<TypeNode>;
     }
-    type TypeReferenceType = TypeReferenceNode | ExpressionWithTypeArguments;
-    interface TypeReferenceNode extends NodeWithTypeArguments {
+    export type TypeReferenceType = TypeReferenceNode | ExpressionWithTypeArguments;
+    export interface TypeReferenceNode extends NodeWithTypeArguments {
         kind: SyntaxKind.TypeReference;
         typeName: EntityName;
     }
-    interface TypePredicateNode extends TypeNode {
+    export interface TypePredicateNode extends TypeNode {
         kind: SyntaxKind.TypePredicate;
         parent: SignatureDeclaration | JSDocTypeExpression;
         parameterName: Identifier | ThisTypeNode;
         type: TypeNode;
     }
-    interface TypeQueryNode extends TypeNode {
+    export interface TypeQueryNode extends TypeNode {
         kind: SyntaxKind.TypeQuery;
         exprName: EntityName;
     }
-    interface TypeLiteralNode extends TypeNode, Declaration {
+    export interface TypeLiteralNode extends TypeNode, Declaration {
         kind: SyntaxKind.TypeLiteral;
         members: NodeArray<TypeElement>;
     }
-    interface ArrayTypeNode extends TypeNode {
+    export interface ArrayTypeNode extends TypeNode {
         kind: SyntaxKind.ArrayType;
         elementType: TypeNode;
     }
-    interface TupleTypeNode extends TypeNode {
+    export interface TupleTypeNode extends TypeNode {
         kind: SyntaxKind.TupleType;
         elementTypes: NodeArray<TypeNode>;
     }
-    interface OptionalTypeNode extends TypeNode {
+    export interface OptionalTypeNode extends TypeNode {
         kind: SyntaxKind.OptionalType;
         type: TypeNode;
     }
-    interface RestTypeNode extends TypeNode {
+    export interface RestTypeNode extends TypeNode {
         kind: SyntaxKind.RestType;
         type: TypeNode;
     }
-    type UnionOrIntersectionTypeNode = UnionTypeNode | IntersectionTypeNode;
-    interface UnionTypeNode extends TypeNode {
+    export type UnionOrIntersectionTypeNode = UnionTypeNode | IntersectionTypeNode;
+    export interface UnionTypeNode extends TypeNode {
         kind: SyntaxKind.UnionType;
         types: NodeArray<TypeNode>;
     }
-    interface IntersectionTypeNode extends TypeNode {
+    export interface IntersectionTypeNode extends TypeNode {
         kind: SyntaxKind.IntersectionType;
         types: NodeArray<TypeNode>;
     }
-    interface ConditionalTypeNode extends TypeNode {
+    export interface ConditionalTypeNode extends TypeNode {
         kind: SyntaxKind.ConditionalType;
         checkType: TypeNode;
         extendsType: TypeNode;
         trueType: TypeNode;
         falseType: TypeNode;
     }
-    interface InferTypeNode extends TypeNode {
+    export interface InferTypeNode extends TypeNode {
         kind: SyntaxKind.InferType;
         typeParameter: TypeParameterDeclaration;
     }
-    interface ParenthesizedTypeNode extends TypeNode {
+    export interface ParenthesizedTypeNode extends TypeNode {
         kind: SyntaxKind.ParenthesizedType;
         type: TypeNode;
     }
-    interface TypeOperatorNode extends TypeNode {
+    export interface TypeOperatorNode extends TypeNode {
         kind: SyntaxKind.TypeOperator;
         operator: SyntaxKind.KeyOfKeyword | SyntaxKind.UniqueKeyword | SyntaxKind.ReadonlyKeyword;
         type: TypeNode;
     }
-    interface IndexedAccessTypeNode extends TypeNode {
+    export interface IndexedAccessTypeNode extends TypeNode {
         kind: SyntaxKind.IndexedAccessType;
         objectType: TypeNode;
         indexType: TypeNode;
     }
-    interface MappedTypeNode extends TypeNode, Declaration {
+    export interface MappedTypeNode extends TypeNode, Declaration {
         kind: SyntaxKind.MappedType;
         readonlyToken?: ReadonlyToken | PlusToken | MinusToken;
         typeParameter: TypeParameterDeclaration;
         questionToken?: QuestionToken | PlusToken | MinusToken;
         type?: TypeNode;
     }
-    interface LiteralTypeNode extends TypeNode {
+    export interface LiteralTypeNode extends TypeNode {
         kind: SyntaxKind.LiteralType;
         literal: BooleanLiteral | LiteralExpression | PrefixUnaryExpression;
     }
-    interface StringLiteral extends LiteralExpression {
+    export interface StringLiteral extends LiteralExpression {
         kind: SyntaxKind.StringLiteral;
     }
-    type StringLiteralLike = StringLiteral | NoSubstitutionTemplateLiteral;
-    interface Expression extends Node {
+    export type StringLiteralLike = StringLiteral | NoSubstitutionTemplateLiteral;
+    export interface Expression extends Node {
         _expressionBrand: any;
     }
-    interface OmittedExpression extends Expression {
+    export interface OmittedExpression extends Expression {
         kind: SyntaxKind.OmittedExpression;
     }
-    interface PartiallyEmittedExpression extends LeftHandSideExpression {
+    export interface PartiallyEmittedExpression extends LeftHandSideExpression {
         kind: SyntaxKind.PartiallyEmittedExpression;
         expression: Expression;
     }
-    interface UnaryExpression extends Expression {
+    export interface UnaryExpression extends Expression {
         _unaryExpressionBrand: any;
     }
     /** Deprecated, please use UpdateExpression */
-    type IncrementExpression = UpdateExpression;
-    interface UpdateExpression extends UnaryExpression {
+    export type IncrementExpression = UpdateExpression;
+    export interface UpdateExpression extends UnaryExpression {
         _updateExpressionBrand: any;
     }
-    type PrefixUnaryOperator = SyntaxKind.PlusPlusToken | SyntaxKind.MinusMinusToken | SyntaxKind.PlusToken | SyntaxKind.MinusToken | SyntaxKind.TildeToken | SyntaxKind.ExclamationToken;
-    interface PrefixUnaryExpression extends UpdateExpression {
+    export type PrefixUnaryOperator = SyntaxKind.PlusPlusToken | SyntaxKind.MinusMinusToken | SyntaxKind.PlusToken | SyntaxKind.MinusToken | SyntaxKind.TildeToken | SyntaxKind.ExclamationToken;
+    export interface PrefixUnaryExpression extends UpdateExpression {
         kind: SyntaxKind.PrefixUnaryExpression;
         operator: PrefixUnaryOperator;
         operand: UnaryExpression;
     }
-    type PostfixUnaryOperator = SyntaxKind.PlusPlusToken | SyntaxKind.MinusMinusToken;
-    interface PostfixUnaryExpression extends UpdateExpression {
+    export type PostfixUnaryOperator = SyntaxKind.PlusPlusToken | SyntaxKind.MinusMinusToken;
+    export interface PostfixUnaryExpression extends UpdateExpression {
         kind: SyntaxKind.PostfixUnaryExpression;
         operand: LeftHandSideExpression;
         operator: PostfixUnaryOperator;
     }
-    interface LeftHandSideExpression extends UpdateExpression {
+    export interface LeftHandSideExpression extends UpdateExpression {
         _leftHandSideExpressionBrand: any;
     }
-    interface MemberExpression extends LeftHandSideExpression {
+    export interface MemberExpression extends LeftHandSideExpression {
         _memberExpressionBrand: any;
     }
-    interface PrimaryExpression extends MemberExpression {
+    export interface PrimaryExpression extends MemberExpression {
         _primaryExpressionBrand: any;
     }
-    interface NullLiteral extends PrimaryExpression, TypeNode {
+    export interface NullLiteral extends PrimaryExpression, TypeNode {
         kind: SyntaxKind.NullKeyword;
     }
-    interface BooleanLiteral extends PrimaryExpression, TypeNode {
+    export interface BooleanLiteral extends PrimaryExpression, TypeNode {
         kind: SyntaxKind.TrueKeyword | SyntaxKind.FalseKeyword;
     }
-    interface ThisExpression extends PrimaryExpression, KeywordTypeNode {
+    export interface ThisExpression extends PrimaryExpression, KeywordTypeNode {
         kind: SyntaxKind.ThisKeyword;
     }
-    interface SuperExpression extends PrimaryExpression {
+    export interface SuperExpression extends PrimaryExpression {
         kind: SyntaxKind.SuperKeyword;
     }
-    interface ImportExpression extends PrimaryExpression {
+    export interface ImportExpression extends PrimaryExpression {
         kind: SyntaxKind.ImportKeyword;
     }
-    interface DeleteExpression extends UnaryExpression {
+    export interface DeleteExpression extends UnaryExpression {
         kind: SyntaxKind.DeleteExpression;
         expression: UnaryExpression;
     }
-    interface TypeOfExpression extends UnaryExpression {
+    export interface TypeOfExpression extends UnaryExpression {
         kind: SyntaxKind.TypeOfExpression;
         expression: UnaryExpression;
     }
-    interface VoidExpression extends UnaryExpression {
+    export interface VoidExpression extends UnaryExpression {
         kind: SyntaxKind.VoidExpression;
         expression: UnaryExpression;
     }
-    interface AwaitExpression extends UnaryExpression {
+    export interface AwaitExpression extends UnaryExpression {
         kind: SyntaxKind.AwaitExpression;
         expression: UnaryExpression;
     }
-    interface YieldExpression extends Expression {
+    export interface YieldExpression extends Expression {
         kind: SyntaxKind.YieldExpression;
         asteriskToken?: AsteriskToken;
         expression?: Expression;
     }
-    interface SyntheticExpression extends Expression {
+    export interface SyntheticExpression extends Expression {
         kind: SyntaxKind.SyntheticExpression;
         isSpread: boolean;
         type: Type;
     }
-    type ExponentiationOperator = SyntaxKind.AsteriskAsteriskToken;
-    type MultiplicativeOperator = SyntaxKind.AsteriskToken | SyntaxKind.SlashToken | SyntaxKind.PercentToken;
-    type MultiplicativeOperatorOrHigher = ExponentiationOperator | MultiplicativeOperator;
-    type AdditiveOperator = SyntaxKind.PlusToken | SyntaxKind.MinusToken;
-    type AdditiveOperatorOrHigher = MultiplicativeOperatorOrHigher | AdditiveOperator;
-    type ShiftOperator = SyntaxKind.LessThanLessThanToken | SyntaxKind.GreaterThanGreaterThanToken | SyntaxKind.GreaterThanGreaterThanGreaterThanToken;
-    type ShiftOperatorOrHigher = AdditiveOperatorOrHigher | ShiftOperator;
-    type RelationalOperator = SyntaxKind.LessThanToken | SyntaxKind.LessThanEqualsToken | SyntaxKind.GreaterThanToken | SyntaxKind.GreaterThanEqualsToken | SyntaxKind.InstanceOfKeyword | SyntaxKind.InKeyword;
-    type RelationalOperatorOrHigher = ShiftOperatorOrHigher | RelationalOperator;
-    type EqualityOperator = SyntaxKind.EqualsEqualsToken | SyntaxKind.EqualsEqualsEqualsToken | SyntaxKind.ExclamationEqualsEqualsToken | SyntaxKind.ExclamationEqualsToken;
-    type EqualityOperatorOrHigher = RelationalOperatorOrHigher | EqualityOperator;
-    type BitwiseOperator = SyntaxKind.AmpersandToken | SyntaxKind.BarToken | SyntaxKind.CaretToken;
-    type BitwiseOperatorOrHigher = EqualityOperatorOrHigher | BitwiseOperator;
-    type LogicalOperator = SyntaxKind.AmpersandAmpersandToken | SyntaxKind.BarBarToken;
-    type LogicalOperatorOrHigher = BitwiseOperatorOrHigher | LogicalOperator;
-    type CompoundAssignmentOperator = SyntaxKind.PlusEqualsToken | SyntaxKind.MinusEqualsToken | SyntaxKind.AsteriskAsteriskEqualsToken | SyntaxKind.AsteriskEqualsToken | SyntaxKind.SlashEqualsToken | SyntaxKind.PercentEqualsToken | SyntaxKind.AmpersandEqualsToken | SyntaxKind.BarEqualsToken | SyntaxKind.CaretEqualsToken | SyntaxKind.LessThanLessThanEqualsToken | SyntaxKind.GreaterThanGreaterThanGreaterThanEqualsToken | SyntaxKind.GreaterThanGreaterThanEqualsToken;
-    type AssignmentOperator = SyntaxKind.EqualsToken | CompoundAssignmentOperator;
-    type AssignmentOperatorOrHigher = LogicalOperatorOrHigher | AssignmentOperator;
-    type BinaryOperator = AssignmentOperatorOrHigher | SyntaxKind.CommaToken;
-    type BinaryOperatorToken = Token<BinaryOperator>;
-    interface BinaryExpression extends Expression, Declaration {
+    export type ExponentiationOperator = SyntaxKind.AsteriskAsteriskToken;
+    export type MultiplicativeOperator = SyntaxKind.AsteriskToken | SyntaxKind.SlashToken | SyntaxKind.PercentToken;
+    export type MultiplicativeOperatorOrHigher = ExponentiationOperator | MultiplicativeOperator;
+    export type AdditiveOperator = SyntaxKind.PlusToken | SyntaxKind.MinusToken;
+    export type AdditiveOperatorOrHigher = MultiplicativeOperatorOrHigher | AdditiveOperator;
+    export type ShiftOperator = SyntaxKind.LessThanLessThanToken | SyntaxKind.GreaterThanGreaterThanToken | SyntaxKind.GreaterThanGreaterThanGreaterThanToken;
+    export type ShiftOperatorOrHigher = AdditiveOperatorOrHigher | ShiftOperator;
+    export type RelationalOperator = SyntaxKind.LessThanToken | SyntaxKind.LessThanEqualsToken | SyntaxKind.GreaterThanToken | SyntaxKind.GreaterThanEqualsToken | SyntaxKind.InstanceOfKeyword | SyntaxKind.InKeyword;
+    export type RelationalOperatorOrHigher = ShiftOperatorOrHigher | RelationalOperator;
+    export type EqualityOperator = SyntaxKind.EqualsEqualsToken | SyntaxKind.EqualsEqualsEqualsToken | SyntaxKind.ExclamationEqualsEqualsToken | SyntaxKind.ExclamationEqualsToken;
+    export type EqualityOperatorOrHigher = RelationalOperatorOrHigher | EqualityOperator;
+    export type BitwiseOperator = SyntaxKind.AmpersandToken | SyntaxKind.BarToken | SyntaxKind.CaretToken;
+    export type BitwiseOperatorOrHigher = EqualityOperatorOrHigher | BitwiseOperator;
+    export type LogicalOperator = SyntaxKind.AmpersandAmpersandToken | SyntaxKind.BarBarToken;
+    export type LogicalOperatorOrHigher = BitwiseOperatorOrHigher | LogicalOperator;
+    export type CompoundAssignmentOperator = SyntaxKind.PlusEqualsToken | SyntaxKind.MinusEqualsToken | SyntaxKind.AsteriskAsteriskEqualsToken | SyntaxKind.AsteriskEqualsToken | SyntaxKind.SlashEqualsToken | SyntaxKind.PercentEqualsToken | SyntaxKind.AmpersandEqualsToken | SyntaxKind.BarEqualsToken | SyntaxKind.CaretEqualsToken | SyntaxKind.LessThanLessThanEqualsToken | SyntaxKind.GreaterThanGreaterThanGreaterThanEqualsToken | SyntaxKind.GreaterThanGreaterThanEqualsToken;
+    export type AssignmentOperator = SyntaxKind.EqualsToken | CompoundAssignmentOperator;
+    export type AssignmentOperatorOrHigher = LogicalOperatorOrHigher | AssignmentOperator;
+    export type BinaryOperator = AssignmentOperatorOrHigher | SyntaxKind.CommaToken;
+    export type BinaryOperatorToken = Token<BinaryOperator>;
+    export interface BinaryExpression extends Expression, Declaration {
         kind: SyntaxKind.BinaryExpression;
         left: Expression;
         operatorToken: BinaryOperatorToken;
         right: Expression;
     }
-    type AssignmentOperatorToken = Token<AssignmentOperator>;
-    interface AssignmentExpression<TOperator extends AssignmentOperatorToken> extends BinaryExpression {
+    export type AssignmentOperatorToken = Token<AssignmentOperator>;
+    export interface AssignmentExpression<TOperator extends AssignmentOperatorToken> extends BinaryExpression {
         left: LeftHandSideExpression;
         operatorToken: TOperator;
     }
-    interface ObjectDestructuringAssignment extends AssignmentExpression<EqualsToken> {
+    export interface ObjectDestructuringAssignment extends AssignmentExpression<EqualsToken> {
         left: ObjectLiteralExpression;
     }
-    interface ArrayDestructuringAssignment extends AssignmentExpression<EqualsToken> {
+    export interface ArrayDestructuringAssignment extends AssignmentExpression<EqualsToken> {
         left: ArrayLiteralExpression;
     }
-    type DestructuringAssignment = ObjectDestructuringAssignment | ArrayDestructuringAssignment;
-    type BindingOrAssignmentElement = VariableDeclaration | ParameterDeclaration | BindingElement | PropertyAssignment | ShorthandPropertyAssignment | SpreadAssignment | OmittedExpression | SpreadElement | ArrayLiteralExpression | ObjectLiteralExpression | AssignmentExpression<EqualsToken> | Identifier | PropertyAccessExpression | ElementAccessExpression;
-    type BindingOrAssignmentElementRestIndicator = DotDotDotToken | SpreadElement | SpreadAssignment;
-    type BindingOrAssignmentElementTarget = BindingOrAssignmentPattern | Identifier | PropertyAccessExpression | ElementAccessExpression | OmittedExpression;
-    type ObjectBindingOrAssignmentPattern = ObjectBindingPattern | ObjectLiteralExpression;
-    type ArrayBindingOrAssignmentPattern = ArrayBindingPattern | ArrayLiteralExpression;
-    type AssignmentPattern = ObjectLiteralExpression | ArrayLiteralExpression;
-    type BindingOrAssignmentPattern = ObjectBindingOrAssignmentPattern | ArrayBindingOrAssignmentPattern;
-    interface ConditionalExpression extends Expression {
+    export type DestructuringAssignment = ObjectDestructuringAssignment | ArrayDestructuringAssignment;
+    export type BindingOrAssignmentElement = VariableDeclaration | ParameterDeclaration | BindingElement | PropertyAssignment | ShorthandPropertyAssignment | SpreadAssignment | OmittedExpression | SpreadElement | ArrayLiteralExpression | ObjectLiteralExpression | AssignmentExpression<EqualsToken> | Identifier | PropertyAccessExpression | ElementAccessExpression;
+    export type BindingOrAssignmentElementRestIndicator = DotDotDotToken | SpreadElement | SpreadAssignment;
+    export type BindingOrAssignmentElementTarget = BindingOrAssignmentPattern | Identifier | PropertyAccessExpression | ElementAccessExpression | OmittedExpression;
+    export type ObjectBindingOrAssignmentPattern = ObjectBindingPattern | ObjectLiteralExpression;
+    export type ArrayBindingOrAssignmentPattern = ArrayBindingPattern | ArrayLiteralExpression;
+    export type AssignmentPattern = ObjectLiteralExpression | ArrayLiteralExpression;
+    export type BindingOrAssignmentPattern = ObjectBindingOrAssignmentPattern | ArrayBindingOrAssignmentPattern;
+    export interface ConditionalExpression extends Expression {
         kind: SyntaxKind.ConditionalExpression;
         condition: Expression;
         questionToken: QuestionToken;
@@ -978,34 +978,34 @@ declare namespace ts {
         colonToken: ColonToken;
         whenFalse: Expression;
     }
-    type FunctionBody = Block;
-    type ConciseBody = FunctionBody | Expression;
-    interface FunctionExpression extends PrimaryExpression, FunctionLikeDeclarationBase, JSDocContainer {
+    export type FunctionBody = Block;
+    export type ConciseBody = FunctionBody | Expression;
+    export interface FunctionExpression extends PrimaryExpression, FunctionLikeDeclarationBase, JSDocContainer {
         kind: SyntaxKind.FunctionExpression;
         name?: Identifier;
         body: FunctionBody;
     }
-    interface ArrowFunction extends Expression, FunctionLikeDeclarationBase, JSDocContainer {
+    export interface ArrowFunction extends Expression, FunctionLikeDeclarationBase, JSDocContainer {
         kind: SyntaxKind.ArrowFunction;
         equalsGreaterThanToken: EqualsGreaterThanToken;
         body: ConciseBody;
         name: never;
     }
-    interface LiteralLikeNode extends Node {
+    export interface LiteralLikeNode extends Node {
         text: string;
         isUnterminated?: boolean;
         hasExtendedUnicodeEscape?: boolean;
     }
-    interface LiteralExpression extends LiteralLikeNode, PrimaryExpression {
+    export interface LiteralExpression extends LiteralLikeNode, PrimaryExpression {
         _literalExpressionBrand: any;
     }
-    interface RegularExpressionLiteral extends LiteralExpression {
+    export interface RegularExpressionLiteral extends LiteralExpression {
         kind: SyntaxKind.RegularExpressionLiteral;
     }
-    interface NoSubstitutionTemplateLiteral extends LiteralExpression {
+    export interface NoSubstitutionTemplateLiteral extends LiteralExpression {
         kind: SyntaxKind.NoSubstitutionTemplateLiteral;
     }
-    enum TokenFlags {
+    export enum TokenFlags {
         None = 0,
         Scientific = 16,
         Octal = 32,
@@ -1013,45 +1013,45 @@ declare namespace ts {
         BinarySpecifier = 128,
         OctalSpecifier = 256,
     }
-    interface NumericLiteral extends LiteralExpression {
+    export interface NumericLiteral extends LiteralExpression {
         kind: SyntaxKind.NumericLiteral;
     }
-    interface BigIntLiteral extends LiteralExpression {
+    export interface BigIntLiteral extends LiteralExpression {
         kind: SyntaxKind.BigIntLiteral;
     }
-    interface TemplateHead extends LiteralLikeNode {
+    export interface TemplateHead extends LiteralLikeNode {
         kind: SyntaxKind.TemplateHead;
         parent: TemplateExpression;
     }
-    interface TemplateMiddle extends LiteralLikeNode {
+    export interface TemplateMiddle extends LiteralLikeNode {
         kind: SyntaxKind.TemplateMiddle;
         parent: TemplateSpan;
     }
-    interface TemplateTail extends LiteralLikeNode {
+    export interface TemplateTail extends LiteralLikeNode {
         kind: SyntaxKind.TemplateTail;
         parent: TemplateSpan;
     }
-    type TemplateLiteral = TemplateExpression | NoSubstitutionTemplateLiteral;
-    interface TemplateExpression extends PrimaryExpression {
+    export type TemplateLiteral = TemplateExpression | NoSubstitutionTemplateLiteral;
+    export interface TemplateExpression extends PrimaryExpression {
         kind: SyntaxKind.TemplateExpression;
         head: TemplateHead;
         templateSpans: NodeArray<TemplateSpan>;
     }
-    interface TemplateSpan extends Node {
+    export interface TemplateSpan extends Node {
         kind: SyntaxKind.TemplateSpan;
         parent: TemplateExpression;
         expression: Expression;
         literal: TemplateMiddle | TemplateTail;
     }
-    interface ParenthesizedExpression extends PrimaryExpression, JSDocContainer {
+    export interface ParenthesizedExpression extends PrimaryExpression, JSDocContainer {
         kind: SyntaxKind.ParenthesizedExpression;
         expression: Expression;
     }
-    interface ArrayLiteralExpression extends PrimaryExpression {
+    export interface ArrayLiteralExpression extends PrimaryExpression {
         kind: SyntaxKind.ArrayLiteralExpression;
         elements: NodeArray<Expression>;
     }
-    interface SpreadElement extends Expression {
+    export interface SpreadElement extends Expression {
         kind: SyntaxKind.SpreadElement;
         parent: ArrayLiteralExpression | CallExpression | NewExpression;
         expression: Expression;
@@ -1062,413 +1062,413 @@ declare namespace ts {
      * JSXAttribute or JSXSpreadAttribute. ObjectLiteralExpression, on the other hand, can only have properties of type
      * ObjectLiteralElement (e.g. PropertyAssignment, ShorthandPropertyAssignment etc.)
      */
-    interface ObjectLiteralExpressionBase<T extends ObjectLiteralElement> extends PrimaryExpression, Declaration {
+    export interface ObjectLiteralExpressionBase<T extends ObjectLiteralElement> extends PrimaryExpression, Declaration {
         properties: NodeArray<T>;
     }
-    interface ObjectLiteralExpression extends ObjectLiteralExpressionBase<ObjectLiteralElementLike> {
+    export interface ObjectLiteralExpression extends ObjectLiteralExpressionBase<ObjectLiteralElementLike> {
         kind: SyntaxKind.ObjectLiteralExpression;
     }
-    type EntityNameExpression = Identifier | PropertyAccessEntityNameExpression;
-    type EntityNameOrEntityNameExpression = EntityName | EntityNameExpression;
-    interface PropertyAccessExpression extends MemberExpression, NamedDeclaration {
+    export type EntityNameExpression = Identifier | PropertyAccessEntityNameExpression;
+    export type EntityNameOrEntityNameExpression = EntityName | EntityNameExpression;
+    export interface PropertyAccessExpression extends MemberExpression, NamedDeclaration {
         kind: SyntaxKind.PropertyAccessExpression;
         expression: LeftHandSideExpression;
         name: Identifier;
     }
-    interface SuperPropertyAccessExpression extends PropertyAccessExpression {
+    export interface SuperPropertyAccessExpression extends PropertyAccessExpression {
         expression: SuperExpression;
     }
     /** Brand for a PropertyAccessExpression which, like a QualifiedName, consists of a sequence of identifiers separated by dots. */
-    interface PropertyAccessEntityNameExpression extends PropertyAccessExpression {
+    export interface PropertyAccessEntityNameExpression extends PropertyAccessExpression {
         _propertyAccessExpressionLikeQualifiedNameBrand?: any;
         expression: EntityNameExpression;
     }
-    interface ElementAccessExpression extends MemberExpression {
+    export interface ElementAccessExpression extends MemberExpression {
         kind: SyntaxKind.ElementAccessExpression;
         expression: LeftHandSideExpression;
         argumentExpression: Expression;
     }
-    interface SuperElementAccessExpression extends ElementAccessExpression {
+    export interface SuperElementAccessExpression extends ElementAccessExpression {
         expression: SuperExpression;
     }
-    type SuperProperty = SuperPropertyAccessExpression | SuperElementAccessExpression;
-    interface CallExpression extends LeftHandSideExpression, Declaration {
+    export type SuperProperty = SuperPropertyAccessExpression | SuperElementAccessExpression;
+    export interface CallExpression extends LeftHandSideExpression, Declaration {
         kind: SyntaxKind.CallExpression;
         expression: LeftHandSideExpression;
         typeArguments?: NodeArray<TypeNode>;
         arguments: NodeArray<Expression>;
     }
-    interface SuperCall extends CallExpression {
+    export interface SuperCall extends CallExpression {
         expression: SuperExpression;
     }
-    interface ImportCall extends CallExpression {
+    export interface ImportCall extends CallExpression {
         expression: ImportExpression;
     }
-    interface ExpressionWithTypeArguments extends NodeWithTypeArguments {
+    export interface ExpressionWithTypeArguments extends NodeWithTypeArguments {
         kind: SyntaxKind.ExpressionWithTypeArguments;
         parent: HeritageClause | JSDocAugmentsTag;
         expression: LeftHandSideExpression;
     }
-    interface NewExpression extends PrimaryExpression, Declaration {
+    export interface NewExpression extends PrimaryExpression, Declaration {
         kind: SyntaxKind.NewExpression;
         expression: LeftHandSideExpression;
         typeArguments?: NodeArray<TypeNode>;
         arguments?: NodeArray<Expression>;
     }
-    interface TaggedTemplateExpression extends MemberExpression {
+    export interface TaggedTemplateExpression extends MemberExpression {
         kind: SyntaxKind.TaggedTemplateExpression;
         tag: LeftHandSideExpression;
         typeArguments?: NodeArray<TypeNode>;
         template: TemplateLiteral;
     }
-    type CallLikeExpression = CallExpression | NewExpression | TaggedTemplateExpression | Decorator | JsxOpeningLikeElement;
-    interface AsExpression extends Expression {
+    export type CallLikeExpression = CallExpression | NewExpression | TaggedTemplateExpression | Decorator | JsxOpeningLikeElement;
+    export interface AsExpression extends Expression {
         kind: SyntaxKind.AsExpression;
         expression: Expression;
         type: TypeNode;
     }
-    interface TypeAssertion extends UnaryExpression {
+    export interface TypeAssertion extends UnaryExpression {
         kind: SyntaxKind.TypeAssertionExpression;
         type: TypeNode;
         expression: UnaryExpression;
     }
-    type AssertionExpression = TypeAssertion | AsExpression;
-    interface NonNullExpression extends LeftHandSideExpression {
+    export type AssertionExpression = TypeAssertion | AsExpression;
+    export interface NonNullExpression extends LeftHandSideExpression {
         kind: SyntaxKind.NonNullExpression;
         expression: Expression;
     }
-    interface MetaProperty extends PrimaryExpression {
+    export interface MetaProperty extends PrimaryExpression {
         kind: SyntaxKind.MetaProperty;
         keywordToken: SyntaxKind.NewKeyword | SyntaxKind.ImportKeyword;
         name: Identifier;
     }
-    interface JsxElement extends PrimaryExpression {
+    export interface JsxElement extends PrimaryExpression {
         kind: SyntaxKind.JsxElement;
         openingElement: JsxOpeningElement;
         children: NodeArray<JsxChild>;
         closingElement: JsxClosingElement;
     }
-    type JsxOpeningLikeElement = JsxSelfClosingElement | JsxOpeningElement;
-    type JsxAttributeLike = JsxAttribute | JsxSpreadAttribute;
-    type JsxTagNameExpression = Identifier | ThisExpression | JsxTagNamePropertyAccess;
-    interface JsxTagNamePropertyAccess extends PropertyAccessExpression {
+    export type JsxOpeningLikeElement = JsxSelfClosingElement | JsxOpeningElement;
+    export type JsxAttributeLike = JsxAttribute | JsxSpreadAttribute;
+    export type JsxTagNameExpression = Identifier | ThisExpression | JsxTagNamePropertyAccess;
+    export interface JsxTagNamePropertyAccess extends PropertyAccessExpression {
         expression: JsxTagNameExpression;
     }
-    interface JsxAttributes extends ObjectLiteralExpressionBase<JsxAttributeLike> {
+    export interface JsxAttributes extends ObjectLiteralExpressionBase<JsxAttributeLike> {
         kind: SyntaxKind.JsxAttributes;
         parent: JsxOpeningLikeElement;
     }
-    interface JsxOpeningElement extends Expression {
+    export interface JsxOpeningElement extends Expression {
         kind: SyntaxKind.JsxOpeningElement;
         parent: JsxElement;
         tagName: JsxTagNameExpression;
         typeArguments?: NodeArray<TypeNode>;
         attributes: JsxAttributes;
     }
-    interface JsxSelfClosingElement extends PrimaryExpression {
+    export interface JsxSelfClosingElement extends PrimaryExpression {
         kind: SyntaxKind.JsxSelfClosingElement;
         tagName: JsxTagNameExpression;
         typeArguments?: NodeArray<TypeNode>;
         attributes: JsxAttributes;
     }
-    interface JsxFragment extends PrimaryExpression {
+    export interface JsxFragment extends PrimaryExpression {
         kind: SyntaxKind.JsxFragment;
         openingFragment: JsxOpeningFragment;
         children: NodeArray<JsxChild>;
         closingFragment: JsxClosingFragment;
     }
-    interface JsxOpeningFragment extends Expression {
+    export interface JsxOpeningFragment extends Expression {
         kind: SyntaxKind.JsxOpeningFragment;
         parent: JsxFragment;
     }
-    interface JsxClosingFragment extends Expression {
+    export interface JsxClosingFragment extends Expression {
         kind: SyntaxKind.JsxClosingFragment;
         parent: JsxFragment;
     }
-    interface JsxAttribute extends ObjectLiteralElement {
+    export interface JsxAttribute extends ObjectLiteralElement {
         kind: SyntaxKind.JsxAttribute;
         parent: JsxAttributes;
         name: Identifier;
         initializer?: StringLiteral | JsxExpression;
     }
-    interface JsxSpreadAttribute extends ObjectLiteralElement {
+    export interface JsxSpreadAttribute extends ObjectLiteralElement {
         kind: SyntaxKind.JsxSpreadAttribute;
         parent: JsxAttributes;
         expression: Expression;
     }
-    interface JsxClosingElement extends Node {
+    export interface JsxClosingElement extends Node {
         kind: SyntaxKind.JsxClosingElement;
         parent: JsxElement;
         tagName: JsxTagNameExpression;
     }
-    interface JsxExpression extends Expression {
+    export interface JsxExpression extends Expression {
         kind: SyntaxKind.JsxExpression;
         parent: JsxElement | JsxAttributeLike;
         dotDotDotToken?: Token<SyntaxKind.DotDotDotToken>;
         expression?: Expression;
     }
-    interface JsxText extends LiteralLikeNode {
+    export interface JsxText extends LiteralLikeNode {
         kind: SyntaxKind.JsxText;
         containsOnlyTriviaWhiteSpaces: boolean;
         parent: JsxElement;
     }
-    type JsxChild = JsxText | JsxExpression | JsxElement | JsxSelfClosingElement | JsxFragment;
-    interface Statement extends Node {
+    export type JsxChild = JsxText | JsxExpression | JsxElement | JsxSelfClosingElement | JsxFragment;
+    export interface Statement extends Node {
         _statementBrand: any;
     }
-    interface NotEmittedStatement extends Statement {
+    export interface NotEmittedStatement extends Statement {
         kind: SyntaxKind.NotEmittedStatement;
     }
     /**
      * A list of comma-separated expressions. This node is only created by transformations.
      */
-    interface CommaListExpression extends Expression {
+    export interface CommaListExpression extends Expression {
         kind: SyntaxKind.CommaListExpression;
         elements: NodeArray<Expression>;
     }
-    interface EmptyStatement extends Statement {
+    export interface EmptyStatement extends Statement {
         kind: SyntaxKind.EmptyStatement;
     }
-    interface DebuggerStatement extends Statement {
+    export interface DebuggerStatement extends Statement {
         kind: SyntaxKind.DebuggerStatement;
     }
-    interface MissingDeclaration extends DeclarationStatement {
+    export interface MissingDeclaration extends DeclarationStatement {
         kind: SyntaxKind.MissingDeclaration;
         name?: Identifier;
     }
-    type BlockLike = SourceFile | Block | ModuleBlock | CaseOrDefaultClause;
-    interface Block extends Statement {
+    export type BlockLike = SourceFile | Block | ModuleBlock | CaseOrDefaultClause;
+    export interface Block extends Statement {
         kind: SyntaxKind.Block;
         statements: NodeArray<Statement>;
     }
-    interface VariableStatement extends Statement, JSDocContainer {
+    export interface VariableStatement extends Statement, JSDocContainer {
         kind: SyntaxKind.VariableStatement;
         declarationList: VariableDeclarationList;
     }
-    interface ExpressionStatement extends Statement, JSDocContainer {
+    export interface ExpressionStatement extends Statement, JSDocContainer {
         kind: SyntaxKind.ExpressionStatement;
         expression: Expression;
     }
-    interface IfStatement extends Statement {
+    export interface IfStatement extends Statement {
         kind: SyntaxKind.IfStatement;
         expression: Expression;
         thenStatement: Statement;
         elseStatement?: Statement;
     }
-    interface IterationStatement extends Statement {
+    export interface IterationStatement extends Statement {
         statement: Statement;
     }
-    interface DoStatement extends IterationStatement {
+    export interface DoStatement extends IterationStatement {
         kind: SyntaxKind.DoStatement;
         expression: Expression;
     }
-    interface WhileStatement extends IterationStatement {
+    export interface WhileStatement extends IterationStatement {
         kind: SyntaxKind.WhileStatement;
         expression: Expression;
     }
-    type ForInitializer = VariableDeclarationList | Expression;
-    interface ForStatement extends IterationStatement {
+    export type ForInitializer = VariableDeclarationList | Expression;
+    export interface ForStatement extends IterationStatement {
         kind: SyntaxKind.ForStatement;
         initializer?: ForInitializer;
         condition?: Expression;
         incrementor?: Expression;
     }
-    type ForInOrOfStatement = ForInStatement | ForOfStatement;
-    interface ForInStatement extends IterationStatement {
+    export type ForInOrOfStatement = ForInStatement | ForOfStatement;
+    export interface ForInStatement extends IterationStatement {
         kind: SyntaxKind.ForInStatement;
         initializer: ForInitializer;
         expression: Expression;
     }
-    interface ForOfStatement extends IterationStatement {
+    export interface ForOfStatement extends IterationStatement {
         kind: SyntaxKind.ForOfStatement;
         awaitModifier?: AwaitKeywordToken;
         initializer: ForInitializer;
         expression: Expression;
     }
-    interface BreakStatement extends Statement {
+    export interface BreakStatement extends Statement {
         kind: SyntaxKind.BreakStatement;
         label?: Identifier;
     }
-    interface ContinueStatement extends Statement {
+    export interface ContinueStatement extends Statement {
         kind: SyntaxKind.ContinueStatement;
         label?: Identifier;
     }
-    type BreakOrContinueStatement = BreakStatement | ContinueStatement;
-    interface ReturnStatement extends Statement {
+    export type BreakOrContinueStatement = BreakStatement | ContinueStatement;
+    export interface ReturnStatement extends Statement {
         kind: SyntaxKind.ReturnStatement;
         expression?: Expression;
     }
-    interface WithStatement extends Statement {
+    export interface WithStatement extends Statement {
         kind: SyntaxKind.WithStatement;
         expression: Expression;
         statement: Statement;
     }
-    interface SwitchStatement extends Statement {
+    export interface SwitchStatement extends Statement {
         kind: SyntaxKind.SwitchStatement;
         expression: Expression;
         caseBlock: CaseBlock;
         possiblyExhaustive?: boolean;
     }
-    interface CaseBlock extends Node {
+    export interface CaseBlock extends Node {
         kind: SyntaxKind.CaseBlock;
         parent: SwitchStatement;
         clauses: NodeArray<CaseOrDefaultClause>;
     }
-    interface CaseClause extends Node {
+    export interface CaseClause extends Node {
         kind: SyntaxKind.CaseClause;
         parent: CaseBlock;
         expression: Expression;
         statements: NodeArray<Statement>;
     }
-    interface DefaultClause extends Node {
+    export interface DefaultClause extends Node {
         kind: SyntaxKind.DefaultClause;
         parent: CaseBlock;
         statements: NodeArray<Statement>;
     }
-    type CaseOrDefaultClause = CaseClause | DefaultClause;
-    interface LabeledStatement extends Statement, JSDocContainer {
+    export type CaseOrDefaultClause = CaseClause | DefaultClause;
+    export interface LabeledStatement extends Statement, JSDocContainer {
         kind: SyntaxKind.LabeledStatement;
         label: Identifier;
         statement: Statement;
     }
-    interface ThrowStatement extends Statement {
+    export interface ThrowStatement extends Statement {
         kind: SyntaxKind.ThrowStatement;
         expression?: Expression;
     }
-    interface TryStatement extends Statement {
+    export interface TryStatement extends Statement {
         kind: SyntaxKind.TryStatement;
         tryBlock: Block;
         catchClause?: CatchClause;
         finallyBlock?: Block;
     }
-    interface CatchClause extends Node {
+    export interface CatchClause extends Node {
         kind: SyntaxKind.CatchClause;
         parent: TryStatement;
         variableDeclaration?: VariableDeclaration;
         block: Block;
     }
-    type ObjectTypeDeclaration = ClassLikeDeclaration | InterfaceDeclaration | TypeLiteralNode;
-    type DeclarationWithTypeParameters = DeclarationWithTypeParameterChildren | JSDocTypedefTag | JSDocCallbackTag | JSDocSignature;
-    type DeclarationWithTypeParameterChildren = SignatureDeclaration | ClassLikeDeclaration | InterfaceDeclaration | TypeAliasDeclaration | JSDocTemplateTag;
-    interface ClassLikeDeclarationBase extends NamedDeclaration, JSDocContainer {
+    export type ObjectTypeDeclaration = ClassLikeDeclaration | InterfaceDeclaration | TypeLiteralNode;
+    export type DeclarationWithTypeParameters = DeclarationWithTypeParameterChildren | JSDocTypedefTag | JSDocCallbackTag | JSDocSignature;
+    export type DeclarationWithTypeParameterChildren = SignatureDeclaration | ClassLikeDeclaration | InterfaceDeclaration | TypeAliasDeclaration | JSDocTemplateTag;
+    export interface ClassLikeDeclarationBase extends NamedDeclaration, JSDocContainer {
         kind: SyntaxKind.ClassDeclaration | SyntaxKind.ClassExpression;
         name?: Identifier;
         typeParameters?: NodeArray<TypeParameterDeclaration>;
         heritageClauses?: NodeArray<HeritageClause>;
         members: NodeArray<ClassElement>;
     }
-    interface ClassDeclaration extends ClassLikeDeclarationBase, DeclarationStatement {
+    export interface ClassDeclaration extends ClassLikeDeclarationBase, DeclarationStatement {
         kind: SyntaxKind.ClassDeclaration;
         /** May be undefined in `export default class { ... }`. */
         name?: Identifier;
     }
-    interface ClassExpression extends ClassLikeDeclarationBase, PrimaryExpression {
+    export interface ClassExpression extends ClassLikeDeclarationBase, PrimaryExpression {
         kind: SyntaxKind.ClassExpression;
     }
-    type ClassLikeDeclaration = ClassDeclaration | ClassExpression;
-    interface ClassElement extends NamedDeclaration {
+    export type ClassLikeDeclaration = ClassDeclaration | ClassExpression;
+    export interface ClassElement extends NamedDeclaration {
         _classElementBrand: any;
         name?: PropertyName;
     }
-    interface TypeElement extends NamedDeclaration {
+    export interface TypeElement extends NamedDeclaration {
         _typeElementBrand: any;
         name?: PropertyName;
         questionToken?: QuestionToken;
     }
-    interface InterfaceDeclaration extends DeclarationStatement, JSDocContainer {
+    export interface InterfaceDeclaration extends DeclarationStatement, JSDocContainer {
         kind: SyntaxKind.InterfaceDeclaration;
         name: Identifier;
         typeParameters?: NodeArray<TypeParameterDeclaration>;
         heritageClauses?: NodeArray<HeritageClause>;
         members: NodeArray<TypeElement>;
     }
-    interface HeritageClause extends Node {
+    export interface HeritageClause extends Node {
         kind: SyntaxKind.HeritageClause;
         parent: InterfaceDeclaration | ClassLikeDeclaration;
         token: SyntaxKind.ExtendsKeyword | SyntaxKind.ImplementsKeyword;
         types: NodeArray<ExpressionWithTypeArguments>;
     }
-    interface TypeAliasDeclaration extends DeclarationStatement, JSDocContainer {
+    export interface TypeAliasDeclaration extends DeclarationStatement, JSDocContainer {
         kind: SyntaxKind.TypeAliasDeclaration;
         name: Identifier;
         typeParameters?: NodeArray<TypeParameterDeclaration>;
         type: TypeNode;
     }
-    interface EnumMember extends NamedDeclaration, JSDocContainer {
+    export interface EnumMember extends NamedDeclaration, JSDocContainer {
         kind: SyntaxKind.EnumMember;
         parent: EnumDeclaration;
         name: PropertyName;
         initializer?: Expression;
     }
-    interface EnumDeclaration extends DeclarationStatement, JSDocContainer {
+    export interface EnumDeclaration extends DeclarationStatement, JSDocContainer {
         kind: SyntaxKind.EnumDeclaration;
         name: Identifier;
         members: NodeArray<EnumMember>;
     }
-    type ModuleName = Identifier | StringLiteral;
-    type ModuleBody = NamespaceBody | JSDocNamespaceBody;
-    interface ModuleDeclaration extends DeclarationStatement, JSDocContainer {
+    export type ModuleName = Identifier | StringLiteral;
+    export type ModuleBody = NamespaceBody | JSDocNamespaceBody;
+    export interface ModuleDeclaration extends DeclarationStatement, JSDocContainer {
         kind: SyntaxKind.ModuleDeclaration;
         parent: ModuleBody | SourceFile;
         name: ModuleName;
         body?: ModuleBody | JSDocNamespaceDeclaration;
     }
-    type NamespaceBody = ModuleBlock | NamespaceDeclaration;
-    interface NamespaceDeclaration extends ModuleDeclaration {
+    export type NamespaceBody = ModuleBlock | NamespaceDeclaration;
+    export interface NamespaceDeclaration extends ModuleDeclaration {
         name: Identifier;
         body: NamespaceBody;
     }
-    type JSDocNamespaceBody = Identifier | JSDocNamespaceDeclaration;
-    interface JSDocNamespaceDeclaration extends ModuleDeclaration {
+    export type JSDocNamespaceBody = Identifier | JSDocNamespaceDeclaration;
+    export interface JSDocNamespaceDeclaration extends ModuleDeclaration {
         name: Identifier;
         body?: JSDocNamespaceBody;
     }
-    interface ModuleBlock extends Node, Statement {
+    export interface ModuleBlock extends Node, Statement {
         kind: SyntaxKind.ModuleBlock;
         parent: ModuleDeclaration;
         statements: NodeArray<Statement>;
     }
-    type ModuleReference = EntityName | ExternalModuleReference;
+    export type ModuleReference = EntityName | ExternalModuleReference;
     /**
      * One of:
      * - import x = require("mod");
      * - import x = M.x;
      */
-    interface ImportEqualsDeclaration extends DeclarationStatement, JSDocContainer {
+    export interface ImportEqualsDeclaration extends DeclarationStatement, JSDocContainer {
         kind: SyntaxKind.ImportEqualsDeclaration;
         parent: SourceFile | ModuleBlock;
         name: Identifier;
         moduleReference: ModuleReference;
     }
-    interface ExternalModuleReference extends Node {
+    export interface ExternalModuleReference extends Node {
         kind: SyntaxKind.ExternalModuleReference;
         parent: ImportEqualsDeclaration;
         expression: Expression;
     }
-    interface ImportDeclaration extends Statement {
+    export interface ImportDeclaration extends Statement {
         kind: SyntaxKind.ImportDeclaration;
         parent: SourceFile | ModuleBlock;
         importClause?: ImportClause;
         /** If this is not a StringLiteral it will be a grammar error. */
         moduleSpecifier: Expression;
     }
-    type NamedImportBindings = NamespaceImport | NamedImports;
-    interface ImportClause extends NamedDeclaration {
+    export type NamedImportBindings = NamespaceImport | NamedImports;
+    export interface ImportClause extends NamedDeclaration {
         kind: SyntaxKind.ImportClause;
         parent: ImportDeclaration;
         name?: Identifier;
         namedBindings?: NamedImportBindings;
     }
-    interface NamespaceImport extends NamedDeclaration {
+    export interface NamespaceImport extends NamedDeclaration {
         kind: SyntaxKind.NamespaceImport;
         parent: ImportClause;
         name: Identifier;
     }
-    interface NamespaceExportDeclaration extends DeclarationStatement {
+    export interface NamespaceExportDeclaration extends DeclarationStatement {
         kind: SyntaxKind.NamespaceExportDeclaration;
         name: Identifier;
     }
-    interface ExportDeclaration extends DeclarationStatement, JSDocContainer {
+    export interface ExportDeclaration extends DeclarationStatement, JSDocContainer {
         kind: SyntaxKind.ExportDeclaration;
         parent: SourceFile | ModuleBlock;
         /** Will not be assigned in the case of `export * from "foo";` */
@@ -1476,162 +1476,162 @@ declare namespace ts {
         /** If this is not a StringLiteral it will be a grammar error. */
         moduleSpecifier?: Expression;
     }
-    interface NamedImports extends Node {
+    export interface NamedImports extends Node {
         kind: SyntaxKind.NamedImports;
         parent: ImportClause;
         elements: NodeArray<ImportSpecifier>;
     }
-    interface NamedExports extends Node {
+    export interface NamedExports extends Node {
         kind: SyntaxKind.NamedExports;
         parent: ExportDeclaration;
         elements: NodeArray<ExportSpecifier>;
     }
-    type NamedImportsOrExports = NamedImports | NamedExports;
-    interface ImportSpecifier extends NamedDeclaration {
+    export type NamedImportsOrExports = NamedImports | NamedExports;
+    export interface ImportSpecifier extends NamedDeclaration {
         kind: SyntaxKind.ImportSpecifier;
         parent: NamedImports;
         propertyName?: Identifier;
         name: Identifier;
     }
-    interface ExportSpecifier extends NamedDeclaration {
+    export interface ExportSpecifier extends NamedDeclaration {
         kind: SyntaxKind.ExportSpecifier;
         parent: NamedExports;
         propertyName?: Identifier;
         name: Identifier;
     }
-    type ImportOrExportSpecifier = ImportSpecifier | ExportSpecifier;
+    export type ImportOrExportSpecifier = ImportSpecifier | ExportSpecifier;
     /**
      * This is either an `export =` or an `export default` declaration.
      * Unless `isExportEquals` is set, this node was parsed as an `export default`.
      */
-    interface ExportAssignment extends DeclarationStatement {
+    export interface ExportAssignment extends DeclarationStatement {
         kind: SyntaxKind.ExportAssignment;
         parent: SourceFile;
         isExportEquals?: boolean;
         expression: Expression;
     }
-    interface FileReference extends TextRange {
+    export interface FileReference extends TextRange {
         fileName: string;
     }
-    interface CheckJsDirective extends TextRange {
+    export interface CheckJsDirective extends TextRange {
         enabled: boolean;
     }
-    type CommentKind = SyntaxKind.SingleLineCommentTrivia | SyntaxKind.MultiLineCommentTrivia;
-    interface CommentRange extends TextRange {
+    export type CommentKind = SyntaxKind.SingleLineCommentTrivia | SyntaxKind.MultiLineCommentTrivia;
+    export interface CommentRange extends TextRange {
         hasTrailingNewLine?: boolean;
         kind: CommentKind;
     }
-    interface SynthesizedComment extends CommentRange {
+    export interface SynthesizedComment extends CommentRange {
         text: string;
         pos: -1;
         end: -1;
     }
-    interface JSDocTypeExpression extends TypeNode {
+    export interface JSDocTypeExpression extends TypeNode {
         kind: SyntaxKind.JSDocTypeExpression;
         type: TypeNode;
     }
-    interface JSDocType extends TypeNode {
+    export interface JSDocType extends TypeNode {
         _jsDocTypeBrand: any;
     }
-    interface JSDocAllType extends JSDocType {
+    export interface JSDocAllType extends JSDocType {
         kind: SyntaxKind.JSDocAllType;
     }
-    interface JSDocUnknownType extends JSDocType {
+    export interface JSDocUnknownType extends JSDocType {
         kind: SyntaxKind.JSDocUnknownType;
     }
-    interface JSDocNonNullableType extends JSDocType {
+    export interface JSDocNonNullableType extends JSDocType {
         kind: SyntaxKind.JSDocNonNullableType;
         type: TypeNode;
     }
-    interface JSDocNullableType extends JSDocType {
+    export interface JSDocNullableType extends JSDocType {
         kind: SyntaxKind.JSDocNullableType;
         type: TypeNode;
     }
-    interface JSDocOptionalType extends JSDocType {
+    export interface JSDocOptionalType extends JSDocType {
         kind: SyntaxKind.JSDocOptionalType;
         type: TypeNode;
     }
-    interface JSDocFunctionType extends JSDocType, SignatureDeclarationBase {
+    export interface JSDocFunctionType extends JSDocType, SignatureDeclarationBase {
         kind: SyntaxKind.JSDocFunctionType;
     }
-    interface JSDocVariadicType extends JSDocType {
+    export interface JSDocVariadicType extends JSDocType {
         kind: SyntaxKind.JSDocVariadicType;
         type: TypeNode;
     }
-    type JSDocTypeReferencingNode = JSDocVariadicType | JSDocOptionalType | JSDocNullableType | JSDocNonNullableType;
-    interface JSDoc extends Node {
+    export type JSDocTypeReferencingNode = JSDocVariadicType | JSDocOptionalType | JSDocNullableType | JSDocNonNullableType;
+    export interface JSDoc extends Node {
         kind: SyntaxKind.JSDocComment;
         parent: HasJSDoc;
         tags?: NodeArray<JSDocTag>;
         comment?: string;
     }
-    interface JSDocTag extends Node {
+    export interface JSDocTag extends Node {
         parent: JSDoc | JSDocTypeLiteral;
         tagName: Identifier;
         comment?: string;
     }
-    interface JSDocUnknownTag extends JSDocTag {
+    export interface JSDocUnknownTag extends JSDocTag {
         kind: SyntaxKind.JSDocTag;
     }
     /**
      * Note that `@extends` is a synonym of `@augments`.
      * Both tags are represented by this interface.
      */
-    interface JSDocAugmentsTag extends JSDocTag {
+    export interface JSDocAugmentsTag extends JSDocTag {
         kind: SyntaxKind.JSDocAugmentsTag;
         class: ExpressionWithTypeArguments & {
             expression: Identifier | PropertyAccessEntityNameExpression;
         };
     }
-    interface JSDocAuthorTag extends JSDocTag {
+    export interface JSDocAuthorTag extends JSDocTag {
         kind: SyntaxKind.JSDocAuthorTag;
     }
-    interface JSDocClassTag extends JSDocTag {
+    export interface JSDocClassTag extends JSDocTag {
         kind: SyntaxKind.JSDocClassTag;
     }
-    interface JSDocEnumTag extends JSDocTag, Declaration {
+    export interface JSDocEnumTag extends JSDocTag, Declaration {
         parent: JSDoc;
         kind: SyntaxKind.JSDocEnumTag;
         typeExpression?: JSDocTypeExpression;
     }
-    interface JSDocThisTag extends JSDocTag {
+    export interface JSDocThisTag extends JSDocTag {
         kind: SyntaxKind.JSDocThisTag;
         typeExpression?: JSDocTypeExpression;
     }
-    interface JSDocTemplateTag extends JSDocTag {
+    export interface JSDocTemplateTag extends JSDocTag {
         kind: SyntaxKind.JSDocTemplateTag;
         constraint: JSDocTypeExpression | undefined;
         typeParameters: NodeArray<TypeParameterDeclaration>;
     }
-    interface JSDocReturnTag extends JSDocTag {
+    export interface JSDocReturnTag extends JSDocTag {
         kind: SyntaxKind.JSDocReturnTag;
         typeExpression?: JSDocTypeExpression;
     }
-    interface JSDocTypeTag extends JSDocTag {
+    export interface JSDocTypeTag extends JSDocTag {
         kind: SyntaxKind.JSDocTypeTag;
         typeExpression: JSDocTypeExpression;
     }
-    interface JSDocTypedefTag extends JSDocTag, NamedDeclaration {
+    export interface JSDocTypedefTag extends JSDocTag, NamedDeclaration {
         parent: JSDoc;
         kind: SyntaxKind.JSDocTypedefTag;
         fullName?: JSDocNamespaceDeclaration | Identifier;
         name?: Identifier;
         typeExpression?: JSDocTypeExpression | JSDocTypeLiteral;
     }
-    interface JSDocCallbackTag extends JSDocTag, NamedDeclaration {
+    export interface JSDocCallbackTag extends JSDocTag, NamedDeclaration {
         parent: JSDoc;
         kind: SyntaxKind.JSDocCallbackTag;
         fullName?: JSDocNamespaceDeclaration | Identifier;
         name?: Identifier;
         typeExpression: JSDocSignature;
     }
-    interface JSDocSignature extends JSDocType, Declaration {
+    export interface JSDocSignature extends JSDocType, Declaration {
         kind: SyntaxKind.JSDocSignature;
         typeParameters?: ReadonlyArray<JSDocTemplateTag>;
         parameters: ReadonlyArray<JSDocParameterTag>;
         type: JSDocReturnTag | undefined;
     }
-    interface JSDocPropertyLikeTag extends JSDocTag, Declaration {
+    export interface JSDocPropertyLikeTag extends JSDocTag, Declaration {
         parent: JSDoc;
         name: EntityName;
         typeExpression?: JSDocTypeExpression;
@@ -1639,19 +1639,19 @@ declare namespace ts {
         isNameFirst: boolean;
         isBracketed: boolean;
     }
-    interface JSDocPropertyTag extends JSDocPropertyLikeTag {
+    export interface JSDocPropertyTag extends JSDocPropertyLikeTag {
         kind: SyntaxKind.JSDocPropertyTag;
     }
-    interface JSDocParameterTag extends JSDocPropertyLikeTag {
+    export interface JSDocParameterTag extends JSDocPropertyLikeTag {
         kind: SyntaxKind.JSDocParameterTag;
     }
-    interface JSDocTypeLiteral extends JSDocType {
+    export interface JSDocTypeLiteral extends JSDocType {
         kind: SyntaxKind.JSDocTypeLiteral;
         jsDocPropertyTags?: ReadonlyArray<JSDocPropertyLikeTag>;
         /** If true, then this type literal represents an *array* of its type. */
         isArrayType?: boolean;
     }
-    enum FlowFlags {
+    export enum FlowFlags {
         Unreachable = 1,
         Start = 2,
         BranchLabel = 4,
@@ -1668,55 +1668,55 @@ declare namespace ts {
         Label = 12,
         Condition = 96
     }
-    interface FlowLock {
+    export interface FlowLock {
         locked?: boolean;
     }
-    interface AfterFinallyFlow extends FlowNodeBase, FlowLock {
+    export interface AfterFinallyFlow extends FlowNodeBase, FlowLock {
         antecedent: FlowNode;
     }
-    interface PreFinallyFlow extends FlowNodeBase {
+    export interface PreFinallyFlow extends FlowNodeBase {
         antecedent: FlowNode;
         lock: FlowLock;
     }
-    type FlowNode = AfterFinallyFlow | PreFinallyFlow | FlowStart | FlowLabel | FlowAssignment | FlowCondition | FlowSwitchClause | FlowArrayMutation;
-    interface FlowNodeBase {
+    export type FlowNode = AfterFinallyFlow | PreFinallyFlow | FlowStart | FlowLabel | FlowAssignment | FlowCondition | FlowSwitchClause | FlowArrayMutation;
+    export interface FlowNodeBase {
         flags: FlowFlags;
         id?: number;
     }
-    interface FlowStart extends FlowNodeBase {
+    export interface FlowStart extends FlowNodeBase {
         container?: FunctionExpression | ArrowFunction | MethodDeclaration;
     }
-    interface FlowLabel extends FlowNodeBase {
+    export interface FlowLabel extends FlowNodeBase {
         antecedents: FlowNode[] | undefined;
     }
-    interface FlowAssignment extends FlowNodeBase {
+    export interface FlowAssignment extends FlowNodeBase {
         node: Expression | VariableDeclaration | BindingElement;
         antecedent: FlowNode;
     }
-    interface FlowCondition extends FlowNodeBase {
+    export interface FlowCondition extends FlowNodeBase {
         expression: Expression;
         antecedent: FlowNode;
     }
-    interface FlowSwitchClause extends FlowNodeBase {
+    export interface FlowSwitchClause extends FlowNodeBase {
         switchStatement: SwitchStatement;
         clauseStart: number;
         clauseEnd: number;
         antecedent: FlowNode;
     }
-    interface FlowArrayMutation extends FlowNodeBase {
+    export interface FlowArrayMutation extends FlowNodeBase {
         node: CallExpression | BinaryExpression;
         antecedent: FlowNode;
     }
-    type FlowType = Type | IncompleteType;
-    interface IncompleteType {
+    export type FlowType = Type | IncompleteType;
+    export interface IncompleteType {
         flags: TypeFlags;
         type: Type;
     }
-    interface AmdDependency {
+    export interface AmdDependency {
         path: string;
         name?: string;
     }
-    interface SourceFile extends Declaration {
+    export interface SourceFile extends Declaration {
         kind: SyntaxKind.SourceFile;
         statements: NodeArray<Statement>;
         endOfFileToken: Token<SyntaxKind.EndOfFileToken>;
@@ -1740,12 +1740,12 @@ declare namespace ts {
         hasNoDefaultLib: boolean;
         languageVersion: ScriptTarget;
     }
-    interface Bundle extends Node {
+    export interface Bundle extends Node {
         kind: SyntaxKind.Bundle;
         prepends: ReadonlyArray<InputFiles | UnparsedSource>;
         sourceFiles: ReadonlyArray<SourceFile>;
     }
-    interface InputFiles extends Node {
+    export interface InputFiles extends Node {
         kind: SyntaxKind.InputFiles;
         javascriptPath?: string;
         javascriptText: string;
@@ -1756,7 +1756,7 @@ declare namespace ts {
         declarationMapPath?: string;
         declarationMapText?: string;
     }
-    interface UnparsedSource extends Node {
+    export interface UnparsedSource extends Node {
         kind: SyntaxKind.UnparsedSource;
         fileName: string;
         text: string;
@@ -1771,53 +1771,53 @@ declare namespace ts {
         syntheticReferences?: ReadonlyArray<UnparsedSyntheticReference>;
         texts: ReadonlyArray<UnparsedSourceText>;
     }
-    type UnparsedSourceText = UnparsedPrepend | UnparsedTextLike;
-    type UnparsedNode = UnparsedPrologue | UnparsedSourceText | UnparsedSyntheticReference;
-    interface UnparsedSection extends Node {
+    export type UnparsedSourceText = UnparsedPrepend | UnparsedTextLike;
+    export type UnparsedNode = UnparsedPrologue | UnparsedSourceText | UnparsedSyntheticReference;
+    export interface UnparsedSection extends Node {
         kind: SyntaxKind;
         data?: string;
         parent: UnparsedSource;
     }
-    interface UnparsedPrologue extends UnparsedSection {
+    export interface UnparsedPrologue extends UnparsedSection {
         kind: SyntaxKind.UnparsedPrologue;
         data: string;
         parent: UnparsedSource;
     }
-    interface UnparsedPrepend extends UnparsedSection {
+    export interface UnparsedPrepend extends UnparsedSection {
         kind: SyntaxKind.UnparsedPrepend;
         data: string;
         parent: UnparsedSource;
         texts: ReadonlyArray<UnparsedTextLike>;
     }
-    interface UnparsedTextLike extends UnparsedSection {
+    export interface UnparsedTextLike extends UnparsedSection {
         kind: SyntaxKind.UnparsedText | SyntaxKind.UnparsedInternalText;
         parent: UnparsedSource;
     }
-    interface UnparsedSyntheticReference extends UnparsedSection {
+    export interface UnparsedSyntheticReference extends UnparsedSection {
         kind: SyntaxKind.UnparsedSyntheticReference;
         parent: UnparsedSource;
     }
-    interface JsonSourceFile extends SourceFile {
+    export interface JsonSourceFile extends SourceFile {
         statements: NodeArray<JsonObjectExpressionStatement>;
     }
-    interface TsConfigSourceFile extends JsonSourceFile {
+    export interface TsConfigSourceFile extends JsonSourceFile {
         extendedSourceFiles?: string[];
     }
-    interface JsonMinusNumericLiteral extends PrefixUnaryExpression {
+    export interface JsonMinusNumericLiteral extends PrefixUnaryExpression {
         kind: SyntaxKind.PrefixUnaryExpression;
         operator: SyntaxKind.MinusToken;
         operand: NumericLiteral;
     }
-    interface JsonObjectExpressionStatement extends ExpressionStatement {
+    export interface JsonObjectExpressionStatement extends ExpressionStatement {
         expression: ObjectLiteralExpression | ArrayLiteralExpression | JsonMinusNumericLiteral | NumericLiteral | StringLiteral | BooleanLiteral | NullLiteral;
     }
-    interface ScriptReferenceHost {
+    export interface ScriptReferenceHost {
         getCompilerOptions(): CompilerOptions;
         getSourceFile(fileName: string): SourceFile | undefined;
         getSourceFileByPath(path: Path): SourceFile | undefined;
         getCurrentDirectory(): string;
     }
-    interface ParseConfigHost {
+    export interface ParseConfigHost {
         useCaseSensitiveFileNames: boolean;
         readDirectory(rootDir: string, extensions: ReadonlyArray<string>, excludes: ReadonlyArray<string> | undefined, includes: ReadonlyArray<string>, depth?: number): ReadonlyArray<string>;
         /**
@@ -1833,18 +1833,18 @@ declare namespace ts {
      * specified like "./blah" to an absolute path to an actual
      * tsconfig file, e.g. "/root/blah/tsconfig.json"
      */
-    type ResolvedConfigFileName = string & {
+    export type ResolvedConfigFileName = string & {
         _isResolvedConfigFileName: never;
     };
-    type WriteFileCallback = (fileName: string, data: string, writeByteOrderMark: boolean, onError?: (message: string) => void, sourceFiles?: ReadonlyArray<SourceFile>) => void;
-    class OperationCanceledException {
+    export type WriteFileCallback = (fileName: string, data: string, writeByteOrderMark: boolean, onError?: (message: string) => void, sourceFiles?: ReadonlyArray<SourceFile>) => void;
+    export class OperationCanceledException {
     }
-    interface CancellationToken {
+    export interface CancellationToken {
         isCancellationRequested(): boolean;
         /** @throws OperationCanceledException if isCancellationRequested is true */
         throwIfCancellationRequested(): void;
     }
-    interface Program extends ScriptReferenceHost {
+    export interface Program extends ScriptReferenceHost {
         /**
          * Get a list of root file names that were passed to a 'createProgram'
          */
@@ -1880,17 +1880,17 @@ declare namespace ts {
         getProjectReferences(): ReadonlyArray<ProjectReference> | undefined;
         getResolvedProjectReferences(): ReadonlyArray<ResolvedProjectReference | undefined> | undefined;
     }
-    interface ResolvedProjectReference {
+    export interface ResolvedProjectReference {
         commandLine: ParsedCommandLine;
         sourceFile: SourceFile;
         references?: ReadonlyArray<ResolvedProjectReference | undefined>;
     }
-    type CustomTransformerFactory = (context: TransformationContext) => CustomTransformer;
-    interface CustomTransformer {
+    export type CustomTransformerFactory = (context: TransformationContext) => CustomTransformer;
+    export interface CustomTransformer {
         transformSourceFile(node: SourceFile): SourceFile;
         transformBundle(node: Bundle): Bundle;
     }
-    interface CustomTransformers {
+    export interface CustomTransformers {
         /** Custom transformers to evaluate before built-in .js transformations. */
         before?: (TransformerFactory<SourceFile> | CustomTransformerFactory)[];
         /** Custom transformers to evaluate after built-in .js transformations. */
@@ -1898,7 +1898,7 @@ declare namespace ts {
         /** Custom transformers to evaluate after built-in .d.ts transformations. */
         afterDeclarations?: (TransformerFactory<Bundle | SourceFile> | CustomTransformerFactory)[];
     }
-    interface SourceMapSpan {
+    export interface SourceMapSpan {
         /** Line number in the .js file. */
         emittedLine: number;
         /** Column number in the .js file. */
@@ -1913,19 +1913,19 @@ declare namespace ts {
         sourceIndex: number;
     }
     /** Return code used by getEmitOutput function to indicate status of the function */
-    enum ExitStatus {
+    export enum ExitStatus {
         Success = 0,
         DiagnosticsPresent_OutputsSkipped = 1,
         DiagnosticsPresent_OutputsGenerated = 2,
         InvalidProject_OutputsSkipped = 3
     }
-    interface EmitResult {
+    export interface EmitResult {
         emitSkipped: boolean;
         /** Contains declaration emit diagnostics */
         diagnostics: ReadonlyArray<Diagnostic>;
         emittedFiles?: string[];
     }
-    interface TypeChecker {
+    export interface TypeChecker {
         getTypeOfSymbolAtLocation(symbol: Symbol, node: Node): Type;
         getDeclaredTypeOfSymbol(symbol: Symbol): Type;
         getPropertiesOfType(type: Type): Symbol[];
@@ -2017,7 +2017,7 @@ declare namespace ts {
          */
         runWithCancellationToken<T>(token: CancellationToken, cb: (checker: TypeChecker) => T): T;
     }
-    enum NodeBuilderFlags {
+    export enum NodeBuilderFlags {
         None = 0,
         NoTruncation = 1,
         WriteArrayAsGenericType = 2,
@@ -2048,7 +2048,7 @@ declare namespace ts {
         InInitialEntityName = 16777216,
         InReverseMappedType = 33554432
     }
-    enum TypeFormatFlags {
+    export enum TypeFormatFlags {
         None = 0,
         NoTruncation = 1,
         WriteArrayAsGenericType = 2,
@@ -2071,31 +2071,31 @@ declare namespace ts {
         /** @deprecated */ WriteOwnNameForAnyLike = 0,
         NodeBuilderFlagsMask = 9469291
     }
-    enum SymbolFormatFlags {
+    export enum SymbolFormatFlags {
         None = 0,
         WriteTypeParametersOrArguments = 1,
         UseOnlyExternalAliasing = 2,
         AllowAnyNodeKind = 4,
         UseAliasDefinedOutsideCurrentScope = 8,
     }
-    enum TypePredicateKind {
+    export enum TypePredicateKind {
         This = 0,
         Identifier = 1
     }
-    interface TypePredicateBase {
+    export interface TypePredicateBase {
         kind: TypePredicateKind;
         type: Type;
     }
-    interface ThisTypePredicate extends TypePredicateBase {
+    export interface ThisTypePredicate extends TypePredicateBase {
         kind: TypePredicateKind.This;
     }
-    interface IdentifierTypePredicate extends TypePredicateBase {
+    export interface IdentifierTypePredicate extends TypePredicateBase {
         kind: TypePredicateKind.Identifier;
         parameterName: string;
         parameterIndex: number;
     }
-    type TypePredicate = IdentifierTypePredicate | ThisTypePredicate;
-    enum SymbolFlags {
+    export type TypePredicate = IdentifierTypePredicate | ThisTypePredicate;
+    export enum SymbolFlags {
         None = 0,
         FunctionScopedVariable = 1,
         BlockScopedVariable = 2,
@@ -2156,7 +2156,7 @@ declare namespace ts {
         PropertyOrAccessor = 98308,
         ClassMember = 106500,
     }
-    interface Symbol {
+    export interface Symbol {
         flags: SymbolFlags;
         escapedName: __String;
         declarations: Declaration[];
@@ -2165,7 +2165,7 @@ declare namespace ts {
         exports?: SymbolTable;
         globalExports?: SymbolTable;
     }
-    enum InternalSymbolName {
+    export enum InternalSymbolName {
         Call = "__call",
         Constructor = "__constructor",
         New = "__new",
@@ -2192,13 +2192,13 @@ declare namespace ts {
      * with a normal string (which is good, it cannot be misused on assignment or on usage),
      * while still being comparable with a normal string via === (also good) and castable from a string.
      */
-    type __String = (string & {
+    export type __String = (string & {
         __escapedIdentifier: void;
     }) | (void & {
         __escapedIdentifier: void;
     }) | InternalSymbolName;
     /** ReadonlyMap where keys are `__String`s. */
-    interface ReadonlyUnderscoreEscapedMap<T> {
+    export interface ReadonlyUnderscoreEscapedMap<T> {
         get(key: __String): T | undefined;
         has(key: __String): boolean;
         forEach(action: (value: T, key: __String) => void): void;
@@ -2208,14 +2208,14 @@ declare namespace ts {
         entries(): Iterator<[__String, T]>;
     }
     /** Map where keys are `__String`s. */
-    interface UnderscoreEscapedMap<T> extends ReadonlyUnderscoreEscapedMap<T> {
+    export interface UnderscoreEscapedMap<T> extends ReadonlyUnderscoreEscapedMap<T> {
         set(key: __String, value: T): this;
         delete(key: __String): boolean;
         clear(): void;
     }
     /** SymbolTable based on ES6 Map interface. */
-    type SymbolTable = UnderscoreEscapedMap<Symbol>;
-    enum TypeFlags {
+    export type SymbolTable = UnderscoreEscapedMap<Symbol>;
+    export enum TypeFlags {
         Any = 1,
         Unknown = 2,
         String = 4,
@@ -2264,35 +2264,35 @@ declare namespace ts {
         Narrowable = 133970943,
         NotUnionOrUnit = 67637251,
     }
-    type DestructuringPattern = BindingPattern | ObjectLiteralExpression | ArrayLiteralExpression;
-    interface Type {
+    export type DestructuringPattern = BindingPattern | ObjectLiteralExpression | ArrayLiteralExpression;
+    export interface Type {
         flags: TypeFlags;
         symbol: Symbol;
         pattern?: DestructuringPattern;
         aliasSymbol?: Symbol;
         aliasTypeArguments?: ReadonlyArray<Type>;
     }
-    interface LiteralType extends Type {
+    export interface LiteralType extends Type {
         value: string | number | PseudoBigInt;
         freshType: LiteralType;
         regularType: LiteralType;
     }
-    interface UniqueESSymbolType extends Type {
+    export interface UniqueESSymbolType extends Type {
         symbol: Symbol;
         escapedName: __String;
     }
-    interface StringLiteralType extends LiteralType {
+    export interface StringLiteralType extends LiteralType {
         value: string;
     }
-    interface NumberLiteralType extends LiteralType {
+    export interface NumberLiteralType extends LiteralType {
         value: number;
     }
-    interface BigIntLiteralType extends LiteralType {
+    export interface BigIntLiteralType extends LiteralType {
         value: PseudoBigInt;
     }
-    interface EnumType extends Type {
+    export interface EnumType extends Type {
     }
-    enum ObjectFlags {
+    export enum ObjectFlags {
         Class = 1,
         Interface = 2,
         Reference = 4,
@@ -2312,18 +2312,18 @@ declare namespace ts {
         ArrayLiteral = 65536,
         ClassOrInterface = 3,
     }
-    interface ObjectType extends Type {
+    export interface ObjectType extends Type {
         objectFlags: ObjectFlags;
     }
     /** Class and interface types (ObjectFlags.Class and ObjectFlags.Interface). */
-    interface InterfaceType extends ObjectType {
+    export interface InterfaceType extends ObjectType {
         typeParameters: TypeParameter[] | undefined;
         outerTypeParameters: TypeParameter[] | undefined;
         localTypeParameters: TypeParameter[] | undefined;
         thisType: TypeParameter | undefined;
     }
-    type BaseType = ObjectType | IntersectionType;
-    interface InterfaceTypeWithDeclaredMembers extends InterfaceType {
+    export type BaseType = ObjectType | IntersectionType;
+    export interface InterfaceTypeWithDeclaredMembers extends InterfaceType {
         declaredProperties: Symbol[];
         declaredCallSignatures: Signature[];
         declaredConstructSignatures: Signature[];
@@ -2340,49 +2340,49 @@ declare namespace ts {
      * if the class or interface has no type parameters and the reference isn't specifying an
      * explicit "this" argument.
      */
-    interface TypeReference extends ObjectType {
+    export interface TypeReference extends ObjectType {
         target: GenericType;
         typeArguments?: ReadonlyArray<Type>;
     }
-    interface GenericType extends InterfaceType, TypeReference {
+    export interface GenericType extends InterfaceType, TypeReference {
     }
-    interface TupleType extends GenericType {
+    export interface TupleType extends GenericType {
         minLength: number;
         hasRestElement: boolean;
         readonly: boolean;
         associatedNames?: __String[];
     }
-    interface TupleTypeReference extends TypeReference {
+    export interface TupleTypeReference extends TypeReference {
         target: TupleType;
     }
-    interface UnionOrIntersectionType extends Type {
+    export interface UnionOrIntersectionType extends Type {
         types: Type[];
     }
-    interface UnionType extends UnionOrIntersectionType {
+    export interface UnionType extends UnionOrIntersectionType {
     }
-    interface IntersectionType extends UnionOrIntersectionType {
+    export interface IntersectionType extends UnionOrIntersectionType {
     }
-    type StructuredType = ObjectType | UnionType | IntersectionType;
-    interface EvolvingArrayType extends ObjectType {
+    export type StructuredType = ObjectType | UnionType | IntersectionType;
+    export interface EvolvingArrayType extends ObjectType {
         elementType: Type;
         finalArrayType?: Type;
     }
-    interface InstantiableType extends Type {
+    export interface InstantiableType extends Type {
     }
-    interface TypeParameter extends InstantiableType {
+    export interface TypeParameter extends InstantiableType {
     }
-    interface IndexedAccessType extends InstantiableType {
+    export interface IndexedAccessType extends InstantiableType {
         objectType: Type;
         indexType: Type;
         constraint?: Type;
         simplifiedForReading?: Type;
         simplifiedForWriting?: Type;
     }
-    type TypeVariable = TypeParameter | IndexedAccessType;
-    interface IndexType extends InstantiableType {
+    export type TypeVariable = TypeParameter | IndexedAccessType;
+    export interface IndexType extends InstantiableType {
         type: InstantiableType | UnionOrIntersectionType;
     }
-    interface ConditionalRoot {
+    export interface ConditionalRoot {
         node: ConditionalTypeNode;
         checkType: Type;
         extendsType: Type;
@@ -2395,36 +2395,36 @@ declare namespace ts {
         aliasSymbol?: Symbol;
         aliasTypeArguments?: Type[];
     }
-    interface ConditionalType extends InstantiableType {
+    export interface ConditionalType extends InstantiableType {
         root: ConditionalRoot;
         checkType: Type;
         extendsType: Type;
         resolvedTrueType: Type;
         resolvedFalseType: Type;
     }
-    interface SubstitutionType extends InstantiableType {
+    export interface SubstitutionType extends InstantiableType {
         typeVariable: TypeVariable;
         substitute: Type;
     }
-    enum SignatureKind {
+    export enum SignatureKind {
         Call = 0,
         Construct = 1
     }
-    interface Signature {
+    export interface Signature {
         declaration?: SignatureDeclaration | JSDocSignature;
         typeParameters?: ReadonlyArray<TypeParameter>;
         parameters: ReadonlyArray<Symbol>;
     }
-    enum IndexKind {
+    export enum IndexKind {
         String = 0,
         Number = 1
     }
-    interface IndexInfo {
+    export interface IndexInfo {
         type: Type;
         isReadonly: boolean;
         declaration?: IndexSignatureDeclaration;
     }
-    enum InferencePriority {
+    export enum InferencePriority {
         NakedTypeVariable = 1,
         HomomorphicMappedType = 2,
         PartialHomomorphicMappedType = 4,
@@ -2436,13 +2436,13 @@ declare namespace ts {
         PriorityImpliesCombination = 56
     }
     /** @deprecated Use FileExtensionInfo instead. */
-    type JsFileExtensionInfo = FileExtensionInfo;
-    interface FileExtensionInfo {
+    export type JsFileExtensionInfo = FileExtensionInfo;
+    export interface FileExtensionInfo {
         extension: string;
         isMixedContent: boolean;
         scriptKind?: ScriptKind;
     }
-    interface DiagnosticMessage {
+    export interface DiagnosticMessage {
         key: string;
         category: DiagnosticCategory;
         code: number;
@@ -2455,19 +2455,19 @@ declare namespace ts {
      * While it seems that DiagnosticMessageChain is structurally similar to DiagnosticMessage,
      * the difference is that messages are all preformatted in DMC.
      */
-    interface DiagnosticMessageChain {
+    export interface DiagnosticMessageChain {
         messageText: string;
         category: DiagnosticCategory;
         code: number;
         next?: DiagnosticMessageChain[];
     }
-    interface Diagnostic extends DiagnosticRelatedInformation {
+    export interface Diagnostic extends DiagnosticRelatedInformation {
         /** May store more in future. For now, this will simply be `true` to indicate when a diagnostic is an unused-identifier diagnostic. */
         reportsUnnecessary?: {};
         source?: string;
         relatedInformation?: DiagnosticRelatedInformation[];
     }
-    interface DiagnosticRelatedInformation {
+    export interface DiagnosticRelatedInformation {
         category: DiagnosticCategory;
         code: number;
         file: SourceFile | undefined;
@@ -2475,25 +2475,25 @@ declare namespace ts {
         length: number | undefined;
         messageText: string | DiagnosticMessageChain;
     }
-    interface DiagnosticWithLocation extends Diagnostic {
+    export interface DiagnosticWithLocation extends Diagnostic {
         file: SourceFile;
         start: number;
         length: number;
     }
-    enum DiagnosticCategory {
+    export enum DiagnosticCategory {
         Warning = 0,
         Error = 1,
         Suggestion = 2,
         Message = 3
     }
-    enum ModuleResolutionKind {
+    export enum ModuleResolutionKind {
         Classic = 1,
         NodeJs = 2
     }
-    interface PluginImport {
+    export interface PluginImport {
         name: string;
     }
-    interface ProjectReference {
+    export interface ProjectReference {
         /** A normalized path on disk */
         path: string;
         /** The path as the user originally wrote it */
@@ -2503,8 +2503,8 @@ declare namespace ts {
         /** True if it is intended that this reference form a circularity */
         circular?: boolean;
     }
-    type CompilerOptionsValue = string | number | boolean | (string | number)[] | string[] | MapLike<string[]> | PluginImport[] | ProjectReference[] | null | undefined;
-    interface CompilerOptions {
+    export type CompilerOptionsValue = string | number | boolean | (string | number)[] | string[] | MapLike<string[]> | PluginImport[] | ProjectReference[] | null | undefined;
+    export interface CompilerOptions {
         allowJs?: boolean;
         allowSyntheticDefaultImports?: boolean;
         allowUmdGlobalAccess?: boolean;
@@ -2587,14 +2587,14 @@ declare namespace ts {
         esModuleInterop?: boolean;
         [option: string]: CompilerOptionsValue | TsConfigSourceFile | undefined;
     }
-    interface TypeAcquisition {
+    export interface TypeAcquisition {
         enableAutoDiscovery?: boolean;
         enable?: boolean;
         include?: string[];
         exclude?: string[];
         [option: string]: string[] | boolean | undefined;
     }
-    enum ModuleKind {
+    export enum ModuleKind {
         None = 0,
         CommonJS = 1,
         AMD = 2,
@@ -2603,22 +2603,22 @@ declare namespace ts {
         ES2015 = 5,
         ESNext = 99
     }
-    enum JsxEmit {
+    export enum JsxEmit {
         None = 0,
         Preserve = 1,
         React = 2,
         ReactNative = 3
     }
-    enum NewLineKind {
+    export enum NewLineKind {
         CarriageReturnLineFeed = 0,
         LineFeed = 1
     }
-    interface LineAndCharacter {
+    export interface LineAndCharacter {
         /** 0-based. */
         line: number;
         character: number;
     }
-    enum ScriptKind {
+    export enum ScriptKind {
         Unknown = 0,
         JS = 1,
         JSX = 2,
@@ -2632,7 +2632,7 @@ declare namespace ts {
          */
         Deferred = 7
     }
-    enum ScriptTarget {
+    export enum ScriptTarget {
         ES3 = 0,
         ES5 = 1,
         ES2015 = 2,
@@ -2645,12 +2645,12 @@ declare namespace ts {
         JSON = 100,
         Latest = 99
     }
-    enum LanguageVariant {
+    export enum LanguageVariant {
         Standard = 0,
         JSX = 1
     }
     /** Either a parsed command line or a parsed tsconfig.json */
-    interface ParsedCommandLine {
+    export interface ParsedCommandLine {
         options: CompilerOptions;
         typeAcquisition?: TypeAcquisition;
         fileNames: string[];
@@ -2660,15 +2660,15 @@ declare namespace ts {
         wildcardDirectories?: MapLike<WatchDirectoryFlags>;
         compileOnSave?: boolean;
     }
-    enum WatchDirectoryFlags {
+    export enum WatchDirectoryFlags {
         None = 0,
         Recursive = 1
     }
-    interface ExpandResult {
+    export interface ExpandResult {
         fileNames: string[];
         wildcardDirectories: MapLike<WatchDirectoryFlags>;
     }
-    interface CreateProgramOptions {
+    export interface CreateProgramOptions {
         rootNames: ReadonlyArray<string>;
         options: CompilerOptions;
         projectReferences?: ReadonlyArray<ProjectReference>;
@@ -2676,7 +2676,7 @@ declare namespace ts {
         oldProgram?: Program;
         configFileParsingDiagnostics?: ReadonlyArray<Diagnostic>;
     }
-    interface ModuleResolutionHost {
+    export interface ModuleResolutionHost {
         fileExists(fileName: string): boolean;
         readFile(fileName: string): string | undefined;
         trace?(s: string): void;
@@ -2696,7 +2696,7 @@ declare namespace ts {
      *
      * Prefer to return a `ResolvedModuleFull` so that the file type does not have to be inferred.
      */
-    interface ResolvedModule {
+    export interface ResolvedModule {
         /** Path of the file the module was resolved to. */
         resolvedFileName: string;
         /** True if `resolvedFileName` comes from `node_modules`. */
@@ -2707,7 +2707,7 @@ declare namespace ts {
      * Prefer this over `ResolvedModule`.
      * If changing this, remember to change `moduleResolutionIsEqualTo`.
      */
-    interface ResolvedModuleFull extends ResolvedModule {
+    export interface ResolvedModuleFull extends ResolvedModule {
         /**
          * Extension of resolvedFileName. This must match what's at the end of resolvedFileName.
          * This is optional for backwards-compatibility, but will be added if not provided.
@@ -2719,7 +2719,7 @@ declare namespace ts {
      * Unique identifier with a package name and version.
      * If changing this, remember to change `packageIdIsEqual`.
      */
-    interface PackageId {
+    export interface PackageId {
         /**
          * Name of the package.
          * Should not include `@types`.
@@ -2734,7 +2734,7 @@ declare namespace ts {
         /** Version of the package, e.g. "1.2.3" */
         version: string;
     }
-    enum Extension {
+    export enum Extension {
         Ts = ".ts",
         Tsx = ".tsx",
         Dts = ".d.ts",
@@ -2743,21 +2743,21 @@ declare namespace ts {
         Json = ".json",
         TsBuildInfo = ".tsbuildinfo"
     }
-    interface ResolvedModuleWithFailedLookupLocations {
+    export interface ResolvedModuleWithFailedLookupLocations {
         readonly resolvedModule: ResolvedModuleFull | undefined;
     }
-    interface ResolvedTypeReferenceDirective {
+    export interface ResolvedTypeReferenceDirective {
         primary: boolean;
         resolvedFileName: string | undefined;
         packageId?: PackageId;
         /** True if `resolvedFileName` comes from `node_modules`. */
         isExternalLibraryImport?: boolean;
     }
-    interface ResolvedTypeReferenceDirectiveWithFailedLookupLocations {
+    export interface ResolvedTypeReferenceDirectiveWithFailedLookupLocations {
         readonly resolvedTypeReferenceDirective: ResolvedTypeReferenceDirective | undefined;
         readonly failedLookupLocations: ReadonlyArray<string>;
     }
-    interface CompilerHost extends ModuleResolutionHost {
+    export interface CompilerHost extends ModuleResolutionHost {
         getSourceFile(fileName: string, languageVersion: ScriptTarget, onError?: (message: string) => void, shouldCreateNewSourceFile?: boolean): SourceFile | undefined;
         getSourceFileByPath?(fileName: string, path: Path, languageVersion: ScriptTarget, onError?: (message: string) => void, shouldCreateNewSourceFile?: boolean): SourceFile | undefined;
         getCancellationToken?(): CancellationToken;
@@ -2778,15 +2778,15 @@ declare namespace ts {
         createHash?(data: string): string;
         getParsedCommandLine?(fileName: string): ParsedCommandLine | undefined;
     }
-    interface SourceMapRange extends TextRange {
+    export interface SourceMapRange extends TextRange {
         source?: SourceMapSource;
     }
-    interface SourceMapSource {
+    export interface SourceMapSource {
         fileName: string;
         text: string;
         skipTrivia?: (pos: number) => number;
     }
-    enum EmitFlags {
+    export enum EmitFlags {
         None = 0,
         SingleLine = 1,
         AdviseOnEmitNode = 2,
@@ -2817,18 +2817,18 @@ declare namespace ts {
         Iterator = 8388608,
         NoAsciiEscaping = 16777216,
     }
-    interface EmitHelper {
+    export interface EmitHelper {
         readonly name: string;
         readonly scoped: boolean;
         readonly text: string | ((node: EmitHelperUniqueNameCallback) => string);
         readonly priority?: number;
     }
-    interface UnscopedEmitHelper extends EmitHelper {
+    export interface UnscopedEmitHelper extends EmitHelper {
         readonly scoped: false;
         readonly text: string;
     }
-    type EmitHelperUniqueNameCallback = (name: string) => string;
-    enum EmitHint {
+    export type EmitHelperUniqueNameCallback = (name: string) => string;
+    export enum EmitHint {
         SourceFile = 0,
         Expression = 1,
         IdentifierName = 2,
@@ -2836,7 +2836,7 @@ declare namespace ts {
         Unspecified = 4,
         EmbeddedStatement = 5
     }
-    interface TransformationContext {
+    export interface TransformationContext {
         /** Gets the compiler options supplied to the transformer. */
         getCompilerOptions(): CompilerOptions;
         /** Starts a new lexical environment. */
@@ -2886,7 +2886,7 @@ declare namespace ts {
          */
         onEmitNode: (hint: EmitHint, node: Node, emitCallback: (hint: EmitHint, node: Node) => void) => void;
     }
-    interface TransformationResult<T extends Node> {
+    export interface TransformationResult<T extends Node> {
         /** Gets the transformed source files. */
         transformed: T[];
         /** Gets diagnostics for the transformation. */
@@ -2915,17 +2915,17 @@ declare namespace ts {
      * A function that is used to initialize and return a `Transformer` callback, which in turn
      * will be used to transform one or more nodes.
      */
-    type TransformerFactory<T extends Node> = (context: TransformationContext) => Transformer<T>;
+    export type TransformerFactory<T extends Node> = (context: TransformationContext) => Transformer<T>;
     /**
      * A function that transforms a node.
      */
-    type Transformer<T extends Node> = (node: T) => T;
+    export type Transformer<T extends Node> = (node: T) => T;
     /**
      * A function that accepts and possibly transforms a node.
      */
-    type Visitor = (node: Node) => VisitResult<Node>;
-    type VisitResult<T extends Node> = T | T[] | undefined;
-    interface Printer {
+    export type Visitor = (node: Node) => VisitResult<Node>;
+    export type VisitResult<T extends Node> = T | T[] | undefined;
+    export interface Printer {
         /**
          * Print a node and its subtree as-is, without any emit transformations.
          * @param hint A value indicating the purpose of a node. This is primarily used to
@@ -2953,7 +2953,7 @@ declare namespace ts {
          */
         printBundle(bundle: Bundle): string;
     }
-    interface PrintHandlers {
+    export interface PrintHandlers {
         /**
          * A hook used by the Printer when generating unique names to avoid collisions with
          * globally defined names that exist outside of the current source file.
@@ -2996,28 +2996,28 @@ declare namespace ts {
          */
         substituteNode?(hint: EmitHint, node: Node): Node;
     }
-    interface PrinterOptions {
+    export interface PrinterOptions {
         removeComments?: boolean;
         newLine?: NewLineKind;
         omitTrailingSemicolon?: boolean;
         noEmitHelpers?: boolean;
     }
-    interface GetEffectiveTypeRootsHost {
+    export interface GetEffectiveTypeRootsHost {
         directoryExists?(directoryName: string): boolean;
         getCurrentDirectory?(): string;
     }
-    interface TextSpan {
+    export interface TextSpan {
         start: number;
         length: number;
     }
-    interface TextChangeRange {
+    export interface TextChangeRange {
         span: TextSpan;
         newLength: number;
     }
-    interface SyntaxList extends Node {
+    export interface SyntaxList extends Node {
         _children: Node[];
     }
-    enum ListFormat {
+    export enum ListFormat {
         None = 0,
         SingleLine = 0,
         MultiLine = 1,
@@ -3084,7 +3084,7 @@ declare namespace ts {
         IndexSignatureParameters = 8848,
         JSDocComment = 33
     }
-    interface UserPreferences {
+    export interface UserPreferences {
         readonly disableSuggestions?: boolean;
         readonly quotePreference?: "auto" | "double" | "single";
         readonly includeCompletionsForModuleExports?: boolean;
@@ -3096,22 +3096,23 @@ declare namespace ts {
         readonly providePrefixAndSuffixTextForRename?: boolean;
     }
     /** Represents a bigint literal value without requiring bigint support */
-    interface PseudoBigInt {
+    export interface PseudoBigInt {
         negative: boolean;
         base10Value: string;
     }
+    export {};
 }
 declare function setTimeout(handler: (...args: any[]) => void, timeout: number): any;
 declare function clearTimeout(handle: any): void;
 declare namespace ts {
-    enum FileWatcherEventKind {
+    export enum FileWatcherEventKind {
         Created = 0,
         Changed = 1,
         Deleted = 2
     }
-    type FileWatcherCallback = (fileName: string, eventKind: FileWatcherEventKind) => void;
-    type DirectoryWatcherCallback = (fileName: string) => void;
-    interface System {
+    export type FileWatcherCallback = (fileName: string, eventKind: FileWatcherEventKind) => void;
+    export type DirectoryWatcherCallback = (fileName: string) => void;
+    export interface System {
         args: string[];
         newLine: string;
         useCaseSensitiveFileNames: boolean;
@@ -3152,11 +3153,12 @@ declare namespace ts {
         base64decode?(input: string): string;
         base64encode?(input: string): string;
     }
-    interface FileWatcher {
+    export interface FileWatcher {
         close(): void;
     }
-    function getNodeMajorVersion(): number | undefined;
-    let sys: System;
+    export function getNodeMajorVersion(): number | undefined;
+    export let sys: System;
+    export {};
 }
 declare namespace ts {
     type ErrorCallback = (message: DiagnosticMessage, length: number) => void;
@@ -3602,7 +3604,7 @@ declare namespace ts {
     function isStringLiteralLike(node: Node): node is StringLiteralLike;
 }
 declare namespace ts {
-    function createNode(kind: SyntaxKind, pos?: number, end?: number): Node;
+    export function createNode(kind: SyntaxKind, pos?: number, end?: number): Node;
     /**
      * Invokes a callback for each child of the given node. The 'cbNode' callback is invoked for all child nodes
      * stored in properties. If a 'cbNodes' callback is specified, it is invoked for embedded arrays; otherwise,
@@ -3616,25 +3618,26 @@ declare namespace ts {
      * @remarks `forEachChild` must visit the children of a node in the order
      * that they appear in the source code. The language service depends on this property to locate nodes by position.
      */
-    function forEachChild<T>(node: Node, cbNode: (node: Node) => T | undefined, cbNodes?: (nodes: NodeArray<Node>) => T | undefined): T | undefined;
-    function createSourceFile(fileName: string, sourceText: string, languageVersion: ScriptTarget, setParentNodes?: boolean, scriptKind?: ScriptKind): SourceFile;
-    function parseIsolatedEntityName(text: string, languageVersion: ScriptTarget): EntityName | undefined;
+    export function forEachChild<T>(node: Node, cbNode: (node: Node) => T | undefined, cbNodes?: (nodes: NodeArray<Node>) => T | undefined): T | undefined;
+    export function createSourceFile(fileName: string, sourceText: string, languageVersion: ScriptTarget, setParentNodes?: boolean, scriptKind?: ScriptKind): SourceFile;
+    export function parseIsolatedEntityName(text: string, languageVersion: ScriptTarget): EntityName | undefined;
     /**
      * Parse json text into SyntaxTree and return node and parse errors if any
      * @param fileName
      * @param sourceText
      */
-    function parseJsonText(fileName: string, sourceText: string): JsonSourceFile;
-    function isExternalModule(file: SourceFile): boolean;
-    function updateSourceFile(sourceFile: SourceFile, newText: string, textChangeRange: TextChangeRange, aggressiveChecks?: boolean): SourceFile;
+    export function parseJsonText(fileName: string, sourceText: string): JsonSourceFile;
+    export function isExternalModule(file: SourceFile): boolean;
+    export function updateSourceFile(sourceFile: SourceFile, newText: string, textChangeRange: TextChangeRange, aggressiveChecks?: boolean): SourceFile;
+    export {};
 }
 declare namespace ts {
-    function parseCommandLine(commandLine: ReadonlyArray<string>, readFile?: (path: string) => string | undefined): ParsedCommandLine;
-    type DiagnosticReporter = (diagnostic: Diagnostic) => void;
+    export function parseCommandLine(commandLine: ReadonlyArray<string>, readFile?: (path: string) => string | undefined): ParsedCommandLine;
+    export type DiagnosticReporter = (diagnostic: Diagnostic) => void;
     /**
      * Reports config file diagnostics
      */
-    interface ConfigFileDiagnosticsReporter {
+    export interface ConfigFileDiagnosticsReporter {
         /**
          * Reports unrecoverable error when parsing config file
          */
@@ -3643,18 +3646,18 @@ declare namespace ts {
     /**
      * Interface extending ParseConfigHost to support ParseConfigFile that reads config file and reports errors
      */
-    interface ParseConfigFileHost extends ParseConfigHost, ConfigFileDiagnosticsReporter {
+    export interface ParseConfigFileHost extends ParseConfigHost, ConfigFileDiagnosticsReporter {
         getCurrentDirectory(): string;
     }
     /**
      * Reads the config file, reports errors if any and exits if the config file cannot be found
      */
-    function getParsedCommandLineOfConfigFile(configFileName: string, optionsToExtend: CompilerOptions, host: ParseConfigFileHost, extendedConfigCache?: Map<ExtendedConfigCacheEntry>): ParsedCommandLine | undefined;
+    export function getParsedCommandLineOfConfigFile(configFileName: string, optionsToExtend: CompilerOptions, host: ParseConfigFileHost, extendedConfigCache?: Map<ExtendedConfigCacheEntry>): ParsedCommandLine | undefined;
     /**
      * Read tsconfig.json file
      * @param fileName The path to the config file
      */
-    function readConfigFile(fileName: string, readFile: (path: string) => string | undefined): {
+    export function readConfigFile(fileName: string, readFile: (path: string) => string | undefined): {
         config?: any;
         error?: Diagnostic;
     };
@@ -3663,7 +3666,7 @@ declare namespace ts {
      * @param fileName The path to the config file
      * @param jsonText The text of the config file
      */
-    function parseConfigFileTextToJson(fileName: string, jsonText: string): {
+    export function parseConfigFileTextToJson(fileName: string, jsonText: string): {
         config?: any;
         error?: Diagnostic;
     };
@@ -3671,11 +3674,11 @@ declare namespace ts {
      * Read tsconfig.json file
      * @param fileName The path to the config file
      */
-    function readJsonConfigFile(fileName: string, readFile: (path: string) => string | undefined): TsConfigSourceFile;
+    export function readJsonConfigFile(fileName: string, readFile: (path: string) => string | undefined): TsConfigSourceFile;
     /**
      * Convert the json syntax tree into the json value
      */
-    function convertToObject(sourceFile: JsonSourceFile, errors: Push<Diagnostic>): any;
+    export function convertToObject(sourceFile: JsonSourceFile, errors: Push<Diagnostic>): any;
     /**
      * Parse the contents of a config file (tsconfig.json).
      * @param json The contents of the config file to parse
@@ -3683,7 +3686,7 @@ declare namespace ts {
      * @param basePath A root directory to resolve relative path entries in the config
      *    file to. e.g. outDir
      */
-    function parseJsonConfigFileContent(json: any, host: ParseConfigHost, basePath: string, existingOptions?: CompilerOptions, configFileName?: string, resolutionStack?: Path[], extraFileExtensions?: ReadonlyArray<FileExtensionInfo>, extendedConfigCache?: Map<ExtendedConfigCacheEntry>): ParsedCommandLine;
+    export function parseJsonConfigFileContent(json: any, host: ParseConfigHost, basePath: string, existingOptions?: CompilerOptions, configFileName?: string, resolutionStack?: Path[], extraFileExtensions?: ReadonlyArray<FileExtensionInfo>, extendedConfigCache?: Map<ExtendedConfigCacheEntry>): ParsedCommandLine;
     /**
      * Parse the contents of a config file (tsconfig.json).
      * @param jsonNode The contents of the config file to parse
@@ -3691,8 +3694,8 @@ declare namespace ts {
      * @param basePath A root directory to resolve relative path entries in the config
      *    file to. e.g. outDir
      */
-    function parseJsonSourceFileConfigFileContent(sourceFile: TsConfigSourceFile, host: ParseConfigHost, basePath: string, existingOptions?: CompilerOptions, configFileName?: string, resolutionStack?: Path[], extraFileExtensions?: ReadonlyArray<FileExtensionInfo>, extendedConfigCache?: Map<ExtendedConfigCacheEntry>): ParsedCommandLine;
-    interface ParsedTsconfig {
+    export function parseJsonSourceFileConfigFileContent(sourceFile: TsConfigSourceFile, host: ParseConfigHost, basePath: string, existingOptions?: CompilerOptions, configFileName?: string, resolutionStack?: Path[], extraFileExtensions?: ReadonlyArray<FileExtensionInfo>, extendedConfigCache?: Map<ExtendedConfigCacheEntry>): ParsedCommandLine;
+    export interface ParsedTsconfig {
         raw: any;
         options?: CompilerOptions;
         typeAcquisition?: TypeAcquisition;
@@ -3701,18 +3704,19 @@ declare namespace ts {
          */
         extendedConfigPath?: string;
     }
-    interface ExtendedConfigCacheEntry {
+    export interface ExtendedConfigCacheEntry {
         extendedResult: TsConfigSourceFile;
         extendedConfig: ParsedTsconfig | undefined;
     }
-    function convertCompilerOptionsFromJson(jsonOptions: any, basePath: string, configFileName?: string): {
+    export function convertCompilerOptionsFromJson(jsonOptions: any, basePath: string, configFileName?: string): {
         options: CompilerOptions;
         errors: Diagnostic[];
     };
-    function convertTypeAcquisitionFromJson(jsonOptions: any, basePath: string, configFileName?: string): {
+    export function convertTypeAcquisitionFromJson(jsonOptions: any, basePath: string, configFileName?: string): {
         options: TypeAcquisition;
         errors: Diagnostic[];
     };
+    export {};
 }
 declare namespace ts {
     function getEffectiveTypeRoots(options: CompilerOptions, host: GetEffectiveTypeRootsHost): string[] | undefined;
@@ -4267,20 +4271,20 @@ declare namespace ts {
     function createPrinter(printerOptions?: PrinterOptions, handlers?: PrintHandlers): Printer;
 }
 declare namespace ts {
-    function findConfigFile(searchPath: string, fileExists: (fileName: string) => boolean, configName?: string): string | undefined;
-    function resolveTripleslashReference(moduleName: string, containingFile: string): string;
-    function createCompilerHost(options: CompilerOptions, setParentNodes?: boolean): CompilerHost;
-    function getPreEmitDiagnostics(program: Program, sourceFile?: SourceFile, cancellationToken?: CancellationToken): ReadonlyArray<Diagnostic>;
-    interface FormatDiagnosticsHost {
+    export function findConfigFile(searchPath: string, fileExists: (fileName: string) => boolean, configName?: string): string | undefined;
+    export function resolveTripleslashReference(moduleName: string, containingFile: string): string;
+    export function createCompilerHost(options: CompilerOptions, setParentNodes?: boolean): CompilerHost;
+    export function getPreEmitDiagnostics(program: Program, sourceFile?: SourceFile, cancellationToken?: CancellationToken): ReadonlyArray<Diagnostic>;
+    export interface FormatDiagnosticsHost {
         getCurrentDirectory(): string;
         getCanonicalFileName(fileName: string): string;
         getNewLine(): string;
     }
-    function formatDiagnostics(diagnostics: ReadonlyArray<Diagnostic>, host: FormatDiagnosticsHost): string;
-    function formatDiagnostic(diagnostic: Diagnostic, host: FormatDiagnosticsHost): string;
-    function formatDiagnosticsWithColorAndContext(diagnostics: ReadonlyArray<Diagnostic>, host: FormatDiagnosticsHost): string;
-    function flattenDiagnosticMessageText(diag: string | DiagnosticMessageChain | undefined, newLine: string, indent?: number): string;
-    function getConfigFileParsingDiagnostics(configFileParseResult: ParsedCommandLine): ReadonlyArray<Diagnostic>;
+    export function formatDiagnostics(diagnostics: ReadonlyArray<Diagnostic>, host: FormatDiagnosticsHost): string;
+    export function formatDiagnostic(diagnostic: Diagnostic, host: FormatDiagnosticsHost): string;
+    export function formatDiagnosticsWithColorAndContext(diagnostics: ReadonlyArray<Diagnostic>, host: FormatDiagnosticsHost): string;
+    export function flattenDiagnosticMessageText(diag: string | DiagnosticMessageChain | undefined, newLine: string, indent?: number): string;
+    export function getConfigFileParsingDiagnostics(configFileParseResult: ParsedCommandLine): ReadonlyArray<Diagnostic>;
     /**
      * Create a new 'Program' instance. A Program is an immutable collection of 'SourceFile's and a 'CompilerOptions'
      * that represent a compilation unit.
@@ -4291,7 +4295,7 @@ declare namespace ts {
      * @param createProgramOptions - The options for creating a program.
      * @returns A 'Program' object.
      */
-    function createProgram(createProgramOptions: CreateProgramOptions): Program;
+    export function createProgram(createProgramOptions: CreateProgramOptions): Program;
     /**
      * Create a new 'Program' instance. A Program is an immutable collection of 'SourceFile's and a 'CompilerOptions'
      * that represent a compilation unit.
@@ -4306,16 +4310,17 @@ declare namespace ts {
      * @param configFileParsingDiagnostics - error during config file parsing
      * @returns A 'Program' object.
      */
-    function createProgram(rootNames: ReadonlyArray<string>, options: CompilerOptions, host?: CompilerHost, oldProgram?: Program, configFileParsingDiagnostics?: ReadonlyArray<Diagnostic>): Program;
-    /** @deprecated */ interface ResolveProjectReferencePathHost {
+    export function createProgram(rootNames: ReadonlyArray<string>, options: CompilerOptions, host?: CompilerHost, oldProgram?: Program, configFileParsingDiagnostics?: ReadonlyArray<Diagnostic>): Program;
+    /** @deprecated */ export interface ResolveProjectReferencePathHost {
         fileExists(fileName: string): boolean;
     }
     /**
      * Returns the target config filename of a project reference.
      * Note: The file might not exist.
      */
-    function resolveProjectReferencePath(ref: ProjectReference): ResolvedConfigFileName;
-    /** @deprecated */ function resolveProjectReferencePath(host: ResolveProjectReferencePathHost, ref: ProjectReference): ResolvedConfigFileName;
+    export function resolveProjectReferencePath(ref: ProjectReference): ResolvedConfigFileName;
+    /** @deprecated */ export function resolveProjectReferencePath(host: ResolveProjectReferencePathHost, ref: ProjectReference): ResolvedConfigFileName;
+    export {};
 }
 declare namespace ts {
     interface EmitOutput {
@@ -8594,35 +8599,35 @@ declare namespace ts.server {
     }
 }
 declare namespace ts.server {
-    const maxProgramSizeForNonTsFiles: number;
-    const ProjectsUpdatedInBackgroundEvent = "projectsUpdatedInBackground";
-    const ProjectLoadingStartEvent = "projectLoadingStart";
-    const ProjectLoadingFinishEvent = "projectLoadingFinish";
-    const LargeFileReferencedEvent = "largeFileReferenced";
-    const ConfigFileDiagEvent = "configFileDiag";
-    const ProjectLanguageServiceStateEvent = "projectLanguageServiceState";
-    const ProjectInfoTelemetryEvent = "projectInfo";
-    const OpenFileInfoTelemetryEvent = "openFileInfo";
-    interface ProjectsUpdatedInBackgroundEvent {
+    export const maxProgramSizeForNonTsFiles: number;
+    export const ProjectsUpdatedInBackgroundEvent = "projectsUpdatedInBackground";
+    export const ProjectLoadingStartEvent = "projectLoadingStart";
+    export const ProjectLoadingFinishEvent = "projectLoadingFinish";
+    export const LargeFileReferencedEvent = "largeFileReferenced";
+    export const ConfigFileDiagEvent = "configFileDiag";
+    export const ProjectLanguageServiceStateEvent = "projectLanguageServiceState";
+    export const ProjectInfoTelemetryEvent = "projectInfo";
+    export const OpenFileInfoTelemetryEvent = "openFileInfo";
+    export interface ProjectsUpdatedInBackgroundEvent {
         eventName: typeof ProjectsUpdatedInBackgroundEvent;
         data: {
             openFiles: string[];
         };
     }
-    interface ProjectLoadingStartEvent {
+    export interface ProjectLoadingStartEvent {
         eventName: typeof ProjectLoadingStartEvent;
         data: {
             project: Project;
             reason: string;
         };
     }
-    interface ProjectLoadingFinishEvent {
+    export interface ProjectLoadingFinishEvent {
         eventName: typeof ProjectLoadingFinishEvent;
         data: {
             project: Project;
         };
     }
-    interface LargeFileReferencedEvent {
+    export interface LargeFileReferencedEvent {
         eventName: typeof LargeFileReferencedEvent;
         data: {
             file: string;
@@ -8630,7 +8635,7 @@ declare namespace ts.server {
             maxFileSize: number;
         };
     }
-    interface ConfigFileDiagEvent {
+    export interface ConfigFileDiagEvent {
         eventName: typeof ConfigFileDiagEvent;
         data: {
             triggerFile: string;
@@ -8638,7 +8643,7 @@ declare namespace ts.server {
             diagnostics: ReadonlyArray<Diagnostic>;
         };
     }
-    interface ProjectLanguageServiceStateEvent {
+    export interface ProjectLanguageServiceStateEvent {
         eventName: typeof ProjectLanguageServiceStateEvent;
         data: {
             project: Project;
@@ -8646,11 +8651,11 @@ declare namespace ts.server {
         };
     }
     /** This will be converted to the payload of a protocol.TelemetryEvent in session.defaultEventHandler. */
-    interface ProjectInfoTelemetryEvent {
+    export interface ProjectInfoTelemetryEvent {
         readonly eventName: typeof ProjectInfoTelemetryEvent;
         readonly data: ProjectInfoTelemetryEventData;
     }
-    interface ProjectInfoTelemetryEventData {
+    export interface ProjectInfoTelemetryEventData {
         /** Cryptographically secure hash of project file location. */
         readonly projectId: string;
         /** Count of file extensions seen in the project. */
@@ -8677,19 +8682,19 @@ declare namespace ts.server {
      * Info about a file will only be sent once per session, even if the file changes in ways that might affect the info.
      * Currently this is only sent for '.js' files.
      */
-    interface OpenFileInfoTelemetryEvent {
+    export interface OpenFileInfoTelemetryEvent {
         readonly eventName: typeof OpenFileInfoTelemetryEvent;
         readonly data: OpenFileInfoTelemetryEventData;
     }
-    interface OpenFileInfoTelemetryEventData {
+    export interface OpenFileInfoTelemetryEventData {
         readonly info: OpenFileInfo;
     }
-    interface ProjectInfoTypeAcquisitionData {
+    export interface ProjectInfoTypeAcquisitionData {
         readonly enable: boolean | undefined;
         readonly include: boolean;
         readonly exclude: boolean;
     }
-    interface FileStats {
+    export interface FileStats {
         readonly js: number;
         readonly jsSize?: number;
         readonly jsx: number;
@@ -8703,39 +8708,39 @@ declare namespace ts.server {
         readonly deferred: number;
         readonly deferredSize?: number;
     }
-    interface OpenFileInfo {
+    export interface OpenFileInfo {
         readonly checkJs: boolean;
     }
-    type ProjectServiceEvent = LargeFileReferencedEvent | ProjectsUpdatedInBackgroundEvent | ProjectLoadingStartEvent | ProjectLoadingFinishEvent | ConfigFileDiagEvent | ProjectLanguageServiceStateEvent | ProjectInfoTelemetryEvent | OpenFileInfoTelemetryEvent;
-    type ProjectServiceEventHandler = (event: ProjectServiceEvent) => void;
-    interface SafeList {
+    export type ProjectServiceEvent = LargeFileReferencedEvent | ProjectsUpdatedInBackgroundEvent | ProjectLoadingStartEvent | ProjectLoadingFinishEvent | ConfigFileDiagEvent | ProjectLanguageServiceStateEvent | ProjectInfoTelemetryEvent | OpenFileInfoTelemetryEvent;
+    export type ProjectServiceEventHandler = (event: ProjectServiceEvent) => void;
+    export interface SafeList {
         [name: string]: {
             match: RegExp;
             exclude?: (string | number)[][];
             types?: string[];
         };
     }
-    interface TypesMapFile {
+    export interface TypesMapFile {
         typesMap: SafeList;
         simpleMap: {
             [libName: string]: string;
         };
     }
-    function convertFormatOptions(protocolOptions: protocol.FormatCodeSettings): FormatCodeSettings;
-    function convertCompilerOptions(protocolOptions: protocol.ExternalProjectCompilerOptions): CompilerOptions & protocol.CompileOnSaveMixin;
-    function tryConvertScriptKindName(scriptKindName: protocol.ScriptKindName | ScriptKind): ScriptKind;
-    function convertScriptKindName(scriptKindName: protocol.ScriptKindName): ScriptKind.Unknown | ScriptKind.JS | ScriptKind.JSX | ScriptKind.TS | ScriptKind.TSX;
-    interface HostConfiguration {
+    export function convertFormatOptions(protocolOptions: protocol.FormatCodeSettings): FormatCodeSettings;
+    export function convertCompilerOptions(protocolOptions: protocol.ExternalProjectCompilerOptions): CompilerOptions & protocol.CompileOnSaveMixin;
+    export function tryConvertScriptKindName(scriptKindName: protocol.ScriptKindName | ScriptKind): ScriptKind;
+    export function convertScriptKindName(scriptKindName: protocol.ScriptKindName): ScriptKind.Unknown | ScriptKind.JS | ScriptKind.JSX | ScriptKind.TS | ScriptKind.TSX;
+    export interface HostConfiguration {
         formatCodeOptions: FormatCodeSettings;
         preferences: protocol.UserPreferences;
         hostInfo: string;
         extraFileExtensions?: FileExtensionInfo[];
     }
-    interface OpenConfiguredProjectResult {
+    export interface OpenConfiguredProjectResult {
         configFileName?: NormalizedPath;
         configFileErrors?: ReadonlyArray<Diagnostic>;
     }
-    interface ProjectServiceOptions {
+    export interface ProjectServiceOptions {
         host: ServerHost;
         logger: Logger;
         cancellationToken: HostCancellationToken;
@@ -8751,7 +8756,7 @@ declare namespace ts.server {
         typesMapLocation?: string;
         syntaxOnly?: boolean;
     }
-    class ProjectService {
+    export class ProjectService {
         private readonly scriptInfoInNodeModulesWatchers;
         /**
          * Contains all the deleted script info's version information so that
@@ -9004,6 +9009,7 @@ declare namespace ts.server {
         hasDeferredExtension(): boolean;
         configurePlugin(args: protocol.ConfigurePluginRequestArguments): void;
     }
+    export {};
 }
 declare namespace ts.server {
     interface ServerCancellationToken extends HostCancellationToken {
diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts
index ebd2d1471f7..1bb693c0845 100644
--- a/tests/baselines/reference/api/typescript.d.ts
+++ b/tests/baselines/reference/api/typescript.d.ts
@@ -65,17 +65,17 @@ declare namespace ts {
     }
 }
 declare namespace ts {
-    type Path = string & {
+    export type Path = string & {
         __pathBrand: any;
     };
-    interface TextRange {
+    export interface TextRange {
         pos: number;
         end: number;
     }
-    type JSDocSyntaxKind = SyntaxKind.EndOfFileToken | SyntaxKind.WhitespaceTrivia | SyntaxKind.AtToken | SyntaxKind.NewLineTrivia | SyntaxKind.AsteriskToken | SyntaxKind.OpenBraceToken | SyntaxKind.CloseBraceToken | SyntaxKind.LessThanToken | SyntaxKind.GreaterThanToken | SyntaxKind.OpenBracketToken | SyntaxKind.CloseBracketToken | SyntaxKind.EqualsToken | SyntaxKind.CommaToken | SyntaxKind.DotToken | SyntaxKind.Identifier | SyntaxKind.BacktickToken | SyntaxKind.Unknown | KeywordSyntaxKind;
-    type KeywordSyntaxKind = SyntaxKind.AbstractKeyword | SyntaxKind.AnyKeyword | SyntaxKind.AsKeyword | SyntaxKind.BigIntKeyword | SyntaxKind.BooleanKeyword | SyntaxKind.BreakKeyword | SyntaxKind.CaseKeyword | SyntaxKind.CatchKeyword | SyntaxKind.ClassKeyword | SyntaxKind.ContinueKeyword | SyntaxKind.ConstKeyword | SyntaxKind.ConstructorKeyword | SyntaxKind.DebuggerKeyword | SyntaxKind.DeclareKeyword | SyntaxKind.DefaultKeyword | SyntaxKind.DeleteKeyword | SyntaxKind.DoKeyword | SyntaxKind.ElseKeyword | SyntaxKind.EnumKeyword | SyntaxKind.ExportKeyword | SyntaxKind.ExtendsKeyword | SyntaxKind.FalseKeyword | SyntaxKind.FinallyKeyword | SyntaxKind.ForKeyword | SyntaxKind.FromKeyword | SyntaxKind.FunctionKeyword | SyntaxKind.GetKeyword | SyntaxKind.IfKeyword | SyntaxKind.ImplementsKeyword | SyntaxKind.ImportKeyword | SyntaxKind.InKeyword | SyntaxKind.InferKeyword | SyntaxKind.InstanceOfKeyword | SyntaxKind.InterfaceKeyword | SyntaxKind.IsKeyword | SyntaxKind.KeyOfKeyword | SyntaxKind.LetKeyword | SyntaxKind.ModuleKeyword | SyntaxKind.NamespaceKeyword | SyntaxKind.NeverKeyword | SyntaxKind.NewKeyword | SyntaxKind.NullKeyword | SyntaxKind.NumberKeyword | SyntaxKind.ObjectKeyword | SyntaxKind.PackageKeyword | SyntaxKind.PrivateKeyword | SyntaxKind.ProtectedKeyword | SyntaxKind.PublicKeyword | SyntaxKind.ReadonlyKeyword | SyntaxKind.RequireKeyword | SyntaxKind.GlobalKeyword | SyntaxKind.ReturnKeyword | SyntaxKind.SetKeyword | SyntaxKind.StaticKeyword | SyntaxKind.StringKeyword | SyntaxKind.SuperKeyword | SyntaxKind.SwitchKeyword | SyntaxKind.SymbolKeyword | SyntaxKind.ThisKeyword | SyntaxKind.ThrowKeyword | SyntaxKind.TrueKeyword | SyntaxKind.TryKeyword | SyntaxKind.TypeKeyword | SyntaxKind.TypeOfKeyword | SyntaxKind.UndefinedKeyword | SyntaxKind.UniqueKeyword | SyntaxKind.UnknownKeyword | SyntaxKind.VarKeyword | SyntaxKind.VoidKeyword | SyntaxKind.WhileKeyword | SyntaxKind.WithKeyword | SyntaxKind.YieldKeyword | SyntaxKind.AsyncKeyword | SyntaxKind.AwaitKeyword | SyntaxKind.OfKeyword;
-    type JsxTokenSyntaxKind = SyntaxKind.LessThanSlashToken | SyntaxKind.EndOfFileToken | SyntaxKind.ConflictMarkerTrivia | SyntaxKind.JsxText | SyntaxKind.JsxTextAllWhiteSpaces | SyntaxKind.OpenBraceToken | SyntaxKind.LessThanToken;
-    enum SyntaxKind {
+    export type JSDocSyntaxKind = SyntaxKind.EndOfFileToken | SyntaxKind.WhitespaceTrivia | SyntaxKind.AtToken | SyntaxKind.NewLineTrivia | SyntaxKind.AsteriskToken | SyntaxKind.OpenBraceToken | SyntaxKind.CloseBraceToken | SyntaxKind.LessThanToken | SyntaxKind.GreaterThanToken | SyntaxKind.OpenBracketToken | SyntaxKind.CloseBracketToken | SyntaxKind.EqualsToken | SyntaxKind.CommaToken | SyntaxKind.DotToken | SyntaxKind.Identifier | SyntaxKind.BacktickToken | SyntaxKind.Unknown | KeywordSyntaxKind;
+    export type KeywordSyntaxKind = SyntaxKind.AbstractKeyword | SyntaxKind.AnyKeyword | SyntaxKind.AsKeyword | SyntaxKind.BigIntKeyword | SyntaxKind.BooleanKeyword | SyntaxKind.BreakKeyword | SyntaxKind.CaseKeyword | SyntaxKind.CatchKeyword | SyntaxKind.ClassKeyword | SyntaxKind.ContinueKeyword | SyntaxKind.ConstKeyword | SyntaxKind.ConstructorKeyword | SyntaxKind.DebuggerKeyword | SyntaxKind.DeclareKeyword | SyntaxKind.DefaultKeyword | SyntaxKind.DeleteKeyword | SyntaxKind.DoKeyword | SyntaxKind.ElseKeyword | SyntaxKind.EnumKeyword | SyntaxKind.ExportKeyword | SyntaxKind.ExtendsKeyword | SyntaxKind.FalseKeyword | SyntaxKind.FinallyKeyword | SyntaxKind.ForKeyword | SyntaxKind.FromKeyword | SyntaxKind.FunctionKeyword | SyntaxKind.GetKeyword | SyntaxKind.IfKeyword | SyntaxKind.ImplementsKeyword | SyntaxKind.ImportKeyword | SyntaxKind.InKeyword | SyntaxKind.InferKeyword | SyntaxKind.InstanceOfKeyword | SyntaxKind.InterfaceKeyword | SyntaxKind.IsKeyword | SyntaxKind.KeyOfKeyword | SyntaxKind.LetKeyword | SyntaxKind.ModuleKeyword | SyntaxKind.NamespaceKeyword | SyntaxKind.NeverKeyword | SyntaxKind.NewKeyword | SyntaxKind.NullKeyword | SyntaxKind.NumberKeyword | SyntaxKind.ObjectKeyword | SyntaxKind.PackageKeyword | SyntaxKind.PrivateKeyword | SyntaxKind.ProtectedKeyword | SyntaxKind.PublicKeyword | SyntaxKind.ReadonlyKeyword | SyntaxKind.RequireKeyword | SyntaxKind.GlobalKeyword | SyntaxKind.ReturnKeyword | SyntaxKind.SetKeyword | SyntaxKind.StaticKeyword | SyntaxKind.StringKeyword | SyntaxKind.SuperKeyword | SyntaxKind.SwitchKeyword | SyntaxKind.SymbolKeyword | SyntaxKind.ThisKeyword | SyntaxKind.ThrowKeyword | SyntaxKind.TrueKeyword | SyntaxKind.TryKeyword | SyntaxKind.TypeKeyword | SyntaxKind.TypeOfKeyword | SyntaxKind.UndefinedKeyword | SyntaxKind.UniqueKeyword | SyntaxKind.UnknownKeyword | SyntaxKind.VarKeyword | SyntaxKind.VoidKeyword | SyntaxKind.WhileKeyword | SyntaxKind.WithKeyword | SyntaxKind.YieldKeyword | SyntaxKind.AsyncKeyword | SyntaxKind.AwaitKeyword | SyntaxKind.OfKeyword;
+    export type JsxTokenSyntaxKind = SyntaxKind.LessThanSlashToken | SyntaxKind.EndOfFileToken | SyntaxKind.ConflictMarkerTrivia | SyntaxKind.JsxText | SyntaxKind.JsxTextAllWhiteSpaces | SyntaxKind.OpenBraceToken | SyntaxKind.LessThanToken;
+    export enum SyntaxKind {
         Unknown = 0,
         EndOfFileToken = 1,
         SingleLineCommentTrivia = 2,
@@ -427,7 +427,7 @@ declare namespace ts {
         FirstJSDocTagNode = 300,
         LastJSDocTagNode = 312,
     }
-    enum NodeFlags {
+    export enum NodeFlags {
         None = 0,
         Let = 1,
         Const = 2,
@@ -456,7 +456,7 @@ declare namespace ts {
         ContextFlags = 12679168,
         TypeExcludesFlags = 20480,
     }
-    enum ModifierFlags {
+    export enum ModifierFlags {
         None = 0,
         Export = 1,
         Ambient = 2,
@@ -477,7 +477,7 @@ declare namespace ts {
         ExportDefault = 513,
         All = 3071
     }
-    enum JsxFlags {
+    export enum JsxFlags {
         None = 0,
         /** An element from a named property of the JSX.IntrinsicElements interface */
         IntrinsicNamedElement = 1,
@@ -485,40 +485,40 @@ declare namespace ts {
         IntrinsicIndexedElement = 2,
         IntrinsicElement = 3
     }
-    interface Node extends TextRange {
+    export interface Node extends TextRange {
         kind: SyntaxKind;
         flags: NodeFlags;
         decorators?: NodeArray<Decorator>;
         modifiers?: ModifiersArray;
         parent: Node;
     }
-    interface JSDocContainer {
+    export interface JSDocContainer {
     }
-    type HasJSDoc = ParameterDeclaration | CallSignatureDeclaration | ConstructSignatureDeclaration | MethodSignature | PropertySignature | ArrowFunction | ParenthesizedExpression | SpreadAssignment | ShorthandPropertyAssignment | PropertyAssignment | FunctionExpression | LabeledStatement | ExpressionStatement | VariableStatement | FunctionDeclaration | ConstructorDeclaration | MethodDeclaration | PropertyDeclaration | AccessorDeclaration | ClassLikeDeclaration | InterfaceDeclaration | TypeAliasDeclaration | EnumMember | EnumDeclaration | ModuleDeclaration | ImportEqualsDeclaration | IndexSignatureDeclaration | FunctionTypeNode | ConstructorTypeNode | JSDocFunctionType | ExportDeclaration | EndOfFileToken;
-    type HasType = SignatureDeclaration | VariableDeclaration | ParameterDeclaration | PropertySignature | PropertyDeclaration | TypePredicateNode | ParenthesizedTypeNode | TypeOperatorNode | MappedTypeNode | AssertionExpression | TypeAliasDeclaration | JSDocTypeExpression | JSDocNonNullableType | JSDocNullableType | JSDocOptionalType | JSDocVariadicType;
-    type HasInitializer = HasExpressionInitializer | ForStatement | ForInStatement | ForOfStatement | JsxAttribute;
-    type HasExpressionInitializer = VariableDeclaration | ParameterDeclaration | BindingElement | PropertySignature | PropertyDeclaration | PropertyAssignment | EnumMember;
-    interface NodeArray<T extends Node> extends ReadonlyArray<T>, TextRange {
+    export type HasJSDoc = ParameterDeclaration | CallSignatureDeclaration | ConstructSignatureDeclaration | MethodSignature | PropertySignature | ArrowFunction | ParenthesizedExpression | SpreadAssignment | ShorthandPropertyAssignment | PropertyAssignment | FunctionExpression | LabeledStatement | ExpressionStatement | VariableStatement | FunctionDeclaration | ConstructorDeclaration | MethodDeclaration | PropertyDeclaration | AccessorDeclaration | ClassLikeDeclaration | InterfaceDeclaration | TypeAliasDeclaration | EnumMember | EnumDeclaration | ModuleDeclaration | ImportEqualsDeclaration | IndexSignatureDeclaration | FunctionTypeNode | ConstructorTypeNode | JSDocFunctionType | ExportDeclaration | EndOfFileToken;
+    export type HasType = SignatureDeclaration | VariableDeclaration | ParameterDeclaration | PropertySignature | PropertyDeclaration | TypePredicateNode | ParenthesizedTypeNode | TypeOperatorNode | MappedTypeNode | AssertionExpression | TypeAliasDeclaration | JSDocTypeExpression | JSDocNonNullableType | JSDocNullableType | JSDocOptionalType | JSDocVariadicType;
+    export type HasInitializer = HasExpressionInitializer | ForStatement | ForInStatement | ForOfStatement | JsxAttribute;
+    export type HasExpressionInitializer = VariableDeclaration | ParameterDeclaration | BindingElement | PropertySignature | PropertyDeclaration | PropertyAssignment | EnumMember;
+    export interface NodeArray<T extends Node> extends ReadonlyArray<T>, TextRange {
         hasTrailingComma?: boolean;
     }
-    interface Token<TKind extends SyntaxKind> extends Node {
+    export interface Token<TKind extends SyntaxKind> extends Node {
         kind: TKind;
     }
-    type DotDotDotToken = Token<SyntaxKind.DotDotDotToken>;
-    type QuestionToken = Token<SyntaxKind.QuestionToken>;
-    type ExclamationToken = Token<SyntaxKind.ExclamationToken>;
-    type ColonToken = Token<SyntaxKind.ColonToken>;
-    type EqualsToken = Token<SyntaxKind.EqualsToken>;
-    type AsteriskToken = Token<SyntaxKind.AsteriskToken>;
-    type EqualsGreaterThanToken = Token<SyntaxKind.EqualsGreaterThanToken>;
-    type EndOfFileToken = Token<SyntaxKind.EndOfFileToken> & JSDocContainer;
-    type ReadonlyToken = Token<SyntaxKind.ReadonlyKeyword>;
-    type AwaitKeywordToken = Token<SyntaxKind.AwaitKeyword>;
-    type PlusToken = Token<SyntaxKind.PlusToken>;
-    type MinusToken = Token<SyntaxKind.MinusToken>;
-    type Modifier = Token<SyntaxKind.AbstractKeyword> | Token<SyntaxKind.AsyncKeyword> | Token<SyntaxKind.ConstKeyword> | Token<SyntaxKind.DeclareKeyword> | Token<SyntaxKind.DefaultKeyword> | Token<SyntaxKind.ExportKeyword> | Token<SyntaxKind.PublicKeyword> | Token<SyntaxKind.PrivateKeyword> | Token<SyntaxKind.ProtectedKeyword> | Token<SyntaxKind.ReadonlyKeyword> | Token<SyntaxKind.StaticKeyword>;
-    type ModifiersArray = NodeArray<Modifier>;
-    interface Identifier extends PrimaryExpression, Declaration {
+    export type DotDotDotToken = Token<SyntaxKind.DotDotDotToken>;
+    export type QuestionToken = Token<SyntaxKind.QuestionToken>;
+    export type ExclamationToken = Token<SyntaxKind.ExclamationToken>;
+    export type ColonToken = Token<SyntaxKind.ColonToken>;
+    export type EqualsToken = Token<SyntaxKind.EqualsToken>;
+    export type AsteriskToken = Token<SyntaxKind.AsteriskToken>;
+    export type EqualsGreaterThanToken = Token<SyntaxKind.EqualsGreaterThanToken>;
+    export type EndOfFileToken = Token<SyntaxKind.EndOfFileToken> & JSDocContainer;
+    export type ReadonlyToken = Token<SyntaxKind.ReadonlyKeyword>;
+    export type AwaitKeywordToken = Token<SyntaxKind.AwaitKeyword>;
+    export type PlusToken = Token<SyntaxKind.PlusToken>;
+    export type MinusToken = Token<SyntaxKind.MinusToken>;
+    export type Modifier = Token<SyntaxKind.AbstractKeyword> | Token<SyntaxKind.AsyncKeyword> | Token<SyntaxKind.ConstKeyword> | Token<SyntaxKind.DeclareKeyword> | Token<SyntaxKind.DefaultKeyword> | Token<SyntaxKind.ExportKeyword> | Token<SyntaxKind.PublicKeyword> | Token<SyntaxKind.PrivateKeyword> | Token<SyntaxKind.ProtectedKeyword> | Token<SyntaxKind.ReadonlyKeyword> | Token<SyntaxKind.StaticKeyword>;
+    export type ModifiersArray = NodeArray<Modifier>;
+    export interface Identifier extends PrimaryExpression, Declaration {
         kind: SyntaxKind.Identifier;
         /**
          * Prefer to use `id.unescapedText`. (Note: This is available only in services, not internally to the TypeScript compiler.)
@@ -528,37 +528,37 @@ declare namespace ts {
         originalKeywordKind?: SyntaxKind;
         isInJSDocNamespace?: boolean;
     }
-    interface TransientIdentifier extends Identifier {
+    export interface TransientIdentifier extends Identifier {
         resolvedSymbol: Symbol;
     }
-    interface QualifiedName extends Node {
+    export interface QualifiedName extends Node {
         kind: SyntaxKind.QualifiedName;
         left: EntityName;
         right: Identifier;
     }
-    type EntityName = Identifier | QualifiedName;
-    type PropertyName = Identifier | StringLiteral | NumericLiteral | ComputedPropertyName;
-    type DeclarationName = Identifier | StringLiteralLike | NumericLiteral | ComputedPropertyName | BindingPattern;
-    interface Declaration extends Node {
+    export type EntityName = Identifier | QualifiedName;
+    export type PropertyName = Identifier | StringLiteral | NumericLiteral | ComputedPropertyName;
+    export type DeclarationName = Identifier | StringLiteralLike | NumericLiteral | ComputedPropertyName | BindingPattern;
+    export interface Declaration extends Node {
         _declarationBrand: any;
     }
-    interface NamedDeclaration extends Declaration {
+    export interface NamedDeclaration extends Declaration {
         name?: DeclarationName;
     }
-    interface DeclarationStatement extends NamedDeclaration, Statement {
+    export interface DeclarationStatement extends NamedDeclaration, Statement {
         name?: Identifier | StringLiteral | NumericLiteral;
     }
-    interface ComputedPropertyName extends Node {
+    export interface ComputedPropertyName extends Node {
         parent: Declaration;
         kind: SyntaxKind.ComputedPropertyName;
         expression: Expression;
     }
-    interface Decorator extends Node {
+    export interface Decorator extends Node {
         kind: SyntaxKind.Decorator;
         parent: NamedDeclaration;
         expression: LeftHandSideExpression;
     }
-    interface TypeParameterDeclaration extends NamedDeclaration {
+    export interface TypeParameterDeclaration extends NamedDeclaration {
         kind: SyntaxKind.TypeParameter;
         parent: DeclarationWithTypeParameterChildren | InferTypeNode;
         name: Identifier;
@@ -567,22 +567,22 @@ declare namespace ts {
         default?: TypeNode;
         expression?: Expression;
     }
-    interface SignatureDeclarationBase extends NamedDeclaration, JSDocContainer {
+    export interface SignatureDeclarationBase extends NamedDeclaration, JSDocContainer {
         kind: SignatureDeclaration["kind"];
         name?: PropertyName;
         typeParameters?: NodeArray<TypeParameterDeclaration>;
         parameters: NodeArray<ParameterDeclaration>;
         type?: TypeNode;
     }
-    type SignatureDeclaration = CallSignatureDeclaration | ConstructSignatureDeclaration | MethodSignature | IndexSignatureDeclaration | FunctionTypeNode | ConstructorTypeNode | JSDocFunctionType | FunctionDeclaration | MethodDeclaration | ConstructorDeclaration | AccessorDeclaration | FunctionExpression | ArrowFunction;
-    interface CallSignatureDeclaration extends SignatureDeclarationBase, TypeElement {
+    export type SignatureDeclaration = CallSignatureDeclaration | ConstructSignatureDeclaration | MethodSignature | IndexSignatureDeclaration | FunctionTypeNode | ConstructorTypeNode | JSDocFunctionType | FunctionDeclaration | MethodDeclaration | ConstructorDeclaration | AccessorDeclaration | FunctionExpression | ArrowFunction;
+    export interface CallSignatureDeclaration extends SignatureDeclarationBase, TypeElement {
         kind: SyntaxKind.CallSignature;
     }
-    interface ConstructSignatureDeclaration extends SignatureDeclarationBase, TypeElement {
+    export interface ConstructSignatureDeclaration extends SignatureDeclarationBase, TypeElement {
         kind: SyntaxKind.ConstructSignature;
     }
-    type BindingName = Identifier | BindingPattern;
-    interface VariableDeclaration extends NamedDeclaration {
+    export type BindingName = Identifier | BindingPattern;
+    export interface VariableDeclaration extends NamedDeclaration {
         kind: SyntaxKind.VariableDeclaration;
         parent: VariableDeclarationList | CatchClause;
         name: BindingName;
@@ -590,12 +590,12 @@ declare namespace ts {
         type?: TypeNode;
         initializer?: Expression;
     }
-    interface VariableDeclarationList extends Node {
+    export interface VariableDeclarationList extends Node {
         kind: SyntaxKind.VariableDeclarationList;
         parent: VariableStatement | ForStatement | ForOfStatement | ForInStatement;
         declarations: NodeArray<VariableDeclaration>;
     }
-    interface ParameterDeclaration extends NamedDeclaration, JSDocContainer {
+    export interface ParameterDeclaration extends NamedDeclaration, JSDocContainer {
         kind: SyntaxKind.Parameter;
         parent: SignatureDeclaration;
         dotDotDotToken?: DotDotDotToken;
@@ -604,7 +604,7 @@ declare namespace ts {
         type?: TypeNode;
         initializer?: Expression;
     }
-    interface BindingElement extends NamedDeclaration {
+    export interface BindingElement extends NamedDeclaration {
         kind: SyntaxKind.BindingElement;
         parent: BindingPattern;
         propertyName?: PropertyName;
@@ -612,14 +612,14 @@ declare namespace ts {
         name: BindingName;
         initializer?: Expression;
     }
-    interface PropertySignature extends TypeElement, JSDocContainer {
+    export interface PropertySignature extends TypeElement, JSDocContainer {
         kind: SyntaxKind.PropertySignature;
         name: PropertyName;
         questionToken?: QuestionToken;
         type?: TypeNode;
         initializer?: Expression;
     }
-    interface PropertyDeclaration extends ClassElement, JSDocContainer {
+    export interface PropertyDeclaration extends ClassElement, JSDocContainer {
         kind: SyntaxKind.PropertyDeclaration;
         parent: ClassLikeDeclaration;
         name: PropertyName;
@@ -628,20 +628,20 @@ declare namespace ts {
         type?: TypeNode;
         initializer?: Expression;
     }
-    interface ObjectLiteralElement extends NamedDeclaration {
+    export interface ObjectLiteralElement extends NamedDeclaration {
         _objectLiteralBrand: any;
         name?: PropertyName;
     }
     /** Unlike ObjectLiteralElement, excludes JSXAttribute and JSXSpreadAttribute. */
-    type ObjectLiteralElementLike = PropertyAssignment | ShorthandPropertyAssignment | SpreadAssignment | MethodDeclaration | AccessorDeclaration;
-    interface PropertyAssignment extends ObjectLiteralElement, JSDocContainer {
+    export type ObjectLiteralElementLike = PropertyAssignment | ShorthandPropertyAssignment | SpreadAssignment | MethodDeclaration | AccessorDeclaration;
+    export interface PropertyAssignment extends ObjectLiteralElement, JSDocContainer {
         parent: ObjectLiteralExpression;
         kind: SyntaxKind.PropertyAssignment;
         name: PropertyName;
         questionToken?: QuestionToken;
         initializer: Expression;
     }
-    interface ShorthandPropertyAssignment extends ObjectLiteralElement, JSDocContainer {
+    export interface ShorthandPropertyAssignment extends ObjectLiteralElement, JSDocContainer {
         parent: ObjectLiteralExpression;
         kind: SyntaxKind.ShorthandPropertyAssignment;
         name: Identifier;
@@ -650,27 +650,27 @@ declare namespace ts {
         equalsToken?: Token<SyntaxKind.EqualsToken>;
         objectAssignmentInitializer?: Expression;
     }
-    interface SpreadAssignment extends ObjectLiteralElement, JSDocContainer {
+    export interface SpreadAssignment extends ObjectLiteralElement, JSDocContainer {
         parent: ObjectLiteralExpression;
         kind: SyntaxKind.SpreadAssignment;
         expression: Expression;
     }
-    type VariableLikeDeclaration = VariableDeclaration | ParameterDeclaration | BindingElement | PropertyDeclaration | PropertyAssignment | PropertySignature | JsxAttribute | ShorthandPropertyAssignment | EnumMember | JSDocPropertyTag | JSDocParameterTag;
-    interface PropertyLikeDeclaration extends NamedDeclaration {
+    export type VariableLikeDeclaration = VariableDeclaration | ParameterDeclaration | BindingElement | PropertyDeclaration | PropertyAssignment | PropertySignature | JsxAttribute | ShorthandPropertyAssignment | EnumMember | JSDocPropertyTag | JSDocParameterTag;
+    export interface PropertyLikeDeclaration extends NamedDeclaration {
         name: PropertyName;
     }
-    interface ObjectBindingPattern extends Node {
+    export interface ObjectBindingPattern extends Node {
         kind: SyntaxKind.ObjectBindingPattern;
         parent: VariableDeclaration | ParameterDeclaration | BindingElement;
         elements: NodeArray<BindingElement>;
     }
-    interface ArrayBindingPattern extends Node {
+    export interface ArrayBindingPattern extends Node {
         kind: SyntaxKind.ArrayBindingPattern;
         parent: VariableDeclaration | ParameterDeclaration | BindingElement;
         elements: NodeArray<ArrayBindingElement>;
     }
-    type BindingPattern = ObjectBindingPattern | ArrayBindingPattern;
-    type ArrayBindingElement = BindingElement | OmittedExpression;
+    export type BindingPattern = ObjectBindingPattern | ArrayBindingPattern;
+    export type ArrayBindingElement = BindingElement | OmittedExpression;
     /**
      * Several node kinds share function-like features such as a signature,
      * a name, and a body. These nodes should extend FunctionLikeDeclarationBase.
@@ -679,298 +679,298 @@ declare namespace ts {
      * - MethodDeclaration
      * - AccessorDeclaration
      */
-    interface FunctionLikeDeclarationBase extends SignatureDeclarationBase {
+    export interface FunctionLikeDeclarationBase extends SignatureDeclarationBase {
         _functionLikeDeclarationBrand: any;
         asteriskToken?: AsteriskToken;
         questionToken?: QuestionToken;
         exclamationToken?: ExclamationToken;
         body?: Block | Expression;
     }
-    type FunctionLikeDeclaration = FunctionDeclaration | MethodDeclaration | GetAccessorDeclaration | SetAccessorDeclaration | ConstructorDeclaration | FunctionExpression | ArrowFunction;
+    export type FunctionLikeDeclaration = FunctionDeclaration | MethodDeclaration | GetAccessorDeclaration | SetAccessorDeclaration | ConstructorDeclaration | FunctionExpression | ArrowFunction;
     /** @deprecated Use SignatureDeclaration */
-    type FunctionLike = SignatureDeclaration;
-    interface FunctionDeclaration extends FunctionLikeDeclarationBase, DeclarationStatement {
+    export type FunctionLike = SignatureDeclaration;
+    export interface FunctionDeclaration extends FunctionLikeDeclarationBase, DeclarationStatement {
         kind: SyntaxKind.FunctionDeclaration;
         name?: Identifier;
         body?: FunctionBody;
     }
-    interface MethodSignature extends SignatureDeclarationBase, TypeElement {
+    export interface MethodSignature extends SignatureDeclarationBase, TypeElement {
         kind: SyntaxKind.MethodSignature;
         parent: ObjectTypeDeclaration;
         name: PropertyName;
     }
-    interface MethodDeclaration extends FunctionLikeDeclarationBase, ClassElement, ObjectLiteralElement, JSDocContainer {
+    export interface MethodDeclaration extends FunctionLikeDeclarationBase, ClassElement, ObjectLiteralElement, JSDocContainer {
         kind: SyntaxKind.MethodDeclaration;
         parent: ClassLikeDeclaration | ObjectLiteralExpression;
         name: PropertyName;
         body?: FunctionBody;
     }
-    interface ConstructorDeclaration extends FunctionLikeDeclarationBase, ClassElement, JSDocContainer {
+    export interface ConstructorDeclaration extends FunctionLikeDeclarationBase, ClassElement, JSDocContainer {
         kind: SyntaxKind.Constructor;
         parent: ClassLikeDeclaration;
         body?: FunctionBody;
     }
     /** For when we encounter a semicolon in a class declaration. ES6 allows these as class elements. */
-    interface SemicolonClassElement extends ClassElement {
+    export interface SemicolonClassElement extends ClassElement {
         kind: SyntaxKind.SemicolonClassElement;
         parent: ClassLikeDeclaration;
     }
-    interface GetAccessorDeclaration extends FunctionLikeDeclarationBase, ClassElement, ObjectLiteralElement, JSDocContainer {
+    export interface GetAccessorDeclaration extends FunctionLikeDeclarationBase, ClassElement, ObjectLiteralElement, JSDocContainer {
         kind: SyntaxKind.GetAccessor;
         parent: ClassLikeDeclaration | ObjectLiteralExpression;
         name: PropertyName;
         body?: FunctionBody;
     }
-    interface SetAccessorDeclaration extends FunctionLikeDeclarationBase, ClassElement, ObjectLiteralElement, JSDocContainer {
+    export interface SetAccessorDeclaration extends FunctionLikeDeclarationBase, ClassElement, ObjectLiteralElement, JSDocContainer {
         kind: SyntaxKind.SetAccessor;
         parent: ClassLikeDeclaration | ObjectLiteralExpression;
         name: PropertyName;
         body?: FunctionBody;
     }
-    type AccessorDeclaration = GetAccessorDeclaration | SetAccessorDeclaration;
-    interface IndexSignatureDeclaration extends SignatureDeclarationBase, ClassElement, TypeElement {
+    export type AccessorDeclaration = GetAccessorDeclaration | SetAccessorDeclaration;
+    export interface IndexSignatureDeclaration extends SignatureDeclarationBase, ClassElement, TypeElement {
         kind: SyntaxKind.IndexSignature;
         parent: ObjectTypeDeclaration;
     }
-    interface TypeNode extends Node {
+    export interface TypeNode extends Node {
         _typeNodeBrand: any;
     }
-    interface KeywordTypeNode extends TypeNode {
+    export interface KeywordTypeNode extends TypeNode {
         kind: SyntaxKind.AnyKeyword | SyntaxKind.UnknownKeyword | SyntaxKind.NumberKeyword | SyntaxKind.BigIntKeyword | SyntaxKind.ObjectKeyword | SyntaxKind.BooleanKeyword | SyntaxKind.StringKeyword | SyntaxKind.SymbolKeyword | SyntaxKind.ThisKeyword | SyntaxKind.VoidKeyword | SyntaxKind.UndefinedKeyword | SyntaxKind.NullKeyword | SyntaxKind.NeverKeyword;
     }
-    interface ImportTypeNode extends NodeWithTypeArguments {
+    export interface ImportTypeNode extends NodeWithTypeArguments {
         kind: SyntaxKind.ImportType;
         isTypeOf?: boolean;
         argument: TypeNode;
         qualifier?: EntityName;
     }
-    interface ThisTypeNode extends TypeNode {
+    export interface ThisTypeNode extends TypeNode {
         kind: SyntaxKind.ThisType;
     }
-    type FunctionOrConstructorTypeNode = FunctionTypeNode | ConstructorTypeNode;
-    interface FunctionOrConstructorTypeNodeBase extends TypeNode, SignatureDeclarationBase {
+    export type FunctionOrConstructorTypeNode = FunctionTypeNode | ConstructorTypeNode;
+    export interface FunctionOrConstructorTypeNodeBase extends TypeNode, SignatureDeclarationBase {
         kind: SyntaxKind.FunctionType | SyntaxKind.ConstructorType;
         type: TypeNode;
     }
-    interface FunctionTypeNode extends FunctionOrConstructorTypeNodeBase {
+    export interface FunctionTypeNode extends FunctionOrConstructorTypeNodeBase {
         kind: SyntaxKind.FunctionType;
     }
-    interface ConstructorTypeNode extends FunctionOrConstructorTypeNodeBase {
+    export interface ConstructorTypeNode extends FunctionOrConstructorTypeNodeBase {
         kind: SyntaxKind.ConstructorType;
     }
-    interface NodeWithTypeArguments extends TypeNode {
+    export interface NodeWithTypeArguments extends TypeNode {
         typeArguments?: NodeArray<TypeNode>;
     }
-    type TypeReferenceType = TypeReferenceNode | ExpressionWithTypeArguments;
-    interface TypeReferenceNode extends NodeWithTypeArguments {
+    export type TypeReferenceType = TypeReferenceNode | ExpressionWithTypeArguments;
+    export interface TypeReferenceNode extends NodeWithTypeArguments {
         kind: SyntaxKind.TypeReference;
         typeName: EntityName;
     }
-    interface TypePredicateNode extends TypeNode {
+    export interface TypePredicateNode extends TypeNode {
         kind: SyntaxKind.TypePredicate;
         parent: SignatureDeclaration | JSDocTypeExpression;
         parameterName: Identifier | ThisTypeNode;
         type: TypeNode;
     }
-    interface TypeQueryNode extends TypeNode {
+    export interface TypeQueryNode extends TypeNode {
         kind: SyntaxKind.TypeQuery;
         exprName: EntityName;
     }
-    interface TypeLiteralNode extends TypeNode, Declaration {
+    export interface TypeLiteralNode extends TypeNode, Declaration {
         kind: SyntaxKind.TypeLiteral;
         members: NodeArray<TypeElement>;
     }
-    interface ArrayTypeNode extends TypeNode {
+    export interface ArrayTypeNode extends TypeNode {
         kind: SyntaxKind.ArrayType;
         elementType: TypeNode;
     }
-    interface TupleTypeNode extends TypeNode {
+    export interface TupleTypeNode extends TypeNode {
         kind: SyntaxKind.TupleType;
         elementTypes: NodeArray<TypeNode>;
     }
-    interface OptionalTypeNode extends TypeNode {
+    export interface OptionalTypeNode extends TypeNode {
         kind: SyntaxKind.OptionalType;
         type: TypeNode;
     }
-    interface RestTypeNode extends TypeNode {
+    export interface RestTypeNode extends TypeNode {
         kind: SyntaxKind.RestType;
         type: TypeNode;
     }
-    type UnionOrIntersectionTypeNode = UnionTypeNode | IntersectionTypeNode;
-    interface UnionTypeNode extends TypeNode {
+    export type UnionOrIntersectionTypeNode = UnionTypeNode | IntersectionTypeNode;
+    export interface UnionTypeNode extends TypeNode {
         kind: SyntaxKind.UnionType;
         types: NodeArray<TypeNode>;
     }
-    interface IntersectionTypeNode extends TypeNode {
+    export interface IntersectionTypeNode extends TypeNode {
         kind: SyntaxKind.IntersectionType;
         types: NodeArray<TypeNode>;
     }
-    interface ConditionalTypeNode extends TypeNode {
+    export interface ConditionalTypeNode extends TypeNode {
         kind: SyntaxKind.ConditionalType;
         checkType: TypeNode;
         extendsType: TypeNode;
         trueType: TypeNode;
         falseType: TypeNode;
     }
-    interface InferTypeNode extends TypeNode {
+    export interface InferTypeNode extends TypeNode {
         kind: SyntaxKind.InferType;
         typeParameter: TypeParameterDeclaration;
     }
-    interface ParenthesizedTypeNode extends TypeNode {
+    export interface ParenthesizedTypeNode extends TypeNode {
         kind: SyntaxKind.ParenthesizedType;
         type: TypeNode;
     }
-    interface TypeOperatorNode extends TypeNode {
+    export interface TypeOperatorNode extends TypeNode {
         kind: SyntaxKind.TypeOperator;
         operator: SyntaxKind.KeyOfKeyword | SyntaxKind.UniqueKeyword | SyntaxKind.ReadonlyKeyword;
         type: TypeNode;
     }
-    interface IndexedAccessTypeNode extends TypeNode {
+    export interface IndexedAccessTypeNode extends TypeNode {
         kind: SyntaxKind.IndexedAccessType;
         objectType: TypeNode;
         indexType: TypeNode;
     }
-    interface MappedTypeNode extends TypeNode, Declaration {
+    export interface MappedTypeNode extends TypeNode, Declaration {
         kind: SyntaxKind.MappedType;
         readonlyToken?: ReadonlyToken | PlusToken | MinusToken;
         typeParameter: TypeParameterDeclaration;
         questionToken?: QuestionToken | PlusToken | MinusToken;
         type?: TypeNode;
     }
-    interface LiteralTypeNode extends TypeNode {
+    export interface LiteralTypeNode extends TypeNode {
         kind: SyntaxKind.LiteralType;
         literal: BooleanLiteral | LiteralExpression | PrefixUnaryExpression;
     }
-    interface StringLiteral extends LiteralExpression {
+    export interface StringLiteral extends LiteralExpression {
         kind: SyntaxKind.StringLiteral;
     }
-    type StringLiteralLike = StringLiteral | NoSubstitutionTemplateLiteral;
-    interface Expression extends Node {
+    export type StringLiteralLike = StringLiteral | NoSubstitutionTemplateLiteral;
+    export interface Expression extends Node {
         _expressionBrand: any;
     }
-    interface OmittedExpression extends Expression {
+    export interface OmittedExpression extends Expression {
         kind: SyntaxKind.OmittedExpression;
     }
-    interface PartiallyEmittedExpression extends LeftHandSideExpression {
+    export interface PartiallyEmittedExpression extends LeftHandSideExpression {
         kind: SyntaxKind.PartiallyEmittedExpression;
         expression: Expression;
     }
-    interface UnaryExpression extends Expression {
+    export interface UnaryExpression extends Expression {
         _unaryExpressionBrand: any;
     }
     /** Deprecated, please use UpdateExpression */
-    type IncrementExpression = UpdateExpression;
-    interface UpdateExpression extends UnaryExpression {
+    export type IncrementExpression = UpdateExpression;
+    export interface UpdateExpression extends UnaryExpression {
         _updateExpressionBrand: any;
     }
-    type PrefixUnaryOperator = SyntaxKind.PlusPlusToken | SyntaxKind.MinusMinusToken | SyntaxKind.PlusToken | SyntaxKind.MinusToken | SyntaxKind.TildeToken | SyntaxKind.ExclamationToken;
-    interface PrefixUnaryExpression extends UpdateExpression {
+    export type PrefixUnaryOperator = SyntaxKind.PlusPlusToken | SyntaxKind.MinusMinusToken | SyntaxKind.PlusToken | SyntaxKind.MinusToken | SyntaxKind.TildeToken | SyntaxKind.ExclamationToken;
+    export interface PrefixUnaryExpression extends UpdateExpression {
         kind: SyntaxKind.PrefixUnaryExpression;
         operator: PrefixUnaryOperator;
         operand: UnaryExpression;
     }
-    type PostfixUnaryOperator = SyntaxKind.PlusPlusToken | SyntaxKind.MinusMinusToken;
-    interface PostfixUnaryExpression extends UpdateExpression {
+    export type PostfixUnaryOperator = SyntaxKind.PlusPlusToken | SyntaxKind.MinusMinusToken;
+    export interface PostfixUnaryExpression extends UpdateExpression {
         kind: SyntaxKind.PostfixUnaryExpression;
         operand: LeftHandSideExpression;
         operator: PostfixUnaryOperator;
     }
-    interface LeftHandSideExpression extends UpdateExpression {
+    export interface LeftHandSideExpression extends UpdateExpression {
         _leftHandSideExpressionBrand: any;
     }
-    interface MemberExpression extends LeftHandSideExpression {
+    export interface MemberExpression extends LeftHandSideExpression {
         _memberExpressionBrand: any;
     }
-    interface PrimaryExpression extends MemberExpression {
+    export interface PrimaryExpression extends MemberExpression {
         _primaryExpressionBrand: any;
     }
-    interface NullLiteral extends PrimaryExpression, TypeNode {
+    export interface NullLiteral extends PrimaryExpression, TypeNode {
         kind: SyntaxKind.NullKeyword;
     }
-    interface BooleanLiteral extends PrimaryExpression, TypeNode {
+    export interface BooleanLiteral extends PrimaryExpression, TypeNode {
         kind: SyntaxKind.TrueKeyword | SyntaxKind.FalseKeyword;
     }
-    interface ThisExpression extends PrimaryExpression, KeywordTypeNode {
+    export interface ThisExpression extends PrimaryExpression, KeywordTypeNode {
         kind: SyntaxKind.ThisKeyword;
     }
-    interface SuperExpression extends PrimaryExpression {
+    export interface SuperExpression extends PrimaryExpression {
         kind: SyntaxKind.SuperKeyword;
     }
-    interface ImportExpression extends PrimaryExpression {
+    export interface ImportExpression extends PrimaryExpression {
         kind: SyntaxKind.ImportKeyword;
     }
-    interface DeleteExpression extends UnaryExpression {
+    export interface DeleteExpression extends UnaryExpression {
         kind: SyntaxKind.DeleteExpression;
         expression: UnaryExpression;
     }
-    interface TypeOfExpression extends UnaryExpression {
+    export interface TypeOfExpression extends UnaryExpression {
         kind: SyntaxKind.TypeOfExpression;
         expression: UnaryExpression;
     }
-    interface VoidExpression extends UnaryExpression {
+    export interface VoidExpression extends UnaryExpression {
         kind: SyntaxKind.VoidExpression;
         expression: UnaryExpression;
     }
-    interface AwaitExpression extends UnaryExpression {
+    export interface AwaitExpression extends UnaryExpression {
         kind: SyntaxKind.AwaitExpression;
         expression: UnaryExpression;
     }
-    interface YieldExpression extends Expression {
+    export interface YieldExpression extends Expression {
         kind: SyntaxKind.YieldExpression;
         asteriskToken?: AsteriskToken;
         expression?: Expression;
     }
-    interface SyntheticExpression extends Expression {
+    export interface SyntheticExpression extends Expression {
         kind: SyntaxKind.SyntheticExpression;
         isSpread: boolean;
         type: Type;
     }
-    type ExponentiationOperator = SyntaxKind.AsteriskAsteriskToken;
-    type MultiplicativeOperator = SyntaxKind.AsteriskToken | SyntaxKind.SlashToken | SyntaxKind.PercentToken;
-    type MultiplicativeOperatorOrHigher = ExponentiationOperator | MultiplicativeOperator;
-    type AdditiveOperator = SyntaxKind.PlusToken | SyntaxKind.MinusToken;
-    type AdditiveOperatorOrHigher = MultiplicativeOperatorOrHigher | AdditiveOperator;
-    type ShiftOperator = SyntaxKind.LessThanLessThanToken | SyntaxKind.GreaterThanGreaterThanToken | SyntaxKind.GreaterThanGreaterThanGreaterThanToken;
-    type ShiftOperatorOrHigher = AdditiveOperatorOrHigher | ShiftOperator;
-    type RelationalOperator = SyntaxKind.LessThanToken | SyntaxKind.LessThanEqualsToken | SyntaxKind.GreaterThanToken | SyntaxKind.GreaterThanEqualsToken | SyntaxKind.InstanceOfKeyword | SyntaxKind.InKeyword;
-    type RelationalOperatorOrHigher = ShiftOperatorOrHigher | RelationalOperator;
-    type EqualityOperator = SyntaxKind.EqualsEqualsToken | SyntaxKind.EqualsEqualsEqualsToken | SyntaxKind.ExclamationEqualsEqualsToken | SyntaxKind.ExclamationEqualsToken;
-    type EqualityOperatorOrHigher = RelationalOperatorOrHigher | EqualityOperator;
-    type BitwiseOperator = SyntaxKind.AmpersandToken | SyntaxKind.BarToken | SyntaxKind.CaretToken;
-    type BitwiseOperatorOrHigher = EqualityOperatorOrHigher | BitwiseOperator;
-    type LogicalOperator = SyntaxKind.AmpersandAmpersandToken | SyntaxKind.BarBarToken;
-    type LogicalOperatorOrHigher = BitwiseOperatorOrHigher | LogicalOperator;
-    type CompoundAssignmentOperator = SyntaxKind.PlusEqualsToken | SyntaxKind.MinusEqualsToken | SyntaxKind.AsteriskAsteriskEqualsToken | SyntaxKind.AsteriskEqualsToken | SyntaxKind.SlashEqualsToken | SyntaxKind.PercentEqualsToken | SyntaxKind.AmpersandEqualsToken | SyntaxKind.BarEqualsToken | SyntaxKind.CaretEqualsToken | SyntaxKind.LessThanLessThanEqualsToken | SyntaxKind.GreaterThanGreaterThanGreaterThanEqualsToken | SyntaxKind.GreaterThanGreaterThanEqualsToken;
-    type AssignmentOperator = SyntaxKind.EqualsToken | CompoundAssignmentOperator;
-    type AssignmentOperatorOrHigher = LogicalOperatorOrHigher | AssignmentOperator;
-    type BinaryOperator = AssignmentOperatorOrHigher | SyntaxKind.CommaToken;
-    type BinaryOperatorToken = Token<BinaryOperator>;
-    interface BinaryExpression extends Expression, Declaration {
+    export type ExponentiationOperator = SyntaxKind.AsteriskAsteriskToken;
+    export type MultiplicativeOperator = SyntaxKind.AsteriskToken | SyntaxKind.SlashToken | SyntaxKind.PercentToken;
+    export type MultiplicativeOperatorOrHigher = ExponentiationOperator | MultiplicativeOperator;
+    export type AdditiveOperator = SyntaxKind.PlusToken | SyntaxKind.MinusToken;
+    export type AdditiveOperatorOrHigher = MultiplicativeOperatorOrHigher | AdditiveOperator;
+    export type ShiftOperator = SyntaxKind.LessThanLessThanToken | SyntaxKind.GreaterThanGreaterThanToken | SyntaxKind.GreaterThanGreaterThanGreaterThanToken;
+    export type ShiftOperatorOrHigher = AdditiveOperatorOrHigher | ShiftOperator;
+    export type RelationalOperator = SyntaxKind.LessThanToken | SyntaxKind.LessThanEqualsToken | SyntaxKind.GreaterThanToken | SyntaxKind.GreaterThanEqualsToken | SyntaxKind.InstanceOfKeyword | SyntaxKind.InKeyword;
+    export type RelationalOperatorOrHigher = ShiftOperatorOrHigher | RelationalOperator;
+    export type EqualityOperator = SyntaxKind.EqualsEqualsToken | SyntaxKind.EqualsEqualsEqualsToken | SyntaxKind.ExclamationEqualsEqualsToken | SyntaxKind.ExclamationEqualsToken;
+    export type EqualityOperatorOrHigher = RelationalOperatorOrHigher | EqualityOperator;
+    export type BitwiseOperator = SyntaxKind.AmpersandToken | SyntaxKind.BarToken | SyntaxKind.CaretToken;
+    export type BitwiseOperatorOrHigher = EqualityOperatorOrHigher | BitwiseOperator;
+    export type LogicalOperator = SyntaxKind.AmpersandAmpersandToken | SyntaxKind.BarBarToken;
+    export type LogicalOperatorOrHigher = BitwiseOperatorOrHigher | LogicalOperator;
+    export type CompoundAssignmentOperator = SyntaxKind.PlusEqualsToken | SyntaxKind.MinusEqualsToken | SyntaxKind.AsteriskAsteriskEqualsToken | SyntaxKind.AsteriskEqualsToken | SyntaxKind.SlashEqualsToken | SyntaxKind.PercentEqualsToken | SyntaxKind.AmpersandEqualsToken | SyntaxKind.BarEqualsToken | SyntaxKind.CaretEqualsToken | SyntaxKind.LessThanLessThanEqualsToken | SyntaxKind.GreaterThanGreaterThanGreaterThanEqualsToken | SyntaxKind.GreaterThanGreaterThanEqualsToken;
+    export type AssignmentOperator = SyntaxKind.EqualsToken | CompoundAssignmentOperator;
+    export type AssignmentOperatorOrHigher = LogicalOperatorOrHigher | AssignmentOperator;
+    export type BinaryOperator = AssignmentOperatorOrHigher | SyntaxKind.CommaToken;
+    export type BinaryOperatorToken = Token<BinaryOperator>;
+    export interface BinaryExpression extends Expression, Declaration {
         kind: SyntaxKind.BinaryExpression;
         left: Expression;
         operatorToken: BinaryOperatorToken;
         right: Expression;
     }
-    type AssignmentOperatorToken = Token<AssignmentOperator>;
-    interface AssignmentExpression<TOperator extends AssignmentOperatorToken> extends BinaryExpression {
+    export type AssignmentOperatorToken = Token<AssignmentOperator>;
+    export interface AssignmentExpression<TOperator extends AssignmentOperatorToken> extends BinaryExpression {
         left: LeftHandSideExpression;
         operatorToken: TOperator;
     }
-    interface ObjectDestructuringAssignment extends AssignmentExpression<EqualsToken> {
+    export interface ObjectDestructuringAssignment extends AssignmentExpression<EqualsToken> {
         left: ObjectLiteralExpression;
     }
-    interface ArrayDestructuringAssignment extends AssignmentExpression<EqualsToken> {
+    export interface ArrayDestructuringAssignment extends AssignmentExpression<EqualsToken> {
         left: ArrayLiteralExpression;
     }
-    type DestructuringAssignment = ObjectDestructuringAssignment | ArrayDestructuringAssignment;
-    type BindingOrAssignmentElement = VariableDeclaration | ParameterDeclaration | BindingElement | PropertyAssignment | ShorthandPropertyAssignment | SpreadAssignment | OmittedExpression | SpreadElement | ArrayLiteralExpression | ObjectLiteralExpression | AssignmentExpression<EqualsToken> | Identifier | PropertyAccessExpression | ElementAccessExpression;
-    type BindingOrAssignmentElementRestIndicator = DotDotDotToken | SpreadElement | SpreadAssignment;
-    type BindingOrAssignmentElementTarget = BindingOrAssignmentPattern | Identifier | PropertyAccessExpression | ElementAccessExpression | OmittedExpression;
-    type ObjectBindingOrAssignmentPattern = ObjectBindingPattern | ObjectLiteralExpression;
-    type ArrayBindingOrAssignmentPattern = ArrayBindingPattern | ArrayLiteralExpression;
-    type AssignmentPattern = ObjectLiteralExpression | ArrayLiteralExpression;
-    type BindingOrAssignmentPattern = ObjectBindingOrAssignmentPattern | ArrayBindingOrAssignmentPattern;
-    interface ConditionalExpression extends Expression {
+    export type DestructuringAssignment = ObjectDestructuringAssignment | ArrayDestructuringAssignment;
+    export type BindingOrAssignmentElement = VariableDeclaration | ParameterDeclaration | BindingElement | PropertyAssignment | ShorthandPropertyAssignment | SpreadAssignment | OmittedExpression | SpreadElement | ArrayLiteralExpression | ObjectLiteralExpression | AssignmentExpression<EqualsToken> | Identifier | PropertyAccessExpression | ElementAccessExpression;
+    export type BindingOrAssignmentElementRestIndicator = DotDotDotToken | SpreadElement | SpreadAssignment;
+    export type BindingOrAssignmentElementTarget = BindingOrAssignmentPattern | Identifier | PropertyAccessExpression | ElementAccessExpression | OmittedExpression;
+    export type ObjectBindingOrAssignmentPattern = ObjectBindingPattern | ObjectLiteralExpression;
+    export type ArrayBindingOrAssignmentPattern = ArrayBindingPattern | ArrayLiteralExpression;
+    export type AssignmentPattern = ObjectLiteralExpression | ArrayLiteralExpression;
+    export type BindingOrAssignmentPattern = ObjectBindingOrAssignmentPattern | ArrayBindingOrAssignmentPattern;
+    export interface ConditionalExpression extends Expression {
         kind: SyntaxKind.ConditionalExpression;
         condition: Expression;
         questionToken: QuestionToken;
@@ -978,34 +978,34 @@ declare namespace ts {
         colonToken: ColonToken;
         whenFalse: Expression;
     }
-    type FunctionBody = Block;
-    type ConciseBody = FunctionBody | Expression;
-    interface FunctionExpression extends PrimaryExpression, FunctionLikeDeclarationBase, JSDocContainer {
+    export type FunctionBody = Block;
+    export type ConciseBody = FunctionBody | Expression;
+    export interface FunctionExpression extends PrimaryExpression, FunctionLikeDeclarationBase, JSDocContainer {
         kind: SyntaxKind.FunctionExpression;
         name?: Identifier;
         body: FunctionBody;
     }
-    interface ArrowFunction extends Expression, FunctionLikeDeclarationBase, JSDocContainer {
+    export interface ArrowFunction extends Expression, FunctionLikeDeclarationBase, JSDocContainer {
         kind: SyntaxKind.ArrowFunction;
         equalsGreaterThanToken: EqualsGreaterThanToken;
         body: ConciseBody;
         name: never;
     }
-    interface LiteralLikeNode extends Node {
+    export interface LiteralLikeNode extends Node {
         text: string;
         isUnterminated?: boolean;
         hasExtendedUnicodeEscape?: boolean;
     }
-    interface LiteralExpression extends LiteralLikeNode, PrimaryExpression {
+    export interface LiteralExpression extends LiteralLikeNode, PrimaryExpression {
         _literalExpressionBrand: any;
     }
-    interface RegularExpressionLiteral extends LiteralExpression {
+    export interface RegularExpressionLiteral extends LiteralExpression {
         kind: SyntaxKind.RegularExpressionLiteral;
     }
-    interface NoSubstitutionTemplateLiteral extends LiteralExpression {
+    export interface NoSubstitutionTemplateLiteral extends LiteralExpression {
         kind: SyntaxKind.NoSubstitutionTemplateLiteral;
     }
-    enum TokenFlags {
+    export enum TokenFlags {
         None = 0,
         Scientific = 16,
         Octal = 32,
@@ -1013,45 +1013,45 @@ declare namespace ts {
         BinarySpecifier = 128,
         OctalSpecifier = 256,
     }
-    interface NumericLiteral extends LiteralExpression {
+    export interface NumericLiteral extends LiteralExpression {
         kind: SyntaxKind.NumericLiteral;
     }
-    interface BigIntLiteral extends LiteralExpression {
+    export interface BigIntLiteral extends LiteralExpression {
         kind: SyntaxKind.BigIntLiteral;
     }
-    interface TemplateHead extends LiteralLikeNode {
+    export interface TemplateHead extends LiteralLikeNode {
         kind: SyntaxKind.TemplateHead;
         parent: TemplateExpression;
     }
-    interface TemplateMiddle extends LiteralLikeNode {
+    export interface TemplateMiddle extends LiteralLikeNode {
         kind: SyntaxKind.TemplateMiddle;
         parent: TemplateSpan;
     }
-    interface TemplateTail extends LiteralLikeNode {
+    export interface TemplateTail extends LiteralLikeNode {
         kind: SyntaxKind.TemplateTail;
         parent: TemplateSpan;
     }
-    type TemplateLiteral = TemplateExpression | NoSubstitutionTemplateLiteral;
-    interface TemplateExpression extends PrimaryExpression {
+    export type TemplateLiteral = TemplateExpression | NoSubstitutionTemplateLiteral;
+    export interface TemplateExpression extends PrimaryExpression {
         kind: SyntaxKind.TemplateExpression;
         head: TemplateHead;
         templateSpans: NodeArray<TemplateSpan>;
     }
-    interface TemplateSpan extends Node {
+    export interface TemplateSpan extends Node {
         kind: SyntaxKind.TemplateSpan;
         parent: TemplateExpression;
         expression: Expression;
         literal: TemplateMiddle | TemplateTail;
     }
-    interface ParenthesizedExpression extends PrimaryExpression, JSDocContainer {
+    export interface ParenthesizedExpression extends PrimaryExpression, JSDocContainer {
         kind: SyntaxKind.ParenthesizedExpression;
         expression: Expression;
     }
-    interface ArrayLiteralExpression extends PrimaryExpression {
+    export interface ArrayLiteralExpression extends PrimaryExpression {
         kind: SyntaxKind.ArrayLiteralExpression;
         elements: NodeArray<Expression>;
     }
-    interface SpreadElement extends Expression {
+    export interface SpreadElement extends Expression {
         kind: SyntaxKind.SpreadElement;
         parent: ArrayLiteralExpression | CallExpression | NewExpression;
         expression: Expression;
@@ -1062,413 +1062,413 @@ declare namespace ts {
      * JSXAttribute or JSXSpreadAttribute. ObjectLiteralExpression, on the other hand, can only have properties of type
      * ObjectLiteralElement (e.g. PropertyAssignment, ShorthandPropertyAssignment etc.)
      */
-    interface ObjectLiteralExpressionBase<T extends ObjectLiteralElement> extends PrimaryExpression, Declaration {
+    export interface ObjectLiteralExpressionBase<T extends ObjectLiteralElement> extends PrimaryExpression, Declaration {
         properties: NodeArray<T>;
     }
-    interface ObjectLiteralExpression extends ObjectLiteralExpressionBase<ObjectLiteralElementLike> {
+    export interface ObjectLiteralExpression extends ObjectLiteralExpressionBase<ObjectLiteralElementLike> {
         kind: SyntaxKind.ObjectLiteralExpression;
     }
-    type EntityNameExpression = Identifier | PropertyAccessEntityNameExpression;
-    type EntityNameOrEntityNameExpression = EntityName | EntityNameExpression;
-    interface PropertyAccessExpression extends MemberExpression, NamedDeclaration {
+    export type EntityNameExpression = Identifier | PropertyAccessEntityNameExpression;
+    export type EntityNameOrEntityNameExpression = EntityName | EntityNameExpression;
+    export interface PropertyAccessExpression extends MemberExpression, NamedDeclaration {
         kind: SyntaxKind.PropertyAccessExpression;
         expression: LeftHandSideExpression;
         name: Identifier;
     }
-    interface SuperPropertyAccessExpression extends PropertyAccessExpression {
+    export interface SuperPropertyAccessExpression extends PropertyAccessExpression {
         expression: SuperExpression;
     }
     /** Brand for a PropertyAccessExpression which, like a QualifiedName, consists of a sequence of identifiers separated by dots. */
-    interface PropertyAccessEntityNameExpression extends PropertyAccessExpression {
+    export interface PropertyAccessEntityNameExpression extends PropertyAccessExpression {
         _propertyAccessExpressionLikeQualifiedNameBrand?: any;
         expression: EntityNameExpression;
     }
-    interface ElementAccessExpression extends MemberExpression {
+    export interface ElementAccessExpression extends MemberExpression {
         kind: SyntaxKind.ElementAccessExpression;
         expression: LeftHandSideExpression;
         argumentExpression: Expression;
     }
-    interface SuperElementAccessExpression extends ElementAccessExpression {
+    export interface SuperElementAccessExpression extends ElementAccessExpression {
         expression: SuperExpression;
     }
-    type SuperProperty = SuperPropertyAccessExpression | SuperElementAccessExpression;
-    interface CallExpression extends LeftHandSideExpression, Declaration {
+    export type SuperProperty = SuperPropertyAccessExpression | SuperElementAccessExpression;
+    export interface CallExpression extends LeftHandSideExpression, Declaration {
         kind: SyntaxKind.CallExpression;
         expression: LeftHandSideExpression;
         typeArguments?: NodeArray<TypeNode>;
         arguments: NodeArray<Expression>;
     }
-    interface SuperCall extends CallExpression {
+    export interface SuperCall extends CallExpression {
         expression: SuperExpression;
     }
-    interface ImportCall extends CallExpression {
+    export interface ImportCall extends CallExpression {
         expression: ImportExpression;
     }
-    interface ExpressionWithTypeArguments extends NodeWithTypeArguments {
+    export interface ExpressionWithTypeArguments extends NodeWithTypeArguments {
         kind: SyntaxKind.ExpressionWithTypeArguments;
         parent: HeritageClause | JSDocAugmentsTag;
         expression: LeftHandSideExpression;
     }
-    interface NewExpression extends PrimaryExpression, Declaration {
+    export interface NewExpression extends PrimaryExpression, Declaration {
         kind: SyntaxKind.NewExpression;
         expression: LeftHandSideExpression;
         typeArguments?: NodeArray<TypeNode>;
         arguments?: NodeArray<Expression>;
     }
-    interface TaggedTemplateExpression extends MemberExpression {
+    export interface TaggedTemplateExpression extends MemberExpression {
         kind: SyntaxKind.TaggedTemplateExpression;
         tag: LeftHandSideExpression;
         typeArguments?: NodeArray<TypeNode>;
         template: TemplateLiteral;
     }
-    type CallLikeExpression = CallExpression | NewExpression | TaggedTemplateExpression | Decorator | JsxOpeningLikeElement;
-    interface AsExpression extends Expression {
+    export type CallLikeExpression = CallExpression | NewExpression | TaggedTemplateExpression | Decorator | JsxOpeningLikeElement;
+    export interface AsExpression extends Expression {
         kind: SyntaxKind.AsExpression;
         expression: Expression;
         type: TypeNode;
     }
-    interface TypeAssertion extends UnaryExpression {
+    export interface TypeAssertion extends UnaryExpression {
         kind: SyntaxKind.TypeAssertionExpression;
         type: TypeNode;
         expression: UnaryExpression;
     }
-    type AssertionExpression = TypeAssertion | AsExpression;
-    interface NonNullExpression extends LeftHandSideExpression {
+    export type AssertionExpression = TypeAssertion | AsExpression;
+    export interface NonNullExpression extends LeftHandSideExpression {
         kind: SyntaxKind.NonNullExpression;
         expression: Expression;
     }
-    interface MetaProperty extends PrimaryExpression {
+    export interface MetaProperty extends PrimaryExpression {
         kind: SyntaxKind.MetaProperty;
         keywordToken: SyntaxKind.NewKeyword | SyntaxKind.ImportKeyword;
         name: Identifier;
     }
-    interface JsxElement extends PrimaryExpression {
+    export interface JsxElement extends PrimaryExpression {
         kind: SyntaxKind.JsxElement;
         openingElement: JsxOpeningElement;
         children: NodeArray<JsxChild>;
         closingElement: JsxClosingElement;
     }
-    type JsxOpeningLikeElement = JsxSelfClosingElement | JsxOpeningElement;
-    type JsxAttributeLike = JsxAttribute | JsxSpreadAttribute;
-    type JsxTagNameExpression = Identifier | ThisExpression | JsxTagNamePropertyAccess;
-    interface JsxTagNamePropertyAccess extends PropertyAccessExpression {
+    export type JsxOpeningLikeElement = JsxSelfClosingElement | JsxOpeningElement;
+    export type JsxAttributeLike = JsxAttribute | JsxSpreadAttribute;
+    export type JsxTagNameExpression = Identifier | ThisExpression | JsxTagNamePropertyAccess;
+    export interface JsxTagNamePropertyAccess extends PropertyAccessExpression {
         expression: JsxTagNameExpression;
     }
-    interface JsxAttributes extends ObjectLiteralExpressionBase<JsxAttributeLike> {
+    export interface JsxAttributes extends ObjectLiteralExpressionBase<JsxAttributeLike> {
         kind: SyntaxKind.JsxAttributes;
         parent: JsxOpeningLikeElement;
     }
-    interface JsxOpeningElement extends Expression {
+    export interface JsxOpeningElement extends Expression {
         kind: SyntaxKind.JsxOpeningElement;
         parent: JsxElement;
         tagName: JsxTagNameExpression;
         typeArguments?: NodeArray<TypeNode>;
         attributes: JsxAttributes;
     }
-    interface JsxSelfClosingElement extends PrimaryExpression {
+    export interface JsxSelfClosingElement extends PrimaryExpression {
         kind: SyntaxKind.JsxSelfClosingElement;
         tagName: JsxTagNameExpression;
         typeArguments?: NodeArray<TypeNode>;
         attributes: JsxAttributes;
     }
-    interface JsxFragment extends PrimaryExpression {
+    export interface JsxFragment extends PrimaryExpression {
         kind: SyntaxKind.JsxFragment;
         openingFragment: JsxOpeningFragment;
         children: NodeArray<JsxChild>;
         closingFragment: JsxClosingFragment;
     }
-    interface JsxOpeningFragment extends Expression {
+    export interface JsxOpeningFragment extends Expression {
         kind: SyntaxKind.JsxOpeningFragment;
         parent: JsxFragment;
     }
-    interface JsxClosingFragment extends Expression {
+    export interface JsxClosingFragment extends Expression {
         kind: SyntaxKind.JsxClosingFragment;
         parent: JsxFragment;
     }
-    interface JsxAttribute extends ObjectLiteralElement {
+    export interface JsxAttribute extends ObjectLiteralElement {
         kind: SyntaxKind.JsxAttribute;
         parent: JsxAttributes;
         name: Identifier;
         initializer?: StringLiteral | JsxExpression;
     }
-    interface JsxSpreadAttribute extends ObjectLiteralElement {
+    export interface JsxSpreadAttribute extends ObjectLiteralElement {
         kind: SyntaxKind.JsxSpreadAttribute;
         parent: JsxAttributes;
         expression: Expression;
     }
-    interface JsxClosingElement extends Node {
+    export interface JsxClosingElement extends Node {
         kind: SyntaxKind.JsxClosingElement;
         parent: JsxElement;
         tagName: JsxTagNameExpression;
     }
-    interface JsxExpression extends Expression {
+    export interface JsxExpression extends Expression {
         kind: SyntaxKind.JsxExpression;
         parent: JsxElement | JsxAttributeLike;
         dotDotDotToken?: Token<SyntaxKind.DotDotDotToken>;
         expression?: Expression;
     }
-    interface JsxText extends LiteralLikeNode {
+    export interface JsxText extends LiteralLikeNode {
         kind: SyntaxKind.JsxText;
         containsOnlyTriviaWhiteSpaces: boolean;
         parent: JsxElement;
     }
-    type JsxChild = JsxText | JsxExpression | JsxElement | JsxSelfClosingElement | JsxFragment;
-    interface Statement extends Node {
+    export type JsxChild = JsxText | JsxExpression | JsxElement | JsxSelfClosingElement | JsxFragment;
+    export interface Statement extends Node {
         _statementBrand: any;
     }
-    interface NotEmittedStatement extends Statement {
+    export interface NotEmittedStatement extends Statement {
         kind: SyntaxKind.NotEmittedStatement;
     }
     /**
      * A list of comma-separated expressions. This node is only created by transformations.
      */
-    interface CommaListExpression extends Expression {
+    export interface CommaListExpression extends Expression {
         kind: SyntaxKind.CommaListExpression;
         elements: NodeArray<Expression>;
     }
-    interface EmptyStatement extends Statement {
+    export interface EmptyStatement extends Statement {
         kind: SyntaxKind.EmptyStatement;
     }
-    interface DebuggerStatement extends Statement {
+    export interface DebuggerStatement extends Statement {
         kind: SyntaxKind.DebuggerStatement;
     }
-    interface MissingDeclaration extends DeclarationStatement {
+    export interface MissingDeclaration extends DeclarationStatement {
         kind: SyntaxKind.MissingDeclaration;
         name?: Identifier;
     }
-    type BlockLike = SourceFile | Block | ModuleBlock | CaseOrDefaultClause;
-    interface Block extends Statement {
+    export type BlockLike = SourceFile | Block | ModuleBlock | CaseOrDefaultClause;
+    export interface Block extends Statement {
         kind: SyntaxKind.Block;
         statements: NodeArray<Statement>;
     }
-    interface VariableStatement extends Statement, JSDocContainer {
+    export interface VariableStatement extends Statement, JSDocContainer {
         kind: SyntaxKind.VariableStatement;
         declarationList: VariableDeclarationList;
     }
-    interface ExpressionStatement extends Statement, JSDocContainer {
+    export interface ExpressionStatement extends Statement, JSDocContainer {
         kind: SyntaxKind.ExpressionStatement;
         expression: Expression;
     }
-    interface IfStatement extends Statement {
+    export interface IfStatement extends Statement {
         kind: SyntaxKind.IfStatement;
         expression: Expression;
         thenStatement: Statement;
         elseStatement?: Statement;
     }
-    interface IterationStatement extends Statement {
+    export interface IterationStatement extends Statement {
         statement: Statement;
     }
-    interface DoStatement extends IterationStatement {
+    export interface DoStatement extends IterationStatement {
         kind: SyntaxKind.DoStatement;
         expression: Expression;
     }
-    interface WhileStatement extends IterationStatement {
+    export interface WhileStatement extends IterationStatement {
         kind: SyntaxKind.WhileStatement;
         expression: Expression;
     }
-    type ForInitializer = VariableDeclarationList | Expression;
-    interface ForStatement extends IterationStatement {
+    export type ForInitializer = VariableDeclarationList | Expression;
+    export interface ForStatement extends IterationStatement {
         kind: SyntaxKind.ForStatement;
         initializer?: ForInitializer;
         condition?: Expression;
         incrementor?: Expression;
     }
-    type ForInOrOfStatement = ForInStatement | ForOfStatement;
-    interface ForInStatement extends IterationStatement {
+    export type ForInOrOfStatement = ForInStatement | ForOfStatement;
+    export interface ForInStatement extends IterationStatement {
         kind: SyntaxKind.ForInStatement;
         initializer: ForInitializer;
         expression: Expression;
     }
-    interface ForOfStatement extends IterationStatement {
+    export interface ForOfStatement extends IterationStatement {
         kind: SyntaxKind.ForOfStatement;
         awaitModifier?: AwaitKeywordToken;
         initializer: ForInitializer;
         expression: Expression;
     }
-    interface BreakStatement extends Statement {
+    export interface BreakStatement extends Statement {
         kind: SyntaxKind.BreakStatement;
         label?: Identifier;
     }
-    interface ContinueStatement extends Statement {
+    export interface ContinueStatement extends Statement {
         kind: SyntaxKind.ContinueStatement;
         label?: Identifier;
     }
-    type BreakOrContinueStatement = BreakStatement | ContinueStatement;
-    interface ReturnStatement extends Statement {
+    export type BreakOrContinueStatement = BreakStatement | ContinueStatement;
+    export interface ReturnStatement extends Statement {
         kind: SyntaxKind.ReturnStatement;
         expression?: Expression;
     }
-    interface WithStatement extends Statement {
+    export interface WithStatement extends Statement {
         kind: SyntaxKind.WithStatement;
         expression: Expression;
         statement: Statement;
     }
-    interface SwitchStatement extends Statement {
+    export interface SwitchStatement extends Statement {
         kind: SyntaxKind.SwitchStatement;
         expression: Expression;
         caseBlock: CaseBlock;
         possiblyExhaustive?: boolean;
     }
-    interface CaseBlock extends Node {
+    export interface CaseBlock extends Node {
         kind: SyntaxKind.CaseBlock;
         parent: SwitchStatement;
         clauses: NodeArray<CaseOrDefaultClause>;
     }
-    interface CaseClause extends Node {
+    export interface CaseClause extends Node {
         kind: SyntaxKind.CaseClause;
         parent: CaseBlock;
         expression: Expression;
         statements: NodeArray<Statement>;
     }
-    interface DefaultClause extends Node {
+    export interface DefaultClause extends Node {
         kind: SyntaxKind.DefaultClause;
         parent: CaseBlock;
         statements: NodeArray<Statement>;
     }
-    type CaseOrDefaultClause = CaseClause | DefaultClause;
-    interface LabeledStatement extends Statement, JSDocContainer {
+    export type CaseOrDefaultClause = CaseClause | DefaultClause;
+    export interface LabeledStatement extends Statement, JSDocContainer {
         kind: SyntaxKind.LabeledStatement;
         label: Identifier;
         statement: Statement;
     }
-    interface ThrowStatement extends Statement {
+    export interface ThrowStatement extends Statement {
         kind: SyntaxKind.ThrowStatement;
         expression?: Expression;
     }
-    interface TryStatement extends Statement {
+    export interface TryStatement extends Statement {
         kind: SyntaxKind.TryStatement;
         tryBlock: Block;
         catchClause?: CatchClause;
         finallyBlock?: Block;
     }
-    interface CatchClause extends Node {
+    export interface CatchClause extends Node {
         kind: SyntaxKind.CatchClause;
         parent: TryStatement;
         variableDeclaration?: VariableDeclaration;
         block: Block;
     }
-    type ObjectTypeDeclaration = ClassLikeDeclaration | InterfaceDeclaration | TypeLiteralNode;
-    type DeclarationWithTypeParameters = DeclarationWithTypeParameterChildren | JSDocTypedefTag | JSDocCallbackTag | JSDocSignature;
-    type DeclarationWithTypeParameterChildren = SignatureDeclaration | ClassLikeDeclaration | InterfaceDeclaration | TypeAliasDeclaration | JSDocTemplateTag;
-    interface ClassLikeDeclarationBase extends NamedDeclaration, JSDocContainer {
+    export type ObjectTypeDeclaration = ClassLikeDeclaration | InterfaceDeclaration | TypeLiteralNode;
+    export type DeclarationWithTypeParameters = DeclarationWithTypeParameterChildren | JSDocTypedefTag | JSDocCallbackTag | JSDocSignature;
+    export type DeclarationWithTypeParameterChildren = SignatureDeclaration | ClassLikeDeclaration | InterfaceDeclaration | TypeAliasDeclaration | JSDocTemplateTag;
+    export interface ClassLikeDeclarationBase extends NamedDeclaration, JSDocContainer {
         kind: SyntaxKind.ClassDeclaration | SyntaxKind.ClassExpression;
         name?: Identifier;
         typeParameters?: NodeArray<TypeParameterDeclaration>;
         heritageClauses?: NodeArray<HeritageClause>;
         members: NodeArray<ClassElement>;
     }
-    interface ClassDeclaration extends ClassLikeDeclarationBase, DeclarationStatement {
+    export interface ClassDeclaration extends ClassLikeDeclarationBase, DeclarationStatement {
         kind: SyntaxKind.ClassDeclaration;
         /** May be undefined in `export default class { ... }`. */
         name?: Identifier;
     }
-    interface ClassExpression extends ClassLikeDeclarationBase, PrimaryExpression {
+    export interface ClassExpression extends ClassLikeDeclarationBase, PrimaryExpression {
         kind: SyntaxKind.ClassExpression;
     }
-    type ClassLikeDeclaration = ClassDeclaration | ClassExpression;
-    interface ClassElement extends NamedDeclaration {
+    export type ClassLikeDeclaration = ClassDeclaration | ClassExpression;
+    export interface ClassElement extends NamedDeclaration {
         _classElementBrand: any;
         name?: PropertyName;
     }
-    interface TypeElement extends NamedDeclaration {
+    export interface TypeElement extends NamedDeclaration {
         _typeElementBrand: any;
         name?: PropertyName;
         questionToken?: QuestionToken;
     }
-    interface InterfaceDeclaration extends DeclarationStatement, JSDocContainer {
+    export interface InterfaceDeclaration extends DeclarationStatement, JSDocContainer {
         kind: SyntaxKind.InterfaceDeclaration;
         name: Identifier;
         typeParameters?: NodeArray<TypeParameterDeclaration>;
         heritageClauses?: NodeArray<HeritageClause>;
         members: NodeArray<TypeElement>;
     }
-    interface HeritageClause extends Node {
+    export interface HeritageClause extends Node {
         kind: SyntaxKind.HeritageClause;
         parent: InterfaceDeclaration | ClassLikeDeclaration;
         token: SyntaxKind.ExtendsKeyword | SyntaxKind.ImplementsKeyword;
         types: NodeArray<ExpressionWithTypeArguments>;
     }
-    interface TypeAliasDeclaration extends DeclarationStatement, JSDocContainer {
+    export interface TypeAliasDeclaration extends DeclarationStatement, JSDocContainer {
         kind: SyntaxKind.TypeAliasDeclaration;
         name: Identifier;
         typeParameters?: NodeArray<TypeParameterDeclaration>;
         type: TypeNode;
     }
-    interface EnumMember extends NamedDeclaration, JSDocContainer {
+    export interface EnumMember extends NamedDeclaration, JSDocContainer {
         kind: SyntaxKind.EnumMember;
         parent: EnumDeclaration;
         name: PropertyName;
         initializer?: Expression;
     }
-    interface EnumDeclaration extends DeclarationStatement, JSDocContainer {
+    export interface EnumDeclaration extends DeclarationStatement, JSDocContainer {
         kind: SyntaxKind.EnumDeclaration;
         name: Identifier;
         members: NodeArray<EnumMember>;
     }
-    type ModuleName = Identifier | StringLiteral;
-    type ModuleBody = NamespaceBody | JSDocNamespaceBody;
-    interface ModuleDeclaration extends DeclarationStatement, JSDocContainer {
+    export type ModuleName = Identifier | StringLiteral;
+    export type ModuleBody = NamespaceBody | JSDocNamespaceBody;
+    export interface ModuleDeclaration extends DeclarationStatement, JSDocContainer {
         kind: SyntaxKind.ModuleDeclaration;
         parent: ModuleBody | SourceFile;
         name: ModuleName;
         body?: ModuleBody | JSDocNamespaceDeclaration;
     }
-    type NamespaceBody = ModuleBlock | NamespaceDeclaration;
-    interface NamespaceDeclaration extends ModuleDeclaration {
+    export type NamespaceBody = ModuleBlock | NamespaceDeclaration;
+    export interface NamespaceDeclaration extends ModuleDeclaration {
         name: Identifier;
         body: NamespaceBody;
     }
-    type JSDocNamespaceBody = Identifier | JSDocNamespaceDeclaration;
-    interface JSDocNamespaceDeclaration extends ModuleDeclaration {
+    export type JSDocNamespaceBody = Identifier | JSDocNamespaceDeclaration;
+    export interface JSDocNamespaceDeclaration extends ModuleDeclaration {
         name: Identifier;
         body?: JSDocNamespaceBody;
     }
-    interface ModuleBlock extends Node, Statement {
+    export interface ModuleBlock extends Node, Statement {
         kind: SyntaxKind.ModuleBlock;
         parent: ModuleDeclaration;
         statements: NodeArray<Statement>;
     }
-    type ModuleReference = EntityName | ExternalModuleReference;
+    export type ModuleReference = EntityName | ExternalModuleReference;
     /**
      * One of:
      * - import x = require("mod");
      * - import x = M.x;
      */
-    interface ImportEqualsDeclaration extends DeclarationStatement, JSDocContainer {
+    export interface ImportEqualsDeclaration extends DeclarationStatement, JSDocContainer {
         kind: SyntaxKind.ImportEqualsDeclaration;
         parent: SourceFile | ModuleBlock;
         name: Identifier;
         moduleReference: ModuleReference;
     }
-    interface ExternalModuleReference extends Node {
+    export interface ExternalModuleReference extends Node {
         kind: SyntaxKind.ExternalModuleReference;
         parent: ImportEqualsDeclaration;
         expression: Expression;
     }
-    interface ImportDeclaration extends Statement {
+    export interface ImportDeclaration extends Statement {
         kind: SyntaxKind.ImportDeclaration;
         parent: SourceFile | ModuleBlock;
         importClause?: ImportClause;
         /** If this is not a StringLiteral it will be a grammar error. */
         moduleSpecifier: Expression;
     }
-    type NamedImportBindings = NamespaceImport | NamedImports;
-    interface ImportClause extends NamedDeclaration {
+    export type NamedImportBindings = NamespaceImport | NamedImports;
+    export interface ImportClause extends NamedDeclaration {
         kind: SyntaxKind.ImportClause;
         parent: ImportDeclaration;
         name?: Identifier;
         namedBindings?: NamedImportBindings;
     }
-    interface NamespaceImport extends NamedDeclaration {
+    export interface NamespaceImport extends NamedDeclaration {
         kind: SyntaxKind.NamespaceImport;
         parent: ImportClause;
         name: Identifier;
     }
-    interface NamespaceExportDeclaration extends DeclarationStatement {
+    export interface NamespaceExportDeclaration extends DeclarationStatement {
         kind: SyntaxKind.NamespaceExportDeclaration;
         name: Identifier;
     }
-    interface ExportDeclaration extends DeclarationStatement, JSDocContainer {
+    export interface ExportDeclaration extends DeclarationStatement, JSDocContainer {
         kind: SyntaxKind.ExportDeclaration;
         parent: SourceFile | ModuleBlock;
         /** Will not be assigned in the case of `export * from "foo";` */
@@ -1476,162 +1476,162 @@ declare namespace ts {
         /** If this is not a StringLiteral it will be a grammar error. */
         moduleSpecifier?: Expression;
     }
-    interface NamedImports extends Node {
+    export interface NamedImports extends Node {
         kind: SyntaxKind.NamedImports;
         parent: ImportClause;
         elements: NodeArray<ImportSpecifier>;
     }
-    interface NamedExports extends Node {
+    export interface NamedExports extends Node {
         kind: SyntaxKind.NamedExports;
         parent: ExportDeclaration;
         elements: NodeArray<ExportSpecifier>;
     }
-    type NamedImportsOrExports = NamedImports | NamedExports;
-    interface ImportSpecifier extends NamedDeclaration {
+    export type NamedImportsOrExports = NamedImports | NamedExports;
+    export interface ImportSpecifier extends NamedDeclaration {
         kind: SyntaxKind.ImportSpecifier;
         parent: NamedImports;
         propertyName?: Identifier;
         name: Identifier;
     }
-    interface ExportSpecifier extends NamedDeclaration {
+    export interface ExportSpecifier extends NamedDeclaration {
         kind: SyntaxKind.ExportSpecifier;
         parent: NamedExports;
         propertyName?: Identifier;
         name: Identifier;
     }
-    type ImportOrExportSpecifier = ImportSpecifier | ExportSpecifier;
+    export type ImportOrExportSpecifier = ImportSpecifier | ExportSpecifier;
     /**
      * This is either an `export =` or an `export default` declaration.
      * Unless `isExportEquals` is set, this node was parsed as an `export default`.
      */
-    interface ExportAssignment extends DeclarationStatement {
+    export interface ExportAssignment extends DeclarationStatement {
         kind: SyntaxKind.ExportAssignment;
         parent: SourceFile;
         isExportEquals?: boolean;
         expression: Expression;
     }
-    interface FileReference extends TextRange {
+    export interface FileReference extends TextRange {
         fileName: string;
     }
-    interface CheckJsDirective extends TextRange {
+    export interface CheckJsDirective extends TextRange {
         enabled: boolean;
     }
-    type CommentKind = SyntaxKind.SingleLineCommentTrivia | SyntaxKind.MultiLineCommentTrivia;
-    interface CommentRange extends TextRange {
+    export type CommentKind = SyntaxKind.SingleLineCommentTrivia | SyntaxKind.MultiLineCommentTrivia;
+    export interface CommentRange extends TextRange {
         hasTrailingNewLine?: boolean;
         kind: CommentKind;
     }
-    interface SynthesizedComment extends CommentRange {
+    export interface SynthesizedComment extends CommentRange {
         text: string;
         pos: -1;
         end: -1;
     }
-    interface JSDocTypeExpression extends TypeNode {
+    export interface JSDocTypeExpression extends TypeNode {
         kind: SyntaxKind.JSDocTypeExpression;
         type: TypeNode;
     }
-    interface JSDocType extends TypeNode {
+    export interface JSDocType extends TypeNode {
         _jsDocTypeBrand: any;
     }
-    interface JSDocAllType extends JSDocType {
+    export interface JSDocAllType extends JSDocType {
         kind: SyntaxKind.JSDocAllType;
     }
-    interface JSDocUnknownType extends JSDocType {
+    export interface JSDocUnknownType extends JSDocType {
         kind: SyntaxKind.JSDocUnknownType;
     }
-    interface JSDocNonNullableType extends JSDocType {
+    export interface JSDocNonNullableType extends JSDocType {
         kind: SyntaxKind.JSDocNonNullableType;
         type: TypeNode;
     }
-    interface JSDocNullableType extends JSDocType {
+    export interface JSDocNullableType extends JSDocType {
         kind: SyntaxKind.JSDocNullableType;
         type: TypeNode;
     }
-    interface JSDocOptionalType extends JSDocType {
+    export interface JSDocOptionalType extends JSDocType {
         kind: SyntaxKind.JSDocOptionalType;
         type: TypeNode;
     }
-    interface JSDocFunctionType extends JSDocType, SignatureDeclarationBase {
+    export interface JSDocFunctionType extends JSDocType, SignatureDeclarationBase {
         kind: SyntaxKind.JSDocFunctionType;
     }
-    interface JSDocVariadicType extends JSDocType {
+    export interface JSDocVariadicType extends JSDocType {
         kind: SyntaxKind.JSDocVariadicType;
         type: TypeNode;
     }
-    type JSDocTypeReferencingNode = JSDocVariadicType | JSDocOptionalType | JSDocNullableType | JSDocNonNullableType;
-    interface JSDoc extends Node {
+    export type JSDocTypeReferencingNode = JSDocVariadicType | JSDocOptionalType | JSDocNullableType | JSDocNonNullableType;
+    export interface JSDoc extends Node {
         kind: SyntaxKind.JSDocComment;
         parent: HasJSDoc;
         tags?: NodeArray<JSDocTag>;
         comment?: string;
     }
-    interface JSDocTag extends Node {
+    export interface JSDocTag extends Node {
         parent: JSDoc | JSDocTypeLiteral;
         tagName: Identifier;
         comment?: string;
     }
-    interface JSDocUnknownTag extends JSDocTag {
+    export interface JSDocUnknownTag extends JSDocTag {
         kind: SyntaxKind.JSDocTag;
     }
     /**
      * Note that `@extends` is a synonym of `@augments`.
      * Both tags are represented by this interface.
      */
-    interface JSDocAugmentsTag extends JSDocTag {
+    export interface JSDocAugmentsTag extends JSDocTag {
         kind: SyntaxKind.JSDocAugmentsTag;
         class: ExpressionWithTypeArguments & {
             expression: Identifier | PropertyAccessEntityNameExpression;
         };
     }
-    interface JSDocAuthorTag extends JSDocTag {
+    export interface JSDocAuthorTag extends JSDocTag {
         kind: SyntaxKind.JSDocAuthorTag;
     }
-    interface JSDocClassTag extends JSDocTag {
+    export interface JSDocClassTag extends JSDocTag {
         kind: SyntaxKind.JSDocClassTag;
     }
-    interface JSDocEnumTag extends JSDocTag, Declaration {
+    export interface JSDocEnumTag extends JSDocTag, Declaration {
         parent: JSDoc;
         kind: SyntaxKind.JSDocEnumTag;
         typeExpression?: JSDocTypeExpression;
     }
-    interface JSDocThisTag extends JSDocTag {
+    export interface JSDocThisTag extends JSDocTag {
         kind: SyntaxKind.JSDocThisTag;
         typeExpression?: JSDocTypeExpression;
     }
-    interface JSDocTemplateTag extends JSDocTag {
+    export interface JSDocTemplateTag extends JSDocTag {
         kind: SyntaxKind.JSDocTemplateTag;
         constraint: JSDocTypeExpression | undefined;
         typeParameters: NodeArray<TypeParameterDeclaration>;
     }
-    interface JSDocReturnTag extends JSDocTag {
+    export interface JSDocReturnTag extends JSDocTag {
         kind: SyntaxKind.JSDocReturnTag;
         typeExpression?: JSDocTypeExpression;
     }
-    interface JSDocTypeTag extends JSDocTag {
+    export interface JSDocTypeTag extends JSDocTag {
         kind: SyntaxKind.JSDocTypeTag;
         typeExpression: JSDocTypeExpression;
     }
-    interface JSDocTypedefTag extends JSDocTag, NamedDeclaration {
+    export interface JSDocTypedefTag extends JSDocTag, NamedDeclaration {
         parent: JSDoc;
         kind: SyntaxKind.JSDocTypedefTag;
         fullName?: JSDocNamespaceDeclaration | Identifier;
         name?: Identifier;
         typeExpression?: JSDocTypeExpression | JSDocTypeLiteral;
     }
-    interface JSDocCallbackTag extends JSDocTag, NamedDeclaration {
+    export interface JSDocCallbackTag extends JSDocTag, NamedDeclaration {
         parent: JSDoc;
         kind: SyntaxKind.JSDocCallbackTag;
         fullName?: JSDocNamespaceDeclaration | Identifier;
         name?: Identifier;
         typeExpression: JSDocSignature;
     }
-    interface JSDocSignature extends JSDocType, Declaration {
+    export interface JSDocSignature extends JSDocType, Declaration {
         kind: SyntaxKind.JSDocSignature;
         typeParameters?: ReadonlyArray<JSDocTemplateTag>;
         parameters: ReadonlyArray<JSDocParameterTag>;
         type: JSDocReturnTag | undefined;
     }
-    interface JSDocPropertyLikeTag extends JSDocTag, Declaration {
+    export interface JSDocPropertyLikeTag extends JSDocTag, Declaration {
         parent: JSDoc;
         name: EntityName;
         typeExpression?: JSDocTypeExpression;
@@ -1639,19 +1639,19 @@ declare namespace ts {
         isNameFirst: boolean;
         isBracketed: boolean;
     }
-    interface JSDocPropertyTag extends JSDocPropertyLikeTag {
+    export interface JSDocPropertyTag extends JSDocPropertyLikeTag {
         kind: SyntaxKind.JSDocPropertyTag;
     }
-    interface JSDocParameterTag extends JSDocPropertyLikeTag {
+    export interface JSDocParameterTag extends JSDocPropertyLikeTag {
         kind: SyntaxKind.JSDocParameterTag;
     }
-    interface JSDocTypeLiteral extends JSDocType {
+    export interface JSDocTypeLiteral extends JSDocType {
         kind: SyntaxKind.JSDocTypeLiteral;
         jsDocPropertyTags?: ReadonlyArray<JSDocPropertyLikeTag>;
         /** If true, then this type literal represents an *array* of its type. */
         isArrayType?: boolean;
     }
-    enum FlowFlags {
+    export enum FlowFlags {
         Unreachable = 1,
         Start = 2,
         BranchLabel = 4,
@@ -1668,55 +1668,55 @@ declare namespace ts {
         Label = 12,
         Condition = 96
     }
-    interface FlowLock {
+    export interface FlowLock {
         locked?: boolean;
     }
-    interface AfterFinallyFlow extends FlowNodeBase, FlowLock {
+    export interface AfterFinallyFlow extends FlowNodeBase, FlowLock {
         antecedent: FlowNode;
     }
-    interface PreFinallyFlow extends FlowNodeBase {
+    export interface PreFinallyFlow extends FlowNodeBase {
         antecedent: FlowNode;
         lock: FlowLock;
     }
-    type FlowNode = AfterFinallyFlow | PreFinallyFlow | FlowStart | FlowLabel | FlowAssignment | FlowCondition | FlowSwitchClause | FlowArrayMutation;
-    interface FlowNodeBase {
+    export type FlowNode = AfterFinallyFlow | PreFinallyFlow | FlowStart | FlowLabel | FlowAssignment | FlowCondition | FlowSwitchClause | FlowArrayMutation;
+    export interface FlowNodeBase {
         flags: FlowFlags;
         id?: number;
     }
-    interface FlowStart extends FlowNodeBase {
+    export interface FlowStart extends FlowNodeBase {
         container?: FunctionExpression | ArrowFunction | MethodDeclaration;
     }
-    interface FlowLabel extends FlowNodeBase {
+    export interface FlowLabel extends FlowNodeBase {
         antecedents: FlowNode[] | undefined;
     }
-    interface FlowAssignment extends FlowNodeBase {
+    export interface FlowAssignment extends FlowNodeBase {
         node: Expression | VariableDeclaration | BindingElement;
         antecedent: FlowNode;
     }
-    interface FlowCondition extends FlowNodeBase {
+    export interface FlowCondition extends FlowNodeBase {
         expression: Expression;
         antecedent: FlowNode;
     }
-    interface FlowSwitchClause extends FlowNodeBase {
+    export interface FlowSwitchClause extends FlowNodeBase {
         switchStatement: SwitchStatement;
         clauseStart: number;
         clauseEnd: number;
         antecedent: FlowNode;
     }
-    interface FlowArrayMutation extends FlowNodeBase {
+    export interface FlowArrayMutation extends FlowNodeBase {
         node: CallExpression | BinaryExpression;
         antecedent: FlowNode;
     }
-    type FlowType = Type | IncompleteType;
-    interface IncompleteType {
+    export type FlowType = Type | IncompleteType;
+    export interface IncompleteType {
         flags: TypeFlags;
         type: Type;
     }
-    interface AmdDependency {
+    export interface AmdDependency {
         path: string;
         name?: string;
     }
-    interface SourceFile extends Declaration {
+    export interface SourceFile extends Declaration {
         kind: SyntaxKind.SourceFile;
         statements: NodeArray<Statement>;
         endOfFileToken: Token<SyntaxKind.EndOfFileToken>;
@@ -1740,12 +1740,12 @@ declare namespace ts {
         hasNoDefaultLib: boolean;
         languageVersion: ScriptTarget;
     }
-    interface Bundle extends Node {
+    export interface Bundle extends Node {
         kind: SyntaxKind.Bundle;
         prepends: ReadonlyArray<InputFiles | UnparsedSource>;
         sourceFiles: ReadonlyArray<SourceFile>;
     }
-    interface InputFiles extends Node {
+    export interface InputFiles extends Node {
         kind: SyntaxKind.InputFiles;
         javascriptPath?: string;
         javascriptText: string;
@@ -1756,7 +1756,7 @@ declare namespace ts {
         declarationMapPath?: string;
         declarationMapText?: string;
     }
-    interface UnparsedSource extends Node {
+    export interface UnparsedSource extends Node {
         kind: SyntaxKind.UnparsedSource;
         fileName: string;
         text: string;
@@ -1771,53 +1771,53 @@ declare namespace ts {
         syntheticReferences?: ReadonlyArray<UnparsedSyntheticReference>;
         texts: ReadonlyArray<UnparsedSourceText>;
     }
-    type UnparsedSourceText = UnparsedPrepend | UnparsedTextLike;
-    type UnparsedNode = UnparsedPrologue | UnparsedSourceText | UnparsedSyntheticReference;
-    interface UnparsedSection extends Node {
+    export type UnparsedSourceText = UnparsedPrepend | UnparsedTextLike;
+    export type UnparsedNode = UnparsedPrologue | UnparsedSourceText | UnparsedSyntheticReference;
+    export interface UnparsedSection extends Node {
         kind: SyntaxKind;
         data?: string;
         parent: UnparsedSource;
     }
-    interface UnparsedPrologue extends UnparsedSection {
+    export interface UnparsedPrologue extends UnparsedSection {
         kind: SyntaxKind.UnparsedPrologue;
         data: string;
         parent: UnparsedSource;
     }
-    interface UnparsedPrepend extends UnparsedSection {
+    export interface UnparsedPrepend extends UnparsedSection {
         kind: SyntaxKind.UnparsedPrepend;
         data: string;
         parent: UnparsedSource;
         texts: ReadonlyArray<UnparsedTextLike>;
     }
-    interface UnparsedTextLike extends UnparsedSection {
+    export interface UnparsedTextLike extends UnparsedSection {
         kind: SyntaxKind.UnparsedText | SyntaxKind.UnparsedInternalText;
         parent: UnparsedSource;
     }
-    interface UnparsedSyntheticReference extends UnparsedSection {
+    export interface UnparsedSyntheticReference extends UnparsedSection {
         kind: SyntaxKind.UnparsedSyntheticReference;
         parent: UnparsedSource;
     }
-    interface JsonSourceFile extends SourceFile {
+    export interface JsonSourceFile extends SourceFile {
         statements: NodeArray<JsonObjectExpressionStatement>;
     }
-    interface TsConfigSourceFile extends JsonSourceFile {
+    export interface TsConfigSourceFile extends JsonSourceFile {
         extendedSourceFiles?: string[];
     }
-    interface JsonMinusNumericLiteral extends PrefixUnaryExpression {
+    export interface JsonMinusNumericLiteral extends PrefixUnaryExpression {
         kind: SyntaxKind.PrefixUnaryExpression;
         operator: SyntaxKind.MinusToken;
         operand: NumericLiteral;
     }
-    interface JsonObjectExpressionStatement extends ExpressionStatement {
+    export interface JsonObjectExpressionStatement extends ExpressionStatement {
         expression: ObjectLiteralExpression | ArrayLiteralExpression | JsonMinusNumericLiteral | NumericLiteral | StringLiteral | BooleanLiteral | NullLiteral;
     }
-    interface ScriptReferenceHost {
+    export interface ScriptReferenceHost {
         getCompilerOptions(): CompilerOptions;
         getSourceFile(fileName: string): SourceFile | undefined;
         getSourceFileByPath(path: Path): SourceFile | undefined;
         getCurrentDirectory(): string;
     }
-    interface ParseConfigHost {
+    export interface ParseConfigHost {
         useCaseSensitiveFileNames: boolean;
         readDirectory(rootDir: string, extensions: ReadonlyArray<string>, excludes: ReadonlyArray<string> | undefined, includes: ReadonlyArray<string>, depth?: number): ReadonlyArray<string>;
         /**
@@ -1833,18 +1833,18 @@ declare namespace ts {
      * specified like "./blah" to an absolute path to an actual
      * tsconfig file, e.g. "/root/blah/tsconfig.json"
      */
-    type ResolvedConfigFileName = string & {
+    export type ResolvedConfigFileName = string & {
         _isResolvedConfigFileName: never;
     };
-    type WriteFileCallback = (fileName: string, data: string, writeByteOrderMark: boolean, onError?: (message: string) => void, sourceFiles?: ReadonlyArray<SourceFile>) => void;
-    class OperationCanceledException {
+    export type WriteFileCallback = (fileName: string, data: string, writeByteOrderMark: boolean, onError?: (message: string) => void, sourceFiles?: ReadonlyArray<SourceFile>) => void;
+    export class OperationCanceledException {
     }
-    interface CancellationToken {
+    export interface CancellationToken {
         isCancellationRequested(): boolean;
         /** @throws OperationCanceledException if isCancellationRequested is true */
         throwIfCancellationRequested(): void;
     }
-    interface Program extends ScriptReferenceHost {
+    export interface Program extends ScriptReferenceHost {
         /**
          * Get a list of root file names that were passed to a 'createProgram'
          */
@@ -1880,17 +1880,17 @@ declare namespace ts {
         getProjectReferences(): ReadonlyArray<ProjectReference> | undefined;
         getResolvedProjectReferences(): ReadonlyArray<ResolvedProjectReference | undefined> | undefined;
     }
-    interface ResolvedProjectReference {
+    export interface ResolvedProjectReference {
         commandLine: ParsedCommandLine;
         sourceFile: SourceFile;
         references?: ReadonlyArray<ResolvedProjectReference | undefined>;
     }
-    type CustomTransformerFactory = (context: TransformationContext) => CustomTransformer;
-    interface CustomTransformer {
+    export type CustomTransformerFactory = (context: TransformationContext) => CustomTransformer;
+    export interface CustomTransformer {
         transformSourceFile(node: SourceFile): SourceFile;
         transformBundle(node: Bundle): Bundle;
     }
-    interface CustomTransformers {
+    export interface CustomTransformers {
         /** Custom transformers to evaluate before built-in .js transformations. */
         before?: (TransformerFactory<SourceFile> | CustomTransformerFactory)[];
         /** Custom transformers to evaluate after built-in .js transformations. */
@@ -1898,7 +1898,7 @@ declare namespace ts {
         /** Custom transformers to evaluate after built-in .d.ts transformations. */
         afterDeclarations?: (TransformerFactory<Bundle | SourceFile> | CustomTransformerFactory)[];
     }
-    interface SourceMapSpan {
+    export interface SourceMapSpan {
         /** Line number in the .js file. */
         emittedLine: number;
         /** Column number in the .js file. */
@@ -1913,19 +1913,19 @@ declare namespace ts {
         sourceIndex: number;
     }
     /** Return code used by getEmitOutput function to indicate status of the function */
-    enum ExitStatus {
+    export enum ExitStatus {
         Success = 0,
         DiagnosticsPresent_OutputsSkipped = 1,
         DiagnosticsPresent_OutputsGenerated = 2,
         InvalidProject_OutputsSkipped = 3
     }
-    interface EmitResult {
+    export interface EmitResult {
         emitSkipped: boolean;
         /** Contains declaration emit diagnostics */
         diagnostics: ReadonlyArray<Diagnostic>;
         emittedFiles?: string[];
     }
-    interface TypeChecker {
+    export interface TypeChecker {
         getTypeOfSymbolAtLocation(symbol: Symbol, node: Node): Type;
         getDeclaredTypeOfSymbol(symbol: Symbol): Type;
         getPropertiesOfType(type: Type): Symbol[];
@@ -2017,7 +2017,7 @@ declare namespace ts {
          */
         runWithCancellationToken<T>(token: CancellationToken, cb: (checker: TypeChecker) => T): T;
     }
-    enum NodeBuilderFlags {
+    export enum NodeBuilderFlags {
         None = 0,
         NoTruncation = 1,
         WriteArrayAsGenericType = 2,
@@ -2048,7 +2048,7 @@ declare namespace ts {
         InInitialEntityName = 16777216,
         InReverseMappedType = 33554432
     }
-    enum TypeFormatFlags {
+    export enum TypeFormatFlags {
         None = 0,
         NoTruncation = 1,
         WriteArrayAsGenericType = 2,
@@ -2071,31 +2071,31 @@ declare namespace ts {
         /** @deprecated */ WriteOwnNameForAnyLike = 0,
         NodeBuilderFlagsMask = 9469291
     }
-    enum SymbolFormatFlags {
+    export enum SymbolFormatFlags {
         None = 0,
         WriteTypeParametersOrArguments = 1,
         UseOnlyExternalAliasing = 2,
         AllowAnyNodeKind = 4,
         UseAliasDefinedOutsideCurrentScope = 8,
     }
-    enum TypePredicateKind {
+    export enum TypePredicateKind {
         This = 0,
         Identifier = 1
     }
-    interface TypePredicateBase {
+    export interface TypePredicateBase {
         kind: TypePredicateKind;
         type: Type;
     }
-    interface ThisTypePredicate extends TypePredicateBase {
+    export interface ThisTypePredicate extends TypePredicateBase {
         kind: TypePredicateKind.This;
     }
-    interface IdentifierTypePredicate extends TypePredicateBase {
+    export interface IdentifierTypePredicate extends TypePredicateBase {
         kind: TypePredicateKind.Identifier;
         parameterName: string;
         parameterIndex: number;
     }
-    type TypePredicate = IdentifierTypePredicate | ThisTypePredicate;
-    enum SymbolFlags {
+    export type TypePredicate = IdentifierTypePredicate | ThisTypePredicate;
+    export enum SymbolFlags {
         None = 0,
         FunctionScopedVariable = 1,
         BlockScopedVariable = 2,
@@ -2156,7 +2156,7 @@ declare namespace ts {
         PropertyOrAccessor = 98308,
         ClassMember = 106500,
     }
-    interface Symbol {
+    export interface Symbol {
         flags: SymbolFlags;
         escapedName: __String;
         declarations: Declaration[];
@@ -2165,7 +2165,7 @@ declare namespace ts {
         exports?: SymbolTable;
         globalExports?: SymbolTable;
     }
-    enum InternalSymbolName {
+    export enum InternalSymbolName {
         Call = "__call",
         Constructor = "__constructor",
         New = "__new",
@@ -2192,13 +2192,13 @@ declare namespace ts {
      * with a normal string (which is good, it cannot be misused on assignment or on usage),
      * while still being comparable with a normal string via === (also good) and castable from a string.
      */
-    type __String = (string & {
+    export type __String = (string & {
         __escapedIdentifier: void;
     }) | (void & {
         __escapedIdentifier: void;
     }) | InternalSymbolName;
     /** ReadonlyMap where keys are `__String`s. */
-    interface ReadonlyUnderscoreEscapedMap<T> {
+    export interface ReadonlyUnderscoreEscapedMap<T> {
         get(key: __String): T | undefined;
         has(key: __String): boolean;
         forEach(action: (value: T, key: __String) => void): void;
@@ -2208,14 +2208,14 @@ declare namespace ts {
         entries(): Iterator<[__String, T]>;
     }
     /** Map where keys are `__String`s. */
-    interface UnderscoreEscapedMap<T> extends ReadonlyUnderscoreEscapedMap<T> {
+    export interface UnderscoreEscapedMap<T> extends ReadonlyUnderscoreEscapedMap<T> {
         set(key: __String, value: T): this;
         delete(key: __String): boolean;
         clear(): void;
     }
     /** SymbolTable based on ES6 Map interface. */
-    type SymbolTable = UnderscoreEscapedMap<Symbol>;
-    enum TypeFlags {
+    export type SymbolTable = UnderscoreEscapedMap<Symbol>;
+    export enum TypeFlags {
         Any = 1,
         Unknown = 2,
         String = 4,
@@ -2264,35 +2264,35 @@ declare namespace ts {
         Narrowable = 133970943,
         NotUnionOrUnit = 67637251,
     }
-    type DestructuringPattern = BindingPattern | ObjectLiteralExpression | ArrayLiteralExpression;
-    interface Type {
+    export type DestructuringPattern = BindingPattern | ObjectLiteralExpression | ArrayLiteralExpression;
+    export interface Type {
         flags: TypeFlags;
         symbol: Symbol;
         pattern?: DestructuringPattern;
         aliasSymbol?: Symbol;
         aliasTypeArguments?: ReadonlyArray<Type>;
     }
-    interface LiteralType extends Type {
+    export interface LiteralType extends Type {
         value: string | number | PseudoBigInt;
         freshType: LiteralType;
         regularType: LiteralType;
     }
-    interface UniqueESSymbolType extends Type {
+    export interface UniqueESSymbolType extends Type {
         symbol: Symbol;
         escapedName: __String;
     }
-    interface StringLiteralType extends LiteralType {
+    export interface StringLiteralType extends LiteralType {
         value: string;
     }
-    interface NumberLiteralType extends LiteralType {
+    export interface NumberLiteralType extends LiteralType {
         value: number;
     }
-    interface BigIntLiteralType extends LiteralType {
+    export interface BigIntLiteralType extends LiteralType {
         value: PseudoBigInt;
     }
-    interface EnumType extends Type {
+    export interface EnumType extends Type {
     }
-    enum ObjectFlags {
+    export enum ObjectFlags {
         Class = 1,
         Interface = 2,
         Reference = 4,
@@ -2312,18 +2312,18 @@ declare namespace ts {
         ArrayLiteral = 65536,
         ClassOrInterface = 3,
     }
-    interface ObjectType extends Type {
+    export interface ObjectType extends Type {
         objectFlags: ObjectFlags;
     }
     /** Class and interface types (ObjectFlags.Class and ObjectFlags.Interface). */
-    interface InterfaceType extends ObjectType {
+    export interface InterfaceType extends ObjectType {
         typeParameters: TypeParameter[] | undefined;
         outerTypeParameters: TypeParameter[] | undefined;
         localTypeParameters: TypeParameter[] | undefined;
         thisType: TypeParameter | undefined;
     }
-    type BaseType = ObjectType | IntersectionType;
-    interface InterfaceTypeWithDeclaredMembers extends InterfaceType {
+    export type BaseType = ObjectType | IntersectionType;
+    export interface InterfaceTypeWithDeclaredMembers extends InterfaceType {
         declaredProperties: Symbol[];
         declaredCallSignatures: Signature[];
         declaredConstructSignatures: Signature[];
@@ -2340,49 +2340,49 @@ declare namespace ts {
      * if the class or interface has no type parameters and the reference isn't specifying an
      * explicit "this" argument.
      */
-    interface TypeReference extends ObjectType {
+    export interface TypeReference extends ObjectType {
         target: GenericType;
         typeArguments?: ReadonlyArray<Type>;
     }
-    interface GenericType extends InterfaceType, TypeReference {
+    export interface GenericType extends InterfaceType, TypeReference {
     }
-    interface TupleType extends GenericType {
+    export interface TupleType extends GenericType {
         minLength: number;
         hasRestElement: boolean;
         readonly: boolean;
         associatedNames?: __String[];
     }
-    interface TupleTypeReference extends TypeReference {
+    export interface TupleTypeReference extends TypeReference {
         target: TupleType;
     }
-    interface UnionOrIntersectionType extends Type {
+    export interface UnionOrIntersectionType extends Type {
         types: Type[];
     }
-    interface UnionType extends UnionOrIntersectionType {
+    export interface UnionType extends UnionOrIntersectionType {
     }
-    interface IntersectionType extends UnionOrIntersectionType {
+    export interface IntersectionType extends UnionOrIntersectionType {
     }
-    type StructuredType = ObjectType | UnionType | IntersectionType;
-    interface EvolvingArrayType extends ObjectType {
+    export type StructuredType = ObjectType | UnionType | IntersectionType;
+    export interface EvolvingArrayType extends ObjectType {
         elementType: Type;
         finalArrayType?: Type;
     }
-    interface InstantiableType extends Type {
+    export interface InstantiableType extends Type {
     }
-    interface TypeParameter extends InstantiableType {
+    export interface TypeParameter extends InstantiableType {
     }
-    interface IndexedAccessType extends InstantiableType {
+    export interface IndexedAccessType extends InstantiableType {
         objectType: Type;
         indexType: Type;
         constraint?: Type;
         simplifiedForReading?: Type;
         simplifiedForWriting?: Type;
     }
-    type TypeVariable = TypeParameter | IndexedAccessType;
-    interface IndexType extends InstantiableType {
+    export type TypeVariable = TypeParameter | IndexedAccessType;
+    export interface IndexType extends InstantiableType {
         type: InstantiableType | UnionOrIntersectionType;
     }
-    interface ConditionalRoot {
+    export interface ConditionalRoot {
         node: ConditionalTypeNode;
         checkType: Type;
         extendsType: Type;
@@ -2395,36 +2395,36 @@ declare namespace ts {
         aliasSymbol?: Symbol;
         aliasTypeArguments?: Type[];
     }
-    interface ConditionalType extends InstantiableType {
+    export interface ConditionalType extends InstantiableType {
         root: ConditionalRoot;
         checkType: Type;
         extendsType: Type;
         resolvedTrueType: Type;
         resolvedFalseType: Type;
     }
-    interface SubstitutionType extends InstantiableType {
+    export interface SubstitutionType extends InstantiableType {
         typeVariable: TypeVariable;
         substitute: Type;
     }
-    enum SignatureKind {
+    export enum SignatureKind {
         Call = 0,
         Construct = 1
     }
-    interface Signature {
+    export interface Signature {
         declaration?: SignatureDeclaration | JSDocSignature;
         typeParameters?: ReadonlyArray<TypeParameter>;
         parameters: ReadonlyArray<Symbol>;
     }
-    enum IndexKind {
+    export enum IndexKind {
         String = 0,
         Number = 1
     }
-    interface IndexInfo {
+    export interface IndexInfo {
         type: Type;
         isReadonly: boolean;
         declaration?: IndexSignatureDeclaration;
     }
-    enum InferencePriority {
+    export enum InferencePriority {
         NakedTypeVariable = 1,
         HomomorphicMappedType = 2,
         PartialHomomorphicMappedType = 4,
@@ -2436,13 +2436,13 @@ declare namespace ts {
         PriorityImpliesCombination = 56
     }
     /** @deprecated Use FileExtensionInfo instead. */
-    type JsFileExtensionInfo = FileExtensionInfo;
-    interface FileExtensionInfo {
+    export type JsFileExtensionInfo = FileExtensionInfo;
+    export interface FileExtensionInfo {
         extension: string;
         isMixedContent: boolean;
         scriptKind?: ScriptKind;
     }
-    interface DiagnosticMessage {
+    export interface DiagnosticMessage {
         key: string;
         category: DiagnosticCategory;
         code: number;
@@ -2455,19 +2455,19 @@ declare namespace ts {
      * While it seems that DiagnosticMessageChain is structurally similar to DiagnosticMessage,
      * the difference is that messages are all preformatted in DMC.
      */
-    interface DiagnosticMessageChain {
+    export interface DiagnosticMessageChain {
         messageText: string;
         category: DiagnosticCategory;
         code: number;
         next?: DiagnosticMessageChain[];
     }
-    interface Diagnostic extends DiagnosticRelatedInformation {
+    export interface Diagnostic extends DiagnosticRelatedInformation {
         /** May store more in future. For now, this will simply be `true` to indicate when a diagnostic is an unused-identifier diagnostic. */
         reportsUnnecessary?: {};
         source?: string;
         relatedInformation?: DiagnosticRelatedInformation[];
     }
-    interface DiagnosticRelatedInformation {
+    export interface DiagnosticRelatedInformation {
         category: DiagnosticCategory;
         code: number;
         file: SourceFile | undefined;
@@ -2475,25 +2475,25 @@ declare namespace ts {
         length: number | undefined;
         messageText: string | DiagnosticMessageChain;
     }
-    interface DiagnosticWithLocation extends Diagnostic {
+    export interface DiagnosticWithLocation extends Diagnostic {
         file: SourceFile;
         start: number;
         length: number;
     }
-    enum DiagnosticCategory {
+    export enum DiagnosticCategory {
         Warning = 0,
         Error = 1,
         Suggestion = 2,
         Message = 3
     }
-    enum ModuleResolutionKind {
+    export enum ModuleResolutionKind {
         Classic = 1,
         NodeJs = 2
     }
-    interface PluginImport {
+    export interface PluginImport {
         name: string;
     }
-    interface ProjectReference {
+    export interface ProjectReference {
         /** A normalized path on disk */
         path: string;
         /** The path as the user originally wrote it */
@@ -2503,8 +2503,8 @@ declare namespace ts {
         /** True if it is intended that this reference form a circularity */
         circular?: boolean;
     }
-    type CompilerOptionsValue = string | number | boolean | (string | number)[] | string[] | MapLike<string[]> | PluginImport[] | ProjectReference[] | null | undefined;
-    interface CompilerOptions {
+    export type CompilerOptionsValue = string | number | boolean | (string | number)[] | string[] | MapLike<string[]> | PluginImport[] | ProjectReference[] | null | undefined;
+    export interface CompilerOptions {
         allowJs?: boolean;
         allowSyntheticDefaultImports?: boolean;
         allowUmdGlobalAccess?: boolean;
@@ -2587,14 +2587,14 @@ declare namespace ts {
         esModuleInterop?: boolean;
         [option: string]: CompilerOptionsValue | TsConfigSourceFile | undefined;
     }
-    interface TypeAcquisition {
+    export interface TypeAcquisition {
         enableAutoDiscovery?: boolean;
         enable?: boolean;
         include?: string[];
         exclude?: string[];
         [option: string]: string[] | boolean | undefined;
     }
-    enum ModuleKind {
+    export enum ModuleKind {
         None = 0,
         CommonJS = 1,
         AMD = 2,
@@ -2603,22 +2603,22 @@ declare namespace ts {
         ES2015 = 5,
         ESNext = 99
     }
-    enum JsxEmit {
+    export enum JsxEmit {
         None = 0,
         Preserve = 1,
         React = 2,
         ReactNative = 3
     }
-    enum NewLineKind {
+    export enum NewLineKind {
         CarriageReturnLineFeed = 0,
         LineFeed = 1
     }
-    interface LineAndCharacter {
+    export interface LineAndCharacter {
         /** 0-based. */
         line: number;
         character: number;
     }
-    enum ScriptKind {
+    export enum ScriptKind {
         Unknown = 0,
         JS = 1,
         JSX = 2,
@@ -2632,7 +2632,7 @@ declare namespace ts {
          */
         Deferred = 7
     }
-    enum ScriptTarget {
+    export enum ScriptTarget {
         ES3 = 0,
         ES5 = 1,
         ES2015 = 2,
@@ -2645,12 +2645,12 @@ declare namespace ts {
         JSON = 100,
         Latest = 99
     }
-    enum LanguageVariant {
+    export enum LanguageVariant {
         Standard = 0,
         JSX = 1
     }
     /** Either a parsed command line or a parsed tsconfig.json */
-    interface ParsedCommandLine {
+    export interface ParsedCommandLine {
         options: CompilerOptions;
         typeAcquisition?: TypeAcquisition;
         fileNames: string[];
@@ -2660,15 +2660,15 @@ declare namespace ts {
         wildcardDirectories?: MapLike<WatchDirectoryFlags>;
         compileOnSave?: boolean;
     }
-    enum WatchDirectoryFlags {
+    export enum WatchDirectoryFlags {
         None = 0,
         Recursive = 1
     }
-    interface ExpandResult {
+    export interface ExpandResult {
         fileNames: string[];
         wildcardDirectories: MapLike<WatchDirectoryFlags>;
     }
-    interface CreateProgramOptions {
+    export interface CreateProgramOptions {
         rootNames: ReadonlyArray<string>;
         options: CompilerOptions;
         projectReferences?: ReadonlyArray<ProjectReference>;
@@ -2676,7 +2676,7 @@ declare namespace ts {
         oldProgram?: Program;
         configFileParsingDiagnostics?: ReadonlyArray<Diagnostic>;
     }
-    interface ModuleResolutionHost {
+    export interface ModuleResolutionHost {
         fileExists(fileName: string): boolean;
         readFile(fileName: string): string | undefined;
         trace?(s: string): void;
@@ -2696,7 +2696,7 @@ declare namespace ts {
      *
      * Prefer to return a `ResolvedModuleFull` so that the file type does not have to be inferred.
      */
-    interface ResolvedModule {
+    export interface ResolvedModule {
         /** Path of the file the module was resolved to. */
         resolvedFileName: string;
         /** True if `resolvedFileName` comes from `node_modules`. */
@@ -2707,7 +2707,7 @@ declare namespace ts {
      * Prefer this over `ResolvedModule`.
      * If changing this, remember to change `moduleResolutionIsEqualTo`.
      */
-    interface ResolvedModuleFull extends ResolvedModule {
+    export interface ResolvedModuleFull extends ResolvedModule {
         /**
          * Extension of resolvedFileName. This must match what's at the end of resolvedFileName.
          * This is optional for backwards-compatibility, but will be added if not provided.
@@ -2719,7 +2719,7 @@ declare namespace ts {
      * Unique identifier with a package name and version.
      * If changing this, remember to change `packageIdIsEqual`.
      */
-    interface PackageId {
+    export interface PackageId {
         /**
          * Name of the package.
          * Should not include `@types`.
@@ -2734,7 +2734,7 @@ declare namespace ts {
         /** Version of the package, e.g. "1.2.3" */
         version: string;
     }
-    enum Extension {
+    export enum Extension {
         Ts = ".ts",
         Tsx = ".tsx",
         Dts = ".d.ts",
@@ -2743,21 +2743,21 @@ declare namespace ts {
         Json = ".json",
         TsBuildInfo = ".tsbuildinfo"
     }
-    interface ResolvedModuleWithFailedLookupLocations {
+    export interface ResolvedModuleWithFailedLookupLocations {
         readonly resolvedModule: ResolvedModuleFull | undefined;
     }
-    interface ResolvedTypeReferenceDirective {
+    export interface ResolvedTypeReferenceDirective {
         primary: boolean;
         resolvedFileName: string | undefined;
         packageId?: PackageId;
         /** True if `resolvedFileName` comes from `node_modules`. */
         isExternalLibraryImport?: boolean;
     }
-    interface ResolvedTypeReferenceDirectiveWithFailedLookupLocations {
+    export interface ResolvedTypeReferenceDirectiveWithFailedLookupLocations {
         readonly resolvedTypeReferenceDirective: ResolvedTypeReferenceDirective | undefined;
         readonly failedLookupLocations: ReadonlyArray<string>;
     }
-    interface CompilerHost extends ModuleResolutionHost {
+    export interface CompilerHost extends ModuleResolutionHost {
         getSourceFile(fileName: string, languageVersion: ScriptTarget, onError?: (message: string) => void, shouldCreateNewSourceFile?: boolean): SourceFile | undefined;
         getSourceFileByPath?(fileName: string, path: Path, languageVersion: ScriptTarget, onError?: (message: string) => void, shouldCreateNewSourceFile?: boolean): SourceFile | undefined;
         getCancellationToken?(): CancellationToken;
@@ -2778,15 +2778,15 @@ declare namespace ts {
         createHash?(data: string): string;
         getParsedCommandLine?(fileName: string): ParsedCommandLine | undefined;
     }
-    interface SourceMapRange extends TextRange {
+    export interface SourceMapRange extends TextRange {
         source?: SourceMapSource;
     }
-    interface SourceMapSource {
+    export interface SourceMapSource {
         fileName: string;
         text: string;
         skipTrivia?: (pos: number) => number;
     }
-    enum EmitFlags {
+    export enum EmitFlags {
         None = 0,
         SingleLine = 1,
         AdviseOnEmitNode = 2,
@@ -2817,18 +2817,18 @@ declare namespace ts {
         Iterator = 8388608,
         NoAsciiEscaping = 16777216,
     }
-    interface EmitHelper {
+    export interface EmitHelper {
         readonly name: string;
         readonly scoped: boolean;
         readonly text: string | ((node: EmitHelperUniqueNameCallback) => string);
         readonly priority?: number;
     }
-    interface UnscopedEmitHelper extends EmitHelper {
+    export interface UnscopedEmitHelper extends EmitHelper {
         readonly scoped: false;
         readonly text: string;
     }
-    type EmitHelperUniqueNameCallback = (name: string) => string;
-    enum EmitHint {
+    export type EmitHelperUniqueNameCallback = (name: string) => string;
+    export enum EmitHint {
         SourceFile = 0,
         Expression = 1,
         IdentifierName = 2,
@@ -2836,7 +2836,7 @@ declare namespace ts {
         Unspecified = 4,
         EmbeddedStatement = 5
     }
-    interface TransformationContext {
+    export interface TransformationContext {
         /** Gets the compiler options supplied to the transformer. */
         getCompilerOptions(): CompilerOptions;
         /** Starts a new lexical environment. */
@@ -2886,7 +2886,7 @@ declare namespace ts {
          */
         onEmitNode: (hint: EmitHint, node: Node, emitCallback: (hint: EmitHint, node: Node) => void) => void;
     }
-    interface TransformationResult<T extends Node> {
+    export interface TransformationResult<T extends Node> {
         /** Gets the transformed source files. */
         transformed: T[];
         /** Gets diagnostics for the transformation. */
@@ -2915,17 +2915,17 @@ declare namespace ts {
      * A function that is used to initialize and return a `Transformer` callback, which in turn
      * will be used to transform one or more nodes.
      */
-    type TransformerFactory<T extends Node> = (context: TransformationContext) => Transformer<T>;
+    export type TransformerFactory<T extends Node> = (context: TransformationContext) => Transformer<T>;
     /**
      * A function that transforms a node.
      */
-    type Transformer<T extends Node> = (node: T) => T;
+    export type Transformer<T extends Node> = (node: T) => T;
     /**
      * A function that accepts and possibly transforms a node.
      */
-    type Visitor = (node: Node) => VisitResult<Node>;
-    type VisitResult<T extends Node> = T | T[] | undefined;
-    interface Printer {
+    export type Visitor = (node: Node) => VisitResult<Node>;
+    export type VisitResult<T extends Node> = T | T[] | undefined;
+    export interface Printer {
         /**
          * Print a node and its subtree as-is, without any emit transformations.
          * @param hint A value indicating the purpose of a node. This is primarily used to
@@ -2953,7 +2953,7 @@ declare namespace ts {
          */
         printBundle(bundle: Bundle): string;
     }
-    interface PrintHandlers {
+    export interface PrintHandlers {
         /**
          * A hook used by the Printer when generating unique names to avoid collisions with
          * globally defined names that exist outside of the current source file.
@@ -2996,28 +2996,28 @@ declare namespace ts {
          */
         substituteNode?(hint: EmitHint, node: Node): Node;
     }
-    interface PrinterOptions {
+    export interface PrinterOptions {
         removeComments?: boolean;
         newLine?: NewLineKind;
         omitTrailingSemicolon?: boolean;
         noEmitHelpers?: boolean;
     }
-    interface GetEffectiveTypeRootsHost {
+    export interface GetEffectiveTypeRootsHost {
         directoryExists?(directoryName: string): boolean;
         getCurrentDirectory?(): string;
     }
-    interface TextSpan {
+    export interface TextSpan {
         start: number;
         length: number;
     }
-    interface TextChangeRange {
+    export interface TextChangeRange {
         span: TextSpan;
         newLength: number;
     }
-    interface SyntaxList extends Node {
+    export interface SyntaxList extends Node {
         _children: Node[];
     }
-    enum ListFormat {
+    export enum ListFormat {
         None = 0,
         SingleLine = 0,
         MultiLine = 1,
@@ -3084,7 +3084,7 @@ declare namespace ts {
         IndexSignatureParameters = 8848,
         JSDocComment = 33
     }
-    interface UserPreferences {
+    export interface UserPreferences {
         readonly disableSuggestions?: boolean;
         readonly quotePreference?: "auto" | "double" | "single";
         readonly includeCompletionsForModuleExports?: boolean;
@@ -3096,22 +3096,23 @@ declare namespace ts {
         readonly providePrefixAndSuffixTextForRename?: boolean;
     }
     /** Represents a bigint literal value without requiring bigint support */
-    interface PseudoBigInt {
+    export interface PseudoBigInt {
         negative: boolean;
         base10Value: string;
     }
+    export {};
 }
 declare function setTimeout(handler: (...args: any[]) => void, timeout: number): any;
 declare function clearTimeout(handle: any): void;
 declare namespace ts {
-    enum FileWatcherEventKind {
+    export enum FileWatcherEventKind {
         Created = 0,
         Changed = 1,
         Deleted = 2
     }
-    type FileWatcherCallback = (fileName: string, eventKind: FileWatcherEventKind) => void;
-    type DirectoryWatcherCallback = (fileName: string) => void;
-    interface System {
+    export type FileWatcherCallback = (fileName: string, eventKind: FileWatcherEventKind) => void;
+    export type DirectoryWatcherCallback = (fileName: string) => void;
+    export interface System {
         args: string[];
         newLine: string;
         useCaseSensitiveFileNames: boolean;
@@ -3152,11 +3153,12 @@ declare namespace ts {
         base64decode?(input: string): string;
         base64encode?(input: string): string;
     }
-    interface FileWatcher {
+    export interface FileWatcher {
         close(): void;
     }
-    function getNodeMajorVersion(): number | undefined;
-    let sys: System;
+    export function getNodeMajorVersion(): number | undefined;
+    export let sys: System;
+    export {};
 }
 declare namespace ts {
     type ErrorCallback = (message: DiagnosticMessage, length: number) => void;
@@ -3602,7 +3604,7 @@ declare namespace ts {
     function isStringLiteralLike(node: Node): node is StringLiteralLike;
 }
 declare namespace ts {
-    function createNode(kind: SyntaxKind, pos?: number, end?: number): Node;
+    export function createNode(kind: SyntaxKind, pos?: number, end?: number): Node;
     /**
      * Invokes a callback for each child of the given node. The 'cbNode' callback is invoked for all child nodes
      * stored in properties. If a 'cbNodes' callback is specified, it is invoked for embedded arrays; otherwise,
@@ -3616,25 +3618,26 @@ declare namespace ts {
      * @remarks `forEachChild` must visit the children of a node in the order
      * that they appear in the source code. The language service depends on this property to locate nodes by position.
      */
-    function forEachChild<T>(node: Node, cbNode: (node: Node) => T | undefined, cbNodes?: (nodes: NodeArray<Node>) => T | undefined): T | undefined;
-    function createSourceFile(fileName: string, sourceText: string, languageVersion: ScriptTarget, setParentNodes?: boolean, scriptKind?: ScriptKind): SourceFile;
-    function parseIsolatedEntityName(text: string, languageVersion: ScriptTarget): EntityName | undefined;
+    export function forEachChild<T>(node: Node, cbNode: (node: Node) => T | undefined, cbNodes?: (nodes: NodeArray<Node>) => T | undefined): T | undefined;
+    export function createSourceFile(fileName: string, sourceText: string, languageVersion: ScriptTarget, setParentNodes?: boolean, scriptKind?: ScriptKind): SourceFile;
+    export function parseIsolatedEntityName(text: string, languageVersion: ScriptTarget): EntityName | undefined;
     /**
      * Parse json text into SyntaxTree and return node and parse errors if any
      * @param fileName
      * @param sourceText
      */
-    function parseJsonText(fileName: string, sourceText: string): JsonSourceFile;
-    function isExternalModule(file: SourceFile): boolean;
-    function updateSourceFile(sourceFile: SourceFile, newText: string, textChangeRange: TextChangeRange, aggressiveChecks?: boolean): SourceFile;
+    export function parseJsonText(fileName: string, sourceText: string): JsonSourceFile;
+    export function isExternalModule(file: SourceFile): boolean;
+    export function updateSourceFile(sourceFile: SourceFile, newText: string, textChangeRange: TextChangeRange, aggressiveChecks?: boolean): SourceFile;
+    export {};
 }
 declare namespace ts {
-    function parseCommandLine(commandLine: ReadonlyArray<string>, readFile?: (path: string) => string | undefined): ParsedCommandLine;
-    type DiagnosticReporter = (diagnostic: Diagnostic) => void;
+    export function parseCommandLine(commandLine: ReadonlyArray<string>, readFile?: (path: string) => string | undefined): ParsedCommandLine;
+    export type DiagnosticReporter = (diagnostic: Diagnostic) => void;
     /**
      * Reports config file diagnostics
      */
-    interface ConfigFileDiagnosticsReporter {
+    export interface ConfigFileDiagnosticsReporter {
         /**
          * Reports unrecoverable error when parsing config file
          */
@@ -3643,18 +3646,18 @@ declare namespace ts {
     /**
      * Interface extending ParseConfigHost to support ParseConfigFile that reads config file and reports errors
      */
-    interface ParseConfigFileHost extends ParseConfigHost, ConfigFileDiagnosticsReporter {
+    export interface ParseConfigFileHost extends ParseConfigHost, ConfigFileDiagnosticsReporter {
         getCurrentDirectory(): string;
     }
     /**
      * Reads the config file, reports errors if any and exits if the config file cannot be found
      */
-    function getParsedCommandLineOfConfigFile(configFileName: string, optionsToExtend: CompilerOptions, host: ParseConfigFileHost, extendedConfigCache?: Map<ExtendedConfigCacheEntry>): ParsedCommandLine | undefined;
+    export function getParsedCommandLineOfConfigFile(configFileName: string, optionsToExtend: CompilerOptions, host: ParseConfigFileHost, extendedConfigCache?: Map<ExtendedConfigCacheEntry>): ParsedCommandLine | undefined;
     /**
      * Read tsconfig.json file
      * @param fileName The path to the config file
      */
-    function readConfigFile(fileName: string, readFile: (path: string) => string | undefined): {
+    export function readConfigFile(fileName: string, readFile: (path: string) => string | undefined): {
         config?: any;
         error?: Diagnostic;
     };
@@ -3663,7 +3666,7 @@ declare namespace ts {
      * @param fileName The path to the config file
      * @param jsonText The text of the config file
      */
-    function parseConfigFileTextToJson(fileName: string, jsonText: string): {
+    export function parseConfigFileTextToJson(fileName: string, jsonText: string): {
         config?: any;
         error?: Diagnostic;
     };
@@ -3671,11 +3674,11 @@ declare namespace ts {
      * Read tsconfig.json file
      * @param fileName The path to the config file
      */
-    function readJsonConfigFile(fileName: string, readFile: (path: string) => string | undefined): TsConfigSourceFile;
+    export function readJsonConfigFile(fileName: string, readFile: (path: string) => string | undefined): TsConfigSourceFile;
     /**
      * Convert the json syntax tree into the json value
      */
-    function convertToObject(sourceFile: JsonSourceFile, errors: Push<Diagnostic>): any;
+    export function convertToObject(sourceFile: JsonSourceFile, errors: Push<Diagnostic>): any;
     /**
      * Parse the contents of a config file (tsconfig.json).
      * @param json The contents of the config file to parse
@@ -3683,7 +3686,7 @@ declare namespace ts {
      * @param basePath A root directory to resolve relative path entries in the config
      *    file to. e.g. outDir
      */
-    function parseJsonConfigFileContent(json: any, host: ParseConfigHost, basePath: string, existingOptions?: CompilerOptions, configFileName?: string, resolutionStack?: Path[], extraFileExtensions?: ReadonlyArray<FileExtensionInfo>, extendedConfigCache?: Map<ExtendedConfigCacheEntry>): ParsedCommandLine;
+    export function parseJsonConfigFileContent(json: any, host: ParseConfigHost, basePath: string, existingOptions?: CompilerOptions, configFileName?: string, resolutionStack?: Path[], extraFileExtensions?: ReadonlyArray<FileExtensionInfo>, extendedConfigCache?: Map<ExtendedConfigCacheEntry>): ParsedCommandLine;
     /**
      * Parse the contents of a config file (tsconfig.json).
      * @param jsonNode The contents of the config file to parse
@@ -3691,8 +3694,8 @@ declare namespace ts {
      * @param basePath A root directory to resolve relative path entries in the config
      *    file to. e.g. outDir
      */
-    function parseJsonSourceFileConfigFileContent(sourceFile: TsConfigSourceFile, host: ParseConfigHost, basePath: string, existingOptions?: CompilerOptions, configFileName?: string, resolutionStack?: Path[], extraFileExtensions?: ReadonlyArray<FileExtensionInfo>, extendedConfigCache?: Map<ExtendedConfigCacheEntry>): ParsedCommandLine;
-    interface ParsedTsconfig {
+    export function parseJsonSourceFileConfigFileContent(sourceFile: TsConfigSourceFile, host: ParseConfigHost, basePath: string, existingOptions?: CompilerOptions, configFileName?: string, resolutionStack?: Path[], extraFileExtensions?: ReadonlyArray<FileExtensionInfo>, extendedConfigCache?: Map<ExtendedConfigCacheEntry>): ParsedCommandLine;
+    export interface ParsedTsconfig {
         raw: any;
         options?: CompilerOptions;
         typeAcquisition?: TypeAcquisition;
@@ -3701,18 +3704,19 @@ declare namespace ts {
          */
         extendedConfigPath?: string;
     }
-    interface ExtendedConfigCacheEntry {
+    export interface ExtendedConfigCacheEntry {
         extendedResult: TsConfigSourceFile;
         extendedConfig: ParsedTsconfig | undefined;
     }
-    function convertCompilerOptionsFromJson(jsonOptions: any, basePath: string, configFileName?: string): {
+    export function convertCompilerOptionsFromJson(jsonOptions: any, basePath: string, configFileName?: string): {
         options: CompilerOptions;
         errors: Diagnostic[];
     };
-    function convertTypeAcquisitionFromJson(jsonOptions: any, basePath: string, configFileName?: string): {
+    export function convertTypeAcquisitionFromJson(jsonOptions: any, basePath: string, configFileName?: string): {
         options: TypeAcquisition;
         errors: Diagnostic[];
     };
+    export {};
 }
 declare namespace ts {
     function getEffectiveTypeRoots(options: CompilerOptions, host: GetEffectiveTypeRootsHost): string[] | undefined;
@@ -4267,20 +4271,20 @@ declare namespace ts {
     function createPrinter(printerOptions?: PrinterOptions, handlers?: PrintHandlers): Printer;
 }
 declare namespace ts {
-    function findConfigFile(searchPath: string, fileExists: (fileName: string) => boolean, configName?: string): string | undefined;
-    function resolveTripleslashReference(moduleName: string, containingFile: string): string;
-    function createCompilerHost(options: CompilerOptions, setParentNodes?: boolean): CompilerHost;
-    function getPreEmitDiagnostics(program: Program, sourceFile?: SourceFile, cancellationToken?: CancellationToken): ReadonlyArray<Diagnostic>;
-    interface FormatDiagnosticsHost {
+    export function findConfigFile(searchPath: string, fileExists: (fileName: string) => boolean, configName?: string): string | undefined;
+    export function resolveTripleslashReference(moduleName: string, containingFile: string): string;
+    export function createCompilerHost(options: CompilerOptions, setParentNodes?: boolean): CompilerHost;
+    export function getPreEmitDiagnostics(program: Program, sourceFile?: SourceFile, cancellationToken?: CancellationToken): ReadonlyArray<Diagnostic>;
+    export interface FormatDiagnosticsHost {
         getCurrentDirectory(): string;
         getCanonicalFileName(fileName: string): string;
         getNewLine(): string;
     }
-    function formatDiagnostics(diagnostics: ReadonlyArray<Diagnostic>, host: FormatDiagnosticsHost): string;
-    function formatDiagnostic(diagnostic: Diagnostic, host: FormatDiagnosticsHost): string;
-    function formatDiagnosticsWithColorAndContext(diagnostics: ReadonlyArray<Diagnostic>, host: FormatDiagnosticsHost): string;
-    function flattenDiagnosticMessageText(diag: string | DiagnosticMessageChain | undefined, newLine: string, indent?: number): string;
-    function getConfigFileParsingDiagnostics(configFileParseResult: ParsedCommandLine): ReadonlyArray<Diagnostic>;
+    export function formatDiagnostics(diagnostics: ReadonlyArray<Diagnostic>, host: FormatDiagnosticsHost): string;
+    export function formatDiagnostic(diagnostic: Diagnostic, host: FormatDiagnosticsHost): string;
+    export function formatDiagnosticsWithColorAndContext(diagnostics: ReadonlyArray<Diagnostic>, host: FormatDiagnosticsHost): string;
+    export function flattenDiagnosticMessageText(diag: string | DiagnosticMessageChain | undefined, newLine: string, indent?: number): string;
+    export function getConfigFileParsingDiagnostics(configFileParseResult: ParsedCommandLine): ReadonlyArray<Diagnostic>;
     /**
      * Create a new 'Program' instance. A Program is an immutable collection of 'SourceFile's and a 'CompilerOptions'
      * that represent a compilation unit.
@@ -4291,7 +4295,7 @@ declare namespace ts {
      * @param createProgramOptions - The options for creating a program.
      * @returns A 'Program' object.
      */
-    function createProgram(createProgramOptions: CreateProgramOptions): Program;
+    export function createProgram(createProgramOptions: CreateProgramOptions): Program;
     /**
      * Create a new 'Program' instance. A Program is an immutable collection of 'SourceFile's and a 'CompilerOptions'
      * that represent a compilation unit.
@@ -4306,16 +4310,17 @@ declare namespace ts {
      * @param configFileParsingDiagnostics - error during config file parsing
      * @returns A 'Program' object.
      */
-    function createProgram(rootNames: ReadonlyArray<string>, options: CompilerOptions, host?: CompilerHost, oldProgram?: Program, configFileParsingDiagnostics?: ReadonlyArray<Diagnostic>): Program;
-    /** @deprecated */ interface ResolveProjectReferencePathHost {
+    export function createProgram(rootNames: ReadonlyArray<string>, options: CompilerOptions, host?: CompilerHost, oldProgram?: Program, configFileParsingDiagnostics?: ReadonlyArray<Diagnostic>): Program;
+    /** @deprecated */ export interface ResolveProjectReferencePathHost {
         fileExists(fileName: string): boolean;
     }
     /**
      * Returns the target config filename of a project reference.
      * Note: The file might not exist.
      */
-    function resolveProjectReferencePath(ref: ProjectReference): ResolvedConfigFileName;
-    /** @deprecated */ function resolveProjectReferencePath(host: ResolveProjectReferencePathHost, ref: ProjectReference): ResolvedConfigFileName;
+    export function resolveProjectReferencePath(ref: ProjectReference): ResolvedConfigFileName;
+    /** @deprecated */ export function resolveProjectReferencePath(host: ResolveProjectReferencePathHost, ref: ProjectReference): ResolvedConfigFileName;
+    export {};
 }
 declare namespace ts {
     interface EmitOutput {

From 996e7e50d5cae2ac7226ad9396794d4160a27a0f Mon Sep 17 00:00:00 2001
From: Bill Ticehurst <billti@hotmail.com>
Date: Fri, 26 Oct 2018 11:22:25 -0700
Subject: [PATCH 073/151] Use optional module "@microsoft/typescript-etw" for
 ETW logging

---
 package.json                       |  1 +
 src/compiler/binder.ts             | 13 ++++--
 src/compiler/core.ts               | 18 +++++++++
 src/compiler/moduleNameResolver.ts | 25 +++++++-----
 src/compiler/parser.ts             | 15 +++++--
 src/compiler/sys.ts                | 56 ++++++++++++++------------
 src/compiler/watch.ts              | 23 +++++++----
 src/server/project.ts              | 63 ++++++++++++++++--------------
 src/server/session.ts              | 15 ++++++-
 src/server/utilities.ts            | 30 +++++++++-----
 src/tsserver/server.ts             | 13 ++++++
 11 files changed, 183 insertions(+), 89 deletions(-)

diff --git a/package.json b/package.json
index 2f1b44cbb0d..333240b0e7a 100644
--- a/package.json
+++ b/package.json
@@ -42,6 +42,7 @@
         "@types/gulp-sourcemaps": "0.0.32",
         "@types/jake": "latest",
         "@types/merge2": "latest",
+        "@types/microsoft__typescript-etw": "latest",
         "@types/minimatch": "latest",
         "@types/minimist": "latest",
         "@types/mkdirp": "latest",
diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts
index d18ab45a347..89602facbb1 100644
--- a/src/compiler/binder.ts
+++ b/src/compiler/binder.ts
@@ -105,10 +105,15 @@ namespace ts {
     const binder = createBinder();
 
     export function bindSourceFile(file: SourceFile, options: CompilerOptions) {
-        performance.mark("beforeBind");
-        binder(file, options);
-        performance.mark("afterBind");
-        performance.measure("Bind", "beforeBind", "afterBind");
+        try {
+            performance.mark("beforeBind");
+            if (etwLogger) etwLogger.logStartBindFile("" + file.fileName);
+            binder(file, options);
+        } finally {
+            if (etwLogger) etwLogger.logStopBindFile();
+            performance.mark("afterBind");
+            performance.measure("Bind", "beforeBind", "afterBind");
+        }
     }
 
     function createBinder(): (file: SourceFile, options: CompilerOptions) => void {
diff --git a/src/compiler/core.ts b/src/compiler/core.ts
index e0e70c72943..30e04f8983b 100644
--- a/src/compiler/core.ts
+++ b/src/compiler/core.ts
@@ -4,6 +4,24 @@ namespace ts {
     export const versionMajorMinor = "3.6";
     /** The version of the TypeScript compiler release */
     export const version = `${versionMajorMinor}.0-dev`;
+
+    // Load optional module to enable Event Tracing for Windows
+    // See https://github.com/microsoft/typescript-etw for more information
+    let etwModule;
+    try {
+        // tslint:disable-next-line:no-implicit-dependencies
+        etwModule = require("@microsoft/typescript-etw");
+    }
+    catch (e) {
+        // Optional module not installed
+        etwModule = undefined;
+    }
+
+    /* @internal */
+    // tslint:disable-next-line:no-implicit-dependencies
+    export const etwLogger: typeof import("@microsoft/typescript-etw") | undefined = etwModule;
+
+    if (etwLogger) etwLogger.logInfoEvent(`Starting TypeScript v${versionMajorMinor} with command line: ${JSON.stringify(process.argv)}`);
 }
 
 namespace ts {
diff --git a/src/compiler/moduleNameResolver.ts b/src/compiler/moduleNameResolver.ts
index 94f835caff5..f36ff5c7d4e 100644
--- a/src/compiler/moduleNameResolver.ts
+++ b/src/compiler/moduleNameResolver.ts
@@ -665,16 +665,23 @@ namespace ts {
                 }
             }
 
-            switch (moduleResolution) {
-                case ModuleResolutionKind.NodeJs:
-                    result = nodeModuleNameResolver(moduleName, containingFile, compilerOptions, host, cache, redirectedReference);
-                    break;
-                case ModuleResolutionKind.Classic:
-                    result = classicNameResolver(moduleName, containingFile, compilerOptions, host, cache, redirectedReference);
-                    break;
-                default:
-                    return Debug.fail(`Unexpected moduleResolution: ${moduleResolution}`);
+            try {
+                if (etwLogger) etwLogger.logStartResolveModule(moduleName /* , containingFile, ModuleResolutionKind[moduleResolution]*/);
+                switch (moduleResolution) {
+                    case ModuleResolutionKind.NodeJs:
+                        result = nodeModuleNameResolver(moduleName, containingFile, compilerOptions, host, cache, redirectedReference);
+                        break;
+                    case ModuleResolutionKind.Classic:
+                        result = classicNameResolver(moduleName, containingFile, compilerOptions, host, cache, redirectedReference);
+                        break;
+                    default:
+                        return Debug.fail(`Unexpected moduleResolution: ${moduleResolution}`);
+                }
             }
+            finally {
+                if (etwLogger && result && result.resolvedModule) etwLogger.logInfoEvent(`Module "${moduleName}" resolved to "${result.resolvedModule.resolvedFileName}"`);
+                if (etwLogger) etwLogger.logStopResolveModule((result && result.resolvedModule) ? "" + result.resolvedModule.resolvedFileName : "null");
+             }
 
             if (perFolderCache) {
                 perFolderCache.set(moduleName, result);
diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
index 254be93000b..9e66504a120 100644
--- a/src/compiler/parser.ts
+++ b/src/compiler/parser.ts
@@ -512,12 +512,19 @@ namespace ts {
     export function createSourceFile(fileName: string, sourceText: string, languageVersion: ScriptTarget, setParentNodes = false, scriptKind?: ScriptKind): SourceFile {
         performance.mark("beforeParse");
         let result: SourceFile;
-        if (languageVersion === ScriptTarget.JSON) {
-            result = Parser.parseSourceFile(fileName, sourceText, languageVersion, /*syntaxCursor*/ undefined, setParentNodes, ScriptKind.JSON);
+        try {
+            if (etwLogger) etwLogger.logStartParseSourceFile(fileName);
+            if (languageVersion === ScriptTarget.JSON) {
+                result = Parser.parseSourceFile(fileName, sourceText, languageVersion, /*syntaxCursor*/ undefined, setParentNodes, ScriptKind.JSON);
+            }
+            else {
+                result = Parser.parseSourceFile(fileName, sourceText, languageVersion, /*syntaxCursor*/ undefined, setParentNodes, scriptKind);
+            }
         }
-        else {
-            result = Parser.parseSourceFile(fileName, sourceText, languageVersion, /*syntaxCursor*/ undefined, setParentNodes, scriptKind);
+        finally {
+            if (etwLogger) etwLogger.logStopParseSourceFile();
         }
+
         performance.mark("afterParse");
         performance.measure("Parse", "beforeParse", "afterParse");
         return result;
diff --git a/src/compiler/sys.ts b/src/compiler/sys.ts
index 7049821c90f..5e404768918 100644
--- a/src/compiler/sys.ts
+++ b/src/compiler/sys.ts
@@ -1087,35 +1087,41 @@ namespace ts {
             }
 
             function readFile(fileName: string, _encoding?: string): string | undefined {
-                if (!fileExists(fileName)) {
-                    return undefined;
-                }
-                const buffer = _fs.readFileSync(fileName);
-                let len = buffer.length;
-                if (len >= 2 && buffer[0] === 0xFE && buffer[1] === 0xFF) {
-                    // Big endian UTF-16 byte order mark detected. Since big endian is not supported by node.js,
-                    // flip all byte pairs and treat as little endian.
-                    len &= ~1; // Round down to a multiple of 2
-                    for (let i = 0; i < len; i += 2) {
-                        const temp = buffer[i];
-                        buffer[i] = buffer[i + 1];
-                        buffer[i + 1] = temp;
+                try {
+                    if (etwLogger) etwLogger.logStartReadFile(fileName);
+                    if (!fileExists(fileName)) {
+                        return undefined;
                     }
-                    return buffer.toString("utf16le", 2);
+                    const buffer = _fs.readFileSync(fileName);
+                    let len = buffer.length;
+                    if (len >= 2 && buffer[0] === 0xFE && buffer[1] === 0xFF) {
+                        // Big endian UTF-16 byte order mark detected. Since big endian is not supported by node.js,
+                        // flip all byte pairs and treat as little endian.
+                        len &= ~1; // Round down to a multiple of 2
+                        for (let i = 0; i < len; i += 2) {
+                            const temp = buffer[i];
+                            buffer[i] = buffer[i + 1];
+                            buffer[i + 1] = temp;
+                        }
+                        return buffer.toString("utf16le", 2);
+                    }
+                    if (len >= 2 && buffer[0] === 0xFF && buffer[1] === 0xFE) {
+                        // Little endian UTF-16 byte order mark detected
+                        return buffer.toString("utf16le", 2);
+                    }
+                    if (len >= 3 && buffer[0] === 0xEF && buffer[1] === 0xBB && buffer[2] === 0xBF) {
+                        // UTF-8 byte order mark detected
+                        return buffer.toString("utf8", 3);
+                    }
+                    // Default is UTF-8 with no byte order mark
+                    return buffer.toString("utf8");
+                } finally {
+                    if (etwLogger) etwLogger.logStopReadFile();
                 }
-                if (len >= 2 && buffer[0] === 0xFF && buffer[1] === 0xFE) {
-                    // Little endian UTF-16 byte order mark detected
-                    return buffer.toString("utf16le", 2);
-                }
-                if (len >= 3 && buffer[0] === 0xEF && buffer[1] === 0xBB && buffer[2] === 0xBF) {
-                    // UTF-8 byte order mark detected
-                    return buffer.toString("utf8", 3);
-                }
-                // Default is UTF-8 with no byte order mark
-                return buffer.toString("utf8");
             }
 
             function writeFile(fileName: string, data: string, writeByteOrderMark?: boolean): void {
+                if (etwLogger) etwLogger.logEvent("WriteFile: " + fileName);
                 // If a BOM is required, emit one
                 if (writeByteOrderMark) {
                     data = byteOrderMarkIndicator + data;
@@ -1135,6 +1141,7 @@ namespace ts {
             }
 
             function getAccessibleFileSystemEntries(path: string): FileSystemEntries {
+                if (etwLogger) etwLogger.logEvent("ReadDir: " + (path || "."));
                 try {
                     const entries = _fs.readdirSync(path || ".").sort();
                     const files: string[] = [];
@@ -1196,6 +1203,7 @@ namespace ts {
             }
 
             function getDirectories(path: string): string[] {
+                if (etwLogger) etwLogger.logEvent("ReadDir: " + path);
                 return filter<string>(_fs.readdirSync(path), dir => fileSystemEntryExists(combinePaths(path, dir), FileSystemEntryKind.Directory));
             }
 
diff --git a/src/compiler/watch.ts b/src/compiler/watch.ts
index 6963a4df645..4b1ce6b71f4 100644
--- a/src/compiler/watch.ts
+++ b/src/compiler/watch.ts
@@ -1003,14 +1003,21 @@ namespace ts {
             timerToUpdateProgram = undefined;
             reportWatchDiagnostic(Diagnostics.File_change_detected_Starting_incremental_compilation);
 
-            switch (reloadLevel) {
-                case ConfigFileProgramReloadLevel.Partial:
-                    return reloadFileNamesFromConfigFile();
-                case ConfigFileProgramReloadLevel.Full:
-                    return reloadConfigFile();
-                default:
-                    synchronizeProgram();
-                    return;
+            try {
+                switch (reloadLevel) {
+                    case ConfigFileProgramReloadLevel.Partial:
+                        if (etwLogger) etwLogger.logStartUpdateProgram("PartialConfigReload");
+                        return reloadFileNamesFromConfigFile();
+                    case ConfigFileProgramReloadLevel.Full:
+                        if (etwLogger) etwLogger.logStartUpdateProgram("FullConfigReload");
+                        return reloadConfigFile();
+                    default:
+                        if (etwLogger) etwLogger.logStartUpdateProgram("SynchronizeProgram");
+                        synchronizeProgram();
+                        return;
+                }
+            } finally {
+                if (etwLogger) etwLogger.logStopUpdateProgram("Done");
             }
         }
 
diff --git a/src/server/project.ts b/src/server/project.ts
index 889e97b24c5..6e9973b9e9a 100644
--- a/src/server/project.ts
+++ b/src/server/project.ts
@@ -851,42 +851,47 @@ namespace ts.server {
          * @returns: true if set of files in the project stays the same and false - otherwise.
          */
         updateGraph(): boolean {
-            this.resolutionCache.startRecordingFilesWithChangedResolutions();
+            if (etwLogger) etwLogger.logStartUpdateGraph();
+            try {
+                this.resolutionCache.startRecordingFilesWithChangedResolutions();
 
-            const hasNewProgram = this.updateGraphWorker();
-            const hasAddedorRemovedFiles = this.hasAddedorRemovedFiles;
-            this.hasAddedorRemovedFiles = false;
+                const hasNewProgram = this.updateGraphWorker();
+                const hasAddedorRemovedFiles = this.hasAddedorRemovedFiles;
+                this.hasAddedorRemovedFiles = false;
 
-            const changedFiles: ReadonlyArray<Path> = this.resolutionCache.finishRecordingFilesWithChangedResolutions() || emptyArray;
+                const changedFiles: ReadonlyArray<Path> = this.resolutionCache.finishRecordingFilesWithChangedResolutions() || emptyArray;
 
-            for (const file of changedFiles) {
-                // delete cached information for changed files
-                this.cachedUnresolvedImportsPerFile.delete(file);
-            }
-
-            // update builder only if language service is enabled
-            // otherwise tell it to drop its internal state
-            if (this.languageServiceEnabled) {
-                // 1. no changes in structure, no changes in unresolved imports - do nothing
-                // 2. no changes in structure, unresolved imports were changed - collect unresolved imports for all files
-                // (can reuse cached imports for files that were not changed)
-                // 3. new files were added/removed, but compilation settings stays the same - collect unresolved imports for all new/modified files
-                // (can reuse cached imports for files that were not changed)
-                // 4. compilation settings were changed in the way that might affect module resolution - drop all caches and collect all data from the scratch
-                if (hasNewProgram || changedFiles.length) {
-                    this.lastCachedUnresolvedImportsList = getUnresolvedImports(this.program!, this.cachedUnresolvedImportsPerFile);
+                for (const file of changedFiles) {
+                    // delete cached information for changed files
+                    this.cachedUnresolvedImportsPerFile.delete(file);
                 }
 
-                this.projectService.typingsCache.enqueueInstallTypingsForProject(this, this.lastCachedUnresolvedImportsList, hasAddedorRemovedFiles);
-            }
-            else {
-                this.lastCachedUnresolvedImportsList = undefined;
-            }
+                // update builder only if language service is enabled
+                // otherwise tell it to drop its internal state
+                if (this.languageServiceEnabled) {
+                    // 1. no changes in structure, no changes in unresolved imports - do nothing
+                    // 2. no changes in structure, unresolved imports were changed - collect unresolved imports for all files
+                    // (can reuse cached imports for files that were not changed)
+                    // 3. new files were added/removed, but compilation settings stays the same - collect unresolved imports for all new/modified files
+                    // (can reuse cached imports for files that were not changed)
+                    // 4. compilation settings were changed in the way that might affect module resolution - drop all caches and collect all data from the scratch
+                    if (hasNewProgram || changedFiles.length) {
+                        this.lastCachedUnresolvedImportsList = getUnresolvedImports(this.program!, this.cachedUnresolvedImportsPerFile);
+                    }
 
-            if (hasNewProgram) {
-                this.projectProgramVersion++;
+                    this.projectService.typingsCache.enqueueInstallTypingsForProject(this, this.lastCachedUnresolvedImportsList, hasAddedorRemovedFiles);
+                }
+                else {
+                    this.lastCachedUnresolvedImportsList = undefined;
+                }
+
+                if (hasNewProgram) {
+                    this.projectProgramVersion++;
+                }
+                return !hasNewProgram;
+            } finally {
+                if (etwLogger) etwLogger.logStopUpdateGraph();
             }
-            return !hasNewProgram;
         }
 
         /*@internal*/
diff --git a/src/server/session.ts b/src/server/session.ts
index d663ca09249..4dea24c8df0 100644
--- a/src/server/session.ts
+++ b/src/server/session.ts
@@ -731,7 +731,9 @@ namespace ts.server {
                 }
                 return;
             }
-            this.host.write(formatMessage(msg, this.logger, this.byteLength, this.host.newLine));
+            const msgText = formatMessage(msg, this.logger, this.byteLength, this.host.newLine);
+            if (etwLogger) etwLogger.logEvent(`Response message size: ${msgText.length}`);
+            this.host.write(msgText);
         }
 
         public event<T extends object>(body: T, eventName: string): void {
@@ -2506,9 +2508,12 @@ namespace ts.server {
 
             let request: protocol.Request | undefined;
             let relevantFile: protocol.FileRequestArgs | undefined;
+            let commandSucceeded = false;
             try {
                 request = <protocol.Request>JSON.parse(message);
                 relevantFile = request.arguments && (request as protocol.FileRequest).arguments.file ? (request as protocol.FileRequest).arguments : undefined;
+
+                if (etwLogger) etwLogger.logStartCommand("" + request.command, message.substring(0, 100));
                 const { response, responseRequired } = this.executeCommand(request);
 
                 if (this.logger.hasLevel(LogLevel.requestTime)) {
@@ -2521,6 +2526,10 @@ namespace ts.server {
                     }
                 }
 
+                // Note: Log before writing the response, else the editor can complete its activity before the server does
+                // Set 'commandSucceded' flag to ensure logStopCommand doesn't get called twice (e.g. if doOutput throws)
+                commandSucceeded = true;
+                if (etwLogger) etwLogger.logStopCommand("" + request.command, "Success");
                 if (response) {
                     this.doOutput(response, request.command, request.seq, /*success*/ true);
                 }
@@ -2531,10 +2540,14 @@ namespace ts.server {
             catch (err) {
                 if (err instanceof OperationCanceledException) {
                     // Handle cancellation exceptions
+                    if (etwLogger && !commandSucceeded) etwLogger.logStopCommand("" + (request && request.command), "Canceled: " + err);
                     this.doOutput({ canceled: true }, request!.command, request!.seq, /*success*/ true);
                     return;
                 }
+
                 this.logErrorWorker(err, message, relevantFile);
+                if (etwLogger && !commandSucceeded) etwLogger.logStopCommand("" + (request && request.command), "Error: " + err);
+
                 this.doOutput(
                     /*info*/ undefined,
                     request ? request.command : CommandNames.Unknown,
diff --git a/src/server/utilities.ts b/src/server/utilities.ts
index fd38c6a4326..a11d13f589d 100644
--- a/src/server/utilities.ts
+++ b/src/server/utilities.ts
@@ -150,11 +150,16 @@ namespace ts.server {
         }
 
         private static run(self: ThrottledOperations, operationId: string, cb: () => void) {
-            self.pendingTimeouts.delete(operationId);
-            if (self.logger) {
-                self.logger.info(`Running: ${operationId}`);
+            try {
+                if (etwLogger) etwLogger.logStartScheduledOperation(operationId);
+                self.pendingTimeouts.delete(operationId);
+                if (self.logger) {
+                    self.logger.info(`Running: ${operationId}`);
+                }
+                cb();
+            } finally {
+                if (etwLogger) etwLogger.logStopScheduledOperation();
             }
-            cb();
         }
     }
 
@@ -174,13 +179,18 @@ namespace ts.server {
         private static run(self: GcTimer) {
             self.timerId = undefined;
 
-            const log = self.logger.hasLevel(LogLevel.requestTime);
-            const before = log && self.host.getMemoryUsage!(); // TODO: GH#18217
+            try {
+                if (etwLogger) etwLogger.logStartScheduledOperation("GC collect");
+                const log = self.logger.hasLevel(LogLevel.requestTime);
+                const before = log && self.host.getMemoryUsage!(); // TODO: GH#18217
 
-            self.host.gc!(); // TODO: GH#18217
-            if (log) {
-                const after = self.host.getMemoryUsage!(); // TODO: GH#18217
-                self.logger.perftrc(`GC::before ${before}, after ${after}`);
+                self.host.gc!(); // TODO: GH#18217
+                if (log) {
+                    const after = self.host.getMemoryUsage!(); // TODO: GH#18217
+                    self.logger.perftrc(`GC::before ${before}, after ${after}`);
+                }
+            } finally {
+                if (etwLogger) etwLogger.logStopScheduledOperation();
             }
         }
     }
diff --git a/src/tsserver/server.ts b/src/tsserver/server.ts
index a9fbf2f3b6a..7cbe53682b0 100644
--- a/src/tsserver/server.ts
+++ b/src/tsserver/server.ts
@@ -180,6 +180,19 @@ namespace ts.server {
         }
 
         msg(s: string, type: Msg = Msg.Err) {
+            if (etwLogger) {
+                switch (type) {
+                    case Msg.Info:
+                    etwLogger.logInfoEvent(s);
+                    break;
+                    case Msg.Perf:
+                    etwLogger.logPerfEvent(s);
+                    break;
+                    default: // Msg.Err
+                    etwLogger.logErrEvent(s);
+                    break;
+                }
+            }
             if (!this.canWrite) return;
 
             s = `[${nowString()}] ${s}\n`;

From 1ac980ec96350c9a0893dac33f87528a0cb6c91f Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Fri, 26 Jul 2019 12:26:07 -0700
Subject: [PATCH 074/151] File move

---
 src/testRunner/tsconfig.json                                    | 2 +-
 .../unittests/{tsbuildWatchMode.ts => tsbuild/watchMode.ts}     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename src/testRunner/unittests/{tsbuildWatchMode.ts => tsbuild/watchMode.ts} (98%)

diff --git a/src/testRunner/tsconfig.json b/src/testRunner/tsconfig.json
index 659dd426b79..a2ae6e478f3 100644
--- a/src/testRunner/tsconfig.json
+++ b/src/testRunner/tsconfig.json
@@ -61,7 +61,6 @@
         "unittests/semver.ts",
         "unittests/shimMap.ts",
         "unittests/transform.ts",
-        "unittests/tsbuildWatchMode.ts",
         "unittests/config/commandLineParsing.ts",
         "unittests/config/configurationExtension.ts",
         "unittests/config/convertCompilerOptionsFromJson.ts",
@@ -103,6 +102,7 @@
         "unittests/tsbuild/resolveJsonModule.ts",
         "unittests/tsbuild/sample.ts",
         "unittests/tsbuild/transitiveReferences.ts",
+        "unittests/tsbuild/watchMode.ts",
         "unittests/tscWatch/consoleClearing.ts",
         "unittests/tscWatch/emit.ts",
         "unittests/tscWatch/emitAndErrorUpdates.ts",
diff --git a/src/testRunner/unittests/tsbuildWatchMode.ts b/src/testRunner/unittests/tsbuild/watchMode.ts
similarity index 98%
rename from src/testRunner/unittests/tsbuildWatchMode.ts
rename to src/testRunner/unittests/tsbuild/watchMode.ts
index a630e28f1d8..9d052ae4af0 100644
--- a/src/testRunner/unittests/tsbuildWatchMode.ts
+++ b/src/testRunner/unittests/tsbuild/watchMode.ts
@@ -33,7 +33,7 @@ namespace ts.tscWatch {
         return [f, host.getModifiedTime(f), host.writtenFiles.has(host.toFullPath(f))] as OutputFileStamp;
     }
 
-    describe("unittests:: tsbuild-watch program updates", () => {
+    describe("unittests:: tsbuild:: watchMode:: program updates", () => {
         const project = "sample1";
         const enum SubProject {
             core = "core",

From 4efcfb7120dd6b6bf5f65b2dea847f343dca91d9 Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Fri, 26 Jul 2019 12:41:00 -0700
Subject: [PATCH 075/151] Some refactoring

---
 src/testRunner/unittests/tsbuild/watchMode.ts | 76 ++++++++++++-------
 1 file changed, 49 insertions(+), 27 deletions(-)

diff --git a/src/testRunner/unittests/tsbuild/watchMode.ts b/src/testRunner/unittests/tsbuild/watchMode.ts
index 9d052ae4af0..4546e4e75c9 100644
--- a/src/testRunner/unittests/tsbuild/watchMode.ts
+++ b/src/testRunner/unittests/tsbuild/watchMode.ts
@@ -113,13 +113,33 @@ namespace ts.tscWatch {
             }
         }
 
-        const core = subProjectFiles(SubProject.core, /*anotherModuleAndSomeDecl*/ true);
-        const logic = subProjectFiles(SubProject.logic);
-        const tests = subProjectFiles(SubProject.tests);
-        const ui = subProjectFiles(SubProject.ui);
-        const allFiles: ReadonlyArray<File> = [libFile, ...core, ...logic, ...tests, ...ui];
-        const testProjectExpectedWatchedFiles = [core[0], core[1], core[2]!, ...logic, ...tests].map(f => f.path.toLowerCase()); // tslint:disable-line no-unnecessary-type-assertion (TODO: type assertion should be necessary)
-        const testProjectExpectedWatchedDirectoriesRecursive = [projectPath(SubProject.core), projectPath(SubProject.logic)];
+        let core: SubProjectFiles;
+        let logic: SubProjectFiles;
+        let tests: SubProjectFiles;
+        let ui: SubProjectFiles;
+        let allFiles: ReadonlyArray<File>;
+        let testProjectExpectedWatchedFiles: string[];
+        let testProjectExpectedWatchedDirectoriesRecursive: string[];
+
+        before(() => {
+            core = subProjectFiles(SubProject.core, /*anotherModuleAndSomeDecl*/ true);
+            logic = subProjectFiles(SubProject.logic);
+            tests = subProjectFiles(SubProject.tests);
+            ui = subProjectFiles(SubProject.ui);
+            allFiles = [libFile, ...core, ...logic, ...tests, ...ui];
+            testProjectExpectedWatchedFiles = [core[0], core[1], core[2]!, ...logic, ...tests].map(f => f.path.toLowerCase()); // tslint:disable-line no-unnecessary-type-assertion (TODO: type assertion should be necessary)
+            testProjectExpectedWatchedDirectoriesRecursive = [projectPath(SubProject.core), projectPath(SubProject.logic)];
+        });
+
+        after(() => {
+            core = undefined!;
+            logic = undefined!;
+            tests = undefined!;
+            ui = undefined!;
+            allFiles = undefined!;
+            testProjectExpectedWatchedFiles = undefined!;
+            testProjectExpectedWatchedDirectoriesRecursive = undefined!;
+        });
 
         function createSolutionInWatchMode(allFiles: ReadonlyArray<File>, defaultOptions?: BuildOptions, disableConsoleClears?: boolean) {
             const host = createTsBuildWatchSystem(allFiles, { currentDirectory: projectsLocation });
@@ -172,9 +192,9 @@ namespace ts.tscWatch {
                 content: `export const newFileConst = 30;`
             };
 
-            function verifyProjectChanges(allFiles: ReadonlyArray<File>) {
+            function verifyProjectChanges(allFilesGetter: () => ReadonlyArray<File>) {
                 function createSolutionInWatchModeToVerifyChanges(additionalFiles?: ReadonlyArray<[SubProject, string]>) {
-                    const host = createSolutionInWatchMode(allFiles);
+                    const host = createSolutionInWatchMode(allFilesGetter());
                     return { host, verifyChangeWithFile, verifyChangeAfterTimeout, verifyWatches };
 
                     function verifyChangeWithFile(fileName: string, content: string, local?: boolean) {
@@ -277,19 +297,21 @@ export class someClass2 { }`);
             }
 
             describe("with simple project reference graph", () => {
-                verifyProjectChanges(allFiles);
+                verifyProjectChanges(() => allFiles);
             });
 
             describe("with circular project reference", () => {
-                const [coreTsconfig, ...otherCoreFiles] = core;
-                const circularCoreConfig: File = {
-                    path: coreTsconfig.path,
-                    content: JSON.stringify({
-                        compilerOptions: { composite: true, declaration: true },
-                        references: [{ path: "../tests", circular: true }]
-                    })
-                };
-                verifyProjectChanges([libFile, circularCoreConfig, ...otherCoreFiles, ...logic, ...tests]);
+                verifyProjectChanges(() => {
+                    const [coreTsconfig, ...otherCoreFiles] = core;
+                    const circularCoreConfig: File = {
+                        path: coreTsconfig.path,
+                        content: JSON.stringify({
+                            compilerOptions: { composite: true, declaration: true },
+                            references: [{ path: "../tests", circular: true }]
+                        })
+                    };
+                    return [libFile, circularCoreConfig, ...otherCoreFiles, ...logic, ...tests];
+                });
             });
         });
 
@@ -681,9 +703,9 @@ let x: string = 10;`);
                     const coreIndexDts = projectFileName(SubProject.core, "index.d.ts");
                     const coreAnotherModuleDts = projectFileName(SubProject.core, "anotherModule.d.ts");
                     const logicIndexDts = projectFileName(SubProject.logic, "index.d.ts");
-                    const expectedWatchedFiles = [core[0], logic[0], ...tests, libFile].map(f => f.path).concat([coreIndexDts, coreAnotherModuleDts, logicIndexDts].map(f => f.toLowerCase()));
+                    const expectedWatchedFiles = () => [core[0], logic[0], ...tests, libFile].map(f => f.path).concat([coreIndexDts, coreAnotherModuleDts, logicIndexDts].map(f => f.toLowerCase()));
                     const expectedWatchedDirectoriesRecursive = projectSystem.getTypeRootsFromLocation(projectPath(SubProject.tests));
-                    const expectedProgramFiles = [tests[1].path, libFile.path, coreIndexDts, coreAnotherModuleDts, logicIndexDts];
+                    const expectedProgramFiles = () => [tests[1].path, libFile.path, coreIndexDts, coreAnotherModuleDts, logicIndexDts];
 
                     function createSolutionAndWatchMode() {
                         return createSolutionAndWatchModeOfProject(allFiles, projectsLocation, `${project}/${SubProject.tests}`, tests[0].path, getOutputFileStamps);
@@ -694,12 +716,12 @@ let x: string = 10;`);
                     }
 
                     function verifyWatches(host: TsBuildWatchSystem, withTsserver?: boolean) {
-                        verifyWatchesOfProject(host, withTsserver ? expectedWatchedFiles.filter(f => f !== tests[1].path.toLowerCase()) : expectedWatchedFiles, expectedWatchedDirectoriesRecursive);
+                        verifyWatchesOfProject(host, withTsserver ? expectedWatchedFiles().filter(f => f !== tests[1].path.toLowerCase()) : expectedWatchedFiles(), expectedWatchedDirectoriesRecursive);
                     }
 
                     function verifyScenario(
                         edit: (host: TsBuildWatchSystem, solutionBuilder: SolutionBuilder<EmitAndSemanticDiagnosticsBuilderProgram>) => void,
-                        expectedFilesAfterEdit: ReadonlyArray<string>
+                        expectedFilesAfterEdit: () => ReadonlyArray<string>
                     ) {
                         it("with tsc-watch", () => {
                             const { host, solutionBuilder, watch } = createSolutionAndWatchMode();
@@ -708,7 +730,7 @@ let x: string = 10;`);
 
                             host.checkTimeoutQueueLengthAndRun(1);
                             checkOutputErrorsIncremental(host, emptyArray);
-                            checkProgramActualFiles(watch(), expectedFilesAfterEdit);
+                            checkProgramActualFiles(watch(), expectedFilesAfterEdit());
 
                         });
 
@@ -718,7 +740,7 @@ let x: string = 10;`);
                             edit(host, solutionBuilder);
 
                             host.checkTimeoutQueueLengthAndRun(2);
-                            checkProjectActualFiles(service, tests[0].path, [tests[0].path, ...expectedFilesAfterEdit]);
+                            checkProjectActualFiles(service, tests[0].path, [tests[0].path, ...expectedFilesAfterEdit()]);
                         });
                     }
 
@@ -729,7 +751,7 @@ let x: string = 10;`);
                             verifyDependencies(watch, coreIndexDts, [coreIndexDts]);
                             verifyDependencies(watch, coreAnotherModuleDts, [coreAnotherModuleDts]);
                             verifyDependencies(watch, logicIndexDts, [logicIndexDts, coreAnotherModuleDts]);
-                            verifyDependencies(watch, tests[1].path, expectedProgramFiles.filter(f => f !== libFile.path));
+                            verifyDependencies(watch, tests[1].path, expectedProgramFiles().filter(f => f !== libFile.path));
                         });
 
                         it("with tsserver", () => {
@@ -769,7 +791,7 @@ export function gfoo() {
                             }));
                             solutionBuilder.invalidateProject(logic[0].path.toLowerCase() as ResolvedConfigFilePath, ConfigFileProgramReloadLevel.Full);
                             solutionBuilder.buildNextInvalidatedProject();
-                        }, [tests[1].path, libFile.path, coreIndexDts, coreAnotherModuleDts, projectFilePath(SubProject.logic, "decls/index.d.ts")]);
+                        }, () => [tests[1].path, libFile.path, coreIndexDts, coreAnotherModuleDts, projectFilePath(SubProject.logic, "decls/index.d.ts")]);
                     });
                 });
 

From 2db8a13d815822149da7b506ca2ae21e3b7f0f1f Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Fri, 26 Jul 2019 14:06:33 -0700
Subject: [PATCH 076/151] Remove project status, watches etc when project is no
 longer part of build order

---
 src/compiler/tsbuild.ts                       |  47 +++++++-
 src/compiler/utilities.ts                     |  24 +++-
 src/harness/virtualFileSystemWithWatch.ts     |   2 +-
 src/testRunner/tsconfig.json                  |   1 +
 .../unittests/tsbuild/watchEnvironment.ts     | 111 ++++++++++++++++++
 src/testRunner/unittests/tsbuild/watchMode.ts |   8 ++
 6 files changed, 186 insertions(+), 7 deletions(-)
 create mode 100644 src/testRunner/unittests/tsbuild/watchEnvironment.ts

diff --git a/src/compiler/tsbuild.ts b/src/compiler/tsbuild.ts
index 29911f42906..ba051ac23b2 100644
--- a/src/compiler/tsbuild.ts
+++ b/src/compiler/tsbuild.ts
@@ -564,8 +564,51 @@ namespace ts {
     }
 
     function getBuildOrder(state: SolutionBuilderState) {
-        return state.buildOrder ||
-            (state.buildOrder = createBuildOrder(state, state.rootNames.map(f => resolveProjectName(state, f))));
+        return state.buildOrder || createStateBuildOrder(state);
+    }
+
+    function createStateBuildOrder(state: SolutionBuilderState) {
+        const buildOrder = createBuildOrder(state, state.rootNames.map(f => resolveProjectName(state, f)));
+        if (arrayIsEqualTo(state.buildOrder, buildOrder)) return state.buildOrder!;
+
+        // Clear all to ResolvedConfigFilePaths cache to start fresh
+        state.resolvedConfigFilePaths.clear();
+        const currentProjects = arrayToSet(
+            buildOrder,
+            resolved => toResolvedConfigFilePath(state, resolved)
+        ) as ConfigFileMap<true>;
+
+        const noopOnDelete = { onDeleteValue: noop };
+        // Config file cache
+        mutateMapSkippingNewValues(state.configFileCache, currentProjects, noopOnDelete);
+        mutateMapSkippingNewValues(state.projectStatus, currentProjects, noopOnDelete);
+        mutateMapSkippingNewValues(state.buildInfoChecked, currentProjects, noopOnDelete);
+        mutateMapSkippingNewValues(state.builderPrograms, currentProjects, noopOnDelete);
+        mutateMapSkippingNewValues(state.diagnostics, currentProjects, noopOnDelete);
+        mutateMapSkippingNewValues(state.projectPendingBuild, currentProjects, noopOnDelete);
+        mutateMapSkippingNewValues(state.projectErrorsReported, currentProjects, noopOnDelete);
+
+        // Remove watches for the program no longer in the solution
+        if (state.watch) {
+            mutateMapSkippingNewValues(
+                state.allWatchedConfigFiles,
+                currentProjects,
+                { onDeleteValue: closeFileWatcher }
+            );
+
+            mutateMapSkippingNewValues(
+                state.allWatchedWildcardDirectories,
+                currentProjects,
+                { onDeleteValue: existingMap => existingMap.forEach(closeFileWatcherOf) }
+            );
+
+            mutateMapSkippingNewValues(
+                state.allWatchedInputFiles,
+                currentProjects,
+                { onDeleteValue: existingMap => existingMap.forEach(closeFileWatcher) }
+            );
+        }
+        return state.buildOrder = buildOrder;
     }
 
     function getBuildOrderFor(state: SolutionBuilderState, project: string | undefined, onlyReferences: boolean | undefined) {
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index d13e12a6f19..aa6e974c8e8 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -4466,8 +4466,7 @@ namespace ts {
         map.clear();
     }
 
-    export interface MutateMapOptions<T, U> {
-        createNewValue(key: string, valueInNewMap: U): T;
+    export interface MutateMapSkippingNewValuesOptions<T, U> {
         onDeleteValue(existingValue: T, key: string): void;
 
         /**
@@ -4482,8 +4481,12 @@ namespace ts {
     /**
      * Mutates the map with newMap such that keys in map will be same as newMap.
      */
-    export function mutateMap<T, U>(map: Map<T>, newMap: ReadonlyMap<U>, options: MutateMapOptions<T, U>) {
-        const { createNewValue, onDeleteValue, onExistingValue } = options;
+    export function mutateMapSkippingNewValues<T, U>(
+        map: Map<T>,
+        newMap: ReadonlyMap<U>,
+        options: MutateMapSkippingNewValuesOptions<T, U>
+    ) {
+        const { onDeleteValue, onExistingValue } = options;
         // Needs update
         map.forEach((existingValue, key) => {
             const valueInNewMap = newMap.get(key);
@@ -4497,7 +4500,20 @@ namespace ts {
                 onExistingValue(existingValue, valueInNewMap, key);
             }
         });
+    }
 
+    export interface MutateMapOptions<T, U> extends MutateMapSkippingNewValuesOptions<T, U> {
+        createNewValue(key: string, valueInNewMap: U): T;
+    }
+
+    /**
+     * Mutates the map with newMap such that keys in map will be same as newMap.
+     */
+    export function mutateMap<T, U>(map: Map<T>, newMap: ReadonlyMap<U>, options: MutateMapOptions<T, U>) {
+        // Needs update
+        mutateMapSkippingNewValues(map, newMap, options);
+
+        const { createNewValue } = options;
         // Add new values that are not already present
         newMap.forEach((valueInNewMap, key) => {
             if (!map.has(key)) {
diff --git a/src/harness/virtualFileSystemWithWatch.ts b/src/harness/virtualFileSystemWithWatch.ts
index b8e3d189781..0535d832374 100644
--- a/src/harness/virtualFileSystemWithWatch.ts
+++ b/src/harness/virtualFileSystemWithWatch.ts
@@ -405,7 +405,7 @@ interface Array<T> {}`
             return s;
         }
 
-        private now() {
+        now() {
             this.time += timeIncrements;
             return new Date(this.time);
         }
diff --git a/src/testRunner/tsconfig.json b/src/testRunner/tsconfig.json
index a2ae6e478f3..7d0cea1ea64 100644
--- a/src/testRunner/tsconfig.json
+++ b/src/testRunner/tsconfig.json
@@ -102,6 +102,7 @@
         "unittests/tsbuild/resolveJsonModule.ts",
         "unittests/tsbuild/sample.ts",
         "unittests/tsbuild/transitiveReferences.ts",
+        "unittests/tsbuild/watchEnvironment.ts",
         "unittests/tsbuild/watchMode.ts",
         "unittests/tscWatch/consoleClearing.ts",
         "unittests/tscWatch/emit.ts",
diff --git a/src/testRunner/unittests/tsbuild/watchEnvironment.ts b/src/testRunner/unittests/tsbuild/watchEnvironment.ts
new file mode 100644
index 00000000000..f97c92a89d4
--- /dev/null
+++ b/src/testRunner/unittests/tsbuild/watchEnvironment.ts
@@ -0,0 +1,111 @@
+namespace ts.tscWatch {
+    describe("unittests:: tsbuild:: watchEnvironment:: tsbuild:: watchMode:: with different watch environments", () => {
+        it("watchFile on same file multiple times because file is part of multiple projects", () => {
+            const project = `${TestFSWithWatch.tsbuildProjectsLocation}/myproject`;
+            let maxPkgs = 4;
+            const configPath = `${project}/tsconfig.json`;
+            const typing: File = {
+                path: `${project}/typings/xterm.d.ts`,
+                content: "export const typing = 10;"
+            };
+
+            const allPkgFiles = pkgs(pkgFiles);
+            const system = createWatchedSystem([libFile, typing, ...flatArray(allPkgFiles)], { currentDirectory: project });
+            writePkgReferences();
+            const host = createSolutionBuilderWithWatchHost(system);
+            const solutionBuilder = createSolutionBuilderWithWatch(host, ["tsconfig.json"], { watch: true, verbose: true });
+            solutionBuilder.build();
+            checkOutputErrorsInitial(system, emptyArray, /*disableConsoleClears*/ undefined, [
+                `Projects in this build: \r\n${
+                concatenate(
+                    pkgs(index => `    * pkg${index}/tsconfig.json`),
+                    ["    * tsconfig.json"]
+                ).join("\r\n")}\n\n`,
+                ...flatArray(pkgs(index => [
+                    `Project 'pkg${index}/tsconfig.json' is out of date because output file 'pkg${index}/index.js' does not exist\n\n`,
+                    `Building project '${project}/pkg${index}/tsconfig.json'...\n\n`
+                ]))
+            ]);
+
+            const watchFilesDetailed = arrayToMap(flatArray(allPkgFiles), f => f.path, () => 1);
+            watchFilesDetailed.set(configPath, 1);
+            watchFilesDetailed.set(typing.path, maxPkgs);
+            checkWatchedFilesDetailed(system, watchFilesDetailed);
+            system.writeFile(typing.path, `${typing.content}export const typing1 = 10;`);
+            verifyInvoke();
+
+            // Make change
+            maxPkgs--;
+            writePkgReferences();
+            system.checkTimeoutQueueLengthAndRun(1);
+            checkOutputErrorsIncremental(system, emptyArray);
+            const lastFiles = last(allPkgFiles);
+            lastFiles.forEach(f => watchFilesDetailed.delete(f.path));
+            watchFilesDetailed.set(typing.path, maxPkgs);
+            checkWatchedFilesDetailed(system, watchFilesDetailed);
+            system.writeFile(typing.path, typing.content);
+            verifyInvoke();
+
+            // Make change to remove all the watches
+            maxPkgs = 0;
+            writePkgReferences();
+            system.checkTimeoutQueueLengthAndRun(1);
+            checkOutputErrorsIncremental(system, [
+                `tsconfig.json(1,10): error TS18002: The 'files' list in config file '${configPath}' is empty.\n`
+            ]);
+            checkWatchedFilesDetailed(system, [configPath], 1);
+
+            system.writeFile(typing.path, `${typing.content}export const typing1 = 10;`);
+            system.checkTimeoutQueueLength(0);
+
+            function flatArray<T>(arr: T[][]): readonly T[] {
+                return flatMap(arr, identity);
+            }
+            function pkgs<T>(cb: (index: number) => T): T[] {
+                const result: T[] = [];
+                for (let index = 0; index < maxPkgs; index++) {
+                    result.push(cb(index));
+                }
+                return result;
+            }
+            function createPkgReference(index: number) {
+                return { path: `./pkg${index}` };
+            }
+            function pkgFiles(index: number): File[] {
+                return [
+                    {
+                        path: `${project}/pkg${index}/index.ts`,
+                        content: `export const pkg${index} = ${index};`
+                    },
+                    {
+                        path: `${project}/pkg${index}/tsconfig.json`,
+                        content: JSON.stringify({
+                            complerOptions: { composite: true },
+                            include: [
+                                "**/*.ts",
+                                "../typings/xterm.d.ts"
+                            ]
+                        })
+                    }
+                ];
+            }
+            function writePkgReferences() {
+                system.writeFile(configPath, JSON.stringify({
+                    files: [],
+                    include: [],
+                    references: pkgs(createPkgReference)
+                }));
+            }
+            function verifyInvoke() {
+                pkgs(() => system.checkTimeoutQueueLengthAndRun(1));
+                checkOutputErrorsIncremental(system, emptyArray, /*disableConsoleClears*/ undefined, /*logsBeforeWatchDiagnostics*/ undefined, [
+                    ...flatArray(pkgs(index => [
+                        `Project 'pkg${index}/tsconfig.json' is out of date because oldest output 'pkg${index}/index.js' is older than newest input 'typings/xterm.d.ts'\n\n`,
+                        `Building project '${project}/pkg${index}/tsconfig.json'...\n\n`,
+                        `Updating unchanged output timestamps of project '${project}/pkg${index}/tsconfig.json'...\n\n`
+                    ]))
+                ]);
+            }
+        });
+    });
+}
diff --git a/src/testRunner/unittests/tsbuild/watchMode.ts b/src/testRunner/unittests/tsbuild/watchMode.ts
index 4546e4e75c9..bd7653b6bea 100644
--- a/src/testRunner/unittests/tsbuild/watchMode.ts
+++ b/src/testRunner/unittests/tsbuild/watchMode.ts
@@ -16,11 +16,19 @@ namespace ts.tscWatch {
         return host;
     }
 
+
     export function createSolutionBuilder(system: WatchedSystem, rootNames: ReadonlyArray<string>, defaultOptions?: BuildOptions) {
         const host = createSolutionBuilderHost(system);
+        host.now = system.now.bind(system);
         return ts.createSolutionBuilder(host, rootNames, defaultOptions || {});
     }
 
+    export function createSolutionBuilderWithWatchHost(system: WatchedSystem) {
+        const host = ts.createSolutionBuilderWithWatchHost(system);
+        host.now = system.now.bind(system);
+        return host;
+    }
+
     function createSolutionBuilderWithWatch(system: TsBuildWatchSystem, rootNames: ReadonlyArray<string>, defaultOptions?: BuildOptions) {
         const host = createSolutionBuilderWithWatchHost(system);
         const solutionBuilder = ts.createSolutionBuilderWithWatch(host, rootNames, defaultOptions || { watch: true });

From b84f13d7cf10b5cdbfd1510fdd9c2e75d9543251 Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Mon, 29 Jul 2019 15:32:53 -0700
Subject: [PATCH 077/151] Use single stats watcher per filename Fixes #28690

---
 src/compiler/sys.ts                           |  52 ++++-
 src/harness/virtualFileSystemWithWatch.ts     |  35 ++-
 .../unittests/tsbuild/watchEnvironment.ts     | 215 ++++++++++--------
 .../unittests/tscWatch/watchEnvironment.ts    |   2 +-
 4 files changed, 194 insertions(+), 110 deletions(-)

diff --git a/src/compiler/sys.ts b/src/compiler/sys.ts
index 7049821c90f..50080e0da7b 100644
--- a/src/compiler/sys.ts
+++ b/src/compiler/sys.ts
@@ -304,6 +304,53 @@ namespace ts {
         }
     }
 
+    /* @internal */
+    export function createSingleFileWatcherPerName(
+        watchFile: HostWatchFile,
+        useCaseSensitiveFileNames: boolean
+    ): HostWatchFile {
+        interface SingleFileWatcher {
+            watcher: FileWatcher;
+            refCount: number;
+        }
+        const cache = createMap<SingleFileWatcher>();
+        const callbacksCache = createMultiMap<FileWatcherCallback>();
+        const toCanonicalFileName = createGetCanonicalFileName(useCaseSensitiveFileNames);
+
+        return (fileName, callback, pollingInterval) => {
+            const path = toCanonicalFileName(fileName);
+            const existing = cache.get(path);
+            if (existing) {
+                existing.refCount++;
+            }
+            else {
+                cache.set(path, {
+                    watcher: watchFile(
+                        fileName,
+                        (fileName, eventKind) => forEach(
+                            callbacksCache.get(path),
+                            cb => cb(fileName, eventKind)
+                        ),
+                        pollingInterval
+                    ),
+                    refCount: 1
+                });
+            }
+            callbacksCache.add(path, callback);
+
+            return {
+                close: () => {
+                    const watcher = Debug.assertDefined(cache.get(path));
+                    callbacksCache.remove(path, callback);
+                    watcher.refCount--;
+                    if (watcher.refCount) return;
+                    cache.delete(path);
+                    closeFileWatcherOf(watcher);
+                }
+            };
+        };
+    }
+
     /**
      * Returns true if file status changed
      */
@@ -695,6 +742,7 @@ namespace ts {
             const useNonPollingWatchers = process.env.TSC_NONPOLLING_WATCHER;
             const tscWatchFile = process.env.TSC_WATCHFILE;
             const tscWatchDirectory = process.env.TSC_WATCHDIRECTORY;
+            const fsWatchFile = createSingleFileWatcherPerName(fsWatchFileWorker, useCaseSensitiveFileNames);
             let dynamicPollingWatchFile: HostWatchFile | undefined;
             const nodeSystem: System = {
                 args: process.argv.slice(2),
@@ -835,7 +883,7 @@ namespace ts {
                 return useNonPollingWatchers ?
                     createNonPollingWatchFile() :
                     // Default to do not use polling interval as it is before this experiment branch
-                    (fileName, callback) => fsWatchFile(fileName, callback);
+                    (fileName, callback) => fsWatchFile(fileName, callback, /*pollingInterval*/ undefined);
             }
 
             function getWatchDirectory(): HostWatchDirectory {
@@ -916,7 +964,7 @@ namespace ts {
                 }
             }
 
-            function fsWatchFile(fileName: string, callback: FileWatcherCallback, pollingInterval?: number): FileWatcher {
+            function fsWatchFileWorker(fileName: string, callback: FileWatcherCallback, pollingInterval?: number): FileWatcher {
                 _fs.watchFile(fileName, { persistent: true, interval: pollingInterval || 250 }, fileChanged);
                 let eventKind: FileWatcherEventKind;
                 return {
diff --git a/src/harness/virtualFileSystemWithWatch.ts b/src/harness/virtualFileSystemWithWatch.ts
index 0535d832374..13b87e1c91a 100644
--- a/src/harness/virtualFileSystemWithWatch.ts
+++ b/src/harness/virtualFileSystemWithWatch.ts
@@ -314,6 +314,11 @@ interface Array<T> {}`
         invokeFileDeleteCreateAsPartInsteadOfChange: boolean;
     }
 
+    export enum Tsc_WatchFile {
+        DynamicPolling = "DynamicPriorityPolling",
+        SingleFileWatcherPerName = "SingleFileWatcherPerName"
+    }
+
     export enum Tsc_WatchDirectory {
         WatchFile = "RecursiveDirectoryUsingFsWatchFile",
         NonRecursiveWatchDirectory = "RecursiveDirectoryUsingNonRecursiveWatchDirectory",
@@ -339,7 +344,7 @@ interface Array<T> {}`
         readonly watchedFiles = createMultiMap<TestFileWatcher>();
         private readonly executingFilePath: string;
         private readonly currentDirectory: string;
-        private readonly dynamicPriorityWatchFile: HostWatchFile | undefined;
+        private readonly customWatchFile: HostWatchFile | undefined;
         private readonly customRecursiveWatchDirectory: HostWatchDirectory | undefined;
         public require: ((initialPath: string, moduleName: string) => server.RequireResult) | undefined;
 
@@ -349,9 +354,23 @@ interface Array<T> {}`
             this.executingFilePath = this.getHostSpecificPath(executingFilePath);
             this.currentDirectory = this.getHostSpecificPath(currentDirectory);
             this.reloadFS(fileOrFolderorSymLinkList);
-            this.dynamicPriorityWatchFile = this.environmentVariables && this.environmentVariables.get("TSC_WATCHFILE") === "DynamicPriorityPolling" ?
-                createDynamicPriorityPollingWatchFile(this) :
-                undefined;
+            const tscWatchFile = this.environmentVariables && this.environmentVariables.get("TSC_WATCHFILE") as Tsc_WatchFile;
+            switch (tscWatchFile) {
+                case Tsc_WatchFile.DynamicPolling:
+                    this.customWatchFile = createDynamicPriorityPollingWatchFile(this);
+                    break;
+                case Tsc_WatchFile.SingleFileWatcherPerName:
+                    this.customWatchFile = createSingleFileWatcherPerName(
+                        this.watchFileWorker.bind(this),
+                        this.useCaseSensitiveFileNames
+                    );
+                    break;
+                case undefined:
+                    break;
+                default:
+                    Debug.assertNever(tscWatchFile);
+            }
+
             const tscWatchDirectory = this.environmentVariables && this.environmentVariables.get("TSC_WATCHDIRECTORY") as Tsc_WatchDirectory;
             if (tscWatchDirectory === Tsc_WatchDirectory.WatchFile) {
                 const watchDirectory: HostWatchDirectory = (directory, cb) => this.watchFile(directory, () => cb(directory), PollingInterval.Medium);
@@ -854,10 +873,14 @@ interface Array<T> {}`
         }
 
         watchFile(fileName: string, cb: FileWatcherCallback, pollingInterval: number) {
-            if (this.dynamicPriorityWatchFile) {
-                return this.dynamicPriorityWatchFile(fileName, cb, pollingInterval);
+            if (this.customWatchFile) {
+                return this.customWatchFile(fileName, cb, pollingInterval);
             }
 
+            return this.watchFileWorker(fileName, cb);
+        }
+
+        private watchFileWorker(fileName: string, cb: FileWatcherCallback) {
             const path = this.toFullPath(fileName);
             const callback: TestFileWatcher = { fileName, cb };
             this.watchedFiles.add(path, callback);
diff --git a/src/testRunner/unittests/tsbuild/watchEnvironment.ts b/src/testRunner/unittests/tsbuild/watchEnvironment.ts
index f97c92a89d4..d20dd7a0022 100644
--- a/src/testRunner/unittests/tsbuild/watchEnvironment.ts
+++ b/src/testRunner/unittests/tsbuild/watchEnvironment.ts
@@ -1,111 +1,124 @@
 namespace ts.tscWatch {
     describe("unittests:: tsbuild:: watchEnvironment:: tsbuild:: watchMode:: with different watch environments", () => {
-        it("watchFile on same file multiple times because file is part of multiple projects", () => {
-            const project = `${TestFSWithWatch.tsbuildProjectsLocation}/myproject`;
-            let maxPkgs = 4;
-            const configPath = `${project}/tsconfig.json`;
-            const typing: File = {
-                path: `${project}/typings/xterm.d.ts`,
-                content: "export const typing = 10;"
-            };
+        describe("when watchFile can create multiple watchers per file", () => {
+            verifyWatchFileOnMultipleProjects(/*singleWatchPerFile*/ false);
+        });
 
-            const allPkgFiles = pkgs(pkgFiles);
-            const system = createWatchedSystem([libFile, typing, ...flatArray(allPkgFiles)], { currentDirectory: project });
-            writePkgReferences();
-            const host = createSolutionBuilderWithWatchHost(system);
-            const solutionBuilder = createSolutionBuilderWithWatch(host, ["tsconfig.json"], { watch: true, verbose: true });
-            solutionBuilder.build();
-            checkOutputErrorsInitial(system, emptyArray, /*disableConsoleClears*/ undefined, [
-                `Projects in this build: \r\n${
-                concatenate(
-                    pkgs(index => `    * pkg${index}/tsconfig.json`),
-                    ["    * tsconfig.json"]
-                ).join("\r\n")}\n\n`,
-                ...flatArray(pkgs(index => [
-                    `Project 'pkg${index}/tsconfig.json' is out of date because output file 'pkg${index}/index.js' does not exist\n\n`,
-                    `Building project '${project}/pkg${index}/tsconfig.json'...\n\n`
-                ]))
-            ]);
+        describe("when watchFile is single watcher per file", () => {
+            verifyWatchFileOnMultipleProjects(
+                /*singleWatchPerFile*/ true,
+                arrayToMap(["TSC_WATCHFILE"], identity, () => TestFSWithWatch.Tsc_WatchFile.SingleFileWatcherPerName)
+            );
+        });
 
-            const watchFilesDetailed = arrayToMap(flatArray(allPkgFiles), f => f.path, () => 1);
-            watchFilesDetailed.set(configPath, 1);
-            watchFilesDetailed.set(typing.path, maxPkgs);
-            checkWatchedFilesDetailed(system, watchFilesDetailed);
-            system.writeFile(typing.path, `${typing.content}export const typing1 = 10;`);
-            verifyInvoke();
+        function verifyWatchFileOnMultipleProjects(singleWatchPerFile: boolean, environmentVariables?: Map<string>) {
+            it("watchFile on same file multiple times because file is part of multiple projects", () => {
+                const project = `${TestFSWithWatch.tsbuildProjectsLocation}/myproject`;
+                let maxPkgs = 4;
+                const configPath = `${project}/tsconfig.json`;
+                const typing: File = {
+                    path: `${project}/typings/xterm.d.ts`,
+                    content: "export const typing = 10;"
+                };
 
-            // Make change
-            maxPkgs--;
-            writePkgReferences();
-            system.checkTimeoutQueueLengthAndRun(1);
-            checkOutputErrorsIncremental(system, emptyArray);
-            const lastFiles = last(allPkgFiles);
-            lastFiles.forEach(f => watchFilesDetailed.delete(f.path));
-            watchFilesDetailed.set(typing.path, maxPkgs);
-            checkWatchedFilesDetailed(system, watchFilesDetailed);
-            system.writeFile(typing.path, typing.content);
-            verifyInvoke();
-
-            // Make change to remove all the watches
-            maxPkgs = 0;
-            writePkgReferences();
-            system.checkTimeoutQueueLengthAndRun(1);
-            checkOutputErrorsIncremental(system, [
-                `tsconfig.json(1,10): error TS18002: The 'files' list in config file '${configPath}' is empty.\n`
-            ]);
-            checkWatchedFilesDetailed(system, [configPath], 1);
-
-            system.writeFile(typing.path, `${typing.content}export const typing1 = 10;`);
-            system.checkTimeoutQueueLength(0);
-
-            function flatArray<T>(arr: T[][]): readonly T[] {
-                return flatMap(arr, identity);
-            }
-            function pkgs<T>(cb: (index: number) => T): T[] {
-                const result: T[] = [];
-                for (let index = 0; index < maxPkgs; index++) {
-                    result.push(cb(index));
-                }
-                return result;
-            }
-            function createPkgReference(index: number) {
-                return { path: `./pkg${index}` };
-            }
-            function pkgFiles(index: number): File[] {
-                return [
-                    {
-                        path: `${project}/pkg${index}/index.ts`,
-                        content: `export const pkg${index} = ${index};`
-                    },
-                    {
-                        path: `${project}/pkg${index}/tsconfig.json`,
-                        content: JSON.stringify({
-                            complerOptions: { composite: true },
-                            include: [
-                                "**/*.ts",
-                                "../typings/xterm.d.ts"
-                            ]
-                        })
-                    }
-                ];
-            }
-            function writePkgReferences() {
-                system.writeFile(configPath, JSON.stringify({
-                    files: [],
-                    include: [],
-                    references: pkgs(createPkgReference)
-                }));
-            }
-            function verifyInvoke() {
-                pkgs(() => system.checkTimeoutQueueLengthAndRun(1));
-                checkOutputErrorsIncremental(system, emptyArray, /*disableConsoleClears*/ undefined, /*logsBeforeWatchDiagnostics*/ undefined, [
+                const allPkgFiles = pkgs(pkgFiles);
+                const system = createWatchedSystem([libFile, typing, ...flatArray(allPkgFiles)], { currentDirectory: project, environmentVariables });
+                writePkgReferences();
+                const host = createSolutionBuilderWithWatchHost(system);
+                const solutionBuilder = createSolutionBuilderWithWatch(host, ["tsconfig.json"], { watch: true, verbose: true });
+                solutionBuilder.build();
+                checkOutputErrorsInitial(system, emptyArray, /*disableConsoleClears*/ undefined, [
+                    `Projects in this build: \r\n${
+                    concatenate(
+                        pkgs(index => `    * pkg${index}/tsconfig.json`),
+                        ["    * tsconfig.json"]
+                    ).join("\r\n")}\n\n`,
                     ...flatArray(pkgs(index => [
-                        `Project 'pkg${index}/tsconfig.json' is out of date because oldest output 'pkg${index}/index.js' is older than newest input 'typings/xterm.d.ts'\n\n`,
-                        `Building project '${project}/pkg${index}/tsconfig.json'...\n\n`,
-                        `Updating unchanged output timestamps of project '${project}/pkg${index}/tsconfig.json'...\n\n`
+                        `Project 'pkg${index}/tsconfig.json' is out of date because output file 'pkg${index}/index.js' does not exist\n\n`,
+                        `Building project '${project}/pkg${index}/tsconfig.json'...\n\n`
                     ]))
                 ]);
-            }
-        });
+
+                const watchFilesDetailed = arrayToMap(flatArray(allPkgFiles), f => f.path, () => 1);
+                watchFilesDetailed.set(configPath, 1);
+                watchFilesDetailed.set(typing.path, singleWatchPerFile ? 1 : maxPkgs);
+                checkWatchedFilesDetailed(system, watchFilesDetailed);
+                system.writeFile(typing.path, `${typing.content}export const typing1 = 10;`);
+                verifyInvoke();
+
+                // Make change
+                maxPkgs--;
+                writePkgReferences();
+                system.checkTimeoutQueueLengthAndRun(1);
+                checkOutputErrorsIncremental(system, emptyArray);
+                const lastFiles = last(allPkgFiles);
+                lastFiles.forEach(f => watchFilesDetailed.delete(f.path));
+                watchFilesDetailed.set(typing.path, singleWatchPerFile ? 1 : maxPkgs);
+                checkWatchedFilesDetailed(system, watchFilesDetailed);
+                system.writeFile(typing.path, typing.content);
+                verifyInvoke();
+
+                // Make change to remove all the watches
+                maxPkgs = 0;
+                writePkgReferences();
+                system.checkTimeoutQueueLengthAndRun(1);
+                checkOutputErrorsIncremental(system, [
+                    `tsconfig.json(1,10): error TS18002: The 'files' list in config file '${configPath}' is empty.\n`
+                ]);
+                checkWatchedFilesDetailed(system, [configPath], 1);
+
+                system.writeFile(typing.path, `${typing.content}export const typing1 = 10;`);
+                system.checkTimeoutQueueLength(0);
+
+                function flatArray<T>(arr: T[][]): readonly T[] {
+                    return flatMap(arr, identity);
+                }
+                function pkgs<T>(cb: (index: number) => T): T[] {
+                    const result: T[] = [];
+                    for (let index = 0; index < maxPkgs; index++) {
+                        result.push(cb(index));
+                    }
+                    return result;
+                }
+                function createPkgReference(index: number) {
+                    return { path: `./pkg${index}` };
+                }
+                function pkgFiles(index: number): File[] {
+                    return [
+                        {
+                            path: `${project}/pkg${index}/index.ts`,
+                            content: `export const pkg${index} = ${index};`
+                        },
+                        {
+                            path: `${project}/pkg${index}/tsconfig.json`,
+                            content: JSON.stringify({
+                                complerOptions: { composite: true },
+                                include: [
+                                    "**/*.ts",
+                                    "../typings/xterm.d.ts"
+                                ]
+                            })
+                        }
+                    ];
+                }
+                function writePkgReferences() {
+                    system.writeFile(configPath, JSON.stringify({
+                        files: [],
+                        include: [],
+                        references: pkgs(createPkgReference)
+                    }));
+                }
+                function verifyInvoke() {
+                    pkgs(() => system.checkTimeoutQueueLengthAndRun(1));
+                    checkOutputErrorsIncremental(system, emptyArray, /*disableConsoleClears*/ undefined, /*logsBeforeWatchDiagnostics*/ undefined, [
+                        ...flatArray(pkgs(index => [
+                            `Project 'pkg${index}/tsconfig.json' is out of date because oldest output 'pkg${index}/index.js' is older than newest input 'typings/xterm.d.ts'\n\n`,
+                            `Building project '${project}/pkg${index}/tsconfig.json'...\n\n`,
+                            `Updating unchanged output timestamps of project '${project}/pkg${index}/tsconfig.json'...\n\n`
+                        ]))
+                    ]);
+                }
+            });
+        }
     });
 }
diff --git a/src/testRunner/unittests/tscWatch/watchEnvironment.ts b/src/testRunner/unittests/tscWatch/watchEnvironment.ts
index d30e5854652..ad07d8d1610 100644
--- a/src/testRunner/unittests/tscWatch/watchEnvironment.ts
+++ b/src/testRunner/unittests/tscWatch/watchEnvironment.ts
@@ -9,7 +9,7 @@ namespace ts.tscWatch {
             };
             const files = [file1, libFile];
             const environmentVariables = createMap<string>();
-            environmentVariables.set("TSC_WATCHFILE", "DynamicPriorityPolling");
+            environmentVariables.set("TSC_WATCHFILE", TestFSWithWatch.Tsc_WatchFile.DynamicPolling);
             const host = createWatchedSystem(files, { environmentVariables });
             const watch = createWatchOfFilesAndCompilerOptions([file1.path], host);
 

From 946a14f3f3d1ddb65dea0b379ed1e350e2848809 Mon Sep 17 00:00:00 2001
From: Orta Therox <orta.therox@gmail.com>
Date: Tue, 30 Jul 2019 15:42:37 -0400
Subject: [PATCH 078/151] Allow expando additions to an imported object in
 JavaScript - fixes #31312

---
 src/compiler/checker.ts                               |  6 ++++--
 src/compiler/debug.ts                                 |  2 +-
 .../propertyAssignmentOnImportedSymbol.errors.txt     | 11 -----------
 3 files changed, 5 insertions(+), 14 deletions(-)
 delete mode 100644 tests/baselines/reference/propertyAssignmentOnImportedSymbol.errors.txt

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 3fa9c2da66e..007be810e48 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -29974,7 +29974,7 @@ namespace ts {
             const symbol = getSymbolOfNode(node);
             const target = resolveAlias(symbol);
             if (target !== unknownSymbol) {
-                // For external modules symbol represent local symbol for an alias.
+                // For external modules symbol represents local symbol for an alias.
                 // This local symbol will merge any other local declarations (excluding other aliases)
                 // and symbol.flags will contains combined representation for all merged declaration.
                 // Based on symbol.flags we can compute a set of excluded meanings (meaning that resolved alias should not have,
@@ -30004,7 +30004,9 @@ namespace ts {
         function checkImportBinding(node: ImportEqualsDeclaration | ImportClause | NamespaceImport | ImportSpecifier) {
             checkCollisionWithRequireExportsInGeneratedCode(node, node.name!);
             checkCollisionWithGlobalPromiseInGeneratedCode(node, node.name!);
-            checkAliasSymbol(node);
+            if (!isInJSFile(node)) {
+                checkAliasSymbol(node);
+            }
         }
 
         function checkImportDeclaration(node: ImportDeclaration) {
diff --git a/src/compiler/debug.ts b/src/compiler/debug.ts
index ee6847133c1..c90f4d1fb01 100644
--- a/src/compiler/debug.ts
+++ b/src/compiler/debug.ts
@@ -258,4 +258,4 @@ namespace ts {
             isDebugInfoEnabled = true;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/tests/baselines/reference/propertyAssignmentOnImportedSymbol.errors.txt b/tests/baselines/reference/propertyAssignmentOnImportedSymbol.errors.txt
deleted file mode 100644
index ee17bd087a1..00000000000
--- a/tests/baselines/reference/propertyAssignmentOnImportedSymbol.errors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-tests/cases/conformance/salsa/bug24658.js(1,10): error TS2440: Import declaration conflicts with local declaration of 'hurk'.
-
-
-==== tests/cases/conformance/salsa/mod1.js (0 errors) ====
-    export var hurk = {}
-==== tests/cases/conformance/salsa/bug24658.js (1 errors) ====
-    import { hurk } from './mod1'
-             ~~~~
-!!! error TS2440: Import declaration conflicts with local declaration of 'hurk'.
-    hurk.expando = 4
-    
\ No newline at end of file

From 8dd57061e1361bee525267c53ddc9bbca4cf79c3 Mon Sep 17 00:00:00 2001
From: Orta Therox <orta.therox@gmail.com>
Date: Tue, 30 Jul 2019 15:51:53 -0400
Subject: [PATCH 079/151] Ensure that when import/export are used natively in
 the JS runtime that the check for alias symbol is re-applied - re comment in
 #26912

---
 src/compiler/checker.ts | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 007be810e48..02b6e9913e7 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -29973,7 +29973,10 @@ namespace ts {
         function checkAliasSymbol(node: ImportEqualsDeclaration | ImportClause | NamespaceImport | ImportSpecifier | ExportSpecifier) {
             const symbol = getSymbolOfNode(node);
             const target = resolveAlias(symbol);
-            if (target !== unknownSymbol) {
+
+            const shouldSkipWithJSRequireTargets = !isInJSFile(node) && moduleKind !== ModuleKind.ES2015;
+
+            if (shouldSkipWithJSRequireTargets && target !== unknownSymbol) {
                 // For external modules symbol represents local symbol for an alias.
                 // This local symbol will merge any other local declarations (excluding other aliases)
                 // and symbol.flags will contains combined representation for all merged declaration.
@@ -30004,9 +30007,7 @@ namespace ts {
         function checkImportBinding(node: ImportEqualsDeclaration | ImportClause | NamespaceImport | ImportSpecifier) {
             checkCollisionWithRequireExportsInGeneratedCode(node, node.name!);
             checkCollisionWithGlobalPromiseInGeneratedCode(node, node.name!);
-            if (!isInJSFile(node)) {
-                checkAliasSymbol(node);
-            }
+            checkAliasSymbol(node);
         }
 
         function checkImportDeclaration(node: ImportDeclaration) {

From 1d18b4941e786d4d98dfb79cb70879ff93515714 Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Wed, 31 Jul 2019 11:12:01 -0700
Subject: [PATCH 080/151] Store already known not parenthesized arrow
 expression positions for faster exit in case of deep parsing Fixes #31987

---
 src/compiler/parser.ts                        |   15 +-
 ...arsingDeepParenthensizedExpression.symbols |  755 ++++
 .../parsingDeepParenthensizedExpression.types | 3933 +++++++++++++++++
 .../parsingDeepParenthensizedExpression.ts    |   20 +
 4 files changed, 4722 insertions(+), 1 deletion(-)
 create mode 100644 tests/baselines/reference/parsingDeepParenthensizedExpression.symbols
 create mode 100644 tests/baselines/reference/parsingDeepParenthensizedExpression.types
 create mode 100644 tests/cases/compiler/parsingDeepParenthensizedExpression.ts

diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
index 254be93000b..e87701cddbe 100644
--- a/src/compiler/parser.ts
+++ b/src/compiler/parser.ts
@@ -605,6 +605,8 @@ namespace ts {
 
         let parsingContext: ParsingContext;
 
+        let notParenthesizedArrow: Map<true> | undefined;
+
         // Flags that dictate what parsing context we're in.  For example:
         // Whether or not we are in strict parsing mode.  All that changes in strict parsing mode is
         // that some tokens that would be considered identifiers may be considered keywords.
@@ -826,6 +828,7 @@ namespace ts {
             identifiers = undefined!;
             syntaxCursor = undefined;
             sourceText = undefined!;
+            notParenthesizedArrow = undefined!;
         }
 
         function parseSourceFileWorker(fileName: string, languageVersion: ScriptTarget, setParentNodes: boolean, scriptKind: ScriptKind): SourceFile {
@@ -3676,7 +3679,17 @@ namespace ts {
         }
 
         function parsePossibleParenthesizedArrowFunctionExpressionHead(): ArrowFunction | undefined {
-            return parseParenthesizedArrowFunctionExpressionHead(/*allowAmbiguity*/ false);
+            const tokenPos = scanner.getTokenPos();
+            if (notParenthesizedArrow && notParenthesizedArrow.has(tokenPos.toString())) {
+                return undefined;
+            }
+
+            const result = parseParenthesizedArrowFunctionExpressionHead(/*allowAmbiguity*/ false);
+            if (!result) {
+                (notParenthesizedArrow || (notParenthesizedArrow = createMap())).set(tokenPos.toString(), true);
+            }
+
+            return result;
         }
 
         function tryParseAsyncSimpleArrowFunctionExpression(): ArrowFunction | undefined {
diff --git a/tests/baselines/reference/parsingDeepParenthensizedExpression.symbols b/tests/baselines/reference/parsingDeepParenthensizedExpression.symbols
new file mode 100644
index 00000000000..7787ee60026
--- /dev/null
+++ b/tests/baselines/reference/parsingDeepParenthensizedExpression.symbols
@@ -0,0 +1,755 @@
+=== tests/cases/compiler/a.js ===
+function Y(e, t) {
+>Y : Symbol(Y, Decl(a.js, 0, 0))
+>e : Symbol(e, Decl(a.js, 0, 11))
+>t : Symbol(t, Decl(a.js, 0, 13))
+
+                        e |= 0, t |= 0;
+>e : Symbol(e, Decl(a.js, 0, 11))
+>t : Symbol(t, Decl(a.js, 0, 13))
+
+                        var r, i, a, u, s, c, d, h, p, _, m, g, y, A, T, v, M = 0,
+>r : Symbol(r, Decl(a.js, 2, 27))
+>i : Symbol(i, Decl(a.js, 2, 30))
+>a : Symbol(a, Decl(a.js, 2, 33))
+>u : Symbol(u, Decl(a.js, 2, 36))
+>s : Symbol(s, Decl(a.js, 2, 39))
+>c : Symbol(c, Decl(a.js, 2, 42))
+>d : Symbol(d, Decl(a.js, 2, 45))
+>h : Symbol(h, Decl(a.js, 2, 48))
+>p : Symbol(p, Decl(a.js, 2, 51))
+>_ : Symbol(_, Decl(a.js, 2, 54))
+>m : Symbol(m, Decl(a.js, 2, 57))
+>g : Symbol(g, Decl(a.js, 2, 60))
+>y : Symbol(y, Decl(a.js, 2, 63))
+>A : Symbol(A, Decl(a.js, 2, 66))
+>T : Symbol(T, Decl(a.js, 2, 69))
+>v : Symbol(v, Decl(a.js, 2, 72))
+>M : Symbol(M, Decl(a.js, 2, 75))
+
+                            E = 0,
+>E : Symbol(E, Decl(a.js, 2, 82))
+
+                            w = 0,
+>w : Symbol(w, Decl(a.js, 3, 34))
+
+                            S = 0;
+>S : Symbol(S, Decl(a.js, 4, 34))
+
+                        v = f, (0 | (f = f + 288 | 0)) >= (0 | l) && b(288), T = v, A = t, M = 0 | o[(y = e) >> 2], E = 0 | o[(y + 4 | 0) >> 2], w = 0 | o[(y + 8 | 0) >> 2], S = 0 | o[(y + 12 | 0) >> 2],
+>v : Symbol(v, Decl(a.js, 2, 72))
+>T : Symbol(T, Decl(a.js, 2, 69))
+>v : Symbol(v, Decl(a.js, 2, 72))
+>A : Symbol(A, Decl(a.js, 2, 66))
+>t : Symbol(t, Decl(a.js, 0, 13))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>y : Symbol(y, Decl(a.js, 2, 63))
+>e : Symbol(e, Decl(a.js, 0, 11))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>y : Symbol(y, Decl(a.js, 2, 63))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>y : Symbol(y, Decl(a.js, 2, 63))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>y : Symbol(y, Decl(a.js, 2, 63))
+
+                            function(e, t, r) {
+>e : Symbol(e, Decl(a.js, 7, 37))
+>t : Symbol(t, Decl(a.js, 7, 39))
+>r : Symbol(r, Decl(a.js, 7, 42))
+
+                                e |= 0, t |= 0, r |= 0;
+>e : Symbol(e, Decl(a.js, 7, 37))
+>t : Symbol(t, Decl(a.js, 7, 39))
+>r : Symbol(r, Decl(a.js, 7, 42))
+
+                                var i, a, u, s, c = 0,
+>i : Symbol(i, Decl(a.js, 9, 35))
+>a : Symbol(a, Decl(a.js, 9, 38))
+>u : Symbol(u, Decl(a.js, 9, 41))
+>s : Symbol(s, Decl(a.js, 9, 44))
+>c : Symbol(c, Decl(a.js, 9, 47))
+
+                                    d = 0,
+>d : Symbol(d, Decl(a.js, 9, 54))
+
+                                    h = 0;
+>h : Symbol(h, Decl(a.js, 10, 42))
+
+                                for (s = f, (0 | (f = f + 32 | 0)) >= (0 | l) && b(32), i = e, a = t, u = r, d = 0, h = 0; h >>> 0 < u >>> 0;) c = 255 & (0 | n[(a + h | 0) >> 0]) | (255 & (0 | n[(a + (h + 1 | 0) | 0) >> 0])) << 8 | (255 & (0 | n[(a + (h + 2 | 0) | 0) >> 0])) << 16 | (255 & (0 | n[(a + (h + 3 | 0) | 0) >> 0])) << 24, o[(i + (d << 2) | 0) >> 2] = c, d = d + 1 | 0, h = h + 4 | 0;
+>s : Symbol(s, Decl(a.js, 9, 44))
+>i : Symbol(i, Decl(a.js, 9, 35))
+>e : Symbol(e, Decl(a.js, 7, 37))
+>a : Symbol(a, Decl(a.js, 9, 38))
+>t : Symbol(t, Decl(a.js, 7, 39))
+>u : Symbol(u, Decl(a.js, 9, 41))
+>r : Symbol(r, Decl(a.js, 7, 42))
+>d : Symbol(d, Decl(a.js, 9, 54))
+>h : Symbol(h, Decl(a.js, 10, 42))
+>h : Symbol(h, Decl(a.js, 10, 42))
+>u : Symbol(u, Decl(a.js, 9, 41))
+>c : Symbol(c, Decl(a.js, 9, 47))
+>a : Symbol(a, Decl(a.js, 9, 38))
+>h : Symbol(h, Decl(a.js, 10, 42))
+>a : Symbol(a, Decl(a.js, 9, 38))
+>h : Symbol(h, Decl(a.js, 10, 42))
+>a : Symbol(a, Decl(a.js, 9, 38))
+>h : Symbol(h, Decl(a.js, 10, 42))
+>a : Symbol(a, Decl(a.js, 9, 38))
+>h : Symbol(h, Decl(a.js, 10, 42))
+>i : Symbol(i, Decl(a.js, 9, 35))
+>d : Symbol(d, Decl(a.js, 9, 54))
+>c : Symbol(c, Decl(a.js, 9, 47))
+>d : Symbol(d, Decl(a.js, 9, 54))
+>d : Symbol(d, Decl(a.js, 9, 54))
+>h : Symbol(h, Decl(a.js, 10, 42))
+>h : Symbol(h, Decl(a.js, 10, 42))
+
+                                f = s
+>s : Symbol(s, Decl(a.js, 9, 44))
+
+                            }(T, A, 64), E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 57434055 | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 2054922799 | 0) | 0) << 21 | E >>> 11) + w | 0) + (1309151649 + (((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 30611744 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1560198380 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1120210379 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (718787259 + ((M ^ (S | -1 ^ E)) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 343485551 | 0) | 0) << 21 | E >>> 11) + w | 0, r = M, a = (0 | o[(i = y) >> 2]) + r | 0, o[i >> 2] = a, u = E, c = (0 | o[(s = y + 4 | 0) >> 2]) + u | 0, o[s >> 2] = c, d = w, p = (0 | o[(h = y + 8 | 0) >> 2]) + d | 0, o[h >> 2] = p, _ = S, g = (0 | o[(m = y + 12 | 0) >> 2]) + _ | 0, o[m >> 2] = g, f = v
+>T : Symbol(T, Decl(a.js, 2, 69))
+>A : Symbol(A, Decl(a.js, 2, 66))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>T : Symbol(T, Decl(a.js, 2, 69))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>T : Symbol(T, Decl(a.js, 2, 69))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>T : Symbol(T, Decl(a.js, 2, 69))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>T : Symbol(T, Decl(a.js, 2, 69))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>T : Symbol(T, Decl(a.js, 2, 69))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>T : Symbol(T, Decl(a.js, 2, 69))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>T : Symbol(T, Decl(a.js, 2, 69))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>T : Symbol(T, Decl(a.js, 2, 69))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>T : Symbol(T, Decl(a.js, 2, 69))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>T : Symbol(T, Decl(a.js, 2, 69))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>T : Symbol(T, Decl(a.js, 2, 69))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>T : Symbol(T, Decl(a.js, 2, 69))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>T : Symbol(T, Decl(a.js, 2, 69))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>T : Symbol(T, Decl(a.js, 2, 69))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>T : Symbol(T, Decl(a.js, 2, 69))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>T : Symbol(T, Decl(a.js, 2, 69))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>T : Symbol(T, Decl(a.js, 2, 69))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>T : Symbol(T, Decl(a.js, 2, 69))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>T : Symbol(T, Decl(a.js, 2, 69))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>T : Symbol(T, Decl(a.js, 2, 69))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>T : Symbol(T, Decl(a.js, 2, 69))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>T : Symbol(T, Decl(a.js, 2, 69))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>T : Symbol(T, Decl(a.js, 2, 69))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>T : Symbol(T, Decl(a.js, 2, 69))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>T : Symbol(T, Decl(a.js, 2, 69))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>T : Symbol(T, Decl(a.js, 2, 69))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>T : Symbol(T, Decl(a.js, 2, 69))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>T : Symbol(T, Decl(a.js, 2, 69))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>T : Symbol(T, Decl(a.js, 2, 69))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>T : Symbol(T, Decl(a.js, 2, 69))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>T : Symbol(T, Decl(a.js, 2, 69))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>T : Symbol(T, Decl(a.js, 2, 69))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>T : Symbol(T, Decl(a.js, 2, 69))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>T : Symbol(T, Decl(a.js, 2, 69))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>T : Symbol(T, Decl(a.js, 2, 69))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>T : Symbol(T, Decl(a.js, 2, 69))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>T : Symbol(T, Decl(a.js, 2, 69))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>T : Symbol(T, Decl(a.js, 2, 69))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>T : Symbol(T, Decl(a.js, 2, 69))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>T : Symbol(T, Decl(a.js, 2, 69))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>T : Symbol(T, Decl(a.js, 2, 69))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>T : Symbol(T, Decl(a.js, 2, 69))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>T : Symbol(T, Decl(a.js, 2, 69))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>T : Symbol(T, Decl(a.js, 2, 69))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>T : Symbol(T, Decl(a.js, 2, 69))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>T : Symbol(T, Decl(a.js, 2, 69))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>T : Symbol(T, Decl(a.js, 2, 69))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>T : Symbol(T, Decl(a.js, 2, 69))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>T : Symbol(T, Decl(a.js, 2, 69))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>T : Symbol(T, Decl(a.js, 2, 69))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>T : Symbol(T, Decl(a.js, 2, 69))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>T : Symbol(T, Decl(a.js, 2, 69))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>T : Symbol(T, Decl(a.js, 2, 69))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>T : Symbol(T, Decl(a.js, 2, 69))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>T : Symbol(T, Decl(a.js, 2, 69))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>T : Symbol(T, Decl(a.js, 2, 69))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>T : Symbol(T, Decl(a.js, 2, 69))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>T : Symbol(T, Decl(a.js, 2, 69))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>T : Symbol(T, Decl(a.js, 2, 69))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>T : Symbol(T, Decl(a.js, 2, 69))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>T : Symbol(T, Decl(a.js, 2, 69))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>T : Symbol(T, Decl(a.js, 2, 69))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>T : Symbol(T, Decl(a.js, 2, 69))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>T : Symbol(T, Decl(a.js, 2, 69))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>r : Symbol(r, Decl(a.js, 2, 27))
+>M : Symbol(M, Decl(a.js, 2, 75))
+>a : Symbol(a, Decl(a.js, 2, 33))
+>i : Symbol(i, Decl(a.js, 2, 30))
+>y : Symbol(y, Decl(a.js, 2, 63))
+>r : Symbol(r, Decl(a.js, 2, 27))
+>i : Symbol(i, Decl(a.js, 2, 30))
+>a : Symbol(a, Decl(a.js, 2, 33))
+>u : Symbol(u, Decl(a.js, 2, 36))
+>E : Symbol(E, Decl(a.js, 2, 82))
+>c : Symbol(c, Decl(a.js, 2, 42))
+>s : Symbol(s, Decl(a.js, 2, 39))
+>y : Symbol(y, Decl(a.js, 2, 63))
+>u : Symbol(u, Decl(a.js, 2, 36))
+>s : Symbol(s, Decl(a.js, 2, 39))
+>c : Symbol(c, Decl(a.js, 2, 42))
+>d : Symbol(d, Decl(a.js, 2, 45))
+>w : Symbol(w, Decl(a.js, 3, 34))
+>p : Symbol(p, Decl(a.js, 2, 51))
+>h : Symbol(h, Decl(a.js, 2, 48))
+>y : Symbol(y, Decl(a.js, 2, 63))
+>d : Symbol(d, Decl(a.js, 2, 45))
+>h : Symbol(h, Decl(a.js, 2, 48))
+>p : Symbol(p, Decl(a.js, 2, 51))
+>_ : Symbol(_, Decl(a.js, 2, 54))
+>S : Symbol(S, Decl(a.js, 4, 34))
+>g : Symbol(g, Decl(a.js, 2, 60))
+>m : Symbol(m, Decl(a.js, 2, 57))
+>y : Symbol(y, Decl(a.js, 2, 63))
+>_ : Symbol(_, Decl(a.js, 2, 54))
+>m : Symbol(m, Decl(a.js, 2, 57))
+>g : Symbol(g, Decl(a.js, 2, 60))
+>v : Symbol(v, Decl(a.js, 2, 72))
+                    }
diff --git a/tests/baselines/reference/parsingDeepParenthensizedExpression.types b/tests/baselines/reference/parsingDeepParenthensizedExpression.types
new file mode 100644
index 00000000000..8a1182d9ec6
--- /dev/null
+++ b/tests/baselines/reference/parsingDeepParenthensizedExpression.types
@@ -0,0 +1,3933 @@
+=== tests/cases/compiler/a.js ===
+function Y(e, t) {
+>Y : (e: any, t: any) => void
+>e : any
+>t : any
+
+                        e |= 0, t |= 0;
+>e |= 0, t |= 0 : number
+>e |= 0 : number
+>e : any
+>0 : 0
+>t |= 0 : number
+>t : any
+>0 : 0
+
+                        var r, i, a, u, s, c, d, h, p, _, m, g, y, A, T, v, M = 0,
+>r : any
+>i : any
+>a : any
+>u : any
+>s : any
+>c : any
+>d : any
+>h : any
+>p : any
+>_ : any
+>m : any
+>g : any
+>y : any
+>A : any
+>T : any
+>v : any
+>M : number
+>0 : 0
+
+                            E = 0,
+>E : number
+>0 : 0
+
+                            w = 0,
+>w : number
+>0 : 0
+
+                            S = 0;
+>S : number
+>0 : 0
+
+                        v = f, (0 | (f = f + 288 | 0)) >= (0 | l) && b(288), T = v, A = t, M = 0 | o[(y = e) >> 2], E = 0 | o[(y + 4 | 0) >> 2], w = 0 | o[(y + 8 | 0) >> 2], S = 0 | o[(y + 12 | 0) >> 2],
+>v = f, (0 | (f = f + 288 | 0)) >= (0 | l) && b(288), T = v, A = t, M = 0 | o[(y = e) >> 2], E = 0 | o[(y + 4 | 0) >> 2], w = 0 | o[(y + 8 | 0) >> 2], S = 0 | o[(y + 12 | 0) >> 2],                            function(e, t, r) {                                e |= 0, t |= 0, r |= 0;                                var i, a, u, s, c = 0,                                    d = 0,                                    h = 0;                                for (s = f, (0 | (f = f + 32 | 0)) >= (0 | l) && b(32), i = e, a = t, u = r, d = 0, h = 0; h >>> 0 < u >>> 0;) c = 255 & (0 | n[(a + h | 0) >> 0]) | (255 & (0 | n[(a + (h + 1 | 0) | 0) >> 0])) << 8 | (255 & (0 | n[(a + (h + 2 | 0) | 0) >> 0])) << 16 | (255 & (0 | n[(a + (h + 3 | 0) | 0) >> 0])) << 24, o[(i + (d << 2) | 0) >> 2] = c, d = d + 1 | 0, h = h + 4 | 0;                                f = s                            }(T, A, 64), E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 57434055 | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 2054922799 | 0) | 0) << 21 | E >>> 11) + w | 0) + (1309151649 + (((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 30611744 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1560198380 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1120210379 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (718787259 + ((M ^ (S | -1 ^ E)) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 343485551 | 0) | 0) << 21 | E >>> 11) + w | 0, r = M, a = (0 | o[(i = y) >> 2]) + r | 0, o[i >> 2] = a, u = E, c = (0 | o[(s = y + 4 | 0) >> 2]) + u | 0, o[s >> 2] = c, d = w, p = (0 | o[(h = y + 8 | 0) >> 2]) + d | 0, o[h >> 2] = p, _ = S, g = (0 | o[(m = y + 12 | 0) >> 2]) + _ | 0, o[m >> 2] = g, f = v : error
+>v = f, (0 | (f = f + 288 | 0)) >= (0 | l) && b(288), T = v, A = t, M = 0 | o[(y = e) >> 2], E = 0 | o[(y + 4 | 0) >> 2], w = 0 | o[(y + 8 | 0) >> 2], S = 0 | o[(y + 12 | 0) >> 2],                            function(e, t, r) {                                e |= 0, t |= 0, r |= 0;                                var i, a, u, s, c = 0,                                    d = 0,                                    h = 0;                                for (s = f, (0 | (f = f + 32 | 0)) >= (0 | l) && b(32), i = e, a = t, u = r, d = 0, h = 0; h >>> 0 < u >>> 0;) c = 255 & (0 | n[(a + h | 0) >> 0]) | (255 & (0 | n[(a + (h + 1 | 0) | 0) >> 0])) << 8 | (255 & (0 | n[(a + (h + 2 | 0) | 0) >> 0])) << 16 | (255 & (0 | n[(a + (h + 3 | 0) | 0) >> 0])) << 24, o[(i + (d << 2) | 0) >> 2] = c, d = d + 1 | 0, h = h + 4 | 0;                                f = s                            }(T, A, 64), E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 57434055 | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 2054922799 | 0) | 0) << 21 | E >>> 11) + w | 0) + (1309151649 + (((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 30611744 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1560198380 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1120210379 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (718787259 + ((M ^ (S | -1 ^ E)) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 343485551 | 0) | 0) << 21 | E >>> 11) + w | 0, r = M, a = (0 | o[(i = y) >> 2]) + r | 0, o[i >> 2] = a, u = E, c = (0 | o[(s = y + 4 | 0) >> 2]) + u | 0, o[s >> 2] = c, d = w, p = (0 | o[(h = y + 8 | 0) >> 2]) + d | 0, o[h >> 2] = p, _ = S, g = (0 | o[(m = y + 12 | 0) >> 2]) + _ | 0, o[m >> 2] = g : number
+>v = f, (0 | (f = f + 288 | 0)) >= (0 | l) && b(288), T = v, A = t, M = 0 | o[(y = e) >> 2], E = 0 | o[(y + 4 | 0) >> 2], w = 0 | o[(y + 8 | 0) >> 2], S = 0 | o[(y + 12 | 0) >> 2],                            function(e, t, r) {                                e |= 0, t |= 0, r |= 0;                                var i, a, u, s, c = 0,                                    d = 0,                                    h = 0;                                for (s = f, (0 | (f = f + 32 | 0)) >= (0 | l) && b(32), i = e, a = t, u = r, d = 0, h = 0; h >>> 0 < u >>> 0;) c = 255 & (0 | n[(a + h | 0) >> 0]) | (255 & (0 | n[(a + (h + 1 | 0) | 0) >> 0])) << 8 | (255 & (0 | n[(a + (h + 2 | 0) | 0) >> 0])) << 16 | (255 & (0 | n[(a + (h + 3 | 0) | 0) >> 0])) << 24, o[(i + (d << 2) | 0) >> 2] = c, d = d + 1 | 0, h = h + 4 | 0;                                f = s                            }(T, A, 64), E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 57434055 | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 2054922799 | 0) | 0) << 21 | E >>> 11) + w | 0) + (1309151649 + (((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 30611744 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1560198380 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1120210379 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (718787259 + ((M ^ (S | -1 ^ E)) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 343485551 | 0) | 0) << 21 | E >>> 11) + w | 0, r = M, a = (0 | o[(i = y) >> 2]) + r | 0, o[i >> 2] = a, u = E, c = (0 | o[(s = y + 4 | 0) >> 2]) + u | 0, o[s >> 2] = c, d = w, p = (0 | o[(h = y + 8 | 0) >> 2]) + d | 0, o[h >> 2] = p, _ = S, g = (0 | o[(m = y + 12 | 0) >> 2]) + _ | 0 : number
+>v = f, (0 | (f = f + 288 | 0)) >= (0 | l) && b(288), T = v, A = t, M = 0 | o[(y = e) >> 2], E = 0 | o[(y + 4 | 0) >> 2], w = 0 | o[(y + 8 | 0) >> 2], S = 0 | o[(y + 12 | 0) >> 2],                            function(e, t, r) {                                e |= 0, t |= 0, r |= 0;                                var i, a, u, s, c = 0,                                    d = 0,                                    h = 0;                                for (s = f, (0 | (f = f + 32 | 0)) >= (0 | l) && b(32), i = e, a = t, u = r, d = 0, h = 0; h >>> 0 < u >>> 0;) c = 255 & (0 | n[(a + h | 0) >> 0]) | (255 & (0 | n[(a + (h + 1 | 0) | 0) >> 0])) << 8 | (255 & (0 | n[(a + (h + 2 | 0) | 0) >> 0])) << 16 | (255 & (0 | n[(a + (h + 3 | 0) | 0) >> 0])) << 24, o[(i + (d << 2) | 0) >> 2] = c, d = d + 1 | 0, h = h + 4 | 0;                                f = s                            }(T, A, 64), E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 57434055 | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 2054922799 | 0) | 0) << 21 | E >>> 11) + w | 0) + (1309151649 + (((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 30611744 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1560198380 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1120210379 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (718787259 + ((M ^ (S | -1 ^ E)) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 343485551 | 0) | 0) << 21 | E >>> 11) + w | 0, r = M, a = (0 | o[(i = y) >> 2]) + r | 0, o[i >> 2] = a, u = E, c = (0 | o[(s = y + 4 | 0) >> 2]) + u | 0, o[s >> 2] = c, d = w, p = (0 | o[(h = y + 8 | 0) >> 2]) + d | 0, o[h >> 2] = p, _ = S : number
+>v = f, (0 | (f = f + 288 | 0)) >= (0 | l) && b(288), T = v, A = t, M = 0 | o[(y = e) >> 2], E = 0 | o[(y + 4 | 0) >> 2], w = 0 | o[(y + 8 | 0) >> 2], S = 0 | o[(y + 12 | 0) >> 2],                            function(e, t, r) {                                e |= 0, t |= 0, r |= 0;                                var i, a, u, s, c = 0,                                    d = 0,                                    h = 0;                                for (s = f, (0 | (f = f + 32 | 0)) >= (0 | l) && b(32), i = e, a = t, u = r, d = 0, h = 0; h >>> 0 < u >>> 0;) c = 255 & (0 | n[(a + h | 0) >> 0]) | (255 & (0 | n[(a + (h + 1 | 0) | 0) >> 0])) << 8 | (255 & (0 | n[(a + (h + 2 | 0) | 0) >> 0])) << 16 | (255 & (0 | n[(a + (h + 3 | 0) | 0) >> 0])) << 24, o[(i + (d << 2) | 0) >> 2] = c, d = d + 1 | 0, h = h + 4 | 0;                                f = s                            }(T, A, 64), E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 57434055 | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 2054922799 | 0) | 0) << 21 | E >>> 11) + w | 0) + (1309151649 + (((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 30611744 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1560198380 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1120210379 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (718787259 + ((M ^ (S | -1 ^ E)) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 343485551 | 0) | 0) << 21 | E >>> 11) + w | 0, r = M, a = (0 | o[(i = y) >> 2]) + r | 0, o[i >> 2] = a, u = E, c = (0 | o[(s = y + 4 | 0) >> 2]) + u | 0, o[s >> 2] = c, d = w, p = (0 | o[(h = y + 8 | 0) >> 2]) + d | 0, o[h >> 2] = p : number
+>v = f, (0 | (f = f + 288 | 0)) >= (0 | l) && b(288), T = v, A = t, M = 0 | o[(y = e) >> 2], E = 0 | o[(y + 4 | 0) >> 2], w = 0 | o[(y + 8 | 0) >> 2], S = 0 | o[(y + 12 | 0) >> 2],                            function(e, t, r) {                                e |= 0, t |= 0, r |= 0;                                var i, a, u, s, c = 0,                                    d = 0,                                    h = 0;                                for (s = f, (0 | (f = f + 32 | 0)) >= (0 | l) && b(32), i = e, a = t, u = r, d = 0, h = 0; h >>> 0 < u >>> 0;) c = 255 & (0 | n[(a + h | 0) >> 0]) | (255 & (0 | n[(a + (h + 1 | 0) | 0) >> 0])) << 8 | (255 & (0 | n[(a + (h + 2 | 0) | 0) >> 0])) << 16 | (255 & (0 | n[(a + (h + 3 | 0) | 0) >> 0])) << 24, o[(i + (d << 2) | 0) >> 2] = c, d = d + 1 | 0, h = h + 4 | 0;                                f = s                            }(T, A, 64), E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 57434055 | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 2054922799 | 0) | 0) << 21 | E >>> 11) + w | 0) + (1309151649 + (((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 30611744 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1560198380 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1120210379 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (718787259 + ((M ^ (S | -1 ^ E)) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 343485551 | 0) | 0) << 21 | E >>> 11) + w | 0, r = M, a = (0 | o[(i = y) >> 2]) + r | 0, o[i >> 2] = a, u = E, c = (0 | o[(s = y + 4 | 0) >> 2]) + u | 0, o[s >> 2] = c, d = w, p = (0 | o[(h = y + 8 | 0) >> 2]) + d | 0 : number
+>v = f, (0 | (f = f + 288 | 0)) >= (0 | l) && b(288), T = v, A = t, M = 0 | o[(y = e) >> 2], E = 0 | o[(y + 4 | 0) >> 2], w = 0 | o[(y + 8 | 0) >> 2], S = 0 | o[(y + 12 | 0) >> 2],                            function(e, t, r) {                                e |= 0, t |= 0, r |= 0;                                var i, a, u, s, c = 0,                                    d = 0,                                    h = 0;                                for (s = f, (0 | (f = f + 32 | 0)) >= (0 | l) && b(32), i = e, a = t, u = r, d = 0, h = 0; h >>> 0 < u >>> 0;) c = 255 & (0 | n[(a + h | 0) >> 0]) | (255 & (0 | n[(a + (h + 1 | 0) | 0) >> 0])) << 8 | (255 & (0 | n[(a + (h + 2 | 0) | 0) >> 0])) << 16 | (255 & (0 | n[(a + (h + 3 | 0) | 0) >> 0])) << 24, o[(i + (d << 2) | 0) >> 2] = c, d = d + 1 | 0, h = h + 4 | 0;                                f = s                            }(T, A, 64), E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 57434055 | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 2054922799 | 0) | 0) << 21 | E >>> 11) + w | 0) + (1309151649 + (((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 30611744 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1560198380 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1120210379 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (718787259 + ((M ^ (S | -1 ^ E)) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 343485551 | 0) | 0) << 21 | E >>> 11) + w | 0, r = M, a = (0 | o[(i = y) >> 2]) + r | 0, o[i >> 2] = a, u = E, c = (0 | o[(s = y + 4 | 0) >> 2]) + u | 0, o[s >> 2] = c, d = w : number
+>v = f, (0 | (f = f + 288 | 0)) >= (0 | l) && b(288), T = v, A = t, M = 0 | o[(y = e) >> 2], E = 0 | o[(y + 4 | 0) >> 2], w = 0 | o[(y + 8 | 0) >> 2], S = 0 | o[(y + 12 | 0) >> 2],                            function(e, t, r) {                                e |= 0, t |= 0, r |= 0;                                var i, a, u, s, c = 0,                                    d = 0,                                    h = 0;                                for (s = f, (0 | (f = f + 32 | 0)) >= (0 | l) && b(32), i = e, a = t, u = r, d = 0, h = 0; h >>> 0 < u >>> 0;) c = 255 & (0 | n[(a + h | 0) >> 0]) | (255 & (0 | n[(a + (h + 1 | 0) | 0) >> 0])) << 8 | (255 & (0 | n[(a + (h + 2 | 0) | 0) >> 0])) << 16 | (255 & (0 | n[(a + (h + 3 | 0) | 0) >> 0])) << 24, o[(i + (d << 2) | 0) >> 2] = c, d = d + 1 | 0, h = h + 4 | 0;                                f = s                            }(T, A, 64), E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 57434055 | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 2054922799 | 0) | 0) << 21 | E >>> 11) + w | 0) + (1309151649 + (((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 30611744 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1560198380 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1120210379 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (718787259 + ((M ^ (S | -1 ^ E)) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 343485551 | 0) | 0) << 21 | E >>> 11) + w | 0, r = M, a = (0 | o[(i = y) >> 2]) + r | 0, o[i >> 2] = a, u = E, c = (0 | o[(s = y + 4 | 0) >> 2]) + u | 0, o[s >> 2] = c : number
+>v = f, (0 | (f = f + 288 | 0)) >= (0 | l) && b(288), T = v, A = t, M = 0 | o[(y = e) >> 2], E = 0 | o[(y + 4 | 0) >> 2], w = 0 | o[(y + 8 | 0) >> 2], S = 0 | o[(y + 12 | 0) >> 2],                            function(e, t, r) {                                e |= 0, t |= 0, r |= 0;                                var i, a, u, s, c = 0,                                    d = 0,                                    h = 0;                                for (s = f, (0 | (f = f + 32 | 0)) >= (0 | l) && b(32), i = e, a = t, u = r, d = 0, h = 0; h >>> 0 < u >>> 0;) c = 255 & (0 | n[(a + h | 0) >> 0]) | (255 & (0 | n[(a + (h + 1 | 0) | 0) >> 0])) << 8 | (255 & (0 | n[(a + (h + 2 | 0) | 0) >> 0])) << 16 | (255 & (0 | n[(a + (h + 3 | 0) | 0) >> 0])) << 24, o[(i + (d << 2) | 0) >> 2] = c, d = d + 1 | 0, h = h + 4 | 0;                                f = s                            }(T, A, 64), E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 57434055 | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 2054922799 | 0) | 0) << 21 | E >>> 11) + w | 0) + (1309151649 + (((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 30611744 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1560198380 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1120210379 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (718787259 + ((M ^ (S | -1 ^ E)) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 343485551 | 0) | 0) << 21 | E >>> 11) + w | 0, r = M, a = (0 | o[(i = y) >> 2]) + r | 0, o[i >> 2] = a, u = E, c = (0 | o[(s = y + 4 | 0) >> 2]) + u | 0 : number
+>v = f, (0 | (f = f + 288 | 0)) >= (0 | l) && b(288), T = v, A = t, M = 0 | o[(y = e) >> 2], E = 0 | o[(y + 4 | 0) >> 2], w = 0 | o[(y + 8 | 0) >> 2], S = 0 | o[(y + 12 | 0) >> 2],                            function(e, t, r) {                                e |= 0, t |= 0, r |= 0;                                var i, a, u, s, c = 0,                                    d = 0,                                    h = 0;                                for (s = f, (0 | (f = f + 32 | 0)) >= (0 | l) && b(32), i = e, a = t, u = r, d = 0, h = 0; h >>> 0 < u >>> 0;) c = 255 & (0 | n[(a + h | 0) >> 0]) | (255 & (0 | n[(a + (h + 1 | 0) | 0) >> 0])) << 8 | (255 & (0 | n[(a + (h + 2 | 0) | 0) >> 0])) << 16 | (255 & (0 | n[(a + (h + 3 | 0) | 0) >> 0])) << 24, o[(i + (d << 2) | 0) >> 2] = c, d = d + 1 | 0, h = h + 4 | 0;                                f = s                            }(T, A, 64), E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 57434055 | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 2054922799 | 0) | 0) << 21 | E >>> 11) + w | 0) + (1309151649 + (((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 30611744 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1560198380 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1120210379 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (718787259 + ((M ^ (S | -1 ^ E)) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 343485551 | 0) | 0) << 21 | E >>> 11) + w | 0, r = M, a = (0 | o[(i = y) >> 2]) + r | 0, o[i >> 2] = a, u = E : number
+>v = f, (0 | (f = f + 288 | 0)) >= (0 | l) && b(288), T = v, A = t, M = 0 | o[(y = e) >> 2], E = 0 | o[(y + 4 | 0) >> 2], w = 0 | o[(y + 8 | 0) >> 2], S = 0 | o[(y + 12 | 0) >> 2],                            function(e, t, r) {                                e |= 0, t |= 0, r |= 0;                                var i, a, u, s, c = 0,                                    d = 0,                                    h = 0;                                for (s = f, (0 | (f = f + 32 | 0)) >= (0 | l) && b(32), i = e, a = t, u = r, d = 0, h = 0; h >>> 0 < u >>> 0;) c = 255 & (0 | n[(a + h | 0) >> 0]) | (255 & (0 | n[(a + (h + 1 | 0) | 0) >> 0])) << 8 | (255 & (0 | n[(a + (h + 2 | 0) | 0) >> 0])) << 16 | (255 & (0 | n[(a + (h + 3 | 0) | 0) >> 0])) << 24, o[(i + (d << 2) | 0) >> 2] = c, d = d + 1 | 0, h = h + 4 | 0;                                f = s                            }(T, A, 64), E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 57434055 | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 2054922799 | 0) | 0) << 21 | E >>> 11) + w | 0) + (1309151649 + (((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 30611744 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1560198380 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1120210379 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (718787259 + ((M ^ (S | -1 ^ E)) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 343485551 | 0) | 0) << 21 | E >>> 11) + w | 0, r = M, a = (0 | o[(i = y) >> 2]) + r | 0, o[i >> 2] = a : number
+>v = f, (0 | (f = f + 288 | 0)) >= (0 | l) && b(288), T = v, A = t, M = 0 | o[(y = e) >> 2], E = 0 | o[(y + 4 | 0) >> 2], w = 0 | o[(y + 8 | 0) >> 2], S = 0 | o[(y + 12 | 0) >> 2],                            function(e, t, r) {                                e |= 0, t |= 0, r |= 0;                                var i, a, u, s, c = 0,                                    d = 0,                                    h = 0;                                for (s = f, (0 | (f = f + 32 | 0)) >= (0 | l) && b(32), i = e, a = t, u = r, d = 0, h = 0; h >>> 0 < u >>> 0;) c = 255 & (0 | n[(a + h | 0) >> 0]) | (255 & (0 | n[(a + (h + 1 | 0) | 0) >> 0])) << 8 | (255 & (0 | n[(a + (h + 2 | 0) | 0) >> 0])) << 16 | (255 & (0 | n[(a + (h + 3 | 0) | 0) >> 0])) << 24, o[(i + (d << 2) | 0) >> 2] = c, d = d + 1 | 0, h = h + 4 | 0;                                f = s                            }(T, A, 64), E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 57434055 | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 2054922799 | 0) | 0) << 21 | E >>> 11) + w | 0) + (1309151649 + (((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 30611744 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1560198380 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1120210379 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (718787259 + ((M ^ (S | -1 ^ E)) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 343485551 | 0) | 0) << 21 | E >>> 11) + w | 0, r = M, a = (0 | o[(i = y) >> 2]) + r | 0 : number
+>v = f, (0 | (f = f + 288 | 0)) >= (0 | l) && b(288), T = v, A = t, M = 0 | o[(y = e) >> 2], E = 0 | o[(y + 4 | 0) >> 2], w = 0 | o[(y + 8 | 0) >> 2], S = 0 | o[(y + 12 | 0) >> 2],                            function(e, t, r) {                                e |= 0, t |= 0, r |= 0;                                var i, a, u, s, c = 0,                                    d = 0,                                    h = 0;                                for (s = f, (0 | (f = f + 32 | 0)) >= (0 | l) && b(32), i = e, a = t, u = r, d = 0, h = 0; h >>> 0 < u >>> 0;) c = 255 & (0 | n[(a + h | 0) >> 0]) | (255 & (0 | n[(a + (h + 1 | 0) | 0) >> 0])) << 8 | (255 & (0 | n[(a + (h + 2 | 0) | 0) >> 0])) << 16 | (255 & (0 | n[(a + (h + 3 | 0) | 0) >> 0])) << 24, o[(i + (d << 2) | 0) >> 2] = c, d = d + 1 | 0, h = h + 4 | 0;                                f = s                            }(T, A, 64), E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 57434055 | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 2054922799 | 0) | 0) << 21 | E >>> 11) + w | 0) + (1309151649 + (((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 30611744 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1560198380 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1120210379 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (718787259 + ((M ^ (S | -1 ^ E)) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 343485551 | 0) | 0) << 21 | E >>> 11) + w | 0, r = M : number
+>v = f, (0 | (f = f + 288 | 0)) >= (0 | l) && b(288), T = v, A = t, M = 0 | o[(y = e) >> 2], E = 0 | o[(y + 4 | 0) >> 2], w = 0 | o[(y + 8 | 0) >> 2], S = 0 | o[(y + 12 | 0) >> 2],                            function(e, t, r) {                                e |= 0, t |= 0, r |= 0;                                var i, a, u, s, c = 0,                                    d = 0,                                    h = 0;                                for (s = f, (0 | (f = f + 32 | 0)) >= (0 | l) && b(32), i = e, a = t, u = r, d = 0, h = 0; h >>> 0 < u >>> 0;) c = 255 & (0 | n[(a + h | 0) >> 0]) | (255 & (0 | n[(a + (h + 1 | 0) | 0) >> 0])) << 8 | (255 & (0 | n[(a + (h + 2 | 0) | 0) >> 0])) << 16 | (255 & (0 | n[(a + (h + 3 | 0) | 0) >> 0])) << 24, o[(i + (d << 2) | 0) >> 2] = c, d = d + 1 | 0, h = h + 4 | 0;                                f = s                            }(T, A, 64), E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 57434055 | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 2054922799 | 0) | 0) << 21 | E >>> 11) + w | 0) + (1309151649 + (((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 30611744 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1560198380 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1120210379 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (718787259 + ((M ^ (S | -1 ^ E)) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 343485551 | 0) | 0) << 21 | E >>> 11) + w | 0 : number
+>v = f, (0 | (f = f + 288 | 0)) >= (0 | l) && b(288), T = v, A = t, M = 0 | o[(y = e) >> 2], E = 0 | o[(y + 4 | 0) >> 2], w = 0 | o[(y + 8 | 0) >> 2], S = 0 | o[(y + 12 | 0) >> 2],                            function(e, t, r) {                                e |= 0, t |= 0, r |= 0;                                var i, a, u, s, c = 0,                                    d = 0,                                    h = 0;                                for (s = f, (0 | (f = f + 32 | 0)) >= (0 | l) && b(32), i = e, a = t, u = r, d = 0, h = 0; h >>> 0 < u >>> 0;) c = 255 & (0 | n[(a + h | 0) >> 0]) | (255 & (0 | n[(a + (h + 1 | 0) | 0) >> 0])) << 8 | (255 & (0 | n[(a + (h + 2 | 0) | 0) >> 0])) << 16 | (255 & (0 | n[(a + (h + 3 | 0) | 0) >> 0])) << 24, o[(i + (d << 2) | 0) >> 2] = c, d = d + 1 | 0, h = h + 4 | 0;                                f = s                            }(T, A, 64) : void
+>v = f, (0 | (f = f + 288 | 0)) >= (0 | l) && b(288), T = v, A = t, M = 0 | o[(y = e) >> 2], E = 0 | o[(y + 4 | 0) >> 2], w = 0 | o[(y + 8 | 0) >> 2], S = 0 | o[(y + 12 | 0) >> 2] : number
+>v = f, (0 | (f = f + 288 | 0)) >= (0 | l) && b(288), T = v, A = t, M = 0 | o[(y = e) >> 2], E = 0 | o[(y + 4 | 0) >> 2], w = 0 | o[(y + 8 | 0) >> 2] : number
+>v = f, (0 | (f = f + 288 | 0)) >= (0 | l) && b(288), T = v, A = t, M = 0 | o[(y = e) >> 2], E = 0 | o[(y + 4 | 0) >> 2] : number
+>v = f, (0 | (f = f + 288 | 0)) >= (0 | l) && b(288), T = v, A = t, M = 0 | o[(y = e) >> 2] : number
+>v = f, (0 | (f = f + 288 | 0)) >= (0 | l) && b(288), T = v, A = t : any
+>v = f, (0 | (f = f + 288 | 0)) >= (0 | l) && b(288), T = v : error
+>v = f, (0 | (f = f + 288 | 0)) >= (0 | l) && b(288) : any
+>v = f : error
+>v : any
+>f : error
+>(0 | (f = f + 288 | 0)) >= (0 | l) && b(288) : any
+>(0 | (f = f + 288 | 0)) >= (0 | l) : boolean
+>(0 | (f = f + 288 | 0)) : number
+>0 | (f = f + 288 | 0) : number
+>0 : 0
+>(f = f + 288 | 0) : number
+>f = f + 288 | 0 : number
+>f : error
+>f + 288 | 0 : number
+>f + 288 : error
+>f : error
+>288 : 288
+>0 : 0
+>(0 | l) : number
+>0 | l : number
+>0 : 0
+>l : error
+>b(288) : error
+>b : error
+>288 : 288
+>T = v : error
+>T : any
+>v : error
+>A = t : any
+>A : any
+>t : any
+>M = 0 | o[(y = e) >> 2] : number
+>M : number
+>0 | o[(y = e) >> 2] : number
+>0 : 0
+>o[(y = e) >> 2] : error
+>o : error
+>(y = e) >> 2 : number
+>(y = e) : any
+>y = e : any
+>y : any
+>e : any
+>2 : 2
+>E = 0 | o[(y + 4 | 0) >> 2] : number
+>E : number
+>0 | o[(y + 4 | 0) >> 2] : number
+>0 : 0
+>o[(y + 4 | 0) >> 2] : error
+>o : error
+>(y + 4 | 0) >> 2 : number
+>(y + 4 | 0) : number
+>y + 4 | 0 : number
+>y + 4 : any
+>y : any
+>4 : 4
+>0 : 0
+>2 : 2
+>w = 0 | o[(y + 8 | 0) >> 2] : number
+>w : number
+>0 | o[(y + 8 | 0) >> 2] : number
+>0 : 0
+>o[(y + 8 | 0) >> 2] : error
+>o : error
+>(y + 8 | 0) >> 2 : number
+>(y + 8 | 0) : number
+>y + 8 | 0 : number
+>y + 8 : any
+>y : any
+>8 : 8
+>0 : 0
+>2 : 2
+>S = 0 | o[(y + 12 | 0) >> 2] : number
+>S : number
+>0 | o[(y + 12 | 0) >> 2] : number
+>0 : 0
+>o[(y + 12 | 0) >> 2] : error
+>o : error
+>(y + 12 | 0) >> 2 : number
+>(y + 12 | 0) : number
+>y + 12 | 0 : number
+>y + 12 : any
+>y : any
+>12 : 12
+>0 : 0
+>2 : 2
+
+                            function(e, t, r) {
+>function(e, t, r) {                                e |= 0, t |= 0, r |= 0;                                var i, a, u, s, c = 0,                                    d = 0,                                    h = 0;                                for (s = f, (0 | (f = f + 32 | 0)) >= (0 | l) && b(32), i = e, a = t, u = r, d = 0, h = 0; h >>> 0 < u >>> 0;) c = 255 & (0 | n[(a + h | 0) >> 0]) | (255 & (0 | n[(a + (h + 1 | 0) | 0) >> 0])) << 8 | (255 & (0 | n[(a + (h + 2 | 0) | 0) >> 0])) << 16 | (255 & (0 | n[(a + (h + 3 | 0) | 0) >> 0])) << 24, o[(i + (d << 2) | 0) >> 2] = c, d = d + 1 | 0, h = h + 4 | 0;                                f = s                            }(T, A, 64) : void
+>function(e, t, r) {                                e |= 0, t |= 0, r |= 0;                                var i, a, u, s, c = 0,                                    d = 0,                                    h = 0;                                for (s = f, (0 | (f = f + 32 | 0)) >= (0 | l) && b(32), i = e, a = t, u = r, d = 0, h = 0; h >>> 0 < u >>> 0;) c = 255 & (0 | n[(a + h | 0) >> 0]) | (255 & (0 | n[(a + (h + 1 | 0) | 0) >> 0])) << 8 | (255 & (0 | n[(a + (h + 2 | 0) | 0) >> 0])) << 16 | (255 & (0 | n[(a + (h + 3 | 0) | 0) >> 0])) << 24, o[(i + (d << 2) | 0) >> 2] = c, d = d + 1 | 0, h = h + 4 | 0;                                f = s                            } : (e: any, t: any, r: number) => void
+>e : error
+>t : any
+>r : number
+
+                                e |= 0, t |= 0, r |= 0;
+>e |= 0, t |= 0, r |= 0 : number
+>e |= 0, t |= 0 : number
+>e |= 0 : number
+>e : error
+>0 : 0
+>t |= 0 : number
+>t : any
+>0 : 0
+>r |= 0 : number
+>r : number
+>0 : 0
+
+                                var i, a, u, s, c = 0,
+>i : any
+>a : any
+>u : any
+>s : any
+>c : number
+>0 : 0
+
+                                    d = 0,
+>d : number
+>0 : 0
+
+                                    h = 0;
+>h : number
+>0 : 0
+
+                                for (s = f, (0 | (f = f + 32 | 0)) >= (0 | l) && b(32), i = e, a = t, u = r, d = 0, h = 0; h >>> 0 < u >>> 0;) c = 255 & (0 | n[(a + h | 0) >> 0]) | (255 & (0 | n[(a + (h + 1 | 0) | 0) >> 0])) << 8 | (255 & (0 | n[(a + (h + 2 | 0) | 0) >> 0])) << 16 | (255 & (0 | n[(a + (h + 3 | 0) | 0) >> 0])) << 24, o[(i + (d << 2) | 0) >> 2] = c, d = d + 1 | 0, h = h + 4 | 0;
+>s = f, (0 | (f = f + 32 | 0)) >= (0 | l) && b(32), i = e, a = t, u = r, d = 0, h = 0 : 0
+>s = f, (0 | (f = f + 32 | 0)) >= (0 | l) && b(32), i = e, a = t, u = r, d = 0 : 0
+>s = f, (0 | (f = f + 32 | 0)) >= (0 | l) && b(32), i = e, a = t, u = r : number
+>s = f, (0 | (f = f + 32 | 0)) >= (0 | l) && b(32), i = e, a = t : any
+>s = f, (0 | (f = f + 32 | 0)) >= (0 | l) && b(32), i = e : error
+>s = f, (0 | (f = f + 32 | 0)) >= (0 | l) && b(32) : any
+>s = f : error
+>s : any
+>f : error
+>(0 | (f = f + 32 | 0)) >= (0 | l) && b(32) : any
+>(0 | (f = f + 32 | 0)) >= (0 | l) : boolean
+>(0 | (f = f + 32 | 0)) : number
+>0 | (f = f + 32 | 0) : number
+>0 : 0
+>(f = f + 32 | 0) : number
+>f = f + 32 | 0 : number
+>f : error
+>f + 32 | 0 : number
+>f + 32 : error
+>f : error
+>32 : 32
+>0 : 0
+>(0 | l) : number
+>0 | l : number
+>0 : 0
+>l : error
+>b(32) : error
+>b : error
+>32 : 32
+>i = e : error
+>i : any
+>e : error
+>a = t : any
+>a : any
+>t : any
+>u = r : number
+>u : any
+>r : number
+>d = 0 : 0
+>d : number
+>0 : 0
+>h = 0 : 0
+>h : number
+>0 : 0
+>h >>> 0 < u >>> 0 : boolean
+>h >>> 0 : number
+>h : number
+>0 : 0
+>u >>> 0 : number
+>u : number
+>0 : 0
+>c = 255 & (0 | n[(a + h | 0) >> 0]) | (255 & (0 | n[(a + (h + 1 | 0) | 0) >> 0])) << 8 | (255 & (0 | n[(a + (h + 2 | 0) | 0) >> 0])) << 16 | (255 & (0 | n[(a + (h + 3 | 0) | 0) >> 0])) << 24, o[(i + (d << 2) | 0) >> 2] = c, d = d + 1 | 0, h = h + 4 | 0 : number
+>c = 255 & (0 | n[(a + h | 0) >> 0]) | (255 & (0 | n[(a + (h + 1 | 0) | 0) >> 0])) << 8 | (255 & (0 | n[(a + (h + 2 | 0) | 0) >> 0])) << 16 | (255 & (0 | n[(a + (h + 3 | 0) | 0) >> 0])) << 24, o[(i + (d << 2) | 0) >> 2] = c, d = d + 1 | 0 : number
+>c = 255 & (0 | n[(a + h | 0) >> 0]) | (255 & (0 | n[(a + (h + 1 | 0) | 0) >> 0])) << 8 | (255 & (0 | n[(a + (h + 2 | 0) | 0) >> 0])) << 16 | (255 & (0 | n[(a + (h + 3 | 0) | 0) >> 0])) << 24, o[(i + (d << 2) | 0) >> 2] = c : number
+>c = 255 & (0 | n[(a + h | 0) >> 0]) | (255 & (0 | n[(a + (h + 1 | 0) | 0) >> 0])) << 8 | (255 & (0 | n[(a + (h + 2 | 0) | 0) >> 0])) << 16 | (255 & (0 | n[(a + (h + 3 | 0) | 0) >> 0])) << 24 : number
+>c : number
+>255 & (0 | n[(a + h | 0) >> 0]) | (255 & (0 | n[(a + (h + 1 | 0) | 0) >> 0])) << 8 | (255 & (0 | n[(a + (h + 2 | 0) | 0) >> 0])) << 16 | (255 & (0 | n[(a + (h + 3 | 0) | 0) >> 0])) << 24 : number
+>255 & (0 | n[(a + h | 0) >> 0]) | (255 & (0 | n[(a + (h + 1 | 0) | 0) >> 0])) << 8 | (255 & (0 | n[(a + (h + 2 | 0) | 0) >> 0])) << 16 : number
+>255 & (0 | n[(a + h | 0) >> 0]) | (255 & (0 | n[(a + (h + 1 | 0) | 0) >> 0])) << 8 : number
+>255 & (0 | n[(a + h | 0) >> 0]) : number
+>255 : 255
+>(0 | n[(a + h | 0) >> 0]) : number
+>0 | n[(a + h | 0) >> 0] : number
+>0 : 0
+>n[(a + h | 0) >> 0] : error
+>n : error
+>(a + h | 0) >> 0 : number
+>(a + h | 0) : number
+>a + h | 0 : number
+>a + h : any
+>a : any
+>h : number
+>0 : 0
+>0 : 0
+>(255 & (0 | n[(a + (h + 1 | 0) | 0) >> 0])) << 8 : number
+>(255 & (0 | n[(a + (h + 1 | 0) | 0) >> 0])) : number
+>255 & (0 | n[(a + (h + 1 | 0) | 0) >> 0]) : number
+>255 : 255
+>(0 | n[(a + (h + 1 | 0) | 0) >> 0]) : number
+>0 | n[(a + (h + 1 | 0) | 0) >> 0] : number
+>0 : 0
+>n[(a + (h + 1 | 0) | 0) >> 0] : error
+>n : error
+>(a + (h + 1 | 0) | 0) >> 0 : number
+>(a + (h + 1 | 0) | 0) : number
+>a + (h + 1 | 0) | 0 : number
+>a + (h + 1 | 0) : any
+>a : any
+>(h + 1 | 0) : number
+>h + 1 | 0 : number
+>h + 1 : number
+>h : number
+>1 : 1
+>0 : 0
+>0 : 0
+>0 : 0
+>8 : 8
+>(255 & (0 | n[(a + (h + 2 | 0) | 0) >> 0])) << 16 : number
+>(255 & (0 | n[(a + (h + 2 | 0) | 0) >> 0])) : number
+>255 & (0 | n[(a + (h + 2 | 0) | 0) >> 0]) : number
+>255 : 255
+>(0 | n[(a + (h + 2 | 0) | 0) >> 0]) : number
+>0 | n[(a + (h + 2 | 0) | 0) >> 0] : number
+>0 : 0
+>n[(a + (h + 2 | 0) | 0) >> 0] : error
+>n : error
+>(a + (h + 2 | 0) | 0) >> 0 : number
+>(a + (h + 2 | 0) | 0) : number
+>a + (h + 2 | 0) | 0 : number
+>a + (h + 2 | 0) : any
+>a : any
+>(h + 2 | 0) : number
+>h + 2 | 0 : number
+>h + 2 : number
+>h : number
+>2 : 2
+>0 : 0
+>0 : 0
+>0 : 0
+>16 : 16
+>(255 & (0 | n[(a + (h + 3 | 0) | 0) >> 0])) << 24 : number
+>(255 & (0 | n[(a + (h + 3 | 0) | 0) >> 0])) : number
+>255 & (0 | n[(a + (h + 3 | 0) | 0) >> 0]) : number
+>255 : 255
+>(0 | n[(a + (h + 3 | 0) | 0) >> 0]) : number
+>0 | n[(a + (h + 3 | 0) | 0) >> 0] : number
+>0 : 0
+>n[(a + (h + 3 | 0) | 0) >> 0] : error
+>n : error
+>(a + (h + 3 | 0) | 0) >> 0 : number
+>(a + (h + 3 | 0) | 0) : number
+>a + (h + 3 | 0) | 0 : number
+>a + (h + 3 | 0) : any
+>a : any
+>(h + 3 | 0) : number
+>h + 3 | 0 : number
+>h + 3 : number
+>h : number
+>3 : 3
+>0 : 0
+>0 : 0
+>0 : 0
+>24 : 24
+>o[(i + (d << 2) | 0) >> 2] = c : number
+>o[(i + (d << 2) | 0) >> 2] : error
+>o : error
+>(i + (d << 2) | 0) >> 2 : number
+>(i + (d << 2) | 0) : number
+>i + (d << 2) | 0 : number
+>i + (d << 2) : error
+>i : error
+>(d << 2) : number
+>d << 2 : number
+>d : number
+>2 : 2
+>0 : 0
+>2 : 2
+>c : number
+>d = d + 1 | 0 : number
+>d : number
+>d + 1 | 0 : number
+>d + 1 : number
+>d : number
+>1 : 1
+>0 : 0
+>h = h + 4 | 0 : number
+>h : number
+>h + 4 | 0 : number
+>h + 4 : number
+>h : number
+>4 : 4
+>0 : 0
+
+                                f = s
+>f = s : error
+>f : error
+>s : error
+
+                            }(T, A, 64), E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 57434055 | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 2054922799 | 0) | 0) << 21 | E >>> 11) + w | 0) + (1309151649 + (((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 30611744 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1560198380 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1120210379 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (718787259 + ((M ^ (S | -1 ^ E)) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 343485551 | 0) | 0) << 21 | E >>> 11) + w | 0, r = M, a = (0 | o[(i = y) >> 2]) + r | 0, o[i >> 2] = a, u = E, c = (0 | o[(s = y + 4 | 0) >> 2]) + u | 0, o[s >> 2] = c, d = w, p = (0 | o[(h = y + 8 | 0) >> 2]) + d | 0, o[h >> 2] = p, _ = S, g = (0 | o[(m = y + 12 | 0) >> 2]) + _ | 0, o[m >> 2] = g, f = v
+>T : error
+>A : any
+>64 : 64
+>E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 57434055 | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 2054922799 | 0) | 0) << 21 | E >>> 11) + w | 0) + (1309151649 + (((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 30611744 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1560198380 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1120210379 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (718787259 + ((M ^ (S | -1 ^ E)) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 343485551 | 0) | 0) << 21 | E >>> 11) + w | 0 : number
+>E : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 57434055 | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 2054922799 | 0) | 0) << 21 | E >>> 11) + w | 0) + (1309151649 + (((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 30611744 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1560198380 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1120210379 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (718787259 + ((M ^ (S | -1 ^ E)) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 343485551 | 0) | 0) << 21 | E >>> 11) + w | 0 : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 57434055 | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 2054922799 | 0) | 0) << 21 | E >>> 11) + w | 0) + (1309151649 + (((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 30611744 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1560198380 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1120210379 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (718787259 + ((M ^ (S | -1 ^ E)) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 343485551 | 0) | 0) << 21 | E >>> 11) + w : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 57434055 | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 2054922799 | 0) | 0) << 21 | E >>> 11) + w | 0) + (1309151649 + (((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 30611744 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1560198380 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1120210379 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (718787259 + ((M ^ (S | -1 ^ E)) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 343485551 | 0) | 0) << 21 | E >>> 11) : number
+>E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 57434055 | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 2054922799 | 0) | 0) << 21 | E >>> 11) + w | 0) + (1309151649 + (((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 30611744 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1560198380 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1120210379 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (718787259 + ((M ^ (S | -1 ^ E)) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 343485551 | 0) | 0) << 21 | E >>> 11 : number
+>E : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 57434055 | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 2054922799 | 0) | 0) << 21 | E >>> 11) + w | 0) + (1309151649 + (((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 30611744 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1560198380 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1120210379 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (718787259 + ((M ^ (S | -1 ^ E)) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 343485551 | 0) | 0) << 21 | E >>> 11 : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 57434055 | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 2054922799 | 0) | 0) << 21 | E >>> 11) + w | 0) + (1309151649 + (((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 30611744 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1560198380 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1120210379 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (718787259 + ((M ^ (S | -1 ^ E)) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 343485551 | 0) | 0) << 21 : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 57434055 | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 2054922799 | 0) | 0) << 21 | E >>> 11) + w | 0) + (1309151649 + (((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 30611744 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1560198380 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1120210379 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (718787259 + ((M ^ (S | -1 ^ E)) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 343485551 | 0) | 0) : number
+>E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 57434055 | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 2054922799 | 0) | 0) << 21 | E >>> 11) + w | 0) + (1309151649 + (((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 30611744 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1560198380 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1120210379 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (718787259 + ((M ^ (S | -1 ^ E)) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 343485551 | 0) | 0 : number
+>E : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 57434055 | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 2054922799 | 0) | 0) << 21 | E >>> 11) + w | 0) + (1309151649 + (((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 30611744 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1560198380 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1120210379 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (718787259 + ((M ^ (S | -1 ^ E)) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 343485551 | 0) | 0 : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 57434055 | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 2054922799 | 0) | 0) << 21 | E >>> 11) + w | 0) + (1309151649 + (((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 30611744 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1560198380 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1120210379 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (718787259 + ((M ^ (S | -1 ^ E)) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 343485551 | 0) : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 57434055 | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 2054922799 | 0) | 0) << 21 | E >>> 11) + w | 0) + (1309151649 + (((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 30611744 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1560198380 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 21 | E >>> 11) + w | 0) : number
+>E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 57434055 | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 2054922799 | 0) | 0) << 21 | E >>> 11) + w | 0) + (1309151649 + (((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 30611744 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1560198380 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 21 | E >>> 11) + w | 0 : number
+>E : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 57434055 | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 2054922799 | 0) | 0) << 21 | E >>> 11) + w | 0) + (1309151649 + (((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 30611744 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1560198380 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 21 | E >>> 11) + w | 0 : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 57434055 | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 2054922799 | 0) | 0) << 21 | E >>> 11) + w | 0) + (1309151649 + (((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 30611744 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1560198380 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 21 | E >>> 11) + w : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 57434055 | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 2054922799 | 0) | 0) << 21 | E >>> 11) + w | 0) + (1309151649 + (((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 30611744 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1560198380 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 21 | E >>> 11) : number
+>E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 57434055 | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 2054922799 | 0) | 0) << 21 | E >>> 11) + w | 0) + (1309151649 + (((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 30611744 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1560198380 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 21 | E >>> 11 : number
+>E : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 57434055 | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 2054922799 | 0) | 0) << 21 | E >>> 11) + w | 0) + (1309151649 + (((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 30611744 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1560198380 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 21 | E >>> 11 : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 57434055 | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 2054922799 | 0) | 0) << 21 | E >>> 11) + w | 0) + (1309151649 + (((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 30611744 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1560198380 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 21 : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 57434055 | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 2054922799 | 0) | 0) << 21 | E >>> 11) + w | 0) + (1309151649 + (((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 30611744 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1560198380 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) : number
+>E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 57434055 | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 2054922799 | 0) | 0) << 21 | E >>> 11) + w | 0) + (1309151649 + (((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 30611744 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1560198380 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0 : number
+>E : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 57434055 | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 2054922799 | 0) | 0) << 21 | E >>> 11) + w | 0) + (1309151649 + (((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 30611744 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1560198380 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0 : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 57434055 | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 2054922799 | 0) | 0) << 21 | E >>> 11) + w | 0) + (1309151649 + (((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 30611744 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1560198380 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 57434055 | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 2054922799 | 0) | 0) << 21 | E >>> 11) + w | 0) : number
+>E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 57434055 | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 2054922799 | 0) | 0) << 21 | E >>> 11) + w | 0 : number
+>E : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 57434055 | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 2054922799 | 0) | 0) << 21 | E >>> 11) + w | 0 : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 57434055 | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 2054922799 | 0) | 0) << 21 | E >>> 11) + w : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 57434055 | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 2054922799 | 0) | 0) << 21 | E >>> 11) : number
+>E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 57434055 | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 2054922799 | 0) | 0) << 21 | E >>> 11 : number
+>E : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 57434055 | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 2054922799 | 0) | 0) << 21 | E >>> 11 : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 57434055 | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 2054922799 | 0) | 0) << 21 : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 57434055 | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 2054922799 | 0) | 0) : number
+>E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 57434055 | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 2054922799 | 0) | 0 : number
+>E : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 57434055 | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 2054922799 | 0) | 0 : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 57434055 | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 2054922799 | 0) : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 57434055 | 0) | 0) << 21 | E >>> 11) + w | 0) : number
+>E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 57434055 | 0) | 0) << 21 | E >>> 11) + w | 0 : number
+>E : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 57434055 | 0) | 0) << 21 | E >>> 11) + w | 0 : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 57434055 | 0) | 0) << 21 | E >>> 11) + w : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 57434055 | 0) | 0) << 21 | E >>> 11) : number
+>E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 57434055 | 0) | 0) << 21 | E >>> 11 : number
+>E : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 57434055 | 0) | 0) << 21 | E >>> 11 : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 57434055 | 0) | 0) << 21 : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 57434055 | 0) | 0) : number
+>E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 57434055 | 0) | 0 : number
+>E : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 57434055 | 0) | 0 : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 57434055 | 0) : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w | 0) : number
+>E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w | 0 : number
+>E : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w | 0 : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) : number
+>E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9 : number
+>E : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9 : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) : number
+>E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0 : number
+>E : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0 : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) : number
+>E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0 : number
+>E : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0 : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) : number
+>E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9 : number
+>E : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9 : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) : number
+>E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0 : number
+>E : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0 : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) : number
+>E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0 : number
+>E : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0 : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) : number
+>E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9 : number
+>E : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9 : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) : number
+>E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0 : number
+>E : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0 : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) : number
+>E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0 : number
+>E : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0 : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) : number
+>E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9 : number
+>E : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9 : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) : number
+>E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0 : number
+>E : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0 : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) : number
+>E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0 : number
+>E : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0 : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) : number
+>E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12 : number
+>E : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12 : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) : number
+>E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0 : number
+>E : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0 : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) : number
+>E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0 : number
+>E : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0 : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) : number
+>E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12 : number
+>E : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12 : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) : number
+>E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0 : number
+>E : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0 : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) : number
+>E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0 : number
+>E : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0 : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) : number
+>E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12 : number
+>E : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12 : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) : number
+>E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0 : number
+>E : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0 : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) : number
+>E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0 : number
+>E : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0 : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) : number
+>E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12 : number
+>E : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12 : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) : number
+>E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0 : number
+>E : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0 : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) : number
+>E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0 : number
+>E : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0 : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) : number
+>E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10 : number
+>E : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10 : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) : number
+>E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0 : number
+>E : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0 : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) : number
+>(E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) : number
+>E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0 : number
+>E : number
+>(E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0 : number
+>(E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w : number
+>(E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) : number
+>E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10 : number
+>E : number
+>(E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10 : number
+>(E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 : number
+>(E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) : number
+>E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0 : number
+>E : number
+>(E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0 : number
+>(E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) : number
+>(E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) : number
+>E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0 : number
+>E : number
+>(E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0 : number
+>(E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w : number
+>(E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) : number
+>E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10 : number
+>E : number
+>(E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10 : number
+>(E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 : number
+>(E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) : number
+>E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0 : number
+>E : number
+>(E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0 : number
+>(E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) : number
+>(E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) : number
+>E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0 : number
+>E : number
+>(E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0 : number
+>(E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w : number
+>(E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) : number
+>E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10 : number
+>E : number
+>(E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10 : number
+>(E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 : number
+>(E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) : number
+>E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0 : number
+>E : number
+>E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0 : number
+>E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) : number
+>E : number
+>((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) : number
+>(((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0 : number
+>(((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 : number
+>(((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) : number
+>((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0 : number
+>((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) : number
+>((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) : number
+>(w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M : number
+>(w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S : number
+>(w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) : number
+>w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0 : number
+>w : number
+>(w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0 : number
+>(w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S : number
+>(w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) : number
+>w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15 : number
+>w : number
+>(w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15 : number
+>(w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 : number
+>(w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) : number
+>w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0 : number
+>w : number
+>w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0 : number
+>w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) : number
+>w : number
+>(606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) : number
+>606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0 : number
+>606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) : number
+>606105819 : 606105819
+>(((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) : number
+>((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0 : number
+>((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) : number
+>((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) : number
+>(S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E : number
+>(S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M : number
+>(S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) : number
+>S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0 : number
+>S : number
+>(S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0 : number
+>(S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M : number
+>(S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) : number
+>S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20 : number
+>S : number
+>(S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20 : number
+>(S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 : number
+>(S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) : number
+>S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0 : number
+>S : number
+>S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0 : number
+>S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) : number
+>S : number
+>((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) : number
+>(((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0 : number
+>(((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 : number
+>(((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) : number
+>((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0 : number
+>((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) : number
+>((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) : number
+>(M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w : number
+>(M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E : number
+>(M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) : number
+>M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0 : number
+>M : number
+>(M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0 : number
+>(M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E : number
+>(M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) : number
+>M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25 : number
+>M : number
+>(M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25 : number
+>(M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 : number
+>(M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) : number
+>M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0 : number
+>M : number
+>M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0 : number
+>M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) : number
+>M : number
+>(((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) : number
+>((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0 : number
+>((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 : number
+>((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) : number
+>(E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0 : number
+>(E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) : number
+>(E & w | (-1 ^ E) & S) : number
+>E & w | (-1 ^ E) & S : number
+>E & w : number
+>E : number
+>w : number
+>(-1 ^ E) & S : number
+>(-1 ^ E) : number
+>-1 ^ E : number
+>-1 : -1
+>1 : 1
+>E : number
+>S : number
+>(0 | o[T >> 2]) : number
+>0 | o[T >> 2] : number
+>0 : 0
+>o[T >> 2] : error
+>o : error
+>T >> 2 : number
+>T : error
+>2 : 2
+>0 : 0
+>680876936 : 680876936
+>0 : 0
+>0 : 0
+>7 : 7
+>M >>> 25 : number
+>M : number
+>25 : 25
+>E : number
+>0 : 0
+>E : number
+>(-1 ^ M) & w : number
+>(-1 ^ M) : number
+>-1 ^ M : number
+>-1 : -1
+>1 : 1
+>M : number
+>w : number
+>(0 | o[(T + 4 | 0) >> 2]) : number
+>0 | o[(T + 4 | 0) >> 2] : number
+>0 : 0
+>o[(T + 4 | 0) >> 2] : error
+>o : error
+>(T + 4 | 0) >> 2 : number
+>(T + 4 | 0) : number
+>T + 4 | 0 : number
+>T + 4 : error
+>T : error
+>4 : 4
+>0 : 0
+>2 : 2
+>0 : 0
+>389564586 : 389564586
+>0 : 0
+>0 : 0
+>12 : 12
+>S >>> 20 : number
+>S : number
+>20 : 20
+>M : number
+>0 : 0
+>M : number
+>(-1 ^ S) & E : number
+>(-1 ^ S) : number
+>-1 ^ S : number
+>-1 : -1
+>1 : 1
+>S : number
+>E : number
+>(0 | o[(T + 8 | 0) >> 2]) : number
+>0 | o[(T + 8 | 0) >> 2] : number
+>0 : 0
+>o[(T + 8 | 0) >> 2] : error
+>o : error
+>(T + 8 | 0) >> 2 : number
+>(T + 8 | 0) : number
+>T + 8 | 0 : number
+>T + 8 : error
+>T : error
+>8 : 8
+>0 : 0
+>2 : 2
+>0 : 0
+>0 : 0
+>0 : 0
+>17 : 17
+>w >>> 15 : number
+>w : number
+>15 : 15
+>S : number
+>0 : 0
+>S : number
+>(-1 ^ w) & M : number
+>(-1 ^ w) : number
+>-1 ^ w : number
+>-1 : -1
+>1 : 1
+>w : number
+>M : number
+>(0 | o[(T + 12 | 0) >> 2]) : number
+>0 | o[(T + 12 | 0) >> 2] : number
+>0 : 0
+>o[(T + 12 | 0) >> 2] : error
+>o : error
+>(T + 12 | 0) >> 2 : number
+>(T + 12 | 0) : number
+>T + 12 | 0 : number
+>T + 12 : error
+>T : error
+>12 : 12
+>0 : 0
+>2 : 2
+>0 : 0
+>1044525330 : 1044525330
+>0 : 0
+>0 : 0
+>22 : 22
+>E >>> 10 : number
+>E : number
+>10 : 10
+>w : number
+>0 : 0
+>((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) : number
+>(((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0 : number
+>(((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 : number
+>(((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) : number
+>((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0 : number
+>((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) : number
+>((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) : number
+>(w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M : number
+>(w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S : number
+>(w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) : number
+>w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0 : number
+>w : number
+>(w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0 : number
+>(w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S : number
+>(w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) : number
+>w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15 : number
+>w : number
+>(w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15 : number
+>(w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 : number
+>(w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) : number
+>w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0 : number
+>w : number
+>w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0 : number
+>w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) : number
+>w : number
+>((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) : number
+>(((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0 : number
+>(((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 : number
+>(((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) : number
+>((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0 : number
+>((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) : number
+>((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) : number
+>(S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E : number
+>(S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M : number
+>(S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) : number
+>S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0 : number
+>S : number
+>(S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0 : number
+>(S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M : number
+>(S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) : number
+>S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20 : number
+>S : number
+>(S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20 : number
+>(S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 : number
+>(S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) : number
+>S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0 : number
+>S : number
+>S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0 : number
+>S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) : number
+>S : number
+>(1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) : number
+>1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0 : number
+>1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) : number
+>1200080426 : 1200080426
+>(((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) : number
+>((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0 : number
+>((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) : number
+>((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) : number
+>(M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w : number
+>(M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E : number
+>(M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) : number
+>M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0 : number
+>M : number
+>(M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0 : number
+>(M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E : number
+>(M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) : number
+>M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25 : number
+>M : number
+>(M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25 : number
+>(M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 : number
+>(M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) : number
+>M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0 : number
+>M : number
+>M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0 : number
+>M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) : number
+>M : number
+>(((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) : number
+>((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0 : number
+>((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 : number
+>((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) : number
+>(E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0 : number
+>(E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) : number
+>(E & w | (-1 ^ E) & S) : number
+>E & w | (-1 ^ E) & S : number
+>E & w : number
+>E : number
+>w : number
+>(-1 ^ E) & S : number
+>(-1 ^ E) : number
+>-1 ^ E : number
+>-1 : -1
+>1 : 1
+>E : number
+>S : number
+>(0 | o[(T + 16 | 0) >> 2]) : number
+>0 | o[(T + 16 | 0) >> 2] : number
+>0 : 0
+>o[(T + 16 | 0) >> 2] : error
+>o : error
+>(T + 16 | 0) >> 2 : number
+>(T + 16 | 0) : number
+>T + 16 | 0 : number
+>T + 16 : error
+>T : error
+>16 : 16
+>0 : 0
+>2 : 2
+>0 : 0
+>176418897 : 176418897
+>0 : 0
+>0 : 0
+>7 : 7
+>M >>> 25 : number
+>M : number
+>25 : 25
+>E : number
+>0 : 0
+>E : number
+>(-1 ^ M) & w : number
+>(-1 ^ M) : number
+>-1 ^ M : number
+>-1 : -1
+>1 : 1
+>M : number
+>w : number
+>(0 | o[(T + 20 | 0) >> 2]) : number
+>0 | o[(T + 20 | 0) >> 2] : number
+>0 : 0
+>o[(T + 20 | 0) >> 2] : error
+>o : error
+>(T + 20 | 0) >> 2 : number
+>(T + 20 | 0) : number
+>T + 20 | 0 : number
+>T + 20 : error
+>T : error
+>20 : 20
+>0 : 0
+>2 : 2
+>0 : 0
+>0 : 0
+>0 : 0
+>12 : 12
+>S >>> 20 : number
+>S : number
+>20 : 20
+>M : number
+>0 : 0
+>M : number
+>(-1 ^ S) & E : number
+>(-1 ^ S) : number
+>-1 ^ S : number
+>-1 : -1
+>1 : 1
+>S : number
+>E : number
+>(0 | o[(T + 24 | 0) >> 2]) : number
+>0 | o[(T + 24 | 0) >> 2] : number
+>0 : 0
+>o[(T + 24 | 0) >> 2] : error
+>o : error
+>(T + 24 | 0) >> 2 : number
+>(T + 24 | 0) : number
+>T + 24 | 0 : number
+>T + 24 : error
+>T : error
+>24 : 24
+>0 : 0
+>2 : 2
+>0 : 0
+>1473231341 : 1473231341
+>0 : 0
+>0 : 0
+>17 : 17
+>w >>> 15 : number
+>w : number
+>15 : 15
+>S : number
+>0 : 0
+>S : number
+>(-1 ^ w) & M : number
+>(-1 ^ w) : number
+>-1 ^ w : number
+>-1 : -1
+>1 : 1
+>w : number
+>M : number
+>(0 | o[(T + 28 | 0) >> 2]) : number
+>0 | o[(T + 28 | 0) >> 2] : number
+>0 : 0
+>o[(T + 28 | 0) >> 2] : error
+>o : error
+>(T + 28 | 0) >> 2 : number
+>(T + 28 | 0) : number
+>T + 28 | 0 : number
+>T + 28 : error
+>T : error
+>28 : 28
+>0 : 0
+>2 : 2
+>0 : 0
+>45705983 : 45705983
+>0 : 0
+>0 : 0
+>22 : 22
+>E >>> 10 : number
+>E : number
+>10 : 10
+>w : number
+>0 : 0
+>((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) : number
+>(((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0 : number
+>(((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 : number
+>(((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) : number
+>((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0 : number
+>((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) : number
+>((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) : number
+>(w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M : number
+>(w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S : number
+>(w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) : number
+>w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0 : number
+>w : number
+>(w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0 : number
+>(w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S : number
+>(w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) : number
+>w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15 : number
+>w : number
+>(w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15 : number
+>(w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 : number
+>(w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) : number
+>w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0 : number
+>w : number
+>w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0 : number
+>w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) : number
+>w : number
+>((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) : number
+>(((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0 : number
+>(((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 : number
+>(((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) : number
+>((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0 : number
+>((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) : number
+>((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) : number
+>(S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E : number
+>(S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M : number
+>(S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) : number
+>S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0 : number
+>S : number
+>(S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0 : number
+>(S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M : number
+>(S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) : number
+>S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20 : number
+>S : number
+>(S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20 : number
+>(S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 : number
+>(S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) : number
+>S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0 : number
+>S : number
+>S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0 : number
+>S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) : number
+>S : number
+>((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) : number
+>(((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0 : number
+>(((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 : number
+>(((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) : number
+>((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0 : number
+>((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) : number
+>((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) : number
+>(M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w : number
+>(M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E : number
+>(M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) : number
+>M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0 : number
+>M : number
+>(M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0 : number
+>(M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E : number
+>(M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) : number
+>M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25 : number
+>M : number
+>(M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25 : number
+>(M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 : number
+>(M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) : number
+>M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0 : number
+>M : number
+>M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0 : number
+>M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) : number
+>M : number
+>(1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) : number
+>1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0 : number
+>1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) : number
+>1770035416 : 1770035416
+>((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) : number
+>(E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0 : number
+>(E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) : number
+>(E & w | (-1 ^ E) & S) : number
+>E & w | (-1 ^ E) & S : number
+>E & w : number
+>E : number
+>w : number
+>(-1 ^ E) & S : number
+>(-1 ^ E) : number
+>-1 ^ E : number
+>-1 : -1
+>1 : 1
+>E : number
+>S : number
+>(0 | o[(T + 32 | 0) >> 2]) : number
+>0 | o[(T + 32 | 0) >> 2] : number
+>0 : 0
+>o[(T + 32 | 0) >> 2] : error
+>o : error
+>(T + 32 | 0) >> 2 : number
+>(T + 32 | 0) : number
+>T + 32 | 0 : number
+>T + 32 : error
+>T : error
+>32 : 32
+>0 : 0
+>2 : 2
+>0 : 0
+>0 : 0
+>0 : 0
+>7 : 7
+>M >>> 25 : number
+>M : number
+>25 : 25
+>E : number
+>0 : 0
+>E : number
+>(-1 ^ M) & w : number
+>(-1 ^ M) : number
+>-1 ^ M : number
+>-1 : -1
+>1 : 1
+>M : number
+>w : number
+>(0 | o[(T + 36 | 0) >> 2]) : number
+>0 | o[(T + 36 | 0) >> 2] : number
+>0 : 0
+>o[(T + 36 | 0) >> 2] : error
+>o : error
+>(T + 36 | 0) >> 2 : number
+>(T + 36 | 0) : number
+>T + 36 | 0 : number
+>T + 36 : error
+>T : error
+>36 : 36
+>0 : 0
+>2 : 2
+>0 : 0
+>1958414417 : 1958414417
+>0 : 0
+>0 : 0
+>12 : 12
+>S >>> 20 : number
+>S : number
+>20 : 20
+>M : number
+>0 : 0
+>M : number
+>(-1 ^ S) & E : number
+>(-1 ^ S) : number
+>-1 ^ S : number
+>-1 : -1
+>1 : 1
+>S : number
+>E : number
+>(0 | o[(T + 40 | 0) >> 2]) : number
+>0 | o[(T + 40 | 0) >> 2] : number
+>0 : 0
+>o[(T + 40 | 0) >> 2] : error
+>o : error
+>(T + 40 | 0) >> 2 : number
+>(T + 40 | 0) : number
+>T + 40 | 0 : number
+>T + 40 : error
+>T : error
+>40 : 40
+>0 : 0
+>2 : 2
+>0 : 0
+>42063 : 42063
+>0 : 0
+>0 : 0
+>17 : 17
+>w >>> 15 : number
+>w : number
+>15 : 15
+>S : number
+>0 : 0
+>S : number
+>(-1 ^ w) & M : number
+>(-1 ^ w) : number
+>-1 ^ w : number
+>-1 : -1
+>1 : 1
+>w : number
+>M : number
+>(0 | o[(T + 44 | 0) >> 2]) : number
+>0 | o[(T + 44 | 0) >> 2] : number
+>0 : 0
+>o[(T + 44 | 0) >> 2] : error
+>o : error
+>(T + 44 | 0) >> 2 : number
+>(T + 44 | 0) : number
+>T + 44 | 0 : number
+>T + 44 : error
+>T : error
+>44 : 44
+>0 : 0
+>2 : 2
+>0 : 0
+>1990404162 : 1990404162
+>0 : 0
+>0 : 0
+>22 : 22
+>E >>> 10 : number
+>E : number
+>10 : 10
+>w : number
+>0 : 0
+>(1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) : number
+>1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0 : number
+>1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) : number
+>1236535329 : 1236535329
+>(((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) : number
+>((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0 : number
+>((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) : number
+>((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) : number
+>(w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M : number
+>(w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S : number
+>(w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) : number
+>w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0 : number
+>w : number
+>(w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0 : number
+>(w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S : number
+>(w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) : number
+>w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15 : number
+>w : number
+>(w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15 : number
+>(w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 : number
+>(w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) : number
+>w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0 : number
+>w : number
+>w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0 : number
+>w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) : number
+>w : number
+>((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) : number
+>(((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0 : number
+>(((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 : number
+>(((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) : number
+>((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0 : number
+>((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) : number
+>((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) : number
+>(S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E : number
+>(S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M : number
+>(S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) : number
+>S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0 : number
+>S : number
+>(S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0 : number
+>(S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M : number
+>(S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) : number
+>S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20 : number
+>S : number
+>(S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20 : number
+>(S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 : number
+>(S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) : number
+>S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0 : number
+>S : number
+>S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0 : number
+>S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) : number
+>S : number
+>((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) : number
+>(((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0 : number
+>(((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 : number
+>(((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) : number
+>((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0 : number
+>((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) : number
+>((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) : number
+>(M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w : number
+>(M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E : number
+>(M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) : number
+>M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0 : number
+>M : number
+>(M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0 : number
+>(M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E : number
+>(M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) : number
+>M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25 : number
+>M : number
+>(M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25 : number
+>(M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 : number
+>(M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) : number
+>M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0 : number
+>M : number
+>M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0 : number
+>M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) : number
+>M : number
+>(1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) : number
+>1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0 : number
+>1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) : number
+>1804603682 : 1804603682
+>((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) : number
+>(E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0 : number
+>(E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) : number
+>(E & w | (-1 ^ E) & S) : number
+>E & w | (-1 ^ E) & S : number
+>E & w : number
+>E : number
+>w : number
+>(-1 ^ E) & S : number
+>(-1 ^ E) : number
+>-1 ^ E : number
+>-1 : -1
+>1 : 1
+>E : number
+>S : number
+>(0 | o[(T + 48 | 0) >> 2]) : number
+>0 | o[(T + 48 | 0) >> 2] : number
+>0 : 0
+>o[(T + 48 | 0) >> 2] : error
+>o : error
+>(T + 48 | 0) >> 2 : number
+>(T + 48 | 0) : number
+>T + 48 | 0 : number
+>T + 48 : error
+>T : error
+>48 : 48
+>0 : 0
+>2 : 2
+>0 : 0
+>0 : 0
+>0 : 0
+>7 : 7
+>M >>> 25 : number
+>M : number
+>25 : 25
+>E : number
+>0 : 0
+>E : number
+>(-1 ^ M) & w : number
+>(-1 ^ M) : number
+>-1 ^ M : number
+>-1 : -1
+>1 : 1
+>M : number
+>w : number
+>(0 | o[(T + 52 | 0) >> 2]) : number
+>0 | o[(T + 52 | 0) >> 2] : number
+>0 : 0
+>o[(T + 52 | 0) >> 2] : error
+>o : error
+>(T + 52 | 0) >> 2 : number
+>(T + 52 | 0) : number
+>T + 52 | 0 : number
+>T + 52 : error
+>T : error
+>52 : 52
+>0 : 0
+>2 : 2
+>0 : 0
+>40341101 : 40341101
+>0 : 0
+>0 : 0
+>12 : 12
+>S >>> 20 : number
+>S : number
+>20 : 20
+>M : number
+>0 : 0
+>M : number
+>(-1 ^ S) & E : number
+>(-1 ^ S) : number
+>-1 ^ S : number
+>-1 : -1
+>1 : 1
+>S : number
+>E : number
+>(0 | o[(T + 56 | 0) >> 2]) : number
+>0 | o[(T + 56 | 0) >> 2] : number
+>0 : 0
+>o[(T + 56 | 0) >> 2] : error
+>o : error
+>(T + 56 | 0) >> 2 : number
+>(T + 56 | 0) : number
+>T + 56 | 0 : number
+>T + 56 : error
+>T : error
+>56 : 56
+>0 : 0
+>2 : 2
+>0 : 0
+>1502002290 : 1502002290
+>0 : 0
+>0 : 0
+>17 : 17
+>w >>> 15 : number
+>w : number
+>15 : 15
+>S : number
+>0 : 0
+>S : number
+>(-1 ^ w) & M : number
+>(-1 ^ w) : number
+>-1 ^ w : number
+>-1 : -1
+>1 : 1
+>w : number
+>M : number
+>(0 | o[(T + 60 | 0) >> 2]) : number
+>0 | o[(T + 60 | 0) >> 2] : number
+>0 : 0
+>o[(T + 60 | 0) >> 2] : error
+>o : error
+>(T + 60 | 0) >> 2 : number
+>(T + 60 | 0) : number
+>T + 60 | 0 : number
+>T + 60 : error
+>T : error
+>60 : 60
+>0 : 0
+>2 : 2
+>0 : 0
+>0 : 0
+>0 : 0
+>22 : 22
+>E >>> 10 : number
+>E : number
+>10 : 10
+>w : number
+>0 : 0
+>((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) : number
+>(((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0 : number
+>(((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 : number
+>(((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) : number
+>((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0 : number
+>((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) : number
+>((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) : number
+>(w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M) : number
+>(w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M : number
+>(w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) : number
+>w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0 : number
+>w : number
+>(w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0 : number
+>(w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S : number
+>(w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) : number
+>w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18 : number
+>w : number
+>(w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18 : number
+>(w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 : number
+>(w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) : number
+>w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0 : number
+>w : number
+>w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0 : number
+>w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) : number
+>w : number
+>(643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) : number
+>643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0 : number
+>643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) : number
+>643717713 : 643717713
+>(((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) : number
+>((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0 : number
+>((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) : number
+>((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) : number
+>(S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E) : number
+>(S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E : number
+>(S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) : number
+>S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0 : number
+>S : number
+>(S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0 : number
+>(S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M : number
+>(S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) : number
+>S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23 : number
+>S : number
+>(S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23 : number
+>(S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 : number
+>(S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) : number
+>S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0 : number
+>S : number
+>S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0 : number
+>S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) : number
+>S : number
+>((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) : number
+>(((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0 : number
+>(((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 : number
+>(((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) : number
+>((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0 : number
+>((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) : number
+>((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) : number
+>(M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w) : number
+>(M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w : number
+>(M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) : number
+>M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0 : number
+>M : number
+>(M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0 : number
+>(M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E : number
+>(M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) : number
+>M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27 : number
+>M : number
+>(M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27 : number
+>(M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 : number
+>(M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) : number
+>M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0 : number
+>M : number
+>M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0 : number
+>M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) : number
+>M : number
+>(((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) : number
+>((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0 : number
+>((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 : number
+>((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) : number
+>(E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0 : number
+>(E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) : number
+>(E & S | w & (-1 ^ S)) : number
+>E & S | w & (-1 ^ S) : number
+>E & S : number
+>E : number
+>S : number
+>w & (-1 ^ S) : number
+>w : number
+>(-1 ^ S) : number
+>-1 ^ S : number
+>-1 : -1
+>1 : 1
+>S : number
+>(0 | o[(T + 4 | 0) >> 2]) : number
+>0 | o[(T + 4 | 0) >> 2] : number
+>0 : 0
+>o[(T + 4 | 0) >> 2] : error
+>o : error
+>(T + 4 | 0) >> 2 : number
+>(T + 4 | 0) : number
+>T + 4 | 0 : number
+>T + 4 : error
+>T : error
+>4 : 4
+>0 : 0
+>2 : 2
+>0 : 0
+>165796510 : 165796510
+>0 : 0
+>0 : 0
+>5 : 5
+>M >>> 27 : number
+>M : number
+>27 : 27
+>E : number
+>0 : 0
+>w : number
+>E & (-1 ^ w) : number
+>E : number
+>(-1 ^ w) : number
+>-1 ^ w : number
+>-1 : -1
+>1 : 1
+>w : number
+>(0 | o[(T + 24 | 0) >> 2]) : number
+>0 | o[(T + 24 | 0) >> 2] : number
+>0 : 0
+>o[(T + 24 | 0) >> 2] : error
+>o : error
+>(T + 24 | 0) >> 2 : number
+>(T + 24 | 0) : number
+>T + 24 | 0 : number
+>T + 24 : error
+>T : error
+>24 : 24
+>0 : 0
+>2 : 2
+>0 : 0
+>1069501632 : 1069501632
+>0 : 0
+>0 : 0
+>9 : 9
+>S >>> 23 : number
+>S : number
+>23 : 23
+>M : number
+>0 : 0
+>E : number
+>M & (-1 ^ E) : number
+>M : number
+>(-1 ^ E) : number
+>-1 ^ E : number
+>-1 : -1
+>1 : 1
+>E : number
+>(0 | o[(T + 44 | 0) >> 2]) : number
+>0 | o[(T + 44 | 0) >> 2] : number
+>0 : 0
+>o[(T + 44 | 0) >> 2] : error
+>o : error
+>(T + 44 | 0) >> 2 : number
+>(T + 44 | 0) : number
+>T + 44 | 0 : number
+>T + 44 : error
+>T : error
+>44 : 44
+>0 : 0
+>2 : 2
+>0 : 0
+>0 : 0
+>0 : 0
+>14 : 14
+>w >>> 18 : number
+>w : number
+>18 : 18
+>S : number
+>0 : 0
+>M : number
+>S & (-1 ^ M) : number
+>S : number
+>(-1 ^ M) : number
+>-1 ^ M : number
+>-1 : -1
+>1 : 1
+>M : number
+>(0 | o[T >> 2]) : number
+>0 | o[T >> 2] : number
+>0 : 0
+>o[T >> 2] : error
+>o : error
+>T >> 2 : number
+>T : error
+>2 : 2
+>0 : 0
+>373897302 : 373897302
+>0 : 0
+>0 : 0
+>20 : 20
+>E >>> 12 : number
+>E : number
+>12 : 12
+>w : number
+>0 : 0
+>((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) : number
+>(((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0 : number
+>(((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 : number
+>(((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) : number
+>((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0 : number
+>((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) : number
+>((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) : number
+>(w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M) : number
+>(w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M : number
+>(w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) : number
+>w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0 : number
+>w : number
+>(w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0 : number
+>(w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S : number
+>(w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) : number
+>w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18 : number
+>w : number
+>(w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18 : number
+>(w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 : number
+>(w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) : number
+>w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0 : number
+>w : number
+>w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0 : number
+>w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) : number
+>w : number
+>((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) : number
+>(((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0 : number
+>(((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 : number
+>(((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) : number
+>((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0 : number
+>((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) : number
+>((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) : number
+>(S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E) : number
+>(S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E : number
+>(S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) : number
+>S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0 : number
+>S : number
+>(S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0 : number
+>(S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M : number
+>(S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) : number
+>S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23 : number
+>S : number
+>(S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23 : number
+>(S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 : number
+>(S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) : number
+>S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0 : number
+>S : number
+>S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0 : number
+>S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) : number
+>S : number
+>(38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) : number
+>38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0 : number
+>38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) : number
+>38016083 : 38016083
+>(((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) : number
+>((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0 : number
+>((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) : number
+>((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) : number
+>(M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w) : number
+>(M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w : number
+>(M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) : number
+>M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0 : number
+>M : number
+>(M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0 : number
+>(M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E : number
+>(M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) : number
+>M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27 : number
+>M : number
+>(M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27 : number
+>(M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 : number
+>(M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) : number
+>M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0 : number
+>M : number
+>M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0 : number
+>M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) : number
+>M : number
+>(((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) : number
+>((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0 : number
+>((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 : number
+>((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) : number
+>(E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0 : number
+>(E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) : number
+>(E & S | w & (-1 ^ S)) : number
+>E & S | w & (-1 ^ S) : number
+>E & S : number
+>E : number
+>S : number
+>w & (-1 ^ S) : number
+>w : number
+>(-1 ^ S) : number
+>-1 ^ S : number
+>-1 : -1
+>1 : 1
+>S : number
+>(0 | o[(T + 20 | 0) >> 2]) : number
+>0 | o[(T + 20 | 0) >> 2] : number
+>0 : 0
+>o[(T + 20 | 0) >> 2] : error
+>o : error
+>(T + 20 | 0) >> 2 : number
+>(T + 20 | 0) : number
+>T + 20 | 0 : number
+>T + 20 : error
+>T : error
+>20 : 20
+>0 : 0
+>2 : 2
+>0 : 0
+>701558691 : 701558691
+>0 : 0
+>0 : 0
+>5 : 5
+>M >>> 27 : number
+>M : number
+>27 : 27
+>E : number
+>0 : 0
+>w : number
+>E & (-1 ^ w) : number
+>E : number
+>(-1 ^ w) : number
+>-1 ^ w : number
+>-1 : -1
+>1 : 1
+>w : number
+>(0 | o[(T + 40 | 0) >> 2]) : number
+>0 | o[(T + 40 | 0) >> 2] : number
+>0 : 0
+>o[(T + 40 | 0) >> 2] : error
+>o : error
+>(T + 40 | 0) >> 2 : number
+>(T + 40 | 0) : number
+>T + 40 | 0 : number
+>T + 40 : error
+>T : error
+>40 : 40
+>0 : 0
+>2 : 2
+>0 : 0
+>0 : 0
+>0 : 0
+>9 : 9
+>S >>> 23 : number
+>S : number
+>23 : 23
+>M : number
+>0 : 0
+>E : number
+>M & (-1 ^ E) : number
+>M : number
+>(-1 ^ E) : number
+>-1 ^ E : number
+>-1 : -1
+>1 : 1
+>E : number
+>(0 | o[(T + 60 | 0) >> 2]) : number
+>0 | o[(T + 60 | 0) >> 2] : number
+>0 : 0
+>o[(T + 60 | 0) >> 2] : error
+>o : error
+>(T + 60 | 0) >> 2 : number
+>(T + 60 | 0) : number
+>T + 60 | 0 : number
+>T + 60 : error
+>T : error
+>60 : 60
+>0 : 0
+>2 : 2
+>0 : 0
+>660478335 : 660478335
+>0 : 0
+>0 : 0
+>14 : 14
+>w >>> 18 : number
+>w : number
+>18 : 18
+>S : number
+>0 : 0
+>M : number
+>S & (-1 ^ M) : number
+>S : number
+>(-1 ^ M) : number
+>-1 ^ M : number
+>-1 : -1
+>1 : 1
+>M : number
+>(0 | o[(T + 16 | 0) >> 2]) : number
+>0 | o[(T + 16 | 0) >> 2] : number
+>0 : 0
+>o[(T + 16 | 0) >> 2] : error
+>o : error
+>(T + 16 | 0) >> 2 : number
+>(T + 16 | 0) : number
+>T + 16 | 0 : number
+>T + 16 : error
+>T : error
+>16 : 16
+>0 : 0
+>2 : 2
+>0 : 0
+>405537848 : 405537848
+>0 : 0
+>0 : 0
+>20 : 20
+>E >>> 12 : number
+>E : number
+>12 : 12
+>w : number
+>0 : 0
+>(1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) : number
+>1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0 : number
+>1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) : number
+>1163531501 : 1163531501
+>(((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) : number
+>((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0 : number
+>((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) : number
+>((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) : number
+>(w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M) : number
+>(w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M : number
+>(w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) : number
+>w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0 : number
+>w : number
+>(w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0 : number
+>(w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S : number
+>(w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) : number
+>w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18 : number
+>w : number
+>(w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18 : number
+>(w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 : number
+>(w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) : number
+>w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0 : number
+>w : number
+>w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0 : number
+>w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) : number
+>w : number
+>((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) : number
+>(((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0 : number
+>(((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 : number
+>(((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) : number
+>((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0 : number
+>((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) : number
+>((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) : number
+>(S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E) : number
+>(S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E : number
+>(S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) : number
+>S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0 : number
+>S : number
+>(S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0 : number
+>(S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M : number
+>(S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) : number
+>S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23 : number
+>S : number
+>(S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23 : number
+>(S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 : number
+>(S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) : number
+>S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0 : number
+>S : number
+>S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0 : number
+>S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) : number
+>S : number
+>((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) : number
+>(((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0 : number
+>(((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 : number
+>(((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) : number
+>((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0 : number
+>((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) : number
+>((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) : number
+>(M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w) : number
+>(M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w : number
+>(M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) : number
+>M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0 : number
+>M : number
+>(M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0 : number
+>(M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E : number
+>(M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) : number
+>M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27 : number
+>M : number
+>(M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27 : number
+>(M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 : number
+>(M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) : number
+>M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0 : number
+>M : number
+>M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0 : number
+>M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) : number
+>M : number
+>(568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) : number
+>568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0 : number
+>568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) : number
+>568446438 : 568446438
+>((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) : number
+>(E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0 : number
+>(E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) : number
+>(E & S | w & (-1 ^ S)) : number
+>E & S | w & (-1 ^ S) : number
+>E & S : number
+>E : number
+>S : number
+>w & (-1 ^ S) : number
+>w : number
+>(-1 ^ S) : number
+>-1 ^ S : number
+>-1 : -1
+>1 : 1
+>S : number
+>(0 | o[(T + 36 | 0) >> 2]) : number
+>0 | o[(T + 36 | 0) >> 2] : number
+>0 : 0
+>o[(T + 36 | 0) >> 2] : error
+>o : error
+>(T + 36 | 0) >> 2 : number
+>(T + 36 | 0) : number
+>T + 36 | 0 : number
+>T + 36 : error
+>T : error
+>36 : 36
+>0 : 0
+>2 : 2
+>0 : 0
+>0 : 0
+>0 : 0
+>5 : 5
+>M >>> 27 : number
+>M : number
+>27 : 27
+>E : number
+>0 : 0
+>w : number
+>E & (-1 ^ w) : number
+>E : number
+>(-1 ^ w) : number
+>-1 ^ w : number
+>-1 : -1
+>1 : 1
+>w : number
+>(0 | o[(T + 56 | 0) >> 2]) : number
+>0 | o[(T + 56 | 0) >> 2] : number
+>0 : 0
+>o[(T + 56 | 0) >> 2] : error
+>o : error
+>(T + 56 | 0) >> 2 : number
+>(T + 56 | 0) : number
+>T + 56 | 0 : number
+>T + 56 : error
+>T : error
+>56 : 56
+>0 : 0
+>2 : 2
+>0 : 0
+>1019803690 : 1019803690
+>0 : 0
+>0 : 0
+>9 : 9
+>S >>> 23 : number
+>S : number
+>23 : 23
+>M : number
+>0 : 0
+>E : number
+>M & (-1 ^ E) : number
+>M : number
+>(-1 ^ E) : number
+>-1 ^ E : number
+>-1 : -1
+>1 : 1
+>E : number
+>(0 | o[(T + 12 | 0) >> 2]) : number
+>0 | o[(T + 12 | 0) >> 2] : number
+>0 : 0
+>o[(T + 12 | 0) >> 2] : error
+>o : error
+>(T + 12 | 0) >> 2 : number
+>(T + 12 | 0) : number
+>T + 12 | 0 : number
+>T + 12 : error
+>T : error
+>12 : 12
+>0 : 0
+>2 : 2
+>0 : 0
+>187363961 : 187363961
+>0 : 0
+>0 : 0
+>14 : 14
+>w >>> 18 : number
+>w : number
+>18 : 18
+>S : number
+>0 : 0
+>M : number
+>S & (-1 ^ M) : number
+>S : number
+>(-1 ^ M) : number
+>-1 ^ M : number
+>-1 : -1
+>1 : 1
+>M : number
+>(0 | o[(T + 32 | 0) >> 2]) : number
+>0 | o[(T + 32 | 0) >> 2] : number
+>0 : 0
+>o[(T + 32 | 0) >> 2] : error
+>o : error
+>(T + 32 | 0) >> 2 : number
+>(T + 32 | 0) : number
+>T + 32 | 0 : number
+>T + 32 : error
+>T : error
+>32 : 32
+>0 : 0
+>2 : 2
+>0 : 0
+>0 : 0
+>0 : 0
+>20 : 20
+>E >>> 12 : number
+>E : number
+>12 : 12
+>w : number
+>0 : 0
+>((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) : number
+>(((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0 : number
+>(((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 : number
+>(((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) : number
+>((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0 : number
+>((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) : number
+>((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) : number
+>(w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M) : number
+>(w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M : number
+>(w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) : number
+>w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0 : number
+>w : number
+>(w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0 : number
+>(w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S : number
+>(w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) : number
+>w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18 : number
+>w : number
+>(w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18 : number
+>(w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 : number
+>(w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) : number
+>w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0 : number
+>w : number
+>w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0 : number
+>w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) : number
+>w : number
+>(1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) : number
+>1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0 : number
+>1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) : number
+>1735328473 : 1735328473
+>(((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) : number
+>((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0 : number
+>((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) : number
+>((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) : number
+>(S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E) : number
+>(S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E : number
+>(S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) : number
+>S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0 : number
+>S : number
+>(S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0 : number
+>(S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M : number
+>(S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) : number
+>S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23 : number
+>S : number
+>(S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23 : number
+>(S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 : number
+>(S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) : number
+>S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0 : number
+>S : number
+>S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0 : number
+>S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) : number
+>S : number
+>((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) : number
+>(((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0 : number
+>(((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 : number
+>(((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) : number
+>((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0 : number
+>((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) : number
+>((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) : number
+>(M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w) : number
+>(M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w : number
+>(M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) : number
+>M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0 : number
+>M : number
+>(M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0 : number
+>(M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E : number
+>(M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) : number
+>M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27 : number
+>M : number
+>(M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27 : number
+>(M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 : number
+>(M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) : number
+>M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0 : number
+>M : number
+>M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0 : number
+>M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) : number
+>M : number
+>(((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) : number
+>((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0 : number
+>((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 : number
+>((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) : number
+>(E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0 : number
+>(E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) : number
+>(E & S | w & (-1 ^ S)) : number
+>E & S | w & (-1 ^ S) : number
+>E & S : number
+>E : number
+>S : number
+>w & (-1 ^ S) : number
+>w : number
+>(-1 ^ S) : number
+>-1 ^ S : number
+>-1 : -1
+>1 : 1
+>S : number
+>(0 | o[(T + 52 | 0) >> 2]) : number
+>0 | o[(T + 52 | 0) >> 2] : number
+>0 : 0
+>o[(T + 52 | 0) >> 2] : error
+>o : error
+>(T + 52 | 0) >> 2 : number
+>(T + 52 | 0) : number
+>T + 52 | 0 : number
+>T + 52 : error
+>T : error
+>52 : 52
+>0 : 0
+>2 : 2
+>0 : 0
+>1444681467 : 1444681467
+>0 : 0
+>0 : 0
+>5 : 5
+>M >>> 27 : number
+>M : number
+>27 : 27
+>E : number
+>0 : 0
+>w : number
+>E & (-1 ^ w) : number
+>E : number
+>(-1 ^ w) : number
+>-1 ^ w : number
+>-1 : -1
+>1 : 1
+>w : number
+>(0 | o[(T + 8 | 0) >> 2]) : number
+>0 | o[(T + 8 | 0) >> 2] : number
+>0 : 0
+>o[(T + 8 | 0) >> 2] : error
+>o : error
+>(T + 8 | 0) >> 2 : number
+>(T + 8 | 0) : number
+>T + 8 | 0 : number
+>T + 8 : error
+>T : error
+>8 : 8
+>0 : 0
+>2 : 2
+>0 : 0
+>51403784 : 51403784
+>0 : 0
+>0 : 0
+>9 : 9
+>S >>> 23 : number
+>S : number
+>23 : 23
+>M : number
+>0 : 0
+>E : number
+>M & (-1 ^ E) : number
+>M : number
+>(-1 ^ E) : number
+>-1 ^ E : number
+>-1 : -1
+>1 : 1
+>E : number
+>(0 | o[(T + 28 | 0) >> 2]) : number
+>0 | o[(T + 28 | 0) >> 2] : number
+>0 : 0
+>o[(T + 28 | 0) >> 2] : error
+>o : error
+>(T + 28 | 0) >> 2 : number
+>(T + 28 | 0) : number
+>T + 28 | 0 : number
+>T + 28 : error
+>T : error
+>28 : 28
+>0 : 0
+>2 : 2
+>0 : 0
+>0 : 0
+>0 : 0
+>14 : 14
+>w >>> 18 : number
+>w : number
+>18 : 18
+>S : number
+>0 : 0
+>M : number
+>S & (-1 ^ M) : number
+>S : number
+>(-1 ^ M) : number
+>-1 ^ M : number
+>-1 : -1
+>1 : 1
+>M : number
+>(0 | o[(T + 48 | 0) >> 2]) : number
+>0 | o[(T + 48 | 0) >> 2] : number
+>0 : 0
+>o[(T + 48 | 0) >> 2] : error
+>o : error
+>(T + 48 | 0) >> 2 : number
+>(T + 48 | 0) : number
+>T + 48 | 0 : number
+>T + 48 : error
+>T : error
+>48 : 48
+>0 : 0
+>2 : 2
+>0 : 0
+>1926607734 : 1926607734
+>0 : 0
+>0 : 0
+>20 : 20
+>E >>> 12 : number
+>E : number
+>12 : 12
+>w : number
+>0 : 0
+>((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) : number
+>(((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0 : number
+>(((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 : number
+>(((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) : number
+>((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0 : number
+>((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) : number
+>((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) : number
+>(w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M : number
+>(w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S : number
+>(w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) : number
+>w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0 : number
+>w : number
+>(w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0 : number
+>(w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S : number
+>(w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) : number
+>w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16 : number
+>w : number
+>(w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16 : number
+>(w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 : number
+>(w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) : number
+>w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0 : number
+>w : number
+>w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0 : number
+>w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) : number
+>w : number
+>(1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) : number
+>1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0 : number
+>1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) : number
+>1839030562 : 1839030562
+>(((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) : number
+>((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0 : number
+>((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) : number
+>((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) : number
+>(S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E : number
+>(S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M : number
+>(S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) : number
+>S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0 : number
+>S : number
+>(S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0 : number
+>(S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M : number
+>(S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) : number
+>S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21 : number
+>S : number
+>(S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21 : number
+>(S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 : number
+>(S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) : number
+>S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0 : number
+>S : number
+>S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0 : number
+>S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) : number
+>S : number
+>((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) : number
+>(((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0 : number
+>(((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 : number
+>(((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) : number
+>((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0 : number
+>((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) : number
+>((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) : number
+>(M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w : number
+>(M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E : number
+>(M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) : number
+>M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0 : number
+>M : number
+>(M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0 : number
+>(M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E : number
+>(M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) : number
+>M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28 : number
+>M : number
+>(M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28 : number
+>(M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 : number
+>(M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) : number
+>M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0 : number
+>M : number
+>M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0 : number
+>M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) : number
+>M : number
+>(((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) : number
+>((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0 : number
+>((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 : number
+>((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) : number
+>(E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0 : number
+>(E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) : number
+>(E ^ w ^ S) : number
+>E ^ w ^ S : number
+>E ^ w : number
+>E : number
+>w : number
+>S : number
+>(0 | o[(T + 20 | 0) >> 2]) : number
+>0 | o[(T + 20 | 0) >> 2] : number
+>0 : 0
+>o[(T + 20 | 0) >> 2] : error
+>o : error
+>(T + 20 | 0) >> 2 : number
+>(T + 20 | 0) : number
+>T + 20 | 0 : number
+>T + 20 : error
+>T : error
+>20 : 20
+>0 : 0
+>2 : 2
+>0 : 0
+>378558 : 378558
+>0 : 0
+>0 : 0
+>4 : 4
+>M >>> 28 : number
+>M : number
+>28 : 28
+>E : number
+>0 : 0
+>E : number
+>w : number
+>(0 | o[(T + 32 | 0) >> 2]) : number
+>0 | o[(T + 32 | 0) >> 2] : number
+>0 : 0
+>o[(T + 32 | 0) >> 2] : error
+>o : error
+>(T + 32 | 0) >> 2 : number
+>(T + 32 | 0) : number
+>T + 32 | 0 : number
+>T + 32 : error
+>T : error
+>32 : 32
+>0 : 0
+>2 : 2
+>0 : 0
+>2022574463 : 2022574463
+>0 : 0
+>0 : 0
+>11 : 11
+>S >>> 21 : number
+>S : number
+>21 : 21
+>M : number
+>0 : 0
+>M : number
+>E : number
+>(0 | o[(T + 44 | 0) >> 2]) : number
+>0 | o[(T + 44 | 0) >> 2] : number
+>0 : 0
+>o[(T + 44 | 0) >> 2] : error
+>o : error
+>(T + 44 | 0) >> 2 : number
+>(T + 44 | 0) : number
+>T + 44 | 0 : number
+>T + 44 : error
+>T : error
+>44 : 44
+>0 : 0
+>2 : 2
+>0 : 0
+>0 : 0
+>0 : 0
+>16 : 16
+>w >>> 16 : number
+>w : number
+>16 : 16
+>S : number
+>0 : 0
+>S : number
+>M : number
+>(0 | o[(T + 56 | 0) >> 2]) : number
+>0 | o[(T + 56 | 0) >> 2] : number
+>0 : 0
+>o[(T + 56 | 0) >> 2] : error
+>o : error
+>(T + 56 | 0) >> 2 : number
+>(T + 56 | 0) : number
+>T + 56 | 0 : number
+>T + 56 : error
+>T : error
+>56 : 56
+>0 : 0
+>2 : 2
+>0 : 0
+>35309556 : 35309556
+>0 : 0
+>0 : 0
+>23 : 23
+>E >>> 9 : number
+>E : number
+>9 : 9
+>w : number
+>0 : 0
+>((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) : number
+>(((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0 : number
+>(((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 : number
+>(((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) : number
+>((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0 : number
+>((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) : number
+>((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) : number
+>(w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M : number
+>(w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S : number
+>(w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) : number
+>w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0 : number
+>w : number
+>(w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0 : number
+>(w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S : number
+>(w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) : number
+>w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16 : number
+>w : number
+>(w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16 : number
+>(w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 : number
+>(w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) : number
+>w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0 : number
+>w : number
+>w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0 : number
+>w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) : number
+>w : number
+>((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) : number
+>(((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0 : number
+>(((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 : number
+>(((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) : number
+>((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0 : number
+>((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) : number
+>((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) : number
+>(S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E : number
+>(S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M : number
+>(S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) : number
+>S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0 : number
+>S : number
+>(S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0 : number
+>(S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M : number
+>(S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) : number
+>S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21 : number
+>S : number
+>(S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21 : number
+>(S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 : number
+>(S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) : number
+>S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0 : number
+>S : number
+>S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0 : number
+>S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) : number
+>S : number
+>(1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) : number
+>1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0 : number
+>1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) : number
+>1272893353 : 1272893353
+>(((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) : number
+>((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0 : number
+>((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) : number
+>((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) : number
+>(M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w : number
+>(M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E : number
+>(M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) : number
+>M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0 : number
+>M : number
+>(M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0 : number
+>(M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E : number
+>(M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) : number
+>M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28 : number
+>M : number
+>(M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28 : number
+>(M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 : number
+>(M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) : number
+>M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0 : number
+>M : number
+>M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0 : number
+>M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) : number
+>M : number
+>(((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) : number
+>((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0 : number
+>((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 : number
+>((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) : number
+>(E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0 : number
+>(E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) : number
+>(E ^ w ^ S) : number
+>E ^ w ^ S : number
+>E ^ w : number
+>E : number
+>w : number
+>S : number
+>(0 | o[(T + 4 | 0) >> 2]) : number
+>0 | o[(T + 4 | 0) >> 2] : number
+>0 : 0
+>o[(T + 4 | 0) >> 2] : error
+>o : error
+>(T + 4 | 0) >> 2 : number
+>(T + 4 | 0) : number
+>T + 4 | 0 : number
+>T + 4 : error
+>T : error
+>4 : 4
+>0 : 0
+>2 : 2
+>0 : 0
+>1530992060 : 1530992060
+>0 : 0
+>0 : 0
+>4 : 4
+>M >>> 28 : number
+>M : number
+>28 : 28
+>E : number
+>0 : 0
+>E : number
+>w : number
+>(0 | o[(T + 16 | 0) >> 2]) : number
+>0 | o[(T + 16 | 0) >> 2] : number
+>0 : 0
+>o[(T + 16 | 0) >> 2] : error
+>o : error
+>(T + 16 | 0) >> 2 : number
+>(T + 16 | 0) : number
+>T + 16 | 0 : number
+>T + 16 : error
+>T : error
+>16 : 16
+>0 : 0
+>2 : 2
+>0 : 0
+>0 : 0
+>0 : 0
+>11 : 11
+>S >>> 21 : number
+>S : number
+>21 : 21
+>M : number
+>0 : 0
+>M : number
+>E : number
+>(0 | o[(T + 28 | 0) >> 2]) : number
+>0 | o[(T + 28 | 0) >> 2] : number
+>0 : 0
+>o[(T + 28 | 0) >> 2] : error
+>o : error
+>(T + 28 | 0) >> 2 : number
+>(T + 28 | 0) : number
+>T + 28 | 0 : number
+>T + 28 : error
+>T : error
+>28 : 28
+>0 : 0
+>2 : 2
+>0 : 0
+>155497632 : 155497632
+>0 : 0
+>0 : 0
+>16 : 16
+>w >>> 16 : number
+>w : number
+>16 : 16
+>S : number
+>0 : 0
+>S : number
+>M : number
+>(0 | o[(T + 40 | 0) >> 2]) : number
+>0 | o[(T + 40 | 0) >> 2] : number
+>0 : 0
+>o[(T + 40 | 0) >> 2] : error
+>o : error
+>(T + 40 | 0) >> 2 : number
+>(T + 40 | 0) : number
+>T + 40 | 0 : number
+>T + 40 : error
+>T : error
+>40 : 40
+>0 : 0
+>2 : 2
+>0 : 0
+>1094730640 : 1094730640
+>0 : 0
+>0 : 0
+>23 : 23
+>E >>> 9 : number
+>E : number
+>9 : 9
+>w : number
+>0 : 0
+>(76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) : number
+>76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0 : number
+>76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) : number
+>76029189 : 76029189
+>(((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) : number
+>((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0 : number
+>((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) : number
+>((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) : number
+>(w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M : number
+>(w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S : number
+>(w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) : number
+>w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0 : number
+>w : number
+>(w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0 : number
+>(w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S : number
+>(w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) : number
+>w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16 : number
+>w : number
+>(w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16 : number
+>(w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 : number
+>(w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) : number
+>w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0 : number
+>w : number
+>w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0 : number
+>w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) : number
+>w : number
+>((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) : number
+>(((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0 : number
+>(((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 : number
+>(((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) : number
+>((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0 : number
+>((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) : number
+>((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) : number
+>(S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E : number
+>(S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M : number
+>(S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) : number
+>S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0 : number
+>S : number
+>(S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0 : number
+>(S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M : number
+>(S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) : number
+>S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21 : number
+>S : number
+>(S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21 : number
+>(S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 : number
+>(S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) : number
+>S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0 : number
+>S : number
+>S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0 : number
+>S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) : number
+>S : number
+>((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) : number
+>(((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0 : number
+>(((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 : number
+>(((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) : number
+>((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0 : number
+>((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) : number
+>((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) : number
+>(M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w : number
+>(M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E : number
+>(M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) : number
+>M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0 : number
+>M : number
+>(M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0 : number
+>(M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E : number
+>(M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) : number
+>M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28 : number
+>M : number
+>(M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28 : number
+>(M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 : number
+>(M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) : number
+>M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0 : number
+>M : number
+>M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0 : number
+>M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) : number
+>M : number
+>(681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) : number
+>681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0 : number
+>681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) : number
+>681279174 : 681279174
+>((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) : number
+>(E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0 : number
+>(E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) : number
+>(E ^ w ^ S) : number
+>E ^ w ^ S : number
+>E ^ w : number
+>E : number
+>w : number
+>S : number
+>(0 | o[(T + 52 | 0) >> 2]) : number
+>0 | o[(T + 52 | 0) >> 2] : number
+>0 : 0
+>o[(T + 52 | 0) >> 2] : error
+>o : error
+>(T + 52 | 0) >> 2 : number
+>(T + 52 | 0) : number
+>T + 52 | 0 : number
+>T + 52 : error
+>T : error
+>52 : 52
+>0 : 0
+>2 : 2
+>0 : 0
+>0 : 0
+>0 : 0
+>4 : 4
+>M >>> 28 : number
+>M : number
+>28 : 28
+>E : number
+>0 : 0
+>E : number
+>w : number
+>(0 | o[T >> 2]) : number
+>0 | o[T >> 2] : number
+>0 : 0
+>o[T >> 2] : error
+>o : error
+>T >> 2 : number
+>T : error
+>2 : 2
+>0 : 0
+>358537222 : 358537222
+>0 : 0
+>0 : 0
+>11 : 11
+>S >>> 21 : number
+>S : number
+>21 : 21
+>M : number
+>0 : 0
+>M : number
+>E : number
+>(0 | o[(T + 12 | 0) >> 2]) : number
+>0 | o[(T + 12 | 0) >> 2] : number
+>0 : 0
+>o[(T + 12 | 0) >> 2] : error
+>o : error
+>(T + 12 | 0) >> 2 : number
+>(T + 12 | 0) : number
+>T + 12 | 0 : number
+>T + 12 : error
+>T : error
+>12 : 12
+>0 : 0
+>2 : 2
+>0 : 0
+>722521979 : 722521979
+>0 : 0
+>0 : 0
+>16 : 16
+>w >>> 16 : number
+>w : number
+>16 : 16
+>S : number
+>0 : 0
+>S : number
+>M : number
+>(0 | o[(T + 24 | 0) >> 2]) : number
+>0 | o[(T + 24 | 0) >> 2] : number
+>0 : 0
+>o[(T + 24 | 0) >> 2] : error
+>o : error
+>(T + 24 | 0) >> 2 : number
+>(T + 24 | 0) : number
+>T + 24 | 0 : number
+>T + 24 : error
+>T : error
+>24 : 24
+>0 : 0
+>2 : 2
+>0 : 0
+>0 : 0
+>0 : 0
+>23 : 23
+>E >>> 9 : number
+>E : number
+>9 : 9
+>w : number
+>0 : 0
+>((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) : number
+>(((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0 : number
+>(((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 : number
+>(((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) : number
+>((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0 : number
+>((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) : number
+>((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) : number
+>(w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M : number
+>(w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S : number
+>(w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) : number
+>w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0 : number
+>w : number
+>(w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0 : number
+>(w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S : number
+>(w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) : number
+>w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16 : number
+>w : number
+>(w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16 : number
+>(w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 : number
+>(w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) : number
+>w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0 : number
+>w : number
+>w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0 : number
+>w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) : number
+>w : number
+>(530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) : number
+>530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0 : number
+>530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) : number
+>530742520 : 530742520
+>(((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) : number
+>((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0 : number
+>((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) : number
+>((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) : number
+>(S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E : number
+>(S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M : number
+>(S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) : number
+>S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0 : number
+>S : number
+>(S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0 : number
+>(S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M : number
+>(S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) : number
+>S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21 : number
+>S : number
+>(S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21 : number
+>(S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 : number
+>(S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) : number
+>S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0 : number
+>S : number
+>S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0 : number
+>S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) : number
+>S : number
+>((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) : number
+>(((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0 : number
+>(((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 : number
+>(((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) : number
+>((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0 : number
+>((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) : number
+>((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) : number
+>(M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w : number
+>(M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E : number
+>(M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) : number
+>M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0 : number
+>M : number
+>(M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0 : number
+>(M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E : number
+>(M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) : number
+>M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28 : number
+>M : number
+>(M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28 : number
+>(M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 : number
+>(M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) : number
+>M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0 : number
+>M : number
+>M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0 : number
+>M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) : number
+>M : number
+>(((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) : number
+>((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0 : number
+>((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 : number
+>((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) : number
+>(E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0 : number
+>(E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) : number
+>(E ^ w ^ S) : number
+>E ^ w ^ S : number
+>E ^ w : number
+>E : number
+>w : number
+>S : number
+>(0 | o[(T + 36 | 0) >> 2]) : number
+>0 | o[(T + 36 | 0) >> 2] : number
+>0 : 0
+>o[(T + 36 | 0) >> 2] : error
+>o : error
+>(T + 36 | 0) >> 2 : number
+>(T + 36 | 0) : number
+>T + 36 | 0 : number
+>T + 36 : error
+>T : error
+>36 : 36
+>0 : 0
+>2 : 2
+>0 : 0
+>640364487 : 640364487
+>0 : 0
+>0 : 0
+>4 : 4
+>M >>> 28 : number
+>M : number
+>28 : 28
+>E : number
+>0 : 0
+>E : number
+>w : number
+>(0 | o[(T + 48 | 0) >> 2]) : number
+>0 | o[(T + 48 | 0) >> 2] : number
+>0 : 0
+>o[(T + 48 | 0) >> 2] : error
+>o : error
+>(T + 48 | 0) >> 2 : number
+>(T + 48 | 0) : number
+>T + 48 | 0 : number
+>T + 48 : error
+>T : error
+>48 : 48
+>0 : 0
+>2 : 2
+>0 : 0
+>421815835 : 421815835
+>0 : 0
+>0 : 0
+>11 : 11
+>S >>> 21 : number
+>S : number
+>21 : 21
+>M : number
+>0 : 0
+>M : number
+>E : number
+>(0 | o[(T + 60 | 0) >> 2]) : number
+>0 | o[(T + 60 | 0) >> 2] : number
+>0 : 0
+>o[(T + 60 | 0) >> 2] : error
+>o : error
+>(T + 60 | 0) >> 2 : number
+>(T + 60 | 0) : number
+>T + 60 | 0 : number
+>T + 60 : error
+>T : error
+>60 : 60
+>0 : 0
+>2 : 2
+>0 : 0
+>0 : 0
+>0 : 0
+>16 : 16
+>w >>> 16 : number
+>w : number
+>16 : 16
+>S : number
+>0 : 0
+>S : number
+>M : number
+>(0 | o[(T + 8 | 0) >> 2]) : number
+>0 | o[(T + 8 | 0) >> 2] : number
+>0 : 0
+>o[(T + 8 | 0) >> 2] : error
+>o : error
+>(T + 8 | 0) >> 2 : number
+>(T + 8 | 0) : number
+>T + 8 | 0 : number
+>T + 8 : error
+>T : error
+>8 : 8
+>0 : 0
+>2 : 2
+>0 : 0
+>995338651 : 995338651
+>0 : 0
+>0 : 0
+>23 : 23
+>E >>> 9 : number
+>E : number
+>9 : 9
+>w : number
+>0 : 0
+>((((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 57434055 | 0) : number
+>(((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 57434055 | 0 : number
+>(((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 57434055 : number
+>(((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) : number
+>((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0 : number
+>((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) : number
+>((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) : number
+>(S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M) : number
+>(S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) : number
+>S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0 : number
+>S : number
+>(S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0 : number
+>(S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M : number
+>(S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) : number
+>S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22 : number
+>S : number
+>(S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22 : number
+>(S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 : number
+>(S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) : number
+>S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0 : number
+>S : number
+>S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0 : number
+>S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) : number
+>S : number
+>(1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) : number
+>1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0 : number
+>1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) : number
+>1126891415 : 1126891415
+>((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) : number
+>(E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0 : number
+>(E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) : number
+>(E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) : number
+>E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w) : number
+>E : number
+>((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w) : number
+>(M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w : number
+>(M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) : number
+>M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0 : number
+>M : number
+>(M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0 : number
+>(M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E : number
+>(M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) : number
+>M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26 : number
+>M : number
+>(M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26 : number
+>(M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 : number
+>(M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) : number
+>M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0 : number
+>M : number
+>M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0 : number
+>M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) : number
+>M : number
+>(((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) : number
+>((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0 : number
+>((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 : number
+>((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) : number
+>(w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0 : number
+>(w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) : number
+>(w ^ (E | -1 ^ S)) : number
+>w ^ (E | -1 ^ S) : number
+>w : number
+>(E | -1 ^ S) : number
+>E | -1 ^ S : number
+>E : number
+>-1 ^ S : number
+>-1 : -1
+>1 : 1
+>S : number
+>(0 | o[T >> 2]) : number
+>0 | o[T >> 2] : number
+>0 : 0
+>o[T >> 2] : error
+>o : error
+>T >> 2 : number
+>T : error
+>2 : 2
+>0 : 0
+>198630844 : 198630844
+>0 : 0
+>0 : 0
+>6 : 6
+>M >>> 26 : number
+>M : number
+>26 : 26
+>E : number
+>0 : 0
+>-1 ^ w : number
+>-1 : -1
+>1 : 1
+>w : number
+>(0 | o[(T + 28 | 0) >> 2]) : number
+>0 | o[(T + 28 | 0) >> 2] : number
+>0 : 0
+>o[(T + 28 | 0) >> 2] : error
+>o : error
+>(T + 28 | 0) >> 2 : number
+>(T + 28 | 0) : number
+>T + 28 | 0 : number
+>T + 28 : error
+>T : error
+>28 : 28
+>0 : 0
+>2 : 2
+>0 : 0
+>0 : 0
+>0 : 0
+>10 : 10
+>S >>> 22 : number
+>S : number
+>22 : 22
+>M : number
+>0 : 0
+>((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M) : number
+>(w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M : number
+>(w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) : number
+>w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0 : number
+>w : number
+>(w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0 : number
+>(w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S : number
+>(w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) : number
+>w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17 : number
+>w : number
+>(w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17 : number
+>(w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 : number
+>(w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) : number
+>w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0 : number
+>w : number
+>w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0 : number
+>w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) : number
+>w : number
+>(((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) : number
+>((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0 : number
+>((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 : number
+>((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) : number
+>(M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0 : number
+>(M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) : number
+>(M ^ (S | -1 ^ E)) : number
+>M ^ (S | -1 ^ E) : number
+>M : number
+>(S | -1 ^ E) : number
+>S | -1 ^ E : number
+>S : number
+>-1 ^ E : number
+>-1 : -1
+>1 : 1
+>E : number
+>(0 | o[(T + 56 | 0) >> 2]) : number
+>0 | o[(T + 56 | 0) >> 2] : number
+>0 : 0
+>o[(T + 56 | 0) >> 2] : error
+>o : error
+>(T + 56 | 0) >> 2 : number
+>(T + 56 | 0) : number
+>T + 56 | 0 : number
+>T + 56 : error
+>T : error
+>56 : 56
+>0 : 0
+>2 : 2
+>0 : 0
+>1416354905 : 1416354905
+>0 : 0
+>0 : 0
+>15 : 15
+>w >>> 17 : number
+>w : number
+>17 : 17
+>S : number
+>0 : 0
+>-1 ^ M : number
+>-1 : -1
+>1 : 1
+>M : number
+>(0 | o[(T + 20 | 0) >> 2]) : number
+>0 | o[(T + 20 | 0) >> 2] : number
+>0 : 0
+>o[(T + 20 | 0) >> 2] : error
+>o : error
+>(T + 20 | 0) >> 2 : number
+>(T + 20 | 0) : number
+>T + 20 | 0 : number
+>T + 20 : error
+>T : error
+>20 : 20
+>0 : 0
+>2 : 2
+>0 : 0
+>57434055 : 57434055
+>0 : 0
+>0 : 0
+>21 : 21
+>E >>> 11 : number
+>E : number
+>11 : 11
+>w : number
+>0 : 0
+>((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 2054922799 | 0) : number
+>(((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 2054922799 | 0 : number
+>(((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 2054922799 : number
+>(((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 4 | 0) >> 2]) | 0) : number
+>((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 4 | 0) >> 2]) | 0 : number
+>((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 4 | 0) >> 2]) : number
+>((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) : number
+>(S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M) : number
+>(S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 | S >>> 22) + M | 0) : number
+>S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 | S >>> 22) + M | 0 : number
+>S : number
+>(S = (S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 | S >>> 22) + M | 0 : number
+>(S = (S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 | S >>> 22) + M : number
+>(S = (S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 | S >>> 22) : number
+>S = (S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 | S >>> 22 : number
+>S : number
+>(S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 | S >>> 22 : number
+>(S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 : number
+>(S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) : number
+>S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0 : number
+>S : number
+>S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0 : number
+>S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) : number
+>S : number
+>(((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) : number
+>((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0 : number
+>((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 : number
+>((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) : number
+>(E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0 : number
+>(E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) : number
+>(E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) : number
+>E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w) : number
+>E : number
+>((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w) : number
+>(M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w : number
+>(M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) : number
+>M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0 : number
+>M : number
+>(M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0 : number
+>(M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E : number
+>(M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) : number
+>M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26 : number
+>M : number
+>(M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26 : number
+>(M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 : number
+>(M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) : number
+>M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0 : number
+>M : number
+>M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0 : number
+>M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) : number
+>M : number
+>(1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) : number
+>1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0 : number
+>1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) : number
+>1700485571 : 1700485571
+>((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) : number
+>(w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0 : number
+>(w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) : number
+>(w ^ (E | -1 ^ S)) : number
+>w ^ (E | -1 ^ S) : number
+>w : number
+>(E | -1 ^ S) : number
+>E | -1 ^ S : number
+>E : number
+>-1 ^ S : number
+>-1 : -1
+>1 : 1
+>S : number
+>(0 | o[(T + 48 | 0) >> 2]) : number
+>0 | o[(T + 48 | 0) >> 2] : number
+>0 : 0
+>o[(T + 48 | 0) >> 2] : error
+>o : error
+>(T + 48 | 0) >> 2 : number
+>(T + 48 | 0) : number
+>T + 48 | 0 : number
+>T + 48 : error
+>T : error
+>48 : 48
+>0 : 0
+>2 : 2
+>0 : 0
+>0 : 0
+>0 : 0
+>6 : 6
+>M >>> 26 : number
+>M : number
+>26 : 26
+>E : number
+>0 : 0
+>-1 ^ w : number
+>-1 : -1
+>1 : 1
+>w : number
+>(0 | o[(T + 12 | 0) >> 2]) : number
+>0 | o[(T + 12 | 0) >> 2] : number
+>0 : 0
+>o[(T + 12 | 0) >> 2] : error
+>o : error
+>(T + 12 | 0) >> 2 : number
+>(T + 12 | 0) : number
+>T + 12 | 0 : number
+>T + 12 : error
+>T : error
+>12 : 12
+>0 : 0
+>2 : 2
+>0 : 0
+>1894986606 : 1894986606
+>0 : 0
+>0 : 0
+>10 : 10
+>S >>> 22 : number
+>S : number
+>22 : 22
+>M : number
+>0 : 0
+>((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M) : number
+>(w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M : number
+>(w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17) + S | 0) : number
+>w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17) + S | 0 : number
+>w : number
+>(w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17) + S | 0 : number
+>(w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17) + S : number
+>(w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17) : number
+>w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17 : number
+>w : number
+>(w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17 : number
+>(w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 : number
+>(w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) : number
+>w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0 : number
+>w : number
+>w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0 : number
+>w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) : number
+>w : number
+>(((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) : number
+>((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0 : number
+>((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 : number
+>((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) : number
+>(M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0 : number
+>(M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) : number
+>(M ^ (S | -1 ^ E)) : number
+>M ^ (S | -1 ^ E) : number
+>M : number
+>(S | -1 ^ E) : number
+>S | -1 ^ E : number
+>S : number
+>-1 ^ E : number
+>-1 : -1
+>1 : 1
+>E : number
+>(0 | o[(T + 40 | 0) >> 2]) : number
+>0 | o[(T + 40 | 0) >> 2] : number
+>0 : 0
+>o[(T + 40 | 0) >> 2] : error
+>o : error
+>(T + 40 | 0) >> 2 : number
+>(T + 40 | 0) : number
+>T + 40 | 0 : number
+>T + 40 : error
+>T : error
+>40 : 40
+>0 : 0
+>2 : 2
+>0 : 0
+>1051523 : 1051523
+>0 : 0
+>0 : 0
+>15 : 15
+>w >>> 17 : number
+>w : number
+>17 : 17
+>S : number
+>0 : 0
+>-1 ^ M : number
+>-1 : -1
+>1 : 1
+>M : number
+>(0 | o[(T + 4 | 0) >> 2]) : number
+>0 | o[(T + 4 | 0) >> 2] : number
+>0 : 0
+>o[(T + 4 | 0) >> 2] : error
+>o : error
+>(T + 4 | 0) >> 2 : number
+>(T + 4 | 0) : number
+>T + 4 | 0 : number
+>T + 4 : error
+>T : error
+>4 : 4
+>0 : 0
+>2 : 2
+>0 : 0
+>2054922799 : 2054922799
+>0 : 0
+>0 : 0
+>21 : 21
+>E >>> 11 : number
+>E : number
+>11 : 11
+>w : number
+>0 : 0
+>(1309151649 + (((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 30611744 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1560198380 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) : number
+>1309151649 + (((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 30611744 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1560198380 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0 : number
+>1309151649 + (((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 30611744 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1560198380 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 52 | 0) >> 2]) | 0) : number
+>1309151649 : 1309151649
+>(((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 30611744 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1560198380 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 52 | 0) >> 2]) | 0) : number
+>((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 30611744 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1560198380 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 52 | 0) >> 2]) | 0 : number
+>((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 30611744 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1560198380 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 52 | 0) >> 2]) : number
+>((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 30611744 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1560198380 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) : number
+>(S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 30611744 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1560198380 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M) : number
+>(S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 30611744 | 0) | 0) << 10 | S >>> 22) + M | 0) : number
+>S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 30611744 | 0) | 0) << 10 | S >>> 22) + M | 0 : number
+>S : number
+>(S = (S = S + (((E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 30611744 | 0) | 0) << 10 | S >>> 22) + M | 0 : number
+>(S = (S = S + (((E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 30611744 | 0) | 0) << 10 | S >>> 22) + M : number
+>(S = (S = S + (((E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 30611744 | 0) | 0) << 10 | S >>> 22) : number
+>S = (S = S + (((E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 30611744 | 0) | 0) << 10 | S >>> 22 : number
+>S : number
+>(S = S + (((E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 30611744 | 0) | 0) << 10 | S >>> 22 : number
+>(S = S + (((E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 30611744 | 0) | 0) << 10 : number
+>(S = S + (((E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 30611744 | 0) | 0) : number
+>S = S + (((E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 30611744 | 0) | 0 : number
+>S : number
+>S + (((E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 30611744 | 0) | 0 : number
+>S + (((E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 30611744 | 0) : number
+>S : number
+>(((E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 30611744 | 0) : number
+>((E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 30611744 | 0 : number
+>((E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 30611744 : number
+>((E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 60 | 0) >> 2]) | 0) : number
+>(E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 60 | 0) >> 2]) | 0 : number
+>(E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 60 | 0) >> 2]) : number
+>(E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) : number
+>E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w) : number
+>E : number
+>((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w) : number
+>(M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w : number
+>(M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) : number
+>M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0 : number
+>M : number
+>(M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0 : number
+>(M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E : number
+>(M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) : number
+>M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26 : number
+>M : number
+>(M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26 : number
+>(M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 : number
+>(M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) : number
+>M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0 : number
+>M : number
+>M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0 : number
+>M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) : number
+>M : number
+>(1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) : number
+>1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0 : number
+>1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) : number
+>1873313359 : 1873313359
+>((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) : number
+>(w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0 : number
+>(w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) : number
+>(w ^ (E | -1 ^ S)) : number
+>w ^ (E | -1 ^ S) : number
+>w : number
+>(E | -1 ^ S) : number
+>E | -1 ^ S : number
+>E : number
+>-1 ^ S : number
+>-1 : -1
+>1 : 1
+>S : number
+>(0 | o[(T + 32 | 0) >> 2]) : number
+>0 | o[(T + 32 | 0) >> 2] : number
+>0 : 0
+>o[(T + 32 | 0) >> 2] : error
+>o : error
+>(T + 32 | 0) >> 2 : number
+>(T + 32 | 0) : number
+>T + 32 | 0 : number
+>T + 32 : error
+>T : error
+>32 : 32
+>0 : 0
+>2 : 2
+>0 : 0
+>0 : 0
+>0 : 0
+>6 : 6
+>M >>> 26 : number
+>M : number
+>26 : 26
+>E : number
+>0 : 0
+>-1 ^ w : number
+>-1 : -1
+>1 : 1
+>w : number
+>(0 | o[(T + 60 | 0) >> 2]) : number
+>0 | o[(T + 60 | 0) >> 2] : number
+>0 : 0
+>o[(T + 60 | 0) >> 2] : error
+>o : error
+>(T + 60 | 0) >> 2 : number
+>(T + 60 | 0) : number
+>T + 60 | 0 : number
+>T + 60 : error
+>T : error
+>60 : 60
+>0 : 0
+>2 : 2
+>0 : 0
+>30611744 : 30611744
+>0 : 0
+>0 : 0
+>10 : 10
+>S >>> 22 : number
+>S : number
+>22 : 22
+>M : number
+>0 : 0
+>((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1560198380 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M) : number
+>(w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1560198380 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M : number
+>(w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1560198380 | 0) | 0) << 15 | w >>> 17) + S | 0) : number
+>w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1560198380 | 0) | 0) << 15 | w >>> 17) + S | 0 : number
+>w : number
+>(w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1560198380 | 0) | 0) << 15 | w >>> 17) + S | 0 : number
+>(w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1560198380 | 0) | 0) << 15 | w >>> 17) + S : number
+>(w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1560198380 | 0) | 0) << 15 | w >>> 17) : number
+>w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1560198380 | 0) | 0) << 15 | w >>> 17 : number
+>w : number
+>(w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1560198380 | 0) | 0) << 15 | w >>> 17 : number
+>(w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1560198380 | 0) | 0) << 15 : number
+>(w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1560198380 | 0) | 0) : number
+>w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1560198380 | 0) | 0 : number
+>w : number
+>w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1560198380 | 0) | 0 : number
+>w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1560198380 | 0) : number
+>w : number
+>(((M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1560198380 | 0) : number
+>((M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1560198380 | 0 : number
+>((M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1560198380 : number
+>((M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) | 0) : number
+>(M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) | 0 : number
+>(M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) : number
+>(M ^ (S | -1 ^ E)) : number
+>M ^ (S | -1 ^ E) : number
+>M : number
+>(S | -1 ^ E) : number
+>S | -1 ^ E : number
+>S : number
+>-1 ^ E : number
+>-1 : -1
+>1 : 1
+>E : number
+>(0 | o[(T + 24 | 0) >> 2]) : number
+>0 | o[(T + 24 | 0) >> 2] : number
+>0 : 0
+>o[(T + 24 | 0) >> 2] : error
+>o : error
+>(T + 24 | 0) >> 2 : number
+>(T + 24 | 0) : number
+>T + 24 | 0 : number
+>T + 24 : error
+>T : error
+>24 : 24
+>0 : 0
+>2 : 2
+>0 : 0
+>1560198380 : 1560198380
+>0 : 0
+>0 : 0
+>15 : 15
+>w >>> 17 : number
+>w : number
+>17 : 17
+>S : number
+>0 : 0
+>-1 ^ M : number
+>-1 : -1
+>1 : 1
+>M : number
+>(0 | o[(T + 52 | 0) >> 2]) : number
+>0 | o[(T + 52 | 0) >> 2] : number
+>0 : 0
+>o[(T + 52 | 0) >> 2] : error
+>o : error
+>(T + 52 | 0) >> 2 : number
+>(T + 52 | 0) : number
+>T + 52 | 0 : number
+>T + 52 : error
+>T : error
+>52 : 52
+>0 : 0
+>2 : 2
+>0 : 0
+>0 : 0
+>0 : 0
+>21 : 21
+>E >>> 11 : number
+>E : number
+>11 : 11
+>w : number
+>0 : 0
+>((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1120210379 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (718787259 + ((M ^ (S | -1 ^ E)) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 343485551 | 0) : number
+>(((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1120210379 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (718787259 + ((M ^ (S | -1 ^ E)) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 343485551 | 0 : number
+>(((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1120210379 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (718787259 + ((M ^ (S | -1 ^ E)) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 343485551 : number
+>(((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1120210379 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (718787259 + ((M ^ (S | -1 ^ E)) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 36 | 0) >> 2]) | 0) : number
+>((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1120210379 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (718787259 + ((M ^ (S | -1 ^ E)) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 36 | 0) >> 2]) | 0 : number
+>((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1120210379 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (718787259 + ((M ^ (S | -1 ^ E)) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 36 | 0) >> 2]) : number
+>((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1120210379 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (718787259 + ((M ^ (S | -1 ^ E)) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) : number
+>(S = (S = (S = S + (((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1120210379 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (718787259 + ((M ^ (S | -1 ^ E)) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M) : number
+>(S = (S = (S = S + (((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1120210379 | 0) | 0) << 10 | S >>> 22) + M | 0) : number
+>S = (S = (S = S + (((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1120210379 | 0) | 0) << 10 | S >>> 22) + M | 0 : number
+>S : number
+>(S = (S = S + (((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1120210379 | 0) | 0) << 10 | S >>> 22) + M | 0 : number
+>(S = (S = S + (((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1120210379 | 0) | 0) << 10 | S >>> 22) + M : number
+>(S = (S = S + (((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1120210379 | 0) | 0) << 10 | S >>> 22) : number
+>S = (S = S + (((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1120210379 | 0) | 0) << 10 | S >>> 22 : number
+>S : number
+>(S = S + (((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1120210379 | 0) | 0) << 10 | S >>> 22 : number
+>(S = S + (((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1120210379 | 0) | 0) << 10 : number
+>(S = S + (((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1120210379 | 0) | 0) : number
+>S = S + (((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1120210379 | 0) | 0 : number
+>S : number
+>S + (((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1120210379 | 0) | 0 : number
+>S + (((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1120210379 | 0) : number
+>S : number
+>(((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1120210379 | 0) : number
+>((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1120210379 | 0 : number
+>((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1120210379 : number
+>((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 44 | 0) >> 2]) | 0) : number
+>(E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 44 | 0) >> 2]) | 0 : number
+>(E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 44 | 0) >> 2]) : number
+>(E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) : number
+>E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w) : number
+>E : number
+>((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w) : number
+>(M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w : number
+>(M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0) << 6 | M >>> 26) + E | 0) : number
+>M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0) << 6 | M >>> 26) + E | 0 : number
+>M : number
+>(M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0) << 6 | M >>> 26) + E | 0 : number
+>(M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0) << 6 | M >>> 26) + E : number
+>(M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0) << 6 | M >>> 26) : number
+>M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0) << 6 | M >>> 26 : number
+>M : number
+>(M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0) << 6 | M >>> 26 : number
+>(M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0) << 6 : number
+>(M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0) : number
+>M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0 : number
+>M : number
+>M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0 : number
+>M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) : number
+>M : number
+>(((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) : number
+>((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0 : number
+>((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 : number
+>((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) : number
+>(w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0 : number
+>(w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) : number
+>(w ^ (E | -1 ^ S)) : number
+>w ^ (E | -1 ^ S) : number
+>w : number
+>(E | -1 ^ S) : number
+>E | -1 ^ S : number
+>E : number
+>-1 ^ S : number
+>-1 : -1
+>1 : 1
+>S : number
+>(0 | o[(T + 16 | 0) >> 2]) : number
+>0 | o[(T + 16 | 0) >> 2] : number
+>0 : 0
+>o[(T + 16 | 0) >> 2] : error
+>o : error
+>(T + 16 | 0) >> 2 : number
+>(T + 16 | 0) : number
+>T + 16 | 0 : number
+>T + 16 : error
+>T : error
+>16 : 16
+>0 : 0
+>2 : 2
+>0 : 0
+>145523070 : 145523070
+>0 : 0
+>0 : 0
+>6 : 6
+>M >>> 26 : number
+>M : number
+>26 : 26
+>E : number
+>0 : 0
+>-1 ^ w : number
+>-1 : -1
+>1 : 1
+>w : number
+>(0 | o[(T + 44 | 0) >> 2]) : number
+>0 | o[(T + 44 | 0) >> 2] : number
+>0 : 0
+>o[(T + 44 | 0) >> 2] : error
+>o : error
+>(T + 44 | 0) >> 2 : number
+>(T + 44 | 0) : number
+>T + 44 | 0 : number
+>T + 44 : error
+>T : error
+>44 : 44
+>0 : 0
+>2 : 2
+>0 : 0
+>1120210379 : 1120210379
+>0 : 0
+>0 : 0
+>10 : 10
+>S >>> 22 : number
+>S : number
+>22 : 22
+>M : number
+>0 : 0
+>((w = (w = (w = w + (718787259 + ((M ^ (S | -1 ^ E)) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M) : number
+>(w = (w = (w = w + (718787259 + ((M ^ (S | -1 ^ E)) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M : number
+>(w = (w = (w = w + (718787259 + ((M ^ (S | -1 ^ E)) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 15 | w >>> 17) + S | 0) : number
+>w = (w = (w = w + (718787259 + ((M ^ (S | -1 ^ E)) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 15 | w >>> 17) + S | 0 : number
+>w : number
+>(w = (w = w + (718787259 + ((M ^ (S | -1 ^ E)) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 15 | w >>> 17) + S | 0 : number
+>(w = (w = w + (718787259 + ((M ^ (S | -1 ^ E)) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 15 | w >>> 17) + S : number
+>(w = (w = w + (718787259 + ((M ^ (S | -1 ^ E)) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 15 | w >>> 17) : number
+>w = (w = w + (718787259 + ((M ^ (S | -1 ^ E)) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 15 | w >>> 17 : number
+>w : number
+>(w = w + (718787259 + ((M ^ (S | -1 ^ E)) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 15 | w >>> 17 : number
+>(w = w + (718787259 + ((M ^ (S | -1 ^ E)) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 15 : number
+>(w = w + (718787259 + ((M ^ (S | -1 ^ E)) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) : number
+>w = w + (718787259 + ((M ^ (S | -1 ^ E)) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0 : number
+>w : number
+>w + (718787259 + ((M ^ (S | -1 ^ E)) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0 : number
+>w + (718787259 + ((M ^ (S | -1 ^ E)) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) : number
+>w : number
+>(718787259 + ((M ^ (S | -1 ^ E)) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) : number
+>718787259 + ((M ^ (S | -1 ^ E)) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0 : number
+>718787259 + ((M ^ (S | -1 ^ E)) + (0 | o[(T + 8 | 0) >> 2]) | 0) : number
+>718787259 : 718787259
+>((M ^ (S | -1 ^ E)) + (0 | o[(T + 8 | 0) >> 2]) | 0) : number
+>(M ^ (S | -1 ^ E)) + (0 | o[(T + 8 | 0) >> 2]) | 0 : number
+>(M ^ (S | -1 ^ E)) + (0 | o[(T + 8 | 0) >> 2]) : number
+>(M ^ (S | -1 ^ E)) : number
+>M ^ (S | -1 ^ E) : number
+>M : number
+>(S | -1 ^ E) : number
+>S | -1 ^ E : number
+>S : number
+>-1 ^ E : number
+>-1 : -1
+>1 : 1
+>E : number
+>(0 | o[(T + 8 | 0) >> 2]) : number
+>0 | o[(T + 8 | 0) >> 2] : number
+>0 : 0
+>o[(T + 8 | 0) >> 2] : error
+>o : error
+>(T + 8 | 0) >> 2 : number
+>(T + 8 | 0) : number
+>T + 8 | 0 : number
+>T + 8 : error
+>T : error
+>8 : 8
+>0 : 0
+>2 : 2
+>0 : 0
+>0 : 0
+>0 : 0
+>15 : 15
+>w >>> 17 : number
+>w : number
+>17 : 17
+>S : number
+>0 : 0
+>-1 ^ M : number
+>-1 : -1
+>1 : 1
+>M : number
+>(0 | o[(T + 36 | 0) >> 2]) : number
+>0 | o[(T + 36 | 0) >> 2] : number
+>0 : 0
+>o[(T + 36 | 0) >> 2] : error
+>o : error
+>(T + 36 | 0) >> 2 : number
+>(T + 36 | 0) : number
+>T + 36 | 0 : number
+>T + 36 : error
+>T : error
+>36 : 36
+>0 : 0
+>2 : 2
+>0 : 0
+>343485551 : 343485551
+>0 : 0
+>0 : 0
+>21 : 21
+>E >>> 11 : number
+>E : number
+>11 : 11
+>w : number
+>0 : 0
+>r = M : number
+>r : any
+>M : number
+>a = (0 | o[(i = y) >> 2]) + r | 0 : number
+>a : any
+>(0 | o[(i = y) >> 2]) + r | 0 : number
+>(0 | o[(i = y) >> 2]) + r : number
+>(0 | o[(i = y) >> 2]) : number
+>0 | o[(i = y) >> 2] : number
+>0 : 0
+>o[(i = y) >> 2] : error
+>o : error
+>(i = y) >> 2 : number
+>(i = y) : any
+>i = y : any
+>i : any
+>y : any
+>2 : 2
+>r : number
+>0 : 0
+>o[i >> 2] = a : number
+>o[i >> 2] : error
+>o : error
+>i >> 2 : number
+>i : any
+>2 : 2
+>a : number
+>u = E : number
+>u : any
+>E : number
+>c = (0 | o[(s = y + 4 | 0) >> 2]) + u | 0 : number
+>c : any
+>(0 | o[(s = y + 4 | 0) >> 2]) + u | 0 : number
+>(0 | o[(s = y + 4 | 0) >> 2]) + u : number
+>(0 | o[(s = y + 4 | 0) >> 2]) : number
+>0 | o[(s = y + 4 | 0) >> 2] : number
+>0 : 0
+>o[(s = y + 4 | 0) >> 2] : error
+>o : error
+>(s = y + 4 | 0) >> 2 : number
+>(s = y + 4 | 0) : number
+>s = y + 4 | 0 : number
+>s : any
+>y + 4 | 0 : number
+>y + 4 : any
+>y : any
+>4 : 4
+>0 : 0
+>2 : 2
+>u : number
+>0 : 0
+>o[s >> 2] = c : number
+>o[s >> 2] : error
+>o : error
+>s >> 2 : number
+>s : number
+>2 : 2
+>c : number
+>d = w : number
+>d : any
+>w : number
+>p = (0 | o[(h = y + 8 | 0) >> 2]) + d | 0 : number
+>p : any
+>(0 | o[(h = y + 8 | 0) >> 2]) + d | 0 : number
+>(0 | o[(h = y + 8 | 0) >> 2]) + d : number
+>(0 | o[(h = y + 8 | 0) >> 2]) : number
+>0 | o[(h = y + 8 | 0) >> 2] : number
+>0 : 0
+>o[(h = y + 8 | 0) >> 2] : error
+>o : error
+>(h = y + 8 | 0) >> 2 : number
+>(h = y + 8 | 0) : number
+>h = y + 8 | 0 : number
+>h : any
+>y + 8 | 0 : number
+>y + 8 : any
+>y : any
+>8 : 8
+>0 : 0
+>2 : 2
+>d : number
+>0 : 0
+>o[h >> 2] = p : number
+>o[h >> 2] : error
+>o : error
+>h >> 2 : number
+>h : number
+>2 : 2
+>p : number
+>_ = S : number
+>_ : any
+>S : number
+>g = (0 | o[(m = y + 12 | 0) >> 2]) + _ | 0 : number
+>g : any
+>(0 | o[(m = y + 12 | 0) >> 2]) + _ | 0 : number
+>(0 | o[(m = y + 12 | 0) >> 2]) + _ : number
+>(0 | o[(m = y + 12 | 0) >> 2]) : number
+>0 | o[(m = y + 12 | 0) >> 2] : number
+>0 : 0
+>o[(m = y + 12 | 0) >> 2] : error
+>o : error
+>(m = y + 12 | 0) >> 2 : number
+>(m = y + 12 | 0) : number
+>m = y + 12 | 0 : number
+>m : any
+>y + 12 | 0 : number
+>y + 12 : any
+>y : any
+>12 : 12
+>0 : 0
+>2 : 2
+>_ : number
+>0 : 0
+>o[m >> 2] = g : number
+>o[m >> 2] : error
+>o : error
+>m >> 2 : number
+>m : number
+>2 : 2
+>g : number
+>f = v : error
+>f : error
+>v : error
+                    }
diff --git a/tests/cases/compiler/parsingDeepParenthensizedExpression.ts b/tests/cases/compiler/parsingDeepParenthensizedExpression.ts
new file mode 100644
index 00000000000..525fff957de
--- /dev/null
+++ b/tests/cases/compiler/parsingDeepParenthensizedExpression.ts
@@ -0,0 +1,20 @@
+// @allowJs: true
+// @noEmit: true
+
+// @fileName: a.js
+function Y(e, t) {
+                        e |= 0, t |= 0;
+                        var r, i, a, u, s, c, d, h, p, _, m, g, y, A, T, v, M = 0,
+                            E = 0,
+                            w = 0,
+                            S = 0;
+                        v = f, (0 | (f = f + 288 | 0)) >= (0 | l) && b(288), T = v, A = t, M = 0 | o[(y = e) >> 2], E = 0 | o[(y + 4 | 0) >> 2], w = 0 | o[(y + 8 | 0) >> 2], S = 0 | o[(y + 12 | 0) >> 2],
+                            function(e, t, r) {
+                                e |= 0, t |= 0, r |= 0;
+                                var i, a, u, s, c = 0,
+                                    d = 0,
+                                    h = 0;
+                                for (s = f, (0 | (f = f + 32 | 0)) >= (0 | l) && b(32), i = e, a = t, u = r, d = 0, h = 0; h >>> 0 < u >>> 0;) c = 255 & (0 | n[(a + h | 0) >> 0]) | (255 & (0 | n[(a + (h + 1 | 0) | 0) >> 0])) << 8 | (255 & (0 | n[(a + (h + 2 | 0) | 0) >> 0])) << 16 | (255 & (0 | n[(a + (h + 3 | 0) | 0) >> 0])) << 24, o[(i + (d << 2) | 0) >> 2] = c, d = d + 1 | 0, h = h + 4 | 0;
+                                f = s
+                            }(T, A, 64), E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = (E = E + ((((w = (w = (w = w + (606105819 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[T >> 2]) | 0) - 680876936 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 389564586 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1044525330 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1200080426 + (((M = (M = (M = M + (((E & w | (-1 ^ E) & S) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 176418897 | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 20 | 0) >> 2]) | 0) | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1473231341 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 45705983 | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1770035416 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 1958414417 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 42063 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1990404162 | 0) | 0) << 22 | E >>> 10) + w | 0) + (1236535329 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (1804603682 + ((E & w | (-1 ^ E) & S) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 7 | M >>> 25) + E | 0) & E | (-1 ^ M) & w) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 40341101 | 0) | 0) << 12 | S >>> 20) + M | 0) & M | (-1 ^ S) & E) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1502002290 | 0) | 0) << 17 | w >>> 15) + S | 0) & S | (-1 ^ w) & M) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 22 | E >>> 10) + w | 0) + ((((w = (w = (w = w + (643717713 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 165796510 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1069501632 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[T >> 2]) | 0) - 373897302 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (38016083 + (((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 701558691 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 40 | 0) >> 2]) | 0) | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 660478335 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 405537848 | 0) | 0) << 20 | E >>> 12) + w | 0) + (1163531501 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (568446438 + ((E & S | w & (-1 ^ S)) + (0 | o[(T + 36 | 0) >> 2]) | 0) | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1019803690 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 187363961 | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1735328473 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E & S | w & (-1 ^ S)) + (0 | o[(T + 52 | 0) >> 2]) | 0) - 1444681467 | 0) | 0) << 5 | M >>> 27) + E | 0) & w | E & (-1 ^ w)) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 51403784 | 0) | 0) << 9 | S >>> 23) + M | 0) & E | M & (-1 ^ E)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 14 | w >>> 18) + S | 0) & M | S & (-1 ^ M)) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 1926607734 | 0) | 0) << 20 | E >>> 12) + w | 0) + ((((w = (w = (w = w + (1839030562 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 378558 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 32 | 0) >> 2]) | 0) - 2022574463 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 44 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 35309556 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + ((((S = (S = (S = S + (1272893353 + (((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 1530992060 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 16 | 0) >> 2]) | 0) | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 28 | 0) >> 2]) | 0) - 155497632 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1094730640 | 0) | 0) << 23 | E >>> 9) + w | 0) + (76029189 + (((w = (w = (w = w + ((((S = (S = (S = S + ((((M = (M = (M = M + (681279174 + ((E ^ w ^ S) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[T >> 2]) | 0) - 358537222 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 722521979 | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 24 | 0) >> 2]) | 0) | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((w = (w = (w = w + (530742520 + (((S = (S = (S = S + ((((M = (M = (M = M + (((E ^ w ^ S) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 640364487 | 0) | 0) << 4 | M >>> 28) + E | 0) ^ E ^ w) + (0 | o[(T + 48 | 0) >> 2]) | 0) - 421815835 | 0) | 0) << 11 | S >>> 21) + M | 0) ^ M ^ E) + (0 | o[(T + 60 | 0) >> 2]) | 0) | 0) | 0) << 16 | w >>> 16) + S | 0) ^ S ^ M) + (0 | o[(T + 8 | 0) >> 2]) | 0) - 995338651 | 0) | 0) << 23 | E >>> 9) + w | 0) + ((((S = (S = (S = S + (1126891415 + ((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[T >> 2]) | 0) - 198630844 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 28 | 0) >> 2]) | 0) | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 56 | 0) >> 2]) | 0) - 1416354905 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 20 | 0) >> 2]) | 0) - 57434055 | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1700485571 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 48 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 12 | 0) >> 2]) | 0) - 1894986606 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 40 | 0) >> 2]) | 0) - 1051523 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 4 | 0) >> 2]) | 0) - 2054922799 | 0) | 0) << 21 | E >>> 11) + w | 0) + (1309151649 + (((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (1873313359 + ((w ^ (E | -1 ^ S)) + (0 | o[(T + 32 | 0) >> 2]) | 0) | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 60 | 0) >> 2]) | 0) - 30611744 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (((M ^ (S | -1 ^ E)) + (0 | o[(T + 24 | 0) >> 2]) | 0) - 1560198380 | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 52 | 0) >> 2]) | 0) | 0) | 0) << 21 | E >>> 11) + w | 0) + ((((S = (S = (S = S + (((E ^ ((M = (M = (M = M + (((w ^ (E | -1 ^ S)) + (0 | o[(T + 16 | 0) >> 2]) | 0) - 145523070 | 0) | 0) << 6 | M >>> 26) + E | 0) | -1 ^ w)) + (0 | o[(T + 44 | 0) >> 2]) | 0) - 1120210379 | 0) | 0) << 10 | S >>> 22) + M | 0) ^ ((w = (w = (w = w + (718787259 + ((M ^ (S | -1 ^ E)) + (0 | o[(T + 8 | 0) >> 2]) | 0) | 0) | 0) << 15 | w >>> 17) + S | 0) | -1 ^ M)) + (0 | o[(T + 36 | 0) >> 2]) | 0) - 343485551 | 0) | 0) << 21 | E >>> 11) + w | 0, r = M, a = (0 | o[(i = y) >> 2]) + r | 0, o[i >> 2] = a, u = E, c = (0 | o[(s = y + 4 | 0) >> 2]) + u | 0, o[s >> 2] = c, d = w, p = (0 | o[(h = y + 8 | 0) >> 2]) + d | 0, o[h >> 2] = p, _ = S, g = (0 | o[(m = y + 12 | 0) >> 2]) + _ | 0, o[m >> 2] = g, f = v
+                    }
\ No newline at end of file

From c25e7dd873a856a77c7c5e450ad2eca3aa871ec3 Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Wed, 31 Jul 2019 12:01:49 -0700
Subject: [PATCH 081/151] Wire in compilerOptions of the program in to the
 host's resolveModuleNames and resolveTypeReferenceDirectives api Fixes #31056

---
 src/compiler/program.ts                            |  4 ++--
 src/compiler/types.ts                              |  4 ++--
 src/compiler/watch.ts                              |  8 ++++----
 src/services/services.ts                           |  6 ++----
 src/services/types.ts                              |  4 ++--
 tests/baselines/reference/api/tsserverlibrary.d.ts | 12 ++++++------
 tests/baselines/reference/api/typescript.d.ts      | 12 ++++++------
 7 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/src/compiler/program.ts b/src/compiler/program.ts
index 664e2d0319d..6cbc9258c0c 100644
--- a/src/compiler/program.ts
+++ b/src/compiler/program.ts
@@ -762,7 +762,7 @@ namespace ts {
         let resolveModuleNamesWorker: (moduleNames: string[], containingFile: string, reusedNames?: string[], redirectedReference?: ResolvedProjectReference) => ResolvedModuleFull[];
         const hasInvalidatedResolution = host.hasInvalidatedResolution || returnFalse;
         if (host.resolveModuleNames) {
-            resolveModuleNamesWorker = (moduleNames, containingFile, reusedNames, redirectedReference) => host.resolveModuleNames!(Debug.assertEachDefined(moduleNames), containingFile, reusedNames, redirectedReference).map(resolved => {
+            resolveModuleNamesWorker = (moduleNames, containingFile, reusedNames, redirectedReference) => host.resolveModuleNames!(Debug.assertEachDefined(moduleNames), containingFile, reusedNames, redirectedReference, options).map(resolved => {
                 // An older host may have omitted extension, in which case we should infer it from the file extension of resolvedFileName.
                 if (!resolved || (resolved as ResolvedModuleFull).extension !== undefined) {
                     return resolved as ResolvedModuleFull;
@@ -780,7 +780,7 @@ namespace ts {
 
         let resolveTypeReferenceDirectiveNamesWorker: (typeDirectiveNames: string[], containingFile: string, redirectedReference?: ResolvedProjectReference) => (ResolvedTypeReferenceDirective | undefined)[];
         if (host.resolveTypeReferenceDirectives) {
-            resolveTypeReferenceDirectiveNamesWorker = (typeDirectiveNames, containingFile, redirectedReference) => host.resolveTypeReferenceDirectives!(Debug.assertEachDefined(typeDirectiveNames), containingFile, redirectedReference);
+            resolveTypeReferenceDirectiveNamesWorker = (typeDirectiveNames, containingFile, redirectedReference) => host.resolveTypeReferenceDirectives!(Debug.assertEachDefined(typeDirectiveNames), containingFile, redirectedReference, options);
         }
         else {
             const loader = (typesRef: string, containingFile: string, redirectedReference: ResolvedProjectReference | undefined) => resolveTypeReferenceDirective(typesRef, containingFile, options, host, redirectedReference).resolvedTypeReferenceDirective!; // TODO: GH#18217
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 099f7705f84..eda95095955 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -5173,11 +5173,11 @@ namespace ts {
          * If resolveModuleNames is implemented then implementation for members from ModuleResolutionHost can be just
          * 'throw new Error("NotImplemented")'
          */
-        resolveModuleNames?(moduleNames: string[], containingFile: string, reusedNames?: string[], redirectedReference?: ResolvedProjectReference): (ResolvedModule | undefined)[];
+        resolveModuleNames?(moduleNames: string[], containingFile: string, reusedNames: string[] | undefined, redirectedReference: ResolvedProjectReference | undefined, options: CompilerOptions): (ResolvedModule | undefined)[];
         /**
          * This method is a companion for 'resolveModuleNames' and is used to resolve 'types' references to actual type declaration files
          */
-        resolveTypeReferenceDirectives?(typeReferenceDirectiveNames: string[], containingFile: string, redirectedReference?: ResolvedProjectReference): (ResolvedTypeReferenceDirective | undefined)[];
+        resolveTypeReferenceDirectives?(typeReferenceDirectiveNames: string[], containingFile: string, redirectedReference: ResolvedProjectReference | undefined, options: CompilerOptions): (ResolvedTypeReferenceDirective | undefined)[];
         getEnvironmentVariable?(name: string): string | undefined;
         /* @internal */ onReleaseOldSourceFile?(oldSourceFile: SourceFile, oldOptions: CompilerOptions, hasSourceFileByPath: boolean): void;
         /* @internal */ hasInvalidatedResolution?: HasInvalidatedResolution;
diff --git a/src/compiler/watch.ts b/src/compiler/watch.ts
index 6963a4df645..dad4b8f67cd 100644
--- a/src/compiler/watch.ts
+++ b/src/compiler/watch.ts
@@ -538,9 +538,9 @@ namespace ts {
         getEnvironmentVariable?(name: string): string | undefined;
 
         /** If provided, used to resolve the module names, otherwise typescript's default module resolution */
-        resolveModuleNames?(moduleNames: string[], containingFile: string, reusedNames?: string[], redirectedReference?: ResolvedProjectReference): (ResolvedModule | undefined)[];
+        resolveModuleNames?(moduleNames: string[], containingFile: string, reusedNames: string[] | undefined, redirectedReference: ResolvedProjectReference | undefined, options: CompilerOptions): (ResolvedModule | undefined)[];
         /** If provided, used to resolve type reference directives, otherwise typescript's default resolution */
-        resolveTypeReferenceDirectives?(typeReferenceDirectiveNames: string[], containingFile: string, redirectedReference?: ResolvedProjectReference): (ResolvedTypeReferenceDirective | undefined)[];
+        resolveTypeReferenceDirectives?(typeReferenceDirectiveNames: string[], containingFile: string, redirectedReference: ResolvedProjectReference | undefined, options: CompilerOptions): (ResolvedTypeReferenceDirective | undefined)[];
     }
     /** Internal interface used to wire emit through same host */
 
@@ -744,10 +744,10 @@ namespace ts {
         );
         // Resolve module using host module resolution strategy if provided otherwise use resolution cache to resolve module names
         compilerHost.resolveModuleNames = host.resolveModuleNames ?
-            ((moduleNames, containingFile, reusedNames, redirectedReference) => host.resolveModuleNames!(moduleNames, containingFile, reusedNames, redirectedReference)) :
+            ((...args) => host.resolveModuleNames!(...args)) :
             ((moduleNames, containingFile, reusedNames, redirectedReference) => resolutionCache.resolveModuleNames(moduleNames, containingFile, reusedNames, redirectedReference));
         compilerHost.resolveTypeReferenceDirectives = host.resolveTypeReferenceDirectives ?
-            ((typeDirectiveNames, containingFile, redirectedReference) => host.resolveTypeReferenceDirectives!(typeDirectiveNames, containingFile, redirectedReference)) :
+            ((...args) => host.resolveTypeReferenceDirectives!(...args)) :
             ((typeDirectiveNames, containingFile, redirectedReference) => resolutionCache.resolveTypeReferenceDirectives(typeDirectiveNames, containingFile, redirectedReference));
         const userProvidedResolution = !!host.resolveModuleNames || !!host.resolveTypeReferenceDirectives;
 
diff --git a/src/services/services.ts b/src/services/services.ts
index fab6f88b779..42b3ac3b31d 100644
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -1238,12 +1238,10 @@ namespace ts {
             }
 
             if (host.resolveModuleNames) {
-                compilerHost.resolveModuleNames = (moduleNames, containingFile, reusedNames, redirectedReference) => host.resolveModuleNames!(moduleNames, containingFile, reusedNames, redirectedReference);
+                compilerHost.resolveModuleNames = (...args) => host.resolveModuleNames!(...args);
             }
             if (host.resolveTypeReferenceDirectives) {
-                compilerHost.resolveTypeReferenceDirectives = (typeReferenceDirectiveNames, containingFile, redirectedReference) => {
-                    return host.resolveTypeReferenceDirectives!(typeReferenceDirectiveNames, containingFile, redirectedReference);
-                };
+                compilerHost.resolveTypeReferenceDirectives = (...args) => host.resolveTypeReferenceDirectives!(...args);
             }
 
             const documentRegistryBucketKey = documentRegistry.getKeyForCompilationSettings(newSettings);
diff --git a/src/services/types.ts b/src/services/types.ts
index 099263063a8..53d552394e0 100644
--- a/src/services/types.ts
+++ b/src/services/types.ts
@@ -211,9 +211,9 @@ namespace ts {
          *
          * If this is implemented, `getResolvedModuleWithFailedLookupLocationsFromCache` should be too.
          */
-        resolveModuleNames?(moduleNames: string[], containingFile: string, reusedNames?: string[], redirectedReference?: ResolvedProjectReference): (ResolvedModule | undefined)[];
+        resolveModuleNames?(moduleNames: string[], containingFile: string, reusedNames: string[] | undefined, redirectedReference: ResolvedProjectReference | undefined, options: CompilerOptions): (ResolvedModule | undefined)[];
         getResolvedModuleWithFailedLookupLocationsFromCache?(modulename: string, containingFile: string): ResolvedModuleWithFailedLookupLocations | undefined;
-        resolveTypeReferenceDirectives?(typeDirectiveNames: string[], containingFile: string, redirectedReference?: ResolvedProjectReference): (ResolvedTypeReferenceDirective | undefined)[];
+        resolveTypeReferenceDirectives?(typeDirectiveNames: string[], containingFile: string, redirectedReference: ResolvedProjectReference | undefined, options: CompilerOptions): (ResolvedTypeReferenceDirective | undefined)[];
         /* @internal */ hasInvalidatedResolution?: HasInvalidatedResolution;
         /* @internal */ hasChangedAutomaticTypeDirectiveNames?: boolean;
 
diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts
index d73cbab6b5f..a13fd7592ea 100644
--- a/tests/baselines/reference/api/tsserverlibrary.d.ts
+++ b/tests/baselines/reference/api/tsserverlibrary.d.ts
@@ -2769,11 +2769,11 @@ declare namespace ts {
         useCaseSensitiveFileNames(): boolean;
         getNewLine(): string;
         readDirectory?(rootDir: string, extensions: ReadonlyArray<string>, excludes: ReadonlyArray<string> | undefined, includes: ReadonlyArray<string>, depth?: number): string[];
-        resolveModuleNames?(moduleNames: string[], containingFile: string, reusedNames?: string[], redirectedReference?: ResolvedProjectReference): (ResolvedModule | undefined)[];
+        resolveModuleNames?(moduleNames: string[], containingFile: string, reusedNames: string[] | undefined, redirectedReference: ResolvedProjectReference | undefined, options: CompilerOptions): (ResolvedModule | undefined)[];
         /**
          * This method is a companion for 'resolveModuleNames' and is used to resolve 'types' references to actual type declaration files
          */
-        resolveTypeReferenceDirectives?(typeReferenceDirectiveNames: string[], containingFile: string, redirectedReference?: ResolvedProjectReference): (ResolvedTypeReferenceDirective | undefined)[];
+        resolveTypeReferenceDirectives?(typeReferenceDirectiveNames: string[], containingFile: string, redirectedReference: ResolvedProjectReference | undefined, options: CompilerOptions): (ResolvedTypeReferenceDirective | undefined)[];
         getEnvironmentVariable?(name: string): string | undefined;
         createHash?(data: string): string;
         getParsedCommandLine?(fileName: string): ParsedCommandLine | undefined;
@@ -4529,9 +4529,9 @@ declare namespace ts {
         /** If provided is used to get the environment variable */
         getEnvironmentVariable?(name: string): string | undefined;
         /** If provided, used to resolve the module names, otherwise typescript's default module resolution */
-        resolveModuleNames?(moduleNames: string[], containingFile: string, reusedNames?: string[], redirectedReference?: ResolvedProjectReference): (ResolvedModule | undefined)[];
+        resolveModuleNames?(moduleNames: string[], containingFile: string, reusedNames: string[] | undefined, redirectedReference: ResolvedProjectReference | undefined, options: CompilerOptions): (ResolvedModule | undefined)[];
         /** If provided, used to resolve type reference directives, otherwise typescript's default resolution */
-        resolveTypeReferenceDirectives?(typeReferenceDirectiveNames: string[], containingFile: string, redirectedReference?: ResolvedProjectReference): (ResolvedTypeReferenceDirective | undefined)[];
+        resolveTypeReferenceDirectives?(typeReferenceDirectiveNames: string[], containingFile: string, redirectedReference: ResolvedProjectReference | undefined, options: CompilerOptions): (ResolvedTypeReferenceDirective | undefined)[];
     }
     interface WatchCompilerHost<T extends BuilderProgram> extends ProgramHost<T>, WatchHost {
         /** If provided, callback to invoke after every new program creation */
@@ -4886,9 +4886,9 @@ declare namespace ts {
         realpath?(path: string): string;
         fileExists?(path: string): boolean;
         getTypeRootsVersion?(): number;
-        resolveModuleNames?(moduleNames: string[], containingFile: string, reusedNames?: string[], redirectedReference?: ResolvedProjectReference): (ResolvedModule | undefined)[];
+        resolveModuleNames?(moduleNames: string[], containingFile: string, reusedNames: string[] | undefined, redirectedReference: ResolvedProjectReference | undefined, options: CompilerOptions): (ResolvedModule | undefined)[];
         getResolvedModuleWithFailedLookupLocationsFromCache?(modulename: string, containingFile: string): ResolvedModuleWithFailedLookupLocations | undefined;
-        resolveTypeReferenceDirectives?(typeDirectiveNames: string[], containingFile: string, redirectedReference?: ResolvedProjectReference): (ResolvedTypeReferenceDirective | undefined)[];
+        resolveTypeReferenceDirectives?(typeDirectiveNames: string[], containingFile: string, redirectedReference: ResolvedProjectReference | undefined, options: CompilerOptions): (ResolvedTypeReferenceDirective | undefined)[];
         getDirectories?(directoryName: string): string[];
         /**
          * Gets a set of custom transformers to use during emit.
diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts
index 1bb693c0845..64f83da0123 100644
--- a/tests/baselines/reference/api/typescript.d.ts
+++ b/tests/baselines/reference/api/typescript.d.ts
@@ -2769,11 +2769,11 @@ declare namespace ts {
         useCaseSensitiveFileNames(): boolean;
         getNewLine(): string;
         readDirectory?(rootDir: string, extensions: ReadonlyArray<string>, excludes: ReadonlyArray<string> | undefined, includes: ReadonlyArray<string>, depth?: number): string[];
-        resolveModuleNames?(moduleNames: string[], containingFile: string, reusedNames?: string[], redirectedReference?: ResolvedProjectReference): (ResolvedModule | undefined)[];
+        resolveModuleNames?(moduleNames: string[], containingFile: string, reusedNames: string[] | undefined, redirectedReference: ResolvedProjectReference | undefined, options: CompilerOptions): (ResolvedModule | undefined)[];
         /**
          * This method is a companion for 'resolveModuleNames' and is used to resolve 'types' references to actual type declaration files
          */
-        resolveTypeReferenceDirectives?(typeReferenceDirectiveNames: string[], containingFile: string, redirectedReference?: ResolvedProjectReference): (ResolvedTypeReferenceDirective | undefined)[];
+        resolveTypeReferenceDirectives?(typeReferenceDirectiveNames: string[], containingFile: string, redirectedReference: ResolvedProjectReference | undefined, options: CompilerOptions): (ResolvedTypeReferenceDirective | undefined)[];
         getEnvironmentVariable?(name: string): string | undefined;
         createHash?(data: string): string;
         getParsedCommandLine?(fileName: string): ParsedCommandLine | undefined;
@@ -4529,9 +4529,9 @@ declare namespace ts {
         /** If provided is used to get the environment variable */
         getEnvironmentVariable?(name: string): string | undefined;
         /** If provided, used to resolve the module names, otherwise typescript's default module resolution */
-        resolveModuleNames?(moduleNames: string[], containingFile: string, reusedNames?: string[], redirectedReference?: ResolvedProjectReference): (ResolvedModule | undefined)[];
+        resolveModuleNames?(moduleNames: string[], containingFile: string, reusedNames: string[] | undefined, redirectedReference: ResolvedProjectReference | undefined, options: CompilerOptions): (ResolvedModule | undefined)[];
         /** If provided, used to resolve type reference directives, otherwise typescript's default resolution */
-        resolveTypeReferenceDirectives?(typeReferenceDirectiveNames: string[], containingFile: string, redirectedReference?: ResolvedProjectReference): (ResolvedTypeReferenceDirective | undefined)[];
+        resolveTypeReferenceDirectives?(typeReferenceDirectiveNames: string[], containingFile: string, redirectedReference: ResolvedProjectReference | undefined, options: CompilerOptions): (ResolvedTypeReferenceDirective | undefined)[];
     }
     interface WatchCompilerHost<T extends BuilderProgram> extends ProgramHost<T>, WatchHost {
         /** If provided, callback to invoke after every new program creation */
@@ -4886,9 +4886,9 @@ declare namespace ts {
         realpath?(path: string): string;
         fileExists?(path: string): boolean;
         getTypeRootsVersion?(): number;
-        resolveModuleNames?(moduleNames: string[], containingFile: string, reusedNames?: string[], redirectedReference?: ResolvedProjectReference): (ResolvedModule | undefined)[];
+        resolveModuleNames?(moduleNames: string[], containingFile: string, reusedNames: string[] | undefined, redirectedReference: ResolvedProjectReference | undefined, options: CompilerOptions): (ResolvedModule | undefined)[];
         getResolvedModuleWithFailedLookupLocationsFromCache?(modulename: string, containingFile: string): ResolvedModuleWithFailedLookupLocations | undefined;
-        resolveTypeReferenceDirectives?(typeDirectiveNames: string[], containingFile: string, redirectedReference?: ResolvedProjectReference): (ResolvedTypeReferenceDirective | undefined)[];
+        resolveTypeReferenceDirectives?(typeDirectiveNames: string[], containingFile: string, redirectedReference: ResolvedProjectReference | undefined, options: CompilerOptions): (ResolvedTypeReferenceDirective | undefined)[];
         getDirectories?(directoryName: string): string[];
         /**
          * Gets a set of custom transformers to use during emit.

From 44b13ee475cb9dac0a773d6db7593e759cb4156b Mon Sep 17 00:00:00 2001
From: Orta Therox <orta.therox@gmail.com>
Date: Wed, 31 Jul 2019 14:34:21 -0400
Subject: [PATCH 082/151] Don't exclusively check for just JS but scope down
 the check to not include the expando'd objects

---
 src/compiler/checker.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 02b6e9913e7..c823b066d4b 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -29974,9 +29974,8 @@ namespace ts {
             const symbol = getSymbolOfNode(node);
             const target = resolveAlias(symbol);
 
-            const shouldSkipWithJSRequireTargets = !isInJSFile(node) && moduleKind !== ModuleKind.ES2015;
-
-            if (shouldSkipWithJSRequireTargets && target !== unknownSymbol) {
+            const shouldSkipWithJSExpandoTargets = symbol.flags & SymbolFlags.Assignment;
+            if (!shouldSkipWithJSExpandoTargets && target !== unknownSymbol) {
                 // For external modules symbol represents local symbol for an alias.
                 // This local symbol will merge any other local declarations (excluding other aliases)
                 // and symbol.flags will contains combined representation for all merged declaration.

From b377e99958b777483a25b2483a393fdbb96ee172 Mon Sep 17 00:00:00 2001
From: Andrew Branch <andrewbranch@users.noreply.github.com>
Date: Thu, 1 Aug 2019 08:37:43 -0700
Subject: [PATCH 083/151] Prevent infinite recursion resolving nested
 conditional types with import types in them (#32097)

* Prevent infinite recursion resolving conditional types

* Use push/popTypeResolution and issue error

* Add failing test

* Fix the actual problem

* Revert unnecessary changes
---
 src/compiler/checker.ts                        |  9 ++++++---
 ...ericConditionalTypeWithGenericImportType.js | 18 ++++++++++++++++++
 ...onditionalTypeWithGenericImportType.symbols | 17 +++++++++++++++++
 ...cConditionalTypeWithGenericImportType.types | 13 +++++++++++++
 ...ericConditionalTypeWithGenericImportType.ts |  9 +++++++++
 5 files changed, 63 insertions(+), 3 deletions(-)
 create mode 100644 tests/baselines/reference/nestedGenericConditionalTypeWithGenericImportType.js
 create mode 100644 tests/baselines/reference/nestedGenericConditionalTypeWithGenericImportType.symbols
 create mode 100644 tests/baselines/reference/nestedGenericConditionalTypeWithGenericImportType.types
 create mode 100644 tests/cases/compiler/nestedGenericConditionalTypeWithGenericImportType.ts

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 3fa9c2da66e..340c8c739a4 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -5037,8 +5037,10 @@ namespace ts {
             return Debug.assertNever(propertyName);
         }
 
-        // Pop an entry from the type resolution stack and return its associated result value. The result value will
-        // be true if no circularities were detected, or false if a circularity was found.
+        /**
+         * Pop an entry from the type resolution stack and return its associated result value. The result value will
+         * be true if no circularities were detected, or false if a circularity was found.
+         */
         function popTypeResolution(): boolean {
             resolutionTargets.pop();
             resolutionPropertyNames.pop();
@@ -11402,7 +11404,8 @@ namespace ts {
 
         function maybeTypeParameterReference(node: Node) {
             return !(node.kind === SyntaxKind.QualifiedName ||
-                node.parent.kind === SyntaxKind.TypeReference && (<TypeReferenceNode>node.parent).typeArguments && node === (<TypeReferenceNode>node.parent).typeName);
+                node.parent.kind === SyntaxKind.TypeReference && (<TypeReferenceNode>node.parent).typeArguments && node === (<TypeReferenceNode>node.parent).typeName ||
+                node.parent.kind === SyntaxKind.ImportType && (node.parent as ImportTypeNode).typeArguments && node === (node.parent as ImportTypeNode).qualifier);
         }
 
         function isTypeParameterPossiblyReferenced(tp: TypeParameter, node: Node) {
diff --git a/tests/baselines/reference/nestedGenericConditionalTypeWithGenericImportType.js b/tests/baselines/reference/nestedGenericConditionalTypeWithGenericImportType.js
new file mode 100644
index 00000000000..547b33ce82e
--- /dev/null
+++ b/tests/baselines/reference/nestedGenericConditionalTypeWithGenericImportType.js
@@ -0,0 +1,18 @@
+//// [tests/cases/compiler/nestedGenericConditionalTypeWithGenericImportType.ts] ////
+
+//// [name.ts]
+// #31824
+
+export type Name<T> = any;
+
+//// [index.ts]
+type T<X> = any extends ((any extends any ? any : string) extends any ? import("./name").Name<X> : any)
+  ? any
+  : any;
+
+
+//// [name.js]
+"use strict";
+// #31824
+exports.__esModule = true;
+//// [index.js]
diff --git a/tests/baselines/reference/nestedGenericConditionalTypeWithGenericImportType.symbols b/tests/baselines/reference/nestedGenericConditionalTypeWithGenericImportType.symbols
new file mode 100644
index 00000000000..f759d214e59
--- /dev/null
+++ b/tests/baselines/reference/nestedGenericConditionalTypeWithGenericImportType.symbols
@@ -0,0 +1,17 @@
+=== tests/cases/compiler/name.ts ===
+// #31824
+
+export type Name<T> = any;
+>Name : Symbol(Name, Decl(name.ts, 0, 0))
+>T : Symbol(T, Decl(name.ts, 2, 17))
+
+=== tests/cases/compiler/index.ts ===
+type T<X> = any extends ((any extends any ? any : string) extends any ? import("./name").Name<X> : any)
+>T : Symbol(T, Decl(index.ts, 0, 0))
+>X : Symbol(X, Decl(index.ts, 0, 7))
+>Name : Symbol(Name, Decl(name.ts, 0, 0))
+>X : Symbol(X, Decl(index.ts, 0, 7))
+
+  ? any
+  : any;
+
diff --git a/tests/baselines/reference/nestedGenericConditionalTypeWithGenericImportType.types b/tests/baselines/reference/nestedGenericConditionalTypeWithGenericImportType.types
new file mode 100644
index 00000000000..966c7916279
--- /dev/null
+++ b/tests/baselines/reference/nestedGenericConditionalTypeWithGenericImportType.types
@@ -0,0 +1,13 @@
+=== tests/cases/compiler/name.ts ===
+// #31824
+
+export type Name<T> = any;
+>Name : any
+
+=== tests/cases/compiler/index.ts ===
+type T<X> = any extends ((any extends any ? any : string) extends any ? import("./name").Name<X> : any)
+>T : any
+
+  ? any
+  : any;
+
diff --git a/tests/cases/compiler/nestedGenericConditionalTypeWithGenericImportType.ts b/tests/cases/compiler/nestedGenericConditionalTypeWithGenericImportType.ts
new file mode 100644
index 00000000000..0232b2125b3
--- /dev/null
+++ b/tests/cases/compiler/nestedGenericConditionalTypeWithGenericImportType.ts
@@ -0,0 +1,9 @@
+// #31824
+
+// @filename: name.ts
+export type Name<T> = any;
+
+// @filename: index.ts
+type T<X> = any extends ((any extends any ? any : string) extends any ? import("./name").Name<X> : any)
+  ? any
+  : any;

From 777d504580cbbcb7d0c55ef9485a32db1797a890 Mon Sep 17 00:00:00 2001
From: Orta Therox <orta.therox@gmail.com>
Date: Thu, 1 Aug 2019 12:12:26 -0400
Subject: [PATCH 084/151] Fix a typo in the error message around language
 service plugins

---
 src/server/project.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/server/project.ts b/src/server/project.ts
index 889e97b24c5..579ae4d9325 100644
--- a/src/server/project.ts
+++ b/src/server/project.ts
@@ -1275,7 +1275,7 @@ namespace ts.server {
         private enableProxy(pluginModuleFactory: PluginModuleFactory, configEntry: PluginImport) {
             try {
                 if (typeof pluginModuleFactory !== "function") {
-                    this.projectService.logger.info(`Skipped loading plugin ${configEntry.name} because it did expose a proper factory function`);
+                    this.projectService.logger.info(`Skipped loading plugin ${configEntry.name} because it did not expose a proper factory function`);
                     return;
                 }
 

From 73bef22f0bfd904b5ffbba03136ced954ff67ff8 Mon Sep 17 00:00:00 2001
From: Andrew Branch <andrewbranch@users.noreply.github.com>
Date: Thu, 1 Aug 2019 09:34:11 -0700
Subject: [PATCH 085/151] A merged interface with an inherited member should
 satisfy an abstract base class member (#32539)

* A merged interface with an inherited member should satisfy an abstract base class member

* Tighten up comments and names
---
 src/compiler/checker.ts                       | 102 ++++++++++--------
 ...ritedMembersSatisfyAbstractBase.errors.txt |  28 +++++
 ...rgedInheritedMembersSatisfyAbstractBase.js |  56 ++++++++++
 ...nheritedMembersSatisfyAbstractBase.symbols |  42 ++++++++
 ...dInheritedMembersSatisfyAbstractBase.types |  35 ++++++
 ...rgedInheritedMembersSatisfyAbstractBase.ts |  19 ++++
 6 files changed, 236 insertions(+), 46 deletions(-)
 create mode 100644 tests/baselines/reference/mergedInheritedMembersSatisfyAbstractBase.errors.txt
 create mode 100644 tests/baselines/reference/mergedInheritedMembersSatisfyAbstractBase.js
 create mode 100644 tests/baselines/reference/mergedInheritedMembersSatisfyAbstractBase.symbols
 create mode 100644 tests/baselines/reference/mergedInheritedMembersSatisfyAbstractBase.types
 create mode 100644 tests/cases/conformance/interfaces/declarationMerging/mergedInheritedMembersSatisfyAbstractBase.ts

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 340c8c739a4..92d026cd3dc 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -29329,7 +29329,7 @@ namespace ts {
 
             // NOTE: assignability is checked in checkClassDeclaration
             const baseProperties = getPropertiesOfType(baseType);
-            for (const baseProperty of baseProperties) {
+            basePropertyCheck: for (const baseProperty of baseProperties) {
                 const base = getTargetSymbol(baseProperty);
 
                 if (base.flags & SymbolFlags.Prototype) {
@@ -29341,61 +29341,71 @@ namespace ts {
 
                 Debug.assert(!!derived, "derived should point to something, even if it is the base class' declaration.");
 
-                if (derived) {
-                    // In order to resolve whether the inherited method was overridden in the base class or not,
-                    // we compare the Symbols obtained. Since getTargetSymbol returns the symbol on the *uninstantiated*
-                    // type declaration, derived and base resolve to the same symbol even in the case of generic classes.
-                    if (derived === base) {
-                        // derived class inherits base without override/redeclaration
+                // In order to resolve whether the inherited method was overridden in the base class or not,
+                // we compare the Symbols obtained. Since getTargetSymbol returns the symbol on the *uninstantiated*
+                // type declaration, derived and base resolve to the same symbol even in the case of generic classes.
+                if (derived === base) {
+                    // derived class inherits base without override/redeclaration
 
-                        const derivedClassDecl = getClassLikeDeclarationOfSymbol(type.symbol)!;
+                    const derivedClassDecl = getClassLikeDeclarationOfSymbol(type.symbol)!;
 
-                        // It is an error to inherit an abstract member without implementing it or being declared abstract.
-                        // If there is no declaration for the derived class (as in the case of class expressions),
-                        // then the class cannot be declared abstract.
-                        if (baseDeclarationFlags & ModifierFlags.Abstract && (!derivedClassDecl || !hasModifier(derivedClassDecl, ModifierFlags.Abstract))) {
-                            if (derivedClassDecl.kind === SyntaxKind.ClassExpression) {
-                                error(derivedClassDecl, Diagnostics.Non_abstract_class_expression_does_not_implement_inherited_abstract_member_0_from_class_1,
-                                    symbolToString(baseProperty), typeToString(baseType));
-                            }
-                            else {
-                                error(derivedClassDecl, Diagnostics.Non_abstract_class_0_does_not_implement_inherited_abstract_member_1_from_class_2,
-                                    typeToString(type), symbolToString(baseProperty), typeToString(baseType));
+                    // It is an error to inherit an abstract member without implementing it or being declared abstract.
+                    // If there is no declaration for the derived class (as in the case of class expressions),
+                    // then the class cannot be declared abstract.
+                    if (baseDeclarationFlags & ModifierFlags.Abstract && (!derivedClassDecl || !hasModifier(derivedClassDecl, ModifierFlags.Abstract))) {
+                        // Searches other base types for a declaration that would satisfy the inherited abstract member.
+                        // (The class may have more than one base type via declaration merging with an interface with the
+                        // same name.)
+                        for (const otherBaseType of getBaseTypes(type)) {
+                            if (otherBaseType === baseType) continue;
+                            const baseSymbol = getPropertyOfObjectType(otherBaseType, base.escapedName);
+                            const derivedElsewhere = baseSymbol && getTargetSymbol(baseSymbol);
+                            if (derivedElsewhere && derivedElsewhere !== base) {
+                                continue basePropertyCheck;
                             }
                         }
-                    }
-                    else {
-                        // derived overrides base.
-                        const derivedDeclarationFlags = getDeclarationModifierFlagsFromSymbol(derived);
-                        if (baseDeclarationFlags & ModifierFlags.Private || derivedDeclarationFlags & ModifierFlags.Private) {
-                            // either base or derived property is private - not override, skip it
-                            continue;
-                        }
 
-                        if (isPrototypeProperty(base) || base.flags & SymbolFlags.PropertyOrAccessor && derived.flags & SymbolFlags.PropertyOrAccessor) {
-                            // method is overridden with method or property/accessor is overridden with property/accessor - correct case
-                            continue;
-                        }
-
-                        let errorMessage: DiagnosticMessage;
-                        if (isPrototypeProperty(base)) {
-                            if (derived.flags & SymbolFlags.Accessor) {
-                                errorMessage = Diagnostics.Class_0_defines_instance_member_function_1_but_extended_class_2_defines_it_as_instance_member_accessor;
-                            }
-                            else {
-                                errorMessage = Diagnostics.Class_0_defines_instance_member_function_1_but_extended_class_2_defines_it_as_instance_member_property;
-                            }
-                        }
-                        else if (base.flags & SymbolFlags.Accessor) {
-                            errorMessage = Diagnostics.Class_0_defines_instance_member_accessor_1_but_extended_class_2_defines_it_as_instance_member_function;
+                        if (derivedClassDecl.kind === SyntaxKind.ClassExpression) {
+                            error(derivedClassDecl, Diagnostics.Non_abstract_class_expression_does_not_implement_inherited_abstract_member_0_from_class_1,
+                                symbolToString(baseProperty), typeToString(baseType));
                         }
                         else {
-                            errorMessage = Diagnostics.Class_0_defines_instance_member_property_1_but_extended_class_2_defines_it_as_instance_member_function;
+                            error(derivedClassDecl, Diagnostics.Non_abstract_class_0_does_not_implement_inherited_abstract_member_1_from_class_2,
+                                typeToString(type), symbolToString(baseProperty), typeToString(baseType));
                         }
-
-                        error(getNameOfDeclaration(derived.valueDeclaration) || derived.valueDeclaration, errorMessage, typeToString(baseType), symbolToString(base), typeToString(type));
                     }
                 }
+                else {
+                    // derived overrides base.
+                    const derivedDeclarationFlags = getDeclarationModifierFlagsFromSymbol(derived);
+                    if (baseDeclarationFlags & ModifierFlags.Private || derivedDeclarationFlags & ModifierFlags.Private) {
+                        // either base or derived property is private - not override, skip it
+                        continue;
+                    }
+
+                    if (isPrototypeProperty(base) || base.flags & SymbolFlags.PropertyOrAccessor && derived.flags & SymbolFlags.PropertyOrAccessor) {
+                        // method is overridden with method or property/accessor is overridden with property/accessor - correct case
+                        continue;
+                    }
+
+                    let errorMessage: DiagnosticMessage;
+                    if (isPrototypeProperty(base)) {
+                        if (derived.flags & SymbolFlags.Accessor) {
+                            errorMessage = Diagnostics.Class_0_defines_instance_member_function_1_but_extended_class_2_defines_it_as_instance_member_accessor;
+                        }
+                        else {
+                            errorMessage = Diagnostics.Class_0_defines_instance_member_function_1_but_extended_class_2_defines_it_as_instance_member_property;
+                        }
+                    }
+                    else if (base.flags & SymbolFlags.Accessor) {
+                        errorMessage = Diagnostics.Class_0_defines_instance_member_accessor_1_but_extended_class_2_defines_it_as_instance_member_function;
+                    }
+                    else {
+                        errorMessage = Diagnostics.Class_0_defines_instance_member_property_1_but_extended_class_2_defines_it_as_instance_member_function;
+                    }
+
+                    error(getNameOfDeclaration(derived.valueDeclaration) || derived.valueDeclaration, errorMessage, typeToString(baseType), symbolToString(base), typeToString(type));
+                }
             }
         }
 
diff --git a/tests/baselines/reference/mergedInheritedMembersSatisfyAbstractBase.errors.txt b/tests/baselines/reference/mergedInheritedMembersSatisfyAbstractBase.errors.txt
new file mode 100644
index 00000000000..25e647f565d
--- /dev/null
+++ b/tests/baselines/reference/mergedInheritedMembersSatisfyAbstractBase.errors.txt
@@ -0,0 +1,28 @@
+tests/cases/conformance/interfaces/declarationMerging/mergedInheritedMembersSatisfyAbstractBase.ts(19,11): error TS2320: Interface 'IncorrectlyExtends' cannot simultaneously extend types 'BaseClass' and 'IncorrectGetters'.
+  Named property 'bar' of types 'BaseClass' and 'IncorrectGetters' are not identical.
+
+
+==== tests/cases/conformance/interfaces/declarationMerging/mergedInheritedMembersSatisfyAbstractBase.ts (1 errors) ====
+    abstract class BaseClass {
+      abstract bar: number;
+    }
+    
+    class Broken extends BaseClass {}
+    
+    // declaration merging should satisfy abstract bar
+    interface IGetters {
+      bar: number;
+    }
+    interface Broken extends IGetters {}
+    
+    new Broken().bar
+    
+    class IncorrectlyExtends extends BaseClass {}
+    interface IncorrectGetters {
+      bar: string;
+    }
+    interface IncorrectlyExtends extends IncorrectGetters {}
+              ~~~~~~~~~~~~~~~~~~
+!!! error TS2320: Interface 'IncorrectlyExtends' cannot simultaneously extend types 'BaseClass' and 'IncorrectGetters'.
+!!! error TS2320:   Named property 'bar' of types 'BaseClass' and 'IncorrectGetters' are not identical.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/mergedInheritedMembersSatisfyAbstractBase.js b/tests/baselines/reference/mergedInheritedMembersSatisfyAbstractBase.js
new file mode 100644
index 00000000000..4f6814b7524
--- /dev/null
+++ b/tests/baselines/reference/mergedInheritedMembersSatisfyAbstractBase.js
@@ -0,0 +1,56 @@
+//// [mergedInheritedMembersSatisfyAbstractBase.ts]
+abstract class BaseClass {
+  abstract bar: number;
+}
+
+class Broken extends BaseClass {}
+
+// declaration merging should satisfy abstract bar
+interface IGetters {
+  bar: number;
+}
+interface Broken extends IGetters {}
+
+new Broken().bar
+
+class IncorrectlyExtends extends BaseClass {}
+interface IncorrectGetters {
+  bar: string;
+}
+interface IncorrectlyExtends extends IncorrectGetters {}
+
+
+//// [mergedInheritedMembersSatisfyAbstractBase.js]
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+var BaseClass = /** @class */ (function () {
+    function BaseClass() {
+    }
+    return BaseClass;
+}());
+var Broken = /** @class */ (function (_super) {
+    __extends(Broken, _super);
+    function Broken() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    return Broken;
+}(BaseClass));
+new Broken().bar;
+var IncorrectlyExtends = /** @class */ (function (_super) {
+    __extends(IncorrectlyExtends, _super);
+    function IncorrectlyExtends() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    return IncorrectlyExtends;
+}(BaseClass));
diff --git a/tests/baselines/reference/mergedInheritedMembersSatisfyAbstractBase.symbols b/tests/baselines/reference/mergedInheritedMembersSatisfyAbstractBase.symbols
new file mode 100644
index 00000000000..d44e0e03b07
--- /dev/null
+++ b/tests/baselines/reference/mergedInheritedMembersSatisfyAbstractBase.symbols
@@ -0,0 +1,42 @@
+=== tests/cases/conformance/interfaces/declarationMerging/mergedInheritedMembersSatisfyAbstractBase.ts ===
+abstract class BaseClass {
+>BaseClass : Symbol(BaseClass, Decl(mergedInheritedMembersSatisfyAbstractBase.ts, 0, 0))
+
+  abstract bar: number;
+>bar : Symbol(BaseClass.bar, Decl(mergedInheritedMembersSatisfyAbstractBase.ts, 0, 26))
+}
+
+class Broken extends BaseClass {}
+>Broken : Symbol(Broken, Decl(mergedInheritedMembersSatisfyAbstractBase.ts, 2, 1), Decl(mergedInheritedMembersSatisfyAbstractBase.ts, 9, 1))
+>BaseClass : Symbol(BaseClass, Decl(mergedInheritedMembersSatisfyAbstractBase.ts, 0, 0))
+
+// declaration merging should satisfy abstract bar
+interface IGetters {
+>IGetters : Symbol(IGetters, Decl(mergedInheritedMembersSatisfyAbstractBase.ts, 4, 33))
+
+  bar: number;
+>bar : Symbol(IGetters.bar, Decl(mergedInheritedMembersSatisfyAbstractBase.ts, 7, 20))
+}
+interface Broken extends IGetters {}
+>Broken : Symbol(Broken, Decl(mergedInheritedMembersSatisfyAbstractBase.ts, 2, 1), Decl(mergedInheritedMembersSatisfyAbstractBase.ts, 9, 1))
+>IGetters : Symbol(IGetters, Decl(mergedInheritedMembersSatisfyAbstractBase.ts, 4, 33))
+
+new Broken().bar
+>new Broken().bar : Symbol(BaseClass.bar, Decl(mergedInheritedMembersSatisfyAbstractBase.ts, 0, 26))
+>Broken : Symbol(Broken, Decl(mergedInheritedMembersSatisfyAbstractBase.ts, 2, 1), Decl(mergedInheritedMembersSatisfyAbstractBase.ts, 9, 1))
+>bar : Symbol(BaseClass.bar, Decl(mergedInheritedMembersSatisfyAbstractBase.ts, 0, 26))
+
+class IncorrectlyExtends extends BaseClass {}
+>IncorrectlyExtends : Symbol(IncorrectlyExtends, Decl(mergedInheritedMembersSatisfyAbstractBase.ts, 12, 16), Decl(mergedInheritedMembersSatisfyAbstractBase.ts, 17, 1))
+>BaseClass : Symbol(BaseClass, Decl(mergedInheritedMembersSatisfyAbstractBase.ts, 0, 0))
+
+interface IncorrectGetters {
+>IncorrectGetters : Symbol(IncorrectGetters, Decl(mergedInheritedMembersSatisfyAbstractBase.ts, 14, 45))
+
+  bar: string;
+>bar : Symbol(IncorrectGetters.bar, Decl(mergedInheritedMembersSatisfyAbstractBase.ts, 15, 28))
+}
+interface IncorrectlyExtends extends IncorrectGetters {}
+>IncorrectlyExtends : Symbol(IncorrectlyExtends, Decl(mergedInheritedMembersSatisfyAbstractBase.ts, 12, 16), Decl(mergedInheritedMembersSatisfyAbstractBase.ts, 17, 1))
+>IncorrectGetters : Symbol(IncorrectGetters, Decl(mergedInheritedMembersSatisfyAbstractBase.ts, 14, 45))
+
diff --git a/tests/baselines/reference/mergedInheritedMembersSatisfyAbstractBase.types b/tests/baselines/reference/mergedInheritedMembersSatisfyAbstractBase.types
new file mode 100644
index 00000000000..03d0cdaa067
--- /dev/null
+++ b/tests/baselines/reference/mergedInheritedMembersSatisfyAbstractBase.types
@@ -0,0 +1,35 @@
+=== tests/cases/conformance/interfaces/declarationMerging/mergedInheritedMembersSatisfyAbstractBase.ts ===
+abstract class BaseClass {
+>BaseClass : BaseClass
+
+  abstract bar: number;
+>bar : number
+}
+
+class Broken extends BaseClass {}
+>Broken : Broken
+>BaseClass : BaseClass
+
+// declaration merging should satisfy abstract bar
+interface IGetters {
+  bar: number;
+>bar : number
+}
+interface Broken extends IGetters {}
+
+new Broken().bar
+>new Broken().bar : number
+>new Broken() : Broken
+>Broken : typeof Broken
+>bar : number
+
+class IncorrectlyExtends extends BaseClass {}
+>IncorrectlyExtends : IncorrectlyExtends
+>BaseClass : BaseClass
+
+interface IncorrectGetters {
+  bar: string;
+>bar : string
+}
+interface IncorrectlyExtends extends IncorrectGetters {}
+
diff --git a/tests/cases/conformance/interfaces/declarationMerging/mergedInheritedMembersSatisfyAbstractBase.ts b/tests/cases/conformance/interfaces/declarationMerging/mergedInheritedMembersSatisfyAbstractBase.ts
new file mode 100644
index 00000000000..16b4375e79b
--- /dev/null
+++ b/tests/cases/conformance/interfaces/declarationMerging/mergedInheritedMembersSatisfyAbstractBase.ts
@@ -0,0 +1,19 @@
+abstract class BaseClass {
+  abstract bar: number;
+}
+
+class Broken extends BaseClass {}
+
+// declaration merging should satisfy abstract bar
+interface IGetters {
+  bar: number;
+}
+interface Broken extends IGetters {}
+
+new Broken().bar
+
+class IncorrectlyExtends extends BaseClass {}
+interface IncorrectGetters {
+  bar: string;
+}
+interface IncorrectlyExtends extends IncorrectGetters {}

From 33f362abafbd68603d55756a84aaca828c368f87 Mon Sep 17 00:00:00 2001
From: Andrew Branch <andrewbranch@users.noreply.github.com>
Date: Thu, 1 Aug 2019 11:24:04 -0700
Subject: [PATCH 086/151] =?UTF-8?q?Don=E2=80=99t=20issue=20used-before-ini?=
 =?UTF-8?q?tialization=20errors=20in=20declaration=20files=20(#32579)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/compiler/checker.ts                       |  2 +-
 ...BeforeDefinitionInDeclarationFiles.symbols | 26 +++++++++++++++++++
 ...seBeforeDefinitionInDeclarationFiles.types | 26 +++++++++++++++++++
 .../useBeforeDefinitionInDeclarationFiles.ts  | 10 +++++++
 4 files changed, 63 insertions(+), 1 deletion(-)
 create mode 100644 tests/baselines/reference/useBeforeDefinitionInDeclarationFiles.symbols
 create mode 100644 tests/baselines/reference/useBeforeDefinitionInDeclarationFiles.types
 create mode 100644 tests/cases/compiler/useBeforeDefinitionInDeclarationFiles.ts

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 92d026cd3dc..7d3d037b2a6 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -20700,7 +20700,7 @@ namespace ts {
 
         function checkPropertyNotUsedBeforeDeclaration(prop: Symbol, node: PropertyAccessExpression | QualifiedName, right: Identifier): void {
             const { valueDeclaration } = prop;
-            if (!valueDeclaration) {
+            if (!valueDeclaration || getSourceFileOfNode(node).isDeclarationFile) {
                 return;
             }
 
diff --git a/tests/baselines/reference/useBeforeDefinitionInDeclarationFiles.symbols b/tests/baselines/reference/useBeforeDefinitionInDeclarationFiles.symbols
new file mode 100644
index 00000000000..aafa653cf6a
--- /dev/null
+++ b/tests/baselines/reference/useBeforeDefinitionInDeclarationFiles.symbols
@@ -0,0 +1,26 @@
+=== tests/cases/compiler/declaration.d.ts ===
+export declare class ClassWithSymbols {
+>ClassWithSymbols : Symbol(ClassWithSymbols, Decl(declaration.d.ts, 0, 0))
+
+  public readonly [Namespace.locallyExportedCustomSymbol]: string;
+>[Namespace.locallyExportedCustomSymbol] : Symbol(ClassWithSymbols[Namespace.locallyExportedCustomSymbol], Decl(declaration.d.ts, 0, 39))
+>Namespace.locallyExportedCustomSymbol : Symbol(Namespace.locallyExportedCustomSymbol, Decl(declaration.d.ts, 5, 14))
+>Namespace : Symbol(Namespace, Decl(declaration.d.ts, 3, 1))
+>locallyExportedCustomSymbol : Symbol(Namespace.locallyExportedCustomSymbol, Decl(declaration.d.ts, 5, 14))
+
+  public [Namespace.fullyExportedCustomSymbol](): void;
+>[Namespace.fullyExportedCustomSymbol] : Symbol(ClassWithSymbols[Namespace.fullyExportedCustomSymbol], Decl(declaration.d.ts, 1, 66))
+>Namespace.fullyExportedCustomSymbol : Symbol(Namespace.fullyExportedCustomSymbol, Decl(declaration.d.ts, 6, 14))
+>Namespace : Symbol(Namespace, Decl(declaration.d.ts, 3, 1))
+>fullyExportedCustomSymbol : Symbol(Namespace.fullyExportedCustomSymbol, Decl(declaration.d.ts, 6, 14))
+}
+export namespace Namespace {
+>Namespace : Symbol(Namespace, Decl(declaration.d.ts, 3, 1))
+
+  export const locallyExportedCustomSymbol: unique symbol;
+>locallyExportedCustomSymbol : Symbol(locallyExportedCustomSymbol, Decl(declaration.d.ts, 5, 14))
+
+  export const fullyExportedCustomSymbol: unique symbol;
+>fullyExportedCustomSymbol : Symbol(fullyExportedCustomSymbol, Decl(declaration.d.ts, 6, 14))
+}
+
diff --git a/tests/baselines/reference/useBeforeDefinitionInDeclarationFiles.types b/tests/baselines/reference/useBeforeDefinitionInDeclarationFiles.types
new file mode 100644
index 00000000000..34c79c36bfc
--- /dev/null
+++ b/tests/baselines/reference/useBeforeDefinitionInDeclarationFiles.types
@@ -0,0 +1,26 @@
+=== tests/cases/compiler/declaration.d.ts ===
+export declare class ClassWithSymbols {
+>ClassWithSymbols : ClassWithSymbols
+
+  public readonly [Namespace.locallyExportedCustomSymbol]: string;
+>[Namespace.locallyExportedCustomSymbol] : string
+>Namespace.locallyExportedCustomSymbol : unique symbol
+>Namespace : typeof Namespace
+>locallyExportedCustomSymbol : unique symbol
+
+  public [Namespace.fullyExportedCustomSymbol](): void;
+>[Namespace.fullyExportedCustomSymbol] : () => void
+>Namespace.fullyExportedCustomSymbol : unique symbol
+>Namespace : typeof Namespace
+>fullyExportedCustomSymbol : unique symbol
+}
+export namespace Namespace {
+>Namespace : typeof Namespace
+
+  export const locallyExportedCustomSymbol: unique symbol;
+>locallyExportedCustomSymbol : unique symbol
+
+  export const fullyExportedCustomSymbol: unique symbol;
+>fullyExportedCustomSymbol : unique symbol
+}
+
diff --git a/tests/cases/compiler/useBeforeDefinitionInDeclarationFiles.ts b/tests/cases/compiler/useBeforeDefinitionInDeclarationFiles.ts
new file mode 100644
index 00000000000..e4ebb083830
--- /dev/null
+++ b/tests/cases/compiler/useBeforeDefinitionInDeclarationFiles.ts
@@ -0,0 +1,10 @@
+// @filename: declaration.d.ts
+
+export declare class ClassWithSymbols {
+  public readonly [Namespace.locallyExportedCustomSymbol]: string;
+  public [Namespace.fullyExportedCustomSymbol](): void;
+}
+export namespace Namespace {
+  export const locallyExportedCustomSymbol: unique symbol;
+  export const fullyExportedCustomSymbol: unique symbol;
+}

From c337f046fb8b11eccb0366765bf66e3feebc9b34 Mon Sep 17 00:00:00 2001
From: Orta Therox <orta.therox@gmail.com>
Date: Thu, 1 Aug 2019 14:08:58 -0400
Subject: [PATCH 087/151] Ensure that the comma is removed when all named
 imports are removed via moveToFile - fixes #31195

---
 src/harness/fourslash.ts                      |  2 +-
 src/services/refactors/moveToNewFile.ts       |  6 ++++-
 .../moveToNewFile_cleanUpLastNamedImport.ts   | 27 +++++++++++++++++++
 3 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 tests/cases/fourslash/moveToNewFile_cleanUpLastNamedImport.ts

diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts
index f12506be2fb..11271a9e61a 100644
--- a/src/harness/fourslash.ts
+++ b/src/harness/fourslash.ts
@@ -2430,7 +2430,7 @@ namespace FourSlash {
                     const oldText = this.tryGetFileContent(change.fileName);
                     ts.Debug.assert(!!change.isNewFile === (oldText === undefined));
                     const newContent = change.isNewFile ? ts.first(change.textChanges).newText : ts.textChanges.applyChanges(oldText!, change.textChanges);
-                    assert.equal(newContent, expectedNewContent);
+                    assert.equal(newContent, expectedNewContent, `String mis-matched in file ${change.fileName}`);
                 }
                 for (const newFileName in newFileContent) {
                     ts.Debug.assert(changes.some(c => c.fileName === newFileName), "No change in file", () => newFileName);
diff --git a/src/services/refactors/moveToNewFile.ts b/src/services/refactors/moveToNewFile.ts
index ad60a6da5fc..8da05ee55e1 100644
--- a/src/services/refactors/moveToNewFile.ts
+++ b/src/services/refactors/moveToNewFile.ts
@@ -350,7 +350,11 @@ namespace ts.refactor {
             }
             if (namedBindings) {
                 if (namedBindingsUnused) {
-                    changes.delete(sourceFile, namedBindings);
+                    changes.replaceNode(
+                        sourceFile,
+                        importDecl.importClause,
+                        updateImportClause(importDecl.importClause, name, /*namedBindings*/ undefined)
+                    );
                 }
                 else if (namedBindings.kind === SyntaxKind.NamedImports) {
                     for (const element of namedBindings.elements) {
diff --git a/tests/cases/fourslash/moveToNewFile_cleanUpLastNamedImport.ts b/tests/cases/fourslash/moveToNewFile_cleanUpLastNamedImport.ts
new file mode 100644
index 00000000000..eb45fc77f40
--- /dev/null
+++ b/tests/cases/fourslash/moveToNewFile_cleanUpLastNamedImport.ts
@@ -0,0 +1,27 @@
+/// <reference path='fourslash.ts' />
+
+// @Filename: /has-exports.ts
+////
+//// export interface Exported { }
+//// const defaultExport = ""
+//// export default defaultExport
+
+// @Filename: /31195.ts
+////
+////import defaultExport, { Exported } from "./has-exports"
+////console.log(defaultExport)
+////[|export const bar = (logger: Exported) => 0;|]
+
+verify.moveToNewFile({
+  newFileContents: {
+    "/31195.ts": `
+import defaultExport from "./has-exports"
+console.log(defaultExport)
+`,
+
+    "/bar.ts": 
+    `import { Exported } from "./has-exports";
+export const bar = (logger: Exported) => 0;
+`,
+  }
+});

From fa3e9c86db8a1f4497be33d283b6fa5d7cc7f122 Mon Sep 17 00:00:00 2001
From: Michael Crane <micran@microsoft.com>
Date: Thu, 1 Aug 2019 12:46:33 -0700
Subject: [PATCH 088/151] Add PerfLogger and NullLogger to simplify conditional
 logic

---
 src/compiler/binder.ts             |  4 +-
 src/compiler/core.ts               | 18 +------
 src/compiler/moduleNameResolver.ts |  6 +--
 src/compiler/parser.ts             |  4 +-
 src/compiler/perfLogger.ts         | 81 ++++++++++++++++++++++++++++++
 src/compiler/sys.ts                | 10 ++--
 src/compiler/tsconfig.json         |  1 +
 src/compiler/watch.ts              |  8 +--
 src/server/project.ts              |  4 +-
 src/server/session.ts              | 10 ++--
 src/server/utilities.ts            |  8 +--
 src/tsserver/server.ts             | 23 ++++-----
 12 files changed, 121 insertions(+), 56 deletions(-)
 create mode 100644 src/compiler/perfLogger.ts

diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts
index 89602facbb1..8de145d4b72 100644
--- a/src/compiler/binder.ts
+++ b/src/compiler/binder.ts
@@ -107,10 +107,10 @@ namespace ts {
     export function bindSourceFile(file: SourceFile, options: CompilerOptions) {
         try {
             performance.mark("beforeBind");
-            if (etwLogger) etwLogger.logStartBindFile("" + file.fileName);
+            perfLogger.logStartBindFile("" + file.fileName);
             binder(file, options);
         } finally {
-            if (etwLogger) etwLogger.logStopBindFile();
+            perfLogger.logStopBindFile();
             performance.mark("afterBind");
             performance.measure("Bind", "beforeBind", "afterBind");
         }
diff --git a/src/compiler/core.ts b/src/compiler/core.ts
index 30e04f8983b..37506e53cfc 100644
--- a/src/compiler/core.ts
+++ b/src/compiler/core.ts
@@ -5,23 +5,7 @@ namespace ts {
     /** The version of the TypeScript compiler release */
     export const version = `${versionMajorMinor}.0-dev`;
 
-    // Load optional module to enable Event Tracing for Windows
-    // See https://github.com/microsoft/typescript-etw for more information
-    let etwModule;
-    try {
-        // tslint:disable-next-line:no-implicit-dependencies
-        etwModule = require("@microsoft/typescript-etw");
-    }
-    catch (e) {
-        // Optional module not installed
-        etwModule = undefined;
-    }
-
-    /* @internal */
-    // tslint:disable-next-line:no-implicit-dependencies
-    export const etwLogger: typeof import("@microsoft/typescript-etw") | undefined = etwModule;
-
-    if (etwLogger) etwLogger.logInfoEvent(`Starting TypeScript v${versionMajorMinor} with command line: ${JSON.stringify(process.argv)}`);
+    perfLogger.logInfoEvent(`Starting TypeScript v${versionMajorMinor} with command line: ${JSON.stringify(process.argv)}`);
 }
 
 namespace ts {
diff --git a/src/compiler/moduleNameResolver.ts b/src/compiler/moduleNameResolver.ts
index f36ff5c7d4e..23d39dee52d 100644
--- a/src/compiler/moduleNameResolver.ts
+++ b/src/compiler/moduleNameResolver.ts
@@ -666,7 +666,7 @@ namespace ts {
             }
 
             try {
-                if (etwLogger) etwLogger.logStartResolveModule(moduleName /* , containingFile, ModuleResolutionKind[moduleResolution]*/);
+                perfLogger.logStartResolveModule(moduleName /* , containingFile, ModuleResolutionKind[moduleResolution]*/);
                 switch (moduleResolution) {
                     case ModuleResolutionKind.NodeJs:
                         result = nodeModuleNameResolver(moduleName, containingFile, compilerOptions, host, cache, redirectedReference);
@@ -679,8 +679,8 @@ namespace ts {
                 }
             }
             finally {
-                if (etwLogger && result && result.resolvedModule) etwLogger.logInfoEvent(`Module "${moduleName}" resolved to "${result.resolvedModule.resolvedFileName}"`);
-                if (etwLogger) etwLogger.logStopResolveModule((result && result.resolvedModule) ? "" + result.resolvedModule.resolvedFileName : "null");
+                if (result && result.resolvedModule) perfLogger.logInfoEvent(`Module "${moduleName}" resolved to "${result.resolvedModule.resolvedFileName}"`);
+                perfLogger.logStopResolveModule((result && result.resolvedModule) ? "" + result.resolvedModule.resolvedFileName : "null");
              }
 
             if (perFolderCache) {
diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
index 9e66504a120..a90f556afdf 100644
--- a/src/compiler/parser.ts
+++ b/src/compiler/parser.ts
@@ -513,7 +513,7 @@ namespace ts {
         performance.mark("beforeParse");
         let result: SourceFile;
         try {
-            if (etwLogger) etwLogger.logStartParseSourceFile(fileName);
+            perfLogger.logStartParseSourceFile(fileName);
             if (languageVersion === ScriptTarget.JSON) {
                 result = Parser.parseSourceFile(fileName, sourceText, languageVersion, /*syntaxCursor*/ undefined, setParentNodes, ScriptKind.JSON);
             }
@@ -522,7 +522,7 @@ namespace ts {
             }
         }
         finally {
-            if (etwLogger) etwLogger.logStopParseSourceFile();
+            perfLogger.logStopParseSourceFile();
         }
 
         performance.mark("afterParse");
diff --git a/src/compiler/perfLogger.ts b/src/compiler/perfLogger.ts
new file mode 100644
index 00000000000..4f6d277dac5
--- /dev/null
+++ b/src/compiler/perfLogger.ts
@@ -0,0 +1,81 @@
+/* @internal */
+namespace ts {
+    export type PerfLogger = typeof import("@microsoft/typescript-etw"); // tslint:disable-line:no-implicit-dependencies
+
+    export class NullLogger implements PerfLogger {
+        logEvent(_msg: string): void {
+            return;
+        }
+        logErrEvent(_msg: string): void {
+            return;
+        }
+        logPerfEvent(_msg: string): void {
+            return;
+        }
+        logInfoEvent(_msg: string): void {
+            return;
+        }
+        logStartCommand(_command: string, _msg: string): void {
+            return;
+        }
+        logStopCommand(_command: string, _msg: string): void {
+            return;
+        }
+        logStartUpdateProgram(_msg: string): void {
+            return;
+        }
+        logStopUpdateProgram(_msg: string): void {
+            return;
+        }
+        logStartUpdateGraph(): void {
+            return;
+        }
+        logStopUpdateGraph(): void {
+            return;
+        }
+        logStartResolveModule(_name: string): void {
+            return;
+        }
+        logStopResolveModule(_success: string): void {
+            return;
+        }
+        logStartParseSourceFile(_filename: string): void {
+            return;
+        }
+        logStopParseSourceFile(): void {
+            return;
+        }
+        logStartReadFile(_filename: string): void {
+            return;
+        }
+        logStopReadFile(): void {
+            return;
+        }
+        logStartBindFile(_filename: string): void {
+            return;
+        }
+        logStopBindFile(): void {
+            return;
+        }
+        logStartScheduledOperation(_operationId: string): void {
+            return;
+        }
+        logStopScheduledOperation(): void {
+            return;
+        }
+    }
+
+    // Load optional module to enable Event Tracing for Windows
+    // See https://github.com/microsoft/typescript-etw for more information
+    let etwModule;
+    try {
+        // require() will throw an exception if the module is not installed
+        // It may also return undefined if not installed properly
+        etwModule = require("@microsoft/typescript-etw"); // tslint:disable-line:no-implicit-dependencies
+    }
+    catch (e) {
+        etwModule = undefined;
+    }
+
+    export const perfLogger: PerfLogger = etwModule ? etwModule : new NullLogger();
+}
\ No newline at end of file
diff --git a/src/compiler/sys.ts b/src/compiler/sys.ts
index 5e404768918..95f9531ea95 100644
--- a/src/compiler/sys.ts
+++ b/src/compiler/sys.ts
@@ -1088,7 +1088,7 @@ namespace ts {
 
             function readFile(fileName: string, _encoding?: string): string | undefined {
                 try {
-                    if (etwLogger) etwLogger.logStartReadFile(fileName);
+                    perfLogger.logStartReadFile(fileName);
                     if (!fileExists(fileName)) {
                         return undefined;
                     }
@@ -1116,12 +1116,12 @@ namespace ts {
                     // Default is UTF-8 with no byte order mark
                     return buffer.toString("utf8");
                 } finally {
-                    if (etwLogger) etwLogger.logStopReadFile();
+                    perfLogger.logStopReadFile();
                 }
             }
 
             function writeFile(fileName: string, data: string, writeByteOrderMark?: boolean): void {
-                if (etwLogger) etwLogger.logEvent("WriteFile: " + fileName);
+                perfLogger.logEvent("WriteFile: " + fileName);
                 // If a BOM is required, emit one
                 if (writeByteOrderMark) {
                     data = byteOrderMarkIndicator + data;
@@ -1141,7 +1141,7 @@ namespace ts {
             }
 
             function getAccessibleFileSystemEntries(path: string): FileSystemEntries {
-                if (etwLogger) etwLogger.logEvent("ReadDir: " + (path || "."));
+                perfLogger.logEvent("ReadDir: " + (path || "."));
                 try {
                     const entries = _fs.readdirSync(path || ".").sort();
                     const files: string[] = [];
@@ -1203,7 +1203,7 @@ namespace ts {
             }
 
             function getDirectories(path: string): string[] {
-                if (etwLogger) etwLogger.logEvent("ReadDir: " + path);
+                perfLogger.logEvent("ReadDir: " + path);
                 return filter<string>(_fs.readdirSync(path), dir => fileSystemEntryExists(combinePaths(path, dir), FileSystemEntryKind.Directory));
             }
 
diff --git a/src/compiler/tsconfig.json b/src/compiler/tsconfig.json
index f5e16b0d127..e9a8f7fda52 100644
--- a/src/compiler/tsconfig.json
+++ b/src/compiler/tsconfig.json
@@ -7,6 +7,7 @@
     "references": [],
 
     "files": [
+        "perfLogger.ts",
         "core.ts",
         "debug.ts",
         "performance.ts",
diff --git a/src/compiler/watch.ts b/src/compiler/watch.ts
index 4b1ce6b71f4..abefe1ab32d 100644
--- a/src/compiler/watch.ts
+++ b/src/compiler/watch.ts
@@ -1006,18 +1006,18 @@ namespace ts {
             try {
                 switch (reloadLevel) {
                     case ConfigFileProgramReloadLevel.Partial:
-                        if (etwLogger) etwLogger.logStartUpdateProgram("PartialConfigReload");
+                        perfLogger.logStartUpdateProgram("PartialConfigReload");
                         return reloadFileNamesFromConfigFile();
                     case ConfigFileProgramReloadLevel.Full:
-                        if (etwLogger) etwLogger.logStartUpdateProgram("FullConfigReload");
+                        perfLogger.logStartUpdateProgram("FullConfigReload");
                         return reloadConfigFile();
                     default:
-                        if (etwLogger) etwLogger.logStartUpdateProgram("SynchronizeProgram");
+                        perfLogger.logStartUpdateProgram("SynchronizeProgram");
                         synchronizeProgram();
                         return;
                 }
             } finally {
-                if (etwLogger) etwLogger.logStopUpdateProgram("Done");
+                perfLogger.logStopUpdateProgram("Done");
             }
         }
 
diff --git a/src/server/project.ts b/src/server/project.ts
index 6e9973b9e9a..d65c20f3977 100644
--- a/src/server/project.ts
+++ b/src/server/project.ts
@@ -851,7 +851,7 @@ namespace ts.server {
          * @returns: true if set of files in the project stays the same and false - otherwise.
          */
         updateGraph(): boolean {
-            if (etwLogger) etwLogger.logStartUpdateGraph();
+            perfLogger.logStartUpdateGraph();
             try {
                 this.resolutionCache.startRecordingFilesWithChangedResolutions();
 
@@ -890,7 +890,7 @@ namespace ts.server {
                 }
                 return !hasNewProgram;
             } finally {
-                if (etwLogger) etwLogger.logStopUpdateGraph();
+                perfLogger.logStopUpdateGraph();
             }
         }
 
diff --git a/src/server/session.ts b/src/server/session.ts
index 4dea24c8df0..8be592a81b9 100644
--- a/src/server/session.ts
+++ b/src/server/session.ts
@@ -732,7 +732,7 @@ namespace ts.server {
                 return;
             }
             const msgText = formatMessage(msg, this.logger, this.byteLength, this.host.newLine);
-            if (etwLogger) etwLogger.logEvent(`Response message size: ${msgText.length}`);
+            perfLogger.logEvent(`Response message size: ${msgText.length}`);
             this.host.write(msgText);
         }
 
@@ -2513,7 +2513,7 @@ namespace ts.server {
                 request = <protocol.Request>JSON.parse(message);
                 relevantFile = request.arguments && (request as protocol.FileRequest).arguments.file ? (request as protocol.FileRequest).arguments : undefined;
 
-                if (etwLogger) etwLogger.logStartCommand("" + request.command, message.substring(0, 100));
+                perfLogger.logStartCommand("" + request.command, message.substring(0, 100));
                 const { response, responseRequired } = this.executeCommand(request);
 
                 if (this.logger.hasLevel(LogLevel.requestTime)) {
@@ -2529,7 +2529,7 @@ namespace ts.server {
                 // Note: Log before writing the response, else the editor can complete its activity before the server does
                 // Set 'commandSucceded' flag to ensure logStopCommand doesn't get called twice (e.g. if doOutput throws)
                 commandSucceeded = true;
-                if (etwLogger) etwLogger.logStopCommand("" + request.command, "Success");
+                perfLogger.logStopCommand("" + request.command, "Success");
                 if (response) {
                     this.doOutput(response, request.command, request.seq, /*success*/ true);
                 }
@@ -2540,13 +2540,13 @@ namespace ts.server {
             catch (err) {
                 if (err instanceof OperationCanceledException) {
                     // Handle cancellation exceptions
-                    if (etwLogger && !commandSucceeded) etwLogger.logStopCommand("" + (request && request.command), "Canceled: " + err);
+                    if (!commandSucceeded) perfLogger.logStopCommand("" + (request && request.command), "Canceled: " + err);
                     this.doOutput({ canceled: true }, request!.command, request!.seq, /*success*/ true);
                     return;
                 }
 
                 this.logErrorWorker(err, message, relevantFile);
-                if (etwLogger && !commandSucceeded) etwLogger.logStopCommand("" + (request && request.command), "Error: " + err);
+                if (!commandSucceeded) perfLogger.logStopCommand("" + (request && request.command), "Error: " + err);
 
                 this.doOutput(
                     /*info*/ undefined,
diff --git a/src/server/utilities.ts b/src/server/utilities.ts
index a11d13f589d..a080ea38ac6 100644
--- a/src/server/utilities.ts
+++ b/src/server/utilities.ts
@@ -151,14 +151,14 @@ namespace ts.server {
 
         private static run(self: ThrottledOperations, operationId: string, cb: () => void) {
             try {
-                if (etwLogger) etwLogger.logStartScheduledOperation(operationId);
+                perfLogger.logStartScheduledOperation(operationId);
                 self.pendingTimeouts.delete(operationId);
                 if (self.logger) {
                     self.logger.info(`Running: ${operationId}`);
                 }
                 cb();
             } finally {
-                if (etwLogger) etwLogger.logStopScheduledOperation();
+                perfLogger.logStopScheduledOperation();
             }
         }
     }
@@ -180,7 +180,7 @@ namespace ts.server {
             self.timerId = undefined;
 
             try {
-                if (etwLogger) etwLogger.logStartScheduledOperation("GC collect");
+                perfLogger.logStartScheduledOperation("GC collect");
                 const log = self.logger.hasLevel(LogLevel.requestTime);
                 const before = log && self.host.getMemoryUsage!(); // TODO: GH#18217
 
@@ -190,7 +190,7 @@ namespace ts.server {
                     self.logger.perftrc(`GC::before ${before}, after ${after}`);
                 }
             } finally {
-                if (etwLogger) etwLogger.logStopScheduledOperation();
+                perfLogger.logStopScheduledOperation();
             }
         }
     }
diff --git a/src/tsserver/server.ts b/src/tsserver/server.ts
index 7cbe53682b0..13bba676646 100644
--- a/src/tsserver/server.ts
+++ b/src/tsserver/server.ts
@@ -180,19 +180,18 @@ namespace ts.server {
         }
 
         msg(s: string, type: Msg = Msg.Err) {
-            if (etwLogger) {
-                switch (type) {
-                    case Msg.Info:
-                    etwLogger.logInfoEvent(s);
-                    break;
-                    case Msg.Perf:
-                    etwLogger.logPerfEvent(s);
-                    break;
-                    default: // Msg.Err
-                    etwLogger.logErrEvent(s);
-                    break;
-                }
+            switch (type) {
+                case Msg.Info:
+                    perfLogger.logInfoEvent(s);
+                break;
+                case Msg.Perf:
+                    perfLogger.logPerfEvent(s);
+                break;
+                default: // Msg.Err
+                    perfLogger.logErrEvent(s);
+                break;
             }
+
             if (!this.canWrite) return;
 
             s = `[${nowString()}] ${s}\n`;

From 00a75c4283b2918afd768734efae79684a6fcb12 Mon Sep 17 00:00:00 2001
From: Wesley Wigham <wewigham@microsoft.com>
Date: Thu, 1 Aug 2019 14:23:57 -0700
Subject: [PATCH 089/151] Retarget to es6 and fix the resulting bugs (#32221)

* Retarget to es6 and fix the resulting bugs

* Set target back to es5

* Fix typos in declaration emitter
---
 src/compiler/core.ts                      | 11 +++++++++++
 src/compiler/program.ts                   |  5 ++++-
 src/compiler/transformers/declarations.ts | 18 +++++++++++-------
 src/harness/fourslash.ts                  |  3 ++-
 4 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/src/compiler/core.ts b/src/compiler/core.ts
index e0e70c72943..933c599c41a 100644
--- a/src/compiler/core.ts
+++ b/src/compiler/core.ts
@@ -1381,6 +1381,17 @@ namespace ts {
         return keys;
     }
 
+    export function getAllKeys(obj: object): string[] {
+        const result: string[] = [];
+        do {
+            const names = Object.getOwnPropertyNames(obj);
+            for (const name of names) {
+                pushIfUnique(result, name);
+            }
+        } while (obj = Object.getPrototypeOf(obj));
+        return result;
+    }
+
     export function getOwnValues<T>(sparseArray: T[]): T[] {
         const values: T[] = [];
         for (const key in sparseArray) {
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
index 6cbc9258c0c..a7cb013c8ee 100644
--- a/src/compiler/program.ts
+++ b/src/compiler/program.ts
@@ -814,7 +814,10 @@ namespace ts {
         let mapFromFileToProjectReferenceRedirects: Map<Path> | undefined;
 
         const shouldCreateNewSourceFile = shouldProgramCreateNewSourceFiles(oldProgram, options);
-        const structuralIsReused = tryReuseStructureFromOldProgram();
+        // We set `structuralIsReused` to `undefined` because `tryReuseStructureFromOldProgram` calls `tryReuseStructureFromOldProgram` which checks
+        // `structuralIsReused`, which would be a TDZ violation if it was not set in advance to `undefined`.
+        let structuralIsReused: StructureIsReused | undefined;
+        structuralIsReused = tryReuseStructureFromOldProgram();
         if (structuralIsReused !== StructureIsReused.Completely) {
             processingDefaultLibFiles = [];
             processingOtherFiles = [];
diff --git a/src/compiler/transformers/declarations.ts b/src/compiler/transformers/declarations.ts
index bb939f7d4f1..6dfc909b93a 100644
--- a/src/compiler/transformers/declarations.ts
+++ b/src/compiler/transformers/declarations.ts
@@ -83,6 +83,7 @@ namespace ts {
         let currentSourceFile: SourceFile;
         let refs: Map<SourceFile>;
         let libs: Map<boolean>;
+        let emittedImports: readonly AnyImportSyntax[] | undefined; // must be declared in container so it can be `undefined` while transformer's first pass
         const resolver = context.getEmitResolver();
         const options = context.getCompilerOptions();
         const newLine = getNewLineCharacter(options);
@@ -279,7 +280,7 @@ namespace ts {
             const statements = visitNodes(node.statements, visitDeclarationStatements);
             let combinedStatements = setTextRange(createNodeArray(transformAndReplaceLatePaintedStatements(statements)), node.statements);
             refs.forEach(referenceVisitor);
-            const emittedImports = filter(combinedStatements, isAnyImportSyntax);
+            emittedImports = filter(combinedStatements, isAnyImportSyntax);
             if (isExternalModule(node) && (!resultHasExternalModuleIndicator || (needsScopeFixMarker && !resultHasScopeMarker))) {
                 combinedStatements = setTextRange(createNodeArray([...combinedStatements, createEmptyExports()]), combinedStatements);
             }
@@ -736,6 +737,12 @@ namespace ts {
             }
             const oldDiag = getSymbolAccessibilityDiagnostic;
 
+            // Setup diagnostic-related flags before first potential `cleanup` call, otherwise
+            // We'd see a TDZ violation at runtime
+            const canProduceDiagnostic = canProduceDiagnostics(input);
+            const oldWithinObjectLiteralType = suppressNewDiagnosticContexts;
+            let shouldEnterSuppressNewDiagnosticsContextContext = ((input.kind === SyntaxKind.TypeLiteral || input.kind === SyntaxKind.MappedType) && input.parent.kind !== SyntaxKind.TypeAliasDeclaration);
+
             // Emit methods which are private as properties with no type information
             if (isMethodDeclaration(input) || isMethodSignature(input)) {
                 if (hasModifier(input, ModifierFlags.Private)) {
@@ -744,8 +751,7 @@ namespace ts {
                 }
             }
 
-            const canProdiceDiagnostic = canProduceDiagnostics(input);
-            if (canProdiceDiagnostic && !suppressNewDiagnosticContexts) {
+            if (canProduceDiagnostic && !suppressNewDiagnosticContexts) {
                 getSymbolAccessibilityDiagnostic = createGetSymbolAccessibilityDiagnosticForNode(input as DeclarationDiagnosticProducing);
             }
 
@@ -753,8 +759,6 @@ namespace ts {
                 checkEntityNameVisibility(input.exprName, enclosingDeclaration);
             }
 
-            const oldWithinObjectLiteralType = suppressNewDiagnosticContexts;
-            let shouldEnterSuppressNewDiagnosticsContextContext = ((input.kind === SyntaxKind.TypeLiteral || input.kind === SyntaxKind.MappedType) && input.parent.kind !== SyntaxKind.TypeAliasDeclaration);
             if (shouldEnterSuppressNewDiagnosticsContextContext) {
                 // We stop making new diagnostic contexts within object literal types. Unless it's an object type on the RHS of a type alias declaration. Then we do.
                 suppressNewDiagnosticContexts = true;
@@ -909,13 +913,13 @@ namespace ts {
             return cleanup(visitEachChild(input, visitDeclarationSubtree, context));
 
             function cleanup<T extends Node>(returnValue: T | undefined): T | undefined {
-                if (returnValue && canProdiceDiagnostic && hasDynamicName(input as Declaration)) {
+                if (returnValue && canProduceDiagnostic && hasDynamicName(input as Declaration)) {
                     checkName(input as DeclarationDiagnosticProducing);
                 }
                 if (isEnclosingDeclaration(input)) {
                     enclosingDeclaration = previousEnclosingDeclaration;
                 }
-                if (canProdiceDiagnostic && !suppressNewDiagnosticContexts) {
+                if (canProduceDiagnostic && !suppressNewDiagnosticContexts) {
                     getSymbolAccessibilityDiagnostic = oldDiag;
                 }
                 if (shouldEnterSuppressNewDiagnosticsContextContext) {
diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts
index f12506be2fb..8f1a5ae1528 100644
--- a/src/harness/fourslash.ts
+++ b/src/harness/fourslash.ts
@@ -344,7 +344,8 @@ namespace FourSlash {
                     "getDocumentHighlights",
                 ];
                 const proxy = {} as ts.LanguageService;
-                for (const k in ls) {
+                const keys = ts.getAllKeys(ls);
+                for (const k of keys) {
                     const key = k as keyof typeof ls;
                     if (cacheableMembers.indexOf(key) === -1) {
                         proxy[key] = (...args: any[]) => (ls[key] as Function)(...args);

From f04c7ed8334b933d104734ab32a1660ececeefad Mon Sep 17 00:00:00 2001
From: Orta Therox <orta.therox@gmail.com>
Date: Thu, 1 Aug 2019 17:36:09 -0400
Subject: [PATCH 090/151] Supress console.log & others inside the TS Server
 runtime so that language service plugins don't accidentally use them and kill
 the server - fixes #31209

---
 src/tsserver/server.ts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/tsserver/server.ts b/src/tsserver/server.ts
index a9fbf2f3b6a..e1a9e3bb71f 100644
--- a/src/tsserver/server.ts
+++ b/src/tsserver/server.ts
@@ -970,4 +970,12 @@ namespace ts.server {
     if (ts.sys.tryEnableSourceMapsForHost && /^development$/i.test(ts.sys.getEnvironmentVariable("NODE_ENV"))) {
         ts.sys.tryEnableSourceMapsForHost();
     }
+
+    // Overwrites the current console messages to instead write to
+    // the log. This is so that language service plugins which use
+    // console.log don't break the message passing between tsserver
+    // and the client
+    console.log = (msg) => logger.msg(msg, Msg.Info);
+    console.warn = (msg) => logger.msg(msg, Msg.Err);
+    console.error = (msg) => logger.msg(msg, Msg.Err);
 }

From 9d404b49ff40993fbe1d112345862b13f6a73bab Mon Sep 17 00:00:00 2001
From: TypeScript Bot <ts_bot@rcavanaugh.com>
Date: Thu, 1 Aug 2019 15:14:05 -0700
Subject: [PATCH 091/151] Update user baselines (#32658)

---
 .../baselines/reference/docker/azure-sdk.log  |  16 +-
 tests/baselines/reference/user/axios-src.log  |   2 -
 .../user/chrome-devtools-frontend.log         | 620 +++++++++++++++++-
 tests/baselines/reference/user/mqtt.log       |   8 -
 tests/baselines/reference/user/prettier.log   |   2 -
 tests/baselines/reference/user/zone.js.log    |   7 +
 6 files changed, 612 insertions(+), 43 deletions(-)
 delete mode 100644 tests/baselines/reference/user/mqtt.log
 create mode 100644 tests/baselines/reference/user/zone.js.log

diff --git a/tests/baselines/reference/docker/azure-sdk.log b/tests/baselines/reference/docker/azure-sdk.log
index 8728a9a8110..da2597a1b6d 100644
--- a/tests/baselines/reference/docker/azure-sdk.log
+++ b/tests/baselines/reference/docker/azure-sdk.log
@@ -2,20 +2,18 @@ Exit Code: 1
 Standard output:
 
 Rush Multi-Project Build Tool 5.X.X - https://rushjs.io
+Node.js version is 12.7.0 (pre-LTS)
 Starting "rush rebuild"
 Executing a maximum of ?simultaneous processes...
 XX of XX: [@azure/abort-controller] completed successfully in ? seconds
 XX of XX: [@azure/core-asynciterator-polyfill] completed successfully in ? seconds
+XX of XX: [@azure/core-auth] completed successfully in ? seconds
 XX of XX: [@azure/core-paging] completed successfully in ? seconds
 XX of XX: [@azure/cosmos] completed successfully in ? seconds
-XX of XX: [@azure/event-processor-host] completed successfully in ? seconds
 Warning: You have changed the public API signature for this project. Updating review/service-bus.api.md
 XX of XX: [@azure/storage-blob] completed successfully in ? seconds
 XX of XX: [@azure/storage-file] completed successfully in ? seconds
 XX of XX: [@azure/storage-queue] completed successfully in ? seconds
-XX of XX: [@azure/template] completed successfully in ? seconds
-XX of XX: [testhub] completed successfully in ? seconds
-XX of XX: [@azure/core-auth] completed successfully in ? seconds
 npm ERR! code ELIFECYCLE
 npm ERR! errno 2
 npm ERR! @azure/core-http@X.X.X-preview.2 build:tsc: `tsc -p tsconfig.es.json`
@@ -36,7 +34,9 @@ npm ERR! This is probably not a problem with npm. There is likely additional log
 npm ERR! A complete log of this run can be found in:
 npm ERR!     /root/.npm/_logs/XXXX-XX-XXXXXXXXX-debug.log
 ERROR: "build:lib" exited with 1.
-SUCCESS (11)
+XX of XX: [@azure/event-processor-host] completed successfully in ? seconds
+XX of XX: [testhub] completed successfully in ? seconds
+SUCCESS (10)
 ================================
 @azure/abort-controller (? seconds)
 @azure/core-asynciterator-polyfill (? seconds)
@@ -47,7 +47,6 @@ SUCCESS (11)
 @azure/storage-blob (? seconds)
 @azure/storage-file (? seconds)
 @azure/storage-queue (? seconds)
-@azure/template (? seconds)
 testhub (? seconds)
 ================================
 SUCCESS WITH WARNINGS (1)
@@ -55,7 +54,7 @@ SUCCESS WITH WARNINGS (1)
 @azure/service-bus (? seconds)
 Warning: You have changed the public API signature for this project. Updating review/service-bus.api.md
 ================================
-BLOCKED (7)
+BLOCKED (8)
 ================================
 @azure/core-amqp
 @azure/core-arm
@@ -64,6 +63,7 @@ BLOCKED (7)
 @azure/keyvault-certificates
 @azure/keyvault-keys
 @azure/keyvault-secrets
+@azure/template
 ================================
 FAILURE (1)
 ================================
@@ -95,7 +95,6 @@ rush rebuild - Errors! ( ? seconds)
 
 
 Standard error:
-Your version of Node.js (X.X.X) has not been tested with this release of Rush. The Rush team will not accept issue reports for it. Please consider upgrading Rush or downgrading Node.js.
 XX of XX: [@azure/service-bus] completed with warnings in ? seconds
 XX of XX: [@azure/core-http] failed to build!
 XX of XX: [@azure/core-arm] blocked by [@azure/core-http]!
@@ -105,4 +104,5 @@ XX of XX: [@azure/keyvault-secrets] blocked by [@azure/core-http]!
 XX of XX: [@azure/identity] blocked by [@azure/core-http]!
 XX of XX: [@azure/core-amqp] blocked by [@azure/core-http]!
 XX of XX: [@azure/event-hubs] blocked by [@azure/core-http]!
+XX of XX: [@azure/template] blocked by [@azure/core-http]!
 [@azure/core-http] Returned error code: 1
diff --git a/tests/baselines/reference/user/axios-src.log b/tests/baselines/reference/user/axios-src.log
index 9193929eb71..088a83ccd2e 100644
--- a/tests/baselines/reference/user/axios-src.log
+++ b/tests/baselines/reference/user/axios-src.log
@@ -1,7 +1,5 @@
 Exit Code: 1
 Standard output:
-../../../../../built/local/lib.es2015.iterable.d.ts(41,6): error TS2300: Duplicate identifier 'IteratorResult'.
-../../../../../node_modules/@types/node/index.d.ts(77,11): error TS2300: Duplicate identifier 'IteratorResult'.
 lib/adapters/http.js(12,19): error TS2732: Cannot find module './../../package.json'. Consider using '--resolveJsonModule' to import module with '.json' extension
 lib/adapters/http.js(85,22): error TS2345: Argument of type 'string | undefined' is not assignable to parameter of type 'string'.
   Type 'undefined' is not assignable to type 'string'.
diff --git a/tests/baselines/reference/user/chrome-devtools-frontend.log b/tests/baselines/reference/user/chrome-devtools-frontend.log
index 2d4e456d759..10542cec675 100644
--- a/tests/baselines/reference/user/chrome-devtools-frontend.log
+++ b/tests/baselines/reference/user/chrome-devtools-frontend.log
@@ -11,11 +11,9 @@ Standard output:
 ../../../../built/local/lib.dom.d.ts(12776,13): error TS2300: Duplicate identifier 'Request'.
 ../../../../built/local/lib.dom.d.ts(18500,11): error TS2300: Duplicate identifier 'Window'.
 ../../../../built/local/lib.dom.d.ts(18629,13): error TS2300: Duplicate identifier 'Window'.
-../../../../built/local/lib.es2015.iterable.d.ts(41,6): error TS2300: Duplicate identifier 'IteratorResult'.
 ../../../../built/local/lib.es5.d.ts(1416,11): error TS2300: Duplicate identifier 'ArrayLike'.
 ../../../../built/local/lib.es5.d.ts(1452,6): error TS2300: Duplicate identifier 'Record'.
-../../../../node_modules/@types/node/index.d.ts(77,11): error TS2300: Duplicate identifier 'IteratorResult'.
-../../../../node_modules/@types/node/index.d.ts(150,13): error TS2403: Subsequent variable declarations must have the same type.  Variable 'module' must be of type '{}', but here has type 'NodeModule'.
+../../../../node_modules/@types/node/globals.d.ts(234,13): error TS2403: Subsequent variable declarations must have the same type.  Variable 'module' must be of type '{}', but here has type 'NodeModule'.
 node_modules/chrome-devtools-frontend/front_end/Runtime.js(43,8): error TS2339: Property '_importScriptPathPrefix' does not exist on type 'Window & typeof globalThis'.
 node_modules/chrome-devtools-frontend/front_end/Runtime.js(77,16): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/Runtime.js(78,16): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
@@ -40,7 +38,7 @@ node_modules/chrome-devtools-frontend/front_end/Runtime.js(746,5): error TS2322:
   Type '{}' is missing the following properties from type 'Window': applicationCache, caches, clientInformation, closed, and 229 more.
 node_modules/chrome-devtools-frontend/front_end/Runtime.js(1083,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/Runtime.js(1088,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
-node_modules/chrome-devtools-frontend/front_end/Tests.js(107,5): error TS2322: Type 'Timer' is not assignable to type 'number'.
+node_modules/chrome-devtools-frontend/front_end/Tests.js(107,5): error TS2322: Type 'Timeout' is not assignable to type 'number'.
 node_modules/chrome-devtools-frontend/front_end/Tests.js(203,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/Tests.js(208,10): error TS2554: Expected 4 arguments, but got 3.
 node_modules/chrome-devtools-frontend/front_end/Tests.js(221,12): error TS2554: Expected 4 arguments, but got 3.
@@ -345,6 +343,7 @@ node_modules/chrome-devtools-frontend/front_end/animation/AnimationTimeline.js(1
 node_modules/chrome-devtools-frontend/front_end/animation/AnimationTimeline.js(208,50): error TS2554: Expected 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/animation/AnimationTimeline.js(208,67): error TS2554: Expected 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/animation/AnimationTimeline.js(216,67): error TS2339: Property 'AnimationModel' does not exist on type '{ new (effect?: AnimationEffect, timeline?: AnimationTimeline): Animation; prototype: Animation; }'.
+node_modules/chrome-devtools-frontend/front_end/animation/AnimationTimeline.js(218,34): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; TimelineStarted: number; ProfilesCPUProfileTaken: number; ProfilesHeapProfileTaken: number; AuditsStarted: number; ... 23 more ...; ShowedThirdPartyBadges: number; }'.
 node_modules/chrome-devtools-frontend/front_end/animation/AnimationTimeline.js(233,42): error TS2339: Property 'AnimationTimeline' does not exist on type '{ new (effect?: AnimationEffect, timeline?: AnimationTimeline): Animation; prototype: Animation; }'.
 node_modules/chrome-devtools-frontend/front_end/animation/AnimationTimeline.js(235,47): error TS2339: Property 'AnimationTimeline' does not exist on type '{ new (effect?: AnimationEffect, timeline?: AnimationTimeline): Animation; prototype: Animation; }'.
 node_modules/chrome-devtools-frontend/front_end/animation/AnimationTimeline.js(244,38): error TS2339: Property 'AnimationTimeline' does not exist on type '{ new (effect?: AnimationEffect, timeline?: AnimationTimeline): Animation; prototype: Animation; }'.
@@ -415,6 +414,7 @@ node_modules/chrome-devtools-frontend/front_end/animation/AnimationUI.js(197,13)
 node_modules/chrome-devtools-frontend/front_end/animation/AnimationUI.js(206,55): error TS2339: Property 'AnimationUI' does not exist on type '{ new (effect?: AnimationEffect, timeline?: AnimationTimeline): Animation; prototype: Animation; }'.
 node_modules/chrome-devtools-frontend/front_end/animation/AnimationUI.js(208,63): error TS2339: Property 'AnimationUI' does not exist on type '{ new (effect?: AnimationEffect, timeline?: AnimationTimeline): Animation; prototype: Animation; }'.
 node_modules/chrome-devtools-frontend/front_end/animation/AnimationUI.js(213,68): error TS2339: Property 'AnimationUI' does not exist on type '{ new (effect?: AnimationEffect, timeline?: AnimationTimeline): Animation; prototype: Animation; }'.
+node_modules/chrome-devtools-frontend/front_end/animation/AnimationUI.js(218,9): error TS2367: This condition will always return 'false' since the types '{ CSSTransition: string; CSSAnimation: string; WebAnimation: string; }' and '"CSSTransition"' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/animation/AnimationUI.js(240,52): error TS2339: Property 'AnimationUI' does not exist on type '{ new (effect?: AnimationEffect, timeline?: AnimationTimeline): Animation; prototype: Animation; }'.
 node_modules/chrome-devtools-frontend/front_end/animation/AnimationUI.js(242,61): error TS2339: Property 'AnimationUI' does not exist on type '{ new (effect?: AnimationEffect, timeline?: AnimationTimeline): Animation; prototype: Animation; }'.
 node_modules/chrome-devtools-frontend/front_end/animation/AnimationUI.js(245,70): error TS2339: Property 'AnimationUI' does not exist on type '{ new (effect?: AnimationEffect, timeline?: AnimationTimeline): Animation; prototype: Animation; }'.
@@ -487,8 +487,11 @@ node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(210,51):
 node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(229,36): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(230,23): error TS2339: Property 'autofocus' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(233,53): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(236,34): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ SetExactSize: symbol; SetExactWidthMaxHeight: symbol; MeasureContent: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(252,7): error TS2322: Type 'Promise<void>' is not assignable to type 'Promise<undefined>'.
 node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(256,5): error TS2322: Type 'Promise<void>' is not assignable to type 'Promise<undefined>'.
+node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(285,32): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ None: string; Responsive: string; Device: string; }'.
+node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(294,34): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; TimelineStarted: number; ProfilesCPUProfileTaken: number; ProfilesHeapProfileTaken: number; AuditsStarted: number; ... 23 more ...; ShowedThirdPartyBadges: number; }'.
 node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(302,37): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(342,33): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(356,23): error TS2339: Property 'disabled' does not exist on type 'Element'.
@@ -497,6 +500,7 @@ node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(363,24):
 node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(363,55): error TS2554: Expected 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(365,53): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(379,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
+node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(390,34): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; TimelineStarted: number; ProfilesCPUProfileTaken: number; ProfilesHeapProfileTaken: number; AuditsStarted: number; ... 23 more ...; ShowedThirdPartyBadges: number; }'.
 node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(399,15): error TS2503: Cannot find namespace 'ReportRenderer'.
 node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(403,33): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(439,37): error TS2503: Cannot find namespace 'ReportRenderer'.
@@ -674,7 +678,7 @@ node_modules/chrome-devtools-frontend/front_end/audits2_worker/Audits2Service.js
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/Audits2Service.js(51,25): error TS2339: Property 'runLighthouseInWorker' does not exist on type 'Window & typeof globalThis'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/Audits2Service.js(52,27): error TS2503: Cannot find namespace 'ReportRenderer'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/Audits2Service.js(113,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/audits2_worker/Audits2Service.js(128,1): error TS2739: Type 'Window & typeof globalThis' is missing the following properties from type 'Global': GLOBAL, root, gc
+node_modules/chrome-devtools-frontend/front_end/audits2_worker/Audits2Service.js(128,1): error TS2739: Type 'Window & typeof globalThis' is missing the following properties from type 'Global': Buffer, GLOBAL, root, gc
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/Audits2Service.js(129,8): error TS2339: Property 'isVinn' does not exist on type 'Global'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/Audits2Service.js(130,8): error TS2339: Property 'document' does not exist on type 'Global'.
 node_modules/chrome-devtools-frontend/front_end/audits2_worker/Audits2Service.js(131,8): error TS2339: Property 'document' does not exist on type 'Global'.
@@ -3134,6 +3138,7 @@ node_modules/chrome-devtools-frontend/front_end/bindings/CSSWorkspaceBinding.js(
         Types of parameters 'cssModel' and 'model' are incompatible.
           Type 'T' is not assignable to type 'CSSModel'.
 node_modules/chrome-devtools-frontend/front_end/bindings/CSSWorkspaceBinding.js(49,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
+node_modules/chrome-devtools-frontend/front_end/bindings/CSSWorkspaceBinding.js(64,19): error TS2367: This condition will always return 'true' since the types '{ Regular: string; Inline: string; Attributes: string; }' and 'string' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/bindings/CSSWorkspaceBinding.js(104,9): error TS2403: Subsequent variable declarations must have the same type.  Variable 'rawLocations' must be of type 'CSSLocation[]', but here has type 'any[]'.
 node_modules/chrome-devtools-frontend/front_end/bindings/CSSWorkspaceBinding.js(106,20): error TS2339: Property 'pushAll' does not exist on type 'CSSLocation[]'.
 node_modules/chrome-devtools-frontend/front_end/bindings/CSSWorkspaceBinding.js(126,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
@@ -3160,6 +3165,9 @@ node_modules/chrome-devtools-frontend/front_end/bindings/CSSWorkspaceBinding.js(
 node_modules/chrome-devtools-frontend/front_end/bindings/CSSWorkspaceBinding.js(221,31): error TS2345: Argument of type 'CSSStyleSheetHeader' is not assignable to parameter of type 'K'.
   'CSSStyleSheetHeader' is assignable to the constraint of type 'K', but 'K' could be instantiated with a different subtype of constraint '{}'.
 node_modules/chrome-devtools-frontend/front_end/bindings/CSSWorkspaceBinding.js(261,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
+node_modules/chrome-devtools-frontend/front_end/bindings/CompilerScriptMapping.js(48,52): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Debugger: string; Formatter: string; Network: string; Snippets: string; FileSystem: string; ContentScripts: string; Service: string; }'.
+node_modules/chrome-devtools-frontend/front_end/bindings/CompilerScriptMapping.js(50,62): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Debugger: string; Formatter: string; Network: string; Snippets: string; FileSystem: string; ContentScripts: string; Service: string; }'.
+node_modules/chrome-devtools-frontend/front_end/bindings/CompilerScriptMapping.js(59,56): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Debugger: string; Formatter: string; Network: string; Snippets: string; FileSystem: string; ContentScripts: string; Service: string; }'.
 node_modules/chrome-devtools-frontend/front_end/bindings/CompilerScriptMapping.js(184,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/bindings/CompilerScriptMapping.js(194,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/bindings/CompilerScriptMapping.js(202,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
@@ -3193,6 +3201,7 @@ node_modules/chrome-devtools-frontend/front_end/bindings/DebuggerWorkspaceBindin
 node_modules/chrome-devtools-frontend/front_end/bindings/DebuggerWorkspaceBinding.js(389,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/bindings/DebuggerWorkspaceBinding.js(452,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/bindings/DebuggerWorkspaceBinding.js(460,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
+node_modules/chrome-devtools-frontend/front_end/bindings/DefaultScriptMapping.js(44,63): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Debugger: string; Formatter: string; Network: string; Snippets: string; FileSystem: string; ContentScripts: string; Service: string; }'.
 node_modules/chrome-devtools-frontend/front_end/bindings/DefaultScriptMapping.js(100,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/bindings/DefaultScriptMapping.js(115,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/bindings/FileUtils.js(38,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
@@ -3210,17 +3219,21 @@ node_modules/chrome-devtools-frontend/front_end/bindings/FileUtils.js(227,22): e
 node_modules/chrome-devtools-frontend/front_end/bindings/LiveLocation.js(11,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/bindings/LiveLocation.js(18,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/bindings/LiveLocation.js(29,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
+node_modules/chrome-devtools-frontend/front_end/bindings/NetworkProject.js(223,37): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Debugger: string; Formatter: string; Network: string; Snippets: string; FileSystem: string; ContentScripts: string; Service: string; }'.
 node_modules/chrome-devtools-frontend/front_end/bindings/NetworkProject.js(270,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/bindings/NetworkProject.js(286,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/bindings/NetworkProject.js(308,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/bindings/PresentationConsoleMessageHelper.js(66,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/bindings/PresentationConsoleMessageHelper.js(130,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
+node_modules/chrome-devtools-frontend/front_end/bindings/PresentationConsoleMessageHelper.js(181,19): error TS2367: This condition will always return 'false' since the types '{ Verbose: string; Info: string; Warning: string; Error: string; }' and 'string' have no overlap.
+node_modules/chrome-devtools-frontend/front_end/bindings/PresentationConsoleMessageHelper.js(197,48): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Error: string; Warning: string; }'.
 node_modules/chrome-devtools-frontend/front_end/bindings/ResourceMapping.js(17,56): error TS2345: Argument of type 'this' is not assignable to parameter of type '{ modelAdded(model: T): void; modelRemoved(model: T): void; }'.
   Type 'ResourceMapping' is not assignable to type '{ modelAdded(model: T): void; modelRemoved(model: T): void; }'.
     Types of property 'modelAdded' are incompatible.
       Type '(resourceTreeModel: ResourceTreeModel) => void' is not assignable to type '(model: T) => void'.
         Types of parameters 'resourceTreeModel' and 'model' are incompatible.
           Type 'T' is not assignable to type 'ResourceTreeModel'.
+node_modules/chrome-devtools-frontend/front_end/bindings/ResourceMapping.js(112,48): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Debugger: string; Formatter: string; Network: string; Snippets: string; FileSystem: string; ContentScripts: string; Service: string; }'.
 node_modules/chrome-devtools-frontend/front_end/bindings/ResourceMapping.js(147,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/bindings/ResourceMapping.js(181,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/bindings/ResourceMapping.js(189,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
@@ -3243,14 +3256,18 @@ node_modules/chrome-devtools-frontend/front_end/bindings/ResourceScriptMapping.j
 node_modules/chrome-devtools-frontend/front_end/bindings/ResourceScriptMapping.js(305,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/bindings/ResourceScriptMapping.js(318,26): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/bindings/ResourceScriptMapping.js(323,14): error TS2339: Property '_scriptSource' does not exist on type 'ResourceScriptFile'.
+node_modules/chrome-devtools-frontend/front_end/bindings/ResourceScriptMapping.js(329,82): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Info: string; Warning: string; Error: string; }'.
+node_modules/chrome-devtools-frontend/front_end/bindings/ResourceScriptMapping.js(334,11): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Error: string; Warning: string; }'.
 node_modules/chrome-devtools-frontend/front_end/bindings/ResourceScriptMapping.js(384,38): error TS2339: Property '_scriptSource' does not exist on type 'ResourceScriptFile'.
 node_modules/chrome-devtools-frontend/front_end/bindings/ResourceScriptMapping.js(395,12): error TS2339: Property '_scriptSource' does not exist on type 'ResourceScriptFile'.
 node_modules/chrome-devtools-frontend/front_end/bindings/ResourceUtils.js(44,12): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/bindings/ResourceUtils.js(72,32): error TS2339: Property 'asParsedURL' does not exist on type 'string'.
+node_modules/chrome-devtools-frontend/front_end/bindings/SASSSourceMapping.js(43,52): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Debugger: string; Formatter: string; Network: string; Snippets: string; FileSystem: string; ContentScripts: string; Service: string; }'.
 node_modules/chrome-devtools-frontend/front_end/bindings/SASSSourceMapping.js(63,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/bindings/SASSSourceMapping.js(90,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/bindings/SASSSourceMapping.js(108,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/bindings/SASSSourceMapping.js(161,17): error TS2339: Property 'pushAll' does not exist on type 'any[]'.
+node_modules/chrome-devtools-frontend/front_end/bindings/StylesSourceMapping.js(44,42): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Debugger: string; Formatter: string; Network: string; Snippets: string; FileSystem: string; ContentScripts: string; Service: string; }'.
 node_modules/chrome-devtools-frontend/front_end/bindings/StylesSourceMapping.js(111,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/bindings/StylesSourceMapping.js(129,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/bindings/StylesSourceMapping.js(146,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
@@ -3285,6 +3302,8 @@ node_modules/chrome-devtools-frontend/front_end/bindings_test_runner/IsolatedFil
 node_modules/chrome-devtools-frontend/front_end/bindings_test_runner/IsolatedFilesystemTestRunner.js(275,8): error TS2551: Property '_entry' does not exist on type 'typeof TestFileSystem'. Did you mean 'Entry'?
 node_modules/chrome-devtools-frontend/front_end/bindings_test_runner/IsolatedFilesystemTestRunner.js(276,8): error TS2339: Property '_modificationTimesDelta' does not exist on type 'typeof TestFileSystem'.
 node_modules/chrome-devtools-frontend/front_end/bindings_test_runner/OverridesTestRunner.js(7,13): error TS1064: The return type of an async function or method must be the global Promise<T> type.
+node_modules/chrome-devtools-frontend/front_end/bindings_test_runner/PersistenceTestRunner.js(76,79): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Debugger: string; Formatter: string; Network: string; Snippets: string; FileSystem: string; ContentScripts: string; Service: string; }'.
+node_modules/chrome-devtools-frontend/front_end/bindings_test_runner/PersistenceTestRunner.js(77,82): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Debugger: string; Formatter: string; Network: string; Snippets: string; FileSystem: string; ContentScripts: string; Service: string; }'.
 node_modules/chrome-devtools-frontend/front_end/changes/ChangesHighlighter.js(7,51): error TS2694: Namespace 'Changes.ChangesView' has no exported member 'Row'.
 node_modules/chrome-devtools-frontend/front_end/changes/ChangesHighlighter.js(9,56): error TS2694: Namespace 'Changes.ChangesHighlighter' has no exported member 'DiffState'.
 node_modules/chrome-devtools-frontend/front_end/changes/ChangesHighlighter.js(10,75): error TS2694: Namespace 'Changes.ChangesHighlighter' has no exported member 'DiffState'.
@@ -3323,15 +3342,27 @@ node_modules/chrome-devtools-frontend/front_end/changes/ChangesView.js(139,22):
 node_modules/chrome-devtools-frontend/front_end/changes/ChangesView.js(155,26): error TS2339: Property 'pushAll' does not exist on type 'any[]'.
 node_modules/chrome-devtools-frontend/front_end/changes/ChangesView.js(156,25): error TS2339: Property 'pushAll' does not exist on type 'any[]'.
 node_modules/chrome-devtools-frontend/front_end/changes/ChangesView.js(157,24): error TS2339: Property 'pushAll' does not exist on type 'any[]'.
+node_modules/chrome-devtools-frontend/front_end/changes/ChangesView.js(161,49): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Deletion: string; Addition: string; Equal: string; Spacer: string; }'.
 node_modules/chrome-devtools-frontend/front_end/changes/ChangesView.js(163,24): error TS2339: Property 'pushAll' does not exist on type 'any[]'.
 node_modules/chrome-devtools-frontend/front_end/changes/ChangesView.js(167,25): error TS2339: Property 'pushAll' does not exist on type 'any[]'.
 node_modules/chrome-devtools-frontend/front_end/changes/ChangesView.js(170,28): error TS2339: Property 'pushAll' does not exist on type 'any[]'.
 node_modules/chrome-devtools-frontend/front_end/changes/ChangesView.js(172,26): error TS2339: Property 'pushAll' does not exist on type 'any[]'.
+node_modules/chrome-devtools-frontend/front_end/changes/ChangesView.js(175,51): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Deletion: string; Addition: string; Equal: string; Spacer: string; }'.
 node_modules/chrome-devtools-frontend/front_end/changes/ChangesView.js(206,45): error TS2694: Namespace 'Changes.ChangesView' has no exported member 'Row'.
+node_modules/chrome-devtools-frontend/front_end/changes/ChangesView.js(212,46): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Deletion: string; Addition: string; Equal: string; Spacer: string; }'.
 node_modules/chrome-devtools-frontend/front_end/changes/ChangesView.js(215,22): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/changes/ChangesView.js(216,26): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/changes/ChangesView.js(217,15): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Deletion: string; Addition: string; Equal: string; Spacer: string; }'.
+node_modules/chrome-devtools-frontend/front_end/changes/ChangesView.js(231,46): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Deletion: string; Addition: string; Equal: string; Spacer: string; }'.
 node_modules/chrome-devtools-frontend/front_end/changes/ChangesView.js(239,45): error TS2694: Namespace 'Changes.ChangesView' has no exported member 'Row'.
+node_modules/chrome-devtools-frontend/front_end/changes/ChangesView.js(243,41): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Deletion: string; Addition: string; Equal: string; Spacer: string; }'.
+node_modules/chrome-devtools-frontend/front_end/changes/ChangesView.js(244,42): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Deletion: string; Addition: string; Equal: string; Spacer: string; }'.
+node_modules/chrome-devtools-frontend/front_end/changes/ChangesView.js(253,45): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Deletion: string; Addition: string; Equal: string; Spacer: string; }'.
+node_modules/chrome-devtools-frontend/front_end/changes/ChangesView.js(255,46): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Deletion: string; Addition: string; Equal: string; Spacer: string; }'.
 node_modules/chrome-devtools-frontend/front_end/changes/ChangesView.js(270,38): error TS2694: Namespace 'Changes.ChangesView' has no exported member 'Row'.
+node_modules/chrome-devtools-frontend/front_end/changes/ChangesView.js(273,11): error TS2367: This condition will always return 'false' since the types '{ Deletion: string; Addition: string; Equal: string; Spacer: string; }' and 'string' have no overlap.
+node_modules/chrome-devtools-frontend/front_end/changes/ChangesView.js(275,11): error TS2367: This condition will always return 'false' since the types '{ Deletion: string; Addition: string; Equal: string; Spacer: string; }' and 'string' have no overlap.
+node_modules/chrome-devtools-frontend/front_end/changes/ChangesView.js(277,11): error TS2367: This condition will always return 'false' since the types '{ Deletion: string; Addition: string; Equal: string; Spacer: string; }' and 'string' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/changes/ChangesView.js(314,21): error TS2339: Property 'Row' does not exist on type 'typeof ChangesView'.
 node_modules/chrome-devtools-frontend/front_end/cm/activeline.js(6,17): error TS2307: Cannot find module '../../lib/codemirror'.
 node_modules/chrome-devtools-frontend/front_end/cm/activeline.js(7,19): error TS2304: Cannot find name 'define'.
@@ -3445,11 +3476,11 @@ node_modules/chrome-devtools-frontend/front_end/cm/codemirror.js(8795,39): error
 node_modules/chrome-devtools-frontend/front_end/cm/codemirror.js(8799,38): error TS2339: Property 'offset' does not exist on type '{ node: any; start: number; end: number; collapse: any; coverStart: any; coverEnd: any; } | { node: any; offset: number; }'.
   Property 'offset' does not exist on type '{ node: any; start: number; end: number; collapse: any; coverStart: any; coverEnd: any; }'.
 node_modules/chrome-devtools-frontend/front_end/cm/codemirror.js(8817,16): error TS2769: No overload matches this call.
-  Overload 1 of 2, '(timeoutId: Timer): void', gave the following error.
-    Argument of type 'boolean' is not assignable to parameter of type 'Timer'.
+  Overload 1 of 2, '(timeoutId: Timeout): void', gave the following error.
+    Argument of type 'boolean' is not assignable to parameter of type 'Timeout'.
   Overload 2 of 2, '(handle?: number): void', gave the following error.
     Argument of type 'boolean' is not assignable to parameter of type 'number'.
-node_modules/chrome-devtools-frontend/front_end/cm/codemirror.js(8818,3): error TS2322: Type 'Timer' is not assignable to type 'boolean'.
+node_modules/chrome-devtools-frontend/front_end/cm/codemirror.js(8818,3): error TS2322: Type 'Timeout' is not assignable to type 'boolean'.
 node_modules/chrome-devtools-frontend/front_end/cm/codemirror.js(8840,24): error TS2339: Property 'div' does not exist on type 'ContentEditableInput'.
 node_modules/chrome-devtools-frontend/front_end/cm/codemirror.js(8847,10): error TS2339: Property 'div' does not exist on type 'ContentEditableInput'.
 node_modules/chrome-devtools-frontend/front_end/cm/codemirror.js(8850,58): error TS2339: Property 'div' does not exist on type 'ContentEditableInput'.
@@ -3594,6 +3625,7 @@ node_modules/chrome-devtools-frontend/front_end/color_picker/ContrastDetails.js(
 node_modules/chrome-devtools-frontend/front_end/color_picker/ContrastDetails.js(243,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/color_picker/ContrastDetails.js(261,41): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/color_picker/ContrastInfo.js(32,28): error TS2694: Namespace 'SDK.CSSModel' has no exported member 'ContrastInfo'.
+node_modules/chrome-devtools-frontend/front_end/color_picker/ContrastInfo.js(124,53): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Original: string; Nickname: string; HEX: string; ShortHEX: string; HEXA: string; ShortHEXA: string; RGB: string; RGBA: string; HSL: string; HSLA: string; }'.
 node_modules/chrome-devtools-frontend/front_end/color_picker/ContrastOverlay.js(16,41): error TS2339: Property 'createSVGChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(38,32): error TS2339: Property 'createSVGChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(48,25): error TS2339: Property 'tabIndex' does not exist on type 'Element'.
@@ -3655,6 +3687,8 @@ node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(487,39)
 node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(492,22): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(498,36): error TS2694: Namespace 'ColorPicker.Spectrum' has no exported member 'Palette'.
 node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(528,18): error TS2339: Property 'style' does not exist on type 'Element'.
+node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(541,34): error TS2345: Argument of type 'string | { Original: string; Nickname: string; HEX: string; ShortHEX: string; HEXA: string; ShortHEXA: string; RGB: string; RGBA: string; HSL: string; HSLA: string; }' is not assignable to parameter of type 'string'.
+  Type '{ Original: string; Nickname: string; HEX: string; ShortHEX: string; HEXA: string; ShortHEXA: string; RGB: string; RGBA: string; HSL: string; HSLA: string; }' is not assignable to type 'string'.
 node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(546,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(565,18): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(567,18): error TS2555: Expected at least 2 arguments, but got 1.
@@ -3671,6 +3705,7 @@ node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(775,20)
 node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(776,13): error TS2339: Property 'consume' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(782,36): error TS2339: Property 'value' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(786,28): error TS2339: Property 'sprintf' does not exist on type 'StringConstructor'.
+node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(796,52): error TS2345: Argument of type '{ Original: string; Nickname: string; HEX: string; ShortHEX: string; HEXA: string; ShortHEXA: string; RGB: string; RGBA: string; HSL: string; HSLA: string; }' is not assignable to parameter of type 'string'.
 node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(821,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(838,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(865,22): error TS2339: Property 'Palette' does not exist on type 'typeof Spectrum'.
@@ -3681,28 +3716,49 @@ node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(918,37)
 node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(933,29): error TS2339: Property 'keysArray' does not exist on type 'Map<string, Color>'.
 node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(1009,39): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(1016,41): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/common/Color.js(91,65): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Original: string; Nickname: string; HEX: string; ShortHEX: string; HEXA: string; ShortHEXA: string; RGB: string; RGBA: string; HSL: string; HSLA: string; }'.
+node_modules/chrome-devtools-frontend/front_end/common/Color.js(99,11): error TS2322: Type 'string' is not assignable to type '{ Original: string; Nickname: string; HEX: string; ShortHEX: string; HEXA: string; ShortHEXA: string; RGB: string; RGBA: string; HSL: string; HSLA: string; }'.
 node_modules/chrome-devtools-frontend/front_end/common/Color.js(133,13): error TS2403: Subsequent variable declarations must have the same type.  Variable 'rgba' must be of type 'any', but here has type 'number[]'.
+node_modules/chrome-devtools-frontend/front_end/common/Color.js(139,39): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Original: string; Nickname: string; HEX: string; ShortHEX: string; HEXA: string; ShortHEXA: string; RGB: string; RGBA: string; HSL: string; HSLA: string; }'.
 node_modules/chrome-devtools-frontend/front_end/common/Color.js(149,13): error TS2403: Subsequent variable declarations must have the same type.  Variable 'rgba' must be of type 'any', but here has type 'any[]'.
+node_modules/chrome-devtools-frontend/front_end/common/Color.js(151,39): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Original: string; Nickname: string; HEX: string; ShortHEX: string; HEXA: string; ShortHEXA: string; RGB: string; RGBA: string; HSL: string; HSLA: string; }'.
+node_modules/chrome-devtools-frontend/front_end/common/Color.js(163,85): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Original: string; Nickname: string; HEX: string; ShortHEX: string; HEXA: string; ShortHEXA: string; RGB: string; RGBA: string; HSL: string; HSLA: string; }'.
+node_modules/chrome-devtools-frontend/front_end/common/Color.js(173,35): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Original: string; Nickname: string; HEX: string; ShortHEX: string; HEXA: string; ShortHEXA: string; RGB: string; RGBA: string; HSL: string; HSLA: string; }'.
 node_modules/chrome-devtools-frontend/front_end/common/Color.js(182,15): error TS2345: Argument of type 'string' is not assignable to parameter of type 'number'.
 node_modules/chrome-devtools-frontend/front_end/common/Color.js(217,15): error TS2345: Argument of type 'string' is not assignable to parameter of type 'number'.
 node_modules/chrome-devtools-frontend/front_end/common/Color.js(235,58): error TS2345: Argument of type 'string' is not assignable to parameter of type 'number'.
+node_modules/chrome-devtools-frontend/front_end/common/Color.js(426,5): error TS2322: Type 'string | { Original: string; Nickname: string; HEX: string; ShortHEX: string; HEXA: string; ShortHEXA: string; RGB: string; RGBA: string; HSL: string; HSLA: string; }' is not assignable to type '{ Original: string; Nickname: string; HEX: string; ShortHEX: string; HEXA: string; ShortHEXA: string; RGB: string; RGBA: string; HSL: string; HSLA: string; }'.
+  Type 'string' is not assignable to type '{ Original: string; Nickname: string; HEX: string; ShortHEX: string; HEXA: string; ShortHEXA: string; RGB: string; RGBA: string; HSL: string; HSLA: string; }'.
+node_modules/chrome-devtools-frontend/front_end/common/Color.js(518,7): error TS2322: Type 'string' is not assignable to type '{ Original: string; Nickname: string; HEX: string; ShortHEX: string; HEXA: string; ShortHEXA: string; RGB: string; RGBA: string; HSL: string; HSLA: string; }'.
+node_modules/chrome-devtools-frontend/front_end/common/Color.js(519,5): error TS2322: Type 'string' is not assignable to type '{ Original: string; Nickname: string; HEX: string; ShortHEX: string; HEXA: string; ShortHEXA: string; RGB: string; RGBA: string; HSL: string; HSLA: string; }'.
 node_modules/chrome-devtools-frontend/front_end/common/Color.js(563,23): error TS2339: Property 'sprintf' does not exist on type 'StringConstructor'.
 node_modules/chrome-devtools-frontend/front_end/common/Color.js(566,23): error TS2339: Property 'sprintf' does not exist on type 'StringConstructor'.
 node_modules/chrome-devtools-frontend/front_end/common/Color.js(573,23): error TS2339: Property 'sprintf' does not exist on type 'StringConstructor'.
 node_modules/chrome-devtools-frontend/front_end/common/Color.js(577,23): error TS2339: Property 'sprintf' does not exist on type 'StringConstructor'.
 node_modules/chrome-devtools-frontend/front_end/common/Color.js(582,14): error TS2339: Property 'sprintf' does not exist on type 'StringConstructor'.
 node_modules/chrome-devtools-frontend/front_end/common/Color.js(590,14): error TS2339: Property 'sprintf' does not exist on type 'StringConstructor'.
+node_modules/chrome-devtools-frontend/front_end/common/Color.js(594,13): error TS2367: This condition will always return 'true' since the types '{ Original: string; Nickname: string; HEX: string; ShortHEX: string; HEXA: string; ShortHEXA: string; RGB: string; RGBA: string; HSL: string; HSLA: string; }' and 'string' have no overlap.
+node_modules/chrome-devtools-frontend/front_end/common/Color.js(594,60): error TS2367: This condition will always return 'true' since the types '{ Original: string; Nickname: string; HEX: string; ShortHEX: string; HEXA: string; ShortHEXA: string; RGB: string; RGBA: string; HSL: string; HSLA: string; }' and 'string' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/common/Color.js(597,14): error TS2339: Property 'sprintf' does not exist on type 'StringConstructor'.
+node_modules/chrome-devtools-frontend/front_end/common/Color.js(604,13): error TS2367: This condition will always return 'true' since the types '{ Original: string; Nickname: string; HEX: string; ShortHEX: string; HEXA: string; ShortHEXA: string; RGB: string; RGBA: string; HSL: string; HSLA: string; }' and 'string' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/common/Color.js(607,14): error TS2339: Property 'sprintf' does not exist on type 'StringConstructor'.
 node_modules/chrome-devtools-frontend/front_end/common/Color.js(640,23): error TS2339: Property '_rgbaToNickname' does not exist on type 'typeof Color'.
 node_modules/chrome-devtools-frontend/front_end/common/Color.js(641,20): error TS2339: Property '_rgbaToNickname' does not exist on type 'typeof Color'.
 node_modules/chrome-devtools-frontend/front_end/common/Color.js(646,22): error TS2339: Property '_rgbaToNickname' does not exist on type 'typeof Color'.
 node_modules/chrome-devtools-frontend/front_end/common/Color.js(650,25): error TS2339: Property '_rgbaToNickname' does not exist on type 'typeof Color'.
 node_modules/chrome-devtools-frontend/front_end/common/Color.js(661,5): error TS2741: Property 'a' is missing in type '{ r: number; g: number; b: number; }' but required in type '{ r: number; g: number; b: number; a: number; }'.
+node_modules/chrome-devtools-frontend/front_end/common/Color.js(673,35): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Original: string; Nickname: string; HEX: string; ShortHEX: string; HEXA: string; ShortHEXA: string; RGB: string; RGBA: string; HSL: string; HSLA: string; }'.
+node_modules/chrome-devtools-frontend/front_end/common/Color.js(683,35): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Original: string; Nickname: string; HEX: string; ShortHEX: string; HEXA: string; ShortHEXA: string; RGB: string; RGBA: string; HSL: string; HSLA: string; }'.
+node_modules/chrome-devtools-frontend/front_end/common/Color.js(693,35): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Original: string; Nickname: string; HEX: string; ShortHEX: string; HEXA: string; ShortHEXA: string; RGB: string; RGBA: string; HSL: string; HSLA: string; }'.
 node_modules/chrome-devtools-frontend/front_end/common/Color.js(934,23): error TS2339: Property 'hashCode' does not exist on type 'StringConstructor'.
 node_modules/chrome-devtools-frontend/front_end/common/Color.js(935,45): error TS2345: Argument of type 'number | { min: number; max: number; }' is not assignable to parameter of type 'number | { min: number; max: number; count: number; }'.
   Type '{ min: number; max: number; }' is not assignable to type 'number | { min: number; max: number; count: number; }'.
     Property 'count' is missing in type '{ min: number; max: number; }' but required in type '{ min: number; max: number; count: number; }'.
+node_modules/chrome-devtools-frontend/front_end/common/Console.js(21,42): error TS2345: Argument of type 'string | { Info: string; Warning: string; Error: string; }' is not assignable to parameter of type '{ Info: string; Warning: string; Error: string; }'.
+  Type 'string' is not assignable to type '{ Info: string; Warning: string; Error: string; }'.
+node_modules/chrome-devtools-frontend/front_end/common/Console.js(30,27): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Info: string; Warning: string; Error: string; }'.
+node_modules/chrome-devtools-frontend/front_end/common/Console.js(37,27): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Info: string; Warning: string; Error: string; }'.
+node_modules/chrome-devtools-frontend/front_end/common/Console.js(44,27): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Info: string; Warning: string; Error: string; }'.
 node_modules/chrome-devtools-frontend/front_end/common/ContentProvider.js(37,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/common/ContentProvider.js(42,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/common/ContentProvider.js(47,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
@@ -3745,6 +3801,12 @@ node_modules/chrome-devtools-frontend/front_end/common/ParsedURL.js(215,29): err
 node_modules/chrome-devtools-frontend/front_end/common/ParsedURL.js(318,49): error TS2554: Expected 0 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/common/ParsedURL.js(375,18): error TS2339: Property 'asParsedURL' does not exist on type 'String'.
 node_modules/chrome-devtools-frontend/front_end/common/SegmentedRange.js(48,37): error TS2339: Property 'lowerBound' does not exist on type 'Segment[]'.
+node_modules/chrome-devtools-frontend/front_end/common/Settings.js(74,92): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ Global: symbol; Local: symbol; Session: symbol; }'.
+node_modules/chrome-devtools-frontend/front_end/common/Settings.js(75,75): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ Global: symbol; Local: symbol; Session: symbol; }'.
+node_modules/chrome-devtools-frontend/front_end/common/Settings.js(125,50): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ Global: symbol; Local: symbol; Session: symbol; }'.
+node_modules/chrome-devtools-frontend/front_end/common/Settings.js(158,12): error TS2678: Type 'symbol' is not comparable to type '{ Global: symbol; Local: symbol; Session: symbol; }'.
+node_modules/chrome-devtools-frontend/front_end/common/Settings.js(160,12): error TS2678: Type 'symbol' is not comparable to type '{ Global: symbol; Local: symbol; Session: symbol; }'.
+node_modules/chrome-devtools-frontend/front_end/common/Settings.js(162,12): error TS2678: Type 'symbol' is not comparable to type '{ Global: symbol; Local: symbol; Session: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/common/Settings.js(227,10): error TS2554: Expected 1 arguments, but got 0.
 node_modules/chrome-devtools-frontend/front_end/common/Settings.js(273,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/common/Settings.js(273,31): error TS2694: Namespace 'Common' has no exported member 'Event'.
@@ -3759,7 +3821,7 @@ node_modules/chrome-devtools-frontend/front_end/common/Settings.js(535,18): erro
 node_modules/chrome-devtools-frontend/front_end/common/Settings.js(541,18): error TS2339: Property 'horizontal' does not exist on type '{}'.
 node_modules/chrome-devtools-frontend/front_end/common/Settings.js(542,18): error TS2339: Property 'horizontal' does not exist on type '{}'.
 node_modules/chrome-devtools-frontend/front_end/common/Throttler.js(97,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/common/Throttler.js(102,5): error TS2322: Type 'Timer' is not assignable to type 'number'.
+node_modules/chrome-devtools-frontend/front_end/common/Throttler.js(102,5): error TS2322: Type 'Timeout' is not assignable to type 'number'.
 node_modules/chrome-devtools-frontend/front_end/common/Throttler.js(113,15): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/common/Throttler.js(114,18): error TS2339: Property 'FinishCallback' does not exist on type 'typeof Throttler'.
 node_modules/chrome-devtools-frontend/front_end/common/UIString.js(32,1): error TS2322: Type 'typeof Common | {}' is not assignable to type 'typeof Common'.
@@ -3909,8 +3971,10 @@ node_modules/chrome-devtools-frontend/front_end/console/ConsoleFilter.js(33,26):
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleFilter.js(45,5): error TS2322: Type '{}' is not assignable to type '{ [x: string]: boolean; }'.
   Index signature is missing in type '{}'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleFilter.js(54,24): error TS2339: Property 'ConsoleFilter' does not exist on type '{ new (): Console; prototype: Console; }'.
+node_modules/chrome-devtools-frontend/front_end/console/ConsoleFilter.js(72,47): error TS2352: Conversion of type '{ Verbose: string; Info: string; Warning: string; Error: string; }' to type 'string' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleFilter.js(83,24): error TS2339: Property 'ConsoleFilter' does not exist on type '{ new (): Console; prototype: Console; }'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleFilter.js(87,24): error TS2339: Property 'ConsoleFilter' does not exist on type '{ new (): Console; prototype: Console; }'.
+node_modules/chrome-devtools-frontend/front_end/console/ConsoleFilter.js(90,25): error TS2352: Conversion of type 'string' to type '{ XML: string; JS: string; Network: string; ConsoleAPI: string; Storage: string; AppCache: string; Rendering: string; CSS: string; Security: string; Deprecation: string; Worker: string; Violation: string; Intervention: string; Recommendation: string; Other: string; }' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleFilter.js(95,24): error TS2339: Property 'ConsoleFilter' does not exist on type '{ new (): Console; prototype: Console; }'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleFilter.js(105,40): error TS2694: Namespace 'TextUtils.FilterParser' has no exported member 'ParsedFilter'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleFilter.js(127,9): error TS2339: Property 'ConsoleFilter' does not exist on type '{ new (): Console; prototype: Console; }'.
@@ -3937,6 +4001,7 @@ node_modules/chrome-devtools-frontend/front_end/console/ConsolePrompt.js(137,25)
 node_modules/chrome-devtools-frontend/front_end/console/ConsolePrompt.js(143,19): error TS2339: Property 'consume' does not exist on type 'KeyboardEvent'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsolePrompt.js(159,11): error TS2339: Property 'consume' does not exist on type 'KeyboardEvent'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsolePrompt.js(206,19): error TS2339: Property 'ConsolePanel' does not exist on type '{ new (): Console; prototype: Console; }'.
+node_modules/chrome-devtools-frontend/front_end/console/ConsolePrompt.js(207,38): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; TimelineStarted: number; ProfilesCPUProfileTaken: number; ProfilesHeapProfileTaken: number; AuditsStarted: number; ... 23 more ...; ShowedThirdPartyBadges: number; }'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsolePrompt.js(217,30): error TS2694: Namespace 'UI.SuggestBox' has no exported member 'Suggestions'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsolePrompt.js(246,20): error TS2339: Property 'focus' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsolePrompt.js(272,39): error TS2694: Namespace 'UI.SuggestBox' has no exported member 'Suggestions'.
@@ -4022,6 +4087,9 @@ node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(232,51):
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(233,20): error TS2339: Property 'ConsoleView' does not exist on type '{ new (): Console; prototype: Console; }'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(241,76): error TS2339: Property 'ConsoleFilter' does not exist on type '{ new (): Console; prototype: Console; }'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(312,24): error TS2694: Namespace 'Common' has no exported member 'Event'.
+node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(326,12): error TS2678: Type 'string' is not comparable to type '{ Info: string; Warning: string; Error: string; }'.
+node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(329,12): error TS2678: Type 'string' is not comparable to type '{ Info: string; Warning: string; Error: string; }'.
+node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(332,12): error TS2678: Type 'string' is not comparable to type '{ Info: string; Warning: string; Error: string; }'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(411,7): error TS2322: Type 'Promise<void>' is not assignable to type 'Promise<undefined>'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(419,5): error TS2322: Type 'Promise<void>' is not assignable to type 'Promise<undefined>'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(449,43): error TS2555: Expected at least 2 arguments, but got 1.
@@ -4055,7 +4123,9 @@ node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(757,22):
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(763,20): error TS2339: Property 'window' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(769,30): error TS2339: Property 'ConsoleGroup' does not exist on type '{ new (): Console; prototype: Console; }'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(817,22): error TS2339: Property 'addAll' does not exist on type 'Set<ConsoleMessage>'.
+node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(825,35): error TS2345: Argument of type '{ Verbose: string; Info: string; Warning: string; Error: string; }' is not assignable to parameter of type 'string'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(834,72): error TS2339: Property 'peekLast' does not exist on type 'ConsoleViewMessage[]'.
+node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(840,33): error TS2345: Argument of type '{ Verbose: string; Info: string; Warning: string; Error: string; }' is not assignable to parameter of type 'string'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(857,37): error TS2339: Property 'enclosingNodeOrSelfWithClass' does not exist on type 'EventTarget'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(878,53): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(886,43): error TS2555: Expected at least 2 arguments, but got 1.
@@ -4134,6 +4204,7 @@ node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(21
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(212,22): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(215,30): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(222,15): error TS2403: Subsequent variable declarations must have the same type.  Variable 'args' must be of type 'any[]', but here has type 'any[]'.
+node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(240,13): error TS2367: This condition will always return 'false' since the types '{ Verbose: string; Info: string; Warning: string; Error: string; }' and 'string' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(241,26): error TS2339: Property 'createTextChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(244,28): error TS2339: Property 'createTextChildren' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(244,60): error TS2339: Property 'localizedFailDescription' does not exist on type 'NetworkRequest'.
@@ -4149,6 +4220,7 @@ node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(39
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(402,19): error TS2339: Property '_expandStackTraceForTest' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(420,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(444,42): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
+node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(479,10): error TS2367: This condition will always return 'false' since the types '{ Verbose: string; Info: string; Warning: string; Error: string; }' and 'string' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(487,25): error TS2339: Property 'createTextChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(494,45): error TS2339: Property 'ConsoleViewMessage' does not exist on type '{ new (): Console; prototype: Console; }'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(498,25): error TS2339: Property 'createTextChild' does not exist on type 'Element'.
@@ -4179,17 +4251,32 @@ node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(87
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(877,19): error TS2339: Property 'format' does not exist on type 'StringConstructor'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(884,13): error TS2339: Property 'style' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(885,13): error TS2339: Property 'style' does not exist on type 'Element'.
+node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(887,76): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ Unknown: number; Foreground: number; Background: number; Selection: number; }'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(888,13): error TS2339: Property 'style' does not exist on type 'Element'.
+node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(891,9): error TS2367: This condition will always return 'false' since the types '{ Verbose: string; Info: string; Warning: string; Error: string; }' and 'string' have no overlap.
+node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(893,14): error TS2367: This condition will always return 'false' since the types '{ Verbose: string; Info: string; Warning: string; Error: string; }' and 'string' have no overlap.
+node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(895,81): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ Unknown: number; Foreground: number; Background: number; Selection: number; }'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(896,13): error TS2339: Property 'style' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(904,38): error TS2339: Property 'deepTextContent' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(913,38): error TS2339: Property 'deepTextContent' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(925,30): error TS2339: Property 'title' does not exist on type 'Element'.
+node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(1025,10): error TS2367: This condition will always return 'false' since the types '{ Verbose: string; Info: string; Warning: string; Error: string; }' and 'string' have no overlap.
+node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(1026,10): error TS2367: This condition will always return 'false' since the types '{ Verbose: string; Info: string; Warning: string; Error: string; }' and 'string' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(1057,19): error TS2339: Property 'removeChildren' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(1063,48): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(1069,52): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(1071,19): error TS2339: Property 'message' does not exist on type 'Element'.
+node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(1074,12): error TS2678: Type 'string' is not comparable to type '{ Verbose: string; Info: string; Warning: string; Error: string; }'.
+node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(1078,12): error TS2678: Type 'string' is not comparable to type '{ Verbose: string; Info: string; Warning: string; Error: string; }'.
+node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(1081,12): error TS2678: Type 'string' is not comparable to type '{ Verbose: string; Info: string; Warning: string; Error: string; }'.
+node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(1085,12): error TS2678: Type 'string' is not comparable to type '{ Verbose: string; Info: string; Warning: string; Error: string; }'.
+node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(1102,13): error TS2367: This condition will always return 'false' since the types '{ Verbose: string; Info: string; Warning: string; Error: string; }' and 'string' have no overlap.
+node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(1103,13): error TS2367: This condition will always return 'false' since the types '{ Verbose: string; Info: string; Warning: string; Error: string; }' and 'string' have no overlap.
+node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(1162,14): error TS2678: Type 'string' is not comparable to type '{ Verbose: string; Info: string; Warning: string; Error: string; }'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(1163,36): error TS2339: Property 'type' does not exist on type 'Element'.
+node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(1165,14): error TS2678: Type 'string' is not comparable to type '{ Verbose: string; Info: string; Warning: string; Error: string; }'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(1166,36): error TS2339: Property 'type' does not exist on type 'Element'.
+node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(1168,14): error TS2678: Type 'string' is not comparable to type '{ Verbose: string; Info: string; Warning: string; Error: string; }'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(1169,36): error TS2339: Property 'type' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(1172,36): error TS2339: Property 'type' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(1175,34): error TS2339: Property 'type' does not exist on type 'Element'.
@@ -4335,12 +4422,14 @@ node_modules/chrome-devtools-frontend/front_end/console_counters/WarningErrorCou
 node_modules/chrome-devtools-frontend/front_end/console_counters/WarningErrorCounter.js(42,21): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/console_counters/WarningErrorCounter.js(58,5): error TS2322: Type 'number' is not assignable to type 'string'.
 node_modules/chrome-devtools-frontend/front_end/console_counters/WarningErrorCounter.js(84,19): error TS2339: Property 'title' does not exist on type 'Element'.
+node_modules/chrome-devtools-frontend/front_end/console_model/ConsoleModel.js(143,34): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; TimelineStarted: number; ProfilesCPUProfileTaken: number; ProfilesHeapProfileTaken: number; AuditsStarted: number; ... 23 more ...; ShowedThirdPartyBadges: number; }'.
 node_modules/chrome-devtools-frontend/front_end/console_model/ConsoleModel.js(173,9): error TS2339: Property '_pageLoadSequenceNumber' does not exist on type 'ConsoleMessage'.
 node_modules/chrome-devtools-frontend/front_end/console_model/ConsoleModel.js(193,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/console_model/ConsoleModel.js(196,70): error TS2694: Namespace 'Protocol' has no exported member 'Log'.
 node_modules/chrome-devtools-frontend/front_end/console_model/ConsoleModel.js(207,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/console_model/ConsoleModel.js(210,63): error TS2694: Namespace 'SDK.RuntimeModel' has no exported member 'ExceptionWithTimestamp'.
 node_modules/chrome-devtools-frontend/front_end/console_model/ConsoleModel.js(219,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
+node_modules/chrome-devtools-frontend/front_end/console_model/ConsoleModel.js(228,5): error TS2322: Type 'string' is not assignable to type '{ Verbose: string; Info: string; Warning: string; Error: string; }'.
 node_modules/chrome-devtools-frontend/front_end/console_model/ConsoleModel.js(234,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/console_model/ConsoleModel.js(237,45): error TS2694: Namespace 'SDK.RuntimeModel' has no exported member 'ConsoleAPICall'.
 node_modules/chrome-devtools-frontend/front_end/console_model/ConsoleModel.js(269,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
@@ -4351,16 +4440,24 @@ node_modules/chrome-devtools-frontend/front_end/console_model/ConsoleModel.js(30
 node_modules/chrome-devtools-frontend/front_end/console_model/ConsoleModel.js(309,49): error TS2694: Namespace 'SDK.CPUProfilerModel' has no exported member 'EventData'.
 node_modules/chrome-devtools-frontend/front_end/console_model/ConsoleModel.js(337,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/console_model/ConsoleModel.js(340,50): error TS2694: Namespace 'SDK.NetworkManager' has no exported member 'Message'.
+node_modules/chrome-devtools-frontend/front_end/console_model/ConsoleModel.js(355,12): error TS2678: Type 'string' is not comparable to type '{ Verbose: string; Info: string; Warning: string; Error: string; }'.
+node_modules/chrome-devtools-frontend/front_end/console_model/ConsoleModel.js(358,12): error TS2678: Type 'string' is not comparable to type '{ Verbose: string; Info: string; Warning: string; Error: string; }'.
 node_modules/chrome-devtools-frontend/front_end/console_model/ConsoleModel.js(424,24): error TS2694: Namespace 'Protocol' has no exported member 'Network'.
 node_modules/chrome-devtools-frontend/front_end/console_model/ConsoleModel.js(425,32): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/console_model/ConsoleModel.js(426,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/console_model/ConsoleModel.js(428,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
+node_modules/chrome-devtools-frontend/front_end/console_model/ConsoleModel.js(438,22): error TS2352: Conversion of type 'string' to type '{ Verbose: string; Info: string; Warning: string; Error: string; }' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
 node_modules/chrome-devtools-frontend/front_end/console_model/ConsoleModel.js(448,26): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/console_model/ConsoleModel.js(481,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/console_model/ConsoleModel.js(514,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
+node_modules/chrome-devtools-frontend/front_end/console_model/ConsoleModel.js(556,9): error TS2367: This condition will always return 'false' since the types '{ Verbose: string; Info: string; Warning: string; Error: string; }' and 'string' have no overlap.
+node_modules/chrome-devtools-frontend/front_end/console_model/ConsoleModel.js(557,9): error TS2367: This condition will always return 'false' since the types '{ Verbose: string; Info: string; Warning: string; Error: string; }' and 'string' have no overlap.
+node_modules/chrome-devtools-frontend/front_end/console_model/ConsoleModel.js(564,30): error TS2367: This condition will always return 'false' since the types '{ Verbose: string; Info: string; Warning: string; Error: string; }' and 'string' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/console_model/ConsoleModel.js(578,54): error TS2339: Property '_pageLoadSequenceNumber' does not exist on type 'ConsoleMessage'.
 node_modules/chrome-devtools-frontend/front_end/console_model/ConsoleModel.js(615,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/console_model/ConsoleModel.js(616,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
+node_modules/chrome-devtools-frontend/front_end/console_model/ConsoleModel.js(696,1): error TS2322: Type 'Map<string, string>' is not assignable to type 'Map<{ XML: string; JS: string; Network: string; ConsoleAPI: string; Storage: string; AppCache: string; Rendering: string; CSS: string; Security: string; Deprecation: string; Worker: string; Violation: string; Intervention: string; Recommendation: string; Other: string; }, string>'.
+  Type 'string' is not assignable to type '{ XML: string; JS: string; Network: string; ConsoleAPI: string; Storage: string; AppCache: string; Rendering: string; CSS: string; Security: string; Deprecation: string; Worker: string; Violation: string; Intervention: string; Recommendation: string; Other: string; }'.
 node_modules/chrome-devtools-frontend/front_end/console_test_runner/ConsoleTestRunner.js(16,31): error TS2694: Namespace 'ConsoleTestRunner' has no exported member 'Formatter'.
 node_modules/chrome-devtools-frontend/front_end/console_test_runner/ConsoleTestRunner.js(26,31): error TS2694: Namespace 'ConsoleTestRunner' has no exported member 'Formatter'.
 node_modules/chrome-devtools-frontend/front_end/console_test_runner/ConsoleTestRunner.js(33,29): error TS2339: Property 'ConsoleView' does not exist on type '{ new (): Console; prototype: Console; }'.
@@ -4402,6 +4499,7 @@ node_modules/chrome-devtools-frontend/front_end/cookie_table/CookiesTable.js(81,
 node_modules/chrome-devtools-frontend/front_end/cookie_table/CookiesTable.js(116,28): error TS2741: Property 'folderName' is missing in type '{ cookies: Cookie[]; }' but required in type '{ folderName: string; cookies: Cookie[]; }'.
 node_modules/chrome-devtools-frontend/front_end/cookie_table/CookiesTable.js(320,33): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
 node_modules/chrome-devtools-frontend/front_end/cookie_table/CookiesTable.js(320,52): error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
+node_modules/chrome-devtools-frontend/front_end/cookie_table/CookiesTable.js(345,9): error TS2367: This condition will always return 'false' since the types '{ Request: number; Response: number; }' and 'number' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/cookie_table/CookiesTable.js(346,28): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/cookie_table/CookiesTable.js(347,26): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/cookie_table/CookiesTable.js(348,29): error TS2555: Expected at least 2 arguments, but got 1.
@@ -4436,12 +4534,17 @@ node_modules/chrome-devtools-frontend/front_end/coverage/CoverageListView.js(18,
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageListView.js(19,34): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageListView.js(21,23): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageListView.js(29,23): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/coverage/CoverageListView.js(39,36): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Nearest: string; First: string; Last: string; }'.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageListView.js(112,11): error TS2339: Property 'consume' does not exist on type 'Event'.
+node_modules/chrome-devtools-frontend/front_end/coverage/CoverageListView.js(205,9): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageListView.js(206,25): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/coverage/CoverageListView.js(207,9): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageListView.js(208,25): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/coverage/CoverageListView.js(209,14): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageListView.js(210,25): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageListView.js(264,14): error TS2339: Property 'title' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageListView.js(265,26): error TS2339: Property 'createChild' does not exist on type 'Element'.
+node_modules/chrome-devtools-frontend/front_end/coverage/CoverageListView.js(276,13): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageListView.js(277,16): error TS2339: Property 'title' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageListView.js(277,31): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageListView.js(280,35): error TS2339: Property 'withThousandsSeparator' does not exist on type 'NumberConstructor'.
@@ -4450,11 +4553,14 @@ node_modules/chrome-devtools-frontend/front_end/coverage/CoverageListView.js(285
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageListView.js(286,45): error TS2339: Property 'withThousandsSeparator' does not exist on type 'NumberConstructor'.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageListView.js(290,33): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(34,42): error TS2694: Namespace 'Protocol' has no exported member 'Profiler'.
+node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(100,11): error TS2367: This condition will always return 'true' since the types '{ CSS: number; JavaScript: number; JavaScriptCoarse: number; }' and 'number' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(131,31): error TS2694: Namespace 'Protocol' has no exported member 'Profiler'.
+node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(152,115): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ CSS: number; JavaScript: number; JavaScriptCoarse: number; }'.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(170,31): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(175,64): error TS2694: Namespace 'Coverage' has no exported member 'RangeUseCount'.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(190,48): error TS2694: Namespace 'Coverage' has no exported member 'RangeUseCount'.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(191,11): error TS2403: Subsequent variable declarations must have the same type.  Variable 'entry' must be of type '[CSSStyleSheetHeader, any[]]', but here has type 'CoverageInfo'.
+node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(193,19): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ CSS: number; JavaScript: number; JavaScriptCoarse: number; }'.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(197,5): error TS2322: Type '[CSSStyleSheetHeader, any[]][]' is not assignable to type 'CoverageInfo[]'.
   Type '[CSSStyleSheetHeader, any[]]' is not assignable to type 'CoverageInfo'.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(201,31): error TS2694: Namespace 'Coverage' has no exported member 'RangeUseCount'.
@@ -4464,6 +4570,12 @@ node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(214,21
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(230,25): error TS2339: Property 'peekLast' does not exist on type 'any[]'.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(250,31): error TS2694: Namespace 'Coverage' has no exported member 'RangeUseCount'.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(267,37): error TS2339: Property 'peekLast' does not exist on type 'any[]'.
+node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(347,10): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
+node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(349,5): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
+node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(349,19): error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
+node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(352,7): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
+node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(352,30): error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
+node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(356,10): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(405,31): error TS2694: Namespace 'Coverage' has no exported member 'CoverageSegment'.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(427,31): error TS2694: Namespace 'Coverage' has no exported member 'CoverageSegment'.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(428,31): error TS2694: Namespace 'Coverage' has no exported member 'CoverageSegment'.
@@ -4475,7 +4587,8 @@ node_modules/chrome-devtools-frontend/front_end/coverage/CoverageView.js(49,49):
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageView.js(50,16): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageView.js(53,56): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageView.js(57,54): error TS2339: Property 'createChild' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/coverage/CoverageView.js(141,5): error TS2322: Type 'Timer' is not assignable to type 'number'.
+node_modules/chrome-devtools-frontend/front_end/coverage/CoverageView.js(118,34): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; TimelineStarted: number; ProfilesCPUProfileTaken: number; ProfilesHeapProfileTaken: number; AuditsStarted: number; ... 23 more ...; ShowedThirdPartyBadges: number; }'.
+node_modules/chrome-devtools-frontend/front_end/coverage/CoverageView.js(141,5): error TS2322: Type 'Timeout' is not assignable to type 'number'.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageView.js(187,55): error TS2339: Property 'bytesToString' does not exist on type 'NumberConstructor'.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageView.js(187,85): error TS2339: Property 'bytesToString' does not exist on type 'NumberConstructor'.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageView.js(231,59): error TS1110: Type expected.
@@ -4499,6 +4612,7 @@ node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(96,45): er
 node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(98,48): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(109,26): error TS2352: Conversion of type 'DataGridNode<any>' to type 'NODE_TYPE' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
   'DataGridNode<any>' is assignable to the constraint of type 'NODE_TYPE', but 'NODE_TYPE' could be instantiated with a different subtype of constraint '{}'.
+node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(119,5): error TS2322: Type 'string' is not assignable to type '{ Nearest: string; First: string; Last: string; }'.
 node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(121,17): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(123,17): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(134,45): error TS2554: Expected 0 arguments, but got 1.
@@ -4640,6 +4754,8 @@ node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(1105,27):
 node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(1105,50): error TS2339: Property 'totalOffsetLeft' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(1106,47): error TS2339: Property 'rows' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(1110,33): error TS2339: Property '__index' does not exist on type 'EventTarget'.
+node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(1116,9): error TS2367: This condition will always return 'false' since the types '{ Nearest: string; First: string; Last: string; }' and 'string' have no overlap.
+node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(1118,16): error TS2367: This condition will always return 'false' since the types '{ Nearest: string; First: string; Last: string; }' and 'string' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(1132,24): error TS2339: Property 'constrain' does not exist on type 'NumberConstructor'.
 node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(1135,13): error TS2339: Property '__position' does not exist on type 'EventTarget'.
 node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(1136,13): error TS2339: Property 'style' does not exist on type 'EventTarget'.
@@ -5184,6 +5300,8 @@ node_modules/chrome-devtools-frontend/front_end/elements/ColorSwatchPopoverIcon.
 node_modules/chrome-devtools-frontend/front_end/elements/ColorSwatchPopoverIcon.js(106,77): error TS2339: Property 'consume' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/elements/ColorSwatchPopoverIcon.js(122,28): error TS2694: Namespace 'SDK.CSSModel' has no exported member 'ContrastInfo'.
 node_modules/chrome-devtools-frontend/front_end/elements/ColorSwatchPopoverIcon.js(134,11): error TS2339: Property 'consume' does not exist on type 'Event'.
+node_modules/chrome-devtools-frontend/front_end/elements/ColorSwatchPopoverIcon.js(146,9): error TS2367: This condition will always return 'false' since the types '{ Original: string; Nickname: string; HEX: string; ShortHEX: string; HEXA: string; ShortHEXA: string; RGB: string; RGBA: string; HSL: string; HSLA: string; }' and 'string' have no overlap.
+node_modules/chrome-devtools-frontend/front_end/elements/ColorSwatchPopoverIcon.js(149,36): error TS2345: Argument of type '{ Original: string; Nickname: string; HEX: string; ShortHEX: string; HEXA: string; ShortHEXA: string; RGB: string; RGBA: string; HSL: string; HSLA: string; }' is not assignable to parameter of type 'string'.
 node_modules/chrome-devtools-frontend/front_end/elements/ColorSwatchPopoverIcon.js(156,42): error TS2339: Property 'enclosingNodeOrSelfWithClass' does not exist on type 'ColorSwatch'.
 node_modules/chrome-devtools-frontend/front_end/elements/ColorSwatchPopoverIcon.js(168,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/elements/ColorSwatchPopoverIcon.js(175,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
@@ -5211,7 +5329,7 @@ node_modules/chrome-devtools-frontend/front_end/elements/ComputedStyleWidget.js(
         Type '() => IterableIterator<Promise<ComputedStyle> | Promise<CSSMatchedStyles>>' is not assignable to type '() => Iterator<ComputedStyle | PromiseLike<ComputedStyle>, any, undefined>'.
           Type 'IterableIterator<Promise<ComputedStyle> | Promise<CSSMatchedStyles>>' is not assignable to type 'Iterator<ComputedStyle | PromiseLike<ComputedStyle>, any, undefined>'.
             Types of property 'next' are incompatible.
-              Type '{ (...args: [] | [undefined]): IteratorResult<Promise<ComputedStyle> | Promise<CSSMatchedStyles>, any>; (value?: any): IteratorResult<Promise<ComputedStyle> | Promise<CSSMatchedStyles>, any>; }' is not assignable to type '{ (...args: [] | [undefined]): IteratorResult<ComputedStyle | PromiseLike<ComputedStyle>, any>; (value?: any): IteratorResult<ComputedStyle | PromiseLike<ComputedStyle>, any>; }'.
+              Type '(...args: [] | [undefined]) => IteratorResult<Promise<ComputedStyle> | Promise<CSSMatchedStyles>, any>' is not assignable to type '(...args: [] | [undefined]) => IteratorResult<ComputedStyle | PromiseLike<ComputedStyle>, any>'.
                 Type 'IteratorResult<Promise<ComputedStyle> | Promise<CSSMatchedStyles>, any>' is not assignable to type 'IteratorResult<ComputedStyle | PromiseLike<ComputedStyle>, any>'.
                   Type 'IteratorYieldResult<Promise<ComputedStyle> | Promise<CSSMatchedStyles>>' is not assignable to type 'IteratorResult<ComputedStyle | PromiseLike<ComputedStyle>, any>'.
                     Type 'IteratorYieldResult<Promise<ComputedStyle> | Promise<CSSMatchedStyles>>' is not assignable to type 'IteratorYieldResult<ComputedStyle | PromiseLike<ComputedStyle>>'.
@@ -5232,6 +5350,7 @@ node_modules/chrome-devtools-frontend/front_end/elements/ComputedStyleWidget.js(
 node_modules/chrome-devtools-frontend/front_end/elements/ComputedStyleWidget.js(221,11): error TS2447: The '^' operator is not allowed for boolean types. Consider using '!==' instead.
 node_modules/chrome-devtools-frontend/front_end/elements/ComputedStyleWidget.js(237,13): error TS2339: Property 'consume' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/elements/ComputedStyleWidget.js(247,11): error TS2339: Property 'consume' does not exist on type 'Event'.
+node_modules/chrome-devtools-frontend/front_end/elements/ComputedStyleWidget.js(263,11): error TS2367: This condition will always return 'false' since the types '{ Active: string; Overloaded: string; }' and 'string' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/elements/ComputedStyleWidget.js(281,35): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/elements/ComputedStyleWidget.js(282,49): error TS2339: Property 'selectorText' does not exist on type 'CSSRule'.
 node_modules/chrome-devtools-frontend/front_end/elements/ComputedStyleWidget.js(286,30): error TS2339: Property 'createChild' does not exist on type 'Element'.
@@ -5297,12 +5416,17 @@ node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(644,15
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(650,15): error TS2339: Property 'handled' does not exist on type 'KeyboardEvent'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(721,82): error TS2339: Property 'offsetWidth' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(723,39): error TS2339: Property 'offsetWidth' does not exist on type 'Element'.
+node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(728,33): error TS2367: This condition will always return 'false' since the types 'symbol' and '{ Vertical: symbol; Horizontal: symbol; Slim: symbol; }' have no overlap.
+node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(730,5): error TS2322: Type 'symbol' is not assignable to type '{ Vertical: symbol; Horizontal: symbol; Slim: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(732,60): error TS2339: Property 'sidebarPanes' does not exist on type 'typeof extensionServer'.
+node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(740,35): error TS2367: This condition will always return 'false' since the types '{ Vertical: symbol; Horizontal: symbol; Slim: symbol; }' and 'symbol' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(763,24): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(768,28): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(770,33): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(782,9): error TS2367: This condition will always return 'true' since the types '{ Vertical: symbol; Horizontal: symbol; Slim: symbol; }' and 'symbol' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(785,47): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(800,51): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(809,28): error TS2367: This condition will always return 'false' since the types '{ Vertical: symbol; Horizontal: symbol; Slim: symbol; }' and 'symbol' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(822,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(864,51): error TS2339: Property 'isAncestor' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(867,51): error TS2555: Expected at least 2 arguments, but got 1.
@@ -5324,6 +5448,7 @@ node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeElement.js(
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeElement.js(285,22): error TS2339: Property 'populateTreeElement' does not exist on type 'TreeOutline'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeElement.js(333,22): error TS2339: Property 'suppressRevealAndSelect' does not exist on type 'TreeOutline'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeElement.js(334,22): error TS2339: Property 'selectDOMNode' does not exist on type 'TreeOutline'.
+node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeElement.js(337,36): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; TimelineStarted: number; ProfilesCPUProfileTaken: number; ProfilesHeapProfileTaken: number; AuditsStarted: number; ... 23 more ...; ShowedThirdPartyBadges: number; }'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeElement.js(341,22): error TS2339: Property 'suppressRevealAndSelect' does not exist on type 'TreeOutline'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeElement.js(350,48): error TS2551: Property 'findTreeElement' does not exist on type 'TreeOutline'. Did you mean '_bindTreeElement'?
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeElement.js(425,26): error TS2339: Property 'selectedDOMNode' does not exist on type 'TreeOutline'.
@@ -5521,7 +5646,7 @@ node_modules/chrome-devtools-frontend/front_end/elements/MetricsSidebarPane.js(8
         Type '() => IterableIterator<Promise<Map<string, string>> | Promise<InlineStyleResult>>' is not assignable to type '() => Iterator<Map<string, string> | PromiseLike<Map<string, string>>, any, undefined>'.
           Type 'IterableIterator<Promise<Map<string, string>> | Promise<InlineStyleResult>>' is not assignable to type 'Iterator<Map<string, string> | PromiseLike<Map<string, string>>, any, undefined>'.
             Types of property 'next' are incompatible.
-              Type '{ (...args: [] | [undefined]): IteratorResult<Promise<Map<string, string>> | Promise<InlineStyleResult>, any>; (value?: any): IteratorResult<Promise<Map<string, string>> | Promise<InlineStyleResult>, any>; }' is not assignable to type '{ (...args: [] | [undefined]): IteratorResult<Map<string, string> | PromiseLike<Map<string, string>>, any>; (value?: any): IteratorResult<Map<string, string> | PromiseLike<Map<string, string>>, any>; }'.
+              Type '(...args: [] | [undefined]) => IteratorResult<Promise<Map<string, string>> | Promise<InlineStyleResult>, any>' is not assignable to type '(...args: [] | [undefined]) => IteratorResult<Map<string, string> | PromiseLike<Map<string, string>>, any>'.
                 Type 'IteratorResult<Promise<Map<string, string>> | Promise<InlineStyleResult>, any>' is not assignable to type 'IteratorResult<Map<string, string> | PromiseLike<Map<string, string>>, any>'.
                   Type 'IteratorYieldResult<Promise<Map<string, string>> | Promise<InlineStyleResult>>' is not assignable to type 'IteratorResult<Map<string, string> | PromiseLike<Map<string, string>>, any>'.
                     Type 'IteratorYieldResult<Promise<Map<string, string>> | Promise<InlineStyleResult>>' is not assignable to type 'IteratorYieldResult<Map<string, string> | PromiseLike<Map<string, string>>>'.
@@ -5573,6 +5698,7 @@ node_modules/chrome-devtools-frontend/front_end/elements/PropertiesWidget.js(50,
 node_modules/chrome-devtools-frontend/front_end/elements/PropertiesWidget.js(69,27): error TS2339: Property 'removeChildren' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/elements/PropertiesWidget.js(131,27): error TS2339: Property 'removeChildren' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/elements/PropertiesWidget.js(153,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
+node_modules/chrome-devtools-frontend/front_end/elements/PropertiesWidget.js(156,34): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; TimelineStarted: number; ProfilesCPUProfileTaken: number; ProfilesHeapProfileTaken: number; AuditsStarted: number; ... 23 more ...; ShowedThirdPartyBadges: number; }'.
 node_modules/chrome-devtools-frontend/front_end/elements/PropertiesWidget.js(162,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylePropertyHighlighter.js(29,25): error TS2339: Property 'property' does not exist on type 'TreeElement'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylePropertyHighlighter.js(43,42): error TS2339: Property 'scrollIntoViewIfNeeded' does not exist on type 'Element'.
@@ -5611,6 +5737,7 @@ node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(41
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(438,16): error TS2403: Subsequent variable declarations must have the same type.  Variable 'section' must be of type 'StylePropertiesSection', but here has type 'any'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(441,27): error TS2339: Property 'focus' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(484,14): error TS2339: Property 'peekLast' does not exist on type 'SectionBlock[]'.
+node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(583,34): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; TimelineStarted: number; ProfilesCPUProfileTaken: number; ProfilesHeapProfileTaken: number; AuditsStarted: number; ... 23 more ...; ShowedThirdPartyBadges: number; }'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(590,41): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(594,16): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(595,56): error TS2555: Expected at least 2 arguments, but got 1.
@@ -5648,10 +5775,12 @@ node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(96
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(964,29): error TS2339: Property 'tabIndex' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(972,50): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(973,24): error TS2339: Property 'tabIndex' does not exist on type 'Element'.
+node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(1018,9): error TS2367: This condition will always return 'false' since the types '{ Regular: string; Inline: string; Attributes: string; }' and 'string' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(1019,68): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(1020,9): error TS2367: This condition will always return 'false' since the types '{ Regular: string; Inline: string; Attributes: string; }' and 'string' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(1021,58): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(1022,35): error TS2339: Property 'selectorText' does not exist on type 'CSSRule'.
-node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(1034,5): error TS2322: Type 'Timer' is not assignable to type 'number'.
+node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(1034,5): error TS2322: Type 'Timeout' is not assignable to type 'number'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(1040,69): error TS2339: Property 'selectorText' does not exist on type 'CSSRule'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(1055,24): error TS2339: Property '_section' does not exist on type 'ChildNode'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(1056,29): error TS2339: Property '_section' does not exist on type 'ChildNode'.
@@ -5685,6 +5814,7 @@ node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(12
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(1296,13): error TS2339: Property 'consume' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(1325,43): error TS2345: Argument of type 'TemplateStringsArray' is not assignable to parameter of type 'string | string[]'.
   Type 'TemplateStringsArray' is not assignable to type 'string[]'.
+node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(1336,12): error TS2367: This condition will always return 'false' since the types '{ Active: string; Overloaded: string; }' and 'string' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(1346,7): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(1346,33): error TS2339: Property '_updateFilter' does not exist on type 'TreeElement'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(1349,77): error TS2339: Property 'deepTextContent' does not exist on type 'Element'.
@@ -5740,6 +5870,7 @@ node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(21
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2266,49): error TS2339: Property 'section' does not exist on type 'TreeOutline'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2279,34): error TS2339: Property 'checked' does not exist on type 'EventTarget'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2298,11): error TS2339: Property 'consume' does not exist on type 'Event'.
+node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2321,13): error TS2367: This condition will always return 'false' since the types '{ Active: string; Overloaded: string; }' and 'string' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2337,17): error TS2339: Property 'which' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2342,25): error TS2339: Property 'hasSelection' does not exist on type 'EventTarget'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2343,15): error TS2339: Property 'consume' does not exist on type 'Event'.
@@ -5839,6 +5970,8 @@ node_modules/chrome-devtools-frontend/front_end/emulation/AdvancedApp.js(142,44)
 node_modules/chrome-devtools-frontend/front_end/emulation/AdvancedApp.js(169,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/emulation/AdvancedApp.js(174,57): error TS2339: Property 'window' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeModel.js(9,1): error TS8022: JSDoc '@extends' is not attached to a class.
+node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeModel.js(50,81): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ Global: symbol; Local: symbol; Session: symbol; }'.
+node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeModel.js(53,5): error TS2322: Type 'string' is not assignable to type '{ None: string; Responsive: string; Device: string; }'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeModel.js(56,42): error TS2694: Namespace 'Emulation.EmulatedDevice' has no exported member 'Mode'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeModel.js(65,17): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeModel.js(67,57): error TS2345: Argument of type 'this' is not assignable to parameter of type '{ modelAdded(model: T): void; modelRemoved(model: T): void; }'.
@@ -5852,7 +5985,19 @@ node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeModel.js(76,
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeModel.js(86,59): error TS2365: Operator '>=' cannot be applied to types 'string' and 'number'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeModel.js(86,73): error TS2365: Operator '<=' cannot be applied to types 'string' and 'number'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeModel.js(105,40): error TS2694: Namespace 'Emulation.EmulatedDevice' has no exported member 'Mode'.
+node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeModel.js(112,9): error TS2367: This condition will always return 'false' since the types '{ None: string; Responsive: string; Device: string; }' and 'string' have no overlap.
+node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeModel.js(128,9): error TS2367: This condition will always return 'true' since the types '{ None: string; Responsive: string; Device: string; }' and 'string' have no overlap.
+node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeModel.js(129,36): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; TimelineStarted: number; ProfilesCPUProfileTaken: number; ProfilesHeapProfileTaken: number; AuditsStarted: number; ... 23 more ...; ShowedThirdPartyBadges: number; }'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeModel.js(186,41): error TS2694: Namespace 'Emulation.EmulatedDevice' has no exported member 'Mode'.
+node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeModel.js(282,12): error TS2678: Type 'string' is not comparable to type '{ None: string; Responsive: string; Device: string; }'.
+node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeModel.js(284,12): error TS2678: Type 'string' is not comparable to type '{ None: string; Responsive: string; Device: string; }'.
+node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeModel.js(286,12): error TS2678: Type 'string' is not comparable to type '{ None: string; Responsive: string; Device: string; }'.
+node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeModel.js(419,9): error TS2367: This condition will always return 'true' since the types '{ None: string; Responsive: string; Device: string; }' and 'string' have no overlap.
+node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeModel.js(431,9): error TS2367: This condition will always return 'true' since the types '{ None: string; Responsive: string; Device: string; }' and 'string' have no overlap.
+node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeModel.js(443,9): error TS2367: This condition will always return 'false' since the types '{ None: string; Responsive: string; Device: string; }' and 'string' have no overlap.
+node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeModel.js(463,16): error TS2367: This condition will always return 'false' since the types '{ None: string; Responsive: string; Device: string; }' and 'string' have no overlap.
+node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeModel.js(471,16): error TS2367: This condition will always return 'false' since the types '{ None: string; Responsive: string; Device: string; }' and 'string' have no overlap.
+node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeModel.js(495,48): error TS2367: This condition will always return 'false' since the types '{ None: string; Responsive: string; Device: string; }' and 'string' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeModel.js(496,35): error TS2345: Argument of type 'string' is not assignable to parameter of type 'symbol'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeModel.js(554,24): error TS2694: Namespace 'Protocol' has no exported member 'Emulation'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeModel.js(633,24): error TS2694: Namespace 'Protocol' has no exported member 'Page'.
@@ -5874,6 +6019,7 @@ node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(1
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(158,43): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(168,34): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(194,39): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(205,9): error TS2367: This condition will always return 'false' since the types '{ None: string; Responsive: string; Device: string; }' and 'string' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(211,33): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(212,33): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(213,33): error TS2555: Expected at least 2 arguments, but got 1.
@@ -5884,6 +6030,7 @@ node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(2
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(250,70): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(290,73): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(291,16): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(291,47): error TS2367: This condition will always return 'true' since the types '{ None: string; Responsive: string; Device: string; }' and 'string' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(293,78): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(294,16): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(296,70): error TS2555: Expected at least 2 arguments, but got 1.
@@ -5893,9 +6040,15 @@ node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(3
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(302,78): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(303,16): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(305,51): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(316,20): error TS2367: This condition will always return 'false' since the types '{ None: string; Responsive: string; Device: string; }' and 'string' have no overlap.
+node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(346,9): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ None: string; Responsive: string; Device: string; }'.
+node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(351,25): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ None: string; Responsive: string; Device: string; }'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(392,16): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(393,9): error TS2367: This condition will always return 'false' since the types '{ None: string; Responsive: string; Device: string; }' and 'string' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(397,16): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(428,29): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ None: string; Responsive: string; Device: string; }'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(441,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
+node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(447,9): error TS2367: This condition will always return 'false' since the types '{ None: string; Responsive: string; Device: string; }' and 'string' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(459,77): error TS2339: Property 'totalOffsetLeft' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(460,34): error TS2339: Property 'totalOffsetTop' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(460,78): error TS2339: Property 'offsetHeight' does not exist on type 'Element'.
@@ -5904,14 +6057,26 @@ node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(4
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(482,42): error TS2694: Namespace 'Emulation.EmulatedDevice' has no exported member 'Mode'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(490,42): error TS2694: Namespace 'Emulation.EmulatedDevice' has no exported member 'Mode'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(507,24): error TS2339: Property 'disabled' does not exist on type 'Element'.
+node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(507,35): error TS2367: This condition will always return 'true' since the types '{ None: string; Responsive: string; Device: string; }' and 'string' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(508,25): error TS2339: Property 'disabled' does not exist on type 'Element'.
+node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(508,36): error TS2367: This condition will always return 'true' since the types '{ None: string; Responsive: string; Device: string; }' and 'string' have no overlap.
+node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(509,40): error TS2367: This condition will always return 'false' since the types '{ None: string; Responsive: string; Device: string; }' and 'string' have no overlap.
+node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(510,31): error TS2367: This condition will always return 'false' since the types '{ None: string; Responsive: string; Device: string; }' and 'string' have no overlap.
+node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(515,9): error TS2367: This condition will always return 'false' since the types '{ None: string; Responsive: string; Device: string; }' and 'string' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(519,23): error TS2339: Property 'placeholder' does not exist on type 'Element'.
+node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(534,28): error TS2345: Argument of type '{ Mobile: any; MobileNoTouch: any; Desktop: any; DesktopTouch: any; }' is not assignable to parameter of type 'string'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(538,34): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(539,9): error TS2367: This condition will always return 'false' since the types '{ None: string; Responsive: string; Device: string; }' and 'string' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(540,32): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(541,9): error TS2367: This condition will always return 'false' since the types '{ None: string; Responsive: string; Device: string; }' and 'string' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(550,60): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(550,88): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(551,18): error TS2367: This condition will always return 'false' since the types '{ None: string; Responsive: string; Device: string; }' and 'string' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(553,42): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(560,9): error TS2367: This condition will always return 'false' since the types '{ None: string; Responsive: string; Device: string; }' and 'string' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(563,48): error TS2694: Namespace 'Emulation.EmulatedDevice' has no exported member 'Mode'.
+node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(566,57): error TS2367: This condition will always return 'true' since the types '{ None: string; Responsive: string; Device: string; }' and 'string' have no overlap.
+node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(596,25): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ None: string; Responsive: string; Device: string; }'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(16,34): error TS2345: Argument of type 'string' is not assignable to parameter of type 'symbol'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(37,45): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(74,47): error TS2555: Expected at least 2 arguments, but got 1.
@@ -5922,16 +6087,23 @@ node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(83,1
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(84,14): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(84,41): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(84,70): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(103,27): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ None: string; Responsive: string; Device: string; }'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(105,9): error TS2339: Property 'consume' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(132,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(143,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(176,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
+node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(180,34): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; TimelineStarted: number; ProfilesCPUProfileTaken: number; ProfilesHeapProfileTaken: number; AuditsStarted: number; ... 23 more ...; ShowedThirdPartyBadges: number; }'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(189,15): error TS2339: Property 'style' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(190,15): error TS2339: Property 'style' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(191,15): error TS2339: Property 'style' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(192,15): error TS2339: Property 'style' does not exist on type 'Element'.
+node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(200,55): error TS2367: This condition will always return 'true' since the types '{ None: string; Responsive: string; Device: string; }' and 'string' have no overlap.
+node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(227,21): error TS2367: This condition will always return 'false' since the types '{ None: string; Responsive: string; Device: string; }' and 'string' have no overlap.
+node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(238,50): error TS2367: This condition will always return 'true' since the types '{ None: string; Responsive: string; Device: string; }' and 'string' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(280,30): error TS2339: Property 'positionAt' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(283,31): error TS2339: Property 'positionAt' does not exist on type 'Element'.
+node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(315,9): error TS2367: This condition will always return 'true' since the types '{ None: string; Responsive: string; Device: string; }' and 'string' have no overlap.
+node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(372,25): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ None: string; Responsive: string; Device: string; }'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(396,14): error TS2339: Property 'width' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(397,14): error TS2339: Property 'height' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(398,24): error TS2339: Property 'getContext' does not exist on type 'Element'.
@@ -5939,6 +6111,7 @@ node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(423,
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(443,14): error TS2339: Property 'width' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(444,14): error TS2339: Property 'height' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(445,24): error TS2339: Property 'getContext' does not exist on type 'Element'.
+node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(477,9): error TS2367: This condition will always return 'false' since the types '{ None: string; Responsive: string; Device: string; }' and 'string' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(480,10): error TS2339: Property 'download' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(481,12): error TS2339: Property 'toBlob' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(482,12): error TS2339: Property 'href' does not exist on type 'Element'.
@@ -5996,17 +6169,25 @@ node_modules/chrome-devtools-frontend/front_end/emulation/MediaQueryInspector.js
 node_modules/chrome-devtools-frontend/front_end/emulation/MediaQueryInspector.js(220,41): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/MediaQueryInspector.js(223,11): error TS2339: Property '_model' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/MediaQueryInspector.js(224,11): error TS2339: Property '_locations' does not exist on type 'Element'.
+node_modules/chrome-devtools-frontend/front_end/emulation/MediaQueryInspector.js(254,9): error TS2367: This condition will always return 'false' since the types '{ Max: number; MinMax: number; Min: number; }' and 'number' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/emulation/MediaQueryInspector.js(255,14): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/MediaQueryInspector.js(256,34): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/MediaQueryInspector.js(261,14): error TS2339: Property 'createChild' does not exist on type 'Element'.
+node_modules/chrome-devtools-frontend/front_end/emulation/MediaQueryInspector.js(264,9): error TS2367: This condition will always return 'false' since the types '{ Max: number; MinMax: number; Min: number; }' and 'number' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/emulation/MediaQueryInspector.js(265,14): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/MediaQueryInspector.js(266,32): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/MediaQueryInspector.js(271,14): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/MediaQueryInspector.js(272,33): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/MediaQueryInspector.js(277,14): error TS2339: Property 'createChild' does not exist on type 'Element'.
+node_modules/chrome-devtools-frontend/front_end/emulation/MediaQueryInspector.js(280,9): error TS2367: This condition will always return 'false' since the types '{ Max: number; MinMax: number; Min: number; }' and 'number' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/emulation/MediaQueryInspector.js(281,32): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/MediaQueryInspector.js(285,14): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/MediaQueryInspector.js(286,33): error TS2339: Property 'createChild' does not exist on type 'Element'.
+node_modules/chrome-devtools-frontend/front_end/emulation/MediaQueryInspector.js(398,14): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
+node_modules/chrome-devtools-frontend/front_end/emulation/MediaQueryInspector.js(398,31): error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
+node_modules/chrome-devtools-frontend/front_end/emulation/MediaQueryInspector.js(413,9): error TS2367: This condition will always return 'false' since the types '{ Max: number; MinMax: number; Min: number; }' and 'number' have no overlap.
+node_modules/chrome-devtools-frontend/front_end/emulation/MediaQueryInspector.js(415,9): error TS2367: This condition will always return 'false' since the types '{ Max: number; MinMax: number; Min: number; }' and 'number' have no overlap.
+node_modules/chrome-devtools-frontend/front_end/emulation/MediaQueryInspector.js(425,5): error TS2322: Type 'number' is not assignable to type '{ Max: number; MinMax: number; Min: number; }'.
 node_modules/chrome-devtools-frontend/front_end/emulation/SensorsView.js(18,25): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/SensorsView.js(25,25): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/SensorsView.js(34,32): error TS2339: Property '_instanceObject' does not exist on type 'typeof SensorsView'.
@@ -6033,14 +6214,19 @@ node_modules/chrome-devtools-frontend/front_end/emulation/SensorsView.js(178,39)
 node_modules/chrome-devtools-frontend/front_end/emulation/SensorsView.js(203,39): error TS2339: Property 'disabled' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/SensorsView.js(206,39): error TS2339: Property 'disabled' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/SensorsView.js(220,26): error TS2339: Property 'focus' does not exist on type 'Element'.
+node_modules/chrome-devtools-frontend/front_end/emulation/SensorsView.js(227,36): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ UserInput: string; UserDrag: string; ResetButton: string; SelectPreset: string; }'.
 node_modules/chrome-devtools-frontend/front_end/emulation/SensorsView.js(243,63): error TS2339: Property 'options' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/SensorsView.js(244,19): error TS2339: Property 'selectedIndex' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/SensorsView.js(250,32): error TS2339: Property 'value' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/SensorsView.js(250,64): error TS2339: Property 'value' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/SensorsView.js(250,97): error TS2339: Property 'value' does not exist on type 'Element'.
+node_modules/chrome-devtools-frontend/front_end/emulation/SensorsView.js(251,9): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ UserInput: string; UserDrag: string; ResetButton: string; SelectPreset: string; }'.
+node_modules/chrome-devtools-frontend/front_end/emulation/SensorsView.js(258,9): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ UserInput: string; UserDrag: string; ResetButton: string; SelectPreset: string; }'.
+node_modules/chrome-devtools-frontend/front_end/emulation/SensorsView.js(278,9): error TS2367: This condition will always return 'true' since the types '{ UserInput: string; UserDrag: string; ResetButton: string; SelectPreset: string; }' and 'string' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/emulation/SensorsView.js(279,25): error TS2345: Argument of type 'number' is not assignable to parameter of type 'string'.
 node_modules/chrome-devtools-frontend/front_end/emulation/SensorsView.js(280,24): error TS2345: Argument of type 'number' is not assignable to parameter of type 'string'.
 node_modules/chrome-devtools-frontend/front_end/emulation/SensorsView.js(281,25): error TS2345: Argument of type 'number' is not assignable to parameter of type 'string'.
+node_modules/chrome-devtools-frontend/front_end/emulation/SensorsView.js(284,19): error TS2367: This condition will always return 'true' since the types '{ UserInput: string; UserDrag: string; ResetButton: string; SelectPreset: string; }' and 'string' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/emulation/SensorsView.js(298,29): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/SensorsView.js(301,11): error TS2339: Property 'type' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/SensorsView.js(313,39): error TS2339: Property 'createChild' does not exist on type 'Element'.
@@ -6049,6 +6235,7 @@ node_modules/chrome-devtools-frontend/front_end/emulation/SensorsView.js(322,85)
 node_modules/chrome-devtools-frontend/front_end/emulation/SensorsView.js(327,87): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/emulation/SensorsView.js(331,16): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/emulation/SensorsView.js(362,11): error TS2339: Property 'consume' does not exist on type 'MouseEvent'.
+node_modules/chrome-devtools-frontend/front_end/emulation/SensorsView.js(383,48): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ UserInput: string; UserDrag: string; ResetButton: string; SelectPreset: string; }'.
 node_modules/chrome-devtools-frontend/front_end/emulation/SensorsView.js(402,11): error TS2339: Property 'consume' does not exist on type 'MouseEvent'.
 node_modules/chrome-devtools-frontend/front_end/emulation/SensorsView.js(424,44): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/SensorsView.js(428,32): error TS2555: Expected at least 2 arguments, but got 1.
@@ -6081,6 +6268,7 @@ node_modules/chrome-devtools-frontend/front_end/event_listeners/EventListenersUt
 node_modules/chrome-devtools-frontend/front_end/event_listeners/EventListenersUtils.js(144,37): error TS2694: Namespace 'SDK.DebuggerModel' has no exported member 'FunctionDetails'.
 node_modules/chrome-devtools-frontend/front_end/event_listeners/EventListenersUtils.js(157,32): error TS2694: Namespace 'EventListeners' has no exported member 'EventListenerObjectInInspectedPage'.
 node_modules/chrome-devtools-frontend/front_end/event_listeners/EventListenersUtils.js(172,62): error TS2339: Property 'catchException' does not exist on type 'Promise<EventListener>'.
+node_modules/chrome-devtools-frontend/front_end/event_listeners/EventListenersUtils.js(182,62): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Raw: string; Framework: string; FrameworkUser: string; }'.
 node_modules/chrome-devtools-frontend/front_end/event_listeners/EventListenersUtils.js(227,31): error TS2694: Namespace 'EventListeners' has no exported member 'FrameworkEventListenersObject'.
 node_modules/chrome-devtools-frontend/front_end/event_listeners/EventListenersUtils.js(234,19): error TS2694: Namespace 'SDK' has no exported member 'CallFunctionResult'.
 node_modules/chrome-devtools-frontend/front_end/event_listeners/EventListenersUtils.js(286,55): error TS2694: Namespace 'EventListeners' has no exported member 'EventListenerObjectInInspectedPage'.
@@ -6664,6 +6852,7 @@ node_modules/chrome-devtools-frontend/front_end/host/ResourceLoader.js(38,12): e
 node_modules/chrome-devtools-frontend/front_end/host/ResourceLoader.js(75,40): error TS2694: Namespace 'InspectorFrontendHostAPI' has no exported member 'LoadNetworkResourceResult'.
 node_modules/chrome-devtools-frontend/front_end/host/ResourceLoader.js(88,59): error TS2694: Namespace 'InspectorFrontendHostAPI' has no exported member 'LoadNetworkResourceResult'.
 node_modules/chrome-devtools-frontend/front_end/host/ResourceLoader.js(92,59): error TS2694: Namespace 'InspectorFrontendHostAPI' has no exported member 'LoadNetworkResourceResult'.
+node_modules/chrome-devtools-frontend/front_end/host/UserMetrics.js(56,77): error TS2345: Argument of type '{ WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; TimelineStarted: number; ProfilesCPUProfileTaken: number; ProfilesHeapProfileTaken: number; AuditsStarted: number; ... 23 more ...; ShowedThirdPartyBadges: number; }' is not assignable to parameter of type 'number'.
 node_modules/chrome-devtools-frontend/front_end/inline_editor/BezierEditor.js(11,25): error TS2339: Property 'tabIndex' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/inline_editor/BezierEditor.js(15,48): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/inline_editor/BezierEditor.js(18,46): error TS2339: Property 'createChild' does not exist on type 'Element'.
@@ -6768,6 +6957,7 @@ node_modules/chrome-devtools-frontend/front_end/inline_editor/ColorSwatch.js(228
 node_modules/chrome-devtools-frontend/front_end/inline_editor/ColorSwatch.js(232,91): error TS2339: Property '_constructor' does not exist on type 'typeof CSSShadowSwatch'.
 node_modules/chrome-devtools-frontend/front_end/inline_editor/ColorSwatch.js(290,10): error TS2339: Property 'createChild' does not exist on type 'DocumentFragment'.
 node_modules/chrome-devtools-frontend/front_end/inline_editor/ColorSwatch.js(291,33): error TS2339: Property 'createChild' does not exist on type 'CSSShadowSwatch'.
+node_modules/chrome-devtools-frontend/front_end/inline_editor/SwatchPopoverHelper.js(12,35): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ SetExactSize: symbol; SetExactWidthMaxHeight: symbol; MeasureContent: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/inline_editor/SwatchPopoverHelper.js(13,37): error TS2345: Argument of type 'symbol' is not assignable to parameter of type 'boolean'.
 node_modules/chrome-devtools-frontend/front_end/inline_editor/SwatchPopoverHelper.js(14,64): error TS2339: Property 'consume' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/inline_editor/SwatchPopoverHelper.js(26,16): error TS2339: Property 'relatedTarget' does not exist on type 'Event'.
@@ -6781,12 +6971,14 @@ node_modules/chrome-devtools-frontend/front_end/integration_test_runner.js(6,3):
 node_modules/chrome-devtools-frontend/front_end/integration_test_runner.js(7,3): error TS2552: Cannot find name 'testRunner'. Did you mean 'TestRunner'?
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/LayerDetailsView.js(43,51): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/LayerDetailsView.js(84,15): error TS2339: Property 'which' does not exist on type 'Event'.
+node_modules/chrome-devtools-frontend/front_end/layer_viewer/LayerDetailsView.js(90,9): error TS2367: This condition will always return 'false' since the types '{ Layer: symbol; ScrollRect: symbol; Snapshot: symbol; }' and 'symbol' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/LayerDetailsView.js(95,24): error TS2694: Namespace 'Protocol' has no exported member 'LayerTree'.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/LayerDetailsView.js(102,25): error TS2339: Property 'scrollRectIndex' does not exist on type 'Selection'.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/LayerDetailsView.js(120,85): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/LayerDetailsView.js(159,16): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/LayerDetailsView.js(161,16): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/LayerDetailsView.js(179,51): error TS2339: Property 'bytesToString' does not exist on type 'NumberConstructor'.
+node_modules/chrome-devtools-frontend/front_end/layer_viewer/LayerDetailsView.js(184,20): error TS2367: This condition will always return 'false' since the types '{ Layer: symbol; ScrollRect: symbol; Snapshot: symbol; }' and 'symbol' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/LayerDetailsView.js(191,46): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/LayerDetailsView.js(193,45): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/LayerDetailsView.js(194,59): error TS2555: Expected at least 2 arguments, but got 1.
@@ -6837,15 +7029,25 @@ node_modules/chrome-devtools-frontend/front_end/layer_viewer/LayerTreeOutline.js
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/LayerTreeOutline.js(199,80): error TS2339: Property '_layer' does not exist on type 'TreeElement'.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/LayerTreeOutline.js(222,11): error TS2339: Property 'createTextChild' does not exist on type 'DocumentFragment'.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/LayerTreeOutline.js(223,25): error TS2339: Property 'createChild' does not exist on type 'DocumentFragment'.
+node_modules/chrome-devtools-frontend/front_end/layer_viewer/LayerViewHost.js(92,11): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ Layer: symbol; ScrollRect: symbol; Snapshot: symbol; }'.
+node_modules/chrome-devtools-frontend/front_end/layer_viewer/LayerViewHost.js(101,12): error TS2367: This condition will always return 'false' since the types '{ Layer: symbol; ScrollRect: symbol; Snapshot: symbol; }' and 'symbol' have no overlap.
+node_modules/chrome-devtools-frontend/front_end/layer_viewer/LayerViewHost.js(114,11): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ Layer: symbol; ScrollRect: symbol; Snapshot: symbol; }'.
+node_modules/chrome-devtools-frontend/front_end/layer_viewer/LayerViewHost.js(124,12): error TS2367: This condition will always return 'false' since the types '{ Layer: symbol; ScrollRect: symbol; Snapshot: symbol; }' and 'symbol' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/LayerViewHost.js(125,84): error TS2339: Property 'scrollRectIndex' does not exist on type 'Selection'.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/LayerViewHost.js(135,19): error TS2694: Namespace 'SDK' has no exported member 'SnapshotWithRect'.
+node_modules/chrome-devtools-frontend/front_end/layer_viewer/LayerViewHost.js(138,11): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ Layer: symbol; ScrollRect: symbol; Snapshot: symbol; }'.
+node_modules/chrome-devtools-frontend/front_end/layer_viewer/LayerViewHost.js(148,12): error TS2367: This condition will always return 'false' since the types '{ Layer: symbol; ScrollRect: symbol; Snapshot: symbol; }' and 'symbol' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/LayerViewHost.js(149,34): error TS2339: Property '_snapshot' does not exist on type 'Selection'.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/LayerViewHost.js(153,20): error TS2694: Namespace 'SDK' has no exported member 'SnapshotWithRect'.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/LayerViewHost.js(231,16): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(44,30): error TS2339: Property 'createTextChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(44,53): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(54,47): error TS2339: Property 'createChild' does not exist on type 'Element'.
+node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(152,22): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Hovered: string; Selected: string; }'.
+node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(160,22): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Hovered: string; Selected: string; }'.
+node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(161,22): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Hovered: string; Selected: string; }'.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(166,29): error TS2694: Namespace 'SDK' has no exported member 'SnapshotWithRect'.
+node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(169,9): error TS2367: This condition will always return 'false' since the types '{ Layer: symbol; ScrollRect: symbol; Snapshot: symbol; }' and 'symbol' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(172,39): error TS2694: Namespace 'SDK' has no exported member 'SnapshotWithRect'.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(179,37): error TS2694: Namespace 'SDK' has no exported member 'SnapshotWithRect'.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(187,21): error TS2339: Property 'getContext' does not exist on type 'Element'.
@@ -6860,6 +7062,7 @@ node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(223
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(253,31): error TS2339: Property 'constrain' does not exist on type 'NumberConstructor'.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(285,51): error TS2339: Property 'pMatrixUniform' does not exist on type 'WebGLProgram'.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(289,15): error TS2304: Cannot find name 'CSSMatrix'.
+node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(314,30): error TS2538: Type '{ Left: number; Middle: number; Right: number; }' cannot be used as an index type.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(515,50): error TS2339: Property 'vertexPositionAttribute' does not exist on type 'WebGLProgram'.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(516,50): error TS2339: Property 'textureCoordAttribute' does not exist on type 'WebGLProgram'.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(517,50): error TS2339: Property 'vertexColorAttribute' does not exist on type 'WebGLProgram'.
@@ -6881,12 +7084,14 @@ node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(641
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(642,22): error TS2339: Property 'clientY' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(670,29): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(693,16): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(695,22): error TS2367: This condition will always return 'false' since the types '{ Layer: symbol; ScrollRect: symbol; Snapshot: symbol; }' and 'symbol' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(697,18): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(708,15): error TS2339: Property 'which' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(717,30): error TS2339: Property 'clientX' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(718,30): error TS2339: Property 'clientY' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(726,44): error TS2339: Property 'clientX' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(727,24): error TS2339: Property 'clientY' does not exist on type 'Event'.
+node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(738,23): error TS2367: This condition will always return 'false' since the types '{ Layer: symbol; ScrollRect: symbol; Snapshot: symbol; }' and 'symbol' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(762,26): error TS2339: Property 'LayerStyle' does not exist on type 'typeof Layers3DView'.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(794,28): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(795,29): error TS2555: Expected at least 2 arguments, but got 1.
@@ -6932,7 +7137,9 @@ node_modules/chrome-devtools-frontend/front_end/layer_viewer/TransformController
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/TransformController.js(20,20): error TS2339: Property 'tabIndex' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/TransformController.js(35,55): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/TransformController.js(40,58): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/layer_viewer/TransformController.js(46,19): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Pan: string; Rotate: string; }'.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/TransformController.js(48,51): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/layer_viewer/TransformController.js(116,9): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Pan: string; Rotate: string; }'.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/TransformController.js(128,18): error TS2339: Property 'focus' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/TransformController.js(144,18): error TS2339: Property 'focus' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/TransformController.js(154,26): error TS2339: Property 'constrain' does not exist on type 'NumberConstructor'.
@@ -7037,11 +7244,13 @@ node_modules/chrome-devtools-frontend/front_end/main/Main.js(822,25): error TS23
 node_modules/chrome-devtools-frontend/front_end/main/Main.js(823,16): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/main/Main.js(824,45): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/main/Main.js(825,25): error TS2339: Property 'createChild' does not exist on type 'Element'.
+node_modules/chrome-devtools-frontend/front_end/main/Main.js(833,28): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ SetExactSize: symbol; SetExactWidthMaxHeight: symbol; MeasureContent: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/main/Main.js(847,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/main/Main.js(852,25): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/main/Main.js(853,16): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/main/Main.js(854,25): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/main/Main.js(855,16): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/main/Main.js(864,28): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ SetExactSize: symbol; SetExactWidthMaxHeight: symbol; MeasureContent: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/main/Main.js(907,12): error TS2339: Property 'pageAgent' does not exist on type 'Target'.
 node_modules/chrome-devtools-frontend/front_end/main/Main.js(945,16): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/main/RenderingOptions.js(37,16): error TS2555: Expected at least 2 arguments, but got 1.
@@ -7076,6 +7285,7 @@ node_modules/chrome-devtools-frontend/front_end/mobile_throttling/NetworkThrottl
 node_modules/chrome-devtools-frontend/front_end/mobile_throttling/NetworkThrottlingSelector.js(37,39): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/mobile_throttling/NetworkThrottlingSelector.js(38,38): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/mobile_throttling/NetworkThrottlingSelector.js(43,62): error TS2694: Namespace 'SDK.NetworkManager' has no exported member 'Conditions'.
+node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingManager.js(12,5): error TS2322: Type 'number' is not assignable to type '{ NoThrottling: number; MidTierMobile: number; LowEndMobile: number; }'.
 node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingManager.js(16,59): error TS2694: Namespace 'SDK.NetworkManager' has no exported member 'Conditions'.
 node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingManager.js(18,36): error TS2694: Namespace 'SDK.NetworkManager' has no exported member 'Conditions'.
 node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingManager.js(20,36): error TS2694: Namespace 'SDK.NetworkManager' has no exported member 'Conditions'.
@@ -7099,8 +7309,15 @@ node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingMana
 node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingManager.js(141,81): error TS2694: Namespace 'MobileThrottling' has no exported member 'Conditions'.
 node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingManager.js(147,42): error TS2694: Namespace 'MobileThrottling' has no exported member 'MobileThrottlingConditionsGroup'.
 node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingManager.js(148,35): error TS2694: Namespace 'MobileThrottling' has no exported member 'ConditionsList'.
+node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingManager.js(174,5): error TS2322: Type '{ NoThrottling: number; MidTierMobile: number; LowEndMobile: number; }' is not assignable to type 'number'.
+node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingManager.js(183,43): error TS2345: Argument of type '{ NoThrottling: number; MidTierMobile: number; LowEndMobile: number; }' is not assignable to parameter of type 'number'.
+node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingManager.js(185,9): error TS2367: This condition will always return 'true' since the types '{ NoThrottling: number; MidTierMobile: number; LowEndMobile: number; }' and 'number' have no overlap.
+node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingManager.js(186,36): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; TimelineStarted: number; ProfilesCPUProfileTaken: number; ProfilesHeapProfileTaken: number; AuditsStarted: number; ... 23 more ...; ShowedThirdPartyBadges: number; }'.
 node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingManager.js(188,27): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingManager.js(202,9): error TS2367: This condition will always return 'true' since the types '{ NoThrottling: number; MidTierMobile: number; LowEndMobile: number; }' and 'number' have no overlap.
+node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingManager.js(203,43): error TS2345: Argument of type '{ NoThrottling: number; MidTierMobile: number; LowEndMobile: number; }' is not assignable to parameter of type 'number'.
 node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingManager.js(218,82): error TS2339: Property 'selectedIndex' does not exist on type 'EventTarget'.
+node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingManager.js(224,19): error TS2367: This condition will always return 'false' since the types '{ NoThrottling: number; MidTierMobile: number; LowEndMobile: number; }' and '1' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingManager.js(224,39): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingPresets.js(16,35): error TS2694: Namespace 'SDK.NetworkManager' has no exported member 'Conditions'.
 node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingPresets.js(20,18): error TS2300: Duplicate identifier 'Conditions'.
@@ -7125,6 +7342,9 @@ node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingPres
 node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingPresets.js(77,38): error TS2694: Namespace 'MobileThrottling' has no exported member 'Conditions'.
 node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingPresets.js(82,38): error TS2694: Namespace 'MobileThrottling' has no exported member 'Conditions'.
 node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingPresets.js(87,39): error TS2694: Namespace 'SDK.NetworkManager' has no exported member 'Conditions'.
+node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingPresets.js(96,3): error TS2322: Type 'number' is not assignable to type '{ NoThrottling: number; MidTierMobile: number; LowEndMobile: number; }'.
+node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingPresets.js(97,3): error TS2322: Type 'number' is not assignable to type '{ NoThrottling: number; MidTierMobile: number; LowEndMobile: number; }'.
+node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingPresets.js(98,3): error TS2322: Type 'number' is not assignable to type '{ NoThrottling: number; MidTierMobile: number; LowEndMobile: number; }'.
 node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingSettingsTab.js(14,25): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingSettingsTab.js(14,75): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingSettingsTab.js(17,16): error TS2555: Expected at least 2 arguments, but got 1.
@@ -7182,6 +7402,7 @@ node_modules/chrome-devtools-frontend/front_end/network/EventSourceMessagesView.
 node_modules/chrome-devtools-frontend/front_end/network/EventSourceMessagesView.js(19,34): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/EventSourceMessagesView.js(20,34): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/EventSourceMessagesView.js(21,34): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/network/EventSourceMessagesView.js(27,49): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Ascending: string; Descending: string; }'.
 node_modules/chrome-devtools-frontend/front_end/network/EventSourceMessagesView.js(55,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/network/EventSourceMessagesView.js(58,50): error TS2694: Namespace 'SDK.NetworkRequest' has no exported member 'EventSourceMessage'.
 node_modules/chrome-devtools-frontend/front_end/network/EventSourceMessagesView.js(78,34): error TS2694: Namespace 'SDK.NetworkRequest' has no exported member 'EventSourceMessage'.
@@ -7223,6 +7444,7 @@ node_modules/chrome-devtools-frontend/front_end/network/NetworkConfigView.js(126
 node_modules/chrome-devtools-frontend/front_end/network/NetworkConfigView.js(137,35): error TS2339: Property 'disabled' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkConfigView.js(138,34): error TS2339: Property 'disabled' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkDataGridNode.js(49,36): error TS2694: Namespace 'Network.NetworkNode' has no exported member '_SupportedBackgroundColors'.
+node_modules/chrome-devtools-frontend/front_end/network/NetworkDataGridNode.js(57,62): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ Unknown: number; Foreground: number; Background: number; Selection: number; }'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkDataGridNode.js(60,41): error TS2694: Namespace 'Network.NetworkNode' has no exported member '_SupportedBackgroundColors'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkDataGridNode.js(121,13): error TS2339: Property 'style' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkDataGridNode.js(241,33): error TS2339: Property 'request' does not exist on type 'ViewportDataGridNode<any>'.
@@ -7311,11 +7533,16 @@ node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(174,46
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(175,46): error TS2694: Namespace 'Protocol' has no exported member 'Network'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(184,38): error TS2694: Namespace 'Network.NetworkLogView' has no exported member 'Filter'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(220,39): error TS2694: Namespace 'Network.NetworkLogView' has no exported member 'Filter'.
+node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(301,9): error TS2367: This condition will always return 'false' since the types '{ All: string; Displayed: string; Blocked: string; BlockOverridden: string; }' and 'string' have no overlap.
+node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(303,14): error TS2367: This condition will always return 'false' since the types '{ All: string; Displayed: string; Blocked: string; BlockOverridden: string; }' and 'string' have no overlap.
+node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(305,14): error TS2367: This condition will always return 'false' since the types '{ All: string; Displayed: string; Blocked: string; BlockOverridden: string; }' and 'string' have no overlap.
+node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(307,14): error TS2367: This condition will always return 'false' since the types '{ All: string; Displayed: string; Blocked: string; BlockOverridden: string; }' and 'string' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(585,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(595,40): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(596,40): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(597,50): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(602,42): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(650,36): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Nearest: string; First: string; Last: string; }'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(663,41): error TS2339: Property 'shiftKey' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(690,47): error TS2339: Property 'button' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(691,13): error TS2339: Property 'consume' does not exist on type 'Event'.
@@ -7357,6 +7584,20 @@ node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(1294,2
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(1309,24): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(1314,24): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(1501,39): error TS2694: Namespace 'Network.NetworkLogView' has no exported member 'Filter'.
+node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(1505,12): error TS2678: Type 'string' is not comparable to type '{ Domain: string; HasResponseHeader: string; Is: string; LargerThan: string; Method: string; MimeType: string; MixedContent: string; Priority: string; Scheme: string; SetCookieDomain: string; SetCookieName: string; SetCookieValue: string; StatusCode: string; }'.
+node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(1508,12): error TS2678: Type 'string' is not comparable to type '{ Domain: string; HasResponseHeader: string; Is: string; LargerThan: string; Method: string; MimeType: string; MixedContent: string; Priority: string; Scheme: string; SetCookieDomain: string; SetCookieName: string; SetCookieValue: string; StatusCode: string; }'.
+node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(1511,12): error TS2678: Type 'string' is not comparable to type '{ Domain: string; HasResponseHeader: string; Is: string; LargerThan: string; Method: string; MimeType: string; MixedContent: string; Priority: string; Scheme: string; SetCookieDomain: string; SetCookieName: string; SetCookieValue: string; StatusCode: string; }'.
+node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(1518,12): error TS2678: Type 'string' is not comparable to type '{ Domain: string; HasResponseHeader: string; Is: string; LargerThan: string; Method: string; MimeType: string; MixedContent: string; Priority: string; Scheme: string; SetCookieDomain: string; SetCookieName: string; SetCookieValue: string; StatusCode: string; }'.
+node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(1521,12): error TS2678: Type 'string' is not comparable to type '{ Domain: string; HasResponseHeader: string; Is: string; LargerThan: string; Method: string; MimeType: string; MixedContent: string; Priority: string; Scheme: string; SetCookieDomain: string; SetCookieName: string; SetCookieValue: string; StatusCode: string; }'.
+node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(1524,12): error TS2678: Type 'string' is not comparable to type '{ Domain: string; HasResponseHeader: string; Is: string; LargerThan: string; Method: string; MimeType: string; MixedContent: string; Priority: string; Scheme: string; SetCookieDomain: string; SetCookieName: string; SetCookieValue: string; StatusCode: string; }'.
+node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(1527,12): error TS2678: Type 'string' is not comparable to type '{ Domain: string; HasResponseHeader: string; Is: string; LargerThan: string; Method: string; MimeType: string; MixedContent: string; Priority: string; Scheme: string; SetCookieDomain: string; SetCookieName: string; SetCookieValue: string; StatusCode: string; }'.
+node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(1529,23): error TS2352: Conversion of type 'string' to type '{ All: string; Displayed: string; Blocked: string; BlockOverridden: string; }' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
+node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(1531,12): error TS2678: Type 'string' is not comparable to type '{ Domain: string; HasResponseHeader: string; Is: string; LargerThan: string; Method: string; MimeType: string; MixedContent: string; Priority: string; Scheme: string; SetCookieDomain: string; SetCookieName: string; SetCookieValue: string; StatusCode: string; }'.
+node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(1534,12): error TS2678: Type 'string' is not comparable to type '{ Domain: string; HasResponseHeader: string; Is: string; LargerThan: string; Method: string; MimeType: string; MixedContent: string; Priority: string; Scheme: string; SetCookieDomain: string; SetCookieName: string; SetCookieValue: string; StatusCode: string; }'.
+node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(1537,12): error TS2678: Type 'string' is not comparable to type '{ Domain: string; HasResponseHeader: string; Is: string; LargerThan: string; Method: string; MimeType: string; MixedContent: string; Priority: string; Scheme: string; SetCookieDomain: string; SetCookieName: string; SetCookieValue: string; StatusCode: string; }'.
+node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(1540,12): error TS2678: Type 'string' is not comparable to type '{ Domain: string; HasResponseHeader: string; Is: string; LargerThan: string; Method: string; MimeType: string; MixedContent: string; Priority: string; Scheme: string; SetCookieDomain: string; SetCookieName: string; SetCookieValue: string; StatusCode: string; }'.
+node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(1543,12): error TS2678: Type 'string' is not comparable to type '{ Domain: string; HasResponseHeader: string; Is: string; LargerThan: string; Method: string; MimeType: string; MixedContent: string; Priority: string; Scheme: string; SetCookieDomain: string; SetCookieName: string; SetCookieValue: string; StatusCode: string; }'.
+node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(1546,12): error TS2678: Type 'string' is not comparable to type '{ Domain: string; HasResponseHeader: string; Is: string; LargerThan: string; Method: string; MimeType: string; MixedContent: string; Priority: string; Scheme: string; SetCookieDomain: string; SetCookieName: string; SetCookieValue: string; StatusCode: string; }'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(1554,39): error TS2694: Namespace 'Network.NetworkLogView' has no exported member 'Filter'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(1696,9): error TS2322: Type 'string' is not assignable to type 'number'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(1697,52): error TS2339: Property 'length' does not exist on type 'number'.
@@ -7370,6 +7611,7 @@ node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(83,68): error TS2694: Namespace 'Network.NetworkLogViewColumns' has no exported member 'Descriptor'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(100,49): error TS2339: Property 'button' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(101,15): error TS2339: Property 'consume' does not exist on type 'Event'.
+node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(112,59): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Ascending: string; Descending: string; }'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(127,68): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(150,63): error TS2339: Property 'offsetX' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(150,78): error TS2339: Property 'offsetY' does not exist on type 'Event'.
@@ -7377,6 +7619,7 @@ node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(169,45): error TS2339: Property 'wheelDeltaY' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(202,73): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(207,39): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(219,56): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Ascending: string; Descending: string; }'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(331,45): error TS2694: Namespace 'Network.NetworkLogViewColumns' has no exported member 'Descriptor'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(370,14): error TS2339: Property 'createTextChild' does not exist on type 'DocumentFragment'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(371,32): error TS2339: Property 'createChild' does not exist on type 'DocumentFragment'.
@@ -7388,6 +7631,11 @@ node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(406,16): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(409,16): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(412,16): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(424,11): error TS2367: This condition will always return 'false' since the types '{ StartTime: string; ResponseTime: string; EndTime: string; Duration: string; Latency: string; }' and 'string' have no overlap.
+node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(424,51): error TS2367: This condition will always return 'false' since the types '{ StartTime: string; ResponseTime: string; EndTime: string; Duration: string; Latency: string; }' and 'string' have no overlap.
+node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(428,7): error TS2322: Type '{ StartTime: string; ResponseTime: string; EndTime: string; Duration: string; Latency: string; }' is not assignable to type 'string'.
+node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(429,56): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Ascending: string; Descending: string; }'.
+node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(445,28): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ SetExactSize: symbol; SetExactWidthMaxHeight: symbol; MeasureContent: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(469,46): error TS2694: Namespace 'Network.NetworkLogViewColumns' has no exported member 'Descriptor'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(481,66): error TS2694: Namespace 'Network.NetworkLogViewColumns' has no exported member 'Descriptor'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(522,19): error TS2694: Namespace 'UI' has no exported member 'PopoverRequest'.
@@ -7458,7 +7706,7 @@ node_modules/chrome-devtools-frontend/front_end/network/NetworkPanel.js(201,55):
 node_modules/chrome-devtools-frontend/front_end/network/NetworkPanel.js(202,16): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkPanel.js(274,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkPanel.js(287,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkPanel.js(291,7): error TS2322: Type 'Timer' is not assignable to type 'number'.
+node_modules/chrome-devtools-frontend/front_end/network/NetworkPanel.js(291,7): error TS2322: Type 'Timeout' is not assignable to type 'number'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkPanel.js(366,13): error TS2339: Property 'handled' does not exist on type 'KeyboardEvent'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkPanel.js(397,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkPanel.js(404,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
@@ -7486,6 +7734,7 @@ node_modules/chrome-devtools-frontend/front_end/network/NetworkTimeCalculator.js
 node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.js(13,40): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.js(61,75): error TS2694: Namespace 'Network.NetworkWaterfallColumn' has no exported member '_LayerStyle'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.js(63,75): error TS2694: Namespace 'Network.NetworkWaterfallColumn' has no exported member '_LayerStyle'.
+node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.js(66,67): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ Unknown: number; Foreground: number; Background: number; Selection: number; }'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.js(67,48): error TS2694: Namespace 'Network.NetworkWaterfallColumn' has no exported member '_LayerStyle'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.js(69,48): error TS2694: Namespace 'Network.NetworkWaterfallColumn' has no exported member '_LayerStyle'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.js(72,53): error TS2694: Namespace 'Network.NetworkWaterfallColumn' has no exported member '_LayerStyle'.
@@ -7505,7 +7754,15 @@ node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.j
 node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.js(318,20): error TS2339: Property 'window' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.js(349,45): error TS2339: Property 'offsetWidth' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.js(350,46): error TS2339: Property 'offsetHeight' does not exist on type 'Element'.
+node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.js(397,64): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ Unknown: number; Foreground: number; Background: number; Selection: number; }'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.js(421,62): error TS2694: Namespace 'Network.NetworkWaterfallColumn' has no exported member '_LayerStyle'.
+node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.js(464,12): error TS2678: Type 'string' is not comparable to type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
+node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.js(465,12): error TS2678: Type 'string' is not comparable to type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
+node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.js(466,12): error TS2678: Type 'string' is not comparable to type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
+node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.js(467,12): error TS2678: Type 'string' is not comparable to type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
+node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.js(468,12): error TS2678: Type 'string' is not comparable to type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
+node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.js(469,12): error TS2678: Type 'string' is not comparable to type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
+node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.js(470,12): error TS2678: Type 'string' is not comparable to type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.js(613,32): error TS2339: Property '_LayerStyle' does not exist on type 'typeof NetworkWaterfallColumn'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.js(616,32): error TS2339: Property '_TextLayer' does not exist on type 'typeof NetworkWaterfallColumn'.
 node_modules/chrome-devtools-frontend/front_end/network/RequestCookiesView.js(55,55): error TS2555: Expected at least 2 arguments, but got 1.
@@ -7571,22 +7828,54 @@ node_modules/chrome-devtools-frontend/front_end/network/RequestPreviewView.js(93
 node_modules/chrome-devtools-frontend/front_end/network/RequestResponseView.js(46,34): error TS2694: Namespace 'SDK.NetworkRequest' has no exported member 'ContentData'.
 node_modules/chrome-devtools-frontend/front_end/network/RequestResponseView.js(118,40): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/RequestResponseView.js(121,38): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(53,12): error TS2678: Type 'string' is not comparable to type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
 node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(54,23): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(55,12): error TS2678: Type 'string' is not comparable to type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
 node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(56,23): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(57,12): error TS2678: Type 'string' is not comparable to type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
 node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(58,23): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(59,12): error TS2678: Type 'string' is not comparable to type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
 node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(60,23): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(61,12): error TS2678: Type 'string' is not comparable to type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
 node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(62,23): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(63,12): error TS2678: Type 'string' is not comparable to type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
 node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(64,23): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(65,12): error TS2678: Type 'string' is not comparable to type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
 node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(66,23): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(67,12): error TS2678: Type 'string' is not comparable to type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
 node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(68,23): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(69,12): error TS2678: Type 'string' is not comparable to type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
 node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(70,23): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(71,12): error TS2678: Type 'string' is not comparable to type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
 node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(72,23): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(73,12): error TS2678: Type 'string' is not comparable to type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
 node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(74,23): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(75,12): error TS2678: Type 'string' is not comparable to type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
 node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(76,23): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(77,12): error TS2678: Type 'string' is not comparable to type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
 node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(78,23): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(79,12): error TS2678: Type 'string' is not comparable to type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
 node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(80,23): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(82,23): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(89,32): error TS2694: Namespace 'Network' has no exported member 'RequestTimeRange'.
+node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(130,16): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
+node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(131,16): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
+node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(132,16): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
+node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(140,14): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
+node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(146,18): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
+node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(149,16): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
+node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(153,22): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
+node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(154,22): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
+node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(155,22): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
+node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(156,22): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
+node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(159,22): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
+node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(160,22): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
+node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(161,22): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
+node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(162,22): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
+node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(163,22): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
+node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(164,22): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
+node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(166,11): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
+node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(172,11): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
 node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(187,33): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(202,40): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(217,29): error TS2555: Expected at least 2 arguments, but got 1.
@@ -7616,6 +7905,7 @@ node_modules/chrome-devtools-frontend/front_end/network/ResourceWebSocketFrameVi
 node_modules/chrome-devtools-frontend/front_end/network/ResourceWebSocketFrameView.js(36,34): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/ResourceWebSocketFrameView.js(38,23): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/ResourceWebSocketFrameView.js(43,34): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/network/ResourceWebSocketFrameView.js(54,49): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Ascending: string; Descending: string; }'.
 node_modules/chrome-devtools-frontend/front_end/network/ResourceWebSocketFrameView.js(63,56): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/ResourceWebSocketFrameView.js(76,56): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/ResourceWebSocketFrameView.js(86,56): error TS2555: Expected at least 2 arguments, but got 1.
@@ -7721,6 +8011,7 @@ node_modules/chrome-devtools-frontend/front_end/object_ui/ObjectPopoverHelper.js
 node_modules/chrome-devtools-frontend/front_end/object_ui/ObjectPopoverHelper.js(114,48): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/object_ui/ObjectPopoverHelper.js(129,7): error TS2722: Cannot invoke an object which is possibly 'undefined'.
 node_modules/chrome-devtools-frontend/front_end/object_ui/ObjectPopoverHelper.js(145,50): error TS2339: Property 'createChild' does not exist on type 'Element'.
+node_modules/chrome-devtools-frontend/front_end/object_ui/ObjectPopoverHelper.js(154,31): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ SetExactSize: symbol; SetExactWidthMaxHeight: symbol; MeasureContent: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/object_ui/ObjectPopoverHelper.js(156,7): error TS2722: Cannot invoke an object which is possibly 'undefined'.
 node_modules/chrome-devtools-frontend/front_end/object_ui/ObjectPropertiesSection.js(49,40): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/object_ui/ObjectPropertiesSection.js(56,18): error TS2339: Property '_section' does not exist on type 'Element'.
@@ -7894,6 +8185,7 @@ node_modules/chrome-devtools-frontend/front_end/perf_ui/FilmStripView.js(211,31)
 node_modules/chrome-devtools-frontend/front_end/perf_ui/FilmStripView.js(213,16): error TS2339: Property 'title' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/FilmStripView.js(213,31): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/FilmStripView.js(215,39): error TS2345: Argument of type 'TemplateStringsArray' is not assignable to parameter of type 'string[]'.
+node_modules/chrome-devtools-frontend/front_end/perf_ui/FilmStripView.js(247,34): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ SetExactSize: symbol; SetExactWidthMaxHeight: symbol; MeasureContent: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/FilmStripView.js(254,19): error TS2339: Property 'key' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/FilmStripView.js(256,35): error TS2339: Property 'metaKey' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/FilmStripView.js(263,35): error TS2339: Property 'metaKey' does not exist on type 'Event'.
@@ -7922,6 +8214,10 @@ node_modules/chrome-devtools-frontend/front_end/perf_ui/FlameChart.js(656,65): e
 node_modules/chrome-devtools-frontend/front_end/perf_ui/FlameChart.js(694,31): error TS2339: Property 'keysArray' does not exist on type 'Map<string, number[]>'.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/FlameChart.js(701,13): error TS2403: Subsequent variable declarations must have the same type.  Variable 'entryIndex' must be of type 'any', but here has type 'number'.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/FlameChart.js(796,43): error TS2339: Property 'peekLast' does not exist on type 'any[]'.
+node_modules/chrome-devtools-frontend/front_end/perf_ui/FlameChart.js(805,64): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ Unknown: number; Foreground: number; Background: number; Selection: number; }'.
+node_modules/chrome-devtools-frontend/front_end/perf_ui/FlameChart.js(815,66): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ Unknown: number; Foreground: number; Background: number; Selection: number; }'.
+node_modules/chrome-devtools-frontend/front_end/perf_ui/FlameChart.js(859,67): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ Unknown: number; Foreground: number; Background: number; Selection: number; }'.
+node_modules/chrome-devtools-frontend/front_end/perf_ui/FlameChart.js(870,66): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ Unknown: number; Foreground: number; Background: number; Selection: number; }'.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/FlameChart.js(903,16): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/FlameChart.js(903,60): error TS2694: Namespace 'PerfUI.FlameChart' has no exported member 'Group'.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/FlameChart.js(907,17): error TS1110: Type expected.
@@ -8010,7 +8306,10 @@ node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineGrid.js(43,58):
 node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineGrid.js(44,61): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineGrid.js(51,36): error TS2694: Namespace 'PerfUI.TimelineGrid' has no exported member 'DividersData'.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineGrid.js(98,35): error TS2694: Namespace 'PerfUI.TimelineGrid' has no exported member 'DividersData'.
+node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineGrid.js(104,80): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ Unknown: number; Foreground: number; Background: number; Selection: number; }'.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineGrid.js(119,35): error TS2694: Namespace 'PerfUI.TimelineGrid' has no exported member 'DividersData'.
+node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineGrid.js(132,68): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ Unknown: number; Foreground: number; Background: number; Selection: number; }'.
+node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineGrid.js(135,64): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ Unknown: number; Foreground: number; Background: number; Selection: number; }'.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineGrid.js(189,25): error TS2339: Property '_labelElement' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineGrid.js(196,23): error TS2339: Property '_labelElement' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineGrid.js(199,15): error TS2339: Property 'style' does not exist on type 'Element'.
@@ -8038,7 +8337,9 @@ node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineOverviewPane.js(
 node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineOverviewPane.js(375,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineOverviewPane.js(381,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineOverviewPane.js(395,33): error TS2339: Property 'createChild' does not exist on type 'Element'.
+node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineOverviewPane.js(489,46): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ BlockedByGlassPane: symbol; PierceGlassPane: symbol; PierceContents: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineOverviewPane.js(490,39): error TS2345: Argument of type 'symbol' is not assignable to parameter of type 'boolean'.
+node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineOverviewPane.js(491,37): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ SetExactSize: symbol; SetExactWidthMaxHeight: symbol; MeasureContent: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineOverviewPane.js(495,14): error TS2339: Property 'createChild' does not exist on type 'DocumentFragment'.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineOverviewPane.js(508,61): error TS2339: Property 'boxInWindow' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/performance_test_runner/TimelineTestRunner.js(74,72): error TS2554: Expected 0 arguments, but got 1.
@@ -8108,6 +8409,7 @@ node_modules/chrome-devtools-frontend/front_end/persistence/FileSystemWorkspaceB
 node_modules/chrome-devtools-frontend/front_end/persistence/FileSystemWorkspaceBinding.js(160,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/persistence/FileSystemWorkspaceBinding.js(163,67): error TS2694: Namespace 'Persistence.IsolatedFileSystemManager' has no exported member 'FilesChangedData'.
 node_modules/chrome-devtools-frontend/front_end/persistence/FileSystemWorkspaceBinding.js(190,30): error TS2339: Property 'remove' does not exist on type 'Map<string, FileSystem>'.
+node_modules/chrome-devtools-frontend/front_end/persistence/FileSystemWorkspaceBinding.js(222,26): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Debugger: string; Formatter: string; Network: string; Snippets: string; FileSystem: string; ContentScripts: string; Service: string; }'.
 node_modules/chrome-devtools-frontend/front_end/persistence/FileSystemWorkspaceBinding.js(310,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/persistence/FileSystemWorkspaceBinding.js(330,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/persistence/FileSystemWorkspaceBinding.js(360,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
@@ -8134,6 +8436,7 @@ node_modules/chrome-devtools-frontend/front_end/persistence/IsolatedFileSystem.j
     Argument of type 'string | ArrayBuffer' is not assignable to parameter of type 'string'.
       Type 'ArrayBuffer' is not assignable to type 'string'.
 node_modules/chrome-devtools-frontend/front_end/persistence/IsolatedFileSystem.js(357,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
+node_modules/chrome-devtools-frontend/front_end/persistence/IsolatedFileSystem.js(360,34): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; TimelineStarted: number; ProfilesCPUProfileTaken: number; ProfilesHeapProfileTaken: number; AuditsStarted: number; ... 23 more ...; ShowedThirdPartyBadges: number; }'.
 node_modules/chrome-devtools-frontend/front_end/persistence/IsolatedFileSystem.js(364,17): error TS2304: Cannot find name 'FileEntry'.
 node_modules/chrome-devtools-frontend/front_end/persistence/IsolatedFileSystem.js(372,17): error TS2304: Cannot find name 'FileWriter'.
 node_modules/chrome-devtools-frontend/front_end/persistence/IsolatedFileSystem.js(404,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
@@ -8299,12 +8602,15 @@ node_modules/chrome-devtools-frontend/front_end/platform/utilities.js(1363,25):
 node_modules/chrome-devtools-frontend/front_end/platform/utilities.js(1402,12): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/platform/utilities.js(1424,31): error TS1110: Type expected.
 node_modules/chrome-devtools-frontend/front_end/platform/utilities.js(1430,18): error TS2555: Expected at least 1 arguments, but got 0.
+node_modules/chrome-devtools-frontend/front_end/product_registry/BadgePool.js(17,38): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; TimelineStarted: number; ProfilesCPUProfileTaken: number; ProfilesHeapProfileTaken: number; AuditsStarted: number; ... 23 more ...; ShowedThirdPartyBadges: number; }'.
 node_modules/chrome-devtools-frontend/front_end/product_registry/BadgePool.js(55,29): error TS2339: Property 'createChild' does not exist on type 'DocumentFragment'.
 node_modules/chrome-devtools-frontend/front_end/product_registry/BadgePool.js(108,36): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/product_registry/BadgePool.js(113,18): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/product_registry/BadgePool.js(134,18): error TS2339: Property 'parentNodeOrShadowHost' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/product_registry/BadgePool.js(151,29): error TS2339: Property 'createChild' does not exist on type 'DocumentFragment'.
 node_modules/chrome-devtools-frontend/front_end/product_registry/BadgePool.js(162,45): error TS2339: Property 'boxInWindow' does not exist on type 'Element'.
+node_modules/chrome-devtools-frontend/front_end/product_registry/BadgePool.js(164,28): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ SetExactSize: symbol; SetExactWidthMaxHeight: symbol; MeasureContent: symbol; }'.
+node_modules/chrome-devtools-frontend/front_end/product_registry/BadgePool.js(165,30): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ PreferTop: symbol; PreferBottom: symbol; PreferLeft: symbol; PreferRight: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/product_registry/BadgePool.js(175,36): error TS2339: Property '_colorGenerator' does not exist on type 'typeof BadgePool'.
 node_modules/chrome-devtools-frontend/front_end/product_registry/BadgePool.js(176,33): error TS2339: Property '_colorGenerator' does not exist on type 'typeof BadgePool'.
 node_modules/chrome-devtools-frontend/front_end/product_registry/BadgePool.js(179,38): error TS2339: Property '_colorGenerator' does not exist on type 'typeof BadgePool'.
@@ -8557,6 +8863,7 @@ node_modules/chrome-devtools-frontend/front_end/profiler/CPUProfileView.js(141,2
 node_modules/chrome-devtools-frontend/front_end/profiler/CPUProfileView.js(144,49): error TS2694: Namespace 'SDK.CPUProfilerModel' has no exported member 'EventData'.
 node_modules/chrome-devtools-frontend/front_end/profiler/CPUProfileView.js(145,43): error TS2694: Namespace 'Protocol' has no exported member 'Profiler'.
 node_modules/chrome-devtools-frontend/front_end/profiler/CPUProfileView.js(159,33): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/profiler/CPUProfileView.js(162,34): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; TimelineStarted: number; ProfilesCPUProfileTaken: number; ProfilesHeapProfileTaken: number; AuditsStarted: number; ... 23 more ...; ShowedThirdPartyBadges: number; }'.
 node_modules/chrome-devtools-frontend/front_end/profiler/CPUProfileView.js(225,25): error TS2694: Namespace 'Protocol' has no exported member 'Profiler'.
 node_modules/chrome-devtools-frontend/front_end/profiler/CPUProfileView.js(240,24): error TS2694: Namespace 'Protocol' has no exported member 'Profiler'.
 node_modules/chrome-devtools-frontend/front_end/profiler/CPUProfileView.js(390,21): error TS2339: Property 'secondsToString' does not exist on type 'NumberConstructor'.
@@ -8790,6 +9097,7 @@ node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(947
         Types of parameters 'heapProfilerModel' and 'model' are incompatible.
           Type 'T' is not assignable to type 'HeapProfilerModel'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(989,19): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(1006,34): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; TimelineStarted: number; ProfilesCPUProfileTaken: number; ProfilesHeapProfileTaken: number; AuditsStarted: number; ... 23 more ...; ShowedThirdPartyBadges: number; }'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(1011,19): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(1015,19): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(1038,33): error TS2555: Expected at least 2 arguments, but got 1.
@@ -8918,8 +9226,10 @@ node_modules/chrome-devtools-frontend/front_end/profiler/ProfileView.js(276,15):
 node_modules/chrome-devtools-frontend/front_end/profiler/ProfileView.js(284,65): error TS2339: Property 'value' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/profiler/ProfileView.js(322,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/profiler/ProfileView.js(329,30): error TS2339: Property 'focus' does not exist on type 'ProfileDataGridTree'.
+node_modules/chrome-devtools-frontend/front_end/profiler/ProfileView.js(332,34): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; TimelineStarted: number; ProfilesCPUProfileTaken: number; ProfilesHeapProfileTaken: number; AuditsStarted: number; ... 23 more ...; ShowedThirdPartyBadges: number; }'.
 node_modules/chrome-devtools-frontend/front_end/profiler/ProfileView.js(336,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/profiler/ProfileView.js(347,30): error TS2339: Property 'exclude' does not exist on type 'ProfileDataGridTree'.
+node_modules/chrome-devtools-frontend/front_end/profiler/ProfileView.js(350,34): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; TimelineStarted: number; ProfilesCPUProfileTaken: number; ProfilesHeapProfileTaken: number; AuditsStarted: number; ... 23 more ...; ShowedThirdPartyBadges: number; }'.
 node_modules/chrome-devtools-frontend/front_end/profiler/ProfileView.js(354,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/profiler/ProfileView.js(368,30): error TS2554: Expected 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/profiler/ProfileView.js(404,68): error TS2339: Property 'bytesToString' does not exist on type 'NumberConstructor'.
@@ -9012,6 +9322,7 @@ node_modules/chrome-devtools-frontend/front_end/quick_open/CommandMenu.js(202,18
 node_modules/chrome-devtools-frontend/front_end/quick_open/CommandMenu.js(203,35): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/quick_open/CommandMenu.js(204,24): error TS2339: Property 'hashCode' does not exist on type 'StringConstructor'.
 node_modules/chrome-devtools-frontend/front_end/quick_open/CommandMenu.js(207,18): error TS2339: Property 'createTextChild' does not exist on type 'Element'.
+node_modules/chrome-devtools-frontend/front_end/quick_open/CommandMenu.js(221,34): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; TimelineStarted: number; ProfilesCPUProfileTaken: number; ProfilesHeapProfileTaken: number; AuditsStarted: number; ... 23 more ...; ShowedThirdPartyBadges: number; }'.
 node_modules/chrome-devtools-frontend/front_end/quick_open/CommandMenu.js(229,19): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/quick_open/CommandMenu.js(247,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/quick_open/FilteredListWidget.js(24,47): error TS2339: Property 'createChild' does not exist on type 'Element'.
@@ -9022,6 +9333,7 @@ node_modules/chrome-devtools-frontend/front_end/quick_open/FilteredListWidget.js
       Type '(item: number) => Element' is not assignable to type '(item: T) => Element'.
         Types of parameters 'item' and 'item' are incompatible.
           Type 'T' is not assignable to type 'number'.
+node_modules/chrome-devtools-frontend/front_end/quick_open/FilteredListWidget.js(107,34): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ SetExactSize: symbol; SetExactWidthMaxHeight: symbol; MeasureContent: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/quick_open/FilteredListWidget.js(175,23): error TS2339: Property '_scoringTimer' does not exist on type 'FilteredListWidget'.
 node_modules/chrome-devtools-frontend/front_end/quick_open/FilteredListWidget.js(178,17): error TS2339: Property '_scoringTimer' does not exist on type 'FilteredListWidget'.
 node_modules/chrome-devtools-frontend/front_end/quick_open/FilteredListWidget.js(180,17): error TS2339: Property '_refreshListWithCurrentResult' does not exist on type 'FilteredListWidget'.
@@ -9507,11 +9819,21 @@ node_modules/chrome-devtools-frontend/front_end/sdk/CSSMatchedStyles.js(14,32):
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSMatchedStyles.js(15,32): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSMatchedStyles.js(16,32): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSMatchedStyles.js(33,31): error TS2694: Namespace 'Protocol' has no exported member 'DOM'.
+node_modules/chrome-devtools-frontend/front_end/sdk/CSSMatchedStyles.js(43,74): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Regular: string; Inline: string; Attributes: string; }'.
+node_modules/chrome-devtools-frontend/front_end/sdk/CSSMatchedStyles.js(50,78): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Regular: string; Inline: string; Attributes: string; }'.
+node_modules/chrome-devtools-frontend/front_end/sdk/CSSMatchedStyles.js(77,81): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Regular: string; Inline: string; Attributes: string; }'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSMatchedStyles.js(241,53): error TS2339: Property 'media' does not exist on type 'CSSRule'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSMatchedStyles.js(264,31): error TS2694: Namespace 'Protocol' has no exported member 'DOM'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSMatchedStyles.js(322,58): error TS2339: Property 'valuesArray' does not exist on type 'Map<any, any>'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSMatchedStyles.js(352,46): error TS2345: Argument of type 'CSSRule' is not assignable to parameter of type 'CSSStyleRule'.
   Type 'CSSRule' is missing the following properties from type 'CSSStyleRule': media, wasUsed, _reinitializeSelectors, selectors, and 5 more.
+node_modules/chrome-devtools-frontend/front_end/sdk/CSSMatchedStyles.js(367,32): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Active: string; Overloaded: string; }'.
+node_modules/chrome-devtools-frontend/front_end/sdk/CSSMatchedStyles.js(373,32): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Active: string; Overloaded: string; }'.
+node_modules/chrome-devtools-frontend/front_end/sdk/CSSMatchedStyles.js(378,32): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Active: string; Overloaded: string; }'.
+node_modules/chrome-devtools-frontend/front_end/sdk/CSSMatchedStyles.js(389,34): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Active: string; Overloaded: string; }'.
+node_modules/chrome-devtools-frontend/front_end/sdk/CSSMatchedStyles.js(397,36): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Active: string; Overloaded: string; }'.
+node_modules/chrome-devtools-frontend/front_end/sdk/CSSMatchedStyles.js(405,30): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Active: string; Overloaded: string; }'.
+node_modules/chrome-devtools-frontend/front_end/sdk/CSSMatchedStyles.js(425,30): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Active: string; Overloaded: string; }'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSMedia.js(9,24): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSMedia.js(19,24): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSMedia.js(47,24): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
@@ -9533,7 +9855,9 @@ node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(55,81): error TS
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(102,24): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(203,31): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(238,24): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
+node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(244,34): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; TimelineStarted: number; ProfilesCPUProfileTaken: number; ProfilesHeapProfileTaken: number; AuditsStarted: number; ... 23 more ...; ShowedThirdPartyBadges: number; }'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(262,24): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
+node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(268,34): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; TimelineStarted: number; ProfilesCPUProfileTaken: number; ProfilesHeapProfileTaken: number; AuditsStarted: number; ... 23 more ...; ShowedThirdPartyBadges: number; }'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(290,41): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(328,24): error TS2694: Namespace 'Protocol' has no exported member 'DOM'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(348,24): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
@@ -9542,7 +9866,10 @@ node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(365,38): error T
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(377,41): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(387,45): error TS2339: Property 'valuesArray' does not exist on type 'Map<string, CSSStyleSheetHeader>'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(406,24): error TS2694: Namespace 'Protocol' has no exported member 'DOM'.
+node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(415,71): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Regular: string; Inline: string; Attributes: string; }'.
+node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(417,75): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Regular: string; Inline: string; Attributes: string; }'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(460,24): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
+node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(466,34): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; TimelineStarted: number; ProfilesCPUProfileTaken: number; ProfilesHeapProfileTaken: number; AuditsStarted: number; ... 23 more ...; ShowedThirdPartyBadges: number; }'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(484,24): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(511,46): error TS2339: Property 'valuesArray' does not exist on type 'Map<string, CSSStyleSheetHeader>'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(533,24): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
@@ -9573,10 +9900,12 @@ node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(885,24): error T
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(897,33): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSProperty.js(18,24): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSProperty.js(39,24): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
+node_modules/chrome-devtools-frontend/front_end/sdk/CSSProperty.js(156,36): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; TimelineStarted: number; ProfilesCPUProfileTaken: number; ProfilesHeapProfileTaken: number; AuditsStarted: number; ... 23 more ...; ShowedThirdPartyBadges: number; }'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSProperty.js(168,56): error TS2339: Property 'sprintf' does not exist on type 'StringConstructor'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSRule.js(9,24): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSRule.js(33,32): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSRule.js(33,98): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
+node_modules/chrome-devtools-frontend/front_end/sdk/CSSRule.js(44,83): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Regular: string; Inline: string; Attributes: string; }'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSRule.js(108,24): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSRule.js(131,64): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSRule.js(135,24): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
@@ -9604,6 +9933,8 @@ node_modules/chrome-devtools-frontend/front_end/sdk/CookieModel.js(95,39): error
 node_modules/chrome-devtools-frontend/front_end/sdk/CookieModel.js(97,10): error TS2339: Property 'networkAgent' does not exist on type 'Target'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CookieModel.js(114,38): error TS2339: Property 'asParsedURL' does not exist on type 'string'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CookieModel.js(129,38): error TS2339: Property 'networkAgent' does not exist on type 'Target'.
+node_modules/chrome-devtools-frontend/front_end/sdk/CookieParser.js(79,29): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ Request: number; Response: number; }'.
+node_modules/chrome-devtools-frontend/front_end/sdk/CookieParser.js(97,29): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ Request: number; Response: number; }'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CookieParser.js(246,25): error TS2694: Namespace 'Protocol' has no exported member 'Network'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CookieParser.js(250,33): error TS2694: Namespace 'Protocol' has no exported member 'Network'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CookieParser.js(325,53): error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
@@ -9614,6 +9945,8 @@ node_modules/chrome-devtools-frontend/front_end/sdk/DOMDebuggerModel.js(387,7):
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMDebuggerModel.js(392,18): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMDebuggerModel.js(422,16): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMDebuggerModel.js(453,16): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
+node_modules/chrome-devtools-frontend/front_end/sdk/DOMDebuggerModel.js(469,5): error TS2322: Type 'string | { Raw: string; Framework: string; FrameworkUser: string; }' is not assignable to type '{ Raw: string; Framework: string; FrameworkUser: string; }'.
+  Type 'string' is not assignable to type '{ Raw: string; Framework: string; FrameworkUser: string; }'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMDebuggerModel.js(578,16): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMDebuggerModel.js(581,16): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMDebuggerModel.js(583,16): error TS2555: Expected at least 2 arguments, but got 1.
@@ -10471,6 +10804,8 @@ node_modules/chrome-devtools-frontend/front_end/sdk/TargetManager.js(267,19): er
 node_modules/chrome-devtools-frontend/front_end/sdk/TargetManager.js(279,34): error TS2345: Argument of type 'Function' is not assignable to parameter of type 'new (arg1: Target) => any'.
 node_modules/chrome-devtools-frontend/front_end/sdk/TargetManager.js(319,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/sdk/TargetManager.js(329,32): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/sdk/TargetManager.js(333,36): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; TimelineStarted: number; ProfilesCPUProfileTaken: number; ProfilesHeapProfileTaken: number; AuditsStarted: number; ... 23 more ...; ShowedThirdPartyBadges: number; }'.
+node_modules/chrome-devtools-frontend/front_end/sdk/TargetManager.js(347,36): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; TimelineStarted: number; ProfilesCPUProfileTaken: number; ProfilesHeapProfileTaken: number; AuditsStarted: number; ... 23 more ...; ShowedThirdPartyBadges: number; }'.
 node_modules/chrome-devtools-frontend/front_end/sdk/TargetManager.js(351,42): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sdk/TargetManager.js(352,12): error TS2339: Property 'runtimeAgent' does not exist on type 'Target'.
 node_modules/chrome-devtools-frontend/front_end/sdk/TargetManager.js(356,52): error TS2694: Namespace 'Protocol.InspectorBackend.Connection' has no exported member 'Params'.
@@ -10502,9 +10837,17 @@ node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(283,5): erro
   Type 'NamedObject' is missing the following properties from type 'Process': _threads, _threadByName, id, threadById, and 4 more.
 node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(283,65): error TS2339: Property 'valuesArray' does not exist on type 'Map<string | number, Process>'.
 node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(305,23): error TS2339: Property 'stableSort' does not exist on type 'Event[]'.
+node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(308,49): error TS2345: Argument of type '{ Begin: string; End: string; Complete: string; Instant: string; AsyncBegin: string; AsyncStepInto: string; AsyncStepPast: string; AsyncEnd: string; NestableAsyncBegin: string; NestableAsyncEnd: string; ... 9 more ...; DeleteObject: string; }' is not assignable to parameter of type 'string'.
 node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(338,52): error TS2339: Property 'id' does not exist on type 'Event'.
+node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(342,12): error TS2678: Type 'string' is not comparable to type '{ Begin: string; End: string; Complete: string; Instant: string; AsyncBegin: string; AsyncStepInto: string; AsyncStepPast: string; AsyncEnd: string; NestableAsyncBegin: string; NestableAsyncEnd: string; ... 9 more ...; DeleteObject: string; }'.
+node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(352,12): error TS2678: Type 'string' is not comparable to type '{ Begin: string; End: string; Complete: string; Instant: string; AsyncBegin: string; AsyncStepInto: string; AsyncStepPast: string; AsyncEnd: string; NestableAsyncBegin: string; NestableAsyncEnd: string; ... 9 more ...; DeleteObject: string; }'.
 node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(354,27): error TS2339: Property 'peekLast' does not exist on type 'AsyncEvent[]'.
+node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(357,12): error TS2678: Type 'string' is not comparable to type '{ Begin: string; End: string; Complete: string; Instant: string; AsyncBegin: string; AsyncStepInto: string; AsyncStepPast: string; AsyncEnd: string; NestableAsyncBegin: string; NestableAsyncEnd: string; ... 9 more ...; DeleteObject: string; }'.
 node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(375,71): error TS2339: Property 'id' does not exist on type 'Event'.
+node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(378,9): error TS2367: This condition will always return 'false' since the types '{ Begin: string; End: string; Complete: string; Instant: string; AsyncBegin: string; AsyncStepInto: string; AsyncStepPast: string; AsyncEnd: string; NestableAsyncBegin: string; NestableAsyncEnd: string; ... 9 more ...; DeleteObject: string; }' and 'string' have no overlap.
+node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(392,9): error TS2367: This condition will always return 'false' since the types '{ Begin: string; End: string; Complete: string; Instant: string; AsyncBegin: string; AsyncStepInto: string; AsyncStepPast: string; AsyncEnd: string; NestableAsyncBegin: string; NestableAsyncEnd: string; ... 9 more ...; DeleteObject: string; }' and 'string' have no overlap.
+node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(397,9): error TS2367: This condition will always return 'false' since the types '{ Begin: string; End: string; Complete: string; Instant: string; AsyncBegin: string; AsyncStepInto: string; AsyncStepPast: string; AsyncEnd: string; NestableAsyncBegin: string; NestableAsyncEnd: string; ... 9 more ...; DeleteObject: string; }' and 'string' have no overlap.
+node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(397,48): error TS2367: This condition will always return 'false' since the types '{ Begin: string; End: string; Complete: string; Instant: string; AsyncBegin: string; AsyncStepInto: string; AsyncStepPast: string; AsyncEnd: string; NestableAsyncBegin: string; NestableAsyncEnd: string; ... 9 more ...; DeleteObject: string; }' and 'string' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(398,39): error TS2339: Property 'peekLast' does not exist on type 'Event[]'.
 node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(485,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(526,34): error TS2694: Namespace 'SDK.TracingManager' has no exported member 'EventPayload'.
@@ -10512,9 +10855,12 @@ node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(541,13): err
 node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(543,13): error TS2339: Property 'bind_id' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(576,43): error TS2339: Property 'ordinal' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(576,55): error TS2339: Property 'ordinal' does not exist on type 'Event'.
+node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(637,27): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Begin: string; End: string; Complete: string; Instant: string; AsyncBegin: string; AsyncStepInto: string; AsyncStepPast: string; AsyncEnd: string; NestableAsyncBegin: string; NestableAsyncEnd: string; ... 9 more ...; DeleteObject: string; }'.
 node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(647,34): error TS2694: Namespace 'SDK.TracingManager' has no exported member 'EventPayload'.
 node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(649,15): error TS2577: Return type annotation circularly references itself.
 node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(666,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
+node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(733,9): error TS2367: This condition will always return 'false' since the types '{ Begin: string; End: string; Complete: string; Instant: string; AsyncBegin: string; AsyncStepInto: string; AsyncStepPast: string; AsyncEnd: string; NestableAsyncBegin: string; NestableAsyncEnd: string; ... 9 more ...; DeleteObject: string; }' and 'string' have no overlap.
+node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(733,60): error TS2367: This condition will always return 'false' since the types '{ Begin: string; End: string; Complete: string; Instant: string; AsyncBegin: string; AsyncStepInto: string; AsyncStepPast: string; AsyncEnd: string; NestableAsyncBegin: string; NestableAsyncEnd: string; ... 9 more ...; DeleteObject: string; }' and 'string' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(859,34): error TS2694: Namespace 'SDK.TracingManager' has no exported member 'EventPayload'.
 node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(870,5): error TS2322: Type 'NamedObject[]' is not assignable to type 'Thread[]'.
   Type 'NamedObject' is missing the following properties from type 'Thread': _process, _events, _asyncEvents, _lastTopLevelEvent, and 7 more.
@@ -10567,6 +10913,10 @@ node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(181,22
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(200,46): error TS2694: Namespace 'Protocol' has no exported member 'Security'.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(214,52): error TS2694: Namespace 'Protocol' has no exported member 'Network'.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(242,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
+node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(258,9): error TS2322: Type 'string' is not assignable to type '{ All: string; Displayed: string; Blocked: string; BlockOverridden: string; }'.
+node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(260,7): error TS2322: Type 'string' is not assignable to type '{ All: string; Displayed: string; Blocked: string; BlockOverridden: string; }'.
+node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(262,7): error TS2322: Type 'string' is not assignable to type '{ All: string; Displayed: string; Blocked: string; BlockOverridden: string; }'.
+node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(264,7): error TS2322: Type 'string' is not assignable to type '{ All: string; Displayed: string; Blocked: string; BlockOverridden: string; }'.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(283,24): error TS2694: Namespace 'Protocol' has no exported member 'Security'.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(284,24): error TS2694: Namespace 'Protocol' has no exported member 'Security'.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(285,25): error TS2694: Namespace 'Protocol' has no exported member 'Security'.
@@ -10607,19 +10957,27 @@ node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(669,25
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(670,26): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(671,25): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(672,24): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(698,17): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ All: string; Displayed: string; Blocked: string; BlockOverridden: string; }'.
+node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(702,62): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ All: string; Displayed: string; Blocked: string; BlockOverridden: string; }'.
+node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(711,40): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ All: string; Displayed: string; Blocked: string; BlockOverridden: string; }'.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(712,46): error TS2694: Namespace 'Protocol' has no exported member 'Security'.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(714,25): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(715,29): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(720,56): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ All: string; Displayed: string; Blocked: string; BlockOverridden: string; }'.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(726,24): error TS2694: Namespace 'Protocol' has no exported member 'Security'.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(739,35): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(740,42): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(744,34): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(759,7): error TS2339: Property 'consume' does not exist on type 'Event'.
+node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(761,11): error TS2322: Type 'string' is not assignable to type '{ Domain: string; HasResponseHeader: string; Is: string; LargerThan: string; Method: string; MimeType: string; MixedContent: string; Priority: string; Scheme: string; SetCookieDomain: string; SetCookieName: string; SetCookieValue: string; StatusCode: string; }'.
+node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(761,71): error TS2322: Type '{ All: string; Displayed: string; Blocked: string; BlockOverridden: string; }' is not assignable to type 'string'.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(771,38): error TS2694: Namespace 'Security.SecurityPanel' has no exported member 'Origin'.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(772,38): error TS2694: Namespace 'Security.SecurityPanel' has no exported member 'OriginState'.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(783,37): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(784,75): error TS2554: Expected 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(794,9): error TS2339: Property 'consume' does not exist on type 'Event'.
+node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(797,10): error TS2322: Type 'string' is not assignable to type '{ Domain: string; HasResponseHeader: string; Is: string; LargerThan: string; Method: string; MimeType: string; MixedContent: string; Priority: string; Scheme: string; SetCookieDomain: string; SetCookieName: string; SetCookieValue: string; StatusCode: string; }'.
+node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(798,10): error TS2322: Type 'string' is not assignable to type '{ Domain: string; HasResponseHeader: string; Is: string; LargerThan: string; Method: string; MimeType: string; MixedContent: string; Priority: string; Scheme: string; SetCookieDomain: string; SetCookieName: string; SetCookieValue: string; StatusCode: string; }'.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(803,44): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(804,94): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(808,27): error TS2555: Expected at least 2 arguments, but got 1.
@@ -10736,6 +11094,7 @@ node_modules/chrome-devtools-frontend/front_end/snippets/ScriptSnippetModel.js(2
 node_modules/chrome-devtools-frontend/front_end/snippets/ScriptSnippetModel.js(329,35): error TS2339: Property 'valuesArray' does not exist on type 'Map<DebuggerModel, SnippetScriptMapping>'.
 node_modules/chrome-devtools-frontend/front_end/snippets/ScriptSnippetModel.js(379,33): error TS2339: Property 'remove' does not exist on type 'Map<UISourceCode, Script>'.
 node_modules/chrome-devtools-frontend/front_end/snippets/ScriptSnippetModel.js(380,42): error TS2339: Property 'remove' does not exist on type 'Map<UISourceCode, number>'.
+node_modules/chrome-devtools-frontend/front_end/snippets/ScriptSnippetModel.js(534,35): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Debugger: string; Formatter: string; Network: string; Snippets: string; FileSystem: string; ContentScripts: string; Service: string; }'.
 node_modules/chrome-devtools-frontend/front_end/snippets/ScriptSnippetModel.js(560,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/snippets/ScriptSnippetModel.js(579,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/snippets/SnippetStorage.js(62,27): error TS2339: Property 'valuesArray' does not exist on type 'Map<string, Snippet>'.
@@ -10778,11 +11137,15 @@ node_modules/chrome-devtools-frontend/front_end/source_frame/JSONView.js(170,23)
 node_modules/chrome-devtools-frontend/front_end/source_frame/PreviewFactory.js(14,40): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/source_frame/ResourceSourceFrame.js(51,42): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/source_frame/SourceCodeDiff.js(15,22): error TS2339: Property 'installGutter' does not exist on type 'CodeMirrorTextEditor'.
+node_modules/chrome-devtools-frontend/front_end/source_frame/SourceCodeDiff.js(50,11): error TS2367: This condition will always return 'false' since the types '{ Insert: symbol; Delete: symbol; Modify: symbol; }' and 'symbol' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/source_frame/SourceCodeDiff.js(89,28): error TS2339: Property 'toggleLineClass' does not exist on type 'CodeMirrorTextEditor'.
 node_modules/chrome-devtools-frontend/front_end/source_frame/SourceCodeDiff.js(110,25): error TS2694: Namespace 'Diff.Diff' has no exported member 'DiffArray'.
 node_modules/chrome-devtools-frontend/front_end/source_frame/SourceCodeDiff.js(177,25): error TS2694: Namespace 'Diff.Diff' has no exported member 'DiffArray'.
 node_modules/chrome-devtools-frontend/front_end/source_frame/SourceCodeDiff.js(202,16): error TS2403: Subsequent variable declarations must have the same type.  Variable 'lineNumber' must be of type 'any', but here has type 'number'.
 node_modules/chrome-devtools-frontend/front_end/source_frame/SourceCodeDiff.js(206,41): error TS2339: Property 'diff' does not exist on type 'Map<number, GutterDecoration>'.
+node_modules/chrome-devtools-frontend/front_end/source_frame/SourceCodeDiff.js(250,9): error TS2367: This condition will always return 'false' since the types '{ Insert: symbol; Delete: symbol; Modify: symbol; }' and 'symbol' have no overlap.
+node_modules/chrome-devtools-frontend/front_end/source_frame/SourceCodeDiff.js(252,14): error TS2367: This condition will always return 'false' since the types '{ Insert: symbol; Delete: symbol; Modify: symbol; }' and 'symbol' have no overlap.
+node_modules/chrome-devtools-frontend/front_end/source_frame/SourceCodeDiff.js(254,14): error TS2367: This condition will always return 'false' since the types '{ Insert: symbol; Delete: symbol; Modify: symbol; }' and 'symbol' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/source_frame/SourceCodeDiff.js(275,22): error TS2339: Property 'setGutterDecoration' does not exist on type 'CodeMirrorTextEditor'.
 node_modules/chrome-devtools-frontend/front_end/source_frame/SourceCodeDiff.js(276,22): error TS2339: Property 'toggleLineClass' does not exist on type 'CodeMirrorTextEditor'.
 node_modules/chrome-devtools-frontend/front_end/source_frame/SourceCodeDiff.js(283,22): error TS2339: Property 'setGutterDecoration' does not exist on type 'CodeMirrorTextEditor'.
@@ -10855,6 +11218,7 @@ node_modules/chrome-devtools-frontend/front_end/sources/AddSourceMapURLDialog.js
 node_modules/chrome-devtools-frontend/front_end/sources/AddSourceMapURLDialog.js(22,36): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/AddSourceMapURLDialog.js(27,25): error TS2339: Property 'tabIndex' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/sources/AddSourceMapURLDialog.js(31,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
+node_modules/chrome-devtools-frontend/front_end/sources/AddSourceMapURLDialog.js(37,28): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ SetExactSize: symbol; SetExactWidthMaxHeight: symbol; MeasureContent: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/sources/AddSourceMapURLDialog.js(50,32): error TS2339: Property 'value' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/sources/AddSourceMapURLDialog.js(57,15): error TS2339: Property 'keyCode' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sources/AdvancedSearchView.js(17,52): error TS2339: Property 'createChild' does not exist on type 'Element'.
@@ -10882,6 +11246,7 @@ node_modules/chrome-devtools-frontend/front_end/sources/CSSPlugin.js(197,41): er
 node_modules/chrome-devtools-frontend/front_end/sources/CSSPlugin.js(212,26): error TS2339: Property 'title' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/sources/CSSPlugin.js(212,41): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/CSSPlugin.js(223,11): error TS2339: Property 'consume' does not exist on type 'Event'.
+node_modules/chrome-devtools-frontend/front_end/sources/CSSPlugin.js(247,45): error TS2345: Argument of type '{ Original: string; Nickname: string; HEX: string; ShortHEX: string; HEXA: string; ShortHEXA: string; RGB: string; RGBA: string; HSL: string; HSLA: string; }' is not assignable to parameter of type 'string'.
 node_modules/chrome-devtools-frontend/front_end/sources/CSSPlugin.js(252,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sources/CSSPlugin.js(259,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sources/CSSPlugin.js(266,25): error TS2339: Property 'setColor' does not exist on type 'Element'.
@@ -10894,6 +11259,7 @@ node_modules/chrome-devtools-frontend/front_end/sources/CallStackSidebarPane.js(
 node_modules/chrome-devtools-frontend/front_end/sources/CallStackSidebarPane.js(40,56): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/CallStackSidebarPane.js(42,60): error TS2694: Namespace 'Sources.CallStackSidebarPane' has no exported member 'Item'.
 node_modules/chrome-devtools-frontend/front_end/sources/CallStackSidebarPane.js(44,62): error TS2694: Namespace 'Sources.CallStackSidebarPane' has no exported member 'Item'.
+node_modules/chrome-devtools-frontend/front_end/sources/CallStackSidebarPane.js(45,56): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ NonViewport: symbol; EqualHeightItems: symbol; VariousHeightItems: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/sources/CallStackSidebarPane.js(137,21): error TS2345: Argument of type '{ asyncStackHeader: string; }' is not assignable to parameter of type '{ debuggerCallFrame: CallFrame; debuggerModel: DebuggerModel; }'.
   Object literal may only specify known properties, and 'asyncStackHeader' does not exist in type '{ debuggerCallFrame: CallFrame; debuggerModel: DebuggerModel; }'.
 node_modules/chrome-devtools-frontend/front_end/sources/CallStackSidebarPane.js(163,20): error TS2555: Expected at least 2 arguments, but got 1.
@@ -10985,18 +11351,18 @@ node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptBreakpointsSid
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptBreakpointsSidebarPane.js(199,33): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptBreakpointsSidebarPane.js(203,33): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptBreakpointsSidebarPane.js(206,35): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptCompilerPlugin.js(51,5): error TS2322: Type 'Timer' is not assignable to type 'number'.
+node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptCompilerPlugin.js(51,5): error TS2322: Type 'Timeout' is not assignable to type 'number'.
+node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptCompilerPlugin.js(97,9): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Error: string; Warning: string; }'.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(60,50): error TS2345: Argument of type 'Event' is not assignable to parameter of type 'MouseEvent | KeyboardEvent'.
   Type 'Event' is missing the following properties from type 'KeyboardEvent': altKey, char, charCode, code, and 16 more.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(107,33): error TS2339: Property 'asParsedURL' does not exist on type 'string'.
+node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(128,34): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Warning: string; Info: string; }'.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(128,66): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(132,16): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(134,95): error TS2339: Property 'valuesArray' does not exist on type 'Map<DebuggerModel, ResourceScriptFile>'.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(136,46): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(138,44): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(140,44): error TS2339: Property 'createTextChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(141,62): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(142,65): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(143,41): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(218,20): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(220,20): error TS2555: Expected at least 2 arguments, but got 1.
@@ -11050,12 +11416,15 @@ node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(1270,16): error TS2403: Subsequent variable declarations must have the same type.  Variable 'location' must be of type 'any', but here has type 'UILocation'.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(1286,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(1326,60): error TS2339: Property 'valuesArray' does not exist on type 'Set<BreakpointDecoration>'.
+node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(1400,9): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Warning: string; Info: string; }'.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(1400,38): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(1403,61): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(1425,56): error TS2339: Property 'valuesArray' does not exist on type 'Map<DebuggerModel, ResourceScriptFile>'.
+node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(1442,9): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Warning: string; Info: string; }'.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(1442,38): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(1463,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(1469,63): error TS2694: Namespace 'SourceFrame.SourcesTextEditor' has no exported member 'GutterClickEventData'.
+node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(1506,34): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; TimelineStarted: number; ProfilesCPUProfileTaken: number; ProfilesHeapProfileTaken: number; AuditsStarted: number; ... 23 more ...; ShowedThirdPartyBadges: number; }'.
 node_modules/chrome-devtools-frontend/front_end/sources/NavigatorView.js(87,21): error TS2339: Property '_boostOrder' does not exist on type 'TreeElement'.
 node_modules/chrome-devtools-frontend/front_end/sources/NavigatorView.js(90,32): error TS2339: Property '_typeOrders' does not exist on type 'typeof NavigatorView'.
 node_modules/chrome-devtools-frontend/front_end/sources/NavigatorView.js(102,29): error TS2339: Property '_typeOrders' does not exist on type 'typeof NavigatorView'.
@@ -11153,6 +11522,7 @@ node_modules/chrome-devtools-frontend/front_end/sources/NavigatorView.js(1640,14
 node_modules/chrome-devtools-frontend/front_end/sources/NavigatorView.js(1679,47): error TS2339: Property 'hasFocus' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/sources/ObjectEventListenersSidebarPane.js(11,55): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/ObjectEventListenersSidebarPane.js(84,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
+node_modules/chrome-devtools-frontend/front_end/sources/OpenFileQuickOpen.js(23,34): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; TimelineStarted: number; ProfilesCPUProfileTaken: number; ProfilesHeapProfileTaken: number; AuditsStarted: number; ... 23 more ...; ShowedThirdPartyBadges: number; }'.
 node_modules/chrome-devtools-frontend/front_end/sources/OpenFileQuickOpen.js(54,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/sources/OpenFileQuickOpen.js(65,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/sources/OutlineQuickOpen.js(32,52): error TS2694: Namespace 'Formatter.FormatterWorkerPool' has no exported member 'OutlineItem'.
@@ -11176,6 +11546,7 @@ node_modules/chrome-devtools-frontend/front_end/sources/ScriptFormatterEditorAct
 node_modules/chrome-devtools-frontend/front_end/sources/SimpleHistoryManager.js(37,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/sources/SnippetsPlugin.js(41,46): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/SnippetsPlugin.js(41,80): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/sources/SourceFormatter.js(36,47): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Debugger: string; Formatter: string; Network: string; Snippets: string; FileSystem: string; ContentScripts: string; Service: string; }'.
 node_modules/chrome-devtools-frontend/front_end/sources/SourceFormatter.js(48,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sources/SourceFormatter.js(55,32): error TS2339: Property 'remove' does not exist on type 'Map<UISourceCode, { promise: Promise<SourceFormatData>; formatData: SourceFormatData; }>'.
 node_modules/chrome-devtools-frontend/front_end/sources/SourceFormatter.js(67,32): error TS2339: Property 'remove' does not exist on type 'Map<UISourceCode, { promise: Promise<SourceFormatData>; formatData: SourceFormatData; }>'.
@@ -11376,9 +11747,11 @@ node_modules/chrome-devtools-frontend/front_end/sources/WatchExpressionsSidebarP
 node_modules/chrome-devtools-frontend/front_end/sources/WorkspaceMappingTip.js(28,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sources/WorkspaceMappingTip.js(39,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sources/WorkspaceMappingTip.js(107,25): error TS2339: Property 'asParsedURL' does not exist on type 'string'.
+node_modules/chrome-devtools-frontend/front_end/sources/WorkspaceMappingTip.js(116,9): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Warning: string; Info: string; }'.
 node_modules/chrome-devtools-frontend/front_end/sources/WorkspaceMappingTip.js(116,38): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/WorkspaceMappingTip.js(121,16): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/WorkspaceMappingTip.js(123,16): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/sources/WorkspaceMappingTip.js(138,37): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Warning: string; Info: string; }'.
 node_modules/chrome-devtools-frontend/front_end/sources/WorkspaceMappingTip.js(141,44): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/WorkspaceMappingTip.js(143,44): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/WorkspaceMappingTip.js(145,33): error TS2555: Expected at least 2 arguments, but got 1.
@@ -11610,6 +11983,7 @@ node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(863,24
 node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(1035,19): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(1049,34): error TS2345: Argument of type '(arg0: () => void) => any' is not assignable to parameter of type 'string'.
 node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(1203,19): error TS2339: Property 'naturalOrderComparator' does not exist on type 'StringConstructor'.
+node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(1258,24): error TS2367: This condition will always return 'true' since the types 'string' and '{ Debugger: string; Formatter: string; Network: string; Snippets: string; FileSystem: string; ContentScripts: string; Service: string; }' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(1279,81): error TS2345: Argument of type 'Function' is not assignable to parameter of type '(value: any) => any'.
   Type 'Function' provides no match for the signature '(value: any): any'.
 node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(1304,3): error TS2322: Type 'Promise<void>' is not assignable to type 'Promise<undefined>'.
@@ -11807,6 +12181,8 @@ node_modules/chrome-devtools-frontend/front_end/timeline/CountersGraph.js(414,22
 node_modules/chrome-devtools-frontend/front_end/timeline/CountersGraph.js(426,27): error TS2339: Property 'upperBound' does not exist on type 'any[]'.
 node_modules/chrome-devtools-frontend/front_end/timeline/CountersGraph.js(438,24): error TS2339: Property 'withThousandsSeparator' does not exist on type 'NumberConstructor'.
 node_modules/chrome-devtools-frontend/front_end/timeline/CountersGraph.js(563,19): error TS2339: Property 'preciseMillisToString' does not exist on type 'NumberConstructor'.
+node_modules/chrome-devtools-frontend/front_end/timeline/EventsTimelineTreeView.js(22,54): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Ascending: string; Descending: string; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline/EventsTimelineTreeView.js(33,9): error TS2367: This condition will always return 'false' since the types '{ Frame: string; NetworkRequest: string; TraceEvent: string; Range: string; }' and 'string' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/timeline/EventsTimelineTreeView.js(63,32): error TS2339: Property 'peekLast' does not exist on type 'IterableIterator<Node>[]'.
 node_modules/chrome-devtools-frontend/front_end/timeline/EventsTimelineTreeView.js(91,40): error TS2694: Namespace 'DataGrid.DataGrid' has no exported member 'ColumnDescriptor'.
 node_modules/chrome-devtools-frontend/front_end/timeline/EventsTimelineTreeView.js(95,41): error TS2555: Expected at least 2 arguments, but got 1.
@@ -11814,20 +12190,32 @@ node_modules/chrome-devtools-frontend/front_end/timeline/EventsTimelineTreeView.
 node_modules/chrome-devtools-frontend/front_end/timeline/EventsTimelineTreeView.js(160,31): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/EventsTimelineTreeView.js(183,56): error TS2339: Property 'value' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/timeline/ExtensionTracingSession.js(17,16): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
+node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceModel.js(57,51): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ animation: symbol; console: symbol; userTiming: symbol; input: symbol; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceModel.js(57,89): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ animation: symbol; console: symbol; userTiming: symbol; input: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceModel.js(157,25): error TS2304: Cannot find name 'FileError'.
+node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(24,77): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ Unknown: number; Foreground: number; Background: number; Selection: number; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(26,46): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(28,25): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(29,16): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(33,5): error TS2322: Type 'Map<string, symbol>' is not assignable to type 'Map<string, { CumulativeTime: symbol; CumulativeCount: symbol; }>'.
+  Type 'symbol' is not assignable to type '{ CumulativeTime: symbol; CumulativeCount: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(83,12): error TS2339: Property '_animationId' does not exist on type 'PerformanceMonitor'.
 node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(83,47): error TS2339: Property 'window' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(89,25): error TS2339: Property 'window' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(89,60): error TS2339: Property '_animationId' does not exist on type 'PerformanceMonitor'.
 node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(99,31): error TS2694: Namespace 'Protocol' has no exported member 'Performance'.
 node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(107,9): error TS2739: Type '{}' is missing the following properties from type '{ lastValue: number; lastTimestamp: number; }': lastValue, lastTimestamp
+node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(112,14): error TS2678: Type 'symbol' is not comparable to type '{ CumulativeTime: symbol; CumulativeCount: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(114,22): error TS2339: Property 'constrain' does not exist on type 'NumberConstructor'.
+node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(119,14): error TS2678: Type 'symbol' is not comparable to type '{ CumulativeTime: symbol; CumulativeCount: symbol; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(163,75): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ Unknown: number; Foreground: number; Background: number; Selection: number; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(165,74): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ Unknown: number; Foreground: number; Background: number; Selection: number; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(183,43): error TS2694: Namespace 'Timeline.PerformanceMonitor' has no exported member 'ChartInfo'.
+node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(204,68): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ Unknown: number; Foreground: number; Background: number; Selection: number; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(220,43): error TS2694: Namespace 'Timeline.PerformanceMonitor' has no exported member 'ChartInfo'.
 node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(253,43): error TS2694: Namespace 'Timeline.PerformanceMonitor' has no exported member 'ChartInfo'.
+node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(265,74): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ Unknown: number; Foreground: number; Background: number; Selection: number; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(282,76): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ Unknown: number; Foreground: number; Background: number; Selection: number; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(294,43): error TS2694: Namespace 'Timeline.PerformanceMonitor' has no exported member 'ChartInfo'.
 node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(295,43): error TS2694: Namespace 'Timeline.PerformanceMonitor' has no exported member 'MetricInfo'.
 node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(320,41): error TS2339: Property 'peekLast' does not exist on type '{ timestamp: number; metrics: Map<string, number>; }[]'.
@@ -11845,6 +12233,7 @@ node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(4
 node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(450,22): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(451,22): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(452,22): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(456,69): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ Unknown: number; Foreground: number; Background: number; Selection: number; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(484,51): error TS2694: Namespace 'Timeline.PerformanceMonitor' has no exported member 'ChartInfo'.
 node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(517,43): error TS2694: Namespace 'Timeline.PerformanceMonitor' has no exported member 'ChartInfo'.
 node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(519,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
@@ -11871,8 +12260,12 @@ node_modules/chrome-devtools-frontend/front_end/timeline/TimelineDetailsView.js(
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineDetailsView.js(38,45): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineDetailsView.js(42,45): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineDetailsView.js(46,45): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineDetailsView.js(118,12): error TS2678: Type 'string' is not comparable to type '{ Frame: string; NetworkRequest: string; TraceEvent: string; Range: string; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineDetailsView.js(124,12): error TS2678: Type 'string' is not comparable to type '{ Frame: string; NetworkRequest: string; TraceEvent: string; Range: string; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineDetailsView.js(130,22): error TS2339: Property 'showLayerTree' does not exist on type 'Widget'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineDetailsView.js(132,82): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineDetailsView.js(135,12): error TS2678: Type 'string' is not comparable to type '{ Frame: string; NetworkRequest: string; TraceEvent: string; Range: string; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineDetailsView.js(141,12): error TS2678: Type 'string' is not comparable to type '{ Frame: string; NetworkRequest: string; TraceEvent: string; Range: string; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineDetailsView.js(150,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineDetailsView.js(188,66): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineDetailsView.js(218,64): error TS2555: Expected at least 2 arguments, but got 1.
@@ -11897,19 +12290,40 @@ node_modules/chrome-devtools-frontend/front_end/timeline/TimelineEventOverview.j
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineEventOverview.js(644,87): error TS2339: Property 'bytesToString' does not exist on type 'NumberConstructor'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineEventOverview.js(655,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(60,36): error TS2694: Namespace 'PerfUI.FlameChart' has no exported member 'GroupStyle'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(67,55): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ Unknown: number; Foreground: number; Background: number; Selection: number; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(68,66): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ Unknown: number; Foreground: number; Background: number; Selection: number; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(73,44): error TS2694: Namespace 'PerfUI.FlameChart' has no exported member 'GroupStyle'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(106,9): error TS2367: This condition will always return 'false' since the types '{ Frame: symbol; Event: symbol; InteractionRecord: symbol; ExtensionEvent: symbol; Screenshot: symbol; }' and 'symbol' have no overlap.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(108,11): error TS2367: This condition will always return 'false' since the types '{ Begin: string; End: string; Complete: string; Instant: string; AsyncBegin: string; AsyncStepInto: string; AsyncStepPast: string; AsyncEnd: string; NestableAsyncBegin: string; NestableAsyncEnd: string; ... 9 more ...; DeleteObject: string; }' and 'string' have no overlap.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(108,67): error TS2367: This condition will always return 'false' since the types '{ Begin: string; End: string; Complete: string; Instant: string; AsyncBegin: string; AsyncStepInto: string; AsyncStepPast: string; AsyncEnd: string; NestableAsyncBegin: string; NestableAsyncEnd: string; ... 9 more ...; DeleteObject: string; }' and 'string' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(110,17): error TS2339: Property '_blackboxRoot' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(111,23): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(140,27): error TS2339: Property '_blackboxRoot' does not exist on type 'string | Event | TimelineFrame | Frame'.
-  Property '_blackboxRoot' does not exist on type 'string'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(119,9): error TS2367: This condition will always return 'false' since the types '{ Frame: symbol; Event: symbol; InteractionRecord: symbol; ExtensionEvent: symbol; Screenshot: symbol; }' and 'symbol' have no overlap.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(123,9): error TS2367: This condition will always return 'false' since the types '{ Frame: symbol; Event: symbol; InteractionRecord: symbol; ExtensionEvent: symbol; Screenshot: symbol; }' and 'symbol' have no overlap.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(140,27): error TS2339: Property '_blackboxRoot' does not exist on type 'Event | { Idle: string; Response: string; Scroll: string; Fling: string; Drag: string; Animation: string; Uncategorized: string; } | TimelineFrame | Frame'.
+  Property '_blackboxRoot' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(171,49): error TS2749: 'Image' refers to a value, but is being used as a type here.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(203,31): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(209,66): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ animation: symbol; console: symbol; userTiming: symbol; input: symbol; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(211,68): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ animation: symbol; console: symbol; userTiming: symbol; input: symbol; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(212,91): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ Frame: symbol; Event: symbol; InteractionRecord: symbol; ExtensionEvent: symbol; Screenshot: symbol; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(214,62): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ animation: symbol; console: symbol; userTiming: symbol; input: symbol; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(216,68): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ animation: symbol; console: symbol; userTiming: symbol; input: symbol; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(217,87): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ Frame: symbol; Event: symbol; InteractionRecord: symbol; ExtensionEvent: symbol; Screenshot: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(222,18): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(225,18): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(235,33): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(239,13): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ Frame: symbol; Event: symbol; InteractionRecord: symbol; ExtensionEvent: symbol; Screenshot: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(246,64): error TS2339: Property 'id' does not exist on type 'VirtualThread'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(285,11): error TS2367: This condition will always return 'true' since the types '{ Frame: symbol; Event: symbol; InteractionRecord: symbol; ExtensionEvent: symbol; Screenshot: symbol; }' and 'symbol' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(312,39): error TS2694: Namespace 'PerfUI.FlameChart' has no exported member 'GroupStyle'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(313,9): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ Frame: symbol; Event: symbol; InteractionRecord: symbol; ExtensionEvent: symbol; Screenshot: symbol; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(326,73): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ Frame: symbol; Event: symbol; InteractionRecord: symbol; ExtensionEvent: symbol; Screenshot: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(332,33): error TS2694: Namespace 'PerfUI.FlameChart' has no exported member 'GroupStyle'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(337,23): error TS2367: This condition will always return 'false' since the types '{ Frame: symbol; Event: symbol; InteractionRecord: symbol; ExtensionEvent: symbol; Screenshot: symbol; }' and 'symbol' have no overlap.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(350,41): error TS2345: Argument of type '{ Begin: string; End: string; Complete: string; Instant: string; AsyncBegin: string; AsyncStepInto: string; AsyncStepPast: string; AsyncEnd: string; NestableAsyncBegin: string; NestableAsyncEnd: string; ... 9 more ...; DeleteObject: string; }' is not assignable to parameter of type 'string'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(351,27): error TS2367: This condition will always return 'true' since the types '{ Begin: string; End: string; Complete: string; Instant: string; AsyncBegin: string; AsyncStepInto: string; AsyncStepPast: string; AsyncEnd: string; NestableAsyncBegin: string; NestableAsyncEnd: string; ... 9 more ...; DeleteObject: string; }' and 'string' have no overlap.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(353,43): error TS2345: Argument of type '{ Begin: string; End: string; Complete: string; Instant: string; AsyncBegin: string; AsyncStepInto: string; AsyncStepPast: string; AsyncEnd: string; NestableAsyncBegin: string; NestableAsyncEnd: string; ... 9 more ...; DeleteObject: string; }' is not assignable to parameter of type 'string'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(358,46): error TS2339: Property 'peekLast' does not exist on type 'Event[]'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(360,9): error TS2339: Property '_blackboxRoot' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(362,33): error TS2339: Property 'peekLast' does not exist on type 'Event[]'.
@@ -11917,11 +12331,15 @@ node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataP
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(377,47): error TS2339: Property 'peekLast' does not exist on type 'Event[]'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(417,16): error TS2339: Property 'remove' does not exist on type 'any[]'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(418,16): error TS2339: Property 'remove' does not exist on type 'any[]'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(426,71): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ Frame: symbol; Event: symbol; InteractionRecord: symbol; ExtensionEvent: symbol; Screenshot: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(433,33): error TS2694: Namespace 'PerfUI.FlameChart' has no exported member 'GroupStyle'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(462,9): error TS1345: An expression of type 'void' cannot be tested for truthiness
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(462,50): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(462,87): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ Frame: symbol; Event: symbol; InteractionRecord: symbol; ExtensionEvent: symbol; Screenshot: symbol; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(468,5): error TS2322: Type 'symbol' is not assignable to type '{ Frame: symbol; Event: symbol; InteractionRecord: symbol; ExtensionEvent: symbol; Screenshot: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(475,31): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(476,50): error TS2339: Property 'peekLast' does not exist on type 'any[]'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(478,5): error TS2322: Type 'symbol' is not assignable to type '{ Frame: symbol; Event: symbol; InteractionRecord: symbol; ExtensionEvent: symbol; Screenshot: symbol; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(488,5): error TS2322: Type 'symbol' is not assignable to type '{ Frame: symbol; Event: symbol; InteractionRecord: symbol; ExtensionEvent: symbol; Screenshot: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(492,38): error TS2339: Property 'push' does not exist on type 'number[] | Uint16Array'.
   Property 'push' does not exist on type 'Uint16Array'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(493,42): error TS2339: Property 'push' does not exist on type 'number[] | Float64Array'.
@@ -11930,28 +12348,57 @@ node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataP
   Property 'push' does not exist on type 'Float32Array'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(499,42): error TS2339: Property 'push' does not exist on type 'number[] | Float32Array'.
   Property 'push' does not exist on type 'Float32Array'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(521,9): error TS2367: This condition will always return 'false' since the types '{ Frame: symbol; Event: symbol; InteractionRecord: symbol; ExtensionEvent: symbol; Screenshot: symbol; }' and 'symbol' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(529,40): error TS2339: Property 'millisToString' does not exist on type 'NumberConstructor'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(529,80): error TS2339: Property 'millisToString' does not exist on type 'NumberConstructor'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(530,20): error TS2339: Property 'millisToString' does not exist on type 'NumberConstructor'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(534,16): error TS2367: This condition will always return 'false' since the types '{ Frame: symbol; Event: symbol; InteractionRecord: symbol; ExtensionEvent: symbol; Screenshot: symbol; }' and 'symbol' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(537,38): error TS2339: Property 'preciseMillisToString' does not exist on type 'NumberConstructor'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(538,35): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(538,67): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(541,38): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(548,25): error TS2339: Property 'createChild' does not exist on type 'DocumentFragment'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(577,9): error TS2367: This condition will always return 'false' since the types '{ Frame: symbol; Event: symbol; InteractionRecord: symbol; ExtensionEvent: symbol; Screenshot: symbol; }' and 'symbol' have no overlap.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(579,42): error TS2345: Argument of type '{ Begin: string; End: string; Complete: string; Instant: string; AsyncBegin: string; AsyncStepInto: string; AsyncStepPast: string; AsyncEnd: string; NestableAsyncBegin: string; NestableAsyncEnd: string; ... 9 more ...; DeleteObject: string; }' is not assignable to parameter of type 'string'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(593,9): error TS2367: This condition will always return 'false' since the types '{ Frame: symbol; Event: symbol; InteractionRecord: symbol; ExtensionEvent: symbol; Screenshot: symbol; }' and 'symbol' have no overlap.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(595,9): error TS2367: This condition will always return 'false' since the types '{ Frame: symbol; Event: symbol; InteractionRecord: symbol; ExtensionEvent: symbol; Screenshot: symbol; }' and 'symbol' have no overlap.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(597,9): error TS2367: This condition will always return 'false' since the types '{ Frame: symbol; Event: symbol; InteractionRecord: symbol; ExtensionEvent: symbol; Screenshot: symbol; }' and 'symbol' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(621,36): error TS2339: Property 'preciseMillisToString' does not exist on type 'NumberConstructor'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(654,37): error TS2339: Property 'naturalHeight' does not exist on type 'new (width?: number, height?: number) => HTMLImageElement'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(655,39): error TS2339: Property 'naturalWidth' does not exist on type 'new (width?: number, height?: number) => HTMLImageElement'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(660,23): error TS2345: Argument of type 'new (width?: number, height?: number) => HTMLImageElement' is not assignable to parameter of type 'CanvasImageSource'.
   Type 'new (width?: number, height?: number) => HTMLImageElement' is missing the following properties from type 'OffscreenCanvas': height, width, convertToBlob, getContext, and 4 more.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(684,9): error TS2367: This condition will always return 'false' since the types '{ Frame: symbol; Event: symbol; InteractionRecord: symbol; ExtensionEvent: symbol; Screenshot: symbol; }' and 'symbol' have no overlap.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(689,9): error TS2367: This condition will always return 'false' since the types '{ Frame: symbol; Event: symbol; InteractionRecord: symbol; ExtensionEvent: symbol; Screenshot: symbol; }' and 'symbol' have no overlap.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(694,9): error TS2367: This condition will always return 'false' since the types '{ Frame: symbol; Event: symbol; InteractionRecord: symbol; ExtensionEvent: symbol; Screenshot: symbol; }' and 'symbol' have no overlap.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(704,9): error TS2367: This condition will always return 'false' since the types '{ Frame: symbol; Event: symbol; InteractionRecord: symbol; ExtensionEvent: symbol; Screenshot: symbol; }' and 'symbol' have no overlap.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(748,9): error TS2367: This condition will always return 'false' since the types '{ Frame: symbol; Event: symbol; InteractionRecord: symbol; ExtensionEvent: symbol; Screenshot: symbol; }' and 'symbol' have no overlap.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(750,9): error TS2367: This condition will always return 'false' since the types '{ Frame: symbol; Event: symbol; InteractionRecord: symbol; ExtensionEvent: symbol; Screenshot: symbol; }' and 'symbol' have no overlap.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(753,9): error TS2367: This condition will always return 'false' since the types '{ Frame: symbol; Event: symbol; InteractionRecord: symbol; ExtensionEvent: symbol; Screenshot: symbol; }' and 'symbol' have no overlap.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(781,93): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ Frame: symbol; Event: symbol; InteractionRecord: symbol; ExtensionEvent: symbol; Screenshot: symbol; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(782,82): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ Frame: symbol; Event: symbol; InteractionRecord: symbol; ExtensionEvent: symbol; Screenshot: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(788,33): error TS2694: Namespace 'PerfUI.FlameChart' has no exported member 'GroupStyle'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(816,47): error TS2345: Argument of type '{ Begin: string; End: string; Complete: string; Instant: string; AsyncBegin: string; AsyncStepInto: string; AsyncStepPast: string; AsyncEnd: string; NestableAsyncBegin: string; NestableAsyncEnd: string; ... 9 more ...; DeleteObject: string; }' is not assignable to parameter of type 'string'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(823,43): error TS2367: This condition will always return 'false' since the types '{ Begin: string; End: string; Complete: string; Instant: string; AsyncBegin: string; AsyncStepInto: string; AsyncStepPast: string; AsyncEnd: string; NestableAsyncBegin: string; NestableAsyncEnd: string; ... 9 more ...; DeleteObject: string; }' and 'string' have no overlap.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(861,12): error TS2678: Type 'string' is not comparable to type '{ Begin: string; End: string; Complete: string; Instant: string; AsyncBegin: string; AsyncStepInto: string; AsyncStepPast: string; AsyncEnd: string; NestableAsyncBegin: string; NestableAsyncEnd: string; ... 9 more ...; DeleteObject: string; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(862,44): error TS2339: Property 'id' does not exist on type 'Event'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(864,12): error TS2678: Type 'string' is not comparable to type '{ Begin: string; End: string; Complete: string; Instant: string; AsyncBegin: string; AsyncStepInto: string; AsyncStepPast: string; AsyncEnd: string; NestableAsyncBegin: string; NestableAsyncEnd: string; ... 9 more ...; DeleteObject: string; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(865,63): error TS2339: Property 'id' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(866,44): error TS2339: Property 'id' does not exist on type 'Event'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(868,12): error TS2678: Type 'string' is not comparable to type '{ Begin: string; End: string; Complete: string; Instant: string; AsyncBegin: string; AsyncStepInto: string; AsyncStepPast: string; AsyncEnd: string; NestableAsyncBegin: string; NestableAsyncEnd: string; ... 9 more ...; DeleteObject: string; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(869,63): error TS2339: Property 'id' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(870,47): error TS2339: Property 'id' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(881,45): error TS2339: Property 'millisToString' does not exist on type 'NumberConstructor'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(906,9): error TS2367: This condition will always return 'false' since the types '{ Frame: symbol; Event: symbol; InteractionRecord: symbol; ExtensionEvent: symbol; Screenshot: symbol; }' and 'symbol' have no overlap.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(909,16): error TS2367: This condition will always return 'false' since the types '{ Frame: symbol; Event: symbol; InteractionRecord: symbol; ExtensionEvent: symbol; Screenshot: symbol; }' and 'symbol' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(925,19): error TS2339: Property 'preciseMillisToString' does not exist on type 'NumberConstructor'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(942,23): error TS2367: This condition will always return 'false' since the types '{ Frame: string; NetworkRequest: string; TraceEvent: string; Range: string; }' and 'string' have no overlap.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(1011,31): error TS2367: This condition will always return 'false' since the types '{ Frame: symbol; Event: symbol; InteractionRecord: symbol; ExtensionEvent: symbol; Screenshot: symbol; }' and 'symbol' have no overlap.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartNetworkDataProvider.js(17,53): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ Unknown: number; Foreground: number; Background: number; Selection: number; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartNetworkDataProvider.js(19,64): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ Unknown: number; Foreground: number; Background: number; Selection: number; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartNetworkDataProvider.js(25,48): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartNetworkDataProvider.js(120,9): error TS2367: This condition will always return 'true' since the types '{ Frame: string; NetworkRequest: string; TraceEvent: string; Range: string; }' and 'string' have no overlap.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartNetworkDataProvider.js(210,65): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ Unknown: number; Foreground: number; Background: number; Selection: number; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartNetworkDataProvider.js(217,29): error TS2339: Property 'constrain' does not exist on type 'NumberConstructor'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartNetworkDataProvider.js(306,25): error TS2339: Property 'createChild' does not exist on type 'DocumentFragment'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartNetworkDataProvider.js(309,87): error TS2339: Property 'millisToString' does not exist on type 'NumberConstructor'.
@@ -11980,6 +12427,9 @@ node_modules/chrome-devtools-frontend/front_end/timeline/TimelineHistoryManager.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineHistoryManager.js(227,28): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineHistoryManager.js(248,48): error TS2694: Namespace 'Timeline.TimelineHistoryManager' has no exported member 'PreviewData'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineHistoryManager.js(256,33): error TS2339: Property 'PreviewData' does not exist on type 'typeof TimelineHistoryManager'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineHistoryManager.js(271,37): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ SetExactSize: symbol; SetExactWidthMaxHeight: symbol; MeasureContent: symbol; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineHistoryManager.js(273,46): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ BlockedByGlassPane: symbol; PierceGlassPane: symbol; PierceContents: symbol; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineHistoryManager.js(274,39): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ PreferTop: symbol; PreferBottom: symbol; PreferLeft: symbol; PreferRight: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineHistoryManager.js(278,37): error TS2339: Property 'createChild' does not exist on type 'DocumentFragment'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineHistoryManager.js(281,55): error TS2345: Argument of type 'this' is not assignable to parameter of type '{ createElementForItem(item: T): Element; heightForItem(item: T): number; isItemSelectable(item: T): boolean; selectedItemChanged(from: T, to: T, fromElement: Element, toElement: Element): void; }'.
   Type 'DropDown' is not assignable to type '{ createElementForItem(item: T): Element; heightForItem(item: T): number; isItemSelectable(item: T): boolean; selectedItemChanged(from: T, to: T, fromElement: Element, toElement: Element): void; }'.
@@ -12015,6 +12465,7 @@ node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(100,53
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(111,60): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(131,32): error TS2339: Property 'addEventListener' does not exist on type 'typeof extensionServer'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(168,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(195,5): error TS2322: Type '{ Idle: symbol; StartPending: symbol; Recording: symbol; StopPending: symbol; Loading: symbol; }' is not assignable to type 'symbol'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(214,53): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(219,52): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(221,52): error TS2555: Expected at least 2 arguments, but got 1.
@@ -12026,6 +12477,7 @@ node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(277,16
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(284,48): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(289,44): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(298,23): error TS2694: Namespace 'Common' has no exported member 'Event'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(334,20): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ Idle: symbol; StartPending: symbol; Recording: symbol; StopPending: symbol; Loading: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(340,33): error TS2339: Property 'remove' does not exist on type 'Node'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(362,37): error TS2339: Property 'toISO8601Compact' does not exist on type 'Date'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(396,31): error TS2339: Property 'click' does not exist on type 'Node'.
@@ -12037,9 +12489,14 @@ node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(461,57
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(462,56): error TS2345: Argument of type 'number' is not assignable to parameter of type 'boolean'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(467,24): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(471,52): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(491,20): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ Idle: symbol; StartPending: symbol; Recording: symbol; StopPending: symbol; Loading: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(494,60): error TS2339: Property 'traceProviders' does not exist on type 'typeof extensionServer'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(514,44): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(515,49): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(517,20): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ Idle: symbol; StartPending: symbol; Recording: symbol; StopPending: symbol; Loading: symbol; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(545,36): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; TimelineStarted: number; ProfilesCPUProfileTaken: number; ProfilesHeapProfileTaken: number; AuditsStarted: number; ... 23 more ...; ShowedThirdPartyBadges: number; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(556,34): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; TimelineStarted: number; ProfilesCPUProfileTaken: number; ProfilesHeapProfileTaken: number; AuditsStarted: number; ... 23 more ...; ShowedThirdPartyBadges: number; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(624,20): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ Idle: symbol; StartPending: symbol; Recording: symbol; StopPending: symbol; Loading: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(626,42): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(627,47): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(637,47): error TS2555: Expected at least 2 arguments, but got 1.
@@ -12051,11 +12508,19 @@ node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(694,56
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(719,42): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(732,49): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(739,42): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(748,20): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ Idle: symbol; StartPending: symbol; Recording: symbol; StopPending: symbol; Loading: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(773,42): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(800,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(827,12): error TS2678: Type 'string' is not comparable to type '{ Frame: string; NetworkRequest: string; TraceEvent: string; Range: string; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(829,12): error TS2678: Type 'string' is not comparable to type '{ Frame: string; NetworkRequest: string; TraceEvent: string; Range: string; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(831,12): error TS2678: Type 'string' is not comparable to type '{ Frame: string; NetworkRequest: string; TraceEvent: string; Range: string; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(850,20): error TS2339: Property 'constrain' does not exist on type 'NumberConstructor'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(878,29): error TS2339: Property 'upperBound' does not exist on type 'Event[]'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(1029,24): error TS2339: Property 'ModelSelectionData' does not exist on type 'typeof TimelinePanel'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(1050,43): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Frame: string; NetworkRequest: string; TraceEvent: string; Range: string; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(1059,9): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Frame: string; NetworkRequest: string; TraceEvent: string; Range: string; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(1069,9): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Frame: string; NetworkRequest: string; TraceEvent: string; Range: string; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(1078,43): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Frame: string; NetworkRequest: string; TraceEvent: string; Range: string; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(1125,1): error TS8022: JSDoc '@extends' is not attached to a class.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(1129,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(1134,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
@@ -12071,6 +12536,7 @@ node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(1220,2
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(1224,29): error TS2339: Property 'classList' does not exist on type 'Node & ParentNode'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(1234,22): error TS2339: Property 'focus' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(65,58): error TS2694: Namespace 'DataGrid.DataGrid' has no exported member 'ColumnDescriptor'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(76,36): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Nearest: string; First: string; Last: string; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(134,53): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(162,76): error TS2339: Property 'value' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(173,59): error TS2555: Expected at least 2 arguments, but got 1.
@@ -12108,14 +12574,25 @@ node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(777
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(779,61): error TS2345: Argument of type '{ label: any; value: string; }[]' is not assignable to parameter of type '{ value: string; label: string; title: string; default: boolean; }[]'.
   Type '{ label: any; value: string; }' is missing the following properties from type '{ value: string; label: string; title: string; default: boolean; }': title, default
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(781,84): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(836,12): error TS2678: Type 'string' is not comparable to type '{ None: string; EventName: string; Category: string; Domain: string; Subdomain: string; Product: string; URL: string; Frame: string; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(838,12): error TS2678: Type 'string' is not comparable to type '{ None: string; EventName: string; Category: string; Domain: string; Subdomain: string; Product: string; URL: string; Frame: string; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(840,12): error TS2678: Type 'string' is not comparable to type '{ None: string; EventName: string; Category: string; Domain: string; Subdomain: string; Product: string; URL: string; Frame: string; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(842,12): error TS2678: Type 'string' is not comparable to type '{ None: string; EventName: string; Category: string; Domain: string; Subdomain: string; Product: string; URL: string; Frame: string; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(844,12): error TS2678: Type 'string' is not comparable to type '{ None: string; EventName: string; Category: string; Domain: string; Subdomain: string; Product: string; URL: string; Frame: string; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(846,12): error TS2678: Type 'string' is not comparable to type '{ None: string; EventName: string; Category: string; Domain: string; Subdomain: string; Product: string; URL: string; Frame: string; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(848,12): error TS2678: Type 'string' is not comparable to type '{ None: string; EventName: string; Category: string; Domain: string; Subdomain: string; Product: string; URL: string; Frame: string; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(850,12): error TS2678: Type 'string' is not comparable to type '{ None: string; EventName: string; Category: string; Domain: string; Subdomain: string; Product: string; URL: string; Frame: string; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(871,25): error TS2339: Property 'asParsedURL' does not exist on type 'string'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(896,25): error TS2339: Property 'asParsedURL' does not exist on type 'string'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(910,25): error TS2339: Property 'asParsedURL' does not exist on type 'string'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(977,50): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Ascending: string; Descending: string; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(999,49): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Ascending: string; Descending: string; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(1019,31): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(1020,33): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(1022,56): error TS2694: Namespace 'DataGrid.DataGrid' has no exported member 'ColumnDescriptor'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(1023,35): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(1024,38): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(1027,36): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Nearest: string; First: string; Last: string; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(40,34): error TS2339: Property '_eventStylesMap' does not exist on type 'typeof TimelineUIUtils'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(41,39): error TS2339: Property '_eventStylesMap' does not exist on type 'typeof TimelineUIUtils'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(47,77): error TS2555: Expected at least 2 arguments, but got 1.
@@ -12232,8 +12709,11 @@ node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(247,
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(248,41): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(251,37): error TS2339: Property '_inputEventToDisplayName' does not exist on type 'typeof TimelineUIUtils'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(255,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(264,12): error TS2678: Type 'string' is not comparable to type '{ 'Compile': string; 'Parse': string; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(265,23): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(266,12): error TS2678: Type 'string' is not comparable to type '{ 'Compile': string; 'Parse': string; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(267,23): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(336,15): error TS2352: Conversion of type 'string' to type '{ Char: string; Click: string; ContextMenu: string; FlingCancel: string; FlingStart: string; ImplSideFling: string; KeyDown: string; KeyDownRaw: string; KeyUp: string; LatencyScrollUpdate: string; ... 18 more ...; TouchStart: string; }' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(373,25): error TS2339: Property 'asParsedURL' does not exist on type 'string'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(412,40): error TS2339: Property '_interactionPhaseStylesMap' does not exist on type 'typeof TimelineUIUtils'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(418,54): error TS2555: Expected at least 2 arguments, but got 1.
@@ -12244,6 +12724,15 @@ node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(425,
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(429,52): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(432,32): error TS2339: Property '_interactionPhaseStylesMap' does not exist on type 'typeof TimelineUIUtils'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(454,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(469,9): error TS2322: Type 'symbol' is not assignable to type '{ HTML: symbol; Script: symbol; Style: symbol; Media: symbol; Other: symbol; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(473,9): error TS2322: Type 'symbol' is not assignable to type '{ HTML: symbol; Script: symbol; Style: symbol; Media: symbol; Other: symbol; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(475,9): error TS2322: Type 'symbol' is not assignable to type '{ HTML: symbol; Script: symbol; Style: symbol; Media: symbol; Other: symbol; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(486,9): error TS2322: Type 'symbol' is not assignable to type '{ HTML: symbol; Script: symbol; Style: symbol; Media: symbol; Other: symbol; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(488,9): error TS2322: Type 'symbol' is not assignable to type '{ HTML: symbol; Script: symbol; Style: symbol; Media: symbol; Other: symbol; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(499,12): error TS2678: Type 'symbol' is not comparable to type '{ HTML: symbol; Script: symbol; Style: symbol; Media: symbol; Other: symbol; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(501,12): error TS2678: Type 'symbol' is not comparable to type '{ HTML: symbol; Script: symbol; Style: symbol; Media: symbol; Other: symbol; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(503,12): error TS2678: Type 'symbol' is not comparable to type '{ HTML: symbol; Script: symbol; Style: symbol; Media: symbol; Other: symbol; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(505,12): error TS2678: Type 'symbol' is not comparable to type '{ HTML: symbol; Script: symbol; Style: symbol; Media: symbol; Other: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(526,62): error TS2339: Property 'bytesToString' does not exist on type 'NumberConstructor'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(557,13): error TS2403: Subsequent variable declarations must have the same type.  Variable 'url' must be of type 'string', but here has type 'any'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(564,13): error TS2403: Subsequent variable declarations must have the same type.  Variable 'url' must be of type 'string', but here has type 'any'.
@@ -12297,6 +12786,7 @@ node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(953,
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(955,46): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(957,46): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(960,44): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(963,13): error TS2367: This condition will always return 'false' since the types '{ Begin: string; End: string; Complete: string; Instant: string; AsyncBegin: string; AsyncStepInto: string; AsyncStepPast: string; AsyncEnd: string; NestableAsyncBegin: string; NestableAsyncEnd: string; ... 9 more ...; DeleteObject: string; }' and 'string' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(964,46): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(972,52): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(977,20): error TS2555: Expected at least 2 arguments, but got 1.
@@ -12358,6 +12848,7 @@ node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(1360
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(1403,37): error TS2339: Property 'valuesArray' does not exist on type 'Map<string, InvalidationTrackingEvent[]>'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(1412,13): error TS2339: Property 'addAll' does not exist on type 'Set<number>'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(1431,24): error TS2339: Property 'binaryIndexOf' does not exist on type 'Event[]'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(1452,39): error TS2345: Argument of type '{ Begin: string; End: string; Complete: string; Instant: string; AsyncBegin: string; AsyncStepInto: string; AsyncStepPast: string; AsyncEnd: string; NestableAsyncBegin: string; NestableAsyncEnd: string; ... 9 more ...; DeleteObject: string; }' is not assignable to parameter of type 'string'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(1481,25): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(1483,41): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(1484,46): error TS2555: Expected at least 2 arguments, but got 1.
@@ -12461,12 +12952,54 @@ node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(2373
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineFrameModel.js(73,29): error TS2339: Property 'lowerBound' does not exist on type 'any[]'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineFrameModel.js(74,28): error TS2339: Property 'lowerBound' does not exist on type 'any[]'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineFrameModel.js(223,43): error TS2339: Property 'peekLast' does not exist on type 'any[]'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineFrameModel.js(266,9): error TS2367: This condition will always return 'false' since the types '{ Begin: string; End: string; Complete: string; Instant: string; AsyncBegin: string; AsyncStepInto: string; AsyncStepPast: string; AsyncEnd: string; NestableAsyncBegin: string; NestableAsyncEnd: string; ... 9 more ...; DeleteObject: string; }' and 'string' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineFrameModel.js(267,24): error TS2339: Property 'id' does not exist on type 'Event'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(61,14): error TS2678: Type 'string' is not comparable to type '{ Char: string; Click: string; ContextMenu: string; FlingCancel: string; FlingStart: string; ImplSideFling: string; KeyDown: string; KeyDownRaw: string; KeyUp: string; LatencyScrollUpdate: string; ... 18 more ...; TouchStart: string; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(62,61): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Idle: string; Response: string; Scroll: string; Fling: string; Drag: string; Animation: string; Uncategorized: string; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(66,14): error TS2678: Type 'string' is not comparable to type '{ Char: string; Click: string; ContextMenu: string; FlingCancel: string; FlingStart: string; ImplSideFling: string; KeyDown: string; KeyDownRaw: string; KeyUp: string; LatencyScrollUpdate: string; ... 18 more ...; TouchStart: string; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(68,81): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Idle: string; Response: string; Scroll: string; Fling: string; Drag: string; Animation: string; Uncategorized: string; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(70,63): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Idle: string; Response: string; Scroll: string; Fling: string; Drag: string; Animation: string; Uncategorized: string; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(74,14): error TS2678: Type 'string' is not comparable to type '{ Char: string; Click: string; ContextMenu: string; FlingCancel: string; FlingStart: string; ImplSideFling: string; KeyDown: string; KeyDownRaw: string; KeyUp: string; LatencyScrollUpdate: string; ... 18 more ...; TouchStart: string; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(76,61): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Idle: string; Response: string; Scroll: string; Fling: string; Drag: string; Animation: string; Uncategorized: string; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(79,14): error TS2678: Type 'string' is not comparable to type '{ Char: string; Click: string; ContextMenu: string; FlingCancel: string; FlingStart: string; ImplSideFling: string; KeyDown: string; KeyDownRaw: string; KeyUp: string; LatencyScrollUpdate: string; ... 18 more ...; TouchStart: string; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(88,14): error TS2678: Type 'string' is not comparable to type '{ Char: string; Click: string; ContextMenu: string; FlingCancel: string; FlingStart: string; ImplSideFling: string; KeyDown: string; KeyDownRaw: string; KeyUp: string; LatencyScrollUpdate: string; ... 18 more ...; TouchStart: string; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(92,78): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Idle: string; Response: string; Scroll: string; Fling: string; Drag: string; Animation: string; Uncategorized: string; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(96,14): error TS2678: Type 'string' is not comparable to type '{ Char: string; Click: string; ContextMenu: string; FlingCancel: string; FlingStart: string; ImplSideFling: string; KeyDown: string; KeyDownRaw: string; KeyUp: string; LatencyScrollUpdate: string; ... 18 more ...; TouchStart: string; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(97,61): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Idle: string; Response: string; Scroll: string; Fling: string; Drag: string; Animation: string; Uncategorized: string; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(100,14): error TS2678: Type 'string' is not comparable to type '{ Char: string; Click: string; ContextMenu: string; FlingCancel: string; FlingStart: string; ImplSideFling: string; KeyDown: string; KeyDownRaw: string; KeyUp: string; LatencyScrollUpdate: string; ... 18 more ...; TouchStart: string; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(101,14): error TS2678: Type 'string' is not comparable to type '{ Char: string; Click: string; ContextMenu: string; FlingCancel: string; FlingStart: string; ImplSideFling: string; KeyDown: string; KeyDownRaw: string; KeyUp: string; LatencyScrollUpdate: string; ... 18 more ...; TouchStart: string; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(102,14): error TS2678: Type 'string' is not comparable to type '{ Char: string; Click: string; ContextMenu: string; FlingCancel: string; FlingStart: string; ImplSideFling: string; KeyDown: string; KeyDownRaw: string; KeyUp: string; LatencyScrollUpdate: string; ... 18 more ...; TouchStart: string; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(103,14): error TS2678: Type 'string' is not comparable to type '{ Char: string; Click: string; ContextMenu: string; FlingCancel: string; FlingStart: string; ImplSideFling: string; KeyDown: string; KeyDownRaw: string; KeyUp: string; LatencyScrollUpdate: string; ... 18 more ...; TouchStart: string; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(104,14): error TS2678: Type 'string' is not comparable to type '{ Char: string; Click: string; ContextMenu: string; FlingCancel: string; FlingStart: string; ImplSideFling: string; KeyDown: string; KeyDownRaw: string; KeyUp: string; LatencyScrollUpdate: string; ... 18 more ...; TouchStart: string; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(105,14): error TS2678: Type 'string' is not comparable to type '{ Char: string; Click: string; ContextMenu: string; FlingCancel: string; FlingStart: string; ImplSideFling: string; KeyDown: string; KeyDownRaw: string; KeyUp: string; LatencyScrollUpdate: string; ... 18 more ...; TouchStart: string; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(106,14): error TS2678: Type 'string' is not comparable to type '{ Char: string; Click: string; ContextMenu: string; FlingCancel: string; FlingStart: string; ImplSideFling: string; KeyDown: string; KeyDownRaw: string; KeyUp: string; LatencyScrollUpdate: string; ... 18 more ...; TouchStart: string; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(107,14): error TS2678: Type 'string' is not comparable to type '{ Char: string; Click: string; ContextMenu: string; FlingCancel: string; FlingStart: string; ImplSideFling: string; KeyDown: string; KeyDownRaw: string; KeyUp: string; LatencyScrollUpdate: string; ... 18 more ...; TouchStart: string; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(108,63): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Idle: string; Response: string; Scroll: string; Fling: string; Drag: string; Animation: string; Uncategorized: string; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(111,14): error TS2678: Type 'string' is not comparable to type '{ Char: string; Click: string; ContextMenu: string; FlingCancel: string; FlingStart: string; ImplSideFling: string; KeyDown: string; KeyDownRaw: string; KeyUp: string; LatencyScrollUpdate: string; ... 18 more ...; TouchStart: string; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(124,14): error TS2678: Type 'string' is not comparable to type '{ Char: string; Click: string; ContextMenu: string; FlingCancel: string; FlingStart: string; ImplSideFling: string; KeyDown: string; KeyDownRaw: string; KeyUp: string; LatencyScrollUpdate: string; ... 18 more ...; TouchStart: string; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(128,14): error TS2678: Type 'string' is not comparable to type '{ Char: string; Click: string; ContextMenu: string; FlingCancel: string; FlingStart: string; ImplSideFling: string; KeyDown: string; KeyDownRaw: string; KeyUp: string; LatencyScrollUpdate: string; ... 18 more ...; TouchStart: string; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(130,61): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Idle: string; Response: string; Scroll: string; Fling: string; Drag: string; Animation: string; Uncategorized: string; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(133,82): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Idle: string; Response: string; Scroll: string; Fling: string; Drag: string; Animation: string; Uncategorized: string; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(137,14): error TS2678: Type 'string' is not comparable to type '{ Char: string; Click: string; ContextMenu: string; FlingCancel: string; FlingStart: string; ImplSideFling: string; KeyDown: string; KeyDownRaw: string; KeyUp: string; LatencyScrollUpdate: string; ... 18 more ...; TouchStart: string; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(141,14): error TS2678: Type 'string' is not comparable to type '{ Char: string; Click: string; ContextMenu: string; FlingCancel: string; FlingStart: string; ImplSideFling: string; KeyDown: string; KeyDownRaw: string; KeyUp: string; LatencyScrollUpdate: string; ... 18 more ...; TouchStart: string; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(146,14): error TS2678: Type 'string' is not comparable to type '{ Char: string; Click: string; ContextMenu: string; FlingCancel: string; FlingStart: string; ImplSideFling: string; KeyDown: string; KeyDownRaw: string; KeyUp: string; LatencyScrollUpdate: string; ... 18 more ...; TouchStart: string; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(148,69): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Idle: string; Response: string; Scroll: string; Fling: string; Drag: string; Animation: string; Uncategorized: string; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(149,65): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Idle: string; Response: string; Scroll: string; Fling: string; Drag: string; Animation: string; Uncategorized: string; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(151,61): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Idle: string; Response: string; Scroll: string; Fling: string; Drag: string; Animation: string; Uncategorized: string; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(156,14): error TS2678: Type 'string' is not comparable to type '{ Char: string; Click: string; ContextMenu: string; FlingCancel: string; FlingStart: string; ImplSideFling: string; KeyDown: string; KeyDownRaw: string; KeyUp: string; LatencyScrollUpdate: string; ... 18 more ...; TouchStart: string; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(157,63): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Idle: string; Response: string; Scroll: string; Fling: string; Drag: string; Animation: string; Uncategorized: string; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(161,14): error TS2678: Type 'string' is not comparable to type '{ Char: string; Click: string; ContextMenu: string; FlingCancel: string; FlingStart: string; ImplSideFling: string; KeyDown: string; KeyDownRaw: string; KeyUp: string; LatencyScrollUpdate: string; ... 18 more ...; TouchStart: string; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(164,80): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Idle: string; Response: string; Scroll: string; Fling: string; Drag: string; Animation: string; Uncategorized: string; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(166,63): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Idle: string; Response: string; Scroll: string; Fling: string; Drag: string; Animation: string; Uncategorized: string; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(188,67): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Idle: string; Response: string; Scroll: string; Fling: string; Drag: string; Animation: string; Uncategorized: string; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(255,20): error TS2352: Conversion of type 'string' to type '{ Char: string; Click: string; ContextMenu: string; FlingCancel: string; FlingStart: string; ImplSideFling: string; KeyDown: string; KeyDownRaw: string; KeyUp: string; LatencyScrollUpdate: string; ... 18 more ...; TouchStart: string; }' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(259,16): error TS2352: Conversion of type 'string' to type '{ Char: string; Click: string; ContextMenu: string; FlingCancel: string; FlingStart: string; ImplSideFling: string; KeyDown: string; KeyDownRaw: string; KeyUp: string; LatencyScrollUpdate: string; ... 18 more ...; TouchStart: string; }' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineJSProfile.js(18,47): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineJSProfile.js(31,50): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineJSProfile.js(31,89): error TS2339: Property 'depth' does not exist on type 'CPUProfileNode'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineJSProfile.js(33,38): error TS2739: Type 'ProfileNode' is missing the following properties from type 'CPUProfileNode': positionTicks, deoptReason
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineJSProfile.js(34,50): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineJSProfile.js(38,11): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Begin: string; End: string; Complete: string; Instant: string; AsyncBegin: string; AsyncStepInto: string; AsyncStepPast: string; AsyncEnd: string; NestableAsyncBegin: string; NestableAsyncEnd: string; ... 9 more ...; DeleteObject: string; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineJSProfile.js(51,26): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineJSProfile.js(52,26): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineJSProfile.js(89,9): error TS2339: Property 'ordinal' does not exist on type 'Event'.
@@ -12475,21 +13008,27 @@ node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineJSProfile
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineJSProfile.js(142,33): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineJSProfile.js(172,35): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineJSProfile.js(179,35): error TS2339: Property 'peekLast' does not exist on type 'any[]'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineJSProfile.js(192,22): error TS2339: Property 'ordinal' does not exist on type 'Event'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineJSProfile.js(190,82): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Begin: string; End: string; Complete: string; Instant: string; AsyncBegin: string; AsyncStepInto: string; AsyncStepPast: string; AsyncEnd: string; NestableAsyncBegin: string; NestableAsyncEnd: string; ... 9 more ...; DeleteObject: string; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineJSProfile.js(192,34): error TS2339: Property 'ordinal' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineJSProfile.js(209,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineJSProfile.js(222,7): error TS2322: Type 'string' is not assignable to type '{ 'Compile': string; 'Parse': string; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineJSProfile.js(224,7): error TS2322: Type 'string' is not assignable to type '{ 'Compile': string; 'Parse': string; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineJSProfile.js(230,42): error TS2694: Namespace 'SDK.TracingManager' has no exported member 'EventPayload'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineJSProfile.js(289,37): error TS2694: Namespace 'SDK.TracingManager' has no exported member 'EventPayload'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineJSProfile.js(292,50): error TS2694: Namespace 'SDK.TracingManager' has no exported member 'EventPayload'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(41,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(42,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(59,41): error TS2345: Argument of type '{ Begin: string; End: string; Complete: string; Instant: string; AsyncBegin: string; AsyncStepInto: string; AsyncStepPast: string; AsyncEnd: string; NestableAsyncBegin: string; NestableAsyncEnd: string; ... 9 more ...; DeleteObject: string; }' is not assignable to parameter of type 'string'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(59,82): error TS2345: Argument of type '{ Begin: string; End: string; Complete: string; Instant: string; AsyncBegin: string; AsyncStepInto: string; AsyncStepPast: string; AsyncEnd: string; NestableAsyncBegin: string; NestableAsyncEnd: string; ... 9 more ...; DeleteObject: string; }' is not assignable to parameter of type 'string'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(61,36): error TS2339: Property 'peekLast' does not exist on type 'Event[]'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(69,51): error TS2339: Property 'peekLast' does not exist on type 'Event[]'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(69,51): error TS2339: Property 'peekLast' does not exist on type 'any[]'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(81,24): error TS2339: Property 'upperBound' does not exist on type 'Event[]'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(216,44): error TS2694: Namespace 'TimelineModel.TimelineModel' has no exported member 'MetadataEvents'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(274,54): error TS2339: Property 'valuesArray' does not exist on type 'Set<any>'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(294,81): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Begin: string; End: string; Complete: string; Instant: string; AsyncBegin: string; AsyncStepInto: string; AsyncStepPast: string; AsyncEnd: string; NestableAsyncBegin: string; NestableAsyncEnd: string; ... 9 more ...; DeleteObject: string; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(306,41): error TS2339: Property 'lowerBound' does not exist on type 'Event[]'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(314,70): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Begin: string; End: string; Complete: string; Instant: string; AsyncBegin: string; AsyncStepInto: string; AsyncStepPast: string; AsyncEnd: string; NestableAsyncBegin: string; NestableAsyncEnd: string; ... 9 more ...; DeleteObject: string; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(317,32): error TS2339: Property 'lowerBound' does not exist on type 'Event[]'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(320,29): error TS2339: Property 'lowerBound' does not exist on type 'Event[]'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(377,34): error TS2339: Property 'peekLast' does not exist on type 'Event[]'.
@@ -12499,15 +13038,20 @@ node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(439,32): error TS2339: Property 'mergeOrdered' does not exist on type 'Event[]'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(470,20): error TS2339: Property 'lowerBound' does not exist on type 'Event[]'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(476,46): error TS2339: Property 'peekLast' does not exist on type 'any[]'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(480,42): error TS2345: Argument of type '{ Begin: string; End: string; Complete: string; Instant: string; AsyncBegin: string; AsyncStepInto: string; AsyncStepPast: string; AsyncEnd: string; NestableAsyncBegin: string; NestableAsyncEnd: string; ... 9 more ...; DeleteObject: string; }' is not assignable to parameter of type 'string'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(482,35): error TS2339: Property 'peekLast' does not exist on type 'any[]'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(542,37): error TS2339: Property 'lowerBound' does not exist on type 'AsyncEvent[]'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(601,68): error TS2339: Property 'peekLast' does not exist on type 'any[]'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(607,46): error TS2339: Property 'peekLast' does not exist on type 'any[]'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(762,13): error TS2403: Subsequent variable declarations must have the same type.  Variable 'frameId' must be of type 'any', but here has type 'string'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(801,40): error TS2339: Property 'bind_id' does not exist on type 'Event'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(811,7): error TS2322: Type 'symbol' is not assignable to type '{ animation: symbol; console: symbol; userTiming: symbol; input: symbol; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(813,7): error TS2322: Type 'symbol' is not assignable to type '{ animation: symbol; console: symbol; userTiming: symbol; input: symbol; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(815,7): error TS2322: Type 'symbol' is not assignable to type '{ animation: symbol; console: symbol; userTiming: symbol; input: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(818,39): error TS2339: Property 'peekLast' does not exist on type 'Event[]'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(823,18): error TS2339: Property 'causedFrame' does not exist on type 'AsyncEvent'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(827,109): error TS2339: Property 'causedFrame' does not exist on type 'AsyncEvent'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(836,7): error TS2322: Type 'symbol' is not assignable to type '{ animation: symbol; console: symbol; userTiming: symbol; input: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(861,23): error TS2339: Property 'mergeOrdered' does not exist on type 'AsyncEvent[]'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(1260,29): error TS2339: Property 'MetadataEvents' does not exist on type 'typeof TimelineModel'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(1423,31): error TS2694: Namespace 'TimelineModel' has no exported member 'InvalidationCause'.
@@ -12524,11 +13068,18 @@ node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(1732,45): error TS2339: Property '_typeToInitiator' does not exist on type 'typeof TimelineAsyncEventTracker'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(1736,49): error TS2339: Property '_typeToInitiator' does not exist on type 'typeof TimelineAsyncEventTracker'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(1744,65): error TS2339: Property '_typeToInitiator' does not exist on type 'typeof TimelineAsyncEventTracker'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(1745,13): error TS2352: Conversion of type 'string' to type '{ Task: string; Program: string; EventDispatch: string; GPUTask: string; Animation: string; RequestMainThreadFrame: string; BeginFrame: string; NeedsBeginFrameChanged: string; BeginMainThreadFrame: string; ... 102 more ...; AsyncTask: string; }' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(1748,27): error TS2352: Conversion of type 'string' to type '{ Task: string; Program: string; EventDispatch: string; GPUTask: string; Animation: string; RequestMainThreadFrame: string; BeginFrame: string; NeedsBeginFrameChanged: string; BeginMainThreadFrame: string; ... 102 more ...; AsyncTask: string; }' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(1749,65): error TS2339: Property '_asyncEvents' does not exist on type 'typeof TimelineAsyncEventTracker'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(1780,33): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(1811,25): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(1819,32): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModelFilter.js(30,35): error TS2345: Argument of type '{ Task: string; Program: string; EventDispatch: string; GPUTask: string; Animation: string; RequestMainThreadFrame: string; BeginFrame: string; NeedsBeginFrameChanged: string; BeginMainThreadFrame: string; ... 102 more ...; AsyncTask: string; }' is not assignable to parameter of type 'string'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModelFilter.js(38,7): error TS2322: Type 'string' is not assignable to type '{ Task: string; Program: string; EventDispatch: string; GPUTask: string; Animation: string; RequestMainThreadFrame: string; BeginFrame: string; NeedsBeginFrameChanged: string; BeginMainThreadFrame: string; ... 102 more ...; AsyncTask: string; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModelFilter.js(40,7): error TS2322: Type 'string' is not assignable to type '{ Task: string; Program: string; EventDispatch: string; GPUTask: string; Animation: string; RequestMainThreadFrame: string; BeginFrame: string; NeedsBeginFrameChanged: string; BeginMainThreadFrame: string; ... 102 more ...; AsyncTask: string; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModelFilter.js(42,7): error TS2322: Type 'string' is not assignable to type '{ Task: string; Program: string; EventDispatch: string; GPUTask: string; Animation: string; RequestMainThreadFrame: string; BeginFrame: string; NeedsBeginFrameChanged: string; BeginMainThreadFrame: string; ... 102 more ...; AsyncTask: string; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModelFilter.js(43,22): error TS1110: Type expected.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModelFilter.js(62,38): error TS2345: Argument of type '{ Task: string; Program: string; EventDispatch: string; GPUTask: string; Animation: string; RequestMainThreadFrame: string; BeginFrame: string; NeedsBeginFrameChanged: string; BeginMainThreadFrame: string; ... 102 more ...; AsyncTask: string; }' is not assignable to parameter of type 'string'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineProfileTree.js(74,26): error TS2502: 'parent' is referenced directly or indirectly in its own type annotation.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineProfileTree.js(168,31): error TS2345: Argument of type 'string | symbol' is not assignable to parameter of type 'string'.
   Type 'symbol' is not assignable to type 'string'.
@@ -12618,6 +13169,7 @@ node_modules/chrome-devtools-frontend/front_end/ui/ContextMenu.js(450,49): error
 node_modules/chrome-devtools-frontend/front_end/ui/ContextMenu.js(453,57): error TS2694: Namespace 'InspectorFrontendHostAPI' has no exported member 'ContextMenuDescriptor'.
 node_modules/chrome-devtools-frontend/front_end/ui/ContextMenu.js(457,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/ui/Dialog.js(35,25): error TS2339: Property 'tabIndex' does not exist on type 'Element'.
+node_modules/chrome-devtools-frontend/front_end/ui/Dialog.js(39,35): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ BlockedByGlassPane: symbol; PierceGlassPane: symbol; PierceContents: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/ui/Dialog.js(42,13): error TS2339: Property 'consume' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/ui/Dialog.js(55,24): error TS2339: Property '_instance' does not exist on type 'typeof Dialog'.
 node_modules/chrome-devtools-frontend/front_end/ui/Dialog.js(65,19): error TS2339: Property '_instance' does not exist on type 'typeof Dialog'.
@@ -12698,8 +13250,13 @@ node_modules/chrome-devtools-frontend/front_end/ui/Fragment.js(307,13): error TS
 node_modules/chrome-devtools-frontend/front_end/ui/Geometry.js(210,15): error TS2304: Cannot find name 'CSSMatrix'.
 node_modules/chrome-devtools-frontend/front_end/ui/Geometry.js(272,13): error TS2304: Cannot find name 'CSSMatrix'.
 node_modules/chrome-devtools-frontend/front_end/ui/Geometry.js(316,13): error TS2304: Cannot find name 'CSSMatrix'.
+node_modules/chrome-devtools-frontend/front_end/ui/GlassPane.js(15,35): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ BlockedByGlassPane: symbol; PierceGlassPane: symbol; PierceContents: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/ui/GlassPane.js(18,17): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
+node_modules/chrome-devtools-frontend/front_end/ui/GlassPane.js(66,30): error TS2367: This condition will always return 'true' since the types '{ BlockedByGlassPane: symbol; PierceGlassPane: symbol; PierceContents: symbol; }' and 'symbol' have no overlap.
+node_modules/chrome-devtools-frontend/front_end/ui/GlassPane.js(68,30): error TS2367: This condition will always return 'false' since the types '{ BlockedByGlassPane: symbol; PierceGlassPane: symbol; PierceContents: symbol; }' and 'symbol' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/ui/GlassPane.js(72,15): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
+node_modules/chrome-devtools-frontend/front_end/ui/GlassPane.js(90,5): error TS2322: Type '{ SetExactSize: symbol; SetExactWidthMaxHeight: symbol; MeasureContent: symbol; }' is not assignable to type 'symbol'.
+node_modules/chrome-devtools-frontend/front_end/ui/GlassPane.js(118,5): error TS2322: Type '{ PreferTop: symbol; PreferBottom: symbol; PreferLeft: symbol; PreferRight: symbol; }' is not assignable to type 'symbol'.
 node_modules/chrome-devtools-frontend/front_end/ui/GlassPane.js(125,5): error TS2322: Type 'boolean' is not assignable to type 'symbol'.
 node_modules/chrome-devtools-frontend/front_end/ui/GlassPane.js(126,51): error TS2367: This condition will always return 'true' since the types 'boolean' and 'symbol' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/ui/GlassPane.js(136,18): error TS2339: Property 'style' does not exist on type 'Element'.
@@ -12855,6 +13412,7 @@ node_modules/chrome-devtools-frontend/front_end/ui/Popover.js(109,15): error TS2
 node_modules/chrome-devtools-frontend/front_end/ui/Popover.js(129,15): error TS2339: Property 'relatedTarget' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/ui/Popover.js(129,39): error TS2339: Property 'relatedTarget' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/ui/Popover.js(170,38): error TS2339: Property 'ownerDocument' does not exist on type 'EventTarget'.
+node_modules/chrome-devtools-frontend/front_end/ui/Popover.js(206,29): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ SetExactSize: symbol; SetExactWidthMaxHeight: symbol; MeasureContent: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/ui/Popover.js(207,31): error TS2345: Argument of type 'symbol' is not assignable to parameter of type 'boolean'.
 node_modules/chrome-devtools-frontend/front_end/ui/Popover.js(220,28): error TS2339: Property '_popoverHelper' does not exist on type 'typeof PopoverHelper'.
 node_modules/chrome-devtools-frontend/front_end/ui/Popover.js(222,26): error TS2339: Property '_popoverHelper' does not exist on type 'typeof PopoverHelper'.
@@ -12994,7 +13552,10 @@ node_modules/chrome-devtools-frontend/front_end/ui/ShortcutsScreen.js(308,43): e
 node_modules/chrome-devtools-frontend/front_end/ui/ShortcutsScreen.js(318,35): error TS2694: Namespace 'UI.KeyboardShortcut' has no exported member 'Descriptor'.
 node_modules/chrome-devtools-frontend/front_end/ui/SoftContextMenu.js(31,48): error TS2694: Namespace 'InspectorFrontendHostAPI' has no exported member 'ContextMenuDescriptor'.
 node_modules/chrome-devtools-frontend/front_end/ui/SoftContextMenu.js(32,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
+node_modules/chrome-devtools-frontend/front_end/ui/SoftContextMenu.js(53,9): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ BlockedByGlassPane: symbol; PierceGlassPane: symbol; PierceContents: symbol; }'.
+node_modules/chrome-devtools-frontend/front_end/ui/SoftContextMenu.js(57,37): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ SetExactSize: symbol; SetExactWidthMaxHeight: symbol; MeasureContent: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/ui/SoftContextMenu.js(58,39): error TS2345: Argument of type 'symbol' is not assignable to parameter of type 'boolean'.
+node_modules/chrome-devtools-frontend/front_end/ui/SoftContextMenu.js(60,9): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ PreferTop: symbol; PreferBottom: symbol; PreferLeft: symbol; PreferRight: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/ui/SoftContextMenu.js(62,63): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/SoftContextMenu.js(113,37): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/SoftContextMenu.js(115,23): error TS2339: Property '_isCustom' does not exist on type 'Element'.
@@ -13010,8 +13571,10 @@ node_modules/chrome-devtools-frontend/front_end/ui/SoftContextMenu.js(183,7): er
   'SoftContextMenu' is assignable to the constraint of type 'this', but 'this' could be instantiated with a different subtype of constraint 'SoftContextMenu'.
 node_modules/chrome-devtools-frontend/front_end/ui/SoftDropDown.js(20,37): error TS2339: Property 'createChild' does not exist on type 'DocumentFragment'.
 node_modules/chrome-devtools-frontend/front_end/ui/SoftDropDown.js(25,39): error TS2345: Argument of type 'symbol' is not assignable to parameter of type 'boolean'.
+node_modules/chrome-devtools-frontend/front_end/ui/SoftDropDown.js(26,39): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ PreferTop: symbol; PreferBottom: symbol; PreferLeft: symbol; PreferRight: symbol; }'.
+node_modules/chrome-devtools-frontend/front_end/ui/SoftDropDown.js(28,46): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ BlockedByGlassPane: symbol; PierceGlassPane: symbol; PierceContents: symbol; }'.
+node_modules/chrome-devtools-frontend/front_end/ui/SoftDropDown.js(29,50): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ NonViewport: symbol; EqualHeightItems: symbol; VariousHeightItems: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/ui/SoftDropDown.js(40,30): error TS2339: Property 'disabled' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/ui/SoftDropDown.js(45,69): error TS2339: Property 'consume' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/ui/SoftDropDown.js(64,54): error TS2339: Property 'boxInWindow' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/SoftDropDown.js(69,18): error TS2339: Property 'focus' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/SoftDropDown.js(70,11): error TS2339: Property 'consume' does not exist on type 'Event'.
@@ -13057,6 +13620,8 @@ node_modules/chrome-devtools-frontend/front_end/ui/SplitWidget.js(878,24): error
 node_modules/chrome-devtools-frontend/front_end/ui/SplitWidget.js(913,16): error TS2339: Property 'SettingForOrientation' does not exist on type 'typeof SplitWidget'.
 node_modules/chrome-devtools-frontend/front_end/ui/SuggestBox.js(69,45): error TS2694: Namespace 'UI.SuggestBox' has no exported member 'Suggestion'.
 node_modules/chrome-devtools-frontend/front_end/ui/SuggestBox.js(71,47): error TS2694: Namespace 'UI.SuggestBox' has no exported member 'Suggestion'.
+node_modules/chrome-devtools-frontend/front_end/ui/SuggestBox.js(72,56): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ NonViewport: symbol; EqualHeightItems: symbol; VariousHeightItems: symbol; }'.
+node_modules/chrome-devtools-frontend/front_end/ui/SuggestBox.js(79,39): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ PreferTop: symbol; PreferBottom: symbol; PreferLeft: symbol; PreferRight: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/ui/SuggestBox.js(116,29): error TS2694: Namespace 'UI.SuggestBox' has no exported member 'Suggestions'.
 node_modules/chrome-devtools-frontend/front_end/ui/SuggestBox.js(126,29): error TS2694: Namespace 'UI.SuggestBox' has no exported member 'Suggestions'.
 node_modules/chrome-devtools-frontend/front_end/ui/SuggestBox.js(142,71): error TS2694: Namespace 'UI.SuggestBox' has no exported member 'Suggestion'.
@@ -13174,6 +13739,7 @@ node_modules/chrome-devtools-frontend/front_end/ui/Toolbar.js(43,50): error TS23
 node_modules/chrome-devtools-frontend/front_end/ui/Toolbar.js(48,45): error TS2339: Property 'createChild' does not exist on type 'DocumentFragment'.
 node_modules/chrome-devtools-frontend/front_end/ui/Toolbar.js(75,24): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/ui/Toolbar.js(115,26): error TS2694: Namespace 'Common' has no exported member 'Event'.
+node_modules/chrome-devtools-frontend/front_end/ui/Toolbar.js(128,49): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ BlockedByGlassPane: symbol; PierceGlassPane: symbol; PierceContents: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/ui/Toolbar.js(134,47): error TS2339: Property 'boxInWindow' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/Toolbar.js(246,10): error TS2339: Property '_toolbar' does not exist on type 'ToolbarItem'.
 node_modules/chrome-devtools-frontend/front_end/ui/Toolbar.js(273,19): error TS2339: Property '_toolbar' does not exist on type 'ToolbarItem'.
@@ -13362,6 +13928,10 @@ node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1745,18): error TS
 node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1763,20): error TS2339: Property 'type' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1766,52): error TS2339: Property 'sheet' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1783,30): error TS2339: Property 'cssRules' does not exist on type 'StyleSheet'.
+node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1851,49): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ Unknown: number; Foreground: number; Background: number; Selection: number; }'.
+node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1898,13): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
+node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1900,22): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
+node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1901,22): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
 node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1910,22): error TS2339: Property 'constrain' does not exist on type 'NumberConstructor'.
 node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1911,22): error TS2339: Property 'constrain' does not exist on type 'NumberConstructor'.
 node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1912,22): error TS2339: Property 'constrain' does not exist on type 'NumberConstructor'.
@@ -13376,10 +13946,12 @@ node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1967,23): error TS
 node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1968,48): error TS2345: Argument of type '-1' is not assignable to parameter of type 'string'.
 node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1969,23): error TS2339: Property 'onchange' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1971,34): error TS2339: Property 'files' does not exist on type 'Element'.
+node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1990,28): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ SetExactSize: symbol; SetExactWidthMaxHeight: symbol; MeasureContent: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1993,30): error TS2339: Property 'createChild' does not exist on type 'DocumentFragment'.
 node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1995,49): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1999,15): error TS2339: Property 'consume' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(2003,16): error TS2339: Property 'focus' does not exist on type 'Element'.
+node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(2017,28): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ SetExactSize: symbol; SetExactWidthMaxHeight: symbol; MeasureContent: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(2020,30): error TS2339: Property 'createChild' does not exist on type 'DocumentFragment'.
 node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(2024,57): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(2025,57): error TS2555: Expected at least 2 arguments, but got 1.
@@ -13408,7 +13980,7 @@ node_modules/chrome-devtools-frontend/front_end/ui/View.js(461,44): error TS2769
         Type '() => IterableIterator<Promise<void> | Promise<ToolbarItem[]>>' is not assignable to type '() => Iterator<void | PromiseLike<void>, any, undefined>'.
           Type 'IterableIterator<Promise<void> | Promise<ToolbarItem[]>>' is not assignable to type 'Iterator<void | PromiseLike<void>, any, undefined>'.
             Types of property 'next' are incompatible.
-              Type '{ (...args: [] | [undefined]): IteratorResult<Promise<void> | Promise<ToolbarItem[]>, any>; (value?: any): IteratorResult<Promise<void> | Promise<ToolbarItem[]>, any>; }' is not assignable to type '{ (...args: [] | [undefined]): IteratorResult<void | PromiseLike<void>, any>; (value?: any): IteratorResult<void | PromiseLike<void>, any>; }'.
+              Type '(...args: [] | [undefined]) => IteratorResult<Promise<void> | Promise<ToolbarItem[]>, any>' is not assignable to type '(...args: [] | [undefined]) => IteratorResult<void | PromiseLike<void>, any>'.
                 Type 'IteratorResult<Promise<void> | Promise<ToolbarItem[]>, any>' is not assignable to type 'IteratorResult<void | PromiseLike<void>, any>'.
                   Type 'IteratorYieldResult<Promise<void> | Promise<ToolbarItem[]>>' is not assignable to type 'IteratorResult<void | PromiseLike<void>, any>'.
                     Type 'IteratorYieldResult<Promise<void> | Promise<ToolbarItem[]>>' is not assignable to type 'IteratorYieldResult<void | PromiseLike<void>>'.
@@ -13627,6 +14199,7 @@ node_modules/chrome-devtools-frontend/front_end/workspace/Workspace.js(204,15):
 node_modules/chrome-devtools-frontend/front_end/workspace/Workspace.js(243,25): error TS2352: Conversion of type 'this' to type '{ workspace(): Workspace; id(): string; type(): string; isServiceProject(): boolean; displayName(): string; requestMetadata(uiSourceCode: UISourceCode): Promise<UISourceCodeMetadata>; ... 17 more ...; uiSourceCodes(): UISourceCode[]; }' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
 node_modules/chrome-devtools-frontend/front_end/workspace/Workspace.js(243,25): error TS2352: Conversion of type 'this' to type '{ workspace(): Workspace; id(): string; type(): string; isServiceProject(): boolean; displayName(): string; requestMetadata(uiSourceCode: UISourceCode): Promise<UISourceCodeMetadata>; ... 17 more ...; uiSourceCodes(): UISourceCode[]; }' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
   Type 'ProjectStore' is missing the following properties from type '{ workspace(): Workspace; id(): string; type(): string; isServiceProject(): boolean; displayName(): string; requestMetadata(uiSourceCode: UISourceCode): Promise<UISourceCodeMetadata>; ... 17 more ...; uiSourceCodes(): UISourceCode[]; }': isServiceProject, requestMetadata, requestFileContent, canSetFileContent, and 14 more.
+node_modules/chrome-devtools-frontend/front_end/workspace/Workspace.js(257,5): error TS2322: Type '{ Debugger: string; Formatter: string; Network: string; Snippets: string; FileSystem: string; ContentScripts: string; Service: string; }' is not assignable to type 'string'.
 node_modules/chrome-devtools-frontend/front_end/workspace/Workspace.js(432,27): error TS2339: Property 'valuesArray' does not exist on type 'Map<string, { workspace(): Workspace; id(): string; type(): string; isServiceProject(): boolean; displayName(): string; requestMetadata(uiSourceCode: UISourceCode): Promise<UISourceCodeMetadata>; ... 17 more ...; uiSourceCodes(): UISourceCode[]; }>'.
 node_modules/chrome-devtools-frontend/front_end/workspace_diff/WorkspaceDiff.js(30,35): error TS2694: Namespace 'Diff.Diff' has no exported member 'DiffArray'.
 node_modules/chrome-devtools-frontend/front_end/workspace_diff/WorkspaceDiff.js(38,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
@@ -13637,6 +14210,7 @@ node_modules/chrome-devtools-frontend/front_end/workspace_diff/WorkspaceDiff.js(
 node_modules/chrome-devtools-frontend/front_end/workspace_diff/WorkspaceDiff.js(80,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/workspace_diff/WorkspaceDiff.js(88,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/workspace_diff/WorkspaceDiff.js(96,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
+node_modules/chrome-devtools-frontend/front_end/workspace_diff/WorkspaceDiff.js(194,34): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; TimelineStarted: number; ProfilesCPUProfileTaken: number; ProfilesHeapProfileTaken: number; AuditsStarted: number; ... 23 more ...; ShowedThirdPartyBadges: number; }'.
 node_modules/chrome-devtools-frontend/front_end/workspace_diff/WorkspaceDiff.js(236,35): error TS2694: Namespace 'Diff.Diff' has no exported member 'DiffArray'.
 node_modules/chrome-devtools-frontend/front_end/workspace_diff/WorkspaceDiff.js(260,35): error TS2694: Namespace 'Diff.Diff' has no exported member 'DiffArray'.
 node_modules/chrome-devtools-frontend/front_end/workspace_diff/WorkspaceDiff.js(301,36): error TS2339: Property '_instance' does not exist on type 'typeof WorkspaceDiff'.
diff --git a/tests/baselines/reference/user/mqtt.log b/tests/baselines/reference/user/mqtt.log
deleted file mode 100644
index 54141b16777..00000000000
--- a/tests/baselines/reference/user/mqtt.log
+++ /dev/null
@@ -1,8 +0,0 @@
-Exit Code: 1
-Standard output:
-../../../../built/local/lib.es2015.iterable.d.ts(41,6): error TS2300: Duplicate identifier 'IteratorResult'.
-../../../../node_modules/@types/node/index.d.ts(77,11): error TS2300: Duplicate identifier 'IteratorResult'.
-
-
-
-Standard error:
diff --git a/tests/baselines/reference/user/prettier.log b/tests/baselines/reference/user/prettier.log
index e0c8a987cd3..ff4b267a459 100644
--- a/tests/baselines/reference/user/prettier.log
+++ b/tests/baselines/reference/user/prettier.log
@@ -1,7 +1,5 @@
 Exit Code: 1
 Standard output:
-../../../../../built/local/lib.es2015.iterable.d.ts(41,6): error TS2300: Duplicate identifier 'IteratorResult'.
-../../../../../node_modules/@types/node/index.d.ts(77,11): error TS2300: Duplicate identifier 'IteratorResult'.
 node_modules/@typescript-eslint/typescript-estree/dist/parser.d.ts(1,8): error TS1259: Module '"/prettier/prettier/node_modules/typescript/lib/typescript"' can only be default-imported using the 'esModuleInterop' flag
 src/cli/util.js(60,44): error TS2345: Argument of type 'null' is not assignable to parameter of type 'number | undefined'.
 src/cli/util.js(119,38): error TS2339: Property 'sync' does not exist on type '(...args: any[]) => any'.
diff --git a/tests/baselines/reference/user/zone.js.log b/tests/baselines/reference/user/zone.js.log
new file mode 100644
index 00000000000..f9544396d87
--- /dev/null
+++ b/tests/baselines/reference/user/zone.js.log
@@ -0,0 +1,7 @@
+Exit Code: 1
+Standard output:
+node_modules/zone.js/dist/zone.js.d.ts(292,36): error TS2304: Cannot find name '_PatchFn'.
+
+
+
+Standard error:

From d34cf525766d29b7182cdc19cabd784d311ba081 Mon Sep 17 00:00:00 2001
From: Michael Crane <micran@microsoft.com>
Date: Fri, 2 Aug 2019 10:20:17 -0700
Subject: [PATCH 092/151] Use 'noop' for NullLogger

---
 src/compiler/core.ts       |  2 -
 src/compiler/perfLogger.ts | 94 ++++++++++++--------------------------
 src/compiler/tsconfig.json |  2 +-
 3 files changed, 29 insertions(+), 69 deletions(-)

diff --git a/src/compiler/core.ts b/src/compiler/core.ts
index 37506e53cfc..e0e70c72943 100644
--- a/src/compiler/core.ts
+++ b/src/compiler/core.ts
@@ -4,8 +4,6 @@ namespace ts {
     export const versionMajorMinor = "3.6";
     /** The version of the TypeScript compiler release */
     export const version = `${versionMajorMinor}.0-dev`;
-
-    perfLogger.logInfoEvent(`Starting TypeScript v${versionMajorMinor} with command line: ${JSON.stringify(process.argv)}`);
 }
 
 namespace ts {
diff --git a/src/compiler/perfLogger.ts b/src/compiler/perfLogger.ts
index 4f6d277dac5..974e231d15d 100644
--- a/src/compiler/perfLogger.ts
+++ b/src/compiler/perfLogger.ts
@@ -1,69 +1,28 @@
 /* @internal */
 namespace ts {
-    export type PerfLogger = typeof import("@microsoft/typescript-etw"); // tslint:disable-line:no-implicit-dependencies
-
-    export class NullLogger implements PerfLogger {
-        logEvent(_msg: string): void {
-            return;
-        }
-        logErrEvent(_msg: string): void {
-            return;
-        }
-        logPerfEvent(_msg: string): void {
-            return;
-        }
-        logInfoEvent(_msg: string): void {
-            return;
-        }
-        logStartCommand(_command: string, _msg: string): void {
-            return;
-        }
-        logStopCommand(_command: string, _msg: string): void {
-            return;
-        }
-        logStartUpdateProgram(_msg: string): void {
-            return;
-        }
-        logStopUpdateProgram(_msg: string): void {
-            return;
-        }
-        logStartUpdateGraph(): void {
-            return;
-        }
-        logStopUpdateGraph(): void {
-            return;
-        }
-        logStartResolveModule(_name: string): void {
-            return;
-        }
-        logStopResolveModule(_success: string): void {
-            return;
-        }
-        logStartParseSourceFile(_filename: string): void {
-            return;
-        }
-        logStopParseSourceFile(): void {
-            return;
-        }
-        logStartReadFile(_filename: string): void {
-            return;
-        }
-        logStopReadFile(): void {
-            return;
-        }
-        logStartBindFile(_filename: string): void {
-            return;
-        }
-        logStopBindFile(): void {
-            return;
-        }
-        logStartScheduledOperation(_operationId: string): void {
-            return;
-        }
-        logStopScheduledOperation(): void {
-            return;
-        }
-    }
+    type PerfLogger = typeof import("@microsoft/typescript-etw"); // tslint:disable-line:no-implicit-dependencies
+    const nullLogger: PerfLogger = {
+        logEvent: noop,
+        logErrEvent: noop,
+        logPerfEvent: noop,
+        logInfoEvent: noop,
+        logStartCommand: noop,
+        logStopCommand: noop,
+        logStartUpdateProgram: noop,
+        logStopUpdateProgram: noop,
+        logStartUpdateGraph: noop,
+        logStopUpdateGraph: noop,
+        logStartResolveModule: noop,
+        logStopResolveModule: noop,
+        logStartParseSourceFile: noop,
+        logStopParseSourceFile: noop,
+        logStartReadFile: noop,
+        logStopReadFile: noop,
+        logStartBindFile: noop,
+        logStopBindFile: noop,
+        logStartScheduledOperation: noop,
+        logStopScheduledOperation: noop,
+    };
 
     // Load optional module to enable Event Tracing for Windows
     // See https://github.com/microsoft/typescript-etw for more information
@@ -77,5 +36,8 @@ namespace ts {
         etwModule = undefined;
     }
 
-    export const perfLogger: PerfLogger = etwModule ? etwModule : new NullLogger();
-}
\ No newline at end of file
+    /** Performance logger that will generate ETW events if possible */
+    export const perfLogger: PerfLogger = etwModule ? etwModule : nullLogger;
+
+    perfLogger.logInfoEvent(`Starting TypeScript v${versionMajorMinor} with command line: ${JSON.stringify(process.argv)}`);
+}
diff --git a/src/compiler/tsconfig.json b/src/compiler/tsconfig.json
index e9a8f7fda52..c90c6f35b34 100644
--- a/src/compiler/tsconfig.json
+++ b/src/compiler/tsconfig.json
@@ -7,10 +7,10 @@
     "references": [],
 
     "files": [
-        "perfLogger.ts",
         "core.ts",
         "debug.ts",
         "performance.ts",
+        "perfLogger.ts",
         "semver.ts",
 
         "types.ts",

From 5e197539796a040611d60c76f038e7be7634c6d3 Mon Sep 17 00:00:00 2001
From: Michael Crane <micran@microsoft.com>
Date: Fri, 2 Aug 2019 10:50:49 -0700
Subject: [PATCH 093/151] Update browser table

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

diff --git a/package.json b/package.json
index 333240b0e7a..a90be2f813c 100644
--- a/package.json
+++ b/package.json
@@ -110,7 +110,8 @@
     "browser": {
         "fs": false,
         "os": false,
-        "path": false
+        "path": false,
+        "@microsoft/typescript-etw": false
     },
     "dependencies": {}
 }

From acdbd10626ba6dfb4ad6f3c63beaf97a6b9a608f Mon Sep 17 00:00:00 2001
From: Wesley Wigham <wewigham@microsoft.com>
Date: Fri, 2 Aug 2019 13:15:51 -0700
Subject: [PATCH 094/151] Amend scanner to support astral characters in
 identifiers when parsing es6+ (#32096)

* Amend scanner to support astral characters in identifiers when parsing es6+

* Use charSize helper rather than one-off maybe advance helper

* Update script to emit informative comment, run in unicode 12.1 environment

* Add suggested change
---
 .../regenerate-unicode-identifier-parts.js    | 28 ++++++++
 src/compiler/scanner.ts                       | 65 +++++++++++++++----
 .../extendedUnicodePlaneIdentifiers.js        | 10 +++
 .../extendedUnicodePlaneIdentifiers.symbols   | 14 ++++
 .../extendedUnicodePlaneIdentifiers.types     | 18 +++++
 .../extendedUnicodePlaneIdentifiers.ts        |  4 ++
 6 files changed, 126 insertions(+), 13 deletions(-)
 create mode 100644 scripts/regenerate-unicode-identifier-parts.js
 create mode 100644 tests/baselines/reference/extendedUnicodePlaneIdentifiers.js
 create mode 100644 tests/baselines/reference/extendedUnicodePlaneIdentifiers.symbols
 create mode 100644 tests/baselines/reference/extendedUnicodePlaneIdentifiers.types
 create mode 100644 tests/cases/compiler/extendedUnicodePlaneIdentifiers.ts

diff --git a/scripts/regenerate-unicode-identifier-parts.js b/scripts/regenerate-unicode-identifier-parts.js
new file mode 100644
index 00000000000..acc25914e4d
--- /dev/null
+++ b/scripts/regenerate-unicode-identifier-parts.js
@@ -0,0 +1,28 @@
+
+const MAX_UNICODE_CODEPOINT = 0x10FFFF;
+const isStart = c => /[\p{ID_Start}\u{2118}\u{212E}\u{309B}\u{309C}]/u.test(c); // Other_ID_Start explicitly included for back compat - see http://www.unicode.org/reports/tr31/#Introduction
+const isPart = c => /[\p{ID_Continue}\u{00B7}\u{0387}\u{19DA}\u{1369}\u{136A}\u{136B}\u{136C}\u{136D}\u{136E}\u{136F}\u{1370}\u{1371}]/u.test(c) || isStart(c); // Likewise for Other_ID_Continue
+const parts = [];
+let partsActive = false;
+let startsActive = false;
+const starts = [];
+
+for (let i = 0; i < MAX_UNICODE_CODEPOINT; i++) {
+    if (isStart(String.fromCodePoint(i)) !== startsActive) {
+        starts.push(i - +startsActive);
+        startsActive = !startsActive;
+    }
+    if (isPart(String.fromCodePoint(i)) !== partsActive) {
+        parts.push(i - +partsActive);
+        partsActive = !partsActive;
+    }
+}
+
+console.log(`/**
+* Generated by scripts/regenerate-unicode-identifier-parts.js on node ${process.version} with unicode ${process.versions.unicode}
+* based on http://www.unicode.org/reports/tr31/ and https://www.ecma-international.org/ecma-262/6.0/#sec-names-and-keywords
+* unicodeESNextIdentifierStart corresponds to the ID_Start and Other_ID_Start property, and
+* unicodeESNextIdentifierPart corresponds to ID_Continue, Other_ID_Continue, plus ID_Start and Other_ID_Start
+*/`);
+console.log(`const unicodeESNextIdentifierStart = [${starts.join(", ")}];`);
+console.log(`const unicodeESNextIdentifierPart = [${parts.join(", ")}];`);
diff --git a/src/compiler/scanner.ts b/src/compiler/scanner.ts
index f949893171a..d633e4926b2 100644
--- a/src/compiler/scanner.ts
+++ b/src/compiler/scanner.ts
@@ -248,6 +248,15 @@ namespace ts {
     const unicodeES5IdentifierStart = [170, 170, 181, 181, 186, 186, 192, 214, 216, 246, 248, 705, 710, 721, 736, 740, 748, 748, 750, 750, 880, 884, 886, 887, 890, 893, 902, 902, 904, 906, 908, 908, 910, 929, 931, 1013, 1015, 1153, 1162, 1319, 1329, 1366, 1369, 1369, 1377, 1415, 1488, 1514, 1520, 1522, 1568, 1610, 1646, 1647, 1649, 1747, 1749, 1749, 1765, 1766, 1774, 1775, 1786, 1788, 1791, 1791, 1808, 1808, 1810, 1839, 1869, 1957, 1969, 1969, 1994, 2026, 2036, 2037, 2042, 2042, 2048, 2069, 2074, 2074, 2084, 2084, 2088, 2088, 2112, 2136, 2208, 2208, 2210, 2220, 2308, 2361, 2365, 2365, 2384, 2384, 2392, 2401, 2417, 2423, 2425, 2431, 2437, 2444, 2447, 2448, 2451, 2472, 2474, 2480, 2482, 2482, 2486, 2489, 2493, 2493, 2510, 2510, 2524, 2525, 2527, 2529, 2544, 2545, 2565, 2570, 2575, 2576, 2579, 2600, 2602, 2608, 2610, 2611, 2613, 2614, 2616, 2617, 2649, 2652, 2654, 2654, 2674, 2676, 2693, 2701, 2703, 2705, 2707, 2728, 2730, 2736, 2738, 2739, 2741, 2745, 2749, 2749, 2768, 2768, 2784, 2785, 2821, 2828, 2831, 2832, 2835, 2856, 2858, 2864, 2866, 2867, 2869, 2873, 2877, 2877, 2908, 2909, 2911, 2913, 2929, 2929, 2947, 2947, 2949, 2954, 2958, 2960, 2962, 2965, 2969, 2970, 2972, 2972, 2974, 2975, 2979, 2980, 2984, 2986, 2990, 3001, 3024, 3024, 3077, 3084, 3086, 3088, 3090, 3112, 3114, 3123, 3125, 3129, 3133, 3133, 3160, 3161, 3168, 3169, 3205, 3212, 3214, 3216, 3218, 3240, 3242, 3251, 3253, 3257, 3261, 3261, 3294, 3294, 3296, 3297, 3313, 3314, 3333, 3340, 3342, 3344, 3346, 3386, 3389, 3389, 3406, 3406, 3424, 3425, 3450, 3455, 3461, 3478, 3482, 3505, 3507, 3515, 3517, 3517, 3520, 3526, 3585, 3632, 3634, 3635, 3648, 3654, 3713, 3714, 3716, 3716, 3719, 3720, 3722, 3722, 3725, 3725, 3732, 3735, 3737, 3743, 3745, 3747, 3749, 3749, 3751, 3751, 3754, 3755, 3757, 3760, 3762, 3763, 3773, 3773, 3776, 3780, 3782, 3782, 3804, 3807, 3840, 3840, 3904, 3911, 3913, 3948, 3976, 3980, 4096, 4138, 4159, 4159, 4176, 4181, 4186, 4189, 4193, 4193, 4197, 4198, 4206, 4208, 4213, 4225, 4238, 4238, 4256, 4293, 4295, 4295, 4301, 4301, 4304, 4346, 4348, 4680, 4682, 4685, 4688, 4694, 4696, 4696, 4698, 4701, 4704, 4744, 4746, 4749, 4752, 4784, 4786, 4789, 4792, 4798, 4800, 4800, 4802, 4805, 4808, 4822, 4824, 4880, 4882, 4885, 4888, 4954, 4992, 5007, 5024, 5108, 5121, 5740, 5743, 5759, 5761, 5786, 5792, 5866, 5870, 5872, 5888, 5900, 5902, 5905, 5920, 5937, 5952, 5969, 5984, 5996, 5998, 6000, 6016, 6067, 6103, 6103, 6108, 6108, 6176, 6263, 6272, 6312, 6314, 6314, 6320, 6389, 6400, 6428, 6480, 6509, 6512, 6516, 6528, 6571, 6593, 6599, 6656, 6678, 6688, 6740, 6823, 6823, 6917, 6963, 6981, 6987, 7043, 7072, 7086, 7087, 7098, 7141, 7168, 7203, 7245, 7247, 7258, 7293, 7401, 7404, 7406, 7409, 7413, 7414, 7424, 7615, 7680, 7957, 7960, 7965, 7968, 8005, 8008, 8013, 8016, 8023, 8025, 8025, 8027, 8027, 8029, 8029, 8031, 8061, 8064, 8116, 8118, 8124, 8126, 8126, 8130, 8132, 8134, 8140, 8144, 8147, 8150, 8155, 8160, 8172, 8178, 8180, 8182, 8188, 8305, 8305, 8319, 8319, 8336, 8348, 8450, 8450, 8455, 8455, 8458, 8467, 8469, 8469, 8473, 8477, 8484, 8484, 8486, 8486, 8488, 8488, 8490, 8493, 8495, 8505, 8508, 8511, 8517, 8521, 8526, 8526, 8544, 8584, 11264, 11310, 11312, 11358, 11360, 11492, 11499, 11502, 11506, 11507, 11520, 11557, 11559, 11559, 11565, 11565, 11568, 11623, 11631, 11631, 11648, 11670, 11680, 11686, 11688, 11694, 11696, 11702, 11704, 11710, 11712, 11718, 11720, 11726, 11728, 11734, 11736, 11742, 11823, 11823, 12293, 12295, 12321, 12329, 12337, 12341, 12344, 12348, 12353, 12438, 12445, 12447, 12449, 12538, 12540, 12543, 12549, 12589, 12593, 12686, 12704, 12730, 12784, 12799, 13312, 19893, 19968, 40908, 40960, 42124, 42192, 42237, 42240, 42508, 42512, 42527, 42538, 42539, 42560, 42606, 42623, 42647, 42656, 42735, 42775, 42783, 42786, 42888, 42891, 42894, 42896, 42899, 42912, 42922, 43000, 43009, 43011, 43013, 43015, 43018, 43020, 43042, 43072, 43123, 43138, 43187, 43250, 43255, 43259, 43259, 43274, 43301, 43312, 43334, 43360, 43388, 43396, 43442, 43471, 43471, 43520, 43560, 43584, 43586, 43588, 43595, 43616, 43638, 43642, 43642, 43648, 43695, 43697, 43697, 43701, 43702, 43705, 43709, 43712, 43712, 43714, 43714, 43739, 43741, 43744, 43754, 43762, 43764, 43777, 43782, 43785, 43790, 43793, 43798, 43808, 43814, 43816, 43822, 43968, 44002, 44032, 55203, 55216, 55238, 55243, 55291, 63744, 64109, 64112, 64217, 64256, 64262, 64275, 64279, 64285, 64285, 64287, 64296, 64298, 64310, 64312, 64316, 64318, 64318, 64320, 64321, 64323, 64324, 64326, 64433, 64467, 64829, 64848, 64911, 64914, 64967, 65008, 65019, 65136, 65140, 65142, 65276, 65313, 65338, 65345, 65370, 65382, 65470, 65474, 65479, 65482, 65487, 65490, 65495, 65498, 65500, ];
     const unicodeES5IdentifierPart = [170, 170, 181, 181, 186, 186, 192, 214, 216, 246, 248, 705, 710, 721, 736, 740, 748, 748, 750, 750, 768, 884, 886, 887, 890, 893, 902, 902, 904, 906, 908, 908, 910, 929, 931, 1013, 1015, 1153, 1155, 1159, 1162, 1319, 1329, 1366, 1369, 1369, 1377, 1415, 1425, 1469, 1471, 1471, 1473, 1474, 1476, 1477, 1479, 1479, 1488, 1514, 1520, 1522, 1552, 1562, 1568, 1641, 1646, 1747, 1749, 1756, 1759, 1768, 1770, 1788, 1791, 1791, 1808, 1866, 1869, 1969, 1984, 2037, 2042, 2042, 2048, 2093, 2112, 2139, 2208, 2208, 2210, 2220, 2276, 2302, 2304, 2403, 2406, 2415, 2417, 2423, 2425, 2431, 2433, 2435, 2437, 2444, 2447, 2448, 2451, 2472, 2474, 2480, 2482, 2482, 2486, 2489, 2492, 2500, 2503, 2504, 2507, 2510, 2519, 2519, 2524, 2525, 2527, 2531, 2534, 2545, 2561, 2563, 2565, 2570, 2575, 2576, 2579, 2600, 2602, 2608, 2610, 2611, 2613, 2614, 2616, 2617, 2620, 2620, 2622, 2626, 2631, 2632, 2635, 2637, 2641, 2641, 2649, 2652, 2654, 2654, 2662, 2677, 2689, 2691, 2693, 2701, 2703, 2705, 2707, 2728, 2730, 2736, 2738, 2739, 2741, 2745, 2748, 2757, 2759, 2761, 2763, 2765, 2768, 2768, 2784, 2787, 2790, 2799, 2817, 2819, 2821, 2828, 2831, 2832, 2835, 2856, 2858, 2864, 2866, 2867, 2869, 2873, 2876, 2884, 2887, 2888, 2891, 2893, 2902, 2903, 2908, 2909, 2911, 2915, 2918, 2927, 2929, 2929, 2946, 2947, 2949, 2954, 2958, 2960, 2962, 2965, 2969, 2970, 2972, 2972, 2974, 2975, 2979, 2980, 2984, 2986, 2990, 3001, 3006, 3010, 3014, 3016, 3018, 3021, 3024, 3024, 3031, 3031, 3046, 3055, 3073, 3075, 3077, 3084, 3086, 3088, 3090, 3112, 3114, 3123, 3125, 3129, 3133, 3140, 3142, 3144, 3146, 3149, 3157, 3158, 3160, 3161, 3168, 3171, 3174, 3183, 3202, 3203, 3205, 3212, 3214, 3216, 3218, 3240, 3242, 3251, 3253, 3257, 3260, 3268, 3270, 3272, 3274, 3277, 3285, 3286, 3294, 3294, 3296, 3299, 3302, 3311, 3313, 3314, 3330, 3331, 3333, 3340, 3342, 3344, 3346, 3386, 3389, 3396, 3398, 3400, 3402, 3406, 3415, 3415, 3424, 3427, 3430, 3439, 3450, 3455, 3458, 3459, 3461, 3478, 3482, 3505, 3507, 3515, 3517, 3517, 3520, 3526, 3530, 3530, 3535, 3540, 3542, 3542, 3544, 3551, 3570, 3571, 3585, 3642, 3648, 3662, 3664, 3673, 3713, 3714, 3716, 3716, 3719, 3720, 3722, 3722, 3725, 3725, 3732, 3735, 3737, 3743, 3745, 3747, 3749, 3749, 3751, 3751, 3754, 3755, 3757, 3769, 3771, 3773, 3776, 3780, 3782, 3782, 3784, 3789, 3792, 3801, 3804, 3807, 3840, 3840, 3864, 3865, 3872, 3881, 3893, 3893, 3895, 3895, 3897, 3897, 3902, 3911, 3913, 3948, 3953, 3972, 3974, 3991, 3993, 4028, 4038, 4038, 4096, 4169, 4176, 4253, 4256, 4293, 4295, 4295, 4301, 4301, 4304, 4346, 4348, 4680, 4682, 4685, 4688, 4694, 4696, 4696, 4698, 4701, 4704, 4744, 4746, 4749, 4752, 4784, 4786, 4789, 4792, 4798, 4800, 4800, 4802, 4805, 4808, 4822, 4824, 4880, 4882, 4885, 4888, 4954, 4957, 4959, 4992, 5007, 5024, 5108, 5121, 5740, 5743, 5759, 5761, 5786, 5792, 5866, 5870, 5872, 5888, 5900, 5902, 5908, 5920, 5940, 5952, 5971, 5984, 5996, 5998, 6000, 6002, 6003, 6016, 6099, 6103, 6103, 6108, 6109, 6112, 6121, 6155, 6157, 6160, 6169, 6176, 6263, 6272, 6314, 6320, 6389, 6400, 6428, 6432, 6443, 6448, 6459, 6470, 6509, 6512, 6516, 6528, 6571, 6576, 6601, 6608, 6617, 6656, 6683, 6688, 6750, 6752, 6780, 6783, 6793, 6800, 6809, 6823, 6823, 6912, 6987, 6992, 7001, 7019, 7027, 7040, 7155, 7168, 7223, 7232, 7241, 7245, 7293, 7376, 7378, 7380, 7414, 7424, 7654, 7676, 7957, 7960, 7965, 7968, 8005, 8008, 8013, 8016, 8023, 8025, 8025, 8027, 8027, 8029, 8029, 8031, 8061, 8064, 8116, 8118, 8124, 8126, 8126, 8130, 8132, 8134, 8140, 8144, 8147, 8150, 8155, 8160, 8172, 8178, 8180, 8182, 8188, 8204, 8205, 8255, 8256, 8276, 8276, 8305, 8305, 8319, 8319, 8336, 8348, 8400, 8412, 8417, 8417, 8421, 8432, 8450, 8450, 8455, 8455, 8458, 8467, 8469, 8469, 8473, 8477, 8484, 8484, 8486, 8486, 8488, 8488, 8490, 8493, 8495, 8505, 8508, 8511, 8517, 8521, 8526, 8526, 8544, 8584, 11264, 11310, 11312, 11358, 11360, 11492, 11499, 11507, 11520, 11557, 11559, 11559, 11565, 11565, 11568, 11623, 11631, 11631, 11647, 11670, 11680, 11686, 11688, 11694, 11696, 11702, 11704, 11710, 11712, 11718, 11720, 11726, 11728, 11734, 11736, 11742, 11744, 11775, 11823, 11823, 12293, 12295, 12321, 12335, 12337, 12341, 12344, 12348, 12353, 12438, 12441, 12442, 12445, 12447, 12449, 12538, 12540, 12543, 12549, 12589, 12593, 12686, 12704, 12730, 12784, 12799, 13312, 19893, 19968, 40908, 40960, 42124, 42192, 42237, 42240, 42508, 42512, 42539, 42560, 42607, 42612, 42621, 42623, 42647, 42655, 42737, 42775, 42783, 42786, 42888, 42891, 42894, 42896, 42899, 42912, 42922, 43000, 43047, 43072, 43123, 43136, 43204, 43216, 43225, 43232, 43255, 43259, 43259, 43264, 43309, 43312, 43347, 43360, 43388, 43392, 43456, 43471, 43481, 43520, 43574, 43584, 43597, 43600, 43609, 43616, 43638, 43642, 43643, 43648, 43714, 43739, 43741, 43744, 43759, 43762, 43766, 43777, 43782, 43785, 43790, 43793, 43798, 43808, 43814, 43816, 43822, 43968, 44010, 44012, 44013, 44016, 44025, 44032, 55203, 55216, 55238, 55243, 55291, 63744, 64109, 64112, 64217, 64256, 64262, 64275, 64279, 64285, 64296, 64298, 64310, 64312, 64316, 64318, 64318, 64320, 64321, 64323, 64324, 64326, 64433, 64467, 64829, 64848, 64911, 64914, 64967, 65008, 65019, 65024, 65039, 65056, 65062, 65075, 65076, 65101, 65103, 65136, 65140, 65142, 65276, 65296, 65305, 65313, 65338, 65343, 65343, 65345, 65370, 65382, 65470, 65474, 65479, 65482, 65487, 65490, 65495, 65498, 65500, ];
 
+    /**
+     * Generated by scripts/regenerate-unicode-identifier-parts.js on node v12.4.0 with unicode 12.1
+     * based on http://www.unicode.org/reports/tr31/ and https://www.ecma-international.org/ecma-262/6.0/#sec-names-and-keywords
+     * unicodeESNextIdentifierStart corresponds to the ID_Start and Other_ID_Start property, and
+     * unicodeESNextIdentifierPart corresponds to ID_Continue, Other_ID_Continue, plus ID_Start and Other_ID_Start
+     */
+    const unicodeESNextIdentifierStart = [65, 90, 97, 122, 170, 170, 181, 181, 186, 186, 192, 214, 216, 246, 248, 705, 710, 721, 736, 740, 748, 748, 750, 750, 880, 884, 886, 887, 890, 893, 895, 895, 902, 902, 904, 906, 908, 908, 910, 929, 931, 1013, 1015, 1153, 1162, 1327, 1329, 1366, 1369, 1369, 1376, 1416, 1488, 1514, 1519, 1522, 1568, 1610, 1646, 1647, 1649, 1747, 1749, 1749, 1765, 1766, 1774, 1775, 1786, 1788, 1791, 1791, 1808, 1808, 1810, 1839, 1869, 1957, 1969, 1969, 1994, 2026, 2036, 2037, 2042, 2042, 2048, 2069, 2074, 2074, 2084, 2084, 2088, 2088, 2112, 2136, 2144, 2154, 2208, 2228, 2230, 2237, 2308, 2361, 2365, 2365, 2384, 2384, 2392, 2401, 2417, 2432, 2437, 2444, 2447, 2448, 2451, 2472, 2474, 2480, 2482, 2482, 2486, 2489, 2493, 2493, 2510, 2510, 2524, 2525, 2527, 2529, 2544, 2545, 2556, 2556, 2565, 2570, 2575, 2576, 2579, 2600, 2602, 2608, 2610, 2611, 2613, 2614, 2616, 2617, 2649, 2652, 2654, 2654, 2674, 2676, 2693, 2701, 2703, 2705, 2707, 2728, 2730, 2736, 2738, 2739, 2741, 2745, 2749, 2749, 2768, 2768, 2784, 2785, 2809, 2809, 2821, 2828, 2831, 2832, 2835, 2856, 2858, 2864, 2866, 2867, 2869, 2873, 2877, 2877, 2908, 2909, 2911, 2913, 2929, 2929, 2947, 2947, 2949, 2954, 2958, 2960, 2962, 2965, 2969, 2970, 2972, 2972, 2974, 2975, 2979, 2980, 2984, 2986, 2990, 3001, 3024, 3024, 3077, 3084, 3086, 3088, 3090, 3112, 3114, 3129, 3133, 3133, 3160, 3162, 3168, 3169, 3200, 3200, 3205, 3212, 3214, 3216, 3218, 3240, 3242, 3251, 3253, 3257, 3261, 3261, 3294, 3294, 3296, 3297, 3313, 3314, 3333, 3340, 3342, 3344, 3346, 3386, 3389, 3389, 3406, 3406, 3412, 3414, 3423, 3425, 3450, 3455, 3461, 3478, 3482, 3505, 3507, 3515, 3517, 3517, 3520, 3526, 3585, 3632, 3634, 3635, 3648, 3654, 3713, 3714, 3716, 3716, 3718, 3722, 3724, 3747, 3749, 3749, 3751, 3760, 3762, 3763, 3773, 3773, 3776, 3780, 3782, 3782, 3804, 3807, 3840, 3840, 3904, 3911, 3913, 3948, 3976, 3980, 4096, 4138, 4159, 4159, 4176, 4181, 4186, 4189, 4193, 4193, 4197, 4198, 4206, 4208, 4213, 4225, 4238, 4238, 4256, 4293, 4295, 4295, 4301, 4301, 4304, 4346, 4348, 4680, 4682, 4685, 4688, 4694, 4696, 4696, 4698, 4701, 4704, 4744, 4746, 4749, 4752, 4784, 4786, 4789, 4792, 4798, 4800, 4800, 4802, 4805, 4808, 4822, 4824, 4880, 4882, 4885, 4888, 4954, 4992, 5007, 5024, 5109, 5112, 5117, 5121, 5740, 5743, 5759, 5761, 5786, 5792, 5866, 5870, 5880, 5888, 5900, 5902, 5905, 5920, 5937, 5952, 5969, 5984, 5996, 5998, 6000, 6016, 6067, 6103, 6103, 6108, 6108, 6176, 6264, 6272, 6312, 6314, 6314, 6320, 6389, 6400, 6430, 6480, 6509, 6512, 6516, 6528, 6571, 6576, 6601, 6656, 6678, 6688, 6740, 6823, 6823, 6917, 6963, 6981, 6987, 7043, 7072, 7086, 7087, 7098, 7141, 7168, 7203, 7245, 7247, 7258, 7293, 7296, 7304, 7312, 7354, 7357, 7359, 7401, 7404, 7406, 7411, 7413, 7414, 7418, 7418, 7424, 7615, 7680, 7957, 7960, 7965, 7968, 8005, 8008, 8013, 8016, 8023, 8025, 8025, 8027, 8027, 8029, 8029, 8031, 8061, 8064, 8116, 8118, 8124, 8126, 8126, 8130, 8132, 8134, 8140, 8144, 8147, 8150, 8155, 8160, 8172, 8178, 8180, 8182, 8188, 8305, 8305, 8319, 8319, 8336, 8348, 8450, 8450, 8455, 8455, 8458, 8467, 8469, 8469, 8472, 8477, 8484, 8484, 8486, 8486, 8488, 8488, 8490, 8505, 8508, 8511, 8517, 8521, 8526, 8526, 8544, 8584, 11264, 11310, 11312, 11358, 11360, 11492, 11499, 11502, 11506, 11507, 11520, 11557, 11559, 11559, 11565, 11565, 11568, 11623, 11631, 11631, 11648, 11670, 11680, 11686, 11688, 11694, 11696, 11702, 11704, 11710, 11712, 11718, 11720, 11726, 11728, 11734, 11736, 11742, 12293, 12295, 12321, 12329, 12337, 12341, 12344, 12348, 12353, 12438, 12443, 12447, 12449, 12538, 12540, 12543, 12549, 12591, 12593, 12686, 12704, 12730, 12784, 12799, 13312, 19893, 19968, 40943, 40960, 42124, 42192, 42237, 42240, 42508, 42512, 42527, 42538, 42539, 42560, 42606, 42623, 42653, 42656, 42735, 42775, 42783, 42786, 42888, 42891, 42943, 42946, 42950, 42999, 43009, 43011, 43013, 43015, 43018, 43020, 43042, 43072, 43123, 43138, 43187, 43250, 43255, 43259, 43259, 43261, 43262, 43274, 43301, 43312, 43334, 43360, 43388, 43396, 43442, 43471, 43471, 43488, 43492, 43494, 43503, 43514, 43518, 43520, 43560, 43584, 43586, 43588, 43595, 43616, 43638, 43642, 43642, 43646, 43695, 43697, 43697, 43701, 43702, 43705, 43709, 43712, 43712, 43714, 43714, 43739, 43741, 43744, 43754, 43762, 43764, 43777, 43782, 43785, 43790, 43793, 43798, 43808, 43814, 43816, 43822, 43824, 43866, 43868, 43879, 43888, 44002, 44032, 55203, 55216, 55238, 55243, 55291, 63744, 64109, 64112, 64217, 64256, 64262, 64275, 64279, 64285, 64285, 64287, 64296, 64298, 64310, 64312, 64316, 64318, 64318, 64320, 64321, 64323, 64324, 64326, 64433, 64467, 64829, 64848, 64911, 64914, 64967, 65008, 65019, 65136, 65140, 65142, 65276, 65313, 65338, 65345, 65370, 65382, 65470, 65474, 65479, 65482, 65487, 65490, 65495, 65498, 65500, 65536, 65547, 65549, 65574, 65576, 65594, 65596, 65597, 65599, 65613, 65616, 65629, 65664, 65786, 65856, 65908, 66176, 66204, 66208, 66256, 66304, 66335, 66349, 66378, 66384, 66421, 66432, 66461, 66464, 66499, 66504, 66511, 66513, 66517, 66560, 66717, 66736, 66771, 66776, 66811, 66816, 66855, 66864, 66915, 67072, 67382, 67392, 67413, 67424, 67431, 67584, 67589, 67592, 67592, 67594, 67637, 67639, 67640, 67644, 67644, 67647, 67669, 67680, 67702, 67712, 67742, 67808, 67826, 67828, 67829, 67840, 67861, 67872, 67897, 67968, 68023, 68030, 68031, 68096, 68096, 68112, 68115, 68117, 68119, 68121, 68149, 68192, 68220, 68224, 68252, 68288, 68295, 68297, 68324, 68352, 68405, 68416, 68437, 68448, 68466, 68480, 68497, 68608, 68680, 68736, 68786, 68800, 68850, 68864, 68899, 69376, 69404, 69415, 69415, 69424, 69445, 69600, 69622, 69635, 69687, 69763, 69807, 69840, 69864, 69891, 69926, 69956, 69956, 69968, 70002, 70006, 70006, 70019, 70066, 70081, 70084, 70106, 70106, 70108, 70108, 70144, 70161, 70163, 70187, 70272, 70278, 70280, 70280, 70282, 70285, 70287, 70301, 70303, 70312, 70320, 70366, 70405, 70412, 70415, 70416, 70419, 70440, 70442, 70448, 70450, 70451, 70453, 70457, 70461, 70461, 70480, 70480, 70493, 70497, 70656, 70708, 70727, 70730, 70751, 70751, 70784, 70831, 70852, 70853, 70855, 70855, 71040, 71086, 71128, 71131, 71168, 71215, 71236, 71236, 71296, 71338, 71352, 71352, 71424, 71450, 71680, 71723, 71840, 71903, 71935, 71935, 72096, 72103, 72106, 72144, 72161, 72161, 72163, 72163, 72192, 72192, 72203, 72242, 72250, 72250, 72272, 72272, 72284, 72329, 72349, 72349, 72384, 72440, 72704, 72712, 72714, 72750, 72768, 72768, 72818, 72847, 72960, 72966, 72968, 72969, 72971, 73008, 73030, 73030, 73056, 73061, 73063, 73064, 73066, 73097, 73112, 73112, 73440, 73458, 73728, 74649, 74752, 74862, 74880, 75075, 77824, 78894, 82944, 83526, 92160, 92728, 92736, 92766, 92880, 92909, 92928, 92975, 92992, 92995, 93027, 93047, 93053, 93071, 93760, 93823, 93952, 94026, 94032, 94032, 94099, 94111, 94176, 94177, 94179, 94179, 94208, 100343, 100352, 101106, 110592, 110878, 110928, 110930, 110948, 110951, 110960, 111355, 113664, 113770, 113776, 113788, 113792, 113800, 113808, 113817, 119808, 119892, 119894, 119964, 119966, 119967, 119970, 119970, 119973, 119974, 119977, 119980, 119982, 119993, 119995, 119995, 119997, 120003, 120005, 120069, 120071, 120074, 120077, 120084, 120086, 120092, 120094, 120121, 120123, 120126, 120128, 120132, 120134, 120134, 120138, 120144, 120146, 120485, 120488, 120512, 120514, 120538, 120540, 120570, 120572, 120596, 120598, 120628, 120630, 120654, 120656, 120686, 120688, 120712, 120714, 120744, 120746, 120770, 120772, 120779, 123136, 123180, 123191, 123197, 123214, 123214, 123584, 123627, 124928, 125124, 125184, 125251, 125259, 125259, 126464, 126467, 126469, 126495, 126497, 126498, 126500, 126500, 126503, 126503, 126505, 126514, 126516, 126519, 126521, 126521, 126523, 126523, 126530, 126530, 126535, 126535, 126537, 126537, 126539, 126539, 126541, 126543, 126545, 126546, 126548, 126548, 126551, 126551, 126553, 126553, 126555, 126555, 126557, 126557, 126559, 126559, 126561, 126562, 126564, 126564, 126567, 126570, 126572, 126578, 126580, 126583, 126585, 126588, 126590, 126590, 126592, 126601, 126603, 126619, 126625, 126627, 126629, 126633, 126635, 126651, 131072, 173782, 173824, 177972, 177984, 178205, 178208, 183969, 183984, 191456, 194560, 195101];
+    const unicodeESNextIdentifierPart = [48, 57, 65, 90, 95, 95, 97, 122, 170, 170, 181, 181, 183, 183, 186, 186, 192, 214, 216, 246, 248, 705, 710, 721, 736, 740, 748, 748, 750, 750, 768, 884, 886, 887, 890, 893, 895, 895, 902, 906, 908, 908, 910, 929, 931, 1013, 1015, 1153, 1155, 1159, 1162, 1327, 1329, 1366, 1369, 1369, 1376, 1416, 1425, 1469, 1471, 1471, 1473, 1474, 1476, 1477, 1479, 1479, 1488, 1514, 1519, 1522, 1552, 1562, 1568, 1641, 1646, 1747, 1749, 1756, 1759, 1768, 1770, 1788, 1791, 1791, 1808, 1866, 1869, 1969, 1984, 2037, 2042, 2042, 2045, 2045, 2048, 2093, 2112, 2139, 2144, 2154, 2208, 2228, 2230, 2237, 2259, 2273, 2275, 2403, 2406, 2415, 2417, 2435, 2437, 2444, 2447, 2448, 2451, 2472, 2474, 2480, 2482, 2482, 2486, 2489, 2492, 2500, 2503, 2504, 2507, 2510, 2519, 2519, 2524, 2525, 2527, 2531, 2534, 2545, 2556, 2556, 2558, 2558, 2561, 2563, 2565, 2570, 2575, 2576, 2579, 2600, 2602, 2608, 2610, 2611, 2613, 2614, 2616, 2617, 2620, 2620, 2622, 2626, 2631, 2632, 2635, 2637, 2641, 2641, 2649, 2652, 2654, 2654, 2662, 2677, 2689, 2691, 2693, 2701, 2703, 2705, 2707, 2728, 2730, 2736, 2738, 2739, 2741, 2745, 2748, 2757, 2759, 2761, 2763, 2765, 2768, 2768, 2784, 2787, 2790, 2799, 2809, 2815, 2817, 2819, 2821, 2828, 2831, 2832, 2835, 2856, 2858, 2864, 2866, 2867, 2869, 2873, 2876, 2884, 2887, 2888, 2891, 2893, 2902, 2903, 2908, 2909, 2911, 2915, 2918, 2927, 2929, 2929, 2946, 2947, 2949, 2954, 2958, 2960, 2962, 2965, 2969, 2970, 2972, 2972, 2974, 2975, 2979, 2980, 2984, 2986, 2990, 3001, 3006, 3010, 3014, 3016, 3018, 3021, 3024, 3024, 3031, 3031, 3046, 3055, 3072, 3084, 3086, 3088, 3090, 3112, 3114, 3129, 3133, 3140, 3142, 3144, 3146, 3149, 3157, 3158, 3160, 3162, 3168, 3171, 3174, 3183, 3200, 3203, 3205, 3212, 3214, 3216, 3218, 3240, 3242, 3251, 3253, 3257, 3260, 3268, 3270, 3272, 3274, 3277, 3285, 3286, 3294, 3294, 3296, 3299, 3302, 3311, 3313, 3314, 3328, 3331, 3333, 3340, 3342, 3344, 3346, 3396, 3398, 3400, 3402, 3406, 3412, 3415, 3423, 3427, 3430, 3439, 3450, 3455, 3458, 3459, 3461, 3478, 3482, 3505, 3507, 3515, 3517, 3517, 3520, 3526, 3530, 3530, 3535, 3540, 3542, 3542, 3544, 3551, 3558, 3567, 3570, 3571, 3585, 3642, 3648, 3662, 3664, 3673, 3713, 3714, 3716, 3716, 3718, 3722, 3724, 3747, 3749, 3749, 3751, 3773, 3776, 3780, 3782, 3782, 3784, 3789, 3792, 3801, 3804, 3807, 3840, 3840, 3864, 3865, 3872, 3881, 3893, 3893, 3895, 3895, 3897, 3897, 3902, 3911, 3913, 3948, 3953, 3972, 3974, 3991, 3993, 4028, 4038, 4038, 4096, 4169, 4176, 4253, 4256, 4293, 4295, 4295, 4301, 4301, 4304, 4346, 4348, 4680, 4682, 4685, 4688, 4694, 4696, 4696, 4698, 4701, 4704, 4744, 4746, 4749, 4752, 4784, 4786, 4789, 4792, 4798, 4800, 4800, 4802, 4805, 4808, 4822, 4824, 4880, 4882, 4885, 4888, 4954, 4957, 4959, 4969, 4977, 4992, 5007, 5024, 5109, 5112, 5117, 5121, 5740, 5743, 5759, 5761, 5786, 5792, 5866, 5870, 5880, 5888, 5900, 5902, 5908, 5920, 5940, 5952, 5971, 5984, 5996, 5998, 6000, 6002, 6003, 6016, 6099, 6103, 6103, 6108, 6109, 6112, 6121, 6155, 6157, 6160, 6169, 6176, 6264, 6272, 6314, 6320, 6389, 6400, 6430, 6432, 6443, 6448, 6459, 6470, 6509, 6512, 6516, 6528, 6571, 6576, 6601, 6608, 6618, 6656, 6683, 6688, 6750, 6752, 6780, 6783, 6793, 6800, 6809, 6823, 6823, 6832, 6845, 6912, 6987, 6992, 7001, 7019, 7027, 7040, 7155, 7168, 7223, 7232, 7241, 7245, 7293, 7296, 7304, 7312, 7354, 7357, 7359, 7376, 7378, 7380, 7418, 7424, 7673, 7675, 7957, 7960, 7965, 7968, 8005, 8008, 8013, 8016, 8023, 8025, 8025, 8027, 8027, 8029, 8029, 8031, 8061, 8064, 8116, 8118, 8124, 8126, 8126, 8130, 8132, 8134, 8140, 8144, 8147, 8150, 8155, 8160, 8172, 8178, 8180, 8182, 8188, 8255, 8256, 8276, 8276, 8305, 8305, 8319, 8319, 8336, 8348, 8400, 8412, 8417, 8417, 8421, 8432, 8450, 8450, 8455, 8455, 8458, 8467, 8469, 8469, 8472, 8477, 8484, 8484, 8486, 8486, 8488, 8488, 8490, 8505, 8508, 8511, 8517, 8521, 8526, 8526, 8544, 8584, 11264, 11310, 11312, 11358, 11360, 11492, 11499, 11507, 11520, 11557, 11559, 11559, 11565, 11565, 11568, 11623, 11631, 11631, 11647, 11670, 11680, 11686, 11688, 11694, 11696, 11702, 11704, 11710, 11712, 11718, 11720, 11726, 11728, 11734, 11736, 11742, 11744, 11775, 12293, 12295, 12321, 12335, 12337, 12341, 12344, 12348, 12353, 12438, 12441, 12447, 12449, 12538, 12540, 12543, 12549, 12591, 12593, 12686, 12704, 12730, 12784, 12799, 13312, 19893, 19968, 40943, 40960, 42124, 42192, 42237, 42240, 42508, 42512, 42539, 42560, 42607, 42612, 42621, 42623, 42737, 42775, 42783, 42786, 42888, 42891, 42943, 42946, 42950, 42999, 43047, 43072, 43123, 43136, 43205, 43216, 43225, 43232, 43255, 43259, 43259, 43261, 43309, 43312, 43347, 43360, 43388, 43392, 43456, 43471, 43481, 43488, 43518, 43520, 43574, 43584, 43597, 43600, 43609, 43616, 43638, 43642, 43714, 43739, 43741, 43744, 43759, 43762, 43766, 43777, 43782, 43785, 43790, 43793, 43798, 43808, 43814, 43816, 43822, 43824, 43866, 43868, 43879, 43888, 44010, 44012, 44013, 44016, 44025, 44032, 55203, 55216, 55238, 55243, 55291, 63744, 64109, 64112, 64217, 64256, 64262, 64275, 64279, 64285, 64296, 64298, 64310, 64312, 64316, 64318, 64318, 64320, 64321, 64323, 64324, 64326, 64433, 64467, 64829, 64848, 64911, 64914, 64967, 65008, 65019, 65024, 65039, 65056, 65071, 65075, 65076, 65101, 65103, 65136, 65140, 65142, 65276, 65296, 65305, 65313, 65338, 65343, 65343, 65345, 65370, 65382, 65470, 65474, 65479, 65482, 65487, 65490, 65495, 65498, 65500, 65536, 65547, 65549, 65574, 65576, 65594, 65596, 65597, 65599, 65613, 65616, 65629, 65664, 65786, 65856, 65908, 66045, 66045, 66176, 66204, 66208, 66256, 66272, 66272, 66304, 66335, 66349, 66378, 66384, 66426, 66432, 66461, 66464, 66499, 66504, 66511, 66513, 66517, 66560, 66717, 66720, 66729, 66736, 66771, 66776, 66811, 66816, 66855, 66864, 66915, 67072, 67382, 67392, 67413, 67424, 67431, 67584, 67589, 67592, 67592, 67594, 67637, 67639, 67640, 67644, 67644, 67647, 67669, 67680, 67702, 67712, 67742, 67808, 67826, 67828, 67829, 67840, 67861, 67872, 67897, 67968, 68023, 68030, 68031, 68096, 68099, 68101, 68102, 68108, 68115, 68117, 68119, 68121, 68149, 68152, 68154, 68159, 68159, 68192, 68220, 68224, 68252, 68288, 68295, 68297, 68326, 68352, 68405, 68416, 68437, 68448, 68466, 68480, 68497, 68608, 68680, 68736, 68786, 68800, 68850, 68864, 68903, 68912, 68921, 69376, 69404, 69415, 69415, 69424, 69456, 69600, 69622, 69632, 69702, 69734, 69743, 69759, 69818, 69840, 69864, 69872, 69881, 69888, 69940, 69942, 69951, 69956, 69958, 69968, 70003, 70006, 70006, 70016, 70084, 70089, 70092, 70096, 70106, 70108, 70108, 70144, 70161, 70163, 70199, 70206, 70206, 70272, 70278, 70280, 70280, 70282, 70285, 70287, 70301, 70303, 70312, 70320, 70378, 70384, 70393, 70400, 70403, 70405, 70412, 70415, 70416, 70419, 70440, 70442, 70448, 70450, 70451, 70453, 70457, 70459, 70468, 70471, 70472, 70475, 70477, 70480, 70480, 70487, 70487, 70493, 70499, 70502, 70508, 70512, 70516, 70656, 70730, 70736, 70745, 70750, 70751, 70784, 70853, 70855, 70855, 70864, 70873, 71040, 71093, 71096, 71104, 71128, 71133, 71168, 71232, 71236, 71236, 71248, 71257, 71296, 71352, 71360, 71369, 71424, 71450, 71453, 71467, 71472, 71481, 71680, 71738, 71840, 71913, 71935, 71935, 72096, 72103, 72106, 72151, 72154, 72161, 72163, 72164, 72192, 72254, 72263, 72263, 72272, 72345, 72349, 72349, 72384, 72440, 72704, 72712, 72714, 72758, 72760, 72768, 72784, 72793, 72818, 72847, 72850, 72871, 72873, 72886, 72960, 72966, 72968, 72969, 72971, 73014, 73018, 73018, 73020, 73021, 73023, 73031, 73040, 73049, 73056, 73061, 73063, 73064, 73066, 73102, 73104, 73105, 73107, 73112, 73120, 73129, 73440, 73462, 73728, 74649, 74752, 74862, 74880, 75075, 77824, 78894, 82944, 83526, 92160, 92728, 92736, 92766, 92768, 92777, 92880, 92909, 92912, 92916, 92928, 92982, 92992, 92995, 93008, 93017, 93027, 93047, 93053, 93071, 93760, 93823, 93952, 94026, 94031, 94087, 94095, 94111, 94176, 94177, 94179, 94179, 94208, 100343, 100352, 101106, 110592, 110878, 110928, 110930, 110948, 110951, 110960, 111355, 113664, 113770, 113776, 113788, 113792, 113800, 113808, 113817, 113821, 113822, 119141, 119145, 119149, 119154, 119163, 119170, 119173, 119179, 119210, 119213, 119362, 119364, 119808, 119892, 119894, 119964, 119966, 119967, 119970, 119970, 119973, 119974, 119977, 119980, 119982, 119993, 119995, 119995, 119997, 120003, 120005, 120069, 120071, 120074, 120077, 120084, 120086, 120092, 120094, 120121, 120123, 120126, 120128, 120132, 120134, 120134, 120138, 120144, 120146, 120485, 120488, 120512, 120514, 120538, 120540, 120570, 120572, 120596, 120598, 120628, 120630, 120654, 120656, 120686, 120688, 120712, 120714, 120744, 120746, 120770, 120772, 120779, 120782, 120831, 121344, 121398, 121403, 121452, 121461, 121461, 121476, 121476, 121499, 121503, 121505, 121519, 122880, 122886, 122888, 122904, 122907, 122913, 122915, 122916, 122918, 122922, 123136, 123180, 123184, 123197, 123200, 123209, 123214, 123214, 123584, 123641, 124928, 125124, 125136, 125142, 125184, 125259, 125264, 125273, 126464, 126467, 126469, 126495, 126497, 126498, 126500, 126500, 126503, 126503, 126505, 126514, 126516, 126519, 126521, 126521, 126523, 126523, 126530, 126530, 126535, 126535, 126537, 126537, 126539, 126539, 126541, 126543, 126545, 126546, 126548, 126548, 126551, 126551, 126553, 126553, 126555, 126555, 126557, 126557, 126559, 126559, 126561, 126562, 126564, 126564, 126567, 126570, 126572, 126578, 126580, 126583, 126585, 126588, 126590, 126590, 126592, 126601, 126603, 126619, 126625, 126627, 126629, 126633, 126635, 126651, 131072, 173782, 173824, 177972, 177984, 178205, 178208, 183969, 183984, 191456, 194560, 195101, 917760, 917999];
+
     function lookupInUnicodeMap(code: number, map: ReadonlyArray<number>): boolean {
         // Bail out quickly if it couldn't possibly be in the map.
         if (code < map[0]) {
@@ -279,14 +288,16 @@ namespace ts {
     }
 
     /* @internal */ export function isUnicodeIdentifierStart(code: number, languageVersion: ScriptTarget | undefined) {
-        return languageVersion! >= ScriptTarget.ES5 ?
-            lookupInUnicodeMap(code, unicodeES5IdentifierStart) :
+        return languageVersion! >= ScriptTarget.ES2015 ?
+            lookupInUnicodeMap(code, unicodeESNextIdentifierStart) :
+            languageVersion! === ScriptTarget.ES5 ? lookupInUnicodeMap(code, unicodeES5IdentifierStart) :
             lookupInUnicodeMap(code, unicodeES3IdentifierStart);
     }
 
     function isUnicodeIdentifierPart(code: number, languageVersion: ScriptTarget | undefined) {
-        return languageVersion! >= ScriptTarget.ES5 ?
-            lookupInUnicodeMap(code, unicodeES5IdentifierPart) :
+        return languageVersion! >= ScriptTarget.ES2015 ?
+            lookupInUnicodeMap(code, unicodeESNextIdentifierPart) :
+            languageVersion! === ScriptTarget.ES5 ? lookupInUnicodeMap(code, unicodeES5IdentifierPart) :
             lookupInUnicodeMap(code, unicodeES3IdentifierPart);
     }
 
@@ -1334,9 +1345,9 @@ namespace ts {
             let result = "";
             let start = pos;
             while (pos < end) {
-                let ch = text.charCodeAt(pos);
+                let ch = codePointAt(text, pos);
                 if (isIdentifierPart(ch, languageVersion)) {
-                    pos++;
+                    pos += charSize(ch);
                 }
                 else if (ch === CharacterCodes.backslash) {
                     ch = peekUnicodeEscape();
@@ -1344,7 +1355,7 @@ namespace ts {
                         break;
                     }
                     result += text.substring(start, pos);
-                    result += String.fromCharCode(ch);
+                    result += utf16EncodeAsString(ch);
                     // Valid Unicode escape is always six characters
                     pos += 6;
                     start = pos;
@@ -1442,7 +1453,7 @@ namespace ts {
                 if (pos >= end) {
                     return token = SyntaxKind.EndOfFileToken;
                 }
-                let ch = text.charCodeAt(pos);
+                let ch = codePointAt(text, pos);
 
                 // Special handling for shebang
                 if (ch === CharacterCodes.hash && pos === 0 && isShebangTrivia(text, pos)) {
@@ -1835,8 +1846,8 @@ namespace ts {
                         return token = SyntaxKind.Unknown;
                     default:
                         if (isIdentifierStart(ch, languageVersion)) {
-                            pos++;
-                            while (pos < end && isIdentifierPart(ch = text.charCodeAt(pos), languageVersion)) pos++;
+                            pos += charSize(ch);
+                            while (pos < end && isIdentifierPart(ch = codePointAt(text, pos), languageVersion)) pos += charSize(ch);
                             tokenValue = text.substring(tokenPos, pos);
                             if (ch === CharacterCodes.backslash) {
                                 tokenValue += scanIdentifierParts();
@@ -1844,21 +1855,28 @@ namespace ts {
                             return token = getIdentifierToken();
                         }
                         else if (isWhiteSpaceSingleLine(ch)) {
-                            pos++;
+                            pos += charSize(ch);
                             continue;
                         }
                         else if (isLineBreak(ch)) {
                             tokenFlags |= TokenFlags.PrecedingLineBreak;
-                            pos++;
+                            pos += charSize(ch);
                             continue;
                         }
                         error(Diagnostics.Invalid_character);
-                        pos++;
+                        pos += charSize(ch);
                         return token = SyntaxKind.Unknown;
                 }
             }
         }
 
+        function charSize(ch: number) {
+            if (ch > 0x10000) {
+                return 2;
+            }
+            return 1;
+        }
+
         function reScanGreaterToken(): SyntaxKind {
             if (token === SyntaxKind.GreaterThanToken) {
                 if (text.charCodeAt(pos) === CharacterCodes.greaterThan) {
@@ -2199,4 +2217,25 @@ namespace ts {
             inJSDocType += inType ? 1 : -1;
         }
     }
+
+    /* @internal */
+    const codePointAt: (s: string, i: number) => number = (String.prototype as any).codePointAt ? (s, i) => (s as any).codePointAt(i) : function codePointAt(str, i): number {
+        // from https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/codePointAt
+        const size = str.length;
+        // Account for out-of-bounds indices:
+        if (i < 0 || i >= size) {
+          return undefined!; // String.codePointAt returns `undefined` for OOB indexes
+        }
+        // Get the first code unit
+        const first = str.charCodeAt(i);
+        // check if it’s the start of a surrogate pair
+        if (first >= 0xD800 && first <= 0xDBFF && size > i + 1) { // high surrogate and there is a next code unit
+          const second = str.charCodeAt(i + 1);
+          if (second >= 0xDC00 && second <= 0xDFFF) { // low surrogate
+            // https://mathiasbynens.be/notes/javascript-encoding#surrogate-formulae
+            return (first - 0xD800) * 0x400 + second - 0xDC00 + 0x10000;
+          }
+        }
+        return first;
+    };
 }
diff --git a/tests/baselines/reference/extendedUnicodePlaneIdentifiers.js b/tests/baselines/reference/extendedUnicodePlaneIdentifiers.js
new file mode 100644
index 00000000000..73271b8b671
--- /dev/null
+++ b/tests/baselines/reference/extendedUnicodePlaneIdentifiers.js
@@ -0,0 +1,10 @@
+//// [extendedUnicodePlaneIdentifiers.ts]
+const 𝑚 = 4;
+const 𝑀 = 5;
+console.log(𝑀 + 𝑚); // 9
+
+
+//// [extendedUnicodePlaneIdentifiers.js]
+const 𝑚 = 4;
+const 𝑀 = 5;
+console.log(𝑀 + 𝑚); // 9
diff --git a/tests/baselines/reference/extendedUnicodePlaneIdentifiers.symbols b/tests/baselines/reference/extendedUnicodePlaneIdentifiers.symbols
new file mode 100644
index 00000000000..9d78bfaee05
--- /dev/null
+++ b/tests/baselines/reference/extendedUnicodePlaneIdentifiers.symbols
@@ -0,0 +1,14 @@
+=== tests/cases/compiler/extendedUnicodePlaneIdentifiers.ts ===
+const 𝑚 = 4;
+>𝑚 : Symbol(𝑚, Decl(extendedUnicodePlaneIdentifiers.ts, 0, 5))
+
+const 𝑀 = 5;
+>𝑀 : Symbol(𝑀, Decl(extendedUnicodePlaneIdentifiers.ts, 1, 5))
+
+console.log(𝑀 + 𝑚); // 9
+>console.log : Symbol(Console.log, Decl(lib.dom.d.ts, --, --))
+>console : Symbol(console, Decl(lib.dom.d.ts, --, --))
+>log : Symbol(Console.log, Decl(lib.dom.d.ts, --, --))
+>𝑀 : Symbol(𝑀, Decl(extendedUnicodePlaneIdentifiers.ts, 1, 5))
+>𝑚 : Symbol(𝑚, Decl(extendedUnicodePlaneIdentifiers.ts, 0, 5))
+
diff --git a/tests/baselines/reference/extendedUnicodePlaneIdentifiers.types b/tests/baselines/reference/extendedUnicodePlaneIdentifiers.types
new file mode 100644
index 00000000000..5de90b68b6d
--- /dev/null
+++ b/tests/baselines/reference/extendedUnicodePlaneIdentifiers.types
@@ -0,0 +1,18 @@
+=== tests/cases/compiler/extendedUnicodePlaneIdentifiers.ts ===
+const 𝑚 = 4;
+>𝑚 : 4
+>4 : 4
+
+const 𝑀 = 5;
+>𝑀 : 5
+>5 : 5
+
+console.log(𝑀 + 𝑚); // 9
+>console.log(𝑀 + 𝑚) : void
+>console.log : (message?: any, ...optionalParams: any[]) => void
+>console : Console
+>log : (message?: any, ...optionalParams: any[]) => void
+>𝑀 + 𝑚 : number
+>𝑀 : 5
+>𝑚 : 4
+
diff --git a/tests/cases/compiler/extendedUnicodePlaneIdentifiers.ts b/tests/cases/compiler/extendedUnicodePlaneIdentifiers.ts
new file mode 100644
index 00000000000..f207571549c
--- /dev/null
+++ b/tests/cases/compiler/extendedUnicodePlaneIdentifiers.ts
@@ -0,0 +1,4 @@
+// @target: es2018
+const 𝑚 = 4;
+const 𝑀 = 5;
+console.log(𝑀 + 𝑚); // 9

From e75972cbad4390057e9f531a5e5e9a945d8a2890 Mon Sep 17 00:00:00 2001
From: TypeScript Bot <ts_bot@rcavanaugh.com>
Date: Fri, 2 Aug 2019 13:36:34 -0700
Subject: [PATCH 095/151] Update user baselines (#32683)

---
 .../reference/docker/office-ui-fabric.log        | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/baselines/reference/docker/office-ui-fabric.log b/tests/baselines/reference/docker/office-ui-fabric.log
index 745bdff4193..440a14e9044 100644
--- a/tests/baselines/reference/docker/office-ui-fabric.log
+++ b/tests/baselines/reference/docker/office-ui-fabric.log
@@ -27,7 +27,7 @@ Standard output:
 @uifabric/set-version: [XX:XX:XX XM] ■ Running /office-ui-fabric-react/node_modules/typescript/lib/tsc.js with /office-ui-fabric-react/packages/set-version/tsconfig.json
 @uifabric/set-version: [XX:XX:XX XM] ■ Executing: /usr/local/bin/node "/office-ui-fabric-react/node_modules/typescript/lib/tsc.js" --pretty --target es5 --inlineSources --sourceRoot "../src" --outDir lib-commonjs --module commonjs --project "/office-ui-fabric-react/packages/set-version/tsconfig.json"
 @uifabric/set-version: [XX:XX:XX XM] ■ Running /office-ui-fabric-react/node_modules/typescript/lib/tsc.js with /office-ui-fabric-react/packages/set-version/tsconfig.json
-@uifabric/set-version: [XX:XX:XX XM] ■ Executing: /usr/local/bin/node "/office-ui-fabric-react/node_modules/typescript/lib/tsc.js" --pretty --target es5 --inlineSources --sourceRoot "../src" --outDir lib --module es2015 --project "/office-ui-fabric-react/packages/set-version/tsconfig.json"
+@uifabric/set-version: [XX:XX:XX XM] ■ Executing: /usr/local/bin/node "/office-ui-fabric-react/node_modules/typescript/lib/tsc.js" --pretty --target es5 --inlineSources --sourceRoot "../src" --outDir lib --module esnext --project "/office-ui-fabric-react/packages/set-version/tsconfig.json"
 @uifabric/set-version: [XX:XX:XX XM] ■ Running /office-ui-fabric-react/node_modules/typescript/lib/tsc.js with /office-ui-fabric-react/packages/set-version/tsconfig.json
 @uifabric/set-version: [XX:XX:XX XM] ■ Executing: /usr/local/bin/node "/office-ui-fabric-react/node_modules/typescript/lib/tsc.js" --pretty --target es5 --inlineSources --sourceRoot "../src" --outDir lib-amd --module amd --project "/office-ui-fabric-react/packages/set-version/tsconfig.json"
 @uifabric/set-version: [XX:XX:XX XM] ■ Running Webpack
@@ -50,7 +50,7 @@ Standard output:
 @uifabric/merge-styles: [XX:XX:XX XM] ■ Running /office-ui-fabric-react/node_modules/typescript/lib/tsc.js with /office-ui-fabric-react/packages/merge-styles/tsconfig.json
 @uifabric/merge-styles: [XX:XX:XX XM] ■ Executing: /usr/local/bin/node "/office-ui-fabric-react/node_modules/typescript/lib/tsc.js" --pretty --target es5 --inlineSources --sourceRoot "../src" --outDir lib-commonjs --module commonjs --project "/office-ui-fabric-react/packages/merge-styles/tsconfig.json"
 @uifabric/merge-styles: [XX:XX:XX XM] ■ Running /office-ui-fabric-react/node_modules/typescript/lib/tsc.js with /office-ui-fabric-react/packages/merge-styles/tsconfig.json
-@uifabric/merge-styles: [XX:XX:XX XM] ■ Executing: /usr/local/bin/node "/office-ui-fabric-react/node_modules/typescript/lib/tsc.js" --pretty --target es5 --inlineSources --sourceRoot "../src" --outDir lib --module es2015 --project "/office-ui-fabric-react/packages/merge-styles/tsconfig.json"
+@uifabric/merge-styles: [XX:XX:XX XM] ■ Executing: /usr/local/bin/node "/office-ui-fabric-react/node_modules/typescript/lib/tsc.js" --pretty --target es5 --inlineSources --sourceRoot "../src" --outDir lib --module esnext --project "/office-ui-fabric-react/packages/merge-styles/tsconfig.json"
 @uifabric/merge-styles: [XX:XX:XX XM] ■ Running /office-ui-fabric-react/node_modules/typescript/lib/tsc.js with /office-ui-fabric-react/packages/merge-styles/tsconfig.json
 @uifabric/merge-styles: [XX:XX:XX XM] ■ Executing: /usr/local/bin/node "/office-ui-fabric-react/node_modules/typescript/lib/tsc.js" --pretty --target es5 --inlineSources --sourceRoot "../src" --outDir lib-amd --module amd --project "/office-ui-fabric-react/packages/merge-styles/tsconfig.json"
 @uifabric/merge-styles: [XX:XX:XX XM] ■ Running Jest
@@ -78,7 +78,7 @@ Standard output:
 @uifabric/jest-serializer-merge-styles: [XX:XX:XX XM] ■ Running /office-ui-fabric-react/node_modules/typescript/lib/tsc.js with /office-ui-fabric-react/packages/jest-serializer-merge-styles/tsconfig.json
 @uifabric/jest-serializer-merge-styles: [XX:XX:XX XM] ■ Executing: /usr/local/bin/node "/office-ui-fabric-react/node_modules/typescript/lib/tsc.js" --pretty --target es5 --inlineSources --sourceRoot "../src" --outDir lib-commonjs --module commonjs --project "/office-ui-fabric-react/packages/jest-serializer-merge-styles/tsconfig.json"
 @uifabric/jest-serializer-merge-styles: [XX:XX:XX XM] ■ Running /office-ui-fabric-react/node_modules/typescript/lib/tsc.js with /office-ui-fabric-react/packages/jest-serializer-merge-styles/tsconfig.json
-@uifabric/jest-serializer-merge-styles: [XX:XX:XX XM] ■ Executing: /usr/local/bin/node "/office-ui-fabric-react/node_modules/typescript/lib/tsc.js" --pretty --target es5 --inlineSources --sourceRoot "../src" --outDir lib --module es2015 --project "/office-ui-fabric-react/packages/jest-serializer-merge-styles/tsconfig.json"
+@uifabric/jest-serializer-merge-styles: [XX:XX:XX XM] ■ Executing: /usr/local/bin/node "/office-ui-fabric-react/node_modules/typescript/lib/tsc.js" --pretty --target es5 --inlineSources --sourceRoot "../src" --outDir lib --module esnext --project "/office-ui-fabric-react/packages/jest-serializer-merge-styles/tsconfig.json"
 @uifabric/jest-serializer-merge-styles: [XX:XX:XX XM] ■ Running /office-ui-fabric-react/node_modules/typescript/lib/tsc.js with /office-ui-fabric-react/packages/jest-serializer-merge-styles/tsconfig.json
 @uifabric/jest-serializer-merge-styles: [XX:XX:XX XM] ■ Executing: /usr/local/bin/node "/office-ui-fabric-react/node_modules/typescript/lib/tsc.js" --pretty --target es5 --inlineSources --sourceRoot "../src" --outDir lib-amd --module amd --project "/office-ui-fabric-react/packages/jest-serializer-merge-styles/tsconfig.json"
 @uifabric/jest-serializer-merge-styles: [XX:XX:XX XM] ■ Running Jest
@@ -91,7 +91,7 @@ Standard output:
 @uifabric/test-utilities: [XX:XX:XX XM] ■ Running /office-ui-fabric-react/node_modules/typescript/lib/tsc.js with /office-ui-fabric-react/packages/test-utilities/tsconfig.json
 @uifabric/test-utilities: [XX:XX:XX XM] ■ Executing: /usr/local/bin/node "/office-ui-fabric-react/node_modules/typescript/lib/tsc.js" --pretty --target es5 --inlineSources --sourceRoot "../src" --outDir lib-commonjs --module commonjs --project "/office-ui-fabric-react/packages/test-utilities/tsconfig.json"
 @uifabric/test-utilities: [XX:XX:XX XM] ■ Running /office-ui-fabric-react/node_modules/typescript/lib/tsc.js with /office-ui-fabric-react/packages/test-utilities/tsconfig.json
-@uifabric/test-utilities: [XX:XX:XX XM] ■ Executing: /usr/local/bin/node "/office-ui-fabric-react/node_modules/typescript/lib/tsc.js" --pretty --target es5 --inlineSources --sourceRoot "../src" --outDir lib --module es2015 --project "/office-ui-fabric-react/packages/test-utilities/tsconfig.json"
+@uifabric/test-utilities: [XX:XX:XX XM] ■ Executing: /usr/local/bin/node "/office-ui-fabric-react/node_modules/typescript/lib/tsc.js" --pretty --target es5 --inlineSources --sourceRoot "../src" --outDir lib --module esnext --project "/office-ui-fabric-react/packages/test-utilities/tsconfig.json"
 @uifabric/test-utilities: [XX:XX:XX XM] ■ Running /office-ui-fabric-react/node_modules/typescript/lib/tsc.js with /office-ui-fabric-react/packages/test-utilities/tsconfig.json
 @uifabric/test-utilities: [XX:XX:XX XM] ■ Executing: /usr/local/bin/node "/office-ui-fabric-react/node_modules/typescript/lib/tsc.js" --pretty --target es5 --inlineSources --sourceRoot "../src" --outDir lib-amd --module amd --project "/office-ui-fabric-react/packages/test-utilities/tsconfig.json"
 @uifabric/test-utilities: Done in ?s.
@@ -103,7 +103,7 @@ Standard output:
 @uifabric/utilities: [XX:XX:XX XM] ■ Running /office-ui-fabric-react/node_modules/typescript/lib/tsc.js with /office-ui-fabric-react/packages/utilities/tsconfig.json
 @uifabric/utilities: [XX:XX:XX XM] ■ Executing: /usr/local/bin/node "/office-ui-fabric-react/node_modules/typescript/lib/tsc.js" --pretty --target es5 --inlineSources --sourceRoot "../src" --outDir lib-commonjs --module commonjs --project "/office-ui-fabric-react/packages/utilities/tsconfig.json"
 @uifabric/utilities: [XX:XX:XX XM] ■ Running /office-ui-fabric-react/node_modules/typescript/lib/tsc.js with /office-ui-fabric-react/packages/utilities/tsconfig.json
-@uifabric/utilities: [XX:XX:XX XM] ■ Executing: /usr/local/bin/node "/office-ui-fabric-react/node_modules/typescript/lib/tsc.js" --pretty --target es5 --inlineSources --sourceRoot "../src" --outDir lib --module es2015 --project "/office-ui-fabric-react/packages/utilities/tsconfig.json"
+@uifabric/utilities: [XX:XX:XX XM] ■ Executing: /usr/local/bin/node "/office-ui-fabric-react/node_modules/typescript/lib/tsc.js" --pretty --target es5 --inlineSources --sourceRoot "../src" --outDir lib --module esnext --project "/office-ui-fabric-react/packages/utilities/tsconfig.json"
 @uifabric/utilities: [XX:XX:XX XM] ■ Running /office-ui-fabric-react/node_modules/typescript/lib/tsc.js with /office-ui-fabric-react/packages/utilities/tsconfig.json
 @uifabric/utilities: [XX:XX:XX XM] ■ Executing: /usr/local/bin/node "/office-ui-fabric-react/node_modules/typescript/lib/tsc.js" --pretty --target es5 --inlineSources --sourceRoot "../src" --outDir lib-amd --module amd --project "/office-ui-fabric-react/packages/utilities/tsconfig.json"
 @uifabric/utilities: [XX:XX:XX XM] ■ Running Jest
@@ -156,7 +156,7 @@ Standard output:
 @uifabric/styling: [XX:XX:XX XM] ■ Running /office-ui-fabric-react/node_modules/typescript/lib/tsc.js with /office-ui-fabric-react/packages/styling/tsconfig.json
 @uifabric/styling: [XX:XX:XX XM] ■ Executing: /usr/local/bin/node "/office-ui-fabric-react/node_modules/typescript/lib/tsc.js" --pretty --target es5 --inlineSources --sourceRoot "../src" --outDir lib-commonjs --module commonjs --project "/office-ui-fabric-react/packages/styling/tsconfig.json"
 @uifabric/styling: [XX:XX:XX XM] ■ Running /office-ui-fabric-react/node_modules/typescript/lib/tsc.js with /office-ui-fabric-react/packages/styling/tsconfig.json
-@uifabric/styling: [XX:XX:XX XM] ■ Executing: /usr/local/bin/node "/office-ui-fabric-react/node_modules/typescript/lib/tsc.js" --pretty --target es5 --inlineSources --sourceRoot "../src" --outDir lib --module es2015 --project "/office-ui-fabric-react/packages/styling/tsconfig.json"
+@uifabric/styling: [XX:XX:XX XM] ■ Executing: /usr/local/bin/node "/office-ui-fabric-react/node_modules/typescript/lib/tsc.js" --pretty --target es5 --inlineSources --sourceRoot "../src" --outDir lib --module esnext --project "/office-ui-fabric-react/packages/styling/tsconfig.json"
 @uifabric/styling: [XX:XX:XX XM] ■ Running /office-ui-fabric-react/node_modules/typescript/lib/tsc.js with /office-ui-fabric-react/packages/styling/tsconfig.json
 @uifabric/styling: [XX:XX:XX XM] ■ Executing: /usr/local/bin/node "/office-ui-fabric-react/node_modules/typescript/lib/tsc.js" --pretty --target es5 --inlineSources --sourceRoot "../src" --outDir lib-amd --module amd --project "/office-ui-fabric-react/packages/styling/tsconfig.json"
 @uifabric/styling: [XX:XX:XX XM] ■ Running Jest
@@ -179,7 +179,7 @@ Standard output:
 @uifabric/file-type-icons: [XX:XX:XX XM] ■ Running /office-ui-fabric-react/node_modules/typescript/lib/tsc.js with /office-ui-fabric-react/packages/file-type-icons/tsconfig.json
 @uifabric/file-type-icons: [XX:XX:XX XM] ■ Executing: /usr/local/bin/node "/office-ui-fabric-react/node_modules/typescript/lib/tsc.js" --pretty --target es5 --inlineSources --sourceRoot "../src" --outDir lib-commonjs --module commonjs --project "/office-ui-fabric-react/packages/file-type-icons/tsconfig.json"
 @uifabric/file-type-icons: [XX:XX:XX XM] ■ Running /office-ui-fabric-react/node_modules/typescript/lib/tsc.js with /office-ui-fabric-react/packages/file-type-icons/tsconfig.json
-@uifabric/file-type-icons: [XX:XX:XX XM] ■ Executing: /usr/local/bin/node "/office-ui-fabric-react/node_modules/typescript/lib/tsc.js" --pretty --target es5 --inlineSources --sourceRoot "../src" --outDir lib --module es2015 --project "/office-ui-fabric-react/packages/file-type-icons/tsconfig.json"
+@uifabric/file-type-icons: [XX:XX:XX XM] ■ Executing: /usr/local/bin/node "/office-ui-fabric-react/node_modules/typescript/lib/tsc.js" --pretty --target es5 --inlineSources --sourceRoot "../src" --outDir lib --module esnext --project "/office-ui-fabric-react/packages/file-type-icons/tsconfig.json"
 @uifabric/file-type-icons: [XX:XX:XX XM] ■ Running /office-ui-fabric-react/node_modules/typescript/lib/tsc.js with /office-ui-fabric-react/packages/file-type-icons/tsconfig.json
 @uifabric/file-type-icons: [XX:XX:XX XM] ■ Executing: /usr/local/bin/node "/office-ui-fabric-react/node_modules/typescript/lib/tsc.js" --pretty --target es5 --inlineSources --sourceRoot "../src" --outDir lib-amd --module amd --project "/office-ui-fabric-react/packages/file-type-icons/tsconfig.json"
 @uifabric/file-type-icons: [XX:XX:XX XM] ■ Running Webpack
@@ -194,7 +194,7 @@ Standard output:
 @uifabric/foundation: [XX:XX:XX XM] ■ Running /office-ui-fabric-react/node_modules/typescript/lib/tsc.js with /office-ui-fabric-react/packages/foundation/tsconfig.json
 @uifabric/foundation: [XX:XX:XX XM] ■ Executing: /usr/local/bin/node "/office-ui-fabric-react/node_modules/typescript/lib/tsc.js" --pretty --target es5 --inlineSources --sourceRoot "../src" --outDir lib-commonjs --module commonjs --project "/office-ui-fabric-react/packages/foundation/tsconfig.json"
 @uifabric/foundation: [XX:XX:XX XM] ■ Running /office-ui-fabric-react/node_modules/typescript/lib/tsc.js with /office-ui-fabric-react/packages/foundation/tsconfig.json
-@uifabric/foundation: [XX:XX:XX XM] ■ Executing: /usr/local/bin/node "/office-ui-fabric-react/node_modules/typescript/lib/tsc.js" --pretty --target es5 --inlineSources --sourceRoot "../src" --outDir lib --module es2015 --project "/office-ui-fabric-react/packages/foundation/tsconfig.json"
+@uifabric/foundation: [XX:XX:XX XM] ■ Executing: /usr/local/bin/node "/office-ui-fabric-react/node_modules/typescript/lib/tsc.js" --pretty --target es5 --inlineSources --sourceRoot "../src" --outDir lib --module esnext --project "/office-ui-fabric-react/packages/foundation/tsconfig.json"
 @uifabric/foundation: [XX:XX:XX XM] ■ Running /office-ui-fabric-react/node_modules/typescript/lib/tsc.js with /office-ui-fabric-react/packages/foundation/tsconfig.json
 @uifabric/foundation: [XX:XX:XX XM] ■ Executing: /usr/local/bin/node "/office-ui-fabric-react/node_modules/typescript/lib/tsc.js" --pretty --target es5 --inlineSources --sourceRoot "../src" --outDir lib-amd --module amd --project "/office-ui-fabric-react/packages/foundation/tsconfig.json"
 @uifabric/foundation: [XX:XX:XX XM] ■ Running Jest

From 5233bcc064200e4b8fa9304d5f732aab8dacf604 Mon Sep 17 00:00:00 2001
From: Ben Lichtman <belichtm@microsoft.com>
Date: Fri, 2 Aug 2019 15:53:54 -0700
Subject: [PATCH 096/151] Avoid compile on save for declaration files

---
 src/server/session.ts | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/server/session.ts b/src/server/session.ts
index d663ca09249..66f21e88a76 100644
--- a/src/server/session.ts
+++ b/src/server/session.ts
@@ -1604,15 +1604,22 @@ namespace ts.server {
                 path => this.projectService.getScriptInfoForPath(path)!,
                 projects,
                 (project, info) => {
-                    let result: protocol.CompileOnSaveAffectedFileListSingleProject | undefined;
-                    if (project.compileOnSaveEnabled && project.languageServiceEnabled && !project.isOrphan() && !project.getCompilationSettings().noEmit) {
-                        result = {
-                            projectFileName: project.getProjectName(),
-                            fileNames: project.getCompileOnSaveAffectedFileList(info),
-                            projectUsesOutFile: !!project.getCompilationSettings().outFile || !!project.getCompilationSettings().out
-                        };
+                    if (!project.compileOnSaveEnabled || !project.languageServiceEnabled || project.isOrphan()) {
+                        return undefined;
                     }
-                    return result;
+
+                    const compilationSettings = project.getCompilationSettings();
+
+                    if (!!compilationSettings.noEmit || fileExtensionIs(info.fileName, Extension.Dts) && !getEmitDeclarations(compilationSettings)) {
+                        // avoid triggering emit when a change is made in a .d.ts when declaration emit is disabled
+                        return undefined;
+                    }
+
+                    return {
+                        projectFileName: project.getProjectName(),
+                        fileNames: project.getCompileOnSaveAffectedFileList(info),
+                        projectUsesOutFile: !!compilationSettings.outFile || !!compilationSettings.out
+                    };
                 }
             );
         }

From 0cab79fc567bb2b0c00e6cb0713ba6d1c451a9ee Mon Sep 17 00:00:00 2001
From: Ben Lichtman <belichtm@microsoft.com>
Date: Fri, 2 Aug 2019 15:56:01 -0700
Subject: [PATCH 097/151] Add test

---
 .../unittests/tsserver/compileOnSave.ts       | 97 +++++++++++++++++++
 1 file changed, 97 insertions(+)

diff --git a/src/testRunner/unittests/tsserver/compileOnSave.ts b/src/testRunner/unittests/tsserver/compileOnSave.ts
index 7dc9ea0497c..2773edb7d8d 100644
--- a/src/testRunner/unittests/tsserver/compileOnSave.ts
+++ b/src/testRunner/unittests/tsserver/compileOnSave.ts
@@ -503,6 +503,103 @@ namespace ts.projectSystem {
             });
         });
 
+        describe("for changes in declaration files", () => {
+            function testDTS(dtsFileContents: string, tsFileContents: string, opts: CompilerOptions, expectDTSEmit: boolean) {
+                const dtsFile = {
+                    path: "/a/runtime/a.d.ts",
+                    content: dtsFileContents
+                };
+                const f2 = {
+                    path: "/a/b.ts",
+                    content: tsFileContents
+                };
+                const config = {
+                    path: "/a/tsconfig.json",
+                    content: JSON.stringify({
+                        compilerOptions: opts,
+                        compileOnSave: true
+                    })
+                };
+                const host = createServerHost([dtsFile, f2, config]);
+                const session = projectSystem.createSession(host);
+                session.executeCommand(<protocol.OpenRequest>{
+                    seq: 1,
+                    type: "request",
+                    command: "open",
+                    arguments: { file: dtsFile.path }
+                });
+                const projectService = session.getProjectService();
+                checkNumberOfProjects(projectService, { configuredProjects: 1 });
+                const project = projectService.configuredProjects.get(config.path)!;
+                checkProjectRootFiles(project, [dtsFile.path, f2.path]);
+                session.executeCommand(<protocol.OpenRequest>{
+                    seq: 2,
+                    type: "request",
+                    command: "open",
+                    arguments: { file: f2.path }
+                });
+                checkNumberOfProjects(session.getProjectService(), { configuredProjects: 1 });
+                const { response } = session.executeCommand(<protocol.CompileOnSaveAffectedFileListRequest>{
+                    seq: 3,
+                    type: "request",
+                    command: "compileOnSaveAffectedFileList",
+                    arguments: { file: dtsFile.path }
+                });
+                if (expectDTSEmit) {
+                    assert.equal((response as protocol.CompileOnSaveAffectedFileListSingleProject[]).length, 1, "expected output from 1 project");
+                    assert.equal((response as protocol.CompileOnSaveAffectedFileListSingleProject[])[0].fileNames.length, 2, "expected to affect 2 files");
+                }
+                else {
+                    assert.equal((response as protocol.CompileOnSaveAffectedFileListSingleProject[]).length, 0, "expected no output");
+                }
+
+
+                const { response: response2 } = session.executeCommand(<protocol.CompileOnSaveAffectedFileListRequest>{
+                    seq: 4,
+                    type: "request",
+                    command: "compileOnSaveAffectedFileList",
+                    arguments: { file: f2.path }
+                });
+                assert.equal((response2 as protocol.CompileOnSaveAffectedFileListSingleProject[]).length, 1, "expected output from 1 project");
+            }
+
+            it("should return empty array if change is made in a global declaration file", () => {
+                testDTS(
+                /*dtsFileContents*/ "declare const x: string;",
+                /*tsFileContents*/ "var y = 1;",
+                /*opts*/ {},
+                /*expectDTSEmit*/ false
+                );
+            });
+
+            it("should return empty array if change is made in a module declaration file", () => {
+                testDTS(
+                /*dtsFileContents*/ "export const x: string;",
+                /*tsFileContents*/  "import { x } from './runtime/a;",
+                /*opts*/ {},
+                /*expectDTSEmit*/ false
+                );
+            });
+
+            it("should return results if change is made in a global declaration file with declaration emit", () => {
+                testDTS(
+                /*dtsFileContents*/ "declare const x: string;",
+                /*tsFileContents*/ "var y = 1;",
+                /*opts*/ { declaration: true },
+                /*expectDTSEmit*/ true
+                );
+            });
+
+            it("should return results if change is made in a global declaration file with composite enabled", () => {
+                testDTS(
+                /*dtsFileContents*/ "declare const x: string;",
+                /*tsFileContents*/ "var y = 1;",
+                /*opts*/ { composite: true },
+                /*expectDTSEmit*/ true
+                );
+            });
+        });
+
         describe("tsserverProjectSystem emit with outFile or out setting", () => {
             function test(opts: CompilerOptions, expectedUsesOutFile: boolean) {
                 const f1 = {

From 725321f08cae97db8c99fafa0fdb283e18a58429 Mon Sep 17 00:00:00 2001
From: Andrew Branch <andrewbranch@users.noreply.github.com>
Date: Fri, 2 Aug 2019 15:57:44 -0700
Subject: [PATCH 098/151] =?UTF-8?q?Prioritize=20=E2=80=9Cproperty=20names?=
 =?UTF-8?q?=E2=80=9D=20over=20punctuation=20in=20smart=20select=20(#32687)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Prioritize “property names” over punctuation in smart select

* Update doc comment
---
 src/services/smartSelection.ts                         | 10 ++++------
 .../reference/smartSelection_emptyRanges.baseline      |  5 ++++-
 .../smartSelection_punctuationPriority.baseline        |  6 ++++++
 .../fourslash/smartSelection_punctuationPriority.ts    |  5 +++++
 4 files changed, 19 insertions(+), 7 deletions(-)
 create mode 100644 tests/baselines/reference/smartSelection_punctuationPriority.baseline
 create mode 100644 tests/cases/fourslash/smartSelection_punctuationPriority.ts

diff --git a/src/services/smartSelection.ts b/src/services/smartSelection.ts
index 3765c39ed7a..0a2adcd9507 100644
--- a/src/services/smartSelection.ts
+++ b/src/services/smartSelection.ts
@@ -17,7 +17,7 @@ namespace ts.SmartSelectionRange {
                     break outer;
                 }
 
-                if (positionShouldSnapToNode(pos, node, nextNode)) {
+                if (positionShouldSnapToNode(sourceFile, pos, node)) {
                     // 1. Blocks are effectively redundant with SyntaxLists.
                     // 2. TemplateSpans, along with the SyntaxLists containing them, are a somewhat unintuitive grouping
                     //    of things that should be considered independently.
@@ -97,12 +97,11 @@ namespace ts.SmartSelectionRange {
      * count too, unless that position belongs to the next node. In effect, makes
      * selections able to snap to preceding tokens when the cursor is on the tail
      * end of them with only whitespace ahead.
+     * @param sourceFile The source file containing the nodes.
      * @param pos The position to check.
      * @param node The candidate node to snap to.
-     * @param nextNode The next sibling node in the tree.
-     * @param sourceFile The source file containing the nodes.
      */
-    function positionShouldSnapToNode(pos: number, node: Node, nextNode: Node | undefined) {
+    function positionShouldSnapToNode(sourceFile: SourceFile, pos: number, node: Node) {
         // Can’t use 'ts.positionBelongsToNode()' here because it cleverly accounts
         // for missing nodes, which can’t really be considered when deciding what
         // to select.
@@ -111,9 +110,8 @@ namespace ts.SmartSelectionRange {
             return true;
         }
         const nodeEnd = node.getEnd();
-        const nextNodeStart = nextNode && nextNode.getStart();
         if (nodeEnd === pos) {
-            return pos !== nextNodeStart;
+            return getTouchingPropertyName(sourceFile, pos).pos < node.end;
         }
         return false;
     }
diff --git a/tests/baselines/reference/smartSelection_emptyRanges.baseline b/tests/baselines/reference/smartSelection_emptyRanges.baseline
index 8ec58d839ab..efcb6e66ee9 100644
--- a/tests/baselines/reference/smartSelection_emptyRanges.baseline
+++ b/tests/baselines/reference/smartSelection_emptyRanges.baseline
@@ -44,7 +44,10 @@ class HomePage {
 }
 
 
-                           )  
+                   username   
+
+
+        this.props.username   
 
 
     if (this.props.username) {
diff --git a/tests/baselines/reference/smartSelection_punctuationPriority.baseline b/tests/baselines/reference/smartSelection_punctuationPriority.baseline
new file mode 100644
index 00000000000..176327b8c98
--- /dev/null
+++ b/tests/baselines/reference/smartSelection_punctuationPriority.baseline
@@ -0,0 +1,6 @@
+console/**/.log();
+
+console       
+console.log   
+console.log() 
+console.log();
\ No newline at end of file
diff --git a/tests/cases/fourslash/smartSelection_punctuationPriority.ts b/tests/cases/fourslash/smartSelection_punctuationPriority.ts
new file mode 100644
index 00000000000..af841444b48
--- /dev/null
+++ b/tests/cases/fourslash/smartSelection_punctuationPriority.ts
@@ -0,0 +1,5 @@
+/// <reference path="fourslash.ts" />
+
+////console/**/.log();
+
+verify.baselineSmartSelection();

From 62f65a7884188f7d4f9772bee1962ea2572d0967 Mon Sep 17 00:00:00 2001
From: Andrew Branch <andrewbranch@users.noreply.github.com>
Date: Fri, 2 Aug 2019 15:58:10 -0700
Subject: [PATCH 099/151] Make auto-imports more likely to be valid for the
 file (including JS) & project settings (#32684)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add failing tests

* Use default import or namespace import for import fixes when compiler options allow

* Don’t do import * for export=, ever

* Only do import default for export equals if nothing else will work

* Never do import/require in a JavaScript file

* Update tests for changes in master

* Add const/require fix for JS and select based on usage heuristic

* Fix JS UMD import
---
 src/harness/fourslash.ts                      |  5 +-
 src/services/codefixes/importFixes.ts         | 75 ++++++++++++++-----
 ...xNewImportExportEqualsCommonJSInteropOn.ts | 51 +++++++++++++
 ...ixNewImportExportEqualsESNextInteropOff.ts | 17 +++++
 ...FixNewImportExportEqualsESNextInteropOn.ts | 18 +++++
 ...eCodeFixNewImportExportEqualsJavaScript.ts | 31 ++++++++
 .../importNameCodeFixUMDGlobalJavaScript.ts   | 21 ++++++
 7 files changed, 200 insertions(+), 18 deletions(-)
 create mode 100644 tests/cases/fourslash/importNameCodeFixNewImportExportEqualsCommonJSInteropOn.ts
 create mode 100644 tests/cases/fourslash/importNameCodeFixNewImportExportEqualsESNextInteropOff.ts
 create mode 100644 tests/cases/fourslash/importNameCodeFixNewImportExportEqualsESNextInteropOn.ts
 create mode 100644 tests/cases/fourslash/importNameCodeFixNewImportExportEqualsJavaScript.ts
 create mode 100644 tests/cases/fourslash/importNameCodeFixUMDGlobalJavaScript.ts

diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts
index 18995f23304..3b09fc01fc0 100644
--- a/src/harness/fourslash.ts
+++ b/src/harness/fourslash.ts
@@ -2322,7 +2322,10 @@ namespace FourSlash {
         public applyCodeActionFromCompletion(markerName: string, options: FourSlashInterface.VerifyCompletionActionOptions) {
             this.goToMarker(markerName);
 
-            const details = this.getCompletionEntryDetails(options.name, options.source, options.preferences)!;
+            const details = this.getCompletionEntryDetails(options.name, options.source, options.preferences);
+            if (!details) {
+                return this.raiseError(`No completions were found for the given name, source, and preferences.`);
+            }
             const codeActions = details.codeActions!;
             if (codeActions.length !== 1) {
                 this.raiseError(`Expected one code action, got ${codeActions.length}`);
diff --git a/src/services/codefixes/importFixes.ts b/src/services/codefixes/importFixes.ts
index 5f1754c3036..267415f6cc0 100644
--- a/src/services/codefixes/importFixes.ts
+++ b/src/services/codefixes/importFixes.ts
@@ -135,7 +135,8 @@ namespace ts.codefix {
         Named,
         Default,
         Namespace,
-        Equals
+        Equals,
+        ConstEquals
     }
 
     /** Information about how a symbol is exported from a module. (We don't need to store the exported symbol, just its module.) */
@@ -163,7 +164,7 @@ namespace ts.codefix {
         position: number,
         preferences: UserPreferences,
     ): { readonly moduleSpecifier: string, readonly codeAction: CodeAction } {
-        const exportInfos = getAllReExportingModules(exportedSymbol, moduleSymbol, symbolName, sourceFile, program.getCompilerOptions(), program.getTypeChecker(), program.getSourceFiles());
+        const exportInfos = getAllReExportingModules(sourceFile, exportedSymbol, moduleSymbol, symbolName, sourceFile, program.getCompilerOptions(), program.getTypeChecker(), program.getSourceFiles());
         Debug.assert(exportInfos.some(info => info.moduleSymbol === moduleSymbol));
         // We sort the best codefixes first, so taking `first` is best for completions.
         const moduleSpecifier = first(getNewImportInfos(program, sourceFile, position, exportInfos, host, preferences)).moduleSpecifier;
@@ -175,7 +176,7 @@ namespace ts.codefix {
         return { description, changes, commands };
     }
 
-    function getAllReExportingModules(exportedSymbol: Symbol, exportingModuleSymbol: Symbol, symbolName: string, sourceFile: SourceFile, compilerOptions: CompilerOptions, checker: TypeChecker, allSourceFiles: ReadonlyArray<SourceFile>): ReadonlyArray<SymbolExportInfo> {
+    function getAllReExportingModules(importingFile: SourceFile, exportedSymbol: Symbol, exportingModuleSymbol: Symbol, symbolName: string, sourceFile: SourceFile, compilerOptions: CompilerOptions, checker: TypeChecker, allSourceFiles: ReadonlyArray<SourceFile>): ReadonlyArray<SymbolExportInfo> {
         const result: SymbolExportInfo[] = [];
         forEachExternalModule(checker, allSourceFiles, (moduleSymbol, moduleFile) => {
             // Don't import from a re-export when looking "up" like to `./index` or `../index`.
@@ -183,7 +184,7 @@ namespace ts.codefix {
                 return;
             }
 
-            const defaultInfo = getDefaultLikeExportInfo(moduleSymbol, checker, compilerOptions);
+            const defaultInfo = getDefaultLikeExportInfo(importingFile, moduleSymbol, checker, compilerOptions);
             if (defaultInfo && defaultInfo.name === symbolName && skipAlias(defaultInfo.symbol, checker) === exportedSymbol) {
                 result.push({ moduleSymbol, importKind: defaultInfo.kind, exportedSymbolIsTypeOnly: isTypeOnlySymbol(defaultInfo.symbol, checker) });
             }
@@ -329,7 +330,7 @@ namespace ts.codefix {
         if (!umdSymbol) return undefined;
         const symbol = checker.getAliasedSymbol(umdSymbol);
         const symbolName = umdSymbol.name;
-        const exportInfos: ReadonlyArray<SymbolExportInfo> = [{ moduleSymbol: symbol, importKind: getUmdImportKind(program.getCompilerOptions()), exportedSymbolIsTypeOnly: false }];
+        const exportInfos: ReadonlyArray<SymbolExportInfo> = [{ moduleSymbol: symbol, importKind: getUmdImportKind(sourceFile, program.getCompilerOptions()), exportedSymbolIsTypeOnly: false }];
         const fixes = getFixForImport(exportInfos, symbolName, isIdentifier(token) ? token.getStart(sourceFile) : undefined, program, sourceFile, host, preferences);
         return { fixes, symbolName };
     }
@@ -345,7 +346,7 @@ namespace ts.codefix {
             : undefined;
     }
 
-    function getUmdImportKind(compilerOptions: CompilerOptions): ImportKind {
+    function getUmdImportKind(importingFile: SourceFile, compilerOptions: CompilerOptions): ImportKind {
         // Import a synthetic `default` if enabled.
         if (getAllowSyntheticDefaultImports(compilerOptions)) {
             return ImportKind.Default;
@@ -357,7 +358,10 @@ namespace ts.codefix {
             case ModuleKind.AMD:
             case ModuleKind.CommonJS:
             case ModuleKind.UMD:
-                return ImportKind.Equals;
+                if (isInJSFile(importingFile)) {
+                    return isExternalModule(importingFile) ? ImportKind.Namespace : ImportKind.ConstEquals;
+                 }
+                 return ImportKind.Equals;
             case ModuleKind.System:
             case ModuleKind.ES2015:
             case ModuleKind.ESNext:
@@ -403,7 +407,7 @@ namespace ts.codefix {
         forEachExternalModuleToImportFrom(checker, sourceFile, program.getSourceFiles(), moduleSymbol => {
             cancellationToken.throwIfCancellationRequested();
 
-            const defaultInfo = getDefaultLikeExportInfo(moduleSymbol, checker, program.getCompilerOptions());
+            const defaultInfo = getDefaultLikeExportInfo(sourceFile, moduleSymbol, checker, program.getCompilerOptions());
             if (defaultInfo && defaultInfo.name === symbolName && symbolHasMeaning(defaultInfo.symbolForMeaning, currentTokenMeaning)) {
                 addSymbol(moduleSymbol, defaultInfo.symbol, defaultInfo.kind);
             }
@@ -418,20 +422,41 @@ namespace ts.codefix {
     }
 
     function getDefaultLikeExportInfo(
-        moduleSymbol: Symbol, checker: TypeChecker, compilerOptions: CompilerOptions,
-    ): { readonly symbol: Symbol, readonly symbolForMeaning: Symbol, readonly name: string, readonly kind: ImportKind.Default | ImportKind.Equals } | undefined {
-        const exported = getDefaultLikeExportWorker(moduleSymbol, checker);
+        importingFile: SourceFile, moduleSymbol: Symbol, checker: TypeChecker, compilerOptions: CompilerOptions,
+    ): { readonly symbol: Symbol, readonly symbolForMeaning: Symbol, readonly name: string, readonly kind: ImportKind } | undefined {
+        const exported = getDefaultLikeExportWorker(importingFile, moduleSymbol, checker, compilerOptions);
         if (!exported) return undefined;
         const { symbol, kind } = exported;
         const info = getDefaultExportInfoWorker(symbol, moduleSymbol, checker, compilerOptions);
         return info && { symbol, kind, ...info };
     }
 
-    function getDefaultLikeExportWorker(moduleSymbol: Symbol, checker: TypeChecker): { readonly symbol: Symbol, readonly kind: ImportKind.Default | ImportKind.Equals } | undefined {
+    function getDefaultLikeExportWorker(importingFile: SourceFile, moduleSymbol: Symbol, checker: TypeChecker, compilerOptions: CompilerOptions): { readonly symbol: Symbol, readonly kind: ImportKind } | undefined {
         const defaultExport = checker.tryGetMemberInModuleExports(InternalSymbolName.Default, moduleSymbol);
         if (defaultExport) return { symbol: defaultExport, kind: ImportKind.Default };
         const exportEquals = checker.resolveExternalModuleSymbol(moduleSymbol);
-        return exportEquals === moduleSymbol ? undefined : { symbol: exportEquals, kind: ImportKind.Equals };
+        return exportEquals === moduleSymbol ? undefined : { symbol: exportEquals, kind: getExportEqualsImportKind(importingFile, compilerOptions, checker) };
+    }
+
+    function getExportEqualsImportKind(importingFile: SourceFile, compilerOptions: CompilerOptions, checker: TypeChecker): ImportKind {
+        if (getAllowSyntheticDefaultImports(compilerOptions) && getEmitModuleKind(compilerOptions) >= ModuleKind.ES2015) {
+            return ImportKind.Default;
+        }
+        if (isInJSFile(importingFile)) {
+            return isExternalModule(importingFile) ? ImportKind.Default : ImportKind.ConstEquals;
+        }
+        for (const statement of importingFile.statements) {
+            if (isImportEqualsDeclaration(statement)) {
+                return ImportKind.Equals;
+            }
+            if (isImportDeclaration(statement) && statement.importClause && statement.importClause.name) {
+                const moduleSymbol = checker.getImmediateAliasedSymbol(statement.importClause.symbol);
+                if (moduleSymbol && moduleSymbol.name !== InternalSymbolName.Default) {
+                    return ImportKind.Default;
+                }
+            }
+        }
+        return ImportKind.Equals;
     }
 
     function getDefaultExportInfoWorker(defaultExport: Symbol, moduleSymbol: Symbol, checker: TypeChecker, compilerOptions: CompilerOptions): { readonly symbolForMeaning: Symbol, readonly name: string } | undefined {
@@ -543,7 +568,10 @@ namespace ts.codefix {
     interface ImportsCollection {
         readonly defaultImport: string | undefined;
         readonly namedImports: string[];
-        readonly namespaceLikeImport: { readonly importKind: ImportKind.Equals | ImportKind.Namespace, readonly name: string } | undefined;
+        readonly namespaceLikeImport: {
+            readonly importKind: ImportKind.Equals | ImportKind.Namespace | ImportKind.ConstEquals;
+            readonly name: string;
+        } | undefined;
     }
     function addNewImports(changes: textChanges.ChangeTracker, sourceFile: SourceFile, moduleSpecifier: string, quotePreference: QuotePreference, { defaultImport, namedImports, namespaceLikeImport }: ImportsCollection): void {
         const quotedModuleSpecifier = makeStringLiteral(moduleSpecifier, quotePreference);
@@ -554,12 +582,25 @@ namespace ts.codefix {
                     namedImports.map(n => createImportSpecifier(/*propertyName*/ undefined, createIdentifier(n))), moduleSpecifier, quotePreference));
         }
         if (namespaceLikeImport) {
-            insertImport(changes, sourceFile, namespaceLikeImport.importKind === ImportKind.Equals
-                ? createImportEqualsDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, createIdentifier(namespaceLikeImport.name), createExternalModuleReference(quotedModuleSpecifier))
-                : createImportDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, createImportClause(/*name*/ undefined, createNamespaceImport(createIdentifier(namespaceLikeImport.name))), quotedModuleSpecifier));
+            insertImport(
+                changes,
+                sourceFile,
+                namespaceLikeImport.importKind === ImportKind.Equals ? createImportEqualsDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, createIdentifier(namespaceLikeImport.name), createExternalModuleReference(quotedModuleSpecifier)) :
+                namespaceLikeImport.importKind === ImportKind.ConstEquals ? createConstEqualsRequireDeclaration(namespaceLikeImport.name, quotedModuleSpecifier) :
+                createImportDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, createImportClause(/*name*/ undefined, createNamespaceImport(createIdentifier(namespaceLikeImport.name))), quotedModuleSpecifier));
         }
     }
 
+    function createConstEqualsRequireDeclaration(name: string, quotedModuleSpecifier: StringLiteral): VariableStatement {
+        return createVariableStatement(/*modifiers*/ undefined, createVariableDeclarationList([
+            createVariableDeclaration(
+                createIdentifier(name),
+                /*type*/ undefined,
+                createCall(createIdentifier("require"), /*typeArguments*/ undefined, [quotedModuleSpecifier])
+            )
+        ], NodeFlags.Const));
+    }
+
     function symbolHasMeaning({ declarations }: Symbol, meaning: SemanticMeaning): boolean {
         return some(declarations, decl => !!(getMeaningFromDeclaration(decl) & meaning));
     }
diff --git a/tests/cases/fourslash/importNameCodeFixNewImportExportEqualsCommonJSInteropOn.ts b/tests/cases/fourslash/importNameCodeFixNewImportExportEqualsCommonJSInteropOn.ts
new file mode 100644
index 00000000000..e8f223ca9f4
--- /dev/null
+++ b/tests/cases/fourslash/importNameCodeFixNewImportExportEqualsCommonJSInteropOn.ts
@@ -0,0 +1,51 @@
+/// <reference path="fourslash.ts" />
+
+// @Module: commonjs
+// @EsModuleInterop: true
+
+// @Filename: /foo.d.ts
+////declare module "bar" {
+////  const bar: number;
+////  export = bar;
+////}
+////declare module "foo" {
+////  const foo: number;
+////  export = foo;
+////}
+////declare module "es" {
+////  const es = 0;
+////  export default es;
+////}
+
+// @Filename: /a.ts
+////import bar from "bar";
+////
+////foo
+
+// @Filename: /b.ts
+////foo
+
+// @Filename: /c.ts
+////import es from "es";
+////
+////foo
+
+// 1. Should match existing imports of 'export ='
+goTo.file('/a.ts');
+verify.importFixAtPosition([`import bar from "bar";
+import foo from "foo";
+
+foo`]);
+
+// 2. Should default to ImportEquals
+goTo.file('/b.ts');
+verify.importFixAtPosition([`import foo = require("foo");
+
+foo`]);
+
+// 3. Importing an 'export default' doesn’t count toward the usage heursitic
+goTo.file('/c.ts');
+verify.importFixAtPosition([`import es from "es";
+import foo = require("foo");
+
+foo`]);
\ No newline at end of file
diff --git a/tests/cases/fourslash/importNameCodeFixNewImportExportEqualsESNextInteropOff.ts b/tests/cases/fourslash/importNameCodeFixNewImportExportEqualsESNextInteropOff.ts
new file mode 100644
index 00000000000..329006cab93
--- /dev/null
+++ b/tests/cases/fourslash/importNameCodeFixNewImportExportEqualsESNextInteropOff.ts
@@ -0,0 +1,17 @@
+/// <reference path="fourslash.ts" />
+
+// @Module: esnext
+
+// @Filename: /foo.d.ts
+////declare module "foo" {
+////  const foo: number;
+////  export = foo;
+////}
+
+// @Filename: /index.ts
+////foo
+
+goTo.file('/index.ts');
+verify.importFixAtPosition([`import foo = require("foo");
+
+foo`]);
diff --git a/tests/cases/fourslash/importNameCodeFixNewImportExportEqualsESNextInteropOn.ts b/tests/cases/fourslash/importNameCodeFixNewImportExportEqualsESNextInteropOn.ts
new file mode 100644
index 00000000000..3803e05d0d1
--- /dev/null
+++ b/tests/cases/fourslash/importNameCodeFixNewImportExportEqualsESNextInteropOn.ts
@@ -0,0 +1,18 @@
+/// <reference path="fourslash.ts" />
+
+// @EsModuleInterop: true
+// @Module: es2015
+
+// @Filename: /foo.d.ts
+////declare module "foo" {
+////  const foo: number;
+////  export = foo;
+////}
+
+// @Filename: /index.ts
+////[|foo|]
+
+goTo.file('/index.ts');
+verify.importFixAtPosition([`import foo from "foo";
+
+foo`]);
diff --git a/tests/cases/fourslash/importNameCodeFixNewImportExportEqualsJavaScript.ts b/tests/cases/fourslash/importNameCodeFixNewImportExportEqualsJavaScript.ts
new file mode 100644
index 00000000000..d7a9e82c200
--- /dev/null
+++ b/tests/cases/fourslash/importNameCodeFixNewImportExportEqualsJavaScript.ts
@@ -0,0 +1,31 @@
+/// <reference path="fourslash.ts" />
+
+// @allowJs: true
+// @checkJs: true
+
+// @Filename: /foo.d.ts
+////declare module "foo" {
+////  const foo: number;
+////  export = foo;
+////}
+
+// @Filename: /a.js
+////foo
+
+// @Filename: /b.js
+////import "";
+////
+////foo
+
+// 1. JavaScript should default to 'const ... = require...' without compiler flags set
+goTo.file('/a.js');
+verify.importFixAtPosition([`const foo = require("foo");
+
+foo`]);
+
+// 2. If there are any ImportDeclarations, assume a default import is fine
+goTo.file('/b.js');
+verify.importFixAtPosition([`import "";
+import foo from "foo";
+
+foo`]);
diff --git a/tests/cases/fourslash/importNameCodeFixUMDGlobalJavaScript.ts b/tests/cases/fourslash/importNameCodeFixUMDGlobalJavaScript.ts
new file mode 100644
index 00000000000..161496cc92a
--- /dev/null
+++ b/tests/cases/fourslash/importNameCodeFixUMDGlobalJavaScript.ts
@@ -0,0 +1,21 @@
+/// <reference path="fourslash.ts" />
+
+// @AllowSyntheticDefaultImports: false
+// @Module: commonjs
+// @CheckJs: true
+// @AllowJs: true
+
+// @Filename: a/f1.js
+//// [|export function test() { };
+//// bar1/*0*/.bar;|]
+
+// @Filename: a/foo.d.ts
+//// export declare function bar(): number;
+//// export as namespace bar1; 
+
+verify.importFixAtPosition([
+`import * as bar1 from "./foo";
+
+export function test() { };
+bar1.bar;`
+]);
\ No newline at end of file

From 6b4f73053569106c49f34b1763cb2c851d8b238d Mon Sep 17 00:00:00 2001
From: Wesley Wigham <wewigham@microsoft.com>
Date: Fri, 2 Aug 2019 16:14:19 -0700
Subject: [PATCH 100/151] Fix binding of jsdoc typedefs with no in-comment name
 attached to an expression statement (#32610)

* Fix binding of jsdoc typedefs with no in-comment name attached to an expression statement

* Check toplevel flag before bind

* Small renames
---
 src/compiler/binder.ts                        |  30 +++--
 src/compiler/types.ts                         |   6 +-
 src/compiler/utilities.ts                     |   5 +-
 .../reference/api/tsserverlibrary.d.ts        |  32 ++---
 tests/baselines/reference/api/typescript.d.ts |  32 ++---
 ...checkJsdocTypeTagOnObjectProperty1.symbols |  14 +--
 .../checkObjectDefineProperty.symbols         |  26 ++---
 .../checkOtherObjectAssignProperty.symbols    |  26 ++---
 .../constructorFunctionsStrict.symbols        |   6 +-
 .../contextualTypedSpecialAssignment.symbols  |   8 +-
 ...tDefaultExportWithStaticAssignment.symbols |   6 +-
 ...nmentDefineProperrtyPotentialMerge.symbols |   8 +-
 .../reference/enumMergeWithExpando.symbols    |  22 ++--
 .../jsContainerMergeTsDeclaration2.symbols    |   6 +-
 .../reference/jsEnumCrossFileExport.symbols   |  89 ++++++++++++++
 .../reference/jsEnumCrossFileExport.types     | 109 ++++++++++++++++++
 .../jsEnumFunctionLocalNoCrash.symbols        |  45 ++++++++
 .../jsEnumFunctionLocalNoCrash.types          |  60 ++++++++++
 .../jsdocTemplateConstructorFunction.symbols  |   6 +-
 .../jsdocTemplateConstructorFunction2.symbols |   6 +-
 .../jsdocTypeFromChainedAssignment.symbols    |  20 ++--
 .../misspelledJsDocTypedefTags.symbols        |   4 +-
 ...xportWithExportPropertyAssignment4.symbols |  10 +-
 .../reference/targetTypeTest1.errors.txt      |   8 +-
 .../reference/targetTypeTest1.symbols         |   2 -
 .../reference/typeFromJSInitializer.symbols   |  26 ++---
 .../typeFromPropertyAssignment10.symbols      |  70 +++++------
 .../typeFromPropertyAssignment17.symbols      |  10 +-
 .../typeFromPropertyAssignment25.symbols      |  12 +-
 .../typeFromPropertyAssignment26.symbols      |  10 +-
 .../typeFromPropertyAssignment29.symbols      |  44 +++----
 .../typeFromPropertyAssignment31.symbols      |  44 +++----
 .../typeFromPropertyAssignment32.symbols      |  44 +++----
 .../typeFromPropertyAssignment33.symbols      |  44 +++----
 .../typeFromPropertyAssignment34.symbols      |  20 ++--
 .../typeFromPropertyAssignment6.symbols       |   8 +-
 .../typeFromPropertyAssignment9.symbols       | 102 ++++++++--------
 ...peFromPropertyAssignmentWithExport.symbols |   6 +-
 tests/cases/compiler/jsEnumCrossFileExport.ts |  43 +++++++
 .../compiler/jsEnumFunctionLocalNoCrash.ts    |  20 ++++
 40 files changed, 739 insertions(+), 350 deletions(-)
 create mode 100644 tests/baselines/reference/jsEnumCrossFileExport.symbols
 create mode 100644 tests/baselines/reference/jsEnumCrossFileExport.types
 create mode 100644 tests/baselines/reference/jsEnumFunctionLocalNoCrash.symbols
 create mode 100644 tests/baselines/reference/jsEnumFunctionLocalNoCrash.types
 create mode 100644 tests/cases/compiler/jsEnumCrossFileExport.ts
 create mode 100644 tests/cases/compiler/jsEnumFunctionLocalNoCrash.ts

diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts
index d18ab45a347..3445d26e4c3 100644
--- a/src/compiler/binder.ts
+++ b/src/compiler/binder.ts
@@ -490,11 +490,11 @@ namespace ts {
                 //       and should never be merged directly with other augmentation, and the latter case would be possible if automatic merge is allowed.
                 if (isJSDocTypeAlias(node)) Debug.assert(isInJSFile(node)); // We shouldn't add symbols for JSDoc nodes if not in a JS file.
                 if ((!isAmbientModule(node) && (hasExportModifier || container.flags & NodeFlags.ExportContext)) || isJSDocTypeAlias(node)) {
-                    if (hasModifier(node, ModifierFlags.Default) && !getDeclarationName(node)) {
+                    if (!container.locals || (hasModifier(node, ModifierFlags.Default) && !getDeclarationName(node))) {
                         return declareSymbol(container.symbol.exports!, container.symbol, node, symbolFlags, symbolExcludes); // No local symbol for an unnamed default!
                     }
                     const exportKind = symbolFlags & SymbolFlags.Value ? SymbolFlags.ExportValue : 0;
-                    const local = declareSymbol(container.locals!, /*parent*/ undefined, node, exportKind, symbolExcludes);
+                    const local = declareSymbol(container.locals, /*parent*/ undefined, node, exportKind, symbolExcludes);
                     local.exportSymbol = declareSymbol(container.symbol.exports!, container.symbol, node, symbolFlags, symbolExcludes);
                     node.localSymbol = local;
                     return local;
@@ -1806,7 +1806,19 @@ namespace ts {
                 currentFlow = { flags: FlowFlags.Start };
                 parent = typeAlias;
                 bind(typeAlias.typeExpression);
-                if (isJSDocEnumTag(typeAlias) || !typeAlias.fullName || typeAlias.fullName.kind === SyntaxKind.Identifier) {
+                const declName = getNameOfDeclaration(typeAlias);
+                if ((isJSDocEnumTag(typeAlias) || !typeAlias.fullName) && declName && isPropertyAccessEntityNameExpression(declName.parent)) {
+                    // typedef anchored to an A.B.C assignment - we need to bind into B's namespace under name C
+                    const isTopLevel = isTopLevelNamespaceAssignment(declName.parent);
+                    if (isTopLevel) {
+                        bindPotentiallyMissingNamespaces(file.symbol, declName.parent, isTopLevel, !!findAncestor(declName, d => isPropertyAccessExpression(d) && d.name.escapedText === "prototype"));
+                        const oldContainer = container;
+                        container = isPropertyAccessExpression(declName.parent.expression) ? declName.parent.expression.name : declName.parent.expression;
+                        declareModuleMember(typeAlias, SymbolFlags.TypeAlias, SymbolFlags.TypeAliasExcludes);
+                        container = oldContainer;
+                    }
+                }
+                else if (isJSDocEnumTag(typeAlias) || !typeAlias.fullName || typeAlias.fullName.kind === SyntaxKind.Identifier) {
                     parent = typeAlias.parent;
                     bindBlockScopedDeclaration(typeAlias, SymbolFlags.TypeAlias, SymbolFlags.TypeAliasExcludes);
                 }
@@ -2607,7 +2619,7 @@ namespace ts {
         }
 
         function bindPotentiallyMissingNamespaces(namespaceSymbol: Symbol | undefined, entityName: EntityNameExpression, isToplevel: boolean, isPrototypeProperty: boolean) {
-            if (isToplevel && !isPrototypeProperty && (!namespaceSymbol || !(namespaceSymbol.flags & SymbolFlags.Namespace))) {
+            if (isToplevel && !isPrototypeProperty) {
                 // make symbols or add declarations for intermediate containers
                 const flags = SymbolFlags.Module | SymbolFlags.Assignment;
                 const excludeFlags = SymbolFlags.ValueModuleExcludes & ~SymbolFlags.Assignment;
@@ -2642,11 +2654,15 @@ namespace ts {
             declareSymbol(symbolTable, namespaceSymbol, declaration, includes | SymbolFlags.Assignment, excludes & ~SymbolFlags.Assignment);
         }
 
-        function bindPropertyAssignment(name: EntityNameExpression, propertyAccess: PropertyAccessEntityNameExpression, isPrototypeProperty: boolean) {
-            let namespaceSymbol = lookupSymbolForPropertyAccess(name);
-            const isToplevel = isBinaryExpression(propertyAccess.parent)
+        function isTopLevelNamespaceAssignment(propertyAccess: PropertyAccessEntityNameExpression) {
+            return isBinaryExpression(propertyAccess.parent)
                 ? getParentOfBinaryExpression(propertyAccess.parent).parent.kind === SyntaxKind.SourceFile
                 : propertyAccess.parent.parent.kind === SyntaxKind.SourceFile;
+        }
+
+        function bindPropertyAssignment(name: EntityNameExpression, propertyAccess: PropertyAccessEntityNameExpression, isPrototypeProperty: boolean) {
+            let namespaceSymbol = lookupSymbolForPropertyAccess(name);
+            const isToplevel = isTopLevelNamespaceAssignment(propertyAccess);
             namespaceSymbol = bindPotentiallyMissingNamespaces(namespaceSymbol, propertyAccess.expression, isToplevel, isPrototypeProperty);
             bindPotentiallyNewExpandoMemberToNamespace(propertyAccess, namespaceSymbol, isPrototypeProperty);
         }
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index eda95095955..3f1b30feb45 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -3661,8 +3661,8 @@ namespace ts {
 
         Enum = RegularEnum | ConstEnum,
         Variable = FunctionScopedVariable | BlockScopedVariable,
-        Value = Variable | Property | EnumMember | ObjectLiteral | Function | Class | Enum | ValueModule | Method | GetAccessor | SetAccessor | Assignment,
-        Type = Class | Interface | Enum | EnumMember | TypeLiteral | TypeParameter | TypeAlias | Assignment,
+        Value = Variable | Property | EnumMember | ObjectLiteral | Function | Class | Enum | ValueModule | Method | GetAccessor | SetAccessor,
+        Type = Class | Interface | Enum | EnumMember | TypeLiteral | TypeParameter | TypeAlias,
         Namespace = ValueModule | NamespaceModule | Enum,
         Module = ValueModule | NamespaceModule,
         Accessor = GetAccessor | SetAccessor,
@@ -3683,7 +3683,7 @@ namespace ts {
         InterfaceExcludes = Type & ~(Interface | Class),
         RegularEnumExcludes = (Value | Type) & ~(RegularEnum | ValueModule), // regular enums merge only with regular enums and modules
         ConstEnumExcludes = (Value | Type) & ~ConstEnum, // const enums merge only with const enums
-        ValueModuleExcludes = Value & ~(Function | Class | RegularEnum | ValueModule | Assignment),
+        ValueModuleExcludes = Value & ~(Function | Class | RegularEnum | ValueModule),
         NamespaceModuleExcludes = 0,
         MethodExcludes = Value & ~Method,
         GetAccessorExcludes = Value & ~SetAccessor,
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index aa6e974c8e8..91e6515f664 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -5124,7 +5124,10 @@ namespace ts {
                 }
                 break;
             case SyntaxKind.ExpressionStatement:
-                const expr = hostNode.expression;
+                let expr = hostNode.expression;
+                if (expr.kind === SyntaxKind.BinaryExpression && (expr as BinaryExpression).operatorToken.kind === SyntaxKind.EqualsToken) {
+                    expr = (expr as BinaryExpression).left;
+                }
                 switch (expr.kind) {
                     case SyntaxKind.PropertyAccessExpression:
                         return (expr as PropertyAccessExpression).name;
diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts
index a13fd7592ea..2f5960f9c21 100644
--- a/tests/baselines/reference/api/tsserverlibrary.d.ts
+++ b/tests/baselines/reference/api/tsserverlibrary.d.ts
@@ -2127,28 +2127,28 @@ declare namespace ts {
         ModuleExports = 134217728,
         Enum = 384,
         Variable = 3,
-        Value = 67220415,
-        Type = 67897832,
+        Value = 111551,
+        Type = 788968,
         Namespace = 1920,
         Module = 1536,
         Accessor = 98304,
-        FunctionScopedVariableExcludes = 67220414,
-        BlockScopedVariableExcludes = 67220415,
-        ParameterExcludes = 67220415,
+        FunctionScopedVariableExcludes = 111550,
+        BlockScopedVariableExcludes = 111551,
+        ParameterExcludes = 111551,
         PropertyExcludes = 0,
-        EnumMemberExcludes = 68008959,
-        FunctionExcludes = 67219887,
-        ClassExcludes = 68008383,
-        InterfaceExcludes = 67897736,
-        RegularEnumExcludes = 68008191,
-        ConstEnumExcludes = 68008831,
+        EnumMemberExcludes = 900095,
+        FunctionExcludes = 111023,
+        ClassExcludes = 899519,
+        InterfaceExcludes = 788872,
+        RegularEnumExcludes = 899327,
+        ConstEnumExcludes = 899967,
         ValueModuleExcludes = 110735,
         NamespaceModuleExcludes = 0,
-        MethodExcludes = 67212223,
-        GetAccessorExcludes = 67154879,
-        SetAccessorExcludes = 67187647,
-        TypeParameterExcludes = 67635688,
-        TypeAliasExcludes = 67897832,
+        MethodExcludes = 103359,
+        GetAccessorExcludes = 46015,
+        SetAccessorExcludes = 78783,
+        TypeParameterExcludes = 526824,
+        TypeAliasExcludes = 788968,
         AliasExcludes = 2097152,
         ModuleMember = 2623475,
         ExportHasLocal = 944,
diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts
index 64f83da0123..0b7ee8d086d 100644
--- a/tests/baselines/reference/api/typescript.d.ts
+++ b/tests/baselines/reference/api/typescript.d.ts
@@ -2127,28 +2127,28 @@ declare namespace ts {
         ModuleExports = 134217728,
         Enum = 384,
         Variable = 3,
-        Value = 67220415,
-        Type = 67897832,
+        Value = 111551,
+        Type = 788968,
         Namespace = 1920,
         Module = 1536,
         Accessor = 98304,
-        FunctionScopedVariableExcludes = 67220414,
-        BlockScopedVariableExcludes = 67220415,
-        ParameterExcludes = 67220415,
+        FunctionScopedVariableExcludes = 111550,
+        BlockScopedVariableExcludes = 111551,
+        ParameterExcludes = 111551,
         PropertyExcludes = 0,
-        EnumMemberExcludes = 68008959,
-        FunctionExcludes = 67219887,
-        ClassExcludes = 68008383,
-        InterfaceExcludes = 67897736,
-        RegularEnumExcludes = 68008191,
-        ConstEnumExcludes = 68008831,
+        EnumMemberExcludes = 900095,
+        FunctionExcludes = 111023,
+        ClassExcludes = 899519,
+        InterfaceExcludes = 788872,
+        RegularEnumExcludes = 899327,
+        ConstEnumExcludes = 899967,
         ValueModuleExcludes = 110735,
         NamespaceModuleExcludes = 0,
-        MethodExcludes = 67212223,
-        GetAccessorExcludes = 67154879,
-        SetAccessorExcludes = 67187647,
-        TypeParameterExcludes = 67635688,
-        TypeAliasExcludes = 67897832,
+        MethodExcludes = 103359,
+        GetAccessorExcludes = 46015,
+        SetAccessorExcludes = 78783,
+        TypeParameterExcludes = 526824,
+        TypeAliasExcludes = 788968,
         AliasExcludes = 2097152,
         ModuleMember = 2623475,
         ExportHasLocal = 944,
diff --git a/tests/baselines/reference/checkJsdocTypeTagOnObjectProperty1.symbols b/tests/baselines/reference/checkJsdocTypeTagOnObjectProperty1.symbols
index 68693872a4b..b2e22ae924a 100644
--- a/tests/baselines/reference/checkJsdocTypeTagOnObjectProperty1.symbols
+++ b/tests/baselines/reference/checkJsdocTypeTagOnObjectProperty1.symbols
@@ -4,7 +4,7 @@ var lol = "hello Lol"
 >lol : Symbol(lol, Decl(0.js, 1, 3))
 
 const obj = {
->obj : Symbol(obj, Decl(0.js, 2, 5), Decl(0.js, 17, 1))
+>obj : Symbol(obj, Decl(0.js, 2, 5), Decl(0.js, 17, 1), Decl(0.js, 19, 7), Decl(0.js, 21, 23))
 
   /** @type {string|undefined} */
   foo: undefined,
@@ -40,31 +40,31 @@ const obj = {
 }
 obj.foo = 'string'
 >obj.foo : Symbol(foo, Decl(0.js, 2, 13))
->obj : Symbol(obj, Decl(0.js, 2, 5), Decl(0.js, 17, 1))
+>obj : Symbol(obj, Decl(0.js, 2, 5), Decl(0.js, 17, 1), Decl(0.js, 19, 7), Decl(0.js, 21, 23))
 >foo : Symbol(foo, Decl(0.js, 2, 13))
 
 obj.lol
 >obj.lol : Symbol(lol, Decl(0.js, 10, 4))
->obj : Symbol(obj, Decl(0.js, 2, 5), Decl(0.js, 17, 1))
+>obj : Symbol(obj, Decl(0.js, 2, 5), Decl(0.js, 17, 1), Decl(0.js, 19, 7), Decl(0.js, 21, 23))
 >lol : Symbol(lol, Decl(0.js, 10, 4))
 
 obj.bar = undefined;
 >obj.bar : Symbol(bar, Decl(0.js, 4, 17))
->obj : Symbol(obj, Decl(0.js, 2, 5), Decl(0.js, 17, 1))
+>obj : Symbol(obj, Decl(0.js, 2, 5), Decl(0.js, 17, 1), Decl(0.js, 19, 7), Decl(0.js, 21, 23))
 >bar : Symbol(bar, Decl(0.js, 4, 17))
 >undefined : Symbol(undefined)
 
 var k = obj.method1(0);
 >k : Symbol(k, Decl(0.js, 21, 3))
 >obj.method1 : Symbol(method1, Decl(0.js, 6, 12))
->obj : Symbol(obj, Decl(0.js, 2, 5), Decl(0.js, 17, 1))
+>obj : Symbol(obj, Decl(0.js, 2, 5), Decl(0.js, 17, 1), Decl(0.js, 19, 7), Decl(0.js, 21, 23))
 >method1 : Symbol(method1, Decl(0.js, 6, 12))
 
 obj.bar1 = "42";
->obj : Symbol(obj, Decl(0.js, 2, 5), Decl(0.js, 17, 1))
+>obj : Symbol(obj, Decl(0.js, 2, 5), Decl(0.js, 17, 1), Decl(0.js, 19, 7), Decl(0.js, 21, 23))
 
 obj.arrowFunc(0);
 >obj.arrowFunc : Symbol(arrowFunc, Decl(0.js, 14, 20))
->obj : Symbol(obj, Decl(0.js, 2, 5), Decl(0.js, 17, 1))
+>obj : Symbol(obj, Decl(0.js, 2, 5), Decl(0.js, 17, 1), Decl(0.js, 19, 7), Decl(0.js, 21, 23))
 >arrowFunc : Symbol(arrowFunc, Decl(0.js, 14, 20))
 
diff --git a/tests/baselines/reference/checkObjectDefineProperty.symbols b/tests/baselines/reference/checkObjectDefineProperty.symbols
index 28512d018a4..6b746640af8 100644
--- a/tests/baselines/reference/checkObjectDefineProperty.symbols
+++ b/tests/baselines/reference/checkObjectDefineProperty.symbols
@@ -70,13 +70,13 @@ x.middleInit = "R"; // should also fail
 
 === tests/cases/conformance/jsdoc/index.js ===
 const x = {};
->x : Symbol(x, Decl(index.js, 0, 5), Decl(index.js, 1, 22))
+>x : Symbol(x, Decl(index.js, 0, 5), Decl(index.js, 1, 22), Decl(index.js, 2, 22), Decl(index.js, 3, 22), Decl(index.js, 4, 22) ... and 2 more)
 
 Object.defineProperty(x, "name", { value: "Charles", writable: true });
 >Object.defineProperty : Symbol(ObjectConstructor.defineProperty, Decl(lib.es5.d.ts, --, --))
 >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 >defineProperty : Symbol(ObjectConstructor.defineProperty, Decl(lib.es5.d.ts, --, --))
->x : Symbol(x, Decl(index.js, 0, 5), Decl(index.js, 1, 22))
+>x : Symbol(x, Decl(index.js, 0, 5), Decl(index.js, 1, 22), Decl(index.js, 2, 22), Decl(index.js, 3, 22), Decl(index.js, 4, 22) ... and 2 more)
 >"name" : Symbol(x.name, Decl(index.js, 0, 13))
 >value : Symbol(value, Decl(index.js, 1, 34))
 >writable : Symbol(writable, Decl(index.js, 1, 52))
@@ -85,7 +85,7 @@ Object.defineProperty(x, "middleInit", { value: "H" });
 >Object.defineProperty : Symbol(ObjectConstructor.defineProperty, Decl(lib.es5.d.ts, --, --))
 >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 >defineProperty : Symbol(ObjectConstructor.defineProperty, Decl(lib.es5.d.ts, --, --))
->x : Symbol(x, Decl(index.js, 0, 5), Decl(index.js, 1, 22))
+>x : Symbol(x, Decl(index.js, 0, 5), Decl(index.js, 1, 22), Decl(index.js, 2, 22), Decl(index.js, 3, 22), Decl(index.js, 4, 22) ... and 2 more)
 >"middleInit" : Symbol(x.middleInit, Decl(index.js, 1, 71))
 >value : Symbol(value, Decl(index.js, 2, 40))
 
@@ -93,7 +93,7 @@ Object.defineProperty(x, "lastName", { value: "Smith", writable: false });
 >Object.defineProperty : Symbol(ObjectConstructor.defineProperty, Decl(lib.es5.d.ts, --, --))
 >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 >defineProperty : Symbol(ObjectConstructor.defineProperty, Decl(lib.es5.d.ts, --, --))
->x : Symbol(x, Decl(index.js, 0, 5), Decl(index.js, 1, 22))
+>x : Symbol(x, Decl(index.js, 0, 5), Decl(index.js, 1, 22), Decl(index.js, 2, 22), Decl(index.js, 3, 22), Decl(index.js, 4, 22) ... and 2 more)
 >"lastName" : Symbol(x.lastName, Decl(index.js, 2, 55))
 >value : Symbol(value, Decl(index.js, 3, 38))
 >writable : Symbol(writable, Decl(index.js, 3, 54))
@@ -102,7 +102,7 @@ Object.defineProperty(x, "zip", { get() { return 98122 }, set(_) { /*ignore*/ }
 >Object.defineProperty : Symbol(ObjectConstructor.defineProperty, Decl(lib.es5.d.ts, --, --))
 >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 >defineProperty : Symbol(ObjectConstructor.defineProperty, Decl(lib.es5.d.ts, --, --))
->x : Symbol(x, Decl(index.js, 0, 5), Decl(index.js, 1, 22))
+>x : Symbol(x, Decl(index.js, 0, 5), Decl(index.js, 1, 22), Decl(index.js, 2, 22), Decl(index.js, 3, 22), Decl(index.js, 4, 22) ... and 2 more)
 >"zip" : Symbol(x.zip, Decl(index.js, 3, 74))
 >get : Symbol(get, Decl(index.js, 4, 33))
 >set : Symbol(set, Decl(index.js, 4, 57))
@@ -112,7 +112,7 @@ Object.defineProperty(x, "houseNumber", { get() { return 21.75 } });
 >Object.defineProperty : Symbol(ObjectConstructor.defineProperty, Decl(lib.es5.d.ts, --, --))
 >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 >defineProperty : Symbol(ObjectConstructor.defineProperty, Decl(lib.es5.d.ts, --, --))
->x : Symbol(x, Decl(index.js, 0, 5), Decl(index.js, 1, 22))
+>x : Symbol(x, Decl(index.js, 0, 5), Decl(index.js, 1, 22), Decl(index.js, 2, 22), Decl(index.js, 3, 22), Decl(index.js, 4, 22) ... and 2 more)
 >"houseNumber" : Symbol(x.houseNumber, Decl(index.js, 4, 83))
 >get : Symbol(get, Decl(index.js, 5, 41))
 
@@ -120,7 +120,7 @@ Object.defineProperty(x, "zipStr", {
 >Object.defineProperty : Symbol(ObjectConstructor.defineProperty, Decl(lib.es5.d.ts, --, --))
 >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 >defineProperty : Symbol(ObjectConstructor.defineProperty, Decl(lib.es5.d.ts, --, --))
->x : Symbol(x, Decl(index.js, 0, 5), Decl(index.js, 1, 22))
+>x : Symbol(x, Decl(index.js, 0, 5), Decl(index.js, 1, 22), Decl(index.js, 2, 22), Decl(index.js, 3, 22), Decl(index.js, 4, 22) ... and 2 more)
 >"zipStr" : Symbol(x.zipStr, Decl(index.js, 5, 68))
 
     /** @param {string} str */
@@ -147,7 +147,7 @@ function takeName(named) { return named.name; }
 
 takeName(x);
 >takeName : Symbol(takeName, Decl(index.js, 11, 3))
->x : Symbol(x, Decl(index.js, 0, 5), Decl(index.js, 1, 22))
+>x : Symbol(x, Decl(index.js, 0, 5), Decl(index.js, 1, 22), Decl(index.js, 2, 22), Decl(index.js, 3, 22), Decl(index.js, 4, 22) ... and 2 more)
 
 /**
  * @type {number}
@@ -155,7 +155,7 @@ takeName(x);
 var a = x.zip;
 >a : Symbol(a, Decl(index.js, 22, 3))
 >x.zip : Symbol(x.zip, Decl(index.js, 3, 74))
->x : Symbol(x, Decl(index.js, 0, 5), Decl(index.js, 1, 22))
+>x : Symbol(x, Decl(index.js, 0, 5), Decl(index.js, 1, 22), Decl(index.js, 2, 22), Decl(index.js, 3, 22), Decl(index.js, 4, 22) ... and 2 more)
 >zip : Symbol(x.zip, Decl(index.js, 3, 74))
 
 /**
@@ -164,17 +164,17 @@ var a = x.zip;
 var b = x.houseNumber;
 >b : Symbol(b, Decl(index.js, 27, 3))
 >x.houseNumber : Symbol(x.houseNumber, Decl(index.js, 4, 83))
->x : Symbol(x, Decl(index.js, 0, 5), Decl(index.js, 1, 22))
+>x : Symbol(x, Decl(index.js, 0, 5), Decl(index.js, 1, 22), Decl(index.js, 2, 22), Decl(index.js, 3, 22), Decl(index.js, 4, 22) ... and 2 more)
 >houseNumber : Symbol(x.houseNumber, Decl(index.js, 4, 83))
 
 const returnExemplar = () => x;
 >returnExemplar : Symbol(returnExemplar, Decl(index.js, 29, 5))
->x : Symbol(x, Decl(index.js, 0, 5), Decl(index.js, 1, 22))
+>x : Symbol(x, Decl(index.js, 0, 5), Decl(index.js, 1, 22), Decl(index.js, 2, 22), Decl(index.js, 3, 22), Decl(index.js, 4, 22) ... and 2 more)
 
 const needsExemplar = (_ = x) => void 0;
 >needsExemplar : Symbol(needsExemplar, Decl(index.js, 30, 5))
 >_ : Symbol(_, Decl(index.js, 30, 23))
->x : Symbol(x, Decl(index.js, 0, 5), Decl(index.js, 1, 22))
+>x : Symbol(x, Decl(index.js, 0, 5), Decl(index.js, 1, 22), Decl(index.js, 2, 22), Decl(index.js, 3, 22), Decl(index.js, 4, 22) ... and 2 more)
 
 const expected = /** @type {{name: string, readonly middleInit: string, readonly lastName: string, zip: number, readonly houseNumber: number, zipStr: string}} */(/** @type {*} */(null));
 >expected : Symbol(expected, Decl(index.js, 32, 5))
@@ -199,5 +199,5 @@ module.exports = x;
 >module.exports : Symbol("tests/cases/conformance/jsdoc/index", Decl(index.js, 0, 0))
 >module : Symbol(export=, Decl(index.js, 41, 48))
 >exports : Symbol(export=, Decl(index.js, 41, 48))
->x : Symbol(x, Decl(index.js, 0, 5), Decl(index.js, 1, 22))
+>x : Symbol(x, Decl(index.js, 0, 5), Decl(index.js, 1, 22), Decl(index.js, 2, 22), Decl(index.js, 3, 22), Decl(index.js, 4, 22) ... and 2 more)
 
diff --git a/tests/baselines/reference/checkOtherObjectAssignProperty.symbols b/tests/baselines/reference/checkOtherObjectAssignProperty.symbols
index f72bf16a3b0..33e85602619 100644
--- a/tests/baselines/reference/checkOtherObjectAssignProperty.symbols
+++ b/tests/baselines/reference/checkOtherObjectAssignProperty.symbols
@@ -1,60 +1,60 @@
 === tests/cases/conformance/jsdoc/importer.js ===
 const mod = require("./mod1");
->mod : Symbol(mod, Decl(importer.js, 0, 5), Decl(importer.js, 6, 9))
+>mod : Symbol(mod, Decl(importer.js, 0, 5), Decl(importer.js, 6, 9), Decl(importer.js, 9, 14), Decl(importer.js, 10, 14), Decl(importer.js, 11, 13) ... and 2 more)
 >require : Symbol(require)
 >"./mod1" : Symbol("tests/cases/conformance/jsdoc/mod1", Decl(mod1.js, 0, 0))
 
 mod.thing;
 >mod.thing : Symbol(thing, Decl(mod1.js, 0, 42))
->mod : Symbol(mod, Decl(importer.js, 0, 5), Decl(importer.js, 6, 9))
+>mod : Symbol(mod, Decl(importer.js, 0, 5), Decl(importer.js, 6, 9), Decl(importer.js, 9, 14), Decl(importer.js, 10, 14), Decl(importer.js, 11, 13) ... and 2 more)
 >thing : Symbol(thing, Decl(mod1.js, 0, 42))
 
 mod.other;
->mod : Symbol(mod, Decl(importer.js, 0, 5), Decl(importer.js, 6, 9))
+>mod : Symbol(mod, Decl(importer.js, 0, 5), Decl(importer.js, 6, 9), Decl(importer.js, 9, 14), Decl(importer.js, 10, 14), Decl(importer.js, 11, 13) ... and 2 more)
 
 mod.prop;
->mod : Symbol(mod, Decl(importer.js, 0, 5), Decl(importer.js, 6, 9))
+>mod : Symbol(mod, Decl(importer.js, 0, 5), Decl(importer.js, 6, 9), Decl(importer.js, 9, 14), Decl(importer.js, 10, 14), Decl(importer.js, 11, 13) ... and 2 more)
 
 mod.bad1;
 >mod.bad1 : Symbol(bad1, Decl(mod1.js, 10, 72))
->mod : Symbol(mod, Decl(importer.js, 0, 5), Decl(importer.js, 6, 9))
+>mod : Symbol(mod, Decl(importer.js, 0, 5), Decl(importer.js, 6, 9), Decl(importer.js, 9, 14), Decl(importer.js, 10, 14), Decl(importer.js, 11, 13) ... and 2 more)
 >bad1 : Symbol(bad1, Decl(mod1.js, 10, 72))
 
 mod.bad2;
 >mod.bad2 : Symbol(bad2, Decl(mod1.js, 13, 44))
->mod : Symbol(mod, Decl(importer.js, 0, 5), Decl(importer.js, 6, 9))
+>mod : Symbol(mod, Decl(importer.js, 0, 5), Decl(importer.js, 6, 9), Decl(importer.js, 9, 14), Decl(importer.js, 10, 14), Decl(importer.js, 11, 13) ... and 2 more)
 >bad2 : Symbol(bad2, Decl(mod1.js, 13, 44))
 
 mod.bad3;
 >mod.bad3 : Symbol(bad3, Decl(mod1.js, 14, 77))
->mod : Symbol(mod, Decl(importer.js, 0, 5), Decl(importer.js, 6, 9))
+>mod : Symbol(mod, Decl(importer.js, 0, 5), Decl(importer.js, 6, 9), Decl(importer.js, 9, 14), Decl(importer.js, 10, 14), Decl(importer.js, 11, 13) ... and 2 more)
 >bad3 : Symbol(bad3, Decl(mod1.js, 14, 77))
 
 
 mod.thing = 0;
 >mod.thing : Symbol(thing, Decl(mod1.js, 0, 42))
->mod : Symbol(mod, Decl(importer.js, 0, 5), Decl(importer.js, 6, 9))
+>mod : Symbol(mod, Decl(importer.js, 0, 5), Decl(importer.js, 6, 9), Decl(importer.js, 9, 14), Decl(importer.js, 10, 14), Decl(importer.js, 11, 13) ... and 2 more)
 >thing : Symbol(thing, Decl(mod1.js, 0, 42))
 
 mod.other = 0;
->mod : Symbol(mod, Decl(importer.js, 0, 5), Decl(importer.js, 6, 9))
+>mod : Symbol(mod, Decl(importer.js, 0, 5), Decl(importer.js, 6, 9), Decl(importer.js, 9, 14), Decl(importer.js, 10, 14), Decl(importer.js, 11, 13) ... and 2 more)
 
 mod.prop = 0;
->mod : Symbol(mod, Decl(importer.js, 0, 5), Decl(importer.js, 6, 9))
+>mod : Symbol(mod, Decl(importer.js, 0, 5), Decl(importer.js, 6, 9), Decl(importer.js, 9, 14), Decl(importer.js, 10, 14), Decl(importer.js, 11, 13) ... and 2 more)
 
 mod.bad1 = 0;
 >mod.bad1 : Symbol(bad1, Decl(mod1.js, 10, 72))
->mod : Symbol(mod, Decl(importer.js, 0, 5), Decl(importer.js, 6, 9))
+>mod : Symbol(mod, Decl(importer.js, 0, 5), Decl(importer.js, 6, 9), Decl(importer.js, 9, 14), Decl(importer.js, 10, 14), Decl(importer.js, 11, 13) ... and 2 more)
 >bad1 : Symbol(bad1, Decl(mod1.js, 10, 72))
 
 mod.bad2 = 0;
 >mod.bad2 : Symbol(bad2, Decl(mod1.js, 13, 44))
->mod : Symbol(mod, Decl(importer.js, 0, 5), Decl(importer.js, 6, 9))
+>mod : Symbol(mod, Decl(importer.js, 0, 5), Decl(importer.js, 6, 9), Decl(importer.js, 9, 14), Decl(importer.js, 10, 14), Decl(importer.js, 11, 13) ... and 2 more)
 >bad2 : Symbol(bad2, Decl(mod1.js, 13, 44))
 
 mod.bad3 = 0;
 >mod.bad3 : Symbol(bad3, Decl(mod1.js, 14, 77))
->mod : Symbol(mod, Decl(importer.js, 0, 5), Decl(importer.js, 6, 9))
+>mod : Symbol(mod, Decl(importer.js, 0, 5), Decl(importer.js, 6, 9), Decl(importer.js, 9, 14), Decl(importer.js, 10, 14), Decl(importer.js, 11, 13) ... and 2 more)
 >bad3 : Symbol(bad3, Decl(mod1.js, 14, 77))
 
 === tests/cases/conformance/jsdoc/mod1.js ===
diff --git a/tests/baselines/reference/constructorFunctionsStrict.symbols b/tests/baselines/reference/constructorFunctionsStrict.symbols
index 3954e2ce1e6..74727d8088a 100644
--- a/tests/baselines/reference/constructorFunctionsStrict.symbols
+++ b/tests/baselines/reference/constructorFunctionsStrict.symbols
@@ -20,18 +20,18 @@ C.prototype.m = function() {
 >y : Symbol(C.y, Decl(a.js, 4, 28))
 }
 var c = new C(1)
->c : Symbol(c, Decl(a.js, 7, 3), Decl(a.js, 7, 16))
+>c : Symbol(c, Decl(a.js, 7, 3), Decl(a.js, 7, 16), Decl(a.js, 8, 15))
 >C : Symbol(C, Decl(a.js, 0, 0))
 
 c.x = undefined // should error
 >c.x : Symbol(C.x, Decl(a.js, 1, 15))
->c : Symbol(c, Decl(a.js, 7, 3), Decl(a.js, 7, 16))
+>c : Symbol(c, Decl(a.js, 7, 3), Decl(a.js, 7, 16), Decl(a.js, 8, 15))
 >x : Symbol(C.x, Decl(a.js, 1, 15))
 >undefined : Symbol(undefined)
 
 c.y = undefined // ok
 >c.y : Symbol(C.y, Decl(a.js, 4, 28))
->c : Symbol(c, Decl(a.js, 7, 3), Decl(a.js, 7, 16))
+>c : Symbol(c, Decl(a.js, 7, 3), Decl(a.js, 7, 16), Decl(a.js, 8, 15))
 >y : Symbol(C.y, Decl(a.js, 4, 28))
 >undefined : Symbol(undefined)
 
diff --git a/tests/baselines/reference/contextualTypedSpecialAssignment.symbols b/tests/baselines/reference/contextualTypedSpecialAssignment.symbols
index 01ba1d6ba79..c185640d897 100644
--- a/tests/baselines/reference/contextualTypedSpecialAssignment.symbols
+++ b/tests/baselines/reference/contextualTypedSpecialAssignment.symbols
@@ -6,12 +6,12 @@
 
 // property assignment
 var ns = {}
->ns : Symbol(ns, Decl(test.js, 6, 3), Decl(test.js, 6, 11))
+>ns : Symbol(ns, Decl(test.js, 6, 3), Decl(test.js, 6, 11), Decl(test.js, 11, 1))
 
 /** @type {DoneStatus} */
 ns.x = {
 >ns.x : Symbol(ns.x, Decl(test.js, 6, 11), Decl(test.js, 11, 1))
->ns : Symbol(ns, Decl(test.js, 6, 3), Decl(test.js, 6, 11))
+>ns : Symbol(ns, Decl(test.js, 6, 3), Decl(test.js, 6, 11), Decl(test.js, 11, 1))
 >x : Symbol(ns.x, Decl(test.js, 6, 11), Decl(test.js, 11, 1))
 
     status: 'done',
@@ -24,7 +24,7 @@ ns.x = {
 
 ns.x = {
 >ns.x : Symbol(ns.x, Decl(test.js, 6, 11), Decl(test.js, 11, 1))
->ns : Symbol(ns, Decl(test.js, 6, 3), Decl(test.js, 6, 11))
+>ns : Symbol(ns, Decl(test.js, 6, 3), Decl(test.js, 6, 11), Decl(test.js, 11, 1))
 >x : Symbol(ns.x, Decl(test.js, 6, 11), Decl(test.js, 11, 1))
 
     status: 'done',
@@ -36,7 +36,7 @@ ns.x = {
 }
 ns.x
 >ns.x : Symbol(ns.x, Decl(test.js, 6, 11), Decl(test.js, 11, 1))
->ns : Symbol(ns, Decl(test.js, 6, 3), Decl(test.js, 6, 11))
+>ns : Symbol(ns, Decl(test.js, 6, 3), Decl(test.js, 6, 11), Decl(test.js, 11, 1))
 >x : Symbol(ns.x, Decl(test.js, 6, 11), Decl(test.js, 11, 1))
 
 
diff --git a/tests/baselines/reference/declarationEmitDefaultExportWithStaticAssignment.symbols b/tests/baselines/reference/declarationEmitDefaultExportWithStaticAssignment.symbols
index f65952c18d7..7926ba42008 100644
--- a/tests/baselines/reference/declarationEmitDefaultExportWithStaticAssignment.symbols
+++ b/tests/baselines/reference/declarationEmitDefaultExportWithStaticAssignment.symbols
@@ -52,20 +52,20 @@ function B() { }
 >B : Symbol(B, Decl(index4.ts, 0, 17))
 
 export function C() {
->C : Symbol(C, Decl(index4.ts, 2, 16), Decl(index4.ts, 6, 1))
+>C : Symbol(C, Decl(index4.ts, 2, 16), Decl(index4.ts, 6, 1), Decl(index4.ts, 8, 8))
 
   return null;
 }
 
 C.A = A;
 >C.A : Symbol(C.A, Decl(index4.ts, 6, 1))
->C : Symbol(C, Decl(index4.ts, 2, 16), Decl(index4.ts, 6, 1))
+>C : Symbol(C, Decl(index4.ts, 2, 16), Decl(index4.ts, 6, 1), Decl(index4.ts, 8, 8))
 >A : Symbol(C.A, Decl(index4.ts, 6, 1))
 >A : Symbol(A, Decl(index4.ts, 0, 0))
 
 C.B = B;
 >C.B : Symbol(C.B, Decl(index4.ts, 8, 8))
->C : Symbol(C, Decl(index4.ts, 2, 16), Decl(index4.ts, 6, 1))
+>C : Symbol(C, Decl(index4.ts, 2, 16), Decl(index4.ts, 6, 1), Decl(index4.ts, 8, 8))
 >B : Symbol(C.B, Decl(index4.ts, 8, 8))
 >B : Symbol(B, Decl(index4.ts, 0, 17))
 
diff --git a/tests/baselines/reference/ensureNoCrashExportAssignmentDefineProperrtyPotentialMerge.symbols b/tests/baselines/reference/ensureNoCrashExportAssignmentDefineProperrtyPotentialMerge.symbols
index 9d6f464619f..41ba9b444c7 100644
--- a/tests/baselines/reference/ensureNoCrashExportAssignmentDefineProperrtyPotentialMerge.symbols
+++ b/tests/baselines/reference/ensureNoCrashExportAssignmentDefineProperrtyPotentialMerge.symbols
@@ -35,11 +35,11 @@ module.exports = A;
 
 === tests/cases/compiler/namespacer.js ===
 const B = {}
->B : Symbol(B, Decl(namespacer.js, 0, 5), Decl(namespacer.js, 0, 12))
+>B : Symbol(B, Decl(namespacer.js, 0, 5), Decl(namespacer.js, 0, 12), Decl(namespacer.js, 2, 22))
 
 B.NS = require("./namespacey");
 >B.NS : Symbol(B.NS, Decl(namespacer.js, 0, 12), Decl(namespacer.js, 1, 31))
->B : Symbol(B, Decl(namespacer.js, 0, 5), Decl(namespacer.js, 0, 12))
+>B : Symbol(B, Decl(namespacer.js, 0, 5), Decl(namespacer.js, 0, 12), Decl(namespacer.js, 2, 22))
 >NS : Symbol(B.NS, Decl(namespacer.js, 0, 12), Decl(namespacer.js, 1, 31))
 >require : Symbol(require)
 >"./namespacey" : Symbol("tests/cases/compiler/namespacey", Decl(namespacey.js, 0, 0))
@@ -48,7 +48,7 @@ Object.defineProperty(B, "NS", { value: "why though", writable: true });
 >Object.defineProperty : Symbol(ObjectConstructor.defineProperty, Decl(lib.es5.d.ts, --, --))
 >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 >defineProperty : Symbol(ObjectConstructor.defineProperty, Decl(lib.es5.d.ts, --, --))
->B : Symbol(B, Decl(namespacer.js, 0, 5), Decl(namespacer.js, 0, 12))
+>B : Symbol(B, Decl(namespacer.js, 0, 5), Decl(namespacer.js, 0, 12), Decl(namespacer.js, 2, 22))
 >"NS" : Symbol(B.NS, Decl(namespacer.js, 0, 12), Decl(namespacer.js, 1, 31))
 >value : Symbol(value, Decl(namespacer.js, 2, 32))
 >writable : Symbol(writable, Decl(namespacer.js, 2, 53))
@@ -57,5 +57,5 @@ module.exports = B;
 >module.exports : Symbol("tests/cases/compiler/namespacer", Decl(namespacer.js, 0, 0))
 >module : Symbol(export=, Decl(namespacer.js, 2, 72))
 >exports : Symbol(export=, Decl(namespacer.js, 2, 72))
->B : Symbol(B, Decl(namespacer.js, 0, 5), Decl(namespacer.js, 0, 12))
+>B : Symbol(B, Decl(namespacer.js, 0, 5), Decl(namespacer.js, 0, 12), Decl(namespacer.js, 2, 22))
 
diff --git a/tests/baselines/reference/enumMergeWithExpando.symbols b/tests/baselines/reference/enumMergeWithExpando.symbols
index 854bf6b5169..829bd63e86d 100644
--- a/tests/baselines/reference/enumMergeWithExpando.symbols
+++ b/tests/baselines/reference/enumMergeWithExpando.symbols
@@ -1,31 +1,31 @@
 === tests/cases/conformance/salsa/lovefield-ts.d.ts ===
 // bug #27352, crashes from github.com/google/lovefield
 declare namespace lf {
->lf : Symbol(lf, Decl(lovefield-ts.d.ts, 0, 0), Decl(enums.js, 0, 0), Decl(enums.js, 0, 13))
+>lf : Symbol(lf, Decl(lovefield-ts.d.ts, 0, 0), Decl(enums.js, 0, 0), Decl(enums.js, 0, 13), Decl(enums.js, 1, 18))
 
     export enum Order { ASC, DESC }
->Order : Symbol(Order, Decl(lovefield-ts.d.ts, 1, 22), Decl(enums.js, 0, 0), Decl(enums.js, 1, 3))
+>Order : Symbol(Order, Decl(lovefield-ts.d.ts, 1, 22), Decl(enums.js, 0, 0), Decl(enums.js, 1, 3), Decl(enums.js, 2, 3))
 >ASC : Symbol(Order.ASC, Decl(lovefield-ts.d.ts, 2, 23), Decl(enums.js, 1, 18))
 >DESC : Symbol(Order.DESC, Decl(lovefield-ts.d.ts, 2, 28), Decl(enums.js, 0, 13))
 }
 
 === tests/cases/conformance/salsa/enums.js ===
 lf.Order = {}
->lf.Order : Symbol(lf.Order, Decl(lovefield-ts.d.ts, 1, 22), Decl(enums.js, 0, 0), Decl(enums.js, 1, 3))
->lf : Symbol(lf, Decl(lovefield-ts.d.ts, 0, 0), Decl(enums.js, 0, 0), Decl(enums.js, 0, 13))
->Order : Symbol(lf.Order, Decl(lovefield-ts.d.ts, 1, 22), Decl(enums.js, 0, 0), Decl(enums.js, 1, 3))
+>lf.Order : Symbol(lf.Order, Decl(lovefield-ts.d.ts, 1, 22), Decl(enums.js, 0, 0), Decl(enums.js, 1, 3), Decl(enums.js, 2, 3))
+>lf : Symbol(lf, Decl(lovefield-ts.d.ts, 0, 0), Decl(enums.js, 0, 0), Decl(enums.js, 0, 13), Decl(enums.js, 1, 18))
+>Order : Symbol(lf.Order, Decl(lovefield-ts.d.ts, 1, 22), Decl(enums.js, 0, 0), Decl(enums.js, 1, 3), Decl(enums.js, 2, 3))
 
 lf.Order.DESC = 0;
 >lf.Order.DESC : Symbol(lf.Order.DESC, Decl(lovefield-ts.d.ts, 2, 28), Decl(enums.js, 0, 13))
->lf.Order : Symbol(lf.Order, Decl(lovefield-ts.d.ts, 1, 22), Decl(enums.js, 0, 0), Decl(enums.js, 1, 3))
->lf : Symbol(lf, Decl(lovefield-ts.d.ts, 0, 0), Decl(enums.js, 0, 0), Decl(enums.js, 0, 13))
->Order : Symbol(lf.Order, Decl(lovefield-ts.d.ts, 1, 22), Decl(enums.js, 0, 0), Decl(enums.js, 1, 3))
+>lf.Order : Symbol(lf.Order, Decl(lovefield-ts.d.ts, 1, 22), Decl(enums.js, 0, 0), Decl(enums.js, 1, 3), Decl(enums.js, 2, 3))
+>lf : Symbol(lf, Decl(lovefield-ts.d.ts, 0, 0), Decl(enums.js, 0, 0), Decl(enums.js, 0, 13), Decl(enums.js, 1, 18))
+>Order : Symbol(lf.Order, Decl(lovefield-ts.d.ts, 1, 22), Decl(enums.js, 0, 0), Decl(enums.js, 1, 3), Decl(enums.js, 2, 3))
 >DESC : Symbol(lf.Order.DESC, Decl(lovefield-ts.d.ts, 2, 28), Decl(enums.js, 0, 13))
 
 lf.Order.ASC = 1;
 >lf.Order.ASC : Symbol(lf.Order.ASC, Decl(lovefield-ts.d.ts, 2, 23), Decl(enums.js, 1, 18))
->lf.Order : Symbol(lf.Order, Decl(lovefield-ts.d.ts, 1, 22), Decl(enums.js, 0, 0), Decl(enums.js, 1, 3))
->lf : Symbol(lf, Decl(lovefield-ts.d.ts, 0, 0), Decl(enums.js, 0, 0), Decl(enums.js, 0, 13))
->Order : Symbol(lf.Order, Decl(lovefield-ts.d.ts, 1, 22), Decl(enums.js, 0, 0), Decl(enums.js, 1, 3))
+>lf.Order : Symbol(lf.Order, Decl(lovefield-ts.d.ts, 1, 22), Decl(enums.js, 0, 0), Decl(enums.js, 1, 3), Decl(enums.js, 2, 3))
+>lf : Symbol(lf, Decl(lovefield-ts.d.ts, 0, 0), Decl(enums.js, 0, 0), Decl(enums.js, 0, 13), Decl(enums.js, 1, 18))
+>Order : Symbol(lf.Order, Decl(lovefield-ts.d.ts, 1, 22), Decl(enums.js, 0, 0), Decl(enums.js, 1, 3), Decl(enums.js, 2, 3))
 >ASC : Symbol(lf.Order.ASC, Decl(lovefield-ts.d.ts, 2, 23), Decl(enums.js, 1, 18))
 
diff --git a/tests/baselines/reference/jsContainerMergeTsDeclaration2.symbols b/tests/baselines/reference/jsContainerMergeTsDeclaration2.symbols
index 4f5f86e8e67..fc9bedbeaf4 100644
--- a/tests/baselines/reference/jsContainerMergeTsDeclaration2.symbols
+++ b/tests/baselines/reference/jsContainerMergeTsDeclaration2.symbols
@@ -1,6 +1,6 @@
 === tests/cases/conformance/salsa/a.d.ts ===
 declare namespace C {
->C : Symbol(C, Decl(a.d.ts, 0, 0), Decl(b.js, 0, 0))
+>C : Symbol(C, Decl(a.d.ts, 0, 0), Decl(b.js, 0, 0), Decl(b.js, 0, 17))
 
     function bar(): void
 >bar : Symbol(bar, Decl(a.d.ts, 0, 21), Decl(b.js, 0, 17))
@@ -8,11 +8,11 @@ declare namespace C {
 === tests/cases/conformance/salsa/b.js ===
 C.prototype = {};
 >C.prototype : Symbol(C.prototype, Decl(b.js, 0, 0))
->C : Symbol(C, Decl(a.d.ts, 0, 0), Decl(b.js, 0, 0))
+>C : Symbol(C, Decl(a.d.ts, 0, 0), Decl(b.js, 0, 0), Decl(b.js, 0, 17))
 >prototype : Symbol(C.prototype, Decl(b.js, 0, 0))
 
 C.bar = 2;
 >C.bar : Symbol(C.bar, Decl(a.d.ts, 0, 21), Decl(b.js, 0, 17))
->C : Symbol(C, Decl(a.d.ts, 0, 0), Decl(b.js, 0, 0))
+>C : Symbol(C, Decl(a.d.ts, 0, 0), Decl(b.js, 0, 0), Decl(b.js, 0, 17))
 >bar : Symbol(C.bar, Decl(a.d.ts, 0, 21), Decl(b.js, 0, 17))
 
diff --git a/tests/baselines/reference/jsEnumCrossFileExport.symbols b/tests/baselines/reference/jsEnumCrossFileExport.symbols
new file mode 100644
index 00000000000..60d27769652
--- /dev/null
+++ b/tests/baselines/reference/jsEnumCrossFileExport.symbols
@@ -0,0 +1,89 @@
+=== tests/cases/compiler/enumDef.js ===
+var Host = {};
+>Host : Symbol(Host, Decl(enumDef.js, 0, 3), Decl(enumDef.js, 0, 14), Decl(enumDef.js, 1, 22), Decl(enumDef.js, 8, 2), Decl(enumDef.js, 1, 22) ... and 2 more)
+
+Host.UserMetrics = {};
+>Host.UserMetrics : Symbol(Host.UserMetrics, Decl(enumDef.js, 0, 14), Decl(enumDef.js, 3, 5), Decl(enumDef.js, 15, 5), Decl(enumDef.js, 3, 5), Decl(enumDef.js, 10, 26) ... and 1 more)
+>Host : Symbol(Host, Decl(enumDef.js, 0, 3), Decl(enumDef.js, 0, 14), Decl(enumDef.js, 1, 22), Decl(enumDef.js, 8, 2), Decl(enumDef.js, 1, 22) ... and 2 more)
+>UserMetrics : Symbol(Host.UserMetrics, Decl(enumDef.js, 0, 14), Decl(enumDef.js, 3, 5), Decl(enumDef.js, 15, 5), Decl(enumDef.js, 3, 5), Decl(enumDef.js, 10, 26) ... and 1 more)
+
+/** @enum {number} */
+Host.UserMetrics.Action = {
+>Host.UserMetrics.Action : Symbol(Host.UserMetrics.Action, Decl(enumDef.js, 1, 22), Decl(enumDef.js, 3, 17), Decl(enumDef.js, 2, 4))
+>Host.UserMetrics : Symbol(Host.UserMetrics, Decl(enumDef.js, 0, 14), Decl(enumDef.js, 3, 5), Decl(enumDef.js, 15, 5), Decl(enumDef.js, 3, 5), Decl(enumDef.js, 10, 26) ... and 1 more)
+>Host : Symbol(Host, Decl(enumDef.js, 0, 3), Decl(enumDef.js, 0, 14), Decl(enumDef.js, 1, 22), Decl(enumDef.js, 8, 2), Decl(enumDef.js, 1, 22) ... and 2 more)
+>UserMetrics : Symbol(Host.UserMetrics, Decl(enumDef.js, 0, 14), Decl(enumDef.js, 3, 5), Decl(enumDef.js, 15, 5), Decl(enumDef.js, 3, 5), Decl(enumDef.js, 10, 26) ... and 1 more)
+>Action : Symbol(Host.UserMetrics.Action, Decl(enumDef.js, 1, 22), Decl(enumDef.js, 3, 17), Decl(enumDef.js, 2, 4))
+
+    WindowDocked: 1,
+>WindowDocked : Symbol(WindowDocked, Decl(enumDef.js, 3, 27))
+
+    WindowUndocked: 2,
+>WindowUndocked : Symbol(WindowUndocked, Decl(enumDef.js, 4, 20))
+
+    ScriptsBreakpointSet: 3,
+>ScriptsBreakpointSet : Symbol(ScriptsBreakpointSet, Decl(enumDef.js, 5, 22))
+
+    TimelineStarted: 4,
+>TimelineStarted : Symbol(TimelineStarted, Decl(enumDef.js, 6, 28))
+
+};
+/**
+ * @typedef {string} Host.UserMetrics.Bargh
+ */
+/**
+ * @typedef {string}
+ */
+Host.UserMetrics.Blah = {
+>Host.UserMetrics.Blah : Symbol(Host.UserMetrics.Blah, Decl(enumDef.js, 8, 2), Decl(enumDef.js, 15, 17), Decl(enumDef.js, 13, 3))
+>Host.UserMetrics : Symbol(Host.UserMetrics, Decl(enumDef.js, 0, 14), Decl(enumDef.js, 3, 5), Decl(enumDef.js, 15, 5), Decl(enumDef.js, 3, 5), Decl(enumDef.js, 10, 26) ... and 1 more)
+>Host : Symbol(Host, Decl(enumDef.js, 0, 3), Decl(enumDef.js, 0, 14), Decl(enumDef.js, 1, 22), Decl(enumDef.js, 8, 2), Decl(enumDef.js, 1, 22) ... and 2 more)
+>UserMetrics : Symbol(Host.UserMetrics, Decl(enumDef.js, 0, 14), Decl(enumDef.js, 3, 5), Decl(enumDef.js, 15, 5), Decl(enumDef.js, 3, 5), Decl(enumDef.js, 10, 26) ... and 1 more)
+>Blah : Symbol(Host.UserMetrics.Blah, Decl(enumDef.js, 8, 2), Decl(enumDef.js, 15, 17), Decl(enumDef.js, 13, 3))
+
+    x: 12
+>x : Symbol(x, Decl(enumDef.js, 15, 25))
+}
+=== tests/cases/compiler/index.js ===
+var Other = {};
+>Other : Symbol(Other, Decl(index.js, 0, 3), Decl(index.js, 0, 15))
+
+Other.Cls = class {
+>Other.Cls : Symbol(Other.Cls, Decl(index.js, 0, 15))
+>Other : Symbol(Other, Decl(index.js, 0, 3), Decl(index.js, 0, 15))
+>Cls : Symbol(Other.Cls, Decl(index.js, 0, 15))
+
+    /**
+     * @param {!Host.UserMetrics.Action} p
+     */
+    method(p) {}
+>method : Symbol(Cls.method, Decl(index.js, 1, 19))
+>p : Symbol(p, Decl(index.js, 5, 11))
+
+    usage() {
+>usage : Symbol(Cls.usage, Decl(index.js, 5, 16))
+
+        this.method(Host.UserMetrics.Action.WindowDocked);
+>this.method : Symbol(Cls.method, Decl(index.js, 1, 19))
+>this : Symbol(Cls, Decl(index.js, 1, 11))
+>method : Symbol(Cls.method, Decl(index.js, 1, 19))
+>Host.UserMetrics.Action : Symbol(Host.UserMetrics.Action, Decl(enumDef.js, 1, 22), Decl(enumDef.js, 3, 17), Decl(enumDef.js, 2, 4))
+>Host.UserMetrics : Symbol(Host.UserMetrics, Decl(enumDef.js, 0, 14), Decl(enumDef.js, 3, 5), Decl(enumDef.js, 15, 5), Decl(enumDef.js, 3, 5), Decl(enumDef.js, 10, 26) ... and 1 more)
+>Host : Symbol(Host, Decl(enumDef.js, 0, 3), Decl(enumDef.js, 0, 14), Decl(enumDef.js, 1, 22), Decl(enumDef.js, 8, 2), Decl(enumDef.js, 1, 22) ... and 2 more)
+>UserMetrics : Symbol(Host.UserMetrics, Decl(enumDef.js, 0, 14), Decl(enumDef.js, 3, 5), Decl(enumDef.js, 15, 5), Decl(enumDef.js, 3, 5), Decl(enumDef.js, 10, 26) ... and 1 more)
+>Action : Symbol(Host.UserMetrics.Action, Decl(enumDef.js, 1, 22), Decl(enumDef.js, 3, 17), Decl(enumDef.js, 2, 4))
+    }
+}
+
+/**
+ * @type {Host.UserMetrics.Bargh}
+ */
+var x = "ok";
+>x : Symbol(x, Decl(index.js, 14, 3))
+
+/**
+ * @type {Host.UserMetrics.Blah}
+ */
+var y = "ok";
+>y : Symbol(y, Decl(index.js, 19, 3))
+
diff --git a/tests/baselines/reference/jsEnumCrossFileExport.types b/tests/baselines/reference/jsEnumCrossFileExport.types
new file mode 100644
index 00000000000..24acb348ada
--- /dev/null
+++ b/tests/baselines/reference/jsEnumCrossFileExport.types
@@ -0,0 +1,109 @@
+=== tests/cases/compiler/enumDef.js ===
+var Host = {};
+>Host : typeof Host
+>{} : {}
+
+Host.UserMetrics = {};
+>Host.UserMetrics = {} : typeof Host.UserMetrics
+>Host.UserMetrics : typeof Host.UserMetrics
+>Host : typeof Host
+>UserMetrics : typeof Host.UserMetrics
+>{} : {}
+
+/** @enum {number} */
+Host.UserMetrics.Action = {
+>Host.UserMetrics.Action = {    WindowDocked: 1,    WindowUndocked: 2,    ScriptsBreakpointSet: 3,    TimelineStarted: 4,} : { WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; TimelineStarted: number; }
+>Host.UserMetrics.Action : error
+>Host.UserMetrics : typeof Host.UserMetrics
+>Host : typeof Host
+>UserMetrics : typeof Host.UserMetrics
+>Action : any
+>{    WindowDocked: 1,    WindowUndocked: 2,    ScriptsBreakpointSet: 3,    TimelineStarted: 4,} : { WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; TimelineStarted: number; }
+
+    WindowDocked: 1,
+>WindowDocked : number
+>1 : 1
+
+    WindowUndocked: 2,
+>WindowUndocked : number
+>2 : 2
+
+    ScriptsBreakpointSet: 3,
+>ScriptsBreakpointSet : number
+>3 : 3
+
+    TimelineStarted: 4,
+>TimelineStarted : number
+>4 : 4
+
+};
+/**
+ * @typedef {string} Host.UserMetrics.Bargh
+ */
+/**
+ * @typedef {string}
+ */
+Host.UserMetrics.Blah = {
+>Host.UserMetrics.Blah = {    x: 12} : { x: number; }
+>Host.UserMetrics.Blah : error
+>Host.UserMetrics : typeof Host.UserMetrics
+>Host : typeof Host
+>UserMetrics : typeof Host.UserMetrics
+>Blah : any
+>{    x: 12} : { x: number; }
+
+    x: 12
+>x : number
+>12 : 12
+}
+=== tests/cases/compiler/index.js ===
+var Other = {};
+>Other : typeof Other
+>{} : {}
+
+Other.Cls = class {
+>Other.Cls = class {    /**     * @param {!Host.UserMetrics.Action} p     */    method(p) {}    usage() {        this.method(Host.UserMetrics.Action.WindowDocked);    }} : typeof Cls
+>Other.Cls : typeof Cls
+>Other : typeof Other
+>Cls : typeof Cls
+>class {    /**     * @param {!Host.UserMetrics.Action} p     */    method(p) {}    usage() {        this.method(Host.UserMetrics.Action.WindowDocked);    }} : typeof Cls
+
+    /**
+     * @param {!Host.UserMetrics.Action} p
+     */
+    method(p) {}
+>method : (p: number) => void
+>p : number
+
+    usage() {
+>usage : () => void
+
+        this.method(Host.UserMetrics.Action.WindowDocked);
+>this.method(Host.UserMetrics.Action.WindowDocked) : void
+>this.method : (p: number) => void
+>this : this
+>method : (p: number) => void
+>Host.UserMetrics.Action.WindowDocked : error
+>Host.UserMetrics.Action : any
+>Host.UserMetrics : typeof Host.UserMetrics
+>Host : typeof Host
+>UserMetrics : typeof Host.UserMetrics
+>Action : any
+>WindowDocked : any
+    }
+}
+
+/**
+ * @type {Host.UserMetrics.Bargh}
+ */
+var x = "ok";
+>x : string
+>"ok" : "ok"
+
+/**
+ * @type {Host.UserMetrics.Blah}
+ */
+var y = "ok";
+>y : string
+>"ok" : "ok"
+
diff --git a/tests/baselines/reference/jsEnumFunctionLocalNoCrash.symbols b/tests/baselines/reference/jsEnumFunctionLocalNoCrash.symbols
new file mode 100644
index 00000000000..6d1e59b788e
--- /dev/null
+++ b/tests/baselines/reference/jsEnumFunctionLocalNoCrash.symbols
@@ -0,0 +1,45 @@
+=== tests/cases/compiler/index.js ===
+function defineCommonExtensionSymbols(apiPrivate) {
+>defineCommonExtensionSymbols : Symbol(defineCommonExtensionSymbols, Decl(index.js, 0, 0))
+>apiPrivate : Symbol(apiPrivate, Decl(index.js, 0, 38))
+
+    /** @enum {string} */
+    apiPrivate.Events = {
+>apiPrivate : Symbol(apiPrivate, Decl(index.js, 0, 38))
+
+      ButtonClicked: 'button-clicked-',
+>ButtonClicked : Symbol(ButtonClicked, Decl(index.js, 2, 25))
+
+      PanelObjectSelected: 'panel-objectSelected-',
+>PanelObjectSelected : Symbol(PanelObjectSelected, Decl(index.js, 3, 39))
+
+      NetworkRequestFinished: 'network-request-finished',
+>NetworkRequestFinished : Symbol(NetworkRequestFinished, Decl(index.js, 4, 51))
+
+      OpenResource: 'open-resource',
+>OpenResource : Symbol(OpenResource, Decl(index.js, 5, 57))
+
+      PanelSearch: 'panel-search-',
+>PanelSearch : Symbol(PanelSearch, Decl(index.js, 6, 36))
+
+      RecordingStarted: 'trace-recording-started-',
+>RecordingStarted : Symbol(RecordingStarted, Decl(index.js, 7, 35))
+
+      RecordingStopped: 'trace-recording-stopped-',
+>RecordingStopped : Symbol(RecordingStopped, Decl(index.js, 8, 51))
+
+      ResourceAdded: 'resource-added',
+>ResourceAdded : Symbol(ResourceAdded, Decl(index.js, 9, 51))
+
+      ResourceContentCommitted: 'resource-content-committed',
+>ResourceContentCommitted : Symbol(ResourceContentCommitted, Decl(index.js, 10, 38))
+
+      ViewShown: 'view-shown-',
+>ViewShown : Symbol(ViewShown, Decl(index.js, 11, 61))
+
+      ViewHidden: 'view-hidden-'
+>ViewHidden : Symbol(ViewHidden, Decl(index.js, 12, 31))
+
+    };
+}
+
diff --git a/tests/baselines/reference/jsEnumFunctionLocalNoCrash.types b/tests/baselines/reference/jsEnumFunctionLocalNoCrash.types
new file mode 100644
index 00000000000..247bf32eb81
--- /dev/null
+++ b/tests/baselines/reference/jsEnumFunctionLocalNoCrash.types
@@ -0,0 +1,60 @@
+=== tests/cases/compiler/index.js ===
+function defineCommonExtensionSymbols(apiPrivate) {
+>defineCommonExtensionSymbols : (apiPrivate: any) => void
+>apiPrivate : any
+
+    /** @enum {string} */
+    apiPrivate.Events = {
+>apiPrivate.Events = {      ButtonClicked: 'button-clicked-',      PanelObjectSelected: 'panel-objectSelected-',      NetworkRequestFinished: 'network-request-finished',      OpenResource: 'open-resource',      PanelSearch: 'panel-search-',      RecordingStarted: 'trace-recording-started-',      RecordingStopped: 'trace-recording-stopped-',      ResourceAdded: 'resource-added',      ResourceContentCommitted: 'resource-content-committed',      ViewShown: 'view-shown-',      ViewHidden: 'view-hidden-'    } : { ButtonClicked: string; PanelObjectSelected: string; NetworkRequestFinished: string; OpenResource: string; PanelSearch: string; RecordingStarted: string; RecordingStopped: string; ResourceAdded: string; ResourceContentCommitted: string; ViewShown: string; ViewHidden: string; }
+>apiPrivate.Events : any
+>apiPrivate : any
+>Events : any
+>{      ButtonClicked: 'button-clicked-',      PanelObjectSelected: 'panel-objectSelected-',      NetworkRequestFinished: 'network-request-finished',      OpenResource: 'open-resource',      PanelSearch: 'panel-search-',      RecordingStarted: 'trace-recording-started-',      RecordingStopped: 'trace-recording-stopped-',      ResourceAdded: 'resource-added',      ResourceContentCommitted: 'resource-content-committed',      ViewShown: 'view-shown-',      ViewHidden: 'view-hidden-'    } : { ButtonClicked: string; PanelObjectSelected: string; NetworkRequestFinished: string; OpenResource: string; PanelSearch: string; RecordingStarted: string; RecordingStopped: string; ResourceAdded: string; ResourceContentCommitted: string; ViewShown: string; ViewHidden: string; }
+
+      ButtonClicked: 'button-clicked-',
+>ButtonClicked : string
+>'button-clicked-' : "button-clicked-"
+
+      PanelObjectSelected: 'panel-objectSelected-',
+>PanelObjectSelected : string
+>'panel-objectSelected-' : "panel-objectSelected-"
+
+      NetworkRequestFinished: 'network-request-finished',
+>NetworkRequestFinished : string
+>'network-request-finished' : "network-request-finished"
+
+      OpenResource: 'open-resource',
+>OpenResource : string
+>'open-resource' : "open-resource"
+
+      PanelSearch: 'panel-search-',
+>PanelSearch : string
+>'panel-search-' : "panel-search-"
+
+      RecordingStarted: 'trace-recording-started-',
+>RecordingStarted : string
+>'trace-recording-started-' : "trace-recording-started-"
+
+      RecordingStopped: 'trace-recording-stopped-',
+>RecordingStopped : string
+>'trace-recording-stopped-' : "trace-recording-stopped-"
+
+      ResourceAdded: 'resource-added',
+>ResourceAdded : string
+>'resource-added' : "resource-added"
+
+      ResourceContentCommitted: 'resource-content-committed',
+>ResourceContentCommitted : string
+>'resource-content-committed' : "resource-content-committed"
+
+      ViewShown: 'view-shown-',
+>ViewShown : string
+>'view-shown-' : "view-shown-"
+
+      ViewHidden: 'view-hidden-'
+>ViewHidden : string
+>'view-hidden-' : "view-hidden-"
+
+    };
+}
+
diff --git a/tests/baselines/reference/jsdocTemplateConstructorFunction.symbols b/tests/baselines/reference/jsdocTemplateConstructorFunction.symbols
index d176aba903e..f9b5d1c6b6e 100644
--- a/tests/baselines/reference/jsdocTemplateConstructorFunction.symbols
+++ b/tests/baselines/reference/jsdocTemplateConstructorFunction.symbols
@@ -45,16 +45,16 @@ Zet.prototype.add = function(v, id) {
 >u : Symbol(Zet.u, Decl(templateTagOnConstructorFunctions.js, 8, 17), Decl(templateTagOnConstructorFunctions.js, 17, 37))
 }
 var z = new Zet(1)
->z : Symbol(z, Decl(templateTagOnConstructorFunctions.js, 21, 3), Decl(templateTagOnConstructorFunctions.js, 21, 18))
+>z : Symbol(z, Decl(templateTagOnConstructorFunctions.js, 21, 3), Decl(templateTagOnConstructorFunctions.js, 21, 18), Decl(templateTagOnConstructorFunctions.js, 22, 7))
 >Zet : Symbol(Zet, Decl(templateTagOnConstructorFunctions.js, 0, 0))
 
 z.t = 2
 >z.t : Symbol(Zet.t, Decl(templateTagOnConstructorFunctions.js, 10, 10))
->z : Symbol(z, Decl(templateTagOnConstructorFunctions.js, 21, 3), Decl(templateTagOnConstructorFunctions.js, 21, 18))
+>z : Symbol(z, Decl(templateTagOnConstructorFunctions.js, 21, 3), Decl(templateTagOnConstructorFunctions.js, 21, 18), Decl(templateTagOnConstructorFunctions.js, 22, 7))
 >t : Symbol(Zet.t, Decl(templateTagOnConstructorFunctions.js, 10, 10))
 
 z.u = false
 >z.u : Symbol(Zet.u, Decl(templateTagOnConstructorFunctions.js, 8, 17), Decl(templateTagOnConstructorFunctions.js, 17, 37))
->z : Symbol(z, Decl(templateTagOnConstructorFunctions.js, 21, 3), Decl(templateTagOnConstructorFunctions.js, 21, 18))
+>z : Symbol(z, Decl(templateTagOnConstructorFunctions.js, 21, 3), Decl(templateTagOnConstructorFunctions.js, 21, 18), Decl(templateTagOnConstructorFunctions.js, 22, 7))
 >u : Symbol(Zet.u, Decl(templateTagOnConstructorFunctions.js, 8, 17), Decl(templateTagOnConstructorFunctions.js, 17, 37))
 
diff --git a/tests/baselines/reference/jsdocTemplateConstructorFunction2.symbols b/tests/baselines/reference/jsdocTemplateConstructorFunction2.symbols
index ca12425262b..073a59c283d 100644
--- a/tests/baselines/reference/jsdocTemplateConstructorFunction2.symbols
+++ b/tests/baselines/reference/jsdocTemplateConstructorFunction2.symbols
@@ -41,17 +41,17 @@ Zet.prototype.add = function(v, o) {
 >u : Symbol(Zet.u, Decl(templateTagWithNestedTypeLiteral.js, 4, 17), Decl(templateTagWithNestedTypeLiteral.js, 14, 36))
 }
 var z = new Zet(1)
->z : Symbol(z, Decl(templateTagWithNestedTypeLiteral.js, 18, 3), Decl(templateTagWithNestedTypeLiteral.js, 18, 18))
+>z : Symbol(z, Decl(templateTagWithNestedTypeLiteral.js, 18, 3), Decl(templateTagWithNestedTypeLiteral.js, 18, 18), Decl(templateTagWithNestedTypeLiteral.js, 19, 7))
 >Zet : Symbol(Zet, Decl(templateTagWithNestedTypeLiteral.js, 0, 0))
 
 z.t = 2
 >z.t : Symbol(Zet.t, Decl(templateTagWithNestedTypeLiteral.js, 6, 10))
->z : Symbol(z, Decl(templateTagWithNestedTypeLiteral.js, 18, 3), Decl(templateTagWithNestedTypeLiteral.js, 18, 18))
+>z : Symbol(z, Decl(templateTagWithNestedTypeLiteral.js, 18, 3), Decl(templateTagWithNestedTypeLiteral.js, 18, 18), Decl(templateTagWithNestedTypeLiteral.js, 19, 7))
 >t : Symbol(Zet.t, Decl(templateTagWithNestedTypeLiteral.js, 6, 10))
 
 z.u = false
 >z.u : Symbol(Zet.u, Decl(templateTagWithNestedTypeLiteral.js, 4, 17), Decl(templateTagWithNestedTypeLiteral.js, 14, 36))
->z : Symbol(z, Decl(templateTagWithNestedTypeLiteral.js, 18, 3), Decl(templateTagWithNestedTypeLiteral.js, 18, 18))
+>z : Symbol(z, Decl(templateTagWithNestedTypeLiteral.js, 18, 3), Decl(templateTagWithNestedTypeLiteral.js, 18, 18), Decl(templateTagWithNestedTypeLiteral.js, 19, 7))
 >u : Symbol(Zet.u, Decl(templateTagWithNestedTypeLiteral.js, 4, 17), Decl(templateTagWithNestedTypeLiteral.js, 14, 36))
 
 // lookup in typedef should not crash the compiler, even when the type is unknown
diff --git a/tests/baselines/reference/jsdocTypeFromChainedAssignment.symbols b/tests/baselines/reference/jsdocTypeFromChainedAssignment.symbols
index dbf21cf0925..5b1be631fd9 100644
--- a/tests/baselines/reference/jsdocTypeFromChainedAssignment.symbols
+++ b/tests/baselines/reference/jsdocTypeFromChainedAssignment.symbols
@@ -1,6 +1,6 @@
 === tests/cases/conformance/jsdoc/a.js ===
 function A () {
->A : Symbol(A, Decl(a.js, 0, 0), Decl(a.js, 8, 1))
+>A : Symbol(A, Decl(a.js, 0, 0), Decl(a.js, 8, 1), Decl(a.js, 10, 5))
 
     this.x = 1
 >x : Symbol(A.x, Decl(a.js, 0, 15))
@@ -13,11 +13,11 @@ function A () {
 /** @param {number} n */
 A.prototype.y = A.prototype.z = function f(n) {
 >A.prototype : Symbol(A.y, Decl(a.js, 4, 1))
->A : Symbol(A, Decl(a.js, 0, 0), Decl(a.js, 8, 1))
+>A : Symbol(A, Decl(a.js, 0, 0), Decl(a.js, 8, 1), Decl(a.js, 10, 5))
 >prototype : Symbol(Function.prototype, Decl(lib.es5.d.ts, --, --))
 >y : Symbol(A.y, Decl(a.js, 4, 1))
 >A.prototype : Symbol(A.z, Decl(a.js, 6, 15))
->A : Symbol(A, Decl(a.js, 0, 0), Decl(a.js, 8, 1))
+>A : Symbol(A, Decl(a.js, 0, 0), Decl(a.js, 8, 1), Decl(a.js, 10, 5))
 >prototype : Symbol(Function.prototype, Decl(lib.es5.d.ts, --, --))
 >z : Symbol(A.z, Decl(a.js, 6, 15))
 >f : Symbol(f, Decl(a.js, 6, 31))
@@ -26,27 +26,27 @@ A.prototype.y = A.prototype.z = function f(n) {
     return n + this.x
 >n : Symbol(n, Decl(a.js, 6, 43))
 >this.x : Symbol(A.x, Decl(a.js, 0, 15))
->this : Symbol(A, Decl(a.js, 0, 0), Decl(a.js, 8, 1))
+>this : Symbol(A, Decl(a.js, 0, 0), Decl(a.js, 8, 1), Decl(a.js, 10, 5))
 >x : Symbol(A.x, Decl(a.js, 0, 15))
 }
 /** @param {number} m */
 A.s = A.t = function g(m) {
 >A.s : Symbol(A.s, Decl(a.js, 8, 1))
->A : Symbol(A, Decl(a.js, 0, 0), Decl(a.js, 8, 1))
+>A : Symbol(A, Decl(a.js, 0, 0), Decl(a.js, 8, 1), Decl(a.js, 10, 5))
 >s : Symbol(A.s, Decl(a.js, 8, 1))
 >A.t : Symbol(A.t, Decl(a.js, 10, 5))
->A : Symbol(A, Decl(a.js, 0, 0), Decl(a.js, 8, 1))
+>A : Symbol(A, Decl(a.js, 0, 0), Decl(a.js, 8, 1), Decl(a.js, 10, 5))
 >t : Symbol(A.t, Decl(a.js, 10, 5))
 >g : Symbol(g, Decl(a.js, 10, 11))
 >m : Symbol(m, Decl(a.js, 10, 23))
 
     return m + this.x
 >m : Symbol(m, Decl(a.js, 10, 23))
->this : Symbol(A, Decl(a.js, 0, 0), Decl(a.js, 8, 1))
+>this : Symbol(A, Decl(a.js, 0, 0), Decl(a.js, 8, 1), Decl(a.js, 10, 5))
 }
 var a = new A()
 >a : Symbol(a, Decl(a.js, 13, 3), Decl(a.js, 17, 22))
->A : Symbol(A, Decl(a.js, 0, 0), Decl(a.js, 8, 1))
+>A : Symbol(A, Decl(a.js, 0, 0), Decl(a.js, 8, 1), Decl(a.js, 10, 5))
 
 a.y('no') // error
 >a.y : Symbol(A.y, Decl(a.js, 4, 1))
@@ -60,12 +60,12 @@ a.z('not really') // error
 
 A.s('still no') // error
 >A.s : Symbol(A.s, Decl(a.js, 8, 1))
->A : Symbol(A, Decl(a.js, 0, 0), Decl(a.js, 8, 1))
+>A : Symbol(A, Decl(a.js, 0, 0), Decl(a.js, 8, 1), Decl(a.js, 10, 5))
 >s : Symbol(A.s, Decl(a.js, 8, 1))
 
 A.t('not here either') // error
 >A.t : Symbol(A.t, Decl(a.js, 10, 5))
->A : Symbol(A, Decl(a.js, 0, 0), Decl(a.js, 8, 1))
+>A : Symbol(A, Decl(a.js, 0, 0), Decl(a.js, 8, 1), Decl(a.js, 10, 5))
 >t : Symbol(A.t, Decl(a.js, 10, 5))
 
 a.first = 10 // error: '10' isn't assignable to '1'
diff --git a/tests/baselines/reference/misspelledJsDocTypedefTags.symbols b/tests/baselines/reference/misspelledJsDocTypedefTags.symbols
index 1dda7f1fd58..c7a48f89946 100644
--- a/tests/baselines/reference/misspelledJsDocTypedefTags.symbols
+++ b/tests/baselines/reference/misspelledJsDocTypedefTags.symbols
@@ -1,9 +1,9 @@
 === tests/cases/compiler/a.js ===
 /** @typedef {{ endTime: number, screenshots: number}} A.<b>*/
 Animation.AnimationModel.ScreenshotCapture.Request;
->Animation : Symbol(Animation, Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --))
+>Animation : Symbol(Animation, Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(a.js, 1, 51))
 
 /** @typedef {{ endTime: number, screenshots: !B.<string>}} */
 Animation.AnimationModel.ScreenshotCapture.Request;
->Animation : Symbol(Animation, Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --))
+>Animation : Symbol(Animation, Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(a.js, 1, 51))
 
diff --git a/tests/baselines/reference/moduleExportWithExportPropertyAssignment4.symbols b/tests/baselines/reference/moduleExportWithExportPropertyAssignment4.symbols
index 1dd9bed92e6..edb7d52254a 100644
--- a/tests/baselines/reference/moduleExportWithExportPropertyAssignment4.symbols
+++ b/tests/baselines/reference/moduleExportWithExportPropertyAssignment4.symbols
@@ -49,27 +49,27 @@ module.exports.bothBefore = 'string'
 
 A.justExport = 4
 >A.justExport : Symbol(A.justExport, Decl(mod1.js, 1, 36))
->A : Symbol(A, Decl(mod1.js, 5, 18), Decl(mod1.js, 1, 36))
+>A : Symbol(A, Decl(mod1.js, 5, 18), Decl(mod1.js, 1, 36), Decl(mod1.js, 2, 16), Decl(mod1.js, 3, 16))
 >justExport : Symbol(A.justExport, Decl(mod1.js, 1, 36))
 
 A.bothBefore = 2
 >A.bothBefore : Symbol(A.bothBefore, Decl(mod1.js, 2, 16), Decl(mod1.js, 0, 0))
->A : Symbol(A, Decl(mod1.js, 5, 18), Decl(mod1.js, 1, 36))
+>A : Symbol(A, Decl(mod1.js, 5, 18), Decl(mod1.js, 1, 36), Decl(mod1.js, 2, 16), Decl(mod1.js, 3, 16))
 >bothBefore : Symbol(A.bothBefore, Decl(mod1.js, 2, 16), Decl(mod1.js, 0, 0))
 
 A.bothAfter = 3
 >A.bothAfter : Symbol(A.bothAfter, Decl(mod1.js, 3, 16), Decl(mod1.js, 8, 1))
->A : Symbol(A, Decl(mod1.js, 5, 18), Decl(mod1.js, 1, 36))
+>A : Symbol(A, Decl(mod1.js, 5, 18), Decl(mod1.js, 1, 36), Decl(mod1.js, 2, 16), Decl(mod1.js, 3, 16))
 >bothAfter : Symbol(A.bothAfter, Decl(mod1.js, 3, 16), Decl(mod1.js, 8, 1))
 
 module.exports = A
 >module.exports : Symbol("tests/cases/conformance/salsa/mod1", Decl(mod1.js, 0, 0))
 >module : Symbol(export=, Decl(mod1.js, 4, 15))
 >exports : Symbol(export=, Decl(mod1.js, 4, 15))
->A : Symbol(A, Decl(mod1.js, 5, 18), Decl(mod1.js, 1, 36))
+>A : Symbol(A, Decl(mod1.js, 5, 18), Decl(mod1.js, 1, 36), Decl(mod1.js, 2, 16), Decl(mod1.js, 3, 16))
 
 function A() {
->A : Symbol(A, Decl(mod1.js, 5, 18), Decl(mod1.js, 1, 36))
+>A : Symbol(A, Decl(mod1.js, 5, 18), Decl(mod1.js, 1, 36), Decl(mod1.js, 2, 16), Decl(mod1.js, 3, 16))
 
     this.p = 1
 >p : Symbol(A.p, Decl(mod1.js, 6, 14))
diff --git a/tests/baselines/reference/targetTypeTest1.errors.txt b/tests/baselines/reference/targetTypeTest1.errors.txt
index a0b05690a3b..03a4f0018b3 100644
--- a/tests/baselines/reference/targetTypeTest1.errors.txt
+++ b/tests/baselines/reference/targetTypeTest1.errors.txt
@@ -1,11 +1,13 @@
 tests/cases/compiler/targetTypeTest1.ts(1,15): error TS2300: Duplicate identifier 'Point'.
+tests/cases/compiler/targetTypeTest1.ts(6,43): error TS2709: Cannot use namespace 'Point' as a type.
+tests/cases/compiler/targetTypeTest1.ts(7,22): error TS2709: Cannot use namespace 'Point' as a type.
 tests/cases/compiler/targetTypeTest1.ts(14,10): error TS2300: Duplicate identifier 'Point'.
 tests/cases/compiler/targetTypeTest1.ts(19,18): error TS2384: Overload signatures must all be ambient or non-ambient.
 tests/cases/compiler/targetTypeTest1.ts(53,15): error TS2300: Duplicate identifier 'C'.
 tests/cases/compiler/targetTypeTest1.ts(60,10): error TS2300: Duplicate identifier 'C'.
 
 
-==== tests/cases/compiler/targetTypeTest1.ts (5 errors) ====
+==== tests/cases/compiler/targetTypeTest1.ts (7 errors) ====
     declare class Point
                   ~~~~~
 !!! error TS2300: Duplicate identifier 'Point'.
@@ -14,7 +16,11 @@ tests/cases/compiler/targetTypeTest1.ts(60,10): error TS2300: Duplicate identifi
           public x: number;
           public y: number;
           public add(dx: number, dy: number): Point;
+                                              ~~~~~
+!!! error TS2709: Cannot use namespace 'Point' as a type.
           static origin: Point;
+                         ~~~~~
+!!! error TS2709: Cannot use namespace 'Point' as a type.
     
     }
     
diff --git a/tests/baselines/reference/targetTypeTest1.symbols b/tests/baselines/reference/targetTypeTest1.symbols
index e8b5292603f..9bbad1ef89a 100644
--- a/tests/baselines/reference/targetTypeTest1.symbols
+++ b/tests/baselines/reference/targetTypeTest1.symbols
@@ -16,11 +16,9 @@ declare class Point
 >add : Symbol(Point.add, Decl(targetTypeTest1.ts, 4, 23))
 >dx : Symbol(dx, Decl(targetTypeTest1.ts, 5, 17))
 >dy : Symbol(dy, Decl(targetTypeTest1.ts, 5, 28))
->Point : Symbol(Point, Decl(targetTypeTest1.ts, 8, 1), Decl(targetTypeTest1.ts, 22, 17))
 
       static origin: Point;
 >origin : Symbol(Point.origin, Decl(targetTypeTest1.ts, 5, 48))
->Point : Symbol(Point, Decl(targetTypeTest1.ts, 8, 1), Decl(targetTypeTest1.ts, 22, 17))
 
 }
 
diff --git a/tests/baselines/reference/typeFromJSInitializer.symbols b/tests/baselines/reference/typeFromJSInitializer.symbols
index d7453d1f1e1..b4bc9950847 100644
--- a/tests/baselines/reference/typeFromJSInitializer.symbols
+++ b/tests/baselines/reference/typeFromJSInitializer.symbols
@@ -14,74 +14,74 @@ function A () {
 >empty : Symbol(A.empty, Decl(a.js, 3, 31))
 }
 var a = new A()
->a : Symbol(a, Decl(a.js, 6, 3), Decl(a.js, 6, 15))
+>a : Symbol(a, Decl(a.js, 6, 3), Decl(a.js, 6, 15), Decl(a.js, 7, 13), Decl(a.js, 8, 16), Decl(a.js, 9, 14) ... and 4 more)
 >A : Symbol(A, Decl(a.js, 0, 0))
 
 a.unknown = 1
 >a.unknown : Symbol(A.unknown, Decl(a.js, 0, 15))
->a : Symbol(a, Decl(a.js, 6, 3), Decl(a.js, 6, 15))
+>a : Symbol(a, Decl(a.js, 6, 3), Decl(a.js, 6, 15), Decl(a.js, 7, 13), Decl(a.js, 8, 16), Decl(a.js, 9, 14) ... and 4 more)
 >unknown : Symbol(A.unknown, Decl(a.js, 0, 15))
 
 a.unknown = true
 >a.unknown : Symbol(A.unknown, Decl(a.js, 0, 15))
->a : Symbol(a, Decl(a.js, 6, 3), Decl(a.js, 6, 15))
+>a : Symbol(a, Decl(a.js, 6, 3), Decl(a.js, 6, 15), Decl(a.js, 7, 13), Decl(a.js, 8, 16), Decl(a.js, 9, 14) ... and 4 more)
 >unknown : Symbol(A.unknown, Decl(a.js, 0, 15))
 
 a.unknown = {}
 >a.unknown : Symbol(A.unknown, Decl(a.js, 0, 15))
->a : Symbol(a, Decl(a.js, 6, 3), Decl(a.js, 6, 15))
+>a : Symbol(a, Decl(a.js, 6, 3), Decl(a.js, 6, 15), Decl(a.js, 7, 13), Decl(a.js, 8, 16), Decl(a.js, 9, 14) ... and 4 more)
 >unknown : Symbol(A.unknown, Decl(a.js, 0, 15))
 
 a.unknown = 'hi'
 >a.unknown : Symbol(A.unknown, Decl(a.js, 0, 15))
->a : Symbol(a, Decl(a.js, 6, 3), Decl(a.js, 6, 15))
+>a : Symbol(a, Decl(a.js, 6, 3), Decl(a.js, 6, 15), Decl(a.js, 7, 13), Decl(a.js, 8, 16), Decl(a.js, 9, 14) ... and 4 more)
 >unknown : Symbol(A.unknown, Decl(a.js, 0, 15))
 
 a.unknowable = 1
 >a.unknowable : Symbol(A.unknowable, Decl(a.js, 2, 23))
->a : Symbol(a, Decl(a.js, 6, 3), Decl(a.js, 6, 15))
+>a : Symbol(a, Decl(a.js, 6, 3), Decl(a.js, 6, 15), Decl(a.js, 7, 13), Decl(a.js, 8, 16), Decl(a.js, 9, 14) ... and 4 more)
 >unknowable : Symbol(A.unknowable, Decl(a.js, 2, 23))
 
 a.unknowable = true
 >a.unknowable : Symbol(A.unknowable, Decl(a.js, 2, 23))
->a : Symbol(a, Decl(a.js, 6, 3), Decl(a.js, 6, 15))
+>a : Symbol(a, Decl(a.js, 6, 3), Decl(a.js, 6, 15), Decl(a.js, 7, 13), Decl(a.js, 8, 16), Decl(a.js, 9, 14) ... and 4 more)
 >unknowable : Symbol(A.unknowable, Decl(a.js, 2, 23))
 
 a.unknowable = {}
 >a.unknowable : Symbol(A.unknowable, Decl(a.js, 2, 23))
->a : Symbol(a, Decl(a.js, 6, 3), Decl(a.js, 6, 15))
+>a : Symbol(a, Decl(a.js, 6, 3), Decl(a.js, 6, 15), Decl(a.js, 7, 13), Decl(a.js, 8, 16), Decl(a.js, 9, 14) ... and 4 more)
 >unknowable : Symbol(A.unknowable, Decl(a.js, 2, 23))
 
 a.unknowable = 'hi'
 >a.unknowable : Symbol(A.unknowable, Decl(a.js, 2, 23))
->a : Symbol(a, Decl(a.js, 6, 3), Decl(a.js, 6, 15))
+>a : Symbol(a, Decl(a.js, 6, 3), Decl(a.js, 6, 15), Decl(a.js, 7, 13), Decl(a.js, 8, 16), Decl(a.js, 9, 14) ... and 4 more)
 >unknowable : Symbol(A.unknowable, Decl(a.js, 2, 23))
 
 a.empty.push(1)
 >a.empty.push : Symbol(Array.push, Decl(lib.es5.d.ts, --, --))
 >a.empty : Symbol(A.empty, Decl(a.js, 3, 31))
->a : Symbol(a, Decl(a.js, 6, 3), Decl(a.js, 6, 15))
+>a : Symbol(a, Decl(a.js, 6, 3), Decl(a.js, 6, 15), Decl(a.js, 7, 13), Decl(a.js, 8, 16), Decl(a.js, 9, 14) ... and 4 more)
 >empty : Symbol(A.empty, Decl(a.js, 3, 31))
 >push : Symbol(Array.push, Decl(lib.es5.d.ts, --, --))
 
 a.empty.push(true)
 >a.empty.push : Symbol(Array.push, Decl(lib.es5.d.ts, --, --))
 >a.empty : Symbol(A.empty, Decl(a.js, 3, 31))
->a : Symbol(a, Decl(a.js, 6, 3), Decl(a.js, 6, 15))
+>a : Symbol(a, Decl(a.js, 6, 3), Decl(a.js, 6, 15), Decl(a.js, 7, 13), Decl(a.js, 8, 16), Decl(a.js, 9, 14) ... and 4 more)
 >empty : Symbol(A.empty, Decl(a.js, 3, 31))
 >push : Symbol(Array.push, Decl(lib.es5.d.ts, --, --))
 
 a.empty.push({})
 >a.empty.push : Symbol(Array.push, Decl(lib.es5.d.ts, --, --))
 >a.empty : Symbol(A.empty, Decl(a.js, 3, 31))
->a : Symbol(a, Decl(a.js, 6, 3), Decl(a.js, 6, 15))
+>a : Symbol(a, Decl(a.js, 6, 3), Decl(a.js, 6, 15), Decl(a.js, 7, 13), Decl(a.js, 8, 16), Decl(a.js, 9, 14) ... and 4 more)
 >empty : Symbol(A.empty, Decl(a.js, 3, 31))
 >push : Symbol(Array.push, Decl(lib.es5.d.ts, --, --))
 
 a.empty.push('hi')
 >a.empty.push : Symbol(Array.push, Decl(lib.es5.d.ts, --, --))
 >a.empty : Symbol(A.empty, Decl(a.js, 3, 31))
->a : Symbol(a, Decl(a.js, 6, 3), Decl(a.js, 6, 15))
+>a : Symbol(a, Decl(a.js, 6, 3), Decl(a.js, 6, 15), Decl(a.js, 7, 13), Decl(a.js, 8, 16), Decl(a.js, 9, 14) ... and 4 more)
 >empty : Symbol(A.empty, Decl(a.js, 3, 31))
 >push : Symbol(Array.push, Decl(lib.es5.d.ts, --, --))
 
diff --git a/tests/baselines/reference/typeFromPropertyAssignment10.symbols b/tests/baselines/reference/typeFromPropertyAssignment10.symbols
index 9b0af678352..3a4f826f6a3 100644
--- a/tests/baselines/reference/typeFromPropertyAssignment10.symbols
+++ b/tests/baselines/reference/typeFromPropertyAssignment10.symbols
@@ -1,22 +1,22 @@
 === tests/cases/conformance/salsa/module.js ===
 var Outer = Outer || {};
->Outer : Symbol(Outer, Decl(module.js, 0, 3), Decl(module.js, 0, 24), Decl(someview.js, 0, 0), Decl(application.js, 0, 0))
->Outer : Symbol(Outer, Decl(module.js, 0, 3), Decl(module.js, 0, 24), Decl(someview.js, 0, 0), Decl(application.js, 0, 0))
+>Outer : Symbol(Outer, Decl(module.js, 0, 3), Decl(module.js, 0, 24), Decl(someview.js, 0, 0), Decl(someview.js, 5, 5), Decl(someview.js, 13, 10) ... and 1 more)
+>Outer : Symbol(Outer, Decl(module.js, 0, 3), Decl(module.js, 0, 24), Decl(someview.js, 0, 0), Decl(someview.js, 5, 5), Decl(someview.js, 13, 10) ... and 1 more)
 
 Outer.app = Outer.app || {};
->Outer.app : Symbol(Outer.app, Decl(module.js, 0, 24), Decl(someview.js, 0, 6), Decl(application.js, 0, 6))
->Outer : Symbol(Outer, Decl(module.js, 0, 3), Decl(module.js, 0, 24), Decl(someview.js, 0, 0), Decl(application.js, 0, 0))
->app : Symbol(Outer.app, Decl(module.js, 0, 24), Decl(someview.js, 0, 6), Decl(application.js, 0, 6))
->Outer.app : Symbol(Outer.app, Decl(module.js, 0, 24), Decl(someview.js, 0, 6), Decl(application.js, 0, 6))
->Outer : Symbol(Outer, Decl(module.js, 0, 3), Decl(module.js, 0, 24), Decl(someview.js, 0, 0), Decl(application.js, 0, 0))
->app : Symbol(Outer.app, Decl(module.js, 0, 24), Decl(someview.js, 0, 6), Decl(application.js, 0, 6))
+>Outer.app : Symbol(Outer.app, Decl(module.js, 0, 24), Decl(someview.js, 0, 6), Decl(someview.js, 6, 6), Decl(someview.js, 15, 6), Decl(application.js, 0, 6))
+>Outer : Symbol(Outer, Decl(module.js, 0, 3), Decl(module.js, 0, 24), Decl(someview.js, 0, 0), Decl(someview.js, 5, 5), Decl(someview.js, 13, 10) ... and 1 more)
+>app : Symbol(Outer.app, Decl(module.js, 0, 24), Decl(someview.js, 0, 6), Decl(someview.js, 6, 6), Decl(someview.js, 15, 6), Decl(application.js, 0, 6))
+>Outer.app : Symbol(Outer.app, Decl(module.js, 0, 24), Decl(someview.js, 0, 6), Decl(someview.js, 6, 6), Decl(someview.js, 15, 6), Decl(application.js, 0, 6))
+>Outer : Symbol(Outer, Decl(module.js, 0, 3), Decl(module.js, 0, 24), Decl(someview.js, 0, 0), Decl(someview.js, 5, 5), Decl(someview.js, 13, 10) ... and 1 more)
+>app : Symbol(Outer.app, Decl(module.js, 0, 24), Decl(someview.js, 0, 6), Decl(someview.js, 6, 6), Decl(someview.js, 15, 6), Decl(application.js, 0, 6))
 
 === tests/cases/conformance/salsa/someview.js ===
 Outer.app.SomeView = (function () {
 >Outer.app.SomeView : Symbol(Outer.app.SomeView, Decl(someview.js, 0, 0))
->Outer.app : Symbol(Outer.app, Decl(module.js, 0, 24), Decl(someview.js, 0, 6), Decl(application.js, 0, 6))
->Outer : Symbol(Outer, Decl(module.js, 0, 3), Decl(module.js, 0, 24), Decl(someview.js, 0, 0), Decl(application.js, 0, 0))
->app : Symbol(Outer.app, Decl(module.js, 0, 24), Decl(someview.js, 0, 6), Decl(application.js, 0, 6))
+>Outer.app : Symbol(Outer.app, Decl(module.js, 0, 24), Decl(someview.js, 0, 6), Decl(someview.js, 6, 6), Decl(someview.js, 15, 6), Decl(application.js, 0, 6))
+>Outer : Symbol(Outer, Decl(module.js, 0, 3), Decl(module.js, 0, 24), Decl(someview.js, 0, 0), Decl(someview.js, 5, 5), Decl(someview.js, 13, 10) ... and 1 more)
+>app : Symbol(Outer.app, Decl(module.js, 0, 24), Decl(someview.js, 0, 6), Decl(someview.js, 6, 6), Decl(someview.js, 15, 6), Decl(application.js, 0, 6))
 >SomeView : Symbol(Outer.app.SomeView, Decl(someview.js, 0, 0))
 
     var SomeView = function() {
@@ -31,9 +31,9 @@ Outer.app.SomeView = (function () {
 })();
 Outer.app.Inner = class {
 >Outer.app.Inner : Symbol(Outer.app.Inner, Decl(someview.js, 5, 5))
->Outer.app : Symbol(Outer.app, Decl(module.js, 0, 24), Decl(someview.js, 0, 6), Decl(application.js, 0, 6))
->Outer : Symbol(Outer, Decl(module.js, 0, 3), Decl(module.js, 0, 24), Decl(someview.js, 0, 0), Decl(application.js, 0, 0))
->app : Symbol(Outer.app, Decl(module.js, 0, 24), Decl(someview.js, 0, 6), Decl(application.js, 0, 6))
+>Outer.app : Symbol(Outer.app, Decl(module.js, 0, 24), Decl(someview.js, 0, 6), Decl(someview.js, 6, 6), Decl(someview.js, 15, 6), Decl(application.js, 0, 6))
+>Outer : Symbol(Outer, Decl(module.js, 0, 3), Decl(module.js, 0, 24), Decl(someview.js, 0, 0), Decl(someview.js, 5, 5), Decl(someview.js, 13, 10) ... and 1 more)
+>app : Symbol(Outer.app, Decl(module.js, 0, 24), Decl(someview.js, 0, 6), Decl(someview.js, 6, 6), Decl(someview.js, 15, 6), Decl(application.js, 0, 6))
 >Inner : Symbol(Outer.app.Inner, Decl(someview.js, 5, 5))
 
     constructor() {
@@ -47,9 +47,9 @@ Outer.app.Inner = class {
 var example = new Outer.app.Inner();
 >example : Symbol(example, Decl(someview.js, 12, 3))
 >Outer.app.Inner : Symbol(Outer.app.Inner, Decl(someview.js, 5, 5))
->Outer.app : Symbol(Outer.app, Decl(module.js, 0, 24), Decl(someview.js, 0, 6), Decl(application.js, 0, 6))
->Outer : Symbol(Outer, Decl(module.js, 0, 3), Decl(module.js, 0, 24), Decl(someview.js, 0, 0), Decl(application.js, 0, 0))
->app : Symbol(Outer.app, Decl(module.js, 0, 24), Decl(someview.js, 0, 6), Decl(application.js, 0, 6))
+>Outer.app : Symbol(Outer.app, Decl(module.js, 0, 24), Decl(someview.js, 0, 6), Decl(someview.js, 6, 6), Decl(someview.js, 15, 6), Decl(application.js, 0, 6))
+>Outer : Symbol(Outer, Decl(module.js, 0, 3), Decl(module.js, 0, 24), Decl(someview.js, 0, 0), Decl(someview.js, 5, 5), Decl(someview.js, 13, 10) ... and 1 more)
+>app : Symbol(Outer.app, Decl(module.js, 0, 24), Decl(someview.js, 0, 6), Decl(someview.js, 6, 6), Decl(someview.js, 15, 6), Decl(application.js, 0, 6))
 >Inner : Symbol(Outer.app.Inner, Decl(someview.js, 5, 5))
 
 example.y;
@@ -60,9 +60,9 @@ example.y;
 /** @param {number} k */
 Outer.app.statische = function (k) {
 >Outer.app.statische : Symbol(Outer.app.statische, Decl(someview.js, 13, 10))
->Outer.app : Symbol(Outer.app, Decl(module.js, 0, 24), Decl(someview.js, 0, 6), Decl(application.js, 0, 6))
->Outer : Symbol(Outer, Decl(module.js, 0, 3), Decl(module.js, 0, 24), Decl(someview.js, 0, 0), Decl(application.js, 0, 0))
->app : Symbol(Outer.app, Decl(module.js, 0, 24), Decl(someview.js, 0, 6), Decl(application.js, 0, 6))
+>Outer.app : Symbol(Outer.app, Decl(module.js, 0, 24), Decl(someview.js, 0, 6), Decl(someview.js, 6, 6), Decl(someview.js, 15, 6), Decl(application.js, 0, 6))
+>Outer : Symbol(Outer, Decl(module.js, 0, 3), Decl(module.js, 0, 24), Decl(someview.js, 0, 0), Decl(someview.js, 5, 5), Decl(someview.js, 13, 10) ... and 1 more)
+>app : Symbol(Outer.app, Decl(module.js, 0, 24), Decl(someview.js, 0, 6), Decl(someview.js, 6, 6), Decl(someview.js, 15, 6), Decl(application.js, 0, 6))
 >statische : Symbol(Outer.app.statische, Decl(someview.js, 13, 10))
 >k : Symbol(k, Decl(someview.js, 15, 32))
 
@@ -73,9 +73,9 @@ Outer.app.statische = function (k) {
 === tests/cases/conformance/salsa/application.js ===
 Outer.app.Application = (function () {
 >Outer.app.Application : Symbol(Outer.app.Application, Decl(application.js, 0, 0))
->Outer.app : Symbol(Outer.app, Decl(module.js, 0, 24), Decl(someview.js, 0, 6), Decl(application.js, 0, 6))
->Outer : Symbol(Outer, Decl(module.js, 0, 3), Decl(module.js, 0, 24), Decl(someview.js, 0, 0), Decl(application.js, 0, 0))
->app : Symbol(Outer.app, Decl(module.js, 0, 24), Decl(someview.js, 0, 6), Decl(application.js, 0, 6))
+>Outer.app : Symbol(Outer.app, Decl(module.js, 0, 24), Decl(someview.js, 0, 6), Decl(someview.js, 6, 6), Decl(someview.js, 15, 6), Decl(application.js, 0, 6))
+>Outer : Symbol(Outer, Decl(module.js, 0, 3), Decl(module.js, 0, 24), Decl(someview.js, 0, 0), Decl(someview.js, 5, 5), Decl(someview.js, 13, 10) ... and 1 more)
+>app : Symbol(Outer.app, Decl(module.js, 0, 24), Decl(someview.js, 0, 6), Decl(someview.js, 6, 6), Decl(someview.js, 15, 6), Decl(application.js, 0, 6))
 >Application : Symbol(Outer.app.Application, Decl(application.js, 0, 0))
 
     /**
@@ -91,9 +91,9 @@ Outer.app.Application = (function () {
         me.view = new Outer.app.SomeView();
 >me : Symbol(me, Decl(application.js, 7, 11))
 >Outer.app.SomeView : Symbol(Outer.app.SomeView, Decl(someview.js, 0, 0))
->Outer.app : Symbol(Outer.app, Decl(module.js, 0, 24), Decl(someview.js, 0, 6), Decl(application.js, 0, 6))
->Outer : Symbol(Outer, Decl(module.js, 0, 3), Decl(module.js, 0, 24), Decl(someview.js, 0, 0), Decl(application.js, 0, 0))
->app : Symbol(Outer.app, Decl(module.js, 0, 24), Decl(someview.js, 0, 6), Decl(application.js, 0, 6))
+>Outer.app : Symbol(Outer.app, Decl(module.js, 0, 24), Decl(someview.js, 0, 6), Decl(someview.js, 6, 6), Decl(someview.js, 15, 6), Decl(application.js, 0, 6))
+>Outer : Symbol(Outer, Decl(module.js, 0, 3), Decl(module.js, 0, 24), Decl(someview.js, 0, 0), Decl(someview.js, 5, 5), Decl(someview.js, 13, 10) ... and 1 more)
+>app : Symbol(Outer.app, Decl(module.js, 0, 24), Decl(someview.js, 0, 6), Decl(someview.js, 6, 6), Decl(someview.js, 15, 6), Decl(application.js, 0, 6))
 >SomeView : Symbol(Outer.app.SomeView, Decl(someview.js, 0, 0))
 
     };
@@ -105,17 +105,17 @@ Outer.app.Application = (function () {
 var app = new Outer.app.Application();
 >app : Symbol(app, Decl(main.js, 0, 3))
 >Outer.app.Application : Symbol(Outer.app.Application, Decl(application.js, 0, 0))
->Outer.app : Symbol(Outer.app, Decl(module.js, 0, 24), Decl(someview.js, 0, 6), Decl(application.js, 0, 6))
->Outer : Symbol(Outer, Decl(module.js, 0, 3), Decl(module.js, 0, 24), Decl(someview.js, 0, 0), Decl(application.js, 0, 0))
->app : Symbol(Outer.app, Decl(module.js, 0, 24), Decl(someview.js, 0, 6), Decl(application.js, 0, 6))
+>Outer.app : Symbol(Outer.app, Decl(module.js, 0, 24), Decl(someview.js, 0, 6), Decl(someview.js, 6, 6), Decl(someview.js, 15, 6), Decl(application.js, 0, 6))
+>Outer : Symbol(Outer, Decl(module.js, 0, 3), Decl(module.js, 0, 24), Decl(someview.js, 0, 0), Decl(someview.js, 5, 5), Decl(someview.js, 13, 10) ... and 1 more)
+>app : Symbol(Outer.app, Decl(module.js, 0, 24), Decl(someview.js, 0, 6), Decl(someview.js, 6, 6), Decl(someview.js, 15, 6), Decl(application.js, 0, 6))
 >Application : Symbol(Outer.app.Application, Decl(application.js, 0, 0))
 
 var inner = new Outer.app.Inner();
 >inner : Symbol(inner, Decl(main.js, 1, 3))
 >Outer.app.Inner : Symbol(Outer.app.Inner, Decl(someview.js, 5, 5))
->Outer.app : Symbol(Outer.app, Decl(module.js, 0, 24), Decl(someview.js, 0, 6), Decl(application.js, 0, 6))
->Outer : Symbol(Outer, Decl(module.js, 0, 3), Decl(module.js, 0, 24), Decl(someview.js, 0, 0), Decl(application.js, 0, 0))
->app : Symbol(Outer.app, Decl(module.js, 0, 24), Decl(someview.js, 0, 6), Decl(application.js, 0, 6))
+>Outer.app : Symbol(Outer.app, Decl(module.js, 0, 24), Decl(someview.js, 0, 6), Decl(someview.js, 6, 6), Decl(someview.js, 15, 6), Decl(application.js, 0, 6))
+>Outer : Symbol(Outer, Decl(module.js, 0, 3), Decl(module.js, 0, 24), Decl(someview.js, 0, 0), Decl(someview.js, 5, 5), Decl(someview.js, 13, 10) ... and 1 more)
+>app : Symbol(Outer.app, Decl(module.js, 0, 24), Decl(someview.js, 0, 6), Decl(someview.js, 6, 6), Decl(someview.js, 15, 6), Decl(application.js, 0, 6))
 >Inner : Symbol(Outer.app.Inner, Decl(someview.js, 5, 5))
 
 inner.y;
@@ -134,8 +134,8 @@ x.y;
 
 Outer.app.statische(101); // Infinity, duh
 >Outer.app.statische : Symbol(Outer.app.statische, Decl(someview.js, 13, 10))
->Outer.app : Symbol(Outer.app, Decl(module.js, 0, 24), Decl(someview.js, 0, 6), Decl(application.js, 0, 6))
->Outer : Symbol(Outer, Decl(module.js, 0, 3), Decl(module.js, 0, 24), Decl(someview.js, 0, 0), Decl(application.js, 0, 0))
->app : Symbol(Outer.app, Decl(module.js, 0, 24), Decl(someview.js, 0, 6), Decl(application.js, 0, 6))
+>Outer.app : Symbol(Outer.app, Decl(module.js, 0, 24), Decl(someview.js, 0, 6), Decl(someview.js, 6, 6), Decl(someview.js, 15, 6), Decl(application.js, 0, 6))
+>Outer : Symbol(Outer, Decl(module.js, 0, 3), Decl(module.js, 0, 24), Decl(someview.js, 0, 0), Decl(someview.js, 5, 5), Decl(someview.js, 13, 10) ... and 1 more)
+>app : Symbol(Outer.app, Decl(module.js, 0, 24), Decl(someview.js, 0, 6), Decl(someview.js, 6, 6), Decl(someview.js, 15, 6), Decl(application.js, 0, 6))
 >statische : Symbol(Outer.app.statische, Decl(someview.js, 13, 10))
 
diff --git a/tests/baselines/reference/typeFromPropertyAssignment17.symbols b/tests/baselines/reference/typeFromPropertyAssignment17.symbols
index 165d3a04f8d..5d6f98f309b 100644
--- a/tests/baselines/reference/typeFromPropertyAssignment17.symbols
+++ b/tests/baselines/reference/typeFromPropertyAssignment17.symbols
@@ -41,17 +41,17 @@ module.exports = minimatch
 >module.exports : Symbol("tests/cases/conformance/salsa/minimatch", Decl(minimatch.js, 0, 0))
 >module : Symbol(export=, Decl(minimatch.js, 0, 0))
 >exports : Symbol(export=, Decl(minimatch.js, 0, 0))
->minimatch : Symbol(minimatch, Decl(minimatch.js, 6, 1), Decl(minimatch.js, 1, 26))
+>minimatch : Symbol(minimatch, Decl(minimatch.js, 6, 1), Decl(minimatch.js, 1, 26), Decl(minimatch.js, 2, 15))
 
 minimatch.M = M
 >minimatch.M : Symbol(minimatch.M, Decl(minimatch.js, 1, 26))
->minimatch : Symbol(minimatch, Decl(minimatch.js, 6, 1), Decl(minimatch.js, 1, 26))
+>minimatch : Symbol(minimatch, Decl(minimatch.js, 6, 1), Decl(minimatch.js, 1, 26), Decl(minimatch.js, 2, 15))
 >M : Symbol(minimatch.M, Decl(minimatch.js, 1, 26))
 >M : Symbol(M, Decl(minimatch.js, 13, 1), Decl(minimatch.js, 8, 1))
 
 minimatch.filter = filter
 >minimatch.filter : Symbol(minimatch.filter, Decl(minimatch.js, 2, 15))
->minimatch : Symbol(minimatch, Decl(minimatch.js, 6, 1), Decl(minimatch.js, 1, 26))
+>minimatch : Symbol(minimatch, Decl(minimatch.js, 6, 1), Decl(minimatch.js, 1, 26), Decl(minimatch.js, 2, 15))
 >filter : Symbol(minimatch.filter, Decl(minimatch.js, 2, 15))
 >filter : Symbol(filter, Decl(minimatch.js, 3, 25))
 
@@ -59,10 +59,10 @@ function filter() {
 >filter : Symbol(filter, Decl(minimatch.js, 3, 25))
 
     return minimatch()
->minimatch : Symbol(minimatch, Decl(minimatch.js, 6, 1), Decl(minimatch.js, 1, 26))
+>minimatch : Symbol(minimatch, Decl(minimatch.js, 6, 1), Decl(minimatch.js, 1, 26), Decl(minimatch.js, 2, 15))
 }
 function minimatch() {
->minimatch : Symbol(minimatch, Decl(minimatch.js, 6, 1), Decl(minimatch.js, 1, 26))
+>minimatch : Symbol(minimatch, Decl(minimatch.js, 6, 1), Decl(minimatch.js, 1, 26), Decl(minimatch.js, 2, 15))
 }
 M.defaults = function (def) {
 >M.defaults : Symbol(M.defaults, Decl(minimatch.js, 8, 1))
diff --git a/tests/baselines/reference/typeFromPropertyAssignment25.symbols b/tests/baselines/reference/typeFromPropertyAssignment25.symbols
index a98333e97d0..d2be36efd2e 100644
--- a/tests/baselines/reference/typeFromPropertyAssignment25.symbols
+++ b/tests/baselines/reference/typeFromPropertyAssignment25.symbols
@@ -1,10 +1,10 @@
 === tests/cases/conformance/salsa/bug24703.js ===
 var Common = {};
->Common : Symbol(Common, Decl(bug24703.js, 0, 3), Decl(bug24703.js, 0, 16))
+>Common : Symbol(Common, Decl(bug24703.js, 0, 3), Decl(bug24703.js, 0, 16), Decl(bug24703.js, 5, 1))
 
 Common.I = class {
 >Common.I : Symbol(Common.I, Decl(bug24703.js, 0, 16))
->Common : Symbol(Common, Decl(bug24703.js, 0, 3), Decl(bug24703.js, 0, 16))
+>Common : Symbol(Common, Decl(bug24703.js, 0, 3), Decl(bug24703.js, 0, 16), Decl(bug24703.js, 5, 1))
 >I : Symbol(Common.I, Decl(bug24703.js, 0, 16))
 
     constructor() {
@@ -16,10 +16,10 @@ Common.I = class {
 }
 Common.O = class extends Common.I {
 >Common.O : Symbol(Common.O, Decl(bug24703.js, 5, 1))
->Common : Symbol(Common, Decl(bug24703.js, 0, 3), Decl(bug24703.js, 0, 16))
+>Common : Symbol(Common, Decl(bug24703.js, 0, 3), Decl(bug24703.js, 0, 16), Decl(bug24703.js, 5, 1))
 >O : Symbol(Common.O, Decl(bug24703.js, 5, 1))
 >Common.I : Symbol(Common.I, Decl(bug24703.js, 0, 16))
->Common : Symbol(Common, Decl(bug24703.js, 0, 3), Decl(bug24703.js, 0, 16))
+>Common : Symbol(Common, Decl(bug24703.js, 0, 3), Decl(bug24703.js, 0, 16), Decl(bug24703.js, 5, 1))
 >I : Symbol(Common.I, Decl(bug24703.js, 0, 16))
 
     constructor() {
@@ -35,13 +35,13 @@ Common.O = class extends Common.I {
 var o = new Common.O()
 >o : Symbol(o, Decl(bug24703.js, 12, 3))
 >Common.O : Symbol(Common.O, Decl(bug24703.js, 5, 1))
->Common : Symbol(Common, Decl(bug24703.js, 0, 3), Decl(bug24703.js, 0, 16))
+>Common : Symbol(Common, Decl(bug24703.js, 0, 3), Decl(bug24703.js, 0, 16), Decl(bug24703.js, 5, 1))
 >O : Symbol(Common.O, Decl(bug24703.js, 5, 1))
 
 var i = new Common.I()
 >i : Symbol(i, Decl(bug24703.js, 13, 3))
 >Common.I : Symbol(Common.I, Decl(bug24703.js, 0, 16))
->Common : Symbol(Common, Decl(bug24703.js, 0, 3), Decl(bug24703.js, 0, 16))
+>Common : Symbol(Common, Decl(bug24703.js, 0, 3), Decl(bug24703.js, 0, 16), Decl(bug24703.js, 5, 1))
 >I : Symbol(Common.I, Decl(bug24703.js, 0, 16))
 
 o.i
diff --git a/tests/baselines/reference/typeFromPropertyAssignment26.symbols b/tests/baselines/reference/typeFromPropertyAssignment26.symbols
index f70413c819f..77e48ed24b0 100644
--- a/tests/baselines/reference/typeFromPropertyAssignment26.symbols
+++ b/tests/baselines/reference/typeFromPropertyAssignment26.symbols
@@ -1,10 +1,10 @@
 === tests/cases/conformance/salsa/bug24730.js ===
 var UI = {}
->UI : Symbol(UI, Decl(bug24730.js, 0, 3), Decl(bug24730.js, 0, 11))
+>UI : Symbol(UI, Decl(bug24730.js, 0, 3), Decl(bug24730.js, 0, 11), Decl(bug24730.js, 5, 2))
 
 UI.TreeElement = class {
 >UI.TreeElement : Symbol(UI.TreeElement, Decl(bug24730.js, 0, 11))
->UI : Symbol(UI, Decl(bug24730.js, 0, 3), Decl(bug24730.js, 0, 11))
+>UI : Symbol(UI, Decl(bug24730.js, 0, 3), Decl(bug24730.js, 0, 11), Decl(bug24730.js, 5, 2))
 >TreeElement : Symbol(UI.TreeElement, Decl(bug24730.js, 0, 11))
 
     constructor() {
@@ -16,16 +16,16 @@ UI.TreeElement = class {
 };
 UI.context = new UI.TreeElement()
 >UI.context : Symbol(UI.context, Decl(bug24730.js, 5, 2))
->UI : Symbol(UI, Decl(bug24730.js, 0, 3), Decl(bug24730.js, 0, 11))
+>UI : Symbol(UI, Decl(bug24730.js, 0, 3), Decl(bug24730.js, 0, 11), Decl(bug24730.js, 5, 2))
 >context : Symbol(UI.context, Decl(bug24730.js, 5, 2))
 >UI.TreeElement : Symbol(UI.TreeElement, Decl(bug24730.js, 0, 11))
->UI : Symbol(UI, Decl(bug24730.js, 0, 3), Decl(bug24730.js, 0, 11))
+>UI : Symbol(UI, Decl(bug24730.js, 0, 3), Decl(bug24730.js, 0, 11), Decl(bug24730.js, 5, 2))
 >TreeElement : Symbol(UI.TreeElement, Decl(bug24730.js, 0, 11))
 
 class C extends UI.TreeElement {
 >C : Symbol(C, Decl(bug24730.js, 6, 33))
 >UI.TreeElement : Symbol(UI.TreeElement, Decl(bug24730.js, 0, 11))
->UI : Symbol(UI, Decl(bug24730.js, 0, 3), Decl(bug24730.js, 0, 11))
+>UI : Symbol(UI, Decl(bug24730.js, 0, 3), Decl(bug24730.js, 0, 11), Decl(bug24730.js, 5, 2))
 >TreeElement : Symbol(UI.TreeElement, Decl(bug24730.js, 0, 11))
 
     onpopulate() {
diff --git a/tests/baselines/reference/typeFromPropertyAssignment29.symbols b/tests/baselines/reference/typeFromPropertyAssignment29.symbols
index 8be54d3d87c..dd53b85df00 100644
--- a/tests/baselines/reference/typeFromPropertyAssignment29.symbols
+++ b/tests/baselines/reference/typeFromPropertyAssignment29.symbols
@@ -1,6 +1,6 @@
 === tests/cases/conformance/salsa/typeFromPropertyAssignment29.ts ===
 function ExpandoDecl(n: number) {
->ExpandoDecl : Symbol(ExpandoDecl, Decl(typeFromPropertyAssignment29.ts, 0, 0), Decl(typeFromPropertyAssignment29.ts, 2, 1))
+>ExpandoDecl : Symbol(ExpandoDecl, Decl(typeFromPropertyAssignment29.ts, 0, 0), Decl(typeFromPropertyAssignment29.ts, 2, 1), Decl(typeFromPropertyAssignment29.ts, 3, 20))
 >n : Symbol(n, Decl(typeFromPropertyAssignment29.ts, 0, 21))
 
     return n.toString();
@@ -10,12 +10,12 @@ function ExpandoDecl(n: number) {
 }
 ExpandoDecl.prop = 2
 >ExpandoDecl.prop : Symbol(ExpandoDecl.prop, Decl(typeFromPropertyAssignment29.ts, 2, 1))
->ExpandoDecl : Symbol(ExpandoDecl, Decl(typeFromPropertyAssignment29.ts, 0, 0), Decl(typeFromPropertyAssignment29.ts, 2, 1))
+>ExpandoDecl : Symbol(ExpandoDecl, Decl(typeFromPropertyAssignment29.ts, 0, 0), Decl(typeFromPropertyAssignment29.ts, 2, 1), Decl(typeFromPropertyAssignment29.ts, 3, 20))
 >prop : Symbol(ExpandoDecl.prop, Decl(typeFromPropertyAssignment29.ts, 2, 1))
 
 ExpandoDecl.m = function(n: number) {
 >ExpandoDecl.m : Symbol(ExpandoDecl.m, Decl(typeFromPropertyAssignment29.ts, 3, 20))
->ExpandoDecl : Symbol(ExpandoDecl, Decl(typeFromPropertyAssignment29.ts, 0, 0), Decl(typeFromPropertyAssignment29.ts, 2, 1))
+>ExpandoDecl : Symbol(ExpandoDecl, Decl(typeFromPropertyAssignment29.ts, 0, 0), Decl(typeFromPropertyAssignment29.ts, 2, 1), Decl(typeFromPropertyAssignment29.ts, 3, 20))
 >m : Symbol(ExpandoDecl.m, Decl(typeFromPropertyAssignment29.ts, 3, 20))
 >n : Symbol(n, Decl(typeFromPropertyAssignment29.ts, 4, 25))
 
@@ -25,17 +25,17 @@ ExpandoDecl.m = function(n: number) {
 var n = ExpandoDecl.prop + ExpandoDecl.m(12) + ExpandoDecl(101).length
 >n : Symbol(n, Decl(typeFromPropertyAssignment29.ts, 7, 3), Decl(typeFromPropertyAssignment29.ts, 17, 3), Decl(typeFromPropertyAssignment29.ts, 45, 3), Decl(typeFromPropertyAssignment29.ts, 63, 3), Decl(typeFromPropertyAssignment29.ts, 73, 3) ... and 1 more)
 >ExpandoDecl.prop : Symbol(ExpandoDecl.prop, Decl(typeFromPropertyAssignment29.ts, 2, 1))
->ExpandoDecl : Symbol(ExpandoDecl, Decl(typeFromPropertyAssignment29.ts, 0, 0), Decl(typeFromPropertyAssignment29.ts, 2, 1))
+>ExpandoDecl : Symbol(ExpandoDecl, Decl(typeFromPropertyAssignment29.ts, 0, 0), Decl(typeFromPropertyAssignment29.ts, 2, 1), Decl(typeFromPropertyAssignment29.ts, 3, 20))
 >prop : Symbol(ExpandoDecl.prop, Decl(typeFromPropertyAssignment29.ts, 2, 1))
 >ExpandoDecl.m : Symbol(ExpandoDecl.m, Decl(typeFromPropertyAssignment29.ts, 3, 20))
->ExpandoDecl : Symbol(ExpandoDecl, Decl(typeFromPropertyAssignment29.ts, 0, 0), Decl(typeFromPropertyAssignment29.ts, 2, 1))
+>ExpandoDecl : Symbol(ExpandoDecl, Decl(typeFromPropertyAssignment29.ts, 0, 0), Decl(typeFromPropertyAssignment29.ts, 2, 1), Decl(typeFromPropertyAssignment29.ts, 3, 20))
 >m : Symbol(ExpandoDecl.m, Decl(typeFromPropertyAssignment29.ts, 3, 20))
 >ExpandoDecl(101).length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
->ExpandoDecl : Symbol(ExpandoDecl, Decl(typeFromPropertyAssignment29.ts, 0, 0), Decl(typeFromPropertyAssignment29.ts, 2, 1))
+>ExpandoDecl : Symbol(ExpandoDecl, Decl(typeFromPropertyAssignment29.ts, 0, 0), Decl(typeFromPropertyAssignment29.ts, 2, 1), Decl(typeFromPropertyAssignment29.ts, 3, 20))
 >length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
 
 const ExpandoExpr = function (n: number) {
->ExpandoExpr : Symbol(ExpandoExpr, Decl(typeFromPropertyAssignment29.ts, 9, 5), Decl(typeFromPropertyAssignment29.ts, 11, 1))
+>ExpandoExpr : Symbol(ExpandoExpr, Decl(typeFromPropertyAssignment29.ts, 9, 5), Decl(typeFromPropertyAssignment29.ts, 11, 1), Decl(typeFromPropertyAssignment29.ts, 12, 27), Decl(typeFromPropertyAssignment29.ts, 13, 28))
 >n : Symbol(n, Decl(typeFromPropertyAssignment29.ts, 9, 30))
 
     return n.toString();
@@ -45,19 +45,19 @@ const ExpandoExpr = function (n: number) {
 }
 ExpandoExpr.prop = { x: 2 }
 >ExpandoExpr.prop : Symbol(ExpandoExpr.prop, Decl(typeFromPropertyAssignment29.ts, 11, 1), Decl(typeFromPropertyAssignment29.ts, 12, 27))
->ExpandoExpr : Symbol(ExpandoExpr, Decl(typeFromPropertyAssignment29.ts, 9, 5), Decl(typeFromPropertyAssignment29.ts, 11, 1))
+>ExpandoExpr : Symbol(ExpandoExpr, Decl(typeFromPropertyAssignment29.ts, 9, 5), Decl(typeFromPropertyAssignment29.ts, 11, 1), Decl(typeFromPropertyAssignment29.ts, 12, 27), Decl(typeFromPropertyAssignment29.ts, 13, 28))
 >prop : Symbol(ExpandoExpr.prop, Decl(typeFromPropertyAssignment29.ts, 11, 1), Decl(typeFromPropertyAssignment29.ts, 12, 27))
 >x : Symbol(x, Decl(typeFromPropertyAssignment29.ts, 12, 20))
 
 ExpandoExpr.prop = { y: "" }
 >ExpandoExpr.prop : Symbol(ExpandoExpr.prop, Decl(typeFromPropertyAssignment29.ts, 11, 1), Decl(typeFromPropertyAssignment29.ts, 12, 27))
->ExpandoExpr : Symbol(ExpandoExpr, Decl(typeFromPropertyAssignment29.ts, 9, 5), Decl(typeFromPropertyAssignment29.ts, 11, 1))
+>ExpandoExpr : Symbol(ExpandoExpr, Decl(typeFromPropertyAssignment29.ts, 9, 5), Decl(typeFromPropertyAssignment29.ts, 11, 1), Decl(typeFromPropertyAssignment29.ts, 12, 27), Decl(typeFromPropertyAssignment29.ts, 13, 28))
 >prop : Symbol(ExpandoExpr.prop, Decl(typeFromPropertyAssignment29.ts, 11, 1), Decl(typeFromPropertyAssignment29.ts, 12, 27))
 >y : Symbol(y, Decl(typeFromPropertyAssignment29.ts, 13, 20))
 
 ExpandoExpr.m = function(n: number) {
 >ExpandoExpr.m : Symbol(ExpandoExpr.m, Decl(typeFromPropertyAssignment29.ts, 13, 28))
->ExpandoExpr : Symbol(ExpandoExpr, Decl(typeFromPropertyAssignment29.ts, 9, 5), Decl(typeFromPropertyAssignment29.ts, 11, 1))
+>ExpandoExpr : Symbol(ExpandoExpr, Decl(typeFromPropertyAssignment29.ts, 9, 5), Decl(typeFromPropertyAssignment29.ts, 11, 1), Decl(typeFromPropertyAssignment29.ts, 12, 27), Decl(typeFromPropertyAssignment29.ts, 13, 28))
 >m : Symbol(ExpandoExpr.m, Decl(typeFromPropertyAssignment29.ts, 13, 28))
 >n : Symbol(n, Decl(typeFromPropertyAssignment29.ts, 14, 25))
 
@@ -68,18 +68,18 @@ var n = (ExpandoExpr.prop.x || 0) + ExpandoExpr.m(12) + ExpandoExpr(101).length
 >n : Symbol(n, Decl(typeFromPropertyAssignment29.ts, 7, 3), Decl(typeFromPropertyAssignment29.ts, 17, 3), Decl(typeFromPropertyAssignment29.ts, 45, 3), Decl(typeFromPropertyAssignment29.ts, 63, 3), Decl(typeFromPropertyAssignment29.ts, 73, 3) ... and 1 more)
 >ExpandoExpr.prop.x : Symbol(x, Decl(typeFromPropertyAssignment29.ts, 12, 20))
 >ExpandoExpr.prop : Symbol(ExpandoExpr.prop, Decl(typeFromPropertyAssignment29.ts, 11, 1), Decl(typeFromPropertyAssignment29.ts, 12, 27))
->ExpandoExpr : Symbol(ExpandoExpr, Decl(typeFromPropertyAssignment29.ts, 9, 5), Decl(typeFromPropertyAssignment29.ts, 11, 1))
+>ExpandoExpr : Symbol(ExpandoExpr, Decl(typeFromPropertyAssignment29.ts, 9, 5), Decl(typeFromPropertyAssignment29.ts, 11, 1), Decl(typeFromPropertyAssignment29.ts, 12, 27), Decl(typeFromPropertyAssignment29.ts, 13, 28))
 >prop : Symbol(ExpandoExpr.prop, Decl(typeFromPropertyAssignment29.ts, 11, 1), Decl(typeFromPropertyAssignment29.ts, 12, 27))
 >x : Symbol(x, Decl(typeFromPropertyAssignment29.ts, 12, 20))
 >ExpandoExpr.m : Symbol(ExpandoExpr.m, Decl(typeFromPropertyAssignment29.ts, 13, 28))
->ExpandoExpr : Symbol(ExpandoExpr, Decl(typeFromPropertyAssignment29.ts, 9, 5), Decl(typeFromPropertyAssignment29.ts, 11, 1))
+>ExpandoExpr : Symbol(ExpandoExpr, Decl(typeFromPropertyAssignment29.ts, 9, 5), Decl(typeFromPropertyAssignment29.ts, 11, 1), Decl(typeFromPropertyAssignment29.ts, 12, 27), Decl(typeFromPropertyAssignment29.ts, 13, 28))
 >m : Symbol(ExpandoExpr.m, Decl(typeFromPropertyAssignment29.ts, 13, 28))
 >ExpandoExpr(101).length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
->ExpandoExpr : Symbol(ExpandoExpr, Decl(typeFromPropertyAssignment29.ts, 9, 5), Decl(typeFromPropertyAssignment29.ts, 11, 1))
+>ExpandoExpr : Symbol(ExpandoExpr, Decl(typeFromPropertyAssignment29.ts, 9, 5), Decl(typeFromPropertyAssignment29.ts, 11, 1), Decl(typeFromPropertyAssignment29.ts, 12, 27), Decl(typeFromPropertyAssignment29.ts, 13, 28))
 >length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
 
 const ExpandoArrow = (n: number) => n.toString();
->ExpandoArrow : Symbol(ExpandoArrow, Decl(typeFromPropertyAssignment29.ts, 19, 5), Decl(typeFromPropertyAssignment29.ts, 19, 49))
+>ExpandoArrow : Symbol(ExpandoArrow, Decl(typeFromPropertyAssignment29.ts, 19, 5), Decl(typeFromPropertyAssignment29.ts, 19, 49), Decl(typeFromPropertyAssignment29.ts, 20, 21))
 >n : Symbol(n, Decl(typeFromPropertyAssignment29.ts, 19, 22))
 >n.toString : Symbol(Number.toString, Decl(lib.es5.d.ts, --, --))
 >n : Symbol(n, Decl(typeFromPropertyAssignment29.ts, 19, 22))
@@ -87,12 +87,12 @@ const ExpandoArrow = (n: number) => n.toString();
 
 ExpandoArrow.prop = 2
 >ExpandoArrow.prop : Symbol(ExpandoArrow.prop, Decl(typeFromPropertyAssignment29.ts, 19, 49))
->ExpandoArrow : Symbol(ExpandoArrow, Decl(typeFromPropertyAssignment29.ts, 19, 5), Decl(typeFromPropertyAssignment29.ts, 19, 49))
+>ExpandoArrow : Symbol(ExpandoArrow, Decl(typeFromPropertyAssignment29.ts, 19, 5), Decl(typeFromPropertyAssignment29.ts, 19, 49), Decl(typeFromPropertyAssignment29.ts, 20, 21))
 >prop : Symbol(ExpandoArrow.prop, Decl(typeFromPropertyAssignment29.ts, 19, 49))
 
 ExpandoArrow.m = function(n: number) {
 >ExpandoArrow.m : Symbol(ExpandoArrow.m, Decl(typeFromPropertyAssignment29.ts, 20, 21))
->ExpandoArrow : Symbol(ExpandoArrow, Decl(typeFromPropertyAssignment29.ts, 19, 5), Decl(typeFromPropertyAssignment29.ts, 19, 49))
+>ExpandoArrow : Symbol(ExpandoArrow, Decl(typeFromPropertyAssignment29.ts, 19, 5), Decl(typeFromPropertyAssignment29.ts, 19, 49), Decl(typeFromPropertyAssignment29.ts, 20, 21))
 >m : Symbol(ExpandoArrow.m, Decl(typeFromPropertyAssignment29.ts, 20, 21))
 >n : Symbol(n, Decl(typeFromPropertyAssignment29.ts, 21, 26))
 
@@ -186,7 +186,7 @@ namespace Ns {
 
 // Should not work in Typescript -- must be const
 var ExpandoExpr2 = function (n: number) {
->ExpandoExpr2 : Symbol(ExpandoExpr2, Decl(typeFromPropertyAssignment29.ts, 56, 3), Decl(typeFromPropertyAssignment29.ts, 58, 1))
+>ExpandoExpr2 : Symbol(ExpandoExpr2, Decl(typeFromPropertyAssignment29.ts, 56, 3), Decl(typeFromPropertyAssignment29.ts, 58, 1), Decl(typeFromPropertyAssignment29.ts, 59, 21))
 >n : Symbol(n, Decl(typeFromPropertyAssignment29.ts, 56, 29))
 
     return n.toString();
@@ -195,10 +195,10 @@ var ExpandoExpr2 = function (n: number) {
 >toString : Symbol(Number.toString, Decl(lib.es5.d.ts, --, --))
 }
 ExpandoExpr2.prop = 2
->ExpandoExpr2 : Symbol(ExpandoExpr2, Decl(typeFromPropertyAssignment29.ts, 56, 3), Decl(typeFromPropertyAssignment29.ts, 58, 1))
+>ExpandoExpr2 : Symbol(ExpandoExpr2, Decl(typeFromPropertyAssignment29.ts, 56, 3), Decl(typeFromPropertyAssignment29.ts, 58, 1), Decl(typeFromPropertyAssignment29.ts, 59, 21))
 
 ExpandoExpr2.m = function(n: number) {
->ExpandoExpr2 : Symbol(ExpandoExpr2, Decl(typeFromPropertyAssignment29.ts, 56, 3), Decl(typeFromPropertyAssignment29.ts, 58, 1))
+>ExpandoExpr2 : Symbol(ExpandoExpr2, Decl(typeFromPropertyAssignment29.ts, 56, 3), Decl(typeFromPropertyAssignment29.ts, 58, 1), Decl(typeFromPropertyAssignment29.ts, 59, 21))
 >n : Symbol(n, Decl(typeFromPropertyAssignment29.ts, 60, 26))
 
     return n + 1;
@@ -206,10 +206,10 @@ ExpandoExpr2.m = function(n: number) {
 }
 var n = ExpandoExpr2.prop + ExpandoExpr2.m(12) + ExpandoExpr2(101).length
 >n : Symbol(n, Decl(typeFromPropertyAssignment29.ts, 7, 3), Decl(typeFromPropertyAssignment29.ts, 17, 3), Decl(typeFromPropertyAssignment29.ts, 45, 3), Decl(typeFromPropertyAssignment29.ts, 63, 3), Decl(typeFromPropertyAssignment29.ts, 73, 3) ... and 1 more)
->ExpandoExpr2 : Symbol(ExpandoExpr2, Decl(typeFromPropertyAssignment29.ts, 56, 3), Decl(typeFromPropertyAssignment29.ts, 58, 1))
->ExpandoExpr2 : Symbol(ExpandoExpr2, Decl(typeFromPropertyAssignment29.ts, 56, 3), Decl(typeFromPropertyAssignment29.ts, 58, 1))
+>ExpandoExpr2 : Symbol(ExpandoExpr2, Decl(typeFromPropertyAssignment29.ts, 56, 3), Decl(typeFromPropertyAssignment29.ts, 58, 1), Decl(typeFromPropertyAssignment29.ts, 59, 21))
+>ExpandoExpr2 : Symbol(ExpandoExpr2, Decl(typeFromPropertyAssignment29.ts, 56, 3), Decl(typeFromPropertyAssignment29.ts, 58, 1), Decl(typeFromPropertyAssignment29.ts, 59, 21))
 >ExpandoExpr2(101).length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
->ExpandoExpr2 : Symbol(ExpandoExpr2, Decl(typeFromPropertyAssignment29.ts, 56, 3), Decl(typeFromPropertyAssignment29.ts, 58, 1))
+>ExpandoExpr2 : Symbol(ExpandoExpr2, Decl(typeFromPropertyAssignment29.ts, 56, 3), Decl(typeFromPropertyAssignment29.ts, 58, 1), Decl(typeFromPropertyAssignment29.ts, 59, 21))
 >length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
 
 // Should not work in typescript -- classes already have statics
diff --git a/tests/baselines/reference/typeFromPropertyAssignment31.symbols b/tests/baselines/reference/typeFromPropertyAssignment31.symbols
index 5a20510a739..48a2460cc8b 100644
--- a/tests/baselines/reference/typeFromPropertyAssignment31.symbols
+++ b/tests/baselines/reference/typeFromPropertyAssignment31.symbols
@@ -1,6 +1,6 @@
 === tests/cases/conformance/salsa/typeFromPropertyAssignment31.ts ===
 function ExpandoMerge(n: number) {
->ExpandoMerge : Symbol(ExpandoMerge, Decl(typeFromPropertyAssignment31.ts, 0, 0), Decl(typeFromPropertyAssignment31.ts, 2, 1), Decl(typeFromPropertyAssignment31.ts, 6, 1), Decl(typeFromPropertyAssignment31.ts, 12, 24))
+>ExpandoMerge : Symbol(ExpandoMerge, Decl(typeFromPropertyAssignment31.ts, 0, 0), Decl(typeFromPropertyAssignment31.ts, 2, 1), Decl(typeFromPropertyAssignment31.ts, 3, 21), Decl(typeFromPropertyAssignment31.ts, 6, 1), Decl(typeFromPropertyAssignment31.ts, 9, 1) ... and 6 more)
 >n : Symbol(n, Decl(typeFromPropertyAssignment31.ts, 0, 22))
 
     return n;
@@ -8,12 +8,12 @@ function ExpandoMerge(n: number) {
 }
 ExpandoMerge.p1 = 111
 >ExpandoMerge.p1 : Symbol(ExpandoMerge.p1, Decl(typeFromPropertyAssignment31.ts, 2, 1))
->ExpandoMerge : Symbol(ExpandoMerge, Decl(typeFromPropertyAssignment31.ts, 0, 0), Decl(typeFromPropertyAssignment31.ts, 2, 1), Decl(typeFromPropertyAssignment31.ts, 6, 1), Decl(typeFromPropertyAssignment31.ts, 12, 24))
+>ExpandoMerge : Symbol(ExpandoMerge, Decl(typeFromPropertyAssignment31.ts, 0, 0), Decl(typeFromPropertyAssignment31.ts, 2, 1), Decl(typeFromPropertyAssignment31.ts, 3, 21), Decl(typeFromPropertyAssignment31.ts, 6, 1), Decl(typeFromPropertyAssignment31.ts, 9, 1) ... and 6 more)
 >p1 : Symbol(ExpandoMerge.p1, Decl(typeFromPropertyAssignment31.ts, 2, 1))
 
 ExpandoMerge.m = function(n: number) {
 >ExpandoMerge.m : Symbol(ExpandoMerge.m, Decl(typeFromPropertyAssignment31.ts, 3, 21))
->ExpandoMerge : Symbol(ExpandoMerge, Decl(typeFromPropertyAssignment31.ts, 0, 0), Decl(typeFromPropertyAssignment31.ts, 2, 1), Decl(typeFromPropertyAssignment31.ts, 6, 1), Decl(typeFromPropertyAssignment31.ts, 12, 24))
+>ExpandoMerge : Symbol(ExpandoMerge, Decl(typeFromPropertyAssignment31.ts, 0, 0), Decl(typeFromPropertyAssignment31.ts, 2, 1), Decl(typeFromPropertyAssignment31.ts, 3, 21), Decl(typeFromPropertyAssignment31.ts, 6, 1), Decl(typeFromPropertyAssignment31.ts, 9, 1) ... and 6 more)
 >m : Symbol(ExpandoMerge.m, Decl(typeFromPropertyAssignment31.ts, 3, 21))
 >n : Symbol(n, Decl(typeFromPropertyAssignment31.ts, 4, 26))
 
@@ -21,28 +21,28 @@ ExpandoMerge.m = function(n: number) {
 >n : Symbol(n, Decl(typeFromPropertyAssignment31.ts, 4, 26))
 }
 namespace ExpandoMerge {
->ExpandoMerge : Symbol(ExpandoMerge, Decl(typeFromPropertyAssignment31.ts, 0, 0), Decl(typeFromPropertyAssignment31.ts, 2, 1), Decl(typeFromPropertyAssignment31.ts, 6, 1), Decl(typeFromPropertyAssignment31.ts, 12, 24))
+>ExpandoMerge : Symbol(ExpandoMerge, Decl(typeFromPropertyAssignment31.ts, 0, 0), Decl(typeFromPropertyAssignment31.ts, 2, 1), Decl(typeFromPropertyAssignment31.ts, 3, 21), Decl(typeFromPropertyAssignment31.ts, 6, 1), Decl(typeFromPropertyAssignment31.ts, 9, 1) ... and 6 more)
 
     export var p2 = 222;
 >p2 : Symbol(p2, Decl(typeFromPropertyAssignment31.ts, 8, 14))
 }
 ExpandoMerge.p4 = 44444; // ok
 >ExpandoMerge.p4 : Symbol(ExpandoMerge.p4, Decl(typeFromPropertyAssignment31.ts, 9, 1), Decl(typeFromPropertyAssignment31.ts, 15, 14))
->ExpandoMerge : Symbol(ExpandoMerge, Decl(typeFromPropertyAssignment31.ts, 0, 0), Decl(typeFromPropertyAssignment31.ts, 2, 1), Decl(typeFromPropertyAssignment31.ts, 6, 1), Decl(typeFromPropertyAssignment31.ts, 12, 24))
+>ExpandoMerge : Symbol(ExpandoMerge, Decl(typeFromPropertyAssignment31.ts, 0, 0), Decl(typeFromPropertyAssignment31.ts, 2, 1), Decl(typeFromPropertyAssignment31.ts, 3, 21), Decl(typeFromPropertyAssignment31.ts, 6, 1), Decl(typeFromPropertyAssignment31.ts, 9, 1) ... and 6 more)
 >p4 : Symbol(ExpandoMerge.p4, Decl(typeFromPropertyAssignment31.ts, 9, 1), Decl(typeFromPropertyAssignment31.ts, 15, 14))
 
 ExpandoMerge.p6 = 66666; // ok
 >ExpandoMerge.p6 : Symbol(ExpandoMerge.p6, Decl(typeFromPropertyAssignment31.ts, 10, 24), Decl(typeFromPropertyAssignment31.ts, 17, 14))
->ExpandoMerge : Symbol(ExpandoMerge, Decl(typeFromPropertyAssignment31.ts, 0, 0), Decl(typeFromPropertyAssignment31.ts, 2, 1), Decl(typeFromPropertyAssignment31.ts, 6, 1), Decl(typeFromPropertyAssignment31.ts, 12, 24))
+>ExpandoMerge : Symbol(ExpandoMerge, Decl(typeFromPropertyAssignment31.ts, 0, 0), Decl(typeFromPropertyAssignment31.ts, 2, 1), Decl(typeFromPropertyAssignment31.ts, 3, 21), Decl(typeFromPropertyAssignment31.ts, 6, 1), Decl(typeFromPropertyAssignment31.ts, 9, 1) ... and 6 more)
 >p6 : Symbol(ExpandoMerge.p6, Decl(typeFromPropertyAssignment31.ts, 10, 24), Decl(typeFromPropertyAssignment31.ts, 17, 14))
 
 ExpandoMerge.p8 = false; // type error
 >ExpandoMerge.p8 : Symbol(ExpandoMerge.p8, Decl(typeFromPropertyAssignment31.ts, 11, 24), Decl(typeFromPropertyAssignment31.ts, 19, 14))
->ExpandoMerge : Symbol(ExpandoMerge, Decl(typeFromPropertyAssignment31.ts, 0, 0), Decl(typeFromPropertyAssignment31.ts, 2, 1), Decl(typeFromPropertyAssignment31.ts, 6, 1), Decl(typeFromPropertyAssignment31.ts, 12, 24))
+>ExpandoMerge : Symbol(ExpandoMerge, Decl(typeFromPropertyAssignment31.ts, 0, 0), Decl(typeFromPropertyAssignment31.ts, 2, 1), Decl(typeFromPropertyAssignment31.ts, 3, 21), Decl(typeFromPropertyAssignment31.ts, 6, 1), Decl(typeFromPropertyAssignment31.ts, 9, 1) ... and 6 more)
 >p8 : Symbol(ExpandoMerge.p8, Decl(typeFromPropertyAssignment31.ts, 11, 24), Decl(typeFromPropertyAssignment31.ts, 19, 14))
 
 namespace ExpandoMerge {
->ExpandoMerge : Symbol(ExpandoMerge, Decl(typeFromPropertyAssignment31.ts, 0, 0), Decl(typeFromPropertyAssignment31.ts, 2, 1), Decl(typeFromPropertyAssignment31.ts, 6, 1), Decl(typeFromPropertyAssignment31.ts, 12, 24))
+>ExpandoMerge : Symbol(ExpandoMerge, Decl(typeFromPropertyAssignment31.ts, 0, 0), Decl(typeFromPropertyAssignment31.ts, 2, 1), Decl(typeFromPropertyAssignment31.ts, 3, 21), Decl(typeFromPropertyAssignment31.ts, 6, 1), Decl(typeFromPropertyAssignment31.ts, 9, 1) ... and 6 more)
 
     export var p3 = 333;
 >p3 : Symbol(p3, Decl(typeFromPropertyAssignment31.ts, 14, 14))
@@ -67,50 +67,50 @@ namespace ExpandoMerge {
 }
 ExpandoMerge.p5 = 555555; // ok
 >ExpandoMerge.p5 : Symbol(ExpandoMerge.p5, Decl(typeFromPropertyAssignment31.ts, 16, 14), Decl(typeFromPropertyAssignment31.ts, 21, 1))
->ExpandoMerge : Symbol(ExpandoMerge, Decl(typeFromPropertyAssignment31.ts, 0, 0), Decl(typeFromPropertyAssignment31.ts, 2, 1), Decl(typeFromPropertyAssignment31.ts, 6, 1), Decl(typeFromPropertyAssignment31.ts, 12, 24))
+>ExpandoMerge : Symbol(ExpandoMerge, Decl(typeFromPropertyAssignment31.ts, 0, 0), Decl(typeFromPropertyAssignment31.ts, 2, 1), Decl(typeFromPropertyAssignment31.ts, 3, 21), Decl(typeFromPropertyAssignment31.ts, 6, 1), Decl(typeFromPropertyAssignment31.ts, 9, 1) ... and 6 more)
 >p5 : Symbol(ExpandoMerge.p5, Decl(typeFromPropertyAssignment31.ts, 16, 14), Decl(typeFromPropertyAssignment31.ts, 21, 1))
 
 ExpandoMerge.p7 = 777777; // ok
 >ExpandoMerge.p7 : Symbol(ExpandoMerge.p7, Decl(typeFromPropertyAssignment31.ts, 18, 14), Decl(typeFromPropertyAssignment31.ts, 22, 25))
->ExpandoMerge : Symbol(ExpandoMerge, Decl(typeFromPropertyAssignment31.ts, 0, 0), Decl(typeFromPropertyAssignment31.ts, 2, 1), Decl(typeFromPropertyAssignment31.ts, 6, 1), Decl(typeFromPropertyAssignment31.ts, 12, 24))
+>ExpandoMerge : Symbol(ExpandoMerge, Decl(typeFromPropertyAssignment31.ts, 0, 0), Decl(typeFromPropertyAssignment31.ts, 2, 1), Decl(typeFromPropertyAssignment31.ts, 3, 21), Decl(typeFromPropertyAssignment31.ts, 6, 1), Decl(typeFromPropertyAssignment31.ts, 9, 1) ... and 6 more)
 >p7 : Symbol(ExpandoMerge.p7, Decl(typeFromPropertyAssignment31.ts, 18, 14), Decl(typeFromPropertyAssignment31.ts, 22, 25))
 
 ExpandoMerge.p9 = false; // type error
 >ExpandoMerge.p9 : Symbol(ExpandoMerge.p9, Decl(typeFromPropertyAssignment31.ts, 20, 14), Decl(typeFromPropertyAssignment31.ts, 23, 25))
->ExpandoMerge : Symbol(ExpandoMerge, Decl(typeFromPropertyAssignment31.ts, 0, 0), Decl(typeFromPropertyAssignment31.ts, 2, 1), Decl(typeFromPropertyAssignment31.ts, 6, 1), Decl(typeFromPropertyAssignment31.ts, 12, 24))
+>ExpandoMerge : Symbol(ExpandoMerge, Decl(typeFromPropertyAssignment31.ts, 0, 0), Decl(typeFromPropertyAssignment31.ts, 2, 1), Decl(typeFromPropertyAssignment31.ts, 3, 21), Decl(typeFromPropertyAssignment31.ts, 6, 1), Decl(typeFromPropertyAssignment31.ts, 9, 1) ... and 6 more)
 >p9 : Symbol(ExpandoMerge.p9, Decl(typeFromPropertyAssignment31.ts, 20, 14), Decl(typeFromPropertyAssignment31.ts, 23, 25))
 
 var n = ExpandoMerge.p1 + ExpandoMerge.p2 + ExpandoMerge.p3 + ExpandoMerge.p4 + ExpandoMerge.p5 + ExpandoMerge.p6 + ExpandoMerge.p7 + ExpandoMerge.p8 + ExpandoMerge.p9 + ExpandoMerge.m(12) + ExpandoMerge(1001);
 >n : Symbol(n, Decl(typeFromPropertyAssignment31.ts, 25, 3))
 >ExpandoMerge.p1 : Symbol(ExpandoMerge.p1, Decl(typeFromPropertyAssignment31.ts, 2, 1))
->ExpandoMerge : Symbol(ExpandoMerge, Decl(typeFromPropertyAssignment31.ts, 0, 0), Decl(typeFromPropertyAssignment31.ts, 2, 1), Decl(typeFromPropertyAssignment31.ts, 6, 1), Decl(typeFromPropertyAssignment31.ts, 12, 24))
+>ExpandoMerge : Symbol(ExpandoMerge, Decl(typeFromPropertyAssignment31.ts, 0, 0), Decl(typeFromPropertyAssignment31.ts, 2, 1), Decl(typeFromPropertyAssignment31.ts, 3, 21), Decl(typeFromPropertyAssignment31.ts, 6, 1), Decl(typeFromPropertyAssignment31.ts, 9, 1) ... and 6 more)
 >p1 : Symbol(ExpandoMerge.p1, Decl(typeFromPropertyAssignment31.ts, 2, 1))
 >ExpandoMerge.p2 : Symbol(ExpandoMerge.p2, Decl(typeFromPropertyAssignment31.ts, 8, 14))
->ExpandoMerge : Symbol(ExpandoMerge, Decl(typeFromPropertyAssignment31.ts, 0, 0), Decl(typeFromPropertyAssignment31.ts, 2, 1), Decl(typeFromPropertyAssignment31.ts, 6, 1), Decl(typeFromPropertyAssignment31.ts, 12, 24))
+>ExpandoMerge : Symbol(ExpandoMerge, Decl(typeFromPropertyAssignment31.ts, 0, 0), Decl(typeFromPropertyAssignment31.ts, 2, 1), Decl(typeFromPropertyAssignment31.ts, 3, 21), Decl(typeFromPropertyAssignment31.ts, 6, 1), Decl(typeFromPropertyAssignment31.ts, 9, 1) ... and 6 more)
 >p2 : Symbol(ExpandoMerge.p2, Decl(typeFromPropertyAssignment31.ts, 8, 14))
 >ExpandoMerge.p3 : Symbol(ExpandoMerge.p3, Decl(typeFromPropertyAssignment31.ts, 14, 14))
->ExpandoMerge : Symbol(ExpandoMerge, Decl(typeFromPropertyAssignment31.ts, 0, 0), Decl(typeFromPropertyAssignment31.ts, 2, 1), Decl(typeFromPropertyAssignment31.ts, 6, 1), Decl(typeFromPropertyAssignment31.ts, 12, 24))
+>ExpandoMerge : Symbol(ExpandoMerge, Decl(typeFromPropertyAssignment31.ts, 0, 0), Decl(typeFromPropertyAssignment31.ts, 2, 1), Decl(typeFromPropertyAssignment31.ts, 3, 21), Decl(typeFromPropertyAssignment31.ts, 6, 1), Decl(typeFromPropertyAssignment31.ts, 9, 1) ... and 6 more)
 >p3 : Symbol(ExpandoMerge.p3, Decl(typeFromPropertyAssignment31.ts, 14, 14))
 >ExpandoMerge.p4 : Symbol(ExpandoMerge.p4, Decl(typeFromPropertyAssignment31.ts, 9, 1), Decl(typeFromPropertyAssignment31.ts, 15, 14))
->ExpandoMerge : Symbol(ExpandoMerge, Decl(typeFromPropertyAssignment31.ts, 0, 0), Decl(typeFromPropertyAssignment31.ts, 2, 1), Decl(typeFromPropertyAssignment31.ts, 6, 1), Decl(typeFromPropertyAssignment31.ts, 12, 24))
+>ExpandoMerge : Symbol(ExpandoMerge, Decl(typeFromPropertyAssignment31.ts, 0, 0), Decl(typeFromPropertyAssignment31.ts, 2, 1), Decl(typeFromPropertyAssignment31.ts, 3, 21), Decl(typeFromPropertyAssignment31.ts, 6, 1), Decl(typeFromPropertyAssignment31.ts, 9, 1) ... and 6 more)
 >p4 : Symbol(ExpandoMerge.p4, Decl(typeFromPropertyAssignment31.ts, 9, 1), Decl(typeFromPropertyAssignment31.ts, 15, 14))
 >ExpandoMerge.p5 : Symbol(ExpandoMerge.p5, Decl(typeFromPropertyAssignment31.ts, 16, 14), Decl(typeFromPropertyAssignment31.ts, 21, 1))
->ExpandoMerge : Symbol(ExpandoMerge, Decl(typeFromPropertyAssignment31.ts, 0, 0), Decl(typeFromPropertyAssignment31.ts, 2, 1), Decl(typeFromPropertyAssignment31.ts, 6, 1), Decl(typeFromPropertyAssignment31.ts, 12, 24))
+>ExpandoMerge : Symbol(ExpandoMerge, Decl(typeFromPropertyAssignment31.ts, 0, 0), Decl(typeFromPropertyAssignment31.ts, 2, 1), Decl(typeFromPropertyAssignment31.ts, 3, 21), Decl(typeFromPropertyAssignment31.ts, 6, 1), Decl(typeFromPropertyAssignment31.ts, 9, 1) ... and 6 more)
 >p5 : Symbol(ExpandoMerge.p5, Decl(typeFromPropertyAssignment31.ts, 16, 14), Decl(typeFromPropertyAssignment31.ts, 21, 1))
 >ExpandoMerge.p6 : Symbol(ExpandoMerge.p6, Decl(typeFromPropertyAssignment31.ts, 10, 24), Decl(typeFromPropertyAssignment31.ts, 17, 14))
->ExpandoMerge : Symbol(ExpandoMerge, Decl(typeFromPropertyAssignment31.ts, 0, 0), Decl(typeFromPropertyAssignment31.ts, 2, 1), Decl(typeFromPropertyAssignment31.ts, 6, 1), Decl(typeFromPropertyAssignment31.ts, 12, 24))
+>ExpandoMerge : Symbol(ExpandoMerge, Decl(typeFromPropertyAssignment31.ts, 0, 0), Decl(typeFromPropertyAssignment31.ts, 2, 1), Decl(typeFromPropertyAssignment31.ts, 3, 21), Decl(typeFromPropertyAssignment31.ts, 6, 1), Decl(typeFromPropertyAssignment31.ts, 9, 1) ... and 6 more)
 >p6 : Symbol(ExpandoMerge.p6, Decl(typeFromPropertyAssignment31.ts, 10, 24), Decl(typeFromPropertyAssignment31.ts, 17, 14))
 >ExpandoMerge.p7 : Symbol(ExpandoMerge.p7, Decl(typeFromPropertyAssignment31.ts, 18, 14), Decl(typeFromPropertyAssignment31.ts, 22, 25))
->ExpandoMerge : Symbol(ExpandoMerge, Decl(typeFromPropertyAssignment31.ts, 0, 0), Decl(typeFromPropertyAssignment31.ts, 2, 1), Decl(typeFromPropertyAssignment31.ts, 6, 1), Decl(typeFromPropertyAssignment31.ts, 12, 24))
+>ExpandoMerge : Symbol(ExpandoMerge, Decl(typeFromPropertyAssignment31.ts, 0, 0), Decl(typeFromPropertyAssignment31.ts, 2, 1), Decl(typeFromPropertyAssignment31.ts, 3, 21), Decl(typeFromPropertyAssignment31.ts, 6, 1), Decl(typeFromPropertyAssignment31.ts, 9, 1) ... and 6 more)
 >p7 : Symbol(ExpandoMerge.p7, Decl(typeFromPropertyAssignment31.ts, 18, 14), Decl(typeFromPropertyAssignment31.ts, 22, 25))
 >ExpandoMerge.p8 : Symbol(ExpandoMerge.p8, Decl(typeFromPropertyAssignment31.ts, 11, 24), Decl(typeFromPropertyAssignment31.ts, 19, 14))
->ExpandoMerge : Symbol(ExpandoMerge, Decl(typeFromPropertyAssignment31.ts, 0, 0), Decl(typeFromPropertyAssignment31.ts, 2, 1), Decl(typeFromPropertyAssignment31.ts, 6, 1), Decl(typeFromPropertyAssignment31.ts, 12, 24))
+>ExpandoMerge : Symbol(ExpandoMerge, Decl(typeFromPropertyAssignment31.ts, 0, 0), Decl(typeFromPropertyAssignment31.ts, 2, 1), Decl(typeFromPropertyAssignment31.ts, 3, 21), Decl(typeFromPropertyAssignment31.ts, 6, 1), Decl(typeFromPropertyAssignment31.ts, 9, 1) ... and 6 more)
 >p8 : Symbol(ExpandoMerge.p8, Decl(typeFromPropertyAssignment31.ts, 11, 24), Decl(typeFromPropertyAssignment31.ts, 19, 14))
 >ExpandoMerge.p9 : Symbol(ExpandoMerge.p9, Decl(typeFromPropertyAssignment31.ts, 20, 14), Decl(typeFromPropertyAssignment31.ts, 23, 25))
->ExpandoMerge : Symbol(ExpandoMerge, Decl(typeFromPropertyAssignment31.ts, 0, 0), Decl(typeFromPropertyAssignment31.ts, 2, 1), Decl(typeFromPropertyAssignment31.ts, 6, 1), Decl(typeFromPropertyAssignment31.ts, 12, 24))
+>ExpandoMerge : Symbol(ExpandoMerge, Decl(typeFromPropertyAssignment31.ts, 0, 0), Decl(typeFromPropertyAssignment31.ts, 2, 1), Decl(typeFromPropertyAssignment31.ts, 3, 21), Decl(typeFromPropertyAssignment31.ts, 6, 1), Decl(typeFromPropertyAssignment31.ts, 9, 1) ... and 6 more)
 >p9 : Symbol(ExpandoMerge.p9, Decl(typeFromPropertyAssignment31.ts, 20, 14), Decl(typeFromPropertyAssignment31.ts, 23, 25))
 >ExpandoMerge.m : Symbol(ExpandoMerge.m, Decl(typeFromPropertyAssignment31.ts, 3, 21))
->ExpandoMerge : Symbol(ExpandoMerge, Decl(typeFromPropertyAssignment31.ts, 0, 0), Decl(typeFromPropertyAssignment31.ts, 2, 1), Decl(typeFromPropertyAssignment31.ts, 6, 1), Decl(typeFromPropertyAssignment31.ts, 12, 24))
+>ExpandoMerge : Symbol(ExpandoMerge, Decl(typeFromPropertyAssignment31.ts, 0, 0), Decl(typeFromPropertyAssignment31.ts, 2, 1), Decl(typeFromPropertyAssignment31.ts, 3, 21), Decl(typeFromPropertyAssignment31.ts, 6, 1), Decl(typeFromPropertyAssignment31.ts, 9, 1) ... and 6 more)
 >m : Symbol(ExpandoMerge.m, Decl(typeFromPropertyAssignment31.ts, 3, 21))
->ExpandoMerge : Symbol(ExpandoMerge, Decl(typeFromPropertyAssignment31.ts, 0, 0), Decl(typeFromPropertyAssignment31.ts, 2, 1), Decl(typeFromPropertyAssignment31.ts, 6, 1), Decl(typeFromPropertyAssignment31.ts, 12, 24))
+>ExpandoMerge : Symbol(ExpandoMerge, Decl(typeFromPropertyAssignment31.ts, 0, 0), Decl(typeFromPropertyAssignment31.ts, 2, 1), Decl(typeFromPropertyAssignment31.ts, 3, 21), Decl(typeFromPropertyAssignment31.ts, 6, 1), Decl(typeFromPropertyAssignment31.ts, 9, 1) ... and 6 more)
 
diff --git a/tests/baselines/reference/typeFromPropertyAssignment32.symbols b/tests/baselines/reference/typeFromPropertyAssignment32.symbols
index 0daec198f71..17e9367880e 100644
--- a/tests/baselines/reference/typeFromPropertyAssignment32.symbols
+++ b/tests/baselines/reference/typeFromPropertyAssignment32.symbols
@@ -1,6 +1,6 @@
 === tests/cases/conformance/salsa/expando.ts ===
 function ExpandoMerge(n: number) {
->ExpandoMerge : Symbol(ExpandoMerge, Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1), Decl(ns.ts, 0, 0), Decl(ns.ts, 8, 1))
+>ExpandoMerge : Symbol(ExpandoMerge, Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1), Decl(expando.ts, 3, 21), Decl(expando.ts, 6, 1), Decl(expando.ts, 7, 24) ... and 6 more)
 >n : Symbol(n, Decl(expando.ts, 0, 22))
 
     return n;
@@ -8,12 +8,12 @@ function ExpandoMerge(n: number) {
 }
 ExpandoMerge.p1 = 111
 >ExpandoMerge.p1 : Symbol(ExpandoMerge.p1, Decl(expando.ts, 2, 1))
->ExpandoMerge : Symbol(ExpandoMerge, Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1), Decl(ns.ts, 0, 0), Decl(ns.ts, 8, 1))
+>ExpandoMerge : Symbol(ExpandoMerge, Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1), Decl(expando.ts, 3, 21), Decl(expando.ts, 6, 1), Decl(expando.ts, 7, 24) ... and 6 more)
 >p1 : Symbol(ExpandoMerge.p1, Decl(expando.ts, 2, 1))
 
 ExpandoMerge.m = function(n: number) {
 >ExpandoMerge.m : Symbol(ExpandoMerge.m, Decl(expando.ts, 3, 21))
->ExpandoMerge : Symbol(ExpandoMerge, Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1), Decl(ns.ts, 0, 0), Decl(ns.ts, 8, 1))
+>ExpandoMerge : Symbol(ExpandoMerge, Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1), Decl(expando.ts, 3, 21), Decl(expando.ts, 6, 1), Decl(expando.ts, 7, 24) ... and 6 more)
 >m : Symbol(ExpandoMerge.m, Decl(expando.ts, 3, 21))
 >n : Symbol(n, Decl(expando.ts, 4, 26))
 
@@ -22,71 +22,71 @@ ExpandoMerge.m = function(n: number) {
 }
 ExpandoMerge.p4 = 44444;
 >ExpandoMerge.p4 : Symbol(ExpandoMerge.p4, Decl(expando.ts, 6, 1), Decl(ns.ts, 2, 14))
->ExpandoMerge : Symbol(ExpandoMerge, Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1), Decl(ns.ts, 0, 0), Decl(ns.ts, 8, 1))
+>ExpandoMerge : Symbol(ExpandoMerge, Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1), Decl(expando.ts, 3, 21), Decl(expando.ts, 6, 1), Decl(expando.ts, 7, 24) ... and 6 more)
 >p4 : Symbol(ExpandoMerge.p4, Decl(expando.ts, 6, 1), Decl(ns.ts, 2, 14))
 
 ExpandoMerge.p5 = 555555;
 >ExpandoMerge.p5 : Symbol(ExpandoMerge.p5, Decl(expando.ts, 7, 24), Decl(ns.ts, 3, 14))
->ExpandoMerge : Symbol(ExpandoMerge, Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1), Decl(ns.ts, 0, 0), Decl(ns.ts, 8, 1))
+>ExpandoMerge : Symbol(ExpandoMerge, Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1), Decl(expando.ts, 3, 21), Decl(expando.ts, 6, 1), Decl(expando.ts, 7, 24) ... and 6 more)
 >p5 : Symbol(ExpandoMerge.p5, Decl(expando.ts, 7, 24), Decl(ns.ts, 3, 14))
 
 ExpandoMerge.p6 = 66666;
 >ExpandoMerge.p6 : Symbol(ExpandoMerge.p6, Decl(expando.ts, 8, 25), Decl(ns.ts, 4, 14))
->ExpandoMerge : Symbol(ExpandoMerge, Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1), Decl(ns.ts, 0, 0), Decl(ns.ts, 8, 1))
+>ExpandoMerge : Symbol(ExpandoMerge, Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1), Decl(expando.ts, 3, 21), Decl(expando.ts, 6, 1), Decl(expando.ts, 7, 24) ... and 6 more)
 >p6 : Symbol(ExpandoMerge.p6, Decl(expando.ts, 8, 25), Decl(ns.ts, 4, 14))
 
 ExpandoMerge.p7 = 777777;
 >ExpandoMerge.p7 : Symbol(ExpandoMerge.p7, Decl(expando.ts, 9, 24), Decl(ns.ts, 5, 14))
->ExpandoMerge : Symbol(ExpandoMerge, Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1), Decl(ns.ts, 0, 0), Decl(ns.ts, 8, 1))
+>ExpandoMerge : Symbol(ExpandoMerge, Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1), Decl(expando.ts, 3, 21), Decl(expando.ts, 6, 1), Decl(expando.ts, 7, 24) ... and 6 more)
 >p7 : Symbol(ExpandoMerge.p7, Decl(expando.ts, 9, 24), Decl(ns.ts, 5, 14))
 
 ExpandoMerge.p8 = false; // type error
 >ExpandoMerge.p8 : Symbol(ExpandoMerge.p8, Decl(expando.ts, 10, 25), Decl(ns.ts, 6, 14))
->ExpandoMerge : Symbol(ExpandoMerge, Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1), Decl(ns.ts, 0, 0), Decl(ns.ts, 8, 1))
+>ExpandoMerge : Symbol(ExpandoMerge, Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1), Decl(expando.ts, 3, 21), Decl(expando.ts, 6, 1), Decl(expando.ts, 7, 24) ... and 6 more)
 >p8 : Symbol(ExpandoMerge.p8, Decl(expando.ts, 10, 25), Decl(ns.ts, 6, 14))
 
 ExpandoMerge.p9 = false; // type error
 >ExpandoMerge.p9 : Symbol(ExpandoMerge.p9, Decl(expando.ts, 11, 24), Decl(ns.ts, 7, 14))
->ExpandoMerge : Symbol(ExpandoMerge, Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1), Decl(ns.ts, 0, 0), Decl(ns.ts, 8, 1))
+>ExpandoMerge : Symbol(ExpandoMerge, Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1), Decl(expando.ts, 3, 21), Decl(expando.ts, 6, 1), Decl(expando.ts, 7, 24) ... and 6 more)
 >p9 : Symbol(ExpandoMerge.p9, Decl(expando.ts, 11, 24), Decl(ns.ts, 7, 14))
 
 var n = ExpandoMerge.p1 + ExpandoMerge.p2 + ExpandoMerge.p3 + ExpandoMerge.p4 + ExpandoMerge.p5 + ExpandoMerge.p6 + ExpandoMerge.p7 + ExpandoMerge.p8 + ExpandoMerge.p9 + ExpandoMerge.m(12) + ExpandoMerge(1001);
 >n : Symbol(n, Decl(expando.ts, 13, 3))
 >ExpandoMerge.p1 : Symbol(ExpandoMerge.p1, Decl(expando.ts, 2, 1))
->ExpandoMerge : Symbol(ExpandoMerge, Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1), Decl(ns.ts, 0, 0), Decl(ns.ts, 8, 1))
+>ExpandoMerge : Symbol(ExpandoMerge, Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1), Decl(expando.ts, 3, 21), Decl(expando.ts, 6, 1), Decl(expando.ts, 7, 24) ... and 6 more)
 >p1 : Symbol(ExpandoMerge.p1, Decl(expando.ts, 2, 1))
 >ExpandoMerge.p2 : Symbol(ExpandoMerge.p2, Decl(ns.ts, 10, 14))
->ExpandoMerge : Symbol(ExpandoMerge, Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1), Decl(ns.ts, 0, 0), Decl(ns.ts, 8, 1))
+>ExpandoMerge : Symbol(ExpandoMerge, Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1), Decl(expando.ts, 3, 21), Decl(expando.ts, 6, 1), Decl(expando.ts, 7, 24) ... and 6 more)
 >p2 : Symbol(ExpandoMerge.p2, Decl(ns.ts, 10, 14))
 >ExpandoMerge.p3 : Symbol(ExpandoMerge.p3, Decl(ns.ts, 1, 14))
->ExpandoMerge : Symbol(ExpandoMerge, Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1), Decl(ns.ts, 0, 0), Decl(ns.ts, 8, 1))
+>ExpandoMerge : Symbol(ExpandoMerge, Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1), Decl(expando.ts, 3, 21), Decl(expando.ts, 6, 1), Decl(expando.ts, 7, 24) ... and 6 more)
 >p3 : Symbol(ExpandoMerge.p3, Decl(ns.ts, 1, 14))
 >ExpandoMerge.p4 : Symbol(ExpandoMerge.p4, Decl(expando.ts, 6, 1), Decl(ns.ts, 2, 14))
->ExpandoMerge : Symbol(ExpandoMerge, Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1), Decl(ns.ts, 0, 0), Decl(ns.ts, 8, 1))
+>ExpandoMerge : Symbol(ExpandoMerge, Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1), Decl(expando.ts, 3, 21), Decl(expando.ts, 6, 1), Decl(expando.ts, 7, 24) ... and 6 more)
 >p4 : Symbol(ExpandoMerge.p4, Decl(expando.ts, 6, 1), Decl(ns.ts, 2, 14))
 >ExpandoMerge.p5 : Symbol(ExpandoMerge.p5, Decl(expando.ts, 7, 24), Decl(ns.ts, 3, 14))
->ExpandoMerge : Symbol(ExpandoMerge, Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1), Decl(ns.ts, 0, 0), Decl(ns.ts, 8, 1))
+>ExpandoMerge : Symbol(ExpandoMerge, Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1), Decl(expando.ts, 3, 21), Decl(expando.ts, 6, 1), Decl(expando.ts, 7, 24) ... and 6 more)
 >p5 : Symbol(ExpandoMerge.p5, Decl(expando.ts, 7, 24), Decl(ns.ts, 3, 14))
 >ExpandoMerge.p6 : Symbol(ExpandoMerge.p6, Decl(expando.ts, 8, 25), Decl(ns.ts, 4, 14))
->ExpandoMerge : Symbol(ExpandoMerge, Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1), Decl(ns.ts, 0, 0), Decl(ns.ts, 8, 1))
+>ExpandoMerge : Symbol(ExpandoMerge, Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1), Decl(expando.ts, 3, 21), Decl(expando.ts, 6, 1), Decl(expando.ts, 7, 24) ... and 6 more)
 >p6 : Symbol(ExpandoMerge.p6, Decl(expando.ts, 8, 25), Decl(ns.ts, 4, 14))
 >ExpandoMerge.p7 : Symbol(ExpandoMerge.p7, Decl(expando.ts, 9, 24), Decl(ns.ts, 5, 14))
->ExpandoMerge : Symbol(ExpandoMerge, Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1), Decl(ns.ts, 0, 0), Decl(ns.ts, 8, 1))
+>ExpandoMerge : Symbol(ExpandoMerge, Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1), Decl(expando.ts, 3, 21), Decl(expando.ts, 6, 1), Decl(expando.ts, 7, 24) ... and 6 more)
 >p7 : Symbol(ExpandoMerge.p7, Decl(expando.ts, 9, 24), Decl(ns.ts, 5, 14))
 >ExpandoMerge.p8 : Symbol(ExpandoMerge.p8, Decl(expando.ts, 10, 25), Decl(ns.ts, 6, 14))
->ExpandoMerge : Symbol(ExpandoMerge, Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1), Decl(ns.ts, 0, 0), Decl(ns.ts, 8, 1))
+>ExpandoMerge : Symbol(ExpandoMerge, Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1), Decl(expando.ts, 3, 21), Decl(expando.ts, 6, 1), Decl(expando.ts, 7, 24) ... and 6 more)
 >p8 : Symbol(ExpandoMerge.p8, Decl(expando.ts, 10, 25), Decl(ns.ts, 6, 14))
 >ExpandoMerge.p9 : Symbol(ExpandoMerge.p9, Decl(expando.ts, 11, 24), Decl(ns.ts, 7, 14))
->ExpandoMerge : Symbol(ExpandoMerge, Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1), Decl(ns.ts, 0, 0), Decl(ns.ts, 8, 1))
+>ExpandoMerge : Symbol(ExpandoMerge, Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1), Decl(expando.ts, 3, 21), Decl(expando.ts, 6, 1), Decl(expando.ts, 7, 24) ... and 6 more)
 >p9 : Symbol(ExpandoMerge.p9, Decl(expando.ts, 11, 24), Decl(ns.ts, 7, 14))
 >ExpandoMerge.m : Symbol(ExpandoMerge.m, Decl(expando.ts, 3, 21))
->ExpandoMerge : Symbol(ExpandoMerge, Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1), Decl(ns.ts, 0, 0), Decl(ns.ts, 8, 1))
+>ExpandoMerge : Symbol(ExpandoMerge, Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1), Decl(expando.ts, 3, 21), Decl(expando.ts, 6, 1), Decl(expando.ts, 7, 24) ... and 6 more)
 >m : Symbol(ExpandoMerge.m, Decl(expando.ts, 3, 21))
->ExpandoMerge : Symbol(ExpandoMerge, Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1), Decl(ns.ts, 0, 0), Decl(ns.ts, 8, 1))
+>ExpandoMerge : Symbol(ExpandoMerge, Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1), Decl(expando.ts, 3, 21), Decl(expando.ts, 6, 1), Decl(expando.ts, 7, 24) ... and 6 more)
 
 === tests/cases/conformance/salsa/ns.ts ===
 namespace ExpandoMerge {
->ExpandoMerge : Symbol(ExpandoMerge, Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1), Decl(ns.ts, 0, 0), Decl(ns.ts, 8, 1))
+>ExpandoMerge : Symbol(ExpandoMerge, Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1), Decl(expando.ts, 3, 21), Decl(expando.ts, 6, 1), Decl(expando.ts, 7, 24) ... and 6 more)
 
     export var p3 = 333;
 >p3 : Symbol(p3, Decl(ns.ts, 1, 14))
@@ -110,7 +110,7 @@ namespace ExpandoMerge {
 >p9 : Symbol(p9, Decl(expando.ts, 11, 24), Decl(ns.ts, 7, 14))
 }
 namespace ExpandoMerge {
->ExpandoMerge : Symbol(ExpandoMerge, Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1), Decl(ns.ts, 0, 0), Decl(ns.ts, 8, 1))
+>ExpandoMerge : Symbol(ExpandoMerge, Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1), Decl(expando.ts, 3, 21), Decl(expando.ts, 6, 1), Decl(expando.ts, 7, 24) ... and 6 more)
 
     export var p2 = 222;
 >p2 : Symbol(p2, Decl(ns.ts, 10, 14))
diff --git a/tests/baselines/reference/typeFromPropertyAssignment33.symbols b/tests/baselines/reference/typeFromPropertyAssignment33.symbols
index 2bdaebbbfdd..23f7277ff54 100644
--- a/tests/baselines/reference/typeFromPropertyAssignment33.symbols
+++ b/tests/baselines/reference/typeFromPropertyAssignment33.symbols
@@ -1,6 +1,6 @@
 === tests/cases/conformance/salsa/ns.ts ===
 namespace ExpandoMerge {
->ExpandoMerge : Symbol(ExpandoMerge, Decl(ns.ts, 0, 0), Decl(ns.ts, 8, 1), Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1))
+>ExpandoMerge : Symbol(ExpandoMerge, Decl(ns.ts, 0, 0), Decl(ns.ts, 8, 1), Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1), Decl(expando.ts, 3, 21) ... and 6 more)
 
     export var p3 = 333;
 >p3 : Symbol(p3, Decl(ns.ts, 1, 14))
@@ -24,7 +24,7 @@ namespace ExpandoMerge {
 >p9 : Symbol(p9, Decl(ns.ts, 7, 14), Decl(expando.ts, 11, 24))
 }
 namespace ExpandoMerge {
->ExpandoMerge : Symbol(ExpandoMerge, Decl(ns.ts, 0, 0), Decl(ns.ts, 8, 1), Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1))
+>ExpandoMerge : Symbol(ExpandoMerge, Decl(ns.ts, 0, 0), Decl(ns.ts, 8, 1), Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1), Decl(expando.ts, 3, 21) ... and 6 more)
 
     export var p2 = 222;
 >p2 : Symbol(p2, Decl(ns.ts, 10, 14))
@@ -33,7 +33,7 @@ namespace ExpandoMerge {
 
 === tests/cases/conformance/salsa/expando.ts ===
 function ExpandoMerge(n: number) {
->ExpandoMerge : Symbol(ExpandoMerge, Decl(ns.ts, 0, 0), Decl(ns.ts, 8, 1), Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1))
+>ExpandoMerge : Symbol(ExpandoMerge, Decl(ns.ts, 0, 0), Decl(ns.ts, 8, 1), Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1), Decl(expando.ts, 3, 21) ... and 6 more)
 >n : Symbol(n, Decl(expando.ts, 0, 22))
 
     return n;
@@ -41,12 +41,12 @@ function ExpandoMerge(n: number) {
 }
 ExpandoMerge.p1 = 111
 >ExpandoMerge.p1 : Symbol(ExpandoMerge.p1, Decl(expando.ts, 2, 1))
->ExpandoMerge : Symbol(ExpandoMerge, Decl(ns.ts, 0, 0), Decl(ns.ts, 8, 1), Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1))
+>ExpandoMerge : Symbol(ExpandoMerge, Decl(ns.ts, 0, 0), Decl(ns.ts, 8, 1), Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1), Decl(expando.ts, 3, 21) ... and 6 more)
 >p1 : Symbol(ExpandoMerge.p1, Decl(expando.ts, 2, 1))
 
 ExpandoMerge.m = function(n: number) {
 >ExpandoMerge.m : Symbol(ExpandoMerge.m, Decl(expando.ts, 3, 21))
->ExpandoMerge : Symbol(ExpandoMerge, Decl(ns.ts, 0, 0), Decl(ns.ts, 8, 1), Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1))
+>ExpandoMerge : Symbol(ExpandoMerge, Decl(ns.ts, 0, 0), Decl(ns.ts, 8, 1), Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1), Decl(expando.ts, 3, 21) ... and 6 more)
 >m : Symbol(ExpandoMerge.m, Decl(expando.ts, 3, 21))
 >n : Symbol(n, Decl(expando.ts, 4, 26))
 
@@ -55,66 +55,66 @@ ExpandoMerge.m = function(n: number) {
 }
 ExpandoMerge.p4 = 44444;
 >ExpandoMerge.p4 : Symbol(ExpandoMerge.p4, Decl(ns.ts, 2, 14), Decl(expando.ts, 6, 1))
->ExpandoMerge : Symbol(ExpandoMerge, Decl(ns.ts, 0, 0), Decl(ns.ts, 8, 1), Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1))
+>ExpandoMerge : Symbol(ExpandoMerge, Decl(ns.ts, 0, 0), Decl(ns.ts, 8, 1), Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1), Decl(expando.ts, 3, 21) ... and 6 more)
 >p4 : Symbol(ExpandoMerge.p4, Decl(ns.ts, 2, 14), Decl(expando.ts, 6, 1))
 
 ExpandoMerge.p5 = 555555;
 >ExpandoMerge.p5 : Symbol(ExpandoMerge.p5, Decl(ns.ts, 3, 14), Decl(expando.ts, 7, 24))
->ExpandoMerge : Symbol(ExpandoMerge, Decl(ns.ts, 0, 0), Decl(ns.ts, 8, 1), Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1))
+>ExpandoMerge : Symbol(ExpandoMerge, Decl(ns.ts, 0, 0), Decl(ns.ts, 8, 1), Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1), Decl(expando.ts, 3, 21) ... and 6 more)
 >p5 : Symbol(ExpandoMerge.p5, Decl(ns.ts, 3, 14), Decl(expando.ts, 7, 24))
 
 ExpandoMerge.p6 = 66666;
 >ExpandoMerge.p6 : Symbol(ExpandoMerge.p6, Decl(ns.ts, 4, 14), Decl(expando.ts, 8, 25))
->ExpandoMerge : Symbol(ExpandoMerge, Decl(ns.ts, 0, 0), Decl(ns.ts, 8, 1), Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1))
+>ExpandoMerge : Symbol(ExpandoMerge, Decl(ns.ts, 0, 0), Decl(ns.ts, 8, 1), Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1), Decl(expando.ts, 3, 21) ... and 6 more)
 >p6 : Symbol(ExpandoMerge.p6, Decl(ns.ts, 4, 14), Decl(expando.ts, 8, 25))
 
 ExpandoMerge.p7 = 777777;
 >ExpandoMerge.p7 : Symbol(ExpandoMerge.p7, Decl(ns.ts, 5, 14), Decl(expando.ts, 9, 24))
->ExpandoMerge : Symbol(ExpandoMerge, Decl(ns.ts, 0, 0), Decl(ns.ts, 8, 1), Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1))
+>ExpandoMerge : Symbol(ExpandoMerge, Decl(ns.ts, 0, 0), Decl(ns.ts, 8, 1), Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1), Decl(expando.ts, 3, 21) ... and 6 more)
 >p7 : Symbol(ExpandoMerge.p7, Decl(ns.ts, 5, 14), Decl(expando.ts, 9, 24))
 
 ExpandoMerge.p8 = false; // type error
 >ExpandoMerge.p8 : Symbol(ExpandoMerge.p8, Decl(ns.ts, 6, 14), Decl(expando.ts, 10, 25))
->ExpandoMerge : Symbol(ExpandoMerge, Decl(ns.ts, 0, 0), Decl(ns.ts, 8, 1), Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1))
+>ExpandoMerge : Symbol(ExpandoMerge, Decl(ns.ts, 0, 0), Decl(ns.ts, 8, 1), Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1), Decl(expando.ts, 3, 21) ... and 6 more)
 >p8 : Symbol(ExpandoMerge.p8, Decl(ns.ts, 6, 14), Decl(expando.ts, 10, 25))
 
 ExpandoMerge.p9 = false; // type error
 >ExpandoMerge.p9 : Symbol(ExpandoMerge.p9, Decl(ns.ts, 7, 14), Decl(expando.ts, 11, 24))
->ExpandoMerge : Symbol(ExpandoMerge, Decl(ns.ts, 0, 0), Decl(ns.ts, 8, 1), Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1))
+>ExpandoMerge : Symbol(ExpandoMerge, Decl(ns.ts, 0, 0), Decl(ns.ts, 8, 1), Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1), Decl(expando.ts, 3, 21) ... and 6 more)
 >p9 : Symbol(ExpandoMerge.p9, Decl(ns.ts, 7, 14), Decl(expando.ts, 11, 24))
 
 var n = ExpandoMerge.p1 + ExpandoMerge.p2 + ExpandoMerge.p3 + ExpandoMerge.p4 + ExpandoMerge.p5 + ExpandoMerge.p6 + ExpandoMerge.p7 + ExpandoMerge.p8 + ExpandoMerge.p9 + ExpandoMerge.m(12) + ExpandoMerge(1001);
 >n : Symbol(n, Decl(expando.ts, 13, 3))
 >ExpandoMerge.p1 : Symbol(ExpandoMerge.p1, Decl(expando.ts, 2, 1))
->ExpandoMerge : Symbol(ExpandoMerge, Decl(ns.ts, 0, 0), Decl(ns.ts, 8, 1), Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1))
+>ExpandoMerge : Symbol(ExpandoMerge, Decl(ns.ts, 0, 0), Decl(ns.ts, 8, 1), Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1), Decl(expando.ts, 3, 21) ... and 6 more)
 >p1 : Symbol(ExpandoMerge.p1, Decl(expando.ts, 2, 1))
 >ExpandoMerge.p2 : Symbol(ExpandoMerge.p2, Decl(ns.ts, 10, 14))
->ExpandoMerge : Symbol(ExpandoMerge, Decl(ns.ts, 0, 0), Decl(ns.ts, 8, 1), Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1))
+>ExpandoMerge : Symbol(ExpandoMerge, Decl(ns.ts, 0, 0), Decl(ns.ts, 8, 1), Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1), Decl(expando.ts, 3, 21) ... and 6 more)
 >p2 : Symbol(ExpandoMerge.p2, Decl(ns.ts, 10, 14))
 >ExpandoMerge.p3 : Symbol(ExpandoMerge.p3, Decl(ns.ts, 1, 14))
->ExpandoMerge : Symbol(ExpandoMerge, Decl(ns.ts, 0, 0), Decl(ns.ts, 8, 1), Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1))
+>ExpandoMerge : Symbol(ExpandoMerge, Decl(ns.ts, 0, 0), Decl(ns.ts, 8, 1), Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1), Decl(expando.ts, 3, 21) ... and 6 more)
 >p3 : Symbol(ExpandoMerge.p3, Decl(ns.ts, 1, 14))
 >ExpandoMerge.p4 : Symbol(ExpandoMerge.p4, Decl(ns.ts, 2, 14), Decl(expando.ts, 6, 1))
->ExpandoMerge : Symbol(ExpandoMerge, Decl(ns.ts, 0, 0), Decl(ns.ts, 8, 1), Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1))
+>ExpandoMerge : Symbol(ExpandoMerge, Decl(ns.ts, 0, 0), Decl(ns.ts, 8, 1), Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1), Decl(expando.ts, 3, 21) ... and 6 more)
 >p4 : Symbol(ExpandoMerge.p4, Decl(ns.ts, 2, 14), Decl(expando.ts, 6, 1))
 >ExpandoMerge.p5 : Symbol(ExpandoMerge.p5, Decl(ns.ts, 3, 14), Decl(expando.ts, 7, 24))
->ExpandoMerge : Symbol(ExpandoMerge, Decl(ns.ts, 0, 0), Decl(ns.ts, 8, 1), Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1))
+>ExpandoMerge : Symbol(ExpandoMerge, Decl(ns.ts, 0, 0), Decl(ns.ts, 8, 1), Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1), Decl(expando.ts, 3, 21) ... and 6 more)
 >p5 : Symbol(ExpandoMerge.p5, Decl(ns.ts, 3, 14), Decl(expando.ts, 7, 24))
 >ExpandoMerge.p6 : Symbol(ExpandoMerge.p6, Decl(ns.ts, 4, 14), Decl(expando.ts, 8, 25))
->ExpandoMerge : Symbol(ExpandoMerge, Decl(ns.ts, 0, 0), Decl(ns.ts, 8, 1), Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1))
+>ExpandoMerge : Symbol(ExpandoMerge, Decl(ns.ts, 0, 0), Decl(ns.ts, 8, 1), Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1), Decl(expando.ts, 3, 21) ... and 6 more)
 >p6 : Symbol(ExpandoMerge.p6, Decl(ns.ts, 4, 14), Decl(expando.ts, 8, 25))
 >ExpandoMerge.p7 : Symbol(ExpandoMerge.p7, Decl(ns.ts, 5, 14), Decl(expando.ts, 9, 24))
->ExpandoMerge : Symbol(ExpandoMerge, Decl(ns.ts, 0, 0), Decl(ns.ts, 8, 1), Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1))
+>ExpandoMerge : Symbol(ExpandoMerge, Decl(ns.ts, 0, 0), Decl(ns.ts, 8, 1), Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1), Decl(expando.ts, 3, 21) ... and 6 more)
 >p7 : Symbol(ExpandoMerge.p7, Decl(ns.ts, 5, 14), Decl(expando.ts, 9, 24))
 >ExpandoMerge.p8 : Symbol(ExpandoMerge.p8, Decl(ns.ts, 6, 14), Decl(expando.ts, 10, 25))
->ExpandoMerge : Symbol(ExpandoMerge, Decl(ns.ts, 0, 0), Decl(ns.ts, 8, 1), Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1))
+>ExpandoMerge : Symbol(ExpandoMerge, Decl(ns.ts, 0, 0), Decl(ns.ts, 8, 1), Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1), Decl(expando.ts, 3, 21) ... and 6 more)
 >p8 : Symbol(ExpandoMerge.p8, Decl(ns.ts, 6, 14), Decl(expando.ts, 10, 25))
 >ExpandoMerge.p9 : Symbol(ExpandoMerge.p9, Decl(ns.ts, 7, 14), Decl(expando.ts, 11, 24))
->ExpandoMerge : Symbol(ExpandoMerge, Decl(ns.ts, 0, 0), Decl(ns.ts, 8, 1), Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1))
+>ExpandoMerge : Symbol(ExpandoMerge, Decl(ns.ts, 0, 0), Decl(ns.ts, 8, 1), Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1), Decl(expando.ts, 3, 21) ... and 6 more)
 >p9 : Symbol(ExpandoMerge.p9, Decl(ns.ts, 7, 14), Decl(expando.ts, 11, 24))
 >ExpandoMerge.m : Symbol(ExpandoMerge.m, Decl(expando.ts, 3, 21))
->ExpandoMerge : Symbol(ExpandoMerge, Decl(ns.ts, 0, 0), Decl(ns.ts, 8, 1), Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1))
+>ExpandoMerge : Symbol(ExpandoMerge, Decl(ns.ts, 0, 0), Decl(ns.ts, 8, 1), Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1), Decl(expando.ts, 3, 21) ... and 6 more)
 >m : Symbol(ExpandoMerge.m, Decl(expando.ts, 3, 21))
->ExpandoMerge : Symbol(ExpandoMerge, Decl(ns.ts, 0, 0), Decl(ns.ts, 8, 1), Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1))
+>ExpandoMerge : Symbol(ExpandoMerge, Decl(ns.ts, 0, 0), Decl(ns.ts, 8, 1), Decl(expando.ts, 0, 0), Decl(expando.ts, 2, 1), Decl(expando.ts, 3, 21) ... and 6 more)
 
 
diff --git a/tests/baselines/reference/typeFromPropertyAssignment34.symbols b/tests/baselines/reference/typeFromPropertyAssignment34.symbols
index fb9984c1a87..0c8be1b8df8 100644
--- a/tests/baselines/reference/typeFromPropertyAssignment34.symbols
+++ b/tests/baselines/reference/typeFromPropertyAssignment34.symbols
@@ -1,24 +1,24 @@
 === tests/cases/conformance/salsa/file1.js ===
 var N = {};
->N : Symbol(N, Decl(file1.js, 0, 3), Decl(file1.js, 0, 11), Decl(file2.js, 0, 0))
+>N : Symbol(N, Decl(file1.js, 0, 3), Decl(file1.js, 0, 11), Decl(file2.js, 0, 0), Decl(file2.js, 0, 19))
 
 N.commands = {};
->N.commands : Symbol(N.commands, Decl(file1.js, 0, 11), Decl(file2.js, 0, 2))
->N : Symbol(N, Decl(file1.js, 0, 3), Decl(file1.js, 0, 11), Decl(file2.js, 0, 0))
->commands : Symbol(N.commands, Decl(file1.js, 0, 11), Decl(file2.js, 0, 2))
+>N.commands : Symbol(N.commands, Decl(file1.js, 0, 11), Decl(file2.js, 0, 2), Decl(file2.js, 1, 2))
+>N : Symbol(N, Decl(file1.js, 0, 3), Decl(file1.js, 0, 11), Decl(file2.js, 0, 0), Decl(file2.js, 0, 19))
+>commands : Symbol(N.commands, Decl(file1.js, 0, 11), Decl(file2.js, 0, 2), Decl(file2.js, 1, 2))
 
 === tests/cases/conformance/salsa/file2.js ===
 N.commands.a = 111;
 >N.commands.a : Symbol(N.commands.a, Decl(file2.js, 0, 0))
->N.commands : Symbol(N.commands, Decl(file1.js, 0, 11), Decl(file2.js, 0, 2))
->N : Symbol(N, Decl(file1.js, 0, 3), Decl(file1.js, 0, 11), Decl(file2.js, 0, 0))
->commands : Symbol(N.commands, Decl(file1.js, 0, 11), Decl(file2.js, 0, 2))
+>N.commands : Symbol(N.commands, Decl(file1.js, 0, 11), Decl(file2.js, 0, 2), Decl(file2.js, 1, 2))
+>N : Symbol(N, Decl(file1.js, 0, 3), Decl(file1.js, 0, 11), Decl(file2.js, 0, 0), Decl(file2.js, 0, 19))
+>commands : Symbol(N.commands, Decl(file1.js, 0, 11), Decl(file2.js, 0, 2), Decl(file2.js, 1, 2))
 >a : Symbol(N.commands.a, Decl(file2.js, 0, 0))
 
 N.commands.b = function () { };
 >N.commands.b : Symbol(N.commands.b, Decl(file2.js, 0, 19))
->N.commands : Symbol(N.commands, Decl(file1.js, 0, 11), Decl(file2.js, 0, 2))
->N : Symbol(N, Decl(file1.js, 0, 3), Decl(file1.js, 0, 11), Decl(file2.js, 0, 0))
->commands : Symbol(N.commands, Decl(file1.js, 0, 11), Decl(file2.js, 0, 2))
+>N.commands : Symbol(N.commands, Decl(file1.js, 0, 11), Decl(file2.js, 0, 2), Decl(file2.js, 1, 2))
+>N : Symbol(N, Decl(file1.js, 0, 3), Decl(file1.js, 0, 11), Decl(file2.js, 0, 0), Decl(file2.js, 0, 19))
+>commands : Symbol(N.commands, Decl(file1.js, 0, 11), Decl(file2.js, 0, 2), Decl(file2.js, 1, 2))
 >b : Symbol(N.commands.b, Decl(file2.js, 0, 19))
 
diff --git a/tests/baselines/reference/typeFromPropertyAssignment6.symbols b/tests/baselines/reference/typeFromPropertyAssignment6.symbols
index 0868a599cde..fa5248fd13c 100644
--- a/tests/baselines/reference/typeFromPropertyAssignment6.symbols
+++ b/tests/baselines/reference/typeFromPropertyAssignment6.symbols
@@ -1,11 +1,11 @@
 === tests/cases/conformance/salsa/def.js ===
 class Outer {}
->Outer : Symbol(Outer, Decl(def.js, 0, 0), Decl(a.js, 0, 0))
+>Outer : Symbol(Outer, Decl(def.js, 0, 0), Decl(a.js, 0, 0), Decl(a.js, 2, 1))
 
 === tests/cases/conformance/salsa/a.js ===
 Outer.Inner = class I {
 >Outer.Inner : Symbol(Outer.Inner, Decl(a.js, 0, 0))
->Outer : Symbol(Outer, Decl(def.js, 0, 0), Decl(a.js, 0, 0))
+>Outer : Symbol(Outer, Decl(def.js, 0, 0), Decl(a.js, 0, 0), Decl(a.js, 2, 1))
 >Inner : Symbol(Outer.Inner, Decl(a.js, 0, 0))
 >I : Symbol(I, Decl(a.js, 0, 13))
 
@@ -15,7 +15,7 @@ Outer.Inner = class I {
 /** @type {!Outer.Inner} */
 Outer.i
 >Outer.i : Symbol(Outer.i, Decl(a.js, 2, 1))
->Outer : Symbol(Outer, Decl(def.js, 0, 0), Decl(a.js, 0, 0))
+>Outer : Symbol(Outer, Decl(def.js, 0, 0), Decl(a.js, 0, 0), Decl(a.js, 2, 1))
 >i : Symbol(Outer.i, Decl(a.js, 2, 1))
 
 === tests/cases/conformance/salsa/b.js ===
@@ -23,7 +23,7 @@ var msgs = Outer.i.messages()
 >msgs : Symbol(msgs, Decl(b.js, 0, 3))
 >Outer.i.messages : Symbol(I.messages, Decl(a.js, 0, 23))
 >Outer.i : Symbol(Outer.i, Decl(a.js, 2, 1))
->Outer : Symbol(Outer, Decl(def.js, 0, 0), Decl(a.js, 0, 0))
+>Outer : Symbol(Outer, Decl(def.js, 0, 0), Decl(a.js, 0, 0), Decl(a.js, 2, 1))
 >i : Symbol(Outer.i, Decl(a.js, 2, 1))
 >messages : Symbol(I.messages, Decl(a.js, 0, 23))
 
diff --git a/tests/baselines/reference/typeFromPropertyAssignment9.symbols b/tests/baselines/reference/typeFromPropertyAssignment9.symbols
index 81bd1b09c3d..75ac2bedf8c 100644
--- a/tests/baselines/reference/typeFromPropertyAssignment9.symbols
+++ b/tests/baselines/reference/typeFromPropertyAssignment9.symbols
@@ -1,12 +1,12 @@
 === tests/cases/conformance/salsa/a.js ===
 var my = my || {};
->my : Symbol(my, Decl(a.js, 0, 3), Decl(a.js, 0, 18), Decl(a.js, 7, 34), Decl(a.js, 12, 33))
->my : Symbol(my, Decl(a.js, 0, 3), Decl(a.js, 0, 18), Decl(a.js, 7, 34), Decl(a.js, 12, 33))
+>my : Symbol(my, Decl(a.js, 0, 3), Decl(a.js, 0, 18), Decl(a.js, 4, 1), Decl(a.js, 5, 14), Decl(a.js, 6, 15) ... and 5 more)
+>my : Symbol(my, Decl(a.js, 0, 3), Decl(a.js, 0, 18), Decl(a.js, 4, 1), Decl(a.js, 5, 14), Decl(a.js, 6, 15) ... and 5 more)
 
 /** @param {number} n */
 my.method = function(n) {
 >my.method : Symbol(my.method, Decl(a.js, 0, 18))
->my : Symbol(my, Decl(a.js, 0, 3), Decl(a.js, 0, 18), Decl(a.js, 7, 34), Decl(a.js, 12, 33))
+>my : Symbol(my, Decl(a.js, 0, 3), Decl(a.js, 0, 18), Decl(a.js, 4, 1), Decl(a.js, 5, 14), Decl(a.js, 6, 15) ... and 5 more)
 >method : Symbol(my.method, Decl(a.js, 0, 18))
 >n : Symbol(n, Decl(a.js, 2, 21))
 
@@ -15,32 +15,32 @@ my.method = function(n) {
 }
 my.number = 1;
 >my.number : Symbol(my.number, Decl(a.js, 4, 1))
->my : Symbol(my, Decl(a.js, 0, 3), Decl(a.js, 0, 18), Decl(a.js, 7, 34), Decl(a.js, 12, 33))
+>my : Symbol(my, Decl(a.js, 0, 3), Decl(a.js, 0, 18), Decl(a.js, 4, 1), Decl(a.js, 5, 14), Decl(a.js, 6, 15) ... and 5 more)
 >number : Symbol(my.number, Decl(a.js, 4, 1))
 
 my.object = {};
 >my.object : Symbol(my.object, Decl(a.js, 5, 14))
->my : Symbol(my, Decl(a.js, 0, 3), Decl(a.js, 0, 18), Decl(a.js, 7, 34), Decl(a.js, 12, 33))
+>my : Symbol(my, Decl(a.js, 0, 3), Decl(a.js, 0, 18), Decl(a.js, 4, 1), Decl(a.js, 5, 14), Decl(a.js, 6, 15) ... and 5 more)
 >object : Symbol(my.object, Decl(a.js, 5, 14))
 
 my.predicate = my.predicate || {};
->my.predicate : Symbol(my.predicate, Decl(a.js, 6, 15), Decl(a.js, 8, 3), Decl(a.js, 13, 3))
->my : Symbol(my, Decl(a.js, 0, 3), Decl(a.js, 0, 18), Decl(a.js, 7, 34), Decl(a.js, 12, 33))
->predicate : Symbol(my.predicate, Decl(a.js, 6, 15), Decl(a.js, 8, 3), Decl(a.js, 13, 3))
->my.predicate : Symbol(my.predicate, Decl(a.js, 6, 15), Decl(a.js, 8, 3), Decl(a.js, 13, 3))
->my : Symbol(my, Decl(a.js, 0, 3), Decl(a.js, 0, 18), Decl(a.js, 7, 34), Decl(a.js, 12, 33))
->predicate : Symbol(my.predicate, Decl(a.js, 6, 15), Decl(a.js, 8, 3), Decl(a.js, 13, 3))
+>my.predicate : Symbol(my.predicate, Decl(a.js, 6, 15), Decl(a.js, 8, 3), Decl(a.js, 13, 3), Decl(a.js, 16, 3), Decl(a.js, 20, 3) ... and 1 more)
+>my : Symbol(my, Decl(a.js, 0, 3), Decl(a.js, 0, 18), Decl(a.js, 4, 1), Decl(a.js, 5, 14), Decl(a.js, 6, 15) ... and 5 more)
+>predicate : Symbol(my.predicate, Decl(a.js, 6, 15), Decl(a.js, 8, 3), Decl(a.js, 13, 3), Decl(a.js, 16, 3), Decl(a.js, 20, 3) ... and 1 more)
+>my.predicate : Symbol(my.predicate, Decl(a.js, 6, 15), Decl(a.js, 8, 3), Decl(a.js, 13, 3), Decl(a.js, 16, 3), Decl(a.js, 20, 3) ... and 1 more)
+>my : Symbol(my, Decl(a.js, 0, 3), Decl(a.js, 0, 18), Decl(a.js, 4, 1), Decl(a.js, 5, 14), Decl(a.js, 6, 15) ... and 5 more)
+>predicate : Symbol(my.predicate, Decl(a.js, 6, 15), Decl(a.js, 8, 3), Decl(a.js, 13, 3), Decl(a.js, 16, 3), Decl(a.js, 20, 3) ... and 1 more)
 
 my.predicate.query = function () {
->my.predicate.query : Symbol(my.predicate.query, Decl(a.js, 7, 34), Decl(a.js, 13, 13))
->my.predicate : Symbol(my.predicate, Decl(a.js, 6, 15), Decl(a.js, 8, 3), Decl(a.js, 13, 3))
->my : Symbol(my, Decl(a.js, 0, 3), Decl(a.js, 0, 18), Decl(a.js, 7, 34), Decl(a.js, 12, 33))
->predicate : Symbol(my.predicate, Decl(a.js, 6, 15), Decl(a.js, 8, 3), Decl(a.js, 13, 3))
->query : Symbol(my.predicate.query, Decl(a.js, 7, 34), Decl(a.js, 13, 13))
+>my.predicate.query : Symbol(my.predicate.query, Decl(a.js, 7, 34), Decl(a.js, 13, 13), Decl(a.js, 16, 13))
+>my.predicate : Symbol(my.predicate, Decl(a.js, 6, 15), Decl(a.js, 8, 3), Decl(a.js, 13, 3), Decl(a.js, 16, 3), Decl(a.js, 20, 3) ... and 1 more)
+>my : Symbol(my, Decl(a.js, 0, 3), Decl(a.js, 0, 18), Decl(a.js, 4, 1), Decl(a.js, 5, 14), Decl(a.js, 6, 15) ... and 5 more)
+>predicate : Symbol(my.predicate, Decl(a.js, 6, 15), Decl(a.js, 8, 3), Decl(a.js, 13, 3), Decl(a.js, 16, 3), Decl(a.js, 20, 3) ... and 1 more)
+>query : Symbol(my.predicate.query, Decl(a.js, 7, 34), Decl(a.js, 13, 13), Decl(a.js, 16, 13))
 
     var me = this;
 >me : Symbol(me, Decl(a.js, 9, 7))
->this : Symbol(my.predicate, Decl(a.js, 6, 15), Decl(a.js, 8, 3), Decl(a.js, 13, 3))
+>this : Symbol(my.predicate, Decl(a.js, 6, 15), Decl(a.js, 8, 3), Decl(a.js, 13, 3), Decl(a.js, 16, 3), Decl(a.js, 20, 3) ... and 1 more)
 
     me.property = false;
 >me : Symbol(me, Decl(a.js, 9, 7))
@@ -48,30 +48,30 @@ my.predicate.query = function () {
 };
 var q = new my.predicate.query();
 >q : Symbol(q, Decl(a.js, 12, 3))
->my.predicate.query : Symbol(my.predicate.query, Decl(a.js, 7, 34), Decl(a.js, 13, 13))
->my.predicate : Symbol(my.predicate, Decl(a.js, 6, 15), Decl(a.js, 8, 3), Decl(a.js, 13, 3))
->my : Symbol(my, Decl(a.js, 0, 3), Decl(a.js, 0, 18), Decl(a.js, 7, 34), Decl(a.js, 12, 33))
->predicate : Symbol(my.predicate, Decl(a.js, 6, 15), Decl(a.js, 8, 3), Decl(a.js, 13, 3))
->query : Symbol(my.predicate.query, Decl(a.js, 7, 34), Decl(a.js, 13, 13))
+>my.predicate.query : Symbol(my.predicate.query, Decl(a.js, 7, 34), Decl(a.js, 13, 13), Decl(a.js, 16, 13))
+>my.predicate : Symbol(my.predicate, Decl(a.js, 6, 15), Decl(a.js, 8, 3), Decl(a.js, 13, 3), Decl(a.js, 16, 3), Decl(a.js, 20, 3) ... and 1 more)
+>my : Symbol(my, Decl(a.js, 0, 3), Decl(a.js, 0, 18), Decl(a.js, 4, 1), Decl(a.js, 5, 14), Decl(a.js, 6, 15) ... and 5 more)
+>predicate : Symbol(my.predicate, Decl(a.js, 6, 15), Decl(a.js, 8, 3), Decl(a.js, 13, 3), Decl(a.js, 16, 3), Decl(a.js, 20, 3) ... and 1 more)
+>query : Symbol(my.predicate.query, Decl(a.js, 7, 34), Decl(a.js, 13, 13), Decl(a.js, 16, 13))
 
 my.predicate.query.another = function () {
 >my.predicate.query.another : Symbol(my.predicate.query.another, Decl(a.js, 12, 33))
->my.predicate.query : Symbol(my.predicate.query, Decl(a.js, 7, 34), Decl(a.js, 13, 13))
->my.predicate : Symbol(my.predicate, Decl(a.js, 6, 15), Decl(a.js, 8, 3), Decl(a.js, 13, 3))
->my : Symbol(my, Decl(a.js, 0, 3), Decl(a.js, 0, 18), Decl(a.js, 7, 34), Decl(a.js, 12, 33))
->predicate : Symbol(my.predicate, Decl(a.js, 6, 15), Decl(a.js, 8, 3), Decl(a.js, 13, 3))
->query : Symbol(my.predicate.query, Decl(a.js, 7, 34), Decl(a.js, 13, 13))
+>my.predicate.query : Symbol(my.predicate.query, Decl(a.js, 7, 34), Decl(a.js, 13, 13), Decl(a.js, 16, 13))
+>my.predicate : Symbol(my.predicate, Decl(a.js, 6, 15), Decl(a.js, 8, 3), Decl(a.js, 13, 3), Decl(a.js, 16, 3), Decl(a.js, 20, 3) ... and 1 more)
+>my : Symbol(my, Decl(a.js, 0, 3), Decl(a.js, 0, 18), Decl(a.js, 4, 1), Decl(a.js, 5, 14), Decl(a.js, 6, 15) ... and 5 more)
+>predicate : Symbol(my.predicate, Decl(a.js, 6, 15), Decl(a.js, 8, 3), Decl(a.js, 13, 3), Decl(a.js, 16, 3), Decl(a.js, 20, 3) ... and 1 more)
+>query : Symbol(my.predicate.query, Decl(a.js, 7, 34), Decl(a.js, 13, 13), Decl(a.js, 16, 13))
 >another : Symbol(my.predicate.query.another, Decl(a.js, 12, 33))
 
     return 1;
 }
 my.predicate.query.result = 'none'
 >my.predicate.query.result : Symbol(my.predicate.query.result, Decl(a.js, 15, 1))
->my.predicate.query : Symbol(my.predicate.query, Decl(a.js, 7, 34), Decl(a.js, 13, 13))
->my.predicate : Symbol(my.predicate, Decl(a.js, 6, 15), Decl(a.js, 8, 3), Decl(a.js, 13, 3))
->my : Symbol(my, Decl(a.js, 0, 3), Decl(a.js, 0, 18), Decl(a.js, 7, 34), Decl(a.js, 12, 33))
->predicate : Symbol(my.predicate, Decl(a.js, 6, 15), Decl(a.js, 8, 3), Decl(a.js, 13, 3))
->query : Symbol(my.predicate.query, Decl(a.js, 7, 34), Decl(a.js, 13, 13))
+>my.predicate.query : Symbol(my.predicate.query, Decl(a.js, 7, 34), Decl(a.js, 13, 13), Decl(a.js, 16, 13))
+>my.predicate : Symbol(my.predicate, Decl(a.js, 6, 15), Decl(a.js, 8, 3), Decl(a.js, 13, 3), Decl(a.js, 16, 3), Decl(a.js, 20, 3) ... and 1 more)
+>my : Symbol(my, Decl(a.js, 0, 3), Decl(a.js, 0, 18), Decl(a.js, 4, 1), Decl(a.js, 5, 14), Decl(a.js, 6, 15) ... and 5 more)
+>predicate : Symbol(my.predicate, Decl(a.js, 6, 15), Decl(a.js, 8, 3), Decl(a.js, 13, 3), Decl(a.js, 16, 3), Decl(a.js, 20, 3) ... and 1 more)
+>query : Symbol(my.predicate.query, Decl(a.js, 7, 34), Decl(a.js, 13, 13), Decl(a.js, 16, 13))
 >result : Symbol(my.predicate.query.result, Decl(a.js, 15, 1))
 
 /** @param {number} first
@@ -79,14 +79,14 @@ my.predicate.query.result = 'none'
  */
 my.predicate.sort = my.predicate.sort || function (first, second) {
 >my.predicate.sort : Symbol(my.predicate.sort, Decl(a.js, 16, 34))
->my.predicate : Symbol(my.predicate, Decl(a.js, 6, 15), Decl(a.js, 8, 3), Decl(a.js, 13, 3))
->my : Symbol(my, Decl(a.js, 0, 3), Decl(a.js, 0, 18), Decl(a.js, 7, 34), Decl(a.js, 12, 33))
->predicate : Symbol(my.predicate, Decl(a.js, 6, 15), Decl(a.js, 8, 3), Decl(a.js, 13, 3))
+>my.predicate : Symbol(my.predicate, Decl(a.js, 6, 15), Decl(a.js, 8, 3), Decl(a.js, 13, 3), Decl(a.js, 16, 3), Decl(a.js, 20, 3) ... and 1 more)
+>my : Symbol(my, Decl(a.js, 0, 3), Decl(a.js, 0, 18), Decl(a.js, 4, 1), Decl(a.js, 5, 14), Decl(a.js, 6, 15) ... and 5 more)
+>predicate : Symbol(my.predicate, Decl(a.js, 6, 15), Decl(a.js, 8, 3), Decl(a.js, 13, 3), Decl(a.js, 16, 3), Decl(a.js, 20, 3) ... and 1 more)
 >sort : Symbol(my.predicate.sort, Decl(a.js, 16, 34))
 >my.predicate.sort : Symbol(my.predicate.sort, Decl(a.js, 16, 34))
->my.predicate : Symbol(my.predicate, Decl(a.js, 6, 15), Decl(a.js, 8, 3), Decl(a.js, 13, 3))
->my : Symbol(my, Decl(a.js, 0, 3), Decl(a.js, 0, 18), Decl(a.js, 7, 34), Decl(a.js, 12, 33))
->predicate : Symbol(my.predicate, Decl(a.js, 6, 15), Decl(a.js, 8, 3), Decl(a.js, 13, 3))
+>my.predicate : Symbol(my.predicate, Decl(a.js, 6, 15), Decl(a.js, 8, 3), Decl(a.js, 13, 3), Decl(a.js, 16, 3), Decl(a.js, 20, 3) ... and 1 more)
+>my : Symbol(my, Decl(a.js, 0, 3), Decl(a.js, 0, 18), Decl(a.js, 4, 1), Decl(a.js, 5, 14), Decl(a.js, 6, 15) ... and 5 more)
+>predicate : Symbol(my.predicate, Decl(a.js, 6, 15), Decl(a.js, 8, 3), Decl(a.js, 13, 3), Decl(a.js, 16, 3), Decl(a.js, 20, 3) ... and 1 more)
 >sort : Symbol(my.predicate.sort, Decl(a.js, 16, 34))
 >first : Symbol(first, Decl(a.js, 20, 51))
 >second : Symbol(second, Decl(a.js, 20, 57))
@@ -99,9 +99,9 @@ my.predicate.sort = my.predicate.sort || function (first, second) {
 }
 my.predicate.type = class {
 >my.predicate.type : Symbol(my.predicate.type, Decl(a.js, 22, 1))
->my.predicate : Symbol(my.predicate, Decl(a.js, 6, 15), Decl(a.js, 8, 3), Decl(a.js, 13, 3))
->my : Symbol(my, Decl(a.js, 0, 3), Decl(a.js, 0, 18), Decl(a.js, 7, 34), Decl(a.js, 12, 33))
->predicate : Symbol(my.predicate, Decl(a.js, 6, 15), Decl(a.js, 8, 3), Decl(a.js, 13, 3))
+>my.predicate : Symbol(my.predicate, Decl(a.js, 6, 15), Decl(a.js, 8, 3), Decl(a.js, 13, 3), Decl(a.js, 16, 3), Decl(a.js, 20, 3) ... and 1 more)
+>my : Symbol(my, Decl(a.js, 0, 3), Decl(a.js, 0, 18), Decl(a.js, 4, 1), Decl(a.js, 5, 14), Decl(a.js, 6, 15) ... and 5 more)
+>predicate : Symbol(my.predicate, Decl(a.js, 6, 15), Decl(a.js, 8, 3), Decl(a.js, 13, 3), Decl(a.js, 16, 3), Decl(a.js, 20, 3) ... and 1 more)
 >type : Symbol(my.predicate.type, Decl(a.js, 22, 1))
 
     m() { return 101; }
@@ -111,37 +111,37 @@ my.predicate.type = class {
 
 // global-ish prefixes
 var min = window.min || {};
->min : Symbol(min, Decl(a.js, 29, 3), Decl(a.js, 29, 27), Decl(a.js, 30, 44))
->window.min : Symbol(min, Decl(a.js, 29, 3), Decl(a.js, 29, 27), Decl(a.js, 30, 44))
+>min : Symbol(min, Decl(a.js, 29, 3), Decl(a.js, 29, 27), Decl(a.js, 30, 44), Decl(a.js, 31, 50))
+>window.min : Symbol(min, Decl(a.js, 29, 3), Decl(a.js, 29, 27), Decl(a.js, 30, 44), Decl(a.js, 31, 50))
 >window : Symbol(window, Decl(lib.dom.d.ts, --, --))
->min : Symbol(min, Decl(a.js, 29, 3), Decl(a.js, 29, 27), Decl(a.js, 30, 44))
+>min : Symbol(min, Decl(a.js, 29, 3), Decl(a.js, 29, 27), Decl(a.js, 30, 44), Decl(a.js, 31, 50))
 
 min.nest = this.min.nest || function () { };
 >min.nest : Symbol(min.nest, Decl(a.js, 29, 27), Decl(a.js, 31, 4))
->min : Symbol(min, Decl(a.js, 29, 3), Decl(a.js, 29, 27), Decl(a.js, 30, 44))
+>min : Symbol(min, Decl(a.js, 29, 3), Decl(a.js, 29, 27), Decl(a.js, 30, 44), Decl(a.js, 31, 50))
 >nest : Symbol(min.nest, Decl(a.js, 29, 27), Decl(a.js, 31, 4))
 >this.min.nest : Symbol(min.nest, Decl(a.js, 29, 27), Decl(a.js, 31, 4))
->this.min : Symbol(min, Decl(a.js, 29, 3), Decl(a.js, 29, 27), Decl(a.js, 30, 44))
+>this.min : Symbol(min, Decl(a.js, 29, 3), Decl(a.js, 29, 27), Decl(a.js, 30, 44), Decl(a.js, 31, 50))
 >this : Symbol(globalThis)
->min : Symbol(min, Decl(a.js, 29, 3), Decl(a.js, 29, 27), Decl(a.js, 30, 44))
+>min : Symbol(min, Decl(a.js, 29, 3), Decl(a.js, 29, 27), Decl(a.js, 30, 44), Decl(a.js, 31, 50))
 >nest : Symbol(min.nest, Decl(a.js, 29, 27), Decl(a.js, 31, 4))
 
 min.nest.other = self.min.nest.other || class { };
 >min.nest.other : Symbol(min.nest.other, Decl(a.js, 30, 44))
 >min.nest : Symbol(min.nest, Decl(a.js, 29, 27), Decl(a.js, 31, 4))
->min : Symbol(min, Decl(a.js, 29, 3), Decl(a.js, 29, 27), Decl(a.js, 30, 44))
+>min : Symbol(min, Decl(a.js, 29, 3), Decl(a.js, 29, 27), Decl(a.js, 30, 44), Decl(a.js, 31, 50))
 >nest : Symbol(min.nest, Decl(a.js, 29, 27), Decl(a.js, 31, 4))
 >other : Symbol(min.nest.other, Decl(a.js, 30, 44))
 >self.min.nest.other : Symbol(min.nest.other, Decl(a.js, 30, 44))
 >self.min.nest : Symbol(min.nest, Decl(a.js, 29, 27), Decl(a.js, 31, 4))
->self.min : Symbol(min, Decl(a.js, 29, 3), Decl(a.js, 29, 27), Decl(a.js, 30, 44))
+>self.min : Symbol(min, Decl(a.js, 29, 3), Decl(a.js, 29, 27), Decl(a.js, 30, 44), Decl(a.js, 31, 50))
 >self : Symbol(self, Decl(lib.dom.d.ts, --, --))
->min : Symbol(min, Decl(a.js, 29, 3), Decl(a.js, 29, 27), Decl(a.js, 30, 44))
+>min : Symbol(min, Decl(a.js, 29, 3), Decl(a.js, 29, 27), Decl(a.js, 30, 44), Decl(a.js, 31, 50))
 >nest : Symbol(min.nest, Decl(a.js, 29, 27), Decl(a.js, 31, 4))
 >other : Symbol(min.nest.other, Decl(a.js, 30, 44))
 
 min.property = global.min.property || {};
 >min.property : Symbol(min.property, Decl(a.js, 31, 50))
->min : Symbol(min, Decl(a.js, 29, 3), Decl(a.js, 29, 27), Decl(a.js, 30, 44))
+>min : Symbol(min, Decl(a.js, 29, 3), Decl(a.js, 29, 27), Decl(a.js, 30, 44), Decl(a.js, 31, 50))
 >property : Symbol(min.property, Decl(a.js, 31, 50))
 
diff --git a/tests/baselines/reference/typeFromPropertyAssignmentWithExport.symbols b/tests/baselines/reference/typeFromPropertyAssignmentWithExport.symbols
index 6dcf8532f1e..0e061da7ea6 100644
--- a/tests/baselines/reference/typeFromPropertyAssignmentWithExport.symbols
+++ b/tests/baselines/reference/typeFromPropertyAssignmentWithExport.symbols
@@ -2,16 +2,16 @@
 // this is a javascript file...
 
 export const Adapter = {};
->Adapter : Symbol(Adapter, Decl(a.js, 2, 12), Decl(a.js, 2, 26))
+>Adapter : Symbol(Adapter, Decl(a.js, 2, 12), Decl(a.js, 2, 26), Decl(a.js, 4, 18))
 
 Adapter.prop = {};
 >Adapter.prop : Symbol(Adapter.prop, Decl(a.js, 2, 26))
->Adapter : Symbol(Adapter, Decl(a.js, 2, 12), Decl(a.js, 2, 26))
+>Adapter : Symbol(Adapter, Decl(a.js, 2, 12), Decl(a.js, 2, 26), Decl(a.js, 4, 18))
 >prop : Symbol(Adapter.prop, Decl(a.js, 2, 26))
 
 // comment this out, and it works
 Adapter.asyncMethod = function() {}
 >Adapter.asyncMethod : Symbol(Adapter.asyncMethod, Decl(a.js, 4, 18))
->Adapter : Symbol(Adapter, Decl(a.js, 2, 12), Decl(a.js, 2, 26))
+>Adapter : Symbol(Adapter, Decl(a.js, 2, 12), Decl(a.js, 2, 26), Decl(a.js, 4, 18))
 >asyncMethod : Symbol(Adapter.asyncMethod, Decl(a.js, 4, 18))
 
diff --git a/tests/cases/compiler/jsEnumCrossFileExport.ts b/tests/cases/compiler/jsEnumCrossFileExport.ts
new file mode 100644
index 00000000000..3b9704b92fa
--- /dev/null
+++ b/tests/cases/compiler/jsEnumCrossFileExport.ts
@@ -0,0 +1,43 @@
+// @noEmit: true
+// @checkJs: true
+// @allowJs: true
+// @filename: enumDef.js
+var Host = {};
+Host.UserMetrics = {};
+/** @enum {number} */
+Host.UserMetrics.Action = {
+    WindowDocked: 1,
+    WindowUndocked: 2,
+    ScriptsBreakpointSet: 3,
+    TimelineStarted: 4,
+};
+/**
+ * @typedef {string} Host.UserMetrics.Bargh
+ */
+/**
+ * @typedef {string}
+ */
+Host.UserMetrics.Blah = {
+    x: 12
+}
+// @filename: index.js
+var Other = {};
+Other.Cls = class {
+    /**
+     * @param {!Host.UserMetrics.Action} p
+     */
+    method(p) {}
+    usage() {
+        this.method(Host.UserMetrics.Action.WindowDocked);
+    }
+}
+
+/**
+ * @type {Host.UserMetrics.Bargh}
+ */
+var x = "ok";
+
+/**
+ * @type {Host.UserMetrics.Blah}
+ */
+var y = "ok";
diff --git a/tests/cases/compiler/jsEnumFunctionLocalNoCrash.ts b/tests/cases/compiler/jsEnumFunctionLocalNoCrash.ts
new file mode 100644
index 00000000000..73f9a5453e4
--- /dev/null
+++ b/tests/cases/compiler/jsEnumFunctionLocalNoCrash.ts
@@ -0,0 +1,20 @@
+// @noEmit: true
+// @checkJs: true
+// @allowJs: true
+// @filename: index.js
+function defineCommonExtensionSymbols(apiPrivate) {
+    /** @enum {string} */
+    apiPrivate.Events = {
+      ButtonClicked: 'button-clicked-',
+      PanelObjectSelected: 'panel-objectSelected-',
+      NetworkRequestFinished: 'network-request-finished',
+      OpenResource: 'open-resource',
+      PanelSearch: 'panel-search-',
+      RecordingStarted: 'trace-recording-started-',
+      RecordingStopped: 'trace-recording-stopped-',
+      ResourceAdded: 'resource-added',
+      ResourceContentCommitted: 'resource-content-committed',
+      ViewShown: 'view-shown-',
+      ViewHidden: 'view-hidden-'
+    };
+}

From 7d44a4592e49d5c6b3685e43c062ad158853a59b Mon Sep 17 00:00:00 2001
From: Michael Crane <micran@microsoft.com>
Date: Fri, 2 Aug 2019 16:39:33 -0700
Subject: [PATCH 101/151] Remove try-finally blocks

---
 src/compiler/binder.ts             | 15 +++-----
 src/compiler/moduleNameResolver.ts | 28 ++++++--------
 src/compiler/parser.ts             | 17 ++++-----
 src/compiler/sys.ts                | 61 +++++++++++++++---------------
 src/compiler/watch.ts              | 29 +++++++-------
 5 files changed, 70 insertions(+), 80 deletions(-)

diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts
index 8de145d4b72..e69f94498b5 100644
--- a/src/compiler/binder.ts
+++ b/src/compiler/binder.ts
@@ -105,15 +105,12 @@ namespace ts {
     const binder = createBinder();
 
     export function bindSourceFile(file: SourceFile, options: CompilerOptions) {
-        try {
-            performance.mark("beforeBind");
-            perfLogger.logStartBindFile("" + file.fileName);
-            binder(file, options);
-        } finally {
-            perfLogger.logStopBindFile();
-            performance.mark("afterBind");
-            performance.measure("Bind", "beforeBind", "afterBind");
-        }
+        performance.mark("beforeBind");
+        perfLogger.logStartBindFile("" + file.fileName);
+        binder(file, options);
+        perfLogger.logStopBindFile();
+        performance.mark("afterBind");
+        performance.measure("Bind", "beforeBind", "afterBind");
     }
 
     function createBinder(): (file: SourceFile, options: CompilerOptions) => void {
diff --git a/src/compiler/moduleNameResolver.ts b/src/compiler/moduleNameResolver.ts
index 23d39dee52d..98e82a6843b 100644
--- a/src/compiler/moduleNameResolver.ts
+++ b/src/compiler/moduleNameResolver.ts
@@ -665,23 +665,19 @@ namespace ts {
                 }
             }
 
-            try {
-                perfLogger.logStartResolveModule(moduleName /* , containingFile, ModuleResolutionKind[moduleResolution]*/);
-                switch (moduleResolution) {
-                    case ModuleResolutionKind.NodeJs:
-                        result = nodeModuleNameResolver(moduleName, containingFile, compilerOptions, host, cache, redirectedReference);
-                        break;
-                    case ModuleResolutionKind.Classic:
-                        result = classicNameResolver(moduleName, containingFile, compilerOptions, host, cache, redirectedReference);
-                        break;
-                    default:
-                        return Debug.fail(`Unexpected moduleResolution: ${moduleResolution}`);
-                }
+            perfLogger.logStartResolveModule(moduleName /* , containingFile, ModuleResolutionKind[moduleResolution]*/);
+            switch (moduleResolution) {
+                case ModuleResolutionKind.NodeJs:
+                    result = nodeModuleNameResolver(moduleName, containingFile, compilerOptions, host, cache, redirectedReference);
+                    break;
+                case ModuleResolutionKind.Classic:
+                    result = classicNameResolver(moduleName, containingFile, compilerOptions, host, cache, redirectedReference);
+                    break;
+                default:
+                    return Debug.fail(`Unexpected moduleResolution: ${moduleResolution}`);
             }
-            finally {
-                if (result && result.resolvedModule) perfLogger.logInfoEvent(`Module "${moduleName}" resolved to "${result.resolvedModule.resolvedFileName}"`);
-                perfLogger.logStopResolveModule((result && result.resolvedModule) ? "" + result.resolvedModule.resolvedFileName : "null");
-             }
+            if (result && result.resolvedModule) perfLogger.logInfoEvent(`Module "${moduleName}" resolved to "${result.resolvedModule.resolvedFileName}"`);
+            perfLogger.logStopResolveModule((result && result.resolvedModule) ? "" + result.resolvedModule.resolvedFileName : "null");
 
             if (perFolderCache) {
                 perFolderCache.set(moduleName, result);
diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
index a90f556afdf..ae3b4fac87b 100644
--- a/src/compiler/parser.ts
+++ b/src/compiler/parser.ts
@@ -512,18 +512,15 @@ namespace ts {
     export function createSourceFile(fileName: string, sourceText: string, languageVersion: ScriptTarget, setParentNodes = false, scriptKind?: ScriptKind): SourceFile {
         performance.mark("beforeParse");
         let result: SourceFile;
-        try {
-            perfLogger.logStartParseSourceFile(fileName);
-            if (languageVersion === ScriptTarget.JSON) {
-                result = Parser.parseSourceFile(fileName, sourceText, languageVersion, /*syntaxCursor*/ undefined, setParentNodes, ScriptKind.JSON);
-            }
-            else {
-                result = Parser.parseSourceFile(fileName, sourceText, languageVersion, /*syntaxCursor*/ undefined, setParentNodes, scriptKind);
-            }
+
+        perfLogger.logStartParseSourceFile(fileName);
+        if (languageVersion === ScriptTarget.JSON) {
+            result = Parser.parseSourceFile(fileName, sourceText, languageVersion, /*syntaxCursor*/ undefined, setParentNodes, ScriptKind.JSON);
         }
-        finally {
-            perfLogger.logStopParseSourceFile();
+        else {
+            result = Parser.parseSourceFile(fileName, sourceText, languageVersion, /*syntaxCursor*/ undefined, setParentNodes, scriptKind);
         }
+        perfLogger.logStopParseSourceFile();
 
         performance.mark("afterParse");
         performance.measure("Parse", "beforeParse", "afterParse");
diff --git a/src/compiler/sys.ts b/src/compiler/sys.ts
index 95f9531ea95..f2f14c581e2 100644
--- a/src/compiler/sys.ts
+++ b/src/compiler/sys.ts
@@ -1087,37 +1087,38 @@ namespace ts {
             }
 
             function readFile(fileName: string, _encoding?: string): string | undefined {
-                try {
-                    perfLogger.logStartReadFile(fileName);
-                    if (!fileExists(fileName)) {
-                        return undefined;
-                    }
-                    const buffer = _fs.readFileSync(fileName);
-                    let len = buffer.length;
-                    if (len >= 2 && buffer[0] === 0xFE && buffer[1] === 0xFF) {
-                        // Big endian UTF-16 byte order mark detected. Since big endian is not supported by node.js,
-                        // flip all byte pairs and treat as little endian.
-                        len &= ~1; // Round down to a multiple of 2
-                        for (let i = 0; i < len; i += 2) {
-                            const temp = buffer[i];
-                            buffer[i] = buffer[i + 1];
-                            buffer[i + 1] = temp;
-                        }
-                        return buffer.toString("utf16le", 2);
-                    }
-                    if (len >= 2 && buffer[0] === 0xFF && buffer[1] === 0xFE) {
-                        // Little endian UTF-16 byte order mark detected
-                        return buffer.toString("utf16le", 2);
-                    }
-                    if (len >= 3 && buffer[0] === 0xEF && buffer[1] === 0xBB && buffer[2] === 0xBF) {
-                        // UTF-8 byte order mark detected
-                        return buffer.toString("utf8", 3);
-                    }
-                    // Default is UTF-8 with no byte order mark
-                    return buffer.toString("utf8");
-                } finally {
-                    perfLogger.logStopReadFile();
+                perfLogger.logStartReadFile(fileName);
+                if (!fileExists(fileName)) {
+                    return undefined;
                 }
+                const buffer = _fs.readFileSync(fileName);
+                let len = buffer.length;
+                let result: string;
+                if (len >= 2 && buffer[0] === 0xFE && buffer[1] === 0xFF) {
+                    // Big endian UTF-16 byte order mark detected. Since big endian is not supported by node.js,
+                    // flip all byte pairs and treat as little endian.
+                    len &= ~1; // Round down to a multiple of 2
+                    for (let i = 0; i < len; i += 2) {
+                        const temp = buffer[i];
+                        buffer[i] = buffer[i + 1];
+                        buffer[i + 1] = temp;
+                    }
+                    result = buffer.toString("utf16le", 2);
+                }
+                else if (len >= 2 && buffer[0] === 0xFF && buffer[1] === 0xFE) {
+                    // Little endian UTF-16 byte order mark detected
+                    result = buffer.toString("utf16le", 2);
+                }
+                else if (len >= 3 && buffer[0] === 0xEF && buffer[1] === 0xBB && buffer[2] === 0xBF) {
+                    // UTF-8 byte order mark detected
+                    result = buffer.toString("utf8", 3);
+                }
+                else {
+                    // Default is UTF-8 with no byte order mark
+                    result = buffer.toString("utf8");
+                }
+                perfLogger.logStopReadFile();
+                return result;
             }
 
             function writeFile(fileName: string, data: string, writeByteOrderMark?: boolean): void {
diff --git a/src/compiler/watch.ts b/src/compiler/watch.ts
index abefe1ab32d..5e2c004d429 100644
--- a/src/compiler/watch.ts
+++ b/src/compiler/watch.ts
@@ -1003,22 +1003,21 @@ namespace ts {
             timerToUpdateProgram = undefined;
             reportWatchDiagnostic(Diagnostics.File_change_detected_Starting_incremental_compilation);
 
-            try {
-                switch (reloadLevel) {
-                    case ConfigFileProgramReloadLevel.Partial:
-                        perfLogger.logStartUpdateProgram("PartialConfigReload");
-                        return reloadFileNamesFromConfigFile();
-                    case ConfigFileProgramReloadLevel.Full:
-                        perfLogger.logStartUpdateProgram("FullConfigReload");
-                        return reloadConfigFile();
-                    default:
-                        perfLogger.logStartUpdateProgram("SynchronizeProgram");
-                        synchronizeProgram();
-                        return;
-                }
-            } finally {
-                perfLogger.logStopUpdateProgram("Done");
+            switch (reloadLevel) {
+                case ConfigFileProgramReloadLevel.Partial:
+                    perfLogger.logStartUpdateProgram("PartialConfigReload");
+                    reloadFileNamesFromConfigFile();
+                    break;
+                case ConfigFileProgramReloadLevel.Full:
+                    perfLogger.logStartUpdateProgram("FullConfigReload");
+                    reloadConfigFile();
+                    break;
+                default:
+                    perfLogger.logStartUpdateProgram("SynchronizeProgram");
+                    synchronizeProgram();
+                    break;
             }
+            perfLogger.logStopUpdateProgram("Done");
         }
 
         function reloadFileNamesFromConfigFile() {

From cca32f079cdb105333e6a29b5525c3a01db0eef2 Mon Sep 17 00:00:00 2001
From: Michael Crane <micran@microsoft.com>
Date: Fri, 2 Aug 2019 16:46:19 -0700
Subject: [PATCH 102/151] Remove more try-finally blocks

---
 src/server/project.ts   | 69 ++++++++++++++++++++---------------------
 src/server/utilities.ts | 34 +++++++++-----------
 2 files changed, 47 insertions(+), 56 deletions(-)

diff --git a/src/server/project.ts b/src/server/project.ts
index d65c20f3977..f63b3e8cb0d 100644
--- a/src/server/project.ts
+++ b/src/server/project.ts
@@ -852,46 +852,43 @@ namespace ts.server {
          */
         updateGraph(): boolean {
             perfLogger.logStartUpdateGraph();
-            try {
-                this.resolutionCache.startRecordingFilesWithChangedResolutions();
+            this.resolutionCache.startRecordingFilesWithChangedResolutions();
 
-                const hasNewProgram = this.updateGraphWorker();
-                const hasAddedorRemovedFiles = this.hasAddedorRemovedFiles;
-                this.hasAddedorRemovedFiles = false;
+            const hasNewProgram = this.updateGraphWorker();
+            const hasAddedorRemovedFiles = this.hasAddedorRemovedFiles;
+            this.hasAddedorRemovedFiles = false;
 
-                const changedFiles: ReadonlyArray<Path> = this.resolutionCache.finishRecordingFilesWithChangedResolutions() || emptyArray;
+            const changedFiles: ReadonlyArray<Path> = this.resolutionCache.finishRecordingFilesWithChangedResolutions() || emptyArray;
 
-                for (const file of changedFiles) {
-                    // delete cached information for changed files
-                    this.cachedUnresolvedImportsPerFile.delete(file);
-                }
-
-                // update builder only if language service is enabled
-                // otherwise tell it to drop its internal state
-                if (this.languageServiceEnabled) {
-                    // 1. no changes in structure, no changes in unresolved imports - do nothing
-                    // 2. no changes in structure, unresolved imports were changed - collect unresolved imports for all files
-                    // (can reuse cached imports for files that were not changed)
-                    // 3. new files were added/removed, but compilation settings stays the same - collect unresolved imports for all new/modified files
-                    // (can reuse cached imports for files that were not changed)
-                    // 4. compilation settings were changed in the way that might affect module resolution - drop all caches and collect all data from the scratch
-                    if (hasNewProgram || changedFiles.length) {
-                        this.lastCachedUnresolvedImportsList = getUnresolvedImports(this.program!, this.cachedUnresolvedImportsPerFile);
-                    }
-
-                    this.projectService.typingsCache.enqueueInstallTypingsForProject(this, this.lastCachedUnresolvedImportsList, hasAddedorRemovedFiles);
-                }
-                else {
-                    this.lastCachedUnresolvedImportsList = undefined;
-                }
-
-                if (hasNewProgram) {
-                    this.projectProgramVersion++;
-                }
-                return !hasNewProgram;
-            } finally {
-                perfLogger.logStopUpdateGraph();
+            for (const file of changedFiles) {
+                // delete cached information for changed files
+                this.cachedUnresolvedImportsPerFile.delete(file);
             }
+
+            // update builder only if language service is enabled
+            // otherwise tell it to drop its internal state
+            if (this.languageServiceEnabled) {
+                // 1. no changes in structure, no changes in unresolved imports - do nothing
+                // 2. no changes in structure, unresolved imports were changed - collect unresolved imports for all files
+                // (can reuse cached imports for files that were not changed)
+                // 3. new files were added/removed, but compilation settings stays the same - collect unresolved imports for all new/modified files
+                // (can reuse cached imports for files that were not changed)
+                // 4. compilation settings were changed in the way that might affect module resolution - drop all caches and collect all data from the scratch
+                if (hasNewProgram || changedFiles.length) {
+                    this.lastCachedUnresolvedImportsList = getUnresolvedImports(this.program!, this.cachedUnresolvedImportsPerFile);
+                }
+
+                this.projectService.typingsCache.enqueueInstallTypingsForProject(this, this.lastCachedUnresolvedImportsList, hasAddedorRemovedFiles);
+            }
+            else {
+                this.lastCachedUnresolvedImportsList = undefined;
+            }
+
+            if (hasNewProgram) {
+                this.projectProgramVersion++;
+            }
+            perfLogger.logStopUpdateGraph();
+            return !hasNewProgram;
         }
 
         /*@internal*/
diff --git a/src/server/utilities.ts b/src/server/utilities.ts
index a080ea38ac6..d5e17520cec 100644
--- a/src/server/utilities.ts
+++ b/src/server/utilities.ts
@@ -150,16 +150,13 @@ namespace ts.server {
         }
 
         private static run(self: ThrottledOperations, operationId: string, cb: () => void) {
-            try {
-                perfLogger.logStartScheduledOperation(operationId);
-                self.pendingTimeouts.delete(operationId);
-                if (self.logger) {
-                    self.logger.info(`Running: ${operationId}`);
-                }
-                cb();
-            } finally {
-                perfLogger.logStopScheduledOperation();
+            perfLogger.logStartScheduledOperation(operationId);
+            self.pendingTimeouts.delete(operationId);
+            if (self.logger) {
+                self.logger.info(`Running: ${operationId}`);
             }
+            cb();
+            perfLogger.logStopScheduledOperation();
         }
     }
 
@@ -179,19 +176,16 @@ namespace ts.server {
         private static run(self: GcTimer) {
             self.timerId = undefined;
 
-            try {
-                perfLogger.logStartScheduledOperation("GC collect");
-                const log = self.logger.hasLevel(LogLevel.requestTime);
-                const before = log && self.host.getMemoryUsage!(); // TODO: GH#18217
+            perfLogger.logStartScheduledOperation("GC collect");
+            const log = self.logger.hasLevel(LogLevel.requestTime);
+            const before = log && self.host.getMemoryUsage!(); // TODO: GH#18217
 
-                self.host.gc!(); // TODO: GH#18217
-                if (log) {
-                    const after = self.host.getMemoryUsage!(); // TODO: GH#18217
-                    self.logger.perftrc(`GC::before ${before}, after ${after}`);
-                }
-            } finally {
-                perfLogger.logStopScheduledOperation();
+            self.host.gc!(); // TODO: GH#18217
+            if (log) {
+                const after = self.host.getMemoryUsage!(); // TODO: GH#18217
+                self.logger.perftrc(`GC::before ${before}, after ${after}`);
             }
+            perfLogger.logStopScheduledOperation();
         }
     }
 

From e82d0af554d96738b2e8c7f9027e53ac8bc31007 Mon Sep 17 00:00:00 2001
From: Andrew Branch <andrewbranch@users.noreply.github.com>
Date: Fri, 2 Aug 2019 18:24:46 -0700
Subject: [PATCH 103/151] Fix `readonly` occurrences highlighting (#32583)

* Fix readonly occurrences highlighting

* Rename function

* Rename again

* Apply suggestions from code review

Remove unused function
---
 src/services/documentHighlights.ts            |  6 ++--
 src/services/findAllReferences.ts             | 29 ++++++++++++++++---
 ...umentHighlightsInvalidModifierLocations.ts |  7 ++++-
 .../fourslash/getOccurrencesReadonly1.ts      |  7 +++++
 .../fourslash/getOccurrencesReadonly2.ts      |  7 +++++
 .../fourslash/getOccurrencesReadonly3.ts      | 14 +++++++++
 6 files changed, 63 insertions(+), 7 deletions(-)
 create mode 100644 tests/cases/fourslash/getOccurrencesReadonly1.ts
 create mode 100644 tests/cases/fourslash/getOccurrencesReadonly2.ts
 create mode 100644 tests/cases/fourslash/getOccurrencesReadonly3.ts

diff --git a/src/services/documentHighlights.ts b/src/services/documentHighlights.ts
index f0f3c165d7e..86f418b990a 100644
--- a/src/services/documentHighlights.ts
+++ b/src/services/documentHighlights.ts
@@ -193,7 +193,7 @@ namespace ts.DocumentHighlights {
 
     function getNodesToSearchForModifier(declaration: Node, modifierFlag: ModifierFlags): ReadonlyArray<Node> | undefined {
         // Types of node whose children might have modifiers.
-        const container = declaration.parent as ModuleBlock | SourceFile | Block | CaseClause | DefaultClause | ConstructorDeclaration | MethodDeclaration | FunctionDeclaration | ClassLikeDeclaration;
+        const container = declaration.parent as ModuleBlock | SourceFile | Block | CaseClause | DefaultClause | ConstructorDeclaration | MethodDeclaration | FunctionDeclaration | ObjectTypeDeclaration;
         switch (container.kind) {
             case SyntaxKind.ModuleBlock:
             case SyntaxKind.SourceFile:
@@ -213,11 +213,13 @@ namespace ts.DocumentHighlights {
                 return [...container.parameters, ...(isClassLike(container.parent) ? container.parent.members : [])];
             case SyntaxKind.ClassDeclaration:
             case SyntaxKind.ClassExpression:
+            case SyntaxKind.InterfaceDeclaration:
+            case SyntaxKind.TypeLiteral:
                 const nodes = container.members;
 
                 // If we're an accessibility modifier, we're in an instance member and should search
                 // the constructor's parameter list for instance members as well.
-                if (modifierFlag & ModifierFlags.AccessibilityModifier) {
+                if (modifierFlag & (ModifierFlags.AccessibilityModifier | ModifierFlags.Readonly)) {
                     const constructor = find(container.members, isConstructorDeclaration);
                     if (constructor) {
                         return [...nodes, ...constructor.parameters];
diff --git a/src/services/findAllReferences.ts b/src/services/findAllReferences.ts
index fbe33df92a5..1296b3cfa88 100644
--- a/src/services/findAllReferences.ts
+++ b/src/services/findAllReferences.ts
@@ -709,10 +709,28 @@ namespace ts.FindAllReferences.Core {
         return references.length ? [{ definition: { type: DefinitionKind.Symbol, symbol }, references }] : emptyArray;
     }
 
+    /** As in a `readonly prop: any` or `constructor(readonly prop: any)`, not a `readonly any[]`. */
+    function isReadonlyTypeOperator(node: Node): boolean {
+        return node.kind === SyntaxKind.ReadonlyKeyword
+            && isTypeOperatorNode(node.parent)
+            && node.parent.operator === SyntaxKind.ReadonlyKeyword;
+    }
+
     /** getReferencedSymbols for special node kinds. */
     function getReferencedSymbolsSpecial(node: Node, sourceFiles: ReadonlyArray<SourceFile>, cancellationToken: CancellationToken): SymbolAndEntries[] | undefined {
         if (isTypeKeyword(node.kind)) {
-            return getAllReferencesForKeyword(sourceFiles, node.kind, cancellationToken);
+            // A modifier readonly (like on a property declaration) is not special;
+            // a readonly type keyword (like `readonly string[]`) is.
+            if (node.kind === SyntaxKind.ReadonlyKeyword && !isReadonlyTypeOperator(node)) {
+                return undefined;
+            }
+            // Likewise, when we *are* looking for a special keyword, make sure we
+            // *don’t* include readonly member modifiers.
+            return getAllReferencesForKeyword(
+                sourceFiles,
+                node.kind,
+                cancellationToken,
+                node.kind === SyntaxKind.ReadonlyKeyword ? isReadonlyTypeOperator : undefined);
         }
 
         // Labels
@@ -1235,11 +1253,14 @@ namespace ts.FindAllReferences.Core {
         }
     }
 
-    function getAllReferencesForKeyword(sourceFiles: ReadonlyArray<SourceFile>, keywordKind: SyntaxKind, cancellationToken: CancellationToken): SymbolAndEntries[] | undefined {
+    function getAllReferencesForKeyword(sourceFiles: ReadonlyArray<SourceFile>, keywordKind: SyntaxKind, cancellationToken: CancellationToken, filter?: (node: Node) => boolean): SymbolAndEntries[] | undefined {
         const references = flatMap(sourceFiles, sourceFile => {
             cancellationToken.throwIfCancellationRequested();
-            return mapDefined(getPossibleSymbolReferenceNodes(sourceFile, tokenToString(keywordKind)!, sourceFile), referenceLocation =>
-                referenceLocation.kind === keywordKind ? nodeEntry(referenceLocation) : undefined);
+            return mapDefined(getPossibleSymbolReferenceNodes(sourceFile, tokenToString(keywordKind)!, sourceFile), referenceLocation => {
+                if (referenceLocation.kind === keywordKind && (!filter || filter(referenceLocation))) {
+                    return nodeEntry(referenceLocation);
+                }
+            });
         });
         return references.length ? [{ definition: { type: DefinitionKind.Keyword, node: references[0].node }, references }] : undefined;
     }
diff --git a/tests/cases/fourslash/documentHighlightsInvalidModifierLocations.ts b/tests/cases/fourslash/documentHighlightsInvalidModifierLocations.ts
index baa203901fd..de82fb60089 100644
--- a/tests/cases/fourslash/documentHighlightsInvalidModifierLocations.ts
+++ b/tests/cases/fourslash/documentHighlightsInvalidModifierLocations.ts
@@ -4,7 +4,12 @@
 ////    m([|readonly|] p) {}
 ////}
 ////function f([|readonly|] p) {}
+////
+////class D {
+////    m([|public|] p) {}
+////}
+////function g([|public|] p) {}
 
 for (const r of test.ranges()) {
-    verify.documentHighlightsOf(r, test.ranges());
+    verify.documentHighlightsOf(r, [r]);
 }
diff --git a/tests/cases/fourslash/getOccurrencesReadonly1.ts b/tests/cases/fourslash/getOccurrencesReadonly1.ts
new file mode 100644
index 00000000000..a01d30bed93
--- /dev/null
+++ b/tests/cases/fourslash/getOccurrencesReadonly1.ts
@@ -0,0 +1,7 @@
+/// <reference path="fourslash.ts" />
+
+////interface I {
+////  [|readonly|] prop: string;
+////}
+
+verify.rangesAreOccurrences(false);
diff --git a/tests/cases/fourslash/getOccurrencesReadonly2.ts b/tests/cases/fourslash/getOccurrencesReadonly2.ts
new file mode 100644
index 00000000000..b6485b77a37
--- /dev/null
+++ b/tests/cases/fourslash/getOccurrencesReadonly2.ts
@@ -0,0 +1,7 @@
+/// <reference path="fourslash.ts" />
+
+////type T = {
+////  [|readonly|] prop: string;
+////}
+
+verify.rangesAreOccurrences(false);
diff --git a/tests/cases/fourslash/getOccurrencesReadonly3.ts b/tests/cases/fourslash/getOccurrencesReadonly3.ts
new file mode 100644
index 00000000000..0ca487c6364
--- /dev/null
+++ b/tests/cases/fourslash/getOccurrencesReadonly3.ts
@@ -0,0 +1,14 @@
+/// <reference path="fourslash.ts" />
+
+////class C {
+////  [|readonly|] prop: /**/readonly string[] = [];
+////  constructor([|readonly|] prop2: string) {
+////    class D {
+////      readonly prop: string = "";  
+////    }
+////  }
+////}
+
+verify.rangesAreOccurrences(false);
+goTo.marker();
+verify.occurrencesAtPositionCount(1);

From 3c690f1264c15eacb318f44e801707d274f7408b Mon Sep 17 00:00:00 2001
From: Ron Buckton <ron.buckton@microsoft.com>
Date: Sat, 3 Aug 2019 13:09:11 -0700
Subject: [PATCH 104/151] Move const enums and typeof facts maps out of
 createTypeChecker (#32691)

---
 src/compiler/checker.ts | 423 ++++++++++++++++++++--------------------
 1 file changed, 212 insertions(+), 211 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 6a42774a8c2..f699c08b4db 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -57,6 +57,187 @@ namespace ts {
         GeneratorYield
     }
 
+    const enum TypeFacts {
+        None = 0,
+        TypeofEQString = 1 << 0,      // typeof x === "string"
+        TypeofEQNumber = 1 << 1,      // typeof x === "number"
+        TypeofEQBigInt = 1 << 2,      // typeof x === "bigint"
+        TypeofEQBoolean = 1 << 3,     // typeof x === "boolean"
+        TypeofEQSymbol = 1 << 4,      // typeof x === "symbol"
+        TypeofEQObject = 1 << 5,      // typeof x === "object"
+        TypeofEQFunction = 1 << 6,    // typeof x === "function"
+        TypeofEQHostObject = 1 << 7,  // typeof x === "xxx"
+        TypeofNEString = 1 << 8,      // typeof x !== "string"
+        TypeofNENumber = 1 << 9,      // typeof x !== "number"
+        TypeofNEBigInt = 1 << 10,     // typeof x !== "bigint"
+        TypeofNEBoolean = 1 << 11,     // typeof x !== "boolean"
+        TypeofNESymbol = 1 << 12,     // typeof x !== "symbol"
+        TypeofNEObject = 1 << 13,     // typeof x !== "object"
+        TypeofNEFunction = 1 << 14,   // typeof x !== "function"
+        TypeofNEHostObject = 1 << 15, // typeof x !== "xxx"
+        EQUndefined = 1 << 16,        // x === undefined
+        EQNull = 1 << 17,             // x === null
+        EQUndefinedOrNull = 1 << 18,  // x === undefined / x === null
+        NEUndefined = 1 << 19,        // x !== undefined
+        NENull = 1 << 20,             // x !== null
+        NEUndefinedOrNull = 1 << 21,  // x != undefined / x != null
+        Truthy = 1 << 22,             // x
+        Falsy = 1 << 23,              // !x
+        All = (1 << 24) - 1,
+        // The following members encode facts about particular kinds of types for use in the getTypeFacts function.
+        // The presence of a particular fact means that the given test is true for some (and possibly all) values
+        // of that kind of type.
+        BaseStringStrictFacts = TypeofEQString | TypeofNENumber | TypeofNEBigInt | TypeofNEBoolean | TypeofNESymbol | TypeofNEObject | TypeofNEFunction | TypeofNEHostObject | NEUndefined | NENull | NEUndefinedOrNull,
+        BaseStringFacts = BaseStringStrictFacts | EQUndefined | EQNull | EQUndefinedOrNull | Falsy,
+        StringStrictFacts = BaseStringStrictFacts | Truthy | Falsy,
+        StringFacts = BaseStringFacts | Truthy,
+        EmptyStringStrictFacts = BaseStringStrictFacts | Falsy,
+        EmptyStringFacts = BaseStringFacts,
+        NonEmptyStringStrictFacts = BaseStringStrictFacts | Truthy,
+        NonEmptyStringFacts = BaseStringFacts | Truthy,
+        BaseNumberStrictFacts = TypeofEQNumber | TypeofNEString | TypeofNEBigInt | TypeofNEBoolean | TypeofNESymbol | TypeofNEObject | TypeofNEFunction | TypeofNEHostObject | NEUndefined | NENull | NEUndefinedOrNull,
+        BaseNumberFacts = BaseNumberStrictFacts | EQUndefined | EQNull | EQUndefinedOrNull | Falsy,
+        NumberStrictFacts = BaseNumberStrictFacts | Truthy | Falsy,
+        NumberFacts = BaseNumberFacts | Truthy,
+        ZeroNumberStrictFacts = BaseNumberStrictFacts | Falsy,
+        ZeroNumberFacts = BaseNumberFacts,
+        NonZeroNumberStrictFacts = BaseNumberStrictFacts | Truthy,
+        NonZeroNumberFacts = BaseNumberFacts | Truthy,
+        BaseBigIntStrictFacts = TypeofEQBigInt | TypeofNEString | TypeofNENumber | TypeofNEBoolean | TypeofNESymbol | TypeofNEObject | TypeofNEFunction | TypeofNEHostObject | NEUndefined | NENull | NEUndefinedOrNull,
+        BaseBigIntFacts = BaseBigIntStrictFacts | EQUndefined | EQNull | EQUndefinedOrNull | Falsy,
+        BigIntStrictFacts = BaseBigIntStrictFacts | Truthy | Falsy,
+        BigIntFacts = BaseBigIntFacts | Truthy,
+        ZeroBigIntStrictFacts = BaseBigIntStrictFacts | Falsy,
+        ZeroBigIntFacts = BaseBigIntFacts,
+        NonZeroBigIntStrictFacts = BaseBigIntStrictFacts | Truthy,
+        NonZeroBigIntFacts = BaseBigIntFacts | Truthy,
+        BaseBooleanStrictFacts = TypeofEQBoolean | TypeofNEString | TypeofNENumber | TypeofNEBigInt | TypeofNESymbol | TypeofNEObject | TypeofNEFunction | TypeofNEHostObject | NEUndefined | NENull | NEUndefinedOrNull,
+        BaseBooleanFacts = BaseBooleanStrictFacts | EQUndefined | EQNull | EQUndefinedOrNull | Falsy,
+        BooleanStrictFacts = BaseBooleanStrictFacts | Truthy | Falsy,
+        BooleanFacts = BaseBooleanFacts | Truthy,
+        FalseStrictFacts = BaseBooleanStrictFacts | Falsy,
+        FalseFacts = BaseBooleanFacts,
+        TrueStrictFacts = BaseBooleanStrictFacts | Truthy,
+        TrueFacts = BaseBooleanFacts | Truthy,
+        SymbolStrictFacts = TypeofEQSymbol | TypeofNEString | TypeofNENumber | TypeofNEBigInt | TypeofNEBoolean | TypeofNEObject | TypeofNEFunction | TypeofNEHostObject | NEUndefined | NENull | NEUndefinedOrNull | Truthy,
+        SymbolFacts = SymbolStrictFacts | EQUndefined | EQNull | EQUndefinedOrNull | Falsy,
+        ObjectStrictFacts = TypeofEQObject | TypeofEQHostObject | TypeofNEString | TypeofNENumber | TypeofNEBigInt | TypeofNEBoolean | TypeofNESymbol | TypeofNEFunction | NEUndefined | NENull | NEUndefinedOrNull | Truthy,
+        ObjectFacts = ObjectStrictFacts | EQUndefined | EQNull | EQUndefinedOrNull | Falsy,
+        FunctionStrictFacts = TypeofEQFunction | TypeofEQHostObject | TypeofNEString | TypeofNENumber | TypeofNEBigInt | TypeofNEBoolean | TypeofNESymbol | TypeofNEObject | NEUndefined | NENull | NEUndefinedOrNull | Truthy,
+        FunctionFacts = FunctionStrictFacts | EQUndefined | EQNull | EQUndefinedOrNull | Falsy,
+        UndefinedFacts = TypeofNEString | TypeofNENumber | TypeofNEBigInt | TypeofNEBoolean | TypeofNESymbol | TypeofNEObject | TypeofNEFunction | TypeofNEHostObject | EQUndefined | EQUndefinedOrNull | NENull | Falsy,
+        NullFacts = TypeofEQObject | TypeofNEString | TypeofNENumber | TypeofNEBigInt | TypeofNEBoolean | TypeofNESymbol | TypeofNEFunction | TypeofNEHostObject | EQNull | EQUndefinedOrNull | NEUndefined | Falsy,
+        EmptyObjectStrictFacts = All & ~(EQUndefined | EQNull | EQUndefinedOrNull),
+        EmptyObjectFacts = All,
+    }
+
+    const typeofEQFacts: ReadonlyMap<TypeFacts> = createMapFromTemplate({
+        string: TypeFacts.TypeofEQString,
+        number: TypeFacts.TypeofEQNumber,
+        bigint: TypeFacts.TypeofEQBigInt,
+        boolean: TypeFacts.TypeofEQBoolean,
+        symbol: TypeFacts.TypeofEQSymbol,
+        undefined: TypeFacts.EQUndefined,
+        object: TypeFacts.TypeofEQObject,
+        function: TypeFacts.TypeofEQFunction
+    });
+
+    const typeofNEFacts: ReadonlyMap<TypeFacts> = createMapFromTemplate({
+        string: TypeFacts.TypeofNEString,
+        number: TypeFacts.TypeofNENumber,
+        bigint: TypeFacts.TypeofNEBigInt,
+        boolean: TypeFacts.TypeofNEBoolean,
+        symbol: TypeFacts.TypeofNESymbol,
+        undefined: TypeFacts.NEUndefined,
+        object: TypeFacts.TypeofNEObject,
+        function: TypeFacts.TypeofNEFunction
+    });
+
+    type TypeSystemEntity = Node | Symbol | Type | Signature;
+
+    const enum TypeSystemPropertyName {
+        Type,
+        ResolvedBaseConstructorType,
+        DeclaredType,
+        ResolvedReturnType,
+        ImmediateBaseConstraint,
+        EnumTagType,
+        JSDocTypeReference,
+    }
+
+    const enum CheckMode {
+        Normal = 0,                     // Normal type checking
+        Contextual = 1 << 0,            // Explicitly assigned contextual type, therefore not cacheable
+        Inferential = 1 << 1,           // Inferential typing
+        SkipContextSensitive = 1 << 2,  // Skip context sensitive function expressions
+        SkipGenericFunctions = 1 << 3,  // Skip single signature generic functions
+        IsForSignatureHelp = 1 << 4,    // Call resolution for purposes of signature help
+    }
+
+    const enum ContextFlags {
+        None = 0,
+        Signature = 1 << 0,  // Obtaining contextual signature
+    }
+
+    const enum AccessFlags {
+        None = 0,
+        NoIndexSignatures = 1 << 0,
+        Writing = 1 << 1,
+        CacheSymbol = 1 << 2,
+        NoTupleBoundsCheck = 1 << 3,
+    }
+
+    const enum CallbackCheck {
+        None,
+        Bivariant,
+        Strict,
+    }
+
+    const enum MappedTypeModifiers {
+        IncludeReadonly = 1 << 0,
+        ExcludeReadonly = 1 << 1,
+        IncludeOptional = 1 << 2,
+        ExcludeOptional = 1 << 3,
+    }
+
+    const enum ExpandingFlags {
+        None = 0,
+        Source = 1,
+        Target = 1 << 1,
+        Both = Source | Target,
+    }
+
+    const enum MembersOrExportsResolutionKind {
+        resolvedExports = "resolvedExports",
+        resolvedMembers = "resolvedMembers"
+    }
+
+    const enum UnusedKind {
+        Local,
+        Parameter,
+    }
+
+    /** @param containingNode Node to check for parse error */
+    type AddUnusedDiagnostic = (containingNode: Node, type: UnusedKind, diagnostic: DiagnosticWithLocation) => void;
+
+    const isNotOverloadAndNotAccessor = and(isNotOverload, isNotAccessor);
+
+    const enum DeclarationMeaning {
+        GetAccessor = 1,
+        SetAccessor = 2,
+        PropertyAssignment = 4,
+        Method = 8,
+        GetOrSetAccessor = GetAccessor | SetAccessor,
+        PropertyAssignmentOrMethod = PropertyAssignment | Method,
+    }
+
+    const enum DeclarationSpaces {
+        None = 0,
+        ExportValue = 1 << 0,
+        ExportType = 1 << 1,
+        ExportNamespace = 1 << 2,
+    }
+
     export function getNodeId(node: Node): number {
         if (!node.id) {
             node.id = nextNodeId;
@@ -670,101 +851,7 @@ namespace ts {
         // Suggestion diagnostics must have a file. Keyed by source file name.
         const suggestionDiagnostics = createMultiMap<DiagnosticWithLocation>();
 
-        const enum TypeFacts {
-            None = 0,
-            TypeofEQString = 1 << 0,      // typeof x === "string"
-            TypeofEQNumber = 1 << 1,      // typeof x === "number"
-            TypeofEQBigInt = 1 << 2,      // typeof x === "bigint"
-            TypeofEQBoolean = 1 << 3,     // typeof x === "boolean"
-            TypeofEQSymbol = 1 << 4,      // typeof x === "symbol"
-            TypeofEQObject = 1 << 5,      // typeof x === "object"
-            TypeofEQFunction = 1 << 6,    // typeof x === "function"
-            TypeofEQHostObject = 1 << 7,  // typeof x === "xxx"
-            TypeofNEString = 1 << 8,      // typeof x !== "string"
-            TypeofNENumber = 1 << 9,      // typeof x !== "number"
-            TypeofNEBigInt = 1 << 10,     // typeof x !== "bigint"
-            TypeofNEBoolean = 1 << 11,     // typeof x !== "boolean"
-            TypeofNESymbol = 1 << 12,     // typeof x !== "symbol"
-            TypeofNEObject = 1 << 13,     // typeof x !== "object"
-            TypeofNEFunction = 1 << 14,   // typeof x !== "function"
-            TypeofNEHostObject = 1 << 15, // typeof x !== "xxx"
-            EQUndefined = 1 << 16,        // x === undefined
-            EQNull = 1 << 17,             // x === null
-            EQUndefinedOrNull = 1 << 18,  // x === undefined / x === null
-            NEUndefined = 1 << 19,        // x !== undefined
-            NENull = 1 << 20,             // x !== null
-            NEUndefinedOrNull = 1 << 21,  // x != undefined / x != null
-            Truthy = 1 << 22,             // x
-            Falsy = 1 << 23,              // !x
-            All = (1 << 24) - 1,
-            // The following members encode facts about particular kinds of types for use in the getTypeFacts function.
-            // The presence of a particular fact means that the given test is true for some (and possibly all) values
-            // of that kind of type.
-            BaseStringStrictFacts = TypeofEQString | TypeofNENumber | TypeofNEBigInt | TypeofNEBoolean | TypeofNESymbol | TypeofNEObject | TypeofNEFunction | TypeofNEHostObject | NEUndefined | NENull | NEUndefinedOrNull,
-            BaseStringFacts = BaseStringStrictFacts | EQUndefined | EQNull | EQUndefinedOrNull | Falsy,
-            StringStrictFacts = BaseStringStrictFacts | Truthy | Falsy,
-            StringFacts = BaseStringFacts | Truthy,
-            EmptyStringStrictFacts = BaseStringStrictFacts | Falsy,
-            EmptyStringFacts = BaseStringFacts,
-            NonEmptyStringStrictFacts = BaseStringStrictFacts | Truthy,
-            NonEmptyStringFacts = BaseStringFacts | Truthy,
-            BaseNumberStrictFacts = TypeofEQNumber | TypeofNEString | TypeofNEBigInt | TypeofNEBoolean | TypeofNESymbol | TypeofNEObject | TypeofNEFunction | TypeofNEHostObject | NEUndefined | NENull | NEUndefinedOrNull,
-            BaseNumberFacts = BaseNumberStrictFacts | EQUndefined | EQNull | EQUndefinedOrNull | Falsy,
-            NumberStrictFacts = BaseNumberStrictFacts | Truthy | Falsy,
-            NumberFacts = BaseNumberFacts | Truthy,
-            ZeroNumberStrictFacts = BaseNumberStrictFacts | Falsy,
-            ZeroNumberFacts = BaseNumberFacts,
-            NonZeroNumberStrictFacts = BaseNumberStrictFacts | Truthy,
-            NonZeroNumberFacts = BaseNumberFacts | Truthy,
-            BaseBigIntStrictFacts = TypeofEQBigInt | TypeofNEString | TypeofNENumber | TypeofNEBoolean | TypeofNESymbol | TypeofNEObject | TypeofNEFunction | TypeofNEHostObject | NEUndefined | NENull | NEUndefinedOrNull,
-            BaseBigIntFacts = BaseBigIntStrictFacts | EQUndefined | EQNull | EQUndefinedOrNull | Falsy,
-            BigIntStrictFacts = BaseBigIntStrictFacts | Truthy | Falsy,
-            BigIntFacts = BaseBigIntFacts | Truthy,
-            ZeroBigIntStrictFacts = BaseBigIntStrictFacts | Falsy,
-            ZeroBigIntFacts = BaseBigIntFacts,
-            NonZeroBigIntStrictFacts = BaseBigIntStrictFacts | Truthy,
-            NonZeroBigIntFacts = BaseBigIntFacts | Truthy,
-            BaseBooleanStrictFacts = TypeofEQBoolean | TypeofNEString | TypeofNENumber | TypeofNEBigInt | TypeofNESymbol | TypeofNEObject | TypeofNEFunction | TypeofNEHostObject | NEUndefined | NENull | NEUndefinedOrNull,
-            BaseBooleanFacts = BaseBooleanStrictFacts | EQUndefined | EQNull | EQUndefinedOrNull | Falsy,
-            BooleanStrictFacts = BaseBooleanStrictFacts | Truthy | Falsy,
-            BooleanFacts = BaseBooleanFacts | Truthy,
-            FalseStrictFacts = BaseBooleanStrictFacts | Falsy,
-            FalseFacts = BaseBooleanFacts,
-            TrueStrictFacts = BaseBooleanStrictFacts | Truthy,
-            TrueFacts = BaseBooleanFacts | Truthy,
-            SymbolStrictFacts = TypeofEQSymbol | TypeofNEString | TypeofNENumber | TypeofNEBigInt | TypeofNEBoolean | TypeofNEObject | TypeofNEFunction | TypeofNEHostObject | NEUndefined | NENull | NEUndefinedOrNull | Truthy,
-            SymbolFacts = SymbolStrictFacts | EQUndefined | EQNull | EQUndefinedOrNull | Falsy,
-            ObjectStrictFacts = TypeofEQObject | TypeofEQHostObject | TypeofNEString | TypeofNENumber | TypeofNEBigInt | TypeofNEBoolean | TypeofNESymbol | TypeofNEFunction | NEUndefined | NENull | NEUndefinedOrNull | Truthy,
-            ObjectFacts = ObjectStrictFacts | EQUndefined | EQNull | EQUndefinedOrNull | Falsy,
-            FunctionStrictFacts = TypeofEQFunction | TypeofEQHostObject | TypeofNEString | TypeofNENumber | TypeofNEBigInt | TypeofNEBoolean | TypeofNESymbol | TypeofNEObject | NEUndefined | NENull | NEUndefinedOrNull | Truthy,
-            FunctionFacts = FunctionStrictFacts | EQUndefined | EQNull | EQUndefinedOrNull | Falsy,
-            UndefinedFacts = TypeofNEString | TypeofNENumber | TypeofNEBigInt | TypeofNEBoolean | TypeofNESymbol | TypeofNEObject | TypeofNEFunction | TypeofNEHostObject | EQUndefined | EQUndefinedOrNull | NENull | Falsy,
-            NullFacts = TypeofEQObject | TypeofNEString | TypeofNENumber | TypeofNEBigInt | TypeofNEBoolean | TypeofNESymbol | TypeofNEFunction | TypeofNEHostObject | EQNull | EQUndefinedOrNull | NEUndefined | Falsy,
-            EmptyObjectStrictFacts = All & ~(EQUndefined | EQNull | EQUndefinedOrNull),
-            EmptyObjectFacts = All,
-        }
-
-        const typeofEQFacts = createMapFromTemplate({
-            string: TypeFacts.TypeofEQString,
-            number: TypeFacts.TypeofEQNumber,
-            bigint: TypeFacts.TypeofEQBigInt,
-            boolean: TypeFacts.TypeofEQBoolean,
-            symbol: TypeFacts.TypeofEQSymbol,
-            undefined: TypeFacts.EQUndefined,
-            object: TypeFacts.TypeofEQObject,
-            function: TypeFacts.TypeofEQFunction
-        });
-        const typeofNEFacts = createMapFromTemplate({
-            string: TypeFacts.TypeofNEString,
-            number: TypeFacts.TypeofNENumber,
-            bigint: TypeFacts.TypeofNEBigInt,
-            boolean: TypeFacts.TypeofNEBoolean,
-            symbol: TypeFacts.TypeofNESymbol,
-            undefined: TypeFacts.NEUndefined,
-            object: TypeFacts.TypeofNEObject,
-            function: TypeFacts.TypeofNEFunction
-        });
-        const typeofTypesByName = createMapFromTemplate<Type>({
+        const typeofTypesByName: ReadonlyMap<Type> = createMapFromTemplate<Type>({
             string: stringType,
             number: numberType,
             bigint: bigintType,
@@ -784,77 +871,9 @@ namespace ts {
         const identityRelation = createMap<RelationComparisonResult>();
         const enumRelation = createMap<RelationComparisonResult>();
 
-        type TypeSystemEntity = Node | Symbol | Type | Signature;
-
-        const enum TypeSystemPropertyName {
-            Type,
-            ResolvedBaseConstructorType,
-            DeclaredType,
-            ResolvedReturnType,
-            ImmediateBaseConstraint,
-            EnumTagType,
-            JSDocTypeReference,
-        }
-
-        const enum CheckMode {
-            Normal = 0,                     // Normal type checking
-            Contextual = 1 << 0,            // Explicitly assigned contextual type, therefore not cacheable
-            Inferential = 1 << 1,           // Inferential typing
-            SkipContextSensitive = 1 << 2,  // Skip context sensitive function expressions
-            SkipGenericFunctions = 1 << 3,  // Skip single signature generic functions
-            IsForSignatureHelp = 1 << 4,    // Call resolution for purposes of signature help
-        }
-
-        const enum ContextFlags {
-            None = 0,
-            Signature = 1 << 0,  // Obtaining contextual signature
-        }
-
-        const enum AccessFlags {
-            None = 0,
-            NoIndexSignatures = 1 << 0,
-            Writing = 1 << 1,
-            CacheSymbol = 1 << 2,
-            NoTupleBoundsCheck = 1 << 3,
-        }
-
-        const enum CallbackCheck {
-            None,
-            Bivariant,
-            Strict,
-        }
-
-        const enum MappedTypeModifiers {
-            IncludeReadonly = 1 << 0,
-            ExcludeReadonly = 1 << 1,
-            IncludeOptional = 1 << 2,
-            ExcludeOptional = 1 << 3,
-        }
-
-        const enum ExpandingFlags {
-            None = 0,
-            Source = 1,
-            Target = 1 << 1,
-            Both = Source | Target,
-        }
-
-        const enum MembersOrExportsResolutionKind {
-            resolvedExports = "resolvedExports",
-            resolvedMembers = "resolvedMembers"
-        }
-
-        const enum UnusedKind {
-            Local,
-            Parameter,
-        }
-        /** @param containingNode Node to check for parse error */
-        type AddUnusedDiagnostic = (containingNode: Node, type: UnusedKind, diagnostic: DiagnosticWithLocation) => void;
-
         const builtinGlobals = createSymbolTable();
         builtinGlobals.set(undefinedSymbol.escapedName, undefinedSymbol);
 
-        const isNotOverloadAndNotAccessor = and(isNotOverload, isNotAccessor);
-
         initializeTypeChecker();
 
         return checker;
@@ -25570,20 +25589,13 @@ namespace ts {
         }
 
         function checkClassForDuplicateDeclarations(node: ClassLikeDeclaration) {
-            const enum Declaration {
-                Getter = 1,
-                Setter = 2,
-                Method = 4,
-                Property = Getter | Setter
-            }
-
-            const instanceNames = createUnderscoreEscapedMap<Declaration>();
-            const staticNames = createUnderscoreEscapedMap<Declaration>();
+            const instanceNames = createUnderscoreEscapedMap<DeclarationMeaning>();
+            const staticNames = createUnderscoreEscapedMap<DeclarationMeaning>();
             for (const member of node.members) {
                 if (member.kind === SyntaxKind.Constructor) {
                     for (const param of (member as ConstructorDeclaration).parameters) {
                         if (isParameterPropertyDeclaration(param) && !isBindingPattern(param.name)) {
-                            addName(instanceNames, param.name, param.name.escapedText, Declaration.Property);
+                            addName(instanceNames, param.name, param.name.escapedText, DeclarationMeaning.GetOrSetAccessor);
                         }
                     }
                 }
@@ -25596,30 +25608,30 @@ namespace ts {
                     if (name && memberName) {
                         switch (member.kind) {
                             case SyntaxKind.GetAccessor:
-                                addName(names, name, memberName, Declaration.Getter);
+                                addName(names, name, memberName, DeclarationMeaning.GetAccessor);
                                 break;
 
                             case SyntaxKind.SetAccessor:
-                                addName(names, name, memberName, Declaration.Setter);
+                                addName(names, name, memberName, DeclarationMeaning.SetAccessor);
                                 break;
 
                             case SyntaxKind.PropertyDeclaration:
-                                addName(names, name, memberName, Declaration.Property);
+                                addName(names, name, memberName, DeclarationMeaning.GetOrSetAccessor);
                                 break;
 
                             case SyntaxKind.MethodDeclaration:
-                                addName(names, name, memberName, Declaration.Method);
+                                addName(names, name, memberName, DeclarationMeaning.Method);
                                 break;
                         }
                     }
                 }
             }
 
-            function addName(names: UnderscoreEscapedMap<Declaration>, location: Node, name: __String, meaning: Declaration) {
+            function addName(names: UnderscoreEscapedMap<DeclarationMeaning>, location: Node, name: __String, meaning: DeclarationMeaning) {
                 const prev = names.get(name);
                 if (prev) {
-                    if (prev & Declaration.Method) {
-                        if (meaning !== Declaration.Method) {
+                    if (prev & DeclarationMeaning.Method) {
+                        if (meaning !== DeclarationMeaning.Method) {
                             error(location, Diagnostics.Duplicate_identifier_0, getTextOfNode(location));
                         }
                     }
@@ -26333,12 +26345,6 @@ namespace ts {
             }
         }
 
-        const enum DeclarationSpaces {
-            None = 0,
-            ExportValue = 1 << 0,
-            ExportType = 1 << 1,
-            ExportNamespace = 1 << 2,
-        }
         function checkExportsOnMergedDeclarations(node: Node): void {
             if (!produceDiagnostics) {
                 return;
@@ -30247,16 +30253,6 @@ namespace ts {
             }
         }
 
-        function isNotAccessor(declaration: Declaration): boolean {
-            // Accessors check for their own matching duplicates, and in contexts where they are valid, there are already duplicate identifier checks
-            return !isAccessor(declaration);
-        }
-
-        function isNotOverload(declaration: Declaration): boolean {
-            return (declaration.kind !== SyntaxKind.FunctionDeclaration && declaration.kind !== SyntaxKind.MethodDeclaration) ||
-                    !!(declaration as FunctionDeclaration).body;
-        }
-
         function checkSourceElement(node: Node | undefined): void {
             if (node) {
                 const saveCurrentNode = currentNode;
@@ -32825,13 +32821,7 @@ namespace ts {
         }
 
         function checkGrammarObjectLiteralExpression(node: ObjectLiteralExpression, inDestructuring: boolean) {
-            const enum Flags {
-                Property = 1,
-                GetAccessor = 2,
-                SetAccessor = 4,
-                GetOrSetAccessor = GetAccessor | SetAccessor,
-            }
-            const seen = createUnderscoreEscapedMap<Flags>();
+            const seen = createUnderscoreEscapedMap<DeclarationMeaning>();
 
             for (const prop of node.properties) {
                 if (prop.kind === SyntaxKind.SpreadAssignment) {
@@ -32873,7 +32863,7 @@ namespace ts {
                 //    c.IsAccessorDescriptor(previous) is true and IsDataDescriptor(propId.descriptor) is true.
                 //    d.IsAccessorDescriptor(previous) is true and IsAccessorDescriptor(propId.descriptor) is true
                 // and either both previous and propId.descriptor have[[Get]] fields or both previous and propId.descriptor have[[Set]] fields
-                let currentKind: Flags;
+                let currentKind: DeclarationMeaning;
                 switch (prop.kind) {
                     case SyntaxKind.ShorthandPropertyAssignment:
                         checkGrammarForInvalidExclamationToken(prop.exclamationToken, Diagnostics.A_definite_assignment_assertion_is_not_permitted_in_this_context);
@@ -32884,15 +32874,16 @@ namespace ts {
                         if (name.kind === SyntaxKind.NumericLiteral) {
                             checkGrammarNumericLiteral(name);
                         }
-                        // falls through
+                        currentKind = DeclarationMeaning.PropertyAssignment;
+                        break;
                     case SyntaxKind.MethodDeclaration:
-                        currentKind = Flags.Property;
+                        currentKind = DeclarationMeaning.Method;
                         break;
                     case SyntaxKind.GetAccessor:
-                        currentKind = Flags.GetAccessor;
+                        currentKind = DeclarationMeaning.GetAccessor;
                         break;
                     case SyntaxKind.SetAccessor:
-                        currentKind = Flags.SetAccessor;
+                        currentKind = DeclarationMeaning.SetAccessor;
                         break;
                     default:
                         throw Debug.assertNever(prop, "Unexpected syntax kind:" + (<Node>prop).kind);
@@ -32908,11 +32899,11 @@ namespace ts {
                     seen.set(effectiveName, currentKind);
                 }
                 else {
-                    if (currentKind === Flags.Property && existingKind === Flags.Property) {
+                    if ((currentKind & DeclarationMeaning.PropertyAssignmentOrMethod) && (existingKind & DeclarationMeaning.PropertyAssignmentOrMethod)) {
                         grammarErrorOnNode(name, Diagnostics.Duplicate_identifier_0, getTextOfNode(name));
                     }
-                    else if ((currentKind & Flags.GetOrSetAccessor) && (existingKind & Flags.GetOrSetAccessor)) {
-                        if (existingKind !== Flags.GetOrSetAccessor && currentKind !== existingKind) {
+                    else if ((currentKind & DeclarationMeaning.GetOrSetAccessor) && (existingKind & DeclarationMeaning.GetOrSetAccessor)) {
+                        if (existingKind !== DeclarationMeaning.GetOrSetAccessor && currentKind !== existingKind) {
                             seen.set(effectiveName, currentKind | existingKind);
                         }
                         else {
@@ -33659,6 +33650,16 @@ namespace ts {
         }
     }
 
+    function isNotAccessor(declaration: Declaration): boolean {
+        // Accessors check for their own matching duplicates, and in contexts where they are valid, there are already duplicate identifier checks
+        return !isAccessor(declaration);
+    }
+
+    function isNotOverload(declaration: Declaration): boolean {
+        return (declaration.kind !== SyntaxKind.FunctionDeclaration && declaration.kind !== SyntaxKind.MethodDeclaration) ||
+                !!(declaration as FunctionDeclaration).body;
+    }
+
     /** Like 'isDeclarationName', but returns true for LHS of `import { x as y }` or `export { x as y }`. */
     function isDeclarationNameOrImportPropertyName(name: Node): boolean {
         switch (name.parent.kind) {

From 012bacc415f4b831de1eb8fbac803075c23e5d0a Mon Sep 17 00:00:00 2001
From: Alexander T <alexander.tarasyuk@outlook.com>
Date: Mon, 5 Aug 2019 19:24:09 +0300
Subject: [PATCH 105/151] Define interface for TSConfig. Change compilerOnSave
 to compileOnSave (#32481)

---
 src/compiler/commandLineParser.ts             | 16 ++++++++++++---
 src/testRunner/unittests/config/showConfig.ts | 20 +++++++++++++++++++
 .../tsconfig.json                             | 20 +++++++++++++++++++
 3 files changed, 53 insertions(+), 3 deletions(-)
 create mode 100644 tests/baselines/reference/showConfig/Show TSConfig with compileOnSave and more/tsconfig.json

diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts
index 2c4c867fb67..9ba03842cec 100644
--- a/src/compiler/commandLineParser.ts
+++ b/src/compiler/commandLineParser.ts
@@ -1743,6 +1743,16 @@ namespace ts {
         return false;
     }
 
+    /** @internal */
+    export interface TSConfig {
+        compilerOptions: CompilerOptions;
+        compileOnSave: boolean | undefined;
+        exclude?: ReadonlyArray<string>;
+        files: ReadonlyArray<string> | undefined;
+        include?: ReadonlyArray<string>;
+        references: ReadonlyArray<ProjectReference> | undefined;
+    }
+
     /**
      * Generate an uncommented, complete tsconfig for use with "--showConfig"
      * @param configParseResult options to be generated into tsconfig.json
@@ -1750,7 +1760,7 @@ namespace ts {
      * @param host provides current directory and case sensitivity services
      */
     /** @internal */
-    export function convertToTSConfig(configParseResult: ParsedCommandLine, configFileName: string, host: { getCurrentDirectory(): string, useCaseSensitiveFileNames: boolean }): object {
+    export function convertToTSConfig(configParseResult: ParsedCommandLine, configFileName: string, host: { getCurrentDirectory(): string, useCaseSensitiveFileNames: boolean }): TSConfig {
         const getCanonicalFileName = createGetCanonicalFileName(host.useCaseSensitiveFileNames);
         const files = map(
             filter(
@@ -1778,13 +1788,13 @@ namespace ts {
                 build: undefined,
                 version: undefined,
             },
-            references: map(configParseResult.projectReferences, r => ({ ...r, path: r.originalPath, originalPath: undefined })),
+            references: map(configParseResult.projectReferences, r => ({ ...r, path: r.originalPath ? r.originalPath : "", originalPath: undefined })),
             files: length(files) ? files : undefined,
             ...(configParseResult.configFileSpecs ? {
                 include: filterSameAsDefaultInclude(configParseResult.configFileSpecs.validatedIncludeSpecs),
                 exclude: configParseResult.configFileSpecs.validatedExcludeSpecs
             } : {}),
-            compilerOnSave: !!configParseResult.compileOnSave ? true : undefined
+            compileOnSave: !!configParseResult.compileOnSave ? true : undefined
         };
         return config;
     }
diff --git a/src/testRunner/unittests/config/showConfig.ts b/src/testRunner/unittests/config/showConfig.ts
index 043e8382d23..0a4acece37e 100644
--- a/src/testRunner/unittests/config/showConfig.ts
+++ b/src/testRunner/unittests/config/showConfig.ts
@@ -53,6 +53,26 @@ namespace ts {
 
         showTSConfigCorrectly("Show TSConfig with advanced options", ["--showConfig", "--declaration", "--declarationDir", "lib", "--skipLibCheck", "--noErrorTruncation"]);
 
+        showTSConfigCorrectly("Show TSConfig with compileOnSave and more", ["-p", "tsconfig.json"], {
+            compilerOptions: {
+                esModuleInterop: true,
+                target: "es5",
+                module: "commonjs",
+                strict: true,
+            },
+            compileOnSave: true,
+            exclude: [
+                "dist"
+            ],
+            files: [],
+            include: [
+                "src/*"
+            ],
+            references: [
+                { path: "./test" }
+            ],
+        });
+
         // Regression test for https://github.com/Microsoft/TypeScript/issues/28836
         showTSConfigCorrectly("Show TSConfig with paths and more", ["-p", "tsconfig.json"], {
     compilerOptions: {
diff --git a/tests/baselines/reference/showConfig/Show TSConfig with compileOnSave and more/tsconfig.json b/tests/baselines/reference/showConfig/Show TSConfig with compileOnSave and more/tsconfig.json
new file mode 100644
index 00000000000..373e81d1f75
--- /dev/null
+++ b/tests/baselines/reference/showConfig/Show TSConfig with compileOnSave and more/tsconfig.json	
@@ -0,0 +1,20 @@
+{
+    "compilerOptions": {
+        "esModuleInterop": true,
+        "target": "es5",
+        "module": "commonjs",
+        "strict": true
+    },
+    "references": [
+        {
+            "path": "./test"
+        }
+    ],
+    "include": [
+        "src/*"
+    ],
+    "exclude": [
+        "dist"
+    ],
+    "compileOnSave": true
+}

From c1e0db7953e0a2f558ae156fb7f4db2f77e356ed Mon Sep 17 00:00:00 2001
From: Andrew Branch <andrewbranch@users.noreply.github.com>
Date: Mon, 5 Aug 2019 09:31:59 -0700
Subject: [PATCH 106/151] Escape apparent substitution in synthesized
 NoSubstitutionTemplateLiterals (#32580)

* Add failing test

* Escape apparent substitution in synthesized NoSubstitutionTemplateLiterals
---
 src/compiler/utilities.ts                        | 13 ++++++++++++-
 ...ParamsToDestructuredObject_templateLiteral.ts | 16 ++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 tests/cases/fourslash/refactorConvertParamsToDestructuredObject_templateLiteral.ts

diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index 91e6515f664..4ca13e663ab 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -566,6 +566,8 @@ namespace ts {
         return emitNode && emitNode.flags || 0;
     }
 
+    const escapeNoSubstitutionTemplateLiteralText = compose(escapeString, escapeTemplateSubstitution);
+    const escapeNonAsciiNoSubstitutionTemplateLiteralText = compose(escapeNonAsciiString, escapeTemplateSubstitution);
     export function getLiteralText(node: LiteralLikeNode, sourceFile: SourceFile, neverAsciiEscape: boolean | undefined) {
         // If we don't need to downlevel and we can reach the original source text using
         // the node's parent reference, then simply get the text as it was originally written.
@@ -576,7 +578,11 @@ namespace ts {
             return getSourceTextOfNodeFromSourceFile(sourceFile, node);
         }
 
-        const escapeText = neverAsciiEscape || (getEmitFlags(node) & EmitFlags.NoAsciiEscaping) ? escapeString : escapeNonAsciiString;
+        // If a NoSubstitutionTemplateLiteral appears to have a substitution in it, the original text
+        // had to include a backslash: `not \${a} substitution`.
+        const escapeText = neverAsciiEscape || (getEmitFlags(node) & EmitFlags.NoAsciiEscaping) ?
+            node.kind === SyntaxKind.NoSubstitutionTemplateLiteral ? escapeNoSubstitutionTemplateLiteralText : escapeString :
+            node.kind === SyntaxKind.NoSubstitutionTemplateLiteral ? escapeNonAsciiNoSubstitutionTemplateLiteralText : escapeNonAsciiString;
 
         // If we can't reach the original source text, use the canonical form if it's a number,
         // or a (possibly escaped) quoted form of the original text if it's string-like.
@@ -3113,6 +3119,11 @@ namespace ts {
         }
     }
 
+    const templateSubstitutionRegExp = /\$\{/g;
+    function escapeTemplateSubstitution(str: string): string {
+        return str.replace(templateSubstitutionRegExp, "\\${");
+    }
+
     // This consists of the first 19 unprintable ASCII characters, canonical escapes, lineSeparator,
     // paragraphSeparator, and nextLine. The latter three are just desirable to suppress new lines in
     // the language service. These characters should be escaped when printing, and if any characters are added,
diff --git a/tests/cases/fourslash/refactorConvertParamsToDestructuredObject_templateLiteral.ts b/tests/cases/fourslash/refactorConvertParamsToDestructuredObject_templateLiteral.ts
new file mode 100644
index 00000000000..1075fb7dddb
--- /dev/null
+++ b/tests/cases/fourslash/refactorConvertParamsToDestructuredObject_templateLiteral.ts
@@ -0,0 +1,16 @@
+/// <reference path='fourslash.ts' />
+
+////function /*a*/insert/*b*/(template: string, overwriteBefore = 0) {}
+////insert(`this is \${not} a substitution`);
+
+
+goTo.select("a", "b");
+edit.applyRefactor({
+    refactorName: "Convert parameters to destructured object",
+    actionName: "Convert parameters to destructured object",
+    actionDescription: "Convert parameters to destructured object",
+    newContent: [
+      'function insert({ template, overwriteBefore = 0 }: { template: string; overwriteBefore?: number; }) {}',
+      'insert({ template: `this is \\${not} a substitution` });'
+    ].join('\n')
+});

From 33a65097519c0fc449abbd8160ab84f0400b40ea Mon Sep 17 00:00:00 2001
From: sisisin <azsisisin@gmail.com>
Date: Tue, 6 Aug 2019 04:00:06 +0900
Subject: [PATCH 107/151] Fixes export destructured variables reference
 (#32007)

* Add basic test for current behavior

* Fixes getting destructured variables references(#31922)

* Add test case that renames destructured property

* Fixes missing nested object destrucuturing variable references
---
 src/services/importTracker.ts                 |   8 +-
 src/testRunner/tsconfig.json                  |   1 +
 .../unittests/tsserver/declarationFileMaps.ts |  20 --
 .../unittests/tsserver/getExportReferences.ts | 185 ++++++++++++++++++
 src/testRunner/unittests/tsserver/helpers.ts  |  16 ++
 5 files changed, 206 insertions(+), 24 deletions(-)
 create mode 100644 src/testRunner/unittests/tsserver/getExportReferences.ts

diff --git a/src/services/importTracker.ts b/src/services/importTracker.ts
index 2734d059000..dc5e5a1a9d8 100644
--- a/src/services/importTracker.ts
+++ b/src/services/importTracker.ts
@@ -577,10 +577,10 @@ namespace ts.FindAllReferences {
     // If a reference is a class expression, the exported node would be its parent.
     // If a reference is a variable declaration, the exported node would be the variable statement.
     function getExportNode(parent: Node, node: Node): Node | undefined {
-        if (parent.kind === SyntaxKind.VariableDeclaration) {
-            const p = parent as VariableDeclaration;
-            return p.name !== node ? undefined :
-                p.parent.kind === SyntaxKind.CatchClause ? undefined : p.parent.parent.kind === SyntaxKind.VariableStatement ? p.parent.parent : undefined;
+        const declaration = isVariableDeclaration(parent) ? parent : isBindingElement(parent) ? walkUpBindingElementsAndPatterns(parent) : undefined;
+        if (declaration) {
+            return (parent as VariableDeclaration | BindingElement).name !== node ? undefined :
+                isCatchClause(declaration.parent) ? undefined : isVariableStatement(declaration.parent.parent) ? declaration.parent.parent : undefined;
         }
         else {
             return parent;
diff --git a/src/testRunner/tsconfig.json b/src/testRunner/tsconfig.json
index 7d0cea1ea64..8c8e90c8d9f 100644
--- a/src/testRunner/tsconfig.json
+++ b/src/testRunner/tsconfig.json
@@ -131,6 +131,7 @@
         "unittests/tsserver/formatSettings.ts",
         "unittests/tsserver/getApplicableRefactors.ts",
         "unittests/tsserver/getEditsForFileRename.ts",
+        "unittests/tsserver/getExportReferences.ts",
         "unittests/tsserver/importHelpers.ts",
         "unittests/tsserver/inferredProjects.ts",
         "unittests/tsserver/languageService.ts",
diff --git a/src/testRunner/unittests/tsserver/declarationFileMaps.ts b/src/testRunner/unittests/tsserver/declarationFileMaps.ts
index 0f8af3c414e..734af2a68fe 100644
--- a/src/testRunner/unittests/tsserver/declarationFileMaps.ts
+++ b/src/testRunner/unittests/tsserver/declarationFileMaps.ts
@@ -1,11 +1,4 @@
 namespace ts.projectSystem {
-    interface DocumentSpanFromSubstring {
-        file: File;
-        text: string;
-        options?: SpanFromSubstringOptions;
-        contextText?: string;
-        contextOptions?: SpanFromSubstringOptions;
-    }
     function documentSpanFromSubstring({ file, text, contextText, options, contextOptions }: DocumentSpanFromSubstring): DocumentSpan {
         const contextSpan = contextText !== undefined ? documentSpanFromSubstring({ file, text: contextText, options: contextOptions }) : undefined;
         return {
@@ -19,19 +12,6 @@ namespace ts.projectSystem {
         return documentSpanFromSubstring(input);
     }
 
-    interface MakeReferenceItem extends DocumentSpanFromSubstring {
-        isDefinition: boolean;
-        lineText: string;
-    }
-    function makeReferenceItem({ isDefinition, lineText, ...rest }: MakeReferenceItem): protocol.ReferencesResponseItem {
-        return {
-            ...protocolFileSpanWithContextFromSubstring(rest),
-            isDefinition,
-            isWriteAccess: isDefinition,
-            lineText,
-        };
-    }
-
     interface MakeReferenceEntry extends DocumentSpanFromSubstring {
         isDefinition: boolean;
     }
diff --git a/src/testRunner/unittests/tsserver/getExportReferences.ts b/src/testRunner/unittests/tsserver/getExportReferences.ts
new file mode 100644
index 00000000000..45bd08e39b8
--- /dev/null
+++ b/src/testRunner/unittests/tsserver/getExportReferences.ts
@@ -0,0 +1,185 @@
+namespace ts.projectSystem {
+    describe("unittests:: tsserver:: getExportReferences", () => {
+        const exportVariable = "export const value = 0;";
+        const exportArrayDestructured = "export const [valueA, valueB] = [0, 1];";
+        const exportObjectDestructured = "export const { valueC, valueD: renamedD } = { valueC: 0, valueD: 1 };";
+        const exportNestedObject = "export const { nest: [valueE, { valueF }] } = { nest: [0, { valueF: 1 }] };";
+
+        const mainTs: File = {
+            path: "/main.ts",
+            content: 'import { value, valueA, valueB, valueC, renamedD, valueE, valueF } from "./mod";',
+        };
+        const modTs: File = {
+            path: "/mod.ts",
+            content: `${exportVariable}
+${exportArrayDestructured}
+${exportObjectDestructured}
+${exportNestedObject}
+`,
+        };
+        const tsconfig: File = {
+            path: "/tsconfig.json",
+            content: "{}",
+        };
+
+        function makeSampleSession() {
+            const host = createServerHost([mainTs, modTs, tsconfig]);
+            const session = createSession(host);
+            openFilesForSession([mainTs, modTs], session);
+            return session;
+        }
+
+        const referenceMainTs = (mainTs: File, text: string): protocol.ReferencesResponseItem =>
+            makeReferenceItem({
+                file: mainTs,
+                isDefinition: true,
+                lineText: mainTs.content,
+                contextText: mainTs.content,
+                text,
+            });
+
+        const referenceModTs = (
+            texts: { text: string; lineText: string; contextText?: string },
+            override: Partial<MakeReferenceItem> = {},
+        ): protocol.ReferencesResponseItem =>
+            makeReferenceItem({
+                file: modTs,
+                isDefinition: true,
+                ...texts,
+                ...override,
+            });
+
+        it("should get const variable declaration references", () => {
+            const session = makeSampleSession();
+
+            const response = executeSessionRequest<protocol.ReferencesRequest, protocol.ReferencesResponse>(
+                session,
+                protocol.CommandTypes.References,
+                protocolFileLocationFromSubstring(modTs, "value"),
+            );
+
+            const expectResponse = {
+                refs: [
+                    referenceModTs({ text: "value", lineText: exportVariable, contextText: exportVariable }),
+                    referenceMainTs(mainTs, "value"),
+                ],
+                symbolDisplayString: "const value: 0",
+                symbolName: "value",
+                symbolStartOffset: protocolLocationFromSubstring(modTs.content, "value").offset,
+            };
+
+            assert.deepEqual(response, expectResponse);
+        });
+
+        it("should get array destructuring declaration references", () => {
+            const session = makeSampleSession();
+            const response = executeSessionRequest<protocol.ReferencesRequest, protocol.ReferencesResponse>(
+                session,
+                protocol.CommandTypes.References,
+                protocolFileLocationFromSubstring(modTs, "valueA"),
+            );
+
+            const expectResponse = {
+                refs: [
+                    referenceModTs({
+                        text: "valueA",
+                        lineText: exportArrayDestructured,
+                        contextText: exportArrayDestructured,
+                    }),
+                    referenceMainTs(mainTs, "valueA"),
+                ],
+                symbolDisplayString: "const valueA: number",
+                symbolName: "valueA",
+                symbolStartOffset: protocolLocationFromSubstring(modTs.content, "valueA").offset,
+            };
+
+            assert.deepEqual(response, expectResponse);
+        });
+
+        it("should get object destructuring declaration references", () => {
+            const session = makeSampleSession();
+            const response = executeSessionRequest<protocol.ReferencesRequest, protocol.ReferencesResponse>(
+                session,
+                protocol.CommandTypes.References,
+                protocolFileLocationFromSubstring(modTs, "valueC"),
+            );
+            const expectResponse = {
+                refs: [
+                    referenceModTs({
+                        text: "valueC",
+                        lineText: exportObjectDestructured,
+                        contextText: exportObjectDestructured,
+                    }),
+                    referenceMainTs(mainTs, "valueC"),
+                    referenceModTs(
+                        { text: "valueC", lineText: exportObjectDestructured, contextText: "valueC: 0" },
+                        { options: { index: 1 } },
+                    ),
+                ],
+                symbolDisplayString: "const valueC: number",
+                symbolName: "valueC",
+                symbolStartOffset: protocolLocationFromSubstring(modTs.content, "valueC").offset,
+            };
+
+            assert.deepEqual(response, expectResponse);
+        });
+
+        it("should get object declaration references that renames destructured property", () => {
+            const session = makeSampleSession();
+            const response = executeSessionRequest<protocol.ReferencesRequest, protocol.ReferencesResponse>(
+                session,
+                protocol.CommandTypes.References,
+                protocolFileLocationFromSubstring(modTs, "renamedD"),
+            );
+
+            const expectResponse = {
+                refs: [
+                    referenceModTs({
+                        text: "renamedD",
+                        lineText: exportObjectDestructured,
+                        contextText: exportObjectDestructured,
+                    }),
+                    referenceMainTs(mainTs, "renamedD"),
+                ],
+                symbolDisplayString: "const renamedD: number",
+                symbolName: "renamedD",
+                symbolStartOffset: protocolLocationFromSubstring(modTs.content, "renamedD").offset,
+            };
+
+            assert.deepEqual(response, expectResponse);
+        });
+
+        it("should get nested object declaration references", () => {
+            const session = makeSampleSession();
+            const response = executeSessionRequest<protocol.ReferencesRequest, protocol.ReferencesResponse>(
+                session,
+                protocol.CommandTypes.References,
+                protocolFileLocationFromSubstring(modTs, "valueF"),
+            );
+
+            const expectResponse = {
+                refs: [
+                    referenceModTs({
+                        text: "valueF",
+                        lineText: exportNestedObject,
+                        contextText: exportNestedObject,
+                    }),
+                    referenceMainTs(mainTs, "valueF"),
+                    referenceModTs(
+                        {
+                            text: "valueF",
+                            lineText: exportNestedObject,
+                            contextText: "valueF: 1",
+                        },
+                        { options: { index: 1 } },
+                    ),
+                ],
+                symbolDisplayString: "const valueF: number",
+                symbolName: "valueF",
+                symbolStartOffset: protocolLocationFromSubstring(modTs.content, "valueF").offset,
+            };
+
+            assert.deepEqual(response, expectResponse);
+        });
+    });
+}
diff --git a/src/testRunner/unittests/tsserver/helpers.ts b/src/testRunner/unittests/tsserver/helpers.ts
index 63b854e8ce8..e6baba932f5 100644
--- a/src/testRunner/unittests/tsserver/helpers.ts
+++ b/src/testRunner/unittests/tsserver/helpers.ts
@@ -519,6 +519,8 @@ namespace ts.projectSystem {
         file: File;
         text: string;
         options?: SpanFromSubstringOptions;
+        contextText?: string;
+        contextOptions?: SpanFromSubstringOptions;
     }
     export function protocolFileSpanFromSubstring({ file, text, options }: DocumentSpanFromSubstring): protocol.FileSpan {
         return { file: file.path, ...protocolTextSpanFromSubstring(file.content, text, options) };
@@ -727,4 +729,18 @@ namespace ts.projectSystem {
             assert.strictEqual(outputs.length, index + 1, JSON.stringify(outputs));
         }
     }
+
+    export interface MakeReferenceItem extends DocumentSpanFromSubstring {
+        isDefinition: boolean;
+        lineText: string;
+    }
+
+    export function makeReferenceItem({ isDefinition, lineText, ...rest }: MakeReferenceItem): protocol.ReferencesResponseItem {
+        return {
+            ...protocolFileSpanWithContextFromSubstring(rest),
+            isDefinition,
+            isWriteAccess: isDefinition,
+            lineText,
+        };
+    }
 }

From f6fb1305309daff8f5c8f0e2e6641e15afce3875 Mon Sep 17 00:00:00 2001
From: Michael Crane <micran@microsoft.com>
Date: Mon, 5 Aug 2019 15:19:25 -0700
Subject: [PATCH 108/151] Add 'readFileWorker' instead of modifying 'readFile'

---
 src/compiler/sys.ts | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/compiler/sys.ts b/src/compiler/sys.ts
index f2f14c581e2..300086b72e0 100644
--- a/src/compiler/sys.ts
+++ b/src/compiler/sys.ts
@@ -1086,14 +1086,12 @@ namespace ts {
                 return (directoryName, callback) => fsWatchFile(directoryName, () => callback(directoryName), PollingInterval.Medium);
             }
 
-            function readFile(fileName: string, _encoding?: string): string | undefined {
-                perfLogger.logStartReadFile(fileName);
+            function readFileWorker(fileName: string, _encoding?: string): string | undefined {
                 if (!fileExists(fileName)) {
                     return undefined;
                 }
                 const buffer = _fs.readFileSync(fileName);
                 let len = buffer.length;
-                let result: string;
                 if (len >= 2 && buffer[0] === 0xFE && buffer[1] === 0xFF) {
                     // Big endian UTF-16 byte order mark detected. Since big endian is not supported by node.js,
                     // flip all byte pairs and treat as little endian.
@@ -1103,22 +1101,25 @@ namespace ts {
                         buffer[i] = buffer[i + 1];
                         buffer[i + 1] = temp;
                     }
-                    result = buffer.toString("utf16le", 2);
+                    return buffer.toString("utf16le", 2);
                 }
-                else if (len >= 2 && buffer[0] === 0xFF && buffer[1] === 0xFE) {
+                if (len >= 2 && buffer[0] === 0xFF && buffer[1] === 0xFE) {
                     // Little endian UTF-16 byte order mark detected
-                    result = buffer.toString("utf16le", 2);
+                    return buffer.toString("utf16le", 2);
                 }
-                else if (len >= 3 && buffer[0] === 0xEF && buffer[1] === 0xBB && buffer[2] === 0xBF) {
+                if (len >= 3 && buffer[0] === 0xEF && buffer[1] === 0xBB && buffer[2] === 0xBF) {
                     // UTF-8 byte order mark detected
-                    result = buffer.toString("utf8", 3);
-                }
-                else {
-                    // Default is UTF-8 with no byte order mark
-                    result = buffer.toString("utf8");
+                    return buffer.toString("utf8", 3);
                 }
+                // Default is UTF-8 with no byte order mark
+                return buffer.toString("utf8");
+            }
+
+            function readFile(fileName: string, _encoding?: string): string | undefined {
+                perfLogger.logStartReadFile(fileName);
+                const file = readFileWorker(fileName, _encoding);
                 perfLogger.logStopReadFile();
-                return result;
+                return file;
             }
 
             function writeFile(fileName: string, data: string, writeByteOrderMark?: boolean): void {

From 4df2fc663c03e3b7317c7c5919dec663c8087ff5 Mon Sep 17 00:00:00 2001
From: Ron Buckton <ron.buckton@microsoft.com>
Date: Mon, 5 Aug 2019 16:19:38 -0700
Subject: [PATCH 109/151] Do not include built/local/enu when producing LKG
 (#32723)

---
 lib/enu/diagnosticMessages.generated.json.lcg | 7664 -----------------
 scripts/produceLKG.ts                         |    2 +-
 2 files changed, 1 insertion(+), 7665 deletions(-)
 delete mode 100644 lib/enu/diagnosticMessages.generated.json.lcg

diff --git a/lib/enu/diagnosticMessages.generated.json.lcg b/lib/enu/diagnosticMessages.generated.json.lcg
deleted file mode 100644
index 77e5d6f2236..00000000000
--- a/lib/enu/diagnosticMessages.generated.json.lcg
+++ /dev/null
@@ -1,7664 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LCX SchemaVersion="6.0" Name="diagnosticMessages.generated.json" PsrId="306" FileType="1" SrcCul="en-US" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
-  <OwnedComments>
-    <Cmt Name="Dev" />
-    <Cmt Name="LcxAdmin" />
-    <Cmt Name="Rccx" />
-  </OwnedComments>
-  <Item ItemId=";String Table" ItemType="0" PsrId="306" Leaf="false">
-    <Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
-    <Item ItemId=";Strings" ItemType="0" PsrId="306" Leaf="false">
-      <Disp Icon="Str" Disp="true" LocTbl="false" />
-            <Item ItemId=";A_0_modifier_cannot_be_used_with_an_import_declaration_1079" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A '{0}' modifier cannot be used with an import declaration.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_0_modifier_cannot_be_used_with_an_interface_declaration_1045" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A '{0}' modifier cannot be used with an interface declaration.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_0_parameter_must_be_the_first_parameter_2680" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A '{0}' parameter must be the first parameter.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_bigint_literal_cannot_use_exponential_notation_1352" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A bigint literal cannot use exponential notation.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_bigint_literal_must_be_an_integer_1353" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A bigint literal must be an integer.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_binding_pattern_parameter_cannot_be_optional_in_an_implementation_signature_2463" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A binding pattern parameter cannot be optional in an implementation signature.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_break_statement_can_only_be_used_within_an_enclosing_iteration_or_switch_statement_1105" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A 'break' statement can only be used within an enclosing iteration or switch statement.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_break_statement_can_only_jump_to_a_label_of_an_enclosing_statement_1116" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A 'break' statement can only jump to a label of an enclosing statement.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_class_can_only_implement_an_identifier_Slashqualified_name_with_optional_type_arguments_2500" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A class can only implement an identifier/qualified-name with optional type arguments.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_class_can_only_implement_an_object_type_or_intersection_of_object_types_with_statically_known_memb_2422" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A class can only implement an object type or intersection of object types with statically known members.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_class_declaration_without_the_default_modifier_must_have_a_name_1211" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A class declaration without the 'default' modifier must have a name.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_class_may_only_extend_another_class_2311" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A class may only extend another class.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_class_member_cannot_have_the_0_keyword_1248" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A class member cannot have the '{0}' keyword.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_comma_expression_is_not_allowed_in_a_computed_property_name_1171" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A comma expression is not allowed in a computed property name.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_computed_property_name_cannot_reference_a_type_parameter_from_its_containing_type_2467" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A computed property name cannot reference a type parameter from its containing type.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_computed_property_name_in_a_class_property_declaration_must_refer_to_an_expression_whose_type_is_a_1166" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A computed property name in a class property declaration must refer to an expression whose type is a literal type or a 'unique symbol' type.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_computed_property_name_in_a_method_overload_must_refer_to_an_expression_whose_type_is_a_literal_ty_1168" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A computed property name in a method overload must refer to an expression whose type is a literal type or a 'unique symbol' type.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_computed_property_name_in_a_type_literal_must_refer_to_an_expression_whose_type_is_a_literal_type__1170" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A computed property name in a type literal must refer to an expression whose type is a literal type or a 'unique symbol' type.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_computed_property_name_in_an_ambient_context_must_refer_to_an_expression_whose_type_is_a_literal_t_1165" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A computed property name in an ambient context must refer to an expression whose type is a literal type or a 'unique symbol' type.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_computed_property_name_in_an_interface_must_refer_to_an_expression_whose_type_is_a_literal_type_or_1169" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A computed property name in an interface must refer to an expression whose type is a literal type or a 'unique symbol' type.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_computed_property_name_must_be_of_type_string_number_symbol_or_any_2464" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A computed property name must be of type 'string', 'number', 'symbol', or 'any'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_computed_property_name_of_the_form_0_must_be_of_type_symbol_2471" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A computed property name of the form '{0}' must be of type 'symbol'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_const_assertions_can_only_be_applied_to_references_to_enum_members_or_string_number_boolean_array__1355" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A 'const' assertions can only be applied to references to enum members, or string, number, boolean, array, or object literals.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_const_enum_member_can_only_be_accessed_using_a_string_literal_2476" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A const enum member can only be accessed using a string literal.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_const_initializer_in_an_ambient_context_must_be_a_string_or_numeric_literal_or_literal_enum_refere_1254" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A 'const' initializer in an ambient context must be a string or numeric literal or literal enum reference.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_constructor_cannot_contain_a_super_call_when_its_class_extends_null_17005" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A constructor cannot contain a 'super' call when its class extends 'null'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_constructor_cannot_have_a_this_parameter_2681" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A constructor cannot have a 'this' parameter.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_continue_statement_can_only_be_used_within_an_enclosing_iteration_statement_1104" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A 'continue' statement can only be used within an enclosing iteration statement.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement_1115" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A 'continue' statement can only jump to a label of an enclosing iteration statement.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_declare_modifier_cannot_be_used_in_an_already_ambient_context_1038" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A 'declare' modifier cannot be used in an already ambient context.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_decorator_can_only_decorate_a_method_implementation_not_an_overload_1249" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A decorator can only decorate a method implementation, not an overload.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_default_clause_cannot_appear_more_than_once_in_a_switch_statement_1113" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A 'default' clause cannot appear more than once in a 'switch' statement.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_default_export_can_only_be_used_in_an_ECMAScript_style_module_1319" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A default export can only be used in an ECMAScript-style module.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_definite_assignment_assertion_is_not_permitted_in_this_context_1255" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A definite assignment assertion '!' is not permitted in this context.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_destructuring_declaration_must_have_an_initializer_1182" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A destructuring declaration must have an initializer.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_dynamic_import_call_in_ES5_SlashES3_requires_the_Promise_constructor_Make_sure_you_have_a_declarat_2712" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A dynamic import call in ES5/ES3 requires the 'Promise' constructor.  Make sure you have a declaration for the 'Promise' constructor or include 'ES2015' in your `--lib` option.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_dynamic_import_call_returns_a_Promise_Make_sure_you_have_a_declaration_for_Promise_or_include_ES20_2711" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A dynamic import call returns a 'Promise'. Make sure you have a declaration for 'Promise' or include 'ES2015' in your `--lib` option.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_file_cannot_have_a_reference_to_itself_1006" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A file cannot have a reference to itself.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_for_await_of_statement_is_only_allowed_within_an_async_function_or_async_generator_1103" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A 'for-await-of' statement is only allowed within an async function or async generator.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_function_returning_never_cannot_have_a_reachable_end_point_2534" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A function returning 'never' cannot have a reachable end point.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_function_that_is_called_with_the_new_keyword_cannot_have_a_this_type_that_is_void_2679" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A function that is called with the 'new' keyword cannot have a 'this' type that is 'void'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value_2355" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A function whose declared type is neither 'void' nor 'any' must return a value.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_generator_cannot_have_a_void_type_annotation_2505" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A generator cannot have a 'void' type annotation.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_get_accessor_cannot_have_parameters_1054" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A 'get' accessor cannot have parameters.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_get_accessor_must_return_a_value_2378" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A 'get' accessor must return a value.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_label_is_not_allowed_here_1344" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['A label is not allowed here.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_member_initializer_in_a_enum_declaration_cannot_reference_members_declared_after_it_including_memb_2651" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A member initializer in a enum declaration cannot reference members declared after it, including members defined in other enums.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_mixin_class_must_have_a_constructor_with_a_single_rest_parameter_of_type_any_2545" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A mixin class must have a constructor with a single rest parameter of type 'any[]5D;'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_module_cannot_have_multiple_default_exports_2528" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A module cannot have multiple default exports.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_namespace_declaration_cannot_be_in_a_different_file_from_a_class_or_function_with_which_it_is_merg_2433" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A namespace declaration cannot be in a different file from a class or function with which it is merged.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_namespace_declaration_cannot_be_located_prior_to_a_class_or_function_with_which_it_is_merged_2434" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A namespace declaration cannot be located prior to a class or function with which it is merged.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_namespace_declaration_is_only_allowed_in_a_namespace_or_module_1235" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A namespace declaration is only allowed in a namespace or module.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_non_dry_build_would_build_project_0_6357" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A non-dry build would build project '{0}']]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_non_dry_build_would_delete_the_following_files_Colon_0_6356" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A non-dry build would delete the following files: {0}]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_non_dry_build_would_update_output_of_project_0_6375" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A non-dry build would update output of project '{0}']]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_non_dry_build_would_update_timestamps_for_output_of_project_0_6374" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A non-dry build would update timestamps for output of project '{0}']]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_parameter_initializer_is_only_allowed_in_a_function_or_constructor_implementation_2371" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A parameter initializer is only allowed in a function or constructor implementation.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_parameter_property_cannot_be_declared_using_a_rest_parameter_1317" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A parameter property cannot be declared using a rest parameter.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_parameter_property_is_only_allowed_in_a_constructor_implementation_2369" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A parameter property is only allowed in a constructor implementation.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_parameter_property_may_not_be_declared_using_a_binding_pattern_1187" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A parameter property may not be declared using a binding pattern.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_path_in_an_extends_option_must_be_relative_or_rooted_but_0_is_not_18001" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A path in an 'extends' option must be relative or rooted, but '{0}' is not.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_promise_must_have_a_then_method_1059" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A promise must have a 'then' method.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_property_of_a_class_whose_type_is_a_unique_symbol_type_must_be_both_static_and_readonly_1331" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A property of a class whose type is a 'unique symbol' type must be both 'static' and 'readonly'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_property_of_an_interface_or_type_literal_whose_type_is_a_unique_symbol_type_must_be_readonly_1330" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A property of an interface or type literal whose type is a 'unique symbol' type must be 'readonly'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_required_element_cannot_follow_an_optional_element_1257" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A required element cannot follow an optional element.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_required_parameter_cannot_follow_an_optional_parameter_1016" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A required parameter cannot follow an optional parameter.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_rest_element_cannot_contain_a_binding_pattern_2501" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A rest element cannot contain a binding pattern.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_rest_element_cannot_have_a_property_name_2566" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A rest element cannot have a property name.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_rest_element_cannot_have_an_initializer_1186" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A rest element cannot have an initializer.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_rest_element_must_be_last_in_a_destructuring_pattern_2462" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A rest element must be last in a destructuring pattern.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_rest_element_must_be_last_in_a_tuple_type_1256" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A rest element must be last in a tuple type.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_rest_element_type_must_be_an_array_type_2574" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A rest element type must be an array type.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_rest_parameter_cannot_be_optional_1047" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A rest parameter cannot be optional.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_rest_parameter_cannot_have_an_initializer_1048" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A rest parameter cannot have an initializer.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_rest_parameter_must_be_last_in_a_parameter_list_1014" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A rest parameter must be last in a parameter list.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_rest_parameter_must_be_of_an_array_type_2370" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A rest parameter must be of an array type.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_rest_parameter_or_binding_pattern_may_not_have_a_trailing_comma_1013" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A rest parameter or binding pattern may not have a trailing comma.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_return_statement_can_only_be_used_within_a_function_body_1108" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A 'return' statement can only be used within a function body.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_series_of_entries_which_re_map_imports_to_lookup_locations_relative_to_the_baseUrl_6167" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A series of entries which re-map imports to lookup locations relative to the 'baseUrl'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_set_accessor_cannot_have_a_return_type_annotation_1095" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A 'set' accessor cannot have a return type annotation.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_set_accessor_cannot_have_an_optional_parameter_1051" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A 'set' accessor cannot have an optional parameter.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_set_accessor_cannot_have_rest_parameter_1053" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A 'set' accessor cannot have rest parameter.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_set_accessor_must_have_exactly_one_parameter_1049" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A 'set' accessor must have exactly one parameter.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_set_accessor_parameter_cannot_have_an_initializer_1052" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A 'set' accessor parameter cannot have an initializer.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_signature_with_an_implementation_cannot_use_a_string_literal_type_2381" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A signature with an implementation cannot use a string literal type.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_super_call_must_be_the_first_statement_in_the_constructor_when_a_class_contains_initialized_proper_2376" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_this_based_type_guard_is_not_compatible_with_a_parameter_based_type_guard_2518" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A 'this'-based type guard is not compatible with a parameter-based type guard.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_this_type_is_available_only_in_a_non_static_member_of_a_class_or_interface_2526" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A 'this' type is available only in a non-static member of a class or interface.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_tsconfig_json_file_is_already_defined_at_Colon_0_5054" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A 'tsconfig.json' file is already defined at: '{0}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_type_assertion_expression_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Con_17007" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A type assertion expression is not allowed in the left-hand side of an exponentiation expression. Consider enclosing the expression in parentheses.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_type_literal_property_cannot_have_an_initializer_1247" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A type literal property cannot have an initializer.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_type_predicate_cannot_reference_a_rest_parameter_1229" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A type predicate cannot reference a rest parameter.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_type_predicate_cannot_reference_element_0_in_a_binding_pattern_1230" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A type predicate cannot reference element '{0}' in a binding pattern.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_type_predicate_is_only_allowed_in_return_type_position_for_functions_and_methods_1228" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A type predicate is only allowed in return type position for functions and methods.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_type_predicate_s_type_must_be_assignable_to_its_parameter_s_type_2677" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A type predicate's type must be assignable to its parameter's type.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_variable_whose_type_is_a_unique_symbol_type_must_be_const_1332" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A variable whose type is a 'unique symbol' type must be 'const'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";A_yield_expression_is_only_allowed_in_a_generator_body_1163" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[A 'yield' expression is only allowed in a generator body.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Abstract_method_0_in_class_1_cannot_be_accessed_via_super_expression_2513" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Abstract method '{0}' in class '{1}' cannot be accessed via super expression.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Abstract_methods_can_only_appear_within_an_abstract_class_1244" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Abstract methods can only appear within an abstract class.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Abstract_property_0_in_class_1_cannot_be_accessed_in_the_constructor_2715" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Abstract property '{0}' in class '{1}' cannot be accessed in the constructor.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Accessibility_modifier_already_seen_1028" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Accessibility modifier already seen.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Accessors_are_only_available_when_targeting_ECMAScript_5_and_higher_1056" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Accessors are only available when targeting ECMAScript 5 and higher.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Accessors_must_both_be_abstract_or_non_abstract_2676" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Accessors must both be abstract or non-abstract.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Add_0_to_existing_import_declaration_from_1_90015" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Add '{0}' to existing import declaration from "{1}"]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Add_0_to_unresolved_variable_90008" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Add '{0}.' to unresolved variable]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Add_all_missing_async_modifiers_95041" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Add all missing 'async' modifiers]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Add_all_missing_imports_95064" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Add all missing imports]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Add_all_missing_members_95022" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Add all missing members]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Add_all_missing_super_calls_95039" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Add all missing super calls]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Add_async_modifier_to_containing_function_90029" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Add async modifier to containing function]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Add_await_95083" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Add 'await']]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Add_await_to_initializer_for_0_95084" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Add 'await' to initializer for '{0}']]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Add_braces_to_arrow_function_95059" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Add braces to arrow function]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Add_const_to_all_unresolved_variables_95082" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Add 'const' to all unresolved variables]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Add_const_to_unresolved_variable_95081" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Add 'const' to unresolved variable]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Add_default_import_0_to_existing_import_declaration_from_1_90033" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Add default import '{0}' to existing import declaration from "{1}"]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Add_definite_assignment_assertion_to_property_0_95020" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Add definite assignment assertion to property '{0}']]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Add_definite_assignment_assertions_to_all_uninitialized_properties_95028" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Add definite assignment assertions to all uninitialized properties]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Add_index_signature_for_property_0_90017" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Add index signature for property '{0}']]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Add_initializer_to_property_0_95019" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Add initializer to property '{0}']]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Add_initializers_to_all_uninitialized_properties_95027" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Add initializers to all uninitialized properties]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Add_missing_enum_member_0_95063" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Add missing enum member '{0}']]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Add_missing_new_operator_to_all_calls_95072" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Add missing 'new' operator to all calls]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Add_missing_new_operator_to_call_95071" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Add missing 'new' operator to call]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Add_missing_super_call_90001" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Add missing 'super()' call]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Add_missing_typeof_95052" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Add missing 'typeof']]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Add_names_to_all_parameters_without_names_95073" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Add names to all parameters without names]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Add_or_remove_braces_in_an_arrow_function_95058" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Add or remove braces in an arrow function]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Add_parameter_name_90034" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Add parameter name]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Add_qualifier_to_all_unresolved_variables_matching_a_member_name_95037" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Add qualifier to all unresolved variables matching a member name]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Add_to_all_uncalled_decorators_95044" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Add '()' to all uncalled decorators]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Add_ts_ignore_to_all_error_messages_95042" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Add '@ts-ignore' to all error messages]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Add_undefined_type_to_all_uninitialized_properties_95029" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Add undefined type to all uninitialized properties]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Add_undefined_type_to_property_0_95018" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Add 'undefined' type to property '{0}']]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Add_unknown_conversion_for_non_overlapping_types_95069" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Add 'unknown' conversion for non-overlapping types]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Add_unknown_to_all_conversions_of_non_overlapping_types_95070" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Add 'unknown' to all conversions of non-overlapping types]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Adding_a_tsconfig_json_file_will_help_organize_projects_that_contain_both_TypeScript_and_JavaScript__5068" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Additional_Checks_6176" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Additional Checks]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Advanced_Options_6178" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Advanced Options]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";All_declarations_of_0_must_have_identical_modifiers_2687" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[All declarations of '{0}' must have identical modifiers.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";All_declarations_of_0_must_have_identical_type_parameters_2428" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[All declarations of '{0}' must have identical type parameters.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";All_declarations_of_an_abstract_method_must_be_consecutive_2516" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[All declarations of an abstract method must be consecutive.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";All_destructured_elements_are_unused_6198" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[All destructured elements are unused.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";All_files_must_be_modules_when_the_isolatedModules_flag_is_provided_1208" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[All files must be modules when the '--isolatedModules' flag is provided.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";All_imports_in_import_declaration_are_unused_6192" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[All imports in import declaration are unused.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";All_type_parameters_are_unused_6205" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[All type parameters are unused]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";All_variables_are_unused_6199" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[All variables are unused.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Allow_accessing_UMD_globals_from_modules_95076" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Allow accessing UMD globals from modules.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Allow_default_imports_from_modules_with_no_default_export_This_does_not_affect_code_emit_just_typech_6011" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Allow default imports from modules with no default export. This does not affect code emit, just typechecking.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Allow_javascript_files_to_be_compiled_6102" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Allow javascript files to be compiled.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Ambient_module_declaration_cannot_specify_relative_module_name_2436" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Ambient module declaration cannot specify relative module name.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Ambient_modules_cannot_be_nested_in_other_modules_or_namespaces_2435" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Ambient modules cannot be nested in other modules or namespaces.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";An_AMD_module_cannot_have_multiple_name_assignments_2458" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[An AMD module cannot have multiple name assignments.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";An_abstract_accessor_cannot_have_an_implementation_1318" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[An abstract accessor cannot have an implementation.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";An_accessor_cannot_be_declared_in_an_ambient_context_1086" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[An accessor cannot be declared in an ambient context.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";An_accessor_cannot_have_type_parameters_1094" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[An accessor cannot have type parameters.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";An_ambient_module_declaration_is_only_allowed_at_the_top_level_in_a_file_1234" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[An ambient module declaration is only allowed at the top level in a file.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";An_argument_for_0_was_not_provided_6210" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[An argument for '{0}' was not provided.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";An_argument_matching_this_binding_pattern_was_not_provided_6211" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[An argument matching this binding pattern was not provided.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";An_arithmetic_operand_must_be_of_type_any_number_bigint_or_an_enum_type_2356" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[An arithmetic operand must be of type 'any', 'number', 'bigint' or an enum type.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";An_arrow_function_cannot_have_a_this_parameter_2730" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[An arrow function cannot have a 'this' parameter.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";An_async_function_or_method_in_ES5_SlashES3_requires_the_Promise_constructor_Make_sure_you_have_a_de_2705" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[An async function or method in ES5/ES3 requires the 'Promise' constructor.  Make sure you have a declaration for the 'Promise' constructor or include 'ES2015' in your `--lib` option.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";An_async_function_or_method_must_have_a_valid_awaitable_return_type_1057" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[An async function or method must have a valid awaitable return type.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";An_async_function_or_method_must_return_a_Promise_Make_sure_you_have_a_declaration_for_Promise_or_in_2697" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[An async function or method must return a 'Promise'. Make sure you have a declaration for 'Promise' or include 'ES2015' in your `--lib` option.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";An_async_iterator_must_have_a_next_method_2519" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[An async iterator must have a 'next()' method.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";An_element_access_expression_should_take_an_argument_1011" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[An element access expression should take an argument.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";An_enum_member_cannot_have_a_numeric_name_2452" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[An enum member cannot have a numeric name.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";An_export_assignment_can_only_be_used_in_a_module_1231" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[An export assignment can only be used in a module.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";An_export_assignment_cannot_be_used_in_a_module_with_other_exported_elements_2309" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[An export assignment cannot be used in a module with other exported elements.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";An_export_assignment_cannot_be_used_in_a_namespace_1063" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[An export assignment cannot be used in a namespace.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";An_export_assignment_cannot_have_modifiers_1120" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[An export assignment cannot have modifiers.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";An_export_declaration_can_only_be_used_in_a_module_1233" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[An export declaration can only be used in a module.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";An_export_declaration_cannot_have_modifiers_1193" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[An export declaration cannot have modifiers.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";An_expression_of_type_void_cannot_be_tested_for_truthiness_1345" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[An expression of type 'void' cannot be tested for truthiness]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";An_extended_Unicode_escape_value_must_be_between_0x0_and_0x10FFFF_inclusive_1198" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";An_identifier_or_keyword_cannot_immediately_follow_a_numeric_literal_1351" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[An identifier or keyword cannot immediately follow a numeric literal.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";An_implementation_cannot_be_declared_in_ambient_contexts_1183" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[An implementation cannot be declared in ambient contexts.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";An_import_declaration_can_only_be_used_in_a_namespace_or_module_1232" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[An import declaration can only be used in a namespace or module.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";An_import_declaration_cannot_have_modifiers_1191" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[An import declaration cannot have modifiers.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";An_import_path_cannot_end_with_a_0_extension_Consider_importing_1_instead_2691" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[An import path cannot end with a '{0}' extension. Consider importing '{1}' instead.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";An_index_expression_argument_must_be_of_type_string_number_symbol_or_any_2342" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[An index expression argument must be of type 'string', 'number', 'symbol', or 'any'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";An_index_signature_cannot_have_a_rest_parameter_1017" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[An index signature cannot have a rest parameter.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";An_index_signature_must_have_a_type_annotation_1021" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[An index signature must have a type annotation.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";An_index_signature_must_have_exactly_one_parameter_1096" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[An index signature must have exactly one parameter.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";An_index_signature_parameter_cannot_have_a_question_mark_1019" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[An index signature parameter cannot have a question mark.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";An_index_signature_parameter_cannot_have_an_accessibility_modifier_1018" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[An index signature parameter cannot have an accessibility modifier.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";An_index_signature_parameter_cannot_have_an_initializer_1020" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[An index signature parameter cannot have an initializer.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";An_index_signature_parameter_must_have_a_type_annotation_1022" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[An index signature parameter must have a type annotation.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";An_index_signature_parameter_type_cannot_be_a_type_alias_Consider_writing_0_Colon_1_Colon_2_instead_1336" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[An index signature parameter type cannot be a type alias. Consider writing '[{0}: {1}]5D;: {2}' instead.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";An_index_signature_parameter_type_cannot_be_a_union_type_Consider_using_a_mapped_object_type_instead_1337" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[An index signature parameter type cannot be a union type. Consider using a mapped object type instead.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";An_index_signature_parameter_type_must_be_string_or_number_1023" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[An index signature parameter type must be 'string' or 'number'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";An_interface_can_only_extend_an_identifier_Slashqualified_name_with_optional_type_arguments_2499" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[An interface can only extend an identifier/qualified-name with optional type arguments.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";An_interface_can_only_extend_an_object_type_or_intersection_of_object_types_with_statically_known_me_2312" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[An interface can only extend an object type or intersection of object types with statically known members.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";An_interface_property_cannot_have_an_initializer_1246" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[An interface property cannot have an initializer.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";An_iterator_must_have_a_next_method_2489" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[An iterator must have a 'next()' method.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";An_object_literal_cannot_have_multiple_get_Slashset_accessors_with_the_same_name_1118" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[An object literal cannot have multiple get/set accessors with the same name.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";An_object_literal_cannot_have_multiple_properties_with_the_same_name_in_strict_mode_1117" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[An object literal cannot have multiple properties with the same name in strict mode.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";An_object_literal_cannot_have_property_and_accessor_with_the_same_name_1119" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[An object literal cannot have property and accessor with the same name.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";An_object_member_cannot_be_declared_optional_1162" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[An object member cannot be declared optional.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";An_outer_value_of_this_is_shadowed_by_this_container_2738" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[An outer value of 'this' is shadowed by this container.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";An_overload_signature_cannot_be_declared_as_a_generator_1222" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[An overload signature cannot be declared as a generator.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";An_unary_expression_with_the_0_operator_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_ex_17006" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[An unary expression with the '{0}' operator is not allowed in the left-hand side of an exponentiation expression. Consider enclosing the expression in parentheses.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Annotate_everything_with_types_from_JSDoc_95043" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Annotate everything with types from JSDoc]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Annotate_with_type_from_JSDoc_95009" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Annotate with type from JSDoc]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Annotate_with_types_from_JSDoc_95010" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Annotate with types from JSDoc]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Another_export_default_is_here_2753" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Another export default is here.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Argument_expression_expected_1135" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Argument expression expected.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Argument_for_0_option_must_be_Colon_1_6046" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Argument for '{0}' option must be: {1}.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Argument_of_type_0_is_not_assignable_to_parameter_of_type_1_2345" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Argument of type '{0}' is not assignable to parameter of type '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Array_element_destructuring_pattern_expected_1181" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Array element destructuring pattern expected.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Asterisk_Slash_expected_1010" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['*/' expected.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Augmentations_for_the_global_scope_can_only_be_directly_nested_in_external_modules_or_ambient_module_2669" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Augmentations for the global scope can only be directly nested in external modules or ambient module declarations.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Augmentations_for_the_global_scope_should_have_declare_modifier_unless_they_appear_in_already_ambien_2670" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Augmentations for the global scope should have 'declare' modifier unless they appear in already ambient context.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Auto_discovery_for_typings_is_enabled_in_project_0_Running_extra_resolution_pass_for_module_1_using__6140" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Auto discovery for typings is enabled in project '{0}'. Running extra resolution pass for module '{1}' using cache location '{2}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Base_class_expressions_cannot_reference_class_type_parameters_2562" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Base class expressions cannot reference class type parameters.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Base_constructor_return_type_0_is_not_an_object_type_or_intersection_of_object_types_with_statically_2509" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Base constructor return type '{0}' is not an object type or intersection of object types with statically known members.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Base_constructors_must_all_have_the_same_return_type_2510" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Base constructors must all have the same return type.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Base_directory_to_resolve_non_absolute_module_names_6083" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Base directory to resolve non-absolute module names.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Basic_Options_6172" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Basic Options]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";BigInt_literals_are_not_available_when_targeting_lower_than_ESNext_2737" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[BigInt literals are not available when targeting lower than ESNext.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Binary_digit_expected_1177" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Binary digit expected.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Binding_element_0_implicitly_has_an_1_type_7031" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Binding element '{0}' implicitly has an '{1}' type.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Block_scoped_variable_0_used_before_its_declaration_2448" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Block-scoped variable '{0}' used before its declaration.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Build_all_projects_including_those_that_appear_to_be_up_to_date_6368" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Build all projects, including those that appear to be up to date]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Build_one_or_more_projects_and_their_dependencies_if_out_of_date_6364" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Build one or more projects and their dependencies, if out of date]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Build_option_0_requires_a_value_of_type_1_5073" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Build option '{0}' requires a value of type {1}.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Building_project_0_6358" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Building project '{0}'...]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Call_decorator_expression_90028" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Call decorator expression]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Call_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type_7020" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Call signature, which lacks return-type annotation, implicitly has an 'any' return type.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Call_target_does_not_contain_any_signatures_2346" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Call target does not contain any signatures.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Cannot_access_0_1_because_0_is_a_type_but_not_a_namespace_Did_you_mean_to_retrieve_the_type_of_the_p_2713" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Cannot access '{0}.{1}' because '{0}' is a type, but not a namespace. Did you mean to retrieve the type of the property '{1}' in '{0}' with '{0}["{1}"]5D;'?]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Cannot_access_ambient_const_enums_when_the_isolatedModules_flag_is_provided_2748" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Cannot access ambient const enums when the '--isolatedModules' flag is provided.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Cannot_assign_a_0_constructor_type_to_a_1_constructor_type_2672" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Cannot assign a '{0}' constructor type to a '{1}' constructor type.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Cannot_assign_an_abstract_constructor_type_to_a_non_abstract_constructor_type_2517" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Cannot assign an abstract constructor type to a non-abstract constructor type.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Cannot_assign_to_0_because_it_is_a_constant_2588" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Cannot assign to '{0}' because it is a constant.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Cannot_assign_to_0_because_it_is_a_read_only_property_2540" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Cannot assign to '{0}' because it is a read-only property.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Cannot_assign_to_0_because_it_is_not_a_variable_2539" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Cannot assign to '{0}' because it is not a variable.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Cannot_augment_module_0_because_it_resolves_to_a_non_module_entity_2671" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Cannot augment module '{0}' because it resolves to a non-module entity.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Cannot_augment_module_0_with_value_exports_because_it_resolves_to_a_non_module_entity_2649" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Cannot augment module '{0}' with value exports because it resolves to a non-module entity.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Cannot_compile_modules_using_option_0_unless_the_module_flag_is_amd_or_system_6131" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Cannot compile modules using option '{0}' unless the '--module' flag is 'amd' or 'system'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Cannot_create_an_instance_of_an_abstract_class_2511" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Cannot create an instance of an abstract class.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Cannot_delegate_iteration_to_value_because_the_next_method_of_its_iterator_expects_type_1_but_the_co_2766" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Cannot delegate iteration to value because the 'next' method of its iterator expects type '{1}', but the containing generator will always send '{0}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Cannot_export_0_Only_local_declarations_can_be_exported_from_a_module_2661" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Cannot export '{0}'. Only local declarations can be exported from a module.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Cannot_extend_a_class_0_Class_constructor_is_marked_as_private_2675" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Cannot extend a class '{0}'. Class constructor is marked as private.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Cannot_extend_an_interface_0_Did_you_mean_implements_2689" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Cannot extend an interface '{0}'. Did you mean 'implements'?]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Cannot_find_a_tsconfig_json_file_at_the_specified_directory_Colon_0_5057" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Cannot find a tsconfig.json file at the specified directory: '{0}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Cannot_find_global_type_0_2318" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Cannot find global type '{0}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Cannot_find_global_value_0_2468" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Cannot find global value '{0}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Cannot_find_lib_definition_for_0_2726" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Cannot find lib definition for '{0}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Cannot_find_lib_definition_for_0_Did_you_mean_1_2727" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Cannot find lib definition for '{0}'. Did you mean '{1}'?]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Cannot_find_module_0_2307" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Cannot find module '{0}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Cannot_find_module_0_Consider_using_resolveJsonModule_to_import_module_with_json_extension_2732" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Cannot find module '{0}'. Consider using '--resolveJsonModule' to import module with '.json' extension]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Cannot_find_name_0_2304" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Cannot find name '{0}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Cannot_find_name_0_Did_you_mean_1_2552" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Cannot find name '{0}'. Did you mean '{1}'?]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Cannot_find_name_0_Did_you_mean_the_instance_member_this_0_2663" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Cannot find name '{0}'. Did you mean the instance member 'this.{0}'?]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Cannot_find_name_0_Did_you_mean_the_static_member_1_0_2662" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Cannot find name '{0}'. Did you mean the static member '{1}.{0}'?]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Cannot_find_name_0_Do_you_need_to_change_your_target_library_Try_changing_the_lib_compiler_option_to_2583" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Cannot find name '{0}'. Do you need to change your target library? Try changing the `lib` compiler option to es2015 or later.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Cannot_find_name_0_Do_you_need_to_change_your_target_library_Try_changing_the_lib_compiler_option_to_2584" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Cannot find name '{0}'. Do you need to change your target library? Try changing the `lib` compiler option to include 'dom'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_a_test_runner_Try_npm_i_types_Slashje_2582" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Cannot find name '{0}'. Do you need to install type definitions for a test runner? Try `npm i @types/jest` or `npm i @types/mocha`.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_a_test_runner_Try_npm_i_types_Slashje_2593" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Cannot find name '{0}'. Do you need to install type definitions for a test runner? Try `npm i @types/jest` or `npm i @types/mocha` and then add `jest` or `mocha` to the types field in your tsconfig.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_jQuery_Try_npm_i_types_Slashjquery_2581" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Cannot find name '{0}'. Do you need to install type definitions for jQuery? Try `npm i @types/jquery`.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_jQuery_Try_npm_i_types_Slashjquery_an_2592" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Cannot find name '{0}'. Do you need to install type definitions for jQuery? Try `npm i @types/jquery` and then add `jquery` to the types field in your tsconfig.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_node_Try_npm_i_types_Slashnode_2580" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Cannot find name '{0}'. Do you need to install type definitions for node? Try `npm i @types/node`.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_node_Try_npm_i_types_Slashnode_and_th_2591" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Cannot find name '{0}'. Do you need to install type definitions for node? Try `npm i @types/node` and then add `node` to the types field in your tsconfig.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Cannot_find_namespace_0_2503" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Cannot find namespace '{0}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Cannot_find_parameter_0_1225" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Cannot find parameter '{0}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Cannot_find_the_common_subdirectory_path_for_the_input_files_5009" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Cannot find the common subdirectory path for the input files.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Cannot_find_type_definition_file_for_0_2688" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Cannot find type definition file for '{0}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Cannot_import_type_declaration_files_Consider_importing_0_instead_of_1_6137" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Cannot import type declaration files. Consider importing '{0}' instead of '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1_2481" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Cannot initialize outer scoped variable '{0}' in the same scope as block scoped declaration '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Cannot_invoke_an_object_which_is_possibly_null_2721" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Cannot invoke an object which is possibly 'null'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Cannot_invoke_an_object_which_is_possibly_null_or_undefined_2723" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Cannot invoke an object which is possibly 'null' or 'undefined'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Cannot_invoke_an_object_which_is_possibly_undefined_2722" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Cannot invoke an object which is possibly 'undefined'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Cannot_iterate_value_because_the_next_method_of_its_iterator_expects_type_1_but_array_destructuring__2765" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Cannot iterate value because the 'next' method of its iterator expects type '{1}', but array destructuring will always send '{0}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Cannot_iterate_value_because_the_next_method_of_its_iterator_expects_type_1_but_array_spread_will_al_2764" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Cannot iterate value because the 'next' method of its iterator expects type '{1}', but array spread will always send '{0}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Cannot_iterate_value_because_the_next_method_of_its_iterator_expects_type_1_but_for_of_will_always_s_2763" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Cannot iterate value because the 'next' method of its iterator expects type '{1}', but for-of will always send '{0}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Cannot_prepend_project_0_because_it_does_not_have_outFile_set_6308" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Cannot prepend project '{0}' because it does not have 'outFile' set]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Cannot_re_export_a_type_when_the_isolatedModules_flag_is_provided_1205" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Cannot re-export a type when the '--isolatedModules' flag is provided.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Cannot_read_file_0_Colon_1_5012" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Cannot read file '{0}': {1}.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Cannot_redeclare_block_scoped_variable_0_2451" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Cannot redeclare block-scoped variable '{0}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Cannot_redeclare_exported_variable_0_2323" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Cannot redeclare exported variable '{0}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Cannot_redeclare_identifier_0_in_catch_clause_2492" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Cannot redeclare identifier '{0}' in catch clause.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Cannot_update_output_of_project_0_because_there_was_error_reading_file_1_6376" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Cannot update output of project '{0}' because there was error reading file '{1}']]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Cannot_use_JSX_unless_the_jsx_flag_is_provided_17004" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Cannot use JSX unless the '--jsx' flag is provided.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Cannot_use_imports_exports_or_module_augmentations_when_module_is_none_1148" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Cannot use imports, exports, or module augmentations when '--module' is 'none'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Cannot_use_namespace_0_as_a_type_2709" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Cannot use namespace '{0}' as a type.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Cannot_use_namespace_0_as_a_value_2708" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Cannot use namespace '{0}' as a value.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Cannot_write_file_0_because_it_will_overwrite_tsbuildinfo_file_generated_by_referenced_project_1_6377" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Cannot write file '{0}' because it will overwrite '.tsbuildinfo' file generated by referenced project '{1}']]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Cannot_write_file_0_because_it_would_be_overwritten_by_multiple_input_files_5056" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Cannot write file '{0}' because it would be overwritten by multiple input files.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Cannot_write_file_0_because_it_would_overwrite_input_file_5055" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Cannot write file '{0}' because it would overwrite input file.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Catch_clause_variable_cannot_have_a_type_annotation_1196" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Catch clause variable cannot have a type annotation.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Catch_clause_variable_cannot_have_an_initializer_1197" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Catch clause variable cannot have an initializer.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Change_0_to_1_90014" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Change '{0}' to '{1}']]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Change_all_extended_interfaces_to_implements_95038" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Change all extended interfaces to 'implements']]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Change_all_jsdoc_style_types_to_TypeScript_95030" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Change all jsdoc-style types to TypeScript]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Change_all_jsdoc_style_types_to_TypeScript_and_add_undefined_to_nullable_types_95031" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Change all jsdoc-style types to TypeScript (and add '| undefined' to nullable types)]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Change_extends_to_implements_90003" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Change 'extends' to 'implements']]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Change_spelling_to_0_90022" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Change spelling to '{0}']]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Checking_if_0_is_the_longest_matching_prefix_for_1_2_6104" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Checking if '{0}' is the longest matching prefix for '{1}' - '{2}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Circular_definition_of_import_alias_0_2303" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Circular definition of import alias '{0}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Circularity_detected_while_resolving_configuration_Colon_0_18000" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Circularity detected while resolving configuration: {0}]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Circularity_originates_in_type_at_this_location_2751" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Circularity originates in type at this location.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Class_0_defines_instance_member_accessor_1_but_extended_class_2_defines_it_as_instance_member_functi_2426" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Class '{0}' defines instance member accessor '{1}', but extended class '{2}' defines it as instance member function.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Class_0_defines_instance_member_function_1_but_extended_class_2_defines_it_as_instance_member_access_2423" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Class '{0}' defines instance member function '{1}', but extended class '{2}' defines it as instance member accessor.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Class_0_defines_instance_member_function_1_but_extended_class_2_defines_it_as_instance_member_proper_2424" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Class '{0}' defines instance member function '{1}', but extended class '{2}' defines it as instance member property.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Class_0_defines_instance_member_property_1_but_extended_class_2_defines_it_as_instance_member_functi_2425" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Class '{0}' defines instance member property '{1}', but extended class '{2}' defines it as instance member function.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Class_0_incorrectly_extends_base_class_1_2415" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Class '{0}' incorrectly extends base class '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Class_0_incorrectly_implements_class_1_Did_you_mean_to_extend_1_and_inherit_its_members_as_a_subclas_2720" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Class '{0}' incorrectly implements class '{1}'. Did you mean to extend '{1}' and inherit its members as a subclass?]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Class_0_incorrectly_implements_interface_1_2420" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Class '{0}' incorrectly implements interface '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Class_0_used_before_its_declaration_2449" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Class '{0}' used before its declaration.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Class_declarations_cannot_have_more_than_one_augments_or_extends_tag_8025" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Class declarations cannot have more than one `@augments` or `@extends` tag.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Class_name_cannot_be_0_2414" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Class name cannot be '{0}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Class_name_cannot_be_Object_when_targeting_ES5_with_module_0_2725" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Class name cannot be 'Object' when targeting ES5 with module {0}.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Class_static_side_0_incorrectly_extends_base_class_static_side_1_2417" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Class static side '{0}' incorrectly extends base class static side '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Classes_can_only_extend_a_single_class_1174" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Classes can only extend a single class.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Classes_containing_abstract_methods_must_be_marked_abstract_2514" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Classes containing abstract methods must be marked abstract.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Classes_may_not_have_a_field_named_constructor_18006" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Classes may not have a field named 'constructor'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Command_line_Options_6171" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Command-line Options]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Compile_the_project_given_the_path_to_its_configuration_file_or_to_a_folder_with_a_tsconfig_json_6020" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Compile the project given the path to its configuration file, or to a folder with a 'tsconfig.json'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Compiler_option_0_expects_an_argument_6044" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Compiler option '{0}' expects an argument.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Compiler_option_0_requires_a_value_of_type_1_5024" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Compiler option '{0}' requires a value of type {1}.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Composite_projects_may_not_disable_declaration_emit_6304" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Composite projects may not disable declaration emit.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Composite_projects_may_not_disable_incremental_compilation_6379" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Composite projects may not disable incremental compilation.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Computed_property_names_are_not_allowed_in_enums_1164" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Computed property names are not allowed in enums.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Computed_values_are_not_permitted_in_an_enum_with_string_valued_members_2553" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Computed values are not permitted in an enum with string valued members.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Concatenate_and_emit_output_to_single_file_6001" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Concatenate and emit output to single file.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Conflicting_definitions_for_0_found_at_1_and_2_Consider_installing_a_specific_version_of_this_librar_4090" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Conflicting definitions for '{0}' found at '{1}' and '{2}'. Consider installing a specific version of this library to resolve the conflict.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Conflicts_are_in_this_file_6201" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Conflicts are in this file.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Construct_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type_7013" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Construct signature, which lacks return-type annotation, implicitly has an 'any' return type.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Constructor_implementation_is_missing_2390" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Constructor implementation is missing.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Constructor_of_class_0_is_private_and_only_accessible_within_the_class_declaration_2673" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Constructor of class '{0}' is private and only accessible within the class declaration.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Constructor_of_class_0_is_protected_and_only_accessible_within_the_class_declaration_2674" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Constructor of class '{0}' is protected and only accessible within the class declaration.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Constructors_for_derived_classes_must_contain_a_super_call_2377" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Constructors for derived classes must contain a 'super' call.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Containing_file_is_not_specified_and_root_directory_cannot_be_determined_skipping_lookup_in_node_mod_6126" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Containing file is not specified and root directory cannot be determined, skipping lookup in 'node_modules' folder.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Conversion_of_type_0_to_type_1_may_be_a_mistake_because_neither_type_sufficiently_overlaps_with_the__2352" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Conversion of type '{0}' to type '{1}' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Convert_0_to_mapped_object_type_95055" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Convert '{0}' to mapped object type]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Convert_all_constructor_functions_to_classes_95045" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Convert all constructor functions to classes]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Convert_all_require_to_import_95048" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Convert all 'require' to 'import']]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Convert_all_to_async_functions_95066" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Convert all to async functions]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Convert_all_to_default_imports_95035" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Convert all to default imports]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Convert_default_export_to_named_export_95061" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Convert default export to named export]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Convert_function_0_to_class_95002" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Convert function '{0}' to class]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Convert_function_to_an_ES2015_class_95001" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Convert function to an ES2015 class]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Convert_named_export_to_default_export_95062" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Convert named export to default export]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Convert_named_imports_to_namespace_import_95057" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Convert named imports to namespace import]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Convert_namespace_import_to_named_imports_95056" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Convert namespace import to named imports]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Convert_parameters_to_destructured_object_95075" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Convert parameters to destructured object]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Convert_require_to_import_95047" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Convert 'require' to 'import']]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Convert_to_ES6_module_95017" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Convert to ES6 module]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Convert_to_async_function_95065" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Convert to async function]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Convert_to_default_import_95013" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Convert to default import]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Corrupted_locale_file_0_6051" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Corrupted locale file {0}.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Could_not_find_a_declaration_file_for_module_0_1_implicitly_has_an_any_type_7016" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Could not find a declaration file for module '{0}'. '{1}' implicitly has an 'any' type.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Could_not_write_file_0_Colon_1_5033" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Could not write file '{0}': {1}.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";DIRECTORY_6038" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[DIRECTORY]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Declaration_expected_1146" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Declaration expected.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Declaration_name_conflicts_with_built_in_global_identifier_0_2397" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Declaration name conflicts with built-in global identifier '{0}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Declaration_or_statement_expected_1128" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Declaration or statement expected.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Declare_method_0_90023" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Declare method '{0}']]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Declare_property_0_90016" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Declare property '{0}']]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Declare_static_method_0_90024" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Declare static method '{0}']]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Declare_static_property_0_90027" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Declare static property '{0}']]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Decorators_are_not_valid_here_1206" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Decorators are not valid here.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Decorators_cannot_be_applied_to_multiple_get_Slashset_accessors_of_the_same_name_1207" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Decorators cannot be applied to multiple get/set accessors of the same name.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Default_export_of_the_module_has_or_is_using_private_name_0_4082" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Default export of the module has or is using private name '{0}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Definite_assignment_assertions_can_only_be_used_along_with_a_type_annotation_1258" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Definite assignment assertions can only be used along with a type annotation.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Definitions_of_the_following_identifiers_conflict_with_those_in_another_file_Colon_0_6200" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Definitions of the following identifiers conflict with those in another file: {0}]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Delete_all_unused_declarations_95024" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Delete all unused declarations]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Delete_the_outputs_of_all_projects_6365" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Delete the outputs of all projects]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Deprecated_Use_jsxFactory_instead_Specify_the_object_invoked_for_createElement_when_targeting_react__6084" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[[Deprecated]5D; Use '--jsxFactory' instead. Specify the object invoked for createElement when targeting 'react' JSX emit]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Deprecated_Use_outFile_instead_Concatenate_and_emit_output_to_single_file_6170" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[[Deprecated]5D; Use '--outFile' instead. Concatenate and emit output to single file]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Deprecated_Use_skipLibCheck_instead_Skip_type_checking_of_default_library_declaration_files_6160" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[[Deprecated]5D; Use '--skipLibCheck' instead. Skip type checking of default library declaration files.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Did_you_forget_to_use_await_2773" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Did you forget to use 'await'?]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Did_you_mean_for_0_to_be_constrained_to_type_new_args_Colon_any_1_2735" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Did you mean for '{0}' to be constrained to type 'new (...args: any[]5D;) => {1}'?]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Did_you_mean_to_call_this_expression_6212" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Did you mean to call this expression?]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Did_you_mean_to_mark_this_function_as_async_1356" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Did you mean to mark this function as 'async'?]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Did_you_mean_to_use_new_with_this_expression_6213" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Did you mean to use 'new' with this expression?]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Digit_expected_1124" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Digit expected.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Directory_0_does_not_exist_skipping_all_lookups_in_it_6148" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Directory '{0}' does not exist, skipping all lookups in it.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Disable_checking_for_this_file_90018" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Disable checking for this file]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Disable_size_limitations_on_JavaScript_projects_6162" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Disable size limitations on JavaScript projects.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Disable_strict_checking_of_generic_signatures_in_function_types_6185" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Disable strict checking of generic signatures in function types.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Disallow_inconsistently_cased_references_to_the_same_file_6078" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Disallow inconsistently-cased references to the same file.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Do_not_add_triple_slash_references_or_imported_modules_to_the_list_of_compiled_files_6159" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Do not add triple-slash references or imported modules to the list of compiled files.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Do_not_emit_comments_to_output_6009" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Do not emit comments to output.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Do_not_emit_declarations_for_code_that_has_an_internal_annotation_6056" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Do not emit declarations for code that has an '@internal' annotation.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Do_not_emit_outputs_6010" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Do not emit outputs.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Do_not_emit_outputs_if_any_errors_were_reported_6008" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Do not emit outputs if any errors were reported.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Do_not_emit_use_strict_directives_in_module_output_6112" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Do not emit 'use strict' directives in module output.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Do_not_erase_const_enum_declarations_in_generated_code_6007" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Do not erase const enum declarations in generated code.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Do_not_generate_custom_helper_functions_like_extends_in_compiled_output_6157" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Do not generate custom helper functions like '__extends' in compiled output.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Do_not_include_the_default_library_file_lib_d_ts_6158" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Do not include the default library file (lib.d.ts).]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Do_not_report_errors_on_unreachable_code_6077" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Do not report errors on unreachable code.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Do_not_report_errors_on_unused_labels_6074" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Do not report errors on unused labels.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Do_not_resolve_the_real_path_of_symlinks_6013" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Do not resolve the real path of symlinks.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Do_not_truncate_error_messages_6165" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Do not truncate error messages.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Duplicate_function_implementation_2393" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Duplicate function implementation.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Duplicate_identifier_0_2300" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Duplicate identifier '{0}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module_2441" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Duplicate identifier '{0}'. Compiler reserves name '{1}' in top level scope of a module.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module_containing_async_func_2529" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Duplicate identifier '{0}'. Compiler reserves name '{1}' in top level scope of a module containing async functions.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Duplicate_identifier_0_Compiler_uses_declaration_1_to_support_async_functions_2520" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Duplicate identifier '{0}'. Compiler uses declaration '{1}' to support async functions.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Duplicate_identifier_arguments_Compiler_uses_arguments_to_initialize_rest_parameters_2396" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Duplicate_identifier_newTarget_Compiler_uses_variable_declaration_newTarget_to_capture_new_target_me_2543" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Duplicate identifier '_newTarget'. Compiler uses variable declaration '_newTarget' to capture 'new.target' meta-property reference.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Duplicate_identifier_super_Compiler_uses_super_to_capture_base_class_reference_2401" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Duplicate identifier '_super'. Compiler uses '_super' to capture base class reference.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Duplicate_identifier_this_Compiler_uses_variable_declaration_this_to_capture_this_reference_2399" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Duplicate identifier '_this'. Compiler uses variable declaration '_this' to capture 'this' reference.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Duplicate_label_0_1114" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Duplicate label '{0}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Duplicate_number_index_signature_2375" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Duplicate number index signature.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Duplicate_property_0_2718" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Duplicate property '{0}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Duplicate_string_index_signature_2374" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Duplicate string index signature.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Dynamic_import_cannot_have_type_arguments_1326" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Dynamic import cannot have type arguments]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Dynamic_import_is_only_supported_when_module_flag_is_commonjs_or_esNext_1323" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Dynamic import is only supported when '--module' flag is 'commonjs' or 'esNext'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Dynamic_import_must_have_one_specifier_as_an_argument_1324" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Dynamic import must have one specifier as an argument.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Dynamic_import_s_specifier_must_be_of_type_string_but_here_has_type_0_7036" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Dynamic import's specifier must be of type 'string', but here has type '{0}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Each_member_of_the_union_type_0_has_construct_signatures_but_none_of_those_signatures_are_compatible_2762" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Each member of the union type '{0}' has construct signatures, but none of those signatures are compatible with each other.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Each_member_of_the_union_type_0_has_signatures_but_none_of_those_signatures_are_compatible_with_each_2758" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Each member of the union type '{0}' has signatures, but none of those signatures are compatible with each other.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Element_implicitly_has_an_any_type_because_expression_of_type_0_can_t_be_used_to_index_type_1_7053" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Element implicitly has an 'any' type because expression of type '{0}' can't be used to index type '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Element_implicitly_has_an_any_type_because_index_expression_is_not_of_type_number_7015" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Element implicitly has an 'any' type because index expression is not of type 'number'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Element_implicitly_has_an_any_type_because_type_0_has_no_index_signature_7017" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Element implicitly has an 'any' type because type '{0}' has no index signature.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Element_implicitly_has_an_any_type_because_type_0_has_no_index_signature_Did_you_mean_to_call_1_7052" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Element implicitly has an 'any' type because type '{0}' has no index signature. Did you mean to call '{1}' ?]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Emit_a_UTF_8_Byte_Order_Mark_BOM_in_the_beginning_of_output_files_6164" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Emit_a_single_file_with_source_maps_instead_of_having_a_separate_file_6151" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Emit a single file with source maps instead of having a separate file.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Emit_the_source_alongside_the_sourcemaps_within_a_single_file_requires_inlineSourceMap_or_sourceMap__6152" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Enable_all_strict_type_checking_options_6180" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Enable all strict type-checking options.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Enable_incremental_compilation_6378" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Enable incremental compilation]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Enable_project_compilation_6302" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Enable project compilation]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Enable_strict_bind_call_and_apply_methods_on_functions_6214" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Enable strict 'bind', 'call', and 'apply' methods on functions.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Enable_strict_checking_of_function_types_6186" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Enable strict checking of function types.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Enable_strict_checking_of_property_initialization_in_classes_6187" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Enable strict checking of property initialization in classes.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Enable_strict_null_checks_6113" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Enable strict null checks.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Enable_the_experimentalDecorators_option_in_your_configuration_file_95074" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Enable the 'experimentalDecorators' option in your configuration file]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Enable_tracing_of_the_name_resolution_process_6085" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Enable tracing of the name resolution process.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Enable_verbose_logging_6366" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Enable verbose logging]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Enables_emit_interoperability_between_CommonJS_and_ES_Modules_via_creation_of_namespace_objects_for__7037" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Enables_experimental_support_for_ES7_async_functions_6068" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Enables experimental support for ES7 async functions.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Enables_experimental_support_for_ES7_decorators_6065" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Enables experimental support for ES7 decorators.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Enables_experimental_support_for_emitting_type_metadata_for_decorators_6066" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Enables experimental support for emitting type metadata for decorators.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Enum_0_used_before_its_declaration_2450" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Enum '{0}' used before its declaration.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Enum_declarations_can_only_merge_with_namespace_or_other_enum_declarations_2567" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Enum declarations can only merge with namespace or other enum declarations.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Enum_declarations_must_all_be_const_or_non_const_2473" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Enum declarations must all be const or non-const.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Enum_member_expected_1132" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Enum member expected.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Enum_member_must_have_initializer_1061" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Enum member must have initializer.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Enum_name_cannot_be_0_2431" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Enum name cannot be '{0}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Enum_type_0_circularly_references_itself_2586" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Enum type '{0}' circularly references itself.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Enum_type_0_has_members_with_initializers_that_are_not_literals_2535" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Enum type '{0}' has members with initializers that are not literals.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Examples_Colon_0_6026" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Examples: {0}]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Excessive_stack_depth_comparing_types_0_and_1_2321" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Excessive stack depth comparing types '{0}' and '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Expected_0_1_type_arguments_provide_these_with_an_extends_tag_8027" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Expected {0}-{1} type arguments; provide these with an '@extends' tag.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Expected_0_arguments_but_got_1_2554" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Expected {0} arguments, but got {1}.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Expected_0_arguments_but_got_1_or_more_2556" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Expected {0} arguments, but got {1} or more.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Expected_0_type_arguments_but_got_1_2558" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Expected {0} type arguments, but got {1}.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Expected_0_type_arguments_provide_these_with_an_extends_tag_8026" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Expected {0} type arguments; provide these with an '@extends' tag.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Expected_at_least_0_arguments_but_got_1_2555" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Expected at least {0} arguments, but got {1}.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Expected_at_least_0_arguments_but_got_1_or_more_2557" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Expected at least {0} arguments, but got {1} or more.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Expected_corresponding_JSX_closing_tag_for_0_17002" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Expected corresponding JSX closing tag for '{0}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Expected_corresponding_closing_tag_for_JSX_fragment_17015" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Expected corresponding closing tag for JSX fragment.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Expected_type_of_0_field_in_package_json_to_be_1_got_2_6105" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Expected type of '{0}' field in 'package.json' to be '{1}', got '{2}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Experimental_Options_6177" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Experimental Options]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_t_1219" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Experimental support for decorators is a feature that is subject to change in a future release. Set the 'experimentalDecorators' option in your 'tsconfig' or 'jsconfig' to remove this warning.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Explicitly_specified_module_resolution_kind_Colon_0_6087" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Explicitly specified module resolution kind: '{0}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Export_assignment_cannot_be_used_when_targeting_ECMAScript_modules_Consider_using_export_default_or__1203" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Export assignment cannot be used when targeting ECMAScript modules. Consider using 'export default' or another module format instead.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Export_assignment_is_not_supported_when_module_flag_is_system_1218" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Export assignment is not supported when '--module' flag is 'system'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Export_declaration_conflicts_with_exported_declaration_of_0_2484" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Export declaration conflicts with exported declaration of '{0}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Export_declarations_are_not_permitted_in_a_namespace_1194" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Export declarations are not permitted in a namespace.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Exported_external_package_typings_file_0_is_not_a_module_Please_contact_the_package_author_to_update_2656" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Exported external package typings file '{0}' is not a module. Please contact the package author to update the package definition.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Exported_external_package_typings_file_cannot_contain_tripleslash_references_Please_contact_the_pack_2654" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Exported external package typings file cannot contain tripleslash references. Please contact the package author to update the package definition.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Exported_type_alias_0_has_or_is_using_private_name_1_4081" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Exported type alias '{0}' has or is using private name '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Exported_variable_0_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named_4023" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Exported variable '{0}' has or is using name '{1}' from external module {2} but cannot be named.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Exported_variable_0_has_or_is_using_name_1_from_private_module_2_4024" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Exported variable '{0}' has or is using name '{1}' from private module '{2}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Exported_variable_0_has_or_is_using_private_name_1_4025" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Exported variable '{0}' has or is using private name '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Exports_and_export_assignments_are_not_permitted_in_module_augmentations_2666" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Exports and export assignments are not permitted in module augmentations.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Expression_expected_1109" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Expression expected.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Expression_or_comma_expected_1137" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Expression or comma expected.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Expression_produces_a_union_type_that_is_too_complex_to_represent_2590" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Expression produces a union type that is too complex to represent.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Expression_resolves_to_super_that_compiler_uses_to_capture_base_class_reference_2402" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Expression resolves to '_super' that compiler uses to capture base class reference.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Expression_resolves_to_variable_declaration_0_that_compiler_uses_to_support_async_functions_2521" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Expression resolves to variable declaration '{0}' that compiler uses to support async functions.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Expression_resolves_to_variable_declaration_newTarget_that_compiler_uses_to_capture_new_target_meta__2544" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Expression resolves to variable declaration '_newTarget' that compiler uses to capture 'new.target' meta-property reference.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Expression_resolves_to_variable_declaration_this_that_compiler_uses_to_capture_this_reference_2400" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Expression resolves to variable declaration '_this' that compiler uses to capture 'this' reference.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Extract_constant_95006" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Extract constant]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Extract_function_95005" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Extract function]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Extract_to_0_in_1_95004" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Extract to {0} in {1}]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Extract_to_0_in_1_scope_95008" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Extract to {0} in {1} scope]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Extract_to_0_in_enclosing_scope_95007" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Extract to {0} in enclosing scope]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Extract_to_type_alias_95078" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Extract to type alias]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Extract_to_typedef_95079" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Extract to typedef]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Extract_type_95077" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Extract type]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";FILE_6035" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[FILE]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";FILE_OR_DIRECTORY_6040" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[FILE OR DIRECTORY]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Failed_to_parse_file_0_Colon_1_5014" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Failed to parse file '{0}': {1}.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Fallthrough_case_in_switch_7029" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Fallthrough case in switch.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";File_0_does_not_exist_6096" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[File '{0}' does not exist.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";File_0_exist_use_it_as_a_name_resolution_result_6097" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[File '{0}' exist - use it as a name resolution result.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";File_0_has_an_unsupported_extension_so_skipping_it_6081" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[File '{0}' has an unsupported extension, so skipping it.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";File_0_has_unsupported_extension_The_only_supported_extensions_are_1_6054" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[File '{0}' has unsupported extension. The only supported extensions are {1}.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";File_0_is_not_a_module_2306" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[File '{0}' is not a module.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";File_0_is_not_listed_within_the_file_list_of_project_1_Projects_must_list_all_files_or_use_an_includ_6307" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[File '{0}' is not listed within the file list of project '{1}'. Projects must list all files or use an 'include' pattern.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";File_0_is_not_under_rootDir_1_rootDir_is_expected_to_contain_all_source_files_6059" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[File '{0}' is not under 'rootDir' '{1}'. 'rootDir' is expected to contain all source files.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";File_0_not_found_6053" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[File '{0}' not found.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";File_change_detected_Starting_incremental_compilation_6032" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[File change detected. Starting incremental compilation...]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";File_is_a_CommonJS_module_it_may_be_converted_to_an_ES6_module_80001" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[File is a CommonJS module; it may be converted to an ES6 module.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";File_name_0_differs_from_already_included_file_name_1_only_in_casing_1149" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[File name '{0}' differs from already included file name '{1}' only in casing.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";File_name_0_has_a_1_extension_stripping_it_6132" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[File name '{0}' has a '{1}' extension - stripping it.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";File_specification_cannot_contain_a_parent_directory_that_appears_after_a_recursive_directory_wildca_5065" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[File specification cannot contain a parent directory ('..') that appears after a recursive directory wildcard ('**'): '{0}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";File_specification_cannot_end_in_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0_5010" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[File specification cannot end in a recursive directory wildcard ('**'): '{0}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Fix_all_detected_spelling_errors_95026" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Fix all detected spelling errors]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Fix_all_expressions_possibly_missing_await_95085" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Fix all expressions possibly missing 'await']]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Found_0_errors_6217" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Found {0} errors.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Found_0_errors_Watching_for_file_changes_6194" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Found {0} errors. Watching for file changes.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Found_1_error_6216" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Found 1 error.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Found_1_error_Watching_for_file_changes_6193" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Found 1 error. Watching for file changes.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Found_package_json_at_0_6099" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Found 'package.json' at '{0}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Function_declarations_are_not_allowed_inside_blocks_in_strict_mode_when_targeting_ES3_or_ES5_1250" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Function declarations are not allowed inside blocks in strict mode when targeting 'ES3' or 'ES5'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Function_declarations_are_not_allowed_inside_blocks_in_strict_mode_when_targeting_ES3_or_ES5_Class_d_1251" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Function declarations are not allowed inside blocks in strict mode when targeting 'ES3' or 'ES5'. Class definitions are automatically in strict mode.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Function_declarations_are_not_allowed_inside_blocks_in_strict_mode_when_targeting_ES3_or_ES5_Modules_1252" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Function declarations are not allowed inside blocks in strict mode when targeting 'ES3' or 'ES5'. Modules are automatically in strict mode.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Function_expression_which_lacks_return_type_annotation_implicitly_has_an_0_return_type_7011" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Function expression, which lacks return-type annotation, implicitly has an '{0}' return type.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Function_implementation_is_missing_or_not_immediately_following_the_declaration_2391" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Function implementation is missing or not immediately following the declaration.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Function_implementation_name_must_be_0_2389" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Function implementation name must be '{0}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Function_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_ref_7024" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Function implicitly has return type 'any' because it does not have a return type annotation and is referenced directly or indirectly in one of its return expressions.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Function_lacks_ending_return_statement_and_return_type_does_not_include_undefined_2366" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Function lacks ending return statement and return type does not include 'undefined'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Function_overload_must_be_static_2387" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Function overload must be static.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Function_overload_must_not_be_static_2388" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Function overload must not be static.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Function_type_which_lacks_return_type_annotation_implicitly_has_an_0_return_type_7014" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Function type, which lacks return-type annotation, implicitly has an '{0}' return type.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Generate_get_and_set_accessors_95046" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Generate 'get' and 'set' accessors]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Generates_a_sourcemap_for_each_corresponding_d_ts_file_6000" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Generates a sourcemap for each corresponding '.d.ts' file.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Generates_corresponding_d_ts_file_6002" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Generates corresponding '.d.ts' file.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Generates_corresponding_map_file_6043" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Generates corresponding '.map' file.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Generator_implicitly_has_yield_type_0_because_it_does_not_yield_any_values_Consider_supplying_a_retu_7025" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Generator implicitly has yield type '{0}' because it does not yield any values. Consider supplying a return type annotation.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Generators_are_not_allowed_in_an_ambient_context_1221" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Generators are not allowed in an ambient context.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Generators_are_only_available_when_targeting_ECMAScript_2015_or_higher_1220" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Generators are only available when targeting ECMAScript 2015 or higher.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Generic_type_0_requires_1_type_argument_s_2314" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Generic type '{0}' requires {1} type argument(s).]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Generic_type_0_requires_between_1_and_2_type_arguments_2707" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Generic type '{0}' requires between {1} and {2} type arguments.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Getter_and_setter_accessors_do_not_agree_in_visibility_2379" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Getter and setter accessors do not agree in visibility.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Global_module_exports_may_only_appear_at_top_level_1316" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Global module exports may only appear at top level.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Global_module_exports_may_only_appear_in_declaration_files_1315" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Global module exports may only appear in declaration files.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Global_module_exports_may_only_appear_in_module_files_1314" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Global module exports may only appear in module files.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Global_type_0_must_be_a_class_or_interface_type_2316" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Global type '{0}' must be a class or interface type.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Global_type_0_must_have_1_type_parameter_s_2317" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Global type '{0}' must have {1} type parameter(s).]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Hexadecimal_digit_expected_1125" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Hexadecimal digit expected.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Identifier_expected_0_is_a_reserved_word_in_strict_mode_1212" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Identifier expected. '{0}' is a reserved word in strict mode.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Identifier_expected_0_is_a_reserved_word_in_strict_mode_Class_definitions_are_automatically_in_stric_1213" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Identifier expected. '{0}' is a reserved word in strict mode. Class definitions are automatically in strict mode.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Identifier_expected_0_is_a_reserved_word_in_strict_mode_Modules_are_automatically_in_strict_mode_1214" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Identifier expected. '{0}' is a reserved word in strict mode. Modules are automatically in strict mode.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Identifier_expected_1003" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Identifier expected.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Identifier_expected_esModule_is_reserved_as_an_exported_marker_when_transforming_ECMAScript_modules_1216" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Identifier expected. '__esModule' is reserved as an exported marker when transforming ECMAScript modules.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";If_the_0_package_actually_exposes_this_module_consider_sending_a_pull_request_to_amend_https_Colon_S_7040" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[If the '{0}' package actually exposes this module, consider sending a pull request to amend 'https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/{1}`]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Ignore_this_error_message_90019" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Ignore this error message]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Implement_all_inherited_abstract_classes_95040" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Implement all inherited abstract classes]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Implement_all_unimplemented_interfaces_95032" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Implement all unimplemented interfaces]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Implement_inherited_abstract_class_90007" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Implement inherited abstract class]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Implement_interface_0_90006" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Implement interface '{0}']]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Implements_clause_of_exported_class_0_has_or_is_using_private_name_1_4019" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Implements clause of exported class '{0}' has or is using private name '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Implicit_conversion_of_a_symbol_to_a_string_will_fail_at_runtime_Consider_wrapping_this_expression_i_2731" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Implicit conversion of a 'symbol' to a 'string' will fail at runtime. Consider wrapping this expression in 'String(...)'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Import_0_from_module_1_90013" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Import '{0}' from module "{1}"]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Import_assignment_cannot_be_used_when_targeting_ECMAScript_modules_Consider_using_import_Asterisk_as_1202" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Import assignment cannot be used when targeting ECMAScript modules. Consider using 'import * as ns from "mod"', 'import {a} from "mod"', 'import d from "mod"', or another module format instead.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Import_declaration_0_is_using_private_name_1_4000" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Import declaration '{0}' is using private name '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Import_declaration_conflicts_with_local_declaration_of_0_2440" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Import declaration conflicts with local declaration of '{0}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Import_declarations_in_a_namespace_cannot_reference_a_module_1147" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Import declarations in a namespace cannot reference a module.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Import_default_0_from_module_1_90032" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Import default '{0}' from module "{1}"]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Import_emit_helpers_from_tslib_6139" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Import emit helpers from 'tslib'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Import_may_be_converted_to_a_default_import_80003" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Import may be converted to a default import.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Import_name_cannot_be_0_2438" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Import name cannot be '{0}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Import_or_export_declaration_in_an_ambient_module_declaration_cannot_reference_module_through_relati_2439" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Import or export declaration in an ambient module declaration cannot reference module through relative module name.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Imports_are_not_permitted_in_module_augmentations_Consider_moving_them_to_the_enclosing_external_mod_2667" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Imports are not permitted in module augmentations. Consider moving them to the enclosing external module.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";In_ambient_enum_declarations_member_initializer_must_be_constant_expression_1066" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[In ambient enum declarations member initializer must be constant expression.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";In_an_enum_with_multiple_declarations_only_one_declaration_can_omit_an_initializer_for_its_first_enu_2432" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[In an enum with multiple declarations, only one declaration can omit an initializer for its first enum element.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Include_modules_imported_with_json_extension_6197" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Include modules imported with '.json' extension]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Index_signature_in_type_0_only_permits_reading_2542" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Index signature in type '{0}' only permits reading.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Index_signature_is_missing_in_type_0_2329" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Index signature is missing in type '{0}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Index_signatures_are_incompatible_2330" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Index signatures are incompatible.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Individual_declarations_in_merged_declaration_0_must_be_all_exported_or_all_local_2395" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Individual declarations in merged declaration '{0}' must be all exported or all local.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Infer_all_types_from_usage_95023" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Infer all types from usage]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Infer_parameter_types_from_usage_95012" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Infer parameter types from usage]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Infer_this_type_of_0_from_usage_95080" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Infer 'this' type of '{0}' from usage]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Infer_type_of_0_from_usage_95011" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Infer type of '{0}' from usage]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Initialize_property_0_in_the_constructor_90020" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Initialize property '{0}' in the constructor]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Initialize_static_property_0_90021" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Initialize static property '{0}']]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor_2301" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Initializer of instance member variable '{0}' cannot reference identifier '{1}' declared in the constructor.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Initializer_of_parameter_0_cannot_reference_identifier_1_declared_after_it_2373" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Initializer of parameter '{0}' cannot reference identifier '{1}' declared after it.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Initializer_provides_no_value_for_this_binding_element_and_the_binding_element_has_no_default_value_2525" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Initializer provides no value for this binding element and the binding element has no default value.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Initializers_are_not_allowed_in_ambient_contexts_1039" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Initializers are not allowed in ambient contexts.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Initializes_a_TypeScript_project_and_creates_a_tsconfig_json_file_6070" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Initializes a TypeScript project and creates a tsconfig.json file.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Insert_command_line_options_and_files_from_a_file_6030" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Insert command line options and files from a file.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Install_0_95014" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Install '{0}']]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Install_all_missing_types_packages_95033" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Install all missing types packages]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Interface_0_cannot_simultaneously_extend_types_1_and_2_2320" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Interface '{0}' cannot simultaneously extend types '{1}' and '{2}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Interface_0_incorrectly_extends_interface_1_2430" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Interface '{0}' incorrectly extends interface '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Interface_declaration_cannot_have_implements_clause_1176" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Interface declaration cannot have 'implements' clause.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Interface_name_cannot_be_0_2427" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Interface name cannot be '{0}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Invalid_character_1127" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Invalid character.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Invalid_module_name_in_augmentation_Module_0_resolves_to_an_untyped_module_at_1_which_cannot_be_augm_2665" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Invalid module name in augmentation. Module '{0}' resolves to an untyped module at '{1}', which cannot be augmented.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Invalid_module_name_in_augmentation_module_0_cannot_be_found_2664" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Invalid module name in augmentation, module '{0}' cannot be found.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Invalid_reference_directive_syntax_1084" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Invalid 'reference' directive syntax.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Invalid_use_of_0_Class_definitions_are_automatically_in_strict_mode_1210" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Invalid use of '{0}'. Class definitions are automatically in strict mode.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Invalid_use_of_0_Modules_are_automatically_in_strict_mode_1215" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Invalid use of '{0}'. Modules are automatically in strict mode.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Invalid_use_of_0_in_strict_mode_1100" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Invalid use of '{0}' in strict mode.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Invalid_value_for_jsxFactory_0_is_not_a_valid_identifier_or_qualified_name_5067" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Invalid value for 'jsxFactory'. '{0}' is not a valid identifier or qualified-name.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Invalid_value_for_reactNamespace_0_is_not_a_valid_identifier_5059" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Invalid value for '--reactNamespace'. '{0}' is not a valid identifier.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";It_is_highly_likely_that_you_are_missing_a_semicolon_2734" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[It is highly likely that you are missing a semicolon.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";JSDoc_0_1_does_not_match_the_extends_2_clause_8023" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[JSDoc '@{0} {1}' does not match the 'extends {2}' clause.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";JSDoc_0_is_not_attached_to_a_class_8022" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[JSDoc '@{0}' is not attached to a class.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";JSDoc_may_only_appear_in_the_last_parameter_of_a_signature_8028" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[JSDoc '...' may only appear in the last parameter of a signature.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";JSDoc_param_tag_has_name_0_but_there_is_no_parameter_with_that_name_8024" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[JSDoc '@param' tag has name '{0}', but there is no parameter with that name.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";JSDoc_param_tag_has_name_0_but_there_is_no_parameter_with_that_name_It_would_match_arguments_if_it_h_8029" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[JSDoc '@param' tag has name '{0}', but there is no parameter with that name. It would match 'arguments' if it had an array type.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";JSDoc_type_0_circularly_references_itself_2587" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[JSDoc type '{0}' circularly references itself.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";JSDoc_typedef_tag_should_either_have_a_type_annotation_or_be_followed_by_property_or_member_tags_8021" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[JSDoc '@typedef' tag should either have a type annotation or be followed by '@property' or '@member' tags.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";JSDoc_types_can_only_be_used_inside_documentation_comments_8020" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[JSDoc types can only be used inside documentation comments.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";JSDoc_types_may_be_moved_to_TypeScript_types_80004" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[JSDoc types may be moved to TypeScript types.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";JSX_attribute_expected_17003" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[JSX attribute expected.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";JSX_attributes_must_only_be_assigned_a_non_empty_expression_17000" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[JSX attributes must only be assigned a non-empty 'expression'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";JSX_element_0_has_no_corresponding_closing_tag_17008" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[JSX element '{0}' has no corresponding closing tag.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";JSX_element_attributes_type_0_may_not_be_a_union_type_2600" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[JSX element attributes type '{0}' may not be a union type.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";JSX_element_class_does_not_support_attributes_because_it_does_not_have_a_0_property_2607" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[JSX element class does not support attributes because it does not have a '{0}' property.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";JSX_element_implicitly_has_type_any_because_no_interface_JSX_0_exists_7026" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[JSX element implicitly has type 'any' because no interface 'JSX.{0}' exists.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";JSX_element_implicitly_has_type_any_because_the_global_type_JSX_Element_does_not_exist_2602" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[JSX element implicitly has type 'any' because the global type 'JSX.Element' does not exist.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";JSX_element_type_0_does_not_have_any_construct_or_call_signatures_2604" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[JSX element type '{0}' does not have any construct or call signatures.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";JSX_element_type_0_is_not_a_constructor_function_for_JSX_elements_2605" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[JSX element type '{0}' is not a constructor function for JSX elements.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";JSX_elements_cannot_have_multiple_attributes_with_the_same_name_17001" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[JSX elements cannot have multiple attributes with the same name.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";JSX_expressions_may_not_use_the_comma_operator_Did_you_mean_to_write_an_array_18007" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[JSX expressions may not use the comma operator. Did you mean to write an array?]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";JSX_expressions_must_have_one_parent_element_2657" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[JSX expressions must have one parent element.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";JSX_fragment_has_no_corresponding_closing_tag_17014" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[JSX fragment has no corresponding closing tag.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";JSX_fragment_is_not_supported_when_using_an_inline_JSX_factory_pragma_17017" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[JSX fragment is not supported when using an inline JSX factory pragma]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";JSX_fragment_is_not_supported_when_using_jsxFactory_17016" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[JSX fragment is not supported when using --jsxFactory]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";JSX_spread_child_must_be_an_array_type_2609" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[JSX spread child must be an array type.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Jump_target_cannot_cross_function_boundary_1107" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Jump target cannot cross function boundary.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";KIND_6034" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[KIND]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";LOCATION_6037" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[LOCATION]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Language_service_is_disabled_9004" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Language service is disabled.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Left_side_of_comma_operator_is_unused_and_has_no_side_effects_2695" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Left side of comma operator is unused and has no side effects.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Line_break_not_permitted_here_1142" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Line break not permitted here.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Line_terminator_not_permitted_before_arrow_1200" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Line terminator not permitted before arrow.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";List_of_folders_to_include_type_definitions_from_6161" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[List of folders to include type definitions from.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";List_of_language_service_plugins_6181" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[List of language service plugins.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";List_of_root_folders_whose_combined_content_represents_the_structure_of_the_project_at_runtime_6168" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[List of root folders whose combined content represents the structure of the project at runtime.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Loading_0_from_the_root_dir_1_candidate_location_2_6109" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Loading '{0}' from the root dir '{1}', candidate location '{2}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Loading_module_0_from_node_modules_folder_target_file_type_1_6098" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Loading module '{0}' from 'node_modules' folder, target file type '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Loading_module_as_file_Slash_folder_candidate_module_location_0_target_file_type_1_6095" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Loading module as file / folder, candidate module location '{0}', target file type '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Locale_must_be_of_the_form_language_or_language_territory_For_example_0_or_1_6048" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Locale must be of the form <language> or <language>-<territory>. For example '{0}' or '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Longest_matching_prefix_for_0_is_1_6108" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Longest matching prefix for '{0}' is '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Looking_up_in_node_modules_folder_initial_location_0_6125" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Looking up in 'node_modules' folder, initial location '{0}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Make_all_super_calls_the_first_statement_in_their_constructor_95036" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Make all 'super()' calls the first statement in their constructor]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Make_super_call_the_first_statement_in_the_constructor_90002" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Make 'super()' call the first statement in the constructor]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Mapped_object_type_implicitly_has_an_any_template_type_7039" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Mapped object type implicitly has an 'any' template type.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Member_0_implicitly_has_an_1_type_7008" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Member '{0}' implicitly has an '{1}' type.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Member_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage_7045" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Member '{0}' implicitly has an '{1}' type, but a better type may be inferred from usage.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Merge_conflict_marker_encountered_1185" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Merge conflict marker encountered.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Merged_declaration_0_cannot_include_a_default_export_declaration_Consider_adding_a_separate_export_d_2652" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Merged declaration '{0}' cannot include a default export declaration. Consider adding a separate 'export default {0}' declaration instead.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Meta_property_0_is_only_allowed_in_the_body_of_a_function_declaration_function_expression_or_constru_17013" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Meta-property '{0}' is only allowed in the body of a function declaration, function expression, or constructor.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Method_0_cannot_have_an_implementation_because_it_is_marked_abstract_1245" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Method '{0}' cannot have an implementation because it is marked abstract.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Method_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2_4101" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Method '{0}' of exported interface has or is using name '{1}' from private module '{2}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Method_0_of_exported_interface_has_or_is_using_private_name_1_4102" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Method '{0}' of exported interface has or is using private name '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Modifiers_cannot_appear_here_1184" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Modifiers cannot appear here.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Module_0_can_only_be_default_imported_using_the_1_flag_1259" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Module '{0}' can only be default-imported using the '{1}' flag]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Module_0_does_not_refer_to_a_type_but_is_used_as_a_type_here_Did_you_mean_typeof_import_0_1340" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Module '{0}' does not refer to a type, but is used as a type here. Did you mean 'typeof import('{0}')'?]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Module_0_does_not_refer_to_a_value_but_is_used_as_a_value_here_1339" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Module '{0}' does not refer to a value, but is used as a value here.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Module_0_has_already_exported_a_member_named_1_Consider_explicitly_re_exporting_to_resolve_the_ambig_2308" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Module {0} has already exported a member named '{1}'. Consider explicitly re-exporting to resolve the ambiguity.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Module_0_has_no_default_export_1192" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Module '{0}' has no default export.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Module_0_has_no_exported_member_1_2305" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Module '{0}' has no exported member '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Module_0_has_no_exported_member_1_Did_you_mean_2_2724" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Module '{0}' has no exported member '{1}'. Did you mean '{2}'?]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Module_0_is_hidden_by_a_local_declaration_with_the_same_name_2437" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Module '{0}' is hidden by a local declaration with the same name.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Module_0_uses_export_and_cannot_be_used_with_export_Asterisk_2498" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Module '{0}' uses 'export =' and cannot be used with 'export *'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Module_0_was_resolved_as_ambient_module_declared_in_1_since_this_file_was_not_modified_6145" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Module '{0}' was resolved as ambient module declared in '{1}' since this file was not modified.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Module_0_was_resolved_as_locally_declared_ambient_module_in_file_1_6144" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Module '{0}' was resolved as locally declared ambient module in file '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Module_0_was_resolved_to_1_but_jsx_is_not_set_6142" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Module '{0}' was resolved to '{1}', but '--jsx' is not set.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Module_0_was_resolved_to_1_but_resolveJsonModule_is_not_used_7042" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Module '{0}' was resolved to '{1}', but '--resolveJsonModule' is not used.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Module_Resolution_Options_6174" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Module Resolution Options]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Module_name_0_matched_pattern_1_6092" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Module name '{0}', matched pattern '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Module_name_0_was_not_resolved_6090" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[======== Module name '{0}' was not resolved. ========]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Module_name_0_was_successfully_resolved_to_1_6089" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[======== Module name '{0}' was successfully resolved to '{1}'. ========]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Module_name_0_was_successfully_resolved_to_1_with_Package_ID_2_6218" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[======== Module name '{0}' was successfully resolved to '{1}' with Package ID '{2}'. ========]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Module_resolution_kind_is_not_specified_using_0_6088" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Module resolution kind is not specified, using '{0}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Module_resolution_using_rootDirs_has_failed_6111" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Module resolution using 'rootDirs' has failed.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Move_to_a_new_file_95049" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Move to a new file]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Multiple_consecutive_numeric_separators_are_not_permitted_6189" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Multiple consecutive numeric separators are not permitted.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Multiple_constructor_implementations_are_not_allowed_2392" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Multiple constructor implementations are not allowed.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";NEWLINE_6061" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[NEWLINE]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Named_property_0_of_types_1_and_2_are_not_identical_2319" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Named property '{0}' of types '{1}' and '{2}' are not identical.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Namespace_0_has_no_exported_member_1_2694" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Namespace '{0}' has no exported member '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";No_base_constructor_has_the_specified_number_of_type_arguments_2508" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[No base constructor has the specified number of type arguments.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";No_constituent_of_type_0_is_callable_2755" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[No constituent of type '{0}' is callable.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";No_constituent_of_type_0_is_constructable_2759" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[No constituent of type '{0}' is constructable.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";No_index_signature_with_a_parameter_of_type_0_was_found_on_type_1_7054" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[No index signature with a parameter of type '{0}' was found on type '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";No_inputs_were_found_in_config_file_0_Specified_include_paths_were_1_and_exclude_paths_were_2_18003" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[No inputs were found in config file '{0}'. Specified 'include' paths were '{1}' and 'exclude' paths were '{2}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";No_overload_expects_0_arguments_but_overloads_do_exist_that_expect_either_1_or_2_arguments_2575" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[No overload expects {0} arguments, but overloads do exist that expect either {1} or {2} arguments.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";No_overload_expects_0_type_arguments_but_overloads_do_exist_that_expect_either_1_or_2_type_arguments_2743" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[No overload expects {0} type arguments, but overloads do exist that expect either {1} or {2} type arguments.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";No_overload_matches_this_call_2769" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[No overload matches this call.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer_18004" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[No value exists in scope for the shorthand property '{0}'. Either declare one or provide an initializer.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Non_abstract_class_0_does_not_implement_inherited_abstract_member_1_from_class_2_2515" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Non-abstract class '{0}' does not implement inherited abstract member '{1}' from class '{2}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Non_abstract_class_expression_does_not_implement_inherited_abstract_member_0_from_class_1_2653" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Non-abstract class expression does not implement inherited abstract member '{0}' from class '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Non_simple_parameter_declared_here_1348" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Non-simple parameter declared here.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Not_all_code_paths_return_a_value_7030" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Not all code paths return a value.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Not_all_constituents_of_type_0_are_callable_2756" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Not all constituents of type '{0}' are callable.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Not_all_constituents_of_type_0_are_constructable_2760" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Not all constituents of type '{0}' are constructable.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Numeric_index_type_0_is_not_assignable_to_string_index_type_1_2413" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Numeric index type '{0}' is not assignable to string index type '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Numeric_separators_are_not_allowed_here_6188" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Numeric separators are not allowed here.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Object_is_of_type_unknown_2571" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Object is of type 'unknown'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Object_is_possibly_null_2531" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Object is possibly 'null'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Object_is_possibly_null_or_undefined_2533" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Object is possibly 'null' or 'undefined'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Object_is_possibly_undefined_2532" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Object is possibly 'undefined'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1_2353" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Object literal may only specify known properties, and '{0}' does not exist in type '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Object_literal_may_only_specify_known_properties_but_0_does_not_exist_in_type_1_Did_you_mean_to_writ_2561" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Object literal may only specify known properties, but '{0}' does not exist in type '{1}'. Did you mean to write '{2}'?]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Object_literal_s_property_0_implicitly_has_an_1_type_7018" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Object literal's property '{0}' implicitly has an '{1}' type.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Octal_digit_expected_1178" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Octal digit expected.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Octal_literal_types_must_use_ES2015_syntax_Use_the_syntax_0_8017" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Octal literal types must use ES2015 syntax. Use the syntax '{0}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Octal_literals_are_not_allowed_in_enums_members_initializer_Use_the_syntax_0_8018" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Octal literals are not allowed in enums members initializer. Use the syntax '{0}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Octal_literals_are_not_allowed_in_strict_mode_1121" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Octal literals are not allowed in strict mode.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Octal_literals_are_not_available_when_targeting_ECMAScript_5_and_higher_Use_the_syntax_0_1085" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Octal literals are not available when targeting ECMAScript 5 and higher. Use the syntax '{0}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Only_a_single_variable_declaration_is_allowed_in_a_for_in_statement_1091" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Only a single variable declaration is allowed in a 'for...in' statement.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Only_a_single_variable_declaration_is_allowed_in_a_for_of_statement_1188" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Only a single variable declaration is allowed in a 'for...of' statement.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Only_a_void_function_can_be_called_with_the_new_keyword_2350" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Only a void function can be called with the 'new' keyword.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Only_ambient_modules_can_use_quoted_names_1035" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Only ambient modules can use quoted names.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Only_amd_and_system_modules_are_supported_alongside_0_6082" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Only 'amd' and 'system' modules are supported alongside --{0}.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Only_emit_d_ts_declaration_files_6014" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Only emit '.d.ts' declaration files.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Only_identifiers_Slashqualified_names_with_optional_type_arguments_are_currently_supported_in_a_clas_9002" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Only identifiers/qualified-names with optional type arguments are currently supported in a class 'extends' clause.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Only_public_and_protected_methods_of_the_base_class_are_accessible_via_the_super_keyword_2340" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Only public and protected methods of the base class are accessible via the 'super' keyword.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Operator_0_cannot_be_applied_to_type_1_2736" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Operator '{0}' cannot be applied to type '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Operator_0_cannot_be_applied_to_types_1_and_2_2365" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Operator '{0}' cannot be applied to types '{1}' and '{2}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Option_0_can_only_be_specified_in_tsconfig_json_file_6064" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Option '{0}' can only be specified in 'tsconfig.json' file.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Option_0_can_only_be_used_when_either_option_inlineSourceMap_or_option_sourceMap_is_provided_5051" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Option '{0} can only be used when either option '--inlineSourceMap' or option '--sourceMap' is provided.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Option_0_cannot_be_specified_with_option_1_5053" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Option '{0}' cannot be specified with option '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Option_0_cannot_be_specified_without_specifying_option_1_5052" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Option '{0}' cannot be specified without specifying option '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Option_0_cannot_be_specified_without_specifying_option_1_or_option_2_5069" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Option '{0}' cannot be specified without specifying option '{1}' or option '{2}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Option_0_should_have_array_of_strings_as_a_value_6103" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Option '{0}' should have array of strings as a value.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Option_build_must_be_the_first_command_line_argument_6369" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Option '--build' must be the first command line argument.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Option_incremental_can_only_be_specified_using_tsconfig_emitting_to_single_file_or_when_option_tsBui_5074" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Option '--incremental' can only be specified using tsconfig, emitting to single file or when option `--tsBuildInfoFile` is specified.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Option_isolatedModules_can_only_be_used_when_either_option_module_is_provided_or_option_target_is_ES_5047" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Option 'isolatedModules' can only be used when either option '--module' is provided or option 'target' is 'ES2015' or higher.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Option_paths_cannot_be_used_without_specifying_baseUrl_option_5060" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Option 'paths' cannot be used without specifying '--baseUrl' option.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Option_project_cannot_be_mixed_with_source_files_on_a_command_line_5042" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Option 'project' cannot be mixed with source files on a command line.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Option_resolveJsonModule_can_only_be_specified_when_module_code_generation_is_commonjs_amd_es2015_or_5071" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Option '--resolveJsonModule' can only be specified when module code generation is 'commonjs', 'amd', 'es2015' or 'esNext'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Option_resolveJsonModule_cannot_be_specified_without_node_module_resolution_strategy_5070" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Option '--resolveJsonModule' cannot be specified without 'node' module resolution strategy.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Options_0_and_1_cannot_be_combined_6370" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Options '{0}' and '{1}' cannot be combined.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Options_Colon_6027" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Options:]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Output_directory_for_generated_declaration_files_6166" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Output directory for generated declaration files.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Output_file_0_from_project_1_does_not_exist_6309" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Output file '{0}' from project '{1}' does not exist]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Output_file_0_has_not_been_built_from_source_file_1_6305" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Output file '{0}' has not been built from source file '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Overload_0_of_1_2_gave_the_following_error_2772" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Overload {0} of {1}, '{2}', gave the following error.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Overload_signatures_must_all_be_abstract_or_non_abstract_2512" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Overload signatures must all be abstract or non-abstract.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Overload_signatures_must_all_be_ambient_or_non_ambient_2384" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Overload signatures must all be ambient or non-ambient.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Overload_signatures_must_all_be_exported_or_non_exported_2383" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Overload signatures must all be exported or non-exported.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Overload_signatures_must_all_be_optional_or_required_2386" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Overload signatures must all be optional or required.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Overload_signatures_must_all_be_public_private_or_protected_2385" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Overload signatures must all be public, private or protected.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Parameter_0_cannot_be_referenced_in_its_initializer_2372" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Parameter '{0}' cannot be referenced in its initializer.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Parameter_0_implicitly_has_an_1_type_7006" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Parameter '{0}' implicitly has an '{1}' type.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Parameter_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage_7044" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Parameter '{0}' implicitly has an '{1}' type, but a better type may be inferred from usage.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Parameter_0_is_not_in_the_same_position_as_parameter_1_1227" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Parameter '{0}' is not in the same position as parameter '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2_4066" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Parameter '{0}' of call signature from exported interface has or is using name '{1}' from private module '{2}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1_4067" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Parameter '{0}' of call signature from exported interface has or is using private name '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_can_4061" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Parameter '{0}' of constructor from exported class has or is using name '{1}' from external module {2} but cannot be named.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_private_module_2_4062" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Parameter '{0}' of constructor from exported class has or is using name '{1}' from private module '{2}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Parameter_0_of_constructor_from_exported_class_has_or_is_using_private_name_1_4063" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Parameter '{0}' of constructor from exported class has or is using private name '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_name_1_from_private_mod_4064" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Parameter '{0}' of constructor signature from exported interface has or is using name '{1}' from private module '{2}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1_4065" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Parameter '{0}' of constructor signature from exported interface has or is using private name '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Parameter_0_of_exported_function_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named_4076" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Parameter '{0}' of exported function has or is using name '{1}' from external module {2} but cannot be named.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Parameter_0_of_exported_function_has_or_is_using_name_1_from_private_module_2_4077" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Parameter '{0}' of exported function has or is using name '{1}' from private module '{2}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Parameter_0_of_exported_function_has_or_is_using_private_name_1_4078" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Parameter '{0}' of exported function has or is using private name '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Parameter_0_of_index_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2_4091" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Parameter '{0}' of index signature from exported interface has or is using name '{1}' from private module '{2}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Parameter_0_of_index_signature_from_exported_interface_has_or_is_using_private_name_1_4092" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Parameter '{0}' of index signature from exported interface has or is using private name '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Parameter_0_of_method_from_exported_interface_has_or_is_using_name_1_from_private_module_2_4074" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Parameter '{0}' of method from exported interface has or is using name '{1}' from private module '{2}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1_4075" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Parameter '{0}' of method from exported interface has or is using private name '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_c_4071" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Parameter '{0}' of public method from exported class has or is using name '{1}' from external module {2} but cannot be named.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_private_module_2_4072" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Parameter '{0}' of public method from exported class has or is using name '{1}' from private module '{2}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1_4073" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Parameter '{0}' of public method from exported class has or is using private name '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_external_module__4068" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Parameter '{0}' of public static method from exported class has or is using name '{1}' from external module {2} but cannot be named.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_private_module_2_4069" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Parameter '{0}' of public static method from exported class has or is using name '{1}' from private module '{2}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1_4070" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Parameter '{0}' of public static method from exported class has or is using private name '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Parameter_cannot_have_question_mark_and_initializer_1015" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Parameter cannot have question mark and initializer.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Parameter_declaration_expected_1138" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Parameter declaration expected.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Parameter_has_a_name_but_no_type_Did_you_mean_0_Colon_1_7051" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Parameter has a name but no type. Did you mean '{0}: {1}'?]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Parameter_type_of_public_setter_0_from_exported_class_has_or_is_using_name_1_from_private_module_2_4036" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Parameter type of public setter '{0}' from exported class has or is using name '{1}' from private module '{2}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Parameter_type_of_public_setter_0_from_exported_class_has_or_is_using_private_name_1_4037" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Parameter type of public setter '{0}' from exported class has or is using private name '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Parameter_type_of_public_static_setter_0_from_exported_class_has_or_is_using_name_1_from_private_mod_4034" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Parameter type of public static setter '{0}' from exported class has or is using name '{1}' from private module '{2}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Parameter_type_of_public_static_setter_0_from_exported_class_has_or_is_using_private_name_1_4035" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Parameter type of public static setter '{0}' from exported class has or is using private name '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Parse_in_strict_mode_and_emit_use_strict_for_each_source_file_6141" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Parse in strict mode and emit "use strict" for each source file.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Pattern_0_can_have_at_most_one_Asterisk_character_5061" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Pattern '{0}' can have at most one '*' character.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Prefix_0_with_an_underscore_90025" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Prefix '{0}' with an underscore]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Prefix_all_unused_declarations_with_where_possible_95025" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Prefix all unused declarations with '_' where possible]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Print_names_of_files_part_of_the_compilation_6155" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Print names of files part of the compilation.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Print_names_of_generated_files_part_of_the_compilation_6154" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Print names of generated files part of the compilation.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Print_the_compiler_s_version_6019" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Print the compiler's version.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Print_the_final_configuration_instead_of_building_1350" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Print the final configuration instead of building.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Print_this_message_6017" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Print this message.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Private_or_protected_member_0_cannot_be_accessed_on_a_type_parameter_4105" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Private or protected member '{0}' cannot be accessed on a type parameter.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Project_0_can_t_be_built_because_its_dependency_1_has_errors_6363" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Project '{0}' can't be built because its dependency '{1}' has errors]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Project_0_is_out_of_date_because_its_dependency_1_is_out_of_date_6353" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Project '{0}' is out of date because its dependency '{1}' is out of date]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Project_0_is_out_of_date_because_oldest_output_1_is_older_than_newest_input_2_6350" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Project '{0}' is out of date because oldest output '{1}' is older than newest input '{2}']]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Project_0_is_out_of_date_because_output_file_1_does_not_exist_6352" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Project '{0}' is out of date because output file '{1}' does not exist]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Project_0_is_out_of_date_because_output_for_it_was_generated_with_version_1_that_differs_with_curren_6381" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Project '{0}' is out of date because output for it was generated with version '{1}' that differs with current version '{2}']]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Project_0_is_out_of_date_because_output_of_its_dependency_1_has_changed_6372" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Project '{0}' is out of date because output of its dependency '{1}' has changed]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Project_0_is_up_to_date_6361" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Project '{0}' is up to date]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Project_0_is_up_to_date_because_newest_input_1_is_older_than_oldest_output_2_6351" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Project '{0}' is up to date because newest input '{1}' is older than oldest output '{2}']]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Project_0_is_up_to_date_with_d_ts_files_from_its_dependencies_6354" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Project '{0}' is up to date with .d.ts files from its dependencies]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Project_references_may_not_form_a_circular_graph_Cycle_detected_Colon_0_6202" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Project references may not form a circular graph. Cycle detected: {0}]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Projects_in_this_build_Colon_0_6355" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Projects in this build: {0}]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Projects_to_reference_6300" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Projects to reference]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Property_0_does_not_exist_on_const_enum_1_2479" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Property '{0}' does not exist on 'const' enum '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Property_0_does_not_exist_on_type_1_2339" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Property '{0}' does not exist on type '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Property_0_does_not_exist_on_type_1_Did_you_mean_2_2551" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Property '{0}' does not exist on type '{1}'. Did you mean '{2}'?]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Property_0_has_conflicting_declarations_and_is_inaccessible_in_type_1_2546" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Property '{0}' has conflicting declarations and is inaccessible in type '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Property_0_has_no_initializer_and_is_not_definitely_assigned_in_the_constructor_2564" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Property '{0}' has no initializer and is not definitely assigned in the constructor.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Property_0_implicitly_has_type_any_because_its_get_accessor_lacks_a_return_type_annotation_7033" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Property '{0}' implicitly has type 'any', because its get accessor lacks a return type annotation.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Property_0_implicitly_has_type_any_because_its_set_accessor_lacks_a_parameter_type_annotation_7032" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Property '{0}' implicitly has type 'any', because its set accessor lacks a parameter type annotation.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Property_0_implicitly_has_type_any_but_a_better_type_for_its_get_accessor_may_be_inferred_from_usage_7048" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Property '{0}' implicitly has type 'any', but a better type for its get accessor may be inferred from usage.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Property_0_implicitly_has_type_any_but_a_better_type_for_its_set_accessor_may_be_inferred_from_usage_7049" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Property '{0}' implicitly has type 'any', but a better type for its set accessor may be inferred from usage.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Property_0_in_type_1_is_not_assignable_to_the_same_property_in_base_type_2_2416" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Property '{0}' in type '{1}' is not assignable to the same property in base type '{2}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Property_0_in_type_1_is_not_assignable_to_type_2_2603" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Property '{0}' in type '{1}' is not assignable to type '{2}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Property_0_is_a_static_member_of_type_1_2576" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Property '{0}' is a static member of type '{1}']]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Property_0_is_declared_but_its_value_is_never_read_6138" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Property '{0}' is declared but its value is never read.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Property_0_is_incompatible_with_index_signature_2530" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Property '{0}' is incompatible with index signature.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Property_0_is_incompatible_with_rest_element_type_2573" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Property '{0}' is incompatible with rest element type.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Property_0_is_missing_in_type_1_2324" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Property '{0}' is missing in type '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Property_0_is_missing_in_type_1_but_required_in_type_2_2741" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Property '{0}' is missing in type '{1}' but required in type '{2}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Property_0_is_optional_in_type_1_but_required_in_type_2_2327" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Property '{0}' is optional in type '{1}' but required in type '{2}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Property_0_is_private_and_only_accessible_within_class_1_2341" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Property '{0}' is private and only accessible within class '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Property_0_is_private_in_type_1_but_not_in_type_2_2325" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Property '{0}' is private in type '{1}' but not in type '{2}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1_2446" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Property '{0}' is protected and only accessible through an instance of class '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Property_0_is_protected_and_only_accessible_within_class_1_and_its_subclasses_2445" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Property '{0}' is protected and only accessible within class '{1}' and its subclasses.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Property_0_is_protected_but_type_1_is_not_a_class_derived_from_2_2443" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Property '{0}' is protected but type '{1}' is not a class derived from '{2}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Property_0_is_protected_in_type_1_but_public_in_type_2_2444" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Property '{0}' is protected in type '{1}' but public in type '{2}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Property_0_is_used_before_being_assigned_2565" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Property '{0}' is used before being assigned.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Property_0_is_used_before_its_initialization_2729" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Property '{0}' is used before its initialization.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Property_0_of_JSX_spread_attribute_is_not_assignable_to_target_property_2606" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Property '{0}' of JSX spread attribute is not assignable to target property.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Property_0_of_exported_class_expression_may_not_be_private_or_protected_4094" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Property '{0}' of exported class expression may not be private or protected.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Property_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2_4032" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Property '{0}' of exported interface has or is using name '{1}' from private module '{2}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Property_0_of_exported_interface_has_or_is_using_private_name_1_4033" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Property '{0}' of exported interface has or is using private name '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Property_0_of_type_1_is_not_assignable_to_numeric_index_type_2_2412" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Property '{0}' of type '{1}' is not assignable to numeric index type '{2}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Property_0_of_type_1_is_not_assignable_to_string_index_type_2_2411" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Property '{0}' of type '{1}' is not assignable to string index type '{2}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Property_0_was_also_declared_here_2733" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Property '{0}' was also declared here.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Property_assignment_expected_1136" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Property assignment expected.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Property_destructuring_pattern_expected_1180" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Property destructuring pattern expected.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Property_or_signature_expected_1131" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Property or signature expected.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Property_value_can_only_be_string_literal_numeric_literal_true_false_null_object_literal_or_array_li_1328" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Property value can only be string literal, numeric literal, 'true', 'false', 'null', object literal or array literal.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Provide_full_support_for_iterables_in_for_of_spread_and_destructuring_when_targeting_ES5_or_ES3_6179" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Public_method_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named_4098" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Public method '{0}' of exported class has or is using name '{1}' from external module {2} but cannot be named.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Public_method_0_of_exported_class_has_or_is_using_name_1_from_private_module_2_4099" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Public method '{0}' of exported class has or is using name '{1}' from private module '{2}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Public_method_0_of_exported_class_has_or_is_using_private_name_1_4100" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Public method '{0}' of exported class has or is using private name '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Public_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_name_4029" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Public property '{0}' of exported class has or is using name '{1}' from external module {2} but cannot be named.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Public_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2_4030" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Public property '{0}' of exported class has or is using name '{1}' from private module '{2}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Public_property_0_of_exported_class_has_or_is_using_private_name_1_4031" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Public property '{0}' of exported class has or is using private name '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Public_static_method_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_4095" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Public static method '{0}' of exported class has or is using name '{1}' from external module {2} but cannot be named.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Public_static_method_0_of_exported_class_has_or_is_using_name_1_from_private_module_2_4096" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Public static method '{0}' of exported class has or is using name '{1}' from private module '{2}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Public_static_method_0_of_exported_class_has_or_is_using_private_name_1_4097" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Public static method '{0}' of exported class has or is using private name '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot__4026" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Public static property '{0}' of exported class has or is using name '{1}' from external module {2} but cannot be named.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2_4027" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Public static property '{0}' of exported class has or is using name '{1}' from private module '{2}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Public_static_property_0_of_exported_class_has_or_is_using_private_name_1_4028" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Public static property '{0}' of exported class has or is using private name '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Qualified_name_0_is_not_allowed_without_a_leading_param_object_1_8032" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Qualified name '{0}' is not allowed without a leading '@param {object} {1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Raise_error_on_expressions_and_declarations_with_an_implied_any_type_6052" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Raise error on expressions and declarations with an implied 'any' type.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Raise_error_on_this_expressions_with_an_implied_any_type_6115" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Raise error on 'this' expressions with an implied 'any' type.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Redirect_output_structure_to_the_directory_6006" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Redirect output structure to the directory.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Referenced_project_0_must_have_setting_composite_Colon_true_6306" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Referenced project '{0}' must have setting "composite": true.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Remove_all_unnecessary_uses_of_await_95087" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Remove all unnecessary uses of 'await']]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Remove_all_unreachable_code_95051" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Remove all unreachable code]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Remove_all_unused_labels_95054" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Remove all unused labels]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Remove_braces_from_arrow_function_95060" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Remove braces from arrow function]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Remove_declaration_for_Colon_0_90004" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Remove declaration for: '{0}']]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Remove_destructuring_90009" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Remove destructuring]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Remove_import_from_0_90005" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Remove import from '{0}']]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Remove_template_tag_90011" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Remove template tag]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Remove_type_parameters_90012" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Remove type parameters]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Remove_unnecessary_await_95086" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Remove unnecessary 'await']]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Remove_unreachable_code_95050" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Remove unreachable code]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Remove_unused_label_95053" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Remove unused label]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Remove_variable_statement_90010" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Remove variable statement]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Replace_all_unused_infer_with_unknown_90031" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Replace all unused 'infer' with 'unknown']]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Replace_import_with_0_95015" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Replace import with '{0}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Replace_infer_0_with_unknown_90030" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Replace 'infer {0}' with 'unknown']]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Report_error_when_not_all_code_paths_in_function_return_a_value_6075" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Report error when not all code paths in function return a value.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Report_errors_for_fallthrough_cases_in_switch_statement_6076" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Report errors for fallthrough cases in switch statement.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Report_errors_in_js_files_8019" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Report errors in .js files.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Report_errors_on_unused_locals_6134" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Report errors on unused locals.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Report_errors_on_unused_parameters_6135" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Report errors on unused parameters.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Required_type_parameters_may_not_follow_optional_type_parameters_2706" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Required type parameters may not follow optional type parameters.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Resolution_for_module_0_was_found_in_cache_from_location_1_6147" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Resolution for module '{0}' was found in cache from location '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Resolve_keyof_to_string_valued_property_names_only_no_numbers_or_symbols_6195" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Resolve 'keyof' to string valued property names only (no numbers or symbols).]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Resolving_from_node_modules_folder_6118" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Resolving from node_modules folder...]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Resolving_module_0_from_1_6086" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[======== Resolving module '{0}' from '{1}'. ========]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Resolving_module_name_0_relative_to_base_url_1_2_6094" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Resolving module name '{0}' relative to base url '{1}' - '{2}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Resolving_real_path_for_0_result_1_6130" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Resolving real path for '{0}', result '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Resolving_type_reference_directive_0_containing_file_1_root_directory_2_6116" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[======== Resolving type reference directive '{0}', containing file '{1}', root directory '{2}'. ========]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Resolving_type_reference_directive_0_containing_file_1_root_directory_not_set_6123" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[======== Resolving type reference directive '{0}', containing file '{1}', root directory not set. ========]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Resolving_type_reference_directive_0_containing_file_not_set_root_directory_1_6127" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[======== Resolving type reference directive '{0}', containing file not set, root directory '{1}'. ========]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Resolving_type_reference_directive_0_containing_file_not_set_root_directory_not_set_6128" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[======== Resolving type reference directive '{0}', containing file not set, root directory not set. ========]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Resolving_using_primary_search_paths_6117" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Resolving using primary search paths...]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Resolving_with_primary_search_path_0_6121" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Resolving with primary search path '{0}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Rest_parameter_0_implicitly_has_an_any_type_7019" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Rest parameter '{0}' implicitly has an 'any[]5D;' type.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Rest_parameter_0_implicitly_has_an_any_type_but_a_better_type_may_be_inferred_from_usage_7047" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Rest parameter '{0}' implicitly has an 'any[]5D;' type, but a better type may be inferred from usage.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Rest_signatures_are_incompatible_2572" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Rest signatures are incompatible.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Rest_types_may_only_be_created_from_object_types_2700" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Rest types may only be created from object types.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Return_type_annotation_circularly_references_itself_2577" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Return type annotation circularly references itself.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Return_type_of_call_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1_4046" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Return type of call signature from exported interface has or is using name '{0}' from private module '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Return_type_of_call_signature_from_exported_interface_has_or_is_using_private_name_0_4047" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Return type of call signature from exported interface has or is using private name '{0}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_name_0_from_private_mod_4044" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Return type of constructor signature from exported interface has or is using name '{0}' from private module '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_0_4045" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Return type of constructor signature from exported interface has or is using private name '{0}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Return_type_of_constructor_signature_must_be_assignable_to_the_instance_type_of_the_class_2409" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Return type of constructor signature must be assignable to the instance type of the class.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Return_type_of_exported_function_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named_4058" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Return type of exported function has or is using name '{0}' from external module {1} but cannot be named.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Return_type_of_exported_function_has_or_is_using_name_0_from_private_module_1_4059" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Return type of exported function has or is using name '{0}' from private module '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Return_type_of_exported_function_has_or_is_using_private_name_0_4060" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Return type of exported function has or is using private name '{0}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Return_type_of_index_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1_4048" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Return type of index signature from exported interface has or is using name '{0}' from private module '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Return_type_of_index_signature_from_exported_interface_has_or_is_using_private_name_0_4049" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Return type of index signature from exported interface has or is using private name '{0}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Return_type_of_method_from_exported_interface_has_or_is_using_name_0_from_private_module_1_4056" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Return type of method from exported interface has or is using name '{0}' from private module '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Return_type_of_method_from_exported_interface_has_or_is_using_private_name_0_4057" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Return type of method from exported interface has or is using private name '{0}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Return_type_of_public_getter_0_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_4041" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Return type of public getter '{0}' from exported class has or is using name '{1}' from external module {2} but cannot be named.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Return_type_of_public_getter_0_from_exported_class_has_or_is_using_name_1_from_private_module_2_4042" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Return type of public getter '{0}' from exported class has or is using name '{1}' from private module '{2}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Return_type_of_public_getter_0_from_exported_class_has_or_is_using_private_name_1_4043" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Return type of public getter '{0}' from exported class has or is using private name '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_c_4053" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Return type of public method from exported class has or is using name '{0}' from external module {1} but cannot be named.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_private_module_1_4054" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Return type of public method from exported class has or is using name '{0}' from private module '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Return_type_of_public_method_from_exported_class_has_or_is_using_private_name_0_4055" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Return type of public method from exported class has or is using private name '{0}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Return_type_of_public_static_getter_0_from_exported_class_has_or_is_using_name_1_from_external_modul_4038" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Return type of public static getter '{0}' from exported class has or is using name '{1}' from external module {2} but cannot be named.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Return_type_of_public_static_getter_0_from_exported_class_has_or_is_using_name_1_from_private_module_4039" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Return type of public static getter '{0}' from exported class has or is using name '{1}' from private module '{2}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Return_type_of_public_static_getter_0_from_exported_class_has_or_is_using_private_name_1_4040" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Return type of public static getter '{0}' from exported class has or is using private name '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_external_module__4050" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Return type of public static method from exported class has or is using name '{0}' from external module {1} but cannot be named.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_private_module_1_4051" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Return type of public static method from exported class has or is using name '{0}' from private module '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Return_type_of_public_static_method_from_exported_class_has_or_is_using_private_name_0_4052" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Return type of public static method from exported class has or is using private name '{0}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Reusing_module_resolutions_originating_in_0_since_resolutions_are_unchanged_from_old_program_6184" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Reusing module resolutions originating in '{0}' since resolutions are unchanged from old program.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Reusing_resolution_of_module_0_to_file_1_from_old_program_6183" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Reusing resolution of module '{0}' to file '{1}' from old program.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Rewrite_all_as_indexed_access_types_95034" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Rewrite all as indexed access types]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Rewrite_as_the_indexed_access_type_0_90026" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Rewrite as the indexed access type '{0}']]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Root_directory_cannot_be_determined_skipping_primary_search_paths_6122" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Root directory cannot be determined, skipping primary search paths.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";STRATEGY_6039" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[STRATEGY]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Scoped_package_detected_looking_in_0_6182" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Scoped package detected, looking in '{0}']]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Setters_cannot_return_a_value_2408" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Setters cannot return a value.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Show_all_compiler_options_6169" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Show all compiler options.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Show_diagnostic_information_6149" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Show diagnostic information.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Show_verbose_diagnostic_information_6150" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Show verbose diagnostic information.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Show_what_would_be_built_or_deleted_if_specified_with_clean_6367" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Show what would be built (or deleted, if specified with '--clean')]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Signature_0_must_be_a_type_predicate_1224" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Signature '{0}' must be a type predicate.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Skip_type_checking_of_declaration_files_6012" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Skip type checking of declaration files.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Skipping_build_of_project_0_because_its_dependency_1_has_errors_6362" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Skipping build of project '{0}' because its dependency '{1}' has errors]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Source_Map_Options_6175" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Source Map Options]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Specialized_overload_signature_is_not_assignable_to_any_non_specialized_signature_2382" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Specialized overload signature is not assignable to any non-specialized signature.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Specifier_of_dynamic_import_cannot_be_spread_element_1325" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Specifier of dynamic import cannot be spread element.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Specify_ECMAScript_target_version_Colon_ES3_default_ES5_ES2015_ES2016_ES2017_ES2018_ES2019_or_ESNEXT_6015" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Specify_JSX_code_generation_Colon_preserve_react_native_or_react_6080" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Specify JSX code generation: 'preserve', 'react-native', or 'react'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Specify_file_to_store_incremental_compilation_information_6380" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Specify file to store incremental compilation information]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Specify_library_files_to_be_included_in_the_compilation_6079" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Specify library files to be included in the compilation.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Specify_module_code_generation_Colon_none_commonjs_amd_system_umd_es2015_or_ESNext_6016" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Specify_module_resolution_strategy_Colon_node_Node_js_or_classic_TypeScript_pre_1_6_6069" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6).]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Specify_the_JSX_factory_function_to_use_when_targeting_react_JSX_emit_e_g_React_createElement_or_h_6146" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Specify the JSX factory function to use when targeting 'react' JSX emit, e.g. 'React.createElement' or 'h'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Specify_the_end_of_line_sequence_to_be_used_when_emitting_files_Colon_CRLF_dos_or_LF_unix_6060" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Specify the end of line sequence to be used when emitting files: 'CRLF' (dos) or 'LF' (unix).]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Specify_the_location_where_debugger_should_locate_TypeScript_files_instead_of_source_locations_6004" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Specify the location where debugger should locate TypeScript files instead of source locations.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Specify_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations_6003" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Specify the location where debugger should locate map files instead of generated locations.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Specify_the_root_directory_of_input_files_Use_to_control_the_output_directory_structure_with_outDir_6058" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Specify the root directory of input files. Use to control the output directory structure with --outDir.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Spread_operator_in_new_expressions_is_only_available_when_targeting_ECMAScript_5_and_higher_2472" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Spread operator in 'new' expressions is only available when targeting ECMAScript 5 and higher.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Spread_types_may_only_be_created_from_object_types_2698" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Spread types may only be created from object types.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Starting_compilation_in_watch_mode_6031" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Starting compilation in watch mode...]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Statement_expected_1129" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Statement expected.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Statements_are_not_allowed_in_ambient_contexts_1036" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Statements are not allowed in ambient contexts.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Static_members_cannot_reference_class_type_parameters_2302" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Static members cannot reference class type parameters.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Static_property_0_conflicts_with_built_in_property_Function_0_of_constructor_function_1_2699" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Static property '{0}' conflicts with built-in property 'Function.{0}' of constructor function '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Strict_Type_Checking_Options_6173" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Strict Type-Checking Options]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";String_literal_expected_1141" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[String literal expected.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";String_literal_with_double_quotes_expected_1327" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[String literal with double quotes expected.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Stylize_errors_and_messages_using_color_and_context_experimental_6073" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Stylize errors and messages using color and context (experimental).]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Subsequent_property_declarations_must_have_the_same_type_Property_0_must_be_of_type_1_but_here_has_t_2717" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Subsequent property declarations must have the same type.  Property '{0}' must be of type '{1}', but here has type '{2}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Subsequent_variable_declarations_must_have_the_same_type_Variable_0_must_be_of_type_1_but_here_has_t_2403" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Subsequent variable declarations must have the same type.  Variable '{0}' must be of type '{1}', but here has type '{2}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Substitution_0_for_pattern_1_has_incorrect_type_expected_string_got_2_5064" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Substitution '{0}' for pattern '{1}' has incorrect type, expected 'string', got '{2}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Substitution_0_in_pattern_1_in_can_have_at_most_one_Asterisk_character_5062" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Substitution '{0}' in pattern '{1}' in can have at most one '*' character.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Substitutions_for_pattern_0_should_be_an_array_5063" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Substitutions for pattern '{0}' should be an array.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Substitutions_for_pattern_0_shouldn_t_be_an_empty_array_5066" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Substitutions for pattern '{0}' shouldn't be an empty array.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Successfully_created_a_tsconfig_json_file_6071" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Successfully created a tsconfig.json file.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Super_calls_are_not_permitted_outside_constructors_or_in_nested_functions_inside_constructors_2337" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Super calls are not permitted outside constructors or in nested functions inside constructors.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Suppress_excess_property_checks_for_object_literals_6072" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Suppress excess property checks for object literals.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Suppress_noImplicitAny_errors_for_indexing_objects_lacking_index_signatures_6055" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Suppress noImplicitAny errors for indexing objects lacking index signatures.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Symbol_reference_does_not_refer_to_the_global_Symbol_constructor_object_2470" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['Symbol' reference does not refer to the global Symbol constructor object.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Syntax_Colon_0_6023" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Syntax: {0}]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";The_0_operator_cannot_be_applied_to_type_symbol_2469" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[The '{0}' operator cannot be applied to type 'symbol'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";The_0_operator_is_not_allowed_for_boolean_types_Consider_using_1_instead_2447" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[The '{0}' operator is not allowed for boolean types. Consider using '{1}' instead.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";The_0_property_of_an_async_iterator_must_be_a_method_2768" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[The '{0}' property of an async iterator must be a method.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";The_0_property_of_an_iterator_must_be_a_method_2767" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[The '{0}' property of an iterator must be a method.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";The_Object_type_is_assignable_to_very_few_other_types_Did_you_mean_to_use_the_any_type_instead_2696" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[The 'Object' type is assignable to very few other types. Did you mean to use the 'any' type instead?]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";The_arguments_object_cannot_be_referenced_in_an_arrow_function_in_ES3_and_ES5_Consider_using_a_stand_2496" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[The 'arguments' object cannot be referenced in an arrow function in ES3 and ES5. Consider using a standard function expression.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";The_arguments_object_cannot_be_referenced_in_an_async_function_or_method_in_ES3_and_ES5_Consider_usi_2522" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[The 'arguments' object cannot be referenced in an async function or method in ES3 and ES5. Consider using a standard function or method.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";The_body_of_an_if_statement_cannot_be_the_empty_statement_1313" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[The body of an 'if' statement cannot be the empty statement.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";The_character_set_of_the_input_files_6163" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[The character set of the input files.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";The_containing_arrow_function_captures_the_global_value_of_this_7041" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[The containing arrow function captures the global value of 'this'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";The_containing_function_or_module_body_is_too_large_for_control_flow_analysis_2563" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[The containing function or module body is too large for control flow analysis.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";The_current_host_does_not_support_the_0_option_5001" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[The current host does not support the '{0}' option.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";The_expected_type_comes_from_property_0_which_is_declared_here_on_type_1_6500" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[The expected type comes from property '{0}' which is declared here on type '{1}']]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";The_expected_type_comes_from_the_return_type_of_this_signature_6502" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[The expected type comes from the return type of this signature.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";The_expected_type_comes_from_this_index_signature_6501" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[The expected type comes from this index signature.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";The_expression_of_an_export_assignment_must_be_an_identifier_or_qualified_name_in_an_ambient_context_2714" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[The expression of an export assignment must be an identifier or qualified name in an ambient context.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";The_files_list_in_config_file_0_is_empty_18002" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[The 'files' list in config file '{0}' is empty.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";The_first_export_default_is_here_2752" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[The first export default is here.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";The_first_parameter_of_the_then_method_of_a_promise_must_be_a_callback_1060" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[The first parameter of the 'then' method of a promise must be a callback.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";The_global_type_JSX_0_may_not_have_more_than_one_property_2608" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[The global type 'JSX.{0}' may not have more than one property.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";The_implementation_signature_is_declared_here_2750" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[The implementation signature is declared here.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";The_import_meta_meta_property_is_only_allowed_using_ESNext_for_the_target_and_module_compiler_option_1343" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[The 'import.meta' meta-property is only allowed using 'ESNext' for the 'target' and 'module' compiler options.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";The_inferred_type_of_0_cannot_be_named_without_a_reference_to_1_This_is_likely_not_portable_A_type_a_2742" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[The inferred type of '{0}' cannot be named without a reference to '{1}'. This is likely not portable. A type annotation is necessary.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";The_inferred_type_of_0_references_an_inaccessible_1_type_A_type_annotation_is_necessary_2527" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[The inferred type of '{0}' references an inaccessible '{1}' type. A type annotation is necessary.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";The_last_overload_gave_the_following_error_2770" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[The last overload gave the following error.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";The_last_overload_is_declared_here_2771" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[The last overload is declared here.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern_2491" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[The left-hand side of a 'for...in' statement cannot be a destructuring pattern.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";The_left_hand_side_of_a_for_in_statement_cannot_use_a_type_annotation_2404" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[The left-hand side of a 'for...in' statement cannot use a type annotation.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";The_left_hand_side_of_a_for_in_statement_must_be_a_variable_or_a_property_access_2406" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[The left-hand side of a 'for...in' statement must be a variable or a property access.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";The_left_hand_side_of_a_for_in_statement_must_be_of_type_string_or_any_2405" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[The left-hand side of a 'for...in' statement must be of type 'string' or 'any'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation_2483" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[The left-hand side of a 'for...of' statement cannot use a type annotation.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";The_left_hand_side_of_a_for_of_statement_must_be_a_variable_or_a_property_access_2487" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[The left-hand side of a 'for...of' statement must be a variable or a property access.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";The_left_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_bigint_or_an_enum_type_2362" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[The left-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";The_left_hand_side_of_an_assignment_expression_must_be_a_variable_or_a_property_access_2364" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[The left-hand side of an assignment expression must be a variable or a property access.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";The_left_hand_side_of_an_in_expression_must_be_of_type_any_string_number_or_symbol_2360" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[The left-hand side of an 'in' expression must be of type 'any', 'string', 'number', or 'symbol'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";The_left_hand_side_of_an_instanceof_expression_must_be_of_type_any_an_object_type_or_a_type_paramete_2358" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[The left-hand side of an 'instanceof' expression must be of type 'any', an object type or a type parameter.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";The_locale_used_when_displaying_messages_to_the_user_e_g_en_us_6156" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[The locale used when displaying messages to the user (e.g. 'en-us')]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";The_maximum_dependency_depth_to_search_under_node_modules_and_load_JavaScript_files_6136" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[The maximum dependency depth to search under node_modules and load JavaScript files.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";The_operand_of_a_delete_operator_cannot_be_a_read_only_property_2704" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[The operand of a delete operator cannot be a read-only property.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";The_operand_of_a_delete_operator_must_be_a_property_reference_2703" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[The operand of a delete operator must be a property reference.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_or_a_property_access_2357" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[The operand of an increment or decrement operator must be a variable or a property access.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";The_return_type_of_a_JSX_element_constructor_must_return_an_object_type_2601" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[The return type of a JSX element constructor must return an object type.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";The_return_type_of_a_parameter_decorator_function_must_be_either_void_or_any_1237" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[The return type of a parameter decorator function must be either 'void' or 'any'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";The_return_type_of_a_property_decorator_function_must_be_either_void_or_any_1236" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[The return type of a property decorator function must be either 'void' or 'any'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";The_return_type_of_an_async_function_must_either_be_a_valid_promise_or_must_not_contain_a_callable_t_1058" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[The return type of an async function must either be a valid promise or must not contain a callable 'then' member.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type_1064" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[The return type of an async function or method must be the global Promise<T> type.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";The_right_hand_side_of_a_for_in_statement_must_be_of_type_any_an_object_type_or_a_type_parameter_but_2407" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter, but here has type '{0}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";The_right_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_bigint_or_an_enum_type_2363" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[The right-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";The_right_hand_side_of_an_in_expression_must_be_of_type_any_an_object_type_or_a_type_parameter_2361" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[The right-hand side of an 'in' expression must be of type 'any', an object type or a type parameter.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";The_right_hand_side_of_an_instanceof_expression_must_be_of_type_any_or_of_a_type_assignable_to_the_F_2359" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[The right-hand side of an 'instanceof' expression must be of type 'any' or of a type assignable to the 'Function' interface type.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";The_specified_path_does_not_exist_Colon_0_5058" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[The specified path does not exist: '{0}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";The_target_of_an_assignment_must_be_a_variable_or_a_property_access_2541" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[The target of an assignment must be a variable or a property access.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";The_target_of_an_object_rest_assignment_must_be_a_variable_or_a_property_access_2701" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[The target of an object rest assignment must be a variable or a property access.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";The_this_context_of_type_0_is_not_assignable_to_method_s_this_of_type_1_2684" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[The 'this' context of type '{0}' is not assignable to method's 'this' of type '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";The_this_types_of_each_signature_are_incompatible_2685" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[The 'this' types of each signature are incompatible.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";The_type_0_is_readonly_and_cannot_be_assigned_to_the_mutable_type_1_4104" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[The type '{0}' is 'readonly' and cannot be assigned to the mutable type '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";The_type_argument_for_type_parameter_0_cannot_be_inferred_from_the_usage_Consider_specifying_the_typ_2453" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[The type argument for type parameter '{0}' cannot be inferred from the usage. Consider specifying the type arguments explicitly.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";The_type_of_a_function_declaration_must_match_the_function_s_signature_8030" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[The type of a function declaration must match the function's signature.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";The_type_returned_by_the_0_method_of_an_async_iterator_must_be_a_promise_for_a_type_with_a_value_pro_2547" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[The type returned by the '{0}()' method of an async iterator must be a promise for a type with a 'value' property.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";The_type_returned_by_the_0_method_of_an_iterator_must_have_a_value_property_2490" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[The type returned by the '{0}()' method of an iterator must have a 'value' property.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";The_variable_declaration_of_a_for_in_statement_cannot_have_an_initializer_1189" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[The variable declaration of a 'for...in' statement cannot have an initializer.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";The_variable_declaration_of_a_for_of_statement_cannot_have_an_initializer_1190" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[The variable declaration of a 'for...of' statement cannot have an initializer.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";The_with_statement_is_not_supported_All_symbols_in_a_with_block_will_have_type_any_2410" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[The 'with' statement is not supported. All symbols in a 'with' block will have type 'any'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";This_JSX_tag_s_0_prop_expects_a_single_child_of_type_1_but_multiple_children_were_provided_2746" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[This JSX tag's '{0}' prop expects a single child of type '{1}', but multiple children were provided.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";This_JSX_tag_s_0_prop_expects_type_1_which_requires_multiple_children_but_only_a_single_child_was_pr_2745" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[This JSX tag's '{0}' prop expects type '{1}' which requires multiple children, but only a single child was provided.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";This_condition_will_always_return_0_since_the_types_1_and_2_have_no_overlap_2367" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[This condition will always return '{0}' since the types '{1}' and '{2}' have no overlap.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";This_constructor_function_may_be_converted_to_a_class_declaration_80002" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[This constructor function may be converted to a class declaration.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";This_expression_is_not_callable_2349" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[This expression is not callable.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";This_expression_is_not_constructable_2351" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[This expression is not constructable.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";This_may_be_converted_to_an_async_function_80006" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[This may be converted to an async function.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";This_module_can_only_be_referenced_with_ECMAScript_imports_Slashexports_by_turning_on_the_0_flag_and_2497" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[This module can only be referenced with ECMAScript imports/exports by turning on the '{0}' flag and referencing its default export.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";This_module_is_declared_with_using_export_and_can_only_be_used_with_a_default_import_when_using_the__2594" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[This module is declared with using 'export =', and can only be used with a default import when using the '{0}' flag.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";This_overload_signature_is_not_compatible_with_its_implementation_signature_2394" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[This overload signature is not compatible with its implementation signature.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";This_parameter_is_not_allowed_with_use_strict_directive_1346" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[This parameter is not allowed with 'use strict' directive.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";This_syntax_requires_an_imported_helper_but_module_0_cannot_be_found_2354" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[This syntax requires an imported helper but module '{0}' cannot be found.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";This_syntax_requires_an_imported_helper_named_1_but_module_0_has_no_exported_member_1_2343" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[This syntax requires an imported helper named '{1}', but module '{0}' has no exported member '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Top_level_declarations_in_d_ts_files_must_start_with_either_a_declare_or_export_modifier_1046" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Top-level declarations in .d.ts files must start with either a 'declare' or 'export' modifier.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Trailing_comma_not_allowed_1009" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Trailing comma not allowed.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Transpile_each_file_as_a_separate_module_similar_to_ts_transpileModule_6153" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Transpile each file as a separate module (similar to 'ts.transpileModule').]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Try_npm_install_types_Slash_1_if_it_exists_or_add_a_new_declaration_d_ts_file_containing_declare_mod_7035" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Try `npm install @types/{1}` if it exists or add a new declaration (.d.ts) file containing `declare module '{0}';`]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Trying_other_entries_in_rootDirs_6110" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Trying other entries in 'rootDirs'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Trying_substitution_0_candidate_module_location_Colon_1_6093" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Trying substitution '{0}', candidate module location: '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Tuple_type_0_of_length_1_has_no_element_at_index_2_2493" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Tuple type '{0}' of length '{1}' has no element at index '{2}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Type_0_cannot_be_used_as_an_index_type_2538" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Type '{0}' cannot be used as an index type.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Type_0_cannot_be_used_to_index_type_1_2536" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Type '{0}' cannot be used to index type '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Type_0_does_not_satisfy_the_constraint_1_2344" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Type '{0}' does not satisfy the constraint '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Type_0_has_no_call_signatures_2757" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Type '{0}' has no call signatures.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Type_0_has_no_construct_signatures_2761" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Type '{0}' has no construct signatures.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Type_0_has_no_matching_index_signature_for_type_1_2537" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Type '{0}' has no matching index signature for type '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Type_0_has_no_properties_in_common_with_type_1_2559" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Type '{0}' has no properties in common with type '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Type_0_is_missing_the_following_properties_from_type_1_Colon_2_2739" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Type '{0}' is missing the following properties from type '{1}': {2}]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Type_0_is_missing_the_following_properties_from_type_1_Colon_2_and_3_more_2740" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Type '{0}' is missing the following properties from type '{1}': {2}, and {3} more.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Type_0_is_not_a_constructor_function_type_2507" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Type '{0}' is not a constructor function type.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Prom_1055" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Type '{0}' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Type_0_is_not_an_array_type_2461" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Type '{0}' is not an array type.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Type_0_is_not_an_array_type_or_a_string_type_2495" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Type '{0}' is not an array type or a string type.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Type_0_is_not_an_array_type_or_a_string_type_Use_compiler_option_downlevelIteration_to_allow_iterati_2569" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Type '{0}' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Type_0_is_not_an_array_type_or_a_string_type_or_does_not_have_a_Symbol_iterator_method_that_returns__2549" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Type '{0}' is not an array type or a string type or does not have a '[Symbol.iterator]5D;()' method that returns an iterator.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Type_0_is_not_an_array_type_or_does_not_have_a_Symbol_iterator_method_that_returns_an_iterator_2548" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Type '{0}' is not an array type or does not have a '[Symbol.iterator]5D;()' method that returns an iterator.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Type_0_is_not_assignable_to_type_1_2322" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Type '{0}' is not assignable to type '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Type_0_is_not_assignable_to_type_1_Two_different_types_with_this_name_exist_but_they_are_unrelated_2719" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Type '{0}' is not assignable to type '{1}'. Two different types with this name exist, but they are unrelated.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Type_0_is_not_comparable_to_type_1_2678" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Type '{0}' is not comparable to type '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Type_0_is_not_generic_2315" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Type '{0}' is not generic.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Type_0_must_have_a_Symbol_asyncIterator_method_that_returns_an_async_iterator_2504" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Type '{0}' must have a '[Symbol.asyncIterator]5D;()' method that returns an async iterator.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Type_0_must_have_a_Symbol_iterator_method_that_returns_an_iterator_2488" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Type '{0}' must have a '[Symbol.iterator]5D;()' method that returns an iterator.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Type_0_provides_no_match_for_the_signature_1_2658" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Type '{0}' provides no match for the signature '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Type_0_recursively_references_itself_as_a_base_type_2310" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Type '{0}' recursively references itself as a base type.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Type_alias_0_circularly_references_itself_2456" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Type alias '{0}' circularly references itself.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Type_alias_name_cannot_be_0_2457" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Type alias name cannot be '{0}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Type_annotation_cannot_appear_on_a_constructor_declaration_1093" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Type annotation cannot appear on a constructor declaration.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Type_argument_candidate_1_is_not_a_valid_type_argument_because_it_is_not_a_supertype_of_candidate_0_2455" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Type argument candidate '{1}' is not a valid type argument because it is not a supertype of candidate '{0}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Type_argument_expected_1140" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Type argument expected.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Type_argument_list_cannot_be_empty_1099" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Type argument list cannot be empty.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Type_arguments_cannot_be_used_here_1342" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Type arguments cannot be used here.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Type_declaration_files_to_be_included_in_compilation_6124" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Type declaration files to be included in compilation.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Type_expected_1110" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Type expected.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Type_instantiation_is_excessively_deep_and_possibly_infinite_2589" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Type instantiation is excessively deep and possibly infinite.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Type_is_referenced_directly_or_indirectly_in_the_fulfillment_callback_of_its_own_then_method_1062" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Type is referenced directly or indirectly in the fulfillment callback of its own 'then' method.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Type_of_await_operand_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member_1320" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Type of 'await' operand must either be a valid promise or must not contain a callable 'then' member.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Type_of_computed_property_s_value_is_0_which_is_not_assignable_to_type_1_2418" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Type of computed property's value is '{0}', which is not assignable to type '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Type_of_iterated_elements_of_a_yield_Asterisk_operand_must_either_be_a_valid_promise_or_must_not_con_1322" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Type of iterated elements of a 'yield*' operand must either be a valid promise or must not contain a callable 'then' member.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Type_of_yield_operand_in_an_async_generator_must_either_be_a_valid_promise_or_must_not_contain_a_cal_1321" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Type of 'yield' operand in an async generator must either be a valid promise or must not contain a callable 'then' member.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Type_originates_at_this_import_A_namespace_style_import_cannot_be_called_or_constructed_and_will_cau_7038" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Type originates at this import. A namespace-style import cannot be called or constructed, and will cause a failure at runtime. Consider using a default import or import require here instead.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Type_parameter_0_has_a_circular_constraint_2313" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Type parameter '{0}' has a circular constraint.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Type_parameter_0_has_a_circular_default_2716" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Type parameter '{0}' has a circular default.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Type_parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1_4008" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Type parameter '{0}' of call signature from exported interface has or is using private name '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Type_parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1_4006" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Type parameter '{0}' of constructor signature from exported interface has or is using private name '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Type_parameter_0_of_exported_class_has_or_is_using_private_name_1_4002" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Type parameter '{0}' of exported class has or is using private name '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Type_parameter_0_of_exported_function_has_or_is_using_private_name_1_4016" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Type parameter '{0}' of exported function has or is using private name '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1_4004" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Type parameter '{0}' of exported interface has or is using private name '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Type_parameter_0_of_exported_mapped_object_type_is_using_private_name_1_4103" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Type parameter '{0}' of exported mapped object type is using private name '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Type_parameter_0_of_exported_type_alias_has_or_is_using_private_name_1_4083" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Type parameter '{0}' of exported type alias has or is using private name '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Type_parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1_4014" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Type parameter '{0}' of method from exported interface has or is using private name '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Type_parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1_4012" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Type parameter '{0}' of public method from exported class has or is using private name '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Type_parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1_4010" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Type parameter '{0}' of public static method from exported class has or is using private name '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Type_parameter_declaration_expected_1139" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Type parameter declaration expected.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Type_parameter_defaults_can_only_reference_previously_declared_type_parameters_2744" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Type parameter defaults can only reference previously declared type parameters.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Type_parameter_list_cannot_be_empty_1098" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Type parameter list cannot be empty.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Type_parameter_name_cannot_be_0_2368" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Type parameter name cannot be '{0}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Type_parameters_cannot_appear_on_a_constructor_declaration_1092" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Type parameters cannot appear on a constructor declaration.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Type_predicate_0_is_not_assignable_to_1_1226" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Type predicate '{0}' is not assignable to '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Type_reference_directive_0_was_not_resolved_6120" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[======== Type reference directive '{0}' was not resolved. ========]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2_6119" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[======== Type reference directive '{0}' was successfully resolved to '{1}', primary: {2}. ========]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Type_reference_directive_0_was_successfully_resolved_to_1_with_Package_ID_2_primary_Colon_3_6219" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[======== Type reference directive '{0}' was successfully resolved to '{1}' with Package ID '{2}', primary: {3}. ========]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Types_have_separate_declarations_of_a_private_property_0_2442" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Types have separate declarations of a private property '{0}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Types_of_parameters_0_and_1_are_incompatible_2328" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Types of parameters '{0}' and '{1}' are incompatible.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Types_of_property_0_are_incompatible_2326" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Types of property '{0}' are incompatible.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Unable_to_open_file_0_6050" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Unable to open file '{0}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Unable_to_resolve_signature_of_class_decorator_when_called_as_an_expression_1238" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Unable to resolve signature of class decorator when called as an expression.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Unable_to_resolve_signature_of_method_decorator_when_called_as_an_expression_1241" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Unable to resolve signature of method decorator when called as an expression.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Unable_to_resolve_signature_of_parameter_decorator_when_called_as_an_expression_1239" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Unable to resolve signature of parameter decorator when called as an expression.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Unable_to_resolve_signature_of_property_decorator_when_called_as_an_expression_1240" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Unable to resolve signature of property decorator when called as an expression.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Unexpected_end_of_text_1126" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Unexpected end of text.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Unexpected_token_1012" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Unexpected token.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Unexpected_token_A_constructor_method_accessor_or_property_was_expected_1068" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Unexpected token. A constructor, method, accessor, or property was expected.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Unexpected_token_A_type_parameter_name_was_expected_without_curly_braces_1069" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Unexpected token. A type parameter name was expected without curly braces.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Unexpected_token_expected_1179" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Unexpected token. '{' expected.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Unknown_build_option_0_5072" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Unknown build option '{0}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Unknown_compiler_option_0_5023" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Unknown compiler option '{0}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Unknown_option_excludes_Did_you_mean_exclude_6114" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Unknown option 'excludes'. Did you mean 'exclude'?]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Unknown_type_acquisition_option_0_17010" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Unknown type acquisition option '{0}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Unreachable_code_detected_7027" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Unreachable code detected.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Unsupported_locale_0_6049" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Unsupported locale '{0}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Unterminated_Unicode_escape_sequence_1199" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Unterminated Unicode escape sequence.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Unterminated_quoted_string_in_response_file_0_6045" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Unterminated quoted string in response file '{0}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Unterminated_regular_expression_literal_1161" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Unterminated regular expression literal.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Unterminated_string_literal_1002" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Unterminated string literal.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Unterminated_template_literal_1160" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Unterminated template literal.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Untyped_function_calls_may_not_accept_type_arguments_2347" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Untyped function calls may not accept type arguments.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Unused_label_7028" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Unused label.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Updating_output_of_project_0_6373" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Updating output of project '{0}'...]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Updating_output_timestamps_of_project_0_6359" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Updating output timestamps of project '{0}'...]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Updating_unchanged_output_timestamps_of_project_0_6371" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Updating unchanged output timestamps of project '{0}'...]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Use_synthetic_default_member_95016" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Use synthetic 'default' member.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Using_a_string_in_a_for_of_statement_is_only_supported_in_ECMAScript_5_and_higher_2494" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Using a string in a 'for...of' statement is only supported in ECMAScript 5 and higher.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Using_compiler_options_of_project_reference_redirect_0_6215" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Using compiler options of project reference redirect '{0}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";VERSION_6036" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[VERSION]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Value_of_type_0_has_no_properties_in_common_with_type_1_Did_you_mean_to_call_it_2560" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Value of type '{0}' has no properties in common with type '{1}'. Did you mean to call it?]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Value_of_type_0_is_not_callable_Did_you_mean_to_include_new_2348" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Value of type '{0}' is not callable. Did you mean to include 'new'?]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Variable_0_implicitly_has_an_1_type_7005" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Variable '{0}' implicitly has an '{1}' type.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Variable_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage_7043" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Variable '{0}' implicitly has an '{1}' type, but a better type may be inferred from usage.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Variable_0_implicitly_has_type_1_in_some_locations_but_a_better_type_may_be_inferred_from_usage_7046" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Variable '{0}' implicitly has type '{1}' in some locations, but a better type may be inferred from usage.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Variable_0_implicitly_has_type_1_in_some_locations_where_its_type_cannot_be_determined_7034" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Variable '{0}' implicitly has type '{1}' in some locations where its type cannot be determined.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Variable_0_is_used_before_being_assigned_2454" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Variable '{0}' is used before being assigned.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Variable_declaration_expected_1134" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Variable declaration expected.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Variable_declaration_list_cannot_be_empty_1123" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Variable declaration list cannot be empty.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Version_0_6029" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Version {0}]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Watch_input_files_6005" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Watch input files.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";Whether_to_keep_outdated_console_output_in_watch_mode_instead_of_clearing_the_screen_6191" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[Whether to keep outdated console output in watch mode instead of clearing the screen.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";You_cannot_rename_a_module_via_a_global_import_8031" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[You cannot rename a module via a global import.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library_8001" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[You cannot rename elements that are defined in the standard TypeScript library.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";You_cannot_rename_this_element_8000" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[You cannot rename this element.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";_0_accepts_too_few_arguments_to_be_used_as_a_decorator_here_Did_you_mean_to_call_it_first_and_write__1329" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['{0}' accepts too few arguments to be used as a decorator here. Did you mean to call it first and write '@{0}()'?]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";_0_are_specified_twice_The_attribute_named_0_will_be_overwritten_2710" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['{0}' are specified twice. The attribute named '{0}' will be overwritten.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";_0_can_only_be_used_in_a_ts_file_8009" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['{0}' can only be used in a .ts file.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";_0_components_don_t_accept_text_as_child_elements_Text_in_JSX_has_the_type_string_but_the_expected_t_2747" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['{0}' components don't accept text as child elements. Text in JSX has the type 'string', but the expected type of '{1}' is '{2}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";_0_expected_1005" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['{0}' expected.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";_0_implicitly_has_an_1_return_type_but_a_better_type_may_be_inferred_from_usage_7050" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['{0}' implicitly has an '{1}' return type, but a better type may be inferred from usage.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";_0_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_reference_7023" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['{0}' implicitly has return type 'any' because it does not have a return type annotation and is referenced directly or indirectly in one of its return expressions.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";_0_implicitly_has_type_any_because_it_does_not_have_a_type_annotation_and_is_referenced_directly_or__7022" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['{0}' implicitly has type 'any' because it does not have a type annotation and is referenced directly or indirectly in its own initializer.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";_0_is_a_primitive_but_1_is_a_wrapper_object_Prefer_using_0_when_possible_2692" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['{0}' is a primitive, but '{1}' is a wrapper object. Prefer using '{0}' when possible.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";_0_is_assignable_to_the_constraint_of_type_1_but_1_could_be_instantiated_with_a_different_subtype_of_5075" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['{0}' is assignable to the constraint of type '{1}', but '{1}' could be instantiated with a different subtype of constraint '{2}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";_0_is_declared_but_its_value_is_never_read_6133" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['{0}' is declared but its value is never read.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";_0_is_declared_but_never_used_6196" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['{0}' is declared but never used.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";_0_is_declared_here_2728" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['{0}' is declared here.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";_0_is_not_a_valid_meta_property_for_keyword_1_Did_you_mean_2_17012" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['{0}' is not a valid meta-property for keyword '{1}'. Did you mean '{2}'?]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";_0_is_referenced_directly_or_indirectly_in_its_own_base_expression_2506" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['{0}' is referenced directly or indirectly in its own base expression.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";_0_is_referenced_directly_or_indirectly_in_its_own_type_annotation_2502" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['{0}' is referenced directly or indirectly in its own type annotation.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";_0_list_cannot_be_empty_1097" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['{0}' list cannot be empty.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";_0_modifier_already_seen_1030" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['{0}' modifier already seen.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";_0_modifier_cannot_appear_on_a_class_element_1031" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['{0}' modifier cannot appear on a class element.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";_0_modifier_cannot_appear_on_a_constructor_declaration_1089" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['{0}' modifier cannot appear on a constructor declaration.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";_0_modifier_cannot_appear_on_a_data_property_1043" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['{0}' modifier cannot appear on a data property.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";_0_modifier_cannot_appear_on_a_module_or_namespace_element_1044" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['{0}' modifier cannot appear on a module or namespace element.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";_0_modifier_cannot_appear_on_a_parameter_1090" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['{0}' modifier cannot appear on a parameter.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";_0_modifier_cannot_appear_on_a_type_member_1070" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['{0}' modifier cannot appear on a type member.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";_0_modifier_cannot_appear_on_an_index_signature_1071" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['{0}' modifier cannot appear on an index signature.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";_0_modifier_cannot_be_used_here_1042" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['{0}' modifier cannot be used here.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";_0_modifier_cannot_be_used_in_an_ambient_context_1040" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['{0}' modifier cannot be used in an ambient context.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";_0_modifier_cannot_be_used_with_1_modifier_1243" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['{0}' modifier cannot be used with '{1}' modifier.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";_0_modifier_cannot_be_used_with_a_class_declaration_1041" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['{0}' modifier cannot be used with a class declaration.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";_0_modifier_must_precede_1_modifier_1029" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['{0}' modifier must precede '{1}' modifier.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";_0_only_refers_to_a_type_but_is_being_used_as_a_namespace_here_2702" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['{0}' only refers to a type, but is being used as a namespace here.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";_0_only_refers_to_a_type_but_is_being_used_as_a_value_here_2693" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['{0}' only refers to a type, but is being used as a value here.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";_0_only_refers_to_a_type_but_is_being_used_as_a_value_here_Do_you_need_to_change_your_target_library_2585" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['{0}' only refers to a type, but is being used as a value here. Do you need to change your target library? Try changing the `lib` compiler option to es2015 or later.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";_0_refers_to_a_UMD_global_but_the_current_file_is_a_module_Consider_adding_an_import_instead_2686" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['{0}' refers to a UMD global, but the current file is a module. Consider adding an import instead.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";_0_refers_to_a_value_but_is_being_used_as_a_type_here_2749" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['{0}' refers to a value, but is being used as a type here.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";_0_tag_already_specified_1223" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['{0}' tag already specified.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";_0_tag_cannot_be_used_independently_as_a_top_level_JSDoc_tag_1253" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['{0}' tag cannot be used independently as a top level JSDoc tag.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";_0_was_also_declared_here_6203" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['{0}' was also declared here.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";_0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type_7010" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['{0}', which lacks return-type annotation, implicitly has an '{1}' return type.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";_0_which_lacks_return_type_annotation_implicitly_has_an_1_yield_type_7055" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['{0}', which lacks return-type annotation, implicitly has an '{1}' yield type.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";abstract_modifier_can_only_appear_on_a_class_method_or_property_declaration_1242" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['abstract' modifier can only appear on a class, method, or property declaration.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";and_here_6204" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[and here.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";await_expression_is_only_allowed_within_an_async_function_1308" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['await' expression is only allowed within an async function.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";await_expressions_cannot_be_used_in_a_parameter_initializer_2524" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['await' expressions cannot be used in a parameter initializer.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";await_has_no_effect_on_the_type_of_this_expression_80007" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['await' has no effect on the type of this expression.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";baseUrl_option_is_set_to_0_using_this_value_to_resolve_non_relative_module_name_1_6106" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['baseUrl' option is set to '{0}', using this value to resolve non-relative module name '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";can_only_be_used_in_an_object_literal_property_inside_a_destructuring_assignment_1312" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['=' can only be used in an object literal property inside a destructuring assignment.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";case_or_default_expected_1130" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['case' or 'default' expected.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";class_expressions_are_not_currently_supported_9003" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['class' expressions are not currently supported.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";const_declarations_can_only_be_declared_inside_a_block_1156" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['const' declarations can only be declared inside a block.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";const_declarations_must_be_initialized_1155" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['const' declarations must be initialized.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";const_enum_member_initializer_was_evaluated_to_a_non_finite_value_2477" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['const' enum member initializer was evaluated to a non-finite value.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";const_enum_member_initializer_was_evaluated_to_disallowed_value_NaN_2478" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['const' enum member initializer was evaluated to disallowed value 'NaN'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";const_enum_member_initializers_can_only_contain_literal_values_and_other_computed_enum_values_2474" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[const enum member initializers can only contain literal values and other computed enum values.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";const_enums_can_only_be_used_in_property_or_index_access_expressions_or_the_right_hand_side_of_an_im_2475" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['const' enums can only be used in property or index access expressions or the right hand side of an import declaration or export assignment or type query.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";delete_cannot_be_called_on_an_identifier_in_strict_mode_1102" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['delete' cannot be called on an identifier in strict mode.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";delete_this_Project_0_is_up_to_date_because_it_was_previously_built_6360" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[delete this - Project '{0}' is up to date because it was previously built]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";enum_declarations_can_only_be_used_in_a_ts_file_8015" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['enum declarations' can only be used in a .ts file.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";export_can_only_be_used_in_a_ts_file_8003" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['export=' can only be used in a .ts file.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";export_modifier_cannot_be_applied_to_ambient_modules_and_module_augmentations_since_they_are_always__2668" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['export' modifier cannot be applied to ambient modules and module augmentations since they are always visible.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";extends_clause_already_seen_1172" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['extends' clause already seen.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";extends_clause_must_precede_implements_clause_1173" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['extends' clause must precede 'implements' clause.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";extends_clause_of_exported_class_0_has_or_is_using_private_name_1_4020" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['extends' clause of exported class '{0}' has or is using private name '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";extends_clause_of_exported_interface_0_has_or_is_using_private_name_1_4022" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['extends' clause of exported interface '{0}' has or is using private name '{1}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";file_6025" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[file]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";get_and_set_accessor_must_have_the_same_this_type_2682" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['get' and 'set' accessor must have the same 'this' type.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";get_and_set_accessor_must_have_the_same_type_2380" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['get' and 'set' accessor must have the same type.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";implements_clause_already_seen_1175" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['implements' clause already seen.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";implements_clauses_can_only_be_used_in_a_ts_file_8005" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['implements clauses' can only be used in a .ts file.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";import_can_only_be_used_in_a_ts_file_8002" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['import ... =' can only be used in a .ts file.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";infer_declarations_are_only_permitted_in_the_extends_clause_of_a_conditional_type_1338" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['infer' declarations are only permitted in the 'extends' clause of a conditional type.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";interface_declarations_can_only_be_used_in_a_ts_file_8006" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['interface declarations' can only be used in a .ts file.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";let_declarations_can_only_be_declared_inside_a_block_1157" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['let' declarations can only be declared inside a block.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";let_is_not_allowed_to_be_used_as_a_name_in_let_or_const_declarations_2480" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['let' is not allowed to be used as a name in 'let' or 'const' declarations.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";module_declarations_can_only_be_used_in_a_ts_file_8007" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['module declarations' can only be used in a .ts file.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";new_T_cannot_be_used_to_create_an_array_Use_new_Array_T_instead_1150" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['new T[]5D;' cannot be used to create an array. Use 'new Array<T>()' instead.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";new_expression_whose_target_lacks_a_construct_signature_implicitly_has_an_any_type_7009" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['new' expression, whose target lacks a construct signature, implicitly has an 'any' type.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";non_null_assertions_can_only_be_used_in_a_ts_file_8013" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['non-null assertions' can only be used in a .ts file.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";options_6024" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA[options]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";or_expected_1144" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['{' or ';' expected.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";package_json_does_not_have_a_0_field_6100" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['package.json' does not have a '{0}' field.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";package_json_does_not_have_a_typesVersions_entry_that_matches_version_0_6207" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['package.json' does not have a 'typesVersions' entry that matches version '{0}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";package_json_had_a_falsy_0_field_6220" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['package.json' had a falsy '{0}' field.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";package_json_has_0_field_1_that_references_2_6101" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['package.json' has '{0}' field '{1}' that references '{2}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";package_json_has_a_typesVersions_entry_0_that_is_not_a_valid_semver_range_6209" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['package.json' has a 'typesVersions' entry '{0}' that is not a valid semver range.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";package_json_has_a_typesVersions_entry_0_that_matches_compiler_version_1_looking_for_a_pattern_to_ma_6208" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['package.json' has a 'typesVersions' entry '{0}' that matches compiler version '{1}', looking for a pattern to match module name '{2}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";package_json_has_a_typesVersions_field_with_version_specific_path_mappings_6206" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['package.json' has a 'typesVersions' field with version-specific path mappings.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";parameter_modifiers_can_only_be_used_in_a_ts_file_8012" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['parameter modifiers' can only be used in a .ts file.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";paths_option_is_specified_looking_for_a_pattern_to_match_module_name_0_6091" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['paths' option is specified, looking for a pattern to match module name '{0}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";readonly_modifier_can_only_appear_on_a_property_declaration_or_index_signature_1024" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['readonly' modifier can only appear on a property declaration or index signature.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";readonly_type_modifier_is_only_permitted_on_array_and_tuple_literal_types_1354" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['readonly' type modifier is only permitted on array and tuple literal types.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";require_call_may_be_converted_to_an_import_80005" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['require' call may be converted to an import.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";rootDirs_option_is_set_using_it_to_resolve_relative_module_name_0_6107" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['rootDirs' option is set, using it to resolve relative module name '{0}'.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";super_can_only_be_referenced_in_a_derived_class_2335" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['super' can only be referenced in a derived class.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";super_can_only_be_referenced_in_members_of_derived_classes_or_object_literal_expressions_2660" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['super' can only be referenced in members of derived classes or object literal expressions.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";super_cannot_be_referenced_in_a_computed_property_name_2466" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['super' cannot be referenced in a computed property name.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";super_cannot_be_referenced_in_constructor_arguments_2336" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['super' cannot be referenced in constructor arguments.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";super_is_only_allowed_in_members_of_object_literal_expressions_when_option_target_is_ES2015_or_highe_2659" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['super' is only allowed in members of object literal expressions when option 'target' is 'ES2015' or higher.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";super_may_not_use_type_arguments_2754" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['super' may not use type arguments.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";super_must_be_called_before_accessing_a_property_of_super_in_the_constructor_of_a_derived_class_17011" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['super' must be called before accessing a property of 'super' in the constructor of a derived class.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";super_must_be_called_before_accessing_this_in_the_constructor_of_a_derived_class_17009" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['super' must be called before accessing 'this' in the constructor of a derived class.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";super_must_be_followed_by_an_argument_list_or_member_access_1034" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['super' must be followed by an argument list or member access.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";super_property_access_is_permitted_only_in_a_constructor_member_function_or_member_accessor_of_a_der_2338" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['super' property access is permitted only in a constructor, member function, or member accessor of a derived class.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";this_cannot_be_referenced_in_a_computed_property_name_2465" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['this' cannot be referenced in a computed property name.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";this_cannot_be_referenced_in_a_module_or_namespace_body_2331" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['this' cannot be referenced in a module or namespace body.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";this_cannot_be_referenced_in_a_static_property_initializer_2334" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['this' cannot be referenced in a static property initializer.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";this_cannot_be_referenced_in_constructor_arguments_2333" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['this' cannot be referenced in constructor arguments.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";this_cannot_be_referenced_in_current_location_2332" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['this' cannot be referenced in current location.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";this_implicitly_has_type_any_because_it_does_not_have_a_type_annotation_2683" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['this' implicitly has type 'any' because it does not have a type annotation.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";type_aliases_can_only_be_used_in_a_ts_file_8008" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['type aliases' can only be used in a .ts file.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";type_arguments_can_only_be_used_in_a_ts_file_8011" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['type arguments' can only be used in a .ts file.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";type_assertion_expressions_can_only_be_used_in_a_ts_file_8016" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['type assertion expressions' can only be used in a .ts file.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";type_parameter_declarations_can_only_be_used_in_a_ts_file_8004" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['type parameter declarations' can only be used in a .ts file.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";types_can_only_be_used_in_a_ts_file_8010" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['types' can only be used in a .ts file.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";unique_symbol_types_are_not_allowed_here_1335" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['unique symbol' types are not allowed here.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";unique_symbol_types_are_only_allowed_on_variables_in_a_variable_statement_1334" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['unique symbol' types are only allowed on variables in a variable statement.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";unique_symbol_types_may_not_be_used_on_a_variable_declaration_with_a_binding_name_1333" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['unique symbol' types may not be used on a variable declaration with a binding name.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";use_strict_directive_cannot_be_used_with_non_simple_parameter_list_1347" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['use strict' directive cannot be used with non-simple parameter list.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";use_strict_directive_used_here_1349" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['use strict' directive used here.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";with_statements_are_not_allowed_in_an_async_function_block_1300" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['with' statements are not allowed in an async function block.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";with_statements_are_not_allowed_in_strict_mode_1101" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['with' statements are not allowed in strict mode.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-            <Item ItemId=";yield_expressions_cannot_be_used_in_a_parameter_initializer_2523" ItemType="0" PsrId="306" Leaf="true">
-              <Str Cat="Text">
-                <Val><![CDATA['yield' expressions cannot be used in a parameter initializer.]]></Val>
-              </Str>
-              <Disp Icon="Str" />
-            </Item>
-    </Item>
-  </Item>
-</LCX>
\ No newline at end of file
diff --git a/scripts/produceLKG.ts b/scripts/produceLKG.ts
index 31a81f97a2c..1a6f6dc4c2e 100644
--- a/scripts/produceLKG.ts
+++ b/scripts/produceLKG.ts
@@ -30,7 +30,7 @@ async function copyLocalizedDiagnostics() {
     for (const d of dir) {
         const fileName = path.join(source, d);
         if (fs.statSync(fileName).isDirectory()) {
-            if (d === 'tslint') continue;
+            if (d === 'tslint' || d === 'enu') continue;
             await fs.copy(fileName, path.join(dest, d));
         }
     }

From 3b54ffcf0e80c91f8f2859eeb23f4f6b778836b1 Mon Sep 17 00:00:00 2001
From: Wesley Wigham <wewigham@microsoft.com>
Date: Mon, 5 Aug 2019 16:47:29 -0700
Subject: [PATCH 110/151] Preserve const enums should keep import refs (#28498)

* Preserve const enums should keep import refs

for exported const enums exported via export default

Move some functionality around, small cleanup

Remove unneeded const enum check

* Only mark const enums as references with preserveConstEnums on in export assignments

* Limit change to declarations and preserveConstEnums mode
---
 src/compiler/checker.ts                       | 46 +++++++++++-------
 .../reference/amdModuleConstEnumUsage.js      | 40 ++++++++++++++++
 .../reference/amdModuleConstEnumUsage.symbols | 29 ++++++++++++
 .../reference/amdModuleConstEnumUsage.types   | 30 ++++++++++++
 .../constEnumNoPreserveDeclarationReexport.js | 28 +++++++++++
 ...tEnumNoPreserveDeclarationReexport.symbols | 47 +++++++++++++++++++
 ...nstEnumNoPreserveDeclarationReexport.types | 47 +++++++++++++++++++
 .../constEnumPreserveEmitReexport.js          | 32 +++++++++++++
 .../constEnumPreserveEmitReexport.symbols     | 23 +++++++++
 .../constEnumPreserveEmitReexport.types       | 23 +++++++++
 .../exportAsNamespaceConflict.errors.txt      |  5 +-
 .../exportsAndImports1-amd.errors.txt         | 40 ++++++++++++++++
 .../exportsAndImports1-es6.errors.txt         | 40 ++++++++++++++++
 .../reference/exportsAndImports1.errors.txt   | 40 ++++++++++++++++
 .../exportsAndImports3-amd.errors.txt         | 40 ++++++++++++++++
 .../exportsAndImports3-es6.errors.txt         | 40 ++++++++++++++++
 .../reference/exportsAndImports3.errors.txt   | 40 ++++++++++++++++
 .../cases/compiler/amdModuleConstEnumUsage.ts | 16 +++++++
 .../constEnumNoPreserveDeclarationReexport.ts | 18 +++++++
 .../compiler/constEnumPreserveEmitReexport.ts | 11 +++++
 20 files changed, 615 insertions(+), 20 deletions(-)
 create mode 100644 tests/baselines/reference/amdModuleConstEnumUsage.js
 create mode 100644 tests/baselines/reference/amdModuleConstEnumUsage.symbols
 create mode 100644 tests/baselines/reference/amdModuleConstEnumUsage.types
 create mode 100644 tests/baselines/reference/constEnumNoPreserveDeclarationReexport.js
 create mode 100644 tests/baselines/reference/constEnumNoPreserveDeclarationReexport.symbols
 create mode 100644 tests/baselines/reference/constEnumNoPreserveDeclarationReexport.types
 create mode 100644 tests/baselines/reference/constEnumPreserveEmitReexport.js
 create mode 100644 tests/baselines/reference/constEnumPreserveEmitReexport.symbols
 create mode 100644 tests/baselines/reference/constEnumPreserveEmitReexport.types
 create mode 100644 tests/baselines/reference/exportsAndImports1-amd.errors.txt
 create mode 100644 tests/baselines/reference/exportsAndImports1-es6.errors.txt
 create mode 100644 tests/baselines/reference/exportsAndImports1.errors.txt
 create mode 100644 tests/baselines/reference/exportsAndImports3-amd.errors.txt
 create mode 100644 tests/baselines/reference/exportsAndImports3-es6.errors.txt
 create mode 100644 tests/baselines/reference/exportsAndImports3.errors.txt
 create mode 100644 tests/cases/compiler/amdModuleConstEnumUsage.ts
 create mode 100644 tests/cases/compiler/constEnumNoPreserveDeclarationReexport.ts
 create mode 100644 tests/cases/compiler/constEnumPreserveEmitReexport.ts

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index f699c08b4db..85f2f84c677 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -2380,7 +2380,7 @@ namespace ts {
             return links.target;
         }
 
-        function markExportAsReferenced(node: ImportEqualsDeclaration | ExportAssignment | ExportSpecifier) {
+        function markExportAsReferenced(node: ImportEqualsDeclaration | ExportSpecifier) {
             const symbol = getSymbolOfNode(node);
             const target = resolveAlias(symbol);
             if (target) {
@@ -2402,15 +2402,10 @@ namespace ts {
                 links.referenced = true;
                 const node = getDeclarationOfAliasSymbol(symbol);
                 if (!node) return Debug.fail();
-                if (node.kind === SyntaxKind.ExportAssignment) {
-                    // export default <symbol>
-                    checkExpressionCached((<ExportAssignment>node).expression);
-                }
-                else if (node.kind === SyntaxKind.ExportSpecifier) {
-                    // export { <symbol> } or export { <symbol> as foo }
-                    checkExpressionCached((<ExportSpecifier>node).propertyName || (<ExportSpecifier>node).name);
-                }
-                else if (isInternalModuleImportEqualsDeclaration(node)) {
+                // We defer checking of the reference of an `import =` until the import itself is referenced,
+                // This way a chain of imports can be elided if ultimately the final input is only used in a type
+                // position.
+                if (isInternalModuleImportEqualsDeclaration(node)) {
                     // import foo = <symbol>
                     checkExpressionCached(<Expression>node.moduleReference);
                 }
@@ -17833,8 +17828,12 @@ namespace ts {
             return type;
         }
 
+        function isExportOrExportExpression(location: Node) {
+            return !!findAncestor(location, e => e.parent && isExportAssignment(e.parent) && e.parent.expression === e && isEntityNameExpression(e));
+        }
+
         function markAliasReferenced(symbol: Symbol, location: Node) {
-            if (isNonLocalAlias(symbol, /*excludes*/ SymbolFlags.Value) && !isInTypeQuery(location) && !isConstEnumOrConstEnumOnlyModule(resolveAlias(symbol))) {
+            if (isNonLocalAlias(symbol, /*excludes*/ SymbolFlags.Value) && !isInTypeQuery(location) && ((compilerOptions.preserveConstEnums && isExportOrExportExpression(location)) || !isConstEnumOrConstEnumOnlyModule(resolveAlias(symbol)))) {
                 markAliasSymbolAsReferenced(symbol);
             }
         }
@@ -20345,8 +20344,8 @@ namespace ts {
                 // if jsx emit was not react as there wont be error being emitted
                 reactSym.isReferenced = SymbolFlags.All;
 
-                // If react symbol is alias, mark it as referenced
-                if (reactSym.flags & SymbolFlags.Alias && !isConstEnumOrConstEnumOnlyModule(resolveAlias(reactSym))) {
+                // If react symbol is alias, mark it as refereced
+                if (reactSym.flags & SymbolFlags.Alias) {
                     markAliasSymbolAsReferenced(reactSym);
                 }
             }
@@ -24897,7 +24896,7 @@ namespace ts {
             return result;
         }
 
-        function checkExpressionCached(node: Expression, checkMode?: CheckMode): Type {
+        function checkExpressionCached(node: Expression | QualifiedName, checkMode?: CheckMode): Type {
             const links = getNodeLinks(node);
             if (!links.resolvedType) {
                 if (checkMode && checkMode !== CheckMode.Normal) {
@@ -25225,7 +25224,8 @@ namespace ts {
                 (node.parent.kind === SyntaxKind.PropertyAccessExpression && (<PropertyAccessExpression>node.parent).expression === node) ||
                 (node.parent.kind === SyntaxKind.ElementAccessExpression && (<ElementAccessExpression>node.parent).expression === node) ||
                 ((node.kind === SyntaxKind.Identifier || node.kind === SyntaxKind.QualifiedName) && isInRightSideOfImportOrExportAssignment(<Identifier>node) ||
-                    (node.parent.kind === SyntaxKind.TypeQuery && (<TypeQueryNode>node.parent).exprName === node));
+                    (node.parent.kind === SyntaxKind.TypeQuery && (<TypeQueryNode>node.parent).exprName === node)) ||
+                (node.parent.kind === SyntaxKind.ExportSpecifier && (compilerOptions.preserveConstEnums || node.flags & NodeFlags.Ambient)); // We allow reexporting const enums
 
             if (!ok) {
                 error(node, Diagnostics.const_enums_can_only_be_used_in_property_or_index_access_expressions_or_the_right_hand_side_of_an_import_declaration_or_export_assignment_or_type_query);
@@ -30153,6 +30153,10 @@ namespace ts {
                 }
                 else {
                     markExportAsReferenced(node);
+                    const target = symbol && (symbol.flags & SymbolFlags.Alias ? resolveAlias(symbol) : symbol);
+                    if (!target || target === unknownSymbol || target.flags & SymbolFlags.Value) {
+                        checkExpressionCached(node.propertyName || node.name);
+                    }
                 }
             }
         }
@@ -30179,7 +30183,17 @@ namespace ts {
                 grammarErrorOnFirstToken(node, Diagnostics.An_export_assignment_cannot_have_modifiers);
             }
             if (node.expression.kind === SyntaxKind.Identifier) {
-                markExportAsReferenced(node);
+                const id = node.expression as Identifier;
+                const sym = resolveEntityName(id, SymbolFlags.All, /*ignoreErrors*/ true, /*dontResolveAlias*/ true, node);
+                if (sym) {
+                    markAliasReferenced(sym, id);
+                    // If not a value, we're interpreting the identifier as a type export, along the lines of (`export { Id as default }`)
+                    const target = sym.flags & SymbolFlags.Alias ? resolveAlias(sym) : sym;
+                    if (target === unknownSymbol || target.flags & SymbolFlags.Value) {
+                        // However if it is a value, we need to check it's being used correctly
+                        checkExpressionCached(node.expression);
+                    }
+                }
 
                 if (getEmitDeclarations(compilerOptions)) {
                     collectLinkedAliases(node.expression as Identifier, /*setVisibility*/ true);
diff --git a/tests/baselines/reference/amdModuleConstEnumUsage.js b/tests/baselines/reference/amdModuleConstEnumUsage.js
new file mode 100644
index 00000000000..a15bdb42ea3
--- /dev/null
+++ b/tests/baselines/reference/amdModuleConstEnumUsage.js
@@ -0,0 +1,40 @@
+//// [tests/cases/compiler/amdModuleConstEnumUsage.ts] ////
+
+//// [cc.ts]
+export const enum CharCode {
+    A,
+    B
+}
+//// [file.ts]
+import { CharCode } from 'defs/cc';
+export class User {
+    method(input: number) {
+        if (CharCode.A === input) {}
+    }
+}
+
+
+//// [cc.js]
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    exports.__esModule = true;
+    var CharCode;
+    (function (CharCode) {
+        CharCode[CharCode["A"] = 0] = "A";
+        CharCode[CharCode["B"] = 1] = "B";
+    })(CharCode = exports.CharCode || (exports.CharCode = {}));
+});
+//// [file.js]
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    exports.__esModule = true;
+    var User = /** @class */ (function () {
+        function User() {
+        }
+        User.prototype.method = function (input) {
+            if (0 /* A */ === input) { }
+        };
+        return User;
+    }());
+    exports.User = User;
+});
diff --git a/tests/baselines/reference/amdModuleConstEnumUsage.symbols b/tests/baselines/reference/amdModuleConstEnumUsage.symbols
new file mode 100644
index 00000000000..d6831b01814
--- /dev/null
+++ b/tests/baselines/reference/amdModuleConstEnumUsage.symbols
@@ -0,0 +1,29 @@
+=== /proj/defs/cc.ts ===
+export const enum CharCode {
+>CharCode : Symbol(CharCode, Decl(cc.ts, 0, 0))
+
+    A,
+>A : Symbol(CharCode.A, Decl(cc.ts, 0, 28))
+
+    B
+>B : Symbol(CharCode.B, Decl(cc.ts, 1, 6))
+}
+=== /proj/component/file.ts ===
+import { CharCode } from 'defs/cc';
+>CharCode : Symbol(CharCode, Decl(file.ts, 0, 8))
+
+export class User {
+>User : Symbol(User, Decl(file.ts, 0, 35))
+
+    method(input: number) {
+>method : Symbol(User.method, Decl(file.ts, 1, 19))
+>input : Symbol(input, Decl(file.ts, 2, 11))
+
+        if (CharCode.A === input) {}
+>CharCode.A : Symbol(CharCode.A, Decl(cc.ts, 0, 28))
+>CharCode : Symbol(CharCode, Decl(file.ts, 0, 8))
+>A : Symbol(CharCode.A, Decl(cc.ts, 0, 28))
+>input : Symbol(input, Decl(file.ts, 2, 11))
+    }
+}
+
diff --git a/tests/baselines/reference/amdModuleConstEnumUsage.types b/tests/baselines/reference/amdModuleConstEnumUsage.types
new file mode 100644
index 00000000000..2070c5733a0
--- /dev/null
+++ b/tests/baselines/reference/amdModuleConstEnumUsage.types
@@ -0,0 +1,30 @@
+=== /proj/defs/cc.ts ===
+export const enum CharCode {
+>CharCode : CharCode
+
+    A,
+>A : CharCode.A
+
+    B
+>B : CharCode.B
+}
+=== /proj/component/file.ts ===
+import { CharCode } from 'defs/cc';
+>CharCode : typeof CharCode
+
+export class User {
+>User : User
+
+    method(input: number) {
+>method : (input: number) => void
+>input : number
+
+        if (CharCode.A === input) {}
+>CharCode.A === input : boolean
+>CharCode.A : CharCode.A
+>CharCode : typeof CharCode
+>A : CharCode.A
+>input : number
+    }
+}
+
diff --git a/tests/baselines/reference/constEnumNoPreserveDeclarationReexport.js b/tests/baselines/reference/constEnumNoPreserveDeclarationReexport.js
new file mode 100644
index 00000000000..0edacd183ef
--- /dev/null
+++ b/tests/baselines/reference/constEnumNoPreserveDeclarationReexport.js
@@ -0,0 +1,28 @@
+//// [tests/cases/compiler/constEnumNoPreserveDeclarationReexport.ts] ////
+
+//// [ConstEnum.d.ts]
+export const enum MyConstEnum {
+    Foo,
+    Bar
+}
+//// [ImportExport.d.ts]
+import { MyConstEnum } from './ConstEnum';
+export default MyConstEnum;
+//// [ReExport.d.ts]
+export { MyConstEnum as default } from './ConstEnum';
+//// [usages.ts]
+import {MyConstEnum} from "./ConstEnum";
+import AlsoEnum from "./ImportExport";
+import StillEnum from "./ReExport";
+
+MyConstEnum.Foo;
+AlsoEnum.Foo;
+StillEnum.Foo;
+
+
+//// [usages.js]
+"use strict";
+exports.__esModule = true;
+0 /* Foo */;
+0 /* Foo */;
+0 /* Foo */;
diff --git a/tests/baselines/reference/constEnumNoPreserveDeclarationReexport.symbols b/tests/baselines/reference/constEnumNoPreserveDeclarationReexport.symbols
new file mode 100644
index 00000000000..62f839e02dd
--- /dev/null
+++ b/tests/baselines/reference/constEnumNoPreserveDeclarationReexport.symbols
@@ -0,0 +1,47 @@
+=== tests/cases/compiler/ConstEnum.d.ts ===
+export const enum MyConstEnum {
+>MyConstEnum : Symbol(MyConstEnum, Decl(ConstEnum.d.ts, 0, 0))
+
+    Foo,
+>Foo : Symbol(MyConstEnum.Foo, Decl(ConstEnum.d.ts, 0, 31))
+
+    Bar
+>Bar : Symbol(MyConstEnum.Bar, Decl(ConstEnum.d.ts, 1, 8))
+}
+=== tests/cases/compiler/ImportExport.d.ts ===
+import { MyConstEnum } from './ConstEnum';
+>MyConstEnum : Symbol(MyConstEnum, Decl(ImportExport.d.ts, 0, 8))
+
+export default MyConstEnum;
+>MyConstEnum : Symbol(MyConstEnum, Decl(ImportExport.d.ts, 0, 8))
+
+=== tests/cases/compiler/ReExport.d.ts ===
+export { MyConstEnum as default } from './ConstEnum';
+>MyConstEnum : Symbol(MyConstEnum, Decl(ConstEnum.d.ts, 0, 0))
+>default : Symbol(default, Decl(ReExport.d.ts, 0, 8))
+
+=== tests/cases/compiler/usages.ts ===
+import {MyConstEnum} from "./ConstEnum";
+>MyConstEnum : Symbol(MyConstEnum, Decl(usages.ts, 0, 8))
+
+import AlsoEnum from "./ImportExport";
+>AlsoEnum : Symbol(AlsoEnum, Decl(usages.ts, 1, 6))
+
+import StillEnum from "./ReExport";
+>StillEnum : Symbol(StillEnum, Decl(usages.ts, 2, 6))
+
+MyConstEnum.Foo;
+>MyConstEnum.Foo : Symbol(MyConstEnum.Foo, Decl(ConstEnum.d.ts, 0, 31))
+>MyConstEnum : Symbol(MyConstEnum, Decl(usages.ts, 0, 8))
+>Foo : Symbol(MyConstEnum.Foo, Decl(ConstEnum.d.ts, 0, 31))
+
+AlsoEnum.Foo;
+>AlsoEnum.Foo : Symbol(MyConstEnum.Foo, Decl(ConstEnum.d.ts, 0, 31))
+>AlsoEnum : Symbol(AlsoEnum, Decl(usages.ts, 1, 6))
+>Foo : Symbol(MyConstEnum.Foo, Decl(ConstEnum.d.ts, 0, 31))
+
+StillEnum.Foo;
+>StillEnum.Foo : Symbol(MyConstEnum.Foo, Decl(ConstEnum.d.ts, 0, 31))
+>StillEnum : Symbol(StillEnum, Decl(usages.ts, 2, 6))
+>Foo : Symbol(MyConstEnum.Foo, Decl(ConstEnum.d.ts, 0, 31))
+
diff --git a/tests/baselines/reference/constEnumNoPreserveDeclarationReexport.types b/tests/baselines/reference/constEnumNoPreserveDeclarationReexport.types
new file mode 100644
index 00000000000..f68ae116a18
--- /dev/null
+++ b/tests/baselines/reference/constEnumNoPreserveDeclarationReexport.types
@@ -0,0 +1,47 @@
+=== tests/cases/compiler/ConstEnum.d.ts ===
+export const enum MyConstEnum {
+>MyConstEnum : MyConstEnum
+
+    Foo,
+>Foo : MyConstEnum
+
+    Bar
+>Bar : MyConstEnum
+}
+=== tests/cases/compiler/ImportExport.d.ts ===
+import { MyConstEnum } from './ConstEnum';
+>MyConstEnum : typeof MyConstEnum
+
+export default MyConstEnum;
+>MyConstEnum : MyConstEnum
+
+=== tests/cases/compiler/ReExport.d.ts ===
+export { MyConstEnum as default } from './ConstEnum';
+>MyConstEnum : typeof import("tests/cases/compiler/ConstEnum").MyConstEnum
+>default : typeof import("tests/cases/compiler/ConstEnum").MyConstEnum
+
+=== tests/cases/compiler/usages.ts ===
+import {MyConstEnum} from "./ConstEnum";
+>MyConstEnum : typeof MyConstEnum
+
+import AlsoEnum from "./ImportExport";
+>AlsoEnum : typeof MyConstEnum
+
+import StillEnum from "./ReExport";
+>StillEnum : typeof MyConstEnum
+
+MyConstEnum.Foo;
+>MyConstEnum.Foo : MyConstEnum
+>MyConstEnum : typeof MyConstEnum
+>Foo : MyConstEnum
+
+AlsoEnum.Foo;
+>AlsoEnum.Foo : MyConstEnum
+>AlsoEnum : typeof MyConstEnum
+>Foo : MyConstEnum
+
+StillEnum.Foo;
+>StillEnum.Foo : MyConstEnum
+>StillEnum : typeof MyConstEnum
+>Foo : MyConstEnum
+
diff --git a/tests/baselines/reference/constEnumPreserveEmitReexport.js b/tests/baselines/reference/constEnumPreserveEmitReexport.js
new file mode 100644
index 00000000000..24914ee899b
--- /dev/null
+++ b/tests/baselines/reference/constEnumPreserveEmitReexport.js
@@ -0,0 +1,32 @@
+//// [tests/cases/compiler/constEnumPreserveEmitReexport.ts] ////
+
+//// [ConstEnum.ts]
+export const enum MyConstEnum {
+    Foo,
+    Bar
+};
+//// [ImportExport.ts]
+import { MyConstEnum } from './ConstEnum';
+export default MyConstEnum;
+//// [ReExport.ts]
+export { MyConstEnum as default } from './ConstEnum';
+
+//// [ConstEnum.js]
+"use strict";
+exports.__esModule = true;
+var MyConstEnum;
+(function (MyConstEnum) {
+    MyConstEnum[MyConstEnum["Foo"] = 0] = "Foo";
+    MyConstEnum[MyConstEnum["Bar"] = 1] = "Bar";
+})(MyConstEnum = exports.MyConstEnum || (exports.MyConstEnum = {}));
+;
+//// [ImportExport.js]
+"use strict";
+exports.__esModule = true;
+var ConstEnum_1 = require("./ConstEnum");
+exports["default"] = ConstEnum_1.MyConstEnum;
+//// [ReExport.js]
+"use strict";
+exports.__esModule = true;
+var ConstEnum_1 = require("./ConstEnum");
+exports["default"] = ConstEnum_1.MyConstEnum;
diff --git a/tests/baselines/reference/constEnumPreserveEmitReexport.symbols b/tests/baselines/reference/constEnumPreserveEmitReexport.symbols
new file mode 100644
index 00000000000..0e4e240b4f4
--- /dev/null
+++ b/tests/baselines/reference/constEnumPreserveEmitReexport.symbols
@@ -0,0 +1,23 @@
+=== tests/cases/compiler/ConstEnum.ts ===
+export const enum MyConstEnum {
+>MyConstEnum : Symbol(MyConstEnum, Decl(ConstEnum.ts, 0, 0))
+
+    Foo,
+>Foo : Symbol(MyConstEnum.Foo, Decl(ConstEnum.ts, 0, 31))
+
+    Bar
+>Bar : Symbol(MyConstEnum.Bar, Decl(ConstEnum.ts, 1, 8))
+
+};
+=== tests/cases/compiler/ImportExport.ts ===
+import { MyConstEnum } from './ConstEnum';
+>MyConstEnum : Symbol(MyConstEnum, Decl(ImportExport.ts, 0, 8))
+
+export default MyConstEnum;
+>MyConstEnum : Symbol(MyConstEnum, Decl(ImportExport.ts, 0, 8))
+
+=== tests/cases/compiler/ReExport.ts ===
+export { MyConstEnum as default } from './ConstEnum';
+>MyConstEnum : Symbol(MyConstEnum, Decl(ConstEnum.ts, 0, 0))
+>default : Symbol(default, Decl(ReExport.ts, 0, 8))
+
diff --git a/tests/baselines/reference/constEnumPreserveEmitReexport.types b/tests/baselines/reference/constEnumPreserveEmitReexport.types
new file mode 100644
index 00000000000..d003cdd878a
--- /dev/null
+++ b/tests/baselines/reference/constEnumPreserveEmitReexport.types
@@ -0,0 +1,23 @@
+=== tests/cases/compiler/ConstEnum.ts ===
+export const enum MyConstEnum {
+>MyConstEnum : MyConstEnum
+
+    Foo,
+>Foo : MyConstEnum.Foo
+
+    Bar
+>Bar : MyConstEnum.Bar
+
+};
+=== tests/cases/compiler/ImportExport.ts ===
+import { MyConstEnum } from './ConstEnum';
+>MyConstEnum : typeof MyConstEnum
+
+export default MyConstEnum;
+>MyConstEnum : MyConstEnum
+
+=== tests/cases/compiler/ReExport.ts ===
+export { MyConstEnum as default } from './ConstEnum';
+>MyConstEnum : typeof import("tests/cases/compiler/ConstEnum").MyConstEnum
+>default : typeof import("tests/cases/compiler/ConstEnum").MyConstEnum
+
diff --git a/tests/baselines/reference/exportAsNamespaceConflict.errors.txt b/tests/baselines/reference/exportAsNamespaceConflict.errors.txt
index 02d7f859a69..4b08c736069 100644
--- a/tests/baselines/reference/exportAsNamespaceConflict.errors.txt
+++ b/tests/baselines/reference/exportAsNamespaceConflict.errors.txt
@@ -1,12 +1,9 @@
-/a.d.ts(2,10): error TS2708: Cannot use namespace 'N' as a value.
 /a.d.ts(3,1): error TS2303: Circular definition of import alias 'N'.
 
 
-==== /a.d.ts (2 errors) ====
+==== /a.d.ts (1 errors) ====
     declare global { namespace N {} }
     export = N;
-             ~
-!!! error TS2708: Cannot use namespace 'N' as a value.
     export as namespace N;
     ~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2303: Circular definition of import alias 'N'.
diff --git a/tests/baselines/reference/exportsAndImports1-amd.errors.txt b/tests/baselines/reference/exportsAndImports1-amd.errors.txt
new file mode 100644
index 00000000000..713f464a608
--- /dev/null
+++ b/tests/baselines/reference/exportsAndImports1-amd.errors.txt
@@ -0,0 +1,40 @@
+tests/cases/conformance/es6/modules/t1.ts(23,25): error TS2475: 'const' enums can only be used in property or index access expressions or the right hand side of an import declaration or export assignment or type query.
+tests/cases/conformance/es6/modules/t3.ts(2,25): error TS2475: 'const' enums can only be used in property or index access expressions or the right hand side of an import declaration or export assignment or type query.
+
+
+==== tests/cases/conformance/es6/modules/t1.ts (1 errors) ====
+    var v = 1;
+    function f() { }
+    class C {
+    }
+    interface I {
+    }
+    enum E {
+        A, B, C
+    }
+    const enum D {
+        A, B, C
+    }
+    module M {
+        export var x;
+    }
+    module N {
+        export interface I {
+        }
+    }
+    type T = number;
+    import a = M.x;
+    
+    export { v, f, C, I, E, D, M, N, T, a };
+                            ~
+!!! error TS2475: 'const' enums can only be used in property or index access expressions or the right hand side of an import declaration or export assignment or type query.
+    
+==== tests/cases/conformance/es6/modules/t2.ts (0 errors) ====
+    export { v, f, C, I, E, D, M, N, T, a } from "./t1";
+    
+==== tests/cases/conformance/es6/modules/t3.ts (1 errors) ====
+    import { v, f, C, I, E, D, M, N, T, a } from "./t1";
+    export { v, f, C, I, E, D, M, N, T, a };
+                            ~
+!!! error TS2475: 'const' enums can only be used in property or index access expressions or the right hand side of an import declaration or export assignment or type query.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/exportsAndImports1-es6.errors.txt b/tests/baselines/reference/exportsAndImports1-es6.errors.txt
new file mode 100644
index 00000000000..713f464a608
--- /dev/null
+++ b/tests/baselines/reference/exportsAndImports1-es6.errors.txt
@@ -0,0 +1,40 @@
+tests/cases/conformance/es6/modules/t1.ts(23,25): error TS2475: 'const' enums can only be used in property or index access expressions or the right hand side of an import declaration or export assignment or type query.
+tests/cases/conformance/es6/modules/t3.ts(2,25): error TS2475: 'const' enums can only be used in property or index access expressions or the right hand side of an import declaration or export assignment or type query.
+
+
+==== tests/cases/conformance/es6/modules/t1.ts (1 errors) ====
+    var v = 1;
+    function f() { }
+    class C {
+    }
+    interface I {
+    }
+    enum E {
+        A, B, C
+    }
+    const enum D {
+        A, B, C
+    }
+    module M {
+        export var x;
+    }
+    module N {
+        export interface I {
+        }
+    }
+    type T = number;
+    import a = M.x;
+    
+    export { v, f, C, I, E, D, M, N, T, a };
+                            ~
+!!! error TS2475: 'const' enums can only be used in property or index access expressions or the right hand side of an import declaration or export assignment or type query.
+    
+==== tests/cases/conformance/es6/modules/t2.ts (0 errors) ====
+    export { v, f, C, I, E, D, M, N, T, a } from "./t1";
+    
+==== tests/cases/conformance/es6/modules/t3.ts (1 errors) ====
+    import { v, f, C, I, E, D, M, N, T, a } from "./t1";
+    export { v, f, C, I, E, D, M, N, T, a };
+                            ~
+!!! error TS2475: 'const' enums can only be used in property or index access expressions or the right hand side of an import declaration or export assignment or type query.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/exportsAndImports1.errors.txt b/tests/baselines/reference/exportsAndImports1.errors.txt
new file mode 100644
index 00000000000..713f464a608
--- /dev/null
+++ b/tests/baselines/reference/exportsAndImports1.errors.txt
@@ -0,0 +1,40 @@
+tests/cases/conformance/es6/modules/t1.ts(23,25): error TS2475: 'const' enums can only be used in property or index access expressions or the right hand side of an import declaration or export assignment or type query.
+tests/cases/conformance/es6/modules/t3.ts(2,25): error TS2475: 'const' enums can only be used in property or index access expressions or the right hand side of an import declaration or export assignment or type query.
+
+
+==== tests/cases/conformance/es6/modules/t1.ts (1 errors) ====
+    var v = 1;
+    function f() { }
+    class C {
+    }
+    interface I {
+    }
+    enum E {
+        A, B, C
+    }
+    const enum D {
+        A, B, C
+    }
+    module M {
+        export var x;
+    }
+    module N {
+        export interface I {
+        }
+    }
+    type T = number;
+    import a = M.x;
+    
+    export { v, f, C, I, E, D, M, N, T, a };
+                            ~
+!!! error TS2475: 'const' enums can only be used in property or index access expressions or the right hand side of an import declaration or export assignment or type query.
+    
+==== tests/cases/conformance/es6/modules/t2.ts (0 errors) ====
+    export { v, f, C, I, E, D, M, N, T, a } from "./t1";
+    
+==== tests/cases/conformance/es6/modules/t3.ts (1 errors) ====
+    import { v, f, C, I, E, D, M, N, T, a } from "./t1";
+    export { v, f, C, I, E, D, M, N, T, a };
+                            ~
+!!! error TS2475: 'const' enums can only be used in property or index access expressions or the right hand side of an import declaration or export assignment or type query.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/exportsAndImports3-amd.errors.txt b/tests/baselines/reference/exportsAndImports3-amd.errors.txt
new file mode 100644
index 00000000000..b084c1193f4
--- /dev/null
+++ b/tests/baselines/reference/exportsAndImports3-amd.errors.txt
@@ -0,0 +1,40 @@
+tests/cases/conformance/es6/modules/t1.ts(23,55): error TS2475: 'const' enums can only be used in property or index access expressions or the right hand side of an import declaration or export assignment or type query.
+tests/cases/conformance/es6/modules/t3.ts(2,25): error TS2475: 'const' enums can only be used in property or index access expressions or the right hand side of an import declaration or export assignment or type query.
+
+
+==== tests/cases/conformance/es6/modules/t1.ts (1 errors) ====
+    export var v = 1;
+    export function f() { }
+    export class C {
+    }
+    export interface I {
+    }
+    export enum E {
+        A, B, C
+    }
+    export const enum D {
+        A, B, C
+    }
+    export module M {
+        export var x;
+    }
+    export module N {
+        export interface I {
+        }
+    }
+    export type T = number;
+    export import a = M.x;
+    
+    export { v as v1, f as f1, C as C1, I as I1, E as E1, D as D1, M as M1, N as N1, T as T1, a as a1 };
+                                                          ~
+!!! error TS2475: 'const' enums can only be used in property or index access expressions or the right hand side of an import declaration or export assignment or type query.
+    
+==== tests/cases/conformance/es6/modules/t2.ts (0 errors) ====
+    export { v1 as v, f1 as f, C1 as C, I1 as I, E1 as E, D1 as D, M1 as M, N1 as N, T1 as T, a1 as a } from "./t1";
+    
+==== tests/cases/conformance/es6/modules/t3.ts (1 errors) ====
+    import { v1 as v, f1 as f, C1 as C, I1 as I, E1 as E, D1 as D, M1 as M, N1 as N, T1 as T, a1 as a } from "./t1";
+    export { v, f, C, I, E, D, M, N, T, a };
+                            ~
+!!! error TS2475: 'const' enums can only be used in property or index access expressions or the right hand side of an import declaration or export assignment or type query.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/exportsAndImports3-es6.errors.txt b/tests/baselines/reference/exportsAndImports3-es6.errors.txt
new file mode 100644
index 00000000000..b084c1193f4
--- /dev/null
+++ b/tests/baselines/reference/exportsAndImports3-es6.errors.txt
@@ -0,0 +1,40 @@
+tests/cases/conformance/es6/modules/t1.ts(23,55): error TS2475: 'const' enums can only be used in property or index access expressions or the right hand side of an import declaration or export assignment or type query.
+tests/cases/conformance/es6/modules/t3.ts(2,25): error TS2475: 'const' enums can only be used in property or index access expressions or the right hand side of an import declaration or export assignment or type query.
+
+
+==== tests/cases/conformance/es6/modules/t1.ts (1 errors) ====
+    export var v = 1;
+    export function f() { }
+    export class C {
+    }
+    export interface I {
+    }
+    export enum E {
+        A, B, C
+    }
+    export const enum D {
+        A, B, C
+    }
+    export module M {
+        export var x;
+    }
+    export module N {
+        export interface I {
+        }
+    }
+    export type T = number;
+    export import a = M.x;
+    
+    export { v as v1, f as f1, C as C1, I as I1, E as E1, D as D1, M as M1, N as N1, T as T1, a as a1 };
+                                                          ~
+!!! error TS2475: 'const' enums can only be used in property or index access expressions or the right hand side of an import declaration or export assignment or type query.
+    
+==== tests/cases/conformance/es6/modules/t2.ts (0 errors) ====
+    export { v1 as v, f1 as f, C1 as C, I1 as I, E1 as E, D1 as D, M1 as M, N1 as N, T1 as T, a1 as a } from "./t1";
+    
+==== tests/cases/conformance/es6/modules/t3.ts (1 errors) ====
+    import { v1 as v, f1 as f, C1 as C, I1 as I, E1 as E, D1 as D, M1 as M, N1 as N, T1 as T, a1 as a } from "./t1";
+    export { v, f, C, I, E, D, M, N, T, a };
+                            ~
+!!! error TS2475: 'const' enums can only be used in property or index access expressions or the right hand side of an import declaration or export assignment or type query.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/exportsAndImports3.errors.txt b/tests/baselines/reference/exportsAndImports3.errors.txt
new file mode 100644
index 00000000000..b084c1193f4
--- /dev/null
+++ b/tests/baselines/reference/exportsAndImports3.errors.txt
@@ -0,0 +1,40 @@
+tests/cases/conformance/es6/modules/t1.ts(23,55): error TS2475: 'const' enums can only be used in property or index access expressions or the right hand side of an import declaration or export assignment or type query.
+tests/cases/conformance/es6/modules/t3.ts(2,25): error TS2475: 'const' enums can only be used in property or index access expressions or the right hand side of an import declaration or export assignment or type query.
+
+
+==== tests/cases/conformance/es6/modules/t1.ts (1 errors) ====
+    export var v = 1;
+    export function f() { }
+    export class C {
+    }
+    export interface I {
+    }
+    export enum E {
+        A, B, C
+    }
+    export const enum D {
+        A, B, C
+    }
+    export module M {
+        export var x;
+    }
+    export module N {
+        export interface I {
+        }
+    }
+    export type T = number;
+    export import a = M.x;
+    
+    export { v as v1, f as f1, C as C1, I as I1, E as E1, D as D1, M as M1, N as N1, T as T1, a as a1 };
+                                                          ~
+!!! error TS2475: 'const' enums can only be used in property or index access expressions or the right hand side of an import declaration or export assignment or type query.
+    
+==== tests/cases/conformance/es6/modules/t2.ts (0 errors) ====
+    export { v1 as v, f1 as f, C1 as C, I1 as I, E1 as E, D1 as D, M1 as M, N1 as N, T1 as T, a1 as a } from "./t1";
+    
+==== tests/cases/conformance/es6/modules/t3.ts (1 errors) ====
+    import { v1 as v, f1 as f, C1 as C, I1 as I, E1 as E, D1 as D, M1 as M, N1 as N, T1 as T, a1 as a } from "./t1";
+    export { v, f, C, I, E, D, M, N, T, a };
+                            ~
+!!! error TS2475: 'const' enums can only be used in property or index access expressions or the right hand side of an import declaration or export assignment or type query.
+    
\ No newline at end of file
diff --git a/tests/cases/compiler/amdModuleConstEnumUsage.ts b/tests/cases/compiler/amdModuleConstEnumUsage.ts
new file mode 100644
index 00000000000..6778aee0cdd
--- /dev/null
+++ b/tests/cases/compiler/amdModuleConstEnumUsage.ts
@@ -0,0 +1,16 @@
+// @module: amd
+// @preserveConstEnums: true
+// @baseUrl: /proj
+// @filename: /proj/defs/cc.ts
+export const enum CharCode {
+    A,
+    B
+}
+// @filename: /proj/component/file.ts
+
+import { CharCode } from 'defs/cc';
+export class User {
+    method(input: number) {
+        if (CharCode.A === input) {}
+    }
+}
diff --git a/tests/cases/compiler/constEnumNoPreserveDeclarationReexport.ts b/tests/cases/compiler/constEnumNoPreserveDeclarationReexport.ts
new file mode 100644
index 00000000000..293aade8d57
--- /dev/null
+++ b/tests/cases/compiler/constEnumNoPreserveDeclarationReexport.ts
@@ -0,0 +1,18 @@
+// @filename: ConstEnum.d.ts
+export const enum MyConstEnum {
+    Foo,
+    Bar
+}
+// @filename: ImportExport.d.ts
+import { MyConstEnum } from './ConstEnum';
+export default MyConstEnum;
+// @filename: ReExport.d.ts
+export { MyConstEnum as default } from './ConstEnum';
+// @filename: usages.ts
+import {MyConstEnum} from "./ConstEnum";
+import AlsoEnum from "./ImportExport";
+import StillEnum from "./ReExport";
+
+MyConstEnum.Foo;
+AlsoEnum.Foo;
+StillEnum.Foo;
diff --git a/tests/cases/compiler/constEnumPreserveEmitReexport.ts b/tests/cases/compiler/constEnumPreserveEmitReexport.ts
new file mode 100644
index 00000000000..d53345e6380
--- /dev/null
+++ b/tests/cases/compiler/constEnumPreserveEmitReexport.ts
@@ -0,0 +1,11 @@
+// @preserveConstEnums: true
+// @filename: ConstEnum.ts
+export const enum MyConstEnum {
+    Foo,
+    Bar
+};
+// @filename: ImportExport.ts
+import { MyConstEnum } from './ConstEnum';
+export default MyConstEnum;
+// @filename: ReExport.ts
+export { MyConstEnum as default } from './ConstEnum';
\ No newline at end of file

From e3f4979736a3ccb1687fb9865e85045a8612babf Mon Sep 17 00:00:00 2001
From: Ron Buckton <ron.buckton@microsoft.com>
Date: Mon, 5 Aug 2019 16:53:21 -0700
Subject: [PATCH 111/151] Fix emit for object rest on a module export (#32699)

* Fix emit for object rest on a module export

* Add tests for exports of empty object/array binding patterns

* Add delay for exec to ensure diff tool has enough time to start
---
 Gulpfile.js                                   |  4 +-
 scripts/build/utils.js                        | 38 ++++++++------
 src/compiler/transformers/es2018.ts           | 30 +++++++++++-
 src/harness/harness.ts                        |  2 +
 src/testRunner/compilerRunner.ts              | 49 +++++++++++++++----
 ...ayBindingPattern(module=amd,target=es5).js | 10 ++++
 ...indingPattern(module=amd,target=esnext).js | 10 ++++
 ...dingPattern(module=commonjs,target=es5).js |  8 +++
 ...gPattern(module=commonjs,target=esnext).js |  8 +++
 ...indingPattern(module=es2015,target=es5).js |  6 +++
 ...ingPattern(module=es2015,target=esnext).js |  5 ++
 ...indingPattern(module=esnext,target=es5).js |  6 +++
 ...ingPattern(module=esnext,target=esnext).js |  5 ++
 ...indingPattern(module=system,target=es5).js | 15 ++++++
 ...ingPattern(module=system,target=esnext).js | 15 ++++++
 ...ctBindingPattern(module=amd,target=es5).js | 10 ++++
 ...indingPattern(module=amd,target=esnext).js | 10 ++++
 ...dingPattern(module=commonjs,target=es5).js |  8 +++
 ...gPattern(module=commonjs,target=esnext).js |  8 +++
 ...indingPattern(module=es2015,target=es5).js |  6 +++
 ...ingPattern(module=es2015,target=esnext).js |  5 ++
 ...indingPattern(module=esnext,target=es5).js |  6 +++
 ...ingPattern(module=esnext,target=esnext).js |  5 ++
 ...indingPattern(module=system,target=es5).js | 15 ++++++
 ...ingPattern(module=system,target=esnext).js | 15 ++++++
 ...exportObjectRest(module=amd,target=es5).js | 10 ++++
 ...ortObjectRest(module=amd,target=esnext).js | 10 ++++
 ...tObjectRest(module=commonjs,target=es5).js |  8 +++
 ...jectRest(module=commonjs,target=esnext).js |  8 +++
 ...ortObjectRest(module=es2015,target=es5).js |  6 +++
 ...ObjectRest(module=es2015,target=esnext).js |  5 ++
 ...ortObjectRest(module=esnext,target=es5).js |  6 +++
 ...ObjectRest(module=esnext,target=esnext).js |  5 ++
 ...ortObjectRest(module=system,target=es5).js | 15 ++++++
 ...ObjectRest(module=system,target=esnext).js | 15 ++++++
 .../exportEmptyArrayBindingPattern.ts         |  5 ++
 .../exportEmptyObjectBindingPattern.ts        |  5 ++
 tests/cases/compiler/exportObjectRest.ts      |  5 ++
 38 files changed, 374 insertions(+), 28 deletions(-)
 create mode 100644 tests/baselines/reference/exportEmptyArrayBindingPattern(module=amd,target=es5).js
 create mode 100644 tests/baselines/reference/exportEmptyArrayBindingPattern(module=amd,target=esnext).js
 create mode 100644 tests/baselines/reference/exportEmptyArrayBindingPattern(module=commonjs,target=es5).js
 create mode 100644 tests/baselines/reference/exportEmptyArrayBindingPattern(module=commonjs,target=esnext).js
 create mode 100644 tests/baselines/reference/exportEmptyArrayBindingPattern(module=es2015,target=es5).js
 create mode 100644 tests/baselines/reference/exportEmptyArrayBindingPattern(module=es2015,target=esnext).js
 create mode 100644 tests/baselines/reference/exportEmptyArrayBindingPattern(module=esnext,target=es5).js
 create mode 100644 tests/baselines/reference/exportEmptyArrayBindingPattern(module=esnext,target=esnext).js
 create mode 100644 tests/baselines/reference/exportEmptyArrayBindingPattern(module=system,target=es5).js
 create mode 100644 tests/baselines/reference/exportEmptyArrayBindingPattern(module=system,target=esnext).js
 create mode 100644 tests/baselines/reference/exportEmptyObjectBindingPattern(module=amd,target=es5).js
 create mode 100644 tests/baselines/reference/exportEmptyObjectBindingPattern(module=amd,target=esnext).js
 create mode 100644 tests/baselines/reference/exportEmptyObjectBindingPattern(module=commonjs,target=es5).js
 create mode 100644 tests/baselines/reference/exportEmptyObjectBindingPattern(module=commonjs,target=esnext).js
 create mode 100644 tests/baselines/reference/exportEmptyObjectBindingPattern(module=es2015,target=es5).js
 create mode 100644 tests/baselines/reference/exportEmptyObjectBindingPattern(module=es2015,target=esnext).js
 create mode 100644 tests/baselines/reference/exportEmptyObjectBindingPattern(module=esnext,target=es5).js
 create mode 100644 tests/baselines/reference/exportEmptyObjectBindingPattern(module=esnext,target=esnext).js
 create mode 100644 tests/baselines/reference/exportEmptyObjectBindingPattern(module=system,target=es5).js
 create mode 100644 tests/baselines/reference/exportEmptyObjectBindingPattern(module=system,target=esnext).js
 create mode 100644 tests/baselines/reference/exportObjectRest(module=amd,target=es5).js
 create mode 100644 tests/baselines/reference/exportObjectRest(module=amd,target=esnext).js
 create mode 100644 tests/baselines/reference/exportObjectRest(module=commonjs,target=es5).js
 create mode 100644 tests/baselines/reference/exportObjectRest(module=commonjs,target=esnext).js
 create mode 100644 tests/baselines/reference/exportObjectRest(module=es2015,target=es5).js
 create mode 100644 tests/baselines/reference/exportObjectRest(module=es2015,target=esnext).js
 create mode 100644 tests/baselines/reference/exportObjectRest(module=esnext,target=es5).js
 create mode 100644 tests/baselines/reference/exportObjectRest(module=esnext,target=esnext).js
 create mode 100644 tests/baselines/reference/exportObjectRest(module=system,target=es5).js
 create mode 100644 tests/baselines/reference/exportObjectRest(module=system,target=esnext).js
 create mode 100644 tests/cases/compiler/exportEmptyArrayBindingPattern.ts
 create mode 100644 tests/cases/compiler/exportEmptyObjectBindingPattern.ts
 create mode 100644 tests/cases/compiler/exportObjectRest.ts

diff --git a/Gulpfile.js b/Gulpfile.js
index 42987e4fd8d..a7ee6258056 100644
--- a/Gulpfile.js
+++ b/Gulpfile.js
@@ -436,10 +436,10 @@ task("runtests-parallel").flags = {
     "   --shardId": "1-based ID of this shard (default: 1)",
 };
 
-task("diff", () => exec(getDiffTool(), [refBaseline, localBaseline], { ignoreExitCode: true }));
+task("diff", () => exec(getDiffTool(), [refBaseline, localBaseline], { ignoreExitCode: true, waitForExit: false }));
 task("diff").description = "Diffs the compiler baselines using the diff tool specified by the 'DIFF' environment variable";
 
-task("diff-rwc", () => exec(getDiffTool(), [refRwcBaseline, localRwcBaseline], { ignoreExitCode: true }));
+task("diff-rwc", () => exec(getDiffTool(), [refRwcBaseline, localRwcBaseline], { ignoreExitCode: true, waitForExit: false }));
 task("diff-rwc").description = "Diffs the RWC baselines using the diff tool specified by the 'DIFF' environment variable";
 
 /**
diff --git a/scripts/build/utils.js b/scripts/build/utils.js
index b070bd133a9..a67742cca68 100644
--- a/scripts/build/utils.js
+++ b/scripts/build/utils.js
@@ -25,10 +25,11 @@ const isWindows = /^win/.test(process.platform);
  * @property {boolean} [ignoreExitCode]
  * @property {import("prex").CancellationToken} [cancelToken]
  * @property {boolean} [hidePrompt]
+ * @property {boolean} [waitForExit=true]
  */
 function exec(cmd, args, options = {}) {
     return /**@type {Promise<{exitCode: number}>}*/(new Promise((resolve, reject) => {
-        const { ignoreExitCode, cancelToken = CancellationToken.none } = options;
+        const { ignoreExitCode, cancelToken = CancellationToken.none, waitForExit = true } = options;
         cancelToken.throwIfCancellationRequested();
 
         // TODO (weswig): Update child_process types to add windowsVerbatimArguments to the type definition
@@ -36,26 +37,33 @@ function exec(cmd, args, options = {}) {
         const command = isWindows ? [possiblyQuote(cmd), ...args] : [`${cmd} ${args.join(" ")}`];
 
         if (!options.hidePrompt) log(`> ${chalk.green(cmd)} ${args.join(" ")}`);
-        const proc = spawn(isWindows ? "cmd" : "/bin/sh", [subshellFlag, ...command], { stdio: "inherit", windowsVerbatimArguments: true });
+        const proc = spawn(isWindows ? "cmd" : "/bin/sh", [subshellFlag, ...command], { stdio: waitForExit ? "inherit" : "ignore", windowsVerbatimArguments: true });
         const registration = cancelToken.register(() => {
             log(`${chalk.red("killing")} '${chalk.green(cmd)} ${args.join(" ")}'...`);
             proc.kill("SIGINT");
             proc.kill("SIGTERM");
             reject(new CancelError());
         });
-        proc.on("exit", exitCode => {
-            registration.unregister();
-            if (exitCode === 0 || ignoreExitCode) {
-                resolve({ exitCode });
-            }
-            else {
-                reject(new Error(`Process exited with code: ${exitCode}`));
-            }
-        });
-        proc.on("error", error => {
-            registration.unregister();
-            reject(error);
-        });
+        if (waitForExit) {
+            proc.on("exit", exitCode => {
+                registration.unregister();
+                if (exitCode === 0 || ignoreExitCode) {
+                    resolve({ exitCode });
+                }
+                else {
+                    reject(new Error(`Process exited with code: ${exitCode}`));
+                }
+            });
+            proc.on("error", error => {
+                registration.unregister();
+                reject(error);
+            });
+        }
+        else {
+            proc.unref();
+            // wait a short period in order to allow the process to start successfully before Node exits.
+            setTimeout(() => resolve({ exitCode: undefined }), 100);
+        }
     }));
 }
 exports.exec = exec;
diff --git a/src/compiler/transformers/es2018.ts b/src/compiler/transformers/es2018.ts
index 50fb9f04d1a..63b2ccdb731 100644
--- a/src/compiler/transformers/es2018.ts
+++ b/src/compiler/transformers/es2018.ts
@@ -22,6 +22,7 @@ namespace ts {
         const previousOnSubstituteNode = context.onSubstituteNode;
         context.onSubstituteNode = onSubstituteNode;
 
+        let exportedVariableStatement = false;
         let enabledSubstitutions: ESNextSubstitutionFlags;
         let enclosingFunctionFlags: FunctionFlags;
         let enclosingSuperContainerFlags: NodeCheckFlags = 0;
@@ -40,6 +41,7 @@ namespace ts {
                 return node;
             }
 
+            exportedVariableStatement = false;
             const visited = visitEachChild(node, visitor, context);
             addEmitHelpers(visited, context.readEmitHelpers());
             return visited;
@@ -79,6 +81,8 @@ namespace ts {
                     return visitBinaryExpression(node as BinaryExpression, noDestructuringValue);
                 case SyntaxKind.CatchClause:
                     return visitCatchClause(node as CatchClause);
+                case SyntaxKind.VariableStatement:
+                    return visitVariableStatement(node as VariableStatement);
                 case SyntaxKind.VariableDeclaration:
                     return visitVariableDeclaration(node as VariableDeclaration);
                 case SyntaxKind.ForOfStatement:
@@ -321,19 +325,43 @@ namespace ts {
             return visitEachChild(node, visitor, context);
         }
 
+        function visitVariableStatement(node: VariableStatement): VisitResult<VariableStatement> {
+            if (hasModifier(node, ModifierFlags.Export)) {
+                const savedExportedVariableStatement = exportedVariableStatement;
+                exportedVariableStatement = true;
+                const visited = visitEachChild(node, visitor, context);
+                exportedVariableStatement = savedExportedVariableStatement;
+                return visited;
+            }
+            return visitEachChild(node, visitor, context);
+        }
+
         /**
          * Visits a VariableDeclaration node with a binding pattern.
          *
          * @param node A VariableDeclaration node.
          */
         function visitVariableDeclaration(node: VariableDeclaration): VisitResult<VariableDeclaration> {
+            if (exportedVariableStatement) {
+                const savedExportedVariableStatement = exportedVariableStatement;
+                exportedVariableStatement = false;
+                const visited = visitVariableDeclarationWorker(node, /*exportedVariableStatement*/ true);
+                exportedVariableStatement = savedExportedVariableStatement;
+                return visited;
+            }
+            return visitVariableDeclarationWorker(node, /*exportedVariableStatement*/ false);
+        }
+
+        function visitVariableDeclarationWorker(node: VariableDeclaration, exportedVariableStatement: boolean): VisitResult<VariableDeclaration> {
             // If we are here it is because the name contains a binding pattern with a rest somewhere in it.
             if (isBindingPattern(node.name) && node.name.transformFlags & TransformFlags.ContainsObjectRestOrSpread) {
                 return flattenDestructuringBinding(
                     node,
                     visitor,
                     context,
-                    FlattenLevel.ObjectRest
+                    FlattenLevel.ObjectRest,
+                    /*rval*/ undefined,
+                    exportedVariableStatement
                 );
             }
             return visitEachChild(node, visitor, context);
diff --git a/src/harness/harness.ts b/src/harness/harness.ts
index 9abafded8f9..03d03ba010f 100644
--- a/src/harness/harness.ts
+++ b/src/harness/harness.ts
@@ -726,6 +726,7 @@ namespace Harness {
             includeBuiltFile?: string;
             baselineFile?: string;
             libFiles?: string;
+            noTypesAndSymbols?: boolean;
         }
 
         // Additional options not already in ts.optionDeclarations
@@ -742,6 +743,7 @@ namespace Harness {
             { name: "currentDirectory", type: "string" },
             { name: "symlink", type: "string" },
             { name: "link", type: "string" },
+            { name: "noTypesAndSymbols", type: "boolean" },
             // Emitted js baseline will print full paths for every output file
             { name: "fullEmitPaths", type: "boolean" }
         ];
diff --git a/src/testRunner/compilerRunner.ts b/src/testRunner/compilerRunner.ts
index 537baccaa3e..c007d5409ea 100644
--- a/src/testRunner/compilerRunner.ts
+++ b/src/testRunner/compilerRunner.ts
@@ -58,16 +58,18 @@ class CompilerBaselineRunner extends RunnerBase {
     }
 
     public checkTestCodeOutput(fileName: string, test?: CompilerFileBasedTest) {
-        if (test && test.configurations) {
+        if (test && ts.some(test.configurations)) {
             test.configurations.forEach(configuration => {
                 describe(`${this.testSuiteName} tests for ${fileName}${configuration ? ` (${Harness.getFileBasedTestConfigurationDescription(configuration)})` : ``}`, () => {
                     this.runSuite(fileName, test, configuration);
                 });
             });
         }
-        describe(`${this.testSuiteName} tests for ${fileName}`, () => {
-            this.runSuite(fileName, test);
-        });
+        else {
+            describe(`${this.testSuiteName} tests for ${fileName}`, () => {
+                this.runSuite(fileName, test);
+            });
+        }
     }
 
     private runSuite(fileName: string, test?: CompilerFileBasedTest, configuration?: Harness.FileBasedTestConfiguration) {
@@ -112,6 +114,7 @@ class CompilerBaselineRunner extends RunnerBase {
 class CompilerTest {
     private fileName: string;
     private justName: string;
+    private configuredName: string;
     private lastUnit: Harness.TestCaseParser.TestUnitData;
     private harnessSettings: Harness.TestCaseParser.CompilerSettings;
     private hasNonDtsFiles: boolean;
@@ -126,6 +129,25 @@ class CompilerTest {
     constructor(fileName: string, testCaseContent?: Harness.TestCaseParser.TestCaseContent, configurationOverrides?: Harness.TestCaseParser.CompilerSettings) {
         this.fileName = fileName;
         this.justName = vpath.basename(fileName);
+        this.configuredName = this.justName;
+        if (configurationOverrides) {
+            let configuredName = "";
+            const keys = Object
+                .keys(configurationOverrides)
+                .map(k => k.toLowerCase())
+                .sort();
+            for (const key of keys) {
+                if (configuredName) {
+                    configuredName += ",";
+                }
+                configuredName += `${key}=${configurationOverrides[key].toLowerCase()}`;
+            }
+            if (configuredName) {
+                const extname = vpath.extname(this.justName);
+                const basename = vpath.basename(this.justName, extname, /*ignoreCase*/ true);
+                this.configuredName = `${basename}(${configuredName})${extname}`;
+            }
+        }
 
         const rootDir = fileName.indexOf("conformance") === -1 ? "tests/cases/compiler/" : ts.getDirectoryPath(fileName) + "/";
 
@@ -205,7 +227,7 @@ class CompilerTest {
     public verifyDiagnostics() {
         // check errors
         Harness.Compiler.doErrorBaseline(
-            this.justName,
+            this.configuredName,
             this.tsConfigFiles.concat(this.toBeCompiled, this.otherFiles),
             this.result.diagnostics,
             !!this.options.pretty);
@@ -213,7 +235,7 @@ class CompilerTest {
 
     public verifyModuleResolution() {
         if (this.options.traceResolution) {
-            Harness.Baseline.runBaseline(this.justName.replace(/\.tsx?$/, ".trace.json"),
+            Harness.Baseline.runBaseline(this.configuredName.replace(/\.tsx?$/, ".trace.json"),
                 JSON.stringify(this.result.traces.map(utils.sanitizeTraceResolutionLogEntry), undefined, 4));
         }
     }
@@ -225,14 +247,14 @@ class CompilerTest {
                 // Because of the noEmitOnError option no files are created. We need to return null because baselining isn't required.
                 ? null // tslint:disable-line no-null-keyword
                 : record;
-            Harness.Baseline.runBaseline(this.justName.replace(/\.tsx?$/, ".sourcemap.txt"), baseline);
+            Harness.Baseline.runBaseline(this.configuredName.replace(/\.tsx?$/, ".sourcemap.txt"), baseline);
         }
     }
 
     public verifyJavaScriptOutput() {
         if (this.hasNonDtsFiles) {
             Harness.Compiler.doJsEmitBaseline(
-                this.justName,
+                this.configuredName,
                 this.fileName,
                 this.options,
                 this.result,
@@ -245,7 +267,7 @@ class CompilerTest {
 
     public verifySourceMapOutput() {
         Harness.Compiler.doSourcemapBaseline(
-            this.justName,
+            this.configuredName,
             this.options,
             this.result,
             this.harnessSettings);
@@ -256,8 +278,15 @@ class CompilerTest {
             return;
         }
 
+        const noTypesAndSymbols =
+            this.harnessSettings.noTypesAndSymbols &&
+            this.harnessSettings.noTypesAndSymbols.toLowerCase() === "true";
+        if (noTypesAndSymbols) {
+            return;
+        }
+
         Harness.Compiler.doTypeAndSymbolBaseline(
-            this.justName,
+            this.configuredName,
             this.result.program!,
             this.toBeCompiled.concat(this.otherFiles).filter(file => !!this.result.program!.getSourceFile(file.unitName)),
             /*opts*/ undefined,
diff --git a/tests/baselines/reference/exportEmptyArrayBindingPattern(module=amd,target=es5).js b/tests/baselines/reference/exportEmptyArrayBindingPattern(module=amd,target=es5).js
new file mode 100644
index 00000000000..a116fcf0d32
--- /dev/null
+++ b/tests/baselines/reference/exportEmptyArrayBindingPattern(module=amd,target=es5).js
@@ -0,0 +1,10 @@
+//// [exportEmptyArrayBindingPattern.ts]
+export const [] = [];
+
+//// [exportEmptyArrayBindingPattern.js]
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    var _a;
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports._b = _a = [];
+});
diff --git a/tests/baselines/reference/exportEmptyArrayBindingPattern(module=amd,target=esnext).js b/tests/baselines/reference/exportEmptyArrayBindingPattern(module=amd,target=esnext).js
new file mode 100644
index 00000000000..792a6ebbc59
--- /dev/null
+++ b/tests/baselines/reference/exportEmptyArrayBindingPattern(module=amd,target=esnext).js
@@ -0,0 +1,10 @@
+//// [exportEmptyArrayBindingPattern.ts]
+export const [] = [];
+
+//// [exportEmptyArrayBindingPattern.js]
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    var _a;
+    Object.defineProperty(exports, "__esModule", { value: true });
+    _a = [];
+});
diff --git a/tests/baselines/reference/exportEmptyArrayBindingPattern(module=commonjs,target=es5).js b/tests/baselines/reference/exportEmptyArrayBindingPattern(module=commonjs,target=es5).js
new file mode 100644
index 00000000000..f6d59500611
--- /dev/null
+++ b/tests/baselines/reference/exportEmptyArrayBindingPattern(module=commonjs,target=es5).js
@@ -0,0 +1,8 @@
+//// [exportEmptyArrayBindingPattern.ts]
+export const [] = [];
+
+//// [exportEmptyArrayBindingPattern.js]
+"use strict";
+var _a;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports._b = _a = [];
diff --git a/tests/baselines/reference/exportEmptyArrayBindingPattern(module=commonjs,target=esnext).js b/tests/baselines/reference/exportEmptyArrayBindingPattern(module=commonjs,target=esnext).js
new file mode 100644
index 00000000000..f7f8c3af8ed
--- /dev/null
+++ b/tests/baselines/reference/exportEmptyArrayBindingPattern(module=commonjs,target=esnext).js
@@ -0,0 +1,8 @@
+//// [exportEmptyArrayBindingPattern.ts]
+export const [] = [];
+
+//// [exportEmptyArrayBindingPattern.js]
+"use strict";
+var _a;
+Object.defineProperty(exports, "__esModule", { value: true });
+_a = [];
diff --git a/tests/baselines/reference/exportEmptyArrayBindingPattern(module=es2015,target=es5).js b/tests/baselines/reference/exportEmptyArrayBindingPattern(module=es2015,target=es5).js
new file mode 100644
index 00000000000..5884c8a996b
--- /dev/null
+++ b/tests/baselines/reference/exportEmptyArrayBindingPattern(module=es2015,target=es5).js
@@ -0,0 +1,6 @@
+//// [exportEmptyArrayBindingPattern.ts]
+export const [] = [];
+
+//// [exportEmptyArrayBindingPattern.js]
+var _a;
+export var _b = _a = [];
diff --git a/tests/baselines/reference/exportEmptyArrayBindingPattern(module=es2015,target=esnext).js b/tests/baselines/reference/exportEmptyArrayBindingPattern(module=es2015,target=esnext).js
new file mode 100644
index 00000000000..f2845fa1801
--- /dev/null
+++ b/tests/baselines/reference/exportEmptyArrayBindingPattern(module=es2015,target=esnext).js
@@ -0,0 +1,5 @@
+//// [exportEmptyArrayBindingPattern.ts]
+export const [] = [];
+
+//// [exportEmptyArrayBindingPattern.js]
+export const [] = [];
diff --git a/tests/baselines/reference/exportEmptyArrayBindingPattern(module=esnext,target=es5).js b/tests/baselines/reference/exportEmptyArrayBindingPattern(module=esnext,target=es5).js
new file mode 100644
index 00000000000..5884c8a996b
--- /dev/null
+++ b/tests/baselines/reference/exportEmptyArrayBindingPattern(module=esnext,target=es5).js
@@ -0,0 +1,6 @@
+//// [exportEmptyArrayBindingPattern.ts]
+export const [] = [];
+
+//// [exportEmptyArrayBindingPattern.js]
+var _a;
+export var _b = _a = [];
diff --git a/tests/baselines/reference/exportEmptyArrayBindingPattern(module=esnext,target=esnext).js b/tests/baselines/reference/exportEmptyArrayBindingPattern(module=esnext,target=esnext).js
new file mode 100644
index 00000000000..f2845fa1801
--- /dev/null
+++ b/tests/baselines/reference/exportEmptyArrayBindingPattern(module=esnext,target=esnext).js
@@ -0,0 +1,5 @@
+//// [exportEmptyArrayBindingPattern.ts]
+export const [] = [];
+
+//// [exportEmptyArrayBindingPattern.js]
+export const [] = [];
diff --git a/tests/baselines/reference/exportEmptyArrayBindingPattern(module=system,target=es5).js b/tests/baselines/reference/exportEmptyArrayBindingPattern(module=system,target=es5).js
new file mode 100644
index 00000000000..73694099aa4
--- /dev/null
+++ b/tests/baselines/reference/exportEmptyArrayBindingPattern(module=system,target=es5).js
@@ -0,0 +1,15 @@
+//// [exportEmptyArrayBindingPattern.ts]
+export const [] = [];
+
+//// [exportEmptyArrayBindingPattern.js]
+System.register([], function (exports_1, context_1) {
+    "use strict";
+    var _a, _b;
+    var __moduleName = context_1 && context_1.id;
+    return {
+        setters: [],
+        execute: function () {
+            exports_1("_b", _b = _a = []);
+        }
+    };
+});
diff --git a/tests/baselines/reference/exportEmptyArrayBindingPattern(module=system,target=esnext).js b/tests/baselines/reference/exportEmptyArrayBindingPattern(module=system,target=esnext).js
new file mode 100644
index 00000000000..4e6607b8d5b
--- /dev/null
+++ b/tests/baselines/reference/exportEmptyArrayBindingPattern(module=system,target=esnext).js
@@ -0,0 +1,15 @@
+//// [exportEmptyArrayBindingPattern.ts]
+export const [] = [];
+
+//// [exportEmptyArrayBindingPattern.js]
+System.register([], function (exports_1, context_1) {
+    "use strict";
+    var _a;
+    var __moduleName = context_1 && context_1.id;
+    return {
+        setters: [],
+        execute: function () {
+            _a = [];
+        }
+    };
+});
diff --git a/tests/baselines/reference/exportEmptyObjectBindingPattern(module=amd,target=es5).js b/tests/baselines/reference/exportEmptyObjectBindingPattern(module=amd,target=es5).js
new file mode 100644
index 00000000000..99fda139158
--- /dev/null
+++ b/tests/baselines/reference/exportEmptyObjectBindingPattern(module=amd,target=es5).js
@@ -0,0 +1,10 @@
+//// [exportEmptyObjectBindingPattern.ts]
+export const {} = {};
+
+//// [exportEmptyObjectBindingPattern.js]
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    var _a;
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports._b = _a = {};
+});
diff --git a/tests/baselines/reference/exportEmptyObjectBindingPattern(module=amd,target=esnext).js b/tests/baselines/reference/exportEmptyObjectBindingPattern(module=amd,target=esnext).js
new file mode 100644
index 00000000000..5e145123912
--- /dev/null
+++ b/tests/baselines/reference/exportEmptyObjectBindingPattern(module=amd,target=esnext).js
@@ -0,0 +1,10 @@
+//// [exportEmptyObjectBindingPattern.ts]
+export const {} = {};
+
+//// [exportEmptyObjectBindingPattern.js]
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    var _a;
+    Object.defineProperty(exports, "__esModule", { value: true });
+    _a = {};
+});
diff --git a/tests/baselines/reference/exportEmptyObjectBindingPattern(module=commonjs,target=es5).js b/tests/baselines/reference/exportEmptyObjectBindingPattern(module=commonjs,target=es5).js
new file mode 100644
index 00000000000..880d9a68f7e
--- /dev/null
+++ b/tests/baselines/reference/exportEmptyObjectBindingPattern(module=commonjs,target=es5).js
@@ -0,0 +1,8 @@
+//// [exportEmptyObjectBindingPattern.ts]
+export const {} = {};
+
+//// [exportEmptyObjectBindingPattern.js]
+"use strict";
+var _a;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports._b = _a = {};
diff --git a/tests/baselines/reference/exportEmptyObjectBindingPattern(module=commonjs,target=esnext).js b/tests/baselines/reference/exportEmptyObjectBindingPattern(module=commonjs,target=esnext).js
new file mode 100644
index 00000000000..dd4f0e703ce
--- /dev/null
+++ b/tests/baselines/reference/exportEmptyObjectBindingPattern(module=commonjs,target=esnext).js
@@ -0,0 +1,8 @@
+//// [exportEmptyObjectBindingPattern.ts]
+export const {} = {};
+
+//// [exportEmptyObjectBindingPattern.js]
+"use strict";
+var _a;
+Object.defineProperty(exports, "__esModule", { value: true });
+_a = {};
diff --git a/tests/baselines/reference/exportEmptyObjectBindingPattern(module=es2015,target=es5).js b/tests/baselines/reference/exportEmptyObjectBindingPattern(module=es2015,target=es5).js
new file mode 100644
index 00000000000..983588eed3f
--- /dev/null
+++ b/tests/baselines/reference/exportEmptyObjectBindingPattern(module=es2015,target=es5).js
@@ -0,0 +1,6 @@
+//// [exportEmptyObjectBindingPattern.ts]
+export const {} = {};
+
+//// [exportEmptyObjectBindingPattern.js]
+var _a;
+export var _b = _a = {};
diff --git a/tests/baselines/reference/exportEmptyObjectBindingPattern(module=es2015,target=esnext).js b/tests/baselines/reference/exportEmptyObjectBindingPattern(module=es2015,target=esnext).js
new file mode 100644
index 00000000000..8fa77b37a6c
--- /dev/null
+++ b/tests/baselines/reference/exportEmptyObjectBindingPattern(module=es2015,target=esnext).js
@@ -0,0 +1,5 @@
+//// [exportEmptyObjectBindingPattern.ts]
+export const {} = {};
+
+//// [exportEmptyObjectBindingPattern.js]
+export const {} = {};
diff --git a/tests/baselines/reference/exportEmptyObjectBindingPattern(module=esnext,target=es5).js b/tests/baselines/reference/exportEmptyObjectBindingPattern(module=esnext,target=es5).js
new file mode 100644
index 00000000000..983588eed3f
--- /dev/null
+++ b/tests/baselines/reference/exportEmptyObjectBindingPattern(module=esnext,target=es5).js
@@ -0,0 +1,6 @@
+//// [exportEmptyObjectBindingPattern.ts]
+export const {} = {};
+
+//// [exportEmptyObjectBindingPattern.js]
+var _a;
+export var _b = _a = {};
diff --git a/tests/baselines/reference/exportEmptyObjectBindingPattern(module=esnext,target=esnext).js b/tests/baselines/reference/exportEmptyObjectBindingPattern(module=esnext,target=esnext).js
new file mode 100644
index 00000000000..8fa77b37a6c
--- /dev/null
+++ b/tests/baselines/reference/exportEmptyObjectBindingPattern(module=esnext,target=esnext).js
@@ -0,0 +1,5 @@
+//// [exportEmptyObjectBindingPattern.ts]
+export const {} = {};
+
+//// [exportEmptyObjectBindingPattern.js]
+export const {} = {};
diff --git a/tests/baselines/reference/exportEmptyObjectBindingPattern(module=system,target=es5).js b/tests/baselines/reference/exportEmptyObjectBindingPattern(module=system,target=es5).js
new file mode 100644
index 00000000000..4514b6e6827
--- /dev/null
+++ b/tests/baselines/reference/exportEmptyObjectBindingPattern(module=system,target=es5).js
@@ -0,0 +1,15 @@
+//// [exportEmptyObjectBindingPattern.ts]
+export const {} = {};
+
+//// [exportEmptyObjectBindingPattern.js]
+System.register([], function (exports_1, context_1) {
+    "use strict";
+    var _a, _b;
+    var __moduleName = context_1 && context_1.id;
+    return {
+        setters: [],
+        execute: function () {
+            exports_1("_b", _b = _a = {});
+        }
+    };
+});
diff --git a/tests/baselines/reference/exportEmptyObjectBindingPattern(module=system,target=esnext).js b/tests/baselines/reference/exportEmptyObjectBindingPattern(module=system,target=esnext).js
new file mode 100644
index 00000000000..5ce16afefd8
--- /dev/null
+++ b/tests/baselines/reference/exportEmptyObjectBindingPattern(module=system,target=esnext).js
@@ -0,0 +1,15 @@
+//// [exportEmptyObjectBindingPattern.ts]
+export const {} = {};
+
+//// [exportEmptyObjectBindingPattern.js]
+System.register([], function (exports_1, context_1) {
+    "use strict";
+    var _a;
+    var __moduleName = context_1 && context_1.id;
+    return {
+        setters: [],
+        execute: function () {
+            _a = {};
+        }
+    };
+});
diff --git a/tests/baselines/reference/exportObjectRest(module=amd,target=es5).js b/tests/baselines/reference/exportObjectRest(module=amd,target=es5).js
new file mode 100644
index 00000000000..b265cc92f10
--- /dev/null
+++ b/tests/baselines/reference/exportObjectRest(module=amd,target=es5).js
@@ -0,0 +1,10 @@
+//// [exportObjectRest.ts]
+export const { x, ...rest } = { x: 'x', y: 'y' };
+
+//// [exportObjectRest.js]
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    var _a;
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.x = (_a = { x: 'x', y: 'y' }, _a).x, exports.rest = __rest(_a, ["x"]);
+});
diff --git a/tests/baselines/reference/exportObjectRest(module=amd,target=esnext).js b/tests/baselines/reference/exportObjectRest(module=amd,target=esnext).js
new file mode 100644
index 00000000000..17295b35d20
--- /dev/null
+++ b/tests/baselines/reference/exportObjectRest(module=amd,target=esnext).js
@@ -0,0 +1,10 @@
+//// [exportObjectRest.ts]
+export const { x, ...rest } = { x: 'x', y: 'y' };
+
+//// [exportObjectRest.js]
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    var _a;
+    Object.defineProperty(exports, "__esModule", { value: true });
+    _a = { x: 'x', y: 'y' }, exports.x = _a.x, exports.rest = __rest(_a, ["x"]);
+});
diff --git a/tests/baselines/reference/exportObjectRest(module=commonjs,target=es5).js b/tests/baselines/reference/exportObjectRest(module=commonjs,target=es5).js
new file mode 100644
index 00000000000..8ee5bc8229f
--- /dev/null
+++ b/tests/baselines/reference/exportObjectRest(module=commonjs,target=es5).js
@@ -0,0 +1,8 @@
+//// [exportObjectRest.ts]
+export const { x, ...rest } = { x: 'x', y: 'y' };
+
+//// [exportObjectRest.js]
+"use strict";
+var _a;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.x = (_a = { x: 'x', y: 'y' }, _a).x, exports.rest = __rest(_a, ["x"]);
diff --git a/tests/baselines/reference/exportObjectRest(module=commonjs,target=esnext).js b/tests/baselines/reference/exportObjectRest(module=commonjs,target=esnext).js
new file mode 100644
index 00000000000..9776a14af53
--- /dev/null
+++ b/tests/baselines/reference/exportObjectRest(module=commonjs,target=esnext).js
@@ -0,0 +1,8 @@
+//// [exportObjectRest.ts]
+export const { x, ...rest } = { x: 'x', y: 'y' };
+
+//// [exportObjectRest.js]
+"use strict";
+var _a;
+Object.defineProperty(exports, "__esModule", { value: true });
+_a = { x: 'x', y: 'y' }, exports.x = _a.x, exports.rest = __rest(_a, ["x"]);
diff --git a/tests/baselines/reference/exportObjectRest(module=es2015,target=es5).js b/tests/baselines/reference/exportObjectRest(module=es2015,target=es5).js
new file mode 100644
index 00000000000..e6ac6b0e622
--- /dev/null
+++ b/tests/baselines/reference/exportObjectRest(module=es2015,target=es5).js
@@ -0,0 +1,6 @@
+//// [exportObjectRest.ts]
+export const { x, ...rest } = { x: 'x', y: 'y' };
+
+//// [exportObjectRest.js]
+var _a;
+export var x = (_a = { x: 'x', y: 'y' }, _a).x, rest = __rest(_a, ["x"]);
diff --git a/tests/baselines/reference/exportObjectRest(module=es2015,target=esnext).js b/tests/baselines/reference/exportObjectRest(module=es2015,target=esnext).js
new file mode 100644
index 00000000000..ad3fec1da45
--- /dev/null
+++ b/tests/baselines/reference/exportObjectRest(module=es2015,target=esnext).js
@@ -0,0 +1,5 @@
+//// [exportObjectRest.ts]
+export const { x, ...rest } = { x: 'x', y: 'y' };
+
+//// [exportObjectRest.js]
+export const { x, ...rest } = { x: 'x', y: 'y' };
diff --git a/tests/baselines/reference/exportObjectRest(module=esnext,target=es5).js b/tests/baselines/reference/exportObjectRest(module=esnext,target=es5).js
new file mode 100644
index 00000000000..e6ac6b0e622
--- /dev/null
+++ b/tests/baselines/reference/exportObjectRest(module=esnext,target=es5).js
@@ -0,0 +1,6 @@
+//// [exportObjectRest.ts]
+export const { x, ...rest } = { x: 'x', y: 'y' };
+
+//// [exportObjectRest.js]
+var _a;
+export var x = (_a = { x: 'x', y: 'y' }, _a).x, rest = __rest(_a, ["x"]);
diff --git a/tests/baselines/reference/exportObjectRest(module=esnext,target=esnext).js b/tests/baselines/reference/exportObjectRest(module=esnext,target=esnext).js
new file mode 100644
index 00000000000..ad3fec1da45
--- /dev/null
+++ b/tests/baselines/reference/exportObjectRest(module=esnext,target=esnext).js
@@ -0,0 +1,5 @@
+//// [exportObjectRest.ts]
+export const { x, ...rest } = { x: 'x', y: 'y' };
+
+//// [exportObjectRest.js]
+export const { x, ...rest } = { x: 'x', y: 'y' };
diff --git a/tests/baselines/reference/exportObjectRest(module=system,target=es5).js b/tests/baselines/reference/exportObjectRest(module=system,target=es5).js
new file mode 100644
index 00000000000..0d833ee8a68
--- /dev/null
+++ b/tests/baselines/reference/exportObjectRest(module=system,target=es5).js
@@ -0,0 +1,15 @@
+//// [exportObjectRest.ts]
+export const { x, ...rest } = { x: 'x', y: 'y' };
+
+//// [exportObjectRest.js]
+System.register([], function (exports_1, context_1) {
+    "use strict";
+    var _a, x, rest;
+    var __moduleName = context_1 && context_1.id;
+    return {
+        setters: [],
+        execute: function () {
+            exports_1("x", x = (_a = { x: 'x', y: 'y' }, _a).x), exports_1("rest", rest = __rest(_a, ["x"]));
+        }
+    };
+});
diff --git a/tests/baselines/reference/exportObjectRest(module=system,target=esnext).js b/tests/baselines/reference/exportObjectRest(module=system,target=esnext).js
new file mode 100644
index 00000000000..81a45acaec4
--- /dev/null
+++ b/tests/baselines/reference/exportObjectRest(module=system,target=esnext).js
@@ -0,0 +1,15 @@
+//// [exportObjectRest.ts]
+export const { x, ...rest } = { x: 'x', y: 'y' };
+
+//// [exportObjectRest.js]
+System.register([], function (exports_1, context_1) {
+    "use strict";
+    var _a, x, rest;
+    var __moduleName = context_1 && context_1.id;
+    return {
+        setters: [],
+        execute: function () {
+            _a = { x: 'x', y: 'y' }, exports_1("x", x = _a.x), exports_1("rest", rest = __rest(_a, ["x"]));
+        }
+    };
+});
diff --git a/tests/cases/compiler/exportEmptyArrayBindingPattern.ts b/tests/cases/compiler/exportEmptyArrayBindingPattern.ts
new file mode 100644
index 00000000000..b12beac7c59
--- /dev/null
+++ b/tests/cases/compiler/exportEmptyArrayBindingPattern.ts
@@ -0,0 +1,5 @@
+// @module: commonjs,amd,system,es2015,esnext
+// @target: esnext,es5
+// @noEmitHelpers: true
+// @noTypesAndSymbols: true
+export const [] = [];
\ No newline at end of file
diff --git a/tests/cases/compiler/exportEmptyObjectBindingPattern.ts b/tests/cases/compiler/exportEmptyObjectBindingPattern.ts
new file mode 100644
index 00000000000..6db95fb094b
--- /dev/null
+++ b/tests/cases/compiler/exportEmptyObjectBindingPattern.ts
@@ -0,0 +1,5 @@
+// @module: commonjs,amd,system,es2015,esnext
+// @target: esnext,es5
+// @noEmitHelpers: true
+// @noTypesAndSymbols: true
+export const {} = {};
\ No newline at end of file
diff --git a/tests/cases/compiler/exportObjectRest.ts b/tests/cases/compiler/exportObjectRest.ts
new file mode 100644
index 00000000000..cbc314a7e11
--- /dev/null
+++ b/tests/cases/compiler/exportObjectRest.ts
@@ -0,0 +1,5 @@
+// @module: commonjs,amd,system,es2015,esnext
+// @target: esnext,es5
+// @noEmitHelpers: true
+// @noTypesAndSymbols: true
+export const { x, ...rest } = { x: 'x', y: 'y' };
\ No newline at end of file

From 624d1cad935329b83ce9d2ce8bafda19ea900d22 Mon Sep 17 00:00:00 2001
From: Ron Buckton <ron.buckton@microsoft.com>
Date: Mon, 5 Aug 2019 17:55:28 -0700
Subject: [PATCH 112/151] Fix inferred TNext of generator to use TNext of
 contextual return type (#32719)

---
 src/compiler/checker.ts                       | 25 +++++--
 .../reference/generatorTypeCheck28.types      |  4 +-
 .../reference/generatorTypeCheck45.types      |  2 +-
 .../reference/generatorTypeCheck46.types      |  6 +-
 .../reference/generatorTypeCheck62.types      |  8 +-
 .../reference/generatorTypeCheck63.errors.txt | 12 +--
 .../reference/generatorTypeCheck63.types      | 10 +--
 .../generatorYieldContextualType.types        |  4 +-
 .../types.asyncGenerators.es2018.1.types      | 12 +--
 .../types.asyncGenerators.es2018.2.errors.txt | 74 +++++++++----------
 .../types.asyncGenerators.es2018.2.types      |  6 +-
 tests/baselines/reference/uniqueSymbols.types |  6 +-
 .../reference/uniqueSymbolsDeclarations.types |  6 +-
 13 files changed, 92 insertions(+), 83 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 85f2f84c677..7105e3605aa 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -18815,6 +18815,17 @@ namespace ts {
             return false;
         }
 
+        function getContextualIterationType(kind: IterationTypeKind, functionDecl: SignatureDeclaration): Type | undefined {
+            const isAsync = !!(getFunctionFlags(functionDecl) & FunctionFlags.Async);
+            const contextualReturnType = getContextualReturnType(functionDecl);
+            if (contextualReturnType) {
+                return getIterationTypeOfGeneratorFunctionReturnType(kind, contextualReturnType, isAsync)
+                    || undefined;
+            }
+
+            return undefined;
+        }
+
         function getContextualReturnType(functionDecl: SignatureDeclaration): Type | undefined {
             // If the containing function has a return type annotation, is a constructor, or is a get accessor whose
             // corresponding set accessor has a type annotation, return statements in the function are contextually typed
@@ -23480,7 +23491,11 @@ namespace ts {
             }
 
             if (isGenerator) {
-                return createGeneratorReturnType(yieldType || neverType, returnType || fallbackReturnType, nextType || unknownType, isAsync);
+                return createGeneratorReturnType(
+                    yieldType || neverType,
+                    returnType || fallbackReturnType,
+                    nextType || getContextualIterationType(IterationTypeKind.Next, func) || unknownType,
+                    isAsync);
             }
             else {
                 // From within an async function you can return either a non-promise value or a promise. Any
@@ -24841,13 +24856,7 @@ namespace ts {
                     || anyType;
             }
 
-            const contextualReturnType = getContextualReturnType(func);
-            if (contextualReturnType) {
-                return getIterationTypeOfGeneratorFunctionReturnType(IterationTypeKind.Next, contextualReturnType, isAsync)
-                    || anyType;
-            }
-
-            return anyType;
+            return getContextualIterationType(IterationTypeKind.Next, func) || anyType;
         }
 
         function checkConditionalExpression(node: ConditionalExpression, checkMode?: CheckMode): Type {
diff --git a/tests/baselines/reference/generatorTypeCheck28.types b/tests/baselines/reference/generatorTypeCheck28.types
index 6921c946a39..abd66af518e 100644
--- a/tests/baselines/reference/generatorTypeCheck28.types
+++ b/tests/baselines/reference/generatorTypeCheck28.types
@@ -5,10 +5,10 @@ function* g(): IterableIterator<(x: string) => number> {
 
     yield * {
 >yield * {        *[Symbol.iterator]() {            yield x => x.length;        }    } : void
->{        *[Symbol.iterator]() {            yield x => x.length;        }    } : { [Symbol.iterator](): Generator<(x: string) => number, void, unknown>; }
+>{        *[Symbol.iterator]() {            yield x => x.length;        }    } : { [Symbol.iterator](): Generator<(x: string) => number, void, undefined>; }
 
         *[Symbol.iterator]() {
->[Symbol.iterator] : () => Generator<(x: string) => number, void, unknown>
+>[Symbol.iterator] : () => Generator<(x: string) => number, void, undefined>
 >Symbol.iterator : symbol
 >Symbol : SymbolConstructor
 >iterator : symbol
diff --git a/tests/baselines/reference/generatorTypeCheck45.types b/tests/baselines/reference/generatorTypeCheck45.types
index 18d3e9a5fc2..f8f88191e56 100644
--- a/tests/baselines/reference/generatorTypeCheck45.types
+++ b/tests/baselines/reference/generatorTypeCheck45.types
@@ -11,7 +11,7 @@ foo("", function* () { yield x => x.length }, p => undefined); // T is fixed, sh
 >foo("", function* () { yield x => x.length }, p => undefined) : string
 >foo : <T, U>(x: T, fun: () => Iterator<(x: T) => U, any, undefined>, fun2: (y: U) => T) => T
 >"" : ""
->function* () { yield x => x.length } : () => Generator<(x: string) => number, void, unknown>
+>function* () { yield x => x.length } : () => Generator<(x: string) => number, void, undefined>
 >yield x => x.length : undefined
 >x => x.length : (x: string) => number
 >x : string
diff --git a/tests/baselines/reference/generatorTypeCheck46.types b/tests/baselines/reference/generatorTypeCheck46.types
index 283188193b7..3beb73892ce 100644
--- a/tests/baselines/reference/generatorTypeCheck46.types
+++ b/tests/baselines/reference/generatorTypeCheck46.types
@@ -11,14 +11,14 @@ foo("", function* () {
 >foo("", function* () {    yield* {        *[Symbol.iterator]() {            yield x => x.length        }    }}, p => undefined) : string
 >foo : <T, U>(x: T, fun: () => Iterable<(x: T) => U>, fun2: (y: U) => T) => T
 >"" : ""
->function* () {    yield* {        *[Symbol.iterator]() {            yield x => x.length        }    }} : () => Generator<(x: string) => number, void, unknown>
+>function* () {    yield* {        *[Symbol.iterator]() {            yield x => x.length        }    }} : () => Generator<(x: string) => number, void, undefined>
 
     yield* {
 >yield* {        *[Symbol.iterator]() {            yield x => x.length        }    } : void
->{        *[Symbol.iterator]() {            yield x => x.length        }    } : { [Symbol.iterator](): Generator<(x: string) => number, void, unknown>; }
+>{        *[Symbol.iterator]() {            yield x => x.length        }    } : { [Symbol.iterator](): Generator<(x: string) => number, void, undefined>; }
 
         *[Symbol.iterator]() {
->[Symbol.iterator] : () => Generator<(x: string) => number, void, unknown>
+>[Symbol.iterator] : () => Generator<(x: string) => number, void, undefined>
 >Symbol.iterator : symbol
 >Symbol : SymbolConstructor
 >iterator : symbol
diff --git a/tests/baselines/reference/generatorTypeCheck62.types b/tests/baselines/reference/generatorTypeCheck62.types
index ed957295c31..52eb65fbb63 100644
--- a/tests/baselines/reference/generatorTypeCheck62.types
+++ b/tests/baselines/reference/generatorTypeCheck62.types
@@ -12,7 +12,7 @@ export function strategy<T extends StrategicState>(stratName: string, gen: (a: T
 >a : T
 
     return function*(state) {
->function*(state) {        for (const next of gen(state)) {            if (next) {                next.lastStrategyApplied = stratName;            }            yield next;        }    } : (state: T) => Generator<T, void, unknown>
+>function*(state) {        for (const next of gen(state)) {            if (next) {                next.lastStrategyApplied = stratName;            }            yield next;        }    } : (state: T) => Generator<T, void, undefined>
 >state : T
 
         for (const next of gen(state)) {
@@ -53,7 +53,7 @@ export const Nothing1: Strategy<State> = strategy("Nothing", function*(state: St
 >strategy("Nothing", function*(state: State) {    return state;}) : (a: State) => IterableIterator<State>
 >strategy : <T extends StrategicState>(stratName: string, gen: (a: T) => IterableIterator<T>) => (a: T) => IterableIterator<T>
 >"Nothing" : "Nothing"
->function*(state: State) {    return state;} : (state: State) => Generator<never, State, unknown>
+>function*(state: State) {    return state;} : (state: State) => Generator<never, State, undefined>
 >state : State
 
     return state;
@@ -66,7 +66,7 @@ export const Nothing2: Strategy<State> = strategy("Nothing", function*(state: St
 >strategy("Nothing", function*(state: State) {    yield state;}) : (a: State) => IterableIterator<State>
 >strategy : <T extends StrategicState>(stratName: string, gen: (a: T) => IterableIterator<T>) => (a: T) => IterableIterator<T>
 >"Nothing" : "Nothing"
->function*(state: State) {    yield state;} : (state: State) => Generator<State, void, unknown>
+>function*(state: State) {    yield state;} : (state: State) => Generator<State, void, undefined>
 >state : State
 
     yield state;
@@ -80,7 +80,7 @@ export const Nothing3: Strategy<State> = strategy("Nothing", function* (state: S
 >strategy("Nothing", function* (state: State) {    yield ;    return state;}) : (a: any) => IterableIterator<any>
 >strategy : <T extends StrategicState>(stratName: string, gen: (a: T) => IterableIterator<T>) => (a: T) => IterableIterator<T>
 >"Nothing" : "Nothing"
->function* (state: State) {    yield ;    return state;} : (state: State) => Generator<any, State, unknown>
+>function* (state: State) {    yield ;    return state;} : (state: State) => Generator<any, State, undefined>
 >state : State
 
     yield ;
diff --git a/tests/baselines/reference/generatorTypeCheck63.errors.txt b/tests/baselines/reference/generatorTypeCheck63.errors.txt
index f77488edc4d..60dfb089822 100644
--- a/tests/baselines/reference/generatorTypeCheck63.errors.txt
+++ b/tests/baselines/reference/generatorTypeCheck63.errors.txt
@@ -1,7 +1,7 @@
-tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck63.ts(24,61): error TS2345: Argument of type '(state: State) => Generator<number, State, unknown>' is not assignable to parameter of type '(a: State) => IterableIterator<State>'.
-  Type 'Generator<number, State, unknown>' is not assignable to type 'IterableIterator<State>'.
+tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck63.ts(24,61): error TS2345: Argument of type '(state: State) => Generator<number, State, undefined>' is not assignable to parameter of type '(a: State) => IterableIterator<State>'.
+  Type 'Generator<number, State, undefined>' is not assignable to type 'IterableIterator<State>'.
     Types of property 'next' are incompatible.
-      Type '(...args: [] | [unknown]) => IteratorResult<number, State>' is not assignable to type '(...args: [] | [undefined]) => IteratorResult<State, any>'.
+      Type '(...args: [] | [undefined]) => IteratorResult<number, State>' is not assignable to type '(...args: [] | [undefined]) => IteratorResult<State, any>'.
         Type 'IteratorResult<number, State>' is not assignable to type 'IteratorResult<State, any>'.
           Type 'IteratorYieldResult<number>' is not assignable to type 'IteratorResult<State, any>'.
             Type 'IteratorYieldResult<number>' is not assignable to type 'IteratorYieldResult<State>'.
@@ -34,10 +34,10 @@ tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck63.ts(24,61): err
     
     export const Nothing: Strategy<State> = strategy("Nothing", function* (state: State) {
                                                                 ~~~~~~~~
-!!! error TS2345: Argument of type '(state: State) => Generator<number, State, unknown>' is not assignable to parameter of type '(a: State) => IterableIterator<State>'.
-!!! error TS2345:   Type 'Generator<number, State, unknown>' is not assignable to type 'IterableIterator<State>'.
+!!! error TS2345: Argument of type '(state: State) => Generator<number, State, undefined>' is not assignable to parameter of type '(a: State) => IterableIterator<State>'.
+!!! error TS2345:   Type 'Generator<number, State, undefined>' is not assignable to type 'IterableIterator<State>'.
 !!! error TS2345:     Types of property 'next' are incompatible.
-!!! error TS2345:       Type '(...args: [] | [unknown]) => IteratorResult<number, State>' is not assignable to type '(...args: [] | [undefined]) => IteratorResult<State, any>'.
+!!! error TS2345:       Type '(...args: [] | [undefined]) => IteratorResult<number, State>' is not assignable to type '(...args: [] | [undefined]) => IteratorResult<State, any>'.
 !!! error TS2345:         Type 'IteratorResult<number, State>' is not assignable to type 'IteratorResult<State, any>'.
 !!! error TS2345:           Type 'IteratorYieldResult<number>' is not assignable to type 'IteratorResult<State, any>'.
 !!! error TS2345:             Type 'IteratorYieldResult<number>' is not assignable to type 'IteratorYieldResult<State>'.
diff --git a/tests/baselines/reference/generatorTypeCheck63.types b/tests/baselines/reference/generatorTypeCheck63.types
index 64d67083e61..12d78bac5df 100644
--- a/tests/baselines/reference/generatorTypeCheck63.types
+++ b/tests/baselines/reference/generatorTypeCheck63.types
@@ -12,7 +12,7 @@ export function strategy<T extends StrategicState>(stratName: string, gen: (a: T
 >a : T
 
     return function*(state) {
->function*(state) {        for (const next of gen(state)) {            if (next) {                next.lastStrategyApplied = stratName;            }            yield next;        }    } : (state: T) => Generator<T, void, unknown>
+>function*(state) {        for (const next of gen(state)) {            if (next) {                next.lastStrategyApplied = stratName;            }            yield next;        }    } : (state: T) => Generator<T, void, undefined>
 >state : T
 
         for (const next of gen(state)) {
@@ -53,7 +53,7 @@ export const Nothing: Strategy<State> = strategy("Nothing", function* (state: St
 >strategy("Nothing", function* (state: State) {    yield 1;    return state;}) : any
 >strategy : <T extends StrategicState>(stratName: string, gen: (a: T) => IterableIterator<T>) => (a: T) => IterableIterator<T>
 >"Nothing" : "Nothing"
->function* (state: State) {    yield 1;    return state;} : (state: State) => Generator<number, State, unknown>
+>function* (state: State) {    yield 1;    return state;} : (state: State) => Generator<number, State, undefined>
 >state : State
 
     yield 1;
@@ -70,7 +70,7 @@ export const Nothing1: Strategy<State> = strategy("Nothing", function* (state: S
 >strategy("Nothing", function* (state: State) {}) : (a: State) => IterableIterator<State>
 >strategy : <T extends StrategicState>(stratName: string, gen: (a: T) => IterableIterator<T>) => (a: T) => IterableIterator<T>
 >"Nothing" : "Nothing"
->function* (state: State) {} : (state: State) => Generator<never, void, unknown>
+>function* (state: State) {} : (state: State) => Generator<never, void, undefined>
 >state : State
 
 });
@@ -80,7 +80,7 @@ export const Nothing2: Strategy<State> = strategy("Nothing", function* (state: S
 >strategy("Nothing", function* (state: State) {    return 1;}) : (a: State) => IterableIterator<State>
 >strategy : <T extends StrategicState>(stratName: string, gen: (a: T) => IterableIterator<T>) => (a: T) => IterableIterator<T>
 >"Nothing" : "Nothing"
->function* (state: State) {    return 1;} : (state: State) => Generator<never, number, unknown>
+>function* (state: State) {    return 1;} : (state: State) => Generator<never, number, undefined>
 >state : State
 
     return 1;
@@ -93,7 +93,7 @@ export const Nothing3: Strategy<State> = strategy("Nothing", function* (state: S
 >strategy("Nothing", function* (state: State) {    yield state;    return 1;}) : (a: State) => IterableIterator<State>
 >strategy : <T extends StrategicState>(stratName: string, gen: (a: T) => IterableIterator<T>) => (a: T) => IterableIterator<T>
 >"Nothing" : "Nothing"
->function* (state: State) {    yield state;    return 1;} : (state: State) => Generator<State, number, unknown>
+>function* (state: State) {    yield state;    return 1;} : (state: State) => Generator<State, number, undefined>
 >state : State
 
     yield state;
diff --git a/tests/baselines/reference/generatorYieldContextualType.types b/tests/baselines/reference/generatorYieldContextualType.types
index 5caccffa933..a90bbd040a1 100644
--- a/tests/baselines/reference/generatorYieldContextualType.types
+++ b/tests/baselines/reference/generatorYieldContextualType.types
@@ -6,7 +6,7 @@ declare function f1<T, R, S>(gen: () => Generator<R, T, S>): void;
 f1<0, 0, 1>(function* () {
 >f1<0, 0, 1>(function* () {	const a = yield 0;	return 0;}) : void
 >f1 : <T, R, S>(gen: () => Generator<R, T, S>) => void
->function* () {	const a = yield 0;	return 0;} : () => Generator<0, 0, unknown>
+>function* () {	const a = yield 0;	return 0;} : () => Generator<0, 0, 1>
 
 	const a = yield 0;
 >a : 1
@@ -25,7 +25,7 @@ declare function f2<T, R, S>(gen: () => Generator<R, T, S> | AsyncGenerator<R, T
 f2<0, 0, 1>(async function* () {
 >f2<0, 0, 1>(async function* () {	const a = yield 0;	return 0;}) : void
 >f2 : <T, R, S>(gen: () => Generator<R, T, S> | AsyncGenerator<R, T, S>) => void
->async function* () {	const a = yield 0;	return 0;} : () => AsyncGenerator<0, 0, unknown>
+>async function* () {	const a = yield 0;	return 0;} : () => AsyncGenerator<0, 0, 1>
 
 	const a = yield 0;
 >a : 1
diff --git a/tests/baselines/reference/types.asyncGenerators.es2018.1.types b/tests/baselines/reference/types.asyncGenerators.es2018.1.types
index 24da9312c15..54db9b890ec 100644
--- a/tests/baselines/reference/types.asyncGenerators.es2018.1.types
+++ b/tests/baselines/reference/types.asyncGenerators.es2018.1.types
@@ -75,7 +75,7 @@ async function * inferReturnType8() {
 }
 const assignability1: () => AsyncIterableIterator<number> = async function * () {
 >assignability1 : () => AsyncIterableIterator<number>
->async function * () {    yield 1;} : () => AsyncGenerator<number, void, unknown>
+>async function * () {    yield 1;} : () => AsyncGenerator<number, void, undefined>
 
     yield 1;
 >yield 1 : undefined
@@ -84,7 +84,7 @@ const assignability1: () => AsyncIterableIterator<number> = async function * ()
 };
 const assignability2: () => AsyncIterableIterator<number> = async function * () {
 >assignability2 : () => AsyncIterableIterator<number>
->async function * () {    yield Promise.resolve(1);} : () => AsyncGenerator<number, void, unknown>
+>async function * () {    yield Promise.resolve(1);} : () => AsyncGenerator<number, void, undefined>
 
     yield Promise.resolve(1);
 >yield Promise.resolve(1) : undefined
@@ -135,7 +135,7 @@ const assignability5: () => AsyncIterableIterator<number> = async function * ()
 };
 const assignability6: () => AsyncIterable<number> = async function * () {
 >assignability6 : () => AsyncIterable<number>
->async function * () {    yield 1;} : () => AsyncGenerator<number, void, unknown>
+>async function * () {    yield 1;} : () => AsyncGenerator<number, void, undefined>
 
     yield 1;
 >yield 1 : undefined
@@ -144,7 +144,7 @@ const assignability6: () => AsyncIterable<number> = async function * () {
 };
 const assignability7: () => AsyncIterable<number> = async function * () {
 >assignability7 : () => AsyncIterable<number>
->async function * () {    yield Promise.resolve(1);} : () => AsyncGenerator<number, void, unknown>
+>async function * () {    yield Promise.resolve(1);} : () => AsyncGenerator<number, void, undefined>
 
     yield Promise.resolve(1);
 >yield Promise.resolve(1) : undefined
@@ -195,7 +195,7 @@ const assignability10: () => AsyncIterable<number> = async function * () {
 };
 const assignability11: () => AsyncIterator<number> = async function * () {
 >assignability11 : () => AsyncIterator<number, any, undefined>
->async function * () {    yield 1;} : () => AsyncGenerator<number, void, unknown>
+>async function * () {    yield 1;} : () => AsyncGenerator<number, void, undefined>
 
     yield 1;
 >yield 1 : undefined
@@ -204,7 +204,7 @@ const assignability11: () => AsyncIterator<number> = async function * () {
 };
 const assignability12: () => AsyncIterator<number> = async function * () {
 >assignability12 : () => AsyncIterator<number, any, undefined>
->async function * () {    yield Promise.resolve(1);} : () => AsyncGenerator<number, void, unknown>
+>async function * () {    yield Promise.resolve(1);} : () => AsyncGenerator<number, void, undefined>
 
     yield Promise.resolve(1);
 >yield Promise.resolve(1) : undefined
diff --git a/tests/baselines/reference/types.asyncGenerators.es2018.2.errors.txt b/tests/baselines/reference/types.asyncGenerators.es2018.2.errors.txt
index 1ca77aebc86..d7ec011bced 100644
--- a/tests/baselines/reference/types.asyncGenerators.es2018.2.errors.txt
+++ b/tests/baselines/reference/types.asyncGenerators.es2018.2.errors.txt
@@ -1,9 +1,9 @@
 tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.es2018.2.ts(2,12): error TS2504: Type '{}' must have a '[Symbol.asyncIterator]()' method that returns an async iterator.
 tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.es2018.2.ts(8,12): error TS2504: Type 'Promise<number[]>' must have a '[Symbol.asyncIterator]()' method that returns an async iterator.
-tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.es2018.2.ts(10,7): error TS2322: Type '() => AsyncGenerator<string, void, unknown>' is not assignable to type '() => AsyncIterableIterator<number>'.
-  Type 'AsyncGenerator<string, void, unknown>' is not assignable to type 'AsyncIterableIterator<number>'.
+tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.es2018.2.ts(10,7): error TS2322: Type '() => AsyncGenerator<string, void, undefined>' is not assignable to type '() => AsyncIterableIterator<number>'.
+  Type 'AsyncGenerator<string, void, undefined>' is not assignable to type 'AsyncIterableIterator<number>'.
     Types of property 'next' are incompatible.
-      Type '(...args: [] | [unknown]) => Promise<IteratorResult<string, void>>' is not assignable to type '(...args: [] | [PromiseLike<undefined>]) => Promise<IteratorResult<number, any>>'.
+      Type '(...args: [] | [PromiseLike<undefined>]) => Promise<IteratorResult<string, void>>' is not assignable to type '(...args: [] | [PromiseLike<undefined>]) => Promise<IteratorResult<number, any>>'.
         Type 'Promise<IteratorResult<string, void>>' is not assignable to type 'Promise<IteratorResult<number, any>>'.
           Type 'IteratorResult<string, void>' is not assignable to type 'IteratorResult<number, any>'.
             Type 'IteratorYieldResult<string>' is not assignable to type 'IteratorResult<number, any>'.
@@ -11,20 +11,12 @@ tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.es2018.2.ts(
                 Type 'string' is not assignable to type 'number'.
 tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.es2018.2.ts(13,7): error TS2322: Type '() => AsyncGenerator<string, void, undefined>' is not assignable to type '() => AsyncIterableIterator<number>'.
   Type 'AsyncGenerator<string, void, undefined>' is not assignable to type 'AsyncIterableIterator<number>'.
-    Types of property 'next' are incompatible.
-      Type '(...args: [] | [PromiseLike<undefined>]) => Promise<IteratorResult<string, void>>' is not assignable to type '(...args: [] | [PromiseLike<undefined>]) => Promise<IteratorResult<number, any>>'.
-        Type 'Promise<IteratorResult<string, void>>' is not assignable to type 'Promise<IteratorResult<number, any>>'.
 tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.es2018.2.ts(16,7): error TS2322: Type '() => AsyncGenerator<string, void, unknown>' is not assignable to type '() => AsyncIterableIterator<number>'.
   Type 'AsyncGenerator<string, void, unknown>' is not assignable to type 'AsyncIterableIterator<number>'.
-tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.es2018.2.ts(19,7): error TS2322: Type '() => AsyncGenerator<string, void, unknown>' is not assignable to type '() => AsyncIterable<number>'.
-  Type 'AsyncGenerator<string, void, unknown>' is not assignable to type 'AsyncIterable<number>'.
-    Types of property '[Symbol.asyncIterator]' are incompatible.
-      Type '() => AsyncGenerator<string, void, unknown>' is not assignable to type '() => AsyncIterator<number, any, undefined>'.
-        Type 'AsyncGenerator<string, void, unknown>' is not assignable to type 'AsyncIterator<number, any, undefined>'.
-          Types of property 'next' are incompatible.
-            Type '(...args: [] | [unknown]) => Promise<IteratorResult<string, void>>' is not assignable to type '(...args: [] | [PromiseLike<undefined>]) => Promise<IteratorResult<number, any>>'.
-              Type 'Promise<IteratorResult<string, void>>' is not assignable to type 'Promise<IteratorResult<number, any>>'.
-tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.es2018.2.ts(22,7): error TS2322: Type '() => AsyncGenerator<string, void, undefined>' is not assignable to type '() => AsyncIterable<number>'.
+    Types of property 'next' are incompatible.
+      Type '(...args: [] | [unknown]) => Promise<IteratorResult<string, void>>' is not assignable to type '(...args: [] | [PromiseLike<undefined>]) => Promise<IteratorResult<number, any>>'.
+        Type 'Promise<IteratorResult<string, void>>' is not assignable to type 'Promise<IteratorResult<number, any>>'.
+tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.es2018.2.ts(19,7): error TS2322: Type '() => AsyncGenerator<string, void, undefined>' is not assignable to type '() => AsyncIterable<number>'.
   Type 'AsyncGenerator<string, void, undefined>' is not assignable to type 'AsyncIterable<number>'.
     Types of property '[Symbol.asyncIterator]' are incompatible.
       Type '() => AsyncGenerator<string, void, undefined>' is not assignable to type '() => AsyncIterator<number, any, undefined>'.
@@ -32,10 +24,18 @@ tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.es2018.2.ts(
           Types of property 'next' are incompatible.
             Type '(...args: [] | [PromiseLike<undefined>]) => Promise<IteratorResult<string, void>>' is not assignable to type '(...args: [] | [PromiseLike<undefined>]) => Promise<IteratorResult<number, any>>'.
               Type 'Promise<IteratorResult<string, void>>' is not assignable to type 'Promise<IteratorResult<number, any>>'.
+tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.es2018.2.ts(22,7): error TS2322: Type '() => AsyncGenerator<string, void, undefined>' is not assignable to type '() => AsyncIterable<number>'.
+  Type 'AsyncGenerator<string, void, undefined>' is not assignable to type 'AsyncIterable<number>'.
 tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.es2018.2.ts(25,7): error TS2322: Type '() => AsyncGenerator<string, void, unknown>' is not assignable to type '() => AsyncIterable<number>'.
   Type 'AsyncGenerator<string, void, unknown>' is not assignable to type 'AsyncIterable<number>'.
-tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.es2018.2.ts(28,7): error TS2322: Type '() => AsyncGenerator<string, void, unknown>' is not assignable to type '() => AsyncIterator<number, any, undefined>'.
-  Type 'AsyncGenerator<string, void, unknown>' is not assignable to type 'AsyncIterator<number, any, undefined>'.
+    Types of property '[Symbol.asyncIterator]' are incompatible.
+      Type '() => AsyncGenerator<string, void, unknown>' is not assignable to type '() => AsyncIterator<number, any, undefined>'.
+        Type 'AsyncGenerator<string, void, unknown>' is not assignable to type 'AsyncIterator<number, any, undefined>'.
+          Types of property 'next' are incompatible.
+            Type '(...args: [] | [unknown]) => Promise<IteratorResult<string, void>>' is not assignable to type '(...args: [] | [PromiseLike<undefined>]) => Promise<IteratorResult<number, any>>'.
+              Type 'Promise<IteratorResult<string, void>>' is not assignable to type 'Promise<IteratorResult<number, any>>'.
+tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.es2018.2.ts(28,7): error TS2322: Type '() => AsyncGenerator<string, void, undefined>' is not assignable to type '() => AsyncIterator<number, any, undefined>'.
+  Type 'AsyncGenerator<string, void, undefined>' is not assignable to type 'AsyncIterator<number, any, undefined>'.
 tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.es2018.2.ts(31,7): error TS2322: Type '() => AsyncGenerator<string, void, undefined>' is not assignable to type '() => AsyncIterator<number, any, undefined>'.
   Type 'AsyncGenerator<string, void, undefined>' is not assignable to type 'AsyncIterator<number, any, undefined>'.
 tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.es2018.2.ts(34,7): error TS2322: Type '() => AsyncGenerator<string, void, unknown>' is not assignable to type '() => AsyncIterator<number, any, undefined>'.
@@ -76,10 +76,10 @@ tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.es2018.2.ts(
     }
     const assignability1: () => AsyncIterableIterator<number> = async function * () {
           ~~~~~~~~~~~~~~
-!!! error TS2322: Type '() => AsyncGenerator<string, void, unknown>' is not assignable to type '() => AsyncIterableIterator<number>'.
-!!! error TS2322:   Type 'AsyncGenerator<string, void, unknown>' is not assignable to type 'AsyncIterableIterator<number>'.
+!!! error TS2322: Type '() => AsyncGenerator<string, void, undefined>' is not assignable to type '() => AsyncIterableIterator<number>'.
+!!! error TS2322:   Type 'AsyncGenerator<string, void, undefined>' is not assignable to type 'AsyncIterableIterator<number>'.
 !!! error TS2322:     Types of property 'next' are incompatible.
-!!! error TS2322:       Type '(...args: [] | [unknown]) => Promise<IteratorResult<string, void>>' is not assignable to type '(...args: [] | [PromiseLike<undefined>]) => Promise<IteratorResult<number, any>>'.
+!!! error TS2322:       Type '(...args: [] | [PromiseLike<undefined>]) => Promise<IteratorResult<string, void>>' is not assignable to type '(...args: [] | [PromiseLike<undefined>]) => Promise<IteratorResult<number, any>>'.
 !!! error TS2322:         Type 'Promise<IteratorResult<string, void>>' is not assignable to type 'Promise<IteratorResult<number, any>>'.
 !!! error TS2322:           Type 'IteratorResult<string, void>' is not assignable to type 'IteratorResult<number, any>'.
 !!! error TS2322:             Type 'IteratorYieldResult<string>' is not assignable to type 'IteratorResult<number, any>'.
@@ -91,31 +91,19 @@ tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.es2018.2.ts(
           ~~~~~~~~~~~~~~
 !!! error TS2322: Type '() => AsyncGenerator<string, void, undefined>' is not assignable to type '() => AsyncIterableIterator<number>'.
 !!! error TS2322:   Type 'AsyncGenerator<string, void, undefined>' is not assignable to type 'AsyncIterableIterator<number>'.
-!!! error TS2322:     Types of property 'next' are incompatible.
-!!! error TS2322:       Type '(...args: [] | [PromiseLike<undefined>]) => Promise<IteratorResult<string, void>>' is not assignable to type '(...args: [] | [PromiseLike<undefined>]) => Promise<IteratorResult<number, any>>'.
-!!! error TS2322:         Type 'Promise<IteratorResult<string, void>>' is not assignable to type 'Promise<IteratorResult<number, any>>'.
         yield* ["a", "b"];
     };
     const assignability3: () => AsyncIterableIterator<number> = async function * () {
           ~~~~~~~~~~~~~~
 !!! error TS2322: Type '() => AsyncGenerator<string, void, unknown>' is not assignable to type '() => AsyncIterableIterator<number>'.
 !!! error TS2322:   Type 'AsyncGenerator<string, void, unknown>' is not assignable to type 'AsyncIterableIterator<number>'.
+!!! error TS2322:     Types of property 'next' are incompatible.
+!!! error TS2322:       Type '(...args: [] | [unknown]) => Promise<IteratorResult<string, void>>' is not assignable to type '(...args: [] | [PromiseLike<undefined>]) => Promise<IteratorResult<number, any>>'.
+!!! error TS2322:         Type 'Promise<IteratorResult<string, void>>' is not assignable to type 'Promise<IteratorResult<number, any>>'.
         yield* (async function * () { yield "a"; })();
     };
     const assignability4: () => AsyncIterable<number> = async function * () {
           ~~~~~~~~~~~~~~
-!!! error TS2322: Type '() => AsyncGenerator<string, void, unknown>' is not assignable to type '() => AsyncIterable<number>'.
-!!! error TS2322:   Type 'AsyncGenerator<string, void, unknown>' is not assignable to type 'AsyncIterable<number>'.
-!!! error TS2322:     Types of property '[Symbol.asyncIterator]' are incompatible.
-!!! error TS2322:       Type '() => AsyncGenerator<string, void, unknown>' is not assignable to type '() => AsyncIterator<number, any, undefined>'.
-!!! error TS2322:         Type 'AsyncGenerator<string, void, unknown>' is not assignable to type 'AsyncIterator<number, any, undefined>'.
-!!! error TS2322:           Types of property 'next' are incompatible.
-!!! error TS2322:             Type '(...args: [] | [unknown]) => Promise<IteratorResult<string, void>>' is not assignable to type '(...args: [] | [PromiseLike<undefined>]) => Promise<IteratorResult<number, any>>'.
-!!! error TS2322:               Type 'Promise<IteratorResult<string, void>>' is not assignable to type 'Promise<IteratorResult<number, any>>'.
-        yield "a";
-    };
-    const assignability5: () => AsyncIterable<number> = async function * () {
-          ~~~~~~~~~~~~~~
 !!! error TS2322: Type '() => AsyncGenerator<string, void, undefined>' is not assignable to type '() => AsyncIterable<number>'.
 !!! error TS2322:   Type 'AsyncGenerator<string, void, undefined>' is not assignable to type 'AsyncIterable<number>'.
 !!! error TS2322:     Types of property '[Symbol.asyncIterator]' are incompatible.
@@ -124,18 +112,30 @@ tests/cases/conformance/types/asyncGenerators/types.asyncGenerators.es2018.2.ts(
 !!! error TS2322:           Types of property 'next' are incompatible.
 !!! error TS2322:             Type '(...args: [] | [PromiseLike<undefined>]) => Promise<IteratorResult<string, void>>' is not assignable to type '(...args: [] | [PromiseLike<undefined>]) => Promise<IteratorResult<number, any>>'.
 !!! error TS2322:               Type 'Promise<IteratorResult<string, void>>' is not assignable to type 'Promise<IteratorResult<number, any>>'.
+        yield "a";
+    };
+    const assignability5: () => AsyncIterable<number> = async function * () {
+          ~~~~~~~~~~~~~~
+!!! error TS2322: Type '() => AsyncGenerator<string, void, undefined>' is not assignable to type '() => AsyncIterable<number>'.
+!!! error TS2322:   Type 'AsyncGenerator<string, void, undefined>' is not assignable to type 'AsyncIterable<number>'.
         yield* ["a", "b"];
     };
     const assignability6: () => AsyncIterable<number> = async function * () {
           ~~~~~~~~~~~~~~
 !!! error TS2322: Type '() => AsyncGenerator<string, void, unknown>' is not assignable to type '() => AsyncIterable<number>'.
 !!! error TS2322:   Type 'AsyncGenerator<string, void, unknown>' is not assignable to type 'AsyncIterable<number>'.
+!!! error TS2322:     Types of property '[Symbol.asyncIterator]' are incompatible.
+!!! error TS2322:       Type '() => AsyncGenerator<string, void, unknown>' is not assignable to type '() => AsyncIterator<number, any, undefined>'.
+!!! error TS2322:         Type 'AsyncGenerator<string, void, unknown>' is not assignable to type 'AsyncIterator<number, any, undefined>'.
+!!! error TS2322:           Types of property 'next' are incompatible.
+!!! error TS2322:             Type '(...args: [] | [unknown]) => Promise<IteratorResult<string, void>>' is not assignable to type '(...args: [] | [PromiseLike<undefined>]) => Promise<IteratorResult<number, any>>'.
+!!! error TS2322:               Type 'Promise<IteratorResult<string, void>>' is not assignable to type 'Promise<IteratorResult<number, any>>'.
         yield* (async function * () { yield "a"; })();
     };
     const assignability7: () => AsyncIterator<number> = async function * () {
           ~~~~~~~~~~~~~~
-!!! error TS2322: Type '() => AsyncGenerator<string, void, unknown>' is not assignable to type '() => AsyncIterator<number, any, undefined>'.
-!!! error TS2322:   Type 'AsyncGenerator<string, void, unknown>' is not assignable to type 'AsyncIterator<number, any, undefined>'.
+!!! error TS2322: Type '() => AsyncGenerator<string, void, undefined>' is not assignable to type '() => AsyncIterator<number, any, undefined>'.
+!!! error TS2322:   Type 'AsyncGenerator<string, void, undefined>' is not assignable to type 'AsyncIterator<number, any, undefined>'.
         yield "a";
     };
     const assignability8: () => AsyncIterator<number> = async function * () {
diff --git a/tests/baselines/reference/types.asyncGenerators.es2018.2.types b/tests/baselines/reference/types.asyncGenerators.es2018.2.types
index 022ddd297a2..83524871199 100644
--- a/tests/baselines/reference/types.asyncGenerators.es2018.2.types
+++ b/tests/baselines/reference/types.asyncGenerators.es2018.2.types
@@ -29,7 +29,7 @@ async function * inferReturnType3() {
 }
 const assignability1: () => AsyncIterableIterator<number> = async function * () {
 >assignability1 : () => AsyncIterableIterator<number>
->async function * () {    yield "a";} : () => AsyncGenerator<string, void, unknown>
+>async function * () {    yield "a";} : () => AsyncGenerator<string, void, undefined>
 
     yield "a";
 >yield "a" : undefined
@@ -62,7 +62,7 @@ const assignability3: () => AsyncIterableIterator<number> = async function * ()
 };
 const assignability4: () => AsyncIterable<number> = async function * () {
 >assignability4 : () => AsyncIterable<number>
->async function * () {    yield "a";} : () => AsyncGenerator<string, void, unknown>
+>async function * () {    yield "a";} : () => AsyncGenerator<string, void, undefined>
 
     yield "a";
 >yield "a" : undefined
@@ -95,7 +95,7 @@ const assignability6: () => AsyncIterable<number> = async function * () {
 };
 const assignability7: () => AsyncIterator<number> = async function * () {
 >assignability7 : () => AsyncIterator<number, any, undefined>
->async function * () {    yield "a";} : () => AsyncGenerator<string, void, unknown>
+>async function * () {    yield "a";} : () => AsyncGenerator<string, void, undefined>
 
     yield "a";
 >yield "a" : undefined
diff --git a/tests/baselines/reference/uniqueSymbols.types b/tests/baselines/reference/uniqueSymbols.types
index 02ededf7b1f..a321593c11a 100644
--- a/tests/baselines/reference/uniqueSymbols.types
+++ b/tests/baselines/reference/uniqueSymbols.types
@@ -819,7 +819,7 @@ interface Context {
 
 const o3: Context = {
 >o3 : Context
->{    method1() {        return s; // return type should not widen due to contextual type    },    async method2() {        return s; // return type should not widen due to contextual type    },    async * method3() {        yield s; // yield type should not widen due to contextual type    },    * method4() {        yield s; // yield type should not widen due to contextual type    },    method5(p = s) { // parameter should not widen due to contextual type        return p;    },} : { method1(): unique symbol; method2(): Promise<unique symbol>; method3(): AsyncGenerator<unique symbol, void, unknown>; method4(): Generator<unique symbol, void, unknown>; method5(p?: unique symbol): unique symbol; }
+>{    method1() {        return s; // return type should not widen due to contextual type    },    async method2() {        return s; // return type should not widen due to contextual type    },    async * method3() {        yield s; // yield type should not widen due to contextual type    },    * method4() {        yield s; // yield type should not widen due to contextual type    },    method5(p = s) { // parameter should not widen due to contextual type        return p;    },} : { method1(): unique symbol; method2(): Promise<unique symbol>; method3(): AsyncGenerator<unique symbol, void, undefined>; method4(): Generator<unique symbol, void, undefined>; method5(p?: unique symbol): unique symbol; }
 
     method1() {
 >method1 : () => unique symbol
@@ -836,7 +836,7 @@ const o3: Context = {
 
     },
     async * method3() {
->method3 : () => AsyncGenerator<unique symbol, void, unknown>
+>method3 : () => AsyncGenerator<unique symbol, void, undefined>
 
         yield s; // yield type should not widen due to contextual type
 >yield s : undefined
@@ -844,7 +844,7 @@ const o3: Context = {
 
     },
     * method4() {
->method4 : () => Generator<unique symbol, void, unknown>
+>method4 : () => Generator<unique symbol, void, undefined>
 
         yield s; // yield type should not widen due to contextual type
 >yield s : undefined
diff --git a/tests/baselines/reference/uniqueSymbolsDeclarations.types b/tests/baselines/reference/uniqueSymbolsDeclarations.types
index db198153153..bacdafc5680 100644
--- a/tests/baselines/reference/uniqueSymbolsDeclarations.types
+++ b/tests/baselines/reference/uniqueSymbolsDeclarations.types
@@ -812,7 +812,7 @@ interface Context {
 
 const o4: Context = {
 >o4 : Context
->{    method1() {        return s; // return type should not widen due to contextual type    },    async method2() {        return s; // return type should not widen due to contextual type    },    async * method3() {        yield s; // yield type should not widen due to contextual type    },    * method4() {        yield s; // yield type should not widen due to contextual type    },    method5(p = s) { // parameter should not widen due to contextual type        return p;    }} : { method1(): unique symbol; method2(): Promise<unique symbol>; method3(): AsyncGenerator<unique symbol, void, unknown>; method4(): Generator<unique symbol, void, unknown>; method5(p?: unique symbol): unique symbol; }
+>{    method1() {        return s; // return type should not widen due to contextual type    },    async method2() {        return s; // return type should not widen due to contextual type    },    async * method3() {        yield s; // yield type should not widen due to contextual type    },    * method4() {        yield s; // yield type should not widen due to contextual type    },    method5(p = s) { // parameter should not widen due to contextual type        return p;    }} : { method1(): unique symbol; method2(): Promise<unique symbol>; method3(): AsyncGenerator<unique symbol, void, undefined>; method4(): Generator<unique symbol, void, undefined>; method5(p?: unique symbol): unique symbol; }
 
     method1() {
 >method1 : () => unique symbol
@@ -829,7 +829,7 @@ const o4: Context = {
 
     },
     async * method3() {
->method3 : () => AsyncGenerator<unique symbol, void, unknown>
+>method3 : () => AsyncGenerator<unique symbol, void, undefined>
 
         yield s; // yield type should not widen due to contextual type
 >yield s : undefined
@@ -837,7 +837,7 @@ const o4: Context = {
 
     },
     * method4() {
->method4 : () => Generator<unique symbol, void, unknown>
+>method4 : () => Generator<unique symbol, void, undefined>
 
         yield s; // yield type should not widen due to contextual type
 >yield s : undefined

From 7adc175dfc81a44f5c17cc3a63d83feb9a242e56 Mon Sep 17 00:00:00 2001
From: Wesley Wigham <wewigham@microsoft.com>
Date: Mon, 5 Aug 2019 23:37:26 -0700
Subject: [PATCH 113/151] Adjust isIdentifierText to skip multiple characters
 when a code point is multiple chars long (#32720)

* Adjust isIdentifierText to skip multiple characters when a code point is multiple chars long

* Add a few examples with mixed unicode characters

* for posterity, add some unicode cursive script characters

* Test some more planes more explicitly
---
 src/compiler/scanner.ts                       |  22 ++--
 .../extendedUnicodePlaneIdentifiers.js        |  55 ++++++++++
 .../extendedUnicodePlaneIdentifiers.symbols   |  77 ++++++++++++++
 .../extendedUnicodePlaneIdentifiers.types     | 100 ++++++++++++++++++
 .../extendedUnicodePlaneIdentifiers.ts        |  34 ++++++
 5 files changed, 278 insertions(+), 10 deletions(-)

diff --git a/src/compiler/scanner.ts b/src/compiler/scanner.ts
index d633e4926b2..7eaca34a212 100644
--- a/src/compiler/scanner.ts
+++ b/src/compiler/scanner.ts
@@ -832,12 +832,13 @@ namespace ts {
 
     /* @internal */
     export function isIdentifierText(name: string, languageVersion: ScriptTarget | undefined): boolean {
-        if (!isIdentifierStart(name.charCodeAt(0), languageVersion)) {
+        let ch = codePointAt(name, 0);
+        if (!isIdentifierStart(ch, languageVersion)) {
             return false;
         }
 
-        for (let i = 1; i < name.length; i++) {
-            if (!isIdentifierPart(name.charCodeAt(i), languageVersion)) {
+        for (let i = charSize(ch); i < name.length; i += charSize(ch)) {
+            if (!isIdentifierPart(ch = codePointAt(name, i), languageVersion)) {
                 return false;
             }
         }
@@ -1870,13 +1871,6 @@ namespace ts {
             }
         }
 
-        function charSize(ch: number) {
-            if (ch > 0x10000) {
-                return 2;
-            }
-            return 1;
-        }
-
         function reScanGreaterToken(): SyntaxKind {
             if (token === SyntaxKind.GreaterThanToken) {
                 if (text.charCodeAt(pos) === CharacterCodes.greaterThan) {
@@ -2238,4 +2232,12 @@ namespace ts {
         }
         return first;
     };
+
+    /* @internal */
+    function charSize(ch: number) {
+        if (ch > 0x10000) {
+            return 2;
+        }
+        return 1;
+    }
 }
diff --git a/tests/baselines/reference/extendedUnicodePlaneIdentifiers.js b/tests/baselines/reference/extendedUnicodePlaneIdentifiers.js
index 73271b8b671..7a5a5d9cc04 100644
--- a/tests/baselines/reference/extendedUnicodePlaneIdentifiers.js
+++ b/tests/baselines/reference/extendedUnicodePlaneIdentifiers.js
@@ -2,9 +2,64 @@
 const 𝑚 = 4;
 const 𝑀 = 5;
 console.log(𝑀 + 𝑚); // 9
+
+// lower 8 bits look like 'a'
+const ၡ = 6;
+console.log(ၡ ** ၡ);
+
+// lower 8 bits aren't a valid unicode character
+const ဒ = 7;
+console.log(ဒ ** ဒ);
+
+// a mix, for good measure
+const ဒၡ𝑀 = 7;
+console.log(ဒၡ𝑀 ** ဒၡ𝑀);
+
+const ၡ𝑀ဒ = 7;
+console.log(ၡ𝑀ဒ ** ၡ𝑀ဒ);
+
+const 𝑀ဒၡ = 7;
+console.log(𝑀ဒၡ ** 𝑀ဒၡ);
+
+const 𝓱𝓮𝓵𝓵𝓸 = "𝔀𝓸𝓻𝓵𝓭";
+
+const Ɐⱱ = "ok"; // BMP
+
+const 𓀸𓀹𓀺 = "ok"; // SMP
+
+const 𡚭𡚮𡚯 = "ok"; // SIP
+
+const 𡚭𓀺ⱱ𝓮 = "ok";
+
+const 𓀺ⱱ𝓮𡚭 = "ok";
+
+const ⱱ𝓮𡚭𓀺 = "ok";
+
+const 𝓮𡚭𓀺ⱱ = "ok";
 
 
 //// [extendedUnicodePlaneIdentifiers.js]
 const 𝑚 = 4;
 const 𝑀 = 5;
 console.log(𝑀 + 𝑚); // 9
+// lower 8 bits look like 'a'
+const ၡ = 6;
+console.log(ၡ ** ၡ);
+// lower 8 bits aren't a valid unicode character
+const ဒ = 7;
+console.log(ဒ ** ဒ);
+// a mix, for good measure
+const ဒၡ𝑀 = 7;
+console.log(ဒၡ𝑀 ** ဒၡ𝑀);
+const ၡ𝑀ဒ = 7;
+console.log(ၡ𝑀ဒ ** ၡ𝑀ဒ);
+const 𝑀ဒၡ = 7;
+console.log(𝑀ဒၡ ** 𝑀ဒၡ);
+const 𝓱𝓮𝓵𝓵𝓸 = "𝔀𝓸𝓻𝓵𝓭";
+const Ɐⱱ = "ok"; // BMP
+const 𓀸𓀹𓀺 = "ok"; // SMP
+const 𡚭𡚮𡚯 = "ok"; // SIP
+const 𡚭𓀺ⱱ𝓮 = "ok";
+const 𓀺ⱱ𝓮𡚭 = "ok";
+const ⱱ𝓮𡚭𓀺 = "ok";
+const 𝓮𡚭𓀺ⱱ = "ok";
diff --git a/tests/baselines/reference/extendedUnicodePlaneIdentifiers.symbols b/tests/baselines/reference/extendedUnicodePlaneIdentifiers.symbols
index 9d78bfaee05..170b82da7e9 100644
--- a/tests/baselines/reference/extendedUnicodePlaneIdentifiers.symbols
+++ b/tests/baselines/reference/extendedUnicodePlaneIdentifiers.symbols
@@ -12,3 +12,80 @@ console.log(𝑀 + 𝑚); // 9
 >𝑀 : Symbol(𝑀, Decl(extendedUnicodePlaneIdentifiers.ts, 1, 5))
 >𝑚 : Symbol(𝑚, Decl(extendedUnicodePlaneIdentifiers.ts, 0, 5))
 
+// lower 8 bits look like 'a'
+const ၡ = 6;
+>ၡ : Symbol(ၡ, Decl(extendedUnicodePlaneIdentifiers.ts, 5, 5))
+
+console.log(ၡ ** ၡ);
+>console.log : Symbol(Console.log, Decl(lib.dom.d.ts, --, --))
+>console : Symbol(console, Decl(lib.dom.d.ts, --, --))
+>log : Symbol(Console.log, Decl(lib.dom.d.ts, --, --))
+>ၡ : Symbol(ၡ, Decl(extendedUnicodePlaneIdentifiers.ts, 5, 5))
+>ၡ : Symbol(ၡ, Decl(extendedUnicodePlaneIdentifiers.ts, 5, 5))
+
+// lower 8 bits aren't a valid unicode character
+const ဒ = 7;
+>ဒ : Symbol(ဒ, Decl(extendedUnicodePlaneIdentifiers.ts, 9, 5))
+
+console.log(ဒ ** ဒ);
+>console.log : Symbol(Console.log, Decl(lib.dom.d.ts, --, --))
+>console : Symbol(console, Decl(lib.dom.d.ts, --, --))
+>log : Symbol(Console.log, Decl(lib.dom.d.ts, --, --))
+>ဒ : Symbol(ဒ, Decl(extendedUnicodePlaneIdentifiers.ts, 9, 5))
+>ဒ : Symbol(ဒ, Decl(extendedUnicodePlaneIdentifiers.ts, 9, 5))
+
+// a mix, for good measure
+const ဒၡ𝑀 = 7;
+>ဒၡ𝑀 : Symbol(ဒၡ𝑀, Decl(extendedUnicodePlaneIdentifiers.ts, 13, 5))
+
+console.log(ဒၡ𝑀 ** ဒၡ𝑀);
+>console.log : Symbol(Console.log, Decl(lib.dom.d.ts, --, --))
+>console : Symbol(console, Decl(lib.dom.d.ts, --, --))
+>log : Symbol(Console.log, Decl(lib.dom.d.ts, --, --))
+>ဒၡ𝑀 : Symbol(ဒၡ𝑀, Decl(extendedUnicodePlaneIdentifiers.ts, 13, 5))
+>ဒၡ𝑀 : Symbol(ဒၡ𝑀, Decl(extendedUnicodePlaneIdentifiers.ts, 13, 5))
+
+const ၡ𝑀ဒ = 7;
+>ၡ𝑀ဒ : Symbol(ၡ𝑀ဒ, Decl(extendedUnicodePlaneIdentifiers.ts, 16, 5))
+
+console.log(ၡ𝑀ဒ ** ၡ𝑀ဒ);
+>console.log : Symbol(Console.log, Decl(lib.dom.d.ts, --, --))
+>console : Symbol(console, Decl(lib.dom.d.ts, --, --))
+>log : Symbol(Console.log, Decl(lib.dom.d.ts, --, --))
+>ၡ𝑀ဒ : Symbol(ၡ𝑀ဒ, Decl(extendedUnicodePlaneIdentifiers.ts, 16, 5))
+>ၡ𝑀ဒ : Symbol(ၡ𝑀ဒ, Decl(extendedUnicodePlaneIdentifiers.ts, 16, 5))
+
+const 𝑀ဒၡ = 7;
+>𝑀ဒၡ : Symbol(𝑀ဒၡ, Decl(extendedUnicodePlaneIdentifiers.ts, 19, 5))
+
+console.log(𝑀ဒၡ ** 𝑀ဒၡ);
+>console.log : Symbol(Console.log, Decl(lib.dom.d.ts, --, --))
+>console : Symbol(console, Decl(lib.dom.d.ts, --, --))
+>log : Symbol(Console.log, Decl(lib.dom.d.ts, --, --))
+>𝑀ဒၡ : Symbol(𝑀ဒၡ, Decl(extendedUnicodePlaneIdentifiers.ts, 19, 5))
+>𝑀ဒၡ : Symbol(𝑀ဒၡ, Decl(extendedUnicodePlaneIdentifiers.ts, 19, 5))
+
+const 𝓱𝓮𝓵𝓵𝓸 = "𝔀𝓸𝓻𝓵𝓭";
+>𝓱𝓮𝓵𝓵𝓸 : Symbol(𝓱𝓮𝓵𝓵𝓸, Decl(extendedUnicodePlaneIdentifiers.ts, 22, 5))
+
+const Ɐⱱ = "ok"; // BMP
+>Ɐⱱ : Symbol(Ɐⱱ, Decl(extendedUnicodePlaneIdentifiers.ts, 24, 5))
+
+const 𓀸𓀹𓀺 = "ok"; // SMP
+>𓀸𓀹𓀺 : Symbol(𓀸𓀹𓀺, Decl(extendedUnicodePlaneIdentifiers.ts, 26, 5))
+
+const 𡚭𡚮𡚯 = "ok"; // SIP
+>𡚭𡚮𡚯 : Symbol(𡚭𡚮𡚯, Decl(extendedUnicodePlaneIdentifiers.ts, 28, 5))
+
+const 𡚭𓀺ⱱ𝓮 = "ok";
+>𡚭𓀺ⱱ𝓮 : Symbol(𡚭𓀺ⱱ𝓮, Decl(extendedUnicodePlaneIdentifiers.ts, 30, 5))
+
+const 𓀺ⱱ𝓮𡚭 = "ok";
+>𓀺ⱱ𝓮𡚭 : Symbol(𓀺ⱱ𝓮𡚭, Decl(extendedUnicodePlaneIdentifiers.ts, 32, 5))
+
+const ⱱ𝓮𡚭𓀺 = "ok";
+>ⱱ𝓮𡚭𓀺 : Symbol(ⱱ𝓮𡚭𓀺, Decl(extendedUnicodePlaneIdentifiers.ts, 34, 5))
+
+const 𝓮𡚭𓀺ⱱ = "ok";
+>𝓮𡚭𓀺ⱱ : Symbol(𝓮𡚭𓀺ⱱ, Decl(extendedUnicodePlaneIdentifiers.ts, 36, 5))
+
diff --git a/tests/baselines/reference/extendedUnicodePlaneIdentifiers.types b/tests/baselines/reference/extendedUnicodePlaneIdentifiers.types
index 5de90b68b6d..4ee200dd5d3 100644
--- a/tests/baselines/reference/extendedUnicodePlaneIdentifiers.types
+++ b/tests/baselines/reference/extendedUnicodePlaneIdentifiers.types
@@ -16,3 +16,103 @@ console.log(𝑀 + 𝑚); // 9
 >𝑀 : 5
 >𝑚 : 4
 
+// lower 8 bits look like 'a'
+const ၡ = 6;
+>ၡ : 6
+>6 : 6
+
+console.log(ၡ ** ၡ);
+>console.log(ၡ ** ၡ) : void
+>console.log : (message?: any, ...optionalParams: any[]) => void
+>console : Console
+>log : (message?: any, ...optionalParams: any[]) => void
+>ၡ ** ၡ : number
+>ၡ : 6
+>ၡ : 6
+
+// lower 8 bits aren't a valid unicode character
+const ဒ = 7;
+>ဒ : 7
+>7 : 7
+
+console.log(ဒ ** ဒ);
+>console.log(ဒ ** ဒ) : void
+>console.log : (message?: any, ...optionalParams: any[]) => void
+>console : Console
+>log : (message?: any, ...optionalParams: any[]) => void
+>ဒ ** ဒ : number
+>ဒ : 7
+>ဒ : 7
+
+// a mix, for good measure
+const ဒၡ𝑀 = 7;
+>ဒၡ𝑀 : 7
+>7 : 7
+
+console.log(ဒၡ𝑀 ** ဒၡ𝑀);
+>console.log(ဒၡ𝑀 ** ဒၡ𝑀) : void
+>console.log : (message?: any, ...optionalParams: any[]) => void
+>console : Console
+>log : (message?: any, ...optionalParams: any[]) => void
+>ဒၡ𝑀 ** ဒၡ𝑀 : number
+>ဒၡ𝑀 : 7
+>ဒၡ𝑀 : 7
+
+const ၡ𝑀ဒ = 7;
+>ၡ𝑀ဒ : 7
+>7 : 7
+
+console.log(ၡ𝑀ဒ ** ၡ𝑀ဒ);
+>console.log(ၡ𝑀ဒ ** ၡ𝑀ဒ) : void
+>console.log : (message?: any, ...optionalParams: any[]) => void
+>console : Console
+>log : (message?: any, ...optionalParams: any[]) => void
+>ၡ𝑀ဒ ** ၡ𝑀ဒ : number
+>ၡ𝑀ဒ : 7
+>ၡ𝑀ဒ : 7
+
+const 𝑀ဒၡ = 7;
+>𝑀ဒၡ : 7
+>7 : 7
+
+console.log(𝑀ဒၡ ** 𝑀ဒၡ);
+>console.log(𝑀ဒၡ ** 𝑀ဒၡ) : void
+>console.log : (message?: any, ...optionalParams: any[]) => void
+>console : Console
+>log : (message?: any, ...optionalParams: any[]) => void
+>𝑀ဒၡ ** 𝑀ဒၡ : number
+>𝑀ဒၡ : 7
+>𝑀ဒၡ : 7
+
+const 𝓱𝓮𝓵𝓵𝓸 = "𝔀𝓸𝓻𝓵𝓭";
+>𝓱𝓮𝓵𝓵𝓸 : "𝔀𝓸𝓻𝓵𝓭"
+>"𝔀𝓸𝓻𝓵𝓭" : "𝔀𝓸𝓻𝓵𝓭"
+
+const Ɐⱱ = "ok"; // BMP
+>Ɐⱱ : "ok"
+>"ok" : "ok"
+
+const 𓀸𓀹𓀺 = "ok"; // SMP
+>𓀸𓀹𓀺 : "ok"
+>"ok" : "ok"
+
+const 𡚭𡚮𡚯 = "ok"; // SIP
+>𡚭𡚮𡚯 : "ok"
+>"ok" : "ok"
+
+const 𡚭𓀺ⱱ𝓮 = "ok";
+>𡚭𓀺ⱱ𝓮 : "ok"
+>"ok" : "ok"
+
+const 𓀺ⱱ𝓮𡚭 = "ok";
+>𓀺ⱱ𝓮𡚭 : "ok"
+>"ok" : "ok"
+
+const ⱱ𝓮𡚭𓀺 = "ok";
+>ⱱ𝓮𡚭𓀺 : "ok"
+>"ok" : "ok"
+
+const 𝓮𡚭𓀺ⱱ = "ok";
+>𝓮𡚭𓀺ⱱ : "ok"
+>"ok" : "ok"
+
diff --git a/tests/cases/compiler/extendedUnicodePlaneIdentifiers.ts b/tests/cases/compiler/extendedUnicodePlaneIdentifiers.ts
index f207571549c..9210ee3b7c5 100644
--- a/tests/cases/compiler/extendedUnicodePlaneIdentifiers.ts
+++ b/tests/cases/compiler/extendedUnicodePlaneIdentifiers.ts
@@ -2,3 +2,37 @@
 const 𝑚 = 4;
 const 𝑀 = 5;
 console.log(𝑀 + 𝑚); // 9
+
+// lower 8 bits look like 'a'
+const ၡ = 6;
+console.log(ၡ ** ၡ);
+
+// lower 8 bits aren't a valid unicode character
+const ဒ = 7;
+console.log(ဒ ** ဒ);
+
+// a mix, for good measure
+const ဒၡ𝑀 = 7;
+console.log(ဒၡ𝑀 ** ဒၡ𝑀);
+
+const ၡ𝑀ဒ = 7;
+console.log(ၡ𝑀ဒ ** ၡ𝑀ဒ);
+
+const 𝑀ဒၡ = 7;
+console.log(𝑀ဒၡ ** 𝑀ဒၡ);
+
+const 𝓱𝓮𝓵𝓵𝓸 = "𝔀𝓸𝓻𝓵𝓭";
+
+const Ɐⱱ = "ok"; // BMP
+
+const 𓀸𓀹𓀺 = "ok"; // SMP
+
+const 𡚭𡚮𡚯 = "ok"; // SIP
+
+const 𡚭𓀺ⱱ𝓮 = "ok";
+
+const 𓀺ⱱ𝓮𡚭 = "ok";
+
+const ⱱ𝓮𡚭𓀺 = "ok";
+
+const 𝓮𡚭𓀺ⱱ = "ok";

From 3ff0a249d2ab1dfa4acde313a16537b361093fcd Mon Sep 17 00:00:00 2001
From: Ron Buckton <ron.buckton@microsoft.com>
Date: Tue, 6 Aug 2019 10:46:17 -0700
Subject: [PATCH 114/151] Update based on PR feedback

---
 src/compiler/factory.ts                                     | 2 +-
 src/testRunner/unittests/evaluation/forOf.ts                | 6 +++---
 tests/baselines/reference/ES5For-of33.js                    | 2 +-
 tests/baselines/reference/ES5For-of33.sourcemap.txt         | 2 +-
 tests/baselines/reference/ES5For-of34.js                    | 2 +-
 tests/baselines/reference/ES5For-of34.sourcemap.txt         | 2 +-
 tests/baselines/reference/ES5For-of35.js                    | 2 +-
 tests/baselines/reference/ES5For-of35.sourcemap.txt         | 2 +-
 tests/baselines/reference/ES5For-of36.js                    | 2 +-
 tests/baselines/reference/ES5For-of36.sourcemap.txt         | 2 +-
 tests/baselines/reference/ES5For-of37.js                    | 2 +-
 .../reference/blockScopedBindingsInDownlevelGenerator.js    | 2 +-
 .../reference/emitter.asyncGenerators.classMethods.es5.js   | 4 ++--
 .../emitter.asyncGenerators.functionDeclarations.es5.js     | 4 ++--
 .../emitter.asyncGenerators.functionExpressions.es5.js      | 4 ++--
 .../emitter.asyncGenerators.objectLiteralMethods.es5.js     | 4 ++--
 ...emptyVariableDeclarationBindingPatterns01_ES5iterable.js | 2 +-
 17 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/compiler/factory.ts b/src/compiler/factory.ts
index 82b4a3fb59f..3a8ecb20999 100644
--- a/src/compiler/factory.ts
+++ b/src/compiler/factory.ts
@@ -3645,7 +3645,7 @@ namespace ts {
                         return { value: o && o[i++], done: !o };
                     }
                 };
-                throw new TypeError(s ? "Object not iterable." : "Symbol.iterator is not defined.");
+                throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
             };`
     };
 
diff --git a/src/testRunner/unittests/evaluation/forOf.ts b/src/testRunner/unittests/evaluation/forOf.ts
index 3d9352cf926..9efdf16d351 100644
--- a/src/testRunner/unittests/evaluation/forOf.ts
+++ b/src/testRunner/unittests/evaluation/forOf.ts
@@ -66,7 +66,7 @@ describe("unittests:: evaluation:: forOfEvaluation", () => {
         }
         `, { downlevelIteration: true, target: ts.ScriptTarget.ES5 });
 
-        assert.throws(() => result.main(), "undefined is not iterable (cannot read property Symbol(Symbol.iterator))");
+        assert.throws(() => result.main(), /cannot read property.*Symbol\(Symbol\.iterator\).*/i);
     });
 
     it("es5 over object with no Symbol.iterator with no Symbol", () => {
@@ -93,7 +93,7 @@ describe("unittests:: evaluation:: forOfEvaluation", () => {
         }
         `, { downlevelIteration: true, target: ts.ScriptTarget.ES5 });
 
-        assert.throws(() => result.main(), "Object not iterable");
+        assert.throws(() => result.main(), "Object is not iterable");
     });
 
     it("es5 over object with Symbol.iterator", () => {
@@ -110,7 +110,7 @@ describe("unittests:: evaluation:: forOfEvaluation", () => {
                 {
                     output.push(value)
                 }
-                
+
             }`, { downlevelIteration: true, target: ts.ScriptTarget.ES5 });
 
         result.main();
diff --git a/tests/baselines/reference/ES5For-of33.js b/tests/baselines/reference/ES5For-of33.js
index 900f32b6407..e177630b00c 100644
--- a/tests/baselines/reference/ES5For-of33.js
+++ b/tests/baselines/reference/ES5For-of33.js
@@ -13,7 +13,7 @@ var __values = (this && this.__values) || function(o) {
             return { value: o && o[i++], done: !o };
         }
     };
-    throw new TypeError(s ? "Object not iterable." : "Symbol.iterator is not defined.");
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 };
 var e_1, _a;
 try {
diff --git a/tests/baselines/reference/ES5For-of33.sourcemap.txt b/tests/baselines/reference/ES5For-of33.sourcemap.txt
index f6be2e8fb11..b1be3f06d45 100644
--- a/tests/baselines/reference/ES5For-of33.sourcemap.txt
+++ b/tests/baselines/reference/ES5For-of33.sourcemap.txt
@@ -17,7 +17,7 @@ sourceFile:ES5For-of33.ts
 >>>            return { value: o && o[i++], done: !o };
 >>>        }
 >>>    };
->>>    throw new TypeError(s ? "Object not iterable." : "Symbol.iterator is not defined.");
+>>>    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 >>>};
 >>>var e_1, _a;
 >>>try {
diff --git a/tests/baselines/reference/ES5For-of34.js b/tests/baselines/reference/ES5For-of34.js
index d4ab664d009..2f0ee24e3d8 100644
--- a/tests/baselines/reference/ES5For-of34.js
+++ b/tests/baselines/reference/ES5For-of34.js
@@ -16,7 +16,7 @@ var __values = (this && this.__values) || function(o) {
             return { value: o && o[i++], done: !o };
         }
     };
-    throw new TypeError(s ? "Object not iterable." : "Symbol.iterator is not defined.");
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 };
 var e_1, _a;
 function foo() {
diff --git a/tests/baselines/reference/ES5For-of34.sourcemap.txt b/tests/baselines/reference/ES5For-of34.sourcemap.txt
index e64aa5cdb8c..5694d550cf6 100644
--- a/tests/baselines/reference/ES5For-of34.sourcemap.txt
+++ b/tests/baselines/reference/ES5For-of34.sourcemap.txt
@@ -17,7 +17,7 @@ sourceFile:ES5For-of34.ts
 >>>            return { value: o && o[i++], done: !o };
 >>>        }
 >>>    };
->>>    throw new TypeError(s ? "Object not iterable." : "Symbol.iterator is not defined.");
+>>>    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 >>>};
 >>>var e_1, _a;
 >>>function foo() {
diff --git a/tests/baselines/reference/ES5For-of35.js b/tests/baselines/reference/ES5For-of35.js
index 1158ae5ede1..fb0ac5d2d2b 100644
--- a/tests/baselines/reference/ES5For-of35.js
+++ b/tests/baselines/reference/ES5For-of35.js
@@ -14,7 +14,7 @@ var __values = (this && this.__values) || function(o) {
             return { value: o && o[i++], done: !o };
         }
     };
-    throw new TypeError(s ? "Object not iterable." : "Symbol.iterator is not defined.");
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 };
 var e_1, _a;
 try {
diff --git a/tests/baselines/reference/ES5For-of35.sourcemap.txt b/tests/baselines/reference/ES5For-of35.sourcemap.txt
index 1cabb7af3b6..004c84a7ddf 100644
--- a/tests/baselines/reference/ES5For-of35.sourcemap.txt
+++ b/tests/baselines/reference/ES5For-of35.sourcemap.txt
@@ -17,7 +17,7 @@ sourceFile:ES5For-of35.ts
 >>>            return { value: o && o[i++], done: !o };
 >>>        }
 >>>    };
->>>    throw new TypeError(s ? "Object not iterable." : "Symbol.iterator is not defined.");
+>>>    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 >>>};
 >>>var e_1, _a;
 >>>try {
diff --git a/tests/baselines/reference/ES5For-of36.js b/tests/baselines/reference/ES5For-of36.js
index f08a178256d..da5d6b854e3 100644
--- a/tests/baselines/reference/ES5For-of36.js
+++ b/tests/baselines/reference/ES5For-of36.js
@@ -14,7 +14,7 @@ var __values = (this && this.__values) || function(o) {
             return { value: o && o[i++], done: !o };
         }
     };
-    throw new TypeError(s ? "Object not iterable." : "Symbol.iterator is not defined.");
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 };
 var __read = (this && this.__read) || function (o, n) {
     var m = typeof Symbol === "function" && o[Symbol.iterator];
diff --git a/tests/baselines/reference/ES5For-of36.sourcemap.txt b/tests/baselines/reference/ES5For-of36.sourcemap.txt
index b1977e55d81..21d86faad16 100644
--- a/tests/baselines/reference/ES5For-of36.sourcemap.txt
+++ b/tests/baselines/reference/ES5For-of36.sourcemap.txt
@@ -17,7 +17,7 @@ sourceFile:ES5For-of36.ts
 >>>            return { value: o && o[i++], done: !o };
 >>>        }
 >>>    };
->>>    throw new TypeError(s ? "Object not iterable." : "Symbol.iterator is not defined.");
+>>>    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 >>>};
 >>>var __read = (this && this.__read) || function (o, n) {
 >>>    var m = typeof Symbol === "function" && o[Symbol.iterator];
diff --git a/tests/baselines/reference/ES5For-of37.js b/tests/baselines/reference/ES5For-of37.js
index ada2710249f..7b4baf8f9a0 100644
--- a/tests/baselines/reference/ES5For-of37.js
+++ b/tests/baselines/reference/ES5For-of37.js
@@ -26,7 +26,7 @@ var __values = (this && this.__values) || function(o) {
             return { value: o && o[i++], done: !o };
         }
     };
-    throw new TypeError(s ? "Object not iterable." : "Symbol.iterator is not defined.");
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 };
 var e_1, _a, e_2, _b;
 try {
diff --git a/tests/baselines/reference/blockScopedBindingsInDownlevelGenerator.js b/tests/baselines/reference/blockScopedBindingsInDownlevelGenerator.js
index a0bc036f2a7..21b47adf6c7 100644
--- a/tests/baselines/reference/blockScopedBindingsInDownlevelGenerator.js
+++ b/tests/baselines/reference/blockScopedBindingsInDownlevelGenerator.js
@@ -43,7 +43,7 @@ var __values = (this && this.__values) || function(o) {
             return { value: o && o[i++], done: !o };
         }
     };
-    throw new TypeError(s ? "Object not iterable." : "Symbol.iterator is not defined.");
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 };
 function a() {
     var _loop_1, _a, _b, i, e_1_1;
diff --git a/tests/baselines/reference/emitter.asyncGenerators.classMethods.es5.js b/tests/baselines/reference/emitter.asyncGenerators.classMethods.es5.js
index 629cd3b0d9b..fa9c9f3a515 100644
--- a/tests/baselines/reference/emitter.asyncGenerators.classMethods.es5.js
+++ b/tests/baselines/reference/emitter.asyncGenerators.classMethods.es5.js
@@ -291,7 +291,7 @@ var __values = (this && this.__values) || function(o) {
             return { value: o && o[i++], done: !o };
         }
     };
-    throw new TypeError(s ? "Object not iterable." : "Symbol.iterator is not defined.");
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 };
 var C4 = /** @class */ (function () {
     function C4() {
@@ -373,7 +373,7 @@ var __values = (this && this.__values) || function(o) {
             return { value: o && o[i++], done: !o };
         }
     };
-    throw new TypeError(s ? "Object not iterable." : "Symbol.iterator is not defined.");
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 };
 var C5 = /** @class */ (function () {
     function C5() {
diff --git a/tests/baselines/reference/emitter.asyncGenerators.functionDeclarations.es5.js b/tests/baselines/reference/emitter.asyncGenerators.functionDeclarations.es5.js
index 622195d09df..ba9e6b4180e 100644
--- a/tests/baselines/reference/emitter.asyncGenerators.functionDeclarations.es5.js
+++ b/tests/baselines/reference/emitter.asyncGenerators.functionDeclarations.es5.js
@@ -245,7 +245,7 @@ var __values = (this && this.__values) || function(o) {
             return { value: o && o[i++], done: !o };
         }
     };
-    throw new TypeError(s ? "Object not iterable." : "Symbol.iterator is not defined.");
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 };
 function f4() {
     return __asyncGenerator(this, arguments, function f4_1() {
@@ -322,7 +322,7 @@ var __values = (this && this.__values) || function(o) {
             return { value: o && o[i++], done: !o };
         }
     };
-    throw new TypeError(s ? "Object not iterable." : "Symbol.iterator is not defined.");
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 };
 function f5() {
     return __asyncGenerator(this, arguments, function f5_1() {
diff --git a/tests/baselines/reference/emitter.asyncGenerators.functionExpressions.es5.js b/tests/baselines/reference/emitter.asyncGenerators.functionExpressions.es5.js
index 7d8b9ad649b..bd1280df237 100644
--- a/tests/baselines/reference/emitter.asyncGenerators.functionExpressions.es5.js
+++ b/tests/baselines/reference/emitter.asyncGenerators.functionExpressions.es5.js
@@ -245,7 +245,7 @@ var __values = (this && this.__values) || function(o) {
             return { value: o && o[i++], done: !o };
         }
     };
-    throw new TypeError(s ? "Object not iterable." : "Symbol.iterator is not defined.");
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 };
 var f4 = function () {
     return __asyncGenerator(this, arguments, function () {
@@ -322,7 +322,7 @@ var __values = (this && this.__values) || function(o) {
             return { value: o && o[i++], done: !o };
         }
     };
-    throw new TypeError(s ? "Object not iterable." : "Symbol.iterator is not defined.");
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 };
 var f5 = function () {
     return __asyncGenerator(this, arguments, function () {
diff --git a/tests/baselines/reference/emitter.asyncGenerators.objectLiteralMethods.es5.js b/tests/baselines/reference/emitter.asyncGenerators.objectLiteralMethods.es5.js
index 8677898f05d..138c729aa29 100644
--- a/tests/baselines/reference/emitter.asyncGenerators.objectLiteralMethods.es5.js
+++ b/tests/baselines/reference/emitter.asyncGenerators.objectLiteralMethods.es5.js
@@ -265,7 +265,7 @@ var __values = (this && this.__values) || function(o) {
             return { value: o && o[i++], done: !o };
         }
     };
-    throw new TypeError(s ? "Object not iterable." : "Symbol.iterator is not defined.");
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 };
 var o4 = {
     f: function () {
@@ -344,7 +344,7 @@ var __values = (this && this.__values) || function(o) {
             return { value: o && o[i++], done: !o };
         }
     };
-    throw new TypeError(s ? "Object not iterable." : "Symbol.iterator is not defined.");
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 };
 var o5 = {
     f: function () {
diff --git a/tests/baselines/reference/emptyVariableDeclarationBindingPatterns01_ES5iterable.js b/tests/baselines/reference/emptyVariableDeclarationBindingPatterns01_ES5iterable.js
index e1a2a828b5c..bace5a52d95 100644
--- a/tests/baselines/reference/emptyVariableDeclarationBindingPatterns01_ES5iterable.js
+++ b/tests/baselines/reference/emptyVariableDeclarationBindingPatterns01_ES5iterable.js
@@ -74,7 +74,7 @@ var __values = (this && this.__values) || function(o) {
             return { value: o && o[i++], done: !o };
         }
     };
-    throw new TypeError(s ? "Object not iterable." : "Symbol.iterator is not defined.");
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 };
 (function () {
     var a;

From f8b7a0577794f2e0755b67ac90a36046e605bade Mon Sep 17 00:00:00 2001
From: Orta Therox <orta.therox@gmail.com>
Date: Tue, 6 Aug 2019 14:09:37 -0400
Subject: [PATCH 115/151] Handle the variadic args for inline console.logs

---
 src/tsserver/server.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/tsserver/server.ts b/src/tsserver/server.ts
index e1a9e3bb71f..fcd176ef661 100644
--- a/src/tsserver/server.ts
+++ b/src/tsserver/server.ts
@@ -975,7 +975,7 @@ namespace ts.server {
     // the log. This is so that language service plugins which use
     // console.log don't break the message passing between tsserver
     // and the client
-    console.log = (msg) => logger.msg(msg, Msg.Info);
-    console.warn = (msg) => logger.msg(msg, Msg.Err);
-    console.error = (msg) => logger.msg(msg, Msg.Err);
+    console.log = (...args) => logger.msg(args.length === 1 ? args[0] : args.join(", "), Msg.Info);
+    console.warn = (...args) => logger.msg(args.length === 1 ? args[0] : args.join(", "), Msg.Err);
+    console.error = (...args) => logger.msg(args.length === 1 ? args[0] : args.join(", "), Msg.Err);
 }

From 269c3d3a567855158ec0bcd1600cd98faee00bfc Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com>
Date: Tue, 6 Aug 2019 11:15:06 -0700
Subject: [PATCH 116/151] Suggestions now use diagnosticCollection (#32740)

Previously they used multiMaps, unlike all the other diagnostics. This
prevents duplicate suggestions, like other kinds diagnostics.

Fixes #28710
---
 src/compiler/checker.ts                         |  7 +++----
 tests/cases/fourslash/suggestionNoDuplicates.ts | 14 ++++++++++++++
 2 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 tests/cases/fourslash/suggestionNoDuplicates.ts

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 7105e3605aa..ab0d9b385f4 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -585,7 +585,7 @@ namespace ts {
                     checkSourceFile(file);
                     Debug.assert(!!(getNodeLinks(file).flags & NodeCheckFlags.TypeChecked));
 
-                    diagnostics = addRange(diagnostics, suggestionDiagnostics.get(file.fileName));
+                    diagnostics = addRange(diagnostics, suggestionDiagnostics.getDiagnostics(file.fileName));
                     if (!file.isDeclarationFile && (!unusedIsError(UnusedKind.Local) || !unusedIsError(UnusedKind.Parameter))) {
                         addUnusedDiagnostics();
                     }
@@ -848,8 +848,7 @@ namespace ts {
         const awaitedTypeStack: number[] = [];
 
         const diagnostics = createDiagnosticCollection();
-        // Suggestion diagnostics must have a file. Keyed by source file name.
-        const suggestionDiagnostics = createMultiMap<DiagnosticWithLocation>();
+        const suggestionDiagnostics = createDiagnosticCollection();
 
         const typeofTypesByName: ReadonlyMap<Type> = createMapFromTemplate<Type>({
             string: stringType,
@@ -944,7 +943,7 @@ namespace ts {
                 diagnostics.add(diagnostic);
             }
             else {
-                suggestionDiagnostics.add(diagnostic.file.fileName, { ...diagnostic, category: DiagnosticCategory.Suggestion });
+                suggestionDiagnostics.add({ ...diagnostic, category: DiagnosticCategory.Suggestion });
             }
         }
         function errorOrSuggestion(isError: boolean, location: Node, message: DiagnosticMessage | DiagnosticMessageChain, arg0?: string | number, arg1?: string | number, arg2?: string | number, arg3?: string | number): void {
diff --git a/tests/cases/fourslash/suggestionNoDuplicates.ts b/tests/cases/fourslash/suggestionNoDuplicates.ts
new file mode 100644
index 00000000000..fa5eadf1e0b
--- /dev/null
+++ b/tests/cases/fourslash/suggestionNoDuplicates.ts
@@ -0,0 +1,14 @@
+// @strict: false
+/// <reference path="fourslash.ts" />
+// @Filename: foo.ts
+//// import { f } from [|'m'|]
+//// f
+
+// @Filename: node_modules/m/index.js
+//// module.exports.f = function (x) { return x }
+
+verify.getSemanticDiagnostics([])
+verify.getSuggestionDiagnostics([{
+    code: 7016,
+    message: "Could not find a declaration file for module 'm'. '/tests/cases/fourslash/node_modules/m/index.js' implicitly has an 'any' type.",
+}])

From 47e77c976b6d94a7b5fca4ba05a7f4de6ee26506 Mon Sep 17 00:00:00 2001
From: Michael Crane <micran@microsoft.com>
Date: Tue, 6 Aug 2019 11:48:31 -0700
Subject: [PATCH 117/151] Remove unnecessary 'commandSucceeded' variable

---
 src/server/session.ts | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/server/session.ts b/src/server/session.ts
index 8be592a81b9..4ae5282a743 100644
--- a/src/server/session.ts
+++ b/src/server/session.ts
@@ -2508,7 +2508,6 @@ namespace ts.server {
 
             let request: protocol.Request | undefined;
             let relevantFile: protocol.FileRequestArgs | undefined;
-            let commandSucceeded = false;
             try {
                 request = <protocol.Request>JSON.parse(message);
                 relevantFile = request.arguments && (request as protocol.FileRequest).arguments.file ? (request as protocol.FileRequest).arguments : undefined;
@@ -2527,8 +2526,6 @@ namespace ts.server {
                 }
 
                 // Note: Log before writing the response, else the editor can complete its activity before the server does
-                // Set 'commandSucceded' flag to ensure logStopCommand doesn't get called twice (e.g. if doOutput throws)
-                commandSucceeded = true;
                 perfLogger.logStopCommand("" + request.command, "Success");
                 if (response) {
                     this.doOutput(response, request.command, request.seq, /*success*/ true);
@@ -2540,13 +2537,13 @@ namespace ts.server {
             catch (err) {
                 if (err instanceof OperationCanceledException) {
                     // Handle cancellation exceptions
-                    if (!commandSucceeded) perfLogger.logStopCommand("" + (request && request.command), "Canceled: " + err);
+                    perfLogger.logStopCommand("" + (request && request.command), "Canceled: " + err);
                     this.doOutput({ canceled: true }, request!.command, request!.seq, /*success*/ true);
                     return;
                 }
 
                 this.logErrorWorker(err, message, relevantFile);
-                if (!commandSucceeded) perfLogger.logStopCommand("" + (request && request.command), "Error: " + err);
+                perfLogger.logStopCommand("" + (request && request.command), "Error: " + err);
 
                 this.doOutput(
                     /*info*/ undefined,

From 77cdca2971faedc0030f8860c812833549de2a48 Mon Sep 17 00:00:00 2001
From: Orta Therox <orta.therox@gmail.com>
Date: Tue, 6 Aug 2019 15:45:28 -0400
Subject: [PATCH 118/151] Adds another test around parsing jsdoc

---
 .../fourslash/jsDocDontBreakWithNamespaces.ts      | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/tests/cases/fourslash/jsDocDontBreakWithNamespaces.ts b/tests/cases/fourslash/jsDocDontBreakWithNamespaces.ts
index 5be2f3e7b62..12899d23df3 100644
--- a/tests/cases/fourslash/jsDocDontBreakWithNamespaces.ts
+++ b/tests/cases/fourslash/jsDocDontBreakWithNamespaces.ts
@@ -12,6 +12,10 @@
 //// */
 ////function bar() { }
 ////bar(''/*bar*/);
+////
+/////** @type {function(module:xxxx, module:xxxx): module:xxxxx} */
+////function zee() { }
+////zee(''/*zee*/);
 
 
 verify.signatureHelp({
@@ -29,3 +33,13 @@ verify.signatureHelp({
   docComment: "",
   tags: [],
 });
+
+
+verify.signatureHelp({
+  marker: "zee",
+  text: "zee(): any",
+  docComment: "",
+  tags: [
+    { name: "type", text: "{function(module:xxxx, module:xxxx): module:xxxxx}" },
+  ],
+});

From c0f187a4e81bf3c29d29a733a5483b0deceb2263 Mon Sep 17 00:00:00 2001
From: Ben Lichtman <belichtm@microsoft.com>
Date: Tue, 6 Aug 2019 13:39:18 -0700
Subject: [PATCH 119/151] Allow compile on save with decorator emit

---
 src/server/session.ts                              | 8 ++++++--
 src/testRunner/unittests/tsserver/compileOnSave.ts | 9 +++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/server/session.ts b/src/server/session.ts
index 66f21e88a76..2db58d67460 100644
--- a/src/server/session.ts
+++ b/src/server/session.ts
@@ -1599,6 +1599,10 @@ namespace ts.server {
                 return emptyArray;
             }
 
+            function dtsChangeCanAffectEmit(compilationSettings: CompilerOptions) {
+                return getEmitDeclarations(compilationSettings) || !!compilationSettings.emitDecoratorMetadata;
+            }
+
             return combineProjectOutput(
                 info,
                 path => this.projectService.getScriptInfoForPath(path)!,
@@ -1610,8 +1614,8 @@ namespace ts.server {
 
                     const compilationSettings = project.getCompilationSettings();
 
-                    if (!!compilationSettings.noEmit || fileExtensionIs(info.fileName, Extension.Dts) && !getEmitDeclarations(compilationSettings)) {
-                        // avoid triggering emit when a change is made in a .d.ts when declaration emit is disabled
+                    if (!!compilationSettings.noEmit || fileExtensionIs(info.fileName, Extension.Dts) && !dtsChangeCanAffectEmit(compilationSettings)) {
+                        // avoid triggering emit when a change is made in a .d.ts when declaration emit and decorator metadata emit are disabled
                         return undefined;
                     }
 
diff --git a/src/testRunner/unittests/tsserver/compileOnSave.ts b/src/testRunner/unittests/tsserver/compileOnSave.ts
index 2773edb7d8d..b129c8ecdfc 100644
--- a/src/testRunner/unittests/tsserver/compileOnSave.ts
+++ b/src/testRunner/unittests/tsserver/compileOnSave.ts
@@ -598,6 +598,15 @@ namespace ts.projectSystem {
                 /*expectDTSEmit*/ true
                 );
             });
+
+            it("should return results if change is made in a global declaration file with decorator emit enabled", () => {
+                testDTS(
+                /*dtsFileContents*/ "declare const x: string;",
+                /*tsFileContents*/ "var y = 1;",
+                /*opts*/ { experimentalDecorators: true, emitDecoratorMetadata: true },
+                /*expectDTSEmit*/ true
+                );
+            });
         });
 
         describe("tsserverProjectSystem emit with outFile or out setting", () => {

From 024193fd431088960ee4553e2e6b54b24a725e30 Mon Sep 17 00:00:00 2001
From: TypeScript Bot <ts_bot@rcavanaugh.com>
Date: Tue, 6 Aug 2019 13:42:07 -0700
Subject: [PATCH 120/151] Update user baselines (#32732)

---
 .../baselines/reference/docker/azure-sdk.log  |   27 +-
 tests/baselines/reference/user/acorn.log      |    1 -
 .../user/chrome-devtools-frontend.log         | 2346 ++++-------------
 tests/baselines/reference/user/zone.js.log    |    7 -
 4 files changed, 468 insertions(+), 1913 deletions(-)
 delete mode 100644 tests/baselines/reference/user/zone.js.log

diff --git a/tests/baselines/reference/docker/azure-sdk.log b/tests/baselines/reference/docker/azure-sdk.log
index da2597a1b6d..2a870effa9b 100644
--- a/tests/baselines/reference/docker/azure-sdk.log
+++ b/tests/baselines/reference/docker/azure-sdk.log
@@ -5,15 +5,6 @@ Rush Multi-Project Build Tool 5.X.X - https://rushjs.io
 Node.js version is 12.7.0 (pre-LTS)
 Starting "rush rebuild"
 Executing a maximum of ?simultaneous processes...
-XX of XX: [@azure/abort-controller] completed successfully in ? seconds
-XX of XX: [@azure/core-asynciterator-polyfill] completed successfully in ? seconds
-XX of XX: [@azure/core-auth] completed successfully in ? seconds
-XX of XX: [@azure/core-paging] completed successfully in ? seconds
-XX of XX: [@azure/cosmos] completed successfully in ? seconds
-Warning: You have changed the public API signature for this project. Updating review/service-bus.api.md
-XX of XX: [@azure/storage-blob] completed successfully in ? seconds
-XX of XX: [@azure/storage-file] completed successfully in ? seconds
-XX of XX: [@azure/storage-queue] completed successfully in ? seconds
 npm ERR! code ELIFECYCLE
 npm ERR! errno 2
 npm ERR! @azure/core-http@X.X.X-preview.2 build:tsc: `tsc -p tsconfig.es.json`
@@ -34,14 +25,25 @@ npm ERR! This is probably not a problem with npm. There is likely additional log
 npm ERR! A complete log of this run can be found in:
 npm ERR!     /root/.npm/_logs/XXXX-XX-XXXXXXXXX-debug.log
 ERROR: "build:lib" exited with 1.
+XX of XX: [@azure/core-tracing] completed successfully in ? seconds
 XX of XX: [@azure/event-processor-host] completed successfully in ? seconds
+XX of XX: [@azure/abort-controller] completed successfully in ? seconds
+XX of XX: [@azure/core-asynciterator-polyfill] completed successfully in ? seconds
+XX of XX: [@azure/core-auth] completed successfully in ? seconds
+XX of XX: [@azure/core-paging] completed successfully in ? seconds
+XX of XX: [@azure/cosmos] completed successfully in ? seconds
+Warning: You have changed the public API signature for this project. Updating review/service-bus.api.md
+XX of XX: [@azure/storage-blob] completed successfully in ? seconds
+XX of XX: [@azure/storage-file] completed successfully in ? seconds
+XX of XX: [@azure/storage-queue] completed successfully in ? seconds
 XX of XX: [testhub] completed successfully in ? seconds
-SUCCESS (10)
+SUCCESS (11)
 ================================
 @azure/abort-controller (? seconds)
 @azure/core-asynciterator-polyfill (? seconds)
 @azure/core-auth (? seconds)
 @azure/core-paging (? seconds)
+@azure/core-tracing (? seconds)
 @azure/cosmos (? seconds)
 @azure/event-processor-host (? seconds)
 @azure/storage-blob (? seconds)
@@ -67,7 +69,7 @@ BLOCKED (8)
 ================================
 FAILURE (1)
 ================================
-@azure/core-http (? seconds)
+@azure/core-http ( ? seconds)
 npm ERR! code ELIFECYCLE
 npm ERR! errno 2
 npm ERR! @azure/core-http@X.X.X-preview.2 build:tsc: `tsc -p tsconfig.es.json`
@@ -95,7 +97,7 @@ rush rebuild - Errors! ( ? seconds)
 
 
 Standard error:
-XX of XX: [@azure/service-bus] completed with warnings in ? seconds
+
 XX of XX: [@azure/core-http] failed to build!
 XX of XX: [@azure/core-arm] blocked by [@azure/core-http]!
 XX of XX: [@azure/keyvault-certificates] blocked by [@azure/core-http]!
@@ -105,4 +107,5 @@ XX of XX: [@azure/identity] blocked by [@azure/core-http]!
 XX of XX: [@azure/core-amqp] blocked by [@azure/core-http]!
 XX of XX: [@azure/event-hubs] blocked by [@azure/core-http]!
 XX of XX: [@azure/template] blocked by [@azure/core-http]!
+XX of XX: [@azure/service-bus] completed with warnings in ? seconds
 [@azure/core-http] Returned error code: 1
diff --git a/tests/baselines/reference/user/acorn.log b/tests/baselines/reference/user/acorn.log
index 042e1bd7680..8fcab4831f5 100644
--- a/tests/baselines/reference/user/acorn.log
+++ b/tests/baselines/reference/user/acorn.log
@@ -114,7 +114,6 @@ node_modules/acorn/dist/acorn.js(3032,40): error TS2339: Property 'inGeneratorCo
 node_modules/acorn/dist/acorn.js(3035,8): error TS2339: Property 'exprAllowed' does not exist on type 'TokenType'.
 node_modules/acorn/dist/acorn.js(5297,5): error TS2339: Property 'nextToken' does not exist on type 'Parser'.
 node_modules/acorn/dist/acorn.js(5298,12): error TS2339: Property 'parseExpression' does not exist on type 'Parser'.
-node_modules/acorn/dist/acorn_loose.es.js(1,56): error TS2440: Import declaration conflicts with local declaration of 'defaultOptions'.
 node_modules/acorn/dist/acorn_loose.es.js(73,9): error TS2339: Property 'name' does not exist on type 'Node'.
 node_modules/acorn/dist/acorn_loose.es.js(79,9): error TS2339: Property 'value' does not exist on type 'Node'.
 node_modules/acorn/dist/acorn_loose.es.js(79,23): error TS2339: Property 'raw' does not exist on type 'Node'.
diff --git a/tests/baselines/reference/user/chrome-devtools-frontend.log b/tests/baselines/reference/user/chrome-devtools-frontend.log
index 10542cec675..ad165020fc0 100644
--- a/tests/baselines/reference/user/chrome-devtools-frontend.log
+++ b/tests/baselines/reference/user/chrome-devtools-frontend.log
@@ -1,18 +1,6 @@
 Exit Code: 1
 Standard output:
-../../../../built/local/lib.dom.d.ts(2700,11): error TS2300: Duplicate identifier 'CSSRule'.
-../../../../built/local/lib.dom.d.ts(2719,13): error TS2300: Duplicate identifier 'CSSRule'.
-../../../../built/local/lib.dom.d.ts(3630,11): error TS2300: Duplicate identifier 'Comment'.
-../../../../built/local/lib.dom.d.ts(3633,13): error TS2300: Duplicate identifier 'Comment'.
-../../../../built/local/lib.dom.d.ts(5348,11): error TS2300: Duplicate identifier 'Event'.
-../../../../built/local/lib.dom.d.ts(5416,13): error TS2300: Duplicate identifier 'Event'.
-../../../../built/local/lib.dom.d.ts(11945,11): error TS2300: Duplicate identifier 'Position'.
-../../../../built/local/lib.dom.d.ts(12712,11): error TS2300: Duplicate identifier 'Request'.
-../../../../built/local/lib.dom.d.ts(12776,13): error TS2300: Duplicate identifier 'Request'.
-../../../../built/local/lib.dom.d.ts(18500,11): error TS2300: Duplicate identifier 'Window'.
-../../../../built/local/lib.dom.d.ts(18629,13): error TS2300: Duplicate identifier 'Window'.
 ../../../../built/local/lib.es5.d.ts(1416,11): error TS2300: Duplicate identifier 'ArrayLike'.
-../../../../built/local/lib.es5.d.ts(1452,6): error TS2300: Duplicate identifier 'Record'.
 ../../../../node_modules/@types/node/globals.d.ts(234,13): error TS2403: Subsequent variable declarations must have the same type.  Variable 'module' must be of type '{}', but here has type 'NodeModule'.
 node_modules/chrome-devtools-frontend/front_end/Runtime.js(43,8): error TS2339: Property '_importScriptPathPrefix' does not exist on type 'Window & typeof globalThis'.
 node_modules/chrome-devtools-frontend/front_end/Runtime.js(77,16): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
@@ -105,7 +93,6 @@ node_modules/chrome-devtools-frontend/front_end/Tests.js(1229,10): error TS2339:
 node_modules/chrome-devtools-frontend/front_end/Tests.js(1229,41): error TS2339: Property 'domAutomationController' does not exist on type 'Window & typeof globalThis'.
 node_modules/chrome-devtools-frontend/front_end/accessibility/ARIAAttributesView.js(9,11): error TS2554: Expected 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/accessibility/ARIAAttributesView.js(11,46): error TS2554: Expected 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/accessibility/ARIAAttributesView.js(45,27): error TS2694: Namespace 'SDK.DOMNode' has no exported member 'Attribute'.
 node_modules/chrome-devtools-frontend/front_end/accessibility/ARIAAttributesView.js(64,18): error TS2339: Property 'setTextContentTruncatedIfNeeded' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/accessibility/ARIAAttributesView.js(77,26): error TS2339: Property 'removeChildren' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/accessibility/ARIAAttributesView.js(79,26): error TS2339: Property 'createChild' does not exist on type 'Element'.
@@ -118,8 +105,10 @@ node_modules/chrome-devtools-frontend/front_end/accessibility/ARIAAttributesView
 node_modules/chrome-devtools-frontend/front_end/accessibility/ARIAAttributesView.js(180,15): error TS2339: Property 'keyCode' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/accessibility/ARIAAttributesView.js(180,70): error TS2339: Property 'keyIdentifier' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/accessibility/ARIAAttributesView.js(182,13): error TS2339: Property 'consume' does not exist on type 'Event'.
-node_modules/chrome-devtools-frontend/front_end/accessibility/ARIAAttributesView.js(209,39): error TS2694: Namespace 'UI.SuggestBox' has no exported member 'Suggestions'.
 node_modules/chrome-devtools-frontend/front_end/accessibility/ARIAAttributesView.js(213,36): error TS2339: Property '_isEditingName' does not exist on type 'ARIAAttributePrompt'.
+node_modules/chrome-devtools-frontend/front_end/accessibility/ARIAAttributesView.js(215,5): error TS2322: Type 'Promise<{ text: string; }[]>' is not assignable to type 'Promise<{ text: string; subtitle: string; iconType: string; priority: number; isSecondary: boolean; title: string; }[]>'.
+  Type '{ text: string; }[]' is not assignable to type '{ text: string; subtitle: string; iconType: string; priority: number; isSecondary: boolean; title: string; }[]'.
+    Type '{ text: string; }' is missing the following properties from type '{ text: string; subtitle: string; iconType: string; priority: number; isSecondary: boolean; title: string; }': subtitle, iconType, priority, isSecondary, title
 node_modules/chrome-devtools-frontend/front_end/accessibility/ARIAMetadata.js(56,35): error TS2339: Property '_instance' does not exist on type 'typeof ARIAMetadata'.
 node_modules/chrome-devtools-frontend/front_end/accessibility/ARIAMetadata.js(57,32): error TS2339: Property '_instance' does not exist on type 'typeof ARIAMetadata'.
 node_modules/chrome-devtools-frontend/front_end/accessibility/ARIAMetadata.js(58,37): error TS2339: Property '_instance' does not exist on type 'typeof ARIAMetadata'.
@@ -229,8 +218,6 @@ node_modules/chrome-devtools-frontend/front_end/accessibility/AccessibilityNodeV
 node_modules/chrome-devtools-frontend/front_end/accessibility/AccessibilityNodeView.js(522,20): error TS2339: Property 'createTextChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/accessibility/AccessibilityNodeView.js(535,24): error TS2694: Namespace 'Protocol' has no exported member 'Accessibility'.
 node_modules/chrome-devtools-frontend/front_end/accessibility/AccessibilityNodeView.js(619,26): error TS2339: Property 'removeChildren' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/accessibility/AccessibilitySidebarView.js(129,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/accessibility/AccessibilitySidebarView.js(141,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/accessibility/AccessibilitySidebarView.js(195,29): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/animation/AnimationGroupPreviewUI.js(7,11): error TS2339: Property 'AnimationGroupPreviewUI' does not exist on type '{ new (effect?: AnimationEffect, timeline?: AnimationTimeline): Animation; prototype: Animation; }'.
 node_modules/chrome-devtools-frontend/front_end/animation/AnimationGroupPreviewUI.js(14,18): error TS2339: Property 'createChild' does not exist on type 'Element'.
@@ -279,12 +266,9 @@ node_modules/chrome-devtools-frontend/front_end/animation/AnimationModel.js(691,
 node_modules/chrome-devtools-frontend/front_end/animation/AnimationModel.js(708,11): error TS2339: Property 'AnimationDispatcher' does not exist on type '{ new (effect?: AnimationEffect, timeline?: AnimationTimeline): Animation; prototype: Animation; }'.
 node_modules/chrome-devtools-frontend/front_end/animation/AnimationModel.js(731,24): error TS2694: Namespace 'Protocol' has no exported member 'Animation'.
 node_modules/chrome-devtools-frontend/front_end/animation/AnimationModel.js(741,11): error TS2339: Property 'AnimationModel' does not exist on type '{ new (effect?: AnimationEffect, timeline?: AnimationTimeline): Animation; prototype: Animation; }'.
-node_modules/chrome-devtools-frontend/front_end/animation/AnimationModel.js(747,67): error TS2694: Namespace 'Animation.AnimationModel.ScreenshotCapture' has no exported member 'Request'.
 node_modules/chrome-devtools-frontend/front_end/animation/AnimationModel.js(751,53): error TS2339: Property 'AnimationModel' does not exist on type '{ new (effect?: AnimationEffect, timeline?: AnimationTimeline): Animation; prototype: Animation; }'.
 node_modules/chrome-devtools-frontend/front_end/animation/AnimationModel.js(778,24): error TS2694: Namespace 'Protocol' has no exported member 'Page'.
-node_modules/chrome-devtools-frontend/front_end/animation/AnimationModel.js(782,60): error TS2694: Namespace 'Animation.AnimationModel.ScreenshotCapture' has no exported member 'Request'.
 node_modules/chrome-devtools-frontend/front_end/animation/AnimationModel.js(811,11): error TS2339: Property 'AnimationModel' does not exist on type '{ new (effect?: AnimationEffect, timeline?: AnimationTimeline): Animation; prototype: Animation; }'.
-node_modules/chrome-devtools-frontend/front_end/animation/AnimationModel.js(811,44): error TS2300: Duplicate identifier 'Request'.
 node_modules/chrome-devtools-frontend/front_end/animation/AnimationScreenshotPopover.js(7,11): error TS2339: Property 'AnimationScreenshotPopover' does not exist on type '{ new (effect?: AnimationEffect, timeline?: AnimationTimeline): Animation; prototype: Animation; }'.
 node_modules/chrome-devtools-frontend/front_end/animation/AnimationScreenshotPopover.js(9,23): error TS2749: 'Image' refers to a value, but is being used as a type here.
 node_modules/chrome-devtools-frontend/front_end/animation/AnimationScreenshotPopover.js(18,39): error TS2345: Argument of type 'new (width?: number, height?: number) => HTMLImageElement' is not assignable to parameter of type 'Node'.
@@ -333,8 +317,8 @@ node_modules/chrome-devtools-frontend/front_end/animation/AnimationTimeline.js(1
 node_modules/chrome-devtools-frontend/front_end/animation/AnimationTimeline.js(139,41): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/animation/AnimationTimeline.js(144,48): error TS2554: Expected 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/animation/AnimationTimeline.js(145,36): error TS2339: Property 'AnimationTimeline' does not exist on type '{ new (effect?: AnimationEffect, timeline?: AnimationTimeline): Animation; prototype: Animation; }'.
-node_modules/chrome-devtools-frontend/front_end/animation/AnimationTimeline.js(165,19): error TS2694: Namespace 'UI' has no exported member 'PopoverRequest'.
 node_modules/chrome-devtools-frontend/front_end/animation/AnimationTimeline.js(169,18): error TS2339: Property 'isDescendant' does not exist on type 'EventTarget'.
+node_modules/chrome-devtools-frontend/front_end/animation/AnimationTimeline.js(172,5): error TS2741: Property 'hide' is missing in type '{ box: any; show: (popover: GlassPane) => Promise<any>; }' but required in type '{ box: AnchorBox; show: (arg0: GlassPane) => Promise<boolean>; hide: () => any; }'.
 node_modules/chrome-devtools-frontend/front_end/animation/AnimationTimeline.js(173,25): error TS2339: Property 'boxInWindow' does not exist on type 'EventTarget'.
 node_modules/chrome-devtools-frontend/front_end/animation/AnimationTimeline.js(176,44): error TS2339: Property 'keysArray' does not exist on type 'Map<AnimationGroup, AnimationGroupPreviewUI>'.
 node_modules/chrome-devtools-frontend/front_end/animation/AnimationTimeline.js(177,63): error TS2339: Property 'parentElement' does not exist on type 'EventTarget'.
@@ -343,7 +327,6 @@ node_modules/chrome-devtools-frontend/front_end/animation/AnimationTimeline.js(1
 node_modules/chrome-devtools-frontend/front_end/animation/AnimationTimeline.js(208,50): error TS2554: Expected 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/animation/AnimationTimeline.js(208,67): error TS2554: Expected 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/animation/AnimationTimeline.js(216,67): error TS2339: Property 'AnimationModel' does not exist on type '{ new (effect?: AnimationEffect, timeline?: AnimationTimeline): Animation; prototype: Animation; }'.
-node_modules/chrome-devtools-frontend/front_end/animation/AnimationTimeline.js(218,34): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; TimelineStarted: number; ProfilesCPUProfileTaken: number; ProfilesHeapProfileTaken: number; AuditsStarted: number; ... 23 more ...; ShowedThirdPartyBadges: number; }'.
 node_modules/chrome-devtools-frontend/front_end/animation/AnimationTimeline.js(233,42): error TS2339: Property 'AnimationTimeline' does not exist on type '{ new (effect?: AnimationEffect, timeline?: AnimationTimeline): Animation; prototype: Animation; }'.
 node_modules/chrome-devtools-frontend/front_end/animation/AnimationTimeline.js(235,47): error TS2339: Property 'AnimationTimeline' does not exist on type '{ new (effect?: AnimationEffect, timeline?: AnimationTimeline): Animation; prototype: Animation; }'.
 node_modules/chrome-devtools-frontend/front_end/animation/AnimationTimeline.js(244,38): error TS2339: Property 'AnimationTimeline' does not exist on type '{ new (effect?: AnimationEffect, timeline?: AnimationTimeline): Animation; prototype: Animation; }'.
@@ -352,7 +335,6 @@ node_modules/chrome-devtools-frontend/front_end/animation/AnimationTimeline.js(2
 node_modules/chrome-devtools-frontend/front_end/animation/AnimationTimeline.js(251,36): error TS2554: Expected 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/animation/AnimationTimeline.js(254,38): error TS2339: Property 'AnimationTimeline' does not exist on type '{ new (effect?: AnimationEffect, timeline?: AnimationTimeline): Animation; prototype: Animation; }'.
 node_modules/chrome-devtools-frontend/front_end/animation/AnimationTimeline.js(256,36): error TS2554: Expected 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/animation/AnimationTimeline.js(334,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/animation/AnimationTimeline.js(359,28): error TS2345: Argument of type '(left: AnimationGroup, right: AnimationGroup) => boolean' is not assignable to parameter of type '(a: any, b: any) => number'.
   Type 'boolean' is not assignable to type 'number'.
 node_modules/chrome-devtools-frontend/front_end/animation/AnimationTimeline.js(373,33): error TS2339: Property 'AnimationGroupPreviewUI' does not exist on type '{ new (effect?: AnimationEffect, timeline?: AnimationTimeline): Animation; prototype: Animation; }'.
@@ -360,7 +342,6 @@ node_modules/chrome-devtools-frontend/front_end/animation/AnimationTimeline.js(3
 node_modules/chrome-devtools-frontend/front_end/animation/AnimationTimeline.js(390,11): error TS2339: Property 'consume' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/animation/AnimationTimeline.js(445,30): error TS2339: Property 'AnimationTimeline' does not exist on type '{ new (effect?: AnimationEffect, timeline?: AnimationTimeline): Animation; prototype: Animation; }'.
 node_modules/chrome-devtools-frontend/front_end/animation/AnimationTimeline.js(450,37): error TS2339: Property 'AnimationUI' does not exist on type '{ new (effect?: AnimationEffect, timeline?: AnimationTimeline): Animation; prototype: Animation; }'.
-node_modules/chrome-devtools-frontend/front_end/animation/AnimationTimeline.js(457,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/animation/AnimationTimeline.js(484,36): error TS2339: Property 'millisToString' does not exist on type 'NumberConstructor'.
 node_modules/chrome-devtools-frontend/front_end/animation/AnimationTimeline.js(571,18): error TS2339: Property 'window' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/animation/AnimationTimeline.js(587,44): error TS2339: Property 'millisToString' does not exist on type 'NumberConstructor'.
@@ -414,7 +395,6 @@ node_modules/chrome-devtools-frontend/front_end/animation/AnimationUI.js(197,13)
 node_modules/chrome-devtools-frontend/front_end/animation/AnimationUI.js(206,55): error TS2339: Property 'AnimationUI' does not exist on type '{ new (effect?: AnimationEffect, timeline?: AnimationTimeline): Animation; prototype: Animation; }'.
 node_modules/chrome-devtools-frontend/front_end/animation/AnimationUI.js(208,63): error TS2339: Property 'AnimationUI' does not exist on type '{ new (effect?: AnimationEffect, timeline?: AnimationTimeline): Animation; prototype: Animation; }'.
 node_modules/chrome-devtools-frontend/front_end/animation/AnimationUI.js(213,68): error TS2339: Property 'AnimationUI' does not exist on type '{ new (effect?: AnimationEffect, timeline?: AnimationTimeline): Animation; prototype: Animation; }'.
-node_modules/chrome-devtools-frontend/front_end/animation/AnimationUI.js(218,9): error TS2367: This condition will always return 'false' since the types '{ CSSTransition: string; CSSAnimation: string; WebAnimation: string; }' and '"CSSTransition"' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/animation/AnimationUI.js(240,52): error TS2339: Property 'AnimationUI' does not exist on type '{ new (effect?: AnimationEffect, timeline?: AnimationTimeline): Animation; prototype: Animation; }'.
 node_modules/chrome-devtools-frontend/front_end/animation/AnimationUI.js(242,61): error TS2339: Property 'AnimationUI' does not exist on type '{ new (effect?: AnimationEffect, timeline?: AnimationTimeline): Animation; prototype: Animation; }'.
 node_modules/chrome-devtools-frontend/front_end/animation/AnimationUI.js(245,70): error TS2339: Property 'AnimationUI' does not exist on type '{ new (effect?: AnimationEffect, timeline?: AnimationTimeline): Animation; prototype: Animation; }'.
@@ -446,7 +426,7 @@ node_modules/chrome-devtools-frontend/front_end/application_test_runner/CacheSto
 node_modules/chrome-devtools-frontend/front_end/application_test_runner/CacheStorageTestRunner.js(19,13): error TS2339: Property 'resources' does not exist on type 'any[]'.
 node_modules/chrome-devtools-frontend/front_end/application_test_runner/CacheStorageTestRunner.js(21,37): error TS2339: Property 'resources' does not exist on type 'any[]'.
 node_modules/chrome-devtools-frontend/front_end/application_test_runner/CacheStorageTestRunner.js(32,5): error TS2552: Cannot find name 'promise'. Did you mean 'Promise'?
-node_modules/chrome-devtools-frontend/front_end/application_test_runner/CacheStorageTestRunner.js(40,11): error TS2552: Cannot find name 'promise'. Did you mean 'Promise'?
+node_modules/chrome-devtools-frontend/front_end/application_test_runner/CacheStorageTestRunner.js(40,11): error TS2304: Cannot find name 'promise'.
 node_modules/chrome-devtools-frontend/front_end/application_test_runner/CacheStorageTestRunner.js(61,13): error TS2339: Property 'resources' does not exist on type 'any[]'.
 node_modules/chrome-devtools-frontend/front_end/application_test_runner/CacheStorageTestRunner.js(68,37): error TS2339: Property 'resources' does not exist on type 'any[]'.
 node_modules/chrome-devtools-frontend/front_end/application_test_runner/CacheStorageTestRunner.js(70,13): error TS2339: Property 'resources' does not exist on type 'any[]'.
@@ -487,11 +467,8 @@ node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(210,51):
 node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(229,36): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(230,23): error TS2339: Property 'autofocus' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(233,53): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(236,34): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ SetExactSize: symbol; SetExactWidthMaxHeight: symbol; MeasureContent: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(252,7): error TS2322: Type 'Promise<void>' is not assignable to type 'Promise<undefined>'.
 node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(256,5): error TS2322: Type 'Promise<void>' is not assignable to type 'Promise<undefined>'.
-node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(285,32): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ None: string; Responsive: string; Device: string; }'.
-node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(294,34): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; TimelineStarted: number; ProfilesCPUProfileTaken: number; ProfilesHeapProfileTaken: number; AuditsStarted: number; ... 23 more ...; ShowedThirdPartyBadges: number; }'.
 node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(302,37): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(342,33): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(356,23): error TS2339: Property 'disabled' does not exist on type 'Element'.
@@ -500,7 +477,6 @@ node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(363,24):
 node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(363,55): error TS2554: Expected 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(365,53): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(379,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
-node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(390,34): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; TimelineStarted: number; ProfilesCPUProfileTaken: number; ProfilesHeapProfileTaken: number; AuditsStarted: number; ... 23 more ...; ShowedThirdPartyBadges: number; }'.
 node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(399,15): error TS2503: Cannot find namespace 'ReportRenderer'.
 node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(403,33): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(439,37): error TS2503: Cannot find namespace 'ReportRenderer'.
@@ -508,12 +484,7 @@ node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(463,38):
 node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(468,30): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(500,37): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(507,37): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(509,72): error TS2339: Property 'order' does not exist on type 'any[]'.
-node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(509,90): error TS2339: Property 'order' does not exist on type 'any[]'.
 node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(511,39): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(511,58): error TS2339: Property 'message' does not exist on type 'any[]'.
-node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(514,49): error TS2339: Property 'progressBarClass' does not exist on type 'any[]'.
-node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(523,5): error TS2740: Type '{ progressBarClass: string; message: string; statusMessagePrefix: string; order: number; }' is missing the following properties from type 'any[]': length, pop, push, concat, and 28 more.
 node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(553,32): error TS2345: Argument of type 'TemplateStringsArray' is not assignable to parameter of type 'string | string[]'.
   Type 'TemplateStringsArray' is not assignable to type 'string[]'.
 node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(594,45): error TS2555: Expected at least 2 arguments, but got 1.
@@ -522,8 +493,6 @@ node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(625,40):
 node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(679,53): error TS2304: Cannot find name 'ReportRenderer'.
 node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(690,15): error TS2503: Cannot find namespace 'ReportRenderer'.
 node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(701,15): error TS2503: Cannot find namespace 'ReportRenderer'.
-node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(718,22): error TS2551: Property 'Preset' does not exist on type 'typeof Audits2Panel'. Did you mean 'Presets'?
-node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(720,42): error TS2694: Namespace 'Audits2.Audits2Panel' has no exported member 'Preset'.
 node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(764,17): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(772,5): error TS2322: Type 'Promise<void>' is not assignable to type 'Promise<undefined>'.
 node_modules/chrome-devtools-frontend/front_end/audits2/Audits2Panel.js(780,25): error TS2503: Cannot find namespace 'ReportRenderer'.
@@ -552,7 +521,6 @@ node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/cate
 node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/category-renderer.js(112,15): error TS2503: Cannot find namespace 'ReportRenderer'.
 node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/category-renderer.js(119,50): error TS2304: Cannot find name 'Util'.
 node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/category-renderer.js(143,15): error TS2503: Cannot find namespace 'ReportRenderer'.
-node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/category-renderer.js(148,55): error TS2694: Namespace 'CategoryRenderer' has no exported member 'PerfHintExtendedInfo'.
 node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/category-renderer.js(154,24): error TS2304: Cannot find name 'Util'.
 node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/category-renderer.js(179,29): error TS2304: Cannot find name 'Util'.
 node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/category-renderer.js(183,31): error TS2304: Cannot find name 'Util'.
@@ -579,64 +547,35 @@ node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/cate
 node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/category-renderer.js(483,32): error TS2503: Cannot find namespace 'ReportRenderer'.
 node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/category-renderer.js(507,24): error TS2339: Property 'open' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/category-renderer.js(554,8): error TS2339: Property 'CategoryRenderer' does not exist on type 'Window & typeof globalThis'.
-node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/category-renderer.js(566,18): error TS2339: Property 'PerfHintExtendedInfo' does not exist on type 'typeof CategoryRenderer'.
-node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/crc-details-renderer.js(43,45): error TS2694: Namespace 'CriticalRequestChainRenderer' has no exported member 'CRCSegment'.
 node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/crc-details-renderer.js(71,15): error TS2304: Cannot find name 'DOM'.
-node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/crc-details-renderer.js(73,44): error TS2694: Namespace 'CriticalRequestChainRenderer' has no exported member 'CRCSegment'.
 node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/crc-details-renderer.js(110,30): error TS2304: Cannot find name 'Util'.
 node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/crc-details-renderer.js(117,34): error TS2304: Cannot find name 'Util'.
 node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/crc-details-renderer.js(120,27): error TS2304: Cannot find name 'Util'.
 node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/crc-details-renderer.js(131,15): error TS2304: Cannot find name 'DOM'.
-node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/crc-details-renderer.js(133,44): error TS2694: Namespace 'CriticalRequestChainRenderer' has no exported member 'CRCSegment'.
-node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/crc-details-renderer.js(135,44): error TS2694: Namespace 'CriticalRequestChainRenderer' has no exported member 'CRCDetailsJSON'.
 node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/crc-details-renderer.js(148,15): error TS2304: Cannot find name 'DOM'.
-node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/crc-details-renderer.js(150,44): error TS2694: Namespace 'CriticalRequestChainRenderer' has no exported member 'CRCDetailsJSON'.
 node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/crc-details-renderer.js(158,9): error TS2304: Cannot find name 'Util'.
 node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/crc-details-renderer.js(161,9): error TS2304: Cannot find name 'Util'.
 node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/crc-details-renderer.js(184,8): error TS2339: Property 'CriticalRequestChainRenderer' does not exist on type 'Window & typeof globalThis'.
-node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/crc-details-renderer.js(194,30): error TS2339: Property 'CRCDetailsJSON' does not exist on type 'typeof CriticalRequestChainRenderer'.
-node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/crc-details-renderer.js(204,30): error TS2339: Property 'CRCRequest' does not exist on type 'typeof CriticalRequestChainRenderer'.
-node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/crc-details-renderer.js(216,42): error TS2694: Namespace 'CriticalRequestChainRenderer' has no exported member 'CRCRequest'.
-node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/crc-details-renderer.js(228,30): error TS2339: Property 'CRCSegment' does not exist on type 'typeof CriticalRequestChainRenderer'.
 node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/details-renderer.js(12,15): error TS2304: Cannot find name 'DOM'.
-node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/details-renderer.js(29,31): error TS2694: Namespace 'DetailsRenderer' has no exported member 'DetailsJSON'.
-node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/details-renderer.js(39,61): error TS2694: Namespace 'DetailsRenderer' has no exported member 'LinkDetailsJSON'.
-node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/details-renderer.js(41,66): error TS2694: Namespace 'DetailsRenderer' has no exported member 'ThumbnailDetails'.
-node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/details-renderer.js(43,66): error TS2694: Namespace 'DetailsRenderer' has no exported member 'FilmstripDetails'.
-node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/details-renderer.js(45,62): error TS2694: Namespace 'DetailsRenderer' has no exported member 'CardsDetailsJSON'.
-node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/details-renderer.js(47,62): error TS2694: Namespace 'DetailsRenderer' has no exported member 'TableDetailsJSON'.
-node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/details-renderer.js(51,60): error TS2694: Namespace 'DetailsRenderer' has no exported member 'NodeDetailsJSON'.
+node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/details-renderer.js(41,42): error TS2352: Conversion of type '{ type: string; text: string; }' to type '{ type: string; url: { text: string; }; mimeType: { text: string; }; }' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
+  Type '{ type: string; text: string; }' is missing the following properties from type '{ type: string; url: { text: string; }; mimeType: { text: string; }; }': url, mimeType
+node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/details-renderer.js(43,42): error TS2352: Conversion of type '{ type: string; text: string; }' to type '{ type: string; scale: number; items: { timing: number; timestamp: number; data: string; }[]; }' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
+  Type '{ type: string; text: string; }' is missing the following properties from type '{ type: string; scale: number; items: { timing: number; timestamp: number; data: string; }[]; }': scale, items
+node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/details-renderer.js(45,38): error TS2352: Conversion of type '{ type: string; text: string; }' to type '{ type: string; header: { text: string; }; items: { title: string; value: string; snippet: string; target: string; }[]; }' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
+  Type '{ type: string; text: string; }' is missing the following properties from type '{ type: string; header: { text: string; }; items: { title: string; value: string; snippet: string; target: string; }[]; }': header, items
+node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/details-renderer.js(47,38): error TS2352: Conversion of type '{ type: string; text: string; }' to type '{ type: string; header: { text: string; }; items: { type: string; text: string; }[][]; itemHeaders: { type: string; itemType: string; text: string; }[]; }' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
+  Type '{ type: string; text: string; }' is missing the following properties from type '{ type: string; header: { text: string; }; items: { type: string; text: string; }[][]; itemHeaders: { type: string; itemType: string; text: string; }[]; }': header, items, itemHeaders
 node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/details-renderer.js(53,16): error TS2304: Cannot find name 'CriticalRequestChainRenderer'.
 node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/details-renderer.js(54,23): error TS2503: Cannot find namespace 'CriticalRequestChainRenderer'.
-node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/details-renderer.js(56,61): error TS2694: Namespace 'DetailsRenderer' has no exported member 'ListDetailsJSON'.
-node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/details-renderer.js(63,31): error TS2694: Namespace 'DetailsRenderer' has no exported member 'DetailsJSON'.
+node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/details-renderer.js(56,37): error TS2352: Conversion of type '{ type: string; text: string; }' to type '{ type: string; header: { text: string; }; items: { type: string; text: string; }[]; }' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
+  Type '{ type: string; text: string; }' is missing the following properties from type '{ type: string; header: { text: string; }; items: { type: string; text: string; }[]; }': header, items
 node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/details-renderer.js(73,22): error TS2304: Cannot find name 'Util'.
-node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/details-renderer.js(104,31): error TS2694: Namespace 'DetailsRenderer' has no exported member 'LinkDetailsJSON'.
-node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/details-renderer.js(125,31): error TS2694: Namespace 'DetailsRenderer' has no exported member 'DetailsJSON'.
-node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/details-renderer.js(137,31): error TS2694: Namespace 'DetailsRenderer' has no exported member 'ThumbnailDetails'.
-node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/details-renderer.js(153,31): error TS2694: Namespace 'DetailsRenderer' has no exported member 'ListDetailsJSON'.
-node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/details-renderer.js(176,31): error TS2694: Namespace 'DetailsRenderer' has no exported member 'TableDetailsJSON'.
-node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/details-renderer.js(210,31): error TS2694: Namespace 'DetailsRenderer' has no exported member 'NodeDetailsJSON'.
-node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/details-renderer.js(226,31): error TS2694: Namespace 'DetailsRenderer' has no exported member 'CardsDetailsJSON'.
-node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/details-renderer.js(257,31): error TS2694: Namespace 'DetailsRenderer' has no exported member 'FilmstripDetails'.
+node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/details-renderer.js(141,23): error TS2345: Argument of type '{ text: string; }' is not assignable to parameter of type 'string'.
 node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/details-renderer.js(266,20): error TS2304: Cannot find name 'Util'.
 node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/details-renderer.js(268,18): error TS2304: Cannot find name 'Util'.
-node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/details-renderer.js(285,31): error TS2694: Namespace 'DetailsRenderer' has no exported member 'DetailsJSON'.
 node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/details-renderer.js(298,8): error TS2339: Property 'DetailsRenderer' does not exist on type 'Window & typeof globalThis'.
-node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/details-renderer.js(307,17): error TS2339: Property 'DetailsJSON' does not exist on type 'typeof DetailsRenderer'.
-node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/details-renderer.js(316,17): error TS2339: Property 'ListDetailsJSON' does not exist on type 'typeof DetailsRenderer'.
 node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/details-renderer.js(327,17): error TS2300: Duplicate identifier 'NodeDetailsJSON'.
-node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/details-renderer.js(327,17): error TS2339: Property 'NodeDetailsJSON' does not exist on type 'typeof DetailsRenderer'.
-node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/details-renderer.js(335,17): error TS2339: Property 'CardsDetailsJSON' does not exist on type 'typeof DetailsRenderer'.
-node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/details-renderer.js(344,17): error TS2339: Property 'TableHeaderJSON' does not exist on type 'typeof DetailsRenderer'.
 node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/details-renderer.js(355,17): error TS2300: Duplicate identifier 'NodeDetailsJSON'.
-node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/details-renderer.js(355,17): error TS2339: Property 'NodeDetailsJSON' does not exist on type 'typeof DetailsRenderer'.
-node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/details-renderer.js(360,46): error TS2694: Namespace 'DetailsRenderer' has no exported member 'DetailsJSON'.
-node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/details-renderer.js(361,45): error TS2694: Namespace 'DetailsRenderer' has no exported member 'TableHeaderJSON'.
-node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/details-renderer.js(364,17): error TS2339: Property 'TableDetailsJSON' does not exist on type 'typeof DetailsRenderer'.
-node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/details-renderer.js(372,17): error TS2339: Property 'ThumbnailDetails' does not exist on type 'typeof DetailsRenderer'.
-node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/details-renderer.js(380,17): error TS2339: Property 'LinkDetailsJSON' does not exist on type 'typeof DetailsRenderer'.
-node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/details-renderer.js(388,17): error TS2339: Property 'FilmstripDetails' does not exist on type 'typeof DetailsRenderer'.
 node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/dom.js(63,67): error TS2339: Property 'querySelector' does not exist on type 'Node'.
 node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/dom.js(76,43): error TS2345: Argument of type 'true' is not assignable to parameter of type 'string'.
 node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/dom.js(156,28): error TS2339: Property 'querySelector' does not exist on type 'Node'.
@@ -644,24 +583,11 @@ node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/dom.
 node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/dom.js(177,8): error TS2339: Property 'DOM' does not exist on type 'Window & typeof globalThis'.
 node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/report-renderer.js(19,15): error TS2304: Cannot find name 'DOM'.
 node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/report-renderer.js(20,15): error TS2304: Cannot find name 'CategoryRenderer'.
-node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/report-renderer.js(32,30): error TS2694: Namespace 'ReportRenderer' has no exported member 'ReportJSON'.
-node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/report-renderer.js(53,30): error TS2694: Namespace 'ReportRenderer' has no exported member 'ReportJSON'.
 node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/report-renderer.js(59,9): error TS2304: Cannot find name 'Util'.
-node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/report-renderer.js(80,30): error TS2694: Namespace 'ReportRenderer' has no exported member 'ReportJSON'.
 node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/report-renderer.js(87,9): error TS2304: Cannot find name 'Util'.
-node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/report-renderer.js(92,30): error TS2694: Namespace 'ReportRenderer' has no exported member 'ReportJSON'.
 node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/report-renderer.js(110,47): error TS2304: Cannot find name 'Util'.
-node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/report-renderer.js(119,30): error TS2694: Namespace 'ReportRenderer' has no exported member 'ReportJSON'.
-node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/report-renderer.js(138,30): error TS2694: Namespace 'ReportRenderer' has no exported member 'ReportJSON'.
 node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/report-renderer.js(172,8): error TS2339: Property 'ReportRenderer' does not exist on type 'Window & typeof globalThis'.
 node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/report-renderer.js(193,21): error TS2503: Cannot find namespace 'DetailsRenderer'.
-node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/report-renderer.js(197,16): error TS2339: Property 'AuditJSON' does not exist on type 'typeof ReportRenderer'.
-node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/report-renderer.js(206,39): error TS2694: Namespace 'ReportRenderer' has no exported member 'AuditJSON'.
-node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/report-renderer.js(209,16): error TS2339: Property 'CategoryJSON' does not exist on type 'typeof ReportRenderer'.
-node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/report-renderer.js(217,16): error TS2339: Property 'GroupJSON' does not exist on type 'typeof ReportRenderer'.
-node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/report-renderer.js(229,49): error TS2694: Namespace 'ReportRenderer' has no exported member 'CategoryJSON'.
-node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/report-renderer.js(230,54): error TS2694: Namespace 'ReportRenderer' has no exported member 'GroupJSON'.
-node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/report-renderer.js(237,16): error TS2339: Property 'ReportJSON' does not exist on type 'typeof ReportRenderer'.
 node_modules/chrome-devtools-frontend/front_end/audits2/lighthouse/renderer/util.js(124,5): error TS2739: Type '{}' is missing the following properties from type '{ numPathParts: number; preserveQuery: boolean; preserveHost: boolean; }': numPathParts, preserveQuery, preserveHost
 node_modules/chrome-devtools-frontend/front_end/audits2_test_runner/Audits2TestRunner.js(53,12): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/audits2_test_runner/Audits2TestRunner.js(76,33): error TS2339: Property 'textElement' does not exist on type 'Element'.
@@ -3079,8 +3005,6 @@ node_modules/chrome-devtools-frontend/front_end/bindings/BlackboxManager.js(229,
 node_modules/chrome-devtools-frontend/front_end/bindings/BlackboxManager.js(244,52): error TS2339: Property 'setAsArray' does not exist on type 'Setting<any>'.
 node_modules/chrome-devtools-frontend/front_end/bindings/BlackboxManager.js(251,72): error TS2339: Property 'getAsArray' does not exist on type 'Setting<any>'.
 node_modules/chrome-devtools-frontend/front_end/bindings/BlackboxManager.js(269,52): error TS2339: Property 'setAsArray' does not exist on type 'Setting<any>'.
-node_modules/chrome-devtools-frontend/front_end/bindings/BlackboxManager.js(304,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/bindings/BlackboxManager.js(313,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/bindings/BlackboxManager.js(326,7): error TS2322: Type 'Promise<void>' is not assignable to type 'Promise<undefined>'.
 node_modules/chrome-devtools-frontend/front_end/bindings/BlackboxManager.js(341,32): error TS2694: Namespace 'Protocol' has no exported member 'Debugger'.
 node_modules/chrome-devtools-frontend/front_end/bindings/BlackboxManager.js(351,31): error TS2694: Namespace 'Protocol' has no exported member 'Debugger'.
@@ -3097,12 +3021,11 @@ node_modules/chrome-devtools-frontend/front_end/bindings/BreakpointManager.js(97
 node_modules/chrome-devtools-frontend/front_end/bindings/BreakpointManager.js(122,22): error TS2339: Property 'remove' does not exist on type 'V'.
 node_modules/chrome-devtools-frontend/front_end/bindings/BreakpointManager.js(153,44): error TS2345: Argument of type 'string' is not assignable to parameter of type 'K'.
   'string' is assignable to the constraint of type 'K', but 'K' could be instantiated with a different subtype of constraint '{}'.
-node_modules/chrome-devtools-frontend/front_end/bindings/BreakpointManager.js(158,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/bindings/BreakpointManager.js(166,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/bindings/BreakpointManager.js(181,42): error TS2345: Argument of type 'string' is not assignable to parameter of type 'K'.
   'string' is assignable to the constraint of type 'K', but 'K' could be instantiated with a different subtype of constraint '{}'.
 node_modules/chrome-devtools-frontend/front_end/bindings/BreakpointManager.js(183,45): error TS2339: Property 'remove' does not exist on type 'Map<UISourceCode, Breakpoint[]>'.
 node_modules/chrome-devtools-frontend/front_end/bindings/BreakpointManager.js(237,46): error TS2339: Property 'valuesArray' does not exist on type 'Map<number, Breakpoint[]>'.
+node_modules/chrome-devtools-frontend/front_end/bindings/BreakpointManager.js(272,42): error TS2694: Namespace 'SDK.DebuggerModel' has no exported member 'BreakLocation'.
 node_modules/chrome-devtools-frontend/front_end/bindings/BreakpointManager.js(300,73): error TS2339: Property 'valuesArray' does not exist on type 'Map<number, Map<number, Breakpoint[]>>'.
 node_modules/chrome-devtools-frontend/front_end/bindings/BreakpointManager.js(314,58): error TS2339: Property 'keysArray' does not exist on type 'Map<UISourceCode, Map<number, Map<number, Breakpoint[]>>>'.
 node_modules/chrome-devtools-frontend/front_end/bindings/BreakpointManager.js(326,73): error TS2339: Property 'keysArray' does not exist on type 'Map<number, Map<number, Breakpoint[]>>'.
@@ -3130,7 +3053,6 @@ node_modules/chrome-devtools-frontend/front_end/bindings/BreakpointManager.js(78
 node_modules/chrome-devtools-frontend/front_end/bindings/BreakpointManager.js(862,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/bindings/BreakpointManager.js(863,24): error TS2694: Namespace 'Protocol' has no exported member 'Debugger'.
 node_modules/chrome-devtools-frontend/front_end/bindings/BreakpointManager.js(889,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/bindings/BreakpointManager.js(905,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/bindings/CSSWorkspaceBinding.js(20,47): error TS2345: Argument of type 'this' is not assignable to parameter of type '{ modelAdded(model: T): void; modelRemoved(model: T): void; }'.
   Type 'CSSWorkspaceBinding' is not assignable to type '{ modelAdded(model: T): void; modelRemoved(model: T): void; }'.
     Types of property 'modelAdded' are incompatible.
@@ -3138,7 +3060,6 @@ node_modules/chrome-devtools-frontend/front_end/bindings/CSSWorkspaceBinding.js(
         Types of parameters 'cssModel' and 'model' are incompatible.
           Type 'T' is not assignable to type 'CSSModel'.
 node_modules/chrome-devtools-frontend/front_end/bindings/CSSWorkspaceBinding.js(49,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/bindings/CSSWorkspaceBinding.js(64,19): error TS2367: This condition will always return 'true' since the types '{ Regular: string; Inline: string; Attributes: string; }' and 'string' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/bindings/CSSWorkspaceBinding.js(104,9): error TS2403: Subsequent variable declarations must have the same type.  Variable 'rawLocations' must be of type 'CSSLocation[]', but here has type 'any[]'.
 node_modules/chrome-devtools-frontend/front_end/bindings/CSSWorkspaceBinding.js(106,20): error TS2339: Property 'pushAll' does not exist on type 'CSSLocation[]'.
 node_modules/chrome-devtools-frontend/front_end/bindings/CSSWorkspaceBinding.js(126,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
@@ -3154,24 +3075,15 @@ node_modules/chrome-devtools-frontend/front_end/bindings/CSSWorkspaceBinding.js(
   'string' is assignable to the constraint of type 'K', but 'K' could be instantiated with a different subtype of constraint '{}'.
 node_modules/chrome-devtools-frontend/front_end/bindings/CSSWorkspaceBinding.js(191,46): error TS2345: Argument of type 'CSSStyleSheetHeader' is not assignable to parameter of type 'K'.
   'CSSStyleSheetHeader' is assignable to the constraint of type 'K', but 'K' could be instantiated with a different subtype of constraint '{}'.
-node_modules/chrome-devtools-frontend/front_end/bindings/CSSWorkspaceBinding.js(196,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/bindings/CSSWorkspaceBinding.js(204,16): error TS2339: Property '_header' does not exist on type 'V'.
 node_modules/chrome-devtools-frontend/front_end/bindings/CSSWorkspaceBinding.js(205,27): error TS2345: Argument of type 'CSSStyleSheetHeader' is not assignable to parameter of type 'K'.
   'CSSStyleSheetHeader' is assignable to the constraint of type 'K', but 'K' could be instantiated with a different subtype of constraint '{}'.
 node_modules/chrome-devtools-frontend/front_end/bindings/CSSWorkspaceBinding.js(206,16): error TS2339: Property 'update' does not exist on type 'V'.
-node_modules/chrome-devtools-frontend/front_end/bindings/CSSWorkspaceBinding.js(212,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/bindings/CSSWorkspaceBinding.js(216,46): error TS2345: Argument of type 'CSSStyleSheetHeader' is not assignable to parameter of type 'K'.
   'CSSStyleSheetHeader' is assignable to the constraint of type 'K', but 'K' could be instantiated with a different subtype of constraint '{}'.
 node_modules/chrome-devtools-frontend/front_end/bindings/CSSWorkspaceBinding.js(221,31): error TS2345: Argument of type 'CSSStyleSheetHeader' is not assignable to parameter of type 'K'.
   'CSSStyleSheetHeader' is assignable to the constraint of type 'K', but 'K' could be instantiated with a different subtype of constraint '{}'.
 node_modules/chrome-devtools-frontend/front_end/bindings/CSSWorkspaceBinding.js(261,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/bindings/CompilerScriptMapping.js(48,52): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Debugger: string; Formatter: string; Network: string; Snippets: string; FileSystem: string; ContentScripts: string; Service: string; }'.
-node_modules/chrome-devtools-frontend/front_end/bindings/CompilerScriptMapping.js(50,62): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Debugger: string; Formatter: string; Network: string; Snippets: string; FileSystem: string; ContentScripts: string; Service: string; }'.
-node_modules/chrome-devtools-frontend/front_end/bindings/CompilerScriptMapping.js(59,56): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Debugger: string; Formatter: string; Network: string; Snippets: string; FileSystem: string; ContentScripts: string; Service: string; }'.
-node_modules/chrome-devtools-frontend/front_end/bindings/CompilerScriptMapping.js(184,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/bindings/CompilerScriptMapping.js(194,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/bindings/CompilerScriptMapping.js(202,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/bindings/CompilerScriptMapping.js(218,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/bindings/ContentProviderBasedProject.js(54,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/bindings/ContentProviderBasedProject.js(93,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/bindings/ContentProviderBasedProject.js(134,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
@@ -3187,9 +3099,7 @@ node_modules/chrome-devtools-frontend/front_end/bindings/DebuggerWorkspaceBindin
 node_modules/chrome-devtools-frontend/front_end/bindings/DebuggerWorkspaceBinding.js(65,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/bindings/DebuggerWorkspaceBinding.js(76,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/bindings/DebuggerWorkspaceBinding.js(90,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/bindings/DebuggerWorkspaceBinding.js(195,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/bindings/DebuggerWorkspaceBinding.js(207,34): error TS2339: Property 'valuesArray' does not exist on type 'Set<Location>'.
-node_modules/chrome-devtools-frontend/front_end/bindings/DebuggerWorkspaceBinding.js(230,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/bindings/DebuggerWorkspaceBinding.js(267,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/bindings/DebuggerWorkspaceBinding.js(276,25): error TS2345: Argument of type 'Script' is not assignable to parameter of type 'K'.
   'Script' is assignable to the constraint of type 'K', but 'K' could be instantiated with a different subtype of constraint '{}'.
@@ -3201,9 +3111,6 @@ node_modules/chrome-devtools-frontend/front_end/bindings/DebuggerWorkspaceBindin
 node_modules/chrome-devtools-frontend/front_end/bindings/DebuggerWorkspaceBinding.js(389,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/bindings/DebuggerWorkspaceBinding.js(452,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/bindings/DebuggerWorkspaceBinding.js(460,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
-node_modules/chrome-devtools-frontend/front_end/bindings/DefaultScriptMapping.js(44,63): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Debugger: string; Formatter: string; Network: string; Snippets: string; FileSystem: string; ContentScripts: string; Service: string; }'.
-node_modules/chrome-devtools-frontend/front_end/bindings/DefaultScriptMapping.js(100,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/bindings/DefaultScriptMapping.js(115,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/bindings/FileUtils.js(38,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/bindings/FileUtils.js(43,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/bindings/FileUtils.js(48,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
@@ -3215,28 +3122,15 @@ node_modules/chrome-devtools-frontend/front_end/bindings/FileUtils.js(143,22): e
 node_modules/chrome-devtools-frontend/front_end/bindings/FileUtils.js(146,31): error TS2339: Property 'result' does not exist on type 'EventTarget'.
 node_modules/chrome-devtools-frontend/front_end/bindings/FileUtils.js(178,32): error TS2339: Property 'error' does not exist on type 'EventTarget'.
 node_modules/chrome-devtools-frontend/front_end/bindings/FileUtils.js(194,23): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/bindings/FileUtils.js(227,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/bindings/LiveLocation.js(11,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/bindings/LiveLocation.js(18,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/bindings/LiveLocation.js(29,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/bindings/NetworkProject.js(223,37): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Debugger: string; Formatter: string; Network: string; Snippets: string; FileSystem: string; ContentScripts: string; Service: string; }'.
-node_modules/chrome-devtools-frontend/front_end/bindings/NetworkProject.js(270,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/bindings/NetworkProject.js(286,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/bindings/NetworkProject.js(308,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/bindings/PresentationConsoleMessageHelper.js(66,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/bindings/PresentationConsoleMessageHelper.js(130,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/bindings/PresentationConsoleMessageHelper.js(181,19): error TS2367: This condition will always return 'false' since the types '{ Verbose: string; Info: string; Warning: string; Error: string; }' and 'string' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/bindings/PresentationConsoleMessageHelper.js(197,48): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Error: string; Warning: string; }'.
 node_modules/chrome-devtools-frontend/front_end/bindings/ResourceMapping.js(17,56): error TS2345: Argument of type 'this' is not assignable to parameter of type '{ modelAdded(model: T): void; modelRemoved(model: T): void; }'.
   Type 'ResourceMapping' is not assignable to type '{ modelAdded(model: T): void; modelRemoved(model: T): void; }'.
     Types of property 'modelAdded' are incompatible.
       Type '(resourceTreeModel: ResourceTreeModel) => void' is not assignable to type '(model: T) => void'.
         Types of parameters 'resourceTreeModel' and 'model' are incompatible.
           Type 'T' is not assignable to type 'ResourceTreeModel'.
-node_modules/chrome-devtools-frontend/front_end/bindings/ResourceMapping.js(112,48): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Debugger: string; Formatter: string; Network: string; Snippets: string; FileSystem: string; ContentScripts: string; Service: string; }'.
-node_modules/chrome-devtools-frontend/front_end/bindings/ResourceMapping.js(147,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/bindings/ResourceMapping.js(181,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/bindings/ResourceMapping.js(189,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/bindings/ResourceMapping.js(197,40): error TS2339: Property 'valuesArray' does not exist on type 'Map<string, Binding>'.
 node_modules/chrome-devtools-frontend/front_end/bindings/ResourceMapping.js(204,40): error TS2339: Property 'valuesArray' does not exist on type 'Map<string, Binding>'.
 node_modules/chrome-devtools-frontend/front_end/bindings/ResourceMapping.js(254,28): error TS2339: Property 'firstValue' does not exist on type 'Set<Resource>'.
@@ -3244,35 +3138,18 @@ node_modules/chrome-devtools-frontend/front_end/bindings/ResourceMapping.js(262,
 node_modules/chrome-devtools-frontend/front_end/bindings/ResourceMapping.js(270,28): error TS2339: Property 'firstValue' does not exist on type 'Set<Resource>'.
 node_modules/chrome-devtools-frontend/front_end/bindings/ResourceMapping.js(278,28): error TS2339: Property 'firstValue' does not exist on type 'Set<Resource>'.
 node_modules/chrome-devtools-frontend/front_end/bindings/ResourceMapping.js(289,28): error TS2339: Property 'firstValue' does not exist on type 'Set<Resource>'.
-node_modules/chrome-devtools-frontend/front_end/bindings/ResourceScriptMapping.js(107,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/bindings/ResourceScriptMapping.js(137,38): error TS2339: Property 'remove' does not exist on type 'Map<UISourceCode, ResourceScriptFile>'.
-node_modules/chrome-devtools-frontend/front_end/bindings/ResourceScriptMapping.js(141,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/bindings/ResourceScriptMapping.js(155,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/bindings/ResourceScriptMapping.js(231,55): error TS2339: Property 'valuesArray' does not exist on type 'Set<UISourceCode>'.
 node_modules/chrome-devtools-frontend/front_end/bindings/ResourceScriptMapping.js(284,21): error TS2339: Property '_scriptSource' does not exist on type 'ResourceScriptFile'.
 node_modules/chrome-devtools-frontend/front_end/bindings/ResourceScriptMapping.js(291,38): error TS2339: Property '_scriptSource' does not exist on type 'ResourceScriptFile'.
 node_modules/chrome-devtools-frontend/front_end/bindings/ResourceScriptMapping.js(293,63): error TS2339: Property '_scriptSource' does not exist on type 'ResourceScriptFile'.
-node_modules/chrome-devtools-frontend/front_end/bindings/ResourceScriptMapping.js(298,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/bindings/ResourceScriptMapping.js(305,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/bindings/ResourceScriptMapping.js(318,26): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/bindings/ResourceScriptMapping.js(323,14): error TS2339: Property '_scriptSource' does not exist on type 'ResourceScriptFile'.
-node_modules/chrome-devtools-frontend/front_end/bindings/ResourceScriptMapping.js(329,82): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Info: string; Warning: string; Error: string; }'.
-node_modules/chrome-devtools-frontend/front_end/bindings/ResourceScriptMapping.js(334,11): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Error: string; Warning: string; }'.
 node_modules/chrome-devtools-frontend/front_end/bindings/ResourceScriptMapping.js(384,38): error TS2339: Property '_scriptSource' does not exist on type 'ResourceScriptFile'.
 node_modules/chrome-devtools-frontend/front_end/bindings/ResourceScriptMapping.js(395,12): error TS2339: Property '_scriptSource' does not exist on type 'ResourceScriptFile'.
 node_modules/chrome-devtools-frontend/front_end/bindings/ResourceUtils.js(44,12): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/bindings/ResourceUtils.js(72,32): error TS2339: Property 'asParsedURL' does not exist on type 'string'.
-node_modules/chrome-devtools-frontend/front_end/bindings/SASSSourceMapping.js(43,52): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Debugger: string; Formatter: string; Network: string; Snippets: string; FileSystem: string; ContentScripts: string; Service: string; }'.
-node_modules/chrome-devtools-frontend/front_end/bindings/SASSSourceMapping.js(63,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/bindings/SASSSourceMapping.js(90,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/bindings/SASSSourceMapping.js(108,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/bindings/SASSSourceMapping.js(161,17): error TS2339: Property 'pushAll' does not exist on type 'any[]'.
-node_modules/chrome-devtools-frontend/front_end/bindings/StylesSourceMapping.js(44,42): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Debugger: string; Formatter: string; Network: string; Snippets: string; FileSystem: string; ContentScripts: string; Service: string; }'.
-node_modules/chrome-devtools-frontend/front_end/bindings/StylesSourceMapping.js(111,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/bindings/StylesSourceMapping.js(129,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/bindings/StylesSourceMapping.js(146,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/bindings/StylesSourceMapping.js(229,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/bindings/StylesSourceMapping.js(239,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/bindings/StylesSourceMapping.js(307,26): error TS2339: Property 'firstValue' does not exist on type 'Set<CSSStyleSheetHeader>'.
 node_modules/chrome-devtools-frontend/front_end/bindings/StylesSourceMapping.js(315,26): error TS2339: Property 'firstValue' does not exist on type 'Set<CSSStyleSheetHeader>'.
 node_modules/chrome-devtools-frontend/front_end/bindings/StylesSourceMapping.js(323,26): error TS2339: Property 'firstValue' does not exist on type 'Set<CSSStyleSheetHeader>'.
@@ -3283,7 +3160,6 @@ node_modules/chrome-devtools-frontend/front_end/bindings/TempFile.js(85,5): erro
 node_modules/chrome-devtools-frontend/front_end/bindings/TempFile.js(91,25): error TS2304: Cannot find name 'FileError'.
 node_modules/chrome-devtools-frontend/front_end/bindings/TempFile.js(96,42): error TS2304: Cannot find name 'FileError'.
 node_modules/chrome-devtools-frontend/front_end/bindings/TempFile.js(176,25): error TS2304: Cannot find name 'FileError'.
-node_modules/chrome-devtools-frontend/front_end/bindings/TempFile.js(189,33): error TS2339: Property 'Chunk' does not exist on type 'typeof TempFileBackingStorage'.
 node_modules/chrome-devtools-frontend/front_end/bindings_test_runner/AutomappingTestRunner.js(48,26): error TS2554: Expected 5 arguments, but got 4.
 node_modules/chrome-devtools-frontend/front_end/bindings_test_runner/AutomappingTestRunner.js(71,80): error TS2345: Argument of type 'Promise<any>' is not assignable to parameter of type '() => Promise<string>'.
   Type 'Promise<any>' provides no match for the signature '(): Promise<string>'.
@@ -3302,68 +3178,35 @@ node_modules/chrome-devtools-frontend/front_end/bindings_test_runner/IsolatedFil
 node_modules/chrome-devtools-frontend/front_end/bindings_test_runner/IsolatedFilesystemTestRunner.js(275,8): error TS2551: Property '_entry' does not exist on type 'typeof TestFileSystem'. Did you mean 'Entry'?
 node_modules/chrome-devtools-frontend/front_end/bindings_test_runner/IsolatedFilesystemTestRunner.js(276,8): error TS2339: Property '_modificationTimesDelta' does not exist on type 'typeof TestFileSystem'.
 node_modules/chrome-devtools-frontend/front_end/bindings_test_runner/OverridesTestRunner.js(7,13): error TS1064: The return type of an async function or method must be the global Promise<T> type.
-node_modules/chrome-devtools-frontend/front_end/bindings_test_runner/PersistenceTestRunner.js(76,79): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Debugger: string; Formatter: string; Network: string; Snippets: string; FileSystem: string; ContentScripts: string; Service: string; }'.
-node_modules/chrome-devtools-frontend/front_end/bindings_test_runner/PersistenceTestRunner.js(77,82): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Debugger: string; Formatter: string; Network: string; Snippets: string; FileSystem: string; ContentScripts: string; Service: string; }'.
-node_modules/chrome-devtools-frontend/front_end/changes/ChangesHighlighter.js(7,51): error TS2694: Namespace 'Changes.ChangesView' has no exported member 'Row'.
-node_modules/chrome-devtools-frontend/front_end/changes/ChangesHighlighter.js(9,56): error TS2694: Namespace 'Changes.ChangesHighlighter' has no exported member 'DiffState'.
-node_modules/chrome-devtools-frontend/front_end/changes/ChangesHighlighter.js(10,75): error TS2694: Namespace 'Changes.ChangesHighlighter' has no exported member 'DiffState'.
-node_modules/chrome-devtools-frontend/front_end/changes/ChangesHighlighter.js(11,53): error TS2694: Namespace 'Changes.ChangesHighlighter' has no exported member 'DiffState'.
-node_modules/chrome-devtools-frontend/front_end/changes/ChangesHighlighter.js(12,53): error TS2694: Namespace 'Changes.ChangesHighlighter' has no exported member 'DiffState'.
-node_modules/chrome-devtools-frontend/front_end/changes/ChangesHighlighter.js(12,91): error TS2694: Namespace 'Changes.ChangesHighlighter' has no exported member 'DiffState'.
-node_modules/chrome-devtools-frontend/front_end/changes/ChangesHighlighter.js(22,42): error TS2694: Namespace 'Changes.ChangesHighlighter' has no exported member 'DiffState'.
 node_modules/chrome-devtools-frontend/front_end/changes/ChangesHighlighter.js(47,11): error TS1345: An expression of type 'void' cannot be tested for truthiness
 node_modules/chrome-devtools-frontend/front_end/changes/ChangesHighlighter.js(47,11): error TS1345: An expression of type 'void' cannot be tested for truthiness
 node_modules/chrome-devtools-frontend/front_end/changes/ChangesHighlighter.js(47,47): error TS2339: Property 'blankLine' does not exist on type 'void'.
 node_modules/chrome-devtools-frontend/front_end/changes/ChangesHighlighter.js(48,29): error TS2339: Property 'blankLine' does not exist on type 'void'.
 node_modules/chrome-devtools-frontend/front_end/changes/ChangesHighlighter.js(49,15): error TS1345: An expression of type 'void' cannot be tested for truthiness
 node_modules/chrome-devtools-frontend/front_end/changes/ChangesHighlighter.js(50,29): error TS2339: Property 'token' does not exist on type 'void'.
-node_modules/chrome-devtools-frontend/front_end/changes/ChangesHighlighter.js(59,45): error TS2694: Namespace 'Changes.ChangesHighlighter' has no exported member 'DiffState'.
-node_modules/chrome-devtools-frontend/front_end/changes/ChangesHighlighter.js(78,44): error TS2694: Namespace 'Changes.ChangesHighlighter' has no exported member 'DiffState'.
 node_modules/chrome-devtools-frontend/front_end/changes/ChangesHighlighter.js(102,51): error TS2339: Property 'token' does not exist on type 'void'.
 node_modules/chrome-devtools-frontend/front_end/changes/ChangesHighlighter.js(115,11): error TS1345: An expression of type 'void' cannot be tested for truthiness
-node_modules/chrome-devtools-frontend/front_end/changes/ChangesHighlighter.js(129,44): error TS2694: Namespace 'Changes.ChangesHighlighter' has no exported member 'DiffState'.
 node_modules/chrome-devtools-frontend/front_end/changes/ChangesHighlighter.js(142,31): error TS2339: Property 'blankLine' does not exist on type 'void'.
 node_modules/chrome-devtools-frontend/front_end/changes/ChangesHighlighter.js(144,39): error TS2339: Property 'blankLine' does not exist on type 'void'.
 node_modules/chrome-devtools-frontend/front_end/changes/ChangesHighlighter.js(147,39): error TS2339: Property 'blankLine' does not exist on type 'void'.
-node_modules/chrome-devtools-frontend/front_end/changes/ChangesHighlighter.js(155,44): error TS2694: Namespace 'Changes.ChangesHighlighter' has no exported member 'DiffState'.
-node_modules/chrome-devtools-frontend/front_end/changes/ChangesHighlighter.js(156,45): error TS2694: Namespace 'Changes.ChangesHighlighter' has no exported member 'DiffState'.
-node_modules/chrome-devtools-frontend/front_end/changes/ChangesHighlighter.js(162,53): error TS2694: Namespace 'Changes.ChangesHighlighter' has no exported member 'DiffState'.
-node_modules/chrome-devtools-frontend/front_end/changes/ChangesHighlighter.js(181,28): error TS2339: Property 'DiffState' does not exist on type '(config: any, parserConfig: { diffRows: any[]; baselineLines: string[]; currentLines: string[]; mimeType: string; }) => { startState: () => any; token: (arg0: StringStream & { backUp: (n: any) => void; column: () => void; ... 11 more ...; sol: () => void; }, arg1: any) => string; blankLine: (arg0: any) => string; co...'.
 node_modules/chrome-devtools-frontend/front_end/changes/ChangesSidebar.js(30,90): error TS2339: Property 'uiSourceCode' does not exist on type 'TreeElement'.
-node_modules/chrome-devtools-frontend/front_end/changes/ChangesSidebar.js(38,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/changes/ChangesView.js(26,44): error TS2694: Namespace 'Changes.ChangesView' has no exported member 'Row'.
+node_modules/chrome-devtools-frontend/front_end/changes/ChangesView.js(31,56): error TS2345: Argument of type '{ lineNumbers: true; lineWrapping: false; maxHighlightLength: number; }' is not assignable to parameter of type '{ bracketMatchingSetting: Setting<any>; lineNumbers: boolean; lineWrapping: boolean; mimeType: string; autoHeight: boolean; padBottom: boolean; maxHighlightLength: number; placeholder: string; }'.
+  Type '{ lineNumbers: true; lineWrapping: false; maxHighlightLength: number; }' is missing the following properties from type '{ bracketMatchingSetting: Setting<any>; lineNumbers: boolean; lineWrapping: boolean; mimeType: string; autoHeight: boolean; padBottom: boolean; maxHighlightLength: number; placeholder: string; }': bracketMatchingSetting, mimeType, autoHeight, padBottom, placeholder
 node_modules/chrome-devtools-frontend/front_end/changes/ChangesView.js(37,42): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/changes/ChangesView.js(43,52): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/changes/ChangesView.js(50,20): error TS2554: Expected 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/changes/ChangesView.js(75,11): error TS2339: Property 'consume' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/changes/ChangesView.js(111,22): error TS2554: Expected 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/changes/ChangesView.js(133,25): error TS2694: Namespace 'Diff.Diff' has no exported member 'DiffArray'.
 node_modules/chrome-devtools-frontend/front_end/changes/ChangesView.js(139,22): error TS2554: Expected 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/changes/ChangesView.js(155,26): error TS2339: Property 'pushAll' does not exist on type 'any[]'.
+node_modules/chrome-devtools-frontend/front_end/changes/ChangesView.js(155,26): error TS2339: Property 'pushAll' does not exist on type '{ baselineLineNumber: number; currentLineNumber: number; tokens: { text: string; className: string; }[]; type: string; }[]'.
 node_modules/chrome-devtools-frontend/front_end/changes/ChangesView.js(156,25): error TS2339: Property 'pushAll' does not exist on type 'any[]'.
 node_modules/chrome-devtools-frontend/front_end/changes/ChangesView.js(157,24): error TS2339: Property 'pushAll' does not exist on type 'any[]'.
-node_modules/chrome-devtools-frontend/front_end/changes/ChangesView.js(161,49): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Deletion: string; Addition: string; Equal: string; Spacer: string; }'.
 node_modules/chrome-devtools-frontend/front_end/changes/ChangesView.js(163,24): error TS2339: Property 'pushAll' does not exist on type 'any[]'.
 node_modules/chrome-devtools-frontend/front_end/changes/ChangesView.js(167,25): error TS2339: Property 'pushAll' does not exist on type 'any[]'.
-node_modules/chrome-devtools-frontend/front_end/changes/ChangesView.js(170,28): error TS2339: Property 'pushAll' does not exist on type 'any[]'.
+node_modules/chrome-devtools-frontend/front_end/changes/ChangesView.js(170,28): error TS2339: Property 'pushAll' does not exist on type '{ baselineLineNumber: number; currentLineNumber: number; tokens: { text: string; className: string; }[]; type: string; }[]'.
 node_modules/chrome-devtools-frontend/front_end/changes/ChangesView.js(172,26): error TS2339: Property 'pushAll' does not exist on type 'any[]'.
-node_modules/chrome-devtools-frontend/front_end/changes/ChangesView.js(175,51): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Deletion: string; Addition: string; Equal: string; Spacer: string; }'.
-node_modules/chrome-devtools-frontend/front_end/changes/ChangesView.js(206,45): error TS2694: Namespace 'Changes.ChangesView' has no exported member 'Row'.
-node_modules/chrome-devtools-frontend/front_end/changes/ChangesView.js(212,46): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Deletion: string; Addition: string; Equal: string; Spacer: string; }'.
 node_modules/chrome-devtools-frontend/front_end/changes/ChangesView.js(215,22): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/changes/ChangesView.js(216,26): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/changes/ChangesView.js(217,15): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Deletion: string; Addition: string; Equal: string; Spacer: string; }'.
-node_modules/chrome-devtools-frontend/front_end/changes/ChangesView.js(231,46): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Deletion: string; Addition: string; Equal: string; Spacer: string; }'.
-node_modules/chrome-devtools-frontend/front_end/changes/ChangesView.js(239,45): error TS2694: Namespace 'Changes.ChangesView' has no exported member 'Row'.
-node_modules/chrome-devtools-frontend/front_end/changes/ChangesView.js(243,41): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Deletion: string; Addition: string; Equal: string; Spacer: string; }'.
-node_modules/chrome-devtools-frontend/front_end/changes/ChangesView.js(244,42): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Deletion: string; Addition: string; Equal: string; Spacer: string; }'.
-node_modules/chrome-devtools-frontend/front_end/changes/ChangesView.js(253,45): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Deletion: string; Addition: string; Equal: string; Spacer: string; }'.
-node_modules/chrome-devtools-frontend/front_end/changes/ChangesView.js(255,46): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Deletion: string; Addition: string; Equal: string; Spacer: string; }'.
-node_modules/chrome-devtools-frontend/front_end/changes/ChangesView.js(270,38): error TS2694: Namespace 'Changes.ChangesView' has no exported member 'Row'.
-node_modules/chrome-devtools-frontend/front_end/changes/ChangesView.js(273,11): error TS2367: This condition will always return 'false' since the types '{ Deletion: string; Addition: string; Equal: string; Spacer: string; }' and 'string' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/changes/ChangesView.js(275,11): error TS2367: This condition will always return 'false' since the types '{ Deletion: string; Addition: string; Equal: string; Spacer: string; }' and 'string' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/changes/ChangesView.js(277,11): error TS2367: This condition will always return 'false' since the types '{ Deletion: string; Addition: string; Equal: string; Spacer: string; }' and 'string' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/changes/ChangesView.js(314,21): error TS2339: Property 'Row' does not exist on type 'typeof ChangesView'.
 node_modules/chrome-devtools-frontend/front_end/cm/activeline.js(6,17): error TS2307: Cannot find module '../../lib/codemirror'.
 node_modules/chrome-devtools-frontend/front_end/cm/activeline.js(7,19): error TS2304: Cannot find name 'define'.
 node_modules/chrome-devtools-frontend/front_end/cm/activeline.js(7,43): error TS2304: Cannot find name 'define'.
@@ -3515,7 +3358,7 @@ node_modules/chrome-devtools-frontend/front_end/cm/overlay.js(15,17): error TS23
 node_modules/chrome-devtools-frontend/front_end/cm/overlay.js(16,19): error TS2304: Cannot find name 'define'.
 node_modules/chrome-devtools-frontend/front_end/cm/overlay.js(16,43): error TS2304: Cannot find name 'define'.
 node_modules/chrome-devtools-frontend/front_end/cm/overlay.js(17,5): error TS2304: Cannot find name 'define'.
-node_modules/chrome-devtools-frontend/front_end/cm_headless/headlesscodemirror.js(7,1): error TS2740: Type '{}' is missing the following properties from type 'typeof CodeMirror': on, prototype, Pass, showHint, and 16 more.
+node_modules/chrome-devtools-frontend/front_end/cm_headless/headlesscodemirror.js(7,1): error TS2740: Type '{}' is missing the following properties from type 'typeof CodeMirror': on, prototype, Pass, showHint, and 18 more.
 node_modules/chrome-devtools-frontend/front_end/cm_headless/headlesscodemirror.js(30,14): error TS2403: Subsequent variable declarations must have the same type.  Variable 'ok' must be of type 'boolean', but here has type 'any'.
 node_modules/chrome-devtools-frontend/front_end/cm_headless/headlesscodemirror.js(74,1): error TS2719: Type 'typeof StringStream' is not assignable to type 'typeof StringStream'. Two different types with this name exist, but they are unrelated.
   Types of property 'prototype' are incompatible.
@@ -3604,11 +3447,9 @@ node_modules/chrome-devtools-frontend/front_end/cm_web_modes/xml.js(7,19): error
 node_modules/chrome-devtools-frontend/front_end/cm_web_modes/xml.js(7,43): error TS2304: Cannot find name 'define'.
 node_modules/chrome-devtools-frontend/front_end/cm_web_modes/xml.js(8,5): error TS2304: Cannot find name 'define'.
 node_modules/chrome-devtools-frontend/front_end/color_picker/ContrastDetails.js(9,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/color_picker/ContrastDetails.js(9,41): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/color_picker/ContrastDetails.js(10,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/color_picker/ContrastDetails.js(17,36): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/color_picker/ContrastDetails.js(19,16): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/color_picker/ContrastDetails.js(19,43): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/color_picker/ContrastDetails.js(22,16): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/color_picker/ContrastDetails.js(39,42): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/color_picker/ContrastDetails.js(42,53): error TS2555: Expected at least 2 arguments, but got 1.
@@ -3618,14 +3459,12 @@ node_modules/chrome-devtools-frontend/front_end/color_picker/ContrastDetails.js(
 node_modules/chrome-devtools-frontend/front_end/color_picker/ContrastDetails.js(82,37): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/color_picker/ContrastDetails.js(125,34): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/color_picker/ContrastDetails.js(136,35): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/color_picker/ContrastDetails.js(178,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/color_picker/ContrastDetails.js(191,11): error TS2339: Property 'consume' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/color_picker/ContrastDetails.js(201,42): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/color_picker/ContrastDetails.js(207,42): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/color_picker/ContrastDetails.js(243,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/color_picker/ContrastDetails.js(261,41): error TS2339: Property 'createChild' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/color_picker/ContrastInfo.js(32,28): error TS2694: Namespace 'SDK.CSSModel' has no exported member 'ContrastInfo'.
-node_modules/chrome-devtools-frontend/front_end/color_picker/ContrastInfo.js(124,53): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Original: string; Nickname: string; HEX: string; ShortHEX: string; HEXA: string; ShortHEXA: string; RGB: string; RGBA: string; HSL: string; HSLA: string; }'.
+node_modules/chrome-devtools-frontend/front_end/color_picker/ContrastInfo.js(40,55): error TS2551: Property 'computedFontWeight' does not exist on type '{ backgroundColors: string[]; computedFontSize: string; computedFontWeights: string; computedBodyFontSize: string; }'. Did you mean 'computedFontWeights'?
+node_modules/chrome-devtools-frontend/front_end/color_picker/ContrastInfo.js(43,55): error TS2551: Property 'computedFontWeight' does not exist on type '{ backgroundColors: string[]; computedFontSize: string; computedFontWeights: string; computedBodyFontSize: string; }'. Did you mean 'computedFontWeights'?
 node_modules/chrome-devtools-frontend/front_end/color_picker/ContrastOverlay.js(16,41): error TS2339: Property 'createSVGChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(38,32): error TS2339: Property 'createSVGChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(48,25): error TS2339: Property 'tabIndex' does not exist on type 'Element'.
@@ -3634,7 +3473,6 @@ node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(58,46):
 node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(60,59): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(84,18): error TS2339: Property 'maxLength' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(97,20): error TS2339: Property 'maxLength' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(126,52): error TS2694: Namespace 'ColorPicker.Spectrum' has no exported member 'Palette'.
 node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(128,46): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(130,57): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(133,49): error TS2339: Property 'createChild' does not exist on type 'Element'.
@@ -3660,7 +3498,7 @@ node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(241,27)
 node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(251,13): error TS2339: Property 'style' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(251,39): error TS2339: Property 'sprintf' does not exist on type 'StringConstructor'.
 node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(254,13): error TS2339: Property 'title' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(259,36): error TS2694: Namespace 'ColorPicker.Spectrum' has no exported member 'Palette'.
+node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(270,89): error TS2339: Property 'matchUserFormat' does not exist on type '{ title: string; colors: string[]; mutable: boolean; }'.
 node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(272,22): error TS2339: Property '__mutable' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(273,22): error TS2339: Property '__color' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(277,35): error TS2339: Property 'createChild' does not exist on type 'Element'.
@@ -3680,20 +3518,12 @@ node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(387,11)
 node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(387,65): error TS2339: Property 'pageY' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(390,21): error TS2339: Property 'pageX' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(392,11): error TS2339: Property 'pageY' does not exist on type 'Event'.
-node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(453,38): error TS2694: Namespace 'ColorPicker.Spectrum' has no exported member 'Palette'.
-node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(466,36): error TS2694: Namespace 'ColorPicker.Spectrum' has no exported member 'Palette'.
-node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(481,36): error TS2694: Namespace 'ColorPicker.Spectrum' has no exported member 'Palette'.
 node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(487,39): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(492,22): error TS2339: Property 'createChild' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(498,36): error TS2694: Namespace 'ColorPicker.Spectrum' has no exported member 'Palette'.
 node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(528,18): error TS2339: Property 'style' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(541,34): error TS2345: Argument of type 'string | { Original: string; Nickname: string; HEX: string; ShortHEX: string; HEXA: string; ShortHEXA: string; RGB: string; RGBA: string; HSL: string; HSLA: string; }' is not assignable to parameter of type 'string'.
-  Type '{ Original: string; Nickname: string; HEX: string; ShortHEX: string; HEXA: string; ShortHEXA: string; RGB: string; RGBA: string; HSL: string; HSLA: string; }' is not assignable to type 'string'.
-node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(546,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(565,18): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(567,18): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(570,16): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(598,28): error TS2694: Namespace 'SDK.CSSModel' has no exported member 'ContrastInfo'.
 node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(714,24): error TS2339: Property 'value' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(716,24): error TS2339: Property 'value' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(745,16): error TS2339: Property 'sprintf' does not exist on type 'StringConstructor'.
@@ -3705,88 +3535,49 @@ node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(775,20)
 node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(776,13): error TS2339: Property 'consume' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(782,36): error TS2339: Property 'value' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(786,28): error TS2339: Property 'sprintf' does not exist on type 'StringConstructor'.
-node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(796,52): error TS2345: Argument of type '{ Original: string; Nickname: string; HEX: string; ShortHEX: string; HEXA: string; ShortHEXA: string; RGB: string; RGBA: string; HSL: string; HSLA: string; }' is not assignable to parameter of type 'string'.
-node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(821,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(838,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(865,22): error TS2339: Property 'Palette' does not exist on type 'typeof Spectrum'.
 node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(870,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(870,45): error TS2694: Namespace 'ColorPicker.Spectrum' has no exported member 'Palette'.
 node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(881,37): error TS2339: Property 'catchException' does not exist on type 'Promise<any[]>'.
 node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(918,37): error TS2339: Property 'keysArray' does not exist on type 'Map<string, number>'.
 node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(933,29): error TS2339: Property 'keysArray' does not exist on type 'Map<string, Color>'.
 node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(1009,39): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/color_picker/Spectrum.js(1016,41): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/common/Color.js(91,65): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Original: string; Nickname: string; HEX: string; ShortHEX: string; HEXA: string; ShortHEXA: string; RGB: string; RGBA: string; HSL: string; HSLA: string; }'.
-node_modules/chrome-devtools-frontend/front_end/common/Color.js(99,11): error TS2322: Type 'string' is not assignable to type '{ Original: string; Nickname: string; HEX: string; ShortHEX: string; HEXA: string; ShortHEXA: string; RGB: string; RGBA: string; HSL: string; HSLA: string; }'.
 node_modules/chrome-devtools-frontend/front_end/common/Color.js(133,13): error TS2403: Subsequent variable declarations must have the same type.  Variable 'rgba' must be of type 'any', but here has type 'number[]'.
-node_modules/chrome-devtools-frontend/front_end/common/Color.js(139,39): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Original: string; Nickname: string; HEX: string; ShortHEX: string; HEXA: string; ShortHEXA: string; RGB: string; RGBA: string; HSL: string; HSLA: string; }'.
 node_modules/chrome-devtools-frontend/front_end/common/Color.js(149,13): error TS2403: Subsequent variable declarations must have the same type.  Variable 'rgba' must be of type 'any', but here has type 'any[]'.
-node_modules/chrome-devtools-frontend/front_end/common/Color.js(151,39): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Original: string; Nickname: string; HEX: string; ShortHEX: string; HEXA: string; ShortHEXA: string; RGB: string; RGBA: string; HSL: string; HSLA: string; }'.
-node_modules/chrome-devtools-frontend/front_end/common/Color.js(163,85): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Original: string; Nickname: string; HEX: string; ShortHEX: string; HEXA: string; ShortHEXA: string; RGB: string; RGBA: string; HSL: string; HSLA: string; }'.
-node_modules/chrome-devtools-frontend/front_end/common/Color.js(173,35): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Original: string; Nickname: string; HEX: string; ShortHEX: string; HEXA: string; ShortHEXA: string; RGB: string; RGBA: string; HSL: string; HSLA: string; }'.
 node_modules/chrome-devtools-frontend/front_end/common/Color.js(182,15): error TS2345: Argument of type 'string' is not assignable to parameter of type 'number'.
 node_modules/chrome-devtools-frontend/front_end/common/Color.js(217,15): error TS2345: Argument of type 'string' is not assignable to parameter of type 'number'.
 node_modules/chrome-devtools-frontend/front_end/common/Color.js(235,58): error TS2345: Argument of type 'string' is not assignable to parameter of type 'number'.
-node_modules/chrome-devtools-frontend/front_end/common/Color.js(426,5): error TS2322: Type 'string | { Original: string; Nickname: string; HEX: string; ShortHEX: string; HEXA: string; ShortHEXA: string; RGB: string; RGBA: string; HSL: string; HSLA: string; }' is not assignable to type '{ Original: string; Nickname: string; HEX: string; ShortHEX: string; HEXA: string; ShortHEXA: string; RGB: string; RGBA: string; HSL: string; HSLA: string; }'.
-  Type 'string' is not assignable to type '{ Original: string; Nickname: string; HEX: string; ShortHEX: string; HEXA: string; ShortHEXA: string; RGB: string; RGBA: string; HSL: string; HSLA: string; }'.
-node_modules/chrome-devtools-frontend/front_end/common/Color.js(518,7): error TS2322: Type 'string' is not assignable to type '{ Original: string; Nickname: string; HEX: string; ShortHEX: string; HEXA: string; ShortHEXA: string; RGB: string; RGBA: string; HSL: string; HSLA: string; }'.
-node_modules/chrome-devtools-frontend/front_end/common/Color.js(519,5): error TS2322: Type 'string' is not assignable to type '{ Original: string; Nickname: string; HEX: string; ShortHEX: string; HEXA: string; ShortHEXA: string; RGB: string; RGBA: string; HSL: string; HSLA: string; }'.
 node_modules/chrome-devtools-frontend/front_end/common/Color.js(563,23): error TS2339: Property 'sprintf' does not exist on type 'StringConstructor'.
 node_modules/chrome-devtools-frontend/front_end/common/Color.js(566,23): error TS2339: Property 'sprintf' does not exist on type 'StringConstructor'.
 node_modules/chrome-devtools-frontend/front_end/common/Color.js(573,23): error TS2339: Property 'sprintf' does not exist on type 'StringConstructor'.
 node_modules/chrome-devtools-frontend/front_end/common/Color.js(577,23): error TS2339: Property 'sprintf' does not exist on type 'StringConstructor'.
 node_modules/chrome-devtools-frontend/front_end/common/Color.js(582,14): error TS2339: Property 'sprintf' does not exist on type 'StringConstructor'.
 node_modules/chrome-devtools-frontend/front_end/common/Color.js(590,14): error TS2339: Property 'sprintf' does not exist on type 'StringConstructor'.
-node_modules/chrome-devtools-frontend/front_end/common/Color.js(594,13): error TS2367: This condition will always return 'true' since the types '{ Original: string; Nickname: string; HEX: string; ShortHEX: string; HEXA: string; ShortHEXA: string; RGB: string; RGBA: string; HSL: string; HSLA: string; }' and 'string' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/common/Color.js(594,60): error TS2367: This condition will always return 'true' since the types '{ Original: string; Nickname: string; HEX: string; ShortHEX: string; HEXA: string; ShortHEXA: string; RGB: string; RGBA: string; HSL: string; HSLA: string; }' and 'string' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/common/Color.js(597,14): error TS2339: Property 'sprintf' does not exist on type 'StringConstructor'.
-node_modules/chrome-devtools-frontend/front_end/common/Color.js(604,13): error TS2367: This condition will always return 'true' since the types '{ Original: string; Nickname: string; HEX: string; ShortHEX: string; HEXA: string; ShortHEXA: string; RGB: string; RGBA: string; HSL: string; HSLA: string; }' and 'string' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/common/Color.js(607,14): error TS2339: Property 'sprintf' does not exist on type 'StringConstructor'.
 node_modules/chrome-devtools-frontend/front_end/common/Color.js(640,23): error TS2339: Property '_rgbaToNickname' does not exist on type 'typeof Color'.
 node_modules/chrome-devtools-frontend/front_end/common/Color.js(641,20): error TS2339: Property '_rgbaToNickname' does not exist on type 'typeof Color'.
 node_modules/chrome-devtools-frontend/front_end/common/Color.js(646,22): error TS2339: Property '_rgbaToNickname' does not exist on type 'typeof Color'.
 node_modules/chrome-devtools-frontend/front_end/common/Color.js(650,25): error TS2339: Property '_rgbaToNickname' does not exist on type 'typeof Color'.
 node_modules/chrome-devtools-frontend/front_end/common/Color.js(661,5): error TS2741: Property 'a' is missing in type '{ r: number; g: number; b: number; }' but required in type '{ r: number; g: number; b: number; a: number; }'.
-node_modules/chrome-devtools-frontend/front_end/common/Color.js(673,35): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Original: string; Nickname: string; HEX: string; ShortHEX: string; HEXA: string; ShortHEXA: string; RGB: string; RGBA: string; HSL: string; HSLA: string; }'.
-node_modules/chrome-devtools-frontend/front_end/common/Color.js(683,35): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Original: string; Nickname: string; HEX: string; ShortHEX: string; HEXA: string; ShortHEXA: string; RGB: string; RGBA: string; HSL: string; HSLA: string; }'.
-node_modules/chrome-devtools-frontend/front_end/common/Color.js(693,35): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Original: string; Nickname: string; HEX: string; ShortHEX: string; HEXA: string; ShortHEXA: string; RGB: string; RGBA: string; HSL: string; HSLA: string; }'.
 node_modules/chrome-devtools-frontend/front_end/common/Color.js(934,23): error TS2339: Property 'hashCode' does not exist on type 'StringConstructor'.
 node_modules/chrome-devtools-frontend/front_end/common/Color.js(935,45): error TS2345: Argument of type 'number | { min: number; max: number; }' is not assignable to parameter of type 'number | { min: number; max: number; count: number; }'.
   Type '{ min: number; max: number; }' is not assignable to type 'number | { min: number; max: number; count: number; }'.
     Property 'count' is missing in type '{ min: number; max: number; }' but required in type '{ min: number; max: number; count: number; }'.
-node_modules/chrome-devtools-frontend/front_end/common/Console.js(21,42): error TS2345: Argument of type 'string | { Info: string; Warning: string; Error: string; }' is not assignable to parameter of type '{ Info: string; Warning: string; Error: string; }'.
-  Type 'string' is not assignable to type '{ Info: string; Warning: string; Error: string; }'.
-node_modules/chrome-devtools-frontend/front_end/common/Console.js(30,27): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Info: string; Warning: string; Error: string; }'.
-node_modules/chrome-devtools-frontend/front_end/common/Console.js(37,27): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Info: string; Warning: string; Error: string; }'.
-node_modules/chrome-devtools-frontend/front_end/common/Console.js(44,27): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Info: string; Warning: string; Error: string; }'.
 node_modules/chrome-devtools-frontend/front_end/common/ContentProvider.js(37,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/common/ContentProvider.js(42,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/common/ContentProvider.js(47,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/common/ContentProvider.js(52,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/common/ContentProvider.js(60,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
-node_modules/chrome-devtools-frontend/front_end/common/ModuleExtensionInterfaces.js(12,31): error TS2694: Namespace 'Common.Renderer' has no exported member 'Options'.
 node_modules/chrome-devtools-frontend/front_end/common/ModuleExtensionInterfaces.js(13,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
-node_modules/chrome-devtools-frontend/front_end/common/ModuleExtensionInterfaces.js(20,29): error TS2694: Namespace 'Common.Renderer' has no exported member 'Options'.
-node_modules/chrome-devtools-frontend/front_end/common/ModuleExtensionInterfaces.js(40,17): error TS2300: Duplicate identifier 'Options'.
-node_modules/chrome-devtools-frontend/front_end/common/ModuleExtensionInterfaces.js(40,17): error TS2339: Property 'Options' does not exist on type 'typeof Renderer'.
+node_modules/chrome-devtools-frontend/front_end/common/ModuleExtensionInterfaces.js(34,36): error TS2345: Argument of type '{ title: string | Element; expanded: boolean; editable: boolean; } | {}' is not assignable to parameter of type '{ title: string | Element; expanded: boolean; editable: boolean; }'.
+  Type '{}' is missing the following properties from type '{ title: string | Element; expanded: boolean; editable: boolean; }': title, expanded, editable
 node_modules/chrome-devtools-frontend/front_end/common/ModuleExtensionInterfaces.js(81,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/common/ModuleExtensionInterfaces.js(105,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
-node_modules/chrome-devtools-frontend/front_end/common/Object.js(32,52): error TS2694: Namespace 'Common.Object' has no exported member '_listenerCallbackTuple'.
 node_modules/chrome-devtools-frontend/front_end/common/Object.js(39,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/common/Object.js(39,31): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/common/Object.js(41,35): error TS2694: Namespace 'Common.EventTarget' has no exported member 'EventDescriptor'.
 node_modules/chrome-devtools-frontend/front_end/common/Object.js(73,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/common/Object.js(73,31): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/common/Object.js(109,36): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/common/Object.js(119,8): error TS2300: Duplicate identifier 'Event'.
 node_modules/chrome-devtools-frontend/front_end/common/Object.js(122,59): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/common/Object.js(122,76): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/common/Object.js(124,15): error TS2339: Property '_listenerCallbackTuple' does not exist on type 'typeof Object'.
 node_modules/chrome-devtools-frontend/front_end/common/Object.js(132,112): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/common/Object.js(132,129): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/common/Object.js(134,20): error TS2339: Property 'EventDescriptor' does not exist on type 'typeof EventTarget'.
-node_modules/chrome-devtools-frontend/front_end/common/Object.js(137,39): error TS2694: Namespace 'Common.EventTarget' has no exported member 'EventDescriptor'.
-node_modules/chrome-devtools-frontend/front_end/common/Object.js(153,35): error TS2694: Namespace 'Common.EventTarget' has no exported member 'EventDescriptor'.
+node_modules/chrome-devtools-frontend/front_end/common/Object.js(153,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/common/Object.js(159,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/common/Object.js(172,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/common/OutputStream.js(13,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
@@ -3801,18 +3592,10 @@ node_modules/chrome-devtools-frontend/front_end/common/ParsedURL.js(215,29): err
 node_modules/chrome-devtools-frontend/front_end/common/ParsedURL.js(318,49): error TS2554: Expected 0 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/common/ParsedURL.js(375,18): error TS2339: Property 'asParsedURL' does not exist on type 'String'.
 node_modules/chrome-devtools-frontend/front_end/common/SegmentedRange.js(48,37): error TS2339: Property 'lowerBound' does not exist on type 'Segment[]'.
-node_modules/chrome-devtools-frontend/front_end/common/Settings.js(74,92): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ Global: symbol; Local: symbol; Session: symbol; }'.
-node_modules/chrome-devtools-frontend/front_end/common/Settings.js(75,75): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ Global: symbol; Local: symbol; Session: symbol; }'.
-node_modules/chrome-devtools-frontend/front_end/common/Settings.js(125,50): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ Global: symbol; Local: symbol; Session: symbol; }'.
-node_modules/chrome-devtools-frontend/front_end/common/Settings.js(158,12): error TS2678: Type 'symbol' is not comparable to type '{ Global: symbol; Local: symbol; Session: symbol; }'.
-node_modules/chrome-devtools-frontend/front_end/common/Settings.js(160,12): error TS2678: Type 'symbol' is not comparable to type '{ Global: symbol; Local: symbol; Session: symbol; }'.
-node_modules/chrome-devtools-frontend/front_end/common/Settings.js(162,12): error TS2678: Type 'symbol' is not comparable to type '{ Global: symbol; Local: symbol; Session: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/common/Settings.js(227,10): error TS2554: Expected 1 arguments, but got 0.
 node_modules/chrome-devtools-frontend/front_end/common/Settings.js(273,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/common/Settings.js(273,31): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/common/Settings.js(277,41): error TS2345: Argument of type 'string' is not assignable to parameter of type 'symbol'.
 node_modules/chrome-devtools-frontend/front_end/common/Settings.js(281,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/common/Settings.js(281,31): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/common/Settings.js(285,44): error TS2345: Argument of type 'string' is not assignable to parameter of type 'symbol'.
 node_modules/chrome-devtools-frontend/front_end/common/Settings.js(350,49): error TS2345: Argument of type 'string' is not assignable to parameter of type 'symbol'.
 node_modules/chrome-devtools-frontend/front_end/common/Settings.js(424,22): error TS2741: Property 'disabled' is missing in type '{ pattern: string; }' but required in type '{ pattern: string; disabled: boolean; }'.
@@ -3823,9 +3606,8 @@ node_modules/chrome-devtools-frontend/front_end/common/Settings.js(542,18): erro
 node_modules/chrome-devtools-frontend/front_end/common/Throttler.js(97,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/common/Throttler.js(102,5): error TS2322: Type 'Timeout' is not assignable to type 'number'.
 node_modules/chrome-devtools-frontend/front_end/common/Throttler.js(113,15): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/common/Throttler.js(114,18): error TS2339: Property 'FinishCallback' does not exist on type 'typeof Throttler'.
 node_modules/chrome-devtools-frontend/front_end/common/UIString.js(32,1): error TS2322: Type 'typeof Common | {}' is not assignable to type 'typeof Common'.
-  Type '{}' is missing the following properties from type 'typeof Common': Object, EventTarget, ParsedURL, ResourceType, and 38 more.
+  Type '{}' is missing the following properties from type 'typeof Common': Object, EventTarget, Event, ParsedURL, and 39 more.
 node_modules/chrome-devtools-frontend/front_end/common/UIString.js(40,17): error TS2339: Property 'vsprintf' does not exist on type 'StringConstructor'.
 node_modules/chrome-devtools-frontend/front_end/common/UIString.js(62,36): error TS2339: Property 'tokenizeFormatString' does not exist on type 'StringConstructor'.
 node_modules/chrome-devtools-frontend/front_end/common/UIString.js(62,87): error TS2339: Property 'standardFormatters' does not exist on type 'StringConstructor'.
@@ -3838,20 +3620,16 @@ node_modules/chrome-devtools-frontend/front_end/common/Worker.js(89,15): error T
 node_modules/chrome-devtools-frontend/front_end/components/DOMBreakpointsSidebarPane.js(39,45): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/components/DOMBreakpointsSidebarPane.js(40,46): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/components/DOMBreakpointsSidebarPane.js(41,45): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/components/DOMBreakpointsSidebarPane.js(43,96): error TS2694: Namespace 'Components.DOMBreakpointsSidebarPane' has no exported member 'Item'.
 node_modules/chrome-devtools-frontend/front_end/components/DOMBreakpointsSidebarPane.js(75,38): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/components/DOMBreakpointsSidebarPane.js(78,16): error TS2339: Property 'sprintf' does not exist on type 'StringConstructor'.
 node_modules/chrome-devtools-frontend/front_end/components/DOMBreakpointsSidebarPane.js(80,37): error TS2339: Property 'createChild' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/components/DOMBreakpointsSidebarPane.js(98,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/components/DOMBreakpointsSidebarPane.js(105,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/components/DOMBreakpointsSidebarPane.js(115,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
+node_modules/chrome-devtools-frontend/front_end/components/DOMBreakpointsSidebarPane.js(111,21): error TS2339: Property 'checked' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/components/DOMBreakpointsSidebarPane.js(148,19): error TS2339: Property 'classList' does not exist on type 'Node'.
 node_modules/chrome-devtools-frontend/front_end/components/DOMBreakpointsSidebarPane.js(149,19): error TS2339: Property 'style' does not exist on type 'Node'.
 node_modules/chrome-devtools-frontend/front_end/components/DOMBreakpointsSidebarPane.js(157,13): error TS2339: Property '_item' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/components/DOMBreakpointsSidebarPane.js(177,52): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/components/DOMBreakpointsSidebarPane.js(180,52): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/components/DOMBreakpointsSidebarPane.js(234,38): error TS2300: Duplicate identifier 'Item'.
-node_modules/chrome-devtools-frontend/front_end/components/DOMBreakpointsSidebarPane.js(234,38): error TS2339: Property 'Item' does not exist on type 'typeof DOMBreakpointsSidebarPane'.
+node_modules/chrome-devtools-frontend/front_end/components/DOMBreakpointsSidebarPane.js(193,79): error TS2339: Property 'checked' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/components/DOMBreakpointsSidebarPane.js(237,68): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/components/DOMBreakpointsSidebarPane.js(238,70): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/components/DOMBreakpointsSidebarPane.js(239,64): error TS2555: Expected at least 2 arguments, but got 1.
@@ -3895,15 +3673,22 @@ node_modules/chrome-devtools-frontend/front_end/components/DockController.js(70,
 node_modules/chrome-devtools-frontend/front_end/components/DockController.js(70,83): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/components/DockController.js(71,14): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/components/DockController.js(116,33): error TS2339: Property 'deepActiveElement' does not exist on type 'Document'.
-node_modules/chrome-devtools-frontend/front_end/components/Linkifier.js(62,24): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/components/Linkifier.js(125,94): error TS2339: Property 'remove' does not exist on type 'Map<Target, LiveLocationPool>'.
 node_modules/chrome-devtools-frontend/front_end/components/Linkifier.js(127,41): error TS2339: Property 'remove' does not exist on type 'Map<Target, Element[]>'.
+node_modules/chrome-devtools-frontend/front_end/components/Linkifier.js(133,37): error TS2339: Property 'href' does not exist on type 'Element'.
+node_modules/chrome-devtools-frontend/front_end/components/Linkifier.js(134,38): error TS2339: Property 'title' does not exist on type 'Element'.
+node_modules/chrome-devtools-frontend/front_end/components/Linkifier.js(156,11): error TS2345: Argument of type '{ className: string; lineNumber: number; columnNumber: number; maxLength: number; }' is not assignable to parameter of type '{ text: string; className: string; lineNumber: number; columnNumber: number; preventClick: boolean; maxLength: number; }'.
+  Type '{ className: string; lineNumber: number; columnNumber: number; maxLength: number; }' is missing the following properties from type '{ text: string; className: string; lineNumber: number; columnNumber: number; preventClick: boolean; maxLength: number; }': text, preventClick
+node_modules/chrome-devtools-frontend/front_end/components/Linkifier.js(197,13): error TS2345: Argument of type '{ className: string; lineNumber: number; columnNumber: number; maxLength: number; }' is not assignable to parameter of type '{ text: string; className: string; lineNumber: number; columnNumber: number; preventClick: boolean; maxLength: number; }'.
+  Type '{ className: string; lineNumber: number; columnNumber: number; maxLength: number; }' is missing the following properties from type '{ text: string; className: string; lineNumber: number; columnNumber: number; preventClick: boolean; maxLength: number; }': text, preventClick
 node_modules/chrome-devtools-frontend/front_end/components/Linkifier.js(214,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/components/Linkifier.js(225,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
+node_modules/chrome-devtools-frontend/front_end/components/Linkifier.js(233,72): error TS2345: Argument of type '{ className: string; lineNumber: any; columnNumber: any; maxLength: number; }' is not assignable to parameter of type '{ text: string; className: string; lineNumber: number; columnNumber: number; preventClick: boolean; maxLength: number; }'.
+  Type '{ className: string; lineNumber: any; columnNumber: any; maxLength: number; }' is missing the following properties from type '{ text: string; className: string; lineNumber: number; columnNumber: number; preventClick: boolean; maxLength: number; }': text, preventClick
 node_modules/chrome-devtools-frontend/front_end/components/Linkifier.js(279,46): error TS2339: Property 'keysArray' does not exist on type 'Map<Target, Element[]>'.
 node_modules/chrome-devtools-frontend/front_end/components/Linkifier.js(286,46): error TS2339: Property 'keysArray' does not exist on type 'Map<Target, Element[]>'.
 node_modules/chrome-devtools-frontend/front_end/components/Linkifier.js(309,12): error TS2339: Property 'title' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/components/Linkifier.js(335,27): error TS2694: Namespace 'Components' has no exported member 'LinkifyURLOptions'.
+node_modules/chrome-devtools-frontend/front_end/components/Linkifier.js(339,5): error TS2740: Type '{}' is missing the following properties from type '{ text: string; className: string; lineNumber: number; columnNumber: number; preventClick: boolean; maxLength: number; }': text, className, lineNumber, columnNumber, and 2 more.
 node_modules/chrome-devtools-frontend/front_end/components/Linkifier.js(348,51): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/components/Linkifier.js(390,12): error TS2339: Property 'title' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/components/Linkifier.js(392,12): error TS2339: Property 'href' does not exist on type 'Element'.
@@ -3911,15 +3696,12 @@ node_modules/chrome-devtools-frontend/front_end/components/Linkifier.js(418,10):
 node_modules/chrome-devtools-frontend/front_end/components/Linkifier.js(432,31): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/components/Linkifier.js(443,16): error TS2339: Property 'createTextChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/components/Linkifier.js(445,16): error TS2339: Property 'createTextChild' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/components/Linkifier.js(481,27): error TS2694: Namespace 'Components' has no exported member '_LinkInfo'.
-node_modules/chrome-devtools-frontend/front_end/components/Linkifier.js(484,35): error TS2694: Namespace 'Components' has no exported member '_LinkInfo'.
 node_modules/chrome-devtools-frontend/front_end/components/Linkifier.js(492,11): error TS2339: Property 'consume' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/components/Linkifier.js(493,71): error TS2339: Property 'hasSelection' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/components/Linkifier.js(504,31): error TS2339: Property '_linkHandlerSettingInstance' does not exist on type 'typeof Linkifier'.
 node_modules/chrome-devtools-frontend/front_end/components/Linkifier.js(505,28): error TS2339: Property '_linkHandlerSettingInstance' does not exist on type 'typeof Linkifier'.
 node_modules/chrome-devtools-frontend/front_end/components/Linkifier.js(506,67): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/components/Linkifier.js(508,33): error TS2339: Property '_linkHandlerSettingInstance' does not exist on type 'typeof Linkifier'.
-node_modules/chrome-devtools-frontend/front_end/components/Linkifier.js(513,36): error TS2694: Namespace 'Components.Linkifier' has no exported member 'LinkHandler'.
 node_modules/chrome-devtools-frontend/front_end/components/Linkifier.js(564,9): error TS2322: Type '({ section: string; title: any; handler: () => void; } | { section: string; title: string; handler: any; })[]' is not assignable to type '{ title: string; handler: () => any; }[]'.
   Type '{ section: string; title: any; handler: () => void; } | { section: string; title: string; handler: any; }' is not assignable to type '{ title: string; handler: () => any; }'.
     Type '{ section: string; title: any; handler: () => void; }' is not assignable to type '{ title: string; handler: () => any; }'.
@@ -3929,14 +3711,12 @@ node_modules/chrome-devtools-frontend/front_end/components/Linkifier.js(572,23):
 node_modules/chrome-devtools-frontend/front_end/components/Linkifier.js(580,23): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/components/Linkifier.js(587,23): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/components/Linkifier.js(664,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/components/Linkifier.js(666,22): error TS2551: Property 'LinkHandler' does not exist on type 'typeof Linkifier'. Did you mean '_linkHandlers'?
-node_modules/chrome-devtools-frontend/front_end/components/Linkifier.js(668,47): error TS2694: Namespace 'Components.Linkifier' has no exported member 'LinkHandler'.
 node_modules/chrome-devtools-frontend/front_end/components/Linkifier.js(675,1): error TS8022: JSDoc '@extends' is not attached to a class.
 node_modules/chrome-devtools-frontend/front_end/components/Linkifier.js(680,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/components/Linkifier.js(703,31): error TS2339: Property 'parentNodeOrShadowHost' does not exist on type 'Node'.
 node_modules/chrome-devtools-frontend/front_end/components/Linkifier.js(707,34): error TS2339: Property 'section' does not exist on type '{ title: string; handler: () => any; }'.
 node_modules/chrome-devtools-frontend/front_end/components/Linkifier.js(723,19): error TS2339: Property 'removeChildren' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/components/Linkifier.js(724,52): error TS2339: Property 'keysArray' does not exist on type 'Map<string, any>'.
+node_modules/chrome-devtools-frontend/front_end/components/Linkifier.js(724,52): error TS2339: Property 'keysArray' does not exist on type 'Map<string, (arg0: { contentURL(): string; contentType(): ResourceType; contentEncoded(): Promise<boolean>; requestContent(): Promise<string>; searchInContent(query: string, caseSensitive: boolean, isRegex: boolean): Promise<...>; }, arg1: number) => any>'.
 node_modules/chrome-devtools-frontend/front_end/components/Linkifier.js(725,26): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/components/Linkifier.js(729,14): error TS2339: Property 'selected' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/components/Linkifier.js(732,19): error TS2339: Property 'disabled' does not exist on type 'Element'.
@@ -3949,10 +3729,6 @@ node_modules/chrome-devtools-frontend/front_end/console/ConsoleContextSelector.j
       Type '(runtimeModel: RuntimeModel) => void' is not assignable to type '(model: T) => void'.
         Types of parameters 'runtimeModel' and 'model' are incompatible.
           Type 'T' is not assignable to type 'RuntimeModel'.
-node_modules/chrome-devtools-frontend/front_end/console/ConsoleContextSelector.js(162,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/console/ConsoleContextSelector.js(170,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/console/ConsoleContextSelector.js(192,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/console/ConsoleContextSelector.js(200,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleContextSelector.js(255,28): error TS2339: Property 'createChild' does not exist on type 'DocumentFragment'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleContextSelector.js(256,55): error TS2554: Expected 0 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleContextSelector.js(257,31): error TS2339: Property 'createChild' does not exist on type 'DocumentFragment'.
@@ -3960,10 +3736,7 @@ node_modules/chrome-devtools-frontend/front_end/console/ConsoleContextSelector.j
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleContextSelector.js(279,21): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleContextSelector.js(281,41): error TS2339: Property 'asParsedURL' does not exist on type 'string'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleContextSelector.js(290,21): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/console/ConsoleContextSelector.js(323,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/console/ConsoleContextSelector.js(336,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleFilter.js(5,9): error TS2339: Property 'ConsoleFilter' does not exist on type '{ new (): Console; prototype: Console; }'.
-node_modules/chrome-devtools-frontend/front_end/console/ConsoleFilter.js(8,45): error TS2694: Namespace 'TextUtils.FilterParser' has no exported member 'ParsedFilter'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleFilter.js(16,45): error TS2339: Property 'ConsoleFilter' does not exist on type '{ new (): Console; prototype: Console; }'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleFilter.js(26,5): error TS2322: Type '{}' is not assignable to type '{ [x: string]: boolean; }'.
   Index signature is missing in type '{}'.
@@ -3971,12 +3744,9 @@ node_modules/chrome-devtools-frontend/front_end/console/ConsoleFilter.js(33,26):
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleFilter.js(45,5): error TS2322: Type '{}' is not assignable to type '{ [x: string]: boolean; }'.
   Index signature is missing in type '{}'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleFilter.js(54,24): error TS2339: Property 'ConsoleFilter' does not exist on type '{ new (): Console; prototype: Console; }'.
-node_modules/chrome-devtools-frontend/front_end/console/ConsoleFilter.js(72,47): error TS2352: Conversion of type '{ Verbose: string; Info: string; Warning: string; Error: string; }' to type 'string' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleFilter.js(83,24): error TS2339: Property 'ConsoleFilter' does not exist on type '{ new (): Console; prototype: Console; }'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleFilter.js(87,24): error TS2339: Property 'ConsoleFilter' does not exist on type '{ new (): Console; prototype: Console; }'.
-node_modules/chrome-devtools-frontend/front_end/console/ConsoleFilter.js(90,25): error TS2352: Conversion of type 'string' to type '{ XML: string; JS: string; Network: string; ConsoleAPI: string; Storage: string; AppCache: string; Rendering: string; CSS: string; Security: string; Deprecation: string; Worker: string; Violation: string; Intervention: string; Recommendation: string; Other: string; }' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleFilter.js(95,24): error TS2339: Property 'ConsoleFilter' does not exist on type '{ new (): Console; prototype: Console; }'.
-node_modules/chrome-devtools-frontend/front_end/console/ConsoleFilter.js(105,40): error TS2694: Namespace 'TextUtils.FilterParser' has no exported member 'ParsedFilter'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleFilter.js(127,9): error TS2339: Property 'ConsoleFilter' does not exist on type '{ new (): Console; prototype: Console; }'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsolePanel.js(32,9): error TS2339: Property 'ConsolePanel' does not exist on type '{ new (): Console; prototype: Console; }'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsolePanel.js(35,26): error TS2339: Property 'ConsoleView' does not exist on type '{ new (): Console; prototype: Console; }'.
@@ -3994,6 +3764,8 @@ node_modules/chrome-devtools-frontend/front_end/console/ConsolePanel.js(123,31):
 node_modules/chrome-devtools-frontend/front_end/console/ConsolePrompt.js(7,9): error TS2339: Property 'ConsolePrompt' does not exist on type '{ new (): Console; prototype: Console; }'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsolePrompt.js(11,33): error TS2339: Property 'ConsoleHistoryManager' does not exist on type '{ new (): Console; prototype: Console; }'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsolePrompt.js(16,18): error TS2339: Property 'tabIndex' does not exist on type 'Element'.
+node_modules/chrome-devtools-frontend/front_end/console/ConsolePrompt.js(26,32): error TS2345: Argument of type '{ lineNumbers: false; lineWrapping: true; mimeType: string; autoHeight: true; }' is not assignable to parameter of type '{ bracketMatchingSetting: Setting<any>; lineNumbers: boolean; lineWrapping: boolean; mimeType: string; autoHeight: boolean; padBottom: boolean; maxHighlightLength: number; placeholder: string; }'.
+  Type '{ lineNumbers: false; lineWrapping: true; mimeType: string; autoHeight: true; }' is missing the following properties from type '{ bracketMatchingSetting: Setting<any>; lineNumbers: boolean; lineWrapping: boolean; mimeType: string; autoHeight: boolean; padBottom: boolean; maxHighlightLength: number; placeholder: string; }': bracketMatchingSetting, padBottom, maxHighlightLength, placeholder
 node_modules/chrome-devtools-frontend/front_end/console/ConsolePrompt.js(41,20): error TS2339: Property 'tabIndex' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsolePrompt.js(48,43): error TS2339: Property 'ConsolePrompt' does not exist on type '{ new (): Console; prototype: Console; }'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsolePrompt.js(83,43): error TS2339: Property 'ConsolePrompt' does not exist on type '{ new (): Console; prototype: Console; }'.
@@ -4001,10 +3773,9 @@ node_modules/chrome-devtools-frontend/front_end/console/ConsolePrompt.js(137,25)
 node_modules/chrome-devtools-frontend/front_end/console/ConsolePrompt.js(143,19): error TS2339: Property 'consume' does not exist on type 'KeyboardEvent'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsolePrompt.js(159,11): error TS2339: Property 'consume' does not exist on type 'KeyboardEvent'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsolePrompt.js(206,19): error TS2339: Property 'ConsolePanel' does not exist on type '{ new (): Console; prototype: Console; }'.
-node_modules/chrome-devtools-frontend/front_end/console/ConsolePrompt.js(207,38): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; TimelineStarted: number; ProfilesCPUProfileTaken: number; ProfilesHeapProfileTaken: number; AuditsStarted: number; ... 23 more ...; ShowedThirdPartyBadges: number; }'.
-node_modules/chrome-devtools-frontend/front_end/console/ConsolePrompt.js(217,30): error TS2694: Namespace 'UI.SuggestBox' has no exported member 'Suggestions'.
+node_modules/chrome-devtools-frontend/front_end/console/ConsolePrompt.js(236,5): error TS2322: Type '{ text: any; iconType: string; isSecondary: boolean; }[]' is not assignable to type '{ text: string; subtitle: string; iconType: string; priority: number; isSecondary: boolean; title: string; }[]'.
+  Type '{ text: any; iconType: string; isSecondary: boolean; }' is missing the following properties from type '{ text: string; subtitle: string; iconType: string; priority: number; isSecondary: boolean; title: string; }': subtitle, priority, title
 node_modules/chrome-devtools-frontend/front_end/console/ConsolePrompt.js(246,20): error TS2339: Property 'focus' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/console/ConsolePrompt.js(272,39): error TS2694: Namespace 'UI.SuggestBox' has no exported member 'Suggestions'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsolePrompt.js(300,9): error TS2339: Property 'ConsoleHistoryManager' does not exist on type '{ new (): Console; prototype: Console; }'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsolePrompt.js(387,9): error TS2339: Property 'ConsolePrompt' does not exist on type '{ new (): Console; prototype: Console; }'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleSidebar.js(5,9): error TS2339: Property 'ConsoleSidebar' does not exist on type '{ new (): Console; prototype: Console; }'.
@@ -4012,6 +3783,8 @@ node_modules/chrome-devtools-frontend/front_end/console/ConsoleSidebar.js(26,20)
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleSidebar.js(31,17): error TS2339: Property 'ConsoleSidebar' does not exist on type '{ new (): Console; prototype: Console; }'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleSidebar.js(31,68): error TS2339: Property 'ConsoleFilter' does not exist on type '{ new (): Console; prototype: Console; }'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleSidebar.js(34,17): error TS2339: Property 'ConsoleSidebar' does not exist on type '{ new (): Console; prototype: Console; }'.
+node_modules/chrome-devtools-frontend/front_end/console/ConsoleSidebar.js(34,63): error TS2345: Argument of type '{ key: any; text: any; negative: boolean; }[]' is not assignable to parameter of type '{ key: string; text: string; regex: RegExp; negative: boolean; }[]'.
+  Property 'regex' is missing in type '{ key: any; text: any; negative: boolean; }' but required in type '{ key: string; text: string; regex: RegExp; negative: boolean; }'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleSidebar.js(35,17): error TS2339: Property 'ConsoleFilter' does not exist on type '{ new (): Console; prototype: Console; }'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleSidebar.js(38,17): error TS2339: Property 'ConsoleSidebar' does not exist on type '{ new (): Console; prototype: Console; }'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleSidebar.js(38,70): error TS2339: Property 'ConsoleFilter' does not exist on type '{ new (): Console; prototype: Console; }'.
@@ -4021,11 +3794,9 @@ node_modules/chrome-devtools-frontend/front_end/console/ConsoleSidebar.js(44,17)
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleSidebar.js(44,69): error TS2339: Property 'ConsoleFilter' does not exist on type '{ new (): Console; prototype: Console; }'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleSidebar.js(47,17): error TS2339: Property 'ConsoleSidebar' does not exist on type '{ new (): Console; prototype: Console; }'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleSidebar.js(47,72): error TS2339: Property 'ConsoleFilter' does not exist on type '{ new (): Console; prototype: Console; }'.
-node_modules/chrome-devtools-frontend/front_end/console/ConsoleSidebar.js(57,45): error TS2694: Namespace 'TextUtils.FilterParser' has no exported member 'ParsedFilter'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleSidebar.js(64,30): error TS2339: Property 'ConsoleFilter' does not exist on type '{ new (): Console; prototype: Console; }'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleSidebar.js(65,35): error TS2339: Property 'ConsoleSidebar' does not exist on type '{ new (): Console; prototype: Console; }'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleSidebar.js(94,38): error TS2339: Property '_filter' does not exist on type 'TreeElement'.
-node_modules/chrome-devtools-frontend/front_end/console/ConsoleSidebar.js(98,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleSidebar.js(102,43): error TS2339: Property 'ConsoleSidebar' does not exist on type '{ new (): Console; prototype: Console; }'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleSidebar.js(107,9): error TS2339: Property 'ConsoleSidebar' does not exist on type '{ new (): Console; prototype: Console; }'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleSidebar.js(111,9): error TS2339: Property 'ConsoleSidebar' does not exist on type '{ new (): Console; prototype: Console; }'.
@@ -4038,6 +3809,8 @@ node_modules/chrome-devtools-frontend/front_end/console/ConsoleSidebar.js(177,67
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleSidebar.js(179,61): error TS2339: Property 'ConsoleSidebar' does not exist on type '{ new (): Console; prototype: Console; }'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleSidebar.js(209,41): error TS2339: Property 'asParsedURL' does not exist on type 'string'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleSidebar.js(213,28): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/console/ConsoleSidebar.js(214,31): error TS2345: Argument of type '{ key: any; text: string; negative: false; }' is not assignable to parameter of type '{ key: string; text: string; regex: RegExp; negative: boolean; }'.
+  Property 'regex' is missing in type '{ key: any; text: string; negative: false; }' but required in type '{ key: string; text: string; regex: RegExp; negative: boolean; }'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleSidebar.js(214,45): error TS2339: Property 'ConsoleFilter' does not exist on type '{ new (): Console; prototype: Console; }'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleSidebar.js(216,25): error TS2339: Property 'ConsoleSidebar' does not exist on type '{ new (): Console; prototype: Console; }'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleSidebar.js(226,9): error TS2339: Property 'ConsoleSidebar' does not exist on type '{ new (): Console; prototype: Console; }'.
@@ -4065,7 +3838,6 @@ node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(42,48): e
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(45,33): error TS2339: Property 'ConsoleSidebar' does not exist on type '{ new (): Console; prototype: Console; }'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(46,44): error TS2339: Property 'ConsoleSidebar' does not exist on type '{ new (): Console; prototype: Console; }'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(48,32): error TS2339: Property 'ConsoleViewFilter' does not exist on type '{ new (): Console; prototype: Console; }'.
-node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(88,44): error TS2694: Namespace 'Console.ConsoleView' has no exported member 'RegexMatchRange'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(92,48): error TS2339: Property 'ConsoleContextSelector' does not exist on type '{ new (): Console; prototype: Console; }'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(98,74): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(102,94): error TS2555: Expected at least 2 arguments, but got 1.
@@ -4086,14 +3858,9 @@ node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(232,15):
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(232,51): error TS2339: Property 'ConsoleView' does not exist on type '{ new (): Console; prototype: Console; }'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(233,20): error TS2339: Property 'ConsoleView' does not exist on type '{ new (): Console; prototype: Console; }'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(241,76): error TS2339: Property 'ConsoleFilter' does not exist on type '{ new (): Console; prototype: Console; }'.
-node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(312,24): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(326,12): error TS2678: Type 'string' is not comparable to type '{ Info: string; Warning: string; Error: string; }'.
-node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(329,12): error TS2678: Type 'string' is not comparable to type '{ Info: string; Warning: string; Error: string; }'.
-node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(332,12): error TS2678: Type 'string' is not comparable to type '{ Info: string; Warning: string; Error: string; }'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(411,7): error TS2322: Type 'Promise<void>' is not assignable to type 'Promise<undefined>'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(419,5): error TS2322: Type 'Promise<void>' is not assignable to type 'Promise<undefined>'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(449,43): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(455,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(470,47): error TS2339: Property 'peekLast' does not exist on type 'ConsoleViewMessage[]'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(471,27): error TS2339: Property 'ConsoleView' does not exist on type '{ new (): Console; prototype: Console; }'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(472,45): error TS2339: Property 'ConsoleView' does not exist on type '{ new (): Console; prototype: Console; }'.
@@ -4101,7 +3868,6 @@ node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(474,27):
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(482,40): error TS2339: Property 'upperBound' does not exist on type 'ConsoleViewMessage[]'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(524,35): error TS2339: Property 'ConsoleView' does not exist on type '{ new (): Console; prototype: Console; }'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(525,32): error TS2339: Property 'ConsoleView' does not exist on type '{ new (): Console; prototype: Console; }'.
-node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(530,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(576,96): error TS2339: Property 'peekLast' does not exist on type 'ConsoleViewMessage[]'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(579,49): error TS2339: Property 'peekLast' does not exist on type 'ConsoleViewMessage[]'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(596,40): error TS2339: Property 'ConsoleGroup' does not exist on type '{ new (): Console; prototype: Console; }'.
@@ -4123,9 +3889,7 @@ node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(757,22):
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(763,20): error TS2339: Property 'window' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(769,30): error TS2339: Property 'ConsoleGroup' does not exist on type '{ new (): Console; prototype: Console; }'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(817,22): error TS2339: Property 'addAll' does not exist on type 'Set<ConsoleMessage>'.
-node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(825,35): error TS2345: Argument of type '{ Verbose: string; Info: string; Warning: string; Error: string; }' is not assignable to parameter of type 'string'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(834,72): error TS2339: Property 'peekLast' does not exist on type 'ConsoleViewMessage[]'.
-node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(840,33): error TS2345: Argument of type '{ Verbose: string; Info: string; Warning: string; Error: string; }' is not assignable to parameter of type 'string'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(857,37): error TS2339: Property 'enclosingNodeOrSelfWithClass' does not exist on type 'EventTarget'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(878,53): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(886,43): error TS2555: Expected at least 2 arguments, but got 1.
@@ -4135,7 +3899,6 @@ node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(896,41):
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(901,43): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(904,73): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(932,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
-node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(955,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(959,123): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(963,61): error TS2339: Property 'ConsoleView' does not exist on type '{ new (): Console; prototype: Console; }'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(1009,51): error TS2555: Expected at least 2 arguments, but got 1.
@@ -4156,16 +3919,29 @@ node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(1243,47):
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(1245,47): error TS2339: Property 'ConsoleFilter' does not exist on type '{ new (): Console; prototype: Console; }'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(1247,47): error TS2339: Property 'ConsoleFilter' does not exist on type '{ new (): Console; prototype: Console; }'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(1254,73): error TS2339: Property 'ConsoleFilter' does not exist on type '{ new (): Console; prototype: Console; }'.
+node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(1261,26): error TS2345: Argument of type '{ key: any; text: any; negative: true; }' is not assignable to parameter of type '{ key: string; text: string; regex: RegExp; negative: boolean; }'.
+  Property 'regex' is missing in type '{ key: any; text: any; negative: true; }' but required in type '{ key: string; text: string; regex: RegExp; negative: boolean; }'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(1262,22): error TS2339: Property 'ConsoleFilter' does not exist on type '{ new (): Console; prototype: Console; }'.
+node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(1269,26): error TS2345: Argument of type '{ key: any; text: any; negative: false; }' is not assignable to parameter of type '{ key: string; text: string; regex: RegExp; negative: boolean; }'.
+  Property 'regex' is missing in type '{ key: any; text: any; negative: false; }' but required in type '{ key: string; text: string; regex: RegExp; negative: boolean; }'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(1270,22): error TS2339: Property 'ConsoleFilter' does not exist on type '{ new (): Console; prototype: Console; }'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(1277,60): error TS2339: Property 'ConsoleFilter' does not exist on type '{ new (): Console; prototype: Console; }'.
+node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(1278,42): error TS2769: No overload matches this call.
+  Overload 1 of 2, '(...items: ConcatArray<{ key: string; text: string; regex: RegExp; negative: boolean; }>[]): { key: string; text: string; regex: RegExp; negative: boolean; }[]', gave the following error.
+    Argument of type '{ key: any; text: string; negative: boolean; }[]' is not assignable to parameter of type 'ConcatArray<{ key: string; text: string; regex: RegExp; negative: boolean; }>'.
+      Types of property 'slice' are incompatible.
+        Type '(start?: number, end?: number) => { key: any; text: string; negative: boolean; }[]' is not assignable to type '(start?: number, end?: number) => { key: string; text: string; regex: RegExp; negative: boolean; }[]'.
+          Type '{ key: any; text: string; negative: boolean; }[]' is not assignable to type '{ key: string; text: string; regex: RegExp; negative: boolean; }[]'.
+            Property 'regex' is missing in type '{ key: any; text: string; negative: boolean; }' but required in type '{ key: string; text: string; regex: RegExp; negative: boolean; }'.
+  Overload 2 of 2, '(...items: ({ key: string; text: string; regex: RegExp; negative: boolean; } | ConcatArray<{ key: string; text: string; regex: RegExp; negative: boolean; }>)[]): { key: string; text: string; regex: RegExp; negative: boolean; }[]', gave the following error.
+    Argument of type '{ key: any; text: string; negative: boolean; }[]' is not assignable to parameter of type '{ key: string; text: string; regex: RegExp; negative: boolean; } | ConcatArray<{ key: string; text: string; regex: RegExp; negative: boolean; }>'.
+      Type '{ key: any; text: string; negative: boolean; }[]' is not assignable to type 'ConcatArray<{ key: string; text: string; regex: RegExp; negative: boolean; }>'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(1294,28): error TS2339: Property 'ConsoleFilter' does not exist on type '{ new (): Console; prototype: Console; }'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(1295,32): error TS2339: Property 'ConsoleFilter' does not exist on type '{ new (): Console; prototype: Console; }'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(1303,30): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(1306,21): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(1308,21): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(1310,29): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(1315,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(1323,75): error TS2339: Property 'totalOffsetLeft' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(1324,39): error TS2339: Property 'totalOffsetTop' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleView.js(1324,88): error TS2339: Property 'offsetHeight' does not exist on type 'Element'.
@@ -4204,12 +3980,13 @@ node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(21
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(212,22): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(215,30): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(222,15): error TS2403: Subsequent variable declarations must have the same type.  Variable 'args' must be of type 'any[]', but here has type 'any[]'.
-node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(240,13): error TS2367: This condition will always return 'false' since the types '{ Verbose: string; Info: string; Warning: string; Error: string; }' and 'string' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(241,26): error TS2339: Property 'createTextChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(244,28): error TS2339: Property 'createTextChildren' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(244,60): error TS2339: Property 'localizedFailDescription' does not exist on type 'NetworkRequest'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(246,28): error TS2339: Property 'createTextChildren' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(249,34): error TS2339: Property 'ConsoleViewMessage' does not exist on type '{ new (): Console; prototype: Console; }'.
+node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(304,62): error TS2345: Argument of type '{ maxLength: any; }' is not assignable to parameter of type '{ text: string; className: string; lineNumber: number; columnNumber: number; preventClick: boolean; maxLength: number; }'.
+  Type '{ maxLength: any; }' is missing the following properties from type '{ text: string; className: string; lineNumber: number; columnNumber: number; preventClick: boolean; maxLength: number; }': text, className, lineNumber, columnNumber, preventClick
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(304,82): error TS2339: Property 'ConsoleViewMessage' does not exist on type '{ new (): Console; prototype: Console; }'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(311,28): error TS2339: Property 'createTextChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(332,23): error TS2551: Property '_url' does not exist on type 'ConsoleMessage'. Did you mean 'url'?
@@ -4220,7 +3997,6 @@ node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(39
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(402,19): error TS2339: Property '_expandStackTraceForTest' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(420,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(444,42): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
-node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(479,10): error TS2367: This condition will always return 'false' since the types '{ Verbose: string; Info: string; Warning: string; Error: string; }' and 'string' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(487,25): error TS2339: Property 'createTextChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(494,45): error TS2339: Property 'ConsoleViewMessage' does not exist on type '{ new (): Console; prototype: Console; }'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(498,25): error TS2339: Property 'createTextChild' does not exist on type 'Element'.
@@ -4251,32 +4027,17 @@ node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(87
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(877,19): error TS2339: Property 'format' does not exist on type 'StringConstructor'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(884,13): error TS2339: Property 'style' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(885,13): error TS2339: Property 'style' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(887,76): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ Unknown: number; Foreground: number; Background: number; Selection: number; }'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(888,13): error TS2339: Property 'style' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(891,9): error TS2367: This condition will always return 'false' since the types '{ Verbose: string; Info: string; Warning: string; Error: string; }' and 'string' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(893,14): error TS2367: This condition will always return 'false' since the types '{ Verbose: string; Info: string; Warning: string; Error: string; }' and 'string' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(895,81): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ Unknown: number; Foreground: number; Background: number; Selection: number; }'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(896,13): error TS2339: Property 'style' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(904,38): error TS2339: Property 'deepTextContent' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(913,38): error TS2339: Property 'deepTextContent' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(925,30): error TS2339: Property 'title' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(1025,10): error TS2367: This condition will always return 'false' since the types '{ Verbose: string; Info: string; Warning: string; Error: string; }' and 'string' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(1026,10): error TS2367: This condition will always return 'false' since the types '{ Verbose: string; Info: string; Warning: string; Error: string; }' and 'string' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(1057,19): error TS2339: Property 'removeChildren' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(1063,48): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(1069,52): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(1071,19): error TS2339: Property 'message' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(1074,12): error TS2678: Type 'string' is not comparable to type '{ Verbose: string; Info: string; Warning: string; Error: string; }'.
-node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(1078,12): error TS2678: Type 'string' is not comparable to type '{ Verbose: string; Info: string; Warning: string; Error: string; }'.
-node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(1081,12): error TS2678: Type 'string' is not comparable to type '{ Verbose: string; Info: string; Warning: string; Error: string; }'.
-node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(1085,12): error TS2678: Type 'string' is not comparable to type '{ Verbose: string; Info: string; Warning: string; Error: string; }'.
-node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(1102,13): error TS2367: This condition will always return 'false' since the types '{ Verbose: string; Info: string; Warning: string; Error: string; }' and 'string' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(1103,13): error TS2367: This condition will always return 'false' since the types '{ Verbose: string; Info: string; Warning: string; Error: string; }' and 'string' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(1162,14): error TS2678: Type 'string' is not comparable to type '{ Verbose: string; Info: string; Warning: string; Error: string; }'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(1163,36): error TS2339: Property 'type' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(1165,14): error TS2678: Type 'string' is not comparable to type '{ Verbose: string; Info: string; Warning: string; Error: string; }'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(1166,36): error TS2339: Property 'type' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(1168,14): error TS2678: Type 'string' is not comparable to type '{ Verbose: string; Info: string; Warning: string; Error: string; }'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(1169,36): error TS2339: Property 'type' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(1172,36): error TS2339: Property 'type' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(1175,34): error TS2339: Property 'type' does not exist on type 'Element'.
@@ -4297,6 +4058,8 @@ node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(13
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(1388,33): error TS2339: Property 'createChild' does not exist on type 'DocumentFragment'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(1389,44): error TS2554: Expected 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(1402,20): error TS2339: Property 'ConsoleViewMessage' does not exist on type '{ new (): Console; prototype: Console; }'.
+node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(1403,51): error TS2345: Argument of type '{ text: any; lineNumber: any; columnNumber: any; }' is not assignable to parameter of type '{ text: string; className: string; lineNumber: number; columnNumber: number; preventClick: boolean; maxLength: number; }'.
+  Type '{ text: any; lineNumber: any; columnNumber: any; }' is missing the following properties from type '{ text: string; className: string; lineNumber: number; columnNumber: number; preventClick: boolean; maxLength: number; }': className, preventClick, maxLength
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(1412,18): error TS2339: Property 'ConsoleViewMessage' does not exist on type '{ new (): Console; prototype: Console; }'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(1430,15): error TS2339: Property 'ConsoleViewMessage' does not exist on type '{ new (): Console; prototype: Console; }'.
 node_modules/chrome-devtools-frontend/front_end/console/ConsoleViewMessage.js(1431,15): error TS2339: Property 'ConsoleViewMessage' does not exist on type '{ new (): Console; prototype: Console; }'.
@@ -4422,44 +4185,19 @@ node_modules/chrome-devtools-frontend/front_end/console_counters/WarningErrorCou
 node_modules/chrome-devtools-frontend/front_end/console_counters/WarningErrorCounter.js(42,21): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/console_counters/WarningErrorCounter.js(58,5): error TS2322: Type 'number' is not assignable to type 'string'.
 node_modules/chrome-devtools-frontend/front_end/console_counters/WarningErrorCounter.js(84,19): error TS2339: Property 'title' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/console_model/ConsoleModel.js(143,34): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; TimelineStarted: number; ProfilesCPUProfileTaken: number; ProfilesHeapProfileTaken: number; AuditsStarted: number; ... 23 more ...; ShowedThirdPartyBadges: number; }'.
 node_modules/chrome-devtools-frontend/front_end/console_model/ConsoleModel.js(173,9): error TS2339: Property '_pageLoadSequenceNumber' does not exist on type 'ConsoleMessage'.
-node_modules/chrome-devtools-frontend/front_end/console_model/ConsoleModel.js(193,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/console_model/ConsoleModel.js(196,70): error TS2694: Namespace 'Protocol' has no exported member 'Log'.
-node_modules/chrome-devtools-frontend/front_end/console_model/ConsoleModel.js(207,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/console_model/ConsoleModel.js(210,63): error TS2694: Namespace 'SDK.RuntimeModel' has no exported member 'ExceptionWithTimestamp'.
-node_modules/chrome-devtools-frontend/front_end/console_model/ConsoleModel.js(219,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/console_model/ConsoleModel.js(228,5): error TS2322: Type 'string' is not assignable to type '{ Verbose: string; Info: string; Warning: string; Error: string; }'.
-node_modules/chrome-devtools-frontend/front_end/console_model/ConsoleModel.js(234,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/console_model/ConsoleModel.js(237,45): error TS2694: Namespace 'SDK.RuntimeModel' has no exported member 'ConsoleAPICall'.
-node_modules/chrome-devtools-frontend/front_end/console_model/ConsoleModel.js(269,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/console_model/ConsoleModel.js(286,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/console_model/ConsoleModel.js(295,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/console_model/ConsoleModel.js(298,49): error TS2694: Namespace 'SDK.CPUProfilerModel' has no exported member 'EventData'.
-node_modules/chrome-devtools-frontend/front_end/console_model/ConsoleModel.js(306,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/console_model/ConsoleModel.js(309,49): error TS2694: Namespace 'SDK.CPUProfilerModel' has no exported member 'EventData'.
-node_modules/chrome-devtools-frontend/front_end/console_model/ConsoleModel.js(337,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/console_model/ConsoleModel.js(340,50): error TS2694: Namespace 'SDK.NetworkManager' has no exported member 'Message'.
-node_modules/chrome-devtools-frontend/front_end/console_model/ConsoleModel.js(355,12): error TS2678: Type 'string' is not comparable to type '{ Verbose: string; Info: string; Warning: string; Error: string; }'.
-node_modules/chrome-devtools-frontend/front_end/console_model/ConsoleModel.js(358,12): error TS2678: Type 'string' is not comparable to type '{ Verbose: string; Info: string; Warning: string; Error: string; }'.
+node_modules/chrome-devtools-frontend/front_end/console_model/ConsoleModel.js(263,105): error TS2339: Property 'context' does not exist on type '{ type: string; args: any[]; executionContextId: number; timestamp: number; stackTrace: any; }'.
 node_modules/chrome-devtools-frontend/front_end/console_model/ConsoleModel.js(424,24): error TS2694: Namespace 'Protocol' has no exported member 'Network'.
 node_modules/chrome-devtools-frontend/front_end/console_model/ConsoleModel.js(425,32): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/console_model/ConsoleModel.js(426,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/console_model/ConsoleModel.js(428,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
-node_modules/chrome-devtools-frontend/front_end/console_model/ConsoleModel.js(438,22): error TS2352: Conversion of type 'string' to type '{ Verbose: string; Info: string; Warning: string; Error: string; }' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
 node_modules/chrome-devtools-frontend/front_end/console_model/ConsoleModel.js(448,26): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/console_model/ConsoleModel.js(481,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/console_model/ConsoleModel.js(514,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
-node_modules/chrome-devtools-frontend/front_end/console_model/ConsoleModel.js(556,9): error TS2367: This condition will always return 'false' since the types '{ Verbose: string; Info: string; Warning: string; Error: string; }' and 'string' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/console_model/ConsoleModel.js(557,9): error TS2367: This condition will always return 'false' since the types '{ Verbose: string; Info: string; Warning: string; Error: string; }' and 'string' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/console_model/ConsoleModel.js(564,30): error TS2367: This condition will always return 'false' since the types '{ Verbose: string; Info: string; Warning: string; Error: string; }' and 'string' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/console_model/ConsoleModel.js(578,54): error TS2339: Property '_pageLoadSequenceNumber' does not exist on type 'ConsoleMessage'.
 node_modules/chrome-devtools-frontend/front_end/console_model/ConsoleModel.js(615,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/console_model/ConsoleModel.js(616,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
-node_modules/chrome-devtools-frontend/front_end/console_model/ConsoleModel.js(696,1): error TS2322: Type 'Map<string, string>' is not assignable to type 'Map<{ XML: string; JS: string; Network: string; ConsoleAPI: string; Storage: string; AppCache: string; Rendering: string; CSS: string; Security: string; Deprecation: string; Worker: string; Violation: string; Intervention: string; Recommendation: string; Other: string; }, string>'.
-  Type 'string' is not assignable to type '{ XML: string; JS: string; Network: string; ConsoleAPI: string; Storage: string; AppCache: string; Rendering: string; CSS: string; Security: string; Deprecation: string; Worker: string; Violation: string; Intervention: string; Recommendation: string; Other: string; }'.
-node_modules/chrome-devtools-frontend/front_end/console_test_runner/ConsoleTestRunner.js(16,31): error TS2694: Namespace 'ConsoleTestRunner' has no exported member 'Formatter'.
-node_modules/chrome-devtools-frontend/front_end/console_test_runner/ConsoleTestRunner.js(26,31): error TS2694: Namespace 'ConsoleTestRunner' has no exported member 'Formatter'.
 node_modules/chrome-devtools-frontend/front_end/console_test_runner/ConsoleTestRunner.js(33,29): error TS2339: Property 'ConsoleView' does not exist on type '{ new (): Console; prototype: Console; }'.
 node_modules/chrome-devtools-frontend/front_end/console_test_runner/ConsoleTestRunner.js(73,36): error TS2339: Property 'deepTextContent' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/console_test_runner/ConsoleTestRunner.js(96,13): error TS2339: Property 'ConsoleView' does not exist on type '{ new (): Console; prototype: Console; }'.
@@ -4467,7 +4205,6 @@ node_modules/chrome-devtools-frontend/front_end/console_test_runner/ConsoleTestR
 node_modules/chrome-devtools-frontend/front_end/console_test_runner/ConsoleTestRunner.js(170,29): error TS2339: Property 'ConsoleView' does not exist on type '{ new (): Console; prototype: Console; }'.
 node_modules/chrome-devtools-frontend/front_end/console_test_runner/ConsoleTestRunner.js(191,33): error TS2339: Property 'ConsoleView' does not exist on type '{ new (): Console; prototype: Console; }'.
 node_modules/chrome-devtools-frontend/front_end/console_test_runner/ConsoleTestRunner.js(216,29): error TS2339: Property 'ConsoleView' does not exist on type '{ new (): Console; prototype: Console; }'.
-node_modules/chrome-devtools-frontend/front_end/console_test_runner/ConsoleTestRunner.js(259,31): error TS2694: Namespace 'ConsoleTestRunner' has no exported member 'Formatter'.
 node_modules/chrome-devtools-frontend/front_end/console_test_runner/ConsoleTestRunner.js(269,30): error TS2339: Property 'ConsoleView' does not exist on type '{ new (): Console; prototype: Console; }'.
 node_modules/chrome-devtools-frontend/front_end/console_test_runner/ConsoleTestRunner.js(285,30): error TS2339: Property 'ConsoleView' does not exist on type '{ new (): Console; prototype: Console; }'.
 node_modules/chrome-devtools-frontend/front_end/console_test_runner/ConsoleTestRunner.js(298,30): error TS2339: Property 'ConsoleView' does not exist on type '{ new (): Console; prototype: Console; }'.
@@ -4486,7 +4223,6 @@ node_modules/chrome-devtools-frontend/front_end/console_test_runner/ConsoleTestR
 node_modules/chrome-devtools-frontend/front_end/console_test_runner/ConsoleTestRunner.js(524,51): error TS2339: Property 'traverseNextTextNode' does not exist on type 'Node'.
 node_modules/chrome-devtools-frontend/front_end/console_test_runner/ConsoleTestRunner.js(528,25): error TS2339: Property 'traverseNextTextNode' does not exist on type 'Node'.
 node_modules/chrome-devtools-frontend/front_end/console_test_runner/ConsoleTestRunner.js(563,30): error TS2339: Property 'ConsoleView' does not exist on type '{ new (): Console; prototype: Console; }'.
-node_modules/chrome-devtools-frontend/front_end/cookie_table/CookiesTable.js(50,56): error TS2694: Namespace 'DataGrid.DataGrid' has no exported member 'ColumnDescriptor'.
 node_modules/chrome-devtools-frontend/front_end/cookie_table/CookiesTable.js(53,23): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/cookie_table/CookiesTable.js(61,35): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/cookie_table/CookiesTable.js(62,36): error TS2555: Expected at least 2 arguments, but got 1.
@@ -4499,7 +4235,6 @@ node_modules/chrome-devtools-frontend/front_end/cookie_table/CookiesTable.js(81,
 node_modules/chrome-devtools-frontend/front_end/cookie_table/CookiesTable.js(116,28): error TS2741: Property 'folderName' is missing in type '{ cookies: Cookie[]; }' but required in type '{ folderName: string; cookies: Cookie[]; }'.
 node_modules/chrome-devtools-frontend/front_end/cookie_table/CookiesTable.js(320,33): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
 node_modules/chrome-devtools-frontend/front_end/cookie_table/CookiesTable.js(320,52): error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
-node_modules/chrome-devtools-frontend/front_end/cookie_table/CookiesTable.js(345,9): error TS2367: This condition will always return 'false' since the types '{ Request: number; Response: number; }' and 'number' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/cookie_table/CookiesTable.js(346,28): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/cookie_table/CookiesTable.js(347,26): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/cookie_table/CookiesTable.js(348,29): error TS2555: Expected at least 2 arguments, but got 1.
@@ -4514,17 +4249,13 @@ node_modules/chrome-devtools-frontend/front_end/cookie_table/CookiesTable.js(470
 node_modules/chrome-devtools-frontend/front_end/cookie_table/CookiesTable.js(489,56): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageDecorationManager.js(50,72): error TS2345: Argument of type '{ contentURL(): string; contentType(): ResourceType; contentEncoded(): Promise<boolean>; requestContent(): Promise<string>; searchInContent(query: string, caseSensitive: boolean, isRegex: boolean): Promise<...>; }' is not assignable to parameter of type 'K'.
   '{ contentURL(): string; contentType(): ResourceType; contentEncoded(): Promise<boolean>; requestContent(): Promise<string>; searchInContent(query: string, caseSensitive: boolean, isRegex: boolean): Promise<...>; }' is assignable to the constraint of type 'K', but 'K' could be instantiated with a different subtype of constraint '{}'.
-node_modules/chrome-devtools-frontend/front_end/coverage/CoverageDecorationManager.js(115,72): error TS2345: Argument of type 'UISourceCode' is not assignable to parameter of type 'V'.
-  'UISourceCode' is assignable to the constraint of type 'V', but 'V' could be instantiated with a different subtype of constraint '{}'.
-node_modules/chrome-devtools-frontend/front_end/coverage/CoverageDecorationManager.js(135,32): error TS2694: Namespace 'Coverage' has no exported member 'RawLocation'.
+node_modules/chrome-devtools-frontend/front_end/coverage/CoverageDecorationManager.js(115,49): error TS2345: Argument of type '{ contentURL(): string; contentType(): ResourceType; contentEncoded(): Promise<boolean>; requestContent(): Promise<string>; searchInContent(query: string, caseSensitive: boolean, isRegex: boolean): Promise<...>; }' is not assignable to parameter of type 'K'.
+  '{ contentURL(): string; contentType(): ResourceType; contentEncoded(): Promise<boolean>; requestContent(): Promise<string>; searchInContent(query: string, caseSensitive: boolean, isRegex: boolean): Promise<...>; }' is assignable to the constraint of type 'K', but 'K' could be instantiated with a different subtype of constraint '{}'.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageDecorationManager.js(169,16): error TS2403: Subsequent variable declarations must have the same type.  Variable 'location' must be of type 'Location', but here has type 'CSSLocation'.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageDecorationManager.js(170,31): error TS2339: Property 'header' does not exist on type 'Location'.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageDecorationManager.js(179,31): error TS2339: Property 'styleSheetId' does not exist on type 'Location'.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageDecorationManager.js(180,37): error TS2339: Property 'header' does not exist on type 'Location'.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageDecorationManager.js(225,21): error TS2339: Property 'upperBound' does not exist on type 'CSSStyleSheetHeader[]'.
-node_modules/chrome-devtools-frontend/front_end/coverage/CoverageDecorationManager.js(247,24): error TS2694: Namespace 'Coverage' has no exported member 'RawLocation'.
-node_modules/chrome-devtools-frontend/front_end/coverage/CoverageDecorationManager.js(248,24): error TS2694: Namespace 'Coverage' has no exported member 'RawLocation'.
-node_modules/chrome-devtools-frontend/front_end/coverage/CoverageDecorationManager.js(255,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageDecorationManager.js(258,34): error TS1110: Type expected.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageDecorationManager.js(277,18): error TS2339: Property 'uninstallGutter' does not exist on type 'CodeMirrorTextEditor'.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageDecorationManager.js(293,16): error TS2339: Property 'uninstallGutter' does not exist on type 'CodeMirrorTextEditor'.
@@ -4534,17 +4265,15 @@ node_modules/chrome-devtools-frontend/front_end/coverage/CoverageListView.js(18,
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageListView.js(19,34): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageListView.js(21,23): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageListView.js(29,23): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/coverage/CoverageListView.js(39,36): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Nearest: string; First: string; Last: string; }'.
+node_modules/chrome-devtools-frontend/front_end/coverage/CoverageListView.js(38,52): error TS2345: Argument of type '({ id: string; title: any; width: string; fixedWidth: boolean; sortable: boolean; align?: undefined; sort?: undefined; } | { id: string; title: any; width: string; fixedWidth: boolean; sortable: boolean; align: any; sort?: undefined; } | { ...; })[]' is not assignable to parameter of type '{ id: string; title: string; titleDOMFragment: DocumentFragment; sortable: boolean; sort: string; align: string; fixedWidth: boolean; editable: boolean; nonSelectable: boolean; longText: boolean; disclosure: boolean; weight: number; }[]'.
+  Type '{ id: string; title: any; width: string; fixedWidth: boolean; sortable: boolean; align?: undefined; sort?: undefined; } | { id: string; title: any; width: string; fixedWidth: boolean; sortable: boolean; align: any; sort?: undefined; } | { ...; }' is not assignable to type '{ id: string; title: string; titleDOMFragment: DocumentFragment; sortable: boolean; sort: string; align: string; fixedWidth: boolean; editable: boolean; nonSelectable: boolean; longText: boolean; disclosure: boolean; weight: number; }'.
+    Type '{ id: string; title: any; width: string; fixedWidth: boolean; sortable: boolean; align?: undefined; sort?: undefined; }' is missing the following properties from type '{ id: string; title: string; titleDOMFragment: DocumentFragment; sortable: boolean; sort: string; align: string; fixedWidth: boolean; editable: boolean; nonSelectable: boolean; longText: boolean; disclosure: boolean; weight: number; }': titleDOMFragment, editable, nonSelectable, longText, and 2 more.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageListView.js(112,11): error TS2339: Property 'consume' does not exist on type 'Event'.
-node_modules/chrome-devtools-frontend/front_end/coverage/CoverageListView.js(205,9): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageListView.js(206,25): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/coverage/CoverageListView.js(207,9): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageListView.js(208,25): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/coverage/CoverageListView.js(209,14): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageListView.js(210,25): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageListView.js(264,14): error TS2339: Property 'title' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageListView.js(265,26): error TS2339: Property 'createChild' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/coverage/CoverageListView.js(276,13): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageListView.js(277,16): error TS2339: Property 'title' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageListView.js(277,31): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageListView.js(280,35): error TS2339: Property 'withThousandsSeparator' does not exist on type 'NumberConstructor'.
@@ -4553,33 +4282,18 @@ node_modules/chrome-devtools-frontend/front_end/coverage/CoverageListView.js(285
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageListView.js(286,45): error TS2339: Property 'withThousandsSeparator' does not exist on type 'NumberConstructor'.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageListView.js(290,33): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(34,42): error TS2694: Namespace 'Protocol' has no exported member 'Profiler'.
-node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(100,11): error TS2367: This condition will always return 'true' since the types '{ CSS: number; JavaScript: number; JavaScriptCoarse: number; }' and 'number' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(131,31): error TS2694: Namespace 'Protocol' has no exported member 'Profiler'.
-node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(152,115): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ CSS: number; JavaScript: number; JavaScriptCoarse: number; }'.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(170,31): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
-node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(175,64): error TS2694: Namespace 'Coverage' has no exported member 'RangeUseCount'.
-node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(190,48): error TS2694: Namespace 'Coverage' has no exported member 'RangeUseCount'.
-node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(191,11): error TS2403: Subsequent variable declarations must have the same type.  Variable 'entry' must be of type '[CSSStyleSheetHeader, any[]]', but here has type 'CoverageInfo'.
-node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(193,19): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ CSS: number; JavaScript: number; JavaScriptCoarse: number; }'.
-node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(197,5): error TS2322: Type '[CSSStyleSheetHeader, any[]][]' is not assignable to type 'CoverageInfo[]'.
-  Type '[CSSStyleSheetHeader, any[]]' is not assignable to type 'CoverageInfo'.
-node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(201,31): error TS2694: Namespace 'Coverage' has no exported member 'RangeUseCount'.
-node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(202,32): error TS2694: Namespace 'Coverage' has no exported member 'CoverageSegment'.
-node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(210,23): error TS2339: Property 'peekLast' does not exist on type 'any[]'.
-node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(214,21): error TS2339: Property 'peekLast' does not exist on type 'any[]'.
+node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(191,11): error TS2403: Subsequent variable declarations must have the same type.  Variable 'entry' must be of type '[CSSStyleSheetHeader, { startOffset: number; endOffset: number; count: number; }[]]', but here has type 'CoverageInfo'.
+node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(197,5): error TS2322: Type '[CSSStyleSheetHeader, { startOffset: number; endOffset: number; count: number; }[]][]' is not assignable to type 'CoverageInfo[]'.
+  Type '[CSSStyleSheetHeader, { startOffset: number; endOffset: number; count: number; }[]]' is not assignable to type 'CoverageInfo'.
+node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(210,23): error TS2339: Property 'peekLast' does not exist on type '{ startOffset: number; endOffset: number; count: number; }[]'.
+node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(214,21): error TS2339: Property 'peekLast' does not exist on type '{ startOffset: number; endOffset: number; count: number; }[]'.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(230,25): error TS2339: Property 'peekLast' does not exist on type 'any[]'.
-node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(250,31): error TS2694: Namespace 'Coverage' has no exported member 'RangeUseCount'.
-node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(267,37): error TS2339: Property 'peekLast' does not exist on type 'any[]'.
-node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(347,10): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
-node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(349,5): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
-node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(349,19): error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
-node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(352,7): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
-node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(352,30): error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
-node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(356,10): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
-node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(405,31): error TS2694: Namespace 'Coverage' has no exported member 'CoverageSegment'.
-node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(427,31): error TS2694: Namespace 'Coverage' has no exported member 'CoverageSegment'.
-node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(428,31): error TS2694: Namespace 'Coverage' has no exported member 'CoverageSegment'.
-node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(441,25): error TS2339: Property 'peekLast' does not exist on type '{ end: number; count: any; }[]'.
+node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(267,37): error TS2339: Property 'peekLast' does not exist on type '{ end: number; count: number; }[]'.
+node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(268,21): error TS2345: Argument of type '{ end: number; }' is not assignable to parameter of type '{ end: number; count: number; }'.
+  Property 'count' is missing in type '{ end: number; }' but required in type '{ end: number; count: number; }'.
+node_modules/chrome-devtools-frontend/front_end/coverage/CoverageModel.js(441,25): error TS2339: Property 'peekLast' does not exist on type '{ end: number; count: number; }[]'.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageView.js(20,48): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageView.js(32,53): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageView.js(40,52): error TS2555: Expected at least 2 arguments, but got 1.
@@ -4587,7 +4301,6 @@ node_modules/chrome-devtools-frontend/front_end/coverage/CoverageView.js(49,49):
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageView.js(50,16): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageView.js(53,56): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageView.js(57,54): error TS2339: Property 'createChild' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/coverage/CoverageView.js(118,34): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; TimelineStarted: number; ProfilesCPUProfileTaken: number; ProfilesHeapProfileTaken: number; AuditsStarted: number; ... 23 more ...; ShowedThirdPartyBadges: number; }'.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageView.js(141,5): error TS2322: Type 'Timeout' is not assignable to type 'number'.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageView.js(187,55): error TS2339: Property 'bytesToString' does not exist on type 'NumberConstructor'.
 node_modules/chrome-devtools-frontend/front_end/coverage/CoverageView.js(187,85): error TS2339: Property 'bytesToString' does not exist on type 'NumberConstructor'.
@@ -4595,14 +4308,10 @@ node_modules/chrome-devtools-frontend/front_end/coverage/CoverageView.js(231,59)
 node_modules/chrome-devtools-frontend/front_end/cpu_profiler_test_runner/ProfilerTestRunner.js(12,35): error TS2339: Property 'js_profiler' does not exist on type 'any[]'.
 node_modules/chrome-devtools-frontend/front_end/cpu_profiler_test_runner/ProfilerTestRunner.js(49,15): error TS2339: Property 'js_profiler' does not exist on type 'any[]'.
 node_modules/chrome-devtools-frontend/front_end/cpu_profiler_test_runner/ProfilerTestRunner.js(54,33): error TS2339: Property 'js_profiler' does not exist on type 'any[]'.
-node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(32,41): error TS2694: Namespace 'DataGrid.DataGrid' has no exported member 'ColumnDescriptor'.
 node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(41,18): error TS2339: Property 'tabIndex' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(49,40): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(55,42): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(57,45): error TS2339: Property 'createChild' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(69,43): error TS2694: Namespace 'DataGrid.DataGrid' has no exported member 'ColumnDescriptor'.
-node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(71,52): error TS2694: Namespace 'DataGrid.DataGrid' has no exported member 'ColumnDescriptor'.
-node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(73,43): error TS2694: Namespace 'DataGrid.DataGrid' has no exported member 'ColumnDescriptor'.
 node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(82,54): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(84,47): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(86,45): error TS2339: Property 'createChild' does not exist on type 'Element'.
@@ -4612,15 +4321,12 @@ node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(96,45): er
 node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(98,48): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(109,26): error TS2352: Conversion of type 'DataGridNode<any>' to type 'NODE_TYPE' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
   'DataGridNode<any>' is assignable to the constraint of type 'NODE_TYPE', but 'NODE_TYPE' could be instantiated with a different subtype of constraint '{}'.
-node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(119,5): error TS2322: Type 'string' is not assignable to type '{ Nearest: string; First: string; Last: string; }'.
 node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(121,17): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(123,17): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(134,45): error TS2554: Expected 0 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(135,15): error TS2339: Property 'title' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(139,15): error TS2339: Property 'title' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(159,33): error TS2694: Namespace 'DataGrid.DataGrid' has no exported member 'ColumnDescriptor'.
 node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(196,12): error TS2339: Property 'createChild' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(202,33): error TS2694: Namespace 'DataGrid.DataGrid' has no exported member 'ColumnDescriptor'.
 node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(240,34): error TS2339: Property 'removeChildren' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(241,32): error TS2339: Property 'removeChildren' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(242,21): error TS2339: Property 'removeChildren' does not exist on type 'Element'.
@@ -4628,6 +4334,9 @@ node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(243,24): e
 node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(244,27): error TS2339: Property 'removeChildren' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(249,55): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(250,51): error TS2339: Property 'createChild' does not exist on type 'Element'.
+node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(251,18): error TS2339: Property 'width' does not exist on type '{ id: string; title: string; titleDOMFragment: DocumentFragment; sortable: boolean; sort: string; align: string; fixedWidth: boolean; editable: boolean; nonSelectable: boolean; longText: boolean; disclosure: boolean; weight: number; }'.
+node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(252,43): error TS2339: Property 'width' does not exist on type '{ id: string; title: string; titleDOMFragment: DocumentFragment; sortable: boolean; sort: string; align: string; fixedWidth: boolean; editable: boolean; nonSelectable: boolean; longText: boolean; disclosure: boolean; weight: number; }'.
+node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(253,41): error TS2339: Property 'width' does not exist on type '{ id: string; title: string; titleDOMFragment: DocumentFragment; sortable: boolean; sort: string; align: string; fixedWidth: boolean; editable: boolean; nonSelectable: boolean; longText: boolean; disclosure: boolean; weight: number; }'.
 node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(256,26): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(257,29): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(260,21): error TS2339: Property 'createChild' does not exist on type 'Element'.
@@ -4754,8 +4463,6 @@ node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(1105,27):
 node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(1105,50): error TS2339: Property 'totalOffsetLeft' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(1106,47): error TS2339: Property 'rows' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(1110,33): error TS2339: Property '__index' does not exist on type 'EventTarget'.
-node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(1116,9): error TS2367: This condition will always return 'false' since the types '{ Nearest: string; First: string; Last: string; }' and 'string' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(1118,16): error TS2367: This condition will always return 'false' since the types '{ Nearest: string; First: string; Last: string; }' and 'string' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(1132,24): error TS2339: Property 'constrain' does not exist on type 'NumberConstructor'.
 node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(1135,13): error TS2339: Property '__position' does not exist on type 'EventTarget'.
 node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(1136,13): error TS2339: Property 'style' does not exist on type 'EventTarget'.
@@ -4764,7 +4471,6 @@ node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(1162,54):
 node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(1170,23): error TS2339: Property 'offsetWidth' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(1175,40): error TS2339: Property '__position' does not exist on type 'Element | { __index: number; __position: number; }'.
   Property '__position' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(1214,19): error TS2339: Property 'ColumnDescriptor' does not exist on type 'typeof DataGrid'.
 node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(1324,19): error TS2339: Property '_dataGridNode' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(1334,14): error TS2551: Property 'dirty' does not exist on type 'DataGridNode<NODE_TYPE>'. Did you mean '_dirty'?
 node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(1336,14): error TS2551: Property 'inactive' does not exist on type 'DataGridNode<NODE_TYPE>'. Did you mean '_inactive'?
@@ -4847,13 +4553,13 @@ node_modules/chrome-devtools-frontend/front_end/data_grid/DataGrid.js(2008,1): e
 node_modules/chrome-devtools-frontend/front_end/data_grid/ShowMoreDataGridNode.js(36,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/data_grid/ShowMoreDataGridNode.js(109,14): error TS2339: Property 'style' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/data_grid/SortableDataGrid.js(9,1): error TS8022: JSDoc '@extends' is not attached to a class.
-node_modules/chrome-devtools-frontend/front_end/data_grid/SortableDataGrid.js(11,40): error TS2694: Namespace 'DataGrid.DataGrid' has no exported member 'ColumnDescriptor'.
 node_modules/chrome-devtools-frontend/front_end/data_grid/SortableDataGrid.js(19,5): error TS2322: Type '(a: SortableDataGridNode<any>, b: SortableDataGridNode<any>) => number' is not assignable to type '(arg0: NODE_TYPE, arg1: NODE_TYPE) => number'.
   Types of parameters 'a' and 'arg0' are incompatible.
     Type 'NODE_TYPE' is not assignable to type 'SortableDataGridNode<any>'.
 node_modules/chrome-devtools-frontend/front_end/data_grid/SortableDataGrid.js(20,80): error TS2345: Argument of type 'SortableDataGridNode<NODE_TYPE>' is not assignable to parameter of type 'NODE_TYPE'.
   'SortableDataGridNode<NODE_TYPE>' is assignable to the constraint of type 'NODE_TYPE', but 'NODE_TYPE' could be instantiated with a different subtype of constraint '{}'.
-node_modules/chrome-devtools-frontend/front_end/data_grid/SortableDataGrid.js(82,56): error TS2694: Namespace 'DataGrid.DataGrid' has no exported member 'ColumnDescriptor'.
+node_modules/chrome-devtools-frontend/front_end/data_grid/SortableDataGrid.js(84,59): error TS2345: Argument of type '{ id: string; title: string; width: number; sortable: true; }' is not assignable to parameter of type '{ id: string; title: string; titleDOMFragment: DocumentFragment; sortable: boolean; sort: string; align: string; fixedWidth: boolean; editable: boolean; nonSelectable: boolean; longText: boolean; disclosure: boolean; weight: number; }'.
+  Object literal may only specify known properties, and 'width' does not exist in type '{ id: string; title: string; titleDOMFragment: DocumentFragment; sortable: boolean; sort: string; align: string; fixedWidth: boolean; editable: boolean; nonSelectable: boolean; longText: boolean; disclosure: boolean; weight: number; }'.
 node_modules/chrome-devtools-frontend/front_end/data_grid/SortableDataGrid.js(131,20): error TS2352: Conversion of type 'NODE_TYPE' to type 'SortableDataGridNode<NODE_TYPE>' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
 node_modules/chrome-devtools-frontend/front_end/data_grid/SortableDataGrid.js(141,21): error TS2339: Property 'recalculateSiblings' does not exist on type 'NODE_TYPE'.
 node_modules/chrome-devtools-frontend/front_end/data_grid/SortableDataGrid.js(142,21): error TS2339: Property '_sortChildren' does not exist on type 'NODE_TYPE'.
@@ -4864,13 +4570,6 @@ node_modules/chrome-devtools-frontend/front_end/data_grid/SortableDataGrid.js(16
 node_modules/chrome-devtools-frontend/front_end/data_grid/SortableDataGrid.js(171,24): error TS2339: Property 'recalculateSiblings' does not exist on type 'NODE_TYPE'.
 node_modules/chrome-devtools-frontend/front_end/data_grid/SortableDataGrid.js(173,13): error TS2339: Property '_sortChildren' does not exist on type 'NODE_TYPE'.
 node_modules/chrome-devtools-frontend/front_end/data_grid/ViewportDataGrid.js(9,1): error TS8022: JSDoc '@extends' is not attached to a class.
-node_modules/chrome-devtools-frontend/front_end/data_grid/ViewportDataGrid.js(9,29): error TS2417: Class static side 'typeof ViewportDataGrid' incorrectly extends base class static side 'typeof DataGrid'.
-  Types of property 'Events' are incompatible.
-    Type '{ ViewportCalculated: symbol; }' is missing the following properties from type '{ SelectedNode: symbol; DeselectedNode: symbol; OpenedNode: symbol; SortingChanged: symbol; PaddingChanged: symbol; }': SelectedNode, DeselectedNode, OpenedNode, SortingChanged, PaddingChanged
-node_modules/chrome-devtools-frontend/front_end/data_grid/ViewportDataGrid.js(9,29): error TS2417: Class static side 'typeof ViewportDataGrid' incorrectly extends base class static side 'typeof DataGrid'.
-  Types of property 'Events' are incompatible.
-    Type '{ ViewportCalculated: symbol; }' is not assignable to type '{ SelectedNode: symbol; DeselectedNode: symbol; OpenedNode: symbol; SortingChanged: symbol; PaddingChanged: symbol; }'.
-node_modules/chrome-devtools-frontend/front_end/data_grid/ViewportDataGrid.js(11,41): error TS2694: Namespace 'DataGrid.DataGrid' has no exported member 'ColumnDescriptor'.
 node_modules/chrome-devtools-frontend/front_end/data_grid/ViewportDataGrid.js(32,22): error TS2345: Argument of type 'ViewportDataGridNode<any>' is not assignable to parameter of type 'NODE_TYPE'.
   'ViewportDataGridNode<any>' is assignable to the constraint of type 'NODE_TYPE', but 'NODE_TYPE' could be instantiated with a different subtype of constraint '{}'.
 node_modules/chrome-devtools-frontend/front_end/data_grid/ViewportDataGrid.js(43,41): error TS2339: Property 'flatChildren' does not exist on type 'NODE_TYPE'.
@@ -4914,7 +4613,6 @@ node_modules/chrome-devtools-frontend/front_end/data_grid/ViewportDataGrid.js(47
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(11,36): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(13,77): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(19,50): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(25,28): error TS2694: Namespace 'Adb' has no exported member 'Device'.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(36,47): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(38,62): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(41,16): error TS2555: Expected at least 2 arguments, but got 1.
@@ -4923,8 +4621,6 @@ node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(54,25): e
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(62,30): error TS2339: Property '_instanceObject' does not exist on type 'typeof DevicesView'.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(63,27): error TS2339: Property '_instanceObject' does not exist on type 'typeof DevicesView'.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(64,32): error TS2339: Property '_instanceObject' does not exist on type 'typeof DevicesView'.
-node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(87,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(91,33): error TS2694: Namespace 'Adb' has no exported member 'Device'.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(96,34): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(107,28): error TS2339: Property 'remove' does not exist on type 'Map<string, Element>'.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(108,24): error TS2339: Property 'remove' does not exist on type 'Map<string, DeviceView>'.
@@ -4936,10 +4632,6 @@ node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(147,14):
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(147,32): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(148,14): error TS2339: Property '_status' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(148,33): error TS2339: Property 'createChild' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(153,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(156,34): error TS2694: Namespace 'Adb' has no exported member 'Config'.
-node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(161,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(164,34): error TS2694: Namespace 'Adb' has no exported member 'PortForwardingStatus'.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(179,16): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(180,45): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(211,25): error TS2339: Property 'createChild' does not exist on type 'Element'.
@@ -4948,57 +4640,44 @@ node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(214,69):
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(223,29): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(224,51): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(227,16): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(229,21): error TS2694: Namespace 'Adb' has no exported member 'Config'.
-node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(250,19): error TS2694: Namespace 'Adb' has no exported member 'Config'.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(265,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(265,44): error TS2694: Namespace 'Adb' has no exported member 'PortForwardingRule'.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(272,45): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(273,72): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(279,45): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(280,67): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(283,95): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(285,36): error TS2694: Namespace 'Adb' has no exported member 'PortForwardingRule'.
+node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(286,36): error TS2345: Argument of type 'this' is not assignable to parameter of type '{ renderItem(item: T, editable: boolean): Element; removeItemRequested(item: T, index: number): void; beginEdit(item: T): Editor<T>; commitEdit(item: T, editor: Editor<T>, isNew: boolean): void; }'.
+  Type 'PortForwardingView' is not assignable to type '{ renderItem(item: T, editable: boolean): Element; removeItemRequested(item: T, index: number): void; beginEdit(item: T): Editor<T>; commitEdit(item: T, editor: Editor<T>, isNew: boolean): void; }'.
+    Types of property 'renderItem' are incompatible.
+      Type '(rule: { port: string; address: string; }, editable: boolean) => Element' is not assignable to type '(item: T, editable: boolean) => Element'.
+        Types of parameters 'rule' and 'item' are incompatible.
+          Type 'T' is not assignable to type '{ port: string; address: string; }'.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(290,38): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(293,43): error TS2694: Namespace 'Adb' has no exported member 'PortForwardingRule'.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(297,36): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(299,28): error TS2694: Namespace 'Adb' has no exported member 'PortForwardingRule'.
-node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(313,19): error TS2694: Namespace 'Adb' has no exported member 'PortForwardingConfig'.
-node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(320,34): error TS2694: Namespace 'Adb' has no exported member 'PortForwardingRule'.
-node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(328,19): error TS2694: Namespace 'Adb' has no exported member 'PortForwardingRule'.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(334,24): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(335,69): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(337,13): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(338,13): error TS2339: Property 'createChild' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(344,19): error TS2694: Namespace 'Adb' has no exported member 'PortForwardingRule'.
-node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(355,19): error TS2694: Namespace 'Adb' has no exported member 'PortForwardingRule'.
-node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(369,19): error TS2694: Namespace 'Adb' has no exported member 'PortForwardingRule'.
-node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(380,42): error TS2694: Namespace 'Adb' has no exported member 'PortForwardingRule'.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(389,26): error TS2339: Property 'createChild' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(398,21): error TS2694: Namespace 'Adb' has no exported member 'PortForwardingRule'.
-node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(420,21): error TS2694: Namespace 'Adb' has no exported member 'PortForwardingRule'.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(441,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(441,37): error TS2694: Namespace 'Adb' has no exported member 'NetworkDiscoveryConfig'.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(449,47): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(450,74): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(458,47): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(461,18): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(463,33): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(466,71): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(469,36): error TS2694: Namespace 'Adb' has no exported member 'PortForwardingRule'.
+node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(470,36): error TS2345: Argument of type 'this' is not assignable to parameter of type '{ renderItem(item: T, editable: boolean): Element; removeItemRequested(item: T, index: number): void; beginEdit(item: T): Editor<T>; commitEdit(item: T, editor: Editor<T>, isNew: boolean): void; }'.
+  Type 'NetworkDiscoveryView' is not assignable to type '{ renderItem(item: T, editable: boolean): Element; removeItemRequested(item: T, index: number): void; beginEdit(item: T): Editor<T>; commitEdit(item: T, editor: Editor<T>, isNew: boolean): void; }'.
+    Types of property 'renderItem' are incompatible.
+      Type '(rule: { port: string; address: string; }, editable: boolean) => Element' is not assignable to type '(item: T, editable: boolean) => Element'.
+        Types of parameters 'rule' and 'item' are incompatible.
+          Type 'T' is not assignable to type '{ port: string; address: string; }'.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(475,31): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(475,77): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(478,43): error TS2694: Namespace 'Adb' has no exported member 'PortForwardingRule'.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(482,31): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(482,67): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(507,19): error TS2694: Namespace 'Adb' has no exported member 'NetworkDiscoveryConfig'.
-node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(531,19): error TS2694: Namespace 'Adb' has no exported member 'PortForwardingRule'.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(537,13): error TS2339: Property 'createChild' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(543,19): error TS2694: Namespace 'Adb' has no exported member 'PortForwardingRule'.
-node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(554,19): error TS2694: Namespace 'Adb' has no exported member 'PortForwardingRule'.
-node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(567,19): error TS2694: Namespace 'Adb' has no exported member 'PortForwardingRule'.
-node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(577,42): error TS2694: Namespace 'Adb' has no exported member 'PortForwardingRule'.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(586,26): error TS2339: Property 'createChild' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(592,21): error TS2694: Namespace 'Adb' has no exported member 'PortForwardingRule'.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(613,38): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(616,44): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(618,47): error TS2339: Property 'createChild' does not exist on type 'Element'.
@@ -5006,11 +4685,7 @@ node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(620,16):
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(622,44): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(623,43): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(625,42): error TS2339: Property 'createChild' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(627,50): error TS2694: Namespace 'Devices.DevicesView' has no exported member 'BrowserSection'.
-node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(632,21): error TS2694: Namespace 'Adb' has no exported member 'Device'.
-node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(637,19): error TS2694: Namespace 'Adb' has no exported member 'Device'.
-node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(657,27): error TS2339: Property 'remove' does not exist on type 'Map<string, any>'.
-node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(675,36): error TS2694: Namespace 'Devices.DevicesView' has no exported member 'BrowserSection'.
+node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(657,27): error TS2339: Property 'remove' does not exist on type 'Map<string, { browser: { id: string; adbBrowserChromeVersion: string; compatibleVersion: boolean; adbBrowserName: string; source: string; adbBrowserVersion: string; pages: { id: string; name: string; url: string; attached: boolean; }[]; }; ... 5 more ...; pageSections: Map<...>; }>'.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(679,26): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(682,29): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(683,59): error TS2555: Expected at least 2 arguments, but got 1.
@@ -5025,48 +4700,33 @@ node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(723,17):
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(724,15): error TS2339: Property 'consume' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(731,78): error TS2339: Property 'value' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(732,21): error TS2339: Property 'value' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(738,35): error TS2694: Namespace 'Devices.DevicesView' has no exported member 'BrowserSection'.
-node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(739,19): error TS2694: Namespace 'Adb' has no exported member 'Browser'.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(745,44): error TS2339: Property 'sprintf' does not exist on type 'StringConstructor'.
-node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(783,36): error TS2694: Namespace 'Devices.DevicesView' has no exported member 'PageSection'.
+node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(757,30): error TS2339: Property 'remove' does not exist on type 'Map<string, { page: { id: string; name: string; url: string; attached: boolean; }; element: Element; title: Element; url: Element; inspect: Element; }>'.
+node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(776,15): error TS2339: Property 'classList' does not exist on type 'ChildNode'.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(788,28): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(790,46): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(797,23): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(805,54): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(806,54): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(807,54): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(820,35): error TS2694: Namespace 'Devices.DevicesView' has no exported member 'PageSection'.
-node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(821,19): error TS2694: Namespace 'Adb' has no exported member 'Page'.
-node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(838,19): error TS2694: Namespace 'Adb' has no exported member 'DevicePortForwardingStatus'.
+node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(826,21): error TS2339: Property 'title' does not exist on type 'Element'.
+node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(832,21): error TS2339: Property 'disabled' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(847,89): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(890,31): error TS2694: Namespace 'Adb' has no exported member 'Browser'.
-node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(890,179): error TS2694: Namespace 'Devices.DevicesView' has no exported member 'PageSection'.
-node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(891,21): error TS2339: Property 'BrowserSection' does not exist on type 'typeof DevicesView'.
-node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(893,28): error TS2694: Namespace 'Adb' has no exported member 'Page'.
-node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(894,21): error TS2339: Property 'PageSection' does not exist on type 'typeof DevicesView'.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(903,41): error TS2339: Property 'createChild' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(911,21): error TS2694: Namespace 'Adb' has no exported member 'Config'.
 node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(914,25): error TS2339: Property 'tabIndex' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(930,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/devices/DevicesView.js(933,36): error TS2694: Namespace 'Adb' has no exported member 'Config'.
 node_modules/chrome-devtools-frontend/front_end/devtools_compatibility.js(20,34): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/devtools_compatibility.js(39,17): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/devtools_compatibility.js(56,63): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/devtools_compatibility.js(110,21): error TS2694: Namespace 'Adb' has no exported member 'Config'.
-node_modules/chrome-devtools-frontend/front_end/devtools_compatibility.js(117,21): error TS2694: Namespace 'Adb' has no exported member 'PortForwardingStatus'.
-node_modules/chrome-devtools-frontend/front_end/devtools_compatibility.js(124,29): error TS2694: Namespace 'Adb' has no exported member 'Device'.
 node_modules/chrome-devtools-frontend/front_end/devtools_compatibility.js(224,13): error TS2339: Property 'keyIdentifier' does not exist on type '{ type: string; key: string; code: string; keyCode: number; modifiers: number; }'.
 node_modules/chrome-devtools-frontend/front_end/devtools_compatibility.js(313,10): error TS2339: Property 'DevToolsAPI' does not exist on type 'Window & typeof globalThis'.
 node_modules/chrome-devtools-frontend/front_end/devtools_compatibility.js(371,18): error TS2339: Property 'DevToolsAPI' does not exist on type 'Window & typeof globalThis'.
 node_modules/chrome-devtools-frontend/front_end/devtools_compatibility.js(392,16): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/devtools_compatibility.js(419,16): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/devtools_compatibility.js(419,51): error TS2694: Namespace 'InspectorFrontendHostAPI' has no exported member 'LoadNetworkResourceResult'.
 node_modules/chrome-devtools-frontend/front_end/devtools_compatibility.js(423,71): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/devtools_compatibility.js(428,16): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/devtools_compatibility.js(431,74): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
+node_modules/chrome-devtools-frontend/front_end/devtools_compatibility.js(574,17): error TS2304: Cannot find name 'FileSystem'.
 node_modules/chrome-devtools-frontend/front_end/devtools_compatibility.js(662,16): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/devtools_compatibility.js(692,21): error TS2694: Namespace 'Adb' has no exported member 'Config'.
-node_modules/chrome-devtools-frontend/front_end/devtools_compatibility.js(741,50): error TS2694: Namespace 'InspectorFrontendHostAPI' has no exported member 'ContextMenuDescriptor'.
 node_modules/chrome-devtools-frontend/front_end/devtools_compatibility.js(1059,16): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/devtools_compatibility.js(1123,19): error TS2339: Property 'observe' does not exist on type 'ObjectConstructor'.
 node_modules/chrome-devtools-frontend/front_end/devtools_compatibility.js(1224,18): error TS2304: Cannot find name 'CSSValue'.
@@ -5082,8 +4742,6 @@ node_modules/chrome-devtools-frontend/front_end/devtools_compatibility.js(1290,2
 node_modules/chrome-devtools-frontend/front_end/devtools_compatibility.js(1292,31): error TS2339: Property '__originalDOMTokenListToggle' does not exist on type 'DOMTokenList'.
 node_modules/chrome-devtools-frontend/front_end/devtools_compatibility.js(1293,28): error TS2339: Property '__originalDOMTokenListToggle' does not exist on type 'DOMTokenList'.
 node_modules/chrome-devtools-frontend/front_end/devtools_compatibility.js(1302,19): error TS2339: Property '__originalDOMTokenListToggle' does not exist on type 'DOMTokenList'.
-node_modules/chrome-devtools-frontend/front_end/diff/Diff.js(22,26): error TS2694: Namespace 'Diff.Diff' has no exported member 'DiffArray'.
-node_modules/chrome-devtools-frontend/front_end/diff/Diff.js(43,25): error TS2694: Namespace 'Diff.Diff' has no exported member 'DiffArray'.
 node_modules/chrome-devtools-frontend/front_end/diff/diff_match_patch.js(6,116): error TS2739: Type 'string[]' is missing the following properties from type '{ chars1: string; chars2: string; lineArray: string[]; }': chars1, chars2, lineArray
 node_modules/chrome-devtools-frontend/front_end/diff/diff_match_patch.js(6,240): error TS2322: Type '0' is not assignable to type '{ chars1: string; chars2: string; lineArray: string[]; }'.
 node_modules/chrome-devtools-frontend/front_end/diff/diff_match_patch.js(6,321): error TS2356: An arithmetic operand must be of type 'any', 'number', 'bigint' or an enum type.
@@ -5278,8 +4936,6 @@ node_modules/chrome-devtools-frontend/front_end/elements/ClassesPaneWidget.js(55
 node_modules/chrome-devtools-frontend/front_end/elements/ClassesPaneWidget.js(60,29): error TS2339: Property 'textContent' does not exist on type 'EventTarget'.
 node_modules/chrome-devtools-frontend/front_end/elements/ClassesPaneWidget.js(63,15): error TS2339: Property 'consume' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/elements/ClassesPaneWidget.js(68,18): error TS2339: Property 'textContent' does not exist on type 'EventTarget'.
-node_modules/chrome-devtools-frontend/front_end/elements/ClassesPaneWidget.js(89,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/elements/ClassesPaneWidget.js(100,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/elements/ClassesPaneWidget.js(133,24): error TS2339: Property 'keysArray' does not exist on type 'Map<string, boolean>'.
 node_modules/chrome-devtools-frontend/front_end/elements/ClassesPaneWidget.js(134,22): error TS2339: Property 'caseInsensetiveComparator' does not exist on type 'StringConstructor'.
 node_modules/chrome-devtools-frontend/front_end/elements/ClassesPaneWidget.js(152,32): error TS2339: Property 'checked' does not exist on type 'EventTarget'.
@@ -5288,33 +4944,25 @@ node_modules/chrome-devtools-frontend/front_end/elements/ClassesPaneWidget.js(24
 node_modules/chrome-devtools-frontend/front_end/elements/ClassesPaneWidget.js(291,94): error TS2339: Property 'addAll' does not exist on type 'Set<any>'.
 node_modules/chrome-devtools-frontend/front_end/elements/ClassesPaneWidget.js(297,55): error TS2339: Property 'addAll' does not exist on type 'Set<any>'.
 node_modules/chrome-devtools-frontend/front_end/elements/ClassesPaneWidget.js(299,57): error TS2339: Property 'valuesArray' does not exist on type 'Set<any>'.
-node_modules/chrome-devtools-frontend/front_end/elements/ClassesPaneWidget.js(306,39): error TS2694: Namespace 'UI.SuggestBox' has no exported member 'Suggestions'.
+node_modules/chrome-devtools-frontend/front_end/elements/ClassesPaneWidget.js(319,5): error TS2322: Type 'Promise<{ text: string; subtitle: string; iconType: string; priority: number; isSecondary: boolean; title: string; }[] | { text: string; }[]>' is not assignable to type 'Promise<{ text: string; subtitle: string; iconType: string; priority: number; isSecondary: boolean; title: string; }[]>'.
+  Type '{ text: string; subtitle: string; iconType: string; priority: number; isSecondary: boolean; title: string; }[] | { text: string; }[]' is not assignable to type '{ text: string; subtitle: string; iconType: string; priority: number; isSecondary: boolean; title: string; }[]'.
+    Type '{ text: string; }[]' is not assignable to type '{ text: string; subtitle: string; iconType: string; priority: number; isSecondary: boolean; title: string; }[]'.
+      Type '{ text: string; }' is missing the following properties from type '{ text: string; subtitle: string; iconType: string; priority: number; isSecondary: boolean; title: string; }': subtitle, iconType, priority, isSecondary, title
 node_modules/chrome-devtools-frontend/front_end/elements/ColorSwatchPopoverIcon.js(18,32): error TS2339: Property 'title' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/elements/ColorSwatchPopoverIcon.js(18,47): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/elements/ColorSwatchPopoverIcon.js(20,77): error TS2339: Property 'consume' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/elements/ColorSwatchPopoverIcon.js(30,11): error TS2339: Property 'consume' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/elements/ColorSwatchPopoverIcon.js(45,42): error TS2339: Property 'enclosingNodeOrSelfWithClass' does not exist on type 'BezierSwatch'.
-node_modules/chrome-devtools-frontend/front_end/elements/ColorSwatchPopoverIcon.js(57,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/elements/ColorSwatchPopoverIcon.js(103,36): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/elements/ColorSwatchPopoverIcon.js(104,32): error TS2339: Property 'title' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/elements/ColorSwatchPopoverIcon.js(106,77): error TS2339: Property 'consume' does not exist on type 'Event'.
-node_modules/chrome-devtools-frontend/front_end/elements/ColorSwatchPopoverIcon.js(122,28): error TS2694: Namespace 'SDK.CSSModel' has no exported member 'ContrastInfo'.
 node_modules/chrome-devtools-frontend/front_end/elements/ColorSwatchPopoverIcon.js(134,11): error TS2339: Property 'consume' does not exist on type 'Event'.
-node_modules/chrome-devtools-frontend/front_end/elements/ColorSwatchPopoverIcon.js(146,9): error TS2367: This condition will always return 'false' since the types '{ Original: string; Nickname: string; HEX: string; ShortHEX: string; HEXA: string; ShortHEXA: string; RGB: string; RGBA: string; HSL: string; HSLA: string; }' and 'string' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/elements/ColorSwatchPopoverIcon.js(149,36): error TS2345: Argument of type '{ Original: string; Nickname: string; HEX: string; ShortHEX: string; HEXA: string; ShortHEXA: string; RGB: string; RGBA: string; HSL: string; HSLA: string; }' is not assignable to parameter of type 'string'.
 node_modules/chrome-devtools-frontend/front_end/elements/ColorSwatchPopoverIcon.js(156,42): error TS2339: Property 'enclosingNodeOrSelfWithClass' does not exist on type 'ColorSwatch'.
-node_modules/chrome-devtools-frontend/front_end/elements/ColorSwatchPopoverIcon.js(168,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/elements/ColorSwatchPopoverIcon.js(175,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/elements/ColorSwatchPopoverIcon.js(228,23): error TS2339: Property 'title' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/elements/ColorSwatchPopoverIcon.js(228,38): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/elements/ColorSwatchPopoverIcon.js(230,68): error TS2339: Property 'consume' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/elements/ColorSwatchPopoverIcon.js(248,11): error TS2339: Property 'consume' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/elements/ColorSwatchPopoverIcon.js(262,47): error TS2339: Property 'enclosingNodeOrSelfWithClass' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/elements/ColorSwatchPopoverIcon.js(274,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/elements/ComputedStyleModel.js(31,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/elements/ComputedStyleModel.js(65,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/elements/ComputedStyleModel.js(73,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/elements/ComputedStyleModel.js(84,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/elements/ComputedStyleModel.js(122,5): error TS2322: Type 'Promise<Map<string, string>>' is not assignable to type 'Promise<ComputedStyle>'.
   Type 'Map<string, string>' is missing the following properties from type 'ComputedStyle': node, computedStyle
 node_modules/chrome-devtools-frontend/front_end/elements/ComputedStyleWidget.js(48,36): error TS2339: Property 'createChild' does not exist on type 'Element'.
@@ -5350,7 +4998,6 @@ node_modules/chrome-devtools-frontend/front_end/elements/ComputedStyleWidget.js(
 node_modules/chrome-devtools-frontend/front_end/elements/ComputedStyleWidget.js(221,11): error TS2447: The '^' operator is not allowed for boolean types. Consider using '!==' instead.
 node_modules/chrome-devtools-frontend/front_end/elements/ComputedStyleWidget.js(237,13): error TS2339: Property 'consume' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/elements/ComputedStyleWidget.js(247,11): error TS2339: Property 'consume' does not exist on type 'Event'.
-node_modules/chrome-devtools-frontend/front_end/elements/ComputedStyleWidget.js(263,11): error TS2367: This condition will always return 'false' since the types '{ Active: string; Overloaded: string; }' and 'string' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/elements/ComputedStyleWidget.js(281,35): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/elements/ComputedStyleWidget.js(282,49): error TS2339: Property 'selectorText' does not exist on type 'CSSRule'.
 node_modules/chrome-devtools-frontend/front_end/elements/ComputedStyleWidget.js(286,30): error TS2339: Property 'createChild' does not exist on type 'Element'.
@@ -5382,11 +5029,11 @@ node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(159,24
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(180,12): error TS2339: Property 'removeChildren' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(181,12): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(181,82): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(182,79): error TS2345: Argument of type '{ text: string; }' is not assignable to parameter of type '{ text: string; className: string; lineNumber: number; columnNumber: number; preventClick: boolean; maxLength: number; }'.
+  Type '{ text: string; }' is missing the following properties from type '{ text: string; className: string; lineNumber: number; columnNumber: number; preventClick: boolean; maxLength: number; }': className, lineNumber, columnNumber, preventClick, maxLength
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(189,43): error TS2339: Property 'offsetWidth' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(272,18): error TS2339: Property 'window' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(277,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(310,17): error TS2339: Property 'currentQuery' does not exist on type 'ElementsPanel'.
-node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(314,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(361,54): error TS2339: Property 'body' does not exist on type 'DOMDocument'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(361,80): error TS2339: Property 'documentElement' does not exist on type 'DOMDocument'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(375,58): error TS2339: Property '_pendingNodeReveal' does not exist on type 'ElementsPanel'.
@@ -5396,8 +5043,8 @@ node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(437,16
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(439,58): error TS2339: Property '_searchResults' does not exist on type 'ElementsPanel'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(440,17): error TS2339: Property '_searchResults' does not exist on type 'ElementsPanel'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(442,50): error TS2339: Property '_searchResults' does not exist on type 'ElementsPanel'.
-node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(472,19): error TS2694: Namespace 'UI' has no exported member 'PopoverRequest'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(477,19): error TS2339: Property 'parentElementOrShadowHost' does not exist on type 'EventTarget'.
+node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(481,5): error TS2741: Property 'hide' is missing in type '{ box: any; show: (popover: GlassPane) => Promise<boolean>; }' but required in type '{ box: AnchorBox; show: (arg0: GlassPane) => Promise<boolean>; hide: () => any; }'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(482,17): error TS2339: Property 'boxInWindow' does not exist on type 'EventTarget'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(497,52): error TS2339: Property '_searchResults' does not exist on type 'ElementsPanel'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(497,82): error TS2339: Property '_searchResults' does not exist on type 'ElementsPanel'.
@@ -5408,26 +5055,17 @@ node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(560,20
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(565,15): error TS2339: Property '_searchResults' does not exist on type 'ElementsPanel'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(565,39): error TS2339: Property '_searchResults' does not exist on type 'ElementsPanel'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(567,29): error TS2339: Property '_searchResults' does not exist on type 'ElementsPanel'.
-node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(603,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(611,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(633,13): error TS2339: Property 'handled' does not exist on type 'KeyboardEvent'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(641,13): error TS2339: Property 'handled' does not exist on type 'KeyboardEvent'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(644,15): error TS2339: Property 'handled' does not exist on type 'KeyboardEvent'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(650,15): error TS2339: Property 'handled' does not exist on type 'KeyboardEvent'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(721,82): error TS2339: Property 'offsetWidth' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(723,39): error TS2339: Property 'offsetWidth' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(728,33): error TS2367: This condition will always return 'false' since the types 'symbol' and '{ Vertical: symbol; Horizontal: symbol; Slim: symbol; }' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(730,5): error TS2322: Type 'symbol' is not assignable to type '{ Vertical: symbol; Horizontal: symbol; Slim: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(732,60): error TS2339: Property 'sidebarPanes' does not exist on type 'typeof extensionServer'.
-node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(740,35): error TS2367: This condition will always return 'false' since the types '{ Vertical: symbol; Horizontal: symbol; Slim: symbol; }' and 'symbol' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(763,24): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(768,28): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(770,33): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(782,9): error TS2367: This condition will always return 'true' since the types '{ Vertical: symbol; Horizontal: symbol; Slim: symbol; }' and 'symbol' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(785,47): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(800,51): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(809,28): error TS2367: This condition will always return 'false' since the types '{ Vertical: symbol; Horizontal: symbol; Slim: symbol; }' and 'symbol' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(822,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(864,51): error TS2339: Property 'isAncestor' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(867,51): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(884,11): error TS2339: Property '_pendingNodeReveal' does not exist on type 'ElementsPanel'.
@@ -5435,7 +5073,6 @@ node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(889,16
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(890,16): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(905,15): error TS2339: Property '_pendingNodeReveal' does not exist on type 'ElementsPanel'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsPanel.js(912,15): error TS2339: Property '_pendingNodeReveal' does not exist on type 'ElementsPanel'.
-node_modules/chrome-devtools-frontend/front_end/elements/ElementsSidebarPane.js(66,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeElement.js(44,50): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeElement.js(111,73): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeElement.js(239,29): error TS2339: Property 'style' does not exist on type 'Element'.
@@ -5448,7 +5085,6 @@ node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeElement.js(
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeElement.js(285,22): error TS2339: Property 'populateTreeElement' does not exist on type 'TreeOutline'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeElement.js(333,22): error TS2339: Property 'suppressRevealAndSelect' does not exist on type 'TreeOutline'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeElement.js(334,22): error TS2339: Property 'selectDOMNode' does not exist on type 'TreeOutline'.
-node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeElement.js(337,36): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; TimelineStarted: number; ProfilesCPUProfileTaken: number; ProfilesHeapProfileTaken: number; AuditsStarted: number; ... 23 more ...; ShowedThirdPartyBadges: number; }'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeElement.js(341,22): error TS2339: Property 'suppressRevealAndSelect' does not exist on type 'TreeOutline'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeElement.js(350,48): error TS2551: Property 'findTreeElement' does not exist on type 'TreeOutline'. Did you mean '_bindTreeElement'?
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeElement.js(425,26): error TS2339: Property 'selectedDOMNode' does not exist on type 'TreeOutline'.
@@ -5499,9 +5135,17 @@ node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeElement.js(
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeElement.js(739,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeElement.js(762,13): error TS2339: Property 'style' does not exist on type 'ChildNode'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeElement.js(767,32): error TS2339: Property 'style' does not exist on type 'Element'.
+node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeElement.js(779,41): error TS2345: Argument of type '{ lineNumbers: false; lineWrapping: any; mimeType: string; autoHeight: false; padBottom: false; }' is not assignable to parameter of type '{ bracketMatchingSetting: Setting<any>; lineNumbers: boolean; lineWrapping: boolean; mimeType: string; autoHeight: boolean; padBottom: boolean; maxHighlightLength: number; placeholder: string; }'.
+  Type '{ lineNumbers: false; lineWrapping: any; mimeType: string; autoHeight: false; padBottom: false; }' is missing the following properties from type '{ bracketMatchingSetting: Setting<any>; lineNumbers: boolean; lineWrapping: boolean; mimeType: string; autoHeight: boolean; padBottom: boolean; maxHighlightLength: number; placeholder: string; }': bracketMatchingSetting, maxHighlightLength, placeholder
+node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeElement.js(787,67): error TS2322: Type '{ commit: any; cancel: any; editor: { widget(): Widget; fullRange(): TextRange; selection(): TextRange; setSelection(selection: TextRange): void; text(textRange?: TextRange): string; ... 6 more ...; tokenAtTextPosition(lineNumber: number, columnNumber: number): { ...; }; }; resize: any; }' is not assignable to type '{ cancel: () => any; commit: () => any; }'.
+  Object literal may only specify known properties, and 'editor' does not exist in type '{ cancel: () => any; commit: () => any; }'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeElement.js(796,24): error TS2339: Property 'setMultilineEditing' does not exist on type 'TreeOutline'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeElement.js(803,29): error TS2339: Property 'style' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeElement.js(803,60): error TS2339: Property 'visibleWidth' does not exist on type 'TreeOutline'.
+node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeElement.js(804,21): error TS2339: Property 'editor' does not exist on type '{ cancel: () => any; commit: () => any; }'.
+node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeElement.js(811,50): error TS2339: Property 'editor' does not exist on type '{ cancel: () => any; commit: () => any; }'.
+node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeElement.js(819,21): error TS2339: Property 'editor' does not exist on type '{ cancel: () => any; commit: () => any; }'.
+node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeElement.js(820,21): error TS2339: Property 'editor' does not exist on type '{ cancel: () => any; commit: () => any; }'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeElement.js(828,34): error TS2339: Property 'style' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeElement.js(832,15): error TS2339: Property 'style' does not exist on type 'ChildNode'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeElement.js(837,26): error TS2339: Property 'setMultilineEditing' does not exist on type 'TreeOutline'.
@@ -5525,6 +5169,8 @@ node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeElement.js(
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeElement.js(1172,28): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeElement.js(1246,15): error TS2339: Property 'setTextContentTruncatedIfNeeded' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeElement.js(1251,41): error TS2339: Property 'createChild' does not exist on type 'Node'.
+node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeElement.js(1280,58): error TS2345: Argument of type '{ text: string; preventClick: true; }' is not assignable to parameter of type '{ text: string; className: string; lineNumber: number; columnNumber: number; preventClick: boolean; maxLength: number; }'.
+  Type '{ text: string; preventClick: true; }' is missing the following properties from type '{ text: string; className: string; lineNumber: number; columnNumber: number; preventClick: boolean; maxLength: number; }': className, lineNumber, columnNumber, maxLength
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeElement.js(1313,20): error TS2339: Property 'createTextChild' does not exist on type 'DocumentFragment'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeElement.js(1336,22): error TS2339: Property 'createTextChild' does not exist on type 'DocumentFragment'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeElement.js(1342,20): error TS2339: Property 'createTextChild' does not exist on type 'DocumentFragment'.
@@ -5551,24 +5197,15 @@ node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeElement.js(
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeElement.js(1653,24): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeElement.js(1653,44): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeElement.js(1653,64): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeElementHighlighter.js(24,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(34,32): error TS2417: Class static side 'typeof ElementsTreeOutline' incorrectly extends base class static side 'typeof TreeOutline'.
-  Types of property 'Events' are incompatible.
-    Type '{ SelectedNodeChanged: symbol; ElementsTreeUpdated: symbol; }' is missing the following properties from type '{ ElementAttached: symbol; ElementExpanded: symbol; ElementCollapsed: symbol; ElementSelected: symbol; }': ElementAttached, ElementExpanded, ElementCollapsed, ElementSelected
-node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(34,32): error TS2417: Class static side 'typeof ElementsTreeOutline' incorrectly extends base class static side 'typeof TreeOutline'.
-  Types of property 'Events' are incompatible.
-    Type '{ SelectedNodeChanged: symbol; ElementsTreeUpdated: symbol; }' is not assignable to type '{ ElementAttached: symbol; ElementExpanded: symbol; ElementCollapsed: symbol; ElementSelected: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(45,53): error TS2339: Property 'createChild' does not exist on type 'DocumentFragment'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(49,58): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(120,24): error TS2694: Namespace 'Elements' has no exported member 'MultilineEditorController'.
-node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(143,44): error TS2694: Namespace 'Elements.ElementsTreeOutline' has no exported member 'ClipboardData'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(173,11): error TS2339: Property 'handled' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(197,11): error TS2339: Property 'handled' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(254,11): error TS2339: Property 'handled' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(271,26): error TS2694: Namespace 'Protocol' has no exported member 'DOM'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(495,29): error TS2339: Property 'totalOffsetLeft' does not exist on type 'HTMLElement'.
-node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(515,19): error TS2694: Namespace 'UI' has no exported member 'PopoverRequest'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(520,19): error TS2339: Property 'parentElementOrShadowHost' does not exist on type 'EventTarget'.
+node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(524,5): error TS2741: Property 'hide' is missing in type '{ box: any; show: (popover: GlassPane) => Promise<boolean>; }' but required in type '{ box: AnchorBox; show: (arg0: GlassPane) => Promise<boolean>; hide: () => any; }'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(525,17): error TS2339: Property 'boxInWindow' does not exist on type 'EventTarget'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(527,29): error TS2339: Property 'enclosingNodeOrSelfWithNodeName' does not exist on type 'EventTarget'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(563,27): error TS2339: Property 'offsetWidth' does not exist on type 'Element'.
@@ -5586,14 +5223,6 @@ node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(813,22): error TS2339: Property 'index' does not exist on type 'DOMNode'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(920,9): error TS2740: Type 'Node & ParentNode' is missing the following properties from type 'Element': assignedSlot, attributes, classList, className, and 64 more.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(930,13): error TS2339: Property 'type' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(1010,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(1025,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(1034,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(1043,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(1055,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(1064,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(1075,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(1084,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(1106,44): error TS2339: Property 'keysArray' does not exist on type 'Map<DOMNode, UpdateRecord>'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(1110,89): error TS2339: Property 'scrollTop' does not exist on type 'Node & ParentNode'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(1130,37): error TS2339: Property 'scrollTop' does not exist on type 'Node & ParentNode'.
@@ -5610,8 +5239,6 @@ node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(1409,19): error TS2339: Property 'expandAllButtonElement' does not exist on type 'ElementsTreeElement'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(1411,28): error TS2339: Property 'expandAllButtonElement' does not exist on type 'ElementsTreeElement'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(1412,26): error TS2339: Property 'expandAllButtonElement' does not exist on type 'ElementsTreeElement'.
-node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(1429,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(1443,30): error TS2339: Property 'ClipboardData' does not exist on type 'typeof ElementsTreeOutline'.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(1572,16): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(1573,16): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/elements/ElementsTreeOutline.js(1597,29): error TS2339: Property 'treeElementForTest' does not exist on type 'Element'.
@@ -5694,12 +5321,8 @@ node_modules/chrome-devtools-frontend/front_end/elements/PlatformFontsWidget.js(
 node_modules/chrome-devtools-frontend/front_end/elements/PlatformFontsWidget.js(68,32): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
 node_modules/chrome-devtools-frontend/front_end/elements/PlatformFontsWidget.js(95,50): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/elements/PlatformFontsWidget.js(95,88): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/elements/PropertiesWidget.js(50,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/elements/PropertiesWidget.js(69,27): error TS2339: Property 'removeChildren' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/elements/PropertiesWidget.js(131,27): error TS2339: Property 'removeChildren' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/elements/PropertiesWidget.js(153,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/elements/PropertiesWidget.js(156,34): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; TimelineStarted: number; ProfilesCPUProfileTaken: number; ProfilesHeapProfileTaken: number; AuditsStarted: number; ... 23 more ...; ShowedThirdPartyBadges: number; }'.
-node_modules/chrome-devtools-frontend/front_end/elements/PropertiesWidget.js(162,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylePropertyHighlighter.js(29,25): error TS2339: Property 'property' does not exist on type 'TreeElement'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylePropertyHighlighter.js(43,42): error TS2339: Property 'scrollIntoViewIfNeeded' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(35,18): error TS2339: Property 'tabIndex' does not exist on type 'Element'.
@@ -5732,12 +5355,10 @@ node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(26
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(264,21): error TS2339: Property 'naturalOrderComparator' does not exist on type 'StringConstructor'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(293,19): error TS2339: Property 'isBlank' does not exist on type 'StylePropertiesSection'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(323,81): error TS2339: Property 'style' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(364,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(415,43): error TS2339: Property 'valuesArray' does not exist on type 'Set<any>'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(438,16): error TS2403: Subsequent variable declarations must have the same type.  Variable 'section' must be of type 'StylePropertiesSection', but here has type 'any'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(441,27): error TS2339: Property 'focus' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(484,14): error TS2339: Property 'peekLast' does not exist on type 'SectionBlock[]'.
-node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(583,34): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; TimelineStarted: number; ProfilesCPUProfileTaken: number; ProfilesHeapProfileTaken: number; AuditsStarted: number; ... 23 more ...; ShowedThirdPartyBadges: number; }'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(590,41): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(594,16): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(595,56): error TS2555: Expected at least 2 arguments, but got 1.
@@ -5775,9 +5396,7 @@ node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(96
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(964,29): error TS2339: Property 'tabIndex' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(972,50): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(973,24): error TS2339: Property 'tabIndex' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(1018,9): error TS2367: This condition will always return 'false' since the types '{ Regular: string; Inline: string; Attributes: string; }' and 'string' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(1019,68): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(1020,9): error TS2367: This condition will always return 'false' since the types '{ Regular: string; Inline: string; Attributes: string; }' and 'string' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(1021,58): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(1022,35): error TS2339: Property 'selectorText' does not exist on type 'CSSRule'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(1034,5): error TS2322: Type 'Timeout' is not assignable to type 'number'.
@@ -5793,10 +5412,6 @@ node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(10
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(1099,7): error TS2740: Type 'Node' is missing the following properties from type 'Element': assignedSlot, attributes, classList, className, and 72 more.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(1100,38): error TS2339: Property '_section' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(1102,36): error TS2339: Property '_section' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(1106,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(1117,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(1131,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(1145,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(1232,7): error TS2322: Type 'StylePropertiesSection' is not assignable to type 'this'.
   'StylePropertiesSection' is assignable to the constraint of type 'this', but 'this' could be instantiated with a different subtype of constraint 'StylePropertiesSection'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(1236,7): error TS2322: Type 'StylePropertiesSection' is not assignable to type 'this'.
@@ -5814,7 +5429,6 @@ node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(12
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(1296,13): error TS2339: Property 'consume' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(1325,43): error TS2345: Argument of type 'TemplateStringsArray' is not assignable to parameter of type 'string | string[]'.
   Type 'TemplateStringsArray' is not assignable to type 'string[]'.
-node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(1336,12): error TS2367: This condition will always return 'false' since the types '{ Active: string; Overloaded: string; }' and 'string' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(1346,7): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(1346,33): error TS2339: Property '_updateFilter' does not exist on type 'TreeElement'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(1349,77): error TS2339: Property 'deepTextContent' does not exist on type 'Element'.
@@ -5836,7 +5450,6 @@ node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(15
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(1537,11): error TS2339: Property 'consume' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(1545,38): error TS2339: Property 'enclosingNodeOrSelfWithClass' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(1558,13): error TS2339: Property 'getComponentSelection' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(1575,50): error TS2694: Namespace 'Elements.StylePropertyTreeElement' has no exported member 'Context'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(1611,22): error TS2339: Property 'classList' does not exist on type 'EventTarget'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(1612,51): error TS2339: Property '_selectorIndex' does not exist on type 'EventTarget'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(1613,13): error TS2339: Property 'consume' does not exist on type 'Event'.
@@ -5848,7 +5461,6 @@ node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(16
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(1679,39): error TS2339: Property 'inherited' does not exist on type 'TreeElement'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(1684,20): error TS2339: Property 'startEditing' does not exist on type 'TreeElement'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(1684,44): error TS2339: Property 'nameElement' does not exist on type 'TreeElement'.
-node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(1698,50): error TS2694: Namespace 'Elements.StylePropertyTreeElement' has no exported member 'Context'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(1759,33): error TS2339: Property 'selectorRange' does not exist on type 'CSSRule'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(1762,17): error TS2339: Property 'setSelectorText' does not exist on type 'CSSRule'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(1798,18): error TS2339: Property 'style' does not exist on type 'Element'.
@@ -5859,18 +5471,15 @@ node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(18
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(1809,20): error TS2339: Property 'focus' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(1833,57): error TS2339: Property 'media' does not exist on type 'CSSRule'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(1843,75): error TS2339: Property 'peekLast' does not exist on type 'string[]'.
-node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(1866,49): error TS2694: Namespace 'Elements.StylePropertyTreeElement' has no exported member 'Context'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(1963,35): error TS2339: Property 'key' does not exist on type 'CSSRule'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(1984,25): error TS2339: Property 'key' does not exist on type 'CSSRule'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(1987,17): error TS2339: Property 'setKeyText' does not exist on type 'CSSRule'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2018,64): error TS2339: Property 'key' does not exist on type 'CSSRule'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2109,7): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2109,46): error TS2339: Property '_updateFilter' does not exist on type 'TreeElement'.
-node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2148,30): error TS2694: Namespace 'SDK.CSSModel' has no exported member 'ContrastInfo'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2266,49): error TS2339: Property 'section' does not exist on type 'TreeOutline'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2279,34): error TS2339: Property 'checked' does not exist on type 'EventTarget'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2298,11): error TS2339: Property 'consume' does not exist on type 'Event'.
-node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2321,13): error TS2367: This condition will always return 'false' since the types '{ Active: string; Overloaded: string; }' and 'string' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2337,17): error TS2339: Property 'which' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2342,25): error TS2339: Property 'hasSelection' does not exist on type 'EventTarget'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2343,15): error TS2339: Property 'consume' does not exist on type 'Event'.
@@ -5886,16 +5495,14 @@ node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(24
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2439,11): error TS2339: Property 'consume' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2481,37): error TS2339: Property 'enclosingNodeOrSelfWithClass' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2482,25): error TS2339: Property 'enclosingNodeOrSelfWithClass' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2513,51): error TS2694: Namespace 'Elements.StylePropertyTreeElement' has no exported member 'Context'.
-node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2529,51): error TS2694: Namespace 'Elements.StylePropertyTreeElement' has no exported member 'Context'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2534,24): error TS2339: Property 'clipboardData' does not exist on type 'Event'.
+node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2546,17): error TS2339: Property 'originalName' does not exist on type '{ expanded: boolean; hasChildren: boolean; isEditingName: boolean; previousContent: string; }'.
+node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2547,17): error TS2339: Property 'originalValue' does not exist on type '{ expanded: boolean; hasChildren: boolean; isEditingName: boolean; previousContent: string; }'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2556,43): error TS2339: Property 'textContent' does not exist on type 'EventTarget'.
-node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2560,51): error TS2694: Namespace 'Elements.StylePropertyTreeElement' has no exported member 'Context'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2565,31): error TS2339: Property 'textContent' does not exist on type 'EventTarget'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2575,35): error TS2339: Property 'scrollIntoViewIfNeeded' does not exist on type 'HTMLElement'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2585,71): error TS2339: Property 'naturalOrderComparator' does not exist on type 'StringConstructor'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2604,19): error TS2339: Property 'getComponentSelection' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2608,49): error TS2694: Namespace 'Elements.StylePropertyTreeElement' has no exported member 'Context'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2612,15): error TS2339: Property 'handled' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2619,22): error TS2339: Property 'keyCode' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2619,77): error TS2339: Property 'key' does not exist on type 'Event'.
@@ -5905,16 +5512,15 @@ node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(26
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2630,22): error TS2339: Property 'shiftKey' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2641,47): error TS2339: Property 'textContent' does not exist on type 'EventTarget'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2645,13): error TS2339: Property 'consume' does not exist on type 'Event'.
-node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2651,49): error TS2694: Namespace 'Elements.StylePropertyTreeElement' has no exported member 'Context'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2675,45): error TS2339: Property 'charCode' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2679,58): error TS2339: Property 'textContent' does not exist on type 'EventTarget'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2679,84): error TS2339: Property 'selectionLeftOffset' does not exist on type 'EventTarget'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2682,13): error TS2339: Property 'consume' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2683,43): error TS2339: Property 'textContent' does not exist on type 'EventTarget'.
-node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2699,49): error TS2694: Namespace 'Elements.StylePropertyTreeElement' has no exported member 'Context'.
-node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2715,49): error TS2694: Namespace 'Elements.StylePropertyTreeElement' has no exported member 'Context'.
-node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2750,49): error TS2694: Namespace 'Elements.StylePropertyTreeElement' has no exported member 'Context'.
-node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2765,40): error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
+node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2761,85): error TS2339: Property 'originalName' does not exist on type '{ expanded: boolean; hasChildren: boolean; isEditingName: boolean; previousContent: string; }'.
+node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2762,86): error TS2339: Property 'originalValue' does not exist on type '{ expanded: boolean; hasChildren: boolean; isEditingName: boolean; previousContent: string; }'.
+node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2763,107): error TS2339: Property 'originalValue' does not exist on type '{ expanded: boolean; hasChildren: boolean; isEditingName: boolean; previousContent: string; }'.
+node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2765,24): error TS2447: The '^' operator is not allowed for boolean types. Consider using '!==' instead.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2769,7): error TS2322: Type 'StylePropertyTreeElement' is not assignable to type 'this'.
   'StylePropertyTreeElement' is assignable to the constraint of type 'this', but 'this' could be instantiated with a different subtype of constraint 'StylePropertyTreeElement'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2780,32): error TS2339: Property 'isWhitespace' does not exist on type 'string'.
@@ -5925,21 +5531,19 @@ node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(28
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2838,73): error TS2339: Property 'nameElement' does not exist on type 'TreeElement'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2838,99): error TS2339: Property 'valueElement' does not exist on type 'TreeElement'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2839,25): error TS2339: Property 'startEditing' does not exist on type 'TreeElement'.
-node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2849,61): error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
+node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2849,45): error TS2447: The '^' operator is not allowed for boolean types. Consider using '!==' instead.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2857,9): error TS2322: Type 'StylePropertyTreeElement' is not assignable to type 'this'.
   'StylePropertyTreeElement' is assignable to the constraint of type 'this', but 'this' could be instantiated with a different subtype of constraint 'StylePropertyTreeElement'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2906,7): error TS2322: Type 'Promise<void>' is not assignable to type 'Promise<undefined>'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2910,7): error TS2322: Type 'Promise<void>' is not assignable to type 'Promise<undefined>'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2918,7): error TS2322: Type 'Promise<void>' is not assignable to type 'Promise<undefined>'.
-node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2978,35): error TS2300: Duplicate identifier 'Context'.
-node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(2978,35): error TS2339: Property 'Context' does not exist on type 'typeof StylePropertyTreeElement'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(3021,19): error TS2339: Property 'key' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(3049,13): error TS2339: Property 'consume' does not exist on type 'Event'.
-node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(3120,39): error TS2694: Namespace 'UI.SuggestBox' has no exported member 'Suggestions'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(3265,15): error TS2339: Property 'createTextChild' does not exist on type 'DocumentFragment'.
+node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(3271,75): error TS2345: Argument of type '{ text: string; preventClick: true; }' is not assignable to parameter of type '{ text: string; className: string; lineNumber: number; columnNumber: number; preventClick: boolean; maxLength: number; }'.
+  Type '{ text: string; preventClick: true; }' is missing the following properties from type '{ text: string; className: string; lineNumber: number; columnNumber: number; preventClick: boolean; maxLength: number; }': className, lineNumber, columnNumber, maxLength
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(3272,15): error TS2339: Property 'createTextChild' does not exist on type 'DocumentFragment'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(3282,48): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(3302,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(3305,32): error TS2339: Property '_instance' does not exist on type 'typeof StylesSidebarPane'.
 node_modules/chrome-devtools-frontend/front_end/elements/StylesSidebarPane.js(3312,32): error TS2339: Property '_instance' does not exist on type 'typeof StylesSidebarPane'.
 node_modules/chrome-devtools-frontend/front_end/elements_test_runner/EditDOMTestRunner.js(15,5): error TS2304: Cannot find name 'eventSender'.
@@ -5962,17 +5566,9 @@ node_modules/chrome-devtools-frontend/front_end/elements_test_runner/ElementsTes
 node_modules/chrome-devtools-frontend/front_end/elements_test_runner/ElementsTestRunner.js(1080,35): error TS2339: Property 'AnimationTimeline' does not exist on type '{ new (effect?: AnimationEffect, timeline?: AnimationTimeline): Animation; prototype: Animation; }'.
 node_modules/chrome-devtools-frontend/front_end/elements_test_runner/StylesUpdateLinksTestRunner.js(99,35): error TS2339: Property 'sprintf' does not exist on type 'StringConstructor'.
 node_modules/chrome-devtools-frontend/front_end/elements_test_runner/StylesUpdateLinksTestRunner.js(119,31): error TS2339: Property 'elements' does not exist on type 'any[]'.
-node_modules/chrome-devtools-frontend/front_end/emulation/AdvancedApp.js(56,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/emulation/AdvancedApp.js(92,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/emulation/AdvancedApp.js(105,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/emulation/AdvancedApp.js(124,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/emulation/AdvancedApp.js(142,44): error TS2339: Property 'style' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/emulation/AdvancedApp.js(169,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/emulation/AdvancedApp.js(174,57): error TS2339: Property 'window' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeModel.js(9,1): error TS8022: JSDoc '@extends' is not attached to a class.
-node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeModel.js(50,81): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ Global: symbol; Local: symbol; Session: symbol; }'.
-node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeModel.js(53,5): error TS2322: Type 'string' is not assignable to type '{ None: string; Responsive: string; Device: string; }'.
-node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeModel.js(56,42): error TS2694: Namespace 'Emulation.EmulatedDevice' has no exported member 'Mode'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeModel.js(65,17): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeModel.js(67,57): error TS2345: Argument of type 'this' is not assignable to parameter of type '{ modelAdded(model: T): void; modelRemoved(model: T): void; }'.
   Type 'DeviceModeModel' is not assignable to type '{ modelAdded(model: T): void; modelRemoved(model: T): void; }'.
@@ -5984,21 +5580,6 @@ node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeModel.js(75,
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeModel.js(76,9): error TS2365: Operator '<=' cannot be applied to types 'string' and 'number'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeModel.js(86,59): error TS2365: Operator '>=' cannot be applied to types 'string' and 'number'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeModel.js(86,73): error TS2365: Operator '<=' cannot be applied to types 'string' and 'number'.
-node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeModel.js(105,40): error TS2694: Namespace 'Emulation.EmulatedDevice' has no exported member 'Mode'.
-node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeModel.js(112,9): error TS2367: This condition will always return 'false' since the types '{ None: string; Responsive: string; Device: string; }' and 'string' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeModel.js(128,9): error TS2367: This condition will always return 'true' since the types '{ None: string; Responsive: string; Device: string; }' and 'string' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeModel.js(129,36): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; TimelineStarted: number; ProfilesCPUProfileTaken: number; ProfilesHeapProfileTaken: number; AuditsStarted: number; ... 23 more ...; ShowedThirdPartyBadges: number; }'.
-node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeModel.js(186,41): error TS2694: Namespace 'Emulation.EmulatedDevice' has no exported member 'Mode'.
-node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeModel.js(282,12): error TS2678: Type 'string' is not comparable to type '{ None: string; Responsive: string; Device: string; }'.
-node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeModel.js(284,12): error TS2678: Type 'string' is not comparable to type '{ None: string; Responsive: string; Device: string; }'.
-node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeModel.js(286,12): error TS2678: Type 'string' is not comparable to type '{ None: string; Responsive: string; Device: string; }'.
-node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeModel.js(419,9): error TS2367: This condition will always return 'true' since the types '{ None: string; Responsive: string; Device: string; }' and 'string' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeModel.js(431,9): error TS2367: This condition will always return 'true' since the types '{ None: string; Responsive: string; Device: string; }' and 'string' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeModel.js(443,9): error TS2367: This condition will always return 'false' since the types '{ None: string; Responsive: string; Device: string; }' and 'string' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeModel.js(463,16): error TS2367: This condition will always return 'false' since the types '{ None: string; Responsive: string; Device: string; }' and 'string' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeModel.js(471,16): error TS2367: This condition will always return 'false' since the types '{ None: string; Responsive: string; Device: string; }' and 'string' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeModel.js(495,48): error TS2367: This condition will always return 'false' since the types '{ None: string; Responsive: string; Device: string; }' and 'string' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeModel.js(496,35): error TS2345: Argument of type 'string' is not assignable to parameter of type 'symbol'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeModel.js(554,24): error TS2694: Namespace 'Protocol' has no exported member 'Emulation'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeModel.js(633,24): error TS2694: Namespace 'Protocol' has no exported member 'Page'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeModel.js(665,23): error TS2339: Property 'screenOrientation' does not exist on type '{ width: number; height: number; deviceScaleFactor: number; mobile: boolean; }'.
@@ -6006,7 +5587,6 @@ node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeModel.js(712
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeModel.js(713,25): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeModel.js(714,19): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeModel.js(715,24): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(25,74): error TS2694: Namespace 'Emulation.EmulatedDevice' has no exported member 'Mode'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(33,39): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(43,40): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(95,16): error TS2339: Property 'maxLength' does not exist on type 'Element'.
@@ -6019,7 +5599,6 @@ node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(1
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(158,43): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(168,34): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(194,39): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(205,9): error TS2367: This condition will always return 'false' since the types '{ None: string; Responsive: string; Device: string; }' and 'string' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(211,33): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(212,33): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(213,33): error TS2555: Expected at least 2 arguments, but got 1.
@@ -6030,7 +5609,6 @@ node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(2
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(250,70): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(290,73): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(291,16): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(291,47): error TS2367: This condition will always return 'true' since the types '{ None: string; Responsive: string; Device: string; }' and 'string' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(293,78): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(294,16): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(296,70): error TS2555: Expected at least 2 arguments, but got 1.
@@ -6040,44 +5618,21 @@ node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(3
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(302,78): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(303,16): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(305,51): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(316,20): error TS2367: This condition will always return 'false' since the types '{ None: string; Responsive: string; Device: string; }' and 'string' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(346,9): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ None: string; Responsive: string; Device: string; }'.
-node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(351,25): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ None: string; Responsive: string; Device: string; }'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(392,16): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(393,9): error TS2367: This condition will always return 'false' since the types '{ None: string; Responsive: string; Device: string; }' and 'string' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(397,16): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(428,29): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ None: string; Responsive: string; Device: string; }'.
-node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(441,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(447,9): error TS2367: This condition will always return 'false' since the types '{ None: string; Responsive: string; Device: string; }' and 'string' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(459,77): error TS2339: Property 'totalOffsetLeft' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(460,34): error TS2339: Property 'totalOffsetTop' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(460,78): error TS2339: Property 'offsetHeight' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(461,62): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(462,64): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(482,42): error TS2694: Namespace 'Emulation.EmulatedDevice' has no exported member 'Mode'.
-node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(490,42): error TS2694: Namespace 'Emulation.EmulatedDevice' has no exported member 'Mode'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(507,24): error TS2339: Property 'disabled' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(507,35): error TS2367: This condition will always return 'true' since the types '{ None: string; Responsive: string; Device: string; }' and 'string' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(508,25): error TS2339: Property 'disabled' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(508,36): error TS2367: This condition will always return 'true' since the types '{ None: string; Responsive: string; Device: string; }' and 'string' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(509,40): error TS2367: This condition will always return 'false' since the types '{ None: string; Responsive: string; Device: string; }' and 'string' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(510,31): error TS2367: This condition will always return 'false' since the types '{ None: string; Responsive: string; Device: string; }' and 'string' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(515,9): error TS2367: This condition will always return 'false' since the types '{ None: string; Responsive: string; Device: string; }' and 'string' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(519,23): error TS2339: Property 'placeholder' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(534,28): error TS2345: Argument of type '{ Mobile: any; MobileNoTouch: any; Desktop: any; DesktopTouch: any; }' is not assignable to parameter of type 'string'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(538,34): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(539,9): error TS2367: This condition will always return 'false' since the types '{ None: string; Responsive: string; Device: string; }' and 'string' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(540,32): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(541,9): error TS2367: This condition will always return 'false' since the types '{ None: string; Responsive: string; Device: string; }' and 'string' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(550,60): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(550,88): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(551,18): error TS2367: This condition will always return 'false' since the types '{ None: string; Responsive: string; Device: string; }' and 'string' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(553,42): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(560,9): error TS2367: This condition will always return 'false' since the types '{ None: string; Responsive: string; Device: string; }' and 'string' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(563,48): error TS2694: Namespace 'Emulation.EmulatedDevice' has no exported member 'Mode'.
-node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(566,57): error TS2367: This condition will always return 'true' since the types '{ None: string; Responsive: string; Device: string; }' and 'string' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeToolbar.js(596,25): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ None: string; Responsive: string; Device: string; }'.
-node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(16,34): error TS2345: Argument of type 'string' is not assignable to parameter of type 'symbol'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(37,45): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(74,47): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(83,14): error TS2555: Expected at least 2 arguments, but got 1.
@@ -6087,23 +5642,13 @@ node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(83,1
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(84,14): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(84,41): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(84,70): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(103,27): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ None: string; Responsive: string; Device: string; }'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(105,9): error TS2339: Property 'consume' does not exist on type 'Event'.
-node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(132,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(143,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(176,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(180,34): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; TimelineStarted: number; ProfilesCPUProfileTaken: number; ProfilesHeapProfileTaken: number; AuditsStarted: number; ... 23 more ...; ShowedThirdPartyBadges: number; }'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(189,15): error TS2339: Property 'style' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(190,15): error TS2339: Property 'style' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(191,15): error TS2339: Property 'style' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(192,15): error TS2339: Property 'style' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(200,55): error TS2367: This condition will always return 'true' since the types '{ None: string; Responsive: string; Device: string; }' and 'string' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(227,21): error TS2367: This condition will always return 'false' since the types '{ None: string; Responsive: string; Device: string; }' and 'string' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(238,50): error TS2367: This condition will always return 'true' since the types '{ None: string; Responsive: string; Device: string; }' and 'string' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(280,30): error TS2339: Property 'positionAt' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(283,31): error TS2339: Property 'positionAt' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(315,9): error TS2367: This condition will always return 'true' since the types '{ None: string; Responsive: string; Device: string; }' and 'string' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(372,25): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ None: string; Responsive: string; Device: string; }'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(396,14): error TS2339: Property 'width' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(397,14): error TS2339: Property 'height' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(398,24): error TS2339: Property 'getContext' does not exist on type 'Element'.
@@ -6111,7 +5656,6 @@ node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(423,
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(443,14): error TS2339: Property 'width' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(444,14): error TS2339: Property 'height' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(445,24): error TS2339: Property 'getContext' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(477,9): error TS2367: This condition will always return 'false' since the types '{ None: string; Responsive: string; Device: string; }' and 'string' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(480,10): error TS2339: Property 'download' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(481,12): error TS2339: Property 'toBlob' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(482,12): error TS2339: Property 'href' does not exist on type 'Element'.
@@ -6119,7 +5663,6 @@ node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(483,
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(494,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeView.js(500,22): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeWrapper.js(33,24): error TS2694: Namespace 'Protocol' has no exported member 'Page'.
-node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeWrapper.js(50,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeWrapper.js(53,37): error TS2694: Namespace 'Protocol' has no exported member 'Page'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DeviceModeWrapper.js(120,45): error TS2694: Namespace 'Protocol' has no exported member 'Page'.
 node_modules/chrome-devtools-frontend/front_end/emulation/DevicesSettingsTab.js(15,31): error TS2339: Property 'createChild' does not exist on type 'Element'.
@@ -6137,18 +5680,6 @@ node_modules/chrome-devtools-frontend/front_end/emulation/DevicesSettingsTab.js(
 node_modules/chrome-devtools-frontend/front_end/emulation/DevicesSettingsTab.js(207,68): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/emulation/DevicesSettingsTab.js(208,58): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/emulation/DevicesSettingsTab.js(212,68): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/emulation/EmulatedDevices.js(13,42): error TS2694: Namespace 'Emulation.EmulatedDevice' has no exported member 'Orientation'.
-node_modules/chrome-devtools-frontend/front_end/emulation/EmulatedDevices.js(15,42): error TS2694: Namespace 'Emulation.EmulatedDevice' has no exported member 'Orientation'.
-node_modules/chrome-devtools-frontend/front_end/emulation/EmulatedDevices.js(23,50): error TS2694: Namespace 'Emulation.EmulatedDevice' has no exported member 'Mode'.
-node_modules/chrome-devtools-frontend/front_end/emulation/EmulatedDevices.js(84,45): error TS2694: Namespace 'Emulation.EmulatedDevice' has no exported member 'Orientation'.
-node_modules/chrome-devtools-frontend/front_end/emulation/EmulatedDevices.js(106,53): error TS2694: Namespace 'Emulation.EmulatedDevice' has no exported member 'Orientation'.
-node_modules/chrome-devtools-frontend/front_end/emulation/EmulatedDevices.js(195,49): error TS2694: Namespace 'Emulation.EmulatedDevice' has no exported member 'Mode'.
-node_modules/chrome-devtools-frontend/front_end/emulation/EmulatedDevices.js(243,40): error TS2694: Namespace 'Emulation.EmulatedDevice' has no exported member 'Orientation'.
-node_modules/chrome-devtools-frontend/front_end/emulation/EmulatedDevices.js(263,40): error TS2694: Namespace 'Emulation.EmulatedDevice' has no exported member 'Mode'.
-node_modules/chrome-devtools-frontend/front_end/emulation/EmulatedDevices.js(275,40): error TS2694: Namespace 'Emulation.EmulatedDevice' has no exported member 'Mode'.
-node_modules/chrome-devtools-frontend/front_end/emulation/EmulatedDevices.js(289,41): error TS2694: Namespace 'Emulation.EmulatedDevice' has no exported member 'Orientation'.
-node_modules/chrome-devtools-frontend/front_end/emulation/EmulatedDevices.js(334,26): error TS2339: Property 'Mode' does not exist on type 'typeof EmulatedDevice'.
-node_modules/chrome-devtools-frontend/front_end/emulation/EmulatedDevices.js(337,26): error TS2339: Property 'Orientation' does not exist on type 'typeof EmulatedDevice'.
 node_modules/chrome-devtools-frontend/front_end/emulation/EmulatedDevices.js(470,18): error TS2339: Property 'remove' does not exist on type 'EmulatedDevice[]'.
 node_modules/chrome-devtools-frontend/front_end/emulation/InspectedPagePlaceholder.js(21,20): error TS2339: Property 'window' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/InspectedPagePlaceholder.js(22,35): error TS2339: Property 'window' does not exist on type 'Element'.
@@ -6169,25 +5700,17 @@ node_modules/chrome-devtools-frontend/front_end/emulation/MediaQueryInspector.js
 node_modules/chrome-devtools-frontend/front_end/emulation/MediaQueryInspector.js(220,41): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/MediaQueryInspector.js(223,11): error TS2339: Property '_model' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/MediaQueryInspector.js(224,11): error TS2339: Property '_locations' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/emulation/MediaQueryInspector.js(254,9): error TS2367: This condition will always return 'false' since the types '{ Max: number; MinMax: number; Min: number; }' and 'number' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/emulation/MediaQueryInspector.js(255,14): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/MediaQueryInspector.js(256,34): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/MediaQueryInspector.js(261,14): error TS2339: Property 'createChild' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/emulation/MediaQueryInspector.js(264,9): error TS2367: This condition will always return 'false' since the types '{ Max: number; MinMax: number; Min: number; }' and 'number' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/emulation/MediaQueryInspector.js(265,14): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/MediaQueryInspector.js(266,32): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/MediaQueryInspector.js(271,14): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/MediaQueryInspector.js(272,33): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/MediaQueryInspector.js(277,14): error TS2339: Property 'createChild' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/emulation/MediaQueryInspector.js(280,9): error TS2367: This condition will always return 'false' since the types '{ Max: number; MinMax: number; Min: number; }' and 'number' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/emulation/MediaQueryInspector.js(281,32): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/MediaQueryInspector.js(285,14): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/MediaQueryInspector.js(286,33): error TS2339: Property 'createChild' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/emulation/MediaQueryInspector.js(398,14): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
-node_modules/chrome-devtools-frontend/front_end/emulation/MediaQueryInspector.js(398,31): error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
-node_modules/chrome-devtools-frontend/front_end/emulation/MediaQueryInspector.js(413,9): error TS2367: This condition will always return 'false' since the types '{ Max: number; MinMax: number; Min: number; }' and 'number' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/emulation/MediaQueryInspector.js(415,9): error TS2367: This condition will always return 'false' since the types '{ Max: number; MinMax: number; Min: number; }' and 'number' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/emulation/MediaQueryInspector.js(425,5): error TS2322: Type 'number' is not assignable to type '{ Max: number; MinMax: number; Min: number; }'.
 node_modules/chrome-devtools-frontend/front_end/emulation/SensorsView.js(18,25): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/SensorsView.js(25,25): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/SensorsView.js(34,32): error TS2339: Property '_instanceObject' does not exist on type 'typeof SensorsView'.
@@ -6214,19 +5737,14 @@ node_modules/chrome-devtools-frontend/front_end/emulation/SensorsView.js(178,39)
 node_modules/chrome-devtools-frontend/front_end/emulation/SensorsView.js(203,39): error TS2339: Property 'disabled' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/SensorsView.js(206,39): error TS2339: Property 'disabled' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/SensorsView.js(220,26): error TS2339: Property 'focus' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/emulation/SensorsView.js(227,36): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ UserInput: string; UserDrag: string; ResetButton: string; SelectPreset: string; }'.
 node_modules/chrome-devtools-frontend/front_end/emulation/SensorsView.js(243,63): error TS2339: Property 'options' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/SensorsView.js(244,19): error TS2339: Property 'selectedIndex' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/SensorsView.js(250,32): error TS2339: Property 'value' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/SensorsView.js(250,64): error TS2339: Property 'value' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/SensorsView.js(250,97): error TS2339: Property 'value' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/emulation/SensorsView.js(251,9): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ UserInput: string; UserDrag: string; ResetButton: string; SelectPreset: string; }'.
-node_modules/chrome-devtools-frontend/front_end/emulation/SensorsView.js(258,9): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ UserInput: string; UserDrag: string; ResetButton: string; SelectPreset: string; }'.
-node_modules/chrome-devtools-frontend/front_end/emulation/SensorsView.js(278,9): error TS2367: This condition will always return 'true' since the types '{ UserInput: string; UserDrag: string; ResetButton: string; SelectPreset: string; }' and 'string' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/emulation/SensorsView.js(279,25): error TS2345: Argument of type 'number' is not assignable to parameter of type 'string'.
 node_modules/chrome-devtools-frontend/front_end/emulation/SensorsView.js(280,24): error TS2345: Argument of type 'number' is not assignable to parameter of type 'string'.
 node_modules/chrome-devtools-frontend/front_end/emulation/SensorsView.js(281,25): error TS2345: Argument of type 'number' is not assignable to parameter of type 'string'.
-node_modules/chrome-devtools-frontend/front_end/emulation/SensorsView.js(284,19): error TS2367: This condition will always return 'true' since the types '{ UserInput: string; UserDrag: string; ResetButton: string; SelectPreset: string; }' and 'string' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/emulation/SensorsView.js(298,29): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/SensorsView.js(301,11): error TS2339: Property 'type' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/SensorsView.js(313,39): error TS2339: Property 'createChild' does not exist on type 'Element'.
@@ -6235,7 +5753,6 @@ node_modules/chrome-devtools-frontend/front_end/emulation/SensorsView.js(322,85)
 node_modules/chrome-devtools-frontend/front_end/emulation/SensorsView.js(327,87): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/emulation/SensorsView.js(331,16): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/emulation/SensorsView.js(362,11): error TS2339: Property 'consume' does not exist on type 'MouseEvent'.
-node_modules/chrome-devtools-frontend/front_end/emulation/SensorsView.js(383,48): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ UserInput: string; UserDrag: string; ResetButton: string; SelectPreset: string; }'.
 node_modules/chrome-devtools-frontend/front_end/emulation/SensorsView.js(402,11): error TS2339: Property 'consume' does not exist on type 'MouseEvent'.
 node_modules/chrome-devtools-frontend/front_end/emulation/SensorsView.js(424,44): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/emulation/SensorsView.js(428,32): error TS2555: Expected at least 2 arguments, but got 1.
@@ -6259,26 +5776,17 @@ node_modules/chrome-devtools-frontend/front_end/emulation/SensorsView.js(496,20)
 node_modules/chrome-devtools-frontend/front_end/emulation/SensorsView.js(497,20): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/emulation/SensorsView.js(498,20): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/event_listeners/EventListenersUtils.js(7,93): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/event_listeners/EventListenersUtils.js(12,38): error TS2694: Namespace 'EventListeners' has no exported member 'FrameworkEventListenersObject'.
-node_modules/chrome-devtools-frontend/front_end/event_listeners/EventListenersUtils.js(19,36): error TS2694: Namespace 'EventListeners' has no exported member 'FrameworkEventListenersObject'.
-node_modules/chrome-devtools-frontend/front_end/event_listeners/EventListenersUtils.js(22,52): error TS2694: Namespace 'EventListeners' has no exported member 'FrameworkEventListenersObject'.
-node_modules/chrome-devtools-frontend/front_end/event_listeners/EventListenersUtils.js(28,8): error TS2339: Property 'catchException' does not exist on type 'Promise<any>'.
-node_modules/chrome-devtools-frontend/front_end/event_listeners/EventListenersUtils.js(92,32): error TS2694: Namespace 'EventListeners' has no exported member 'EventListenerObjectInInspectedPage'.
-node_modules/chrome-devtools-frontend/front_end/event_listeners/EventListenersUtils.js(118,32): error TS2694: Namespace 'EventListeners' has no exported member 'EventListenerObjectInInspectedPage'.
-node_modules/chrome-devtools-frontend/front_end/event_listeners/EventListenersUtils.js(144,37): error TS2694: Namespace 'SDK.DebuggerModel' has no exported member 'FunctionDetails'.
-node_modules/chrome-devtools-frontend/front_end/event_listeners/EventListenersUtils.js(157,32): error TS2694: Namespace 'EventListeners' has no exported member 'EventListenerObjectInInspectedPage'.
+node_modules/chrome-devtools-frontend/front_end/event_listeners/EventListenersUtils.js(28,8): error TS2339: Property 'catchException' does not exist on type 'Promise<{ eventListeners: EventListener[]; internalHandlers: RemoteArray; }>'.
+node_modules/chrome-devtools-frontend/front_end/event_listeners/EventListenersUtils.js(160,21): error TS2339: Property 'remove' does not exist on type '{ type: string; useCapture: boolean; passive: boolean; once: boolean; handler: () => any; }'.
 node_modules/chrome-devtools-frontend/front_end/event_listeners/EventListenersUtils.js(172,62): error TS2339: Property 'catchException' does not exist on type 'Promise<EventListener>'.
-node_modules/chrome-devtools-frontend/front_end/event_listeners/EventListenersUtils.js(182,62): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Raw: string; Framework: string; FrameworkUser: string; }'.
-node_modules/chrome-devtools-frontend/front_end/event_listeners/EventListenersUtils.js(227,31): error TS2694: Namespace 'EventListeners' has no exported member 'FrameworkEventListenersObject'.
-node_modules/chrome-devtools-frontend/front_end/event_listeners/EventListenersUtils.js(234,19): error TS2694: Namespace 'SDK' has no exported member 'CallFunctionResult'.
-node_modules/chrome-devtools-frontend/front_end/event_listeners/EventListenersUtils.js(286,55): error TS2694: Namespace 'EventListeners' has no exported member 'EventListenerObjectInInspectedPage'.
 node_modules/chrome-devtools-frontend/front_end/event_listeners/EventListenersUtils.js(295,16): error TS2339: Property 'devtoolsFrameworkEventListeners' does not exist on type 'Window & typeof globalThis'.
 node_modules/chrome-devtools-frontend/front_end/event_listeners/EventListenersUtils.js(295,68): error TS2339: Property 'devtoolsFrameworkEventListeners' does not exist on type 'Window & typeof globalThis'.
 node_modules/chrome-devtools-frontend/front_end/event_listeners/EventListenersUtils.js(296,41): error TS2339: Property 'devtoolsFrameworkEventListeners' does not exist on type 'Window & typeof globalThis'.
 node_modules/chrome-devtools-frontend/front_end/event_listeners/EventListenersUtils.js(306,66): error TS2349: This expression is not callable.
   Each member of the union type '(<U>(callbackfn: (value: any, index: number, array: any[]) => U, thisArg?: any) => U[]) | (<U>(callbackfn: (value: { handler: any; useCapture: boolean; passive: boolean; once: boolean; type: string; }, index: number, array: { ...; }[]) => U, thisArg?: any) => U[])' has signatures, but none of those signatures are compatible with each other.
-node_modules/chrome-devtools-frontend/front_end/event_listeners/EventListenersUtils.js(324,5): error TS2741: Property 'internalHandlers' is missing in type '{ eventListeners: any[]; }' but required in type '{ eventListeners: any[]; internalHandlers: (() => any)[]; }'.
-node_modules/chrome-devtools-frontend/front_end/event_listeners/EventListenersUtils.js(345,33): error TS2694: Namespace 'EventListeners' has no exported member 'EventListenerObjectInInspectedPage'.
+node_modules/chrome-devtools-frontend/front_end/event_listeners/EventListenersUtils.js(324,5): error TS2741: Property 'internalHandlers' is missing in type '{ eventListeners: any[]; }' but required in type '{ eventListeners: { type: string; useCapture: boolean; passive: boolean; once: boolean; handler: () => any; }[]; internalHandlers: (() => any)[]; }'.
+node_modules/chrome-devtools-frontend/front_end/event_listeners/EventListenersUtils.js(371,103): error TS2322: Type '{ type: any; useCapture: any; passive: any; once: any; handler: any; remove: any; }' is not assignable to type '{ type: string; useCapture: boolean; passive: boolean; once: boolean; handler: () => any; }'.
+  Object literal may only specify known properties, and 'remove' does not exist in type '{ type: string; useCapture: boolean; passive: boolean; once: boolean; handler: () => any; }'.
 node_modules/chrome-devtools-frontend/front_end/event_listeners/EventListenersUtils.js(420,32): error TS2352: Conversion of type '{ fn: any; data: any; _data: any; }' to type '(arg0: Node) => any' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
   Type '{ fn: any; data: any; _data: any; }' provides no match for the signature '(arg0: Node): any'.
 node_modules/chrome-devtools-frontend/front_end/event_listeners/EventListenersUtils.js(420,39): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
@@ -6289,8 +5797,7 @@ node_modules/chrome-devtools-frontend/front_end/event_listeners/EventListenersUt
 node_modules/chrome-devtools-frontend/front_end/event_listeners/EventListenersView.js(14,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/event_listeners/EventListenersView.js(27,44): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/event_listeners/EventListenersView.js(35,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
-node_modules/chrome-devtools-frontend/front_end/event_listeners/EventListenersView.js(51,32): error TS2694: Namespace 'EventListeners' has no exported member 'FrameworkEventListenersObject'.
-node_modules/chrome-devtools-frontend/front_end/event_listeners/EventListenersView.js(70,32): error TS2694: Namespace 'EventListeners' has no exported member 'FrameworkEventListenersObject'.
+node_modules/chrome-devtools-frontend/front_end/event_listeners/EventListenersView.js(82,7): error TS2322: Type 'Promise<void>' is not assignable to type 'Promise<undefined>'.
 node_modules/chrome-devtools-frontend/front_end/event_listeners/EventListenersView.js(88,29): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/event_listeners/EventListenersView.js(150,46): error TS2339: Property 'eventListener' does not exist on type 'TreeElement'.
 node_modules/chrome-devtools-frontend/front_end/event_listeners/EventListenersView.js(156,45): error TS2339: Property 'eventListener' does not exist on type 'TreeElement'.
@@ -6334,22 +5841,15 @@ node_modules/chrome-devtools-frontend/front_end/extensions/ExtensionServer.js(47
 node_modules/chrome-devtools-frontend/front_end/extensions/ExtensionServer.js(542,14): error TS2339: Property '_extensionOrigin' does not exist on type 'MessagePort'.
 node_modules/chrome-devtools-frontend/front_end/extensions/ExtensionServer.js(570,9): error TS2345: Argument of type '{ key: any; code: any; keyCode: any; location: any; ctrlKey: any; altKey: any; shiftKey: any; metaKey: any; }' is not assignable to parameter of type 'KeyboardEventInit'.
   Object literal may only specify known properties, and 'keyCode' does not exist in type 'KeyboardEventInit'.
-node_modules/chrome-devtools-frontend/front_end/extensions/ExtensionServer.js(599,76): error TS2345: Argument of type 'symbol' is not assignable to parameter of type 'string'.
-node_modules/chrome-devtools-frontend/front_end/extensions/ExtensionServer.js(603,9): error TS2345: Argument of type 'symbol' is not assignable to parameter of type 'string'.
 node_modules/chrome-devtools-frontend/front_end/extensions/ExtensionServer.js(649,10): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/extensions/ExtensionServer.js(667,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/extensions/ExtensionServer.js(670,36): error TS2339: Property '_overridePlatformExtensionAPIForTest' does not exist on type 'typeof extensionServer'.
 node_modules/chrome-devtools-frontend/front_end/extensions/ExtensionServer.js(671,14): error TS2339: Property 'buildPlatformExtensionAPI' does not exist on type 'Window & typeof globalThis'.
 node_modules/chrome-devtools-frontend/front_end/extensions/ExtensionServer.js(671,69): error TS2339: Property '_overridePlatformExtensionAPIForTest' does not exist on type 'typeof extensionServer'.
-node_modules/chrome-devtools-frontend/front_end/extensions/ExtensionServer.js(681,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/extensions/ExtensionServer.js(712,14): error TS2339: Property 'src' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/extensions/ExtensionServer.js(713,14): error TS2339: Property 'style' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/extensions/ExtensionServer.js(765,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/extensions/ExtensionServer.js(765,31): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/extensions/ExtensionServer.js(777,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/extensions/ExtensionServer.js(777,31): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/extensions/ExtensionServer.js(838,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/extensions/ExtensionServer.js(839,43): error TS2694: Namespace 'Extensions.ExtensionStatus' has no exported member 'Record'.
 node_modules/chrome-devtools-frontend/front_end/extensions/ExtensionServer.js(881,30): error TS2339: Property 'resourceTreeModel' does not exist on type 'true | ResourceTreeFrame'.
   Property 'resourceTreeModel' does not exist on type 'true'.
 node_modules/chrome-devtools-frontend/front_end/extensions/ExtensionServer.js(886,48): error TS2339: Property 'id' does not exist on type 'true | ResourceTreeFrame'.
@@ -6360,11 +5860,7 @@ node_modules/chrome-devtools-frontend/front_end/extensions/ExtensionServer.js(89
   Property 'id' does not exist on type 'true'.
 node_modules/chrome-devtools-frontend/front_end/extensions/ExtensionServer.js(901,44): error TS2339: Property 'url' does not exist on type 'true | ResourceTreeFrame'.
   Property 'url' does not exist on type 'true'.
-node_modules/chrome-devtools-frontend/front_end/extensions/ExtensionServer.js(918,34): error TS2694: Namespace 'SDK.RuntimeModel' has no exported member 'EvaluationResult'.
-node_modules/chrome-devtools-frontend/front_end/extensions/ExtensionServer.js(976,45): error TS2694: Namespace 'Extensions.ExtensionStatus' has no exported member 'Record'.
 node_modules/chrome-devtools-frontend/front_end/extensions/ExtensionServer.js(983,59): error TS2339: Property 'vsprintf' does not exist on type 'StringConstructor'.
-node_modules/chrome-devtools-frontend/front_end/extensions/ExtensionServer.js(1002,28): error TS2300: Duplicate identifier 'Record'.
-node_modules/chrome-devtools-frontend/front_end/extensions/ExtensionServer.js(1002,28): error TS2339: Property 'Record' does not exist on type 'typeof ExtensionStatus'.
 node_modules/chrome-devtools-frontend/front_end/extensions/ExtensionTraceProvider.js(27,32): error TS2339: Property 'startTraceRecording' does not exist on type 'typeof extensionServer'.
 node_modules/chrome-devtools-frontend/front_end/extensions/ExtensionTraceProvider.js(31,32): error TS2339: Property 'stopTraceRecording' does not exist on type 'typeof extensionServer'.
 node_modules/chrome-devtools-frontend/front_end/extensions/ExtensionView.js(50,18): error TS2339: Property 'src' does not exist on type 'Element'.
@@ -6416,40 +5912,26 @@ node_modules/chrome-devtools-frontend/front_end/externs.js(194,13): error TS2355
 node_modules/chrome-devtools-frontend/front_end/externs.js(196,22): error TS2339: Property 'lowerBound' does not exist on type 'Int32Array'.
 node_modules/chrome-devtools-frontend/front_end/externs.js(206,11): error TS2304: Cannot find name 'DirectoryEntry'.
 node_modules/chrome-devtools-frontend/front_end/externs.js(213,8): error TS2339: Property 'domAutomationController' does not exist on type 'Window & typeof globalThis'.
-node_modules/chrome-devtools-frontend/front_end/externs.js(219,47): error TS2694: Namespace 'DevToolsHost' has no exported member 'ContextMenuDescriptor'.
-node_modules/chrome-devtools-frontend/front_end/externs.js(220,14): error TS2300: Duplicate identifier 'ContextMenuDescriptor'.
-node_modules/chrome-devtools-frontend/front_end/externs.js(220,14): error TS2339: Property 'ContextMenuDescriptor' does not exist on type '{ (): void; zoomFactor(): number; copyText(text: string): void; platform(): string; showContextMenuAtPoint(x: number, y: number, items: any[], document: Document): void; sendMessageToEmbedder(message: string): void; ... 6 more ...; upgradeDraggedFileSystemPermissions(fileSystem: { ...; }): void; }'.
 node_modules/chrome-devtools-frontend/front_end/externs.js(223,13): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/externs.js(233,13): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
-node_modules/chrome-devtools-frontend/front_end/externs.js(240,34): error TS2694: Namespace 'DevToolsHost' has no exported member 'ContextMenuDescriptor'.
 node_modules/chrome-devtools-frontend/front_end/externs.js(251,13): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/externs.js(256,13): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/externs.js(261,13): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/externs.js(266,13): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/externs.js(271,13): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/externs.js(278,13): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
-node_modules/chrome-devtools-frontend/front_end/externs.js(328,175): error TS2694: Namespace 'Adb' has no exported member 'Page'.
-node_modules/chrome-devtools-frontend/front_end/externs.js(330,88): error TS2694: Namespace 'Adb' has no exported member 'Browser'.
-node_modules/chrome-devtools-frontend/front_end/externs.js(338,36): error TS2694: Namespace 'Adb' has no exported member 'DevicePortForwardingStatus'.
-node_modules/chrome-devtools-frontend/front_end/externs.js(346,33): error TS2694: Namespace 'Adb' has no exported member 'PortForwardingConfig'.
-node_modules/chrome-devtools-frontend/front_end/externs.js(348,35): error TS2694: Namespace 'Adb' has no exported member 'NetworkDiscoveryConfig'.
+node_modules/chrome-devtools-frontend/front_end/externs.js(283,13): error TS2304: Cannot find name 'FileSystem'.
 node_modules/chrome-devtools-frontend/front_end/externs.js(366,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/externs.js(395,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/externs.js(443,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/externs.js(448,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/externs.js(455,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/externs.js(549,117): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/externs.js(550,12): error TS2339: Property 'BeforeChangeObject' does not exist on type 'typeof CodeMirror'.
-node_modules/chrome-devtools-frontend/front_end/externs.js(553,12): error TS2339: Property 'ChangeObject' does not exist on type 'typeof CodeMirror'.
 node_modules/chrome-devtools-frontend/front_end/externs.js(565,13): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/externs.js(623,8): error TS2339: Property 'dispatchStandaloneTestRunnerMessages' does not exist on type 'Window & typeof globalThis'.
 node_modules/chrome-devtools-frontend/front_end/externs.js(654,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/externs.js(661,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/externs.js(668,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
-node_modules/chrome-devtools-frontend/front_end/externs.js(689,32): error TS2694: Namespace 'Acorn' has no exported member 'Token'.
-node_modules/chrome-devtools-frontend/front_end/externs.js(711,7): error TS2300: Duplicate identifier 'Comment'.
-node_modules/chrome-devtools-frontend/front_end/externs.js(714,22): error TS2694: Namespace 'Acorn' has no exported member 'Token'.
-node_modules/chrome-devtools-frontend/front_end/externs.js(714,35): error TS2694: Namespace 'Acorn' has no exported member 'Comment'.
 node_modules/chrome-devtools-frontend/front_end/externs.js(770,1): error TS8022: JSDoc '@extends' is not attached to a class.
 node_modules/chrome-devtools-frontend/front_end/externs.js(803,13): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/externs.js(805,19): error TS2339: Property 'context' does not exist on type 'Console'.
@@ -6458,30 +5940,15 @@ node_modules/chrome-devtools-frontend/front_end/externs.js(817,12): error TS7014
 node_modules/chrome-devtools-frontend/front_end/formatter/FormatterWorkerPool.js(28,40): error TS2339: Property 'keysArray' does not exist on type 'Map<Worker, Task>'.
 node_modules/chrome-devtools-frontend/front_end/formatter/FormatterWorkerPool.js(74,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/formatter/FormatterWorkerPool.js(162,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/formatter/FormatterWorkerPool.js(162,70): error TS2694: Namespace 'Formatter.FormatterWorkerPool' has no exported member 'CSSRule'.
-node_modules/chrome-devtools-frontend/front_end/formatter/FormatterWorkerPool.js(172,68): error TS2694: Namespace 'Formatter.FormatterWorkerPool' has no exported member 'CSSRule'.
 node_modules/chrome-devtools-frontend/front_end/formatter/FormatterWorkerPool.js(179,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/formatter/FormatterWorkerPool.js(197,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/formatter/FormatterWorkerPool.js(197,70): error TS2694: Namespace 'Formatter.FormatterWorkerPool' has no exported member 'OutlineItem'.
-node_modules/chrome-devtools-frontend/front_end/formatter/FormatterWorkerPool.js(224,54): error TS2694: Namespace 'Formatter.FormatterWorkerPool' has no exported member 'CSSRule'.
+node_modules/chrome-devtools-frontend/front_end/formatter/FormatterWorkerPool.js(229,11): error TS2345: Argument of type '{ line: number; column: number; title: any; }[]' is not assignable to parameter of type '{ line: number; column: number; title: string; subtitle: string; }[]'.
+  Property 'subtitle' is missing in type '{ line: number; column: number; title: any; }' but required in type '{ line: number; column: number; title: string; subtitle: string; }'.
+node_modules/chrome-devtools-frontend/front_end/formatter/FormatterWorkerPool.js(230,87): error TS2339: Property 'selectorText' does not exist on type 'CSSStyleRule | { atRule: string; lineNumber: number; columnNumber: number; }'.
+  Property 'selectorText' does not exist on type '{ atRule: string; lineNumber: number; columnNumber: number; }'.
+node_modules/chrome-devtools-frontend/front_end/formatter/FormatterWorkerPool.js(230,108): error TS2339: Property 'atRule' does not exist on type 'CSSStyleRule | { atRule: string; lineNumber: number; columnNumber: number; }'.
+  Property 'atRule' does not exist on type 'CSSStyleRule'.
 node_modules/chrome-devtools-frontend/front_end/formatter/FormatterWorkerPool.js(244,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/formatter/FormatterWorkerPool.js(259,47): error TS2694: Namespace 'Formatter.FormatterWorkerPool' has no exported member 'FormatMapping'.
-node_modules/chrome-devtools-frontend/front_end/formatter/FormatterWorkerPool.js(265,31): error TS2339: Property 'FormatMapping' does not exist on type 'typeof FormatterWorkerPool'.
-node_modules/chrome-devtools-frontend/front_end/formatter/FormatterWorkerPool.js(268,31): error TS2551: Property 'OutlineItem' does not exist on type 'typeof FormatterWorkerPool'. Did you mean 'JSOutlineItem'?
-node_modules/chrome-devtools-frontend/front_end/formatter/FormatterWorkerPool.js(286,31): error TS2339: Property 'TextRange' does not exist on type 'typeof FormatterWorkerPool'.
-node_modules/chrome-devtools-frontend/front_end/formatter/FormatterWorkerPool.js(292,47): error TS2694: Namespace 'Formatter.FormatterWorkerPool' has no exported member 'TextRange'.
-node_modules/chrome-devtools-frontend/front_end/formatter/FormatterWorkerPool.js(296,47): error TS2694: Namespace 'Formatter.FormatterWorkerPool' has no exported member 'TextRange'.
-node_modules/chrome-devtools-frontend/front_end/formatter/FormatterWorkerPool.js(298,47): error TS2694: Namespace 'Formatter.FormatterWorkerPool' has no exported member 'TextRange'.
-node_modules/chrome-devtools-frontend/front_end/formatter/FormatterWorkerPool.js(309,47): error TS2694: Namespace 'Formatter.FormatterWorkerPool' has no exported member 'TextRange'.
-node_modules/chrome-devtools-frontend/front_end/formatter/FormatterWorkerPool.js(323,31): error TS2551: Property 'CSSAtRule' does not exist on type 'typeof FormatterWorkerPool'. Did you mean 'SCSSRule'?
-node_modules/chrome-devtools-frontend/front_end/formatter/FormatterWorkerPool.js(326,88): error TS2694: Namespace 'Formatter.FormatterWorkerPool' has no exported member 'CSSAtRule'.
-node_modules/chrome-devtools-frontend/front_end/formatter/FormatterWorkerPool.js(328,31): error TS2300: Duplicate identifier 'CSSRule'.
-node_modules/chrome-devtools-frontend/front_end/formatter/FormatterWorkerPool.js(328,31): error TS2551: Property 'CSSRule' does not exist on type 'typeof FormatterWorkerPool'. Did you mean 'SCSSRule'?
-node_modules/chrome-devtools-frontend/front_end/formatter/FormatterWorkerPool.js(332,47): error TS2694: Namespace 'Formatter.FormatterWorkerPool' has no exported member 'TextRange'.
-node_modules/chrome-devtools-frontend/front_end/formatter/FormatterWorkerPool.js(334,47): error TS2694: Namespace 'Formatter.FormatterWorkerPool' has no exported member 'TextRange'.
-node_modules/chrome-devtools-frontend/front_end/formatter/FormatterWorkerPool.js(336,47): error TS2694: Namespace 'Formatter.FormatterWorkerPool' has no exported member 'TextRange'.
-node_modules/chrome-devtools-frontend/front_end/formatter/FormatterWorkerPool.js(345,54): error TS2694: Namespace 'Formatter.FormatterWorkerPool' has no exported member 'TextRange'.
-node_modules/chrome-devtools-frontend/front_end/formatter/FormatterWorkerPool.js(349,47): error TS2694: Namespace 'Formatter.FormatterWorkerPool' has no exported member 'TextRange'.
 node_modules/chrome-devtools-frontend/front_end/formatter/ScriptFormatter.js(39,12): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/formatter/ScriptFormatter.js(65,32): error TS2339: Property 'upperBound' does not exist on type 'number[]'.
 node_modules/chrome-devtools-frontend/front_end/formatter/ScriptFormatter.js(81,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
@@ -6490,20 +5957,21 @@ node_modules/chrome-devtools-frontend/front_end/formatter/ScriptFormatter.js(98,
 node_modules/chrome-devtools-frontend/front_end/formatter/ScriptFormatter.js(111,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/formatter/ScriptFormatter.js(127,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/formatter/ScriptFormatter.js(134,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
-node_modules/chrome-devtools-frontend/front_end/formatter/ScriptFormatter.js(173,45): error TS2694: Namespace 'Formatter.FormatterWorkerPool' has no exported member 'FormatMapping'.
 node_modules/chrome-devtools-frontend/front_end/formatter/ScriptFormatter.js(215,28): error TS2339: Property 'upperBound' does not exist on type 'number[]'.
 node_modules/chrome-devtools-frontend/front_end/formatter_worker.js(6,8): error TS2339: Property 'importScripts' does not exist on type 'Window & typeof globalThis'.
 node_modules/chrome-devtools-frontend/front_end/formatter_worker/AcornTokenizer.js(14,55): error TS2322: Type 'number' is not assignable to type 'boolean'.
 node_modules/chrome-devtools-frontend/front_end/formatter_worker/AcornTokenizer.js(14,71): error TS2322: Type 'any[]' is not assignable to type 'boolean'.
 node_modules/chrome-devtools-frontend/front_end/formatter_worker/AcornTokenizer.js(15,63): error TS2339: Property 'computeLineEndings' does not exist on type 'string'.
-node_modules/chrome-devtools-frontend/front_end/formatter_worker/AcornTokenizer.js(22,21): error TS2694: Namespace 'Acorn' has no exported member 'TokenOrComment'.
-node_modules/chrome-devtools-frontend/front_end/formatter_worker/AcornTokenizer.js(33,21): error TS2694: Namespace 'Acorn' has no exported member 'TokenOrComment'.
-node_modules/chrome-devtools-frontend/front_end/formatter_worker/AcornTokenizer.js(43,21): error TS2694: Namespace 'Acorn' has no exported member 'TokenOrComment'.
-node_modules/chrome-devtools-frontend/front_end/formatter_worker/AcornTokenizer.js(52,21): error TS2694: Namespace 'Acorn' has no exported member 'TokenOrComment'.
-node_modules/chrome-devtools-frontend/front_end/formatter_worker/AcornTokenizer.js(60,21): error TS2694: Namespace 'Acorn' has no exported member 'TokenOrComment'.
-node_modules/chrome-devtools-frontend/front_end/formatter_worker/AcornTokenizer.js(68,22): error TS2694: Namespace 'Acorn' has no exported member 'TokenOrComment'.
-node_modules/chrome-devtools-frontend/front_end/formatter_worker/AcornTokenizer.js(80,22): error TS2694: Namespace 'Acorn' has no exported member 'TokenOrComment'.
-node_modules/chrome-devtools-frontend/front_end/formatter_worker/AcornTokenizer.js(97,22): error TS2694: Namespace 'Acorn' has no exported member 'TokenOrComment'.
+node_modules/chrome-devtools-frontend/front_end/formatter_worker/AcornTokenizer.js(28,99): error TS2339: Property 'keyword' does not exist on type 'string | TokenType'.
+  Property 'keyword' does not exist on type 'string'.
+node_modules/chrome-devtools-frontend/front_end/formatter_worker/AcornTokenizer.js(29,33): error TS2339: Property 'label' does not exist on type 'string | TokenType'.
+  Property 'label' does not exist on type 'string'.
+node_modules/chrome-devtools-frontend/front_end/formatter_worker/AcornTokenizer.js(29,81): error TS2339: Property 'label' does not exist on type 'string | TokenType'.
+  Property 'label' does not exist on type 'string'.
+node_modules/chrome-devtools-frontend/front_end/formatter_worker/AcornTokenizer.js(38,25): error TS2339: Property 'keyword' does not exist on type 'string | TokenType'.
+  Property 'keyword' does not exist on type 'string'.
+node_modules/chrome-devtools-frontend/front_end/formatter_worker/AcornTokenizer.js(39,72): error TS2339: Property 'keyword' does not exist on type 'string | TokenType'.
+  Property 'keyword' does not exist on type 'string'.
 node_modules/chrome-devtools-frontend/front_end/formatter_worker/CSSFormatter.js(67,39): error TS2339: Property 'lowerBound' does not exist on type 'number[]'.
 node_modules/chrome-devtools-frontend/front_end/formatter_worker/CSSRuleParser.js(17,40): error TS2345: Argument of type '(message: any, targetOrigin: string, transfer?: Transferable[]) => void' is not assignable to parameter of type '(arg0: any) => any'.
 node_modules/chrome-devtools-frontend/front_end/formatter_worker/CSSRuleParser.js(22,12): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
@@ -6551,13 +6019,9 @@ node_modules/chrome-devtools-frontend/front_end/formatter_worker/HTMLFormatter.j
 node_modules/chrome-devtools-frontend/front_end/formatter_worker/HTMLFormatter.js(302,49): error TS2339: Property 'peekLast' does not exist on type 'Element[]'.
 node_modules/chrome-devtools-frontend/front_end/formatter_worker/HTMLFormatter.js(329,34): error TS2339: Property 'peekLast' does not exist on type 'Element[]'.
 node_modules/chrome-devtools-frontend/front_end/formatter_worker/JavaScriptFormatter.js(54,58): error TS2322: Type 'number' is not assignable to type 'boolean'.
-node_modules/chrome-devtools-frontend/front_end/formatter_worker/JavaScriptFormatter.js(60,21): error TS2694: Namespace 'Acorn' has no exported member 'TokenOrComment'.
 node_modules/chrome-devtools-frontend/front_end/formatter_worker/JavaScriptFormatter.js(88,15): error TS2339: Property 'parent' does not exist on type 'Node'.
-node_modules/chrome-devtools-frontend/front_end/formatter_worker/JavaScriptFormatter.js(91,37): error TS2694: Namespace 'Acorn' has no exported member 'TokenOrComment'.
 node_modules/chrome-devtools-frontend/front_end/formatter_worker/JavaScriptFormatter.js(92,43): error TS2339: Property 'parent' does not exist on type 'Node'.
-node_modules/chrome-devtools-frontend/front_end/formatter_worker/JavaScriptFormatter.js(102,37): error TS2694: Namespace 'Acorn' has no exported member 'TokenOrComment'.
 node_modules/chrome-devtools-frontend/front_end/formatter_worker/JavaScriptFormatter.js(114,23): error TS2339: Property 'parent' does not exist on type 'Node'.
-node_modules/chrome-devtools-frontend/front_end/formatter_worker/JavaScriptFormatter.js(126,21): error TS2694: Namespace 'Acorn' has no exported member 'TokenOrComment'.
 node_modules/chrome-devtools-frontend/front_end/formatter_worker/JavaScriptFormatter.js(136,19): error TS2339: Property 'label' does not exist on type 'Node'.
 node_modules/chrome-devtools-frontend/front_end/formatter_worker/JavaScriptFormatter.js(165,16): error TS2339: Property 'parent' does not exist on type 'Node'.
 node_modules/chrome-devtools-frontend/front_end/formatter_worker/JavaScriptFormatter.js(165,31): error TS2339: Property 'parent' does not exist on type 'Node'.
@@ -6616,15 +6080,10 @@ node_modules/chrome-devtools-frontend/front_end/formatter_worker/JavaScriptOutli
 node_modules/chrome-devtools-frontend/front_end/formatter_worker/JavaScriptOutline.js(74,22): error TS2339: Property 'generator' does not exist on type 'Node'.
 node_modules/chrome-devtools-frontend/front_end/formatter_worker/JavaScriptOutline.js(78,22): error TS2339: Property 'async' does not exist on type 'Node'.
 node_modules/chrome-devtools-frontend/front_end/formatter_worker/JavaScriptOutline.js(155,5): error TS2554: Expected 2-3 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/formatter_worker/RelaxedJSONParser.js(41,57): error TS2694: Namespace 'FormatterWorker.RelaxedJSONParser' has no exported member 'Context'.
-node_modules/chrome-devtools-frontend/front_end/formatter_worker/RelaxedJSONParser.js(44,65): error TS2694: Namespace 'FormatterWorker.RelaxedJSONParser' has no exported member 'Context'.
-node_modules/chrome-devtools-frontend/front_end/formatter_worker/RelaxedJSONParser.js(57,49): error TS2694: Namespace 'FormatterWorker.RelaxedJSONParser' has no exported member 'Context'.
-node_modules/chrome-devtools-frontend/front_end/formatter_worker/RelaxedJSONParser.js(89,65): error TS2694: Namespace 'FormatterWorker.RelaxedJSONParser' has no exported member 'Context'.
+node_modules/chrome-devtools-frontend/front_end/formatter_worker/RelaxedJSONParser.js(74,7): error TS2356: An arithmetic operand must be of type 'any', 'number', 'bigint' or an enum type.
 node_modules/chrome-devtools-frontend/front_end/formatter_worker/RelaxedJSONParser.js(93,13): error TS2403: Subsequent variable declarations must have the same type.  Variable 'newTip' must be of type '{}', but here has type 'any[]'.
-node_modules/chrome-devtools-frontend/front_end/formatter_worker/RelaxedJSONParser.js(96,65): error TS2694: Namespace 'FormatterWorker.RelaxedJSONParser' has no exported member 'Context'.
 node_modules/chrome-devtools-frontend/front_end/formatter_worker/RelaxedJSONParser.js(104,32): error TS2339: Property 'value' does not exist on type 'Node'.
 node_modules/chrome-devtools-frontend/front_end/formatter_worker/RelaxedJSONParser.js(159,20): error TS2339: Property 'value' does not exist on type 'Node'.
-node_modules/chrome-devtools-frontend/front_end/formatter_worker/RelaxedJSONParser.js(181,35): error TS2300: Duplicate identifier 'Context'.
 node_modules/chrome-devtools-frontend/front_end/formatter_worker/acorn/acorn.js(4,10): error TS2304: Cannot find name 'define'.
 node_modules/chrome-devtools-frontend/front_end/formatter_worker/acorn/acorn.js(4,35): error TS2304: Cannot find name 'define'.
 node_modules/chrome-devtools-frontend/front_end/formatter_worker/acorn/acorn.js(4,48): error TS2304: Cannot find name 'define'.
@@ -6715,6 +6174,8 @@ node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapsho
 node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapshot.js(918,34): error TS2345: Argument of type 'Uint32Array' is not assignable to parameter of type 'number[]'.
   Type 'Uint32Array' is missing the following properties from type 'number[]': pop, push, concat, shift, and 5 more.
 node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapshot.js(920,34): error TS2345: Argument of type 'Uint32Array' is not assignable to parameter of type 'number[]'.
+node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapshot.js(1020,35): error TS2694: Namespace 'HeapSnapshotWorker' has no exported member 'JSHeapSnapshotEdge'.
+node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapshot.js(1028,35): error TS2694: Namespace 'HeapSnapshotWorker' has no exported member 'JSHeapSnapshotRetainerEdge'.
 node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapshot.js(1045,5): error TS2322: Type 'void' is not assignable to type 'HeapSnapshotNode'.
 node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapshot.js(1083,14): error TS2339: Property 'key' does not exist on type '(arg0: HeapSnapshotNode) => boolean'.
 node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapshot.js(1086,14): error TS2339: Property 'key' does not exist on type '(arg0: HeapSnapshotNode) => boolean'.
@@ -6726,16 +6187,15 @@ node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapsho
 node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapshot.js(1273,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapshot.js(1345,12): error TS2339: Property 'nodeIndex' does not exist on type 'void'.
 node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapshot.js(1355,31): error TS2345: Argument of type 'void' is not assignable to parameter of type 'HeapSnapshotNode'.
-node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapshot.js(1369,89): error TS2694: Namespace 'HeapSnapshotWorker.HeapSnapshot' has no exported member 'AggregatedInfo'.
-node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapshot.js(1370,83): error TS2694: Namespace 'HeapSnapshotWorker.HeapSnapshot' has no exported member 'AggregatedInfo'.
-node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapshot.js(1428,63): error TS2694: Namespace 'HeapSnapshotWorker.HeapSnapshot' has no exported member 'AggregatedInfo'.
+node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapshot.js(1424,13): error TS2322: Type '{}' is not assignable to type '{ [x: string]: { count: number; distance: number; self: number; maxRet: number; name: string; idxs: number[]; }; }'.
+  Index signature is missing in type '{}'.
+node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapshot.js(1424,59): error TS2322: Type '{}' is not assignable to type '{ [x: number]: { count: number; distance: number; self: number; maxRet: number; name: string; idxs: number[]; }; }'.
+  Index signature is missing in type '{}'.
 node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapshot.js(1447,12): error TS2339: Property 'nodeIndex' does not exist on type 'void'.
 node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapshot.js(1448,29): error TS2339: Property 'classIndex' does not exist on type 'void'.
 node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapshot.js(1454,39): error TS2345: Argument of type 'void' is not assignable to parameter of type 'HeapSnapshotNode'.
 node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapshot.js(1455,17): error TS2339: Property 'selfSize' does not exist on type 'void'.
 node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapshot.js(1456,47): error TS2339: Property 'retainedSize' does not exist on type 'void'.
-node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapshot.js(1476,88): error TS2694: Namespace 'HeapSnapshotWorker.HeapSnapshot' has no exported member 'AggregatedInfo'.
-node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapshot.js(1476,178): error TS2694: Namespace 'HeapSnapshotWorker.HeapSnapshot' has no exported member 'AggregatedInfo'.
 node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapshot.js(1483,15): error TS2339: Property 'nodeIndex' does not exist on type 'void'.
 node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapshot.js(1484,15): error TS2339: Property 'nodeIndex' does not exist on type 'void'.
 node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapshot.js(1485,22): error TS2339: Property 'id' does not exist on type 'void'.
@@ -6761,7 +6221,6 @@ node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapsho
 node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapshot.js(2021,80): error TS2339: Property 'edges' does not exist on type 'void'.
 node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapshot.js(2032,80): error TS2339: Property 'edges' does not exist on type 'void'.
 node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapshot.js(2057,80): error TS2339: Property 'retainers' does not exist on type 'void'.
-node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapshot.js(2126,33): error TS2339: Property 'AggregatedInfo' does not exist on type 'typeof HeapSnapshot'.
 node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapshot.js(2205,12): error TS2339: Property 'sort' does not exist on type 'HeapSnapshotItemProvider'.
 node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapshot.js(2283,13): error TS2339: Property 'nodeIndex' does not exist on type 'void'.
 node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapshot.js(2287,13): error TS2339: Property 'nodeIndex' does not exist on type 'void'.
@@ -6773,6 +6232,8 @@ node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapsho
 node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapshot.js(2397,13): error TS2339: Property 'nodeIndex' does not exist on type 'void'.
 node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapshot.js(2398,13): error TS2339: Property 'nodeIndex' does not exist on type 'void'.
 node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapshot.js(2416,26): error TS2339: Property 'sortRange' does not exist on type 'number[]'.
+node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapshot.js(2453,35): error TS2694: Namespace 'HeapSnapshotWorker' has no exported member 'JSHeapSnapshotEdge'.
+node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapshot.js(2462,35): error TS2694: Namespace 'HeapSnapshotWorker' has no exported member 'JSHeapSnapshotRetainerEdge'.
 node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapshot.js(2473,26): error TS2339: Property 'isInvisible' does not exist on type 'HeapSnapshotEdge'.
 node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapshot.js(2508,16): error TS2339: Property 'isHidden' does not exist on type 'HeapSnapshotNode'.
 node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapshot.js(2509,62): error TS2339: Property 'rawName' does not exist on type 'HeapSnapshotNode'.
@@ -6793,20 +6254,17 @@ node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapsho
 node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapshot.js(3003,32): error TS2339: Property '_nodeFlags' does not exist on type 'HeapSnapshot'.
 node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapshot.js(3005,32): error TS2339: Property '_nodeFlags' does not exist on type 'HeapSnapshot'.
 node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapshot.js(3025,15): error TS2577: Return type annotation circularly references itself.
+node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapshot.js(3025,35): error TS2694: Namespace 'HeapSnapshotWorker' has no exported member 'JSHeapSnapshotEdge'.
 node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapshot.js(3039,27): error TS2345: Argument of type 'string | number' is not assignable to parameter of type 'string'.
   Type 'number' is not assignable to type 'string'.
 node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapshot.js(3092,28): error TS2345: Argument of type 'string | number' is not assignable to parameter of type 'string'.
   Type 'number' is not assignable to type 'string'.
 node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapshot.js(3170,15): error TS2577: Return type annotation circularly references itself.
+node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapshot.js(3170,35): error TS2694: Namespace 'HeapSnapshotWorker' has no exported member 'JSHeapSnapshotRetainerEdge'.
 node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapshotWorker.js(31,3): error TS2554: Expected 2-3 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/heap_snapshot_worker/HeapSnapshotWorker.js(37,12): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/help/Help.js(6,19): error TS2694: Namespace 'Help' has no exported member 'ReleaseNote'.
-node_modules/chrome-devtools-frontend/front_end/help/Help.js(10,22): error TS2694: Namespace 'Help' has no exported member 'ReleaseNote'.
-node_modules/chrome-devtools-frontend/front_end/help/Help.js(61,74): error TS2694: Namespace 'Help' has no exported member 'ReleaseNoteHighlight'.
-node_modules/chrome-devtools-frontend/front_end/help/ReleaseNoteText.js(12,25): error TS2694: Namespace 'Help' has no exported member 'ReleaseNote'.
 node_modules/chrome-devtools-frontend/front_end/help/ReleaseNoteView.js(10,42): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/help/ReleaseNoteView.js(11,37): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/help/ReleaseNoteView.js(16,20): error TS2694: Namespace 'Help' has no exported member 'ReleaseNote'.
 node_modules/chrome-devtools-frontend/front_end/help/ReleaseNoteView.js(21,26): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/help/ReleaseNoteView.js(26,13): error TS2339: Property 'title' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/help/ReleaseNoteView.js(29,16): error TS2339: Property 'title' does not exist on type 'Element'.
@@ -6824,35 +6282,26 @@ node_modules/chrome-devtools-frontend/front_end/host/InspectorFrontendHost.js(12
 node_modules/chrome-devtools-frontend/front_end/host/InspectorFrontendHost.js(189,10): error TS2339: Property 'events' does not exist on type 'InspectorFrontendHostStub'.
 node_modules/chrome-devtools-frontend/front_end/host/InspectorFrontendHost.js(221,10): error TS2339: Property 'events' does not exist on type 'InspectorFrontendHostStub'.
 node_modules/chrome-devtools-frontend/front_end/host/InspectorFrontendHost.js(253,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/host/InspectorFrontendHost.js(253,49): error TS2694: Namespace 'InspectorFrontendHostAPI' has no exported member 'LoadNetworkResourceResult'.
+node_modules/chrome-devtools-frontend/front_end/host/InspectorFrontendHost.js(259,20): error TS2345: Argument of type '{ statusCode: number; }' is not assignable to parameter of type '{ statusCode: number; headers: { [x: string]: string; }; }'.
+  Property 'headers' is missing in type '{ statusCode: number; }' but required in type '{ statusCode: number; headers: { [x: string]: string; }; }'.
+node_modules/chrome-devtools-frontend/front_end/host/InspectorFrontendHost.js(262,20): error TS2345: Argument of type '{ statusCode: number; }' is not assignable to parameter of type '{ statusCode: number; headers: { [x: string]: string; }; }'.
+  Property 'headers' is missing in type '{ statusCode: number; }' but required in type '{ statusCode: number; headers: { [x: string]: string; }; }'.
 node_modules/chrome-devtools-frontend/front_end/host/InspectorFrontendHost.js(268,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/host/InspectorFrontendHost.js(274,14): error TS2345: Argument of type '{}' is not assignable to parameter of type '{ [x: string]: string; }'.
   Index signature is missing in type '{}'.
+node_modules/chrome-devtools-frontend/front_end/host/InspectorFrontendHost.js(303,15): error TS2304: Cannot find name 'FileSystem'.
 node_modules/chrome-devtools-frontend/front_end/host/InspectorFrontendHost.js(381,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/host/InspectorFrontendHost.js(407,19): error TS2694: Namespace 'Adb' has no exported member 'Config'.
-node_modules/chrome-devtools-frontend/front_end/host/InspectorFrontendHost.js(445,48): error TS2694: Namespace 'InspectorFrontendHostAPI' has no exported member 'ContextMenuDescriptor'.
-node_modules/chrome-devtools-frontend/front_end/host/InspectorFrontendHost.js(471,12): error TS2538: Type 'string[]' cannot be used as an index type.
 node_modules/chrome-devtools-frontend/front_end/host/InspectorFrontendHost.js(557,10): error TS2551: Property 'InspectorFrontendAPI' does not exist on type 'Window & typeof globalThis'. Did you mean 'InspectorFrontendHost'?
-node_modules/chrome-devtools-frontend/front_end/host/InspectorFrontendHostAPI.js(15,50): error TS2694: Namespace 'InspectorFrontendHostAPI' has no exported member 'ContextMenuDescriptor'.
-node_modules/chrome-devtools-frontend/front_end/host/InspectorFrontendHostAPI.js(17,26): error TS2300: Duplicate identifier 'ContextMenuDescriptor'.
-node_modules/chrome-devtools-frontend/front_end/host/InspectorFrontendHostAPI.js(17,26): error TS2339: Property 'ContextMenuDescriptor' does not exist on type 'typeof InspectorFrontendHostAPI'.
-node_modules/chrome-devtools-frontend/front_end/host/InspectorFrontendHostAPI.js(24,26): error TS2339: Property 'LoadNetworkResourceResult' does not exist on type 'typeof InspectorFrontendHostAPI'.
 node_modules/chrome-devtools-frontend/front_end/host/InspectorFrontendHostAPI.js(118,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/host/InspectorFrontendHostAPI.js(123,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/host/InspectorFrontendHostAPI.js(128,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/host/InspectorFrontendHostAPI.js(133,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/host/InspectorFrontendHostAPI.js(210,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
-node_modules/chrome-devtools-frontend/front_end/host/InspectorFrontendHostAPI.js(218,49): error TS2694: Namespace 'InspectorFrontendHostAPI' has no exported member 'LoadNetworkResourceResult'.
+node_modules/chrome-devtools-frontend/front_end/host/InspectorFrontendHostAPI.js(241,15): error TS2304: Cannot find name 'FileSystem'.
 node_modules/chrome-devtools-frontend/front_end/host/InspectorFrontendHostAPI.js(246,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
-node_modules/chrome-devtools-frontend/front_end/host/InspectorFrontendHostAPI.js(263,19): error TS2694: Namespace 'Adb' has no exported member 'Config'.
 node_modules/chrome-devtools-frontend/front_end/host/InspectorFrontendHostAPI.js(299,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
-node_modules/chrome-devtools-frontend/front_end/host/InspectorFrontendHostAPI.js(312,48): error TS2694: Namespace 'InspectorFrontendHostAPI' has no exported member 'ContextMenuDescriptor'.
 node_modules/chrome-devtools-frontend/front_end/host/InspectorFrontendHostAPI.js(332,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/host/ResourceLoader.js(38,12): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/host/ResourceLoader.js(75,40): error TS2694: Namespace 'InspectorFrontendHostAPI' has no exported member 'LoadNetworkResourceResult'.
-node_modules/chrome-devtools-frontend/front_end/host/ResourceLoader.js(88,59): error TS2694: Namespace 'InspectorFrontendHostAPI' has no exported member 'LoadNetworkResourceResult'.
-node_modules/chrome-devtools-frontend/front_end/host/ResourceLoader.js(92,59): error TS2694: Namespace 'InspectorFrontendHostAPI' has no exported member 'LoadNetworkResourceResult'.
-node_modules/chrome-devtools-frontend/front_end/host/UserMetrics.js(56,77): error TS2345: Argument of type '{ WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; TimelineStarted: number; ProfilesCPUProfileTaken: number; ProfilesHeapProfileTaken: number; AuditsStarted: number; ... 23 more ...; ShowedThirdPartyBadges: number; }' is not assignable to parameter of type 'number'.
 node_modules/chrome-devtools-frontend/front_end/inline_editor/BezierEditor.js(11,25): error TS2339: Property 'tabIndex' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/inline_editor/BezierEditor.js(15,48): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/inline_editor/BezierEditor.js(18,46): error TS2339: Property 'createChild' does not exist on type 'Element'.
@@ -6870,12 +6319,9 @@ node_modules/chrome-devtools-frontend/front_end/inline_editor/BezierEditor.js(13
 node_modules/chrome-devtools-frontend/front_end/inline_editor/BezierEditor.js(134,48): error TS2339: Property 'y' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/inline_editor/BezierEditor.js(142,39): error TS2339: Property 'x' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/inline_editor/BezierEditor.js(142,48): error TS2339: Property 'y' does not exist on type 'Event'.
-node_modules/chrome-devtools-frontend/front_end/inline_editor/BezierEditor.js(149,42): error TS2694: Namespace 'InlineEditor.BezierEditor' has no exported member 'PresetCategory'.
 node_modules/chrome-devtools-frontend/front_end/inline_editor/BezierEditor.js(153,37): error TS2339: Property 'createSVGChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/inline_editor/BezierEditor.js(167,30): error TS2339: Property 'createSVGChild' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/inline_editor/BezierEditor.js(183,41): error TS2694: Namespace 'InlineEditor.BezierEditor' has no exported member 'PresetCategory'.
 node_modules/chrome-devtools-frontend/front_end/inline_editor/BezierEditor.js(197,13): error TS2339: Property 'consume' does not exist on type 'Event'.
-node_modules/chrome-devtools-frontend/front_end/inline_editor/BezierEditor.js(271,27): error TS2339: Property 'PresetCategory' does not exist on type 'typeof BezierEditor'.
 node_modules/chrome-devtools-frontend/front_end/inline_editor/BezierUI.js(69,30): error TS2339: Property 'createSVGChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/inline_editor/BezierUI.js(85,32): error TS2339: Property 'createSVGChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/inline_editor/BezierUI.js(100,31): error TS2345: Argument of type 'number' is not assignable to parameter of type 'string'.
@@ -6957,8 +6403,6 @@ node_modules/chrome-devtools-frontend/front_end/inline_editor/ColorSwatch.js(228
 node_modules/chrome-devtools-frontend/front_end/inline_editor/ColorSwatch.js(232,91): error TS2339: Property '_constructor' does not exist on type 'typeof CSSShadowSwatch'.
 node_modules/chrome-devtools-frontend/front_end/inline_editor/ColorSwatch.js(290,10): error TS2339: Property 'createChild' does not exist on type 'DocumentFragment'.
 node_modules/chrome-devtools-frontend/front_end/inline_editor/ColorSwatch.js(291,33): error TS2339: Property 'createChild' does not exist on type 'CSSShadowSwatch'.
-node_modules/chrome-devtools-frontend/front_end/inline_editor/SwatchPopoverHelper.js(12,35): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ SetExactSize: symbol; SetExactWidthMaxHeight: symbol; MeasureContent: symbol; }'.
-node_modules/chrome-devtools-frontend/front_end/inline_editor/SwatchPopoverHelper.js(13,37): error TS2345: Argument of type 'symbol' is not assignable to parameter of type 'boolean'.
 node_modules/chrome-devtools-frontend/front_end/inline_editor/SwatchPopoverHelper.js(14,64): error TS2339: Property 'consume' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/inline_editor/SwatchPopoverHelper.js(26,16): error TS2339: Property 'relatedTarget' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/inline_editor/SwatchPopoverHelper.js(26,39): error TS2339: Property 'relatedTarget' does not exist on type 'Event'.
@@ -6971,14 +6415,12 @@ node_modules/chrome-devtools-frontend/front_end/integration_test_runner.js(6,3):
 node_modules/chrome-devtools-frontend/front_end/integration_test_runner.js(7,3): error TS2552: Cannot find name 'testRunner'. Did you mean 'TestRunner'?
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/LayerDetailsView.js(43,51): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/LayerDetailsView.js(84,15): error TS2339: Property 'which' does not exist on type 'Event'.
-node_modules/chrome-devtools-frontend/front_end/layer_viewer/LayerDetailsView.js(90,9): error TS2367: This condition will always return 'false' since the types '{ Layer: symbol; ScrollRect: symbol; Snapshot: symbol; }' and 'symbol' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/LayerDetailsView.js(95,24): error TS2694: Namespace 'Protocol' has no exported member 'LayerTree'.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/LayerDetailsView.js(102,25): error TS2339: Property 'scrollRectIndex' does not exist on type 'Selection'.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/LayerDetailsView.js(120,85): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/LayerDetailsView.js(159,16): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/LayerDetailsView.js(161,16): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/LayerDetailsView.js(179,51): error TS2339: Property 'bytesToString' does not exist on type 'NumberConstructor'.
-node_modules/chrome-devtools-frontend/front_end/layer_viewer/LayerDetailsView.js(184,20): error TS2367: This condition will always return 'false' since the types '{ Layer: symbol; ScrollRect: symbol; Snapshot: symbol; }' and 'symbol' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/LayerDetailsView.js(191,46): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/LayerDetailsView.js(193,45): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/LayerDetailsView.js(194,59): error TS2555: Expected at least 2 arguments, but got 1.
@@ -6988,6 +6430,7 @@ node_modules/chrome-devtools-frontend/front_end/layer_viewer/LayerDetailsView.js
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/LayerDetailsView.js(198,65): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/LayerDetailsView.js(199,53): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/LayerDetailsView.js(200,52): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/layer_viewer/LayerDetailsView.js(238,30): error TS2300: Duplicate identifier 'Events'.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/LayerDetailsView.js(246,25): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/LayerDetailsView.js(247,19): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/LayerDetailsView.js(248,20): error TS2555: Expected at least 2 arguments, but got 1.
@@ -7029,27 +6472,12 @@ node_modules/chrome-devtools-frontend/front_end/layer_viewer/LayerTreeOutline.js
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/LayerTreeOutline.js(199,80): error TS2339: Property '_layer' does not exist on type 'TreeElement'.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/LayerTreeOutline.js(222,11): error TS2339: Property 'createTextChild' does not exist on type 'DocumentFragment'.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/LayerTreeOutline.js(223,25): error TS2339: Property 'createChild' does not exist on type 'DocumentFragment'.
-node_modules/chrome-devtools-frontend/front_end/layer_viewer/LayerViewHost.js(92,11): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ Layer: symbol; ScrollRect: symbol; Snapshot: symbol; }'.
-node_modules/chrome-devtools-frontend/front_end/layer_viewer/LayerViewHost.js(101,12): error TS2367: This condition will always return 'false' since the types '{ Layer: symbol; ScrollRect: symbol; Snapshot: symbol; }' and 'symbol' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/layer_viewer/LayerViewHost.js(114,11): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ Layer: symbol; ScrollRect: symbol; Snapshot: symbol; }'.
-node_modules/chrome-devtools-frontend/front_end/layer_viewer/LayerViewHost.js(124,12): error TS2367: This condition will always return 'false' since the types '{ Layer: symbol; ScrollRect: symbol; Snapshot: symbol; }' and 'symbol' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/LayerViewHost.js(125,84): error TS2339: Property 'scrollRectIndex' does not exist on type 'Selection'.
-node_modules/chrome-devtools-frontend/front_end/layer_viewer/LayerViewHost.js(135,19): error TS2694: Namespace 'SDK' has no exported member 'SnapshotWithRect'.
-node_modules/chrome-devtools-frontend/front_end/layer_viewer/LayerViewHost.js(138,11): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ Layer: symbol; ScrollRect: symbol; Snapshot: symbol; }'.
-node_modules/chrome-devtools-frontend/front_end/layer_viewer/LayerViewHost.js(148,12): error TS2367: This condition will always return 'false' since the types '{ Layer: symbol; ScrollRect: symbol; Snapshot: symbol; }' and 'symbol' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/LayerViewHost.js(149,34): error TS2339: Property '_snapshot' does not exist on type 'Selection'.
-node_modules/chrome-devtools-frontend/front_end/layer_viewer/LayerViewHost.js(153,20): error TS2694: Namespace 'SDK' has no exported member 'SnapshotWithRect'.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/LayerViewHost.js(231,16): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(44,30): error TS2339: Property 'createTextChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(44,53): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(54,47): error TS2339: Property 'createChild' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(152,22): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Hovered: string; Selected: string; }'.
-node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(160,22): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Hovered: string; Selected: string; }'.
-node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(161,22): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Hovered: string; Selected: string; }'.
-node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(166,29): error TS2694: Namespace 'SDK' has no exported member 'SnapshotWithRect'.
-node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(169,9): error TS2367: This condition will always return 'false' since the types '{ Layer: symbol; ScrollRect: symbol; Snapshot: symbol; }' and 'symbol' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(172,39): error TS2694: Namespace 'SDK' has no exported member 'SnapshotWithRect'.
-node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(179,37): error TS2694: Namespace 'SDK' has no exported member 'SnapshotWithRect'.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(187,21): error TS2339: Property 'getContext' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(215,25): error TS2339: Property 'vertexPositionAttribute' does not exist on type 'WebGLProgram'.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(216,58): error TS2339: Property 'vertexPositionAttribute' does not exist on type 'WebGLProgram'.
@@ -7062,7 +6490,6 @@ node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(223
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(253,31): error TS2339: Property 'constrain' does not exist on type 'NumberConstructor'.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(285,51): error TS2339: Property 'pMatrixUniform' does not exist on type 'WebGLProgram'.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(289,15): error TS2304: Cannot find name 'CSSMatrix'.
-node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(314,30): error TS2538: Type '{ Left: number; Middle: number; Right: number; }' cannot be used as an index type.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(515,50): error TS2339: Property 'vertexPositionAttribute' does not exist on type 'WebGLProgram'.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(516,50): error TS2339: Property 'textureCoordAttribute' does not exist on type 'WebGLProgram'.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(517,50): error TS2339: Property 'vertexColorAttribute' does not exist on type 'WebGLProgram'.
@@ -7084,15 +6511,13 @@ node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(641
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(642,22): error TS2339: Property 'clientY' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(670,29): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(693,16): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(695,22): error TS2367: This condition will always return 'false' since the types '{ Layer: symbol; ScrollRect: symbol; Snapshot: symbol; }' and 'symbol' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(697,18): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(708,15): error TS2339: Property 'which' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(717,30): error TS2339: Property 'clientX' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(718,30): error TS2339: Property 'clientY' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(726,44): error TS2339: Property 'clientX' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(727,24): error TS2339: Property 'clientY' does not exist on type 'Event'.
-node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(738,23): error TS2367: This condition will always return 'false' since the types '{ Layer: symbol; ScrollRect: symbol; Snapshot: symbol; }' and 'symbol' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(762,26): error TS2339: Property 'LayerStyle' does not exist on type 'typeof Layers3DView'.
+node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(776,26): error TS2300: Duplicate identifier 'Events'.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(794,28): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(795,29): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(796,29): error TS2555: Expected at least 2 arguments, but got 1.
@@ -7100,10 +6525,12 @@ node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(841
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(852,15): error TS2749: 'Image' refers to a value, but is being used as a type here.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(858,13): error TS2339: Property 'image' does not exist on type 'WebGLTexture'.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(861,81): error TS2339: Property 'image' does not exist on type 'WebGLTexture'.
-node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(928,26): error TS2694: Namespace 'SDK' has no exported member 'SnapshotWithRect'.
+node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(936,45): error TS2345: Argument of type '{ rect: any; snapshot: PaintProfilerSnapshot; }' is not assignable to parameter of type 'PaintProfilerSnapshot'.
+  Type '{ rect: any; snapshot: PaintProfilerSnapshot; }' is missing the following properties from type 'PaintProfilerSnapshot': _paintProfilerModel, _id, _refCount, release, and 4 more.
+node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(939,36): error TS2345: Argument of type 'Tile' is not assignable to parameter of type 'PaintProfilerSnapshot'.
+  Type 'Tile' is missing the following properties from type 'PaintProfilerSnapshot': _paintProfilerModel, _id, _refCount, release, and 4 more.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(1080,24): error TS2694: Namespace 'Protocol' has no exported member 'DOM'.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(1098,15): error TS2304: Cannot find name 'CSSMatrix'.
-node_modules/chrome-devtools-frontend/front_end/layer_viewer/Layers3DView.js(1143,19): error TS2694: Namespace 'SDK' has no exported member 'SnapshotWithRect'.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/PaintProfilerView.js(36,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/PaintProfilerView.js(42,49): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/PaintProfilerView.js(43,48): error TS2339: Property 'createChild' does not exist on type 'Element'.
@@ -7137,9 +6564,7 @@ node_modules/chrome-devtools-frontend/front_end/layer_viewer/TransformController
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/TransformController.js(20,20): error TS2339: Property 'tabIndex' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/TransformController.js(35,55): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/TransformController.js(40,58): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/layer_viewer/TransformController.js(46,19): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Pan: string; Rotate: string; }'.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/TransformController.js(48,51): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/layer_viewer/TransformController.js(116,9): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Pan: string; Rotate: string; }'.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/TransformController.js(128,18): error TS2339: Property 'focus' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/TransformController.js(144,18): error TS2339: Property 'focus' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/layer_viewer/TransformController.js(154,26): error TS2339: Property 'constrain' does not exist on type 'NumberConstructor'.
@@ -7168,7 +6593,6 @@ node_modules/chrome-devtools-frontend/front_end/layers/LayerTreeModel.js(171,32)
 node_modules/chrome-devtools-frontend/front_end/layers/LayerTreeModel.js(221,24): error TS2694: Namespace 'Protocol' has no exported member 'LayerTree'.
 node_modules/chrome-devtools-frontend/front_end/layers/LayerTreeModel.js(384,25): error TS2694: Namespace 'Protocol' has no exported member 'DOM'.
 node_modules/chrome-devtools-frontend/front_end/layers/LayerTreeModel.js(392,33): error TS2694: Namespace 'Protocol' has no exported member 'LayerTree'.
-node_modules/chrome-devtools-frontend/front_end/layers/LayerTreeModel.js(437,36): error TS2694: Namespace 'SDK' has no exported member 'SnapshotWithRect'.
 node_modules/chrome-devtools-frontend/front_end/layers/LayerTreeModel.js(449,24): error TS2694: Namespace 'Protocol' has no exported member 'DOM'.
 node_modules/chrome-devtools-frontend/front_end/layers/LayerTreeModel.js(458,24): error TS2694: Namespace 'Protocol' has no exported member 'LayerTree'.
 node_modules/chrome-devtools-frontend/front_end/layers/LayerTreeModel.js(477,16): error TS2304: Cannot find name 'CSSMatrix'.
@@ -7179,18 +6603,9 @@ node_modules/chrome-devtools-frontend/front_end/layers/LayerTreeModel.js(552,32)
 node_modules/chrome-devtools-frontend/front_end/layers/LayerTreeModel.js(560,24): error TS2694: Namespace 'Protocol' has no exported member 'LayerTree'.
 node_modules/chrome-devtools-frontend/front_end/layers/LayerTreeModel.js(561,24): error TS2694: Namespace 'Protocol' has no exported member 'DOM'.
 node_modules/chrome-devtools-frontend/front_end/layers/LayersPanel.js(63,60): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/layers/LayersPanel.js(138,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/layers/LayersPanel.js(150,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/layers/LayersPanel.js(160,65): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/layers/LayersPanel.js(169,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/layers/LayersPanel.js(187,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/layers_test_runner/LayersTestRunner.js(55,22): error TS2339: Property 'layers' does not exist on type 'any[]'.
 node_modules/chrome-devtools-frontend/front_end/layers_test_runner/LayersTestRunner.js(130,14): error TS2554: Expected 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/main/ExecutionContextSelector.js(63,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/main/ExecutionContextSelector.js(83,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/main/ExecutionContextSelector.js(140,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/main/ExecutionContextSelector.js(147,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/main/ExecutionContextSelector.js(156,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/main/Main.js(39,15): error TS2339: Property '_instanceForTest' does not exist on type 'typeof Main'.
 node_modules/chrome-devtools-frontend/front_end/main/Main.js(192,39): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/main/Main.js(193,39): error TS2555: Expected at least 2 arguments, but got 1.
@@ -7198,9 +6613,6 @@ node_modules/chrome-devtools-frontend/front_end/main/Main.js(194,39): error TS25
 node_modules/chrome-devtools-frontend/front_end/main/Main.js(195,39): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/main/Main.js(208,5): error TS2741: Property '_extensionAPITestHook' is missing in type 'ExtensionServer' but required in type 'typeof extensionServer'.
 node_modules/chrome-devtools-frontend/front_end/main/Main.js(302,32): error TS2339: Property 'initializeExtensions' does not exist on type 'typeof extensionServer'.
-node_modules/chrome-devtools-frontend/front_end/main/Main.js(321,24): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/main/Main.js(331,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/main/Main.js(345,24): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/main/Main.js(360,53): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/main/Main.js(365,41): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/main/Main.js(367,37): error TS2555: Expected at least 2 arguments, but got 1.
@@ -7214,7 +6626,6 @@ node_modules/chrome-devtools-frontend/front_end/main/Main.js(392,49): error TS25
 node_modules/chrome-devtools-frontend/front_end/main/Main.js(399,43): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/main/Main.js(424,49): error TS2339: Property 'ownerDocument' does not exist on type 'EventTarget'.
 node_modules/chrome-devtools-frontend/front_end/main/Main.js(428,19): error TS2339: Property 'handled' does not exist on type 'CustomEvent<any>'.
-node_modules/chrome-devtools-frontend/front_end/main/Main.js(450,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/main/Main.js(472,12): error TS2339: Property 'registerInspectorDispatcher' does not exist on type 'Target'.
 node_modules/chrome-devtools-frontend/front_end/main/Main.js(473,12): error TS2339: Property 'inspectorAgent' does not exist on type 'Target'.
 node_modules/chrome-devtools-frontend/front_end/main/Main.js(567,65): error TS2339: Property 'deepActiveElement' does not exist on type 'Document'.
@@ -7235,8 +6646,6 @@ node_modules/chrome-devtools-frontend/front_end/main/Main.js(721,29): error TS25
 node_modules/chrome-devtools-frontend/front_end/main/Main.js(724,29): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/main/Main.js(727,29): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/main/Main.js(747,29): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/main/Main.js(764,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/main/Main.js(786,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/main/Main.js(801,31): error TS2339: Property 'sendRawMessageForTesting' does not exist on type 'typeof InspectorBackend'.
 node_modules/chrome-devtools-frontend/front_end/main/Main.js(819,39): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/main/Main.js(820,54): error TS2555: Expected at least 2 arguments, but got 1.
@@ -7244,13 +6653,11 @@ node_modules/chrome-devtools-frontend/front_end/main/Main.js(822,25): error TS23
 node_modules/chrome-devtools-frontend/front_end/main/Main.js(823,16): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/main/Main.js(824,45): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/main/Main.js(825,25): error TS2339: Property 'createChild' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/main/Main.js(833,28): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ SetExactSize: symbol; SetExactWidthMaxHeight: symbol; MeasureContent: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/main/Main.js(847,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/main/Main.js(852,25): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/main/Main.js(853,16): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/main/Main.js(854,25): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/main/Main.js(855,16): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/main/Main.js(864,28): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ SetExactSize: symbol; SetExactWidthMaxHeight: symbol; MeasureContent: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/main/Main.js(907,12): error TS2339: Property 'pageAgent' does not exist on type 'Target'.
 node_modules/chrome-devtools-frontend/front_end/main/Main.js(945,16): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/main/RenderingOptions.js(37,16): error TS2555: Expected at least 2 arguments, but got 1.
@@ -7266,37 +6673,24 @@ node_modules/chrome-devtools-frontend/front_end/main/RenderingOptions.js(57,42):
 node_modules/chrome-devtools-frontend/front_end/main/RenderingOptions.js(58,58): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/main/RenderingOptions.js(59,54): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/main/RequestAppBannerActionDelegate.js(18,14): error TS2339: Property 'pageAgent' does not exist on type 'Target'.
-node_modules/chrome-devtools-frontend/front_end/mobile_throttling/MobileThrottlingSelector.js(7,48): error TS2694: Namespace 'MobileThrottling' has no exported member 'MobileThrottlingConditionsGroup'.
-node_modules/chrome-devtools-frontend/front_end/mobile_throttling/MobileThrottlingSelector.js(7,100): error TS2694: Namespace 'MobileThrottling' has no exported member 'ConditionsList'.
 node_modules/chrome-devtools-frontend/front_end/mobile_throttling/MobileThrottlingSelector.js(8,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/mobile_throttling/MobileThrottlingSelector.js(17,34): error TS2694: Namespace 'MobileThrottling' has no exported member 'ConditionsList'.
-node_modules/chrome-devtools-frontend/front_end/mobile_throttling/MobileThrottlingSelector.js(23,32): error TS2694: Namespace 'MobileThrottling' has no exported member 'Conditions'.
-node_modules/chrome-devtools-frontend/front_end/mobile_throttling/MobileThrottlingSelector.js(31,33): error TS2694: Namespace 'MobileThrottling' has no exported member 'ConditionsList'.
 node_modules/chrome-devtools-frontend/front_end/mobile_throttling/MobileThrottlingSelector.js(34,40): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/mobile_throttling/MobileThrottlingSelector.js(35,39): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/mobile_throttling/MobileThrottlingSelector.js(36,40): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/mobile_throttling/NetworkThrottlingSelector.js(7,48): error TS2694: Namespace 'MobileThrottling' has no exported member 'NetworkThrottlingConditionsGroup'.
-node_modules/chrome-devtools-frontend/front_end/mobile_throttling/NetworkThrottlingSelector.js(7,110): error TS2694: Namespace 'SDK.NetworkManager' has no exported member 'Conditions'.
+node_modules/chrome-devtools-frontend/front_end/mobile_throttling/MobileThrottlingSelector.js(45,28): error TS2339: Property 'network' does not exist on type '{ title: string; description: string; network: { download: number; upload: number; latency: number; title: string; }; cpuThrottlingRate: number; } | { title: string; description: string; }'.
+  Property 'network' does not exist on type '{ title: string; description: string; }'.
+node_modules/chrome-devtools-frontend/front_end/mobile_throttling/MobileThrottlingSelector.js(45,68): error TS2339: Property 'cpuThrottlingRate' does not exist on type '{ title: string; description: string; network: { download: number; upload: number; latency: number; title: string; }; cpuThrottlingRate: number; } | { title: string; description: string; }'.
+  Property 'cpuThrottlingRate' does not exist on type '{ title: string; description: string; }'.
 node_modules/chrome-devtools-frontend/front_end/mobile_throttling/NetworkThrottlingSelector.js(8,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/mobile_throttling/NetworkThrottlingSelector.js(9,57): error TS2694: Namespace 'SDK.NetworkManager' has no exported member 'Conditions'.
-node_modules/chrome-devtools-frontend/front_end/mobile_throttling/NetworkThrottlingSelector.js(18,43): error TS2694: Namespace 'SDK.NetworkManager' has no exported member 'Conditions'.
-node_modules/chrome-devtools-frontend/front_end/mobile_throttling/NetworkThrottlingSelector.js(29,34): error TS2694: Namespace 'SDK.NetworkManager' has no exported member 'Conditions'.
 node_modules/chrome-devtools-frontend/front_end/mobile_throttling/NetworkThrottlingSelector.js(36,40): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/mobile_throttling/NetworkThrottlingSelector.js(37,39): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/mobile_throttling/NetworkThrottlingSelector.js(38,38): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/mobile_throttling/NetworkThrottlingSelector.js(43,62): error TS2694: Namespace 'SDK.NetworkManager' has no exported member 'Conditions'.
-node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingManager.js(12,5): error TS2322: Type 'number' is not assignable to type '{ NoThrottling: number; MidTierMobile: number; LowEndMobile: number; }'.
-node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingManager.js(16,59): error TS2694: Namespace 'SDK.NetworkManager' has no exported member 'Conditions'.
-node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingManager.js(18,36): error TS2694: Namespace 'SDK.NetworkManager' has no exported member 'Conditions'.
-node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingManager.js(20,36): error TS2694: Namespace 'SDK.NetworkManager' has no exported member 'Conditions'.
 node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingManager.js(28,57): error TS2345: Argument of type 'this' is not assignable to parameter of type '{ modelAdded(model: T): void; modelRemoved(model: T): void; }'.
   Type 'ThrottlingManager' is not assignable to type '{ modelAdded(model: T): void; modelRemoved(model: T): void; }'.
     Types of property 'modelAdded' are incompatible.
       Type '(emulationModel: EmulationModel) => void' is not assignable to type '(model: T) => void'.
         Types of parameters 'emulationModel' and 'model' are incompatible.
           Type 'T' is not assignable to type 'EmulationModel'.
-node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingManager.js(44,42): error TS2694: Namespace 'MobileThrottling' has no exported member 'NetworkThrottlingConditionsGroup'.
-node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingManager.js(45,44): error TS2694: Namespace 'SDK.NetworkManager' has no exported member 'Conditions'.
 node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingManager.js(48,21): error TS2339: Property 'removeChildren' does not exist on type 'HTMLSelectElement'.
 node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingManager.js(52,42): error TS2339: Property 'createChild' does not exist on type 'HTMLSelectElement'.
 node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingManager.js(61,54): error TS2555: Expected at least 2 arguments, but got 1.
@@ -7304,52 +6698,23 @@ node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingMana
 node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingManager.js(89,16): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingManager.js(89,44): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingManager.js(117,28): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingManager.js(122,34): error TS2694: Namespace 'MobileThrottling' has no exported member 'ConditionsList'.
 node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingManager.js(140,20): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingManager.js(141,81): error TS2694: Namespace 'MobileThrottling' has no exported member 'Conditions'.
-node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingManager.js(147,42): error TS2694: Namespace 'MobileThrottling' has no exported member 'MobileThrottlingConditionsGroup'.
-node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingManager.js(148,35): error TS2694: Namespace 'MobileThrottling' has no exported member 'ConditionsList'.
-node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingManager.js(174,5): error TS2322: Type '{ NoThrottling: number; MidTierMobile: number; LowEndMobile: number; }' is not assignable to type 'number'.
-node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingManager.js(183,43): error TS2345: Argument of type '{ NoThrottling: number; MidTierMobile: number; LowEndMobile: number; }' is not assignable to parameter of type 'number'.
-node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingManager.js(185,9): error TS2367: This condition will always return 'true' since the types '{ NoThrottling: number; MidTierMobile: number; LowEndMobile: number; }' and 'number' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingManager.js(186,36): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; TimelineStarted: number; ProfilesCPUProfileTaken: number; ProfilesHeapProfileTaken: number; AuditsStarted: number; ... 23 more ...; ShowedThirdPartyBadges: number; }'.
 node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingManager.js(188,27): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingManager.js(202,9): error TS2367: This condition will always return 'true' since the types '{ NoThrottling: number; MidTierMobile: number; LowEndMobile: number; }' and 'number' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingManager.js(203,43): error TS2345: Argument of type '{ NoThrottling: number; MidTierMobile: number; LowEndMobile: number; }' is not assignable to parameter of type 'number'.
 node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingManager.js(218,82): error TS2339: Property 'selectedIndex' does not exist on type 'EventTarget'.
-node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingManager.js(224,19): error TS2367: This condition will always return 'false' since the types '{ NoThrottling: number; MidTierMobile: number; LowEndMobile: number; }' and '1' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingManager.js(224,39): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingPresets.js(16,35): error TS2694: Namespace 'SDK.NetworkManager' has no exported member 'Conditions'.
-node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingPresets.js(20,18): error TS2300: Duplicate identifier 'Conditions'.
-node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingPresets.js(22,30): error TS2694: Namespace 'MobileThrottling' has no exported member 'Conditions'.
 node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingPresets.js(25,23): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingPresets.js(30,30): error TS2694: Namespace 'MobileThrottling' has no exported member 'Conditions'.
 node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingPresets.js(33,23): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingPresets.js(38,30): error TS2694: Namespace 'MobileThrottling' has no exported member 'Conditions'.
 node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingPresets.js(40,17): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingPresets.js(41,23): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingPresets.js(46,30): error TS2694: Namespace 'MobileThrottling' has no exported member 'Conditions'.
 node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingPresets.js(48,17): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingPresets.js(49,23): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingPresets.js(62,30): error TS2694: Namespace 'MobileThrottling' has no exported member 'PlaceholderConditions'.
 node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingPresets.js(64,17): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingPresets.js(65,23): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingPresets.js(68,66): error TS2694: Namespace 'SDK.NetworkManager' has no exported member 'Conditions'.
-node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingPresets.js(71,64): error TS2694: Namespace 'MobileThrottling' has no exported member 'Conditions'.
-node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingPresets.js(71,93): error TS2694: Namespace 'MobileThrottling' has no exported member 'PlaceholderConditions'.
-node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingPresets.js(74,40): error TS2694: Namespace 'MobileThrottling' has no exported member 'Conditions'.
-node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingPresets.js(74,69): error TS2694: Namespace 'MobileThrottling' has no exported member 'PlaceholderConditions'.
-node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingPresets.js(77,38): error TS2694: Namespace 'MobileThrottling' has no exported member 'Conditions'.
-node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingPresets.js(82,38): error TS2694: Namespace 'MobileThrottling' has no exported member 'Conditions'.
-node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingPresets.js(87,39): error TS2694: Namespace 'SDK.NetworkManager' has no exported member 'Conditions'.
-node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingPresets.js(96,3): error TS2322: Type 'number' is not assignable to type '{ NoThrottling: number; MidTierMobile: number; LowEndMobile: number; }'.
-node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingPresets.js(97,3): error TS2322: Type 'number' is not assignable to type '{ NoThrottling: number; MidTierMobile: number; LowEndMobile: number; }'.
-node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingPresets.js(98,3): error TS2322: Type 'number' is not assignable to type '{ NoThrottling: number; MidTierMobile: number; LowEndMobile: number; }'.
+node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingPresets.js(79,86): error TS2739: Type '{ title: string; description: string; }' is missing the following properties from type '{ title: string; description: string; network: { download: number; upload: number; latency: number; title: string; }; cpuThrottlingRate: number; }': network, cpuThrottlingRate
 node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingSettingsTab.js(14,25): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingSettingsTab.js(14,75): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingSettingsTab.js(17,16): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingSettingsTab.js(29,25): error TS2339: Property 'tabIndex' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingSettingsTab.js(61,53): error TS2694: Namespace 'SDK.NetworkManager' has no exported member 'Conditions'.
 node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingSettingsTab.js(63,25): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingSettingsTab.js(67,13): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingSettingsTab.js(68,13): error TS2339: Property 'createChild' does not exist on type 'Element'.
@@ -7357,8 +6722,6 @@ node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingSett
 node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingSettingsTab.js(71,13): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingSettingsTab.js(72,13): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingSettingsTab.js(73,13): error TS2339: Property 'createChild' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingSettingsTab.js(95,53): error TS2694: Namespace 'SDK.NetworkManager' has no exported member 'Conditions'.
-node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingSettingsTab.js(116,53): error TS2694: Namespace 'SDK.NetworkManager' has no exported member 'Conditions'.
 node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingSettingsTab.js(136,26): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingSettingsTab.js(138,16): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingSettingsTab.js(140,76): error TS2555: Expected at least 2 arguments, but got 1.
@@ -7378,38 +6741,29 @@ node_modules/chrome-devtools-frontend/front_end/mobile_throttling/ThrottlingSett
 node_modules/chrome-devtools-frontend/front_end/network/BlockedURLsPane.js(18,39): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/BlockedURLsPane.js(21,49): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/BlockedURLsPane.js(24,51): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/network/BlockedURLsPane.js(28,51): error TS2694: Namespace 'SDK.NetworkManager' has no exported member 'BlockedPattern'.
-node_modules/chrome-devtools-frontend/front_end/network/BlockedURLsPane.js(35,58): error TS2694: Namespace 'SDK.NetworkManager' has no exported member 'BlockedPattern'.
+node_modules/chrome-devtools-frontend/front_end/network/BlockedURLsPane.js(29,36): error TS2345: Argument of type 'this' is not assignable to parameter of type '{ renderItem(item: T, editable: boolean): Element; removeItemRequested(item: T, index: number): void; beginEdit(item: T): Editor<T>; commitEdit(item: T, editor: Editor<T>, isNew: boolean): void; }'.
+  Type 'BlockedURLsPane' is not assignable to type '{ renderItem(item: T, editable: boolean): Element; removeItemRequested(item: T, index: number): void; beginEdit(item: T): Editor<T>; commitEdit(item: T, editor: Editor<T>, isNew: boolean): void; }'.
+    Types of property 'renderItem' are incompatible.
+      Type '(pattern: { url: string; enabled: boolean; }, editable: boolean) => Element' is not assignable to type '(item: T, editable: boolean) => Element'.
+        Types of parameters 'pattern' and 'item' are incompatible.
+          Type 'T' is not assignable to type '{ url: string; enabled: boolean; }'.
 node_modules/chrome-devtools-frontend/front_end/network/BlockedURLsPane.js(52,39): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/network/BlockedURLsPane.js(53,54): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/BlockedURLsPane.js(55,34): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/network/BlockedURLsPane.js(73,34): error TS2694: Namespace 'SDK.NetworkManager' has no exported member 'BlockedPattern'.
 node_modules/chrome-devtools-frontend/front_end/network/BlockedURLsPane.js(80,28): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/network/BlockedURLsPane.js(84,13): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/network/BlockedURLsPane.js(85,13): error TS2339: Property 'createChild' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/network/BlockedURLsPane.js(92,34): error TS2694: Namespace 'SDK.NetworkManager' has no exported member 'BlockedPattern'.
 node_modules/chrome-devtools-frontend/front_end/network/BlockedURLsPane.js(96,11): error TS2339: Property 'consume' does not exist on type 'Event'.
-node_modules/chrome-devtools-frontend/front_end/network/BlockedURLsPane.js(109,34): error TS2694: Namespace 'SDK.NetworkManager' has no exported member 'BlockedPattern'.
-node_modules/chrome-devtools-frontend/front_end/network/BlockedURLsPane.js(120,34): error TS2694: Namespace 'SDK.NetworkManager' has no exported member 'BlockedPattern'.
-node_modules/chrome-devtools-frontend/front_end/network/BlockedURLsPane.js(131,34): error TS2694: Namespace 'SDK.NetworkManager' has no exported member 'BlockedPattern'.
-node_modules/chrome-devtools-frontend/front_end/network/BlockedURLsPane.js(147,57): error TS2694: Namespace 'SDK.NetworkManager' has no exported member 'BlockedPattern'.
 node_modules/chrome-devtools-frontend/front_end/network/BlockedURLsPane.js(155,26): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/network/BlockedURLsPane.js(157,16): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/BlockedURLsPane.js(158,26): error TS2339: Property 'createChild' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/network/BlockedURLsPane.js(226,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/network/EventSourceMessagesView.js(17,56): error TS2694: Namespace 'DataGrid.DataGrid' has no exported member 'ColumnDescriptor'.
 node_modules/chrome-devtools-frontend/front_end/network/EventSourceMessagesView.js(18,32): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/EventSourceMessagesView.js(19,34): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/EventSourceMessagesView.js(20,34): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/EventSourceMessagesView.js(21,34): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/network/EventSourceMessagesView.js(27,49): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Ascending: string; Descending: string; }'.
-node_modules/chrome-devtools-frontend/front_end/network/EventSourceMessagesView.js(55,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/network/EventSourceMessagesView.js(58,50): error TS2694: Namespace 'SDK.NetworkRequest' has no exported member 'EventSourceMessage'.
-node_modules/chrome-devtools-frontend/front_end/network/EventSourceMessagesView.js(78,34): error TS2694: Namespace 'SDK.NetworkRequest' has no exported member 'EventSourceMessage'.
 node_modules/chrome-devtools-frontend/front_end/network/EventSourceMessagesView.js(85,14): error TS2339: Property 'createTextChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/network/EventSourceMessagesView.js(86,14): error TS2339: Property 'title' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/network/HARWriter.js(54,30): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/network/HARWriter.js(74,36): error TS2694: Namespace 'SDK.NetworkRequest' has no exported member 'ContentData'.
 node_modules/chrome-devtools-frontend/front_end/network/HARWriter.js(93,30): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkConfigView.js(12,25): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkConfigView.js(14,25): error TS2339: Property 'createChild' does not exist on type 'Element'.
@@ -7443,15 +6797,8 @@ node_modules/chrome-devtools-frontend/front_end/network/NetworkConfigView.js(116
 node_modules/chrome-devtools-frontend/front_end/network/NetworkConfigView.js(126,44): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkConfigView.js(137,35): error TS2339: Property 'disabled' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkConfigView.js(138,34): error TS2339: Property 'disabled' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkDataGridNode.js(49,36): error TS2694: Namespace 'Network.NetworkNode' has no exported member '_SupportedBackgroundColors'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkDataGridNode.js(57,62): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ Unknown: number; Foreground: number; Background: number; Selection: number; }'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkDataGridNode.js(60,41): error TS2694: Namespace 'Network.NetworkNode' has no exported member '_SupportedBackgroundColors'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkDataGridNode.js(121,13): error TS2339: Property 'style' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkDataGridNode.js(241,33): error TS2339: Property 'request' does not exist on type 'ViewportDataGridNode<any>'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkDataGridNode.js(274,21): error TS2339: Property '_SupportedBackgroundColors' does not exist on type 'typeof NetworkNode'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkDataGridNode.js(276,33): error TS2694: Namespace 'Network.NetworkNode' has no exported member '_SupportedBackgroundColors'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkDataGridNode.js(279,50): error TS2694: Namespace 'ProductRegistry.Registry' has no exported member 'ProductEntry'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkDataGridNode.js(280,21): error TS2339: Property '_ProductEntryInfo' does not exist on type 'typeof NetworkNode'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkDataGridNode.js(392,25): error TS2339: Property 'displayType' does not exist on type 'NetworkNode'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkDataGridNode.js(393,25): error TS2339: Property 'displayType' does not exist on type 'NetworkNode'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkDataGridNode.js(413,12): error TS2339: Property '_initiatorCell' does not exist on type 'NetworkNode'.
@@ -7488,6 +6835,8 @@ node_modules/chrome-devtools-frontend/front_end/network/NetworkDataGridNode.js(8
 node_modules/chrome-devtools-frontend/front_end/network/NetworkDataGridNode.js(885,42): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkDataGridNode.js(899,46): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkDataGridNode.js(902,14): error TS2339: Property 'title' does not exist on type 'Element'.
+node_modules/chrome-devtools-frontend/front_end/network/NetworkDataGridNode.js(904,73): error TS2345: Argument of type '{ text: string; lineNumber: number; columnNumber: number; }' is not assignable to parameter of type '{ text: string; className: string; lineNumber: number; columnNumber: number; preventClick: boolean; maxLength: number; }'.
+  Type '{ text: string; lineNumber: number; columnNumber: number; }' is missing the following properties from type '{ text: string; className: string; lineNumber: number; columnNumber: number; preventClick: boolean; maxLength: number; }': className, preventClick, maxLength
 node_modules/chrome-devtools-frontend/front_end/network/NetworkDataGridNode.js(909,43): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkDataGridNode.js(913,14): error TS2339: Property 'title' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkDataGridNode.js(922,43): error TS2555: Expected at least 2 arguments, but got 1.
@@ -7518,8 +6867,6 @@ node_modules/chrome-devtools-frontend/front_end/network/NetworkItemView.js(56,40
 node_modules/chrome-devtools-frontend/front_end/network/NetworkItemView.js(57,41): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkItemView.js(62,40): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkItemView.js(65,37): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(86,48): error TS2694: Namespace 'Network.NetworkLogView' has no exported member 'Filter'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(88,40): error TS2694: Namespace 'Network.NetworkLogView' has no exported member 'Filter'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(124,33): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(144,44): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(147,57): error TS2555: Expected at least 2 arguments, but got 1.
@@ -7531,18 +6878,10 @@ node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(152,57
           Type 'T' is not assignable to type 'NetworkManager'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(174,46): error TS2694: Namespace 'Protocol' has no exported member 'Network'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(175,46): error TS2694: Namespace 'Protocol' has no exported member 'Network'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(184,38): error TS2694: Namespace 'Network.NetworkLogView' has no exported member 'Filter'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(220,39): error TS2694: Namespace 'Network.NetworkLogView' has no exported member 'Filter'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(301,9): error TS2367: This condition will always return 'false' since the types '{ All: string; Displayed: string; Blocked: string; BlockOverridden: string; }' and 'string' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(303,14): error TS2367: This condition will always return 'false' since the types '{ All: string; Displayed: string; Blocked: string; BlockOverridden: string; }' and 'string' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(305,14): error TS2367: This condition will always return 'false' since the types '{ All: string; Displayed: string; Blocked: string; BlockOverridden: string; }' and 'string' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(307,14): error TS2367: This condition will always return 'false' since the types '{ All: string; Displayed: string; Blocked: string; BlockOverridden: string; }' and 'string' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(585,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(595,40): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(596,40): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(597,50): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(602,42): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(650,36): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Nearest: string; First: string; Last: string; }'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(663,41): error TS2339: Property 'shiftKey' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(690,47): error TS2339: Property 'button' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(691,13): error TS2339: Property 'consume' does not exist on type 'Event'.
@@ -7553,13 +6892,10 @@ node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(757,56
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(761,44): error TS2339: Property 'secondsToString' does not exist on type 'NumberConstructor'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(766,59): error TS2339: Property 'secondsToString' does not exist on type 'NumberConstructor'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(780,45): error TS2339: Property 'window' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(853,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(867,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(905,5): error TS2322: Type 'ViewportDataGridNode<any>[]' is not assignable to type 'NetworkNode[]'.
   Type 'ViewportDataGridNode<any>' is missing the following properties from type 'NetworkNode': _parentView, _isHovered, _isProduct, _showingInitiatorChain, and 18 more.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(916,20): error TS2339: Property 'window' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(938,41): error TS2339: Property 'firstValue' does not exist on type 'Set<NetworkRequest>'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(1074,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(1150,76): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(1157,20): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(1162,20): error TS2555: Expected at least 2 arguments, but got 1.
@@ -7583,35 +6919,11 @@ node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(1223,2
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(1294,25): error TS2339: Property 'asParsedURL' does not exist on type 'string'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(1309,24): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(1314,24): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(1501,39): error TS2694: Namespace 'Network.NetworkLogView' has no exported member 'Filter'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(1505,12): error TS2678: Type 'string' is not comparable to type '{ Domain: string; HasResponseHeader: string; Is: string; LargerThan: string; Method: string; MimeType: string; MixedContent: string; Priority: string; Scheme: string; SetCookieDomain: string; SetCookieName: string; SetCookieValue: string; StatusCode: string; }'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(1508,12): error TS2678: Type 'string' is not comparable to type '{ Domain: string; HasResponseHeader: string; Is: string; LargerThan: string; Method: string; MimeType: string; MixedContent: string; Priority: string; Scheme: string; SetCookieDomain: string; SetCookieName: string; SetCookieValue: string; StatusCode: string; }'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(1511,12): error TS2678: Type 'string' is not comparable to type '{ Domain: string; HasResponseHeader: string; Is: string; LargerThan: string; Method: string; MimeType: string; MixedContent: string; Priority: string; Scheme: string; SetCookieDomain: string; SetCookieName: string; SetCookieValue: string; StatusCode: string; }'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(1518,12): error TS2678: Type 'string' is not comparable to type '{ Domain: string; HasResponseHeader: string; Is: string; LargerThan: string; Method: string; MimeType: string; MixedContent: string; Priority: string; Scheme: string; SetCookieDomain: string; SetCookieName: string; SetCookieValue: string; StatusCode: string; }'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(1521,12): error TS2678: Type 'string' is not comparable to type '{ Domain: string; HasResponseHeader: string; Is: string; LargerThan: string; Method: string; MimeType: string; MixedContent: string; Priority: string; Scheme: string; SetCookieDomain: string; SetCookieName: string; SetCookieValue: string; StatusCode: string; }'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(1524,12): error TS2678: Type 'string' is not comparable to type '{ Domain: string; HasResponseHeader: string; Is: string; LargerThan: string; Method: string; MimeType: string; MixedContent: string; Priority: string; Scheme: string; SetCookieDomain: string; SetCookieName: string; SetCookieValue: string; StatusCode: string; }'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(1527,12): error TS2678: Type 'string' is not comparable to type '{ Domain: string; HasResponseHeader: string; Is: string; LargerThan: string; Method: string; MimeType: string; MixedContent: string; Priority: string; Scheme: string; SetCookieDomain: string; SetCookieName: string; SetCookieValue: string; StatusCode: string; }'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(1529,23): error TS2352: Conversion of type 'string' to type '{ All: string; Displayed: string; Blocked: string; BlockOverridden: string; }' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(1531,12): error TS2678: Type 'string' is not comparable to type '{ Domain: string; HasResponseHeader: string; Is: string; LargerThan: string; Method: string; MimeType: string; MixedContent: string; Priority: string; Scheme: string; SetCookieDomain: string; SetCookieName: string; SetCookieValue: string; StatusCode: string; }'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(1534,12): error TS2678: Type 'string' is not comparable to type '{ Domain: string; HasResponseHeader: string; Is: string; LargerThan: string; Method: string; MimeType: string; MixedContent: string; Priority: string; Scheme: string; SetCookieDomain: string; SetCookieName: string; SetCookieValue: string; StatusCode: string; }'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(1537,12): error TS2678: Type 'string' is not comparable to type '{ Domain: string; HasResponseHeader: string; Is: string; LargerThan: string; Method: string; MimeType: string; MixedContent: string; Priority: string; Scheme: string; SetCookieDomain: string; SetCookieName: string; SetCookieValue: string; StatusCode: string; }'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(1540,12): error TS2678: Type 'string' is not comparable to type '{ Domain: string; HasResponseHeader: string; Is: string; LargerThan: string; Method: string; MimeType: string; MixedContent: string; Priority: string; Scheme: string; SetCookieDomain: string; SetCookieName: string; SetCookieValue: string; StatusCode: string; }'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(1543,12): error TS2678: Type 'string' is not comparable to type '{ Domain: string; HasResponseHeader: string; Is: string; LargerThan: string; Method: string; MimeType: string; MixedContent: string; Priority: string; Scheme: string; SetCookieDomain: string; SetCookieName: string; SetCookieValue: string; StatusCode: string; }'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(1546,12): error TS2678: Type 'string' is not comparable to type '{ Domain: string; HasResponseHeader: string; Is: string; LargerThan: string; Method: string; MimeType: string; MixedContent: string; Priority: string; Scheme: string; SetCookieDomain: string; SetCookieName: string; SetCookieValue: string; StatusCode: string; }'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(1554,39): error TS2694: Namespace 'Network.NetworkLogView' has no exported member 'Filter'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(1696,9): error TS2322: Type 'string' is not assignable to type 'number'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(1697,52): error TS2339: Property 'length' does not exist on type 'number'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(1864,24): error TS2339: Property 'Filter' does not exist on type 'typeof NetworkLogView'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogView.js(1874,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(29,55): error TS2694: Namespace 'Network.NetworkLogViewColumns' has no exported member 'Descriptor'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(48,45): error TS2694: Namespace 'Network.NetworkLogViewColumns' has no exported member 'Descriptor'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(49,34): error TS2694: Namespace 'DataGrid.DataGrid' has no exported member 'ColumnDescriptor'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(52,42): error TS2694: Namespace 'DataGrid.DataGrid' has no exported member 'ColumnDescriptor'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(81,70): error TS2694: Namespace 'Network.NetworkLogViewColumns' has no exported member 'Descriptor'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(83,68): error TS2694: Namespace 'Network.NetworkLogViewColumns' has no exported member 'Descriptor'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(100,49): error TS2339: Property 'button' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(101,15): error TS2339: Property 'consume' does not exist on type 'Event'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(112,59): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Ascending: string; Descending: string; }'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(127,68): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(150,63): error TS2339: Property 'offsetX' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(150,78): error TS2339: Property 'offsetY' does not exist on type 'Event'.
@@ -7619,8 +6931,6 @@ node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(169,45): error TS2339: Property 'wheelDeltaY' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(202,73): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(207,39): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(219,56): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Ascending: string; Descending: string; }'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(331,45): error TS2694: Namespace 'Network.NetworkLogViewColumns' has no exported member 'Descriptor'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(370,14): error TS2339: Property 'createTextChild' does not exist on type 'DocumentFragment'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(371,32): error TS2339: Property 'createChild' does not exist on type 'DocumentFragment'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(387,80): error TS2555: Expected at least 2 arguments, but got 1.
@@ -7631,46 +6941,61 @@ node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(406,16): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(409,16): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(412,16): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(424,11): error TS2367: This condition will always return 'false' since the types '{ StartTime: string; ResponseTime: string; EndTime: string; Duration: string; Latency: string; }' and 'string' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(424,51): error TS2367: This condition will always return 'false' since the types '{ StartTime: string; ResponseTime: string; EndTime: string; Duration: string; Latency: string; }' and 'string' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(428,7): error TS2322: Type '{ StartTime: string; ResponseTime: string; EndTime: string; Duration: string; Latency: string; }' is not assignable to type 'string'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(429,56): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Ascending: string; Descending: string; }'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(445,28): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ SetExactSize: symbol; SetExactWidthMaxHeight: symbol; MeasureContent: symbol; }'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(469,46): error TS2694: Namespace 'Network.NetworkLogViewColumns' has no exported member 'Descriptor'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(481,66): error TS2694: Namespace 'Network.NetworkLogViewColumns' has no exported member 'Descriptor'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(522,19): error TS2694: Namespace 'UI' has no exported member 'PopoverRequest'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(531,31): error TS2339: Property 'enclosingNodeOrSelfWithClass' does not exist on type 'EventTarget'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(616,31): error TS2300: Duplicate identifier 'Descriptor'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(616,31): error TS2339: Property 'Descriptor' does not exist on type 'typeof NetworkLogViewColumns'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(640,50): error TS2694: Namespace 'Network.NetworkLogViewColumns' has no exported member 'Descriptor'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(645,19): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(646,22): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(651,5): error TS2322: Type '{ id: string; title: any; subtitle: any; visible: true; weight: number; hideable: false; nonSelectable: false; alwaysVisible: boolean; sortingFunction: (a: NetworkNode, b: NetworkNode) => number; }' is not assignable to type '{ id: string; title: string; titleDOMFragment: DocumentFragment; subtitle: string; visible: boolean; weight: number; hideable: boolean; nonSelectable: boolean; sortable: boolean; align: string; isResponseHeader: boolean; sortingFunction: (arg0: NetworkNode, arg1: NetworkNode) => number; isCustomHeader: boolean; }'.
+  Object literal may only specify known properties, and 'alwaysVisible' does not exist in type '{ id: string; title: string; titleDOMFragment: DocumentFragment; subtitle: string; visible: boolean; weight: number; hideable: boolean; nonSelectable: boolean; sortable: boolean; align: string; isResponseHeader: boolean; sortingFunction: (arg0: NetworkNode, arg1: NetworkNode) => number; isCustomHeader: boolean; }'.
+node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(654,3): error TS2740: Type '{ id: string; title: any; sortingFunction: any; }' is missing the following properties from type '{ id: string; title: string; titleDOMFragment: DocumentFragment; subtitle: string; visible: boolean; weight: number; hideable: boolean; nonSelectable: boolean; sortable: boolean; align: string; isResponseHeader: boolean; sortingFunction: (arg0: NetworkNode, arg1: NetworkNode) => number; isCustomHeader: boolean; }': titleDOMFragment, subtitle, visible, weight, and 6 more.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(656,19): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(659,3): error TS2740: Type '{ id: string; title: any; visible: true; subtitle: any; sortingFunction: any; }' is missing the following properties from type '{ id: string; title: string; titleDOMFragment: DocumentFragment; subtitle: string; visible: boolean; weight: number; hideable: boolean; nonSelectable: boolean; sortable: boolean; align: string; isResponseHeader: boolean; sortingFunction: (arg0: NetworkNode, arg1: NetworkNode) => number; isCustomHeader: boolean; }': titleDOMFragment, weight, hideable, nonSelectable, and 4 more.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(661,19): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(663,22): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(666,3): error TS2740: Type '{ id: string; title: any; sortingFunction: any; }' is missing the following properties from type '{ id: string; title: string; titleDOMFragment: DocumentFragment; subtitle: string; visible: boolean; weight: number; hideable: boolean; nonSelectable: boolean; sortable: boolean; align: string; isResponseHeader: boolean; sortingFunction: (arg0: NetworkNode, arg1: NetworkNode) => number; isCustomHeader: boolean; }': titleDOMFragment, subtitle, visible, weight, and 6 more.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(668,19): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(671,3): error TS2740: Type '{ id: string; title: any; sortingFunction: any; }' is missing the following properties from type '{ id: string; title: string; titleDOMFragment: DocumentFragment; subtitle: string; visible: boolean; weight: number; hideable: boolean; nonSelectable: boolean; sortable: boolean; align: string; isResponseHeader: boolean; sortingFunction: (arg0: NetworkNode, arg1: NetworkNode) => number; isCustomHeader: boolean; }': titleDOMFragment, subtitle, visible, weight, and 6 more.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(673,19): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(676,3): error TS2740: Type '{ id: string; title: any; sortingFunction: any; }' is missing the following properties from type '{ id: string; title: string; titleDOMFragment: DocumentFragment; subtitle: string; visible: boolean; weight: number; hideable: boolean; nonSelectable: boolean; sortable: boolean; align: string; isResponseHeader: boolean; sortingFunction: (arg0: NetworkNode, arg1: NetworkNode) => number; isCustomHeader: boolean; }': titleDOMFragment, subtitle, visible, weight, and 6 more.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(678,19): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(681,3): error TS2740: Type '{ id: string; title: any; weight: number; align: any; sortingFunction: (a: NetworkNode, b: NetworkNode) => number; }' is missing the following properties from type '{ id: string; title: string; titleDOMFragment: DocumentFragment; subtitle: string; visible: boolean; weight: number; hideable: boolean; nonSelectable: boolean; sortable: boolean; align: string; isResponseHeader: boolean; sortingFunction: (arg0: NetworkNode, arg1: NetworkNode) => number; isCustomHeader: boolean; }': titleDOMFragment, subtitle, visible, hideable, and 4 more.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(683,19): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(688,3): error TS2740: Type '{ id: string; title: any; visible: true; sortingFunction: (a: NetworkNode, b: NetworkNode) => number; }' is missing the following properties from type '{ id: string; title: string; titleDOMFragment: DocumentFragment; subtitle: string; visible: boolean; weight: number; hideable: boolean; nonSelectable: boolean; sortable: boolean; align: string; isResponseHeader: boolean; sortingFunction: (arg0: NetworkNode, arg1: NetworkNode) => number; isCustomHeader: boolean; }': titleDOMFragment, subtitle, weight, hideable, and 5 more.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(690,19): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(694,3): error TS2740: Type '{ id: string; title: any; visible: true; weight: number; sortingFunction: (a: NetworkNode, b: NetworkNode) => number; }' is missing the following properties from type '{ id: string; title: string; titleDOMFragment: DocumentFragment; subtitle: string; visible: boolean; weight: number; hideable: boolean; nonSelectable: boolean; sortable: boolean; align: string; isResponseHeader: boolean; sortingFunction: (arg0: NetworkNode, arg1: NetworkNode) => number; isCustomHeader: boolean; }': titleDOMFragment, subtitle, hideable, nonSelectable, and 4 more.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(696,19): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(701,3): error TS2740: Type '{ id: string; title: any; align: any; sortingFunction: (a: NetworkNode, b: NetworkNode) => number; }' is missing the following properties from type '{ id: string; title: string; titleDOMFragment: DocumentFragment; subtitle: string; visible: boolean; weight: number; hideable: boolean; nonSelectable: boolean; sortable: boolean; align: string; isResponseHeader: boolean; sortingFunction: (arg0: NetworkNode, arg1: NetworkNode) => number; isCustomHeader: boolean; }': titleDOMFragment, subtitle, visible, weight, and 5 more.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(703,19): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(707,3): error TS2740: Type '{ id: string; title: any; align: any; sortingFunction: (a: NetworkNode, b: NetworkNode) => number; }' is missing the following properties from type '{ id: string; title: string; titleDOMFragment: DocumentFragment; subtitle: string; visible: boolean; weight: number; hideable: boolean; nonSelectable: boolean; sortable: boolean; align: string; isResponseHeader: boolean; sortingFunction: (arg0: NetworkNode, arg1: NetworkNode) => number; isCustomHeader: boolean; }': titleDOMFragment, subtitle, visible, weight, and 5 more.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(709,19): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(713,3): error TS2740: Type '{ id: string; title: any; visible: true; subtitle: any; align: any; sortingFunction: (a: NetworkNode, b: NetworkNode) => number; }' is missing the following properties from type '{ id: string; title: string; titleDOMFragment: DocumentFragment; subtitle: string; visible: boolean; weight: number; hideable: boolean; nonSelectable: boolean; sortable: boolean; align: string; isResponseHeader: boolean; sortingFunction: (arg0: NetworkNode, arg1: NetworkNode) => number; isCustomHeader: boolean; }': titleDOMFragment, weight, hideable, nonSelectable, and 3 more.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(715,19): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(717,22): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(721,3): error TS2740: Type '{ id: string; title: any; visible: true; subtitle: any; align: any; sortingFunction: any; }' is missing the following properties from type '{ id: string; title: string; titleDOMFragment: DocumentFragment; subtitle: string; visible: boolean; weight: number; hideable: boolean; nonSelectable: boolean; sortable: boolean; align: string; isResponseHeader: boolean; sortingFunction: (arg0: NetworkNode, arg1: NetworkNode) => number; isCustomHeader: boolean; }': titleDOMFragment, weight, hideable, nonSelectable, and 3 more.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(723,19): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(725,22): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(729,3): error TS2740: Type '{ id: string; title: any; sortingFunction: (a: NetworkNode, b: NetworkNode) => number; }' is missing the following properties from type '{ id: string; title: string; titleDOMFragment: DocumentFragment; subtitle: string; visible: boolean; weight: number; hideable: boolean; nonSelectable: boolean; sortable: boolean; align: string; isResponseHeader: boolean; sortingFunction: (arg0: NetworkNode, arg1: NetworkNode) => number; isCustomHeader: boolean; }': titleDOMFragment, subtitle, visible, weight, and 6 more.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(731,19): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(734,3): error TS2740: Type '{ id: string; title: any; sortingFunction: any; }' is missing the following properties from type '{ id: string; title: string; titleDOMFragment: DocumentFragment; subtitle: string; visible: boolean; weight: number; hideable: boolean; nonSelectable: boolean; sortable: boolean; align: string; isResponseHeader: boolean; sortingFunction: (arg0: NetworkNode, arg1: NetworkNode) => number; isCustomHeader: boolean; }': titleDOMFragment, subtitle, visible, weight, and 6 more.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(736,19): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(739,3): error TS2740: Type '{ id: string; isResponseHeader: true; title: any; sortingFunction: any; }' is missing the following properties from type '{ id: string; title: string; titleDOMFragment: DocumentFragment; subtitle: string; visible: boolean; weight: number; hideable: boolean; nonSelectable: boolean; sortable: boolean; align: string; isResponseHeader: boolean; sortingFunction: (arg0: NetworkNode, arg1: NetworkNode) => number; isCustomHeader: boolean; }': titleDOMFragment, subtitle, visible, weight, and 5 more.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(742,19): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(745,3): error TS2740: Type '{ id: string; isResponseHeader: true; title: any; sortingFunction: any; }' is missing the following properties from type '{ id: string; title: string; titleDOMFragment: DocumentFragment; subtitle: string; visible: boolean; weight: number; hideable: boolean; nonSelectable: boolean; sortable: boolean; align: string; isResponseHeader: boolean; sortingFunction: (arg0: NetworkNode, arg1: NetworkNode) => number; isCustomHeader: boolean; }': titleDOMFragment, subtitle, visible, weight, and 5 more.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(748,19): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(751,3): error TS2740: Type '{ id: string; isResponseHeader: true; title: any; sortingFunction: any; }' is missing the following properties from type '{ id: string; title: string; titleDOMFragment: DocumentFragment; subtitle: string; visible: boolean; weight: number; hideable: boolean; nonSelectable: boolean; sortable: boolean; align: string; isResponseHeader: boolean; sortingFunction: (arg0: NetworkNode, arg1: NetworkNode) => number; isCustomHeader: boolean; }': titleDOMFragment, subtitle, visible, weight, and 5 more.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(754,19): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(757,3): error TS2740: Type '{ id: string; isResponseHeader: true; title: any; align: any; sortingFunction: any; }' is missing the following properties from type '{ id: string; title: string; titleDOMFragment: DocumentFragment; subtitle: string; visible: boolean; weight: number; hideable: boolean; nonSelectable: boolean; sortable: boolean; align: string; isResponseHeader: boolean; sortingFunction: (arg0: NetworkNode, arg1: NetworkNode) => number; isCustomHeader: boolean; }': titleDOMFragment, subtitle, visible, weight, and 4 more.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(760,19): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(764,3): error TS2740: Type '{ id: string; isResponseHeader: true; title: any; sortingFunction: any; }' is missing the following properties from type '{ id: string; title: string; titleDOMFragment: DocumentFragment; subtitle: string; visible: boolean; weight: number; hideable: boolean; nonSelectable: boolean; sortable: boolean; align: string; isResponseHeader: boolean; sortingFunction: (arg0: NetworkNode, arg1: NetworkNode) => number; isCustomHeader: boolean; }': titleDOMFragment, subtitle, visible, weight, and 5 more.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(767,19): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(770,3): error TS2740: Type '{ id: string; isResponseHeader: true; title: any; sortingFunction: any; }' is missing the following properties from type '{ id: string; title: string; titleDOMFragment: DocumentFragment; subtitle: string; visible: boolean; weight: number; hideable: boolean; nonSelectable: boolean; sortable: boolean; align: string; isResponseHeader: boolean; sortingFunction: (arg0: NetworkNode, arg1: NetworkNode) => number; isCustomHeader: boolean; }': titleDOMFragment, subtitle, visible, weight, and 5 more.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(773,19): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(776,3): error TS2740: Type '{ id: string; isResponseHeader: true; title: any; sortingFunction: any; }' is missing the following properties from type '{ id: string; title: string; titleDOMFragment: DocumentFragment; subtitle: string; visible: boolean; weight: number; hideable: boolean; nonSelectable: boolean; sortable: boolean; align: string; isResponseHeader: boolean; sortingFunction: (arg0: NetworkNode, arg1: NetworkNode) => number; isCustomHeader: boolean; }': titleDOMFragment, subtitle, visible, weight, and 5 more.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(779,19): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(782,3): error TS2740: Type '{ id: string; isResponseHeader: true; title: any; sortingFunction: any; }' is missing the following properties from type '{ id: string; title: string; titleDOMFragment: DocumentFragment; subtitle: string; visible: boolean; weight: number; hideable: boolean; nonSelectable: boolean; sortable: boolean; align: string; isResponseHeader: boolean; sortingFunction: (arg0: NetworkNode, arg1: NetworkNode) => number; isCustomHeader: boolean; }': titleDOMFragment, subtitle, visible, weight, and 5 more.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(785,19): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(788,3): error TS2740: Type '{ id: string; isResponseHeader: true; title: any; sortingFunction: any; }' is missing the following properties from type '{ id: string; title: string; titleDOMFragment: DocumentFragment; subtitle: string; visible: boolean; weight: number; hideable: boolean; nonSelectable: boolean; sortable: boolean; align: string; isResponseHeader: boolean; sortingFunction: (arg0: NetworkNode, arg1: NetworkNode) => number; isCustomHeader: boolean; }': titleDOMFragment, subtitle, visible, weight, and 5 more.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(791,19): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/network/NetworkLogViewColumns.js(795,3): error TS2740: Type '{ id: string; title: string; visible: false; hideable: false; }' is missing the following properties from type '{ id: string; title: string; titleDOMFragment: DocumentFragment; subtitle: string; visible: boolean; weight: number; hideable: boolean; nonSelectable: boolean; sortable: boolean; align: string; isResponseHeader: boolean; sortingFunction: (arg0: NetworkNode, arg1: NetworkNode) => number; isCustomHeader: boolean; }': titleDOMFragment, subtitle, weight, nonSelectable, and 5 more.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkManageCustomHeadersView.js(22,25): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkManageCustomHeadersView.js(22,75): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkManageCustomHeadersView.js(29,38): error TS2555: Expected at least 2 arguments, but got 1.
@@ -7680,18 +7005,13 @@ node_modules/chrome-devtools-frontend/front_end/network/NetworkManageCustomHeade
 node_modules/chrome-devtools-frontend/front_end/network/NetworkManageCustomHeadersView.js(131,26): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkManageCustomHeadersView.js(132,77): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkManageCustomHeadersView.js(134,26): error TS2339: Property 'createChild' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkOverview.js(48,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkOverview.js(58,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkOverview.js(103,30): error TS2339: Property 'offsetWidth' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkOverview.js(104,31): error TS2339: Property 'offsetHeight' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkOverview.js(147,18): error TS2339: Property 'window' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkOverview.js(242,31): error TS2339: Property 'offsetHeight' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkOverview.js(279,25): error TS2300: Duplicate identifier 'Window'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkOverview.js(279,25): error TS2339: Property 'Window' does not exist on type 'typeof NetworkOverview'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkPanel.js(58,54): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkPanel.js(67,53): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkPanel.js(79,48): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkPanel.js(158,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkPanel.js(169,51): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkPanel.js(174,73): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkPanel.js(180,42): error TS2555: Expected at least 2 arguments, but got 1.
@@ -7704,22 +7024,11 @@ node_modules/chrome-devtools-frontend/front_end/network/NetworkPanel.js(197,42):
 node_modules/chrome-devtools-frontend/front_end/network/NetworkPanel.js(198,16): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkPanel.js(201,55): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkPanel.js(202,16): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkPanel.js(274,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkPanel.js(287,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkPanel.js(291,7): error TS2322: Type 'Timeout' is not assignable to type 'number'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkPanel.js(366,13): error TS2339: Property 'handled' does not exist on type 'KeyboardEvent'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkPanel.js(397,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkPanel.js(404,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkPanel.js(412,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkPanel.js(420,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkPanel.js(520,53): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkPanel.js(523,22): error TS2339: Property 'isSelfOrDescendant' does not exist on type 'EventTarget'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkPanel.js(550,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkPanel.js(558,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkPanel.js(567,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkPanel.js(575,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkPanel.js(641,17): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkPanel.js(647,42): error TS2694: Namespace 'SDK.TracingManager' has no exported member 'EventPayload'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkPanel.js(684,46): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkPanel.js(705,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkPanel.js(715,46): error TS2555: Expected at least 2 arguments, but got 1.
@@ -7732,39 +7041,21 @@ node_modules/chrome-devtools-frontend/front_end/network/NetworkTimeCalculator.js
 node_modules/chrome-devtools-frontend/front_end/network/NetworkTimeCalculator.js(358,19): error TS2339: Property 'secondsToString' does not exist on type 'NumberConstructor'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkTimeCalculator.js(395,19): error TS2339: Property 'secondsToString' does not exist on type 'NumberConstructor'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.js(13,40): error TS2339: Property 'createChild' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.js(61,75): error TS2694: Namespace 'Network.NetworkWaterfallColumn' has no exported member '_LayerStyle'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.js(63,75): error TS2694: Namespace 'Network.NetworkWaterfallColumn' has no exported member '_LayerStyle'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.js(66,67): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ Unknown: number; Foreground: number; Background: number; Selection: number; }'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.js(67,48): error TS2694: Namespace 'Network.NetworkWaterfallColumn' has no exported member '_LayerStyle'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.js(69,48): error TS2694: Namespace 'Network.NetworkWaterfallColumn' has no exported member '_LayerStyle'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.js(72,53): error TS2694: Namespace 'Network.NetworkWaterfallColumn' has no exported member '_LayerStyle'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.js(74,55): error TS2694: Namespace 'Network.NetworkWaterfallColumn' has no exported member '_TextLayer'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.js(79,84): error TS2694: Namespace 'Network.NetworkWaterfallColumn' has no exported member '_LayerStyle'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.js(101,81): error TS2694: Namespace 'Network.NetworkWaterfallColumn' has no exported member '_LayerStyle'.
+node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.js(68,5): error TS2741: Property 'fillStyle' is missing in type '{ borderColor: string; lineWidth: number; }' but required in type '{ fillStyle: string; lineWidth: number; borderColor: string; }'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.js(180,54): error TS2339: Property 'offsetX' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.js(180,69): error TS2339: Property 'offsetY' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.js(180,85): error TS2339: Property 'shiftKey' does not exist on type 'Event'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.js(185,19): error TS2694: Namespace 'UI' has no exported member 'PopoverRequest'.
+node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.js(200,11): error TS2403: Subsequent variable declarations must have the same type.  Variable 'range' must be of type '{ name: string; start: number; end: number; }', but here has type '{ start: number; mid: number; end: number; }'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.js(211,15): error TS2339: Property 'clientX' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.js(211,68): error TS2339: Property 'clientX' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.js(218,15): error TS2339: Property 'clientY' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.js(218,63): error TS2339: Property 'clientY' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.js(221,34): error TS2339: Property 'boxInWindow' does not exist on type 'Element'.
+node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.js(227,5): error TS2741: Property 'hide' is missing in type '{ box: any; show: (popover: GlassPane) => Promise<true>; }' but required in type '{ box: AnchorBox; show: (arg0: GlassPane) => Promise<boolean>; hide: () => any; }'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.js(298,42): error TS2339: Property 'window' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.js(318,20): error TS2339: Property 'window' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.js(349,45): error TS2339: Property 'offsetWidth' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.js(350,46): error TS2339: Property 'offsetHeight' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.js(397,64): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ Unknown: number; Foreground: number; Background: number; Selection: number; }'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.js(421,62): error TS2694: Namespace 'Network.NetworkWaterfallColumn' has no exported member '_LayerStyle'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.js(464,12): error TS2678: Type 'string' is not comparable to type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.js(465,12): error TS2678: Type 'string' is not comparable to type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.js(466,12): error TS2678: Type 'string' is not comparable to type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.js(467,12): error TS2678: Type 'string' is not comparable to type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.js(468,12): error TS2678: Type 'string' is not comparable to type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.js(469,12): error TS2678: Type 'string' is not comparable to type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.js(470,12): error TS2678: Type 'string' is not comparable to type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.js(613,32): error TS2339: Property '_LayerStyle' does not exist on type 'typeof NetworkWaterfallColumn'.
-node_modules/chrome-devtools-frontend/front_end/network/NetworkWaterfallColumn.js(616,32): error TS2339: Property '_TextLayer' does not exist on type 'typeof NetworkWaterfallColumn'.
 node_modules/chrome-devtools-frontend/front_end/network/RequestCookiesView.js(55,55): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/RequestCookiesView.js(83,27): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/RequestCookiesView.js(84,27): error TS2555: Expected at least 2 arguments, but got 1.
@@ -7781,7 +7072,6 @@ node_modules/chrome-devtools-frontend/front_end/network/RequestHeadersView.js(14
 node_modules/chrome-devtools-frontend/front_end/network/RequestHeadersView.js(158,18): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/RequestHeadersView.js(173,34): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/RequestHeadersView.js(205,41): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/network/RequestHeadersView.js(215,42): error TS2694: Namespace 'SDK.NetworkRequest' has no exported member 'NameValue'.
 node_modules/chrome-devtools-frontend/front_end/network/RequestHeadersView.js(222,39): error TS2339: Property 'removeChildren' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/network/RequestHeadersView.js(223,39): error TS2339: Property 'createTextChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/network/RequestHeadersView.js(237,13): error TS2339: Property 'consume' does not exist on type 'Event'.
@@ -7813,7 +7103,6 @@ node_modules/chrome-devtools-frontend/front_end/network/RequestHeadersView.js(40
 node_modules/chrome-devtools-frontend/front_end/network/RequestHeadersView.js(417,40): error TS2339: Property 'removeChildren' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/network/RequestHeadersView.js(418,40): error TS2339: Property 'createTextChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/network/RequestHeadersView.js(421,40): error TS2339: Property 'createChild' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/network/RequestHeadersView.js(426,42): error TS2694: Namespace 'SDK.NetworkRequest' has no exported member 'NameValue'.
 node_modules/chrome-devtools-frontend/front_end/network/RequestHeadersView.js(437,32): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/RequestHeadersView.js(439,23): error TS2339: Property 'createChild' does not exist on type 'DocumentFragment'.
 node_modules/chrome-devtools-frontend/front_end/network/RequestHeadersView.js(440,23): error TS2339: Property 'createChild' does not exist on type 'DocumentFragment'.
@@ -7825,57 +7114,23 @@ node_modules/chrome-devtools-frontend/front_end/network/RequestHeadersView.js(51
 node_modules/chrome-devtools-frontend/front_end/network/RequestHeadersView.js(514,84): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/RequestPreviewView.js(60,40): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/RequestPreviewView.js(93,38): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/network/RequestResponseView.js(46,34): error TS2694: Namespace 'SDK.NetworkRequest' has no exported member 'ContentData'.
 node_modules/chrome-devtools-frontend/front_end/network/RequestResponseView.js(118,40): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/RequestResponseView.js(121,38): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(53,12): error TS2678: Type 'string' is not comparable to type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
 node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(54,23): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(55,12): error TS2678: Type 'string' is not comparable to type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
 node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(56,23): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(57,12): error TS2678: Type 'string' is not comparable to type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
 node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(58,23): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(59,12): error TS2678: Type 'string' is not comparable to type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
 node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(60,23): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(61,12): error TS2678: Type 'string' is not comparable to type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
 node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(62,23): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(63,12): error TS2678: Type 'string' is not comparable to type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
 node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(64,23): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(65,12): error TS2678: Type 'string' is not comparable to type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
 node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(66,23): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(67,12): error TS2678: Type 'string' is not comparable to type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
 node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(68,23): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(69,12): error TS2678: Type 'string' is not comparable to type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
 node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(70,23): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(71,12): error TS2678: Type 'string' is not comparable to type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
 node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(72,23): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(73,12): error TS2678: Type 'string' is not comparable to type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
 node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(74,23): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(75,12): error TS2678: Type 'string' is not comparable to type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
 node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(76,23): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(77,12): error TS2678: Type 'string' is not comparable to type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
 node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(78,23): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(79,12): error TS2678: Type 'string' is not comparable to type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
 node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(80,23): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(82,23): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(89,32): error TS2694: Namespace 'Network' has no exported member 'RequestTimeRange'.
-node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(130,16): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
-node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(131,16): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
-node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(132,16): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
-node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(140,14): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
-node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(146,18): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
-node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(149,16): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
-node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(153,22): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
-node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(154,22): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
-node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(155,22): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
-node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(156,22): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
-node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(159,22): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
-node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(160,22): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
-node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(161,22): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
-node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(162,22): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
-node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(163,22): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
-node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(164,22): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
-node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(166,11): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
-node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(172,11): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Push: string; Queueing: string; Blocking: string; Connecting: string; DNS: string; Proxy: string; Receiving: string; ReceivingPush: string; Sending: string; ServiceWorker: string; ServiceWorkerPreparation: string; SSL: string; Total: string; Waiting: string; }'.
 node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(187,33): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(202,40): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(217,29): error TS2555: Expected at least 2 arguments, but got 1.
@@ -7901,33 +7156,27 @@ node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(290
 node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(307,34): error TS2339: Property 'millisToString' does not exist on type 'NumberConstructor'.
 node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(315,37): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/network/RequestTimingView.js(318,59): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/network/ResourceWebSocketFrameView.js(35,56): error TS2694: Namespace 'DataGrid.DataGrid' has no exported member 'ColumnDescriptor'.
 node_modules/chrome-devtools-frontend/front_end/network/ResourceWebSocketFrameView.js(36,34): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/ResourceWebSocketFrameView.js(38,23): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/ResourceWebSocketFrameView.js(43,34): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/network/ResourceWebSocketFrameView.js(54,49): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Ascending: string; Descending: string; }'.
 node_modules/chrome-devtools-frontend/front_end/network/ResourceWebSocketFrameView.js(63,56): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/ResourceWebSocketFrameView.js(76,56): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/ResourceWebSocketFrameView.js(86,56): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/ResourceWebSocketFrameView.js(99,18): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/ResourceWebSocketFrameView.js(100,53): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/network/ResourceWebSocketFrameView.js(111,39): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/network/ResourceWebSocketFrameView.js(131,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/network/ResourceWebSocketFrameView.js(134,48): error TS2694: Namespace 'SDK.NetworkRequest' has no exported member 'WebSocketFrame'.
-node_modules/chrome-devtools-frontend/front_end/network/ResourceWebSocketFrameView.js(141,34): error TS2694: Namespace 'SDK.NetworkRequest' has no exported member 'WebSocketFrame'.
 node_modules/chrome-devtools-frontend/front_end/network/ResourceWebSocketFrameView.js(158,58): error TS2339: Property 'value' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/network/ResourceWebSocketFrameView.js(165,21): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/network/ResourceWebSocketFrameView.js(182,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/network/ResourceWebSocketFrameView.js(228,43): error TS2694: Namespace 'UI.NamedBitSetFilterUI' has no exported member 'Item'.
+node_modules/chrome-devtools-frontend/front_end/network/ResourceWebSocketFrameView.js(230,3): error TS2741: Property 'title' is missing in type '{ name: string; label: any; }' but required in type '{ name: string; label: string; title: string; }'.
 node_modules/chrome-devtools-frontend/front_end/network/ResourceWebSocketFrameView.js(230,31): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/network/ResourceWebSocketFrameView.js(231,3): error TS2741: Property 'title' is missing in type '{ name: string; label: any; }' but required in type '{ name: string; label: string; title: string; }'.
 node_modules/chrome-devtools-frontend/front_end/network/ResourceWebSocketFrameView.js(231,32): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/network/ResourceWebSocketFrameView.js(232,3): error TS2741: Property 'title' is missing in type '{ name: string; label: any; }' but required in type '{ name: string; label: string; title: string; }'.
 node_modules/chrome-devtools-frontend/front_end/network/ResourceWebSocketFrameView.js(232,35): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/network/ResourceWebSocketFrameView.js(241,34): error TS2694: Namespace 'SDK.NetworkRequest' has no exported member 'WebSocketFrame'.
 node_modules/chrome-devtools-frontend/front_end/network/ResourceWebSocketFrameView.js(250,14): error TS2339: Property 'createTextChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/network/ResourceWebSocketFrameView.js(251,14): error TS2339: Property 'title' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/network_log/HAREntry.js(130,29): error TS2339: Property 'localizedFailDescription' does not exist on type 'NetworkRequest'.
-node_modules/chrome-devtools-frontend/front_end/network_log/HAREntry.js(150,36): error TS2694: Namespace 'NetworkLog.HAREntry' has no exported member 'Timing'.
-node_modules/chrome-devtools-frontend/front_end/network_log/HAREntry.js(319,21): error TS2339: Property 'Timing' does not exist on type 'typeof HAREntry'.
+node_modules/chrome-devtools-frontend/front_end/network_log/HAREntry.js(202,7): error TS2741: Property '_blocked_proxy' is missing in type '{ blocked: number; dns: number; ssl: number; connect: number; send: number; wait: number; receive: number; _blocked_queueing: number; }' but required in type '{ blocked: number; dns: number; ssl: number; connect: number; send: number; wait: number; receive: number; _blocked_queueing: number; _blocked_proxy: number; }'.
+node_modules/chrome-devtools-frontend/front_end/network_log/HAREntry.js(214,5): error TS2322: Type '{ blocked: number; dns: number; ssl: number; connect: number; send: number; wait: number; receive: number; _blocked_queueing: number; }' is not assignable to type '{ blocked: number; dns: number; ssl: number; connect: number; send: number; wait: number; receive: number; _blocked_queueing: number; _blocked_proxy: number; }'.
 node_modules/chrome-devtools-frontend/front_end/network_log/NetworkLog.js(44,57): error TS2345: Argument of type 'this' is not assignable to parameter of type '{ modelAdded(model: T): void; modelRemoved(model: T): void; }'.
   Type 'NetworkLog' is not assignable to type '{ modelAdded(model: T): void; modelRemoved(model: T): void; }'.
     Types of property 'modelAdded' are incompatible.
@@ -7937,21 +7186,10 @@ node_modules/chrome-devtools-frontend/front_end/network_log/NetworkLog.js(44,57)
 node_modules/chrome-devtools-frontend/front_end/network_log/NetworkLog.js(99,59): error TS2345: Argument of type 'this' is not assignable to parameter of type '{ modelAdded(model: T): void; modelRemoved(model: T): void; }'.
 node_modules/chrome-devtools-frontend/front_end/network_log/NetworkLog.js(101,61): error TS2345: Argument of type 'this' is not assignable to parameter of type '{ modelAdded(model: T): void; modelRemoved(model: T): void; }'.
 node_modules/chrome-devtools-frontend/front_end/network_log/NetworkLog.js(123,24): error TS2694: Namespace 'Protocol' has no exported member 'Network'.
-node_modules/chrome-devtools-frontend/front_end/network_log/NetworkLog.js(154,49): error TS2694: Namespace 'NetworkLog.NetworkLog' has no exported member '_InitiatorInfo'.
-node_modules/chrome-devtools-frontend/front_end/network_log/NetworkLog.js(165,38): error TS2694: Namespace 'NetworkLog.NetworkLog' has no exported member '_InitiatorInfo'.
 node_modules/chrome-devtools-frontend/front_end/network_log/NetworkLog.js(195,40): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/network_log/NetworkLog.js(226,38): error TS2694: Namespace 'NetworkLog.NetworkLog' has no exported member 'InitiatorGraph'.
 node_modules/chrome-devtools-frontend/front_end/network_log/NetworkLog.js(256,29): error TS2339: Property 'addAll' does not exist on type 'Set<NetworkRequest>'.
-node_modules/chrome-devtools-frontend/front_end/network_log/NetworkLog.js(289,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/network_log/NetworkLog.js(355,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/network_log/NetworkLog.js(369,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/network_log/NetworkLog.js(379,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/network_log/NetworkLog.js(388,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/network_log/NetworkLog.js(398,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/network_log/NetworkLog.js(446,82): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/network_log/NetworkLog.js(477,23): error TS2339: Property 'InitiatorGraph' does not exist on type 'typeof NetworkLog'.
 node_modules/chrome-devtools-frontend/front_end/network_log/NetworkLog.js(485,149): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
-node_modules/chrome-devtools-frontend/front_end/network_log/NetworkLog.js(486,23): error TS2339: Property '_InitiatorInfo' does not exist on type 'typeof NetworkLog'.
 node_modules/chrome-devtools-frontend/front_end/network_priorities/NetworkPriorities.js(6,22): error TS2694: Namespace 'Protocol' has no exported member 'Network'.
 node_modules/chrome-devtools-frontend/front_end/network_priorities/NetworkPriorities.js(19,37): error TS2694: Namespace 'Protocol' has no exported member 'Network'.
 node_modules/chrome-devtools-frontend/front_end/network_priorities/NetworkPriorities.js(20,64): error TS2339: Property '_uiLabelToPriorityMap' does not exist on type '(priorityLabel: string) => string'.
@@ -7983,35 +7221,28 @@ node_modules/chrome-devtools-frontend/front_end/object_ui/CustomPreviewComponent
 node_modules/chrome-devtools-frontend/front_end/object_ui/CustomPreviewComponent.js(116,11): error TS2339: Property 'consume' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/object_ui/CustomPreviewComponent.js(125,18): error TS2339: Property 'classList' does not exist on type 'Node'.
 node_modules/chrome-devtools-frontend/front_end/object_ui/CustomPreviewComponent.js(230,18): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/object_ui/JavaScriptAutocomplete.js(25,39): error TS2694: Namespace 'UI.SuggestBox' has no exported member 'Suggestions'.
-node_modules/chrome-devtools-frontend/front_end/object_ui/JavaScriptAutocomplete.js(73,39): error TS2694: Namespace 'UI.SuggestBox' has no exported member 'Suggestions'.
-node_modules/chrome-devtools-frontend/front_end/object_ui/JavaScriptAutocomplete.js(118,32): error TS2694: Namespace 'UI.SuggestBox' has no exported member 'Suggestions'.
+node_modules/chrome-devtools-frontend/front_end/object_ui/JavaScriptAutocomplete.js(99,47): error TS2554: Expected 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/object_ui/JavaScriptAutocomplete.js(132,51): error TS2339: Property 'naturalOrderComparator' does not exist on type 'StringConstructor'.
 node_modules/chrome-devtools-frontend/front_end/object_ui/JavaScriptAutocomplete.js(156,24): error TS2339: Property 'subtitle' does not exist on type '{ text: string; title: string; priority: number; }'.
 node_modules/chrome-devtools-frontend/front_end/object_ui/JavaScriptAutocomplete.js(156,42): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/object_ui/JavaScriptAutocomplete.js(165,39): error TS2694: Namespace 'UI.SuggestBox' has no exported member 'Suggestions'.
+node_modules/chrome-devtools-frontend/front_end/object_ui/JavaScriptAutocomplete.js(157,7): error TS2322: Type '{ text: string; title: string; priority: number; }[]' is not assignable to type '{ text: string; subtitle: string; iconType: string; priority: number; isSecondary: boolean; title: string; }[]'.
+  Type '{ text: string; title: string; priority: number; }' is missing the following properties from type '{ text: string; subtitle: string; iconType: string; priority: number; isSecondary: boolean; title: string; }': subtitle, iconType, isSecondary
 node_modules/chrome-devtools-frontend/front_end/object_ui/JavaScriptAutocomplete.js(183,37): error TS2345: Argument of type 'string' is not assignable to parameter of type 'number'.
 node_modules/chrome-devtools-frontend/front_end/object_ui/JavaScriptAutocomplete.js(183,97): error TS2345: Argument of type 'string' is not assignable to parameter of type 'number'.
-node_modules/chrome-devtools-frontend/front_end/object_ui/JavaScriptAutocomplete.js(218,34): error TS2694: Namespace 'SDK.RuntimeModel' has no exported member 'EvaluationResult'.
-node_modules/chrome-devtools-frontend/front_end/object_ui/JavaScriptAutocomplete.js(219,66): error TS2694: Namespace 'ObjectUI.JavaScriptAutocomplete' has no exported member 'CompletionGroup'.
 node_modules/chrome-devtools-frontend/front_end/object_ui/JavaScriptAutocomplete.js(262,70): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/object_ui/JavaScriptAutocomplete.js(335,16): error TS2403: Subsequent variable declarations must have the same type.  Variable 'scope' must be of type 'Scope', but here has type '{ properties: RemoteObjectProperty[]; name: string; }'.
 node_modules/chrome-devtools-frontend/front_end/object_ui/JavaScriptAutocomplete.js(336,54): error TS2339: Property 'properties' does not exist on type 'Scope'.
-node_modules/chrome-devtools-frontend/front_end/object_ui/JavaScriptAutocomplete.js(342,54): error TS2694: Namespace 'ObjectUI.JavaScriptAutocomplete' has no exported member 'CompletionGroup'.
-node_modules/chrome-devtools-frontend/front_end/object_ui/JavaScriptAutocomplete.js(347,30): error TS2694: Namespace 'UI.SuggestBox' has no exported member 'Suggestions'.
-node_modules/chrome-devtools-frontend/front_end/object_ui/JavaScriptAutocomplete.js(387,56): error TS2694: Namespace 'ObjectUI.JavaScriptAutocomplete' has no exported member 'CompletionGroup'.
-node_modules/chrome-devtools-frontend/front_end/object_ui/JavaScriptAutocomplete.js(388,32): error TS2694: Namespace 'UI.SuggestBox' has no exported member 'Suggestions'.
+node_modules/chrome-devtools-frontend/front_end/object_ui/JavaScriptAutocomplete.js(377,27): error TS2345: Argument of type '{ items: string[]; }' is not assignable to parameter of type '{ title: string; items: string[]; }'.
+  Property 'title' is missing in type '{ items: string[]; }' but required in type '{ title: string; items: string[]; }'.
 node_modules/chrome-devtools-frontend/front_end/object_ui/JavaScriptAutocomplete.js(399,42): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/object_ui/JavaScriptAutocomplete.js(442,28): error TS2339: Property 'subtitle' does not exist on type '{ text: any; priority: number; }'.
+node_modules/chrome-devtools-frontend/front_end/object_ui/JavaScriptAutocomplete.js(420,45): error TS2339: Property 'escapeCharacters' does not exist on type 'string'.
+node_modules/chrome-devtools-frontend/front_end/object_ui/JavaScriptAutocomplete.js(442,28): error TS2339: Property 'subtitle' does not exist on type '{ text: string; priority: number; }'.
 node_modules/chrome-devtools-frontend/front_end/object_ui/JavaScriptAutocomplete.js(466,19): error TS2339: Property 'naturalOrderComparator' does not exist on type 'StringConstructor'.
-node_modules/chrome-devtools-frontend/front_end/object_ui/JavaScriptAutocomplete.js(471,33): error TS2339: Property 'CompletionGroup' does not exist on type 'typeof JavaScriptAutocomplete'.
-node_modules/chrome-devtools-frontend/front_end/object_ui/ObjectPopoverHelper.js(82,35): error TS2694: Namespace 'SDK.DebuggerModel' has no exported member 'FunctionDetails'.
 node_modules/chrome-devtools-frontend/front_end/object_ui/ObjectPopoverHelper.js(91,29): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/object_ui/ObjectPopoverHelper.js(108,50): error TS2554: Expected 0 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/object_ui/ObjectPopoverHelper.js(114,48): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/object_ui/ObjectPopoverHelper.js(129,7): error TS2722: Cannot invoke an object which is possibly 'undefined'.
 node_modules/chrome-devtools-frontend/front_end/object_ui/ObjectPopoverHelper.js(145,50): error TS2339: Property 'createChild' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/object_ui/ObjectPopoverHelper.js(154,31): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ SetExactSize: symbol; SetExactWidthMaxHeight: symbol; MeasureContent: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/object_ui/ObjectPopoverHelper.js(156,7): error TS2722: Cannot invoke an object which is possibly 'undefined'.
 node_modules/chrome-devtools-frontend/front_end/object_ui/ObjectPropertiesSection.js(49,40): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/object_ui/ObjectPropertiesSection.js(56,18): error TS2339: Property '_section' does not exist on type 'Element'.
@@ -8038,7 +7269,6 @@ node_modules/chrome-devtools-frontend/front_end/object_ui/ObjectPropertiesSectio
 node_modules/chrome-devtools-frontend/front_end/object_ui/ObjectPropertiesSection.js(325,20): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/object_ui/ObjectPropertiesSection.js(326,20): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/object_ui/ObjectPropertiesSection.js(328,20): error TS2339: Property 'title' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/object_ui/ObjectPropertiesSection.js(343,35): error TS2694: Namespace 'SDK.DebuggerModel' has no exported member 'FunctionDetails'.
 node_modules/chrome-devtools-frontend/front_end/object_ui/ObjectPropertiesSection.js(392,11): error TS2554: Expected 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/object_ui/ObjectPropertiesSection.js(395,11): error TS2554: Expected 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/object_ui/ObjectPropertiesSection.js(468,48): error TS2339: Property '_skipProto' does not exist on type 'TreeOutline'.
@@ -8095,13 +7325,10 @@ node_modules/chrome-devtools-frontend/front_end/object_ui/ObjectPropertiesSectio
 node_modules/chrome-devtools-frontend/front_end/object_ui/ObjectPropertiesSection.js(1211,44): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
 node_modules/chrome-devtools-frontend/front_end/object_ui/ObjectPropertiesSection.js(1241,23): error TS2339: Property 'parentObject' does not exist on type 'RemoteObjectProperty'.
 node_modules/chrome-devtools-frontend/front_end/object_ui/ObjectPropertiesSection.js(1243,26): error TS2339: Property '_readOnly' does not exist on type 'ObjectPropertyTreeElement'.
-node_modules/chrome-devtools-frontend/front_end/object_ui/ObjectPropertiesSection.js(1319,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/object_ui/ObjectPropertiesSection.js(1328,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/object_ui/ObjectPropertiesSection.js(1336,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/object_ui/ObjectPropertiesSection.js(1353,47): error TS2339: Property 'objectTreeElement' does not exist on type 'TreeOutline'.
 node_modules/chrome-devtools-frontend/front_end/object_ui/ObjectPropertiesSection.js(1359,19): error TS2339: Property 'property' does not exist on type 'TreeElement'.
 node_modules/chrome-devtools-frontend/front_end/object_ui/ObjectPropertiesSection.js(1360,31): error TS2339: Property 'property' does not exist on type 'TreeElement'.
-node_modules/chrome-devtools-frontend/front_end/object_ui/ObjectPropertiesSection.js(1384,31): error TS2694: Namespace 'Common.Renderer' has no exported member 'Options'.
+node_modules/chrome-devtools-frontend/front_end/object_ui/ObjectPropertiesSection.js(1390,5): error TS2739: Type '{}' is missing the following properties from type '{ title: string | Element; expanded: boolean; editable: boolean; }': title, expanded, editable
 node_modules/chrome-devtools-frontend/front_end/object_ui/ObjectPropertiesSection.js(1397,13): error TS2551: Property 'editable' does not exist on type 'ObjectPropertiesSection'. Did you mean '_editable'?
 node_modules/chrome-devtools-frontend/front_end/object_ui/RemoteObjectPreviewFormatter.js(9,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/object_ui/RemoteObjectPreviewFormatter.js(10,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
@@ -8185,7 +7412,6 @@ node_modules/chrome-devtools-frontend/front_end/perf_ui/FilmStripView.js(211,31)
 node_modules/chrome-devtools-frontend/front_end/perf_ui/FilmStripView.js(213,16): error TS2339: Property 'title' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/FilmStripView.js(213,31): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/FilmStripView.js(215,39): error TS2345: Argument of type 'TemplateStringsArray' is not assignable to parameter of type 'string[]'.
-node_modules/chrome-devtools-frontend/front_end/perf_ui/FilmStripView.js(247,34): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ SetExactSize: symbol; SetExactWidthMaxHeight: symbol; MeasureContent: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/FilmStripView.js(254,19): error TS2339: Property 'key' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/FilmStripView.js(256,35): error TS2339: Property 'metaKey' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/FilmStripView.js(263,35): error TS2339: Property 'metaKey' does not exist on type 'Event'.
@@ -8214,24 +7440,14 @@ node_modules/chrome-devtools-frontend/front_end/perf_ui/FlameChart.js(656,65): e
 node_modules/chrome-devtools-frontend/front_end/perf_ui/FlameChart.js(694,31): error TS2339: Property 'keysArray' does not exist on type 'Map<string, number[]>'.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/FlameChart.js(701,13): error TS2403: Subsequent variable declarations must have the same type.  Variable 'entryIndex' must be of type 'any', but here has type 'number'.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/FlameChart.js(796,43): error TS2339: Property 'peekLast' does not exist on type 'any[]'.
-node_modules/chrome-devtools-frontend/front_end/perf_ui/FlameChart.js(805,64): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ Unknown: number; Foreground: number; Background: number; Selection: number; }'.
-node_modules/chrome-devtools-frontend/front_end/perf_ui/FlameChart.js(815,66): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ Unknown: number; Foreground: number; Background: number; Selection: number; }'.
-node_modules/chrome-devtools-frontend/front_end/perf_ui/FlameChart.js(859,67): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ Unknown: number; Foreground: number; Background: number; Selection: number; }'.
-node_modules/chrome-devtools-frontend/front_end/perf_ui/FlameChart.js(870,66): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ Unknown: number; Foreground: number; Background: number; Selection: number; }'.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/FlameChart.js(903,16): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/perf_ui/FlameChart.js(903,60): error TS2694: Namespace 'PerfUI.FlameChart' has no exported member 'Group'.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/FlameChart.js(907,17): error TS1110: Type expected.
-node_modules/chrome-devtools-frontend/front_end/perf_ui/FlameChart.js(931,33): error TS2694: Namespace 'PerfUI.FlameChart' has no exported member 'Group'.
-node_modules/chrome-devtools-frontend/front_end/perf_ui/FlameChart.js(940,33): error TS2694: Namespace 'PerfUI.FlameChart' has no exported member 'Group'.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/FlameChart.js(1027,38): error TS2339: Property 'lowerBound' does not exist on type 'any[]'.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/FlameChart.js(1167,15): error TS1110: Type expected.
-node_modules/chrome-devtools-frontend/front_end/perf_ui/FlameChart.js(1169,70): error TS2339: Property 'peekLast' does not exist on type 'any[]'.
+node_modules/chrome-devtools-frontend/front_end/perf_ui/FlameChart.js(1169,70): error TS2339: Property 'peekLast' does not exist on type '{ name: string; startLevel: number; expanded: boolean; style: { height: number; padding: number; collapsible: boolean; font: string; color: string; backgroundColor: string; nestingLevel: number; itemsHeight: number; shareHeaderLine: boolean; useFirstLineForOverview: boolean; useDecoratorsForOverview: boolean; }; }[]'.
+node_modules/chrome-devtools-frontend/front_end/perf_ui/FlameChart.js(1205,9): error TS2322: Type 'boolean' is not assignable to type 'number'.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/FlameChart.js(1273,25): error TS2339: Property 'style' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/FlameChart.js(1286,19): error TS2339: Property 'constrain' does not exist on type 'NumberConstructor'.
-node_modules/chrome-devtools-frontend/front_end/perf_ui/FlameChart.js(1390,34): error TS2694: Namespace 'PerfUI.FlameChart' has no exported member 'GroupStyle'.
-node_modules/chrome-devtools-frontend/front_end/perf_ui/FlameChart.js(1393,19): error TS2339: Property 'Group' does not exist on type 'typeof FlameChart'.
-node_modules/chrome-devtools-frontend/front_end/perf_ui/FlameChart.js(1410,19): error TS2339: Property 'GroupStyle' does not exist on type 'typeof FlameChart'.
-node_modules/chrome-devtools-frontend/front_end/perf_ui/FlameChart.js(1420,40): error TS2694: Namespace 'PerfUI.FlameChart' has no exported member 'Group'.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/FlameChart.js(1438,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/FlameChart.js(1443,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/FlameChart.js(1450,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
@@ -8261,8 +7477,6 @@ node_modules/chrome-devtools-frontend/front_end/perf_ui/LineLevelProfile.js(142,
 node_modules/chrome-devtools-frontend/front_end/perf_ui/LineLevelProfile.js(145,15): error TS2339: Property 'style' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/LineLevelProfile.js(146,18): error TS2339: Property 'setGutterDecoration' does not exist on type 'CodeMirrorTextEditor'.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/OverviewGrid.js(104,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/perf_ui/OverviewGrid.js(104,31): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/perf_ui/OverviewGrid.js(106,35): error TS2694: Namespace 'Common.EventTarget' has no exported member 'EventDescriptor'.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/OverviewGrid.js(166,45): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/OverviewGrid.js(170,46): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/OverviewGrid.js(175,46): error TS2339: Property 'createChild' does not exist on type 'Element'.
@@ -8304,19 +7518,12 @@ node_modules/chrome-devtools-frontend/front_end/perf_ui/PieChart.js(92,18): erro
 node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineGrid.js(39,42): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineGrid.js(43,58): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineGrid.js(44,61): error TS2339: Property 'createChild' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineGrid.js(51,36): error TS2694: Namespace 'PerfUI.TimelineGrid' has no exported member 'DividersData'.
-node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineGrid.js(98,35): error TS2694: Namespace 'PerfUI.TimelineGrid' has no exported member 'DividersData'.
-node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineGrid.js(104,80): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ Unknown: number; Foreground: number; Background: number; Selection: number; }'.
-node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineGrid.js(119,35): error TS2694: Namespace 'PerfUI.TimelineGrid' has no exported member 'DividersData'.
-node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineGrid.js(132,68): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ Unknown: number; Foreground: number; Background: number; Selection: number; }'.
-node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineGrid.js(135,64): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ Unknown: number; Foreground: number; Background: number; Selection: number; }'.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineGrid.js(189,25): error TS2339: Property '_labelElement' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineGrid.js(196,23): error TS2339: Property '_labelElement' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineGrid.js(199,15): error TS2339: Property 'style' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineGrid.js(200,23): error TS2339: Property 'style' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineGrid.js(210,7): error TS2322: Type 'ChildNode' is not assignable to type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineGrid.js(215,7): error TS2322: Type 'ChildNode' is not assignable to type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineGrid.js(267,21): error TS2339: Property 'DividersData' does not exist on type 'typeof TimelineGrid'.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineGrid.js(277,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineGrid.js(284,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineGrid.js(288,16): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
@@ -8332,14 +7539,10 @@ node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineOverviewPane.js(
 node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineOverviewPane.js(112,30): error TS2339: Property 'offsetWidth' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineOverviewPane.js(152,7): error TS2322: Type 'Promise<void>' is not assignable to type 'Promise<undefined>'.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineOverviewPane.js(186,57): error TS2339: Property 'valuesArray' does not exist on type 'Map<any, any>'.
-node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineOverviewPane.js(213,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineOverviewPane.js(319,19): error TS2339: Property 'preciseMillisToString' does not exist on type 'NumberConstructor'.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineOverviewPane.js(375,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineOverviewPane.js(381,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineOverviewPane.js(395,33): error TS2339: Property 'createChild' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineOverviewPane.js(489,46): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ BlockedByGlassPane: symbol; PierceGlassPane: symbol; PierceContents: symbol; }'.
-node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineOverviewPane.js(490,39): error TS2345: Argument of type 'symbol' is not assignable to parameter of type 'boolean'.
-node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineOverviewPane.js(491,37): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ SetExactSize: symbol; SetExactWidthMaxHeight: symbol; MeasureContent: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineOverviewPane.js(495,14): error TS2339: Property 'createChild' does not exist on type 'DocumentFragment'.
 node_modules/chrome-devtools-frontend/front_end/perf_ui/TimelineOverviewPane.js(508,61): error TS2339: Property 'boxInWindow' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/performance_test_runner/TimelineTestRunner.js(74,72): error TS2554: Expected 0 arguments, but got 1.
@@ -8364,7 +7567,6 @@ node_modules/chrome-devtools-frontend/front_end/performance_test_runner/Timeline
 node_modules/chrome-devtools-frontend/front_end/persistence/Automapping.js(12,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/persistence/Automapping.js(13,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/persistence/Automapping.js(67,40): error TS2339: Property 'valuesArray' does not exist on type 'Set<PersistenceBinding>'.
-node_modules/chrome-devtools-frontend/front_end/persistence/Automapping.js(155,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/persistence/Automapping.js(315,20): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
 node_modules/chrome-devtools-frontend/front_end/persistence/Automapping.js(329,40): error TS2339: Property 'valuesArray' does not exist on type 'Set<PersistenceBinding>'.
 node_modules/chrome-devtools-frontend/front_end/persistence/Automapping.js(355,41): error TS2339: Property 'reverse' does not exist on type 'string'.
@@ -8374,10 +7576,6 @@ node_modules/chrome-devtools-frontend/front_end/persistence/Automapping.js(376,6
 node_modules/chrome-devtools-frontend/front_end/persistence/DefaultMapping.js(12,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/persistence/DefaultMapping.js(13,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/persistence/DefaultMapping.js(36,40): error TS2339: Property 'valuesArray' does not exist on type 'Set<PersistenceBinding>'.
-node_modules/chrome-devtools-frontend/front_end/persistence/DefaultMapping.js(46,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/persistence/DefaultMapping.js(54,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/persistence/DefaultMapping.js(62,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/persistence/DefaultMapping.js(130,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/persistence/DefaultMapping.js(143,40): error TS2339: Property 'valuesArray' does not exist on type 'Set<PersistenceBinding>'.
 node_modules/chrome-devtools-frontend/front_end/persistence/EditFileSystemView.js(60,48): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/persistence/EditFileSystemView.js(61,89): error TS2555: Expected at least 2 arguments, but got 1.
@@ -8399,17 +7597,16 @@ node_modules/chrome-devtools-frontend/front_end/persistence/EditFileSystemView.j
 node_modules/chrome-devtools-frontend/front_end/persistence/EditFileSystemView.js(282,26): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/persistence/EditFileSystemView.js(283,73): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/persistence/EditFileSystemView.js(285,26): error TS2339: Property 'createChild' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/persistence/FileSystemMapping.js(65,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/persistence/FileSystemMapping.js(73,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/persistence/FileSystemMapping.js(180,46): error TS2339: Property 'remove' does not exist on type 'Entry[]'.
 node_modules/chrome-devtools-frontend/front_end/persistence/FileSystemMapping.js(285,52): error TS2339: Property 'remove' does not exist on type 'Entry[]'.
-node_modules/chrome-devtools-frontend/front_end/persistence/FileSystemWorkspaceBinding.js(134,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/persistence/FileSystemWorkspaceBinding.js(150,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/persistence/FileSystemWorkspaceBinding.js(156,28): error TS2339: Property 'remove' does not exist on type 'Map<string, FileSystem>'.
-node_modules/chrome-devtools-frontend/front_end/persistence/FileSystemWorkspaceBinding.js(160,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/persistence/FileSystemWorkspaceBinding.js(163,67): error TS2694: Namespace 'Persistence.IsolatedFileSystemManager' has no exported member 'FilesChangedData'.
+node_modules/chrome-devtools-frontend/front_end/persistence/FileSystemWorkspaceBinding.js(165,51): error TS2345: Argument of type 'K' is not assignable to parameter of type 'string'.
+node_modules/chrome-devtools-frontend/front_end/persistence/FileSystemWorkspaceBinding.js(168,81): error TS2345: Argument of type 'V' is not assignable to parameter of type 'string'.
+node_modules/chrome-devtools-frontend/front_end/persistence/FileSystemWorkspaceBinding.js(172,51): error TS2345: Argument of type 'K' is not assignable to parameter of type 'string'.
+node_modules/chrome-devtools-frontend/front_end/persistence/FileSystemWorkspaceBinding.js(175,79): error TS2345: Argument of type 'V' is not assignable to parameter of type 'string'.
+node_modules/chrome-devtools-frontend/front_end/persistence/FileSystemWorkspaceBinding.js(179,51): error TS2345: Argument of type 'K' is not assignable to parameter of type 'string'.
+node_modules/chrome-devtools-frontend/front_end/persistence/FileSystemWorkspaceBinding.js(182,87): error TS2345: Argument of type 'V' is not assignable to parameter of type 'string'.
 node_modules/chrome-devtools-frontend/front_end/persistence/FileSystemWorkspaceBinding.js(190,30): error TS2339: Property 'remove' does not exist on type 'Map<string, FileSystem>'.
-node_modules/chrome-devtools-frontend/front_end/persistence/FileSystemWorkspaceBinding.js(222,26): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Debugger: string; Formatter: string; Network: string; Snippets: string; FileSystem: string; ContentScripts: string; Service: string; }'.
 node_modules/chrome-devtools-frontend/front_end/persistence/FileSystemWorkspaceBinding.js(310,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/persistence/FileSystemWorkspaceBinding.js(330,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/persistence/FileSystemWorkspaceBinding.js(360,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
@@ -8436,7 +7633,6 @@ node_modules/chrome-devtools-frontend/front_end/persistence/IsolatedFileSystem.j
     Argument of type 'string | ArrayBuffer' is not assignable to parameter of type 'string'.
       Type 'ArrayBuffer' is not assignable to type 'string'.
 node_modules/chrome-devtools-frontend/front_end/persistence/IsolatedFileSystem.js(357,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/persistence/IsolatedFileSystem.js(360,34): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; TimelineStarted: number; ProfilesCPUProfileTaken: number; ProfilesHeapProfileTaken: number; AuditsStarted: number; ... 23 more ...; ShowedThirdPartyBadges: number; }'.
 node_modules/chrome-devtools-frontend/front_end/persistence/IsolatedFileSystem.js(364,17): error TS2304: Cannot find name 'FileEntry'.
 node_modules/chrome-devtools-frontend/front_end/persistence/IsolatedFileSystem.js(372,17): error TS2304: Cannot find name 'FileWriter'.
 node_modules/chrome-devtools-frontend/front_end/persistence/IsolatedFileSystem.js(404,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
@@ -8454,32 +7650,17 @@ node_modules/chrome-devtools-frontend/front_end/persistence/IsolatedFileSystem.j
 node_modules/chrome-devtools-frontend/front_end/persistence/IsolatedFileSystem.js(564,70): error TS2339: Property 'asRegExp' does not exist on type 'Setting<any>'.
 node_modules/chrome-devtools-frontend/front_end/persistence/IsolatedFileSystemManager.js(40,29): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/persistence/IsolatedFileSystemManager.js(62,17): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/persistence/IsolatedFileSystemManager.js(79,24): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/persistence/IsolatedFileSystemManager.js(83,83): error TS2694: Namespace 'Persistence.IsolatedFileSystemManager' has no exported member 'FileSystem'.
-node_modules/chrome-devtools-frontend/front_end/persistence/IsolatedFileSystemManager.js(124,53): error TS2694: Namespace 'Persistence.IsolatedFileSystemManager' has no exported member 'FileSystem'.
-node_modules/chrome-devtools-frontend/front_end/persistence/IsolatedFileSystemManager.js(150,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/persistence/IsolatedFileSystemManager.js(154,72): error TS2694: Namespace 'Persistence.IsolatedFileSystemManager' has no exported member 'FileSystem'.
-node_modules/chrome-devtools-frontend/front_end/persistence/IsolatedFileSystemManager.js(171,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/persistence/IsolatedFileSystemManager.js(185,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
+node_modules/chrome-devtools-frontend/front_end/persistence/IsolatedFileSystemManager.js(162,7): error TS2739: Type 'IsolatedFileSystem' is missing the following properties from type '{ type: string; fileSystemName: string; rootURL: string; fileSystemPath: string; }': fileSystemName, rootURL, fileSystemPath
 node_modules/chrome-devtools-frontend/front_end/persistence/IsolatedFileSystemManager.js(211,21): error TS2345: Argument of type 'string' is not assignable to parameter of type 'K'.
   'string' is assignable to the constraint of type 'K', but 'K' could be instantiated with a different subtype of constraint '{}'.
 node_modules/chrome-devtools-frontend/front_end/persistence/IsolatedFileSystemManager.js(222,30): error TS2339: Property 'valuesArray' does not exist on type 'Map<string, IsolatedFileSystem>'.
 node_modules/chrome-devtools-frontend/front_end/persistence/IsolatedFileSystemManager.js(264,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/persistence/IsolatedFileSystemManager.js(284,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/persistence/IsolatedFileSystemManager.js(297,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/persistence/IsolatedFileSystemManager.js(314,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/persistence/IsolatedFileSystemManager.js(327,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/persistence/IsolatedFileSystemManager.js(342,39): error TS2339: Property 'FileSystem' does not exist on type 'typeof IsolatedFileSystemManager'.
-node_modules/chrome-devtools-frontend/front_end/persistence/IsolatedFileSystemManager.js(345,39): error TS2339: Property 'FilesChangedData' does not exist on type 'typeof IsolatedFileSystemManager'.
-node_modules/chrome-devtools-frontend/front_end/persistence/NetworkPersistenceManager.js(40,43): error TS2694: Namespace 'Common.EventTarget' has no exported member 'EventDescriptor'.
 node_modules/chrome-devtools-frontend/front_end/persistence/NetworkPersistenceManager.js(140,55): error TS2339: Property 'hashCode' does not exist on type 'StringConstructor'.
 node_modules/chrome-devtools-frontend/front_end/persistence/Persistence.js(21,51): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/persistence/Persistence.js(58,23): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/persistence/Persistence.js(58,66): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/persistence/Persistence.js(62,5): error TS2322: Type '{ dispose: () => void; }' is not assignable to type 'Automapping | DefaultMapping'.
   Type '{ dispose: () => void; }' is missing the following properties from type 'DefaultMapping': _workspace, _fileSystemMapping, _bindings, _onBindingCreated, and 10 more.
-node_modules/chrome-devtools-frontend/front_end/persistence/Persistence.js(176,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/persistence/Persistence.js(218,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/persistence/Persistence.js(323,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/persistence/Persistence.js(326,47): error TS2345: Argument of type 'UISourceCode' is not assignable to parameter of type 'K'.
   'UISourceCode' is assignable to the constraint of type 'K', but 'K' could be instantiated with a different subtype of constraint '{}'.
@@ -8494,7 +7675,6 @@ node_modules/chrome-devtools-frontend/front_end/persistence/PersistenceActions.j
 node_modules/chrome-devtools-frontend/front_end/persistence/PersistenceActions.js(34,16): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/persistence/PersistenceActions.js(39,51): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/persistence/PersistenceUtils.js(49,1): error TS8022: JSDoc '@extends' is not attached to a class.
-node_modules/chrome-devtools-frontend/front_end/persistence/PersistenceUtils.js(60,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/persistence/WorkspaceSettingsTab.js(10,31): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/persistence/WorkspaceSettingsTab.js(11,53): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/persistence/WorkspaceSettingsTab.js(13,42): error TS2339: Property 'createChild' does not exist on type 'Element'.
@@ -8602,23 +7782,18 @@ node_modules/chrome-devtools-frontend/front_end/platform/utilities.js(1363,25):
 node_modules/chrome-devtools-frontend/front_end/platform/utilities.js(1402,12): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/platform/utilities.js(1424,31): error TS1110: Type expected.
 node_modules/chrome-devtools-frontend/front_end/platform/utilities.js(1430,18): error TS2555: Expected at least 1 arguments, but got 0.
-node_modules/chrome-devtools-frontend/front_end/product_registry/BadgePool.js(17,38): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; TimelineStarted: number; ProfilesCPUProfileTaken: number; ProfilesHeapProfileTaken: number; AuditsStarted: number; ... 23 more ...; ShowedThirdPartyBadges: number; }'.
 node_modules/chrome-devtools-frontend/front_end/product_registry/BadgePool.js(55,29): error TS2339: Property 'createChild' does not exist on type 'DocumentFragment'.
 node_modules/chrome-devtools-frontend/front_end/product_registry/BadgePool.js(108,36): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/product_registry/BadgePool.js(113,18): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/product_registry/BadgePool.js(134,18): error TS2339: Property 'parentNodeOrShadowHost' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/product_registry/BadgePool.js(151,29): error TS2339: Property 'createChild' does not exist on type 'DocumentFragment'.
 node_modules/chrome-devtools-frontend/front_end/product_registry/BadgePool.js(162,45): error TS2339: Property 'boxInWindow' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/product_registry/BadgePool.js(164,28): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ SetExactSize: symbol; SetExactWidthMaxHeight: symbol; MeasureContent: symbol; }'.
-node_modules/chrome-devtools-frontend/front_end/product_registry/BadgePool.js(165,30): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ PreferTop: symbol; PreferBottom: symbol; PreferLeft: symbol; PreferRight: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/product_registry/BadgePool.js(175,36): error TS2339: Property '_colorGenerator' does not exist on type 'typeof BadgePool'.
 node_modules/chrome-devtools-frontend/front_end/product_registry/BadgePool.js(176,33): error TS2339: Property '_colorGenerator' does not exist on type 'typeof BadgePool'.
 node_modules/chrome-devtools-frontend/front_end/product_registry/BadgePool.js(179,38): error TS2339: Property '_colorGenerator' does not exist on type 'typeof BadgePool'.
 node_modules/chrome-devtools-frontend/front_end/product_registry/ProductRegistry.js(22,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
-node_modules/chrome-devtools-frontend/front_end/product_registry/ProductRegistry.js(28,41): error TS2694: Namespace 'ProductRegistry.Registry' has no exported member 'ProductEntry'.
+node_modules/chrome-devtools-frontend/front_end/product_registry/ProductRegistry.js(28,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/product_registry/ProductRegistry.js(34,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
-node_modules/chrome-devtools-frontend/front_end/product_registry/ProductRegistry.js(55,41): error TS2694: Namespace 'ProductRegistry.Registry' has no exported member 'ProductEntry'.
-node_modules/chrome-devtools-frontend/front_end/product_registry/ProductRegistry.js(72,26): error TS2339: Property 'ProductEntry' does not exist on type 'typeof Registry'.
 node_modules/chrome-devtools-frontend/front_end/product_registry_impl/ProductRegistryData.js(1559,42): error TS2741: Property 'type' is missing in type '{ "product": number; }' but required in type '{ product: number; type: number; }'.
 node_modules/chrome-devtools-frontend/front_end/product_registry_impl/ProductRegistryData.js(1563,42): error TS2741: Property 'type' is missing in type '{ "product": number; }' but required in type '{ product: number; type: number; }'.
 node_modules/chrome-devtools-frontend/front_end/product_registry_impl/ProductRegistryData.js(1604,42): error TS2741: Property 'type' is missing in type '{ "product": number; }' but required in type '{ product: number; type: number; }'.
@@ -8825,8 +8000,8 @@ node_modules/chrome-devtools-frontend/front_end/product_registry_impl/ProductReg
 node_modules/chrome-devtools-frontend/front_end/product_registry_impl/ProductRegistryData.js(6737,42): error TS2741: Property 'type' is missing in type '{ "product": number; }' but required in type '{ product: number; type: number; }'.
 node_modules/chrome-devtools-frontend/front_end/product_registry_impl/ProductRegistryData.js(6738,42): error TS2741: Property 'type' is missing in type '{ "product": number; }' but required in type '{ product: number; type: number; }'.
 node_modules/chrome-devtools-frontend/front_end/product_registry_impl/ProductRegistryData.js(6741,42): error TS2741: Property 'type' is missing in type '{ "product": number; }' but required in type '{ product: number; type: number; }'.
-node_modules/chrome-devtools-frontend/front_end/product_registry_impl/ProductRegistryImpl.js(27,41): error TS2694: Namespace 'ProductRegistry.Registry' has no exported member 'ProductEntry'.
-node_modules/chrome-devtools-frontend/front_end/product_registry_impl/ProductRegistryImpl.js(103,67): error TS2694: Namespace 'ProductRegistry.Registry' has no exported member 'ProductEntry'.
+node_modules/chrome-devtools-frontend/front_end/product_registry_impl/ProductRegistryImpl.js(99,63): error TS2345: Argument of type '{}' is not assignable to parameter of type '{ [x: string]: { name: string; type: number; }; }'.
+  Index signature is missing in type '{}'.
 node_modules/chrome-devtools-frontend/front_end/profiler/BottomUpProfileDataGrid.js(83,15): error TS2339: Property '_remainingNodeInfos' does not exist on type 'ProfileDataGridNode'.
 node_modules/chrome-devtools-frontend/front_end/profiler/BottomUpProfileDataGrid.js(196,26): error TS2339: Property 'UID' does not exist on type 'ProfileNode'.
 node_modules/chrome-devtools-frontend/front_end/profiler/BottomUpProfileDataGrid.js(197,23): error TS2339: Property 'UID' does not exist on type 'ProfileNode'.
@@ -8846,10 +8021,7 @@ node_modules/chrome-devtools-frontend/front_end/profiler/CPUProfileFlameChart.js
 node_modules/chrome-devtools-frontend/front_end/profiler/CPUProfileFlameChart.js(130,21): error TS2339: Property '_entryNodes' does not exist on type 'ProfileFlameChartDataProvider'.
 node_modules/chrome-devtools-frontend/front_end/profiler/CPUProfileFlameChart.js(144,23): error TS2339: Property '_entryNodes' does not exist on type 'ProfileFlameChartDataProvider'.
 node_modules/chrome-devtools-frontend/front_end/profiler/CPUProfileFlameChart.js(154,21): error TS2339: Property '_entryNodes' does not exist on type 'ProfileFlameChartDataProvider'.
-node_modules/chrome-devtools-frontend/front_end/profiler/CPUProfileFlameChart.js(231,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/profiler/CPUProfileFlameChart.js(248,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/profiler/CPUProfileFlameChart.js(414,44): error TS2339: Property 'createChild' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/profiler/CPUProfileFlameChart.js(452,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/profiler/CPUProfileFlameChart.js(481,40): error TS2339: Property 'window' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/profiler/CPUProfileView.js(61,23): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/profiler/CPUProfileView.js(63,23): error TS2555: Expected at least 2 arguments, but got 1.
@@ -8859,11 +8031,8 @@ node_modules/chrome-devtools-frontend/front_end/profiler/CPUProfileView.js(115,3
 node_modules/chrome-devtools-frontend/front_end/profiler/CPUProfileView.js(115,77): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/profiler/CPUProfileView.js(133,19): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/profiler/CPUProfileView.js(137,19): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/profiler/CPUProfileView.js(141,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/profiler/CPUProfileView.js(144,49): error TS2694: Namespace 'SDK.CPUProfilerModel' has no exported member 'EventData'.
 node_modules/chrome-devtools-frontend/front_end/profiler/CPUProfileView.js(145,43): error TS2694: Namespace 'Protocol' has no exported member 'Profiler'.
 node_modules/chrome-devtools-frontend/front_end/profiler/CPUProfileView.js(159,33): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/profiler/CPUProfileView.js(162,34): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; TimelineStarted: number; ProfilesCPUProfileTaken: number; ProfilesHeapProfileTaken: number; AuditsStarted: number; ... 23 more ...; ShowedThirdPartyBadges: number; }'.
 node_modules/chrome-devtools-frontend/front_end/profiler/CPUProfileView.js(225,25): error TS2694: Namespace 'Protocol' has no exported member 'Profiler'.
 node_modules/chrome-devtools-frontend/front_end/profiler/CPUProfileView.js(240,24): error TS2694: Namespace 'Protocol' has no exported member 'Profiler'.
 node_modules/chrome-devtools-frontend/front_end/profiler/CPUProfileView.js(390,21): error TS2339: Property 'secondsToString' does not exist on type 'NumberConstructor'.
@@ -8901,18 +8070,10 @@ node_modules/chrome-devtools-frontend/front_end/profiler/HeapProfileView.js(395,
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapProfilerPanel.js(56,16): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapProfilerPanel.js(88,24): error TS2694: Namespace 'Protocol' has no exported member 'HeapProfiler'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapProfilerPanel.js(100,14): error TS2339: Property 'selectLiveObject' does not exist on type 'Widget'.
-node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotDataGrids.js(34,41): error TS2417: Class static side 'typeof HeapSnapshotSortableDataGrid' incorrectly extends base class static side 'typeof DataGrid'.
-  Types of property 'Events' are incompatible.
-    Type '{ ContentShown: symbol; SortingComplete: symbol; }' is missing the following properties from type '{ SelectedNode: symbol; DeselectedNode: symbol; OpenedNode: symbol; SortingChanged: symbol; PaddingChanged: symbol; }': SelectedNode, DeselectedNode, OpenedNode, SortingChanged, PaddingChanged
-node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotDataGrids.js(34,41): error TS2417: Class static side 'typeof HeapSnapshotSortableDataGrid' incorrectly extends base class static side 'typeof DataGrid'.
-  Types of property 'Events' are incompatible.
-    Type '{ ContentShown: symbol; SortingComplete: symbol; }' is not assignable to type '{ SelectedNode: symbol; DeselectedNode: symbol; OpenedNode: symbol; SortingChanged: symbol; PaddingChanged: symbol; }'.
-node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotDataGrids.js(37,41): error TS2694: Namespace 'DataGrid.DataGrid' has no exported member 'ColumnDescriptor'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotDataGrids.js(124,27): error TS2339: Property 'enclosingNodeOrSelfWithNodeName' does not exist on type 'EventTarget'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotDataGrids.js(137,53): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotDataGrids.js(153,24): error TS2694: Namespace 'Protocol' has no exported member 'HeapProfiler'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotDataGrids.js(191,27): error TS2339: Property '_sortFields' does not exist on type 'HeapSnapshotSortableDataGrid'.
-node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotDataGrids.js(295,41): error TS2694: Namespace 'DataGrid.DataGrid' has no exported member 'ColumnDescriptor'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotDataGrids.js(329,72): error TS2339: Property 'offsetHeight' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotDataGrids.js(375,36): error TS2339: Property 'filteredOut' does not exist on type 'HeapSnapshotGridNode'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotDataGrids.js(375,57): error TS2339: Property 'filteredOut' does not exist on type 'HeapSnapshotGridNode'.
@@ -8927,24 +8088,14 @@ node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotDataGrids.j
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotDataGrids.js(474,43): error TS2551: Property '_allChildren' does not exist on type 'DataGridNode<any>'. Did you mean '_hasChildren'?
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotDataGrids.js(522,27): error TS2339: Property 'offsetTop' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotDataGrids.js(523,40): error TS2339: Property 'offsetHeight' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotDataGrids.js(554,41): error TS2694: Namespace 'DataGrid.DataGrid' has no exported member 'ColumnDescriptor'.
-node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotDataGrids.js(558,58): error TS2694: Namespace 'DataGrid.DataGrid' has no exported member 'ColumnDescriptor'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotDataGrids.js(559,40): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotDataGrids.js(560,42): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotDataGrids.js(561,45): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotDataGrids.js(564,27): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotDataGrids.js(603,43): error TS2417: Class static side 'typeof HeapSnapshotRetainmentDataGrid' incorrectly extends base class static side 'typeof HeapSnapshotContainmentDataGrid'.
-  Types of property 'Events' are incompatible.
-    Type '{ ExpandRetainersComplete: symbol; }' is missing the following properties from type '{ ContentShown: symbol; SortingComplete: symbol; }': ContentShown, SortingComplete
-node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotDataGrids.js(603,43): error TS2417: Class static side 'typeof HeapSnapshotRetainmentDataGrid' incorrectly extends base class static side 'typeof HeapSnapshotContainmentDataGrid'.
-  Types of property 'Events' are incompatible.
-    Type '{ ExpandRetainersComplete: symbol; }' is not assignable to type '{ ContentShown: symbol; SortingComplete: symbol; }'.
-node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotDataGrids.js(608,56): error TS2694: Namespace 'DataGrid.DataGrid' has no exported member 'ColumnDescriptor'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotDataGrids.js(609,36): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotDataGrids.js(611,23): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotDataGrids.js(617,41): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotDataGrids.js(618,42): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotDataGrids.js(669,56): error TS2694: Namespace 'DataGrid.DataGrid' has no exported member 'ColumnDescriptor'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotDataGrids.js(670,36): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotDataGrids.js(671,38): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotDataGrids.js(672,35): error TS2555: Expected at least 2 arguments, but got 1.
@@ -8953,7 +8104,6 @@ node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotDataGrids.j
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotDataGrids.js(700,24): error TS2694: Namespace 'Protocol' has no exported member 'HeapProfiler'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotDataGrids.js(713,67): error TS2339: Property '_name' does not exist on type 'HeapSnapshotGridNode'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotDataGrids.js(717,30): error TS2339: Property 'populateNodeBySnapshotObjectId' does not exist on type 'HeapSnapshotGridNode'.
-node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotDataGrids.js(822,56): error TS2694: Namespace 'DataGrid.DataGrid' has no exported member 'ColumnDescriptor'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotDataGrids.js(823,36): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotDataGrids.js(824,40): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotDataGrids.js(825,42): error TS2555: Expected at least 2 arguments, but got 1.
@@ -8961,7 +8111,6 @@ node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotDataGrids.j
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotDataGrids.js(828,23): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotDataGrids.js(834,41): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotDataGrids.js(835,39): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotDataGrids.js(902,56): error TS2694: Namespace 'DataGrid.DataGrid' has no exported member 'ColumnDescriptor'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotDataGrids.js(903,39): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotDataGrids.js(904,35): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotDataGrids.js(905,38): error TS2555: Expected at least 2 arguments, but got 1.
@@ -8996,7 +8145,9 @@ node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotGridNodes.j
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotGridNodes.js(580,12): error TS2339: Property 'style' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotGridNodes.js(581,10): error TS2339: Property 'heapSnapshotNode' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotGridNodes.js(602,82): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotGridNodes.js(787,24): error TS2694: Namespace 'Profiler' has no exported member 'HeapSnapshotRetainingObjectNode'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotGridNodes.js(804,15): error TS2577: Return type annotation circularly references itself.
+node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotGridNodes.js(804,25): error TS2694: Namespace 'Profiler' has no exported member 'HeapSnapshotRetainingObjectNode'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotGridNodes.js(871,36): error TS2339: Property 'withThousandsSeparator' does not exist on type 'NumberConstructor'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotGridNodes.js(874,34): error TS2339: Property 'withThousandsSeparator' does not exist on type 'NumberConstructor'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotGridNodes.js(966,23): error TS2339: Property 'withThousandsSeparator' does not exist on type 'NumberConstructor'.
@@ -9057,7 +8208,6 @@ node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(230
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(231,62): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(232,62): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(233,61): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(238,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(243,80): error TS2339: Property 'bytesToString' does not exist on type 'NumberConstructor'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(256,17): error TS2345: Argument of type 'ToolbarText' is not assignable to parameter of type 'ToolbarComboBox | ToolbarInput'.
   Type 'ToolbarText' is missing the following properties from type 'ToolbarInput': _prompt, _proxyElement, setValue, _internalSetValue, and 4 more.
@@ -9066,21 +8216,15 @@ node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(397
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(405,24): error TS2345: Argument of type 'SearchConfig' is not assignable to parameter of type 'SearchConfig'.
   Property 'toSearchRegex' is missing in type 'SearchConfig' but required in type 'SearchConfig'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(418,24): error TS2345: Argument of type 'SearchConfig' is not assignable to parameter of type 'SearchConfig'.
-node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(438,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(447,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(451,65): error TS2339: Property 'allocationNodeId' does not exist on type 'DataGridNode<any>'.
-node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(456,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(492,76): error TS2339: Property 'value' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(514,53): error TS2339: Property '_loadPromise' does not exist on type 'ProfileHeader'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(524,42): error TS2339: Property 'selectedOptions' does not exist on type 'EventTarget'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(554,24): error TS2345: Argument of type 'SearchConfig' is not assignable to parameter of type 'SearchConfig'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(559,24): error TS2694: Namespace 'Protocol' has no exported member 'HeapProfiler'.
-node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(572,19): error TS2694: Namespace 'UI' has no exported member 'PopoverRequest'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(575,29): error TS2339: Property 'enclosingNodeOrSelfWithNodeName' does not exist on type 'EventTarget'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(576,28): error TS2339: Property 'enclosingNodeOrSelfWithNodeName' does not exist on type 'EventTarget'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(628,44): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(649,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(658,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(667,11): error TS2345: Argument of type 'string' is not assignable to parameter of type 'symbol'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(749,18): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(793,18): error TS2555: Expected at least 2 arguments, but got 1.
@@ -9097,20 +8241,14 @@ node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(947
         Types of parameters 'heapProfilerModel' and 'model' are incompatible.
           Type 'T' is not assignable to type 'HeapProfilerModel'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(989,19): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(1006,34): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; TimelineStarted: number; ProfilesCPUProfileTaken: number; ProfilesHeapProfileTaken: number; AuditsStarted: number; ... 23 more ...; ShowedThirdPartyBadges: number; }'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(1011,19): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(1015,19): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(1038,33): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(1042,5): error TS2740: Type 'ProfileHeader' is missing the following properties from type 'HeapProfileHeader': _heapProfilerModel, maxJSObjectId, _workerProxy, _receiver, and 22 more.
-node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(1050,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(1056,33): error TS2339: Property 'transferChunk' does not exist on type 'ProfileHeader'.
-node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(1060,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(1069,15): error TS2339: Property '_prepareToLoad' does not exist on type 'ProfileHeader'.
-node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(1073,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(1086,35): error TS2345: Argument of type 'string' is not assignable to parameter of type 'symbol'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(1098,67): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(1122,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(1139,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(1155,35): error TS2345: Argument of type 'string' is not assignable to parameter of type 'symbol'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(1168,37): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(1169,37): error TS2555: Expected at least 2 arguments, but got 1.
@@ -9123,7 +8261,6 @@ node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(121
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(1225,13): error TS2339: Property '_finishLoad' does not exist on type 'ProfileHeader'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(1248,19): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(1252,19): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(1258,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(1358,30): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(1430,30): error TS2339: Property 'bytesToString' does not exist on type 'NumberConstructor'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(1458,24): error TS2339: Property '_snapshotReceived' does not exist on type 'ProfileType'.
@@ -9135,7 +8272,6 @@ node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(156
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(1563,11): error TS2345: Argument of type 'string' is not assignable to parameter of type 'symbol'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(1578,9): error TS2345: Argument of type 'string' is not assignable to parameter of type 'symbol'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(1580,9): error TS2345: Argument of type 'string' is not assignable to parameter of type 'symbol'.
-node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(1584,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(1604,79): error TS2339: Property 'peekLast' does not exist on type 'number[]'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(1719,26): error TS2339: Property 'bytesToString' does not exist on type 'NumberConstructor'.
 node_modules/chrome-devtools-frontend/front_end/profiler/HeapSnapshotView.js(1823,36): error TS2339: Property 'constrain' does not exist on type 'NumberConstructor'.
@@ -9207,7 +8343,12 @@ node_modules/chrome-devtools-frontend/front_end/profiler/ProfileType.js(239,15):
 node_modules/chrome-devtools-frontend/front_end/profiler/ProfileType.js(244,24): error TS2694: Namespace 'Protocol' has no exported member 'HeapProfiler'.
 node_modules/chrome-devtools-frontend/front_end/profiler/ProfileView.js(10,18): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/profiler/ProfileView.js(13,48): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/profiler/ProfileView.js(16,56): error TS2694: Namespace 'DataGrid.DataGrid' has no exported member 'ColumnDescriptor'.
+node_modules/chrome-devtools-frontend/front_end/profiler/ProfileView.js(20,7): error TS2345: Argument of type '{ id: string; title: string; width: string; fixedWidth: true; sortable: true; sort: any; }' is not assignable to parameter of type '{ id: string; title: string; titleDOMFragment: DocumentFragment; sortable: boolean; sort: string; align: string; fixedWidth: boolean; editable: boolean; nonSelectable: boolean; longText: boolean; disclosure: boolean; weight: number; }'.
+  Object literal may only specify known properties, and 'width' does not exist in type '{ id: string; title: string; titleDOMFragment: DocumentFragment; sortable: boolean; sort: string; align: string; fixedWidth: boolean; editable: boolean; nonSelectable: boolean; longText: boolean; disclosure: boolean; weight: number; }'.
+node_modules/chrome-devtools-frontend/front_end/profiler/ProfileView.js(25,67): error TS2345: Argument of type '{ id: string; title: string; width: string; fixedWidth: true; sortable: true; }' is not assignable to parameter of type '{ id: string; title: string; titleDOMFragment: DocumentFragment; sortable: boolean; sort: string; align: string; fixedWidth: boolean; editable: boolean; nonSelectable: boolean; longText: boolean; disclosure: boolean; weight: number; }'.
+  Object literal may only specify known properties, and 'width' does not exist in type '{ id: string; title: string; titleDOMFragment: DocumentFragment; sortable: boolean; sort: string; align: string; fixedWidth: boolean; editable: boolean; nonSelectable: boolean; longText: boolean; disclosure: boolean; weight: number; }'.
+node_modules/chrome-devtools-frontend/front_end/profiler/ProfileView.js(26,18): error TS2345: Argument of type '{ id: string; title: any; disclosure: true; sortable: true; }' is not assignable to parameter of type '{ id: string; title: string; titleDOMFragment: DocumentFragment; sortable: boolean; sort: string; align: string; fixedWidth: boolean; editable: boolean; nonSelectable: boolean; longText: boolean; disclosure: boolean; weight: number; }'.
+  Type '{ id: string; title: any; disclosure: true; sortable: true; }' is missing the following properties from type '{ id: string; title: string; titleDOMFragment: DocumentFragment; sortable: boolean; sort: string; align: string; fixedWidth: boolean; editable: boolean; nonSelectable: boolean; longText: boolean; disclosure: boolean; weight: number; }': titleDOMFragment, sort, align, fixedWidth, and 4 more.
 node_modules/chrome-devtools-frontend/front_end/profiler/ProfileView.js(26,49): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/profiler/ProfileView.js(35,52): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/profiler/ProfileView.js(39,54): error TS2555: Expected at least 2 arguments, but got 1.
@@ -9220,17 +8361,11 @@ node_modules/chrome-devtools-frontend/front_end/profiler/ProfileView.js(136,59):
 node_modules/chrome-devtools-frontend/front_end/profiler/ProfileView.js(136,78): error TS2339: Property 'adjustedTotal' does not exist on type 'ProfileView'.
 node_modules/chrome-devtools-frontend/front_end/profiler/ProfileView.js(147,59): error TS2339: Property 'profile' does not exist on type 'ProfileView'.
 node_modules/chrome-devtools-frontend/front_end/profiler/ProfileView.js(147,78): error TS2339: Property 'adjustedTotal' does not exist on type 'ProfileView'.
-node_modules/chrome-devtools-frontend/front_end/profiler/ProfileView.js(259,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/profiler/ProfileView.js(264,30): error TS2339: Property '_profileHeader' does not exist on type 'ProfileView'.
 node_modules/chrome-devtools-frontend/front_end/profiler/ProfileView.js(276,15): error TS2339: Property 'profile' does not exist on type 'ProfileView'.
 node_modules/chrome-devtools-frontend/front_end/profiler/ProfileView.js(284,65): error TS2339: Property 'value' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/profiler/ProfileView.js(322,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/profiler/ProfileView.js(329,30): error TS2339: Property 'focus' does not exist on type 'ProfileDataGridTree'.
-node_modules/chrome-devtools-frontend/front_end/profiler/ProfileView.js(332,34): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; TimelineStarted: number; ProfilesCPUProfileTaken: number; ProfilesHeapProfileTaken: number; AuditsStarted: number; ... 23 more ...; ShowedThirdPartyBadges: number; }'.
-node_modules/chrome-devtools-frontend/front_end/profiler/ProfileView.js(336,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/profiler/ProfileView.js(347,30): error TS2339: Property 'exclude' does not exist on type 'ProfileDataGridTree'.
-node_modules/chrome-devtools-frontend/front_end/profiler/ProfileView.js(350,34): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; TimelineStarted: number; ProfilesCPUProfileTaken: number; ProfilesHeapProfileTaken: number; AuditsStarted: number; ... 23 more ...; ShowedThirdPartyBadges: number; }'.
-node_modules/chrome-devtools-frontend/front_end/profiler/ProfileView.js(354,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/profiler/ProfileView.js(368,30): error TS2554: Expected 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/profiler/ProfileView.js(404,68): error TS2339: Property 'bytesToString' does not exist on type 'NumberConstructor'.
 node_modules/chrome-devtools-frontend/front_end/profiler/ProfileView.js(459,56): error TS2339: Property 'toISO8601Compact' does not exist on type 'Date'.
@@ -9248,11 +8383,7 @@ node_modules/chrome-devtools-frontend/front_end/profiler/ProfilesPanel.js(111,48
 node_modules/chrome-devtools-frontend/front_end/profiler/ProfilesPanel.js(114,13): error TS2339: Property 'consume' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/profiler/ProfilesPanel.js(129,28): error TS2339: Property '_fileSelectorElement' does not exist on type 'typeof ProfilesPanel'.
 node_modules/chrome-devtools-frontend/front_end/profiler/ProfilesPanel.js(157,35): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/profiler/ProfilesPanel.js(210,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/profiler/ProfilesPanel.js(233,23): error TS2339: Property 'removeChildren' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/profiler/ProfilesPanel.js(261,24): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/profiler/ProfilesPanel.js(269,24): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/profiler/ProfilesPanel.js(277,24): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/profiler/ProfilesPanel.js(302,36): error TS2339: Property 'isSelfOrAncestor' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/profiler/ProfilesPanel.js(304,18): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/profiler/ProfilesPanel.js(304,68): error TS2339: Property 'click' does not exist on type 'Node'.
@@ -9264,7 +8395,6 @@ node_modules/chrome-devtools-frontend/front_end/profiler/ProfilesPanel.js(530,9)
 node_modules/chrome-devtools-frontend/front_end/profiler/ProfilesPanel.js(596,48): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/profiler/ProfilesPanel.js(598,49): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/profiler/ProfilesPanel.js(614,48): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/profiler/ProfilesPanel.js(623,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/profiler/ProfilesPanel.js(650,33): error TS2339: Property 'enclosingNodeOrSelfWithClass' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/profiler/ProfilesPanel.js(701,26): error TS2339: Property 'appendChildren' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/profiler/ProfilesPanel.js(713,16): error TS2555: Expected at least 2 arguments, but got 1.
@@ -9281,10 +8411,8 @@ node_modules/chrome-devtools-frontend/front_end/profiler/ProfilesPanel.js(811,31
 node_modules/chrome-devtools-frontend/front_end/profiler/TargetsComboBoxController.js(31,38): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/profiler/TargetsComboBoxController.js(36,27): error TS2339: Property 'selectedIndex' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/profiler/TargetsComboBoxController.js(49,39): error TS2339: Property 'remove' does not exist on type 'Map<Target, Element>'.
-node_modules/chrome-devtools-frontend/front_end/profiler/TargetsComboBoxController.js(55,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/profiler/TargetsComboBoxController.js(60,12): error TS2339: Property 'text' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/profiler/TargetsComboBoxController.js(64,66): error TS2339: Property 'selectedIndex' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/profiler/TargetsComboBoxController.js(79,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/profiler/TargetsComboBoxController.js(97,25): error TS2339: Property 'selectedIndex' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/profiler/TopDownProfileDataGrid.js(63,17): error TS2339: Property 'populate' does not exist on type 'TopDownProfileDataGridTree | TopDownProfileDataGridNode'.
   Property 'populate' does not exist on type 'TopDownProfileDataGridTree'.
@@ -9296,10 +8424,6 @@ node_modules/chrome-devtools-frontend/front_end/protocol/InspectorBackend.js(170
 node_modules/chrome-devtools-frontend/front_end/protocol/InspectorBackend.js(194,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/protocol/InspectorBackend.js(201,17): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/protocol/InspectorBackend.js(202,20): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/protocol/InspectorBackend.js(205,38): error TS2339: Property 'Params' does not exist on type 'typeof Connection'.
-node_modules/chrome-devtools-frontend/front_end/protocol/InspectorBackend.js(208,61): error TS2694: Namespace 'Protocol.InspectorBackend.Connection' has no exported member 'Params'.
-node_modules/chrome-devtools-frontend/front_end/protocol/InspectorBackend.js(210,38): error TS2339: Property 'Factory' does not exist on type 'typeof Connection'.
-node_modules/chrome-devtools-frontend/front_end/protocol/InspectorBackend.js(217,53): error TS2694: Namespace 'Protocol.InspectorBackend.Connection' has no exported member 'Factory'.
 node_modules/chrome-devtools-frontend/front_end/protocol/InspectorBackend.js(229,36): error TS2339: Property 'deprecatedRunAfterPendingDispatches' does not exist on type 'typeof InspectorBackend'.
 node_modules/chrome-devtools-frontend/front_end/protocol/InspectorBackend.js(230,33): error TS2339: Property 'deprecatedRunAfterPendingDispatches' does not exist on type 'typeof InspectorBackend'.
 node_modules/chrome-devtools-frontend/front_end/protocol/InspectorBackend.js(233,36): error TS2339: Property 'sendRawMessageForTesting' does not exist on type 'typeof InspectorBackend'.
@@ -9322,7 +8446,6 @@ node_modules/chrome-devtools-frontend/front_end/quick_open/CommandMenu.js(202,18
 node_modules/chrome-devtools-frontend/front_end/quick_open/CommandMenu.js(203,35): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/quick_open/CommandMenu.js(204,24): error TS2339: Property 'hashCode' does not exist on type 'StringConstructor'.
 node_modules/chrome-devtools-frontend/front_end/quick_open/CommandMenu.js(207,18): error TS2339: Property 'createTextChild' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/quick_open/CommandMenu.js(221,34): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; TimelineStarted: number; ProfilesCPUProfileTaken: number; ProfilesHeapProfileTaken: number; AuditsStarted: number; ... 23 more ...; ShowedThirdPartyBadges: number; }'.
 node_modules/chrome-devtools-frontend/front_end/quick_open/CommandMenu.js(229,19): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/quick_open/CommandMenu.js(247,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/quick_open/FilteredListWidget.js(24,47): error TS2339: Property 'createChild' does not exist on type 'Element'.
@@ -9333,7 +8456,6 @@ node_modules/chrome-devtools-frontend/front_end/quick_open/FilteredListWidget.js
       Type '(item: number) => Element' is not assignable to type '(item: T) => Element'.
         Types of parameters 'item' and 'item' are incompatible.
           Type 'T' is not assignable to type 'number'.
-node_modules/chrome-devtools-frontend/front_end/quick_open/FilteredListWidget.js(107,34): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ SetExactSize: symbol; SetExactWidthMaxHeight: symbol; MeasureContent: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/quick_open/FilteredListWidget.js(175,23): error TS2339: Property '_scoringTimer' does not exist on type 'FilteredListWidget'.
 node_modules/chrome-devtools-frontend/front_end/quick_open/FilteredListWidget.js(178,17): error TS2339: Property '_scoringTimer' does not exist on type 'FilteredListWidget'.
 node_modules/chrome-devtools-frontend/front_end/quick_open/FilteredListWidget.js(180,17): error TS2339: Property '_refreshListWithCurrentResult' does not exist on type 'FilteredListWidget'.
@@ -9387,8 +8509,9 @@ node_modules/chrome-devtools-frontend/front_end/resources/AppManifestView.js(55,
           Type 'T' is not assignable to type 'ResourceTreeModel'.
 node_modules/chrome-devtools-frontend/front_end/resources/AppManifestView.js(88,31): error TS2694: Namespace 'Protocol' has no exported member 'Page'.
 node_modules/chrome-devtools-frontend/front_end/resources/AppManifestView.js(116,25): error TS2339: Property 'removeChildren' does not exist on type 'Element'.
+node_modules/chrome-devtools-frontend/front_end/resources/AppManifestView.js(120,84): error TS2345: Argument of type '{ text: string; }' is not assignable to parameter of type '{ text: string; className: string; lineNumber: number; columnNumber: number; preventClick: boolean; maxLength: number; }'.
+  Type '{ text: string; }' is missing the following properties from type '{ text: string; className: string; lineNumber: number; columnNumber: number; preventClick: boolean; maxLength: number; }': className, lineNumber, columnNumber, preventClick, maxLength
 node_modules/chrome-devtools-frontend/front_end/resources/AppManifestView.js(139,32): error TS2339: Property 'createChild' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/resources/AppManifestView.js(158,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/resources/AppManifestView.js(163,14): error TS2339: Property 'pageAgent' does not exist on type 'Target'.
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationCacheItemsView.js(31,18): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationCacheItemsView.js(37,54): error TS2555: Expected at least 2 arguments, but got 1.
@@ -9401,17 +8524,13 @@ node_modules/chrome-devtools-frontend/front_end/resources/ApplicationCacheItemsV
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationCacheItemsView.js(132,51): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationCacheItemsView.js(134,30): error TS2339: Property 'type' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationCacheItemsView.js(135,51): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/resources/ApplicationCacheItemsView.js(177,56): error TS2694: Namespace 'DataGrid.DataGrid' has no exported member 'ColumnDescriptor'.
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationCacheItemsView.js(178,38): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationCacheItemsView.js(179,34): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationCacheItemsView.js(180,34): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationCacheItemsView.js(223,26): error TS2339: Property 'bytesToString' does not exist on type 'NumberConstructor'.
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationCacheItemsView.js(225,12): error TS2339: Property 'resource' does not exist on type 'DataGridNode<any>'.
-node_modules/chrome-devtools-frontend/front_end/resources/ApplicationCacheItemsView.js(239,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationCacheModel.js(39,12): error TS2339: Property 'registerApplicationCacheDispatcher' does not exist on type 'Target'.
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationCacheModel.js(40,26): error TS2339: Property 'applicationCacheAgent' does not exist on type 'Target'.
-node_modules/chrome-devtools-frontend/front_end/resources/ApplicationCacheModel.js(55,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/resources/ApplicationCacheModel.js(71,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationCacheModel.js(166,34): error TS2694: Namespace 'Protocol' has no exported member 'ApplicationCache'.
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(51,67): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(59,61): error TS2555: Expected at least 2 arguments, but got 1.
@@ -9423,17 +8542,11 @@ node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSideba
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(89,64): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(95,99): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(214,47): error TS2339: Property 'valuesArray' does not exist on type 'Map<Database, DatabaseQueryView>'.
-node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(233,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(269,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(282,31): error TS2339: Property 'asParsedURL' does not exist on type 'string'.
-node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(295,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(317,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(336,34): error TS2339: Property 'remove' does not exist on type 'Map<DOMStorage, DOMStorageTreeElement>'.
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(594,20): error TS2339: Property 'itemURL' does not exist on type 'BaseStorageTreeElement'.
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(751,32): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(785,52): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(795,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(814,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(825,31): error TS2339: Property 'remove' does not exist on type 'SWCacheTreeElement[]'.
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(879,52): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(918,32): error TS2555: Expected at least 2 arguments, but got 1.
@@ -9441,11 +8554,7 @@ node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSideba
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(984,32): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(1017,32): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(1052,52): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(1062,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(1082,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(1094,35): error TS2339: Property 'remove' does not exist on type 'IDBDatabaseTreeElement[]'.
-node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(1099,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(1113,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(1179,52): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(1225,27): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/resources/ApplicationPanelSidebar.js(1298,52): error TS2555: Expected at least 2 arguments, but got 1.
@@ -9474,7 +8583,6 @@ node_modules/chrome-devtools-frontend/front_end/resources/ClearStorageView.js(57
 node_modules/chrome-devtools-frontend/front_end/resources/ClearStorageView.js(58,37): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/resources/ClearStorageView.js(63,16): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/resources/ClearStorageView.js(63,76): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/resources/ClearStorageView.js(104,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/resources/ClearStorageView.js(129,18): error TS2339: Property 'storageAgent' does not exist on type 'Target'.
 node_modules/chrome-devtools-frontend/front_end/resources/ClearStorageView.js(174,23): error TS2339: Property 'disabled' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/resources/ClearStorageView.js(176,44): error TS2555: Expected at least 2 arguments, but got 1.
@@ -9494,17 +8602,12 @@ node_modules/chrome-devtools-frontend/front_end/resources/ClearStorageView.js(24
 node_modules/chrome-devtools-frontend/front_end/resources/ClearStorageView.js(249,23): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/resources/ClearStorageView.js(256,31): error TS2694: Namespace 'Protocol' has no exported member 'Storage'.
 node_modules/chrome-devtools-frontend/front_end/resources/CookieItemsView.js(36,18): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/resources/CookieItemsView.js(47,43): error TS2694: Namespace 'Common.EventTarget' has no exported member 'EventDescriptor'.
 node_modules/chrome-devtools-frontend/front_end/resources/CookieItemsView.js(81,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/resources/CookieItemsView.js(101,42): error TS2339: Property 'asParsedURL' does not exist on type 'string'.
 node_modules/chrome-devtools-frontend/front_end/resources/DOMStorageItemsView.js(32,18): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/resources/DOMStorageItemsView.js(38,56): error TS2694: Namespace 'DataGrid.DataGrid' has no exported member 'ColumnDescriptor'.
 node_modules/chrome-devtools-frontend/front_end/resources/DOMStorageItemsView.js(39,33): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/resources/DOMStorageItemsView.js(40,35): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/resources/DOMStorageItemsView.js(55,46): error TS2339: Property 'createChild' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/resources/DOMStorageItemsView.js(100,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/resources/DOMStorageItemsView.js(121,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/resources/DOMStorageItemsView.js(141,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/resources/DOMStorageItemsView.js(178,11): error TS2403: Subsequent variable declarations must have the same type.  Variable 'node' must be of type 'any', but here has type 'DataGridNode<any>'.
 node_modules/chrome-devtools-frontend/front_end/resources/DOMStorageItemsView.js(259,43): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/resources/DOMStorageItemsView.js(275,38): error TS2339: Property 'key' does not exist on type 'DataGridNode<any>'.
@@ -9513,8 +8616,6 @@ node_modules/chrome-devtools-frontend/front_end/resources/DOMStorageModel.js(55,
 node_modules/chrome-devtools-frontend/front_end/resources/DOMStorageModel.js(71,41): error TS2694: Namespace 'Protocol' has no exported member 'DOMStorage'.
 node_modules/chrome-devtools-frontend/front_end/resources/DOMStorageModel.js(119,26): error TS2339: Property 'domstorageAgent' does not exist on type 'Target'.
 node_modules/chrome-devtools-frontend/front_end/resources/DOMStorageModel.js(126,19): error TS2339: Property 'registerDOMStorageDispatcher' does not exist on type 'Target'.
-node_modules/chrome-devtools-frontend/front_end/resources/DOMStorageModel.js(155,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/resources/DOMStorageModel.js(175,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/resources/DOMStorageModel.js(204,24): error TS2694: Namespace 'Protocol' has no exported member 'DOMStorage'.
 node_modules/chrome-devtools-frontend/front_end/resources/DOMStorageModel.js(216,24): error TS2694: Namespace 'Protocol' has no exported member 'DOMStorage'.
 node_modules/chrome-devtools-frontend/front_end/resources/DOMStorageModel.js(229,24): error TS2694: Namespace 'Protocol' has no exported member 'DOMStorage'.
@@ -9532,7 +8633,6 @@ node_modules/chrome-devtools-frontend/front_end/resources/DatabaseModel.js(131,1
 node_modules/chrome-devtools-frontend/front_end/resources/DatabaseModel.js(191,24): error TS2694: Namespace 'Protocol' has no exported member 'Database'.
 node_modules/chrome-devtools-frontend/front_end/resources/DatabaseQueryView.js(38,42): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/resources/DatabaseQueryView.js(52,62): error TS2339: Property 'hasSelection' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/resources/DatabaseQueryView.js(60,39): error TS2694: Namespace 'UI.SuggestBox' has no exported member 'Suggestions'.
 node_modules/chrome-devtools-frontend/front_end/resources/DatabaseQueryView.js(85,64): error TS2339: Property 'hasSelection' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/resources/DatabaseQueryView.js(151,19): error TS2339: Property 'createTextChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/resources/DatabaseTableView.js(31,18): error TS2555: Expected at least 2 arguments, but got 1.
@@ -9543,7 +8643,6 @@ node_modules/chrome-devtools-frontend/front_end/resources/DatabaseTableView.js(1
 node_modules/chrome-devtools-frontend/front_end/resources/DatabaseTableView.js(124,40): error TS2345: Argument of type '{}' is not assignable to parameter of type '{ [x: string]: boolean; }'.
   Index signature is missing in type '{}'.
 node_modules/chrome-devtools-frontend/front_end/resources/DatabaseTableView.js(130,18): error TS2339: Property 'removeChildren' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/resources/DatabaseTableView.js(139,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/resources/IndexedDBModel.js(41,12): error TS2339: Property 'registerStorageDispatcher' does not exist on type 'Target'.
 node_modules/chrome-devtools-frontend/front_end/resources/IndexedDBModel.js(43,35): error TS2339: Property 'indexedDBAgent' does not exist on type 'Target'.
 node_modules/chrome-devtools-frontend/front_end/resources/IndexedDBModel.js(44,33): error TS2339: Property 'storageAgent' does not exist on type 'Target'.
@@ -9551,8 +8650,6 @@ node_modules/chrome-devtools-frontend/front_end/resources/IndexedDBModel.js(62,2
 node_modules/chrome-devtools-frontend/front_end/resources/IndexedDBModel.js(94,37): error TS2694: Namespace 'Protocol' has no exported member 'IndexedDB'.
 node_modules/chrome-devtools-frontend/front_end/resources/IndexedDBModel.js(100,25): error TS2694: Namespace 'Protocol' has no exported member 'IndexedDB'.
 node_modules/chrome-devtools-frontend/front_end/resources/IndexedDBModel.js(112,24): error TS2694: Namespace 'Protocol' has no exported member 'IndexedDB'.
-node_modules/chrome-devtools-frontend/front_end/resources/IndexedDBModel.js(215,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/resources/IndexedDBModel.js(223,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/resources/IndexedDBModel.js(258,36): error TS2339: Property 'asParsedURL' does not exist on type 'string'.
 node_modules/chrome-devtools-frontend/front_end/resources/IndexedDBModel.js(368,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/resources/IndexedDBModel.js(381,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
@@ -9572,10 +8669,17 @@ node_modules/chrome-devtools-frontend/front_end/resources/IndexedDBViews.js(122,
 node_modules/chrome-devtools-frontend/front_end/resources/IndexedDBViews.js(125,53): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/resources/IndexedDBViews.js(128,67): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/resources/IndexedDBViews.js(130,40): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/resources/IndexedDBViews.js(147,56): error TS2694: Namespace 'DataGrid.DataGrid' has no exported member 'ColumnDescriptor'.
 node_modules/chrome-devtools-frontend/front_end/resources/IndexedDBViews.js(148,47): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/resources/IndexedDBViews.js(148,79): error TS2345: Argument of type '{ id: string; title: any; sortable: false; width: string; }' is not assignable to parameter of type '{ id: string; title: string; titleDOMFragment: DocumentFragment; sortable: boolean; sort: string; align: string; fixedWidth: boolean; editable: boolean; nonSelectable: boolean; longText: boolean; disclosure: boolean; weight: number; }'.
+  Object literal may only specify known properties, and 'width' does not exist in type '{ id: string; title: string; titleDOMFragment: DocumentFragment; sortable: boolean; sort: string; align: string; fixedWidth: boolean; editable: boolean; nonSelectable: boolean; longText: boolean; disclosure: boolean; weight: number; }'.
+node_modules/chrome-devtools-frontend/front_end/resources/IndexedDBViews.js(150,9): error TS2345: Argument of type '{ id: string; titleDOMFragment: DocumentFragment; sortable: false; }' is not assignable to parameter of type '{ id: string; title: string; titleDOMFragment: DocumentFragment; sortable: boolean; sort: string; align: string; fixedWidth: boolean; editable: boolean; nonSelectable: boolean; longText: boolean; disclosure: boolean; weight: number; }'.
+  Type '{ id: string; titleDOMFragment: DocumentFragment; sortable: false; }' is missing the following properties from type '{ id: string; title: string; titleDOMFragment: DocumentFragment; sortable: boolean; sort: string; align: string; fixedWidth: boolean; editable: boolean; nonSelectable: boolean; longText: boolean; disclosure: boolean; weight: number; }': title, sort, align, fixedWidth, and 5 more.
 node_modules/chrome-devtools-frontend/front_end/resources/IndexedDBViews.js(150,76): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/resources/IndexedDBViews.js(152,20): error TS2345: Argument of type '{ id: string; titleDOMFragment: DocumentFragment; sortable: false; }' is not assignable to parameter of type '{ id: string; title: string; titleDOMFragment: DocumentFragment; sortable: boolean; sort: string; align: string; fixedWidth: boolean; editable: boolean; nonSelectable: boolean; longText: boolean; disclosure: boolean; weight: number; }'.
+  Type '{ id: string; titleDOMFragment: DocumentFragment; sortable: false; }' is missing the following properties from type '{ id: string; title: string; titleDOMFragment: DocumentFragment; sortable: boolean; sort: string; align: string; fixedWidth: boolean; editable: boolean; nonSelectable: boolean; longText: boolean; disclosure: boolean; weight: number; }': title, sort, align, fixedWidth, and 5 more.
 node_modules/chrome-devtools-frontend/front_end/resources/IndexedDBViews.js(154,64): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/resources/IndexedDBViews.js(158,18): error TS2345: Argument of type '{ id: string; title: any; sortable: false; }' is not assignable to parameter of type '{ id: string; title: string; titleDOMFragment: DocumentFragment; sortable: boolean; sort: string; align: string; fixedWidth: boolean; editable: boolean; nonSelectable: boolean; longText: boolean; disclosure: boolean; weight: number; }'.
+  Type '{ id: string; title: any; sortable: false; }' is missing the following properties from type '{ id: string; title: string; titleDOMFragment: DocumentFragment; sortable: boolean; sort: string; align: string; fixedWidth: boolean; editable: boolean; nonSelectable: boolean; longText: boolean; disclosure: boolean; weight: number; }': titleDOMFragment, sort, align, fixedWidth, and 5 more.
 node_modules/chrome-devtools-frontend/front_end/resources/IndexedDBViews.js(158,46): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/resources/IndexedDBViews.js(174,29): error TS2339: Property 'createTextChild' does not exist on type 'DocumentFragment'.
 node_modules/chrome-devtools-frontend/front_end/resources/IndexedDBViews.js(178,29): error TS2339: Property 'createTextChild' does not exist on type 'DocumentFragment'.
@@ -9591,11 +8695,7 @@ node_modules/chrome-devtools-frontend/front_end/resources/IndexedDBViews.js(217,
 node_modules/chrome-devtools-frontend/front_end/resources/IndexedDBViews.js(221,59): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/resources/IndexedDBViews.js(228,27): error TS2339: Property 'placeholder' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/resources/IndexedDBViews.js(228,48): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/resources/IndexedDBViews.js(238,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/resources/IndexedDBViews.js(246,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/resources/IndexedDBViews.js(295,52): error TS2339: Property 'value' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/resources/IndexedDBViews.js(362,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/resources/IndexedDBViews.js(369,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/resources/IndexedDBViews.js(433,14): error TS2339: Property 'removeChildren' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/resources/ResourcesPanel.js(22,47): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/resources/ResourcesSection.js(69,33): error TS2339: Property 'remove' does not exist on type 'Map<string, FrameTreeElement>'.
@@ -9609,19 +8709,13 @@ node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkerCacheView
 node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkerCacheViews.js(50,55): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkerCacheViews.js(54,62): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkerCacheViews.js(90,43): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkerCacheViews.js(99,56): error TS2694: Namespace 'DataGrid.DataGrid' has no exported member 'ColumnDescriptor'.
 node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkerCacheViews.js(100,34): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkerCacheViews.js(101,41): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkerCacheViews.js(103,23): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkerCacheViews.js(110,23): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkerCacheViews.js(154,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkerCacheViews.js(162,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkerCacheViews.js(198,31): error TS2694: Namespace 'Protocol' has no exported member 'CacheStorage'.
 node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkerCacheViews.js(215,11): error TS2403: Subsequent variable declarations must have the same type.  Variable 'node' must be of type 'any', but here has type 'DataGridNode<any>'.
-node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkerCacheViews.js(253,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkerCacheViews.js(260,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkerCacheViews.js(285,24): error TS2694: Namespace 'Protocol' has no exported member 'CacheStorage'.
-node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkerCacheViews.js(316,44): error TS2694: Namespace 'SDK.NetworkRequest' has no exported member 'ContentData'.
 node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkerCacheViews.js(381,50): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkerCacheViews.js(382,50): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkersView.js(12,57): error TS2555: Expected at least 2 arguments, but got 1.
@@ -9631,7 +8725,6 @@ node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkersView.js(
 node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkersView.js(61,39): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkersView.js(64,48): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkersView.js(66,44): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkersView.js(69,75): error TS2694: Namespace 'Common.EventTarget' has no exported member 'EventDescriptor'.
 node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkersView.js(71,63): error TS2345: Argument of type 'this' is not assignable to parameter of type '{ modelAdded(model: T): void; modelRemoved(model: T): void; }'.
   Type 'ServiceWorkersView' is not assignable to type '{ modelAdded(model: T): void; modelRemoved(model: T): void; }'.
     Types of property 'modelAdded' are incompatible.
@@ -9640,8 +8733,6 @@ node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkersView.js(
           Type 'T' is not assignable to type 'ServiceWorkerManager'.
 node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkersView.js(120,7): error TS2447: The '|=' operator is not allowed for boolean types. Consider using '||' instead.
 node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkersView.js(121,7): error TS2447: The '|=' operator is not allowed for boolean types. Consider using '||' instead.
-node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkersView.js(150,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkersView.js(211,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkersView.js(238,24): error TS2339: Property 'filterRegex' does not exist on type 'StringConstructor'.
 node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkersView.js(262,30): error TS2339: Property 'asParsedURL' does not exist on type 'string'.
 node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkersView.js(293,63): error TS2555: Expected at least 2 arguments, but got 1.
@@ -9657,8 +8748,8 @@ node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkersView.js(
 node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkersView.js(321,21): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkersView.js(323,45): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkersView.js(324,12): error TS2339: Property 'type' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkersView.js(332,13): error TS2339: Property 'key' does not exist on type 'Event'.
-node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkersView.js(333,11): error TS2339: Property 'consume' does not exist on type 'Event'.
+node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkersView.js(329,54): error TS2345: Argument of type '{ lineNumbers: boolean; lineWrapping: boolean; autoHeight: boolean; padBottom: boolean; mimeType: string; }' is not assignable to parameter of type '{ bracketMatchingSetting: Setting<any>; lineNumbers: boolean; lineWrapping: boolean; mimeType: string; autoHeight: boolean; padBottom: boolean; maxHighlightLength: number; placeholder: string; }'.
+  Type '{ lineNumbers: boolean; lineWrapping: boolean; autoHeight: boolean; padBottom: boolean; mimeType: string; }' is missing the following properties from type '{ bracketMatchingSetting: Setting<any>; lineNumbers: boolean; lineWrapping: boolean; mimeType: string; autoHeight: boolean; padBottom: boolean; maxHighlightLength: number; placeholder: string; }': bracketMatchingSetting, maxHighlightLength, placeholder
 node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkersView.js(343,66): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkersView.js(344,21): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkersView.js(346,45): error TS2555: Expected at least 2 arguments, but got 1.
@@ -9674,6 +8765,8 @@ node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkersView.js(
 node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkersView.js(403,30): error TS2339: Property 'targetAgent' does not exist on type 'Target'.
 node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkersView.js(411,23): error TS2339: Property 'removeChildren' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkersView.js(413,34): error TS2339: Property 'createChild' does not exist on type 'Element'.
+node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkersView.js(414,73): error TS2345: Argument of type '{ text: string; }' is not assignable to parameter of type '{ text: string; className: string; lineNumber: number; columnNumber: number; preventClick: boolean; maxLength: number; }'.
+  Type '{ text: string; }' is missing the following properties from type '{ text: string; className: string; lineNumber: number; columnNumber: number; preventClick: boolean; maxLength: number; }': className, lineNumber, columnNumber, preventClick, maxLength
 node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkersView.js(421,23): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkersView.js(446,23): error TS2339: Property 'removeChildren' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkersView.js(447,43): error TS2339: Property 'createChild' does not exist on type 'Element'.
@@ -9687,8 +8780,6 @@ node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkersView.js(
 node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkersView.js(486,44): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkersView.js(492,16): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkersView.js(496,25): error TS2339: Property 'createChild' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkersView.js(505,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkersView.js(512,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkersView.js(537,24): error TS2694: Namespace 'Protocol' has no exported member 'Target'.
 node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkersView.js(548,24): error TS2694: Namespace 'Protocol' has no exported member 'Target'.
 node_modules/chrome-devtools-frontend/front_end/resources/ServiceWorkersView.js(552,15): error TS2339: Property 'createTextChild' does not exist on type 'Element'.
@@ -9700,10 +8791,9 @@ node_modules/chrome-devtools-frontend/front_end/resources/StorageItemsView.js(15
 node_modules/chrome-devtools-frontend/front_end/resources/StorageItemsView.js(17,32): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/resources/StorageItemsView.js(18,50): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/resources/StorageItemsView.js(22,51): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/resources/StorageItemsView.js(40,60): error TS2345: Argument of type 'Function' is not assignable to parameter of type '(arg0: any) => any'.
-  Type 'Function' provides no match for the signature '(arg0: any): any'.
+node_modules/chrome-devtools-frontend/front_end/resources/StorageItemsView.js(40,60): error TS2345: Argument of type 'Function' is not assignable to parameter of type '(arg0: { data: any; }) => any'.
+  Type 'Function' provides no match for the signature '(arg0: { data: any; }): any'.
 node_modules/chrome-devtools-frontend/front_end/resources/StorageItemsView.js(49,52): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/resources/StorageItemsView.js(54,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/screencast/InputModel.js(11,31): error TS2339: Property 'inputAgent' does not exist on type 'Target'.
 node_modules/chrome-devtools-frontend/front_end/screencast/InputModel.js(36,70): error TS2339: Property 'charCode' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/screencast/InputModel.js(43,28): error TS2339: Property 'keyIdentifier' does not exist on type 'Event'.
@@ -9732,7 +8822,6 @@ node_modules/chrome-devtools-frontend/front_end/screencast/ScreencastApp.js(16,6
 node_modules/chrome-devtools-frontend/front_end/screencast/ScreencastApp.js(85,35): error TS2345: Argument of type 'ScreencastView' is not assignable to parameter of type 'boolean'.
 node_modules/chrome-devtools-frontend/front_end/screencast/ScreencastView.js(56,42): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/screencast/ScreencastView.js(152,24): error TS2694: Namespace 'Protocol' has no exported member 'Page'.
-node_modules/chrome-devtools-frontend/front_end/screencast/ScreencastView.js(193,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/screencast/ScreencastView.js(205,51): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/screencast/ScreencastView.js(208,51): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/screencast/ScreencastView.js(220,13): error TS2339: Property 'consume' does not exist on type 'Event'.
@@ -9806,12 +8895,10 @@ node_modules/chrome-devtools-frontend/front_end/sdk/CPUProfilerModel.js(78,24):
 node_modules/chrome-devtools-frontend/front_end/sdk/CPUProfilerModel.js(79,24): error TS2694: Namespace 'Protocol' has no exported member 'Profiler'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CPUProfilerModel.js(97,24): error TS2694: Namespace 'Protocol' has no exported member 'Debugger'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CPUProfilerModel.js(99,24): error TS2694: Namespace 'Protocol' has no exported member 'Profiler'.
-node_modules/chrome-devtools-frontend/front_end/sdk/CPUProfilerModel.js(104,49): error TS2694: Namespace 'SDK.CPUProfilerModel' has no exported member 'EventData'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CPUProfilerModel.js(127,34): error TS2694: Namespace 'Protocol' has no exported member 'Profiler'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CPUProfilerModel.js(144,41): error TS2694: Namespace 'Protocol' has no exported member 'Profiler'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CPUProfilerModel.js(158,41): error TS2694: Namespace 'Protocol' has no exported member 'Profiler'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CPUProfilerModel.js(173,112): error TS2694: Namespace 'Protocol' has no exported member 'Profiler'.
-node_modules/chrome-devtools-frontend/front_end/sdk/CPUProfilerModel.js(174,22): error TS2339: Property 'EventData' does not exist on type 'typeof CPUProfilerModel'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSMatchedStyles.js(11,24): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSMatchedStyles.js(12,24): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSMatchedStyles.js(13,32): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
@@ -9819,21 +8906,11 @@ node_modules/chrome-devtools-frontend/front_end/sdk/CSSMatchedStyles.js(14,32):
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSMatchedStyles.js(15,32): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSMatchedStyles.js(16,32): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSMatchedStyles.js(33,31): error TS2694: Namespace 'Protocol' has no exported member 'DOM'.
-node_modules/chrome-devtools-frontend/front_end/sdk/CSSMatchedStyles.js(43,74): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Regular: string; Inline: string; Attributes: string; }'.
-node_modules/chrome-devtools-frontend/front_end/sdk/CSSMatchedStyles.js(50,78): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Regular: string; Inline: string; Attributes: string; }'.
-node_modules/chrome-devtools-frontend/front_end/sdk/CSSMatchedStyles.js(77,81): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Regular: string; Inline: string; Attributes: string; }'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSMatchedStyles.js(241,53): error TS2339: Property 'media' does not exist on type 'CSSRule'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSMatchedStyles.js(264,31): error TS2694: Namespace 'Protocol' has no exported member 'DOM'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSMatchedStyles.js(322,58): error TS2339: Property 'valuesArray' does not exist on type 'Map<any, any>'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSMatchedStyles.js(352,46): error TS2345: Argument of type 'CSSRule' is not assignable to parameter of type 'CSSStyleRule'.
   Type 'CSSRule' is missing the following properties from type 'CSSStyleRule': media, wasUsed, _reinitializeSelectors, selectors, and 5 more.
-node_modules/chrome-devtools-frontend/front_end/sdk/CSSMatchedStyles.js(367,32): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Active: string; Overloaded: string; }'.
-node_modules/chrome-devtools-frontend/front_end/sdk/CSSMatchedStyles.js(373,32): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Active: string; Overloaded: string; }'.
-node_modules/chrome-devtools-frontend/front_end/sdk/CSSMatchedStyles.js(378,32): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Active: string; Overloaded: string; }'.
-node_modules/chrome-devtools-frontend/front_end/sdk/CSSMatchedStyles.js(389,34): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Active: string; Overloaded: string; }'.
-node_modules/chrome-devtools-frontend/front_end/sdk/CSSMatchedStyles.js(397,36): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Active: string; Overloaded: string; }'.
-node_modules/chrome-devtools-frontend/front_end/sdk/CSSMatchedStyles.js(405,30): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Active: string; Overloaded: string; }'.
-node_modules/chrome-devtools-frontend/front_end/sdk/CSSMatchedStyles.js(425,30): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Active: string; Overloaded: string; }'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSMedia.js(9,24): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSMedia.js(19,24): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSMedia.js(47,24): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
@@ -9855,21 +8932,15 @@ node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(55,81): error TS
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(102,24): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(203,31): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(238,24): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
-node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(244,34): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; TimelineStarted: number; ProfilesCPUProfileTaken: number; ProfilesHeapProfileTaken: number; AuditsStarted: number; ... 23 more ...; ShowedThirdPartyBadges: number; }'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(262,24): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
-node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(268,34): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; TimelineStarted: number; ProfilesCPUProfileTaken: number; ProfilesHeapProfileTaken: number; AuditsStarted: number; ... 23 more ...; ShowedThirdPartyBadges: number; }'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(290,41): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(328,24): error TS2694: Namespace 'Protocol' has no exported member 'DOM'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(348,24): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(356,24): error TS2694: Namespace 'Protocol' has no exported member 'DOM'.
-node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(365,38): error TS2694: Namespace 'SDK.CSSModel' has no exported member 'ContrastInfo'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(377,41): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(387,45): error TS2339: Property 'valuesArray' does not exist on type 'Map<string, CSSStyleSheetHeader>'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(406,24): error TS2694: Namespace 'Protocol' has no exported member 'DOM'.
-node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(415,71): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Regular: string; Inline: string; Attributes: string; }'.
-node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(417,75): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Regular: string; Inline: string; Attributes: string; }'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(460,24): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
-node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(466,34): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; TimelineStarted: number; ProfilesCPUProfileTaken: number; ProfilesHeapProfileTaken: number; AuditsStarted: number; ... 23 more ...; ShowedThirdPartyBadges: number; }'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(484,24): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(511,46): error TS2339: Property 'valuesArray' does not exist on type 'Map<string, CSSStyleSheetHeader>'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(533,24): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
@@ -9889,8 +8960,6 @@ node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(674,24): error T
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(687,46): error TS2339: Property 'valuesArray' does not exist on type 'Map<string, CSSStyleSheetHeader>'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(751,34): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(751,75): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
-node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(752,14): error TS2339: Property 'RuleUsage' does not exist on type 'typeof CSSModel'.
-node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(755,14): error TS2339: Property 'ContrastInfo' does not exist on type 'typeof CSSModel'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(778,24): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(848,24): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(856,24): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
@@ -9900,12 +8969,10 @@ node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(885,24): error T
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSModel.js(897,33): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSProperty.js(18,24): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSProperty.js(39,24): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
-node_modules/chrome-devtools-frontend/front_end/sdk/CSSProperty.js(156,36): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; TimelineStarted: number; ProfilesCPUProfileTaken: number; ProfilesHeapProfileTaken: number; AuditsStarted: number; ... 23 more ...; ShowedThirdPartyBadges: number; }'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSProperty.js(168,56): error TS2339: Property 'sprintf' does not exist on type 'StringConstructor'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSRule.js(9,24): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSRule.js(33,32): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSRule.js(33,98): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
-node_modules/chrome-devtools-frontend/front_end/sdk/CSSRule.js(44,83): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Regular: string; Inline: string; Attributes: string; }'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSRule.js(108,24): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSRule.js(131,64): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSRule.js(135,24): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
@@ -9920,12 +8987,7 @@ node_modules/chrome-devtools-frontend/front_end/sdk/CSSStyleDeclaration.js(8,24)
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSStyleDeclaration.js(41,47): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSStyleDeclaration.js(50,24): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CSSStyleSheetHeader.js(11,24): error TS2694: Namespace 'Protocol' has no exported member 'CSS'.
-node_modules/chrome-devtools-frontend/front_end/sdk/Connections.js(10,52): error TS2694: Namespace 'Protocol.InspectorBackend.Connection' has no exported member 'Params'.
-node_modules/chrome-devtools-frontend/front_end/sdk/Connections.js(34,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/sdk/Connections.js(41,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sdk/Connections.js(86,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/sdk/Connections.js(87,52): error TS2694: Namespace 'Protocol.InspectorBackend.Connection' has no exported member 'Params'.
-node_modules/chrome-devtools-frontend/front_end/sdk/Connections.js(168,52): error TS2694: Namespace 'Protocol.InspectorBackend.Connection' has no exported member 'Params'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CookieModel.js(14,24): error TS2694: Namespace 'Protocol' has no exported member 'Network'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CookieModel.js(40,27): error TS2339: Property 'asParsedURL' does not exist on type 'string'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CookieModel.js(65,26): error TS2339: Property 'networkAgent' does not exist on type 'Target'.
@@ -9933,20 +8995,15 @@ node_modules/chrome-devtools-frontend/front_end/sdk/CookieModel.js(95,39): error
 node_modules/chrome-devtools-frontend/front_end/sdk/CookieModel.js(97,10): error TS2339: Property 'networkAgent' does not exist on type 'Target'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CookieModel.js(114,38): error TS2339: Property 'asParsedURL' does not exist on type 'string'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CookieModel.js(129,38): error TS2339: Property 'networkAgent' does not exist on type 'Target'.
-node_modules/chrome-devtools-frontend/front_end/sdk/CookieParser.js(79,29): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ Request: number; Response: number; }'.
-node_modules/chrome-devtools-frontend/front_end/sdk/CookieParser.js(97,29): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ Request: number; Response: number; }'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CookieParser.js(246,25): error TS2694: Namespace 'Protocol' has no exported member 'Network'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CookieParser.js(250,33): error TS2694: Namespace 'Protocol' has no exported member 'Network'.
 node_modules/chrome-devtools-frontend/front_end/sdk/CookieParser.js(325,53): error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMDebuggerModel.js(11,26): error TS2339: Property 'domdebuggerAgent' does not exist on type 'Target'.
-node_modules/chrome-devtools-frontend/front_end/sdk/DOMDebuggerModel.js(232,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMDebuggerModel.js(275,24): error TS2694: Namespace 'Protocol' has no exported member 'DOMDebugger'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMDebuggerModel.js(387,7): error TS2322: Type 'Promise<void>' is not assignable to type 'Promise<undefined>'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMDebuggerModel.js(392,18): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMDebuggerModel.js(422,16): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMDebuggerModel.js(453,16): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/sdk/DOMDebuggerModel.js(469,5): error TS2322: Type 'string | { Raw: string; Framework: string; FrameworkUser: string; }' is not assignable to type '{ Raw: string; Framework: string; FrameworkUser: string; }'.
-  Type 'string' is not assignable to type '{ Raw: string; Framework: string; FrameworkUser: string; }'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMDebuggerModel.js(578,16): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMDebuggerModel.js(581,16): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMDebuggerModel.js(583,16): error TS2555: Expected at least 2 arguments, but got 1.
@@ -9991,7 +9048,6 @@ node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(136,53): error T
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(137,28): error TS2339: Property 'documentElement' does not exist on type 'DOMDocument'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(138,53): error TS2339: Property 'body' does not exist on type 'DOMDocument'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(139,28): error TS2339: Property 'body' does not exist on type 'DOMDocument'.
-node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(454,35): error TS2694: Namespace 'SDK.DOMNode' has no exported member 'Attribute'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(476,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(554,31): error TS2339: Property 'index' does not exist on type 'DOMNode'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(555,16): error TS2339: Property 'index' does not exist on type 'DOMNode'.
@@ -10012,7 +9068,6 @@ node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(896,7): error TS
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(928,12): error TS2339: Property 'scrollIntoViewIfNeeded' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(940,29): error TS2339: Property 'pageAgent' does not exist on type 'Target'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(947,12): error TS2339: Property 'focus' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(970,13): error TS2339: Property 'Attribute' does not exist on type 'typeof DOMNode'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(986,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(1042,24): error TS2694: Namespace 'Protocol' has no exported member 'DOM'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(1062,26): error TS2339: Property 'domAgent' does not exist on type 'Target'.
@@ -10081,10 +9136,8 @@ node_modules/chrome-devtools-frontend/front_end/sdk/DOMModel.js(1801,17): error
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(41,12): error TS2339: Property 'registerDebuggerDispatcher' does not exist on type 'Target'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(42,26): error TS2339: Property 'debuggerAgent' does not exist on type 'Target'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(231,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
-node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(250,43): error TS2694: Namespace 'SDK.DebuggerModel' has no exported member 'SetBreakpointResult'.
-node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(281,43): error TS2694: Namespace 'SDK.DebuggerModel' has no exported member 'SetBreakpointResult'.
-node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(304,43): error TS2694: Namespace 'SDK.DebuggerModel' has no exported member 'SetBreakpointResult'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(319,24): error TS2694: Namespace 'Protocol' has no exported member 'Debugger'.
+node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(332,50): error TS2694: Namespace 'SDK.DebuggerModel' has no exported member 'BreakLocation'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(346,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(347,34): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(355,24): error TS2694: Namespace 'Protocol' has no exported member 'Debugger'.
@@ -10110,21 +9163,13 @@ node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(540,24): er
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(546,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(700,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(711,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
-node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(763,32): error TS2694: Namespace 'SDK.RuntimeModel' has no exported member 'EvaluationOptions'.
-node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(764,42): error TS2694: Namespace 'SDK.RuntimeModel' has no exported member 'EvaluationResult'.
-node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(772,43): error TS2694: Namespace 'SDK.DebuggerModel' has no exported member 'FunctionDetails'.
-node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(780,36): error TS2694: Namespace 'SDK.DebuggerModel' has no exported member 'FunctionDetails'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(816,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(829,24): error TS2694: Namespace 'Protocol' has no exported member 'Debugger'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(830,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(830,31): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(838,24): error TS2694: Namespace 'Protocol' has no exported member 'Debugger'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(839,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(839,31): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(899,22): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
-node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(908,19): error TS2339: Property 'FunctionDetails' does not exist on type 'typeof DebuggerModel'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(967,31): error TS2694: Namespace 'Protocol' has no exported member 'Debugger'.
-node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(971,19): error TS2339: Property 'SetBreakpointResult' does not exist on type 'typeof DebuggerModel'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(987,32): error TS2694: Namespace 'Protocol' has no exported member 'Debugger'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(991,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(992,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
@@ -10142,10 +9187,11 @@ node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(1117,14): e
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(1148,24): error TS2694: Namespace 'Protocol' has no exported member 'Debugger'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(1158,24): error TS2694: Namespace 'Protocol' has no exported member 'Debugger'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(1159,15): error TS2577: Return type annotation circularly references itself.
+node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(1159,34): error TS2694: Namespace 'SDK.DebuggerModel' has no exported member 'BreakLocation'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(1174,24): error TS2694: Namespace 'Protocol' has no exported member 'Debugger'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(1197,32): error TS2694: Namespace 'Protocol' has no exported member 'Debugger'.
-node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(1294,32): error TS2694: Namespace 'SDK.RuntimeModel' has no exported member 'EvaluationOptions'.
-node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(1295,42): error TS2694: Namespace 'SDK.RuntimeModel' has no exported member 'EvaluationResult'.
+node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(1311,7): error TS2739: Type '{ error: any; }' is missing the following properties from type '{ object: RemoteObject; exceptionDetails: any; error: string; }': object, exceptionDetails
+node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(1313,5): error TS2741: Property 'error' is missing in type '{ object: RemoteObject; exceptionDetails: any; }' but required in type '{ object: RemoteObject; exceptionDetails: any; error: string; }'.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(1369,23): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(1371,23): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sdk/DebuggerModel.js(1373,23): error TS2555: Expected at least 2 arguments, but got 1.
@@ -10165,7 +9211,10 @@ node_modules/chrome-devtools-frontend/front_end/sdk/EmulationModel.js(12,30): er
 node_modules/chrome-devtools-frontend/front_end/sdk/EmulationModel.js(13,43): error TS2339: Property 'deviceOrientationAgent' does not exist on type 'Target'.
 node_modules/chrome-devtools-frontend/front_end/sdk/EmulationModel.js(51,24): error TS2694: Namespace 'Protocol' has no exported member 'PageAgent'.
 node_modules/chrome-devtools-frontend/front_end/sdk/EmulationModel.js(148,5): error TS2741: Property 'scriptId' is missing in type '{ enabled: boolean; configuration: string; }' but required in type '{ enabled: boolean; configuration: string; scriptId: string; }'.
+node_modules/chrome-devtools-frontend/front_end/sdk/FilmStripModel.js(46,48): error TS2694: Namespace 'SDK.TracingModel' has no exported member 'ObjectSnapshot'.
 node_modules/chrome-devtools-frontend/front_end/sdk/FilmStripModel.js(77,30): error TS2339: Property 'upperBound' does not exist on type 'Frame[]'.
+node_modules/chrome-devtools-frontend/front_end/sdk/FilmStripModel.js(104,34): error TS2694: Namespace 'SDK.TracingModel' has no exported member 'ObjectSnapshot'.
+node_modules/chrome-devtools-frontend/front_end/sdk/FilmStripModel.js(122,32): error TS2694: Namespace 'SDK.TracingModel' has no exported member 'ObjectSnapshot'.
 node_modules/chrome-devtools-frontend/front_end/sdk/HeapProfilerModel.js(10,12): error TS2339: Property 'registerHeapProfilerDispatcher' does not exist on type 'Target'.
 node_modules/chrome-devtools-frontend/front_end/sdk/HeapProfilerModel.js(12,38): error TS2339: Property 'heapProfilerAgent' does not exist on type 'Target'.
 node_modules/chrome-devtools-frontend/front_end/sdk/HeapProfilerModel.js(44,34): error TS2694: Namespace 'Protocol' has no exported member 'HeapProfiler'.
@@ -10194,7 +9243,6 @@ node_modules/chrome-devtools-frontend/front_end/sdk/LayerTreeBase.js(118,15): er
 node_modules/chrome-devtools-frontend/front_end/sdk/LayerTreeBase.js(123,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/sdk/LayerTreeBase.js(128,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/sdk/LayerTreeBase.js(133,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
-node_modules/chrome-devtools-frontend/front_end/sdk/LayerTreeBase.js(133,36): error TS2694: Namespace 'SDK' has no exported member 'SnapshotWithRect'.
 node_modules/chrome-devtools-frontend/front_end/sdk/LayerTreeBase.js(148,24): error TS2694: Namespace 'Protocol' has no exported member 'LayerTree'.
 node_modules/chrome-devtools-frontend/front_end/sdk/LayerTreeBase.js(152,26): error TS2694: Namespace 'Protocol' has no exported member 'DOM'.
 node_modules/chrome-devtools-frontend/front_end/sdk/LayerTreeBase.js(154,26): error TS2694: Namespace 'Protocol' has no exported member 'DOM'.
@@ -10207,30 +9255,18 @@ node_modules/chrome-devtools-frontend/front_end/sdk/LogModel.js(15,29): error TS
 node_modules/chrome-devtools-frontend/front_end/sdk/LogModel.js(28,24): error TS2694: Namespace 'Protocol' has no exported member 'Log'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(41,33): error TS2339: Property 'networkAgent' does not exist on type 'Target'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(42,12): error TS2339: Property 'registerNetworkDispatcher' does not exist on type 'Target'.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(105,44): error TS2694: Namespace 'SDK.NetworkRequest' has no exported member 'ContentData'.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(121,34): error TS2694: Namespace 'SDK.NetworkManager' has no exported member 'Conditions'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(122,25): error TS2694: Namespace 'Protocol' has no exported member 'Network'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(128,36): error TS2551: Property '_connectionTypes' does not exist on type 'typeof NetworkManager'. Did you mean '_connectionType'?
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(130,26): error TS2551: Property '_connectionTypes' does not exist on type 'typeof NetworkManager'. Did you mean '_connectionType'?
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(131,34): error TS2551: Property '_connectionTypes' does not exist on type 'typeof NetworkManager'. Did you mean '_connectionType'?
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(154,5): error TS2322: Type '{}' is not assignable to type '{ [x: string]: string; }'.
   Index signature is missing in type '{}'.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(166,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(199,20): error TS2339: Property 'Message' does not exist on type 'typeof NetworkManager'.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(220,20): error TS2300: Duplicate identifier 'Conditions'.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(220,20): error TS2339: Property 'Conditions' does not exist on type 'typeof NetworkManager'.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(222,32): error TS2694: Namespace 'SDK.NetworkManager' has no exported member 'Conditions'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(224,17): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(230,32): error TS2694: Namespace 'SDK.NetworkManager' has no exported member 'Conditions'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(232,17): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(238,32): error TS2694: Namespace 'SDK.NetworkManager' has no exported member 'Conditions'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(240,17): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(246,32): error TS2694: Namespace 'SDK.NetworkManager' has no exported member 'Conditions'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(248,17): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(255,20): error TS2339: Property 'BlockedPattern' does not exist on type 'typeof NetworkManager'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(269,34): error TS2694: Namespace 'Protocol' has no exported member 'Network'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(276,24): error TS2694: Namespace 'Protocol' has no exported member 'Network'.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(277,43): error TS2694: Namespace 'SDK.NetworkRequest' has no exported member 'NameValue'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(291,24): error TS2694: Namespace 'Protocol' has no exported member 'Network'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(304,24): error TS2694: Namespace 'Protocol' has no exported member 'Network'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(322,20): error TS2339: Property 'connectionReused' does not exist on type 'NetworkRequest'.
@@ -10297,20 +9333,15 @@ node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(777,24): e
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(779,24): error TS2694: Namespace 'Protocol' has no exported member 'Network'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(782,24): error TS2694: Namespace 'Protocol' has no exported member 'Network'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(799,31): error TS2694: Namespace 'Protocol' has no exported member 'NetworkAgent'.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(801,36): error TS2694: Namespace 'SDK.NetworkManager' has no exported member 'Conditions'.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(812,57): error TS2694: Namespace 'SDK.MultitargetNetworkManager' has no exported member 'RequestInterceptor'.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(812,108): error TS2694: Namespace 'SDK.MultitargetNetworkManager' has no exported member 'InterceptionPattern'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(827,21): error TS2339: Property 'sprintf' does not exist on type 'StringConstructor'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(836,31): error TS2339: Property 'networkAgent' does not exist on type 'Target'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(855,32): error TS2339: Property 'networkAgent' does not exist on type 'Target'.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(874,34): error TS2694: Namespace 'SDK.NetworkManager' has no exported member 'Conditions'.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(884,35): error TS2694: Namespace 'SDK.NetworkManager' has no exported member 'Conditions'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(891,24): error TS2694: Namespace 'Protocol' has no exported member 'NetworkAgent'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(905,24): error TS2694: Namespace 'Protocol' has no exported member 'Network'.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(955,42): error TS2694: Namespace 'SDK.NetworkManager' has no exported member 'BlockedPattern'.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(976,41): error TS2694: Namespace 'SDK.NetworkManager' has no exported member 'BlockedPattern'.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(1019,52): error TS2694: Namespace 'SDK.MultitargetNetworkManager' has no exported member 'InterceptionPattern'.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(1020,45): error TS2694: Namespace 'SDK.MultitargetNetworkManager' has no exported member 'RequestInterceptor'.
+node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(1025,47): error TS2345: Argument of type '(arg0: InterceptedRequest) => Promise<any>' is not assignable to parameter of type 'K'.
+  '(arg0: InterceptedRequest) => Promise<any>' is assignable to the constraint of type 'K', but 'K' could be instantiated with a different subtype of constraint '{}'.
+node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(1027,43): error TS2345: Argument of type '(arg0: InterceptedRequest) => Promise<any>' is not assignable to parameter of type 'K'.
+  '(arg0: InterceptedRequest) => Promise<any>' is assignable to the constraint of type 'K', but 'K' could be instantiated with a different subtype of constraint '{}'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(1060,13): error TS2349: This expression is not callable.
   Type '{}' has no call signatures.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(1084,19): error TS2339: Property 'networkAgent' does not exist on type 'Target'.
@@ -10330,10 +9361,7 @@ node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(1185,21):
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(1185,38): error TS2339: Property 'indexOf' does not exist on type 'string | ArrayBuffer'.
   Property 'indexOf' does not exist on type 'ArrayBuffer'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(1196,24): error TS2694: Namespace 'Protocol' has no exported member 'Network'.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(1205,44): error TS2694: Namespace 'SDK.NetworkRequest' has no exported member 'ContentData'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(1215,66): error TS2694: Namespace 'Protocol' has no exported member 'Network'.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(1216,31): error TS2339: Property 'InterceptionPattern' does not exist on type 'typeof MultitargetNetworkManager'.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkManager.js(1219,31): error TS2339: Property 'RequestInterceptor' does not exist on type 'typeof MultitargetNetworkManager'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(36,24): error TS2694: Namespace 'Protocol' has no exported member 'Network'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(39,24): error TS2694: Namespace 'Protocol' has no exported member 'Page'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(40,24): error TS2694: Namespace 'Protocol' has no exported member 'Network'.
@@ -10343,10 +9371,6 @@ node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(58,26): er
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(66,26): error TS2694: Namespace 'Protocol' has no exported member 'Security'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(69,26): error TS2694: Namespace 'Protocol' has no exported member 'Network'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(71,26): error TS2694: Namespace 'Protocol' has no exported member 'Network'.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(76,45): error TS2694: Namespace 'SDK.NetworkRequest' has no exported member 'ContentData'.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(78,44): error TS2694: Namespace 'SDK.NetworkRequest' has no exported member 'WebSocketFrame'.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(80,44): error TS2694: Namespace 'SDK.NetworkRequest' has no exported member 'EventSourceMessage'.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(87,43): error TS2694: Namespace 'SDK.NetworkRequest' has no exported member 'NameValue'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(94,26): error TS2694: Namespace 'Protocol' has no exported member 'Network'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(97,26): error TS2694: Namespace 'Protocol' has no exported member 'Security'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(99,26): error TS2694: Namespace 'Protocol' has no exported member 'Network'.
@@ -10365,31 +9389,13 @@ node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(415,24): e
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(466,25): error TS2694: Namespace 'Protocol' has no exported member 'Network'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(473,24): error TS2694: Namespace 'Protocol' has no exported member 'Network'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(543,82): error TS2339: Property 'asParsedURL' does not exist on type 'string'.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(615,43): error TS2694: Namespace 'SDK.NetworkRequest' has no exported member 'NameValue'.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(622,42): error TS2694: Namespace 'SDK.NetworkRequest' has no exported member 'NameValue'.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(709,43): error TS2694: Namespace 'SDK.NetworkRequest' has no exported member 'NameValue'.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(716,42): error TS2694: Namespace 'SDK.NetworkRequest' has no exported member 'NameValue'.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(745,43): error TS2694: Namespace 'SDK.NetworkRequest' has no exported member 'NameValue'.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(815,43): error TS2694: Namespace 'SDK.NetworkRequest' has no exported member 'NameValue'.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(828,43): error TS2694: Namespace 'SDK.NetworkRequest' has no exported member 'NameValue'.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(860,43): error TS2694: Namespace 'SDK.NetworkRequest' has no exported member 'NameValue'.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(874,42): error TS2694: Namespace 'SDK.NetworkRequest' has no exported member 'NameValue'.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(895,44): error TS2694: Namespace 'SDK.NetworkRequest' has no exported member 'ContentData'.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(908,54): error TS2694: Namespace 'SDK.NetworkRequest' has no exported member 'ContentData'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(980,24): error TS2694: Namespace 'Protocol' has no exported member 'Network'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(987,25): error TS2694: Namespace 'Protocol' has no exported member 'Network'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(994,24): error TS2694: Namespace 'Protocol' has no exported member 'Network'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(1001,25): error TS2694: Namespace 'Protocol' has no exported member 'Network'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(1019,13): error TS2339: Property 'src' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(1026,25): error TS2694: Namespace 'Protocol' has no exported member 'Network'.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(1033,43): error TS2694: Namespace 'SDK.NetworkRequest' has no exported member 'WebSocketFrame'.
 node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(1054,24): error TS2694: Namespace 'Protocol' has no exported member 'Network'.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(1070,34): error TS2694: Namespace 'SDK.NetworkRequest' has no exported member 'WebSocketFrame'.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(1078,43): error TS2694: Namespace 'SDK.NetworkRequest' has no exported member 'EventSourceMessage'.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(1118,20): error TS2339: Property 'NameValue' does not exist on type 'typeof NetworkRequest'.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(1128,20): error TS2339: Property 'WebSocketFrame' does not exist on type 'typeof NetworkRequest'.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(1131,20): error TS2339: Property 'EventSourceMessage' does not exist on type 'typeof NetworkRequest'.
-node_modules/chrome-devtools-frontend/front_end/sdk/NetworkRequest.js(1134,20): error TS2339: Property 'ContentData' does not exist on type 'typeof NetworkRequest'.
 node_modules/chrome-devtools-frontend/front_end/sdk/OverlayModel.js(16,12): error TS2339: Property 'registerOverlayDispatcher' does not exist on type 'Target'.
 node_modules/chrome-devtools-frontend/front_end/sdk/OverlayModel.js(17,33): error TS2339: Property 'overlayAgent' does not exist on type 'Target'.
 node_modules/chrome-devtools-frontend/front_end/sdk/OverlayModel.js(81,22): error TS2339: Property '_highlightDisabled' does not exist on type 'typeof OverlayModel'.
@@ -10427,10 +9433,8 @@ node_modules/chrome-devtools-frontend/front_end/sdk/OverlayModel.js(316,24): err
 node_modules/chrome-devtools-frontend/front_end/sdk/OverlayModel.js(317,24): error TS2694: Namespace 'Protocol' has no exported member 'Overlay'.
 node_modules/chrome-devtools-frontend/front_end/sdk/OverlayModel.js(326,24): error TS2694: Namespace 'Protocol' has no exported member 'Page'.
 node_modules/chrome-devtools-frontend/front_end/sdk/PaintProfiler.js(37,35): error TS2339: Property 'layerTreeAgent' does not exist on type 'Target'.
-node_modules/chrome-devtools-frontend/front_end/sdk/PaintProfiler.js(41,27): error TS2694: Namespace 'SDK' has no exported member 'PictureFragment'.
 node_modules/chrome-devtools-frontend/front_end/sdk/PaintProfiler.js(108,24): error TS2694: Namespace 'Protocol' has no exported member 'DOM'.
 node_modules/chrome-devtools-frontend/front_end/sdk/PaintProfiler.js(109,41): error TS2694: Namespace 'Protocol' has no exported member 'LayerTree'.
-node_modules/chrome-devtools-frontend/front_end/sdk/PaintProfiler.js(134,19): error TS2694: Namespace 'SDK' has no exported member 'RawPaintProfilerLogItem'.
 node_modules/chrome-devtools-frontend/front_end/sdk/PerformanceMetricsModel.js(11,26): error TS2339: Property 'performanceAgent' does not exist on type 'Target'.
 node_modules/chrome-devtools-frontend/front_end/sdk/PerformanceMetricsModel.js(29,41): error TS2694: Namespace 'Protocol' has no exported member 'Performance'.
 node_modules/chrome-devtools-frontend/front_end/sdk/ProfileTreeModel.js(9,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
@@ -10466,11 +9470,8 @@ node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(334,31): err
 node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(342,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(342,39): error TS1110: Type expected.
 node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(343,31): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
-node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(344,29): error TS2694: Namespace 'SDK' has no exported member 'CallFunctionResult'.
 node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(350,16): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(350,30): error TS2694: Namespace 'SDK' has no exported member 'CallFunctionResult'.
 node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(358,16): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(358,30): error TS2694: Namespace 'SDK' has no exported member 'CallFunctionResult'.
 node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(369,39): error TS1110: Type expected.
 node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(370,31): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(371,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
@@ -10527,12 +9528,6 @@ node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(1179,3): err
 node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(1179,3): error TS2416: Property 'callFunctionJSON' in type 'LocalJSONObject' is not assignable to the same property in base type 'RemoteObject'.
   Type '(functionDeclaration: (this: any) => any, args: any[], callback: (arg0: any) => any) => void' is not assignable to type '<T>(functionDeclaration: (this: any, ...arg1: any[]) => T, args: any[], callback: (arg0: T) => any) => void'.
     Types of parameters 'functionDeclaration' and 'functionDeclaration' are incompatible.
-node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(1234,21): error TS2694: Namespace 'SDK' has no exported member 'CallFunctionResult'.
-node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(1265,21): error TS2694: Namespace 'SDK' has no exported member 'CallFunctionResult'.
-node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(1345,43): error TS2694: Namespace 'SDK.DebuggerModel' has no exported member 'FunctionDetails'.
-node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(1352,45): error TS2694: Namespace 'SDK.DebuggerModel' has no exported member 'FunctionDetails'.
-node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(1363,35): error TS2694: Namespace 'SDK.DebuggerModel' has no exported member 'FunctionDetails'.
-node_modules/chrome-devtools-frontend/front_end/sdk/RemoteObject.js(1364,36): error TS2694: Namespace 'SDK.DebuggerModel' has no exported member 'FunctionDetails'.
 node_modules/chrome-devtools-frontend/front_end/sdk/Resource.js(38,24): error TS2694: Namespace 'Protocol' has no exported member 'Page'.
 node_modules/chrome-devtools-frontend/front_end/sdk/Resource.js(39,24): error TS2694: Namespace 'Protocol' has no exported member 'Network'.
 node_modules/chrome-devtools-frontend/front_end/sdk/Resource.js(56,55): error TS2339: Property 'isValid' does not exist on type 'Date'.
@@ -10551,8 +9546,6 @@ node_modules/chrome-devtools-frontend/front_end/sdk/ResourceTreeModel.js(162,24)
 node_modules/chrome-devtools-frontend/front_end/sdk/ResourceTreeModel.js(163,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/sdk/ResourceTreeModel.js(184,24): error TS2694: Namespace 'Protocol' has no exported member 'Page'.
 node_modules/chrome-devtools-frontend/front_end/sdk/ResourceTreeModel.js(216,24): error TS2694: Namespace 'Protocol' has no exported member 'Page'.
-node_modules/chrome-devtools-frontend/front_end/sdk/ResourceTreeModel.js(235,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/sdk/ResourceTreeModel.js(251,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sdk/ResourceTreeModel.js(273,24): error TS2694: Namespace 'Protocol' has no exported member 'Page'.
 node_modules/chrome-devtools-frontend/front_end/sdk/ResourceTreeModel.js(281,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/sdk/ResourceTreeModel.js(294,25): error TS2339: Property 'valuesArray' does not exist on type 'Map<string, ResourceTreeFrame>'.
@@ -10602,13 +9595,13 @@ node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(184,5): erro
     Type '(functionDeclaration: (this: any) => any, args: any[], callback: (arg0: any) => any) => void' is not assignable to type '<T>(functionDeclaration: (this: any, ...arg1: any[]) => T, args: any[], callback: (arg0: T) => any) => void'.
       Types of parameters 'functionDeclaration' and 'functionDeclaration' are incompatible.
 node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(209,5): error TS2322: Type 'RemoteObjectImpl' is not assignable to type 'RemoteObject'.
-node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(237,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(249,42): error TS2694: Namespace 'SDK.RuntimeModel' has no exported member 'CompileScriptResult'.
 node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(267,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
-node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(275,42): error TS2694: Namespace 'SDK.RuntimeModel' has no exported member 'EvaluationResult'.
-node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(301,42): error TS2694: Namespace 'SDK.RuntimeModel' has no exported member 'QueryObjectResult'.
+node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(294,7): error TS2739: Type '{ error: any; }' is missing the following properties from type '{ object: RemoteObject; exceptionDetails: any; error: string; }': object, exceptionDetails
+node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(296,5): error TS2741: Property 'error' is missing in type '{ object: RemoteObject; exceptionDetails: any; }' but required in type '{ object: RemoteObject; exceptionDetails: any; error: string; }'.
+node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(305,7): error TS2741: Property 'objects' is missing in type '{ error: string; }' but required in type '{ objects: RemoteObject; error: string; }'.
+node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(311,7): error TS2741: Property 'objects' is missing in type '{ error: any; }' but required in type '{ objects: RemoteObject; error: string; }'.
+node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(313,5): error TS2741: Property 'error' is missing in type '{ objects: RemoteObject; }' but required in type '{ objects: RemoteObject; error: string; }'.
 node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(317,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
-node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(344,35): error TS2694: Namespace 'SDK.DebuggerModel' has no exported member 'FunctionDetails'.
 node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(398,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(414,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(430,32): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
@@ -10616,28 +9609,19 @@ node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(433,24): err
 node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(449,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(458,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(484,54): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
-node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(485,18): error TS2339: Property 'ExceptionWithTimestamp' does not exist on type 'typeof RuntimeModel'.
 node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(488,27): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(489,36): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
-node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(492,18): error TS2339: Property 'CompileScriptResult' does not exist on type 'typeof RuntimeModel'.
-node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(503,18): error TS2339: Property 'EvaluationOptions' does not exist on type 'typeof RuntimeModel'.
 node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(507,36): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
-node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(511,18): error TS2339: Property 'EvaluationResult' does not exist on type 'typeof RuntimeModel'.
-node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(518,18): error TS2339: Property 'QueryObjectResult' does not exist on type 'typeof RuntimeModel'.
 node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(523,30): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(526,30): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
-node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(529,18): error TS2339: Property 'ConsoleAPICall' does not exist on type 'typeof RuntimeModel'.
 node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(545,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(553,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(569,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(587,32): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(590,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(599,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
-node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(670,32): error TS2694: Namespace 'SDK.RuntimeModel' has no exported member 'EvaluationOptions'.
-node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(673,42): error TS2694: Namespace 'SDK.RuntimeModel' has no exported member 'EvaluationResult'.
-node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(685,42): error TS2694: Namespace 'SDK.RuntimeModel' has no exported member 'EvaluationResult'.
-node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(701,32): error TS2694: Namespace 'SDK.RuntimeModel' has no exported member 'EvaluationOptions'.
-node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(704,42): error TS2694: Namespace 'SDK.RuntimeModel' has no exported member 'EvaluationResult'.
+node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(727,7): error TS2739: Type '{ error: any; }' is missing the following properties from type '{ object: RemoteObject; exceptionDetails: any; error: string; }': object, exceptionDetails
+node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(729,5): error TS2741: Property 'error' is missing in type '{ object: RemoteObject; exceptionDetails: any; }' but required in type '{ object: RemoteObject; exceptionDetails: any; error: string; }'.
 node_modules/chrome-devtools-frontend/front_end/sdk/RuntimeModel.js(767,33): error TS2339: Property 'asParsedURL' does not exist on type 'string'.
 node_modules/chrome-devtools-frontend/front_end/sdk/ScreenCaptureModel.js(14,26): error TS2339: Property 'pageAgent' does not exist on type 'Target'.
 node_modules/chrome-devtools-frontend/front_end/sdk/ScreenCaptureModel.js(15,17): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
@@ -10667,12 +9651,11 @@ node_modules/chrome-devtools-frontend/front_end/sdk/Script.js(190,50): error TS2
 node_modules/chrome-devtools-frontend/front_end/sdk/Script.js(190,95): error TS2694: Namespace 'Protocol' has no exported member 'Debugger'.
 node_modules/chrome-devtools-frontend/front_end/sdk/Script.js(190,127): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/sdk/Script.js(190,158): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
-node_modules/chrome-devtools-frontend/front_end/sdk/Script.js(198,16): error TS2345: Argument of type '"Script failed to parse"' is not assignable to parameter of type 'symbol'.
 node_modules/chrome-devtools-frontend/front_end/sdk/Script.js(203,54): error TS2339: Property 'debuggerAgent' does not exist on type 'Target'.
 node_modules/chrome-devtools-frontend/front_end/sdk/Script.js(247,31): error TS2694: Namespace 'Protocol' has no exported member 'Debugger'.
 node_modules/chrome-devtools-frontend/front_end/sdk/Script.js(251,54): error TS2339: Property 'debuggerAgent' does not exist on type 'Target'.
 node_modules/chrome-devtools-frontend/front_end/sdk/SecurityOriginManager.js(41,34): error TS2339: Property 'valuesArray' does not exist on type 'Set<string>'.
-node_modules/chrome-devtools-frontend/front_end/sdk/ServerTiming.js(20,41): error TS2694: Namespace 'SDK.NetworkRequest' has no exported member 'NameValue'.
+node_modules/chrome-devtools-frontend/front_end/sdk/ServerTiming.js(30,12): error TS2339: Property 'pushAll' does not exist on type 'any[]'.
 node_modules/chrome-devtools-frontend/front_end/sdk/ServerTiming.js(110,26): error TS2554: Expected 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sdk/ServerTiming.js(129,32): error TS2345: Argument of type 'TemplateStringsArray' is not assignable to parameter of type 'string | string[]'.
   Type 'TemplateStringsArray' is not assignable to type 'string[]'.
@@ -10689,8 +9672,6 @@ node_modules/chrome-devtools-frontend/front_end/sdk/ServiceWorkerCacheModel.js(2
 node_modules/chrome-devtools-frontend/front_end/sdk/ServiceWorkerCacheModel.js(94,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/sdk/ServiceWorkerCacheModel.js(94,41): error TS2694: Namespace 'Protocol' has no exported member 'CacheStorage'.
 node_modules/chrome-devtools-frontend/front_end/sdk/ServiceWorkerCacheModel.js(151,36): error TS2339: Property 'asParsedURL' does not exist on type 'string'.
-node_modules/chrome-devtools-frontend/front_end/sdk/ServiceWorkerCacheModel.js(203,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/sdk/ServiceWorkerCacheModel.js(211,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sdk/ServiceWorkerCacheModel.js(236,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/sdk/ServiceWorkerCacheModel.js(236,40): error TS2694: Namespace 'Protocol' has no exported member 'CacheStorage'.
 node_modules/chrome-devtools-frontend/front_end/sdk/ServiceWorkerCacheModel.js(332,34): error TS2694: Namespace 'Protocol' has no exported member 'CacheStorage'.
@@ -10708,9 +9689,7 @@ node_modules/chrome-devtools-frontend/front_end/sdk/ServiceWorkerManager.js(437,
 node_modules/chrome-devtools-frontend/front_end/sdk/ServiceWorkerManager.js(444,33): error TS2694: Namespace 'Protocol' has no exported member 'ServiceWorker'.
 node_modules/chrome-devtools-frontend/front_end/sdk/ServiceWorkerManager.js(449,24): error TS2694: Namespace 'Protocol' has no exported member 'ServiceWorker'.
 node_modules/chrome-devtools-frontend/front_end/sdk/ServiceWorkerManager.js(480,24): error TS2694: Namespace 'Protocol' has no exported member 'ServiceWorker'.
-node_modules/chrome-devtools-frontend/front_end/sdk/ServiceWorkerManager.js(549,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sdk/ServiceWorkerManager.js(553,68): error TS2339: Property 'valuesArray' does not exist on type 'Map<string, ServiceWorkerRegistration>'.
-node_modules/chrome-devtools-frontend/front_end/sdk/ServiceWorkerManager.js(565,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sdk/ServiceWorkerManager.js(608,36): error TS2339: Property 'asParsedURL' does not exist on type 'string'.
 node_modules/chrome-devtools-frontend/front_end/sdk/SourceMap.js(106,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/sdk/SourceMap.js(111,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
@@ -10738,7 +9717,6 @@ node_modules/chrome-devtools-frontend/front_end/sdk/SourceMap.js(507,20): error
 node_modules/chrome-devtools-frontend/front_end/sdk/SourceMap.js(527,37): error TS2339: Property '_base64Map' does not exist on type 'typeof TextSourceMap'.
 node_modules/chrome-devtools-frontend/front_end/sdk/SourceMap.js(558,18): error TS2339: Property 'lowerBound' does not exist on type 'SourceMapEntry[]'.
 node_modules/chrome-devtools-frontend/front_end/sdk/SourceMap.js(559,29): error TS2339: Property 'upperBound' does not exist on type 'SourceMapEntry[]'.
-node_modules/chrome-devtools-frontend/front_end/sdk/SourceMapManager.js(52,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sdk/SourceMapManager.js(85,41): error TS2345: Argument of type 'string' is not assignable to parameter of type 'K'.
   'string' is assignable to the constraint of type 'K', but 'K' could be instantiated with a different subtype of constraint '{}'.
 node_modules/chrome-devtools-frontend/front_end/sdk/SourceMapManager.js(86,46): error TS2345: Argument of type 'string' is not assignable to parameter of type 'K'.
@@ -10765,7 +9743,6 @@ node_modules/chrome-devtools-frontend/front_end/sdk/SourceMapManager.js(232,40):
   'string' is assignable to the constraint of type 'K', but 'K' could be instantiated with a different subtype of constraint '{}'.
 node_modules/chrome-devtools-frontend/front_end/sdk/SourceMapManager.js(234,42): error TS2345: Argument of type 'string' is not assignable to parameter of type 'K'.
   'string' is assignable to the constraint of type 'K', but 'K' could be instantiated with a different subtype of constraint '{}'.
-node_modules/chrome-devtools-frontend/front_end/sdk/Target.js(16,52): error TS2694: Namespace 'Protocol.InspectorBackend.Connection' has no exported member 'Factory'.
 node_modules/chrome-devtools-frontend/front_end/sdk/Target.js(148,48): error TS2339: Property 'valuesArray' does not exist on type 'Map<any, any>'.
 node_modules/chrome-devtools-frontend/front_end/sdk/Target.js(159,53): error TS2345: Argument of type 'new (arg1: Target) => T' is not assignable to parameter of type 'new (arg1: Target) => SDKModel'.
   Type 'T' is not assignable to type 'SDKModel'.
@@ -10773,7 +9750,6 @@ node_modules/chrome-devtools-frontend/front_end/sdk/Target.js(166,48): error TS2
   Type 'T' is not assignable to type 'SDKModel'.
 node_modules/chrome-devtools-frontend/front_end/sdk/Target.js(191,34): error TS2339: Property 'asParsedURL' does not exist on type 'string'.
 node_modules/chrome-devtools-frontend/front_end/sdk/TargetManager.js(15,103): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/sdk/TargetManager.js(15,120): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sdk/TargetManager.js(27,16): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/sdk/TargetManager.js(104,35): error TS2345: Argument of type 'new (arg1: Target) => T' is not assignable to parameter of type 'new (arg1: Target) => SDKModel'.
   Type 'T' is not assignable to type 'SDKModel'.
@@ -10791,84 +9767,53 @@ node_modules/chrome-devtools-frontend/front_end/sdk/TargetManager.js(134,27): er
 node_modules/chrome-devtools-frontend/front_end/sdk/TargetManager.js(146,29): error TS2345: Argument of type 'SDKModel' is not assignable to parameter of type 'T'.
   'SDKModel' is assignable to the constraint of type 'T', but 'T' could be instantiated with a different subtype of constraint '{}'.
 node_modules/chrome-devtools-frontend/front_end/sdk/TargetManager.js(152,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/sdk/TargetManager.js(152,31): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sdk/TargetManager.js(157,42): error TS2345: Argument of type 'Function' is not assignable to parameter of type 'new (arg1: Target) => any'.
   Type 'Function' provides no match for the signature 'new (arg1: Target): any'.
 node_modules/chrome-devtools-frontend/front_end/sdk/TargetManager.js(169,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/sdk/TargetManager.js(169,31): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sdk/TargetManager.js(177,42): error TS2345: Argument of type 'Function' is not assignable to parameter of type 'new (arg1: Target) => any'.
 node_modules/chrome-devtools-frontend/front_end/sdk/TargetManager.js(209,21): error TS2339: Property 'remove' does not exist on type '{ targetAdded(target: Target): void; targetRemoved(target: Target): void; }[]'.
-node_modules/chrome-devtools-frontend/front_end/sdk/TargetManager.js(216,52): error TS2694: Namespace 'Protocol.InspectorBackend.Connection' has no exported member 'Factory'.
 node_modules/chrome-devtools-frontend/front_end/sdk/TargetManager.js(237,34): error TS2345: Argument of type 'Function' is not assignable to parameter of type 'new (arg1: Target) => any'.
 node_modules/chrome-devtools-frontend/front_end/sdk/TargetManager.js(267,19): error TS2339: Property 'remove' does not exist on type 'Target[]'.
 node_modules/chrome-devtools-frontend/front_end/sdk/TargetManager.js(279,34): error TS2345: Argument of type 'Function' is not assignable to parameter of type 'new (arg1: Target) => any'.
 node_modules/chrome-devtools-frontend/front_end/sdk/TargetManager.js(319,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/sdk/TargetManager.js(329,32): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/sdk/TargetManager.js(333,36): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; TimelineStarted: number; ProfilesCPUProfileTaken: number; ProfilesHeapProfileTaken: number; AuditsStarted: number; ... 23 more ...; ShowedThirdPartyBadges: number; }'.
-node_modules/chrome-devtools-frontend/front_end/sdk/TargetManager.js(347,36): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; TimelineStarted: number; ProfilesCPUProfileTaken: number; ProfilesHeapProfileTaken: number; AuditsStarted: number; ... 23 more ...; ShowedThirdPartyBadges: number; }'.
 node_modules/chrome-devtools-frontend/front_end/sdk/TargetManager.js(351,42): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sdk/TargetManager.js(352,12): error TS2339: Property 'runtimeAgent' does not exist on type 'Target'.
-node_modules/chrome-devtools-frontend/front_end/sdk/TargetManager.js(356,52): error TS2694: Namespace 'Protocol.InspectorBackend.Connection' has no exported member 'Params'.
 node_modules/chrome-devtools-frontend/front_end/sdk/TargetManager.js(381,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/sdk/TargetManager.js(401,38): error TS2339: Property 'targetAgent' does not exist on type 'Target'.
 node_modules/chrome-devtools-frontend/front_end/sdk/TargetManager.js(406,18): error TS2339: Property 'registerTargetDispatcher' does not exist on type 'Target'.
-node_modules/chrome-devtools-frontend/front_end/sdk/TargetManager.js(424,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/sdk/TargetManager.js(427,34): error TS2694: Namespace 'Adb' has no exported member 'Config'.
 node_modules/chrome-devtools-frontend/front_end/sdk/TargetManager.js(483,24): error TS2694: Namespace 'Protocol' has no exported member 'Target'.
 node_modules/chrome-devtools-frontend/front_end/sdk/TargetManager.js(501,24): error TS2694: Namespace 'Protocol' has no exported member 'Target'.
 node_modules/chrome-devtools-frontend/front_end/sdk/TargetManager.js(530,24): error TS2694: Namespace 'Protocol' has no exported member 'Target'.
 node_modules/chrome-devtools-frontend/front_end/sdk/TargetManager.js(552,12): error TS2339: Property 'runtimeAgent' does not exist on type 'Target'.
 node_modules/chrome-devtools-frontend/front_end/sdk/TargetManager.js(581,24): error TS2694: Namespace 'Protocol' has no exported member 'TargetAgent'.
-node_modules/chrome-devtools-frontend/front_end/sdk/TargetManager.js(583,52): error TS2694: Namespace 'Protocol.InspectorBackend.Connection' has no exported member 'Params'.
 node_modules/chrome-devtools-frontend/front_end/sdk/TargetManager.js(598,24): error TS2694: Namespace 'Protocol' has no exported member 'TargetAgent'.
-node_modules/chrome-devtools-frontend/front_end/sdk/TargetManager.js(600,52): error TS2694: Namespace 'Protocol.InspectorBackend.Connection' has no exported member 'Params'.
-node_modules/chrome-devtools-frontend/front_end/sdk/TracingManager.js(13,42): error TS2694: Namespace 'SDK.TracingManager' has no exported member 'EventPayload'.
 node_modules/chrome-devtools-frontend/front_end/sdk/TracingManager.js(36,33): error TS2339: Property 'tracingAgent' does not exist on type 'Target'.
 node_modules/chrome-devtools-frontend/front_end/sdk/TracingManager.js(37,12): error TS2339: Property 'registerTracingDispatcher' does not exist on type 'Target'.
-node_modules/chrome-devtools-frontend/front_end/sdk/TracingManager.js(56,42): error TS2694: Namespace 'SDK.TracingManager' has no exported member 'EventPayload'.
-node_modules/chrome-devtools-frontend/front_end/sdk/TracingManager.js(119,20): error TS2339: Property 'EventPayload' does not exist on type 'typeof TracingManager'.
-node_modules/chrome-devtools-frontend/front_end/sdk/TracingManager.js(150,42): error TS2694: Namespace 'SDK.TracingManager' has no exported member 'EventPayload'.
-node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(77,34): error TS2694: Namespace 'SDK.TracingManager' has no exported member 'EventPayload'.
-node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(133,42): error TS2694: Namespace 'SDK.TracingManager' has no exported member 'EventPayload'.
-node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(179,34): error TS2694: Namespace 'SDK.TracingManager' has no exported member 'EventPayload'.
 node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(250,47): error TS2339: Property 'id' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(254,37): error TS2339: Property 'id' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(283,5): error TS2322: Type 'NamedObject[]' is not assignable to type 'Process[]'.
   Type 'NamedObject' is missing the following properties from type 'Process': _threads, _threadByName, id, threadById, and 4 more.
 node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(283,65): error TS2339: Property 'valuesArray' does not exist on type 'Map<string | number, Process>'.
 node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(305,23): error TS2339: Property 'stableSort' does not exist on type 'Event[]'.
-node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(308,49): error TS2345: Argument of type '{ Begin: string; End: string; Complete: string; Instant: string; AsyncBegin: string; AsyncStepInto: string; AsyncStepPast: string; AsyncEnd: string; NestableAsyncBegin: string; NestableAsyncEnd: string; ... 9 more ...; DeleteObject: string; }' is not assignable to parameter of type 'string'.
 node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(338,52): error TS2339: Property 'id' does not exist on type 'Event'.
-node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(342,12): error TS2678: Type 'string' is not comparable to type '{ Begin: string; End: string; Complete: string; Instant: string; AsyncBegin: string; AsyncStepInto: string; AsyncStepPast: string; AsyncEnd: string; NestableAsyncBegin: string; NestableAsyncEnd: string; ... 9 more ...; DeleteObject: string; }'.
-node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(352,12): error TS2678: Type 'string' is not comparable to type '{ Begin: string; End: string; Complete: string; Instant: string; AsyncBegin: string; AsyncStepInto: string; AsyncStepPast: string; AsyncEnd: string; NestableAsyncBegin: string; NestableAsyncEnd: string; ... 9 more ...; DeleteObject: string; }'.
 node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(354,27): error TS2339: Property 'peekLast' does not exist on type 'AsyncEvent[]'.
-node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(357,12): error TS2678: Type 'string' is not comparable to type '{ Begin: string; End: string; Complete: string; Instant: string; AsyncBegin: string; AsyncStepInto: string; AsyncStepPast: string; AsyncEnd: string; NestableAsyncBegin: string; NestableAsyncEnd: string; ... 9 more ...; DeleteObject: string; }'.
 node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(375,71): error TS2339: Property 'id' does not exist on type 'Event'.
-node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(378,9): error TS2367: This condition will always return 'false' since the types '{ Begin: string; End: string; Complete: string; Instant: string; AsyncBegin: string; AsyncStepInto: string; AsyncStepPast: string; AsyncEnd: string; NestableAsyncBegin: string; NestableAsyncEnd: string; ... 9 more ...; DeleteObject: string; }' and 'string' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(392,9): error TS2367: This condition will always return 'false' since the types '{ Begin: string; End: string; Complete: string; Instant: string; AsyncBegin: string; AsyncStepInto: string; AsyncStepPast: string; AsyncEnd: string; NestableAsyncBegin: string; NestableAsyncEnd: string; ... 9 more ...; DeleteObject: string; }' and 'string' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(397,9): error TS2367: This condition will always return 'false' since the types '{ Begin: string; End: string; Complete: string; Instant: string; AsyncBegin: string; AsyncStepInto: string; AsyncStepPast: string; AsyncEnd: string; NestableAsyncBegin: string; NestableAsyncEnd: string; ... 9 more ...; DeleteObject: string; }' and 'string' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(397,48): error TS2367: This condition will always return 'false' since the types '{ Begin: string; End: string; Complete: string; Instant: string; AsyncBegin: string; AsyncStepInto: string; AsyncStepPast: string; AsyncEnd: string; NestableAsyncBegin: string; NestableAsyncEnd: string; ... 9 more ...; DeleteObject: string; }' and 'string' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(398,39): error TS2339: Property 'peekLast' does not exist on type 'Event[]'.
 node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(485,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
-node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(526,34): error TS2694: Namespace 'SDK.TracingManager' has no exported member 'EventPayload'.
 node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(541,13): error TS2339: Property 'id' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(543,13): error TS2339: Property 'bind_id' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(576,43): error TS2339: Property 'ordinal' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(576,55): error TS2339: Property 'ordinal' does not exist on type 'Event'.
-node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(637,27): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Begin: string; End: string; Complete: string; Instant: string; AsyncBegin: string; AsyncStepInto: string; AsyncStepPast: string; AsyncEnd: string; NestableAsyncBegin: string; NestableAsyncEnd: string; ... 9 more ...; DeleteObject: string; }'.
-node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(647,34): error TS2694: Namespace 'SDK.TracingManager' has no exported member 'EventPayload'.
 node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(649,15): error TS2577: Return type annotation circularly references itself.
+node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(649,33): error TS2694: Namespace 'SDK.TracingModel' has no exported member 'ObjectSnapshot'.
 node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(666,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(733,9): error TS2367: This condition will always return 'false' since the types '{ Begin: string; End: string; Complete: string; Instant: string; AsyncBegin: string; AsyncStepInto: string; AsyncStepPast: string; AsyncEnd: string; NestableAsyncBegin: string; NestableAsyncEnd: string; ... 9 more ...; DeleteObject: string; }' and 'string' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(733,60): error TS2367: This condition will always return 'false' since the types '{ Begin: string; End: string; Complete: string; Instant: string; AsyncBegin: string; AsyncStepInto: string; AsyncStepPast: string; AsyncEnd: string; NestableAsyncBegin: string; NestableAsyncEnd: string; ... 9 more ...; DeleteObject: string; }' and 'string' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(859,34): error TS2694: Namespace 'SDK.TracingManager' has no exported member 'EventPayload'.
 node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(870,5): error TS2322: Type 'NamedObject[]' is not assignable to type 'Thread[]'.
   Type 'NamedObject' is missing the following properties from type 'Thread': _process, _events, _asyncEvents, _lastTopLevelEvent, and 7 more.
 node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(870,61): error TS2339: Property 'valuesArray' does not exist on type 'Map<number, Thread>'.
 node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(888,23): error TS2339: Property 'stableSort' does not exist on type 'any[]'.
 node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(889,18): error TS2339: Property 'stableSort' does not exist on type 'any[]'.
 node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(917,18): error TS2339: Property 'remove' does not exist on type 'any[]'.
-node_modules/chrome-devtools-frontend/front_end/sdk/TracingModel.js(921,34): error TS2694: Namespace 'SDK.TracingManager' has no exported member 'EventPayload'.
 node_modules/chrome-devtools-frontend/front_end/sdk_test_runner/PageMockTestRunner.js(17,38): error TS2554: Expected 5 arguments, but got 4.
 node_modules/chrome-devtools-frontend/front_end/sdk_test_runner/PageMockTestRunner.js(88,20): error TS2339: Property 'hashCode' does not exist on type 'StringConstructor'.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityModel.js(14,34): error TS2339: Property 'securityAgent' does not exist on type 'Target'.
@@ -10886,8 +9831,6 @@ node_modules/chrome-devtools-frontend/front_end/security/SecurityModel.js(103,31
 node_modules/chrome-devtools-frontend/front_end/security/SecurityModel.js(104,24): error TS2694: Namespace 'Protocol' has no exported member 'Security'.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(15,32): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(21,31): error TS2694: Namespace 'Protocol' has no exported member 'Network'.
-node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(24,45): error TS2694: Namespace 'Security.SecurityPanel' has no exported member 'Origin'.
-node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(24,77): error TS2694: Namespace 'Security.SecurityPanel' has no exported member 'OriginState'.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(30,61): error TS2345: Argument of type 'this' is not assignable to parameter of type '{ modelAdded(model: T): void; modelRemoved(model: T): void; }'.
   Type 'SecurityPanel' is not assignable to type '{ modelAdded(model: T): void; modelRemoved(model: T): void; }'.
     Types of property 'modelAdded' are incompatible.
@@ -10904,33 +9847,20 @@ node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(101,24
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(108,24): error TS2694: Namespace 'Protocol' has no exported member 'Security'.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(110,31): error TS2694: Namespace 'Protocol' has no exported member 'Security'.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(111,24): error TS2694: Namespace 'Protocol' has no exported member 'Security'.
-node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(121,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(125,46): error TS2694: Namespace 'Protocol' has no exported member 'Security'.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(127,52): error TS2694: Namespace 'Protocol' has no exported member 'Security'.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(128,54): error TS2694: Namespace 'Protocol' has no exported member 'Security'.
-node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(138,38): error TS2694: Namespace 'Security.SecurityPanel' has no exported member 'Origin'.
-node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(181,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(200,46): error TS2694: Namespace 'Protocol' has no exported member 'Security'.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(214,52): error TS2694: Namespace 'Protocol' has no exported member 'Network'.
-node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(242,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(258,9): error TS2322: Type 'string' is not assignable to type '{ All: string; Displayed: string; Blocked: string; BlockOverridden: string; }'.
-node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(260,7): error TS2322: Type 'string' is not assignable to type '{ All: string; Displayed: string; Blocked: string; BlockOverridden: string; }'.
-node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(262,7): error TS2322: Type 'string' is not assignable to type '{ All: string; Displayed: string; Blocked: string; BlockOverridden: string; }'.
-node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(264,7): error TS2322: Type 'string' is not assignable to type '{ All: string; Displayed: string; Blocked: string; BlockOverridden: string; }'.
+node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(225,11): error TS2403: Subsequent variable declarations must have the same type.  Variable 'originState' must be of type 'OriginState', but here has type '{}'.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(283,24): error TS2694: Namespace 'Protocol' has no exported member 'Security'.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(284,24): error TS2694: Namespace 'Protocol' has no exported member 'Security'.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(285,25): error TS2694: Namespace 'Protocol' has no exported member 'Security'.
-node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(332,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(371,24): error TS2339: Property 'Origin' does not exist on type 'typeof SecurityPanel'.
-node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(380,24): error TS2339: Property 'OriginState' does not exist on type 'typeof SecurityPanel'.
+node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(375,25): error TS2694: Namespace 'Protocol' has no exported member 'Security'.
+node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(376,25): error TS2694: Namespace 'Protocol' has no exported member 'Network'.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(389,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(389,47): error TS2694: Namespace 'Security.SecurityPanel' has no exported member 'Origin'.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(416,59): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(422,45): error TS2694: Namespace 'Security.SecurityPanel' has no exported member 'Origin'.
-node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(439,38): error TS2694: Namespace 'Security.SecurityPanel' has no exported member 'Origin'.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(440,24): error TS2694: Namespace 'Protocol' has no exported member 'Security'.
-node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(451,38): error TS2694: Namespace 'Security.SecurityPanel' has no exported member 'Origin'.
-node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(458,38): error TS2694: Namespace 'Security.SecurityPanel' has no exported member 'Origin'.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(459,24): error TS2694: Namespace 'Protocol' has no exported member 'Security'.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(515,22): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(516,21): error TS2555: Expected at least 2 arguments, but got 1.
@@ -10957,27 +9887,17 @@ node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(669,25
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(670,26): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(671,25): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(672,24): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(698,17): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ All: string; Displayed: string; Blocked: string; BlockOverridden: string; }'.
-node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(702,62): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ All: string; Displayed: string; Blocked: string; BlockOverridden: string; }'.
-node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(711,40): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ All: string; Displayed: string; Blocked: string; BlockOverridden: string; }'.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(712,46): error TS2694: Namespace 'Protocol' has no exported member 'Security'.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(714,25): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(715,29): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(720,56): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ All: string; Displayed: string; Blocked: string; BlockOverridden: string; }'.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(726,24): error TS2694: Namespace 'Protocol' has no exported member 'Security'.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(739,35): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(740,42): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(744,34): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(759,7): error TS2339: Property 'consume' does not exist on type 'Event'.
-node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(761,11): error TS2322: Type 'string' is not assignable to type '{ Domain: string; HasResponseHeader: string; Is: string; LargerThan: string; Method: string; MimeType: string; MixedContent: string; Priority: string; Scheme: string; SetCookieDomain: string; SetCookieName: string; SetCookieValue: string; StatusCode: string; }'.
-node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(761,71): error TS2322: Type '{ All: string; Displayed: string; Blocked: string; BlockOverridden: string; }' is not assignable to type 'string'.
-node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(771,38): error TS2694: Namespace 'Security.SecurityPanel' has no exported member 'Origin'.
-node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(772,38): error TS2694: Namespace 'Security.SecurityPanel' has no exported member 'OriginState'.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(783,37): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(784,75): error TS2554: Expected 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(794,9): error TS2339: Property 'consume' does not exist on type 'Event'.
-node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(797,10): error TS2322: Type 'string' is not assignable to type '{ Domain: string; HasResponseHeader: string; Is: string; LargerThan: string; Method: string; MimeType: string; MixedContent: string; Priority: string; Scheme: string; SetCookieDomain: string; SetCookieName: string; SetCookieValue: string; StatusCode: string; }'.
-node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(798,10): error TS2322: Type 'string' is not assignable to type '{ Domain: string; HasResponseHeader: string; Is: string; LargerThan: string; Method: string; MimeType: string; MixedContent: string; Priority: string; Scheme: string; SetCookieDomain: string; SetCookieName: string; SetCookieValue: string; StatusCode: string; }'.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(803,44): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(804,94): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/security/SecurityPanel.js(808,27): error TS2555: Expected at least 2 arguments, but got 1.
@@ -11083,7 +10003,6 @@ node_modules/chrome-devtools-frontend/front_end/snippets/ScriptSnippetModel.js(5
         Types of parameters 'debuggerModel' and 'model' are incompatible.
           Type 'T' is not assignable to type 'DebuggerModel'.
 node_modules/chrome-devtools-frontend/front_end/snippets/ScriptSnippetModel.js(70,35): error TS2339: Property 'remove' does not exist on type 'Map<DebuggerModel, SnippetScriptMapping>'.
-node_modules/chrome-devtools-frontend/front_end/snippets/ScriptSnippetModel.js(146,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/snippets/ScriptSnippetModel.js(165,36): error TS2339: Property 'remove' does not exist on type 'Map<UISourceCode, string>'.
 node_modules/chrome-devtools-frontend/front_end/snippets/ScriptSnippetModel.js(172,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/snippets/ScriptSnippetModel.js(207,35): error TS2339: Property 'valuesArray' does not exist on type 'Map<DebuggerModel, SnippetScriptMapping>'.
@@ -11094,7 +10013,6 @@ node_modules/chrome-devtools-frontend/front_end/snippets/ScriptSnippetModel.js(2
 node_modules/chrome-devtools-frontend/front_end/snippets/ScriptSnippetModel.js(329,35): error TS2339: Property 'valuesArray' does not exist on type 'Map<DebuggerModel, SnippetScriptMapping>'.
 node_modules/chrome-devtools-frontend/front_end/snippets/ScriptSnippetModel.js(379,33): error TS2339: Property 'remove' does not exist on type 'Map<UISourceCode, Script>'.
 node_modules/chrome-devtools-frontend/front_end/snippets/ScriptSnippetModel.js(380,42): error TS2339: Property 'remove' does not exist on type 'Map<UISourceCode, number>'.
-node_modules/chrome-devtools-frontend/front_end/snippets/ScriptSnippetModel.js(534,35): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Debugger: string; Formatter: string; Network: string; Snippets: string; FileSystem: string; ContentScripts: string; Service: string; }'.
 node_modules/chrome-devtools-frontend/front_end/snippets/ScriptSnippetModel.js(560,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/snippets/ScriptSnippetModel.js(579,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/snippets/SnippetStorage.js(62,27): error TS2339: Property 'valuesArray' does not exist on type 'Map<string, Snippet>'.
@@ -11137,15 +10055,9 @@ node_modules/chrome-devtools-frontend/front_end/source_frame/JSONView.js(170,23)
 node_modules/chrome-devtools-frontend/front_end/source_frame/PreviewFactory.js(14,40): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/source_frame/ResourceSourceFrame.js(51,42): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/source_frame/SourceCodeDiff.js(15,22): error TS2339: Property 'installGutter' does not exist on type 'CodeMirrorTextEditor'.
-node_modules/chrome-devtools-frontend/front_end/source_frame/SourceCodeDiff.js(50,11): error TS2367: This condition will always return 'false' since the types '{ Insert: symbol; Delete: symbol; Modify: symbol; }' and 'symbol' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/source_frame/SourceCodeDiff.js(89,28): error TS2339: Property 'toggleLineClass' does not exist on type 'CodeMirrorTextEditor'.
-node_modules/chrome-devtools-frontend/front_end/source_frame/SourceCodeDiff.js(110,25): error TS2694: Namespace 'Diff.Diff' has no exported member 'DiffArray'.
-node_modules/chrome-devtools-frontend/front_end/source_frame/SourceCodeDiff.js(177,25): error TS2694: Namespace 'Diff.Diff' has no exported member 'DiffArray'.
 node_modules/chrome-devtools-frontend/front_end/source_frame/SourceCodeDiff.js(202,16): error TS2403: Subsequent variable declarations must have the same type.  Variable 'lineNumber' must be of type 'any', but here has type 'number'.
 node_modules/chrome-devtools-frontend/front_end/source_frame/SourceCodeDiff.js(206,41): error TS2339: Property 'diff' does not exist on type 'Map<number, GutterDecoration>'.
-node_modules/chrome-devtools-frontend/front_end/source_frame/SourceCodeDiff.js(250,9): error TS2367: This condition will always return 'false' since the types '{ Insert: symbol; Delete: symbol; Modify: symbol; }' and 'symbol' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/source_frame/SourceCodeDiff.js(252,14): error TS2367: This condition will always return 'false' since the types '{ Insert: symbol; Delete: symbol; Modify: symbol; }' and 'symbol' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/source_frame/SourceCodeDiff.js(254,14): error TS2367: This condition will always return 'false' since the types '{ Insert: symbol; Delete: symbol; Modify: symbol; }' and 'symbol' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/source_frame/SourceCodeDiff.js(275,22): error TS2339: Property 'setGutterDecoration' does not exist on type 'CodeMirrorTextEditor'.
 node_modules/chrome-devtools-frontend/front_end/source_frame/SourceCodeDiff.js(276,22): error TS2339: Property 'toggleLineClass' does not exist on type 'CodeMirrorTextEditor'.
 node_modules/chrome-devtools-frontend/front_end/source_frame/SourceCodeDiff.js(283,22): error TS2339: Property 'setGutterDecoration' does not exist on type 'CodeMirrorTextEditor'.
@@ -11156,8 +10068,10 @@ node_modules/chrome-devtools-frontend/front_end/source_frame/SourceFrame.js(435,
 node_modules/chrome-devtools-frontend/front_end/source_frame/SourceFrame.js(459,15): error TS2339: Property '__fromRegExpQuery' does not exist on type 'RegExp'.
 node_modules/chrome-devtools-frontend/front_end/source_frame/SourceFrame.js(472,36): error TS2339: Property 'lowerBound' does not exist on type 'TextRange[]'.
 node_modules/chrome-devtools-frontend/front_end/source_frame/SourceFrame.js(475,46): error TS2339: Property 'computeLineEndings' does not exist on type 'string'.
+node_modules/chrome-devtools-frontend/front_end/source_frame/SourcesTextEditor.js(12,11): error TS2345: Argument of type '{ lineNumbers: true; lineWrapping: false; bracketMatchingSetting: Setting<any>; padBottom: true; }' is not assignable to parameter of type '{ bracketMatchingSetting: Setting<any>; lineNumbers: boolean; lineWrapping: boolean; mimeType: string; autoHeight: boolean; padBottom: boolean; maxHighlightLength: number; placeholder: string; }'.
+  Type '{ lineNumbers: true; lineWrapping: false; bracketMatchingSetting: Setting<any>; padBottom: true; }' is missing the following properties from type '{ bracketMatchingSetting: Setting<any>; lineNumbers: boolean; lineWrapping: boolean; mimeType: string; autoHeight: boolean; padBottom: boolean; maxHighlightLength: number; placeholder: string; }': mimeType, autoHeight, maxHighlightLength, placeholder
 node_modules/chrome-devtools-frontend/front_end/source_frame/SourcesTextEditor.js(45,12): error TS2339: Property '_isHandlingMouseDownEvent' does not exist on type 'SourcesTextEditor'.
-node_modules/chrome-devtools-frontend/front_end/source_frame/SourcesTextEditor.js(54,20): error TS2694: Namespace 'UI' has no exported member 'AutocompleteConfig'.
+node_modules/chrome-devtools-frontend/front_end/source_frame/SourcesTextEditor.js(55,5): error TS2739: Type '{ isWordChar: any; }' is missing the following properties from type '{ substituteRangeCallback: (arg0: number, arg1: number) => TextRange; suggestionsCallback: (arg0: TextRange, arg1: TextRange, arg2?: boolean) => Promise<{ text: string; subtitle: string; iconType: string; priority: number; isSecondary: boolean; title: string; }[]>; isWordChar: (arg0: string) => boolean; captureEnter...': substituteRangeCallback, suggestionsCallback, captureEnter
 node_modules/chrome-devtools-frontend/front_end/source_frame/SourcesTextEditor.js(90,14): error TS2403: Subsequent variable declarations must have the same type.  Variable 'i' must be of type 'number', but here has type 'string'.
 node_modules/chrome-devtools-frontend/front_end/source_frame/SourcesTextEditor.js(93,29): error TS2345: Argument of type 'number' is not assignable to parameter of type 'string'.
 node_modules/chrome-devtools-frontend/front_end/source_frame/SourcesTextEditor.js(134,12): error TS2339: Property '_tokenHighlighter' does not exist on type 'CodeMirrorTextEditor'.
@@ -11169,8 +10083,6 @@ node_modules/chrome-devtools-frontend/front_end/source_frame/SourcesTextEditor.j
 node_modules/chrome-devtools-frontend/front_end/source_frame/SourcesTextEditor.js(445,15): error TS2339: Property '_isHandlingMouseDownEvent' does not exist on type 'SourcesTextEditor'.
 node_modules/chrome-devtools-frontend/front_end/source_frame/SourcesTextEditor.js(561,13): error TS2339: Property '_codeMirrorWhitespaceStyleInjected' does not exist on type 'Document'.
 node_modules/chrome-devtools-frontend/front_end/source_frame/SourcesTextEditor.js(563,9): error TS2339: Property '_codeMirrorWhitespaceStyleInjected' does not exist on type 'Document'.
-node_modules/chrome-devtools-frontend/front_end/source_frame/SourcesTextEditor.js(580,18): error TS2694: Namespace 'UI' has no exported member 'AutocompleteConfig'.
-node_modules/chrome-devtools-frontend/front_end/source_frame/SourcesTextEditor.js(594,31): error TS2339: Property 'GutterClickEventData' does not exist on type 'typeof SourcesTextEditor'.
 node_modules/chrome-devtools-frontend/front_end/source_frame/SourcesTextEditor.js(614,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/source_frame/SourcesTextEditor.js(622,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/source_frame/SourcesTextEditor.js(759,9): error TS1345: An expression of type 'void' cannot be tested for truthiness
@@ -11218,7 +10130,6 @@ node_modules/chrome-devtools-frontend/front_end/sources/AddSourceMapURLDialog.js
 node_modules/chrome-devtools-frontend/front_end/sources/AddSourceMapURLDialog.js(22,36): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/AddSourceMapURLDialog.js(27,25): error TS2339: Property 'tabIndex' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/sources/AddSourceMapURLDialog.js(31,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/sources/AddSourceMapURLDialog.js(37,28): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ SetExactSize: symbol; SetExactWidthMaxHeight: symbol; MeasureContent: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/sources/AddSourceMapURLDialog.js(50,32): error TS2339: Property 'value' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/sources/AddSourceMapURLDialog.js(57,15): error TS2339: Property 'keyCode' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sources/AdvancedSearchView.js(17,52): error TS2339: Property 'createChild' does not exist on type 'Element'.
@@ -11239,6 +10150,8 @@ node_modules/chrome-devtools-frontend/front_end/sources/AdvancedSearchView.js(29
 node_modules/chrome-devtools-frontend/front_end/sources/AdvancedSearchView.js(296,65): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/AdvancedSearchView.js(318,19): error TS2339: Property 'keyCode' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sources/AdvancedSearchView.js(397,46): error TS2339: Property 'window' does not exist on type 'Element'.
+node_modules/chrome-devtools-frontend/front_end/sources/CSSPlugin.js(44,9): error TS2345: Argument of type '{ suggestionsCallback: any; isWordChar: any; }' is not assignable to parameter of type '{ substituteRangeCallback: (arg0: number, arg1: number) => TextRange; suggestionsCallback: (arg0: TextRange, arg1: TextRange, arg2?: boolean) => Promise<{ text: string; subtitle: string; iconType: string; priority: number; isSecondary: boolean; title: string; }[]>; isWordChar: (arg0: string) => boolean; captureEnter...'.
+  Type '{ suggestionsCallback: any; isWordChar: any; }' is missing the following properties from type '{ substituteRangeCallback: (arg0: number, arg1: number) => TextRange; suggestionsCallback: (arg0: TextRange, arg1: TextRange, arg2?: boolean) => Promise<{ text: string; subtitle: string; iconType: string; priority: number; isSecondary: boolean; title: string; }[]>; isWordChar: (arg0: string) => boolean; captureEnter...': substituteRangeCallback, captureEnter
 node_modules/chrome-devtools-frontend/front_end/sources/CSSPlugin.js(84,13): error TS2339: Property 'consume' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sources/CSSPlugin.js(102,19): error TS2339: Property 'sprintf' does not exist on type 'StringConstructor'.
 node_modules/chrome-devtools-frontend/front_end/sources/CSSPlugin.js(197,26): error TS2339: Property 'title' does not exist on type 'Element'.
@@ -11246,32 +10159,29 @@ node_modules/chrome-devtools-frontend/front_end/sources/CSSPlugin.js(197,41): er
 node_modules/chrome-devtools-frontend/front_end/sources/CSSPlugin.js(212,26): error TS2339: Property 'title' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/sources/CSSPlugin.js(212,41): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/CSSPlugin.js(223,11): error TS2339: Property 'consume' does not exist on type 'Event'.
-node_modules/chrome-devtools-frontend/front_end/sources/CSSPlugin.js(247,45): error TS2345: Argument of type '{ Original: string; Nickname: string; HEX: string; ShortHEX: string; HEXA: string; ShortHEXA: string; RGB: string; RGBA: string; HSL: string; HSLA: string; }' is not assignable to parameter of type 'string'.
-node_modules/chrome-devtools-frontend/front_end/sources/CSSPlugin.js(252,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/sources/CSSPlugin.js(259,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sources/CSSPlugin.js(266,25): error TS2339: Property 'setColor' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/sources/CSSPlugin.js(288,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sources/CSSPlugin.js(292,25): error TS2339: Property 'setBezierText' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/sources/CSSPlugin.js(315,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/sources/CSSPlugin.js(333,40): error TS2694: Namespace 'UI.SuggestBox' has no exported member 'Suggestions'.
+node_modules/chrome-devtools-frontend/front_end/sources/CSSPlugin.js(347,5): error TS2322: Type 'Promise<{ text: string; }[]>' is not assignable to type 'Promise<{ text: string; subtitle: string; iconType: string; priority: number; isSecondary: boolean; title: string; }[]>'.
+  Type '{ text: string; }[]' is not assignable to type '{ text: string; subtitle: string; iconType: string; priority: number; isSecondary: boolean; title: string; }[]'.
+    Type '{ text: string; }' is missing the following properties from type '{ text: string; subtitle: string; iconType: string; priority: number; isSecondary: boolean; title: string; }': subtitle, iconType, priority, isSecondary, title
 node_modules/chrome-devtools-frontend/front_end/sources/CallStackSidebarPane.js(33,18): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/CallStackSidebarPane.js(39,57): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/sources/CallStackSidebarPane.js(40,56): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/sources/CallStackSidebarPane.js(42,60): error TS2694: Namespace 'Sources.CallStackSidebarPane' has no exported member 'Item'.
-node_modules/chrome-devtools-frontend/front_end/sources/CallStackSidebarPane.js(44,62): error TS2694: Namespace 'Sources.CallStackSidebarPane' has no exported member 'Item'.
-node_modules/chrome-devtools-frontend/front_end/sources/CallStackSidebarPane.js(45,56): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ NonViewport: symbol; EqualHeightItems: symbol; VariousHeightItems: symbol; }'.
+node_modules/chrome-devtools-frontend/front_end/sources/CallStackSidebarPane.js(45,50): error TS2345: Argument of type 'this' is not assignable to parameter of type '{ createElementForItem(item: T): Element; heightForItem(item: T): number; isItemSelectable(item: T): boolean; selectedItemChanged(from: T, to: T, fromElement: Element, toElement: Element): void; }'.
+  Type 'CallStackSidebarPane' is not assignable to type '{ createElementForItem(item: T): Element; heightForItem(item: T): number; isItemSelectable(item: T): boolean; selectedItemChanged(from: T, to: T, fromElement: Element, toElement: Element): void; }'.
+    Types of property 'createElementForItem' are incompatible.
+      Type '(item: { debuggerCallFrame: CallFrame; asyncStackHeader: string; runtimeCallFrame: any; debuggerModel: DebuggerModel; }) => Element' is not assignable to type '(item: T) => Element'.
+        Types of parameters 'item' and 'item' are incompatible.
+          Type 'T' is not assignable to type '{ debuggerCallFrame: CallFrame; asyncStackHeader: string; runtimeCallFrame: any; debuggerModel: DebuggerModel; }'.
+node_modules/chrome-devtools-frontend/front_end/sources/CallStackSidebarPane.js(104,78): error TS2345: Argument of type '{ debuggerCallFrame: CallFrame; debuggerModel: DebuggerModel; }' is not assignable to parameter of type '{ debuggerCallFrame: CallFrame; asyncStackHeader: string; runtimeCallFrame: any; debuggerModel: DebuggerModel; }'.
+  Type '{ debuggerCallFrame: CallFrame; debuggerModel: DebuggerModel; }' is missing the following properties from type '{ debuggerCallFrame: CallFrame; asyncStackHeader: string; runtimeCallFrame: any; debuggerModel: DebuggerModel; }': asyncStackHeader, runtimeCallFrame
 node_modules/chrome-devtools-frontend/front_end/sources/CallStackSidebarPane.js(137,21): error TS2345: Argument of type '{ asyncStackHeader: string; }' is not assignable to parameter of type '{ debuggerCallFrame: CallFrame; debuggerModel: DebuggerModel; }'.
   Object literal may only specify known properties, and 'asyncStackHeader' does not exist in type '{ debuggerCallFrame: CallFrame; debuggerModel: DebuggerModel; }'.
 node_modules/chrome-devtools-frontend/front_end/sources/CallStackSidebarPane.js(163,20): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/sources/CallStackSidebarPane.js(182,44): error TS2694: Namespace 'Sources.CallStackSidebarPane' has no exported member 'Item'.
+node_modules/chrome-devtools-frontend/front_end/sources/CallStackSidebarPane.js(171,28): error TS2345: Argument of type '{ debuggerCallFrame: CallFrame; debuggerModel: DebuggerModel; }[]' is not assignable to parameter of type '{ debuggerCallFrame: CallFrame; asyncStackHeader: string; runtimeCallFrame: any; debuggerModel: DebuggerModel; }[]'.
+  Type '{ debuggerCallFrame: CallFrame; debuggerModel: DebuggerModel; }' is not assignable to type '{ debuggerCallFrame: CallFrame; asyncStackHeader: string; runtimeCallFrame: any; debuggerModel: DebuggerModel; }'.
 node_modules/chrome-devtools-frontend/front_end/sources/CallStackSidebarPane.js(187,25): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/sources/CallStackSidebarPane.js(209,33): error TS2339: Property 'createChild' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/sources/CallStackSidebarPane.js(219,44): error TS2694: Namespace 'Sources.CallStackSidebarPane' has no exported member 'Item'.
-node_modules/chrome-devtools-frontend/front_end/sources/CallStackSidebarPane.js(229,44): error TS2694: Namespace 'Sources.CallStackSidebarPane' has no exported member 'Item'.
-node_modules/chrome-devtools-frontend/front_end/sources/CallStackSidebarPane.js(238,44): error TS2694: Namespace 'Sources.CallStackSidebarPane' has no exported member 'Item'.
-node_modules/chrome-devtools-frontend/front_end/sources/CallStackSidebarPane.js(239,44): error TS2694: Namespace 'Sources.CallStackSidebarPane' has no exported member 'Item'.
-node_modules/chrome-devtools-frontend/front_end/sources/CallStackSidebarPane.js(253,44): error TS2694: Namespace 'Sources.CallStackSidebarPane' has no exported member 'Item'.
-node_modules/chrome-devtools-frontend/front_end/sources/CallStackSidebarPane.js(265,44): error TS2694: Namespace 'Sources.CallStackSidebarPane' has no exported member 'Item'.
 node_modules/chrome-devtools-frontend/front_end/sources/CallStackSidebarPane.js(285,13): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/sources/CallStackSidebarPane.js(286,31): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/sources/CallStackSidebarPane.js(287,38): error TS2555: Expected at least 2 arguments, but got 1.
@@ -11280,16 +10190,12 @@ node_modules/chrome-devtools-frontend/front_end/sources/CallStackSidebarPane.js(
 node_modules/chrome-devtools-frontend/front_end/sources/CallStackSidebarPane.js(302,38): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/CallStackSidebarPane.js(319,54): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/CallStackSidebarPane.js(320,52): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/sources/CallStackSidebarPane.js(338,44): error TS2694: Namespace 'Sources.CallStackSidebarPane' has no exported member 'Item'.
 node_modules/chrome-devtools-frontend/front_end/sources/CallStackSidebarPane.js(370,20): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/CallStackSidebarPane.js(373,20): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/CallStackSidebarPane.js(379,20): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/CallStackSidebarPane.js(382,20): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/CallStackSidebarPane.js(415,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/sources/CallStackSidebarPane.js(415,52): error TS2694: Namespace 'UI.KeyboardShortcut' has no exported member 'Descriptor'.
 node_modules/chrome-devtools-frontend/front_end/sources/CallStackSidebarPane.js(431,36): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
-node_modules/chrome-devtools-frontend/front_end/sources/CallStackSidebarPane.js(435,30): error TS2300: Duplicate identifier 'Item'.
-node_modules/chrome-devtools-frontend/front_end/sources/CallStackSidebarPane.js(435,30): error TS2339: Property 'Item' does not exist on type 'typeof CallStackSidebarPane'.
 node_modules/chrome-devtools-frontend/front_end/sources/DebuggerPausedMessage.js(11,33): error TS2339: Property 'createChild' does not exist on type 'DocumentFragment'.
 node_modules/chrome-devtools-frontend/front_end/sources/DebuggerPausedMessage.js(54,44): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/DebuggerPausedMessage.js(56,44): error TS2555: Expected at least 2 arguments, but got 1.
@@ -11302,29 +10208,24 @@ node_modules/chrome-devtools-frontend/front_end/sources/DebuggerPausedMessage.js
 node_modules/chrome-devtools-frontend/front_end/sources/DebuggerPausedMessage.js(77,87): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/DebuggerPausedMessage.js(96,40): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/sources/DebuggerPausedMessage.js(101,41): error TS2339: Property 'createChild' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/sources/EditingLocationHistoryManager.js(54,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sources/EventListenerBreakpointsSidebarPane.js(11,41): error TS2339: Property 'tabIndex' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/sources/EventListenerBreakpointsSidebarPane.js(15,74): error TS2694: Namespace 'Sources.EventListenerBreakpointsSidebarPane' has no exported member 'Item'.
-node_modules/chrome-devtools-frontend/front_end/sources/EventListenerBreakpointsSidebarPane.js(24,113): error TS2694: Namespace 'Sources.EventListenerBreakpointsSidebarPane' has no exported member 'Item'.
 node_modules/chrome-devtools-frontend/front_end/sources/EventListenerBreakpointsSidebarPane.js(57,33): error TS2339: Property 'createChild' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/sources/EventListenerBreakpointsSidebarPane.js(126,45): error TS2300: Duplicate identifier 'Item'.
-node_modules/chrome-devtools-frontend/front_end/sources/EventListenerBreakpointsSidebarPane.js(126,45): error TS2339: Property 'Item' does not exist on type 'typeof EventListenerBreakpointsSidebarPane'.
-node_modules/chrome-devtools-frontend/front_end/sources/FilteredUISourceCodeListProvider.js(20,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
+node_modules/chrome-devtools-frontend/front_end/sources/EventListenerBreakpointsSidebarPane.js(92,33): error TS2339: Property 'checked' does not exist on type 'Element'.
+node_modules/chrome-devtools-frontend/front_end/sources/EventListenerBreakpointsSidebarPane.js(96,52): error TS2339: Property 'checked' does not exist on type 'Element'.
+node_modules/chrome-devtools-frontend/front_end/sources/EventListenerBreakpointsSidebarPane.js(106,41): error TS2339: Property 'checked' does not exist on type 'Element'.
+node_modules/chrome-devtools-frontend/front_end/sources/EventListenerBreakpointsSidebarPane.js(120,14): error TS2339: Property 'checked' does not exist on type 'Element'.
+node_modules/chrome-devtools-frontend/front_end/sources/EventListenerBreakpointsSidebarPane.js(121,14): error TS2339: Property 'indeterminate' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/sources/FilteredUISourceCodeListProvider.js(140,21): error TS2339: Property 'title' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/sources/FilteredUISourceCodeListProvider.js(159,13): error TS2339: Property 'removeChildren' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/sources/FilteredUISourceCodeListProvider.js(163,25): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/sources/FilteredUISourceCodeListProvider.js(165,26): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/sources/FilteredUISourceCodeListProvider.js(167,13): error TS2339: Property 'title' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/sources/FilteredUISourceCodeListProvider.js(205,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sources/FilteredUISourceCodeListProvider.js(220,19): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/GoToLineQuickOpen.js(28,21): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/GoToLineQuickOpen.js(31,21): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/GoToLineQuickOpen.js(32,23): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/GoToLineQuickOpen.js(34,22): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/sources/InplaceFormatterEditorAction.js(10,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/sources/InplaceFormatterEditorAction.js(18,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sources/InplaceFormatterEditorAction.js(46,48): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/sources/InplaceFormatterEditorAction.js(68,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sources/InplaceFormatterEditorAction.js(100,37): error TS2339: Property 'selection' does not exist on type 'Widget'.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptBreakpointsSidebarPane.js(32,27): error TS2339: Property 'removeChildren' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptBreakpointsSidebarPane.js(33,46): error TS2339: Property 'createChild' does not exist on type 'Element'.
@@ -11352,17 +10253,17 @@ node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptBreakpointsSid
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptBreakpointsSidebarPane.js(203,33): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptBreakpointsSidebarPane.js(206,35): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptCompilerPlugin.js(51,5): error TS2322: Type 'Timeout' is not assignable to type 'number'.
-node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptCompilerPlugin.js(97,9): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Error: string; Warning: string; }'.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(60,50): error TS2345: Argument of type 'Event' is not assignable to parameter of type 'MouseEvent | KeyboardEvent'.
   Type 'Event' is missing the following properties from type 'KeyboardEvent': altKey, char, charCode, code, and 16 more.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(107,33): error TS2339: Property 'asParsedURL' does not exist on type 'string'.
-node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(128,34): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Warning: string; Info: string; }'.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(128,66): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(132,16): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(134,95): error TS2339: Property 'valuesArray' does not exist on type 'Map<DebuggerModel, ResourceScriptFile>'.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(136,46): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(138,44): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(140,44): error TS2339: Property 'createTextChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(141,62): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(142,65): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(143,41): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(218,20): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(220,20): error TS2555: Expected at least 2 arguments, but got 1.
@@ -11376,10 +10277,7 @@ node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(244,49): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(284,61): error TS2339: Property 'valuesArray' does not exist on type 'Map<DebuggerModel, ResourceScriptFile>'.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(285,45): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(296,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(309,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(345,56): error TS2339: Property 'valuesArray' does not exist on type 'Map<DebuggerModel, ResourceScriptFile>'.
-node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(380,19): error TS2694: Namespace 'UI' has no exported member 'PopoverRequest'.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(491,15): error TS2339: Property 'consume' does not exist on type 'KeyboardEvent'.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(517,37): error TS2339: Property 'enclosingNodeOrSelfWithClass' does not exist on type 'EventTarget'.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(545,11): error TS2339: Property 'consume' does not exist on type 'MouseEvent'.
@@ -11387,12 +10285,14 @@ node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(611,34): error TS2339: Property 'value' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(612,34): error TS2339: Property 'select' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(618,41): error TS2339: Property 'createChild' does not exist on type 'Element'.
+node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(688,42): error TS2694: Namespace 'SDK.DebuggerModel' has no exported member 'BreakLocation'.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(779,18): error TS2339: Property 'startColumn' does not exist on type 'never'.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(781,15): error TS2339: Property 'type' does not exist on type 'never'.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(790,15): error TS2339: Property 'type' does not exist on type 'never'.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(793,15): error TS2339: Property 'type' does not exist on type 'never'.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(796,15): error TS2339: Property 'type' does not exist on type 'never'.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(796,48): error TS2339: Property 'type' does not exist on type 'never'.
+node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(832,33): error TS2694: Namespace 'SDK.DebuggerModel' has no exported member 'BreakLocation'.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(938,14): error TS2339: Property 'style' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(939,14): error TS2339: Property '__nameToToken' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(948,18): error TS2339: Property 'createTextChild' does not exist on type 'Element'.
@@ -11410,21 +10310,19 @@ node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(1176,18): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(1180,18): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(1183,18): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(1190,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(1201,56): error TS2339: Property 'valuesArray' does not exist on type 'Map<DebuggerModel, ResourceScriptFile>'.
-node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(1210,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(1270,16): error TS2403: Subsequent variable declarations must have the same type.  Variable 'location' must be of type 'any', but here has type 'UILocation'.
-node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(1286,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(1326,60): error TS2339: Property 'valuesArray' does not exist on type 'Set<BreakpointDecoration>'.
-node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(1400,9): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Warning: string; Info: string; }'.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(1400,38): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(1403,61): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(1425,56): error TS2339: Property 'valuesArray' does not exist on type 'Map<DebuggerModel, ResourceScriptFile>'.
-node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(1442,9): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Warning: string; Info: string; }'.
 node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(1442,38): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(1463,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(1469,63): error TS2694: Namespace 'SourceFrame.SourcesTextEditor' has no exported member 'GutterClickEventData'.
-node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(1506,34): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; TimelineStarted: number; ProfilesCPUProfileTaken: number; ProfilesHeapProfileTaken: number; AuditsStarted: number; ... 23 more ...; ShowedThirdPartyBadges: number; }'.
+node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(1473,21): error TS2339: Property 'button' does not exist on type 'Event'.
+node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(1473,49): error TS2339: Property 'altKey' does not exist on type 'Event'.
+node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(1473,71): error TS2339: Property 'ctrlKey' does not exist on type 'Event'.
+node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(1473,94): error TS2339: Property 'metaKey' does not exist on type 'Event'.
+node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(1476,52): error TS2339: Property 'shiftKey' does not exist on type 'Event'.
+node_modules/chrome-devtools-frontend/front_end/sources/JavaScriptSourceFrame.js(1477,17): error TS2339: Property 'consume' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sources/NavigatorView.js(87,21): error TS2339: Property '_boostOrder' does not exist on type 'TreeElement'.
 node_modules/chrome-devtools-frontend/front_end/sources/NavigatorView.js(90,32): error TS2339: Property '_typeOrders' does not exist on type 'typeof NavigatorView'.
 node_modules/chrome-devtools-frontend/front_end/sources/NavigatorView.js(102,29): error TS2339: Property '_typeOrders' does not exist on type 'typeof NavigatorView'.
@@ -11435,9 +10333,6 @@ node_modules/chrome-devtools-frontend/front_end/sources/NavigatorView.js(107,37)
 node_modules/chrome-devtools-frontend/front_end/sources/NavigatorView.js(129,33): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/NavigatorView.js(142,30): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/NavigatorView.js(145,28): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/sources/NavigatorView.js(167,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/sources/NavigatorView.js(175,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/sources/NavigatorView.js(183,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sources/NavigatorView.js(189,52): error TS2345: Argument of type 'UISourceCode' is not assignable to parameter of type 'K'.
   'UISourceCode' is assignable to the constraint of type 'K', but 'K' could be instantiated with a different subtype of constraint '{}'.
 node_modules/chrome-devtools-frontend/front_end/sources/NavigatorView.js(191,19): error TS2339: Property 'updateTitle' does not exist on type 'V'.
@@ -11445,14 +10340,10 @@ node_modules/chrome-devtools-frontend/front_end/sources/NavigatorView.js(192,55)
   'UISourceCode' is assignable to the constraint of type 'K', but 'K' could be instantiated with a different subtype of constraint '{}'.
 node_modules/chrome-devtools-frontend/front_end/sources/NavigatorView.js(194,22): error TS2339: Property 'updateTitle' does not exist on type 'V'.
 node_modules/chrome-devtools-frontend/front_end/sources/NavigatorView.js(212,22): error TS2339: Property 'updateTitle' does not exist on type 'NavigatorTreeNode'.
-node_modules/chrome-devtools-frontend/front_end/sources/NavigatorView.js(262,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/sources/NavigatorView.js(275,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sources/NavigatorView.js(283,55): error TS2345: Argument of type 'UISourceCode' is not assignable to parameter of type 'K'.
   'UISourceCode' is assignable to the constraint of type 'K', but 'K' could be instantiated with a different subtype of constraint '{}'.
 node_modules/chrome-devtools-frontend/front_end/sources/NavigatorView.js(336,33): error TS2345: Argument of type 'UISourceCode' is not assignable to parameter of type 'K'.
   'UISourceCode' is assignable to the constraint of type 'K', but 'K' could be instantiated with a different subtype of constraint '{}'.
-node_modules/chrome-devtools-frontend/front_end/sources/NavigatorView.js(346,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/sources/NavigatorView.js(354,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sources/NavigatorView.js(388,58): error TS2339: Property 'reverse' does not exist on type 'string'.
 node_modules/chrome-devtools-frontend/front_end/sources/NavigatorView.js(499,29): error TS2339: Property '_boostOrder' does not exist on type 'TreeElement'.
 node_modules/chrome-devtools-frontend/front_end/sources/NavigatorView.js(527,28): error TS2339: Property '_boostOrder' does not exist on type 'TreeElement'.
@@ -11485,7 +10376,6 @@ node_modules/chrome-devtools-frontend/front_end/sources/NavigatorView.js(779,56)
 node_modules/chrome-devtools-frontend/front_end/sources/NavigatorView.js(803,50): error TS2339: Property 'hasFocus' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/sources/NavigatorView.js(851,14): error TS2339: Property 'parent' does not exist on type 'NavigatorGroupTreeNode'.
 node_modules/chrome-devtools-frontend/front_end/sources/NavigatorView.js(852,12): error TS2339: Property 'parent' does not exist on type 'NavigatorGroupTreeNode'.
-node_modules/chrome-devtools-frontend/front_end/sources/NavigatorView.js(876,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sources/NavigatorView.js(951,23): error TS2339: Property '_title' does not exist on type 'NavigatorTreeNode'.
 node_modules/chrome-devtools-frontend/front_end/sources/NavigatorView.js(952,19): error TS2339: Property 'parent' does not exist on type 'NavigatorTreeNode'.
 node_modules/chrome-devtools-frontend/front_end/sources/NavigatorView.js(1023,17): error TS2339: Property 'title' does not exist on type 'Element'.
@@ -11521,11 +10411,8 @@ node_modules/chrome-devtools-frontend/front_end/sources/NavigatorView.js(1616,40
 node_modules/chrome-devtools-frontend/front_end/sources/NavigatorView.js(1640,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/sources/NavigatorView.js(1679,47): error TS2339: Property 'hasFocus' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/sources/ObjectEventListenersSidebarPane.js(11,55): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/sources/ObjectEventListenersSidebarPane.js(84,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/sources/OpenFileQuickOpen.js(23,34): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; TimelineStarted: number; ProfilesCPUProfileTaken: number; ProfilesHeapProfileTaken: number; AuditsStarted: number; ... 23 more ...; ShowedThirdPartyBadges: number; }'.
 node_modules/chrome-devtools-frontend/front_end/sources/OpenFileQuickOpen.js(54,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/sources/OpenFileQuickOpen.js(65,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/sources/OutlineQuickOpen.js(32,52): error TS2694: Namespace 'Formatter.FormatterWorkerPool' has no exported member 'OutlineItem'.
 node_modules/chrome-devtools-frontend/front_end/sources/OutlineQuickOpen.js(118,21): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/OutlineQuickOpen.js(120,21): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/OutlineQuickOpen.js(121,19): error TS2555: Expected at least 2 arguments, but got 1.
@@ -11538,20 +10425,14 @@ node_modules/chrome-devtools-frontend/front_end/sources/ScopeChainSidebarPane.js
 node_modules/chrome-devtools-frontend/front_end/sources/ScopeChainSidebarPane.js(105,37): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/ScopeChainSidebarPane.js(114,20): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/sources/ScopeChainSidebarPane.js(115,20): error TS2339: Property 'createChild' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/sources/ScriptFormatterEditorAction.js(16,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/sources/ScriptFormatterEditorAction.js(28,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sources/ScriptFormatterEditorAction.js(61,48): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/sources/ScriptFormatterEditorAction.js(85,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sources/ScriptFormatterEditorAction.js(105,35): error TS2339: Property 'selection' does not exist on type 'Widget'.
 node_modules/chrome-devtools-frontend/front_end/sources/SimpleHistoryManager.js(37,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/sources/SnippetsPlugin.js(41,46): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/SnippetsPlugin.js(41,80): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/sources/SourceFormatter.js(36,47): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Debugger: string; Formatter: string; Network: string; Snippets: string; FileSystem: string; ContentScripts: string; Service: string; }'.
-node_modules/chrome-devtools-frontend/front_end/sources/SourceFormatter.js(48,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sources/SourceFormatter.js(55,32): error TS2339: Property 'remove' does not exist on type 'Map<UISourceCode, { promise: Promise<SourceFormatData>; formatData: SourceFormatData; }>'.
 node_modules/chrome-devtools-frontend/front_end/sources/SourceFormatter.js(67,32): error TS2339: Property 'remove' does not exist on type 'Map<UISourceCode, { promise: Promise<SourceFormatData>; formatData: SourceFormatData; }>'.
 node_modules/chrome-devtools-frontend/front_end/sources/SourceMapNamesResolver.js(304,37): error TS2339: Property 'inverse' does not exist on type 'Map<string, string>'.
-node_modules/chrome-devtools-frontend/front_end/sources/SourceMapNamesResolver.js(322,32): error TS2694: Namespace 'SDK.RuntimeModel' has no exported member 'EvaluationResult'.
 node_modules/chrome-devtools-frontend/front_end/sources/SourceMapNamesResolver.js(361,25): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/sources/SourceMapNamesResolver.js(369,25): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/sources/SourceMapNamesResolver.js(417,25): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
@@ -11567,10 +10448,7 @@ node_modules/chrome-devtools-frontend/front_end/sources/SourceMapNamesResolver.j
 node_modules/chrome-devtools-frontend/front_end/sources/SourceMapNamesResolver.js(535,39): error TS1110: Type expected.
 node_modules/chrome-devtools-frontend/front_end/sources/SourceMapNamesResolver.js(536,31): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/sources/SourceMapNamesResolver.js(537,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/sources/SourcesNavigator.js(51,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/sources/SourcesNavigator.js(109,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sources/SourcesNavigator.js(145,24): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/sources/SourcesNavigator.js(189,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sources/SourcesNavigator.js(211,26): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/SourcesNavigator.js(217,53): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/SourcesNavigator.js(224,24): error TS2555: Expected at least 2 arguments, but got 1.
@@ -11588,21 +10466,16 @@ node_modules/chrome-devtools-frontend/front_end/sources/SourcesPanel.js(78,41):
 node_modules/chrome-devtools-frontend/front_end/sources/SourcesPanel.js(122,32): error TS2339: Property 'addEventListener' does not exist on type 'typeof extensionServer'.
 node_modules/chrome-devtools-frontend/front_end/sources/SourcesPanel.js(131,30): error TS2551: Property '_instance' does not exist on type 'typeof SourcesPanel'. Did you mean 'instance'?
 node_modules/chrome-devtools-frontend/front_end/sources/SourcesPanel.js(132,35): error TS2551: Property '_instance' does not exist on type 'typeof SourcesPanel'. Did you mean 'instance'?
-node_modules/chrome-devtools-frontend/front_end/sources/SourcesPanel.js(208,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sources/SourcesPanel.js(227,52): error TS2339: Property '_instance' does not exist on type 'typeof WrapperView'.
 node_modules/chrome-devtools-frontend/front_end/sources/SourcesPanel.js(242,40): error TS2339: Property '_instance' does not exist on type 'typeof WrapperView'.
 node_modules/chrome-devtools-frontend/front_end/sources/SourcesPanel.js(257,7): error TS2322: Type '{ tabbedPane(): TabbedPane; enableMoreTabsButton(): void; }' is not assignable to type '{ appendApplicableItems(locationName: string): void; appendView(view: { viewId(): string; title(): string; isCloseable(): boolean; isTransient(): boolean; toolbarItems(): Promise<ToolbarItem[]>; widget(): Promise<...>; disposeView(): void; }, insertBefore?: { ...; }): void; showView(view: { ...; }, insertBefore?: { ...'.
 node_modules/chrome-devtools-frontend/front_end/sources/SourcesPanel.js(277,20): error TS2339: Property 'window' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/sources/SourcesPanel.js(289,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/sources/SourcesPanel.js(330,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sources/SourcesPanel.js(356,44): error TS2339: Property '_instance' does not exist on type 'typeof WrapperView'.
 node_modules/chrome-devtools-frontend/front_end/sources/SourcesPanel.js(356,90): error TS2339: Property '_instance' does not exist on type 'typeof WrapperView'.
 node_modules/chrome-devtools-frontend/front_end/sources/SourcesPanel.js(366,42): error TS2339: Property '_instance' does not exist on type 'typeof WrapperView'.
 node_modules/chrome-devtools-frontend/front_end/sources/SourcesPanel.js(366,88): error TS2339: Property '_instance' does not exist on type 'typeof WrapperView'.
 node_modules/chrome-devtools-frontend/front_end/sources/SourcesPanel.js(413,16): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/SourcesPanel.js(465,16): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/sources/SourcesPanel.js(550,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/sources/SourcesPanel.js(596,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sources/SourcesPanel.js(689,37): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/SourcesPanel.js(717,24): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/SourcesPanel.js(795,20): error TS2555: Expected at least 2 arguments, but got 1.
@@ -11617,7 +10490,6 @@ node_modules/chrome-devtools-frontend/front_end/sources/SourcesPanel.js(909,27):
 node_modules/chrome-devtools-frontend/front_end/sources/SourcesPanel.js(963,28): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/SourcesPanel.js(1011,45): error TS2339: Property 'offsetWidth' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/sources/SourcesPanel.js(1078,60): error TS2339: Property 'sidebarPanes' does not exist on type 'typeof extensionServer'.
-node_modules/chrome-devtools-frontend/front_end/sources/SourcesPanel.js(1093,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sources/SourcesPanel.js(1290,38): error TS2339: Property '_instance' does not exist on type 'typeof WrapperView'.
 node_modules/chrome-devtools-frontend/front_end/sources/SourcesPanel.js(1298,47): error TS2339: Property '_instance' does not exist on type 'typeof WrapperView'.
 node_modules/chrome-devtools-frontend/front_end/sources/SourcesPanel.js(1298,93): error TS2339: Property '_instance' does not exist on type 'typeof WrapperView'.
@@ -11633,7 +10505,6 @@ node_modules/chrome-devtools-frontend/front_end/sources/SourcesSearchScope.js(16
 node_modules/chrome-devtools-frontend/front_end/sources/SourcesSearchScope.js(183,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/sources/SourcesSearchScope.js(257,29): error TS2339: Property 'mergeOrdered' does not exist on type 'any[]'.
 node_modules/chrome-devtools-frontend/front_end/sources/SourcesView.js(38,50): error TS2339: Property 'createChild' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/sources/SourcesView.js(55,36): error TS2694: Namespace 'Common.EventTarget' has no exported member 'EventDescriptor'.
 node_modules/chrome-devtools-frontend/front_end/sources/SourcesView.js(83,34): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/SourcesView.js(101,56): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/SourcesView.js(102,58): error TS2555: Expected at least 2 arguments, but got 1.
@@ -11641,35 +10512,19 @@ node_modules/chrome-devtools-frontend/front_end/sources/SourcesView.js(108,25):
 node_modules/chrome-devtools-frontend/front_end/sources/SourcesView.js(113,15): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/sources/SourcesView.js(113,55): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/SourcesView.js(134,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/sources/SourcesView.js(134,52): error TS2694: Namespace 'UI.KeyboardShortcut' has no exported member 'Descriptor'.
-node_modules/chrome-devtools-frontend/front_end/sources/SourcesView.js(139,45): error TS2694: Namespace 'UI.KeyboardShortcut' has no exported member 'Descriptor'.
-node_modules/chrome-devtools-frontend/front_end/sources/SourcesView.js(190,43): error TS2694: Namespace 'UI.KeyboardShortcut' has no exported member 'Descriptor'.
-node_modules/chrome-devtools-frontend/front_end/sources/SourcesView.js(287,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sources/SourcesView.js(432,36): error TS2339: Property 'remove' does not exist on type 'Map<UISourceCode, Widget>'.
-node_modules/chrome-devtools-frontend/front_end/sources/SourcesView.js(472,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/sources/SourcesView.js(494,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/sources/SourcesView.js(530,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sources/SourcesView.js(724,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/sources/SourcesView.js(761,28): error TS2339: Property 'naturalOrderComparator' does not exist on type 'StringConstructor'.
 node_modules/chrome-devtools-frontend/front_end/sources/TabbedEditorContainer.js(36,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
-node_modules/chrome-devtools-frontend/front_end/sources/TabbedEditorContainer.js(77,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/sources/TabbedEditorContainer.js(109,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sources/TabbedEditorContainer.js(201,50): error TS2339: Property 'textEditor' does not exist on type 'Widget'.
 node_modules/chrome-devtools-frontend/front_end/sources/TabbedEditorContainer.js(203,23): error TS2339: Property 'textEditor' does not exist on type 'Widget'.
 node_modules/chrome-devtools-frontend/front_end/sources/TabbedEditorContainer.js(205,23): error TS2339: Property 'textEditor' does not exist on type 'Widget'.
 node_modules/chrome-devtools-frontend/front_end/sources/TabbedEditorContainer.js(210,50): error TS2339: Property 'textEditor' does not exist on type 'Widget'.
 node_modules/chrome-devtools-frontend/front_end/sources/TabbedEditorContainer.js(212,23): error TS2339: Property 'textEditor' does not exist on type 'Widget'.
 node_modules/chrome-devtools-frontend/front_end/sources/TabbedEditorContainer.js(214,23): error TS2339: Property 'textEditor' does not exist on type 'Widget'.
-node_modules/chrome-devtools-frontend/front_end/sources/TabbedEditorContainer.js(219,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/sources/TabbedEditorContainer.js(237,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sources/TabbedEditorContainer.js(244,32): error TS2339: Property 'sourceSelectionChanged' does not exist on type 'typeof extensionServer'.
-node_modules/chrome-devtools-frontend/front_end/sources/TabbedEditorContainer.js(473,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sources/TabbedEditorContainer.js(485,18): error TS2339: Property 'remove' does not exist on type 'Map<any, any>'.
-node_modules/chrome-devtools-frontend/front_end/sources/TabbedEditorContainer.js(497,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sources/TabbedEditorContainer.js(540,29): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/sources/TabbedEditorContainer.js(549,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/sources/TabbedEditorContainer.js(558,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/sources/TabbedEditorContainer.js(566,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sources/ThreadsSidebarPane.js(16,50): error TS2345: Argument of type 'this' is not assignable to parameter of type '{ createElementForItem(item: T): Element; heightForItem(item: T): number; isItemSelectable(item: T): boolean; selectedItemChanged(from: T, to: T, fromElement: Element, toElement: Element): void; }'.
   Type 'ThreadsSidebarPane' is not assignable to type '{ createElementForItem(item: T): Element; heightForItem(item: T): number; isItemSelectable(item: T): boolean; selectedItemChanged(from: T, to: T, fromElement: Element, toElement: Element): void; }'.
     Types of property 'createElementForItem' are incompatible.
@@ -11685,20 +10540,12 @@ node_modules/chrome-devtools-frontend/front_end/sources/ThreadsSidebarPane.js(20
 node_modules/chrome-devtools-frontend/front_end/sources/ThreadsSidebarPane.js(38,25): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/sources/ThreadsSidebarPane.js(39,31): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/sources/ThreadsSidebarPane.js(49,40): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/sources/ThreadsSidebarPane.js(53,24): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/sources/ThreadsSidebarPane.js(126,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sources/UISourceCodeFrame.js(204,19): error TS2339: Property 'addAll' does not exist on type 'Set<Message>'.
-node_modules/chrome-devtools-frontend/front_end/sources/UISourceCodeFrame.js(229,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/sources/UISourceCodeFrame.js(239,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/sources/UISourceCodeFrame.js(374,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/sources/UISourceCodeFrame.js(402,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/sources/UISourceCodeFrame.js(434,19): error TS2694: Namespace 'UI' has no exported member 'PopoverRequest'.
 node_modules/chrome-devtools-frontend/front_end/sources/UISourceCodeFrame.js(437,32): error TS2339: Property 'enclosingNodeOrSelfWithClass' does not exist on type 'EventTarget'.
 node_modules/chrome-devtools-frontend/front_end/sources/UISourceCodeFrame.js(438,22): error TS2339: Property 'enclosingNodeOrSelfWithClass' does not exist on type 'EventTarget'.
 node_modules/chrome-devtools-frontend/front_end/sources/UISourceCodeFrame.js(443,29): error TS2339: Property 'clientX' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sources/UISourceCodeFrame.js(443,44): error TS2339: Property 'clientY' does not exist on type 'Event'.
-node_modules/chrome-devtools-frontend/front_end/sources/UISourceCodeFrame.js(461,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/sources/UISourceCodeFrame.js(469,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
+node_modules/chrome-devtools-frontend/front_end/sources/UISourceCodeFrame.js(444,5): error TS2741: Property 'hide' is missing in type '{ box: any; show: (popover: GlassPane) => Promise<true>; }' but required in type '{ box: AnchorBox; show: (arg0: GlassPane) => Promise<boolean>; hide: () => any; }'.
 node_modules/chrome-devtools-frontend/front_end/sources/UISourceCodeFrame.js(511,24): error TS2339: Property 'pushAll' does not exist on type 'ToolbarItem[]'.
 node_modules/chrome-devtools-frontend/front_end/sources/UISourceCodeFrame.js(512,25): error TS2339: Property 'pushAll' does not exist on type 'any[]'.
 node_modules/chrome-devtools-frontend/front_end/sources/UISourceCodeFrame.js(547,31): error TS2339: Property 'createChild' does not exist on type 'Element'.
@@ -11718,7 +10565,6 @@ node_modules/chrome-devtools-frontend/front_end/sources/WatchExpressionsSidebarP
 node_modules/chrome-devtools-frontend/front_end/sources/WatchExpressionsSidebarPane.js(97,25): error TS2339: Property 'removeChildren' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/sources/WatchExpressionsSidebarPane.js(99,46): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/sources/WatchExpressionsSidebarPane.js(100,45): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/sources/WatchExpressionsSidebarPane.js(127,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sources/WatchExpressionsSidebarPane.js(132,30): error TS2339: Property 'remove' does not exist on type 'WatchExpression[]'.
 node_modules/chrome-devtools-frontend/front_end/sources/WatchExpressionsSidebarPane.js(156,7): error TS2447: The '|=' operator is not allowed for boolean types. Consider using '||' instead.
 node_modules/chrome-devtools-frontend/front_end/sources/WatchExpressionsSidebarPane.js(159,52): error TS2555: Expected at least 2 arguments, but got 1.
@@ -11744,14 +10590,10 @@ node_modules/chrome-devtools-frontend/front_end/sources/WatchExpressionsSidebarP
 node_modules/chrome-devtools-frontend/front_end/sources/WatchExpressionsSidebarPane.js(426,56): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/WatchExpressionsSidebarPane.js(428,24): error TS2339: Property 'deepElementFromPoint' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sources/WatchExpressionsSidebarPane.js(429,38): error TS2339: Property 'isSelfOrAncestor' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/sources/WorkspaceMappingTip.js(28,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/sources/WorkspaceMappingTip.js(39,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/sources/WorkspaceMappingTip.js(107,25): error TS2339: Property 'asParsedURL' does not exist on type 'string'.
-node_modules/chrome-devtools-frontend/front_end/sources/WorkspaceMappingTip.js(116,9): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Warning: string; Info: string; }'.
 node_modules/chrome-devtools-frontend/front_end/sources/WorkspaceMappingTip.js(116,38): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/WorkspaceMappingTip.js(121,16): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/WorkspaceMappingTip.js(123,16): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/sources/WorkspaceMappingTip.js(138,37): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Warning: string; Info: string; }'.
 node_modules/chrome-devtools-frontend/front_end/sources/WorkspaceMappingTip.js(141,44): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/WorkspaceMappingTip.js(143,44): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/sources/WorkspaceMappingTip.js(145,33): error TS2555: Expected at least 2 arguments, but got 1.
@@ -11822,6 +10664,8 @@ node_modules/chrome-devtools-frontend/front_end/sources_test_runner/SourcesTestR
 node_modules/chrome-devtools-frontend/front_end/sources_test_runner/SourcesTestRunner.js(129,11): error TS2339: Property 'pushAll' does not exist on type 'any[]'.
 node_modules/chrome-devtools-frontend/front_end/terminal/TerminalWidget.js(29,54): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/terminal/TerminalWidget.js(30,72): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/terminal/TerminalWidget.js(120,46): error TS2345: Argument of type '{ text: string; lineNumber: number; columnNumber: number; maxLengh: number; className: string; }' is not assignable to parameter of type '{ text: string; className: string; lineNumber: number; columnNumber: number; preventClick: boolean; maxLength: number; }'.
+  Object literal may only specify known properties, but 'maxLengh' does not exist in type '{ text: string; className: string; lineNumber: number; columnNumber: number; preventClick: boolean; maxLength: number; }'. Did you mean to write 'maxLength'?
 node_modules/chrome-devtools-frontend/front_end/terminal/xterm.js/addons/fit/fit.js(19,34): error TS2307: Cannot find module '../../xterm'.
 node_modules/chrome-devtools-frontend/front_end/terminal/xterm.js/addons/fit/fit.js(20,21): error TS2304: Cannot find name 'define'.
 node_modules/chrome-devtools-frontend/front_end/terminal/xterm.js/addons/fit/fit.js(24,5): error TS2304: Cannot find name 'define'.
@@ -11969,21 +10813,17 @@ node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(641,59
 node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(641,92): error TS2551: Property 'testRunner' does not exist on type 'Window & typeof globalThis'. Did you mean 'TestRunner'?
 node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(642,3): error TS2322: Type '1' is not assignable to type 'boolean'.
 node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(683,28): error TS2363: The right-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
-node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(717,24): error TS2694: Namespace 'TestRunner' has no exported member 'CustomFormatters'.
-node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(748,24): error TS2694: Namespace 'TestRunner' has no exported member 'CustomFormatters'.
 node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(777,22): error TS2339: Property 'attributes' does not exist on type 'Node'.
 node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(785,14): error TS2339: Property 'shadowRoot' does not exist on type 'Node'.
 node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(786,39): error TS2339: Property 'shadowRoot' does not exist on type 'Node'.
 node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(805,12): error TS2339: Property 'shadowRoot' does not exist on type 'Node'.
 node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(806,44): error TS2339: Property 'shadowRoot' does not exist on type 'Node'.
-node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(812,24): error TS2694: Namespace 'TestRunner' has no exported member 'CustomFormatters'.
 node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(839,78): error TS2339: Property 'deepTextContent' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(842,43): error TS2339: Property 'property' does not exist on type 'TreeElement'.
-node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(863,24): error TS2694: Namespace 'Common' has no exported member 'Event'.
+node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(868,31): error TS2345: Argument of type '{ data: any; }' is not assignable to parameter of type 'symbol'.
 node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(1035,19): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(1049,34): error TS2345: Argument of type '(arg0: () => void) => any' is not assignable to parameter of type 'string'.
 node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(1203,19): error TS2339: Property 'naturalOrderComparator' does not exist on type 'StringConstructor'.
-node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(1258,24): error TS2367: This condition will always return 'true' since the types 'string' and '{ Debugger: string; Formatter: string; Network: string; Snippets: string; FileSystem: string; ContentScripts: string; Service: string; }' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(1279,81): error TS2345: Argument of type 'Function' is not assignable to parameter of type '(value: any) => any'.
   Type 'Function' provides no match for the signature '(value: any): any'.
 node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(1304,3): error TS2322: Type 'Promise<void>' is not assignable to type 'Promise<undefined>'.
@@ -11993,9 +10833,7 @@ node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(1388,1
 node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(1425,37): error TS2339: Property '_instanceForTest' does not exist on type 'typeof Main'.
 node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(1426,27): error TS2339: Property '_instanceForTest' does not exist on type 'typeof Main'.
 node_modules/chrome-devtools-frontend/front_end/test_runner/TestRunner.js(1427,48): error TS2339: Property '_instanceForTest' does not exist on type 'typeof Main'.
-node_modules/chrome-devtools-frontend/front_end/text_editor/CodeMirrorTextEditor.js(36,29): error TS2694: Namespace 'UI.TextEditor' has no exported member 'Options'.
 node_modules/chrome-devtools-frontend/front_end/text_editor/CodeMirrorTextEditor.js(165,18): error TS2339: Property 'style' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/text_editor/CodeMirrorTextEditor.js(169,67): error TS2694: Namespace 'TextEditor.CodeMirrorTextEditor' has no exported member 'Decoration'.
 node_modules/chrome-devtools-frontend/front_end/text_editor/CodeMirrorTextEditor.js(251,22): error TS2339: Property 'name' does not exist on type 'void'.
 node_modules/chrome-devtools-frontend/front_end/text_editor/CodeMirrorTextEditor.js(252,22): error TS2339: Property 'token' does not exist on type 'void'.
 node_modules/chrome-devtools-frontend/front_end/text_editor/CodeMirrorTextEditor.js(252,70): error TS2339: Property 'token' does not exist on type 'void'.
@@ -12005,7 +10843,6 @@ node_modules/chrome-devtools-frontend/front_end/text_editor/CodeMirrorTextEditor
 node_modules/chrome-devtools-frontend/front_end/text_editor/CodeMirrorTextEditor.js(449,60): error TS2339: Property 'constrain' does not exist on type 'NumberConstructor'.
 node_modules/chrome-devtools-frontend/front_end/text_editor/CodeMirrorTextEditor.js(557,9): error TS2339: Property 'consume' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/text_editor/CodeMirrorTextEditor.js(565,9): error TS2339: Property 'consume' does not exist on type 'Event'.
-node_modules/chrome-devtools-frontend/front_end/text_editor/CodeMirrorTextEditor.js(570,18): error TS2694: Namespace 'UI' has no exported member 'AutocompleteConfig'.
 node_modules/chrome-devtools-frontend/front_end/text_editor/CodeMirrorTextEditor.js(588,9): error TS2365: Operator '>=' cannot be applied to types 'number' and 'void'.
 node_modules/chrome-devtools-frontend/front_end/text_editor/CodeMirrorTextEditor.js(589,55): error TS2339: Property 'length' does not exist on type 'void'.
 node_modules/chrome-devtools-frontend/front_end/text_editor/CodeMirrorTextEditor.js(592,24): error TS2339: Property 'left' does not exist on type 'void'.
@@ -12042,10 +10879,8 @@ node_modules/chrome-devtools-frontend/front_end/text_editor/CodeMirrorTextEditor
 node_modules/chrome-devtools-frontend/front_end/text_editor/CodeMirrorTextEditor.js(856,45): error TS2339: Property 'left' does not exist on type 'void'.
 node_modules/chrome-devtools-frontend/front_end/text_editor/CodeMirrorTextEditor.js(863,27): error TS2345: Argument of type 'number' is not assignable to parameter of type 'K'.
   'number' is assignable to the constraint of type 'K', but 'K' could be instantiated with a different subtype of constraint '{}'.
-node_modules/chrome-devtools-frontend/front_end/text_editor/CodeMirrorTextEditor.js(866,49): error TS2694: Namespace 'TextEditor.CodeMirrorTextEditor' has no exported member 'Decoration'.
 node_modules/chrome-devtools-frontend/front_end/text_editor/CodeMirrorTextEditor.js(879,27): error TS2345: Argument of type 'number' is not assignable to parameter of type 'K'.
   'number' is assignable to the constraint of type 'K', but 'K' could be instantiated with a different subtype of constraint '{}'.
-node_modules/chrome-devtools-frontend/front_end/text_editor/CodeMirrorTextEditor.js(883,49): error TS2694: Namespace 'TextEditor.CodeMirrorTextEditor' has no exported member 'Decoration'.
 node_modules/chrome-devtools-frontend/front_end/text_editor/CodeMirrorTextEditor.js(889,32): error TS2345: Argument of type 'number' is not assignable to parameter of type 'K'.
   'number' is assignable to the constraint of type 'K', but 'K' could be instantiated with a different subtype of constraint '{}'.
 node_modules/chrome-devtools-frontend/front_end/text_editor/CodeMirrorTextEditor.js(899,25): error TS2339: Property 'constrain' does not exist on type 'NumberConstructor'.
@@ -12058,7 +10893,6 @@ node_modules/chrome-devtools-frontend/front_end/text_editor/CodeMirrorTextEditor
 node_modules/chrome-devtools-frontend/front_end/text_editor/CodeMirrorTextEditor.js(968,62): error TS2339: Property 'offsetTop' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/text_editor/CodeMirrorTextEditor.js(1003,20): error TS2345: Argument of type 'void' is not assignable to parameter of type 'Pos'.
 node_modules/chrome-devtools-frontend/front_end/text_editor/CodeMirrorTextEditor.js(1003,50): error TS2365: Operator '+' cannot be applied to types 'void' and 'number'.
-node_modules/chrome-devtools-frontend/front_end/text_editor/CodeMirrorTextEditor.js(1038,34): error TS2694: Namespace 'CodeMirror' has no exported member 'ChangeObject'.
 node_modules/chrome-devtools-frontend/front_end/text_editor/CodeMirrorTextEditor.js(1047,22): error TS2367: This condition will always return 'false' since the types 'void' and '1' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/text_editor/CodeMirrorTextEditor.js(1052,104): error TS2339: Property 'widget' does not exist on type 'V'.
 node_modules/chrome-devtools-frontend/front_end/text_editor/CodeMirrorTextEditor.js(1089,41): error TS2339: Property 'top' does not exist on type 'void'.
@@ -12094,17 +10928,13 @@ node_modules/chrome-devtools-frontend/front_end/text_editor/CodeMirrorTextEditor
 node_modules/chrome-devtools-frontend/front_end/text_editor/CodeMirrorTextEditor.js(1637,61): error TS2339: Property 'line' does not exist on type 'void'.
 node_modules/chrome-devtools-frontend/front_end/text_editor/CodeMirrorTextEditor.js(1637,71): error TS2339: Property 'ch' does not exist on type 'void'.
 node_modules/chrome-devtools-frontend/front_end/text_editor/CodeMirrorTextEditor.js(1647,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/text_editor/CodeMirrorTextEditor.js(1650,33): error TS2339: Property 'Decoration' does not exist on type 'typeof CodeMirrorTextEditor'.
-node_modules/chrome-devtools-frontend/front_end/text_editor/CodeMirrorTextEditor.js(1659,29): error TS2694: Namespace 'UI.TextEditor' has no exported member 'Options'.
-node_modules/chrome-devtools-frontend/front_end/text_editor/CodeMirrorUtils.js(53,24): error TS2694: Namespace 'CodeMirror' has no exported member 'ChangeObject'.
 node_modules/chrome-devtools-frontend/front_end/text_editor/CodeMirrorUtils.js(146,15): error TS1345: An expression of type 'void' cannot be tested for truthiness
 node_modules/chrome-devtools-frontend/front_end/text_editor/CodeMirrorUtils.js(147,26): error TS2339: Property 'token' does not exist on type 'void'.
 node_modules/chrome-devtools-frontend/front_end/text_editor/CodeMirrorUtils.js(149,67): error TS2339: Property 'length' does not exist on type 'void'.
-node_modules/chrome-devtools-frontend/front_end/text_editor/TextEditorAutocompleteController.js(12,18): error TS2694: Namespace 'UI' has no exported member 'AutocompleteConfig'.
 node_modules/chrome-devtools-frontend/front_end/text_editor/TextEditorAutocompleteController.js(42,30): error TS2345: Argument of type 'void' is not assignable to parameter of type 'string'.
-node_modules/chrome-devtools-frontend/front_end/text_editor/TextEditorAutocompleteController.js(62,26): error TS2694: Namespace 'CodeMirror' has no exported member 'BeforeChangeObject'.
-node_modules/chrome-devtools-frontend/front_end/text_editor/TextEditorAutocompleteController.js(113,40): error TS2694: Namespace 'UI.SuggestBox' has no exported member 'Suggestions'.
-node_modules/chrome-devtools-frontend/front_end/text_editor/TextEditorAutocompleteController.js(135,34): error TS2694: Namespace 'CodeMirror' has no exported member 'ChangeObject'.
+node_modules/chrome-devtools-frontend/front_end/text_editor/TextEditorAutocompleteController.js(130,5): error TS2322: Type 'Promise<{ text: string; }[]>' is not assignable to type 'Promise<{ text: string; subtitle: string; iconType: string; priority: number; isSecondary: boolean; title: string; }[]>'.
+  Type '{ text: string; }[]' is not assignable to type '{ text: string; subtitle: string; iconType: string; priority: number; isSecondary: boolean; title: string; }[]'.
+    Type '{ text: string; }' is missing the following properties from type '{ text: string; subtitle: string; iconType: string; priority: number; isSecondary: boolean; title: string; }': subtitle, iconType, priority, isSecondary, title
 node_modules/chrome-devtools-frontend/front_end/text_editor/TextEditorAutocompleteController.js(163,43): error TS2339: Property 'line' does not exist on type 'void'.
 node_modules/chrome-devtools-frontend/front_end/text_editor/TextEditorAutocompleteController.js(163,85): error TS2339: Property 'ch' does not exist on type 'void'.
 node_modules/chrome-devtools-frontend/front_end/text_editor/TextEditorAutocompleteController.js(168,83): error TS2339: Property 'line' does not exist on type 'void'.
@@ -12115,12 +10945,10 @@ node_modules/chrome-devtools-frontend/front_end/text_editor/TextEditorAutocomple
 node_modules/chrome-devtools-frontend/front_end/text_editor/TextEditorAutocompleteController.js(224,56): error TS2339: Property 'line' does not exist on type 'void'.
 node_modules/chrome-devtools-frontend/front_end/text_editor/TextEditorAutocompleteController.js(224,69): error TS2339: Property 'ch' does not exist on type 'void'.
 node_modules/chrome-devtools-frontend/front_end/text_editor/TextEditorAutocompleteController.js(231,35): error TS2339: Property 'ch' does not exist on type 'void'.
-node_modules/chrome-devtools-frontend/front_end/text_editor/TextEditorAutocompleteController.js(239,31): error TS2694: Namespace 'UI.SuggestBox' has no exported member 'Suggestions'.
 node_modules/chrome-devtools-frontend/front_end/text_editor/TextEditorAutocompleteController.js(278,86): error TS2339: Property 'line' does not exist on type 'void'.
 node_modules/chrome-devtools-frontend/front_end/text_editor/TextEditorAutocompleteController.js(278,99): error TS2339: Property 'ch' does not exist on type 'void'.
 node_modules/chrome-devtools-frontend/front_end/text_editor/TextEditorAutocompleteController.js(286,18): error TS2339: Property 'line' does not exist on type 'void'.
 node_modules/chrome-devtools-frontend/front_end/text_editor/TextEditorAutocompleteController.js(286,31): error TS2339: Property 'ch' does not exist on type 'void'.
-node_modules/chrome-devtools-frontend/front_end/text_editor/TextEditorAutocompleteController.js(303,29): error TS2694: Namespace 'UI.SuggestBox' has no exported member 'Suggestions'.
 node_modules/chrome-devtools-frontend/front_end/text_editor/TextEditorAutocompleteController.js(329,19): error TS2339: Property 'keyCode' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/text_editor/TextEditorAutocompleteController.js(360,19): error TS2339: Property 'ch' does not exist on type 'void'.
 node_modules/chrome-devtools-frontend/front_end/text_editor/TextEditorAutocompleteController.js(360,58): error TS2339: Property 'line' does not exist on type 'void'.
@@ -12137,16 +10965,12 @@ node_modules/chrome-devtools-frontend/front_end/text_editor/TextEditorAutocomple
 node_modules/chrome-devtools-frontend/front_end/text_editor/TextEditorAutocompleteController.js(411,89): error TS2339: Property 'charAt' does not exist on type 'void'.
 node_modules/chrome-devtools-frontend/front_end/text_editor/TextEditorAutocompleteController.js(411,103): error TS2339: Property 'ch' does not exist on type 'void'.
 node_modules/chrome-devtools-frontend/front_end/text_utils/Text.js(21,39): error TS2339: Property 'computeLineEndings' does not exist on type 'string'.
-node_modules/chrome-devtools-frontend/front_end/text_utils/Text.js(51,31): error TS2694: Namespace 'TextUtils.Text' has no exported member 'Position'.
 node_modules/chrome-devtools-frontend/front_end/text_utils/Text.js(55,34): error TS2339: Property 'lowerBound' does not exist on type 'number[]'.
-node_modules/chrome-devtools-frontend/front_end/text_utils/Text.js(122,16): error TS2300: Duplicate identifier 'Position'.
-node_modules/chrome-devtools-frontend/front_end/text_utils/Text.js(122,16): error TS2339: Property 'Position' does not exist on type 'typeof Text'.
 node_modules/chrome-devtools-frontend/front_end/text_utils/Text.js(160,42): error TS2339: Property 'lowerBound' does not exist on type 'number[]'.
 node_modules/chrome-devtools-frontend/front_end/text_utils/TextRange.js(84,31): error TS2339: Property 'computeLineEndings' does not exist on type 'string'.
-node_modules/chrome-devtools-frontend/front_end/text_utils/TextUtils.js(201,38): error TS2694: Namespace 'TextUtils.FilterParser' has no exported member 'ParsedFilter'.
-node_modules/chrome-devtools-frontend/front_end/text_utils/TextUtils.js(202,39): error TS2694: Namespace 'TextUtils.FilterParser' has no exported member 'ParsedFilter'.
-node_modules/chrome-devtools-frontend/front_end/text_utils/TextUtils.js(210,46): error TS2694: Namespace 'TextUtils.FilterParser' has no exported member 'ParsedFilter'.
-node_modules/chrome-devtools-frontend/front_end/text_utils/TextUtils.js(243,24): error TS2339: Property 'ParsedFilter' does not exist on type 'typeof FilterParser'.
+node_modules/chrome-devtools-frontend/front_end/text_utils/TextUtils.js(238,5): error TS2322: Type '({ key: any; text: any; negative: boolean; } | { regex: RegExp; negative: boolean; } | { text: any; negative: boolean; })[]' is not assignable to type '{ key: string; text: string; regex: RegExp; negative: boolean; }[]'.
+  Type '{ key: any; text: any; negative: boolean; } | { regex: RegExp; negative: boolean; } | { text: any; negative: boolean; }' is not assignable to type '{ key: string; text: string; regex: RegExp; negative: boolean; }'.
+    Property 'regex' is missing in type '{ key: any; text: any; negative: boolean; }' but required in type '{ key: string; text: string; regex: RegExp; negative: boolean; }'.
 node_modules/chrome-devtools-frontend/front_end/text_utils/TextUtils.js(265,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/text_utils/TextUtils.js(340,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/timeline/CountersGraph.js(59,42): error TS2339: Property 'createChild' does not exist on type 'Element'.
@@ -12177,96 +11001,75 @@ node_modules/chrome-devtools-frontend/front_end/timeline/CountersGraph.js(379,28
 node_modules/chrome-devtools-frontend/front_end/timeline/CountersGraph.js(380,28): error TS2339: Property 'borderColor' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/timeline/CountersGraph.js(384,40): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/timeline/CountersGraph.js(394,50): error TS2339: Property 'createChild' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/timeline/CountersGraph.js(414,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/timeline/CountersGraph.js(426,27): error TS2339: Property 'upperBound' does not exist on type 'any[]'.
 node_modules/chrome-devtools-frontend/front_end/timeline/CountersGraph.js(438,24): error TS2339: Property 'withThousandsSeparator' does not exist on type 'NumberConstructor'.
 node_modules/chrome-devtools-frontend/front_end/timeline/CountersGraph.js(563,19): error TS2339: Property 'preciseMillisToString' does not exist on type 'NumberConstructor'.
-node_modules/chrome-devtools-frontend/front_end/timeline/EventsTimelineTreeView.js(22,54): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Ascending: string; Descending: string; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline/EventsTimelineTreeView.js(33,9): error TS2367: This condition will always return 'false' since the types '{ Frame: string; NetworkRequest: string; TraceEvent: string; Range: string; }' and 'string' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/timeline/EventsTimelineTreeView.js(63,32): error TS2339: Property 'peekLast' does not exist on type 'IterableIterator<Node>[]'.
-node_modules/chrome-devtools-frontend/front_end/timeline/EventsTimelineTreeView.js(91,40): error TS2694: Namespace 'DataGrid.DataGrid' has no exported member 'ColumnDescriptor'.
 node_modules/chrome-devtools-frontend/front_end/timeline/EventsTimelineTreeView.js(95,41): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/timeline/EventsTimelineTreeView.js(95,65): error TS2345: Argument of type '{ id: string; title: any; width: string; fixedWidth: true; sortable: true; }' is not assignable to parameter of type '{ id: string; title: string; titleDOMFragment: DocumentFragment; sortable: boolean; sort: string; align: string; fixedWidth: boolean; editable: boolean; nonSelectable: boolean; longText: boolean; disclosure: boolean; weight: number; }'.
+  Object literal may only specify known properties, and 'width' does not exist in type '{ id: string; title: string; titleDOMFragment: DocumentFragment; sortable: boolean; sort: string; align: string; fixedWidth: boolean; editable: boolean; nonSelectable: boolean; longText: boolean; disclosure: boolean; weight: number; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline/EventsTimelineTreeView.js(97,54): error TS2339: Property 'width' does not exist on type '{ id: string; title: string; titleDOMFragment: DocumentFragment; sortable: boolean; sort: string; align: string; fixedWidth: boolean; editable: boolean; nonSelectable: boolean; longText: boolean; disclosure: boolean; weight: number; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/EventsTimelineTreeView.js(158,80): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/EventsTimelineTreeView.js(160,31): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/EventsTimelineTreeView.js(183,56): error TS2339: Property 'value' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/timeline/ExtensionTracingSession.js(17,16): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceModel.js(57,51): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ animation: symbol; console: symbol; userTiming: symbol; input: symbol; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceModel.js(57,89): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ animation: symbol; console: symbol; userTiming: symbol; input: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceModel.js(157,25): error TS2304: Cannot find name 'FileError'.
-node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(24,77): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ Unknown: number; Foreground: number; Background: number; Selection: number; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(26,46): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(28,25): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(29,16): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(33,5): error TS2322: Type 'Map<string, symbol>' is not assignable to type 'Map<string, { CumulativeTime: symbol; CumulativeCount: symbol; }>'.
-  Type 'symbol' is not assignable to type '{ CumulativeTime: symbol; CumulativeCount: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(83,12): error TS2339: Property '_animationId' does not exist on type 'PerformanceMonitor'.
 node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(83,47): error TS2339: Property 'window' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(89,25): error TS2339: Property 'window' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(89,60): error TS2339: Property '_animationId' does not exist on type 'PerformanceMonitor'.
 node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(99,31): error TS2694: Namespace 'Protocol' has no exported member 'Performance'.
 node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(107,9): error TS2739: Type '{}' is missing the following properties from type '{ lastValue: number; lastTimestamp: number; }': lastValue, lastTimestamp
-node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(112,14): error TS2678: Type 'symbol' is not comparable to type '{ CumulativeTime: symbol; CumulativeCount: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(114,22): error TS2339: Property 'constrain' does not exist on type 'NumberConstructor'.
-node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(119,14): error TS2678: Type 'symbol' is not comparable to type '{ CumulativeTime: symbol; CumulativeCount: symbol; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(163,75): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ Unknown: number; Foreground: number; Background: number; Selection: number; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(165,74): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ Unknown: number; Foreground: number; Background: number; Selection: number; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(183,43): error TS2694: Namespace 'Timeline.PerformanceMonitor' has no exported member 'ChartInfo'.
-node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(204,68): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ Unknown: number; Foreground: number; Background: number; Selection: number; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(220,43): error TS2694: Namespace 'Timeline.PerformanceMonitor' has no exported member 'ChartInfo'.
-node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(253,43): error TS2694: Namespace 'Timeline.PerformanceMonitor' has no exported member 'ChartInfo'.
-node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(265,74): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ Unknown: number; Foreground: number; Background: number; Selection: number; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(282,76): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ Unknown: number; Foreground: number; Background: number; Selection: number; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(294,43): error TS2694: Namespace 'Timeline.PerformanceMonitor' has no exported member 'ChartInfo'.
-node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(295,43): error TS2694: Namespace 'Timeline.PerformanceMonitor' has no exported member 'MetricInfo'.
+node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(193,47): error TS2339: Property 'stacked' does not exist on type '{ title: string; metrics: { name: string; color: string; mode: symbol; }[]; max: number; currentMax: number; format: symbol; smooth: boolean; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(320,41): error TS2339: Property 'peekLast' does not exist on type '{ timestamp: number; metrics: Map<string, number>; }[]'.
 node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(330,24): error TS2339: Property 'constrain' does not exist on type 'NumberConstructor'.
-node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(395,51): error TS2694: Namespace 'Timeline.PerformanceMonitor' has no exported member 'MetricInfo'.
-node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(402,29): error TS2339: Property 'ChartInfo' does not exist on type 'typeof PerformanceMonitor'.
-node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(411,29): error TS2339: Property 'MetricInfo' does not exist on type 'typeof PerformanceMonitor'.
 node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(419,27): error TS2339: Property 'createChild' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(427,52): error TS2694: Namespace 'Timeline.PerformanceMonitor' has no exported member 'ChartInfo'.
 node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(430,23): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(432,11): error TS2741: Property 'mode' is missing in type '{ name: string; color: string; }' but required in type '{ name: string; color: string; mode: symbol; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(432,50): error TS2741: Property 'mode' is missing in type '{ name: string; color: string; }' but required in type '{ name: string; color: string; mode: symbol; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(433,11): error TS2741: Property 'mode' is missing in type '{ name: string; color: string; }' but required in type '{ name: string; color: string; mode: symbol; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(433,58): error TS2741: Property 'mode' is missing in type '{ name: string; color: string; }' but required in type '{ name: string; color: string; mode: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(442,23): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(443,19): error TS2741: Property 'mode' is missing in type '{ name: string; color: string; }' but required in type '{ name: string; color: string; mode: symbol; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(443,61): error TS2741: Property 'mode' is missing in type '{ name: string; color: string; }' but required in type '{ name: string; color: string; mode: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(447,22): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(447,55): error TS2741: Property 'mode' is missing in type '{ name: string; color: string; }' but required in type '{ name: string; color: string; mode: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(448,22): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(448,64): error TS2741: Property 'mode' is missing in type '{ name: string; color: string; }' but required in type '{ name: string; color: string; mode: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(449,22): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(449,55): error TS2741: Property 'mode' is missing in type '{ name: string; color: string; }' but required in type '{ name: string; color: string; mode: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(450,22): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(450,61): error TS2741: Property 'mode' is missing in type '{ name: string; color: string; }' but required in type '{ name: string; color: string; mode: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(451,22): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(451,59): error TS2741: Property 'mode' is missing in type '{ name: string; color: string; }' but required in type '{ name: string; color: string; mode: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(452,22): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(456,69): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ Unknown: number; Foreground: number; Background: number; Selection: number; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(484,51): error TS2694: Namespace 'Timeline.PerformanceMonitor' has no exported member 'ChartInfo'.
-node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(517,43): error TS2694: Namespace 'Timeline.PerformanceMonitor' has no exported member 'ChartInfo'.
+node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(452,65): error TS2741: Property 'mode' is missing in type '{ name: string; color: string; }' but required in type '{ name: string; color: string; mode: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(519,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
+node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(522,22): error TS2339: Property 'color' does not exist on type '{ title: string; metrics: { name: string; color: string; mode: symbol; }[]; max: number; currentMax: number; format: symbol; smooth: boolean; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(526,27): error TS2339: Property 'createChild' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/timeline/PerformanceMonitor.js(539,43): error TS2694: Namespace 'Timeline.PerformanceMonitor' has no exported member 'ChartInfo'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineController.js(28,59): error TS2345: Argument of type 'this' is not assignable to parameter of type '{ modelAdded(model: T): void; modelRemoved(model: T): void; }'.
   Type 'TimelineController' is not assignable to type '{ modelAdded(model: T): void; modelRemoved(model: T): void; }'.
     Types of property 'modelAdded' are incompatible.
       Type '(cpuProfilerModel: CPUProfilerModel) => void' is not assignable to type '(model: T) => void'.
         Types of parameters 'cpuProfilerModel' and 'model' are incompatible.
           Type 'T' is not assignable to type 'CPUProfilerModel'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineController.js(39,43): error TS2694: Namespace 'Timeline.TimelineController' has no exported member 'RecordingOptions'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineController.js(44,64): error TS2339: Property 'traceProviders' does not exist on type 'typeof extensionServer'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineController.js(137,24): error TS2694: Namespace 'Protocol' has no exported member 'Profiler'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineController.js(141,34): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineController.js(180,42): error TS2694: Namespace 'SDK.TracingManager' has no exported member 'EventPayload'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineController.js(209,24): error TS2694: Namespace 'Protocol' has no exported member 'Profiler'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineController.js(214,58): error TS2694: Namespace 'SDK.TracingManager' has no exported member 'EventPayload'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineController.js(233,96): error TS2339: Property 'peekLast' does not exist on type 'Event[]'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineController.js(272,1): error TS8022: JSDoc '@extends' is not attached to a class.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineController.js(288,29): error TS2339: Property 'RecordingOptions' does not exist on type 'typeof TimelineController'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineDetailsView.js(29,44): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineDetailsView.js(31,44): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineDetailsView.js(38,45): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineDetailsView.js(42,45): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineDetailsView.js(46,45): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineDetailsView.js(118,12): error TS2678: Type 'string' is not comparable to type '{ Frame: string; NetworkRequest: string; TraceEvent: string; Range: string; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineDetailsView.js(124,12): error TS2678: Type 'string' is not comparable to type '{ Frame: string; NetworkRequest: string; TraceEvent: string; Range: string; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineDetailsView.js(130,22): error TS2339: Property 'showLayerTree' does not exist on type 'Widget'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineDetailsView.js(132,82): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineDetailsView.js(135,12): error TS2678: Type 'string' is not comparable to type '{ Frame: string; NetworkRequest: string; TraceEvent: string; Range: string; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineDetailsView.js(141,12): error TS2678: Type 'string' is not comparable to type '{ Frame: string; NetworkRequest: string; TraceEvent: string; Range: string; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineDetailsView.js(150,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineDetailsView.js(188,66): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineDetailsView.js(218,64): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineEventOverview.js(46,20): error TS2339: Property 'createChild' does not exist on type 'Element'.
@@ -12289,41 +11092,16 @@ node_modules/chrome-devtools-frontend/front_end/timeline/TimelineEventOverview.j
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineEventOverview.js(644,48): error TS2339: Property 'bytesToString' does not exist on type 'NumberConstructor'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineEventOverview.js(644,87): error TS2339: Property 'bytesToString' does not exist on type 'NumberConstructor'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineEventOverview.js(655,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(60,36): error TS2694: Namespace 'PerfUI.FlameChart' has no exported member 'GroupStyle'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(67,55): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ Unknown: number; Foreground: number; Background: number; Selection: number; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(68,66): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ Unknown: number; Foreground: number; Background: number; Selection: number; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(73,44): error TS2694: Namespace 'PerfUI.FlameChart' has no exported member 'GroupStyle'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(106,9): error TS2367: This condition will always return 'false' since the types '{ Frame: symbol; Event: symbol; InteractionRecord: symbol; ExtensionEvent: symbol; Screenshot: symbol; }' and 'symbol' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(108,11): error TS2367: This condition will always return 'false' since the types '{ Begin: string; End: string; Complete: string; Instant: string; AsyncBegin: string; AsyncStepInto: string; AsyncStepPast: string; AsyncEnd: string; NestableAsyncBegin: string; NestableAsyncEnd: string; ... 9 more ...; DeleteObject: string; }' and 'string' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(108,67): error TS2367: This condition will always return 'false' since the types '{ Begin: string; End: string; Complete: string; Instant: string; AsyncBegin: string; AsyncStepInto: string; AsyncStepPast: string; AsyncEnd: string; NestableAsyncBegin: string; NestableAsyncEnd: string; ... 9 more ...; DeleteObject: string; }' and 'string' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(110,17): error TS2339: Property '_blackboxRoot' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(111,23): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(119,9): error TS2367: This condition will always return 'false' since the types '{ Frame: symbol; Event: symbol; InteractionRecord: symbol; ExtensionEvent: symbol; Screenshot: symbol; }' and 'symbol' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(123,9): error TS2367: This condition will always return 'false' since the types '{ Frame: symbol; Event: symbol; InteractionRecord: symbol; ExtensionEvent: symbol; Screenshot: symbol; }' and 'symbol' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(140,27): error TS2339: Property '_blackboxRoot' does not exist on type 'Event | { Idle: string; Response: string; Scroll: string; Fling: string; Drag: string; Animation: string; Uncategorized: string; } | TimelineFrame | Frame'.
-  Property '_blackboxRoot' does not exist on type 'Event'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(140,27): error TS2339: Property '_blackboxRoot' does not exist on type 'string | Event | TimelineFrame | Frame'.
+  Property '_blackboxRoot' does not exist on type 'string'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(171,49): error TS2749: 'Image' refers to a value, but is being used as a type here.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(203,31): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(209,66): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ animation: symbol; console: symbol; userTiming: symbol; input: symbol; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(211,68): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ animation: symbol; console: symbol; userTiming: symbol; input: symbol; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(212,91): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ Frame: symbol; Event: symbol; InteractionRecord: symbol; ExtensionEvent: symbol; Screenshot: symbol; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(214,62): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ animation: symbol; console: symbol; userTiming: symbol; input: symbol; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(216,68): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ animation: symbol; console: symbol; userTiming: symbol; input: symbol; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(217,87): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ Frame: symbol; Event: symbol; InteractionRecord: symbol; ExtensionEvent: symbol; Screenshot: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(222,18): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(225,18): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(235,33): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(239,13): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ Frame: symbol; Event: symbol; InteractionRecord: symbol; ExtensionEvent: symbol; Screenshot: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(246,64): error TS2339: Property 'id' does not exist on type 'VirtualThread'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(285,11): error TS2367: This condition will always return 'true' since the types '{ Frame: symbol; Event: symbol; InteractionRecord: symbol; ExtensionEvent: symbol; Screenshot: symbol; }' and 'symbol' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(312,39): error TS2694: Namespace 'PerfUI.FlameChart' has no exported member 'GroupStyle'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(313,9): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ Frame: symbol; Event: symbol; InteractionRecord: symbol; ExtensionEvent: symbol; Screenshot: symbol; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(326,73): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ Frame: symbol; Event: symbol; InteractionRecord: symbol; ExtensionEvent: symbol; Screenshot: symbol; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(332,33): error TS2694: Namespace 'PerfUI.FlameChart' has no exported member 'GroupStyle'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(337,23): error TS2367: This condition will always return 'false' since the types '{ Frame: symbol; Event: symbol; InteractionRecord: symbol; ExtensionEvent: symbol; Screenshot: symbol; }' and 'symbol' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(350,41): error TS2345: Argument of type '{ Begin: string; End: string; Complete: string; Instant: string; AsyncBegin: string; AsyncStepInto: string; AsyncStepPast: string; AsyncEnd: string; NestableAsyncBegin: string; NestableAsyncEnd: string; ... 9 more ...; DeleteObject: string; }' is not assignable to parameter of type 'string'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(351,27): error TS2367: This condition will always return 'true' since the types '{ Begin: string; End: string; Complete: string; Instant: string; AsyncBegin: string; AsyncStepInto: string; AsyncStepPast: string; AsyncEnd: string; NestableAsyncBegin: string; NestableAsyncEnd: string; ... 9 more ...; DeleteObject: string; }' and 'string' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(353,43): error TS2345: Argument of type '{ Begin: string; End: string; Complete: string; Instant: string; AsyncBegin: string; AsyncStepInto: string; AsyncStepPast: string; AsyncEnd: string; NestableAsyncBegin: string; NestableAsyncEnd: string; ... 9 more ...; DeleteObject: string; }' is not assignable to parameter of type 'string'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(358,46): error TS2339: Property 'peekLast' does not exist on type 'Event[]'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(360,9): error TS2339: Property '_blackboxRoot' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(362,33): error TS2339: Property 'peekLast' does not exist on type 'Event[]'.
@@ -12331,15 +11109,10 @@ node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataP
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(377,47): error TS2339: Property 'peekLast' does not exist on type 'Event[]'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(417,16): error TS2339: Property 'remove' does not exist on type 'any[]'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(418,16): error TS2339: Property 'remove' does not exist on type 'any[]'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(426,71): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ Frame: symbol; Event: symbol; InteractionRecord: symbol; ExtensionEvent: symbol; Screenshot: symbol; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(433,33): error TS2694: Namespace 'PerfUI.FlameChart' has no exported member 'GroupStyle'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(462,9): error TS1345: An expression of type 'void' cannot be tested for truthiness
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(462,50): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(462,87): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ Frame: symbol; Event: symbol; InteractionRecord: symbol; ExtensionEvent: symbol; Screenshot: symbol; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(468,5): error TS2322: Type 'symbol' is not assignable to type '{ Frame: symbol; Event: symbol; InteractionRecord: symbol; ExtensionEvent: symbol; Screenshot: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(475,31): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(476,50): error TS2339: Property 'peekLast' does not exist on type 'any[]'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(478,5): error TS2322: Type 'symbol' is not assignable to type '{ Frame: symbol; Event: symbol; InteractionRecord: symbol; ExtensionEvent: symbol; Screenshot: symbol; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(488,5): error TS2322: Type 'symbol' is not assignable to type '{ Frame: symbol; Event: symbol; InteractionRecord: symbol; ExtensionEvent: symbol; Screenshot: symbol; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(476,50): error TS2339: Property 'peekLast' does not exist on type '{ name: string; startLevel: number; expanded: boolean; style: { height: number; padding: number; collapsible: boolean; font: string; color: string; backgroundColor: string; nestingLevel: number; itemsHeight: number; shareHeaderLine: boolean; useFirstLineForOverview: boolean; useDecoratorsForOverview: boolean; }; }[]'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(492,38): error TS2339: Property 'push' does not exist on type 'number[] | Uint16Array'.
   Property 'push' does not exist on type 'Uint16Array'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(493,42): error TS2339: Property 'push' does not exist on type 'number[] | Float64Array'.
@@ -12348,68 +11121,38 @@ node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataP
   Property 'push' does not exist on type 'Float32Array'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(499,42): error TS2339: Property 'push' does not exist on type 'number[] | Float32Array'.
   Property 'push' does not exist on type 'Float32Array'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(521,9): error TS2367: This condition will always return 'false' since the types '{ Frame: symbol; Event: symbol; InteractionRecord: symbol; ExtensionEvent: symbol; Screenshot: symbol; }' and 'symbol' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(529,40): error TS2339: Property 'millisToString' does not exist on type 'NumberConstructor'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(529,80): error TS2339: Property 'millisToString' does not exist on type 'NumberConstructor'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(530,20): error TS2339: Property 'millisToString' does not exist on type 'NumberConstructor'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(534,16): error TS2367: This condition will always return 'false' since the types '{ Frame: symbol; Event: symbol; InteractionRecord: symbol; ExtensionEvent: symbol; Screenshot: symbol; }' and 'symbol' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(537,38): error TS2339: Property 'preciseMillisToString' does not exist on type 'NumberConstructor'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(538,35): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(538,67): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(541,38): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(548,25): error TS2339: Property 'createChild' does not exist on type 'DocumentFragment'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(577,9): error TS2367: This condition will always return 'false' since the types '{ Frame: symbol; Event: symbol; InteractionRecord: symbol; ExtensionEvent: symbol; Screenshot: symbol; }' and 'symbol' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(579,42): error TS2345: Argument of type '{ Begin: string; End: string; Complete: string; Instant: string; AsyncBegin: string; AsyncStepInto: string; AsyncStepPast: string; AsyncEnd: string; NestableAsyncBegin: string; NestableAsyncEnd: string; ... 9 more ...; DeleteObject: string; }' is not assignable to parameter of type 'string'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(593,9): error TS2367: This condition will always return 'false' since the types '{ Frame: symbol; Event: symbol; InteractionRecord: symbol; ExtensionEvent: symbol; Screenshot: symbol; }' and 'symbol' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(595,9): error TS2367: This condition will always return 'false' since the types '{ Frame: symbol; Event: symbol; InteractionRecord: symbol; ExtensionEvent: symbol; Screenshot: symbol; }' and 'symbol' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(597,9): error TS2367: This condition will always return 'false' since the types '{ Frame: symbol; Event: symbol; InteractionRecord: symbol; ExtensionEvent: symbol; Screenshot: symbol; }' and 'symbol' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(621,36): error TS2339: Property 'preciseMillisToString' does not exist on type 'NumberConstructor'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(654,37): error TS2339: Property 'naturalHeight' does not exist on type 'new (width?: number, height?: number) => HTMLImageElement'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(655,39): error TS2339: Property 'naturalWidth' does not exist on type 'new (width?: number, height?: number) => HTMLImageElement'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(660,23): error TS2345: Argument of type 'new (width?: number, height?: number) => HTMLImageElement' is not assignable to parameter of type 'CanvasImageSource'.
   Type 'new (width?: number, height?: number) => HTMLImageElement' is missing the following properties from type 'OffscreenCanvas': height, width, convertToBlob, getContext, and 4 more.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(684,9): error TS2367: This condition will always return 'false' since the types '{ Frame: symbol; Event: symbol; InteractionRecord: symbol; ExtensionEvent: symbol; Screenshot: symbol; }' and 'symbol' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(689,9): error TS2367: This condition will always return 'false' since the types '{ Frame: symbol; Event: symbol; InteractionRecord: symbol; ExtensionEvent: symbol; Screenshot: symbol; }' and 'symbol' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(694,9): error TS2367: This condition will always return 'false' since the types '{ Frame: symbol; Event: symbol; InteractionRecord: symbol; ExtensionEvent: symbol; Screenshot: symbol; }' and 'symbol' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(704,9): error TS2367: This condition will always return 'false' since the types '{ Frame: symbol; Event: symbol; InteractionRecord: symbol; ExtensionEvent: symbol; Screenshot: symbol; }' and 'symbol' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(748,9): error TS2367: This condition will always return 'false' since the types '{ Frame: symbol; Event: symbol; InteractionRecord: symbol; ExtensionEvent: symbol; Screenshot: symbol; }' and 'symbol' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(750,9): error TS2367: This condition will always return 'false' since the types '{ Frame: symbol; Event: symbol; InteractionRecord: symbol; ExtensionEvent: symbol; Screenshot: symbol; }' and 'symbol' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(753,9): error TS2367: This condition will always return 'false' since the types '{ Frame: symbol; Event: symbol; InteractionRecord: symbol; ExtensionEvent: symbol; Screenshot: symbol; }' and 'symbol' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(781,93): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ Frame: symbol; Event: symbol; InteractionRecord: symbol; ExtensionEvent: symbol; Screenshot: symbol; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(782,82): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ Frame: symbol; Event: symbol; InteractionRecord: symbol; ExtensionEvent: symbol; Screenshot: symbol; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(788,33): error TS2694: Namespace 'PerfUI.FlameChart' has no exported member 'GroupStyle'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(816,47): error TS2345: Argument of type '{ Begin: string; End: string; Complete: string; Instant: string; AsyncBegin: string; AsyncStepInto: string; AsyncStepPast: string; AsyncEnd: string; NestableAsyncBegin: string; NestableAsyncEnd: string; ... 9 more ...; DeleteObject: string; }' is not assignable to parameter of type 'string'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(823,43): error TS2367: This condition will always return 'false' since the types '{ Begin: string; End: string; Complete: string; Instant: string; AsyncBegin: string; AsyncStepInto: string; AsyncStepPast: string; AsyncEnd: string; NestableAsyncBegin: string; NestableAsyncEnd: string; ... 9 more ...; DeleteObject: string; }' and 'string' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(861,12): error TS2678: Type 'string' is not comparable to type '{ Begin: string; End: string; Complete: string; Instant: string; AsyncBegin: string; AsyncStepInto: string; AsyncStepPast: string; AsyncEnd: string; NestableAsyncBegin: string; NestableAsyncEnd: string; ... 9 more ...; DeleteObject: string; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(862,44): error TS2339: Property 'id' does not exist on type 'Event'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(864,12): error TS2678: Type 'string' is not comparable to type '{ Begin: string; End: string; Complete: string; Instant: string; AsyncBegin: string; AsyncStepInto: string; AsyncStepPast: string; AsyncEnd: string; NestableAsyncBegin: string; NestableAsyncEnd: string; ... 9 more ...; DeleteObject: string; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(865,63): error TS2339: Property 'id' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(866,44): error TS2339: Property 'id' does not exist on type 'Event'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(868,12): error TS2678: Type 'string' is not comparable to type '{ Begin: string; End: string; Complete: string; Instant: string; AsyncBegin: string; AsyncStepInto: string; AsyncStepPast: string; AsyncEnd: string; NestableAsyncBegin: string; NestableAsyncEnd: string; ... 9 more ...; DeleteObject: string; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(869,63): error TS2339: Property 'id' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(870,47): error TS2339: Property 'id' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(881,45): error TS2339: Property 'millisToString' does not exist on type 'NumberConstructor'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(906,9): error TS2367: This condition will always return 'false' since the types '{ Frame: symbol; Event: symbol; InteractionRecord: symbol; ExtensionEvent: symbol; Screenshot: symbol; }' and 'symbol' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(909,16): error TS2367: This condition will always return 'false' since the types '{ Frame: symbol; Event: symbol; InteractionRecord: symbol; ExtensionEvent: symbol; Screenshot: symbol; }' and 'symbol' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(925,19): error TS2339: Property 'preciseMillisToString' does not exist on type 'NumberConstructor'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(942,23): error TS2367: This condition will always return 'false' since the types '{ Frame: string; NetworkRequest: string; TraceEvent: string; Range: string; }' and 'string' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartDataProvider.js(1011,31): error TS2367: This condition will always return 'false' since the types '{ Frame: symbol; Event: symbol; InteractionRecord: symbol; ExtensionEvent: symbol; Screenshot: symbol; }' and 'symbol' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartNetworkDataProvider.js(17,53): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ Unknown: number; Foreground: number; Background: number; Selection: number; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartNetworkDataProvider.js(19,64): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ Unknown: number; Foreground: number; Background: number; Selection: number; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartNetworkDataProvider.js(25,48): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartNetworkDataProvider.js(120,9): error TS2367: This condition will always return 'true' since the types '{ Frame: string; NetworkRequest: string; TraceEvent: string; Range: string; }' and 'string' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartNetworkDataProvider.js(210,65): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ Unknown: number; Foreground: number; Background: number; Selection: number; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartNetworkDataProvider.js(217,29): error TS2339: Property 'constrain' does not exist on type 'NumberConstructor'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartNetworkDataProvider.js(306,25): error TS2339: Property 'createChild' does not exist on type 'DocumentFragment'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartNetworkDataProvider.js(309,87): error TS2339: Property 'millisToString' does not exist on type 'NumberConstructor'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartNetworkDataProvider.js(313,69): error TS2694: Namespace 'Protocol' has no exported member 'Network'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartNetworkDataProvider.js(360,56): error TS2339: Property 'peekLast' does not exist on type 'number[]'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartNetworkDataProvider.js(372,10): error TS2322: Type '{ startLevel: number; name: any; expanded: boolean; style: { padding: number; height: number; collapsible: boolean; color: string; font: string; backgroundColor: string; nestingLevel: number; useFirstLineForOverview: boolean; useDecoratorsForOverview: boolean; shareHeaderLine: boolean; }; }' is not assignable to type '{ name: string; startLevel: number; expanded: boolean; style: { height: number; padding: number; collapsible: boolean; font: string; color: string; backgroundColor: string; nestingLevel: number; itemsHeight: number; shareHeaderLine: boolean; useFirstLineForOverview: boolean; useDecoratorsForOverview: boolean; }; }'.
+  Types of property 'style' are incompatible.
+    Property 'itemsHeight' is missing in type '{ padding: number; height: number; collapsible: boolean; color: string; font: string; backgroundColor: string; nestingLevel: number; useFirstLineForOverview: boolean; useDecoratorsForOverview: boolean; shareHeaderLine: boolean; }' but required in type '{ height: number; padding: number; collapsible: boolean; font: string; color: string; backgroundColor: string; nestingLevel: number; itemsHeight: number; shareHeaderLine: boolean; useFirstLineForOverview: boolean; useDecoratorsForOverview: boolean; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartNetworkDataProvider.js(391,64): error TS2339: Property 'constrain' does not exist on type 'NumberConstructor'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartNetworkDataProvider.js(408,19): error TS2339: Property 'preciseMillisToString' does not exist on type 'NumberConstructor'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartView.js(49,52): error TS2339: Property 'createChild' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartView.js(184,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartView.js(282,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartView.js(434,24): error TS2694: Namespace 'Timeline' has no exported member 'TimelineMarkerStyle'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineFlameChartView.js(463,28): error TS2339: Property 'millisToString' does not exist on type 'NumberConstructor'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineHistoryManager.js(68,33): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineHistoryManager.js(106,27): error TS2339: Property 'constrain' does not exist on type 'NumberConstructor'.
@@ -12425,11 +11168,6 @@ node_modules/chrome-devtools-frontend/front_end/timeline/TimelineHistoryManager.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineHistoryManager.js(225,15): error TS2339: Property 'style' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineHistoryManager.js(226,15): error TS2339: Property 'style' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineHistoryManager.js(227,28): error TS2339: Property 'createChild' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineHistoryManager.js(248,48): error TS2694: Namespace 'Timeline.TimelineHistoryManager' has no exported member 'PreviewData'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineHistoryManager.js(256,33): error TS2339: Property 'PreviewData' does not exist on type 'typeof TimelineHistoryManager'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineHistoryManager.js(271,37): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ SetExactSize: symbol; SetExactWidthMaxHeight: symbol; MeasureContent: symbol; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineHistoryManager.js(273,46): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ BlockedByGlassPane: symbol; PierceGlassPane: symbol; PierceContents: symbol; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineHistoryManager.js(274,39): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ PreferTop: symbol; PreferBottom: symbol; PreferLeft: symbol; PreferRight: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineHistoryManager.js(278,37): error TS2339: Property 'createChild' does not exist on type 'DocumentFragment'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineHistoryManager.js(281,55): error TS2345: Argument of type 'this' is not assignable to parameter of type '{ createElementForItem(item: T): Element; heightForItem(item: T): number; isItemSelectable(item: T): boolean; selectedItemChanged(from: T, to: T, fromElement: Element, toElement: Element): void; }'.
   Type 'DropDown' is not assignable to type '{ createElementForItem(item: T): Element; heightForItem(item: T): number; isItemSelectable(item: T): boolean; selectedItemChanged(from: T, to: T, fromElement: Element, toElement: Element): void; }'.
@@ -12445,12 +11183,10 @@ node_modules/chrome-devtools-frontend/front_end/timeline/TimelineHistoryManager.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineHistoryManager.js(361,11): error TS2339: Property 'consume' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineHistoryManager.js(432,39): error TS2339: Property 'createChild' does not exist on type 'DocumentFragment'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineLayersView.js(13,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineLayersView.js(66,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineLoader.js(19,17): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineLoader.js(43,14): error TS2339: Property '_reportErrorAndCancelLoading' does not exist on type 'typeof TimelineLoader'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineLoader.js(91,50): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineLoader.js(118,48): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineLoader.js(137,54): error TS2694: Namespace 'SDK.TracingManager' has no exported member 'EventPayload'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineLoader.js(146,50): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineLoader.js(203,48): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePaintProfilerView.js(119,26): error TS2694: Namespace 'Protocol' has no exported member 'DOM'.
@@ -12464,8 +11200,6 @@ node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(91,45)
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(100,53): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(111,60): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(131,32): error TS2339: Property 'addEventListener' does not exist on type 'typeof extensionServer'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(168,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(195,5): error TS2322: Type '{ Idle: symbol; StartPending: symbol; Recording: symbol; StopPending: symbol; Loading: symbol; }' is not assignable to type 'symbol'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(214,53): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(219,52): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(221,52): error TS2555: Expected at least 2 arguments, but got 1.
@@ -12476,8 +11210,6 @@ node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(274,16
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(277,16): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(284,48): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(289,44): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(298,23): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(334,20): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ Idle: symbol; StartPending: symbol; Recording: symbol; StopPending: symbol; Loading: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(340,33): error TS2339: Property 'remove' does not exist on type 'Node'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(362,37): error TS2339: Property 'toISO8601Compact' does not exist on type 'Date'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(396,31): error TS2339: Property 'click' does not exist on type 'Node'.
@@ -12489,14 +11221,9 @@ node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(461,57
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(462,56): error TS2345: Argument of type 'number' is not assignable to parameter of type 'boolean'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(467,24): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(471,52): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(491,20): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ Idle: symbol; StartPending: symbol; Recording: symbol; StopPending: symbol; Loading: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(494,60): error TS2339: Property 'traceProviders' does not exist on type 'typeof extensionServer'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(514,44): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(515,49): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(517,20): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ Idle: symbol; StartPending: symbol; Recording: symbol; StopPending: symbol; Loading: symbol; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(545,36): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; TimelineStarted: number; ProfilesCPUProfileTaken: number; ProfilesHeapProfileTaken: number; AuditsStarted: number; ... 23 more ...; ShowedThirdPartyBadges: number; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(556,34): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; TimelineStarted: number; ProfilesCPUProfileTaken: number; ProfilesHeapProfileTaken: number; AuditsStarted: number; ... 23 more ...; ShowedThirdPartyBadges: number; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(624,20): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ Idle: symbol; StartPending: symbol; Recording: symbol; StopPending: symbol; Loading: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(626,42): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(627,47): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(637,47): error TS2555: Expected at least 2 arguments, but got 1.
@@ -12508,19 +11235,9 @@ node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(694,56
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(719,42): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(732,49): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(739,42): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(748,20): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ Idle: symbol; StartPending: symbol; Recording: symbol; StopPending: symbol; Loading: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(773,42): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(800,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(827,12): error TS2678: Type 'string' is not comparable to type '{ Frame: string; NetworkRequest: string; TraceEvent: string; Range: string; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(829,12): error TS2678: Type 'string' is not comparable to type '{ Frame: string; NetworkRequest: string; TraceEvent: string; Range: string; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(831,12): error TS2678: Type 'string' is not comparable to type '{ Frame: string; NetworkRequest: string; TraceEvent: string; Range: string; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(850,20): error TS2339: Property 'constrain' does not exist on type 'NumberConstructor'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(878,29): error TS2339: Property 'upperBound' does not exist on type 'Event[]'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(1029,24): error TS2339: Property 'ModelSelectionData' does not exist on type 'typeof TimelinePanel'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(1050,43): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Frame: string; NetworkRequest: string; TraceEvent: string; Range: string; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(1059,9): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Frame: string; NetworkRequest: string; TraceEvent: string; Range: string; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(1069,9): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Frame: string; NetworkRequest: string; TraceEvent: string; Range: string; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(1078,43): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Frame: string; NetworkRequest: string; TraceEvent: string; Range: string; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(1125,1): error TS8022: JSDoc '@extends' is not attached to a class.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(1129,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(1134,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
@@ -12535,15 +11252,18 @@ node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(1215,2
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(1220,22): error TS2339: Property 'disabled' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(1224,29): error TS2339: Property 'classList' does not exist on type 'Node & ParentNode'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelinePanel.js(1234,22): error TS2339: Property 'focus' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(65,58): error TS2694: Namespace 'DataGrid.DataGrid' has no exported member 'ColumnDescriptor'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(76,36): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Nearest: string; First: string; Last: string; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(134,53): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(162,76): error TS2339: Property 'value' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(173,59): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(280,5): error TS2740: Type 'TopDownRootNode' is missing the following properties from type 'Node': id, event, parent, _groupId, and 4 more.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(286,40): error TS2694: Namespace 'DataGrid.DataGrid' has no exported member 'ColumnDescriptor'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(289,45): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(289,68): error TS2345: Argument of type '{ id: string; title: any; width: string; fixedWidth: true; sortable: true; }' is not assignable to parameter of type '{ id: string; title: string; titleDOMFragment: DocumentFragment; sortable: boolean; sort: string; align: string; fixedWidth: boolean; editable: boolean; nonSelectable: boolean; longText: boolean; disclosure: boolean; weight: number; }'.
+  Object literal may only specify known properties, and 'width' does not exist in type '{ id: string; title: string; titleDOMFragment: DocumentFragment; sortable: boolean; sort: string; align: string; fixedWidth: boolean; editable: boolean; nonSelectable: boolean; longText: boolean; disclosure: boolean; weight: number; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(290,46): error TS2555: Expected at least 2 arguments, but got 1.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(290,70): error TS2345: Argument of type '{ id: string; title: any; width: string; fixedWidth: true; sortable: true; }' is not assignable to parameter of type '{ id: string; title: string; titleDOMFragment: DocumentFragment; sortable: boolean; sort: string; align: string; fixedWidth: boolean; editable: boolean; nonSelectable: boolean; longText: boolean; disclosure: boolean; weight: number; }'.
+  Object literal may only specify known properties, and 'width' does not exist in type '{ id: string; title: string; titleDOMFragment: DocumentFragment; sortable: boolean; sort: string; align: string; fixedWidth: boolean; editable: boolean; nonSelectable: boolean; longText: boolean; disclosure: boolean; weight: number; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(291,18): error TS2345: Argument of type '{ id: string; title: any; disclosure: true; sortable: true; }' is not assignable to parameter of type '{ id: string; title: string; titleDOMFragment: DocumentFragment; sortable: boolean; sort: string; align: string; fixedWidth: boolean; editable: boolean; nonSelectable: boolean; longText: boolean; disclosure: boolean; weight: number; }'.
+  Type '{ id: string; title: any; disclosure: true; sortable: true; }' is missing the following properties from type '{ id: string; title: string; titleDOMFragment: DocumentFragment; sortable: boolean; sort: string; align: string; fixedWidth: boolean; editable: boolean; nonSelectable: boolean; longText: boolean; disclosure: boolean; weight: number; }': titleDOMFragment, sort, align, fixedWidth, and 4 more.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(291,49): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(372,31): error TS2339: Property 'removeChildren' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(375,44): error TS2339: Property 'createChild' does not exist on type 'Element'.
@@ -12571,28 +11291,16 @@ node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(774
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(775,22): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(776,22): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(777,22): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(779,61): error TS2345: Argument of type '{ label: any; value: string; }[]' is not assignable to parameter of type '{ value: string; label: string; title: string; default: boolean; }[]'.
-  Type '{ label: any; value: string; }' is missing the following properties from type '{ value: string; label: string; title: string; default: boolean; }': title, default
+node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(779,61): error TS2345: Argument of type '{ label: any; value: any; }[]' is not assignable to parameter of type '{ value: string; label: string; title: string; default: boolean; }[]'.
+  Type '{ label: any; value: any; }' is missing the following properties from type '{ value: string; label: string; title: string; default: boolean; }': title, default
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(781,84): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(836,12): error TS2678: Type 'string' is not comparable to type '{ None: string; EventName: string; Category: string; Domain: string; Subdomain: string; Product: string; URL: string; Frame: string; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(838,12): error TS2678: Type 'string' is not comparable to type '{ None: string; EventName: string; Category: string; Domain: string; Subdomain: string; Product: string; URL: string; Frame: string; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(840,12): error TS2678: Type 'string' is not comparable to type '{ None: string; EventName: string; Category: string; Domain: string; Subdomain: string; Product: string; URL: string; Frame: string; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(842,12): error TS2678: Type 'string' is not comparable to type '{ None: string; EventName: string; Category: string; Domain: string; Subdomain: string; Product: string; URL: string; Frame: string; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(844,12): error TS2678: Type 'string' is not comparable to type '{ None: string; EventName: string; Category: string; Domain: string; Subdomain: string; Product: string; URL: string; Frame: string; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(846,12): error TS2678: Type 'string' is not comparable to type '{ None: string; EventName: string; Category: string; Domain: string; Subdomain: string; Product: string; URL: string; Frame: string; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(848,12): error TS2678: Type 'string' is not comparable to type '{ None: string; EventName: string; Category: string; Domain: string; Subdomain: string; Product: string; URL: string; Frame: string; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(850,12): error TS2678: Type 'string' is not comparable to type '{ None: string; EventName: string; Category: string; Domain: string; Subdomain: string; Product: string; URL: string; Frame: string; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(871,25): error TS2339: Property 'asParsedURL' does not exist on type 'string'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(896,25): error TS2339: Property 'asParsedURL' does not exist on type 'string'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(910,25): error TS2339: Property 'asParsedURL' does not exist on type 'string'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(977,50): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Ascending: string; Descending: string; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(999,49): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Ascending: string; Descending: string; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(1019,31): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(1020,33): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(1022,56): error TS2694: Namespace 'DataGrid.DataGrid' has no exported member 'ColumnDescriptor'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(1023,35): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(1024,38): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineTreeView.js(1027,36): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Nearest: string; First: string; Last: string; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(40,34): error TS2339: Property '_eventStylesMap' does not exist on type 'typeof TimelineUIUtils'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(41,39): error TS2339: Property '_eventStylesMap' does not exist on type 'typeof TimelineUIUtils'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(47,77): error TS2555: Expected at least 2 arguments, but got 1.
@@ -12709,11 +11417,8 @@ node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(247,
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(248,41): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(251,37): error TS2339: Property '_inputEventToDisplayName' does not exist on type 'typeof TimelineUIUtils'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(255,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(264,12): error TS2678: Type 'string' is not comparable to type '{ 'Compile': string; 'Parse': string; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(265,23): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(266,12): error TS2678: Type 'string' is not comparable to type '{ 'Compile': string; 'Parse': string; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(267,23): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(336,15): error TS2352: Conversion of type 'string' to type '{ Char: string; Click: string; ContextMenu: string; FlingCancel: string; FlingStart: string; ImplSideFling: string; KeyDown: string; KeyDownRaw: string; KeyUp: string; LatencyScrollUpdate: string; ... 18 more ...; TouchStart: string; }' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(373,25): error TS2339: Property 'asParsedURL' does not exist on type 'string'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(412,40): error TS2339: Property '_interactionPhaseStylesMap' does not exist on type 'typeof TimelineUIUtils'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(418,54): error TS2555: Expected at least 2 arguments, but got 1.
@@ -12724,15 +11429,6 @@ node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(425,
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(429,52): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(432,32): error TS2339: Property '_interactionPhaseStylesMap' does not exist on type 'typeof TimelineUIUtils'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(454,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(469,9): error TS2322: Type 'symbol' is not assignable to type '{ HTML: symbol; Script: symbol; Style: symbol; Media: symbol; Other: symbol; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(473,9): error TS2322: Type 'symbol' is not assignable to type '{ HTML: symbol; Script: symbol; Style: symbol; Media: symbol; Other: symbol; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(475,9): error TS2322: Type 'symbol' is not assignable to type '{ HTML: symbol; Script: symbol; Style: symbol; Media: symbol; Other: symbol; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(486,9): error TS2322: Type 'symbol' is not assignable to type '{ HTML: symbol; Script: symbol; Style: symbol; Media: symbol; Other: symbol; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(488,9): error TS2322: Type 'symbol' is not assignable to type '{ HTML: symbol; Script: symbol; Style: symbol; Media: symbol; Other: symbol; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(499,12): error TS2678: Type 'symbol' is not comparable to type '{ HTML: symbol; Script: symbol; Style: symbol; Media: symbol; Other: symbol; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(501,12): error TS2678: Type 'symbol' is not comparable to type '{ HTML: symbol; Script: symbol; Style: symbol; Media: symbol; Other: symbol; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(503,12): error TS2678: Type 'symbol' is not comparable to type '{ HTML: symbol; Script: symbol; Style: symbol; Media: symbol; Other: symbol; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(505,12): error TS2678: Type 'symbol' is not comparable to type '{ HTML: symbol; Script: symbol; Style: symbol; Media: symbol; Other: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(526,62): error TS2339: Property 'bytesToString' does not exist on type 'NumberConstructor'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(557,13): error TS2403: Subsequent variable declarations must have the same type.  Variable 'url' must be of type 'string', but here has type 'any'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(564,13): error TS2403: Subsequent variable declarations must have the same type.  Variable 'url' must be of type 'string', but here has type 'any'.
@@ -12786,7 +11482,6 @@ node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(953,
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(955,46): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(957,46): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(960,44): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(963,13): error TS2367: This condition will always return 'false' since the types '{ Begin: string; End: string; Complete: string; Instant: string; AsyncBegin: string; AsyncStepInto: string; AsyncStepPast: string; AsyncEnd: string; NestableAsyncBegin: string; NestableAsyncEnd: string; ... 9 more ...; DeleteObject: string; }' and 'string' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(964,46): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(972,52): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(977,20): error TS2555: Expected at least 2 arguments, but got 1.
@@ -12848,7 +11543,6 @@ node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(1360
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(1403,37): error TS2339: Property 'valuesArray' does not exist on type 'Map<string, InvalidationTrackingEvent[]>'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(1412,13): error TS2339: Property 'addAll' does not exist on type 'Set<number>'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(1431,24): error TS2339: Property 'binaryIndexOf' does not exist on type 'Event[]'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(1452,39): error TS2345: Argument of type '{ Begin: string; End: string; Complete: string; Instant: string; AsyncBegin: string; AsyncStepInto: string; AsyncStepPast: string; AsyncEnd: string; NestableAsyncBegin: string; NestableAsyncEnd: string; ... 9 more ...; DeleteObject: string; }' is not assignable to parameter of type 'string'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(1481,25): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(1483,41): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(1484,46): error TS2555: Expected at least 2 arguments, but got 1.
@@ -12898,8 +11592,6 @@ node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(1735
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(1736,39): error TS2551: Property '_eventDispatchDesciptors' does not exist on type 'typeof TimelineUIUtils'. Did you mean 'eventDispatchDesciptors'?
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(1741,30): error TS2551: Property '_eventDispatchDesciptors' does not exist on type 'typeof TimelineUIUtils'. Did you mean 'eventDispatchDesciptors'?
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(1754,37): error TS2551: Property '_eventDispatchDesciptors' does not exist on type 'typeof TimelineUIUtils'. Did you mean 'eventDispatchDesciptors'?
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(1759,25): error TS2694: Namespace 'Timeline' has no exported member 'TimelineMarkerStyle'.
-node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(1815,25): error TS2694: Namespace 'Timeline' has no exported member 'TimelineMarkerStyle'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(1819,21): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(1833,46): error TS2339: Property '_colorGenerator' does not exist on type '(id: string) => string'.
 node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(1834,43): error TS2339: Property '_colorGenerator' does not exist on type '(id: string) => string'.
@@ -12952,54 +11644,14 @@ node_modules/chrome-devtools-frontend/front_end/timeline/TimelineUIUtils.js(2373
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineFrameModel.js(73,29): error TS2339: Property 'lowerBound' does not exist on type 'any[]'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineFrameModel.js(74,28): error TS2339: Property 'lowerBound' does not exist on type 'any[]'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineFrameModel.js(223,43): error TS2339: Property 'peekLast' does not exist on type 'any[]'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineFrameModel.js(266,9): error TS2367: This condition will always return 'false' since the types '{ Begin: string; End: string; Complete: string; Instant: string; AsyncBegin: string; AsyncStepInto: string; AsyncStepPast: string; AsyncEnd: string; NestableAsyncBegin: string; NestableAsyncEnd: string; ... 9 more ...; DeleteObject: string; }' and 'string' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineFrameModel.js(267,24): error TS2339: Property 'id' does not exist on type 'Event'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(61,14): error TS2678: Type 'string' is not comparable to type '{ Char: string; Click: string; ContextMenu: string; FlingCancel: string; FlingStart: string; ImplSideFling: string; KeyDown: string; KeyDownRaw: string; KeyUp: string; LatencyScrollUpdate: string; ... 18 more ...; TouchStart: string; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(62,61): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Idle: string; Response: string; Scroll: string; Fling: string; Drag: string; Animation: string; Uncategorized: string; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(66,14): error TS2678: Type 'string' is not comparable to type '{ Char: string; Click: string; ContextMenu: string; FlingCancel: string; FlingStart: string; ImplSideFling: string; KeyDown: string; KeyDownRaw: string; KeyUp: string; LatencyScrollUpdate: string; ... 18 more ...; TouchStart: string; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(68,81): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Idle: string; Response: string; Scroll: string; Fling: string; Drag: string; Animation: string; Uncategorized: string; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(70,63): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Idle: string; Response: string; Scroll: string; Fling: string; Drag: string; Animation: string; Uncategorized: string; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(74,14): error TS2678: Type 'string' is not comparable to type '{ Char: string; Click: string; ContextMenu: string; FlingCancel: string; FlingStart: string; ImplSideFling: string; KeyDown: string; KeyDownRaw: string; KeyUp: string; LatencyScrollUpdate: string; ... 18 more ...; TouchStart: string; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(76,61): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Idle: string; Response: string; Scroll: string; Fling: string; Drag: string; Animation: string; Uncategorized: string; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(79,14): error TS2678: Type 'string' is not comparable to type '{ Char: string; Click: string; ContextMenu: string; FlingCancel: string; FlingStart: string; ImplSideFling: string; KeyDown: string; KeyDownRaw: string; KeyUp: string; LatencyScrollUpdate: string; ... 18 more ...; TouchStart: string; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(88,14): error TS2678: Type 'string' is not comparable to type '{ Char: string; Click: string; ContextMenu: string; FlingCancel: string; FlingStart: string; ImplSideFling: string; KeyDown: string; KeyDownRaw: string; KeyUp: string; LatencyScrollUpdate: string; ... 18 more ...; TouchStart: string; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(92,78): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Idle: string; Response: string; Scroll: string; Fling: string; Drag: string; Animation: string; Uncategorized: string; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(96,14): error TS2678: Type 'string' is not comparable to type '{ Char: string; Click: string; ContextMenu: string; FlingCancel: string; FlingStart: string; ImplSideFling: string; KeyDown: string; KeyDownRaw: string; KeyUp: string; LatencyScrollUpdate: string; ... 18 more ...; TouchStart: string; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(97,61): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Idle: string; Response: string; Scroll: string; Fling: string; Drag: string; Animation: string; Uncategorized: string; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(100,14): error TS2678: Type 'string' is not comparable to type '{ Char: string; Click: string; ContextMenu: string; FlingCancel: string; FlingStart: string; ImplSideFling: string; KeyDown: string; KeyDownRaw: string; KeyUp: string; LatencyScrollUpdate: string; ... 18 more ...; TouchStart: string; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(101,14): error TS2678: Type 'string' is not comparable to type '{ Char: string; Click: string; ContextMenu: string; FlingCancel: string; FlingStart: string; ImplSideFling: string; KeyDown: string; KeyDownRaw: string; KeyUp: string; LatencyScrollUpdate: string; ... 18 more ...; TouchStart: string; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(102,14): error TS2678: Type 'string' is not comparable to type '{ Char: string; Click: string; ContextMenu: string; FlingCancel: string; FlingStart: string; ImplSideFling: string; KeyDown: string; KeyDownRaw: string; KeyUp: string; LatencyScrollUpdate: string; ... 18 more ...; TouchStart: string; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(103,14): error TS2678: Type 'string' is not comparable to type '{ Char: string; Click: string; ContextMenu: string; FlingCancel: string; FlingStart: string; ImplSideFling: string; KeyDown: string; KeyDownRaw: string; KeyUp: string; LatencyScrollUpdate: string; ... 18 more ...; TouchStart: string; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(104,14): error TS2678: Type 'string' is not comparable to type '{ Char: string; Click: string; ContextMenu: string; FlingCancel: string; FlingStart: string; ImplSideFling: string; KeyDown: string; KeyDownRaw: string; KeyUp: string; LatencyScrollUpdate: string; ... 18 more ...; TouchStart: string; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(105,14): error TS2678: Type 'string' is not comparable to type '{ Char: string; Click: string; ContextMenu: string; FlingCancel: string; FlingStart: string; ImplSideFling: string; KeyDown: string; KeyDownRaw: string; KeyUp: string; LatencyScrollUpdate: string; ... 18 more ...; TouchStart: string; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(106,14): error TS2678: Type 'string' is not comparable to type '{ Char: string; Click: string; ContextMenu: string; FlingCancel: string; FlingStart: string; ImplSideFling: string; KeyDown: string; KeyDownRaw: string; KeyUp: string; LatencyScrollUpdate: string; ... 18 more ...; TouchStart: string; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(107,14): error TS2678: Type 'string' is not comparable to type '{ Char: string; Click: string; ContextMenu: string; FlingCancel: string; FlingStart: string; ImplSideFling: string; KeyDown: string; KeyDownRaw: string; KeyUp: string; LatencyScrollUpdate: string; ... 18 more ...; TouchStart: string; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(108,63): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Idle: string; Response: string; Scroll: string; Fling: string; Drag: string; Animation: string; Uncategorized: string; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(111,14): error TS2678: Type 'string' is not comparable to type '{ Char: string; Click: string; ContextMenu: string; FlingCancel: string; FlingStart: string; ImplSideFling: string; KeyDown: string; KeyDownRaw: string; KeyUp: string; LatencyScrollUpdate: string; ... 18 more ...; TouchStart: string; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(124,14): error TS2678: Type 'string' is not comparable to type '{ Char: string; Click: string; ContextMenu: string; FlingCancel: string; FlingStart: string; ImplSideFling: string; KeyDown: string; KeyDownRaw: string; KeyUp: string; LatencyScrollUpdate: string; ... 18 more ...; TouchStart: string; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(128,14): error TS2678: Type 'string' is not comparable to type '{ Char: string; Click: string; ContextMenu: string; FlingCancel: string; FlingStart: string; ImplSideFling: string; KeyDown: string; KeyDownRaw: string; KeyUp: string; LatencyScrollUpdate: string; ... 18 more ...; TouchStart: string; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(130,61): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Idle: string; Response: string; Scroll: string; Fling: string; Drag: string; Animation: string; Uncategorized: string; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(133,82): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Idle: string; Response: string; Scroll: string; Fling: string; Drag: string; Animation: string; Uncategorized: string; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(137,14): error TS2678: Type 'string' is not comparable to type '{ Char: string; Click: string; ContextMenu: string; FlingCancel: string; FlingStart: string; ImplSideFling: string; KeyDown: string; KeyDownRaw: string; KeyUp: string; LatencyScrollUpdate: string; ... 18 more ...; TouchStart: string; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(141,14): error TS2678: Type 'string' is not comparable to type '{ Char: string; Click: string; ContextMenu: string; FlingCancel: string; FlingStart: string; ImplSideFling: string; KeyDown: string; KeyDownRaw: string; KeyUp: string; LatencyScrollUpdate: string; ... 18 more ...; TouchStart: string; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(146,14): error TS2678: Type 'string' is not comparable to type '{ Char: string; Click: string; ContextMenu: string; FlingCancel: string; FlingStart: string; ImplSideFling: string; KeyDown: string; KeyDownRaw: string; KeyUp: string; LatencyScrollUpdate: string; ... 18 more ...; TouchStart: string; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(148,69): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Idle: string; Response: string; Scroll: string; Fling: string; Drag: string; Animation: string; Uncategorized: string; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(149,65): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Idle: string; Response: string; Scroll: string; Fling: string; Drag: string; Animation: string; Uncategorized: string; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(151,61): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Idle: string; Response: string; Scroll: string; Fling: string; Drag: string; Animation: string; Uncategorized: string; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(156,14): error TS2678: Type 'string' is not comparable to type '{ Char: string; Click: string; ContextMenu: string; FlingCancel: string; FlingStart: string; ImplSideFling: string; KeyDown: string; KeyDownRaw: string; KeyUp: string; LatencyScrollUpdate: string; ... 18 more ...; TouchStart: string; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(157,63): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Idle: string; Response: string; Scroll: string; Fling: string; Drag: string; Animation: string; Uncategorized: string; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(161,14): error TS2678: Type 'string' is not comparable to type '{ Char: string; Click: string; ContextMenu: string; FlingCancel: string; FlingStart: string; ImplSideFling: string; KeyDown: string; KeyDownRaw: string; KeyUp: string; LatencyScrollUpdate: string; ... 18 more ...; TouchStart: string; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(164,80): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Idle: string; Response: string; Scroll: string; Fling: string; Drag: string; Animation: string; Uncategorized: string; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(166,63): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Idle: string; Response: string; Scroll: string; Fling: string; Drag: string; Animation: string; Uncategorized: string; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(188,67): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Idle: string; Response: string; Scroll: string; Fling: string; Drag: string; Animation: string; Uncategorized: string; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(255,20): error TS2352: Conversion of type 'string' to type '{ Char: string; Click: string; ContextMenu: string; FlingCancel: string; FlingStart: string; ImplSideFling: string; KeyDown: string; KeyDownRaw: string; KeyUp: string; LatencyScrollUpdate: string; ... 18 more ...; TouchStart: string; }' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineIRModel.js(259,16): error TS2352: Conversion of type 'string' to type '{ Char: string; Click: string; ContextMenu: string; FlingCancel: string; FlingStart: string; ImplSideFling: string; KeyDown: string; KeyDownRaw: string; KeyUp: string; LatencyScrollUpdate: string; ... 18 more ...; TouchStart: string; }' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineFrameModel.js(268,51): error TS2694: Namespace 'SDK.TracingModel' has no exported member 'ObjectSnapshot'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineFrameModel.js(354,32): error TS2694: Namespace 'SDK.TracingModel' has no exported member 'ObjectSnapshot'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineJSProfile.js(18,47): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineJSProfile.js(31,50): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineJSProfile.js(31,89): error TS2339: Property 'depth' does not exist on type 'CPUProfileNode'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineJSProfile.js(33,38): error TS2739: Type 'ProfileNode' is missing the following properties from type 'CPUProfileNode': positionTicks, deoptReason
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineJSProfile.js(34,50): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineJSProfile.js(38,11): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Begin: string; End: string; Complete: string; Instant: string; AsyncBegin: string; AsyncStepInto: string; AsyncStepPast: string; AsyncEnd: string; NestableAsyncBegin: string; NestableAsyncEnd: string; ... 9 more ...; DeleteObject: string; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineJSProfile.js(51,26): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineJSProfile.js(52,26): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineJSProfile.js(89,9): error TS2339: Property 'ordinal' does not exist on type 'Event'.
@@ -13008,27 +11660,18 @@ node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineJSProfile
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineJSProfile.js(142,33): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineJSProfile.js(172,35): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineJSProfile.js(179,35): error TS2339: Property 'peekLast' does not exist on type 'any[]'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineJSProfile.js(190,82): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Begin: string; End: string; Complete: string; Instant: string; AsyncBegin: string; AsyncStepInto: string; AsyncStepPast: string; AsyncEnd: string; NestableAsyncBegin: string; NestableAsyncEnd: string; ... 9 more ...; DeleteObject: string; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineJSProfile.js(192,22): error TS2339: Property 'ordinal' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineJSProfile.js(192,34): error TS2339: Property 'ordinal' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineJSProfile.js(209,24): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineJSProfile.js(222,7): error TS2322: Type 'string' is not assignable to type '{ 'Compile': string; 'Parse': string; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineJSProfile.js(224,7): error TS2322: Type 'string' is not assignable to type '{ 'Compile': string; 'Parse': string; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineJSProfile.js(230,42): error TS2694: Namespace 'SDK.TracingManager' has no exported member 'EventPayload'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineJSProfile.js(289,37): error TS2694: Namespace 'SDK.TracingManager' has no exported member 'EventPayload'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineJSProfile.js(292,50): error TS2694: Namespace 'SDK.TracingManager' has no exported member 'EventPayload'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(41,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(42,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(59,41): error TS2345: Argument of type '{ Begin: string; End: string; Complete: string; Instant: string; AsyncBegin: string; AsyncStepInto: string; AsyncStepPast: string; AsyncEnd: string; NestableAsyncBegin: string; NestableAsyncEnd: string; ... 9 more ...; DeleteObject: string; }' is not assignable to parameter of type 'string'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(59,82): error TS2345: Argument of type '{ Begin: string; End: string; Complete: string; Instant: string; AsyncBegin: string; AsyncStepInto: string; AsyncStepPast: string; AsyncEnd: string; NestableAsyncBegin: string; NestableAsyncEnd: string; ... 9 more ...; DeleteObject: string; }' is not assignable to parameter of type 'string'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(61,36): error TS2339: Property 'peekLast' does not exist on type 'Event[]'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(69,51): error TS2339: Property 'peekLast' does not exist on type 'Event[]'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(69,51): error TS2339: Property 'peekLast' does not exist on type 'any[]'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(81,24): error TS2339: Property 'upperBound' does not exist on type 'Event[]'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(216,44): error TS2694: Namespace 'TimelineModel.TimelineModel' has no exported member 'MetadataEvents'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(179,51): error TS2339: Property 'peekLast' does not exist on type 'Event[]'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(274,54): error TS2339: Property 'valuesArray' does not exist on type 'Set<any>'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(294,81): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Begin: string; End: string; Complete: string; Instant: string; AsyncBegin: string; AsyncStepInto: string; AsyncStepPast: string; AsyncEnd: string; NestableAsyncBegin: string; NestableAsyncEnd: string; ... 9 more ...; DeleteObject: string; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(306,41): error TS2339: Property 'lowerBound' does not exist on type 'Event[]'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(314,70): error TS2345: Argument of type 'string' is not assignable to parameter of type '{ Begin: string; End: string; Complete: string; Instant: string; AsyncBegin: string; AsyncStepInto: string; AsyncStepPast: string; AsyncEnd: string; NestableAsyncBegin: string; NestableAsyncEnd: string; ... 9 more ...; DeleteObject: string; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(317,32): error TS2339: Property 'lowerBound' does not exist on type 'Event[]'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(320,29): error TS2339: Property 'lowerBound' does not exist on type 'Event[]'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(377,34): error TS2339: Property 'peekLast' does not exist on type 'Event[]'.
@@ -13038,23 +11681,17 @@ node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(439,32): error TS2339: Property 'mergeOrdered' does not exist on type 'Event[]'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(470,20): error TS2339: Property 'lowerBound' does not exist on type 'Event[]'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(476,46): error TS2339: Property 'peekLast' does not exist on type 'any[]'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(480,42): error TS2345: Argument of type '{ Begin: string; End: string; Complete: string; Instant: string; AsyncBegin: string; AsyncStepInto: string; AsyncStepPast: string; AsyncEnd: string; NestableAsyncBegin: string; NestableAsyncEnd: string; ... 9 more ...; DeleteObject: string; }' is not assignable to parameter of type 'string'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(482,35): error TS2339: Property 'peekLast' does not exist on type 'any[]'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(542,37): error TS2339: Property 'lowerBound' does not exist on type 'AsyncEvent[]'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(601,68): error TS2339: Property 'peekLast' does not exist on type 'any[]'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(607,46): error TS2339: Property 'peekLast' does not exist on type 'any[]'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(716,44): error TS2694: Namespace 'SDK.TracingModel' has no exported member 'ObjectSnapshot'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(762,13): error TS2403: Subsequent variable declarations must have the same type.  Variable 'frameId' must be of type 'any', but here has type 'string'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(801,40): error TS2339: Property 'bind_id' does not exist on type 'Event'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(811,7): error TS2322: Type 'symbol' is not assignable to type '{ animation: symbol; console: symbol; userTiming: symbol; input: symbol; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(813,7): error TS2322: Type 'symbol' is not assignable to type '{ animation: symbol; console: symbol; userTiming: symbol; input: symbol; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(815,7): error TS2322: Type 'symbol' is not assignable to type '{ animation: symbol; console: symbol; userTiming: symbol; input: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(818,39): error TS2339: Property 'peekLast' does not exist on type 'Event[]'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(823,18): error TS2339: Property 'causedFrame' does not exist on type 'AsyncEvent'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(827,109): error TS2339: Property 'causedFrame' does not exist on type 'AsyncEvent'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(836,7): error TS2322: Type 'symbol' is not assignable to type '{ animation: symbol; console: symbol; userTiming: symbol; input: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(861,23): error TS2339: Property 'mergeOrdered' does not exist on type 'AsyncEvent[]'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(1260,29): error TS2339: Property 'MetadataEvents' does not exist on type 'typeof TimelineModel'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(1423,31): error TS2694: Namespace 'TimelineModel' has no exported member 'InvalidationCause'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(1433,61): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(1524,30): error TS2488: Type 'Iterator<InvalidationTrackingEvent, any, undefined>' must have a '[Symbol.iterator]()' method that returns an iterator.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(1532,22): error TS2339: Property 'linkedRecalcStyleEvent' does not exist on type 'InvalidationTrackingEvent'.
@@ -13068,19 +11705,16 @@ node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(1732,45): error TS2339: Property '_typeToInitiator' does not exist on type 'typeof TimelineAsyncEventTracker'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(1736,49): error TS2339: Property '_typeToInitiator' does not exist on type 'typeof TimelineAsyncEventTracker'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(1744,65): error TS2339: Property '_typeToInitiator' does not exist on type 'typeof TimelineAsyncEventTracker'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(1745,13): error TS2352: Conversion of type 'string' to type '{ Task: string; Program: string; EventDispatch: string; GPUTask: string; Animation: string; RequestMainThreadFrame: string; BeginFrame: string; NeedsBeginFrameChanged: string; BeginMainThreadFrame: string; ... 102 more ...; AsyncTask: string; }' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(1748,27): error TS2352: Conversion of type 'string' to type '{ Task: string; Program: string; EventDispatch: string; GPUTask: string; Animation: string; RequestMainThreadFrame: string; BeginFrame: string; NeedsBeginFrameChanged: string; BeginMainThreadFrame: string; ... 102 more ...; AsyncTask: string; }' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(1749,65): error TS2339: Property '_asyncEvents' does not exist on type 'typeof TimelineAsyncEventTracker'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(1780,33): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(1782,34): error TS2694: Namespace 'SDK.TracingModel' has no exported member 'ObjectSnapshot'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(1811,25): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModel.js(1819,32): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModelFilter.js(30,35): error TS2345: Argument of type '{ Task: string; Program: string; EventDispatch: string; GPUTask: string; Animation: string; RequestMainThreadFrame: string; BeginFrame: string; NeedsBeginFrameChanged: string; BeginMainThreadFrame: string; ... 102 more ...; AsyncTask: string; }' is not assignable to parameter of type 'string'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModelFilter.js(38,7): error TS2322: Type 'string' is not assignable to type '{ Task: string; Program: string; EventDispatch: string; GPUTask: string; Animation: string; RequestMainThreadFrame: string; BeginFrame: string; NeedsBeginFrameChanged: string; BeginMainThreadFrame: string; ... 102 more ...; AsyncTask: string; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModelFilter.js(40,7): error TS2322: Type 'string' is not assignable to type '{ Task: string; Program: string; EventDispatch: string; GPUTask: string; Animation: string; RequestMainThreadFrame: string; BeginFrame: string; NeedsBeginFrameChanged: string; BeginMainThreadFrame: string; ... 102 more ...; AsyncTask: string; }'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModelFilter.js(42,7): error TS2322: Type 'string' is not assignable to type '{ Task: string; Program: string; EventDispatch: string; GPUTask: string; Animation: string; RequestMainThreadFrame: string; BeginFrame: string; NeedsBeginFrameChanged: string; BeginMainThreadFrame: string; ... 102 more ...; AsyncTask: string; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModelFilter.js(43,22): error TS1110: Type expected.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineModelFilter.js(62,38): error TS2345: Argument of type '{ Task: string; Program: string; EventDispatch: string; GPUTask: string; Animation: string; RequestMainThreadFrame: string; BeginFrame: string; NeedsBeginFrameChanged: string; BeginMainThreadFrame: string; ... 102 more ...; AsyncTask: string; }' is not assignable to parameter of type 'string'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineProfileTree.js(72,49): error TS2694: Namespace 'TimelineModel.TimelineProfileTree' has no exported member 'TopDownNode'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineProfileTree.js(74,26): error TS2502: 'parent' is referenced directly or indirectly in its own type annotation.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineProfileTree.js(103,58): error TS2694: Namespace 'TimelineModel.TimelineProfileTree' has no exported member 'TopDownNode'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineProfileTree.js(106,63): error TS2694: Namespace 'TimelineModel.TimelineProfileTree' has no exported member 'TopDownNode'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineProfileTree.js(168,31): error TS2345: Argument of type 'string | symbol' is not assignable to parameter of type 'string'.
   Type 'symbol' is not assignable to type 'string'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineProfileTree.js(172,22): error TS2345: Argument of type 'string | symbol' is not assignable to parameter of type 'string'.
@@ -13102,26 +11736,19 @@ node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineProfileTr
   'BottomUpNode' is assignable to the constraint of type 'this', but 'this' could be instantiated with a different subtype of constraint 'BottomUpNode'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineProfileTree.js(559,23): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TimelineProfileTree.js(563,33): error TS2694: Namespace 'Protocol' has no exported member 'Runtime'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TracingLayerTree.js(6,41): error TS2694: Namespace 'TimelineModel' has no exported member 'TracingLayerPayload'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TracingLayerTree.js(38,45): error TS2694: Namespace 'TimelineModel' has no exported member 'TracingLayerTile'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TracingLayerTree.js(44,29): error TS2694: Namespace 'TimelineModel' has no exported member 'TracingLayerPayload'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TracingLayerTree.js(45,36): error TS2694: Namespace 'TimelineModel' has no exported member 'TracingLayerPayload'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TracingLayerTree.js(81,37): error TS2694: Namespace 'TimelineModel' has no exported member 'TracingLayerTile'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TracingLayerTree.js(91,29): error TS2694: Namespace 'SDK' has no exported member 'SnapshotWithRect'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TracingLayerTree.js(97,39): error TS2694: Namespace 'SDK' has no exported member 'SnapshotWithRect'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TracingLayerTree.js(102,39): error TS2694: Namespace 'SDK' has no exported member 'SnapshotWithRect'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TracingLayerTree.js(120,29): error TS2694: Namespace 'TimelineModel' has no exported member 'TracingLayerPayload'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TracingLayerTree.js(142,29): error TS2694: Namespace 'TimelineModel' has no exported member 'TracingLayerPayload'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TracingLayerTree.js(160,29): error TS2694: Namespace 'TimelineModel' has no exported member 'TracingLayerPayload'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TracingLayerTree.js(168,29): error TS2694: Namespace 'TimelineModel' has no exported member 'TracingLayerPayload'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TracingLayerTree.js(342,25): error TS2694: Namespace 'Protocol' has no exported member 'DOM'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TracingLayerTree.js(350,33): error TS2694: Namespace 'Protocol' has no exported member 'LayerTree'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TracingLayerTree.js(375,36): error TS2694: Namespace 'SDK' has no exported member 'SnapshotWithRect'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TracingLayerTree.js(388,29): error TS2694: Namespace 'SDK' has no exported member 'SnapshotWithRect'.
-node_modules/chrome-devtools-frontend/front_end/timeline_model/TracingLayerTree.js(438,29): error TS2694: Namespace 'TimelineModel' has no exported member 'TracingLayerPayload'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TracingLayerTree.js(442,17): error TS2339: Property 'non_fast_scrollable_region' does not exist on type '{ bounds: { height: number; width: number; }; children: ...[]; layer_id: number; position: number[]; scroll_offset: number[]; layer_quad: number[]; draws_content: number; gpu_memory_usage: number; transform: number[]; owner_node: number; compositing_reasons: string[]; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TracingLayerTree.js(444,19): error TS2339: Property 'non_fast_scrollable_region' does not exist on type '{ bounds: { height: number; width: number; }; children: ...[]; layer_id: number; position: number[]; scroll_offset: number[]; layer_quad: number[]; draws_content: number; gpu_memory_usage: number; transform: number[]; owner_node: number; compositing_reasons: string[]; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TracingLayerTree.js(444,90): error TS2339: Property 'name' does not exist on type 'string'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TracingLayerTree.js(446,17): error TS2339: Property 'touch_event_handler_region' does not exist on type '{ bounds: { height: number; width: number; }; children: ...[]; layer_id: number; position: number[]; scroll_offset: number[]; layer_quad: number[]; draws_content: number; gpu_memory_usage: number; transform: number[]; owner_node: number; compositing_reasons: string[]; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TracingLayerTree.js(448,19): error TS2339: Property 'touch_event_handler_region' does not exist on type '{ bounds: { height: number; width: number; }; children: ...[]; layer_id: number; position: number[]; scroll_offset: number[]; layer_quad: number[]; draws_content: number; gpu_memory_usage: number; transform: number[]; owner_node: number; compositing_reasons: string[]; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TracingLayerTree.js(448,90): error TS2339: Property 'name' does not exist on type 'string'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TracingLayerTree.js(450,17): error TS2339: Property 'wheel_event_handler_region' does not exist on type '{ bounds: { height: number; width: number; }; children: ...[]; layer_id: number; position: number[]; scroll_offset: number[]; layer_quad: number[]; draws_content: number; gpu_memory_usage: number; transform: number[]; owner_node: number; compositing_reasons: string[]; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TracingLayerTree.js(452,19): error TS2339: Property 'wheel_event_handler_region' does not exist on type '{ bounds: { height: number; width: number; }; children: ...[]; layer_id: number; position: number[]; scroll_offset: number[]; layer_quad: number[]; draws_content: number; gpu_memory_usage: number; transform: number[]; owner_node: number; compositing_reasons: string[]; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TracingLayerTree.js(452,90): error TS2339: Property 'name' does not exist on type 'string'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TracingLayerTree.js(454,17): error TS2339: Property 'scroll_event_handler_region' does not exist on type '{ bounds: { height: number; width: number; }; children: ...[]; layer_id: number; position: number[]; scroll_offset: number[]; layer_quad: number[]; draws_content: number; gpu_memory_usage: number; transform: number[]; owner_node: number; compositing_reasons: string[]; }'.
+node_modules/chrome-devtools-frontend/front_end/timeline_model/TracingLayerTree.js(456,19): error TS2339: Property 'scroll_event_handler_region' does not exist on type '{ bounds: { height: number; width: number; }; children: ...[]; layer_id: number; position: number[]; scroll_offset: number[]; layer_quad: number[]; draws_content: number; gpu_memory_usage: number; transform: number[]; owner_node: number; compositing_reasons: string[]; }'.
 node_modules/chrome-devtools-frontend/front_end/timeline_model/TracingLayerTree.js(456,90): error TS2339: Property 'name' does not exist on type 'string'.
 node_modules/chrome-devtools-frontend/front_end/ui/ARIAUtils.js(91,41): error TS2345: Argument of type 'boolean' is not assignable to parameter of type 'string'.
 node_modules/chrome-devtools-frontend/front_end/ui/ARIAUtils.js(109,41): error TS2345: Argument of type 'boolean' is not assignable to parameter of type 'string'.
@@ -13135,27 +11762,27 @@ node_modules/chrome-devtools-frontend/front_end/ui/Context.js(31,33): error TS11
 node_modules/chrome-devtools-frontend/front_end/ui/Context.js(37,36): error TS2345: Argument of type 'new (...arg1: any[]) => T' is not assignable to parameter of type 'new () => any'.
 node_modules/chrome-devtools-frontend/front_end/ui/Context.js(49,38): error TS1110: Type expected.
 node_modules/chrome-devtools-frontend/front_end/ui/Context.js(50,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/ui/Context.js(50,31): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/ui/Context.js(63,38): error TS1110: Type expected.
 node_modules/chrome-devtools-frontend/front_end/ui/Context.js(64,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/ui/Context.js(64,31): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/ui/Context.js(73,30): error TS2339: Property 'remove' does not exist on type 'Map<any, any>'.
 node_modules/chrome-devtools-frontend/front_end/ui/Context.js(77,33): error TS1110: Type expected.
 node_modules/chrome-devtools-frontend/front_end/ui/Context.js(86,45): error TS1110: Type expected.
 node_modules/chrome-devtools-frontend/front_end/ui/ContextMenu.js(42,15): error TS2502: 'contextMenu' is referenced directly or indirectly in its own type annotation.
-node_modules/chrome-devtools-frontend/front_end/ui/ContextMenu.js(81,41): error TS2694: Namespace 'InspectorFrontendHostAPI' has no exported member 'ContextMenuDescriptor'.
 node_modules/chrome-devtools-frontend/front_end/ui/ContextMenu.js(87,18): error TS2339: Property '_customElement' does not exist on type 'ContextMenuItem'.
 node_modules/chrome-devtools-frontend/front_end/ui/ContextMenu.js(88,33): error TS2339: Property '_customElement' does not exist on type 'ContextMenuItem'.
+node_modules/chrome-devtools-frontend/front_end/ui/ContextMenu.js(91,9): error TS2739: Type '{ type: string; id: any; label: string; enabled: boolean; }' is missing the following properties from type '{ type: string; id: number; label: string; enabled: boolean; checked: boolean; subItems: ...[]; }': checked, subItems
+node_modules/chrome-devtools-frontend/front_end/ui/ContextMenu.js(93,9): error TS2739: Type '{ type: string; }' is missing the following properties from type '{ type: string; id: number; label: string; enabled: boolean; checked: boolean; subItems: ...[]; }': id, label, enabled, checked, subItems
+node_modules/chrome-devtools-frontend/front_end/ui/ContextMenu.js(95,9): error TS2741: Property 'subItems' is missing in type '{ type: string; id: any; label: string; checked: boolean; enabled: boolean; }' but required in type '{ type: string; id: number; label: string; enabled: boolean; checked: boolean; subItems: ...[]; }'.
 node_modules/chrome-devtools-frontend/front_end/ui/ContextMenu.js(123,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/ui/ContextMenu.js(140,10): error TS2339: Property '_customElement' does not exist on type 'ContextMenuItem'.
 node_modules/chrome-devtools-frontend/front_end/ui/ContextMenu.js(175,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/ui/ContextMenu.js(299,41): error TS2694: Namespace 'InspectorFrontendHostAPI' has no exported member 'ContextMenuDescriptor'.
-node_modules/chrome-devtools-frontend/front_end/ui/ContextMenu.js(302,42): error TS2694: Namespace 'InspectorFrontendHostAPI' has no exported member 'ContextMenuDescriptor'.
+node_modules/chrome-devtools-frontend/front_end/ui/ContextMenu.js(303,9): error TS2739: Type '{ type: string; label: string; enabled: boolean; subItems: undefined[]; }' is missing the following properties from type '{ type: string; id: number; label: string; enabled: boolean; checked: boolean; subItems: ...[]; }': id, checked
 node_modules/chrome-devtools-frontend/front_end/ui/ContextMenu.js(309,40): error TS2339: Property 'peekLast' does not exist on type 'ContextMenuSection[]'.
+node_modules/chrome-devtools-frontend/front_end/ui/ContextMenu.js(310,30): error TS2345: Argument of type '{ type: string; }' is not assignable to parameter of type '{ type: string; id: number; label: string; enabled: boolean; checked: boolean; subItems: ...[]; }'.
+  Type '{ type: string; }' is missing the following properties from type '{ type: string; id: number; label: string; enabled: boolean; checked: boolean; subItems: ...[]; }': id, label, enabled, checked, subItems
 node_modules/chrome-devtools-frontend/front_end/ui/ContextMenu.js(339,39): error TS2339: Property 'x' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/ui/ContextMenu.js(340,39): error TS2339: Property 'y' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/ui/ContextMenu.js(344,24): error TS2339: Property 'deepElementFromPoint' does not exist on type 'Event'.
-node_modules/chrome-devtools-frontend/front_end/ui/ContextMenu.js(352,24): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/ui/ContextMenu.js(355,22): error TS2339: Property '_useSoftMenu' does not exist on type 'typeof ContextMenu'.
 node_modules/chrome-devtools-frontend/front_end/ui/ContextMenu.js(383,20): error TS2339: Property '_pendingMenu' does not exist on type 'typeof ContextMenu'.
 node_modules/chrome-devtools-frontend/front_end/ui/ContextMenu.js(390,26): error TS2339: Property '_pendingMenu' does not exist on type 'typeof ContextMenu'.
@@ -13165,11 +11792,7 @@ node_modules/chrome-devtools-frontend/front_end/ui/ContextMenu.js(418,45): error
 node_modules/chrome-devtools-frontend/front_end/ui/ContextMenu.js(420,46): error TS2339: Property 'ownerDocument' does not exist on type 'EventTarget'.
 node_modules/chrome-devtools-frontend/front_end/ui/ContextMenu.js(422,101): error TS2339: Property 'ownerDocument' does not exist on type 'EventTarget'.
 node_modules/chrome-devtools-frontend/front_end/ui/ContextMenu.js(442,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/ui/ContextMenu.js(450,49): error TS2694: Namespace 'InspectorFrontendHostAPI' has no exported member 'ContextMenuDescriptor'.
-node_modules/chrome-devtools-frontend/front_end/ui/ContextMenu.js(453,57): error TS2694: Namespace 'InspectorFrontendHostAPI' has no exported member 'ContextMenuDescriptor'.
-node_modules/chrome-devtools-frontend/front_end/ui/ContextMenu.js(457,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/ui/Dialog.js(35,25): error TS2339: Property 'tabIndex' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/ui/Dialog.js(39,35): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ BlockedByGlassPane: symbol; PierceGlassPane: symbol; PierceContents: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/ui/Dialog.js(42,13): error TS2339: Property 'consume' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/ui/Dialog.js(55,24): error TS2339: Property '_instance' does not exist on type 'typeof Dialog'.
 node_modules/chrome-devtools-frontend/front_end/ui/Dialog.js(65,19): error TS2339: Property '_instance' does not exist on type 'typeof Dialog'.
@@ -13192,7 +11815,6 @@ node_modules/chrome-devtools-frontend/front_end/ui/DropTarget.js(78,30): error T
 node_modules/chrome-devtools-frontend/front_end/ui/DropTarget.js(85,11): error TS2339: Property 'consume' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/ui/EmptyWidget.js(42,41): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/FilterBar.js(46,101): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/ui/FilterBar.js(87,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/ui/FilterBar.js(136,18): error TS2339: Property 'removeChildren' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/FilterBar.js(146,1): error TS8022: JSDoc '@extends' is not attached to a class.
 node_modules/chrome-devtools-frontend/front_end/ui/FilterBar.js(155,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
@@ -13201,10 +11823,6 @@ node_modules/chrome-devtools-frontend/front_end/ui/FilterBar.js(175,52): error T
 node_modules/chrome-devtools-frontend/front_end/ui/FilterBar.js(180,24): error TS2339: Property 'title' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/FilterBar.js(180,39): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/ui/FilterBar.js(181,40): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/ui/FilterBar.js(184,76): error TS2694: Namespace 'UI.SuggestBox' has no exported member 'Suggestions'.
-node_modules/chrome-devtools-frontend/front_end/ui/FilterBar.js(192,39): error TS2694: Namespace 'UI.SuggestBox' has no exported member 'Suggestions'.
-node_modules/chrome-devtools-frontend/front_end/ui/FilterBar.js(235,74): error TS2694: Namespace 'UI.SuggestBox' has no exported member 'Suggestions'.
-node_modules/chrome-devtools-frontend/front_end/ui/FilterBar.js(253,46): error TS2694: Namespace 'UI.NamedBitSetFilterUI' has no exported member 'Item'.
 node_modules/chrome-devtools-frontend/front_end/ui/FilterBar.js(259,26): error TS2339: Property 'title' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/FilterBar.js(265,59): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/ui/FilterBar.js(266,26): error TS2339: Property 'createChild' does not exist on type 'Element'.
@@ -13218,12 +11836,9 @@ node_modules/chrome-devtools-frontend/front_end/ui/FilterBar.js(351,32): error T
 node_modules/chrome-devtools-frontend/front_end/ui/FilterBar.js(351,46): error TS2339: Property 'altKey' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/ui/FilterBar.js(351,59): error TS2339: Property 'shiftKey' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/ui/FilterBar.js(352,37): error TS2339: Property 'typeName' does not exist on type 'EventTarget'.
-node_modules/chrome-devtools-frontend/front_end/ui/FilterBar.js(375,24): error TS2300: Duplicate identifier 'Item'.
-node_modules/chrome-devtools-frontend/front_end/ui/FilterBar.js(375,24): error TS2339: Property 'Item' does not exist on type 'typeof NamedBitSetFilterUI'.
-node_modules/chrome-devtools-frontend/front_end/ui/FilterSuggestionBuilder.js(21,39): error TS2694: Namespace 'UI.SuggestBox' has no exported member 'Suggestions'.
-node_modules/chrome-devtools-frontend/front_end/ui/ForwardedInputEventHandler.js(14,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/ui/Fragment.js(12,49): error TS2694: Namespace 'UI.Fragment' has no exported member '_State'.
-node_modules/chrome-devtools-frontend/front_end/ui/Fragment.js(84,28): error TS2694: Namespace 'UI.Fragment' has no exported member '_Template'.
+node_modules/chrome-devtools-frontend/front_end/ui/FilterSuggestionBuilder.js(51,5): error TS2322: Type 'Promise<{ text: string; }[]>' is not assignable to type 'Promise<{ text: string; subtitle: string; iconType: string; priority: number; isSecondary: boolean; title: string; }[]>'.
+  Type '{ text: string; }[]' is not assignable to type '{ text: string; subtitle: string; iconType: string; priority: number; isSecondary: boolean; title: string; }[]'.
+    Type '{ text: string; }' is missing the following properties from type '{ text: string; subtitle: string; iconType: string; priority: number; isSecondary: boolean; title: string; }': subtitle, iconType, priority, isSecondary, title
 node_modules/chrome-devtools-frontend/front_end/ui/Fragment.js(113,55): error TS2339: Property 'hasAttributes' does not exist on type 'Node'.
 node_modules/chrome-devtools-frontend/front_end/ui/Fragment.js(114,18): error TS2339: Property 'hasAttribute' does not exist on type 'Node'.
 node_modules/chrome-devtools-frontend/front_end/ui/Fragment.js(116,39): error TS2339: Property 'getAttribute' does not exist on type 'Node'.
@@ -13240,25 +11855,16 @@ node_modules/chrome-devtools-frontend/front_end/ui/Fragment.js(153,14): error TS
 node_modules/chrome-devtools-frontend/front_end/ui/Fragment.js(166,103): error TS2339: Property 'data' does not exist on type 'Node'.
 node_modules/chrome-devtools-frontend/front_end/ui/Fragment.js(171,22): error TS2339: Property 'classList' does not exist on type 'Node'.
 node_modules/chrome-devtools-frontend/front_end/ui/Fragment.js(174,21): error TS2339: Property 'remove' does not exist on type 'Node'.
-node_modules/chrome-devtools-frontend/front_end/ui/Fragment.js(179,27): error TS2694: Namespace 'UI.Fragment' has no exported member '_Template'.
+node_modules/chrome-devtools-frontend/front_end/ui/Fragment.js(184,80): error TS2339: Property 'content' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/Fragment.js(247,24): error TS2488: Type 'NodeListOf<Element>' must have a '[Symbol.iterator]()' method that returns an iterator.
 node_modules/chrome-devtools-frontend/front_end/ui/Fragment.js(273,33): error TS2694: Namespace 'UI.Fragment' has no exported member '_Bind'.
-node_modules/chrome-devtools-frontend/front_end/ui/Fragment.js(276,13): error TS2551: Property '_Template' does not exist on type 'typeof Fragment'. Did you mean '_template'?
-node_modules/chrome-devtools-frontend/front_end/ui/Fragment.js(286,13): error TS2339: Property '_State' does not exist on type 'typeof Fragment'.
 node_modules/chrome-devtools-frontend/front_end/ui/Fragment.js(292,2): error TS1131: Property or signature expected.
 node_modules/chrome-devtools-frontend/front_end/ui/Fragment.js(307,13): error TS2339: Property '_Bind' does not exist on type 'typeof Fragment'.
 node_modules/chrome-devtools-frontend/front_end/ui/Geometry.js(210,15): error TS2304: Cannot find name 'CSSMatrix'.
 node_modules/chrome-devtools-frontend/front_end/ui/Geometry.js(272,13): error TS2304: Cannot find name 'CSSMatrix'.
 node_modules/chrome-devtools-frontend/front_end/ui/Geometry.js(316,13): error TS2304: Cannot find name 'CSSMatrix'.
-node_modules/chrome-devtools-frontend/front_end/ui/GlassPane.js(15,35): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ BlockedByGlassPane: symbol; PierceGlassPane: symbol; PierceContents: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/ui/GlassPane.js(18,17): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/ui/GlassPane.js(66,30): error TS2367: This condition will always return 'true' since the types '{ BlockedByGlassPane: symbol; PierceGlassPane: symbol; PierceContents: symbol; }' and 'symbol' have no overlap.
-node_modules/chrome-devtools-frontend/front_end/ui/GlassPane.js(68,30): error TS2367: This condition will always return 'false' since the types '{ BlockedByGlassPane: symbol; PierceGlassPane: symbol; PierceContents: symbol; }' and 'symbol' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/ui/GlassPane.js(72,15): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/ui/GlassPane.js(90,5): error TS2322: Type '{ SetExactSize: symbol; SetExactWidthMaxHeight: symbol; MeasureContent: symbol; }' is not assignable to type 'symbol'.
-node_modules/chrome-devtools-frontend/front_end/ui/GlassPane.js(118,5): error TS2322: Type '{ PreferTop: symbol; PreferBottom: symbol; PreferLeft: symbol; PreferRight: symbol; }' is not assignable to type 'symbol'.
-node_modules/chrome-devtools-frontend/front_end/ui/GlassPane.js(125,5): error TS2322: Type 'boolean' is not assignable to type 'symbol'.
-node_modules/chrome-devtools-frontend/front_end/ui/GlassPane.js(126,51): error TS2367: This condition will always return 'true' since the types 'boolean' and 'symbol' have no overlap.
 node_modules/chrome-devtools-frontend/front_end/ui/GlassPane.js(136,18): error TS2339: Property 'style' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/GlassPane.js(157,22): error TS2339: Property 'deepElementFromPoint' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/ui/GlassPane.js(158,38): error TS2339: Property 'isSelfOrAncestor' does not exist on type 'Element'.
@@ -13293,35 +11899,72 @@ node_modules/chrome-devtools-frontend/front_end/ui/Icon.js(9,1): error TS8022: J
 node_modules/chrome-devtools-frontend/front_end/ui/Icon.js(21,18): error TS2339: Property '_constructor' does not exist on type 'typeof Icon'.
 node_modules/chrome-devtools-frontend/front_end/ui/Icon.js(22,15): error TS2339: Property '_constructor' does not exist on type 'typeof Icon'.
 node_modules/chrome-devtools-frontend/front_end/ui/Icon.js(24,53): error TS2339: Property '_constructor' does not exist on type 'typeof Icon'.
-node_modules/chrome-devtools-frontend/front_end/ui/Icon.js(36,25): error TS2694: Namespace 'UI.Icon' has no exported member 'Descriptor'.
-node_modules/chrome-devtools-frontend/front_end/ui/Icon.js(38,25): error TS2694: Namespace 'UI.Icon' has no exported member 'SpriteSheet'.
-node_modules/chrome-devtools-frontend/front_end/ui/Icon.js(105,9): error TS2300: Duplicate identifier 'Descriptor'.
-node_modules/chrome-devtools-frontend/front_end/ui/Icon.js(105,9): error TS2551: Property 'Descriptor' does not exist on type 'typeof Icon'. Did you mean 'Descriptors'?
-node_modules/chrome-devtools-frontend/front_end/ui/Icon.js(108,9): error TS2551: Property 'SpriteSheet' does not exist on type 'typeof Icon'. Did you mean 'SpriteSheets'?
-node_modules/chrome-devtools-frontend/front_end/ui/Icon.js(110,21): error TS2694: Namespace 'UI.Icon' has no exported member 'SpriteSheet'.
-node_modules/chrome-devtools-frontend/front_end/ui/Icon.js(118,21): error TS2694: Namespace 'UI.Icon' has no exported member 'Descriptor'.
+node_modules/chrome-devtools-frontend/front_end/ui/Icon.js(81,70): error TS2339: Property 'invert' does not exist on type '{ position: string; spritesheet: string; isMask: boolean; }'.
+node_modules/chrome-devtools-frontend/front_end/ui/Icon.js(88,27): error TS2339: Property 'coordinates' does not exist on type '{ position: string; spritesheet: string; isMask: boolean; }'.
+node_modules/chrome-devtools-frontend/front_end/ui/Icon.js(93,24): error TS2339: Property 'coordinates' does not exist on type '{ position: string; spritesheet: string; isMask: boolean; }'.
+node_modules/chrome-devtools-frontend/front_end/ui/Icon.js(98,32): error TS2339: Property 'coordinates' does not exist on type '{ position: string; spritesheet: string; isMask: boolean; }'.
+node_modules/chrome-devtools-frontend/front_end/ui/Icon.js(98,68): error TS2339: Property 'coordinates' does not exist on type '{ position: string; spritesheet: string; isMask: boolean; }'.
+node_modules/chrome-devtools-frontend/front_end/ui/Icon.js(121,3): error TS2741: Property 'isMask' is missing in type '{ position: string; spritesheet: string; }' but required in type '{ position: string; spritesheet: string; isMask: boolean; }'.
+node_modules/chrome-devtools-frontend/front_end/ui/Icon.js(124,3): error TS2741: Property 'isMask' is missing in type '{ position: string; spritesheet: string; }' but required in type '{ position: string; spritesheet: string; isMask: boolean; }'.
+node_modules/chrome-devtools-frontend/front_end/ui/Icon.js(126,3): error TS2741: Property 'isMask' is missing in type '{ position: string; spritesheet: string; }' but required in type '{ position: string; spritesheet: string; isMask: boolean; }'.
+node_modules/chrome-devtools-frontend/front_end/ui/Icon.js(127,3): error TS2741: Property 'isMask' is missing in type '{ position: string; spritesheet: string; }' but required in type '{ position: string; spritesheet: string; isMask: boolean; }'.
+node_modules/chrome-devtools-frontend/front_end/ui/Icon.js(128,3): error TS2741: Property 'isMask' is missing in type '{ position: string; spritesheet: string; }' but required in type '{ position: string; spritesheet: string; isMask: boolean; }'.
+node_modules/chrome-devtools-frontend/front_end/ui/Icon.js(131,3): error TS2741: Property 'isMask' is missing in type '{ position: string; spritesheet: string; }' but required in type '{ position: string; spritesheet: string; isMask: boolean; }'.
+node_modules/chrome-devtools-frontend/front_end/ui/Icon.js(132,3): error TS2741: Property 'isMask' is missing in type '{ position: string; spritesheet: string; }' but required in type '{ position: string; spritesheet: string; isMask: boolean; }'.
+node_modules/chrome-devtools-frontend/front_end/ui/Icon.js(133,3): error TS2741: Property 'isMask' is missing in type '{ position: string; spritesheet: string; }' but required in type '{ position: string; spritesheet: string; isMask: boolean; }'.
+node_modules/chrome-devtools-frontend/front_end/ui/Icon.js(134,3): error TS2741: Property 'isMask' is missing in type '{ position: string; spritesheet: string; }' but required in type '{ position: string; spritesheet: string; isMask: boolean; }'.
+node_modules/chrome-devtools-frontend/front_end/ui/Icon.js(135,3): error TS2741: Property 'isMask' is missing in type '{ position: string; spritesheet: string; }' but required in type '{ position: string; spritesheet: string; isMask: boolean; }'.
+node_modules/chrome-devtools-frontend/front_end/ui/Icon.js(137,3): error TS2741: Property 'isMask' is missing in type '{ position: string; spritesheet: string; }' but required in type '{ position: string; spritesheet: string; isMask: boolean; }'.
+node_modules/chrome-devtools-frontend/front_end/ui/Icon.js(138,3): error TS2741: Property 'isMask' is missing in type '{ position: string; spritesheet: string; }' but required in type '{ position: string; spritesheet: string; isMask: boolean; }'.
+node_modules/chrome-devtools-frontend/front_end/ui/Icon.js(140,3): error TS2741: Property 'isMask' is missing in type '{ position: string; spritesheet: string; }' but required in type '{ position: string; spritesheet: string; isMask: boolean; }'.
+node_modules/chrome-devtools-frontend/front_end/ui/Icon.js(141,3): error TS2741: Property 'isMask' is missing in type '{ position: string; spritesheet: string; }' but required in type '{ position: string; spritesheet: string; isMask: boolean; }'.
+node_modules/chrome-devtools-frontend/front_end/ui/Icon.js(142,3): error TS2741: Property 'isMask' is missing in type '{ position: string; spritesheet: string; }' but required in type '{ position: string; spritesheet: string; isMask: boolean; }'.
+node_modules/chrome-devtools-frontend/front_end/ui/Icon.js(143,3): error TS2741: Property 'isMask' is missing in type '{ position: string; spritesheet: string; }' but required in type '{ position: string; spritesheet: string; isMask: boolean; }'.
+node_modules/chrome-devtools-frontend/front_end/ui/Icon.js(144,3): error TS2741: Property 'isMask' is missing in type '{ position: string; spritesheet: string; }' but required in type '{ position: string; spritesheet: string; isMask: boolean; }'.
+node_modules/chrome-devtools-frontend/front_end/ui/Icon.js(148,3): error TS2741: Property 'isMask' is missing in type '{ position: string; spritesheet: string; }' but required in type '{ position: string; spritesheet: string; isMask: boolean; }'.
+node_modules/chrome-devtools-frontend/front_end/ui/Icon.js(149,3): error TS2741: Property 'isMask' is missing in type '{ position: string; spritesheet: string; }' but required in type '{ position: string; spritesheet: string; isMask: boolean; }'.
+node_modules/chrome-devtools-frontend/front_end/ui/Icon.js(150,3): error TS2741: Property 'isMask' is missing in type '{ position: string; spritesheet: string; }' but required in type '{ position: string; spritesheet: string; isMask: boolean; }'.
+node_modules/chrome-devtools-frontend/front_end/ui/Icon.js(152,3): error TS2741: Property 'isMask' is missing in type '{ position: string; spritesheet: string; }' but required in type '{ position: string; spritesheet: string; isMask: boolean; }'.
+node_modules/chrome-devtools-frontend/front_end/ui/Icon.js(153,3): error TS2741: Property 'isMask' is missing in type '{ position: string; spritesheet: string; }' but required in type '{ position: string; spritesheet: string; isMask: boolean; }'.
+node_modules/chrome-devtools-frontend/front_end/ui/Icon.js(154,3): error TS2741: Property 'isMask' is missing in type '{ position: string; spritesheet: string; }' but required in type '{ position: string; spritesheet: string; isMask: boolean; }'.
+node_modules/chrome-devtools-frontend/front_end/ui/Icon.js(164,72): error TS2322: Type '{ position: string; spritesheet: string; invert: boolean; }' is not assignable to type '{ position: string; spritesheet: string; isMask: boolean; }'.
+  Object literal may only specify known properties, and 'invert' does not exist in type '{ position: string; spritesheet: string; isMask: boolean; }'.
+node_modules/chrome-devtools-frontend/front_end/ui/Icon.js(165,67): error TS2322: Type '{ position: string; spritesheet: string; invert: boolean; }' is not assignable to type '{ position: string; spritesheet: string; isMask: boolean; }'.
+  Object literal may only specify known properties, and 'invert' does not exist in type '{ position: string; spritesheet: string; isMask: boolean; }'.
+node_modules/chrome-devtools-frontend/front_end/ui/Icon.js(166,3): error TS2741: Property 'isMask' is missing in type '{ position: string; spritesheet: string; }' but required in type '{ position: string; spritesheet: string; isMask: boolean; }'.
+node_modules/chrome-devtools-frontend/front_end/ui/Icon.js(167,3): error TS2741: Property 'isMask' is missing in type '{ position: string; spritesheet: string; }' but required in type '{ position: string; spritesheet: string; isMask: boolean; }'.
+node_modules/chrome-devtools-frontend/front_end/ui/Icon.js(168,3): error TS2741: Property 'isMask' is missing in type '{ position: string; spritesheet: string; }' but required in type '{ position: string; spritesheet: string; isMask: boolean; }'.
+node_modules/chrome-devtools-frontend/front_end/ui/Icon.js(169,3): error TS2741: Property 'isMask' is missing in type '{ position: string; spritesheet: string; }' but required in type '{ position: string; spritesheet: string; isMask: boolean; }'.
+node_modules/chrome-devtools-frontend/front_end/ui/Icon.js(170,3): error TS2741: Property 'isMask' is missing in type '{ position: string; spritesheet: string; }' but required in type '{ position: string; spritesheet: string; isMask: boolean; }'.
+node_modules/chrome-devtools-frontend/front_end/ui/Icon.js(172,3): error TS2741: Property 'isMask' is missing in type '{ position: string; spritesheet: string; }' but required in type '{ position: string; spritesheet: string; isMask: boolean; }'.
+node_modules/chrome-devtools-frontend/front_end/ui/Icon.js(173,3): error TS2741: Property 'isMask' is missing in type '{ position: string; spritesheet: string; }' but required in type '{ position: string; spritesheet: string; isMask: boolean; }'.
+node_modules/chrome-devtools-frontend/front_end/ui/Icon.js(174,3): error TS2741: Property 'isMask' is missing in type '{ position: string; spritesheet: string; }' but required in type '{ position: string; spritesheet: string; isMask: boolean; }'.
+node_modules/chrome-devtools-frontend/front_end/ui/Icon.js(175,3): error TS2741: Property 'isMask' is missing in type '{ position: string; spritesheet: string; }' but required in type '{ position: string; spritesheet: string; isMask: boolean; }'.
+node_modules/chrome-devtools-frontend/front_end/ui/Icon.js(176,3): error TS2741: Property 'isMask' is missing in type '{ position: string; spritesheet: string; }' but required in type '{ position: string; spritesheet: string; isMask: boolean; }'.
+node_modules/chrome-devtools-frontend/front_end/ui/Icon.js(177,3): error TS2741: Property 'isMask' is missing in type '{ position: string; spritesheet: string; }' but required in type '{ position: string; spritesheet: string; isMask: boolean; }'.
+node_modules/chrome-devtools-frontend/front_end/ui/Icon.js(180,3): error TS2741: Property 'isMask' is missing in type '{ position: string; spritesheet: string; }' but required in type '{ position: string; spritesheet: string; isMask: boolean; }'.
+node_modules/chrome-devtools-frontend/front_end/ui/Icon.js(250,3): error TS2741: Property 'isMask' is missing in type '{ position: string; spritesheet: string; }' but required in type '{ position: string; spritesheet: string; isMask: boolean; }'.
+node_modules/chrome-devtools-frontend/front_end/ui/Icon.js(251,3): error TS2741: Property 'isMask' is missing in type '{ position: string; spritesheet: string; }' but required in type '{ position: string; spritesheet: string; isMask: boolean; }'.
+node_modules/chrome-devtools-frontend/front_end/ui/Icon.js(252,3): error TS2741: Property 'isMask' is missing in type '{ position: string; spritesheet: string; }' but required in type '{ position: string; spritesheet: string; isMask: boolean; }'.
+node_modules/chrome-devtools-frontend/front_end/ui/Icon.js(253,3): error TS2741: Property 'isMask' is missing in type '{ position: string; spritesheet: string; }' but required in type '{ position: string; spritesheet: string; isMask: boolean; }'.
 node_modules/chrome-devtools-frontend/front_end/ui/Infobar.js(16,45): error TS2339: Property 'createChild' does not exist on type 'DocumentFragment'.
 node_modules/chrome-devtools-frontend/front_end/ui/Infobar.js(26,46): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/ui/Infobar.js(32,42): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/ui/Infobar.js(39,17): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/ui/Infobar.js(71,15): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/ui/InplaceEditor.js(11,33): error TS2694: Namespace 'UI.InplaceEditor' has no exported member 'Controller'.
 node_modules/chrome-devtools-frontend/front_end/ui/InplaceEditor.js(14,27): error TS2339: Property '_defaultInstance' does not exist on type 'typeof InplaceEditor'.
 node_modules/chrome-devtools-frontend/front_end/ui/InplaceEditor.js(15,24): error TS2339: Property '_defaultInstance' does not exist on type 'typeof InplaceEditor'.
 node_modules/chrome-devtools-frontend/front_end/ui/InplaceEditor.js(16,29): error TS2339: Property '_defaultInstance' does not exist on type 'typeof InplaceEditor'.
-node_modules/chrome-devtools-frontend/front_end/ui/InplaceEditor.js(69,33): error TS2694: Namespace 'UI.InplaceEditor' has no exported member 'Controller'.
 node_modules/chrome-devtools-frontend/front_end/ui/InplaceEditor.js(131,22): error TS2339: Property 'keyCode' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/ui/InplaceEditor.js(131,77): error TS2339: Property 'key' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/ui/InplaceEditor.js(133,22): error TS2339: Property 'key' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/ui/InplaceEditor.js(134,33): error TS2339: Property 'shiftKey' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/ui/InplaceEditor.js(183,23): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/ui/InplaceEditor.js(183,43): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/ui/InplaceEditor.js(185,18): error TS2339: Property 'Controller' does not exist on type 'typeof InplaceEditor'.
 node_modules/chrome-devtools-frontend/front_end/ui/InplaceEditor.js(194,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/ui/InplaceEditor.js(195,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/ui/InspectorView.js(53,57): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/ui/InspectorView.js(69,47): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/ui/InspectorView.js(80,24): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/ui/InspectorView.js(116,7): error TS2322: Type '{ tabbedPane(): TabbedPane; enableMoreTabsButton(): void; }' is not assignable to type '{ appendApplicableItems(locationName: string): void; appendView(view: { viewId(): string; title(): string; isCloseable(): boolean; isTransient(): boolean; toolbarItems(): Promise<ToolbarItem[]>; widget(): Promise<...>; disposeView(): void; }, insertBefore?: { ...; }): void; showView(view: { ...; }, insertBefore?: { ...'.
 node_modules/chrome-devtools-frontend/front_end/ui/InspectorView.js(118,7): error TS2322: Type '{ tabbedPane(): TabbedPane; enableMoreTabsButton(): void; }' is not assignable to type '{ appendApplicableItems(locationName: string): void; appendView(view: { viewId(): string; title(): string; isCloseable(): boolean; isTransient(): boolean; toolbarItems(): Promise<ToolbarItem[]>; widget(): Promise<...>; disposeView(): void; }, insertBefore?: { ...; }): void; showView(view: { ...; }, insertBefore?: { ...'.
 node_modules/chrome-devtools-frontend/front_end/ui/InspectorView.js(247,73): error TS2339: Property 'altKey' does not exist on type 'Event'.
@@ -13337,21 +11980,10 @@ node_modules/chrome-devtools-frontend/front_end/ui/InspectorView.js(270,15): err
 node_modules/chrome-devtools-frontend/front_end/ui/InspectorView.js(272,13): error TS2339: Property 'consume' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/ui/InspectorView.js(275,15): error TS2339: Property 'key' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/ui/InspectorView.js(277,13): error TS2339: Property 'consume' does not exist on type 'Event'.
-node_modules/chrome-devtools-frontend/front_end/ui/InspectorView.js(300,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/ui/InspectorView.js(308,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/ui/KeyboardShortcut.js(91,19): error TS2339: Property 'ctrlKey' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/ui/KeyboardShortcut.js(91,37): error TS2339: Property 'shiftKey' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/ui/KeyboardShortcut.js(91,56): error TS2339: Property 'altKey' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/ui/KeyboardShortcut.js(91,73): error TS2339: Property 'metaKey' does not exist on type 'Event'.
-node_modules/chrome-devtools-frontend/front_end/ui/KeyboardShortcut.js(95,42): error TS2694: Namespace 'UI.KeyboardShortcut' has no exported member 'Key'.
-node_modules/chrome-devtools-frontend/front_end/ui/KeyboardShortcut.js(97,36): error TS2694: Namespace 'UI.KeyboardShortcut' has no exported member 'Descriptor'.
-node_modules/chrome-devtools-frontend/front_end/ui/KeyboardShortcut.js(108,36): error TS2694: Namespace 'UI.KeyboardShortcut' has no exported member 'Descriptor'.
-node_modules/chrome-devtools-frontend/front_end/ui/KeyboardShortcut.js(135,42): error TS2694: Namespace 'UI.KeyboardShortcut' has no exported member 'Key'.
-node_modules/chrome-devtools-frontend/front_end/ui/KeyboardShortcut.js(144,42): error TS2694: Namespace 'UI.KeyboardShortcut' has no exported member 'Key'.
-node_modules/chrome-devtools-frontend/front_end/ui/KeyboardShortcut.js(216,21): error TS2551: Property 'Key' does not exist on type 'typeof KeyboardShortcut'. Did you mean 'Keys'?
-node_modules/chrome-devtools-frontend/front_end/ui/KeyboardShortcut.js(218,50): error TS2694: Namespace 'UI.KeyboardShortcut' has no exported member 'Key'.
-node_modules/chrome-devtools-frontend/front_end/ui/KeyboardShortcut.js(289,21): error TS2300: Duplicate identifier 'Descriptor'.
-node_modules/chrome-devtools-frontend/front_end/ui/KeyboardShortcut.js(289,21): error TS2339: Property 'Descriptor' does not exist on type 'typeof KeyboardShortcut'.
 node_modules/chrome-devtools-frontend/front_end/ui/ListControl.js(14,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/ui/ListControl.js(22,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/ui/ListControl.js(28,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
@@ -13360,7 +11992,6 @@ node_modules/chrome-devtools-frontend/front_end/ui/ListControl.js(60,37): error
 node_modules/chrome-devtools-frontend/front_end/ui/ListControl.js(61,40): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/ListControl.js(76,18): error TS2339: Property 'tabIndex' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/ListControl.js(88,67): error TS2339: Property 'offsetHeight' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/ui/ListControl.js(106,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/ui/ListControl.js(158,39): error TS2339: Property 'offsetHeight' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/ListControl.js(160,33): error TS2339: Property 'constrain' does not exist on type 'NumberConstructor'.
 node_modules/chrome-devtools-frontend/front_end/ui/ListControl.js(180,25): error TS2339: Property 'parentNodeOrShadowHost' does not exist on type 'Node'.
@@ -13403,8 +12034,6 @@ node_modules/chrome-devtools-frontend/front_end/ui/ListWidget.js(386,14): error
 node_modules/chrome-devtools-frontend/front_end/ui/ListWidget.js(395,18): error TS2339: Property 'scrollIntoViewIfNeeded' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/ListWidget.js(402,28): error TS2339: Property 'disabled' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/Panel.js(75,13): error TS2339: Property 'handled' does not exist on type 'KeyboardEvent'.
-node_modules/chrome-devtools-frontend/front_end/ui/Panel.js(79,43): error TS2694: Namespace 'UI.KeyboardShortcut' has no exported member 'Descriptor'.
-node_modules/chrome-devtools-frontend/front_end/ui/Popover.js(37,40): error TS2694: Namespace 'UI' has no exported member 'PopoverRequest'.
 node_modules/chrome-devtools-frontend/front_end/ui/Popover.js(44,17): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/ui/Popover.js(80,79): error TS2339: Property 'clientX' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/ui/Popover.js(80,94): error TS2339: Property 'clientY' does not exist on type 'Event'.
@@ -13412,8 +12041,6 @@ node_modules/chrome-devtools-frontend/front_end/ui/Popover.js(109,15): error TS2
 node_modules/chrome-devtools-frontend/front_end/ui/Popover.js(129,15): error TS2339: Property 'relatedTarget' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/ui/Popover.js(129,39): error TS2339: Property 'relatedTarget' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/ui/Popover.js(170,38): error TS2339: Property 'ownerDocument' does not exist on type 'EventTarget'.
-node_modules/chrome-devtools-frontend/front_end/ui/Popover.js(206,29): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ SetExactSize: symbol; SetExactWidthMaxHeight: symbol; MeasureContent: symbol; }'.
-node_modules/chrome-devtools-frontend/front_end/ui/Popover.js(207,31): error TS2345: Argument of type 'symbol' is not assignable to parameter of type 'boolean'.
 node_modules/chrome-devtools-frontend/front_end/ui/Popover.js(220,28): error TS2339: Property '_popoverHelper' does not exist on type 'typeof PopoverHelper'.
 node_modules/chrome-devtools-frontend/front_end/ui/Popover.js(222,26): error TS2339: Property '_popoverHelper' does not exist on type 'typeof PopoverHelper'.
 node_modules/chrome-devtools-frontend/front_end/ui/Popover.js(224,24): error TS2339: Property '_popoverHelper' does not exist on type 'typeof PopoverHelper'.
@@ -13470,11 +12097,9 @@ node_modules/chrome-devtools-frontend/front_end/ui/SettingsUI.js(107,25): error
 node_modules/chrome-devtools-frontend/front_end/ui/SettingsUI.js(119,27): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/SettingsUI.js(133,24): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/ui/SettingsUI.js(155,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
-node_modules/chrome-devtools-frontend/front_end/ui/ShortcutRegistry.js(16,56): error TS2694: Namespace 'UI.KeyboardShortcut' has no exported member 'Descriptor'.
 node_modules/chrome-devtools-frontend/front_end/ui/ShortcutRegistry.js(26,83): error TS2339: Property 'valuesArray' does not exist on type 'Set<string>'.
 node_modules/chrome-devtools-frontend/front_end/ui/ShortcutRegistry.js(34,42): error TS2345: Argument of type 'string' is not assignable to parameter of type 'K'.
   'string' is assignable to the constraint of type 'K', but 'K' could be instantiated with a different subtype of constraint '{}'.
-node_modules/chrome-devtools-frontend/front_end/ui/ShortcutRegistry.js(39,44): error TS2694: Namespace 'UI.KeyboardShortcut' has no exported member 'Descriptor'.
 node_modules/chrome-devtools-frontend/front_end/ui/ShortcutRegistry.js(42,46): error TS2345: Argument of type 'string' is not assignable to parameter of type 'K'.
   'string' is assignable to the constraint of type 'K', but 'K' could be instantiated with a different subtype of constraint '{}'.
 node_modules/chrome-devtools-frontend/front_end/ui/ShortcutRegistry.js(88,15): error TS2339: Property 'consume' does not exist on type 'KeyboardEvent'.
@@ -13543,19 +12168,9 @@ node_modules/chrome-devtools-frontend/front_end/ui/ShortcutsScreen.js(222,20): e
 node_modules/chrome-devtools-frontend/front_end/ui/ShortcutsScreen.js(222,83): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/ui/ShortcutsScreen.js(223,37): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/ShortcutsScreen.js(231,52): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/ui/ShortcutsScreen.js(257,35): error TS2694: Namespace 'UI.KeyboardShortcut' has no exported member 'Descriptor'.
-node_modules/chrome-devtools-frontend/front_end/ui/ShortcutsScreen.js(265,43): error TS2694: Namespace 'UI.KeyboardShortcut' has no exported member 'Descriptor'.
-node_modules/chrome-devtools-frontend/front_end/ui/ShortcutsScreen.js(273,43): error TS2694: Namespace 'UI.KeyboardShortcut' has no exported member 'Descriptor'.
 node_modules/chrome-devtools-frontend/front_end/ui/ShortcutsScreen.js(277,53): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/ui/ShortcutsScreen.js(292,28): error TS2339: Property 'createChild' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/ui/ShortcutsScreen.js(308,43): error TS2694: Namespace 'UI.KeyboardShortcut' has no exported member 'Descriptor'.
-node_modules/chrome-devtools-frontend/front_end/ui/ShortcutsScreen.js(318,35): error TS2694: Namespace 'UI.KeyboardShortcut' has no exported member 'Descriptor'.
-node_modules/chrome-devtools-frontend/front_end/ui/SoftContextMenu.js(31,48): error TS2694: Namespace 'InspectorFrontendHostAPI' has no exported member 'ContextMenuDescriptor'.
 node_modules/chrome-devtools-frontend/front_end/ui/SoftContextMenu.js(32,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/ui/SoftContextMenu.js(53,9): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ BlockedByGlassPane: symbol; PierceGlassPane: symbol; PierceContents: symbol; }'.
-node_modules/chrome-devtools-frontend/front_end/ui/SoftContextMenu.js(57,37): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ SetExactSize: symbol; SetExactWidthMaxHeight: symbol; MeasureContent: symbol; }'.
-node_modules/chrome-devtools-frontend/front_end/ui/SoftContextMenu.js(58,39): error TS2345: Argument of type 'symbol' is not assignable to parameter of type 'boolean'.
-node_modules/chrome-devtools-frontend/front_end/ui/SoftContextMenu.js(60,9): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ PreferTop: symbol; PreferBottom: symbol; PreferLeft: symbol; PreferRight: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/ui/SoftContextMenu.js(62,63): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/SoftContextMenu.js(113,37): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/SoftContextMenu.js(115,23): error TS2339: Property '_isCustom' does not exist on type 'Element'.
@@ -13570,11 +12185,8 @@ node_modules/chrome-devtools-frontend/front_end/ui/SoftContextMenu.js(163,22): e
 node_modules/chrome-devtools-frontend/front_end/ui/SoftContextMenu.js(183,7): error TS2322: Type 'SoftContextMenu' is not assignable to type 'this'.
   'SoftContextMenu' is assignable to the constraint of type 'this', but 'this' could be instantiated with a different subtype of constraint 'SoftContextMenu'.
 node_modules/chrome-devtools-frontend/front_end/ui/SoftDropDown.js(20,37): error TS2339: Property 'createChild' does not exist on type 'DocumentFragment'.
-node_modules/chrome-devtools-frontend/front_end/ui/SoftDropDown.js(25,39): error TS2345: Argument of type 'symbol' is not assignable to parameter of type 'boolean'.
-node_modules/chrome-devtools-frontend/front_end/ui/SoftDropDown.js(26,39): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ PreferTop: symbol; PreferBottom: symbol; PreferLeft: symbol; PreferRight: symbol; }'.
-node_modules/chrome-devtools-frontend/front_end/ui/SoftDropDown.js(28,46): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ BlockedByGlassPane: symbol; PierceGlassPane: symbol; PierceContents: symbol; }'.
-node_modules/chrome-devtools-frontend/front_end/ui/SoftDropDown.js(29,50): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ NonViewport: symbol; EqualHeightItems: symbol; VariousHeightItems: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/ui/SoftDropDown.js(40,30): error TS2339: Property 'disabled' does not exist on type 'Element'.
+node_modules/chrome-devtools-frontend/front_end/ui/SoftDropDown.js(45,69): error TS2339: Property 'consume' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/ui/SoftDropDown.js(64,54): error TS2339: Property 'boxInWindow' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/SoftDropDown.js(69,18): error TS2339: Property 'focus' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/SoftDropDown.js(70,11): error TS2339: Property 'consume' does not exist on type 'Event'.
@@ -13583,7 +12195,6 @@ node_modules/chrome-devtools-frontend/front_end/ui/SoftDropDown.js(95,19): error
 node_modules/chrome-devtools-frontend/front_end/ui/SoftDropDown.js(149,19): error TS2339: Property 'key' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/ui/SoftDropDown.js(151,30): error TS2339: Property 'key' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/ui/SoftDropDown.js(165,13): error TS2339: Property 'consume' does not exist on type 'Event'.
-node_modules/chrome-devtools-frontend/front_end/ui/SoftDropDown.js(186,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/ui/SoftDropDown.js(217,14): error TS2339: Property 'movementX' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/ui/SoftDropDown.js(217,29): error TS2339: Property 'movementY' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/ui/SoftDropDown.js(281,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
@@ -13610,35 +12221,21 @@ node_modules/chrome-devtools-frontend/front_end/ui/SplitWidget.js(590,25): error
 node_modules/chrome-devtools-frontend/front_end/ui/SplitWidget.js(593,27): error TS2339: Property 'window' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/SplitWidget.js(647,21): error TS2339: Property 'constrain' does not exist on type 'NumberConstructor'.
 node_modules/chrome-devtools-frontend/front_end/ui/SplitWidget.js(654,21): error TS2339: Property 'constrain' does not exist on type 'NumberConstructor'.
-node_modules/chrome-devtools-frontend/front_end/ui/SplitWidget.js(715,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/ui/SplitWidget.js(722,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/ui/SplitWidget.js(740,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/ui/SplitWidget.js(788,31): error TS2694: Namespace 'UI.SplitWidget' has no exported member 'SettingForOrientation'.
-node_modules/chrome-devtools-frontend/front_end/ui/SplitWidget.js(861,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/ui/SplitWidget.js(872,47): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/ui/SplitWidget.js(878,24): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/ui/SplitWidget.js(913,16): error TS2339: Property 'SettingForOrientation' does not exist on type 'typeof SplitWidget'.
-node_modules/chrome-devtools-frontend/front_end/ui/SuggestBox.js(69,45): error TS2694: Namespace 'UI.SuggestBox' has no exported member 'Suggestion'.
-node_modules/chrome-devtools-frontend/front_end/ui/SuggestBox.js(71,47): error TS2694: Namespace 'UI.SuggestBox' has no exported member 'Suggestion'.
-node_modules/chrome-devtools-frontend/front_end/ui/SuggestBox.js(72,56): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ NonViewport: symbol; EqualHeightItems: symbol; VariousHeightItems: symbol; }'.
-node_modules/chrome-devtools-frontend/front_end/ui/SuggestBox.js(79,39): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ PreferTop: symbol; PreferBottom: symbol; PreferLeft: symbol; PreferRight: symbol; }'.
-node_modules/chrome-devtools-frontend/front_end/ui/SuggestBox.js(116,29): error TS2694: Namespace 'UI.SuggestBox' has no exported member 'Suggestions'.
-node_modules/chrome-devtools-frontend/front_end/ui/SuggestBox.js(126,29): error TS2694: Namespace 'UI.SuggestBox' has no exported member 'Suggestions'.
-node_modules/chrome-devtools-frontend/front_end/ui/SuggestBox.js(142,71): error TS2694: Namespace 'UI.SuggestBox' has no exported member 'Suggestion'.
-node_modules/chrome-devtools-frontend/front_end/ui/SuggestBox.js(202,29): error TS2694: Namespace 'UI.SuggestBox' has no exported member 'Suggestion'.
+node_modules/chrome-devtools-frontend/front_end/ui/SuggestBox.js(72,50): error TS2345: Argument of type 'this' is not assignable to parameter of type '{ createElementForItem(item: T): Element; heightForItem(item: T): number; isItemSelectable(item: T): boolean; selectedItemChanged(from: T, to: T, fromElement: Element, toElement: Element): void; }'.
+  Type 'SuggestBox' is not assignable to type '{ createElementForItem(item: T): Element; heightForItem(item: T): number; isItemSelectable(item: T): boolean; selectedItemChanged(from: T, to: T, fromElement: Element, toElement: Element): void; }'.
+    Types of property 'createElementForItem' are incompatible.
+      Type '(item: { text: string; subtitle: string; iconType: string; priority: number; isSecondary: boolean; title: string; }) => Element' is not assignable to type '(item: T) => Element'.
+        Types of parameters 'item' and 'item' are incompatible.
+          Type 'T' is not assignable to type '{ text: string; subtitle: string; iconType: string; priority: number; isSecondary: boolean; title: string; }'.
+node_modules/chrome-devtools-frontend/front_end/ui/SuggestBox.js(155,59): error TS2345: Argument of type '{ text: string; subtitle: string; }' is not assignable to parameter of type '{ text: string; subtitle: string; iconType: string; priority: number; isSecondary: boolean; title: string; }'.
+  Type '{ text: string; subtitle: string; }' is missing the following properties from type '{ text: string; subtitle: string; iconType: string; priority: number; isSecondary: boolean; title: string; }': iconType, priority, isSecondary, title
 node_modules/chrome-devtools-frontend/front_end/ui/SuggestBox.js(214,13): error TS2339: Property 'tabIndex' does not exist on type 'Element'.
+node_modules/chrome-devtools-frontend/front_end/ui/SuggestBox.js(216,57): error TS2554: Expected 0 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/ui/SuggestBox.js(218,32): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/SuggestBox.js(227,37): error TS2339: Property 'createChild' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/ui/SuggestBox.js(235,29): error TS2694: Namespace 'UI.SuggestBox' has no exported member 'Suggestion'.
-node_modules/chrome-devtools-frontend/front_end/ui/SuggestBox.js(244,29): error TS2694: Namespace 'UI.SuggestBox' has no exported member 'Suggestion'.
-node_modules/chrome-devtools-frontend/front_end/ui/SuggestBox.js(253,29): error TS2694: Namespace 'UI.SuggestBox' has no exported member 'Suggestion'.
-node_modules/chrome-devtools-frontend/front_end/ui/SuggestBox.js(254,29): error TS2694: Namespace 'UI.SuggestBox' has no exported member 'Suggestion'.
+node_modules/chrome-devtools-frontend/front_end/ui/SuggestBox.js(228,59): error TS2554: Expected 0 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/ui/SuggestBox.js(282,11): error TS2339: Property 'consume' does not exist on type 'Event'.
-node_modules/chrome-devtools-frontend/front_end/ui/SuggestBox.js(286,29): error TS2694: Namespace 'UI.SuggestBox' has no exported member 'Suggestions'.
-node_modules/chrome-devtools-frontend/front_end/ui/SuggestBox.js(307,29): error TS2694: Namespace 'UI.SuggestBox' has no exported member 'Suggestions'.
-node_modules/chrome-devtools-frontend/front_end/ui/SuggestBox.js(394,15): error TS2339: Property 'Suggestion' does not exist on type 'typeof SuggestBox'.
-node_modules/chrome-devtools-frontend/front_end/ui/SuggestBox.js(397,36): error TS2694: Namespace 'UI.SuggestBox' has no exported member 'Suggestion'.
-node_modules/chrome-devtools-frontend/front_end/ui/SuggestBox.js(399,15): error TS2339: Property 'Suggestions' does not exist on type 'typeof SuggestBox'.
 node_modules/chrome-devtools-frontend/front_end/ui/SyntaxHighlighter.js(54,10): error TS2339: Property 'createTextChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/SyntaxHighlighter.js(74,12): error TS2339: Property 'removeChildren' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/SyntaxHighlighter.js(82,16): error TS2339: Property 'createTextChild' does not exist on type 'Element'.
@@ -13649,7 +12246,6 @@ node_modules/chrome-devtools-frontend/front_end/ui/TabbedPane.js(41,47): error T
 node_modules/chrome-devtools-frontend/front_end/ui/TabbedPane.js(47,48): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/TabbedPane.js(159,27): error TS2339: Property 'focus' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/TabbedPane.js(314,56): error TS2339: Property 'getComponentRoot' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/ui/TabbedPane.js(405,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/ui/TabbedPane.js(568,15): error TS2339: Property 'which' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/ui/TabbedPane.js(671,27): error TS2339: Property '__tab' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/TabbedPane.js(679,31): error TS2339: Property '__tab' does not exist on type 'Element'.
@@ -13693,7 +12289,6 @@ node_modules/chrome-devtools-frontend/front_end/ui/TabbedPane.js(1248,24): error
 node_modules/chrome-devtools-frontend/front_end/ui/TabbedPane.js(1252,22): error TS2339: Property 'style' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/TabbedPane.js(1252,55): error TS2339: Property 'pageX' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/ui/TabbedPane.js(1260,22): error TS2339: Property 'style' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/ui/TextEditor.js(11,29): error TS2694: Namespace 'UI.TextEditor' has no exported member 'Options'.
 node_modules/chrome-devtools-frontend/front_end/ui/TextEditor.js(12,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/ui/TextEditor.js(21,1): error TS8022: JSDoc '@extends' is not attached to a class.
 node_modules/chrome-devtools-frontend/front_end/ui/TextEditor.js(26,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
@@ -13701,12 +12296,7 @@ node_modules/chrome-devtools-frontend/front_end/ui/TextEditor.js(31,15): error T
 node_modules/chrome-devtools-frontend/front_end/ui/TextEditor.js(36,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/ui/TextEditor.js(47,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 node_modules/chrome-devtools-frontend/front_end/ui/TextEditor.js(58,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
-node_modules/chrome-devtools-frontend/front_end/ui/TextEditor.js(70,18): error TS2694: Namespace 'UI' has no exported member 'AutocompleteConfig'.
 node_modules/chrome-devtools-frontend/front_end/ui/TextEditor.js(79,15): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
-node_modules/chrome-devtools-frontend/front_end/ui/TextEditor.js(101,15): error TS2300: Duplicate identifier 'Options'.
-node_modules/chrome-devtools-frontend/front_end/ui/TextEditor.js(101,15): error TS2339: Property 'Options' does not exist on type 'typeof TextEditor'.
-node_modules/chrome-devtools-frontend/front_end/ui/TextEditor.js(106,119): error TS2694: Namespace 'UI.SuggestBox' has no exported member 'Suggestions'.
-node_modules/chrome-devtools-frontend/front_end/ui/TextPrompt.js(52,74): error TS2694: Namespace 'UI.SuggestBox' has no exported member 'Suggestions'.
 node_modules/chrome-devtools-frontend/front_end/ui/TextPrompt.js(89,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/ui/TextPrompt.js(113,39): error TS2339: Property 'createChild' does not exist on type 'DocumentFragment'.
 node_modules/chrome-devtools-frontend/front_end/ui/TextPrompt.js(115,24): error TS2339: Property 'style' does not exist on type 'Element'.
@@ -13726,8 +12316,6 @@ node_modules/chrome-devtools-frontend/front_end/ui/TextPrompt.js(299,72): error
 node_modules/chrome-devtools-frontend/front_end/ui/TextPrompt.js(309,13): error TS2339: Property 'consume' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/ui/TextPrompt.js(389,35): error TS2339: Property 'getComponentSelection' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/TextPrompt.js(437,29): error TS2339: Property 'boxInWindow' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/ui/TextPrompt.js(454,30): error TS2694: Namespace 'UI.SuggestBox' has no exported member 'Suggestions'.
-node_modules/chrome-devtools-frontend/front_end/ui/TextPrompt.js(466,29): error TS2694: Namespace 'UI.SuggestBox' has no exported member 'Suggestions'.
 node_modules/chrome-devtools-frontend/front_end/ui/TextPrompt.js(564,35): error TS2339: Property 'getComponentSelection' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/TextPrompt.js(580,35): error TS2339: Property 'getComponentSelection' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/TextPrompt.js(592,35): error TS2339: Property 'getComponentSelection' does not exist on type 'Element'.
@@ -13737,9 +12325,6 @@ node_modules/chrome-devtools-frontend/front_end/ui/TextPrompt.js(622,35): error
 node_modules/chrome-devtools-frontend/front_end/ui/TextPrompt.js(627,7): error TS2322: Type 'ChildNode' is not assignable to type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/Toolbar.js(43,50): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/Toolbar.js(48,45): error TS2339: Property 'createChild' does not exist on type 'DocumentFragment'.
-node_modules/chrome-devtools-frontend/front_end/ui/Toolbar.js(75,24): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/ui/Toolbar.js(115,26): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/ui/Toolbar.js(128,49): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ BlockedByGlassPane: symbol; PierceGlassPane: symbol; PierceContents: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/ui/Toolbar.js(134,47): error TS2339: Property 'boxInWindow' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/Toolbar.js(246,10): error TS2339: Property '_toolbar' does not exist on type 'ToolbarItem'.
 node_modules/chrome-devtools-frontend/front_end/ui/Toolbar.js(273,19): error TS2339: Property '_toolbar' does not exist on type 'ToolbarItem'.
@@ -13753,7 +12338,6 @@ node_modules/chrome-devtools-frontend/front_end/ui/Toolbar.js(484,38): error TS2
 node_modules/chrome-devtools-frontend/front_end/ui/Toolbar.js(520,18): error TS2339: Property 'style' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/Toolbar.js(535,20): error TS2339: Property 'style' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/Toolbar.js(545,11): error TS2339: Property 'consume' does not exist on type 'Event'.
-node_modules/chrome-devtools-frontend/front_end/ui/Toolbar.js(579,74): error TS2694: Namespace 'UI.SuggestBox' has no exported member 'Suggestions'.
 node_modules/chrome-devtools-frontend/front_end/ui/Toolbar.js(584,46): error TS2339: Property 'createChild' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/Toolbar.js(599,20): error TS2339: Property 'style' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/Toolbar.js(601,20): error TS2339: Property 'style' does not exist on type 'Element'.
@@ -13928,10 +12512,6 @@ node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1745,18): error TS
 node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1763,20): error TS2339: Property 'type' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1766,52): error TS2339: Property 'sheet' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1783,30): error TS2339: Property 'cssRules' does not exist on type 'StyleSheet'.
-node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1851,49): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ Unknown: number; Foreground: number; Background: number; Selection: number; }'.
-node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1898,13): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
-node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1900,22): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
-node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1901,22): error TS2362: The left-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
 node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1910,22): error TS2339: Property 'constrain' does not exist on type 'NumberConstructor'.
 node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1911,22): error TS2339: Property 'constrain' does not exist on type 'NumberConstructor'.
 node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1912,22): error TS2339: Property 'constrain' does not exist on type 'NumberConstructor'.
@@ -13946,12 +12526,10 @@ node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1967,23): error TS
 node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1968,48): error TS2345: Argument of type '-1' is not assignable to parameter of type 'string'.
 node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1969,23): error TS2339: Property 'onchange' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1971,34): error TS2339: Property 'files' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1990,28): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ SetExactSize: symbol; SetExactWidthMaxHeight: symbol; MeasureContent: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1993,30): error TS2339: Property 'createChild' does not exist on type 'DocumentFragment'.
 node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1995,49): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(1999,15): error TS2339: Property 'consume' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(2003,16): error TS2339: Property 'focus' does not exist on type 'Element'.
-node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(2017,28): error TS2345: Argument of type 'symbol' is not assignable to parameter of type '{ SetExactSize: symbol; SetExactWidthMaxHeight: symbol; MeasureContent: symbol; }'.
 node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(2020,30): error TS2339: Property 'createChild' does not exist on type 'DocumentFragment'.
 node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(2024,57): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/ui/UIUtils.js(2025,57): error TS2555: Expected at least 2 arguments, but got 1.
@@ -14002,8 +12580,6 @@ node_modules/chrome-devtools-frontend/front_end/ui/View.js(556,36): error TS2339
 node_modules/chrome-devtools-frontend/front_end/ui/View.js(558,22): error TS2339: Property 'key' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/ui/View.js(560,22): error TS2339: Property 'key' does not exist on type 'Event'.
 node_modules/chrome-devtools-frontend/front_end/ui/View.js(702,26): error TS2555: Expected at least 2 arguments, but got 1.
-node_modules/chrome-devtools-frontend/front_end/ui/View.js(793,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/ui/View.js(802,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/ui/Widget.js(45,18): error TS2339: Property '__widget' does not exist on type 'Element'.
 node_modules/chrome-devtools-frontend/front_end/ui/Widget.js(88,16): error TS2339: Property '__widget' does not exist on type 'Node'.
 node_modules/chrome-devtools-frontend/front_end/ui/Widget.js(90,19): error TS2339: Property 'parentNodeOrShadowHost' does not exist on type 'Node'.
@@ -14155,12 +12731,7 @@ node_modules/chrome-devtools-frontend/front_end/worker_service/ServiceDispatcher
 node_modules/chrome-devtools-frontend/front_end/worker_service/ServiceDispatcher.js(154,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/worker_service/ServiceDispatcher.js(155,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
 node_modules/chrome-devtools-frontend/front_end/workspace/FileManager.js(37,29): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/workspace/FileManager.js(59,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/workspace/FileManager.js(70,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/workspace/FileManager.js(96,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/workspace/SearchConfig.js(92,52): error TS2694: Namespace 'Workspace.SearchConfig' has no exported member 'RegexQuery'.
 node_modules/chrome-devtools-frontend/front_end/workspace/SearchConfig.js(164,20): error TS2339: Property 'regexSpecialCharacters' does not exist on type 'StringConstructor'.
-node_modules/chrome-devtools-frontend/front_end/workspace/SearchConfig.js(177,24): error TS2339: Property 'RegexQuery' does not exist on type 'typeof SearchConfig'.
 node_modules/chrome-devtools-frontend/front_end/workspace/UISourceCode.js(45,25): error TS2339: Property 'asParsedURL' does not exist on type 'string'.
 node_modules/chrome-devtools-frontend/front_end/workspace/UISourceCode.js(136,21): error TS2555: Expected at least 2 arguments, but got 1.
 node_modules/chrome-devtools-frontend/front_end/workspace/UISourceCode.js(298,33): error TS2555: Expected at least 2 arguments, but got 1.
@@ -14199,20 +12770,9 @@ node_modules/chrome-devtools-frontend/front_end/workspace/Workspace.js(204,15):
 node_modules/chrome-devtools-frontend/front_end/workspace/Workspace.js(243,25): error TS2352: Conversion of type 'this' to type '{ workspace(): Workspace; id(): string; type(): string; isServiceProject(): boolean; displayName(): string; requestMetadata(uiSourceCode: UISourceCode): Promise<UISourceCodeMetadata>; ... 17 more ...; uiSourceCodes(): UISourceCode[]; }' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
 node_modules/chrome-devtools-frontend/front_end/workspace/Workspace.js(243,25): error TS2352: Conversion of type 'this' to type '{ workspace(): Workspace; id(): string; type(): string; isServiceProject(): boolean; displayName(): string; requestMetadata(uiSourceCode: UISourceCode): Promise<UISourceCodeMetadata>; ... 17 more ...; uiSourceCodes(): UISourceCode[]; }' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
   Type 'ProjectStore' is missing the following properties from type '{ workspace(): Workspace; id(): string; type(): string; isServiceProject(): boolean; displayName(): string; requestMetadata(uiSourceCode: UISourceCode): Promise<UISourceCodeMetadata>; ... 17 more ...; uiSourceCodes(): UISourceCode[]; }': isServiceProject, requestMetadata, requestFileContent, canSetFileContent, and 14 more.
-node_modules/chrome-devtools-frontend/front_end/workspace/Workspace.js(257,5): error TS2322: Type '{ Debugger: string; Formatter: string; Network: string; Snippets: string; FileSystem: string; ContentScripts: string; Service: string; }' is not assignable to type 'string'.
 node_modules/chrome-devtools-frontend/front_end/workspace/Workspace.js(432,27): error TS2339: Property 'valuesArray' does not exist on type 'Map<string, { workspace(): Workspace; id(): string; type(): string; isServiceProject(): boolean; displayName(): string; requestMetadata(uiSourceCode: UISourceCode): Promise<UISourceCodeMetadata>; ... 17 more ...; uiSourceCodes(): UISourceCode[]; }>'.
-node_modules/chrome-devtools-frontend/front_end/workspace_diff/WorkspaceDiff.js(30,35): error TS2694: Namespace 'Diff.Diff' has no exported member 'DiffArray'.
 node_modules/chrome-devtools-frontend/front_end/workspace_diff/WorkspaceDiff.js(38,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/workspace_diff/WorkspaceDiff.js(38,31): error TS2694: Namespace 'Common' has no exported member 'Event'.
 node_modules/chrome-devtools-frontend/front_end/workspace_diff/WorkspaceDiff.js(47,14): error TS7014: Function type, which lacks return-type annotation, implicitly has an 'any' return type.
-node_modules/chrome-devtools-frontend/front_end/workspace_diff/WorkspaceDiff.js(47,31): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/workspace_diff/WorkspaceDiff.js(72,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/workspace_diff/WorkspaceDiff.js(80,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/workspace_diff/WorkspaceDiff.js(88,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/workspace_diff/WorkspaceDiff.js(96,22): error TS2694: Namespace 'Common' has no exported member 'Event'.
-node_modules/chrome-devtools-frontend/front_end/workspace_diff/WorkspaceDiff.js(194,34): error TS2345: Argument of type 'number' is not assignable to parameter of type '{ WindowDocked: number; WindowUndocked: number; ScriptsBreakpointSet: number; TimelineStarted: number; ProfilesCPUProfileTaken: number; ProfilesHeapProfileTaken: number; AuditsStarted: number; ... 23 more ...; ShowedThirdPartyBadges: number; }'.
-node_modules/chrome-devtools-frontend/front_end/workspace_diff/WorkspaceDiff.js(236,35): error TS2694: Namespace 'Diff.Diff' has no exported member 'DiffArray'.
-node_modules/chrome-devtools-frontend/front_end/workspace_diff/WorkspaceDiff.js(260,35): error TS2694: Namespace 'Diff.Diff' has no exported member 'DiffArray'.
 node_modules/chrome-devtools-frontend/front_end/workspace_diff/WorkspaceDiff.js(301,36): error TS2339: Property '_instance' does not exist on type 'typeof WorkspaceDiff'.
 node_modules/chrome-devtools-frontend/front_end/workspace_diff/WorkspaceDiff.js(302,33): error TS2339: Property '_instance' does not exist on type 'typeof WorkspaceDiff'.
 node_modules/chrome-devtools-frontend/front_end/workspace_diff/WorkspaceDiff.js(303,38): error TS2339: Property '_instance' does not exist on type 'typeof WorkspaceDiff'.
diff --git a/tests/baselines/reference/user/zone.js.log b/tests/baselines/reference/user/zone.js.log
deleted file mode 100644
index f9544396d87..00000000000
--- a/tests/baselines/reference/user/zone.js.log
+++ /dev/null
@@ -1,7 +0,0 @@
-Exit Code: 1
-Standard output:
-node_modules/zone.js/dist/zone.js.d.ts(292,36): error TS2304: Cannot find name '_PatchFn'.
-
-
-
-Standard error:

From d75740280f2d0c1f71b4386fce6a7fe73a7732b2 Mon Sep 17 00:00:00 2001
From: Ron Buckton <ron.buckton@microsoft.com>
Date: Tue, 6 Aug 2019 13:48:58 -0700
Subject: [PATCH 121/151] Resolve module specifier relative to
 moduleFile.originalFileName (#32722)

* Resolve module specifier relative to moduleFile.originalFileName

* Use baseline testing for outputs

* Added skipLibCheck to test

* Switch to using vfs.formatPatch for output
---
 src/compiler/moduleSpecifiers.ts              |   2 +-
 src/harness/vfs.ts                            |  26 +-
 src/testRunner/tsconfig.json                  |   1 +
 .../unittests/config/projectReferences.ts     |   1 -
 .../unittests/tsbuild/moduleSpecifiers.ts     |  98 +++++
 .../initial-build/resolves-correctly.js       | 348 ++++++++++++++++++
 6 files changed, 472 insertions(+), 4 deletions(-)
 create mode 100644 src/testRunner/unittests/tsbuild/moduleSpecifiers.ts
 create mode 100644 tests/baselines/reference/tsbuild/moduleSpecifiers/initial-build/resolves-correctly.js

diff --git a/src/compiler/moduleSpecifiers.ts b/src/compiler/moduleSpecifiers.ts
index bc448698c69..fbed429e312 100644
--- a/src/compiler/moduleSpecifiers.ts
+++ b/src/compiler/moduleSpecifiers.ts
@@ -93,7 +93,7 @@ namespace ts.moduleSpecifiers {
 
         const info = getInfo(importingSourceFile.path, host);
         const moduleSourceFile = getSourceFileOfNode(moduleSymbol.valueDeclaration || getNonAugmentationDeclaration(moduleSymbol));
-        const modulePaths = getAllModulePaths(files, importingSourceFile.path, moduleSourceFile.fileName, info.getCanonicalFileName, host, redirectTargetsMap);
+        const modulePaths = getAllModulePaths(files, importingSourceFile.path, moduleSourceFile.originalFileName, info.getCanonicalFileName, host, redirectTargetsMap);
 
         const preferences = getPreferences(userPreferences, compilerOptions, importingSourceFile);
         const global = mapDefined(modulePaths, moduleFileName => tryGetModuleNameAsNodeModule(moduleFileName, info, host, compilerOptions));
diff --git a/src/harness/vfs.ts b/src/harness/vfs.ts
index b20c04937f8..5ef5851433a 100644
--- a/src/harness/vfs.ts
+++ b/src/harness/vfs.ts
@@ -1525,8 +1525,11 @@ namespace vfs {
         return typeof value === "string" || Buffer.isBuffer(value) ? new File(value) : new Directory(value);
     }
 
-    export function formatPatch(patch: FileSet) {
-        return formatPatchWorker("", patch);
+    export function formatPatch(patch: FileSet): string;
+    export function formatPatch(patch: FileSet | undefined): string | null;
+    export function formatPatch(patch: FileSet | undefined) {
+        // tslint:disable-next-line:no-null-keyword
+        return patch ? formatPatchWorker("", patch) : null;
     }
 
     function formatPatchWorker(dirname: string, container: FileSet): string {
@@ -1559,5 +1562,24 @@ namespace vfs {
         }
         return text;
     }
+
+    export function iteratePatch(patch: FileSet | undefined): IterableIterator<[string, string]> | null {
+        // tslint:disable-next-line:no-null-keyword
+        return patch ? Harness.Compiler.iterateOutputs(iteratePatchWorker("", patch)) : null;
+    }
+
+    function* iteratePatchWorker(dirname: string, container: FileSet): IterableIterator<documents.TextDocument> {
+        for (const name of Object.keys(container)) {
+            const entry = normalizeFileSetEntry(container[name]);
+            const file = dirname ? vpath.combine(dirname, name) : name;
+            if (entry instanceof Directory) {
+                yield* ts.arrayFrom(iteratePatchWorker(file, entry.files));
+            }
+            else if (entry instanceof File) {
+                const content = typeof entry.data === "string" ? entry.data : entry.data.toString("utf8");
+                yield new documents.TextDocument(file, content);
+            }
+        }
+    }
 }
 // tslint:enable:no-null-keyword
\ No newline at end of file
diff --git a/src/testRunner/tsconfig.json b/src/testRunner/tsconfig.json
index c1e56ddc34b..e7ff655ce10 100644
--- a/src/testRunner/tsconfig.json
+++ b/src/testRunner/tsconfig.json
@@ -98,6 +98,7 @@
         "unittests/tsbuild/inferredTypeFromTransitiveModule.ts",
         "unittests/tsbuild/lateBoundSymbol.ts",
         "unittests/tsbuild/missingExtendedFile.ts",
+        "unittests/tsbuild/moduleSpecifiers.ts",
         "unittests/tsbuild/outFile.ts",
         "unittests/tsbuild/referencesWithRootDirInParent.ts",
         "unittests/tsbuild/resolveJsonModule.ts",
diff --git a/src/testRunner/unittests/config/projectReferences.ts b/src/testRunner/unittests/config/projectReferences.ts
index 9bbef4e631f..305cc726c97 100644
--- a/src/testRunner/unittests/config/projectReferences.ts
+++ b/src/testRunner/unittests/config/projectReferences.ts
@@ -348,5 +348,4 @@ namespace ts {
             });
         });
     });
-
 }
diff --git a/src/testRunner/unittests/tsbuild/moduleSpecifiers.ts b/src/testRunner/unittests/tsbuild/moduleSpecifiers.ts
new file mode 100644
index 00000000000..ad0a229e876
--- /dev/null
+++ b/src/testRunner/unittests/tsbuild/moduleSpecifiers.ts
@@ -0,0 +1,98 @@
+namespace ts {
+    // https://github.com/microsoft/TypeScript/issues/31696
+    it("unittests:: tsbuild:: moduleSpecifiers:: synthesized module specifiers to referenced projects resolve correctly", () => {
+        const baseFs = vfs.createFromFileSystem(Harness.IO, /*ignoreCase*/ false, {
+            files: {
+                "/src/common/nominal.ts": utils.dedent`
+                    export declare type Nominal<T, Name extends string> = T & {
+                        [Symbol.species]: Name;
+                    };
+                    `,
+                "/src/common/tsconfig.json": utils.dedent`
+                    {
+                        "extends": "../../tsconfig.base.json",
+                        "compilerOptions": {
+                            "composite": true
+                        },
+                        "include": ["nominal.ts"]
+                    }`,
+                "/src/sub-project/index.ts": utils.dedent`
+                    import { Nominal } from '../common/nominal';
+
+                    export type MyNominal = Nominal<string, 'MyNominal'>;
+                    `,
+                "/src/sub-project/tsconfig.json": utils.dedent`
+                    {
+                        "extends": "../../tsconfig.base.json",
+                        "compilerOptions": {
+                            "composite": true
+                        },
+                        "references": [
+                            { "path": "../common" }
+                        ],
+                        "include": ["./index.ts"]
+                    }`,
+                "/src/sub-project-2/index.ts": utils.dedent`
+                    import { MyNominal } from '../sub-project/index';
+
+                    const variable = {
+                        key: 'value' as MyNominal,
+                    };
+
+                    export function getVar(): keyof typeof variable {
+                        return 'key';
+                    }
+                    `,
+                "/src/sub-project-2/tsconfig.json": utils.dedent`
+                    {
+                        "extends": "../../tsconfig.base.json",
+                        "compilerOptions": {
+                            "composite": true
+                        },
+                        "references": [
+                            { "path": "../sub-project" }
+                        ],
+                        "include": ["./index.ts"]
+                    }`,
+                "/src/tsconfig.json": utils.dedent`
+                    {
+                        "compilerOptions": {
+                            "composite": true
+                        },
+                        "references": [
+                            { "path": "./sub-project" },
+                            { "path": "./sub-project-2" }
+                        ],
+                        "include": []
+                    }`,
+                "/tsconfig.base.json": utils.dedent`
+                    {
+                        "compilerOptions": {
+                            "skipLibCheck": true,
+                            "rootDir": "./",
+                            "outDir": "lib",
+                            "lib": ["dom", "es2015", "es2015.symbol.wellknown"]
+                        }
+                    }`,
+                "/tsconfig.json": utils.dedent`{
+                    "compilerOptions": {
+                        "composite": true
+                    },
+                    "references": [
+                        { "path": "./src" }
+                    ],
+                    "include": []
+                }`
+            },
+            cwd: "/"
+        });
+        const fs = baseFs.makeReadonly().shadow();
+        const sys = new fakes.System(fs, { executingFilePath: "/", newLine: "\n" });
+        const host = new fakes.SolutionBuilderHost(sys);
+        const builder = createSolutionBuilder(host, ["/tsconfig.json"], { dry: false, force: false, verbose: false });
+        builder.build();
+
+        // Prior to fixing GH31696 the import in `/lib/src/sub-project-2/index.d.ts` was `import("../../lib/src/common/nonterminal")`, which was invalid.
+        Harness.Baseline.runBaseline("tsbuild/moduleSpecifiers/initial-build/resolves-correctly.js", vfs.formatPatch(fs.diff(baseFs)));
+    });
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsbuild/moduleSpecifiers/initial-build/resolves-correctly.js b/tests/baselines/reference/tsbuild/moduleSpecifiers/initial-build/resolves-correctly.js
new file mode 100644
index 00000000000..d8c1cfb360e
--- /dev/null
+++ b/tests/baselines/reference/tsbuild/moduleSpecifiers/initial-build/resolves-correctly.js
@@ -0,0 +1,348 @@
+//// [/lib/src/common/nominal.d.ts]
+export declare type Nominal<T, Name extends string> = T & {
+    [Symbol.species]: Name;
+};
+
+
+//// [/lib/src/common/nominal.js]
+"use strict";
+exports.__esModule = true;
+
+
+//// [/lib/src/common/tsconfig.tsbuildinfo]
+{
+  "program": {
+    "fileInfos": {
+      "../../../.ts/lib.es5.d.ts": {
+        "version": "354625479304",
+        "signature": "354625479304"
+      },
+      "../../../.ts/lib.es2015.d.ts": {
+        "version": "57263133672",
+        "signature": "57263133672"
+      },
+      "../../../.ts/lib.dom.d.ts": {
+        "version": "-1041975536091",
+        "signature": "-1041975536091"
+      },
+      "../../../.ts/lib.es2015.core.d.ts": {
+        "version": "370321249768",
+        "signature": "370321249768"
+      },
+      "../../../.ts/lib.es2015.collection.d.ts": {
+        "version": "-95997535017",
+        "signature": "-95997535017"
+      },
+      "../../../.ts/lib.es2015.generator.d.ts": {
+        "version": "10837180865",
+        "signature": "10837180865"
+      },
+      "../../../.ts/lib.es2015.iterable.d.ts": {
+        "version": "232404497324",
+        "signature": "232404497324"
+      },
+      "../../../.ts/lib.es2015.promise.d.ts": {
+        "version": "235321148269",
+        "signature": "235321148269"
+      },
+      "../../../.ts/lib.es2015.proxy.d.ts": {
+        "version": "55479865087",
+        "signature": "55479865087"
+      },
+      "../../../.ts/lib.es2015.reflect.d.ts": {
+        "version": "30748787093",
+        "signature": "30748787093"
+      },
+      "../../../.ts/lib.es2015.symbol.d.ts": {
+        "version": "9409688441",
+        "signature": "9409688441"
+      },
+      "../../../.ts/lib.es2015.symbol.wellknown.d.ts": {
+        "version": "-67261006573",
+        "signature": "-67261006573"
+      },
+      "../../../src/common/nominal.ts": {
+        "version": "-24498031910",
+        "signature": "-24498031910"
+      }
+    },
+    "options": {
+      "skipLibCheck": true,
+      "rootDir": "../../..",
+      "outDir": "../..",
+      "lib": [
+        "lib.dom.d.ts",
+        "lib.es2015.d.ts",
+        "lib.es2015.symbol.wellknown.d.ts"
+      ],
+      "composite": true,
+      "configFilePath": "../../../src/common/tsconfig.json"
+    },
+    "referencedMap": {},
+    "exportedModulesMap": {},
+    "semanticDiagnosticsPerFile": [
+      "../../../.ts/lib.dom.d.ts",
+      "../../../.ts/lib.es2015.collection.d.ts",
+      "../../../.ts/lib.es2015.core.d.ts",
+      "../../../.ts/lib.es2015.d.ts",
+      "../../../.ts/lib.es2015.generator.d.ts",
+      "../../../.ts/lib.es2015.iterable.d.ts",
+      "../../../.ts/lib.es2015.promise.d.ts",
+      "../../../.ts/lib.es2015.proxy.d.ts",
+      "../../../.ts/lib.es2015.reflect.d.ts",
+      "../../../.ts/lib.es2015.symbol.d.ts",
+      "../../../.ts/lib.es2015.symbol.wellknown.d.ts",
+      "../../../.ts/lib.es5.d.ts",
+      "../../../src/common/nominal.ts"
+    ]
+  },
+  "version": "FakeTSVersion"
+}
+
+//// [/lib/src/sub-project/index.d.ts]
+import { Nominal } from '../common/nominal';
+export declare type MyNominal = Nominal<string, 'MyNominal'>;
+
+
+//// [/lib/src/sub-project/index.js]
+"use strict";
+exports.__esModule = true;
+
+
+//// [/lib/src/sub-project/tsconfig.tsbuildinfo]
+{
+  "program": {
+    "fileInfos": {
+      "../../../.ts/lib.es5.d.ts": {
+        "version": "354625479304",
+        "signature": "354625479304"
+      },
+      "../../../.ts/lib.es2015.d.ts": {
+        "version": "57263133672",
+        "signature": "57263133672"
+      },
+      "../../../.ts/lib.dom.d.ts": {
+        "version": "-1041975536091",
+        "signature": "-1041975536091"
+      },
+      "../../../.ts/lib.es2015.core.d.ts": {
+        "version": "370321249768",
+        "signature": "370321249768"
+      },
+      "../../../.ts/lib.es2015.collection.d.ts": {
+        "version": "-95997535017",
+        "signature": "-95997535017"
+      },
+      "../../../.ts/lib.es2015.generator.d.ts": {
+        "version": "10837180865",
+        "signature": "10837180865"
+      },
+      "../../../.ts/lib.es2015.iterable.d.ts": {
+        "version": "232404497324",
+        "signature": "232404497324"
+      },
+      "../../../.ts/lib.es2015.promise.d.ts": {
+        "version": "235321148269",
+        "signature": "235321148269"
+      },
+      "../../../.ts/lib.es2015.proxy.d.ts": {
+        "version": "55479865087",
+        "signature": "55479865087"
+      },
+      "../../../.ts/lib.es2015.reflect.d.ts": {
+        "version": "30748787093",
+        "signature": "30748787093"
+      },
+      "../../../.ts/lib.es2015.symbol.d.ts": {
+        "version": "9409688441",
+        "signature": "9409688441"
+      },
+      "../../../.ts/lib.es2015.symbol.wellknown.d.ts": {
+        "version": "-67261006573",
+        "signature": "-67261006573"
+      },
+      "../../../src/common/nominal.ts": {
+        "version": "-24498031910",
+        "signature": "-24498031910"
+      },
+      "../../../src/sub-project/index.ts": {
+        "version": "-22894055505",
+        "signature": "-18559108619"
+      }
+    },
+    "options": {
+      "skipLibCheck": true,
+      "rootDir": "../../..",
+      "outDir": "../..",
+      "lib": [
+        "lib.dom.d.ts",
+        "lib.es2015.d.ts",
+        "lib.es2015.symbol.wellknown.d.ts"
+      ],
+      "composite": true,
+      "configFilePath": "../../../src/sub-project/tsconfig.json"
+    },
+    "referencedMap": {
+      "../../../src/sub-project/index.ts": [
+        "../common/nominal.d.ts"
+      ]
+    },
+    "exportedModulesMap": {
+      "../../../src/sub-project/index.ts": [
+        "../common/nominal.d.ts"
+      ]
+    },
+    "semanticDiagnosticsPerFile": [
+      "../../../.ts/lib.dom.d.ts",
+      "../../../.ts/lib.es2015.collection.d.ts",
+      "../../../.ts/lib.es2015.core.d.ts",
+      "../../../.ts/lib.es2015.d.ts",
+      "../../../.ts/lib.es2015.generator.d.ts",
+      "../../../.ts/lib.es2015.iterable.d.ts",
+      "../../../.ts/lib.es2015.promise.d.ts",
+      "../../../.ts/lib.es2015.proxy.d.ts",
+      "../../../.ts/lib.es2015.reflect.d.ts",
+      "../../../.ts/lib.es2015.symbol.d.ts",
+      "../../../.ts/lib.es2015.symbol.wellknown.d.ts",
+      "../../../.ts/lib.es5.d.ts",
+      "../../../src/common/nominal.ts",
+      "../../../src/sub-project/index.ts"
+    ]
+  },
+  "version": "FakeTSVersion"
+}
+
+//// [/lib/src/sub-project-2/index.d.ts]
+declare const variable: {
+    key: import("../common/nominal").Nominal<string, "MyNominal">;
+};
+export declare function getVar(): keyof typeof variable;
+export {};
+
+
+//// [/lib/src/sub-project-2/index.js]
+"use strict";
+exports.__esModule = true;
+var variable = {
+    key: 'value'
+};
+function getVar() {
+    return 'key';
+}
+exports.getVar = getVar;
+
+
+//// [/lib/src/sub-project-2/tsconfig.tsbuildinfo]
+{
+  "program": {
+    "fileInfos": {
+      "../../../.ts/lib.es5.d.ts": {
+        "version": "354625479304",
+        "signature": "354625479304"
+      },
+      "../../../.ts/lib.es2015.d.ts": {
+        "version": "57263133672",
+        "signature": "57263133672"
+      },
+      "../../../.ts/lib.dom.d.ts": {
+        "version": "-1041975536091",
+        "signature": "-1041975536091"
+      },
+      "../../../.ts/lib.es2015.core.d.ts": {
+        "version": "370321249768",
+        "signature": "370321249768"
+      },
+      "../../../.ts/lib.es2015.collection.d.ts": {
+        "version": "-95997535017",
+        "signature": "-95997535017"
+      },
+      "../../../.ts/lib.es2015.generator.d.ts": {
+        "version": "10837180865",
+        "signature": "10837180865"
+      },
+      "../../../.ts/lib.es2015.iterable.d.ts": {
+        "version": "232404497324",
+        "signature": "232404497324"
+      },
+      "../../../.ts/lib.es2015.promise.d.ts": {
+        "version": "235321148269",
+        "signature": "235321148269"
+      },
+      "../../../.ts/lib.es2015.proxy.d.ts": {
+        "version": "55479865087",
+        "signature": "55479865087"
+      },
+      "../../../.ts/lib.es2015.reflect.d.ts": {
+        "version": "30748787093",
+        "signature": "30748787093"
+      },
+      "../../../.ts/lib.es2015.symbol.d.ts": {
+        "version": "9409688441",
+        "signature": "9409688441"
+      },
+      "../../../.ts/lib.es2015.symbol.wellknown.d.ts": {
+        "version": "-67261006573",
+        "signature": "-67261006573"
+      },
+      "../../../src/common/nominal.ts": {
+        "version": "-24498031910",
+        "signature": "-24498031910"
+      },
+      "../../../src/sub-project/index.ts": {
+        "version": "-18559108619",
+        "signature": "-18559108619"
+      },
+      "../../../src/sub-project-2/index.ts": {
+        "version": "-13939373533",
+        "signature": "-33844181688"
+      }
+    },
+    "options": {
+      "skipLibCheck": true,
+      "rootDir": "../../..",
+      "outDir": "../..",
+      "lib": [
+        "lib.dom.d.ts",
+        "lib.es2015.d.ts",
+        "lib.es2015.symbol.wellknown.d.ts"
+      ],
+      "composite": true,
+      "configFilePath": "../../../src/sub-project-2/tsconfig.json"
+    },
+    "referencedMap": {
+      "../../../src/sub-project-2/index.ts": [
+        "../sub-project/index.d.ts"
+      ],
+      "../../../src/sub-project/index.ts": [
+        "../common/nominal.d.ts"
+      ]
+    },
+    "exportedModulesMap": {
+      "../../../src/sub-project-2/index.ts": [
+        "../common/nominal.d.ts"
+      ],
+      "../../../src/sub-project/index.ts": [
+        "../common/nominal.d.ts"
+      ]
+    },
+    "semanticDiagnosticsPerFile": [
+      "../../../.ts/lib.dom.d.ts",
+      "../../../.ts/lib.es2015.collection.d.ts",
+      "../../../.ts/lib.es2015.core.d.ts",
+      "../../../.ts/lib.es2015.d.ts",
+      "../../../.ts/lib.es2015.generator.d.ts",
+      "../../../.ts/lib.es2015.iterable.d.ts",
+      "../../../.ts/lib.es2015.promise.d.ts",
+      "../../../.ts/lib.es2015.proxy.d.ts",
+      "../../../.ts/lib.es2015.reflect.d.ts",
+      "../../../.ts/lib.es2015.symbol.d.ts",
+      "../../../.ts/lib.es2015.symbol.wellknown.d.ts",
+      "../../../.ts/lib.es5.d.ts",
+      "../../../src/common/nominal.ts",
+      "../../../src/sub-project-2/index.ts",
+      "../../../src/sub-project/index.ts"
+    ]
+  },
+  "version": "FakeTSVersion"
+}
+

From e293232f6a4d17cce56e4903dbcae21f1a0722db Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Thu, 1 Aug 2019 10:40:03 -0700
Subject: [PATCH 122/151] Change to missing file watcher on linux and darwin
 explicitly to avoid watching deleted inode

---
 src/compiler/sys.ts | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/compiler/sys.ts b/src/compiler/sys.ts
index 583aaad3cdb..ac710e6992b 100644
--- a/src/compiler/sys.ts
+++ b/src/compiler/sys.ts
@@ -730,6 +730,7 @@ namespace ts {
 
             const nodeVersion = getNodeMajorVersion();
             const isNode4OrLater = nodeVersion! >= 4;
+            const isLinuxOrMacOs = process.platform === "linux" || process.platform === "darwin";
 
             const platform: string = _os.platform();
             const useCaseSensitiveFileNames = isFileSystemCaseSensitive();
@@ -1029,6 +1030,12 @@ namespace ts {
 
             function fsWatch(fileOrDirectory: string, entryKind: FileSystemEntryKind.File | FileSystemEntryKind.Directory, callback: FsWatchCallback, recursive: boolean, fallbackPollingWatchFile: HostWatchFile, pollingInterval?: number): FileWatcher {
                 let options: any;
+                const lastDirectoryPartWithDirectorySeparator = isLinuxOrMacOs ?
+                    fileOrDirectory.substr(fileOrDirectory.lastIndexOf(directorySeparator)) :
+                    undefined;
+                const lastDirectoryPart = isLinuxOrMacOs ?
+                    lastDirectoryPartWithDirectorySeparator!.slice(directorySeparator.length) :
+                    undefined;
                 /** Watcher for the file system entry depending on whether it is missing or present */
                 let watcher = !fileSystemEntryExists(fileOrDirectory, entryKind) ?
                     watchMissingFileSystemEntry() :
@@ -1072,11 +1079,12 @@ namespace ts {
                         }
                     }
                     try {
-
                         const presentWatcher = _fs.watch(
                             fileOrDirectory,
                             options,
-                            callback
+                            isLinuxOrMacOs ?
+                                callbackChangingToMissingFileSystemEntry :
+                                callback
                         );
                         // Watch the missing file or directory or error
                         presentWatcher.on("error", () => invokeCallbackAndUpdateWatcher(watchMissingFileSystemEntry));
@@ -1090,6 +1098,18 @@ namespace ts {
                     }
                 }
 
+                function callbackChangingToMissingFileSystemEntry(event: "rename" | "change", relativeName: string | undefined) {
+                    // because relativeName is not guaranteed to be correct we need to check on each rename with few combinations
+                    // Eg on ubuntoo while watchin app/node_modules the relativeName is "node_modules" which is neither relative nor full path
+                    return event === "rename" &&
+                        (!relativeName ||
+                            relativeName === lastDirectoryPart ||
+                            relativeName.lastIndexOf(lastDirectoryPartWithDirectorySeparator!) === relativeName.length - lastDirectoryPartWithDirectorySeparator!.length) &&
+                        !fileSystemEntryExists(fileOrDirectory, entryKind) ?
+                        invokeCallbackAndUpdateWatcher(watchMissingFileSystemEntry) :
+                        callback(event, relativeName);
+                }
+
                 /**
                  * Watch the file or directory using fs.watchFile since fs.watch threw exception
                  * Eg. on linux the number of watches are limited and one could easily exhaust watches and the exception ENOSPC is thrown when creating watcher at that point

From d00056f096bfb87bf8253e6b0d86f1a518143657 Mon Sep 17 00:00:00 2001
From: Wesley Wigham <wewigham@microsoft.com>
Date: Tue, 6 Aug 2019 14:43:41 -0700
Subject: [PATCH 123/151] Support extended unicode escapes in identifiers, per
 es6 spec (#32725)

---
 src/compiler/scanner.ts                       | 30 +++++++++++++++++++
 ...xtendedUnicodeEscapeSequenceIdentifiers.js | 11 +++++++
 ...edUnicodeEscapeSequenceIdentifiers.symbols | 14 +++++++++
 ...ndedUnicodeEscapeSequenceIdentifiers.types | 18 +++++++++++
 ...xtendedUnicodeEscapeSequenceIdentifiers.ts |  5 ++++
 5 files changed, 78 insertions(+)
 create mode 100644 tests/baselines/reference/extendedUnicodeEscapeSequenceIdentifiers.js
 create mode 100644 tests/baselines/reference/extendedUnicodeEscapeSequenceIdentifiers.symbols
 create mode 100644 tests/baselines/reference/extendedUnicodeEscapeSequenceIdentifiers.types
 create mode 100644 tests/cases/compiler/extendedUnicodeEscapeSequenceIdentifiers.ts

diff --git a/src/compiler/scanner.ts b/src/compiler/scanner.ts
index 7eaca34a212..735a7bf9d44 100644
--- a/src/compiler/scanner.ts
+++ b/src/compiler/scanner.ts
@@ -1342,6 +1342,19 @@ namespace ts {
             return -1;
         }
 
+
+        function peekExtendedUnicodeEscape(): number {
+            if (languageVersion >= ScriptTarget.ES2015 && codePointAt(text, pos + 1) === CharacterCodes.u && codePointAt(text, pos + 2) === CharacterCodes.openBrace) {
+                const start = pos;
+                pos += 3;
+                const escapedValueString = scanMinimumNumberOfHexDigits(1, /*canHaveSeparators*/ false);
+                const escapedValue = escapedValueString ? parseInt(escapedValueString, 16) : -1;
+                pos = start;
+                return escapedValue;
+            }
+            return -1;
+        }
+
         function scanIdentifierParts(): string {
             let result = "";
             let start = pos;
@@ -1351,6 +1364,14 @@ namespace ts {
                     pos += charSize(ch);
                 }
                 else if (ch === CharacterCodes.backslash) {
+                    ch = peekExtendedUnicodeEscape();
+                    if (ch >= 0 && isIdentifierPart(ch, languageVersion)) {
+                        pos += 3;
+                        tokenFlags |= TokenFlags.ExtendedUnicodeEscape;
+                        result += scanExtendedUnicodeEscape();
+                        start = pos;
+                        continue;
+                    }
                     ch = peekUnicodeEscape();
                     if (!(ch >= 0 && isIdentifierPart(ch, languageVersion))) {
                         break;
@@ -1836,12 +1857,21 @@ namespace ts {
                         pos++;
                         return token = SyntaxKind.AtToken;
                     case CharacterCodes.backslash:
+                        const extendedCookedChar = peekExtendedUnicodeEscape();
+                        if (extendedCookedChar >= 0 && isIdentifierStart(extendedCookedChar, languageVersion)) {
+                            pos += 3;
+                            tokenFlags |= TokenFlags.ExtendedUnicodeEscape;
+                            tokenValue = scanExtendedUnicodeEscape() + scanIdentifierParts();
+                            return token = getIdentifierToken();
+                        }
+
                         const cookedChar = peekUnicodeEscape();
                         if (cookedChar >= 0 && isIdentifierStart(cookedChar, languageVersion)) {
                             pos += 6;
                             tokenValue = String.fromCharCode(cookedChar) + scanIdentifierParts();
                             return token = getIdentifierToken();
                         }
+
                         error(Diagnostics.Invalid_character);
                         pos++;
                         return token = SyntaxKind.Unknown;
diff --git a/tests/baselines/reference/extendedUnicodeEscapeSequenceIdentifiers.js b/tests/baselines/reference/extendedUnicodeEscapeSequenceIdentifiers.js
new file mode 100644
index 00000000000..619bb8ae284
--- /dev/null
+++ b/tests/baselines/reference/extendedUnicodeEscapeSequenceIdentifiers.js
@@ -0,0 +1,11 @@
+//// [extendedUnicodeEscapeSequenceIdentifiers.ts]
+const \u{0061} = 12;
+const a\u{0061} = 12;
+
+console.log(a + aa);
+
+
+//// [extendedUnicodeEscapeSequenceIdentifiers.js]
+const \u{0061} = 12;
+const a\u{0061} = 12;
+console.log(a + aa);
diff --git a/tests/baselines/reference/extendedUnicodeEscapeSequenceIdentifiers.symbols b/tests/baselines/reference/extendedUnicodeEscapeSequenceIdentifiers.symbols
new file mode 100644
index 00000000000..ad4f2c1e89e
--- /dev/null
+++ b/tests/baselines/reference/extendedUnicodeEscapeSequenceIdentifiers.symbols
@@ -0,0 +1,14 @@
+=== tests/cases/compiler/extendedUnicodeEscapeSequenceIdentifiers.ts ===
+const \u{0061} = 12;
+>\u{0061} : Symbol(\u{0061}, Decl(extendedUnicodeEscapeSequenceIdentifiers.ts, 0, 5))
+
+const a\u{0061} = 12;
+>a\u{0061} : Symbol(a\u{0061}, Decl(extendedUnicodeEscapeSequenceIdentifiers.ts, 1, 5))
+
+console.log(a + aa);
+>console.log : Symbol(Console.log, Decl(lib.dom.d.ts, --, --))
+>console : Symbol(console, Decl(lib.dom.d.ts, --, --))
+>log : Symbol(Console.log, Decl(lib.dom.d.ts, --, --))
+>a : Symbol(\u{0061}, Decl(extendedUnicodeEscapeSequenceIdentifiers.ts, 0, 5))
+>aa : Symbol(a\u{0061}, Decl(extendedUnicodeEscapeSequenceIdentifiers.ts, 1, 5))
+
diff --git a/tests/baselines/reference/extendedUnicodeEscapeSequenceIdentifiers.types b/tests/baselines/reference/extendedUnicodeEscapeSequenceIdentifiers.types
new file mode 100644
index 00000000000..9189c4a8813
--- /dev/null
+++ b/tests/baselines/reference/extendedUnicodeEscapeSequenceIdentifiers.types
@@ -0,0 +1,18 @@
+=== tests/cases/compiler/extendedUnicodeEscapeSequenceIdentifiers.ts ===
+const \u{0061} = 12;
+>\u{0061} : 12
+>12 : 12
+
+const a\u{0061} = 12;
+>a\u{0061} : 12
+>12 : 12
+
+console.log(a + aa);
+>console.log(a + aa) : void
+>console.log : (message?: any, ...optionalParams: any[]) => void
+>console : Console
+>log : (message?: any, ...optionalParams: any[]) => void
+>a + aa : number
+>a : 12
+>aa : 12
+
diff --git a/tests/cases/compiler/extendedUnicodeEscapeSequenceIdentifiers.ts b/tests/cases/compiler/extendedUnicodeEscapeSequenceIdentifiers.ts
new file mode 100644
index 00000000000..466c73c42da
--- /dev/null
+++ b/tests/cases/compiler/extendedUnicodeEscapeSequenceIdentifiers.ts
@@ -0,0 +1,5 @@
+// @target: es6
+const \u{0061} = 12;
+const a\u{0061} = 12;
+
+console.log(a + aa);

From 480b73915fdd805952fd355e4cf3e1bc803e0878 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com>
Date: Tue, 6 Aug 2019 15:03:24 -0700
Subject: [PATCH 124/151] Improve excess property checking for intersections
 (#32582)

* Improve excess property checking for intersections

Still a draft, the implementation needs improvement

* Use mutable isIntersection in checkTypeRelatedTo

This makes parameter lists a lot shorter. Seems like a slight
improvement, although I can revert if I change my mind.

* Fix semicolon lint

* Remove TODOOOO

* Revert "Use mutable isIntersection in checkTypeRelatedTo"

This reverts commit b8dccff2a25495867cff070b94601015e689b8ff.
---
 src/compiler/checker.ts                       | 54 +++++++++---------
 ...ropertyCheckWithNestedArrayIntersection.js | 34 +++++++++++
 ...tyCheckWithNestedArrayIntersection.symbols | 56 +++++++++++++++++++
 ...ertyCheckWithNestedArrayIntersection.types | 54 ++++++++++++++++++
 ...tyChecksWithNestedIntersections.errors.txt |  2 +-
 ...ssPropertyChecksWithNestedIntersections.js |  4 +-
 ...pertyChecksWithNestedIntersections.symbols |  2 +-
 ...ropertyChecksWithNestedIntersections.types |  2 +-
 tests/baselines/reference/weakType.errors.txt | 16 ++----
 tests/baselines/reference/weakType.js         |  6 +-
 tests/baselines/reference/weakType.symbols    | 10 ++--
 tests/baselines/reference/weakType.types      |  8 +--
 ...ropertyCheckWithNestedArrayIntersection.ts | 22 ++++++++
 ...ssPropertyChecksWithNestedIntersections.ts |  2 +-
 tests/cases/compiler/weakType.ts              |  4 +-
 tests/cases/user/prettier/prettier            |  2 +-
 16 files changed, 220 insertions(+), 58 deletions(-)
 create mode 100644 tests/baselines/reference/excessPropertyCheckWithNestedArrayIntersection.js
 create mode 100644 tests/baselines/reference/excessPropertyCheckWithNestedArrayIntersection.symbols
 create mode 100644 tests/baselines/reference/excessPropertyCheckWithNestedArrayIntersection.types
 create mode 100644 tests/cases/compiler/excessPropertyCheckWithNestedArrayIntersection.ts

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index ab0d9b385f4..30637c3cebc 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -12802,7 +12802,7 @@ namespace ts {
                     isSimpleTypeRelatedTo(source, target, relation, reportErrors ? reportError : undefined)) return Ternary.True;
 
                 const isComparingJsxAttributes = !!(getObjectFlags(source) & ObjectFlags.JsxAttributes);
-                const isPerformingExcessPropertyChecks = (isObjectLiteralType(source) && getObjectFlags(source) & ObjectFlags.FreshLiteral);
+                const isPerformingExcessPropertyChecks = !isApparentIntersectionConstituent && (isObjectLiteralType(source) && getObjectFlags(source) & ObjectFlags.FreshLiteral);
                 if (isPerformingExcessPropertyChecks) {
                     const discriminantType = target.flags & TypeFlags.Union ? findMatchingDiscriminantType(source, target as UnionType) : undefined;
                     if (hasExcessProperties(<FreshObjectLiteralType>source, target, discriminantType, reportErrors)) {
@@ -12813,11 +12813,11 @@ namespace ts {
                     }
                 }
 
-                if (relation !== comparableRelation && !isApparentIntersectionConstituent &&
+                const isPerformingCommonPropertyChecks = relation !== comparableRelation && !isApparentIntersectionConstituent &&
                     source.flags & (TypeFlags.Primitive | TypeFlags.Object | TypeFlags.Intersection) && source !== globalObjectType &&
                     target.flags & (TypeFlags.Object | TypeFlags.Intersection) && isWeakType(target) &&
-                    (getPropertiesOfType(source).length > 0 || typeHasCallOrConstructSignatures(source)) &&
-                    !hasCommonProperties(source, target, isComparingJsxAttributes)) {
+                    (getPropertiesOfType(source).length > 0 || typeHasCallOrConstructSignatures(source));
+                if (isPerformingCommonPropertyChecks && !hasCommonProperties(source, target, isComparingJsxAttributes)) {
                     if (reportErrors) {
                         const calls = getSignaturesOfType(source, SignatureKind.Call);
                         const constructs = getSignaturesOfType(source, SignatureKind.Construct);
@@ -12847,10 +12847,10 @@ namespace ts {
                 else {
                     if (target.flags & TypeFlags.Union) {
                         result = typeRelatedToSomeType(getRegularTypeOfObjectLiteral(source), <UnionType>target, reportErrors && !(source.flags & TypeFlags.Primitive) && !(target.flags & TypeFlags.Primitive));
-                        if (result && isPerformingExcessPropertyChecks) {
+                        if (result && (isPerformingExcessPropertyChecks || isPerformingCommonPropertyChecks)) {
                             // Validate against excess props using the original `source`
                             const discriminantType = findMatchingDiscriminantType(source, target as UnionType) || filterPrimitivesIfContainsNonPrimitive(target as UnionType);
-                            if (!propertiesRelatedTo(source, discriminantType, reportErrors, /*excludedProperties*/ undefined)) {
+                            if (!propertiesRelatedTo(source, discriminantType, reportErrors, /*excludedProperties*/ undefined, isIntersectionConstituent)) {
                                 return Ternary.False;
                             }
                         }
@@ -12858,9 +12858,9 @@ namespace ts {
                     else if (target.flags & TypeFlags.Intersection) {
                         isIntersectionConstituent = true; // set here to affect the following trio of checks
                         result = typeRelatedToEachType(getRegularTypeOfObjectLiteral(source), target as IntersectionType, reportErrors);
-                        if (result && isPerformingExcessPropertyChecks) {
+                        if (result && (isPerformingExcessPropertyChecks || isPerformingCommonPropertyChecks)) {
                             // Validate against excess props using the original `source`
-                            if (!propertiesRelatedTo(source, target, reportErrors, /*excludedProperties*/ undefined)) {
+                            if (!propertiesRelatedTo(source, target, reportErrors, /*excludedProperties*/ undefined, /*isIntersectionConstituent*/ false)) {
                                 return Ternary.False;
                             }
                         }
@@ -13186,7 +13186,7 @@ namespace ts {
                 return result;
             }
 
-            function typeArgumentsRelatedTo(sources: ReadonlyArray<Type> = emptyArray, targets: ReadonlyArray<Type> = emptyArray, variances: ReadonlyArray<VarianceFlags> = emptyArray, reportErrors: boolean): Ternary {
+            function typeArgumentsRelatedTo(sources: ReadonlyArray<Type> = emptyArray, targets: ReadonlyArray<Type> = emptyArray, variances: ReadonlyArray<VarianceFlags> = emptyArray, reportErrors: boolean, isIntersectionConstituent: boolean): Ternary {
                 if (sources.length !== targets.length && relation === identityRelation) {
                     return Ternary.False;
                 }
@@ -13210,10 +13210,10 @@ namespace ts {
                             related = relation === identityRelation ? isRelatedTo(s, t, /*reportErrors*/ false) : compareTypesIdentical(s, t);
                         }
                         else if (variance === VarianceFlags.Covariant) {
-                            related = isRelatedTo(s, t, reportErrors);
+                            related = isRelatedTo(s, t, reportErrors, /*headMessage*/ undefined, isIntersectionConstituent);
                         }
                         else if (variance === VarianceFlags.Contravariant) {
-                            related = isRelatedTo(t, s, reportErrors);
+                            related = isRelatedTo(t, s, reportErrors, /*headMessage*/ undefined, isIntersectionConstituent);
                         }
                         else if (variance === VarianceFlags.Bivariant) {
                             // In the bivariant case we first compare contravariantly without reporting
@@ -13222,16 +13222,16 @@ namespace ts {
                             // which is generally easier to reason about.
                             related = isRelatedTo(t, s, /*reportErrors*/ false);
                             if (!related) {
-                                related = isRelatedTo(s, t, reportErrors);
+                                related = isRelatedTo(s, t, reportErrors, /*headMessage*/ undefined, isIntersectionConstituent);
                             }
                         }
                         else {
                             // In the invariant case we first compare covariantly, and only when that
                             // succeeds do we proceed to compare contravariantly. Thus, error elaboration
                             // will typically be based on the covariant check.
-                            related = isRelatedTo(s, t, reportErrors);
+                            related = isRelatedTo(s, t, reportErrors, /*headMessage*/ undefined, isIntersectionConstituent);
                             if (related) {
-                                related &= isRelatedTo(t, s, reportErrors);
+                                related &= isRelatedTo(t, s, reportErrors, /*headMessage*/ undefined, isIntersectionConstituent);
                             }
                         }
                         if (!related) {
@@ -13377,7 +13377,7 @@ namespace ts {
                     source.aliasTypeArguments && source.aliasSymbol === target.aliasSymbol &&
                     !(source.aliasTypeArgumentsContainsMarker || target.aliasTypeArgumentsContainsMarker)) {
                     const variances = getAliasVariances(source.aliasSymbol);
-                    const varianceResult = relateVariances(source.aliasTypeArguments, target.aliasTypeArguments, variances);
+                    const varianceResult = relateVariances(source.aliasTypeArguments, target.aliasTypeArguments, variances, isIntersectionConstituent);
                     if (varianceResult !== undefined) {
                         return varianceResult;
                     }
@@ -13563,7 +13563,7 @@ namespace ts {
                         // type references (which are intended by be compared structurally). Obtain the variance
                         // information for the type parameters and relate the type arguments accordingly.
                         const variances = getVariances((<TypeReference>source).target);
-                        const varianceResult = relateVariances((<TypeReference>source).typeArguments, (<TypeReference>target).typeArguments, variances);
+                        const varianceResult = relateVariances((<TypeReference>source).typeArguments, (<TypeReference>target).typeArguments, variances, isIntersectionConstituent);
                         if (varianceResult !== undefined) {
                             return varianceResult;
                         }
@@ -13591,7 +13591,7 @@ namespace ts {
                     if (source.flags & (TypeFlags.Object | TypeFlags.Intersection) && target.flags & TypeFlags.Object) {
                         // Report structural errors only if we haven't reported any errors yet
                         const reportStructuralErrors = reportErrors && errorInfo === saveErrorInfo && !sourceIsPrimitive;
-                        result = propertiesRelatedTo(source, target, reportStructuralErrors, /*excludedProperties*/ undefined);
+                        result = propertiesRelatedTo(source, target, reportStructuralErrors, /*excludedProperties*/ undefined, isIntersectionConstituent);
                         if (result) {
                             result &= signaturesRelatedTo(source, target, SignatureKind.Call, reportStructuralErrors);
                             if (result) {
@@ -13627,8 +13627,8 @@ namespace ts {
                 }
                 return Ternary.False;
 
-                function relateVariances(sourceTypeArguments: ReadonlyArray<Type> | undefined, targetTypeArguments: ReadonlyArray<Type> | undefined, variances: VarianceFlags[]) {
-                    if (result = typeArgumentsRelatedTo(sourceTypeArguments, targetTypeArguments, variances, reportErrors)) {
+                function relateVariances(sourceTypeArguments: ReadonlyArray<Type> | undefined, targetTypeArguments: ReadonlyArray<Type> | undefined, variances: VarianceFlags[], isIntersectionConstituent: boolean) {
+                    if (result = typeArgumentsRelatedTo(sourceTypeArguments, targetTypeArguments, variances, reportErrors, isIntersectionConstituent)) {
                         return result;
                     }
                     if (some(variances, v => !!(v & VarianceFlags.AllowsStructuralFallback))) {
@@ -13756,7 +13756,7 @@ namespace ts {
                             if (!targetProperty) continue outer;
                             if (sourceProperty === targetProperty) continue;
                             // We compare the source property to the target in the context of a single discriminant type.
-                            const related = propertyRelatedTo(source, target, sourceProperty, targetProperty, _ => combination[i], /*reportErrors*/ false);
+                            const related = propertyRelatedTo(source, target, sourceProperty, targetProperty, _ => combination[i], /*reportErrors*/ false, /*isIntersectionConstituent*/ false);
                             // If the target property could not be found, or if the properties were not related,
                             // then this constituent is not a match.
                             if (!related) {
@@ -13775,7 +13775,7 @@ namespace ts {
                 // Compare the remaining non-discriminant properties of each match.
                 let result = Ternary.True;
                 for (const type of matchingTypes) {
-                    result &= propertiesRelatedTo(source, type, /*reportErrors*/ false, excludedProperties);
+                    result &= propertiesRelatedTo(source, type, /*reportErrors*/ false, excludedProperties, /*isIntersectionConstituent*/ false);
                     if (result) {
                         result &= signaturesRelatedTo(source, type, SignatureKind.Call, /*reportStructuralErrors*/ false);
                         if (result) {
@@ -13811,7 +13811,7 @@ namespace ts {
                 return result || properties;
             }
 
-            function isPropertySymbolTypeRelated(sourceProp: Symbol, targetProp: Symbol, getTypeOfSourceProperty: (sym: Symbol) => Type, reportErrors: boolean): Ternary {
+            function isPropertySymbolTypeRelated(sourceProp: Symbol, targetProp: Symbol, getTypeOfSourceProperty: (sym: Symbol) => Type, reportErrors: boolean, isIntersectionConstituent: boolean): Ternary {
                 const targetIsOptional = strictNullChecks && !!(getCheckFlags(targetProp) & CheckFlags.Partial);
                 const source = getTypeOfSourceProperty(sourceProp);
                 if (getCheckFlags(targetProp) & CheckFlags.DeferredType && !getSymbolLinks(targetProp).type) {
@@ -13850,11 +13850,11 @@ namespace ts {
                     return result;
                 }
                 else {
-                    return isRelatedTo(source, addOptionality(getTypeOfSymbol(targetProp), targetIsOptional), reportErrors);
+                    return isRelatedTo(source, addOptionality(getTypeOfSymbol(targetProp), targetIsOptional), reportErrors, /*headMessage*/ undefined, isIntersectionConstituent);
                 }
             }
 
-            function propertyRelatedTo(source: Type, target: Type, sourceProp: Symbol, targetProp: Symbol, getTypeOfSourceProperty: (sym: Symbol) => Type, reportErrors: boolean): Ternary {
+            function propertyRelatedTo(source: Type, target: Type, sourceProp: Symbol, targetProp: Symbol, getTypeOfSourceProperty: (sym: Symbol) => Type, reportErrors: boolean, isIntersectionConstituent: boolean): Ternary {
                 const sourcePropFlags = getDeclarationModifierFlagsFromSymbol(sourceProp);
                 const targetPropFlags = getDeclarationModifierFlagsFromSymbol(targetProp);
                 if (sourcePropFlags & ModifierFlags.Private || targetPropFlags & ModifierFlags.Private) {
@@ -13896,7 +13896,7 @@ namespace ts {
                     return Ternary.False;
                 }
                 // If the target comes from a partial union prop, allow `undefined` in the target type
-                const related = isPropertySymbolTypeRelated(sourceProp, targetProp, getTypeOfSourceProperty, reportErrors);
+                const related = isPropertySymbolTypeRelated(sourceProp, targetProp, getTypeOfSourceProperty, reportErrors, isIntersectionConstituent);
                 if (!related) {
                     if (reportErrors) {
                         reportError(Diagnostics.Types_of_property_0_are_incompatible, symbolToString(targetProp));
@@ -13921,7 +13921,7 @@ namespace ts {
                 return related;
             }
 
-            function propertiesRelatedTo(source: Type, target: Type, reportErrors: boolean, excludedProperties: UnderscoreEscapedMap<true> | undefined): Ternary {
+            function propertiesRelatedTo(source: Type, target: Type, reportErrors: boolean, excludedProperties: UnderscoreEscapedMap<true> | undefined, isIntersectionConstituent: boolean): Ternary {
                 if (relation === identityRelation) {
                     return propertiesIdenticalTo(source, target, excludedProperties);
                 }
@@ -14008,7 +14008,7 @@ namespace ts {
                     if (!(targetProp.flags & SymbolFlags.Prototype)) {
                         const sourceProp = getPropertyOfType(source, targetProp.escapedName);
                         if (sourceProp && sourceProp !== targetProp) {
-                            const related = propertyRelatedTo(source, target, sourceProp, targetProp, getTypeOfSymbol, reportErrors);
+                            const related = propertyRelatedTo(source, target, sourceProp, targetProp, getTypeOfSymbol, reportErrors, isIntersectionConstituent);
                             if (!related) {
                                 return Ternary.False;
                             }
diff --git a/tests/baselines/reference/excessPropertyCheckWithNestedArrayIntersection.js b/tests/baselines/reference/excessPropertyCheckWithNestedArrayIntersection.js
new file mode 100644
index 00000000000..0f9085edd10
--- /dev/null
+++ b/tests/baselines/reference/excessPropertyCheckWithNestedArrayIntersection.js
@@ -0,0 +1,34 @@
+//// [excessPropertyCheckWithNestedArrayIntersection.ts]
+interface ValueOnlyFields {
+    fields: Array<{
+        value: number | null;
+    }>;
+}
+interface ValueAndKeyFields {
+    fields: Array<{
+        key: string | null;
+        value: number | null;
+    }>;
+}
+interface BugRepro {
+  dataType: ValueAndKeyFields & ValueOnlyFields;
+}
+const repro: BugRepro = {
+  dataType: {
+    fields: [{
+      key: 'bla', // should be OK: Not excess
+      value: null,
+    }],
+  }
+}
+
+
+//// [excessPropertyCheckWithNestedArrayIntersection.js]
+var repro = {
+    dataType: {
+        fields: [{
+                key: 'bla',
+                value: null
+            }]
+    }
+};
diff --git a/tests/baselines/reference/excessPropertyCheckWithNestedArrayIntersection.symbols b/tests/baselines/reference/excessPropertyCheckWithNestedArrayIntersection.symbols
new file mode 100644
index 00000000000..7d1ec2afde4
--- /dev/null
+++ b/tests/baselines/reference/excessPropertyCheckWithNestedArrayIntersection.symbols
@@ -0,0 +1,56 @@
+=== tests/cases/compiler/excessPropertyCheckWithNestedArrayIntersection.ts ===
+interface ValueOnlyFields {
+>ValueOnlyFields : Symbol(ValueOnlyFields, Decl(excessPropertyCheckWithNestedArrayIntersection.ts, 0, 0))
+
+    fields: Array<{
+>fields : Symbol(ValueOnlyFields.fields, Decl(excessPropertyCheckWithNestedArrayIntersection.ts, 0, 27))
+>Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+
+        value: number | null;
+>value : Symbol(value, Decl(excessPropertyCheckWithNestedArrayIntersection.ts, 1, 19))
+
+    }>;
+}
+interface ValueAndKeyFields {
+>ValueAndKeyFields : Symbol(ValueAndKeyFields, Decl(excessPropertyCheckWithNestedArrayIntersection.ts, 4, 1))
+
+    fields: Array<{
+>fields : Symbol(ValueAndKeyFields.fields, Decl(excessPropertyCheckWithNestedArrayIntersection.ts, 5, 29))
+>Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+
+        key: string | null;
+>key : Symbol(key, Decl(excessPropertyCheckWithNestedArrayIntersection.ts, 6, 19))
+
+        value: number | null;
+>value : Symbol(value, Decl(excessPropertyCheckWithNestedArrayIntersection.ts, 7, 27))
+
+    }>;
+}
+interface BugRepro {
+>BugRepro : Symbol(BugRepro, Decl(excessPropertyCheckWithNestedArrayIntersection.ts, 10, 1))
+
+  dataType: ValueAndKeyFields & ValueOnlyFields;
+>dataType : Symbol(BugRepro.dataType, Decl(excessPropertyCheckWithNestedArrayIntersection.ts, 11, 20))
+>ValueAndKeyFields : Symbol(ValueAndKeyFields, Decl(excessPropertyCheckWithNestedArrayIntersection.ts, 4, 1))
+>ValueOnlyFields : Symbol(ValueOnlyFields, Decl(excessPropertyCheckWithNestedArrayIntersection.ts, 0, 0))
+}
+const repro: BugRepro = {
+>repro : Symbol(repro, Decl(excessPropertyCheckWithNestedArrayIntersection.ts, 14, 5))
+>BugRepro : Symbol(BugRepro, Decl(excessPropertyCheckWithNestedArrayIntersection.ts, 10, 1))
+
+  dataType: {
+>dataType : Symbol(dataType, Decl(excessPropertyCheckWithNestedArrayIntersection.ts, 14, 25))
+
+    fields: [{
+>fields : Symbol(fields, Decl(excessPropertyCheckWithNestedArrayIntersection.ts, 15, 13))
+
+      key: 'bla', // should be OK: Not excess
+>key : Symbol(key, Decl(excessPropertyCheckWithNestedArrayIntersection.ts, 16, 14))
+
+      value: null,
+>value : Symbol(value, Decl(excessPropertyCheckWithNestedArrayIntersection.ts, 17, 17))
+
+    }],
+  }
+}
+
diff --git a/tests/baselines/reference/excessPropertyCheckWithNestedArrayIntersection.types b/tests/baselines/reference/excessPropertyCheckWithNestedArrayIntersection.types
new file mode 100644
index 00000000000..8b819992a09
--- /dev/null
+++ b/tests/baselines/reference/excessPropertyCheckWithNestedArrayIntersection.types
@@ -0,0 +1,54 @@
+=== tests/cases/compiler/excessPropertyCheckWithNestedArrayIntersection.ts ===
+interface ValueOnlyFields {
+    fields: Array<{
+>fields : { value: number; }[]
+
+        value: number | null;
+>value : number
+>null : null
+
+    }>;
+}
+interface ValueAndKeyFields {
+    fields: Array<{
+>fields : { key: string; value: number; }[]
+
+        key: string | null;
+>key : string
+>null : null
+
+        value: number | null;
+>value : number
+>null : null
+
+    }>;
+}
+interface BugRepro {
+  dataType: ValueAndKeyFields & ValueOnlyFields;
+>dataType : ValueAndKeyFields & ValueOnlyFields
+}
+const repro: BugRepro = {
+>repro : BugRepro
+>{  dataType: {    fields: [{      key: 'bla', // should be OK: Not excess      value: null,    }],  }} : { dataType: { fields: { key: string; value: null; }[]; }; }
+
+  dataType: {
+>dataType : { fields: { key: string; value: null; }[]; }
+>{    fields: [{      key: 'bla', // should be OK: Not excess      value: null,    }],  } : { fields: { key: string; value: null; }[]; }
+
+    fields: [{
+>fields : { key: string; value: null; }[]
+>[{      key: 'bla', // should be OK: Not excess      value: null,    }] : { key: string; value: null; }[]
+>{      key: 'bla', // should be OK: Not excess      value: null,    } : { key: string; value: null; }
+
+      key: 'bla', // should be OK: Not excess
+>key : string
+>'bla' : "bla"
+
+      value: null,
+>value : null
+>null : null
+
+    }],
+  }
+}
+
diff --git a/tests/baselines/reference/excessPropertyChecksWithNestedIntersections.errors.txt b/tests/baselines/reference/excessPropertyChecksWithNestedIntersections.errors.txt
index 368a71de003..32ee6b530f8 100644
--- a/tests/baselines/reference/excessPropertyChecksWithNestedIntersections.errors.txt
+++ b/tests/baselines/reference/excessPropertyChecksWithNestedIntersections.errors.txt
@@ -47,7 +47,7 @@ tests/cases/compiler/excessPropertyChecksWithNestedIntersections.ts(70,50): erro
                       ~
 !!! error TS2322: Type 'number' is not assignable to type 'string'.
 !!! related TS6500 tests/cases/compiler/excessPropertyChecksWithNestedIntersections.ts:4:5: The expected type comes from property 'x' which is declared here on type 'A'
-    let f: D = { a: { x: 'hello', y: 2 }, c: 5 }; // should be an error
+    let f: D = { a: { x: 'hello', y: 2 }, c: 5 }; // error - y does not exist in type A
                                   ~~~~
 !!! error TS2322: Type '{ x: string; y: number; }' is not assignable to type 'A'.
 !!! error TS2322:   Object literal may only specify known properties, and 'y' does not exist in type 'A'.
diff --git a/tests/baselines/reference/excessPropertyChecksWithNestedIntersections.js b/tests/baselines/reference/excessPropertyChecksWithNestedIntersections.js
index f43b7bf83a4..e242825b852 100644
--- a/tests/baselines/reference/excessPropertyChecksWithNestedIntersections.js
+++ b/tests/baselines/reference/excessPropertyChecksWithNestedIntersections.js
@@ -21,7 +21,7 @@ let c: B = { a: { x: 'hello', y: 2 } }; // error - y does not exist in type A
 
 let d: D = { a: { x: 'hello' }, c: 5 }; // ok
 let e: D = { a: { x: 2 }, c: 5 }; // error - types of property x are incompatible
-let f: D = { a: { x: 'hello', y: 2 }, c: 5 }; // should be an error
+let f: D = { a: { x: 'hello', y: 2 }, c: 5 }; // error - y does not exist in type A
 
 // https://github.com/Microsoft/TypeScript/issues/18075
 
@@ -80,7 +80,7 @@ var b = { a: { x: 2 } }; // error - types of property x are incompatible
 var c = { a: { x: 'hello', y: 2 } }; // error - y does not exist in type A
 var d = { a: { x: 'hello' }, c: 5 }; // ok
 var e = { a: { x: 2 }, c: 5 }; // error - types of property x are incompatible
-var f = { a: { x: 'hello', y: 2 }, c: 5 }; // should be an error
+var f = { a: { x: 'hello', y: 2 }, c: 5 }; // error - y does not exist in type A
 exports.photo = {
     id: 1,
     url: '',
diff --git a/tests/baselines/reference/excessPropertyChecksWithNestedIntersections.symbols b/tests/baselines/reference/excessPropertyChecksWithNestedIntersections.symbols
index bf10195045e..f859b8f48ef 100644
--- a/tests/baselines/reference/excessPropertyChecksWithNestedIntersections.symbols
+++ b/tests/baselines/reference/excessPropertyChecksWithNestedIntersections.symbols
@@ -61,7 +61,7 @@ let e: D = { a: { x: 2 }, c: 5 }; // error - types of property x are incompatibl
 >x : Symbol(x, Decl(excessPropertyChecksWithNestedIntersections.ts, 21, 17))
 >c : Symbol(c, Decl(excessPropertyChecksWithNestedIntersections.ts, 21, 25))
 
-let f: D = { a: { x: 'hello', y: 2 }, c: 5 }; // should be an error
+let f: D = { a: { x: 'hello', y: 2 }, c: 5 }; // error - y does not exist in type A
 >f : Symbol(f, Decl(excessPropertyChecksWithNestedIntersections.ts, 22, 3))
 >D : Symbol(D, Decl(excessPropertyChecksWithNestedIntersections.ts, 12, 1))
 >a : Symbol(a, Decl(excessPropertyChecksWithNestedIntersections.ts, 22, 12))
diff --git a/tests/baselines/reference/excessPropertyChecksWithNestedIntersections.types b/tests/baselines/reference/excessPropertyChecksWithNestedIntersections.types
index d15b8f7e0dd..29019339fa6 100644
--- a/tests/baselines/reference/excessPropertyChecksWithNestedIntersections.types
+++ b/tests/baselines/reference/excessPropertyChecksWithNestedIntersections.types
@@ -65,7 +65,7 @@ let e: D = { a: { x: 2 }, c: 5 }; // error - types of property x are incompatibl
 >c : number
 >5 : 5
 
-let f: D = { a: { x: 'hello', y: 2 }, c: 5 }; // should be an error
+let f: D = { a: { x: 'hello', y: 2 }, c: 5 }; // error - y does not exist in type A
 >f : D
 >{ a: { x: 'hello', y: 2 }, c: 5 } : { a: { x: string; y: number; }; c: number; }
 >a : { x: string; y: number; }
diff --git a/tests/baselines/reference/weakType.errors.txt b/tests/baselines/reference/weakType.errors.txt
index 4ea859a82dd..9fc9deab703 100644
--- a/tests/baselines/reference/weakType.errors.txt
+++ b/tests/baselines/reference/weakType.errors.txt
@@ -5,10 +5,8 @@ tests/cases/compiler/weakType.ts(18,13): error TS2559: Type '12' has no properti
 tests/cases/compiler/weakType.ts(19,13): error TS2559: Type '"completely wrong"' has no properties in common with type 'Settings'.
 tests/cases/compiler/weakType.ts(20,13): error TS2559: Type 'false' has no properties in common with type 'Settings'.
 tests/cases/compiler/weakType.ts(37,18): error TS2559: Type '{ error?: number; }' has no properties in common with type 'ChangeOptions'.
-tests/cases/compiler/weakType.ts(62,5): error TS2322: Type '{ properties: { wrong: string; }; }' is not assignable to type 'Weak & Spoiler'.
-  Type '{ properties: { wrong: string; }; }' is not assignable to type 'Weak'.
-    Types of property 'properties' are incompatible.
-      Type '{ wrong: string; }' has no properties in common with type '{ b?: number; }'.
+tests/cases/compiler/weakType.ts(62,5): error TS2326: Types of property 'properties' are incompatible.
+  Type '{ wrong: string; }' has no properties in common with type '{ b?: number; }'.
 
 
 ==== tests/cases/compiler/weakType.ts (8 errors) ====
@@ -85,16 +83,14 @@ tests/cases/compiler/weakType.ts(62,5): error TS2322: Type '{ properties: { wron
             b?: number
         }
     }
-    declare let unknown: {
+    declare let propertiesWrong: {
         properties: {
             wrong: string
         }
     }
-    let weak: Weak & Spoiler = unknown
+    let weak: Weak & Spoiler = propertiesWrong
         ~~~~
-!!! error TS2322: Type '{ properties: { wrong: string; }; }' is not assignable to type 'Weak & Spoiler'.
-!!! error TS2322:   Type '{ properties: { wrong: string; }; }' is not assignable to type 'Weak'.
-!!! error TS2322:     Types of property 'properties' are incompatible.
-!!! error TS2322:       Type '{ wrong: string; }' has no properties in common with type '{ b?: number; }'.
+!!! error TS2326: Types of property 'properties' are incompatible.
+!!! error TS2326:   Type '{ wrong: string; }' has no properties in common with type '{ b?: number; }'.
     
     
\ No newline at end of file
diff --git a/tests/baselines/reference/weakType.js b/tests/baselines/reference/weakType.js
index 850d8de6a8b..3bc20032d7f 100644
--- a/tests/baselines/reference/weakType.js
+++ b/tests/baselines/reference/weakType.js
@@ -55,12 +55,12 @@ type Weak = {
         b?: number
     }
 }
-declare let unknown: {
+declare let propertiesWrong: {
     properties: {
         wrong: string
     }
 }
-let weak: Weak & Spoiler = unknown
+let weak: Weak & Spoiler = propertiesWrong
 
 
 
@@ -89,4 +89,4 @@ var K = /** @class */ (function () {
     return K;
 }());
 var ctor = K;
-var weak = unknown;
+var weak = propertiesWrong;
diff --git a/tests/baselines/reference/weakType.symbols b/tests/baselines/reference/weakType.symbols
index 3e47c828190..0b51b726517 100644
--- a/tests/baselines/reference/weakType.symbols
+++ b/tests/baselines/reference/weakType.symbols
@@ -144,20 +144,20 @@ type Weak = {
 >b : Symbol(b, Decl(weakType.ts, 52, 18))
     }
 }
-declare let unknown: {
->unknown : Symbol(unknown, Decl(weakType.ts, 56, 11))
+declare let propertiesWrong: {
+>propertiesWrong : Symbol(propertiesWrong, Decl(weakType.ts, 56, 11))
 
     properties: {
->properties : Symbol(properties, Decl(weakType.ts, 56, 22))
+>properties : Symbol(properties, Decl(weakType.ts, 56, 30))
 
         wrong: string
 >wrong : Symbol(wrong, Decl(weakType.ts, 57, 17))
     }
 }
-let weak: Weak & Spoiler = unknown
+let weak: Weak & Spoiler = propertiesWrong
 >weak : Symbol(weak, Decl(weakType.ts, 61, 3))
 >Weak : Symbol(Weak, Decl(weakType.ts, 49, 32))
 >Spoiler : Symbol(Spoiler, Decl(weakType.ts, 47, 18))
->unknown : Symbol(unknown, Decl(weakType.ts, 56, 11))
+>propertiesWrong : Symbol(propertiesWrong, Decl(weakType.ts, 56, 11))
 
 
diff --git a/tests/baselines/reference/weakType.types b/tests/baselines/reference/weakType.types
index 3a7d14a3724..58438c8dca2 100644
--- a/tests/baselines/reference/weakType.types
+++ b/tests/baselines/reference/weakType.types
@@ -147,8 +147,8 @@ type Weak = {
 >b : number
     }
 }
-declare let unknown: {
->unknown : { properties: { wrong: string; }; }
+declare let propertiesWrong: {
+>propertiesWrong : { properties: { wrong: string; }; }
 
     properties: {
 >properties : { wrong: string; }
@@ -157,8 +157,8 @@ declare let unknown: {
 >wrong : string
     }
 }
-let weak: Weak & Spoiler = unknown
+let weak: Weak & Spoiler = propertiesWrong
 >weak : Weak & Spoiler
->unknown : { properties: { wrong: string; }; }
+>propertiesWrong : { properties: { wrong: string; }; }
 
 
diff --git a/tests/cases/compiler/excessPropertyCheckWithNestedArrayIntersection.ts b/tests/cases/compiler/excessPropertyCheckWithNestedArrayIntersection.ts
new file mode 100644
index 00000000000..6da67d5d22b
--- /dev/null
+++ b/tests/cases/compiler/excessPropertyCheckWithNestedArrayIntersection.ts
@@ -0,0 +1,22 @@
+interface ValueOnlyFields {
+    fields: Array<{
+        value: number | null;
+    }>;
+}
+interface ValueAndKeyFields {
+    fields: Array<{
+        key: string | null;
+        value: number | null;
+    }>;
+}
+interface BugRepro {
+  dataType: ValueAndKeyFields & ValueOnlyFields;
+}
+const repro: BugRepro = {
+  dataType: {
+    fields: [{
+      key: 'bla', // should be OK: Not excess
+      value: null,
+    }],
+  }
+}
diff --git a/tests/cases/compiler/excessPropertyChecksWithNestedIntersections.ts b/tests/cases/compiler/excessPropertyChecksWithNestedIntersections.ts
index 86bf8f6261c..b3e877e173a 100644
--- a/tests/cases/compiler/excessPropertyChecksWithNestedIntersections.ts
+++ b/tests/cases/compiler/excessPropertyChecksWithNestedIntersections.ts
@@ -20,7 +20,7 @@ let c: B = { a: { x: 'hello', y: 2 } }; // error - y does not exist in type A
 
 let d: D = { a: { x: 'hello' }, c: 5 }; // ok
 let e: D = { a: { x: 2 }, c: 5 }; // error - types of property x are incompatible
-let f: D = { a: { x: 'hello', y: 2 }, c: 5 }; // should be an error
+let f: D = { a: { x: 'hello', y: 2 }, c: 5 }; // error - y does not exist in type A
 
 // https://github.com/Microsoft/TypeScript/issues/18075
 
diff --git a/tests/cases/compiler/weakType.ts b/tests/cases/compiler/weakType.ts
index 08c9d95e672..d9415fdef45 100644
--- a/tests/cases/compiler/weakType.ts
+++ b/tests/cases/compiler/weakType.ts
@@ -54,10 +54,10 @@ type Weak = {
         b?: number
     }
 }
-declare let unknown: {
+declare let propertiesWrong: {
     properties: {
         wrong: string
     }
 }
-let weak: Weak & Spoiler = unknown
+let weak: Weak & Spoiler = propertiesWrong
 
diff --git a/tests/cases/user/prettier/prettier b/tests/cases/user/prettier/prettier
index 1e471a00796..6fae09b67ec 160000
--- a/tests/cases/user/prettier/prettier
+++ b/tests/cases/user/prettier/prettier
@@ -1 +1 @@
-Subproject commit 1e471a007968b7490563b91ed6909ae6046f3fe8
+Subproject commit 6fae09b67ec6f7b27259a5c133a6961d05a4161b

From f3336841792414fbeb0ae169f6fdf98dfbcbfcee Mon Sep 17 00:00:00 2001
From: Wesley Wigham <wewigham@microsoft.com>
Date: Tue, 6 Aug 2019 15:14:32 -0700
Subject: [PATCH 125/151] Fix unicode escapes in jsx identifiers and extended
 unicode characters in jsdoc (#32716)

* Fix unicode escapes in jsx identifiers and extended unicode characters in jsdoc

* Support unicode escapes in JSDoc

* Add tests for extended escapes
---
 src/compiler/parser.ts                        |  6 +-
 src/compiler/scanner.ts                       | 50 +++++++++---
 ...ments.parsesCorrectly.leadingAsterisk.json |  1 +
 ...nts.parsesCorrectly.noLeadingAsterisk.json |  1 +
 ...Comments.parsesCorrectly.noReturnType.json |  1 +
 ...ocComments.parsesCorrectly.returnTag1.json |  1 +
 ...ocComments.parsesCorrectly.returnTag2.json |  1 +
 .../DocComments.parsesCorrectly.typeTag.json  |  1 +
 .../extendedUnicodePlaneIdentifiersJSDoc.js   | 19 +++++
 ...tendedUnicodePlaneIdentifiersJSDoc.symbols | 18 +++++
 ...extendedUnicodePlaneIdentifiersJSDoc.types | 20 +++++
 .../reference/unicodeEscapesInJSDoc.js        | 33 ++++++++
 .../reference/unicodeEscapesInJSDoc.symbols   | 35 ++++++++
 .../reference/unicodeEscapesInJSDoc.types     | 39 +++++++++
 .../reference/unicodeEscapesInJsxtags.js      | 34 ++++++++
 .../reference/unicodeEscapesInJsxtags.symbols | 69 ++++++++++++++++
 .../reference/unicodeEscapesInJsxtags.types   | 79 +++++++++++++++++++
 .../extendedUnicodePlaneIdentifiersJSDoc.ts   | 13 +++
 tests/cases/compiler/unicodeEscapesInJSDoc.ts | 20 +++++
 .../jsx/unicodeEscapesInJsxtags.tsx           | 27 +++++++
 20 files changed, 455 insertions(+), 13 deletions(-)
 create mode 100644 tests/baselines/reference/extendedUnicodePlaneIdentifiersJSDoc.js
 create mode 100644 tests/baselines/reference/extendedUnicodePlaneIdentifiersJSDoc.symbols
 create mode 100644 tests/baselines/reference/extendedUnicodePlaneIdentifiersJSDoc.types
 create mode 100644 tests/baselines/reference/unicodeEscapesInJSDoc.js
 create mode 100644 tests/baselines/reference/unicodeEscapesInJSDoc.symbols
 create mode 100644 tests/baselines/reference/unicodeEscapesInJSDoc.types
 create mode 100644 tests/baselines/reference/unicodeEscapesInJsxtags.js
 create mode 100644 tests/baselines/reference/unicodeEscapesInJsxtags.symbols
 create mode 100644 tests/baselines/reference/unicodeEscapesInJsxtags.types
 create mode 100644 tests/cases/compiler/extendedUnicodePlaneIdentifiersJSDoc.ts
 create mode 100644 tests/cases/compiler/unicodeEscapesInJSDoc.ts
 create mode 100644 tests/cases/conformance/jsx/unicodeEscapesInJsxtags.tsx

diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
index 4515af1989d..704260e7279 100644
--- a/src/compiler/parser.ts
+++ b/src/compiler/parser.ts
@@ -7305,10 +7305,14 @@ namespace ts {
                         return createMissingNode<Identifier>(SyntaxKind.Identifier, /*reportAtCurrentPosition*/ !message, message || Diagnostics.Identifier_expected);
                     }
 
+                    identifierCount++;
                     const pos = scanner.getTokenPos();
                     const end = scanner.getTextPos();
                     const result = <Identifier>createNode(SyntaxKind.Identifier, pos);
-                    result.escapedText = escapeLeadingUnderscores(scanner.getTokenText());
+                    if (token() !== SyntaxKind.Identifier) {
+                        result.originalKeywordKind = token();
+                    }
+                    result.escapedText = escapeLeadingUnderscores(internIdentifier(scanner.getTokenValue()));
                     finishNode(result, end);
 
                     nextTokenJSDoc();
diff --git a/src/compiler/scanner.ts b/src/compiler/scanner.ts
index 735a7bf9d44..eccce228d34 100644
--- a/src/compiler/scanner.ts
+++ b/src/compiler/scanner.ts
@@ -1015,7 +1015,7 @@ namespace ts {
         }
 
         function checkForIdentifierStartAfterNumericLiteral(numericStart: number, isScientific?: boolean) {
-            if (!isIdentifierStart(text.charCodeAt(pos), languageVersion)) {
+            if (!isIdentifierStart(codePointAt(text, pos), languageVersion)) {
                 return;
             }
 
@@ -2063,17 +2063,22 @@ namespace ts {
         // they allow dashes
         function scanJsxIdentifier(): SyntaxKind {
             if (tokenIsIdentifierOrKeyword(token)) {
-                const firstCharPosition = pos;
+                // An identifier or keyword has already been parsed - check for a `-` and then append it and everything after it to the token
+                // Do note that this means that `scanJsxIdentifier` effectively _mutates_ the visible token without advancing to a new token
+                // Any caller should be expecting this behavior and should only read the pos or token value after calling it.
                 while (pos < end) {
                     const ch = text.charCodeAt(pos);
-                    if (ch === CharacterCodes.minus || ((firstCharPosition === pos) ? isIdentifierStart(ch, languageVersion) : isIdentifierPart(ch, languageVersion))) {
+                    if (ch === CharacterCodes.minus) {
+                        tokenValue += "-";
                         pos++;
+                        continue;
                     }
-                    else {
+                    const oldPos = pos;
+                    tokenValue += scanIdentifierParts(); // reuse `scanIdentifierParts` so unicode escapes are handled
+                    if (pos === oldPos) {
                         break;
                     }
                 }
-                tokenValue += text.substring(firstCharPosition, pos);
             }
             return token;
         }
@@ -2099,8 +2104,8 @@ namespace ts {
                 return token = SyntaxKind.EndOfFileToken;
             }
 
-            const ch = text.charCodeAt(pos);
-            pos++;
+            const ch = codePointAt(text, pos);
+            pos += charSize(ch);
             switch (ch) {
                 case CharacterCodes.tab:
                 case CharacterCodes.verticalTab:
@@ -2138,13 +2143,34 @@ namespace ts {
                     return token = SyntaxKind.DotToken;
                 case CharacterCodes.backtick:
                     return token = SyntaxKind.BacktickToken;
+                case CharacterCodes.backslash:
+                    pos--;
+                    const extendedCookedChar = peekExtendedUnicodeEscape();
+                    if (extendedCookedChar >= 0 && isIdentifierStart(extendedCookedChar, languageVersion)) {
+                        pos += 3;
+                        tokenFlags |= TokenFlags.ExtendedUnicodeEscape;
+                        tokenValue = scanExtendedUnicodeEscape() + scanIdentifierParts();
+                        return token = getIdentifierToken();
+                    }
+
+                    const cookedChar = peekUnicodeEscape();
+                    if (cookedChar >= 0 && isIdentifierStart(cookedChar, languageVersion)) {
+                        pos += 6;
+                        tokenValue = String.fromCharCode(cookedChar) + scanIdentifierParts();
+                        return token = getIdentifierToken();
+                    }
+                    error(Diagnostics.Invalid_character);
+                    pos++;
+                    return token = SyntaxKind.Unknown;
             }
 
-            if (isIdentifierStart(ch, ScriptTarget.Latest)) {
-                while (isIdentifierPart(text.charCodeAt(pos), ScriptTarget.Latest) && pos < end) {
-                    pos++;
-                }
+            if (isIdentifierStart(ch, languageVersion)) {
+                let char = ch;
+                while (pos < end && isIdentifierPart(char = codePointAt(text, pos), languageVersion)) pos += charSize(char);
                 tokenValue = text.substring(tokenPos, pos);
+                if (char === CharacterCodes.backslash) {
+                    tokenValue += scanIdentifierParts();
+                }
                 return token = getIdentifierToken();
             }
             else {
@@ -2265,7 +2291,7 @@ namespace ts {
 
     /* @internal */
     function charSize(ch: number) {
-        if (ch > 0x10000) {
+        if (ch >= 0x10000) {
             return 2;
         }
         return 1;
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.leadingAsterisk.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.leadingAsterisk.json
index ec99bbafe5f..ed9660cb05a 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.leadingAsterisk.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.leadingAsterisk.json
@@ -17,6 +17,7 @@
                 "end": 13,
                 "modifierFlagsCache": 0,
                 "transformFlags": 0,
+                "originalKeywordKind": "TypeKeyword",
                 "escapedText": "type"
             },
             "typeExpression": {
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.noLeadingAsterisk.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.noLeadingAsterisk.json
index ec99bbafe5f..ed9660cb05a 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.noLeadingAsterisk.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.noLeadingAsterisk.json
@@ -17,6 +17,7 @@
                 "end": 13,
                 "modifierFlagsCache": 0,
                 "transformFlags": 0,
+                "originalKeywordKind": "TypeKeyword",
                 "escapedText": "type"
             },
             "typeExpression": {
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.noReturnType.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.noReturnType.json
index 11ea4b772cc..a661ddc90c4 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.noReturnType.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.noReturnType.json
@@ -17,6 +17,7 @@
                 "end": 15,
                 "modifierFlagsCache": 0,
                 "transformFlags": 0,
+                "originalKeywordKind": "ReturnKeyword",
                 "escapedText": "return"
             }
         },
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.returnTag1.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.returnTag1.json
index 1e43cee5930..c50d3389a71 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.returnTag1.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.returnTag1.json
@@ -17,6 +17,7 @@
                 "end": 15,
                 "modifierFlagsCache": 0,
                 "transformFlags": 0,
+                "originalKeywordKind": "ReturnKeyword",
                 "escapedText": "return"
             },
             "typeExpression": {
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.returnTag2.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.returnTag2.json
index 42c3c74327b..6576be9ef70 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.returnTag2.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.returnTag2.json
@@ -17,6 +17,7 @@
                 "end": 15,
                 "modifierFlagsCache": 0,
                 "transformFlags": 0,
+                "originalKeywordKind": "ReturnKeyword",
                 "escapedText": "return"
             },
             "typeExpression": {
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.typeTag.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.typeTag.json
index ec99bbafe5f..ed9660cb05a 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.typeTag.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.typeTag.json
@@ -17,6 +17,7 @@
                 "end": 13,
                 "modifierFlagsCache": 0,
                 "transformFlags": 0,
+                "originalKeywordKind": "TypeKeyword",
                 "escapedText": "type"
             },
             "typeExpression": {
diff --git a/tests/baselines/reference/extendedUnicodePlaneIdentifiersJSDoc.js b/tests/baselines/reference/extendedUnicodePlaneIdentifiersJSDoc.js
new file mode 100644
index 00000000000..51405d063d4
--- /dev/null
+++ b/tests/baselines/reference/extendedUnicodePlaneIdentifiersJSDoc.js
@@ -0,0 +1,19 @@
+//// [file.js]
+/**
+ * Adds
+ * @param {number} 𝑚
+ * @param {number} 𝑀
+ */
+function foo(𝑚, 𝑀) {
+    console.log(𝑀 + 𝑚);
+}
+
+//// [file.js]
+/**
+ * Adds
+ * @param {number} 𝑚
+ * @param {number} 𝑀
+ */
+function foo(𝑚, 𝑀) {
+    console.log(𝑀 + 𝑚);
+}
diff --git a/tests/baselines/reference/extendedUnicodePlaneIdentifiersJSDoc.symbols b/tests/baselines/reference/extendedUnicodePlaneIdentifiersJSDoc.symbols
new file mode 100644
index 00000000000..56c380b1e53
--- /dev/null
+++ b/tests/baselines/reference/extendedUnicodePlaneIdentifiersJSDoc.symbols
@@ -0,0 +1,18 @@
+=== tests/cases/compiler/file.js ===
+/**
+ * Adds
+ * @param {number} 𝑚
+ * @param {number} 𝑀
+ */
+function foo(𝑚, 𝑀) {
+>foo : Symbol(foo, Decl(file.js, 0, 0))
+>𝑚 : Symbol(𝑚, Decl(file.js, 5, 13))
+>𝑀 : Symbol(𝑀, Decl(file.js, 5, 16))
+
+    console.log(𝑀 + 𝑚);
+>console.log : Symbol(Console.log, Decl(lib.dom.d.ts, --, --))
+>console : Symbol(console, Decl(lib.dom.d.ts, --, --))
+>log : Symbol(Console.log, Decl(lib.dom.d.ts, --, --))
+>𝑀 : Symbol(𝑀, Decl(file.js, 5, 16))
+>𝑚 : Symbol(𝑚, Decl(file.js, 5, 13))
+}
diff --git a/tests/baselines/reference/extendedUnicodePlaneIdentifiersJSDoc.types b/tests/baselines/reference/extendedUnicodePlaneIdentifiersJSDoc.types
new file mode 100644
index 00000000000..06512f273f5
--- /dev/null
+++ b/tests/baselines/reference/extendedUnicodePlaneIdentifiersJSDoc.types
@@ -0,0 +1,20 @@
+=== tests/cases/compiler/file.js ===
+/**
+ * Adds
+ * @param {number} 𝑚
+ * @param {number} 𝑀
+ */
+function foo(𝑚, 𝑀) {
+>foo : (𝑚: number, 𝑀: number) => void
+>𝑚 : number
+>𝑀 : number
+
+    console.log(𝑀 + 𝑚);
+>console.log(𝑀 + 𝑚) : void
+>console.log : (message?: any, ...optionalParams: any[]) => void
+>console : Console
+>log : (message?: any, ...optionalParams: any[]) => void
+>𝑀 + 𝑚 : number
+>𝑀 : number
+>𝑚 : number
+}
diff --git a/tests/baselines/reference/unicodeEscapesInJSDoc.js b/tests/baselines/reference/unicodeEscapesInJSDoc.js
new file mode 100644
index 00000000000..601aeeb218b
--- /dev/null
+++ b/tests/baselines/reference/unicodeEscapesInJSDoc.js
@@ -0,0 +1,33 @@
+//// [file.js]
+/**
+ * @param {number} \u0061
+ * @param {number} a\u0061
+ */
+function foo(a, aa) {
+    console.log(a + aa);
+}
+
+/**
+ * @param {number} \u{0061}
+ * @param {number} a\u{0061}
+ */
+function bar(a, aa) {
+    console.log(a + aa);
+}
+
+
+//// [file.js]
+/**
+ * @param {number} \u0061
+ * @param {number} a\u0061
+ */
+function foo(a, aa) {
+    console.log(a + aa);
+}
+/**
+ * @param {number} \u{0061}
+ * @param {number} a\u{0061}
+ */
+function bar(a, aa) {
+    console.log(a + aa);
+}
diff --git a/tests/baselines/reference/unicodeEscapesInJSDoc.symbols b/tests/baselines/reference/unicodeEscapesInJSDoc.symbols
new file mode 100644
index 00000000000..c2dd2af2a55
--- /dev/null
+++ b/tests/baselines/reference/unicodeEscapesInJSDoc.symbols
@@ -0,0 +1,35 @@
+=== tests/cases/compiler/file.js ===
+/**
+ * @param {number} \u0061
+ * @param {number} a\u0061
+ */
+function foo(a, aa) {
+>foo : Symbol(foo, Decl(file.js, 0, 0))
+>a : Symbol(a, Decl(file.js, 4, 13))
+>aa : Symbol(aa, Decl(file.js, 4, 15))
+
+    console.log(a + aa);
+>console.log : Symbol(Console.log, Decl(lib.dom.d.ts, --, --))
+>console : Symbol(console, Decl(lib.dom.d.ts, --, --))
+>log : Symbol(Console.log, Decl(lib.dom.d.ts, --, --))
+>a : Symbol(a, Decl(file.js, 4, 13))
+>aa : Symbol(aa, Decl(file.js, 4, 15))
+}
+
+/**
+ * @param {number} \u{0061}
+ * @param {number} a\u{0061}
+ */
+function bar(a, aa) {
+>bar : Symbol(bar, Decl(file.js, 6, 1))
+>a : Symbol(a, Decl(file.js, 12, 13))
+>aa : Symbol(aa, Decl(file.js, 12, 15))
+
+    console.log(a + aa);
+>console.log : Symbol(Console.log, Decl(lib.dom.d.ts, --, --))
+>console : Symbol(console, Decl(lib.dom.d.ts, --, --))
+>log : Symbol(Console.log, Decl(lib.dom.d.ts, --, --))
+>a : Symbol(a, Decl(file.js, 12, 13))
+>aa : Symbol(aa, Decl(file.js, 12, 15))
+}
+
diff --git a/tests/baselines/reference/unicodeEscapesInJSDoc.types b/tests/baselines/reference/unicodeEscapesInJSDoc.types
new file mode 100644
index 00000000000..f0be72b2df2
--- /dev/null
+++ b/tests/baselines/reference/unicodeEscapesInJSDoc.types
@@ -0,0 +1,39 @@
+=== tests/cases/compiler/file.js ===
+/**
+ * @param {number} \u0061
+ * @param {number} a\u0061
+ */
+function foo(a, aa) {
+>foo : (a: number, aa: number) => void
+>a : number
+>aa : number
+
+    console.log(a + aa);
+>console.log(a + aa) : void
+>console.log : (message?: any, ...optionalParams: any[]) => void
+>console : Console
+>log : (message?: any, ...optionalParams: any[]) => void
+>a + aa : number
+>a : number
+>aa : number
+}
+
+/**
+ * @param {number} \u{0061}
+ * @param {number} a\u{0061}
+ */
+function bar(a, aa) {
+>bar : (a: number, aa: number) => void
+>a : number
+>aa : number
+
+    console.log(a + aa);
+>console.log(a + aa) : void
+>console.log : (message?: any, ...optionalParams: any[]) => void
+>console : Console
+>log : (message?: any, ...optionalParams: any[]) => void
+>a + aa : number
+>a : number
+>aa : number
+}
+
diff --git a/tests/baselines/reference/unicodeEscapesInJsxtags.js b/tests/baselines/reference/unicodeEscapesInJsxtags.js
new file mode 100644
index 00000000000..c57eb1c9e7b
--- /dev/null
+++ b/tests/baselines/reference/unicodeEscapesInJsxtags.js
@@ -0,0 +1,34 @@
+//// [file.tsx]
+import * as React from "react";
+declare global {
+    namespace JSX {
+        interface IntrinsicElements {
+            "a-b": any;
+            "a-c": any;
+        }
+    }
+}
+const Compa = (x: {x: number}) => <div>{"" + x}</div>;
+
+let a = <\u0061></a>; // works
+let ab = <\u0061-b></a-b>; // works
+let ac = <a-\u0063></a-c>; // works
+let compa = <Comp\u0061 x={12} />; // works
+
+let a2 = <\u{0061}></a>; // works
+let ab2 = <\u{0061}-b></a-b>; // works
+let ac2 = <a-\u{0063}></a-c>; // works
+let compa2 = <Comp\u{0061} x={12} />; // works
+
+
+//// [file.js]
+import * as React from "react";
+const Compa = (x) => React.createElement("div", null, "" + x);
+let a = React.createElement("a", null); // works
+let ab = React.createElement("a-b", null); // works
+let ac = React.createElement("a-c", null); // works
+let compa = React.createElement(Comp\u0061, { x: 12 }); // works
+let a2 = React.createElement("a", null); // works
+let ab2 = React.createElement("a-b", null); // works
+let ac2 = React.createElement("a-c", null); // works
+let compa2 = React.createElement(Comp\u{0061}, { x: 12 }); // works
diff --git a/tests/baselines/reference/unicodeEscapesInJsxtags.symbols b/tests/baselines/reference/unicodeEscapesInJsxtags.symbols
new file mode 100644
index 00000000000..e2bc9525303
--- /dev/null
+++ b/tests/baselines/reference/unicodeEscapesInJsxtags.symbols
@@ -0,0 +1,69 @@
+=== tests/cases/conformance/jsx/file.tsx ===
+import * as React from "react";
+>React : Symbol(React, Decl(file.tsx, 0, 6))
+
+declare global {
+>global : Symbol(global, Decl(file.tsx, 0, 31))
+
+    namespace JSX {
+>JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1), Decl(file.tsx, 1, 16))
+
+        interface IntrinsicElements {
+>IntrinsicElements : Symbol(IntrinsicElements, Decl(react.d.ts, 2368, 78), Decl(file.tsx, 2, 19))
+
+            "a-b": any;
+>"a-b" : Symbol(IntrinsicElements["a-b"], Decl(file.tsx, 3, 37))
+
+            "a-c": any;
+>"a-c" : Symbol(IntrinsicElements["a-c"], Decl(file.tsx, 4, 23))
+        }
+    }
+}
+const Compa = (x: {x: number}) => <div>{"" + x}</div>;
+>Compa : Symbol(Compa, Decl(file.tsx, 9, 5))
+>x : Symbol(x, Decl(file.tsx, 9, 15))
+>x : Symbol(x, Decl(file.tsx, 9, 19))
+>div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
+>x : Symbol(x, Decl(file.tsx, 9, 15))
+>div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2400, 45))
+
+let a = <\u0061></a>; // works
+>a : Symbol(a, Decl(file.tsx, 11, 3))
+>\u0061 : Symbol(JSX.IntrinsicElements.a, Decl(react.d.ts, 2370, 33))
+>a : Symbol(JSX.IntrinsicElements.a, Decl(react.d.ts, 2370, 33))
+
+let ab = <\u0061-b></a-b>; // works
+>ab : Symbol(ab, Decl(file.tsx, 12, 3))
+>\u0061-b : Symbol(JSX.IntrinsicElements["a-b"], Decl(file.tsx, 3, 37))
+>a-b : Symbol(JSX.IntrinsicElements["a-b"], Decl(file.tsx, 3, 37))
+
+let ac = <a-\u0063></a-c>; // works
+>ac : Symbol(ac, Decl(file.tsx, 13, 3))
+>a-\u0063 : Symbol(JSX.IntrinsicElements["a-c"], Decl(file.tsx, 4, 23))
+>a-c : Symbol(JSX.IntrinsicElements["a-c"], Decl(file.tsx, 4, 23))
+
+let compa = <Comp\u0061 x={12} />; // works
+>compa : Symbol(compa, Decl(file.tsx, 14, 3))
+>Comp\u0061 : Symbol(Compa, Decl(file.tsx, 9, 5))
+>x : Symbol(x, Decl(file.tsx, 14, 23))
+
+let a2 = <\u{0061}></a>; // works
+>a2 : Symbol(a2, Decl(file.tsx, 16, 3))
+>\u{0061} : Symbol(JSX.IntrinsicElements.a, Decl(react.d.ts, 2370, 33))
+>a : Symbol(JSX.IntrinsicElements.a, Decl(react.d.ts, 2370, 33))
+
+let ab2 = <\u{0061}-b></a-b>; // works
+>ab2 : Symbol(ab2, Decl(file.tsx, 17, 3))
+>\u{0061}-b : Symbol(JSX.IntrinsicElements["a-b"], Decl(file.tsx, 3, 37))
+>a-b : Symbol(JSX.IntrinsicElements["a-b"], Decl(file.tsx, 3, 37))
+
+let ac2 = <a-\u{0063}></a-c>; // works
+>ac2 : Symbol(ac2, Decl(file.tsx, 18, 3))
+>a-\u{0063} : Symbol(JSX.IntrinsicElements["a-c"], Decl(file.tsx, 4, 23))
+>a-c : Symbol(JSX.IntrinsicElements["a-c"], Decl(file.tsx, 4, 23))
+
+let compa2 = <Comp\u{0061} x={12} />; // works
+>compa2 : Symbol(compa2, Decl(file.tsx, 19, 3))
+>Comp\u{0061} : Symbol(Compa, Decl(file.tsx, 9, 5))
+>x : Symbol(x, Decl(file.tsx, 19, 26))
+
diff --git a/tests/baselines/reference/unicodeEscapesInJsxtags.types b/tests/baselines/reference/unicodeEscapesInJsxtags.types
new file mode 100644
index 00000000000..745fafba258
--- /dev/null
+++ b/tests/baselines/reference/unicodeEscapesInJsxtags.types
@@ -0,0 +1,79 @@
+=== tests/cases/conformance/jsx/file.tsx ===
+import * as React from "react";
+>React : typeof React
+
+declare global {
+>global : any
+
+    namespace JSX {
+        interface IntrinsicElements {
+            "a-b": any;
+>"a-b" : any
+
+            "a-c": any;
+>"a-c" : any
+        }
+    }
+}
+const Compa = (x: {x: number}) => <div>{"" + x}</div>;
+>Compa : (x: { x: number; }) => JSX.Element
+>(x: {x: number}) => <div>{"" + x}</div> : (x: { x: number; }) => JSX.Element
+>x : { x: number; }
+>x : number
+><div>{"" + x}</div> : JSX.Element
+>div : any
+>"" + x : string
+>"" : ""
+>x : { x: number; }
+>div : any
+
+let a = <\u0061></a>; // works
+>a : JSX.Element
+><\u0061></a> : JSX.Element
+>\u0061 : JSX.Element
+>a : JSX.Element
+
+let ab = <\u0061-b></a-b>; // works
+>ab : JSX.Element
+><\u0061-b></a-b> : JSX.Element
+>\u0061-b : any
+>a-b : any
+
+let ac = <a-\u0063></a-c>; // works
+>ac : JSX.Element
+><a-\u0063></a-c> : JSX.Element
+>a-\u0063 : any
+>a-c : any
+
+let compa = <Comp\u0061 x={12} />; // works
+>compa : JSX.Element
+><Comp\u0061 x={12} /> : JSX.Element
+>Comp\u0061 : (x: { x: number; }) => JSX.Element
+>x : number
+>12 : 12
+
+let a2 = <\u{0061}></a>; // works
+>a2 : JSX.Element
+><\u{0061}></a> : JSX.Element
+>\u{0061} : JSX.Element
+>a : JSX.Element
+
+let ab2 = <\u{0061}-b></a-b>; // works
+>ab2 : JSX.Element
+><\u{0061}-b></a-b> : JSX.Element
+>\u{0061}-b : any
+>a-b : any
+
+let ac2 = <a-\u{0063}></a-c>; // works
+>ac2 : JSX.Element
+><a-\u{0063}></a-c> : JSX.Element
+>a-\u{0063} : any
+>a-c : any
+
+let compa2 = <Comp\u{0061} x={12} />; // works
+>compa2 : JSX.Element
+><Comp\u{0061} x={12} /> : JSX.Element
+>Comp\u{0061} : (x: { x: number; }) => JSX.Element
+>x : number
+>12 : 12
+
diff --git a/tests/cases/compiler/extendedUnicodePlaneIdentifiersJSDoc.ts b/tests/cases/compiler/extendedUnicodePlaneIdentifiersJSDoc.ts
new file mode 100644
index 00000000000..0808e475e6f
--- /dev/null
+++ b/tests/cases/compiler/extendedUnicodePlaneIdentifiersJSDoc.ts
@@ -0,0 +1,13 @@
+// @allowJs: true
+// @checkJs: true
+// @outDir: ./out
+// @target: es2018
+// @filename: file.js
+/**
+ * Adds
+ * @param {number} 𝑚
+ * @param {number} 𝑀
+ */
+function foo(𝑚, 𝑀) {
+    console.log(𝑀 + 𝑚);
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/unicodeEscapesInJSDoc.ts b/tests/cases/compiler/unicodeEscapesInJSDoc.ts
new file mode 100644
index 00000000000..d87bb4e4ab7
--- /dev/null
+++ b/tests/cases/compiler/unicodeEscapesInJSDoc.ts
@@ -0,0 +1,20 @@
+// @allowJs: true
+// @checkJs: true
+// @outDir: ./out
+// @target: es2018
+// @filename: file.js
+/**
+ * @param {number} \u0061
+ * @param {number} a\u0061
+ */
+function foo(a, aa) {
+    console.log(a + aa);
+}
+
+/**
+ * @param {number} \u{0061}
+ * @param {number} a\u{0061}
+ */
+function bar(a, aa) {
+    console.log(a + aa);
+}
diff --git a/tests/cases/conformance/jsx/unicodeEscapesInJsxtags.tsx b/tests/cases/conformance/jsx/unicodeEscapesInJsxtags.tsx
new file mode 100644
index 00000000000..fbac3943316
--- /dev/null
+++ b/tests/cases/conformance/jsx/unicodeEscapesInJsxtags.tsx
@@ -0,0 +1,27 @@
+// @filename: file.tsx
+// @jsx: react
+// @noLib: true
+// @skipLibCheck: true
+// @target: es2015
+// @moduleResolution: node
+// @libFiles: react.d.ts,lib.d.ts
+import * as React from "react";
+declare global {
+    namespace JSX {
+        interface IntrinsicElements {
+            "a-b": any;
+            "a-c": any;
+        }
+    }
+}
+const Compa = (x: {x: number}) => <div>{"" + x}</div>;
+
+let a = <\u0061></a>; // works
+let ab = <\u0061-b></a-b>; // works
+let ac = <a-\u0063></a-c>; // works
+let compa = <Comp\u0061 x={12} />; // works
+
+let a2 = <\u{0061}></a>; // works
+let ab2 = <\u{0061}-b></a-b>; // works
+let ac2 = <a-\u{0063}></a-c>; // works
+let compa2 = <Comp\u{0061} x={12} />; // works

From 8cf8eb1720fe61c48020a42456470ec85e25b4ea Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Thu, 1 Aug 2019 14:01:57 -0700
Subject: [PATCH 126/151] Add some logging to the sys.watchFile and
 sys.watchDirectory

---
 src/compiler/sys.ts            | 5 +++++
 src/compiler/watchUtilities.ts | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/src/compiler/sys.ts b/src/compiler/sys.ts
index ac710e6992b..4418737ec96 100644
--- a/src/compiler/sys.ts
+++ b/src/compiler/sys.ts
@@ -379,6 +379,9 @@ namespace ts {
     /*@internal*/
     export const ignoredPaths = ["/node_modules/.", "/.git", "/.#"];
 
+    /*@internal*/
+    export let sysLog: (s: string) => void = noop;
+
     /*@internal*/
     export interface RecursiveDirectoryWatcherHost {
         watchDirectory: HostWatchDirectory;
@@ -1053,6 +1056,7 @@ namespace ts {
                  * @param createWatcher
                  */
                 function invokeCallbackAndUpdateWatcher(createWatcher: () => FileWatcher) {
+                    sysLog(`sysLog:: ${fileOrDirectory}:: Changing watcher to ${createWatcher === watchPresentFileSystemEntry ? "Present" : "Missing"}FileSystemEntryWatcher`);
                     // Call the callback for current directory
                     callback("rename", "");
 
@@ -1115,6 +1119,7 @@ namespace ts {
                  * Eg. on linux the number of watches are limited and one could easily exhaust watches and the exception ENOSPC is thrown when creating watcher at that point
                  */
                 function watchPresentFileSystemEntryWithFsWatchFile(): FileWatcher {
+                    sysLog(`sysLog:: ${fileOrDirectory}:: Changing to fsWatchFile`);
                     return fallbackPollingWatchFile(fileOrDirectory, createFileWatcherCallback(callback), pollingInterval);
                 }
 
diff --git a/src/compiler/watchUtilities.ts b/src/compiler/watchUtilities.ts
index 7c11dcf2856..41642ca43b4 100644
--- a/src/compiler/watchUtilities.ts
+++ b/src/compiler/watchUtilities.ts
@@ -370,6 +370,9 @@ namespace ts {
         const createFileWatcher: CreateFileWatcher<WatchFileHost, PollingInterval, FileWatcherEventKind, never, X, Y> = getCreateFileWatcher(watchLogLevel, watchFile);
         const createFilePathWatcher: CreateFileWatcher<WatchFileHost, PollingInterval, FileWatcherEventKind, Path, X, Y> = watchLogLevel === WatchLogLevel.None ? watchFilePath : createFileWatcher;
         const createDirectoryWatcher: CreateFileWatcher<WatchDirectoryHost, WatchDirectoryFlags, undefined, never, X, Y> = getCreateFileWatcher(watchLogLevel, watchDirectory);
+        if (watchLogLevel === WatchLogLevel.Verbose && sysLog === noop) {
+            sysLog = s => log(s);
+        }
         return {
             watchFile: (host, file, callback, pollingInterval, detailInfo1, detailInfo2) =>
                 createFileWatcher(host, file, callback, pollingInterval, /*passThrough*/ undefined, detailInfo1, detailInfo2, watchFile, log, "FileWatcher", getDetailWatchInfo),

From abd127f3089a6bc689680891de5aa113e1afc04a Mon Sep 17 00:00:00 2001
From: Wesley Wigham <wewigham@microsoft.com>
Date: Tue, 6 Aug 2019 16:44:42 -0700
Subject: [PATCH 127/151] Only check import = reference when target is Value
 (#32747)

---
 src/compiler/checker.ts                       |  7 ++-
 ...otCheckedAsValueWhenTargetNonValue.symbols | 45 +++++++++++++++++++
 ...nNotCheckedAsValueWhenTargetNonValue.types | 39 ++++++++++++++++
 ...tionNotCheckedAsValueWhenTargetNonValue.ts | 20 +++++++++
 tests/cases/user/prettier/prettier            |  2 +-
 5 files changed, 110 insertions(+), 3 deletions(-)
 create mode 100644 tests/baselines/reference/importDeclarationNotCheckedAsValueWhenTargetNonValue.symbols
 create mode 100644 tests/baselines/reference/importDeclarationNotCheckedAsValueWhenTargetNonValue.types
 create mode 100644 tests/cases/compiler/importDeclarationNotCheckedAsValueWhenTargetNonValue.ts

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 30637c3cebc..63db442ceba 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -2405,8 +2405,11 @@ namespace ts {
                 // This way a chain of imports can be elided if ultimately the final input is only used in a type
                 // position.
                 if (isInternalModuleImportEqualsDeclaration(node)) {
-                    // import foo = <symbol>
-                    checkExpressionCached(<Expression>node.moduleReference);
+                    const target = resolveSymbol(symbol);
+                    if (target === unknownSymbol || target.flags & SymbolFlags.Value) {
+                        // import foo = <symbol>
+                        checkExpressionCached(<Expression>node.moduleReference);
+                    }
                 }
             }
         }
diff --git a/tests/baselines/reference/importDeclarationNotCheckedAsValueWhenTargetNonValue.symbols b/tests/baselines/reference/importDeclarationNotCheckedAsValueWhenTargetNonValue.symbols
new file mode 100644
index 00000000000..91a2bade757
--- /dev/null
+++ b/tests/baselines/reference/importDeclarationNotCheckedAsValueWhenTargetNonValue.symbols
@@ -0,0 +1,45 @@
+=== tests/cases/compiler/file.d.ts ===
+declare namespace dojox {
+>dojox : Symbol(dojox, Decl(file.d.ts, 0, 0))
+
+    namespace charting {
+>charting : Symbol(charting, Decl(file.d.ts, 0, 25))
+
+        namespace axis2d {
+>axis2d : Symbol(axis2d, Decl(file.d.ts, 1, 24))
+
+            export class Val { }
+>Val : Symbol(Val, Decl(file.d.ts, 2, 26))
+
+            interface common {
+>common : Symbol(common, Decl(file.d.ts, 3, 32), Decl(file.d.ts, 6, 13))
+
+                createText: object;
+>createText : Symbol(common.createText, Decl(file.d.ts, 4, 30))
+            }
+            namespace common {
+>common : Symbol(common, Decl(file.d.ts, 3, 32), Decl(file.d.ts, 6, 13))
+
+                interface createText {
+>createText : Symbol(createText, Decl(file.d.ts, 7, 30))
+
+                    gfx(): string
+>gfx : Symbol(createText.gfx, Decl(file.d.ts, 8, 38))
+                }
+            }
+        }
+    }
+}
+declare module "dojox/charting/axis2d/common.createText" {
+>"dojox/charting/axis2d/common.createText" : Symbol("dojox/charting/axis2d/common.createText", Decl(file.d.ts, 14, 1))
+
+    import exp = dojox.charting.axis2d.common
+>exp : Symbol(exp, Decl(file.d.ts, 15, 58))
+>dojox : Symbol(dojox, Decl(file.d.ts, 0, 0))
+>charting : Symbol(dojox.charting, Decl(file.d.ts, 0, 25))
+>axis2d : Symbol(dojox.charting.axis2d, Decl(file.d.ts, 1, 24))
+>common : Symbol(exp, Decl(file.d.ts, 3, 32), Decl(file.d.ts, 6, 13))
+
+    export = exp;
+>exp : Symbol(exp, Decl(file.d.ts, 15, 58))
+}
diff --git a/tests/baselines/reference/importDeclarationNotCheckedAsValueWhenTargetNonValue.types b/tests/baselines/reference/importDeclarationNotCheckedAsValueWhenTargetNonValue.types
new file mode 100644
index 00000000000..aa5a75ca6ec
--- /dev/null
+++ b/tests/baselines/reference/importDeclarationNotCheckedAsValueWhenTargetNonValue.types
@@ -0,0 +1,39 @@
+=== tests/cases/compiler/file.d.ts ===
+declare namespace dojox {
+>dojox : typeof dojox
+
+    namespace charting {
+>charting : typeof charting
+
+        namespace axis2d {
+>axis2d : typeof axis2d
+
+            export class Val { }
+>Val : Val
+
+            interface common {
+                createText: object;
+>createText : object
+            }
+            namespace common {
+                interface createText {
+                    gfx(): string
+>gfx : () => string
+                }
+            }
+        }
+    }
+}
+declare module "dojox/charting/axis2d/common.createText" {
+>"dojox/charting/axis2d/common.createText" : typeof import("dojox/charting/axis2d/common.createText")
+
+    import exp = dojox.charting.axis2d.common
+>exp : any
+>dojox : typeof dojox
+>charting : typeof dojox.charting
+>axis2d : typeof dojox.charting.axis2d
+>common : exp
+
+    export = exp;
+>exp : exp
+}
diff --git a/tests/cases/compiler/importDeclarationNotCheckedAsValueWhenTargetNonValue.ts b/tests/cases/compiler/importDeclarationNotCheckedAsValueWhenTargetNonValue.ts
new file mode 100644
index 00000000000..8e2061794fd
--- /dev/null
+++ b/tests/cases/compiler/importDeclarationNotCheckedAsValueWhenTargetNonValue.ts
@@ -0,0 +1,20 @@
+// @filename: file.d.ts
+declare namespace dojox {
+    namespace charting {
+        namespace axis2d {
+            export class Val { }
+            interface common {
+                createText: object;
+            }
+            namespace common {
+                interface createText {
+                    gfx(): string
+                }
+            }
+        }
+    }
+}
+declare module "dojox/charting/axis2d/common.createText" {
+    import exp = dojox.charting.axis2d.common
+    export = exp;
+}
\ No newline at end of file
diff --git a/tests/cases/user/prettier/prettier b/tests/cases/user/prettier/prettier
index 6fae09b67ec..1e471a00796 160000
--- a/tests/cases/user/prettier/prettier
+++ b/tests/cases/user/prettier/prettier
@@ -1 +1 @@
-Subproject commit 6fae09b67ec6f7b27259a5c133a6961d05a4161b
+Subproject commit 1e471a007968b7490563b91ed6909ae6046f3fe8

From 3646809ecdcaca24627c4de112abd84941f90316 Mon Sep 17 00:00:00 2001
From: Ben Lichtman <belichtm@microsoft.com>
Date: Wed, 7 Aug 2019 09:46:49 -0700
Subject: [PATCH 128/151] Move helper function outside class

---
 src/server/session.ts | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/server/session.ts b/src/server/session.ts
index 2db58d67460..03ed5e10f8c 100644
--- a/src/server/session.ts
+++ b/src/server/session.ts
@@ -42,6 +42,11 @@ namespace ts.server {
         return false;
     }
 
+
+    function dtsChangeCanAffectEmit(compilationSettings: CompilerOptions) {
+        return getEmitDeclarations(compilationSettings) || !!compilationSettings.emitDecoratorMetadata;
+    }
+
     function formatDiag(fileName: NormalizedPath, project: Project, diag: Diagnostic): protocol.Diagnostic {
         const scriptInfo = project.getScriptInfoForNormalizedPath(fileName)!; // TODO: GH#18217
         return {
@@ -1599,10 +1604,6 @@ namespace ts.server {
                 return emptyArray;
             }
 
-            function dtsChangeCanAffectEmit(compilationSettings: CompilerOptions) {
-                return getEmitDeclarations(compilationSettings) || !!compilationSettings.emitDecoratorMetadata;
-            }
-
             return combineProjectOutput(
                 info,
                 path => this.projectService.getScriptInfoForPath(path)!,

From 984956afec35a0b1b4613de1b13dad99d25d0deb Mon Sep 17 00:00:00 2001
From: Andrew Branch <andrewbranch@users.noreply.github.com>
Date: Wed, 7 Aug 2019 11:27:36 -0700
Subject: [PATCH 129/151] Only add unnecessary-await suggestion on await
 expressions (#32754)

---
 src/compiler/checker.ts                                  | 9 +++++----
 ...codeFixRemoveUnnecessaryAwait_notAvailableOnReturn.ts | 8 ++++++++
 2 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 tests/cases/fourslash/codeFixRemoveUnnecessaryAwait_notAvailableOnReturn.ts

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index b8f80084482..e3da1993100 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -24037,7 +24037,11 @@ namespace ts {
             }
 
             const operandType = checkExpression(node.expression);
-            return checkAwaitedType(operandType, node, Diagnostics.Type_of_await_operand_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member);
+            const awaitedType = checkAwaitedType(operandType, node, Diagnostics.Type_of_await_operand_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member);
+            if (awaitedType === operandType && awaitedType !== errorType && !(operandType.flags & TypeFlags.AnyOrUnknown)) {
+                addErrorOrSuggestion(/*isError*/ false, createDiagnosticForNode(node, Diagnostics.await_has_no_effect_on_the_type_of_this_expression));
+            }
+            return awaitedType;
         }
 
         function checkPrefixUnaryExpression(node: PrefixUnaryExpression): Type {
@@ -26537,9 +26541,6 @@ namespace ts {
          */
         function checkAwaitedType(type: Type, errorNode: Node, diagnosticMessage: DiagnosticMessage, arg0?: string | number): Type {
             const awaitedType = getAwaitedType(type, errorNode, diagnosticMessage, arg0);
-            if (awaitedType === type && !(type.flags & TypeFlags.AnyOrUnknown)) {
-                addErrorOrSuggestion(/*isError*/ false, createDiagnosticForNode(errorNode, Diagnostics.await_has_no_effect_on_the_type_of_this_expression));
-            }
             return awaitedType || errorType;
         }
 
diff --git a/tests/cases/fourslash/codeFixRemoveUnnecessaryAwait_notAvailableOnReturn.ts b/tests/cases/fourslash/codeFixRemoveUnnecessaryAwait_notAvailableOnReturn.ts
new file mode 100644
index 00000000000..e2ecf88ec44
--- /dev/null
+++ b/tests/cases/fourslash/codeFixRemoveUnnecessaryAwait_notAvailableOnReturn.ts
@@ -0,0 +1,8 @@
+/// <reference path="fourslash.ts" />
+
+// @target: esnext
+////async function fn(): Promise<number> {
+////  return 0;
+////}
+
+verify.getSuggestionDiagnostics([]);

From b24050aefd2a3ea88d463c6a147a9b6e1878dec7 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com>
Date: Thu, 8 Aug 2019 15:34:52 -0700
Subject: [PATCH 130/151] Excess discriminated types match all discriminable
 properties (#32755)

* Target types in excess property checking must match all discriminable properties

This allows fewer types to be discriminated in excess properties, which
fixes some examples.

* Add excess property test

* Fix semicolon lint

* Remove extra semicolon!

* Improve EPC for unions with multiple discriminants
---
 src/compiler/checker.ts                       |  19 ++-
 ...yCheckWithMultipleDiscriminants.errors.txt |  78 ++++++++++
 ...sPropertyCheckWithMultipleDiscriminants.js |  91 +++++++++++
 ...ertyCheckWithMultipleDiscriminants.symbols | 143 ++++++++++++++++++
 ...opertyCheckWithMultipleDiscriminants.types | 141 +++++++++++++++++
 .../excessPropertyCheckWithUnions.errors.txt  |  20 ++-
 .../excessPropertyCheckWithUnions.js          |  19 +++
 .../excessPropertyCheckWithUnions.symbols     |  33 ++++
 .../excessPropertyCheckWithUnions.types       |  34 +++++
 ...sPropertyCheckWithMultipleDiscriminants.ts |  59 ++++++++
 .../compiler/excessPropertyCheckWithUnions.ts |  13 ++
 11 files changed, 642 insertions(+), 8 deletions(-)
 create mode 100644 tests/baselines/reference/excessPropertyCheckWithMultipleDiscriminants.errors.txt
 create mode 100644 tests/baselines/reference/excessPropertyCheckWithMultipleDiscriminants.js
 create mode 100644 tests/baselines/reference/excessPropertyCheckWithMultipleDiscriminants.symbols
 create mode 100644 tests/baselines/reference/excessPropertyCheckWithMultipleDiscriminants.types
 create mode 100644 tests/cases/compiler/excessPropertyCheckWithMultipleDiscriminants.ts

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index e3da1993100..96b02a2dcea 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -14269,20 +14269,25 @@ namespace ts {
         function discriminateTypeByDiscriminableItems(target: UnionType, discriminators: [() => Type, __String][], related: (source: Type, target: Type) => boolean | Ternary): Type | undefined;
         function discriminateTypeByDiscriminableItems(target: UnionType, discriminators: [() => Type, __String][], related: (source: Type, target: Type) => boolean | Ternary, defaultValue: Type): Type;
         function discriminateTypeByDiscriminableItems(target: UnionType, discriminators: [() => Type, __String][], related: (source: Type, target: Type) => boolean | Ternary, defaultValue?: Type) {
-            let match: Type | undefined;
+            // undefined=unknown, true=discriminated, false=not discriminated
+            // The state of each type progresses from left to right. Discriminated types stop at 'true'.
+            const discriminable = target.types.map(_ => undefined) as (boolean | undefined)[];
             for (const [getDiscriminatingType, propertyName] of discriminators) {
+                let i = 0;
                 for (const type of target.types) {
                     const targetType = getTypeOfPropertyOfType(type, propertyName);
                     if (targetType && related(getDiscriminatingType(), targetType)) {
-                        if (match) {
-                            if (type === match) continue; // Finding multiple fields which discriminate to the same type is fine
-                            return defaultValue;
-                        }
-                        match = type;
+                        discriminable[i] = discriminable[i] === undefined ? true : discriminable[i];
                     }
+                    else {
+                        discriminable[i] = false;
+                    }
+                    i++;
                 }
             }
-            return match || defaultValue;
+            const match = discriminable.indexOf(/*searchElement*/ true);
+            // make sure exactly 1 matches before returning it
+            return match === -1 || discriminable.indexOf(/*searchElement*/ true, match + 1) !== -1 ? defaultValue : target.types[match];
         }
 
         /**
diff --git a/tests/baselines/reference/excessPropertyCheckWithMultipleDiscriminants.errors.txt b/tests/baselines/reference/excessPropertyCheckWithMultipleDiscriminants.errors.txt
new file mode 100644
index 00000000000..29575580e80
--- /dev/null
+++ b/tests/baselines/reference/excessPropertyCheckWithMultipleDiscriminants.errors.txt
@@ -0,0 +1,78 @@
+tests/cases/compiler/excessPropertyCheckWithMultipleDiscriminants.ts(30,5): error TS2322: Type '{ type: "number"; value: number; multipleOf: number; format: string; }' is not assignable to type 'Primitive'.
+  Object literal may only specify known properties, and 'multipleOf' does not exist in type 'Float'.
+tests/cases/compiler/excessPropertyCheckWithMultipleDiscriminants.ts(41,5): error TS2322: Type '{ p1: "left"; p2: false; p3: number; p4: string; }' is not assignable to type 'DisjointDiscriminants'.
+  Object literal may only specify known properties, and 'p3' does not exist in type '{ p1: "left"; p2: boolean; }'.
+tests/cases/compiler/excessPropertyCheckWithMultipleDiscriminants.ts(57,5): error TS2322: Type '{ p1: "right"; p2: false; p3: number; p4: string; }' is not assignable to type 'DisjointDiscriminants'.
+  Object literal may only specify known properties, and 'p3' does not exist in type '{ p1: "right"; p2: false; p4: string; }'.
+
+
+==== tests/cases/compiler/excessPropertyCheckWithMultipleDiscriminants.ts (3 errors) ====
+    // Repro from #32657
+    
+    interface Base<T> {
+        value: T;
+    }
+    
+    interface Int extends Base<number> {
+        type: "integer";
+        multipleOf?: number;
+    }
+    
+    interface Float extends Base<number> {
+        type: "number";
+    }
+    
+    interface Str extends Base<string> {
+        type: "string";
+        format?: string;
+    }
+    
+    interface Bool extends Base<boolean> {
+        type: "boolean";
+    }
+    
+    type Primitive = Int | Float | Str | Bool;
+    
+    const foo: Primitive = {
+        type: "number",
+        value: 10,
+        multipleOf: 5, // excess property
+        ~~~~~~~~~~~~~
+!!! error TS2322: Type '{ type: "number"; value: number; multipleOf: number; format: string; }' is not assignable to type 'Primitive'.
+!!! error TS2322:   Object literal may only specify known properties, and 'multipleOf' does not exist in type 'Float'.
+        format: "what?"
+    }
+    
+    
+    type DisjointDiscriminants = { p1: 'left'; p2: true; p3: number } | { p1: 'right'; p2: false; p4: string } | { p1: 'left'; p2: boolean };
+    
+    // This has excess error because variant three is the only applicable case.
+    const a: DisjointDiscriminants = {
+        p1: 'left',
+        p2: false,
+        p3: 42,
+        ~~~~~~
+!!! error TS2322: Type '{ p1: "left"; p2: false; p3: number; p4: string; }' is not assignable to type 'DisjointDiscriminants'.
+!!! error TS2322:   Object literal may only specify known properties, and 'p3' does not exist in type '{ p1: "left"; p2: boolean; }'.
+        p4: "hello"
+    };
+    
+    // This has no excess error because variant one and three are both applicable.
+    const b: DisjointDiscriminants = {
+        p1: 'left',
+        p2: true,
+        p3: 42,
+        p4: "hello"
+    };
+    
+    // This has excess error because variant two is the only applicable case
+    const c: DisjointDiscriminants = {
+        p1: 'right',
+        p2: false,
+        p3: 42,
+        ~~~~~~
+!!! error TS2322: Type '{ p1: "right"; p2: false; p3: number; p4: string; }' is not assignable to type 'DisjointDiscriminants'.
+!!! error TS2322:   Object literal may only specify known properties, and 'p3' does not exist in type '{ p1: "right"; p2: false; p4: string; }'.
+        p4: "hello"
+    };
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/excessPropertyCheckWithMultipleDiscriminants.js b/tests/baselines/reference/excessPropertyCheckWithMultipleDiscriminants.js
new file mode 100644
index 00000000000..a847e63aa5a
--- /dev/null
+++ b/tests/baselines/reference/excessPropertyCheckWithMultipleDiscriminants.js
@@ -0,0 +1,91 @@
+//// [excessPropertyCheckWithMultipleDiscriminants.ts]
+// Repro from #32657
+
+interface Base<T> {
+    value: T;
+}
+
+interface Int extends Base<number> {
+    type: "integer";
+    multipleOf?: number;
+}
+
+interface Float extends Base<number> {
+    type: "number";
+}
+
+interface Str extends Base<string> {
+    type: "string";
+    format?: string;
+}
+
+interface Bool extends Base<boolean> {
+    type: "boolean";
+}
+
+type Primitive = Int | Float | Str | Bool;
+
+const foo: Primitive = {
+    type: "number",
+    value: 10,
+    multipleOf: 5, // excess property
+    format: "what?"
+}
+
+
+type DisjointDiscriminants = { p1: 'left'; p2: true; p3: number } | { p1: 'right'; p2: false; p4: string } | { p1: 'left'; p2: boolean };
+
+// This has excess error because variant three is the only applicable case.
+const a: DisjointDiscriminants = {
+    p1: 'left',
+    p2: false,
+    p3: 42,
+    p4: "hello"
+};
+
+// This has no excess error because variant one and three are both applicable.
+const b: DisjointDiscriminants = {
+    p1: 'left',
+    p2: true,
+    p3: 42,
+    p4: "hello"
+};
+
+// This has excess error because variant two is the only applicable case
+const c: DisjointDiscriminants = {
+    p1: 'right',
+    p2: false,
+    p3: 42,
+    p4: "hello"
+};
+
+
+//// [excessPropertyCheckWithMultipleDiscriminants.js]
+// Repro from #32657
+var foo = {
+    type: "number",
+    value: 10,
+    multipleOf: 5,
+    format: "what?"
+};
+// This has excess error because variant three is the only applicable case.
+var a = {
+    p1: 'left',
+    p2: false,
+    p3: 42,
+    p4: "hello"
+};
+// This has no excess error because variant one and three are both applicable.
+var b = {
+    p1: 'left',
+    p2: true,
+    p3: 42,
+    p4: "hello"
+};
+// This has excess error because variant two is the only applicable case
+var c = {
+    p1: 'right',
+    p2: false,
+    p3: 42,
+    p4: "hello"
+};
diff --git a/tests/baselines/reference/excessPropertyCheckWithMultipleDiscriminants.symbols b/tests/baselines/reference/excessPropertyCheckWithMultipleDiscriminants.symbols
new file mode 100644
index 00000000000..7a1b06b045a
--- /dev/null
+++ b/tests/baselines/reference/excessPropertyCheckWithMultipleDiscriminants.symbols
@@ -0,0 +1,143 @@
+=== tests/cases/compiler/excessPropertyCheckWithMultipleDiscriminants.ts ===
+// Repro from #32657
+
+interface Base<T> {
+>Base : Symbol(Base, Decl(excessPropertyCheckWithMultipleDiscriminants.ts, 0, 0))
+>T : Symbol(T, Decl(excessPropertyCheckWithMultipleDiscriminants.ts, 2, 15))
+
+    value: T;
+>value : Symbol(Base.value, Decl(excessPropertyCheckWithMultipleDiscriminants.ts, 2, 19))
+>T : Symbol(T, Decl(excessPropertyCheckWithMultipleDiscriminants.ts, 2, 15))
+}
+
+interface Int extends Base<number> {
+>Int : Symbol(Int, Decl(excessPropertyCheckWithMultipleDiscriminants.ts, 4, 1))
+>Base : Symbol(Base, Decl(excessPropertyCheckWithMultipleDiscriminants.ts, 0, 0))
+
+    type: "integer";
+>type : Symbol(Int.type, Decl(excessPropertyCheckWithMultipleDiscriminants.ts, 6, 36))
+
+    multipleOf?: number;
+>multipleOf : Symbol(Int.multipleOf, Decl(excessPropertyCheckWithMultipleDiscriminants.ts, 7, 20))
+}
+
+interface Float extends Base<number> {
+>Float : Symbol(Float, Decl(excessPropertyCheckWithMultipleDiscriminants.ts, 9, 1))
+>Base : Symbol(Base, Decl(excessPropertyCheckWithMultipleDiscriminants.ts, 0, 0))
+
+    type: "number";
+>type : Symbol(Float.type, Decl(excessPropertyCheckWithMultipleDiscriminants.ts, 11, 38))
+}
+
+interface Str extends Base<string> {
+>Str : Symbol(Str, Decl(excessPropertyCheckWithMultipleDiscriminants.ts, 13, 1))
+>Base : Symbol(Base, Decl(excessPropertyCheckWithMultipleDiscriminants.ts, 0, 0))
+
+    type: "string";
+>type : Symbol(Str.type, Decl(excessPropertyCheckWithMultipleDiscriminants.ts, 15, 36))
+
+    format?: string;
+>format : Symbol(Str.format, Decl(excessPropertyCheckWithMultipleDiscriminants.ts, 16, 19))
+}
+
+interface Bool extends Base<boolean> {
+>Bool : Symbol(Bool, Decl(excessPropertyCheckWithMultipleDiscriminants.ts, 18, 1))
+>Base : Symbol(Base, Decl(excessPropertyCheckWithMultipleDiscriminants.ts, 0, 0))
+
+    type: "boolean";
+>type : Symbol(Bool.type, Decl(excessPropertyCheckWithMultipleDiscriminants.ts, 20, 38))
+}
+
+type Primitive = Int | Float | Str | Bool;
+>Primitive : Symbol(Primitive, Decl(excessPropertyCheckWithMultipleDiscriminants.ts, 22, 1))
+>Int : Symbol(Int, Decl(excessPropertyCheckWithMultipleDiscriminants.ts, 4, 1))
+>Float : Symbol(Float, Decl(excessPropertyCheckWithMultipleDiscriminants.ts, 9, 1))
+>Str : Symbol(Str, Decl(excessPropertyCheckWithMultipleDiscriminants.ts, 13, 1))
+>Bool : Symbol(Bool, Decl(excessPropertyCheckWithMultipleDiscriminants.ts, 18, 1))
+
+const foo: Primitive = {
+>foo : Symbol(foo, Decl(excessPropertyCheckWithMultipleDiscriminants.ts, 26, 5))
+>Primitive : Symbol(Primitive, Decl(excessPropertyCheckWithMultipleDiscriminants.ts, 22, 1))
+
+    type: "number",
+>type : Symbol(type, Decl(excessPropertyCheckWithMultipleDiscriminants.ts, 26, 24))
+
+    value: 10,
+>value : Symbol(value, Decl(excessPropertyCheckWithMultipleDiscriminants.ts, 27, 19))
+
+    multipleOf: 5, // excess property
+>multipleOf : Symbol(multipleOf, Decl(excessPropertyCheckWithMultipleDiscriminants.ts, 28, 14))
+
+    format: "what?"
+>format : Symbol(format, Decl(excessPropertyCheckWithMultipleDiscriminants.ts, 29, 18))
+}
+
+
+type DisjointDiscriminants = { p1: 'left'; p2: true; p3: number } | { p1: 'right'; p2: false; p4: string } | { p1: 'left'; p2: boolean };
+>DisjointDiscriminants : Symbol(DisjointDiscriminants, Decl(excessPropertyCheckWithMultipleDiscriminants.ts, 31, 1))
+>p1 : Symbol(p1, Decl(excessPropertyCheckWithMultipleDiscriminants.ts, 34, 30))
+>p2 : Symbol(p2, Decl(excessPropertyCheckWithMultipleDiscriminants.ts, 34, 42))
+>p3 : Symbol(p3, Decl(excessPropertyCheckWithMultipleDiscriminants.ts, 34, 52))
+>p1 : Symbol(p1, Decl(excessPropertyCheckWithMultipleDiscriminants.ts, 34, 69))
+>p2 : Symbol(p2, Decl(excessPropertyCheckWithMultipleDiscriminants.ts, 34, 82))
+>p4 : Symbol(p4, Decl(excessPropertyCheckWithMultipleDiscriminants.ts, 34, 93))
+>p1 : Symbol(p1, Decl(excessPropertyCheckWithMultipleDiscriminants.ts, 34, 110))
+>p2 : Symbol(p2, Decl(excessPropertyCheckWithMultipleDiscriminants.ts, 34, 122))
+
+// This has excess error because variant three is the only applicable case.
+const a: DisjointDiscriminants = {
+>a : Symbol(a, Decl(excessPropertyCheckWithMultipleDiscriminants.ts, 37, 5))
+>DisjointDiscriminants : Symbol(DisjointDiscriminants, Decl(excessPropertyCheckWithMultipleDiscriminants.ts, 31, 1))
+
+    p1: 'left',
+>p1 : Symbol(p1, Decl(excessPropertyCheckWithMultipleDiscriminants.ts, 37, 34))
+
+    p2: false,
+>p2 : Symbol(p2, Decl(excessPropertyCheckWithMultipleDiscriminants.ts, 38, 15))
+
+    p3: 42,
+>p3 : Symbol(p3, Decl(excessPropertyCheckWithMultipleDiscriminants.ts, 39, 14))
+
+    p4: "hello"
+>p4 : Symbol(p4, Decl(excessPropertyCheckWithMultipleDiscriminants.ts, 40, 11))
+
+};
+
+// This has no excess error because variant one and three are both applicable.
+const b: DisjointDiscriminants = {
+>b : Symbol(b, Decl(excessPropertyCheckWithMultipleDiscriminants.ts, 45, 5))
+>DisjointDiscriminants : Symbol(DisjointDiscriminants, Decl(excessPropertyCheckWithMultipleDiscriminants.ts, 31, 1))
+
+    p1: 'left',
+>p1 : Symbol(p1, Decl(excessPropertyCheckWithMultipleDiscriminants.ts, 45, 34))
+
+    p2: true,
+>p2 : Symbol(p2, Decl(excessPropertyCheckWithMultipleDiscriminants.ts, 46, 15))
+
+    p3: 42,
+>p3 : Symbol(p3, Decl(excessPropertyCheckWithMultipleDiscriminants.ts, 47, 13))
+
+    p4: "hello"
+>p4 : Symbol(p4, Decl(excessPropertyCheckWithMultipleDiscriminants.ts, 48, 11))
+
+};
+
+// This has excess error because variant two is the only applicable case
+const c: DisjointDiscriminants = {
+>c : Symbol(c, Decl(excessPropertyCheckWithMultipleDiscriminants.ts, 53, 5))
+>DisjointDiscriminants : Symbol(DisjointDiscriminants, Decl(excessPropertyCheckWithMultipleDiscriminants.ts, 31, 1))
+
+    p1: 'right',
+>p1 : Symbol(p1, Decl(excessPropertyCheckWithMultipleDiscriminants.ts, 53, 34))
+
+    p2: false,
+>p2 : Symbol(p2, Decl(excessPropertyCheckWithMultipleDiscriminants.ts, 54, 16))
+
+    p3: 42,
+>p3 : Symbol(p3, Decl(excessPropertyCheckWithMultipleDiscriminants.ts, 55, 14))
+
+    p4: "hello"
+>p4 : Symbol(p4, Decl(excessPropertyCheckWithMultipleDiscriminants.ts, 56, 11))
+
+};
+
diff --git a/tests/baselines/reference/excessPropertyCheckWithMultipleDiscriminants.types b/tests/baselines/reference/excessPropertyCheckWithMultipleDiscriminants.types
new file mode 100644
index 00000000000..1f5d85b10a5
--- /dev/null
+++ b/tests/baselines/reference/excessPropertyCheckWithMultipleDiscriminants.types
@@ -0,0 +1,141 @@
+=== tests/cases/compiler/excessPropertyCheckWithMultipleDiscriminants.ts ===
+// Repro from #32657
+
+interface Base<T> {
+    value: T;
+>value : T
+}
+
+interface Int extends Base<number> {
+    type: "integer";
+>type : "integer"
+
+    multipleOf?: number;
+>multipleOf : number
+}
+
+interface Float extends Base<number> {
+    type: "number";
+>type : "number"
+}
+
+interface Str extends Base<string> {
+    type: "string";
+>type : "string"
+
+    format?: string;
+>format : string
+}
+
+interface Bool extends Base<boolean> {
+    type: "boolean";
+>type : "boolean"
+}
+
+type Primitive = Int | Float | Str | Bool;
+>Primitive : Primitive
+
+const foo: Primitive = {
+>foo : Primitive
+>{    type: "number",    value: 10,    multipleOf: 5, // excess property    format: "what?"} : { type: "number"; value: number; multipleOf: number; format: string; }
+
+    type: "number",
+>type : "number"
+>"number" : "number"
+
+    value: 10,
+>value : number
+>10 : 10
+
+    multipleOf: 5, // excess property
+>multipleOf : number
+>5 : 5
+
+    format: "what?"
+>format : string
+>"what?" : "what?"
+}
+
+
+type DisjointDiscriminants = { p1: 'left'; p2: true; p3: number } | { p1: 'right'; p2: false; p4: string } | { p1: 'left'; p2: boolean };
+>DisjointDiscriminants : DisjointDiscriminants
+>p1 : "left"
+>p2 : true
+>true : true
+>p3 : number
+>p1 : "right"
+>p2 : false
+>false : false
+>p4 : string
+>p1 : "left"
+>p2 : boolean
+
+// This has excess error because variant three is the only applicable case.
+const a: DisjointDiscriminants = {
+>a : DisjointDiscriminants
+>{    p1: 'left',    p2: false,    p3: 42,    p4: "hello"} : { p1: "left"; p2: false; p3: number; p4: string; }
+
+    p1: 'left',
+>p1 : "left"
+>'left' : "left"
+
+    p2: false,
+>p2 : false
+>false : false
+
+    p3: 42,
+>p3 : number
+>42 : 42
+
+    p4: "hello"
+>p4 : string
+>"hello" : "hello"
+
+};
+
+// This has no excess error because variant one and three are both applicable.
+const b: DisjointDiscriminants = {
+>b : DisjointDiscriminants
+>{    p1: 'left',    p2: true,    p3: 42,    p4: "hello"} : { p1: "left"; p2: true; p3: number; p4: string; }
+
+    p1: 'left',
+>p1 : "left"
+>'left' : "left"
+
+    p2: true,
+>p2 : true
+>true : true
+
+    p3: 42,
+>p3 : number
+>42 : 42
+
+    p4: "hello"
+>p4 : string
+>"hello" : "hello"
+
+};
+
+// This has excess error because variant two is the only applicable case
+const c: DisjointDiscriminants = {
+>c : DisjointDiscriminants
+>{    p1: 'right',    p2: false,    p3: 42,    p4: "hello"} : { p1: "right"; p2: false; p3: number; p4: string; }
+
+    p1: 'right',
+>p1 : "right"
+>'right' : "right"
+
+    p2: false,
+>p2 : false
+>false : false
+
+    p3: 42,
+>p3 : number
+>42 : 42
+
+    p4: "hello"
+>p4 : string
+>"hello" : "hello"
+
+};
+
diff --git a/tests/baselines/reference/excessPropertyCheckWithUnions.errors.txt b/tests/baselines/reference/excessPropertyCheckWithUnions.errors.txt
index 469b6d089b6..72da324caf7 100644
--- a/tests/baselines/reference/excessPropertyCheckWithUnions.errors.txt
+++ b/tests/baselines/reference/excessPropertyCheckWithUnions.errors.txt
@@ -23,9 +23,11 @@ tests/cases/compiler/excessPropertyCheckWithUnions.ts(50,35): error TS2322: Type
 tests/cases/compiler/excessPropertyCheckWithUnions.ts(66,9): error TS2326: Types of property 'n' are incompatible.
   Type '{ a: string; b: string; }' is not assignable to type 'AN'.
     Object literal may only specify known properties, and 'b' does not exist in type 'AN'.
+tests/cases/compiler/excessPropertyCheckWithUnions.ts(87,5): error TS2322: Type '{ tag: "button"; type: "submit"; href: string; }' is not assignable to type 'Union'.
+  Object literal may only specify known properties, and 'href' does not exist in type 'Button'.
 
 
-==== tests/cases/compiler/excessPropertyCheckWithUnions.ts (10 errors) ====
+==== tests/cases/compiler/excessPropertyCheckWithUnions.ts (11 errors) ====
     type ADT = {
         tag: "A",
         a1: string
@@ -137,4 +139,20 @@ tests/cases/compiler/excessPropertyCheckWithUnions.ts(66,9): error TS2326: Types
             c: "c", // ok -- kind: "A", an: { a: string } | { c: string }
         }
     }
+    
+    // Excess property checks must match all discriminable properties
+    type Button = { tag: 'button'; type?: 'submit'; };
+    type Anchor = { tag: 'a'; type?: string; href: string };
+    
+    type Union = Button | Anchor;
+    const obj: Union = {
+        tag: 'button',
+        type: 'submit',
+    
+        // should have error here
+        href: 'foo',
+        ~~~~~~~~~~~
+!!! error TS2322: Type '{ tag: "button"; type: "submit"; href: string; }' is not assignable to type 'Union'.
+!!! error TS2322:   Object literal may only specify known properties, and 'href' does not exist in type 'Button'.
+    };
     
\ No newline at end of file
diff --git a/tests/baselines/reference/excessPropertyCheckWithUnions.js b/tests/baselines/reference/excessPropertyCheckWithUnions.js
index c76ad750601..691a64f65b8 100644
--- a/tests/baselines/reference/excessPropertyCheckWithUnions.js
+++ b/tests/baselines/reference/excessPropertyCheckWithUnions.js
@@ -74,6 +74,19 @@ const abac: AB = {
         c: "c", // ok -- kind: "A", an: { a: string } | { c: string }
     }
 }
+
+// Excess property checks must match all discriminable properties
+type Button = { tag: 'button'; type?: 'submit'; };
+type Anchor = { tag: 'a'; type?: string; href: string };
+
+type Union = Button | Anchor;
+const obj: Union = {
+    tag: 'button',
+    type: 'submit',
+
+    // should have error here
+    href: 'foo',
+};
 
 
 //// [excessPropertyCheckWithUnions.js]
@@ -125,3 +138,9 @@ var abac = {
         c: "c"
     }
 };
+var obj = {
+    tag: 'button',
+    type: 'submit',
+    // should have error here
+    href: 'foo'
+};
diff --git a/tests/baselines/reference/excessPropertyCheckWithUnions.symbols b/tests/baselines/reference/excessPropertyCheckWithUnions.symbols
index beee933a2f1..749e359d4a1 100644
--- a/tests/baselines/reference/excessPropertyCheckWithUnions.symbols
+++ b/tests/baselines/reference/excessPropertyCheckWithUnions.symbols
@@ -221,3 +221,36 @@ const abac: AB = {
     }
 }
 
+// Excess property checks must match all discriminable properties
+type Button = { tag: 'button'; type?: 'submit'; };
+>Button : Symbol(Button, Decl(excessPropertyCheckWithUnions.ts, 74, 1))
+>tag : Symbol(tag, Decl(excessPropertyCheckWithUnions.ts, 77, 15))
+>type : Symbol(type, Decl(excessPropertyCheckWithUnions.ts, 77, 30))
+
+type Anchor = { tag: 'a'; type?: string; href: string };
+>Anchor : Symbol(Anchor, Decl(excessPropertyCheckWithUnions.ts, 77, 50))
+>tag : Symbol(tag, Decl(excessPropertyCheckWithUnions.ts, 78, 15))
+>type : Symbol(type, Decl(excessPropertyCheckWithUnions.ts, 78, 25))
+>href : Symbol(href, Decl(excessPropertyCheckWithUnions.ts, 78, 40))
+
+type Union = Button | Anchor;
+>Union : Symbol(Union, Decl(excessPropertyCheckWithUnions.ts, 78, 56))
+>Button : Symbol(Button, Decl(excessPropertyCheckWithUnions.ts, 74, 1))
+>Anchor : Symbol(Anchor, Decl(excessPropertyCheckWithUnions.ts, 77, 50))
+
+const obj: Union = {
+>obj : Symbol(obj, Decl(excessPropertyCheckWithUnions.ts, 81, 5))
+>Union : Symbol(Union, Decl(excessPropertyCheckWithUnions.ts, 78, 56))
+
+    tag: 'button',
+>tag : Symbol(tag, Decl(excessPropertyCheckWithUnions.ts, 81, 20))
+
+    type: 'submit',
+>type : Symbol(type, Decl(excessPropertyCheckWithUnions.ts, 82, 18))
+
+    // should have error here
+    href: 'foo',
+>href : Symbol(href, Decl(excessPropertyCheckWithUnions.ts, 83, 19))
+
+};
+
diff --git a/tests/baselines/reference/excessPropertyCheckWithUnions.types b/tests/baselines/reference/excessPropertyCheckWithUnions.types
index 83542716c65..f56aa287daa 100644
--- a/tests/baselines/reference/excessPropertyCheckWithUnions.types
+++ b/tests/baselines/reference/excessPropertyCheckWithUnions.types
@@ -278,3 +278,37 @@ const abac: AB = {
     }
 }
 
+// Excess property checks must match all discriminable properties
+type Button = { tag: 'button'; type?: 'submit'; };
+>Button : Button
+>tag : "button"
+>type : "submit" | undefined
+
+type Anchor = { tag: 'a'; type?: string; href: string };
+>Anchor : Anchor
+>tag : "a"
+>type : string | undefined
+>href : string
+
+type Union = Button | Anchor;
+>Union : Union
+
+const obj: Union = {
+>obj : Union
+>{    tag: 'button',    type: 'submit',    // should have error here    href: 'foo',} : { tag: "button"; type: "submit"; href: string; }
+
+    tag: 'button',
+>tag : "button"
+>'button' : "button"
+
+    type: 'submit',
+>type : "submit"
+>'submit' : "submit"
+
+    // should have error here
+    href: 'foo',
+>href : string
+>'foo' : "foo"
+
+};
+
diff --git a/tests/cases/compiler/excessPropertyCheckWithMultipleDiscriminants.ts b/tests/cases/compiler/excessPropertyCheckWithMultipleDiscriminants.ts
new file mode 100644
index 00000000000..5f7abedc1f4
--- /dev/null
+++ b/tests/cases/compiler/excessPropertyCheckWithMultipleDiscriminants.ts
@@ -0,0 +1,59 @@
+// Repro from #32657
+
+interface Base<T> {
+    value: T;
+}
+
+interface Int extends Base<number> {
+    type: "integer";
+    multipleOf?: number;
+}
+
+interface Float extends Base<number> {
+    type: "number";
+}
+
+interface Str extends Base<string> {
+    type: "string";
+    format?: string;
+}
+
+interface Bool extends Base<boolean> {
+    type: "boolean";
+}
+
+type Primitive = Int | Float | Str | Bool;
+
+const foo: Primitive = {
+    type: "number",
+    value: 10,
+    multipleOf: 5, // excess property
+    format: "what?"
+}
+
+
+type DisjointDiscriminants = { p1: 'left'; p2: true; p3: number } | { p1: 'right'; p2: false; p4: string } | { p1: 'left'; p2: boolean };
+
+// This has excess error because variant three is the only applicable case.
+const a: DisjointDiscriminants = {
+    p1: 'left',
+    p2: false,
+    p3: 42,
+    p4: "hello"
+};
+
+// This has no excess error because variant one and three are both applicable.
+const b: DisjointDiscriminants = {
+    p1: 'left',
+    p2: true,
+    p3: 42,
+    p4: "hello"
+};
+
+// This has excess error because variant two is the only applicable case
+const c: DisjointDiscriminants = {
+    p1: 'right',
+    p2: false,
+    p3: 42,
+    p4: "hello"
+};
diff --git a/tests/cases/compiler/excessPropertyCheckWithUnions.ts b/tests/cases/compiler/excessPropertyCheckWithUnions.ts
index 027e67e4ec9..bb3e59151fc 100644
--- a/tests/cases/compiler/excessPropertyCheckWithUnions.ts
+++ b/tests/cases/compiler/excessPropertyCheckWithUnions.ts
@@ -74,3 +74,16 @@ const abac: AB = {
         c: "c", // ok -- kind: "A", an: { a: string } | { c: string }
     }
 }
+
+// Excess property checks must match all discriminable properties
+type Button = { tag: 'button'; type?: 'submit'; };
+type Anchor = { tag: 'a'; type?: string; href: string };
+
+type Union = Button | Anchor;
+const obj: Union = {
+    tag: 'button',
+    type: 'submit',
+
+    // should have error here
+    href: 'foo',
+};

From d9780cd7ba3db3fe4be26ff9cc645200d933eed7 Mon Sep 17 00:00:00 2001
From: Andrew Casey <andrew.casey@microsoft.com>
Date: Fri, 9 Aug 2019 10:27:02 -0700
Subject: [PATCH 131/151] Include fewer paths in exception

It's sufficient to append them to the log.
---
 src/services/services.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/services/services.ts b/src/services/services.ts
index 42b3ac3b31d..b769ee2da3e 100644
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -1158,7 +1158,7 @@ namespace ts {
         function getValidSourceFile(fileName: string): SourceFile {
             const sourceFile = program.getSourceFile(fileName);
             if (!sourceFile) {
-                throw new Error(`Could not find sourceFile: '${fileName}' in ${program && JSON.stringify(program.getSourceFiles().map(f => f.fileName))}.`);
+                throw new Error(`Could not find sourceFile: '${fileName}'.`);
             }
             return sourceFile;
         }

From 5294e92d27da2bb2f1aca162fb12bc0cb8646e73 Mon Sep 17 00:00:00 2001
From: Orta Therox <orta.therox@gmail.com>
Date: Fri, 9 Aug 2019 13:48:07 -0400
Subject: [PATCH 132/151] Use switch instead of instatating an array and when
 looking inside a module

---
 src/compiler/parser.ts | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
index 522f4974ddf..b51c90eb742 100644
--- a/src/compiler/parser.ts
+++ b/src/compiler/parser.ts
@@ -2434,9 +2434,16 @@ namespace ts {
             const moduleSpecifier = parseOptionalToken(SyntaxKind.ModuleKeyword);
             if (moduleSpecifier) {
                 const moduleTag = createNode(SyntaxKind.JSDocNamepathType, moduleSpecifier.pos) as JSDocNamepathType;
-                const terminators = [SyntaxKind.CloseBraceToken, SyntaxKind.EndOfFileToken, SyntaxKind.CommaToken, SyntaxKind.CloseParenToken, SyntaxKind.WhitespaceTrivia];
-                while (terminators.indexOf(token()) < 0) {
-                    nextTokenJSDoc();
+                terminate: while (true) {
+                    switch (token()) {
+                        case SyntaxKind.CloseBraceToken:
+                        case SyntaxKind.EndOfFileToken:
+                        case SyntaxKind.CommaToken:
+                        case SyntaxKind.WhitespaceTrivia:
+                            break terminate;
+                        default:
+                            nextTokenJSDoc();
+                    }
                 }
 
                 scanner.setInJSDocType(false);

From 6122e92802c5c69275904d674167275c3df080a1 Mon Sep 17 00:00:00 2001
From: Andrew Casey <andrew.casey@microsoft.com>
Date: Fri, 9 Aug 2019 12:34:40 -0700
Subject: [PATCH 133/151] Restore logging of the program file list

---
 src/server/session.ts    | 3 ++-
 src/services/services.ts | 7 ++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/server/session.ts b/src/server/session.ts
index 7e6bca66c04..52bf905dedc 100644
--- a/src/server/session.ts
+++ b/src/server/session.ts
@@ -711,7 +711,8 @@ namespace ts.server {
                     catch { } // tslint:disable-line no-empty
                 }
 
-                if (err.message && err.message.indexOf(`Could not find sourceFile:`) !== -1) {
+                if (err.hasOwnProperty("ProgramFiles")) {
+                    msg += `\n\nProgram files: {(err as any)["ProgramFiles"]}\n`;
                     msg += `\n\nProjects::\n`;
                     let counter = 0;
                     const addProjectInfo = (project: Project) => {
diff --git a/src/services/services.ts b/src/services/services.ts
index b769ee2da3e..51987c26889 100644
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -1158,7 +1158,12 @@ namespace ts {
         function getValidSourceFile(fileName: string): SourceFile {
             const sourceFile = program.getSourceFile(fileName);
             if (!sourceFile) {
-                throw new Error(`Could not find sourceFile: '${fileName}'.`);
+                let error = new Error(`Could not find sourceFile: '${fileName}'.`);
+
+                // Attach sidecar data for the server log
+                (error as any)["ProgramFiles"] = program && JSON.stringify(program.getSourceFiles().map(f => f.fileName));
+
+                throw error;
             }
             return sourceFile;
         }

From 85b8d27ea3819480b9fcfcb3914a2a6bc1685e7e Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com>
Date: Fri, 9 Aug 2019 12:53:15 -0700
Subject: [PATCH 134/151] Remove error on invalid jsdoc tokens (#32769)

* Remove error on invalid jsdoc tokens

In JSDoc:

1. In the scanner, don't issue an error, even for invalid identifiers.
2. In the binder, don't issue an error for reserved (but otherwise valid)
identifiers.

/**
 * Example of 1: "\"
 * Example of 2: @private
 */

* Update baselines

* Add invalid unicode escape test for JSDoc

* Add quotes around invalid unicode escape

* Add another unicode escape JSDoc test
---
 src/compiler/binder.ts                            |  3 ++-
 src/compiler/parser.ts                            |  6 +++---
 src/compiler/scanner.ts                           |  1 -
 .../DocComments.parsesCorrectly.@link tags.json   |  1 +
 ...mments.parsesCorrectly.Nested @param tags.json |  1 +
 ...nts.parsesCorrectly.argSynonymForParamTag.json |  1 +
 ...arsesCorrectly.argumentSynonymForParamTag.json |  1 +
 ...nts.parsesCorrectly.asteriskAfterPreamble.json |  1 +
 .../DocComments.parsesCorrectly.authorTag.json    |  1 +
 .../DocComments.parsesCorrectly.emptyComment.json |  1 +
 ...cComments.parsesCorrectly.leadingAsterisk.json |  1 +
 ...tly.less-than and greater-than characters.json |  1 +
 ...omments.parsesCorrectly.noLeadingAsterisk.json |  1 +
 .../DocComments.parsesCorrectly.noReturnType.json |  1 +
 .../DocComments.parsesCorrectly.oneParamTag.json  |  1 +
 .../DocComments.parsesCorrectly.paramTag1.json    |  1 +
 ...ts.parsesCorrectly.paramTagBracketedName1.json |  1 +
 ...ts.parsesCorrectly.paramTagBracketedName2.json |  1 +
 ...nts.parsesCorrectly.paramTagNameThenType1.json |  1 +
 ...nts.parsesCorrectly.paramTagNameThenType2.json |  1 +
 ...Comments.parsesCorrectly.paramWithoutType.json |  1 +
 .../DocComments.parsesCorrectly.returnTag1.json   |  1 +
 .../DocComments.parsesCorrectly.returnTag2.json   |  1 +
 .../DocComments.parsesCorrectly.returnsTag1.json  |  1 +
 .../DocComments.parsesCorrectly.templateTag.json  |  1 +
 .../DocComments.parsesCorrectly.templateTag2.json |  1 +
 .../DocComments.parsesCorrectly.templateTag3.json |  1 +
 .../DocComments.parsesCorrectly.templateTag4.json |  1 +
 .../DocComments.parsesCorrectly.templateTag5.json |  1 +
 .../DocComments.parsesCorrectly.templateTag6.json |  1 +
 ...ocComments.parsesCorrectly.threeAsterisks.json |  1 +
 .../DocComments.parsesCorrectly.twoParamTag2.json |  1 +
 ...nts.parsesCorrectly.twoParamTagOnSameLine.json |  1 +
 .../DocComments.parsesCorrectly.typeTag.json      |  1 +
 ...arsesCorrectly.typedefTagWithChildrenTags.json |  1 +
 .../reference/jsdocInvalidTokens.symbols          | 12 ++++++++++++
 .../baselines/reference/jsdocInvalidTokens.types  | 13 +++++++++++++
 .../conformance/scanner/jsdocInvalidTokens.ts     | 15 +++++++++++++++
 38 files changed, 77 insertions(+), 5 deletions(-)
 create mode 100644 tests/baselines/reference/jsdocInvalidTokens.symbols
 create mode 100644 tests/baselines/reference/jsdocInvalidTokens.types
 create mode 100644 tests/cases/conformance/scanner/jsdocInvalidTokens.ts

diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts
index 25c275fe969..afa6e36a6de 100644
--- a/src/compiler/binder.ts
+++ b/src/compiler/binder.ts
@@ -1842,7 +1842,8 @@ namespace ts {
                 node.originalKeywordKind! >= SyntaxKind.FirstFutureReservedWord &&
                 node.originalKeywordKind! <= SyntaxKind.LastFutureReservedWord &&
                 !isIdentifierName(node) &&
-                !(node.flags & NodeFlags.Ambient)) {
+                !(node.flags & NodeFlags.Ambient) &&
+                !(node.flags & NodeFlags.JSDoc)) {
 
                 // Report error only if there are no parse errors in file
                 if (!file.parseDiagnostics.length) {
diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
index 704260e7279..a81cf8e29ef 100644
--- a/src/compiler/parser.ts
+++ b/src/compiler/parser.ts
@@ -6434,7 +6434,7 @@ namespace ts {
             export function parseIsolatedJSDocComment(content: string, start: number | undefined, length: number | undefined): { jsDoc: JSDoc, diagnostics: Diagnostic[] } | undefined {
                 initializeState(content, ScriptTarget.Latest, /*_syntaxCursor:*/ undefined, ScriptKind.JS);
                 sourceFile = <SourceFile>{ languageVariant: LanguageVariant.Standard, text: content }; // tslint:disable-line no-object-literal-type-assertion
-                const jsDoc = parseJSDocCommentWorker(start, length);
+                const jsDoc = doInsideOfContext(NodeFlags.JSDoc, () => parseJSDocCommentWorker(start, length));
                 const diagnostics = parseDiagnostics;
                 clearState();
 
@@ -6446,7 +6446,7 @@ namespace ts {
                 const saveParseDiagnosticsLength = parseDiagnostics.length;
                 const saveParseErrorBeforeNextFinishedNode = parseErrorBeforeNextFinishedNode;
 
-                const comment = parseJSDocCommentWorker(start, length);
+                const comment = doInsideOfContext(NodeFlags.JSDoc, () => parseJSDocCommentWorker(start, length));
                 if (comment) {
                     comment.parent = parent;
                 }
@@ -6477,7 +6477,7 @@ namespace ts {
                 CallbackParameter = 1 << 2,
             }
 
-            export function parseJSDocCommentWorker(start = 0, length: number | undefined): JSDoc | undefined {
+            function parseJSDocCommentWorker(start = 0, length: number | undefined): JSDoc | undefined {
                 const content = sourceText;
                 const end = length === undefined ? content.length : start + length;
                 length = end - start;
diff --git a/src/compiler/scanner.ts b/src/compiler/scanner.ts
index eccce228d34..2ac31eb2e7b 100644
--- a/src/compiler/scanner.ts
+++ b/src/compiler/scanner.ts
@@ -2159,7 +2159,6 @@ namespace ts {
                         tokenValue = String.fromCharCode(cookedChar) + scanIdentifierParts();
                         return token = getIdentifierToken();
                     }
-                    error(Diagnostics.Invalid_character);
                     pos++;
                     return token = SyntaxKind.Unknown;
             }
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.@link tags.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.@link tags.json
index 0cf9640d8b7..9817af1157f 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.@link tags.json	
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.@link tags.json	
@@ -2,6 +2,7 @@
     "kind": "JSDocComment",
     "pos": 0,
     "end": 127,
+    "flags": "JSDoc",
     "modifierFlagsCache": 0,
     "transformFlags": 0,
     "tags": {
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.Nested @param tags.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.Nested @param tags.json
index 3eb18224068..05eb1275891 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.Nested @param tags.json	
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.Nested @param tags.json	
@@ -2,6 +2,7 @@
     "kind": "JSDocComment",
     "pos": 0,
     "end": 66,
+    "flags": "JSDoc",
     "modifierFlagsCache": 0,
     "transformFlags": 0,
     "tags": {
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.argSynonymForParamTag.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.argSynonymForParamTag.json
index 04160cb1848..3a6ee3365dc 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.argSynonymForParamTag.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.argSynonymForParamTag.json
@@ -2,6 +2,7 @@
     "kind": "JSDocComment",
     "pos": 0,
     "end": 44,
+    "flags": "JSDoc",
     "modifierFlagsCache": 0,
     "transformFlags": 0,
     "tags": {
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.argumentSynonymForParamTag.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.argumentSynonymForParamTag.json
index cd2e8dcc822..2fa5734c1a3 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.argumentSynonymForParamTag.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.argumentSynonymForParamTag.json
@@ -2,6 +2,7 @@
     "kind": "JSDocComment",
     "pos": 0,
     "end": 49,
+    "flags": "JSDoc",
     "modifierFlagsCache": 0,
     "transformFlags": 0,
     "tags": {
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.asteriskAfterPreamble.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.asteriskAfterPreamble.json
index 94083d05508..2d4beb55b12 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.asteriskAfterPreamble.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.asteriskAfterPreamble.json
@@ -2,6 +2,7 @@
     "kind": "JSDocComment",
     "pos": 0,
     "end": 23,
+    "flags": "JSDoc",
     "modifierFlagsCache": 0,
     "transformFlags": 0,
     "comment": "* @type {number}"
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.authorTag.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.authorTag.json
index 54e06da0465..eff1b97e80a 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.authorTag.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.authorTag.json
@@ -2,6 +2,7 @@
     "kind": "JSDocComment",
     "pos": 0,
     "end": 112,
+    "flags": "JSDoc",
     "modifierFlagsCache": 0,
     "transformFlags": 0,
     "tags": {
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.emptyComment.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.emptyComment.json
index 10cfd883c98..cf684f317f6 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.emptyComment.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.emptyComment.json
@@ -2,6 +2,7 @@
     "kind": "JSDocComment",
     "pos": 0,
     "end": 5,
+    "flags": "JSDoc",
     "modifierFlagsCache": 0,
     "transformFlags": 0
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.leadingAsterisk.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.leadingAsterisk.json
index ed9660cb05a..8f056c2da40 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.leadingAsterisk.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.leadingAsterisk.json
@@ -2,6 +2,7 @@
     "kind": "JSDocComment",
     "pos": 0,
     "end": 27,
+    "flags": "JSDoc",
     "modifierFlagsCache": 0,
     "transformFlags": 0,
     "tags": {
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.less-than and greater-than characters.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.less-than and greater-than characters.json
index 642fde1b7da..e0a57b72e93 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.less-than and greater-than characters.json	
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.less-than and greater-than characters.json	
@@ -2,6 +2,7 @@
     "kind": "JSDocComment",
     "pos": 0,
     "end": 61,
+    "flags": "JSDoc",
     "modifierFlagsCache": 0,
     "transformFlags": 0,
     "tags": {
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.noLeadingAsterisk.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.noLeadingAsterisk.json
index ed9660cb05a..8f056c2da40 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.noLeadingAsterisk.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.noLeadingAsterisk.json
@@ -2,6 +2,7 @@
     "kind": "JSDocComment",
     "pos": 0,
     "end": 27,
+    "flags": "JSDoc",
     "modifierFlagsCache": 0,
     "transformFlags": 0,
     "tags": {
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.noReturnType.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.noReturnType.json
index a661ddc90c4..e0c0f1c9713 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.noReturnType.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.noReturnType.json
@@ -2,6 +2,7 @@
     "kind": "JSDocComment",
     "pos": 0,
     "end": 20,
+    "flags": "JSDoc",
     "modifierFlagsCache": 0,
     "transformFlags": 0,
     "tags": {
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.oneParamTag.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.oneParamTag.json
index b153b897d74..1b072194d84 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.oneParamTag.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.oneParamTag.json
@@ -2,6 +2,7 @@
     "kind": "JSDocComment",
     "pos": 0,
     "end": 34,
+    "flags": "JSDoc",
     "modifierFlagsCache": 0,
     "transformFlags": 0,
     "tags": {
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTag1.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTag1.json
index b77c09d380e..712ac49a36f 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTag1.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTag1.json
@@ -2,6 +2,7 @@
     "kind": "JSDocComment",
     "pos": 0,
     "end": 59,
+    "flags": "JSDoc",
     "modifierFlagsCache": 0,
     "transformFlags": 0,
     "tags": {
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagBracketedName1.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagBracketedName1.json
index f30f67c5394..3eebbc73ba9 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagBracketedName1.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagBracketedName1.json
@@ -2,6 +2,7 @@
     "kind": "JSDocComment",
     "pos": 0,
     "end": 61,
+    "flags": "JSDoc",
     "modifierFlagsCache": 0,
     "transformFlags": 0,
     "tags": {
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagBracketedName2.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagBracketedName2.json
index 6c8c57a5347..d864cbeafd2 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagBracketedName2.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagBracketedName2.json
@@ -2,6 +2,7 @@
     "kind": "JSDocComment",
     "pos": 0,
     "end": 66,
+    "flags": "JSDoc",
     "modifierFlagsCache": 0,
     "transformFlags": 0,
     "tags": {
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagNameThenType1.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagNameThenType1.json
index 24779f14f89..223d1e95105 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagNameThenType1.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagNameThenType1.json
@@ -2,6 +2,7 @@
     "kind": "JSDocComment",
     "pos": 0,
     "end": 34,
+    "flags": "JSDoc",
     "modifierFlagsCache": 0,
     "transformFlags": 0,
     "tags": {
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagNameThenType2.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagNameThenType2.json
index cf503702588..4c29e477e10 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagNameThenType2.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagNameThenType2.json
@@ -2,6 +2,7 @@
     "kind": "JSDocComment",
     "pos": 0,
     "end": 46,
+    "flags": "JSDoc",
     "modifierFlagsCache": 0,
     "transformFlags": 0,
     "tags": {
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramWithoutType.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramWithoutType.json
index ec4a36acc53..c2cb7a167db 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramWithoutType.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramWithoutType.json
@@ -2,6 +2,7 @@
     "kind": "JSDocComment",
     "pos": 0,
     "end": 23,
+    "flags": "JSDoc",
     "modifierFlagsCache": 0,
     "transformFlags": 0,
     "tags": {
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.returnTag1.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.returnTag1.json
index c50d3389a71..a2d66247e14 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.returnTag1.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.returnTag1.json
@@ -2,6 +2,7 @@
     "kind": "JSDocComment",
     "pos": 0,
     "end": 29,
+    "flags": "JSDoc",
     "modifierFlagsCache": 0,
     "transformFlags": 0,
     "tags": {
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.returnTag2.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.returnTag2.json
index 6576be9ef70..5fe9854187d 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.returnTag2.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.returnTag2.json
@@ -2,6 +2,7 @@
     "kind": "JSDocComment",
     "pos": 0,
     "end": 54,
+    "flags": "JSDoc",
     "modifierFlagsCache": 0,
     "transformFlags": 0,
     "tags": {
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.returnsTag1.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.returnsTag1.json
index 2170ab303bb..3d1722eedc2 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.returnsTag1.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.returnsTag1.json
@@ -2,6 +2,7 @@
     "kind": "JSDocComment",
     "pos": 0,
     "end": 30,
+    "flags": "JSDoc",
     "modifierFlagsCache": 0,
     "transformFlags": 0,
     "tags": {
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag.json
index 6f63982375d..1e7cc39feb7 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag.json
@@ -2,6 +2,7 @@
     "kind": "JSDocComment",
     "pos": 0,
     "end": 24,
+    "flags": "JSDoc",
     "modifierFlagsCache": 0,
     "transformFlags": 0,
     "tags": {
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag2.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag2.json
index 25d1916f4b4..0428568bdb4 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag2.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag2.json
@@ -2,6 +2,7 @@
     "kind": "JSDocComment",
     "pos": 0,
     "end": 26,
+    "flags": "JSDoc",
     "modifierFlagsCache": 0,
     "transformFlags": 0,
     "tags": {
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag3.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag3.json
index e8367c03624..e7e6a0f30d0 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag3.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag3.json
@@ -2,6 +2,7 @@
     "kind": "JSDocComment",
     "pos": 0,
     "end": 27,
+    "flags": "JSDoc",
     "modifierFlagsCache": 0,
     "transformFlags": 0,
     "tags": {
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag4.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag4.json
index e8367c03624..e7e6a0f30d0 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag4.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag4.json
@@ -2,6 +2,7 @@
     "kind": "JSDocComment",
     "pos": 0,
     "end": 27,
+    "flags": "JSDoc",
     "modifierFlagsCache": 0,
     "transformFlags": 0,
     "tags": {
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag5.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag5.json
index 7d1ecb252a6..1322ca477f2 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag5.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag5.json
@@ -2,6 +2,7 @@
     "kind": "JSDocComment",
     "pos": 0,
     "end": 28,
+    "flags": "JSDoc",
     "modifierFlagsCache": 0,
     "transformFlags": 0,
     "tags": {
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag6.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag6.json
index af38432f2e0..c3e885082a6 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag6.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.templateTag6.json
@@ -2,6 +2,7 @@
     "kind": "JSDocComment",
     "pos": 0,
     "end": 60,
+    "flags": "JSDoc",
     "modifierFlagsCache": 0,
     "transformFlags": 0,
     "tags": {
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.threeAsterisks.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.threeAsterisks.json
index 6b26905e200..6e8ff913426 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.threeAsterisks.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.threeAsterisks.json
@@ -2,6 +2,7 @@
     "kind": "JSDocComment",
     "pos": 0,
     "end": 7,
+    "flags": "JSDoc",
     "modifierFlagsCache": 0,
     "transformFlags": 0,
     "comment": "*"
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.twoParamTag2.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.twoParamTag2.json
index a9c8c5b4d3e..5532f8fd2d1 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.twoParamTag2.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.twoParamTag2.json
@@ -2,6 +2,7 @@
     "kind": "JSDocComment",
     "pos": 0,
     "end": 60,
+    "flags": "JSDoc",
     "modifierFlagsCache": 0,
     "transformFlags": 0,
     "tags": {
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.twoParamTagOnSameLine.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.twoParamTagOnSameLine.json
index 7e420be3441..3d7c904d305 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.twoParamTagOnSameLine.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.twoParamTagOnSameLine.json
@@ -2,6 +2,7 @@
     "kind": "JSDocComment",
     "pos": 0,
     "end": 56,
+    "flags": "JSDoc",
     "modifierFlagsCache": 0,
     "transformFlags": 0,
     "tags": {
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.typeTag.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.typeTag.json
index ed9660cb05a..8f056c2da40 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.typeTag.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.typeTag.json
@@ -2,6 +2,7 @@
     "kind": "JSDocComment",
     "pos": 0,
     "end": 27,
+    "flags": "JSDoc",
     "modifierFlagsCache": 0,
     "transformFlags": 0,
     "tags": {
diff --git a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.typedefTagWithChildrenTags.json b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.typedefTagWithChildrenTags.json
index 85ab7e185c4..62307391798 100644
--- a/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.typedefTagWithChildrenTags.json
+++ b/tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.typedefTagWithChildrenTags.json
@@ -2,6 +2,7 @@
     "kind": "JSDocComment",
     "pos": 0,
     "end": 102,
+    "flags": "JSDoc",
     "modifierFlagsCache": 0,
     "transformFlags": 0,
     "tags": {
diff --git a/tests/baselines/reference/jsdocInvalidTokens.symbols b/tests/baselines/reference/jsdocInvalidTokens.symbols
new file mode 100644
index 00000000000..82b4cc36a68
--- /dev/null
+++ b/tests/baselines/reference/jsdocInvalidTokens.symbols
@@ -0,0 +1,12 @@
+=== tests/cases/conformance/scanner/jsdocInvalidTokens.js ===
+/**
+ *
+ * unicode-escape = "\u{abcdefghi}" -- should not have error for invalid unicode escape
+ * unicode-escape2 = "qq\u{abcdefghi}" -- no error here either
+ * quoted-pair = "\" -- should not have error for invalid quote sequence
+ * or for the tag below:
+ * @private
+ */
+var hi = 1
+>hi : Symbol(hi, Decl(jsdocInvalidTokens.js, 8, 3))
+
diff --git a/tests/baselines/reference/jsdocInvalidTokens.types b/tests/baselines/reference/jsdocInvalidTokens.types
new file mode 100644
index 00000000000..3e9638b7197
--- /dev/null
+++ b/tests/baselines/reference/jsdocInvalidTokens.types
@@ -0,0 +1,13 @@
+=== tests/cases/conformance/scanner/jsdocInvalidTokens.js ===
+/**
+ *
+ * unicode-escape = "\u{abcdefghi}" -- should not have error for invalid unicode escape
+ * unicode-escape2 = "qq\u{abcdefghi}" -- no error here either
+ * quoted-pair = "\" -- should not have error for invalid quote sequence
+ * or for the tag below:
+ * @private
+ */
+var hi = 1
+>hi : number
+>1 : 1
+
diff --git a/tests/cases/conformance/scanner/jsdocInvalidTokens.ts b/tests/cases/conformance/scanner/jsdocInvalidTokens.ts
new file mode 100644
index 00000000000..6962b976725
--- /dev/null
+++ b/tests/cases/conformance/scanner/jsdocInvalidTokens.ts
@@ -0,0 +1,15 @@
+// @Filename: jsdocInvalidTokens.js
+// @strict: true
+// @allowJs: true
+// @checkJs: true
+// @noEmit: true
+
+/**
+ *
+ * unicode-escape = "\u{abcdefghi}" -- should not have error for invalid unicode escape
+ * unicode-escape2 = "qq\u{abcdefghi}" -- no error here either
+ * quoted-pair = "\" -- should not have error for invalid quote sequence
+ * or for the tag below:
+ * @private
+ */
+var hi = 1

From 8d902ad75ff60df6792dddeea104d9e43d335f76 Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Fri, 9 Aug 2019 13:57:47 -0700
Subject: [PATCH 135/151] Update src/compiler/sys.ts

Co-Authored-By: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com>
---
 src/compiler/sys.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/compiler/sys.ts b/src/compiler/sys.ts
index 4418737ec96..45a67a8fee3 100644
--- a/src/compiler/sys.ts
+++ b/src/compiler/sys.ts
@@ -1033,7 +1033,12 @@ namespace ts {
 
             function fsWatch(fileOrDirectory: string, entryKind: FileSystemEntryKind.File | FileSystemEntryKind.Directory, callback: FsWatchCallback, recursive: boolean, fallbackPollingWatchFile: HostWatchFile, pollingInterval?: number): FileWatcher {
                 let options: any;
-                const lastDirectoryPartWithDirectorySeparator = isLinuxOrMacOs ?
+                let lastDirectoryPartWithDirectorySeparator: string | undefined;
+                let lastDirectoryPart: string | undefined;
+                if (isLinuxOrMacOs) {
+                    lastDirectoryPartWithDirectorySeparator = fileOrDirectory.substr(fileOrDirectory.lastIndexOf(directorySeparator));
+                    lastDirectoryPart = lastDirectoryPartWithDirectorySeparator.slice(directorySeparator.length);
+                }   
                     fileOrDirectory.substr(fileOrDirectory.lastIndexOf(directorySeparator)) :
                     undefined;
                 const lastDirectoryPart = isLinuxOrMacOs ?

From d6f768d3ee7b34f2c5f3520469a2a09a37dfbecc Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Fri, 9 Aug 2019 14:00:40 -0700
Subject: [PATCH 136/151] Update src/compiler/sys.ts

Co-Authored-By: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com>
---
 src/compiler/sys.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/compiler/sys.ts b/src/compiler/sys.ts
index 45a67a8fee3..96204e2a751 100644
--- a/src/compiler/sys.ts
+++ b/src/compiler/sys.ts
@@ -1109,7 +1109,7 @@ namespace ts {
 
                 function callbackChangingToMissingFileSystemEntry(event: "rename" | "change", relativeName: string | undefined) {
                     // because relativeName is not guaranteed to be correct we need to check on each rename with few combinations
-                    // Eg on ubuntoo while watchin app/node_modules the relativeName is "node_modules" which is neither relative nor full path
+                    // Eg on ubuntu while watching app/node_modules the relativeName is "node_modules" which is neither relative nor full path
                     return event === "rename" &&
                         (!relativeName ||
                             relativeName === lastDirectoryPart ||

From 05af8faac627017166752e14d9b0ad050cea4d53 Mon Sep 17 00:00:00 2001
From: Ron Buckton <ron.buckton@microsoft.com>
Date: Fri, 9 Aug 2019 14:02:18 -0700
Subject: [PATCH 137/151] Support tree-shakable imports for --target es2015
 (#32742)

* Support tree-shakable imports for --target es2015

* Alias external helper imports for --module es2015
---
 src/compiler/emitter.ts                       |  2 +-
 src/compiler/factory.ts                       | 76 +++++++++++++++++--
 src/compiler/transformers/destructuring.ts    |  3 +-
 src/compiler/transformers/es2015.ts           |  6 +-
 src/compiler/transformers/es2017.ts           |  3 +-
 src/compiler/transformers/es2018.ts           | 15 ++--
 src/compiler/transformers/generators.ts       |  3 +-
 src/compiler/transformers/module/es2015.ts    | 36 ++++-----
 src/compiler/transformers/module/module.ts    | 12 +--
 src/compiler/transformers/ts.ts               |  9 ++-
 src/compiler/transformers/utilities.ts        | 19 +++--
 src/compiler/types.ts                         |  9 ++-
 tests/baselines/reference/importHelpersES6.js |  4 +-
 ...tHelpersWithLocalCollisions(module=amd).js | 32 ++++++++
 ...ersWithLocalCollisions(module=commonjs).js | 31 ++++++++
 ...lpersWithLocalCollisions(module=es2015).js | 29 +++++++
 ...lpersWithLocalCollisions(module=system).js | 42 ++++++++++
 .../importHelpersWithLocalCollisions.ts       | 21 +++++
 18 files changed, 293 insertions(+), 59 deletions(-)
 create mode 100644 tests/baselines/reference/importHelpersWithLocalCollisions(module=amd).js
 create mode 100644 tests/baselines/reference/importHelpersWithLocalCollisions(module=commonjs).js
 create mode 100644 tests/baselines/reference/importHelpersWithLocalCollisions(module=es2015).js
 create mode 100644 tests/baselines/reference/importHelpersWithLocalCollisions(module=system).js
 create mode 100644 tests/cases/compiler/importHelpersWithLocalCollisions.ts

diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index 8681a452e2a..a70973825d1 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -1609,7 +1609,7 @@ namespace ts {
             for (let i = 0; i < numNodes; i++) {
                 const currentNode = bundle ? i < numPrepends ? bundle.prepends[i] : bundle.sourceFiles[i - numPrepends] : node;
                 const sourceFile = isSourceFile(currentNode) ? currentNode : isUnparsedSource(currentNode) ? undefined : currentSourceFile!;
-                const shouldSkip = printerOptions.noEmitHelpers || (!!sourceFile && getExternalHelpersModuleName(sourceFile) !== undefined);
+                const shouldSkip = printerOptions.noEmitHelpers || (!!sourceFile && hasRecordedExternalHelpers(sourceFile));
                 const shouldBundle = (isSourceFile(currentNode) || isUnparsedSource(currentNode)) && !isOwnFileEmit;
                 const helpers = isUnparsedSource(currentNode) ? currentNode.helpers : getSortedEmitHelpers(currentNode);
                 if (helpers) {
diff --git a/src/compiler/factory.ts b/src/compiler/factory.ts
index 3a8ecb20999..8678ba4c122 100644
--- a/src/compiler/factory.ts
+++ b/src/compiler/factory.ts
@@ -3628,12 +3628,16 @@ namespace ts {
 
     // Helpers
 
-    export function getHelperName(name: string) {
+    /**
+     * Gets an identifier for the name of an *unscoped* emit helper.
+     */
+    export function getUnscopedHelperName(name: string) {
         return setEmitFlags(createIdentifier(name), EmitFlags.HelperName | EmitFlags.AdviseOnEmitNode);
     }
 
     export const valuesHelper: UnscopedEmitHelper = {
         name: "typescript:values",
+        importName: "__values",
         scoped: false,
         text: `
             var __values = (this && this.__values) || function(o) {
@@ -3653,7 +3657,7 @@ namespace ts {
         context.requestEmitHelper(valuesHelper);
         return setTextRange(
             createCall(
-                getHelperName("__values"),
+                getUnscopedHelperName("__values"),
                 /*typeArguments*/ undefined,
                 [expression]
             ),
@@ -3663,6 +3667,7 @@ namespace ts {
 
     export const readHelper: UnscopedEmitHelper = {
         name: "typescript:read",
+        importName: "__read",
         scoped: false,
         text: `
             var __read = (this && this.__read) || function (o, n) {
@@ -3687,7 +3692,7 @@ namespace ts {
         context.requestEmitHelper(readHelper);
         return setTextRange(
             createCall(
-                getHelperName("__read"),
+                getUnscopedHelperName("__read"),
                 /*typeArguments*/ undefined,
                 count !== undefined
                     ? [iteratorRecord, createLiteral(count)]
@@ -3699,6 +3704,7 @@ namespace ts {
 
     export const spreadHelper: UnscopedEmitHelper = {
         name: "typescript:spread",
+        importName: "__spread",
         scoped: false,
         text: `
             var __spread = (this && this.__spread) || function () {
@@ -3712,7 +3718,7 @@ namespace ts {
         context.requestEmitHelper(spreadHelper);
         return setTextRange(
             createCall(
-                getHelperName("__spread"),
+                getUnscopedHelperName("__spread"),
                 /*typeArguments*/ undefined,
                 argumentList
             ),
@@ -3722,6 +3728,7 @@ namespace ts {
 
     export const spreadArraysHelper: UnscopedEmitHelper = {
         name: "typescript:spreadArrays",
+        importName: "__spreadArrays",
         scoped: false,
         text: `
             var __spreadArrays = (this && this.__spreadArrays) || function () {
@@ -3737,7 +3744,7 @@ namespace ts {
         context.requestEmitHelper(spreadArraysHelper);
         return setTextRange(
             createCall(
-                getHelperName("__spreadArrays"),
+                getUnscopedHelperName("__spreadArrays"),
                 /*typeArguments*/ undefined,
                 argumentList
             ),
@@ -4863,6 +4870,65 @@ namespace ts {
         return emitNode && emitNode.externalHelpersModuleName;
     }
 
+    export function hasRecordedExternalHelpers(sourceFile: SourceFile) {
+        const parseNode = getOriginalNode(sourceFile, isSourceFile);
+        const emitNode = parseNode && parseNode.emitNode;
+        return !!emitNode && (!!emitNode.externalHelpersModuleName || !!emitNode.externalHelpers);
+    }
+
+    export function createExternalHelpersImportDeclarationIfNeeded(sourceFile: SourceFile, compilerOptions: CompilerOptions, hasExportStarsToExportValues?: boolean, hasImportStar?: boolean, hasImportDefault?: boolean) {
+        if (compilerOptions.importHelpers && isEffectiveExternalModule(sourceFile, compilerOptions)) {
+            let namedBindings: NamedImportBindings | undefined;
+            const moduleKind = getEmitModuleKind(compilerOptions);
+            if (moduleKind >= ModuleKind.ES2015 && moduleKind <= ModuleKind.ESNext) {
+                // use named imports
+                const helpers = getEmitHelpers(sourceFile);
+                if (helpers) {
+                    const helperNames: string[] = [];
+                    for (const helper of helpers) {
+                        if (!helper.scoped) {
+                            const importName = (helper as UnscopedEmitHelper).importName;
+                            if (importName) {
+                                pushIfUnique(helperNames, importName);
+                            }
+                        }
+                    }
+                    if (some(helperNames)) {
+                        helperNames.sort(compareStringsCaseSensitive);
+                        // Alias the imports if the names are used somewhere in the file.
+                        // NOTE: We don't need to care about global import collisions as this is a module.
+                        namedBindings = createNamedImports(
+                            map(helperNames, name => isFileLevelUniqueName(sourceFile, name)
+                                ? createImportSpecifier(/*propertyName*/ undefined, createIdentifier(name))
+                                : createImportSpecifier(createIdentifier(name), getUnscopedHelperName(name))
+                            )
+                        );
+                        const parseNode = getOriginalNode(sourceFile, isSourceFile);
+                        const emitNode = getOrCreateEmitNode(parseNode);
+                        emitNode.externalHelpers = true;
+                    }
+                }
+            }
+            else {
+                // use a namespace import
+                const externalHelpersModuleName = getOrCreateExternalHelpersModuleNameIfNeeded(sourceFile, compilerOptions, hasExportStarsToExportValues, hasImportStar || hasImportDefault);
+                if (externalHelpersModuleName) {
+                    namedBindings = createNamespaceImport(externalHelpersModuleName);
+                }
+            }
+            if (namedBindings) {
+                const externalHelpersImportDeclaration = createImportDeclaration(
+                    /*decorators*/ undefined,
+                    /*modifiers*/ undefined,
+                    createImportClause(/*name*/ undefined, namedBindings),
+                    createLiteral(externalHelpersModuleNameText)
+                );
+                addEmitFlags(externalHelpersImportDeclaration, EmitFlags.NeverApplyImportHelper);
+                return externalHelpersImportDeclaration;
+            }
+        }
+    }
+
     export function getOrCreateExternalHelpersModuleNameIfNeeded(node: SourceFile, compilerOptions: CompilerOptions, hasExportStarsToExportValues?: boolean, hasImportStarOrImportDefault?: boolean) {
         if (compilerOptions.importHelpers && isEffectiveExternalModule(node, compilerOptions)) {
             const externalHelpersModuleName = getExternalHelpersModuleName(node);
diff --git a/src/compiler/transformers/destructuring.ts b/src/compiler/transformers/destructuring.ts
index 8946db3f60b..a12cbd42eb6 100644
--- a/src/compiler/transformers/destructuring.ts
+++ b/src/compiler/transformers/destructuring.ts
@@ -514,6 +514,7 @@ namespace ts {
 
     export const restHelper: UnscopedEmitHelper = {
         name: "typescript:rest",
+        importName: "__rest",
         scoped: false,
         text: `
             var __rest = (this && this.__rest) || function (s, e) {
@@ -557,7 +558,7 @@ namespace ts {
             }
         }
         return createCall(
-            getHelperName("__rest"),
+            getUnscopedHelperName("__rest"),
             /*typeArguments*/ undefined,
             [
                 value,
diff --git a/src/compiler/transformers/es2015.ts b/src/compiler/transformers/es2015.ts
index 7623d19dd25..793f6e1b1ef 100644
--- a/src/compiler/transformers/es2015.ts
+++ b/src/compiler/transformers/es2015.ts
@@ -4339,7 +4339,7 @@ namespace ts {
     function createExtendsHelper(context: TransformationContext, name: Identifier) {
         context.requestEmitHelper(extendsHelper);
         return createCall(
-            getHelperName("__extends"),
+            getUnscopedHelperName("__extends"),
             /*typeArguments*/ undefined,
             [
                 name,
@@ -4351,7 +4351,7 @@ namespace ts {
     function createTemplateObjectHelper(context: TransformationContext, cooked: ArrayLiteralExpression, raw: ArrayLiteralExpression) {
         context.requestEmitHelper(templateObjectHelper);
         return createCall(
-            getHelperName("__makeTemplateObject"),
+            getUnscopedHelperName("__makeTemplateObject"),
             /*typeArguments*/ undefined,
             [
                 cooked,
@@ -4362,6 +4362,7 @@ namespace ts {
 
     export const extendsHelper: UnscopedEmitHelper = {
         name: "typescript:extends",
+        importName: "__extends",
         scoped: false,
         priority: 0,
         text: `
@@ -4383,6 +4384,7 @@ namespace ts {
 
     export const templateObjectHelper: UnscopedEmitHelper = {
         name: "typescript:makeTemplateObject",
+        importName: "__makeTemplateObject",
         scoped: false,
         priority: 0,
         text: `
diff --git a/src/compiler/transformers/es2017.ts b/src/compiler/transformers/es2017.ts
index 9c2d5700d43..98f42b5a564 100644
--- a/src/compiler/transformers/es2017.ts
+++ b/src/compiler/transformers/es2017.ts
@@ -771,6 +771,7 @@ namespace ts {
 
     export const awaiterHelper: UnscopedEmitHelper = {
         name: "typescript:awaiter",
+        importName: "__awaiter",
         scoped: false,
         priority: 5,
         text: `
@@ -802,7 +803,7 @@ namespace ts {
         (generatorFunc.emitNode || (generatorFunc.emitNode = {} as EmitNode)).flags |= EmitFlags.AsyncFunctionBody | EmitFlags.ReuseTempVariableScope;
 
         return createCall(
-            getHelperName("__awaiter"),
+            getUnscopedHelperName("__awaiter"),
             /*typeArguments*/ undefined,
             [
                 createThis(),
diff --git a/src/compiler/transformers/es2018.ts b/src/compiler/transformers/es2018.ts
index 63b2ccdb731..c723da3d312 100644
--- a/src/compiler/transformers/es2018.ts
+++ b/src/compiler/transformers/es2018.ts
@@ -995,6 +995,7 @@ namespace ts {
 
     export const assignHelper: UnscopedEmitHelper = {
         name: "typescript:assign",
+        importName: "__assign",
         scoped: false,
         priority: 1,
         text: `
@@ -1019,7 +1020,7 @@ namespace ts {
         }
         context.requestEmitHelper(assignHelper);
         return createCall(
-            getHelperName("__assign"),
+            getUnscopedHelperName("__assign"),
             /*typeArguments*/ undefined,
             attributesSegments
         );
@@ -1027,6 +1028,7 @@ namespace ts {
 
     export const awaitHelper: UnscopedEmitHelper = {
         name: "typescript:await",
+        importName: "__await",
         scoped: false,
         text: `
             var __await = (this && this.__await) || function (v) { return this instanceof __await ? (this.v = v, this) : new __await(v); }`
@@ -1034,11 +1036,12 @@ namespace ts {
 
     function createAwaitHelper(context: TransformationContext, expression: Expression) {
         context.requestEmitHelper(awaitHelper);
-        return createCall(getHelperName("__await"), /*typeArguments*/ undefined, [expression]);
+        return createCall(getUnscopedHelperName("__await"), /*typeArguments*/ undefined, [expression]);
     }
 
     export const asyncGeneratorHelper: UnscopedEmitHelper = {
         name: "typescript:asyncGenerator",
+        importName: "__asyncGenerator",
         scoped: false,
         text: `
             var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _arguments, generator) {
@@ -1062,7 +1065,7 @@ namespace ts {
         (generatorFunc.emitNode || (generatorFunc.emitNode = {} as EmitNode)).flags |= EmitFlags.AsyncFunctionBody;
 
         return createCall(
-            getHelperName("__asyncGenerator"),
+            getUnscopedHelperName("__asyncGenerator"),
             /*typeArguments*/ undefined,
             [
                 createThis(),
@@ -1074,6 +1077,7 @@ namespace ts {
 
     export const asyncDelegator: UnscopedEmitHelper = {
         name: "typescript:asyncDelegator",
+        importName: "__asyncDelegator",
         scoped: false,
         text: `
             var __asyncDelegator = (this && this.__asyncDelegator) || function (o) {
@@ -1088,7 +1092,7 @@ namespace ts {
         context.requestEmitHelper(asyncDelegator);
         return setTextRange(
             createCall(
-                getHelperName("__asyncDelegator"),
+                getUnscopedHelperName("__asyncDelegator"),
                 /*typeArguments*/ undefined,
                 [expression]
             ),
@@ -1098,6 +1102,7 @@ namespace ts {
 
     export const asyncValues: UnscopedEmitHelper = {
         name: "typescript:asyncValues",
+        importName: "__asyncValues",
         scoped: false,
         text: `
             var __asyncValues = (this && this.__asyncValues) || function (o) {
@@ -1113,7 +1118,7 @@ namespace ts {
         context.requestEmitHelper(asyncValues);
         return setTextRange(
             createCall(
-                getHelperName("__asyncValues"),
+                getUnscopedHelperName("__asyncValues"),
                 /*typeArguments*/ undefined,
                 [expression]
             ),
diff --git a/src/compiler/transformers/generators.ts b/src/compiler/transformers/generators.ts
index 154b09dc93d..09b4d146dd6 100644
--- a/src/compiler/transformers/generators.ts
+++ b/src/compiler/transformers/generators.ts
@@ -3176,7 +3176,7 @@ namespace ts {
     function createGeneratorHelper(context: TransformationContext, body: FunctionExpression) {
         context.requestEmitHelper(generatorHelper);
         return createCall(
-            getHelperName("__generator"),
+            getUnscopedHelperName("__generator"),
             /*typeArguments*/ undefined,
             [createThis(), body]);
     }
@@ -3242,6 +3242,7 @@ namespace ts {
     // For examples of how these are used, see the comments in ./transformers/generators.ts
     export const generatorHelper: UnscopedEmitHelper = {
         name: "typescript:generator",
+        importName: "__generator",
         scoped: false,
         priority: 6,
         text: `
diff --git a/src/compiler/transformers/module/es2015.ts b/src/compiler/transformers/module/es2015.ts
index 792dd944596..e1123d1248d 100644
--- a/src/compiler/transformers/module/es2015.ts
+++ b/src/compiler/transformers/module/es2015.ts
@@ -9,7 +9,7 @@ namespace ts {
         context.enableEmitNotification(SyntaxKind.SourceFile);
         context.enableSubstitution(SyntaxKind.Identifier);
 
-        let currentSourceFile: SourceFile | undefined;
+        let helperNameSubstitutions: Map<Identifier> | undefined;
         return chainBundle(transformSourceFile);
 
         function transformSourceFile(node: SourceFile) {
@@ -18,18 +18,11 @@ namespace ts {
             }
 
             if (isExternalModule(node) || compilerOptions.isolatedModules) {
-                const externalHelpersModuleName = getOrCreateExternalHelpersModuleNameIfNeeded(node, compilerOptions);
-                if (externalHelpersModuleName) {
+                const externalHelpersImportDeclaration = createExternalHelpersImportDeclarationIfNeeded(node, compilerOptions);
+                if (externalHelpersImportDeclaration) {
                     const statements: Statement[] = [];
                     const statementOffset = addPrologue(statements, node.statements);
-                    const tslibImport = createImportDeclaration(
-                        /*decorators*/ undefined,
-                        /*modifiers*/ undefined,
-                        createImportClause(/*name*/ undefined, createNamespaceImport(externalHelpersModuleName)),
-                        createLiteral(externalHelpersModuleNameText)
-                    );
-                    addEmitFlags(tslibImport, EmitFlags.NeverApplyImportHelper);
-                    append(statements, tslibImport);
+                    append(statements, externalHelpersImportDeclaration);
 
                     addRange(statements, visitNodes(node.statements, visitor, isStatement, statementOffset));
                     return updateSourceFileNode(
@@ -74,9 +67,9 @@ namespace ts {
          */
         function onEmitNode(hint: EmitHint, node: Node, emitCallback: (hint: EmitHint, node: Node) => void): void {
             if (isSourceFile(node)) {
-                currentSourceFile = node;
+                helperNameSubstitutions = createMap<Identifier>();
                 previousOnEmitNode(hint, node, emitCallback);
-                currentSourceFile = undefined;
+                helperNameSubstitutions = undefined;
             }
             else {
                 previousOnEmitNode(hint, node, emitCallback);
@@ -95,21 +88,20 @@ namespace ts {
          */
         function onSubstituteNode(hint: EmitHint, node: Node) {
             node = previousOnSubstituteNode(hint, node);
-            if (isIdentifier(node) && hint === EmitHint.Expression) {
-                return substituteExpressionIdentifier(node);
+            if (helperNameSubstitutions && isIdentifier(node) && getEmitFlags(node) & EmitFlags.HelperName) {
+                return substituteHelperName(node);
             }
 
             return node;
         }
 
-        function substituteExpressionIdentifier(node: Identifier): Expression {
-            if (getEmitFlags(node) & EmitFlags.HelperName) {
-                const externalHelpersModuleName = getExternalHelpersModuleName(currentSourceFile!);
-                if (externalHelpersModuleName) {
-                    return createPropertyAccess(externalHelpersModuleName, node);
-                }
+        function substituteHelperName(node: Identifier): Expression {
+            const name = idText(node);
+            let substitution = helperNameSubstitutions!.get(name);
+            if (!substitution) {
+                helperNameSubstitutions!.set(name, substitution = createFileLevelUniqueName(name));
             }
-            return node;
+            return substitution;
         }
     }
 }
diff --git a/src/compiler/transformers/module/module.ts b/src/compiler/transformers/module/module.ts
index 2e02e15a2ed..53e4f824008 100644
--- a/src/compiler/transformers/module/module.ts
+++ b/src/compiler/transformers/module/module.ts
@@ -698,7 +698,7 @@ namespace ts {
             const promise = createNew(createIdentifier("Promise"), /*typeArguments*/ undefined, [func]);
             if (compilerOptions.esModuleInterop) {
                 context.requestEmitHelper(importStarHelper);
-                return createCall(createPropertyAccess(promise, createIdentifier("then")), /*typeArguments*/ undefined, [getHelperName("__importStar")]);
+                return createCall(createPropertyAccess(promise, createIdentifier("then")), /*typeArguments*/ undefined, [getUnscopedHelperName("__importStar")]);
             }
             return promise;
         }
@@ -713,7 +713,7 @@ namespace ts {
             let requireCall = createCall(createIdentifier("require"), /*typeArguments*/ undefined, arg ? [arg] : []);
             if (compilerOptions.esModuleInterop) {
                 context.requestEmitHelper(importStarHelper);
-                requireCall = createCall(getHelperName("__importStar"), /*typeArguments*/ undefined, [requireCall]);
+                requireCall = createCall(getUnscopedHelperName("__importStar"), /*typeArguments*/ undefined, [requireCall]);
             }
 
             let func: FunctionExpression | ArrowFunction;
@@ -753,11 +753,11 @@ namespace ts {
             }
             if (getImportNeedsImportStarHelper(node)) {
                 context.requestEmitHelper(importStarHelper);
-                return createCall(getHelperName("__importStar"), /*typeArguments*/ undefined, [innerExpr]);
+                return createCall(getUnscopedHelperName("__importStar"), /*typeArguments*/ undefined, [innerExpr]);
             }
             if (getImportNeedsImportDefaultHelper(node)) {
                 context.requestEmitHelper(importDefaultHelper);
-                return createCall(getHelperName("__importDefault"), /*typeArguments*/ undefined, [innerExpr]);
+                return createCall(getUnscopedHelperName("__importDefault"), /*typeArguments*/ undefined, [innerExpr]);
             }
             return innerExpr;
         }
@@ -1793,7 +1793,7 @@ namespace ts {
     function createExportStarHelper(context: TransformationContext, module: Expression) {
         const compilerOptions = context.getCompilerOptions();
         return compilerOptions.importHelpers
-            ? createCall(getHelperName("__exportStar"), /*typeArguments*/ undefined, [module, createIdentifier("exports")])
+            ? createCall(getUnscopedHelperName("__exportStar"), /*typeArguments*/ undefined, [module, createIdentifier("exports")])
             : createCall(createIdentifier("__export"), /*typeArguments*/ undefined, [module]);
     }
 
@@ -1808,6 +1808,7 @@ namespace ts {
     // emit helper for `import * as Name from "foo"`
     export const importStarHelper: UnscopedEmitHelper = {
         name: "typescript:commonjsimportstar",
+        importName: "__importStar",
         scoped: false,
         text: `
 var __importStar = (this && this.__importStar) || function (mod) {
@@ -1822,6 +1823,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     // emit helper for `import Name from "foo"`
     export const importDefaultHelper: UnscopedEmitHelper = {
         name: "typescript:commonjsimportdefault",
+        importName: "__importDefault",
         scoped: false,
         text: `
 var __importDefault = (this && this.__importDefault) || function (mod) {
diff --git a/src/compiler/transformers/ts.ts b/src/compiler/transformers/ts.ts
index db4c1459e5a..8d6c593bfe5 100644
--- a/src/compiler/transformers/ts.ts
+++ b/src/compiler/transformers/ts.ts
@@ -3282,7 +3282,7 @@ namespace ts {
         context.requestEmitHelper(decorateHelper);
         return setTextRange(
             createCall(
-                getHelperName("__decorate"),
+                getUnscopedHelperName("__decorate"),
                 /*typeArguments*/ undefined,
                 argumentsArray
             ),
@@ -3292,6 +3292,7 @@ namespace ts {
 
     export const decorateHelper: UnscopedEmitHelper = {
         name: "typescript:decorate",
+        importName: "__decorate",
         scoped: false,
         priority: 2,
         text: `
@@ -3306,7 +3307,7 @@ namespace ts {
     function createMetadataHelper(context: TransformationContext, metadataKey: string, metadataValue: Expression) {
         context.requestEmitHelper(metadataHelper);
         return createCall(
-            getHelperName("__metadata"),
+            getUnscopedHelperName("__metadata"),
             /*typeArguments*/ undefined,
             [
                 createLiteral(metadataKey),
@@ -3317,6 +3318,7 @@ namespace ts {
 
     export const metadataHelper: UnscopedEmitHelper = {
         name: "typescript:metadata",
+        importName: "__metadata",
         scoped: false,
         priority: 3,
         text: `
@@ -3329,7 +3331,7 @@ namespace ts {
         context.requestEmitHelper(paramHelper);
         return setTextRange(
             createCall(
-                getHelperName("__param"),
+                getUnscopedHelperName("__param"),
                 /*typeArguments*/ undefined,
                 [
                     createLiteral(parameterOffset),
@@ -3342,6 +3344,7 @@ namespace ts {
 
     export const paramHelper: UnscopedEmitHelper = {
         name: "typescript:param",
+        importName: "__param",
         scoped: false,
         priority: 4,
         text: `
diff --git a/src/compiler/transformers/utilities.ts b/src/compiler/transformers/utilities.ts
index f5f8a298a49..8a986215107 100644
--- a/src/compiler/transformers/utilities.ts
+++ b/src/compiler/transformers/utilities.ts
@@ -70,7 +70,8 @@ namespace ts {
         let hasExportDefault = false;
         let exportEquals: ExportAssignment | undefined;
         let hasExportStarsToExportValues = false;
-        let hasImportStarOrImportDefault = false;
+        let hasImportStar = false;
+        let hasImportDefault = false;
 
         for (const node of sourceFile.statements) {
             switch (node.kind) {
@@ -80,7 +81,12 @@ namespace ts {
                     // import * as x from "mod"
                     // import { x, y } from "mod"
                     externalImports.push(<ImportDeclaration>node);
-                    hasImportStarOrImportDefault = hasImportStarOrImportDefault || getImportNeedsImportStarHelper(<ImportDeclaration>node) || getImportNeedsImportDefaultHelper(<ImportDeclaration>node);
+                    if (!hasImportStar && getImportNeedsImportStarHelper(<ImportDeclaration>node)) {
+                        hasImportStar = true;
+                    }
+                    if (!hasImportDefault && getImportNeedsImportDefaultHelper(<ImportDeclaration>node)) {
+                        hasImportDefault = true;
+                    }
                     break;
 
                 case SyntaxKind.ImportEqualsDeclaration:
@@ -183,15 +189,8 @@ namespace ts {
             }
         }
 
-        const externalHelpersModuleName = getOrCreateExternalHelpersModuleNameIfNeeded(sourceFile, compilerOptions, hasExportStarsToExportValues, hasImportStarOrImportDefault);
-        const externalHelpersImportDeclaration = externalHelpersModuleName && createImportDeclaration(
-            /*decorators*/ undefined,
-            /*modifiers*/ undefined,
-            createImportClause(/*name*/ undefined, createNamespaceImport(externalHelpersModuleName)),
-            createLiteral(externalHelpersModuleNameText));
-
+        const externalHelpersImportDeclaration = createExternalHelpersImportDeclarationIfNeeded(sourceFile, compilerOptions, hasExportStarsToExportValues, hasImportStar, hasImportDefault);
         if (externalHelpersImportDeclaration) {
-            addEmitFlags(externalHelpersImportDeclaration, EmitFlags.NeverApplyImportHelper);
             externalImports.unshift(externalHelpersImportDeclaration);
         }
 
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 3f1b30feb45..ee7861a336b 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -4760,6 +4760,10 @@ namespace ts {
         AMD = 2,
         UMD = 3,
         System = 4,
+
+        // NOTE: ES module kinds should be contiguous to more easily check whether a module kind is *any* ES module kind.
+        //       Non-ES module kinds should not come between ES2015 (the earliest ES module kind) and ESNext (the last ES
+        //       module kind).
         ES2015 = 5,
         ESNext = 99
     }
@@ -5289,6 +5293,7 @@ namespace ts {
         tokenSourceMapRanges?: (SourceMapRange | undefined)[]; // The text range to use when emitting source mappings for tokens
         constantValue?: string | number;         // The constant value of an expression
         externalHelpersModuleName?: Identifier;  // The local name for an imported helpers module
+        externalHelpers?: boolean;
         helpers?: EmitHelper[];                  // Emit helpers for the node
         startsOnNewLine?: boolean;               // If the node should begin on a new line
     }
@@ -5310,7 +5315,7 @@ namespace ts {
         NoTrailingComments = 1 << 10,           // Do not emit trailing comments for this node.
         NoComments = NoLeadingComments | NoTrailingComments, // Do not emit comments for this node.
         NoNestedComments = 1 << 11,
-        HelperName = 1 << 12,
+        HelperName = 1 << 12,                   // The Identifier refers to an *unscoped* emit helper (one that is emitted at the top of the file)
         ExportName = 1 << 13,                   // Ensure an export prefix is added for an identifier that points to an exported declaration with a local name (see SymbolFlags.ExportHasLocal).
         LocalName = 1 << 14,                    // Ensure an export prefix is not added for an identifier that points to an exported declaration.
         InternalName = 1 << 15,                 // The name is internal to an ES5 class body function.
@@ -5336,6 +5341,8 @@ namespace ts {
 
     export interface UnscopedEmitHelper extends EmitHelper {
         readonly scoped: false;                                         // Indicates whether the helper MUST be emitted in the current scope.
+        /* @internal */
+        readonly importName?: string;                                   // The name of the helper to use when importing via `--importHelpers`.
         readonly text: string;                                          // ES3-compatible raw script text, or a function yielding such a string
     }
 
diff --git a/tests/baselines/reference/importHelpersES6.js b/tests/baselines/reference/importHelpersES6.js
index bc17939e2cc..9eb0e980c0f 100644
--- a/tests/baselines/reference/importHelpersES6.js
+++ b/tests/baselines/reference/importHelpersES6.js
@@ -18,10 +18,10 @@ export declare function __awaiter(thisArg: any, _arguments: any, P: Function, ge
 
 
 //// [a.js]
-import * as tslib_1 from "tslib";
+import { __decorate } from "tslib";
 let A = class A {
 };
-A = tslib_1.__decorate([
+A = __decorate([
     dec
 ], A);
 export { A };
diff --git a/tests/baselines/reference/importHelpersWithLocalCollisions(module=amd).js b/tests/baselines/reference/importHelpersWithLocalCollisions(module=amd).js
new file mode 100644
index 00000000000..d603b0ade17
--- /dev/null
+++ b/tests/baselines/reference/importHelpersWithLocalCollisions(module=amd).js
@@ -0,0 +1,32 @@
+//// [tests/cases/compiler/importHelpersWithLocalCollisions.ts] ////
+
+//// [a.ts]
+declare var dec: any, __decorate: any;
+@dec export class A {
+
+}
+
+const o = { a: 1 };
+const y = { ...o };
+
+//// [tslib.d.ts]
+export declare function __extends(d: Function, b: Function): void;
+export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
+export declare function __param(paramIndex: number, decorator: Function): Function;
+export declare function __metadata(metadataKey: any, metadataValue: any): Function;
+export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
+
+
+//// [a.js]
+define(["require", "exports", "tslib"], function (require, exports, tslib_1) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    let A = class A {
+    };
+    A = tslib_1.__decorate([
+        dec
+    ], A);
+    exports.A = A;
+    const o = { a: 1 };
+    const y = Object.assign({}, o);
+});
diff --git a/tests/baselines/reference/importHelpersWithLocalCollisions(module=commonjs).js b/tests/baselines/reference/importHelpersWithLocalCollisions(module=commonjs).js
new file mode 100644
index 00000000000..560bc114c3d
--- /dev/null
+++ b/tests/baselines/reference/importHelpersWithLocalCollisions(module=commonjs).js
@@ -0,0 +1,31 @@
+//// [tests/cases/compiler/importHelpersWithLocalCollisions.ts] ////
+
+//// [a.ts]
+declare var dec: any, __decorate: any;
+@dec export class A {
+
+}
+
+const o = { a: 1 };
+const y = { ...o };
+
+//// [tslib.d.ts]
+export declare function __extends(d: Function, b: Function): void;
+export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
+export declare function __param(paramIndex: number, decorator: Function): Function;
+export declare function __metadata(metadataKey: any, metadataValue: any): Function;
+export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
+
+
+//// [a.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+let A = class A {
+};
+A = tslib_1.__decorate([
+    dec
+], A);
+exports.A = A;
+const o = { a: 1 };
+const y = Object.assign({}, o);
diff --git a/tests/baselines/reference/importHelpersWithLocalCollisions(module=es2015).js b/tests/baselines/reference/importHelpersWithLocalCollisions(module=es2015).js
new file mode 100644
index 00000000000..ba22069c306
--- /dev/null
+++ b/tests/baselines/reference/importHelpersWithLocalCollisions(module=es2015).js
@@ -0,0 +1,29 @@
+//// [tests/cases/compiler/importHelpersWithLocalCollisions.ts] ////
+
+//// [a.ts]
+declare var dec: any, __decorate: any;
+@dec export class A {
+
+}
+
+const o = { a: 1 };
+const y = { ...o };
+
+//// [tslib.d.ts]
+export declare function __extends(d: Function, b: Function): void;
+export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
+export declare function __param(paramIndex: number, decorator: Function): Function;
+export declare function __metadata(metadataKey: any, metadataValue: any): Function;
+export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
+
+
+//// [a.js]
+import { __decorate as __decorate_1 } from "tslib";
+let A = class A {
+};
+A = __decorate_1([
+    dec
+], A);
+export { A };
+const o = { a: 1 };
+const y = Object.assign({}, o);
diff --git a/tests/baselines/reference/importHelpersWithLocalCollisions(module=system).js b/tests/baselines/reference/importHelpersWithLocalCollisions(module=system).js
new file mode 100644
index 00000000000..fb10d64b45a
--- /dev/null
+++ b/tests/baselines/reference/importHelpersWithLocalCollisions(module=system).js
@@ -0,0 +1,42 @@
+//// [tests/cases/compiler/importHelpersWithLocalCollisions.ts] ////
+
+//// [a.ts]
+declare var dec: any, __decorate: any;
+@dec export class A {
+
+}
+
+const o = { a: 1 };
+const y = { ...o };
+
+//// [tslib.d.ts]
+export declare function __extends(d: Function, b: Function): void;
+export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
+export declare function __param(paramIndex: number, decorator: Function): Function;
+export declare function __metadata(metadataKey: any, metadataValue: any): Function;
+export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
+
+
+//// [a.js]
+System.register(["tslib"], function (exports_1, context_1) {
+    "use strict";
+    var tslib_1, A, o, y;
+    var __moduleName = context_1 && context_1.id;
+    return {
+        setters: [
+            function (tslib_1_1) {
+                tslib_1 = tslib_1_1;
+            }
+        ],
+        execute: function () {
+            A = class A {
+            };
+            A = tslib_1.__decorate([
+                dec
+            ], A);
+            exports_1("A", A);
+            o = { a: 1 };
+            y = Object.assign({}, o);
+        }
+    };
+});
diff --git a/tests/cases/compiler/importHelpersWithLocalCollisions.ts b/tests/cases/compiler/importHelpersWithLocalCollisions.ts
new file mode 100644
index 00000000000..30e67ca069b
--- /dev/null
+++ b/tests/cases/compiler/importHelpersWithLocalCollisions.ts
@@ -0,0 +1,21 @@
+// @importHelpers: true
+// @target: es6
+// @module: commonjs, system, amd, es2015
+// @moduleResolution: classic
+// @experimentalDecorators: true
+// @filename: a.ts
+// @noTypesAndSymbols: true
+declare var dec: any, __decorate: any;
+@dec export class A {
+
+}
+
+const o = { a: 1 };
+const y = { ...o };
+
+// @filename: tslib.d.ts
+export declare function __extends(d: Function, b: Function): void;
+export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
+export declare function __param(paramIndex: number, decorator: Function): Function;
+export declare function __metadata(metadataKey: any, metadataValue: any): Function;
+export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;

From 9133e7ad0efbe362a77ae2db496189d0bb7496b0 Mon Sep 17 00:00:00 2001
From: Ron Buckton <ron.buckton@microsoft.com>
Date: Fri, 9 Aug 2019 14:04:01 -0700
Subject: [PATCH 138/151] Use defaults for transpileModule (#31563)

---
 src/services/transpile.ts                      | 10 +++++++++-
 src/testRunner/unittests/services/transpile.ts |  5 ++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/services/transpile.ts b/src/services/transpile.ts
index 030d2273b62..bdc27ac5e22 100644
--- a/src/services/transpile.ts
+++ b/src/services/transpile.ts
@@ -26,7 +26,15 @@ namespace ts {
     export function transpileModule(input: string, transpileOptions: TranspileOptions): TranspileOutput {
         const diagnostics: Diagnostic[] = [];
 
-        const options: CompilerOptions = transpileOptions.compilerOptions ? fixupCompilerOptions(transpileOptions.compilerOptions, diagnostics) : getDefaultCompilerOptions();
+        const options: CompilerOptions = transpileOptions.compilerOptions ? fixupCompilerOptions(transpileOptions.compilerOptions, diagnostics) : {};
+
+        // mix in default options
+        const defaultOptions = getDefaultCompilerOptions();
+        for (const key in defaultOptions) {
+            if (hasProperty(defaultOptions, key) && options[key] === undefined) {
+                options[key] = defaultOptions[key];
+            }
+        }
 
         options.isolatedModules = true;
 
diff --git a/src/testRunner/unittests/services/transpile.ts b/src/testRunner/unittests/services/transpile.ts
index 8429179ffa3..6e8f3bcac9c 100644
--- a/src/testRunner/unittests/services/transpile.ts
+++ b/src/testRunner/unittests/services/transpile.ts
@@ -17,7 +17,10 @@ namespace ts {
 
                 transpileOptions = testSettings.options || {};
                 if (!transpileOptions.compilerOptions) {
-                    transpileOptions.compilerOptions = {};
+                    transpileOptions.compilerOptions = { };
+                }
+                if (transpileOptions.compilerOptions.target === undefined) {
+                    transpileOptions.compilerOptions.target = ScriptTarget.ES3;
                 }
 
                 if (transpileOptions.compilerOptions.newLine === undefined) {

From 6c19c13094703fe00996e978dceb087e751c19f3 Mon Sep 17 00:00:00 2001
From: Andrew Casey <andrew.casey@microsoft.com>
Date: Fri, 9 Aug 2019 14:04:04 -0700
Subject: [PATCH 139/151] Use an explicit type

---
 src/server/session.ts                                      | 7 ++++---
 src/services/services.ts                                   | 7 ++++---
 src/services/utilities.ts                                  | 5 +++++
 .../unittests/tsserver/cachingFileSystemInformation.ts     | 2 +-
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/server/session.ts b/src/server/session.ts
index 52bf905dedc..12d3ba47476 100644
--- a/src/server/session.ts
+++ b/src/server/session.ts
@@ -689,7 +689,7 @@ namespace ts.server {
             this.logErrorWorker(err, cmd);
         }
 
-        private logErrorWorker(err: Error, cmd: string, fileRequest?: protocol.FileRequestArgs): void {
+        private logErrorWorker(err: Error & PossibleProgramFileInfo, cmd: string, fileRequest?: protocol.FileRequestArgs): void {
             let msg = "Exception on executing command " + cmd;
             if (err.message) {
                 msg += ":\n" + indent(err.message);
@@ -711,8 +711,9 @@ namespace ts.server {
                     catch { } // tslint:disable-line no-empty
                 }
 
-                if (err.hasOwnProperty("ProgramFiles")) {
-                    msg += `\n\nProgram files: {(err as any)["ProgramFiles"]}\n`;
+
+                if (err.ProgramFiles) {
+                    msg += `\n\nProgram files: {JSON.stringify(error.ProgramFiles}}\n`;
                     msg += `\n\nProjects::\n`;
                     let counter = 0;
                     const addProjectInfo = (project: Project) => {
diff --git a/src/services/services.ts b/src/services/services.ts
index 51987c26889..93145e01223 100644
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -1158,10 +1158,11 @@ namespace ts {
         function getValidSourceFile(fileName: string): SourceFile {
             const sourceFile = program.getSourceFile(fileName);
             if (!sourceFile) {
-                let error = new Error(`Could not find sourceFile: '${fileName}'.`);
+                const error: Error & PossibleProgramFileInfo = new Error(`Could not find sourceFile: '${fileName}'.`);
 
-                // Attach sidecar data for the server log
-                (error as any)["ProgramFiles"] = program && JSON.stringify(program.getSourceFiles().map(f => f.fileName));
+                // We've been having trouble debugging this, so attach sidecar data for the tsserver log.
+                // See https://github.com/microsoft/TypeScript/issues/30180.
+                error.ProgramFiles = program.getSourceFiles().map(f => f.fileName);
 
                 throw error;
             }
diff --git a/src/services/utilities.ts b/src/services/utilities.ts
index 852d22106a2..2e6e6875a81 100644
--- a/src/services/utilities.ts
+++ b/src/services/utilities.ts
@@ -967,6 +967,11 @@ namespace ts {
         readonly called: Identifier;
         readonly nTypeArguments: number;
     }
+
+    export interface PossibleProgramFileInfo {
+        ProgramFiles?: string[];
+    }
+
     // Get info for an expression like `f <` that may be the start of type arguments.
     export function getPossibleTypeArgumentsInfo(tokenIn: Node, sourceFile: SourceFile): PossibleTypeArgumentInfo | undefined {
         let token: Node | undefined = tokenIn;
diff --git a/src/testRunner/unittests/tsserver/cachingFileSystemInformation.ts b/src/testRunner/unittests/tsserver/cachingFileSystemInformation.ts
index 688c8c49ebe..468ad351552 100644
--- a/src/testRunner/unittests/tsserver/cachingFileSystemInformation.ts
+++ b/src/testRunner/unittests/tsserver/cachingFileSystemInformation.ts
@@ -139,7 +139,7 @@ namespace ts.projectSystem {
                 assert.isTrue(false, `should not find file '${imported.path}'`);
             }
             catch (e) {
-                assert.isTrue(e.message.indexOf(`Could not find sourceFile: '${imported.path}' in ["${root.path}"].`) === 0, `Actual: ${e.message}`);
+                assert.isTrue(e.message.indexOf(`Could not find sourceFile: '${imported.path}'.`) === 0, `Actual: ${e.message}`);
             }
             const f2Lookups = getLocationsForModuleLookup("f2");
             callsTrackingHost.verifyCalledOnEachEntryNTimes(CalledMapsWithSingleArg.fileExists, f2Lookups, 1);

From c1980c78578fbde7300dba073a1b9e024bb10419 Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Fri, 9 Aug 2019 14:14:30 -0700
Subject: [PATCH 140/151] Fix the incorrectly accepted suggestion

---
 src/compiler/sys.ts | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/compiler/sys.ts b/src/compiler/sys.ts
index 96204e2a751..1a0df8a91c1 100644
--- a/src/compiler/sys.ts
+++ b/src/compiler/sys.ts
@@ -1039,11 +1039,6 @@ namespace ts {
                     lastDirectoryPartWithDirectorySeparator = fileOrDirectory.substr(fileOrDirectory.lastIndexOf(directorySeparator));
                     lastDirectoryPart = lastDirectoryPartWithDirectorySeparator.slice(directorySeparator.length);
                 }   
-                    fileOrDirectory.substr(fileOrDirectory.lastIndexOf(directorySeparator)) :
-                    undefined;
-                const lastDirectoryPart = isLinuxOrMacOs ?
-                    lastDirectoryPartWithDirectorySeparator!.slice(directorySeparator.length) :
-                    undefined;
                 /** Watcher for the file system entry depending on whether it is missing or present */
                 let watcher = !fileSystemEntryExists(fileOrDirectory, entryKind) ?
                     watchMissingFileSystemEntry() :

From 6fe6cb3913a779a2091606a23af552f3800ebb67 Mon Sep 17 00:00:00 2001
From: Andrew Casey <andrew.casey@microsoft.com>
Date: Fri, 9 Aug 2019 14:32:34 -0700
Subject: [PATCH 141/151] Correct string template

---
 src/server/session.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/server/session.ts b/src/server/session.ts
index 12d3ba47476..f7d6e4a747a 100644
--- a/src/server/session.ts
+++ b/src/server/session.ts
@@ -713,7 +713,7 @@ namespace ts.server {
 
 
                 if (err.ProgramFiles) {
-                    msg += `\n\nProgram files: {JSON.stringify(error.ProgramFiles}}\n`;
+                    msg += `\n\nProgram files: ${JSON.stringify(err.ProgramFiles)}\n`;
                     msg += `\n\nProjects::\n`;
                     let counter = 0;
                     const addProjectInfo = (project: Project) => {

From 8c6612b31efde12b969a0dbc66496dab6b5d7c78 Mon Sep 17 00:00:00 2001
From: Andrew Casey <andrew.casey@microsoft.com>
Date: Fri, 9 Aug 2019 14:50:24 -0700
Subject: [PATCH 142/151] Tweak message text

---
 src/services/services.ts                                        | 2 +-
 .../unittests/tsserver/cachingFileSystemInformation.ts          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/services/services.ts b/src/services/services.ts
index 93145e01223..10d038d3975 100644
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -1158,7 +1158,7 @@ namespace ts {
         function getValidSourceFile(fileName: string): SourceFile {
             const sourceFile = program.getSourceFile(fileName);
             if (!sourceFile) {
-                const error: Error & PossibleProgramFileInfo = new Error(`Could not find sourceFile: '${fileName}'.`);
+                const error: Error & PossibleProgramFileInfo = new Error(`Could not find source file: '${fileName}'.`);
 
                 // We've been having trouble debugging this, so attach sidecar data for the tsserver log.
                 // See https://github.com/microsoft/TypeScript/issues/30180.
diff --git a/src/testRunner/unittests/tsserver/cachingFileSystemInformation.ts b/src/testRunner/unittests/tsserver/cachingFileSystemInformation.ts
index 468ad351552..b6df5183873 100644
--- a/src/testRunner/unittests/tsserver/cachingFileSystemInformation.ts
+++ b/src/testRunner/unittests/tsserver/cachingFileSystemInformation.ts
@@ -139,7 +139,7 @@ namespace ts.projectSystem {
                 assert.isTrue(false, `should not find file '${imported.path}'`);
             }
             catch (e) {
-                assert.isTrue(e.message.indexOf(`Could not find sourceFile: '${imported.path}'.`) === 0, `Actual: ${e.message}`);
+                assert.isTrue(e.message.indexOf(`Could not find source file: '${imported.path}'.`) === 0, `Actual: ${e.message}`);
             }
             const f2Lookups = getLocationsForModuleLookup("f2");
             callsTrackingHost.verifyCalledOnEachEntryNTimes(CalledMapsWithSingleArg.fileExists, f2Lookups, 1);

From b7e49d1d1ca2fea3777abefd2613a5dcfe03df19 Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Fri, 9 Aug 2019 15:06:51 -0700
Subject: [PATCH 143/151] Ignore unknown files to search from in document
 highlights

---
 src/services/services.ts                        |  2 +-
 ...moduleImport_filesToSearchWithInvalidFile.ts | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 tests/cases/fourslash/documentHighlights_moduleImport_filesToSearchWithInvalidFile.ts

diff --git a/src/services/services.ts b/src/services/services.ts
index 93145e01223..d2e9900d936 100644
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -1565,7 +1565,7 @@ namespace ts {
             const normalizedFileName = normalizePath(fileName);
             Debug.assert(filesToSearch.some(f => normalizePath(f) === normalizedFileName));
             synchronizeHostData();
-            const sourceFilesToSearch = filesToSearch.map(getValidSourceFile);
+            const sourceFilesToSearch = mapDefined(filesToSearch, fileName => program.getSourceFile(fileName));
             const sourceFile = getValidSourceFile(fileName);
             return DocumentHighlights.getDocumentHighlights(program, cancellationToken, sourceFile, position, sourceFilesToSearch);
         }
diff --git a/tests/cases/fourslash/documentHighlights_moduleImport_filesToSearchWithInvalidFile.ts b/tests/cases/fourslash/documentHighlights_moduleImport_filesToSearchWithInvalidFile.ts
new file mode 100644
index 00000000000..d72d6868b96
--- /dev/null
+++ b/tests/cases/fourslash/documentHighlights_moduleImport_filesToSearchWithInvalidFile.ts
@@ -0,0 +1,17 @@
+/// <reference path="fourslash.ts" />
+
+// @Filename: /node_modules/@types/foo/index.d.ts
+////export const x: number;
+
+// @Filename: /a.ts
+////import * as foo from "foo";
+////foo.[|x|];
+
+// @Filename: /b.ts
+////import { [|x|] } from "foo";
+
+// @Filename: /c.ts
+////import { x } from "foo";
+
+const [r0, r1] = test.ranges();
+verify.rangesAreDocumentHighlights(test.ranges(), { filesToSearch: ["/a.ts", "/b.ts", "/unknown.ts"] });

From 850ff783f4dad242119e362314df0882518cf4a6 Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Fri, 9 Aug 2019 15:13:07 -0700
Subject: [PATCH 144/151] Fix lint error

---
 src/compiler/sys.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/compiler/sys.ts b/src/compiler/sys.ts
index 1a0df8a91c1..b49446dd33e 100644
--- a/src/compiler/sys.ts
+++ b/src/compiler/sys.ts
@@ -1038,7 +1038,7 @@ namespace ts {
                 if (isLinuxOrMacOs) {
                     lastDirectoryPartWithDirectorySeparator = fileOrDirectory.substr(fileOrDirectory.lastIndexOf(directorySeparator));
                     lastDirectoryPart = lastDirectoryPartWithDirectorySeparator.slice(directorySeparator.length);
-                }   
+                }
                 /** Watcher for the file system entry depending on whether it is missing or present */
                 let watcher = !fileSystemEntryExists(fileOrDirectory, entryKind) ?
                     watchMissingFileSystemEntry() :

From f2719f95b490bc673dffe0250e1b2e2f491d7472 Mon Sep 17 00:00:00 2001
From: Wesley Wigham <wewigham@microsoft.com>
Date: Fri, 9 Aug 2019 16:10:10 -0700
Subject: [PATCH 145/151] Allow functions and ambient classes to merge (#32584)

---
 src/compiler/checker.ts                       | 19 ++++-
 src/compiler/types.ts                         |  4 +-
 ...ambientClassOverloadForFunction.errors.txt | 12 ---
 .../ambientClassOverloadForFunction.symbols   |  4 +-
 .../ambientClassOverloadForFunction.types     |  2 +-
 .../reference/api/tsserverlibrary.d.ts        |  4 +-
 tests/baselines/reference/api/typescript.d.ts |  4 +-
 .../augmentedTypesClass2a.errors.txt          | 10 ++-
 .../reference/augmentedTypesClass2a.symbols   |  4 +-
 .../reference/augmentedTypesClass2a.types     |  2 +-
 .../augmentedTypesFunction.errors.txt         |  4 +
 .../reference/augmentedTypesFunction.symbols  |  8 +-
 .../reference/augmentedTypesFunction.types    |  4 +-
 .../reference/callOnInstance.errors.txt       | 16 ++--
 .../reference/callOnInstance.symbols          |  8 +-
 .../baselines/reference/callOnInstance.types  | 10 +--
 .../reference/callOverloads1.errors.txt       |  7 +-
 .../reference/callOverloads1.symbols          | 10 ++-
 .../baselines/reference/callOverloads1.types  | 18 ++---
 .../reference/callOverloads2.errors.txt       |  7 +-
 .../reference/callOverloads2.symbols          | 10 ++-
 .../baselines/reference/callOverloads2.types  | 18 ++---
 .../reference/callOverloads3.errors.txt       | 17 ++--
 .../reference/callOverloads3.symbols          | 16 ++--
 .../baselines/reference/callOverloads3.types  | 26 +++---
 .../reference/callOverloads4.errors.txt       | 17 ++--
 .../reference/callOverloads4.symbols          | 16 ++--
 .../baselines/reference/callOverloads4.types  | 26 +++---
 .../reference/callOverloads5.errors.txt       | 17 ++--
 .../reference/callOverloads5.symbols          | 16 ++--
 .../baselines/reference/callOverloads5.types  | 24 +++---
 .../reference/classFunctionMerging.js         | 17 ++++
 .../reference/classFunctionMerging.symbols    | 30 +++++++
 .../reference/classFunctionMerging.types      | 31 +++++++
 .../classOverloadForFunction.errors.txt       |  2 +
 .../classOverloadForFunction.symbols          |  4 +-
 .../reference/classOverloadForFunction.types  |  2 +-
 .../classOverloadForFunction2.errors.txt      |  4 +-
 .../classOverloadForFunction2.symbols         |  4 +-
 .../reference/classOverloadForFunction2.types |  2 +-
 .../constructorOverloads4.errors.txt          | 19 ++---
 .../reference/constructorOverloads4.symbols   | 16 ++--
 .../reference/constructorOverloads4.types     | 18 ++---
 .../constructorOverloads5.errors.txt          | 30 -------
 .../reference/constructorOverloads5.symbols   | 10 +--
 .../reference/constructorOverloads5.types     |  6 +-
 .../constructorOverloads7.errors.txt          | 14 +---
 .../reference/constructorOverloads7.symbols   |  6 +-
 .../reference/constructorOverloads7.types     |  6 +-
 ...ifiersAcrossContainerBoundaries.errors.txt |  2 +
 ...entifiersAcrossContainerBoundaries.symbols |  4 +-
 ...IdentifiersAcrossContainerBoundaries.types |  2 +-
 ...ateIdentifiersAcrossFileBoundaries.symbols |  8 +-
 ...icateIdentifiersAcrossFileBoundaries.types |  4 +-
 .../reference/es6ClassTest9.errors.txt        |  8 +-
 .../baselines/reference/es6ClassTest9.symbols |  4 +-
 tests/baselines/reference/es6ClassTest9.types |  2 +-
 .../baselines/reference/funClodule.errors.txt | 25 ++----
 tests/baselines/reference/funClodule.symbols  | 18 ++---
 ...ReturnTypeAndFunctionClassMerge.errors.txt | 20 +----
 ...iedReturnTypeAndFunctionClassMerge.symbols | 12 +--
 .../multipleDefaultExports01.errors.txt       | 21 +++--
 .../multipleDefaultExports01.symbols          |  4 +-
 .../reference/multipleDefaultExports01.types  |  8 +-
 .../multipleExportDefault5.errors.txt         | 20 +++--
 .../reference/multipleExportDefault5.symbols  |  4 +-
 .../reference/multipleExportDefault5.types    |  4 +-
 .../reference/nameCollisions.errors.txt       |  4 +
 .../reference/nameCollisions.symbols          |  8 +-
 .../baselines/reference/nameCollisions.types  |  4 +-
 .../staticClassMemberError.errors.txt         |  2 +
 .../reference/staticClassMemberError.symbols  |  4 +-
 .../reference/staticClassMemberError.types    |  2 +-
 .../reference/targetTypeTest1.errors.txt      | 20 +----
 .../reference/targetTypeTest1.symbols         | 44 +++++-----
 .../baselines/reference/targetTypeTest1.types | 80 +++++++++----------
 tests/cases/compiler/classFunctionMerging.ts  | 12 +++
 ...nStatementInDuplicateIdentifierFunction.ts |  2 +-
 78 files changed, 488 insertions(+), 445 deletions(-)
 delete mode 100644 tests/baselines/reference/ambientClassOverloadForFunction.errors.txt
 create mode 100644 tests/baselines/reference/classFunctionMerging.js
 create mode 100644 tests/baselines/reference/classFunctionMerging.symbols
 create mode 100644 tests/baselines/reference/classFunctionMerging.types
 delete mode 100644 tests/baselines/reference/constructorOverloads5.errors.txt
 create mode 100644 tests/cases/compiler/classFunctionMerging.ts

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 96b02a2dcea..464c97d5519 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -26276,8 +26276,9 @@ namespace ts {
 
             let duplicateFunctionDeclaration = false;
             let multipleConstructorImplementation = false;
+            let hasNonAmbientClass = false;
             for (const current of declarations) {
-                const node = <SignatureDeclaration>current;
+                const node = <SignatureDeclaration | ClassDeclaration | ClassExpression>current;
                 const inAmbientContext = node.flags & NodeFlags.Ambient;
                 const inAmbientContextOrInterface = node.parent.kind === SyntaxKind.InterfaceDeclaration || node.parent.kind === SyntaxKind.TypeLiteral || inAmbientContext;
                 if (inAmbientContextOrInterface) {
@@ -26291,6 +26292,10 @@ namespace ts {
                     previousDeclaration = undefined;
                 }
 
+                if ((node.kind === SyntaxKind.ClassDeclaration || node.kind === SyntaxKind.ClassExpression) && !inAmbientContext) {
+                    hasNonAmbientClass = true;
+                }
+
                 if (node.kind === SyntaxKind.FunctionDeclaration || node.kind === SyntaxKind.MethodDeclaration || node.kind === SyntaxKind.MethodSignature || node.kind === SyntaxKind.Constructor) {
                     const currentNodeFlags = getEffectiveDeclarationFlags(node, flagsToCheck);
                     someNodeFlags |= currentNodeFlags;
@@ -26339,6 +26344,16 @@ namespace ts {
                 });
             }
 
+            if (hasNonAmbientClass && !isConstructor && symbol.flags & SymbolFlags.Function) {
+                // A non-ambient class cannot be an implementation for a non-constructor function/class merge
+                // TODO: The below just replicates our older error from when classes and functions were
+                // entirely unable to merge - a more helpful message like "Class declaration cannot implement overload list"
+                // might be warranted. :shrug:
+                forEach(declarations, declaration => {
+                    addDuplicateDeclarationError(getNameOfDeclaration(declaration) || declaration, Diagnostics.Duplicate_identifier_0, symbolName(symbol), filter(declarations, d => d !== declaration));
+                });
+            }
+
             // Abstract methods can't have an implementation -- in particular, they don't need one.
             if (lastSeenNonAmbientDeclaration && !lastSeenNonAmbientDeclaration.body &&
                 !hasModifier(lastSeenNonAmbientDeclaration, ModifierFlags.Abstract) && !lastSeenNonAmbientDeclaration.questionToken) {
@@ -31650,7 +31665,7 @@ namespace ts {
             if (!symbol || !(symbol.flags & SymbolFlags.Function)) {
                 return false;
             }
-            return !!forEachEntry(getExportsOfSymbol(symbol), p => p.flags & SymbolFlags.Value && isPropertyAccessExpression(p.valueDeclaration));
+            return !!forEachEntry(getExportsOfSymbol(symbol), p => p.flags & SymbolFlags.Value && p.valueDeclaration && isPropertyAccessExpression(p.valueDeclaration));
         }
 
         function getPropertiesOfContainerFunction(node: Declaration): Symbol[] {
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index ee7861a336b..92ebd8a6c3d 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -3678,8 +3678,8 @@ namespace ts {
         ParameterExcludes = Value,
         PropertyExcludes = None,
         EnumMemberExcludes = Value | Type,
-        FunctionExcludes = Value & ~(Function | ValueModule),
-        ClassExcludes = (Value | Type) & ~(ValueModule | Interface), // class-interface mergability done in checker.ts
+        FunctionExcludes = Value & ~(Function | ValueModule | Class),
+        ClassExcludes = (Value | Type) & ~(ValueModule | Interface | Function), // class-interface mergability done in checker.ts
         InterfaceExcludes = Type & ~(Interface | Class),
         RegularEnumExcludes = (Value | Type) & ~(RegularEnum | ValueModule), // regular enums merge only with regular enums and modules
         ConstEnumExcludes = (Value | Type) & ~ConstEnum, // const enums merge only with const enums
diff --git a/tests/baselines/reference/ambientClassOverloadForFunction.errors.txt b/tests/baselines/reference/ambientClassOverloadForFunction.errors.txt
deleted file mode 100644
index 16df32bb2c5..00000000000
--- a/tests/baselines/reference/ambientClassOverloadForFunction.errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-tests/cases/compiler/ambientClassOverloadForFunction.ts(1,15): error TS2300: Duplicate identifier 'foo'.
-tests/cases/compiler/ambientClassOverloadForFunction.ts(2,10): error TS2300: Duplicate identifier 'foo'.
-
-
-==== tests/cases/compiler/ambientClassOverloadForFunction.ts (2 errors) ====
-    declare class foo{};
-                  ~~~
-!!! error TS2300: Duplicate identifier 'foo'.
-    function foo() { return null; }
-             ~~~
-!!! error TS2300: Duplicate identifier 'foo'.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/ambientClassOverloadForFunction.symbols b/tests/baselines/reference/ambientClassOverloadForFunction.symbols
index 7ba3fa34593..db83743745b 100644
--- a/tests/baselines/reference/ambientClassOverloadForFunction.symbols
+++ b/tests/baselines/reference/ambientClassOverloadForFunction.symbols
@@ -1,7 +1,7 @@
 === tests/cases/compiler/ambientClassOverloadForFunction.ts ===
 declare class foo{};
->foo : Symbol(foo, Decl(ambientClassOverloadForFunction.ts, 0, 0))
+>foo : Symbol(foo, Decl(ambientClassOverloadForFunction.ts, 0, 20), Decl(ambientClassOverloadForFunction.ts, 0, 0))
 
 function foo() { return null; }
->foo : Symbol(foo, Decl(ambientClassOverloadForFunction.ts, 0, 20))
+>foo : Symbol(foo, Decl(ambientClassOverloadForFunction.ts, 0, 20), Decl(ambientClassOverloadForFunction.ts, 0, 0))
 
diff --git a/tests/baselines/reference/ambientClassOverloadForFunction.types b/tests/baselines/reference/ambientClassOverloadForFunction.types
index fef745bd971..1e798690820 100644
--- a/tests/baselines/reference/ambientClassOverloadForFunction.types
+++ b/tests/baselines/reference/ambientClassOverloadForFunction.types
@@ -3,6 +3,6 @@ declare class foo{};
 >foo : foo
 
 function foo() { return null; }
->foo : () => any
+>foo : typeof foo
 >null : null
 
diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts
index 2f5960f9c21..f963783e4c7 100644
--- a/tests/baselines/reference/api/tsserverlibrary.d.ts
+++ b/tests/baselines/reference/api/tsserverlibrary.d.ts
@@ -2137,8 +2137,8 @@ declare namespace ts {
         ParameterExcludes = 111551,
         PropertyExcludes = 0,
         EnumMemberExcludes = 900095,
-        FunctionExcludes = 111023,
-        ClassExcludes = 899519,
+        FunctionExcludes = 110991,
+        ClassExcludes = 899503,
         InterfaceExcludes = 788872,
         RegularEnumExcludes = 899327,
         ConstEnumExcludes = 899967,
diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts
index 0b7ee8d086d..a1fe4a874a6 100644
--- a/tests/baselines/reference/api/typescript.d.ts
+++ b/tests/baselines/reference/api/typescript.d.ts
@@ -2137,8 +2137,8 @@ declare namespace ts {
         ParameterExcludes = 111551,
         PropertyExcludes = 0,
         EnumMemberExcludes = 900095,
-        FunctionExcludes = 111023,
-        ClassExcludes = 899519,
+        FunctionExcludes = 110991,
+        ClassExcludes = 899503,
         InterfaceExcludes = 788872,
         RegularEnumExcludes = 899327,
         ConstEnumExcludes = 899967,
diff --git a/tests/baselines/reference/augmentedTypesClass2a.errors.txt b/tests/baselines/reference/augmentedTypesClass2a.errors.txt
index b17ab32d408..6031558ac0a 100644
--- a/tests/baselines/reference/augmentedTypesClass2a.errors.txt
+++ b/tests/baselines/reference/augmentedTypesClass2a.errors.txt
@@ -1,15 +1,23 @@
 tests/cases/compiler/augmentedTypesClass2a.ts(2,7): error TS2300: Duplicate identifier 'c2'.
+tests/cases/compiler/augmentedTypesClass2a.ts(2,7): error TS2300: Duplicate identifier 'c2'.
+tests/cases/compiler/augmentedTypesClass2a.ts(3,10): error TS2300: Duplicate identifier 'c2'.
 tests/cases/compiler/augmentedTypesClass2a.ts(3,10): error TS2300: Duplicate identifier 'c2'.
 tests/cases/compiler/augmentedTypesClass2a.ts(4,5): error TS2300: Duplicate identifier 'c2'.
 
 
-==== tests/cases/compiler/augmentedTypesClass2a.ts (3 errors) ====
+==== tests/cases/compiler/augmentedTypesClass2a.ts (5 errors) ====
     //// class then function
     class c2 { public foo() { } } // error
           ~~
+!!! error TS2300: Duplicate identifier 'c2'.
+!!! related TS6203 tests/cases/compiler/augmentedTypesClass2a.ts:3:10: 'c2' was also declared here.
+          ~~
 !!! error TS2300: Duplicate identifier 'c2'.
     function c2() { } // error
              ~~
+!!! error TS2300: Duplicate identifier 'c2'.
+!!! related TS6203 tests/cases/compiler/augmentedTypesClass2a.ts:2:7: 'c2' was also declared here.
+             ~~
 !!! error TS2300: Duplicate identifier 'c2'.
     var c2 = () => { }
         ~~
diff --git a/tests/baselines/reference/augmentedTypesClass2a.symbols b/tests/baselines/reference/augmentedTypesClass2a.symbols
index 78acabbbb4f..ca5558cfbc5 100644
--- a/tests/baselines/reference/augmentedTypesClass2a.symbols
+++ b/tests/baselines/reference/augmentedTypesClass2a.symbols
@@ -1,11 +1,11 @@
 === tests/cases/compiler/augmentedTypesClass2a.ts ===
 //// class then function
 class c2 { public foo() { } } // error
->c2 : Symbol(c2, Decl(augmentedTypesClass2a.ts, 0, 0))
+>c2 : Symbol(c2, Decl(augmentedTypesClass2a.ts, 1, 29), Decl(augmentedTypesClass2a.ts, 0, 0))
 >foo : Symbol(c2.foo, Decl(augmentedTypesClass2a.ts, 1, 10))
 
 function c2() { } // error
->c2 : Symbol(c2, Decl(augmentedTypesClass2a.ts, 1, 29))
+>c2 : Symbol(c2, Decl(augmentedTypesClass2a.ts, 1, 29), Decl(augmentedTypesClass2a.ts, 0, 0))
 
 var c2 = () => { }
 >c2 : Symbol(c2, Decl(augmentedTypesClass2a.ts, 3, 3))
diff --git a/tests/baselines/reference/augmentedTypesClass2a.types b/tests/baselines/reference/augmentedTypesClass2a.types
index 156d4975d04..81cde2c99e4 100644
--- a/tests/baselines/reference/augmentedTypesClass2a.types
+++ b/tests/baselines/reference/augmentedTypesClass2a.types
@@ -5,7 +5,7 @@ class c2 { public foo() { } } // error
 >foo : () => void
 
 function c2() { } // error
->c2 : () => void
+>c2 : typeof c2
 
 var c2 = () => { }
 >c2 : () => void
diff --git a/tests/baselines/reference/augmentedTypesFunction.errors.txt b/tests/baselines/reference/augmentedTypesFunction.errors.txt
index 2b17ee912fb..ff2ea23036a 100644
--- a/tests/baselines/reference/augmentedTypesFunction.errors.txt
+++ b/tests/baselines/reference/augmentedTypesFunction.errors.txt
@@ -40,16 +40,20 @@ tests/cases/compiler/augmentedTypesFunction.ts(21,6): error TS2567: Enum declara
     function y3() { } // error
              ~~
 !!! error TS2300: Duplicate identifier 'y3'.
+!!! related TS6203 tests/cases/compiler/augmentedTypesFunction.ts:14:7: 'y3' was also declared here.
     class y3 { } // error
           ~~
 !!! error TS2300: Duplicate identifier 'y3'.
+!!! related TS6203 tests/cases/compiler/augmentedTypesFunction.ts:13:10: 'y3' was also declared here.
     
     function y3a() { } // error
              ~~~
 !!! error TS2300: Duplicate identifier 'y3a'.
+!!! related TS6203 tests/cases/compiler/augmentedTypesFunction.ts:17:7: 'y3a' was also declared here.
     class y3a { public foo() { } } // error
           ~~~
 !!! error TS2300: Duplicate identifier 'y3a'.
+!!! related TS6203 tests/cases/compiler/augmentedTypesFunction.ts:16:10: 'y3a' was also declared here.
     
     // function then enum
     function y4() { } // error
diff --git a/tests/baselines/reference/augmentedTypesFunction.symbols b/tests/baselines/reference/augmentedTypesFunction.symbols
index 8f202847cd3..007600e1f5b 100644
--- a/tests/baselines/reference/augmentedTypesFunction.symbols
+++ b/tests/baselines/reference/augmentedTypesFunction.symbols
@@ -21,16 +21,16 @@ var y2a = () => { } // error
 
 // function then class
 function y3() { } // error
->y3 : Symbol(y3, Decl(augmentedTypesFunction.ts, 9, 19))
+>y3 : Symbol(y3, Decl(augmentedTypesFunction.ts, 9, 19), Decl(augmentedTypesFunction.ts, 12, 17))
 
 class y3 { } // error
->y3 : Symbol(y3, Decl(augmentedTypesFunction.ts, 12, 17))
+>y3 : Symbol(y3, Decl(augmentedTypesFunction.ts, 9, 19), Decl(augmentedTypesFunction.ts, 12, 17))
 
 function y3a() { } // error
->y3a : Symbol(y3a, Decl(augmentedTypesFunction.ts, 13, 12))
+>y3a : Symbol(y3a, Decl(augmentedTypesFunction.ts, 13, 12), Decl(augmentedTypesFunction.ts, 15, 18))
 
 class y3a { public foo() { } } // error
->y3a : Symbol(y3a, Decl(augmentedTypesFunction.ts, 15, 18))
+>y3a : Symbol(y3a, Decl(augmentedTypesFunction.ts, 13, 12), Decl(augmentedTypesFunction.ts, 15, 18))
 >foo : Symbol(y3a.foo, Decl(augmentedTypesFunction.ts, 16, 11))
 
 // function then enum
diff --git a/tests/baselines/reference/augmentedTypesFunction.types b/tests/baselines/reference/augmentedTypesFunction.types
index e30d38179c6..91d6f4f11b1 100644
--- a/tests/baselines/reference/augmentedTypesFunction.types
+++ b/tests/baselines/reference/augmentedTypesFunction.types
@@ -23,13 +23,13 @@ var y2a = () => { } // error
 
 // function then class
 function y3() { } // error
->y3 : () => void
+>y3 : typeof y3
 
 class y3 { } // error
 >y3 : y3
 
 function y3a() { } // error
->y3a : () => void
+>y3a : typeof y3a
 
 class y3a { public foo() { } } // error
 >y3a : y3a
diff --git a/tests/baselines/reference/callOnInstance.errors.txt b/tests/baselines/reference/callOnInstance.errors.txt
index 62abe6fd1e0..15a03546e21 100644
--- a/tests/baselines/reference/callOnInstance.errors.txt
+++ b/tests/baselines/reference/callOnInstance.errors.txt
@@ -1,24 +1,20 @@
-tests/cases/compiler/callOnInstance.ts(1,18): error TS2300: Duplicate identifier 'D'.
-tests/cases/compiler/callOnInstance.ts(3,15): error TS2300: Duplicate identifier 'D'.
-tests/cases/compiler/callOnInstance.ts(7,25): error TS2554: Expected 0 arguments, but got 1.
+tests/cases/compiler/callOnInstance.ts(7,18): error TS2349: This expression is not callable.
+  Type 'D' has no call signatures.
 tests/cases/compiler/callOnInstance.ts(10,1): error TS2349: This expression is not callable.
   Type 'C' has no call signatures.
 
 
-==== tests/cases/compiler/callOnInstance.ts (4 errors) ====
+==== tests/cases/compiler/callOnInstance.ts (2 errors) ====
     declare function D(): string; // error
-                     ~
-!!! error TS2300: Duplicate identifier 'D'.
     
     declare class D { constructor (value: number); } // error
-                  ~
-!!! error TS2300: Duplicate identifier 'D'.
     
     var s1: string = D(); // OK
     
     var s2: string = (new D(1))();
-                            ~
-!!! error TS2554: Expected 0 arguments, but got 1.
+                     ~~~~~~~~~~
+!!! error TS2349: This expression is not callable.
+!!! error TS2349:   Type 'D' has no call signatures.
     
     declare class C { constructor(value: number); }
     (new C(1))(); // Error for calling an instance
diff --git a/tests/baselines/reference/callOnInstance.symbols b/tests/baselines/reference/callOnInstance.symbols
index 1bf147805fd..060436d81b5 100644
--- a/tests/baselines/reference/callOnInstance.symbols
+++ b/tests/baselines/reference/callOnInstance.symbols
@@ -1,18 +1,18 @@
 === tests/cases/compiler/callOnInstance.ts ===
 declare function D(): string; // error
->D : Symbol(D, Decl(callOnInstance.ts, 0, 0))
+>D : Symbol(D, Decl(callOnInstance.ts, 0, 0), Decl(callOnInstance.ts, 0, 29))
 
 declare class D { constructor (value: number); } // error
->D : Symbol(D, Decl(callOnInstance.ts, 0, 29))
+>D : Symbol(D, Decl(callOnInstance.ts, 0, 0), Decl(callOnInstance.ts, 0, 29))
 >value : Symbol(value, Decl(callOnInstance.ts, 2, 31))
 
 var s1: string = D(); // OK
 >s1 : Symbol(s1, Decl(callOnInstance.ts, 4, 3))
->D : Symbol(D, Decl(callOnInstance.ts, 0, 0))
+>D : Symbol(D, Decl(callOnInstance.ts, 0, 0), Decl(callOnInstance.ts, 0, 29))
 
 var s2: string = (new D(1))();
 >s2 : Symbol(s2, Decl(callOnInstance.ts, 6, 3))
->D : Symbol(D, Decl(callOnInstance.ts, 0, 0))
+>D : Symbol(D, Decl(callOnInstance.ts, 0, 0), Decl(callOnInstance.ts, 0, 29))
 
 declare class C { constructor(value: number); }
 >C : Symbol(C, Decl(callOnInstance.ts, 6, 30))
diff --git a/tests/baselines/reference/callOnInstance.types b/tests/baselines/reference/callOnInstance.types
index c90954ded07..5e49fe970c0 100644
--- a/tests/baselines/reference/callOnInstance.types
+++ b/tests/baselines/reference/callOnInstance.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/callOnInstance.ts ===
 declare function D(): string; // error
->D : () => string
+>D : typeof D
 
 declare class D { constructor (value: number); } // error
 >D : D
@@ -9,14 +9,14 @@ declare class D { constructor (value: number); } // error
 var s1: string = D(); // OK
 >s1 : string
 >D() : string
->D : () => string
+>D : typeof D
 
 var s2: string = (new D(1))();
 >s2 : string
 >(new D(1))() : any
->(new D(1)) : any
->new D(1) : any
->D : () => string
+>(new D(1)) : D
+>new D(1) : D
+>D : typeof D
 >1 : 1
 
 declare class C { constructor(value: number); }
diff --git a/tests/baselines/reference/callOverloads1.errors.txt b/tests/baselines/reference/callOverloads1.errors.txt
index 3e260cc4a95..95b96aa7ec1 100644
--- a/tests/baselines/reference/callOverloads1.errors.txt
+++ b/tests/baselines/reference/callOverloads1.errors.txt
@@ -1,13 +1,13 @@
 tests/cases/compiler/callOverloads1.ts(1,7): error TS2300: Duplicate identifier 'Foo'.
 tests/cases/compiler/callOverloads1.ts(9,10): error TS2300: Duplicate identifier 'Foo'.
 tests/cases/compiler/callOverloads1.ts(9,10): error TS2391: Function implementation is missing or not immediately following the declaration.
-tests/cases/compiler/callOverloads1.ts(13,18): error TS2554: Expected 0 arguments, but got 1.
 
 
-==== tests/cases/compiler/callOverloads1.ts (4 errors) ====
+==== tests/cases/compiler/callOverloads1.ts (3 errors) ====
     class Foo { // error
           ~~~
 !!! error TS2300: Duplicate identifier 'Foo'.
+!!! related TS6203 tests/cases/compiler/callOverloads1.ts:9:10: 'Foo' was also declared here.
         bar1() { /*WScript.Echo("bar1");*/ }
     
         constructor(x: any) {
@@ -18,14 +18,13 @@ tests/cases/compiler/callOverloads1.ts(13,18): error TS2554: Expected 0 argument
     function Foo(); // error
              ~~~
 !!! error TS2300: Duplicate identifier 'Foo'.
+!!! related TS6203 tests/cases/compiler/callOverloads1.ts:1:7: 'Foo' was also declared here.
              ~~~
 !!! error TS2391: Function implementation is missing or not immediately following the declaration.
     function F1(s:string);
     function F1(a:any) { return a;}
     
     var f1 = new Foo("hey");
-                     ~~~~~
-!!! error TS2554: Expected 0 arguments, but got 1.
     
     
     f1.bar1();
diff --git a/tests/baselines/reference/callOverloads1.symbols b/tests/baselines/reference/callOverloads1.symbols
index aadfcd4c06e..d5f6149dac1 100644
--- a/tests/baselines/reference/callOverloads1.symbols
+++ b/tests/baselines/reference/callOverloads1.symbols
@@ -1,6 +1,6 @@
 === tests/cases/compiler/callOverloads1.ts ===
 class Foo { // error
->Foo : Symbol(Foo, Decl(callOverloads1.ts, 0, 0))
+>Foo : Symbol(Foo, Decl(callOverloads1.ts, 6, 1), Decl(callOverloads1.ts, 0, 0))
 
     bar1() { /*WScript.Echo("bar1");*/ }
 >bar1 : Symbol(Foo.bar1, Decl(callOverloads1.ts, 0, 11))
@@ -13,7 +13,7 @@ class Foo { // error
 }
 
 function Foo(); // error
->Foo : Symbol(Foo, Decl(callOverloads1.ts, 6, 1))
+>Foo : Symbol(Foo, Decl(callOverloads1.ts, 6, 1), Decl(callOverloads1.ts, 0, 0))
 
 function F1(s:string);
 >F1 : Symbol(F1, Decl(callOverloads1.ts, 8, 15), Decl(callOverloads1.ts, 9, 22))
@@ -26,12 +26,14 @@ function F1(a:any) { return a;}
 
 var f1 = new Foo("hey");
 >f1 : Symbol(f1, Decl(callOverloads1.ts, 12, 3))
->Foo : Symbol(Foo, Decl(callOverloads1.ts, 6, 1))
+>Foo : Symbol(Foo, Decl(callOverloads1.ts, 6, 1), Decl(callOverloads1.ts, 0, 0))
 
 
 f1.bar1();
+>f1.bar1 : Symbol(Foo.bar1, Decl(callOverloads1.ts, 0, 11))
 >f1 : Symbol(f1, Decl(callOverloads1.ts, 12, 3))
+>bar1 : Symbol(Foo.bar1, Decl(callOverloads1.ts, 0, 11))
 
 Foo();
->Foo : Symbol(Foo, Decl(callOverloads1.ts, 6, 1))
+>Foo : Symbol(Foo, Decl(callOverloads1.ts, 6, 1), Decl(callOverloads1.ts, 0, 0))
 
diff --git a/tests/baselines/reference/callOverloads1.types b/tests/baselines/reference/callOverloads1.types
index 0eb8284d257..34fc1ca20d4 100644
--- a/tests/baselines/reference/callOverloads1.types
+++ b/tests/baselines/reference/callOverloads1.types
@@ -13,7 +13,7 @@ class Foo { // error
 }
 
 function Foo(); // error
->Foo : () => any
+>Foo : typeof Foo
 
 function F1(s:string);
 >F1 : (s: string) => any
@@ -25,19 +25,19 @@ function F1(a:any) { return a;}
 >a : any
 
 var f1 = new Foo("hey");
->f1 : any
->new Foo("hey") : any
->Foo : () => any
+>f1 : Foo
+>new Foo("hey") : Foo
+>Foo : typeof Foo
 >"hey" : "hey"
 
 
 f1.bar1();
->f1.bar1() : any
->f1.bar1 : any
->f1 : any
->bar1 : any
+>f1.bar1() : void
+>f1.bar1 : () => void
+>f1 : Foo
+>bar1 : () => void
 
 Foo();
 >Foo() : any
->Foo : () => any
+>Foo : typeof Foo
 
diff --git a/tests/baselines/reference/callOverloads2.errors.txt b/tests/baselines/reference/callOverloads2.errors.txt
index 360f3510479..8377e5fa4da 100644
--- a/tests/baselines/reference/callOverloads2.errors.txt
+++ b/tests/baselines/reference/callOverloads2.errors.txt
@@ -4,13 +4,13 @@ tests/cases/compiler/callOverloads2.ts(11,10): error TS2389: Function implementa
 tests/cases/compiler/callOverloads2.ts(11,10): error TS2393: Duplicate function implementation.
 tests/cases/compiler/callOverloads2.ts(12,10): error TS2393: Duplicate function implementation.
 tests/cases/compiler/callOverloads2.ts(14,10): error TS2391: Function implementation is missing or not immediately following the declaration.
-tests/cases/compiler/callOverloads2.ts(18,18): error TS2554: Expected 0 arguments, but got 1.
 
 
-==== tests/cases/compiler/callOverloads2.ts (7 errors) ====
+==== tests/cases/compiler/callOverloads2.ts (6 errors) ====
     class Foo { // error
           ~~~
 !!! error TS2300: Duplicate identifier 'Foo'.
+!!! related TS6203 tests/cases/compiler/callOverloads2.ts:9:10: 'Foo' was also declared here.
         bar1() { /*WScript.Echo("bar1");*/ }
     
         constructor(x: any) {
@@ -21,6 +21,7 @@ tests/cases/compiler/callOverloads2.ts(18,18): error TS2554: Expected 0 argument
     function Foo(); // error
              ~~~
 !!! error TS2300: Duplicate identifier 'Foo'.
+!!! related TS6203 tests/cases/compiler/callOverloads2.ts:1:7: 'Foo' was also declared here.
     
     function F1(s:string) {return s;} // error
              ~~
@@ -38,8 +39,6 @@ tests/cases/compiler/callOverloads2.ts(18,18): error TS2554: Expected 0 argument
     declare function Gar(s:String); // expect no error
     
     var f1 = new Foo("hey");
-                     ~~~~~
-!!! error TS2554: Expected 0 arguments, but got 1.
     
     
     f1.bar1();
diff --git a/tests/baselines/reference/callOverloads2.symbols b/tests/baselines/reference/callOverloads2.symbols
index 7c3fe03398d..96b5533f7c3 100644
--- a/tests/baselines/reference/callOverloads2.symbols
+++ b/tests/baselines/reference/callOverloads2.symbols
@@ -1,6 +1,6 @@
 === tests/cases/compiler/callOverloads2.ts ===
 class Foo { // error
->Foo : Symbol(Foo, Decl(callOverloads2.ts, 0, 0))
+>Foo : Symbol(Foo, Decl(callOverloads2.ts, 6, 1), Decl(callOverloads2.ts, 0, 0))
 
     bar1() { /*WScript.Echo("bar1");*/ }
 >bar1 : Symbol(Foo.bar1, Decl(callOverloads2.ts, 0, 11))
@@ -13,7 +13,7 @@ class Foo { // error
 }
 
 function Foo(); // error
->Foo : Symbol(Foo, Decl(callOverloads2.ts, 6, 1))
+>Foo : Symbol(Foo, Decl(callOverloads2.ts, 6, 1), Decl(callOverloads2.ts, 0, 0))
 
 function F1(s:string) {return s;} // error
 >F1 : Symbol(F1, Decl(callOverloads2.ts, 8, 15), Decl(callOverloads2.ts, 10, 33))
@@ -36,12 +36,14 @@ declare function Gar(s:String); // expect no error
 
 var f1 = new Foo("hey");
 >f1 : Symbol(f1, Decl(callOverloads2.ts, 17, 3))
->Foo : Symbol(Foo, Decl(callOverloads2.ts, 6, 1))
+>Foo : Symbol(Foo, Decl(callOverloads2.ts, 6, 1), Decl(callOverloads2.ts, 0, 0))
 
 
 f1.bar1();
+>f1.bar1 : Symbol(Foo.bar1, Decl(callOverloads2.ts, 0, 11))
 >f1 : Symbol(f1, Decl(callOverloads2.ts, 17, 3))
+>bar1 : Symbol(Foo.bar1, Decl(callOverloads2.ts, 0, 11))
 
 Foo();
->Foo : Symbol(Foo, Decl(callOverloads2.ts, 6, 1))
+>Foo : Symbol(Foo, Decl(callOverloads2.ts, 6, 1), Decl(callOverloads2.ts, 0, 0))
 
diff --git a/tests/baselines/reference/callOverloads2.types b/tests/baselines/reference/callOverloads2.types
index 6718d22a191..f473ce23358 100644
--- a/tests/baselines/reference/callOverloads2.types
+++ b/tests/baselines/reference/callOverloads2.types
@@ -13,7 +13,7 @@ class Foo { // error
 }
 
 function Foo(); // error
->Foo : () => any
+>Foo : typeof Foo
 
 function F1(s:string) {return s;} // error
 >F1 : (s: string) => string
@@ -34,19 +34,19 @@ declare function Gar(s:String); // expect no error
 >s : String
 
 var f1 = new Foo("hey");
->f1 : any
->new Foo("hey") : any
->Foo : () => any
+>f1 : Foo
+>new Foo("hey") : Foo
+>Foo : typeof Foo
 >"hey" : "hey"
 
 
 f1.bar1();
->f1.bar1() : any
->f1.bar1 : any
->f1 : any
->bar1 : any
+>f1.bar1() : void
+>f1.bar1 : () => void
+>f1 : Foo
+>bar1 : () => void
 
 Foo();
 >Foo() : any
->Foo : () => any
+>Foo : typeof Foo
 
diff --git a/tests/baselines/reference/callOverloads3.errors.txt b/tests/baselines/reference/callOverloads3.errors.txt
index 7a38d132cbb..7c064ba1775 100644
--- a/tests/baselines/reference/callOverloads3.errors.txt
+++ b/tests/baselines/reference/callOverloads3.errors.txt
@@ -1,28 +1,27 @@
 tests/cases/compiler/callOverloads3.ts(1,10): error TS2300: Duplicate identifier 'Foo'.
-tests/cases/compiler/callOverloads3.ts(1,16): error TS2749: 'Foo' refers to a value, but is being used as a type here.
 tests/cases/compiler/callOverloads3.ts(2,10): error TS2300: Duplicate identifier 'Foo'.
 tests/cases/compiler/callOverloads3.ts(2,10): error TS2391: Function implementation is missing or not immediately following the declaration.
-tests/cases/compiler/callOverloads3.ts(2,24): error TS2749: 'Foo' refers to a value, but is being used as a type here.
 tests/cases/compiler/callOverloads3.ts(3,7): error TS2300: Duplicate identifier 'Foo'.
-tests/cases/compiler/callOverloads3.ts(11,10): error TS2350: Only a void function can be called with the 'new' keyword.
 
 
-==== tests/cases/compiler/callOverloads3.ts (7 errors) ====
+==== tests/cases/compiler/callOverloads3.ts (4 errors) ====
     function Foo():Foo; // error
              ~~~
 !!! error TS2300: Duplicate identifier 'Foo'.
-                   ~~~
-!!! error TS2749: 'Foo' refers to a value, but is being used as a type here.
+!!! related TS6203 tests/cases/compiler/callOverloads3.ts:2:10: 'Foo' was also declared here.
+!!! related TS6204 tests/cases/compiler/callOverloads3.ts:3:7: and here.
     function Foo(s:string):Foo; // error
              ~~~
 !!! error TS2300: Duplicate identifier 'Foo'.
+!!! related TS6203 tests/cases/compiler/callOverloads3.ts:1:10: 'Foo' was also declared here.
+!!! related TS6204 tests/cases/compiler/callOverloads3.ts:3:7: and here.
              ~~~
 !!! error TS2391: Function implementation is missing or not immediately following the declaration.
-                           ~~~
-!!! error TS2749: 'Foo' refers to a value, but is being used as a type here.
     class Foo { // error
           ~~~
 !!! error TS2300: Duplicate identifier 'Foo'.
+!!! related TS6203 tests/cases/compiler/callOverloads3.ts:1:10: 'Foo' was also declared here.
+!!! related TS6204 tests/cases/compiler/callOverloads3.ts:2:10: and here.
         bar1() { /*WScript.Echo("bar1");*/ }
         constructor(x: any) {
             // WScript.Echo("Constructor function has executed");
@@ -31,8 +30,6 @@ tests/cases/compiler/callOverloads3.ts(11,10): error TS2350: Only a void functio
     //class Foo(s: String);
     
     var f1 = new Foo("hey");
-             ~~~~~~~~~~~~~~
-!!! error TS2350: Only a void function can be called with the 'new' keyword.
     
     
     f1.bar1();
diff --git a/tests/baselines/reference/callOverloads3.symbols b/tests/baselines/reference/callOverloads3.symbols
index f694684402a..d0d5c3ef35b 100644
--- a/tests/baselines/reference/callOverloads3.symbols
+++ b/tests/baselines/reference/callOverloads3.symbols
@@ -1,13 +1,15 @@
 === tests/cases/compiler/callOverloads3.ts ===
 function Foo():Foo; // error
->Foo : Symbol(Foo, Decl(callOverloads3.ts, 0, 0), Decl(callOverloads3.ts, 0, 19))
+>Foo : Symbol(Foo, Decl(callOverloads3.ts, 0, 0), Decl(callOverloads3.ts, 0, 19), Decl(callOverloads3.ts, 1, 27))
+>Foo : Symbol(Foo, Decl(callOverloads3.ts, 0, 0), Decl(callOverloads3.ts, 0, 19), Decl(callOverloads3.ts, 1, 27))
 
 function Foo(s:string):Foo; // error
->Foo : Symbol(Foo, Decl(callOverloads3.ts, 0, 0), Decl(callOverloads3.ts, 0, 19))
+>Foo : Symbol(Foo, Decl(callOverloads3.ts, 0, 0), Decl(callOverloads3.ts, 0, 19), Decl(callOverloads3.ts, 1, 27))
 >s : Symbol(s, Decl(callOverloads3.ts, 1, 13))
+>Foo : Symbol(Foo, Decl(callOverloads3.ts, 0, 0), Decl(callOverloads3.ts, 0, 19), Decl(callOverloads3.ts, 1, 27))
 
 class Foo { // error
->Foo : Symbol(Foo, Decl(callOverloads3.ts, 1, 27))
+>Foo : Symbol(Foo, Decl(callOverloads3.ts, 0, 0), Decl(callOverloads3.ts, 0, 19), Decl(callOverloads3.ts, 1, 27))
 
     bar1() { /*WScript.Echo("bar1");*/ }
 >bar1 : Symbol(Foo.bar1, Decl(callOverloads3.ts, 2, 11))
@@ -22,15 +24,17 @@ class Foo { // error
 
 var f1 = new Foo("hey");
 >f1 : Symbol(f1, Decl(callOverloads3.ts, 10, 3))
->Foo : Symbol(Foo, Decl(callOverloads3.ts, 0, 0), Decl(callOverloads3.ts, 0, 19))
+>Foo : Symbol(Foo, Decl(callOverloads3.ts, 0, 0), Decl(callOverloads3.ts, 0, 19), Decl(callOverloads3.ts, 1, 27))
 
 
 f1.bar1();
+>f1.bar1 : Symbol(Foo.bar1, Decl(callOverloads3.ts, 2, 11))
 >f1 : Symbol(f1, Decl(callOverloads3.ts, 10, 3))
+>bar1 : Symbol(Foo.bar1, Decl(callOverloads3.ts, 2, 11))
 
 Foo();
->Foo : Symbol(Foo, Decl(callOverloads3.ts, 0, 0), Decl(callOverloads3.ts, 0, 19))
+>Foo : Symbol(Foo, Decl(callOverloads3.ts, 0, 0), Decl(callOverloads3.ts, 0, 19), Decl(callOverloads3.ts, 1, 27))
 
 Foo("s");
->Foo : Symbol(Foo, Decl(callOverloads3.ts, 0, 0), Decl(callOverloads3.ts, 0, 19))
+>Foo : Symbol(Foo, Decl(callOverloads3.ts, 0, 0), Decl(callOverloads3.ts, 0, 19), Decl(callOverloads3.ts, 1, 27))
 
diff --git a/tests/baselines/reference/callOverloads3.types b/tests/baselines/reference/callOverloads3.types
index eeef5edc339..3b1c7166b4b 100644
--- a/tests/baselines/reference/callOverloads3.types
+++ b/tests/baselines/reference/callOverloads3.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/callOverloads3.ts ===
 function Foo():Foo; // error
->Foo : { (): any; (s: string): any; }
+>Foo : typeof Foo
 
 function Foo(s:string):Foo; // error
->Foo : { (): any; (s: string): any; }
+>Foo : typeof Foo
 >s : string
 
 class Foo { // error
@@ -21,24 +21,24 @@ class Foo { // error
 //class Foo(s: String);
 
 var f1 = new Foo("hey");
->f1 : any
->new Foo("hey") : any
->Foo : { (): any; (s: string): any; }
+>f1 : Foo
+>new Foo("hey") : Foo
+>Foo : typeof Foo
 >"hey" : "hey"
 
 
 f1.bar1();
->f1.bar1() : any
->f1.bar1 : any
->f1 : any
->bar1 : any
+>f1.bar1() : void
+>f1.bar1 : () => void
+>f1 : Foo
+>bar1 : () => void
 
 Foo();
->Foo() : any
->Foo : { (): any; (s: string): any; }
+>Foo() : Foo
+>Foo : typeof Foo
 
 Foo("s");
->Foo("s") : any
->Foo : { (): any; (s: string): any; }
+>Foo("s") : Foo
+>Foo : typeof Foo
 >"s" : "s"
 
diff --git a/tests/baselines/reference/callOverloads4.errors.txt b/tests/baselines/reference/callOverloads4.errors.txt
index dcecd65666e..cf86024f995 100644
--- a/tests/baselines/reference/callOverloads4.errors.txt
+++ b/tests/baselines/reference/callOverloads4.errors.txt
@@ -1,28 +1,27 @@
 tests/cases/compiler/callOverloads4.ts(1,10): error TS2300: Duplicate identifier 'Foo'.
-tests/cases/compiler/callOverloads4.ts(1,16): error TS2749: 'Foo' refers to a value, but is being used as a type here.
 tests/cases/compiler/callOverloads4.ts(2,10): error TS2300: Duplicate identifier 'Foo'.
 tests/cases/compiler/callOverloads4.ts(2,10): error TS2391: Function implementation is missing or not immediately following the declaration.
-tests/cases/compiler/callOverloads4.ts(2,24): error TS2749: 'Foo' refers to a value, but is being used as a type here.
 tests/cases/compiler/callOverloads4.ts(3,7): error TS2300: Duplicate identifier 'Foo'.
-tests/cases/compiler/callOverloads4.ts(11,10): error TS2350: Only a void function can be called with the 'new' keyword.
 
 
-==== tests/cases/compiler/callOverloads4.ts (7 errors) ====
+==== tests/cases/compiler/callOverloads4.ts (4 errors) ====
     function Foo():Foo; // error
              ~~~
 !!! error TS2300: Duplicate identifier 'Foo'.
-                   ~~~
-!!! error TS2749: 'Foo' refers to a value, but is being used as a type here.
+!!! related TS6203 tests/cases/compiler/callOverloads4.ts:2:10: 'Foo' was also declared here.
+!!! related TS6204 tests/cases/compiler/callOverloads4.ts:3:7: and here.
     function Foo(s:string):Foo; // error
              ~~~
 !!! error TS2300: Duplicate identifier 'Foo'.
+!!! related TS6203 tests/cases/compiler/callOverloads4.ts:1:10: 'Foo' was also declared here.
+!!! related TS6204 tests/cases/compiler/callOverloads4.ts:3:7: and here.
              ~~~
 !!! error TS2391: Function implementation is missing or not immediately following the declaration.
-                           ~~~
-!!! error TS2749: 'Foo' refers to a value, but is being used as a type here.
     class Foo { // error
           ~~~
 !!! error TS2300: Duplicate identifier 'Foo'.
+!!! related TS6203 tests/cases/compiler/callOverloads4.ts:1:10: 'Foo' was also declared here.
+!!! related TS6204 tests/cases/compiler/callOverloads4.ts:2:10: and here.
         bar1() { /*WScript.Echo("bar1");*/ }
         constructor(s: string);
         constructor(x: any) {
@@ -31,8 +30,6 @@ tests/cases/compiler/callOverloads4.ts(11,10): error TS2350: Only a void functio
     }
     
     var f1 = new Foo("hey");
-             ~~~~~~~~~~~~~~
-!!! error TS2350: Only a void function can be called with the 'new' keyword.
     
     
     f1.bar1();
diff --git a/tests/baselines/reference/callOverloads4.symbols b/tests/baselines/reference/callOverloads4.symbols
index 2d898dbdbcc..99e49b775bd 100644
--- a/tests/baselines/reference/callOverloads4.symbols
+++ b/tests/baselines/reference/callOverloads4.symbols
@@ -1,13 +1,15 @@
 === tests/cases/compiler/callOverloads4.ts ===
 function Foo():Foo; // error
->Foo : Symbol(Foo, Decl(callOverloads4.ts, 0, 0), Decl(callOverloads4.ts, 0, 19))
+>Foo : Symbol(Foo, Decl(callOverloads4.ts, 0, 0), Decl(callOverloads4.ts, 0, 19), Decl(callOverloads4.ts, 1, 27))
+>Foo : Symbol(Foo, Decl(callOverloads4.ts, 0, 0), Decl(callOverloads4.ts, 0, 19), Decl(callOverloads4.ts, 1, 27))
 
 function Foo(s:string):Foo; // error
->Foo : Symbol(Foo, Decl(callOverloads4.ts, 0, 0), Decl(callOverloads4.ts, 0, 19))
+>Foo : Symbol(Foo, Decl(callOverloads4.ts, 0, 0), Decl(callOverloads4.ts, 0, 19), Decl(callOverloads4.ts, 1, 27))
 >s : Symbol(s, Decl(callOverloads4.ts, 1, 13))
+>Foo : Symbol(Foo, Decl(callOverloads4.ts, 0, 0), Decl(callOverloads4.ts, 0, 19), Decl(callOverloads4.ts, 1, 27))
 
 class Foo { // error
->Foo : Symbol(Foo, Decl(callOverloads4.ts, 1, 27))
+>Foo : Symbol(Foo, Decl(callOverloads4.ts, 0, 0), Decl(callOverloads4.ts, 0, 19), Decl(callOverloads4.ts, 1, 27))
 
     bar1() { /*WScript.Echo("bar1");*/ }
 >bar1 : Symbol(Foo.bar1, Decl(callOverloads4.ts, 2, 11))
@@ -24,15 +26,17 @@ class Foo { // error
 
 var f1 = new Foo("hey");
 >f1 : Symbol(f1, Decl(callOverloads4.ts, 10, 3))
->Foo : Symbol(Foo, Decl(callOverloads4.ts, 0, 0), Decl(callOverloads4.ts, 0, 19))
+>Foo : Symbol(Foo, Decl(callOverloads4.ts, 0, 0), Decl(callOverloads4.ts, 0, 19), Decl(callOverloads4.ts, 1, 27))
 
 
 f1.bar1();
+>f1.bar1 : Symbol(Foo.bar1, Decl(callOverloads4.ts, 2, 11))
 >f1 : Symbol(f1, Decl(callOverloads4.ts, 10, 3))
+>bar1 : Symbol(Foo.bar1, Decl(callOverloads4.ts, 2, 11))
 
 Foo();
->Foo : Symbol(Foo, Decl(callOverloads4.ts, 0, 0), Decl(callOverloads4.ts, 0, 19))
+>Foo : Symbol(Foo, Decl(callOverloads4.ts, 0, 0), Decl(callOverloads4.ts, 0, 19), Decl(callOverloads4.ts, 1, 27))
 
 Foo("s");
->Foo : Symbol(Foo, Decl(callOverloads4.ts, 0, 0), Decl(callOverloads4.ts, 0, 19))
+>Foo : Symbol(Foo, Decl(callOverloads4.ts, 0, 0), Decl(callOverloads4.ts, 0, 19), Decl(callOverloads4.ts, 1, 27))
 
diff --git a/tests/baselines/reference/callOverloads4.types b/tests/baselines/reference/callOverloads4.types
index 45a84ed10c6..3b72dfd6b74 100644
--- a/tests/baselines/reference/callOverloads4.types
+++ b/tests/baselines/reference/callOverloads4.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/callOverloads4.ts ===
 function Foo():Foo; // error
->Foo : { (): any; (s: string): any; }
+>Foo : typeof Foo
 
 function Foo(s:string):Foo; // error
->Foo : { (): any; (s: string): any; }
+>Foo : typeof Foo
 >s : string
 
 class Foo { // error
@@ -23,24 +23,24 @@ class Foo { // error
 }
 
 var f1 = new Foo("hey");
->f1 : any
->new Foo("hey") : any
->Foo : { (): any; (s: string): any; }
+>f1 : Foo
+>new Foo("hey") : Foo
+>Foo : typeof Foo
 >"hey" : "hey"
 
 
 f1.bar1();
->f1.bar1() : any
->f1.bar1 : any
->f1 : any
->bar1 : any
+>f1.bar1() : void
+>f1.bar1 : () => void
+>f1 : Foo
+>bar1 : () => void
 
 Foo();
->Foo() : any
->Foo : { (): any; (s: string): any; }
+>Foo() : Foo
+>Foo : typeof Foo
 
 Foo("s");
->Foo("s") : any
->Foo : { (): any; (s: string): any; }
+>Foo("s") : Foo
+>Foo : typeof Foo
 >"s" : "s"
 
diff --git a/tests/baselines/reference/callOverloads5.errors.txt b/tests/baselines/reference/callOverloads5.errors.txt
index e9ebdc8a524..bbf4b4bad8b 100644
--- a/tests/baselines/reference/callOverloads5.errors.txt
+++ b/tests/baselines/reference/callOverloads5.errors.txt
@@ -1,28 +1,27 @@
 tests/cases/compiler/callOverloads5.ts(1,10): error TS2300: Duplicate identifier 'Foo'.
-tests/cases/compiler/callOverloads5.ts(1,16): error TS2749: 'Foo' refers to a value, but is being used as a type here.
 tests/cases/compiler/callOverloads5.ts(2,10): error TS2300: Duplicate identifier 'Foo'.
 tests/cases/compiler/callOverloads5.ts(2,10): error TS2391: Function implementation is missing or not immediately following the declaration.
-tests/cases/compiler/callOverloads5.ts(2,24): error TS2749: 'Foo' refers to a value, but is being used as a type here.
 tests/cases/compiler/callOverloads5.ts(3,7): error TS2300: Duplicate identifier 'Foo'.
-tests/cases/compiler/callOverloads5.ts(13,10): error TS2350: Only a void function can be called with the 'new' keyword.
 
 
-==== tests/cases/compiler/callOverloads5.ts (7 errors) ====
+==== tests/cases/compiler/callOverloads5.ts (4 errors) ====
     function Foo():Foo; // error
              ~~~
 !!! error TS2300: Duplicate identifier 'Foo'.
-                   ~~~
-!!! error TS2749: 'Foo' refers to a value, but is being used as a type here.
+!!! related TS6203 tests/cases/compiler/callOverloads5.ts:2:10: 'Foo' was also declared here.
+!!! related TS6204 tests/cases/compiler/callOverloads5.ts:3:7: and here.
     function Foo(s:string):Foo; // error
              ~~~
 !!! error TS2300: Duplicate identifier 'Foo'.
+!!! related TS6203 tests/cases/compiler/callOverloads5.ts:1:10: 'Foo' was also declared here.
+!!! related TS6204 tests/cases/compiler/callOverloads5.ts:3:7: and here.
              ~~~
 !!! error TS2391: Function implementation is missing or not immediately following the declaration.
-                           ~~~
-!!! error TS2749: 'Foo' refers to a value, but is being used as a type here.
     class Foo { // error
           ~~~
 !!! error TS2300: Duplicate identifier 'Foo'.
+!!! related TS6203 tests/cases/compiler/callOverloads5.ts:1:10: 'Foo' was also declared here.
+!!! related TS6204 tests/cases/compiler/callOverloads5.ts:2:10: and here.
     	bar1(s:string);
     	bar1(n:number);
         bar1(a:any) { /*WScript.Echo(a);*/ }
@@ -33,8 +32,6 @@ tests/cases/compiler/callOverloads5.ts(13,10): error TS2350: Only a void functio
     //class Foo(s: String);
     
     var f1 = new Foo("hey");
-             ~~~~~~~~~~~~~~
-!!! error TS2350: Only a void function can be called with the 'new' keyword.
     
     
     f1.bar1("a");
diff --git a/tests/baselines/reference/callOverloads5.symbols b/tests/baselines/reference/callOverloads5.symbols
index 0f63d3edf06..649233ce143 100644
--- a/tests/baselines/reference/callOverloads5.symbols
+++ b/tests/baselines/reference/callOverloads5.symbols
@@ -1,13 +1,15 @@
 === tests/cases/compiler/callOverloads5.ts ===
 function Foo():Foo; // error
->Foo : Symbol(Foo, Decl(callOverloads5.ts, 0, 0), Decl(callOverloads5.ts, 0, 19))
+>Foo : Symbol(Foo, Decl(callOverloads5.ts, 0, 0), Decl(callOverloads5.ts, 0, 19), Decl(callOverloads5.ts, 1, 27))
+>Foo : Symbol(Foo, Decl(callOverloads5.ts, 0, 0), Decl(callOverloads5.ts, 0, 19), Decl(callOverloads5.ts, 1, 27))
 
 function Foo(s:string):Foo; // error
->Foo : Symbol(Foo, Decl(callOverloads5.ts, 0, 0), Decl(callOverloads5.ts, 0, 19))
+>Foo : Symbol(Foo, Decl(callOverloads5.ts, 0, 0), Decl(callOverloads5.ts, 0, 19), Decl(callOverloads5.ts, 1, 27))
 >s : Symbol(s, Decl(callOverloads5.ts, 1, 13))
+>Foo : Symbol(Foo, Decl(callOverloads5.ts, 0, 0), Decl(callOverloads5.ts, 0, 19), Decl(callOverloads5.ts, 1, 27))
 
 class Foo { // error
->Foo : Symbol(Foo, Decl(callOverloads5.ts, 1, 27))
+>Foo : Symbol(Foo, Decl(callOverloads5.ts, 0, 0), Decl(callOverloads5.ts, 0, 19), Decl(callOverloads5.ts, 1, 27))
 
 	bar1(s:string);
 >bar1 : Symbol(Foo.bar1, Decl(callOverloads5.ts, 2, 11), Decl(callOverloads5.ts, 3, 16), Decl(callOverloads5.ts, 4, 16))
@@ -31,15 +33,17 @@ class Foo { // error
 
 var f1 = new Foo("hey");
 >f1 : Symbol(f1, Decl(callOverloads5.ts, 12, 3))
->Foo : Symbol(Foo, Decl(callOverloads5.ts, 0, 0), Decl(callOverloads5.ts, 0, 19))
+>Foo : Symbol(Foo, Decl(callOverloads5.ts, 0, 0), Decl(callOverloads5.ts, 0, 19), Decl(callOverloads5.ts, 1, 27))
 
 
 f1.bar1("a");
+>f1.bar1 : Symbol(Foo.bar1, Decl(callOverloads5.ts, 2, 11), Decl(callOverloads5.ts, 3, 16), Decl(callOverloads5.ts, 4, 16))
 >f1 : Symbol(f1, Decl(callOverloads5.ts, 12, 3))
+>bar1 : Symbol(Foo.bar1, Decl(callOverloads5.ts, 2, 11), Decl(callOverloads5.ts, 3, 16), Decl(callOverloads5.ts, 4, 16))
 
 Foo();
->Foo : Symbol(Foo, Decl(callOverloads5.ts, 0, 0), Decl(callOverloads5.ts, 0, 19))
+>Foo : Symbol(Foo, Decl(callOverloads5.ts, 0, 0), Decl(callOverloads5.ts, 0, 19), Decl(callOverloads5.ts, 1, 27))
 
 Foo("s");
->Foo : Symbol(Foo, Decl(callOverloads5.ts, 0, 0), Decl(callOverloads5.ts, 0, 19))
+>Foo : Symbol(Foo, Decl(callOverloads5.ts, 0, 0), Decl(callOverloads5.ts, 0, 19), Decl(callOverloads5.ts, 1, 27))
 
diff --git a/tests/baselines/reference/callOverloads5.types b/tests/baselines/reference/callOverloads5.types
index 45e5d77d5aa..400d20b772f 100644
--- a/tests/baselines/reference/callOverloads5.types
+++ b/tests/baselines/reference/callOverloads5.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/callOverloads5.ts ===
 function Foo():Foo; // error
->Foo : { (): any; (s: string): any; }
+>Foo : typeof Foo
 
 function Foo(s:string):Foo; // error
->Foo : { (): any; (s: string): any; }
+>Foo : typeof Foo
 >s : string
 
 class Foo { // error
@@ -30,25 +30,25 @@ class Foo { // error
 //class Foo(s: String);
 
 var f1 = new Foo("hey");
->f1 : any
->new Foo("hey") : any
->Foo : { (): any; (s: string): any; }
+>f1 : Foo
+>new Foo("hey") : Foo
+>Foo : typeof Foo
 >"hey" : "hey"
 
 
 f1.bar1("a");
 >f1.bar1("a") : any
->f1.bar1 : any
->f1 : any
->bar1 : any
+>f1.bar1 : { (s: string): any; (n: number): any; }
+>f1 : Foo
+>bar1 : { (s: string): any; (n: number): any; }
 >"a" : "a"
 
 Foo();
->Foo() : any
->Foo : { (): any; (s: string): any; }
+>Foo() : Foo
+>Foo : typeof Foo
 
 Foo("s");
->Foo("s") : any
->Foo : { (): any; (s: string): any; }
+>Foo("s") : Foo
+>Foo : typeof Foo
 >"s" : "s"
 
diff --git a/tests/baselines/reference/classFunctionMerging.js b/tests/baselines/reference/classFunctionMerging.js
new file mode 100644
index 00000000000..7da31c1bbd0
--- /dev/null
+++ b/tests/baselines/reference/classFunctionMerging.js
@@ -0,0 +1,17 @@
+//// [classFunctionMerging.ts]
+// We allow ambient classes and functions to merge, this way callable classes
+// which are also namespaces can be represented in declaration files
+declare function Foo (x: number): Foo.Inst;
+declare class Foo {
+    constructor(x: string);
+}
+declare namespace Foo {
+    export type Inst = number;
+}
+
+const a = new Foo("");
+const b = Foo(12);
+
+//// [classFunctionMerging.js]
+var a = new Foo("");
+var b = Foo(12);
diff --git a/tests/baselines/reference/classFunctionMerging.symbols b/tests/baselines/reference/classFunctionMerging.symbols
new file mode 100644
index 00000000000..48e17e4fec3
--- /dev/null
+++ b/tests/baselines/reference/classFunctionMerging.symbols
@@ -0,0 +1,30 @@
+=== tests/cases/compiler/classFunctionMerging.ts ===
+// We allow ambient classes and functions to merge, this way callable classes
+// which are also namespaces can be represented in declaration files
+declare function Foo (x: number): Foo.Inst;
+>Foo : Symbol(Foo, Decl(classFunctionMerging.ts, 0, 0), Decl(classFunctionMerging.ts, 2, 43), Decl(classFunctionMerging.ts, 5, 1))
+>x : Symbol(x, Decl(classFunctionMerging.ts, 2, 22))
+>Foo : Symbol(Foo, Decl(classFunctionMerging.ts, 0, 0), Decl(classFunctionMerging.ts, 2, 43), Decl(classFunctionMerging.ts, 5, 1))
+>Inst : Symbol(Foo.Inst, Decl(classFunctionMerging.ts, 6, 23))
+
+declare class Foo {
+>Foo : Symbol(Foo, Decl(classFunctionMerging.ts, 0, 0), Decl(classFunctionMerging.ts, 2, 43), Decl(classFunctionMerging.ts, 5, 1))
+
+    constructor(x: string);
+>x : Symbol(x, Decl(classFunctionMerging.ts, 4, 16))
+}
+declare namespace Foo {
+>Foo : Symbol(Foo, Decl(classFunctionMerging.ts, 0, 0), Decl(classFunctionMerging.ts, 2, 43), Decl(classFunctionMerging.ts, 5, 1))
+
+    export type Inst = number;
+>Inst : Symbol(Inst, Decl(classFunctionMerging.ts, 6, 23))
+}
+
+const a = new Foo("");
+>a : Symbol(a, Decl(classFunctionMerging.ts, 10, 5))
+>Foo : Symbol(Foo, Decl(classFunctionMerging.ts, 0, 0), Decl(classFunctionMerging.ts, 2, 43), Decl(classFunctionMerging.ts, 5, 1))
+
+const b = Foo(12);
+>b : Symbol(b, Decl(classFunctionMerging.ts, 11, 5))
+>Foo : Symbol(Foo, Decl(classFunctionMerging.ts, 0, 0), Decl(classFunctionMerging.ts, 2, 43), Decl(classFunctionMerging.ts, 5, 1))
+
diff --git a/tests/baselines/reference/classFunctionMerging.types b/tests/baselines/reference/classFunctionMerging.types
new file mode 100644
index 00000000000..0e1bc79a707
--- /dev/null
+++ b/tests/baselines/reference/classFunctionMerging.types
@@ -0,0 +1,31 @@
+=== tests/cases/compiler/classFunctionMerging.ts ===
+// We allow ambient classes and functions to merge, this way callable classes
+// which are also namespaces can be represented in declaration files
+declare function Foo (x: number): Foo.Inst;
+>Foo : typeof Foo
+>x : number
+>Foo : any
+
+declare class Foo {
+>Foo : Foo
+
+    constructor(x: string);
+>x : string
+}
+declare namespace Foo {
+    export type Inst = number;
+>Inst : number
+}
+
+const a = new Foo("");
+>a : Foo
+>new Foo("") : Foo
+>Foo : typeof Foo
+>"" : ""
+
+const b = Foo(12);
+>b : number
+>Foo(12) : number
+>Foo : typeof Foo
+>12 : 12
+
diff --git a/tests/baselines/reference/classOverloadForFunction.errors.txt b/tests/baselines/reference/classOverloadForFunction.errors.txt
index 14bc27fb5ca..70e4d5d7b4f 100644
--- a/tests/baselines/reference/classOverloadForFunction.errors.txt
+++ b/tests/baselines/reference/classOverloadForFunction.errors.txt
@@ -6,7 +6,9 @@ tests/cases/compiler/classOverloadForFunction.ts(2,10): error TS2300: Duplicate
     class foo { };
           ~~~
 !!! error TS2300: Duplicate identifier 'foo'.
+!!! related TS6203 tests/cases/compiler/classOverloadForFunction.ts:2:10: 'foo' was also declared here.
     function foo() {}
              ~~~
 !!! error TS2300: Duplicate identifier 'foo'.
+!!! related TS6203 tests/cases/compiler/classOverloadForFunction.ts:1:7: 'foo' was also declared here.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/classOverloadForFunction.symbols b/tests/baselines/reference/classOverloadForFunction.symbols
index 063215b5fef..90a62747e49 100644
--- a/tests/baselines/reference/classOverloadForFunction.symbols
+++ b/tests/baselines/reference/classOverloadForFunction.symbols
@@ -1,7 +1,7 @@
 === tests/cases/compiler/classOverloadForFunction.ts ===
 class foo { };
->foo : Symbol(foo, Decl(classOverloadForFunction.ts, 0, 0))
+>foo : Symbol(foo, Decl(classOverloadForFunction.ts, 0, 14), Decl(classOverloadForFunction.ts, 0, 0))
 
 function foo() {}
->foo : Symbol(foo, Decl(classOverloadForFunction.ts, 0, 14))
+>foo : Symbol(foo, Decl(classOverloadForFunction.ts, 0, 14), Decl(classOverloadForFunction.ts, 0, 0))
 
diff --git a/tests/baselines/reference/classOverloadForFunction.types b/tests/baselines/reference/classOverloadForFunction.types
index fd98ba7bc81..b1c4565242d 100644
--- a/tests/baselines/reference/classOverloadForFunction.types
+++ b/tests/baselines/reference/classOverloadForFunction.types
@@ -3,5 +3,5 @@ class foo { };
 >foo : foo
 
 function foo() {}
->foo : () => void
+>foo : typeof foo
 
diff --git a/tests/baselines/reference/classOverloadForFunction2.errors.txt b/tests/baselines/reference/classOverloadForFunction2.errors.txt
index 4dd459c48ec..447be14c4f9 100644
--- a/tests/baselines/reference/classOverloadForFunction2.errors.txt
+++ b/tests/baselines/reference/classOverloadForFunction2.errors.txt
@@ -7,8 +7,10 @@ tests/cases/compiler/classOverloadForFunction2.ts(2,7): error TS2300: Duplicate
     function bar(): string;
              ~~~
 !!! error TS2300: Duplicate identifier 'bar'.
+!!! related TS6203 tests/cases/compiler/classOverloadForFunction2.ts:2:7: 'bar' was also declared here.
              ~~~
 !!! error TS2391: Function implementation is missing or not immediately following the declaration.
     class bar {}
           ~~~
-!!! error TS2300: Duplicate identifier 'bar'.
\ No newline at end of file
+!!! error TS2300: Duplicate identifier 'bar'.
+!!! related TS6203 tests/cases/compiler/classOverloadForFunction2.ts:1:10: 'bar' was also declared here.
\ No newline at end of file
diff --git a/tests/baselines/reference/classOverloadForFunction2.symbols b/tests/baselines/reference/classOverloadForFunction2.symbols
index df135e383be..daaea300ba3 100644
--- a/tests/baselines/reference/classOverloadForFunction2.symbols
+++ b/tests/baselines/reference/classOverloadForFunction2.symbols
@@ -1,7 +1,7 @@
 === tests/cases/compiler/classOverloadForFunction2.ts ===
 function bar(): string;
->bar : Symbol(bar, Decl(classOverloadForFunction2.ts, 0, 0))
+>bar : Symbol(bar, Decl(classOverloadForFunction2.ts, 0, 0), Decl(classOverloadForFunction2.ts, 0, 23))
 
 class bar {}
->bar : Symbol(bar, Decl(classOverloadForFunction2.ts, 0, 23))
+>bar : Symbol(bar, Decl(classOverloadForFunction2.ts, 0, 0), Decl(classOverloadForFunction2.ts, 0, 23))
 
diff --git a/tests/baselines/reference/classOverloadForFunction2.types b/tests/baselines/reference/classOverloadForFunction2.types
index 13e785694e5..db0a9be0c73 100644
--- a/tests/baselines/reference/classOverloadForFunction2.types
+++ b/tests/baselines/reference/classOverloadForFunction2.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/classOverloadForFunction2.ts ===
 function bar(): string;
->bar : () => string
+>bar : typeof bar
 
 class bar {}
 >bar : bar
diff --git a/tests/baselines/reference/constructorOverloads4.errors.txt b/tests/baselines/reference/constructorOverloads4.errors.txt
index 9a02c67361b..595023f2a4c 100644
--- a/tests/baselines/reference/constructorOverloads4.errors.txt
+++ b/tests/baselines/reference/constructorOverloads4.errors.txt
@@ -1,27 +1,20 @@
-tests/cases/compiler/constructorOverloads4.ts(2,18): error TS2300: Duplicate identifier 'Function'.
-tests/cases/compiler/constructorOverloads4.ts(5,21): error TS2300: Duplicate identifier 'Function'.
-tests/cases/compiler/constructorOverloads4.ts(6,21): error TS2300: Duplicate identifier 'Function'.
-tests/cases/compiler/constructorOverloads4.ts(10,2): error TS2350: Only a void function can be called with the 'new' keyword.
+tests/cases/compiler/constructorOverloads4.ts(10,1): error TS2349: This expression is not callable.
+  Type 'Function' has no call signatures.
 
 
-==== tests/cases/compiler/constructorOverloads4.ts (4 errors) ====
+==== tests/cases/compiler/constructorOverloads4.ts (1 errors) ====
     declare module M {    
         export class Function {
-                     ~~~~~~~~
-!!! error TS2300: Duplicate identifier 'Function'.
             constructor(...args: string[]);
         }
         export function Function(...args: any[]): any;
-                        ~~~~~~~~
-!!! error TS2300: Duplicate identifier 'Function'.
         export function Function(...args: string[]): Function;
-                        ~~~~~~~~
-!!! error TS2300: Duplicate identifier 'Function'.
     }
     
     
     (new M.Function("return 5"))();
-     ~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2350: Only a void function can be called with the 'new' keyword.
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2349: This expression is not callable.
+!!! error TS2349:   Type 'Function' has no call signatures.
     M.Function("yo");
     
\ No newline at end of file
diff --git a/tests/baselines/reference/constructorOverloads4.symbols b/tests/baselines/reference/constructorOverloads4.symbols
index cb008ba6883..a215282b968 100644
--- a/tests/baselines/reference/constructorOverloads4.symbols
+++ b/tests/baselines/reference/constructorOverloads4.symbols
@@ -3,29 +3,29 @@ declare module M {
 >M : Symbol(M, Decl(constructorOverloads4.ts, 0, 0))
 
     export class Function {
->Function : Symbol(Function, Decl(constructorOverloads4.ts, 0, 18))
+>Function : Symbol(Function, Decl(constructorOverloads4.ts, 3, 5), Decl(constructorOverloads4.ts, 4, 50), Decl(constructorOverloads4.ts, 0, 18))
 
         constructor(...args: string[]);
 >args : Symbol(args, Decl(constructorOverloads4.ts, 2, 20))
     }
     export function Function(...args: any[]): any;
->Function : Symbol(Function, Decl(constructorOverloads4.ts, 3, 5), Decl(constructorOverloads4.ts, 4, 50))
+>Function : Symbol(Function, Decl(constructorOverloads4.ts, 3, 5), Decl(constructorOverloads4.ts, 4, 50), Decl(constructorOverloads4.ts, 0, 18))
 >args : Symbol(args, Decl(constructorOverloads4.ts, 4, 29))
 
     export function Function(...args: string[]): Function;
->Function : Symbol(Function, Decl(constructorOverloads4.ts, 3, 5), Decl(constructorOverloads4.ts, 4, 50))
+>Function : Symbol(Function, Decl(constructorOverloads4.ts, 3, 5), Decl(constructorOverloads4.ts, 4, 50), Decl(constructorOverloads4.ts, 0, 18))
 >args : Symbol(args, Decl(constructorOverloads4.ts, 5, 29))
->Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+>Function : Symbol(Function, Decl(constructorOverloads4.ts, 3, 5), Decl(constructorOverloads4.ts, 4, 50), Decl(constructorOverloads4.ts, 0, 18))
 }
 
 
 (new M.Function("return 5"))();
->M.Function : Symbol(M.Function, Decl(constructorOverloads4.ts, 3, 5), Decl(constructorOverloads4.ts, 4, 50))
+>M.Function : Symbol(M.Function, Decl(constructorOverloads4.ts, 3, 5), Decl(constructorOverloads4.ts, 4, 50), Decl(constructorOverloads4.ts, 0, 18))
 >M : Symbol(M, Decl(constructorOverloads4.ts, 0, 0))
->Function : Symbol(M.Function, Decl(constructorOverloads4.ts, 3, 5), Decl(constructorOverloads4.ts, 4, 50))
+>Function : Symbol(M.Function, Decl(constructorOverloads4.ts, 3, 5), Decl(constructorOverloads4.ts, 4, 50), Decl(constructorOverloads4.ts, 0, 18))
 
 M.Function("yo");
->M.Function : Symbol(M.Function, Decl(constructorOverloads4.ts, 3, 5), Decl(constructorOverloads4.ts, 4, 50))
+>M.Function : Symbol(M.Function, Decl(constructorOverloads4.ts, 3, 5), Decl(constructorOverloads4.ts, 4, 50), Decl(constructorOverloads4.ts, 0, 18))
 >M : Symbol(M, Decl(constructorOverloads4.ts, 0, 0))
->Function : Symbol(M.Function, Decl(constructorOverloads4.ts, 3, 5), Decl(constructorOverloads4.ts, 4, 50))
+>Function : Symbol(M.Function, Decl(constructorOverloads4.ts, 3, 5), Decl(constructorOverloads4.ts, 4, 50), Decl(constructorOverloads4.ts, 0, 18))
 
diff --git a/tests/baselines/reference/constructorOverloads4.types b/tests/baselines/reference/constructorOverloads4.types
index faf28b5e682..7e2fbd9a848 100644
--- a/tests/baselines/reference/constructorOverloads4.types
+++ b/tests/baselines/reference/constructorOverloads4.types
@@ -3,34 +3,34 @@ declare module M {
 >M : typeof M
 
     export class Function {
->Function : M.Function
+>Function : Function
 
         constructor(...args: string[]);
 >args : string[]
     }
     export function Function(...args: any[]): any;
->Function : { (...args: any[]): any; (...args: string[]): Function; }
+>Function : typeof Function
 >args : any[]
 
     export function Function(...args: string[]): Function;
->Function : { (...args: any[]): any; (...args: string[]): Function; }
+>Function : typeof Function
 >args : string[]
 }
 
 
 (new M.Function("return 5"))();
 >(new M.Function("return 5"))() : any
->(new M.Function("return 5")) : any
->new M.Function("return 5") : any
->M.Function : { (...args: any[]): any; (...args: string[]): Function; }
+>(new M.Function("return 5")) : M.Function
+>new M.Function("return 5") : M.Function
+>M.Function : typeof M.Function
 >M : typeof M
->Function : { (...args: any[]): any; (...args: string[]): Function; }
+>Function : typeof M.Function
 >"return 5" : "return 5"
 
 M.Function("yo");
 >M.Function("yo") : any
->M.Function : { (...args: any[]): any; (...args: string[]): Function; }
+>M.Function : typeof M.Function
 >M : typeof M
->Function : { (...args: any[]): any; (...args: string[]): Function; }
+>Function : typeof M.Function
 >"yo" : "yo"
 
diff --git a/tests/baselines/reference/constructorOverloads5.errors.txt b/tests/baselines/reference/constructorOverloads5.errors.txt
deleted file mode 100644
index 0a695fc001c..00000000000
--- a/tests/baselines/reference/constructorOverloads5.errors.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-tests/cases/compiler/constructorOverloads5.ts(4,21): error TS2300: Duplicate identifier 'RegExp'.
-tests/cases/compiler/constructorOverloads5.ts(5,21): error TS2300: Duplicate identifier 'RegExp'.
-tests/cases/compiler/constructorOverloads5.ts(6,18): error TS2300: Duplicate identifier 'RegExp'.
-
-
-==== tests/cases/compiler/constructorOverloads5.ts (3 errors) ====
-     interface IArguments {}
-    
-     declare module M {
-        export function RegExp(pattern: string): RegExp;
-                        ~~~~~~
-!!! error TS2300: Duplicate identifier 'RegExp'.
-        export function RegExp(pattern: string, flags: string): RegExp;
-                        ~~~~~~
-!!! error TS2300: Duplicate identifier 'RegExp'.
-        export class RegExp {
-                     ~~~~~~
-!!! error TS2300: Duplicate identifier 'RegExp'.
-            constructor(pattern: string);
-            constructor(pattern: string, flags: string);
-            exec(string: string): string[];
-            test(string: string): boolean;
-            source: string;
-            global: boolean;
-            ignoreCase: boolean;
-            multiline: boolean;
-            lastIndex: boolean;
-        }
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/constructorOverloads5.symbols b/tests/baselines/reference/constructorOverloads5.symbols
index 1f0e4160b99..c6c9fedbbef 100644
--- a/tests/baselines/reference/constructorOverloads5.symbols
+++ b/tests/baselines/reference/constructorOverloads5.symbols
@@ -6,18 +6,18 @@
 >M : Symbol(M, Decl(constructorOverloads5.ts, 0, 24))
 
     export function RegExp(pattern: string): RegExp;
->RegExp : Symbol(RegExp, Decl(constructorOverloads5.ts, 2, 19), Decl(constructorOverloads5.ts, 3, 52))
+>RegExp : Symbol(RegExp, Decl(constructorOverloads5.ts, 2, 19), Decl(constructorOverloads5.ts, 3, 52), Decl(constructorOverloads5.ts, 4, 67))
 >pattern : Symbol(pattern, Decl(constructorOverloads5.ts, 3, 27))
->RegExp : Symbol(RegExp, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+>RegExp : Symbol(RegExp, Decl(constructorOverloads5.ts, 2, 19), Decl(constructorOverloads5.ts, 3, 52), Decl(constructorOverloads5.ts, 4, 67))
 
     export function RegExp(pattern: string, flags: string): RegExp;
->RegExp : Symbol(RegExp, Decl(constructorOverloads5.ts, 2, 19), Decl(constructorOverloads5.ts, 3, 52))
+>RegExp : Symbol(RegExp, Decl(constructorOverloads5.ts, 2, 19), Decl(constructorOverloads5.ts, 3, 52), Decl(constructorOverloads5.ts, 4, 67))
 >pattern : Symbol(pattern, Decl(constructorOverloads5.ts, 4, 27))
 >flags : Symbol(flags, Decl(constructorOverloads5.ts, 4, 43))
->RegExp : Symbol(RegExp, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+>RegExp : Symbol(RegExp, Decl(constructorOverloads5.ts, 2, 19), Decl(constructorOverloads5.ts, 3, 52), Decl(constructorOverloads5.ts, 4, 67))
 
     export class RegExp {
->RegExp : Symbol(RegExp, Decl(constructorOverloads5.ts, 4, 67))
+>RegExp : Symbol(RegExp, Decl(constructorOverloads5.ts, 2, 19), Decl(constructorOverloads5.ts, 3, 52), Decl(constructorOverloads5.ts, 4, 67))
 
         constructor(pattern: string);
 >pattern : Symbol(pattern, Decl(constructorOverloads5.ts, 6, 20))
diff --git a/tests/baselines/reference/constructorOverloads5.types b/tests/baselines/reference/constructorOverloads5.types
index 27f5e09e157..69a1d835d5f 100644
--- a/tests/baselines/reference/constructorOverloads5.types
+++ b/tests/baselines/reference/constructorOverloads5.types
@@ -5,16 +5,16 @@
 >M : typeof M
 
     export function RegExp(pattern: string): RegExp;
->RegExp : { (pattern: string): RegExp; (pattern: string, flags: string): RegExp; }
+>RegExp : typeof RegExp
 >pattern : string
 
     export function RegExp(pattern: string, flags: string): RegExp;
->RegExp : { (pattern: string): RegExp; (pattern: string, flags: string): RegExp; }
+>RegExp : typeof RegExp
 >pattern : string
 >flags : string
 
     export class RegExp {
->RegExp : M.RegExp
+>RegExp : RegExp
 
         constructor(pattern: string);
 >pattern : string
diff --git a/tests/baselines/reference/constructorOverloads7.errors.txt b/tests/baselines/reference/constructorOverloads7.errors.txt
index 81aeaaf24ff..c6d2341a9e5 100644
--- a/tests/baselines/reference/constructorOverloads7.errors.txt
+++ b/tests/baselines/reference/constructorOverloads7.errors.txt
@@ -1,25 +1,15 @@
-tests/cases/compiler/constructorOverloads7.ts(1,15): error TS2300: Duplicate identifier 'Point'.
-tests/cases/compiler/constructorOverloads7.ts(7,35): error TS2749: 'Point' refers to a value, but is being used as a type here.
-tests/cases/compiler/constructorOverloads7.ts(8,14): error TS2749: 'Point' refers to a value, but is being used as a type here.
-tests/cases/compiler/constructorOverloads7.ts(15,10): error TS2300: Duplicate identifier 'Point'.
 tests/cases/compiler/constructorOverloads7.ts(22,18): error TS2384: Overload signatures must all be ambient or non-ambient.
 
 
-==== tests/cases/compiler/constructorOverloads7.ts (5 errors) ====
+==== tests/cases/compiler/constructorOverloads7.ts (1 errors) ====
     declare class Point
-                  ~~~~~
-!!! error TS2300: Duplicate identifier 'Point'.
     {
         x: number;
         y: number;
         constructor(x: number, y: number);
     
          add(dx: number, dy: number): Point;
-                                      ~~~~~
-!!! error TS2749: 'Point' refers to a value, but is being used as a type here.
          origin: Point;
-                 ~~~~~
-!!! error TS2749: 'Point' refers to a value, but is being used as a type here.
     
     }
     
@@ -27,8 +17,6 @@ tests/cases/compiler/constructorOverloads7.ts(22,18): error TS2384: Overload sig
     // Because Point is a constructor function, this is inferred
     // to be Point and return type is inferred to be void
     function Point(x, y) {
-             ~~~~~
-!!! error TS2300: Duplicate identifier 'Point'.
         this.x = x;
         this.y = y;
     
diff --git a/tests/baselines/reference/constructorOverloads7.symbols b/tests/baselines/reference/constructorOverloads7.symbols
index fe2d6cb7817..8381d29066d 100644
--- a/tests/baselines/reference/constructorOverloads7.symbols
+++ b/tests/baselines/reference/constructorOverloads7.symbols
@@ -1,6 +1,6 @@
 === tests/cases/compiler/constructorOverloads7.ts ===
 declare class Point
->Point : Symbol(Point, Decl(constructorOverloads7.ts, 0, 0))
+>Point : Symbol(Point, Decl(constructorOverloads7.ts, 9, 1), Decl(constructorOverloads7.ts, 0, 0))
 {
     x: number;
 >x : Symbol(Point.x, Decl(constructorOverloads7.ts, 1, 1))
@@ -16,9 +16,11 @@ declare class Point
 >add : Symbol(Point.add, Decl(constructorOverloads7.ts, 4, 38))
 >dx : Symbol(dx, Decl(constructorOverloads7.ts, 6, 9))
 >dy : Symbol(dy, Decl(constructorOverloads7.ts, 6, 20))
+>Point : Symbol(Point, Decl(constructorOverloads7.ts, 9, 1), Decl(constructorOverloads7.ts, 0, 0))
 
      origin: Point;
 >origin : Symbol(Point.origin, Decl(constructorOverloads7.ts, 6, 40))
+>Point : Symbol(Point, Decl(constructorOverloads7.ts, 9, 1), Decl(constructorOverloads7.ts, 0, 0))
 
 }
 
@@ -26,7 +28,7 @@ declare class Point
 // Because Point is a constructor function, this is inferred
 // to be Point and return type is inferred to be void
 function Point(x, y) {
->Point : Symbol(Point, Decl(constructorOverloads7.ts, 9, 1))
+>Point : Symbol(Point, Decl(constructorOverloads7.ts, 9, 1), Decl(constructorOverloads7.ts, 0, 0))
 >x : Symbol(x, Decl(constructorOverloads7.ts, 14, 15))
 >y : Symbol(y, Decl(constructorOverloads7.ts, 14, 17))
 
diff --git a/tests/baselines/reference/constructorOverloads7.types b/tests/baselines/reference/constructorOverloads7.types
index f5873284d89..360bf6f023f 100644
--- a/tests/baselines/reference/constructorOverloads7.types
+++ b/tests/baselines/reference/constructorOverloads7.types
@@ -13,12 +13,12 @@ declare class Point
 >y : number
 
      add(dx: number, dy: number): Point;
->add : (dx: number, dy: number) => any
+>add : (dx: number, dy: number) => Point
 >dx : number
 >dy : number
 
      origin: Point;
->origin : any
+>origin : Point
 
 }
 
@@ -26,7 +26,7 @@ declare class Point
 // Because Point is a constructor function, this is inferred
 // to be Point and return type is inferred to be void
 function Point(x, y) {
->Point : (x: any, y: any) => any
+>Point : typeof Point
 >x : any
 >y : any
 
diff --git a/tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.errors.txt b/tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.errors.txt
index 684c123ebd7..d4792e6b2d0 100644
--- a/tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.errors.txt
+++ b/tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.errors.txt
@@ -16,11 +16,13 @@ tests/cases/compiler/duplicateIdentifiersAcrossContainerBoundaries.ts(41,16): er
         export function f() { }
                         ~
 !!! error TS2300: Duplicate identifier 'f'.
+!!! related TS6203 tests/cases/compiler/duplicateIdentifiersAcrossContainerBoundaries.ts:12:18: 'f' was also declared here.
     }
     module M {
         export class f { } // error
                      ~
 !!! error TS2300: Duplicate identifier 'f'.
+!!! related TS6203 tests/cases/compiler/duplicateIdentifiersAcrossContainerBoundaries.ts:9:21: 'f' was also declared here.
     }
     
     module M {
diff --git a/tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.symbols b/tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.symbols
index 61fde6458d8..c3e7efaf6e6 100644
--- a/tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.symbols
+++ b/tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.symbols
@@ -16,13 +16,13 @@ module M {
 >M : Symbol(M, Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 0, 0), Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 2, 1), Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 5, 1), Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 9, 1), Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 12, 1) ... and 5 more)
 
     export function f() { }
->f : Symbol(f, Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 7, 10))
+>f : Symbol(f, Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 7, 10), Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 10, 10))
 }
 module M {
 >M : Symbol(M, Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 0, 0), Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 2, 1), Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 5, 1), Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 9, 1), Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 12, 1) ... and 5 more)
 
     export class f { } // error
->f : Symbol(f, Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 10, 10))
+>f : Symbol(f, Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 7, 10), Decl(duplicateIdentifiersAcrossContainerBoundaries.ts, 10, 10))
 }
 
 module M {
diff --git a/tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.types b/tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.types
index bd24ae4ab37..24eb8637e23 100644
--- a/tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.types
+++ b/tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.types
@@ -13,7 +13,7 @@ module M {
 >M : typeof M
 
     export function f() { }
->f : () => void
+>f : typeof f
 }
 module M {
 >M : typeof M
diff --git a/tests/baselines/reference/duplicateIdentifiersAcrossFileBoundaries.symbols b/tests/baselines/reference/duplicateIdentifiersAcrossFileBoundaries.symbols
index 608dfbfc96f..431c87dd383 100644
--- a/tests/baselines/reference/duplicateIdentifiersAcrossFileBoundaries.symbols
+++ b/tests/baselines/reference/duplicateIdentifiersAcrossFileBoundaries.symbols
@@ -6,10 +6,10 @@ class C1 { }
 >C1 : Symbol(C1, Decl(file1.ts, 0, 15), Decl(file2.ts, 0, 11))
 
 class C2 { }
->C2 : Symbol(C2, Decl(file1.ts, 1, 12))
+>C2 : Symbol(C2, Decl(file1.ts, 1, 12), Decl(file2.ts, 1, 16))
 
 function f() { }
->f : Symbol(f, Decl(file1.ts, 2, 12))
+>f : Symbol(f, Decl(file1.ts, 2, 12), Decl(file2.ts, 2, 17))
 
 var v = 3;
 >v : Symbol(v, Decl(file1.ts, 4, 3), Decl(file2.ts, 4, 3))
@@ -40,10 +40,10 @@ interface C1 { } // error -- cannot merge interface with non-ambient class
 >C1 : Symbol(C1, Decl(file1.ts, 0, 15), Decl(file2.ts, 0, 11))
 
 function C2() { } // error -- cannot merge function with non-ambient class
->C2 : Symbol(C2, Decl(file2.ts, 1, 16))
+>C2 : Symbol(C2, Decl(file1.ts, 1, 12), Decl(file2.ts, 1, 16))
 
 class f { } // error -- cannot merge function with non-ambient class
->f : Symbol(f, Decl(file2.ts, 2, 17))
+>f : Symbol(f, Decl(file1.ts, 2, 12), Decl(file2.ts, 2, 17))
 
 var v = 3;
 >v : Symbol(v, Decl(file1.ts, 4, 3), Decl(file2.ts, 4, 3))
diff --git a/tests/baselines/reference/duplicateIdentifiersAcrossFileBoundaries.types b/tests/baselines/reference/duplicateIdentifiersAcrossFileBoundaries.types
index e4da45b1873..9449853ee2a 100644
--- a/tests/baselines/reference/duplicateIdentifiersAcrossFileBoundaries.types
+++ b/tests/baselines/reference/duplicateIdentifiersAcrossFileBoundaries.types
@@ -7,7 +7,7 @@ class C2 { }
 >C2 : C2
 
 function f() { }
->f : () => void
+>f : typeof f
 
 var v = 3;
 >v : number
@@ -37,7 +37,7 @@ class I { } // error -- cannot merge interface with non-ambient class
 
 interface C1 { } // error -- cannot merge interface with non-ambient class
 function C2() { } // error -- cannot merge function with non-ambient class
->C2 : () => void
+>C2 : typeof C2
 
 class f { } // error -- cannot merge function with non-ambient class
 >f : f
diff --git a/tests/baselines/reference/es6ClassTest9.errors.txt b/tests/baselines/reference/es6ClassTest9.errors.txt
index 21d9fccc2e5..de13f242bff 100644
--- a/tests/baselines/reference/es6ClassTest9.errors.txt
+++ b/tests/baselines/reference/es6ClassTest9.errors.txt
@@ -1,18 +1,12 @@
-tests/cases/compiler/es6ClassTest9.ts(1,15): error TS2300: Duplicate identifier 'foo'.
 tests/cases/compiler/es6ClassTest9.ts(1,18): error TS1005: '{' expected.
 tests/cases/compiler/es6ClassTest9.ts(1,19): error TS1109: Expression expected.
-tests/cases/compiler/es6ClassTest9.ts(2,10): error TS2300: Duplicate identifier 'foo'.
 
 
-==== tests/cases/compiler/es6ClassTest9.ts (4 errors) ====
+==== tests/cases/compiler/es6ClassTest9.ts (2 errors) ====
     declare class foo();
-                  ~~~
-!!! error TS2300: Duplicate identifier 'foo'.
                      ~
 !!! error TS1005: '{' expected.
                       ~
 !!! error TS1109: Expression expected.
     function foo() {}
-             ~~~
-!!! error TS2300: Duplicate identifier 'foo'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/es6ClassTest9.symbols b/tests/baselines/reference/es6ClassTest9.symbols
index 03deef02379..7b362f29e48 100644
--- a/tests/baselines/reference/es6ClassTest9.symbols
+++ b/tests/baselines/reference/es6ClassTest9.symbols
@@ -1,7 +1,7 @@
 === tests/cases/compiler/es6ClassTest9.ts ===
 declare class foo();
->foo : Symbol(foo, Decl(es6ClassTest9.ts, 0, 0))
+>foo : Symbol(foo, Decl(es6ClassTest9.ts, 0, 20), Decl(es6ClassTest9.ts, 0, 0))
 
 function foo() {}
->foo : Symbol(foo, Decl(es6ClassTest9.ts, 0, 20))
+>foo : Symbol(foo, Decl(es6ClassTest9.ts, 0, 20), Decl(es6ClassTest9.ts, 0, 0))
 
diff --git a/tests/baselines/reference/es6ClassTest9.types b/tests/baselines/reference/es6ClassTest9.types
index 47b80cffcfa..c3872cc05c0 100644
--- a/tests/baselines/reference/es6ClassTest9.types
+++ b/tests/baselines/reference/es6ClassTest9.types
@@ -5,5 +5,5 @@ declare class foo();
 > : any
 
 function foo() {}
->foo : () => void
+>foo : typeof foo
 
diff --git a/tests/baselines/reference/funClodule.errors.txt b/tests/baselines/reference/funClodule.errors.txt
index c55e7391bfe..a86c3ed89bf 100644
--- a/tests/baselines/reference/funClodule.errors.txt
+++ b/tests/baselines/reference/funClodule.errors.txt
@@ -1,46 +1,37 @@
-tests/cases/compiler/funClodule.ts(1,18): error TS2300: Duplicate identifier 'foo'.
-tests/cases/compiler/funClodule.ts(2,16): error TS2300: Duplicate identifier 'foo'.
-tests/cases/compiler/funClodule.ts(5,15): error TS2300: Duplicate identifier 'foo'.
-tests/cases/compiler/funClodule.ts(8,15): error TS2300: Duplicate identifier 'foo2'.
-tests/cases/compiler/funClodule.ts(12,18): error TS2300: Duplicate identifier 'foo2'.
 tests/cases/compiler/funClodule.ts(15,10): error TS2300: Duplicate identifier 'foo3'.
 tests/cases/compiler/funClodule.ts(16,8): error TS2300: Duplicate identifier 'foo3'.
 tests/cases/compiler/funClodule.ts(19,7): error TS2300: Duplicate identifier 'foo3'.
 
 
-==== tests/cases/compiler/funClodule.ts (8 errors) ====
+==== tests/cases/compiler/funClodule.ts (3 errors) ====
     declare function foo();
-                     ~~~
-!!! error TS2300: Duplicate identifier 'foo'.
     declare module foo {
-                   ~~~
-!!! error TS2300: Duplicate identifier 'foo'.
         export function x(): any;
     }
     declare class foo { } // Should error
-                  ~~~
-!!! error TS2300: Duplicate identifier 'foo'.
     
     
     declare class foo2 { }
-                  ~~~~
-!!! error TS2300: Duplicate identifier 'foo2'.
     declare module foo2 {
         export function x(): any;
     }
     declare function foo2(); // Should error
-                     ~~~~
-!!! error TS2300: Duplicate identifier 'foo2'.
     
     
     function foo3() { }
              ~~~~
 !!! error TS2300: Duplicate identifier 'foo3'.
+!!! related TS6203 tests/cases/compiler/funClodule.ts:16:8: 'foo3' was also declared here.
+!!! related TS6204 tests/cases/compiler/funClodule.ts:19:7: and here.
     module foo3 {
            ~~~~
 !!! error TS2300: Duplicate identifier 'foo3'.
+!!! related TS6203 tests/cases/compiler/funClodule.ts:15:10: 'foo3' was also declared here.
+!!! related TS6204 tests/cases/compiler/funClodule.ts:19:7: and here.
          export function x(): any { }
     }
     class foo3 { } // Should error
           ~~~~
-!!! error TS2300: Duplicate identifier 'foo3'.
\ No newline at end of file
+!!! error TS2300: Duplicate identifier 'foo3'.
+!!! related TS6203 tests/cases/compiler/funClodule.ts:15:10: 'foo3' was also declared here.
+!!! related TS6204 tests/cases/compiler/funClodule.ts:16:8: and here.
\ No newline at end of file
diff --git a/tests/baselines/reference/funClodule.symbols b/tests/baselines/reference/funClodule.symbols
index 4e342b4bac3..83f7ff12beb 100644
--- a/tests/baselines/reference/funClodule.symbols
+++ b/tests/baselines/reference/funClodule.symbols
@@ -1,39 +1,39 @@
 === tests/cases/compiler/funClodule.ts ===
 declare function foo();
->foo : Symbol(foo, Decl(funClodule.ts, 0, 0), Decl(funClodule.ts, 0, 23))
+>foo : Symbol(foo, Decl(funClodule.ts, 0, 0), Decl(funClodule.ts, 0, 23), Decl(funClodule.ts, 3, 1))
 
 declare module foo {
->foo : Symbol(foo, Decl(funClodule.ts, 0, 0), Decl(funClodule.ts, 0, 23))
+>foo : Symbol(foo, Decl(funClodule.ts, 0, 0), Decl(funClodule.ts, 0, 23), Decl(funClodule.ts, 3, 1))
 
     export function x(): any;
 >x : Symbol(x, Decl(funClodule.ts, 1, 20))
 }
 declare class foo { } // Should error
->foo : Symbol(foo, Decl(funClodule.ts, 3, 1))
+>foo : Symbol(foo, Decl(funClodule.ts, 0, 0), Decl(funClodule.ts, 0, 23), Decl(funClodule.ts, 3, 1))
 
 
 declare class foo2 { }
->foo2 : Symbol(foo2, Decl(funClodule.ts, 4, 21))
+>foo2 : Symbol(foo2, Decl(funClodule.ts, 10, 1), Decl(funClodule.ts, 4, 21), Decl(funClodule.ts, 7, 22))
 
 declare module foo2 {
->foo2 : Symbol(foo2, Decl(funClodule.ts, 10, 1), Decl(funClodule.ts, 7, 22))
+>foo2 : Symbol(foo2, Decl(funClodule.ts, 10, 1), Decl(funClodule.ts, 4, 21), Decl(funClodule.ts, 7, 22))
 
     export function x(): any;
 >x : Symbol(x, Decl(funClodule.ts, 8, 21))
 }
 declare function foo2(); // Should error
->foo2 : Symbol(foo2, Decl(funClodule.ts, 10, 1), Decl(funClodule.ts, 7, 22))
+>foo2 : Symbol(foo2, Decl(funClodule.ts, 10, 1), Decl(funClodule.ts, 4, 21), Decl(funClodule.ts, 7, 22))
 
 
 function foo3() { }
->foo3 : Symbol(foo3, Decl(funClodule.ts, 11, 24), Decl(funClodule.ts, 14, 19))
+>foo3 : Symbol(foo3, Decl(funClodule.ts, 11, 24), Decl(funClodule.ts, 14, 19), Decl(funClodule.ts, 17, 1))
 
 module foo3 {
->foo3 : Symbol(foo3, Decl(funClodule.ts, 11, 24), Decl(funClodule.ts, 14, 19))
+>foo3 : Symbol(foo3, Decl(funClodule.ts, 11, 24), Decl(funClodule.ts, 14, 19), Decl(funClodule.ts, 17, 1))
 
      export function x(): any { }
 >x : Symbol(x, Decl(funClodule.ts, 15, 13))
 }
 class foo3 { } // Should error
->foo3 : Symbol(foo3, Decl(funClodule.ts, 17, 1))
+>foo3 : Symbol(foo3, Decl(funClodule.ts, 11, 24), Decl(funClodule.ts, 14, 19), Decl(funClodule.ts, 17, 1))
 
diff --git a/tests/baselines/reference/getAccessorWithImpliedReturnTypeAndFunctionClassMerge.errors.txt b/tests/baselines/reference/getAccessorWithImpliedReturnTypeAndFunctionClassMerge.errors.txt
index e7ceb8acea2..7ec8f614edb 100644
--- a/tests/baselines/reference/getAccessorWithImpliedReturnTypeAndFunctionClassMerge.errors.txt
+++ b/tests/baselines/reference/getAccessorWithImpliedReturnTypeAndFunctionClassMerge.errors.txt
@@ -1,27 +1,11 @@
-tests/cases/compiler/getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts(1,18): error TS2300: Duplicate identifier '_'.
-tests/cases/compiler/getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts(1,41): error TS2709: Cannot use namespace '_' as a type.
-tests/cases/compiler/getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts(2,18): error TS2300: Duplicate identifier '_'.
-tests/cases/compiler/getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts(2,34): error TS2709: Cannot use namespace '_' as a type.
-tests/cases/compiler/getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts(4,16): error TS2300: Duplicate identifier '_'.
-tests/cases/compiler/getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts(15,15): error TS2300: Duplicate identifier '_'.
 tests/cases/compiler/getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts(21,20): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 
 
-==== tests/cases/compiler/getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts (7 errors) ====
+==== tests/cases/compiler/getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts (1 errors) ====
     declare function _<T>(value: Array<T>): _<T>;
-                     ~
-!!! error TS2300: Duplicate identifier '_'.
-                                            ~
-!!! error TS2709: Cannot use namespace '_' as a type.
     declare function _<T>(value: T): _<T>;
-                     ~
-!!! error TS2300: Duplicate identifier '_'.
-                                     ~
-!!! error TS2709: Cannot use namespace '_' as a type.
     
     declare module _ {
-                   ~
-!!! error TS2300: Duplicate identifier '_'.
         export function each<T>(
             //list: List<T>,
             //iterator: ListIterator<T, void>,
@@ -33,8 +17,6 @@ tests/cases/compiler/getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts(21
     }
     
     declare class _<T> {
-                  ~
-!!! error TS2300: Duplicate identifier '_'.
         each(iterator: _.ListIterator<T, void>, context?: any): void;
     }
     
diff --git a/tests/baselines/reference/getAccessorWithImpliedReturnTypeAndFunctionClassMerge.symbols b/tests/baselines/reference/getAccessorWithImpliedReturnTypeAndFunctionClassMerge.symbols
index 39516807c4d..68ec0b7989c 100644
--- a/tests/baselines/reference/getAccessorWithImpliedReturnTypeAndFunctionClassMerge.symbols
+++ b/tests/baselines/reference/getAccessorWithImpliedReturnTypeAndFunctionClassMerge.symbols
@@ -1,21 +1,23 @@
 === tests/cases/compiler/getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts ===
 declare function _<T>(value: Array<T>): _<T>;
->_ : Symbol(_, Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 0, 0), Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 0, 45), Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 1, 38))
+>_ : Symbol(_, Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 0, 0), Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 0, 45), Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 1, 38), Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 12, 1))
 >T : Symbol(T, Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 0, 19))
 >value : Symbol(value, Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 0, 22))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 >T : Symbol(T, Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 0, 19))
+>_ : Symbol(_, Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 0, 0), Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 0, 45), Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 1, 38), Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 12, 1))
 >T : Symbol(T, Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 0, 19))
 
 declare function _<T>(value: T): _<T>;
->_ : Symbol(_, Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 0, 0), Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 0, 45), Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 1, 38))
+>_ : Symbol(_, Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 0, 0), Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 0, 45), Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 1, 38), Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 12, 1))
 >T : Symbol(T, Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 1, 19))
 >value : Symbol(value, Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 1, 22))
 >T : Symbol(T, Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 1, 19))
+>_ : Symbol(_, Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 0, 0), Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 0, 45), Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 1, 38), Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 12, 1))
 >T : Symbol(T, Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 1, 19))
 
 declare module _ {
->_ : Symbol(_, Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 0, 0), Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 0, 45), Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 1, 38))
+>_ : Symbol(_, Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 0, 0), Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 0, 45), Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 1, 38), Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 12, 1))
 
     export function each<T>(
 >each : Symbol(each, Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 3, 18))
@@ -42,13 +44,13 @@ declare module _ {
 }
 
 declare class _<T> {
->_ : Symbol(_, Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 12, 1))
+>_ : Symbol(_, Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 0, 0), Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 0, 45), Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 1, 38), Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 12, 1))
 >T : Symbol(T, Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 14, 16))
 
     each(iterator: _.ListIterator<T, void>, context?: any): void;
 >each : Symbol(_.each, Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 14, 20))
 >iterator : Symbol(iterator, Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 15, 9))
->_ : Symbol(_, Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 0, 0), Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 0, 45), Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 1, 38))
+>_ : Symbol(_, Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 0, 0), Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 0, 45), Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 1, 38), Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 12, 1))
 >ListIterator : Symbol(_.ListIterator, Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 7, 29))
 >T : Symbol(T, Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 14, 16))
 >context : Symbol(context, Decl(getAccessorWithImpliedReturnTypeAndFunctionClassMerge.ts, 15, 43))
diff --git a/tests/baselines/reference/multipleDefaultExports01.errors.txt b/tests/baselines/reference/multipleDefaultExports01.errors.txt
index 8500a542aa7..37865bc30e0 100644
--- a/tests/baselines/reference/multipleDefaultExports01.errors.txt
+++ b/tests/baselines/reference/multipleDefaultExports01.errors.txt
@@ -1,21 +1,31 @@
+tests/cases/conformance/es6/modules/m1.ts(1,22): error TS2300: Duplicate identifier 'default'.
+tests/cases/conformance/es6/modules/m1.ts(1,22): error TS2323: Cannot redeclare exported variable 'default'.
 tests/cases/conformance/es6/modules/m1.ts(1,22): error TS2528: A module cannot have multiple default exports.
-tests/cases/conformance/es6/modules/m1.ts(5,25): error TS2528: A module cannot have multiple default exports.
+tests/cases/conformance/es6/modules/m1.ts(5,25): error TS2300: Duplicate identifier 'default'.
+tests/cases/conformance/es6/modules/m1.ts(5,25): error TS2323: Cannot redeclare exported variable 'default'.
 tests/cases/conformance/es6/modules/m1.ts(5,25): error TS2528: A module cannot have multiple default exports.
 tests/cases/conformance/es6/modules/m1.ts(10,16): error TS2528: A module cannot have multiple default exports.
 
 
-==== tests/cases/conformance/es6/modules/m1.ts (4 errors) ====
+==== tests/cases/conformance/es6/modules/m1.ts (7 errors) ====
     export default class foo {
                          ~~~
+!!! error TS2300: Duplicate identifier 'default'.
+!!! related TS6203 tests/cases/conformance/es6/modules/m1.ts:5:25: 'default' was also declared here.
+                         ~~~
+!!! error TS2323: Cannot redeclare exported variable 'default'.
+                         ~~~
 !!! error TS2528: A module cannot have multiple default exports.
-!!! related TS2752 tests/cases/conformance/es6/modules/m1.ts:5:25: The first export default is here.
+!!! related TS6204 tests/cases/conformance/es6/modules/m1.ts:10:16: and here.
     
     }
     
     export default function bar() {
                             ~~~
-!!! error TS2528: A module cannot have multiple default exports.
-!!! related TS2753 tests/cases/conformance/es6/modules/m1.ts:1:22: Another export default is here.
+!!! error TS2300: Duplicate identifier 'default'.
+!!! related TS6203 tests/cases/conformance/es6/modules/m1.ts:1:22: 'default' was also declared here.
+                            ~~~
+!!! error TS2323: Cannot redeclare exported variable 'default'.
                             ~~~
 !!! error TS2528: A module cannot have multiple default exports.
 !!! related TS2753 tests/cases/conformance/es6/modules/m1.ts:10:16: Another export default is here.
@@ -27,6 +37,7 @@ tests/cases/conformance/es6/modules/m1.ts(10,16): error TS2528: A module cannot
                    ~
 !!! error TS2528: A module cannot have multiple default exports.
 !!! related TS2752 tests/cases/conformance/es6/modules/m1.ts:5:25: The first export default is here.
+!!! related TS2752 tests/cases/conformance/es6/modules/m1.ts:1:22: The first export default is here.
     
 ==== tests/cases/conformance/es6/modules/m2.ts (0 errors) ====
     import Entity from "./m1"
diff --git a/tests/baselines/reference/multipleDefaultExports01.symbols b/tests/baselines/reference/multipleDefaultExports01.symbols
index 8336963df9b..f8565768b72 100644
--- a/tests/baselines/reference/multipleDefaultExports01.symbols
+++ b/tests/baselines/reference/multipleDefaultExports01.symbols
@@ -1,11 +1,11 @@
 === tests/cases/conformance/es6/modules/m1.ts ===
 export default class foo {
->foo : Symbol(foo, Decl(m1.ts, 0, 0))
+>foo : Symbol(bar, Decl(m1.ts, 2, 1), Decl(m1.ts, 0, 0))
 
 }
 
 export default function bar() {
->bar : Symbol(bar, Decl(m1.ts, 2, 1))
+>bar : Symbol(bar, Decl(m1.ts, 2, 1), Decl(m1.ts, 0, 0))
 
 }
 
diff --git a/tests/baselines/reference/multipleDefaultExports01.types b/tests/baselines/reference/multipleDefaultExports01.types
index 3b34a7a5cc8..58c89d0609b 100644
--- a/tests/baselines/reference/multipleDefaultExports01.types
+++ b/tests/baselines/reference/multipleDefaultExports01.types
@@ -1,11 +1,11 @@
 === tests/cases/conformance/es6/modules/m1.ts ===
 export default class foo {
->foo : import("tests/cases/conformance/es6/modules/m1").default
+>foo : bar
 
 }
 
 export default function bar() {
->bar : () => void
+>bar : typeof bar
 
 }
 
@@ -18,9 +18,9 @@ export default x;
 
 === tests/cases/conformance/es6/modules/m2.ts ===
 import Entity from "./m1"
->Entity : () => void
+>Entity : typeof Entity
 
 Entity();
 >Entity() : void
->Entity : () => void
+>Entity : typeof Entity
 
diff --git a/tests/baselines/reference/multipleExportDefault5.errors.txt b/tests/baselines/reference/multipleExportDefault5.errors.txt
index f846248bf38..b03ba7f7ac6 100644
--- a/tests/baselines/reference/multipleExportDefault5.errors.txt
+++ b/tests/baselines/reference/multipleExportDefault5.errors.txt
@@ -1,13 +1,19 @@
-tests/cases/conformance/externalModules/multipleExportDefault5.ts(1,25): error TS2528: A module cannot have multiple default exports.
-tests/cases/conformance/externalModules/multipleExportDefault5.ts(2,22): error TS2528: A module cannot have multiple default exports.
+tests/cases/conformance/externalModules/multipleExportDefault5.ts(1,25): error TS2300: Duplicate identifier 'default'.
+tests/cases/conformance/externalModules/multipleExportDefault5.ts(1,25): error TS2323: Cannot redeclare exported variable 'default'.
+tests/cases/conformance/externalModules/multipleExportDefault5.ts(2,22): error TS2300: Duplicate identifier 'default'.
+tests/cases/conformance/externalModules/multipleExportDefault5.ts(2,22): error TS2323: Cannot redeclare exported variable 'default'.
 
 
-==== tests/cases/conformance/externalModules/multipleExportDefault5.ts (2 errors) ====
+==== tests/cases/conformance/externalModules/multipleExportDefault5.ts (4 errors) ====
     export default function bar() { }
                             ~~~
-!!! error TS2528: A module cannot have multiple default exports.
-!!! related TS2753 tests/cases/conformance/externalModules/multipleExportDefault5.ts:2:22: Another export default is here.
+!!! error TS2300: Duplicate identifier 'default'.
+!!! related TS6203 tests/cases/conformance/externalModules/multipleExportDefault5.ts:2:22: 'default' was also declared here.
+                            ~~~
+!!! error TS2323: Cannot redeclare exported variable 'default'.
     export default class C {}
                          ~
-!!! error TS2528: A module cannot have multiple default exports.
-!!! related TS2752 tests/cases/conformance/externalModules/multipleExportDefault5.ts:1:25: The first export default is here.
\ No newline at end of file
+!!! error TS2300: Duplicate identifier 'default'.
+!!! related TS6203 tests/cases/conformance/externalModules/multipleExportDefault5.ts:1:25: 'default' was also declared here.
+                         ~
+!!! error TS2323: Cannot redeclare exported variable 'default'.
\ No newline at end of file
diff --git a/tests/baselines/reference/multipleExportDefault5.symbols b/tests/baselines/reference/multipleExportDefault5.symbols
index 56f6fd335e8..91f90c4783a 100644
--- a/tests/baselines/reference/multipleExportDefault5.symbols
+++ b/tests/baselines/reference/multipleExportDefault5.symbols
@@ -1,7 +1,7 @@
 === tests/cases/conformance/externalModules/multipleExportDefault5.ts ===
 export default function bar() { }
->bar : Symbol(bar, Decl(multipleExportDefault5.ts, 0, 0))
+>bar : Symbol(bar, Decl(multipleExportDefault5.ts, 0, 0), Decl(multipleExportDefault5.ts, 0, 33))
 
 export default class C {}
->C : Symbol(C, Decl(multipleExportDefault5.ts, 0, 33))
+>C : Symbol(bar, Decl(multipleExportDefault5.ts, 0, 0), Decl(multipleExportDefault5.ts, 0, 33))
 
diff --git a/tests/baselines/reference/multipleExportDefault5.types b/tests/baselines/reference/multipleExportDefault5.types
index ab7b3ed9b0c..aaada9ea28a 100644
--- a/tests/baselines/reference/multipleExportDefault5.types
+++ b/tests/baselines/reference/multipleExportDefault5.types
@@ -1,7 +1,7 @@
 === tests/cases/conformance/externalModules/multipleExportDefault5.ts ===
 export default function bar() { }
->bar : () => void
+>bar : typeof bar
 
 export default class C {}
->C : import("tests/cases/conformance/externalModules/multipleExportDefault5").default
+>C : bar
 
diff --git a/tests/baselines/reference/nameCollisions.errors.txt b/tests/baselines/reference/nameCollisions.errors.txt
index 6a7e1114aa2..484444226b4 100644
--- a/tests/baselines/reference/nameCollisions.errors.txt
+++ b/tests/baselines/reference/nameCollisions.errors.txt
@@ -67,16 +67,20 @@ tests/cases/compiler/nameCollisions.ts(37,11): error TS2300: Duplicate identifie
         class C { }
               ~
 !!! error TS2300: Duplicate identifier 'C'.
+!!! related TS6203 tests/cases/compiler/nameCollisions.ts:34:14: 'C' was also declared here.
         function C() { } // error
                  ~
 !!! error TS2300: Duplicate identifier 'C'.
+!!! related TS6203 tests/cases/compiler/nameCollisions.ts:33:11: 'C' was also declared here.
     
         function C2() { }
                  ~~
 !!! error TS2300: Duplicate identifier 'C2'.
+!!! related TS6203 tests/cases/compiler/nameCollisions.ts:37:11: 'C2' was also declared here.
         class C2 { } // error
               ~~
 !!! error TS2300: Duplicate identifier 'C2'.
+!!! related TS6203 tests/cases/compiler/nameCollisions.ts:36:14: 'C2' was also declared here.
     
         function fi() { }
         interface fi { } // ok
diff --git a/tests/baselines/reference/nameCollisions.symbols b/tests/baselines/reference/nameCollisions.symbols
index 414d074a717..aabbefd6b7a 100644
--- a/tests/baselines/reference/nameCollisions.symbols
+++ b/tests/baselines/reference/nameCollisions.symbols
@@ -60,16 +60,16 @@ module T {
 >i : Symbol(i, Decl(nameCollisions.ts, 29, 7), Decl(nameCollisions.ts, 29, 10))
 
     class C { }
->C : Symbol(C, Decl(nameCollisions.ts, 30, 19))
+>C : Symbol(C, Decl(nameCollisions.ts, 32, 15), Decl(nameCollisions.ts, 30, 19))
 
     function C() { } // error
->C : Symbol(C, Decl(nameCollisions.ts, 32, 15))
+>C : Symbol(C, Decl(nameCollisions.ts, 32, 15), Decl(nameCollisions.ts, 30, 19))
 
     function C2() { }
->C2 : Symbol(C2, Decl(nameCollisions.ts, 33, 20))
+>C2 : Symbol(C2, Decl(nameCollisions.ts, 33, 20), Decl(nameCollisions.ts, 35, 21))
 
     class C2 { } // error
->C2 : Symbol(C2, Decl(nameCollisions.ts, 35, 21))
+>C2 : Symbol(C2, Decl(nameCollisions.ts, 33, 20), Decl(nameCollisions.ts, 35, 21))
 
     function fi() { }
 >fi : Symbol(fi, Decl(nameCollisions.ts, 36, 16), Decl(nameCollisions.ts, 38, 21))
diff --git a/tests/baselines/reference/nameCollisions.types b/tests/baselines/reference/nameCollisions.types
index e4eae83a915..3ab39ae08b0 100644
--- a/tests/baselines/reference/nameCollisions.types
+++ b/tests/baselines/reference/nameCollisions.types
@@ -62,10 +62,10 @@ module T {
 >C : C
 
     function C() { } // error
->C : () => void
+>C : typeof C
 
     function C2() { }
->C2 : () => void
+>C2 : typeof C2
 
     class C2 { } // error
 >C2 : C2
diff --git a/tests/baselines/reference/staticClassMemberError.errors.txt b/tests/baselines/reference/staticClassMemberError.errors.txt
index 43a2cd6934d..b82eb78b1d6 100644
--- a/tests/baselines/reference/staticClassMemberError.errors.txt
+++ b/tests/baselines/reference/staticClassMemberError.errors.txt
@@ -18,10 +18,12 @@ tests/cases/compiler/staticClassMemberError.ts(10,7): error TS2300: Duplicate id
     function Foo();
              ~~~
 !!! error TS2300: Duplicate identifier 'Foo'.
+!!! related TS6203 tests/cases/compiler/staticClassMemberError.ts:10:7: 'Foo' was also declared here.
              ~~~
 !!! error TS2391: Function implementation is missing or not immediately following the declaration.
     class Foo {
           ~~~
 !!! error TS2300: Duplicate identifier 'Foo'.
+!!! related TS6203 tests/cases/compiler/staticClassMemberError.ts:9:10: 'Foo' was also declared here.
      static bar;
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/staticClassMemberError.symbols b/tests/baselines/reference/staticClassMemberError.symbols
index ec11f50bb03..e70f26e7d5a 100644
--- a/tests/baselines/reference/staticClassMemberError.symbols
+++ b/tests/baselines/reference/staticClassMemberError.symbols
@@ -14,10 +14,10 @@ class C {
 
 // just want to make sure this one doesn't crash the compiler
 function Foo();
->Foo : Symbol(Foo, Decl(staticClassMemberError.ts, 5, 1))
+>Foo : Symbol(Foo, Decl(staticClassMemberError.ts, 5, 1), Decl(staticClassMemberError.ts, 8, 15))
 
 class Foo {
->Foo : Symbol(Foo, Decl(staticClassMemberError.ts, 8, 15))
+>Foo : Symbol(Foo, Decl(staticClassMemberError.ts, 5, 1), Decl(staticClassMemberError.ts, 8, 15))
 
  static bar;
 >bar : Symbol(Foo.bar, Decl(staticClassMemberError.ts, 9, 11))
diff --git a/tests/baselines/reference/staticClassMemberError.types b/tests/baselines/reference/staticClassMemberError.types
index d3ff5ca1c67..ae2d778aaf0 100644
--- a/tests/baselines/reference/staticClassMemberError.types
+++ b/tests/baselines/reference/staticClassMemberError.types
@@ -17,7 +17,7 @@ class C {
 
 // just want to make sure this one doesn't crash the compiler
 function Foo();
->Foo : () => any
+>Foo : typeof Foo
 
 class Foo {
 >Foo : Foo
diff --git a/tests/baselines/reference/targetTypeTest1.errors.txt b/tests/baselines/reference/targetTypeTest1.errors.txt
index 03a4f0018b3..8ba9f0981f3 100644
--- a/tests/baselines/reference/targetTypeTest1.errors.txt
+++ b/tests/baselines/reference/targetTypeTest1.errors.txt
@@ -1,26 +1,14 @@
-tests/cases/compiler/targetTypeTest1.ts(1,15): error TS2300: Duplicate identifier 'Point'.
-tests/cases/compiler/targetTypeTest1.ts(6,43): error TS2709: Cannot use namespace 'Point' as a type.
-tests/cases/compiler/targetTypeTest1.ts(7,22): error TS2709: Cannot use namespace 'Point' as a type.
-tests/cases/compiler/targetTypeTest1.ts(14,10): error TS2300: Duplicate identifier 'Point'.
 tests/cases/compiler/targetTypeTest1.ts(19,18): error TS2384: Overload signatures must all be ambient or non-ambient.
-tests/cases/compiler/targetTypeTest1.ts(53,15): error TS2300: Duplicate identifier 'C'.
-tests/cases/compiler/targetTypeTest1.ts(60,10): error TS2300: Duplicate identifier 'C'.
 
 
-==== tests/cases/compiler/targetTypeTest1.ts (7 errors) ====
+==== tests/cases/compiler/targetTypeTest1.ts (1 errors) ====
     declare class Point
-                  ~~~~~
-!!! error TS2300: Duplicate identifier 'Point'.
     {
           constructor(x: number, y: number);
           public x: number;
           public y: number;
           public add(dx: number, dy: number): Point;
-                                              ~~~~~
-!!! error TS2709: Cannot use namespace 'Point' as a type.
           static origin: Point;
-                         ~~~~~
-!!! error TS2709: Cannot use namespace 'Point' as a type.
     
     }
     
@@ -28,8 +16,6 @@ tests/cases/compiler/targetTypeTest1.ts(60,10): error TS2300: Duplicate identifi
     // Because Point is a constructor function, this is inferred
     // to be Point and return type is inferred to be void
     function Point(x, y) {
-             ~~~~~
-!!! error TS2300: Duplicate identifier 'Point'.
         this.x = x;
         this.y = y;
     }
@@ -71,8 +57,6 @@ tests/cases/compiler/targetTypeTest1.ts(60,10): error TS2300: Duplicate identifi
     }
     
     declare class C {
-                  ~
-!!! error TS2300: Duplicate identifier 'C'.
         constructor(a:number, b:number);
     	public a : number;
     	public b: number;    
@@ -80,8 +64,6 @@ tests/cases/compiler/targetTypeTest1.ts(60,10): error TS2300: Duplicate identifi
     } 
     
     function C(a,b) {
-             ~
-!!! error TS2300: Duplicate identifier 'C'.
     	this.a=a;
     	this.b=b;
     }
diff --git a/tests/baselines/reference/targetTypeTest1.symbols b/tests/baselines/reference/targetTypeTest1.symbols
index 9bbad1ef89a..cb96adec2e3 100644
--- a/tests/baselines/reference/targetTypeTest1.symbols
+++ b/tests/baselines/reference/targetTypeTest1.symbols
@@ -1,6 +1,6 @@
 === tests/cases/compiler/targetTypeTest1.ts ===
 declare class Point
->Point : Symbol(Point, Decl(targetTypeTest1.ts, 0, 0))
+>Point : Symbol(Point, Decl(targetTypeTest1.ts, 8, 1), Decl(targetTypeTest1.ts, 0, 0), Decl(targetTypeTest1.ts, 22, 17))
 {
       constructor(x: number, y: number);
 >x : Symbol(x, Decl(targetTypeTest1.ts, 2, 18))
@@ -16,9 +16,11 @@ declare class Point
 >add : Symbol(Point.add, Decl(targetTypeTest1.ts, 4, 23))
 >dx : Symbol(dx, Decl(targetTypeTest1.ts, 5, 17))
 >dy : Symbol(dy, Decl(targetTypeTest1.ts, 5, 28))
+>Point : Symbol(Point, Decl(targetTypeTest1.ts, 8, 1), Decl(targetTypeTest1.ts, 0, 0), Decl(targetTypeTest1.ts, 22, 17))
 
       static origin: Point;
->origin : Symbol(Point.origin, Decl(targetTypeTest1.ts, 5, 48))
+>origin : Symbol(Point.origin, Decl(targetTypeTest1.ts, 5, 48), Decl(targetTypeTest1.ts, 22, 17))
+>Point : Symbol(Point, Decl(targetTypeTest1.ts, 8, 1), Decl(targetTypeTest1.ts, 0, 0), Decl(targetTypeTest1.ts, 22, 17))
 
 }
 
@@ -26,7 +28,7 @@ declare class Point
 // Because Point is a constructor function, this is inferred
 // to be Point and return type is inferred to be void
 function Point(x, y) {
->Point : Symbol(Point, Decl(targetTypeTest1.ts, 8, 1), Decl(targetTypeTest1.ts, 22, 17))
+>Point : Symbol(Point, Decl(targetTypeTest1.ts, 8, 1), Decl(targetTypeTest1.ts, 0, 0), Decl(targetTypeTest1.ts, 22, 17))
 >x : Symbol(x, Decl(targetTypeTest1.ts, 13, 15))
 >y : Symbol(y, Decl(targetTypeTest1.ts, 13, 17))
 
@@ -55,23 +57,25 @@ var x = EF1(1,2);
 
 // Point.origin declared as type Point
 Point.origin = new Point(0, 0);
->Point.origin : Symbol(Point.origin, Decl(targetTypeTest1.ts, 22, 17))
->Point : Symbol(Point, Decl(targetTypeTest1.ts, 8, 1), Decl(targetTypeTest1.ts, 22, 17))
->origin : Symbol(Point.origin, Decl(targetTypeTest1.ts, 22, 17))
->Point : Symbol(Point, Decl(targetTypeTest1.ts, 8, 1), Decl(targetTypeTest1.ts, 22, 17))
+>Point.origin : Symbol(Point.origin, Decl(targetTypeTest1.ts, 5, 48), Decl(targetTypeTest1.ts, 22, 17))
+>Point : Symbol(Point, Decl(targetTypeTest1.ts, 8, 1), Decl(targetTypeTest1.ts, 0, 0), Decl(targetTypeTest1.ts, 22, 17))
+>origin : Symbol(Point.origin, Decl(targetTypeTest1.ts, 5, 48), Decl(targetTypeTest1.ts, 22, 17))
+>Point : Symbol(Point, Decl(targetTypeTest1.ts, 8, 1), Decl(targetTypeTest1.ts, 0, 0), Decl(targetTypeTest1.ts, 22, 17))
 
 // Point.prototype declared as type Point
 // this inferred as Point because of obj.prop assignment
 // dx, dy, and return type inferred using target typing
 Point.prototype.add = function(dx, dy) {
->Point.prototype : Symbol(Function.prototype, Decl(lib.es5.d.ts, --, --))
->Point : Symbol(Point, Decl(targetTypeTest1.ts, 8, 1), Decl(targetTypeTest1.ts, 22, 17))
->prototype : Symbol(Function.prototype, Decl(lib.es5.d.ts, --, --))
+>Point.prototype.add : Symbol(Point.add, Decl(targetTypeTest1.ts, 4, 23))
+>Point.prototype : Symbol(Point.prototype)
+>Point : Symbol(Point, Decl(targetTypeTest1.ts, 8, 1), Decl(targetTypeTest1.ts, 0, 0), Decl(targetTypeTest1.ts, 22, 17))
+>prototype : Symbol(Point.prototype)
+>add : Symbol(Point.add, Decl(targetTypeTest1.ts, 4, 23))
 >dx : Symbol(dx, Decl(targetTypeTest1.ts, 30, 31))
 >dy : Symbol(dy, Decl(targetTypeTest1.ts, 30, 34))
 
     return new Point(this.x + dx, this.y + dy);
->Point : Symbol(Point, Decl(targetTypeTest1.ts, 8, 1), Decl(targetTypeTest1.ts, 22, 17))
+>Point : Symbol(Point, Decl(targetTypeTest1.ts, 8, 1), Decl(targetTypeTest1.ts, 0, 0), Decl(targetTypeTest1.ts, 22, 17))
 >dx : Symbol(dx, Decl(targetTypeTest1.ts, 30, 31))
 >dy : Symbol(dy, Decl(targetTypeTest1.ts, 30, 34))
 
@@ -84,9 +88,9 @@ var f : number = 5;
 // this in function add inferred to be type of object literal (i.e. Point)
 // dx, dy, and return type of add inferred using target typing
 Point.prototype = {
->Point.prototype : Symbol(Function.prototype, Decl(lib.es5.d.ts, --, --))
->Point : Symbol(Point, Decl(targetTypeTest1.ts, 8, 1), Decl(targetTypeTest1.ts, 22, 17))
->prototype : Symbol(Function.prototype, Decl(lib.es5.d.ts, --, --))
+>Point.prototype : Symbol(Point.prototype)
+>Point : Symbol(Point, Decl(targetTypeTest1.ts, 8, 1), Decl(targetTypeTest1.ts, 0, 0), Decl(targetTypeTest1.ts, 22, 17))
+>prototype : Symbol(Point.prototype)
 
     x: 0,
 >x : Symbol(x, Decl(targetTypeTest1.ts, 39, 19))
@@ -100,7 +104,7 @@ Point.prototype = {
 >dy : Symbol(dy, Decl(targetTypeTest1.ts, 42, 21))
 
         return new Point(this.x + dx, this.y + dy);
->Point : Symbol(Point, Decl(targetTypeTest1.ts, 8, 1), Decl(targetTypeTest1.ts, 22, 17))
+>Point : Symbol(Point, Decl(targetTypeTest1.ts, 8, 1), Decl(targetTypeTest1.ts, 0, 0), Decl(targetTypeTest1.ts, 22, 17))
 >dx : Symbol(dx, Decl(targetTypeTest1.ts, 42, 18))
 >dy : Symbol(dy, Decl(targetTypeTest1.ts, 42, 21))
     }
@@ -118,7 +122,7 @@ z = function(a: number) {
 }
 
 declare class C {
->C : Symbol(C, Decl(targetTypeTest1.ts, 50, 1))
+>C : Symbol(C, Decl(targetTypeTest1.ts, 57, 1), Decl(targetTypeTest1.ts, 50, 1))
 
     constructor(a:number, b:number);
 >a : Symbol(a, Decl(targetTypeTest1.ts, 53, 16))
@@ -137,7 +141,7 @@ declare class C {
 } 
 
 function C(a,b) {
->C : Symbol(C, Decl(targetTypeTest1.ts, 57, 1))
+>C : Symbol(C, Decl(targetTypeTest1.ts, 57, 1), Decl(targetTypeTest1.ts, 50, 1))
 >a : Symbol(a, Decl(targetTypeTest1.ts, 59, 11))
 >b : Symbol(b, Decl(targetTypeTest1.ts, 59, 13))
 
@@ -149,9 +153,9 @@ function C(a,b) {
 }
 
 C.prototype = 
->C.prototype : Symbol(Function.prototype, Decl(lib.es5.d.ts, --, --))
->C : Symbol(C, Decl(targetTypeTest1.ts, 57, 1))
->prototype : Symbol(Function.prototype, Decl(lib.es5.d.ts, --, --))
+>C.prototype : Symbol(C.prototype)
+>C : Symbol(C, Decl(targetTypeTest1.ts, 57, 1), Decl(targetTypeTest1.ts, 50, 1))
+>prototype : Symbol(C.prototype)
 
 	{	a:0,
 >a : Symbol(a, Decl(targetTypeTest1.ts, 65, 2))
diff --git a/tests/baselines/reference/targetTypeTest1.types b/tests/baselines/reference/targetTypeTest1.types
index fcf994b941a..3dbb1e0a846 100644
--- a/tests/baselines/reference/targetTypeTest1.types
+++ b/tests/baselines/reference/targetTypeTest1.types
@@ -13,12 +13,12 @@ declare class Point
 >y : number
 
       public add(dx: number, dy: number): Point;
->add : (dx: number, dy: number) => any
+>add : (dx: number, dy: number) => Point
 >dx : number
 >dy : number
 
       static origin: Point;
->origin : any
+>origin : Point
 
 }
 
@@ -67,11 +67,11 @@ var x = EF1(1,2);
 
 // Point.origin declared as type Point
 Point.origin = new Point(0, 0);
->Point.origin = new Point(0, 0) : any
->Point.origin : any
+>Point.origin = new Point(0, 0) : Point
+>Point.origin : Point
 >Point : typeof Point
->origin : any
->new Point(0, 0) : any
+>origin : Point
+>new Point(0, 0) : Point
 >Point : typeof Point
 >0 : 0
 >0 : 0
@@ -80,29 +80,29 @@ Point.origin = new Point(0, 0);
 // this inferred as Point because of obj.prop assignment
 // dx, dy, and return type inferred using target typing
 Point.prototype.add = function(dx, dy) {
->Point.prototype.add = function(dx, dy) {    return new Point(this.x + dx, this.y + dy);} : (dx: any, dy: any) => any
->Point.prototype.add : any
->Point.prototype : any
+>Point.prototype.add = function(dx, dy) {    return new Point(this.x + dx, this.y + dy);} : (dx: number, dy: number) => Point
+>Point.prototype.add : (dx: number, dy: number) => Point
+>Point.prototype : Point
 >Point : typeof Point
->prototype : any
->add : any
->function(dx, dy) {    return new Point(this.x + dx, this.y + dy);} : (dx: any, dy: any) => any
->dx : any
->dy : any
+>prototype : Point
+>add : (dx: number, dy: number) => Point
+>function(dx, dy) {    return new Point(this.x + dx, this.y + dy);} : (dx: number, dy: number) => Point
+>dx : number
+>dy : number
 
     return new Point(this.x + dx, this.y + dy);
->new Point(this.x + dx, this.y + dy) : any
+>new Point(this.x + dx, this.y + dy) : Point
 >Point : typeof Point
 >this.x + dx : any
 >this.x : any
 >this : any
 >x : any
->dx : any
+>dx : number
 >this.y + dy : any
 >this.y : any
 >this : any
 >y : any
->dy : any
+>dy : number
 
 };
 
@@ -114,11 +114,11 @@ var f : number = 5;
 // this in function add inferred to be type of object literal (i.e. Point)
 // dx, dy, and return type of add inferred using target typing
 Point.prototype = {
->Point.prototype = {    x: 0,    y: 0,    add: function(dx, dy) {        return new Point(this.x + dx, this.y + dy);    }} : { x: number; y: number; add: (dx: any, dy: any) => any; }
->Point.prototype : any
+>Point.prototype = {    x: 0,    y: 0,    add: function(dx, dy) {        return new Point(this.x + dx, this.y + dy);    }} : { x: number; y: number; add: (dx: number, dy: number) => Point; }
+>Point.prototype : Point
 >Point : typeof Point
->prototype : any
->{    x: 0,    y: 0,    add: function(dx, dy) {        return new Point(this.x + dx, this.y + dy);    }} : { x: number; y: number; add: (dx: any, dy: any) => any; }
+>prototype : Point
+>{    x: 0,    y: 0,    add: function(dx, dy) {        return new Point(this.x + dx, this.y + dy);    }} : { x: number; y: number; add: (dx: number, dy: number) => Point; }
 
     x: 0,
 >x : number
@@ -129,24 +129,24 @@ Point.prototype = {
 >0 : 0
 
     add: function(dx, dy) {
->add : (dx: any, dy: any) => any
->function(dx, dy) {        return new Point(this.x + dx, this.y + dy);    } : (dx: any, dy: any) => any
->dx : any
->dy : any
+>add : (dx: number, dy: number) => Point
+>function(dx, dy) {        return new Point(this.x + dx, this.y + dy);    } : (dx: number, dy: number) => Point
+>dx : number
+>dy : number
 
         return new Point(this.x + dx, this.y + dy);
->new Point(this.x + dx, this.y + dy) : any
+>new Point(this.x + dx, this.y + dy) : Point
 >Point : typeof Point
 >this.x + dx : any
 >this.x : any
 >this : any
 >x : any
->dx : any
+>dx : number
 >this.y + dy : any
 >this.y : any
 >this : any
 >y : any
->dy : any
+>dy : number
     }
 };
 
@@ -183,7 +183,7 @@ declare class C {
 } 
 
 function C(a,b) {
->C : (a: any, b: any) => void
+>C : typeof C
 >a : any
 >b : any
 
@@ -203,13 +203,13 @@ function C(a,b) {
 }
 
 C.prototype = 
->C.prototype = 	{	a:0,		b:0, 		C1M1: function(c,d) {     				return (this.a + c) + (this.b + d);			}	} : { a: number; b: number; C1M1: (c: any, d: any) => any; }
->C.prototype : any
->C : (a: any, b: any) => void
->prototype : any
+>C.prototype = 	{	a:0,		b:0, 		C1M1: function(c,d) {     				return (this.a + c) + (this.b + d);			}	} : { a: number; b: number; C1M1: (c: number, d: number) => any; }
+>C.prototype : C
+>C : typeof C
+>prototype : C
 
 	{	a:0,
->{	a:0,		b:0, 		C1M1: function(c,d) {     				return (this.a + c) + (this.b + d);			}	} : { a: number; b: number; C1M1: (c: any, d: any) => any; }
+>{	a:0,		b:0, 		C1M1: function(c,d) {     				return (this.a + c) + (this.b + d);			}	} : { a: number; b: number; C1M1: (c: number, d: number) => any; }
 >a : number
 >0 : 0
 
@@ -218,10 +218,10 @@ C.prototype =
 >0 : 0
 
 		C1M1: function(c,d) {     
->C1M1 : (c: any, d: any) => any
->function(c,d) {     				return (this.a + c) + (this.b + d);			} : (c: any, d: any) => any
->c : any
->d : any
+>C1M1 : (c: number, d: number) => any
+>function(c,d) {     				return (this.a + c) + (this.b + d);			} : (c: number, d: number) => any
+>c : number
+>d : number
 
 				return (this.a + c) + (this.b + d);
 >(this.a + c) + (this.b + d) : any
@@ -230,13 +230,13 @@ C.prototype =
 >this.a : any
 >this : any
 >a : any
->c : any
+>c : number
 >(this.b + d) : any
 >this.b + d : any
 >this.b : any
 >this : any
 >b : any
->d : any
+>d : number
 			}
 	};
 
diff --git a/tests/cases/compiler/classFunctionMerging.ts b/tests/cases/compiler/classFunctionMerging.ts
new file mode 100644
index 00000000000..5b8dadc23dd
--- /dev/null
+++ b/tests/cases/compiler/classFunctionMerging.ts
@@ -0,0 +1,12 @@
+// We allow ambient classes and functions to merge, this way callable classes
+// which are also namespaces can be represented in declaration files
+declare function Foo (x: number): Foo.Inst;
+declare class Foo {
+    constructor(x: string);
+}
+declare namespace Foo {
+    export type Inst = number;
+}
+
+const a = new Foo("");
+const b = Foo(12);
\ No newline at end of file
diff --git a/tests/cases/fourslash/insertReturnStatementInDuplicateIdentifierFunction.ts b/tests/cases/fourslash/insertReturnStatementInDuplicateIdentifierFunction.ts
index 8abdac6d206..cd5b08034d4 100644
--- a/tests/cases/fourslash/insertReturnStatementInDuplicateIdentifierFunction.ts
+++ b/tests/cases/fourslash/insertReturnStatementInDuplicateIdentifierFunction.ts
@@ -1,6 +1,6 @@
 /// <reference path="fourslash.ts" />
 
-//// declare class foo { };
+//// class foo { };
 //// function foo() { /**/ }
 
 goTo.marker();

From 98b6db81d9fade9f06eb903d591766dfd8ed2025 Mon Sep 17 00:00:00 2001
From: Ron Buckton <ron.buckton@microsoft.com>
Date: Fri, 9 Aug 2019 16:11:25 -0700
Subject: [PATCH 146/151] Allow accessors in ambient class declarations
 (#32787)

* Allow accessors in ambient class declarations

* Update src/compiler/transformers/declarations.ts

Co-Authored-By: Wesley Wigham <wewigham@microsoft.com>
---
 src/compiler/checker.ts                       | 57 ++++++-------
 src/compiler/diagnosticMessages.json          |  4 -
 src/compiler/transformers/declarations.ts     | 79 +++++++++++++++++--
 src/compiler/utilities.ts                     |  4 +-
 src/services/codefixes/helpers.ts             | 52 +++++++++---
 .../accessorsInAmbientContext.errors.txt      | 48 +++++------
 .../reference/ambientAccessors(target=es3).js | 30 +++++++
 .../ambientAccessors(target=es3).symbols      | 33 ++++++++
 .../ambientAccessors(target=es3).types        | 33 ++++++++
 .../reference/ambientAccessors(target=es5).js | 30 +++++++
 .../ambientAccessors(target=es5).symbols      | 33 ++++++++
 .../ambientAccessors(target=es5).types        | 33 ++++++++
 .../reference/ambientGetters.errors.txt       | 11 +--
 tests/baselines/reference/giant.errors.txt    | 56 +------------
 tests/baselines/reference/giant.js            | 24 +++---
 .../reference/parserAccessors5.errors.txt     |  6 +-
 .../reference/parserAccessors6.errors.txt     |  6 +-
 .../parserComputedPropertyName23.errors.txt   |  5 +-
 .../ambientAccessors.ts                       | 16 ++++
 ...codeFixAmbientClassExtendAbstractMethod.ts | 31 ++++++++
 ...FixAmbientClassExtendAbstractMethod_all.ts | 26 ++++++
 ...ImplementClassAbstractGettersAndSetters.ts | 32 ++++++++
 ...entClassImplementClassMethodViaHeritage.ts | 16 ++++
 .../codeFixClassExtendAbstractGetterSetter.ts | 31 ++++++--
 ...ImplementClassAbstractGettersAndSetters.ts | 15 +++-
 25 files changed, 537 insertions(+), 174 deletions(-)
 create mode 100644 tests/baselines/reference/ambientAccessors(target=es3).js
 create mode 100644 tests/baselines/reference/ambientAccessors(target=es3).symbols
 create mode 100644 tests/baselines/reference/ambientAccessors(target=es3).types
 create mode 100644 tests/baselines/reference/ambientAccessors(target=es5).js
 create mode 100644 tests/baselines/reference/ambientAccessors(target=es5).symbols
 create mode 100644 tests/baselines/reference/ambientAccessors(target=es5).types
 create mode 100644 tests/cases/conformance/classes/propertyMemberDeclarations/memberAccessorDeclarations/ambientAccessors.ts
 create mode 100644 tests/cases/fourslash/codeFixAmbientClassExtendAbstractMethod.ts
 create mode 100644 tests/cases/fourslash/codeFixAmbientClassExtendAbstractMethod_all.ts
 create mode 100644 tests/cases/fourslash/codeFixAmbientClassImplementClassAbstractGettersAndSetters.ts
 create mode 100644 tests/cases/fourslash/codeFixAmbientClassImplementClassMethodViaHeritage.ts

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 464c97d5519..65f550cb664 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -5938,7 +5938,9 @@ namespace ts {
                     // Otherwise, fall back to 'any'.
                     else {
                         if (setter) {
-                            errorOrSuggestion(noImplicitAny, setter, Diagnostics.Property_0_implicitly_has_type_any_because_its_set_accessor_lacks_a_parameter_type_annotation, symbolToString(symbol));
+                            if (!isPrivateWithinAmbient(setter)) {
+                                errorOrSuggestion(noImplicitAny, setter, Diagnostics.Property_0_implicitly_has_type_any_because_its_set_accessor_lacks_a_parameter_type_annotation, symbolToString(symbol));
+                            }
                         }
                         else {
                             Debug.assert(!!getter, "there must existed getter as we are current checking either setter or getter in this function");
@@ -33059,43 +33061,39 @@ namespace ts {
         }
 
         function checkGrammarAccessor(accessor: AccessorDeclaration): boolean {
-            const kind = accessor.kind;
-            if (languageVersion < ScriptTarget.ES5) {
-                return grammarErrorOnNode(accessor.name, Diagnostics.Accessors_are_only_available_when_targeting_ECMAScript_5_and_higher);
+            if (!(accessor.flags & NodeFlags.Ambient)) {
+                if (languageVersion < ScriptTarget.ES5) {
+                    return grammarErrorOnNode(accessor.name, Diagnostics.Accessors_are_only_available_when_targeting_ECMAScript_5_and_higher);
+                }
+                if (accessor.body === undefined && !hasModifier(accessor, ModifierFlags.Abstract)) {
+                    return grammarErrorAtPos(accessor, accessor.end - 1, ";".length, Diagnostics._0_expected, "{");
+                }
             }
-            else if (accessor.flags & NodeFlags.Ambient) {
-                return grammarErrorOnNode(accessor.name, Diagnostics.An_accessor_cannot_be_declared_in_an_ambient_context);
-            }
-            else if (accessor.body === undefined && !hasModifier(accessor, ModifierFlags.Abstract)) {
-                return grammarErrorAtPos(accessor, accessor.end - 1, ";".length, Diagnostics._0_expected, "{");
-            }
-            else if (accessor.body && hasModifier(accessor, ModifierFlags.Abstract)) {
+            if (accessor.body && hasModifier(accessor, ModifierFlags.Abstract)) {
                 return grammarErrorOnNode(accessor, Diagnostics.An_abstract_accessor_cannot_have_an_implementation);
             }
-            else if (accessor.typeParameters) {
+            if (accessor.typeParameters) {
                 return grammarErrorOnNode(accessor.name, Diagnostics.An_accessor_cannot_have_type_parameters);
             }
-            else if (!doesAccessorHaveCorrectParameterCount(accessor)) {
+            if (!doesAccessorHaveCorrectParameterCount(accessor)) {
                 return grammarErrorOnNode(accessor.name,
-                                          kind === SyntaxKind.GetAccessor ?
+                                          accessor.kind === SyntaxKind.GetAccessor ?
                                           Diagnostics.A_get_accessor_cannot_have_parameters :
                                           Diagnostics.A_set_accessor_must_have_exactly_one_parameter);
             }
-            else if (kind === SyntaxKind.SetAccessor) {
+            if (accessor.kind === SyntaxKind.SetAccessor) {
                 if (accessor.type) {
                     return grammarErrorOnNode(accessor.name, Diagnostics.A_set_accessor_cannot_have_a_return_type_annotation);
                 }
-                else {
-                    const parameter = accessor.parameters[0];
-                    if (parameter.dotDotDotToken) {
-                        return grammarErrorOnNode(parameter.dotDotDotToken, Diagnostics.A_set_accessor_cannot_have_rest_parameter);
-                    }
-                    else if (parameter.questionToken) {
-                        return grammarErrorOnNode(parameter.questionToken, Diagnostics.A_set_accessor_cannot_have_an_optional_parameter);
-                    }
-                    else if (parameter.initializer) {
-                        return grammarErrorOnNode(accessor.name, Diagnostics.A_set_accessor_parameter_cannot_have_an_initializer);
-                    }
+                const parameter = Debug.assertDefined(getSetAccessorValueParameter(accessor), "Return value does not match parameter count assertion.");
+                if (parameter.dotDotDotToken) {
+                    return grammarErrorOnNode(parameter.dotDotDotToken, Diagnostics.A_set_accessor_cannot_have_rest_parameter);
+                }
+                if (parameter.questionToken) {
+                    return grammarErrorOnNode(parameter.questionToken, Diagnostics.A_set_accessor_cannot_have_an_optional_parameter);
+                }
+                if (parameter.initializer) {
+                    return grammarErrorOnNode(accessor.name, Diagnostics.A_set_accessor_parameter_cannot_have_an_initializer);
                 }
             }
             return false;
@@ -33583,14 +33581,9 @@ namespace ts {
 
         function checkGrammarStatementInAmbientContext(node: Node): boolean {
             if (node.flags & NodeFlags.Ambient) {
-                // An accessors is already reported about the ambient context
-                if (isAccessor(node.parent)) {
-                    return getNodeLinks(node).hasReportedStatementInAmbientContext = true;
-                }
-
                 // Find containing block which is either Block, ModuleBlock, SourceFile
                 const links = getNodeLinks(node);
-                if (!links.hasReportedStatementInAmbientContext && isFunctionLike(node.parent)) {
+                if (!links.hasReportedStatementInAmbientContext && (isFunctionLike(node.parent) || isAccessor(node.parent))) {
                     return getNodeLinks(node).hasReportedStatementInAmbientContext = grammarErrorOnFirstToken(node, Diagnostics.An_implementation_cannot_be_declared_in_ambient_contexts);
                 }
 
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index 4528d504d0d..5cca456dd49 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -243,10 +243,6 @@
         "category": "Error",
         "code": 1085
     },
-    "An accessor cannot be declared in an ambient context.": {
-        "category": "Error",
-        "code": 1086
-    },
     "'{0}' modifier cannot appear on a constructor declaration.": {
         "category": "Error",
         "code": 1089
diff --git a/src/compiler/transformers/declarations.ts b/src/compiler/transformers/declarations.ts
index 6dfc909b93a..2eaab8c0692 100644
--- a/src/compiler/transformers/declarations.ts
+++ b/src/compiler/transformers/declarations.ts
@@ -393,7 +393,7 @@ namespace ts {
             }
         }
 
-        function ensureParameter(p: ParameterDeclaration, modifierMask?: ModifierFlags): ParameterDeclaration {
+        function ensureParameter(p: ParameterDeclaration, modifierMask?: ModifierFlags, type?: TypeNode): ParameterDeclaration {
             let oldDiag: typeof getSymbolAccessibilityDiagnostic | undefined;
             if (!suppressNewDiagnosticContexts) {
                 oldDiag = getSymbolAccessibilityDiagnostic;
@@ -406,7 +406,7 @@ namespace ts {
                 p.dotDotDotToken,
                 filterBindingPatternInitializers(p.name),
                 resolver.isOptionalParameter(p) ? (p.questionToken || createToken(SyntaxKind.QuestionToken)) : undefined,
-                ensureType(p, p.type, /*ignorePrivate*/ true), // Ignore private param props, since this type is going straight back into a param
+                ensureType(p, type || p.type, /*ignorePrivate*/ true), // Ignore private param props, since this type is going straight back into a param
                 ensureNoInitializer(p)
             );
             if (!suppressNewDiagnosticContexts) {
@@ -535,6 +535,36 @@ namespace ts {
             return createNodeArray(newParams, params.hasTrailingComma);
         }
 
+        function updateAccessorParamsList(input: AccessorDeclaration, isPrivate: boolean) {
+            let newParams: ParameterDeclaration[] | undefined;
+            if (!isPrivate) {
+                const thisParameter = getThisParameter(input);
+                if (thisParameter) {
+                    newParams = [ensureParameter(thisParameter)];
+                }
+            }
+            if (isSetAccessorDeclaration(input)) {
+                let newValueParameter: ParameterDeclaration | undefined;
+                if (!isPrivate) {
+                    const valueParameter = getSetAccessorValueParameter(input);
+                    if (valueParameter) {
+                        const accessorType = getTypeAnnotationFromAllAccessorDeclarations(input, resolver.getAllAccessorDeclarations(input));
+                        newValueParameter = ensureParameter(valueParameter, /*modifierMask*/ undefined, accessorType);
+                    }
+                }
+                if (!newValueParameter) {
+                    newValueParameter = createParameter(
+                        /*decorators*/ undefined,
+                        /*modifiers*/ undefined,
+                        /*dotDotDotToken*/ undefined,
+                        "value"
+                    );
+                }
+                newParams = append(newParams, newValueParameter);
+            }
+            return createNodeArray(newParams || emptyArray) as NodeArray<ParameterDeclaration>;
+        }
+
         function ensureTypeParams(node: Node, params: NodeArray<TypeParameterDeclaration> | undefined) {
             return hasModifier(node, ModifierFlags.Private) ? undefined : visitNodes(params, visitDeclarationSubtree);
         }
@@ -811,10 +841,33 @@ namespace ts {
                         return cleanup(sig);
                     }
                     case SyntaxKind.GetAccessor: {
+                        // For now, only emit class accessors as accessors if they were already declared in an ambient context.
+                        if (input.flags & NodeFlags.Ambient) {
+                            const isPrivate = hasModifier(input, ModifierFlags.Private);
+                            const accessorType = getTypeAnnotationFromAllAccessorDeclarations(input, resolver.getAllAccessorDeclarations(input));
+                            return cleanup(updateGetAccessor(
+                                input,
+                                /*decorators*/ undefined,
+                                ensureModifiers(input),
+                                input.name,
+                                updateAccessorParamsList(input, isPrivate),
+                                !isPrivate ? ensureType(input, accessorType) : undefined,
+                                /*body*/ undefined));
+                        }
                         const newNode = ensureAccessor(input);
                         return cleanup(newNode);
                     }
                     case SyntaxKind.SetAccessor: {
+                        // For now, only emit class accessors as accessors if they were already declared in an ambient context.
+                        if (input.flags & NodeFlags.Ambient) {
+                            return cleanup(updateSetAccessor(
+                                input,
+                                /*decorators*/ undefined,
+                                ensureModifiers(input),
+                                input.name,
+                                updateAccessorParamsList(input, hasModifier(input, ModifierFlags.Private)),
+                                /*body*/ undefined));
+                        }
                         const newNode = ensureAccessor(input);
                         return cleanup(newNode);
                     }
@@ -1374,17 +1427,27 @@ namespace ts {
             return maskModifierFlags(node, mask, additions);
         }
 
+        function getTypeAnnotationFromAllAccessorDeclarations(node: AccessorDeclaration, accessors: AllAccessorDeclarations) {
+            let accessorType = getTypeAnnotationFromAccessor(node);
+            if (!accessorType && node !== accessors.firstAccessor) {
+                accessorType = getTypeAnnotationFromAccessor(accessors.firstAccessor);
+                // If we end up pulling the type from the second accessor, we also need to change the diagnostic context to get the expected error message
+                getSymbolAccessibilityDiagnostic = createGetSymbolAccessibilityDiagnosticForNode(accessors.firstAccessor);
+            }
+            if (!accessorType && accessors.secondAccessor && node !== accessors.secondAccessor) {
+                accessorType = getTypeAnnotationFromAccessor(accessors.secondAccessor);
+                // If we end up pulling the type from the second accessor, we also need to change the diagnostic context to get the expected error message
+                getSymbolAccessibilityDiagnostic = createGetSymbolAccessibilityDiagnosticForNode(accessors.secondAccessor);
+            }
+            return accessorType;
+        }
+
         function ensureAccessor(node: AccessorDeclaration): PropertyDeclaration | undefined {
             const accessors = resolver.getAllAccessorDeclarations(node);
             if (node.kind !== accessors.firstAccessor.kind) {
                 return;
             }
-            let accessorType = getTypeAnnotationFromAccessor(node);
-            if (!accessorType && accessors.secondAccessor) {
-                accessorType = getTypeAnnotationFromAccessor(accessors.secondAccessor);
-                // If we end up pulling the type from the second accessor, we also need to change the diagnostic context to get the expected error message
-                getSymbolAccessibilityDiagnostic = createGetSymbolAccessibilityDiagnosticForNode(accessors.secondAccessor);
-            }
+            const accessorType = getTypeAnnotationFromAllAccessorDeclarations(node, accessors);
             const prop = createProperty(/*decorators*/ undefined, maskModifiers(node, /*mask*/ undefined, (!accessors.setAccessor) ? ModifierFlags.Readonly : ModifierFlags.None), node.name, node.questionToken, ensureType(node, accessorType), /*initializer*/ undefined);
             const leadingsSyntheticCommentRanges = accessors.secondAccessor && getLeadingCommentRangesOfNode(accessors.secondAccessor, currentSourceFile);
             if (leadingsSyntheticCommentRanges) {
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index 4ca13e663ab..02ca57919c9 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -3518,7 +3518,7 @@ namespace ts {
         return find(node.members, (member): member is ConstructorDeclaration & { body: FunctionBody } => isConstructorDeclaration(member) && nodeIsPresent(member.body));
     }
 
-    function getSetAccessorValueParameter(accessor: SetAccessorDeclaration): ParameterDeclaration | undefined {
+    export function getSetAccessorValueParameter(accessor: SetAccessorDeclaration): ParameterDeclaration | undefined {
         if (accessor && accessor.parameters.length > 0) {
             const hasThis = accessor.parameters.length === 2 && parameterIsThisKeyword(accessor.parameters[0]);
             return accessor.parameters[hasThis ? 1 : 0];
@@ -3553,7 +3553,7 @@ namespace ts {
         return id.originalKeywordKind === SyntaxKind.ThisKeyword;
     }
 
-    export function getAllAccessorDeclarations(declarations: NodeArray<Declaration>, accessor: AccessorDeclaration): AllAccessorDeclarations {
+    export function getAllAccessorDeclarations(declarations: readonly Declaration[], accessor: AccessorDeclaration): AllAccessorDeclarations {
         // TODO: GH#18217
         let firstAccessor!: AccessorDeclaration;
         let secondAccessor!: AccessorDeclaration;
diff --git a/src/services/codefixes/helpers.ts b/src/services/codefixes/helpers.ts
index 45a79613db5..e4c56e3ea51 100644
--- a/src/services/codefixes/helpers.ts
+++ b/src/services/codefixes/helpers.ts
@@ -55,10 +55,9 @@ namespace ts.codefix {
         const modifiers = visibilityModifier ? createNodeArray([visibilityModifier]) : undefined;
         const type = checker.getWidenedType(checker.getTypeOfSymbolAtLocation(symbol, enclosingDeclaration));
         const optional = !!(symbol.flags & SymbolFlags.Optional);
+        const ambient = !!(enclosingDeclaration.flags & NodeFlags.Ambient);
 
         switch (declaration.kind) {
-            case SyntaxKind.GetAccessor:
-            case SyntaxKind.SetAccessor:
             case SyntaxKind.PropertySignature:
             case SyntaxKind.PropertyDeclaration:
                 const typeNode = checker.typeToTypeNode(type, enclosingDeclaration, /*flags*/ undefined, getNoopSymbolTrackerWithResolver(context));
@@ -70,6 +69,37 @@ namespace ts.codefix {
                     typeNode,
                     /*initializer*/ undefined));
                 break;
+            case SyntaxKind.GetAccessor:
+            case SyntaxKind.SetAccessor: {
+                const allAccessors = getAllAccessorDeclarations(declarations, declaration as AccessorDeclaration);
+                const typeNode = checker.typeToTypeNode(type, enclosingDeclaration, /*flags*/ undefined, getNoopSymbolTrackerWithResolver(context));
+                const orderedAccessors = allAccessors.secondAccessor
+                    ? [allAccessors.firstAccessor, allAccessors.secondAccessor]
+                    : [allAccessors.firstAccessor];
+                for (const accessor of orderedAccessors) {
+                    if (isGetAccessorDeclaration(accessor)) {
+                        out(createGetAccessor(
+                            /*decorators*/ undefined,
+                            modifiers,
+                            name,
+                            emptyArray,
+                            typeNode,
+                            ambient ? undefined : createStubbedMethodBody(preferences)));
+                    }
+                    else {
+                        Debug.assertNode(accessor, isSetAccessorDeclaration);
+                        const parameter = getSetAccessorValueParameter(accessor);
+                        const parameterName = parameter && isIdentifier(parameter.name) ? idText(parameter.name) : undefined;
+                        out(createSetAccessor(
+                            /*decorators*/ undefined,
+                            modifiers,
+                            name,
+                            createDummyParameters(1, [parameterName], [typeNode], 1, /*inJs*/ false),
+                            ambient ? undefined : createStubbedMethodBody(preferences)));
+                    }
+                }
+                break;
+            }
             case SyntaxKind.MethodSignature:
             case SyntaxKind.MethodDeclaration:
                 // The signature for the implementation appears as an entry in `signatures` iff
@@ -87,7 +117,7 @@ namespace ts.codefix {
                 if (declarations.length === 1) {
                     Debug.assert(signatures.length === 1);
                     const signature = signatures[0];
-                    outputMethod(signature, modifiers, name, createStubbedMethodBody(preferences));
+                    outputMethod(signature, modifiers, name, ambient ? undefined : createStubbedMethodBody(preferences));
                     break;
                 }
 
@@ -96,13 +126,15 @@ namespace ts.codefix {
                     outputMethod(signature, getSynthesizedDeepClones(modifiers, /*includeTrivia*/ false), getSynthesizedDeepClone(name, /*includeTrivia*/ false));
                 }
 
-                if (declarations.length > signatures.length) {
-                    const signature = checker.getSignatureFromDeclaration(declarations[declarations.length - 1] as SignatureDeclaration)!;
-                    outputMethod(signature, modifiers, name, createStubbedMethodBody(preferences));
-                }
-                else {
-                    Debug.assert(declarations.length === signatures.length);
-                    out(createMethodImplementingSignatures(signatures, name, optional, modifiers, preferences));
+                if (!ambient) {
+                    if (declarations.length > signatures.length) {
+                        const signature = checker.getSignatureFromDeclaration(declarations[declarations.length - 1] as SignatureDeclaration)!;
+                        outputMethod(signature, modifiers, name, createStubbedMethodBody(preferences));
+                    }
+                    else {
+                        Debug.assert(declarations.length === signatures.length);
+                        out(createMethodImplementingSignatures(signatures, name, optional, modifiers, preferences));
+                    }
                 }
                 break;
         }
diff --git a/tests/baselines/reference/accessorsInAmbientContext.errors.txt b/tests/baselines/reference/accessorsInAmbientContext.errors.txt
index 44b100bd58d..9a625f84c10 100644
--- a/tests/baselines/reference/accessorsInAmbientContext.errors.txt
+++ b/tests/baselines/reference/accessorsInAmbientContext.errors.txt
@@ -1,44 +1,44 @@
-tests/cases/compiler/accessorsInAmbientContext.ts(3,13): error TS1086: An accessor cannot be declared in an ambient context.
-tests/cases/compiler/accessorsInAmbientContext.ts(4,13): error TS1086: An accessor cannot be declared in an ambient context.
-tests/cases/compiler/accessorsInAmbientContext.ts(6,20): error TS1086: An accessor cannot be declared in an ambient context.
-tests/cases/compiler/accessorsInAmbientContext.ts(7,20): error TS1086: An accessor cannot be declared in an ambient context.
-tests/cases/compiler/accessorsInAmbientContext.ts(12,9): error TS1086: An accessor cannot be declared in an ambient context.
-tests/cases/compiler/accessorsInAmbientContext.ts(13,9): error TS1086: An accessor cannot be declared in an ambient context.
-tests/cases/compiler/accessorsInAmbientContext.ts(15,16): error TS1086: An accessor cannot be declared in an ambient context.
-tests/cases/compiler/accessorsInAmbientContext.ts(16,16): error TS1086: An accessor cannot be declared in an ambient context.
+tests/cases/compiler/accessorsInAmbientContext.ts(3,17): error TS1183: An implementation cannot be declared in ambient contexts.
+tests/cases/compiler/accessorsInAmbientContext.ts(4,18): error TS1183: An implementation cannot be declared in ambient contexts.
+tests/cases/compiler/accessorsInAmbientContext.ts(6,24): error TS1183: An implementation cannot be declared in ambient contexts.
+tests/cases/compiler/accessorsInAmbientContext.ts(7,25): error TS1183: An implementation cannot be declared in ambient contexts.
+tests/cases/compiler/accessorsInAmbientContext.ts(12,13): error TS1183: An implementation cannot be declared in ambient contexts.
+tests/cases/compiler/accessorsInAmbientContext.ts(13,14): error TS1183: An implementation cannot be declared in ambient contexts.
+tests/cases/compiler/accessorsInAmbientContext.ts(15,20): error TS1183: An implementation cannot be declared in ambient contexts.
+tests/cases/compiler/accessorsInAmbientContext.ts(16,21): error TS1183: An implementation cannot be declared in ambient contexts.
 
 
 ==== tests/cases/compiler/accessorsInAmbientContext.ts (8 errors) ====
     declare module M {
         class C {
             get X() { return 1; }
-                ~
-!!! error TS1086: An accessor cannot be declared in an ambient context.
+                    ~
+!!! error TS1183: An implementation cannot be declared in ambient contexts.
             set X(v) { }
-                ~
-!!! error TS1086: An accessor cannot be declared in an ambient context.
+                     ~
+!!! error TS1183: An implementation cannot be declared in ambient contexts.
     
             static get Y() { return 1; }
-                       ~
-!!! error TS1086: An accessor cannot be declared in an ambient context.
+                           ~
+!!! error TS1183: An implementation cannot be declared in ambient contexts.
             static set Y(v) { }
-                       ~
-!!! error TS1086: An accessor cannot be declared in an ambient context.
+                            ~
+!!! error TS1183: An implementation cannot be declared in ambient contexts.
         }
     }
     
     declare class C {
         get X() { return 1; }
-            ~
-!!! error TS1086: An accessor cannot be declared in an ambient context.
+                ~
+!!! error TS1183: An implementation cannot be declared in ambient contexts.
         set X(v) { }
-            ~
-!!! error TS1086: An accessor cannot be declared in an ambient context.
+                 ~
+!!! error TS1183: An implementation cannot be declared in ambient contexts.
     
         static get Y() { return 1; }
-                   ~
-!!! error TS1086: An accessor cannot be declared in an ambient context.
+                       ~
+!!! error TS1183: An implementation cannot be declared in ambient contexts.
         static set Y(v) { }
-                   ~
-!!! error TS1086: An accessor cannot be declared in an ambient context.
+                        ~
+!!! error TS1183: An implementation cannot be declared in ambient contexts.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/ambientAccessors(target=es3).js b/tests/baselines/reference/ambientAccessors(target=es3).js
new file mode 100644
index 00000000000..4ddebd5e0eb
--- /dev/null
+++ b/tests/baselines/reference/ambientAccessors(target=es3).js
@@ -0,0 +1,30 @@
+//// [ambientAccessors.ts]
+// ok to use accessors in ambient class in ES3
+declare class C {
+    static get a(): string;
+    static set a(value: string);
+
+    private static get b(): string;
+    private static set b(foo: string);
+
+    get x(): string;
+    set x(value: string);
+
+    private get y(): string;
+    private set y(foo: string);
+}
+
+//// [ambientAccessors.js]
+
+
+//// [ambientAccessors.d.ts]
+declare class C {
+    static get a(): string;
+    static set a(value: string);
+    private static get b();
+    private static set b(value);
+    get x(): string;
+    set x(value: string);
+    private get y();
+    private set y(value);
+}
diff --git a/tests/baselines/reference/ambientAccessors(target=es3).symbols b/tests/baselines/reference/ambientAccessors(target=es3).symbols
new file mode 100644
index 00000000000..a73d3dcdabd
--- /dev/null
+++ b/tests/baselines/reference/ambientAccessors(target=es3).symbols
@@ -0,0 +1,33 @@
+=== tests/cases/conformance/classes/propertyMemberDeclarations/memberAccessorDeclarations/ambientAccessors.ts ===
+// ok to use accessors in ambient class in ES3
+declare class C {
+>C : Symbol(C, Decl(ambientAccessors.ts, 0, 0))
+
+    static get a(): string;
+>a : Symbol(C.a, Decl(ambientAccessors.ts, 1, 17), Decl(ambientAccessors.ts, 2, 27))
+
+    static set a(value: string);
+>a : Symbol(C.a, Decl(ambientAccessors.ts, 1, 17), Decl(ambientAccessors.ts, 2, 27))
+>value : Symbol(value, Decl(ambientAccessors.ts, 3, 17))
+
+    private static get b(): string;
+>b : Symbol(C.b, Decl(ambientAccessors.ts, 3, 32), Decl(ambientAccessors.ts, 5, 35))
+
+    private static set b(foo: string);
+>b : Symbol(C.b, Decl(ambientAccessors.ts, 3, 32), Decl(ambientAccessors.ts, 5, 35))
+>foo : Symbol(foo, Decl(ambientAccessors.ts, 6, 25))
+
+    get x(): string;
+>x : Symbol(C.x, Decl(ambientAccessors.ts, 6, 38), Decl(ambientAccessors.ts, 8, 20))
+
+    set x(value: string);
+>x : Symbol(C.x, Decl(ambientAccessors.ts, 6, 38), Decl(ambientAccessors.ts, 8, 20))
+>value : Symbol(value, Decl(ambientAccessors.ts, 9, 10))
+
+    private get y(): string;
+>y : Symbol(C.y, Decl(ambientAccessors.ts, 9, 25), Decl(ambientAccessors.ts, 11, 28))
+
+    private set y(foo: string);
+>y : Symbol(C.y, Decl(ambientAccessors.ts, 9, 25), Decl(ambientAccessors.ts, 11, 28))
+>foo : Symbol(foo, Decl(ambientAccessors.ts, 12, 18))
+}
diff --git a/tests/baselines/reference/ambientAccessors(target=es3).types b/tests/baselines/reference/ambientAccessors(target=es3).types
new file mode 100644
index 00000000000..48b4f03823d
--- /dev/null
+++ b/tests/baselines/reference/ambientAccessors(target=es3).types
@@ -0,0 +1,33 @@
+=== tests/cases/conformance/classes/propertyMemberDeclarations/memberAccessorDeclarations/ambientAccessors.ts ===
+// ok to use accessors in ambient class in ES3
+declare class C {
+>C : C
+
+    static get a(): string;
+>a : string
+
+    static set a(value: string);
+>a : string
+>value : string
+
+    private static get b(): string;
+>b : string
+
+    private static set b(foo: string);
+>b : string
+>foo : string
+
+    get x(): string;
+>x : string
+
+    set x(value: string);
+>x : string
+>value : string
+
+    private get y(): string;
+>y : string
+
+    private set y(foo: string);
+>y : string
+>foo : string
+}
diff --git a/tests/baselines/reference/ambientAccessors(target=es5).js b/tests/baselines/reference/ambientAccessors(target=es5).js
new file mode 100644
index 00000000000..4ddebd5e0eb
--- /dev/null
+++ b/tests/baselines/reference/ambientAccessors(target=es5).js
@@ -0,0 +1,30 @@
+//// [ambientAccessors.ts]
+// ok to use accessors in ambient class in ES3
+declare class C {
+    static get a(): string;
+    static set a(value: string);
+
+    private static get b(): string;
+    private static set b(foo: string);
+
+    get x(): string;
+    set x(value: string);
+
+    private get y(): string;
+    private set y(foo: string);
+}
+
+//// [ambientAccessors.js]
+
+
+//// [ambientAccessors.d.ts]
+declare class C {
+    static get a(): string;
+    static set a(value: string);
+    private static get b();
+    private static set b(value);
+    get x(): string;
+    set x(value: string);
+    private get y();
+    private set y(value);
+}
diff --git a/tests/baselines/reference/ambientAccessors(target=es5).symbols b/tests/baselines/reference/ambientAccessors(target=es5).symbols
new file mode 100644
index 00000000000..a73d3dcdabd
--- /dev/null
+++ b/tests/baselines/reference/ambientAccessors(target=es5).symbols
@@ -0,0 +1,33 @@
+=== tests/cases/conformance/classes/propertyMemberDeclarations/memberAccessorDeclarations/ambientAccessors.ts ===
+// ok to use accessors in ambient class in ES3
+declare class C {
+>C : Symbol(C, Decl(ambientAccessors.ts, 0, 0))
+
+    static get a(): string;
+>a : Symbol(C.a, Decl(ambientAccessors.ts, 1, 17), Decl(ambientAccessors.ts, 2, 27))
+
+    static set a(value: string);
+>a : Symbol(C.a, Decl(ambientAccessors.ts, 1, 17), Decl(ambientAccessors.ts, 2, 27))
+>value : Symbol(value, Decl(ambientAccessors.ts, 3, 17))
+
+    private static get b(): string;
+>b : Symbol(C.b, Decl(ambientAccessors.ts, 3, 32), Decl(ambientAccessors.ts, 5, 35))
+
+    private static set b(foo: string);
+>b : Symbol(C.b, Decl(ambientAccessors.ts, 3, 32), Decl(ambientAccessors.ts, 5, 35))
+>foo : Symbol(foo, Decl(ambientAccessors.ts, 6, 25))
+
+    get x(): string;
+>x : Symbol(C.x, Decl(ambientAccessors.ts, 6, 38), Decl(ambientAccessors.ts, 8, 20))
+
+    set x(value: string);
+>x : Symbol(C.x, Decl(ambientAccessors.ts, 6, 38), Decl(ambientAccessors.ts, 8, 20))
+>value : Symbol(value, Decl(ambientAccessors.ts, 9, 10))
+
+    private get y(): string;
+>y : Symbol(C.y, Decl(ambientAccessors.ts, 9, 25), Decl(ambientAccessors.ts, 11, 28))
+
+    private set y(foo: string);
+>y : Symbol(C.y, Decl(ambientAccessors.ts, 9, 25), Decl(ambientAccessors.ts, 11, 28))
+>foo : Symbol(foo, Decl(ambientAccessors.ts, 12, 18))
+}
diff --git a/tests/baselines/reference/ambientAccessors(target=es5).types b/tests/baselines/reference/ambientAccessors(target=es5).types
new file mode 100644
index 00000000000..48b4f03823d
--- /dev/null
+++ b/tests/baselines/reference/ambientAccessors(target=es5).types
@@ -0,0 +1,33 @@
+=== tests/cases/conformance/classes/propertyMemberDeclarations/memberAccessorDeclarations/ambientAccessors.ts ===
+// ok to use accessors in ambient class in ES3
+declare class C {
+>C : C
+
+    static get a(): string;
+>a : string
+
+    static set a(value: string);
+>a : string
+>value : string
+
+    private static get b(): string;
+>b : string
+
+    private static set b(foo: string);
+>b : string
+>foo : string
+
+    get x(): string;
+>x : string
+
+    set x(value: string);
+>x : string
+>value : string
+
+    private get y(): string;
+>y : string
+
+    private set y(foo: string);
+>y : string
+>foo : string
+}
diff --git a/tests/baselines/reference/ambientGetters.errors.txt b/tests/baselines/reference/ambientGetters.errors.txt
index b245f561813..b061f4b04f8 100644
--- a/tests/baselines/reference/ambientGetters.errors.txt
+++ b/tests/baselines/reference/ambientGetters.errors.txt
@@ -1,16 +1,13 @@
-tests/cases/compiler/ambientGetters.ts(2,9): error TS1086: An accessor cannot be declared in an ambient context.
-tests/cases/compiler/ambientGetters.ts(6,9): error TS1086: An accessor cannot be declared in an ambient context.
+tests/cases/compiler/ambientGetters.ts(6,18): error TS1183: An implementation cannot be declared in ambient contexts.
 
 
-==== tests/cases/compiler/ambientGetters.ts (2 errors) ====
+==== tests/cases/compiler/ambientGetters.ts (1 errors) ====
     declare class A {
         get length() : number;
-            ~~~~~~
-!!! error TS1086: An accessor cannot be declared in an ambient context.
     }
     
     declare class B {
         get length() { return 0; }
-            ~~~~~~
-!!! error TS1086: An accessor cannot be declared in an ambient context.
+                     ~
+!!! error TS1183: An implementation cannot be declared in ambient contexts.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/giant.errors.txt b/tests/baselines/reference/giant.errors.txt
index eb899ff132e..3c81c601f56 100644
--- a/tests/baselines/reference/giant.errors.txt
+++ b/tests/baselines/reference/giant.errors.txt
@@ -75,28 +75,22 @@ tests/cases/compiler/giant.ts(242,21): error TS1183: An implementation cannot be
 tests/cases/compiler/giant.ts(243,22): error TS1183: An implementation cannot be declared in ambient contexts.
 tests/cases/compiler/giant.ts(244,16): error TS2300: Duplicate identifier 'pgF'.
 tests/cases/compiler/giant.ts(244,22): error TS1183: An implementation cannot be declared in ambient contexts.
-tests/cases/compiler/giant.ts(245,20): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 tests/cases/compiler/giant.ts(245,20): error TS2300: Duplicate identifier 'pgF'.
 tests/cases/compiler/giant.ts(246,16): error TS2300: Duplicate identifier 'psF'.
 tests/cases/compiler/giant.ts(246,31): error TS1183: An implementation cannot be declared in ambient contexts.
-tests/cases/compiler/giant.ts(247,20): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 tests/cases/compiler/giant.ts(247,20): error TS2300: Duplicate identifier 'psF'.
 tests/cases/compiler/giant.ts(248,17): error TS2300: Duplicate identifier 'rgF'.
 tests/cases/compiler/giant.ts(248,23): error TS1183: An implementation cannot be declared in ambient contexts.
-tests/cases/compiler/giant.ts(249,21): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 tests/cases/compiler/giant.ts(249,21): error TS2300: Duplicate identifier 'rgF'.
 tests/cases/compiler/giant.ts(250,17): error TS2300: Duplicate identifier 'rsF'.
 tests/cases/compiler/giant.ts(250,32): error TS1183: An implementation cannot be declared in ambient contexts.
-tests/cases/compiler/giant.ts(251,21): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 tests/cases/compiler/giant.ts(251,21): error TS2300: Duplicate identifier 'rsF'.
 tests/cases/compiler/giant.ts(253,21): error TS1183: An implementation cannot be declared in ambient contexts.
 tests/cases/compiler/giant.ts(254,16): error TS2300: Duplicate identifier 'tsF'.
 tests/cases/compiler/giant.ts(254,31): error TS1183: An implementation cannot be declared in ambient contexts.
-tests/cases/compiler/giant.ts(255,20): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 tests/cases/compiler/giant.ts(255,20): error TS2300: Duplicate identifier 'tsF'.
 tests/cases/compiler/giant.ts(256,16): error TS2300: Duplicate identifier 'tgF'.
 tests/cases/compiler/giant.ts(256,22): error TS1183: An implementation cannot be declared in ambient contexts.
-tests/cases/compiler/giant.ts(257,20): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 tests/cases/compiler/giant.ts(257,20): error TS2300: Duplicate identifier 'tgF'.
 tests/cases/compiler/giant.ts(261,22): error TS1183: An implementation cannot be declared in ambient contexts.
 tests/cases/compiler/giant.ts(261,25): error TS1036: Statements are not allowed in ambient contexts.
@@ -178,28 +172,22 @@ tests/cases/compiler/giant.ts(500,21): error TS1183: An implementation cannot be
 tests/cases/compiler/giant.ts(501,22): error TS1183: An implementation cannot be declared in ambient contexts.
 tests/cases/compiler/giant.ts(502,16): error TS2300: Duplicate identifier 'pgF'.
 tests/cases/compiler/giant.ts(502,22): error TS1183: An implementation cannot be declared in ambient contexts.
-tests/cases/compiler/giant.ts(503,20): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 tests/cases/compiler/giant.ts(503,20): error TS2300: Duplicate identifier 'pgF'.
 tests/cases/compiler/giant.ts(504,16): error TS2300: Duplicate identifier 'psF'.
 tests/cases/compiler/giant.ts(504,31): error TS1183: An implementation cannot be declared in ambient contexts.
-tests/cases/compiler/giant.ts(505,20): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 tests/cases/compiler/giant.ts(505,20): error TS2300: Duplicate identifier 'psF'.
 tests/cases/compiler/giant.ts(506,17): error TS2300: Duplicate identifier 'rgF'.
 tests/cases/compiler/giant.ts(506,23): error TS1183: An implementation cannot be declared in ambient contexts.
-tests/cases/compiler/giant.ts(507,21): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 tests/cases/compiler/giant.ts(507,21): error TS2300: Duplicate identifier 'rgF'.
 tests/cases/compiler/giant.ts(508,17): error TS2300: Duplicate identifier 'rsF'.
 tests/cases/compiler/giant.ts(508,32): error TS1183: An implementation cannot be declared in ambient contexts.
-tests/cases/compiler/giant.ts(509,21): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 tests/cases/compiler/giant.ts(509,21): error TS2300: Duplicate identifier 'rsF'.
 tests/cases/compiler/giant.ts(511,21): error TS1183: An implementation cannot be declared in ambient contexts.
 tests/cases/compiler/giant.ts(512,16): error TS2300: Duplicate identifier 'tsF'.
 tests/cases/compiler/giant.ts(512,31): error TS1183: An implementation cannot be declared in ambient contexts.
-tests/cases/compiler/giant.ts(513,20): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 tests/cases/compiler/giant.ts(513,20): error TS2300: Duplicate identifier 'tsF'.
 tests/cases/compiler/giant.ts(514,16): error TS2300: Duplicate identifier 'tgF'.
 tests/cases/compiler/giant.ts(514,22): error TS1183: An implementation cannot be declared in ambient contexts.
-tests/cases/compiler/giant.ts(515,20): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 tests/cases/compiler/giant.ts(515,20): error TS2300: Duplicate identifier 'tgF'.
 tests/cases/compiler/giant.ts(519,22): error TS1183: An implementation cannot be declared in ambient contexts.
 tests/cases/compiler/giant.ts(519,25): error TS1036: Statements are not allowed in ambient contexts.
@@ -210,28 +198,22 @@ tests/cases/compiler/giant.ts(536,17): error TS1183: An implementation cannot be
 tests/cases/compiler/giant.ts(537,18): error TS1183: An implementation cannot be declared in ambient contexts.
 tests/cases/compiler/giant.ts(538,12): error TS2300: Duplicate identifier 'pgF'.
 tests/cases/compiler/giant.ts(538,18): error TS1183: An implementation cannot be declared in ambient contexts.
-tests/cases/compiler/giant.ts(539,16): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 tests/cases/compiler/giant.ts(539,16): error TS2300: Duplicate identifier 'pgF'.
 tests/cases/compiler/giant.ts(540,12): error TS2300: Duplicate identifier 'psF'.
 tests/cases/compiler/giant.ts(540,27): error TS1183: An implementation cannot be declared in ambient contexts.
-tests/cases/compiler/giant.ts(541,16): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 tests/cases/compiler/giant.ts(541,16): error TS2300: Duplicate identifier 'psF'.
 tests/cases/compiler/giant.ts(542,13): error TS2300: Duplicate identifier 'rgF'.
 tests/cases/compiler/giant.ts(542,19): error TS1183: An implementation cannot be declared in ambient contexts.
-tests/cases/compiler/giant.ts(543,17): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 tests/cases/compiler/giant.ts(543,17): error TS2300: Duplicate identifier 'rgF'.
 tests/cases/compiler/giant.ts(544,13): error TS2300: Duplicate identifier 'rsF'.
 tests/cases/compiler/giant.ts(544,28): error TS1183: An implementation cannot be declared in ambient contexts.
-tests/cases/compiler/giant.ts(545,17): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 tests/cases/compiler/giant.ts(545,17): error TS2300: Duplicate identifier 'rsF'.
 tests/cases/compiler/giant.ts(547,17): error TS1183: An implementation cannot be declared in ambient contexts.
 tests/cases/compiler/giant.ts(548,12): error TS2300: Duplicate identifier 'tsF'.
 tests/cases/compiler/giant.ts(548,27): error TS1183: An implementation cannot be declared in ambient contexts.
-tests/cases/compiler/giant.ts(549,16): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 tests/cases/compiler/giant.ts(549,16): error TS2300: Duplicate identifier 'tsF'.
 tests/cases/compiler/giant.ts(550,12): error TS2300: Duplicate identifier 'tgF'.
 tests/cases/compiler/giant.ts(550,18): error TS1183: An implementation cannot be declared in ambient contexts.
-tests/cases/compiler/giant.ts(551,16): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 tests/cases/compiler/giant.ts(551,16): error TS2300: Duplicate identifier 'tgF'.
 tests/cases/compiler/giant.ts(555,18): error TS1183: An implementation cannot be declared in ambient contexts.
 tests/cases/compiler/giant.ts(555,21): error TS1036: Statements are not allowed in ambient contexts.
@@ -265,7 +247,7 @@ tests/cases/compiler/giant.ts(671,25): error TS1036: Statements are not allowed
 tests/cases/compiler/giant.ts(675,30): error TS1183: An implementation cannot be declared in ambient contexts.
 
 
-==== tests/cases/compiler/giant.ts (265 errors) ====
+==== tests/cases/compiler/giant.ts (247 errors) ====
     /*
         Prefixes
         p -> public
@@ -666,8 +648,6 @@ tests/cases/compiler/giant.ts(675,30): error TS1183: An implementation cannot be
 !!! error TS1183: An implementation cannot be declared in ambient contexts.
             public get pgF()
                        ~~~
-!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-                       ~~~
 !!! error TS2300: Duplicate identifier 'pgF'.
             public psF(param:any) { }
                    ~~~
@@ -676,8 +656,6 @@ tests/cases/compiler/giant.ts(675,30): error TS1183: An implementation cannot be
 !!! error TS1183: An implementation cannot be declared in ambient contexts.
             public set psF(param:any)
                        ~~~
-!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-                       ~~~
 !!! error TS2300: Duplicate identifier 'psF'.
             private rgF() { }
                     ~~~
@@ -686,8 +664,6 @@ tests/cases/compiler/giant.ts(675,30): error TS1183: An implementation cannot be
 !!! error TS1183: An implementation cannot be declared in ambient contexts.
             private get rgF()
                         ~~~
-!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-                        ~~~
 !!! error TS2300: Duplicate identifier 'rgF'.
             private rsF(param:any) { }
                     ~~~
@@ -696,8 +672,6 @@ tests/cases/compiler/giant.ts(675,30): error TS1183: An implementation cannot be
 !!! error TS1183: An implementation cannot be declared in ambient contexts.
             private set rsF(param:any)
                         ~~~
-!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-                        ~~~
 !!! error TS2300: Duplicate identifier 'rsF'.
             static tV;
             static tF() { }
@@ -710,8 +684,6 @@ tests/cases/compiler/giant.ts(675,30): error TS1183: An implementation cannot be
 !!! error TS1183: An implementation cannot be declared in ambient contexts.
             static set tsF(param:any)
                        ~~~
-!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-                       ~~~
 !!! error TS2300: Duplicate identifier 'tsF'.
             static tgF() { }
                    ~~~
@@ -720,8 +692,6 @@ tests/cases/compiler/giant.ts(675,30): error TS1183: An implementation cannot be
 !!! error TS1183: An implementation cannot be declared in ambient contexts.
             static get tgF()
                        ~~~
-!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-                       ~~~
 !!! error TS2300: Duplicate identifier 'tgF'.
         }
         export declare module eaM {
@@ -1130,8 +1100,6 @@ tests/cases/compiler/giant.ts(675,30): error TS1183: An implementation cannot be
 !!! error TS1183: An implementation cannot be declared in ambient contexts.
             public get pgF()
                        ~~~
-!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-                       ~~~
 !!! error TS2300: Duplicate identifier 'pgF'.
             public psF(param:any) { }
                    ~~~
@@ -1140,8 +1108,6 @@ tests/cases/compiler/giant.ts(675,30): error TS1183: An implementation cannot be
 !!! error TS1183: An implementation cannot be declared in ambient contexts.
             public set psF(param:any)
                        ~~~
-!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-                       ~~~
 !!! error TS2300: Duplicate identifier 'psF'.
             private rgF() { }
                     ~~~
@@ -1150,8 +1116,6 @@ tests/cases/compiler/giant.ts(675,30): error TS1183: An implementation cannot be
 !!! error TS1183: An implementation cannot be declared in ambient contexts.
             private get rgF()
                         ~~~
-!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-                        ~~~
 !!! error TS2300: Duplicate identifier 'rgF'.
             private rsF(param:any) { }
                     ~~~
@@ -1160,8 +1124,6 @@ tests/cases/compiler/giant.ts(675,30): error TS1183: An implementation cannot be
 !!! error TS1183: An implementation cannot be declared in ambient contexts.
             private set rsF(param:any)
                         ~~~
-!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-                        ~~~
 !!! error TS2300: Duplicate identifier 'rsF'.
             static tV;
             static tF() { }
@@ -1174,8 +1136,6 @@ tests/cases/compiler/giant.ts(675,30): error TS1183: An implementation cannot be
 !!! error TS1183: An implementation cannot be declared in ambient contexts.
             static set tsF(param:any)
                        ~~~
-!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-                       ~~~
 !!! error TS2300: Duplicate identifier 'tsF'.
             static tgF() { }
                    ~~~
@@ -1184,8 +1144,6 @@ tests/cases/compiler/giant.ts(675,30): error TS1183: An implementation cannot be
 !!! error TS1183: An implementation cannot be declared in ambient contexts.
             static get tgF()
                        ~~~
-!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-                       ~~~
 !!! error TS2300: Duplicate identifier 'tgF'.
         }
         export declare module eaM {
@@ -1230,8 +1188,6 @@ tests/cases/compiler/giant.ts(675,30): error TS1183: An implementation cannot be
 !!! error TS1183: An implementation cannot be declared in ambient contexts.
         public get pgF()
                    ~~~
-!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-                   ~~~
 !!! error TS2300: Duplicate identifier 'pgF'.
         public psF(param:any) { }
                ~~~
@@ -1240,8 +1196,6 @@ tests/cases/compiler/giant.ts(675,30): error TS1183: An implementation cannot be
 !!! error TS1183: An implementation cannot be declared in ambient contexts.
         public set psF(param:any)
                    ~~~
-!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-                   ~~~
 !!! error TS2300: Duplicate identifier 'psF'.
         private rgF() { }
                 ~~~
@@ -1250,8 +1204,6 @@ tests/cases/compiler/giant.ts(675,30): error TS1183: An implementation cannot be
 !!! error TS1183: An implementation cannot be declared in ambient contexts.
         private get rgF()
                     ~~~
-!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-                    ~~~
 !!! error TS2300: Duplicate identifier 'rgF'.
         private rsF(param:any) { }
                 ~~~
@@ -1260,8 +1212,6 @@ tests/cases/compiler/giant.ts(675,30): error TS1183: An implementation cannot be
 !!! error TS1183: An implementation cannot be declared in ambient contexts.
         private set rsF(param:any)
                     ~~~
-!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-                    ~~~
 !!! error TS2300: Duplicate identifier 'rsF'.
         static tV;
         static tF() { }
@@ -1274,8 +1224,6 @@ tests/cases/compiler/giant.ts(675,30): error TS1183: An implementation cannot be
 !!! error TS1183: An implementation cannot be declared in ambient contexts.
         static set tsF(param:any)
                    ~~~
-!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-                   ~~~
 !!! error TS2300: Duplicate identifier 'tsF'.
         static tgF() { }
                ~~~
@@ -1284,8 +1232,6 @@ tests/cases/compiler/giant.ts(675,30): error TS1183: An implementation cannot be
 !!! error TS1183: An implementation cannot be declared in ambient contexts.
         static get tgF()
                    ~~~
-!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-                   ~~~
 !!! error TS2300: Duplicate identifier 'tgF'.
     }
     export declare module eaM {
diff --git a/tests/baselines/reference/giant.js b/tests/baselines/reference/giant.js
index e76937b00ab..85686faa01e 100644
--- a/tests/baselines/reference/giant.js
+++ b/tests/baselines/reference/giant.js
@@ -1237,19 +1237,19 @@ export declare module eM {
         pF(): void;
         private rF;
         pgF(): void;
-        readonly pgF: any;
+        get pgF(): any;
         psF(param: any): void;
-        psF: any;
+        set psF(param: any);
         private rgF;
-        private readonly rgF;
-        private rsF;
+        private get rgF();
         private rsF;
+        private set rsF(value);
         static tV: any;
         static tF(): void;
         static tsF(param: any): void;
-        static tsF: any;
+        static set tsF(param: any);
         static tgF(): void;
-        static readonly tgF: any;
+        static get tgF(): any;
     }
     module eaM {
         var V: any;
@@ -1277,19 +1277,19 @@ export declare class eaC {
     pF(): void;
     private rF;
     pgF(): void;
-    readonly pgF: any;
+    get pgF(): any;
     psF(param: any): void;
-    psF: any;
+    set psF(param: any);
     private rgF;
-    private readonly rgF;
-    private rsF;
+    private get rgF();
     private rsF;
+    private set rsF(value);
     static tV: any;
     static tF(): void;
     static tsF(param: any): void;
-    static tsF: any;
+    static set tsF(param: any);
     static tgF(): void;
-    static readonly tgF: any;
+    static get tgF(): any;
 }
 export declare module eaM {
     var V: any;
diff --git a/tests/baselines/reference/parserAccessors5.errors.txt b/tests/baselines/reference/parserAccessors5.errors.txt
index b7dcd8ef923..66f346e5ef7 100644
--- a/tests/baselines/reference/parserAccessors5.errors.txt
+++ b/tests/baselines/reference/parserAccessors5.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors5.ts(2,7): error TS1086: An accessor cannot be declared in an ambient context.
+tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors5.ts(2,13): error TS1183: An implementation cannot be declared in ambient contexts.
 
 
 ==== tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors5.ts (1 errors) ====
     declare class C {
       get foo() { return 0; }
-          ~~~
-!!! error TS1086: An accessor cannot be declared in an ambient context.
+                ~
+!!! error TS1183: An implementation cannot be declared in ambient contexts.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserAccessors6.errors.txt b/tests/baselines/reference/parserAccessors6.errors.txt
index 023ec6d79c3..13512269df3 100644
--- a/tests/baselines/reference/parserAccessors6.errors.txt
+++ b/tests/baselines/reference/parserAccessors6.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors6.ts(2,7): error TS1086: An accessor cannot be declared in an ambient context.
+tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors6.ts(2,14): error TS1183: An implementation cannot be declared in ambient contexts.
 
 
 ==== tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors6.ts (1 errors) ====
     declare class C {
       set foo(v) { }
-          ~~~
-!!! error TS1086: An accessor cannot be declared in an ambient context.
+                 ~
+!!! error TS1183: An implementation cannot be declared in ambient contexts.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserComputedPropertyName23.errors.txt b/tests/baselines/reference/parserComputedPropertyName23.errors.txt
index 8c95992253c..2ecf45eb697 100644
--- a/tests/baselines/reference/parserComputedPropertyName23.errors.txt
+++ b/tests/baselines/reference/parserComputedPropertyName23.errors.txt
@@ -1,12 +1,9 @@
-tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName23.ts(2,9): error TS1086: An accessor cannot be declared in an ambient context.
 tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName23.ts(2,10): error TS2304: Cannot find name 'e'.
 
 
-==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName23.ts (2 errors) ====
+==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName23.ts (1 errors) ====
     declare class C {
         get [e](): number 
-            ~~~
-!!! error TS1086: An accessor cannot be declared in an ambient context.
              ~
 !!! error TS2304: Cannot find name 'e'.
     }
\ No newline at end of file
diff --git a/tests/cases/conformance/classes/propertyMemberDeclarations/memberAccessorDeclarations/ambientAccessors.ts b/tests/cases/conformance/classes/propertyMemberDeclarations/memberAccessorDeclarations/ambientAccessors.ts
new file mode 100644
index 00000000000..44861363ad8
--- /dev/null
+++ b/tests/cases/conformance/classes/propertyMemberDeclarations/memberAccessorDeclarations/ambientAccessors.ts
@@ -0,0 +1,16 @@
+// @target: es3, es5
+// @declaration: true
+// ok to use accessors in ambient class in ES3
+declare class C {
+    static get a(): string;
+    static set a(value: string);
+
+    private static get b(): string;
+    private static set b(foo: string);
+
+    get x(): string;
+    set x(value: string);
+
+    private get y(): string;
+    private set y(foo: string);
+}
\ No newline at end of file
diff --git a/tests/cases/fourslash/codeFixAmbientClassExtendAbstractMethod.ts b/tests/cases/fourslash/codeFixAmbientClassExtendAbstractMethod.ts
new file mode 100644
index 00000000000..35da0b24faa
--- /dev/null
+++ b/tests/cases/fourslash/codeFixAmbientClassExtendAbstractMethod.ts
@@ -0,0 +1,31 @@
+/// <reference path='fourslash.ts' />
+
+////abstract class A {
+////    abstract f(a: number, b: string): boolean;
+////    abstract f(a: number, b: string): this;
+////    abstract f(a: string, b: number): Function;
+////    abstract f(a: string): Function;
+////    abstract foo(): number;
+////}
+////
+////declare class C extends A {}
+
+verify.codeFix({
+    description: "Implement inherited abstract class",
+    newFileContent:
+`abstract class A {
+    abstract f(a: number, b: string): boolean;
+    abstract f(a: number, b: string): this;
+    abstract f(a: string, b: number): Function;
+    abstract f(a: string): Function;
+    abstract foo(): number;
+}
+
+declare class C extends A {
+    f(a: number, b: string): boolean;
+    f(a: number, b: string): this;
+    f(a: string, b: number): Function;
+    f(a: string): Function;
+    foo(): number;
+}`
+});
diff --git a/tests/cases/fourslash/codeFixAmbientClassExtendAbstractMethod_all.ts b/tests/cases/fourslash/codeFixAmbientClassExtendAbstractMethod_all.ts
new file mode 100644
index 00000000000..699f5e8b495
--- /dev/null
+++ b/tests/cases/fourslash/codeFixAmbientClassExtendAbstractMethod_all.ts
@@ -0,0 +1,26 @@
+/// <reference path='fourslash.ts' />
+
+////abstract class A {
+////    abstract m(): void;
+////    abstract n(): void;
+////}
+////declare class B extends A {}
+////declare class C extends A {}
+
+verify.codeFixAll({
+    fixId: "fixClassDoesntImplementInheritedAbstractMember",
+    fixAllDescription: "Implement all inherited abstract classes",
+    newFileContent:
+`abstract class A {
+    abstract m(): void;
+    abstract n(): void;
+}
+declare class B extends A {
+    m(): void;
+    n(): void;
+}
+declare class C extends A {
+    m(): void;
+    n(): void;
+}`,
+});
diff --git a/tests/cases/fourslash/codeFixAmbientClassImplementClassAbstractGettersAndSetters.ts b/tests/cases/fourslash/codeFixAmbientClassImplementClassAbstractGettersAndSetters.ts
new file mode 100644
index 00000000000..1defadb5c7c
--- /dev/null
+++ b/tests/cases/fourslash/codeFixAmbientClassImplementClassAbstractGettersAndSetters.ts
@@ -0,0 +1,32 @@
+/// <reference path='fourslash.ts' />
+
+////abstract class A {
+////    abstract get a(): string;
+////    abstract set a(newName: string);
+////
+////    abstract get b(): number;
+////
+////    abstract set c(arg: number | string);
+////}
+////
+////declare class C implements A {}
+
+verify.codeFix({
+    description: "Implement interface 'A'",
+    newFileContent:
+`abstract class A {
+    abstract get a(): string;
+    abstract set a(newName: string);
+
+    abstract get b(): number;
+
+    abstract set c(arg: number | string);
+}
+
+declare class C implements A {
+    get a(): string;
+    set a(newName: string);
+    get b(): number;
+    set c(arg: string | number);
+}`,
+});
diff --git a/tests/cases/fourslash/codeFixAmbientClassImplementClassMethodViaHeritage.ts b/tests/cases/fourslash/codeFixAmbientClassImplementClassMethodViaHeritage.ts
new file mode 100644
index 00000000000..20bdd4a4a10
--- /dev/null
+++ b/tests/cases/fourslash/codeFixAmbientClassImplementClassMethodViaHeritage.ts
@@ -0,0 +1,16 @@
+/// <reference path='fourslash.ts' />
+
+//// class C1 {
+////     f1() {}
+//// }
+////
+//// class C2 extends C1 {
+////
+//// }
+////
+//// declare class C3 implements C2 {[|
+////     |]f2();
+//// }
+
+verify.rangeAfterCodeFix(`f1(): void;
+`);
diff --git a/tests/cases/fourslash/codeFixClassExtendAbstractGetterSetter.ts b/tests/cases/fourslash/codeFixClassExtendAbstractGetterSetter.ts
index 0a66f445cc7..00c140dfccc 100644
--- a/tests/cases/fourslash/codeFixClassExtendAbstractGetterSetter.ts
+++ b/tests/cases/fourslash/codeFixClassExtendAbstractGetterSetter.ts
@@ -38,12 +38,29 @@ verify.codeFix({
 abstract class B extends A {}
 
 class C extends A {
-    a: string | number;
-    b: this;
-    c: A;
-    d: string | number;
-    e: this;
-    f: A;
-    g: string;
+    get a(): string | number {
+        throw new Error("Method not implemented.");
+    }
+    get b(): this {
+        throw new Error("Method not implemented.");
+    }
+    get c(): A {
+        throw new Error("Method not implemented.");
+    }
+    set d(arg: string | number) {
+        throw new Error("Method not implemented.");
+    }
+    set e(arg: this) {
+        throw new Error("Method not implemented.");
+    }
+    set f(arg: A) {
+        throw new Error("Method not implemented.");
+    }
+    get g(): string {
+        throw new Error("Method not implemented.");
+    }
+    set g(newName: string) {
+        throw new Error("Method not implemented.");
+    }
 }`
 });
diff --git a/tests/cases/fourslash/codeFixClassImplementClassAbstractGettersAndSetters.ts b/tests/cases/fourslash/codeFixClassImplementClassAbstractGettersAndSetters.ts
index 71e0aba73b3..dad3c42964d 100644
--- a/tests/cases/fourslash/codeFixClassImplementClassAbstractGettersAndSetters.ts
+++ b/tests/cases/fourslash/codeFixClassImplementClassAbstractGettersAndSetters.ts
@@ -24,8 +24,17 @@ verify.codeFix({
 }
 
 class C implements A {
-    a: string;
-    b: number;
-    c: string | number;
+    get a(): string {
+        throw new Error("Method not implemented.");
+    }
+    set a(newName: string) {
+        throw new Error("Method not implemented.");
+    }
+    get b(): number {
+        throw new Error("Method not implemented.");
+    }
+    set c(arg: string | number) {
+        throw new Error("Method not implemented.");
+    }
 }`,
 });

From bf054ae79691a82136f73f1340dc133ea8769622 Mon Sep 17 00:00:00 2001
From: Ron Buckton <ron.buckton@microsoft.com>
Date: Mon, 12 Aug 2019 13:00:58 -0700
Subject: [PATCH 147/151] Add support for import.meta in System modules
 (#32797)

---
 src/compiler/checker.ts                       |   4 +-
 src/compiler/diagnosticMessages.json          |   2 +-
 src/compiler/transformers/module/system.ts    |  16 +-
 src/compiler/types.ts                         |   6 +
 src/compiler/utilities.ts                     |   6 +
 ...ta(module=commonjs,target=es5).errors.txt} |  52 +++---
 ...importMeta(module=commonjs,target=es5).js} |   2 +-
 ...tMeta(module=commonjs,target=es5).symbols} |   0
 ...ortMeta(module=commonjs,target=es5).types} |   0
 ...(module=commonjs,target=esnext).errors.txt | 110 ++++++++++++
 ...portMeta(module=commonjs,target=esnext).js |  71 ++++++++
 ...ta(module=commonjs,target=esnext).symbols} |   0
 ...Meta(module=commonjs,target=esnext).types} |   0
 ...Meta(module=esnext,target=es5).errors.txt} |   0
 .../importMeta(module=esnext,target=es5).js   | 110 ++++++++++++
 ...portMeta(module=esnext,target=es5).symbols | 101 +++++++++++
 ...importMeta(module=esnext,target=es5).types | 166 ++++++++++++++++++
 ...ta(module=esnext,target=esnext).errors.txt |  71 ++++++++
 ...mportMeta(module=esnext,target=esnext).js} |   0
 ...tMeta(module=esnext,target=esnext).symbols | 101 +++++++++++
 ...ortMeta(module=esnext,target=esnext).types | 166 ++++++++++++++++++
 ...tMeta(module=system,target=es5).errors.txt |  71 ++++++++
 .../importMeta(module=system,target=es5).js   | 150 ++++++++++++++++
 ...portMeta(module=system,target=es5).symbols | 101 +++++++++++
 ...importMeta(module=system,target=es5).types | 166 ++++++++++++++++++
 ...ta(module=system,target=esnext).errors.txt |  71 ++++++++
 ...importMeta(module=system,target=esnext).js | 102 +++++++++++
 ...tMeta(module=system,target=esnext).symbols | 101 +++++++++++
 ...ortMeta(module=system,target=esnext).types | 166 ++++++++++++++++++
 .../es2019/importMeta/importMeta.ts           |   4 +-
 .../es2019/importMeta/importMetaES5.ts        |  42 -----
 31 files changed, 1883 insertions(+), 75 deletions(-)
 rename tests/baselines/reference/{importMetaES5.errors.txt => importMeta(module=commonjs,target=es5).errors.txt} (79%)
 rename tests/baselines/reference/{importMetaES5.js => importMeta(module=commonjs,target=es5).js} (97%)
 rename tests/baselines/reference/{importMeta.symbols => importMeta(module=commonjs,target=es5).symbols} (100%)
 rename tests/baselines/reference/{importMeta.types => importMeta(module=commonjs,target=es5).types} (100%)
 create mode 100644 tests/baselines/reference/importMeta(module=commonjs,target=esnext).errors.txt
 create mode 100644 tests/baselines/reference/importMeta(module=commonjs,target=esnext).js
 rename tests/baselines/reference/{importMetaES5.symbols => importMeta(module=commonjs,target=esnext).symbols} (100%)
 rename tests/baselines/reference/{importMetaES5.types => importMeta(module=commonjs,target=esnext).types} (100%)
 rename tests/baselines/reference/{importMeta.errors.txt => importMeta(module=esnext,target=es5).errors.txt} (100%)
 create mode 100644 tests/baselines/reference/importMeta(module=esnext,target=es5).js
 create mode 100644 tests/baselines/reference/importMeta(module=esnext,target=es5).symbols
 create mode 100644 tests/baselines/reference/importMeta(module=esnext,target=es5).types
 create mode 100644 tests/baselines/reference/importMeta(module=esnext,target=esnext).errors.txt
 rename tests/baselines/reference/{importMeta.js => importMeta(module=esnext,target=esnext).js} (100%)
 create mode 100644 tests/baselines/reference/importMeta(module=esnext,target=esnext).symbols
 create mode 100644 tests/baselines/reference/importMeta(module=esnext,target=esnext).types
 create mode 100644 tests/baselines/reference/importMeta(module=system,target=es5).errors.txt
 create mode 100644 tests/baselines/reference/importMeta(module=system,target=es5).js
 create mode 100644 tests/baselines/reference/importMeta(module=system,target=es5).symbols
 create mode 100644 tests/baselines/reference/importMeta(module=system,target=es5).types
 create mode 100644 tests/baselines/reference/importMeta(module=system,target=esnext).errors.txt
 create mode 100644 tests/baselines/reference/importMeta(module=system,target=esnext).js
 create mode 100644 tests/baselines/reference/importMeta(module=system,target=esnext).symbols
 create mode 100644 tests/baselines/reference/importMeta(module=system,target=esnext).types
 delete mode 100644 tests/cases/conformance/es2019/importMeta/importMetaES5.ts

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 65f550cb664..62308cbfbbf 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -23161,8 +23161,8 @@ namespace ts {
         }
 
         function checkImportMetaProperty(node: MetaProperty) {
-            if (languageVersion < ScriptTarget.ESNext || moduleKind < ModuleKind.ESNext) {
-                error(node, Diagnostics.The_import_meta_meta_property_is_only_allowed_using_ESNext_for_the_target_and_module_compiler_options);
+            if (moduleKind !== ModuleKind.ESNext && moduleKind !== ModuleKind.System) {
+                error(node, Diagnostics.The_import_meta_meta_property_is_only_allowed_when_the_module_option_is_esnext_or_system);
             }
             const file = getSourceFileOfNode(node);
             Debug.assert(!!(file.flags & NodeFlags.PossiblyContainsImportMeta), "Containing file is missing import meta node flag.");
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index 5cca456dd49..e22d64e0f72 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -979,7 +979,7 @@
         "category": "Error",
         "code": 1342
     },
-    "The 'import.meta' meta-property is only allowed using 'ESNext' for the 'target' and 'module' compiler options.": {
+    "The 'import.meta' meta-property is only allowed when the '--module' option is 'esnext' or 'system'.": {
         "category": "Error",
         "code": 1343
     },
diff --git a/src/compiler/transformers/module/system.ts b/src/compiler/transformers/module/system.ts
index ae303440bc1..0607e8c77c7 100644
--- a/src/compiler/transformers/module/system.ts
+++ b/src/compiler/transformers/module/system.ts
@@ -24,12 +24,14 @@ namespace ts {
         context.enableSubstitution(SyntaxKind.BinaryExpression); // Substitutes assignments to exported symbols.
         context.enableSubstitution(SyntaxKind.PrefixUnaryExpression); // Substitutes updates to exported symbols.
         context.enableSubstitution(SyntaxKind.PostfixUnaryExpression); // Substitutes updates to exported symbols.
+        context.enableSubstitution(SyntaxKind.MetaProperty); // Substitutes 'import.meta'
         context.enableEmitNotification(SyntaxKind.SourceFile); // Restore state when substituting nodes in a file.
 
         const moduleInfoMap: ExternalModuleInfo[] = []; // The ExternalModuleInfo for each file.
         const deferredExports: (Statement[] | undefined)[] = []; // Exports to defer until an EndOfDeclarationMarker is found.
         const exportFunctionsMap: Identifier[] = []; // The export function associated with a source file.
         const noSubstitutionMap: boolean[][] = []; // Set of nodes for which substitution rules should be ignored for each file.
+        const contextObjectMap: Identifier[] = []; // The context object associated with a source file.
 
         let currentSourceFile: SourceFile; // The current file.
         let moduleInfo: ExternalModuleInfo; // ExternalModuleInfo for the current file.
@@ -75,7 +77,7 @@ namespace ts {
             // existing identifiers.
             exportFunction = createUniqueName("exports");
             exportFunctionsMap[id] = exportFunction;
-            contextObject = createUniqueName("context");
+            contextObject = contextObjectMap[id] = createUniqueName("context");
 
             // Add the body of the module.
             const dependencyGroups = collectDependencyGroups(moduleInfo.externalImports);
@@ -1586,6 +1588,7 @@ namespace ts {
                 moduleInfo = moduleInfoMap[id];
                 exportFunction = exportFunctionsMap[id];
                 noSubstitution = noSubstitutionMap[id];
+                contextObject = contextObjectMap[id];
 
                 if (noSubstitution) {
                     delete noSubstitutionMap[id];
@@ -1596,6 +1599,7 @@ namespace ts {
                 currentSourceFile = undefined!;
                 moduleInfo = undefined!;
                 exportFunction = undefined!;
+                contextObject = undefined!;
                 noSubstitution = undefined;
             }
             else {
@@ -1641,6 +1645,7 @@ namespace ts {
             }
             return node;
         }
+
         /**
          * Substitution for a ShorthandPropertyAssignment whose name that may contain an imported or exported symbol.
          *
@@ -1694,6 +1699,8 @@ namespace ts {
                 case SyntaxKind.PrefixUnaryExpression:
                 case SyntaxKind.PostfixUnaryExpression:
                     return substituteUnaryExpression(<PrefixUnaryExpression | PostfixUnaryExpression>node);
+                case SyntaxKind.MetaProperty:
+                    return substituteMetaProperty(<MetaProperty>node);
             }
 
             return node;
@@ -1830,6 +1837,13 @@ namespace ts {
             return node;
         }
 
+        function substituteMetaProperty(node: MetaProperty) {
+            if (isImportMeta(node)) {
+                return createPropertyAccess(contextObject, createIdentifier("meta"));
+            }
+            return node;
+        }
+
         /**
          * Gets the exports of a name.
          *
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index b04cac47143..02dcc828486 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -1864,6 +1864,12 @@ namespace ts {
         name: Identifier;
     }
 
+    /* @internal */
+    export interface ImportMetaProperty extends MetaProperty {
+        keywordToken: SyntaxKind.ImportKeyword;
+        name: Identifier & { escapedText: __String & "meta" };
+    }
+
     /// A JSX expression of the form <TagName attrs>...</TagName>
     export interface JsxElement extends PrimaryExpression {
         kind: SyntaxKind.JsxElement;
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index 02ca57919c9..c020c1e859e 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -987,6 +987,12 @@ namespace ts {
         return n.kind === SyntaxKind.CallExpression && (<CallExpression>n).expression.kind === SyntaxKind.ImportKeyword;
     }
 
+    export function isImportMeta(n: Node): n is ImportMetaProperty {
+        return isMetaProperty(n)
+            && n.keywordToken === SyntaxKind.ImportKeyword
+            && n.name.escapedText === "meta";
+    }
+
     export function isLiteralImportTypeNode(n: Node): n is LiteralImportTypeNode {
         return isImportTypeNode(n) && isLiteralTypeNode(n.argument) && isStringLiteral(n.argument.literal);
     }
diff --git a/tests/baselines/reference/importMetaES5.errors.txt b/tests/baselines/reference/importMeta(module=commonjs,target=es5).errors.txt
similarity index 79%
rename from tests/baselines/reference/importMetaES5.errors.txt
rename to tests/baselines/reference/importMeta(module=commonjs,target=es5).errors.txt
index 71b67efae01..6642c54ac48 100644
--- a/tests/baselines/reference/importMetaES5.errors.txt
+++ b/tests/baselines/reference/importMeta(module=commonjs,target=es5).errors.txt
@@ -1,26 +1,26 @@
 error TS2468: Cannot find global value 'Promise'.
-tests/cases/conformance/es2019/importMeta/assignmentTargets.ts(1,32): error TS1343: The 'import.meta' meta-property is only allowed using 'ESNext' for the 'target' and 'module' compiler options.
+tests/cases/conformance/es2019/importMeta/assignmentTargets.ts(1,32): error TS1343: The 'import.meta' meta-property is only allowed when the '--module' option is 'esnext' or 'system'.
 tests/cases/conformance/es2019/importMeta/assignmentTargets.ts(1,44): error TS2339: Property 'blah' does not exist on type 'ImportMeta'.
-tests/cases/conformance/es2019/importMeta/assignmentTargets.ts(1,51): error TS1343: The 'import.meta' meta-property is only allowed using 'ESNext' for the 'target' and 'module' compiler options.
+tests/cases/conformance/es2019/importMeta/assignmentTargets.ts(1,51): error TS1343: The 'import.meta' meta-property is only allowed when the '--module' option is 'esnext' or 'system'.
 tests/cases/conformance/es2019/importMeta/assignmentTargets.ts(1,63): error TS2339: Property 'blue' does not exist on type 'ImportMeta'.
-tests/cases/conformance/es2019/importMeta/assignmentTargets.ts(1,70): error TS1343: The 'import.meta' meta-property is only allowed using 'ESNext' for the 'target' and 'module' compiler options.
-tests/cases/conformance/es2019/importMeta/assignmentTargets.ts(2,1): error TS1343: The 'import.meta' meta-property is only allowed using 'ESNext' for the 'target' and 'module' compiler options.
+tests/cases/conformance/es2019/importMeta/assignmentTargets.ts(1,70): error TS1343: The 'import.meta' meta-property is only allowed when the '--module' option is 'esnext' or 'system'.
+tests/cases/conformance/es2019/importMeta/assignmentTargets.ts(2,1): error TS1343: The 'import.meta' meta-property is only allowed when the '--module' option is 'esnext' or 'system'.
 tests/cases/conformance/es2019/importMeta/assignmentTargets.ts(2,1): error TS2364: The left-hand side of an assignment expression must be a variable or a property access.
-tests/cases/conformance/es2019/importMeta/assignmentTargets.ts(11,21): error TS1343: The 'import.meta' meta-property is only allowed using 'ESNext' for the 'target' and 'module' compiler options.
+tests/cases/conformance/es2019/importMeta/assignmentTargets.ts(11,21): error TS1343: The 'import.meta' meta-property is only allowed when the '--module' option is 'esnext' or 'system'.
 tests/cases/conformance/es2019/importMeta/example.ts(2,2): error TS2705: An async function or method in ES5/ES3 requires the 'Promise' constructor.  Make sure you have a declaration for the 'Promise' constructor or include 'ES2015' in your `--lib` option.
-tests/cases/conformance/es2019/importMeta/example.ts(3,59): error TS1343: The 'import.meta' meta-property is only allowed using 'ESNext' for the 'target' and 'module' compiler options.
+tests/cases/conformance/es2019/importMeta/example.ts(3,59): error TS1343: The 'import.meta' meta-property is only allowed when the '--module' option is 'esnext' or 'system'.
 tests/cases/conformance/es2019/importMeta/example.ts(3,71): error TS2339: Property 'url' does not exist on type 'ImportMeta'.
-tests/cases/conformance/es2019/importMeta/example.ts(6,16): error TS1343: The 'import.meta' meta-property is only allowed using 'ESNext' for the 'target' and 'module' compiler options.
+tests/cases/conformance/es2019/importMeta/example.ts(6,16): error TS1343: The 'import.meta' meta-property is only allowed when the '--module' option is 'esnext' or 'system'.
 tests/cases/conformance/es2019/importMeta/example.ts(6,28): error TS2339: Property 'scriptElement' does not exist on type 'ImportMeta'.
-tests/cases/conformance/es2019/importMeta/moduleLookingFile01.ts(1,16): error TS1343: The 'import.meta' meta-property is only allowed using 'ESNext' for the 'target' and 'module' compiler options.
-tests/cases/conformance/es2019/importMeta/moduleLookingFile01.ts(2,16): error TS1343: The 'import.meta' meta-property is only allowed using 'ESNext' for the 'target' and 'module' compiler options.
+tests/cases/conformance/es2019/importMeta/moduleLookingFile01.ts(1,16): error TS1343: The 'import.meta' meta-property is only allowed when the '--module' option is 'esnext' or 'system'.
+tests/cases/conformance/es2019/importMeta/moduleLookingFile01.ts(2,16): error TS1343: The 'import.meta' meta-property is only allowed when the '--module' option is 'esnext' or 'system'.
 tests/cases/conformance/es2019/importMeta/moduleLookingFile01.ts(2,23): error TS17012: 'metal' is not a valid meta-property for keyword 'import'. Did you mean 'meta'?
-tests/cases/conformance/es2019/importMeta/moduleLookingFile01.ts(3,16): error TS1343: The 'import.meta' meta-property is only allowed using 'ESNext' for the 'target' and 'module' compiler options.
+tests/cases/conformance/es2019/importMeta/moduleLookingFile01.ts(3,16): error TS1343: The 'import.meta' meta-property is only allowed when the '--module' option is 'esnext' or 'system'.
 tests/cases/conformance/es2019/importMeta/moduleLookingFile01.ts(3,23): error TS17012: 'import' is not a valid meta-property for keyword 'import'. Did you mean 'meta'?
-tests/cases/conformance/es2019/importMeta/scriptLookingFile01.ts(1,15): error TS1343: The 'import.meta' meta-property is only allowed using 'ESNext' for the 'target' and 'module' compiler options.
-tests/cases/conformance/es2019/importMeta/scriptLookingFile01.ts(2,15): error TS1343: The 'import.meta' meta-property is only allowed using 'ESNext' for the 'target' and 'module' compiler options.
+tests/cases/conformance/es2019/importMeta/scriptLookingFile01.ts(1,15): error TS1343: The 'import.meta' meta-property is only allowed when the '--module' option is 'esnext' or 'system'.
+tests/cases/conformance/es2019/importMeta/scriptLookingFile01.ts(2,15): error TS1343: The 'import.meta' meta-property is only allowed when the '--module' option is 'esnext' or 'system'.
 tests/cases/conformance/es2019/importMeta/scriptLookingFile01.ts(2,22): error TS17012: 'metal' is not a valid meta-property for keyword 'import'. Did you mean 'meta'?
-tests/cases/conformance/es2019/importMeta/scriptLookingFile01.ts(3,15): error TS1343: The 'import.meta' meta-property is only allowed using 'ESNext' for the 'target' and 'module' compiler options.
+tests/cases/conformance/es2019/importMeta/scriptLookingFile01.ts(3,15): error TS1343: The 'import.meta' meta-property is only allowed when the '--module' option is 'esnext' or 'system'.
 tests/cases/conformance/es2019/importMeta/scriptLookingFile01.ts(3,22): error TS17012: 'import' is not a valid meta-property for keyword 'import'. Did you mean 'meta'?
 
 
@@ -32,14 +32,14 @@ tests/cases/conformance/es2019/importMeta/scriptLookingFile01.ts(3,22): error TS
 !!! error TS2705: An async function or method in ES5/ES3 requires the 'Promise' constructor.  Make sure you have a declaration for the 'Promise' constructor or include 'ES2015' in your `--lib` option.
       const response = await fetch(new URL("../hamsters.jpg", import.meta.url).toString());
                                                               ~~~~~~~~~~~
-!!! error TS1343: The 'import.meta' meta-property is only allowed using 'ESNext' for the 'target' and 'module' compiler options.
+!!! error TS1343: The 'import.meta' meta-property is only allowed when the '--module' option is 'esnext' or 'system'.
                                                                           ~~~
 !!! error TS2339: Property 'url' does not exist on type 'ImportMeta'.
       const blob = await response.blob();
     
       const size = import.meta.scriptElement.dataset.size || 300;
                    ~~~~~~~~~~~
-!!! error TS1343: The 'import.meta' meta-property is only allowed using 'ESNext' for the 'target' and 'module' compiler options.
+!!! error TS1343: The 'import.meta' meta-property is only allowed when the '--module' option is 'esnext' or 'system'.
                                ~~~~~~~~~~~~~
 !!! error TS2339: Property 'scriptElement' does not exist on type 'ImportMeta'.
     
@@ -53,48 +53,48 @@ tests/cases/conformance/es2019/importMeta/scriptLookingFile01.ts(3,22): error TS
 ==== tests/cases/conformance/es2019/importMeta/moduleLookingFile01.ts (5 errors) ====
     export let x = import.meta;
                    ~~~~~~~~~~~
-!!! error TS1343: The 'import.meta' meta-property is only allowed using 'ESNext' for the 'target' and 'module' compiler options.
+!!! error TS1343: The 'import.meta' meta-property is only allowed when the '--module' option is 'esnext' or 'system'.
     export let y = import.metal;
                    ~~~~~~~~~~~~
-!!! error TS1343: The 'import.meta' meta-property is only allowed using 'ESNext' for the 'target' and 'module' compiler options.
+!!! error TS1343: The 'import.meta' meta-property is only allowed when the '--module' option is 'esnext' or 'system'.
                           ~~~~~
 !!! error TS17012: 'metal' is not a valid meta-property for keyword 'import'. Did you mean 'meta'?
     export let z = import.import.import.malkovich;
                    ~~~~~~~~~~~~~
-!!! error TS1343: The 'import.meta' meta-property is only allowed using 'ESNext' for the 'target' and 'module' compiler options.
+!!! error TS1343: The 'import.meta' meta-property is only allowed when the '--module' option is 'esnext' or 'system'.
                           ~~~~~~
 !!! error TS17012: 'import' is not a valid meta-property for keyword 'import'. Did you mean 'meta'?
     
 ==== tests/cases/conformance/es2019/importMeta/scriptLookingFile01.ts (5 errors) ====
     let globalA = import.meta;
                   ~~~~~~~~~~~
-!!! error TS1343: The 'import.meta' meta-property is only allowed using 'ESNext' for the 'target' and 'module' compiler options.
+!!! error TS1343: The 'import.meta' meta-property is only allowed when the '--module' option is 'esnext' or 'system'.
     let globalB = import.metal;
                   ~~~~~~~~~~~~
-!!! error TS1343: The 'import.meta' meta-property is only allowed using 'ESNext' for the 'target' and 'module' compiler options.
+!!! error TS1343: The 'import.meta' meta-property is only allowed when the '--module' option is 'esnext' or 'system'.
                          ~~~~~
 !!! error TS17012: 'metal' is not a valid meta-property for keyword 'import'. Did you mean 'meta'?
     let globalC = import.import.import.malkovich;
                   ~~~~~~~~~~~~~
-!!! error TS1343: The 'import.meta' meta-property is only allowed using 'ESNext' for the 'target' and 'module' compiler options.
+!!! error TS1343: The 'import.meta' meta-property is only allowed when the '--module' option is 'esnext' or 'system'.
                          ~~~~~~
 !!! error TS17012: 'import' is not a valid meta-property for keyword 'import'. Did you mean 'meta'?
     
 ==== tests/cases/conformance/es2019/importMeta/assignmentTargets.ts (8 errors) ====
     export const foo: ImportMeta = import.meta.blah = import.meta.blue = import.meta;
                                    ~~~~~~~~~~~
-!!! error TS1343: The 'import.meta' meta-property is only allowed using 'ESNext' for the 'target' and 'module' compiler options.
+!!! error TS1343: The 'import.meta' meta-property is only allowed when the '--module' option is 'esnext' or 'system'.
                                                ~~~~
 !!! error TS2339: Property 'blah' does not exist on type 'ImportMeta'.
                                                       ~~~~~~~~~~~
-!!! error TS1343: The 'import.meta' meta-property is only allowed using 'ESNext' for the 'target' and 'module' compiler options.
+!!! error TS1343: The 'import.meta' meta-property is only allowed when the '--module' option is 'esnext' or 'system'.
                                                                   ~~~~
 !!! error TS2339: Property 'blue' does not exist on type 'ImportMeta'.
                                                                          ~~~~~~~~~~~
-!!! error TS1343: The 'import.meta' meta-property is only allowed using 'ESNext' for the 'target' and 'module' compiler options.
+!!! error TS1343: The 'import.meta' meta-property is only allowed when the '--module' option is 'esnext' or 'system'.
     import.meta = foo;
     ~~~~~~~~~~~
-!!! error TS1343: The 'import.meta' meta-property is only allowed using 'ESNext' for the 'target' and 'module' compiler options.
+!!! error TS1343: The 'import.meta' meta-property is only allowed when the '--module' option is 'esnext' or 'system'.
     ~~~~~~~~~~~
 !!! error TS2364: The left-hand side of an assignment expression must be a variable or a property access.
     
@@ -107,4 +107,4 @@ tests/cases/conformance/es2019/importMeta/scriptLookingFile01.ts(3,22): error TS
     
     const { a, b, c } = import.meta.wellKnownProperty;
                         ~~~~~~~~~~~
-!!! error TS1343: The 'import.meta' meta-property is only allowed using 'ESNext' for the 'target' and 'module' compiler options.
\ No newline at end of file
+!!! error TS1343: The 'import.meta' meta-property is only allowed when the '--module' option is 'esnext' or 'system'.
\ No newline at end of file
diff --git a/tests/baselines/reference/importMetaES5.js b/tests/baselines/reference/importMeta(module=commonjs,target=es5).js
similarity index 97%
rename from tests/baselines/reference/importMetaES5.js
rename to tests/baselines/reference/importMeta(module=commonjs,target=es5).js
index 6b69557e419..1a8c764dd32 100644
--- a/tests/baselines/reference/importMetaES5.js
+++ b/tests/baselines/reference/importMeta(module=commonjs,target=es5).js
@@ -1,4 +1,4 @@
-//// [tests/cases/conformance/es2019/importMeta/importMetaES5.ts] ////
+//// [tests/cases/conformance/es2019/importMeta/importMeta.ts] ////
 
 //// [example.ts]
 // Adapted from https://github.com/tc39/proposal-import-meta/tree/c3902a9ffe2e69a7ac42c19d7ea74cbdcea9b7fb#example
diff --git a/tests/baselines/reference/importMeta.symbols b/tests/baselines/reference/importMeta(module=commonjs,target=es5).symbols
similarity index 100%
rename from tests/baselines/reference/importMeta.symbols
rename to tests/baselines/reference/importMeta(module=commonjs,target=es5).symbols
diff --git a/tests/baselines/reference/importMeta.types b/tests/baselines/reference/importMeta(module=commonjs,target=es5).types
similarity index 100%
rename from tests/baselines/reference/importMeta.types
rename to tests/baselines/reference/importMeta(module=commonjs,target=es5).types
diff --git a/tests/baselines/reference/importMeta(module=commonjs,target=esnext).errors.txt b/tests/baselines/reference/importMeta(module=commonjs,target=esnext).errors.txt
new file mode 100644
index 00000000000..6642c54ac48
--- /dev/null
+++ b/tests/baselines/reference/importMeta(module=commonjs,target=esnext).errors.txt
@@ -0,0 +1,110 @@
+error TS2468: Cannot find global value 'Promise'.
+tests/cases/conformance/es2019/importMeta/assignmentTargets.ts(1,32): error TS1343: The 'import.meta' meta-property is only allowed when the '--module' option is 'esnext' or 'system'.
+tests/cases/conformance/es2019/importMeta/assignmentTargets.ts(1,44): error TS2339: Property 'blah' does not exist on type 'ImportMeta'.
+tests/cases/conformance/es2019/importMeta/assignmentTargets.ts(1,51): error TS1343: The 'import.meta' meta-property is only allowed when the '--module' option is 'esnext' or 'system'.
+tests/cases/conformance/es2019/importMeta/assignmentTargets.ts(1,63): error TS2339: Property 'blue' does not exist on type 'ImportMeta'.
+tests/cases/conformance/es2019/importMeta/assignmentTargets.ts(1,70): error TS1343: The 'import.meta' meta-property is only allowed when the '--module' option is 'esnext' or 'system'.
+tests/cases/conformance/es2019/importMeta/assignmentTargets.ts(2,1): error TS1343: The 'import.meta' meta-property is only allowed when the '--module' option is 'esnext' or 'system'.
+tests/cases/conformance/es2019/importMeta/assignmentTargets.ts(2,1): error TS2364: The left-hand side of an assignment expression must be a variable or a property access.
+tests/cases/conformance/es2019/importMeta/assignmentTargets.ts(11,21): error TS1343: The 'import.meta' meta-property is only allowed when the '--module' option is 'esnext' or 'system'.
+tests/cases/conformance/es2019/importMeta/example.ts(2,2): error TS2705: An async function or method in ES5/ES3 requires the 'Promise' constructor.  Make sure you have a declaration for the 'Promise' constructor or include 'ES2015' in your `--lib` option.
+tests/cases/conformance/es2019/importMeta/example.ts(3,59): error TS1343: The 'import.meta' meta-property is only allowed when the '--module' option is 'esnext' or 'system'.
+tests/cases/conformance/es2019/importMeta/example.ts(3,71): error TS2339: Property 'url' does not exist on type 'ImportMeta'.
+tests/cases/conformance/es2019/importMeta/example.ts(6,16): error TS1343: The 'import.meta' meta-property is only allowed when the '--module' option is 'esnext' or 'system'.
+tests/cases/conformance/es2019/importMeta/example.ts(6,28): error TS2339: Property 'scriptElement' does not exist on type 'ImportMeta'.
+tests/cases/conformance/es2019/importMeta/moduleLookingFile01.ts(1,16): error TS1343: The 'import.meta' meta-property is only allowed when the '--module' option is 'esnext' or 'system'.
+tests/cases/conformance/es2019/importMeta/moduleLookingFile01.ts(2,16): error TS1343: The 'import.meta' meta-property is only allowed when the '--module' option is 'esnext' or 'system'.
+tests/cases/conformance/es2019/importMeta/moduleLookingFile01.ts(2,23): error TS17012: 'metal' is not a valid meta-property for keyword 'import'. Did you mean 'meta'?
+tests/cases/conformance/es2019/importMeta/moduleLookingFile01.ts(3,16): error TS1343: The 'import.meta' meta-property is only allowed when the '--module' option is 'esnext' or 'system'.
+tests/cases/conformance/es2019/importMeta/moduleLookingFile01.ts(3,23): error TS17012: 'import' is not a valid meta-property for keyword 'import'. Did you mean 'meta'?
+tests/cases/conformance/es2019/importMeta/scriptLookingFile01.ts(1,15): error TS1343: The 'import.meta' meta-property is only allowed when the '--module' option is 'esnext' or 'system'.
+tests/cases/conformance/es2019/importMeta/scriptLookingFile01.ts(2,15): error TS1343: The 'import.meta' meta-property is only allowed when the '--module' option is 'esnext' or 'system'.
+tests/cases/conformance/es2019/importMeta/scriptLookingFile01.ts(2,22): error TS17012: 'metal' is not a valid meta-property for keyword 'import'. Did you mean 'meta'?
+tests/cases/conformance/es2019/importMeta/scriptLookingFile01.ts(3,15): error TS1343: The 'import.meta' meta-property is only allowed when the '--module' option is 'esnext' or 'system'.
+tests/cases/conformance/es2019/importMeta/scriptLookingFile01.ts(3,22): error TS17012: 'import' is not a valid meta-property for keyword 'import'. Did you mean 'meta'?
+
+
+!!! error TS2468: Cannot find global value 'Promise'.
+==== tests/cases/conformance/es2019/importMeta/example.ts (5 errors) ====
+    // Adapted from https://github.com/tc39/proposal-import-meta/tree/c3902a9ffe2e69a7ac42c19d7ea74cbdcea9b7fb#example
+    (async () => {
+     ~~~~~~~~~~~~~
+!!! error TS2705: An async function or method in ES5/ES3 requires the 'Promise' constructor.  Make sure you have a declaration for the 'Promise' constructor or include 'ES2015' in your `--lib` option.
+      const response = await fetch(new URL("../hamsters.jpg", import.meta.url).toString());
+                                                              ~~~~~~~~~~~
+!!! error TS1343: The 'import.meta' meta-property is only allowed when the '--module' option is 'esnext' or 'system'.
+                                                                          ~~~
+!!! error TS2339: Property 'url' does not exist on type 'ImportMeta'.
+      const blob = await response.blob();
+    
+      const size = import.meta.scriptElement.dataset.size || 300;
+                   ~~~~~~~~~~~
+!!! error TS1343: The 'import.meta' meta-property is only allowed when the '--module' option is 'esnext' or 'system'.
+                               ~~~~~~~~~~~~~
+!!! error TS2339: Property 'scriptElement' does not exist on type 'ImportMeta'.
+    
+      const image = new Image();
+      image.src = URL.createObjectURL(blob);
+      image.width = image.height = size;
+    
+      document.body.appendChild(image);
+    })();
+    
+==== tests/cases/conformance/es2019/importMeta/moduleLookingFile01.ts (5 errors) ====
+    export let x = import.meta;
+                   ~~~~~~~~~~~
+!!! error TS1343: The 'import.meta' meta-property is only allowed when the '--module' option is 'esnext' or 'system'.
+    export let y = import.metal;
+                   ~~~~~~~~~~~~
+!!! error TS1343: The 'import.meta' meta-property is only allowed when the '--module' option is 'esnext' or 'system'.
+                          ~~~~~
+!!! error TS17012: 'metal' is not a valid meta-property for keyword 'import'. Did you mean 'meta'?
+    export let z = import.import.import.malkovich;
+                   ~~~~~~~~~~~~~
+!!! error TS1343: The 'import.meta' meta-property is only allowed when the '--module' option is 'esnext' or 'system'.
+                          ~~~~~~
+!!! error TS17012: 'import' is not a valid meta-property for keyword 'import'. Did you mean 'meta'?
+    
+==== tests/cases/conformance/es2019/importMeta/scriptLookingFile01.ts (5 errors) ====
+    let globalA = import.meta;
+                  ~~~~~~~~~~~
+!!! error TS1343: The 'import.meta' meta-property is only allowed when the '--module' option is 'esnext' or 'system'.
+    let globalB = import.metal;
+                  ~~~~~~~~~~~~
+!!! error TS1343: The 'import.meta' meta-property is only allowed when the '--module' option is 'esnext' or 'system'.
+                         ~~~~~
+!!! error TS17012: 'metal' is not a valid meta-property for keyword 'import'. Did you mean 'meta'?
+    let globalC = import.import.import.malkovich;
+                  ~~~~~~~~~~~~~
+!!! error TS1343: The 'import.meta' meta-property is only allowed when the '--module' option is 'esnext' or 'system'.
+                         ~~~~~~
+!!! error TS17012: 'import' is not a valid meta-property for keyword 'import'. Did you mean 'meta'?
+    
+==== tests/cases/conformance/es2019/importMeta/assignmentTargets.ts (8 errors) ====
+    export const foo: ImportMeta = import.meta.blah = import.meta.blue = import.meta;
+                                   ~~~~~~~~~~~
+!!! error TS1343: The 'import.meta' meta-property is only allowed when the '--module' option is 'esnext' or 'system'.
+                                               ~~~~
+!!! error TS2339: Property 'blah' does not exist on type 'ImportMeta'.
+                                                      ~~~~~~~~~~~
+!!! error TS1343: The 'import.meta' meta-property is only allowed when the '--module' option is 'esnext' or 'system'.
+                                                                  ~~~~
+!!! error TS2339: Property 'blue' does not exist on type 'ImportMeta'.
+                                                                         ~~~~~~~~~~~
+!!! error TS1343: The 'import.meta' meta-property is only allowed when the '--module' option is 'esnext' or 'system'.
+    import.meta = foo;
+    ~~~~~~~~~~~
+!!! error TS1343: The 'import.meta' meta-property is only allowed when the '--module' option is 'esnext' or 'system'.
+    ~~~~~~~~~~~
+!!! error TS2364: The left-hand side of an assignment expression must be a variable or a property access.
+    
+    // @Filename augmentations.ts
+    declare global {
+      interface ImportMeta {
+        wellKnownProperty: { a: number, b: string, c: boolean };
+      }
+    }
+    
+    const { a, b, c } = import.meta.wellKnownProperty;
+                        ~~~~~~~~~~~
+!!! error TS1343: The 'import.meta' meta-property is only allowed when the '--module' option is 'esnext' or 'system'.
\ No newline at end of file
diff --git a/tests/baselines/reference/importMeta(module=commonjs,target=esnext).js b/tests/baselines/reference/importMeta(module=commonjs,target=esnext).js
new file mode 100644
index 00000000000..15dcfe01d29
--- /dev/null
+++ b/tests/baselines/reference/importMeta(module=commonjs,target=esnext).js
@@ -0,0 +1,71 @@
+//// [tests/cases/conformance/es2019/importMeta/importMeta.ts] ////
+
+//// [example.ts]
+// Adapted from https://github.com/tc39/proposal-import-meta/tree/c3902a9ffe2e69a7ac42c19d7ea74cbdcea9b7fb#example
+(async () => {
+  const response = await fetch(new URL("../hamsters.jpg", import.meta.url).toString());
+  const blob = await response.blob();
+
+  const size = import.meta.scriptElement.dataset.size || 300;
+
+  const image = new Image();
+  image.src = URL.createObjectURL(blob);
+  image.width = image.height = size;
+
+  document.body.appendChild(image);
+})();
+
+//// [moduleLookingFile01.ts]
+export let x = import.meta;
+export let y = import.metal;
+export let z = import.import.import.malkovich;
+
+//// [scriptLookingFile01.ts]
+let globalA = import.meta;
+let globalB = import.metal;
+let globalC = import.import.import.malkovich;
+
+//// [assignmentTargets.ts]
+export const foo: ImportMeta = import.meta.blah = import.meta.blue = import.meta;
+import.meta = foo;
+
+// @Filename augmentations.ts
+declare global {
+  interface ImportMeta {
+    wellKnownProperty: { a: number, b: string, c: boolean };
+  }
+}
+
+const { a, b, c } = import.meta.wellKnownProperty;
+
+//// [example.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+// Adapted from https://github.com/tc39/proposal-import-meta/tree/c3902a9ffe2e69a7ac42c19d7ea74cbdcea9b7fb#example
+(async () => {
+    const response = await fetch(new URL("../hamsters.jpg", import.meta.url).toString());
+    const blob = await response.blob();
+    const size = import.meta.scriptElement.dataset.size || 300;
+    const image = new Image();
+    image.src = URL.createObjectURL(blob);
+    image.width = image.height = size;
+    document.body.appendChild(image);
+})();
+//// [moduleLookingFile01.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.x = (import.meta);
+exports.y = (import.metal);
+exports.z = import.import.import.malkovich;
+//// [scriptLookingFile01.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+let globalA = import.meta;
+let globalB = import.metal;
+let globalC = import.import.import.malkovich;
+//// [assignmentTargets.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.foo = import.meta.blah = import.meta.blue = import.meta;
+import.meta = exports.foo;
+const { a, b, c } = import.meta.wellKnownProperty;
diff --git a/tests/baselines/reference/importMetaES5.symbols b/tests/baselines/reference/importMeta(module=commonjs,target=esnext).symbols
similarity index 100%
rename from tests/baselines/reference/importMetaES5.symbols
rename to tests/baselines/reference/importMeta(module=commonjs,target=esnext).symbols
diff --git a/tests/baselines/reference/importMetaES5.types b/tests/baselines/reference/importMeta(module=commonjs,target=esnext).types
similarity index 100%
rename from tests/baselines/reference/importMetaES5.types
rename to tests/baselines/reference/importMeta(module=commonjs,target=esnext).types
diff --git a/tests/baselines/reference/importMeta.errors.txt b/tests/baselines/reference/importMeta(module=esnext,target=es5).errors.txt
similarity index 100%
rename from tests/baselines/reference/importMeta.errors.txt
rename to tests/baselines/reference/importMeta(module=esnext,target=es5).errors.txt
diff --git a/tests/baselines/reference/importMeta(module=esnext,target=es5).js b/tests/baselines/reference/importMeta(module=esnext,target=es5).js
new file mode 100644
index 00000000000..57a51318e25
--- /dev/null
+++ b/tests/baselines/reference/importMeta(module=esnext,target=es5).js
@@ -0,0 +1,110 @@
+//// [tests/cases/conformance/es2019/importMeta/importMeta.ts] ////
+
+//// [example.ts]
+// Adapted from https://github.com/tc39/proposal-import-meta/tree/c3902a9ffe2e69a7ac42c19d7ea74cbdcea9b7fb#example
+(async () => {
+  const response = await fetch(new URL("../hamsters.jpg", import.meta.url).toString());
+  const blob = await response.blob();
+
+  const size = import.meta.scriptElement.dataset.size || 300;
+
+  const image = new Image();
+  image.src = URL.createObjectURL(blob);
+  image.width = image.height = size;
+
+  document.body.appendChild(image);
+})();
+
+//// [moduleLookingFile01.ts]
+export let x = import.meta;
+export let y = import.metal;
+export let z = import.import.import.malkovich;
+
+//// [scriptLookingFile01.ts]
+let globalA = import.meta;
+let globalB = import.metal;
+let globalC = import.import.import.malkovich;
+
+//// [assignmentTargets.ts]
+export const foo: ImportMeta = import.meta.blah = import.meta.blue = import.meta;
+import.meta = foo;
+
+// @Filename augmentations.ts
+declare global {
+  interface ImportMeta {
+    wellKnownProperty: { a: number, b: string, c: boolean };
+  }
+}
+
+const { a, b, c } = import.meta.wellKnownProperty;
+
+//// [example.js]
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+var _this = this;
+// Adapted from https://github.com/tc39/proposal-import-meta/tree/c3902a9ffe2e69a7ac42c19d7ea74cbdcea9b7fb#example
+(function () { return __awaiter(_this, void 0, void 0, function () {
+    var response, blob, size, image;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0: return [4 /*yield*/, fetch(new URL("../hamsters.jpg", import.meta.url).toString())];
+            case 1:
+                response = _a.sent();
+                return [4 /*yield*/, response.blob()];
+            case 2:
+                blob = _a.sent();
+                size = import.meta.scriptElement.dataset.size || 300;
+                image = new Image();
+                image.src = URL.createObjectURL(blob);
+                image.width = image.height = size;
+                document.body.appendChild(image);
+                return [2 /*return*/];
+        }
+    });
+}); })();
+//// [moduleLookingFile01.js]
+export var x = import.meta;
+export var y = import.metal;
+export var z = import.import.import.malkovich;
+//// [scriptLookingFile01.js]
+var globalA = import.meta;
+var globalB = import.metal;
+var globalC = import.import.import.malkovich;
+//// [assignmentTargets.js]
+export var foo = import.meta.blah = import.meta.blue = import.meta;
+import.meta = foo;
+var _a = import.meta.wellKnownProperty, a = _a.a, b = _a.b, c = _a.c;
diff --git a/tests/baselines/reference/importMeta(module=esnext,target=es5).symbols b/tests/baselines/reference/importMeta(module=esnext,target=es5).symbols
new file mode 100644
index 00000000000..d21785639ed
--- /dev/null
+++ b/tests/baselines/reference/importMeta(module=esnext,target=es5).symbols
@@ -0,0 +1,101 @@
+=== tests/cases/conformance/es2019/importMeta/example.ts ===
+// Adapted from https://github.com/tc39/proposal-import-meta/tree/c3902a9ffe2e69a7ac42c19d7ea74cbdcea9b7fb#example
+(async () => {
+  const response = await fetch(new URL("../hamsters.jpg", import.meta.url).toString());
+>response : Symbol(response, Decl(example.ts, 2, 7))
+>fetch : Symbol(fetch, Decl(lib.dom.d.ts, --, --))
+>new URL("../hamsters.jpg", import.meta.url).toString : Symbol(Object.toString, Decl(lib.es5.d.ts, --, --))
+>URL : Symbol(URL, Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --))
+>toString : Symbol(Object.toString, Decl(lib.es5.d.ts, --, --))
+
+  const blob = await response.blob();
+>blob : Symbol(blob, Decl(example.ts, 3, 7))
+>response.blob : Symbol(Body.blob, Decl(lib.dom.d.ts, --, --))
+>response : Symbol(response, Decl(example.ts, 2, 7))
+>blob : Symbol(Body.blob, Decl(lib.dom.d.ts, --, --))
+
+  const size = import.meta.scriptElement.dataset.size || 300;
+>size : Symbol(size, Decl(example.ts, 5, 7))
+
+  const image = new Image();
+>image : Symbol(image, Decl(example.ts, 7, 7))
+>Image : Symbol(Image, Decl(lib.dom.d.ts, --, --))
+
+  image.src = URL.createObjectURL(blob);
+>image.src : Symbol(HTMLImageElement.src, Decl(lib.dom.d.ts, --, --))
+>image : Symbol(image, Decl(example.ts, 7, 7))
+>src : Symbol(HTMLImageElement.src, Decl(lib.dom.d.ts, --, --))
+>URL.createObjectURL : Symbol(createObjectURL, Decl(lib.dom.d.ts, --, --))
+>URL : Symbol(URL, Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --))
+>createObjectURL : Symbol(createObjectURL, Decl(lib.dom.d.ts, --, --))
+>blob : Symbol(blob, Decl(example.ts, 3, 7))
+
+  image.width = image.height = size;
+>image.width : Symbol(HTMLImageElement.width, Decl(lib.dom.d.ts, --, --))
+>image : Symbol(image, Decl(example.ts, 7, 7))
+>width : Symbol(HTMLImageElement.width, Decl(lib.dom.d.ts, --, --))
+>image.height : Symbol(HTMLImageElement.height, Decl(lib.dom.d.ts, --, --))
+>image : Symbol(image, Decl(example.ts, 7, 7))
+>height : Symbol(HTMLImageElement.height, Decl(lib.dom.d.ts, --, --))
+>size : Symbol(size, Decl(example.ts, 5, 7))
+
+  document.body.appendChild(image);
+>document.body.appendChild : Symbol(Node.appendChild, Decl(lib.dom.d.ts, --, --))
+>document.body : Symbol(Document.body, Decl(lib.dom.d.ts, --, --))
+>document : Symbol(document, Decl(lib.dom.d.ts, --, --))
+>body : Symbol(Document.body, Decl(lib.dom.d.ts, --, --))
+>appendChild : Symbol(Node.appendChild, Decl(lib.dom.d.ts, --, --))
+>image : Symbol(image, Decl(example.ts, 7, 7))
+
+})();
+
+=== tests/cases/conformance/es2019/importMeta/moduleLookingFile01.ts ===
+export let x = import.meta;
+>x : Symbol(x, Decl(moduleLookingFile01.ts, 0, 10))
+
+export let y = import.metal;
+>y : Symbol(y, Decl(moduleLookingFile01.ts, 1, 10))
+
+export let z = import.import.import.malkovich;
+>z : Symbol(z, Decl(moduleLookingFile01.ts, 2, 10))
+
+=== tests/cases/conformance/es2019/importMeta/scriptLookingFile01.ts ===
+let globalA = import.meta;
+>globalA : Symbol(globalA, Decl(scriptLookingFile01.ts, 0, 3))
+
+let globalB = import.metal;
+>globalB : Symbol(globalB, Decl(scriptLookingFile01.ts, 1, 3))
+
+let globalC = import.import.import.malkovich;
+>globalC : Symbol(globalC, Decl(scriptLookingFile01.ts, 2, 3))
+
+=== tests/cases/conformance/es2019/importMeta/assignmentTargets.ts ===
+export const foo: ImportMeta = import.meta.blah = import.meta.blue = import.meta;
+>foo : Symbol(foo, Decl(assignmentTargets.ts, 0, 12))
+>ImportMeta : Symbol(ImportMeta, Decl(lib.es5.d.ts, --, --), Decl(assignmentTargets.ts, 4, 16))
+
+import.meta = foo;
+>foo : Symbol(foo, Decl(assignmentTargets.ts, 0, 12))
+
+// @Filename augmentations.ts
+declare global {
+>global : Symbol(global, Decl(assignmentTargets.ts, 1, 18))
+
+  interface ImportMeta {
+>ImportMeta : Symbol(ImportMeta, Decl(lib.es5.d.ts, --, --), Decl(assignmentTargets.ts, 4, 16))
+
+    wellKnownProperty: { a: number, b: string, c: boolean };
+>wellKnownProperty : Symbol(ImportMeta.wellKnownProperty, Decl(assignmentTargets.ts, 5, 24))
+>a : Symbol(a, Decl(assignmentTargets.ts, 6, 24))
+>b : Symbol(b, Decl(assignmentTargets.ts, 6, 35))
+>c : Symbol(c, Decl(assignmentTargets.ts, 6, 46))
+  }
+}
+
+const { a, b, c } = import.meta.wellKnownProperty;
+>a : Symbol(a, Decl(assignmentTargets.ts, 10, 7))
+>b : Symbol(b, Decl(assignmentTargets.ts, 10, 10))
+>c : Symbol(c, Decl(assignmentTargets.ts, 10, 13))
+>import.meta.wellKnownProperty : Symbol(ImportMeta.wellKnownProperty, Decl(assignmentTargets.ts, 5, 24))
+>wellKnownProperty : Symbol(ImportMeta.wellKnownProperty, Decl(assignmentTargets.ts, 5, 24))
+
diff --git a/tests/baselines/reference/importMeta(module=esnext,target=es5).types b/tests/baselines/reference/importMeta(module=esnext,target=es5).types
new file mode 100644
index 00000000000..78d2e3395c8
--- /dev/null
+++ b/tests/baselines/reference/importMeta(module=esnext,target=es5).types
@@ -0,0 +1,166 @@
+=== tests/cases/conformance/es2019/importMeta/example.ts ===
+// Adapted from https://github.com/tc39/proposal-import-meta/tree/c3902a9ffe2e69a7ac42c19d7ea74cbdcea9b7fb#example
+(async () => {
+>(async () => {  const response = await fetch(new URL("../hamsters.jpg", import.meta.url).toString());  const blob = await response.blob();  const size = import.meta.scriptElement.dataset.size || 300;  const image = new Image();  image.src = URL.createObjectURL(blob);  image.width = image.height = size;  document.body.appendChild(image);})() : Promise<void>
+>(async () => {  const response = await fetch(new URL("../hamsters.jpg", import.meta.url).toString());  const blob = await response.blob();  const size = import.meta.scriptElement.dataset.size || 300;  const image = new Image();  image.src = URL.createObjectURL(blob);  image.width = image.height = size;  document.body.appendChild(image);}) : () => Promise<void>
+>async () => {  const response = await fetch(new URL("../hamsters.jpg", import.meta.url).toString());  const blob = await response.blob();  const size = import.meta.scriptElement.dataset.size || 300;  const image = new Image();  image.src = URL.createObjectURL(blob);  image.width = image.height = size;  document.body.appendChild(image);} : () => Promise<void>
+
+  const response = await fetch(new URL("../hamsters.jpg", import.meta.url).toString());
+>response : Response
+>await fetch(new URL("../hamsters.jpg", import.meta.url).toString()) : Response
+>fetch(new URL("../hamsters.jpg", import.meta.url).toString()) : Promise<Response>
+>fetch : (input: RequestInfo, init?: RequestInit) => Promise<Response>
+>new URL("../hamsters.jpg", import.meta.url).toString() : string
+>new URL("../hamsters.jpg", import.meta.url).toString : () => string
+>new URL("../hamsters.jpg", import.meta.url) : URL
+>URL : { new (url: string, base?: string | URL): URL; prototype: URL; createObjectURL(object: any): string; revokeObjectURL(url: string): void; }
+>"../hamsters.jpg" : "../hamsters.jpg"
+>import.meta.url : any
+>import.meta : ImportMeta
+>meta : any
+>url : any
+>toString : () => string
+
+  const blob = await response.blob();
+>blob : Blob
+>await response.blob() : Blob
+>response.blob() : Promise<Blob>
+>response.blob : () => Promise<Blob>
+>response : Response
+>blob : () => Promise<Blob>
+
+  const size = import.meta.scriptElement.dataset.size || 300;
+>size : any
+>import.meta.scriptElement.dataset.size || 300 : any
+>import.meta.scriptElement.dataset.size : any
+>import.meta.scriptElement.dataset : any
+>import.meta.scriptElement : any
+>import.meta : ImportMeta
+>meta : any
+>scriptElement : any
+>dataset : any
+>size : any
+>300 : 300
+
+  const image = new Image();
+>image : HTMLImageElement
+>new Image() : HTMLImageElement
+>Image : new (width?: number, height?: number) => HTMLImageElement
+
+  image.src = URL.createObjectURL(blob);
+>image.src = URL.createObjectURL(blob) : string
+>image.src : string
+>image : HTMLImageElement
+>src : string
+>URL.createObjectURL(blob) : string
+>URL.createObjectURL : (object: any) => string
+>URL : { new (url: string, base?: string | URL): URL; prototype: URL; createObjectURL(object: any): string; revokeObjectURL(url: string): void; }
+>createObjectURL : (object: any) => string
+>blob : Blob
+
+  image.width = image.height = size;
+>image.width = image.height = size : any
+>image.width : number
+>image : HTMLImageElement
+>width : number
+>image.height = size : any
+>image.height : number
+>image : HTMLImageElement
+>height : number
+>size : any
+
+  document.body.appendChild(image);
+>document.body.appendChild(image) : HTMLImageElement
+>document.body.appendChild : <T extends Node>(newChild: T) => T
+>document.body : HTMLElement
+>document : Document
+>body : HTMLElement
+>appendChild : <T extends Node>(newChild: T) => T
+>image : HTMLImageElement
+
+})();
+
+=== tests/cases/conformance/es2019/importMeta/moduleLookingFile01.ts ===
+export let x = import.meta;
+>x : ImportMeta
+>import.meta : ImportMeta
+>meta : any
+
+export let y = import.metal;
+>y : any
+>import.metal : any
+>metal : any
+
+export let z = import.import.import.malkovich;
+>z : any
+>import.import.import.malkovich : any
+>import.import.import : any
+>import.import : any
+>import : any
+>import : any
+>malkovich : any
+
+=== tests/cases/conformance/es2019/importMeta/scriptLookingFile01.ts ===
+let globalA = import.meta;
+>globalA : ImportMeta
+>import.meta : ImportMeta
+>meta : any
+
+let globalB = import.metal;
+>globalB : any
+>import.metal : any
+>metal : any
+
+let globalC = import.import.import.malkovich;
+>globalC : any
+>import.import.import.malkovich : any
+>import.import.import : any
+>import.import : any
+>import : any
+>import : any
+>malkovich : any
+
+=== tests/cases/conformance/es2019/importMeta/assignmentTargets.ts ===
+export const foo: ImportMeta = import.meta.blah = import.meta.blue = import.meta;
+>foo : ImportMeta
+>import.meta.blah = import.meta.blue = import.meta : ImportMeta
+>import.meta.blah : any
+>import.meta : ImportMeta
+>meta : any
+>blah : any
+>import.meta.blue = import.meta : ImportMeta
+>import.meta.blue : any
+>import.meta : ImportMeta
+>meta : any
+>blue : any
+>import.meta : ImportMeta
+>meta : any
+
+import.meta = foo;
+>import.meta = foo : ImportMeta
+>import.meta : ImportMeta
+>meta : any
+>foo : ImportMeta
+
+// @Filename augmentations.ts
+declare global {
+>global : any
+
+  interface ImportMeta {
+    wellKnownProperty: { a: number, b: string, c: boolean };
+>wellKnownProperty : { a: number; b: string; c: boolean; }
+>a : number
+>b : string
+>c : boolean
+  }
+}
+
+const { a, b, c } = import.meta.wellKnownProperty;
+>a : number
+>b : string
+>c : boolean
+>import.meta.wellKnownProperty : { a: number; b: string; c: boolean; }
+>import.meta : ImportMeta
+>meta : any
+>wellKnownProperty : { a: number; b: string; c: boolean; }
+
diff --git a/tests/baselines/reference/importMeta(module=esnext,target=esnext).errors.txt b/tests/baselines/reference/importMeta(module=esnext,target=esnext).errors.txt
new file mode 100644
index 00000000000..999c883f266
--- /dev/null
+++ b/tests/baselines/reference/importMeta(module=esnext,target=esnext).errors.txt
@@ -0,0 +1,71 @@
+error TS2468: Cannot find global value 'Promise'.
+tests/cases/conformance/es2019/importMeta/assignmentTargets.ts(1,44): error TS2339: Property 'blah' does not exist on type 'ImportMeta'.
+tests/cases/conformance/es2019/importMeta/assignmentTargets.ts(1,63): error TS2339: Property 'blue' does not exist on type 'ImportMeta'.
+tests/cases/conformance/es2019/importMeta/assignmentTargets.ts(2,1): error TS2364: The left-hand side of an assignment expression must be a variable or a property access.
+tests/cases/conformance/es2019/importMeta/example.ts(2,2): error TS2705: An async function or method in ES5/ES3 requires the 'Promise' constructor.  Make sure you have a declaration for the 'Promise' constructor or include 'ES2015' in your `--lib` option.
+tests/cases/conformance/es2019/importMeta/example.ts(3,71): error TS2339: Property 'url' does not exist on type 'ImportMeta'.
+tests/cases/conformance/es2019/importMeta/example.ts(6,28): error TS2339: Property 'scriptElement' does not exist on type 'ImportMeta'.
+tests/cases/conformance/es2019/importMeta/moduleLookingFile01.ts(2,23): error TS17012: 'metal' is not a valid meta-property for keyword 'import'. Did you mean 'meta'?
+tests/cases/conformance/es2019/importMeta/moduleLookingFile01.ts(3,23): error TS17012: 'import' is not a valid meta-property for keyword 'import'. Did you mean 'meta'?
+tests/cases/conformance/es2019/importMeta/scriptLookingFile01.ts(2,22): error TS17012: 'metal' is not a valid meta-property for keyword 'import'. Did you mean 'meta'?
+tests/cases/conformance/es2019/importMeta/scriptLookingFile01.ts(3,22): error TS17012: 'import' is not a valid meta-property for keyword 'import'. Did you mean 'meta'?
+
+
+!!! error TS2468: Cannot find global value 'Promise'.
+==== tests/cases/conformance/es2019/importMeta/example.ts (3 errors) ====
+    // Adapted from https://github.com/tc39/proposal-import-meta/tree/c3902a9ffe2e69a7ac42c19d7ea74cbdcea9b7fb#example
+    (async () => {
+     ~~~~~~~~~~~~~
+!!! error TS2705: An async function or method in ES5/ES3 requires the 'Promise' constructor.  Make sure you have a declaration for the 'Promise' constructor or include 'ES2015' in your `--lib` option.
+      const response = await fetch(new URL("../hamsters.jpg", import.meta.url).toString());
+                                                                          ~~~
+!!! error TS2339: Property 'url' does not exist on type 'ImportMeta'.
+      const blob = await response.blob();
+    
+      const size = import.meta.scriptElement.dataset.size || 300;
+                               ~~~~~~~~~~~~~
+!!! error TS2339: Property 'scriptElement' does not exist on type 'ImportMeta'.
+    
+      const image = new Image();
+      image.src = URL.createObjectURL(blob);
+      image.width = image.height = size;
+    
+      document.body.appendChild(image);
+    })();
+    
+==== tests/cases/conformance/es2019/importMeta/moduleLookingFile01.ts (2 errors) ====
+    export let x = import.meta;
+    export let y = import.metal;
+                          ~~~~~
+!!! error TS17012: 'metal' is not a valid meta-property for keyword 'import'. Did you mean 'meta'?
+    export let z = import.import.import.malkovich;
+                          ~~~~~~
+!!! error TS17012: 'import' is not a valid meta-property for keyword 'import'. Did you mean 'meta'?
+    
+==== tests/cases/conformance/es2019/importMeta/scriptLookingFile01.ts (2 errors) ====
+    let globalA = import.meta;
+    let globalB = import.metal;
+                         ~~~~~
+!!! error TS17012: 'metal' is not a valid meta-property for keyword 'import'. Did you mean 'meta'?
+    let globalC = import.import.import.malkovich;
+                         ~~~~~~
+!!! error TS17012: 'import' is not a valid meta-property for keyword 'import'. Did you mean 'meta'?
+    
+==== tests/cases/conformance/es2019/importMeta/assignmentTargets.ts (3 errors) ====
+    export const foo: ImportMeta = import.meta.blah = import.meta.blue = import.meta;
+                                               ~~~~
+!!! error TS2339: Property 'blah' does not exist on type 'ImportMeta'.
+                                                                  ~~~~
+!!! error TS2339: Property 'blue' does not exist on type 'ImportMeta'.
+    import.meta = foo;
+    ~~~~~~~~~~~
+!!! error TS2364: The left-hand side of an assignment expression must be a variable or a property access.
+    
+    // @Filename augmentations.ts
+    declare global {
+      interface ImportMeta {
+        wellKnownProperty: { a: number, b: string, c: boolean };
+      }
+    }
+    
+    const { a, b, c } = import.meta.wellKnownProperty;
\ No newline at end of file
diff --git a/tests/baselines/reference/importMeta.js b/tests/baselines/reference/importMeta(module=esnext,target=esnext).js
similarity index 100%
rename from tests/baselines/reference/importMeta.js
rename to tests/baselines/reference/importMeta(module=esnext,target=esnext).js
diff --git a/tests/baselines/reference/importMeta(module=esnext,target=esnext).symbols b/tests/baselines/reference/importMeta(module=esnext,target=esnext).symbols
new file mode 100644
index 00000000000..d21785639ed
--- /dev/null
+++ b/tests/baselines/reference/importMeta(module=esnext,target=esnext).symbols
@@ -0,0 +1,101 @@
+=== tests/cases/conformance/es2019/importMeta/example.ts ===
+// Adapted from https://github.com/tc39/proposal-import-meta/tree/c3902a9ffe2e69a7ac42c19d7ea74cbdcea9b7fb#example
+(async () => {
+  const response = await fetch(new URL("../hamsters.jpg", import.meta.url).toString());
+>response : Symbol(response, Decl(example.ts, 2, 7))
+>fetch : Symbol(fetch, Decl(lib.dom.d.ts, --, --))
+>new URL("../hamsters.jpg", import.meta.url).toString : Symbol(Object.toString, Decl(lib.es5.d.ts, --, --))
+>URL : Symbol(URL, Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --))
+>toString : Symbol(Object.toString, Decl(lib.es5.d.ts, --, --))
+
+  const blob = await response.blob();
+>blob : Symbol(blob, Decl(example.ts, 3, 7))
+>response.blob : Symbol(Body.blob, Decl(lib.dom.d.ts, --, --))
+>response : Symbol(response, Decl(example.ts, 2, 7))
+>blob : Symbol(Body.blob, Decl(lib.dom.d.ts, --, --))
+
+  const size = import.meta.scriptElement.dataset.size || 300;
+>size : Symbol(size, Decl(example.ts, 5, 7))
+
+  const image = new Image();
+>image : Symbol(image, Decl(example.ts, 7, 7))
+>Image : Symbol(Image, Decl(lib.dom.d.ts, --, --))
+
+  image.src = URL.createObjectURL(blob);
+>image.src : Symbol(HTMLImageElement.src, Decl(lib.dom.d.ts, --, --))
+>image : Symbol(image, Decl(example.ts, 7, 7))
+>src : Symbol(HTMLImageElement.src, Decl(lib.dom.d.ts, --, --))
+>URL.createObjectURL : Symbol(createObjectURL, Decl(lib.dom.d.ts, --, --))
+>URL : Symbol(URL, Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --))
+>createObjectURL : Symbol(createObjectURL, Decl(lib.dom.d.ts, --, --))
+>blob : Symbol(blob, Decl(example.ts, 3, 7))
+
+  image.width = image.height = size;
+>image.width : Symbol(HTMLImageElement.width, Decl(lib.dom.d.ts, --, --))
+>image : Symbol(image, Decl(example.ts, 7, 7))
+>width : Symbol(HTMLImageElement.width, Decl(lib.dom.d.ts, --, --))
+>image.height : Symbol(HTMLImageElement.height, Decl(lib.dom.d.ts, --, --))
+>image : Symbol(image, Decl(example.ts, 7, 7))
+>height : Symbol(HTMLImageElement.height, Decl(lib.dom.d.ts, --, --))
+>size : Symbol(size, Decl(example.ts, 5, 7))
+
+  document.body.appendChild(image);
+>document.body.appendChild : Symbol(Node.appendChild, Decl(lib.dom.d.ts, --, --))
+>document.body : Symbol(Document.body, Decl(lib.dom.d.ts, --, --))
+>document : Symbol(document, Decl(lib.dom.d.ts, --, --))
+>body : Symbol(Document.body, Decl(lib.dom.d.ts, --, --))
+>appendChild : Symbol(Node.appendChild, Decl(lib.dom.d.ts, --, --))
+>image : Symbol(image, Decl(example.ts, 7, 7))
+
+})();
+
+=== tests/cases/conformance/es2019/importMeta/moduleLookingFile01.ts ===
+export let x = import.meta;
+>x : Symbol(x, Decl(moduleLookingFile01.ts, 0, 10))
+
+export let y = import.metal;
+>y : Symbol(y, Decl(moduleLookingFile01.ts, 1, 10))
+
+export let z = import.import.import.malkovich;
+>z : Symbol(z, Decl(moduleLookingFile01.ts, 2, 10))
+
+=== tests/cases/conformance/es2019/importMeta/scriptLookingFile01.ts ===
+let globalA = import.meta;
+>globalA : Symbol(globalA, Decl(scriptLookingFile01.ts, 0, 3))
+
+let globalB = import.metal;
+>globalB : Symbol(globalB, Decl(scriptLookingFile01.ts, 1, 3))
+
+let globalC = import.import.import.malkovich;
+>globalC : Symbol(globalC, Decl(scriptLookingFile01.ts, 2, 3))
+
+=== tests/cases/conformance/es2019/importMeta/assignmentTargets.ts ===
+export const foo: ImportMeta = import.meta.blah = import.meta.blue = import.meta;
+>foo : Symbol(foo, Decl(assignmentTargets.ts, 0, 12))
+>ImportMeta : Symbol(ImportMeta, Decl(lib.es5.d.ts, --, --), Decl(assignmentTargets.ts, 4, 16))
+
+import.meta = foo;
+>foo : Symbol(foo, Decl(assignmentTargets.ts, 0, 12))
+
+// @Filename augmentations.ts
+declare global {
+>global : Symbol(global, Decl(assignmentTargets.ts, 1, 18))
+
+  interface ImportMeta {
+>ImportMeta : Symbol(ImportMeta, Decl(lib.es5.d.ts, --, --), Decl(assignmentTargets.ts, 4, 16))
+
+    wellKnownProperty: { a: number, b: string, c: boolean };
+>wellKnownProperty : Symbol(ImportMeta.wellKnownProperty, Decl(assignmentTargets.ts, 5, 24))
+>a : Symbol(a, Decl(assignmentTargets.ts, 6, 24))
+>b : Symbol(b, Decl(assignmentTargets.ts, 6, 35))
+>c : Symbol(c, Decl(assignmentTargets.ts, 6, 46))
+  }
+}
+
+const { a, b, c } = import.meta.wellKnownProperty;
+>a : Symbol(a, Decl(assignmentTargets.ts, 10, 7))
+>b : Symbol(b, Decl(assignmentTargets.ts, 10, 10))
+>c : Symbol(c, Decl(assignmentTargets.ts, 10, 13))
+>import.meta.wellKnownProperty : Symbol(ImportMeta.wellKnownProperty, Decl(assignmentTargets.ts, 5, 24))
+>wellKnownProperty : Symbol(ImportMeta.wellKnownProperty, Decl(assignmentTargets.ts, 5, 24))
+
diff --git a/tests/baselines/reference/importMeta(module=esnext,target=esnext).types b/tests/baselines/reference/importMeta(module=esnext,target=esnext).types
new file mode 100644
index 00000000000..78d2e3395c8
--- /dev/null
+++ b/tests/baselines/reference/importMeta(module=esnext,target=esnext).types
@@ -0,0 +1,166 @@
+=== tests/cases/conformance/es2019/importMeta/example.ts ===
+// Adapted from https://github.com/tc39/proposal-import-meta/tree/c3902a9ffe2e69a7ac42c19d7ea74cbdcea9b7fb#example
+(async () => {
+>(async () => {  const response = await fetch(new URL("../hamsters.jpg", import.meta.url).toString());  const blob = await response.blob();  const size = import.meta.scriptElement.dataset.size || 300;  const image = new Image();  image.src = URL.createObjectURL(blob);  image.width = image.height = size;  document.body.appendChild(image);})() : Promise<void>
+>(async () => {  const response = await fetch(new URL("../hamsters.jpg", import.meta.url).toString());  const blob = await response.blob();  const size = import.meta.scriptElement.dataset.size || 300;  const image = new Image();  image.src = URL.createObjectURL(blob);  image.width = image.height = size;  document.body.appendChild(image);}) : () => Promise<void>
+>async () => {  const response = await fetch(new URL("../hamsters.jpg", import.meta.url).toString());  const blob = await response.blob();  const size = import.meta.scriptElement.dataset.size || 300;  const image = new Image();  image.src = URL.createObjectURL(blob);  image.width = image.height = size;  document.body.appendChild(image);} : () => Promise<void>
+
+  const response = await fetch(new URL("../hamsters.jpg", import.meta.url).toString());
+>response : Response
+>await fetch(new URL("../hamsters.jpg", import.meta.url).toString()) : Response
+>fetch(new URL("../hamsters.jpg", import.meta.url).toString()) : Promise<Response>
+>fetch : (input: RequestInfo, init?: RequestInit) => Promise<Response>
+>new URL("../hamsters.jpg", import.meta.url).toString() : string
+>new URL("../hamsters.jpg", import.meta.url).toString : () => string
+>new URL("../hamsters.jpg", import.meta.url) : URL
+>URL : { new (url: string, base?: string | URL): URL; prototype: URL; createObjectURL(object: any): string; revokeObjectURL(url: string): void; }
+>"../hamsters.jpg" : "../hamsters.jpg"
+>import.meta.url : any
+>import.meta : ImportMeta
+>meta : any
+>url : any
+>toString : () => string
+
+  const blob = await response.blob();
+>blob : Blob
+>await response.blob() : Blob
+>response.blob() : Promise<Blob>
+>response.blob : () => Promise<Blob>
+>response : Response
+>blob : () => Promise<Blob>
+
+  const size = import.meta.scriptElement.dataset.size || 300;
+>size : any
+>import.meta.scriptElement.dataset.size || 300 : any
+>import.meta.scriptElement.dataset.size : any
+>import.meta.scriptElement.dataset : any
+>import.meta.scriptElement : any
+>import.meta : ImportMeta
+>meta : any
+>scriptElement : any
+>dataset : any
+>size : any
+>300 : 300
+
+  const image = new Image();
+>image : HTMLImageElement
+>new Image() : HTMLImageElement
+>Image : new (width?: number, height?: number) => HTMLImageElement
+
+  image.src = URL.createObjectURL(blob);
+>image.src = URL.createObjectURL(blob) : string
+>image.src : string
+>image : HTMLImageElement
+>src : string
+>URL.createObjectURL(blob) : string
+>URL.createObjectURL : (object: any) => string
+>URL : { new (url: string, base?: string | URL): URL; prototype: URL; createObjectURL(object: any): string; revokeObjectURL(url: string): void; }
+>createObjectURL : (object: any) => string
+>blob : Blob
+
+  image.width = image.height = size;
+>image.width = image.height = size : any
+>image.width : number
+>image : HTMLImageElement
+>width : number
+>image.height = size : any
+>image.height : number
+>image : HTMLImageElement
+>height : number
+>size : any
+
+  document.body.appendChild(image);
+>document.body.appendChild(image) : HTMLImageElement
+>document.body.appendChild : <T extends Node>(newChild: T) => T
+>document.body : HTMLElement
+>document : Document
+>body : HTMLElement
+>appendChild : <T extends Node>(newChild: T) => T
+>image : HTMLImageElement
+
+})();
+
+=== tests/cases/conformance/es2019/importMeta/moduleLookingFile01.ts ===
+export let x = import.meta;
+>x : ImportMeta
+>import.meta : ImportMeta
+>meta : any
+
+export let y = import.metal;
+>y : any
+>import.metal : any
+>metal : any
+
+export let z = import.import.import.malkovich;
+>z : any
+>import.import.import.malkovich : any
+>import.import.import : any
+>import.import : any
+>import : any
+>import : any
+>malkovich : any
+
+=== tests/cases/conformance/es2019/importMeta/scriptLookingFile01.ts ===
+let globalA = import.meta;
+>globalA : ImportMeta
+>import.meta : ImportMeta
+>meta : any
+
+let globalB = import.metal;
+>globalB : any
+>import.metal : any
+>metal : any
+
+let globalC = import.import.import.malkovich;
+>globalC : any
+>import.import.import.malkovich : any
+>import.import.import : any
+>import.import : any
+>import : any
+>import : any
+>malkovich : any
+
+=== tests/cases/conformance/es2019/importMeta/assignmentTargets.ts ===
+export const foo: ImportMeta = import.meta.blah = import.meta.blue = import.meta;
+>foo : ImportMeta
+>import.meta.blah = import.meta.blue = import.meta : ImportMeta
+>import.meta.blah : any
+>import.meta : ImportMeta
+>meta : any
+>blah : any
+>import.meta.blue = import.meta : ImportMeta
+>import.meta.blue : any
+>import.meta : ImportMeta
+>meta : any
+>blue : any
+>import.meta : ImportMeta
+>meta : any
+
+import.meta = foo;
+>import.meta = foo : ImportMeta
+>import.meta : ImportMeta
+>meta : any
+>foo : ImportMeta
+
+// @Filename augmentations.ts
+declare global {
+>global : any
+
+  interface ImportMeta {
+    wellKnownProperty: { a: number, b: string, c: boolean };
+>wellKnownProperty : { a: number; b: string; c: boolean; }
+>a : number
+>b : string
+>c : boolean
+  }
+}
+
+const { a, b, c } = import.meta.wellKnownProperty;
+>a : number
+>b : string
+>c : boolean
+>import.meta.wellKnownProperty : { a: number; b: string; c: boolean; }
+>import.meta : ImportMeta
+>meta : any
+>wellKnownProperty : { a: number; b: string; c: boolean; }
+
diff --git a/tests/baselines/reference/importMeta(module=system,target=es5).errors.txt b/tests/baselines/reference/importMeta(module=system,target=es5).errors.txt
new file mode 100644
index 00000000000..999c883f266
--- /dev/null
+++ b/tests/baselines/reference/importMeta(module=system,target=es5).errors.txt
@@ -0,0 +1,71 @@
+error TS2468: Cannot find global value 'Promise'.
+tests/cases/conformance/es2019/importMeta/assignmentTargets.ts(1,44): error TS2339: Property 'blah' does not exist on type 'ImportMeta'.
+tests/cases/conformance/es2019/importMeta/assignmentTargets.ts(1,63): error TS2339: Property 'blue' does not exist on type 'ImportMeta'.
+tests/cases/conformance/es2019/importMeta/assignmentTargets.ts(2,1): error TS2364: The left-hand side of an assignment expression must be a variable or a property access.
+tests/cases/conformance/es2019/importMeta/example.ts(2,2): error TS2705: An async function or method in ES5/ES3 requires the 'Promise' constructor.  Make sure you have a declaration for the 'Promise' constructor or include 'ES2015' in your `--lib` option.
+tests/cases/conformance/es2019/importMeta/example.ts(3,71): error TS2339: Property 'url' does not exist on type 'ImportMeta'.
+tests/cases/conformance/es2019/importMeta/example.ts(6,28): error TS2339: Property 'scriptElement' does not exist on type 'ImportMeta'.
+tests/cases/conformance/es2019/importMeta/moduleLookingFile01.ts(2,23): error TS17012: 'metal' is not a valid meta-property for keyword 'import'. Did you mean 'meta'?
+tests/cases/conformance/es2019/importMeta/moduleLookingFile01.ts(3,23): error TS17012: 'import' is not a valid meta-property for keyword 'import'. Did you mean 'meta'?
+tests/cases/conformance/es2019/importMeta/scriptLookingFile01.ts(2,22): error TS17012: 'metal' is not a valid meta-property for keyword 'import'. Did you mean 'meta'?
+tests/cases/conformance/es2019/importMeta/scriptLookingFile01.ts(3,22): error TS17012: 'import' is not a valid meta-property for keyword 'import'. Did you mean 'meta'?
+
+
+!!! error TS2468: Cannot find global value 'Promise'.
+==== tests/cases/conformance/es2019/importMeta/example.ts (3 errors) ====
+    // Adapted from https://github.com/tc39/proposal-import-meta/tree/c3902a9ffe2e69a7ac42c19d7ea74cbdcea9b7fb#example
+    (async () => {
+     ~~~~~~~~~~~~~
+!!! error TS2705: An async function or method in ES5/ES3 requires the 'Promise' constructor.  Make sure you have a declaration for the 'Promise' constructor or include 'ES2015' in your `--lib` option.
+      const response = await fetch(new URL("../hamsters.jpg", import.meta.url).toString());
+                                                                          ~~~
+!!! error TS2339: Property 'url' does not exist on type 'ImportMeta'.
+      const blob = await response.blob();
+    
+      const size = import.meta.scriptElement.dataset.size || 300;
+                               ~~~~~~~~~~~~~
+!!! error TS2339: Property 'scriptElement' does not exist on type 'ImportMeta'.
+    
+      const image = new Image();
+      image.src = URL.createObjectURL(blob);
+      image.width = image.height = size;
+    
+      document.body.appendChild(image);
+    })();
+    
+==== tests/cases/conformance/es2019/importMeta/moduleLookingFile01.ts (2 errors) ====
+    export let x = import.meta;
+    export let y = import.metal;
+                          ~~~~~
+!!! error TS17012: 'metal' is not a valid meta-property for keyword 'import'. Did you mean 'meta'?
+    export let z = import.import.import.malkovich;
+                          ~~~~~~
+!!! error TS17012: 'import' is not a valid meta-property for keyword 'import'. Did you mean 'meta'?
+    
+==== tests/cases/conformance/es2019/importMeta/scriptLookingFile01.ts (2 errors) ====
+    let globalA = import.meta;
+    let globalB = import.metal;
+                         ~~~~~
+!!! error TS17012: 'metal' is not a valid meta-property for keyword 'import'. Did you mean 'meta'?
+    let globalC = import.import.import.malkovich;
+                         ~~~~~~
+!!! error TS17012: 'import' is not a valid meta-property for keyword 'import'. Did you mean 'meta'?
+    
+==== tests/cases/conformance/es2019/importMeta/assignmentTargets.ts (3 errors) ====
+    export const foo: ImportMeta = import.meta.blah = import.meta.blue = import.meta;
+                                               ~~~~
+!!! error TS2339: Property 'blah' does not exist on type 'ImportMeta'.
+                                                                  ~~~~
+!!! error TS2339: Property 'blue' does not exist on type 'ImportMeta'.
+    import.meta = foo;
+    ~~~~~~~~~~~
+!!! error TS2364: The left-hand side of an assignment expression must be a variable or a property access.
+    
+    // @Filename augmentations.ts
+    declare global {
+      interface ImportMeta {
+        wellKnownProperty: { a: number, b: string, c: boolean };
+      }
+    }
+    
+    const { a, b, c } = import.meta.wellKnownProperty;
\ No newline at end of file
diff --git a/tests/baselines/reference/importMeta(module=system,target=es5).js b/tests/baselines/reference/importMeta(module=system,target=es5).js
new file mode 100644
index 00000000000..ce9321f5fe9
--- /dev/null
+++ b/tests/baselines/reference/importMeta(module=system,target=es5).js
@@ -0,0 +1,150 @@
+//// [tests/cases/conformance/es2019/importMeta/importMeta.ts] ////
+
+//// [example.ts]
+// Adapted from https://github.com/tc39/proposal-import-meta/tree/c3902a9ffe2e69a7ac42c19d7ea74cbdcea9b7fb#example
+(async () => {
+  const response = await fetch(new URL("../hamsters.jpg", import.meta.url).toString());
+  const blob = await response.blob();
+
+  const size = import.meta.scriptElement.dataset.size || 300;
+
+  const image = new Image();
+  image.src = URL.createObjectURL(blob);
+  image.width = image.height = size;
+
+  document.body.appendChild(image);
+})();
+
+//// [moduleLookingFile01.ts]
+export let x = import.meta;
+export let y = import.metal;
+export let z = import.import.import.malkovich;
+
+//// [scriptLookingFile01.ts]
+let globalA = import.meta;
+let globalB = import.metal;
+let globalC = import.import.import.malkovich;
+
+//// [assignmentTargets.ts]
+export const foo: ImportMeta = import.meta.blah = import.meta.blue = import.meta;
+import.meta = foo;
+
+// @Filename augmentations.ts
+declare global {
+  interface ImportMeta {
+    wellKnownProperty: { a: number, b: string, c: boolean };
+  }
+}
+
+const { a, b, c } = import.meta.wellKnownProperty;
+
+//// [example.js]
+System.register([], function (exports_1, context_1) {
+    "use strict";
+    var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+        function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+        return new (P || (P = Promise))(function (resolve, reject) {
+            function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+            function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+            function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+            step((generator = generator.apply(thisArg, _arguments || [])).next());
+        });
+    };
+    var __generator = (this && this.__generator) || function (thisArg, body) {
+        var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+        return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+        function verb(n) { return function (v) { return step([n, v]); }; }
+        function step(op) {
+            if (f) throw new TypeError("Generator is already executing.");
+            while (_) try {
+                if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+                if (y = 0, t) op = [op[0] & 2, t.value];
+                switch (op[0]) {
+                    case 0: case 1: t = op; break;
+                    case 4: _.label++; return { value: op[1], done: false };
+                    case 5: _.label++; y = op[1]; op = [0]; continue;
+                    case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                    default:
+                        if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                        if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                        if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                        if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                        if (t[2]) _.ops.pop();
+                        _.trys.pop(); continue;
+                }
+                op = body.call(thisArg, _);
+            } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+            if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+        }
+    };
+    var _this;
+    _this = this;
+    var __moduleName = context_1 && context_1.id;
+    return {
+        setters: [],
+        execute: function () {
+            // Adapted from https://github.com/tc39/proposal-import-meta/tree/c3902a9ffe2e69a7ac42c19d7ea74cbdcea9b7fb#example
+            (function () { return __awaiter(_this, void 0, void 0, function () {
+                var response, blob, size, image;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0: return [4 /*yield*/, fetch(new URL("../hamsters.jpg", context_1.meta.url).toString())];
+                        case 1:
+                            response = _a.sent();
+                            return [4 /*yield*/, response.blob()];
+                        case 2:
+                            blob = _a.sent();
+                            size = context_1.meta.scriptElement.dataset.size || 300;
+                            image = new Image();
+                            image.src = URL.createObjectURL(blob);
+                            image.width = image.height = size;
+                            document.body.appendChild(image);
+                            return [2 /*return*/];
+                    }
+                });
+            }); })();
+        }
+    };
+});
+//// [moduleLookingFile01.js]
+System.register([], function (exports_1, context_1) {
+    "use strict";
+    var x, y, z;
+    var __moduleName = context_1 && context_1.id;
+    return {
+        setters: [],
+        execute: function () {
+            exports_1("x", x = (context_1.meta));
+            exports_1("y", y = (import.metal));
+            exports_1("z", z = import.import.import.malkovich);
+        }
+    };
+});
+//// [scriptLookingFile01.js]
+System.register([], function (exports_1, context_1) {
+    "use strict";
+    var globalA, globalB, globalC;
+    var __moduleName = context_1 && context_1.id;
+    return {
+        setters: [],
+        execute: function () {
+            globalA = (context_1.meta);
+            globalB = (import.metal);
+            globalC = import.import.import.malkovich;
+        }
+    };
+});
+//// [assignmentTargets.js]
+System.register([], function (exports_1, context_1) {
+    "use strict";
+    var foo, _a, a, b, c;
+    var __moduleName = context_1 && context_1.id;
+    return {
+        setters: [],
+        execute: function () {
+            exports_1("foo", foo = context_1.meta.blah = context_1.meta.blue = context_1.meta);
+            context_1.meta = foo;
+            _a = context_1.meta.wellKnownProperty, a = _a.a, b = _a.b, c = _a.c;
+        }
+    };
+});
diff --git a/tests/baselines/reference/importMeta(module=system,target=es5).symbols b/tests/baselines/reference/importMeta(module=system,target=es5).symbols
new file mode 100644
index 00000000000..d21785639ed
--- /dev/null
+++ b/tests/baselines/reference/importMeta(module=system,target=es5).symbols
@@ -0,0 +1,101 @@
+=== tests/cases/conformance/es2019/importMeta/example.ts ===
+// Adapted from https://github.com/tc39/proposal-import-meta/tree/c3902a9ffe2e69a7ac42c19d7ea74cbdcea9b7fb#example
+(async () => {
+  const response = await fetch(new URL("../hamsters.jpg", import.meta.url).toString());
+>response : Symbol(response, Decl(example.ts, 2, 7))
+>fetch : Symbol(fetch, Decl(lib.dom.d.ts, --, --))
+>new URL("../hamsters.jpg", import.meta.url).toString : Symbol(Object.toString, Decl(lib.es5.d.ts, --, --))
+>URL : Symbol(URL, Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --))
+>toString : Symbol(Object.toString, Decl(lib.es5.d.ts, --, --))
+
+  const blob = await response.blob();
+>blob : Symbol(blob, Decl(example.ts, 3, 7))
+>response.blob : Symbol(Body.blob, Decl(lib.dom.d.ts, --, --))
+>response : Symbol(response, Decl(example.ts, 2, 7))
+>blob : Symbol(Body.blob, Decl(lib.dom.d.ts, --, --))
+
+  const size = import.meta.scriptElement.dataset.size || 300;
+>size : Symbol(size, Decl(example.ts, 5, 7))
+
+  const image = new Image();
+>image : Symbol(image, Decl(example.ts, 7, 7))
+>Image : Symbol(Image, Decl(lib.dom.d.ts, --, --))
+
+  image.src = URL.createObjectURL(blob);
+>image.src : Symbol(HTMLImageElement.src, Decl(lib.dom.d.ts, --, --))
+>image : Symbol(image, Decl(example.ts, 7, 7))
+>src : Symbol(HTMLImageElement.src, Decl(lib.dom.d.ts, --, --))
+>URL.createObjectURL : Symbol(createObjectURL, Decl(lib.dom.d.ts, --, --))
+>URL : Symbol(URL, Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --))
+>createObjectURL : Symbol(createObjectURL, Decl(lib.dom.d.ts, --, --))
+>blob : Symbol(blob, Decl(example.ts, 3, 7))
+
+  image.width = image.height = size;
+>image.width : Symbol(HTMLImageElement.width, Decl(lib.dom.d.ts, --, --))
+>image : Symbol(image, Decl(example.ts, 7, 7))
+>width : Symbol(HTMLImageElement.width, Decl(lib.dom.d.ts, --, --))
+>image.height : Symbol(HTMLImageElement.height, Decl(lib.dom.d.ts, --, --))
+>image : Symbol(image, Decl(example.ts, 7, 7))
+>height : Symbol(HTMLImageElement.height, Decl(lib.dom.d.ts, --, --))
+>size : Symbol(size, Decl(example.ts, 5, 7))
+
+  document.body.appendChild(image);
+>document.body.appendChild : Symbol(Node.appendChild, Decl(lib.dom.d.ts, --, --))
+>document.body : Symbol(Document.body, Decl(lib.dom.d.ts, --, --))
+>document : Symbol(document, Decl(lib.dom.d.ts, --, --))
+>body : Symbol(Document.body, Decl(lib.dom.d.ts, --, --))
+>appendChild : Symbol(Node.appendChild, Decl(lib.dom.d.ts, --, --))
+>image : Symbol(image, Decl(example.ts, 7, 7))
+
+})();
+
+=== tests/cases/conformance/es2019/importMeta/moduleLookingFile01.ts ===
+export let x = import.meta;
+>x : Symbol(x, Decl(moduleLookingFile01.ts, 0, 10))
+
+export let y = import.metal;
+>y : Symbol(y, Decl(moduleLookingFile01.ts, 1, 10))
+
+export let z = import.import.import.malkovich;
+>z : Symbol(z, Decl(moduleLookingFile01.ts, 2, 10))
+
+=== tests/cases/conformance/es2019/importMeta/scriptLookingFile01.ts ===
+let globalA = import.meta;
+>globalA : Symbol(globalA, Decl(scriptLookingFile01.ts, 0, 3))
+
+let globalB = import.metal;
+>globalB : Symbol(globalB, Decl(scriptLookingFile01.ts, 1, 3))
+
+let globalC = import.import.import.malkovich;
+>globalC : Symbol(globalC, Decl(scriptLookingFile01.ts, 2, 3))
+
+=== tests/cases/conformance/es2019/importMeta/assignmentTargets.ts ===
+export const foo: ImportMeta = import.meta.blah = import.meta.blue = import.meta;
+>foo : Symbol(foo, Decl(assignmentTargets.ts, 0, 12))
+>ImportMeta : Symbol(ImportMeta, Decl(lib.es5.d.ts, --, --), Decl(assignmentTargets.ts, 4, 16))
+
+import.meta = foo;
+>foo : Symbol(foo, Decl(assignmentTargets.ts, 0, 12))
+
+// @Filename augmentations.ts
+declare global {
+>global : Symbol(global, Decl(assignmentTargets.ts, 1, 18))
+
+  interface ImportMeta {
+>ImportMeta : Symbol(ImportMeta, Decl(lib.es5.d.ts, --, --), Decl(assignmentTargets.ts, 4, 16))
+
+    wellKnownProperty: { a: number, b: string, c: boolean };
+>wellKnownProperty : Symbol(ImportMeta.wellKnownProperty, Decl(assignmentTargets.ts, 5, 24))
+>a : Symbol(a, Decl(assignmentTargets.ts, 6, 24))
+>b : Symbol(b, Decl(assignmentTargets.ts, 6, 35))
+>c : Symbol(c, Decl(assignmentTargets.ts, 6, 46))
+  }
+}
+
+const { a, b, c } = import.meta.wellKnownProperty;
+>a : Symbol(a, Decl(assignmentTargets.ts, 10, 7))
+>b : Symbol(b, Decl(assignmentTargets.ts, 10, 10))
+>c : Symbol(c, Decl(assignmentTargets.ts, 10, 13))
+>import.meta.wellKnownProperty : Symbol(ImportMeta.wellKnownProperty, Decl(assignmentTargets.ts, 5, 24))
+>wellKnownProperty : Symbol(ImportMeta.wellKnownProperty, Decl(assignmentTargets.ts, 5, 24))
+
diff --git a/tests/baselines/reference/importMeta(module=system,target=es5).types b/tests/baselines/reference/importMeta(module=system,target=es5).types
new file mode 100644
index 00000000000..78d2e3395c8
--- /dev/null
+++ b/tests/baselines/reference/importMeta(module=system,target=es5).types
@@ -0,0 +1,166 @@
+=== tests/cases/conformance/es2019/importMeta/example.ts ===
+// Adapted from https://github.com/tc39/proposal-import-meta/tree/c3902a9ffe2e69a7ac42c19d7ea74cbdcea9b7fb#example
+(async () => {
+>(async () => {  const response = await fetch(new URL("../hamsters.jpg", import.meta.url).toString());  const blob = await response.blob();  const size = import.meta.scriptElement.dataset.size || 300;  const image = new Image();  image.src = URL.createObjectURL(blob);  image.width = image.height = size;  document.body.appendChild(image);})() : Promise<void>
+>(async () => {  const response = await fetch(new URL("../hamsters.jpg", import.meta.url).toString());  const blob = await response.blob();  const size = import.meta.scriptElement.dataset.size || 300;  const image = new Image();  image.src = URL.createObjectURL(blob);  image.width = image.height = size;  document.body.appendChild(image);}) : () => Promise<void>
+>async () => {  const response = await fetch(new URL("../hamsters.jpg", import.meta.url).toString());  const blob = await response.blob();  const size = import.meta.scriptElement.dataset.size || 300;  const image = new Image();  image.src = URL.createObjectURL(blob);  image.width = image.height = size;  document.body.appendChild(image);} : () => Promise<void>
+
+  const response = await fetch(new URL("../hamsters.jpg", import.meta.url).toString());
+>response : Response
+>await fetch(new URL("../hamsters.jpg", import.meta.url).toString()) : Response
+>fetch(new URL("../hamsters.jpg", import.meta.url).toString()) : Promise<Response>
+>fetch : (input: RequestInfo, init?: RequestInit) => Promise<Response>
+>new URL("../hamsters.jpg", import.meta.url).toString() : string
+>new URL("../hamsters.jpg", import.meta.url).toString : () => string
+>new URL("../hamsters.jpg", import.meta.url) : URL
+>URL : { new (url: string, base?: string | URL): URL; prototype: URL; createObjectURL(object: any): string; revokeObjectURL(url: string): void; }
+>"../hamsters.jpg" : "../hamsters.jpg"
+>import.meta.url : any
+>import.meta : ImportMeta
+>meta : any
+>url : any
+>toString : () => string
+
+  const blob = await response.blob();
+>blob : Blob
+>await response.blob() : Blob
+>response.blob() : Promise<Blob>
+>response.blob : () => Promise<Blob>
+>response : Response
+>blob : () => Promise<Blob>
+
+  const size = import.meta.scriptElement.dataset.size || 300;
+>size : any
+>import.meta.scriptElement.dataset.size || 300 : any
+>import.meta.scriptElement.dataset.size : any
+>import.meta.scriptElement.dataset : any
+>import.meta.scriptElement : any
+>import.meta : ImportMeta
+>meta : any
+>scriptElement : any
+>dataset : any
+>size : any
+>300 : 300
+
+  const image = new Image();
+>image : HTMLImageElement
+>new Image() : HTMLImageElement
+>Image : new (width?: number, height?: number) => HTMLImageElement
+
+  image.src = URL.createObjectURL(blob);
+>image.src = URL.createObjectURL(blob) : string
+>image.src : string
+>image : HTMLImageElement
+>src : string
+>URL.createObjectURL(blob) : string
+>URL.createObjectURL : (object: any) => string
+>URL : { new (url: string, base?: string | URL): URL; prototype: URL; createObjectURL(object: any): string; revokeObjectURL(url: string): void; }
+>createObjectURL : (object: any) => string
+>blob : Blob
+
+  image.width = image.height = size;
+>image.width = image.height = size : any
+>image.width : number
+>image : HTMLImageElement
+>width : number
+>image.height = size : any
+>image.height : number
+>image : HTMLImageElement
+>height : number
+>size : any
+
+  document.body.appendChild(image);
+>document.body.appendChild(image) : HTMLImageElement
+>document.body.appendChild : <T extends Node>(newChild: T) => T
+>document.body : HTMLElement
+>document : Document
+>body : HTMLElement
+>appendChild : <T extends Node>(newChild: T) => T
+>image : HTMLImageElement
+
+})();
+
+=== tests/cases/conformance/es2019/importMeta/moduleLookingFile01.ts ===
+export let x = import.meta;
+>x : ImportMeta
+>import.meta : ImportMeta
+>meta : any
+
+export let y = import.metal;
+>y : any
+>import.metal : any
+>metal : any
+
+export let z = import.import.import.malkovich;
+>z : any
+>import.import.import.malkovich : any
+>import.import.import : any
+>import.import : any
+>import : any
+>import : any
+>malkovich : any
+
+=== tests/cases/conformance/es2019/importMeta/scriptLookingFile01.ts ===
+let globalA = import.meta;
+>globalA : ImportMeta
+>import.meta : ImportMeta
+>meta : any
+
+let globalB = import.metal;
+>globalB : any
+>import.metal : any
+>metal : any
+
+let globalC = import.import.import.malkovich;
+>globalC : any
+>import.import.import.malkovich : any
+>import.import.import : any
+>import.import : any
+>import : any
+>import : any
+>malkovich : any
+
+=== tests/cases/conformance/es2019/importMeta/assignmentTargets.ts ===
+export const foo: ImportMeta = import.meta.blah = import.meta.blue = import.meta;
+>foo : ImportMeta
+>import.meta.blah = import.meta.blue = import.meta : ImportMeta
+>import.meta.blah : any
+>import.meta : ImportMeta
+>meta : any
+>blah : any
+>import.meta.blue = import.meta : ImportMeta
+>import.meta.blue : any
+>import.meta : ImportMeta
+>meta : any
+>blue : any
+>import.meta : ImportMeta
+>meta : any
+
+import.meta = foo;
+>import.meta = foo : ImportMeta
+>import.meta : ImportMeta
+>meta : any
+>foo : ImportMeta
+
+// @Filename augmentations.ts
+declare global {
+>global : any
+
+  interface ImportMeta {
+    wellKnownProperty: { a: number, b: string, c: boolean };
+>wellKnownProperty : { a: number; b: string; c: boolean; }
+>a : number
+>b : string
+>c : boolean
+  }
+}
+
+const { a, b, c } = import.meta.wellKnownProperty;
+>a : number
+>b : string
+>c : boolean
+>import.meta.wellKnownProperty : { a: number; b: string; c: boolean; }
+>import.meta : ImportMeta
+>meta : any
+>wellKnownProperty : { a: number; b: string; c: boolean; }
+
diff --git a/tests/baselines/reference/importMeta(module=system,target=esnext).errors.txt b/tests/baselines/reference/importMeta(module=system,target=esnext).errors.txt
new file mode 100644
index 00000000000..999c883f266
--- /dev/null
+++ b/tests/baselines/reference/importMeta(module=system,target=esnext).errors.txt
@@ -0,0 +1,71 @@
+error TS2468: Cannot find global value 'Promise'.
+tests/cases/conformance/es2019/importMeta/assignmentTargets.ts(1,44): error TS2339: Property 'blah' does not exist on type 'ImportMeta'.
+tests/cases/conformance/es2019/importMeta/assignmentTargets.ts(1,63): error TS2339: Property 'blue' does not exist on type 'ImportMeta'.
+tests/cases/conformance/es2019/importMeta/assignmentTargets.ts(2,1): error TS2364: The left-hand side of an assignment expression must be a variable or a property access.
+tests/cases/conformance/es2019/importMeta/example.ts(2,2): error TS2705: An async function or method in ES5/ES3 requires the 'Promise' constructor.  Make sure you have a declaration for the 'Promise' constructor or include 'ES2015' in your `--lib` option.
+tests/cases/conformance/es2019/importMeta/example.ts(3,71): error TS2339: Property 'url' does not exist on type 'ImportMeta'.
+tests/cases/conformance/es2019/importMeta/example.ts(6,28): error TS2339: Property 'scriptElement' does not exist on type 'ImportMeta'.
+tests/cases/conformance/es2019/importMeta/moduleLookingFile01.ts(2,23): error TS17012: 'metal' is not a valid meta-property for keyword 'import'. Did you mean 'meta'?
+tests/cases/conformance/es2019/importMeta/moduleLookingFile01.ts(3,23): error TS17012: 'import' is not a valid meta-property for keyword 'import'. Did you mean 'meta'?
+tests/cases/conformance/es2019/importMeta/scriptLookingFile01.ts(2,22): error TS17012: 'metal' is not a valid meta-property for keyword 'import'. Did you mean 'meta'?
+tests/cases/conformance/es2019/importMeta/scriptLookingFile01.ts(3,22): error TS17012: 'import' is not a valid meta-property for keyword 'import'. Did you mean 'meta'?
+
+
+!!! error TS2468: Cannot find global value 'Promise'.
+==== tests/cases/conformance/es2019/importMeta/example.ts (3 errors) ====
+    // Adapted from https://github.com/tc39/proposal-import-meta/tree/c3902a9ffe2e69a7ac42c19d7ea74cbdcea9b7fb#example
+    (async () => {
+     ~~~~~~~~~~~~~
+!!! error TS2705: An async function or method in ES5/ES3 requires the 'Promise' constructor.  Make sure you have a declaration for the 'Promise' constructor or include 'ES2015' in your `--lib` option.
+      const response = await fetch(new URL("../hamsters.jpg", import.meta.url).toString());
+                                                                          ~~~
+!!! error TS2339: Property 'url' does not exist on type 'ImportMeta'.
+      const blob = await response.blob();
+    
+      const size = import.meta.scriptElement.dataset.size || 300;
+                               ~~~~~~~~~~~~~
+!!! error TS2339: Property 'scriptElement' does not exist on type 'ImportMeta'.
+    
+      const image = new Image();
+      image.src = URL.createObjectURL(blob);
+      image.width = image.height = size;
+    
+      document.body.appendChild(image);
+    })();
+    
+==== tests/cases/conformance/es2019/importMeta/moduleLookingFile01.ts (2 errors) ====
+    export let x = import.meta;
+    export let y = import.metal;
+                          ~~~~~
+!!! error TS17012: 'metal' is not a valid meta-property for keyword 'import'. Did you mean 'meta'?
+    export let z = import.import.import.malkovich;
+                          ~~~~~~
+!!! error TS17012: 'import' is not a valid meta-property for keyword 'import'. Did you mean 'meta'?
+    
+==== tests/cases/conformance/es2019/importMeta/scriptLookingFile01.ts (2 errors) ====
+    let globalA = import.meta;
+    let globalB = import.metal;
+                         ~~~~~
+!!! error TS17012: 'metal' is not a valid meta-property for keyword 'import'. Did you mean 'meta'?
+    let globalC = import.import.import.malkovich;
+                         ~~~~~~
+!!! error TS17012: 'import' is not a valid meta-property for keyword 'import'. Did you mean 'meta'?
+    
+==== tests/cases/conformance/es2019/importMeta/assignmentTargets.ts (3 errors) ====
+    export const foo: ImportMeta = import.meta.blah = import.meta.blue = import.meta;
+                                               ~~~~
+!!! error TS2339: Property 'blah' does not exist on type 'ImportMeta'.
+                                                                  ~~~~
+!!! error TS2339: Property 'blue' does not exist on type 'ImportMeta'.
+    import.meta = foo;
+    ~~~~~~~~~~~
+!!! error TS2364: The left-hand side of an assignment expression must be a variable or a property access.
+    
+    // @Filename augmentations.ts
+    declare global {
+      interface ImportMeta {
+        wellKnownProperty: { a: number, b: string, c: boolean };
+      }
+    }
+    
+    const { a, b, c } = import.meta.wellKnownProperty;
\ No newline at end of file
diff --git a/tests/baselines/reference/importMeta(module=system,target=esnext).js b/tests/baselines/reference/importMeta(module=system,target=esnext).js
new file mode 100644
index 00000000000..b3639b579a8
--- /dev/null
+++ b/tests/baselines/reference/importMeta(module=system,target=esnext).js
@@ -0,0 +1,102 @@
+//// [tests/cases/conformance/es2019/importMeta/importMeta.ts] ////
+
+//// [example.ts]
+// Adapted from https://github.com/tc39/proposal-import-meta/tree/c3902a9ffe2e69a7ac42c19d7ea74cbdcea9b7fb#example
+(async () => {
+  const response = await fetch(new URL("../hamsters.jpg", import.meta.url).toString());
+  const blob = await response.blob();
+
+  const size = import.meta.scriptElement.dataset.size || 300;
+
+  const image = new Image();
+  image.src = URL.createObjectURL(blob);
+  image.width = image.height = size;
+
+  document.body.appendChild(image);
+})();
+
+//// [moduleLookingFile01.ts]
+export let x = import.meta;
+export let y = import.metal;
+export let z = import.import.import.malkovich;
+
+//// [scriptLookingFile01.ts]
+let globalA = import.meta;
+let globalB = import.metal;
+let globalC = import.import.import.malkovich;
+
+//// [assignmentTargets.ts]
+export const foo: ImportMeta = import.meta.blah = import.meta.blue = import.meta;
+import.meta = foo;
+
+// @Filename augmentations.ts
+declare global {
+  interface ImportMeta {
+    wellKnownProperty: { a: number, b: string, c: boolean };
+  }
+}
+
+const { a, b, c } = import.meta.wellKnownProperty;
+
+//// [example.js]
+System.register([], function (exports_1, context_1) {
+    "use strict";
+    var __moduleName = context_1 && context_1.id;
+    return {
+        setters: [],
+        execute: function () {
+            // Adapted from https://github.com/tc39/proposal-import-meta/tree/c3902a9ffe2e69a7ac42c19d7ea74cbdcea9b7fb#example
+            (async () => {
+                const response = await fetch(new URL("../hamsters.jpg", context_1.meta.url).toString());
+                const blob = await response.blob();
+                const size = context_1.meta.scriptElement.dataset.size || 300;
+                const image = new Image();
+                image.src = URL.createObjectURL(blob);
+                image.width = image.height = size;
+                document.body.appendChild(image);
+            })();
+        }
+    };
+});
+//// [moduleLookingFile01.js]
+System.register([], function (exports_1, context_1) {
+    "use strict";
+    var x, y, z;
+    var __moduleName = context_1 && context_1.id;
+    return {
+        setters: [],
+        execute: function () {
+            exports_1("x", x = (context_1.meta));
+            exports_1("y", y = (import.metal));
+            exports_1("z", z = import.import.import.malkovich);
+        }
+    };
+});
+//// [scriptLookingFile01.js]
+System.register([], function (exports_1, context_1) {
+    "use strict";
+    var globalA, globalB, globalC;
+    var __moduleName = context_1 && context_1.id;
+    return {
+        setters: [],
+        execute: function () {
+            globalA = (context_1.meta);
+            globalB = (import.metal);
+            globalC = import.import.import.malkovich;
+        }
+    };
+});
+//// [assignmentTargets.js]
+System.register([], function (exports_1, context_1) {
+    "use strict";
+    var foo, _a, a, b, c;
+    var __moduleName = context_1 && context_1.id;
+    return {
+        setters: [],
+        execute: function () {
+            exports_1("foo", foo = context_1.meta.blah = context_1.meta.blue = context_1.meta);
+            context_1.meta = foo;
+            _a = context_1.meta.wellKnownProperty, a = _a.a, b = _a.b, c = _a.c;
+        }
+    };
+});
diff --git a/tests/baselines/reference/importMeta(module=system,target=esnext).symbols b/tests/baselines/reference/importMeta(module=system,target=esnext).symbols
new file mode 100644
index 00000000000..d21785639ed
--- /dev/null
+++ b/tests/baselines/reference/importMeta(module=system,target=esnext).symbols
@@ -0,0 +1,101 @@
+=== tests/cases/conformance/es2019/importMeta/example.ts ===
+// Adapted from https://github.com/tc39/proposal-import-meta/tree/c3902a9ffe2e69a7ac42c19d7ea74cbdcea9b7fb#example
+(async () => {
+  const response = await fetch(new URL("../hamsters.jpg", import.meta.url).toString());
+>response : Symbol(response, Decl(example.ts, 2, 7))
+>fetch : Symbol(fetch, Decl(lib.dom.d.ts, --, --))
+>new URL("../hamsters.jpg", import.meta.url).toString : Symbol(Object.toString, Decl(lib.es5.d.ts, --, --))
+>URL : Symbol(URL, Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --))
+>toString : Symbol(Object.toString, Decl(lib.es5.d.ts, --, --))
+
+  const blob = await response.blob();
+>blob : Symbol(blob, Decl(example.ts, 3, 7))
+>response.blob : Symbol(Body.blob, Decl(lib.dom.d.ts, --, --))
+>response : Symbol(response, Decl(example.ts, 2, 7))
+>blob : Symbol(Body.blob, Decl(lib.dom.d.ts, --, --))
+
+  const size = import.meta.scriptElement.dataset.size || 300;
+>size : Symbol(size, Decl(example.ts, 5, 7))
+
+  const image = new Image();
+>image : Symbol(image, Decl(example.ts, 7, 7))
+>Image : Symbol(Image, Decl(lib.dom.d.ts, --, --))
+
+  image.src = URL.createObjectURL(blob);
+>image.src : Symbol(HTMLImageElement.src, Decl(lib.dom.d.ts, --, --))
+>image : Symbol(image, Decl(example.ts, 7, 7))
+>src : Symbol(HTMLImageElement.src, Decl(lib.dom.d.ts, --, --))
+>URL.createObjectURL : Symbol(createObjectURL, Decl(lib.dom.d.ts, --, --))
+>URL : Symbol(URL, Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --))
+>createObjectURL : Symbol(createObjectURL, Decl(lib.dom.d.ts, --, --))
+>blob : Symbol(blob, Decl(example.ts, 3, 7))
+
+  image.width = image.height = size;
+>image.width : Symbol(HTMLImageElement.width, Decl(lib.dom.d.ts, --, --))
+>image : Symbol(image, Decl(example.ts, 7, 7))
+>width : Symbol(HTMLImageElement.width, Decl(lib.dom.d.ts, --, --))
+>image.height : Symbol(HTMLImageElement.height, Decl(lib.dom.d.ts, --, --))
+>image : Symbol(image, Decl(example.ts, 7, 7))
+>height : Symbol(HTMLImageElement.height, Decl(lib.dom.d.ts, --, --))
+>size : Symbol(size, Decl(example.ts, 5, 7))
+
+  document.body.appendChild(image);
+>document.body.appendChild : Symbol(Node.appendChild, Decl(lib.dom.d.ts, --, --))
+>document.body : Symbol(Document.body, Decl(lib.dom.d.ts, --, --))
+>document : Symbol(document, Decl(lib.dom.d.ts, --, --))
+>body : Symbol(Document.body, Decl(lib.dom.d.ts, --, --))
+>appendChild : Symbol(Node.appendChild, Decl(lib.dom.d.ts, --, --))
+>image : Symbol(image, Decl(example.ts, 7, 7))
+
+})();
+
+=== tests/cases/conformance/es2019/importMeta/moduleLookingFile01.ts ===
+export let x = import.meta;
+>x : Symbol(x, Decl(moduleLookingFile01.ts, 0, 10))
+
+export let y = import.metal;
+>y : Symbol(y, Decl(moduleLookingFile01.ts, 1, 10))
+
+export let z = import.import.import.malkovich;
+>z : Symbol(z, Decl(moduleLookingFile01.ts, 2, 10))
+
+=== tests/cases/conformance/es2019/importMeta/scriptLookingFile01.ts ===
+let globalA = import.meta;
+>globalA : Symbol(globalA, Decl(scriptLookingFile01.ts, 0, 3))
+
+let globalB = import.metal;
+>globalB : Symbol(globalB, Decl(scriptLookingFile01.ts, 1, 3))
+
+let globalC = import.import.import.malkovich;
+>globalC : Symbol(globalC, Decl(scriptLookingFile01.ts, 2, 3))
+
+=== tests/cases/conformance/es2019/importMeta/assignmentTargets.ts ===
+export const foo: ImportMeta = import.meta.blah = import.meta.blue = import.meta;
+>foo : Symbol(foo, Decl(assignmentTargets.ts, 0, 12))
+>ImportMeta : Symbol(ImportMeta, Decl(lib.es5.d.ts, --, --), Decl(assignmentTargets.ts, 4, 16))
+
+import.meta = foo;
+>foo : Symbol(foo, Decl(assignmentTargets.ts, 0, 12))
+
+// @Filename augmentations.ts
+declare global {
+>global : Symbol(global, Decl(assignmentTargets.ts, 1, 18))
+
+  interface ImportMeta {
+>ImportMeta : Symbol(ImportMeta, Decl(lib.es5.d.ts, --, --), Decl(assignmentTargets.ts, 4, 16))
+
+    wellKnownProperty: { a: number, b: string, c: boolean };
+>wellKnownProperty : Symbol(ImportMeta.wellKnownProperty, Decl(assignmentTargets.ts, 5, 24))
+>a : Symbol(a, Decl(assignmentTargets.ts, 6, 24))
+>b : Symbol(b, Decl(assignmentTargets.ts, 6, 35))
+>c : Symbol(c, Decl(assignmentTargets.ts, 6, 46))
+  }
+}
+
+const { a, b, c } = import.meta.wellKnownProperty;
+>a : Symbol(a, Decl(assignmentTargets.ts, 10, 7))
+>b : Symbol(b, Decl(assignmentTargets.ts, 10, 10))
+>c : Symbol(c, Decl(assignmentTargets.ts, 10, 13))
+>import.meta.wellKnownProperty : Symbol(ImportMeta.wellKnownProperty, Decl(assignmentTargets.ts, 5, 24))
+>wellKnownProperty : Symbol(ImportMeta.wellKnownProperty, Decl(assignmentTargets.ts, 5, 24))
+
diff --git a/tests/baselines/reference/importMeta(module=system,target=esnext).types b/tests/baselines/reference/importMeta(module=system,target=esnext).types
new file mode 100644
index 00000000000..78d2e3395c8
--- /dev/null
+++ b/tests/baselines/reference/importMeta(module=system,target=esnext).types
@@ -0,0 +1,166 @@
+=== tests/cases/conformance/es2019/importMeta/example.ts ===
+// Adapted from https://github.com/tc39/proposal-import-meta/tree/c3902a9ffe2e69a7ac42c19d7ea74cbdcea9b7fb#example
+(async () => {
+>(async () => {  const response = await fetch(new URL("../hamsters.jpg", import.meta.url).toString());  const blob = await response.blob();  const size = import.meta.scriptElement.dataset.size || 300;  const image = new Image();  image.src = URL.createObjectURL(blob);  image.width = image.height = size;  document.body.appendChild(image);})() : Promise<void>
+>(async () => {  const response = await fetch(new URL("../hamsters.jpg", import.meta.url).toString());  const blob = await response.blob();  const size = import.meta.scriptElement.dataset.size || 300;  const image = new Image();  image.src = URL.createObjectURL(blob);  image.width = image.height = size;  document.body.appendChild(image);}) : () => Promise<void>
+>async () => {  const response = await fetch(new URL("../hamsters.jpg", import.meta.url).toString());  const blob = await response.blob();  const size = import.meta.scriptElement.dataset.size || 300;  const image = new Image();  image.src = URL.createObjectURL(blob);  image.width = image.height = size;  document.body.appendChild(image);} : () => Promise<void>
+
+  const response = await fetch(new URL("../hamsters.jpg", import.meta.url).toString());
+>response : Response
+>await fetch(new URL("../hamsters.jpg", import.meta.url).toString()) : Response
+>fetch(new URL("../hamsters.jpg", import.meta.url).toString()) : Promise<Response>
+>fetch : (input: RequestInfo, init?: RequestInit) => Promise<Response>
+>new URL("../hamsters.jpg", import.meta.url).toString() : string
+>new URL("../hamsters.jpg", import.meta.url).toString : () => string
+>new URL("../hamsters.jpg", import.meta.url) : URL
+>URL : { new (url: string, base?: string | URL): URL; prototype: URL; createObjectURL(object: any): string; revokeObjectURL(url: string): void; }
+>"../hamsters.jpg" : "../hamsters.jpg"
+>import.meta.url : any
+>import.meta : ImportMeta
+>meta : any
+>url : any
+>toString : () => string
+
+  const blob = await response.blob();
+>blob : Blob
+>await response.blob() : Blob
+>response.blob() : Promise<Blob>
+>response.blob : () => Promise<Blob>
+>response : Response
+>blob : () => Promise<Blob>
+
+  const size = import.meta.scriptElement.dataset.size || 300;
+>size : any
+>import.meta.scriptElement.dataset.size || 300 : any
+>import.meta.scriptElement.dataset.size : any
+>import.meta.scriptElement.dataset : any
+>import.meta.scriptElement : any
+>import.meta : ImportMeta
+>meta : any
+>scriptElement : any
+>dataset : any
+>size : any
+>300 : 300
+
+  const image = new Image();
+>image : HTMLImageElement
+>new Image() : HTMLImageElement
+>Image : new (width?: number, height?: number) => HTMLImageElement
+
+  image.src = URL.createObjectURL(blob);
+>image.src = URL.createObjectURL(blob) : string
+>image.src : string
+>image : HTMLImageElement
+>src : string
+>URL.createObjectURL(blob) : string
+>URL.createObjectURL : (object: any) => string
+>URL : { new (url: string, base?: string | URL): URL; prototype: URL; createObjectURL(object: any): string; revokeObjectURL(url: string): void; }
+>createObjectURL : (object: any) => string
+>blob : Blob
+
+  image.width = image.height = size;
+>image.width = image.height = size : any
+>image.width : number
+>image : HTMLImageElement
+>width : number
+>image.height = size : any
+>image.height : number
+>image : HTMLImageElement
+>height : number
+>size : any
+
+  document.body.appendChild(image);
+>document.body.appendChild(image) : HTMLImageElement
+>document.body.appendChild : <T extends Node>(newChild: T) => T
+>document.body : HTMLElement
+>document : Document
+>body : HTMLElement
+>appendChild : <T extends Node>(newChild: T) => T
+>image : HTMLImageElement
+
+})();
+
+=== tests/cases/conformance/es2019/importMeta/moduleLookingFile01.ts ===
+export let x = import.meta;
+>x : ImportMeta
+>import.meta : ImportMeta
+>meta : any
+
+export let y = import.metal;
+>y : any
+>import.metal : any
+>metal : any
+
+export let z = import.import.import.malkovich;
+>z : any
+>import.import.import.malkovich : any
+>import.import.import : any
+>import.import : any
+>import : any
+>import : any
+>malkovich : any
+
+=== tests/cases/conformance/es2019/importMeta/scriptLookingFile01.ts ===
+let globalA = import.meta;
+>globalA : ImportMeta
+>import.meta : ImportMeta
+>meta : any
+
+let globalB = import.metal;
+>globalB : any
+>import.metal : any
+>metal : any
+
+let globalC = import.import.import.malkovich;
+>globalC : any
+>import.import.import.malkovich : any
+>import.import.import : any
+>import.import : any
+>import : any
+>import : any
+>malkovich : any
+
+=== tests/cases/conformance/es2019/importMeta/assignmentTargets.ts ===
+export const foo: ImportMeta = import.meta.blah = import.meta.blue = import.meta;
+>foo : ImportMeta
+>import.meta.blah = import.meta.blue = import.meta : ImportMeta
+>import.meta.blah : any
+>import.meta : ImportMeta
+>meta : any
+>blah : any
+>import.meta.blue = import.meta : ImportMeta
+>import.meta.blue : any
+>import.meta : ImportMeta
+>meta : any
+>blue : any
+>import.meta : ImportMeta
+>meta : any
+
+import.meta = foo;
+>import.meta = foo : ImportMeta
+>import.meta : ImportMeta
+>meta : any
+>foo : ImportMeta
+
+// @Filename augmentations.ts
+declare global {
+>global : any
+
+  interface ImportMeta {
+    wellKnownProperty: { a: number, b: string, c: boolean };
+>wellKnownProperty : { a: number; b: string; c: boolean; }
+>a : number
+>b : string
+>c : boolean
+  }
+}
+
+const { a, b, c } = import.meta.wellKnownProperty;
+>a : number
+>b : string
+>c : boolean
+>import.meta.wellKnownProperty : { a: number; b: string; c: boolean; }
+>import.meta : ImportMeta
+>meta : any
+>wellKnownProperty : { a: number; b: string; c: boolean; }
+
diff --git a/tests/cases/conformance/es2019/importMeta/importMeta.ts b/tests/cases/conformance/es2019/importMeta/importMeta.ts
index 71d635a6534..30d604b51f8 100644
--- a/tests/cases/conformance/es2019/importMeta/importMeta.ts
+++ b/tests/cases/conformance/es2019/importMeta/importMeta.ts
@@ -1,6 +1,6 @@
 
-// @target: esnext
-// @module: esnext
+// @target: esnext,es5
+// @module: esnext,commonjs,system
 // @lib: es5,dom
 
 // @Filename: example.ts
diff --git a/tests/cases/conformance/es2019/importMeta/importMetaES5.ts b/tests/cases/conformance/es2019/importMeta/importMetaES5.ts
deleted file mode 100644
index b11a32ecc9b..00000000000
--- a/tests/cases/conformance/es2019/importMeta/importMetaES5.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-
-// @target: es5
-// @module: commonjs
-// @lib: es5,dom
-
-// @Filename: example.ts
-// Adapted from https://github.com/tc39/proposal-import-meta/tree/c3902a9ffe2e69a7ac42c19d7ea74cbdcea9b7fb#example
-(async () => {
-  const response = await fetch(new URL("../hamsters.jpg", import.meta.url).toString());
-  const blob = await response.blob();
-
-  const size = import.meta.scriptElement.dataset.size || 300;
-
-  const image = new Image();
-  image.src = URL.createObjectURL(blob);
-  image.width = image.height = size;
-
-  document.body.appendChild(image);
-})();
-
-// @Filename: moduleLookingFile01.ts
-export let x = import.meta;
-export let y = import.metal;
-export let z = import.import.import.malkovich;
-
-// @Filename: scriptLookingFile01.ts
-let globalA = import.meta;
-let globalB = import.metal;
-let globalC = import.import.import.malkovich;
-
-// @Filename: assignmentTargets.ts
-export const foo: ImportMeta = import.meta.blah = import.meta.blue = import.meta;
-import.meta = foo;
-
-// @Filename augmentations.ts
-declare global {
-  interface ImportMeta {
-    wellKnownProperty: { a: number, b: string, c: boolean };
-  }
-}
-
-const { a, b, c } = import.meta.wellKnownProperty;
\ No newline at end of file

From e10991413c0d966eeee3e2f619a2c5c3d192f6be Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Mon, 12 Aug 2019 13:13:28 -0700
Subject: [PATCH 148/151] Print program only if there are files are added or
 removed from the program.

---
 src/server/project.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/server/project.ts b/src/server/project.ts
index 91ac212ea13..f9465d8b242 100644
--- a/src/server/project.ts
+++ b/src/server/project.ts
@@ -1009,9 +1009,12 @@ namespace ts.server {
             );
             const elapsed = timestamp() - start;
             this.writeLog(`Finishing updateGraphWorker: Project: ${this.getProjectName()} Version: ${this.getProjectVersion()} structureChanged: ${hasNewProgram} Elapsed: ${elapsed}ms`);
-            if (this.program !== oldProgram) {
+            if (this.hasAddedorRemovedFiles) {
                 this.print();
             }
+            else if (this.program !== oldProgram) {
+                this.writeLog(`Different program with same set of files:: oldProgram.structureIsReused:: ${oldProgram && oldProgram.structureIsReused}`);
+            }
             return hasNewProgram;
         }
 

From b3268a7e061481a5d491e88f21d076943b342051 Mon Sep 17 00:00:00 2001
From: Ron Buckton <ron.buckton@microsoft.com>
Date: Mon, 12 Aug 2019 13:33:04 -0700
Subject: [PATCH 149/151] Do not emit 'this' for __awaiter helper at the top
 level of a strict-mode file. (#32823)

---
 src/compiler/transformers/es2017.ts           | 36 +++++++++++++++---
 src/compiler/transformers/es2018.ts           | 38 ++++++++++++++-----
 src/compiler/utilities.ts                     | 37 ++++++++++++++++++
 .../asyncAwaitIsolatedModules_es5.js          | 15 ++++----
 .../asyncAwaitIsolatedModules_es6.js          | 14 +++----
 .../reference/asyncFunctionsAcrossFiles.js    |  4 +-
 .../reference/exportDefaultAsyncFunction2.js  |  2 +-
 .../importCallExpressionAsyncES3AMD.js        |  5 +--
 .../importCallExpressionAsyncES3CJS.js        |  5 +--
 .../importCallExpressionAsyncES3System.js     |  7 ++--
 .../importCallExpressionAsyncES3UMD.js        |  5 +--
 .../importCallExpressionAsyncES5AMD.js        |  5 +--
 .../importCallExpressionAsyncES5CJS.js        |  5 +--
 .../importCallExpressionAsyncES5System.js     |  7 ++--
 .../importCallExpressionAsyncES5UMD.js        |  5 +--
 .../importCallExpressionAsyncES6AMD.js        |  4 +-
 .../importCallExpressionAsyncES6CJS.js        |  4 +-
 .../importCallExpressionAsyncES6System.js     |  4 +-
 .../importCallExpressionAsyncES6UMD.js        |  4 +-
 .../importMeta(module=commonjs,target=es5).js |  3 +-
 .../importMeta(module=esnext,target=es5).js   |  3 +-
 .../importMeta(module=system,target=es5).js   |  4 +-
 ...uxLikeDeferredInferenceAllowsAssignment.js |  3 +-
 23 files changed, 144 insertions(+), 75 deletions(-)

diff --git a/src/compiler/transformers/es2017.ts b/src/compiler/transformers/es2017.ts
index 98f42b5a564..005d5a8fdd6 100644
--- a/src/compiler/transformers/es2017.ts
+++ b/src/compiler/transformers/es2017.ts
@@ -41,6 +41,8 @@ namespace ts {
         /** A set of node IDs for generated super accessors (variable statements). */
         const substitutedSuperAccessors: boolean[] = [];
 
+        let topLevel: boolean;
+
         // Save the previous transformation hooks.
         const previousOnEmitNode = context.onEmitNode;
         const previousOnSubstituteNode = context.onSubstituteNode;
@@ -56,11 +58,26 @@ namespace ts {
                 return node;
             }
 
+            topLevel = isEffectiveStrictModeSourceFile(node, compilerOptions);
             const visited = visitEachChild(node, visitor, context);
             addEmitHelpers(visited, context.readEmitHelpers());
             return visited;
         }
 
+        function doOutsideOfTopLevel<T, U>(cb: (value: T) => U, value: T) {
+            if (topLevel) {
+                topLevel = false;
+                const result = cb(value);
+                topLevel = true;
+                return result;
+            }
+            return cb(value);
+        }
+
+        function visitDefault(node: Node): VisitResult<Node> {
+            return visitEachChild(node, visitor, context);
+        }
+
         function visitor(node: Node): VisitResult<Node> {
             if ((node.transformFlags & TransformFlags.ContainsES2017) === 0) {
                 return node;
@@ -74,13 +91,13 @@ namespace ts {
                     return visitAwaitExpression(<AwaitExpression>node);
 
                 case SyntaxKind.MethodDeclaration:
-                    return visitMethodDeclaration(<MethodDeclaration>node);
+                    return doOutsideOfTopLevel(visitMethodDeclaration, <MethodDeclaration>node);
 
                 case SyntaxKind.FunctionDeclaration:
-                    return visitFunctionDeclaration(<FunctionDeclaration>node);
+                    return doOutsideOfTopLevel(visitFunctionDeclaration, <FunctionDeclaration>node);
 
                 case SyntaxKind.FunctionExpression:
-                    return visitFunctionExpression(<FunctionExpression>node);
+                    return doOutsideOfTopLevel(visitFunctionExpression, <FunctionExpression>node);
 
                 case SyntaxKind.ArrowFunction:
                     return visitArrowFunction(<ArrowFunction>node);
@@ -97,6 +114,13 @@ namespace ts {
                     }
                     return visitEachChild(node, visitor, context);
 
+                case SyntaxKind.GetAccessor:
+                case SyntaxKind.SetAccessor:
+                case SyntaxKind.Constructor:
+                case SyntaxKind.ClassDeclaration:
+                case SyntaxKind.ClassExpression:
+                    return doOutsideOfTopLevel(visitDefault, node);
+
                 default:
                     return visitEachChild(node, visitor, context);
             }
@@ -433,6 +457,7 @@ namespace ts {
                     createReturn(
                         createAwaiterHelper(
                             context,
+                            !topLevel,
                             hasLexicalArguments,
                             promiseConstructor,
                             transformAsyncFunctionBodyWorker(<Block>node.body, statementOffset)
@@ -473,6 +498,7 @@ namespace ts {
             else {
                 const expression = createAwaiterHelper(
                     context,
+                    !topLevel,
                     hasLexicalArguments,
                     promiseConstructor,
                     transformAsyncFunctionBodyWorker(node.body!)
@@ -786,7 +812,7 @@ namespace ts {
             };`
     };
 
-    function createAwaiterHelper(context: TransformationContext, hasLexicalArguments: boolean, promiseConstructor: EntityName | Expression | undefined, body: Block) {
+    function createAwaiterHelper(context: TransformationContext, hasLexicalThis: boolean, hasLexicalArguments: boolean, promiseConstructor: EntityName | Expression | undefined, body: Block) {
         context.requestEmitHelper(awaiterHelper);
 
         const generatorFunc = createFunctionExpression(
@@ -806,7 +832,7 @@ namespace ts {
             getUnscopedHelperName("__awaiter"),
             /*typeArguments*/ undefined,
             [
-                createThis(),
+                hasLexicalThis ? createThis() : createVoidZero(),
                 hasLexicalArguments ? createIdentifier("arguments") : createVoidZero(),
                 promiseConstructor ? createExpressionFromEntityName(promiseConstructor) : createVoidZero(),
                 generatorFunc
diff --git a/src/compiler/transformers/es2018.ts b/src/compiler/transformers/es2018.ts
index c723da3d312..bf9cc61039d 100644
--- a/src/compiler/transformers/es2018.ts
+++ b/src/compiler/transformers/es2018.ts
@@ -26,6 +26,7 @@ namespace ts {
         let enabledSubstitutions: ESNextSubstitutionFlags;
         let enclosingFunctionFlags: FunctionFlags;
         let enclosingSuperContainerFlags: NodeCheckFlags = 0;
+        let topLevel: boolean;
 
         /** Keeps track of property names accessed on super (`super.x`) within async functions. */
         let capturedSuperProperties: UnderscoreEscapedMap<true>;
@@ -42,6 +43,7 @@ namespace ts {
             }
 
             exportedVariableStatement = false;
+            topLevel = isEffectiveStrictModeSourceFile(node, compilerOptions);
             const visited = visitEachChild(node, visitor, context);
             addEmitHelpers(visited, context.readEmitHelpers());
             return visited;
@@ -62,6 +64,20 @@ namespace ts {
             return node;
         }
 
+        function doOutsideOfTopLevel<T, U>(cb: (value: T) => U, value: T) {
+            if (topLevel) {
+                topLevel = false;
+                const result = cb(value);
+                topLevel = true;
+                return result;
+            }
+            return cb(value);
+        }
+
+        function visitDefault(node: Node): VisitResult<Node> {
+            return visitEachChild(node, visitor, context);
+        }
+
         function visitorWorker(node: Node, noDestructuringValue: boolean): VisitResult<Node> {
             if ((node.transformFlags & TransformFlags.ContainsES2018) === 0) {
                 return node;
@@ -92,17 +108,17 @@ namespace ts {
                 case SyntaxKind.VoidExpression:
                     return visitVoidExpression(node as VoidExpression);
                 case SyntaxKind.Constructor:
-                    return visitConstructorDeclaration(node as ConstructorDeclaration);
+                    return doOutsideOfTopLevel(visitConstructorDeclaration, node as ConstructorDeclaration);
                 case SyntaxKind.MethodDeclaration:
-                    return visitMethodDeclaration(node as MethodDeclaration);
+                    return doOutsideOfTopLevel(visitMethodDeclaration, node as MethodDeclaration);
                 case SyntaxKind.GetAccessor:
-                    return visitGetAccessorDeclaration(node as GetAccessorDeclaration);
+                    return doOutsideOfTopLevel(visitGetAccessorDeclaration, node as GetAccessorDeclaration);
                 case SyntaxKind.SetAccessor:
-                    return visitSetAccessorDeclaration(node as SetAccessorDeclaration);
+                    return doOutsideOfTopLevel(visitSetAccessorDeclaration, node as SetAccessorDeclaration);
                 case SyntaxKind.FunctionDeclaration:
-                    return visitFunctionDeclaration(node as FunctionDeclaration);
+                    return doOutsideOfTopLevel(visitFunctionDeclaration, node as FunctionDeclaration);
                 case SyntaxKind.FunctionExpression:
-                    return visitFunctionExpression(node as FunctionExpression);
+                    return doOutsideOfTopLevel(visitFunctionExpression, node as FunctionExpression);
                 case SyntaxKind.ArrowFunction:
                     return visitArrowFunction(node as ArrowFunction);
                 case SyntaxKind.Parameter:
@@ -121,6 +137,9 @@ namespace ts {
                         hasSuperElementAccess = true;
                     }
                     return visitEachChild(node, visitor, context);
+                case SyntaxKind.ClassDeclaration:
+                case SyntaxKind.ClassExpression:
+                    return doOutsideOfTopLevel(visitDefault, node);
                 default:
                     return visitEachChild(node, visitor, context);
             }
@@ -754,7 +773,8 @@ namespace ts {
                             node.body!,
                             visitLexicalEnvironment(node.body!.statements, visitor, context, statementOffset)
                         )
-                    )
+                    ),
+                    !topLevel
                 )
             );
 
@@ -1057,7 +1077,7 @@ namespace ts {
             };`
     };
 
-    function createAsyncGeneratorHelper(context: TransformationContext, generatorFunc: FunctionExpression) {
+    function createAsyncGeneratorHelper(context: TransformationContext, generatorFunc: FunctionExpression, hasLexicalThis: boolean) {
         context.requestEmitHelper(awaitHelper);
         context.requestEmitHelper(asyncGeneratorHelper);
 
@@ -1068,7 +1088,7 @@ namespace ts {
             getUnscopedHelperName("__asyncGenerator"),
             /*typeArguments*/ undefined,
             [
-                createThis(),
+                hasLexicalThis ? createThis() : createVoidZero(),
                 createIdentifier("arguments"),
                 generatorFunc
             ]
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index c020c1e859e..aa442d822e4 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -700,6 +700,43 @@ namespace ts {
         return isExternalModule(node) || compilerOptions.isolatedModules || ((getEmitModuleKind(compilerOptions) === ModuleKind.CommonJS) && !!node.commonJsModuleIndicator);
     }
 
+    /**
+     * Returns whether the source file will be treated as if it were in strict mode at runtime.
+     */
+    export function isEffectiveStrictModeSourceFile(node: SourceFile, compilerOptions: CompilerOptions) {
+        // We can only verify strict mode for JS/TS files
+        switch (node.scriptKind) {
+            case ScriptKind.JS:
+            case ScriptKind.TS:
+            case ScriptKind.JSX:
+            case ScriptKind.TSX:
+                break;
+            default:
+                return false;
+        }
+        // Strict mode does not matter for declaration files.
+        if (node.isDeclarationFile) {
+            return false;
+        }
+        // If `alwaysStrict` is set, then treat the file as strict.
+        if (getStrictOptionValue(compilerOptions, "alwaysStrict")) {
+            return true;
+        }
+        // Starting with a "use strict" directive indicates the file is strict.
+        if (startsWithUseStrict(node.statements)) {
+            return true;
+        }
+        if (isExternalModule(node) || compilerOptions.isolatedModules) {
+            // ECMAScript Modules are always strict.
+            if (getEmitModuleKind(compilerOptions) >= ModuleKind.ES2015) {
+                return true;
+            }
+            // Other modules are strict unless otherwise specified.
+            return !compilerOptions.noImplicitUseStrict;
+        }
+        return false;
+    }
+
     export function isBlockScope(node: Node, parentNode: Node): boolean {
         switch (node.kind) {
             case SyntaxKind.SourceFile:
diff --git a/tests/baselines/reference/asyncAwaitIsolatedModules_es5.js b/tests/baselines/reference/asyncAwaitIsolatedModules_es5.js
index 934f6be814a..ec3837911de 100644
--- a/tests/baselines/reference/asyncAwaitIsolatedModules_es5.js
+++ b/tests/baselines/reference/asyncAwaitIsolatedModules_es5.js
@@ -77,7 +77,6 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-var _this = this;
 Object.defineProperty(exports, "__esModule", { value: true });
 var missing_1 = require("missing");
 function f0() {
@@ -110,25 +109,25 @@ var f6 = function () {
         return [2 /*return*/];
     }); });
 };
-var f7 = function () { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
+var f7 = function () { return __awaiter(void 0, void 0, void 0, function () { return __generator(this, function (_a) {
     return [2 /*return*/];
 }); }); };
-var f8 = function () { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
+var f8 = function () { return __awaiter(void 0, void 0, void 0, function () { return __generator(this, function (_a) {
     return [2 /*return*/];
 }); }); };
-var f9 = function () { return __awaiter(_this, void 0, missing_1.MyPromise, function () { return __generator(this, function (_a) {
+var f9 = function () { return __awaiter(void 0, void 0, missing_1.MyPromise, function () { return __generator(this, function (_a) {
     return [2 /*return*/];
 }); }); };
-var f10 = function () { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
+var f10 = function () { return __awaiter(void 0, void 0, void 0, function () { return __generator(this, function (_a) {
     return [2 /*return*/, p];
 }); }); };
-var f11 = function () { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
+var f11 = function () { return __awaiter(void 0, void 0, void 0, function () { return __generator(this, function (_a) {
     return [2 /*return*/, mp];
 }); }); };
-var f12 = function () { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
+var f12 = function () { return __awaiter(void 0, void 0, void 0, function () { return __generator(this, function (_a) {
     return [2 /*return*/, mp];
 }); }); };
-var f13 = function () { return __awaiter(_this, void 0, missing_1.MyPromise, function () { return __generator(this, function (_a) {
+var f13 = function () { return __awaiter(void 0, void 0, missing_1.MyPromise, function () { return __generator(this, function (_a) {
     return [2 /*return*/, p];
 }); }); };
 var o = {
diff --git a/tests/baselines/reference/asyncAwaitIsolatedModules_es6.js b/tests/baselines/reference/asyncAwaitIsolatedModules_es6.js
index 2b956515ba1..015992805bc 100644
--- a/tests/baselines/reference/asyncAwaitIsolatedModules_es6.js
+++ b/tests/baselines/reference/asyncAwaitIsolatedModules_es6.js
@@ -67,13 +67,13 @@ let f5 = function () {
 let f6 = function () {
     return __awaiter(this, void 0, void 0, function* () { });
 };
-let f7 = () => __awaiter(this, void 0, void 0, function* () { });
-let f8 = () => __awaiter(this, void 0, void 0, function* () { });
-let f9 = () => __awaiter(this, void 0, void 0, function* () { });
-let f10 = () => __awaiter(this, void 0, void 0, function* () { return p; });
-let f11 = () => __awaiter(this, void 0, void 0, function* () { return mp; });
-let f12 = () => __awaiter(this, void 0, void 0, function* () { return mp; });
-let f13 = () => __awaiter(this, void 0, void 0, function* () { return p; });
+let f7 = () => __awaiter(void 0, void 0, void 0, function* () { });
+let f8 = () => __awaiter(void 0, void 0, void 0, function* () { });
+let f9 = () => __awaiter(void 0, void 0, void 0, function* () { });
+let f10 = () => __awaiter(void 0, void 0, void 0, function* () { return p; });
+let f11 = () => __awaiter(void 0, void 0, void 0, function* () { return mp; });
+let f12 = () => __awaiter(void 0, void 0, void 0, function* () { return mp; });
+let f13 = () => __awaiter(void 0, void 0, void 0, function* () { return p; });
 let o = {
     m1() {
         return __awaiter(this, void 0, void 0, function* () { });
diff --git a/tests/baselines/reference/asyncFunctionsAcrossFiles.js b/tests/baselines/reference/asyncFunctionsAcrossFiles.js
index cd86f20c69d..642558c7206 100644
--- a/tests/baselines/reference/asyncFunctionsAcrossFiles.js
+++ b/tests/baselines/reference/asyncFunctionsAcrossFiles.js
@@ -27,7 +27,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { a } from './a';
 export const b = {
-    f: () => __awaiter(this, void 0, void 0, function* () {
+    f: () => __awaiter(void 0, void 0, void 0, function* () {
         yield a.f();
     })
 };
@@ -43,7 +43,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { b } from './b';
 export const a = {
-    f: () => __awaiter(this, void 0, void 0, function* () {
+    f: () => __awaiter(void 0, void 0, void 0, function* () {
         yield b.f();
     })
 };
diff --git a/tests/baselines/reference/exportDefaultAsyncFunction2.js b/tests/baselines/reference/exportDefaultAsyncFunction2.js
index ad9b9086a74..a94ad0f12d4 100644
--- a/tests/baselines/reference/exportDefaultAsyncFunction2.js
+++ b/tests/baselines/reference/exportDefaultAsyncFunction2.js
@@ -43,7 +43,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-export default () => __awaiter(this, void 0, void 0, function* () { return 0; });
+export default () => __awaiter(void 0, void 0, void 0, function* () { return 0; });
 //// [c.js]
 import { async } from 'asyncawait';
 export default async();
diff --git a/tests/baselines/reference/importCallExpressionAsyncES3AMD.js b/tests/baselines/reference/importCallExpressionAsyncES3AMD.js
index 9b4f7f76cc7..5f83ff55b04 100644
--- a/tests/baselines/reference/importCallExpressionAsyncES3AMD.js
+++ b/tests/baselines/reference/importCallExpressionAsyncES3AMD.js
@@ -67,7 +67,6 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    var _this = this;
     exports.__esModule = true;
     function fn() {
         return __awaiter(this, void 0, void 0, function () {
@@ -105,7 +104,7 @@ define(["require", "exports"], function (require, exports) {
     }());
     exports.cl1 = cl1;
     exports.obj = {
-        m: function () { return __awaiter(_this, void 0, void 0, function () {
+        m: function () { return __awaiter(void 0, void 0, void 0, function () {
             var req;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -139,7 +138,7 @@ define(["require", "exports"], function (require, exports) {
         return cl2;
     }());
     exports.cl2 = cl2;
-    exports.l = function () { return __awaiter(_this, void 0, void 0, function () {
+    exports.l = function () { return __awaiter(void 0, void 0, void 0, function () {
         var req;
         return __generator(this, function (_a) {
             switch (_a.label) {
diff --git a/tests/baselines/reference/importCallExpressionAsyncES3CJS.js b/tests/baselines/reference/importCallExpressionAsyncES3CJS.js
index 43b4c868529..fe621973598 100644
--- a/tests/baselines/reference/importCallExpressionAsyncES3CJS.js
+++ b/tests/baselines/reference/importCallExpressionAsyncES3CJS.js
@@ -66,7 +66,6 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-var _this = this;
 exports.__esModule = true;
 function fn() {
     return __awaiter(this, void 0, void 0, function () {
@@ -104,7 +103,7 @@ var cl1 = /** @class */ (function () {
 }());
 exports.cl1 = cl1;
 exports.obj = {
-    m: function () { return __awaiter(_this, void 0, void 0, function () {
+    m: function () { return __awaiter(void 0, void 0, void 0, function () {
         var req;
         return __generator(this, function (_a) {
             switch (_a.label) {
@@ -138,7 +137,7 @@ var cl2 = /** @class */ (function () {
     return cl2;
 }());
 exports.cl2 = cl2;
-exports.l = function () { return __awaiter(_this, void 0, void 0, function () {
+exports.l = function () { return __awaiter(void 0, void 0, void 0, function () {
     var req;
     return __generator(this, function (_a) {
         switch (_a.label) {
diff --git a/tests/baselines/reference/importCallExpressionAsyncES3System.js b/tests/baselines/reference/importCallExpressionAsyncES3System.js
index 6369c73b68b..e4cc24387bc 100644
--- a/tests/baselines/reference/importCallExpressionAsyncES3System.js
+++ b/tests/baselines/reference/importCallExpressionAsyncES3System.js
@@ -67,8 +67,7 @@ System.register([], function (exports_1, context_1) {
             if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
         }
     };
-    var _this, cl1, obj, cl2, l;
-    _this = this;
+    var cl1, obj, cl2, l;
     var __moduleName = context_1 && context_1.id;
     function fn() {
         return __awaiter(this, void 0, void 0, function () {
@@ -109,7 +108,7 @@ System.register([], function (exports_1, context_1) {
             }());
             exports_1("cl1", cl1);
             exports_1("obj", obj = {
-                m: function () { return __awaiter(_this, void 0, void 0, function () {
+                m: function () { return __awaiter(void 0, void 0, void 0, function () {
                     var req;
                     return __generator(this, function (_a) {
                         switch (_a.label) {
@@ -143,7 +142,7 @@ System.register([], function (exports_1, context_1) {
                 return cl2;
             }());
             exports_1("cl2", cl2);
-            exports_1("l", l = function () { return __awaiter(_this, void 0, void 0, function () {
+            exports_1("l", l = function () { return __awaiter(void 0, void 0, void 0, function () {
                 var req;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
diff --git a/tests/baselines/reference/importCallExpressionAsyncES3UMD.js b/tests/baselines/reference/importCallExpressionAsyncES3UMD.js
index 794678e871d..26788580672 100644
--- a/tests/baselines/reference/importCallExpressionAsyncES3UMD.js
+++ b/tests/baselines/reference/importCallExpressionAsyncES3UMD.js
@@ -76,7 +76,6 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 })(function (require, exports) {
     "use strict";
     var __syncRequire = typeof module === "object" && typeof module.exports === "object";
-    var _this = this;
     exports.__esModule = true;
     function fn() {
         return __awaiter(this, void 0, void 0, function () {
@@ -114,7 +113,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }());
     exports.cl1 = cl1;
     exports.obj = {
-        m: function () { return __awaiter(_this, void 0, void 0, function () {
+        m: function () { return __awaiter(void 0, void 0, void 0, function () {
             var req;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -148,7 +147,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         return cl2;
     }());
     exports.cl2 = cl2;
-    exports.l = function () { return __awaiter(_this, void 0, void 0, function () {
+    exports.l = function () { return __awaiter(void 0, void 0, void 0, function () {
         var req;
         return __generator(this, function (_a) {
             switch (_a.label) {
diff --git a/tests/baselines/reference/importCallExpressionAsyncES5AMD.js b/tests/baselines/reference/importCallExpressionAsyncES5AMD.js
index 2451190c793..d2310ece41f 100644
--- a/tests/baselines/reference/importCallExpressionAsyncES5AMD.js
+++ b/tests/baselines/reference/importCallExpressionAsyncES5AMD.js
@@ -67,7 +67,6 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    var _this = this;
     Object.defineProperty(exports, "__esModule", { value: true });
     function fn() {
         return __awaiter(this, void 0, void 0, function () {
@@ -105,7 +104,7 @@ define(["require", "exports"], function (require, exports) {
     }());
     exports.cl1 = cl1;
     exports.obj = {
-        m: function () { return __awaiter(_this, void 0, void 0, function () {
+        m: function () { return __awaiter(void 0, void 0, void 0, function () {
             var req;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -139,7 +138,7 @@ define(["require", "exports"], function (require, exports) {
         return cl2;
     }());
     exports.cl2 = cl2;
-    exports.l = function () { return __awaiter(_this, void 0, void 0, function () {
+    exports.l = function () { return __awaiter(void 0, void 0, void 0, function () {
         var req;
         return __generator(this, function (_a) {
             switch (_a.label) {
diff --git a/tests/baselines/reference/importCallExpressionAsyncES5CJS.js b/tests/baselines/reference/importCallExpressionAsyncES5CJS.js
index cd60c69c4cf..4cc52e2add7 100644
--- a/tests/baselines/reference/importCallExpressionAsyncES5CJS.js
+++ b/tests/baselines/reference/importCallExpressionAsyncES5CJS.js
@@ -66,7 +66,6 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-var _this = this;
 Object.defineProperty(exports, "__esModule", { value: true });
 function fn() {
     return __awaiter(this, void 0, void 0, function () {
@@ -104,7 +103,7 @@ var cl1 = /** @class */ (function () {
 }());
 exports.cl1 = cl1;
 exports.obj = {
-    m: function () { return __awaiter(_this, void 0, void 0, function () {
+    m: function () { return __awaiter(void 0, void 0, void 0, function () {
         var req;
         return __generator(this, function (_a) {
             switch (_a.label) {
@@ -138,7 +137,7 @@ var cl2 = /** @class */ (function () {
     return cl2;
 }());
 exports.cl2 = cl2;
-exports.l = function () { return __awaiter(_this, void 0, void 0, function () {
+exports.l = function () { return __awaiter(void 0, void 0, void 0, function () {
     var req;
     return __generator(this, function (_a) {
         switch (_a.label) {
diff --git a/tests/baselines/reference/importCallExpressionAsyncES5System.js b/tests/baselines/reference/importCallExpressionAsyncES5System.js
index da510e8d098..bc577e5c981 100644
--- a/tests/baselines/reference/importCallExpressionAsyncES5System.js
+++ b/tests/baselines/reference/importCallExpressionAsyncES5System.js
@@ -67,8 +67,7 @@ System.register([], function (exports_1, context_1) {
             if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
         }
     };
-    var _this, cl1, obj, cl2, l;
-    _this = this;
+    var cl1, obj, cl2, l;
     var __moduleName = context_1 && context_1.id;
     function fn() {
         return __awaiter(this, void 0, void 0, function () {
@@ -109,7 +108,7 @@ System.register([], function (exports_1, context_1) {
             }());
             exports_1("cl1", cl1);
             exports_1("obj", obj = {
-                m: function () { return __awaiter(_this, void 0, void 0, function () {
+                m: function () { return __awaiter(void 0, void 0, void 0, function () {
                     var req;
                     return __generator(this, function (_a) {
                         switch (_a.label) {
@@ -143,7 +142,7 @@ System.register([], function (exports_1, context_1) {
                 return cl2;
             }());
             exports_1("cl2", cl2);
-            exports_1("l", l = function () { return __awaiter(_this, void 0, void 0, function () {
+            exports_1("l", l = function () { return __awaiter(void 0, void 0, void 0, function () {
                 var req;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
diff --git a/tests/baselines/reference/importCallExpressionAsyncES5UMD.js b/tests/baselines/reference/importCallExpressionAsyncES5UMD.js
index 111b747ff32..8091c83c0ee 100644
--- a/tests/baselines/reference/importCallExpressionAsyncES5UMD.js
+++ b/tests/baselines/reference/importCallExpressionAsyncES5UMD.js
@@ -76,7 +76,6 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 })(function (require, exports) {
     "use strict";
     var __syncRequire = typeof module === "object" && typeof module.exports === "object";
-    var _this = this;
     Object.defineProperty(exports, "__esModule", { value: true });
     function fn() {
         return __awaiter(this, void 0, void 0, function () {
@@ -114,7 +113,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }());
     exports.cl1 = cl1;
     exports.obj = {
-        m: function () { return __awaiter(_this, void 0, void 0, function () {
+        m: function () { return __awaiter(void 0, void 0, void 0, function () {
             var req;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -148,7 +147,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         return cl2;
     }());
     exports.cl2 = cl2;
-    exports.l = function () { return __awaiter(_this, void 0, void 0, function () {
+    exports.l = function () { return __awaiter(void 0, void 0, void 0, function () {
         var req;
         return __generator(this, function (_a) {
             switch (_a.label) {
diff --git a/tests/baselines/reference/importCallExpressionAsyncES6AMD.js b/tests/baselines/reference/importCallExpressionAsyncES6AMD.js
index 80cf843ade9..b6c74d5cf73 100644
--- a/tests/baselines/reference/importCallExpressionAsyncES6AMD.js
+++ b/tests/baselines/reference/importCallExpressionAsyncES6AMD.js
@@ -56,7 +56,7 @@ define(["require", "exports"], function (require, exports) {
     }
     exports.cl1 = cl1;
     exports.obj = {
-        m: () => __awaiter(this, void 0, void 0, function* () {
+        m: () => __awaiter(void 0, void 0, void 0, function* () {
             const req = yield new Promise((resolve_3, reject_3) => { require(['./test'], resolve_3, reject_3); }); // THREE
         })
     };
@@ -70,7 +70,7 @@ define(["require", "exports"], function (require, exports) {
         }
     }
     exports.cl2 = cl2;
-    exports.l = () => __awaiter(this, void 0, void 0, function* () {
+    exports.l = () => __awaiter(void 0, void 0, void 0, function* () {
         const req = yield new Promise((resolve_5, reject_5) => { require(['./test'], resolve_5, reject_5); }); // FIVE
     });
 });
diff --git a/tests/baselines/reference/importCallExpressionAsyncES6CJS.js b/tests/baselines/reference/importCallExpressionAsyncES6CJS.js
index 7ce2b69b44c..8c4e7596bd5 100644
--- a/tests/baselines/reference/importCallExpressionAsyncES6CJS.js
+++ b/tests/baselines/reference/importCallExpressionAsyncES6CJS.js
@@ -55,7 +55,7 @@ class cl1 {
 }
 exports.cl1 = cl1;
 exports.obj = {
-    m: () => __awaiter(this, void 0, void 0, function* () {
+    m: () => __awaiter(void 0, void 0, void 0, function* () {
         const req = yield Promise.resolve().then(() => require('./test')); // THREE
     })
 };
@@ -69,6 +69,6 @@ class cl2 {
     }
 }
 exports.cl2 = cl2;
-exports.l = () => __awaiter(this, void 0, void 0, function* () {
+exports.l = () => __awaiter(void 0, void 0, void 0, function* () {
     const req = yield Promise.resolve().then(() => require('./test')); // FIVE
 });
diff --git a/tests/baselines/reference/importCallExpressionAsyncES6System.js b/tests/baselines/reference/importCallExpressionAsyncES6System.js
index 8dd7e2f32e8..51c8832bb52 100644
--- a/tests/baselines/reference/importCallExpressionAsyncES6System.js
+++ b/tests/baselines/reference/importCallExpressionAsyncES6System.js
@@ -60,7 +60,7 @@ System.register([], function (exports_1, context_1) {
             };
             exports_1("cl1", cl1);
             exports_1("obj", obj = {
-                m: () => __awaiter(this, void 0, void 0, function* () {
+                m: () => __awaiter(void 0, void 0, void 0, function* () {
                     const req = yield context_1.import('./test'); // THREE
                 })
             });
@@ -74,7 +74,7 @@ System.register([], function (exports_1, context_1) {
                 }
             };
             exports_1("cl2", cl2);
-            exports_1("l", l = () => __awaiter(this, void 0, void 0, function* () {
+            exports_1("l", l = () => __awaiter(void 0, void 0, void 0, function* () {
                 const req = yield context_1.import('./test'); // FIVE
             }));
         }
diff --git a/tests/baselines/reference/importCallExpressionAsyncES6UMD.js b/tests/baselines/reference/importCallExpressionAsyncES6UMD.js
index f7dfe0d9934..2be59a1de74 100644
--- a/tests/baselines/reference/importCallExpressionAsyncES6UMD.js
+++ b/tests/baselines/reference/importCallExpressionAsyncES6UMD.js
@@ -65,7 +65,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     }
     exports.cl1 = cl1;
     exports.obj = {
-        m: () => __awaiter(this, void 0, void 0, function* () {
+        m: () => __awaiter(void 0, void 0, void 0, function* () {
             const req = yield __syncRequire ? Promise.resolve().then(() => require('./test')) : new Promise((resolve_3, reject_3) => { require(['./test'], resolve_3, reject_3); }); // THREE
         })
     };
@@ -79,7 +79,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         }
     }
     exports.cl2 = cl2;
-    exports.l = () => __awaiter(this, void 0, void 0, function* () {
+    exports.l = () => __awaiter(void 0, void 0, void 0, function* () {
         const req = yield __syncRequire ? Promise.resolve().then(() => require('./test')) : new Promise((resolve_5, reject_5) => { require(['./test'], resolve_5, reject_5); }); // FIVE
     });
 });
diff --git a/tests/baselines/reference/importMeta(module=commonjs,target=es5).js b/tests/baselines/reference/importMeta(module=commonjs,target=es5).js
index 1a8c764dd32..a4290bcb592 100644
--- a/tests/baselines/reference/importMeta(module=commonjs,target=es5).js
+++ b/tests/baselines/reference/importMeta(module=commonjs,target=es5).js
@@ -76,10 +76,9 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-var _this = this;
 Object.defineProperty(exports, "__esModule", { value: true });
 // Adapted from https://github.com/tc39/proposal-import-meta/tree/c3902a9ffe2e69a7ac42c19d7ea74cbdcea9b7fb#example
-(function () { return __awaiter(_this, void 0, void 0, function () {
+(function () { return __awaiter(void 0, void 0, void 0, function () {
     var response, blob, size, image;
     return __generator(this, function (_a) {
         switch (_a.label) {
diff --git a/tests/baselines/reference/importMeta(module=esnext,target=es5).js b/tests/baselines/reference/importMeta(module=esnext,target=es5).js
index 57a51318e25..522b0f01661 100644
--- a/tests/baselines/reference/importMeta(module=esnext,target=es5).js
+++ b/tests/baselines/reference/importMeta(module=esnext,target=es5).js
@@ -75,9 +75,8 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-var _this = this;
 // Adapted from https://github.com/tc39/proposal-import-meta/tree/c3902a9ffe2e69a7ac42c19d7ea74cbdcea9b7fb#example
-(function () { return __awaiter(_this, void 0, void 0, function () {
+(function () { return __awaiter(void 0, void 0, void 0, function () {
     var response, blob, size, image;
     return __generator(this, function (_a) {
         switch (_a.label) {
diff --git a/tests/baselines/reference/importMeta(module=system,target=es5).js b/tests/baselines/reference/importMeta(module=system,target=es5).js
index ce9321f5fe9..3eda4156d8b 100644
--- a/tests/baselines/reference/importMeta(module=system,target=es5).js
+++ b/tests/baselines/reference/importMeta(module=system,target=es5).js
@@ -77,14 +77,12 @@ System.register([], function (exports_1, context_1) {
             if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
         }
     };
-    var _this;
-    _this = this;
     var __moduleName = context_1 && context_1.id;
     return {
         setters: [],
         execute: function () {
             // Adapted from https://github.com/tc39/proposal-import-meta/tree/c3902a9ffe2e69a7ac42c19d7ea74cbdcea9b7fb#example
-            (function () { return __awaiter(_this, void 0, void 0, function () {
+            (function () { return __awaiter(void 0, void 0, void 0, function () {
                 var response, blob, size, image;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
diff --git a/tests/baselines/reference/reactReduxLikeDeferredInferenceAllowsAssignment.js b/tests/baselines/reference/reactReduxLikeDeferredInferenceAllowsAssignment.js
index 88ae943f92a..3c2cb0e7626 100644
--- a/tests/baselines/reference/reactReduxLikeDeferredInferenceAllowsAssignment.js
+++ b/tests/baselines/reference/reactReduxLikeDeferredInferenceAllowsAssignment.js
@@ -198,7 +198,6 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-var _this = this;
 exports.__esModule = true;
 var simpleAction = function (payload) { return ({
     type: "SIMPLE_ACTION",
@@ -206,7 +205,7 @@ var simpleAction = function (payload) { return ({
 }); };
 var thunkAction = function (param1, param2) { return function (dispatch, _a) {
     var foo = _a.foo;
-    return __awaiter(_this, void 0, void 0, function () {
+    return __awaiter(void 0, void 0, void 0, function () {
         return __generator(this, function (_b) {
             return [2 /*return*/, foo];
         });

From 4ab85bbf350b7a0b9a6ad320efcc58a67c155c68 Mon Sep 17 00:00:00 2001
From: Wesley Wigham <wewigham@microsoft.com>
Date: Mon, 12 Aug 2019 16:00:38 -0700
Subject: [PATCH 150/151] Add error message for keywords with escapes in them
 (#32718)

* Add error message for keywords with escapes in them

* Move check into parser during advance to next token to utilize context for contextual keywords

* git add .

* Add tests for extended escapes

* Better error courtesy of @DanielRossenwaser

* Add test of browser-inconsistent case and alter condition to match spec

* Merge adjacent conditions

* Use seperate functions for checking keywords vs not

* Use flags to track unicode escape presence

* Adjust error text
---
 src/compiler/diagnosticMessages.json          |  4 +
 src/compiler/parser.ts                        | 13 +++-
 src/compiler/scanner.ts                       |  6 ++
 src/compiler/types.ts                         |  2 +
 src/compiler/utilities.ts                     |  4 +
 .../reference/api/tsserverlibrary.d.ts        |  1 +
 tests/baselines/reference/api/typescript.d.ts |  1 +
 .../scannerUnicodeEscapeInKeyword1.errors.txt |  7 ++
 .../scannerUnicodeEscapeInKeyword2.errors.txt | 61 +++++++++++++++
 .../scannerUnicodeEscapeInKeyword2.js         | 62 +++++++++++++++
 .../scannerUnicodeEscapeInKeyword2.symbols    | 62 +++++++++++++++
 .../scannerUnicodeEscapeInKeyword2.types      | 77 +++++++++++++++++++
 ...hStatementsWithMultipleDefaults.errors.txt | 14 +---
 .../scannerUnicodeEscapeInKeyword2.ts         | 39 ++++++++++
 14 files changed, 341 insertions(+), 12 deletions(-)
 create mode 100644 tests/baselines/reference/scannerUnicodeEscapeInKeyword1.errors.txt
 create mode 100644 tests/baselines/reference/scannerUnicodeEscapeInKeyword2.errors.txt
 create mode 100644 tests/baselines/reference/scannerUnicodeEscapeInKeyword2.js
 create mode 100644 tests/baselines/reference/scannerUnicodeEscapeInKeyword2.symbols
 create mode 100644 tests/baselines/reference/scannerUnicodeEscapeInKeyword2.types
 create mode 100644 tests/cases/conformance/scanner/ecmascript5/scannerUnicodeEscapeInKeyword2.ts

diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index e22d64e0f72..47ec8756d20 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -851,6 +851,10 @@
         "category": "Error",
         "code": 1259
     },
+    "Keywords cannot contain escape characters.": {
+        "category": "Error",
+        "code": 1260
+    },
     "'with' statements are not allowed in an async function block.": {
         "category": "Error",
         "code": 1300
diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
index 4c8a5e567f8..6451a4f5c96 100644
--- a/src/compiler/parser.ts
+++ b/src/compiler/parser.ts
@@ -1086,10 +1086,19 @@ namespace ts {
             return currentToken;
         }
 
-        function nextToken(): SyntaxKind {
+        function nextTokenWithoutCheck() {
             return currentToken = scanner.scan();
         }
 
+        function nextToken(): SyntaxKind {
+            // if the keyword had an escape
+            if (isKeyword(currentToken) && (scanner.hasUnicodeEscape() || scanner.hasExtendedUnicodeEscape())) {
+                // issue a parse error for the escape
+                parseErrorAt(scanner.getTokenPos(), scanner.getTextPos(), Diagnostics.Keywords_cannot_contain_escape_characters);
+            }
+            return nextTokenWithoutCheck();
+        }
+
         function nextTokenJSDoc(): JSDocSyntaxKind {
             return currentToken = scanner.scanJsDocToken();
         }
@@ -1380,7 +1389,7 @@ namespace ts {
                     node.originalKeywordKind = token();
                 }
                 node.escapedText = escapeLeadingUnderscores(internIdentifier(scanner.getTokenValue()));
-                nextToken();
+                nextTokenWithoutCheck();
                 return finishNode(node);
             }
 
diff --git a/src/compiler/scanner.ts b/src/compiler/scanner.ts
index 44a28916185..75f0b31c896 100644
--- a/src/compiler/scanner.ts
+++ b/src/compiler/scanner.ts
@@ -18,6 +18,7 @@ namespace ts {
         getTokenPos(): number;
         getTokenText(): string;
         getTokenValue(): string;
+        hasUnicodeEscape(): boolean;
         hasExtendedUnicodeEscape(): boolean;
         hasPrecedingLineBreak(): boolean;
         isIdentifier(): boolean;
@@ -884,6 +885,7 @@ namespace ts {
             getTokenPos: () => tokenPos,
             getTokenText: () => text.substring(tokenPos, pos),
             getTokenValue: () => tokenValue,
+            hasUnicodeEscape: () => (tokenFlags & TokenFlags.UnicodeEscape) !== 0,
             hasExtendedUnicodeEscape: () => (tokenFlags & TokenFlags.ExtendedUnicodeEscape) !== 0,
             hasPrecedingLineBreak: () => (tokenFlags & TokenFlags.PrecedingLineBreak) !== 0,
             isIdentifier: () => token === SyntaxKind.Identifier || token > SyntaxKind.LastReservedWord,
@@ -1245,6 +1247,7 @@ namespace ts {
                         return scanExtendedUnicodeEscape();
                     }
 
+                    tokenFlags |= TokenFlags.UnicodeEscape;
                     // '\uDDDD'
                     return scanHexadecimalEscape(/*numDigits*/ 4);
 
@@ -1376,6 +1379,7 @@ namespace ts {
                     if (!(ch >= 0 && isIdentifierPart(ch, languageVersion))) {
                         break;
                     }
+                    tokenFlags |= TokenFlags.UnicodeEscape;
                     result += text.substring(start, pos);
                     result += utf16EncodeAsString(ch);
                     // Valid Unicode escape is always six characters
@@ -1868,6 +1872,7 @@ namespace ts {
                         const cookedChar = peekUnicodeEscape();
                         if (cookedChar >= 0 && isIdentifierStart(cookedChar, languageVersion)) {
                             pos += 6;
+                            tokenFlags |= TokenFlags.UnicodeEscape;
                             tokenValue = String.fromCharCode(cookedChar) + scanIdentifierParts();
                             return token = getIdentifierToken();
                         }
@@ -2156,6 +2161,7 @@ namespace ts {
                     const cookedChar = peekUnicodeEscape();
                     if (cookedChar >= 0 && isIdentifierStart(cookedChar, languageVersion)) {
                         pos += 6;
+                        tokenFlags |= TokenFlags.UnicodeEscape;
                         tokenValue = String.fromCharCode(cookedChar) + scanIdentifierParts();
                         return token = getIdentifierToken();
                     }
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 02dcc828486..a4373b7dc01 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -1679,6 +1679,8 @@ namespace ts {
         /* @internal */
         ContainsSeparator = 1 << 9, // e.g. `0b1100_0101`
         /* @internal */
+        UnicodeEscape = 1 << 10,
+        /* @internal */
         BinaryOrOctalSpecifier = BinarySpecifier | OctalSpecifier,
         /* @internal */
         NumericLiteralFlags = Scientific | Octal | HexSpecifier | BinaryOrOctalSpecifier | ContainsSeparator
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index aa442d822e4..0bb3c799af5 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -2682,6 +2682,10 @@ namespace ts {
         return isKeyword(token) && !isContextualKeyword(token);
     }
 
+    export function isFutureReservedKeyword(token: SyntaxKind): boolean {
+        return SyntaxKind.FirstFutureReservedWord <= token && token <= SyntaxKind.LastFutureReservedWord;
+    }
+
     export function isStringANonContextualKeyword(name: string) {
         const token = stringToToken(name);
         return token !== undefined && isNonContextualKeyword(token);
diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts
index 3ed8570cab8..4c88e5fe219 100644
--- a/tests/baselines/reference/api/tsserverlibrary.d.ts
+++ b/tests/baselines/reference/api/tsserverlibrary.d.ts
@@ -3174,6 +3174,7 @@ declare namespace ts {
         getTokenPos(): number;
         getTokenText(): string;
         getTokenValue(): string;
+        hasUnicodeEscape(): boolean;
         hasExtendedUnicodeEscape(): boolean;
         hasPrecedingLineBreak(): boolean;
         isIdentifier(): boolean;
diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts
index 3b2ad792601..bb30ccc908d 100644
--- a/tests/baselines/reference/api/typescript.d.ts
+++ b/tests/baselines/reference/api/typescript.d.ts
@@ -3174,6 +3174,7 @@ declare namespace ts {
         getTokenPos(): number;
         getTokenText(): string;
         getTokenValue(): string;
+        hasUnicodeEscape(): boolean;
         hasExtendedUnicodeEscape(): boolean;
         hasPrecedingLineBreak(): boolean;
         isIdentifier(): boolean;
diff --git a/tests/baselines/reference/scannerUnicodeEscapeInKeyword1.errors.txt b/tests/baselines/reference/scannerUnicodeEscapeInKeyword1.errors.txt
new file mode 100644
index 00000000000..ec7c0033271
--- /dev/null
+++ b/tests/baselines/reference/scannerUnicodeEscapeInKeyword1.errors.txt
@@ -0,0 +1,7 @@
+tests/cases/conformance/scanner/ecmascript5/scannerUnicodeEscapeInKeyword1.ts(1,1): error TS1260: Keywords cannot contain escape characters.
+
+
+==== tests/cases/conformance/scanner/ecmascript5/scannerUnicodeEscapeInKeyword1.ts (1 errors) ====
+    \u0076ar x = "hello";
+    ~~~~~~~~
+!!! error TS1260: Keywords cannot contain escape characters.
\ No newline at end of file
diff --git a/tests/baselines/reference/scannerUnicodeEscapeInKeyword2.errors.txt b/tests/baselines/reference/scannerUnicodeEscapeInKeyword2.errors.txt
new file mode 100644
index 00000000000..f65d70920c5
--- /dev/null
+++ b/tests/baselines/reference/scannerUnicodeEscapeInKeyword2.errors.txt
@@ -0,0 +1,61 @@
+tests/cases/conformance/scanner/ecmascript5/file1.ts(3,5): error TS1260: Keywords cannot contain escape characters.
+tests/cases/conformance/scanner/ecmascript5/file1.ts(8,5): error TS1260: Keywords cannot contain escape characters.
+tests/cases/conformance/scanner/ecmascript5/file1.ts(13,1): error TS1260: Keywords cannot contain escape characters.
+tests/cases/conformance/scanner/ecmascript5/file2.ts(1,1): error TS1260: Keywords cannot contain escape characters.
+tests/cases/conformance/scanner/ecmascript5/file2.ts(5,5): error TS1260: Keywords cannot contain escape characters.
+tests/cases/conformance/scanner/ecmascript5/file2.ts(10,5): error TS1260: Keywords cannot contain escape characters.
+tests/cases/conformance/scanner/ecmascript5/file2.ts(15,1): error TS1260: Keywords cannot contain escape characters.
+
+
+==== tests/cases/conformance/scanner/ecmascript5/file1.ts (3 errors) ====
+    var \u0061wait = 12; // ok
+    async function main() {
+        \u0061wait 12; // not ok
+        ~~~~~~~~~~
+!!! error TS1260: Keywords cannot contain escape characters.
+    }
+    
+    var \u0079ield = 12; // ok
+    function *gen() {
+        \u0079ield 12; //not ok
+        ~~~~~~~~~~
+!!! error TS1260: Keywords cannot contain escape characters.
+    }
+    
+    type typ\u0065 = 12; // ok
+    
+    typ\u0065 notok = 0; // not ok
+    ~~~~~~~~~
+!!! error TS1260: Keywords cannot contain escape characters.
+    
+    export {};
+==== tests/cases/conformance/scanner/ecmascript5/file2.ts (4 errors) ====
+    \u{0076}ar x = "hello"; // not ok
+    ~~~~~~~~~~
+!!! error TS1260: Keywords cannot contain escape characters.
+    
+    var \u{0061}wait = 12; // ok
+    async function main() {
+        \u{0061}wait 12; // not ok
+        ~~~~~~~~~~~~
+!!! error TS1260: Keywords cannot contain escape characters.
+    }
+    
+    var \u{0079}ield = 12; // ok
+    function *gen() {
+        \u{0079}ield 12; //not ok
+        ~~~~~~~~~~~~
+!!! error TS1260: Keywords cannot contain escape characters.
+    }
+    
+    type typ\u{0065} = 12; // ok
+    
+    typ\u{0065} notok = 0; // not ok
+    ~~~~~~~~~~~
+!!! error TS1260: Keywords cannot contain escape characters.
+    
+    export {};
+    
+    const a = {def\u0061ult: 12}; // OK, `default` not in keyword position
+    // chrome and jsc may still error on this, ref https://bugs.chromium.org/p/chromium/issues/detail?id=993000 and https://bugs.webkit.org/show_bug.cgi?id=200638
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/scannerUnicodeEscapeInKeyword2.js b/tests/baselines/reference/scannerUnicodeEscapeInKeyword2.js
new file mode 100644
index 00000000000..d93ba71d1d3
--- /dev/null
+++ b/tests/baselines/reference/scannerUnicodeEscapeInKeyword2.js
@@ -0,0 +1,62 @@
+//// [tests/cases/conformance/scanner/ecmascript5/scannerUnicodeEscapeInKeyword2.ts] ////
+
+//// [file1.ts]
+var \u0061wait = 12; // ok
+async function main() {
+    \u0061wait 12; // not ok
+}
+
+var \u0079ield = 12; // ok
+function *gen() {
+    \u0079ield 12; //not ok
+}
+
+type typ\u0065 = 12; // ok
+
+typ\u0065 notok = 0; // not ok
+
+export {};
+//// [file2.ts]
+\u{0076}ar x = "hello"; // not ok
+
+var \u{0061}wait = 12; // ok
+async function main() {
+    \u{0061}wait 12; // not ok
+}
+
+var \u{0079}ield = 12; // ok
+function *gen() {
+    \u{0079}ield 12; //not ok
+}
+
+type typ\u{0065} = 12; // ok
+
+typ\u{0065} notok = 0; // not ok
+
+export {};
+
+const a = {def\u0061ult: 12}; // OK, `default` not in keyword position
+// chrome and jsc may still error on this, ref https://bugs.chromium.org/p/chromium/issues/detail?id=993000 and https://bugs.webkit.org/show_bug.cgi?id=200638
+
+
+//// [file1.js]
+var \u0061wait = 12; // ok
+async function main() {
+    await 12; // not ok
+}
+var \u0079ield = 12; // ok
+function* gen() {
+    yield 12; //not ok
+}
+//// [file2.js]
+var x = "hello"; // not ok
+var \u{0061}wait = 12; // ok
+async function main() {
+    await 12; // not ok
+}
+var \u{0079}ield = 12; // ok
+function* gen() {
+    yield 12; //not ok
+}
+const a = { def\u0061ult: 12 }; // OK, `default` not in keyword position
+// chrome and jsc may still error on this, ref https://bugs.chromium.org/p/chromium/issues/detail?id=993000 and https://bugs.webkit.org/show_bug.cgi?id=200638
diff --git a/tests/baselines/reference/scannerUnicodeEscapeInKeyword2.symbols b/tests/baselines/reference/scannerUnicodeEscapeInKeyword2.symbols
new file mode 100644
index 00000000000..bd6c92ec26d
--- /dev/null
+++ b/tests/baselines/reference/scannerUnicodeEscapeInKeyword2.symbols
@@ -0,0 +1,62 @@
+=== tests/cases/conformance/scanner/ecmascript5/file1.ts ===
+var \u0061wait = 12; // ok
+>\u0061wait : Symbol(\u0061wait, Decl(file1.ts, 0, 3))
+
+async function main() {
+>main : Symbol(main, Decl(file1.ts, 0, 20))
+
+    \u0061wait 12; // not ok
+}
+
+var \u0079ield = 12; // ok
+>\u0079ield : Symbol(\u0079ield, Decl(file1.ts, 5, 3))
+
+function *gen() {
+>gen : Symbol(gen, Decl(file1.ts, 5, 20))
+
+    \u0079ield 12; //not ok
+}
+
+type typ\u0065 = 12; // ok
+>typ\u0065 : Symbol(typ\u0065, Decl(file1.ts, 8, 1))
+
+typ\u0065 notok = 0; // not ok
+>notok : Symbol(notok, Decl(file1.ts, 10, 20))
+
+export {};
+=== tests/cases/conformance/scanner/ecmascript5/file2.ts ===
+\u{0076}ar x = "hello"; // not ok
+>x : Symbol(x, Decl(file2.ts, 0, 10))
+
+var \u{0061}wait = 12; // ok
+>\u{0061}wait : Symbol(\u{0061}wait, Decl(file2.ts, 2, 3))
+
+async function main() {
+>main : Symbol(main, Decl(file2.ts, 2, 22))
+
+    \u{0061}wait 12; // not ok
+}
+
+var \u{0079}ield = 12; // ok
+>\u{0079}ield : Symbol(\u{0079}ield, Decl(file2.ts, 7, 3))
+
+function *gen() {
+>gen : Symbol(gen, Decl(file2.ts, 7, 22))
+
+    \u{0079}ield 12; //not ok
+}
+
+type typ\u{0065} = 12; // ok
+>typ\u{0065} : Symbol(typ\u{0065}, Decl(file2.ts, 10, 1))
+
+typ\u{0065} notok = 0; // not ok
+>notok : Symbol(notok, Decl(file2.ts, 12, 22))
+
+export {};
+
+const a = {def\u0061ult: 12}; // OK, `default` not in keyword position
+>a : Symbol(a, Decl(file2.ts, 18, 5))
+>def\u0061ult : Symbol(def\u0061ult, Decl(file2.ts, 18, 11))
+
+// chrome and jsc may still error on this, ref https://bugs.chromium.org/p/chromium/issues/detail?id=993000 and https://bugs.webkit.org/show_bug.cgi?id=200638
+
diff --git a/tests/baselines/reference/scannerUnicodeEscapeInKeyword2.types b/tests/baselines/reference/scannerUnicodeEscapeInKeyword2.types
new file mode 100644
index 00000000000..e4460866a51
--- /dev/null
+++ b/tests/baselines/reference/scannerUnicodeEscapeInKeyword2.types
@@ -0,0 +1,77 @@
+=== tests/cases/conformance/scanner/ecmascript5/file1.ts ===
+var \u0061wait = 12; // ok
+>\u0061wait : number
+>12 : 12
+
+async function main() {
+>main : () => Promise<void>
+
+    \u0061wait 12; // not ok
+>\u0061wait 12 : 12
+>12 : 12
+}
+
+var \u0079ield = 12; // ok
+>\u0079ield : number
+>12 : 12
+
+function *gen() {
+>gen : () => Generator<number, void, unknown>
+
+    \u0079ield 12; //not ok
+>\u0079ield 12 : any
+>12 : 12
+}
+
+type typ\u0065 = 12; // ok
+>typ\u0065 : 12
+
+typ\u0065 notok = 0; // not ok
+>notok : 0
+
+export {};
+=== tests/cases/conformance/scanner/ecmascript5/file2.ts ===
+\u{0076}ar x = "hello"; // not ok
+>x : string
+>"hello" : "hello"
+
+var \u{0061}wait = 12; // ok
+>\u{0061}wait : number
+>12 : 12
+
+async function main() {
+>main : () => Promise<void>
+
+    \u{0061}wait 12; // not ok
+>\u{0061}wait 12 : 12
+>12 : 12
+}
+
+var \u{0079}ield = 12; // ok
+>\u{0079}ield : number
+>12 : 12
+
+function *gen() {
+>gen : () => Generator<number, void, unknown>
+
+    \u{0079}ield 12; //not ok
+>\u{0079}ield 12 : any
+>12 : 12
+}
+
+type typ\u{0065} = 12; // ok
+>typ\u{0065} : 12
+
+typ\u{0065} notok = 0; // not ok
+>notok : 0
+
+export {};
+
+const a = {def\u0061ult: 12}; // OK, `default` not in keyword position
+>a : { def\u0061ult: number; }
+>{def\u0061ult: 12} : { def\u0061ult: number; }
+>def\u0061ult : number
+>12 : 12
+
+// chrome and jsc may still error on this, ref https://bugs.chromium.org/p/chromium/issues/detail?id=993000 and https://bugs.webkit.org/show_bug.cgi?id=200638
+
diff --git a/tests/baselines/reference/switchStatementsWithMultipleDefaults.errors.txt b/tests/baselines/reference/switchStatementsWithMultipleDefaults.errors.txt
index 9760ce4d99b..65565857894 100644
--- a/tests/baselines/reference/switchStatementsWithMultipleDefaults.errors.txt
+++ b/tests/baselines/reference/switchStatementsWithMultipleDefaults.errors.txt
@@ -1,9 +1,7 @@
-tests/cases/compiler/switchStatementsWithMultipleDefaults.ts(8,5): error TS1113: A 'default' clause cannot appear more than once in a 'switch' statement.
-tests/cases/compiler/switchStatementsWithMultipleDefaults.ts(20,13): error TS1113: A 'default' clause cannot appear more than once in a 'switch' statement.
-tests/cases/compiler/switchStatementsWithMultipleDefaults.ts(27,22): error TS1108: A 'return' statement can only be used within a function body.
+tests/cases/compiler/switchStatementsWithMultipleDefaults.ts(25,13): error TS1260: Keywords cannot contain escape characters.
 
 
-==== tests/cases/compiler/switchStatementsWithMultipleDefaults.ts (3 errors) ====
+==== tests/cases/compiler/switchStatementsWithMultipleDefaults.ts (1 errors) ====
     var x = 10;
     
     switch (x) {
@@ -12,8 +10,6 @@ tests/cases/compiler/switchStatementsWithMultipleDefaults.ts(27,22): error TS110
         default:    // No issues.
             break;
         default:    // Error; second 'default' clause.
-        ~~~~~~~~
-!!! error TS1113: A 'default' clause cannot appear more than once in a 'switch' statement.
         default:    // Error; third 'default' clause.
         case 3:
             x *= x;
@@ -26,17 +22,15 @@ tests/cases/compiler/switchStatementsWithMultipleDefaults.ts(27,22): error TS110
             switch (x * x) {
                 default:    // No issues.
                 default:    // Error; second 'default' clause.
-                ~~~~~~~~
-!!! error TS1113: A 'default' clause cannot appear more than once in a 'switch' statement.
                     break;
                 case 10000:
                     x /= x;
                 default:    // Error, third 'default' clause
                 def\u0061ult: // Error, fourth 'default' clause.
+                ~~~~~~~~~~~~
+!!! error TS1260: Keywords cannot contain escape characters.
                 // Errors on fifth-seventh
                 default: return;
-                         ~~~~~~
-!!! error TS1108: A 'return' statement can only be used within a function body.
                 default: default:
             }
     }
\ No newline at end of file
diff --git a/tests/cases/conformance/scanner/ecmascript5/scannerUnicodeEscapeInKeyword2.ts b/tests/cases/conformance/scanner/ecmascript5/scannerUnicodeEscapeInKeyword2.ts
new file mode 100644
index 00000000000..a92c22569db
--- /dev/null
+++ b/tests/cases/conformance/scanner/ecmascript5/scannerUnicodeEscapeInKeyword2.ts
@@ -0,0 +1,39 @@
+// @target: esnext
+// @filename: file1.ts
+var \u0061wait = 12; // ok
+async function main() {
+    \u0061wait 12; // not ok
+}
+
+var \u0079ield = 12; // ok
+function *gen() {
+    \u0079ield 12; //not ok
+}
+
+type typ\u0065 = 12; // ok
+
+typ\u0065 notok = 0; // not ok
+
+export {};
+// @filename: file2.ts
+
+\u{0076}ar x = "hello"; // not ok
+
+var \u{0061}wait = 12; // ok
+async function main() {
+    \u{0061}wait 12; // not ok
+}
+
+var \u{0079}ield = 12; // ok
+function *gen() {
+    \u{0079}ield 12; //not ok
+}
+
+type typ\u{0065} = 12; // ok
+
+typ\u{0065} notok = 0; // not ok
+
+export {};
+
+const a = {def\u0061ult: 12}; // OK, `default` not in keyword position
+// chrome and jsc may still error on this, ref https://bugs.chromium.org/p/chromium/issues/detail?id=993000 and https://bugs.webkit.org/show_bug.cgi?id=200638

From decc3cd671125acc66e1a2fd3941167985e5c145 Mon Sep 17 00:00:00 2001
From: Ron Buckton <ron.buckton@microsoft.com>
Date: Mon, 12 Aug 2019 16:05:15 -0700
Subject: [PATCH 151/151] Elide /index from auto-import when using rootDirs
 compiler option (#32828)

---
 src/compiler/moduleSpecifiers.ts              |  8 ++++---
 .../importNameCodeFixNewImportRootDirs1.ts    | 22 +++++++++++++++++++
 2 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 tests/cases/fourslash/importNameCodeFixNewImportRootDirs1.ts

diff --git a/src/compiler/moduleSpecifiers.ts b/src/compiler/moduleSpecifiers.ts
index fbed429e312..8c96199b7bf 100644
--- a/src/compiler/moduleSpecifiers.ts
+++ b/src/compiler/moduleSpecifiers.ts
@@ -114,7 +114,7 @@ namespace ts.moduleSpecifiers {
     function getLocalModuleSpecifier(moduleFileName: string, { getCanonicalFileName, sourceDirectory }: Info, compilerOptions: CompilerOptions, { ending, relativePreference }: Preferences): string {
         const { baseUrl, paths, rootDirs } = compilerOptions;
 
-        const relativePath = rootDirs && tryGetModuleNameFromRootDirs(rootDirs, moduleFileName, sourceDirectory, getCanonicalFileName) ||
+        const relativePath = rootDirs && tryGetModuleNameFromRootDirs(rootDirs, moduleFileName, sourceDirectory, getCanonicalFileName, ending, compilerOptions) ||
             removeExtensionAndIndexPostFix(ensurePathIsNonModuleName(getRelativePathFromDirectory(sourceDirectory, moduleFileName, getCanonicalFileName)), ending, compilerOptions);
         if (!baseUrl || relativePreference === RelativePreference.Relative) {
             return relativePath;
@@ -248,7 +248,7 @@ namespace ts.moduleSpecifiers {
         }
     }
 
-    function tryGetModuleNameFromRootDirs(rootDirs: ReadonlyArray<string>, moduleFileName: string, sourceDirectory: string, getCanonicalFileName: (file: string) => string): string | undefined {
+    function tryGetModuleNameFromRootDirs(rootDirs: ReadonlyArray<string>, moduleFileName: string, sourceDirectory: string, getCanonicalFileName: (file: string) => string, ending: Ending, compilerOptions: CompilerOptions): string | undefined {
         const normalizedTargetPath = getPathRelativeToRootDirs(moduleFileName, rootDirs, getCanonicalFileName);
         if (normalizedTargetPath === undefined) {
             return undefined;
@@ -256,7 +256,9 @@ namespace ts.moduleSpecifiers {
 
         const normalizedSourcePath = getPathRelativeToRootDirs(sourceDirectory, rootDirs, getCanonicalFileName);
         const relativePath = normalizedSourcePath !== undefined ? ensurePathIsNonModuleName(getRelativePathFromDirectory(normalizedSourcePath, normalizedTargetPath, getCanonicalFileName)) : normalizedTargetPath;
-        return removeFileExtension(relativePath);
+        return getEmitModuleResolutionKind(compilerOptions) === ModuleResolutionKind.NodeJs
+            ? removeExtensionAndIndexPostFix(relativePath, ending, compilerOptions)
+            : removeFileExtension(relativePath);
     }
 
     function tryGetModuleNameAsNodeModule(moduleFileName: string, { getCanonicalFileName, sourceDirectory }: Info, host: ModuleSpecifierResolutionHost, options: CompilerOptions): string | undefined {
diff --git a/tests/cases/fourslash/importNameCodeFixNewImportRootDirs1.ts b/tests/cases/fourslash/importNameCodeFixNewImportRootDirs1.ts
new file mode 100644
index 00000000000..dfac047ae19
--- /dev/null
+++ b/tests/cases/fourslash/importNameCodeFixNewImportRootDirs1.ts
@@ -0,0 +1,22 @@
+/// <reference path="fourslash.ts" />
+
+// @Filename: a/f1.ts
+//// [|foo/*0*/();|]
+
+// @Filename: a/b/index.ts
+//// export function foo() {};
+
+// @Filename: tsconfig.json
+//// {
+////     "compilerOptions": {
+////         "rootDirs": [
+////             "a"
+////         ]
+////     }
+//// }
+
+verify.importFixAtPosition([
+`import { foo } from "./b";
+
+foo();`
+]);